diff --git a/.env.example b/.env.example
index bed835645756..944da2aa9296 100644
--- a/.env.example
+++ b/.env.example
@@ -11,7 +11,6 @@ USE_WEB_PROXY=false
 USE_WDYR=false
 CAPTURE_METRICS=false
 ONYX_METRICS=false
-GOOGLE_GEOLOCATION_API_KEY=AIzaSyBqg6bMvQU7cPWDKhhzpYqJrTEnSorpiLI
 
 EXPENSIFY_ACCOUNT_ID_ACCOUNTING=-1
 EXPENSIFY_ACCOUNT_ID_ADMIN=-1
diff --git a/.env.production b/.env.production
index 4b0a98e77557..5e676134d681 100644
--- a/.env.production
+++ b/.env.production
@@ -7,4 +7,3 @@ PUSHER_APP_KEY=268df511a204fbb60884
 USE_WEB_PROXY=false
 ENVIRONMENT=production
 SEND_CRASH_REPORTS=true
-GOOGLE_GEOLOCATION_API_KEY=AIzaSyBFKujMpzExz0_z2pAGfPUwkmlaUc-uw1Q
diff --git a/.env.staging b/.env.staging
index 1b3ec15fc172..17d82ac2d136 100644
--- a/.env.staging
+++ b/.env.staging
@@ -6,5 +6,4 @@ EXPENSIFY_PARTNER_PASSWORD=e21965746fd75f82bb66
 PUSHER_APP_KEY=268df511a204fbb60884
 USE_WEB_PROXY=false
 ENVIRONMENT=staging
-SEND_CRASH_REPORTS=true
-GOOGLE_GEOLOCATION_API_KEY=AIzaSyD2T1mlByThbUN88O8OPOD8vKuMMwLD4-M
\ No newline at end of file
+SEND_CRASH_REPORTS=true
\ No newline at end of file
diff --git a/.eslintignore b/.eslintignore
index d3358a02fe4b..3d966d096add 100644
--- a/.eslintignore
+++ b/.eslintignore
@@ -1,5 +1,13 @@
-**/node_modules/*
-**/dist/*
-android/**/build/*
-.github/actions/**/index.js"
+!.storybook
+!.github
+.github/actions/**/index.js
+*.config.js
+**/.eslintrc.js
+**/node_modules/**
+**/dist/**
+android/**/build/**
 docs/vendor/**
+docs/assets/**
+web/gtm.js
+**/.expo/**
+src/libs/SearchParser/searchParser.js
diff --git a/.eslintrc.js b/.eslintrc.js
index c8a842fa4650..cb1219533278 100644
--- a/.eslintrc.js
+++ b/.eslintrc.js
@@ -1,12 +1,14 @@
+const path = require('path');
+
 const restrictedImportPaths = [
     {
         name: 'react-native',
         importNames: ['useWindowDimensions', 'StatusBar', 'TouchableOpacity', 'TouchableWithoutFeedback', 'TouchableNativeFeedback', 'TouchableHighlight', 'Pressable', 'Text', 'ScrollView'],
         message: [
             '',
-            "For 'useWindowDimensions', please use 'src/hooks/useWindowDimensions' instead.",
-            "For 'TouchableOpacity', 'TouchableWithoutFeedback', 'TouchableNativeFeedback', 'TouchableHighlight', 'Pressable', please use 'PressableWithFeedback' and/or 'PressableWithoutFeedback' from 'src/components/Pressable' instead.",
-            "For 'StatusBar', please use 'src/libs/StatusBar' instead.",
+            "For 'useWindowDimensions', please use '@src/hooks/useWindowDimensions' instead.",
+            "For 'TouchableOpacity', 'TouchableWithoutFeedback', 'TouchableNativeFeedback', 'TouchableHighlight', 'Pressable', please use 'PressableWithFeedback' and/or 'PressableWithoutFeedback' from '@components/Pressable' instead.",
+            "For 'StatusBar', please use '@libs/StatusBar' instead.",
             "For 'Text', please use '@components/Text' instead.",
             "For 'ScrollView', please use '@components/ScrollView' instead.",
         ].join('\n'),
@@ -14,7 +16,7 @@ const restrictedImportPaths = [
     {
         name: 'react-native-gesture-handler',
         importNames: ['TouchableOpacity', 'TouchableWithoutFeedback', 'TouchableNativeFeedback', 'TouchableHighlight'],
-        message: "Please use 'PressableWithFeedback' and/or 'PressableWithoutFeedback' from 'src/components/Pressable' instead.",
+        message: "Please use 'PressableWithFeedback' and/or 'PressableWithoutFeedback' from '@components/Pressable' instead.",
     },
     {
         name: 'awesome-phonenumber',
@@ -24,7 +26,7 @@ const restrictedImportPaths = [
     {
         name: 'react-native-safe-area-context',
         importNames: ['useSafeAreaInsets', 'SafeAreaConsumer', 'SafeAreaInsetsContext'],
-        message: "Please use 'useSafeAreaInsets' from 'src/hooks/useSafeAreaInset' and/or 'SafeAreaConsumer' from 'src/components/SafeAreaConsumer' instead.",
+        message: "Please use 'useSafeAreaInsets' from '@src/hooks/useSafeAreaInset' and/or 'SafeAreaConsumer' from '@components/SafeAreaConsumer' instead.",
     },
     {
         name: 'react',
@@ -34,18 +36,18 @@ const restrictedImportPaths = [
     {
         name: '@styles/index',
         importNames: ['default', 'defaultStyles'],
-        message: 'Do not import styles directly. Please use the `useThemeStyles` hook or `withThemeStyles` HOC instead.',
+        message: 'Do not import styles directly. Please use the `useThemeStyles` hook instead.',
     },
     {
         name: '@styles/utils',
         importNames: ['default', 'DefaultStyleUtils'],
-        message: 'Do not import StyleUtils directly. Please use the `useStyleUtils` hook or `withStyleUtils` HOC instead.',
+        message: 'Do not import StyleUtils directly. Please use the `useStyleUtils` hook instead.',
     },
     {
         name: '@styles/theme',
         importNames: ['default', 'defaultTheme'],
 
-        message: 'Do not import themes directly. Please use the `useTheme` hook or `withTheme` HOC instead.',
+        message: 'Do not import themes directly. Please use the `useTheme` hook instead.',
     },
     {
         name: '@styles/theme/illustrations',
@@ -55,20 +57,38 @@ const restrictedImportPaths = [
         name: 'date-fns/locale',
         message: "Do not import 'date-fns/locale' directly. Please use the submodule import instead, like 'date-fns/locale/en-GB'.",
     },
+    {
+        name: 'expensify-common',
+        importNames: ['Device', 'ExpensiMark'],
+        message: [
+            '',
+            "For 'Device', do not import it directly, it's known to make VSCode's IntelliSense crash. Please import the desired module from `expensify-common/dist/Device` instead.",
+            "For 'ExpensiMark', please use '@libs/Parser' instead.",
+        ].join('\n'),
+    },
+    {
+        name: 'lodash/memoize',
+        message: "Please use '@src/libs/memoize' instead.",
+    },
+    {
+        name: 'lodash',
+        importNames: ['memoize'],
+        message: "Please use '@src/libs/memoize' instead.",
+    },
 ];
 
 const restrictedImportPatterns = [
     {
         group: ['**/assets/animations/**/*.json'],
-        message: "Do not import animations directly. Please use the 'src/components/LottieAnimations' import instead.",
+        message: "Do not import animations directly. Please use the '@components/LottieAnimations' import instead.",
     },
     {
         group: ['@styles/theme/themes/**'],
-        message: 'Do not import themes directly. Please use the `useTheme` hook or `withTheme` HOC instead.',
+        message: 'Do not import themes directly. Please use the `useTheme` hook instead.',
     },
     {
         group: ['@styles/utils/**', '!@styles/utils/FontUtils', '!@styles/utils/types'],
-        message: 'Do not import style util functions directly. Please use the `useStyleUtils` hook or `withStyleUtils` HOC instead.',
+        message: 'Do not import style util functions directly. Please use the `useStyleUtils` hook instead.',
     },
     {
         group: ['@styles/theme/illustrations/themes/**'],
@@ -77,218 +97,190 @@ const restrictedImportPatterns = [
 ];
 
 module.exports = {
-    extends: ['expensify', 'plugin:storybook/recommended', 'plugin:react-native-a11y/basic', 'plugin:@dword-design/import-alias/recommended', 'prettier'],
-    plugins: ['react-native-a11y', 'testing-library'],
-    parser: 'babel-eslint',
-    ignorePatterns: ['!.*', 'src/vendor', '.github/actions/**/index.js', 'desktop/dist/*.js', 'dist/*.js', 'node_modules/.bin/**', 'node_modules/.cache/**', '.git/**'],
+    extends: [
+        'expensify',
+        'airbnb-typescript',
+        'plugin:storybook/recommended',
+        'plugin:react-native-a11y/basic',
+        'plugin:@dword-design/import-alias/recommended',
+        'plugin:@typescript-eslint/recommended-type-checked',
+        'plugin:@typescript-eslint/stylistic-type-checked',
+        'plugin:you-dont-need-lodash-underscore/all',
+        'plugin:prettier/recommended',
+    ],
+    plugins: ['@typescript-eslint', 'jsdoc', 'you-dont-need-lodash-underscore', 'react-native-a11y', 'react', 'testing-library', 'eslint-plugin-react-compiler'],
+    ignorePatterns: ['lib/**'],
+    parser: '@typescript-eslint/parser',
+    parserOptions: {
+        project: path.resolve(__dirname, './tsconfig.json'),
+    },
     env: {
         jest: true,
     },
     globals: {
         __DEV__: 'readonly',
     },
-    overrides: [
-        {
-            files: ['*.js', '*.jsx', '*.ts', '*.tsx'],
-            plugins: ['react'],
-            rules: {
-                'prefer-regex-literals': 'off',
-                'rulesdir/no-multiple-onyx-in-file': 'off',
-                'react-native-a11y/has-accessibility-hint': ['off'],
-                'react/jsx-no-constructed-context-values': 'error',
-                'react-native-a11y/has-valid-accessibility-descriptors': [
-                    'error',
-                    {
-                        touchables: ['PressableWithoutFeedback', 'PressableWithFeedback'],
-                    },
-                ],
-                '@dword-design/import-alias/prefer-alias': [
-                    'warn',
-                    {
-                        alias: {
-                            '@assets': './assets',
-                            '@components': './src/components',
-                            '@hooks': './src/hooks',
-                            // This is needed up here, if not @libs/actions would take the priority
-                            '@userActions': './src/libs/actions',
-                            '@libs': './src/libs',
-                            '@navigation': './src/libs/Navigation',
-                            '@pages': './src/pages',
-                            '@styles': './src/styles',
-                            // This path is provide alias for files like `ONYXKEYS` and `CONST`.
-                            '@src': './src',
-                            '@desktop': './desktop',
-                            '@github': './.github',
-                        },
-                    },
-                ],
-                'rulesdir/avoid-anonymous-functions': 'off',
+    rules: {
+        // TypeScript specific rules
+        '@typescript-eslint/prefer-enum-initializers': 'error',
+        '@typescript-eslint/no-var-requires': 'off',
+        '@typescript-eslint/no-non-null-assertion': 'error',
+        '@typescript-eslint/switch-exhaustiveness-check': 'error',
+        '@typescript-eslint/consistent-type-definitions': ['error', 'type'],
+        '@typescript-eslint/no-floating-promises': 'off',
+        '@typescript-eslint/no-import-type-side-effects': 'error',
+        '@typescript-eslint/array-type': ['error', {default: 'array-simple'}],
+        '@typescript-eslint/naming-convention': [
+            'error',
+            {
+                selector: ['variable', 'property'],
+                format: ['camelCase', 'UPPER_CASE', 'PascalCase'],
             },
-        },
-        // This helps disable the `prefer-alias` rule to be enabled for specific directories
-        {
-            files: ['tests/**/*.js', 'tests/**/*.ts', 'tests/**/*.jsx', 'assets/**/*.js', '.storybook/**/*.js'],
-            rules: {'@dword-design/import-alias/prefer-alias': ['off']},
-        },
-        {
-            files: ['tests/**/*.js', 'tests/**/*.ts', 'tests/**/*.jsx', 'tests/**/*.tsx'],
-            extends: ['plugin:testing-library/react'],
-            rules: {
-                'testing-library/await-async-queries': 'error',
-                'testing-library/await-async-utils': 'error',
-                'testing-library/no-debugging-utils': 'error',
-                'testing-library/no-manual-cleanup': 'error',
-                'testing-library/no-unnecessary-act': 'error',
-                'testing-library/prefer-find-by': 'error',
-                'testing-library/prefer-presence-queries': 'error',
-                'testing-library/prefer-screen-queries': 'error',
+            {
+                selector: 'function',
+                format: ['camelCase', 'PascalCase'],
             },
-        },
-        {
-            files: ['*.js', '*.jsx'],
-            settings: {
-                'import/resolver': {
-                    node: {
-                        extensions: ['.js', '.website.js', '.desktop.js', '.native.js', '.ios.js', '.android.js', '.config.js', '.ts', '.tsx'],
-                    },
+            {
+                selector: ['typeLike', 'enumMember'],
+                format: ['PascalCase'],
+            },
+            {
+                selector: ['parameter', 'method'],
+                format: ['camelCase', 'PascalCase'],
+                leadingUnderscore: 'allow',
+            },
+        ],
+        '@typescript-eslint/ban-types': [
+            'error',
+            {
+                types: {
+                    object: "Use 'Record<string, T>' instead.",
                 },
+                extendDefaults: true,
             },
-            rules: {
-                'import/extensions': [
-                    'error',
-                    'ignorePackages',
-                    {
-                        js: 'never',
-                        jsx: 'never',
-                        ts: 'never',
-                        tsx: 'never',
-                    },
-                ],
-                'no-restricted-imports': [
-                    'error',
-                    {
-                        paths: restrictedImportPaths,
-                        patterns: restrictedImportPatterns,
-                    },
-                ],
-                curly: 'error',
-                'react/display-name': 'error',
+        ],
+        '@typescript-eslint/consistent-type-imports': [
+            'error',
+            {
+                prefer: 'type-imports',
+                fixStyle: 'separate-type-imports',
             },
-        },
-        {
-            files: ['*.ts', '*.tsx'],
-            extends: [
-                'airbnb-typescript',
-                'plugin:@typescript-eslint/recommended-type-checked',
-                'plugin:@typescript-eslint/stylistic-type-checked',
-                'plugin:you-dont-need-lodash-underscore/all',
-                'prettier',
-            ],
-            plugins: ['@typescript-eslint', 'jsdoc', 'you-dont-need-lodash-underscore'],
-            parser: '@typescript-eslint/parser',
-            parserOptions: {
-                project: './tsconfig.json',
+        ],
+        '@typescript-eslint/consistent-type-exports': [
+            'error',
+            {
+                fixMixedExportsWithInlineTypeSpecifier: false,
             },
-            rules: {
-                // TODO: Remove the following rules after TypeScript migration is complete.
-                '@typescript-eslint/no-unsafe-argument': 'off',
-                '@typescript-eslint/no-unsafe-call': 'off',
-                '@typescript-eslint/no-unsafe-member-access': 'off',
-                '@typescript-eslint/no-unsafe-assignment': 'off',
+        ],
+        '@typescript-eslint/no-use-before-define': ['error', {functions: false}],
 
-                '@typescript-eslint/naming-convention': [
-                    'error',
-                    {
-                        selector: ['variable', 'property'],
-                        format: ['camelCase', 'UPPER_CASE', 'PascalCase'],
-                    },
-                    {
-                        selector: 'function',
-                        format: ['camelCase', 'PascalCase'],
-                    },
-                    {
-                        selector: ['typeLike', 'enumMember'],
-                        format: ['PascalCase'],
-                    },
-                    {
-                        selector: ['parameter', 'method'],
-                        format: ['camelCase', 'PascalCase'],
-                        leadingUnderscore: 'allow',
-                    },
-                ],
-                '@typescript-eslint/ban-types': [
-                    'error',
-                    {
-                        types: {
-                            object: "Use 'Record<string, T>' instead.",
-                        },
-                        extendDefaults: true,
-                    },
-                ],
-                '@typescript-eslint/array-type': ['error', {default: 'array-simple'}],
-                '@typescript-eslint/prefer-enum-initializers': 'error',
-                '@typescript-eslint/no-var-requires': 'off',
-                '@typescript-eslint/no-non-null-assertion': 'error',
-                '@typescript-eslint/switch-exhaustiveness-check': 'error',
-                '@typescript-eslint/consistent-type-definitions': ['error', 'type'],
-                '@typescript-eslint/no-floating-promises': 'off',
-                '@typescript-eslint/consistent-type-imports': [
-                    'error',
-                    {
-                        prefer: 'type-imports',
-                        fixStyle: 'separate-type-imports',
-                    },
-                ],
-                '@typescript-eslint/no-import-type-side-effects': 'error',
-                '@typescript-eslint/consistent-type-exports': [
-                    'error',
-                    {
-                        fixMixedExportsWithInlineTypeSpecifier: false,
-                    },
-                ],
-                'import/consistent-type-specifier-style': ['error', 'prefer-top-level'],
-                'es/no-nullish-coalescing-operators': 'off',
-                'es/no-optional-chaining': 'off',
-                'valid-jsdoc': 'off',
-                'jsdoc/no-types': 'error',
-                'rulesdir/no-default-props': 'error',
-                'import/no-extraneous-dependencies': 'off',
-                'rulesdir/prefer-underscore-method': 'off',
-                'rulesdir/prefer-import-module-contents': 'off',
-                'react/require-default-props': 'off',
-                'react/prop-types': 'off',
-                'no-restricted-syntax': [
-                    'error',
-                    {
-                        selector: 'TSEnumDeclaration',
-                        message: "Please don't declare enums, use union types instead.",
-                    },
-                ],
-                'no-restricted-properties': [
-                    'error',
-                    {
-                        object: 'Image',
-                        property: 'getSize',
-                        message: 'Usage of Image.getImage is restricted. Please use the `react-native-image-size`.',
-                    },
-                ],
-                'no-restricted-imports': [
+        // ESLint core rules
+        'es/no-nullish-coalescing-operators': 'off',
+        'es/no-optional-chaining': 'off',
+
+        // Import specific rules
+        'import/consistent-type-specifier-style': ['error', 'prefer-top-level'],
+        'import/no-extraneous-dependencies': 'off',
+
+        // Rulesdir specific rules
+        'rulesdir/no-default-props': 'error',
+        'rulesdir/prefer-type-fest': 'error',
+        'rulesdir/no-multiple-onyx-in-file': 'off',
+        'rulesdir/prefer-underscore-method': 'off',
+        'rulesdir/prefer-import-module-contents': 'off',
+
+        // React and React Native specific rules
+        'react-native-a11y/has-accessibility-hint': ['off'],
+        'react/require-default-props': 'off',
+        'react/prop-types': 'off',
+        'react/jsx-no-constructed-context-values': 'error',
+        'react-native-a11y/has-valid-accessibility-descriptors': [
+            'error',
+            {
+                touchables: ['PressableWithoutFeedback', 'PressableWithFeedback'],
+            },
+        ],
+        'react-compiler/react-compiler': 'error',
+
+        // Disallow usage of certain functions and imports
+        'no-restricted-syntax': [
+            'error',
+            {
+                selector: 'TSEnumDeclaration',
+                message: "Please don't declare enums, use union types instead.",
+            },
+        ],
+        'no-restricted-properties': [
+            'error',
+            {
+                object: 'Image',
+                property: 'getSize',
+                message: 'Usage of Image.getImage is restricted. Please use the `react-native-image-size`.',
+            },
+        ],
+        'no-restricted-imports': [
+            'error',
+            {
+                paths: restrictedImportPaths,
+                patterns: restrictedImportPatterns,
+            },
+        ],
+
+        // Other rules
+        curly: 'error',
+        'you-dont-need-lodash-underscore/throttle': 'off',
+        // The suggested alternative (structuredClone) is not supported in Hermes:https://github.com/facebook/hermes/issues/684
+        'you-dont-need-lodash-underscore/clone-deep': 'off',
+        'prefer-regex-literals': 'off',
+        'valid-jsdoc': 'off',
+        'jsdoc/no-types': 'error',
+        '@dword-design/import-alias/prefer-alias': [
+            'warn',
+            {
+                alias: {
+                    '@assets': './assets',
+                    '@components': './src/components',
+                    '@hooks': './src/hooks',
+                    // This is needed up here, if not @libs/actions would take the priority
+                    '@userActions': './src/libs/actions',
+                    '@libs': './src/libs',
+                    '@navigation': './src/libs/Navigation',
+                    '@pages': './src/pages',
+                    '@styles': './src/styles',
+                    // This path is provide alias for files like `ONYXKEYS` and `CONST`.
+                    '@src': './src',
+                    '@desktop': './desktop',
+                    '@github': './.github',
+                },
+            },
+        ],
+    },
+
+    overrides: [
+        // Enforces every Onyx type and its properties to have a comment explaining its purpose.
+        {
+            files: ['src/types/onyx/**/*.ts'],
+            rules: {
+                'jsdoc/require-jsdoc': [
                     'error',
                     {
-                        paths: restrictedImportPaths,
-                        patterns: restrictedImportPatterns,
+                        contexts: ['TSInterfaceDeclaration', 'TSTypeAliasDeclaration', 'TSPropertySignature'],
                     },
                 ],
-                curly: 'error',
-                'you-dont-need-lodash-underscore/throttle': 'off',
             },
         },
+
+        // Remove once no JS files are left
         {
-            files: ['workflow_tests/**/*.{js,jsx,ts,tsx}', 'tests/**/*.{js,jsx,ts,tsx}', '.github/**/*.{js,jsx,ts,tsx}'],
+            files: ['*.js', '*.jsx'],
+            extends: ['plugin:@typescript-eslint/disable-type-checked'],
             rules: {
-                '@lwc/lwc/no-async-await': 'off',
-                'no-await-in-loop': 'off',
-                'no-restricted-syntax': ['error', 'ForInStatement', 'LabeledStatement', 'WithStatement'],
+                '@typescript-eslint/prefer-nullish-coalescing': 'off',
+                '@typescript-eslint/no-unsafe-return': 'off',
+                '@typescript-eslint/unbound-method': 'off',
+                'jsdoc/no-types': 'off',
+                'react/jsx-filename-extension': 'off',
+                'rulesdir/no-default-props': 'off',
             },
         },
         {
diff --git a/.github/.eslintrc.js b/.github/.eslintrc.js
index e769944cd1a9..41fc57fb9829 100644
--- a/.github/.eslintrc.js
+++ b/.github/.eslintrc.js
@@ -1,6 +1,12 @@
-// For all these Node.js scripts, we do not want to disable `console` statements
 module.exports = {
     rules: {
+        // For all these Node.js scripts, we do not want to disable `console` statements
         'no-console': 'off',
+
+        '@lwc/lwc/no-async-await': 'off',
+        'no-await-in-loop': 'off',
+        'no-restricted-syntax': ['error', 'ForInStatement', 'LabeledStatement', 'WithStatement'],
+        'no-continue': 'off',
+        'no-restricted-imports': 'off',
     },
 };
diff --git a/.github/actions/composite/buildAndroidE2EAPK/action.yml b/.github/actions/composite/buildAndroidE2EAPK/action.yml
index 47e13f6313a0..25fafcb7be7f 100644
--- a/.github/actions/composite/buildAndroidE2EAPK/action.yml
+++ b/.github/actions/composite/buildAndroidE2EAPK/action.yml
@@ -37,6 +37,9 @@ inputs:
   EXPENSIFY_PARTNER_PASSWORD_EMAIL:
     description: The email address of the Expensify partner to use for the build
     required: true
+  SLACK_WEBHOOK_URL:
+    description: 'URL of the slack webhook'
+    required: true
 
 runs:
   using: composite
@@ -53,7 +56,7 @@ runs:
         distribution: "oracle"
         java-version: "17"
 
-    - uses: ruby/setup-ruby@a05e47355e80e57b9a67566a813648fa67d92011
+    - uses: ruby/setup-ruby@v1.187.0
       with:
         ruby-version: "2.7"
         bundler-cache: true
@@ -72,9 +75,28 @@ runs:
     - name: Build APK
       run: npm run ${{ inputs.PACKAGE_SCRIPT_NAME }}
       shell: bash
+      env:
+        RUBYOPT: '-rostruct'
+
+    - name: Announce failed workflow in Slack
+      if: failure()
+      uses: 8398a7/action-slack@v3
+      with:
+        status: custom
+        custom_payload: |
+          {
+            channel: '#e2e-announce',
+            attachments: [{
+              color: 'danger',
+              text: `🚧 ${process.env.AS_REPO} E2E APK build run failed on <https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }}|${{ github.workflow }}> workflow 🚧`,
+            }]
+          }
+      env:
+        GITHUB_TOKEN: ${{ github.token }}
+        SLACK_WEBHOOK_URL: ${{ inputs.SLACK_WEBHOOK_URL }}
 
     - name: Upload APK
-      uses: actions/upload-artifact@5d5d22a31266ced268874388b861e4b58bb5c2f3
+      uses: actions/upload-artifact@v4
       with:
         name: ${{ inputs.ARTIFACT_NAME }}
         path: ${{ inputs.APP_OUTPUT_PATH }}
diff --git a/.github/actions/composite/setupNode/action.yml b/.github/actions/composite/setupNode/action.yml
index c6a6029e06e0..b3bbf7a537ff 100644
--- a/.github/actions/composite/setupNode/action.yml
+++ b/.github/actions/composite/setupNode/action.yml
@@ -31,7 +31,7 @@ runs:
 
     - name: Install root project node packages
       if: steps.cache-node-modules.outputs.cache-hit != 'true'
-      uses: nick-fields/retry@v2
+      uses: nick-fields/retry@3f757583fb1b1f940bc8ef4bf4734c8dc02a5847
       with:
         timeout_minutes: 30
         max_attempts: 3
@@ -39,7 +39,7 @@ runs:
 
     - name: Install node packages for desktop submodule
       if: steps.cache-desktop-node-modules.outputs.cache-hit != 'true'
-      uses: nick-fields/retry@v2
+      uses: nick-fields/retry@3f757583fb1b1f940bc8ef4bf4734c8dc02a5847
       with:
         timeout_minutes: 30
         max_attempts: 3
diff --git a/.github/actions/javascript/authorChecklist/categories/newComponentCategory.ts b/.github/actions/javascript/authorChecklist/categories/newComponentCategory.ts
index 042d91a5b956..3a5912cf3da7 100644
--- a/.github/actions/javascript/authorChecklist/categories/newComponentCategory.ts
+++ b/.github/actions/javascript/authorChecklist/categories/newComponentCategory.ts
@@ -1,4 +1,5 @@
 import * as github from '@actions/github';
+import type {WebhookPayload} from '@actions/github/lib/interfaces';
 import {parse} from '@babel/parser';
 import traverse from '@babel/traverse';
 import CONST from '@github/libs/CONST';
@@ -8,6 +9,15 @@ import type Category from './Category';
 
 type SuperClassType = {superClass: {name?: string; object: {name: string}; property: {name: string}} | null; name: string};
 
+type GithubPaylod = WebhookPayload & {
+    // eslint-disable-next-line @typescript-eslint/naming-convention
+    pull_request?: {
+        head: {
+            ref?: string;
+        };
+    };
+};
+
 const items = [
     "I verified that similar component doesn't exist in the codebase",
     'I verified that all props are defined accurately and each prop has a `/** comment above it */`',
@@ -77,7 +87,7 @@ async function detectReactComponentInFile(filename: string): Promise<boolean | u
         owner: CONST.GITHUB_OWNER,
         repo: CONST.APP_REPO,
         path: filename,
-        ref: github.context.payload.pull_request?.head.ref,
+        ref: (github.context.payload as GithubPaylod)?.pull_request?.head.ref,
     };
     try {
         const {data} = await GithubUtils.octokit.repos.getContent(params);
diff --git a/.github/actions/javascript/authorChecklist/index.js b/.github/actions/javascript/authorChecklist/index.js
index 337fe7398fb3..612a2457d630 100644
--- a/.github/actions/javascript/authorChecklist/index.js
+++ b/.github/actions/javascript/authorChecklist/index.js
@@ -11710,7 +11710,7 @@ FetchError.prototype.name = 'FetchError';
 
 let convert;
 try {
-	convert = (__nccwpck_require__(2877).convert);
+	convert = (__nccwpck_require__(3975).convert);
 } catch (e) {}
 
 const INTERNALS = Symbol('Body internals');
@@ -16967,7 +16967,7 @@ async function detectReactComponentInFile(filename) {
         owner: CONST_1.default.GITHUB_OWNER,
         repo: CONST_1.default.APP_REPO,
         path: filename,
-        ref: github.context.payload.pull_request?.head.ref,
+        ref: github.context.payload?.pull_request?.head.ref,
     };
     try {
         const { data } = await GithubUtils_1.default.octokit.repos.getContent(params);
@@ -17016,7 +17016,22 @@ const CONST = {
         STAGING_DEPLOY: 'StagingDeployCash',
         DEPLOY_BLOCKER: 'DeployBlockerCash',
         INTERNAL_QA: 'InternalQA',
+        HELP_WANTED: 'Help Wanted',
+        CP_STAGING: 'CP Staging',
     },
+    ACTIONS: {
+        CREATED: 'created',
+        EDIT: 'edited',
+    },
+    EVENTS: {
+        ISSUE_COMMENT: 'issue_comment',
+    },
+    OPENAI_ROLES: {
+        USER: 'user',
+        ASSISTANT: 'assistant',
+    },
+    PROPOSAL_KEYWORD: 'Proposal',
+    OPENAI_THREAD_COMPLETED: 'completed',
     DATE_FORMAT_STRING: 'yyyy-MM-dd',
     PULL_REQUEST_REGEX: new RegExp(`${GITHUB_BASE_URL_REGEX.source}/.*/.*/pull/([0-9]+).*`),
     ISSUE_REGEX: new RegExp(`${GITHUB_BASE_URL_REGEX.source}/.*/.*/issues/([0-9]+).*`),
@@ -17024,6 +17039,9 @@ const CONST = {
     POLL_RATE: 10000,
     APP_REPO_URL: `https://github.com/${GIT_CONST.GITHUB_OWNER}/${GIT_CONST.APP_REPO}`,
     APP_REPO_GIT_URL: `git@github.com:${GIT_CONST.GITHUB_OWNER}/${GIT_CONST.APP_REPO}.git`,
+    NO_ACTION: 'NO_ACTION',
+    OPENAI_POLL_RATE: 1500,
+    OPENAI_POLL_TIMEOUT: 90000,
 };
 exports["default"] = CONST;
 
@@ -17073,13 +17091,11 @@ const CONST_1 = __importDefault(__nccwpck_require__(9873));
 class GithubUtils {
     static internalOctokit;
     /**
-     * Initialize internal octokit
-     *
-     * @private
+     * Initialize internal octokit.
+     * NOTE: When using GithubUtils in CI, you don't need to call this manually.
      */
-    static initOctokit() {
+    static initOctokitWithToken(token) {
         const Octokit = utils_1.GitHub.plugin(plugin_throttling_1.throttling, plugin_paginate_rest_1.paginateRest);
-        const token = core.getInput('GITHUB_TOKEN', { required: true });
         // Save a copy of octokit used in this class
         this.internalOctokit = new Octokit((0, utils_1.getOctokitOptions)(token, {
             throttle: {
@@ -17099,6 +17115,15 @@ class GithubUtils {
             },
         }));
     }
+    /**
+     * Default initialize method assuming running in CI, getting the token from an input.
+     *
+     * @private
+     */
+    static initOctokit() {
+        const token = core.getInput('GITHUB_TOKEN', { required: true });
+        this.initOctokitWithToken(token);
+    }
     /**
      * Either give an existing instance of Octokit rest or create a new one
      *
@@ -17393,12 +17418,6 @@ class GithubUtils {
         })
             .then((response) => response.data.workflow_runs[0]?.id);
     }
-    /**
-     * Generate the well-formatted body of a production release.
-     */
-    static getReleaseBody(pullRequests) {
-        return pullRequests.map((number) => `- ${this.getPullRequestURLFromNumber(number)}`).join('\r\n');
-    }
     /**
      * Generate the URL of an New Expensify pull request given the PR number.
      */
@@ -17454,12 +17473,31 @@ class GithubUtils {
             .then((events) => events.filter((event) => event.event === 'closed'))
             .then((closedEvents) => closedEvents.at(-1)?.actor?.login ?? '');
     }
-    static getArtifactByName(artefactName) {
-        return this.paginate(this.octokit.actions.listArtifactsForRepo, {
+    /**
+     * Returns a single artifact by name. If none is found, it returns undefined.
+     */
+    static getArtifactByName(artifactName) {
+        return this.octokit.actions
+            .listArtifactsForRepo({
+            owner: CONST_1.default.GITHUB_OWNER,
+            repo: CONST_1.default.APP_REPO,
+            per_page: 1,
+            name: artifactName,
+        })
+            .then((response) => response.data.artifacts[0]);
+    }
+    /**
+     * Given an artifact ID, returns the download URL to a zip file containing the artifact.
+     */
+    static getArtifactDownloadURL(artifactId) {
+        return this.octokit.actions
+            .downloadArtifact({
             owner: CONST_1.default.GITHUB_OWNER,
             repo: CONST_1.default.APP_REPO,
-            per_page: 100,
-        }).then((artifacts) => artifacts.find((artifact) => artifact.name === artefactName));
+            artifact_id: artifactId,
+            archive_format: 'zip',
+        })
+            .then((response) => response.url);
     }
 }
 exports["default"] = GithubUtils;
@@ -17531,27 +17569,27 @@ exports["default"] = arrayDifference;
 
 /***/ }),
 
-/***/ 2877:
+/***/ 9491:
 /***/ ((module) => {
 
-module.exports = eval("require")("encoding");
-
+"use strict";
+module.exports = require("assert");
 
 /***/ }),
 
-/***/ 9491:
+/***/ 6113:
 /***/ ((module) => {
 
 "use strict";
-module.exports = require("assert");
+module.exports = require("crypto");
 
 /***/ }),
 
-/***/ 6113:
+/***/ 3975:
 /***/ ((module) => {
 
 "use strict";
-module.exports = require("crypto");
+module.exports = require("encoding");
 
 /***/ }),
 
@@ -17681,7 +17719,7 @@ exports["default"] = _default;
 var _highlight = __nccwpck_require__(7654);
 var _picocolors = _interopRequireWildcard(__nccwpck_require__(7023), true);
 function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function (e) { return e ? t : r; })(e); }
-function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != typeof e && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && Object.prototype.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
+function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != typeof e && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && {}.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
 const colors = typeof process === "object" && (process.env.FORCE_COLOR === "0" || process.env.FORCE_COLOR === "false") ? (0, _picocolors.createColors)(false) : _picocolors.default;
 const compose = (f, g) => v => f(g(v));
 let pcWithForcedColor = undefined;
@@ -20470,20 +20508,21 @@ function TaggedTemplateExpression(node) {
   this.print(node.typeParameters, node);
   this.print(node.quasi, node);
 }
-function TemplateElement(node, parent) {
-  const isFirst = parent.quasis[0] === node;
-  const isLast = parent.quasis[parent.quasis.length - 1] === node;
-  const value = (isFirst ? "`" : "}") + node.value.raw + (isLast ? "`" : "${");
-  this.token(value, true);
+function TemplateElement() {
+  throw new Error("TemplateElement printing is handled in TemplateLiteral");
 }
 function TemplateLiteral(node) {
   const quasis = node.quasis;
+  let partRaw = "`";
   for (let i = 0; i < quasis.length; i++) {
-    this.print(quasis[i], node);
+    partRaw += quasis[i].value.raw;
     if (i + 1 < quasis.length) {
+      this.token(partRaw + "${", true);
       this.print(node.expressions[i], node);
+      partRaw = "}";
     }
   }
+  this.token(partRaw + "`", true);
 }
 
 //# sourceMappingURL=template-literals.js.map
@@ -20598,14 +20637,16 @@ function RecordExpression(node) {
   const props = node.properties;
   let startToken;
   let endToken;
-  if (this.format.recordAndTupleSyntaxType === "bar") {
-    startToken = "{|";
-    endToken = "|}";
-  } else if (this.format.recordAndTupleSyntaxType !== "hash" && this.format.recordAndTupleSyntaxType != null) {
-    throw new Error(`The "recordAndTupleSyntaxType" generator option must be "bar" or "hash" (${JSON.stringify(this.format.recordAndTupleSyntaxType)} received).`);
-  } else {
-    startToken = "#{";
-    endToken = "}";
+  {
+    if (this.format.recordAndTupleSyntaxType === "bar") {
+      startToken = "{|";
+      endToken = "|}";
+    } else if (this.format.recordAndTupleSyntaxType !== "hash" && this.format.recordAndTupleSyntaxType != null) {
+      throw new Error(`The "recordAndTupleSyntaxType" generator option must be "bar" or "hash" (${JSON.stringify(this.format.recordAndTupleSyntaxType)} received).`);
+    } else {
+      startToken = "#{";
+      endToken = "}";
+    }
   }
   this.token(startToken);
   if (props.length) {
@@ -20623,14 +20664,16 @@ function TupleExpression(node) {
   const len = elems.length;
   let startToken;
   let endToken;
-  if (this.format.recordAndTupleSyntaxType === "bar") {
-    startToken = "[|";
-    endToken = "|]";
-  } else if (this.format.recordAndTupleSyntaxType === "hash") {
-    startToken = "#[";
-    endToken = "]";
-  } else {
-    throw new Error(`${this.format.recordAndTupleSyntaxType} is not a valid recordAndTuple syntax type`);
+  {
+    if (this.format.recordAndTupleSyntaxType === "bar") {
+      startToken = "[|";
+      endToken = "|]";
+    } else if (this.format.recordAndTupleSyntaxType === "hash") {
+      startToken = "#[";
+      endToken = "]";
+    } else {
+      throw new Error(`${this.format.recordAndTupleSyntaxType} is not a valid recordAndTuple syntax type`);
+    }
   }
   this.token(startToken);
   for (let i = 0; i < elems.length; i++) {
@@ -21120,7 +21163,8 @@ function TSMappedType(node) {
     nameType,
     optional,
     readonly,
-    typeParameter
+    typeParameter,
+    typeAnnotation
   } = node;
   this.tokenChar(123);
   this.space();
@@ -21146,9 +21190,11 @@ function TSMappedType(node) {
     tokenIfPlusMinus(this, optional);
     this.tokenChar(63);
   }
-  this.tokenChar(58);
-  this.space();
-  this.print(node.typeAnnotation, node);
+  if (typeAnnotation) {
+    this.tokenChar(58);
+    this.space();
+    this.print(typeAnnotation, node);
+  }
   this.space();
   this.tokenChar(125);
 }
@@ -21428,7 +21474,6 @@ exports["default"] = generate;
 var _sourceMap = __nccwpck_require__(6280);
 var _printer = __nccwpck_require__(5637);
 function normalizeOptions(code, opts) {
-  var _opts$recordAndTupleS;
   const format = {
     auxiliaryCommentBefore: opts.auxiliaryCommentBefore,
     auxiliaryCommentAfter: opts.auxiliaryCommentAfter,
@@ -21448,13 +21493,14 @@ function normalizeOptions(code, opts) {
       wrap: true,
       minimal: false
     }, opts.jsescOption),
-    recordAndTupleSyntaxType: (_opts$recordAndTupleS = opts.recordAndTupleSyntaxType) != null ? _opts$recordAndTupleS : "hash",
     topicToken: opts.topicToken,
     importAttributesKeyword: opts.importAttributesKeyword
   };
   {
+    var _opts$recordAndTupleS;
     format.decoratorsBeforeExport = opts.decoratorsBeforeExport;
     format.jsescOption.json = opts.jsonCompatibleStrings;
+    format.recordAndTupleSyntaxType = (_opts$recordAndTupleS = opts.recordAndTupleSyntaxType) != null ? _opts$recordAndTupleS : "hash";
   }
   if (format.minified) {
     format.compact = true;
@@ -22309,7 +22355,7 @@ class Printer {
     }
     this._printStack.push(node);
     const oldInAux = this._insideAux;
-    this._insideAux = node.loc == undefined;
+    this._insideAux = node.loc == null;
     this._maybeAddAuxComment(this._insideAux && !oldInAux);
     const parenthesized = (_node$extra = node.extra) == null ? void 0 : _node$extra.parenthesized;
     let shouldPrintParens = forceParens || parenthesized && format.retainFunctionParens && nodeType === "FunctionExpression" || needsParens(node, parent, this._printStack);
@@ -22602,7 +22648,7 @@ class Printer {
         if (type === 0) {
           let offset = 0;
           if (i === 0) {
-            if (this._buf.hasContent() && (comment.type === "CommentLine" || commentStartLine != commentEndLine)) {
+            if (this._buf.hasContent() && (comment.type === "CommentLine" || commentStartLine !== commentEndLine)) {
               offset = leadingCommentNewline = 1;
             }
           } else {
@@ -22819,8 +22865,7 @@ const visitor = {
     requeueComputedKeyAndDecorators(path);
   }
 };
-var _default = visitor;
-exports["default"] = _default;
+var _default = exports["default"] = visitor;
 
 //# sourceMappingURL=index.js.map
 
@@ -23634,7 +23679,7 @@ var _jsTokens = __nccwpck_require__(1531);
 var _helperValidatorIdentifier = __nccwpck_require__(2738);
 var _picocolors = _interopRequireWildcard(__nccwpck_require__(7023), true);
 function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function (e) { return e ? t : r; })(e); }
-function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != typeof e && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && Object.prototype.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
+function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != typeof e && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && {}.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
 const colors = typeof process === "object" && (process.env.FORCE_COLOR === "0" || process.env.FORCE_COLOR === "false") ? (0, _picocolors.createColors)(false) : _picocolors.default;
 const compose = (f, g) => v => f(g(v));
 const sometimesKeywords = new Set(["as", "async", "from", "get", "of", "set"]);
@@ -23661,7 +23706,7 @@ let tokenize;
       if ((0, _helperValidatorIdentifier.isKeyword)(token.value) || (0, _helperValidatorIdentifier.isStrictReservedWord)(token.value, true) || sometimesKeywords.has(token.value)) {
         return "keyword";
       }
-      if (JSX_TAG.test(token.value) && (text[offset - 1] === "<" || text.slice(offset - 2, offset) == "</")) {
+      if (JSX_TAG.test(token.value) && (text[offset - 1] === "<" || text.slice(offset - 2, offset) === "</")) {
         return "jsxIdentifier";
       }
       if (token.value[0] !== token.value[0].toLowerCase()) {
@@ -23831,10 +23876,7 @@ const NodeDescriptions = {
   VariableDeclarator: "variable declaration",
   YieldExpression: "yield expression"
 };
-const toNodeDescription = ({
-  type,
-  prefix
-}) => type === "UpdateExpression" ? NodeDescriptions.UpdateExpression[String(prefix)] : NodeDescriptions[type];
+const toNodeDescription = node => node.type === "UpdateExpression" ? NodeDescriptions.UpdateExpression[`${node.prefix}`] : NodeDescriptions[node.type];
 var StandardErrors = {
   AccessorIsGenerator: ({
     kind
@@ -24045,6 +24087,7 @@ var StandardErrors = {
   UnterminatedRegExp: "Unterminated regular expression.",
   UnterminatedString: "Unterminated string constant.",
   UnterminatedTemplate: "Unterminated template.",
+  UsingDeclarationExport: "Using declaration cannot be exported.",
   UsingDeclarationHasBindingPattern: "Using declaration cannot have destructuring patterns.",
   VarRedeclaration: ({
     identifierName
@@ -24334,6 +24377,10 @@ var estree = superClass => class ESTreeParserMixin extends superClass {
     }
     return this.finishNode(node, "MethodDefinition");
   }
+  nameIsConstructor(key) {
+    if (key.type === "Literal") return key.value === "constructor";
+    return super.nameIsConstructor(key);
+  }
   parseClassProperty(...args) {
     const propertyNode = super.parseClassProperty(...args);
     {
@@ -24398,9 +24445,9 @@ var estree = superClass => class ESTreeParserMixin extends superClass {
     }
   }
   toAssignableObjectExpressionProp(prop, isLast, isLHS) {
-    if (prop.kind === "get" || prop.kind === "set") {
+    if (prop.type === "Property" && (prop.kind === "get" || prop.kind === "set")) {
       this.raise(Errors.PatternHasAccessor, prop.key);
-    } else if (prop.method) {
+    } else if (prop.type === "Property" && prop.method) {
       this.raise(Errors.PatternHasMethod, prop.key);
     } else {
       super.toAssignableObjectExpressionProp(prop, isLast, isLHS);
@@ -24412,9 +24459,9 @@ var estree = superClass => class ESTreeParserMixin extends superClass {
       node.type = "ImportExpression";
       node.source = node.arguments[0];
       if (this.hasPlugin("importAttributes") || this.hasPlugin("importAssertions")) {
-        var _node$arguments$, _node$arguments$2;
-        node.options = (_node$arguments$ = node.arguments[1]) != null ? _node$arguments$ : null;
-        node.attributes = (_node$arguments$2 = node.arguments[1]) != null ? _node$arguments$2 : null;
+        var _ref, _ref2;
+        node.options = (_ref = node.arguments[1]) != null ? _ref : null;
+        node.attributes = (_ref2 = node.arguments[1]) != null ? _ref2 : null;
       }
       delete node.arguments;
       delete node.callee;
@@ -24486,7 +24533,7 @@ var estree = superClass => class ESTreeParserMixin extends superClass {
     return node.type === "Property" && node.kind === "init" && !node.method;
   }
   isObjectMethod(node) {
-    return node.method || node.kind === "get" || node.kind === "set";
+    return node.type === "Property" && (node.method || node.kind === "get" || node.kind === "set");
   }
   finishNodeAt(node, type, endLoc) {
     return toESTreeLocation(super.finishNodeAt(node, type, endLoc));
@@ -25389,7 +25436,9 @@ class CommentsParser extends BaseParser {
     const {
       commentsLen
     } = this.state;
-    if (this.comments.length != commentsLen) this.comments.length = commentsLen;
+    if (this.comments.length !== commentsLen) {
+      this.comments.length = commentsLen;
+    }
     this.comments.push(comment);
     this.state.commentsLen++;
   }
@@ -25611,12 +25660,8 @@ class State {
   get strict() {
     return (this.flags & 1) > 0;
   }
-  set strict(value) {
-    if (value) {
-      this.flags |= 1;
-    } else {
-      this.flags &= ~1;
-    }
+  set strict(v) {
+    if (v) this.flags |= 1;else this.flags &= -2;
   }
   init({
     strictMode,
@@ -25632,112 +25677,68 @@ class State {
   get maybeInArrowParameters() {
     return (this.flags & 2) > 0;
   }
-  set maybeInArrowParameters(value) {
-    if (value) {
-      this.flags |= 2;
-    } else {
-      this.flags &= ~2;
-    }
+  set maybeInArrowParameters(v) {
+    if (v) this.flags |= 2;else this.flags &= -3;
   }
   get inType() {
     return (this.flags & 4) > 0;
   }
-  set inType(value) {
-    if (value) {
-      this.flags |= 4;
-    } else {
-      this.flags &= ~4;
-    }
+  set inType(v) {
+    if (v) this.flags |= 4;else this.flags &= -5;
   }
   get noAnonFunctionType() {
     return (this.flags & 8) > 0;
   }
-  set noAnonFunctionType(value) {
-    if (value) {
-      this.flags |= 8;
-    } else {
-      this.flags &= ~8;
-    }
+  set noAnonFunctionType(v) {
+    if (v) this.flags |= 8;else this.flags &= -9;
   }
   get hasFlowComment() {
     return (this.flags & 16) > 0;
   }
-  set hasFlowComment(value) {
-    if (value) {
-      this.flags |= 16;
-    } else {
-      this.flags &= ~16;
-    }
+  set hasFlowComment(v) {
+    if (v) this.flags |= 16;else this.flags &= -17;
   }
   get isAmbientContext() {
     return (this.flags & 32) > 0;
   }
-  set isAmbientContext(value) {
-    if (value) {
-      this.flags |= 32;
-    } else {
-      this.flags &= ~32;
-    }
+  set isAmbientContext(v) {
+    if (v) this.flags |= 32;else this.flags &= -33;
   }
   get inAbstractClass() {
     return (this.flags & 64) > 0;
   }
-  set inAbstractClass(value) {
-    if (value) {
-      this.flags |= 64;
-    } else {
-      this.flags &= ~64;
-    }
+  set inAbstractClass(v) {
+    if (v) this.flags |= 64;else this.flags &= -65;
   }
   get inDisallowConditionalTypesContext() {
     return (this.flags & 128) > 0;
   }
-  set inDisallowConditionalTypesContext(value) {
-    if (value) {
-      this.flags |= 128;
-    } else {
-      this.flags &= ~128;
-    }
+  set inDisallowConditionalTypesContext(v) {
+    if (v) this.flags |= 128;else this.flags &= -129;
   }
   get soloAwait() {
     return (this.flags & 256) > 0;
   }
-  set soloAwait(value) {
-    if (value) {
-      this.flags |= 256;
-    } else {
-      this.flags &= ~256;
-    }
+  set soloAwait(v) {
+    if (v) this.flags |= 256;else this.flags &= -257;
   }
   get inFSharpPipelineDirectBody() {
     return (this.flags & 512) > 0;
   }
-  set inFSharpPipelineDirectBody(value) {
-    if (value) {
-      this.flags |= 512;
-    } else {
-      this.flags &= ~512;
-    }
+  set inFSharpPipelineDirectBody(v) {
+    if (v) this.flags |= 512;else this.flags &= -513;
   }
   get canStartJSXElement() {
     return (this.flags & 1024) > 0;
   }
-  set canStartJSXElement(value) {
-    if (value) {
-      this.flags |= 1024;
-    } else {
-      this.flags &= ~1024;
-    }
+  set canStartJSXElement(v) {
+    if (v) this.flags |= 1024;else this.flags &= -1025;
   }
   get containsEsc() {
     return (this.flags & 2048) > 0;
   }
-  set containsEsc(value) {
-    if (value) {
-      this.flags |= 2048;
-    } else {
-      this.flags &= ~2048;
-    }
+  set containsEsc(v) {
+    if (v) this.flags |= 2048;else this.flags &= -2049;
   }
   curPosition() {
     return new Position(this.curLine, this.pos - this.lineStart, this.pos);
@@ -28563,50 +28564,56 @@ var flow = superClass => class FlowParserMixin extends superClass {
         this.state.noAnonFunctionType = oldNoAnonFunctionType;
         return type;
       case 47:
-        node.typeParameters = this.flowParseTypeParameterDeclaration();
-        this.expect(10);
-        tmp = this.flowParseFunctionTypeParams();
-        node.params = tmp.params;
-        node.rest = tmp.rest;
-        node.this = tmp._this;
-        this.expect(11);
-        this.expect(19);
-        node.returnType = this.flowParseType();
-        return this.finishNode(node, "FunctionTypeAnnotation");
+        {
+          const node = this.startNode();
+          node.typeParameters = this.flowParseTypeParameterDeclaration();
+          this.expect(10);
+          tmp = this.flowParseFunctionTypeParams();
+          node.params = tmp.params;
+          node.rest = tmp.rest;
+          node.this = tmp._this;
+          this.expect(11);
+          this.expect(19);
+          node.returnType = this.flowParseType();
+          return this.finishNode(node, "FunctionTypeAnnotation");
+        }
       case 10:
-        this.next();
-        if (!this.match(11) && !this.match(21)) {
-          if (tokenIsIdentifier(this.state.type) || this.match(78)) {
-            const token = this.lookahead().type;
-            isGroupedType = token !== 17 && token !== 14;
-          } else {
-            isGroupedType = true;
+        {
+          const node = this.startNode();
+          this.next();
+          if (!this.match(11) && !this.match(21)) {
+            if (tokenIsIdentifier(this.state.type) || this.match(78)) {
+              const token = this.lookahead().type;
+              isGroupedType = token !== 17 && token !== 14;
+            } else {
+              isGroupedType = true;
+            }
           }
-        }
-        if (isGroupedType) {
-          this.state.noAnonFunctionType = false;
-          type = this.flowParseType();
-          this.state.noAnonFunctionType = oldNoAnonFunctionType;
-          if (this.state.noAnonFunctionType || !(this.match(12) || this.match(11) && this.lookahead().type === 19)) {
-            this.expect(11);
-            return type;
+          if (isGroupedType) {
+            this.state.noAnonFunctionType = false;
+            type = this.flowParseType();
+            this.state.noAnonFunctionType = oldNoAnonFunctionType;
+            if (this.state.noAnonFunctionType || !(this.match(12) || this.match(11) && this.lookahead().type === 19)) {
+              this.expect(11);
+              return type;
+            } else {
+              this.eat(12);
+            }
+          }
+          if (type) {
+            tmp = this.flowParseFunctionTypeParams([this.reinterpretTypeAsFunctionTypeParam(type)]);
           } else {
-            this.eat(12);
+            tmp = this.flowParseFunctionTypeParams();
           }
+          node.params = tmp.params;
+          node.rest = tmp.rest;
+          node.this = tmp._this;
+          this.expect(11);
+          this.expect(19);
+          node.returnType = this.flowParseType();
+          node.typeParameters = null;
+          return this.finishNode(node, "FunctionTypeAnnotation");
         }
-        if (type) {
-          tmp = this.flowParseFunctionTypeParams([this.reinterpretTypeAsFunctionTypeParam(type)]);
-        } else {
-          tmp = this.flowParseFunctionTypeParams();
-        }
-        node.params = tmp.params;
-        node.rest = tmp.rest;
-        node.this = tmp._this;
-        this.expect(11);
-        this.expect(19);
-        node.returnType = this.flowParseType();
-        node.typeParameters = null;
-        return this.finishNode(node, "FunctionTypeAnnotation");
       case 133:
         return this.parseLiteral(this.state.value, "StringLiteralTypeAnnotation");
       case 85:
@@ -28922,7 +28929,7 @@ var flow = superClass => class FlowParserMixin extends superClass {
     const arrows = [];
     while (stack.length !== 0) {
       const node = stack.pop();
-      if (node.type === "ArrowFunctionExpression") {
+      if (node.type === "ArrowFunctionExpression" && node.body.type !== "BlockStatement") {
         if (node.typeParameters || !node.returnType) {
           this.finishArrowValidation(node);
         } else {
@@ -28959,18 +28966,18 @@ var flow = superClass => class FlowParserMixin extends superClass {
     return result;
   }
   parseParenItem(node, startLoc) {
-    node = super.parseParenItem(node, startLoc);
+    const newNode = super.parseParenItem(node, startLoc);
     if (this.eat(17)) {
-      node.optional = true;
+      newNode.optional = true;
       this.resetEndLocation(node);
     }
     if (this.match(14)) {
       const typeCastNode = this.startNodeAt(startLoc);
-      typeCastNode.expression = node;
+      typeCastNode.expression = newNode;
       typeCastNode.typeAnnotation = this.flowParseTypeAnnotation();
       return this.finishNode(typeCastNode, "TypeCastExpression");
     }
-    return node;
+    return newNode;
   }
   assertModuleNodeAllowed(node) {
     if (node.type === "ImportDeclaration" && (node.importKind === "type" || node.importKind === "typeof") || node.type === "ExportNamedDeclaration" && node.exportKind === "type" || node.type === "ExportAllDeclaration" && node.exportKind === "type") {
@@ -30343,7 +30350,7 @@ var jsx = superClass => class JSXParserMixin extends superClass {
     } else {
       let count = 0;
       let semi = false;
-      while (count++ < 10 && this.state.pos < this.length && !(semi = this.codePointAtPos(this.state.pos) == 59)) {
+      while (count++ < 10 && this.state.pos < this.length && !(semi = this.codePointAtPos(this.state.pos) === 59)) {
         ++this.state.pos;
       }
       if (semi) {
@@ -30505,7 +30512,7 @@ var jsx = superClass => class JSXParserMixin extends superClass {
             children.push(this.jsxParseElementAt(startLoc));
             break;
           case 141:
-            children.push(this.parseExprAtom());
+            children.push(this.parseLiteral(this.state.value, "JSXText"));
             break;
           case 5:
             {
@@ -30562,9 +30569,7 @@ var jsx = superClass => class JSXParserMixin extends superClass {
     context[context.length - 1] = newContext;
   }
   parseExprAtom(refExpressionErrors) {
-    if (this.match(141)) {
-      return this.parseLiteral(this.state.value, "JSXText");
-    } else if (this.match(142)) {
+    if (this.match(142)) {
       return this.jsxParseElement();
     } else if (this.match(47) && this.input.charCodeAt(this.state.pos) !== 33) {
       this.replaceToken(142);
@@ -30645,14 +30650,14 @@ class TypeScriptScopeHandler extends ScopeHandler {
     return new TypeScriptScope(flags);
   }
   enter(flags) {
-    if (flags == 256) {
+    if (flags === 256) {
       this.importsStack.push(new Set());
     }
     super.enter(flags);
   }
   exit() {
     const flags = super.exit();
-    if (flags == 256) {
+    if (flags === 256) {
       this.importsStack.pop();
     }
     return flags;
@@ -30961,14 +30966,15 @@ class LValParser extends NodeUtils {
     return this.finishNode(prop, "RestElement");
   }
   parseBindingProperty() {
-    const prop = this.startNode();
     const {
       type,
       startLoc
     } = this.state;
     if (type === 21) {
-      return this.parseBindingRestProperty(prop);
-    } else if (type === 138) {
+      return this.parseBindingRestProperty(this.startNode());
+    }
+    const prop = this.startNode();
+    if (type === 138) {
       this.expectPlugin("destructuringPrivate", startLoc);
       this.classScope.usePrivateName(this.state.value, startLoc);
       prop.key = this.parsePrivateName();
@@ -32818,13 +32824,14 @@ var typescript = superClass => class TypeScriptParserMixin extends superClass {
   parseExport(node, decorators) {
     if (this.match(83)) {
       this.next();
+      const nodeImportEquals = node;
       let maybeDefaultIdentifier = null;
       if (this.isContextual(130) && this.isPotentialImportPhase(false)) {
-        maybeDefaultIdentifier = this.parseMaybeImportPhase(node, false);
+        maybeDefaultIdentifier = this.parseMaybeImportPhase(nodeImportEquals, false);
       } else {
-        node.importKind = "value";
+        nodeImportEquals.importKind = "value";
       }
-      return this.tsParseImportEqualsDeclaration(node, maybeDefaultIdentifier, true);
+      return this.tsParseImportEqualsDeclaration(nodeImportEquals, maybeDefaultIdentifier, true);
     } else if (this.eat(29)) {
       const assign = node;
       assign.expression = super.parseExpression();
@@ -32996,9 +33003,9 @@ var typescript = superClass => class TypeScriptParserMixin extends superClass {
     return result.node;
   }
   parseParenItem(node, startLoc) {
-    node = super.parseParenItem(node, startLoc);
+    const newNode = super.parseParenItem(node, startLoc);
     if (this.eat(17)) {
-      node.optional = true;
+      newNode.optional = true;
       this.resetEndLocation(node);
     }
     if (this.match(14)) {
@@ -33107,7 +33114,9 @@ var typescript = superClass => class TypeScriptParserMixin extends superClass {
   }
   declareClassPrivateMethodInScope(node, kind) {
     if (node.type === "TSDeclareMethod") return;
-    if (node.type === "MethodDefinition" && !node.value.body) return;
+    if (node.type === "MethodDefinition" && !hasOwnProperty.call(node.value, "body")) {
+      return;
+    }
     super.declareClassPrivateMethodInScope(node, kind);
   }
   parseClassSuper(node) {
@@ -33306,6 +33315,7 @@ var typescript = superClass => class TypeScriptParserMixin extends superClass {
       TSTypeCastExpression: true,
       TSParameterProperty: "parameter",
       TSNonNullExpression: "expression",
+      TSInstantiationExpression: "expression",
       TSAsExpression: (binding !== 64 || !isUnparenthesizedInAssign) && ["expression", true],
       TSSatisfiesExpression: (binding !== 64 || !isUnparenthesizedInAssign) && ["expression", true],
       TSTypeAssertion: (binding !== 64 || !isUnparenthesizedInAssign) && ["expression", true]
@@ -33659,9 +33669,12 @@ var placeholders = superClass => class PlaceholdersParserMixin extends superClas
     }
   }
   finishPlaceholder(node, expectedNode) {
-    const isFinished = !!(node.expectedNode && node.type === "Placeholder");
-    node.expectedNode = expectedNode;
-    return isFinished ? node : this.finishNode(node, "Placeholder");
+    let placeholder = node;
+    if (!placeholder.expectedNode || !placeholder.type) {
+      placeholder = this.finishNode(placeholder, "Placeholder");
+    }
+    placeholder.expectedNode = expectedNode;
+    return placeholder;
   }
   getTokenFromCode(code) {
     if (code === 37 && this.input.charCodeAt(this.state.pos + 1) === 37) {
@@ -33721,8 +33734,9 @@ var placeholders = superClass => class PlaceholdersParserMixin extends superClas
       return this.finishNode(stmt, "LabeledStatement");
     }
     this.semicolon();
-    node.name = expr.name;
-    return this.finishPlaceholder(node, "Statement");
+    const stmtPlaceholder = node;
+    stmtPlaceholder.name = expr.name;
+    return this.finishPlaceholder(stmtPlaceholder, "Statement");
   }
   parseBlock(allowDirectives, createNewLexicalScope, afterBlockParse) {
     return this.parsePlaceholder("BlockStatement") || super.parseBlock(allowDirectives, createNewLexicalScope, afterBlockParse);
@@ -33755,17 +33769,18 @@ var placeholders = superClass => class PlaceholdersParserMixin extends superClas
   parseExport(node, decorators) {
     const placeholder = this.parsePlaceholder("Identifier");
     if (!placeholder) return super.parseExport(node, decorators);
+    const node2 = node;
     if (!this.isContextual(98) && !this.match(12)) {
-      node.specifiers = [];
-      node.source = null;
-      node.declaration = this.finishPlaceholder(placeholder, "Declaration");
-      return this.finishNode(node, "ExportNamedDeclaration");
+      node2.specifiers = [];
+      node2.source = null;
+      node2.declaration = this.finishPlaceholder(placeholder, "Declaration");
+      return this.finishNode(node2, "ExportNamedDeclaration");
     }
     this.expectPlugin("exportDefaultFrom");
     const specifier = this.startNode();
     specifier.exported = placeholder;
-    node.specifiers = [this.finishNode(specifier, "ExportDefaultSpecifier")];
-    return super.parseExport(node, decorators);
+    node2.specifiers = [this.finishNode(specifier, "ExportDefaultSpecifier")];
+    return super.parseExport(node2, decorators);
   }
   isExportDefaultSpecifier() {
     if (this.match(65)) {
@@ -33882,7 +33897,6 @@ function getPluginOption(plugins, name, option) {
 }
 const PIPELINE_PROPOSALS = ["minimal", "fsharp", "hack", "smart"];
 const TOPIC_TOKENS = ["^^", "@@", "^", "%", "#"];
-const RECORD_AND_TUPLE_SYNTAX_TYPES = ["hash", "bar"];
 function validatePlugins(plugins) {
   if (hasPlugin(plugins, "decorators")) {
     if (hasPlugin(plugins, "decorators-legacy")) {
@@ -33909,9 +33923,10 @@ function validatePlugins(plugins) {
       const proposalList = PIPELINE_PROPOSALS.map(p => `"${p}"`).join(", ");
       throw new Error(`"pipelineOperator" requires "proposal" option whose value must be one of: ${proposalList}.`);
     }
-    const tupleSyntaxIsHash = hasPlugin(plugins, ["recordAndTuple", {
+    const recordAndTupleConfigItem = ["recordAndTuple", {
       syntaxType: "hash"
-    }]);
+    }];
+    const tupleSyntaxIsHash = hasPlugin(plugins, recordAndTupleConfigItem);
     if (proposal === "hack") {
       if (hasPlugin(plugins, "placeholders")) {
         throw new Error("Cannot combine placeholders plugin and Hack-style pipes.");
@@ -33925,10 +33940,10 @@ function validatePlugins(plugins) {
         throw new Error(`"pipelineOperator" in "proposal": "hack" mode also requires a "topicToken" option whose value must be one of: ${tokenList}.`);
       }
       if (topicToken === "#" && tupleSyntaxIsHash) {
-        throw new Error('Plugin conflict between `["pipelineOperator", { proposal: "hack", topicToken: "#" }]` and `["recordAndtuple", { syntaxType: "hash"}]`.');
+        throw new Error(`Plugin conflict between \`["pipelineOperator", { proposal: "hack", topicToken: "#" }]\` and \`${JSON.stringify(recordAndTupleConfigItem)}\`.`);
       }
     } else if (proposal === "smart" && tupleSyntaxIsHash) {
-      throw new Error('Plugin conflict between `["pipelineOperator", { proposal: "smart" }]` and `["recordAndtuple", { syntaxType: "hash"}]`.');
+      throw new Error(`Plugin conflict between \`["pipelineOperator", { proposal: "smart" }]\` and \`${JSON.stringify(recordAndTupleConfigItem)}\`.`);
     }
   }
   if (hasPlugin(plugins, "moduleAttributes")) {
@@ -33945,8 +33960,16 @@ function validatePlugins(plugins) {
   if (hasPlugin(plugins, "importAssertions") && hasPlugin(plugins, "importAttributes")) {
     throw new Error("Cannot combine importAssertions and importAttributes plugins.");
   }
-  if (hasPlugin(plugins, "recordAndTuple") && getPluginOption(plugins, "recordAndTuple", "syntaxType") != null && !RECORD_AND_TUPLE_SYNTAX_TYPES.includes(getPluginOption(plugins, "recordAndTuple", "syntaxType"))) {
-    throw new Error("The 'syntaxType' option of the 'recordAndTuple' plugin must be one of: " + RECORD_AND_TUPLE_SYNTAX_TYPES.map(p => `'${p}'`).join(", "));
+  if (hasPlugin(plugins, "recordAndTuple")) {
+    const syntaxType = getPluginOption(plugins, "recordAndTuple", "syntaxType");
+    if (syntaxType != null) {
+      {
+        const RECORD_AND_TUPLE_SYNTAX_TYPES = ["hash", "bar"];
+        if (!RECORD_AND_TUPLE_SYNTAX_TYPES.includes(syntaxType)) {
+          throw new Error("The 'syntaxType' option of the 'recordAndTuple' plugin must be one of: " + RECORD_AND_TUPLE_SYNTAX_TYPES.map(p => `'${p}'`).join(", "));
+        }
+      }
+    }
   }
   if (hasPlugin(plugins, "asyncDoExpressions") && !hasPlugin(plugins, "doExpressions")) {
     const error = new Error("'asyncDoExpressions' requires 'doExpressions', please add 'doExpressions' to parser plugins.");
@@ -35065,14 +35088,16 @@ class ExpressionParser extends LValParser {
   }
   parseTemplate(isTagged) {
     const node = this.startNode();
-    node.expressions = [];
     let curElt = this.parseTemplateElement(isTagged);
-    node.quasis = [curElt];
+    const quasis = [curElt];
+    const substitutions = [];
     while (!curElt.tail) {
-      node.expressions.push(this.parseTemplateSubstitution());
+      substitutions.push(this.parseTemplateSubstitution());
       this.readTemplateContinuation();
-      node.quasis.push(curElt = this.parseTemplateElement(isTagged));
+      quasis.push(curElt = this.parseTemplateElement(isTagged));
     }
+    node.expressions = substitutions;
+    node.quasis = quasis;
     return this.finishNode(node, "TemplateLiteral");
   }
   parseTemplateSubstitution() {
@@ -35109,8 +35134,10 @@ class ExpressionParser extends LValParser {
       if (isRecord && !this.isObjectProperty(prop) && prop.type !== "SpreadElement") {
         this.raise(Errors.InvalidRecordProperty, prop);
       }
-      if (prop.shorthand) {
-        this.addExtra(prop, "shorthand", true);
+      {
+        if (prop.shorthand) {
+          this.addExtra(prop, "shorthand", true);
+        }
       }
       node.properties.push(prop);
     }
@@ -35160,8 +35187,11 @@ class ExpressionParser extends LValParser {
     let isGenerator = this.eat(55);
     this.parsePropertyNamePrefixOperator(prop);
     const containsEsc = this.state.containsEsc;
-    const key = this.parsePropertyName(prop, refExpressionErrors);
+    this.parsePropertyName(prop, refExpressionErrors);
     if (!isGenerator && !containsEsc && this.maybeAsyncOrAccessorProp(prop)) {
+      const {
+        key
+      } = prop;
       const keyName = key.name;
       if (keyName === "async" && !this.hasPrecedingLineBreak()) {
         isAsync = true;
@@ -35296,7 +35326,6 @@ class ExpressionParser extends LValParser {
         prop.computed = false;
       }
     }
-    return prop.key;
   }
   initFunction(node, isAsync) {
     node.id = null;
@@ -36619,9 +36648,9 @@ class StatementParser extends ExpressionParser {
           this.raise(Errors.DeclarationMissingInitializer, this.state.lastTokEndLoc, {
             kind: "destructuring"
           });
-        } else if (kind === "const" && !(this.match(58) || this.isContextual(102))) {
+        } else if ((kind === "const" || kind === "using" || kind === "await using") && !(this.match(58) || this.isContextual(102))) {
           this.raise(Errors.DeclarationMissingInitializer, this.state.lastTokEndLoc, {
-            kind: "const"
+            kind
           });
         }
       }
@@ -36706,8 +36735,11 @@ class StatementParser extends ExpressionParser {
   isClassMethod() {
     return this.match(10);
   }
+  nameIsConstructor(key) {
+    return key.type === "Identifier" && key.name === "constructor" || key.type === "StringLiteral" && key.value === "constructor";
+  }
   isNonstaticConstructor(method) {
-    return !method.computed && !method.static && (method.key.name === "constructor" || method.key.value === "constructor");
+    return !method.computed && !method.static && this.nameIsConstructor(method.key);
   }
   parseClassBody(hadSuperClass, oldStrict) {
     this.classScope.enter();
@@ -36809,9 +36841,10 @@ class StatementParser extends ExpressionParser {
       this.pushClassMethod(classBody, publicMethod, true, false, false, false);
       return;
     }
-    const isContextual = tokenIsIdentifier(this.state.type) && !this.state.containsEsc;
-    const isPrivate = this.match(138);
+    const isContextual = !this.state.containsEsc && tokenIsIdentifier(this.state.type);
     const key = this.parseClassElementName(member);
+    const maybeContextualKw = isContextual ? key.name : null;
+    const isPrivate = this.isPrivateName(key);
     const maybeQuestionTokenStartLoc = this.state.startLoc;
     this.parsePostMemberNameModifiers(publicMember);
     if (this.isClassMethod()) {
@@ -36840,7 +36873,7 @@ class StatementParser extends ExpressionParser {
       } else {
         this.pushClassProperty(classBody, publicProp);
       }
-    } else if (isContextual && key.name === "async" && !this.isLineTerminator()) {
+    } else if (maybeContextualKw === "async" && !this.isLineTerminator()) {
       this.resetPreviousNodeTrailingComments(key);
       const isGenerator = this.eat(55);
       if (publicMember.optional) {
@@ -36858,9 +36891,9 @@ class StatementParser extends ExpressionParser {
         }
         this.pushClassMethod(classBody, publicMethod, isGenerator, true, false, false);
       }
-    } else if (isContextual && (key.name === "get" || key.name === "set") && !(this.match(55) && this.isLineTerminator())) {
+    } else if ((maybeContextualKw === "get" || maybeContextualKw === "set") && !(this.match(55) && this.isLineTerminator())) {
       this.resetPreviousNodeTrailingComments(key);
-      method.kind = key.name;
+      method.kind = maybeContextualKw;
       const isPrivate = this.match(138);
       this.parseClassElementName(publicMethod);
       if (isPrivate) {
@@ -36872,7 +36905,7 @@ class StatementParser extends ExpressionParser {
         this.pushClassMethod(classBody, publicMethod, false, false, false, false);
       }
       this.checkGetterSetterParams(publicMethod);
-    } else if (isContextual && key.name === "accessor" && !this.isLineTerminator()) {
+    } else if (maybeContextualKw === "accessor" && !this.isLineTerminator()) {
       this.expectPlugin("decoratorAutoAccessors");
       this.resetPreviousNodeTrailingComments(key);
       const isPrivate = this.match(138);
@@ -36904,7 +36937,8 @@ class StatementParser extends ExpressionParser {
       member.key = key;
       return key;
     }
-    return this.parsePropertyName(member);
+    this.parsePropertyName(member);
+    return member.key;
   }
   parseClassStaticBlock(classBody, member) {
     var _member$decorators;
@@ -36923,7 +36957,7 @@ class StatementParser extends ExpressionParser {
     }
   }
   pushClassProperty(classBody, prop) {
-    if (!prop.computed && (prop.key.name === "constructor" || prop.key.value === "constructor")) {
+    if (!prop.computed && this.nameIsConstructor(prop.key)) {
       this.raise(Errors.ConstructorClassField, prop.key);
     }
     classBody.body.push(this.parseClassProperty(prop));
@@ -36934,11 +36968,8 @@ class StatementParser extends ExpressionParser {
     this.classScope.declarePrivateName(this.getPrivateNameSV(node.key), 0, node.key.loc.start);
   }
   pushClassAccessorProperty(classBody, prop, isPrivate) {
-    if (!isPrivate && !prop.computed) {
-      const key = prop.key;
-      if (key.name === "constructor" || key.value === "constructor") {
-        this.raise(Errors.ConstructorClassField, key);
-      }
+    if (!isPrivate && !prop.computed && this.nameIsConstructor(prop.key)) {
+      this.raise(Errors.ConstructorClassField, prop.key);
     }
     const node = this.parseClassAccessorProperty(prop);
     classBody.body.push(node);
@@ -37074,7 +37105,8 @@ class StatementParser extends ExpressionParser {
   }
   maybeParseExportNamespaceSpecifier(node) {
     if (this.isContextual(93)) {
-      if (!node.specifiers) node.specifiers = [];
+      var _ref, _ref$specifiers;
+      (_ref$specifiers = (_ref = node).specifiers) != null ? _ref$specifiers : _ref.specifiers = [];
       const specifier = this.startNodeAt(this.state.lastTokStartLoc);
       this.next();
       specifier.exported = this.parseModuleExportName();
@@ -37085,13 +37117,14 @@ class StatementParser extends ExpressionParser {
   }
   maybeParseExportNamedSpecifiers(node) {
     if (this.match(5)) {
-      if (!node.specifiers) node.specifiers = [];
-      const isTypeExport = node.exportKind === "type";
-      node.specifiers.push(...this.parseExportSpecifiers(isTypeExport));
-      node.source = null;
-      node.declaration = null;
+      const node2 = node;
+      if (!node2.specifiers) node2.specifiers = [];
+      const isTypeExport = node2.exportKind === "type";
+      node2.specifiers.push(...this.parseExportSpecifiers(isTypeExport));
+      node2.source = null;
+      node2.declaration = null;
       if (this.hasPlugin("importAssertions")) {
-        node.assertions = [];
+        node2.assertions = [];
       }
       return true;
     }
@@ -37202,6 +37235,14 @@ class StatementParser extends ExpressionParser {
         return true;
       }
     }
+    if (this.isContextual(107)) {
+      this.raise(Errors.UsingDeclarationExport, this.state.startLoc);
+      return true;
+    }
+    if (this.isContextual(96) && this.startsAwaitUsing()) {
+      this.raise(Errors.UsingDeclarationExport, this.state.startLoc);
+      return true;
+    }
     return type === 74 || type === 75 || type === 68 || type === 80 || this.isLet() || this.isAsyncFunction();
   }
   checkExport(node, checkNames, isDefault, isFrom) {
@@ -37239,12 +37280,15 @@ class StatementParser extends ExpressionParser {
           }
         }
       } else if (node.declaration) {
-        if (node.declaration.type === "FunctionDeclaration" || node.declaration.type === "ClassDeclaration") {
-          const id = node.declaration.id;
+        const decl = node.declaration;
+        if (decl.type === "FunctionDeclaration" || decl.type === "ClassDeclaration") {
+          const {
+            id
+          } = decl;
           if (!id) throw new Error("Assertion failure");
           this.checkDuplicateExports(node, id.name);
-        } else if (node.declaration.type === "VariableDeclaration") {
-          for (const declaration of node.declaration.declarations) {
+        } else if (decl.type === "VariableDeclaration") {
+          for (const declaration of decl.declarations) {
             this.checkDeclaration(declaration.id);
           }
         }
@@ -49294,9 +49338,10 @@ exports["default"] = gatherSequenceExpressions;
 var _getBindingIdentifiers = __nccwpck_require__(3331);
 var _index = __nccwpck_require__(2605);
 var _index2 = __nccwpck_require__(9380);
+var _productions = __nccwpck_require__(4157);
 var _cloneNode = __nccwpck_require__(5823);
 ;
-function gatherSequenceExpressions(nodes, scope, declars) {
+function gatherSequenceExpressions(nodes, declars) {
   const exprs = [];
   let ensureLastUndefined = true;
   for (const node of nodes) {
@@ -49323,12 +49368,12 @@ function gatherSequenceExpressions(nodes, scope, declars) {
       }
       ensureLastUndefined = true;
     } else if ((0, _index.isIfStatement)(node)) {
-      const consequent = node.consequent ? gatherSequenceExpressions([node.consequent], scope, declars) : scope.buildUndefinedNode();
-      const alternate = node.alternate ? gatherSequenceExpressions([node.alternate], scope, declars) : scope.buildUndefinedNode();
+      const consequent = node.consequent ? gatherSequenceExpressions([node.consequent], declars) : (0, _productions.buildUndefinedNode)();
+      const alternate = node.alternate ? gatherSequenceExpressions([node.alternate], declars) : (0, _productions.buildUndefinedNode)();
       if (!consequent || !alternate) return;
       exprs.push((0, _index2.conditionalExpression)(node.test, consequent, alternate));
     } else if ((0, _index.isBlockStatement)(node)) {
-      const body = gatherSequenceExpressions(node.body, scope, declars);
+      const body = gatherSequenceExpressions(node.body, declars);
       if (!body) return;
       exprs.push(body);
     } else if ((0, _index.isEmptyStatement)(node)) {
@@ -49340,7 +49385,7 @@ function gatherSequenceExpressions(nodes, scope, declars) {
     }
   }
   if (ensureLastUndefined) {
-    exprs.push(scope.buildUndefinedNode());
+    exprs.push((0, _productions.buildUndefinedNode)());
   }
   if (exprs.length === 1) {
     return exprs[0];
@@ -49565,7 +49610,7 @@ var _gatherSequenceExpressions = __nccwpck_require__(1022);
 function toSequenceExpression(nodes, scope) {
   if (!(nodes != null && nodes.length)) return;
   const declars = [];
-  const result = (0, _gatherSequenceExpressions.default)(nodes, scope, declars);
+  const result = (0, _gatherSequenceExpressions.default)(nodes, declars);
   if (!result) return;
   for (const declar of declars) {
     scope.push(declar);
@@ -49845,7 +49890,7 @@ defineType("CallExpression", {
       validate: (0, _utils.assertNodeType)("Expression", "Super", "V8IntrinsicIdentifier")
     },
     arguments: {
-      validate: (0, _utils.chain)((0, _utils.assertValueType)("array"), (0, _utils.assertEach)((0, _utils.assertNodeType)("Expression", "SpreadElement", "JSXNamespacedName", "ArgumentPlaceholder")))
+      validate: (0, _utils.chain)((0, _utils.assertValueType)("array"), (0, _utils.assertEach)((0, _utils.assertNodeType)("Expression", "SpreadElement", "ArgumentPlaceholder")))
     }
   }, !process.env.BABEL_TYPES_8_BREAKING ? {
     optional: {
@@ -51232,7 +51277,7 @@ defineType("OptionalCallExpression", {
       validate: (0, _utils.assertNodeType)("Expression")
     },
     arguments: {
-      validate: (0, _utils.chain)((0, _utils.assertValueType)("array"), (0, _utils.assertEach)((0, _utils.assertNodeType)("Expression", "SpreadElement", "JSXNamespacedName", "ArgumentPlaceholder")))
+      validate: (0, _utils.chain)((0, _utils.assertValueType)("array"), (0, _utils.assertEach)((0, _utils.assertNodeType)("Expression", "SpreadElement", "ArgumentPlaceholder")))
     },
     optional: {
       validate: !process.env.BABEL_TYPES_8_BREAKING ? (0, _utils.assertValueType)("boolean") : (0, _utils.chain)((0, _utils.assertValueType)("boolean"), (0, _utils.assertOptionalChainStart)())
@@ -54075,10 +54120,9 @@ function getBindingIdentifiers(node, duplicates, outerOnly, newBindingsOnly) {
   while (search.length) {
     const id = search.shift();
     if (!id) continue;
-    if (newBindingsOnly && ((0, _index.isAssignmentExpression)(id) || (0, _index.isUnaryExpression)(id))) {
+    if (newBindingsOnly && ((0, _index.isAssignmentExpression)(id) || (0, _index.isUnaryExpression)(id) || (0, _index.isUpdateExpression)(id))) {
       continue;
     }
-    const keys = getBindingIdentifiers.keys[id.type];
     if ((0, _index.isIdentifier)(id)) {
       if (duplicates) {
         const _ids = ids[id.name] = ids[id.name] || [];
@@ -54103,6 +54147,7 @@ function getBindingIdentifiers(node, duplicates, outerOnly, newBindingsOnly) {
         continue;
       }
     }
+    const keys = getBindingIdentifiers.keys[id.type];
     if (keys) {
       for (let i = 0; i < keys.length; i++) {
         const key = keys[i];
diff --git a/.github/actions/javascript/awaitStagingDeploys/awaitStagingDeploys.ts b/.github/actions/javascript/awaitStagingDeploys/awaitStagingDeploys.ts
index 26947193cd80..96bb17a14354 100644
--- a/.github/actions/javascript/awaitStagingDeploys/awaitStagingDeploys.ts
+++ b/.github/actions/javascript/awaitStagingDeploys/awaitStagingDeploys.ts
@@ -8,19 +8,10 @@ import {promiseDoWhile} from '@github/libs/promiseWhile';
 type CurrentStagingDeploys = Awaited<ReturnType<typeof GitHubUtils.octokit.actions.listWorkflowRuns>>['data']['workflow_runs'];
 
 function run() {
-    console.info('[awaitStagingDeploys] POLL RATE', CONST.POLL_RATE);
-    console.info('[awaitStagingDeploys] run()');
-    console.info('[awaitStagingDeploys] getStringInput', getStringInput);
-    console.info('[awaitStagingDeploys] GitHubUtils', GitHubUtils);
-    console.info('[awaitStagingDeploys] promiseDoWhile', promiseDoWhile);
-
     const tag = getStringInput('TAG', {required: false});
-    console.info('[awaitStagingDeploys] run() tag', tag);
 
     let currentStagingDeploys: CurrentStagingDeploys = [];
 
-    console.info('[awaitStagingDeploys] run()  _.throttle', lodashThrottle);
-
     const throttleFunc = () =>
         Promise.all([
             // These are active deploys
@@ -42,24 +33,20 @@ function run() {
                 }),
         ])
             .then((responses) => {
-                console.info('[awaitStagingDeploys] listWorkflowRuns responses', responses);
                 const workflowRuns = responses[0].data.workflow_runs;
                 if (!tag && typeof responses[1] === 'object') {
                     workflowRuns.push(...responses[1].data.workflow_runs);
                 }
-                console.info('[awaitStagingDeploys] workflowRuns', workflowRuns);
                 return workflowRuns;
             })
             .then((workflowRuns) => (currentStagingDeploys = workflowRuns.filter((workflowRun) => workflowRun.status !== 'completed')))
             .then(() => {
-                console.info('[awaitStagingDeploys] currentStagingDeploys', currentStagingDeploys);
                 console.log(
                     !currentStagingDeploys.length
                         ? 'No current staging deploys found'
                         : `Found ${currentStagingDeploys.length} staging deploy${currentStagingDeploys.length > 1 ? 's' : ''} still running...`,
                 );
             });
-    console.info('[awaitStagingDeploys] run() throttleFunc', throttleFunc);
 
     return promiseDoWhile(
         () => !!currentStagingDeploys.length,
diff --git a/.github/actions/javascript/awaitStagingDeploys/index.js b/.github/actions/javascript/awaitStagingDeploys/index.js
index c91313520673..7bdbafc0b722 100644
--- a/.github/actions/javascript/awaitStagingDeploys/index.js
+++ b/.github/actions/javascript/awaitStagingDeploys/index.js
@@ -7373,7 +7373,7 @@ FetchError.prototype.name = 'FetchError';
 
 let convert;
 try {
-	convert = (__nccwpck_require__(2877).convert);
+	convert = (__nccwpck_require__(3975).convert);
 } catch (e) {}
 
 const INTERNALS = Symbol('Body internals');
@@ -12131,15 +12131,8 @@ const CONST_1 = __importDefault(__nccwpck_require__(9873));
 const GithubUtils_1 = __importDefault(__nccwpck_require__(9296));
 const promiseWhile_1 = __nccwpck_require__(9438);
 function run() {
-    console.info('[awaitStagingDeploys] POLL RATE', CONST_1.default.POLL_RATE);
-    console.info('[awaitStagingDeploys] run()');
-    console.info('[awaitStagingDeploys] getStringInput', ActionUtils_1.getStringInput);
-    console.info('[awaitStagingDeploys] GitHubUtils', GithubUtils_1.default);
-    console.info('[awaitStagingDeploys] promiseDoWhile', promiseWhile_1.promiseDoWhile);
     const tag = (0, ActionUtils_1.getStringInput)('TAG', { required: false });
-    console.info('[awaitStagingDeploys] run() tag', tag);
     let currentStagingDeploys = [];
-    console.info('[awaitStagingDeploys] run()  _.throttle', throttle_1.default);
     const throttleFunc = () => Promise.all([
         // These are active deploys
         GithubUtils_1.default.octokit.actions.listWorkflowRuns({
@@ -12159,22 +12152,18 @@ function run() {
             }),
     ])
         .then((responses) => {
-        console.info('[awaitStagingDeploys] listWorkflowRuns responses', responses);
         const workflowRuns = responses[0].data.workflow_runs;
         if (!tag && typeof responses[1] === 'object') {
             workflowRuns.push(...responses[1].data.workflow_runs);
         }
-        console.info('[awaitStagingDeploys] workflowRuns', workflowRuns);
         return workflowRuns;
     })
         .then((workflowRuns) => (currentStagingDeploys = workflowRuns.filter((workflowRun) => workflowRun.status !== 'completed')))
         .then(() => {
-        console.info('[awaitStagingDeploys] currentStagingDeploys', currentStagingDeploys);
         console.log(!currentStagingDeploys.length
             ? 'No current staging deploys found'
             : `Found ${currentStagingDeploys.length} staging deploy${currentStagingDeploys.length > 1 ? 's' : ''} still running...`);
     });
-    console.info('[awaitStagingDeploys] run() throttleFunc', throttleFunc);
     return (0, promiseWhile_1.promiseDoWhile)(() => !!currentStagingDeploys.length, (0, throttle_1.default)(throttleFunc, 
     // Poll every 60 seconds instead of every 10 seconds
     CONST_1.default.POLL_RATE * 6));
@@ -12268,7 +12257,22 @@ const CONST = {
         STAGING_DEPLOY: 'StagingDeployCash',
         DEPLOY_BLOCKER: 'DeployBlockerCash',
         INTERNAL_QA: 'InternalQA',
+        HELP_WANTED: 'Help Wanted',
+        CP_STAGING: 'CP Staging',
     },
+    ACTIONS: {
+        CREATED: 'created',
+        EDIT: 'edited',
+    },
+    EVENTS: {
+        ISSUE_COMMENT: 'issue_comment',
+    },
+    OPENAI_ROLES: {
+        USER: 'user',
+        ASSISTANT: 'assistant',
+    },
+    PROPOSAL_KEYWORD: 'Proposal',
+    OPENAI_THREAD_COMPLETED: 'completed',
     DATE_FORMAT_STRING: 'yyyy-MM-dd',
     PULL_REQUEST_REGEX: new RegExp(`${GITHUB_BASE_URL_REGEX.source}/.*/.*/pull/([0-9]+).*`),
     ISSUE_REGEX: new RegExp(`${GITHUB_BASE_URL_REGEX.source}/.*/.*/issues/([0-9]+).*`),
@@ -12276,6 +12280,9 @@ const CONST = {
     POLL_RATE: 10000,
     APP_REPO_URL: `https://github.com/${GIT_CONST.GITHUB_OWNER}/${GIT_CONST.APP_REPO}`,
     APP_REPO_GIT_URL: `git@github.com:${GIT_CONST.GITHUB_OWNER}/${GIT_CONST.APP_REPO}.git`,
+    NO_ACTION: 'NO_ACTION',
+    OPENAI_POLL_RATE: 1500,
+    OPENAI_POLL_TIMEOUT: 90000,
 };
 exports["default"] = CONST;
 
@@ -12325,13 +12332,11 @@ const CONST_1 = __importDefault(__nccwpck_require__(9873));
 class GithubUtils {
     static internalOctokit;
     /**
-     * Initialize internal octokit
-     *
-     * @private
+     * Initialize internal octokit.
+     * NOTE: When using GithubUtils in CI, you don't need to call this manually.
      */
-    static initOctokit() {
+    static initOctokitWithToken(token) {
         const Octokit = utils_1.GitHub.plugin(plugin_throttling_1.throttling, plugin_paginate_rest_1.paginateRest);
-        const token = core.getInput('GITHUB_TOKEN', { required: true });
         // Save a copy of octokit used in this class
         this.internalOctokit = new Octokit((0, utils_1.getOctokitOptions)(token, {
             throttle: {
@@ -12351,6 +12356,15 @@ class GithubUtils {
             },
         }));
     }
+    /**
+     * Default initialize method assuming running in CI, getting the token from an input.
+     *
+     * @private
+     */
+    static initOctokit() {
+        const token = core.getInput('GITHUB_TOKEN', { required: true });
+        this.initOctokitWithToken(token);
+    }
     /**
      * Either give an existing instance of Octokit rest or create a new one
      *
@@ -12645,12 +12659,6 @@ class GithubUtils {
         })
             .then((response) => response.data.workflow_runs[0]?.id);
     }
-    /**
-     * Generate the well-formatted body of a production release.
-     */
-    static getReleaseBody(pullRequests) {
-        return pullRequests.map((number) => `- ${this.getPullRequestURLFromNumber(number)}`).join('\r\n');
-    }
     /**
      * Generate the URL of an New Expensify pull request given the PR number.
      */
@@ -12706,12 +12714,31 @@ class GithubUtils {
             .then((events) => events.filter((event) => event.event === 'closed'))
             .then((closedEvents) => closedEvents.at(-1)?.actor?.login ?? '');
     }
-    static getArtifactByName(artefactName) {
-        return this.paginate(this.octokit.actions.listArtifactsForRepo, {
+    /**
+     * Returns a single artifact by name. If none is found, it returns undefined.
+     */
+    static getArtifactByName(artifactName) {
+        return this.octokit.actions
+            .listArtifactsForRepo({
             owner: CONST_1.default.GITHUB_OWNER,
             repo: CONST_1.default.APP_REPO,
-            per_page: 100,
-        }).then((artifacts) => artifacts.find((artifact) => artifact.name === artefactName));
+            per_page: 1,
+            name: artifactName,
+        })
+            .then((response) => response.data.artifacts[0]);
+    }
+    /**
+     * Given an artifact ID, returns the download URL to a zip file containing the artifact.
+     */
+    static getArtifactDownloadURL(artifactId) {
+        return this.octokit.actions
+            .downloadArtifact({
+            owner: CONST_1.default.GITHUB_OWNER,
+            repo: CONST_1.default.APP_REPO,
+            artifact_id: artifactId,
+            archive_format: 'zip',
+        })
+            .then((response) => response.url);
     }
 }
 exports["default"] = GithubUtils;
@@ -12730,7 +12757,6 @@ exports.promiseDoWhile = exports.promiseWhile = void 0;
  * Simulates a while loop where the condition is determined by the result of a Promise.
  */
 function promiseWhile(condition, action) {
-    console.info('[promiseWhile] promiseWhile()');
     return new Promise((resolve, reject) => {
         const loop = function () {
             if (!condition()) {
@@ -12738,7 +12764,6 @@ function promiseWhile(condition, action) {
             }
             else {
                 const actionResult = action?.();
-                console.info('[promiseWhile] promiseWhile() actionResult', actionResult);
                 if (!actionResult) {
                     resolve();
                     return;
@@ -12759,11 +12784,8 @@ exports.promiseWhile = promiseWhile;
  * Simulates a do-while loop where the condition is determined by the result of a Promise.
  */
 function promiseDoWhile(condition, action) {
-    console.info('[promiseWhile] promiseDoWhile()');
     return new Promise((resolve, reject) => {
-        console.info('[promiseWhile] promiseDoWhile() condition', condition);
         const actionResult = action?.();
-        console.info('[promiseWhile] promiseDoWhile() actionResult', actionResult);
         if (!actionResult) {
             resolve();
             return;
@@ -12812,27 +12834,27 @@ exports["default"] = arrayDifference;
 
 /***/ }),
 
-/***/ 2877:
+/***/ 9491:
 /***/ ((module) => {
 
-module.exports = eval("require")("encoding");
-
+"use strict";
+module.exports = require("assert");
 
 /***/ }),
 
-/***/ 9491:
+/***/ 6113:
 /***/ ((module) => {
 
 "use strict";
-module.exports = require("assert");
+module.exports = require("crypto");
 
 /***/ }),
 
-/***/ 6113:
+/***/ 3975:
 /***/ ((module) => {
 
 "use strict";
-module.exports = require("crypto");
+module.exports = require("encoding");
 
 /***/ }),
 
diff --git a/.github/actions/javascript/bumpVersion/bumpVersion.ts b/.github/actions/javascript/bumpVersion/bumpVersion.ts
index ed4828367cf2..92b81836ce13 100644
--- a/.github/actions/javascript/bumpVersion/bumpVersion.ts
+++ b/.github/actions/javascript/bumpVersion/bumpVersion.ts
@@ -1,9 +1,11 @@
 import * as core from '@actions/core';
 import {exec as originalExec} from 'child_process';
 import fs from 'fs';
+import type {PackageJson} from 'type-fest';
 import {promisify} from 'util';
 import {generateAndroidVersionCode, updateAndroidVersion, updateiOSVersion} from '@github/libs/nativeVersionUpdater';
 import * as versionUpdater from '@github/libs/versionUpdater';
+import type {SemverLevel} from '@github/libs/versionUpdater';
 
 const exec = promisify(originalExec);
 
@@ -19,7 +21,7 @@ function updateNativeVersions(version: string) {
         .then(() => {
             console.log('Successfully updated Android!');
         })
-        .catch((err) => {
+        .catch((err: string | Error) => {
             console.error('Error updating Android');
             core.setFailed(err);
         });
@@ -42,13 +44,17 @@ function updateNativeVersions(version: string) {
 }
 
 let semanticVersionLevel = core.getInput('SEMVER_LEVEL', {required: true});
-if (!semanticVersionLevel || !Object.keys(versionUpdater.SEMANTIC_VERSION_LEVELS).includes(semanticVersionLevel)) {
+if (!semanticVersionLevel || !versionUpdater.isValidSemverLevel(semanticVersionLevel)) {
     semanticVersionLevel = versionUpdater.SEMANTIC_VERSION_LEVELS.BUILD;
     console.log(`Invalid input for 'SEMVER_LEVEL': ${semanticVersionLevel}`, `Defaulting to: ${semanticVersionLevel}`);
 }
 
-const {version: previousVersion} = JSON.parse(fs.readFileSync('./package.json').toString());
-const newVersion = versionUpdater.incrementVersion(previousVersion, semanticVersionLevel);
+const {version: previousVersion} = JSON.parse(fs.readFileSync('./package.json').toString()) as PackageJson;
+if (!previousVersion) {
+    core.setFailed('Error: Could not read package.json');
+}
+
+const newVersion = versionUpdater.incrementVersion(previousVersion ?? '', semanticVersionLevel as SemverLevel);
 console.log(`Previous version: ${previousVersion}`, `New version: ${newVersion}`);
 
 updateNativeVersions(newVersion);
diff --git a/.github/actions/javascript/bumpVersion/index.js b/.github/actions/javascript/bumpVersion/index.js
index d4a085fc9ddf..c8360931845a 100644
--- a/.github/actions/javascript/bumpVersion/index.js
+++ b/.github/actions/javascript/bumpVersion/index.js
@@ -1928,7 +1928,7 @@ class SemVer {
     do {
       const a = this.build[i]
       const b = other.build[i]
-      debug('prerelease compare', i, a, b)
+      debug('build compare', i, a, b)
       if (a === undefined && b === undefined) {
         return 0
       } else if (b === undefined) {
@@ -3473,12 +3473,15 @@ function updateNativeVersions(version) {
     }
 }
 let semanticVersionLevel = core.getInput('SEMVER_LEVEL', { required: true });
-if (!semanticVersionLevel || !Object.keys(versionUpdater.SEMANTIC_VERSION_LEVELS).includes(semanticVersionLevel)) {
+if (!semanticVersionLevel || !versionUpdater.isValidSemverLevel(semanticVersionLevel)) {
     semanticVersionLevel = versionUpdater.SEMANTIC_VERSION_LEVELS.BUILD;
     console.log(`Invalid input for 'SEMVER_LEVEL': ${semanticVersionLevel}`, `Defaulting to: ${semanticVersionLevel}`);
 }
 const { version: previousVersion } = JSON.parse(fs_1.default.readFileSync('./package.json').toString());
-const newVersion = versionUpdater.incrementVersion(previousVersion, semanticVersionLevel);
+if (!previousVersion) {
+    core.setFailed('Error: Could not read package.json');
+}
+const newVersion = versionUpdater.incrementVersion(previousVersion ?? '', semanticVersionLevel);
 console.log(`Previous version: ${previousVersion}`, `New version: ${newVersion}`);
 updateNativeVersions(newVersion);
 console.log(`Setting npm version to ${newVersion}`);
@@ -3586,7 +3589,7 @@ exports.updateiOSVersion = updateiOSVersion;
 "use strict";
 
 Object.defineProperty(exports, "__esModule", ({ value: true }));
-exports.getPreviousVersion = exports.incrementPatch = exports.incrementMinor = exports.SEMANTIC_VERSION_LEVELS = exports.MAX_INCREMENTS = exports.incrementVersion = exports.getVersionStringFromNumber = exports.getVersionNumberFromString = void 0;
+exports.getPreviousVersion = exports.incrementPatch = exports.incrementMinor = exports.SEMANTIC_VERSION_LEVELS = exports.MAX_INCREMENTS = exports.incrementVersion = exports.getVersionStringFromNumber = exports.getVersionNumberFromString = exports.isValidSemverLevel = void 0;
 const SEMANTIC_VERSION_LEVELS = {
     MAJOR: 'MAJOR',
     MINOR: 'MINOR',
@@ -3596,6 +3599,10 @@ const SEMANTIC_VERSION_LEVELS = {
 exports.SEMANTIC_VERSION_LEVELS = SEMANTIC_VERSION_LEVELS;
 const MAX_INCREMENTS = 99;
 exports.MAX_INCREMENTS = MAX_INCREMENTS;
+function isValidSemverLevel(str) {
+    return Object.keys(SEMANTIC_VERSION_LEVELS).includes(str);
+}
+exports.isValidSemverLevel = isValidSemverLevel;
 /**
  * Transforms a versions string into a number
  */
diff --git a/.github/actions/javascript/checkDeployBlockers/checkDeployBlockers.ts b/.github/actions/javascript/checkDeployBlockers/checkDeployBlockers.ts
index bf94b136ce43..d51d68796070 100644
--- a/.github/actions/javascript/checkDeployBlockers/checkDeployBlockers.ts
+++ b/.github/actions/javascript/checkDeployBlockers/checkDeployBlockers.ts
@@ -60,7 +60,7 @@ const run = function (): Promise<void> {
                 core.setOutput('HAS_DEPLOY_BLOCKERS', false);
             }
         })
-        .catch((error) => {
+        .catch((error: string | Error) => {
             console.error('A problem occurred while trying to communicate with the GitHub API', error);
             core.setFailed(error);
         });
diff --git a/.github/actions/javascript/checkDeployBlockers/index.js b/.github/actions/javascript/checkDeployBlockers/index.js
index 842deb1cbb5d..74cd1509fbfa 100644
--- a/.github/actions/javascript/checkDeployBlockers/index.js
+++ b/.github/actions/javascript/checkDeployBlockers/index.js
@@ -6679,7 +6679,7 @@ FetchError.prototype.name = 'FetchError';
 
 let convert;
 try {
-	convert = (__nccwpck_require__(2877).convert);
+	convert = (__nccwpck_require__(3975).convert);
 } catch (e) {}
 
 const INTERNALS = Symbol('Body internals');
@@ -11540,7 +11540,22 @@ const CONST = {
         STAGING_DEPLOY: 'StagingDeployCash',
         DEPLOY_BLOCKER: 'DeployBlockerCash',
         INTERNAL_QA: 'InternalQA',
+        HELP_WANTED: 'Help Wanted',
+        CP_STAGING: 'CP Staging',
     },
+    ACTIONS: {
+        CREATED: 'created',
+        EDIT: 'edited',
+    },
+    EVENTS: {
+        ISSUE_COMMENT: 'issue_comment',
+    },
+    OPENAI_ROLES: {
+        USER: 'user',
+        ASSISTANT: 'assistant',
+    },
+    PROPOSAL_KEYWORD: 'Proposal',
+    OPENAI_THREAD_COMPLETED: 'completed',
     DATE_FORMAT_STRING: 'yyyy-MM-dd',
     PULL_REQUEST_REGEX: new RegExp(`${GITHUB_BASE_URL_REGEX.source}/.*/.*/pull/([0-9]+).*`),
     ISSUE_REGEX: new RegExp(`${GITHUB_BASE_URL_REGEX.source}/.*/.*/issues/([0-9]+).*`),
@@ -11548,6 +11563,9 @@ const CONST = {
     POLL_RATE: 10000,
     APP_REPO_URL: `https://github.com/${GIT_CONST.GITHUB_OWNER}/${GIT_CONST.APP_REPO}`,
     APP_REPO_GIT_URL: `git@github.com:${GIT_CONST.GITHUB_OWNER}/${GIT_CONST.APP_REPO}.git`,
+    NO_ACTION: 'NO_ACTION',
+    OPENAI_POLL_RATE: 1500,
+    OPENAI_POLL_TIMEOUT: 90000,
 };
 exports["default"] = CONST;
 
@@ -11597,13 +11615,11 @@ const CONST_1 = __importDefault(__nccwpck_require__(9873));
 class GithubUtils {
     static internalOctokit;
     /**
-     * Initialize internal octokit
-     *
-     * @private
+     * Initialize internal octokit.
+     * NOTE: When using GithubUtils in CI, you don't need to call this manually.
      */
-    static initOctokit() {
+    static initOctokitWithToken(token) {
         const Octokit = utils_1.GitHub.plugin(plugin_throttling_1.throttling, plugin_paginate_rest_1.paginateRest);
-        const token = core.getInput('GITHUB_TOKEN', { required: true });
         // Save a copy of octokit used in this class
         this.internalOctokit = new Octokit((0, utils_1.getOctokitOptions)(token, {
             throttle: {
@@ -11623,6 +11639,15 @@ class GithubUtils {
             },
         }));
     }
+    /**
+     * Default initialize method assuming running in CI, getting the token from an input.
+     *
+     * @private
+     */
+    static initOctokit() {
+        const token = core.getInput('GITHUB_TOKEN', { required: true });
+        this.initOctokitWithToken(token);
+    }
     /**
      * Either give an existing instance of Octokit rest or create a new one
      *
@@ -11917,12 +11942,6 @@ class GithubUtils {
         })
             .then((response) => response.data.workflow_runs[0]?.id);
     }
-    /**
-     * Generate the well-formatted body of a production release.
-     */
-    static getReleaseBody(pullRequests) {
-        return pullRequests.map((number) => `- ${this.getPullRequestURLFromNumber(number)}`).join('\r\n');
-    }
     /**
      * Generate the URL of an New Expensify pull request given the PR number.
      */
@@ -11978,12 +11997,31 @@ class GithubUtils {
             .then((events) => events.filter((event) => event.event === 'closed'))
             .then((closedEvents) => closedEvents.at(-1)?.actor?.login ?? '');
     }
-    static getArtifactByName(artefactName) {
-        return this.paginate(this.octokit.actions.listArtifactsForRepo, {
+    /**
+     * Returns a single artifact by name. If none is found, it returns undefined.
+     */
+    static getArtifactByName(artifactName) {
+        return this.octokit.actions
+            .listArtifactsForRepo({
             owner: CONST_1.default.GITHUB_OWNER,
             repo: CONST_1.default.APP_REPO,
-            per_page: 100,
-        }).then((artifacts) => artifacts.find((artifact) => artifact.name === artefactName));
+            per_page: 1,
+            name: artifactName,
+        })
+            .then((response) => response.data.artifacts[0]);
+    }
+    /**
+     * Given an artifact ID, returns the download URL to a zip file containing the artifact.
+     */
+    static getArtifactDownloadURL(artifactId) {
+        return this.octokit.actions
+            .downloadArtifact({
+            owner: CONST_1.default.GITHUB_OWNER,
+            repo: CONST_1.default.APP_REPO,
+            artifact_id: artifactId,
+            archive_format: 'zip',
+        })
+            .then((response) => response.url);
     }
 }
 exports["default"] = GithubUtils;
@@ -12024,27 +12062,27 @@ exports["default"] = arrayDifference;
 
 /***/ }),
 
-/***/ 2877:
+/***/ 9491:
 /***/ ((module) => {
 
-module.exports = eval("require")("encoding");
-
+"use strict";
+module.exports = require("assert");
 
 /***/ }),
 
-/***/ 9491:
+/***/ 6113:
 /***/ ((module) => {
 
 "use strict";
-module.exports = require("assert");
+module.exports = require("crypto");
 
 /***/ }),
 
-/***/ 6113:
+/***/ 3975:
 /***/ ((module) => {
 
 "use strict";
-module.exports = require("crypto");
+module.exports = require("encoding");
 
 /***/ }),
 
diff --git a/.github/actions/javascript/checkReactCompiler/action.yml b/.github/actions/javascript/checkReactCompiler/action.yml
new file mode 100644
index 000000000000..a8a1c35744c3
--- /dev/null
+++ b/.github/actions/javascript/checkReactCompiler/action.yml
@@ -0,0 +1,12 @@
+name: 'Check React compiler'
+description: 'Compares two lists of compiled files and fails a job if previously successfully compiled files are no longer compiled successfully'
+inputs:
+  OLD_LIST:
+    description: List of compiled files from the previous commit
+    required: true
+  NEW_LIST:
+    description: List of compiled files from the current commit
+    required: true
+runs:
+  using: 'node20'
+  main: 'index.js'
diff --git a/.github/actions/javascript/checkReactCompiler/checkReactCompiler.ts b/.github/actions/javascript/checkReactCompiler/checkReactCompiler.ts
new file mode 100644
index 000000000000..fbc4b249cb46
--- /dev/null
+++ b/.github/actions/javascript/checkReactCompiler/checkReactCompiler.ts
@@ -0,0 +1,37 @@
+/* eslint-disable @typescript-eslint/naming-convention */
+import * as core from '@actions/core';
+
+type ReactCompilerOutput = {
+    success: string[];
+    failure: string[];
+};
+
+const run = function (): Promise<void> {
+    const oldList = JSON.parse(core.getInput('OLD_LIST', {required: true})) as ReactCompilerOutput;
+    const newList = JSON.parse(core.getInput('NEW_LIST', {required: true})) as ReactCompilerOutput;
+
+    const errors: string[] = [];
+
+    oldList.success.forEach((file) => {
+        if (newList.success.includes(file) || !newList.failure.includes(file)) {
+            return;
+        }
+
+        errors.push(file);
+    });
+
+    if (errors.length > 0) {
+        errors.forEach((error) => console.error(error));
+        throw new Error(
+            'Some files could be compiled with react-compiler before successfully, but now they can not be compiled. Check https://github.com/Expensify/App/blob/main/contributingGuides/REACT_COMPILER.md documentation to see how you can fix this.',
+        );
+    }
+
+    return Promise.resolve();
+};
+
+if (require.main === module) {
+    run();
+}
+
+export default run;
diff --git a/.github/actions/javascript/checkReactCompiler/index.js b/.github/actions/javascript/checkReactCompiler/index.js
new file mode 100644
index 000000000000..1d8ca6adbd16
--- /dev/null
+++ b/.github/actions/javascript/checkReactCompiler/index.js
@@ -0,0 +1,2883 @@
+/**
+ * NOTE: This is a compiled file. DO NOT directly edit this file.
+ */
+/******/ (() => { // webpackBootstrap
+/******/ 	var __webpack_modules__ = ({
+
+/***/ 351:
+/***/ (function(__unused_webpack_module, exports, __nccwpck_require__) {
+
+"use strict";
+
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
+Object.defineProperty(exports, "__esModule", ({ value: true }));
+exports.issue = exports.issueCommand = void 0;
+const os = __importStar(__nccwpck_require__(37));
+const utils_1 = __nccwpck_require__(278);
+/**
+ * Commands
+ *
+ * Command Format:
+ *   ::name key=value,key=value::message
+ *
+ * Examples:
+ *   ::warning::This is the message
+ *   ::set-env name=MY_VAR::some value
+ */
+function issueCommand(command, properties, message) {
+    const cmd = new Command(command, properties, message);
+    process.stdout.write(cmd.toString() + os.EOL);
+}
+exports.issueCommand = issueCommand;
+function issue(name, message = '') {
+    issueCommand(name, {}, message);
+}
+exports.issue = issue;
+const CMD_STRING = '::';
+class Command {
+    constructor(command, properties, message) {
+        if (!command) {
+            command = 'missing.command';
+        }
+        this.command = command;
+        this.properties = properties;
+        this.message = message;
+    }
+    toString() {
+        let cmdStr = CMD_STRING + this.command;
+        if (this.properties && Object.keys(this.properties).length > 0) {
+            cmdStr += ' ';
+            let first = true;
+            for (const key in this.properties) {
+                if (this.properties.hasOwnProperty(key)) {
+                    const val = this.properties[key];
+                    if (val) {
+                        if (first) {
+                            first = false;
+                        }
+                        else {
+                            cmdStr += ',';
+                        }
+                        cmdStr += `${key}=${escapeProperty(val)}`;
+                    }
+                }
+            }
+        }
+        cmdStr += `${CMD_STRING}${escapeData(this.message)}`;
+        return cmdStr;
+    }
+}
+function escapeData(s) {
+    return utils_1.toCommandValue(s)
+        .replace(/%/g, '%25')
+        .replace(/\r/g, '%0D')
+        .replace(/\n/g, '%0A');
+}
+function escapeProperty(s) {
+    return utils_1.toCommandValue(s)
+        .replace(/%/g, '%25')
+        .replace(/\r/g, '%0D')
+        .replace(/\n/g, '%0A')
+        .replace(/:/g, '%3A')
+        .replace(/,/g, '%2C');
+}
+//# sourceMappingURL=command.js.map
+
+/***/ }),
+
+/***/ 186:
+/***/ (function(__unused_webpack_module, exports, __nccwpck_require__) {
+
+"use strict";
+
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+Object.defineProperty(exports, "__esModule", ({ value: true }));
+exports.getIDToken = exports.getState = exports.saveState = exports.group = exports.endGroup = exports.startGroup = exports.info = exports.notice = exports.warning = exports.error = exports.debug = exports.isDebug = exports.setFailed = exports.setCommandEcho = exports.setOutput = exports.getBooleanInput = exports.getMultilineInput = exports.getInput = exports.addPath = exports.setSecret = exports.exportVariable = exports.ExitCode = void 0;
+const command_1 = __nccwpck_require__(351);
+const file_command_1 = __nccwpck_require__(717);
+const utils_1 = __nccwpck_require__(278);
+const os = __importStar(__nccwpck_require__(37));
+const path = __importStar(__nccwpck_require__(17));
+const oidc_utils_1 = __nccwpck_require__(41);
+/**
+ * The code to exit an action
+ */
+var ExitCode;
+(function (ExitCode) {
+    /**
+     * A code indicating that the action was successful
+     */
+    ExitCode[ExitCode["Success"] = 0] = "Success";
+    /**
+     * A code indicating that the action was a failure
+     */
+    ExitCode[ExitCode["Failure"] = 1] = "Failure";
+})(ExitCode = exports.ExitCode || (exports.ExitCode = {}));
+//-----------------------------------------------------------------------
+// Variables
+//-----------------------------------------------------------------------
+/**
+ * Sets env variable for this action and future actions in the job
+ * @param name the name of the variable to set
+ * @param val the value of the variable. Non-string values will be converted to a string via JSON.stringify
+ */
+// eslint-disable-next-line @typescript-eslint/no-explicit-any
+function exportVariable(name, val) {
+    const convertedVal = utils_1.toCommandValue(val);
+    process.env[name] = convertedVal;
+    const filePath = process.env['GITHUB_ENV'] || '';
+    if (filePath) {
+        return file_command_1.issueFileCommand('ENV', file_command_1.prepareKeyValueMessage(name, val));
+    }
+    command_1.issueCommand('set-env', { name }, convertedVal);
+}
+exports.exportVariable = exportVariable;
+/**
+ * Registers a secret which will get masked from logs
+ * @param secret value of the secret
+ */
+function setSecret(secret) {
+    command_1.issueCommand('add-mask', {}, secret);
+}
+exports.setSecret = setSecret;
+/**
+ * Prepends inputPath to the PATH (for this action and future actions)
+ * @param inputPath
+ */
+function addPath(inputPath) {
+    const filePath = process.env['GITHUB_PATH'] || '';
+    if (filePath) {
+        file_command_1.issueFileCommand('PATH', inputPath);
+    }
+    else {
+        command_1.issueCommand('add-path', {}, inputPath);
+    }
+    process.env['PATH'] = `${inputPath}${path.delimiter}${process.env['PATH']}`;
+}
+exports.addPath = addPath;
+/**
+ * Gets the value of an input.
+ * Unless trimWhitespace is set to false in InputOptions, the value is also trimmed.
+ * Returns an empty string if the value is not defined.
+ *
+ * @param     name     name of the input to get
+ * @param     options  optional. See InputOptions.
+ * @returns   string
+ */
+function getInput(name, options) {
+    const val = process.env[`INPUT_${name.replace(/ /g, '_').toUpperCase()}`] || '';
+    if (options && options.required && !val) {
+        throw new Error(`Input required and not supplied: ${name}`);
+    }
+    if (options && options.trimWhitespace === false) {
+        return val;
+    }
+    return val.trim();
+}
+exports.getInput = getInput;
+/**
+ * Gets the values of an multiline input.  Each value is also trimmed.
+ *
+ * @param     name     name of the input to get
+ * @param     options  optional. See InputOptions.
+ * @returns   string[]
+ *
+ */
+function getMultilineInput(name, options) {
+    const inputs = getInput(name, options)
+        .split('\n')
+        .filter(x => x !== '');
+    if (options && options.trimWhitespace === false) {
+        return inputs;
+    }
+    return inputs.map(input => input.trim());
+}
+exports.getMultilineInput = getMultilineInput;
+/**
+ * Gets the input value of the boolean type in the YAML 1.2 "core schema" specification.
+ * Support boolean input list: `true | True | TRUE | false | False | FALSE` .
+ * The return value is also in boolean type.
+ * ref: https://yaml.org/spec/1.2/spec.html#id2804923
+ *
+ * @param     name     name of the input to get
+ * @param     options  optional. See InputOptions.
+ * @returns   boolean
+ */
+function getBooleanInput(name, options) {
+    const trueValue = ['true', 'True', 'TRUE'];
+    const falseValue = ['false', 'False', 'FALSE'];
+    const val = getInput(name, options);
+    if (trueValue.includes(val))
+        return true;
+    if (falseValue.includes(val))
+        return false;
+    throw new TypeError(`Input does not meet YAML 1.2 "Core Schema" specification: ${name}\n` +
+        `Support boolean input list: \`true | True | TRUE | false | False | FALSE\``);
+}
+exports.getBooleanInput = getBooleanInput;
+/**
+ * Sets the value of an output.
+ *
+ * @param     name     name of the output to set
+ * @param     value    value to store. Non-string values will be converted to a string via JSON.stringify
+ */
+// eslint-disable-next-line @typescript-eslint/no-explicit-any
+function setOutput(name, value) {
+    const filePath = process.env['GITHUB_OUTPUT'] || '';
+    if (filePath) {
+        return file_command_1.issueFileCommand('OUTPUT', file_command_1.prepareKeyValueMessage(name, value));
+    }
+    process.stdout.write(os.EOL);
+    command_1.issueCommand('set-output', { name }, utils_1.toCommandValue(value));
+}
+exports.setOutput = setOutput;
+/**
+ * Enables or disables the echoing of commands into stdout for the rest of the step.
+ * Echoing is disabled by default if ACTIONS_STEP_DEBUG is not set.
+ *
+ */
+function setCommandEcho(enabled) {
+    command_1.issue('echo', enabled ? 'on' : 'off');
+}
+exports.setCommandEcho = setCommandEcho;
+//-----------------------------------------------------------------------
+// Results
+//-----------------------------------------------------------------------
+/**
+ * Sets the action status to failed.
+ * When the action exits it will be with an exit code of 1
+ * @param message add error issue message
+ */
+function setFailed(message) {
+    process.exitCode = ExitCode.Failure;
+    error(message);
+}
+exports.setFailed = setFailed;
+//-----------------------------------------------------------------------
+// Logging Commands
+//-----------------------------------------------------------------------
+/**
+ * Gets whether Actions Step Debug is on or not
+ */
+function isDebug() {
+    return process.env['RUNNER_DEBUG'] === '1';
+}
+exports.isDebug = isDebug;
+/**
+ * Writes debug message to user log
+ * @param message debug message
+ */
+function debug(message) {
+    command_1.issueCommand('debug', {}, message);
+}
+exports.debug = debug;
+/**
+ * Adds an error issue
+ * @param message error issue message. Errors will be converted to string via toString()
+ * @param properties optional properties to add to the annotation.
+ */
+function error(message, properties = {}) {
+    command_1.issueCommand('error', utils_1.toCommandProperties(properties), message instanceof Error ? message.toString() : message);
+}
+exports.error = error;
+/**
+ * Adds a warning issue
+ * @param message warning issue message. Errors will be converted to string via toString()
+ * @param properties optional properties to add to the annotation.
+ */
+function warning(message, properties = {}) {
+    command_1.issueCommand('warning', utils_1.toCommandProperties(properties), message instanceof Error ? message.toString() : message);
+}
+exports.warning = warning;
+/**
+ * Adds a notice issue
+ * @param message notice issue message. Errors will be converted to string via toString()
+ * @param properties optional properties to add to the annotation.
+ */
+function notice(message, properties = {}) {
+    command_1.issueCommand('notice', utils_1.toCommandProperties(properties), message instanceof Error ? message.toString() : message);
+}
+exports.notice = notice;
+/**
+ * Writes info to log with console.log.
+ * @param message info message
+ */
+function info(message) {
+    process.stdout.write(message + os.EOL);
+}
+exports.info = info;
+/**
+ * Begin an output group.
+ *
+ * Output until the next `groupEnd` will be foldable in this group
+ *
+ * @param name The name of the output group
+ */
+function startGroup(name) {
+    command_1.issue('group', name);
+}
+exports.startGroup = startGroup;
+/**
+ * End an output group.
+ */
+function endGroup() {
+    command_1.issue('endgroup');
+}
+exports.endGroup = endGroup;
+/**
+ * Wrap an asynchronous function call in a group.
+ *
+ * Returns the same type as the function itself.
+ *
+ * @param name The name of the group
+ * @param fn The function to wrap in the group
+ */
+function group(name, fn) {
+    return __awaiter(this, void 0, void 0, function* () {
+        startGroup(name);
+        let result;
+        try {
+            result = yield fn();
+        }
+        finally {
+            endGroup();
+        }
+        return result;
+    });
+}
+exports.group = group;
+//-----------------------------------------------------------------------
+// Wrapper action state
+//-----------------------------------------------------------------------
+/**
+ * Saves state for current action, the state can only be retrieved by this action's post job execution.
+ *
+ * @param     name     name of the state to store
+ * @param     value    value to store. Non-string values will be converted to a string via JSON.stringify
+ */
+// eslint-disable-next-line @typescript-eslint/no-explicit-any
+function saveState(name, value) {
+    const filePath = process.env['GITHUB_STATE'] || '';
+    if (filePath) {
+        return file_command_1.issueFileCommand('STATE', file_command_1.prepareKeyValueMessage(name, value));
+    }
+    command_1.issueCommand('save-state', { name }, utils_1.toCommandValue(value));
+}
+exports.saveState = saveState;
+/**
+ * Gets the value of an state set by this action's main execution.
+ *
+ * @param     name     name of the state to get
+ * @returns   string
+ */
+function getState(name) {
+    return process.env[`STATE_${name}`] || '';
+}
+exports.getState = getState;
+function getIDToken(aud) {
+    return __awaiter(this, void 0, void 0, function* () {
+        return yield oidc_utils_1.OidcClient.getIDToken(aud);
+    });
+}
+exports.getIDToken = getIDToken;
+/**
+ * Summary exports
+ */
+var summary_1 = __nccwpck_require__(327);
+Object.defineProperty(exports, "summary", ({ enumerable: true, get: function () { return summary_1.summary; } }));
+/**
+ * @deprecated use core.summary
+ */
+var summary_2 = __nccwpck_require__(327);
+Object.defineProperty(exports, "markdownSummary", ({ enumerable: true, get: function () { return summary_2.markdownSummary; } }));
+/**
+ * Path exports
+ */
+var path_utils_1 = __nccwpck_require__(981);
+Object.defineProperty(exports, "toPosixPath", ({ enumerable: true, get: function () { return path_utils_1.toPosixPath; } }));
+Object.defineProperty(exports, "toWin32Path", ({ enumerable: true, get: function () { return path_utils_1.toWin32Path; } }));
+Object.defineProperty(exports, "toPlatformPath", ({ enumerable: true, get: function () { return path_utils_1.toPlatformPath; } }));
+//# sourceMappingURL=core.js.map
+
+/***/ }),
+
+/***/ 717:
+/***/ (function(__unused_webpack_module, exports, __nccwpck_require__) {
+
+"use strict";
+
+// For internal use, subject to change.
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
+Object.defineProperty(exports, "__esModule", ({ value: true }));
+exports.prepareKeyValueMessage = exports.issueFileCommand = void 0;
+// We use any as a valid input type
+/* eslint-disable @typescript-eslint/no-explicit-any */
+const fs = __importStar(__nccwpck_require__(147));
+const os = __importStar(__nccwpck_require__(37));
+const uuid_1 = __nccwpck_require__(840);
+const utils_1 = __nccwpck_require__(278);
+function issueFileCommand(command, message) {
+    const filePath = process.env[`GITHUB_${command}`];
+    if (!filePath) {
+        throw new Error(`Unable to find environment variable for file command ${command}`);
+    }
+    if (!fs.existsSync(filePath)) {
+        throw new Error(`Missing file at path: ${filePath}`);
+    }
+    fs.appendFileSync(filePath, `${utils_1.toCommandValue(message)}${os.EOL}`, {
+        encoding: 'utf8'
+    });
+}
+exports.issueFileCommand = issueFileCommand;
+function prepareKeyValueMessage(key, value) {
+    const delimiter = `ghadelimiter_${uuid_1.v4()}`;
+    const convertedValue = utils_1.toCommandValue(value);
+    // These should realistically never happen, but just in case someone finds a
+    // way to exploit uuid generation let's not allow keys or values that contain
+    // the delimiter.
+    if (key.includes(delimiter)) {
+        throw new Error(`Unexpected input: name should not contain the delimiter "${delimiter}"`);
+    }
+    if (convertedValue.includes(delimiter)) {
+        throw new Error(`Unexpected input: value should not contain the delimiter "${delimiter}"`);
+    }
+    return `${key}<<${delimiter}${os.EOL}${convertedValue}${os.EOL}${delimiter}`;
+}
+exports.prepareKeyValueMessage = prepareKeyValueMessage;
+//# sourceMappingURL=file-command.js.map
+
+/***/ }),
+
+/***/ 41:
+/***/ (function(__unused_webpack_module, exports, __nccwpck_require__) {
+
+"use strict";
+
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+Object.defineProperty(exports, "__esModule", ({ value: true }));
+exports.OidcClient = void 0;
+const http_client_1 = __nccwpck_require__(255);
+const auth_1 = __nccwpck_require__(526);
+const core_1 = __nccwpck_require__(186);
+class OidcClient {
+    static createHttpClient(allowRetry = true, maxRetry = 10) {
+        const requestOptions = {
+            allowRetries: allowRetry,
+            maxRetries: maxRetry
+        };
+        return new http_client_1.HttpClient('actions/oidc-client', [new auth_1.BearerCredentialHandler(OidcClient.getRequestToken())], requestOptions);
+    }
+    static getRequestToken() {
+        const token = process.env['ACTIONS_ID_TOKEN_REQUEST_TOKEN'];
+        if (!token) {
+            throw new Error('Unable to get ACTIONS_ID_TOKEN_REQUEST_TOKEN env variable');
+        }
+        return token;
+    }
+    static getIDTokenUrl() {
+        const runtimeUrl = process.env['ACTIONS_ID_TOKEN_REQUEST_URL'];
+        if (!runtimeUrl) {
+            throw new Error('Unable to get ACTIONS_ID_TOKEN_REQUEST_URL env variable');
+        }
+        return runtimeUrl;
+    }
+    static getCall(id_token_url) {
+        var _a;
+        return __awaiter(this, void 0, void 0, function* () {
+            const httpclient = OidcClient.createHttpClient();
+            const res = yield httpclient
+                .getJson(id_token_url)
+                .catch(error => {
+                throw new Error(`Failed to get ID Token. \n 
+        Error Code : ${error.statusCode}\n 
+        Error Message: ${error.result.message}`);
+            });
+            const id_token = (_a = res.result) === null || _a === void 0 ? void 0 : _a.value;
+            if (!id_token) {
+                throw new Error('Response json body do not have ID Token field');
+            }
+            return id_token;
+        });
+    }
+    static getIDToken(audience) {
+        return __awaiter(this, void 0, void 0, function* () {
+            try {
+                // New ID Token is requested from action service
+                let id_token_url = OidcClient.getIDTokenUrl();
+                if (audience) {
+                    const encodedAudience = encodeURIComponent(audience);
+                    id_token_url = `${id_token_url}&audience=${encodedAudience}`;
+                }
+                core_1.debug(`ID token url is ${id_token_url}`);
+                const id_token = yield OidcClient.getCall(id_token_url);
+                core_1.setSecret(id_token);
+                return id_token;
+            }
+            catch (error) {
+                throw new Error(`Error message: ${error.message}`);
+            }
+        });
+    }
+}
+exports.OidcClient = OidcClient;
+//# sourceMappingURL=oidc-utils.js.map
+
+/***/ }),
+
+/***/ 981:
+/***/ (function(__unused_webpack_module, exports, __nccwpck_require__) {
+
+"use strict";
+
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
+Object.defineProperty(exports, "__esModule", ({ value: true }));
+exports.toPlatformPath = exports.toWin32Path = exports.toPosixPath = void 0;
+const path = __importStar(__nccwpck_require__(17));
+/**
+ * toPosixPath converts the given path to the posix form. On Windows, \\ will be
+ * replaced with /.
+ *
+ * @param pth. Path to transform.
+ * @return string Posix path.
+ */
+function toPosixPath(pth) {
+    return pth.replace(/[\\]/g, '/');
+}
+exports.toPosixPath = toPosixPath;
+/**
+ * toWin32Path converts the given path to the win32 form. On Linux, / will be
+ * replaced with \\.
+ *
+ * @param pth. Path to transform.
+ * @return string Win32 path.
+ */
+function toWin32Path(pth) {
+    return pth.replace(/[/]/g, '\\');
+}
+exports.toWin32Path = toWin32Path;
+/**
+ * toPlatformPath converts the given path to a platform-specific path. It does
+ * this by replacing instances of / and \ with the platform-specific path
+ * separator.
+ *
+ * @param pth The path to platformize.
+ * @return string The platform-specific path.
+ */
+function toPlatformPath(pth) {
+    return pth.replace(/[/\\]/g, path.sep);
+}
+exports.toPlatformPath = toPlatformPath;
+//# sourceMappingURL=path-utils.js.map
+
+/***/ }),
+
+/***/ 327:
+/***/ (function(__unused_webpack_module, exports, __nccwpck_require__) {
+
+"use strict";
+
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+Object.defineProperty(exports, "__esModule", ({ value: true }));
+exports.summary = exports.markdownSummary = exports.SUMMARY_DOCS_URL = exports.SUMMARY_ENV_VAR = void 0;
+const os_1 = __nccwpck_require__(37);
+const fs_1 = __nccwpck_require__(147);
+const { access, appendFile, writeFile } = fs_1.promises;
+exports.SUMMARY_ENV_VAR = 'GITHUB_STEP_SUMMARY';
+exports.SUMMARY_DOCS_URL = 'https://docs.github.com/actions/using-workflows/workflow-commands-for-github-actions#adding-a-job-summary';
+class Summary {
+    constructor() {
+        this._buffer = '';
+    }
+    /**
+     * Finds the summary file path from the environment, rejects if env var is not found or file does not exist
+     * Also checks r/w permissions.
+     *
+     * @returns step summary file path
+     */
+    filePath() {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (this._filePath) {
+                return this._filePath;
+            }
+            const pathFromEnv = process.env[exports.SUMMARY_ENV_VAR];
+            if (!pathFromEnv) {
+                throw new Error(`Unable to find environment variable for $${exports.SUMMARY_ENV_VAR}. Check if your runtime environment supports job summaries.`);
+            }
+            try {
+                yield access(pathFromEnv, fs_1.constants.R_OK | fs_1.constants.W_OK);
+            }
+            catch (_a) {
+                throw new Error(`Unable to access summary file: '${pathFromEnv}'. Check if the file has correct read/write permissions.`);
+            }
+            this._filePath = pathFromEnv;
+            return this._filePath;
+        });
+    }
+    /**
+     * Wraps content in an HTML tag, adding any HTML attributes
+     *
+     * @param {string} tag HTML tag to wrap
+     * @param {string | null} content content within the tag
+     * @param {[attribute: string]: string} attrs key-value list of HTML attributes to add
+     *
+     * @returns {string} content wrapped in HTML element
+     */
+    wrap(tag, content, attrs = {}) {
+        const htmlAttrs = Object.entries(attrs)
+            .map(([key, value]) => ` ${key}="${value}"`)
+            .join('');
+        if (!content) {
+            return `<${tag}${htmlAttrs}>`;
+        }
+        return `<${tag}${htmlAttrs}>${content}</${tag}>`;
+    }
+    /**
+     * Writes text in the buffer to the summary buffer file and empties buffer. Will append by default.
+     *
+     * @param {SummaryWriteOptions} [options] (optional) options for write operation
+     *
+     * @returns {Promise<Summary>} summary instance
+     */
+    write(options) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const overwrite = !!(options === null || options === void 0 ? void 0 : options.overwrite);
+            const filePath = yield this.filePath();
+            const writeFunc = overwrite ? writeFile : appendFile;
+            yield writeFunc(filePath, this._buffer, { encoding: 'utf8' });
+            return this.emptyBuffer();
+        });
+    }
+    /**
+     * Clears the summary buffer and wipes the summary file
+     *
+     * @returns {Summary} summary instance
+     */
+    clear() {
+        return __awaiter(this, void 0, void 0, function* () {
+            return this.emptyBuffer().write({ overwrite: true });
+        });
+    }
+    /**
+     * Returns the current summary buffer as a string
+     *
+     * @returns {string} string of summary buffer
+     */
+    stringify() {
+        return this._buffer;
+    }
+    /**
+     * If the summary buffer is empty
+     *
+     * @returns {boolen} true if the buffer is empty
+     */
+    isEmptyBuffer() {
+        return this._buffer.length === 0;
+    }
+    /**
+     * Resets the summary buffer without writing to summary file
+     *
+     * @returns {Summary} summary instance
+     */
+    emptyBuffer() {
+        this._buffer = '';
+        return this;
+    }
+    /**
+     * Adds raw text to the summary buffer
+     *
+     * @param {string} text content to add
+     * @param {boolean} [addEOL=false] (optional) append an EOL to the raw text (default: false)
+     *
+     * @returns {Summary} summary instance
+     */
+    addRaw(text, addEOL = false) {
+        this._buffer += text;
+        return addEOL ? this.addEOL() : this;
+    }
+    /**
+     * Adds the operating system-specific end-of-line marker to the buffer
+     *
+     * @returns {Summary} summary instance
+     */
+    addEOL() {
+        return this.addRaw(os_1.EOL);
+    }
+    /**
+     * Adds an HTML codeblock to the summary buffer
+     *
+     * @param {string} code content to render within fenced code block
+     * @param {string} lang (optional) language to syntax highlight code
+     *
+     * @returns {Summary} summary instance
+     */
+    addCodeBlock(code, lang) {
+        const attrs = Object.assign({}, (lang && { lang }));
+        const element = this.wrap('pre', this.wrap('code', code), attrs);
+        return this.addRaw(element).addEOL();
+    }
+    /**
+     * Adds an HTML list to the summary buffer
+     *
+     * @param {string[]} items list of items to render
+     * @param {boolean} [ordered=false] (optional) if the rendered list should be ordered or not (default: false)
+     *
+     * @returns {Summary} summary instance
+     */
+    addList(items, ordered = false) {
+        const tag = ordered ? 'ol' : 'ul';
+        const listItems = items.map(item => this.wrap('li', item)).join('');
+        const element = this.wrap(tag, listItems);
+        return this.addRaw(element).addEOL();
+    }
+    /**
+     * Adds an HTML table to the summary buffer
+     *
+     * @param {SummaryTableCell[]} rows table rows
+     *
+     * @returns {Summary} summary instance
+     */
+    addTable(rows) {
+        const tableBody = rows
+            .map(row => {
+            const cells = row
+                .map(cell => {
+                if (typeof cell === 'string') {
+                    return this.wrap('td', cell);
+                }
+                const { header, data, colspan, rowspan } = cell;
+                const tag = header ? 'th' : 'td';
+                const attrs = Object.assign(Object.assign({}, (colspan && { colspan })), (rowspan && { rowspan }));
+                return this.wrap(tag, data, attrs);
+            })
+                .join('');
+            return this.wrap('tr', cells);
+        })
+            .join('');
+        const element = this.wrap('table', tableBody);
+        return this.addRaw(element).addEOL();
+    }
+    /**
+     * Adds a collapsable HTML details element to the summary buffer
+     *
+     * @param {string} label text for the closed state
+     * @param {string} content collapsable content
+     *
+     * @returns {Summary} summary instance
+     */
+    addDetails(label, content) {
+        const element = this.wrap('details', this.wrap('summary', label) + content);
+        return this.addRaw(element).addEOL();
+    }
+    /**
+     * Adds an HTML image tag to the summary buffer
+     *
+     * @param {string} src path to the image you to embed
+     * @param {string} alt text description of the image
+     * @param {SummaryImageOptions} options (optional) addition image attributes
+     *
+     * @returns {Summary} summary instance
+     */
+    addImage(src, alt, options) {
+        const { width, height } = options || {};
+        const attrs = Object.assign(Object.assign({}, (width && { width })), (height && { height }));
+        const element = this.wrap('img', null, Object.assign({ src, alt }, attrs));
+        return this.addRaw(element).addEOL();
+    }
+    /**
+     * Adds an HTML section heading element
+     *
+     * @param {string} text heading text
+     * @param {number | string} [level=1] (optional) the heading level, default: 1
+     *
+     * @returns {Summary} summary instance
+     */
+    addHeading(text, level) {
+        const tag = `h${level}`;
+        const allowedTag = ['h1', 'h2', 'h3', 'h4', 'h5', 'h6'].includes(tag)
+            ? tag
+            : 'h1';
+        const element = this.wrap(allowedTag, text);
+        return this.addRaw(element).addEOL();
+    }
+    /**
+     * Adds an HTML thematic break (<hr>) to the summary buffer
+     *
+     * @returns {Summary} summary instance
+     */
+    addSeparator() {
+        const element = this.wrap('hr', null);
+        return this.addRaw(element).addEOL();
+    }
+    /**
+     * Adds an HTML line break (<br>) to the summary buffer
+     *
+     * @returns {Summary} summary instance
+     */
+    addBreak() {
+        const element = this.wrap('br', null);
+        return this.addRaw(element).addEOL();
+    }
+    /**
+     * Adds an HTML blockquote to the summary buffer
+     *
+     * @param {string} text quote text
+     * @param {string} cite (optional) citation url
+     *
+     * @returns {Summary} summary instance
+     */
+    addQuote(text, cite) {
+        const attrs = Object.assign({}, (cite && { cite }));
+        const element = this.wrap('blockquote', text, attrs);
+        return this.addRaw(element).addEOL();
+    }
+    /**
+     * Adds an HTML anchor tag to the summary buffer
+     *
+     * @param {string} text link text/content
+     * @param {string} href hyperlink
+     *
+     * @returns {Summary} summary instance
+     */
+    addLink(text, href) {
+        const element = this.wrap('a', text, { href });
+        return this.addRaw(element).addEOL();
+    }
+}
+const _summary = new Summary();
+/**
+ * @deprecated use `core.summary`
+ */
+exports.markdownSummary = _summary;
+exports.summary = _summary;
+//# sourceMappingURL=summary.js.map
+
+/***/ }),
+
+/***/ 278:
+/***/ ((__unused_webpack_module, exports) => {
+
+"use strict";
+
+// We use any as a valid input type
+/* eslint-disable @typescript-eslint/no-explicit-any */
+Object.defineProperty(exports, "__esModule", ({ value: true }));
+exports.toCommandProperties = exports.toCommandValue = void 0;
+/**
+ * Sanitizes an input into a string so it can be passed into issueCommand safely
+ * @param input input to sanitize into a string
+ */
+function toCommandValue(input) {
+    if (input === null || input === undefined) {
+        return '';
+    }
+    else if (typeof input === 'string' || input instanceof String) {
+        return input;
+    }
+    return JSON.stringify(input);
+}
+exports.toCommandValue = toCommandValue;
+/**
+ *
+ * @param annotationProperties
+ * @returns The command properties to send with the actual annotation command
+ * See IssueCommandProperties: https://github.com/actions/runner/blob/main/src/Runner.Worker/ActionCommandManager.cs#L646
+ */
+function toCommandProperties(annotationProperties) {
+    if (!Object.keys(annotationProperties).length) {
+        return {};
+    }
+    return {
+        title: annotationProperties.title,
+        file: annotationProperties.file,
+        line: annotationProperties.startLine,
+        endLine: annotationProperties.endLine,
+        col: annotationProperties.startColumn,
+        endColumn: annotationProperties.endColumn
+    };
+}
+exports.toCommandProperties = toCommandProperties;
+//# sourceMappingURL=utils.js.map
+
+/***/ }),
+
+/***/ 526:
+/***/ (function(__unused_webpack_module, exports) {
+
+"use strict";
+
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+Object.defineProperty(exports, "__esModule", ({ value: true }));
+exports.PersonalAccessTokenCredentialHandler = exports.BearerCredentialHandler = exports.BasicCredentialHandler = void 0;
+class BasicCredentialHandler {
+    constructor(username, password) {
+        this.username = username;
+        this.password = password;
+    }
+    prepareRequest(options) {
+        if (!options.headers) {
+            throw Error('The request has no headers');
+        }
+        options.headers['Authorization'] = `Basic ${Buffer.from(`${this.username}:${this.password}`).toString('base64')}`;
+    }
+    // This handler cannot handle 401
+    canHandleAuthentication() {
+        return false;
+    }
+    handleAuthentication() {
+        return __awaiter(this, void 0, void 0, function* () {
+            throw new Error('not implemented');
+        });
+    }
+}
+exports.BasicCredentialHandler = BasicCredentialHandler;
+class BearerCredentialHandler {
+    constructor(token) {
+        this.token = token;
+    }
+    // currently implements pre-authorization
+    // TODO: support preAuth = false where it hooks on 401
+    prepareRequest(options) {
+        if (!options.headers) {
+            throw Error('The request has no headers');
+        }
+        options.headers['Authorization'] = `Bearer ${this.token}`;
+    }
+    // This handler cannot handle 401
+    canHandleAuthentication() {
+        return false;
+    }
+    handleAuthentication() {
+        return __awaiter(this, void 0, void 0, function* () {
+            throw new Error('not implemented');
+        });
+    }
+}
+exports.BearerCredentialHandler = BearerCredentialHandler;
+class PersonalAccessTokenCredentialHandler {
+    constructor(token) {
+        this.token = token;
+    }
+    // currently implements pre-authorization
+    // TODO: support preAuth = false where it hooks on 401
+    prepareRequest(options) {
+        if (!options.headers) {
+            throw Error('The request has no headers');
+        }
+        options.headers['Authorization'] = `Basic ${Buffer.from(`PAT:${this.token}`).toString('base64')}`;
+    }
+    // This handler cannot handle 401
+    canHandleAuthentication() {
+        return false;
+    }
+    handleAuthentication() {
+        return __awaiter(this, void 0, void 0, function* () {
+            throw new Error('not implemented');
+        });
+    }
+}
+exports.PersonalAccessTokenCredentialHandler = PersonalAccessTokenCredentialHandler;
+//# sourceMappingURL=auth.js.map
+
+/***/ }),
+
+/***/ 255:
+/***/ (function(__unused_webpack_module, exports, __nccwpck_require__) {
+
+"use strict";
+
+/* eslint-disable @typescript-eslint/no-explicit-any */
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+Object.defineProperty(exports, "__esModule", ({ value: true }));
+exports.HttpClient = exports.isHttps = exports.HttpClientResponse = exports.HttpClientError = exports.getProxyUrl = exports.MediaTypes = exports.Headers = exports.HttpCodes = void 0;
+const http = __importStar(__nccwpck_require__(685));
+const https = __importStar(__nccwpck_require__(687));
+const pm = __importStar(__nccwpck_require__(835));
+const tunnel = __importStar(__nccwpck_require__(294));
+var HttpCodes;
+(function (HttpCodes) {
+    HttpCodes[HttpCodes["OK"] = 200] = "OK";
+    HttpCodes[HttpCodes["MultipleChoices"] = 300] = "MultipleChoices";
+    HttpCodes[HttpCodes["MovedPermanently"] = 301] = "MovedPermanently";
+    HttpCodes[HttpCodes["ResourceMoved"] = 302] = "ResourceMoved";
+    HttpCodes[HttpCodes["SeeOther"] = 303] = "SeeOther";
+    HttpCodes[HttpCodes["NotModified"] = 304] = "NotModified";
+    HttpCodes[HttpCodes["UseProxy"] = 305] = "UseProxy";
+    HttpCodes[HttpCodes["SwitchProxy"] = 306] = "SwitchProxy";
+    HttpCodes[HttpCodes["TemporaryRedirect"] = 307] = "TemporaryRedirect";
+    HttpCodes[HttpCodes["PermanentRedirect"] = 308] = "PermanentRedirect";
+    HttpCodes[HttpCodes["BadRequest"] = 400] = "BadRequest";
+    HttpCodes[HttpCodes["Unauthorized"] = 401] = "Unauthorized";
+    HttpCodes[HttpCodes["PaymentRequired"] = 402] = "PaymentRequired";
+    HttpCodes[HttpCodes["Forbidden"] = 403] = "Forbidden";
+    HttpCodes[HttpCodes["NotFound"] = 404] = "NotFound";
+    HttpCodes[HttpCodes["MethodNotAllowed"] = 405] = "MethodNotAllowed";
+    HttpCodes[HttpCodes["NotAcceptable"] = 406] = "NotAcceptable";
+    HttpCodes[HttpCodes["ProxyAuthenticationRequired"] = 407] = "ProxyAuthenticationRequired";
+    HttpCodes[HttpCodes["RequestTimeout"] = 408] = "RequestTimeout";
+    HttpCodes[HttpCodes["Conflict"] = 409] = "Conflict";
+    HttpCodes[HttpCodes["Gone"] = 410] = "Gone";
+    HttpCodes[HttpCodes["TooManyRequests"] = 429] = "TooManyRequests";
+    HttpCodes[HttpCodes["InternalServerError"] = 500] = "InternalServerError";
+    HttpCodes[HttpCodes["NotImplemented"] = 501] = "NotImplemented";
+    HttpCodes[HttpCodes["BadGateway"] = 502] = "BadGateway";
+    HttpCodes[HttpCodes["ServiceUnavailable"] = 503] = "ServiceUnavailable";
+    HttpCodes[HttpCodes["GatewayTimeout"] = 504] = "GatewayTimeout";
+})(HttpCodes = exports.HttpCodes || (exports.HttpCodes = {}));
+var Headers;
+(function (Headers) {
+    Headers["Accept"] = "accept";
+    Headers["ContentType"] = "content-type";
+})(Headers = exports.Headers || (exports.Headers = {}));
+var MediaTypes;
+(function (MediaTypes) {
+    MediaTypes["ApplicationJson"] = "application/json";
+})(MediaTypes = exports.MediaTypes || (exports.MediaTypes = {}));
+/**
+ * Returns the proxy URL, depending upon the supplied url and proxy environment variables.
+ * @param serverUrl  The server URL where the request will be sent. For example, https://api.github.com
+ */
+function getProxyUrl(serverUrl) {
+    const proxyUrl = pm.getProxyUrl(new URL(serverUrl));
+    return proxyUrl ? proxyUrl.href : '';
+}
+exports.getProxyUrl = getProxyUrl;
+const HttpRedirectCodes = [
+    HttpCodes.MovedPermanently,
+    HttpCodes.ResourceMoved,
+    HttpCodes.SeeOther,
+    HttpCodes.TemporaryRedirect,
+    HttpCodes.PermanentRedirect
+];
+const HttpResponseRetryCodes = [
+    HttpCodes.BadGateway,
+    HttpCodes.ServiceUnavailable,
+    HttpCodes.GatewayTimeout
+];
+const RetryableHttpVerbs = ['OPTIONS', 'GET', 'DELETE', 'HEAD'];
+const ExponentialBackoffCeiling = 10;
+const ExponentialBackoffTimeSlice = 5;
+class HttpClientError extends Error {
+    constructor(message, statusCode) {
+        super(message);
+        this.name = 'HttpClientError';
+        this.statusCode = statusCode;
+        Object.setPrototypeOf(this, HttpClientError.prototype);
+    }
+}
+exports.HttpClientError = HttpClientError;
+class HttpClientResponse {
+    constructor(message) {
+        this.message = message;
+    }
+    readBody() {
+        return __awaiter(this, void 0, void 0, function* () {
+            return new Promise((resolve) => __awaiter(this, void 0, void 0, function* () {
+                let output = Buffer.alloc(0);
+                this.message.on('data', (chunk) => {
+                    output = Buffer.concat([output, chunk]);
+                });
+                this.message.on('end', () => {
+                    resolve(output.toString());
+                });
+            }));
+        });
+    }
+}
+exports.HttpClientResponse = HttpClientResponse;
+function isHttps(requestUrl) {
+    const parsedUrl = new URL(requestUrl);
+    return parsedUrl.protocol === 'https:';
+}
+exports.isHttps = isHttps;
+class HttpClient {
+    constructor(userAgent, handlers, requestOptions) {
+        this._ignoreSslError = false;
+        this._allowRedirects = true;
+        this._allowRedirectDowngrade = false;
+        this._maxRedirects = 50;
+        this._allowRetries = false;
+        this._maxRetries = 1;
+        this._keepAlive = false;
+        this._disposed = false;
+        this.userAgent = userAgent;
+        this.handlers = handlers || [];
+        this.requestOptions = requestOptions;
+        if (requestOptions) {
+            if (requestOptions.ignoreSslError != null) {
+                this._ignoreSslError = requestOptions.ignoreSslError;
+            }
+            this._socketTimeout = requestOptions.socketTimeout;
+            if (requestOptions.allowRedirects != null) {
+                this._allowRedirects = requestOptions.allowRedirects;
+            }
+            if (requestOptions.allowRedirectDowngrade != null) {
+                this._allowRedirectDowngrade = requestOptions.allowRedirectDowngrade;
+            }
+            if (requestOptions.maxRedirects != null) {
+                this._maxRedirects = Math.max(requestOptions.maxRedirects, 0);
+            }
+            if (requestOptions.keepAlive != null) {
+                this._keepAlive = requestOptions.keepAlive;
+            }
+            if (requestOptions.allowRetries != null) {
+                this._allowRetries = requestOptions.allowRetries;
+            }
+            if (requestOptions.maxRetries != null) {
+                this._maxRetries = requestOptions.maxRetries;
+            }
+        }
+    }
+    options(requestUrl, additionalHeaders) {
+        return __awaiter(this, void 0, void 0, function* () {
+            return this.request('OPTIONS', requestUrl, null, additionalHeaders || {});
+        });
+    }
+    get(requestUrl, additionalHeaders) {
+        return __awaiter(this, void 0, void 0, function* () {
+            return this.request('GET', requestUrl, null, additionalHeaders || {});
+        });
+    }
+    del(requestUrl, additionalHeaders) {
+        return __awaiter(this, void 0, void 0, function* () {
+            return this.request('DELETE', requestUrl, null, additionalHeaders || {});
+        });
+    }
+    post(requestUrl, data, additionalHeaders) {
+        return __awaiter(this, void 0, void 0, function* () {
+            return this.request('POST', requestUrl, data, additionalHeaders || {});
+        });
+    }
+    patch(requestUrl, data, additionalHeaders) {
+        return __awaiter(this, void 0, void 0, function* () {
+            return this.request('PATCH', requestUrl, data, additionalHeaders || {});
+        });
+    }
+    put(requestUrl, data, additionalHeaders) {
+        return __awaiter(this, void 0, void 0, function* () {
+            return this.request('PUT', requestUrl, data, additionalHeaders || {});
+        });
+    }
+    head(requestUrl, additionalHeaders) {
+        return __awaiter(this, void 0, void 0, function* () {
+            return this.request('HEAD', requestUrl, null, additionalHeaders || {});
+        });
+    }
+    sendStream(verb, requestUrl, stream, additionalHeaders) {
+        return __awaiter(this, void 0, void 0, function* () {
+            return this.request(verb, requestUrl, stream, additionalHeaders);
+        });
+    }
+    /**
+     * Gets a typed object from an endpoint
+     * Be aware that not found returns a null.  Other errors (4xx, 5xx) reject the promise
+     */
+    getJson(requestUrl, additionalHeaders = {}) {
+        return __awaiter(this, void 0, void 0, function* () {
+            additionalHeaders[Headers.Accept] = this._getExistingOrDefaultHeader(additionalHeaders, Headers.Accept, MediaTypes.ApplicationJson);
+            const res = yield this.get(requestUrl, additionalHeaders);
+            return this._processResponse(res, this.requestOptions);
+        });
+    }
+    postJson(requestUrl, obj, additionalHeaders = {}) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const data = JSON.stringify(obj, null, 2);
+            additionalHeaders[Headers.Accept] = this._getExistingOrDefaultHeader(additionalHeaders, Headers.Accept, MediaTypes.ApplicationJson);
+            additionalHeaders[Headers.ContentType] = this._getExistingOrDefaultHeader(additionalHeaders, Headers.ContentType, MediaTypes.ApplicationJson);
+            const res = yield this.post(requestUrl, data, additionalHeaders);
+            return this._processResponse(res, this.requestOptions);
+        });
+    }
+    putJson(requestUrl, obj, additionalHeaders = {}) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const data = JSON.stringify(obj, null, 2);
+            additionalHeaders[Headers.Accept] = this._getExistingOrDefaultHeader(additionalHeaders, Headers.Accept, MediaTypes.ApplicationJson);
+            additionalHeaders[Headers.ContentType] = this._getExistingOrDefaultHeader(additionalHeaders, Headers.ContentType, MediaTypes.ApplicationJson);
+            const res = yield this.put(requestUrl, data, additionalHeaders);
+            return this._processResponse(res, this.requestOptions);
+        });
+    }
+    patchJson(requestUrl, obj, additionalHeaders = {}) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const data = JSON.stringify(obj, null, 2);
+            additionalHeaders[Headers.Accept] = this._getExistingOrDefaultHeader(additionalHeaders, Headers.Accept, MediaTypes.ApplicationJson);
+            additionalHeaders[Headers.ContentType] = this._getExistingOrDefaultHeader(additionalHeaders, Headers.ContentType, MediaTypes.ApplicationJson);
+            const res = yield this.patch(requestUrl, data, additionalHeaders);
+            return this._processResponse(res, this.requestOptions);
+        });
+    }
+    /**
+     * Makes a raw http request.
+     * All other methods such as get, post, patch, and request ultimately call this.
+     * Prefer get, del, post and patch
+     */
+    request(verb, requestUrl, data, headers) {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (this._disposed) {
+                throw new Error('Client has already been disposed.');
+            }
+            const parsedUrl = new URL(requestUrl);
+            let info = this._prepareRequest(verb, parsedUrl, headers);
+            // Only perform retries on reads since writes may not be idempotent.
+            const maxTries = this._allowRetries && RetryableHttpVerbs.includes(verb)
+                ? this._maxRetries + 1
+                : 1;
+            let numTries = 0;
+            let response;
+            do {
+                response = yield this.requestRaw(info, data);
+                // Check if it's an authentication challenge
+                if (response &&
+                    response.message &&
+                    response.message.statusCode === HttpCodes.Unauthorized) {
+                    let authenticationHandler;
+                    for (const handler of this.handlers) {
+                        if (handler.canHandleAuthentication(response)) {
+                            authenticationHandler = handler;
+                            break;
+                        }
+                    }
+                    if (authenticationHandler) {
+                        return authenticationHandler.handleAuthentication(this, info, data);
+                    }
+                    else {
+                        // We have received an unauthorized response but have no handlers to handle it.
+                        // Let the response return to the caller.
+                        return response;
+                    }
+                }
+                let redirectsRemaining = this._maxRedirects;
+                while (response.message.statusCode &&
+                    HttpRedirectCodes.includes(response.message.statusCode) &&
+                    this._allowRedirects &&
+                    redirectsRemaining > 0) {
+                    const redirectUrl = response.message.headers['location'];
+                    if (!redirectUrl) {
+                        // if there's no location to redirect to, we won't
+                        break;
+                    }
+                    const parsedRedirectUrl = new URL(redirectUrl);
+                    if (parsedUrl.protocol === 'https:' &&
+                        parsedUrl.protocol !== parsedRedirectUrl.protocol &&
+                        !this._allowRedirectDowngrade) {
+                        throw new Error('Redirect from HTTPS to HTTP protocol. This downgrade is not allowed for security reasons. If you want to allow this behavior, set the allowRedirectDowngrade option to true.');
+                    }
+                    // we need to finish reading the response before reassigning response
+                    // which will leak the open socket.
+                    yield response.readBody();
+                    // strip authorization header if redirected to a different hostname
+                    if (parsedRedirectUrl.hostname !== parsedUrl.hostname) {
+                        for (const header in headers) {
+                            // header names are case insensitive
+                            if (header.toLowerCase() === 'authorization') {
+                                delete headers[header];
+                            }
+                        }
+                    }
+                    // let's make the request with the new redirectUrl
+                    info = this._prepareRequest(verb, parsedRedirectUrl, headers);
+                    response = yield this.requestRaw(info, data);
+                    redirectsRemaining--;
+                }
+                if (!response.message.statusCode ||
+                    !HttpResponseRetryCodes.includes(response.message.statusCode)) {
+                    // If not a retry code, return immediately instead of retrying
+                    return response;
+                }
+                numTries += 1;
+                if (numTries < maxTries) {
+                    yield response.readBody();
+                    yield this._performExponentialBackoff(numTries);
+                }
+            } while (numTries < maxTries);
+            return response;
+        });
+    }
+    /**
+     * Needs to be called if keepAlive is set to true in request options.
+     */
+    dispose() {
+        if (this._agent) {
+            this._agent.destroy();
+        }
+        this._disposed = true;
+    }
+    /**
+     * Raw request.
+     * @param info
+     * @param data
+     */
+    requestRaw(info, data) {
+        return __awaiter(this, void 0, void 0, function* () {
+            return new Promise((resolve, reject) => {
+                function callbackForResult(err, res) {
+                    if (err) {
+                        reject(err);
+                    }
+                    else if (!res) {
+                        // If `err` is not passed, then `res` must be passed.
+                        reject(new Error('Unknown error'));
+                    }
+                    else {
+                        resolve(res);
+                    }
+                }
+                this.requestRawWithCallback(info, data, callbackForResult);
+            });
+        });
+    }
+    /**
+     * Raw request with callback.
+     * @param info
+     * @param data
+     * @param onResult
+     */
+    requestRawWithCallback(info, data, onResult) {
+        if (typeof data === 'string') {
+            if (!info.options.headers) {
+                info.options.headers = {};
+            }
+            info.options.headers['Content-Length'] = Buffer.byteLength(data, 'utf8');
+        }
+        let callbackCalled = false;
+        function handleResult(err, res) {
+            if (!callbackCalled) {
+                callbackCalled = true;
+                onResult(err, res);
+            }
+        }
+        const req = info.httpModule.request(info.options, (msg) => {
+            const res = new HttpClientResponse(msg);
+            handleResult(undefined, res);
+        });
+        let socket;
+        req.on('socket', sock => {
+            socket = sock;
+        });
+        // If we ever get disconnected, we want the socket to timeout eventually
+        req.setTimeout(this._socketTimeout || 3 * 60000, () => {
+            if (socket) {
+                socket.end();
+            }
+            handleResult(new Error(`Request timeout: ${info.options.path}`));
+        });
+        req.on('error', function (err) {
+            // err has statusCode property
+            // res should have headers
+            handleResult(err);
+        });
+        if (data && typeof data === 'string') {
+            req.write(data, 'utf8');
+        }
+        if (data && typeof data !== 'string') {
+            data.on('close', function () {
+                req.end();
+            });
+            data.pipe(req);
+        }
+        else {
+            req.end();
+        }
+    }
+    /**
+     * Gets an http agent. This function is useful when you need an http agent that handles
+     * routing through a proxy server - depending upon the url and proxy environment variables.
+     * @param serverUrl  The server URL where the request will be sent. For example, https://api.github.com
+     */
+    getAgent(serverUrl) {
+        const parsedUrl = new URL(serverUrl);
+        return this._getAgent(parsedUrl);
+    }
+    _prepareRequest(method, requestUrl, headers) {
+        const info = {};
+        info.parsedUrl = requestUrl;
+        const usingSsl = info.parsedUrl.protocol === 'https:';
+        info.httpModule = usingSsl ? https : http;
+        const defaultPort = usingSsl ? 443 : 80;
+        info.options = {};
+        info.options.host = info.parsedUrl.hostname;
+        info.options.port = info.parsedUrl.port
+            ? parseInt(info.parsedUrl.port)
+            : defaultPort;
+        info.options.path =
+            (info.parsedUrl.pathname || '') + (info.parsedUrl.search || '');
+        info.options.method = method;
+        info.options.headers = this._mergeHeaders(headers);
+        if (this.userAgent != null) {
+            info.options.headers['user-agent'] = this.userAgent;
+        }
+        info.options.agent = this._getAgent(info.parsedUrl);
+        // gives handlers an opportunity to participate
+        if (this.handlers) {
+            for (const handler of this.handlers) {
+                handler.prepareRequest(info.options);
+            }
+        }
+        return info;
+    }
+    _mergeHeaders(headers) {
+        if (this.requestOptions && this.requestOptions.headers) {
+            return Object.assign({}, lowercaseKeys(this.requestOptions.headers), lowercaseKeys(headers || {}));
+        }
+        return lowercaseKeys(headers || {});
+    }
+    _getExistingOrDefaultHeader(additionalHeaders, header, _default) {
+        let clientHeader;
+        if (this.requestOptions && this.requestOptions.headers) {
+            clientHeader = lowercaseKeys(this.requestOptions.headers)[header];
+        }
+        return additionalHeaders[header] || clientHeader || _default;
+    }
+    _getAgent(parsedUrl) {
+        let agent;
+        const proxyUrl = pm.getProxyUrl(parsedUrl);
+        const useProxy = proxyUrl && proxyUrl.hostname;
+        if (this._keepAlive && useProxy) {
+            agent = this._proxyAgent;
+        }
+        if (this._keepAlive && !useProxy) {
+            agent = this._agent;
+        }
+        // if agent is already assigned use that agent.
+        if (agent) {
+            return agent;
+        }
+        const usingSsl = parsedUrl.protocol === 'https:';
+        let maxSockets = 100;
+        if (this.requestOptions) {
+            maxSockets = this.requestOptions.maxSockets || http.globalAgent.maxSockets;
+        }
+        // This is `useProxy` again, but we need to check `proxyURl` directly for TypeScripts's flow analysis.
+        if (proxyUrl && proxyUrl.hostname) {
+            const agentOptions = {
+                maxSockets,
+                keepAlive: this._keepAlive,
+                proxy: Object.assign(Object.assign({}, ((proxyUrl.username || proxyUrl.password) && {
+                    proxyAuth: `${proxyUrl.username}:${proxyUrl.password}`
+                })), { host: proxyUrl.hostname, port: proxyUrl.port })
+            };
+            let tunnelAgent;
+            const overHttps = proxyUrl.protocol === 'https:';
+            if (usingSsl) {
+                tunnelAgent = overHttps ? tunnel.httpsOverHttps : tunnel.httpsOverHttp;
+            }
+            else {
+                tunnelAgent = overHttps ? tunnel.httpOverHttps : tunnel.httpOverHttp;
+            }
+            agent = tunnelAgent(agentOptions);
+            this._proxyAgent = agent;
+        }
+        // if reusing agent across request and tunneling agent isn't assigned create a new agent
+        if (this._keepAlive && !agent) {
+            const options = { keepAlive: this._keepAlive, maxSockets };
+            agent = usingSsl ? new https.Agent(options) : new http.Agent(options);
+            this._agent = agent;
+        }
+        // if not using private agent and tunnel agent isn't setup then use global agent
+        if (!agent) {
+            agent = usingSsl ? https.globalAgent : http.globalAgent;
+        }
+        if (usingSsl && this._ignoreSslError) {
+            // we don't want to set NODE_TLS_REJECT_UNAUTHORIZED=0 since that will affect request for entire process
+            // http.RequestOptions doesn't expose a way to modify RequestOptions.agent.options
+            // we have to cast it to any and change it directly
+            agent.options = Object.assign(agent.options || {}, {
+                rejectUnauthorized: false
+            });
+        }
+        return agent;
+    }
+    _performExponentialBackoff(retryNumber) {
+        return __awaiter(this, void 0, void 0, function* () {
+            retryNumber = Math.min(ExponentialBackoffCeiling, retryNumber);
+            const ms = ExponentialBackoffTimeSlice * Math.pow(2, retryNumber);
+            return new Promise(resolve => setTimeout(() => resolve(), ms));
+        });
+    }
+    _processResponse(res, options) {
+        return __awaiter(this, void 0, void 0, function* () {
+            return new Promise((resolve, reject) => __awaiter(this, void 0, void 0, function* () {
+                const statusCode = res.message.statusCode || 0;
+                const response = {
+                    statusCode,
+                    result: null,
+                    headers: {}
+                };
+                // not found leads to null obj returned
+                if (statusCode === HttpCodes.NotFound) {
+                    resolve(response);
+                }
+                // get the result from the body
+                function dateTimeDeserializer(key, value) {
+                    if (typeof value === 'string') {
+                        const a = new Date(value);
+                        if (!isNaN(a.valueOf())) {
+                            return a;
+                        }
+                    }
+                    return value;
+                }
+                let obj;
+                let contents;
+                try {
+                    contents = yield res.readBody();
+                    if (contents && contents.length > 0) {
+                        if (options && options.deserializeDates) {
+                            obj = JSON.parse(contents, dateTimeDeserializer);
+                        }
+                        else {
+                            obj = JSON.parse(contents);
+                        }
+                        response.result = obj;
+                    }
+                    response.headers = res.message.headers;
+                }
+                catch (err) {
+                    // Invalid resource (contents not json);  leaving result obj null
+                }
+                // note that 3xx redirects are handled by the http layer.
+                if (statusCode > 299) {
+                    let msg;
+                    // if exception/error in body, attempt to get better error
+                    if (obj && obj.message) {
+                        msg = obj.message;
+                    }
+                    else if (contents && contents.length > 0) {
+                        // it may be the case that the exception is in the body message as string
+                        msg = contents;
+                    }
+                    else {
+                        msg = `Failed request: (${statusCode})`;
+                    }
+                    const err = new HttpClientError(msg, statusCode);
+                    err.result = response.result;
+                    reject(err);
+                }
+                else {
+                    resolve(response);
+                }
+            }));
+        });
+    }
+}
+exports.HttpClient = HttpClient;
+const lowercaseKeys = (obj) => Object.keys(obj).reduce((c, k) => ((c[k.toLowerCase()] = obj[k]), c), {});
+//# sourceMappingURL=index.js.map
+
+/***/ }),
+
+/***/ 835:
+/***/ ((__unused_webpack_module, exports) => {
+
+"use strict";
+
+Object.defineProperty(exports, "__esModule", ({ value: true }));
+exports.checkBypass = exports.getProxyUrl = void 0;
+function getProxyUrl(reqUrl) {
+    const usingSsl = reqUrl.protocol === 'https:';
+    if (checkBypass(reqUrl)) {
+        return undefined;
+    }
+    const proxyVar = (() => {
+        if (usingSsl) {
+            return process.env['https_proxy'] || process.env['HTTPS_PROXY'];
+        }
+        else {
+            return process.env['http_proxy'] || process.env['HTTP_PROXY'];
+        }
+    })();
+    if (proxyVar) {
+        return new URL(proxyVar);
+    }
+    else {
+        return undefined;
+    }
+}
+exports.getProxyUrl = getProxyUrl;
+function checkBypass(reqUrl) {
+    if (!reqUrl.hostname) {
+        return false;
+    }
+    const noProxy = process.env['no_proxy'] || process.env['NO_PROXY'] || '';
+    if (!noProxy) {
+        return false;
+    }
+    // Determine the request port
+    let reqPort;
+    if (reqUrl.port) {
+        reqPort = Number(reqUrl.port);
+    }
+    else if (reqUrl.protocol === 'http:') {
+        reqPort = 80;
+    }
+    else if (reqUrl.protocol === 'https:') {
+        reqPort = 443;
+    }
+    // Format the request hostname and hostname with port
+    const upperReqHosts = [reqUrl.hostname.toUpperCase()];
+    if (typeof reqPort === 'number') {
+        upperReqHosts.push(`${upperReqHosts[0]}:${reqPort}`);
+    }
+    // Compare request host against noproxy
+    for (const upperNoProxyItem of noProxy
+        .split(',')
+        .map(x => x.trim().toUpperCase())
+        .filter(x => x)) {
+        if (upperReqHosts.some(x => x === upperNoProxyItem)) {
+            return true;
+        }
+    }
+    return false;
+}
+exports.checkBypass = checkBypass;
+//# sourceMappingURL=proxy.js.map
+
+/***/ }),
+
+/***/ 294:
+/***/ ((module, __unused_webpack_exports, __nccwpck_require__) => {
+
+module.exports = __nccwpck_require__(219);
+
+
+/***/ }),
+
+/***/ 219:
+/***/ ((__unused_webpack_module, exports, __nccwpck_require__) => {
+
+"use strict";
+
+
+var net = __nccwpck_require__(808);
+var tls = __nccwpck_require__(404);
+var http = __nccwpck_require__(685);
+var https = __nccwpck_require__(687);
+var events = __nccwpck_require__(361);
+var assert = __nccwpck_require__(491);
+var util = __nccwpck_require__(837);
+
+
+exports.httpOverHttp = httpOverHttp;
+exports.httpsOverHttp = httpsOverHttp;
+exports.httpOverHttps = httpOverHttps;
+exports.httpsOverHttps = httpsOverHttps;
+
+
+function httpOverHttp(options) {
+  var agent = new TunnelingAgent(options);
+  agent.request = http.request;
+  return agent;
+}
+
+function httpsOverHttp(options) {
+  var agent = new TunnelingAgent(options);
+  agent.request = http.request;
+  agent.createSocket = createSecureSocket;
+  agent.defaultPort = 443;
+  return agent;
+}
+
+function httpOverHttps(options) {
+  var agent = new TunnelingAgent(options);
+  agent.request = https.request;
+  return agent;
+}
+
+function httpsOverHttps(options) {
+  var agent = new TunnelingAgent(options);
+  agent.request = https.request;
+  agent.createSocket = createSecureSocket;
+  agent.defaultPort = 443;
+  return agent;
+}
+
+
+function TunnelingAgent(options) {
+  var self = this;
+  self.options = options || {};
+  self.proxyOptions = self.options.proxy || {};
+  self.maxSockets = self.options.maxSockets || http.Agent.defaultMaxSockets;
+  self.requests = [];
+  self.sockets = [];
+
+  self.on('free', function onFree(socket, host, port, localAddress) {
+    var options = toOptions(host, port, localAddress);
+    for (var i = 0, len = self.requests.length; i < len; ++i) {
+      var pending = self.requests[i];
+      if (pending.host === options.host && pending.port === options.port) {
+        // Detect the request to connect same origin server,
+        // reuse the connection.
+        self.requests.splice(i, 1);
+        pending.request.onSocket(socket);
+        return;
+      }
+    }
+    socket.destroy();
+    self.removeSocket(socket);
+  });
+}
+util.inherits(TunnelingAgent, events.EventEmitter);
+
+TunnelingAgent.prototype.addRequest = function addRequest(req, host, port, localAddress) {
+  var self = this;
+  var options = mergeOptions({request: req}, self.options, toOptions(host, port, localAddress));
+
+  if (self.sockets.length >= this.maxSockets) {
+    // We are over limit so we'll add it to the queue.
+    self.requests.push(options);
+    return;
+  }
+
+  // If we are under maxSockets create a new one.
+  self.createSocket(options, function(socket) {
+    socket.on('free', onFree);
+    socket.on('close', onCloseOrRemove);
+    socket.on('agentRemove', onCloseOrRemove);
+    req.onSocket(socket);
+
+    function onFree() {
+      self.emit('free', socket, options);
+    }
+
+    function onCloseOrRemove(err) {
+      self.removeSocket(socket);
+      socket.removeListener('free', onFree);
+      socket.removeListener('close', onCloseOrRemove);
+      socket.removeListener('agentRemove', onCloseOrRemove);
+    }
+  });
+};
+
+TunnelingAgent.prototype.createSocket = function createSocket(options, cb) {
+  var self = this;
+  var placeholder = {};
+  self.sockets.push(placeholder);
+
+  var connectOptions = mergeOptions({}, self.proxyOptions, {
+    method: 'CONNECT',
+    path: options.host + ':' + options.port,
+    agent: false,
+    headers: {
+      host: options.host + ':' + options.port
+    }
+  });
+  if (options.localAddress) {
+    connectOptions.localAddress = options.localAddress;
+  }
+  if (connectOptions.proxyAuth) {
+    connectOptions.headers = connectOptions.headers || {};
+    connectOptions.headers['Proxy-Authorization'] = 'Basic ' +
+        new Buffer(connectOptions.proxyAuth).toString('base64');
+  }
+
+  debug('making CONNECT request');
+  var connectReq = self.request(connectOptions);
+  connectReq.useChunkedEncodingByDefault = false; // for v0.6
+  connectReq.once('response', onResponse); // for v0.6
+  connectReq.once('upgrade', onUpgrade);   // for v0.6
+  connectReq.once('connect', onConnect);   // for v0.7 or later
+  connectReq.once('error', onError);
+  connectReq.end();
+
+  function onResponse(res) {
+    // Very hacky. This is necessary to avoid http-parser leaks.
+    res.upgrade = true;
+  }
+
+  function onUpgrade(res, socket, head) {
+    // Hacky.
+    process.nextTick(function() {
+      onConnect(res, socket, head);
+    });
+  }
+
+  function onConnect(res, socket, head) {
+    connectReq.removeAllListeners();
+    socket.removeAllListeners();
+
+    if (res.statusCode !== 200) {
+      debug('tunneling socket could not be established, statusCode=%d',
+        res.statusCode);
+      socket.destroy();
+      var error = new Error('tunneling socket could not be established, ' +
+        'statusCode=' + res.statusCode);
+      error.code = 'ECONNRESET';
+      options.request.emit('error', error);
+      self.removeSocket(placeholder);
+      return;
+    }
+    if (head.length > 0) {
+      debug('got illegal response body from proxy');
+      socket.destroy();
+      var error = new Error('got illegal response body from proxy');
+      error.code = 'ECONNRESET';
+      options.request.emit('error', error);
+      self.removeSocket(placeholder);
+      return;
+    }
+    debug('tunneling connection has established');
+    self.sockets[self.sockets.indexOf(placeholder)] = socket;
+    return cb(socket);
+  }
+
+  function onError(cause) {
+    connectReq.removeAllListeners();
+
+    debug('tunneling socket could not be established, cause=%s\n',
+          cause.message, cause.stack);
+    var error = new Error('tunneling socket could not be established, ' +
+                          'cause=' + cause.message);
+    error.code = 'ECONNRESET';
+    options.request.emit('error', error);
+    self.removeSocket(placeholder);
+  }
+};
+
+TunnelingAgent.prototype.removeSocket = function removeSocket(socket) {
+  var pos = this.sockets.indexOf(socket)
+  if (pos === -1) {
+    return;
+  }
+  this.sockets.splice(pos, 1);
+
+  var pending = this.requests.shift();
+  if (pending) {
+    // If we have pending requests and a socket gets closed a new one
+    // needs to be created to take over in the pool for the one that closed.
+    this.createSocket(pending, function(socket) {
+      pending.request.onSocket(socket);
+    });
+  }
+};
+
+function createSecureSocket(options, cb) {
+  var self = this;
+  TunnelingAgent.prototype.createSocket.call(self, options, function(socket) {
+    var hostHeader = options.request.getHeader('host');
+    var tlsOptions = mergeOptions({}, self.options, {
+      socket: socket,
+      servername: hostHeader ? hostHeader.replace(/:.*$/, '') : options.host
+    });
+
+    // 0 is dummy port for v0.6
+    var secureSocket = tls.connect(0, tlsOptions);
+    self.sockets[self.sockets.indexOf(socket)] = secureSocket;
+    cb(secureSocket);
+  });
+}
+
+
+function toOptions(host, port, localAddress) {
+  if (typeof host === 'string') { // since v0.10
+    return {
+      host: host,
+      port: port,
+      localAddress: localAddress
+    };
+  }
+  return host; // for v0.11 or later
+}
+
+function mergeOptions(target) {
+  for (var i = 1, len = arguments.length; i < len; ++i) {
+    var overrides = arguments[i];
+    if (typeof overrides === 'object') {
+      var keys = Object.keys(overrides);
+      for (var j = 0, keyLen = keys.length; j < keyLen; ++j) {
+        var k = keys[j];
+        if (overrides[k] !== undefined) {
+          target[k] = overrides[k];
+        }
+      }
+    }
+  }
+  return target;
+}
+
+
+var debug;
+if (process.env.NODE_DEBUG && /\btunnel\b/.test(process.env.NODE_DEBUG)) {
+  debug = function() {
+    var args = Array.prototype.slice.call(arguments);
+    if (typeof args[0] === 'string') {
+      args[0] = 'TUNNEL: ' + args[0];
+    } else {
+      args.unshift('TUNNEL:');
+    }
+    console.error.apply(console, args);
+  }
+} else {
+  debug = function() {};
+}
+exports.debug = debug; // for test
+
+
+/***/ }),
+
+/***/ 840:
+/***/ ((__unused_webpack_module, exports, __nccwpck_require__) => {
+
+"use strict";
+
+
+Object.defineProperty(exports, "__esModule", ({
+  value: true
+}));
+Object.defineProperty(exports, "v1", ({
+  enumerable: true,
+  get: function () {
+    return _v.default;
+  }
+}));
+Object.defineProperty(exports, "v3", ({
+  enumerable: true,
+  get: function () {
+    return _v2.default;
+  }
+}));
+Object.defineProperty(exports, "v4", ({
+  enumerable: true,
+  get: function () {
+    return _v3.default;
+  }
+}));
+Object.defineProperty(exports, "v5", ({
+  enumerable: true,
+  get: function () {
+    return _v4.default;
+  }
+}));
+Object.defineProperty(exports, "NIL", ({
+  enumerable: true,
+  get: function () {
+    return _nil.default;
+  }
+}));
+Object.defineProperty(exports, "version", ({
+  enumerable: true,
+  get: function () {
+    return _version.default;
+  }
+}));
+Object.defineProperty(exports, "validate", ({
+  enumerable: true,
+  get: function () {
+    return _validate.default;
+  }
+}));
+Object.defineProperty(exports, "stringify", ({
+  enumerable: true,
+  get: function () {
+    return _stringify.default;
+  }
+}));
+Object.defineProperty(exports, "parse", ({
+  enumerable: true,
+  get: function () {
+    return _parse.default;
+  }
+}));
+
+var _v = _interopRequireDefault(__nccwpck_require__(628));
+
+var _v2 = _interopRequireDefault(__nccwpck_require__(409));
+
+var _v3 = _interopRequireDefault(__nccwpck_require__(122));
+
+var _v4 = _interopRequireDefault(__nccwpck_require__(120));
+
+var _nil = _interopRequireDefault(__nccwpck_require__(332));
+
+var _version = _interopRequireDefault(__nccwpck_require__(595));
+
+var _validate = _interopRequireDefault(__nccwpck_require__(900));
+
+var _stringify = _interopRequireDefault(__nccwpck_require__(950));
+
+var _parse = _interopRequireDefault(__nccwpck_require__(746));
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+
+/***/ }),
+
+/***/ 569:
+/***/ ((__unused_webpack_module, exports, __nccwpck_require__) => {
+
+"use strict";
+
+
+Object.defineProperty(exports, "__esModule", ({
+  value: true
+}));
+exports["default"] = void 0;
+
+var _crypto = _interopRequireDefault(__nccwpck_require__(113));
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+
+function md5(bytes) {
+  if (Array.isArray(bytes)) {
+    bytes = Buffer.from(bytes);
+  } else if (typeof bytes === 'string') {
+    bytes = Buffer.from(bytes, 'utf8');
+  }
+
+  return _crypto.default.createHash('md5').update(bytes).digest();
+}
+
+var _default = md5;
+exports["default"] = _default;
+
+/***/ }),
+
+/***/ 332:
+/***/ ((__unused_webpack_module, exports) => {
+
+"use strict";
+
+
+Object.defineProperty(exports, "__esModule", ({
+  value: true
+}));
+exports["default"] = void 0;
+var _default = '00000000-0000-0000-0000-000000000000';
+exports["default"] = _default;
+
+/***/ }),
+
+/***/ 746:
+/***/ ((__unused_webpack_module, exports, __nccwpck_require__) => {
+
+"use strict";
+
+
+Object.defineProperty(exports, "__esModule", ({
+  value: true
+}));
+exports["default"] = void 0;
+
+var _validate = _interopRequireDefault(__nccwpck_require__(900));
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+
+function parse(uuid) {
+  if (!(0, _validate.default)(uuid)) {
+    throw TypeError('Invalid UUID');
+  }
+
+  let v;
+  const arr = new Uint8Array(16); // Parse ########-....-....-....-............
+
+  arr[0] = (v = parseInt(uuid.slice(0, 8), 16)) >>> 24;
+  arr[1] = v >>> 16 & 0xff;
+  arr[2] = v >>> 8 & 0xff;
+  arr[3] = v & 0xff; // Parse ........-####-....-....-............
+
+  arr[4] = (v = parseInt(uuid.slice(9, 13), 16)) >>> 8;
+  arr[5] = v & 0xff; // Parse ........-....-####-....-............
+
+  arr[6] = (v = parseInt(uuid.slice(14, 18), 16)) >>> 8;
+  arr[7] = v & 0xff; // Parse ........-....-....-####-............
+
+  arr[8] = (v = parseInt(uuid.slice(19, 23), 16)) >>> 8;
+  arr[9] = v & 0xff; // Parse ........-....-....-....-############
+  // (Use "/" to avoid 32-bit truncation when bit-shifting high-order bytes)
+
+  arr[10] = (v = parseInt(uuid.slice(24, 36), 16)) / 0x10000000000 & 0xff;
+  arr[11] = v / 0x100000000 & 0xff;
+  arr[12] = v >>> 24 & 0xff;
+  arr[13] = v >>> 16 & 0xff;
+  arr[14] = v >>> 8 & 0xff;
+  arr[15] = v & 0xff;
+  return arr;
+}
+
+var _default = parse;
+exports["default"] = _default;
+
+/***/ }),
+
+/***/ 814:
+/***/ ((__unused_webpack_module, exports) => {
+
+"use strict";
+
+
+Object.defineProperty(exports, "__esModule", ({
+  value: true
+}));
+exports["default"] = void 0;
+var _default = /^(?:[0-9a-f]{8}-[0-9a-f]{4}-[1-5][0-9a-f]{3}-[89ab][0-9a-f]{3}-[0-9a-f]{12}|00000000-0000-0000-0000-000000000000)$/i;
+exports["default"] = _default;
+
+/***/ }),
+
+/***/ 807:
+/***/ ((__unused_webpack_module, exports, __nccwpck_require__) => {
+
+"use strict";
+
+
+Object.defineProperty(exports, "__esModule", ({
+  value: true
+}));
+exports["default"] = rng;
+
+var _crypto = _interopRequireDefault(__nccwpck_require__(113));
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+
+const rnds8Pool = new Uint8Array(256); // # of random values to pre-allocate
+
+let poolPtr = rnds8Pool.length;
+
+function rng() {
+  if (poolPtr > rnds8Pool.length - 16) {
+    _crypto.default.randomFillSync(rnds8Pool);
+
+    poolPtr = 0;
+  }
+
+  return rnds8Pool.slice(poolPtr, poolPtr += 16);
+}
+
+/***/ }),
+
+/***/ 274:
+/***/ ((__unused_webpack_module, exports, __nccwpck_require__) => {
+
+"use strict";
+
+
+Object.defineProperty(exports, "__esModule", ({
+  value: true
+}));
+exports["default"] = void 0;
+
+var _crypto = _interopRequireDefault(__nccwpck_require__(113));
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+
+function sha1(bytes) {
+  if (Array.isArray(bytes)) {
+    bytes = Buffer.from(bytes);
+  } else if (typeof bytes === 'string') {
+    bytes = Buffer.from(bytes, 'utf8');
+  }
+
+  return _crypto.default.createHash('sha1').update(bytes).digest();
+}
+
+var _default = sha1;
+exports["default"] = _default;
+
+/***/ }),
+
+/***/ 950:
+/***/ ((__unused_webpack_module, exports, __nccwpck_require__) => {
+
+"use strict";
+
+
+Object.defineProperty(exports, "__esModule", ({
+  value: true
+}));
+exports["default"] = void 0;
+
+var _validate = _interopRequireDefault(__nccwpck_require__(900));
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+
+/**
+ * Convert array of 16 byte values to UUID string format of the form:
+ * XXXXXXXX-XXXX-XXXX-XXXX-XXXXXXXXXXXX
+ */
+const byteToHex = [];
+
+for (let i = 0; i < 256; ++i) {
+  byteToHex.push((i + 0x100).toString(16).substr(1));
+}
+
+function stringify(arr, offset = 0) {
+  // Note: Be careful editing this code!  It's been tuned for performance
+  // and works in ways you may not expect. See https://github.com/uuidjs/uuid/pull/434
+  const uuid = (byteToHex[arr[offset + 0]] + byteToHex[arr[offset + 1]] + byteToHex[arr[offset + 2]] + byteToHex[arr[offset + 3]] + '-' + byteToHex[arr[offset + 4]] + byteToHex[arr[offset + 5]] + '-' + byteToHex[arr[offset + 6]] + byteToHex[arr[offset + 7]] + '-' + byteToHex[arr[offset + 8]] + byteToHex[arr[offset + 9]] + '-' + byteToHex[arr[offset + 10]] + byteToHex[arr[offset + 11]] + byteToHex[arr[offset + 12]] + byteToHex[arr[offset + 13]] + byteToHex[arr[offset + 14]] + byteToHex[arr[offset + 15]]).toLowerCase(); // Consistency check for valid UUID.  If this throws, it's likely due to one
+  // of the following:
+  // - One or more input array values don't map to a hex octet (leading to
+  // "undefined" in the uuid)
+  // - Invalid input values for the RFC `version` or `variant` fields
+
+  if (!(0, _validate.default)(uuid)) {
+    throw TypeError('Stringified UUID is invalid');
+  }
+
+  return uuid;
+}
+
+var _default = stringify;
+exports["default"] = _default;
+
+/***/ }),
+
+/***/ 628:
+/***/ ((__unused_webpack_module, exports, __nccwpck_require__) => {
+
+"use strict";
+
+
+Object.defineProperty(exports, "__esModule", ({
+  value: true
+}));
+exports["default"] = void 0;
+
+var _rng = _interopRequireDefault(__nccwpck_require__(807));
+
+var _stringify = _interopRequireDefault(__nccwpck_require__(950));
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+
+// **`v1()` - Generate time-based UUID**
+//
+// Inspired by https://github.com/LiosK/UUID.js
+// and http://docs.python.org/library/uuid.html
+let _nodeId;
+
+let _clockseq; // Previous uuid creation time
+
+
+let _lastMSecs = 0;
+let _lastNSecs = 0; // See https://github.com/uuidjs/uuid for API details
+
+function v1(options, buf, offset) {
+  let i = buf && offset || 0;
+  const b = buf || new Array(16);
+  options = options || {};
+  let node = options.node || _nodeId;
+  let clockseq = options.clockseq !== undefined ? options.clockseq : _clockseq; // node and clockseq need to be initialized to random values if they're not
+  // specified.  We do this lazily to minimize issues related to insufficient
+  // system entropy.  See #189
+
+  if (node == null || clockseq == null) {
+    const seedBytes = options.random || (options.rng || _rng.default)();
+
+    if (node == null) {
+      // Per 4.5, create and 48-bit node id, (47 random bits + multicast bit = 1)
+      node = _nodeId = [seedBytes[0] | 0x01, seedBytes[1], seedBytes[2], seedBytes[3], seedBytes[4], seedBytes[5]];
+    }
+
+    if (clockseq == null) {
+      // Per 4.2.2, randomize (14 bit) clockseq
+      clockseq = _clockseq = (seedBytes[6] << 8 | seedBytes[7]) & 0x3fff;
+    }
+  } // UUID timestamps are 100 nano-second units since the Gregorian epoch,
+  // (1582-10-15 00:00).  JSNumbers aren't precise enough for this, so
+  // time is handled internally as 'msecs' (integer milliseconds) and 'nsecs'
+  // (100-nanoseconds offset from msecs) since unix epoch, 1970-01-01 00:00.
+
+
+  let msecs = options.msecs !== undefined ? options.msecs : Date.now(); // Per 4.2.1.2, use count of uuid's generated during the current clock
+  // cycle to simulate higher resolution clock
+
+  let nsecs = options.nsecs !== undefined ? options.nsecs : _lastNSecs + 1; // Time since last uuid creation (in msecs)
+
+  const dt = msecs - _lastMSecs + (nsecs - _lastNSecs) / 10000; // Per 4.2.1.2, Bump clockseq on clock regression
+
+  if (dt < 0 && options.clockseq === undefined) {
+    clockseq = clockseq + 1 & 0x3fff;
+  } // Reset nsecs if clock regresses (new clockseq) or we've moved onto a new
+  // time interval
+
+
+  if ((dt < 0 || msecs > _lastMSecs) && options.nsecs === undefined) {
+    nsecs = 0;
+  } // Per 4.2.1.2 Throw error if too many uuids are requested
+
+
+  if (nsecs >= 10000) {
+    throw new Error("uuid.v1(): Can't create more than 10M uuids/sec");
+  }
+
+  _lastMSecs = msecs;
+  _lastNSecs = nsecs;
+  _clockseq = clockseq; // Per 4.1.4 - Convert from unix epoch to Gregorian epoch
+
+  msecs += 12219292800000; // `time_low`
+
+  const tl = ((msecs & 0xfffffff) * 10000 + nsecs) % 0x100000000;
+  b[i++] = tl >>> 24 & 0xff;
+  b[i++] = tl >>> 16 & 0xff;
+  b[i++] = tl >>> 8 & 0xff;
+  b[i++] = tl & 0xff; // `time_mid`
+
+  const tmh = msecs / 0x100000000 * 10000 & 0xfffffff;
+  b[i++] = tmh >>> 8 & 0xff;
+  b[i++] = tmh & 0xff; // `time_high_and_version`
+
+  b[i++] = tmh >>> 24 & 0xf | 0x10; // include version
+
+  b[i++] = tmh >>> 16 & 0xff; // `clock_seq_hi_and_reserved` (Per 4.2.2 - include variant)
+
+  b[i++] = clockseq >>> 8 | 0x80; // `clock_seq_low`
+
+  b[i++] = clockseq & 0xff; // `node`
+
+  for (let n = 0; n < 6; ++n) {
+    b[i + n] = node[n];
+  }
+
+  return buf || (0, _stringify.default)(b);
+}
+
+var _default = v1;
+exports["default"] = _default;
+
+/***/ }),
+
+/***/ 409:
+/***/ ((__unused_webpack_module, exports, __nccwpck_require__) => {
+
+"use strict";
+
+
+Object.defineProperty(exports, "__esModule", ({
+  value: true
+}));
+exports["default"] = void 0;
+
+var _v = _interopRequireDefault(__nccwpck_require__(998));
+
+var _md = _interopRequireDefault(__nccwpck_require__(569));
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+
+const v3 = (0, _v.default)('v3', 0x30, _md.default);
+var _default = v3;
+exports["default"] = _default;
+
+/***/ }),
+
+/***/ 998:
+/***/ ((__unused_webpack_module, exports, __nccwpck_require__) => {
+
+"use strict";
+
+
+Object.defineProperty(exports, "__esModule", ({
+  value: true
+}));
+exports["default"] = _default;
+exports.URL = exports.DNS = void 0;
+
+var _stringify = _interopRequireDefault(__nccwpck_require__(950));
+
+var _parse = _interopRequireDefault(__nccwpck_require__(746));
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+
+function stringToBytes(str) {
+  str = unescape(encodeURIComponent(str)); // UTF8 escape
+
+  const bytes = [];
+
+  for (let i = 0; i < str.length; ++i) {
+    bytes.push(str.charCodeAt(i));
+  }
+
+  return bytes;
+}
+
+const DNS = '6ba7b810-9dad-11d1-80b4-00c04fd430c8';
+exports.DNS = DNS;
+const URL = '6ba7b811-9dad-11d1-80b4-00c04fd430c8';
+exports.URL = URL;
+
+function _default(name, version, hashfunc) {
+  function generateUUID(value, namespace, buf, offset) {
+    if (typeof value === 'string') {
+      value = stringToBytes(value);
+    }
+
+    if (typeof namespace === 'string') {
+      namespace = (0, _parse.default)(namespace);
+    }
+
+    if (namespace.length !== 16) {
+      throw TypeError('Namespace must be array-like (16 iterable integer values, 0-255)');
+    } // Compute hash of namespace and value, Per 4.3
+    // Future: Use spread syntax when supported on all platforms, e.g. `bytes =
+    // hashfunc([...namespace, ... value])`
+
+
+    let bytes = new Uint8Array(16 + value.length);
+    bytes.set(namespace);
+    bytes.set(value, namespace.length);
+    bytes = hashfunc(bytes);
+    bytes[6] = bytes[6] & 0x0f | version;
+    bytes[8] = bytes[8] & 0x3f | 0x80;
+
+    if (buf) {
+      offset = offset || 0;
+
+      for (let i = 0; i < 16; ++i) {
+        buf[offset + i] = bytes[i];
+      }
+
+      return buf;
+    }
+
+    return (0, _stringify.default)(bytes);
+  } // Function#name is not settable on some platforms (#270)
+
+
+  try {
+    generateUUID.name = name; // eslint-disable-next-line no-empty
+  } catch (err) {} // For CommonJS default export support
+
+
+  generateUUID.DNS = DNS;
+  generateUUID.URL = URL;
+  return generateUUID;
+}
+
+/***/ }),
+
+/***/ 122:
+/***/ ((__unused_webpack_module, exports, __nccwpck_require__) => {
+
+"use strict";
+
+
+Object.defineProperty(exports, "__esModule", ({
+  value: true
+}));
+exports["default"] = void 0;
+
+var _rng = _interopRequireDefault(__nccwpck_require__(807));
+
+var _stringify = _interopRequireDefault(__nccwpck_require__(950));
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+
+function v4(options, buf, offset) {
+  options = options || {};
+
+  const rnds = options.random || (options.rng || _rng.default)(); // Per 4.4, set bits for version and `clock_seq_hi_and_reserved`
+
+
+  rnds[6] = rnds[6] & 0x0f | 0x40;
+  rnds[8] = rnds[8] & 0x3f | 0x80; // Copy bytes to buffer, if provided
+
+  if (buf) {
+    offset = offset || 0;
+
+    for (let i = 0; i < 16; ++i) {
+      buf[offset + i] = rnds[i];
+    }
+
+    return buf;
+  }
+
+  return (0, _stringify.default)(rnds);
+}
+
+var _default = v4;
+exports["default"] = _default;
+
+/***/ }),
+
+/***/ 120:
+/***/ ((__unused_webpack_module, exports, __nccwpck_require__) => {
+
+"use strict";
+
+
+Object.defineProperty(exports, "__esModule", ({
+  value: true
+}));
+exports["default"] = void 0;
+
+var _v = _interopRequireDefault(__nccwpck_require__(998));
+
+var _sha = _interopRequireDefault(__nccwpck_require__(274));
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+
+const v5 = (0, _v.default)('v5', 0x50, _sha.default);
+var _default = v5;
+exports["default"] = _default;
+
+/***/ }),
+
+/***/ 900:
+/***/ ((__unused_webpack_module, exports, __nccwpck_require__) => {
+
+"use strict";
+
+
+Object.defineProperty(exports, "__esModule", ({
+  value: true
+}));
+exports["default"] = void 0;
+
+var _regex = _interopRequireDefault(__nccwpck_require__(814));
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+
+function validate(uuid) {
+  return typeof uuid === 'string' && _regex.default.test(uuid);
+}
+
+var _default = validate;
+exports["default"] = _default;
+
+/***/ }),
+
+/***/ 595:
+/***/ ((__unused_webpack_module, exports, __nccwpck_require__) => {
+
+"use strict";
+
+
+Object.defineProperty(exports, "__esModule", ({
+  value: true
+}));
+exports["default"] = void 0;
+
+var _validate = _interopRequireDefault(__nccwpck_require__(900));
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+
+function version(uuid) {
+  if (!(0, _validate.default)(uuid)) {
+    throw TypeError('Invalid UUID');
+  }
+
+  return parseInt(uuid.substr(14, 1), 16);
+}
+
+var _default = version;
+exports["default"] = _default;
+
+/***/ }),
+
+/***/ 83:
+/***/ (function(__unused_webpack_module, exports, __nccwpck_require__) {
+
+"use strict";
+
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
+Object.defineProperty(exports, "__esModule", ({ value: true }));
+/* eslint-disable @typescript-eslint/naming-convention */
+const core = __importStar(__nccwpck_require__(186));
+const run = function () {
+    const oldList = JSON.parse(core.getInput('OLD_LIST', { required: true }));
+    const newList = JSON.parse(core.getInput('NEW_LIST', { required: true }));
+    const errors = [];
+    oldList.success.forEach((file) => {
+        if (newList.success.includes(file) || !newList.failure.includes(file)) {
+            return;
+        }
+        errors.push(file);
+    });
+    if (errors.length > 0) {
+        errors.forEach((error) => console.error(error));
+        throw new Error('Some files could be compiled with react-compiler before successfully, but now they can not be compiled. Check https://github.com/Expensify/App/blob/main/contributingGuides/REACT_COMPILER.md documentation to see how you can fix this.');
+    }
+    return Promise.resolve();
+};
+if (require.main === require.cache[eval('__filename')]) {
+    run();
+}
+exports["default"] = run;
+
+
+/***/ }),
+
+/***/ 491:
+/***/ ((module) => {
+
+"use strict";
+module.exports = require("assert");
+
+/***/ }),
+
+/***/ 113:
+/***/ ((module) => {
+
+"use strict";
+module.exports = require("crypto");
+
+/***/ }),
+
+/***/ 361:
+/***/ ((module) => {
+
+"use strict";
+module.exports = require("events");
+
+/***/ }),
+
+/***/ 147:
+/***/ ((module) => {
+
+"use strict";
+module.exports = require("fs");
+
+/***/ }),
+
+/***/ 685:
+/***/ ((module) => {
+
+"use strict";
+module.exports = require("http");
+
+/***/ }),
+
+/***/ 687:
+/***/ ((module) => {
+
+"use strict";
+module.exports = require("https");
+
+/***/ }),
+
+/***/ 808:
+/***/ ((module) => {
+
+"use strict";
+module.exports = require("net");
+
+/***/ }),
+
+/***/ 37:
+/***/ ((module) => {
+
+"use strict";
+module.exports = require("os");
+
+/***/ }),
+
+/***/ 17:
+/***/ ((module) => {
+
+"use strict";
+module.exports = require("path");
+
+/***/ }),
+
+/***/ 404:
+/***/ ((module) => {
+
+"use strict";
+module.exports = require("tls");
+
+/***/ }),
+
+/***/ 837:
+/***/ ((module) => {
+
+"use strict";
+module.exports = require("util");
+
+/***/ })
+
+/******/ 	});
+/************************************************************************/
+/******/ 	// The module cache
+/******/ 	var __webpack_module_cache__ = {};
+/******/ 	
+/******/ 	// The require function
+/******/ 	function __nccwpck_require__(moduleId) {
+/******/ 		// Check if module is in cache
+/******/ 		var cachedModule = __webpack_module_cache__[moduleId];
+/******/ 		if (cachedModule !== undefined) {
+/******/ 			return cachedModule.exports;
+/******/ 		}
+/******/ 		// Create a new module (and put it into the cache)
+/******/ 		var module = __webpack_module_cache__[moduleId] = {
+/******/ 			// no module.id needed
+/******/ 			// no module.loaded needed
+/******/ 			exports: {}
+/******/ 		};
+/******/ 	
+/******/ 		// Execute the module function
+/******/ 		var threw = true;
+/******/ 		try {
+/******/ 			__webpack_modules__[moduleId].call(module.exports, module, module.exports, __nccwpck_require__);
+/******/ 			threw = false;
+/******/ 		} finally {
+/******/ 			if(threw) delete __webpack_module_cache__[moduleId];
+/******/ 		}
+/******/ 	
+/******/ 		// Return the exports of the module
+/******/ 		return module.exports;
+/******/ 	}
+/******/ 	
+/************************************************************************/
+/******/ 	/* webpack/runtime/compat */
+/******/ 	
+/******/ 	if (typeof __nccwpck_require__ !== 'undefined') __nccwpck_require__.ab = __dirname + "/";
+/******/ 	
+/************************************************************************/
+/******/ 	
+/******/ 	// startup
+/******/ 	// Load entry module and return exports
+/******/ 	// This entry module is referenced by other modules so it can't be inlined
+/******/ 	var __webpack_exports__ = __nccwpck_require__(83);
+/******/ 	module.exports = __webpack_exports__;
+/******/ 	
+/******/ })()
+;
diff --git a/.github/actions/javascript/createOrUpdateStagingDeploy/createOrUpdateStagingDeploy.ts b/.github/actions/javascript/createOrUpdateStagingDeploy/createOrUpdateStagingDeploy.ts
index 4ef4d565ffd1..caff455e9fa5 100644
--- a/.github/actions/javascript/createOrUpdateStagingDeploy/createOrUpdateStagingDeploy.ts
+++ b/.github/actions/javascript/createOrUpdateStagingDeploy/createOrUpdateStagingDeploy.ts
@@ -8,10 +8,14 @@ import GitUtils from '@github/libs/GitUtils';
 
 type IssuesCreateResponse = Awaited<ReturnType<typeof GithubUtils.octokit.issues.create>>['data'];
 
+type PackageJson = {
+    version: string;
+};
+
 async function run(): Promise<IssuesCreateResponse | void> {
     // Note: require('package.json').version does not work because ncc will resolve that to a plain string at compile time
-    const packageJson = JSON.parse(fs.readFileSync('package.json', 'utf8'));
-    const newVersionTag: string = packageJson.version;
+    const packageJson = JSON.parse(fs.readFileSync('package.json', 'utf8')) as PackageJson;
+    const newVersionTag = packageJson.version;
 
     try {
         // Start by fetching the list of recent StagingDeployCash issues, along with the list of open deploy blockers
diff --git a/.github/actions/javascript/createOrUpdateStagingDeploy/index.js b/.github/actions/javascript/createOrUpdateStagingDeploy/index.js
index 127fb1fe3dca..d3e249ee6f47 100644
--- a/.github/actions/javascript/createOrUpdateStagingDeploy/index.js
+++ b/.github/actions/javascript/createOrUpdateStagingDeploy/index.js
@@ -9434,7 +9434,7 @@ FetchError.prototype.name = 'FetchError';
 
 let convert;
 try {
-	convert = (__nccwpck_require__(2877).convert);
+	convert = (__nccwpck_require__(3975).convert);
 } catch (e) {}
 
 const INTERNALS = Symbol('Body internals');
@@ -14352,7 +14352,22 @@ const CONST = {
         STAGING_DEPLOY: 'StagingDeployCash',
         DEPLOY_BLOCKER: 'DeployBlockerCash',
         INTERNAL_QA: 'InternalQA',
+        HELP_WANTED: 'Help Wanted',
+        CP_STAGING: 'CP Staging',
     },
+    ACTIONS: {
+        CREATED: 'created',
+        EDIT: 'edited',
+    },
+    EVENTS: {
+        ISSUE_COMMENT: 'issue_comment',
+    },
+    OPENAI_ROLES: {
+        USER: 'user',
+        ASSISTANT: 'assistant',
+    },
+    PROPOSAL_KEYWORD: 'Proposal',
+    OPENAI_THREAD_COMPLETED: 'completed',
     DATE_FORMAT_STRING: 'yyyy-MM-dd',
     PULL_REQUEST_REGEX: new RegExp(`${GITHUB_BASE_URL_REGEX.source}/.*/.*/pull/([0-9]+).*`),
     ISSUE_REGEX: new RegExp(`${GITHUB_BASE_URL_REGEX.source}/.*/.*/issues/([0-9]+).*`),
@@ -14360,6 +14375,9 @@ const CONST = {
     POLL_RATE: 10000,
     APP_REPO_URL: `https://github.com/${GIT_CONST.GITHUB_OWNER}/${GIT_CONST.APP_REPO}`,
     APP_REPO_GIT_URL: `git@github.com:${GIT_CONST.GITHUB_OWNER}/${GIT_CONST.APP_REPO}.git`,
+    NO_ACTION: 'NO_ACTION',
+    OPENAI_POLL_RATE: 1500,
+    OPENAI_POLL_TIMEOUT: 90000,
 };
 exports["default"] = CONST;
 
@@ -14401,7 +14419,66 @@ Object.defineProperty(exports, "__esModule", ({ value: true }));
 const child_process_1 = __nccwpck_require__(2081);
 const CONST_1 = __importDefault(__nccwpck_require__(9873));
 const sanitizeStringForJSONParse_1 = __importDefault(__nccwpck_require__(3902));
-const VERSION_UPDATER = __importStar(__nccwpck_require__(8982));
+const VersionUpdater = __importStar(__nccwpck_require__(8982));
+/**
+ * Check if a tag exists locally or in the remote.
+ */
+function tagExists(tag) {
+    try {
+        // Check if the tag exists locally
+        (0, child_process_1.execSync)(`git show-ref --tags ${tag}`, { stdio: 'ignore' });
+        return true; // Tag exists locally
+    }
+    catch (error) {
+        // Tag does not exist locally, check in remote
+        let shouldRetry = true;
+        let needsRepack = false;
+        let doesTagExist = false;
+        while (shouldRetry) {
+            try {
+                if (needsRepack) {
+                    // We have seen some scenarios where this fixes the git fetch.
+                    // Why? Who knows... https://github.com/Expensify/App/pull/31459
+                    (0, child_process_1.execSync)('git repack -d', { stdio: 'inherit' });
+                }
+                (0, child_process_1.execSync)(`git ls-remote --exit-code --tags origin ${tag}`, { stdio: 'ignore' });
+                doesTagExist = true;
+                shouldRetry = false;
+            }
+            catch (e) {
+                if (!needsRepack) {
+                    console.log('Attempting to repack and retry...');
+                    needsRepack = true;
+                }
+                else {
+                    console.error("Repack didn't help, giving up...");
+                    shouldRetry = false;
+                }
+            }
+        }
+        return doesTagExist;
+    }
+}
+/**
+ * This essentially just calls getPreviousVersion in a loop, until it finds a version for which a tag exists.
+ * It's useful if we manually perform a version bump, because in that case a tag may not exist for the previous version.
+ *
+ * @param tag the current tag
+ * @param level the Semver level to step backward by
+ */
+function getPreviousExistingTag(tag, level) {
+    let previousVersion = VersionUpdater.getPreviousVersion(tag, level);
+    let tagExistsForPreviousVersion = false;
+    while (!tagExistsForPreviousVersion) {
+        if (tagExists(previousVersion)) {
+            tagExistsForPreviousVersion = true;
+            break;
+        }
+        console.log(`Tag for previous version ${previousVersion} does not exist. Checking for an older version...`);
+        previousVersion = VersionUpdater.getPreviousVersion(previousVersion, level);
+    }
+    return previousVersion;
+}
 /**
  * @param [shallowExcludeTag] When fetching the given tag, exclude all history reachable by the shallowExcludeTag (used to make fetch much faster)
  */
@@ -14444,8 +14521,8 @@ function fetchTag(tag, shallowExcludeTag = '') {
  * Get merge logs between two tags (inclusive) as a JavaScript object.
  */
 function getCommitHistoryAsJSON(fromTag, toTag) {
-    // Fetch tags, exclude commits reachable from the previous patch version (i.e: previous checklist), so that we don't have to fetch the full history
-    const previousPatchVersion = VERSION_UPDATER.getPreviousVersion(fromTag, VERSION_UPDATER.SEMANTIC_VERSION_LEVELS.PATCH);
+    // Fetch tags, excluding commits reachable from the previous patch version (i.e: previous checklist), so that we don't have to fetch the full history
+    const previousPatchVersion = getPreviousExistingTag(fromTag, VersionUpdater.SEMANTIC_VERSION_LEVELS.PATCH);
     fetchTag(fromTag, previousPatchVersion);
     fetchTag(toTag, previousPatchVersion);
     console.log('Getting pull requests merged between the following tags:', fromTag, toTag);
@@ -14466,6 +14543,7 @@ function getCommitHistoryAsJSON(fromTag, toTag) {
         });
         spawnedProcess.on('close', (code) => {
             if (code !== 0) {
+                console.log('code: ', code);
                 return reject(new Error(`${stderr}`));
             }
             resolve(stdout);
@@ -14517,6 +14595,7 @@ async function getPullRequestsMergedBetween(fromTag, toTag) {
     return pullRequestNumbers;
 }
 exports["default"] = {
+    getPreviousExistingTag,
     getValidMergedPRs,
     getPullRequestsMergedBetween,
 };
@@ -14567,13 +14646,11 @@ const CONST_1 = __importDefault(__nccwpck_require__(9873));
 class GithubUtils {
     static internalOctokit;
     /**
-     * Initialize internal octokit
-     *
-     * @private
+     * Initialize internal octokit.
+     * NOTE: When using GithubUtils in CI, you don't need to call this manually.
      */
-    static initOctokit() {
+    static initOctokitWithToken(token) {
         const Octokit = utils_1.GitHub.plugin(plugin_throttling_1.throttling, plugin_paginate_rest_1.paginateRest);
-        const token = core.getInput('GITHUB_TOKEN', { required: true });
         // Save a copy of octokit used in this class
         this.internalOctokit = new Octokit((0, utils_1.getOctokitOptions)(token, {
             throttle: {
@@ -14593,6 +14670,15 @@ class GithubUtils {
             },
         }));
     }
+    /**
+     * Default initialize method assuming running in CI, getting the token from an input.
+     *
+     * @private
+     */
+    static initOctokit() {
+        const token = core.getInput('GITHUB_TOKEN', { required: true });
+        this.initOctokitWithToken(token);
+    }
     /**
      * Either give an existing instance of Octokit rest or create a new one
      *
@@ -14887,12 +14973,6 @@ class GithubUtils {
         })
             .then((response) => response.data.workflow_runs[0]?.id);
     }
-    /**
-     * Generate the well-formatted body of a production release.
-     */
-    static getReleaseBody(pullRequests) {
-        return pullRequests.map((number) => `- ${this.getPullRequestURLFromNumber(number)}`).join('\r\n');
-    }
     /**
      * Generate the URL of an New Expensify pull request given the PR number.
      */
@@ -14948,12 +15028,31 @@ class GithubUtils {
             .then((events) => events.filter((event) => event.event === 'closed'))
             .then((closedEvents) => closedEvents.at(-1)?.actor?.login ?? '');
     }
-    static getArtifactByName(artefactName) {
-        return this.paginate(this.octokit.actions.listArtifactsForRepo, {
+    /**
+     * Returns a single artifact by name. If none is found, it returns undefined.
+     */
+    static getArtifactByName(artifactName) {
+        return this.octokit.actions
+            .listArtifactsForRepo({
             owner: CONST_1.default.GITHUB_OWNER,
             repo: CONST_1.default.APP_REPO,
-            per_page: 100,
-        }).then((artifacts) => artifacts.find((artifact) => artifact.name === artefactName));
+            per_page: 1,
+            name: artifactName,
+        })
+            .then((response) => response.data.artifacts[0]);
+    }
+    /**
+     * Given an artifact ID, returns the download URL to a zip file containing the artifact.
+     */
+    static getArtifactDownloadURL(artifactId) {
+        return this.octokit.actions
+            .downloadArtifact({
+            owner: CONST_1.default.GITHUB_OWNER,
+            repo: CONST_1.default.APP_REPO,
+            artifact_id: artifactId,
+            archive_format: 'zip',
+        })
+            .then((response) => response.url);
     }
 }
 exports["default"] = GithubUtils;
@@ -15000,7 +15099,7 @@ exports["default"] = sanitizeStringForJSONParse;
 "use strict";
 
 Object.defineProperty(exports, "__esModule", ({ value: true }));
-exports.getPreviousVersion = exports.incrementPatch = exports.incrementMinor = exports.SEMANTIC_VERSION_LEVELS = exports.MAX_INCREMENTS = exports.incrementVersion = exports.getVersionStringFromNumber = exports.getVersionNumberFromString = void 0;
+exports.getPreviousVersion = exports.incrementPatch = exports.incrementMinor = exports.SEMANTIC_VERSION_LEVELS = exports.MAX_INCREMENTS = exports.incrementVersion = exports.getVersionStringFromNumber = exports.getVersionNumberFromString = exports.isValidSemverLevel = void 0;
 const SEMANTIC_VERSION_LEVELS = {
     MAJOR: 'MAJOR',
     MINOR: 'MINOR',
@@ -15010,6 +15109,10 @@ const SEMANTIC_VERSION_LEVELS = {
 exports.SEMANTIC_VERSION_LEVELS = SEMANTIC_VERSION_LEVELS;
 const MAX_INCREMENTS = 99;
 exports.MAX_INCREMENTS = MAX_INCREMENTS;
+function isValidSemverLevel(str) {
+    return Object.keys(SEMANTIC_VERSION_LEVELS).includes(str);
+}
+exports.isValidSemverLevel = isValidSemverLevel;
 /**
  * Transforms a versions string into a number
  */
@@ -15126,14 +15229,6 @@ function arrayDifference(array1, array2) {
 exports["default"] = arrayDifference;
 
 
-/***/ }),
-
-/***/ 2877:
-/***/ ((module) => {
-
-module.exports = eval("require")("encoding");
-
-
 /***/ }),
 
 /***/ 9491:
@@ -15160,6 +15255,14 @@ module.exports = require("crypto");
 
 /***/ }),
 
+/***/ 3975:
+/***/ ((module) => {
+
+"use strict";
+module.exports = require("encoding");
+
+/***/ }),
+
 /***/ 2361:
 /***/ ((module) => {
 
@@ -15267,9 +15370,9 @@ module.exports = require("zlib");
 /***/ 3286:
 /***/ ((module) => {
 
-function _interopRequireDefault(obj) {
-  return obj && obj.__esModule ? obj : {
-    "default": obj
+function _interopRequireDefault(e) {
+  return e && e.__esModule ? e : {
+    "default": e
   };
 }
 module.exports = _interopRequireDefault, module.exports.__esModule = true, module.exports["default"] = module.exports;
diff --git a/.github/actions/javascript/getArtifactInfo/index.js b/.github/actions/javascript/getArtifactInfo/index.js
index 77f61f491fec..82bf90ef6d2b 100644
--- a/.github/actions/javascript/getArtifactInfo/index.js
+++ b/.github/actions/javascript/getArtifactInfo/index.js
@@ -6679,7 +6679,7 @@ FetchError.prototype.name = 'FetchError';
 
 let convert;
 try {
-	convert = (__nccwpck_require__(2877).convert);
+	convert = (__nccwpck_require__(3975).convert);
 } catch (e) {}
 
 const INTERNALS = Symbol('Body internals');
@@ -11501,7 +11501,22 @@ const CONST = {
         STAGING_DEPLOY: 'StagingDeployCash',
         DEPLOY_BLOCKER: 'DeployBlockerCash',
         INTERNAL_QA: 'InternalQA',
+        HELP_WANTED: 'Help Wanted',
+        CP_STAGING: 'CP Staging',
     },
+    ACTIONS: {
+        CREATED: 'created',
+        EDIT: 'edited',
+    },
+    EVENTS: {
+        ISSUE_COMMENT: 'issue_comment',
+    },
+    OPENAI_ROLES: {
+        USER: 'user',
+        ASSISTANT: 'assistant',
+    },
+    PROPOSAL_KEYWORD: 'Proposal',
+    OPENAI_THREAD_COMPLETED: 'completed',
     DATE_FORMAT_STRING: 'yyyy-MM-dd',
     PULL_REQUEST_REGEX: new RegExp(`${GITHUB_BASE_URL_REGEX.source}/.*/.*/pull/([0-9]+).*`),
     ISSUE_REGEX: new RegExp(`${GITHUB_BASE_URL_REGEX.source}/.*/.*/issues/([0-9]+).*`),
@@ -11509,6 +11524,9 @@ const CONST = {
     POLL_RATE: 10000,
     APP_REPO_URL: `https://github.com/${GIT_CONST.GITHUB_OWNER}/${GIT_CONST.APP_REPO}`,
     APP_REPO_GIT_URL: `git@github.com:${GIT_CONST.GITHUB_OWNER}/${GIT_CONST.APP_REPO}.git`,
+    NO_ACTION: 'NO_ACTION',
+    OPENAI_POLL_RATE: 1500,
+    OPENAI_POLL_TIMEOUT: 90000,
 };
 exports["default"] = CONST;
 
@@ -11558,13 +11576,11 @@ const CONST_1 = __importDefault(__nccwpck_require__(9873));
 class GithubUtils {
     static internalOctokit;
     /**
-     * Initialize internal octokit
-     *
-     * @private
+     * Initialize internal octokit.
+     * NOTE: When using GithubUtils in CI, you don't need to call this manually.
      */
-    static initOctokit() {
+    static initOctokitWithToken(token) {
         const Octokit = utils_1.GitHub.plugin(plugin_throttling_1.throttling, plugin_paginate_rest_1.paginateRest);
-        const token = core.getInput('GITHUB_TOKEN', { required: true });
         // Save a copy of octokit used in this class
         this.internalOctokit = new Octokit((0, utils_1.getOctokitOptions)(token, {
             throttle: {
@@ -11584,6 +11600,15 @@ class GithubUtils {
             },
         }));
     }
+    /**
+     * Default initialize method assuming running in CI, getting the token from an input.
+     *
+     * @private
+     */
+    static initOctokit() {
+        const token = core.getInput('GITHUB_TOKEN', { required: true });
+        this.initOctokitWithToken(token);
+    }
     /**
      * Either give an existing instance of Octokit rest or create a new one
      *
@@ -11878,12 +11903,6 @@ class GithubUtils {
         })
             .then((response) => response.data.workflow_runs[0]?.id);
     }
-    /**
-     * Generate the well-formatted body of a production release.
-     */
-    static getReleaseBody(pullRequests) {
-        return pullRequests.map((number) => `- ${this.getPullRequestURLFromNumber(number)}`).join('\r\n');
-    }
     /**
      * Generate the URL of an New Expensify pull request given the PR number.
      */
@@ -11939,12 +11958,31 @@ class GithubUtils {
             .then((events) => events.filter((event) => event.event === 'closed'))
             .then((closedEvents) => closedEvents.at(-1)?.actor?.login ?? '');
     }
-    static getArtifactByName(artefactName) {
-        return this.paginate(this.octokit.actions.listArtifactsForRepo, {
+    /**
+     * Returns a single artifact by name. If none is found, it returns undefined.
+     */
+    static getArtifactByName(artifactName) {
+        return this.octokit.actions
+            .listArtifactsForRepo({
             owner: CONST_1.default.GITHUB_OWNER,
             repo: CONST_1.default.APP_REPO,
-            per_page: 100,
-        }).then((artifacts) => artifacts.find((artifact) => artifact.name === artefactName));
+            per_page: 1,
+            name: artifactName,
+        })
+            .then((response) => response.data.artifacts[0]);
+    }
+    /**
+     * Given an artifact ID, returns the download URL to a zip file containing the artifact.
+     */
+    static getArtifactDownloadURL(artifactId) {
+        return this.octokit.actions
+            .downloadArtifact({
+            owner: CONST_1.default.GITHUB_OWNER,
+            repo: CONST_1.default.APP_REPO,
+            artifact_id: artifactId,
+            archive_format: 'zip',
+        })
+            .then((response) => response.url);
     }
 }
 exports["default"] = GithubUtils;
@@ -11985,27 +12023,27 @@ exports["default"] = arrayDifference;
 
 /***/ }),
 
-/***/ 2877:
+/***/ 9491:
 /***/ ((module) => {
 
-module.exports = eval("require")("encoding");
-
+"use strict";
+module.exports = require("assert");
 
 /***/ }),
 
-/***/ 9491:
+/***/ 6113:
 /***/ ((module) => {
 
 "use strict";
-module.exports = require("assert");
+module.exports = require("crypto");
 
 /***/ }),
 
-/***/ 6113:
+/***/ 3975:
 /***/ ((module) => {
 
 "use strict";
-module.exports = require("crypto");
+module.exports = require("encoding");
 
 /***/ }),
 
diff --git a/.github/actions/javascript/getDeployPullRequestList/getDeployPullRequestList.ts b/.github/actions/javascript/getDeployPullRequestList/getDeployPullRequestList.ts
index ecf242f00cc2..da946b78a056 100644
--- a/.github/actions/javascript/getDeployPullRequestList/getDeployPullRequestList.ts
+++ b/.github/actions/javascript/getDeployPullRequestList/getDeployPullRequestList.ts
@@ -1,13 +1,83 @@
 import * as core from '@actions/core';
 import * as github from '@actions/github';
+import type {RestEndpointMethodTypes} from '@octokit/plugin-rest-endpoint-methods/dist-types/generated/parameters-and-response-types';
 import {getJSONInput} from '@github/libs/ActionUtils';
 import GithubUtils from '@github/libs/GithubUtils';
 import GitUtils from '@github/libs/GitUtils';
 
+type WorkflowRun = RestEndpointMethodTypes['actions']['listWorkflowRuns']['response']['data']['workflow_runs'][number];
+
+const BUILD_AND_DEPLOY_JOB_NAME_PREFIX = 'Build and deploy';
+
+/**
+ * This function checks if a given release is a valid baseTag to get the PR list with `git log baseTag...endTag`.
+ *
+ * The rules are:
+ *     - production deploys can only be compared with other production deploys
+ *     - staging deploys can be compared with other staging deploys or production deploys.
+ *       The reason is that the final staging release in each deploy cycle will BECOME a production release.
+ *       For example, imagine a checklist is closed with version 9.0.20-6; that's the most recent staging deploy, but the release for 9.0.20-6 is now finalized, so it looks like a prod deploy.
+ *       When 9.0.21-0 finishes deploying to staging, the most recent prerelease is 9.0.20-5. However, we want 9.0.20-6...9.0.21-0,
+ *       NOT 9.0.20-5...9.0.21-0 (so that the PR CP'd in 9.0.20-6 is not included in the next checklist)
+ */
+async function isReleaseValidBaseForEnvironment(releaseTag: string, isProductionDeploy: boolean) {
+    if (!isProductionDeploy) {
+        return true;
+    }
+    const isPrerelease = (
+        await GithubUtils.octokit.repos.getReleaseByTag({
+            owner: github.context.repo.owner,
+            repo: github.context.repo.repo,
+            tag: releaseTag,
+        })
+    ).data.prerelease;
+    return !isPrerelease;
+}
+
+/**
+ * Was a given platformDeploy workflow run successful on at least one platform?
+ */
+async function wasDeploySuccessful(runID: number) {
+    const jobsForWorkflowRun = (
+        await GithubUtils.octokit.actions.listJobsForWorkflowRun({
+            owner: github.context.repo.owner,
+            repo: github.context.repo.repo,
+            // eslint-disable-next-line @typescript-eslint/naming-convention
+            run_id: runID,
+            filter: 'latest',
+        })
+    ).data.jobs;
+    return jobsForWorkflowRun.some((job) => job.name.startsWith(BUILD_AND_DEPLOY_JOB_NAME_PREFIX) && job.conclusion === 'success');
+}
+
+/**
+ * This function checks if a given deploy workflow is a valid basis for comparison when listing PRs merged between two versions.
+ * It returns the reason a version should be skipped, or an empty string if the version should not be skipped.
+ */
+async function shouldSkipVersion(lastSuccessfulDeploy: WorkflowRun, inputTag: string, isProductionDeploy: boolean): Promise<string> {
+    if (!lastSuccessfulDeploy?.head_branch) {
+        // This should never happen. Just doing this to appease TS.
+        return '';
+    }
+
+    // we never want to compare a tag with itself. This check is necessary because prod deploys almost always have the same version as the last staging deploy.
+    // In this case, the next for wrong environment fails because the release that triggered that staging deploy is now finalized, so it looks like a prod deploy.
+    if (lastSuccessfulDeploy?.head_branch === inputTag) {
+        return `Same as input tag ${inputTag}`;
+    }
+    if (!(await isReleaseValidBaseForEnvironment(lastSuccessfulDeploy?.head_branch, isProductionDeploy))) {
+        return 'Was a staging deploy, we only want to compare with other production deploys';
+    }
+    if (!(await wasDeploySuccessful(lastSuccessfulDeploy.id))) {
+        return 'Was an unsuccessful deploy, nothing was deployed in that version';
+    }
+    return '';
+}
+
 async function run() {
     try {
         const inputTag = core.getInput('TAG', {required: true});
-        const isProductionDeploy = getJSONInput('IS_PRODUCTION_DEPLOY', {required: false}, false);
+        const isProductionDeploy = !!getJSONInput('IS_PRODUCTION_DEPLOY', {required: false}, false);
         const deployEnv = isProductionDeploy ? 'production' : 'staging';
 
         console.log(`Looking for PRs deployed to ${deployEnv} in ${inputTag}...`);
@@ -19,11 +89,35 @@ async function run() {
                 // eslint-disable-next-line @typescript-eslint/naming-convention
                 workflow_id: 'platformDeploy.yml',
                 status: 'completed',
-                event: isProductionDeploy ? 'release' : 'push',
             })
-        ).data.workflow_runs;
+        ).data.workflow_runs
+            // Note: we filter out cancelled runs instead of looking only for success runs
+            // because if a build fails on even one platform, then it will have the status 'failure'
+            .filter((workflowRun) => workflowRun.conclusion !== 'cancelled');
+
+        // Find the most recent deploy workflow targeting the correct environment, for which at least one of the build jobs finished successfully
+        let lastSuccessfulDeploy = completedDeploys.shift();
+
+        if (!lastSuccessfulDeploy) {
+            throw new Error('Could not find a prior successful deploy');
+        }
+
+        let reason = await shouldSkipVersion(lastSuccessfulDeploy, inputTag, isProductionDeploy);
+        while (lastSuccessfulDeploy && reason) {
+            console.log(
+                `Deploy of tag ${lastSuccessfulDeploy.head_branch} was not valid as a base for comparison, looking at the next one. Reason: ${reason}`,
+                lastSuccessfulDeploy.html_url,
+            );
+            lastSuccessfulDeploy = completedDeploys.shift();
+
+            if (!lastSuccessfulDeploy) {
+                throw new Error('Could not find a prior successful deploy');
+            }
+
+            reason = await shouldSkipVersion(lastSuccessfulDeploy, inputTag, isProductionDeploy);
+        }
 
-        const priorTag = completedDeploys[0].head_branch;
+        const priorTag = lastSuccessfulDeploy.head_branch;
         console.log(`Looking for PRs deployed to ${deployEnv} between ${priorTag} and ${inputTag}`);
         const prList = await GitUtils.getPullRequestsMergedBetween(priorTag ?? '', inputTag);
         console.log('Found the pull request list: ', prList);
diff --git a/.github/actions/javascript/getDeployPullRequestList/index.js b/.github/actions/javascript/getDeployPullRequestList/index.js
index 8f9f9deea896..300cb1edc0ed 100644
--- a/.github/actions/javascript/getDeployPullRequestList/index.js
+++ b/.github/actions/javascript/getDeployPullRequestList/index.js
@@ -6723,7 +6723,7 @@ FetchError.prototype.name = 'FetchError';
 
 let convert;
 try {
-	convert = (__nccwpck_require__(2877).convert);
+	convert = (__nccwpck_require__(3975).convert);
 } catch (e) {}
 
 const INTERNALS = Symbol('Body internals');
@@ -11502,10 +11502,68 @@ const github = __importStar(__nccwpck_require__(5438));
 const ActionUtils_1 = __nccwpck_require__(6981);
 const GithubUtils_1 = __importDefault(__nccwpck_require__(9296));
 const GitUtils_1 = __importDefault(__nccwpck_require__(1547));
+const BUILD_AND_DEPLOY_JOB_NAME_PREFIX = 'Build and deploy';
+/**
+ * This function checks if a given release is a valid baseTag to get the PR list with `git log baseTag...endTag`.
+ *
+ * The rules are:
+ *     - production deploys can only be compared with other production deploys
+ *     - staging deploys can be compared with other staging deploys or production deploys.
+ *       The reason is that the final staging release in each deploy cycle will BECOME a production release.
+ *       For example, imagine a checklist is closed with version 9.0.20-6; that's the most recent staging deploy, but the release for 9.0.20-6 is now finalized, so it looks like a prod deploy.
+ *       When 9.0.21-0 finishes deploying to staging, the most recent prerelease is 9.0.20-5. However, we want 9.0.20-6...9.0.21-0,
+ *       NOT 9.0.20-5...9.0.21-0 (so that the PR CP'd in 9.0.20-6 is not included in the next checklist)
+ */
+async function isReleaseValidBaseForEnvironment(releaseTag, isProductionDeploy) {
+    if (!isProductionDeploy) {
+        return true;
+    }
+    const isPrerelease = (await GithubUtils_1.default.octokit.repos.getReleaseByTag({
+        owner: github.context.repo.owner,
+        repo: github.context.repo.repo,
+        tag: releaseTag,
+    })).data.prerelease;
+    return !isPrerelease;
+}
+/**
+ * Was a given platformDeploy workflow run successful on at least one platform?
+ */
+async function wasDeploySuccessful(runID) {
+    const jobsForWorkflowRun = (await GithubUtils_1.default.octokit.actions.listJobsForWorkflowRun({
+        owner: github.context.repo.owner,
+        repo: github.context.repo.repo,
+        // eslint-disable-next-line @typescript-eslint/naming-convention
+        run_id: runID,
+        filter: 'latest',
+    })).data.jobs;
+    return jobsForWorkflowRun.some((job) => job.name.startsWith(BUILD_AND_DEPLOY_JOB_NAME_PREFIX) && job.conclusion === 'success');
+}
+/**
+ * This function checks if a given deploy workflow is a valid basis for comparison when listing PRs merged between two versions.
+ * It returns the reason a version should be skipped, or an empty string if the version should not be skipped.
+ */
+async function shouldSkipVersion(lastSuccessfulDeploy, inputTag, isProductionDeploy) {
+    if (!lastSuccessfulDeploy?.head_branch) {
+        // This should never happen. Just doing this to appease TS.
+        return '';
+    }
+    // we never want to compare a tag with itself. This check is necessary because prod deploys almost always have the same version as the last staging deploy.
+    // In this case, the next for wrong environment fails because the release that triggered that staging deploy is now finalized, so it looks like a prod deploy.
+    if (lastSuccessfulDeploy?.head_branch === inputTag) {
+        return `Same as input tag ${inputTag}`;
+    }
+    if (!(await isReleaseValidBaseForEnvironment(lastSuccessfulDeploy?.head_branch, isProductionDeploy))) {
+        return 'Was a staging deploy, we only want to compare with other production deploys';
+    }
+    if (!(await wasDeploySuccessful(lastSuccessfulDeploy.id))) {
+        return 'Was an unsuccessful deploy, nothing was deployed in that version';
+    }
+    return '';
+}
 async function run() {
     try {
         const inputTag = core.getInput('TAG', { required: true });
-        const isProductionDeploy = (0, ActionUtils_1.getJSONInput)('IS_PRODUCTION_DEPLOY', { required: false }, false);
+        const isProductionDeploy = !!(0, ActionUtils_1.getJSONInput)('IS_PRODUCTION_DEPLOY', { required: false }, false);
         const deployEnv = isProductionDeploy ? 'production' : 'staging';
         console.log(`Looking for PRs deployed to ${deployEnv} in ${inputTag}...`);
         const completedDeploys = (await GithubUtils_1.default.octokit.actions.listWorkflowRuns({
@@ -11514,9 +11572,25 @@ async function run() {
             // eslint-disable-next-line @typescript-eslint/naming-convention
             workflow_id: 'platformDeploy.yml',
             status: 'completed',
-            event: isProductionDeploy ? 'release' : 'push',
-        })).data.workflow_runs;
-        const priorTag = completedDeploys[0].head_branch;
+        })).data.workflow_runs
+            // Note: we filter out cancelled runs instead of looking only for success runs
+            // because if a build fails on even one platform, then it will have the status 'failure'
+            .filter((workflowRun) => workflowRun.conclusion !== 'cancelled');
+        // Find the most recent deploy workflow targeting the correct environment, for which at least one of the build jobs finished successfully
+        let lastSuccessfulDeploy = completedDeploys.shift();
+        if (!lastSuccessfulDeploy) {
+            throw new Error('Could not find a prior successful deploy');
+        }
+        let reason = await shouldSkipVersion(lastSuccessfulDeploy, inputTag, isProductionDeploy);
+        while (lastSuccessfulDeploy && reason) {
+            console.log(`Deploy of tag ${lastSuccessfulDeploy.head_branch} was not valid as a base for comparison, looking at the next one. Reason: ${reason}`, lastSuccessfulDeploy.html_url);
+            lastSuccessfulDeploy = completedDeploys.shift();
+            if (!lastSuccessfulDeploy) {
+                throw new Error('Could not find a prior successful deploy');
+            }
+            reason = await shouldSkipVersion(lastSuccessfulDeploy, inputTag, isProductionDeploy);
+        }
+        const priorTag = lastSuccessfulDeploy.head_branch;
         console.log(`Looking for PRs deployed to ${deployEnv} between ${priorTag} and ${inputTag}`);
         const prList = await GitUtils_1.default.getPullRequestsMergedBetween(priorTag ?? '', inputTag);
         console.log('Found the pull request list: ', prList);
@@ -11616,7 +11690,22 @@ const CONST = {
         STAGING_DEPLOY: 'StagingDeployCash',
         DEPLOY_BLOCKER: 'DeployBlockerCash',
         INTERNAL_QA: 'InternalQA',
+        HELP_WANTED: 'Help Wanted',
+        CP_STAGING: 'CP Staging',
+    },
+    ACTIONS: {
+        CREATED: 'created',
+        EDIT: 'edited',
     },
+    EVENTS: {
+        ISSUE_COMMENT: 'issue_comment',
+    },
+    OPENAI_ROLES: {
+        USER: 'user',
+        ASSISTANT: 'assistant',
+    },
+    PROPOSAL_KEYWORD: 'Proposal',
+    OPENAI_THREAD_COMPLETED: 'completed',
     DATE_FORMAT_STRING: 'yyyy-MM-dd',
     PULL_REQUEST_REGEX: new RegExp(`${GITHUB_BASE_URL_REGEX.source}/.*/.*/pull/([0-9]+).*`),
     ISSUE_REGEX: new RegExp(`${GITHUB_BASE_URL_REGEX.source}/.*/.*/issues/([0-9]+).*`),
@@ -11624,6 +11713,9 @@ const CONST = {
     POLL_RATE: 10000,
     APP_REPO_URL: `https://github.com/${GIT_CONST.GITHUB_OWNER}/${GIT_CONST.APP_REPO}`,
     APP_REPO_GIT_URL: `git@github.com:${GIT_CONST.GITHUB_OWNER}/${GIT_CONST.APP_REPO}.git`,
+    NO_ACTION: 'NO_ACTION',
+    OPENAI_POLL_RATE: 1500,
+    OPENAI_POLL_TIMEOUT: 90000,
 };
 exports["default"] = CONST;
 
@@ -11665,7 +11757,66 @@ Object.defineProperty(exports, "__esModule", ({ value: true }));
 const child_process_1 = __nccwpck_require__(2081);
 const CONST_1 = __importDefault(__nccwpck_require__(9873));
 const sanitizeStringForJSONParse_1 = __importDefault(__nccwpck_require__(3902));
-const VERSION_UPDATER = __importStar(__nccwpck_require__(8982));
+const VersionUpdater = __importStar(__nccwpck_require__(8982));
+/**
+ * Check if a tag exists locally or in the remote.
+ */
+function tagExists(tag) {
+    try {
+        // Check if the tag exists locally
+        (0, child_process_1.execSync)(`git show-ref --tags ${tag}`, { stdio: 'ignore' });
+        return true; // Tag exists locally
+    }
+    catch (error) {
+        // Tag does not exist locally, check in remote
+        let shouldRetry = true;
+        let needsRepack = false;
+        let doesTagExist = false;
+        while (shouldRetry) {
+            try {
+                if (needsRepack) {
+                    // We have seen some scenarios where this fixes the git fetch.
+                    // Why? Who knows... https://github.com/Expensify/App/pull/31459
+                    (0, child_process_1.execSync)('git repack -d', { stdio: 'inherit' });
+                }
+                (0, child_process_1.execSync)(`git ls-remote --exit-code --tags origin ${tag}`, { stdio: 'ignore' });
+                doesTagExist = true;
+                shouldRetry = false;
+            }
+            catch (e) {
+                if (!needsRepack) {
+                    console.log('Attempting to repack and retry...');
+                    needsRepack = true;
+                }
+                else {
+                    console.error("Repack didn't help, giving up...");
+                    shouldRetry = false;
+                }
+            }
+        }
+        return doesTagExist;
+    }
+}
+/**
+ * This essentially just calls getPreviousVersion in a loop, until it finds a version for which a tag exists.
+ * It's useful if we manually perform a version bump, because in that case a tag may not exist for the previous version.
+ *
+ * @param tag the current tag
+ * @param level the Semver level to step backward by
+ */
+function getPreviousExistingTag(tag, level) {
+    let previousVersion = VersionUpdater.getPreviousVersion(tag, level);
+    let tagExistsForPreviousVersion = false;
+    while (!tagExistsForPreviousVersion) {
+        if (tagExists(previousVersion)) {
+            tagExistsForPreviousVersion = true;
+            break;
+        }
+        console.log(`Tag for previous version ${previousVersion} does not exist. Checking for an older version...`);
+        previousVersion = VersionUpdater.getPreviousVersion(previousVersion, level);
+    }
+    return previousVersion;
+}
 /**
  * @param [shallowExcludeTag] When fetching the given tag, exclude all history reachable by the shallowExcludeTag (used to make fetch much faster)
  */
@@ -11708,8 +11859,8 @@ function fetchTag(tag, shallowExcludeTag = '') {
  * Get merge logs between two tags (inclusive) as a JavaScript object.
  */
 function getCommitHistoryAsJSON(fromTag, toTag) {
-    // Fetch tags, exclude commits reachable from the previous patch version (i.e: previous checklist), so that we don't have to fetch the full history
-    const previousPatchVersion = VERSION_UPDATER.getPreviousVersion(fromTag, VERSION_UPDATER.SEMANTIC_VERSION_LEVELS.PATCH);
+    // Fetch tags, excluding commits reachable from the previous patch version (i.e: previous checklist), so that we don't have to fetch the full history
+    const previousPatchVersion = getPreviousExistingTag(fromTag, VersionUpdater.SEMANTIC_VERSION_LEVELS.PATCH);
     fetchTag(fromTag, previousPatchVersion);
     fetchTag(toTag, previousPatchVersion);
     console.log('Getting pull requests merged between the following tags:', fromTag, toTag);
@@ -11730,6 +11881,7 @@ function getCommitHistoryAsJSON(fromTag, toTag) {
         });
         spawnedProcess.on('close', (code) => {
             if (code !== 0) {
+                console.log('code: ', code);
                 return reject(new Error(`${stderr}`));
             }
             resolve(stdout);
@@ -11781,6 +11933,7 @@ async function getPullRequestsMergedBetween(fromTag, toTag) {
     return pullRequestNumbers;
 }
 exports["default"] = {
+    getPreviousExistingTag,
     getValidMergedPRs,
     getPullRequestsMergedBetween,
 };
@@ -11831,13 +11984,11 @@ const CONST_1 = __importDefault(__nccwpck_require__(9873));
 class GithubUtils {
     static internalOctokit;
     /**
-     * Initialize internal octokit
-     *
-     * @private
+     * Initialize internal octokit.
+     * NOTE: When using GithubUtils in CI, you don't need to call this manually.
      */
-    static initOctokit() {
+    static initOctokitWithToken(token) {
         const Octokit = utils_1.GitHub.plugin(plugin_throttling_1.throttling, plugin_paginate_rest_1.paginateRest);
-        const token = core.getInput('GITHUB_TOKEN', { required: true });
         // Save a copy of octokit used in this class
         this.internalOctokit = new Octokit((0, utils_1.getOctokitOptions)(token, {
             throttle: {
@@ -11857,6 +12008,15 @@ class GithubUtils {
             },
         }));
     }
+    /**
+     * Default initialize method assuming running in CI, getting the token from an input.
+     *
+     * @private
+     */
+    static initOctokit() {
+        const token = core.getInput('GITHUB_TOKEN', { required: true });
+        this.initOctokitWithToken(token);
+    }
     /**
      * Either give an existing instance of Octokit rest or create a new one
      *
@@ -12151,12 +12311,6 @@ class GithubUtils {
         })
             .then((response) => response.data.workflow_runs[0]?.id);
     }
-    /**
-     * Generate the well-formatted body of a production release.
-     */
-    static getReleaseBody(pullRequests) {
-        return pullRequests.map((number) => `- ${this.getPullRequestURLFromNumber(number)}`).join('\r\n');
-    }
     /**
      * Generate the URL of an New Expensify pull request given the PR number.
      */
@@ -12212,12 +12366,31 @@ class GithubUtils {
             .then((events) => events.filter((event) => event.event === 'closed'))
             .then((closedEvents) => closedEvents.at(-1)?.actor?.login ?? '');
     }
-    static getArtifactByName(artefactName) {
-        return this.paginate(this.octokit.actions.listArtifactsForRepo, {
+    /**
+     * Returns a single artifact by name. If none is found, it returns undefined.
+     */
+    static getArtifactByName(artifactName) {
+        return this.octokit.actions
+            .listArtifactsForRepo({
             owner: CONST_1.default.GITHUB_OWNER,
             repo: CONST_1.default.APP_REPO,
-            per_page: 100,
-        }).then((artifacts) => artifacts.find((artifact) => artifact.name === artefactName));
+            per_page: 1,
+            name: artifactName,
+        })
+            .then((response) => response.data.artifacts[0]);
+    }
+    /**
+     * Given an artifact ID, returns the download URL to a zip file containing the artifact.
+     */
+    static getArtifactDownloadURL(artifactId) {
+        return this.octokit.actions
+            .downloadArtifact({
+            owner: CONST_1.default.GITHUB_OWNER,
+            repo: CONST_1.default.APP_REPO,
+            artifact_id: artifactId,
+            archive_format: 'zip',
+        })
+            .then((response) => response.url);
     }
 }
 exports["default"] = GithubUtils;
@@ -12264,7 +12437,7 @@ exports["default"] = sanitizeStringForJSONParse;
 "use strict";
 
 Object.defineProperty(exports, "__esModule", ({ value: true }));
-exports.getPreviousVersion = exports.incrementPatch = exports.incrementMinor = exports.SEMANTIC_VERSION_LEVELS = exports.MAX_INCREMENTS = exports.incrementVersion = exports.getVersionStringFromNumber = exports.getVersionNumberFromString = void 0;
+exports.getPreviousVersion = exports.incrementPatch = exports.incrementMinor = exports.SEMANTIC_VERSION_LEVELS = exports.MAX_INCREMENTS = exports.incrementVersion = exports.getVersionStringFromNumber = exports.getVersionNumberFromString = exports.isValidSemverLevel = void 0;
 const SEMANTIC_VERSION_LEVELS = {
     MAJOR: 'MAJOR',
     MINOR: 'MINOR',
@@ -12274,6 +12447,10 @@ const SEMANTIC_VERSION_LEVELS = {
 exports.SEMANTIC_VERSION_LEVELS = SEMANTIC_VERSION_LEVELS;
 const MAX_INCREMENTS = 99;
 exports.MAX_INCREMENTS = MAX_INCREMENTS;
+function isValidSemverLevel(str) {
+    return Object.keys(SEMANTIC_VERSION_LEVELS).includes(str);
+}
+exports.isValidSemverLevel = isValidSemverLevel;
 /**
  * Transforms a versions string into a number
  */
@@ -12390,14 +12567,6 @@ function arrayDifference(array1, array2) {
 exports["default"] = arrayDifference;
 
 
-/***/ }),
-
-/***/ 2877:
-/***/ ((module) => {
-
-module.exports = eval("require")("encoding");
-
-
 /***/ }),
 
 /***/ 9491:
@@ -12424,6 +12593,14 @@ module.exports = require("crypto");
 
 /***/ }),
 
+/***/ 3975:
+/***/ ((module) => {
+
+"use strict";
+module.exports = require("encoding");
+
+/***/ }),
+
 /***/ 2361:
 /***/ ((module) => {
 
diff --git a/.github/actions/javascript/getGraphiteString/getGraphiteString.ts b/.github/actions/javascript/getGraphiteString/getGraphiteString.ts
index 57a941105f90..93d5d8a9618b 100644
--- a/.github/actions/javascript/getGraphiteString/getGraphiteString.ts
+++ b/.github/actions/javascript/getGraphiteString/getGraphiteString.ts
@@ -1,6 +1,15 @@
 import * as core from '@actions/core';
 import fs from 'fs';
 
+type RegressionEntry = {
+    metadata?: {
+        creationDate: string;
+    };
+    name: string;
+    meanDuration: number;
+    meanCount: number;
+};
+
 const run = () => {
     // Prefix path to the graphite metric
     const GRAPHITE_PATH = 'reassure';
@@ -24,7 +33,7 @@ const run = () => {
         }
 
         try {
-            const current = JSON.parse(entry);
+            const current = JSON.parse(entry) as RegressionEntry;
 
             // Extract timestamp, Graphite accepts timestamp in seconds
             if (current.metadata?.creationDate) {
diff --git a/.github/actions/javascript/getPreviousVersion/getPreviousVersion.ts b/.github/actions/javascript/getPreviousVersion/getPreviousVersion.ts
index dc1e99d1e3b8..7799ffe7c9ec 100644
--- a/.github/actions/javascript/getPreviousVersion/getPreviousVersion.ts
+++ b/.github/actions/javascript/getPreviousVersion/getPreviousVersion.ts
@@ -1,12 +1,29 @@
 import * as core from '@actions/core';
 import {readFileSync} from 'fs';
+import type {PackageJson} from 'type-fest';
+import GitUtils from '@github/libs/GitUtils';
 import * as versionUpdater from '@github/libs/versionUpdater';
+import type {SemverLevel} from '@github/libs/versionUpdater';
 
-const semverLevel = core.getInput('SEMVER_LEVEL', {required: true});
-if (!semverLevel || !Object.values<string>(versionUpdater.SEMANTIC_VERSION_LEVELS).includes(semverLevel)) {
-    core.setFailed(`'Error: Invalid input for 'SEMVER_LEVEL': ${semverLevel}`);
+function run() {
+    const semverLevel = core.getInput('SEMVER_LEVEL', {required: true});
+    if (!semverLevel || !versionUpdater.isValidSemverLevel(semverLevel)) {
+        core.setFailed(`'Error: Invalid input for 'SEMVER_LEVEL': ${semverLevel}`);
+    }
+
+    const {version: currentVersion} = JSON.parse(readFileSync('./package.json', 'utf8')) as PackageJson;
+    if (!currentVersion) {
+        core.setFailed('Error: Could not read package.json');
+    }
+
+    // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+    const previousVersion = GitUtils.getPreviousExistingTag(currentVersion!, semverLevel as SemverLevel);
+    core.setOutput('PREVIOUS_VERSION', previousVersion);
+    return previousVersion;
+}
+
+if (require.main === module) {
+    run();
 }
 
-const {version: currentVersion} = JSON.parse(readFileSync('./package.json', 'utf8'));
-const previousVersion = versionUpdater.getPreviousVersion(currentVersion, semverLevel);
-core.setOutput('PREVIOUS_VERSION', previousVersion);
+export default run;
diff --git a/.github/actions/javascript/getPreviousVersion/index.js b/.github/actions/javascript/getPreviousVersion/index.js
index f372f0fdaf99..9938951d6768 100644
--- a/.github/actions/javascript/getPreviousVersion/index.js
+++ b/.github/actions/javascript/getPreviousVersion/index.js
@@ -2719,17 +2719,335 @@ var __importStar = (this && this.__importStar) || function (mod) {
     __setModuleDefault(result, mod);
     return result;
 };
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", ({ value: true }));
 const core = __importStar(__nccwpck_require__(186));
 const fs_1 = __nccwpck_require__(147);
+const GitUtils_1 = __importDefault(__nccwpck_require__(547));
 const versionUpdater = __importStar(__nccwpck_require__(982));
-const semverLevel = core.getInput('SEMVER_LEVEL', { required: true });
-if (!semverLevel || !Object.values(versionUpdater.SEMANTIC_VERSION_LEVELS).includes(semverLevel)) {
-    core.setFailed(`'Error: Invalid input for 'SEMVER_LEVEL': ${semverLevel}`);
+function run() {
+    const semverLevel = core.getInput('SEMVER_LEVEL', { required: true });
+    if (!semverLevel || !versionUpdater.isValidSemverLevel(semverLevel)) {
+        core.setFailed(`'Error: Invalid input for 'SEMVER_LEVEL': ${semverLevel}`);
+    }
+    const { version: currentVersion } = JSON.parse((0, fs_1.readFileSync)('./package.json', 'utf8'));
+    if (!currentVersion) {
+        core.setFailed('Error: Could not read package.json');
+    }
+    // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+    const previousVersion = GitUtils_1.default.getPreviousExistingTag(currentVersion, semverLevel);
+    core.setOutput('PREVIOUS_VERSION', previousVersion);
+    return previousVersion;
+}
+if (require.main === require.cache[eval('__filename')]) {
+    run();
 }
-const { version: currentVersion } = JSON.parse((0, fs_1.readFileSync)('./package.json', 'utf8'));
-const previousVersion = versionUpdater.getPreviousVersion(currentVersion, semverLevel);
-core.setOutput('PREVIOUS_VERSION', previousVersion);
+exports["default"] = run;
+
+
+/***/ }),
+
+/***/ 873:
+/***/ ((__unused_webpack_module, exports) => {
+
+"use strict";
+
+Object.defineProperty(exports, "__esModule", ({ value: true }));
+const GITHUB_BASE_URL_REGEX = new RegExp('https?://(?:github\\.com|api\\.github\\.com)');
+const GIT_CONST = {
+    GITHUB_OWNER: 'Expensify',
+    APP_REPO: 'App',
+};
+const CONST = {
+    ...GIT_CONST,
+    APPLAUSE_BOT: 'applausebot',
+    OS_BOTIFY: 'OSBotify',
+    LABELS: {
+        STAGING_DEPLOY: 'StagingDeployCash',
+        DEPLOY_BLOCKER: 'DeployBlockerCash',
+        INTERNAL_QA: 'InternalQA',
+        HELP_WANTED: 'Help Wanted',
+        CP_STAGING: 'CP Staging',
+    },
+    ACTIONS: {
+        CREATED: 'created',
+        EDIT: 'edited',
+    },
+    EVENTS: {
+        ISSUE_COMMENT: 'issue_comment',
+    },
+    OPENAI_ROLES: {
+        USER: 'user',
+        ASSISTANT: 'assistant',
+    },
+    PROPOSAL_KEYWORD: 'Proposal',
+    OPENAI_THREAD_COMPLETED: 'completed',
+    DATE_FORMAT_STRING: 'yyyy-MM-dd',
+    PULL_REQUEST_REGEX: new RegExp(`${GITHUB_BASE_URL_REGEX.source}/.*/.*/pull/([0-9]+).*`),
+    ISSUE_REGEX: new RegExp(`${GITHUB_BASE_URL_REGEX.source}/.*/.*/issues/([0-9]+).*`),
+    ISSUE_OR_PULL_REQUEST_REGEX: new RegExp(`${GITHUB_BASE_URL_REGEX.source}/.*/.*/(?:pull|issues)/([0-9]+).*`),
+    POLL_RATE: 10000,
+    APP_REPO_URL: `https://github.com/${GIT_CONST.GITHUB_OWNER}/${GIT_CONST.APP_REPO}`,
+    APP_REPO_GIT_URL: `git@github.com:${GIT_CONST.GITHUB_OWNER}/${GIT_CONST.APP_REPO}.git`,
+    NO_ACTION: 'NO_ACTION',
+    OPENAI_POLL_RATE: 1500,
+    OPENAI_POLL_TIMEOUT: 90000,
+};
+exports["default"] = CONST;
+
+
+/***/ }),
+
+/***/ 547:
+/***/ (function(__unused_webpack_module, exports, __nccwpck_require__) {
+
+"use strict";
+
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", ({ value: true }));
+const child_process_1 = __nccwpck_require__(81);
+const CONST_1 = __importDefault(__nccwpck_require__(873));
+const sanitizeStringForJSONParse_1 = __importDefault(__nccwpck_require__(902));
+const VersionUpdater = __importStar(__nccwpck_require__(982));
+/**
+ * Check if a tag exists locally or in the remote.
+ */
+function tagExists(tag) {
+    try {
+        // Check if the tag exists locally
+        (0, child_process_1.execSync)(`git show-ref --tags ${tag}`, { stdio: 'ignore' });
+        return true; // Tag exists locally
+    }
+    catch (error) {
+        // Tag does not exist locally, check in remote
+        let shouldRetry = true;
+        let needsRepack = false;
+        let doesTagExist = false;
+        while (shouldRetry) {
+            try {
+                if (needsRepack) {
+                    // We have seen some scenarios where this fixes the git fetch.
+                    // Why? Who knows... https://github.com/Expensify/App/pull/31459
+                    (0, child_process_1.execSync)('git repack -d', { stdio: 'inherit' });
+                }
+                (0, child_process_1.execSync)(`git ls-remote --exit-code --tags origin ${tag}`, { stdio: 'ignore' });
+                doesTagExist = true;
+                shouldRetry = false;
+            }
+            catch (e) {
+                if (!needsRepack) {
+                    console.log('Attempting to repack and retry...');
+                    needsRepack = true;
+                }
+                else {
+                    console.error("Repack didn't help, giving up...");
+                    shouldRetry = false;
+                }
+            }
+        }
+        return doesTagExist;
+    }
+}
+/**
+ * This essentially just calls getPreviousVersion in a loop, until it finds a version for which a tag exists.
+ * It's useful if we manually perform a version bump, because in that case a tag may not exist for the previous version.
+ *
+ * @param tag the current tag
+ * @param level the Semver level to step backward by
+ */
+function getPreviousExistingTag(tag, level) {
+    let previousVersion = VersionUpdater.getPreviousVersion(tag, level);
+    let tagExistsForPreviousVersion = false;
+    while (!tagExistsForPreviousVersion) {
+        if (tagExists(previousVersion)) {
+            tagExistsForPreviousVersion = true;
+            break;
+        }
+        console.log(`Tag for previous version ${previousVersion} does not exist. Checking for an older version...`);
+        previousVersion = VersionUpdater.getPreviousVersion(previousVersion, level);
+    }
+    return previousVersion;
+}
+/**
+ * @param [shallowExcludeTag] When fetching the given tag, exclude all history reachable by the shallowExcludeTag (used to make fetch much faster)
+ */
+function fetchTag(tag, shallowExcludeTag = '') {
+    let shouldRetry = true;
+    let needsRepack = false;
+    while (shouldRetry) {
+        try {
+            let command = '';
+            if (needsRepack) {
+                // We have seen some scenarios where this fixes the git fetch.
+                // Why? Who knows... https://github.com/Expensify/App/pull/31459
+                command = 'git repack -d';
+                console.log(`Running command: ${command}`);
+                (0, child_process_1.execSync)(command);
+            }
+            command = `git fetch origin tag ${tag} --no-tags`;
+            // Note that this condition is only ever NOT true in the 1.0.0-0 edge case
+            if (shallowExcludeTag && shallowExcludeTag !== tag) {
+                command += ` --shallow-exclude=${shallowExcludeTag}`;
+            }
+            console.log(`Running command: ${command}`);
+            (0, child_process_1.execSync)(command);
+            shouldRetry = false;
+        }
+        catch (e) {
+            console.error(e);
+            if (!needsRepack) {
+                console.log('Attempting to repack and retry...');
+                needsRepack = true;
+            }
+            else {
+                console.error("Repack didn't help, giving up...");
+                shouldRetry = false;
+            }
+        }
+    }
+}
+/**
+ * Get merge logs between two tags (inclusive) as a JavaScript object.
+ */
+function getCommitHistoryAsJSON(fromTag, toTag) {
+    // Fetch tags, excluding commits reachable from the previous patch version (i.e: previous checklist), so that we don't have to fetch the full history
+    const previousPatchVersion = getPreviousExistingTag(fromTag, VersionUpdater.SEMANTIC_VERSION_LEVELS.PATCH);
+    fetchTag(fromTag, previousPatchVersion);
+    fetchTag(toTag, previousPatchVersion);
+    console.log('Getting pull requests merged between the following tags:', fromTag, toTag);
+    return new Promise((resolve, reject) => {
+        let stdout = '';
+        let stderr = '';
+        const args = ['log', '--format={"commit": "%H", "authorName": "%an", "subject": "%s"},', `${fromTag}...${toTag}`];
+        console.log(`Running command: git ${args.join(' ')}`);
+        const spawnedProcess = (0, child_process_1.spawn)('git', args);
+        spawnedProcess.on('message', console.log);
+        spawnedProcess.stdout.on('data', (chunk) => {
+            console.log(chunk.toString());
+            stdout += chunk.toString();
+        });
+        spawnedProcess.stderr.on('data', (chunk) => {
+            console.error(chunk.toString());
+            stderr += chunk.toString();
+        });
+        spawnedProcess.on('close', (code) => {
+            if (code !== 0) {
+                console.log('code: ', code);
+                return reject(new Error(`${stderr}`));
+            }
+            resolve(stdout);
+        });
+        spawnedProcess.on('error', (err) => reject(err));
+    }).then((stdout) => {
+        // Sanitize just the text within commit subjects as that's the only potentially un-parseable text.
+        const sanitizedOutput = stdout.replace(/(?<="subject": ").*?(?="})/g, (subject) => (0, sanitizeStringForJSONParse_1.default)(subject));
+        // Then remove newlines, format as JSON and convert to a proper JS object
+        const json = `[${sanitizedOutput}]`.replace(/(\r\n|\n|\r)/gm, '').replace('},]', '}]');
+        return JSON.parse(json);
+    });
+}
+/**
+ * Parse merged PRs, excluding those from irrelevant branches.
+ */
+function getValidMergedPRs(commits) {
+    const mergedPRs = new Set();
+    commits.forEach((commit) => {
+        const author = commit.authorName;
+        if (author === CONST_1.default.OS_BOTIFY) {
+            return;
+        }
+        const match = commit.subject.match(/Merge pull request #(\d+) from (?!Expensify\/.*-cherry-pick-staging)/);
+        if (!Array.isArray(match) || match.length < 2) {
+            return;
+        }
+        const pr = Number.parseInt(match[1], 10);
+        if (mergedPRs.has(pr)) {
+            // If a PR shows up in the log twice, that means that the PR was deployed in the previous checklist.
+            // That also means that we don't want to include it in the current checklist, so we remove it now.
+            mergedPRs.delete(pr);
+            return;
+        }
+        mergedPRs.add(pr);
+    });
+    return Array.from(mergedPRs);
+}
+/**
+ * Takes in two git tags and returns a list of PR numbers of all PRs merged between those two tags
+ */
+async function getPullRequestsMergedBetween(fromTag, toTag) {
+    console.log(`Looking for commits made between ${fromTag} and ${toTag}...`);
+    const commitList = await getCommitHistoryAsJSON(fromTag, toTag);
+    console.log(`Commits made between ${fromTag} and ${toTag}:`, commitList);
+    // Find which commit messages correspond to merged PR's
+    const pullRequestNumbers = getValidMergedPRs(commitList).sort((a, b) => a - b);
+    console.log(`List of pull requests merged between ${fromTag} and ${toTag}`, pullRequestNumbers);
+    return pullRequestNumbers;
+}
+exports["default"] = {
+    getPreviousExistingTag,
+    getValidMergedPRs,
+    getPullRequestsMergedBetween,
+};
+
+
+/***/ }),
+
+/***/ 902:
+/***/ ((__unused_webpack_module, exports) => {
+
+"use strict";
+
+/* eslint-disable @typescript-eslint/naming-convention */
+Object.defineProperty(exports, "__esModule", ({ value: true }));
+const replacer = (str) => ({
+    '\\': '\\\\',
+    '\t': '\\t',
+    '\n': '\\n',
+    '\r': '\\r',
+    '\f': '\\f',
+    '"': '\\"',
+}[str] ?? '');
+/**
+ * Replace any characters in the string that will break JSON.parse for our Git Log output
+ *
+ * Solution partly taken from SO user Gabriel Rodríguez Flores 🙇
+ * https://stackoverflow.com/questions/52789718/how-to-remove-special-characters-before-json-parse-while-file-reading
+ */
+const sanitizeStringForJSONParse = (inputString) => {
+    if (typeof inputString !== 'string') {
+        throw new TypeError('Input must me of type String');
+    }
+    // Replace any newlines and escape backslashes
+    return inputString.replace(/\\|\t|\n|\r|\f|"/g, replacer);
+};
+exports["default"] = sanitizeStringForJSONParse;
 
 
 /***/ }),
@@ -2740,7 +3058,7 @@ core.setOutput('PREVIOUS_VERSION', previousVersion);
 "use strict";
 
 Object.defineProperty(exports, "__esModule", ({ value: true }));
-exports.getPreviousVersion = exports.incrementPatch = exports.incrementMinor = exports.SEMANTIC_VERSION_LEVELS = exports.MAX_INCREMENTS = exports.incrementVersion = exports.getVersionStringFromNumber = exports.getVersionNumberFromString = void 0;
+exports.getPreviousVersion = exports.incrementPatch = exports.incrementMinor = exports.SEMANTIC_VERSION_LEVELS = exports.MAX_INCREMENTS = exports.incrementVersion = exports.getVersionStringFromNumber = exports.getVersionNumberFromString = exports.isValidSemverLevel = void 0;
 const SEMANTIC_VERSION_LEVELS = {
     MAJOR: 'MAJOR',
     MINOR: 'MINOR',
@@ -2750,6 +3068,10 @@ const SEMANTIC_VERSION_LEVELS = {
 exports.SEMANTIC_VERSION_LEVELS = SEMANTIC_VERSION_LEVELS;
 const MAX_INCREMENTS = 99;
 exports.MAX_INCREMENTS = MAX_INCREMENTS;
+function isValidSemverLevel(str) {
+    return Object.keys(SEMANTIC_VERSION_LEVELS).includes(str);
+}
+exports.isValidSemverLevel = isValidSemverLevel;
 /**
  * Transforms a versions string into a number
  */
@@ -2843,6 +3165,14 @@ module.exports = require("assert");
 
 /***/ }),
 
+/***/ 81:
+/***/ ((module) => {
+
+"use strict";
+module.exports = require("child_process");
+
+/***/ }),
+
 /***/ 113:
 /***/ ((module) => {
 
diff --git a/.github/actions/javascript/getPullRequestDetails/index.js b/.github/actions/javascript/getPullRequestDetails/index.js
index 14814367e3cd..8580842b380c 100644
--- a/.github/actions/javascript/getPullRequestDetails/index.js
+++ b/.github/actions/javascript/getPullRequestDetails/index.js
@@ -6679,7 +6679,7 @@ FetchError.prototype.name = 'FetchError';
 
 let convert;
 try {
-	convert = (__nccwpck_require__(2877).convert);
+	convert = (__nccwpck_require__(3975).convert);
 } catch (e) {}
 
 const INTERNALS = Symbol('Body internals');
@@ -11603,7 +11603,22 @@ const CONST = {
         STAGING_DEPLOY: 'StagingDeployCash',
         DEPLOY_BLOCKER: 'DeployBlockerCash',
         INTERNAL_QA: 'InternalQA',
+        HELP_WANTED: 'Help Wanted',
+        CP_STAGING: 'CP Staging',
     },
+    ACTIONS: {
+        CREATED: 'created',
+        EDIT: 'edited',
+    },
+    EVENTS: {
+        ISSUE_COMMENT: 'issue_comment',
+    },
+    OPENAI_ROLES: {
+        USER: 'user',
+        ASSISTANT: 'assistant',
+    },
+    PROPOSAL_KEYWORD: 'Proposal',
+    OPENAI_THREAD_COMPLETED: 'completed',
     DATE_FORMAT_STRING: 'yyyy-MM-dd',
     PULL_REQUEST_REGEX: new RegExp(`${GITHUB_BASE_URL_REGEX.source}/.*/.*/pull/([0-9]+).*`),
     ISSUE_REGEX: new RegExp(`${GITHUB_BASE_URL_REGEX.source}/.*/.*/issues/([0-9]+).*`),
@@ -11611,6 +11626,9 @@ const CONST = {
     POLL_RATE: 10000,
     APP_REPO_URL: `https://github.com/${GIT_CONST.GITHUB_OWNER}/${GIT_CONST.APP_REPO}`,
     APP_REPO_GIT_URL: `git@github.com:${GIT_CONST.GITHUB_OWNER}/${GIT_CONST.APP_REPO}.git`,
+    NO_ACTION: 'NO_ACTION',
+    OPENAI_POLL_RATE: 1500,
+    OPENAI_POLL_TIMEOUT: 90000,
 };
 exports["default"] = CONST;
 
@@ -11660,13 +11678,11 @@ const CONST_1 = __importDefault(__nccwpck_require__(9873));
 class GithubUtils {
     static internalOctokit;
     /**
-     * Initialize internal octokit
-     *
-     * @private
+     * Initialize internal octokit.
+     * NOTE: When using GithubUtils in CI, you don't need to call this manually.
      */
-    static initOctokit() {
+    static initOctokitWithToken(token) {
         const Octokit = utils_1.GitHub.plugin(plugin_throttling_1.throttling, plugin_paginate_rest_1.paginateRest);
-        const token = core.getInput('GITHUB_TOKEN', { required: true });
         // Save a copy of octokit used in this class
         this.internalOctokit = new Octokit((0, utils_1.getOctokitOptions)(token, {
             throttle: {
@@ -11686,6 +11702,15 @@ class GithubUtils {
             },
         }));
     }
+    /**
+     * Default initialize method assuming running in CI, getting the token from an input.
+     *
+     * @private
+     */
+    static initOctokit() {
+        const token = core.getInput('GITHUB_TOKEN', { required: true });
+        this.initOctokitWithToken(token);
+    }
     /**
      * Either give an existing instance of Octokit rest or create a new one
      *
@@ -11980,12 +12005,6 @@ class GithubUtils {
         })
             .then((response) => response.data.workflow_runs[0]?.id);
     }
-    /**
-     * Generate the well-formatted body of a production release.
-     */
-    static getReleaseBody(pullRequests) {
-        return pullRequests.map((number) => `- ${this.getPullRequestURLFromNumber(number)}`).join('\r\n');
-    }
     /**
      * Generate the URL of an New Expensify pull request given the PR number.
      */
@@ -12041,12 +12060,31 @@ class GithubUtils {
             .then((events) => events.filter((event) => event.event === 'closed'))
             .then((closedEvents) => closedEvents.at(-1)?.actor?.login ?? '');
     }
-    static getArtifactByName(artefactName) {
-        return this.paginate(this.octokit.actions.listArtifactsForRepo, {
+    /**
+     * Returns a single artifact by name. If none is found, it returns undefined.
+     */
+    static getArtifactByName(artifactName) {
+        return this.octokit.actions
+            .listArtifactsForRepo({
             owner: CONST_1.default.GITHUB_OWNER,
             repo: CONST_1.default.APP_REPO,
-            per_page: 100,
-        }).then((artifacts) => artifacts.find((artifact) => artifact.name === artefactName));
+            per_page: 1,
+            name: artifactName,
+        })
+            .then((response) => response.data.artifacts[0]);
+    }
+    /**
+     * Given an artifact ID, returns the download URL to a zip file containing the artifact.
+     */
+    static getArtifactDownloadURL(artifactId) {
+        return this.octokit.actions
+            .downloadArtifact({
+            owner: CONST_1.default.GITHUB_OWNER,
+            repo: CONST_1.default.APP_REPO,
+            artifact_id: artifactId,
+            archive_format: 'zip',
+        })
+            .then((response) => response.url);
     }
 }
 exports["default"] = GithubUtils;
@@ -12087,27 +12125,27 @@ exports["default"] = arrayDifference;
 
 /***/ }),
 
-/***/ 2877:
+/***/ 9491:
 /***/ ((module) => {
 
-module.exports = eval("require")("encoding");
-
+"use strict";
+module.exports = require("assert");
 
 /***/ }),
 
-/***/ 9491:
+/***/ 6113:
 /***/ ((module) => {
 
 "use strict";
-module.exports = require("assert");
+module.exports = require("crypto");
 
 /***/ }),
 
-/***/ 6113:
+/***/ 3975:
 /***/ ((module) => {
 
 "use strict";
-module.exports = require("crypto");
+module.exports = require("encoding");
 
 /***/ }),
 
diff --git a/.github/actions/javascript/getReleaseBody/action.yml b/.github/actions/javascript/getReleaseBody/action.yml
deleted file mode 100644
index e4a451ccda8d..000000000000
--- a/.github/actions/javascript/getReleaseBody/action.yml
+++ /dev/null
@@ -1,12 +0,0 @@
-name: 'Get Release Body'
-description: 'Generate the body of a production release'
-inputs:
-  PR_LIST:
-    description: JSON array of pull request numbers (string)
-    required: true
-outputs:
-  RELEASE_BODY:
-    description: String body of a production release.
-runs:
-  using: 'node20'
-  main: './index.js'
diff --git a/.github/actions/javascript/getReleaseBody/getReleaseBody.ts b/.github/actions/javascript/getReleaseBody/getReleaseBody.ts
deleted file mode 100644
index 10024fedc5e7..000000000000
--- a/.github/actions/javascript/getReleaseBody/getReleaseBody.ts
+++ /dev/null
@@ -1,12 +0,0 @@
-import * as core from '@actions/core';
-import * as ActionUtils from '@github/libs/ActionUtils';
-import GithubUtils from '@github/libs/GithubUtils';
-
-// Parse the stringified JSON array of PR numbers, and cast each from String -> Number
-const PRList = ActionUtils.getJSONInput('PR_LIST', {required: true}) as number[];
-console.log('Got PR list: ', String(PRList));
-
-const releaseBody = GithubUtils.getReleaseBody(PRList);
-console.log(`Generated release body: ${releaseBody}`);
-
-core.setOutput('RELEASE_BODY', releaseBody);
diff --git a/.github/actions/javascript/getReleaseBody/index.js b/.github/actions/javascript/getReleaseBody/index.js
deleted file mode 100644
index 6c746e26a4a4..000000000000
--- a/.github/actions/javascript/getReleaseBody/index.js
+++ /dev/null
@@ -1,12216 +0,0 @@
-/**
- * NOTE: This is a compiled file. DO NOT directly edit this file.
- */
-/******/ (() => { // webpackBootstrap
-/******/ 	var __webpack_modules__ = ({
-
-/***/ 7351:
-/***/ (function(__unused_webpack_module, exports, __nccwpck_require__) {
-
-"use strict";
-
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
-Object.defineProperty(exports, "__esModule", ({ value: true }));
-exports.issue = exports.issueCommand = void 0;
-const os = __importStar(__nccwpck_require__(2037));
-const utils_1 = __nccwpck_require__(5278);
-/**
- * Commands
- *
- * Command Format:
- *   ::name key=value,key=value::message
- *
- * Examples:
- *   ::warning::This is the message
- *   ::set-env name=MY_VAR::some value
- */
-function issueCommand(command, properties, message) {
-    const cmd = new Command(command, properties, message);
-    process.stdout.write(cmd.toString() + os.EOL);
-}
-exports.issueCommand = issueCommand;
-function issue(name, message = '') {
-    issueCommand(name, {}, message);
-}
-exports.issue = issue;
-const CMD_STRING = '::';
-class Command {
-    constructor(command, properties, message) {
-        if (!command) {
-            command = 'missing.command';
-        }
-        this.command = command;
-        this.properties = properties;
-        this.message = message;
-    }
-    toString() {
-        let cmdStr = CMD_STRING + this.command;
-        if (this.properties && Object.keys(this.properties).length > 0) {
-            cmdStr += ' ';
-            let first = true;
-            for (const key in this.properties) {
-                if (this.properties.hasOwnProperty(key)) {
-                    const val = this.properties[key];
-                    if (val) {
-                        if (first) {
-                            first = false;
-                        }
-                        else {
-                            cmdStr += ',';
-                        }
-                        cmdStr += `${key}=${escapeProperty(val)}`;
-                    }
-                }
-            }
-        }
-        cmdStr += `${CMD_STRING}${escapeData(this.message)}`;
-        return cmdStr;
-    }
-}
-function escapeData(s) {
-    return utils_1.toCommandValue(s)
-        .replace(/%/g, '%25')
-        .replace(/\r/g, '%0D')
-        .replace(/\n/g, '%0A');
-}
-function escapeProperty(s) {
-    return utils_1.toCommandValue(s)
-        .replace(/%/g, '%25')
-        .replace(/\r/g, '%0D')
-        .replace(/\n/g, '%0A')
-        .replace(/:/g, '%3A')
-        .replace(/,/g, '%2C');
-}
-//# sourceMappingURL=command.js.map
-
-/***/ }),
-
-/***/ 2186:
-/***/ (function(__unused_webpack_module, exports, __nccwpck_require__) {
-
-"use strict";
-
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
-Object.defineProperty(exports, "__esModule", ({ value: true }));
-exports.getIDToken = exports.getState = exports.saveState = exports.group = exports.endGroup = exports.startGroup = exports.info = exports.notice = exports.warning = exports.error = exports.debug = exports.isDebug = exports.setFailed = exports.setCommandEcho = exports.setOutput = exports.getBooleanInput = exports.getMultilineInput = exports.getInput = exports.addPath = exports.setSecret = exports.exportVariable = exports.ExitCode = void 0;
-const command_1 = __nccwpck_require__(7351);
-const file_command_1 = __nccwpck_require__(717);
-const utils_1 = __nccwpck_require__(5278);
-const os = __importStar(__nccwpck_require__(2037));
-const path = __importStar(__nccwpck_require__(1017));
-const oidc_utils_1 = __nccwpck_require__(8041);
-/**
- * The code to exit an action
- */
-var ExitCode;
-(function (ExitCode) {
-    /**
-     * A code indicating that the action was successful
-     */
-    ExitCode[ExitCode["Success"] = 0] = "Success";
-    /**
-     * A code indicating that the action was a failure
-     */
-    ExitCode[ExitCode["Failure"] = 1] = "Failure";
-})(ExitCode = exports.ExitCode || (exports.ExitCode = {}));
-//-----------------------------------------------------------------------
-// Variables
-//-----------------------------------------------------------------------
-/**
- * Sets env variable for this action and future actions in the job
- * @param name the name of the variable to set
- * @param val the value of the variable. Non-string values will be converted to a string via JSON.stringify
- */
-// eslint-disable-next-line @typescript-eslint/no-explicit-any
-function exportVariable(name, val) {
-    const convertedVal = utils_1.toCommandValue(val);
-    process.env[name] = convertedVal;
-    const filePath = process.env['GITHUB_ENV'] || '';
-    if (filePath) {
-        return file_command_1.issueFileCommand('ENV', file_command_1.prepareKeyValueMessage(name, val));
-    }
-    command_1.issueCommand('set-env', { name }, convertedVal);
-}
-exports.exportVariable = exportVariable;
-/**
- * Registers a secret which will get masked from logs
- * @param secret value of the secret
- */
-function setSecret(secret) {
-    command_1.issueCommand('add-mask', {}, secret);
-}
-exports.setSecret = setSecret;
-/**
- * Prepends inputPath to the PATH (for this action and future actions)
- * @param inputPath
- */
-function addPath(inputPath) {
-    const filePath = process.env['GITHUB_PATH'] || '';
-    if (filePath) {
-        file_command_1.issueFileCommand('PATH', inputPath);
-    }
-    else {
-        command_1.issueCommand('add-path', {}, inputPath);
-    }
-    process.env['PATH'] = `${inputPath}${path.delimiter}${process.env['PATH']}`;
-}
-exports.addPath = addPath;
-/**
- * Gets the value of an input.
- * Unless trimWhitespace is set to false in InputOptions, the value is also trimmed.
- * Returns an empty string if the value is not defined.
- *
- * @param     name     name of the input to get
- * @param     options  optional. See InputOptions.
- * @returns   string
- */
-function getInput(name, options) {
-    const val = process.env[`INPUT_${name.replace(/ /g, '_').toUpperCase()}`] || '';
-    if (options && options.required && !val) {
-        throw new Error(`Input required and not supplied: ${name}`);
-    }
-    if (options && options.trimWhitespace === false) {
-        return val;
-    }
-    return val.trim();
-}
-exports.getInput = getInput;
-/**
- * Gets the values of an multiline input.  Each value is also trimmed.
- *
- * @param     name     name of the input to get
- * @param     options  optional. See InputOptions.
- * @returns   string[]
- *
- */
-function getMultilineInput(name, options) {
-    const inputs = getInput(name, options)
-        .split('\n')
-        .filter(x => x !== '');
-    if (options && options.trimWhitespace === false) {
-        return inputs;
-    }
-    return inputs.map(input => input.trim());
-}
-exports.getMultilineInput = getMultilineInput;
-/**
- * Gets the input value of the boolean type in the YAML 1.2 "core schema" specification.
- * Support boolean input list: `true | True | TRUE | false | False | FALSE` .
- * The return value is also in boolean type.
- * ref: https://yaml.org/spec/1.2/spec.html#id2804923
- *
- * @param     name     name of the input to get
- * @param     options  optional. See InputOptions.
- * @returns   boolean
- */
-function getBooleanInput(name, options) {
-    const trueValue = ['true', 'True', 'TRUE'];
-    const falseValue = ['false', 'False', 'FALSE'];
-    const val = getInput(name, options);
-    if (trueValue.includes(val))
-        return true;
-    if (falseValue.includes(val))
-        return false;
-    throw new TypeError(`Input does not meet YAML 1.2 "Core Schema" specification: ${name}\n` +
-        `Support boolean input list: \`true | True | TRUE | false | False | FALSE\``);
-}
-exports.getBooleanInput = getBooleanInput;
-/**
- * Sets the value of an output.
- *
- * @param     name     name of the output to set
- * @param     value    value to store. Non-string values will be converted to a string via JSON.stringify
- */
-// eslint-disable-next-line @typescript-eslint/no-explicit-any
-function setOutput(name, value) {
-    const filePath = process.env['GITHUB_OUTPUT'] || '';
-    if (filePath) {
-        return file_command_1.issueFileCommand('OUTPUT', file_command_1.prepareKeyValueMessage(name, value));
-    }
-    process.stdout.write(os.EOL);
-    command_1.issueCommand('set-output', { name }, utils_1.toCommandValue(value));
-}
-exports.setOutput = setOutput;
-/**
- * Enables or disables the echoing of commands into stdout for the rest of the step.
- * Echoing is disabled by default if ACTIONS_STEP_DEBUG is not set.
- *
- */
-function setCommandEcho(enabled) {
-    command_1.issue('echo', enabled ? 'on' : 'off');
-}
-exports.setCommandEcho = setCommandEcho;
-//-----------------------------------------------------------------------
-// Results
-//-----------------------------------------------------------------------
-/**
- * Sets the action status to failed.
- * When the action exits it will be with an exit code of 1
- * @param message add error issue message
- */
-function setFailed(message) {
-    process.exitCode = ExitCode.Failure;
-    error(message);
-}
-exports.setFailed = setFailed;
-//-----------------------------------------------------------------------
-// Logging Commands
-//-----------------------------------------------------------------------
-/**
- * Gets whether Actions Step Debug is on or not
- */
-function isDebug() {
-    return process.env['RUNNER_DEBUG'] === '1';
-}
-exports.isDebug = isDebug;
-/**
- * Writes debug message to user log
- * @param message debug message
- */
-function debug(message) {
-    command_1.issueCommand('debug', {}, message);
-}
-exports.debug = debug;
-/**
- * Adds an error issue
- * @param message error issue message. Errors will be converted to string via toString()
- * @param properties optional properties to add to the annotation.
- */
-function error(message, properties = {}) {
-    command_1.issueCommand('error', utils_1.toCommandProperties(properties), message instanceof Error ? message.toString() : message);
-}
-exports.error = error;
-/**
- * Adds a warning issue
- * @param message warning issue message. Errors will be converted to string via toString()
- * @param properties optional properties to add to the annotation.
- */
-function warning(message, properties = {}) {
-    command_1.issueCommand('warning', utils_1.toCommandProperties(properties), message instanceof Error ? message.toString() : message);
-}
-exports.warning = warning;
-/**
- * Adds a notice issue
- * @param message notice issue message. Errors will be converted to string via toString()
- * @param properties optional properties to add to the annotation.
- */
-function notice(message, properties = {}) {
-    command_1.issueCommand('notice', utils_1.toCommandProperties(properties), message instanceof Error ? message.toString() : message);
-}
-exports.notice = notice;
-/**
- * Writes info to log with console.log.
- * @param message info message
- */
-function info(message) {
-    process.stdout.write(message + os.EOL);
-}
-exports.info = info;
-/**
- * Begin an output group.
- *
- * Output until the next `groupEnd` will be foldable in this group
- *
- * @param name The name of the output group
- */
-function startGroup(name) {
-    command_1.issue('group', name);
-}
-exports.startGroup = startGroup;
-/**
- * End an output group.
- */
-function endGroup() {
-    command_1.issue('endgroup');
-}
-exports.endGroup = endGroup;
-/**
- * Wrap an asynchronous function call in a group.
- *
- * Returns the same type as the function itself.
- *
- * @param name The name of the group
- * @param fn The function to wrap in the group
- */
-function group(name, fn) {
-    return __awaiter(this, void 0, void 0, function* () {
-        startGroup(name);
-        let result;
-        try {
-            result = yield fn();
-        }
-        finally {
-            endGroup();
-        }
-        return result;
-    });
-}
-exports.group = group;
-//-----------------------------------------------------------------------
-// Wrapper action state
-//-----------------------------------------------------------------------
-/**
- * Saves state for current action, the state can only be retrieved by this action's post job execution.
- *
- * @param     name     name of the state to store
- * @param     value    value to store. Non-string values will be converted to a string via JSON.stringify
- */
-// eslint-disable-next-line @typescript-eslint/no-explicit-any
-function saveState(name, value) {
-    const filePath = process.env['GITHUB_STATE'] || '';
-    if (filePath) {
-        return file_command_1.issueFileCommand('STATE', file_command_1.prepareKeyValueMessage(name, value));
-    }
-    command_1.issueCommand('save-state', { name }, utils_1.toCommandValue(value));
-}
-exports.saveState = saveState;
-/**
- * Gets the value of an state set by this action's main execution.
- *
- * @param     name     name of the state to get
- * @returns   string
- */
-function getState(name) {
-    return process.env[`STATE_${name}`] || '';
-}
-exports.getState = getState;
-function getIDToken(aud) {
-    return __awaiter(this, void 0, void 0, function* () {
-        return yield oidc_utils_1.OidcClient.getIDToken(aud);
-    });
-}
-exports.getIDToken = getIDToken;
-/**
- * Summary exports
- */
-var summary_1 = __nccwpck_require__(1327);
-Object.defineProperty(exports, "summary", ({ enumerable: true, get: function () { return summary_1.summary; } }));
-/**
- * @deprecated use core.summary
- */
-var summary_2 = __nccwpck_require__(1327);
-Object.defineProperty(exports, "markdownSummary", ({ enumerable: true, get: function () { return summary_2.markdownSummary; } }));
-/**
- * Path exports
- */
-var path_utils_1 = __nccwpck_require__(2981);
-Object.defineProperty(exports, "toPosixPath", ({ enumerable: true, get: function () { return path_utils_1.toPosixPath; } }));
-Object.defineProperty(exports, "toWin32Path", ({ enumerable: true, get: function () { return path_utils_1.toWin32Path; } }));
-Object.defineProperty(exports, "toPlatformPath", ({ enumerable: true, get: function () { return path_utils_1.toPlatformPath; } }));
-//# sourceMappingURL=core.js.map
-
-/***/ }),
-
-/***/ 717:
-/***/ (function(__unused_webpack_module, exports, __nccwpck_require__) {
-
-"use strict";
-
-// For internal use, subject to change.
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
-Object.defineProperty(exports, "__esModule", ({ value: true }));
-exports.prepareKeyValueMessage = exports.issueFileCommand = void 0;
-// We use any as a valid input type
-/* eslint-disable @typescript-eslint/no-explicit-any */
-const fs = __importStar(__nccwpck_require__(7147));
-const os = __importStar(__nccwpck_require__(2037));
-const uuid_1 = __nccwpck_require__(5840);
-const utils_1 = __nccwpck_require__(5278);
-function issueFileCommand(command, message) {
-    const filePath = process.env[`GITHUB_${command}`];
-    if (!filePath) {
-        throw new Error(`Unable to find environment variable for file command ${command}`);
-    }
-    if (!fs.existsSync(filePath)) {
-        throw new Error(`Missing file at path: ${filePath}`);
-    }
-    fs.appendFileSync(filePath, `${utils_1.toCommandValue(message)}${os.EOL}`, {
-        encoding: 'utf8'
-    });
-}
-exports.issueFileCommand = issueFileCommand;
-function prepareKeyValueMessage(key, value) {
-    const delimiter = `ghadelimiter_${uuid_1.v4()}`;
-    const convertedValue = utils_1.toCommandValue(value);
-    // These should realistically never happen, but just in case someone finds a
-    // way to exploit uuid generation let's not allow keys or values that contain
-    // the delimiter.
-    if (key.includes(delimiter)) {
-        throw new Error(`Unexpected input: name should not contain the delimiter "${delimiter}"`);
-    }
-    if (convertedValue.includes(delimiter)) {
-        throw new Error(`Unexpected input: value should not contain the delimiter "${delimiter}"`);
-    }
-    return `${key}<<${delimiter}${os.EOL}${convertedValue}${os.EOL}${delimiter}`;
-}
-exports.prepareKeyValueMessage = prepareKeyValueMessage;
-//# sourceMappingURL=file-command.js.map
-
-/***/ }),
-
-/***/ 8041:
-/***/ (function(__unused_webpack_module, exports, __nccwpck_require__) {
-
-"use strict";
-
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
-Object.defineProperty(exports, "__esModule", ({ value: true }));
-exports.OidcClient = void 0;
-const http_client_1 = __nccwpck_require__(6255);
-const auth_1 = __nccwpck_require__(5526);
-const core_1 = __nccwpck_require__(2186);
-class OidcClient {
-    static createHttpClient(allowRetry = true, maxRetry = 10) {
-        const requestOptions = {
-            allowRetries: allowRetry,
-            maxRetries: maxRetry
-        };
-        return new http_client_1.HttpClient('actions/oidc-client', [new auth_1.BearerCredentialHandler(OidcClient.getRequestToken())], requestOptions);
-    }
-    static getRequestToken() {
-        const token = process.env['ACTIONS_ID_TOKEN_REQUEST_TOKEN'];
-        if (!token) {
-            throw new Error('Unable to get ACTIONS_ID_TOKEN_REQUEST_TOKEN env variable');
-        }
-        return token;
-    }
-    static getIDTokenUrl() {
-        const runtimeUrl = process.env['ACTIONS_ID_TOKEN_REQUEST_URL'];
-        if (!runtimeUrl) {
-            throw new Error('Unable to get ACTIONS_ID_TOKEN_REQUEST_URL env variable');
-        }
-        return runtimeUrl;
-    }
-    static getCall(id_token_url) {
-        var _a;
-        return __awaiter(this, void 0, void 0, function* () {
-            const httpclient = OidcClient.createHttpClient();
-            const res = yield httpclient
-                .getJson(id_token_url)
-                .catch(error => {
-                throw new Error(`Failed to get ID Token. \n 
-        Error Code : ${error.statusCode}\n 
-        Error Message: ${error.result.message}`);
-            });
-            const id_token = (_a = res.result) === null || _a === void 0 ? void 0 : _a.value;
-            if (!id_token) {
-                throw new Error('Response json body do not have ID Token field');
-            }
-            return id_token;
-        });
-    }
-    static getIDToken(audience) {
-        return __awaiter(this, void 0, void 0, function* () {
-            try {
-                // New ID Token is requested from action service
-                let id_token_url = OidcClient.getIDTokenUrl();
-                if (audience) {
-                    const encodedAudience = encodeURIComponent(audience);
-                    id_token_url = `${id_token_url}&audience=${encodedAudience}`;
-                }
-                core_1.debug(`ID token url is ${id_token_url}`);
-                const id_token = yield OidcClient.getCall(id_token_url);
-                core_1.setSecret(id_token);
-                return id_token;
-            }
-            catch (error) {
-                throw new Error(`Error message: ${error.message}`);
-            }
-        });
-    }
-}
-exports.OidcClient = OidcClient;
-//# sourceMappingURL=oidc-utils.js.map
-
-/***/ }),
-
-/***/ 2981:
-/***/ (function(__unused_webpack_module, exports, __nccwpck_require__) {
-
-"use strict";
-
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
-Object.defineProperty(exports, "__esModule", ({ value: true }));
-exports.toPlatformPath = exports.toWin32Path = exports.toPosixPath = void 0;
-const path = __importStar(__nccwpck_require__(1017));
-/**
- * toPosixPath converts the given path to the posix form. On Windows, \\ will be
- * replaced with /.
- *
- * @param pth. Path to transform.
- * @return string Posix path.
- */
-function toPosixPath(pth) {
-    return pth.replace(/[\\]/g, '/');
-}
-exports.toPosixPath = toPosixPath;
-/**
- * toWin32Path converts the given path to the win32 form. On Linux, / will be
- * replaced with \\.
- *
- * @param pth. Path to transform.
- * @return string Win32 path.
- */
-function toWin32Path(pth) {
-    return pth.replace(/[/]/g, '\\');
-}
-exports.toWin32Path = toWin32Path;
-/**
- * toPlatformPath converts the given path to a platform-specific path. It does
- * this by replacing instances of / and \ with the platform-specific path
- * separator.
- *
- * @param pth The path to platformize.
- * @return string The platform-specific path.
- */
-function toPlatformPath(pth) {
-    return pth.replace(/[/\\]/g, path.sep);
-}
-exports.toPlatformPath = toPlatformPath;
-//# sourceMappingURL=path-utils.js.map
-
-/***/ }),
-
-/***/ 1327:
-/***/ (function(__unused_webpack_module, exports, __nccwpck_require__) {
-
-"use strict";
-
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
-Object.defineProperty(exports, "__esModule", ({ value: true }));
-exports.summary = exports.markdownSummary = exports.SUMMARY_DOCS_URL = exports.SUMMARY_ENV_VAR = void 0;
-const os_1 = __nccwpck_require__(2037);
-const fs_1 = __nccwpck_require__(7147);
-const { access, appendFile, writeFile } = fs_1.promises;
-exports.SUMMARY_ENV_VAR = 'GITHUB_STEP_SUMMARY';
-exports.SUMMARY_DOCS_URL = 'https://docs.github.com/actions/using-workflows/workflow-commands-for-github-actions#adding-a-job-summary';
-class Summary {
-    constructor() {
-        this._buffer = '';
-    }
-    /**
-     * Finds the summary file path from the environment, rejects if env var is not found or file does not exist
-     * Also checks r/w permissions.
-     *
-     * @returns step summary file path
-     */
-    filePath() {
-        return __awaiter(this, void 0, void 0, function* () {
-            if (this._filePath) {
-                return this._filePath;
-            }
-            const pathFromEnv = process.env[exports.SUMMARY_ENV_VAR];
-            if (!pathFromEnv) {
-                throw new Error(`Unable to find environment variable for $${exports.SUMMARY_ENV_VAR}. Check if your runtime environment supports job summaries.`);
-            }
-            try {
-                yield access(pathFromEnv, fs_1.constants.R_OK | fs_1.constants.W_OK);
-            }
-            catch (_a) {
-                throw new Error(`Unable to access summary file: '${pathFromEnv}'. Check if the file has correct read/write permissions.`);
-            }
-            this._filePath = pathFromEnv;
-            return this._filePath;
-        });
-    }
-    /**
-     * Wraps content in an HTML tag, adding any HTML attributes
-     *
-     * @param {string} tag HTML tag to wrap
-     * @param {string | null} content content within the tag
-     * @param {[attribute: string]: string} attrs key-value list of HTML attributes to add
-     *
-     * @returns {string} content wrapped in HTML element
-     */
-    wrap(tag, content, attrs = {}) {
-        const htmlAttrs = Object.entries(attrs)
-            .map(([key, value]) => ` ${key}="${value}"`)
-            .join('');
-        if (!content) {
-            return `<${tag}${htmlAttrs}>`;
-        }
-        return `<${tag}${htmlAttrs}>${content}</${tag}>`;
-    }
-    /**
-     * Writes text in the buffer to the summary buffer file and empties buffer. Will append by default.
-     *
-     * @param {SummaryWriteOptions} [options] (optional) options for write operation
-     *
-     * @returns {Promise<Summary>} summary instance
-     */
-    write(options) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const overwrite = !!(options === null || options === void 0 ? void 0 : options.overwrite);
-            const filePath = yield this.filePath();
-            const writeFunc = overwrite ? writeFile : appendFile;
-            yield writeFunc(filePath, this._buffer, { encoding: 'utf8' });
-            return this.emptyBuffer();
-        });
-    }
-    /**
-     * Clears the summary buffer and wipes the summary file
-     *
-     * @returns {Summary} summary instance
-     */
-    clear() {
-        return __awaiter(this, void 0, void 0, function* () {
-            return this.emptyBuffer().write({ overwrite: true });
-        });
-    }
-    /**
-     * Returns the current summary buffer as a string
-     *
-     * @returns {string} string of summary buffer
-     */
-    stringify() {
-        return this._buffer;
-    }
-    /**
-     * If the summary buffer is empty
-     *
-     * @returns {boolen} true if the buffer is empty
-     */
-    isEmptyBuffer() {
-        return this._buffer.length === 0;
-    }
-    /**
-     * Resets the summary buffer without writing to summary file
-     *
-     * @returns {Summary} summary instance
-     */
-    emptyBuffer() {
-        this._buffer = '';
-        return this;
-    }
-    /**
-     * Adds raw text to the summary buffer
-     *
-     * @param {string} text content to add
-     * @param {boolean} [addEOL=false] (optional) append an EOL to the raw text (default: false)
-     *
-     * @returns {Summary} summary instance
-     */
-    addRaw(text, addEOL = false) {
-        this._buffer += text;
-        return addEOL ? this.addEOL() : this;
-    }
-    /**
-     * Adds the operating system-specific end-of-line marker to the buffer
-     *
-     * @returns {Summary} summary instance
-     */
-    addEOL() {
-        return this.addRaw(os_1.EOL);
-    }
-    /**
-     * Adds an HTML codeblock to the summary buffer
-     *
-     * @param {string} code content to render within fenced code block
-     * @param {string} lang (optional) language to syntax highlight code
-     *
-     * @returns {Summary} summary instance
-     */
-    addCodeBlock(code, lang) {
-        const attrs = Object.assign({}, (lang && { lang }));
-        const element = this.wrap('pre', this.wrap('code', code), attrs);
-        return this.addRaw(element).addEOL();
-    }
-    /**
-     * Adds an HTML list to the summary buffer
-     *
-     * @param {string[]} items list of items to render
-     * @param {boolean} [ordered=false] (optional) if the rendered list should be ordered or not (default: false)
-     *
-     * @returns {Summary} summary instance
-     */
-    addList(items, ordered = false) {
-        const tag = ordered ? 'ol' : 'ul';
-        const listItems = items.map(item => this.wrap('li', item)).join('');
-        const element = this.wrap(tag, listItems);
-        return this.addRaw(element).addEOL();
-    }
-    /**
-     * Adds an HTML table to the summary buffer
-     *
-     * @param {SummaryTableCell[]} rows table rows
-     *
-     * @returns {Summary} summary instance
-     */
-    addTable(rows) {
-        const tableBody = rows
-            .map(row => {
-            const cells = row
-                .map(cell => {
-                if (typeof cell === 'string') {
-                    return this.wrap('td', cell);
-                }
-                const { header, data, colspan, rowspan } = cell;
-                const tag = header ? 'th' : 'td';
-                const attrs = Object.assign(Object.assign({}, (colspan && { colspan })), (rowspan && { rowspan }));
-                return this.wrap(tag, data, attrs);
-            })
-                .join('');
-            return this.wrap('tr', cells);
-        })
-            .join('');
-        const element = this.wrap('table', tableBody);
-        return this.addRaw(element).addEOL();
-    }
-    /**
-     * Adds a collapsable HTML details element to the summary buffer
-     *
-     * @param {string} label text for the closed state
-     * @param {string} content collapsable content
-     *
-     * @returns {Summary} summary instance
-     */
-    addDetails(label, content) {
-        const element = this.wrap('details', this.wrap('summary', label) + content);
-        return this.addRaw(element).addEOL();
-    }
-    /**
-     * Adds an HTML image tag to the summary buffer
-     *
-     * @param {string} src path to the image you to embed
-     * @param {string} alt text description of the image
-     * @param {SummaryImageOptions} options (optional) addition image attributes
-     *
-     * @returns {Summary} summary instance
-     */
-    addImage(src, alt, options) {
-        const { width, height } = options || {};
-        const attrs = Object.assign(Object.assign({}, (width && { width })), (height && { height }));
-        const element = this.wrap('img', null, Object.assign({ src, alt }, attrs));
-        return this.addRaw(element).addEOL();
-    }
-    /**
-     * Adds an HTML section heading element
-     *
-     * @param {string} text heading text
-     * @param {number | string} [level=1] (optional) the heading level, default: 1
-     *
-     * @returns {Summary} summary instance
-     */
-    addHeading(text, level) {
-        const tag = `h${level}`;
-        const allowedTag = ['h1', 'h2', 'h3', 'h4', 'h5', 'h6'].includes(tag)
-            ? tag
-            : 'h1';
-        const element = this.wrap(allowedTag, text);
-        return this.addRaw(element).addEOL();
-    }
-    /**
-     * Adds an HTML thematic break (<hr>) to the summary buffer
-     *
-     * @returns {Summary} summary instance
-     */
-    addSeparator() {
-        const element = this.wrap('hr', null);
-        return this.addRaw(element).addEOL();
-    }
-    /**
-     * Adds an HTML line break (<br>) to the summary buffer
-     *
-     * @returns {Summary} summary instance
-     */
-    addBreak() {
-        const element = this.wrap('br', null);
-        return this.addRaw(element).addEOL();
-    }
-    /**
-     * Adds an HTML blockquote to the summary buffer
-     *
-     * @param {string} text quote text
-     * @param {string} cite (optional) citation url
-     *
-     * @returns {Summary} summary instance
-     */
-    addQuote(text, cite) {
-        const attrs = Object.assign({}, (cite && { cite }));
-        const element = this.wrap('blockquote', text, attrs);
-        return this.addRaw(element).addEOL();
-    }
-    /**
-     * Adds an HTML anchor tag to the summary buffer
-     *
-     * @param {string} text link text/content
-     * @param {string} href hyperlink
-     *
-     * @returns {Summary} summary instance
-     */
-    addLink(text, href) {
-        const element = this.wrap('a', text, { href });
-        return this.addRaw(element).addEOL();
-    }
-}
-const _summary = new Summary();
-/**
- * @deprecated use `core.summary`
- */
-exports.markdownSummary = _summary;
-exports.summary = _summary;
-//# sourceMappingURL=summary.js.map
-
-/***/ }),
-
-/***/ 5278:
-/***/ ((__unused_webpack_module, exports) => {
-
-"use strict";
-
-// We use any as a valid input type
-/* eslint-disable @typescript-eslint/no-explicit-any */
-Object.defineProperty(exports, "__esModule", ({ value: true }));
-exports.toCommandProperties = exports.toCommandValue = void 0;
-/**
- * Sanitizes an input into a string so it can be passed into issueCommand safely
- * @param input input to sanitize into a string
- */
-function toCommandValue(input) {
-    if (input === null || input === undefined) {
-        return '';
-    }
-    else if (typeof input === 'string' || input instanceof String) {
-        return input;
-    }
-    return JSON.stringify(input);
-}
-exports.toCommandValue = toCommandValue;
-/**
- *
- * @param annotationProperties
- * @returns The command properties to send with the actual annotation command
- * See IssueCommandProperties: https://github.com/actions/runner/blob/main/src/Runner.Worker/ActionCommandManager.cs#L646
- */
-function toCommandProperties(annotationProperties) {
-    if (!Object.keys(annotationProperties).length) {
-        return {};
-    }
-    return {
-        title: annotationProperties.title,
-        file: annotationProperties.file,
-        line: annotationProperties.startLine,
-        endLine: annotationProperties.endLine,
-        col: annotationProperties.startColumn,
-        endColumn: annotationProperties.endColumn
-    };
-}
-exports.toCommandProperties = toCommandProperties;
-//# sourceMappingURL=utils.js.map
-
-/***/ }),
-
-/***/ 4087:
-/***/ ((__unused_webpack_module, exports, __nccwpck_require__) => {
-
-"use strict";
-
-Object.defineProperty(exports, "__esModule", ({ value: true }));
-exports.Context = void 0;
-const fs_1 = __nccwpck_require__(7147);
-const os_1 = __nccwpck_require__(2037);
-class Context {
-    /**
-     * Hydrate the context from the environment
-     */
-    constructor() {
-        var _a, _b, _c;
-        this.payload = {};
-        if (process.env.GITHUB_EVENT_PATH) {
-            if (fs_1.existsSync(process.env.GITHUB_EVENT_PATH)) {
-                this.payload = JSON.parse(fs_1.readFileSync(process.env.GITHUB_EVENT_PATH, { encoding: 'utf8' }));
-            }
-            else {
-                const path = process.env.GITHUB_EVENT_PATH;
-                process.stdout.write(`GITHUB_EVENT_PATH ${path} does not exist${os_1.EOL}`);
-            }
-        }
-        this.eventName = process.env.GITHUB_EVENT_NAME;
-        this.sha = process.env.GITHUB_SHA;
-        this.ref = process.env.GITHUB_REF;
-        this.workflow = process.env.GITHUB_WORKFLOW;
-        this.action = process.env.GITHUB_ACTION;
-        this.actor = process.env.GITHUB_ACTOR;
-        this.job = process.env.GITHUB_JOB;
-        this.runNumber = parseInt(process.env.GITHUB_RUN_NUMBER, 10);
-        this.runId = parseInt(process.env.GITHUB_RUN_ID, 10);
-        this.apiUrl = (_a = process.env.GITHUB_API_URL) !== null && _a !== void 0 ? _a : `https://api.github.com`;
-        this.serverUrl = (_b = process.env.GITHUB_SERVER_URL) !== null && _b !== void 0 ? _b : `https://github.com`;
-        this.graphqlUrl = (_c = process.env.GITHUB_GRAPHQL_URL) !== null && _c !== void 0 ? _c : `https://api.github.com/graphql`;
-    }
-    get issue() {
-        const payload = this.payload;
-        return Object.assign(Object.assign({}, this.repo), { number: (payload.issue || payload.pull_request || payload).number });
-    }
-    get repo() {
-        if (process.env.GITHUB_REPOSITORY) {
-            const [owner, repo] = process.env.GITHUB_REPOSITORY.split('/');
-            return { owner, repo };
-        }
-        if (this.payload.repository) {
-            return {
-                owner: this.payload.repository.owner.login,
-                repo: this.payload.repository.name
-            };
-        }
-        throw new Error("context.repo requires a GITHUB_REPOSITORY environment variable like 'owner/repo'");
-    }
-}
-exports.Context = Context;
-//# sourceMappingURL=context.js.map
-
-/***/ }),
-
-/***/ 7914:
-/***/ (function(__unused_webpack_module, exports, __nccwpck_require__) {
-
-"use strict";
-
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
-Object.defineProperty(exports, "__esModule", ({ value: true }));
-exports.getApiBaseUrl = exports.getProxyAgent = exports.getAuthString = void 0;
-const httpClient = __importStar(__nccwpck_require__(6255));
-function getAuthString(token, options) {
-    if (!token && !options.auth) {
-        throw new Error('Parameter token or opts.auth is required');
-    }
-    else if (token && options.auth) {
-        throw new Error('Parameters token and opts.auth may not both be specified');
-    }
-    return typeof options.auth === 'string' ? options.auth : `token ${token}`;
-}
-exports.getAuthString = getAuthString;
-function getProxyAgent(destinationUrl) {
-    const hc = new httpClient.HttpClient();
-    return hc.getAgent(destinationUrl);
-}
-exports.getProxyAgent = getProxyAgent;
-function getApiBaseUrl() {
-    return process.env['GITHUB_API_URL'] || 'https://api.github.com';
-}
-exports.getApiBaseUrl = getApiBaseUrl;
-//# sourceMappingURL=utils.js.map
-
-/***/ }),
-
-/***/ 3030:
-/***/ (function(__unused_webpack_module, exports, __nccwpck_require__) {
-
-"use strict";
-
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
-Object.defineProperty(exports, "__esModule", ({ value: true }));
-exports.getOctokitOptions = exports.GitHub = exports.defaults = exports.context = void 0;
-const Context = __importStar(__nccwpck_require__(4087));
-const Utils = __importStar(__nccwpck_require__(7914));
-// octokit + plugins
-const core_1 = __nccwpck_require__(8525);
-const plugin_rest_endpoint_methods_1 = __nccwpck_require__(3044);
-const plugin_paginate_rest_1 = __nccwpck_require__(8945);
-exports.context = new Context.Context();
-const baseUrl = Utils.getApiBaseUrl();
-exports.defaults = {
-    baseUrl,
-    request: {
-        agent: Utils.getProxyAgent(baseUrl)
-    }
-};
-exports.GitHub = core_1.Octokit.plugin(plugin_rest_endpoint_methods_1.restEndpointMethods, plugin_paginate_rest_1.paginateRest).defaults(exports.defaults);
-/**
- * Convience function to correctly format Octokit Options to pass into the constructor.
- *
- * @param     token    the repo PAT or GITHUB_TOKEN
- * @param     options  other options to set
- */
-function getOctokitOptions(token, options) {
-    const opts = Object.assign({}, options || {}); // Shallow clone - don't mutate the object provided by the caller
-    // Auth
-    const auth = Utils.getAuthString(token, opts);
-    if (auth) {
-        opts.auth = auth;
-    }
-    return opts;
-}
-exports.getOctokitOptions = getOctokitOptions;
-//# sourceMappingURL=utils.js.map
-
-/***/ }),
-
-/***/ 673:
-/***/ ((__unused_webpack_module, exports) => {
-
-"use strict";
-
-
-Object.defineProperty(exports, "__esModule", ({ value: true }));
-
-const REGEX_IS_INSTALLATION_LEGACY = /^v1\./;
-const REGEX_IS_INSTALLATION = /^ghs_/;
-const REGEX_IS_USER_TO_SERVER = /^ghu_/;
-async function auth(token) {
-  const isApp = token.split(/\./).length === 3;
-  const isInstallation = REGEX_IS_INSTALLATION_LEGACY.test(token) || REGEX_IS_INSTALLATION.test(token);
-  const isUserToServer = REGEX_IS_USER_TO_SERVER.test(token);
-  const tokenType = isApp ? "app" : isInstallation ? "installation" : isUserToServer ? "user-to-server" : "oauth";
-  return {
-    type: "token",
-    token: token,
-    tokenType
-  };
-}
-
-/**
- * Prefix token for usage in the Authorization header
- *
- * @param token OAuth token or JSON Web Token
- */
-function withAuthorizationPrefix(token) {
-  if (token.split(/\./).length === 3) {
-    return `bearer ${token}`;
-  }
-
-  return `token ${token}`;
-}
-
-async function hook(token, request, route, parameters) {
-  const endpoint = request.endpoint.merge(route, parameters);
-  endpoint.headers.authorization = withAuthorizationPrefix(token);
-  return request(endpoint);
-}
-
-const createTokenAuth = function createTokenAuth(token) {
-  if (!token) {
-    throw new Error("[@octokit/auth-token] No token passed to createTokenAuth");
-  }
-
-  if (typeof token !== "string") {
-    throw new Error("[@octokit/auth-token] Token passed to createTokenAuth is not a string");
-  }
-
-  token = token.replace(/^(token|bearer) +/i, "");
-  return Object.assign(auth.bind(null, token), {
-    hook: hook.bind(null, token)
-  });
-};
-
-exports.createTokenAuth = createTokenAuth;
-//# sourceMappingURL=index.js.map
-
-
-/***/ }),
-
-/***/ 8525:
-/***/ ((__unused_webpack_module, exports, __nccwpck_require__) => {
-
-"use strict";
-
-
-Object.defineProperty(exports, "__esModule", ({ value: true }));
-
-var universalUserAgent = __nccwpck_require__(5030);
-var beforeAfterHook = __nccwpck_require__(3682);
-var request = __nccwpck_require__(9353);
-var graphql = __nccwpck_require__(6422);
-var authToken = __nccwpck_require__(673);
-
-function _objectWithoutPropertiesLoose(source, excluded) {
-  if (source == null) return {};
-  var target = {};
-  var sourceKeys = Object.keys(source);
-  var key, i;
-
-  for (i = 0; i < sourceKeys.length; i++) {
-    key = sourceKeys[i];
-    if (excluded.indexOf(key) >= 0) continue;
-    target[key] = source[key];
-  }
-
-  return target;
-}
-
-function _objectWithoutProperties(source, excluded) {
-  if (source == null) return {};
-
-  var target = _objectWithoutPropertiesLoose(source, excluded);
-
-  var key, i;
-
-  if (Object.getOwnPropertySymbols) {
-    var sourceSymbolKeys = Object.getOwnPropertySymbols(source);
-
-    for (i = 0; i < sourceSymbolKeys.length; i++) {
-      key = sourceSymbolKeys[i];
-      if (excluded.indexOf(key) >= 0) continue;
-      if (!Object.prototype.propertyIsEnumerable.call(source, key)) continue;
-      target[key] = source[key];
-    }
-  }
-
-  return target;
-}
-
-const VERSION = "3.6.0";
-
-const _excluded = ["authStrategy"];
-class Octokit {
-  constructor(options = {}) {
-    const hook = new beforeAfterHook.Collection();
-    const requestDefaults = {
-      baseUrl: request.request.endpoint.DEFAULTS.baseUrl,
-      headers: {},
-      request: Object.assign({}, options.request, {
-        // @ts-ignore internal usage only, no need to type
-        hook: hook.bind(null, "request")
-      }),
-      mediaType: {
-        previews: [],
-        format: ""
-      }
-    }; // prepend default user agent with `options.userAgent` if set
-
-    requestDefaults.headers["user-agent"] = [options.userAgent, `octokit-core.js/${VERSION} ${universalUserAgent.getUserAgent()}`].filter(Boolean).join(" ");
-
-    if (options.baseUrl) {
-      requestDefaults.baseUrl = options.baseUrl;
-    }
-
-    if (options.previews) {
-      requestDefaults.mediaType.previews = options.previews;
-    }
-
-    if (options.timeZone) {
-      requestDefaults.headers["time-zone"] = options.timeZone;
-    }
-
-    this.request = request.request.defaults(requestDefaults);
-    this.graphql = graphql.withCustomRequest(this.request).defaults(requestDefaults);
-    this.log = Object.assign({
-      debug: () => {},
-      info: () => {},
-      warn: console.warn.bind(console),
-      error: console.error.bind(console)
-    }, options.log);
-    this.hook = hook; // (1) If neither `options.authStrategy` nor `options.auth` are set, the `octokit` instance
-    //     is unauthenticated. The `this.auth()` method is a no-op and no request hook is registered.
-    // (2) If only `options.auth` is set, use the default token authentication strategy.
-    // (3) If `options.authStrategy` is set then use it and pass in `options.auth`. Always pass own request as many strategies accept a custom request instance.
-    // TODO: type `options.auth` based on `options.authStrategy`.
-
-    if (!options.authStrategy) {
-      if (!options.auth) {
-        // (1)
-        this.auth = async () => ({
-          type: "unauthenticated"
-        });
-      } else {
-        // (2)
-        const auth = authToken.createTokenAuth(options.auth); // @ts-ignore  ¯\_(ツ)_/¯
-
-        hook.wrap("request", auth.hook);
-        this.auth = auth;
-      }
-    } else {
-      const {
-        authStrategy
-      } = options,
-            otherOptions = _objectWithoutProperties(options, _excluded);
-
-      const auth = authStrategy(Object.assign({
-        request: this.request,
-        log: this.log,
-        // we pass the current octokit instance as well as its constructor options
-        // to allow for authentication strategies that return a new octokit instance
-        // that shares the same internal state as the current one. The original
-        // requirement for this was the "event-octokit" authentication strategy
-        // of https://github.com/probot/octokit-auth-probot.
-        octokit: this,
-        octokitOptions: otherOptions
-      }, options.auth)); // @ts-ignore  ¯\_(ツ)_/¯
-
-      hook.wrap("request", auth.hook);
-      this.auth = auth;
-    } // apply plugins
-    // https://stackoverflow.com/a/16345172
-
-
-    const classConstructor = this.constructor;
-    classConstructor.plugins.forEach(plugin => {
-      Object.assign(this, plugin(this, options));
-    });
-  }
-
-  static defaults(defaults) {
-    const OctokitWithDefaults = class extends this {
-      constructor(...args) {
-        const options = args[0] || {};
-
-        if (typeof defaults === "function") {
-          super(defaults(options));
-          return;
-        }
-
-        super(Object.assign({}, defaults, options, options.userAgent && defaults.userAgent ? {
-          userAgent: `${options.userAgent} ${defaults.userAgent}`
-        } : null));
-      }
-
-    };
-    return OctokitWithDefaults;
-  }
-  /**
-   * Attach a plugin (or many) to your Octokit instance.
-   *
-   * @example
-   * const API = Octokit.plugin(plugin1, plugin2, plugin3, ...)
-   */
-
-
-  static plugin(...newPlugins) {
-    var _a;
-
-    const currentPlugins = this.plugins;
-    const NewOctokit = (_a = class extends this {}, _a.plugins = currentPlugins.concat(newPlugins.filter(plugin => !currentPlugins.includes(plugin))), _a);
-    return NewOctokit;
-  }
-
-}
-Octokit.VERSION = VERSION;
-Octokit.plugins = [];
-
-exports.Octokit = Octokit;
-//# sourceMappingURL=index.js.map
-
-
-/***/ }),
-
-/***/ 8713:
-/***/ ((__unused_webpack_module, exports, __nccwpck_require__) => {
-
-"use strict";
-
-
-Object.defineProperty(exports, "__esModule", ({ value: true }));
-
-var isPlainObject = __nccwpck_require__(3287);
-var universalUserAgent = __nccwpck_require__(5030);
-
-function lowercaseKeys(object) {
-  if (!object) {
-    return {};
-  }
-
-  return Object.keys(object).reduce((newObj, key) => {
-    newObj[key.toLowerCase()] = object[key];
-    return newObj;
-  }, {});
-}
-
-function mergeDeep(defaults, options) {
-  const result = Object.assign({}, defaults);
-  Object.keys(options).forEach(key => {
-    if (isPlainObject.isPlainObject(options[key])) {
-      if (!(key in defaults)) Object.assign(result, {
-        [key]: options[key]
-      });else result[key] = mergeDeep(defaults[key], options[key]);
-    } else {
-      Object.assign(result, {
-        [key]: options[key]
-      });
-    }
-  });
-  return result;
-}
-
-function removeUndefinedProperties(obj) {
-  for (const key in obj) {
-    if (obj[key] === undefined) {
-      delete obj[key];
-    }
-  }
-
-  return obj;
-}
-
-function merge(defaults, route, options) {
-  if (typeof route === "string") {
-    let [method, url] = route.split(" ");
-    options = Object.assign(url ? {
-      method,
-      url
-    } : {
-      url: method
-    }, options);
-  } else {
-    options = Object.assign({}, route);
-  } // lowercase header names before merging with defaults to avoid duplicates
-
-
-  options.headers = lowercaseKeys(options.headers); // remove properties with undefined values before merging
-
-  removeUndefinedProperties(options);
-  removeUndefinedProperties(options.headers);
-  const mergedOptions = mergeDeep(defaults || {}, options); // mediaType.previews arrays are merged, instead of overwritten
-
-  if (defaults && defaults.mediaType.previews.length) {
-    mergedOptions.mediaType.previews = defaults.mediaType.previews.filter(preview => !mergedOptions.mediaType.previews.includes(preview)).concat(mergedOptions.mediaType.previews);
-  }
-
-  mergedOptions.mediaType.previews = mergedOptions.mediaType.previews.map(preview => preview.replace(/-preview/, ""));
-  return mergedOptions;
-}
-
-function addQueryParameters(url, parameters) {
-  const separator = /\?/.test(url) ? "&" : "?";
-  const names = Object.keys(parameters);
-
-  if (names.length === 0) {
-    return url;
-  }
-
-  return url + separator + names.map(name => {
-    if (name === "q") {
-      return "q=" + parameters.q.split("+").map(encodeURIComponent).join("+");
-    }
-
-    return `${name}=${encodeURIComponent(parameters[name])}`;
-  }).join("&");
-}
-
-const urlVariableRegex = /\{[^}]+\}/g;
-
-function removeNonChars(variableName) {
-  return variableName.replace(/^\W+|\W+$/g, "").split(/,/);
-}
-
-function extractUrlVariableNames(url) {
-  const matches = url.match(urlVariableRegex);
-
-  if (!matches) {
-    return [];
-  }
-
-  return matches.map(removeNonChars).reduce((a, b) => a.concat(b), []);
-}
-
-function omit(object, keysToOmit) {
-  return Object.keys(object).filter(option => !keysToOmit.includes(option)).reduce((obj, key) => {
-    obj[key] = object[key];
-    return obj;
-  }, {});
-}
-
-// Based on https://github.com/bramstein/url-template, licensed under BSD
-// TODO: create separate package.
-//
-// Copyright (c) 2012-2014, Bram Stein
-// All rights reserved.
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions
-// are met:
-//  1. Redistributions of source code must retain the above copyright
-//     notice, this list of conditions and the following disclaimer.
-//  2. Redistributions in binary form must reproduce the above copyright
-//     notice, this list of conditions and the following disclaimer in the
-//     documentation and/or other materials provided with the distribution.
-//  3. The name of the author may not be used to endorse or promote products
-//     derived from this software without specific prior written permission.
-// THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
-// WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-// MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
-// EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
-// INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
-// OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-// NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
-// EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-/* istanbul ignore file */
-function encodeReserved(str) {
-  return str.split(/(%[0-9A-Fa-f]{2})/g).map(function (part) {
-    if (!/%[0-9A-Fa-f]/.test(part)) {
-      part = encodeURI(part).replace(/%5B/g, "[").replace(/%5D/g, "]");
-    }
-
-    return part;
-  }).join("");
-}
-
-function encodeUnreserved(str) {
-  return encodeURIComponent(str).replace(/[!'()*]/g, function (c) {
-    return "%" + c.charCodeAt(0).toString(16).toUpperCase();
-  });
-}
-
-function encodeValue(operator, value, key) {
-  value = operator === "+" || operator === "#" ? encodeReserved(value) : encodeUnreserved(value);
-
-  if (key) {
-    return encodeUnreserved(key) + "=" + value;
-  } else {
-    return value;
-  }
-}
-
-function isDefined(value) {
-  return value !== undefined && value !== null;
-}
-
-function isKeyOperator(operator) {
-  return operator === ";" || operator === "&" || operator === "?";
-}
-
-function getValues(context, operator, key, modifier) {
-  var value = context[key],
-      result = [];
-
-  if (isDefined(value) && value !== "") {
-    if (typeof value === "string" || typeof value === "number" || typeof value === "boolean") {
-      value = value.toString();
-
-      if (modifier && modifier !== "*") {
-        value = value.substring(0, parseInt(modifier, 10));
-      }
-
-      result.push(encodeValue(operator, value, isKeyOperator(operator) ? key : ""));
-    } else {
-      if (modifier === "*") {
-        if (Array.isArray(value)) {
-          value.filter(isDefined).forEach(function (value) {
-            result.push(encodeValue(operator, value, isKeyOperator(operator) ? key : ""));
-          });
-        } else {
-          Object.keys(value).forEach(function (k) {
-            if (isDefined(value[k])) {
-              result.push(encodeValue(operator, value[k], k));
-            }
-          });
-        }
-      } else {
-        const tmp = [];
-
-        if (Array.isArray(value)) {
-          value.filter(isDefined).forEach(function (value) {
-            tmp.push(encodeValue(operator, value));
-          });
-        } else {
-          Object.keys(value).forEach(function (k) {
-            if (isDefined(value[k])) {
-              tmp.push(encodeUnreserved(k));
-              tmp.push(encodeValue(operator, value[k].toString()));
-            }
-          });
-        }
-
-        if (isKeyOperator(operator)) {
-          result.push(encodeUnreserved(key) + "=" + tmp.join(","));
-        } else if (tmp.length !== 0) {
-          result.push(tmp.join(","));
-        }
-      }
-    }
-  } else {
-    if (operator === ";") {
-      if (isDefined(value)) {
-        result.push(encodeUnreserved(key));
-      }
-    } else if (value === "" && (operator === "&" || operator === "?")) {
-      result.push(encodeUnreserved(key) + "=");
-    } else if (value === "") {
-      result.push("");
-    }
-  }
-
-  return result;
-}
-
-function parseUrl(template) {
-  return {
-    expand: expand.bind(null, template)
-  };
-}
-
-function expand(template, context) {
-  var operators = ["+", "#", ".", "/", ";", "?", "&"];
-  return template.replace(/\{([^\{\}]+)\}|([^\{\}]+)/g, function (_, expression, literal) {
-    if (expression) {
-      let operator = "";
-      const values = [];
-
-      if (operators.indexOf(expression.charAt(0)) !== -1) {
-        operator = expression.charAt(0);
-        expression = expression.substr(1);
-      }
-
-      expression.split(/,/g).forEach(function (variable) {
-        var tmp = /([^:\*]*)(?::(\d+)|(\*))?/.exec(variable);
-        values.push(getValues(context, operator, tmp[1], tmp[2] || tmp[3]));
-      });
-
-      if (operator && operator !== "+") {
-        var separator = ",";
-
-        if (operator === "?") {
-          separator = "&";
-        } else if (operator !== "#") {
-          separator = operator;
-        }
-
-        return (values.length !== 0 ? operator : "") + values.join(separator);
-      } else {
-        return values.join(",");
-      }
-    } else {
-      return encodeReserved(literal);
-    }
-  });
-}
-
-function parse(options) {
-  // https://fetch.spec.whatwg.org/#methods
-  let method = options.method.toUpperCase(); // replace :varname with {varname} to make it RFC 6570 compatible
-
-  let url = (options.url || "/").replace(/:([a-z]\w+)/g, "{$1}");
-  let headers = Object.assign({}, options.headers);
-  let body;
-  let parameters = omit(options, ["method", "baseUrl", "url", "headers", "request", "mediaType"]); // extract variable names from URL to calculate remaining variables later
-
-  const urlVariableNames = extractUrlVariableNames(url);
-  url = parseUrl(url).expand(parameters);
-
-  if (!/^http/.test(url)) {
-    url = options.baseUrl + url;
-  }
-
-  const omittedParameters = Object.keys(options).filter(option => urlVariableNames.includes(option)).concat("baseUrl");
-  const remainingParameters = omit(parameters, omittedParameters);
-  const isBinaryRequest = /application\/octet-stream/i.test(headers.accept);
-
-  if (!isBinaryRequest) {
-    if (options.mediaType.format) {
-      // e.g. application/vnd.github.v3+json => application/vnd.github.v3.raw
-      headers.accept = headers.accept.split(/,/).map(preview => preview.replace(/application\/vnd(\.\w+)(\.v3)?(\.\w+)?(\+json)?$/, `application/vnd$1$2.${options.mediaType.format}`)).join(",");
-    }
-
-    if (options.mediaType.previews.length) {
-      const previewsFromAcceptHeader = headers.accept.match(/[\w-]+(?=-preview)/g) || [];
-      headers.accept = previewsFromAcceptHeader.concat(options.mediaType.previews).map(preview => {
-        const format = options.mediaType.format ? `.${options.mediaType.format}` : "+json";
-        return `application/vnd.github.${preview}-preview${format}`;
-      }).join(",");
-    }
-  } // for GET/HEAD requests, set URL query parameters from remaining parameters
-  // for PATCH/POST/PUT/DELETE requests, set request body from remaining parameters
-
-
-  if (["GET", "HEAD"].includes(method)) {
-    url = addQueryParameters(url, remainingParameters);
-  } else {
-    if ("data" in remainingParameters) {
-      body = remainingParameters.data;
-    } else {
-      if (Object.keys(remainingParameters).length) {
-        body = remainingParameters;
-      } else {
-        headers["content-length"] = 0;
-      }
-    }
-  } // default content-type for JSON if body is set
-
-
-  if (!headers["content-type"] && typeof body !== "undefined") {
-    headers["content-type"] = "application/json; charset=utf-8";
-  } // GitHub expects 'content-length: 0' header for PUT/PATCH requests without body.
-  // fetch does not allow to set `content-length` header, but we can set body to an empty string
-
-
-  if (["PATCH", "PUT"].includes(method) && typeof body === "undefined") {
-    body = "";
-  } // Only return body/request keys if present
-
-
-  return Object.assign({
-    method,
-    url,
-    headers
-  }, typeof body !== "undefined" ? {
-    body
-  } : null, options.request ? {
-    request: options.request
-  } : null);
-}
-
-function endpointWithDefaults(defaults, route, options) {
-  return parse(merge(defaults, route, options));
-}
-
-function withDefaults(oldDefaults, newDefaults) {
-  const DEFAULTS = merge(oldDefaults, newDefaults);
-  const endpoint = endpointWithDefaults.bind(null, DEFAULTS);
-  return Object.assign(endpoint, {
-    DEFAULTS,
-    defaults: withDefaults.bind(null, DEFAULTS),
-    merge: merge.bind(null, DEFAULTS),
-    parse
-  });
-}
-
-const VERSION = "6.0.12";
-
-const userAgent = `octokit-endpoint.js/${VERSION} ${universalUserAgent.getUserAgent()}`; // DEFAULTS has all properties set that EndpointOptions has, except url.
-// So we use RequestParameters and add method as additional required property.
-
-const DEFAULTS = {
-  method: "GET",
-  baseUrl: "https://api.github.com",
-  headers: {
-    accept: "application/vnd.github.v3+json",
-    "user-agent": userAgent
-  },
-  mediaType: {
-    format: "",
-    previews: []
-  }
-};
-
-const endpoint = withDefaults(null, DEFAULTS);
-
-exports.endpoint = endpoint;
-//# sourceMappingURL=index.js.map
-
-
-/***/ }),
-
-/***/ 6422:
-/***/ ((__unused_webpack_module, exports, __nccwpck_require__) => {
-
-"use strict";
-
-
-Object.defineProperty(exports, "__esModule", ({ value: true }));
-
-var request = __nccwpck_require__(9353);
-var universalUserAgent = __nccwpck_require__(5030);
-
-const VERSION = "4.8.0";
-
-function _buildMessageForResponseErrors(data) {
-  return `Request failed due to following response errors:\n` + data.errors.map(e => ` - ${e.message}`).join("\n");
-}
-
-class GraphqlResponseError extends Error {
-  constructor(request, headers, response) {
-    super(_buildMessageForResponseErrors(response));
-    this.request = request;
-    this.headers = headers;
-    this.response = response;
-    this.name = "GraphqlResponseError"; // Expose the errors and response data in their shorthand properties.
-
-    this.errors = response.errors;
-    this.data = response.data; // Maintains proper stack trace (only available on V8)
-
-    /* istanbul ignore next */
-
-    if (Error.captureStackTrace) {
-      Error.captureStackTrace(this, this.constructor);
-    }
-  }
-
-}
-
-const NON_VARIABLE_OPTIONS = ["method", "baseUrl", "url", "headers", "request", "query", "mediaType"];
-const FORBIDDEN_VARIABLE_OPTIONS = ["query", "method", "url"];
-const GHES_V3_SUFFIX_REGEX = /\/api\/v3\/?$/;
-function graphql(request, query, options) {
-  if (options) {
-    if (typeof query === "string" && "query" in options) {
-      return Promise.reject(new Error(`[@octokit/graphql] "query" cannot be used as variable name`));
-    }
-
-    for (const key in options) {
-      if (!FORBIDDEN_VARIABLE_OPTIONS.includes(key)) continue;
-      return Promise.reject(new Error(`[@octokit/graphql] "${key}" cannot be used as variable name`));
-    }
-  }
-
-  const parsedOptions = typeof query === "string" ? Object.assign({
-    query
-  }, options) : query;
-  const requestOptions = Object.keys(parsedOptions).reduce((result, key) => {
-    if (NON_VARIABLE_OPTIONS.includes(key)) {
-      result[key] = parsedOptions[key];
-      return result;
-    }
-
-    if (!result.variables) {
-      result.variables = {};
-    }
-
-    result.variables[key] = parsedOptions[key];
-    return result;
-  }, {}); // workaround for GitHub Enterprise baseUrl set with /api/v3 suffix
-  // https://github.com/octokit/auth-app.js/issues/111#issuecomment-657610451
-
-  const baseUrl = parsedOptions.baseUrl || request.endpoint.DEFAULTS.baseUrl;
-
-  if (GHES_V3_SUFFIX_REGEX.test(baseUrl)) {
-    requestOptions.url = baseUrl.replace(GHES_V3_SUFFIX_REGEX, "/api/graphql");
-  }
-
-  return request(requestOptions).then(response => {
-    if (response.data.errors) {
-      const headers = {};
-
-      for (const key of Object.keys(response.headers)) {
-        headers[key] = response.headers[key];
-      }
-
-      throw new GraphqlResponseError(requestOptions, headers, response.data);
-    }
-
-    return response.data.data;
-  });
-}
-
-function withDefaults(request$1, newDefaults) {
-  const newRequest = request$1.defaults(newDefaults);
-
-  const newApi = (query, options) => {
-    return graphql(newRequest, query, options);
-  };
-
-  return Object.assign(newApi, {
-    defaults: withDefaults.bind(null, newRequest),
-    endpoint: request.request.endpoint
-  });
-}
-
-const graphql$1 = withDefaults(request.request, {
-  headers: {
-    "user-agent": `octokit-graphql.js/${VERSION} ${universalUserAgent.getUserAgent()}`
-  },
-  method: "POST",
-  url: "/graphql"
-});
-function withCustomRequest(customRequest) {
-  return withDefaults(customRequest, {
-    method: "POST",
-    url: "/graphql"
-  });
-}
-
-exports.GraphqlResponseError = GraphqlResponseError;
-exports.graphql = graphql$1;
-exports.withCustomRequest = withCustomRequest;
-//# sourceMappingURL=index.js.map
-
-
-/***/ }),
-
-/***/ 8945:
-/***/ ((__unused_webpack_module, exports) => {
-
-"use strict";
-
-
-Object.defineProperty(exports, "__esModule", ({ value: true }));
-
-const VERSION = "2.21.3";
-
-function ownKeys(object, enumerableOnly) {
-  var keys = Object.keys(object);
-
-  if (Object.getOwnPropertySymbols) {
-    var symbols = Object.getOwnPropertySymbols(object);
-    enumerableOnly && (symbols = symbols.filter(function (sym) {
-      return Object.getOwnPropertyDescriptor(object, sym).enumerable;
-    })), keys.push.apply(keys, symbols);
-  }
-
-  return keys;
-}
-
-function _objectSpread2(target) {
-  for (var i = 1; i < arguments.length; i++) {
-    var source = null != arguments[i] ? arguments[i] : {};
-    i % 2 ? ownKeys(Object(source), !0).forEach(function (key) {
-      _defineProperty(target, key, source[key]);
-    }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) {
-      Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key));
-    });
-  }
-
-  return target;
-}
-
-function _defineProperty(obj, key, value) {
-  if (key in obj) {
-    Object.defineProperty(obj, key, {
-      value: value,
-      enumerable: true,
-      configurable: true,
-      writable: true
-    });
-  } else {
-    obj[key] = value;
-  }
-
-  return obj;
-}
-
-/**
- * Some “list” response that can be paginated have a different response structure
- *
- * They have a `total_count` key in the response (search also has `incomplete_results`,
- * /installation/repositories also has `repository_selection`), as well as a key with
- * the list of the items which name varies from endpoint to endpoint.
- *
- * Octokit normalizes these responses so that paginated results are always returned following
- * the same structure. One challenge is that if the list response has only one page, no Link
- * header is provided, so this header alone is not sufficient to check wether a response is
- * paginated or not.
- *
- * We check if a "total_count" key is present in the response data, but also make sure that
- * a "url" property is not, as the "Get the combined status for a specific ref" endpoint would
- * otherwise match: https://developer.github.com/v3/repos/statuses/#get-the-combined-status-for-a-specific-ref
- */
-function normalizePaginatedListResponse(response) {
-  // endpoints can respond with 204 if repository is empty
-  if (!response.data) {
-    return _objectSpread2(_objectSpread2({}, response), {}, {
-      data: []
-    });
-  }
-
-  const responseNeedsNormalization = "total_count" in response.data && !("url" in response.data);
-  if (!responseNeedsNormalization) return response; // keep the additional properties intact as there is currently no other way
-  // to retrieve the same information.
-
-  const incompleteResults = response.data.incomplete_results;
-  const repositorySelection = response.data.repository_selection;
-  const totalCount = response.data.total_count;
-  delete response.data.incomplete_results;
-  delete response.data.repository_selection;
-  delete response.data.total_count;
-  const namespaceKey = Object.keys(response.data)[0];
-  const data = response.data[namespaceKey];
-  response.data = data;
-
-  if (typeof incompleteResults !== "undefined") {
-    response.data.incomplete_results = incompleteResults;
-  }
-
-  if (typeof repositorySelection !== "undefined") {
-    response.data.repository_selection = repositorySelection;
-  }
-
-  response.data.total_count = totalCount;
-  return response;
-}
-
-function iterator(octokit, route, parameters) {
-  const options = typeof route === "function" ? route.endpoint(parameters) : octokit.request.endpoint(route, parameters);
-  const requestMethod = typeof route === "function" ? route : octokit.request;
-  const method = options.method;
-  const headers = options.headers;
-  let url = options.url;
-  return {
-    [Symbol.asyncIterator]: () => ({
-      async next() {
-        if (!url) return {
-          done: true
-        };
-
-        try {
-          const response = await requestMethod({
-            method,
-            url,
-            headers
-          });
-          const normalizedResponse = normalizePaginatedListResponse(response); // `response.headers.link` format:
-          // '<https://api.github.com/users/aseemk/followers?page=2>; rel="next", <https://api.github.com/users/aseemk/followers?page=2>; rel="last"'
-          // sets `url` to undefined if "next" URL is not present or `link` header is not set
-
-          url = ((normalizedResponse.headers.link || "").match(/<([^>]+)>;\s*rel="next"/) || [])[1];
-          return {
-            value: normalizedResponse
-          };
-        } catch (error) {
-          if (error.status !== 409) throw error;
-          url = "";
-          return {
-            value: {
-              status: 200,
-              headers: {},
-              data: []
-            }
-          };
-        }
-      }
-
-    })
-  };
-}
-
-function paginate(octokit, route, parameters, mapFn) {
-  if (typeof parameters === "function") {
-    mapFn = parameters;
-    parameters = undefined;
-  }
-
-  return gather(octokit, [], iterator(octokit, route, parameters)[Symbol.asyncIterator](), mapFn);
-}
-
-function gather(octokit, results, iterator, mapFn) {
-  return iterator.next().then(result => {
-    if (result.done) {
-      return results;
-    }
-
-    let earlyExit = false;
-
-    function done() {
-      earlyExit = true;
-    }
-
-    results = results.concat(mapFn ? mapFn(result.value, done) : result.value.data);
-
-    if (earlyExit) {
-      return results;
-    }
-
-    return gather(octokit, results, iterator, mapFn);
-  });
-}
-
-const composePaginateRest = Object.assign(paginate, {
-  iterator
-});
-
-const paginatingEndpoints = ["GET /app/hook/deliveries", "GET /app/installations", "GET /applications/grants", "GET /authorizations", "GET /enterprises/{enterprise}/actions/permissions/organizations", "GET /enterprises/{enterprise}/actions/runner-groups", "GET /enterprises/{enterprise}/actions/runner-groups/{runner_group_id}/organizations", "GET /enterprises/{enterprise}/actions/runner-groups/{runner_group_id}/runners", "GET /enterprises/{enterprise}/actions/runners", "GET /enterprises/{enterprise}/audit-log", "GET /enterprises/{enterprise}/secret-scanning/alerts", "GET /enterprises/{enterprise}/settings/billing/advanced-security", "GET /events", "GET /gists", "GET /gists/public", "GET /gists/starred", "GET /gists/{gist_id}/comments", "GET /gists/{gist_id}/commits", "GET /gists/{gist_id}/forks", "GET /installation/repositories", "GET /issues", "GET /licenses", "GET /marketplace_listing/plans", "GET /marketplace_listing/plans/{plan_id}/accounts", "GET /marketplace_listing/stubbed/plans", "GET /marketplace_listing/stubbed/plans/{plan_id}/accounts", "GET /networks/{owner}/{repo}/events", "GET /notifications", "GET /organizations", "GET /orgs/{org}/actions/cache/usage-by-repository", "GET /orgs/{org}/actions/permissions/repositories", "GET /orgs/{org}/actions/runner-groups", "GET /orgs/{org}/actions/runner-groups/{runner_group_id}/repositories", "GET /orgs/{org}/actions/runner-groups/{runner_group_id}/runners", "GET /orgs/{org}/actions/runners", "GET /orgs/{org}/actions/secrets", "GET /orgs/{org}/actions/secrets/{secret_name}/repositories", "GET /orgs/{org}/audit-log", "GET /orgs/{org}/blocks", "GET /orgs/{org}/code-scanning/alerts", "GET /orgs/{org}/codespaces", "GET /orgs/{org}/credential-authorizations", "GET /orgs/{org}/dependabot/secrets", "GET /orgs/{org}/dependabot/secrets/{secret_name}/repositories", "GET /orgs/{org}/events", "GET /orgs/{org}/external-groups", "GET /orgs/{org}/failed_invitations", "GET /orgs/{org}/hooks", "GET /orgs/{org}/hooks/{hook_id}/deliveries", "GET /orgs/{org}/installations", "GET /orgs/{org}/invitations", "GET /orgs/{org}/invitations/{invitation_id}/teams", "GET /orgs/{org}/issues", "GET /orgs/{org}/members", "GET /orgs/{org}/migrations", "GET /orgs/{org}/migrations/{migration_id}/repositories", "GET /orgs/{org}/outside_collaborators", "GET /orgs/{org}/packages", "GET /orgs/{org}/packages/{package_type}/{package_name}/versions", "GET /orgs/{org}/projects", "GET /orgs/{org}/public_members", "GET /orgs/{org}/repos", "GET /orgs/{org}/secret-scanning/alerts", "GET /orgs/{org}/settings/billing/advanced-security", "GET /orgs/{org}/team-sync/groups", "GET /orgs/{org}/teams", "GET /orgs/{org}/teams/{team_slug}/discussions", "GET /orgs/{org}/teams/{team_slug}/discussions/{discussion_number}/comments", "GET /orgs/{org}/teams/{team_slug}/discussions/{discussion_number}/comments/{comment_number}/reactions", "GET /orgs/{org}/teams/{team_slug}/discussions/{discussion_number}/reactions", "GET /orgs/{org}/teams/{team_slug}/invitations", "GET /orgs/{org}/teams/{team_slug}/members", "GET /orgs/{org}/teams/{team_slug}/projects", "GET /orgs/{org}/teams/{team_slug}/repos", "GET /orgs/{org}/teams/{team_slug}/teams", "GET /projects/columns/{column_id}/cards", "GET /projects/{project_id}/collaborators", "GET /projects/{project_id}/columns", "GET /repos/{owner}/{repo}/actions/artifacts", "GET /repos/{owner}/{repo}/actions/caches", "GET /repos/{owner}/{repo}/actions/runners", "GET /repos/{owner}/{repo}/actions/runs", "GET /repos/{owner}/{repo}/actions/runs/{run_id}/artifacts", "GET /repos/{owner}/{repo}/actions/runs/{run_id}/attempts/{attempt_number}/jobs", "GET /repos/{owner}/{repo}/actions/runs/{run_id}/jobs", "GET /repos/{owner}/{repo}/actions/secrets", "GET /repos/{owner}/{repo}/actions/workflows", "GET /repos/{owner}/{repo}/actions/workflows/{workflow_id}/runs", "GET /repos/{owner}/{repo}/assignees", "GET /repos/{owner}/{repo}/branches", "GET /repos/{owner}/{repo}/check-runs/{check_run_id}/annotations", "GET /repos/{owner}/{repo}/check-suites/{check_suite_id}/check-runs", "GET /repos/{owner}/{repo}/code-scanning/alerts", "GET /repos/{owner}/{repo}/code-scanning/alerts/{alert_number}/instances", "GET /repos/{owner}/{repo}/code-scanning/analyses", "GET /repos/{owner}/{repo}/codespaces", "GET /repos/{owner}/{repo}/codespaces/devcontainers", "GET /repos/{owner}/{repo}/codespaces/secrets", "GET /repos/{owner}/{repo}/collaborators", "GET /repos/{owner}/{repo}/comments", "GET /repos/{owner}/{repo}/comments/{comment_id}/reactions", "GET /repos/{owner}/{repo}/commits", "GET /repos/{owner}/{repo}/commits/{commit_sha}/comments", "GET /repos/{owner}/{repo}/commits/{commit_sha}/pulls", "GET /repos/{owner}/{repo}/commits/{ref}/check-runs", "GET /repos/{owner}/{repo}/commits/{ref}/check-suites", "GET /repos/{owner}/{repo}/commits/{ref}/status", "GET /repos/{owner}/{repo}/commits/{ref}/statuses", "GET /repos/{owner}/{repo}/contributors", "GET /repos/{owner}/{repo}/dependabot/secrets", "GET /repos/{owner}/{repo}/deployments", "GET /repos/{owner}/{repo}/deployments/{deployment_id}/statuses", "GET /repos/{owner}/{repo}/environments", "GET /repos/{owner}/{repo}/events", "GET /repos/{owner}/{repo}/forks", "GET /repos/{owner}/{repo}/git/matching-refs/{ref}", "GET /repos/{owner}/{repo}/hooks", "GET /repos/{owner}/{repo}/hooks/{hook_id}/deliveries", "GET /repos/{owner}/{repo}/invitations", "GET /repos/{owner}/{repo}/issues", "GET /repos/{owner}/{repo}/issues/comments", "GET /repos/{owner}/{repo}/issues/comments/{comment_id}/reactions", "GET /repos/{owner}/{repo}/issues/events", "GET /repos/{owner}/{repo}/issues/{issue_number}/comments", "GET /repos/{owner}/{repo}/issues/{issue_number}/events", "GET /repos/{owner}/{repo}/issues/{issue_number}/labels", "GET /repos/{owner}/{repo}/issues/{issue_number}/reactions", "GET /repos/{owner}/{repo}/issues/{issue_number}/timeline", "GET /repos/{owner}/{repo}/keys", "GET /repos/{owner}/{repo}/labels", "GET /repos/{owner}/{repo}/milestones", "GET /repos/{owner}/{repo}/milestones/{milestone_number}/labels", "GET /repos/{owner}/{repo}/notifications", "GET /repos/{owner}/{repo}/pages/builds", "GET /repos/{owner}/{repo}/projects", "GET /repos/{owner}/{repo}/pulls", "GET /repos/{owner}/{repo}/pulls/comments", "GET /repos/{owner}/{repo}/pulls/comments/{comment_id}/reactions", "GET /repos/{owner}/{repo}/pulls/{pull_number}/comments", "GET /repos/{owner}/{repo}/pulls/{pull_number}/commits", "GET /repos/{owner}/{repo}/pulls/{pull_number}/files", "GET /repos/{owner}/{repo}/pulls/{pull_number}/requested_reviewers", "GET /repos/{owner}/{repo}/pulls/{pull_number}/reviews", "GET /repos/{owner}/{repo}/pulls/{pull_number}/reviews/{review_id}/comments", "GET /repos/{owner}/{repo}/releases", "GET /repos/{owner}/{repo}/releases/{release_id}/assets", "GET /repos/{owner}/{repo}/releases/{release_id}/reactions", "GET /repos/{owner}/{repo}/secret-scanning/alerts", "GET /repos/{owner}/{repo}/secret-scanning/alerts/{alert_number}/locations", "GET /repos/{owner}/{repo}/stargazers", "GET /repos/{owner}/{repo}/subscribers", "GET /repos/{owner}/{repo}/tags", "GET /repos/{owner}/{repo}/teams", "GET /repos/{owner}/{repo}/topics", "GET /repositories", "GET /repositories/{repository_id}/environments/{environment_name}/secrets", "GET /search/code", "GET /search/commits", "GET /search/issues", "GET /search/labels", "GET /search/repositories", "GET /search/topics", "GET /search/users", "GET /teams/{team_id}/discussions", "GET /teams/{team_id}/discussions/{discussion_number}/comments", "GET /teams/{team_id}/discussions/{discussion_number}/comments/{comment_number}/reactions", "GET /teams/{team_id}/discussions/{discussion_number}/reactions", "GET /teams/{team_id}/invitations", "GET /teams/{team_id}/members", "GET /teams/{team_id}/projects", "GET /teams/{team_id}/repos", "GET /teams/{team_id}/teams", "GET /user/blocks", "GET /user/codespaces", "GET /user/codespaces/secrets", "GET /user/emails", "GET /user/followers", "GET /user/following", "GET /user/gpg_keys", "GET /user/installations", "GET /user/installations/{installation_id}/repositories", "GET /user/issues", "GET /user/keys", "GET /user/marketplace_purchases", "GET /user/marketplace_purchases/stubbed", "GET /user/memberships/orgs", "GET /user/migrations", "GET /user/migrations/{migration_id}/repositories", "GET /user/orgs", "GET /user/packages", "GET /user/packages/{package_type}/{package_name}/versions", "GET /user/public_emails", "GET /user/repos", "GET /user/repository_invitations", "GET /user/starred", "GET /user/subscriptions", "GET /user/teams", "GET /users", "GET /users/{username}/events", "GET /users/{username}/events/orgs/{org}", "GET /users/{username}/events/public", "GET /users/{username}/followers", "GET /users/{username}/following", "GET /users/{username}/gists", "GET /users/{username}/gpg_keys", "GET /users/{username}/keys", "GET /users/{username}/orgs", "GET /users/{username}/packages", "GET /users/{username}/projects", "GET /users/{username}/received_events", "GET /users/{username}/received_events/public", "GET /users/{username}/repos", "GET /users/{username}/starred", "GET /users/{username}/subscriptions"];
-
-function isPaginatingEndpoint(arg) {
-  if (typeof arg === "string") {
-    return paginatingEndpoints.includes(arg);
-  } else {
-    return false;
-  }
-}
-
-/**
- * @param octokit Octokit instance
- * @param options Options passed to Octokit constructor
- */
-
-function paginateRest(octokit) {
-  return {
-    paginate: Object.assign(paginate.bind(null, octokit), {
-      iterator: iterator.bind(null, octokit)
-    })
-  };
-}
-paginateRest.VERSION = VERSION;
-
-exports.composePaginateRest = composePaginateRest;
-exports.isPaginatingEndpoint = isPaginatingEndpoint;
-exports.paginateRest = paginateRest;
-exports.paginatingEndpoints = paginatingEndpoints;
-//# sourceMappingURL=index.js.map
-
-
-/***/ }),
-
-/***/ 7471:
-/***/ ((__unused_webpack_module, exports, __nccwpck_require__) => {
-
-"use strict";
-
-
-Object.defineProperty(exports, "__esModule", ({ value: true }));
-
-function _interopDefault (ex) { return (ex && (typeof ex === 'object') && 'default' in ex) ? ex['default'] : ex; }
-
-var deprecation = __nccwpck_require__(8932);
-var once = _interopDefault(__nccwpck_require__(1223));
-
-const logOnceCode = once(deprecation => console.warn(deprecation));
-const logOnceHeaders = once(deprecation => console.warn(deprecation));
-/**
- * Error with extra properties to help with debugging
- */
-
-class RequestError extends Error {
-  constructor(message, statusCode, options) {
-    super(message); // Maintains proper stack trace (only available on V8)
-
-    /* istanbul ignore next */
-
-    if (Error.captureStackTrace) {
-      Error.captureStackTrace(this, this.constructor);
-    }
-
-    this.name = "HttpError";
-    this.status = statusCode;
-    let headers;
-
-    if ("headers" in options && typeof options.headers !== "undefined") {
-      headers = options.headers;
-    }
-
-    if ("response" in options) {
-      this.response = options.response;
-      headers = options.response.headers;
-    } // redact request credentials without mutating original request options
-
-
-    const requestCopy = Object.assign({}, options.request);
-
-    if (options.request.headers.authorization) {
-      requestCopy.headers = Object.assign({}, options.request.headers, {
-        authorization: options.request.headers.authorization.replace(/ .*$/, " [REDACTED]")
-      });
-    }
-
-    requestCopy.url = requestCopy.url // client_id & client_secret can be passed as URL query parameters to increase rate limit
-    // see https://developer.github.com/v3/#increasing-the-unauthenticated-rate-limit-for-oauth-applications
-    .replace(/\bclient_secret=\w+/g, "client_secret=[REDACTED]") // OAuth tokens can be passed as URL query parameters, although it is not recommended
-    // see https://developer.github.com/v3/#oauth2-token-sent-in-a-header
-    .replace(/\baccess_token=\w+/g, "access_token=[REDACTED]");
-    this.request = requestCopy; // deprecations
-
-    Object.defineProperty(this, "code", {
-      get() {
-        logOnceCode(new deprecation.Deprecation("[@octokit/request-error] `error.code` is deprecated, use `error.status`."));
-        return statusCode;
-      }
-
-    });
-    Object.defineProperty(this, "headers", {
-      get() {
-        logOnceHeaders(new deprecation.Deprecation("[@octokit/request-error] `error.headers` is deprecated, use `error.response.headers`."));
-        return headers || {};
-      }
-
-    });
-  }
-
-}
-
-exports.RequestError = RequestError;
-//# sourceMappingURL=index.js.map
-
-
-/***/ }),
-
-/***/ 9353:
-/***/ ((__unused_webpack_module, exports, __nccwpck_require__) => {
-
-"use strict";
-
-
-Object.defineProperty(exports, "__esModule", ({ value: true }));
-
-function _interopDefault (ex) { return (ex && (typeof ex === 'object') && 'default' in ex) ? ex['default'] : ex; }
-
-var endpoint = __nccwpck_require__(8713);
-var universalUserAgent = __nccwpck_require__(5030);
-var isPlainObject = __nccwpck_require__(3287);
-var nodeFetch = _interopDefault(__nccwpck_require__(467));
-var requestError = __nccwpck_require__(7471);
-
-const VERSION = "5.6.3";
-
-function getBufferResponse(response) {
-  return response.arrayBuffer();
-}
-
-function fetchWrapper(requestOptions) {
-  const log = requestOptions.request && requestOptions.request.log ? requestOptions.request.log : console;
-
-  if (isPlainObject.isPlainObject(requestOptions.body) || Array.isArray(requestOptions.body)) {
-    requestOptions.body = JSON.stringify(requestOptions.body);
-  }
-
-  let headers = {};
-  let status;
-  let url;
-  const fetch = requestOptions.request && requestOptions.request.fetch || nodeFetch;
-  return fetch(requestOptions.url, Object.assign({
-    method: requestOptions.method,
-    body: requestOptions.body,
-    headers: requestOptions.headers,
-    redirect: requestOptions.redirect
-  }, // `requestOptions.request.agent` type is incompatible
-  // see https://github.com/octokit/types.ts/pull/264
-  requestOptions.request)).then(async response => {
-    url = response.url;
-    status = response.status;
-
-    for (const keyAndValue of response.headers) {
-      headers[keyAndValue[0]] = keyAndValue[1];
-    }
-
-    if ("deprecation" in headers) {
-      const matches = headers.link && headers.link.match(/<([^>]+)>; rel="deprecation"/);
-      const deprecationLink = matches && matches.pop();
-      log.warn(`[@octokit/request] "${requestOptions.method} ${requestOptions.url}" is deprecated. It is scheduled to be removed on ${headers.sunset}${deprecationLink ? `. See ${deprecationLink}` : ""}`);
-    }
-
-    if (status === 204 || status === 205) {
-      return;
-    } // GitHub API returns 200 for HEAD requests
-
-
-    if (requestOptions.method === "HEAD") {
-      if (status < 400) {
-        return;
-      }
-
-      throw new requestError.RequestError(response.statusText, status, {
-        response: {
-          url,
-          status,
-          headers,
-          data: undefined
-        },
-        request: requestOptions
-      });
-    }
-
-    if (status === 304) {
-      throw new requestError.RequestError("Not modified", status, {
-        response: {
-          url,
-          status,
-          headers,
-          data: await getResponseData(response)
-        },
-        request: requestOptions
-      });
-    }
-
-    if (status >= 400) {
-      const data = await getResponseData(response);
-      const error = new requestError.RequestError(toErrorMessage(data), status, {
-        response: {
-          url,
-          status,
-          headers,
-          data
-        },
-        request: requestOptions
-      });
-      throw error;
-    }
-
-    return getResponseData(response);
-  }).then(data => {
-    return {
-      status,
-      url,
-      headers,
-      data
-    };
-  }).catch(error => {
-    if (error instanceof requestError.RequestError) throw error;
-    throw new requestError.RequestError(error.message, 500, {
-      request: requestOptions
-    });
-  });
-}
-
-async function getResponseData(response) {
-  const contentType = response.headers.get("content-type");
-
-  if (/application\/json/.test(contentType)) {
-    return response.json();
-  }
-
-  if (!contentType || /^text\/|charset=utf-8$/.test(contentType)) {
-    return response.text();
-  }
-
-  return getBufferResponse(response);
-}
-
-function toErrorMessage(data) {
-  if (typeof data === "string") return data; // istanbul ignore else - just in case
-
-  if ("message" in data) {
-    if (Array.isArray(data.errors)) {
-      return `${data.message}: ${data.errors.map(JSON.stringify).join(", ")}`;
-    }
-
-    return data.message;
-  } // istanbul ignore next - just in case
-
-
-  return `Unknown error: ${JSON.stringify(data)}`;
-}
-
-function withDefaults(oldEndpoint, newDefaults) {
-  const endpoint = oldEndpoint.defaults(newDefaults);
-
-  const newApi = function (route, parameters) {
-    const endpointOptions = endpoint.merge(route, parameters);
-
-    if (!endpointOptions.request || !endpointOptions.request.hook) {
-      return fetchWrapper(endpoint.parse(endpointOptions));
-    }
-
-    const request = (route, parameters) => {
-      return fetchWrapper(endpoint.parse(endpoint.merge(route, parameters)));
-    };
-
-    Object.assign(request, {
-      endpoint,
-      defaults: withDefaults.bind(null, endpoint)
-    });
-    return endpointOptions.request.hook(request, endpointOptions);
-  };
-
-  return Object.assign(newApi, {
-    endpoint,
-    defaults: withDefaults.bind(null, endpoint)
-  });
-}
-
-const request = withDefaults(endpoint.endpoint, {
-  headers: {
-    "user-agent": `octokit-request.js/${VERSION} ${universalUserAgent.getUserAgent()}`
-  }
-});
-
-exports.request = request;
-//# sourceMappingURL=index.js.map
-
-
-/***/ }),
-
-/***/ 5526:
-/***/ (function(__unused_webpack_module, exports) {
-
-"use strict";
-
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
-Object.defineProperty(exports, "__esModule", ({ value: true }));
-exports.PersonalAccessTokenCredentialHandler = exports.BearerCredentialHandler = exports.BasicCredentialHandler = void 0;
-class BasicCredentialHandler {
-    constructor(username, password) {
-        this.username = username;
-        this.password = password;
-    }
-    prepareRequest(options) {
-        if (!options.headers) {
-            throw Error('The request has no headers');
-        }
-        options.headers['Authorization'] = `Basic ${Buffer.from(`${this.username}:${this.password}`).toString('base64')}`;
-    }
-    // This handler cannot handle 401
-    canHandleAuthentication() {
-        return false;
-    }
-    handleAuthentication() {
-        return __awaiter(this, void 0, void 0, function* () {
-            throw new Error('not implemented');
-        });
-    }
-}
-exports.BasicCredentialHandler = BasicCredentialHandler;
-class BearerCredentialHandler {
-    constructor(token) {
-        this.token = token;
-    }
-    // currently implements pre-authorization
-    // TODO: support preAuth = false where it hooks on 401
-    prepareRequest(options) {
-        if (!options.headers) {
-            throw Error('The request has no headers');
-        }
-        options.headers['Authorization'] = `Bearer ${this.token}`;
-    }
-    // This handler cannot handle 401
-    canHandleAuthentication() {
-        return false;
-    }
-    handleAuthentication() {
-        return __awaiter(this, void 0, void 0, function* () {
-            throw new Error('not implemented');
-        });
-    }
-}
-exports.BearerCredentialHandler = BearerCredentialHandler;
-class PersonalAccessTokenCredentialHandler {
-    constructor(token) {
-        this.token = token;
-    }
-    // currently implements pre-authorization
-    // TODO: support preAuth = false where it hooks on 401
-    prepareRequest(options) {
-        if (!options.headers) {
-            throw Error('The request has no headers');
-        }
-        options.headers['Authorization'] = `Basic ${Buffer.from(`PAT:${this.token}`).toString('base64')}`;
-    }
-    // This handler cannot handle 401
-    canHandleAuthentication() {
-        return false;
-    }
-    handleAuthentication() {
-        return __awaiter(this, void 0, void 0, function* () {
-            throw new Error('not implemented');
-        });
-    }
-}
-exports.PersonalAccessTokenCredentialHandler = PersonalAccessTokenCredentialHandler;
-//# sourceMappingURL=auth.js.map
-
-/***/ }),
-
-/***/ 6255:
-/***/ (function(__unused_webpack_module, exports, __nccwpck_require__) {
-
-"use strict";
-
-/* eslint-disable @typescript-eslint/no-explicit-any */
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
-Object.defineProperty(exports, "__esModule", ({ value: true }));
-exports.HttpClient = exports.isHttps = exports.HttpClientResponse = exports.HttpClientError = exports.getProxyUrl = exports.MediaTypes = exports.Headers = exports.HttpCodes = void 0;
-const http = __importStar(__nccwpck_require__(3685));
-const https = __importStar(__nccwpck_require__(5687));
-const pm = __importStar(__nccwpck_require__(9835));
-const tunnel = __importStar(__nccwpck_require__(4294));
-var HttpCodes;
-(function (HttpCodes) {
-    HttpCodes[HttpCodes["OK"] = 200] = "OK";
-    HttpCodes[HttpCodes["MultipleChoices"] = 300] = "MultipleChoices";
-    HttpCodes[HttpCodes["MovedPermanently"] = 301] = "MovedPermanently";
-    HttpCodes[HttpCodes["ResourceMoved"] = 302] = "ResourceMoved";
-    HttpCodes[HttpCodes["SeeOther"] = 303] = "SeeOther";
-    HttpCodes[HttpCodes["NotModified"] = 304] = "NotModified";
-    HttpCodes[HttpCodes["UseProxy"] = 305] = "UseProxy";
-    HttpCodes[HttpCodes["SwitchProxy"] = 306] = "SwitchProxy";
-    HttpCodes[HttpCodes["TemporaryRedirect"] = 307] = "TemporaryRedirect";
-    HttpCodes[HttpCodes["PermanentRedirect"] = 308] = "PermanentRedirect";
-    HttpCodes[HttpCodes["BadRequest"] = 400] = "BadRequest";
-    HttpCodes[HttpCodes["Unauthorized"] = 401] = "Unauthorized";
-    HttpCodes[HttpCodes["PaymentRequired"] = 402] = "PaymentRequired";
-    HttpCodes[HttpCodes["Forbidden"] = 403] = "Forbidden";
-    HttpCodes[HttpCodes["NotFound"] = 404] = "NotFound";
-    HttpCodes[HttpCodes["MethodNotAllowed"] = 405] = "MethodNotAllowed";
-    HttpCodes[HttpCodes["NotAcceptable"] = 406] = "NotAcceptable";
-    HttpCodes[HttpCodes["ProxyAuthenticationRequired"] = 407] = "ProxyAuthenticationRequired";
-    HttpCodes[HttpCodes["RequestTimeout"] = 408] = "RequestTimeout";
-    HttpCodes[HttpCodes["Conflict"] = 409] = "Conflict";
-    HttpCodes[HttpCodes["Gone"] = 410] = "Gone";
-    HttpCodes[HttpCodes["TooManyRequests"] = 429] = "TooManyRequests";
-    HttpCodes[HttpCodes["InternalServerError"] = 500] = "InternalServerError";
-    HttpCodes[HttpCodes["NotImplemented"] = 501] = "NotImplemented";
-    HttpCodes[HttpCodes["BadGateway"] = 502] = "BadGateway";
-    HttpCodes[HttpCodes["ServiceUnavailable"] = 503] = "ServiceUnavailable";
-    HttpCodes[HttpCodes["GatewayTimeout"] = 504] = "GatewayTimeout";
-})(HttpCodes = exports.HttpCodes || (exports.HttpCodes = {}));
-var Headers;
-(function (Headers) {
-    Headers["Accept"] = "accept";
-    Headers["ContentType"] = "content-type";
-})(Headers = exports.Headers || (exports.Headers = {}));
-var MediaTypes;
-(function (MediaTypes) {
-    MediaTypes["ApplicationJson"] = "application/json";
-})(MediaTypes = exports.MediaTypes || (exports.MediaTypes = {}));
-/**
- * Returns the proxy URL, depending upon the supplied url and proxy environment variables.
- * @param serverUrl  The server URL where the request will be sent. For example, https://api.github.com
- */
-function getProxyUrl(serverUrl) {
-    const proxyUrl = pm.getProxyUrl(new URL(serverUrl));
-    return proxyUrl ? proxyUrl.href : '';
-}
-exports.getProxyUrl = getProxyUrl;
-const HttpRedirectCodes = [
-    HttpCodes.MovedPermanently,
-    HttpCodes.ResourceMoved,
-    HttpCodes.SeeOther,
-    HttpCodes.TemporaryRedirect,
-    HttpCodes.PermanentRedirect
-];
-const HttpResponseRetryCodes = [
-    HttpCodes.BadGateway,
-    HttpCodes.ServiceUnavailable,
-    HttpCodes.GatewayTimeout
-];
-const RetryableHttpVerbs = ['OPTIONS', 'GET', 'DELETE', 'HEAD'];
-const ExponentialBackoffCeiling = 10;
-const ExponentialBackoffTimeSlice = 5;
-class HttpClientError extends Error {
-    constructor(message, statusCode) {
-        super(message);
-        this.name = 'HttpClientError';
-        this.statusCode = statusCode;
-        Object.setPrototypeOf(this, HttpClientError.prototype);
-    }
-}
-exports.HttpClientError = HttpClientError;
-class HttpClientResponse {
-    constructor(message) {
-        this.message = message;
-    }
-    readBody() {
-        return __awaiter(this, void 0, void 0, function* () {
-            return new Promise((resolve) => __awaiter(this, void 0, void 0, function* () {
-                let output = Buffer.alloc(0);
-                this.message.on('data', (chunk) => {
-                    output = Buffer.concat([output, chunk]);
-                });
-                this.message.on('end', () => {
-                    resolve(output.toString());
-                });
-            }));
-        });
-    }
-}
-exports.HttpClientResponse = HttpClientResponse;
-function isHttps(requestUrl) {
-    const parsedUrl = new URL(requestUrl);
-    return parsedUrl.protocol === 'https:';
-}
-exports.isHttps = isHttps;
-class HttpClient {
-    constructor(userAgent, handlers, requestOptions) {
-        this._ignoreSslError = false;
-        this._allowRedirects = true;
-        this._allowRedirectDowngrade = false;
-        this._maxRedirects = 50;
-        this._allowRetries = false;
-        this._maxRetries = 1;
-        this._keepAlive = false;
-        this._disposed = false;
-        this.userAgent = userAgent;
-        this.handlers = handlers || [];
-        this.requestOptions = requestOptions;
-        if (requestOptions) {
-            if (requestOptions.ignoreSslError != null) {
-                this._ignoreSslError = requestOptions.ignoreSslError;
-            }
-            this._socketTimeout = requestOptions.socketTimeout;
-            if (requestOptions.allowRedirects != null) {
-                this._allowRedirects = requestOptions.allowRedirects;
-            }
-            if (requestOptions.allowRedirectDowngrade != null) {
-                this._allowRedirectDowngrade = requestOptions.allowRedirectDowngrade;
-            }
-            if (requestOptions.maxRedirects != null) {
-                this._maxRedirects = Math.max(requestOptions.maxRedirects, 0);
-            }
-            if (requestOptions.keepAlive != null) {
-                this._keepAlive = requestOptions.keepAlive;
-            }
-            if (requestOptions.allowRetries != null) {
-                this._allowRetries = requestOptions.allowRetries;
-            }
-            if (requestOptions.maxRetries != null) {
-                this._maxRetries = requestOptions.maxRetries;
-            }
-        }
-    }
-    options(requestUrl, additionalHeaders) {
-        return __awaiter(this, void 0, void 0, function* () {
-            return this.request('OPTIONS', requestUrl, null, additionalHeaders || {});
-        });
-    }
-    get(requestUrl, additionalHeaders) {
-        return __awaiter(this, void 0, void 0, function* () {
-            return this.request('GET', requestUrl, null, additionalHeaders || {});
-        });
-    }
-    del(requestUrl, additionalHeaders) {
-        return __awaiter(this, void 0, void 0, function* () {
-            return this.request('DELETE', requestUrl, null, additionalHeaders || {});
-        });
-    }
-    post(requestUrl, data, additionalHeaders) {
-        return __awaiter(this, void 0, void 0, function* () {
-            return this.request('POST', requestUrl, data, additionalHeaders || {});
-        });
-    }
-    patch(requestUrl, data, additionalHeaders) {
-        return __awaiter(this, void 0, void 0, function* () {
-            return this.request('PATCH', requestUrl, data, additionalHeaders || {});
-        });
-    }
-    put(requestUrl, data, additionalHeaders) {
-        return __awaiter(this, void 0, void 0, function* () {
-            return this.request('PUT', requestUrl, data, additionalHeaders || {});
-        });
-    }
-    head(requestUrl, additionalHeaders) {
-        return __awaiter(this, void 0, void 0, function* () {
-            return this.request('HEAD', requestUrl, null, additionalHeaders || {});
-        });
-    }
-    sendStream(verb, requestUrl, stream, additionalHeaders) {
-        return __awaiter(this, void 0, void 0, function* () {
-            return this.request(verb, requestUrl, stream, additionalHeaders);
-        });
-    }
-    /**
-     * Gets a typed object from an endpoint
-     * Be aware that not found returns a null.  Other errors (4xx, 5xx) reject the promise
-     */
-    getJson(requestUrl, additionalHeaders = {}) {
-        return __awaiter(this, void 0, void 0, function* () {
-            additionalHeaders[Headers.Accept] = this._getExistingOrDefaultHeader(additionalHeaders, Headers.Accept, MediaTypes.ApplicationJson);
-            const res = yield this.get(requestUrl, additionalHeaders);
-            return this._processResponse(res, this.requestOptions);
-        });
-    }
-    postJson(requestUrl, obj, additionalHeaders = {}) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const data = JSON.stringify(obj, null, 2);
-            additionalHeaders[Headers.Accept] = this._getExistingOrDefaultHeader(additionalHeaders, Headers.Accept, MediaTypes.ApplicationJson);
-            additionalHeaders[Headers.ContentType] = this._getExistingOrDefaultHeader(additionalHeaders, Headers.ContentType, MediaTypes.ApplicationJson);
-            const res = yield this.post(requestUrl, data, additionalHeaders);
-            return this._processResponse(res, this.requestOptions);
-        });
-    }
-    putJson(requestUrl, obj, additionalHeaders = {}) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const data = JSON.stringify(obj, null, 2);
-            additionalHeaders[Headers.Accept] = this._getExistingOrDefaultHeader(additionalHeaders, Headers.Accept, MediaTypes.ApplicationJson);
-            additionalHeaders[Headers.ContentType] = this._getExistingOrDefaultHeader(additionalHeaders, Headers.ContentType, MediaTypes.ApplicationJson);
-            const res = yield this.put(requestUrl, data, additionalHeaders);
-            return this._processResponse(res, this.requestOptions);
-        });
-    }
-    patchJson(requestUrl, obj, additionalHeaders = {}) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const data = JSON.stringify(obj, null, 2);
-            additionalHeaders[Headers.Accept] = this._getExistingOrDefaultHeader(additionalHeaders, Headers.Accept, MediaTypes.ApplicationJson);
-            additionalHeaders[Headers.ContentType] = this._getExistingOrDefaultHeader(additionalHeaders, Headers.ContentType, MediaTypes.ApplicationJson);
-            const res = yield this.patch(requestUrl, data, additionalHeaders);
-            return this._processResponse(res, this.requestOptions);
-        });
-    }
-    /**
-     * Makes a raw http request.
-     * All other methods such as get, post, patch, and request ultimately call this.
-     * Prefer get, del, post and patch
-     */
-    request(verb, requestUrl, data, headers) {
-        return __awaiter(this, void 0, void 0, function* () {
-            if (this._disposed) {
-                throw new Error('Client has already been disposed.');
-            }
-            const parsedUrl = new URL(requestUrl);
-            let info = this._prepareRequest(verb, parsedUrl, headers);
-            // Only perform retries on reads since writes may not be idempotent.
-            const maxTries = this._allowRetries && RetryableHttpVerbs.includes(verb)
-                ? this._maxRetries + 1
-                : 1;
-            let numTries = 0;
-            let response;
-            do {
-                response = yield this.requestRaw(info, data);
-                // Check if it's an authentication challenge
-                if (response &&
-                    response.message &&
-                    response.message.statusCode === HttpCodes.Unauthorized) {
-                    let authenticationHandler;
-                    for (const handler of this.handlers) {
-                        if (handler.canHandleAuthentication(response)) {
-                            authenticationHandler = handler;
-                            break;
-                        }
-                    }
-                    if (authenticationHandler) {
-                        return authenticationHandler.handleAuthentication(this, info, data);
-                    }
-                    else {
-                        // We have received an unauthorized response but have no handlers to handle it.
-                        // Let the response return to the caller.
-                        return response;
-                    }
-                }
-                let redirectsRemaining = this._maxRedirects;
-                while (response.message.statusCode &&
-                    HttpRedirectCodes.includes(response.message.statusCode) &&
-                    this._allowRedirects &&
-                    redirectsRemaining > 0) {
-                    const redirectUrl = response.message.headers['location'];
-                    if (!redirectUrl) {
-                        // if there's no location to redirect to, we won't
-                        break;
-                    }
-                    const parsedRedirectUrl = new URL(redirectUrl);
-                    if (parsedUrl.protocol === 'https:' &&
-                        parsedUrl.protocol !== parsedRedirectUrl.protocol &&
-                        !this._allowRedirectDowngrade) {
-                        throw new Error('Redirect from HTTPS to HTTP protocol. This downgrade is not allowed for security reasons. If you want to allow this behavior, set the allowRedirectDowngrade option to true.');
-                    }
-                    // we need to finish reading the response before reassigning response
-                    // which will leak the open socket.
-                    yield response.readBody();
-                    // strip authorization header if redirected to a different hostname
-                    if (parsedRedirectUrl.hostname !== parsedUrl.hostname) {
-                        for (const header in headers) {
-                            // header names are case insensitive
-                            if (header.toLowerCase() === 'authorization') {
-                                delete headers[header];
-                            }
-                        }
-                    }
-                    // let's make the request with the new redirectUrl
-                    info = this._prepareRequest(verb, parsedRedirectUrl, headers);
-                    response = yield this.requestRaw(info, data);
-                    redirectsRemaining--;
-                }
-                if (!response.message.statusCode ||
-                    !HttpResponseRetryCodes.includes(response.message.statusCode)) {
-                    // If not a retry code, return immediately instead of retrying
-                    return response;
-                }
-                numTries += 1;
-                if (numTries < maxTries) {
-                    yield response.readBody();
-                    yield this._performExponentialBackoff(numTries);
-                }
-            } while (numTries < maxTries);
-            return response;
-        });
-    }
-    /**
-     * Needs to be called if keepAlive is set to true in request options.
-     */
-    dispose() {
-        if (this._agent) {
-            this._agent.destroy();
-        }
-        this._disposed = true;
-    }
-    /**
-     * Raw request.
-     * @param info
-     * @param data
-     */
-    requestRaw(info, data) {
-        return __awaiter(this, void 0, void 0, function* () {
-            return new Promise((resolve, reject) => {
-                function callbackForResult(err, res) {
-                    if (err) {
-                        reject(err);
-                    }
-                    else if (!res) {
-                        // If `err` is not passed, then `res` must be passed.
-                        reject(new Error('Unknown error'));
-                    }
-                    else {
-                        resolve(res);
-                    }
-                }
-                this.requestRawWithCallback(info, data, callbackForResult);
-            });
-        });
-    }
-    /**
-     * Raw request with callback.
-     * @param info
-     * @param data
-     * @param onResult
-     */
-    requestRawWithCallback(info, data, onResult) {
-        if (typeof data === 'string') {
-            if (!info.options.headers) {
-                info.options.headers = {};
-            }
-            info.options.headers['Content-Length'] = Buffer.byteLength(data, 'utf8');
-        }
-        let callbackCalled = false;
-        function handleResult(err, res) {
-            if (!callbackCalled) {
-                callbackCalled = true;
-                onResult(err, res);
-            }
-        }
-        const req = info.httpModule.request(info.options, (msg) => {
-            const res = new HttpClientResponse(msg);
-            handleResult(undefined, res);
-        });
-        let socket;
-        req.on('socket', sock => {
-            socket = sock;
-        });
-        // If we ever get disconnected, we want the socket to timeout eventually
-        req.setTimeout(this._socketTimeout || 3 * 60000, () => {
-            if (socket) {
-                socket.end();
-            }
-            handleResult(new Error(`Request timeout: ${info.options.path}`));
-        });
-        req.on('error', function (err) {
-            // err has statusCode property
-            // res should have headers
-            handleResult(err);
-        });
-        if (data && typeof data === 'string') {
-            req.write(data, 'utf8');
-        }
-        if (data && typeof data !== 'string') {
-            data.on('close', function () {
-                req.end();
-            });
-            data.pipe(req);
-        }
-        else {
-            req.end();
-        }
-    }
-    /**
-     * Gets an http agent. This function is useful when you need an http agent that handles
-     * routing through a proxy server - depending upon the url and proxy environment variables.
-     * @param serverUrl  The server URL where the request will be sent. For example, https://api.github.com
-     */
-    getAgent(serverUrl) {
-        const parsedUrl = new URL(serverUrl);
-        return this._getAgent(parsedUrl);
-    }
-    _prepareRequest(method, requestUrl, headers) {
-        const info = {};
-        info.parsedUrl = requestUrl;
-        const usingSsl = info.parsedUrl.protocol === 'https:';
-        info.httpModule = usingSsl ? https : http;
-        const defaultPort = usingSsl ? 443 : 80;
-        info.options = {};
-        info.options.host = info.parsedUrl.hostname;
-        info.options.port = info.parsedUrl.port
-            ? parseInt(info.parsedUrl.port)
-            : defaultPort;
-        info.options.path =
-            (info.parsedUrl.pathname || '') + (info.parsedUrl.search || '');
-        info.options.method = method;
-        info.options.headers = this._mergeHeaders(headers);
-        if (this.userAgent != null) {
-            info.options.headers['user-agent'] = this.userAgent;
-        }
-        info.options.agent = this._getAgent(info.parsedUrl);
-        // gives handlers an opportunity to participate
-        if (this.handlers) {
-            for (const handler of this.handlers) {
-                handler.prepareRequest(info.options);
-            }
-        }
-        return info;
-    }
-    _mergeHeaders(headers) {
-        if (this.requestOptions && this.requestOptions.headers) {
-            return Object.assign({}, lowercaseKeys(this.requestOptions.headers), lowercaseKeys(headers || {}));
-        }
-        return lowercaseKeys(headers || {});
-    }
-    _getExistingOrDefaultHeader(additionalHeaders, header, _default) {
-        let clientHeader;
-        if (this.requestOptions && this.requestOptions.headers) {
-            clientHeader = lowercaseKeys(this.requestOptions.headers)[header];
-        }
-        return additionalHeaders[header] || clientHeader || _default;
-    }
-    _getAgent(parsedUrl) {
-        let agent;
-        const proxyUrl = pm.getProxyUrl(parsedUrl);
-        const useProxy = proxyUrl && proxyUrl.hostname;
-        if (this._keepAlive && useProxy) {
-            agent = this._proxyAgent;
-        }
-        if (this._keepAlive && !useProxy) {
-            agent = this._agent;
-        }
-        // if agent is already assigned use that agent.
-        if (agent) {
-            return agent;
-        }
-        const usingSsl = parsedUrl.protocol === 'https:';
-        let maxSockets = 100;
-        if (this.requestOptions) {
-            maxSockets = this.requestOptions.maxSockets || http.globalAgent.maxSockets;
-        }
-        // This is `useProxy` again, but we need to check `proxyURl` directly for TypeScripts's flow analysis.
-        if (proxyUrl && proxyUrl.hostname) {
-            const agentOptions = {
-                maxSockets,
-                keepAlive: this._keepAlive,
-                proxy: Object.assign(Object.assign({}, ((proxyUrl.username || proxyUrl.password) && {
-                    proxyAuth: `${proxyUrl.username}:${proxyUrl.password}`
-                })), { host: proxyUrl.hostname, port: proxyUrl.port })
-            };
-            let tunnelAgent;
-            const overHttps = proxyUrl.protocol === 'https:';
-            if (usingSsl) {
-                tunnelAgent = overHttps ? tunnel.httpsOverHttps : tunnel.httpsOverHttp;
-            }
-            else {
-                tunnelAgent = overHttps ? tunnel.httpOverHttps : tunnel.httpOverHttp;
-            }
-            agent = tunnelAgent(agentOptions);
-            this._proxyAgent = agent;
-        }
-        // if reusing agent across request and tunneling agent isn't assigned create a new agent
-        if (this._keepAlive && !agent) {
-            const options = { keepAlive: this._keepAlive, maxSockets };
-            agent = usingSsl ? new https.Agent(options) : new http.Agent(options);
-            this._agent = agent;
-        }
-        // if not using private agent and tunnel agent isn't setup then use global agent
-        if (!agent) {
-            agent = usingSsl ? https.globalAgent : http.globalAgent;
-        }
-        if (usingSsl && this._ignoreSslError) {
-            // we don't want to set NODE_TLS_REJECT_UNAUTHORIZED=0 since that will affect request for entire process
-            // http.RequestOptions doesn't expose a way to modify RequestOptions.agent.options
-            // we have to cast it to any and change it directly
-            agent.options = Object.assign(agent.options || {}, {
-                rejectUnauthorized: false
-            });
-        }
-        return agent;
-    }
-    _performExponentialBackoff(retryNumber) {
-        return __awaiter(this, void 0, void 0, function* () {
-            retryNumber = Math.min(ExponentialBackoffCeiling, retryNumber);
-            const ms = ExponentialBackoffTimeSlice * Math.pow(2, retryNumber);
-            return new Promise(resolve => setTimeout(() => resolve(), ms));
-        });
-    }
-    _processResponse(res, options) {
-        return __awaiter(this, void 0, void 0, function* () {
-            return new Promise((resolve, reject) => __awaiter(this, void 0, void 0, function* () {
-                const statusCode = res.message.statusCode || 0;
-                const response = {
-                    statusCode,
-                    result: null,
-                    headers: {}
-                };
-                // not found leads to null obj returned
-                if (statusCode === HttpCodes.NotFound) {
-                    resolve(response);
-                }
-                // get the result from the body
-                function dateTimeDeserializer(key, value) {
-                    if (typeof value === 'string') {
-                        const a = new Date(value);
-                        if (!isNaN(a.valueOf())) {
-                            return a;
-                        }
-                    }
-                    return value;
-                }
-                let obj;
-                let contents;
-                try {
-                    contents = yield res.readBody();
-                    if (contents && contents.length > 0) {
-                        if (options && options.deserializeDates) {
-                            obj = JSON.parse(contents, dateTimeDeserializer);
-                        }
-                        else {
-                            obj = JSON.parse(contents);
-                        }
-                        response.result = obj;
-                    }
-                    response.headers = res.message.headers;
-                }
-                catch (err) {
-                    // Invalid resource (contents not json);  leaving result obj null
-                }
-                // note that 3xx redirects are handled by the http layer.
-                if (statusCode > 299) {
-                    let msg;
-                    // if exception/error in body, attempt to get better error
-                    if (obj && obj.message) {
-                        msg = obj.message;
-                    }
-                    else if (contents && contents.length > 0) {
-                        // it may be the case that the exception is in the body message as string
-                        msg = contents;
-                    }
-                    else {
-                        msg = `Failed request: (${statusCode})`;
-                    }
-                    const err = new HttpClientError(msg, statusCode);
-                    err.result = response.result;
-                    reject(err);
-                }
-                else {
-                    resolve(response);
-                }
-            }));
-        });
-    }
-}
-exports.HttpClient = HttpClient;
-const lowercaseKeys = (obj) => Object.keys(obj).reduce((c, k) => ((c[k.toLowerCase()] = obj[k]), c), {});
-//# sourceMappingURL=index.js.map
-
-/***/ }),
-
-/***/ 9835:
-/***/ ((__unused_webpack_module, exports) => {
-
-"use strict";
-
-Object.defineProperty(exports, "__esModule", ({ value: true }));
-exports.checkBypass = exports.getProxyUrl = void 0;
-function getProxyUrl(reqUrl) {
-    const usingSsl = reqUrl.protocol === 'https:';
-    if (checkBypass(reqUrl)) {
-        return undefined;
-    }
-    const proxyVar = (() => {
-        if (usingSsl) {
-            return process.env['https_proxy'] || process.env['HTTPS_PROXY'];
-        }
-        else {
-            return process.env['http_proxy'] || process.env['HTTP_PROXY'];
-        }
-    })();
-    if (proxyVar) {
-        return new URL(proxyVar);
-    }
-    else {
-        return undefined;
-    }
-}
-exports.getProxyUrl = getProxyUrl;
-function checkBypass(reqUrl) {
-    if (!reqUrl.hostname) {
-        return false;
-    }
-    const noProxy = process.env['no_proxy'] || process.env['NO_PROXY'] || '';
-    if (!noProxy) {
-        return false;
-    }
-    // Determine the request port
-    let reqPort;
-    if (reqUrl.port) {
-        reqPort = Number(reqUrl.port);
-    }
-    else if (reqUrl.protocol === 'http:') {
-        reqPort = 80;
-    }
-    else if (reqUrl.protocol === 'https:') {
-        reqPort = 443;
-    }
-    // Format the request hostname and hostname with port
-    const upperReqHosts = [reqUrl.hostname.toUpperCase()];
-    if (typeof reqPort === 'number') {
-        upperReqHosts.push(`${upperReqHosts[0]}:${reqPort}`);
-    }
-    // Compare request host against noproxy
-    for (const upperNoProxyItem of noProxy
-        .split(',')
-        .map(x => x.trim().toUpperCase())
-        .filter(x => x)) {
-        if (upperReqHosts.some(x => x === upperNoProxyItem)) {
-            return true;
-        }
-    }
-    return false;
-}
-exports.checkBypass = checkBypass;
-//# sourceMappingURL=proxy.js.map
-
-/***/ }),
-
-/***/ 4193:
-/***/ ((__unused_webpack_module, exports) => {
-
-"use strict";
-
-
-Object.defineProperty(exports, "__esModule", ({ value: true }));
-
-const VERSION = "3.1.0";
-
-/**
- * Some “list” response that can be paginated have a different response structure
- *
- * They have a `total_count` key in the response (search also has `incomplete_results`,
- * /installation/repositories also has `repository_selection`), as well as a key with
- * the list of the items which name varies from endpoint to endpoint.
- *
- * Octokit normalizes these responses so that paginated results are always returned following
- * the same structure. One challenge is that if the list response has only one page, no Link
- * header is provided, so this header alone is not sufficient to check wether a response is
- * paginated or not.
- *
- * We check if a "total_count" key is present in the response data, but also make sure that
- * a "url" property is not, as the "Get the combined status for a specific ref" endpoint would
- * otherwise match: https://developer.github.com/v3/repos/statuses/#get-the-combined-status-for-a-specific-ref
- */
-function normalizePaginatedListResponse(response) {
-  // endpoints can respond with 204 if repository is empty
-  if (!response.data) {
-    return { ...response,
-      data: []
-    };
-  }
-
-  const responseNeedsNormalization = "total_count" in response.data && !("url" in response.data);
-  if (!responseNeedsNormalization) return response; // keep the additional properties intact as there is currently no other way
-  // to retrieve the same information.
-
-  const incompleteResults = response.data.incomplete_results;
-  const repositorySelection = response.data.repository_selection;
-  const totalCount = response.data.total_count;
-  delete response.data.incomplete_results;
-  delete response.data.repository_selection;
-  delete response.data.total_count;
-  const namespaceKey = Object.keys(response.data)[0];
-  const data = response.data[namespaceKey];
-  response.data = data;
-
-  if (typeof incompleteResults !== "undefined") {
-    response.data.incomplete_results = incompleteResults;
-  }
-
-  if (typeof repositorySelection !== "undefined") {
-    response.data.repository_selection = repositorySelection;
-  }
-
-  response.data.total_count = totalCount;
-  return response;
-}
-
-function iterator(octokit, route, parameters) {
-  const options = typeof route === "function" ? route.endpoint(parameters) : octokit.request.endpoint(route, parameters);
-  const requestMethod = typeof route === "function" ? route : octokit.request;
-  const method = options.method;
-  const headers = options.headers;
-  let url = options.url;
-  return {
-    [Symbol.asyncIterator]: () => ({
-      async next() {
-        if (!url) return {
-          done: true
-        };
-
-        try {
-          const response = await requestMethod({
-            method,
-            url,
-            headers
-          });
-          const normalizedResponse = normalizePaginatedListResponse(response); // `response.headers.link` format:
-          // '<https://api.github.com/users/aseemk/followers?page=2>; rel="next", <https://api.github.com/users/aseemk/followers?page=2>; rel="last"'
-          // sets `url` to undefined if "next" URL is not present or `link` header is not set
-
-          url = ((normalizedResponse.headers.link || "").match(/<([^>]+)>;\s*rel="next"/) || [])[1];
-          return {
-            value: normalizedResponse
-          };
-        } catch (error) {
-          if (error.status !== 409) throw error;
-          url = "";
-          return {
-            value: {
-              status: 200,
-              headers: {},
-              data: []
-            }
-          };
-        }
-      }
-
-    })
-  };
-}
-
-function paginate(octokit, route, parameters, mapFn) {
-  if (typeof parameters === "function") {
-    mapFn = parameters;
-    parameters = undefined;
-  }
-
-  return gather(octokit, [], iterator(octokit, route, parameters)[Symbol.asyncIterator](), mapFn);
-}
-
-function gather(octokit, results, iterator, mapFn) {
-  return iterator.next().then(result => {
-    if (result.done) {
-      return results;
-    }
-
-    let earlyExit = false;
-
-    function done() {
-      earlyExit = true;
-    }
-
-    results = results.concat(mapFn ? mapFn(result.value, done) : result.value.data);
-
-    if (earlyExit) {
-      return results;
-    }
-
-    return gather(octokit, results, iterator, mapFn);
-  });
-}
-
-const composePaginateRest = Object.assign(paginate, {
-  iterator
-});
-
-const paginatingEndpoints = ["GET /app/hook/deliveries", "GET /app/installations", "GET /applications/grants", "GET /authorizations", "GET /enterprises/{enterprise}/actions/permissions/organizations", "GET /enterprises/{enterprise}/actions/runner-groups", "GET /enterprises/{enterprise}/actions/runner-groups/{runner_group_id}/organizations", "GET /enterprises/{enterprise}/actions/runner-groups/{runner_group_id}/runners", "GET /enterprises/{enterprise}/actions/runners", "GET /enterprises/{enterprise}/audit-log", "GET /enterprises/{enterprise}/code-scanning/alerts", "GET /enterprises/{enterprise}/secret-scanning/alerts", "GET /enterprises/{enterprise}/settings/billing/advanced-security", "GET /events", "GET /gists", "GET /gists/public", "GET /gists/starred", "GET /gists/{gist_id}/comments", "GET /gists/{gist_id}/commits", "GET /gists/{gist_id}/forks", "GET /installation/repositories", "GET /issues", "GET /licenses", "GET /marketplace_listing/plans", "GET /marketplace_listing/plans/{plan_id}/accounts", "GET /marketplace_listing/stubbed/plans", "GET /marketplace_listing/stubbed/plans/{plan_id}/accounts", "GET /networks/{owner}/{repo}/events", "GET /notifications", "GET /organizations", "GET /orgs/{org}/actions/cache/usage-by-repository", "GET /orgs/{org}/actions/permissions/repositories", "GET /orgs/{org}/actions/runner-groups", "GET /orgs/{org}/actions/runner-groups/{runner_group_id}/repositories", "GET /orgs/{org}/actions/runner-groups/{runner_group_id}/runners", "GET /orgs/{org}/actions/runners", "GET /orgs/{org}/actions/secrets", "GET /orgs/{org}/actions/secrets/{secret_name}/repositories", "GET /orgs/{org}/audit-log", "GET /orgs/{org}/blocks", "GET /orgs/{org}/code-scanning/alerts", "GET /orgs/{org}/codespaces", "GET /orgs/{org}/credential-authorizations", "GET /orgs/{org}/dependabot/secrets", "GET /orgs/{org}/dependabot/secrets/{secret_name}/repositories", "GET /orgs/{org}/events", "GET /orgs/{org}/external-groups", "GET /orgs/{org}/failed_invitations", "GET /orgs/{org}/hooks", "GET /orgs/{org}/hooks/{hook_id}/deliveries", "GET /orgs/{org}/installations", "GET /orgs/{org}/invitations", "GET /orgs/{org}/invitations/{invitation_id}/teams", "GET /orgs/{org}/issues", "GET /orgs/{org}/members", "GET /orgs/{org}/migrations", "GET /orgs/{org}/migrations/{migration_id}/repositories", "GET /orgs/{org}/outside_collaborators", "GET /orgs/{org}/packages", "GET /orgs/{org}/packages/{package_type}/{package_name}/versions", "GET /orgs/{org}/projects", "GET /orgs/{org}/public_members", "GET /orgs/{org}/repos", "GET /orgs/{org}/secret-scanning/alerts", "GET /orgs/{org}/settings/billing/advanced-security", "GET /orgs/{org}/team-sync/groups", "GET /orgs/{org}/teams", "GET /orgs/{org}/teams/{team_slug}/discussions", "GET /orgs/{org}/teams/{team_slug}/discussions/{discussion_number}/comments", "GET /orgs/{org}/teams/{team_slug}/discussions/{discussion_number}/comments/{comment_number}/reactions", "GET /orgs/{org}/teams/{team_slug}/discussions/{discussion_number}/reactions", "GET /orgs/{org}/teams/{team_slug}/invitations", "GET /orgs/{org}/teams/{team_slug}/members", "GET /orgs/{org}/teams/{team_slug}/projects", "GET /orgs/{org}/teams/{team_slug}/repos", "GET /orgs/{org}/teams/{team_slug}/teams", "GET /projects/columns/{column_id}/cards", "GET /projects/{project_id}/collaborators", "GET /projects/{project_id}/columns", "GET /repos/{owner}/{repo}/actions/artifacts", "GET /repos/{owner}/{repo}/actions/caches", "GET /repos/{owner}/{repo}/actions/runners", "GET /repos/{owner}/{repo}/actions/runs", "GET /repos/{owner}/{repo}/actions/runs/{run_id}/artifacts", "GET /repos/{owner}/{repo}/actions/runs/{run_id}/attempts/{attempt_number}/jobs", "GET /repos/{owner}/{repo}/actions/runs/{run_id}/jobs", "GET /repos/{owner}/{repo}/actions/secrets", "GET /repos/{owner}/{repo}/actions/workflows", "GET /repos/{owner}/{repo}/actions/workflows/{workflow_id}/runs", "GET /repos/{owner}/{repo}/assignees", "GET /repos/{owner}/{repo}/branches", "GET /repos/{owner}/{repo}/check-runs/{check_run_id}/annotations", "GET /repos/{owner}/{repo}/check-suites/{check_suite_id}/check-runs", "GET /repos/{owner}/{repo}/code-scanning/alerts", "GET /repos/{owner}/{repo}/code-scanning/alerts/{alert_number}/instances", "GET /repos/{owner}/{repo}/code-scanning/analyses", "GET /repos/{owner}/{repo}/codespaces", "GET /repos/{owner}/{repo}/codespaces/devcontainers", "GET /repos/{owner}/{repo}/codespaces/secrets", "GET /repos/{owner}/{repo}/collaborators", "GET /repos/{owner}/{repo}/comments", "GET /repos/{owner}/{repo}/comments/{comment_id}/reactions", "GET /repos/{owner}/{repo}/commits", "GET /repos/{owner}/{repo}/commits/{commit_sha}/comments", "GET /repos/{owner}/{repo}/commits/{commit_sha}/pulls", "GET /repos/{owner}/{repo}/commits/{ref}/check-runs", "GET /repos/{owner}/{repo}/commits/{ref}/check-suites", "GET /repos/{owner}/{repo}/commits/{ref}/status", "GET /repos/{owner}/{repo}/commits/{ref}/statuses", "GET /repos/{owner}/{repo}/contributors", "GET /repos/{owner}/{repo}/dependabot/secrets", "GET /repos/{owner}/{repo}/deployments", "GET /repos/{owner}/{repo}/deployments/{deployment_id}/statuses", "GET /repos/{owner}/{repo}/environments", "GET /repos/{owner}/{repo}/events", "GET /repos/{owner}/{repo}/forks", "GET /repos/{owner}/{repo}/git/matching-refs/{ref}", "GET /repos/{owner}/{repo}/hooks", "GET /repos/{owner}/{repo}/hooks/{hook_id}/deliveries", "GET /repos/{owner}/{repo}/invitations", "GET /repos/{owner}/{repo}/issues", "GET /repos/{owner}/{repo}/issues/comments", "GET /repos/{owner}/{repo}/issues/comments/{comment_id}/reactions", "GET /repos/{owner}/{repo}/issues/events", "GET /repos/{owner}/{repo}/issues/{issue_number}/comments", "GET /repos/{owner}/{repo}/issues/{issue_number}/events", "GET /repos/{owner}/{repo}/issues/{issue_number}/labels", "GET /repos/{owner}/{repo}/issues/{issue_number}/reactions", "GET /repos/{owner}/{repo}/issues/{issue_number}/timeline", "GET /repos/{owner}/{repo}/keys", "GET /repos/{owner}/{repo}/labels", "GET /repos/{owner}/{repo}/milestones", "GET /repos/{owner}/{repo}/milestones/{milestone_number}/labels", "GET /repos/{owner}/{repo}/notifications", "GET /repos/{owner}/{repo}/pages/builds", "GET /repos/{owner}/{repo}/projects", "GET /repos/{owner}/{repo}/pulls", "GET /repos/{owner}/{repo}/pulls/comments", "GET /repos/{owner}/{repo}/pulls/comments/{comment_id}/reactions", "GET /repos/{owner}/{repo}/pulls/{pull_number}/comments", "GET /repos/{owner}/{repo}/pulls/{pull_number}/commits", "GET /repos/{owner}/{repo}/pulls/{pull_number}/files", "GET /repos/{owner}/{repo}/pulls/{pull_number}/requested_reviewers", "GET /repos/{owner}/{repo}/pulls/{pull_number}/reviews", "GET /repos/{owner}/{repo}/pulls/{pull_number}/reviews/{review_id}/comments", "GET /repos/{owner}/{repo}/releases", "GET /repos/{owner}/{repo}/releases/{release_id}/assets", "GET /repos/{owner}/{repo}/releases/{release_id}/reactions", "GET /repos/{owner}/{repo}/secret-scanning/alerts", "GET /repos/{owner}/{repo}/secret-scanning/alerts/{alert_number}/locations", "GET /repos/{owner}/{repo}/stargazers", "GET /repos/{owner}/{repo}/subscribers", "GET /repos/{owner}/{repo}/tags", "GET /repos/{owner}/{repo}/teams", "GET /repos/{owner}/{repo}/topics", "GET /repositories", "GET /repositories/{repository_id}/environments/{environment_name}/secrets", "GET /search/code", "GET /search/commits", "GET /search/issues", "GET /search/labels", "GET /search/repositories", "GET /search/topics", "GET /search/users", "GET /teams/{team_id}/discussions", "GET /teams/{team_id}/discussions/{discussion_number}/comments", "GET /teams/{team_id}/discussions/{discussion_number}/comments/{comment_number}/reactions", "GET /teams/{team_id}/discussions/{discussion_number}/reactions", "GET /teams/{team_id}/invitations", "GET /teams/{team_id}/members", "GET /teams/{team_id}/projects", "GET /teams/{team_id}/repos", "GET /teams/{team_id}/teams", "GET /user/blocks", "GET /user/codespaces", "GET /user/codespaces/secrets", "GET /user/emails", "GET /user/followers", "GET /user/following", "GET /user/gpg_keys", "GET /user/installations", "GET /user/installations/{installation_id}/repositories", "GET /user/issues", "GET /user/keys", "GET /user/marketplace_purchases", "GET /user/marketplace_purchases/stubbed", "GET /user/memberships/orgs", "GET /user/migrations", "GET /user/migrations/{migration_id}/repositories", "GET /user/orgs", "GET /user/packages", "GET /user/packages/{package_type}/{package_name}/versions", "GET /user/public_emails", "GET /user/repos", "GET /user/repository_invitations", "GET /user/starred", "GET /user/subscriptions", "GET /user/teams", "GET /users", "GET /users/{username}/events", "GET /users/{username}/events/orgs/{org}", "GET /users/{username}/events/public", "GET /users/{username}/followers", "GET /users/{username}/following", "GET /users/{username}/gists", "GET /users/{username}/gpg_keys", "GET /users/{username}/keys", "GET /users/{username}/orgs", "GET /users/{username}/packages", "GET /users/{username}/projects", "GET /users/{username}/received_events", "GET /users/{username}/received_events/public", "GET /users/{username}/repos", "GET /users/{username}/starred", "GET /users/{username}/subscriptions"];
-
-function isPaginatingEndpoint(arg) {
-  if (typeof arg === "string") {
-    return paginatingEndpoints.includes(arg);
-  } else {
-    return false;
-  }
-}
-
-/**
- * @param octokit Octokit instance
- * @param options Options passed to Octokit constructor
- */
-
-function paginateRest(octokit) {
-  return {
-    paginate: Object.assign(paginate.bind(null, octokit), {
-      iterator: iterator.bind(null, octokit)
-    })
-  };
-}
-paginateRest.VERSION = VERSION;
-
-exports.composePaginateRest = composePaginateRest;
-exports.isPaginatingEndpoint = isPaginatingEndpoint;
-exports.paginateRest = paginateRest;
-exports.paginatingEndpoints = paginatingEndpoints;
-//# sourceMappingURL=index.js.map
-
-
-/***/ }),
-
-/***/ 3044:
-/***/ ((__unused_webpack_module, exports) => {
-
-"use strict";
-
-
-Object.defineProperty(exports, "__esModule", ({ value: true }));
-
-function ownKeys(object, enumerableOnly) {
-  var keys = Object.keys(object);
-
-  if (Object.getOwnPropertySymbols) {
-    var symbols = Object.getOwnPropertySymbols(object);
-
-    if (enumerableOnly) {
-      symbols = symbols.filter(function (sym) {
-        return Object.getOwnPropertyDescriptor(object, sym).enumerable;
-      });
-    }
-
-    keys.push.apply(keys, symbols);
-  }
-
-  return keys;
-}
-
-function _objectSpread2(target) {
-  for (var i = 1; i < arguments.length; i++) {
-    var source = arguments[i] != null ? arguments[i] : {};
-
-    if (i % 2) {
-      ownKeys(Object(source), true).forEach(function (key) {
-        _defineProperty(target, key, source[key]);
-      });
-    } else if (Object.getOwnPropertyDescriptors) {
-      Object.defineProperties(target, Object.getOwnPropertyDescriptors(source));
-    } else {
-      ownKeys(Object(source)).forEach(function (key) {
-        Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key));
-      });
-    }
-  }
-
-  return target;
-}
-
-function _defineProperty(obj, key, value) {
-  if (key in obj) {
-    Object.defineProperty(obj, key, {
-      value: value,
-      enumerable: true,
-      configurable: true,
-      writable: true
-    });
-  } else {
-    obj[key] = value;
-  }
-
-  return obj;
-}
-
-const Endpoints = {
-  actions: {
-    addCustomLabelsToSelfHostedRunnerForOrg: ["POST /orgs/{org}/actions/runners/{runner_id}/labels"],
-    addCustomLabelsToSelfHostedRunnerForRepo: ["POST /repos/{owner}/{repo}/actions/runners/{runner_id}/labels"],
-    addSelectedRepoToOrgSecret: ["PUT /orgs/{org}/actions/secrets/{secret_name}/repositories/{repository_id}"],
-    approveWorkflowRun: ["POST /repos/{owner}/{repo}/actions/runs/{run_id}/approve"],
-    cancelWorkflowRun: ["POST /repos/{owner}/{repo}/actions/runs/{run_id}/cancel"],
-    createOrUpdateEnvironmentSecret: ["PUT /repositories/{repository_id}/environments/{environment_name}/secrets/{secret_name}"],
-    createOrUpdateOrgSecret: ["PUT /orgs/{org}/actions/secrets/{secret_name}"],
-    createOrUpdateRepoSecret: ["PUT /repos/{owner}/{repo}/actions/secrets/{secret_name}"],
-    createRegistrationTokenForOrg: ["POST /orgs/{org}/actions/runners/registration-token"],
-    createRegistrationTokenForRepo: ["POST /repos/{owner}/{repo}/actions/runners/registration-token"],
-    createRemoveTokenForOrg: ["POST /orgs/{org}/actions/runners/remove-token"],
-    createRemoveTokenForRepo: ["POST /repos/{owner}/{repo}/actions/runners/remove-token"],
-    createWorkflowDispatch: ["POST /repos/{owner}/{repo}/actions/workflows/{workflow_id}/dispatches"],
-    deleteActionsCacheById: ["DELETE /repos/{owner}/{repo}/actions/caches/{cache_id}"],
-    deleteActionsCacheByKey: ["DELETE /repos/{owner}/{repo}/actions/caches{?key,ref}"],
-    deleteArtifact: ["DELETE /repos/{owner}/{repo}/actions/artifacts/{artifact_id}"],
-    deleteEnvironmentSecret: ["DELETE /repositories/{repository_id}/environments/{environment_name}/secrets/{secret_name}"],
-    deleteOrgSecret: ["DELETE /orgs/{org}/actions/secrets/{secret_name}"],
-    deleteRepoSecret: ["DELETE /repos/{owner}/{repo}/actions/secrets/{secret_name}"],
-    deleteSelfHostedRunnerFromOrg: ["DELETE /orgs/{org}/actions/runners/{runner_id}"],
-    deleteSelfHostedRunnerFromRepo: ["DELETE /repos/{owner}/{repo}/actions/runners/{runner_id}"],
-    deleteWorkflowRun: ["DELETE /repos/{owner}/{repo}/actions/runs/{run_id}"],
-    deleteWorkflowRunLogs: ["DELETE /repos/{owner}/{repo}/actions/runs/{run_id}/logs"],
-    disableSelectedRepositoryGithubActionsOrganization: ["DELETE /orgs/{org}/actions/permissions/repositories/{repository_id}"],
-    disableWorkflow: ["PUT /repos/{owner}/{repo}/actions/workflows/{workflow_id}/disable"],
-    downloadArtifact: ["GET /repos/{owner}/{repo}/actions/artifacts/{artifact_id}/{archive_format}"],
-    downloadJobLogsForWorkflowRun: ["GET /repos/{owner}/{repo}/actions/jobs/{job_id}/logs"],
-    downloadWorkflowRunAttemptLogs: ["GET /repos/{owner}/{repo}/actions/runs/{run_id}/attempts/{attempt_number}/logs"],
-    downloadWorkflowRunLogs: ["GET /repos/{owner}/{repo}/actions/runs/{run_id}/logs"],
-    enableSelectedRepositoryGithubActionsOrganization: ["PUT /orgs/{org}/actions/permissions/repositories/{repository_id}"],
-    enableWorkflow: ["PUT /repos/{owner}/{repo}/actions/workflows/{workflow_id}/enable"],
-    getActionsCacheList: ["GET /repos/{owner}/{repo}/actions/caches"],
-    getActionsCacheUsage: ["GET /repos/{owner}/{repo}/actions/cache/usage"],
-    getActionsCacheUsageByRepoForOrg: ["GET /orgs/{org}/actions/cache/usage-by-repository"],
-    getActionsCacheUsageForEnterprise: ["GET /enterprises/{enterprise}/actions/cache/usage"],
-    getActionsCacheUsageForOrg: ["GET /orgs/{org}/actions/cache/usage"],
-    getAllowedActionsOrganization: ["GET /orgs/{org}/actions/permissions/selected-actions"],
-    getAllowedActionsRepository: ["GET /repos/{owner}/{repo}/actions/permissions/selected-actions"],
-    getArtifact: ["GET /repos/{owner}/{repo}/actions/artifacts/{artifact_id}"],
-    getEnvironmentPublicKey: ["GET /repositories/{repository_id}/environments/{environment_name}/secrets/public-key"],
-    getEnvironmentSecret: ["GET /repositories/{repository_id}/environments/{environment_name}/secrets/{secret_name}"],
-    getGithubActionsDefaultWorkflowPermissionsEnterprise: ["GET /enterprises/{enterprise}/actions/permissions/workflow"],
-    getGithubActionsDefaultWorkflowPermissionsOrganization: ["GET /orgs/{org}/actions/permissions/workflow"],
-    getGithubActionsDefaultWorkflowPermissionsRepository: ["GET /repos/{owner}/{repo}/actions/permissions/workflow"],
-    getGithubActionsPermissionsOrganization: ["GET /orgs/{org}/actions/permissions"],
-    getGithubActionsPermissionsRepository: ["GET /repos/{owner}/{repo}/actions/permissions"],
-    getJobForWorkflowRun: ["GET /repos/{owner}/{repo}/actions/jobs/{job_id}"],
-    getOrgPublicKey: ["GET /orgs/{org}/actions/secrets/public-key"],
-    getOrgSecret: ["GET /orgs/{org}/actions/secrets/{secret_name}"],
-    getPendingDeploymentsForRun: ["GET /repos/{owner}/{repo}/actions/runs/{run_id}/pending_deployments"],
-    getRepoPermissions: ["GET /repos/{owner}/{repo}/actions/permissions", {}, {
-      renamed: ["actions", "getGithubActionsPermissionsRepository"]
-    }],
-    getRepoPublicKey: ["GET /repos/{owner}/{repo}/actions/secrets/public-key"],
-    getRepoSecret: ["GET /repos/{owner}/{repo}/actions/secrets/{secret_name}"],
-    getReviewsForRun: ["GET /repos/{owner}/{repo}/actions/runs/{run_id}/approvals"],
-    getSelfHostedRunnerForOrg: ["GET /orgs/{org}/actions/runners/{runner_id}"],
-    getSelfHostedRunnerForRepo: ["GET /repos/{owner}/{repo}/actions/runners/{runner_id}"],
-    getWorkflow: ["GET /repos/{owner}/{repo}/actions/workflows/{workflow_id}"],
-    getWorkflowAccessToRepository: ["GET /repos/{owner}/{repo}/actions/permissions/access"],
-    getWorkflowRun: ["GET /repos/{owner}/{repo}/actions/runs/{run_id}"],
-    getWorkflowRunAttempt: ["GET /repos/{owner}/{repo}/actions/runs/{run_id}/attempts/{attempt_number}"],
-    getWorkflowRunUsage: ["GET /repos/{owner}/{repo}/actions/runs/{run_id}/timing"],
-    getWorkflowUsage: ["GET /repos/{owner}/{repo}/actions/workflows/{workflow_id}/timing"],
-    listArtifactsForRepo: ["GET /repos/{owner}/{repo}/actions/artifacts"],
-    listEnvironmentSecrets: ["GET /repositories/{repository_id}/environments/{environment_name}/secrets"],
-    listJobsForWorkflowRun: ["GET /repos/{owner}/{repo}/actions/runs/{run_id}/jobs"],
-    listJobsForWorkflowRunAttempt: ["GET /repos/{owner}/{repo}/actions/runs/{run_id}/attempts/{attempt_number}/jobs"],
-    listLabelsForSelfHostedRunnerForOrg: ["GET /orgs/{org}/actions/runners/{runner_id}/labels"],
-    listLabelsForSelfHostedRunnerForRepo: ["GET /repos/{owner}/{repo}/actions/runners/{runner_id}/labels"],
-    listOrgSecrets: ["GET /orgs/{org}/actions/secrets"],
-    listRepoSecrets: ["GET /repos/{owner}/{repo}/actions/secrets"],
-    listRepoWorkflows: ["GET /repos/{owner}/{repo}/actions/workflows"],
-    listRunnerApplicationsForOrg: ["GET /orgs/{org}/actions/runners/downloads"],
-    listRunnerApplicationsForRepo: ["GET /repos/{owner}/{repo}/actions/runners/downloads"],
-    listSelectedReposForOrgSecret: ["GET /orgs/{org}/actions/secrets/{secret_name}/repositories"],
-    listSelectedRepositoriesEnabledGithubActionsOrganization: ["GET /orgs/{org}/actions/permissions/repositories"],
-    listSelfHostedRunnersForOrg: ["GET /orgs/{org}/actions/runners"],
-    listSelfHostedRunnersForRepo: ["GET /repos/{owner}/{repo}/actions/runners"],
-    listWorkflowRunArtifacts: ["GET /repos/{owner}/{repo}/actions/runs/{run_id}/artifacts"],
-    listWorkflowRuns: ["GET /repos/{owner}/{repo}/actions/workflows/{workflow_id}/runs"],
-    listWorkflowRunsForRepo: ["GET /repos/{owner}/{repo}/actions/runs"],
-    reRunJobForWorkflowRun: ["POST /repos/{owner}/{repo}/actions/jobs/{job_id}/rerun"],
-    reRunWorkflow: ["POST /repos/{owner}/{repo}/actions/runs/{run_id}/rerun"],
-    reRunWorkflowFailedJobs: ["POST /repos/{owner}/{repo}/actions/runs/{run_id}/rerun-failed-jobs"],
-    removeAllCustomLabelsFromSelfHostedRunnerForOrg: ["DELETE /orgs/{org}/actions/runners/{runner_id}/labels"],
-    removeAllCustomLabelsFromSelfHostedRunnerForRepo: ["DELETE /repos/{owner}/{repo}/actions/runners/{runner_id}/labels"],
-    removeCustomLabelFromSelfHostedRunnerForOrg: ["DELETE /orgs/{org}/actions/runners/{runner_id}/labels/{name}"],
-    removeCustomLabelFromSelfHostedRunnerForRepo: ["DELETE /repos/{owner}/{repo}/actions/runners/{runner_id}/labels/{name}"],
-    removeSelectedRepoFromOrgSecret: ["DELETE /orgs/{org}/actions/secrets/{secret_name}/repositories/{repository_id}"],
-    reviewPendingDeploymentsForRun: ["POST /repos/{owner}/{repo}/actions/runs/{run_id}/pending_deployments"],
-    setAllowedActionsOrganization: ["PUT /orgs/{org}/actions/permissions/selected-actions"],
-    setAllowedActionsRepository: ["PUT /repos/{owner}/{repo}/actions/permissions/selected-actions"],
-    setCustomLabelsForSelfHostedRunnerForOrg: ["PUT /orgs/{org}/actions/runners/{runner_id}/labels"],
-    setCustomLabelsForSelfHostedRunnerForRepo: ["PUT /repos/{owner}/{repo}/actions/runners/{runner_id}/labels"],
-    setGithubActionsDefaultWorkflowPermissionsEnterprise: ["PUT /enterprises/{enterprise}/actions/permissions/workflow"],
-    setGithubActionsDefaultWorkflowPermissionsOrganization: ["PUT /orgs/{org}/actions/permissions/workflow"],
-    setGithubActionsDefaultWorkflowPermissionsRepository: ["PUT /repos/{owner}/{repo}/actions/permissions/workflow"],
-    setGithubActionsPermissionsOrganization: ["PUT /orgs/{org}/actions/permissions"],
-    setGithubActionsPermissionsRepository: ["PUT /repos/{owner}/{repo}/actions/permissions"],
-    setSelectedReposForOrgSecret: ["PUT /orgs/{org}/actions/secrets/{secret_name}/repositories"],
-    setSelectedRepositoriesEnabledGithubActionsOrganization: ["PUT /orgs/{org}/actions/permissions/repositories"],
-    setWorkflowAccessToRepository: ["PUT /repos/{owner}/{repo}/actions/permissions/access"]
-  },
-  activity: {
-    checkRepoIsStarredByAuthenticatedUser: ["GET /user/starred/{owner}/{repo}"],
-    deleteRepoSubscription: ["DELETE /repos/{owner}/{repo}/subscription"],
-    deleteThreadSubscription: ["DELETE /notifications/threads/{thread_id}/subscription"],
-    getFeeds: ["GET /feeds"],
-    getRepoSubscription: ["GET /repos/{owner}/{repo}/subscription"],
-    getThread: ["GET /notifications/threads/{thread_id}"],
-    getThreadSubscriptionForAuthenticatedUser: ["GET /notifications/threads/{thread_id}/subscription"],
-    listEventsForAuthenticatedUser: ["GET /users/{username}/events"],
-    listNotificationsForAuthenticatedUser: ["GET /notifications"],
-    listOrgEventsForAuthenticatedUser: ["GET /users/{username}/events/orgs/{org}"],
-    listPublicEvents: ["GET /events"],
-    listPublicEventsForRepoNetwork: ["GET /networks/{owner}/{repo}/events"],
-    listPublicEventsForUser: ["GET /users/{username}/events/public"],
-    listPublicOrgEvents: ["GET /orgs/{org}/events"],
-    listReceivedEventsForUser: ["GET /users/{username}/received_events"],
-    listReceivedPublicEventsForUser: ["GET /users/{username}/received_events/public"],
-    listRepoEvents: ["GET /repos/{owner}/{repo}/events"],
-    listRepoNotificationsForAuthenticatedUser: ["GET /repos/{owner}/{repo}/notifications"],
-    listReposStarredByAuthenticatedUser: ["GET /user/starred"],
-    listReposStarredByUser: ["GET /users/{username}/starred"],
-    listReposWatchedByUser: ["GET /users/{username}/subscriptions"],
-    listStargazersForRepo: ["GET /repos/{owner}/{repo}/stargazers"],
-    listWatchedReposForAuthenticatedUser: ["GET /user/subscriptions"],
-    listWatchersForRepo: ["GET /repos/{owner}/{repo}/subscribers"],
-    markNotificationsAsRead: ["PUT /notifications"],
-    markRepoNotificationsAsRead: ["PUT /repos/{owner}/{repo}/notifications"],
-    markThreadAsRead: ["PATCH /notifications/threads/{thread_id}"],
-    setRepoSubscription: ["PUT /repos/{owner}/{repo}/subscription"],
-    setThreadSubscription: ["PUT /notifications/threads/{thread_id}/subscription"],
-    starRepoForAuthenticatedUser: ["PUT /user/starred/{owner}/{repo}"],
-    unstarRepoForAuthenticatedUser: ["DELETE /user/starred/{owner}/{repo}"]
-  },
-  apps: {
-    addRepoToInstallation: ["PUT /user/installations/{installation_id}/repositories/{repository_id}", {}, {
-      renamed: ["apps", "addRepoToInstallationForAuthenticatedUser"]
-    }],
-    addRepoToInstallationForAuthenticatedUser: ["PUT /user/installations/{installation_id}/repositories/{repository_id}"],
-    checkToken: ["POST /applications/{client_id}/token"],
-    createFromManifest: ["POST /app-manifests/{code}/conversions"],
-    createInstallationAccessToken: ["POST /app/installations/{installation_id}/access_tokens"],
-    deleteAuthorization: ["DELETE /applications/{client_id}/grant"],
-    deleteInstallation: ["DELETE /app/installations/{installation_id}"],
-    deleteToken: ["DELETE /applications/{client_id}/token"],
-    getAuthenticated: ["GET /app"],
-    getBySlug: ["GET /apps/{app_slug}"],
-    getInstallation: ["GET /app/installations/{installation_id}"],
-    getOrgInstallation: ["GET /orgs/{org}/installation"],
-    getRepoInstallation: ["GET /repos/{owner}/{repo}/installation"],
-    getSubscriptionPlanForAccount: ["GET /marketplace_listing/accounts/{account_id}"],
-    getSubscriptionPlanForAccountStubbed: ["GET /marketplace_listing/stubbed/accounts/{account_id}"],
-    getUserInstallation: ["GET /users/{username}/installation"],
-    getWebhookConfigForApp: ["GET /app/hook/config"],
-    getWebhookDelivery: ["GET /app/hook/deliveries/{delivery_id}"],
-    listAccountsForPlan: ["GET /marketplace_listing/plans/{plan_id}/accounts"],
-    listAccountsForPlanStubbed: ["GET /marketplace_listing/stubbed/plans/{plan_id}/accounts"],
-    listInstallationReposForAuthenticatedUser: ["GET /user/installations/{installation_id}/repositories"],
-    listInstallations: ["GET /app/installations"],
-    listInstallationsForAuthenticatedUser: ["GET /user/installations"],
-    listPlans: ["GET /marketplace_listing/plans"],
-    listPlansStubbed: ["GET /marketplace_listing/stubbed/plans"],
-    listReposAccessibleToInstallation: ["GET /installation/repositories"],
-    listSubscriptionsForAuthenticatedUser: ["GET /user/marketplace_purchases"],
-    listSubscriptionsForAuthenticatedUserStubbed: ["GET /user/marketplace_purchases/stubbed"],
-    listWebhookDeliveries: ["GET /app/hook/deliveries"],
-    redeliverWebhookDelivery: ["POST /app/hook/deliveries/{delivery_id}/attempts"],
-    removeRepoFromInstallation: ["DELETE /user/installations/{installation_id}/repositories/{repository_id}", {}, {
-      renamed: ["apps", "removeRepoFromInstallationForAuthenticatedUser"]
-    }],
-    removeRepoFromInstallationForAuthenticatedUser: ["DELETE /user/installations/{installation_id}/repositories/{repository_id}"],
-    resetToken: ["PATCH /applications/{client_id}/token"],
-    revokeInstallationAccessToken: ["DELETE /installation/token"],
-    scopeToken: ["POST /applications/{client_id}/token/scoped"],
-    suspendInstallation: ["PUT /app/installations/{installation_id}/suspended"],
-    unsuspendInstallation: ["DELETE /app/installations/{installation_id}/suspended"],
-    updateWebhookConfigForApp: ["PATCH /app/hook/config"]
-  },
-  billing: {
-    getGithubActionsBillingOrg: ["GET /orgs/{org}/settings/billing/actions"],
-    getGithubActionsBillingUser: ["GET /users/{username}/settings/billing/actions"],
-    getGithubAdvancedSecurityBillingGhe: ["GET /enterprises/{enterprise}/settings/billing/advanced-security"],
-    getGithubAdvancedSecurityBillingOrg: ["GET /orgs/{org}/settings/billing/advanced-security"],
-    getGithubPackagesBillingOrg: ["GET /orgs/{org}/settings/billing/packages"],
-    getGithubPackagesBillingUser: ["GET /users/{username}/settings/billing/packages"],
-    getSharedStorageBillingOrg: ["GET /orgs/{org}/settings/billing/shared-storage"],
-    getSharedStorageBillingUser: ["GET /users/{username}/settings/billing/shared-storage"]
-  },
-  checks: {
-    create: ["POST /repos/{owner}/{repo}/check-runs"],
-    createSuite: ["POST /repos/{owner}/{repo}/check-suites"],
-    get: ["GET /repos/{owner}/{repo}/check-runs/{check_run_id}"],
-    getSuite: ["GET /repos/{owner}/{repo}/check-suites/{check_suite_id}"],
-    listAnnotations: ["GET /repos/{owner}/{repo}/check-runs/{check_run_id}/annotations"],
-    listForRef: ["GET /repos/{owner}/{repo}/commits/{ref}/check-runs"],
-    listForSuite: ["GET /repos/{owner}/{repo}/check-suites/{check_suite_id}/check-runs"],
-    listSuitesForRef: ["GET /repos/{owner}/{repo}/commits/{ref}/check-suites"],
-    rerequestRun: ["POST /repos/{owner}/{repo}/check-runs/{check_run_id}/rerequest"],
-    rerequestSuite: ["POST /repos/{owner}/{repo}/check-suites/{check_suite_id}/rerequest"],
-    setSuitesPreferences: ["PATCH /repos/{owner}/{repo}/check-suites/preferences"],
-    update: ["PATCH /repos/{owner}/{repo}/check-runs/{check_run_id}"]
-  },
-  codeScanning: {
-    deleteAnalysis: ["DELETE /repos/{owner}/{repo}/code-scanning/analyses/{analysis_id}{?confirm_delete}"],
-    getAlert: ["GET /repos/{owner}/{repo}/code-scanning/alerts/{alert_number}", {}, {
-      renamedParameters: {
-        alert_id: "alert_number"
-      }
-    }],
-    getAnalysis: ["GET /repos/{owner}/{repo}/code-scanning/analyses/{analysis_id}"],
-    getSarif: ["GET /repos/{owner}/{repo}/code-scanning/sarifs/{sarif_id}"],
-    listAlertInstances: ["GET /repos/{owner}/{repo}/code-scanning/alerts/{alert_number}/instances"],
-    listAlertsForOrg: ["GET /orgs/{org}/code-scanning/alerts"],
-    listAlertsForRepo: ["GET /repos/{owner}/{repo}/code-scanning/alerts"],
-    listAlertsInstances: ["GET /repos/{owner}/{repo}/code-scanning/alerts/{alert_number}/instances", {}, {
-      renamed: ["codeScanning", "listAlertInstances"]
-    }],
-    listRecentAnalyses: ["GET /repos/{owner}/{repo}/code-scanning/analyses"],
-    updateAlert: ["PATCH /repos/{owner}/{repo}/code-scanning/alerts/{alert_number}"],
-    uploadSarif: ["POST /repos/{owner}/{repo}/code-scanning/sarifs"]
-  },
-  codesOfConduct: {
-    getAllCodesOfConduct: ["GET /codes_of_conduct"],
-    getConductCode: ["GET /codes_of_conduct/{key}"]
-  },
-  codespaces: {
-    addRepositoryForSecretForAuthenticatedUser: ["PUT /user/codespaces/secrets/{secret_name}/repositories/{repository_id}"],
-    codespaceMachinesForAuthenticatedUser: ["GET /user/codespaces/{codespace_name}/machines"],
-    createForAuthenticatedUser: ["POST /user/codespaces"],
-    createOrUpdateRepoSecret: ["PUT /repos/{owner}/{repo}/codespaces/secrets/{secret_name}"],
-    createOrUpdateSecretForAuthenticatedUser: ["PUT /user/codespaces/secrets/{secret_name}"],
-    createWithPrForAuthenticatedUser: ["POST /repos/{owner}/{repo}/pulls/{pull_number}/codespaces"],
-    createWithRepoForAuthenticatedUser: ["POST /repos/{owner}/{repo}/codespaces"],
-    deleteForAuthenticatedUser: ["DELETE /user/codespaces/{codespace_name}"],
-    deleteFromOrganization: ["DELETE /orgs/{org}/members/{username}/codespaces/{codespace_name}"],
-    deleteRepoSecret: ["DELETE /repos/{owner}/{repo}/codespaces/secrets/{secret_name}"],
-    deleteSecretForAuthenticatedUser: ["DELETE /user/codespaces/secrets/{secret_name}"],
-    exportForAuthenticatedUser: ["POST /user/codespaces/{codespace_name}/exports"],
-    getExportDetailsForAuthenticatedUser: ["GET /user/codespaces/{codespace_name}/exports/{export_id}"],
-    getForAuthenticatedUser: ["GET /user/codespaces/{codespace_name}"],
-    getPublicKeyForAuthenticatedUser: ["GET /user/codespaces/secrets/public-key"],
-    getRepoPublicKey: ["GET /repos/{owner}/{repo}/codespaces/secrets/public-key"],
-    getRepoSecret: ["GET /repos/{owner}/{repo}/codespaces/secrets/{secret_name}"],
-    getSecretForAuthenticatedUser: ["GET /user/codespaces/secrets/{secret_name}"],
-    listDevcontainersInRepositoryForAuthenticatedUser: ["GET /repos/{owner}/{repo}/codespaces/devcontainers"],
-    listForAuthenticatedUser: ["GET /user/codespaces"],
-    listInOrganization: ["GET /orgs/{org}/codespaces", {}, {
-      renamedParameters: {
-        org_id: "org"
-      }
-    }],
-    listInRepositoryForAuthenticatedUser: ["GET /repos/{owner}/{repo}/codespaces"],
-    listRepoSecrets: ["GET /repos/{owner}/{repo}/codespaces/secrets"],
-    listRepositoriesForSecretForAuthenticatedUser: ["GET /user/codespaces/secrets/{secret_name}/repositories"],
-    listSecretsForAuthenticatedUser: ["GET /user/codespaces/secrets"],
-    removeRepositoryForSecretForAuthenticatedUser: ["DELETE /user/codespaces/secrets/{secret_name}/repositories/{repository_id}"],
-    repoMachinesForAuthenticatedUser: ["GET /repos/{owner}/{repo}/codespaces/machines"],
-    setRepositoriesForSecretForAuthenticatedUser: ["PUT /user/codespaces/secrets/{secret_name}/repositories"],
-    startForAuthenticatedUser: ["POST /user/codespaces/{codespace_name}/start"],
-    stopForAuthenticatedUser: ["POST /user/codespaces/{codespace_name}/stop"],
-    stopInOrganization: ["POST /orgs/{org}/members/{username}/codespaces/{codespace_name}/stop"],
-    updateForAuthenticatedUser: ["PATCH /user/codespaces/{codespace_name}"]
-  },
-  dependabot: {
-    addSelectedRepoToOrgSecret: ["PUT /orgs/{org}/dependabot/secrets/{secret_name}/repositories/{repository_id}"],
-    createOrUpdateOrgSecret: ["PUT /orgs/{org}/dependabot/secrets/{secret_name}"],
-    createOrUpdateRepoSecret: ["PUT /repos/{owner}/{repo}/dependabot/secrets/{secret_name}"],
-    deleteOrgSecret: ["DELETE /orgs/{org}/dependabot/secrets/{secret_name}"],
-    deleteRepoSecret: ["DELETE /repos/{owner}/{repo}/dependabot/secrets/{secret_name}"],
-    getOrgPublicKey: ["GET /orgs/{org}/dependabot/secrets/public-key"],
-    getOrgSecret: ["GET /orgs/{org}/dependabot/secrets/{secret_name}"],
-    getRepoPublicKey: ["GET /repos/{owner}/{repo}/dependabot/secrets/public-key"],
-    getRepoSecret: ["GET /repos/{owner}/{repo}/dependabot/secrets/{secret_name}"],
-    listOrgSecrets: ["GET /orgs/{org}/dependabot/secrets"],
-    listRepoSecrets: ["GET /repos/{owner}/{repo}/dependabot/secrets"],
-    listSelectedReposForOrgSecret: ["GET /orgs/{org}/dependabot/secrets/{secret_name}/repositories"],
-    removeSelectedRepoFromOrgSecret: ["DELETE /orgs/{org}/dependabot/secrets/{secret_name}/repositories/{repository_id}"],
-    setSelectedReposForOrgSecret: ["PUT /orgs/{org}/dependabot/secrets/{secret_name}/repositories"]
-  },
-  dependencyGraph: {
-    createRepositorySnapshot: ["POST /repos/{owner}/{repo}/dependency-graph/snapshots"],
-    diffRange: ["GET /repos/{owner}/{repo}/dependency-graph/compare/{basehead}"]
-  },
-  emojis: {
-    get: ["GET /emojis"]
-  },
-  enterpriseAdmin: {
-    addCustomLabelsToSelfHostedRunnerForEnterprise: ["POST /enterprises/{enterprise}/actions/runners/{runner_id}/labels"],
-    disableSelectedOrganizationGithubActionsEnterprise: ["DELETE /enterprises/{enterprise}/actions/permissions/organizations/{org_id}"],
-    enableSelectedOrganizationGithubActionsEnterprise: ["PUT /enterprises/{enterprise}/actions/permissions/organizations/{org_id}"],
-    getAllowedActionsEnterprise: ["GET /enterprises/{enterprise}/actions/permissions/selected-actions"],
-    getGithubActionsPermissionsEnterprise: ["GET /enterprises/{enterprise}/actions/permissions"],
-    getServerStatistics: ["GET /enterprise-installation/{enterprise_or_org}/server-statistics"],
-    listLabelsForSelfHostedRunnerForEnterprise: ["GET /enterprises/{enterprise}/actions/runners/{runner_id}/labels"],
-    listSelectedOrganizationsEnabledGithubActionsEnterprise: ["GET /enterprises/{enterprise}/actions/permissions/organizations"],
-    removeAllCustomLabelsFromSelfHostedRunnerForEnterprise: ["DELETE /enterprises/{enterprise}/actions/runners/{runner_id}/labels"],
-    removeCustomLabelFromSelfHostedRunnerForEnterprise: ["DELETE /enterprises/{enterprise}/actions/runners/{runner_id}/labels/{name}"],
-    setAllowedActionsEnterprise: ["PUT /enterprises/{enterprise}/actions/permissions/selected-actions"],
-    setCustomLabelsForSelfHostedRunnerForEnterprise: ["PUT /enterprises/{enterprise}/actions/runners/{runner_id}/labels"],
-    setGithubActionsPermissionsEnterprise: ["PUT /enterprises/{enterprise}/actions/permissions"],
-    setSelectedOrganizationsEnabledGithubActionsEnterprise: ["PUT /enterprises/{enterprise}/actions/permissions/organizations"]
-  },
-  gists: {
-    checkIsStarred: ["GET /gists/{gist_id}/star"],
-    create: ["POST /gists"],
-    createComment: ["POST /gists/{gist_id}/comments"],
-    delete: ["DELETE /gists/{gist_id}"],
-    deleteComment: ["DELETE /gists/{gist_id}/comments/{comment_id}"],
-    fork: ["POST /gists/{gist_id}/forks"],
-    get: ["GET /gists/{gist_id}"],
-    getComment: ["GET /gists/{gist_id}/comments/{comment_id}"],
-    getRevision: ["GET /gists/{gist_id}/{sha}"],
-    list: ["GET /gists"],
-    listComments: ["GET /gists/{gist_id}/comments"],
-    listCommits: ["GET /gists/{gist_id}/commits"],
-    listForUser: ["GET /users/{username}/gists"],
-    listForks: ["GET /gists/{gist_id}/forks"],
-    listPublic: ["GET /gists/public"],
-    listStarred: ["GET /gists/starred"],
-    star: ["PUT /gists/{gist_id}/star"],
-    unstar: ["DELETE /gists/{gist_id}/star"],
-    update: ["PATCH /gists/{gist_id}"],
-    updateComment: ["PATCH /gists/{gist_id}/comments/{comment_id}"]
-  },
-  git: {
-    createBlob: ["POST /repos/{owner}/{repo}/git/blobs"],
-    createCommit: ["POST /repos/{owner}/{repo}/git/commits"],
-    createRef: ["POST /repos/{owner}/{repo}/git/refs"],
-    createTag: ["POST /repos/{owner}/{repo}/git/tags"],
-    createTree: ["POST /repos/{owner}/{repo}/git/trees"],
-    deleteRef: ["DELETE /repos/{owner}/{repo}/git/refs/{ref}"],
-    getBlob: ["GET /repos/{owner}/{repo}/git/blobs/{file_sha}"],
-    getCommit: ["GET /repos/{owner}/{repo}/git/commits/{commit_sha}"],
-    getRef: ["GET /repos/{owner}/{repo}/git/ref/{ref}"],
-    getTag: ["GET /repos/{owner}/{repo}/git/tags/{tag_sha}"],
-    getTree: ["GET /repos/{owner}/{repo}/git/trees/{tree_sha}"],
-    listMatchingRefs: ["GET /repos/{owner}/{repo}/git/matching-refs/{ref}"],
-    updateRef: ["PATCH /repos/{owner}/{repo}/git/refs/{ref}"]
-  },
-  gitignore: {
-    getAllTemplates: ["GET /gitignore/templates"],
-    getTemplate: ["GET /gitignore/templates/{name}"]
-  },
-  interactions: {
-    getRestrictionsForAuthenticatedUser: ["GET /user/interaction-limits"],
-    getRestrictionsForOrg: ["GET /orgs/{org}/interaction-limits"],
-    getRestrictionsForRepo: ["GET /repos/{owner}/{repo}/interaction-limits"],
-    getRestrictionsForYourPublicRepos: ["GET /user/interaction-limits", {}, {
-      renamed: ["interactions", "getRestrictionsForAuthenticatedUser"]
-    }],
-    removeRestrictionsForAuthenticatedUser: ["DELETE /user/interaction-limits"],
-    removeRestrictionsForOrg: ["DELETE /orgs/{org}/interaction-limits"],
-    removeRestrictionsForRepo: ["DELETE /repos/{owner}/{repo}/interaction-limits"],
-    removeRestrictionsForYourPublicRepos: ["DELETE /user/interaction-limits", {}, {
-      renamed: ["interactions", "removeRestrictionsForAuthenticatedUser"]
-    }],
-    setRestrictionsForAuthenticatedUser: ["PUT /user/interaction-limits"],
-    setRestrictionsForOrg: ["PUT /orgs/{org}/interaction-limits"],
-    setRestrictionsForRepo: ["PUT /repos/{owner}/{repo}/interaction-limits"],
-    setRestrictionsForYourPublicRepos: ["PUT /user/interaction-limits", {}, {
-      renamed: ["interactions", "setRestrictionsForAuthenticatedUser"]
-    }]
-  },
-  issues: {
-    addAssignees: ["POST /repos/{owner}/{repo}/issues/{issue_number}/assignees"],
-    addLabels: ["POST /repos/{owner}/{repo}/issues/{issue_number}/labels"],
-    checkUserCanBeAssigned: ["GET /repos/{owner}/{repo}/assignees/{assignee}"],
-    create: ["POST /repos/{owner}/{repo}/issues"],
-    createComment: ["POST /repos/{owner}/{repo}/issues/{issue_number}/comments"],
-    createLabel: ["POST /repos/{owner}/{repo}/labels"],
-    createMilestone: ["POST /repos/{owner}/{repo}/milestones"],
-    deleteComment: ["DELETE /repos/{owner}/{repo}/issues/comments/{comment_id}"],
-    deleteLabel: ["DELETE /repos/{owner}/{repo}/labels/{name}"],
-    deleteMilestone: ["DELETE /repos/{owner}/{repo}/milestones/{milestone_number}"],
-    get: ["GET /repos/{owner}/{repo}/issues/{issue_number}"],
-    getComment: ["GET /repos/{owner}/{repo}/issues/comments/{comment_id}"],
-    getEvent: ["GET /repos/{owner}/{repo}/issues/events/{event_id}"],
-    getLabel: ["GET /repos/{owner}/{repo}/labels/{name}"],
-    getMilestone: ["GET /repos/{owner}/{repo}/milestones/{milestone_number}"],
-    list: ["GET /issues"],
-    listAssignees: ["GET /repos/{owner}/{repo}/assignees"],
-    listComments: ["GET /repos/{owner}/{repo}/issues/{issue_number}/comments"],
-    listCommentsForRepo: ["GET /repos/{owner}/{repo}/issues/comments"],
-    listEvents: ["GET /repos/{owner}/{repo}/issues/{issue_number}/events"],
-    listEventsForRepo: ["GET /repos/{owner}/{repo}/issues/events"],
-    listEventsForTimeline: ["GET /repos/{owner}/{repo}/issues/{issue_number}/timeline"],
-    listForAuthenticatedUser: ["GET /user/issues"],
-    listForOrg: ["GET /orgs/{org}/issues"],
-    listForRepo: ["GET /repos/{owner}/{repo}/issues"],
-    listLabelsForMilestone: ["GET /repos/{owner}/{repo}/milestones/{milestone_number}/labels"],
-    listLabelsForRepo: ["GET /repos/{owner}/{repo}/labels"],
-    listLabelsOnIssue: ["GET /repos/{owner}/{repo}/issues/{issue_number}/labels"],
-    listMilestones: ["GET /repos/{owner}/{repo}/milestones"],
-    lock: ["PUT /repos/{owner}/{repo}/issues/{issue_number}/lock"],
-    removeAllLabels: ["DELETE /repos/{owner}/{repo}/issues/{issue_number}/labels"],
-    removeAssignees: ["DELETE /repos/{owner}/{repo}/issues/{issue_number}/assignees"],
-    removeLabel: ["DELETE /repos/{owner}/{repo}/issues/{issue_number}/labels/{name}"],
-    setLabels: ["PUT /repos/{owner}/{repo}/issues/{issue_number}/labels"],
-    unlock: ["DELETE /repos/{owner}/{repo}/issues/{issue_number}/lock"],
-    update: ["PATCH /repos/{owner}/{repo}/issues/{issue_number}"],
-    updateComment: ["PATCH /repos/{owner}/{repo}/issues/comments/{comment_id}"],
-    updateLabel: ["PATCH /repos/{owner}/{repo}/labels/{name}"],
-    updateMilestone: ["PATCH /repos/{owner}/{repo}/milestones/{milestone_number}"]
-  },
-  licenses: {
-    get: ["GET /licenses/{license}"],
-    getAllCommonlyUsed: ["GET /licenses"],
-    getForRepo: ["GET /repos/{owner}/{repo}/license"]
-  },
-  markdown: {
-    render: ["POST /markdown"],
-    renderRaw: ["POST /markdown/raw", {
-      headers: {
-        "content-type": "text/plain; charset=utf-8"
-      }
-    }]
-  },
-  meta: {
-    get: ["GET /meta"],
-    getOctocat: ["GET /octocat"],
-    getZen: ["GET /zen"],
-    root: ["GET /"]
-  },
-  migrations: {
-    cancelImport: ["DELETE /repos/{owner}/{repo}/import"],
-    deleteArchiveForAuthenticatedUser: ["DELETE /user/migrations/{migration_id}/archive"],
-    deleteArchiveForOrg: ["DELETE /orgs/{org}/migrations/{migration_id}/archive"],
-    downloadArchiveForOrg: ["GET /orgs/{org}/migrations/{migration_id}/archive"],
-    getArchiveForAuthenticatedUser: ["GET /user/migrations/{migration_id}/archive"],
-    getCommitAuthors: ["GET /repos/{owner}/{repo}/import/authors"],
-    getImportStatus: ["GET /repos/{owner}/{repo}/import"],
-    getLargeFiles: ["GET /repos/{owner}/{repo}/import/large_files"],
-    getStatusForAuthenticatedUser: ["GET /user/migrations/{migration_id}"],
-    getStatusForOrg: ["GET /orgs/{org}/migrations/{migration_id}"],
-    listForAuthenticatedUser: ["GET /user/migrations"],
-    listForOrg: ["GET /orgs/{org}/migrations"],
-    listReposForAuthenticatedUser: ["GET /user/migrations/{migration_id}/repositories"],
-    listReposForOrg: ["GET /orgs/{org}/migrations/{migration_id}/repositories"],
-    listReposForUser: ["GET /user/migrations/{migration_id}/repositories", {}, {
-      renamed: ["migrations", "listReposForAuthenticatedUser"]
-    }],
-    mapCommitAuthor: ["PATCH /repos/{owner}/{repo}/import/authors/{author_id}"],
-    setLfsPreference: ["PATCH /repos/{owner}/{repo}/import/lfs"],
-    startForAuthenticatedUser: ["POST /user/migrations"],
-    startForOrg: ["POST /orgs/{org}/migrations"],
-    startImport: ["PUT /repos/{owner}/{repo}/import"],
-    unlockRepoForAuthenticatedUser: ["DELETE /user/migrations/{migration_id}/repos/{repo_name}/lock"],
-    unlockRepoForOrg: ["DELETE /orgs/{org}/migrations/{migration_id}/repos/{repo_name}/lock"],
-    updateImport: ["PATCH /repos/{owner}/{repo}/import"]
-  },
-  orgs: {
-    blockUser: ["PUT /orgs/{org}/blocks/{username}"],
-    cancelInvitation: ["DELETE /orgs/{org}/invitations/{invitation_id}"],
-    checkBlockedUser: ["GET /orgs/{org}/blocks/{username}"],
-    checkMembershipForUser: ["GET /orgs/{org}/members/{username}"],
-    checkPublicMembershipForUser: ["GET /orgs/{org}/public_members/{username}"],
-    convertMemberToOutsideCollaborator: ["PUT /orgs/{org}/outside_collaborators/{username}"],
-    createInvitation: ["POST /orgs/{org}/invitations"],
-    createWebhook: ["POST /orgs/{org}/hooks"],
-    deleteWebhook: ["DELETE /orgs/{org}/hooks/{hook_id}"],
-    get: ["GET /orgs/{org}"],
-    getMembershipForAuthenticatedUser: ["GET /user/memberships/orgs/{org}"],
-    getMembershipForUser: ["GET /orgs/{org}/memberships/{username}"],
-    getWebhook: ["GET /orgs/{org}/hooks/{hook_id}"],
-    getWebhookConfigForOrg: ["GET /orgs/{org}/hooks/{hook_id}/config"],
-    getWebhookDelivery: ["GET /orgs/{org}/hooks/{hook_id}/deliveries/{delivery_id}"],
-    list: ["GET /organizations"],
-    listAppInstallations: ["GET /orgs/{org}/installations"],
-    listBlockedUsers: ["GET /orgs/{org}/blocks"],
-    listCustomRoles: ["GET /organizations/{organization_id}/custom_roles"],
-    listFailedInvitations: ["GET /orgs/{org}/failed_invitations"],
-    listForAuthenticatedUser: ["GET /user/orgs"],
-    listForUser: ["GET /users/{username}/orgs"],
-    listInvitationTeams: ["GET /orgs/{org}/invitations/{invitation_id}/teams"],
-    listMembers: ["GET /orgs/{org}/members"],
-    listMembershipsForAuthenticatedUser: ["GET /user/memberships/orgs"],
-    listOutsideCollaborators: ["GET /orgs/{org}/outside_collaborators"],
-    listPendingInvitations: ["GET /orgs/{org}/invitations"],
-    listPublicMembers: ["GET /orgs/{org}/public_members"],
-    listWebhookDeliveries: ["GET /orgs/{org}/hooks/{hook_id}/deliveries"],
-    listWebhooks: ["GET /orgs/{org}/hooks"],
-    pingWebhook: ["POST /orgs/{org}/hooks/{hook_id}/pings"],
-    redeliverWebhookDelivery: ["POST /orgs/{org}/hooks/{hook_id}/deliveries/{delivery_id}/attempts"],
-    removeMember: ["DELETE /orgs/{org}/members/{username}"],
-    removeMembershipForUser: ["DELETE /orgs/{org}/memberships/{username}"],
-    removeOutsideCollaborator: ["DELETE /orgs/{org}/outside_collaborators/{username}"],
-    removePublicMembershipForAuthenticatedUser: ["DELETE /orgs/{org}/public_members/{username}"],
-    setMembershipForUser: ["PUT /orgs/{org}/memberships/{username}"],
-    setPublicMembershipForAuthenticatedUser: ["PUT /orgs/{org}/public_members/{username}"],
-    unblockUser: ["DELETE /orgs/{org}/blocks/{username}"],
-    update: ["PATCH /orgs/{org}"],
-    updateMembershipForAuthenticatedUser: ["PATCH /user/memberships/orgs/{org}"],
-    updateWebhook: ["PATCH /orgs/{org}/hooks/{hook_id}"],
-    updateWebhookConfigForOrg: ["PATCH /orgs/{org}/hooks/{hook_id}/config"]
-  },
-  packages: {
-    deletePackageForAuthenticatedUser: ["DELETE /user/packages/{package_type}/{package_name}"],
-    deletePackageForOrg: ["DELETE /orgs/{org}/packages/{package_type}/{package_name}"],
-    deletePackageForUser: ["DELETE /users/{username}/packages/{package_type}/{package_name}"],
-    deletePackageVersionForAuthenticatedUser: ["DELETE /user/packages/{package_type}/{package_name}/versions/{package_version_id}"],
-    deletePackageVersionForOrg: ["DELETE /orgs/{org}/packages/{package_type}/{package_name}/versions/{package_version_id}"],
-    deletePackageVersionForUser: ["DELETE /users/{username}/packages/{package_type}/{package_name}/versions/{package_version_id}"],
-    getAllPackageVersionsForAPackageOwnedByAnOrg: ["GET /orgs/{org}/packages/{package_type}/{package_name}/versions", {}, {
-      renamed: ["packages", "getAllPackageVersionsForPackageOwnedByOrg"]
-    }],
-    getAllPackageVersionsForAPackageOwnedByTheAuthenticatedUser: ["GET /user/packages/{package_type}/{package_name}/versions", {}, {
-      renamed: ["packages", "getAllPackageVersionsForPackageOwnedByAuthenticatedUser"]
-    }],
-    getAllPackageVersionsForPackageOwnedByAuthenticatedUser: ["GET /user/packages/{package_type}/{package_name}/versions"],
-    getAllPackageVersionsForPackageOwnedByOrg: ["GET /orgs/{org}/packages/{package_type}/{package_name}/versions"],
-    getAllPackageVersionsForPackageOwnedByUser: ["GET /users/{username}/packages/{package_type}/{package_name}/versions"],
-    getPackageForAuthenticatedUser: ["GET /user/packages/{package_type}/{package_name}"],
-    getPackageForOrganization: ["GET /orgs/{org}/packages/{package_type}/{package_name}"],
-    getPackageForUser: ["GET /users/{username}/packages/{package_type}/{package_name}"],
-    getPackageVersionForAuthenticatedUser: ["GET /user/packages/{package_type}/{package_name}/versions/{package_version_id}"],
-    getPackageVersionForOrganization: ["GET /orgs/{org}/packages/{package_type}/{package_name}/versions/{package_version_id}"],
-    getPackageVersionForUser: ["GET /users/{username}/packages/{package_type}/{package_name}/versions/{package_version_id}"],
-    listPackagesForAuthenticatedUser: ["GET /user/packages"],
-    listPackagesForOrganization: ["GET /orgs/{org}/packages"],
-    listPackagesForUser: ["GET /users/{username}/packages"],
-    restorePackageForAuthenticatedUser: ["POST /user/packages/{package_type}/{package_name}/restore{?token}"],
-    restorePackageForOrg: ["POST /orgs/{org}/packages/{package_type}/{package_name}/restore{?token}"],
-    restorePackageForUser: ["POST /users/{username}/packages/{package_type}/{package_name}/restore{?token}"],
-    restorePackageVersionForAuthenticatedUser: ["POST /user/packages/{package_type}/{package_name}/versions/{package_version_id}/restore"],
-    restorePackageVersionForOrg: ["POST /orgs/{org}/packages/{package_type}/{package_name}/versions/{package_version_id}/restore"],
-    restorePackageVersionForUser: ["POST /users/{username}/packages/{package_type}/{package_name}/versions/{package_version_id}/restore"]
-  },
-  projects: {
-    addCollaborator: ["PUT /projects/{project_id}/collaborators/{username}"],
-    createCard: ["POST /projects/columns/{column_id}/cards"],
-    createColumn: ["POST /projects/{project_id}/columns"],
-    createForAuthenticatedUser: ["POST /user/projects"],
-    createForOrg: ["POST /orgs/{org}/projects"],
-    createForRepo: ["POST /repos/{owner}/{repo}/projects"],
-    delete: ["DELETE /projects/{project_id}"],
-    deleteCard: ["DELETE /projects/columns/cards/{card_id}"],
-    deleteColumn: ["DELETE /projects/columns/{column_id}"],
-    get: ["GET /projects/{project_id}"],
-    getCard: ["GET /projects/columns/cards/{card_id}"],
-    getColumn: ["GET /projects/columns/{column_id}"],
-    getPermissionForUser: ["GET /projects/{project_id}/collaborators/{username}/permission"],
-    listCards: ["GET /projects/columns/{column_id}/cards"],
-    listCollaborators: ["GET /projects/{project_id}/collaborators"],
-    listColumns: ["GET /projects/{project_id}/columns"],
-    listForOrg: ["GET /orgs/{org}/projects"],
-    listForRepo: ["GET /repos/{owner}/{repo}/projects"],
-    listForUser: ["GET /users/{username}/projects"],
-    moveCard: ["POST /projects/columns/cards/{card_id}/moves"],
-    moveColumn: ["POST /projects/columns/{column_id}/moves"],
-    removeCollaborator: ["DELETE /projects/{project_id}/collaborators/{username}"],
-    update: ["PATCH /projects/{project_id}"],
-    updateCard: ["PATCH /projects/columns/cards/{card_id}"],
-    updateColumn: ["PATCH /projects/columns/{column_id}"]
-  },
-  pulls: {
-    checkIfMerged: ["GET /repos/{owner}/{repo}/pulls/{pull_number}/merge"],
-    create: ["POST /repos/{owner}/{repo}/pulls"],
-    createReplyForReviewComment: ["POST /repos/{owner}/{repo}/pulls/{pull_number}/comments/{comment_id}/replies"],
-    createReview: ["POST /repos/{owner}/{repo}/pulls/{pull_number}/reviews"],
-    createReviewComment: ["POST /repos/{owner}/{repo}/pulls/{pull_number}/comments"],
-    deletePendingReview: ["DELETE /repos/{owner}/{repo}/pulls/{pull_number}/reviews/{review_id}"],
-    deleteReviewComment: ["DELETE /repos/{owner}/{repo}/pulls/comments/{comment_id}"],
-    dismissReview: ["PUT /repos/{owner}/{repo}/pulls/{pull_number}/reviews/{review_id}/dismissals"],
-    get: ["GET /repos/{owner}/{repo}/pulls/{pull_number}"],
-    getReview: ["GET /repos/{owner}/{repo}/pulls/{pull_number}/reviews/{review_id}"],
-    getReviewComment: ["GET /repos/{owner}/{repo}/pulls/comments/{comment_id}"],
-    list: ["GET /repos/{owner}/{repo}/pulls"],
-    listCommentsForReview: ["GET /repos/{owner}/{repo}/pulls/{pull_number}/reviews/{review_id}/comments"],
-    listCommits: ["GET /repos/{owner}/{repo}/pulls/{pull_number}/commits"],
-    listFiles: ["GET /repos/{owner}/{repo}/pulls/{pull_number}/files"],
-    listRequestedReviewers: ["GET /repos/{owner}/{repo}/pulls/{pull_number}/requested_reviewers"],
-    listReviewComments: ["GET /repos/{owner}/{repo}/pulls/{pull_number}/comments"],
-    listReviewCommentsForRepo: ["GET /repos/{owner}/{repo}/pulls/comments"],
-    listReviews: ["GET /repos/{owner}/{repo}/pulls/{pull_number}/reviews"],
-    merge: ["PUT /repos/{owner}/{repo}/pulls/{pull_number}/merge"],
-    removeRequestedReviewers: ["DELETE /repos/{owner}/{repo}/pulls/{pull_number}/requested_reviewers"],
-    requestReviewers: ["POST /repos/{owner}/{repo}/pulls/{pull_number}/requested_reviewers"],
-    submitReview: ["POST /repos/{owner}/{repo}/pulls/{pull_number}/reviews/{review_id}/events"],
-    update: ["PATCH /repos/{owner}/{repo}/pulls/{pull_number}"],
-    updateBranch: ["PUT /repos/{owner}/{repo}/pulls/{pull_number}/update-branch"],
-    updateReview: ["PUT /repos/{owner}/{repo}/pulls/{pull_number}/reviews/{review_id}"],
-    updateReviewComment: ["PATCH /repos/{owner}/{repo}/pulls/comments/{comment_id}"]
-  },
-  rateLimit: {
-    get: ["GET /rate_limit"]
-  },
-  reactions: {
-    createForCommitComment: ["POST /repos/{owner}/{repo}/comments/{comment_id}/reactions"],
-    createForIssue: ["POST /repos/{owner}/{repo}/issues/{issue_number}/reactions"],
-    createForIssueComment: ["POST /repos/{owner}/{repo}/issues/comments/{comment_id}/reactions"],
-    createForPullRequestReviewComment: ["POST /repos/{owner}/{repo}/pulls/comments/{comment_id}/reactions"],
-    createForRelease: ["POST /repos/{owner}/{repo}/releases/{release_id}/reactions"],
-    createForTeamDiscussionCommentInOrg: ["POST /orgs/{org}/teams/{team_slug}/discussions/{discussion_number}/comments/{comment_number}/reactions"],
-    createForTeamDiscussionInOrg: ["POST /orgs/{org}/teams/{team_slug}/discussions/{discussion_number}/reactions"],
-    deleteForCommitComment: ["DELETE /repos/{owner}/{repo}/comments/{comment_id}/reactions/{reaction_id}"],
-    deleteForIssue: ["DELETE /repos/{owner}/{repo}/issues/{issue_number}/reactions/{reaction_id}"],
-    deleteForIssueComment: ["DELETE /repos/{owner}/{repo}/issues/comments/{comment_id}/reactions/{reaction_id}"],
-    deleteForPullRequestComment: ["DELETE /repos/{owner}/{repo}/pulls/comments/{comment_id}/reactions/{reaction_id}"],
-    deleteForRelease: ["DELETE /repos/{owner}/{repo}/releases/{release_id}/reactions/{reaction_id}"],
-    deleteForTeamDiscussion: ["DELETE /orgs/{org}/teams/{team_slug}/discussions/{discussion_number}/reactions/{reaction_id}"],
-    deleteForTeamDiscussionComment: ["DELETE /orgs/{org}/teams/{team_slug}/discussions/{discussion_number}/comments/{comment_number}/reactions/{reaction_id}"],
-    listForCommitComment: ["GET /repos/{owner}/{repo}/comments/{comment_id}/reactions"],
-    listForIssue: ["GET /repos/{owner}/{repo}/issues/{issue_number}/reactions"],
-    listForIssueComment: ["GET /repos/{owner}/{repo}/issues/comments/{comment_id}/reactions"],
-    listForPullRequestReviewComment: ["GET /repos/{owner}/{repo}/pulls/comments/{comment_id}/reactions"],
-    listForRelease: ["GET /repos/{owner}/{repo}/releases/{release_id}/reactions"],
-    listForTeamDiscussionCommentInOrg: ["GET /orgs/{org}/teams/{team_slug}/discussions/{discussion_number}/comments/{comment_number}/reactions"],
-    listForTeamDiscussionInOrg: ["GET /orgs/{org}/teams/{team_slug}/discussions/{discussion_number}/reactions"]
-  },
-  repos: {
-    acceptInvitation: ["PATCH /user/repository_invitations/{invitation_id}", {}, {
-      renamed: ["repos", "acceptInvitationForAuthenticatedUser"]
-    }],
-    acceptInvitationForAuthenticatedUser: ["PATCH /user/repository_invitations/{invitation_id}"],
-    addAppAccessRestrictions: ["POST /repos/{owner}/{repo}/branches/{branch}/protection/restrictions/apps", {}, {
-      mapToData: "apps"
-    }],
-    addCollaborator: ["PUT /repos/{owner}/{repo}/collaborators/{username}"],
-    addStatusCheckContexts: ["POST /repos/{owner}/{repo}/branches/{branch}/protection/required_status_checks/contexts", {}, {
-      mapToData: "contexts"
-    }],
-    addTeamAccessRestrictions: ["POST /repos/{owner}/{repo}/branches/{branch}/protection/restrictions/teams", {}, {
-      mapToData: "teams"
-    }],
-    addUserAccessRestrictions: ["POST /repos/{owner}/{repo}/branches/{branch}/protection/restrictions/users", {}, {
-      mapToData: "users"
-    }],
-    checkCollaborator: ["GET /repos/{owner}/{repo}/collaborators/{username}"],
-    checkVulnerabilityAlerts: ["GET /repos/{owner}/{repo}/vulnerability-alerts"],
-    codeownersErrors: ["GET /repos/{owner}/{repo}/codeowners/errors"],
-    compareCommits: ["GET /repos/{owner}/{repo}/compare/{base}...{head}"],
-    compareCommitsWithBasehead: ["GET /repos/{owner}/{repo}/compare/{basehead}"],
-    createAutolink: ["POST /repos/{owner}/{repo}/autolinks"],
-    createCommitComment: ["POST /repos/{owner}/{repo}/commits/{commit_sha}/comments"],
-    createCommitSignatureProtection: ["POST /repos/{owner}/{repo}/branches/{branch}/protection/required_signatures"],
-    createCommitStatus: ["POST /repos/{owner}/{repo}/statuses/{sha}"],
-    createDeployKey: ["POST /repos/{owner}/{repo}/keys"],
-    createDeployment: ["POST /repos/{owner}/{repo}/deployments"],
-    createDeploymentStatus: ["POST /repos/{owner}/{repo}/deployments/{deployment_id}/statuses"],
-    createDispatchEvent: ["POST /repos/{owner}/{repo}/dispatches"],
-    createForAuthenticatedUser: ["POST /user/repos"],
-    createFork: ["POST /repos/{owner}/{repo}/forks"],
-    createInOrg: ["POST /orgs/{org}/repos"],
-    createOrUpdateEnvironment: ["PUT /repos/{owner}/{repo}/environments/{environment_name}"],
-    createOrUpdateFileContents: ["PUT /repos/{owner}/{repo}/contents/{path}"],
-    createPagesSite: ["POST /repos/{owner}/{repo}/pages"],
-    createRelease: ["POST /repos/{owner}/{repo}/releases"],
-    createTagProtection: ["POST /repos/{owner}/{repo}/tags/protection"],
-    createUsingTemplate: ["POST /repos/{template_owner}/{template_repo}/generate"],
-    createWebhook: ["POST /repos/{owner}/{repo}/hooks"],
-    declineInvitation: ["DELETE /user/repository_invitations/{invitation_id}", {}, {
-      renamed: ["repos", "declineInvitationForAuthenticatedUser"]
-    }],
-    declineInvitationForAuthenticatedUser: ["DELETE /user/repository_invitations/{invitation_id}"],
-    delete: ["DELETE /repos/{owner}/{repo}"],
-    deleteAccessRestrictions: ["DELETE /repos/{owner}/{repo}/branches/{branch}/protection/restrictions"],
-    deleteAdminBranchProtection: ["DELETE /repos/{owner}/{repo}/branches/{branch}/protection/enforce_admins"],
-    deleteAnEnvironment: ["DELETE /repos/{owner}/{repo}/environments/{environment_name}"],
-    deleteAutolink: ["DELETE /repos/{owner}/{repo}/autolinks/{autolink_id}"],
-    deleteBranchProtection: ["DELETE /repos/{owner}/{repo}/branches/{branch}/protection"],
-    deleteCommitComment: ["DELETE /repos/{owner}/{repo}/comments/{comment_id}"],
-    deleteCommitSignatureProtection: ["DELETE /repos/{owner}/{repo}/branches/{branch}/protection/required_signatures"],
-    deleteDeployKey: ["DELETE /repos/{owner}/{repo}/keys/{key_id}"],
-    deleteDeployment: ["DELETE /repos/{owner}/{repo}/deployments/{deployment_id}"],
-    deleteFile: ["DELETE /repos/{owner}/{repo}/contents/{path}"],
-    deleteInvitation: ["DELETE /repos/{owner}/{repo}/invitations/{invitation_id}"],
-    deletePagesSite: ["DELETE /repos/{owner}/{repo}/pages"],
-    deletePullRequestReviewProtection: ["DELETE /repos/{owner}/{repo}/branches/{branch}/protection/required_pull_request_reviews"],
-    deleteRelease: ["DELETE /repos/{owner}/{repo}/releases/{release_id}"],
-    deleteReleaseAsset: ["DELETE /repos/{owner}/{repo}/releases/assets/{asset_id}"],
-    deleteTagProtection: ["DELETE /repos/{owner}/{repo}/tags/protection/{tag_protection_id}"],
-    deleteWebhook: ["DELETE /repos/{owner}/{repo}/hooks/{hook_id}"],
-    disableAutomatedSecurityFixes: ["DELETE /repos/{owner}/{repo}/automated-security-fixes"],
-    disableLfsForRepo: ["DELETE /repos/{owner}/{repo}/lfs"],
-    disableVulnerabilityAlerts: ["DELETE /repos/{owner}/{repo}/vulnerability-alerts"],
-    downloadArchive: ["GET /repos/{owner}/{repo}/zipball/{ref}", {}, {
-      renamed: ["repos", "downloadZipballArchive"]
-    }],
-    downloadTarballArchive: ["GET /repos/{owner}/{repo}/tarball/{ref}"],
-    downloadZipballArchive: ["GET /repos/{owner}/{repo}/zipball/{ref}"],
-    enableAutomatedSecurityFixes: ["PUT /repos/{owner}/{repo}/automated-security-fixes"],
-    enableLfsForRepo: ["PUT /repos/{owner}/{repo}/lfs"],
-    enableVulnerabilityAlerts: ["PUT /repos/{owner}/{repo}/vulnerability-alerts"],
-    generateReleaseNotes: ["POST /repos/{owner}/{repo}/releases/generate-notes"],
-    get: ["GET /repos/{owner}/{repo}"],
-    getAccessRestrictions: ["GET /repos/{owner}/{repo}/branches/{branch}/protection/restrictions"],
-    getAdminBranchProtection: ["GET /repos/{owner}/{repo}/branches/{branch}/protection/enforce_admins"],
-    getAllEnvironments: ["GET /repos/{owner}/{repo}/environments"],
-    getAllStatusCheckContexts: ["GET /repos/{owner}/{repo}/branches/{branch}/protection/required_status_checks/contexts"],
-    getAllTopics: ["GET /repos/{owner}/{repo}/topics"],
-    getAppsWithAccessToProtectedBranch: ["GET /repos/{owner}/{repo}/branches/{branch}/protection/restrictions/apps"],
-    getAutolink: ["GET /repos/{owner}/{repo}/autolinks/{autolink_id}"],
-    getBranch: ["GET /repos/{owner}/{repo}/branches/{branch}"],
-    getBranchProtection: ["GET /repos/{owner}/{repo}/branches/{branch}/protection"],
-    getClones: ["GET /repos/{owner}/{repo}/traffic/clones"],
-    getCodeFrequencyStats: ["GET /repos/{owner}/{repo}/stats/code_frequency"],
-    getCollaboratorPermissionLevel: ["GET /repos/{owner}/{repo}/collaborators/{username}/permission"],
-    getCombinedStatusForRef: ["GET /repos/{owner}/{repo}/commits/{ref}/status"],
-    getCommit: ["GET /repos/{owner}/{repo}/commits/{ref}"],
-    getCommitActivityStats: ["GET /repos/{owner}/{repo}/stats/commit_activity"],
-    getCommitComment: ["GET /repos/{owner}/{repo}/comments/{comment_id}"],
-    getCommitSignatureProtection: ["GET /repos/{owner}/{repo}/branches/{branch}/protection/required_signatures"],
-    getCommunityProfileMetrics: ["GET /repos/{owner}/{repo}/community/profile"],
-    getContent: ["GET /repos/{owner}/{repo}/contents/{path}"],
-    getContributorsStats: ["GET /repos/{owner}/{repo}/stats/contributors"],
-    getDeployKey: ["GET /repos/{owner}/{repo}/keys/{key_id}"],
-    getDeployment: ["GET /repos/{owner}/{repo}/deployments/{deployment_id}"],
-    getDeploymentStatus: ["GET /repos/{owner}/{repo}/deployments/{deployment_id}/statuses/{status_id}"],
-    getEnvironment: ["GET /repos/{owner}/{repo}/environments/{environment_name}"],
-    getLatestPagesBuild: ["GET /repos/{owner}/{repo}/pages/builds/latest"],
-    getLatestRelease: ["GET /repos/{owner}/{repo}/releases/latest"],
-    getPages: ["GET /repos/{owner}/{repo}/pages"],
-    getPagesBuild: ["GET /repos/{owner}/{repo}/pages/builds/{build_id}"],
-    getPagesHealthCheck: ["GET /repos/{owner}/{repo}/pages/health"],
-    getParticipationStats: ["GET /repos/{owner}/{repo}/stats/participation"],
-    getPullRequestReviewProtection: ["GET /repos/{owner}/{repo}/branches/{branch}/protection/required_pull_request_reviews"],
-    getPunchCardStats: ["GET /repos/{owner}/{repo}/stats/punch_card"],
-    getReadme: ["GET /repos/{owner}/{repo}/readme"],
-    getReadmeInDirectory: ["GET /repos/{owner}/{repo}/readme/{dir}"],
-    getRelease: ["GET /repos/{owner}/{repo}/releases/{release_id}"],
-    getReleaseAsset: ["GET /repos/{owner}/{repo}/releases/assets/{asset_id}"],
-    getReleaseByTag: ["GET /repos/{owner}/{repo}/releases/tags/{tag}"],
-    getStatusChecksProtection: ["GET /repos/{owner}/{repo}/branches/{branch}/protection/required_status_checks"],
-    getTeamsWithAccessToProtectedBranch: ["GET /repos/{owner}/{repo}/branches/{branch}/protection/restrictions/teams"],
-    getTopPaths: ["GET /repos/{owner}/{repo}/traffic/popular/paths"],
-    getTopReferrers: ["GET /repos/{owner}/{repo}/traffic/popular/referrers"],
-    getUsersWithAccessToProtectedBranch: ["GET /repos/{owner}/{repo}/branches/{branch}/protection/restrictions/users"],
-    getViews: ["GET /repos/{owner}/{repo}/traffic/views"],
-    getWebhook: ["GET /repos/{owner}/{repo}/hooks/{hook_id}"],
-    getWebhookConfigForRepo: ["GET /repos/{owner}/{repo}/hooks/{hook_id}/config"],
-    getWebhookDelivery: ["GET /repos/{owner}/{repo}/hooks/{hook_id}/deliveries/{delivery_id}"],
-    listAutolinks: ["GET /repos/{owner}/{repo}/autolinks"],
-    listBranches: ["GET /repos/{owner}/{repo}/branches"],
-    listBranchesForHeadCommit: ["GET /repos/{owner}/{repo}/commits/{commit_sha}/branches-where-head"],
-    listCollaborators: ["GET /repos/{owner}/{repo}/collaborators"],
-    listCommentsForCommit: ["GET /repos/{owner}/{repo}/commits/{commit_sha}/comments"],
-    listCommitCommentsForRepo: ["GET /repos/{owner}/{repo}/comments"],
-    listCommitStatusesForRef: ["GET /repos/{owner}/{repo}/commits/{ref}/statuses"],
-    listCommits: ["GET /repos/{owner}/{repo}/commits"],
-    listContributors: ["GET /repos/{owner}/{repo}/contributors"],
-    listDeployKeys: ["GET /repos/{owner}/{repo}/keys"],
-    listDeploymentStatuses: ["GET /repos/{owner}/{repo}/deployments/{deployment_id}/statuses"],
-    listDeployments: ["GET /repos/{owner}/{repo}/deployments"],
-    listForAuthenticatedUser: ["GET /user/repos"],
-    listForOrg: ["GET /orgs/{org}/repos"],
-    listForUser: ["GET /users/{username}/repos"],
-    listForks: ["GET /repos/{owner}/{repo}/forks"],
-    listInvitations: ["GET /repos/{owner}/{repo}/invitations"],
-    listInvitationsForAuthenticatedUser: ["GET /user/repository_invitations"],
-    listLanguages: ["GET /repos/{owner}/{repo}/languages"],
-    listPagesBuilds: ["GET /repos/{owner}/{repo}/pages/builds"],
-    listPublic: ["GET /repositories"],
-    listPullRequestsAssociatedWithCommit: ["GET /repos/{owner}/{repo}/commits/{commit_sha}/pulls"],
-    listReleaseAssets: ["GET /repos/{owner}/{repo}/releases/{release_id}/assets"],
-    listReleases: ["GET /repos/{owner}/{repo}/releases"],
-    listTagProtection: ["GET /repos/{owner}/{repo}/tags/protection"],
-    listTags: ["GET /repos/{owner}/{repo}/tags"],
-    listTeams: ["GET /repos/{owner}/{repo}/teams"],
-    listWebhookDeliveries: ["GET /repos/{owner}/{repo}/hooks/{hook_id}/deliveries"],
-    listWebhooks: ["GET /repos/{owner}/{repo}/hooks"],
-    merge: ["POST /repos/{owner}/{repo}/merges"],
-    mergeUpstream: ["POST /repos/{owner}/{repo}/merge-upstream"],
-    pingWebhook: ["POST /repos/{owner}/{repo}/hooks/{hook_id}/pings"],
-    redeliverWebhookDelivery: ["POST /repos/{owner}/{repo}/hooks/{hook_id}/deliveries/{delivery_id}/attempts"],
-    removeAppAccessRestrictions: ["DELETE /repos/{owner}/{repo}/branches/{branch}/protection/restrictions/apps", {}, {
-      mapToData: "apps"
-    }],
-    removeCollaborator: ["DELETE /repos/{owner}/{repo}/collaborators/{username}"],
-    removeStatusCheckContexts: ["DELETE /repos/{owner}/{repo}/branches/{branch}/protection/required_status_checks/contexts", {}, {
-      mapToData: "contexts"
-    }],
-    removeStatusCheckProtection: ["DELETE /repos/{owner}/{repo}/branches/{branch}/protection/required_status_checks"],
-    removeTeamAccessRestrictions: ["DELETE /repos/{owner}/{repo}/branches/{branch}/protection/restrictions/teams", {}, {
-      mapToData: "teams"
-    }],
-    removeUserAccessRestrictions: ["DELETE /repos/{owner}/{repo}/branches/{branch}/protection/restrictions/users", {}, {
-      mapToData: "users"
-    }],
-    renameBranch: ["POST /repos/{owner}/{repo}/branches/{branch}/rename"],
-    replaceAllTopics: ["PUT /repos/{owner}/{repo}/topics"],
-    requestPagesBuild: ["POST /repos/{owner}/{repo}/pages/builds"],
-    setAdminBranchProtection: ["POST /repos/{owner}/{repo}/branches/{branch}/protection/enforce_admins"],
-    setAppAccessRestrictions: ["PUT /repos/{owner}/{repo}/branches/{branch}/protection/restrictions/apps", {}, {
-      mapToData: "apps"
-    }],
-    setStatusCheckContexts: ["PUT /repos/{owner}/{repo}/branches/{branch}/protection/required_status_checks/contexts", {}, {
-      mapToData: "contexts"
-    }],
-    setTeamAccessRestrictions: ["PUT /repos/{owner}/{repo}/branches/{branch}/protection/restrictions/teams", {}, {
-      mapToData: "teams"
-    }],
-    setUserAccessRestrictions: ["PUT /repos/{owner}/{repo}/branches/{branch}/protection/restrictions/users", {}, {
-      mapToData: "users"
-    }],
-    testPushWebhook: ["POST /repos/{owner}/{repo}/hooks/{hook_id}/tests"],
-    transfer: ["POST /repos/{owner}/{repo}/transfer"],
-    update: ["PATCH /repos/{owner}/{repo}"],
-    updateBranchProtection: ["PUT /repos/{owner}/{repo}/branches/{branch}/protection"],
-    updateCommitComment: ["PATCH /repos/{owner}/{repo}/comments/{comment_id}"],
-    updateInformationAboutPagesSite: ["PUT /repos/{owner}/{repo}/pages"],
-    updateInvitation: ["PATCH /repos/{owner}/{repo}/invitations/{invitation_id}"],
-    updatePullRequestReviewProtection: ["PATCH /repos/{owner}/{repo}/branches/{branch}/protection/required_pull_request_reviews"],
-    updateRelease: ["PATCH /repos/{owner}/{repo}/releases/{release_id}"],
-    updateReleaseAsset: ["PATCH /repos/{owner}/{repo}/releases/assets/{asset_id}"],
-    updateStatusCheckPotection: ["PATCH /repos/{owner}/{repo}/branches/{branch}/protection/required_status_checks", {}, {
-      renamed: ["repos", "updateStatusCheckProtection"]
-    }],
-    updateStatusCheckProtection: ["PATCH /repos/{owner}/{repo}/branches/{branch}/protection/required_status_checks"],
-    updateWebhook: ["PATCH /repos/{owner}/{repo}/hooks/{hook_id}"],
-    updateWebhookConfigForRepo: ["PATCH /repos/{owner}/{repo}/hooks/{hook_id}/config"],
-    uploadReleaseAsset: ["POST /repos/{owner}/{repo}/releases/{release_id}/assets{?name,label}", {
-      baseUrl: "https://uploads.github.com"
-    }]
-  },
-  search: {
-    code: ["GET /search/code"],
-    commits: ["GET /search/commits"],
-    issuesAndPullRequests: ["GET /search/issues"],
-    labels: ["GET /search/labels"],
-    repos: ["GET /search/repositories"],
-    topics: ["GET /search/topics"],
-    users: ["GET /search/users"]
-  },
-  secretScanning: {
-    getAlert: ["GET /repos/{owner}/{repo}/secret-scanning/alerts/{alert_number}"],
-    listAlertsForEnterprise: ["GET /enterprises/{enterprise}/secret-scanning/alerts"],
-    listAlertsForOrg: ["GET /orgs/{org}/secret-scanning/alerts"],
-    listAlertsForRepo: ["GET /repos/{owner}/{repo}/secret-scanning/alerts"],
-    listLocationsForAlert: ["GET /repos/{owner}/{repo}/secret-scanning/alerts/{alert_number}/locations"],
-    updateAlert: ["PATCH /repos/{owner}/{repo}/secret-scanning/alerts/{alert_number}"]
-  },
-  teams: {
-    addOrUpdateMembershipForUserInOrg: ["PUT /orgs/{org}/teams/{team_slug}/memberships/{username}"],
-    addOrUpdateProjectPermissionsInOrg: ["PUT /orgs/{org}/teams/{team_slug}/projects/{project_id}"],
-    addOrUpdateRepoPermissionsInOrg: ["PUT /orgs/{org}/teams/{team_slug}/repos/{owner}/{repo}"],
-    checkPermissionsForProjectInOrg: ["GET /orgs/{org}/teams/{team_slug}/projects/{project_id}"],
-    checkPermissionsForRepoInOrg: ["GET /orgs/{org}/teams/{team_slug}/repos/{owner}/{repo}"],
-    create: ["POST /orgs/{org}/teams"],
-    createDiscussionCommentInOrg: ["POST /orgs/{org}/teams/{team_slug}/discussions/{discussion_number}/comments"],
-    createDiscussionInOrg: ["POST /orgs/{org}/teams/{team_slug}/discussions"],
-    deleteDiscussionCommentInOrg: ["DELETE /orgs/{org}/teams/{team_slug}/discussions/{discussion_number}/comments/{comment_number}"],
-    deleteDiscussionInOrg: ["DELETE /orgs/{org}/teams/{team_slug}/discussions/{discussion_number}"],
-    deleteInOrg: ["DELETE /orgs/{org}/teams/{team_slug}"],
-    getByName: ["GET /orgs/{org}/teams/{team_slug}"],
-    getDiscussionCommentInOrg: ["GET /orgs/{org}/teams/{team_slug}/discussions/{discussion_number}/comments/{comment_number}"],
-    getDiscussionInOrg: ["GET /orgs/{org}/teams/{team_slug}/discussions/{discussion_number}"],
-    getMembershipForUserInOrg: ["GET /orgs/{org}/teams/{team_slug}/memberships/{username}"],
-    list: ["GET /orgs/{org}/teams"],
-    listChildInOrg: ["GET /orgs/{org}/teams/{team_slug}/teams"],
-    listDiscussionCommentsInOrg: ["GET /orgs/{org}/teams/{team_slug}/discussions/{discussion_number}/comments"],
-    listDiscussionsInOrg: ["GET /orgs/{org}/teams/{team_slug}/discussions"],
-    listForAuthenticatedUser: ["GET /user/teams"],
-    listMembersInOrg: ["GET /orgs/{org}/teams/{team_slug}/members"],
-    listPendingInvitationsInOrg: ["GET /orgs/{org}/teams/{team_slug}/invitations"],
-    listProjectsInOrg: ["GET /orgs/{org}/teams/{team_slug}/projects"],
-    listReposInOrg: ["GET /orgs/{org}/teams/{team_slug}/repos"],
-    removeMembershipForUserInOrg: ["DELETE /orgs/{org}/teams/{team_slug}/memberships/{username}"],
-    removeProjectInOrg: ["DELETE /orgs/{org}/teams/{team_slug}/projects/{project_id}"],
-    removeRepoInOrg: ["DELETE /orgs/{org}/teams/{team_slug}/repos/{owner}/{repo}"],
-    updateDiscussionCommentInOrg: ["PATCH /orgs/{org}/teams/{team_slug}/discussions/{discussion_number}/comments/{comment_number}"],
-    updateDiscussionInOrg: ["PATCH /orgs/{org}/teams/{team_slug}/discussions/{discussion_number}"],
-    updateInOrg: ["PATCH /orgs/{org}/teams/{team_slug}"]
-  },
-  users: {
-    addEmailForAuthenticated: ["POST /user/emails", {}, {
-      renamed: ["users", "addEmailForAuthenticatedUser"]
-    }],
-    addEmailForAuthenticatedUser: ["POST /user/emails"],
-    block: ["PUT /user/blocks/{username}"],
-    checkBlocked: ["GET /user/blocks/{username}"],
-    checkFollowingForUser: ["GET /users/{username}/following/{target_user}"],
-    checkPersonIsFollowedByAuthenticated: ["GET /user/following/{username}"],
-    createGpgKeyForAuthenticated: ["POST /user/gpg_keys", {}, {
-      renamed: ["users", "createGpgKeyForAuthenticatedUser"]
-    }],
-    createGpgKeyForAuthenticatedUser: ["POST /user/gpg_keys"],
-    createPublicSshKeyForAuthenticated: ["POST /user/keys", {}, {
-      renamed: ["users", "createPublicSshKeyForAuthenticatedUser"]
-    }],
-    createPublicSshKeyForAuthenticatedUser: ["POST /user/keys"],
-    deleteEmailForAuthenticated: ["DELETE /user/emails", {}, {
-      renamed: ["users", "deleteEmailForAuthenticatedUser"]
-    }],
-    deleteEmailForAuthenticatedUser: ["DELETE /user/emails"],
-    deleteGpgKeyForAuthenticated: ["DELETE /user/gpg_keys/{gpg_key_id}", {}, {
-      renamed: ["users", "deleteGpgKeyForAuthenticatedUser"]
-    }],
-    deleteGpgKeyForAuthenticatedUser: ["DELETE /user/gpg_keys/{gpg_key_id}"],
-    deletePublicSshKeyForAuthenticated: ["DELETE /user/keys/{key_id}", {}, {
-      renamed: ["users", "deletePublicSshKeyForAuthenticatedUser"]
-    }],
-    deletePublicSshKeyForAuthenticatedUser: ["DELETE /user/keys/{key_id}"],
-    follow: ["PUT /user/following/{username}"],
-    getAuthenticated: ["GET /user"],
-    getByUsername: ["GET /users/{username}"],
-    getContextForUser: ["GET /users/{username}/hovercard"],
-    getGpgKeyForAuthenticated: ["GET /user/gpg_keys/{gpg_key_id}", {}, {
-      renamed: ["users", "getGpgKeyForAuthenticatedUser"]
-    }],
-    getGpgKeyForAuthenticatedUser: ["GET /user/gpg_keys/{gpg_key_id}"],
-    getPublicSshKeyForAuthenticated: ["GET /user/keys/{key_id}", {}, {
-      renamed: ["users", "getPublicSshKeyForAuthenticatedUser"]
-    }],
-    getPublicSshKeyForAuthenticatedUser: ["GET /user/keys/{key_id}"],
-    list: ["GET /users"],
-    listBlockedByAuthenticated: ["GET /user/blocks", {}, {
-      renamed: ["users", "listBlockedByAuthenticatedUser"]
-    }],
-    listBlockedByAuthenticatedUser: ["GET /user/blocks"],
-    listEmailsForAuthenticated: ["GET /user/emails", {}, {
-      renamed: ["users", "listEmailsForAuthenticatedUser"]
-    }],
-    listEmailsForAuthenticatedUser: ["GET /user/emails"],
-    listFollowedByAuthenticated: ["GET /user/following", {}, {
-      renamed: ["users", "listFollowedByAuthenticatedUser"]
-    }],
-    listFollowedByAuthenticatedUser: ["GET /user/following"],
-    listFollowersForAuthenticatedUser: ["GET /user/followers"],
-    listFollowersForUser: ["GET /users/{username}/followers"],
-    listFollowingForUser: ["GET /users/{username}/following"],
-    listGpgKeysForAuthenticated: ["GET /user/gpg_keys", {}, {
-      renamed: ["users", "listGpgKeysForAuthenticatedUser"]
-    }],
-    listGpgKeysForAuthenticatedUser: ["GET /user/gpg_keys"],
-    listGpgKeysForUser: ["GET /users/{username}/gpg_keys"],
-    listPublicEmailsForAuthenticated: ["GET /user/public_emails", {}, {
-      renamed: ["users", "listPublicEmailsForAuthenticatedUser"]
-    }],
-    listPublicEmailsForAuthenticatedUser: ["GET /user/public_emails"],
-    listPublicKeysForUser: ["GET /users/{username}/keys"],
-    listPublicSshKeysForAuthenticated: ["GET /user/keys", {}, {
-      renamed: ["users", "listPublicSshKeysForAuthenticatedUser"]
-    }],
-    listPublicSshKeysForAuthenticatedUser: ["GET /user/keys"],
-    setPrimaryEmailVisibilityForAuthenticated: ["PATCH /user/email/visibility", {}, {
-      renamed: ["users", "setPrimaryEmailVisibilityForAuthenticatedUser"]
-    }],
-    setPrimaryEmailVisibilityForAuthenticatedUser: ["PATCH /user/email/visibility"],
-    unblock: ["DELETE /user/blocks/{username}"],
-    unfollow: ["DELETE /user/following/{username}"],
-    updateAuthenticated: ["PATCH /user"]
-  }
-};
-
-const VERSION = "5.16.2";
-
-function endpointsToMethods(octokit, endpointsMap) {
-  const newMethods = {};
-
-  for (const [scope, endpoints] of Object.entries(endpointsMap)) {
-    for (const [methodName, endpoint] of Object.entries(endpoints)) {
-      const [route, defaults, decorations] = endpoint;
-      const [method, url] = route.split(/ /);
-      const endpointDefaults = Object.assign({
-        method,
-        url
-      }, defaults);
-
-      if (!newMethods[scope]) {
-        newMethods[scope] = {};
-      }
-
-      const scopeMethods = newMethods[scope];
-
-      if (decorations) {
-        scopeMethods[methodName] = decorate(octokit, scope, methodName, endpointDefaults, decorations);
-        continue;
-      }
-
-      scopeMethods[methodName] = octokit.request.defaults(endpointDefaults);
-    }
-  }
-
-  return newMethods;
-}
-
-function decorate(octokit, scope, methodName, defaults, decorations) {
-  const requestWithDefaults = octokit.request.defaults(defaults);
-  /* istanbul ignore next */
-
-  function withDecorations(...args) {
-    // @ts-ignore https://github.com/microsoft/TypeScript/issues/25488
-    let options = requestWithDefaults.endpoint.merge(...args); // There are currently no other decorations than `.mapToData`
-
-    if (decorations.mapToData) {
-      options = Object.assign({}, options, {
-        data: options[decorations.mapToData],
-        [decorations.mapToData]: undefined
-      });
-      return requestWithDefaults(options);
-    }
-
-    if (decorations.renamed) {
-      const [newScope, newMethodName] = decorations.renamed;
-      octokit.log.warn(`octokit.${scope}.${methodName}() has been renamed to octokit.${newScope}.${newMethodName}()`);
-    }
-
-    if (decorations.deprecated) {
-      octokit.log.warn(decorations.deprecated);
-    }
-
-    if (decorations.renamedParameters) {
-      // @ts-ignore https://github.com/microsoft/TypeScript/issues/25488
-      const options = requestWithDefaults.endpoint.merge(...args);
-
-      for (const [name, alias] of Object.entries(decorations.renamedParameters)) {
-        if (name in options) {
-          octokit.log.warn(`"${name}" parameter is deprecated for "octokit.${scope}.${methodName}()". Use "${alias}" instead`);
-
-          if (!(alias in options)) {
-            options[alias] = options[name];
-          }
-
-          delete options[name];
-        }
-      }
-
-      return requestWithDefaults(options);
-    } // @ts-ignore https://github.com/microsoft/TypeScript/issues/25488
-
-
-    return requestWithDefaults(...args);
-  }
-
-  return Object.assign(withDecorations, requestWithDefaults);
-}
-
-function restEndpointMethods(octokit) {
-  const api = endpointsToMethods(octokit, Endpoints);
-  return {
-    rest: api
-  };
-}
-restEndpointMethods.VERSION = VERSION;
-function legacyRestEndpointMethods(octokit) {
-  const api = endpointsToMethods(octokit, Endpoints);
-  return _objectSpread2(_objectSpread2({}, api), {}, {
-    rest: api
-  });
-}
-legacyRestEndpointMethods.VERSION = VERSION;
-
-exports.legacyRestEndpointMethods = legacyRestEndpointMethods;
-exports.restEndpointMethods = restEndpointMethods;
-//# sourceMappingURL=index.js.map
-
-
-/***/ }),
-
-/***/ 9968:
-/***/ ((__unused_webpack_module, exports, __nccwpck_require__) => {
-
-"use strict";
-
-
-Object.defineProperty(exports, "__esModule", ({ value: true }));
-
-function _interopDefault (ex) { return (ex && (typeof ex === 'object') && 'default' in ex) ? ex['default'] : ex; }
-
-var BottleneckLight = _interopDefault(__nccwpck_require__(1174));
-
-const VERSION = "4.1.0";
-
-const noop = () => Promise.resolve(); // @ts-expect-error
-
-
-function wrapRequest(state, request, options) {
-  return state.retryLimiter.schedule(doRequest, state, request, options);
-} // @ts-expect-error
-
-async function doRequest(state, request, options) {
-  const isWrite = options.method !== "GET" && options.method !== "HEAD";
-  const {
-    pathname
-  } = new URL(options.url, "http://github.test");
-  const isSearch = options.method === "GET" && pathname.startsWith("/search/");
-  const isGraphQL = pathname.startsWith("/graphql");
-  const retryCount = ~~options.request.retryCount;
-  const jobOptions = retryCount > 0 ? {
-    priority: 0,
-    weight: 0
-  } : {};
-
-  if (state.clustering) {
-    // Remove a job from Redis if it has not completed or failed within 60s
-    // Examples: Node process terminated, client disconnected, etc.
-    // @ts-expect-error
-    jobOptions.expiration = 1000 * 60;
-  } // Guarantee at least 1000ms between writes
-  // GraphQL can also trigger writes
-
-
-  if (isWrite || isGraphQL) {
-    await state.write.key(state.id).schedule(jobOptions, noop);
-  } // Guarantee at least 3000ms between requests that trigger notifications
-
-
-  if (isWrite && state.triggersNotification(pathname)) {
-    await state.notifications.key(state.id).schedule(jobOptions, noop);
-  } // Guarantee at least 2000ms between search requests
-
-
-  if (isSearch) {
-    await state.search.key(state.id).schedule(jobOptions, noop);
-  }
-
-  const req = state.global.key(state.id).schedule(jobOptions, request, options);
-
-  if (isGraphQL) {
-    const res = await req;
-
-    if (res.data.errors != null && // @ts-expect-error
-    res.data.errors.some(error => error.type === "RATE_LIMITED")) {
-      const error = Object.assign(new Error("GraphQL Rate Limit Exceeded"), {
-        response: res,
-        data: res.data
-      });
-      throw error;
-    }
-  }
-
-  return req;
-}
-
-var triggersNotificationPaths = ["/orgs/{org}/invitations", "/orgs/{org}/invitations/{invitation_id}", "/orgs/{org}/teams/{team_slug}/discussions", "/orgs/{org}/teams/{team_slug}/discussions/{discussion_number}/comments", "/repos/{owner}/{repo}/collaborators/{username}", "/repos/{owner}/{repo}/commits/{commit_sha}/comments", "/repos/{owner}/{repo}/issues", "/repos/{owner}/{repo}/issues/{issue_number}/comments", "/repos/{owner}/{repo}/pulls", "/repos/{owner}/{repo}/pulls/{pull_number}/comments", "/repos/{owner}/{repo}/pulls/{pull_number}/comments/{comment_id}/replies", "/repos/{owner}/{repo}/pulls/{pull_number}/merge", "/repos/{owner}/{repo}/pulls/{pull_number}/requested_reviewers", "/repos/{owner}/{repo}/pulls/{pull_number}/reviews", "/repos/{owner}/{repo}/releases", "/teams/{team_id}/discussions", "/teams/{team_id}/discussions/{discussion_number}/comments"];
-
-function routeMatcher(paths) {
-  // EXAMPLE. For the following paths:
-
-  /* [
-      "/orgs/{org}/invitations",
-      "/repos/{owner}/{repo}/collaborators/{username}"
-  ] */
-  const regexes = paths.map(path => path.split("/").map(c => c.startsWith("{") ? "(?:.+?)" : c).join("/")); // 'regexes' would contain:
-
-  /* [
-      '/orgs/(?:.+?)/invitations',
-      '/repos/(?:.+?)/(?:.+?)/collaborators/(?:.+?)'
-  ] */
-
-  const regex = `^(?:${regexes.map(r => `(?:${r})`).join("|")})[^/]*$`; // 'regex' would contain:
-
-  /*
-    ^(?:(?:\/orgs\/(?:.+?)\/invitations)|(?:\/repos\/(?:.+?)\/(?:.+?)\/collaborators\/(?:.+?)))[^\/]*$
-       It may look scary, but paste it into https://www.debuggex.com/
-    and it will make a lot more sense!
-  */
-
-  return new RegExp(regex, "i");
-}
-
-// @ts-expect-error
-
-const regex = routeMatcher(triggersNotificationPaths);
-const triggersNotification = regex.test.bind(regex);
-const groups = {}; // @ts-expect-error
-
-const createGroups = function (Bottleneck, common) {
-  groups.global = new Bottleneck.Group({
-    id: "octokit-global",
-    maxConcurrent: 10,
-    ...common
-  });
-  groups.search = new Bottleneck.Group({
-    id: "octokit-search",
-    maxConcurrent: 1,
-    minTime: 2000,
-    ...common
-  });
-  groups.write = new Bottleneck.Group({
-    id: "octokit-write",
-    maxConcurrent: 1,
-    minTime: 1000,
-    ...common
-  });
-  groups.notifications = new Bottleneck.Group({
-    id: "octokit-notifications",
-    maxConcurrent: 1,
-    minTime: 3000,
-    ...common
-  });
-};
-
-function throttling(octokit, octokitOptions) {
-  const {
-    enabled = true,
-    Bottleneck = BottleneckLight,
-    id = "no-id",
-    timeout = 1000 * 60 * 2,
-    // Redis TTL: 2 minutes
-    connection
-  } = octokitOptions.throttle || {};
-
-  if (!enabled) {
-    return {};
-  }
-
-  const common = {
-    connection,
-    timeout
-  };
-
-  if (groups.global == null) {
-    createGroups(Bottleneck, common);
-  }
-
-  const state = Object.assign({
-    clustering: connection != null,
-    triggersNotification,
-    minimumSecondaryRateRetryAfter: 5,
-    retryAfterBaseValue: 1000,
-    retryLimiter: new Bottleneck(),
-    id,
-    ...groups
-  }, octokitOptions.throttle);
-  const isUsingDeprecatedOnAbuseLimitHandler = typeof state.onAbuseLimit === "function" && state.onAbuseLimit;
-
-  if (typeof (isUsingDeprecatedOnAbuseLimitHandler ? state.onAbuseLimit : state.onSecondaryRateLimit) !== "function" || typeof state.onRateLimit !== "function") {
-    throw new Error(`octokit/plugin-throttling error:
-        You must pass the onSecondaryRateLimit and onRateLimit error handlers.
-        See https://github.com/octokit/rest.js#throttling
-
-        const octokit = new Octokit({
-          throttle: {
-            onSecondaryRateLimit: (retryAfter, options) => {/* ... */},
-            onRateLimit: (retryAfter, options) => {/* ... */}
-          }
-        })
-    `);
-  }
-
-  const events = {};
-  const emitter = new Bottleneck.Events(events); // @ts-expect-error
-
-  events.on("secondary-limit", isUsingDeprecatedOnAbuseLimitHandler ? function (...args) {
-    octokit.log.warn("[@octokit/plugin-throttling] `onAbuseLimit()` is deprecated and will be removed in a future release of `@octokit/plugin-throttling`, please use the `onSecondaryRateLimit` handler instead");
-    return state.onAbuseLimit(...args);
-  } : state.onSecondaryRateLimit); // @ts-expect-error
-
-  events.on("rate-limit", state.onRateLimit); // @ts-expect-error
-
-  events.on("error", e => octokit.log.warn("Error in throttling-plugin limit handler", e)); // @ts-expect-error
-
-  state.retryLimiter.on("failed", async function (error, info) {
-    const options = info.args[info.args.length - 1];
-    const {
-      pathname
-    } = new URL(options.url, "http://github.test");
-    const shouldRetryGraphQL = pathname.startsWith("/graphql") && error.status !== 401;
-
-    if (!(shouldRetryGraphQL || error.status === 403)) {
-      return;
-    }
-
-    const retryCount = ~~options.request.retryCount;
-    options.request.retryCount = retryCount;
-    const {
-      wantRetry,
-      retryAfter = 0
-    } = await async function () {
-      if (/\bsecondary rate\b/i.test(error.message)) {
-        // The user has hit the secondary rate limit. (REST and GraphQL)
-        // https://docs.github.com/en/rest/overview/resources-in-the-rest-api#secondary-rate-limits
-        // The Retry-After header can sometimes be blank when hitting a secondary rate limit,
-        // but is always present after 2-3s, so make sure to set `retryAfter` to at least 5s by default.
-        const retryAfter = Math.max(~~error.response.headers["retry-after"], state.minimumSecondaryRateRetryAfter);
-        const wantRetry = await emitter.trigger("secondary-limit", retryAfter, options, octokit);
-        return {
-          wantRetry,
-          retryAfter
-        };
-      }
-
-      if (error.response.headers != null && error.response.headers["x-ratelimit-remaining"] === "0") {
-        // The user has used all their allowed calls for the current time period (REST and GraphQL)
-        // https://docs.github.com/en/rest/reference/rate-limit (REST)
-        // https://docs.github.com/en/graphql/overview/resource-limitations#rate-limit (GraphQL)
-        const rateLimitReset = new Date(~~error.response.headers["x-ratelimit-reset"] * 1000).getTime();
-        const retryAfter = Math.max(Math.ceil((rateLimitReset - Date.now()) / 1000), 0);
-        const wantRetry = await emitter.trigger("rate-limit", retryAfter, options, octokit);
-        return {
-          wantRetry,
-          retryAfter
-        };
-      }
-
-      return {};
-    }();
-
-    if (wantRetry) {
-      options.request.retryCount++;
-      return retryAfter * state.retryAfterBaseValue;
-    }
-  });
-  octokit.hook.wrap("request", wrapRequest.bind(null, state));
-  return {};
-}
-throttling.VERSION = VERSION;
-throttling.triggersNotification = triggersNotification;
-
-exports.throttling = throttling;
-//# sourceMappingURL=index.js.map
-
-
-/***/ }),
-
-/***/ 3682:
-/***/ ((module, __unused_webpack_exports, __nccwpck_require__) => {
-
-var register = __nccwpck_require__(4670)
-var addHook = __nccwpck_require__(5549)
-var removeHook = __nccwpck_require__(6819)
-
-// bind with array of arguments: https://stackoverflow.com/a/21792913
-var bind = Function.bind
-var bindable = bind.bind(bind)
-
-function bindApi (hook, state, name) {
-  var removeHookRef = bindable(removeHook, null).apply(null, name ? [state, name] : [state])
-  hook.api = { remove: removeHookRef }
-  hook.remove = removeHookRef
-
-  ;['before', 'error', 'after', 'wrap'].forEach(function (kind) {
-    var args = name ? [state, kind, name] : [state, kind]
-    hook[kind] = hook.api[kind] = bindable(addHook, null).apply(null, args)
-  })
-}
-
-function HookSingular () {
-  var singularHookName = 'h'
-  var singularHookState = {
-    registry: {}
-  }
-  var singularHook = register.bind(null, singularHookState, singularHookName)
-  bindApi(singularHook, singularHookState, singularHookName)
-  return singularHook
-}
-
-function HookCollection () {
-  var state = {
-    registry: {}
-  }
-
-  var hook = register.bind(null, state)
-  bindApi(hook, state)
-
-  return hook
-}
-
-var collectionHookDeprecationMessageDisplayed = false
-function Hook () {
-  if (!collectionHookDeprecationMessageDisplayed) {
-    console.warn('[before-after-hook]: "Hook()" repurposing warning, use "Hook.Collection()". Read more: https://git.io/upgrade-before-after-hook-to-1.4')
-    collectionHookDeprecationMessageDisplayed = true
-  }
-  return HookCollection()
-}
-
-Hook.Singular = HookSingular.bind()
-Hook.Collection = HookCollection.bind()
-
-module.exports = Hook
-// expose constructors as a named property for TypeScript
-module.exports.Hook = Hook
-module.exports.Singular = Hook.Singular
-module.exports.Collection = Hook.Collection
-
-
-/***/ }),
-
-/***/ 5549:
-/***/ ((module) => {
-
-module.exports = addHook;
-
-function addHook(state, kind, name, hook) {
-  var orig = hook;
-  if (!state.registry[name]) {
-    state.registry[name] = [];
-  }
-
-  if (kind === "before") {
-    hook = function (method, options) {
-      return Promise.resolve()
-        .then(orig.bind(null, options))
-        .then(method.bind(null, options));
-    };
-  }
-
-  if (kind === "after") {
-    hook = function (method, options) {
-      var result;
-      return Promise.resolve()
-        .then(method.bind(null, options))
-        .then(function (result_) {
-          result = result_;
-          return orig(result, options);
-        })
-        .then(function () {
-          return result;
-        });
-    };
-  }
-
-  if (kind === "error") {
-    hook = function (method, options) {
-      return Promise.resolve()
-        .then(method.bind(null, options))
-        .catch(function (error) {
-          return orig(error, options);
-        });
-    };
-  }
-
-  state.registry[name].push({
-    hook: hook,
-    orig: orig,
-  });
-}
-
-
-/***/ }),
-
-/***/ 4670:
-/***/ ((module) => {
-
-module.exports = register;
-
-function register(state, name, method, options) {
-  if (typeof method !== "function") {
-    throw new Error("method for before hook must be a function");
-  }
-
-  if (!options) {
-    options = {};
-  }
-
-  if (Array.isArray(name)) {
-    return name.reverse().reduce(function (callback, name) {
-      return register.bind(null, state, name, callback, options);
-    }, method)();
-  }
-
-  return Promise.resolve().then(function () {
-    if (!state.registry[name]) {
-      return method(options);
-    }
-
-    return state.registry[name].reduce(function (method, registered) {
-      return registered.hook.bind(null, method, options);
-    }, method)();
-  });
-}
-
-
-/***/ }),
-
-/***/ 6819:
-/***/ ((module) => {
-
-module.exports = removeHook;
-
-function removeHook(state, name, method) {
-  if (!state.registry[name]) {
-    return;
-  }
-
-  var index = state.registry[name]
-    .map(function (registered) {
-      return registered.orig;
-    })
-    .indexOf(method);
-
-  if (index === -1) {
-    return;
-  }
-
-  state.registry[name].splice(index, 1);
-}
-
-
-/***/ }),
-
-/***/ 1174:
-/***/ (function(module) {
-
-/**
-  * This file contains the Bottleneck library (MIT), compiled to ES2017, and without Clustering support.
-  * https://github.com/SGrondin/bottleneck
-  */
-(function (global, factory) {
-	 true ? module.exports = factory() :
-	0;
-}(this, (function () { 'use strict';
-
-	var commonjsGlobal = typeof globalThis !== 'undefined' ? globalThis : typeof window !== 'undefined' ? window : typeof global !== 'undefined' ? global : typeof self !== 'undefined' ? self : {};
-
-	function getCjsExportFromNamespace (n) {
-		return n && n['default'] || n;
-	}
-
-	var load = function(received, defaults, onto = {}) {
-	  var k, ref, v;
-	  for (k in defaults) {
-	    v = defaults[k];
-	    onto[k] = (ref = received[k]) != null ? ref : v;
-	  }
-	  return onto;
-	};
-
-	var overwrite = function(received, defaults, onto = {}) {
-	  var k, v;
-	  for (k in received) {
-	    v = received[k];
-	    if (defaults[k] !== void 0) {
-	      onto[k] = v;
-	    }
-	  }
-	  return onto;
-	};
-
-	var parser = {
-		load: load,
-		overwrite: overwrite
-	};
-
-	var DLList;
-
-	DLList = class DLList {
-	  constructor(incr, decr) {
-	    this.incr = incr;
-	    this.decr = decr;
-	    this._first = null;
-	    this._last = null;
-	    this.length = 0;
-	  }
-
-	  push(value) {
-	    var node;
-	    this.length++;
-	    if (typeof this.incr === "function") {
-	      this.incr();
-	    }
-	    node = {
-	      value,
-	      prev: this._last,
-	      next: null
-	    };
-	    if (this._last != null) {
-	      this._last.next = node;
-	      this._last = node;
-	    } else {
-	      this._first = this._last = node;
-	    }
-	    return void 0;
-	  }
-
-	  shift() {
-	    var value;
-	    if (this._first == null) {
-	      return;
-	    } else {
-	      this.length--;
-	      if (typeof this.decr === "function") {
-	        this.decr();
-	      }
-	    }
-	    value = this._first.value;
-	    if ((this._first = this._first.next) != null) {
-	      this._first.prev = null;
-	    } else {
-	      this._last = null;
-	    }
-	    return value;
-	  }
-
-	  first() {
-	    if (this._first != null) {
-	      return this._first.value;
-	    }
-	  }
-
-	  getArray() {
-	    var node, ref, results;
-	    node = this._first;
-	    results = [];
-	    while (node != null) {
-	      results.push((ref = node, node = node.next, ref.value));
-	    }
-	    return results;
-	  }
-
-	  forEachShift(cb) {
-	    var node;
-	    node = this.shift();
-	    while (node != null) {
-	      (cb(node), node = this.shift());
-	    }
-	    return void 0;
-	  }
-
-	  debug() {
-	    var node, ref, ref1, ref2, results;
-	    node = this._first;
-	    results = [];
-	    while (node != null) {
-	      results.push((ref = node, node = node.next, {
-	        value: ref.value,
-	        prev: (ref1 = ref.prev) != null ? ref1.value : void 0,
-	        next: (ref2 = ref.next) != null ? ref2.value : void 0
-	      }));
-	    }
-	    return results;
-	  }
-
-	};
-
-	var DLList_1 = DLList;
-
-	var Events;
-
-	Events = class Events {
-	  constructor(instance) {
-	    this.instance = instance;
-	    this._events = {};
-	    if ((this.instance.on != null) || (this.instance.once != null) || (this.instance.removeAllListeners != null)) {
-	      throw new Error("An Emitter already exists for this object");
-	    }
-	    this.instance.on = (name, cb) => {
-	      return this._addListener(name, "many", cb);
-	    };
-	    this.instance.once = (name, cb) => {
-	      return this._addListener(name, "once", cb);
-	    };
-	    this.instance.removeAllListeners = (name = null) => {
-	      if (name != null) {
-	        return delete this._events[name];
-	      } else {
-	        return this._events = {};
-	      }
-	    };
-	  }
-
-	  _addListener(name, status, cb) {
-	    var base;
-	    if ((base = this._events)[name] == null) {
-	      base[name] = [];
-	    }
-	    this._events[name].push({cb, status});
-	    return this.instance;
-	  }
-
-	  listenerCount(name) {
-	    if (this._events[name] != null) {
-	      return this._events[name].length;
-	    } else {
-	      return 0;
-	    }
-	  }
-
-	  async trigger(name, ...args) {
-	    var e, promises;
-	    try {
-	      if (name !== "debug") {
-	        this.trigger("debug", `Event triggered: ${name}`, args);
-	      }
-	      if (this._events[name] == null) {
-	        return;
-	      }
-	      this._events[name] = this._events[name].filter(function(listener) {
-	        return listener.status !== "none";
-	      });
-	      promises = this._events[name].map(async(listener) => {
-	        var e, returned;
-	        if (listener.status === "none") {
-	          return;
-	        }
-	        if (listener.status === "once") {
-	          listener.status = "none";
-	        }
-	        try {
-	          returned = typeof listener.cb === "function" ? listener.cb(...args) : void 0;
-	          if (typeof (returned != null ? returned.then : void 0) === "function") {
-	            return (await returned);
-	          } else {
-	            return returned;
-	          }
-	        } catch (error) {
-	          e = error;
-	          {
-	            this.trigger("error", e);
-	          }
-	          return null;
-	        }
-	      });
-	      return ((await Promise.all(promises))).find(function(x) {
-	        return x != null;
-	      });
-	    } catch (error) {
-	      e = error;
-	      {
-	        this.trigger("error", e);
-	      }
-	      return null;
-	    }
-	  }
-
-	};
-
-	var Events_1 = Events;
-
-	var DLList$1, Events$1, Queues;
-
-	DLList$1 = DLList_1;
-
-	Events$1 = Events_1;
-
-	Queues = class Queues {
-	  constructor(num_priorities) {
-	    var i;
-	    this.Events = new Events$1(this);
-	    this._length = 0;
-	    this._lists = (function() {
-	      var j, ref, results;
-	      results = [];
-	      for (i = j = 1, ref = num_priorities; (1 <= ref ? j <= ref : j >= ref); i = 1 <= ref ? ++j : --j) {
-	        results.push(new DLList$1((() => {
-	          return this.incr();
-	        }), (() => {
-	          return this.decr();
-	        })));
-	      }
-	      return results;
-	    }).call(this);
-	  }
-
-	  incr() {
-	    if (this._length++ === 0) {
-	      return this.Events.trigger("leftzero");
-	    }
-	  }
-
-	  decr() {
-	    if (--this._length === 0) {
-	      return this.Events.trigger("zero");
-	    }
-	  }
-
-	  push(job) {
-	    return this._lists[job.options.priority].push(job);
-	  }
-
-	  queued(priority) {
-	    if (priority != null) {
-	      return this._lists[priority].length;
-	    } else {
-	      return this._length;
-	    }
-	  }
-
-	  shiftAll(fn) {
-	    return this._lists.forEach(function(list) {
-	      return list.forEachShift(fn);
-	    });
-	  }
-
-	  getFirst(arr = this._lists) {
-	    var j, len, list;
-	    for (j = 0, len = arr.length; j < len; j++) {
-	      list = arr[j];
-	      if (list.length > 0) {
-	        return list;
-	      }
-	    }
-	    return [];
-	  }
-
-	  shiftLastFrom(priority) {
-	    return this.getFirst(this._lists.slice(priority).reverse()).shift();
-	  }
-
-	};
-
-	var Queues_1 = Queues;
-
-	var BottleneckError;
-
-	BottleneckError = class BottleneckError extends Error {};
-
-	var BottleneckError_1 = BottleneckError;
-
-	var BottleneckError$1, DEFAULT_PRIORITY, Job, NUM_PRIORITIES, parser$1;
-
-	NUM_PRIORITIES = 10;
-
-	DEFAULT_PRIORITY = 5;
-
-	parser$1 = parser;
-
-	BottleneckError$1 = BottleneckError_1;
-
-	Job = class Job {
-	  constructor(task, args, options, jobDefaults, rejectOnDrop, Events, _states, Promise) {
-	    this.task = task;
-	    this.args = args;
-	    this.rejectOnDrop = rejectOnDrop;
-	    this.Events = Events;
-	    this._states = _states;
-	    this.Promise = Promise;
-	    this.options = parser$1.load(options, jobDefaults);
-	    this.options.priority = this._sanitizePriority(this.options.priority);
-	    if (this.options.id === jobDefaults.id) {
-	      this.options.id = `${this.options.id}-${this._randomIndex()}`;
-	    }
-	    this.promise = new this.Promise((_resolve, _reject) => {
-	      this._resolve = _resolve;
-	      this._reject = _reject;
-	    });
-	    this.retryCount = 0;
-	  }
-
-	  _sanitizePriority(priority) {
-	    var sProperty;
-	    sProperty = ~~priority !== priority ? DEFAULT_PRIORITY : priority;
-	    if (sProperty < 0) {
-	      return 0;
-	    } else if (sProperty > NUM_PRIORITIES - 1) {
-	      return NUM_PRIORITIES - 1;
-	    } else {
-	      return sProperty;
-	    }
-	  }
-
-	  _randomIndex() {
-	    return Math.random().toString(36).slice(2);
-	  }
-
-	  doDrop({error, message = "This job has been dropped by Bottleneck"} = {}) {
-	    if (this._states.remove(this.options.id)) {
-	      if (this.rejectOnDrop) {
-	        this._reject(error != null ? error : new BottleneckError$1(message));
-	      }
-	      this.Events.trigger("dropped", {args: this.args, options: this.options, task: this.task, promise: this.promise});
-	      return true;
-	    } else {
-	      return false;
-	    }
-	  }
-
-	  _assertStatus(expected) {
-	    var status;
-	    status = this._states.jobStatus(this.options.id);
-	    if (!(status === expected || (expected === "DONE" && status === null))) {
-	      throw new BottleneckError$1(`Invalid job status ${status}, expected ${expected}. Please open an issue at https://github.com/SGrondin/bottleneck/issues`);
-	    }
-	  }
-
-	  doReceive() {
-	    this._states.start(this.options.id);
-	    return this.Events.trigger("received", {args: this.args, options: this.options});
-	  }
-
-	  doQueue(reachedHWM, blocked) {
-	    this._assertStatus("RECEIVED");
-	    this._states.next(this.options.id);
-	    return this.Events.trigger("queued", {args: this.args, options: this.options, reachedHWM, blocked});
-	  }
-
-	  doRun() {
-	    if (this.retryCount === 0) {
-	      this._assertStatus("QUEUED");
-	      this._states.next(this.options.id);
-	    } else {
-	      this._assertStatus("EXECUTING");
-	    }
-	    return this.Events.trigger("scheduled", {args: this.args, options: this.options});
-	  }
-
-	  async doExecute(chained, clearGlobalState, run, free) {
-	    var error, eventInfo, passed;
-	    if (this.retryCount === 0) {
-	      this._assertStatus("RUNNING");
-	      this._states.next(this.options.id);
-	    } else {
-	      this._assertStatus("EXECUTING");
-	    }
-	    eventInfo = {args: this.args, options: this.options, retryCount: this.retryCount};
-	    this.Events.trigger("executing", eventInfo);
-	    try {
-	      passed = (await (chained != null ? chained.schedule(this.options, this.task, ...this.args) : this.task(...this.args)));
-	      if (clearGlobalState()) {
-	        this.doDone(eventInfo);
-	        await free(this.options, eventInfo);
-	        this._assertStatus("DONE");
-	        return this._resolve(passed);
-	      }
-	    } catch (error1) {
-	      error = error1;
-	      return this._onFailure(error, eventInfo, clearGlobalState, run, free);
-	    }
-	  }
-
-	  doExpire(clearGlobalState, run, free) {
-	    var error, eventInfo;
-	    if (this._states.jobStatus(this.options.id === "RUNNING")) {
-	      this._states.next(this.options.id);
-	    }
-	    this._assertStatus("EXECUTING");
-	    eventInfo = {args: this.args, options: this.options, retryCount: this.retryCount};
-	    error = new BottleneckError$1(`This job timed out after ${this.options.expiration} ms.`);
-	    return this._onFailure(error, eventInfo, clearGlobalState, run, free);
-	  }
-
-	  async _onFailure(error, eventInfo, clearGlobalState, run, free) {
-	    var retry, retryAfter;
-	    if (clearGlobalState()) {
-	      retry = (await this.Events.trigger("failed", error, eventInfo));
-	      if (retry != null) {
-	        retryAfter = ~~retry;
-	        this.Events.trigger("retry", `Retrying ${this.options.id} after ${retryAfter} ms`, eventInfo);
-	        this.retryCount++;
-	        return run(retryAfter);
-	      } else {
-	        this.doDone(eventInfo);
-	        await free(this.options, eventInfo);
-	        this._assertStatus("DONE");
-	        return this._reject(error);
-	      }
-	    }
-	  }
-
-	  doDone(eventInfo) {
-	    this._assertStatus("EXECUTING");
-	    this._states.next(this.options.id);
-	    return this.Events.trigger("done", eventInfo);
-	  }
-
-	};
-
-	var Job_1 = Job;
-
-	var BottleneckError$2, LocalDatastore, parser$2;
-
-	parser$2 = parser;
-
-	BottleneckError$2 = BottleneckError_1;
-
-	LocalDatastore = class LocalDatastore {
-	  constructor(instance, storeOptions, storeInstanceOptions) {
-	    this.instance = instance;
-	    this.storeOptions = storeOptions;
-	    this.clientId = this.instance._randomIndex();
-	    parser$2.load(storeInstanceOptions, storeInstanceOptions, this);
-	    this._nextRequest = this._lastReservoirRefresh = this._lastReservoirIncrease = Date.now();
-	    this._running = 0;
-	    this._done = 0;
-	    this._unblockTime = 0;
-	    this.ready = this.Promise.resolve();
-	    this.clients = {};
-	    this._startHeartbeat();
-	  }
-
-	  _startHeartbeat() {
-	    var base;
-	    if ((this.heartbeat == null) && (((this.storeOptions.reservoirRefreshInterval != null) && (this.storeOptions.reservoirRefreshAmount != null)) || ((this.storeOptions.reservoirIncreaseInterval != null) && (this.storeOptions.reservoirIncreaseAmount != null)))) {
-	      return typeof (base = (this.heartbeat = setInterval(() => {
-	        var amount, incr, maximum, now, reservoir;
-	        now = Date.now();
-	        if ((this.storeOptions.reservoirRefreshInterval != null) && now >= this._lastReservoirRefresh + this.storeOptions.reservoirRefreshInterval) {
-	          this._lastReservoirRefresh = now;
-	          this.storeOptions.reservoir = this.storeOptions.reservoirRefreshAmount;
-	          this.instance._drainAll(this.computeCapacity());
-	        }
-	        if ((this.storeOptions.reservoirIncreaseInterval != null) && now >= this._lastReservoirIncrease + this.storeOptions.reservoirIncreaseInterval) {
-	          ({
-	            reservoirIncreaseAmount: amount,
-	            reservoirIncreaseMaximum: maximum,
-	            reservoir
-	          } = this.storeOptions);
-	          this._lastReservoirIncrease = now;
-	          incr = maximum != null ? Math.min(amount, maximum - reservoir) : amount;
-	          if (incr > 0) {
-	            this.storeOptions.reservoir += incr;
-	            return this.instance._drainAll(this.computeCapacity());
-	          }
-	        }
-	      }, this.heartbeatInterval))).unref === "function" ? base.unref() : void 0;
-	    } else {
-	      return clearInterval(this.heartbeat);
-	    }
-	  }
-
-	  async __publish__(message) {
-	    await this.yieldLoop();
-	    return this.instance.Events.trigger("message", message.toString());
-	  }
-
-	  async __disconnect__(flush) {
-	    await this.yieldLoop();
-	    clearInterval(this.heartbeat);
-	    return this.Promise.resolve();
-	  }
-
-	  yieldLoop(t = 0) {
-	    return new this.Promise(function(resolve, reject) {
-	      return setTimeout(resolve, t);
-	    });
-	  }
-
-	  computePenalty() {
-	    var ref;
-	    return (ref = this.storeOptions.penalty) != null ? ref : (15 * this.storeOptions.minTime) || 5000;
-	  }
-
-	  async __updateSettings__(options) {
-	    await this.yieldLoop();
-	    parser$2.overwrite(options, options, this.storeOptions);
-	    this._startHeartbeat();
-	    this.instance._drainAll(this.computeCapacity());
-	    return true;
-	  }
-
-	  async __running__() {
-	    await this.yieldLoop();
-	    return this._running;
-	  }
-
-	  async __queued__() {
-	    await this.yieldLoop();
-	    return this.instance.queued();
-	  }
-
-	  async __done__() {
-	    await this.yieldLoop();
-	    return this._done;
-	  }
-
-	  async __groupCheck__(time) {
-	    await this.yieldLoop();
-	    return (this._nextRequest + this.timeout) < time;
-	  }
-
-	  computeCapacity() {
-	    var maxConcurrent, reservoir;
-	    ({maxConcurrent, reservoir} = this.storeOptions);
-	    if ((maxConcurrent != null) && (reservoir != null)) {
-	      return Math.min(maxConcurrent - this._running, reservoir);
-	    } else if (maxConcurrent != null) {
-	      return maxConcurrent - this._running;
-	    } else if (reservoir != null) {
-	      return reservoir;
-	    } else {
-	      return null;
-	    }
-	  }
-
-	  conditionsCheck(weight) {
-	    var capacity;
-	    capacity = this.computeCapacity();
-	    return (capacity == null) || weight <= capacity;
-	  }
-
-	  async __incrementReservoir__(incr) {
-	    var reservoir;
-	    await this.yieldLoop();
-	    reservoir = this.storeOptions.reservoir += incr;
-	    this.instance._drainAll(this.computeCapacity());
-	    return reservoir;
-	  }
-
-	  async __currentReservoir__() {
-	    await this.yieldLoop();
-	    return this.storeOptions.reservoir;
-	  }
-
-	  isBlocked(now) {
-	    return this._unblockTime >= now;
-	  }
-
-	  check(weight, now) {
-	    return this.conditionsCheck(weight) && (this._nextRequest - now) <= 0;
-	  }
-
-	  async __check__(weight) {
-	    var now;
-	    await this.yieldLoop();
-	    now = Date.now();
-	    return this.check(weight, now);
-	  }
-
-	  async __register__(index, weight, expiration) {
-	    var now, wait;
-	    await this.yieldLoop();
-	    now = Date.now();
-	    if (this.conditionsCheck(weight)) {
-	      this._running += weight;
-	      if (this.storeOptions.reservoir != null) {
-	        this.storeOptions.reservoir -= weight;
-	      }
-	      wait = Math.max(this._nextRequest - now, 0);
-	      this._nextRequest = now + wait + this.storeOptions.minTime;
-	      return {
-	        success: true,
-	        wait,
-	        reservoir: this.storeOptions.reservoir
-	      };
-	    } else {
-	      return {
-	        success: false
-	      };
-	    }
-	  }
-
-	  strategyIsBlock() {
-	    return this.storeOptions.strategy === 3;
-	  }
-
-	  async __submit__(queueLength, weight) {
-	    var blocked, now, reachedHWM;
-	    await this.yieldLoop();
-	    if ((this.storeOptions.maxConcurrent != null) && weight > this.storeOptions.maxConcurrent) {
-	      throw new BottleneckError$2(`Impossible to add a job having a weight of ${weight} to a limiter having a maxConcurrent setting of ${this.storeOptions.maxConcurrent}`);
-	    }
-	    now = Date.now();
-	    reachedHWM = (this.storeOptions.highWater != null) && queueLength === this.storeOptions.highWater && !this.check(weight, now);
-	    blocked = this.strategyIsBlock() && (reachedHWM || this.isBlocked(now));
-	    if (blocked) {
-	      this._unblockTime = now + this.computePenalty();
-	      this._nextRequest = this._unblockTime + this.storeOptions.minTime;
-	      this.instance._dropAllQueued();
-	    }
-	    return {
-	      reachedHWM,
-	      blocked,
-	      strategy: this.storeOptions.strategy
-	    };
-	  }
-
-	  async __free__(index, weight) {
-	    await this.yieldLoop();
-	    this._running -= weight;
-	    this._done += weight;
-	    this.instance._drainAll(this.computeCapacity());
-	    return {
-	      running: this._running
-	    };
-	  }
-
-	};
-
-	var LocalDatastore_1 = LocalDatastore;
-
-	var BottleneckError$3, States;
-
-	BottleneckError$3 = BottleneckError_1;
-
-	States = class States {
-	  constructor(status1) {
-	    this.status = status1;
-	    this._jobs = {};
-	    this.counts = this.status.map(function() {
-	      return 0;
-	    });
-	  }
-
-	  next(id) {
-	    var current, next;
-	    current = this._jobs[id];
-	    next = current + 1;
-	    if ((current != null) && next < this.status.length) {
-	      this.counts[current]--;
-	      this.counts[next]++;
-	      return this._jobs[id]++;
-	    } else if (current != null) {
-	      this.counts[current]--;
-	      return delete this._jobs[id];
-	    }
-	  }
-
-	  start(id) {
-	    var initial;
-	    initial = 0;
-	    this._jobs[id] = initial;
-	    return this.counts[initial]++;
-	  }
-
-	  remove(id) {
-	    var current;
-	    current = this._jobs[id];
-	    if (current != null) {
-	      this.counts[current]--;
-	      delete this._jobs[id];
-	    }
-	    return current != null;
-	  }
-
-	  jobStatus(id) {
-	    var ref;
-	    return (ref = this.status[this._jobs[id]]) != null ? ref : null;
-	  }
-
-	  statusJobs(status) {
-	    var k, pos, ref, results, v;
-	    if (status != null) {
-	      pos = this.status.indexOf(status);
-	      if (pos < 0) {
-	        throw new BottleneckError$3(`status must be one of ${this.status.join(', ')}`);
-	      }
-	      ref = this._jobs;
-	      results = [];
-	      for (k in ref) {
-	        v = ref[k];
-	        if (v === pos) {
-	          results.push(k);
-	        }
-	      }
-	      return results;
-	    } else {
-	      return Object.keys(this._jobs);
-	    }
-	  }
-
-	  statusCounts() {
-	    return this.counts.reduce(((acc, v, i) => {
-	      acc[this.status[i]] = v;
-	      return acc;
-	    }), {});
-	  }
-
-	};
-
-	var States_1 = States;
-
-	var DLList$2, Sync;
-
-	DLList$2 = DLList_1;
-
-	Sync = class Sync {
-	  constructor(name, Promise) {
-	    this.schedule = this.schedule.bind(this);
-	    this.name = name;
-	    this.Promise = Promise;
-	    this._running = 0;
-	    this._queue = new DLList$2();
-	  }
-
-	  isEmpty() {
-	    return this._queue.length === 0;
-	  }
-
-	  async _tryToRun() {
-	    var args, cb, error, reject, resolve, returned, task;
-	    if ((this._running < 1) && this._queue.length > 0) {
-	      this._running++;
-	      ({task, args, resolve, reject} = this._queue.shift());
-	      cb = (await (async function() {
-	        try {
-	          returned = (await task(...args));
-	          return function() {
-	            return resolve(returned);
-	          };
-	        } catch (error1) {
-	          error = error1;
-	          return function() {
-	            return reject(error);
-	          };
-	        }
-	      })());
-	      this._running--;
-	      this._tryToRun();
-	      return cb();
-	    }
-	  }
-
-	  schedule(task, ...args) {
-	    var promise, reject, resolve;
-	    resolve = reject = null;
-	    promise = new this.Promise(function(_resolve, _reject) {
-	      resolve = _resolve;
-	      return reject = _reject;
-	    });
-	    this._queue.push({task, args, resolve, reject});
-	    this._tryToRun();
-	    return promise;
-	  }
-
-	};
-
-	var Sync_1 = Sync;
-
-	var version = "2.19.5";
-	var version$1 = {
-		version: version
-	};
-
-	var version$2 = /*#__PURE__*/Object.freeze({
-		version: version,
-		default: version$1
-	});
-
-	var require$$2 = () => console.log('You must import the full version of Bottleneck in order to use this feature.');
-
-	var require$$3 = () => console.log('You must import the full version of Bottleneck in order to use this feature.');
-
-	var require$$4 = () => console.log('You must import the full version of Bottleneck in order to use this feature.');
-
-	var Events$2, Group, IORedisConnection$1, RedisConnection$1, Scripts$1, parser$3;
-
-	parser$3 = parser;
-
-	Events$2 = Events_1;
-
-	RedisConnection$1 = require$$2;
-
-	IORedisConnection$1 = require$$3;
-
-	Scripts$1 = require$$4;
-
-	Group = (function() {
-	  class Group {
-	    constructor(limiterOptions = {}) {
-	      this.deleteKey = this.deleteKey.bind(this);
-	      this.limiterOptions = limiterOptions;
-	      parser$3.load(this.limiterOptions, this.defaults, this);
-	      this.Events = new Events$2(this);
-	      this.instances = {};
-	      this.Bottleneck = Bottleneck_1;
-	      this._startAutoCleanup();
-	      this.sharedConnection = this.connection != null;
-	      if (this.connection == null) {
-	        if (this.limiterOptions.datastore === "redis") {
-	          this.connection = new RedisConnection$1(Object.assign({}, this.limiterOptions, {Events: this.Events}));
-	        } else if (this.limiterOptions.datastore === "ioredis") {
-	          this.connection = new IORedisConnection$1(Object.assign({}, this.limiterOptions, {Events: this.Events}));
-	        }
-	      }
-	    }
-
-	    key(key = "") {
-	      var ref;
-	      return (ref = this.instances[key]) != null ? ref : (() => {
-	        var limiter;
-	        limiter = this.instances[key] = new this.Bottleneck(Object.assign(this.limiterOptions, {
-	          id: `${this.id}-${key}`,
-	          timeout: this.timeout,
-	          connection: this.connection
-	        }));
-	        this.Events.trigger("created", limiter, key);
-	        return limiter;
-	      })();
-	    }
-
-	    async deleteKey(key = "") {
-	      var deleted, instance;
-	      instance = this.instances[key];
-	      if (this.connection) {
-	        deleted = (await this.connection.__runCommand__(['del', ...Scripts$1.allKeys(`${this.id}-${key}`)]));
-	      }
-	      if (instance != null) {
-	        delete this.instances[key];
-	        await instance.disconnect();
-	      }
-	      return (instance != null) || deleted > 0;
-	    }
-
-	    limiters() {
-	      var k, ref, results, v;
-	      ref = this.instances;
-	      results = [];
-	      for (k in ref) {
-	        v = ref[k];
-	        results.push({
-	          key: k,
-	          limiter: v
-	        });
-	      }
-	      return results;
-	    }
-
-	    keys() {
-	      return Object.keys(this.instances);
-	    }
-
-	    async clusterKeys() {
-	      var cursor, end, found, i, k, keys, len, next, start;
-	      if (this.connection == null) {
-	        return this.Promise.resolve(this.keys());
-	      }
-	      keys = [];
-	      cursor = null;
-	      start = `b_${this.id}-`.length;
-	      end = "_settings".length;
-	      while (cursor !== 0) {
-	        [next, found] = (await this.connection.__runCommand__(["scan", cursor != null ? cursor : 0, "match", `b_${this.id}-*_settings`, "count", 10000]));
-	        cursor = ~~next;
-	        for (i = 0, len = found.length; i < len; i++) {
-	          k = found[i];
-	          keys.push(k.slice(start, -end));
-	        }
-	      }
-	      return keys;
-	    }
-
-	    _startAutoCleanup() {
-	      var base;
-	      clearInterval(this.interval);
-	      return typeof (base = (this.interval = setInterval(async() => {
-	        var e, k, ref, results, time, v;
-	        time = Date.now();
-	        ref = this.instances;
-	        results = [];
-	        for (k in ref) {
-	          v = ref[k];
-	          try {
-	            if ((await v._store.__groupCheck__(time))) {
-	              results.push(this.deleteKey(k));
-	            } else {
-	              results.push(void 0);
-	            }
-	          } catch (error) {
-	            e = error;
-	            results.push(v.Events.trigger("error", e));
-	          }
-	        }
-	        return results;
-	      }, this.timeout / 2))).unref === "function" ? base.unref() : void 0;
-	    }
-
-	    updateSettings(options = {}) {
-	      parser$3.overwrite(options, this.defaults, this);
-	      parser$3.overwrite(options, options, this.limiterOptions);
-	      if (options.timeout != null) {
-	        return this._startAutoCleanup();
-	      }
-	    }
-
-	    disconnect(flush = true) {
-	      var ref;
-	      if (!this.sharedConnection) {
-	        return (ref = this.connection) != null ? ref.disconnect(flush) : void 0;
-	      }
-	    }
-
-	  }
-	  Group.prototype.defaults = {
-	    timeout: 1000 * 60 * 5,
-	    connection: null,
-	    Promise: Promise,
-	    id: "group-key"
-	  };
-
-	  return Group;
-
-	}).call(commonjsGlobal);
-
-	var Group_1 = Group;
-
-	var Batcher, Events$3, parser$4;
-
-	parser$4 = parser;
-
-	Events$3 = Events_1;
-
-	Batcher = (function() {
-	  class Batcher {
-	    constructor(options = {}) {
-	      this.options = options;
-	      parser$4.load(this.options, this.defaults, this);
-	      this.Events = new Events$3(this);
-	      this._arr = [];
-	      this._resetPromise();
-	      this._lastFlush = Date.now();
-	    }
-
-	    _resetPromise() {
-	      return this._promise = new this.Promise((res, rej) => {
-	        return this._resolve = res;
-	      });
-	    }
-
-	    _flush() {
-	      clearTimeout(this._timeout);
-	      this._lastFlush = Date.now();
-	      this._resolve();
-	      this.Events.trigger("batch", this._arr);
-	      this._arr = [];
-	      return this._resetPromise();
-	    }
-
-	    add(data) {
-	      var ret;
-	      this._arr.push(data);
-	      ret = this._promise;
-	      if (this._arr.length === this.maxSize) {
-	        this._flush();
-	      } else if ((this.maxTime != null) && this._arr.length === 1) {
-	        this._timeout = setTimeout(() => {
-	          return this._flush();
-	        }, this.maxTime);
-	      }
-	      return ret;
-	    }
-
-	  }
-	  Batcher.prototype.defaults = {
-	    maxTime: null,
-	    maxSize: null,
-	    Promise: Promise
-	  };
-
-	  return Batcher;
-
-	}).call(commonjsGlobal);
-
-	var Batcher_1 = Batcher;
-
-	var require$$4$1 = () => console.log('You must import the full version of Bottleneck in order to use this feature.');
-
-	var require$$8 = getCjsExportFromNamespace(version$2);
-
-	var Bottleneck, DEFAULT_PRIORITY$1, Events$4, Job$1, LocalDatastore$1, NUM_PRIORITIES$1, Queues$1, RedisDatastore$1, States$1, Sync$1, parser$5,
-	  splice = [].splice;
-
-	NUM_PRIORITIES$1 = 10;
-
-	DEFAULT_PRIORITY$1 = 5;
-
-	parser$5 = parser;
-
-	Queues$1 = Queues_1;
-
-	Job$1 = Job_1;
-
-	LocalDatastore$1 = LocalDatastore_1;
-
-	RedisDatastore$1 = require$$4$1;
-
-	Events$4 = Events_1;
-
-	States$1 = States_1;
-
-	Sync$1 = Sync_1;
-
-	Bottleneck = (function() {
-	  class Bottleneck {
-	    constructor(options = {}, ...invalid) {
-	      var storeInstanceOptions, storeOptions;
-	      this._addToQueue = this._addToQueue.bind(this);
-	      this._validateOptions(options, invalid);
-	      parser$5.load(options, this.instanceDefaults, this);
-	      this._queues = new Queues$1(NUM_PRIORITIES$1);
-	      this._scheduled = {};
-	      this._states = new States$1(["RECEIVED", "QUEUED", "RUNNING", "EXECUTING"].concat(this.trackDoneStatus ? ["DONE"] : []));
-	      this._limiter = null;
-	      this.Events = new Events$4(this);
-	      this._submitLock = new Sync$1("submit", this.Promise);
-	      this._registerLock = new Sync$1("register", this.Promise);
-	      storeOptions = parser$5.load(options, this.storeDefaults, {});
-	      this._store = (function() {
-	        if (this.datastore === "redis" || this.datastore === "ioredis" || (this.connection != null)) {
-	          storeInstanceOptions = parser$5.load(options, this.redisStoreDefaults, {});
-	          return new RedisDatastore$1(this, storeOptions, storeInstanceOptions);
-	        } else if (this.datastore === "local") {
-	          storeInstanceOptions = parser$5.load(options, this.localStoreDefaults, {});
-	          return new LocalDatastore$1(this, storeOptions, storeInstanceOptions);
-	        } else {
-	          throw new Bottleneck.prototype.BottleneckError(`Invalid datastore type: ${this.datastore}`);
-	        }
-	      }).call(this);
-	      this._queues.on("leftzero", () => {
-	        var ref;
-	        return (ref = this._store.heartbeat) != null ? typeof ref.ref === "function" ? ref.ref() : void 0 : void 0;
-	      });
-	      this._queues.on("zero", () => {
-	        var ref;
-	        return (ref = this._store.heartbeat) != null ? typeof ref.unref === "function" ? ref.unref() : void 0 : void 0;
-	      });
-	    }
-
-	    _validateOptions(options, invalid) {
-	      if (!((options != null) && typeof options === "object" && invalid.length === 0)) {
-	        throw new Bottleneck.prototype.BottleneckError("Bottleneck v2 takes a single object argument. Refer to https://github.com/SGrondin/bottleneck#upgrading-to-v2 if you're upgrading from Bottleneck v1.");
-	      }
-	    }
-
-	    ready() {
-	      return this._store.ready;
-	    }
-
-	    clients() {
-	      return this._store.clients;
-	    }
-
-	    channel() {
-	      return `b_${this.id}`;
-	    }
-
-	    channel_client() {
-	      return `b_${this.id}_${this._store.clientId}`;
-	    }
-
-	    publish(message) {
-	      return this._store.__publish__(message);
-	    }
-
-	    disconnect(flush = true) {
-	      return this._store.__disconnect__(flush);
-	    }
-
-	    chain(_limiter) {
-	      this._limiter = _limiter;
-	      return this;
-	    }
-
-	    queued(priority) {
-	      return this._queues.queued(priority);
-	    }
-
-	    clusterQueued() {
-	      return this._store.__queued__();
-	    }
-
-	    empty() {
-	      return this.queued() === 0 && this._submitLock.isEmpty();
-	    }
-
-	    running() {
-	      return this._store.__running__();
-	    }
-
-	    done() {
-	      return this._store.__done__();
-	    }
-
-	    jobStatus(id) {
-	      return this._states.jobStatus(id);
-	    }
-
-	    jobs(status) {
-	      return this._states.statusJobs(status);
-	    }
-
-	    counts() {
-	      return this._states.statusCounts();
-	    }
-
-	    _randomIndex() {
-	      return Math.random().toString(36).slice(2);
-	    }
-
-	    check(weight = 1) {
-	      return this._store.__check__(weight);
-	    }
-
-	    _clearGlobalState(index) {
-	      if (this._scheduled[index] != null) {
-	        clearTimeout(this._scheduled[index].expiration);
-	        delete this._scheduled[index];
-	        return true;
-	      } else {
-	        return false;
-	      }
-	    }
-
-	    async _free(index, job, options, eventInfo) {
-	      var e, running;
-	      try {
-	        ({running} = (await this._store.__free__(index, options.weight)));
-	        this.Events.trigger("debug", `Freed ${options.id}`, eventInfo);
-	        if (running === 0 && this.empty()) {
-	          return this.Events.trigger("idle");
-	        }
-	      } catch (error1) {
-	        e = error1;
-	        return this.Events.trigger("error", e);
-	      }
-	    }
-
-	    _run(index, job, wait) {
-	      var clearGlobalState, free, run;
-	      job.doRun();
-	      clearGlobalState = this._clearGlobalState.bind(this, index);
-	      run = this._run.bind(this, index, job);
-	      free = this._free.bind(this, index, job);
-	      return this._scheduled[index] = {
-	        timeout: setTimeout(() => {
-	          return job.doExecute(this._limiter, clearGlobalState, run, free);
-	        }, wait),
-	        expiration: job.options.expiration != null ? setTimeout(function() {
-	          return job.doExpire(clearGlobalState, run, free);
-	        }, wait + job.options.expiration) : void 0,
-	        job: job
-	      };
-	    }
-
-	    _drainOne(capacity) {
-	      return this._registerLock.schedule(() => {
-	        var args, index, next, options, queue;
-	        if (this.queued() === 0) {
-	          return this.Promise.resolve(null);
-	        }
-	        queue = this._queues.getFirst();
-	        ({options, args} = next = queue.first());
-	        if ((capacity != null) && options.weight > capacity) {
-	          return this.Promise.resolve(null);
-	        }
-	        this.Events.trigger("debug", `Draining ${options.id}`, {args, options});
-	        index = this._randomIndex();
-	        return this._store.__register__(index, options.weight, options.expiration).then(({success, wait, reservoir}) => {
-	          var empty;
-	          this.Events.trigger("debug", `Drained ${options.id}`, {success, args, options});
-	          if (success) {
-	            queue.shift();
-	            empty = this.empty();
-	            if (empty) {
-	              this.Events.trigger("empty");
-	            }
-	            if (reservoir === 0) {
-	              this.Events.trigger("depleted", empty);
-	            }
-	            this._run(index, next, wait);
-	            return this.Promise.resolve(options.weight);
-	          } else {
-	            return this.Promise.resolve(null);
-	          }
-	        });
-	      });
-	    }
-
-	    _drainAll(capacity, total = 0) {
-	      return this._drainOne(capacity).then((drained) => {
-	        var newCapacity;
-	        if (drained != null) {
-	          newCapacity = capacity != null ? capacity - drained : capacity;
-	          return this._drainAll(newCapacity, total + drained);
-	        } else {
-	          return this.Promise.resolve(total);
-	        }
-	      }).catch((e) => {
-	        return this.Events.trigger("error", e);
-	      });
-	    }
-
-	    _dropAllQueued(message) {
-	      return this._queues.shiftAll(function(job) {
-	        return job.doDrop({message});
-	      });
-	    }
-
-	    stop(options = {}) {
-	      var done, waitForExecuting;
-	      options = parser$5.load(options, this.stopDefaults);
-	      waitForExecuting = (at) => {
-	        var finished;
-	        finished = () => {
-	          var counts;
-	          counts = this._states.counts;
-	          return (counts[0] + counts[1] + counts[2] + counts[3]) === at;
-	        };
-	        return new this.Promise((resolve, reject) => {
-	          if (finished()) {
-	            return resolve();
-	          } else {
-	            return this.on("done", () => {
-	              if (finished()) {
-	                this.removeAllListeners("done");
-	                return resolve();
-	              }
-	            });
-	          }
-	        });
-	      };
-	      done = options.dropWaitingJobs ? (this._run = function(index, next) {
-	        return next.doDrop({
-	          message: options.dropErrorMessage
-	        });
-	      }, this._drainOne = () => {
-	        return this.Promise.resolve(null);
-	      }, this._registerLock.schedule(() => {
-	        return this._submitLock.schedule(() => {
-	          var k, ref, v;
-	          ref = this._scheduled;
-	          for (k in ref) {
-	            v = ref[k];
-	            if (this.jobStatus(v.job.options.id) === "RUNNING") {
-	              clearTimeout(v.timeout);
-	              clearTimeout(v.expiration);
-	              v.job.doDrop({
-	                message: options.dropErrorMessage
-	              });
-	            }
-	          }
-	          this._dropAllQueued(options.dropErrorMessage);
-	          return waitForExecuting(0);
-	        });
-	      })) : this.schedule({
-	        priority: NUM_PRIORITIES$1 - 1,
-	        weight: 0
-	      }, () => {
-	        return waitForExecuting(1);
-	      });
-	      this._receive = function(job) {
-	        return job._reject(new Bottleneck.prototype.BottleneckError(options.enqueueErrorMessage));
-	      };
-	      this.stop = () => {
-	        return this.Promise.reject(new Bottleneck.prototype.BottleneckError("stop() has already been called"));
-	      };
-	      return done;
-	    }
-
-	    async _addToQueue(job) {
-	      var args, blocked, error, options, reachedHWM, shifted, strategy;
-	      ({args, options} = job);
-	      try {
-	        ({reachedHWM, blocked, strategy} = (await this._store.__submit__(this.queued(), options.weight)));
-	      } catch (error1) {
-	        error = error1;
-	        this.Events.trigger("debug", `Could not queue ${options.id}`, {args, options, error});
-	        job.doDrop({error});
-	        return false;
-	      }
-	      if (blocked) {
-	        job.doDrop();
-	        return true;
-	      } else if (reachedHWM) {
-	        shifted = strategy === Bottleneck.prototype.strategy.LEAK ? this._queues.shiftLastFrom(options.priority) : strategy === Bottleneck.prototype.strategy.OVERFLOW_PRIORITY ? this._queues.shiftLastFrom(options.priority + 1) : strategy === Bottleneck.prototype.strategy.OVERFLOW ? job : void 0;
-	        if (shifted != null) {
-	          shifted.doDrop();
-	        }
-	        if ((shifted == null) || strategy === Bottleneck.prototype.strategy.OVERFLOW) {
-	          if (shifted == null) {
-	            job.doDrop();
-	          }
-	          return reachedHWM;
-	        }
-	      }
-	      job.doQueue(reachedHWM, blocked);
-	      this._queues.push(job);
-	      await this._drainAll();
-	      return reachedHWM;
-	    }
-
-	    _receive(job) {
-	      if (this._states.jobStatus(job.options.id) != null) {
-	        job._reject(new Bottleneck.prototype.BottleneckError(`A job with the same id already exists (id=${job.options.id})`));
-	        return false;
-	      } else {
-	        job.doReceive();
-	        return this._submitLock.schedule(this._addToQueue, job);
-	      }
-	    }
-
-	    submit(...args) {
-	      var cb, fn, job, options, ref, ref1, task;
-	      if (typeof args[0] === "function") {
-	        ref = args, [fn, ...args] = ref, [cb] = splice.call(args, -1);
-	        options = parser$5.load({}, this.jobDefaults);
-	      } else {
-	        ref1 = args, [options, fn, ...args] = ref1, [cb] = splice.call(args, -1);
-	        options = parser$5.load(options, this.jobDefaults);
-	      }
-	      task = (...args) => {
-	        return new this.Promise(function(resolve, reject) {
-	          return fn(...args, function(...args) {
-	            return (args[0] != null ? reject : resolve)(args);
-	          });
-	        });
-	      };
-	      job = new Job$1(task, args, options, this.jobDefaults, this.rejectOnDrop, this.Events, this._states, this.Promise);
-	      job.promise.then(function(args) {
-	        return typeof cb === "function" ? cb(...args) : void 0;
-	      }).catch(function(args) {
-	        if (Array.isArray(args)) {
-	          return typeof cb === "function" ? cb(...args) : void 0;
-	        } else {
-	          return typeof cb === "function" ? cb(args) : void 0;
-	        }
-	      });
-	      return this._receive(job);
-	    }
-
-	    schedule(...args) {
-	      var job, options, task;
-	      if (typeof args[0] === "function") {
-	        [task, ...args] = args;
-	        options = {};
-	      } else {
-	        [options, task, ...args] = args;
-	      }
-	      job = new Job$1(task, args, options, this.jobDefaults, this.rejectOnDrop, this.Events, this._states, this.Promise);
-	      this._receive(job);
-	      return job.promise;
-	    }
-
-	    wrap(fn) {
-	      var schedule, wrapped;
-	      schedule = this.schedule.bind(this);
-	      wrapped = function(...args) {
-	        return schedule(fn.bind(this), ...args);
-	      };
-	      wrapped.withOptions = function(options, ...args) {
-	        return schedule(options, fn, ...args);
-	      };
-	      return wrapped;
-	    }
-
-	    async updateSettings(options = {}) {
-	      await this._store.__updateSettings__(parser$5.overwrite(options, this.storeDefaults));
-	      parser$5.overwrite(options, this.instanceDefaults, this);
-	      return this;
-	    }
-
-	    currentReservoir() {
-	      return this._store.__currentReservoir__();
-	    }
-
-	    incrementReservoir(incr = 0) {
-	      return this._store.__incrementReservoir__(incr);
-	    }
-
-	  }
-	  Bottleneck.default = Bottleneck;
-
-	  Bottleneck.Events = Events$4;
-
-	  Bottleneck.version = Bottleneck.prototype.version = require$$8.version;
-
-	  Bottleneck.strategy = Bottleneck.prototype.strategy = {
-	    LEAK: 1,
-	    OVERFLOW: 2,
-	    OVERFLOW_PRIORITY: 4,
-	    BLOCK: 3
-	  };
-
-	  Bottleneck.BottleneckError = Bottleneck.prototype.BottleneckError = BottleneckError_1;
-
-	  Bottleneck.Group = Bottleneck.prototype.Group = Group_1;
-
-	  Bottleneck.RedisConnection = Bottleneck.prototype.RedisConnection = require$$2;
-
-	  Bottleneck.IORedisConnection = Bottleneck.prototype.IORedisConnection = require$$3;
-
-	  Bottleneck.Batcher = Bottleneck.prototype.Batcher = Batcher_1;
-
-	  Bottleneck.prototype.jobDefaults = {
-	    priority: DEFAULT_PRIORITY$1,
-	    weight: 1,
-	    expiration: null,
-	    id: "<no-id>"
-	  };
-
-	  Bottleneck.prototype.storeDefaults = {
-	    maxConcurrent: null,
-	    minTime: 0,
-	    highWater: null,
-	    strategy: Bottleneck.prototype.strategy.LEAK,
-	    penalty: null,
-	    reservoir: null,
-	    reservoirRefreshInterval: null,
-	    reservoirRefreshAmount: null,
-	    reservoirIncreaseInterval: null,
-	    reservoirIncreaseAmount: null,
-	    reservoirIncreaseMaximum: null
-	  };
-
-	  Bottleneck.prototype.localStoreDefaults = {
-	    Promise: Promise,
-	    timeout: null,
-	    heartbeatInterval: 250
-	  };
-
-	  Bottleneck.prototype.redisStoreDefaults = {
-	    Promise: Promise,
-	    timeout: null,
-	    heartbeatInterval: 5000,
-	    clientTimeout: 10000,
-	    Redis: null,
-	    clientOptions: {},
-	    clusterNodes: null,
-	    clearDatastore: false,
-	    connection: null
-	  };
-
-	  Bottleneck.prototype.instanceDefaults = {
-	    datastore: "local",
-	    connection: null,
-	    id: "<no-id>",
-	    rejectOnDrop: true,
-	    trackDoneStatus: false,
-	    Promise: Promise
-	  };
-
-	  Bottleneck.prototype.stopDefaults = {
-	    enqueueErrorMessage: "This limiter has been stopped and cannot accept new jobs.",
-	    dropWaitingJobs: true,
-	    dropErrorMessage: "This limiter has been stopped."
-	  };
-
-	  return Bottleneck;
-
-	}).call(commonjsGlobal);
-
-	var Bottleneck_1 = Bottleneck;
-
-	var lib = Bottleneck_1;
-
-	return lib;
-
-})));
-
-
-/***/ }),
-
-/***/ 8932:
-/***/ ((__unused_webpack_module, exports) => {
-
-"use strict";
-
-
-Object.defineProperty(exports, "__esModule", ({ value: true }));
-
-class Deprecation extends Error {
-  constructor(message) {
-    super(message); // Maintains proper stack trace (only available on V8)
-
-    /* istanbul ignore next */
-
-    if (Error.captureStackTrace) {
-      Error.captureStackTrace(this, this.constructor);
-    }
-
-    this.name = 'Deprecation';
-  }
-
-}
-
-exports.Deprecation = Deprecation;
-
-
-/***/ }),
-
-/***/ 3287:
-/***/ ((__unused_webpack_module, exports) => {
-
-"use strict";
-
-
-Object.defineProperty(exports, "__esModule", ({ value: true }));
-
-/*!
- * is-plain-object <https://github.com/jonschlinkert/is-plain-object>
- *
- * Copyright (c) 2014-2017, Jon Schlinkert.
- * Released under the MIT License.
- */
-
-function isObject(o) {
-  return Object.prototype.toString.call(o) === '[object Object]';
-}
-
-function isPlainObject(o) {
-  var ctor,prot;
-
-  if (isObject(o) === false) return false;
-
-  // If has modified constructor
-  ctor = o.constructor;
-  if (ctor === undefined) return true;
-
-  // If has modified prototype
-  prot = ctor.prototype;
-  if (isObject(prot) === false) return false;
-
-  // If constructor does not have an Object-specific method
-  if (prot.hasOwnProperty('isPrototypeOf') === false) {
-    return false;
-  }
-
-  // Most likely a plain Object
-  return true;
-}
-
-exports.isPlainObject = isPlainObject;
-
-
-/***/ }),
-
-/***/ 467:
-/***/ ((module, exports, __nccwpck_require__) => {
-
-"use strict";
-
-
-Object.defineProperty(exports, "__esModule", ({ value: true }));
-
-function _interopDefault (ex) { return (ex && (typeof ex === 'object') && 'default' in ex) ? ex['default'] : ex; }
-
-var Stream = _interopDefault(__nccwpck_require__(2781));
-var http = _interopDefault(__nccwpck_require__(3685));
-var Url = _interopDefault(__nccwpck_require__(7310));
-var whatwgUrl = _interopDefault(__nccwpck_require__(3323));
-var https = _interopDefault(__nccwpck_require__(5687));
-var zlib = _interopDefault(__nccwpck_require__(9796));
-
-// Based on https://github.com/tmpvar/jsdom/blob/aa85b2abf07766ff7bf5c1f6daafb3726f2f2db5/lib/jsdom/living/blob.js
-
-// fix for "Readable" isn't a named export issue
-const Readable = Stream.Readable;
-
-const BUFFER = Symbol('buffer');
-const TYPE = Symbol('type');
-
-class Blob {
-	constructor() {
-		this[TYPE] = '';
-
-		const blobParts = arguments[0];
-		const options = arguments[1];
-
-		const buffers = [];
-		let size = 0;
-
-		if (blobParts) {
-			const a = blobParts;
-			const length = Number(a.length);
-			for (let i = 0; i < length; i++) {
-				const element = a[i];
-				let buffer;
-				if (element instanceof Buffer) {
-					buffer = element;
-				} else if (ArrayBuffer.isView(element)) {
-					buffer = Buffer.from(element.buffer, element.byteOffset, element.byteLength);
-				} else if (element instanceof ArrayBuffer) {
-					buffer = Buffer.from(element);
-				} else if (element instanceof Blob) {
-					buffer = element[BUFFER];
-				} else {
-					buffer = Buffer.from(typeof element === 'string' ? element : String(element));
-				}
-				size += buffer.length;
-				buffers.push(buffer);
-			}
-		}
-
-		this[BUFFER] = Buffer.concat(buffers);
-
-		let type = options && options.type !== undefined && String(options.type).toLowerCase();
-		if (type && !/[^\u0020-\u007E]/.test(type)) {
-			this[TYPE] = type;
-		}
-	}
-	get size() {
-		return this[BUFFER].length;
-	}
-	get type() {
-		return this[TYPE];
-	}
-	text() {
-		return Promise.resolve(this[BUFFER].toString());
-	}
-	arrayBuffer() {
-		const buf = this[BUFFER];
-		const ab = buf.buffer.slice(buf.byteOffset, buf.byteOffset + buf.byteLength);
-		return Promise.resolve(ab);
-	}
-	stream() {
-		const readable = new Readable();
-		readable._read = function () {};
-		readable.push(this[BUFFER]);
-		readable.push(null);
-		return readable;
-	}
-	toString() {
-		return '[object Blob]';
-	}
-	slice() {
-		const size = this.size;
-
-		const start = arguments[0];
-		const end = arguments[1];
-		let relativeStart, relativeEnd;
-		if (start === undefined) {
-			relativeStart = 0;
-		} else if (start < 0) {
-			relativeStart = Math.max(size + start, 0);
-		} else {
-			relativeStart = Math.min(start, size);
-		}
-		if (end === undefined) {
-			relativeEnd = size;
-		} else if (end < 0) {
-			relativeEnd = Math.max(size + end, 0);
-		} else {
-			relativeEnd = Math.min(end, size);
-		}
-		const span = Math.max(relativeEnd - relativeStart, 0);
-
-		const buffer = this[BUFFER];
-		const slicedBuffer = buffer.slice(relativeStart, relativeStart + span);
-		const blob = new Blob([], { type: arguments[2] });
-		blob[BUFFER] = slicedBuffer;
-		return blob;
-	}
-}
-
-Object.defineProperties(Blob.prototype, {
-	size: { enumerable: true },
-	type: { enumerable: true },
-	slice: { enumerable: true }
-});
-
-Object.defineProperty(Blob.prototype, Symbol.toStringTag, {
-	value: 'Blob',
-	writable: false,
-	enumerable: false,
-	configurable: true
-});
-
-/**
- * fetch-error.js
- *
- * FetchError interface for operational errors
- */
-
-/**
- * Create FetchError instance
- *
- * @param   String      message      Error message for human
- * @param   String      type         Error type for machine
- * @param   String      systemError  For Node.js system error
- * @return  FetchError
- */
-function FetchError(message, type, systemError) {
-  Error.call(this, message);
-
-  this.message = message;
-  this.type = type;
-
-  // when err.type is `system`, err.code contains system error code
-  if (systemError) {
-    this.code = this.errno = systemError.code;
-  }
-
-  // hide custom error implementation details from end-users
-  Error.captureStackTrace(this, this.constructor);
-}
-
-FetchError.prototype = Object.create(Error.prototype);
-FetchError.prototype.constructor = FetchError;
-FetchError.prototype.name = 'FetchError';
-
-let convert;
-try {
-	convert = (__nccwpck_require__(2877).convert);
-} catch (e) {}
-
-const INTERNALS = Symbol('Body internals');
-
-// fix an issue where "PassThrough" isn't a named export for node <10
-const PassThrough = Stream.PassThrough;
-
-/**
- * Body mixin
- *
- * Ref: https://fetch.spec.whatwg.org/#body
- *
- * @param   Stream  body  Readable stream
- * @param   Object  opts  Response options
- * @return  Void
- */
-function Body(body) {
-	var _this = this;
-
-	var _ref = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {},
-	    _ref$size = _ref.size;
-
-	let size = _ref$size === undefined ? 0 : _ref$size;
-	var _ref$timeout = _ref.timeout;
-	let timeout = _ref$timeout === undefined ? 0 : _ref$timeout;
-
-	if (body == null) {
-		// body is undefined or null
-		body = null;
-	} else if (isURLSearchParams(body)) {
-		// body is a URLSearchParams
-		body = Buffer.from(body.toString());
-	} else if (isBlob(body)) ; else if (Buffer.isBuffer(body)) ; else if (Object.prototype.toString.call(body) === '[object ArrayBuffer]') {
-		// body is ArrayBuffer
-		body = Buffer.from(body);
-	} else if (ArrayBuffer.isView(body)) {
-		// body is ArrayBufferView
-		body = Buffer.from(body.buffer, body.byteOffset, body.byteLength);
-	} else if (body instanceof Stream) ; else {
-		// none of the above
-		// coerce to string then buffer
-		body = Buffer.from(String(body));
-	}
-	this[INTERNALS] = {
-		body,
-		disturbed: false,
-		error: null
-	};
-	this.size = size;
-	this.timeout = timeout;
-
-	if (body instanceof Stream) {
-		body.on('error', function (err) {
-			const error = err.name === 'AbortError' ? err : new FetchError(`Invalid response body while trying to fetch ${_this.url}: ${err.message}`, 'system', err);
-			_this[INTERNALS].error = error;
-		});
-	}
-}
-
-Body.prototype = {
-	get body() {
-		return this[INTERNALS].body;
-	},
-
-	get bodyUsed() {
-		return this[INTERNALS].disturbed;
-	},
-
-	/**
-  * Decode response as ArrayBuffer
-  *
-  * @return  Promise
-  */
-	arrayBuffer() {
-		return consumeBody.call(this).then(function (buf) {
-			return buf.buffer.slice(buf.byteOffset, buf.byteOffset + buf.byteLength);
-		});
-	},
-
-	/**
-  * Return raw response as Blob
-  *
-  * @return Promise
-  */
-	blob() {
-		let ct = this.headers && this.headers.get('content-type') || '';
-		return consumeBody.call(this).then(function (buf) {
-			return Object.assign(
-			// Prevent copying
-			new Blob([], {
-				type: ct.toLowerCase()
-			}), {
-				[BUFFER]: buf
-			});
-		});
-	},
-
-	/**
-  * Decode response as json
-  *
-  * @return  Promise
-  */
-	json() {
-		var _this2 = this;
-
-		return consumeBody.call(this).then(function (buffer) {
-			try {
-				return JSON.parse(buffer.toString());
-			} catch (err) {
-				return Body.Promise.reject(new FetchError(`invalid json response body at ${_this2.url} reason: ${err.message}`, 'invalid-json'));
-			}
-		});
-	},
-
-	/**
-  * Decode response as text
-  *
-  * @return  Promise
-  */
-	text() {
-		return consumeBody.call(this).then(function (buffer) {
-			return buffer.toString();
-		});
-	},
-
-	/**
-  * Decode response as buffer (non-spec api)
-  *
-  * @return  Promise
-  */
-	buffer() {
-		return consumeBody.call(this);
-	},
-
-	/**
-  * Decode response as text, while automatically detecting the encoding and
-  * trying to decode to UTF-8 (non-spec api)
-  *
-  * @return  Promise
-  */
-	textConverted() {
-		var _this3 = this;
-
-		return consumeBody.call(this).then(function (buffer) {
-			return convertBody(buffer, _this3.headers);
-		});
-	}
-};
-
-// In browsers, all properties are enumerable.
-Object.defineProperties(Body.prototype, {
-	body: { enumerable: true },
-	bodyUsed: { enumerable: true },
-	arrayBuffer: { enumerable: true },
-	blob: { enumerable: true },
-	json: { enumerable: true },
-	text: { enumerable: true }
-});
-
-Body.mixIn = function (proto) {
-	for (const name of Object.getOwnPropertyNames(Body.prototype)) {
-		// istanbul ignore else: future proof
-		if (!(name in proto)) {
-			const desc = Object.getOwnPropertyDescriptor(Body.prototype, name);
-			Object.defineProperty(proto, name, desc);
-		}
-	}
-};
-
-/**
- * Consume and convert an entire Body to a Buffer.
- *
- * Ref: https://fetch.spec.whatwg.org/#concept-body-consume-body
- *
- * @return  Promise
- */
-function consumeBody() {
-	var _this4 = this;
-
-	if (this[INTERNALS].disturbed) {
-		return Body.Promise.reject(new TypeError(`body used already for: ${this.url}`));
-	}
-
-	this[INTERNALS].disturbed = true;
-
-	if (this[INTERNALS].error) {
-		return Body.Promise.reject(this[INTERNALS].error);
-	}
-
-	let body = this.body;
-
-	// body is null
-	if (body === null) {
-		return Body.Promise.resolve(Buffer.alloc(0));
-	}
-
-	// body is blob
-	if (isBlob(body)) {
-		body = body.stream();
-	}
-
-	// body is buffer
-	if (Buffer.isBuffer(body)) {
-		return Body.Promise.resolve(body);
-	}
-
-	// istanbul ignore if: should never happen
-	if (!(body instanceof Stream)) {
-		return Body.Promise.resolve(Buffer.alloc(0));
-	}
-
-	// body is stream
-	// get ready to actually consume the body
-	let accum = [];
-	let accumBytes = 0;
-	let abort = false;
-
-	return new Body.Promise(function (resolve, reject) {
-		let resTimeout;
-
-		// allow timeout on slow response body
-		if (_this4.timeout) {
-			resTimeout = setTimeout(function () {
-				abort = true;
-				reject(new FetchError(`Response timeout while trying to fetch ${_this4.url} (over ${_this4.timeout}ms)`, 'body-timeout'));
-			}, _this4.timeout);
-		}
-
-		// handle stream errors
-		body.on('error', function (err) {
-			if (err.name === 'AbortError') {
-				// if the request was aborted, reject with this Error
-				abort = true;
-				reject(err);
-			} else {
-				// other errors, such as incorrect content-encoding
-				reject(new FetchError(`Invalid response body while trying to fetch ${_this4.url}: ${err.message}`, 'system', err));
-			}
-		});
-
-		body.on('data', function (chunk) {
-			if (abort || chunk === null) {
-				return;
-			}
-
-			if (_this4.size && accumBytes + chunk.length > _this4.size) {
-				abort = true;
-				reject(new FetchError(`content size at ${_this4.url} over limit: ${_this4.size}`, 'max-size'));
-				return;
-			}
-
-			accumBytes += chunk.length;
-			accum.push(chunk);
-		});
-
-		body.on('end', function () {
-			if (abort) {
-				return;
-			}
-
-			clearTimeout(resTimeout);
-
-			try {
-				resolve(Buffer.concat(accum, accumBytes));
-			} catch (err) {
-				// handle streams that have accumulated too much data (issue #414)
-				reject(new FetchError(`Could not create Buffer from response body for ${_this4.url}: ${err.message}`, 'system', err));
-			}
-		});
-	});
-}
-
-/**
- * Detect buffer encoding and convert to target encoding
- * ref: http://www.w3.org/TR/2011/WD-html5-20110113/parsing.html#determining-the-character-encoding
- *
- * @param   Buffer  buffer    Incoming buffer
- * @param   String  encoding  Target encoding
- * @return  String
- */
-function convertBody(buffer, headers) {
-	if (typeof convert !== 'function') {
-		throw new Error('The package `encoding` must be installed to use the textConverted() function');
-	}
-
-	const ct = headers.get('content-type');
-	let charset = 'utf-8';
-	let res, str;
-
-	// header
-	if (ct) {
-		res = /charset=([^;]*)/i.exec(ct);
-	}
-
-	// no charset in content type, peek at response body for at most 1024 bytes
-	str = buffer.slice(0, 1024).toString();
-
-	// html5
-	if (!res && str) {
-		res = /<meta.+?charset=(['"])(.+?)\1/i.exec(str);
-	}
-
-	// html4
-	if (!res && str) {
-		res = /<meta[\s]+?http-equiv=(['"])content-type\1[\s]+?content=(['"])(.+?)\2/i.exec(str);
-		if (!res) {
-			res = /<meta[\s]+?content=(['"])(.+?)\1[\s]+?http-equiv=(['"])content-type\3/i.exec(str);
-			if (res) {
-				res.pop(); // drop last quote
-			}
-		}
-
-		if (res) {
-			res = /charset=(.*)/i.exec(res.pop());
-		}
-	}
-
-	// xml
-	if (!res && str) {
-		res = /<\?xml.+?encoding=(['"])(.+?)\1/i.exec(str);
-	}
-
-	// found charset
-	if (res) {
-		charset = res.pop();
-
-		// prevent decode issues when sites use incorrect encoding
-		// ref: https://hsivonen.fi/encoding-menu/
-		if (charset === 'gb2312' || charset === 'gbk') {
-			charset = 'gb18030';
-		}
-	}
-
-	// turn raw buffers into a single utf-8 buffer
-	return convert(buffer, 'UTF-8', charset).toString();
-}
-
-/**
- * Detect a URLSearchParams object
- * ref: https://github.com/bitinn/node-fetch/issues/296#issuecomment-307598143
- *
- * @param   Object  obj     Object to detect by type or brand
- * @return  String
- */
-function isURLSearchParams(obj) {
-	// Duck-typing as a necessary condition.
-	if (typeof obj !== 'object' || typeof obj.append !== 'function' || typeof obj.delete !== 'function' || typeof obj.get !== 'function' || typeof obj.getAll !== 'function' || typeof obj.has !== 'function' || typeof obj.set !== 'function') {
-		return false;
-	}
-
-	// Brand-checking and more duck-typing as optional condition.
-	return obj.constructor.name === 'URLSearchParams' || Object.prototype.toString.call(obj) === '[object URLSearchParams]' || typeof obj.sort === 'function';
-}
-
-/**
- * Check if `obj` is a W3C `Blob` object (which `File` inherits from)
- * @param  {*} obj
- * @return {boolean}
- */
-function isBlob(obj) {
-	return typeof obj === 'object' && typeof obj.arrayBuffer === 'function' && typeof obj.type === 'string' && typeof obj.stream === 'function' && typeof obj.constructor === 'function' && typeof obj.constructor.name === 'string' && /^(Blob|File)$/.test(obj.constructor.name) && /^(Blob|File)$/.test(obj[Symbol.toStringTag]);
-}
-
-/**
- * Clone body given Res/Req instance
- *
- * @param   Mixed  instance  Response or Request instance
- * @return  Mixed
- */
-function clone(instance) {
-	let p1, p2;
-	let body = instance.body;
-
-	// don't allow cloning a used body
-	if (instance.bodyUsed) {
-		throw new Error('cannot clone body after it is used');
-	}
-
-	// check that body is a stream and not form-data object
-	// note: we can't clone the form-data object without having it as a dependency
-	if (body instanceof Stream && typeof body.getBoundary !== 'function') {
-		// tee instance body
-		p1 = new PassThrough();
-		p2 = new PassThrough();
-		body.pipe(p1);
-		body.pipe(p2);
-		// set instance body to teed body and return the other teed body
-		instance[INTERNALS].body = p1;
-		body = p2;
-	}
-
-	return body;
-}
-
-/**
- * Performs the operation "extract a `Content-Type` value from |object|" as
- * specified in the specification:
- * https://fetch.spec.whatwg.org/#concept-bodyinit-extract
- *
- * This function assumes that instance.body is present.
- *
- * @param   Mixed  instance  Any options.body input
- */
-function extractContentType(body) {
-	if (body === null) {
-		// body is null
-		return null;
-	} else if (typeof body === 'string') {
-		// body is string
-		return 'text/plain;charset=UTF-8';
-	} else if (isURLSearchParams(body)) {
-		// body is a URLSearchParams
-		return 'application/x-www-form-urlencoded;charset=UTF-8';
-	} else if (isBlob(body)) {
-		// body is blob
-		return body.type || null;
-	} else if (Buffer.isBuffer(body)) {
-		// body is buffer
-		return null;
-	} else if (Object.prototype.toString.call(body) === '[object ArrayBuffer]') {
-		// body is ArrayBuffer
-		return null;
-	} else if (ArrayBuffer.isView(body)) {
-		// body is ArrayBufferView
-		return null;
-	} else if (typeof body.getBoundary === 'function') {
-		// detect form data input from form-data module
-		return `multipart/form-data;boundary=${body.getBoundary()}`;
-	} else if (body instanceof Stream) {
-		// body is stream
-		// can't really do much about this
-		return null;
-	} else {
-		// Body constructor defaults other things to string
-		return 'text/plain;charset=UTF-8';
-	}
-}
-
-/**
- * The Fetch Standard treats this as if "total bytes" is a property on the body.
- * For us, we have to explicitly get it with a function.
- *
- * ref: https://fetch.spec.whatwg.org/#concept-body-total-bytes
- *
- * @param   Body    instance   Instance of Body
- * @return  Number?            Number of bytes, or null if not possible
- */
-function getTotalBytes(instance) {
-	const body = instance.body;
-
-
-	if (body === null) {
-		// body is null
-		return 0;
-	} else if (isBlob(body)) {
-		return body.size;
-	} else if (Buffer.isBuffer(body)) {
-		// body is buffer
-		return body.length;
-	} else if (body && typeof body.getLengthSync === 'function') {
-		// detect form data input from form-data module
-		if (body._lengthRetrievers && body._lengthRetrievers.length == 0 || // 1.x
-		body.hasKnownLength && body.hasKnownLength()) {
-			// 2.x
-			return body.getLengthSync();
-		}
-		return null;
-	} else {
-		// body is stream
-		return null;
-	}
-}
-
-/**
- * Write a Body to a Node.js WritableStream (e.g. http.Request) object.
- *
- * @param   Body    instance   Instance of Body
- * @return  Void
- */
-function writeToStream(dest, instance) {
-	const body = instance.body;
-
-
-	if (body === null) {
-		// body is null
-		dest.end();
-	} else if (isBlob(body)) {
-		body.stream().pipe(dest);
-	} else if (Buffer.isBuffer(body)) {
-		// body is buffer
-		dest.write(body);
-		dest.end();
-	} else {
-		// body is stream
-		body.pipe(dest);
-	}
-}
-
-// expose Promise
-Body.Promise = global.Promise;
-
-/**
- * headers.js
- *
- * Headers class offers convenient helpers
- */
-
-const invalidTokenRegex = /[^\^_`a-zA-Z\-0-9!#$%&'*+.|~]/;
-const invalidHeaderCharRegex = /[^\t\x20-\x7e\x80-\xff]/;
-
-function validateName(name) {
-	name = `${name}`;
-	if (invalidTokenRegex.test(name) || name === '') {
-		throw new TypeError(`${name} is not a legal HTTP header name`);
-	}
-}
-
-function validateValue(value) {
-	value = `${value}`;
-	if (invalidHeaderCharRegex.test(value)) {
-		throw new TypeError(`${value} is not a legal HTTP header value`);
-	}
-}
-
-/**
- * Find the key in the map object given a header name.
- *
- * Returns undefined if not found.
- *
- * @param   String  name  Header name
- * @return  String|Undefined
- */
-function find(map, name) {
-	name = name.toLowerCase();
-	for (const key in map) {
-		if (key.toLowerCase() === name) {
-			return key;
-		}
-	}
-	return undefined;
-}
-
-const MAP = Symbol('map');
-class Headers {
-	/**
-  * Headers class
-  *
-  * @param   Object  headers  Response headers
-  * @return  Void
-  */
-	constructor() {
-		let init = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : undefined;
-
-		this[MAP] = Object.create(null);
-
-		if (init instanceof Headers) {
-			const rawHeaders = init.raw();
-			const headerNames = Object.keys(rawHeaders);
-
-			for (const headerName of headerNames) {
-				for (const value of rawHeaders[headerName]) {
-					this.append(headerName, value);
-				}
-			}
-
-			return;
-		}
-
-		// We don't worry about converting prop to ByteString here as append()
-		// will handle it.
-		if (init == null) ; else if (typeof init === 'object') {
-			const method = init[Symbol.iterator];
-			if (method != null) {
-				if (typeof method !== 'function') {
-					throw new TypeError('Header pairs must be iterable');
-				}
-
-				// sequence<sequence<ByteString>>
-				// Note: per spec we have to first exhaust the lists then process them
-				const pairs = [];
-				for (const pair of init) {
-					if (typeof pair !== 'object' || typeof pair[Symbol.iterator] !== 'function') {
-						throw new TypeError('Each header pair must be iterable');
-					}
-					pairs.push(Array.from(pair));
-				}
-
-				for (const pair of pairs) {
-					if (pair.length !== 2) {
-						throw new TypeError('Each header pair must be a name/value tuple');
-					}
-					this.append(pair[0], pair[1]);
-				}
-			} else {
-				// record<ByteString, ByteString>
-				for (const key of Object.keys(init)) {
-					const value = init[key];
-					this.append(key, value);
-				}
-			}
-		} else {
-			throw new TypeError('Provided initializer must be an object');
-		}
-	}
-
-	/**
-  * Return combined header value given name
-  *
-  * @param   String  name  Header name
-  * @return  Mixed
-  */
-	get(name) {
-		name = `${name}`;
-		validateName(name);
-		const key = find(this[MAP], name);
-		if (key === undefined) {
-			return null;
-		}
-
-		return this[MAP][key].join(', ');
-	}
-
-	/**
-  * Iterate over all headers
-  *
-  * @param   Function  callback  Executed for each item with parameters (value, name, thisArg)
-  * @param   Boolean   thisArg   `this` context for callback function
-  * @return  Void
-  */
-	forEach(callback) {
-		let thisArg = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : undefined;
-
-		let pairs = getHeaders(this);
-		let i = 0;
-		while (i < pairs.length) {
-			var _pairs$i = pairs[i];
-			const name = _pairs$i[0],
-			      value = _pairs$i[1];
-
-			callback.call(thisArg, value, name, this);
-			pairs = getHeaders(this);
-			i++;
-		}
-	}
-
-	/**
-  * Overwrite header values given name
-  *
-  * @param   String  name   Header name
-  * @param   String  value  Header value
-  * @return  Void
-  */
-	set(name, value) {
-		name = `${name}`;
-		value = `${value}`;
-		validateName(name);
-		validateValue(value);
-		const key = find(this[MAP], name);
-		this[MAP][key !== undefined ? key : name] = [value];
-	}
-
-	/**
-  * Append a value onto existing header
-  *
-  * @param   String  name   Header name
-  * @param   String  value  Header value
-  * @return  Void
-  */
-	append(name, value) {
-		name = `${name}`;
-		value = `${value}`;
-		validateName(name);
-		validateValue(value);
-		const key = find(this[MAP], name);
-		if (key !== undefined) {
-			this[MAP][key].push(value);
-		} else {
-			this[MAP][name] = [value];
-		}
-	}
-
-	/**
-  * Check for header name existence
-  *
-  * @param   String   name  Header name
-  * @return  Boolean
-  */
-	has(name) {
-		name = `${name}`;
-		validateName(name);
-		return find(this[MAP], name) !== undefined;
-	}
-
-	/**
-  * Delete all header values given name
-  *
-  * @param   String  name  Header name
-  * @return  Void
-  */
-	delete(name) {
-		name = `${name}`;
-		validateName(name);
-		const key = find(this[MAP], name);
-		if (key !== undefined) {
-			delete this[MAP][key];
-		}
-	}
-
-	/**
-  * Return raw headers (non-spec api)
-  *
-  * @return  Object
-  */
-	raw() {
-		return this[MAP];
-	}
-
-	/**
-  * Get an iterator on keys.
-  *
-  * @return  Iterator
-  */
-	keys() {
-		return createHeadersIterator(this, 'key');
-	}
-
-	/**
-  * Get an iterator on values.
-  *
-  * @return  Iterator
-  */
-	values() {
-		return createHeadersIterator(this, 'value');
-	}
-
-	/**
-  * Get an iterator on entries.
-  *
-  * This is the default iterator of the Headers object.
-  *
-  * @return  Iterator
-  */
-	[Symbol.iterator]() {
-		return createHeadersIterator(this, 'key+value');
-	}
-}
-Headers.prototype.entries = Headers.prototype[Symbol.iterator];
-
-Object.defineProperty(Headers.prototype, Symbol.toStringTag, {
-	value: 'Headers',
-	writable: false,
-	enumerable: false,
-	configurable: true
-});
-
-Object.defineProperties(Headers.prototype, {
-	get: { enumerable: true },
-	forEach: { enumerable: true },
-	set: { enumerable: true },
-	append: { enumerable: true },
-	has: { enumerable: true },
-	delete: { enumerable: true },
-	keys: { enumerable: true },
-	values: { enumerable: true },
-	entries: { enumerable: true }
-});
-
-function getHeaders(headers) {
-	let kind = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 'key+value';
-
-	const keys = Object.keys(headers[MAP]).sort();
-	return keys.map(kind === 'key' ? function (k) {
-		return k.toLowerCase();
-	} : kind === 'value' ? function (k) {
-		return headers[MAP][k].join(', ');
-	} : function (k) {
-		return [k.toLowerCase(), headers[MAP][k].join(', ')];
-	});
-}
-
-const INTERNAL = Symbol('internal');
-
-function createHeadersIterator(target, kind) {
-	const iterator = Object.create(HeadersIteratorPrototype);
-	iterator[INTERNAL] = {
-		target,
-		kind,
-		index: 0
-	};
-	return iterator;
-}
-
-const HeadersIteratorPrototype = Object.setPrototypeOf({
-	next() {
-		// istanbul ignore if
-		if (!this || Object.getPrototypeOf(this) !== HeadersIteratorPrototype) {
-			throw new TypeError('Value of `this` is not a HeadersIterator');
-		}
-
-		var _INTERNAL = this[INTERNAL];
-		const target = _INTERNAL.target,
-		      kind = _INTERNAL.kind,
-		      index = _INTERNAL.index;
-
-		const values = getHeaders(target, kind);
-		const len = values.length;
-		if (index >= len) {
-			return {
-				value: undefined,
-				done: true
-			};
-		}
-
-		this[INTERNAL].index = index + 1;
-
-		return {
-			value: values[index],
-			done: false
-		};
-	}
-}, Object.getPrototypeOf(Object.getPrototypeOf([][Symbol.iterator]())));
-
-Object.defineProperty(HeadersIteratorPrototype, Symbol.toStringTag, {
-	value: 'HeadersIterator',
-	writable: false,
-	enumerable: false,
-	configurable: true
-});
-
-/**
- * Export the Headers object in a form that Node.js can consume.
- *
- * @param   Headers  headers
- * @return  Object
- */
-function exportNodeCompatibleHeaders(headers) {
-	const obj = Object.assign({ __proto__: null }, headers[MAP]);
-
-	// http.request() only supports string as Host header. This hack makes
-	// specifying custom Host header possible.
-	const hostHeaderKey = find(headers[MAP], 'Host');
-	if (hostHeaderKey !== undefined) {
-		obj[hostHeaderKey] = obj[hostHeaderKey][0];
-	}
-
-	return obj;
-}
-
-/**
- * Create a Headers object from an object of headers, ignoring those that do
- * not conform to HTTP grammar productions.
- *
- * @param   Object  obj  Object of headers
- * @return  Headers
- */
-function createHeadersLenient(obj) {
-	const headers = new Headers();
-	for (const name of Object.keys(obj)) {
-		if (invalidTokenRegex.test(name)) {
-			continue;
-		}
-		if (Array.isArray(obj[name])) {
-			for (const val of obj[name]) {
-				if (invalidHeaderCharRegex.test(val)) {
-					continue;
-				}
-				if (headers[MAP][name] === undefined) {
-					headers[MAP][name] = [val];
-				} else {
-					headers[MAP][name].push(val);
-				}
-			}
-		} else if (!invalidHeaderCharRegex.test(obj[name])) {
-			headers[MAP][name] = [obj[name]];
-		}
-	}
-	return headers;
-}
-
-const INTERNALS$1 = Symbol('Response internals');
-
-// fix an issue where "STATUS_CODES" aren't a named export for node <10
-const STATUS_CODES = http.STATUS_CODES;
-
-/**
- * Response class
- *
- * @param   Stream  body  Readable stream
- * @param   Object  opts  Response options
- * @return  Void
- */
-class Response {
-	constructor() {
-		let body = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : null;
-		let opts = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
-
-		Body.call(this, body, opts);
-
-		const status = opts.status || 200;
-		const headers = new Headers(opts.headers);
-
-		if (body != null && !headers.has('Content-Type')) {
-			const contentType = extractContentType(body);
-			if (contentType) {
-				headers.append('Content-Type', contentType);
-			}
-		}
-
-		this[INTERNALS$1] = {
-			url: opts.url,
-			status,
-			statusText: opts.statusText || STATUS_CODES[status],
-			headers,
-			counter: opts.counter
-		};
-	}
-
-	get url() {
-		return this[INTERNALS$1].url || '';
-	}
-
-	get status() {
-		return this[INTERNALS$1].status;
-	}
-
-	/**
-  * Convenience property representing if the request ended normally
-  */
-	get ok() {
-		return this[INTERNALS$1].status >= 200 && this[INTERNALS$1].status < 300;
-	}
-
-	get redirected() {
-		return this[INTERNALS$1].counter > 0;
-	}
-
-	get statusText() {
-		return this[INTERNALS$1].statusText;
-	}
-
-	get headers() {
-		return this[INTERNALS$1].headers;
-	}
-
-	/**
-  * Clone this response
-  *
-  * @return  Response
-  */
-	clone() {
-		return new Response(clone(this), {
-			url: this.url,
-			status: this.status,
-			statusText: this.statusText,
-			headers: this.headers,
-			ok: this.ok,
-			redirected: this.redirected
-		});
-	}
-}
-
-Body.mixIn(Response.prototype);
-
-Object.defineProperties(Response.prototype, {
-	url: { enumerable: true },
-	status: { enumerable: true },
-	ok: { enumerable: true },
-	redirected: { enumerable: true },
-	statusText: { enumerable: true },
-	headers: { enumerable: true },
-	clone: { enumerable: true }
-});
-
-Object.defineProperty(Response.prototype, Symbol.toStringTag, {
-	value: 'Response',
-	writable: false,
-	enumerable: false,
-	configurable: true
-});
-
-const INTERNALS$2 = Symbol('Request internals');
-const URL = Url.URL || whatwgUrl.URL;
-
-// fix an issue where "format", "parse" aren't a named export for node <10
-const parse_url = Url.parse;
-const format_url = Url.format;
-
-/**
- * Wrapper around `new URL` to handle arbitrary URLs
- *
- * @param  {string} urlStr
- * @return {void}
- */
-function parseURL(urlStr) {
-	/*
- 	Check whether the URL is absolute or not
- 		Scheme: https://tools.ietf.org/html/rfc3986#section-3.1
- 	Absolute URL: https://tools.ietf.org/html/rfc3986#section-4.3
- */
-	if (/^[a-zA-Z][a-zA-Z\d+\-.]*:/.exec(urlStr)) {
-		urlStr = new URL(urlStr).toString();
-	}
-
-	// Fallback to old implementation for arbitrary URLs
-	return parse_url(urlStr);
-}
-
-const streamDestructionSupported = 'destroy' in Stream.Readable.prototype;
-
-/**
- * Check if a value is an instance of Request.
- *
- * @param   Mixed   input
- * @return  Boolean
- */
-function isRequest(input) {
-	return typeof input === 'object' && typeof input[INTERNALS$2] === 'object';
-}
-
-function isAbortSignal(signal) {
-	const proto = signal && typeof signal === 'object' && Object.getPrototypeOf(signal);
-	return !!(proto && proto.constructor.name === 'AbortSignal');
-}
-
-/**
- * Request class
- *
- * @param   Mixed   input  Url or Request instance
- * @param   Object  init   Custom options
- * @return  Void
- */
-class Request {
-	constructor(input) {
-		let init = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
-
-		let parsedURL;
-
-		// normalize input
-		if (!isRequest(input)) {
-			if (input && input.href) {
-				// in order to support Node.js' Url objects; though WHATWG's URL objects
-				// will fall into this branch also (since their `toString()` will return
-				// `href` property anyway)
-				parsedURL = parseURL(input.href);
-			} else {
-				// coerce input to a string before attempting to parse
-				parsedURL = parseURL(`${input}`);
-			}
-			input = {};
-		} else {
-			parsedURL = parseURL(input.url);
-		}
-
-		let method = init.method || input.method || 'GET';
-		method = method.toUpperCase();
-
-		if ((init.body != null || isRequest(input) && input.body !== null) && (method === 'GET' || method === 'HEAD')) {
-			throw new TypeError('Request with GET/HEAD method cannot have body');
-		}
-
-		let inputBody = init.body != null ? init.body : isRequest(input) && input.body !== null ? clone(input) : null;
-
-		Body.call(this, inputBody, {
-			timeout: init.timeout || input.timeout || 0,
-			size: init.size || input.size || 0
-		});
-
-		const headers = new Headers(init.headers || input.headers || {});
-
-		if (inputBody != null && !headers.has('Content-Type')) {
-			const contentType = extractContentType(inputBody);
-			if (contentType) {
-				headers.append('Content-Type', contentType);
-			}
-		}
-
-		let signal = isRequest(input) ? input.signal : null;
-		if ('signal' in init) signal = init.signal;
-
-		if (signal != null && !isAbortSignal(signal)) {
-			throw new TypeError('Expected signal to be an instanceof AbortSignal');
-		}
-
-		this[INTERNALS$2] = {
-			method,
-			redirect: init.redirect || input.redirect || 'follow',
-			headers,
-			parsedURL,
-			signal
-		};
-
-		// node-fetch-only options
-		this.follow = init.follow !== undefined ? init.follow : input.follow !== undefined ? input.follow : 20;
-		this.compress = init.compress !== undefined ? init.compress : input.compress !== undefined ? input.compress : true;
-		this.counter = init.counter || input.counter || 0;
-		this.agent = init.agent || input.agent;
-	}
-
-	get method() {
-		return this[INTERNALS$2].method;
-	}
-
-	get url() {
-		return format_url(this[INTERNALS$2].parsedURL);
-	}
-
-	get headers() {
-		return this[INTERNALS$2].headers;
-	}
-
-	get redirect() {
-		return this[INTERNALS$2].redirect;
-	}
-
-	get signal() {
-		return this[INTERNALS$2].signal;
-	}
-
-	/**
-  * Clone this request
-  *
-  * @return  Request
-  */
-	clone() {
-		return new Request(this);
-	}
-}
-
-Body.mixIn(Request.prototype);
-
-Object.defineProperty(Request.prototype, Symbol.toStringTag, {
-	value: 'Request',
-	writable: false,
-	enumerable: false,
-	configurable: true
-});
-
-Object.defineProperties(Request.prototype, {
-	method: { enumerable: true },
-	url: { enumerable: true },
-	headers: { enumerable: true },
-	redirect: { enumerable: true },
-	clone: { enumerable: true },
-	signal: { enumerable: true }
-});
-
-/**
- * Convert a Request to Node.js http request options.
- *
- * @param   Request  A Request instance
- * @return  Object   The options object to be passed to http.request
- */
-function getNodeRequestOptions(request) {
-	const parsedURL = request[INTERNALS$2].parsedURL;
-	const headers = new Headers(request[INTERNALS$2].headers);
-
-	// fetch step 1.3
-	if (!headers.has('Accept')) {
-		headers.set('Accept', '*/*');
-	}
-
-	// Basic fetch
-	if (!parsedURL.protocol || !parsedURL.hostname) {
-		throw new TypeError('Only absolute URLs are supported');
-	}
-
-	if (!/^https?:$/.test(parsedURL.protocol)) {
-		throw new TypeError('Only HTTP(S) protocols are supported');
-	}
-
-	if (request.signal && request.body instanceof Stream.Readable && !streamDestructionSupported) {
-		throw new Error('Cancellation of streamed requests with AbortSignal is not supported in node < 8');
-	}
-
-	// HTTP-network-or-cache fetch steps 2.4-2.7
-	let contentLengthValue = null;
-	if (request.body == null && /^(POST|PUT)$/i.test(request.method)) {
-		contentLengthValue = '0';
-	}
-	if (request.body != null) {
-		const totalBytes = getTotalBytes(request);
-		if (typeof totalBytes === 'number') {
-			contentLengthValue = String(totalBytes);
-		}
-	}
-	if (contentLengthValue) {
-		headers.set('Content-Length', contentLengthValue);
-	}
-
-	// HTTP-network-or-cache fetch step 2.11
-	if (!headers.has('User-Agent')) {
-		headers.set('User-Agent', 'node-fetch/1.0 (+https://github.com/bitinn/node-fetch)');
-	}
-
-	// HTTP-network-or-cache fetch step 2.15
-	if (request.compress && !headers.has('Accept-Encoding')) {
-		headers.set('Accept-Encoding', 'gzip,deflate');
-	}
-
-	let agent = request.agent;
-	if (typeof agent === 'function') {
-		agent = agent(parsedURL);
-	}
-
-	if (!headers.has('Connection') && !agent) {
-		headers.set('Connection', 'close');
-	}
-
-	// HTTP-network fetch step 4.2
-	// chunked encoding is handled by Node.js
-
-	return Object.assign({}, parsedURL, {
-		method: request.method,
-		headers: exportNodeCompatibleHeaders(headers),
-		agent
-	});
-}
-
-/**
- * abort-error.js
- *
- * AbortError interface for cancelled requests
- */
-
-/**
- * Create AbortError instance
- *
- * @param   String      message      Error message for human
- * @return  AbortError
- */
-function AbortError(message) {
-  Error.call(this, message);
-
-  this.type = 'aborted';
-  this.message = message;
-
-  // hide custom error implementation details from end-users
-  Error.captureStackTrace(this, this.constructor);
-}
-
-AbortError.prototype = Object.create(Error.prototype);
-AbortError.prototype.constructor = AbortError;
-AbortError.prototype.name = 'AbortError';
-
-const URL$1 = Url.URL || whatwgUrl.URL;
-
-// fix an issue where "PassThrough", "resolve" aren't a named export for node <10
-const PassThrough$1 = Stream.PassThrough;
-
-const isDomainOrSubdomain = function isDomainOrSubdomain(destination, original) {
-	const orig = new URL$1(original).hostname;
-	const dest = new URL$1(destination).hostname;
-
-	return orig === dest || orig[orig.length - dest.length - 1] === '.' && orig.endsWith(dest);
-};
-
-/**
- * Fetch function
- *
- * @param   Mixed    url   Absolute url or Request instance
- * @param   Object   opts  Fetch options
- * @return  Promise
- */
-function fetch(url, opts) {
-
-	// allow custom promise
-	if (!fetch.Promise) {
-		throw new Error('native promise missing, set fetch.Promise to your favorite alternative');
-	}
-
-	Body.Promise = fetch.Promise;
-
-	// wrap http.request into fetch
-	return new fetch.Promise(function (resolve, reject) {
-		// build request object
-		const request = new Request(url, opts);
-		const options = getNodeRequestOptions(request);
-
-		const send = (options.protocol === 'https:' ? https : http).request;
-		const signal = request.signal;
-
-		let response = null;
-
-		const abort = function abort() {
-			let error = new AbortError('The user aborted a request.');
-			reject(error);
-			if (request.body && request.body instanceof Stream.Readable) {
-				request.body.destroy(error);
-			}
-			if (!response || !response.body) return;
-			response.body.emit('error', error);
-		};
-
-		if (signal && signal.aborted) {
-			abort();
-			return;
-		}
-
-		const abortAndFinalize = function abortAndFinalize() {
-			abort();
-			finalize();
-		};
-
-		// send request
-		const req = send(options);
-		let reqTimeout;
-
-		if (signal) {
-			signal.addEventListener('abort', abortAndFinalize);
-		}
-
-		function finalize() {
-			req.abort();
-			if (signal) signal.removeEventListener('abort', abortAndFinalize);
-			clearTimeout(reqTimeout);
-		}
-
-		if (request.timeout) {
-			req.once('socket', function (socket) {
-				reqTimeout = setTimeout(function () {
-					reject(new FetchError(`network timeout at: ${request.url}`, 'request-timeout'));
-					finalize();
-				}, request.timeout);
-			});
-		}
-
-		req.on('error', function (err) {
-			reject(new FetchError(`request to ${request.url} failed, reason: ${err.message}`, 'system', err));
-			finalize();
-		});
-
-		req.on('response', function (res) {
-			clearTimeout(reqTimeout);
-
-			const headers = createHeadersLenient(res.headers);
-
-			// HTTP fetch step 5
-			if (fetch.isRedirect(res.statusCode)) {
-				// HTTP fetch step 5.2
-				const location = headers.get('Location');
-
-				// HTTP fetch step 5.3
-				let locationURL = null;
-				try {
-					locationURL = location === null ? null : new URL$1(location, request.url).toString();
-				} catch (err) {
-					// error here can only be invalid URL in Location: header
-					// do not throw when options.redirect == manual
-					// let the user extract the errorneous redirect URL
-					if (request.redirect !== 'manual') {
-						reject(new FetchError(`uri requested responds with an invalid redirect URL: ${location}`, 'invalid-redirect'));
-						finalize();
-						return;
-					}
-				}
-
-				// HTTP fetch step 5.5
-				switch (request.redirect) {
-					case 'error':
-						reject(new FetchError(`uri requested responds with a redirect, redirect mode is set to error: ${request.url}`, 'no-redirect'));
-						finalize();
-						return;
-					case 'manual':
-						// node-fetch-specific step: make manual redirect a bit easier to use by setting the Location header value to the resolved URL.
-						if (locationURL !== null) {
-							// handle corrupted header
-							try {
-								headers.set('Location', locationURL);
-							} catch (err) {
-								// istanbul ignore next: nodejs server prevent invalid response headers, we can't test this through normal request
-								reject(err);
-							}
-						}
-						break;
-					case 'follow':
-						// HTTP-redirect fetch step 2
-						if (locationURL === null) {
-							break;
-						}
-
-						// HTTP-redirect fetch step 5
-						if (request.counter >= request.follow) {
-							reject(new FetchError(`maximum redirect reached at: ${request.url}`, 'max-redirect'));
-							finalize();
-							return;
-						}
-
-						// HTTP-redirect fetch step 6 (counter increment)
-						// Create a new Request object.
-						const requestOpts = {
-							headers: new Headers(request.headers),
-							follow: request.follow,
-							counter: request.counter + 1,
-							agent: request.agent,
-							compress: request.compress,
-							method: request.method,
-							body: request.body,
-							signal: request.signal,
-							timeout: request.timeout,
-							size: request.size
-						};
-
-						if (!isDomainOrSubdomain(request.url, locationURL)) {
-							for (const name of ['authorization', 'www-authenticate', 'cookie', 'cookie2']) {
-								requestOpts.headers.delete(name);
-							}
-						}
-
-						// HTTP-redirect fetch step 9
-						if (res.statusCode !== 303 && request.body && getTotalBytes(request) === null) {
-							reject(new FetchError('Cannot follow redirect with body being a readable stream', 'unsupported-redirect'));
-							finalize();
-							return;
-						}
-
-						// HTTP-redirect fetch step 11
-						if (res.statusCode === 303 || (res.statusCode === 301 || res.statusCode === 302) && request.method === 'POST') {
-							requestOpts.method = 'GET';
-							requestOpts.body = undefined;
-							requestOpts.headers.delete('content-length');
-						}
-
-						// HTTP-redirect fetch step 15
-						resolve(fetch(new Request(locationURL, requestOpts)));
-						finalize();
-						return;
-				}
-			}
-
-			// prepare response
-			res.once('end', function () {
-				if (signal) signal.removeEventListener('abort', abortAndFinalize);
-			});
-			let body = res.pipe(new PassThrough$1());
-
-			const response_options = {
-				url: request.url,
-				status: res.statusCode,
-				statusText: res.statusMessage,
-				headers: headers,
-				size: request.size,
-				timeout: request.timeout,
-				counter: request.counter
-			};
-
-			// HTTP-network fetch step 12.1.1.3
-			const codings = headers.get('Content-Encoding');
-
-			// HTTP-network fetch step 12.1.1.4: handle content codings
-
-			// in following scenarios we ignore compression support
-			// 1. compression support is disabled
-			// 2. HEAD request
-			// 3. no Content-Encoding header
-			// 4. no content response (204)
-			// 5. content not modified response (304)
-			if (!request.compress || request.method === 'HEAD' || codings === null || res.statusCode === 204 || res.statusCode === 304) {
-				response = new Response(body, response_options);
-				resolve(response);
-				return;
-			}
-
-			// For Node v6+
-			// Be less strict when decoding compressed responses, since sometimes
-			// servers send slightly invalid responses that are still accepted
-			// by common browsers.
-			// Always using Z_SYNC_FLUSH is what cURL does.
-			const zlibOptions = {
-				flush: zlib.Z_SYNC_FLUSH,
-				finishFlush: zlib.Z_SYNC_FLUSH
-			};
-
-			// for gzip
-			if (codings == 'gzip' || codings == 'x-gzip') {
-				body = body.pipe(zlib.createGunzip(zlibOptions));
-				response = new Response(body, response_options);
-				resolve(response);
-				return;
-			}
-
-			// for deflate
-			if (codings == 'deflate' || codings == 'x-deflate') {
-				// handle the infamous raw deflate response from old servers
-				// a hack for old IIS and Apache servers
-				const raw = res.pipe(new PassThrough$1());
-				raw.once('data', function (chunk) {
-					// see http://stackoverflow.com/questions/37519828
-					if ((chunk[0] & 0x0F) === 0x08) {
-						body = body.pipe(zlib.createInflate());
-					} else {
-						body = body.pipe(zlib.createInflateRaw());
-					}
-					response = new Response(body, response_options);
-					resolve(response);
-				});
-				return;
-			}
-
-			// for br
-			if (codings == 'br' && typeof zlib.createBrotliDecompress === 'function') {
-				body = body.pipe(zlib.createBrotliDecompress());
-				response = new Response(body, response_options);
-				resolve(response);
-				return;
-			}
-
-			// otherwise, use response as-is
-			response = new Response(body, response_options);
-			resolve(response);
-		});
-
-		writeToStream(req, request);
-	});
-}
-/**
- * Redirect code matching
- *
- * @param   Number   code  Status code
- * @return  Boolean
- */
-fetch.isRedirect = function (code) {
-	return code === 301 || code === 302 || code === 303 || code === 307 || code === 308;
-};
-
-// expose Promise
-fetch.Promise = global.Promise;
-
-module.exports = exports = fetch;
-Object.defineProperty(exports, "__esModule", ({ value: true }));
-exports["default"] = exports;
-exports.Headers = Headers;
-exports.Request = Request;
-exports.Response = Response;
-exports.FetchError = FetchError;
-
-
-/***/ }),
-
-/***/ 2299:
-/***/ ((module, __unused_webpack_exports, __nccwpck_require__) => {
-
-"use strict";
-
-
-var punycode = __nccwpck_require__(5477);
-var mappingTable = __nccwpck_require__(1907);
-
-var PROCESSING_OPTIONS = {
-  TRANSITIONAL: 0,
-  NONTRANSITIONAL: 1
-};
-
-function normalize(str) { // fix bug in v8
-  return str.split('\u0000').map(function (s) { return s.normalize('NFC'); }).join('\u0000');
-}
-
-function findStatus(val) {
-  var start = 0;
-  var end = mappingTable.length - 1;
-
-  while (start <= end) {
-    var mid = Math.floor((start + end) / 2);
-
-    var target = mappingTable[mid];
-    if (target[0][0] <= val && target[0][1] >= val) {
-      return target;
-    } else if (target[0][0] > val) {
-      end = mid - 1;
-    } else {
-      start = mid + 1;
-    }
-  }
-
-  return null;
-}
-
-var regexAstralSymbols = /[\uD800-\uDBFF][\uDC00-\uDFFF]/g;
-
-function countSymbols(string) {
-  return string
-    // replace every surrogate pair with a BMP symbol
-    .replace(regexAstralSymbols, '_')
-    // then get the length
-    .length;
-}
-
-function mapChars(domain_name, useSTD3, processing_option) {
-  var hasError = false;
-  var processed = "";
-
-  var len = countSymbols(domain_name);
-  for (var i = 0; i < len; ++i) {
-    var codePoint = domain_name.codePointAt(i);
-    var status = findStatus(codePoint);
-
-    switch (status[1]) {
-      case "disallowed":
-        hasError = true;
-        processed += String.fromCodePoint(codePoint);
-        break;
-      case "ignored":
-        break;
-      case "mapped":
-        processed += String.fromCodePoint.apply(String, status[2]);
-        break;
-      case "deviation":
-        if (processing_option === PROCESSING_OPTIONS.TRANSITIONAL) {
-          processed += String.fromCodePoint.apply(String, status[2]);
-        } else {
-          processed += String.fromCodePoint(codePoint);
-        }
-        break;
-      case "valid":
-        processed += String.fromCodePoint(codePoint);
-        break;
-      case "disallowed_STD3_mapped":
-        if (useSTD3) {
-          hasError = true;
-          processed += String.fromCodePoint(codePoint);
-        } else {
-          processed += String.fromCodePoint.apply(String, status[2]);
-        }
-        break;
-      case "disallowed_STD3_valid":
-        if (useSTD3) {
-          hasError = true;
-        }
-
-        processed += String.fromCodePoint(codePoint);
-        break;
-    }
-  }
-
-  return {
-    string: processed,
-    error: hasError
-  };
-}
-
-var combiningMarksRegex = /[\u0300-\u036F\u0483-\u0489\u0591-\u05BD\u05BF\u05C1\u05C2\u05C4\u05C5\u05C7\u0610-\u061A\u064B-\u065F\u0670\u06D6-\u06DC\u06DF-\u06E4\u06E7\u06E8\u06EA-\u06ED\u0711\u0730-\u074A\u07A6-\u07B0\u07EB-\u07F3\u0816-\u0819\u081B-\u0823\u0825-\u0827\u0829-\u082D\u0859-\u085B\u08E4-\u0903\u093A-\u093C\u093E-\u094F\u0951-\u0957\u0962\u0963\u0981-\u0983\u09BC\u09BE-\u09C4\u09C7\u09C8\u09CB-\u09CD\u09D7\u09E2\u09E3\u0A01-\u0A03\u0A3C\u0A3E-\u0A42\u0A47\u0A48\u0A4B-\u0A4D\u0A51\u0A70\u0A71\u0A75\u0A81-\u0A83\u0ABC\u0ABE-\u0AC5\u0AC7-\u0AC9\u0ACB-\u0ACD\u0AE2\u0AE3\u0B01-\u0B03\u0B3C\u0B3E-\u0B44\u0B47\u0B48\u0B4B-\u0B4D\u0B56\u0B57\u0B62\u0B63\u0B82\u0BBE-\u0BC2\u0BC6-\u0BC8\u0BCA-\u0BCD\u0BD7\u0C00-\u0C03\u0C3E-\u0C44\u0C46-\u0C48\u0C4A-\u0C4D\u0C55\u0C56\u0C62\u0C63\u0C81-\u0C83\u0CBC\u0CBE-\u0CC4\u0CC6-\u0CC8\u0CCA-\u0CCD\u0CD5\u0CD6\u0CE2\u0CE3\u0D01-\u0D03\u0D3E-\u0D44\u0D46-\u0D48\u0D4A-\u0D4D\u0D57\u0D62\u0D63\u0D82\u0D83\u0DCA\u0DCF-\u0DD4\u0DD6\u0DD8-\u0DDF\u0DF2\u0DF3\u0E31\u0E34-\u0E3A\u0E47-\u0E4E\u0EB1\u0EB4-\u0EB9\u0EBB\u0EBC\u0EC8-\u0ECD\u0F18\u0F19\u0F35\u0F37\u0F39\u0F3E\u0F3F\u0F71-\u0F84\u0F86\u0F87\u0F8D-\u0F97\u0F99-\u0FBC\u0FC6\u102B-\u103E\u1056-\u1059\u105E-\u1060\u1062-\u1064\u1067-\u106D\u1071-\u1074\u1082-\u108D\u108F\u109A-\u109D\u135D-\u135F\u1712-\u1714\u1732-\u1734\u1752\u1753\u1772\u1773\u17B4-\u17D3\u17DD\u180B-\u180D\u18A9\u1920-\u192B\u1930-\u193B\u19B0-\u19C0\u19C8\u19C9\u1A17-\u1A1B\u1A55-\u1A5E\u1A60-\u1A7C\u1A7F\u1AB0-\u1ABE\u1B00-\u1B04\u1B34-\u1B44\u1B6B-\u1B73\u1B80-\u1B82\u1BA1-\u1BAD\u1BE6-\u1BF3\u1C24-\u1C37\u1CD0-\u1CD2\u1CD4-\u1CE8\u1CED\u1CF2-\u1CF4\u1CF8\u1CF9\u1DC0-\u1DF5\u1DFC-\u1DFF\u20D0-\u20F0\u2CEF-\u2CF1\u2D7F\u2DE0-\u2DFF\u302A-\u302F\u3099\u309A\uA66F-\uA672\uA674-\uA67D\uA69F\uA6F0\uA6F1\uA802\uA806\uA80B\uA823-\uA827\uA880\uA881\uA8B4-\uA8C4\uA8E0-\uA8F1\uA926-\uA92D\uA947-\uA953\uA980-\uA983\uA9B3-\uA9C0\uA9E5\uAA29-\uAA36\uAA43\uAA4C\uAA4D\uAA7B-\uAA7D\uAAB0\uAAB2-\uAAB4\uAAB7\uAAB8\uAABE\uAABF\uAAC1\uAAEB-\uAAEF\uAAF5\uAAF6\uABE3-\uABEA\uABEC\uABED\uFB1E\uFE00-\uFE0F\uFE20-\uFE2D]|\uD800[\uDDFD\uDEE0\uDF76-\uDF7A]|\uD802[\uDE01-\uDE03\uDE05\uDE06\uDE0C-\uDE0F\uDE38-\uDE3A\uDE3F\uDEE5\uDEE6]|\uD804[\uDC00-\uDC02\uDC38-\uDC46\uDC7F-\uDC82\uDCB0-\uDCBA\uDD00-\uDD02\uDD27-\uDD34\uDD73\uDD80-\uDD82\uDDB3-\uDDC0\uDE2C-\uDE37\uDEDF-\uDEEA\uDF01-\uDF03\uDF3C\uDF3E-\uDF44\uDF47\uDF48\uDF4B-\uDF4D\uDF57\uDF62\uDF63\uDF66-\uDF6C\uDF70-\uDF74]|\uD805[\uDCB0-\uDCC3\uDDAF-\uDDB5\uDDB8-\uDDC0\uDE30-\uDE40\uDEAB-\uDEB7]|\uD81A[\uDEF0-\uDEF4\uDF30-\uDF36]|\uD81B[\uDF51-\uDF7E\uDF8F-\uDF92]|\uD82F[\uDC9D\uDC9E]|\uD834[\uDD65-\uDD69\uDD6D-\uDD72\uDD7B-\uDD82\uDD85-\uDD8B\uDDAA-\uDDAD\uDE42-\uDE44]|\uD83A[\uDCD0-\uDCD6]|\uDB40[\uDD00-\uDDEF]/;
-
-function validateLabel(label, processing_option) {
-  if (label.substr(0, 4) === "xn--") {
-    label = punycode.toUnicode(label);
-    processing_option = PROCESSING_OPTIONS.NONTRANSITIONAL;
-  }
-
-  var error = false;
-
-  if (normalize(label) !== label ||
-      (label[3] === "-" && label[4] === "-") ||
-      label[0] === "-" || label[label.length - 1] === "-" ||
-      label.indexOf(".") !== -1 ||
-      label.search(combiningMarksRegex) === 0) {
-    error = true;
-  }
-
-  var len = countSymbols(label);
-  for (var i = 0; i < len; ++i) {
-    var status = findStatus(label.codePointAt(i));
-    if ((processing === PROCESSING_OPTIONS.TRANSITIONAL && status[1] !== "valid") ||
-        (processing === PROCESSING_OPTIONS.NONTRANSITIONAL &&
-         status[1] !== "valid" && status[1] !== "deviation")) {
-      error = true;
-      break;
-    }
-  }
-
-  return {
-    label: label,
-    error: error
-  };
-}
-
-function processing(domain_name, useSTD3, processing_option) {
-  var result = mapChars(domain_name, useSTD3, processing_option);
-  result.string = normalize(result.string);
-
-  var labels = result.string.split(".");
-  for (var i = 0; i < labels.length; ++i) {
-    try {
-      var validation = validateLabel(labels[i]);
-      labels[i] = validation.label;
-      result.error = result.error || validation.error;
-    } catch(e) {
-      result.error = true;
-    }
-  }
-
-  return {
-    string: labels.join("."),
-    error: result.error
-  };
-}
-
-module.exports.toASCII = function(domain_name, useSTD3, processing_option, verifyDnsLength) {
-  var result = processing(domain_name, useSTD3, processing_option);
-  var labels = result.string.split(".");
-  labels = labels.map(function(l) {
-    try {
-      return punycode.toASCII(l);
-    } catch(e) {
-      result.error = true;
-      return l;
-    }
-  });
-
-  if (verifyDnsLength) {
-    var total = labels.slice(0, labels.length - 1).join(".").length;
-    if (total.length > 253 || total.length === 0) {
-      result.error = true;
-    }
-
-    for (var i=0; i < labels.length; ++i) {
-      if (labels.length > 63 || labels.length === 0) {
-        result.error = true;
-        break;
-      }
-    }
-  }
-
-  if (result.error) return null;
-  return labels.join(".");
-};
-
-module.exports.toUnicode = function(domain_name, useSTD3) {
-  var result = processing(domain_name, useSTD3, PROCESSING_OPTIONS.NONTRANSITIONAL);
-
-  return {
-    domain: result.string,
-    error: result.error
-  };
-};
-
-module.exports.PROCESSING_OPTIONS = PROCESSING_OPTIONS;
-
-
-/***/ }),
-
-/***/ 5871:
-/***/ ((module) => {
-
-"use strict";
-
-
-var conversions = {};
-module.exports = conversions;
-
-function sign(x) {
-    return x < 0 ? -1 : 1;
-}
-
-function evenRound(x) {
-    // Round x to the nearest integer, choosing the even integer if it lies halfway between two.
-    if ((x % 1) === 0.5 && (x & 1) === 0) { // [even number].5; round down (i.e. floor)
-        return Math.floor(x);
-    } else {
-        return Math.round(x);
-    }
-}
-
-function createNumberConversion(bitLength, typeOpts) {
-    if (!typeOpts.unsigned) {
-        --bitLength;
-    }
-    const lowerBound = typeOpts.unsigned ? 0 : -Math.pow(2, bitLength);
-    const upperBound = Math.pow(2, bitLength) - 1;
-
-    const moduloVal = typeOpts.moduloBitLength ? Math.pow(2, typeOpts.moduloBitLength) : Math.pow(2, bitLength);
-    const moduloBound = typeOpts.moduloBitLength ? Math.pow(2, typeOpts.moduloBitLength - 1) : Math.pow(2, bitLength - 1);
-
-    return function(V, opts) {
-        if (!opts) opts = {};
-
-        let x = +V;
-
-        if (opts.enforceRange) {
-            if (!Number.isFinite(x)) {
-                throw new TypeError("Argument is not a finite number");
-            }
-
-            x = sign(x) * Math.floor(Math.abs(x));
-            if (x < lowerBound || x > upperBound) {
-                throw new TypeError("Argument is not in byte range");
-            }
-
-            return x;
-        }
-
-        if (!isNaN(x) && opts.clamp) {
-            x = evenRound(x);
-
-            if (x < lowerBound) x = lowerBound;
-            if (x > upperBound) x = upperBound;
-            return x;
-        }
-
-        if (!Number.isFinite(x) || x === 0) {
-            return 0;
-        }
-
-        x = sign(x) * Math.floor(Math.abs(x));
-        x = x % moduloVal;
-
-        if (!typeOpts.unsigned && x >= moduloBound) {
-            return x - moduloVal;
-        } else if (typeOpts.unsigned) {
-            if (x < 0) {
-              x += moduloVal;
-            } else if (x === -0) { // don't return negative zero
-              return 0;
-            }
-        }
-
-        return x;
-    }
-}
-
-conversions["void"] = function () {
-    return undefined;
-};
-
-conversions["boolean"] = function (val) {
-    return !!val;
-};
-
-conversions["byte"] = createNumberConversion(8, { unsigned: false });
-conversions["octet"] = createNumberConversion(8, { unsigned: true });
-
-conversions["short"] = createNumberConversion(16, { unsigned: false });
-conversions["unsigned short"] = createNumberConversion(16, { unsigned: true });
-
-conversions["long"] = createNumberConversion(32, { unsigned: false });
-conversions["unsigned long"] = createNumberConversion(32, { unsigned: true });
-
-conversions["long long"] = createNumberConversion(32, { unsigned: false, moduloBitLength: 64 });
-conversions["unsigned long long"] = createNumberConversion(32, { unsigned: true, moduloBitLength: 64 });
-
-conversions["double"] = function (V) {
-    const x = +V;
-
-    if (!Number.isFinite(x)) {
-        throw new TypeError("Argument is not a finite floating-point value");
-    }
-
-    return x;
-};
-
-conversions["unrestricted double"] = function (V) {
-    const x = +V;
-
-    if (isNaN(x)) {
-        throw new TypeError("Argument is NaN");
-    }
-
-    return x;
-};
-
-// not quite valid, but good enough for JS
-conversions["float"] = conversions["double"];
-conversions["unrestricted float"] = conversions["unrestricted double"];
-
-conversions["DOMString"] = function (V, opts) {
-    if (!opts) opts = {};
-
-    if (opts.treatNullAsEmptyString && V === null) {
-        return "";
-    }
-
-    return String(V);
-};
-
-conversions["ByteString"] = function (V, opts) {
-    const x = String(V);
-    let c = undefined;
-    for (let i = 0; (c = x.codePointAt(i)) !== undefined; ++i) {
-        if (c > 255) {
-            throw new TypeError("Argument is not a valid bytestring");
-        }
-    }
-
-    return x;
-};
-
-conversions["USVString"] = function (V) {
-    const S = String(V);
-    const n = S.length;
-    const U = [];
-    for (let i = 0; i < n; ++i) {
-        const c = S.charCodeAt(i);
-        if (c < 0xD800 || c > 0xDFFF) {
-            U.push(String.fromCodePoint(c));
-        } else if (0xDC00 <= c && c <= 0xDFFF) {
-            U.push(String.fromCodePoint(0xFFFD));
-        } else {
-            if (i === n - 1) {
-                U.push(String.fromCodePoint(0xFFFD));
-            } else {
-                const d = S.charCodeAt(i + 1);
-                if (0xDC00 <= d && d <= 0xDFFF) {
-                    const a = c & 0x3FF;
-                    const b = d & 0x3FF;
-                    U.push(String.fromCodePoint((2 << 15) + (2 << 9) * a + b));
-                    ++i;
-                } else {
-                    U.push(String.fromCodePoint(0xFFFD));
-                }
-            }
-        }
-    }
-
-    return U.join('');
-};
-
-conversions["Date"] = function (V, opts) {
-    if (!(V instanceof Date)) {
-        throw new TypeError("Argument is not a Date object");
-    }
-    if (isNaN(V)) {
-        return undefined;
-    }
-
-    return V;
-};
-
-conversions["RegExp"] = function (V, opts) {
-    if (!(V instanceof RegExp)) {
-        V = new RegExp(V);
-    }
-
-    return V;
-};
-
-
-/***/ }),
-
-/***/ 8262:
-/***/ ((__unused_webpack_module, exports, __nccwpck_require__) => {
-
-"use strict";
-
-const usm = __nccwpck_require__(33);
-
-exports.implementation = class URLImpl {
-  constructor(constructorArgs) {
-    const url = constructorArgs[0];
-    const base = constructorArgs[1];
-
-    let parsedBase = null;
-    if (base !== undefined) {
-      parsedBase = usm.basicURLParse(base);
-      if (parsedBase === "failure") {
-        throw new TypeError("Invalid base URL");
-      }
-    }
-
-    const parsedURL = usm.basicURLParse(url, { baseURL: parsedBase });
-    if (parsedURL === "failure") {
-      throw new TypeError("Invalid URL");
-    }
-
-    this._url = parsedURL;
-
-    // TODO: query stuff
-  }
-
-  get href() {
-    return usm.serializeURL(this._url);
-  }
-
-  set href(v) {
-    const parsedURL = usm.basicURLParse(v);
-    if (parsedURL === "failure") {
-      throw new TypeError("Invalid URL");
-    }
-
-    this._url = parsedURL;
-  }
-
-  get origin() {
-    return usm.serializeURLOrigin(this._url);
-  }
-
-  get protocol() {
-    return this._url.scheme + ":";
-  }
-
-  set protocol(v) {
-    usm.basicURLParse(v + ":", { url: this._url, stateOverride: "scheme start" });
-  }
-
-  get username() {
-    return this._url.username;
-  }
-
-  set username(v) {
-    if (usm.cannotHaveAUsernamePasswordPort(this._url)) {
-      return;
-    }
-
-    usm.setTheUsername(this._url, v);
-  }
-
-  get password() {
-    return this._url.password;
-  }
-
-  set password(v) {
-    if (usm.cannotHaveAUsernamePasswordPort(this._url)) {
-      return;
-    }
-
-    usm.setThePassword(this._url, v);
-  }
-
-  get host() {
-    const url = this._url;
-
-    if (url.host === null) {
-      return "";
-    }
-
-    if (url.port === null) {
-      return usm.serializeHost(url.host);
-    }
-
-    return usm.serializeHost(url.host) + ":" + usm.serializeInteger(url.port);
-  }
-
-  set host(v) {
-    if (this._url.cannotBeABaseURL) {
-      return;
-    }
-
-    usm.basicURLParse(v, { url: this._url, stateOverride: "host" });
-  }
-
-  get hostname() {
-    if (this._url.host === null) {
-      return "";
-    }
-
-    return usm.serializeHost(this._url.host);
-  }
-
-  set hostname(v) {
-    if (this._url.cannotBeABaseURL) {
-      return;
-    }
-
-    usm.basicURLParse(v, { url: this._url, stateOverride: "hostname" });
-  }
-
-  get port() {
-    if (this._url.port === null) {
-      return "";
-    }
-
-    return usm.serializeInteger(this._url.port);
-  }
-
-  set port(v) {
-    if (usm.cannotHaveAUsernamePasswordPort(this._url)) {
-      return;
-    }
-
-    if (v === "") {
-      this._url.port = null;
-    } else {
-      usm.basicURLParse(v, { url: this._url, stateOverride: "port" });
-    }
-  }
-
-  get pathname() {
-    if (this._url.cannotBeABaseURL) {
-      return this._url.path[0];
-    }
-
-    if (this._url.path.length === 0) {
-      return "";
-    }
-
-    return "/" + this._url.path.join("/");
-  }
-
-  set pathname(v) {
-    if (this._url.cannotBeABaseURL) {
-      return;
-    }
-
-    this._url.path = [];
-    usm.basicURLParse(v, { url: this._url, stateOverride: "path start" });
-  }
-
-  get search() {
-    if (this._url.query === null || this._url.query === "") {
-      return "";
-    }
-
-    return "?" + this._url.query;
-  }
-
-  set search(v) {
-    // TODO: query stuff
-
-    const url = this._url;
-
-    if (v === "") {
-      url.query = null;
-      return;
-    }
-
-    const input = v[0] === "?" ? v.substring(1) : v;
-    url.query = "";
-    usm.basicURLParse(input, { url, stateOverride: "query" });
-  }
-
-  get hash() {
-    if (this._url.fragment === null || this._url.fragment === "") {
-      return "";
-    }
-
-    return "#" + this._url.fragment;
-  }
-
-  set hash(v) {
-    if (v === "") {
-      this._url.fragment = null;
-      return;
-    }
-
-    const input = v[0] === "#" ? v.substring(1) : v;
-    this._url.fragment = "";
-    usm.basicURLParse(input, { url: this._url, stateOverride: "fragment" });
-  }
-
-  toJSON() {
-    return this.href;
-  }
-};
-
-
-/***/ }),
-
-/***/ 653:
-/***/ ((module, __unused_webpack_exports, __nccwpck_require__) => {
-
-"use strict";
-
-
-const conversions = __nccwpck_require__(5871);
-const utils = __nccwpck_require__(276);
-const Impl = __nccwpck_require__(8262);
-
-const impl = utils.implSymbol;
-
-function URL(url) {
-  if (!this || this[impl] || !(this instanceof URL)) {
-    throw new TypeError("Failed to construct 'URL': Please use the 'new' operator, this DOM object constructor cannot be called as a function.");
-  }
-  if (arguments.length < 1) {
-    throw new TypeError("Failed to construct 'URL': 1 argument required, but only " + arguments.length + " present.");
-  }
-  const args = [];
-  for (let i = 0; i < arguments.length && i < 2; ++i) {
-    args[i] = arguments[i];
-  }
-  args[0] = conversions["USVString"](args[0]);
-  if (args[1] !== undefined) {
-  args[1] = conversions["USVString"](args[1]);
-  }
-
-  module.exports.setup(this, args);
-}
-
-URL.prototype.toJSON = function toJSON() {
-  if (!this || !module.exports.is(this)) {
-    throw new TypeError("Illegal invocation");
-  }
-  const args = [];
-  for (let i = 0; i < arguments.length && i < 0; ++i) {
-    args[i] = arguments[i];
-  }
-  return this[impl].toJSON.apply(this[impl], args);
-};
-Object.defineProperty(URL.prototype, "href", {
-  get() {
-    return this[impl].href;
-  },
-  set(V) {
-    V = conversions["USVString"](V);
-    this[impl].href = V;
-  },
-  enumerable: true,
-  configurable: true
-});
-
-URL.prototype.toString = function () {
-  if (!this || !module.exports.is(this)) {
-    throw new TypeError("Illegal invocation");
-  }
-  return this.href;
-};
-
-Object.defineProperty(URL.prototype, "origin", {
-  get() {
-    return this[impl].origin;
-  },
-  enumerable: true,
-  configurable: true
-});
-
-Object.defineProperty(URL.prototype, "protocol", {
-  get() {
-    return this[impl].protocol;
-  },
-  set(V) {
-    V = conversions["USVString"](V);
-    this[impl].protocol = V;
-  },
-  enumerable: true,
-  configurable: true
-});
-
-Object.defineProperty(URL.prototype, "username", {
-  get() {
-    return this[impl].username;
-  },
-  set(V) {
-    V = conversions["USVString"](V);
-    this[impl].username = V;
-  },
-  enumerable: true,
-  configurable: true
-});
-
-Object.defineProperty(URL.prototype, "password", {
-  get() {
-    return this[impl].password;
-  },
-  set(V) {
-    V = conversions["USVString"](V);
-    this[impl].password = V;
-  },
-  enumerable: true,
-  configurable: true
-});
-
-Object.defineProperty(URL.prototype, "host", {
-  get() {
-    return this[impl].host;
-  },
-  set(V) {
-    V = conversions["USVString"](V);
-    this[impl].host = V;
-  },
-  enumerable: true,
-  configurable: true
-});
-
-Object.defineProperty(URL.prototype, "hostname", {
-  get() {
-    return this[impl].hostname;
-  },
-  set(V) {
-    V = conversions["USVString"](V);
-    this[impl].hostname = V;
-  },
-  enumerable: true,
-  configurable: true
-});
-
-Object.defineProperty(URL.prototype, "port", {
-  get() {
-    return this[impl].port;
-  },
-  set(V) {
-    V = conversions["USVString"](V);
-    this[impl].port = V;
-  },
-  enumerable: true,
-  configurable: true
-});
-
-Object.defineProperty(URL.prototype, "pathname", {
-  get() {
-    return this[impl].pathname;
-  },
-  set(V) {
-    V = conversions["USVString"](V);
-    this[impl].pathname = V;
-  },
-  enumerable: true,
-  configurable: true
-});
-
-Object.defineProperty(URL.prototype, "search", {
-  get() {
-    return this[impl].search;
-  },
-  set(V) {
-    V = conversions["USVString"](V);
-    this[impl].search = V;
-  },
-  enumerable: true,
-  configurable: true
-});
-
-Object.defineProperty(URL.prototype, "hash", {
-  get() {
-    return this[impl].hash;
-  },
-  set(V) {
-    V = conversions["USVString"](V);
-    this[impl].hash = V;
-  },
-  enumerable: true,
-  configurable: true
-});
-
-
-module.exports = {
-  is(obj) {
-    return !!obj && obj[impl] instanceof Impl.implementation;
-  },
-  create(constructorArgs, privateData) {
-    let obj = Object.create(URL.prototype);
-    this.setup(obj, constructorArgs, privateData);
-    return obj;
-  },
-  setup(obj, constructorArgs, privateData) {
-    if (!privateData) privateData = {};
-    privateData.wrapper = obj;
-
-    obj[impl] = new Impl.implementation(constructorArgs, privateData);
-    obj[impl][utils.wrapperSymbol] = obj;
-  },
-  interface: URL,
-  expose: {
-    Window: { URL: URL },
-    Worker: { URL: URL }
-  }
-};
-
-
-
-/***/ }),
-
-/***/ 3323:
-/***/ ((__unused_webpack_module, exports, __nccwpck_require__) => {
-
-"use strict";
-
-
-exports.URL = __nccwpck_require__(653)["interface"];
-exports.serializeURL = __nccwpck_require__(33).serializeURL;
-exports.serializeURLOrigin = __nccwpck_require__(33).serializeURLOrigin;
-exports.basicURLParse = __nccwpck_require__(33).basicURLParse;
-exports.setTheUsername = __nccwpck_require__(33).setTheUsername;
-exports.setThePassword = __nccwpck_require__(33).setThePassword;
-exports.serializeHost = __nccwpck_require__(33).serializeHost;
-exports.serializeInteger = __nccwpck_require__(33).serializeInteger;
-exports.parseURL = __nccwpck_require__(33).parseURL;
-
-
-/***/ }),
-
-/***/ 33:
-/***/ ((module, __unused_webpack_exports, __nccwpck_require__) => {
-
-"use strict";
-
-const punycode = __nccwpck_require__(5477);
-const tr46 = __nccwpck_require__(2299);
-
-const specialSchemes = {
-  ftp: 21,
-  file: null,
-  gopher: 70,
-  http: 80,
-  https: 443,
-  ws: 80,
-  wss: 443
-};
-
-const failure = Symbol("failure");
-
-function countSymbols(str) {
-  return punycode.ucs2.decode(str).length;
-}
-
-function at(input, idx) {
-  const c = input[idx];
-  return isNaN(c) ? undefined : String.fromCodePoint(c);
-}
-
-function isASCIIDigit(c) {
-  return c >= 0x30 && c <= 0x39;
-}
-
-function isASCIIAlpha(c) {
-  return (c >= 0x41 && c <= 0x5A) || (c >= 0x61 && c <= 0x7A);
-}
-
-function isASCIIAlphanumeric(c) {
-  return isASCIIAlpha(c) || isASCIIDigit(c);
-}
-
-function isASCIIHex(c) {
-  return isASCIIDigit(c) || (c >= 0x41 && c <= 0x46) || (c >= 0x61 && c <= 0x66);
-}
-
-function isSingleDot(buffer) {
-  return buffer === "." || buffer.toLowerCase() === "%2e";
-}
-
-function isDoubleDot(buffer) {
-  buffer = buffer.toLowerCase();
-  return buffer === ".." || buffer === "%2e." || buffer === ".%2e" || buffer === "%2e%2e";
-}
-
-function isWindowsDriveLetterCodePoints(cp1, cp2) {
-  return isASCIIAlpha(cp1) && (cp2 === 58 || cp2 === 124);
-}
-
-function isWindowsDriveLetterString(string) {
-  return string.length === 2 && isASCIIAlpha(string.codePointAt(0)) && (string[1] === ":" || string[1] === "|");
-}
-
-function isNormalizedWindowsDriveLetterString(string) {
-  return string.length === 2 && isASCIIAlpha(string.codePointAt(0)) && string[1] === ":";
-}
-
-function containsForbiddenHostCodePoint(string) {
-  return string.search(/\u0000|\u0009|\u000A|\u000D|\u0020|#|%|\/|:|\?|@|\[|\\|\]/) !== -1;
-}
-
-function containsForbiddenHostCodePointExcludingPercent(string) {
-  return string.search(/\u0000|\u0009|\u000A|\u000D|\u0020|#|\/|:|\?|@|\[|\\|\]/) !== -1;
-}
-
-function isSpecialScheme(scheme) {
-  return specialSchemes[scheme] !== undefined;
-}
-
-function isSpecial(url) {
-  return isSpecialScheme(url.scheme);
-}
-
-function defaultPort(scheme) {
-  return specialSchemes[scheme];
-}
-
-function percentEncode(c) {
-  let hex = c.toString(16).toUpperCase();
-  if (hex.length === 1) {
-    hex = "0" + hex;
-  }
-
-  return "%" + hex;
-}
-
-function utf8PercentEncode(c) {
-  const buf = new Buffer(c);
-
-  let str = "";
-
-  for (let i = 0; i < buf.length; ++i) {
-    str += percentEncode(buf[i]);
-  }
-
-  return str;
-}
-
-function utf8PercentDecode(str) {
-  const input = new Buffer(str);
-  const output = [];
-  for (let i = 0; i < input.length; ++i) {
-    if (input[i] !== 37) {
-      output.push(input[i]);
-    } else if (input[i] === 37 && isASCIIHex(input[i + 1]) && isASCIIHex(input[i + 2])) {
-      output.push(parseInt(input.slice(i + 1, i + 3).toString(), 16));
-      i += 2;
-    } else {
-      output.push(input[i]);
-    }
-  }
-  return new Buffer(output).toString();
-}
-
-function isC0ControlPercentEncode(c) {
-  return c <= 0x1F || c > 0x7E;
-}
-
-const extraPathPercentEncodeSet = new Set([32, 34, 35, 60, 62, 63, 96, 123, 125]);
-function isPathPercentEncode(c) {
-  return isC0ControlPercentEncode(c) || extraPathPercentEncodeSet.has(c);
-}
-
-const extraUserinfoPercentEncodeSet =
-  new Set([47, 58, 59, 61, 64, 91, 92, 93, 94, 124]);
-function isUserinfoPercentEncode(c) {
-  return isPathPercentEncode(c) || extraUserinfoPercentEncodeSet.has(c);
-}
-
-function percentEncodeChar(c, encodeSetPredicate) {
-  const cStr = String.fromCodePoint(c);
-
-  if (encodeSetPredicate(c)) {
-    return utf8PercentEncode(cStr);
-  }
-
-  return cStr;
-}
-
-function parseIPv4Number(input) {
-  let R = 10;
-
-  if (input.length >= 2 && input.charAt(0) === "0" && input.charAt(1).toLowerCase() === "x") {
-    input = input.substring(2);
-    R = 16;
-  } else if (input.length >= 2 && input.charAt(0) === "0") {
-    input = input.substring(1);
-    R = 8;
-  }
-
-  if (input === "") {
-    return 0;
-  }
-
-  const regex = R === 10 ? /[^0-9]/ : (R === 16 ? /[^0-9A-Fa-f]/ : /[^0-7]/);
-  if (regex.test(input)) {
-    return failure;
-  }
-
-  return parseInt(input, R);
-}
-
-function parseIPv4(input) {
-  const parts = input.split(".");
-  if (parts[parts.length - 1] === "") {
-    if (parts.length > 1) {
-      parts.pop();
-    }
-  }
-
-  if (parts.length > 4) {
-    return input;
-  }
-
-  const numbers = [];
-  for (const part of parts) {
-    if (part === "") {
-      return input;
-    }
-    const n = parseIPv4Number(part);
-    if (n === failure) {
-      return input;
-    }
-
-    numbers.push(n);
-  }
-
-  for (let i = 0; i < numbers.length - 1; ++i) {
-    if (numbers[i] > 255) {
-      return failure;
-    }
-  }
-  if (numbers[numbers.length - 1] >= Math.pow(256, 5 - numbers.length)) {
-    return failure;
-  }
-
-  let ipv4 = numbers.pop();
-  let counter = 0;
-
-  for (const n of numbers) {
-    ipv4 += n * Math.pow(256, 3 - counter);
-    ++counter;
-  }
-
-  return ipv4;
-}
-
-function serializeIPv4(address) {
-  let output = "";
-  let n = address;
-
-  for (let i = 1; i <= 4; ++i) {
-    output = String(n % 256) + output;
-    if (i !== 4) {
-      output = "." + output;
-    }
-    n = Math.floor(n / 256);
-  }
-
-  return output;
-}
-
-function parseIPv6(input) {
-  const address = [0, 0, 0, 0, 0, 0, 0, 0];
-  let pieceIndex = 0;
-  let compress = null;
-  let pointer = 0;
-
-  input = punycode.ucs2.decode(input);
-
-  if (input[pointer] === 58) {
-    if (input[pointer + 1] !== 58) {
-      return failure;
-    }
-
-    pointer += 2;
-    ++pieceIndex;
-    compress = pieceIndex;
-  }
-
-  while (pointer < input.length) {
-    if (pieceIndex === 8) {
-      return failure;
-    }
-
-    if (input[pointer] === 58) {
-      if (compress !== null) {
-        return failure;
-      }
-      ++pointer;
-      ++pieceIndex;
-      compress = pieceIndex;
-      continue;
-    }
-
-    let value = 0;
-    let length = 0;
-
-    while (length < 4 && isASCIIHex(input[pointer])) {
-      value = value * 0x10 + parseInt(at(input, pointer), 16);
-      ++pointer;
-      ++length;
-    }
-
-    if (input[pointer] === 46) {
-      if (length === 0) {
-        return failure;
-      }
-
-      pointer -= length;
-
-      if (pieceIndex > 6) {
-        return failure;
-      }
-
-      let numbersSeen = 0;
-
-      while (input[pointer] !== undefined) {
-        let ipv4Piece = null;
-
-        if (numbersSeen > 0) {
-          if (input[pointer] === 46 && numbersSeen < 4) {
-            ++pointer;
-          } else {
-            return failure;
-          }
-        }
-
-        if (!isASCIIDigit(input[pointer])) {
-          return failure;
-        }
-
-        while (isASCIIDigit(input[pointer])) {
-          const number = parseInt(at(input, pointer));
-          if (ipv4Piece === null) {
-            ipv4Piece = number;
-          } else if (ipv4Piece === 0) {
-            return failure;
-          } else {
-            ipv4Piece = ipv4Piece * 10 + number;
-          }
-          if (ipv4Piece > 255) {
-            return failure;
-          }
-          ++pointer;
-        }
-
-        address[pieceIndex] = address[pieceIndex] * 0x100 + ipv4Piece;
-
-        ++numbersSeen;
-
-        if (numbersSeen === 2 || numbersSeen === 4) {
-          ++pieceIndex;
-        }
-      }
-
-      if (numbersSeen !== 4) {
-        return failure;
-      }
-
-      break;
-    } else if (input[pointer] === 58) {
-      ++pointer;
-      if (input[pointer] === undefined) {
-        return failure;
-      }
-    } else if (input[pointer] !== undefined) {
-      return failure;
-    }
-
-    address[pieceIndex] = value;
-    ++pieceIndex;
-  }
-
-  if (compress !== null) {
-    let swaps = pieceIndex - compress;
-    pieceIndex = 7;
-    while (pieceIndex !== 0 && swaps > 0) {
-      const temp = address[compress + swaps - 1];
-      address[compress + swaps - 1] = address[pieceIndex];
-      address[pieceIndex] = temp;
-      --pieceIndex;
-      --swaps;
-    }
-  } else if (compress === null && pieceIndex !== 8) {
-    return failure;
-  }
-
-  return address;
-}
-
-function serializeIPv6(address) {
-  let output = "";
-  const seqResult = findLongestZeroSequence(address);
-  const compress = seqResult.idx;
-  let ignore0 = false;
-
-  for (let pieceIndex = 0; pieceIndex <= 7; ++pieceIndex) {
-    if (ignore0 && address[pieceIndex] === 0) {
-      continue;
-    } else if (ignore0) {
-      ignore0 = false;
-    }
-
-    if (compress === pieceIndex) {
-      const separator = pieceIndex === 0 ? "::" : ":";
-      output += separator;
-      ignore0 = true;
-      continue;
-    }
-
-    output += address[pieceIndex].toString(16);
-
-    if (pieceIndex !== 7) {
-      output += ":";
-    }
-  }
-
-  return output;
-}
-
-function parseHost(input, isSpecialArg) {
-  if (input[0] === "[") {
-    if (input[input.length - 1] !== "]") {
-      return failure;
-    }
-
-    return parseIPv6(input.substring(1, input.length - 1));
-  }
-
-  if (!isSpecialArg) {
-    return parseOpaqueHost(input);
-  }
-
-  const domain = utf8PercentDecode(input);
-  const asciiDomain = tr46.toASCII(domain, false, tr46.PROCESSING_OPTIONS.NONTRANSITIONAL, false);
-  if (asciiDomain === null) {
-    return failure;
-  }
-
-  if (containsForbiddenHostCodePoint(asciiDomain)) {
-    return failure;
-  }
-
-  const ipv4Host = parseIPv4(asciiDomain);
-  if (typeof ipv4Host === "number" || ipv4Host === failure) {
-    return ipv4Host;
-  }
-
-  return asciiDomain;
-}
-
-function parseOpaqueHost(input) {
-  if (containsForbiddenHostCodePointExcludingPercent(input)) {
-    return failure;
-  }
-
-  let output = "";
-  const decoded = punycode.ucs2.decode(input);
-  for (let i = 0; i < decoded.length; ++i) {
-    output += percentEncodeChar(decoded[i], isC0ControlPercentEncode);
-  }
-  return output;
-}
-
-function findLongestZeroSequence(arr) {
-  let maxIdx = null;
-  let maxLen = 1; // only find elements > 1
-  let currStart = null;
-  let currLen = 0;
-
-  for (let i = 0; i < arr.length; ++i) {
-    if (arr[i] !== 0) {
-      if (currLen > maxLen) {
-        maxIdx = currStart;
-        maxLen = currLen;
-      }
-
-      currStart = null;
-      currLen = 0;
-    } else {
-      if (currStart === null) {
-        currStart = i;
-      }
-      ++currLen;
-    }
-  }
-
-  // if trailing zeros
-  if (currLen > maxLen) {
-    maxIdx = currStart;
-    maxLen = currLen;
-  }
-
-  return {
-    idx: maxIdx,
-    len: maxLen
-  };
-}
-
-function serializeHost(host) {
-  if (typeof host === "number") {
-    return serializeIPv4(host);
-  }
-
-  // IPv6 serializer
-  if (host instanceof Array) {
-    return "[" + serializeIPv6(host) + "]";
-  }
-
-  return host;
-}
-
-function trimControlChars(url) {
-  return url.replace(/^[\u0000-\u001F\u0020]+|[\u0000-\u001F\u0020]+$/g, "");
-}
-
-function trimTabAndNewline(url) {
-  return url.replace(/\u0009|\u000A|\u000D/g, "");
-}
-
-function shortenPath(url) {
-  const path = url.path;
-  if (path.length === 0) {
-    return;
-  }
-  if (url.scheme === "file" && path.length === 1 && isNormalizedWindowsDriveLetter(path[0])) {
-    return;
-  }
-
-  path.pop();
-}
-
-function includesCredentials(url) {
-  return url.username !== "" || url.password !== "";
-}
-
-function cannotHaveAUsernamePasswordPort(url) {
-  return url.host === null || url.host === "" || url.cannotBeABaseURL || url.scheme === "file";
-}
-
-function isNormalizedWindowsDriveLetter(string) {
-  return /^[A-Za-z]:$/.test(string);
-}
-
-function URLStateMachine(input, base, encodingOverride, url, stateOverride) {
-  this.pointer = 0;
-  this.input = input;
-  this.base = base || null;
-  this.encodingOverride = encodingOverride || "utf-8";
-  this.stateOverride = stateOverride;
-  this.url = url;
-  this.failure = false;
-  this.parseError = false;
-
-  if (!this.url) {
-    this.url = {
-      scheme: "",
-      username: "",
-      password: "",
-      host: null,
-      port: null,
-      path: [],
-      query: null,
-      fragment: null,
-
-      cannotBeABaseURL: false
-    };
-
-    const res = trimControlChars(this.input);
-    if (res !== this.input) {
-      this.parseError = true;
-    }
-    this.input = res;
-  }
-
-  const res = trimTabAndNewline(this.input);
-  if (res !== this.input) {
-    this.parseError = true;
-  }
-  this.input = res;
-
-  this.state = stateOverride || "scheme start";
-
-  this.buffer = "";
-  this.atFlag = false;
-  this.arrFlag = false;
-  this.passwordTokenSeenFlag = false;
-
-  this.input = punycode.ucs2.decode(this.input);
-
-  for (; this.pointer <= this.input.length; ++this.pointer) {
-    const c = this.input[this.pointer];
-    const cStr = isNaN(c) ? undefined : String.fromCodePoint(c);
-
-    // exec state machine
-    const ret = this["parse " + this.state](c, cStr);
-    if (!ret) {
-      break; // terminate algorithm
-    } else if (ret === failure) {
-      this.failure = true;
-      break;
-    }
-  }
-}
-
-URLStateMachine.prototype["parse scheme start"] = function parseSchemeStart(c, cStr) {
-  if (isASCIIAlpha(c)) {
-    this.buffer += cStr.toLowerCase();
-    this.state = "scheme";
-  } else if (!this.stateOverride) {
-    this.state = "no scheme";
-    --this.pointer;
-  } else {
-    this.parseError = true;
-    return failure;
-  }
-
-  return true;
-};
-
-URLStateMachine.prototype["parse scheme"] = function parseScheme(c, cStr) {
-  if (isASCIIAlphanumeric(c) || c === 43 || c === 45 || c === 46) {
-    this.buffer += cStr.toLowerCase();
-  } else if (c === 58) {
-    if (this.stateOverride) {
-      if (isSpecial(this.url) && !isSpecialScheme(this.buffer)) {
-        return false;
-      }
-
-      if (!isSpecial(this.url) && isSpecialScheme(this.buffer)) {
-        return false;
-      }
-
-      if ((includesCredentials(this.url) || this.url.port !== null) && this.buffer === "file") {
-        return false;
-      }
-
-      if (this.url.scheme === "file" && (this.url.host === "" || this.url.host === null)) {
-        return false;
-      }
-    }
-    this.url.scheme = this.buffer;
-    this.buffer = "";
-    if (this.stateOverride) {
-      return false;
-    }
-    if (this.url.scheme === "file") {
-      if (this.input[this.pointer + 1] !== 47 || this.input[this.pointer + 2] !== 47) {
-        this.parseError = true;
-      }
-      this.state = "file";
-    } else if (isSpecial(this.url) && this.base !== null && this.base.scheme === this.url.scheme) {
-      this.state = "special relative or authority";
-    } else if (isSpecial(this.url)) {
-      this.state = "special authority slashes";
-    } else if (this.input[this.pointer + 1] === 47) {
-      this.state = "path or authority";
-      ++this.pointer;
-    } else {
-      this.url.cannotBeABaseURL = true;
-      this.url.path.push("");
-      this.state = "cannot-be-a-base-URL path";
-    }
-  } else if (!this.stateOverride) {
-    this.buffer = "";
-    this.state = "no scheme";
-    this.pointer = -1;
-  } else {
-    this.parseError = true;
-    return failure;
-  }
-
-  return true;
-};
-
-URLStateMachine.prototype["parse no scheme"] = function parseNoScheme(c) {
-  if (this.base === null || (this.base.cannotBeABaseURL && c !== 35)) {
-    return failure;
-  } else if (this.base.cannotBeABaseURL && c === 35) {
-    this.url.scheme = this.base.scheme;
-    this.url.path = this.base.path.slice();
-    this.url.query = this.base.query;
-    this.url.fragment = "";
-    this.url.cannotBeABaseURL = true;
-    this.state = "fragment";
-  } else if (this.base.scheme === "file") {
-    this.state = "file";
-    --this.pointer;
-  } else {
-    this.state = "relative";
-    --this.pointer;
-  }
-
-  return true;
-};
-
-URLStateMachine.prototype["parse special relative or authority"] = function parseSpecialRelativeOrAuthority(c) {
-  if (c === 47 && this.input[this.pointer + 1] === 47) {
-    this.state = "special authority ignore slashes";
-    ++this.pointer;
-  } else {
-    this.parseError = true;
-    this.state = "relative";
-    --this.pointer;
-  }
-
-  return true;
-};
-
-URLStateMachine.prototype["parse path or authority"] = function parsePathOrAuthority(c) {
-  if (c === 47) {
-    this.state = "authority";
-  } else {
-    this.state = "path";
-    --this.pointer;
-  }
-
-  return true;
-};
-
-URLStateMachine.prototype["parse relative"] = function parseRelative(c) {
-  this.url.scheme = this.base.scheme;
-  if (isNaN(c)) {
-    this.url.username = this.base.username;
-    this.url.password = this.base.password;
-    this.url.host = this.base.host;
-    this.url.port = this.base.port;
-    this.url.path = this.base.path.slice();
-    this.url.query = this.base.query;
-  } else if (c === 47) {
-    this.state = "relative slash";
-  } else if (c === 63) {
-    this.url.username = this.base.username;
-    this.url.password = this.base.password;
-    this.url.host = this.base.host;
-    this.url.port = this.base.port;
-    this.url.path = this.base.path.slice();
-    this.url.query = "";
-    this.state = "query";
-  } else if (c === 35) {
-    this.url.username = this.base.username;
-    this.url.password = this.base.password;
-    this.url.host = this.base.host;
-    this.url.port = this.base.port;
-    this.url.path = this.base.path.slice();
-    this.url.query = this.base.query;
-    this.url.fragment = "";
-    this.state = "fragment";
-  } else if (isSpecial(this.url) && c === 92) {
-    this.parseError = true;
-    this.state = "relative slash";
-  } else {
-    this.url.username = this.base.username;
-    this.url.password = this.base.password;
-    this.url.host = this.base.host;
-    this.url.port = this.base.port;
-    this.url.path = this.base.path.slice(0, this.base.path.length - 1);
-
-    this.state = "path";
-    --this.pointer;
-  }
-
-  return true;
-};
-
-URLStateMachine.prototype["parse relative slash"] = function parseRelativeSlash(c) {
-  if (isSpecial(this.url) && (c === 47 || c === 92)) {
-    if (c === 92) {
-      this.parseError = true;
-    }
-    this.state = "special authority ignore slashes";
-  } else if (c === 47) {
-    this.state = "authority";
-  } else {
-    this.url.username = this.base.username;
-    this.url.password = this.base.password;
-    this.url.host = this.base.host;
-    this.url.port = this.base.port;
-    this.state = "path";
-    --this.pointer;
-  }
-
-  return true;
-};
-
-URLStateMachine.prototype["parse special authority slashes"] = function parseSpecialAuthoritySlashes(c) {
-  if (c === 47 && this.input[this.pointer + 1] === 47) {
-    this.state = "special authority ignore slashes";
-    ++this.pointer;
-  } else {
-    this.parseError = true;
-    this.state = "special authority ignore slashes";
-    --this.pointer;
-  }
-
-  return true;
-};
-
-URLStateMachine.prototype["parse special authority ignore slashes"] = function parseSpecialAuthorityIgnoreSlashes(c) {
-  if (c !== 47 && c !== 92) {
-    this.state = "authority";
-    --this.pointer;
-  } else {
-    this.parseError = true;
-  }
-
-  return true;
-};
-
-URLStateMachine.prototype["parse authority"] = function parseAuthority(c, cStr) {
-  if (c === 64) {
-    this.parseError = true;
-    if (this.atFlag) {
-      this.buffer = "%40" + this.buffer;
-    }
-    this.atFlag = true;
-
-    // careful, this is based on buffer and has its own pointer (this.pointer != pointer) and inner chars
-    const len = countSymbols(this.buffer);
-    for (let pointer = 0; pointer < len; ++pointer) {
-      const codePoint = this.buffer.codePointAt(pointer);
-
-      if (codePoint === 58 && !this.passwordTokenSeenFlag) {
-        this.passwordTokenSeenFlag = true;
-        continue;
-      }
-      const encodedCodePoints = percentEncodeChar(codePoint, isUserinfoPercentEncode);
-      if (this.passwordTokenSeenFlag) {
-        this.url.password += encodedCodePoints;
-      } else {
-        this.url.username += encodedCodePoints;
-      }
-    }
-    this.buffer = "";
-  } else if (isNaN(c) || c === 47 || c === 63 || c === 35 ||
-             (isSpecial(this.url) && c === 92)) {
-    if (this.atFlag && this.buffer === "") {
-      this.parseError = true;
-      return failure;
-    }
-    this.pointer -= countSymbols(this.buffer) + 1;
-    this.buffer = "";
-    this.state = "host";
-  } else {
-    this.buffer += cStr;
-  }
-
-  return true;
-};
-
-URLStateMachine.prototype["parse hostname"] =
-URLStateMachine.prototype["parse host"] = function parseHostName(c, cStr) {
-  if (this.stateOverride && this.url.scheme === "file") {
-    --this.pointer;
-    this.state = "file host";
-  } else if (c === 58 && !this.arrFlag) {
-    if (this.buffer === "") {
-      this.parseError = true;
-      return failure;
-    }
-
-    const host = parseHost(this.buffer, isSpecial(this.url));
-    if (host === failure) {
-      return failure;
-    }
-
-    this.url.host = host;
-    this.buffer = "";
-    this.state = "port";
-    if (this.stateOverride === "hostname") {
-      return false;
-    }
-  } else if (isNaN(c) || c === 47 || c === 63 || c === 35 ||
-             (isSpecial(this.url) && c === 92)) {
-    --this.pointer;
-    if (isSpecial(this.url) && this.buffer === "") {
-      this.parseError = true;
-      return failure;
-    } else if (this.stateOverride && this.buffer === "" &&
-               (includesCredentials(this.url) || this.url.port !== null)) {
-      this.parseError = true;
-      return false;
-    }
-
-    const host = parseHost(this.buffer, isSpecial(this.url));
-    if (host === failure) {
-      return failure;
-    }
-
-    this.url.host = host;
-    this.buffer = "";
-    this.state = "path start";
-    if (this.stateOverride) {
-      return false;
-    }
-  } else {
-    if (c === 91) {
-      this.arrFlag = true;
-    } else if (c === 93) {
-      this.arrFlag = false;
-    }
-    this.buffer += cStr;
-  }
-
-  return true;
-};
-
-URLStateMachine.prototype["parse port"] = function parsePort(c, cStr) {
-  if (isASCIIDigit(c)) {
-    this.buffer += cStr;
-  } else if (isNaN(c) || c === 47 || c === 63 || c === 35 ||
-             (isSpecial(this.url) && c === 92) ||
-             this.stateOverride) {
-    if (this.buffer !== "") {
-      const port = parseInt(this.buffer);
-      if (port > Math.pow(2, 16) - 1) {
-        this.parseError = true;
-        return failure;
-      }
-      this.url.port = port === defaultPort(this.url.scheme) ? null : port;
-      this.buffer = "";
-    }
-    if (this.stateOverride) {
-      return false;
-    }
-    this.state = "path start";
-    --this.pointer;
-  } else {
-    this.parseError = true;
-    return failure;
-  }
-
-  return true;
-};
-
-const fileOtherwiseCodePoints = new Set([47, 92, 63, 35]);
-
-URLStateMachine.prototype["parse file"] = function parseFile(c) {
-  this.url.scheme = "file";
-
-  if (c === 47 || c === 92) {
-    if (c === 92) {
-      this.parseError = true;
-    }
-    this.state = "file slash";
-  } else if (this.base !== null && this.base.scheme === "file") {
-    if (isNaN(c)) {
-      this.url.host = this.base.host;
-      this.url.path = this.base.path.slice();
-      this.url.query = this.base.query;
-    } else if (c === 63) {
-      this.url.host = this.base.host;
-      this.url.path = this.base.path.slice();
-      this.url.query = "";
-      this.state = "query";
-    } else if (c === 35) {
-      this.url.host = this.base.host;
-      this.url.path = this.base.path.slice();
-      this.url.query = this.base.query;
-      this.url.fragment = "";
-      this.state = "fragment";
-    } else {
-      if (this.input.length - this.pointer - 1 === 0 || // remaining consists of 0 code points
-          !isWindowsDriveLetterCodePoints(c, this.input[this.pointer + 1]) ||
-          (this.input.length - this.pointer - 1 >= 2 && // remaining has at least 2 code points
-           !fileOtherwiseCodePoints.has(this.input[this.pointer + 2]))) {
-        this.url.host = this.base.host;
-        this.url.path = this.base.path.slice();
-        shortenPath(this.url);
-      } else {
-        this.parseError = true;
-      }
-
-      this.state = "path";
-      --this.pointer;
-    }
-  } else {
-    this.state = "path";
-    --this.pointer;
-  }
-
-  return true;
-};
-
-URLStateMachine.prototype["parse file slash"] = function parseFileSlash(c) {
-  if (c === 47 || c === 92) {
-    if (c === 92) {
-      this.parseError = true;
-    }
-    this.state = "file host";
-  } else {
-    if (this.base !== null && this.base.scheme === "file") {
-      if (isNormalizedWindowsDriveLetterString(this.base.path[0])) {
-        this.url.path.push(this.base.path[0]);
-      } else {
-        this.url.host = this.base.host;
-      }
-    }
-    this.state = "path";
-    --this.pointer;
-  }
-
-  return true;
-};
-
-URLStateMachine.prototype["parse file host"] = function parseFileHost(c, cStr) {
-  if (isNaN(c) || c === 47 || c === 92 || c === 63 || c === 35) {
-    --this.pointer;
-    if (!this.stateOverride && isWindowsDriveLetterString(this.buffer)) {
-      this.parseError = true;
-      this.state = "path";
-    } else if (this.buffer === "") {
-      this.url.host = "";
-      if (this.stateOverride) {
-        return false;
-      }
-      this.state = "path start";
-    } else {
-      let host = parseHost(this.buffer, isSpecial(this.url));
-      if (host === failure) {
-        return failure;
-      }
-      if (host === "localhost") {
-        host = "";
-      }
-      this.url.host = host;
-
-      if (this.stateOverride) {
-        return false;
-      }
-
-      this.buffer = "";
-      this.state = "path start";
-    }
-  } else {
-    this.buffer += cStr;
-  }
-
-  return true;
-};
-
-URLStateMachine.prototype["parse path start"] = function parsePathStart(c) {
-  if (isSpecial(this.url)) {
-    if (c === 92) {
-      this.parseError = true;
-    }
-    this.state = "path";
-
-    if (c !== 47 && c !== 92) {
-      --this.pointer;
-    }
-  } else if (!this.stateOverride && c === 63) {
-    this.url.query = "";
-    this.state = "query";
-  } else if (!this.stateOverride && c === 35) {
-    this.url.fragment = "";
-    this.state = "fragment";
-  } else if (c !== undefined) {
-    this.state = "path";
-    if (c !== 47) {
-      --this.pointer;
-    }
-  }
-
-  return true;
-};
-
-URLStateMachine.prototype["parse path"] = function parsePath(c) {
-  if (isNaN(c) || c === 47 || (isSpecial(this.url) && c === 92) ||
-      (!this.stateOverride && (c === 63 || c === 35))) {
-    if (isSpecial(this.url) && c === 92) {
-      this.parseError = true;
-    }
-
-    if (isDoubleDot(this.buffer)) {
-      shortenPath(this.url);
-      if (c !== 47 && !(isSpecial(this.url) && c === 92)) {
-        this.url.path.push("");
-      }
-    } else if (isSingleDot(this.buffer) && c !== 47 &&
-               !(isSpecial(this.url) && c === 92)) {
-      this.url.path.push("");
-    } else if (!isSingleDot(this.buffer)) {
-      if (this.url.scheme === "file" && this.url.path.length === 0 && isWindowsDriveLetterString(this.buffer)) {
-        if (this.url.host !== "" && this.url.host !== null) {
-          this.parseError = true;
-          this.url.host = "";
-        }
-        this.buffer = this.buffer[0] + ":";
-      }
-      this.url.path.push(this.buffer);
-    }
-    this.buffer = "";
-    if (this.url.scheme === "file" && (c === undefined || c === 63 || c === 35)) {
-      while (this.url.path.length > 1 && this.url.path[0] === "") {
-        this.parseError = true;
-        this.url.path.shift();
-      }
-    }
-    if (c === 63) {
-      this.url.query = "";
-      this.state = "query";
-    }
-    if (c === 35) {
-      this.url.fragment = "";
-      this.state = "fragment";
-    }
-  } else {
-    // TODO: If c is not a URL code point and not "%", parse error.
-
-    if (c === 37 &&
-      (!isASCIIHex(this.input[this.pointer + 1]) ||
-        !isASCIIHex(this.input[this.pointer + 2]))) {
-      this.parseError = true;
-    }
-
-    this.buffer += percentEncodeChar(c, isPathPercentEncode);
-  }
-
-  return true;
-};
-
-URLStateMachine.prototype["parse cannot-be-a-base-URL path"] = function parseCannotBeABaseURLPath(c) {
-  if (c === 63) {
-    this.url.query = "";
-    this.state = "query";
-  } else if (c === 35) {
-    this.url.fragment = "";
-    this.state = "fragment";
-  } else {
-    // TODO: Add: not a URL code point
-    if (!isNaN(c) && c !== 37) {
-      this.parseError = true;
-    }
-
-    if (c === 37 &&
-        (!isASCIIHex(this.input[this.pointer + 1]) ||
-         !isASCIIHex(this.input[this.pointer + 2]))) {
-      this.parseError = true;
-    }
-
-    if (!isNaN(c)) {
-      this.url.path[0] = this.url.path[0] + percentEncodeChar(c, isC0ControlPercentEncode);
-    }
-  }
-
-  return true;
-};
-
-URLStateMachine.prototype["parse query"] = function parseQuery(c, cStr) {
-  if (isNaN(c) || (!this.stateOverride && c === 35)) {
-    if (!isSpecial(this.url) || this.url.scheme === "ws" || this.url.scheme === "wss") {
-      this.encodingOverride = "utf-8";
-    }
-
-    const buffer = new Buffer(this.buffer); // TODO: Use encoding override instead
-    for (let i = 0; i < buffer.length; ++i) {
-      if (buffer[i] < 0x21 || buffer[i] > 0x7E || buffer[i] === 0x22 || buffer[i] === 0x23 ||
-          buffer[i] === 0x3C || buffer[i] === 0x3E) {
-        this.url.query += percentEncode(buffer[i]);
-      } else {
-        this.url.query += String.fromCodePoint(buffer[i]);
-      }
-    }
-
-    this.buffer = "";
-    if (c === 35) {
-      this.url.fragment = "";
-      this.state = "fragment";
-    }
-  } else {
-    // TODO: If c is not a URL code point and not "%", parse error.
-    if (c === 37 &&
-      (!isASCIIHex(this.input[this.pointer + 1]) ||
-        !isASCIIHex(this.input[this.pointer + 2]))) {
-      this.parseError = true;
-    }
-
-    this.buffer += cStr;
-  }
-
-  return true;
-};
-
-URLStateMachine.prototype["parse fragment"] = function parseFragment(c) {
-  if (isNaN(c)) { // do nothing
-  } else if (c === 0x0) {
-    this.parseError = true;
-  } else {
-    // TODO: If c is not a URL code point and not "%", parse error.
-    if (c === 37 &&
-      (!isASCIIHex(this.input[this.pointer + 1]) ||
-        !isASCIIHex(this.input[this.pointer + 2]))) {
-      this.parseError = true;
-    }
-
-    this.url.fragment += percentEncodeChar(c, isC0ControlPercentEncode);
-  }
-
-  return true;
-};
-
-function serializeURL(url, excludeFragment) {
-  let output = url.scheme + ":";
-  if (url.host !== null) {
-    output += "//";
-
-    if (url.username !== "" || url.password !== "") {
-      output += url.username;
-      if (url.password !== "") {
-        output += ":" + url.password;
-      }
-      output += "@";
-    }
-
-    output += serializeHost(url.host);
-
-    if (url.port !== null) {
-      output += ":" + url.port;
-    }
-  } else if (url.host === null && url.scheme === "file") {
-    output += "//";
-  }
-
-  if (url.cannotBeABaseURL) {
-    output += url.path[0];
-  } else {
-    for (const string of url.path) {
-      output += "/" + string;
-    }
-  }
-
-  if (url.query !== null) {
-    output += "?" + url.query;
-  }
-
-  if (!excludeFragment && url.fragment !== null) {
-    output += "#" + url.fragment;
-  }
-
-  return output;
-}
-
-function serializeOrigin(tuple) {
-  let result = tuple.scheme + "://";
-  result += serializeHost(tuple.host);
-
-  if (tuple.port !== null) {
-    result += ":" + tuple.port;
-  }
-
-  return result;
-}
-
-module.exports.serializeURL = serializeURL;
-
-module.exports.serializeURLOrigin = function (url) {
-  // https://url.spec.whatwg.org/#concept-url-origin
-  switch (url.scheme) {
-    case "blob":
-      try {
-        return module.exports.serializeURLOrigin(module.exports.parseURL(url.path[0]));
-      } catch (e) {
-        // serializing an opaque origin returns "null"
-        return "null";
-      }
-    case "ftp":
-    case "gopher":
-    case "http":
-    case "https":
-    case "ws":
-    case "wss":
-      return serializeOrigin({
-        scheme: url.scheme,
-        host: url.host,
-        port: url.port
-      });
-    case "file":
-      // spec says "exercise to the reader", chrome says "file://"
-      return "file://";
-    default:
-      // serializing an opaque origin returns "null"
-      return "null";
-  }
-};
-
-module.exports.basicURLParse = function (input, options) {
-  if (options === undefined) {
-    options = {};
-  }
-
-  const usm = new URLStateMachine(input, options.baseURL, options.encodingOverride, options.url, options.stateOverride);
-  if (usm.failure) {
-    return "failure";
-  }
-
-  return usm.url;
-};
-
-module.exports.setTheUsername = function (url, username) {
-  url.username = "";
-  const decoded = punycode.ucs2.decode(username);
-  for (let i = 0; i < decoded.length; ++i) {
-    url.username += percentEncodeChar(decoded[i], isUserinfoPercentEncode);
-  }
-};
-
-module.exports.setThePassword = function (url, password) {
-  url.password = "";
-  const decoded = punycode.ucs2.decode(password);
-  for (let i = 0; i < decoded.length; ++i) {
-    url.password += percentEncodeChar(decoded[i], isUserinfoPercentEncode);
-  }
-};
-
-module.exports.serializeHost = serializeHost;
-
-module.exports.cannotHaveAUsernamePasswordPort = cannotHaveAUsernamePasswordPort;
-
-module.exports.serializeInteger = function (integer) {
-  return String(integer);
-};
-
-module.exports.parseURL = function (input, options) {
-  if (options === undefined) {
-    options = {};
-  }
-
-  // We don't handle blobs, so this just delegates:
-  return module.exports.basicURLParse(input, { baseURL: options.baseURL, encodingOverride: options.encodingOverride });
-};
-
-
-/***/ }),
-
-/***/ 276:
-/***/ ((module) => {
-
-"use strict";
-
-
-module.exports.mixin = function mixin(target, source) {
-  const keys = Object.getOwnPropertyNames(source);
-  for (let i = 0; i < keys.length; ++i) {
-    Object.defineProperty(target, keys[i], Object.getOwnPropertyDescriptor(source, keys[i]));
-  }
-};
-
-module.exports.wrapperSymbol = Symbol("wrapper");
-module.exports.implSymbol = Symbol("impl");
-
-module.exports.wrapperForImpl = function (impl) {
-  return impl[module.exports.wrapperSymbol];
-};
-
-module.exports.implForWrapper = function (wrapper) {
-  return wrapper[module.exports.implSymbol];
-};
-
-
-
-/***/ }),
-
-/***/ 1223:
-/***/ ((module, __unused_webpack_exports, __nccwpck_require__) => {
-
-var wrappy = __nccwpck_require__(2940)
-module.exports = wrappy(once)
-module.exports.strict = wrappy(onceStrict)
-
-once.proto = once(function () {
-  Object.defineProperty(Function.prototype, 'once', {
-    value: function () {
-      return once(this)
-    },
-    configurable: true
-  })
-
-  Object.defineProperty(Function.prototype, 'onceStrict', {
-    value: function () {
-      return onceStrict(this)
-    },
-    configurable: true
-  })
-})
-
-function once (fn) {
-  var f = function () {
-    if (f.called) return f.value
-    f.called = true
-    return f.value = fn.apply(this, arguments)
-  }
-  f.called = false
-  return f
-}
-
-function onceStrict (fn) {
-  var f = function () {
-    if (f.called)
-      throw new Error(f.onceError)
-    f.called = true
-    return f.value = fn.apply(this, arguments)
-  }
-  var name = fn.name || 'Function wrapped with `once`'
-  f.onceError = name + " shouldn't be called more than once"
-  f.called = false
-  return f
-}
-
-
-/***/ }),
-
-/***/ 4294:
-/***/ ((module, __unused_webpack_exports, __nccwpck_require__) => {
-
-module.exports = __nccwpck_require__(4219);
-
-
-/***/ }),
-
-/***/ 4219:
-/***/ ((__unused_webpack_module, exports, __nccwpck_require__) => {
-
-"use strict";
-
-
-var net = __nccwpck_require__(1808);
-var tls = __nccwpck_require__(4404);
-var http = __nccwpck_require__(3685);
-var https = __nccwpck_require__(5687);
-var events = __nccwpck_require__(2361);
-var assert = __nccwpck_require__(9491);
-var util = __nccwpck_require__(3837);
-
-
-exports.httpOverHttp = httpOverHttp;
-exports.httpsOverHttp = httpsOverHttp;
-exports.httpOverHttps = httpOverHttps;
-exports.httpsOverHttps = httpsOverHttps;
-
-
-function httpOverHttp(options) {
-  var agent = new TunnelingAgent(options);
-  agent.request = http.request;
-  return agent;
-}
-
-function httpsOverHttp(options) {
-  var agent = new TunnelingAgent(options);
-  agent.request = http.request;
-  agent.createSocket = createSecureSocket;
-  agent.defaultPort = 443;
-  return agent;
-}
-
-function httpOverHttps(options) {
-  var agent = new TunnelingAgent(options);
-  agent.request = https.request;
-  return agent;
-}
-
-function httpsOverHttps(options) {
-  var agent = new TunnelingAgent(options);
-  agent.request = https.request;
-  agent.createSocket = createSecureSocket;
-  agent.defaultPort = 443;
-  return agent;
-}
-
-
-function TunnelingAgent(options) {
-  var self = this;
-  self.options = options || {};
-  self.proxyOptions = self.options.proxy || {};
-  self.maxSockets = self.options.maxSockets || http.Agent.defaultMaxSockets;
-  self.requests = [];
-  self.sockets = [];
-
-  self.on('free', function onFree(socket, host, port, localAddress) {
-    var options = toOptions(host, port, localAddress);
-    for (var i = 0, len = self.requests.length; i < len; ++i) {
-      var pending = self.requests[i];
-      if (pending.host === options.host && pending.port === options.port) {
-        // Detect the request to connect same origin server,
-        // reuse the connection.
-        self.requests.splice(i, 1);
-        pending.request.onSocket(socket);
-        return;
-      }
-    }
-    socket.destroy();
-    self.removeSocket(socket);
-  });
-}
-util.inherits(TunnelingAgent, events.EventEmitter);
-
-TunnelingAgent.prototype.addRequest = function addRequest(req, host, port, localAddress) {
-  var self = this;
-  var options = mergeOptions({request: req}, self.options, toOptions(host, port, localAddress));
-
-  if (self.sockets.length >= this.maxSockets) {
-    // We are over limit so we'll add it to the queue.
-    self.requests.push(options);
-    return;
-  }
-
-  // If we are under maxSockets create a new one.
-  self.createSocket(options, function(socket) {
-    socket.on('free', onFree);
-    socket.on('close', onCloseOrRemove);
-    socket.on('agentRemove', onCloseOrRemove);
-    req.onSocket(socket);
-
-    function onFree() {
-      self.emit('free', socket, options);
-    }
-
-    function onCloseOrRemove(err) {
-      self.removeSocket(socket);
-      socket.removeListener('free', onFree);
-      socket.removeListener('close', onCloseOrRemove);
-      socket.removeListener('agentRemove', onCloseOrRemove);
-    }
-  });
-};
-
-TunnelingAgent.prototype.createSocket = function createSocket(options, cb) {
-  var self = this;
-  var placeholder = {};
-  self.sockets.push(placeholder);
-
-  var connectOptions = mergeOptions({}, self.proxyOptions, {
-    method: 'CONNECT',
-    path: options.host + ':' + options.port,
-    agent: false,
-    headers: {
-      host: options.host + ':' + options.port
-    }
-  });
-  if (options.localAddress) {
-    connectOptions.localAddress = options.localAddress;
-  }
-  if (connectOptions.proxyAuth) {
-    connectOptions.headers = connectOptions.headers || {};
-    connectOptions.headers['Proxy-Authorization'] = 'Basic ' +
-        new Buffer(connectOptions.proxyAuth).toString('base64');
-  }
-
-  debug('making CONNECT request');
-  var connectReq = self.request(connectOptions);
-  connectReq.useChunkedEncodingByDefault = false; // for v0.6
-  connectReq.once('response', onResponse); // for v0.6
-  connectReq.once('upgrade', onUpgrade);   // for v0.6
-  connectReq.once('connect', onConnect);   // for v0.7 or later
-  connectReq.once('error', onError);
-  connectReq.end();
-
-  function onResponse(res) {
-    // Very hacky. This is necessary to avoid http-parser leaks.
-    res.upgrade = true;
-  }
-
-  function onUpgrade(res, socket, head) {
-    // Hacky.
-    process.nextTick(function() {
-      onConnect(res, socket, head);
-    });
-  }
-
-  function onConnect(res, socket, head) {
-    connectReq.removeAllListeners();
-    socket.removeAllListeners();
-
-    if (res.statusCode !== 200) {
-      debug('tunneling socket could not be established, statusCode=%d',
-        res.statusCode);
-      socket.destroy();
-      var error = new Error('tunneling socket could not be established, ' +
-        'statusCode=' + res.statusCode);
-      error.code = 'ECONNRESET';
-      options.request.emit('error', error);
-      self.removeSocket(placeholder);
-      return;
-    }
-    if (head.length > 0) {
-      debug('got illegal response body from proxy');
-      socket.destroy();
-      var error = new Error('got illegal response body from proxy');
-      error.code = 'ECONNRESET';
-      options.request.emit('error', error);
-      self.removeSocket(placeholder);
-      return;
-    }
-    debug('tunneling connection has established');
-    self.sockets[self.sockets.indexOf(placeholder)] = socket;
-    return cb(socket);
-  }
-
-  function onError(cause) {
-    connectReq.removeAllListeners();
-
-    debug('tunneling socket could not be established, cause=%s\n',
-          cause.message, cause.stack);
-    var error = new Error('tunneling socket could not be established, ' +
-                          'cause=' + cause.message);
-    error.code = 'ECONNRESET';
-    options.request.emit('error', error);
-    self.removeSocket(placeholder);
-  }
-};
-
-TunnelingAgent.prototype.removeSocket = function removeSocket(socket) {
-  var pos = this.sockets.indexOf(socket)
-  if (pos === -1) {
-    return;
-  }
-  this.sockets.splice(pos, 1);
-
-  var pending = this.requests.shift();
-  if (pending) {
-    // If we have pending requests and a socket gets closed a new one
-    // needs to be created to take over in the pool for the one that closed.
-    this.createSocket(pending, function(socket) {
-      pending.request.onSocket(socket);
-    });
-  }
-};
-
-function createSecureSocket(options, cb) {
-  var self = this;
-  TunnelingAgent.prototype.createSocket.call(self, options, function(socket) {
-    var hostHeader = options.request.getHeader('host');
-    var tlsOptions = mergeOptions({}, self.options, {
-      socket: socket,
-      servername: hostHeader ? hostHeader.replace(/:.*$/, '') : options.host
-    });
-
-    // 0 is dummy port for v0.6
-    var secureSocket = tls.connect(0, tlsOptions);
-    self.sockets[self.sockets.indexOf(socket)] = secureSocket;
-    cb(secureSocket);
-  });
-}
-
-
-function toOptions(host, port, localAddress) {
-  if (typeof host === 'string') { // since v0.10
-    return {
-      host: host,
-      port: port,
-      localAddress: localAddress
-    };
-  }
-  return host; // for v0.11 or later
-}
-
-function mergeOptions(target) {
-  for (var i = 1, len = arguments.length; i < len; ++i) {
-    var overrides = arguments[i];
-    if (typeof overrides === 'object') {
-      var keys = Object.keys(overrides);
-      for (var j = 0, keyLen = keys.length; j < keyLen; ++j) {
-        var k = keys[j];
-        if (overrides[k] !== undefined) {
-          target[k] = overrides[k];
-        }
-      }
-    }
-  }
-  return target;
-}
-
-
-var debug;
-if (process.env.NODE_DEBUG && /\btunnel\b/.test(process.env.NODE_DEBUG)) {
-  debug = function() {
-    var args = Array.prototype.slice.call(arguments);
-    if (typeof args[0] === 'string') {
-      args[0] = 'TUNNEL: ' + args[0];
-    } else {
-      args.unshift('TUNNEL:');
-    }
-    console.error.apply(console, args);
-  }
-} else {
-  debug = function() {};
-}
-exports.debug = debug; // for test
-
-
-/***/ }),
-
-/***/ 5030:
-/***/ ((__unused_webpack_module, exports) => {
-
-"use strict";
-
-
-Object.defineProperty(exports, "__esModule", ({ value: true }));
-
-function getUserAgent() {
-  if (typeof navigator === "object" && "userAgent" in navigator) {
-    return navigator.userAgent;
-  }
-
-  if (typeof process === "object" && "version" in process) {
-    return `Node.js/${process.version.substr(1)} (${process.platform}; ${process.arch})`;
-  }
-
-  return "<environment undetectable>";
-}
-
-exports.getUserAgent = getUserAgent;
-//# sourceMappingURL=index.js.map
-
-
-/***/ }),
-
-/***/ 5840:
-/***/ ((__unused_webpack_module, exports, __nccwpck_require__) => {
-
-"use strict";
-
-
-Object.defineProperty(exports, "__esModule", ({
-  value: true
-}));
-Object.defineProperty(exports, "v1", ({
-  enumerable: true,
-  get: function () {
-    return _v.default;
-  }
-}));
-Object.defineProperty(exports, "v3", ({
-  enumerable: true,
-  get: function () {
-    return _v2.default;
-  }
-}));
-Object.defineProperty(exports, "v4", ({
-  enumerable: true,
-  get: function () {
-    return _v3.default;
-  }
-}));
-Object.defineProperty(exports, "v5", ({
-  enumerable: true,
-  get: function () {
-    return _v4.default;
-  }
-}));
-Object.defineProperty(exports, "NIL", ({
-  enumerable: true,
-  get: function () {
-    return _nil.default;
-  }
-}));
-Object.defineProperty(exports, "version", ({
-  enumerable: true,
-  get: function () {
-    return _version.default;
-  }
-}));
-Object.defineProperty(exports, "validate", ({
-  enumerable: true,
-  get: function () {
-    return _validate.default;
-  }
-}));
-Object.defineProperty(exports, "stringify", ({
-  enumerable: true,
-  get: function () {
-    return _stringify.default;
-  }
-}));
-Object.defineProperty(exports, "parse", ({
-  enumerable: true,
-  get: function () {
-    return _parse.default;
-  }
-}));
-
-var _v = _interopRequireDefault(__nccwpck_require__(8628));
-
-var _v2 = _interopRequireDefault(__nccwpck_require__(6409));
-
-var _v3 = _interopRequireDefault(__nccwpck_require__(5122));
-
-var _v4 = _interopRequireDefault(__nccwpck_require__(9120));
-
-var _nil = _interopRequireDefault(__nccwpck_require__(5332));
-
-var _version = _interopRequireDefault(__nccwpck_require__(1595));
-
-var _validate = _interopRequireDefault(__nccwpck_require__(6900));
-
-var _stringify = _interopRequireDefault(__nccwpck_require__(8950));
-
-var _parse = _interopRequireDefault(__nccwpck_require__(2746));
-
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
-/***/ }),
-
-/***/ 4569:
-/***/ ((__unused_webpack_module, exports, __nccwpck_require__) => {
-
-"use strict";
-
-
-Object.defineProperty(exports, "__esModule", ({
-  value: true
-}));
-exports["default"] = void 0;
-
-var _crypto = _interopRequireDefault(__nccwpck_require__(6113));
-
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
-function md5(bytes) {
-  if (Array.isArray(bytes)) {
-    bytes = Buffer.from(bytes);
-  } else if (typeof bytes === 'string') {
-    bytes = Buffer.from(bytes, 'utf8');
-  }
-
-  return _crypto.default.createHash('md5').update(bytes).digest();
-}
-
-var _default = md5;
-exports["default"] = _default;
-
-/***/ }),
-
-/***/ 5332:
-/***/ ((__unused_webpack_module, exports) => {
-
-"use strict";
-
-
-Object.defineProperty(exports, "__esModule", ({
-  value: true
-}));
-exports["default"] = void 0;
-var _default = '00000000-0000-0000-0000-000000000000';
-exports["default"] = _default;
-
-/***/ }),
-
-/***/ 2746:
-/***/ ((__unused_webpack_module, exports, __nccwpck_require__) => {
-
-"use strict";
-
-
-Object.defineProperty(exports, "__esModule", ({
-  value: true
-}));
-exports["default"] = void 0;
-
-var _validate = _interopRequireDefault(__nccwpck_require__(6900));
-
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
-function parse(uuid) {
-  if (!(0, _validate.default)(uuid)) {
-    throw TypeError('Invalid UUID');
-  }
-
-  let v;
-  const arr = new Uint8Array(16); // Parse ########-....-....-....-............
-
-  arr[0] = (v = parseInt(uuid.slice(0, 8), 16)) >>> 24;
-  arr[1] = v >>> 16 & 0xff;
-  arr[2] = v >>> 8 & 0xff;
-  arr[3] = v & 0xff; // Parse ........-####-....-....-............
-
-  arr[4] = (v = parseInt(uuid.slice(9, 13), 16)) >>> 8;
-  arr[5] = v & 0xff; // Parse ........-....-####-....-............
-
-  arr[6] = (v = parseInt(uuid.slice(14, 18), 16)) >>> 8;
-  arr[7] = v & 0xff; // Parse ........-....-....-####-............
-
-  arr[8] = (v = parseInt(uuid.slice(19, 23), 16)) >>> 8;
-  arr[9] = v & 0xff; // Parse ........-....-....-....-############
-  // (Use "/" to avoid 32-bit truncation when bit-shifting high-order bytes)
-
-  arr[10] = (v = parseInt(uuid.slice(24, 36), 16)) / 0x10000000000 & 0xff;
-  arr[11] = v / 0x100000000 & 0xff;
-  arr[12] = v >>> 24 & 0xff;
-  arr[13] = v >>> 16 & 0xff;
-  arr[14] = v >>> 8 & 0xff;
-  arr[15] = v & 0xff;
-  return arr;
-}
-
-var _default = parse;
-exports["default"] = _default;
-
-/***/ }),
-
-/***/ 814:
-/***/ ((__unused_webpack_module, exports) => {
-
-"use strict";
-
-
-Object.defineProperty(exports, "__esModule", ({
-  value: true
-}));
-exports["default"] = void 0;
-var _default = /^(?:[0-9a-f]{8}-[0-9a-f]{4}-[1-5][0-9a-f]{3}-[89ab][0-9a-f]{3}-[0-9a-f]{12}|00000000-0000-0000-0000-000000000000)$/i;
-exports["default"] = _default;
-
-/***/ }),
-
-/***/ 807:
-/***/ ((__unused_webpack_module, exports, __nccwpck_require__) => {
-
-"use strict";
-
-
-Object.defineProperty(exports, "__esModule", ({
-  value: true
-}));
-exports["default"] = rng;
-
-var _crypto = _interopRequireDefault(__nccwpck_require__(6113));
-
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
-const rnds8Pool = new Uint8Array(256); // # of random values to pre-allocate
-
-let poolPtr = rnds8Pool.length;
-
-function rng() {
-  if (poolPtr > rnds8Pool.length - 16) {
-    _crypto.default.randomFillSync(rnds8Pool);
-
-    poolPtr = 0;
-  }
-
-  return rnds8Pool.slice(poolPtr, poolPtr += 16);
-}
-
-/***/ }),
-
-/***/ 5274:
-/***/ ((__unused_webpack_module, exports, __nccwpck_require__) => {
-
-"use strict";
-
-
-Object.defineProperty(exports, "__esModule", ({
-  value: true
-}));
-exports["default"] = void 0;
-
-var _crypto = _interopRequireDefault(__nccwpck_require__(6113));
-
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
-function sha1(bytes) {
-  if (Array.isArray(bytes)) {
-    bytes = Buffer.from(bytes);
-  } else if (typeof bytes === 'string') {
-    bytes = Buffer.from(bytes, 'utf8');
-  }
-
-  return _crypto.default.createHash('sha1').update(bytes).digest();
-}
-
-var _default = sha1;
-exports["default"] = _default;
-
-/***/ }),
-
-/***/ 8950:
-/***/ ((__unused_webpack_module, exports, __nccwpck_require__) => {
-
-"use strict";
-
-
-Object.defineProperty(exports, "__esModule", ({
-  value: true
-}));
-exports["default"] = void 0;
-
-var _validate = _interopRequireDefault(__nccwpck_require__(6900));
-
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
-/**
- * Convert array of 16 byte values to UUID string format of the form:
- * XXXXXXXX-XXXX-XXXX-XXXX-XXXXXXXXXXXX
- */
-const byteToHex = [];
-
-for (let i = 0; i < 256; ++i) {
-  byteToHex.push((i + 0x100).toString(16).substr(1));
-}
-
-function stringify(arr, offset = 0) {
-  // Note: Be careful editing this code!  It's been tuned for performance
-  // and works in ways you may not expect. See https://github.com/uuidjs/uuid/pull/434
-  const uuid = (byteToHex[arr[offset + 0]] + byteToHex[arr[offset + 1]] + byteToHex[arr[offset + 2]] + byteToHex[arr[offset + 3]] + '-' + byteToHex[arr[offset + 4]] + byteToHex[arr[offset + 5]] + '-' + byteToHex[arr[offset + 6]] + byteToHex[arr[offset + 7]] + '-' + byteToHex[arr[offset + 8]] + byteToHex[arr[offset + 9]] + '-' + byteToHex[arr[offset + 10]] + byteToHex[arr[offset + 11]] + byteToHex[arr[offset + 12]] + byteToHex[arr[offset + 13]] + byteToHex[arr[offset + 14]] + byteToHex[arr[offset + 15]]).toLowerCase(); // Consistency check for valid UUID.  If this throws, it's likely due to one
-  // of the following:
-  // - One or more input array values don't map to a hex octet (leading to
-  // "undefined" in the uuid)
-  // - Invalid input values for the RFC `version` or `variant` fields
-
-  if (!(0, _validate.default)(uuid)) {
-    throw TypeError('Stringified UUID is invalid');
-  }
-
-  return uuid;
-}
-
-var _default = stringify;
-exports["default"] = _default;
-
-/***/ }),
-
-/***/ 8628:
-/***/ ((__unused_webpack_module, exports, __nccwpck_require__) => {
-
-"use strict";
-
-
-Object.defineProperty(exports, "__esModule", ({
-  value: true
-}));
-exports["default"] = void 0;
-
-var _rng = _interopRequireDefault(__nccwpck_require__(807));
-
-var _stringify = _interopRequireDefault(__nccwpck_require__(8950));
-
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
-// **`v1()` - Generate time-based UUID**
-//
-// Inspired by https://github.com/LiosK/UUID.js
-// and http://docs.python.org/library/uuid.html
-let _nodeId;
-
-let _clockseq; // Previous uuid creation time
-
-
-let _lastMSecs = 0;
-let _lastNSecs = 0; // See https://github.com/uuidjs/uuid for API details
-
-function v1(options, buf, offset) {
-  let i = buf && offset || 0;
-  const b = buf || new Array(16);
-  options = options || {};
-  let node = options.node || _nodeId;
-  let clockseq = options.clockseq !== undefined ? options.clockseq : _clockseq; // node and clockseq need to be initialized to random values if they're not
-  // specified.  We do this lazily to minimize issues related to insufficient
-  // system entropy.  See #189
-
-  if (node == null || clockseq == null) {
-    const seedBytes = options.random || (options.rng || _rng.default)();
-
-    if (node == null) {
-      // Per 4.5, create and 48-bit node id, (47 random bits + multicast bit = 1)
-      node = _nodeId = [seedBytes[0] | 0x01, seedBytes[1], seedBytes[2], seedBytes[3], seedBytes[4], seedBytes[5]];
-    }
-
-    if (clockseq == null) {
-      // Per 4.2.2, randomize (14 bit) clockseq
-      clockseq = _clockseq = (seedBytes[6] << 8 | seedBytes[7]) & 0x3fff;
-    }
-  } // UUID timestamps are 100 nano-second units since the Gregorian epoch,
-  // (1582-10-15 00:00).  JSNumbers aren't precise enough for this, so
-  // time is handled internally as 'msecs' (integer milliseconds) and 'nsecs'
-  // (100-nanoseconds offset from msecs) since unix epoch, 1970-01-01 00:00.
-
-
-  let msecs = options.msecs !== undefined ? options.msecs : Date.now(); // Per 4.2.1.2, use count of uuid's generated during the current clock
-  // cycle to simulate higher resolution clock
-
-  let nsecs = options.nsecs !== undefined ? options.nsecs : _lastNSecs + 1; // Time since last uuid creation (in msecs)
-
-  const dt = msecs - _lastMSecs + (nsecs - _lastNSecs) / 10000; // Per 4.2.1.2, Bump clockseq on clock regression
-
-  if (dt < 0 && options.clockseq === undefined) {
-    clockseq = clockseq + 1 & 0x3fff;
-  } // Reset nsecs if clock regresses (new clockseq) or we've moved onto a new
-  // time interval
-
-
-  if ((dt < 0 || msecs > _lastMSecs) && options.nsecs === undefined) {
-    nsecs = 0;
-  } // Per 4.2.1.2 Throw error if too many uuids are requested
-
-
-  if (nsecs >= 10000) {
-    throw new Error("uuid.v1(): Can't create more than 10M uuids/sec");
-  }
-
-  _lastMSecs = msecs;
-  _lastNSecs = nsecs;
-  _clockseq = clockseq; // Per 4.1.4 - Convert from unix epoch to Gregorian epoch
-
-  msecs += 12219292800000; // `time_low`
-
-  const tl = ((msecs & 0xfffffff) * 10000 + nsecs) % 0x100000000;
-  b[i++] = tl >>> 24 & 0xff;
-  b[i++] = tl >>> 16 & 0xff;
-  b[i++] = tl >>> 8 & 0xff;
-  b[i++] = tl & 0xff; // `time_mid`
-
-  const tmh = msecs / 0x100000000 * 10000 & 0xfffffff;
-  b[i++] = tmh >>> 8 & 0xff;
-  b[i++] = tmh & 0xff; // `time_high_and_version`
-
-  b[i++] = tmh >>> 24 & 0xf | 0x10; // include version
-
-  b[i++] = tmh >>> 16 & 0xff; // `clock_seq_hi_and_reserved` (Per 4.2.2 - include variant)
-
-  b[i++] = clockseq >>> 8 | 0x80; // `clock_seq_low`
-
-  b[i++] = clockseq & 0xff; // `node`
-
-  for (let n = 0; n < 6; ++n) {
-    b[i + n] = node[n];
-  }
-
-  return buf || (0, _stringify.default)(b);
-}
-
-var _default = v1;
-exports["default"] = _default;
-
-/***/ }),
-
-/***/ 6409:
-/***/ ((__unused_webpack_module, exports, __nccwpck_require__) => {
-
-"use strict";
-
-
-Object.defineProperty(exports, "__esModule", ({
-  value: true
-}));
-exports["default"] = void 0;
-
-var _v = _interopRequireDefault(__nccwpck_require__(5998));
-
-var _md = _interopRequireDefault(__nccwpck_require__(4569));
-
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
-const v3 = (0, _v.default)('v3', 0x30, _md.default);
-var _default = v3;
-exports["default"] = _default;
-
-/***/ }),
-
-/***/ 5998:
-/***/ ((__unused_webpack_module, exports, __nccwpck_require__) => {
-
-"use strict";
-
-
-Object.defineProperty(exports, "__esModule", ({
-  value: true
-}));
-exports["default"] = _default;
-exports.URL = exports.DNS = void 0;
-
-var _stringify = _interopRequireDefault(__nccwpck_require__(8950));
-
-var _parse = _interopRequireDefault(__nccwpck_require__(2746));
-
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
-function stringToBytes(str) {
-  str = unescape(encodeURIComponent(str)); // UTF8 escape
-
-  const bytes = [];
-
-  for (let i = 0; i < str.length; ++i) {
-    bytes.push(str.charCodeAt(i));
-  }
-
-  return bytes;
-}
-
-const DNS = '6ba7b810-9dad-11d1-80b4-00c04fd430c8';
-exports.DNS = DNS;
-const URL = '6ba7b811-9dad-11d1-80b4-00c04fd430c8';
-exports.URL = URL;
-
-function _default(name, version, hashfunc) {
-  function generateUUID(value, namespace, buf, offset) {
-    if (typeof value === 'string') {
-      value = stringToBytes(value);
-    }
-
-    if (typeof namespace === 'string') {
-      namespace = (0, _parse.default)(namespace);
-    }
-
-    if (namespace.length !== 16) {
-      throw TypeError('Namespace must be array-like (16 iterable integer values, 0-255)');
-    } // Compute hash of namespace and value, Per 4.3
-    // Future: Use spread syntax when supported on all platforms, e.g. `bytes =
-    // hashfunc([...namespace, ... value])`
-
-
-    let bytes = new Uint8Array(16 + value.length);
-    bytes.set(namespace);
-    bytes.set(value, namespace.length);
-    bytes = hashfunc(bytes);
-    bytes[6] = bytes[6] & 0x0f | version;
-    bytes[8] = bytes[8] & 0x3f | 0x80;
-
-    if (buf) {
-      offset = offset || 0;
-
-      for (let i = 0; i < 16; ++i) {
-        buf[offset + i] = bytes[i];
-      }
-
-      return buf;
-    }
-
-    return (0, _stringify.default)(bytes);
-  } // Function#name is not settable on some platforms (#270)
-
-
-  try {
-    generateUUID.name = name; // eslint-disable-next-line no-empty
-  } catch (err) {} // For CommonJS default export support
-
-
-  generateUUID.DNS = DNS;
-  generateUUID.URL = URL;
-  return generateUUID;
-}
-
-/***/ }),
-
-/***/ 5122:
-/***/ ((__unused_webpack_module, exports, __nccwpck_require__) => {
-
-"use strict";
-
-
-Object.defineProperty(exports, "__esModule", ({
-  value: true
-}));
-exports["default"] = void 0;
-
-var _rng = _interopRequireDefault(__nccwpck_require__(807));
-
-var _stringify = _interopRequireDefault(__nccwpck_require__(8950));
-
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
-function v4(options, buf, offset) {
-  options = options || {};
-
-  const rnds = options.random || (options.rng || _rng.default)(); // Per 4.4, set bits for version and `clock_seq_hi_and_reserved`
-
-
-  rnds[6] = rnds[6] & 0x0f | 0x40;
-  rnds[8] = rnds[8] & 0x3f | 0x80; // Copy bytes to buffer, if provided
-
-  if (buf) {
-    offset = offset || 0;
-
-    for (let i = 0; i < 16; ++i) {
-      buf[offset + i] = rnds[i];
-    }
-
-    return buf;
-  }
-
-  return (0, _stringify.default)(rnds);
-}
-
-var _default = v4;
-exports["default"] = _default;
-
-/***/ }),
-
-/***/ 9120:
-/***/ ((__unused_webpack_module, exports, __nccwpck_require__) => {
-
-"use strict";
-
-
-Object.defineProperty(exports, "__esModule", ({
-  value: true
-}));
-exports["default"] = void 0;
-
-var _v = _interopRequireDefault(__nccwpck_require__(5998));
-
-var _sha = _interopRequireDefault(__nccwpck_require__(5274));
-
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
-const v5 = (0, _v.default)('v5', 0x50, _sha.default);
-var _default = v5;
-exports["default"] = _default;
-
-/***/ }),
-
-/***/ 6900:
-/***/ ((__unused_webpack_module, exports, __nccwpck_require__) => {
-
-"use strict";
-
-
-Object.defineProperty(exports, "__esModule", ({
-  value: true
-}));
-exports["default"] = void 0;
-
-var _regex = _interopRequireDefault(__nccwpck_require__(814));
-
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
-function validate(uuid) {
-  return typeof uuid === 'string' && _regex.default.test(uuid);
-}
-
-var _default = validate;
-exports["default"] = _default;
-
-/***/ }),
-
-/***/ 1595:
-/***/ ((__unused_webpack_module, exports, __nccwpck_require__) => {
-
-"use strict";
-
-
-Object.defineProperty(exports, "__esModule", ({
-  value: true
-}));
-exports["default"] = void 0;
-
-var _validate = _interopRequireDefault(__nccwpck_require__(6900));
-
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
-function version(uuid) {
-  if (!(0, _validate.default)(uuid)) {
-    throw TypeError('Invalid UUID');
-  }
-
-  return parseInt(uuid.substr(14, 1), 16);
-}
-
-var _default = version;
-exports["default"] = _default;
-
-/***/ }),
-
-/***/ 2940:
-/***/ ((module) => {
-
-// Returns a wrapper function that returns a wrapped callback
-// The wrapper function should do some stuff, and return a
-// presumably different callback function.
-// This makes sure that own properties are retained, so that
-// decorations and such are not lost along the way.
-module.exports = wrappy
-function wrappy (fn, cb) {
-  if (fn && cb) return wrappy(fn)(cb)
-
-  if (typeof fn !== 'function')
-    throw new TypeError('need wrapper function')
-
-  Object.keys(fn).forEach(function (k) {
-    wrapper[k] = fn[k]
-  })
-
-  return wrapper
-
-  function wrapper() {
-    var args = new Array(arguments.length)
-    for (var i = 0; i < args.length; i++) {
-      args[i] = arguments[i]
-    }
-    var ret = fn.apply(this, args)
-    var cb = args[args.length-1]
-    if (typeof ret === 'function' && ret !== cb) {
-      Object.keys(cb).forEach(function (k) {
-        ret[k] = cb[k]
-      })
-    }
-    return ret
-  }
-}
-
-
-/***/ }),
-
-/***/ 8564:
-/***/ (function(__unused_webpack_module, exports, __nccwpck_require__) {
-
-"use strict";
-
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", ({ value: true }));
-const core = __importStar(__nccwpck_require__(2186));
-const ActionUtils = __importStar(__nccwpck_require__(6981));
-const GithubUtils_1 = __importDefault(__nccwpck_require__(9296));
-// Parse the stringified JSON array of PR numbers, and cast each from String -> Number
-const PRList = ActionUtils.getJSONInput('PR_LIST', { required: true });
-console.log('Got PR list: ', String(PRList));
-const releaseBody = GithubUtils_1.default.getReleaseBody(PRList);
-console.log(`Generated release body: ${releaseBody}`);
-core.setOutput('RELEASE_BODY', releaseBody);
-
-
-/***/ }),
-
-/***/ 6981:
-/***/ (function(__unused_webpack_module, exports, __nccwpck_require__) {
-
-"use strict";
-
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
-Object.defineProperty(exports, "__esModule", ({ value: true }));
-exports.getStringInput = exports.getJSONInput = void 0;
-const core = __importStar(__nccwpck_require__(2186));
-/**
- * Safely parse a JSON input to a GitHub Action.
- *
- * @param name - The name of the input.
- * @param options - Options to pass to core.getInput
- * @param [defaultValue] - A default value to provide for the input.
- *                         Not required if the {required: true} option is given in the second arg to this function.
- */
-function getJSONInput(name, options, defaultValue) {
-    const input = core.getInput(name, options);
-    if (input) {
-        return JSON.parse(input);
-    }
-    return defaultValue;
-}
-exports.getJSONInput = getJSONInput;
-/**
- * Safely access a string input to a GitHub Action, or fall back on a default if the string is empty.
- */
-function getStringInput(name, options, defaultValue) {
-    const input = core.getInput(name, options);
-    if (!input) {
-        return defaultValue;
-    }
-    return input;
-}
-exports.getStringInput = getStringInput;
-
-
-/***/ }),
-
-/***/ 9873:
-/***/ ((__unused_webpack_module, exports) => {
-
-"use strict";
-
-Object.defineProperty(exports, "__esModule", ({ value: true }));
-const GITHUB_BASE_URL_REGEX = new RegExp('https?://(?:github\\.com|api\\.github\\.com)');
-const GIT_CONST = {
-    GITHUB_OWNER: 'Expensify',
-    APP_REPO: 'App',
-};
-const CONST = {
-    ...GIT_CONST,
-    APPLAUSE_BOT: 'applausebot',
-    OS_BOTIFY: 'OSBotify',
-    LABELS: {
-        STAGING_DEPLOY: 'StagingDeployCash',
-        DEPLOY_BLOCKER: 'DeployBlockerCash',
-        INTERNAL_QA: 'InternalQA',
-    },
-    DATE_FORMAT_STRING: 'yyyy-MM-dd',
-    PULL_REQUEST_REGEX: new RegExp(`${GITHUB_BASE_URL_REGEX.source}/.*/.*/pull/([0-9]+).*`),
-    ISSUE_REGEX: new RegExp(`${GITHUB_BASE_URL_REGEX.source}/.*/.*/issues/([0-9]+).*`),
-    ISSUE_OR_PULL_REQUEST_REGEX: new RegExp(`${GITHUB_BASE_URL_REGEX.source}/.*/.*/(?:pull|issues)/([0-9]+).*`),
-    POLL_RATE: 10000,
-    APP_REPO_URL: `https://github.com/${GIT_CONST.GITHUB_OWNER}/${GIT_CONST.APP_REPO}`,
-    APP_REPO_GIT_URL: `git@github.com:${GIT_CONST.GITHUB_OWNER}/${GIT_CONST.APP_REPO}.git`,
-};
-exports["default"] = CONST;
-
-
-/***/ }),
-
-/***/ 9296:
-/***/ (function(__unused_webpack_module, exports, __nccwpck_require__) {
-
-"use strict";
-
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", ({ value: true }));
-/* eslint-disable @typescript-eslint/naming-convention, import/no-import-module-exports */
-const core = __importStar(__nccwpck_require__(2186));
-const utils_1 = __nccwpck_require__(3030);
-const plugin_paginate_rest_1 = __nccwpck_require__(4193);
-const plugin_throttling_1 = __nccwpck_require__(9968);
-const EmptyObject_1 = __nccwpck_require__(8227);
-const arrayDifference_1 = __importDefault(__nccwpck_require__(7034));
-const CONST_1 = __importDefault(__nccwpck_require__(9873));
-class GithubUtils {
-    static internalOctokit;
-    /**
-     * Initialize internal octokit
-     *
-     * @private
-     */
-    static initOctokit() {
-        const Octokit = utils_1.GitHub.plugin(plugin_throttling_1.throttling, plugin_paginate_rest_1.paginateRest);
-        const token = core.getInput('GITHUB_TOKEN', { required: true });
-        // Save a copy of octokit used in this class
-        this.internalOctokit = new Octokit((0, utils_1.getOctokitOptions)(token, {
-            throttle: {
-                retryAfterBaseValue: 2000,
-                onRateLimit: (retryAfter, options) => {
-                    console.warn(`Request quota exhausted for request ${options.method} ${options.url}`);
-                    // Retry five times when hitting a rate limit error, then give up
-                    if (options.request.retryCount <= 5) {
-                        console.log(`Retrying after ${retryAfter} seconds!`);
-                        return true;
-                    }
-                },
-                onAbuseLimit: (retryAfter, options) => {
-                    // does not retry, only logs a warning
-                    console.warn(`Abuse detected for request ${options.method} ${options.url}`);
-                },
-            },
-        }));
-    }
-    /**
-     * Either give an existing instance of Octokit rest or create a new one
-     *
-     * @readonly
-     * @static
-     */
-    static get octokit() {
-        if (!this.internalOctokit) {
-            this.initOctokit();
-        }
-        // eslint-disable-next-line @typescript-eslint/non-nullable-type-assertion-style
-        return this.internalOctokit.rest;
-    }
-    /**
-     * Get the graphql instance from internal octokit.
-     * @readonly
-     * @static
-     */
-    static get graphql() {
-        if (!this.internalOctokit) {
-            this.initOctokit();
-        }
-        // eslint-disable-next-line @typescript-eslint/non-nullable-type-assertion-style
-        return this.internalOctokit.graphql;
-    }
-    /**
-     * Either give an existing instance of Octokit paginate or create a new one
-     *
-     * @readonly
-     * @static
-     */
-    static get paginate() {
-        if (!this.internalOctokit) {
-            this.initOctokit();
-        }
-        // eslint-disable-next-line @typescript-eslint/non-nullable-type-assertion-style
-        return this.internalOctokit.paginate;
-    }
-    /**
-     * Finds one open `StagingDeployCash` issue via GitHub octokit library.
-     */
-    static getStagingDeployCash() {
-        return this.octokit.issues
-            .listForRepo({
-            owner: CONST_1.default.GITHUB_OWNER,
-            repo: CONST_1.default.APP_REPO,
-            labels: CONST_1.default.LABELS.STAGING_DEPLOY,
-            state: 'open',
-        })
-            .then(({ data }) => {
-            if (!data.length) {
-                throw new Error(`Unable to find ${CONST_1.default.LABELS.STAGING_DEPLOY} issue.`);
-            }
-            if (data.length > 1) {
-                throw new Error(`Found more than one ${CONST_1.default.LABELS.STAGING_DEPLOY} issue.`);
-            }
-            return this.getStagingDeployCashData(data[0]);
-        });
-    }
-    /**
-     * Takes in a GitHub issue object and returns the data we want.
-     */
-    static getStagingDeployCashData(issue) {
-        try {
-            const versionRegex = new RegExp('([0-9]+)\\.([0-9]+)\\.([0-9]+)(?:-([0-9]+))?', 'g');
-            const tag = issue.body?.match(versionRegex)?.[0].replace(/`/g, '');
-            return {
-                title: issue.title,
-                url: issue.url,
-                number: this.getIssueOrPullRequestNumberFromURL(issue.url),
-                labels: issue.labels,
-                PRList: this.getStagingDeployCashPRList(issue),
-                deployBlockers: this.getStagingDeployCashDeployBlockers(issue),
-                internalQAPRList: this.getStagingDeployCashInternalQA(issue),
-                isTimingDashboardChecked: issue.body ? /-\s\[x]\sI checked the \[App Timing Dashboard]/.test(issue.body) : false,
-                isFirebaseChecked: issue.body ? /-\s\[x]\sI checked \[Firebase Crashlytics]/.test(issue.body) : false,
-                isGHStatusChecked: issue.body ? /-\s\[x]\sI checked \[GitHub Status]/.test(issue.body) : false,
-                tag,
-            };
-        }
-        catch (exception) {
-            throw new Error(`Unable to find ${CONST_1.default.LABELS.STAGING_DEPLOY} issue with correct data.`);
-        }
-    }
-    /**
-     * Parse the PRList and Internal QA section of the StagingDeployCash issue body.
-     *
-     * @private
-     */
-    static getStagingDeployCashPRList(issue) {
-        let PRListSection = issue.body?.match(/pull requests:\*\*\r?\n((?:-.*\r?\n)+)\r?\n\r?\n?/) ?? null;
-        if (PRListSection?.length !== 2) {
-            // No PRs, return an empty array
-            console.log('Hmmm...The open StagingDeployCash does not list any pull requests, continuing...');
-            return [];
-        }
-        PRListSection = PRListSection[1];
-        const PRList = [...PRListSection.matchAll(new RegExp(`- \\[([ x])] (${CONST_1.default.PULL_REQUEST_REGEX.source})`, 'g'))].map((match) => ({
-            url: match[2],
-            number: Number.parseInt(match[3], 10),
-            isVerified: match[1] === 'x',
-        }));
-        return PRList.sort((a, b) => a.number - b.number);
-    }
-    /**
-     * Parse DeployBlocker section of the StagingDeployCash issue body.
-     *
-     * @private
-     */
-    static getStagingDeployCashDeployBlockers(issue) {
-        let deployBlockerSection = issue.body?.match(/Deploy Blockers:\*\*\r?\n((?:-.*\r?\n)+)/) ?? null;
-        if (deployBlockerSection?.length !== 2) {
-            return [];
-        }
-        deployBlockerSection = deployBlockerSection[1];
-        const deployBlockers = [...deployBlockerSection.matchAll(new RegExp(`- \\[([ x])]\\s(${CONST_1.default.ISSUE_OR_PULL_REQUEST_REGEX.source})`, 'g'))].map((match) => ({
-            url: match[2],
-            number: Number.parseInt(match[3], 10),
-            isResolved: match[1] === 'x',
-        }));
-        return deployBlockers.sort((a, b) => a.number - b.number);
-    }
-    /**
-     * Parse InternalQA section of the StagingDeployCash issue body.
-     *
-     * @private
-     */
-    static getStagingDeployCashInternalQA(issue) {
-        let internalQASection = issue.body?.match(/Internal QA:\*\*\r?\n((?:- \[[ x]].*\r?\n)+)/) ?? null;
-        if (internalQASection?.length !== 2) {
-            return [];
-        }
-        internalQASection = internalQASection[1];
-        const internalQAPRs = [...internalQASection.matchAll(new RegExp(`- \\[([ x])]\\s(${CONST_1.default.PULL_REQUEST_REGEX.source})`, 'g'))].map((match) => ({
-            url: match[2].split('-')[0].trim(),
-            number: Number.parseInt(match[3], 10),
-            isResolved: match[1] === 'x',
-        }));
-        return internalQAPRs.sort((a, b) => a.number - b.number);
-    }
-    /**
-     * Generate the issue body and assignees for a StagingDeployCash.
-     */
-    static generateStagingDeployCashBodyAndAssignees(tag, PRList, verifiedPRList = [], deployBlockers = [], resolvedDeployBlockers = [], resolvedInternalQAPRs = [], isTimingDashboardChecked = false, isFirebaseChecked = false, isGHStatusChecked = false) {
-        return this.fetchAllPullRequests(PRList.map((pr) => this.getPullRequestNumberFromURL(pr)))
-            .then((data) => {
-            const internalQAPRs = Array.isArray(data) ? data.filter((pr) => !(0, EmptyObject_1.isEmptyObject)(pr.labels.find((item) => item.name === CONST_1.default.LABELS.INTERNAL_QA))) : [];
-            return Promise.all(internalQAPRs.map((pr) => this.getPullRequestMergerLogin(pr.number).then((mergerLogin) => ({ url: pr.html_url, mergerLogin })))).then((results) => {
-                // The format of this map is following:
-                // {
-                //    'https://github.com/Expensify/App/pull/9641': 'PauloGasparSv',
-                //    'https://github.com/Expensify/App/pull/9642': 'mountiny'
-                // }
-                const internalQAPRMap = results.reduce((acc, { url, mergerLogin }) => {
-                    acc[url] = mergerLogin;
-                    return acc;
-                }, {});
-                console.log('Found the following Internal QA PRs:', internalQAPRMap);
-                const noQAPRs = Array.isArray(data) ? data.filter((PR) => /\[No\s?QA]/i.test(PR.title)).map((item) => item.html_url) : [];
-                console.log('Found the following NO QA PRs:', noQAPRs);
-                const verifiedOrNoQAPRs = [...new Set([...verifiedPRList, ...noQAPRs])];
-                const sortedPRList = [...new Set((0, arrayDifference_1.default)(PRList, Object.keys(internalQAPRMap)))].sort((a, b) => GithubUtils.getPullRequestNumberFromURL(a) - GithubUtils.getPullRequestNumberFromURL(b));
-                const sortedDeployBlockers = [...new Set(deployBlockers)].sort((a, b) => GithubUtils.getIssueOrPullRequestNumberFromURL(a) - GithubUtils.getIssueOrPullRequestNumberFromURL(b));
-                // Tag version and comparison URL
-                // eslint-disable-next-line max-len
-                let issueBody = `**Release Version:** \`${tag}\`\r\n**Compare Changes:** https://github.com/Expensify/App/compare/production...staging\r\n`;
-                // PR list
-                if (sortedPRList.length > 0) {
-                    issueBody += '\r\n**This release contains changes from the following pull requests:**\r\n';
-                    sortedPRList.forEach((URL) => {
-                        issueBody += verifiedOrNoQAPRs.includes(URL) ? '- [x]' : '- [ ]';
-                        issueBody += ` ${URL}\r\n`;
-                    });
-                    issueBody += '\r\n\r\n';
-                }
-                // Internal QA PR list
-                if (!(0, EmptyObject_1.isEmptyObject)(internalQAPRMap)) {
-                    console.log('Found the following verified Internal QA PRs:', resolvedInternalQAPRs);
-                    issueBody += '**Internal QA:**\r\n';
-                    Object.keys(internalQAPRMap).forEach((URL) => {
-                        const merger = internalQAPRMap[URL];
-                        const mergerMention = `@${merger}`;
-                        issueBody += `${resolvedInternalQAPRs.includes(URL) ? '- [x]' : '- [ ]'} `;
-                        issueBody += `${URL}`;
-                        issueBody += ` - ${mergerMention}`;
-                        issueBody += '\r\n';
-                    });
-                    issueBody += '\r\n\r\n';
-                }
-                // Deploy blockers
-                if (deployBlockers.length > 0) {
-                    issueBody += '**Deploy Blockers:**\r\n';
-                    sortedDeployBlockers.forEach((URL) => {
-                        issueBody += resolvedDeployBlockers.includes(URL) ? '- [x] ' : '- [ ] ';
-                        issueBody += URL;
-                        issueBody += '\r\n';
-                    });
-                    issueBody += '\r\n\r\n';
-                }
-                issueBody += '**Deployer verifications:**';
-                // eslint-disable-next-line max-len
-                issueBody += `\r\n- [${isTimingDashboardChecked ? 'x' : ' '}] I checked the [App Timing Dashboard](https://graphs.expensify.com/grafana/d/yj2EobAGz/app-timing?orgId=1) and verified this release does not cause a noticeable performance regression.`;
-                // eslint-disable-next-line max-len
-                issueBody += `\r\n- [${isFirebaseChecked ? 'x' : ' '}] I checked [Firebase Crashlytics](https://console.firebase.google.com/u/0/project/expensify-chat/crashlytics/app/android:com.expensify.chat/issues?state=open&time=last-seven-days&tag=all) and verified that this release does not introduce any new crashes. More detailed instructions on this verification can be found [here](https://stackoverflowteams.com/c/expensify/questions/15095/15096).`;
-                // eslint-disable-next-line max-len
-                issueBody += `\r\n- [${isGHStatusChecked ? 'x' : ' '}] I checked [GitHub Status](https://www.githubstatus.com/) and verified there is no reported incident with Actions.`;
-                issueBody += '\r\n\r\ncc @Expensify/applauseleads\r\n';
-                const issueAssignees = [...new Set(Object.values(internalQAPRMap))];
-                const issue = { issueBody, issueAssignees };
-                return issue;
-            });
-        })
-            .catch((err) => console.warn('Error generating StagingDeployCash issue body! Continuing...', err));
-    }
-    /**
-     * Fetch all pull requests given a list of PR numbers.
-     */
-    static fetchAllPullRequests(pullRequestNumbers) {
-        const oldestPR = pullRequestNumbers.sort((a, b) => a - b)[0];
-        return this.paginate(this.octokit.pulls.list, {
-            owner: CONST_1.default.GITHUB_OWNER,
-            repo: CONST_1.default.APP_REPO,
-            state: 'all',
-            sort: 'created',
-            direction: 'desc',
-            per_page: 100,
-        }, ({ data }, done) => {
-            if (data.find((pr) => pr.number === oldestPR)) {
-                done();
-            }
-            return data;
-        })
-            .then((prList) => prList.filter((pr) => pullRequestNumbers.includes(pr.number)))
-            .catch((err) => console.error('Failed to get PR list', err));
-    }
-    static getPullRequestMergerLogin(pullRequestNumber) {
-        return this.octokit.pulls
-            .get({
-            owner: CONST_1.default.GITHUB_OWNER,
-            repo: CONST_1.default.APP_REPO,
-            pull_number: pullRequestNumber,
-        })
-            .then(({ data: pullRequest }) => pullRequest.merged_by?.login);
-    }
-    static getPullRequestBody(pullRequestNumber) {
-        return this.octokit.pulls
-            .get({
-            owner: CONST_1.default.GITHUB_OWNER,
-            repo: CONST_1.default.APP_REPO,
-            pull_number: pullRequestNumber,
-        })
-            .then(({ data: pullRequestComment }) => pullRequestComment.body);
-    }
-    static getAllReviewComments(pullRequestNumber) {
-        return this.paginate(this.octokit.pulls.listReviews, {
-            owner: CONST_1.default.GITHUB_OWNER,
-            repo: CONST_1.default.APP_REPO,
-            pull_number: pullRequestNumber,
-            per_page: 100,
-        }, (response) => response.data.map((review) => review.body));
-    }
-    static getAllComments(issueNumber) {
-        return this.paginate(this.octokit.issues.listComments, {
-            owner: CONST_1.default.GITHUB_OWNER,
-            repo: CONST_1.default.APP_REPO,
-            issue_number: issueNumber,
-            per_page: 100,
-        }, (response) => response.data.map((comment) => comment.body));
-    }
-    /**
-     * Create comment on pull request
-     */
-    static createComment(repo, number, messageBody) {
-        console.log(`Writing comment on #${number}`);
-        return this.octokit.issues.createComment({
-            owner: CONST_1.default.GITHUB_OWNER,
-            repo,
-            issue_number: number,
-            body: messageBody,
-        });
-    }
-    /**
-     * Get the most recent workflow run for the given New Expensify workflow.
-     */
-    static getLatestWorkflowRunID(workflow) {
-        console.log(`Fetching New Expensify workflow runs for ${workflow}...`);
-        return this.octokit.actions
-            .listWorkflowRuns({
-            owner: CONST_1.default.GITHUB_OWNER,
-            repo: CONST_1.default.APP_REPO,
-            workflow_id: workflow,
-        })
-            .then((response) => response.data.workflow_runs[0]?.id);
-    }
-    /**
-     * Generate the well-formatted body of a production release.
-     */
-    static getReleaseBody(pullRequests) {
-        return pullRequests.map((number) => `- ${this.getPullRequestURLFromNumber(number)}`).join('\r\n');
-    }
-    /**
-     * Generate the URL of an New Expensify pull request given the PR number.
-     */
-    static getPullRequestURLFromNumber(value) {
-        return `${CONST_1.default.APP_REPO_URL}/pull/${value}`;
-    }
-    /**
-     * Parse the pull request number from a URL.
-     *
-     * @throws {Error} If the URL is not a valid Github Pull Request.
-     */
-    static getPullRequestNumberFromURL(URL) {
-        const matches = URL.match(CONST_1.default.PULL_REQUEST_REGEX);
-        if (!Array.isArray(matches) || matches.length !== 2) {
-            throw new Error(`Provided URL ${URL} is not a Github Pull Request!`);
-        }
-        return Number.parseInt(matches[1], 10);
-    }
-    /**
-     * Parse the issue number from a URL.
-     *
-     * @throws {Error} If the URL is not a valid Github Issue.
-     */
-    static getIssueNumberFromURL(URL) {
-        const matches = URL.match(CONST_1.default.ISSUE_REGEX);
-        if (!Array.isArray(matches) || matches.length !== 2) {
-            throw new Error(`Provided URL ${URL} is not a Github Issue!`);
-        }
-        return Number.parseInt(matches[1], 10);
-    }
-    /**
-     * Parse the issue or pull request number from a URL.
-     *
-     * @throws {Error} If the URL is not a valid Github Issue or Pull Request.
-     */
-    static getIssueOrPullRequestNumberFromURL(URL) {
-        const matches = URL.match(CONST_1.default.ISSUE_OR_PULL_REQUEST_REGEX);
-        if (!Array.isArray(matches) || matches.length !== 2) {
-            throw new Error(`Provided URL ${URL} is not a valid Github Issue or Pull Request!`);
-        }
-        return Number.parseInt(matches[1], 10);
-    }
-    /**
-     * Return the login of the actor who closed an issue or PR. If the issue is not closed, return an empty string.
-     */
-    static getActorWhoClosedIssue(issueNumber) {
-        return this.paginate(this.octokit.issues.listEvents, {
-            owner: CONST_1.default.GITHUB_OWNER,
-            repo: CONST_1.default.APP_REPO,
-            issue_number: issueNumber,
-            per_page: 100,
-        })
-            .then((events) => events.filter((event) => event.event === 'closed'))
-            .then((closedEvents) => closedEvents.at(-1)?.actor?.login ?? '');
-    }
-    static getArtifactByName(artefactName) {
-        return this.paginate(this.octokit.actions.listArtifactsForRepo, {
-            owner: CONST_1.default.GITHUB_OWNER,
-            repo: CONST_1.default.APP_REPO,
-            per_page: 100,
-        }).then((artifacts) => artifacts.find((artifact) => artifact.name === artefactName));
-    }
-}
-exports["default"] = GithubUtils;
-
-
-/***/ }),
-
-/***/ 8227:
-/***/ ((__unused_webpack_module, exports) => {
-
-"use strict";
-
-Object.defineProperty(exports, "__esModule", ({ value: true }));
-exports.isEmptyObject = void 0;
-function isEmptyObject(obj) {
-    return Object.keys(obj ?? {}).length === 0;
-}
-exports.isEmptyObject = isEmptyObject;
-
-
-/***/ }),
-
-/***/ 7034:
-/***/ ((__unused_webpack_module, exports) => {
-
-"use strict";
-
-Object.defineProperty(exports, "__esModule", ({ value: true }));
-/**
- * This function is an equivalent of _.difference, it takes two arrays and returns the difference between them.
- * It returns an array of items that are in the first array but not in the second array.
- */
-function arrayDifference(array1, array2) {
-    return [array1, array2].reduce((a, b) => a.filter((c) => !b.includes(c)));
-}
-exports["default"] = arrayDifference;
-
-
-/***/ }),
-
-/***/ 2877:
-/***/ ((module) => {
-
-module.exports = eval("require")("encoding");
-
-
-/***/ }),
-
-/***/ 9491:
-/***/ ((module) => {
-
-"use strict";
-module.exports = require("assert");
-
-/***/ }),
-
-/***/ 6113:
-/***/ ((module) => {
-
-"use strict";
-module.exports = require("crypto");
-
-/***/ }),
-
-/***/ 2361:
-/***/ ((module) => {
-
-"use strict";
-module.exports = require("events");
-
-/***/ }),
-
-/***/ 7147:
-/***/ ((module) => {
-
-"use strict";
-module.exports = require("fs");
-
-/***/ }),
-
-/***/ 3685:
-/***/ ((module) => {
-
-"use strict";
-module.exports = require("http");
-
-/***/ }),
-
-/***/ 5687:
-/***/ ((module) => {
-
-"use strict";
-module.exports = require("https");
-
-/***/ }),
-
-/***/ 1808:
-/***/ ((module) => {
-
-"use strict";
-module.exports = require("net");
-
-/***/ }),
-
-/***/ 2037:
-/***/ ((module) => {
-
-"use strict";
-module.exports = require("os");
-
-/***/ }),
-
-/***/ 1017:
-/***/ ((module) => {
-
-"use strict";
-module.exports = require("path");
-
-/***/ }),
-
-/***/ 5477:
-/***/ ((module) => {
-
-"use strict";
-module.exports = require("punycode");
-
-/***/ }),
-
-/***/ 2781:
-/***/ ((module) => {
-
-"use strict";
-module.exports = require("stream");
-
-/***/ }),
-
-/***/ 4404:
-/***/ ((module) => {
-
-"use strict";
-module.exports = require("tls");
-
-/***/ }),
-
-/***/ 7310:
-/***/ ((module) => {
-
-"use strict";
-module.exports = require("url");
-
-/***/ }),
-
-/***/ 3837:
-/***/ ((module) => {
-
-"use strict";
-module.exports = require("util");
-
-/***/ }),
-
-/***/ 9796:
-/***/ ((module) => {
-
-"use strict";
-module.exports = require("zlib");
-
-/***/ }),
-
-/***/ 1907:
-/***/ ((module) => {
-
-"use strict";
-module.exports = JSON.parse('[[[0,44],"disallowed_STD3_valid"],[[45,46],"valid"],[[47,47],"disallowed_STD3_valid"],[[48,57],"valid"],[[58,64],"disallowed_STD3_valid"],[[65,65],"mapped",[97]],[[66,66],"mapped",[98]],[[67,67],"mapped",[99]],[[68,68],"mapped",[100]],[[69,69],"mapped",[101]],[[70,70],"mapped",[102]],[[71,71],"mapped",[103]],[[72,72],"mapped",[104]],[[73,73],"mapped",[105]],[[74,74],"mapped",[106]],[[75,75],"mapped",[107]],[[76,76],"mapped",[108]],[[77,77],"mapped",[109]],[[78,78],"mapped",[110]],[[79,79],"mapped",[111]],[[80,80],"mapped",[112]],[[81,81],"mapped",[113]],[[82,82],"mapped",[114]],[[83,83],"mapped",[115]],[[84,84],"mapped",[116]],[[85,85],"mapped",[117]],[[86,86],"mapped",[118]],[[87,87],"mapped",[119]],[[88,88],"mapped",[120]],[[89,89],"mapped",[121]],[[90,90],"mapped",[122]],[[91,96],"disallowed_STD3_valid"],[[97,122],"valid"],[[123,127],"disallowed_STD3_valid"],[[128,159],"disallowed"],[[160,160],"disallowed_STD3_mapped",[32]],[[161,167],"valid",[],"NV8"],[[168,168],"disallowed_STD3_mapped",[32,776]],[[169,169],"valid",[],"NV8"],[[170,170],"mapped",[97]],[[171,172],"valid",[],"NV8"],[[173,173],"ignored"],[[174,174],"valid",[],"NV8"],[[175,175],"disallowed_STD3_mapped",[32,772]],[[176,177],"valid",[],"NV8"],[[178,178],"mapped",[50]],[[179,179],"mapped",[51]],[[180,180],"disallowed_STD3_mapped",[32,769]],[[181,181],"mapped",[956]],[[182,182],"valid",[],"NV8"],[[183,183],"valid"],[[184,184],"disallowed_STD3_mapped",[32,807]],[[185,185],"mapped",[49]],[[186,186],"mapped",[111]],[[187,187],"valid",[],"NV8"],[[188,188],"mapped",[49,8260,52]],[[189,189],"mapped",[49,8260,50]],[[190,190],"mapped",[51,8260,52]],[[191,191],"valid",[],"NV8"],[[192,192],"mapped",[224]],[[193,193],"mapped",[225]],[[194,194],"mapped",[226]],[[195,195],"mapped",[227]],[[196,196],"mapped",[228]],[[197,197],"mapped",[229]],[[198,198],"mapped",[230]],[[199,199],"mapped",[231]],[[200,200],"mapped",[232]],[[201,201],"mapped",[233]],[[202,202],"mapped",[234]],[[203,203],"mapped",[235]],[[204,204],"mapped",[236]],[[205,205],"mapped",[237]],[[206,206],"mapped",[238]],[[207,207],"mapped",[239]],[[208,208],"mapped",[240]],[[209,209],"mapped",[241]],[[210,210],"mapped",[242]],[[211,211],"mapped",[243]],[[212,212],"mapped",[244]],[[213,213],"mapped",[245]],[[214,214],"mapped",[246]],[[215,215],"valid",[],"NV8"],[[216,216],"mapped",[248]],[[217,217],"mapped",[249]],[[218,218],"mapped",[250]],[[219,219],"mapped",[251]],[[220,220],"mapped",[252]],[[221,221],"mapped",[253]],[[222,222],"mapped",[254]],[[223,223],"deviation",[115,115]],[[224,246],"valid"],[[247,247],"valid",[],"NV8"],[[248,255],"valid"],[[256,256],"mapped",[257]],[[257,257],"valid"],[[258,258],"mapped",[259]],[[259,259],"valid"],[[260,260],"mapped",[261]],[[261,261],"valid"],[[262,262],"mapped",[263]],[[263,263],"valid"],[[264,264],"mapped",[265]],[[265,265],"valid"],[[266,266],"mapped",[267]],[[267,267],"valid"],[[268,268],"mapped",[269]],[[269,269],"valid"],[[270,270],"mapped",[271]],[[271,271],"valid"],[[272,272],"mapped",[273]],[[273,273],"valid"],[[274,274],"mapped",[275]],[[275,275],"valid"],[[276,276],"mapped",[277]],[[277,277],"valid"],[[278,278],"mapped",[279]],[[279,279],"valid"],[[280,280],"mapped",[281]],[[281,281],"valid"],[[282,282],"mapped",[283]],[[283,283],"valid"],[[284,284],"mapped",[285]],[[285,285],"valid"],[[286,286],"mapped",[287]],[[287,287],"valid"],[[288,288],"mapped",[289]],[[289,289],"valid"],[[290,290],"mapped",[291]],[[291,291],"valid"],[[292,292],"mapped",[293]],[[293,293],"valid"],[[294,294],"mapped",[295]],[[295,295],"valid"],[[296,296],"mapped",[297]],[[297,297],"valid"],[[298,298],"mapped",[299]],[[299,299],"valid"],[[300,300],"mapped",[301]],[[301,301],"valid"],[[302,302],"mapped",[303]],[[303,303],"valid"],[[304,304],"mapped",[105,775]],[[305,305],"valid"],[[306,307],"mapped",[105,106]],[[308,308],"mapped",[309]],[[309,309],"valid"],[[310,310],"mapped",[311]],[[311,312],"valid"],[[313,313],"mapped",[314]],[[314,314],"valid"],[[315,315],"mapped",[316]],[[316,316],"valid"],[[317,317],"mapped",[318]],[[318,318],"valid"],[[319,320],"mapped",[108,183]],[[321,321],"mapped",[322]],[[322,322],"valid"],[[323,323],"mapped",[324]],[[324,324],"valid"],[[325,325],"mapped",[326]],[[326,326],"valid"],[[327,327],"mapped",[328]],[[328,328],"valid"],[[329,329],"mapped",[700,110]],[[330,330],"mapped",[331]],[[331,331],"valid"],[[332,332],"mapped",[333]],[[333,333],"valid"],[[334,334],"mapped",[335]],[[335,335],"valid"],[[336,336],"mapped",[337]],[[337,337],"valid"],[[338,338],"mapped",[339]],[[339,339],"valid"],[[340,340],"mapped",[341]],[[341,341],"valid"],[[342,342],"mapped",[343]],[[343,343],"valid"],[[344,344],"mapped",[345]],[[345,345],"valid"],[[346,346],"mapped",[347]],[[347,347],"valid"],[[348,348],"mapped",[349]],[[349,349],"valid"],[[350,350],"mapped",[351]],[[351,351],"valid"],[[352,352],"mapped",[353]],[[353,353],"valid"],[[354,354],"mapped",[355]],[[355,355],"valid"],[[356,356],"mapped",[357]],[[357,357],"valid"],[[358,358],"mapped",[359]],[[359,359],"valid"],[[360,360],"mapped",[361]],[[361,361],"valid"],[[362,362],"mapped",[363]],[[363,363],"valid"],[[364,364],"mapped",[365]],[[365,365],"valid"],[[366,366],"mapped",[367]],[[367,367],"valid"],[[368,368],"mapped",[369]],[[369,369],"valid"],[[370,370],"mapped",[371]],[[371,371],"valid"],[[372,372],"mapped",[373]],[[373,373],"valid"],[[374,374],"mapped",[375]],[[375,375],"valid"],[[376,376],"mapped",[255]],[[377,377],"mapped",[378]],[[378,378],"valid"],[[379,379],"mapped",[380]],[[380,380],"valid"],[[381,381],"mapped",[382]],[[382,382],"valid"],[[383,383],"mapped",[115]],[[384,384],"valid"],[[385,385],"mapped",[595]],[[386,386],"mapped",[387]],[[387,387],"valid"],[[388,388],"mapped",[389]],[[389,389],"valid"],[[390,390],"mapped",[596]],[[391,391],"mapped",[392]],[[392,392],"valid"],[[393,393],"mapped",[598]],[[394,394],"mapped",[599]],[[395,395],"mapped",[396]],[[396,397],"valid"],[[398,398],"mapped",[477]],[[399,399],"mapped",[601]],[[400,400],"mapped",[603]],[[401,401],"mapped",[402]],[[402,402],"valid"],[[403,403],"mapped",[608]],[[404,404],"mapped",[611]],[[405,405],"valid"],[[406,406],"mapped",[617]],[[407,407],"mapped",[616]],[[408,408],"mapped",[409]],[[409,411],"valid"],[[412,412],"mapped",[623]],[[413,413],"mapped",[626]],[[414,414],"valid"],[[415,415],"mapped",[629]],[[416,416],"mapped",[417]],[[417,417],"valid"],[[418,418],"mapped",[419]],[[419,419],"valid"],[[420,420],"mapped",[421]],[[421,421],"valid"],[[422,422],"mapped",[640]],[[423,423],"mapped",[424]],[[424,424],"valid"],[[425,425],"mapped",[643]],[[426,427],"valid"],[[428,428],"mapped",[429]],[[429,429],"valid"],[[430,430],"mapped",[648]],[[431,431],"mapped",[432]],[[432,432],"valid"],[[433,433],"mapped",[650]],[[434,434],"mapped",[651]],[[435,435],"mapped",[436]],[[436,436],"valid"],[[437,437],"mapped",[438]],[[438,438],"valid"],[[439,439],"mapped",[658]],[[440,440],"mapped",[441]],[[441,443],"valid"],[[444,444],"mapped",[445]],[[445,451],"valid"],[[452,454],"mapped",[100,382]],[[455,457],"mapped",[108,106]],[[458,460],"mapped",[110,106]],[[461,461],"mapped",[462]],[[462,462],"valid"],[[463,463],"mapped",[464]],[[464,464],"valid"],[[465,465],"mapped",[466]],[[466,466],"valid"],[[467,467],"mapped",[468]],[[468,468],"valid"],[[469,469],"mapped",[470]],[[470,470],"valid"],[[471,471],"mapped",[472]],[[472,472],"valid"],[[473,473],"mapped",[474]],[[474,474],"valid"],[[475,475],"mapped",[476]],[[476,477],"valid"],[[478,478],"mapped",[479]],[[479,479],"valid"],[[480,480],"mapped",[481]],[[481,481],"valid"],[[482,482],"mapped",[483]],[[483,483],"valid"],[[484,484],"mapped",[485]],[[485,485],"valid"],[[486,486],"mapped",[487]],[[487,487],"valid"],[[488,488],"mapped",[489]],[[489,489],"valid"],[[490,490],"mapped",[491]],[[491,491],"valid"],[[492,492],"mapped",[493]],[[493,493],"valid"],[[494,494],"mapped",[495]],[[495,496],"valid"],[[497,499],"mapped",[100,122]],[[500,500],"mapped",[501]],[[501,501],"valid"],[[502,502],"mapped",[405]],[[503,503],"mapped",[447]],[[504,504],"mapped",[505]],[[505,505],"valid"],[[506,506],"mapped",[507]],[[507,507],"valid"],[[508,508],"mapped",[509]],[[509,509],"valid"],[[510,510],"mapped",[511]],[[511,511],"valid"],[[512,512],"mapped",[513]],[[513,513],"valid"],[[514,514],"mapped",[515]],[[515,515],"valid"],[[516,516],"mapped",[517]],[[517,517],"valid"],[[518,518],"mapped",[519]],[[519,519],"valid"],[[520,520],"mapped",[521]],[[521,521],"valid"],[[522,522],"mapped",[523]],[[523,523],"valid"],[[524,524],"mapped",[525]],[[525,525],"valid"],[[526,526],"mapped",[527]],[[527,527],"valid"],[[528,528],"mapped",[529]],[[529,529],"valid"],[[530,530],"mapped",[531]],[[531,531],"valid"],[[532,532],"mapped",[533]],[[533,533],"valid"],[[534,534],"mapped",[535]],[[535,535],"valid"],[[536,536],"mapped",[537]],[[537,537],"valid"],[[538,538],"mapped",[539]],[[539,539],"valid"],[[540,540],"mapped",[541]],[[541,541],"valid"],[[542,542],"mapped",[543]],[[543,543],"valid"],[[544,544],"mapped",[414]],[[545,545],"valid"],[[546,546],"mapped",[547]],[[547,547],"valid"],[[548,548],"mapped",[549]],[[549,549],"valid"],[[550,550],"mapped",[551]],[[551,551],"valid"],[[552,552],"mapped",[553]],[[553,553],"valid"],[[554,554],"mapped",[555]],[[555,555],"valid"],[[556,556],"mapped",[557]],[[557,557],"valid"],[[558,558],"mapped",[559]],[[559,559],"valid"],[[560,560],"mapped",[561]],[[561,561],"valid"],[[562,562],"mapped",[563]],[[563,563],"valid"],[[564,566],"valid"],[[567,569],"valid"],[[570,570],"mapped",[11365]],[[571,571],"mapped",[572]],[[572,572],"valid"],[[573,573],"mapped",[410]],[[574,574],"mapped",[11366]],[[575,576],"valid"],[[577,577],"mapped",[578]],[[578,578],"valid"],[[579,579],"mapped",[384]],[[580,580],"mapped",[649]],[[581,581],"mapped",[652]],[[582,582],"mapped",[583]],[[583,583],"valid"],[[584,584],"mapped",[585]],[[585,585],"valid"],[[586,586],"mapped",[587]],[[587,587],"valid"],[[588,588],"mapped",[589]],[[589,589],"valid"],[[590,590],"mapped",[591]],[[591,591],"valid"],[[592,680],"valid"],[[681,685],"valid"],[[686,687],"valid"],[[688,688],"mapped",[104]],[[689,689],"mapped",[614]],[[690,690],"mapped",[106]],[[691,691],"mapped",[114]],[[692,692],"mapped",[633]],[[693,693],"mapped",[635]],[[694,694],"mapped",[641]],[[695,695],"mapped",[119]],[[696,696],"mapped",[121]],[[697,705],"valid"],[[706,709],"valid",[],"NV8"],[[710,721],"valid"],[[722,727],"valid",[],"NV8"],[[728,728],"disallowed_STD3_mapped",[32,774]],[[729,729],"disallowed_STD3_mapped",[32,775]],[[730,730],"disallowed_STD3_mapped",[32,778]],[[731,731],"disallowed_STD3_mapped",[32,808]],[[732,732],"disallowed_STD3_mapped",[32,771]],[[733,733],"disallowed_STD3_mapped",[32,779]],[[734,734],"valid",[],"NV8"],[[735,735],"valid",[],"NV8"],[[736,736],"mapped",[611]],[[737,737],"mapped",[108]],[[738,738],"mapped",[115]],[[739,739],"mapped",[120]],[[740,740],"mapped",[661]],[[741,745],"valid",[],"NV8"],[[746,747],"valid",[],"NV8"],[[748,748],"valid"],[[749,749],"valid",[],"NV8"],[[750,750],"valid"],[[751,767],"valid",[],"NV8"],[[768,831],"valid"],[[832,832],"mapped",[768]],[[833,833],"mapped",[769]],[[834,834],"valid"],[[835,835],"mapped",[787]],[[836,836],"mapped",[776,769]],[[837,837],"mapped",[953]],[[838,846],"valid"],[[847,847],"ignored"],[[848,855],"valid"],[[856,860],"valid"],[[861,863],"valid"],[[864,865],"valid"],[[866,866],"valid"],[[867,879],"valid"],[[880,880],"mapped",[881]],[[881,881],"valid"],[[882,882],"mapped",[883]],[[883,883],"valid"],[[884,884],"mapped",[697]],[[885,885],"valid"],[[886,886],"mapped",[887]],[[887,887],"valid"],[[888,889],"disallowed"],[[890,890],"disallowed_STD3_mapped",[32,953]],[[891,893],"valid"],[[894,894],"disallowed_STD3_mapped",[59]],[[895,895],"mapped",[1011]],[[896,899],"disallowed"],[[900,900],"disallowed_STD3_mapped",[32,769]],[[901,901],"disallowed_STD3_mapped",[32,776,769]],[[902,902],"mapped",[940]],[[903,903],"mapped",[183]],[[904,904],"mapped",[941]],[[905,905],"mapped",[942]],[[906,906],"mapped",[943]],[[907,907],"disallowed"],[[908,908],"mapped",[972]],[[909,909],"disallowed"],[[910,910],"mapped",[973]],[[911,911],"mapped",[974]],[[912,912],"valid"],[[913,913],"mapped",[945]],[[914,914],"mapped",[946]],[[915,915],"mapped",[947]],[[916,916],"mapped",[948]],[[917,917],"mapped",[949]],[[918,918],"mapped",[950]],[[919,919],"mapped",[951]],[[920,920],"mapped",[952]],[[921,921],"mapped",[953]],[[922,922],"mapped",[954]],[[923,923],"mapped",[955]],[[924,924],"mapped",[956]],[[925,925],"mapped",[957]],[[926,926],"mapped",[958]],[[927,927],"mapped",[959]],[[928,928],"mapped",[960]],[[929,929],"mapped",[961]],[[930,930],"disallowed"],[[931,931],"mapped",[963]],[[932,932],"mapped",[964]],[[933,933],"mapped",[965]],[[934,934],"mapped",[966]],[[935,935],"mapped",[967]],[[936,936],"mapped",[968]],[[937,937],"mapped",[969]],[[938,938],"mapped",[970]],[[939,939],"mapped",[971]],[[940,961],"valid"],[[962,962],"deviation",[963]],[[963,974],"valid"],[[975,975],"mapped",[983]],[[976,976],"mapped",[946]],[[977,977],"mapped",[952]],[[978,978],"mapped",[965]],[[979,979],"mapped",[973]],[[980,980],"mapped",[971]],[[981,981],"mapped",[966]],[[982,982],"mapped",[960]],[[983,983],"valid"],[[984,984],"mapped",[985]],[[985,985],"valid"],[[986,986],"mapped",[987]],[[987,987],"valid"],[[988,988],"mapped",[989]],[[989,989],"valid"],[[990,990],"mapped",[991]],[[991,991],"valid"],[[992,992],"mapped",[993]],[[993,993],"valid"],[[994,994],"mapped",[995]],[[995,995],"valid"],[[996,996],"mapped",[997]],[[997,997],"valid"],[[998,998],"mapped",[999]],[[999,999],"valid"],[[1000,1000],"mapped",[1001]],[[1001,1001],"valid"],[[1002,1002],"mapped",[1003]],[[1003,1003],"valid"],[[1004,1004],"mapped",[1005]],[[1005,1005],"valid"],[[1006,1006],"mapped",[1007]],[[1007,1007],"valid"],[[1008,1008],"mapped",[954]],[[1009,1009],"mapped",[961]],[[1010,1010],"mapped",[963]],[[1011,1011],"valid"],[[1012,1012],"mapped",[952]],[[1013,1013],"mapped",[949]],[[1014,1014],"valid",[],"NV8"],[[1015,1015],"mapped",[1016]],[[1016,1016],"valid"],[[1017,1017],"mapped",[963]],[[1018,1018],"mapped",[1019]],[[1019,1019],"valid"],[[1020,1020],"valid"],[[1021,1021],"mapped",[891]],[[1022,1022],"mapped",[892]],[[1023,1023],"mapped",[893]],[[1024,1024],"mapped",[1104]],[[1025,1025],"mapped",[1105]],[[1026,1026],"mapped",[1106]],[[1027,1027],"mapped",[1107]],[[1028,1028],"mapped",[1108]],[[1029,1029],"mapped",[1109]],[[1030,1030],"mapped",[1110]],[[1031,1031],"mapped",[1111]],[[1032,1032],"mapped",[1112]],[[1033,1033],"mapped",[1113]],[[1034,1034],"mapped",[1114]],[[1035,1035],"mapped",[1115]],[[1036,1036],"mapped",[1116]],[[1037,1037],"mapped",[1117]],[[1038,1038],"mapped",[1118]],[[1039,1039],"mapped",[1119]],[[1040,1040],"mapped",[1072]],[[1041,1041],"mapped",[1073]],[[1042,1042],"mapped",[1074]],[[1043,1043],"mapped",[1075]],[[1044,1044],"mapped",[1076]],[[1045,1045],"mapped",[1077]],[[1046,1046],"mapped",[1078]],[[1047,1047],"mapped",[1079]],[[1048,1048],"mapped",[1080]],[[1049,1049],"mapped",[1081]],[[1050,1050],"mapped",[1082]],[[1051,1051],"mapped",[1083]],[[1052,1052],"mapped",[1084]],[[1053,1053],"mapped",[1085]],[[1054,1054],"mapped",[1086]],[[1055,1055],"mapped",[1087]],[[1056,1056],"mapped",[1088]],[[1057,1057],"mapped",[1089]],[[1058,1058],"mapped",[1090]],[[1059,1059],"mapped",[1091]],[[1060,1060],"mapped",[1092]],[[1061,1061],"mapped",[1093]],[[1062,1062],"mapped",[1094]],[[1063,1063],"mapped",[1095]],[[1064,1064],"mapped",[1096]],[[1065,1065],"mapped",[1097]],[[1066,1066],"mapped",[1098]],[[1067,1067],"mapped",[1099]],[[1068,1068],"mapped",[1100]],[[1069,1069],"mapped",[1101]],[[1070,1070],"mapped",[1102]],[[1071,1071],"mapped",[1103]],[[1072,1103],"valid"],[[1104,1104],"valid"],[[1105,1116],"valid"],[[1117,1117],"valid"],[[1118,1119],"valid"],[[1120,1120],"mapped",[1121]],[[1121,1121],"valid"],[[1122,1122],"mapped",[1123]],[[1123,1123],"valid"],[[1124,1124],"mapped",[1125]],[[1125,1125],"valid"],[[1126,1126],"mapped",[1127]],[[1127,1127],"valid"],[[1128,1128],"mapped",[1129]],[[1129,1129],"valid"],[[1130,1130],"mapped",[1131]],[[1131,1131],"valid"],[[1132,1132],"mapped",[1133]],[[1133,1133],"valid"],[[1134,1134],"mapped",[1135]],[[1135,1135],"valid"],[[1136,1136],"mapped",[1137]],[[1137,1137],"valid"],[[1138,1138],"mapped",[1139]],[[1139,1139],"valid"],[[1140,1140],"mapped",[1141]],[[1141,1141],"valid"],[[1142,1142],"mapped",[1143]],[[1143,1143],"valid"],[[1144,1144],"mapped",[1145]],[[1145,1145],"valid"],[[1146,1146],"mapped",[1147]],[[1147,1147],"valid"],[[1148,1148],"mapped",[1149]],[[1149,1149],"valid"],[[1150,1150],"mapped",[1151]],[[1151,1151],"valid"],[[1152,1152],"mapped",[1153]],[[1153,1153],"valid"],[[1154,1154],"valid",[],"NV8"],[[1155,1158],"valid"],[[1159,1159],"valid"],[[1160,1161],"valid",[],"NV8"],[[1162,1162],"mapped",[1163]],[[1163,1163],"valid"],[[1164,1164],"mapped",[1165]],[[1165,1165],"valid"],[[1166,1166],"mapped",[1167]],[[1167,1167],"valid"],[[1168,1168],"mapped",[1169]],[[1169,1169],"valid"],[[1170,1170],"mapped",[1171]],[[1171,1171],"valid"],[[1172,1172],"mapped",[1173]],[[1173,1173],"valid"],[[1174,1174],"mapped",[1175]],[[1175,1175],"valid"],[[1176,1176],"mapped",[1177]],[[1177,1177],"valid"],[[1178,1178],"mapped",[1179]],[[1179,1179],"valid"],[[1180,1180],"mapped",[1181]],[[1181,1181],"valid"],[[1182,1182],"mapped",[1183]],[[1183,1183],"valid"],[[1184,1184],"mapped",[1185]],[[1185,1185],"valid"],[[1186,1186],"mapped",[1187]],[[1187,1187],"valid"],[[1188,1188],"mapped",[1189]],[[1189,1189],"valid"],[[1190,1190],"mapped",[1191]],[[1191,1191],"valid"],[[1192,1192],"mapped",[1193]],[[1193,1193],"valid"],[[1194,1194],"mapped",[1195]],[[1195,1195],"valid"],[[1196,1196],"mapped",[1197]],[[1197,1197],"valid"],[[1198,1198],"mapped",[1199]],[[1199,1199],"valid"],[[1200,1200],"mapped",[1201]],[[1201,1201],"valid"],[[1202,1202],"mapped",[1203]],[[1203,1203],"valid"],[[1204,1204],"mapped",[1205]],[[1205,1205],"valid"],[[1206,1206],"mapped",[1207]],[[1207,1207],"valid"],[[1208,1208],"mapped",[1209]],[[1209,1209],"valid"],[[1210,1210],"mapped",[1211]],[[1211,1211],"valid"],[[1212,1212],"mapped",[1213]],[[1213,1213],"valid"],[[1214,1214],"mapped",[1215]],[[1215,1215],"valid"],[[1216,1216],"disallowed"],[[1217,1217],"mapped",[1218]],[[1218,1218],"valid"],[[1219,1219],"mapped",[1220]],[[1220,1220],"valid"],[[1221,1221],"mapped",[1222]],[[1222,1222],"valid"],[[1223,1223],"mapped",[1224]],[[1224,1224],"valid"],[[1225,1225],"mapped",[1226]],[[1226,1226],"valid"],[[1227,1227],"mapped",[1228]],[[1228,1228],"valid"],[[1229,1229],"mapped",[1230]],[[1230,1230],"valid"],[[1231,1231],"valid"],[[1232,1232],"mapped",[1233]],[[1233,1233],"valid"],[[1234,1234],"mapped",[1235]],[[1235,1235],"valid"],[[1236,1236],"mapped",[1237]],[[1237,1237],"valid"],[[1238,1238],"mapped",[1239]],[[1239,1239],"valid"],[[1240,1240],"mapped",[1241]],[[1241,1241],"valid"],[[1242,1242],"mapped",[1243]],[[1243,1243],"valid"],[[1244,1244],"mapped",[1245]],[[1245,1245],"valid"],[[1246,1246],"mapped",[1247]],[[1247,1247],"valid"],[[1248,1248],"mapped",[1249]],[[1249,1249],"valid"],[[1250,1250],"mapped",[1251]],[[1251,1251],"valid"],[[1252,1252],"mapped",[1253]],[[1253,1253],"valid"],[[1254,1254],"mapped",[1255]],[[1255,1255],"valid"],[[1256,1256],"mapped",[1257]],[[1257,1257],"valid"],[[1258,1258],"mapped",[1259]],[[1259,1259],"valid"],[[1260,1260],"mapped",[1261]],[[1261,1261],"valid"],[[1262,1262],"mapped",[1263]],[[1263,1263],"valid"],[[1264,1264],"mapped",[1265]],[[1265,1265],"valid"],[[1266,1266],"mapped",[1267]],[[1267,1267],"valid"],[[1268,1268],"mapped",[1269]],[[1269,1269],"valid"],[[1270,1270],"mapped",[1271]],[[1271,1271],"valid"],[[1272,1272],"mapped",[1273]],[[1273,1273],"valid"],[[1274,1274],"mapped",[1275]],[[1275,1275],"valid"],[[1276,1276],"mapped",[1277]],[[1277,1277],"valid"],[[1278,1278],"mapped",[1279]],[[1279,1279],"valid"],[[1280,1280],"mapped",[1281]],[[1281,1281],"valid"],[[1282,1282],"mapped",[1283]],[[1283,1283],"valid"],[[1284,1284],"mapped",[1285]],[[1285,1285],"valid"],[[1286,1286],"mapped",[1287]],[[1287,1287],"valid"],[[1288,1288],"mapped",[1289]],[[1289,1289],"valid"],[[1290,1290],"mapped",[1291]],[[1291,1291],"valid"],[[1292,1292],"mapped",[1293]],[[1293,1293],"valid"],[[1294,1294],"mapped",[1295]],[[1295,1295],"valid"],[[1296,1296],"mapped",[1297]],[[1297,1297],"valid"],[[1298,1298],"mapped",[1299]],[[1299,1299],"valid"],[[1300,1300],"mapped",[1301]],[[1301,1301],"valid"],[[1302,1302],"mapped",[1303]],[[1303,1303],"valid"],[[1304,1304],"mapped",[1305]],[[1305,1305],"valid"],[[1306,1306],"mapped",[1307]],[[1307,1307],"valid"],[[1308,1308],"mapped",[1309]],[[1309,1309],"valid"],[[1310,1310],"mapped",[1311]],[[1311,1311],"valid"],[[1312,1312],"mapped",[1313]],[[1313,1313],"valid"],[[1314,1314],"mapped",[1315]],[[1315,1315],"valid"],[[1316,1316],"mapped",[1317]],[[1317,1317],"valid"],[[1318,1318],"mapped",[1319]],[[1319,1319],"valid"],[[1320,1320],"mapped",[1321]],[[1321,1321],"valid"],[[1322,1322],"mapped",[1323]],[[1323,1323],"valid"],[[1324,1324],"mapped",[1325]],[[1325,1325],"valid"],[[1326,1326],"mapped",[1327]],[[1327,1327],"valid"],[[1328,1328],"disallowed"],[[1329,1329],"mapped",[1377]],[[1330,1330],"mapped",[1378]],[[1331,1331],"mapped",[1379]],[[1332,1332],"mapped",[1380]],[[1333,1333],"mapped",[1381]],[[1334,1334],"mapped",[1382]],[[1335,1335],"mapped",[1383]],[[1336,1336],"mapped",[1384]],[[1337,1337],"mapped",[1385]],[[1338,1338],"mapped",[1386]],[[1339,1339],"mapped",[1387]],[[1340,1340],"mapped",[1388]],[[1341,1341],"mapped",[1389]],[[1342,1342],"mapped",[1390]],[[1343,1343],"mapped",[1391]],[[1344,1344],"mapped",[1392]],[[1345,1345],"mapped",[1393]],[[1346,1346],"mapped",[1394]],[[1347,1347],"mapped",[1395]],[[1348,1348],"mapped",[1396]],[[1349,1349],"mapped",[1397]],[[1350,1350],"mapped",[1398]],[[1351,1351],"mapped",[1399]],[[1352,1352],"mapped",[1400]],[[1353,1353],"mapped",[1401]],[[1354,1354],"mapped",[1402]],[[1355,1355],"mapped",[1403]],[[1356,1356],"mapped",[1404]],[[1357,1357],"mapped",[1405]],[[1358,1358],"mapped",[1406]],[[1359,1359],"mapped",[1407]],[[1360,1360],"mapped",[1408]],[[1361,1361],"mapped",[1409]],[[1362,1362],"mapped",[1410]],[[1363,1363],"mapped",[1411]],[[1364,1364],"mapped",[1412]],[[1365,1365],"mapped",[1413]],[[1366,1366],"mapped",[1414]],[[1367,1368],"disallowed"],[[1369,1369],"valid"],[[1370,1375],"valid",[],"NV8"],[[1376,1376],"disallowed"],[[1377,1414],"valid"],[[1415,1415],"mapped",[1381,1410]],[[1416,1416],"disallowed"],[[1417,1417],"valid",[],"NV8"],[[1418,1418],"valid",[],"NV8"],[[1419,1420],"disallowed"],[[1421,1422],"valid",[],"NV8"],[[1423,1423],"valid",[],"NV8"],[[1424,1424],"disallowed"],[[1425,1441],"valid"],[[1442,1442],"valid"],[[1443,1455],"valid"],[[1456,1465],"valid"],[[1466,1466],"valid"],[[1467,1469],"valid"],[[1470,1470],"valid",[],"NV8"],[[1471,1471],"valid"],[[1472,1472],"valid",[],"NV8"],[[1473,1474],"valid"],[[1475,1475],"valid",[],"NV8"],[[1476,1476],"valid"],[[1477,1477],"valid"],[[1478,1478],"valid",[],"NV8"],[[1479,1479],"valid"],[[1480,1487],"disallowed"],[[1488,1514],"valid"],[[1515,1519],"disallowed"],[[1520,1524],"valid"],[[1525,1535],"disallowed"],[[1536,1539],"disallowed"],[[1540,1540],"disallowed"],[[1541,1541],"disallowed"],[[1542,1546],"valid",[],"NV8"],[[1547,1547],"valid",[],"NV8"],[[1548,1548],"valid",[],"NV8"],[[1549,1551],"valid",[],"NV8"],[[1552,1557],"valid"],[[1558,1562],"valid"],[[1563,1563],"valid",[],"NV8"],[[1564,1564],"disallowed"],[[1565,1565],"disallowed"],[[1566,1566],"valid",[],"NV8"],[[1567,1567],"valid",[],"NV8"],[[1568,1568],"valid"],[[1569,1594],"valid"],[[1595,1599],"valid"],[[1600,1600],"valid",[],"NV8"],[[1601,1618],"valid"],[[1619,1621],"valid"],[[1622,1624],"valid"],[[1625,1630],"valid"],[[1631,1631],"valid"],[[1632,1641],"valid"],[[1642,1645],"valid",[],"NV8"],[[1646,1647],"valid"],[[1648,1652],"valid"],[[1653,1653],"mapped",[1575,1652]],[[1654,1654],"mapped",[1608,1652]],[[1655,1655],"mapped",[1735,1652]],[[1656,1656],"mapped",[1610,1652]],[[1657,1719],"valid"],[[1720,1721],"valid"],[[1722,1726],"valid"],[[1727,1727],"valid"],[[1728,1742],"valid"],[[1743,1743],"valid"],[[1744,1747],"valid"],[[1748,1748],"valid",[],"NV8"],[[1749,1756],"valid"],[[1757,1757],"disallowed"],[[1758,1758],"valid",[],"NV8"],[[1759,1768],"valid"],[[1769,1769],"valid",[],"NV8"],[[1770,1773],"valid"],[[1774,1775],"valid"],[[1776,1785],"valid"],[[1786,1790],"valid"],[[1791,1791],"valid"],[[1792,1805],"valid",[],"NV8"],[[1806,1806],"disallowed"],[[1807,1807],"disallowed"],[[1808,1836],"valid"],[[1837,1839],"valid"],[[1840,1866],"valid"],[[1867,1868],"disallowed"],[[1869,1871],"valid"],[[1872,1901],"valid"],[[1902,1919],"valid"],[[1920,1968],"valid"],[[1969,1969],"valid"],[[1970,1983],"disallowed"],[[1984,2037],"valid"],[[2038,2042],"valid",[],"NV8"],[[2043,2047],"disallowed"],[[2048,2093],"valid"],[[2094,2095],"disallowed"],[[2096,2110],"valid",[],"NV8"],[[2111,2111],"disallowed"],[[2112,2139],"valid"],[[2140,2141],"disallowed"],[[2142,2142],"valid",[],"NV8"],[[2143,2207],"disallowed"],[[2208,2208],"valid"],[[2209,2209],"valid"],[[2210,2220],"valid"],[[2221,2226],"valid"],[[2227,2228],"valid"],[[2229,2274],"disallowed"],[[2275,2275],"valid"],[[2276,2302],"valid"],[[2303,2303],"valid"],[[2304,2304],"valid"],[[2305,2307],"valid"],[[2308,2308],"valid"],[[2309,2361],"valid"],[[2362,2363],"valid"],[[2364,2381],"valid"],[[2382,2382],"valid"],[[2383,2383],"valid"],[[2384,2388],"valid"],[[2389,2389],"valid"],[[2390,2391],"valid"],[[2392,2392],"mapped",[2325,2364]],[[2393,2393],"mapped",[2326,2364]],[[2394,2394],"mapped",[2327,2364]],[[2395,2395],"mapped",[2332,2364]],[[2396,2396],"mapped",[2337,2364]],[[2397,2397],"mapped",[2338,2364]],[[2398,2398],"mapped",[2347,2364]],[[2399,2399],"mapped",[2351,2364]],[[2400,2403],"valid"],[[2404,2405],"valid",[],"NV8"],[[2406,2415],"valid"],[[2416,2416],"valid",[],"NV8"],[[2417,2418],"valid"],[[2419,2423],"valid"],[[2424,2424],"valid"],[[2425,2426],"valid"],[[2427,2428],"valid"],[[2429,2429],"valid"],[[2430,2431],"valid"],[[2432,2432],"valid"],[[2433,2435],"valid"],[[2436,2436],"disallowed"],[[2437,2444],"valid"],[[2445,2446],"disallowed"],[[2447,2448],"valid"],[[2449,2450],"disallowed"],[[2451,2472],"valid"],[[2473,2473],"disallowed"],[[2474,2480],"valid"],[[2481,2481],"disallowed"],[[2482,2482],"valid"],[[2483,2485],"disallowed"],[[2486,2489],"valid"],[[2490,2491],"disallowed"],[[2492,2492],"valid"],[[2493,2493],"valid"],[[2494,2500],"valid"],[[2501,2502],"disallowed"],[[2503,2504],"valid"],[[2505,2506],"disallowed"],[[2507,2509],"valid"],[[2510,2510],"valid"],[[2511,2518],"disallowed"],[[2519,2519],"valid"],[[2520,2523],"disallowed"],[[2524,2524],"mapped",[2465,2492]],[[2525,2525],"mapped",[2466,2492]],[[2526,2526],"disallowed"],[[2527,2527],"mapped",[2479,2492]],[[2528,2531],"valid"],[[2532,2533],"disallowed"],[[2534,2545],"valid"],[[2546,2554],"valid",[],"NV8"],[[2555,2555],"valid",[],"NV8"],[[2556,2560],"disallowed"],[[2561,2561],"valid"],[[2562,2562],"valid"],[[2563,2563],"valid"],[[2564,2564],"disallowed"],[[2565,2570],"valid"],[[2571,2574],"disallowed"],[[2575,2576],"valid"],[[2577,2578],"disallowed"],[[2579,2600],"valid"],[[2601,2601],"disallowed"],[[2602,2608],"valid"],[[2609,2609],"disallowed"],[[2610,2610],"valid"],[[2611,2611],"mapped",[2610,2620]],[[2612,2612],"disallowed"],[[2613,2613],"valid"],[[2614,2614],"mapped",[2616,2620]],[[2615,2615],"disallowed"],[[2616,2617],"valid"],[[2618,2619],"disallowed"],[[2620,2620],"valid"],[[2621,2621],"disallowed"],[[2622,2626],"valid"],[[2627,2630],"disallowed"],[[2631,2632],"valid"],[[2633,2634],"disallowed"],[[2635,2637],"valid"],[[2638,2640],"disallowed"],[[2641,2641],"valid"],[[2642,2648],"disallowed"],[[2649,2649],"mapped",[2582,2620]],[[2650,2650],"mapped",[2583,2620]],[[2651,2651],"mapped",[2588,2620]],[[2652,2652],"valid"],[[2653,2653],"disallowed"],[[2654,2654],"mapped",[2603,2620]],[[2655,2661],"disallowed"],[[2662,2676],"valid"],[[2677,2677],"valid"],[[2678,2688],"disallowed"],[[2689,2691],"valid"],[[2692,2692],"disallowed"],[[2693,2699],"valid"],[[2700,2700],"valid"],[[2701,2701],"valid"],[[2702,2702],"disallowed"],[[2703,2705],"valid"],[[2706,2706],"disallowed"],[[2707,2728],"valid"],[[2729,2729],"disallowed"],[[2730,2736],"valid"],[[2737,2737],"disallowed"],[[2738,2739],"valid"],[[2740,2740],"disallowed"],[[2741,2745],"valid"],[[2746,2747],"disallowed"],[[2748,2757],"valid"],[[2758,2758],"disallowed"],[[2759,2761],"valid"],[[2762,2762],"disallowed"],[[2763,2765],"valid"],[[2766,2767],"disallowed"],[[2768,2768],"valid"],[[2769,2783],"disallowed"],[[2784,2784],"valid"],[[2785,2787],"valid"],[[2788,2789],"disallowed"],[[2790,2799],"valid"],[[2800,2800],"valid",[],"NV8"],[[2801,2801],"valid",[],"NV8"],[[2802,2808],"disallowed"],[[2809,2809],"valid"],[[2810,2816],"disallowed"],[[2817,2819],"valid"],[[2820,2820],"disallowed"],[[2821,2828],"valid"],[[2829,2830],"disallowed"],[[2831,2832],"valid"],[[2833,2834],"disallowed"],[[2835,2856],"valid"],[[2857,2857],"disallowed"],[[2858,2864],"valid"],[[2865,2865],"disallowed"],[[2866,2867],"valid"],[[2868,2868],"disallowed"],[[2869,2869],"valid"],[[2870,2873],"valid"],[[2874,2875],"disallowed"],[[2876,2883],"valid"],[[2884,2884],"valid"],[[2885,2886],"disallowed"],[[2887,2888],"valid"],[[2889,2890],"disallowed"],[[2891,2893],"valid"],[[2894,2901],"disallowed"],[[2902,2903],"valid"],[[2904,2907],"disallowed"],[[2908,2908],"mapped",[2849,2876]],[[2909,2909],"mapped",[2850,2876]],[[2910,2910],"disallowed"],[[2911,2913],"valid"],[[2914,2915],"valid"],[[2916,2917],"disallowed"],[[2918,2927],"valid"],[[2928,2928],"valid",[],"NV8"],[[2929,2929],"valid"],[[2930,2935],"valid",[],"NV8"],[[2936,2945],"disallowed"],[[2946,2947],"valid"],[[2948,2948],"disallowed"],[[2949,2954],"valid"],[[2955,2957],"disallowed"],[[2958,2960],"valid"],[[2961,2961],"disallowed"],[[2962,2965],"valid"],[[2966,2968],"disallowed"],[[2969,2970],"valid"],[[2971,2971],"disallowed"],[[2972,2972],"valid"],[[2973,2973],"disallowed"],[[2974,2975],"valid"],[[2976,2978],"disallowed"],[[2979,2980],"valid"],[[2981,2983],"disallowed"],[[2984,2986],"valid"],[[2987,2989],"disallowed"],[[2990,2997],"valid"],[[2998,2998],"valid"],[[2999,3001],"valid"],[[3002,3005],"disallowed"],[[3006,3010],"valid"],[[3011,3013],"disallowed"],[[3014,3016],"valid"],[[3017,3017],"disallowed"],[[3018,3021],"valid"],[[3022,3023],"disallowed"],[[3024,3024],"valid"],[[3025,3030],"disallowed"],[[3031,3031],"valid"],[[3032,3045],"disallowed"],[[3046,3046],"valid"],[[3047,3055],"valid"],[[3056,3058],"valid",[],"NV8"],[[3059,3066],"valid",[],"NV8"],[[3067,3071],"disallowed"],[[3072,3072],"valid"],[[3073,3075],"valid"],[[3076,3076],"disallowed"],[[3077,3084],"valid"],[[3085,3085],"disallowed"],[[3086,3088],"valid"],[[3089,3089],"disallowed"],[[3090,3112],"valid"],[[3113,3113],"disallowed"],[[3114,3123],"valid"],[[3124,3124],"valid"],[[3125,3129],"valid"],[[3130,3132],"disallowed"],[[3133,3133],"valid"],[[3134,3140],"valid"],[[3141,3141],"disallowed"],[[3142,3144],"valid"],[[3145,3145],"disallowed"],[[3146,3149],"valid"],[[3150,3156],"disallowed"],[[3157,3158],"valid"],[[3159,3159],"disallowed"],[[3160,3161],"valid"],[[3162,3162],"valid"],[[3163,3167],"disallowed"],[[3168,3169],"valid"],[[3170,3171],"valid"],[[3172,3173],"disallowed"],[[3174,3183],"valid"],[[3184,3191],"disallowed"],[[3192,3199],"valid",[],"NV8"],[[3200,3200],"disallowed"],[[3201,3201],"valid"],[[3202,3203],"valid"],[[3204,3204],"disallowed"],[[3205,3212],"valid"],[[3213,3213],"disallowed"],[[3214,3216],"valid"],[[3217,3217],"disallowed"],[[3218,3240],"valid"],[[3241,3241],"disallowed"],[[3242,3251],"valid"],[[3252,3252],"disallowed"],[[3253,3257],"valid"],[[3258,3259],"disallowed"],[[3260,3261],"valid"],[[3262,3268],"valid"],[[3269,3269],"disallowed"],[[3270,3272],"valid"],[[3273,3273],"disallowed"],[[3274,3277],"valid"],[[3278,3284],"disallowed"],[[3285,3286],"valid"],[[3287,3293],"disallowed"],[[3294,3294],"valid"],[[3295,3295],"disallowed"],[[3296,3297],"valid"],[[3298,3299],"valid"],[[3300,3301],"disallowed"],[[3302,3311],"valid"],[[3312,3312],"disallowed"],[[3313,3314],"valid"],[[3315,3328],"disallowed"],[[3329,3329],"valid"],[[3330,3331],"valid"],[[3332,3332],"disallowed"],[[3333,3340],"valid"],[[3341,3341],"disallowed"],[[3342,3344],"valid"],[[3345,3345],"disallowed"],[[3346,3368],"valid"],[[3369,3369],"valid"],[[3370,3385],"valid"],[[3386,3386],"valid"],[[3387,3388],"disallowed"],[[3389,3389],"valid"],[[3390,3395],"valid"],[[3396,3396],"valid"],[[3397,3397],"disallowed"],[[3398,3400],"valid"],[[3401,3401],"disallowed"],[[3402,3405],"valid"],[[3406,3406],"valid"],[[3407,3414],"disallowed"],[[3415,3415],"valid"],[[3416,3422],"disallowed"],[[3423,3423],"valid"],[[3424,3425],"valid"],[[3426,3427],"valid"],[[3428,3429],"disallowed"],[[3430,3439],"valid"],[[3440,3445],"valid",[],"NV8"],[[3446,3448],"disallowed"],[[3449,3449],"valid",[],"NV8"],[[3450,3455],"valid"],[[3456,3457],"disallowed"],[[3458,3459],"valid"],[[3460,3460],"disallowed"],[[3461,3478],"valid"],[[3479,3481],"disallowed"],[[3482,3505],"valid"],[[3506,3506],"disallowed"],[[3507,3515],"valid"],[[3516,3516],"disallowed"],[[3517,3517],"valid"],[[3518,3519],"disallowed"],[[3520,3526],"valid"],[[3527,3529],"disallowed"],[[3530,3530],"valid"],[[3531,3534],"disallowed"],[[3535,3540],"valid"],[[3541,3541],"disallowed"],[[3542,3542],"valid"],[[3543,3543],"disallowed"],[[3544,3551],"valid"],[[3552,3557],"disallowed"],[[3558,3567],"valid"],[[3568,3569],"disallowed"],[[3570,3571],"valid"],[[3572,3572],"valid",[],"NV8"],[[3573,3584],"disallowed"],[[3585,3634],"valid"],[[3635,3635],"mapped",[3661,3634]],[[3636,3642],"valid"],[[3643,3646],"disallowed"],[[3647,3647],"valid",[],"NV8"],[[3648,3662],"valid"],[[3663,3663],"valid",[],"NV8"],[[3664,3673],"valid"],[[3674,3675],"valid",[],"NV8"],[[3676,3712],"disallowed"],[[3713,3714],"valid"],[[3715,3715],"disallowed"],[[3716,3716],"valid"],[[3717,3718],"disallowed"],[[3719,3720],"valid"],[[3721,3721],"disallowed"],[[3722,3722],"valid"],[[3723,3724],"disallowed"],[[3725,3725],"valid"],[[3726,3731],"disallowed"],[[3732,3735],"valid"],[[3736,3736],"disallowed"],[[3737,3743],"valid"],[[3744,3744],"disallowed"],[[3745,3747],"valid"],[[3748,3748],"disallowed"],[[3749,3749],"valid"],[[3750,3750],"disallowed"],[[3751,3751],"valid"],[[3752,3753],"disallowed"],[[3754,3755],"valid"],[[3756,3756],"disallowed"],[[3757,3762],"valid"],[[3763,3763],"mapped",[3789,3762]],[[3764,3769],"valid"],[[3770,3770],"disallowed"],[[3771,3773],"valid"],[[3774,3775],"disallowed"],[[3776,3780],"valid"],[[3781,3781],"disallowed"],[[3782,3782],"valid"],[[3783,3783],"disallowed"],[[3784,3789],"valid"],[[3790,3791],"disallowed"],[[3792,3801],"valid"],[[3802,3803],"disallowed"],[[3804,3804],"mapped",[3755,3737]],[[3805,3805],"mapped",[3755,3745]],[[3806,3807],"valid"],[[3808,3839],"disallowed"],[[3840,3840],"valid"],[[3841,3850],"valid",[],"NV8"],[[3851,3851],"valid"],[[3852,3852],"mapped",[3851]],[[3853,3863],"valid",[],"NV8"],[[3864,3865],"valid"],[[3866,3871],"valid",[],"NV8"],[[3872,3881],"valid"],[[3882,3892],"valid",[],"NV8"],[[3893,3893],"valid"],[[3894,3894],"valid",[],"NV8"],[[3895,3895],"valid"],[[3896,3896],"valid",[],"NV8"],[[3897,3897],"valid"],[[3898,3901],"valid",[],"NV8"],[[3902,3906],"valid"],[[3907,3907],"mapped",[3906,4023]],[[3908,3911],"valid"],[[3912,3912],"disallowed"],[[3913,3916],"valid"],[[3917,3917],"mapped",[3916,4023]],[[3918,3921],"valid"],[[3922,3922],"mapped",[3921,4023]],[[3923,3926],"valid"],[[3927,3927],"mapped",[3926,4023]],[[3928,3931],"valid"],[[3932,3932],"mapped",[3931,4023]],[[3933,3944],"valid"],[[3945,3945],"mapped",[3904,4021]],[[3946,3946],"valid"],[[3947,3948],"valid"],[[3949,3952],"disallowed"],[[3953,3954],"valid"],[[3955,3955],"mapped",[3953,3954]],[[3956,3956],"valid"],[[3957,3957],"mapped",[3953,3956]],[[3958,3958],"mapped",[4018,3968]],[[3959,3959],"mapped",[4018,3953,3968]],[[3960,3960],"mapped",[4019,3968]],[[3961,3961],"mapped",[4019,3953,3968]],[[3962,3968],"valid"],[[3969,3969],"mapped",[3953,3968]],[[3970,3972],"valid"],[[3973,3973],"valid",[],"NV8"],[[3974,3979],"valid"],[[3980,3983],"valid"],[[3984,3986],"valid"],[[3987,3987],"mapped",[3986,4023]],[[3988,3989],"valid"],[[3990,3990],"valid"],[[3991,3991],"valid"],[[3992,3992],"disallowed"],[[3993,3996],"valid"],[[3997,3997],"mapped",[3996,4023]],[[3998,4001],"valid"],[[4002,4002],"mapped",[4001,4023]],[[4003,4006],"valid"],[[4007,4007],"mapped",[4006,4023]],[[4008,4011],"valid"],[[4012,4012],"mapped",[4011,4023]],[[4013,4013],"valid"],[[4014,4016],"valid"],[[4017,4023],"valid"],[[4024,4024],"valid"],[[4025,4025],"mapped",[3984,4021]],[[4026,4028],"valid"],[[4029,4029],"disallowed"],[[4030,4037],"valid",[],"NV8"],[[4038,4038],"valid"],[[4039,4044],"valid",[],"NV8"],[[4045,4045],"disallowed"],[[4046,4046],"valid",[],"NV8"],[[4047,4047],"valid",[],"NV8"],[[4048,4049],"valid",[],"NV8"],[[4050,4052],"valid",[],"NV8"],[[4053,4056],"valid",[],"NV8"],[[4057,4058],"valid",[],"NV8"],[[4059,4095],"disallowed"],[[4096,4129],"valid"],[[4130,4130],"valid"],[[4131,4135],"valid"],[[4136,4136],"valid"],[[4137,4138],"valid"],[[4139,4139],"valid"],[[4140,4146],"valid"],[[4147,4149],"valid"],[[4150,4153],"valid"],[[4154,4159],"valid"],[[4160,4169],"valid"],[[4170,4175],"valid",[],"NV8"],[[4176,4185],"valid"],[[4186,4249],"valid"],[[4250,4253],"valid"],[[4254,4255],"valid",[],"NV8"],[[4256,4293],"disallowed"],[[4294,4294],"disallowed"],[[4295,4295],"mapped",[11559]],[[4296,4300],"disallowed"],[[4301,4301],"mapped",[11565]],[[4302,4303],"disallowed"],[[4304,4342],"valid"],[[4343,4344],"valid"],[[4345,4346],"valid"],[[4347,4347],"valid",[],"NV8"],[[4348,4348],"mapped",[4316]],[[4349,4351],"valid"],[[4352,4441],"valid",[],"NV8"],[[4442,4446],"valid",[],"NV8"],[[4447,4448],"disallowed"],[[4449,4514],"valid",[],"NV8"],[[4515,4519],"valid",[],"NV8"],[[4520,4601],"valid",[],"NV8"],[[4602,4607],"valid",[],"NV8"],[[4608,4614],"valid"],[[4615,4615],"valid"],[[4616,4678],"valid"],[[4679,4679],"valid"],[[4680,4680],"valid"],[[4681,4681],"disallowed"],[[4682,4685],"valid"],[[4686,4687],"disallowed"],[[4688,4694],"valid"],[[4695,4695],"disallowed"],[[4696,4696],"valid"],[[4697,4697],"disallowed"],[[4698,4701],"valid"],[[4702,4703],"disallowed"],[[4704,4742],"valid"],[[4743,4743],"valid"],[[4744,4744],"valid"],[[4745,4745],"disallowed"],[[4746,4749],"valid"],[[4750,4751],"disallowed"],[[4752,4782],"valid"],[[4783,4783],"valid"],[[4784,4784],"valid"],[[4785,4785],"disallowed"],[[4786,4789],"valid"],[[4790,4791],"disallowed"],[[4792,4798],"valid"],[[4799,4799],"disallowed"],[[4800,4800],"valid"],[[4801,4801],"disallowed"],[[4802,4805],"valid"],[[4806,4807],"disallowed"],[[4808,4814],"valid"],[[4815,4815],"valid"],[[4816,4822],"valid"],[[4823,4823],"disallowed"],[[4824,4846],"valid"],[[4847,4847],"valid"],[[4848,4878],"valid"],[[4879,4879],"valid"],[[4880,4880],"valid"],[[4881,4881],"disallowed"],[[4882,4885],"valid"],[[4886,4887],"disallowed"],[[4888,4894],"valid"],[[4895,4895],"valid"],[[4896,4934],"valid"],[[4935,4935],"valid"],[[4936,4954],"valid"],[[4955,4956],"disallowed"],[[4957,4958],"valid"],[[4959,4959],"valid"],[[4960,4960],"valid",[],"NV8"],[[4961,4988],"valid",[],"NV8"],[[4989,4991],"disallowed"],[[4992,5007],"valid"],[[5008,5017],"valid",[],"NV8"],[[5018,5023],"disallowed"],[[5024,5108],"valid"],[[5109,5109],"valid"],[[5110,5111],"disallowed"],[[5112,5112],"mapped",[5104]],[[5113,5113],"mapped",[5105]],[[5114,5114],"mapped",[5106]],[[5115,5115],"mapped",[5107]],[[5116,5116],"mapped",[5108]],[[5117,5117],"mapped",[5109]],[[5118,5119],"disallowed"],[[5120,5120],"valid",[],"NV8"],[[5121,5740],"valid"],[[5741,5742],"valid",[],"NV8"],[[5743,5750],"valid"],[[5751,5759],"valid"],[[5760,5760],"disallowed"],[[5761,5786],"valid"],[[5787,5788],"valid",[],"NV8"],[[5789,5791],"disallowed"],[[5792,5866],"valid"],[[5867,5872],"valid",[],"NV8"],[[5873,5880],"valid"],[[5881,5887],"disallowed"],[[5888,5900],"valid"],[[5901,5901],"disallowed"],[[5902,5908],"valid"],[[5909,5919],"disallowed"],[[5920,5940],"valid"],[[5941,5942],"valid",[],"NV8"],[[5943,5951],"disallowed"],[[5952,5971],"valid"],[[5972,5983],"disallowed"],[[5984,5996],"valid"],[[5997,5997],"disallowed"],[[5998,6000],"valid"],[[6001,6001],"disallowed"],[[6002,6003],"valid"],[[6004,6015],"disallowed"],[[6016,6067],"valid"],[[6068,6069],"disallowed"],[[6070,6099],"valid"],[[6100,6102],"valid",[],"NV8"],[[6103,6103],"valid"],[[6104,6107],"valid",[],"NV8"],[[6108,6108],"valid"],[[6109,6109],"valid"],[[6110,6111],"disallowed"],[[6112,6121],"valid"],[[6122,6127],"disallowed"],[[6128,6137],"valid",[],"NV8"],[[6138,6143],"disallowed"],[[6144,6149],"valid",[],"NV8"],[[6150,6150],"disallowed"],[[6151,6154],"valid",[],"NV8"],[[6155,6157],"ignored"],[[6158,6158],"disallowed"],[[6159,6159],"disallowed"],[[6160,6169],"valid"],[[6170,6175],"disallowed"],[[6176,6263],"valid"],[[6264,6271],"disallowed"],[[6272,6313],"valid"],[[6314,6314],"valid"],[[6315,6319],"disallowed"],[[6320,6389],"valid"],[[6390,6399],"disallowed"],[[6400,6428],"valid"],[[6429,6430],"valid"],[[6431,6431],"disallowed"],[[6432,6443],"valid"],[[6444,6447],"disallowed"],[[6448,6459],"valid"],[[6460,6463],"disallowed"],[[6464,6464],"valid",[],"NV8"],[[6465,6467],"disallowed"],[[6468,6469],"valid",[],"NV8"],[[6470,6509],"valid"],[[6510,6511],"disallowed"],[[6512,6516],"valid"],[[6517,6527],"disallowed"],[[6528,6569],"valid"],[[6570,6571],"valid"],[[6572,6575],"disallowed"],[[6576,6601],"valid"],[[6602,6607],"disallowed"],[[6608,6617],"valid"],[[6618,6618],"valid",[],"XV8"],[[6619,6621],"disallowed"],[[6622,6623],"valid",[],"NV8"],[[6624,6655],"valid",[],"NV8"],[[6656,6683],"valid"],[[6684,6685],"disallowed"],[[6686,6687],"valid",[],"NV8"],[[6688,6750],"valid"],[[6751,6751],"disallowed"],[[6752,6780],"valid"],[[6781,6782],"disallowed"],[[6783,6793],"valid"],[[6794,6799],"disallowed"],[[6800,6809],"valid"],[[6810,6815],"disallowed"],[[6816,6822],"valid",[],"NV8"],[[6823,6823],"valid"],[[6824,6829],"valid",[],"NV8"],[[6830,6831],"disallowed"],[[6832,6845],"valid"],[[6846,6846],"valid",[],"NV8"],[[6847,6911],"disallowed"],[[6912,6987],"valid"],[[6988,6991],"disallowed"],[[6992,7001],"valid"],[[7002,7018],"valid",[],"NV8"],[[7019,7027],"valid"],[[7028,7036],"valid",[],"NV8"],[[7037,7039],"disallowed"],[[7040,7082],"valid"],[[7083,7085],"valid"],[[7086,7097],"valid"],[[7098,7103],"valid"],[[7104,7155],"valid"],[[7156,7163],"disallowed"],[[7164,7167],"valid",[],"NV8"],[[7168,7223],"valid"],[[7224,7226],"disallowed"],[[7227,7231],"valid",[],"NV8"],[[7232,7241],"valid"],[[7242,7244],"disallowed"],[[7245,7293],"valid"],[[7294,7295],"valid",[],"NV8"],[[7296,7359],"disallowed"],[[7360,7367],"valid",[],"NV8"],[[7368,7375],"disallowed"],[[7376,7378],"valid"],[[7379,7379],"valid",[],"NV8"],[[7380,7410],"valid"],[[7411,7414],"valid"],[[7415,7415],"disallowed"],[[7416,7417],"valid"],[[7418,7423],"disallowed"],[[7424,7467],"valid"],[[7468,7468],"mapped",[97]],[[7469,7469],"mapped",[230]],[[7470,7470],"mapped",[98]],[[7471,7471],"valid"],[[7472,7472],"mapped",[100]],[[7473,7473],"mapped",[101]],[[7474,7474],"mapped",[477]],[[7475,7475],"mapped",[103]],[[7476,7476],"mapped",[104]],[[7477,7477],"mapped",[105]],[[7478,7478],"mapped",[106]],[[7479,7479],"mapped",[107]],[[7480,7480],"mapped",[108]],[[7481,7481],"mapped",[109]],[[7482,7482],"mapped",[110]],[[7483,7483],"valid"],[[7484,7484],"mapped",[111]],[[7485,7485],"mapped",[547]],[[7486,7486],"mapped",[112]],[[7487,7487],"mapped",[114]],[[7488,7488],"mapped",[116]],[[7489,7489],"mapped",[117]],[[7490,7490],"mapped",[119]],[[7491,7491],"mapped",[97]],[[7492,7492],"mapped",[592]],[[7493,7493],"mapped",[593]],[[7494,7494],"mapped",[7426]],[[7495,7495],"mapped",[98]],[[7496,7496],"mapped",[100]],[[7497,7497],"mapped",[101]],[[7498,7498],"mapped",[601]],[[7499,7499],"mapped",[603]],[[7500,7500],"mapped",[604]],[[7501,7501],"mapped",[103]],[[7502,7502],"valid"],[[7503,7503],"mapped",[107]],[[7504,7504],"mapped",[109]],[[7505,7505],"mapped",[331]],[[7506,7506],"mapped",[111]],[[7507,7507],"mapped",[596]],[[7508,7508],"mapped",[7446]],[[7509,7509],"mapped",[7447]],[[7510,7510],"mapped",[112]],[[7511,7511],"mapped",[116]],[[7512,7512],"mapped",[117]],[[7513,7513],"mapped",[7453]],[[7514,7514],"mapped",[623]],[[7515,7515],"mapped",[118]],[[7516,7516],"mapped",[7461]],[[7517,7517],"mapped",[946]],[[7518,7518],"mapped",[947]],[[7519,7519],"mapped",[948]],[[7520,7520],"mapped",[966]],[[7521,7521],"mapped",[967]],[[7522,7522],"mapped",[105]],[[7523,7523],"mapped",[114]],[[7524,7524],"mapped",[117]],[[7525,7525],"mapped",[118]],[[7526,7526],"mapped",[946]],[[7527,7527],"mapped",[947]],[[7528,7528],"mapped",[961]],[[7529,7529],"mapped",[966]],[[7530,7530],"mapped",[967]],[[7531,7531],"valid"],[[7532,7543],"valid"],[[7544,7544],"mapped",[1085]],[[7545,7578],"valid"],[[7579,7579],"mapped",[594]],[[7580,7580],"mapped",[99]],[[7581,7581],"mapped",[597]],[[7582,7582],"mapped",[240]],[[7583,7583],"mapped",[604]],[[7584,7584],"mapped",[102]],[[7585,7585],"mapped",[607]],[[7586,7586],"mapped",[609]],[[7587,7587],"mapped",[613]],[[7588,7588],"mapped",[616]],[[7589,7589],"mapped",[617]],[[7590,7590],"mapped",[618]],[[7591,7591],"mapped",[7547]],[[7592,7592],"mapped",[669]],[[7593,7593],"mapped",[621]],[[7594,7594],"mapped",[7557]],[[7595,7595],"mapped",[671]],[[7596,7596],"mapped",[625]],[[7597,7597],"mapped",[624]],[[7598,7598],"mapped",[626]],[[7599,7599],"mapped",[627]],[[7600,7600],"mapped",[628]],[[7601,7601],"mapped",[629]],[[7602,7602],"mapped",[632]],[[7603,7603],"mapped",[642]],[[7604,7604],"mapped",[643]],[[7605,7605],"mapped",[427]],[[7606,7606],"mapped",[649]],[[7607,7607],"mapped",[650]],[[7608,7608],"mapped",[7452]],[[7609,7609],"mapped",[651]],[[7610,7610],"mapped",[652]],[[7611,7611],"mapped",[122]],[[7612,7612],"mapped",[656]],[[7613,7613],"mapped",[657]],[[7614,7614],"mapped",[658]],[[7615,7615],"mapped",[952]],[[7616,7619],"valid"],[[7620,7626],"valid"],[[7627,7654],"valid"],[[7655,7669],"valid"],[[7670,7675],"disallowed"],[[7676,7676],"valid"],[[7677,7677],"valid"],[[7678,7679],"valid"],[[7680,7680],"mapped",[7681]],[[7681,7681],"valid"],[[7682,7682],"mapped",[7683]],[[7683,7683],"valid"],[[7684,7684],"mapped",[7685]],[[7685,7685],"valid"],[[7686,7686],"mapped",[7687]],[[7687,7687],"valid"],[[7688,7688],"mapped",[7689]],[[7689,7689],"valid"],[[7690,7690],"mapped",[7691]],[[7691,7691],"valid"],[[7692,7692],"mapped",[7693]],[[7693,7693],"valid"],[[7694,7694],"mapped",[7695]],[[7695,7695],"valid"],[[7696,7696],"mapped",[7697]],[[7697,7697],"valid"],[[7698,7698],"mapped",[7699]],[[7699,7699],"valid"],[[7700,7700],"mapped",[7701]],[[7701,7701],"valid"],[[7702,7702],"mapped",[7703]],[[7703,7703],"valid"],[[7704,7704],"mapped",[7705]],[[7705,7705],"valid"],[[7706,7706],"mapped",[7707]],[[7707,7707],"valid"],[[7708,7708],"mapped",[7709]],[[7709,7709],"valid"],[[7710,7710],"mapped",[7711]],[[7711,7711],"valid"],[[7712,7712],"mapped",[7713]],[[7713,7713],"valid"],[[7714,7714],"mapped",[7715]],[[7715,7715],"valid"],[[7716,7716],"mapped",[7717]],[[7717,7717],"valid"],[[7718,7718],"mapped",[7719]],[[7719,7719],"valid"],[[7720,7720],"mapped",[7721]],[[7721,7721],"valid"],[[7722,7722],"mapped",[7723]],[[7723,7723],"valid"],[[7724,7724],"mapped",[7725]],[[7725,7725],"valid"],[[7726,7726],"mapped",[7727]],[[7727,7727],"valid"],[[7728,7728],"mapped",[7729]],[[7729,7729],"valid"],[[7730,7730],"mapped",[7731]],[[7731,7731],"valid"],[[7732,7732],"mapped",[7733]],[[7733,7733],"valid"],[[7734,7734],"mapped",[7735]],[[7735,7735],"valid"],[[7736,7736],"mapped",[7737]],[[7737,7737],"valid"],[[7738,7738],"mapped",[7739]],[[7739,7739],"valid"],[[7740,7740],"mapped",[7741]],[[7741,7741],"valid"],[[7742,7742],"mapped",[7743]],[[7743,7743],"valid"],[[7744,7744],"mapped",[7745]],[[7745,7745],"valid"],[[7746,7746],"mapped",[7747]],[[7747,7747],"valid"],[[7748,7748],"mapped",[7749]],[[7749,7749],"valid"],[[7750,7750],"mapped",[7751]],[[7751,7751],"valid"],[[7752,7752],"mapped",[7753]],[[7753,7753],"valid"],[[7754,7754],"mapped",[7755]],[[7755,7755],"valid"],[[7756,7756],"mapped",[7757]],[[7757,7757],"valid"],[[7758,7758],"mapped",[7759]],[[7759,7759],"valid"],[[7760,7760],"mapped",[7761]],[[7761,7761],"valid"],[[7762,7762],"mapped",[7763]],[[7763,7763],"valid"],[[7764,7764],"mapped",[7765]],[[7765,7765],"valid"],[[7766,7766],"mapped",[7767]],[[7767,7767],"valid"],[[7768,7768],"mapped",[7769]],[[7769,7769],"valid"],[[7770,7770],"mapped",[7771]],[[7771,7771],"valid"],[[7772,7772],"mapped",[7773]],[[7773,7773],"valid"],[[7774,7774],"mapped",[7775]],[[7775,7775],"valid"],[[7776,7776],"mapped",[7777]],[[7777,7777],"valid"],[[7778,7778],"mapped",[7779]],[[7779,7779],"valid"],[[7780,7780],"mapped",[7781]],[[7781,7781],"valid"],[[7782,7782],"mapped",[7783]],[[7783,7783],"valid"],[[7784,7784],"mapped",[7785]],[[7785,7785],"valid"],[[7786,7786],"mapped",[7787]],[[7787,7787],"valid"],[[7788,7788],"mapped",[7789]],[[7789,7789],"valid"],[[7790,7790],"mapped",[7791]],[[7791,7791],"valid"],[[7792,7792],"mapped",[7793]],[[7793,7793],"valid"],[[7794,7794],"mapped",[7795]],[[7795,7795],"valid"],[[7796,7796],"mapped",[7797]],[[7797,7797],"valid"],[[7798,7798],"mapped",[7799]],[[7799,7799],"valid"],[[7800,7800],"mapped",[7801]],[[7801,7801],"valid"],[[7802,7802],"mapped",[7803]],[[7803,7803],"valid"],[[7804,7804],"mapped",[7805]],[[7805,7805],"valid"],[[7806,7806],"mapped",[7807]],[[7807,7807],"valid"],[[7808,7808],"mapped",[7809]],[[7809,7809],"valid"],[[7810,7810],"mapped",[7811]],[[7811,7811],"valid"],[[7812,7812],"mapped",[7813]],[[7813,7813],"valid"],[[7814,7814],"mapped",[7815]],[[7815,7815],"valid"],[[7816,7816],"mapped",[7817]],[[7817,7817],"valid"],[[7818,7818],"mapped",[7819]],[[7819,7819],"valid"],[[7820,7820],"mapped",[7821]],[[7821,7821],"valid"],[[7822,7822],"mapped",[7823]],[[7823,7823],"valid"],[[7824,7824],"mapped",[7825]],[[7825,7825],"valid"],[[7826,7826],"mapped",[7827]],[[7827,7827],"valid"],[[7828,7828],"mapped",[7829]],[[7829,7833],"valid"],[[7834,7834],"mapped",[97,702]],[[7835,7835],"mapped",[7777]],[[7836,7837],"valid"],[[7838,7838],"mapped",[115,115]],[[7839,7839],"valid"],[[7840,7840],"mapped",[7841]],[[7841,7841],"valid"],[[7842,7842],"mapped",[7843]],[[7843,7843],"valid"],[[7844,7844],"mapped",[7845]],[[7845,7845],"valid"],[[7846,7846],"mapped",[7847]],[[7847,7847],"valid"],[[7848,7848],"mapped",[7849]],[[7849,7849],"valid"],[[7850,7850],"mapped",[7851]],[[7851,7851],"valid"],[[7852,7852],"mapped",[7853]],[[7853,7853],"valid"],[[7854,7854],"mapped",[7855]],[[7855,7855],"valid"],[[7856,7856],"mapped",[7857]],[[7857,7857],"valid"],[[7858,7858],"mapped",[7859]],[[7859,7859],"valid"],[[7860,7860],"mapped",[7861]],[[7861,7861],"valid"],[[7862,7862],"mapped",[7863]],[[7863,7863],"valid"],[[7864,7864],"mapped",[7865]],[[7865,7865],"valid"],[[7866,7866],"mapped",[7867]],[[7867,7867],"valid"],[[7868,7868],"mapped",[7869]],[[7869,7869],"valid"],[[7870,7870],"mapped",[7871]],[[7871,7871],"valid"],[[7872,7872],"mapped",[7873]],[[7873,7873],"valid"],[[7874,7874],"mapped",[7875]],[[7875,7875],"valid"],[[7876,7876],"mapped",[7877]],[[7877,7877],"valid"],[[7878,7878],"mapped",[7879]],[[7879,7879],"valid"],[[7880,7880],"mapped",[7881]],[[7881,7881],"valid"],[[7882,7882],"mapped",[7883]],[[7883,7883],"valid"],[[7884,7884],"mapped",[7885]],[[7885,7885],"valid"],[[7886,7886],"mapped",[7887]],[[7887,7887],"valid"],[[7888,7888],"mapped",[7889]],[[7889,7889],"valid"],[[7890,7890],"mapped",[7891]],[[7891,7891],"valid"],[[7892,7892],"mapped",[7893]],[[7893,7893],"valid"],[[7894,7894],"mapped",[7895]],[[7895,7895],"valid"],[[7896,7896],"mapped",[7897]],[[7897,7897],"valid"],[[7898,7898],"mapped",[7899]],[[7899,7899],"valid"],[[7900,7900],"mapped",[7901]],[[7901,7901],"valid"],[[7902,7902],"mapped",[7903]],[[7903,7903],"valid"],[[7904,7904],"mapped",[7905]],[[7905,7905],"valid"],[[7906,7906],"mapped",[7907]],[[7907,7907],"valid"],[[7908,7908],"mapped",[7909]],[[7909,7909],"valid"],[[7910,7910],"mapped",[7911]],[[7911,7911],"valid"],[[7912,7912],"mapped",[7913]],[[7913,7913],"valid"],[[7914,7914],"mapped",[7915]],[[7915,7915],"valid"],[[7916,7916],"mapped",[7917]],[[7917,7917],"valid"],[[7918,7918],"mapped",[7919]],[[7919,7919],"valid"],[[7920,7920],"mapped",[7921]],[[7921,7921],"valid"],[[7922,7922],"mapped",[7923]],[[7923,7923],"valid"],[[7924,7924],"mapped",[7925]],[[7925,7925],"valid"],[[7926,7926],"mapped",[7927]],[[7927,7927],"valid"],[[7928,7928],"mapped",[7929]],[[7929,7929],"valid"],[[7930,7930],"mapped",[7931]],[[7931,7931],"valid"],[[7932,7932],"mapped",[7933]],[[7933,7933],"valid"],[[7934,7934],"mapped",[7935]],[[7935,7935],"valid"],[[7936,7943],"valid"],[[7944,7944],"mapped",[7936]],[[7945,7945],"mapped",[7937]],[[7946,7946],"mapped",[7938]],[[7947,7947],"mapped",[7939]],[[7948,7948],"mapped",[7940]],[[7949,7949],"mapped",[7941]],[[7950,7950],"mapped",[7942]],[[7951,7951],"mapped",[7943]],[[7952,7957],"valid"],[[7958,7959],"disallowed"],[[7960,7960],"mapped",[7952]],[[7961,7961],"mapped",[7953]],[[7962,7962],"mapped",[7954]],[[7963,7963],"mapped",[7955]],[[7964,7964],"mapped",[7956]],[[7965,7965],"mapped",[7957]],[[7966,7967],"disallowed"],[[7968,7975],"valid"],[[7976,7976],"mapped",[7968]],[[7977,7977],"mapped",[7969]],[[7978,7978],"mapped",[7970]],[[7979,7979],"mapped",[7971]],[[7980,7980],"mapped",[7972]],[[7981,7981],"mapped",[7973]],[[7982,7982],"mapped",[7974]],[[7983,7983],"mapped",[7975]],[[7984,7991],"valid"],[[7992,7992],"mapped",[7984]],[[7993,7993],"mapped",[7985]],[[7994,7994],"mapped",[7986]],[[7995,7995],"mapped",[7987]],[[7996,7996],"mapped",[7988]],[[7997,7997],"mapped",[7989]],[[7998,7998],"mapped",[7990]],[[7999,7999],"mapped",[7991]],[[8000,8005],"valid"],[[8006,8007],"disallowed"],[[8008,8008],"mapped",[8000]],[[8009,8009],"mapped",[8001]],[[8010,8010],"mapped",[8002]],[[8011,8011],"mapped",[8003]],[[8012,8012],"mapped",[8004]],[[8013,8013],"mapped",[8005]],[[8014,8015],"disallowed"],[[8016,8023],"valid"],[[8024,8024],"disallowed"],[[8025,8025],"mapped",[8017]],[[8026,8026],"disallowed"],[[8027,8027],"mapped",[8019]],[[8028,8028],"disallowed"],[[8029,8029],"mapped",[8021]],[[8030,8030],"disallowed"],[[8031,8031],"mapped",[8023]],[[8032,8039],"valid"],[[8040,8040],"mapped",[8032]],[[8041,8041],"mapped",[8033]],[[8042,8042],"mapped",[8034]],[[8043,8043],"mapped",[8035]],[[8044,8044],"mapped",[8036]],[[8045,8045],"mapped",[8037]],[[8046,8046],"mapped",[8038]],[[8047,8047],"mapped",[8039]],[[8048,8048],"valid"],[[8049,8049],"mapped",[940]],[[8050,8050],"valid"],[[8051,8051],"mapped",[941]],[[8052,8052],"valid"],[[8053,8053],"mapped",[942]],[[8054,8054],"valid"],[[8055,8055],"mapped",[943]],[[8056,8056],"valid"],[[8057,8057],"mapped",[972]],[[8058,8058],"valid"],[[8059,8059],"mapped",[973]],[[8060,8060],"valid"],[[8061,8061],"mapped",[974]],[[8062,8063],"disallowed"],[[8064,8064],"mapped",[7936,953]],[[8065,8065],"mapped",[7937,953]],[[8066,8066],"mapped",[7938,953]],[[8067,8067],"mapped",[7939,953]],[[8068,8068],"mapped",[7940,953]],[[8069,8069],"mapped",[7941,953]],[[8070,8070],"mapped",[7942,953]],[[8071,8071],"mapped",[7943,953]],[[8072,8072],"mapped",[7936,953]],[[8073,8073],"mapped",[7937,953]],[[8074,8074],"mapped",[7938,953]],[[8075,8075],"mapped",[7939,953]],[[8076,8076],"mapped",[7940,953]],[[8077,8077],"mapped",[7941,953]],[[8078,8078],"mapped",[7942,953]],[[8079,8079],"mapped",[7943,953]],[[8080,8080],"mapped",[7968,953]],[[8081,8081],"mapped",[7969,953]],[[8082,8082],"mapped",[7970,953]],[[8083,8083],"mapped",[7971,953]],[[8084,8084],"mapped",[7972,953]],[[8085,8085],"mapped",[7973,953]],[[8086,8086],"mapped",[7974,953]],[[8087,8087],"mapped",[7975,953]],[[8088,8088],"mapped",[7968,953]],[[8089,8089],"mapped",[7969,953]],[[8090,8090],"mapped",[7970,953]],[[8091,8091],"mapped",[7971,953]],[[8092,8092],"mapped",[7972,953]],[[8093,8093],"mapped",[7973,953]],[[8094,8094],"mapped",[7974,953]],[[8095,8095],"mapped",[7975,953]],[[8096,8096],"mapped",[8032,953]],[[8097,8097],"mapped",[8033,953]],[[8098,8098],"mapped",[8034,953]],[[8099,8099],"mapped",[8035,953]],[[8100,8100],"mapped",[8036,953]],[[8101,8101],"mapped",[8037,953]],[[8102,8102],"mapped",[8038,953]],[[8103,8103],"mapped",[8039,953]],[[8104,8104],"mapped",[8032,953]],[[8105,8105],"mapped",[8033,953]],[[8106,8106],"mapped",[8034,953]],[[8107,8107],"mapped",[8035,953]],[[8108,8108],"mapped",[8036,953]],[[8109,8109],"mapped",[8037,953]],[[8110,8110],"mapped",[8038,953]],[[8111,8111],"mapped",[8039,953]],[[8112,8113],"valid"],[[8114,8114],"mapped",[8048,953]],[[8115,8115],"mapped",[945,953]],[[8116,8116],"mapped",[940,953]],[[8117,8117],"disallowed"],[[8118,8118],"valid"],[[8119,8119],"mapped",[8118,953]],[[8120,8120],"mapped",[8112]],[[8121,8121],"mapped",[8113]],[[8122,8122],"mapped",[8048]],[[8123,8123],"mapped",[940]],[[8124,8124],"mapped",[945,953]],[[8125,8125],"disallowed_STD3_mapped",[32,787]],[[8126,8126],"mapped",[953]],[[8127,8127],"disallowed_STD3_mapped",[32,787]],[[8128,8128],"disallowed_STD3_mapped",[32,834]],[[8129,8129],"disallowed_STD3_mapped",[32,776,834]],[[8130,8130],"mapped",[8052,953]],[[8131,8131],"mapped",[951,953]],[[8132,8132],"mapped",[942,953]],[[8133,8133],"disallowed"],[[8134,8134],"valid"],[[8135,8135],"mapped",[8134,953]],[[8136,8136],"mapped",[8050]],[[8137,8137],"mapped",[941]],[[8138,8138],"mapped",[8052]],[[8139,8139],"mapped",[942]],[[8140,8140],"mapped",[951,953]],[[8141,8141],"disallowed_STD3_mapped",[32,787,768]],[[8142,8142],"disallowed_STD3_mapped",[32,787,769]],[[8143,8143],"disallowed_STD3_mapped",[32,787,834]],[[8144,8146],"valid"],[[8147,8147],"mapped",[912]],[[8148,8149],"disallowed"],[[8150,8151],"valid"],[[8152,8152],"mapped",[8144]],[[8153,8153],"mapped",[8145]],[[8154,8154],"mapped",[8054]],[[8155,8155],"mapped",[943]],[[8156,8156],"disallowed"],[[8157,8157],"disallowed_STD3_mapped",[32,788,768]],[[8158,8158],"disallowed_STD3_mapped",[32,788,769]],[[8159,8159],"disallowed_STD3_mapped",[32,788,834]],[[8160,8162],"valid"],[[8163,8163],"mapped",[944]],[[8164,8167],"valid"],[[8168,8168],"mapped",[8160]],[[8169,8169],"mapped",[8161]],[[8170,8170],"mapped",[8058]],[[8171,8171],"mapped",[973]],[[8172,8172],"mapped",[8165]],[[8173,8173],"disallowed_STD3_mapped",[32,776,768]],[[8174,8174],"disallowed_STD3_mapped",[32,776,769]],[[8175,8175],"disallowed_STD3_mapped",[96]],[[8176,8177],"disallowed"],[[8178,8178],"mapped",[8060,953]],[[8179,8179],"mapped",[969,953]],[[8180,8180],"mapped",[974,953]],[[8181,8181],"disallowed"],[[8182,8182],"valid"],[[8183,8183],"mapped",[8182,953]],[[8184,8184],"mapped",[8056]],[[8185,8185],"mapped",[972]],[[8186,8186],"mapped",[8060]],[[8187,8187],"mapped",[974]],[[8188,8188],"mapped",[969,953]],[[8189,8189],"disallowed_STD3_mapped",[32,769]],[[8190,8190],"disallowed_STD3_mapped",[32,788]],[[8191,8191],"disallowed"],[[8192,8202],"disallowed_STD3_mapped",[32]],[[8203,8203],"ignored"],[[8204,8205],"deviation",[]],[[8206,8207],"disallowed"],[[8208,8208],"valid",[],"NV8"],[[8209,8209],"mapped",[8208]],[[8210,8214],"valid",[],"NV8"],[[8215,8215],"disallowed_STD3_mapped",[32,819]],[[8216,8227],"valid",[],"NV8"],[[8228,8230],"disallowed"],[[8231,8231],"valid",[],"NV8"],[[8232,8238],"disallowed"],[[8239,8239],"disallowed_STD3_mapped",[32]],[[8240,8242],"valid",[],"NV8"],[[8243,8243],"mapped",[8242,8242]],[[8244,8244],"mapped",[8242,8242,8242]],[[8245,8245],"valid",[],"NV8"],[[8246,8246],"mapped",[8245,8245]],[[8247,8247],"mapped",[8245,8245,8245]],[[8248,8251],"valid",[],"NV8"],[[8252,8252],"disallowed_STD3_mapped",[33,33]],[[8253,8253],"valid",[],"NV8"],[[8254,8254],"disallowed_STD3_mapped",[32,773]],[[8255,8262],"valid",[],"NV8"],[[8263,8263],"disallowed_STD3_mapped",[63,63]],[[8264,8264],"disallowed_STD3_mapped",[63,33]],[[8265,8265],"disallowed_STD3_mapped",[33,63]],[[8266,8269],"valid",[],"NV8"],[[8270,8274],"valid",[],"NV8"],[[8275,8276],"valid",[],"NV8"],[[8277,8278],"valid",[],"NV8"],[[8279,8279],"mapped",[8242,8242,8242,8242]],[[8280,8286],"valid",[],"NV8"],[[8287,8287],"disallowed_STD3_mapped",[32]],[[8288,8288],"ignored"],[[8289,8291],"disallowed"],[[8292,8292],"ignored"],[[8293,8293],"disallowed"],[[8294,8297],"disallowed"],[[8298,8303],"disallowed"],[[8304,8304],"mapped",[48]],[[8305,8305],"mapped",[105]],[[8306,8307],"disallowed"],[[8308,8308],"mapped",[52]],[[8309,8309],"mapped",[53]],[[8310,8310],"mapped",[54]],[[8311,8311],"mapped",[55]],[[8312,8312],"mapped",[56]],[[8313,8313],"mapped",[57]],[[8314,8314],"disallowed_STD3_mapped",[43]],[[8315,8315],"mapped",[8722]],[[8316,8316],"disallowed_STD3_mapped",[61]],[[8317,8317],"disallowed_STD3_mapped",[40]],[[8318,8318],"disallowed_STD3_mapped",[41]],[[8319,8319],"mapped",[110]],[[8320,8320],"mapped",[48]],[[8321,8321],"mapped",[49]],[[8322,8322],"mapped",[50]],[[8323,8323],"mapped",[51]],[[8324,8324],"mapped",[52]],[[8325,8325],"mapped",[53]],[[8326,8326],"mapped",[54]],[[8327,8327],"mapped",[55]],[[8328,8328],"mapped",[56]],[[8329,8329],"mapped",[57]],[[8330,8330],"disallowed_STD3_mapped",[43]],[[8331,8331],"mapped",[8722]],[[8332,8332],"disallowed_STD3_mapped",[61]],[[8333,8333],"disallowed_STD3_mapped",[40]],[[8334,8334],"disallowed_STD3_mapped",[41]],[[8335,8335],"disallowed"],[[8336,8336],"mapped",[97]],[[8337,8337],"mapped",[101]],[[8338,8338],"mapped",[111]],[[8339,8339],"mapped",[120]],[[8340,8340],"mapped",[601]],[[8341,8341],"mapped",[104]],[[8342,8342],"mapped",[107]],[[8343,8343],"mapped",[108]],[[8344,8344],"mapped",[109]],[[8345,8345],"mapped",[110]],[[8346,8346],"mapped",[112]],[[8347,8347],"mapped",[115]],[[8348,8348],"mapped",[116]],[[8349,8351],"disallowed"],[[8352,8359],"valid",[],"NV8"],[[8360,8360],"mapped",[114,115]],[[8361,8362],"valid",[],"NV8"],[[8363,8363],"valid",[],"NV8"],[[8364,8364],"valid",[],"NV8"],[[8365,8367],"valid",[],"NV8"],[[8368,8369],"valid",[],"NV8"],[[8370,8373],"valid",[],"NV8"],[[8374,8376],"valid",[],"NV8"],[[8377,8377],"valid",[],"NV8"],[[8378,8378],"valid",[],"NV8"],[[8379,8381],"valid",[],"NV8"],[[8382,8382],"valid",[],"NV8"],[[8383,8399],"disallowed"],[[8400,8417],"valid",[],"NV8"],[[8418,8419],"valid",[],"NV8"],[[8420,8426],"valid",[],"NV8"],[[8427,8427],"valid",[],"NV8"],[[8428,8431],"valid",[],"NV8"],[[8432,8432],"valid",[],"NV8"],[[8433,8447],"disallowed"],[[8448,8448],"disallowed_STD3_mapped",[97,47,99]],[[8449,8449],"disallowed_STD3_mapped",[97,47,115]],[[8450,8450],"mapped",[99]],[[8451,8451],"mapped",[176,99]],[[8452,8452],"valid",[],"NV8"],[[8453,8453],"disallowed_STD3_mapped",[99,47,111]],[[8454,8454],"disallowed_STD3_mapped",[99,47,117]],[[8455,8455],"mapped",[603]],[[8456,8456],"valid",[],"NV8"],[[8457,8457],"mapped",[176,102]],[[8458,8458],"mapped",[103]],[[8459,8462],"mapped",[104]],[[8463,8463],"mapped",[295]],[[8464,8465],"mapped",[105]],[[8466,8467],"mapped",[108]],[[8468,8468],"valid",[],"NV8"],[[8469,8469],"mapped",[110]],[[8470,8470],"mapped",[110,111]],[[8471,8472],"valid",[],"NV8"],[[8473,8473],"mapped",[112]],[[8474,8474],"mapped",[113]],[[8475,8477],"mapped",[114]],[[8478,8479],"valid",[],"NV8"],[[8480,8480],"mapped",[115,109]],[[8481,8481],"mapped",[116,101,108]],[[8482,8482],"mapped",[116,109]],[[8483,8483],"valid",[],"NV8"],[[8484,8484],"mapped",[122]],[[8485,8485],"valid",[],"NV8"],[[8486,8486],"mapped",[969]],[[8487,8487],"valid",[],"NV8"],[[8488,8488],"mapped",[122]],[[8489,8489],"valid",[],"NV8"],[[8490,8490],"mapped",[107]],[[8491,8491],"mapped",[229]],[[8492,8492],"mapped",[98]],[[8493,8493],"mapped",[99]],[[8494,8494],"valid",[],"NV8"],[[8495,8496],"mapped",[101]],[[8497,8497],"mapped",[102]],[[8498,8498],"disallowed"],[[8499,8499],"mapped",[109]],[[8500,8500],"mapped",[111]],[[8501,8501],"mapped",[1488]],[[8502,8502],"mapped",[1489]],[[8503,8503],"mapped",[1490]],[[8504,8504],"mapped",[1491]],[[8505,8505],"mapped",[105]],[[8506,8506],"valid",[],"NV8"],[[8507,8507],"mapped",[102,97,120]],[[8508,8508],"mapped",[960]],[[8509,8510],"mapped",[947]],[[8511,8511],"mapped",[960]],[[8512,8512],"mapped",[8721]],[[8513,8516],"valid",[],"NV8"],[[8517,8518],"mapped",[100]],[[8519,8519],"mapped",[101]],[[8520,8520],"mapped",[105]],[[8521,8521],"mapped",[106]],[[8522,8523],"valid",[],"NV8"],[[8524,8524],"valid",[],"NV8"],[[8525,8525],"valid",[],"NV8"],[[8526,8526],"valid"],[[8527,8527],"valid",[],"NV8"],[[8528,8528],"mapped",[49,8260,55]],[[8529,8529],"mapped",[49,8260,57]],[[8530,8530],"mapped",[49,8260,49,48]],[[8531,8531],"mapped",[49,8260,51]],[[8532,8532],"mapped",[50,8260,51]],[[8533,8533],"mapped",[49,8260,53]],[[8534,8534],"mapped",[50,8260,53]],[[8535,8535],"mapped",[51,8260,53]],[[8536,8536],"mapped",[52,8260,53]],[[8537,8537],"mapped",[49,8260,54]],[[8538,8538],"mapped",[53,8260,54]],[[8539,8539],"mapped",[49,8260,56]],[[8540,8540],"mapped",[51,8260,56]],[[8541,8541],"mapped",[53,8260,56]],[[8542,8542],"mapped",[55,8260,56]],[[8543,8543],"mapped",[49,8260]],[[8544,8544],"mapped",[105]],[[8545,8545],"mapped",[105,105]],[[8546,8546],"mapped",[105,105,105]],[[8547,8547],"mapped",[105,118]],[[8548,8548],"mapped",[118]],[[8549,8549],"mapped",[118,105]],[[8550,8550],"mapped",[118,105,105]],[[8551,8551],"mapped",[118,105,105,105]],[[8552,8552],"mapped",[105,120]],[[8553,8553],"mapped",[120]],[[8554,8554],"mapped",[120,105]],[[8555,8555],"mapped",[120,105,105]],[[8556,8556],"mapped",[108]],[[8557,8557],"mapped",[99]],[[8558,8558],"mapped",[100]],[[8559,8559],"mapped",[109]],[[8560,8560],"mapped",[105]],[[8561,8561],"mapped",[105,105]],[[8562,8562],"mapped",[105,105,105]],[[8563,8563],"mapped",[105,118]],[[8564,8564],"mapped",[118]],[[8565,8565],"mapped",[118,105]],[[8566,8566],"mapped",[118,105,105]],[[8567,8567],"mapped",[118,105,105,105]],[[8568,8568],"mapped",[105,120]],[[8569,8569],"mapped",[120]],[[8570,8570],"mapped",[120,105]],[[8571,8571],"mapped",[120,105,105]],[[8572,8572],"mapped",[108]],[[8573,8573],"mapped",[99]],[[8574,8574],"mapped",[100]],[[8575,8575],"mapped",[109]],[[8576,8578],"valid",[],"NV8"],[[8579,8579],"disallowed"],[[8580,8580],"valid"],[[8581,8584],"valid",[],"NV8"],[[8585,8585],"mapped",[48,8260,51]],[[8586,8587],"valid",[],"NV8"],[[8588,8591],"disallowed"],[[8592,8682],"valid",[],"NV8"],[[8683,8691],"valid",[],"NV8"],[[8692,8703],"valid",[],"NV8"],[[8704,8747],"valid",[],"NV8"],[[8748,8748],"mapped",[8747,8747]],[[8749,8749],"mapped",[8747,8747,8747]],[[8750,8750],"valid",[],"NV8"],[[8751,8751],"mapped",[8750,8750]],[[8752,8752],"mapped",[8750,8750,8750]],[[8753,8799],"valid",[],"NV8"],[[8800,8800],"disallowed_STD3_valid"],[[8801,8813],"valid",[],"NV8"],[[8814,8815],"disallowed_STD3_valid"],[[8816,8945],"valid",[],"NV8"],[[8946,8959],"valid",[],"NV8"],[[8960,8960],"valid",[],"NV8"],[[8961,8961],"valid",[],"NV8"],[[8962,9000],"valid",[],"NV8"],[[9001,9001],"mapped",[12296]],[[9002,9002],"mapped",[12297]],[[9003,9082],"valid",[],"NV8"],[[9083,9083],"valid",[],"NV8"],[[9084,9084],"valid",[],"NV8"],[[9085,9114],"valid",[],"NV8"],[[9115,9166],"valid",[],"NV8"],[[9167,9168],"valid",[],"NV8"],[[9169,9179],"valid",[],"NV8"],[[9180,9191],"valid",[],"NV8"],[[9192,9192],"valid",[],"NV8"],[[9193,9203],"valid",[],"NV8"],[[9204,9210],"valid",[],"NV8"],[[9211,9215],"disallowed"],[[9216,9252],"valid",[],"NV8"],[[9253,9254],"valid",[],"NV8"],[[9255,9279],"disallowed"],[[9280,9290],"valid",[],"NV8"],[[9291,9311],"disallowed"],[[9312,9312],"mapped",[49]],[[9313,9313],"mapped",[50]],[[9314,9314],"mapped",[51]],[[9315,9315],"mapped",[52]],[[9316,9316],"mapped",[53]],[[9317,9317],"mapped",[54]],[[9318,9318],"mapped",[55]],[[9319,9319],"mapped",[56]],[[9320,9320],"mapped",[57]],[[9321,9321],"mapped",[49,48]],[[9322,9322],"mapped",[49,49]],[[9323,9323],"mapped",[49,50]],[[9324,9324],"mapped",[49,51]],[[9325,9325],"mapped",[49,52]],[[9326,9326],"mapped",[49,53]],[[9327,9327],"mapped",[49,54]],[[9328,9328],"mapped",[49,55]],[[9329,9329],"mapped",[49,56]],[[9330,9330],"mapped",[49,57]],[[9331,9331],"mapped",[50,48]],[[9332,9332],"disallowed_STD3_mapped",[40,49,41]],[[9333,9333],"disallowed_STD3_mapped",[40,50,41]],[[9334,9334],"disallowed_STD3_mapped",[40,51,41]],[[9335,9335],"disallowed_STD3_mapped",[40,52,41]],[[9336,9336],"disallowed_STD3_mapped",[40,53,41]],[[9337,9337],"disallowed_STD3_mapped",[40,54,41]],[[9338,9338],"disallowed_STD3_mapped",[40,55,41]],[[9339,9339],"disallowed_STD3_mapped",[40,56,41]],[[9340,9340],"disallowed_STD3_mapped",[40,57,41]],[[9341,9341],"disallowed_STD3_mapped",[40,49,48,41]],[[9342,9342],"disallowed_STD3_mapped",[40,49,49,41]],[[9343,9343],"disallowed_STD3_mapped",[40,49,50,41]],[[9344,9344],"disallowed_STD3_mapped",[40,49,51,41]],[[9345,9345],"disallowed_STD3_mapped",[40,49,52,41]],[[9346,9346],"disallowed_STD3_mapped",[40,49,53,41]],[[9347,9347],"disallowed_STD3_mapped",[40,49,54,41]],[[9348,9348],"disallowed_STD3_mapped",[40,49,55,41]],[[9349,9349],"disallowed_STD3_mapped",[40,49,56,41]],[[9350,9350],"disallowed_STD3_mapped",[40,49,57,41]],[[9351,9351],"disallowed_STD3_mapped",[40,50,48,41]],[[9352,9371],"disallowed"],[[9372,9372],"disallowed_STD3_mapped",[40,97,41]],[[9373,9373],"disallowed_STD3_mapped",[40,98,41]],[[9374,9374],"disallowed_STD3_mapped",[40,99,41]],[[9375,9375],"disallowed_STD3_mapped",[40,100,41]],[[9376,9376],"disallowed_STD3_mapped",[40,101,41]],[[9377,9377],"disallowed_STD3_mapped",[40,102,41]],[[9378,9378],"disallowed_STD3_mapped",[40,103,41]],[[9379,9379],"disallowed_STD3_mapped",[40,104,41]],[[9380,9380],"disallowed_STD3_mapped",[40,105,41]],[[9381,9381],"disallowed_STD3_mapped",[40,106,41]],[[9382,9382],"disallowed_STD3_mapped",[40,107,41]],[[9383,9383],"disallowed_STD3_mapped",[40,108,41]],[[9384,9384],"disallowed_STD3_mapped",[40,109,41]],[[9385,9385],"disallowed_STD3_mapped",[40,110,41]],[[9386,9386],"disallowed_STD3_mapped",[40,111,41]],[[9387,9387],"disallowed_STD3_mapped",[40,112,41]],[[9388,9388],"disallowed_STD3_mapped",[40,113,41]],[[9389,9389],"disallowed_STD3_mapped",[40,114,41]],[[9390,9390],"disallowed_STD3_mapped",[40,115,41]],[[9391,9391],"disallowed_STD3_mapped",[40,116,41]],[[9392,9392],"disallowed_STD3_mapped",[40,117,41]],[[9393,9393],"disallowed_STD3_mapped",[40,118,41]],[[9394,9394],"disallowed_STD3_mapped",[40,119,41]],[[9395,9395],"disallowed_STD3_mapped",[40,120,41]],[[9396,9396],"disallowed_STD3_mapped",[40,121,41]],[[9397,9397],"disallowed_STD3_mapped",[40,122,41]],[[9398,9398],"mapped",[97]],[[9399,9399],"mapped",[98]],[[9400,9400],"mapped",[99]],[[9401,9401],"mapped",[100]],[[9402,9402],"mapped",[101]],[[9403,9403],"mapped",[102]],[[9404,9404],"mapped",[103]],[[9405,9405],"mapped",[104]],[[9406,9406],"mapped",[105]],[[9407,9407],"mapped",[106]],[[9408,9408],"mapped",[107]],[[9409,9409],"mapped",[108]],[[9410,9410],"mapped",[109]],[[9411,9411],"mapped",[110]],[[9412,9412],"mapped",[111]],[[9413,9413],"mapped",[112]],[[9414,9414],"mapped",[113]],[[9415,9415],"mapped",[114]],[[9416,9416],"mapped",[115]],[[9417,9417],"mapped",[116]],[[9418,9418],"mapped",[117]],[[9419,9419],"mapped",[118]],[[9420,9420],"mapped",[119]],[[9421,9421],"mapped",[120]],[[9422,9422],"mapped",[121]],[[9423,9423],"mapped",[122]],[[9424,9424],"mapped",[97]],[[9425,9425],"mapped",[98]],[[9426,9426],"mapped",[99]],[[9427,9427],"mapped",[100]],[[9428,9428],"mapped",[101]],[[9429,9429],"mapped",[102]],[[9430,9430],"mapped",[103]],[[9431,9431],"mapped",[104]],[[9432,9432],"mapped",[105]],[[9433,9433],"mapped",[106]],[[9434,9434],"mapped",[107]],[[9435,9435],"mapped",[108]],[[9436,9436],"mapped",[109]],[[9437,9437],"mapped",[110]],[[9438,9438],"mapped",[111]],[[9439,9439],"mapped",[112]],[[9440,9440],"mapped",[113]],[[9441,9441],"mapped",[114]],[[9442,9442],"mapped",[115]],[[9443,9443],"mapped",[116]],[[9444,9444],"mapped",[117]],[[9445,9445],"mapped",[118]],[[9446,9446],"mapped",[119]],[[9447,9447],"mapped",[120]],[[9448,9448],"mapped",[121]],[[9449,9449],"mapped",[122]],[[9450,9450],"mapped",[48]],[[9451,9470],"valid",[],"NV8"],[[9471,9471],"valid",[],"NV8"],[[9472,9621],"valid",[],"NV8"],[[9622,9631],"valid",[],"NV8"],[[9632,9711],"valid",[],"NV8"],[[9712,9719],"valid",[],"NV8"],[[9720,9727],"valid",[],"NV8"],[[9728,9747],"valid",[],"NV8"],[[9748,9749],"valid",[],"NV8"],[[9750,9751],"valid",[],"NV8"],[[9752,9752],"valid",[],"NV8"],[[9753,9753],"valid",[],"NV8"],[[9754,9839],"valid",[],"NV8"],[[9840,9841],"valid",[],"NV8"],[[9842,9853],"valid",[],"NV8"],[[9854,9855],"valid",[],"NV8"],[[9856,9865],"valid",[],"NV8"],[[9866,9873],"valid",[],"NV8"],[[9874,9884],"valid",[],"NV8"],[[9885,9885],"valid",[],"NV8"],[[9886,9887],"valid",[],"NV8"],[[9888,9889],"valid",[],"NV8"],[[9890,9905],"valid",[],"NV8"],[[9906,9906],"valid",[],"NV8"],[[9907,9916],"valid",[],"NV8"],[[9917,9919],"valid",[],"NV8"],[[9920,9923],"valid",[],"NV8"],[[9924,9933],"valid",[],"NV8"],[[9934,9934],"valid",[],"NV8"],[[9935,9953],"valid",[],"NV8"],[[9954,9954],"valid",[],"NV8"],[[9955,9955],"valid",[],"NV8"],[[9956,9959],"valid",[],"NV8"],[[9960,9983],"valid",[],"NV8"],[[9984,9984],"valid",[],"NV8"],[[9985,9988],"valid",[],"NV8"],[[9989,9989],"valid",[],"NV8"],[[9990,9993],"valid",[],"NV8"],[[9994,9995],"valid",[],"NV8"],[[9996,10023],"valid",[],"NV8"],[[10024,10024],"valid",[],"NV8"],[[10025,10059],"valid",[],"NV8"],[[10060,10060],"valid",[],"NV8"],[[10061,10061],"valid",[],"NV8"],[[10062,10062],"valid",[],"NV8"],[[10063,10066],"valid",[],"NV8"],[[10067,10069],"valid",[],"NV8"],[[10070,10070],"valid",[],"NV8"],[[10071,10071],"valid",[],"NV8"],[[10072,10078],"valid",[],"NV8"],[[10079,10080],"valid",[],"NV8"],[[10081,10087],"valid",[],"NV8"],[[10088,10101],"valid",[],"NV8"],[[10102,10132],"valid",[],"NV8"],[[10133,10135],"valid",[],"NV8"],[[10136,10159],"valid",[],"NV8"],[[10160,10160],"valid",[],"NV8"],[[10161,10174],"valid",[],"NV8"],[[10175,10175],"valid",[],"NV8"],[[10176,10182],"valid",[],"NV8"],[[10183,10186],"valid",[],"NV8"],[[10187,10187],"valid",[],"NV8"],[[10188,10188],"valid",[],"NV8"],[[10189,10189],"valid",[],"NV8"],[[10190,10191],"valid",[],"NV8"],[[10192,10219],"valid",[],"NV8"],[[10220,10223],"valid",[],"NV8"],[[10224,10239],"valid",[],"NV8"],[[10240,10495],"valid",[],"NV8"],[[10496,10763],"valid",[],"NV8"],[[10764,10764],"mapped",[8747,8747,8747,8747]],[[10765,10867],"valid",[],"NV8"],[[10868,10868],"disallowed_STD3_mapped",[58,58,61]],[[10869,10869],"disallowed_STD3_mapped",[61,61]],[[10870,10870],"disallowed_STD3_mapped",[61,61,61]],[[10871,10971],"valid",[],"NV8"],[[10972,10972],"mapped",[10973,824]],[[10973,11007],"valid",[],"NV8"],[[11008,11021],"valid",[],"NV8"],[[11022,11027],"valid",[],"NV8"],[[11028,11034],"valid",[],"NV8"],[[11035,11039],"valid",[],"NV8"],[[11040,11043],"valid",[],"NV8"],[[11044,11084],"valid",[],"NV8"],[[11085,11087],"valid",[],"NV8"],[[11088,11092],"valid",[],"NV8"],[[11093,11097],"valid",[],"NV8"],[[11098,11123],"valid",[],"NV8"],[[11124,11125],"disallowed"],[[11126,11157],"valid",[],"NV8"],[[11158,11159],"disallowed"],[[11160,11193],"valid",[],"NV8"],[[11194,11196],"disallowed"],[[11197,11208],"valid",[],"NV8"],[[11209,11209],"disallowed"],[[11210,11217],"valid",[],"NV8"],[[11218,11243],"disallowed"],[[11244,11247],"valid",[],"NV8"],[[11248,11263],"disallowed"],[[11264,11264],"mapped",[11312]],[[11265,11265],"mapped",[11313]],[[11266,11266],"mapped",[11314]],[[11267,11267],"mapped",[11315]],[[11268,11268],"mapped",[11316]],[[11269,11269],"mapped",[11317]],[[11270,11270],"mapped",[11318]],[[11271,11271],"mapped",[11319]],[[11272,11272],"mapped",[11320]],[[11273,11273],"mapped",[11321]],[[11274,11274],"mapped",[11322]],[[11275,11275],"mapped",[11323]],[[11276,11276],"mapped",[11324]],[[11277,11277],"mapped",[11325]],[[11278,11278],"mapped",[11326]],[[11279,11279],"mapped",[11327]],[[11280,11280],"mapped",[11328]],[[11281,11281],"mapped",[11329]],[[11282,11282],"mapped",[11330]],[[11283,11283],"mapped",[11331]],[[11284,11284],"mapped",[11332]],[[11285,11285],"mapped",[11333]],[[11286,11286],"mapped",[11334]],[[11287,11287],"mapped",[11335]],[[11288,11288],"mapped",[11336]],[[11289,11289],"mapped",[11337]],[[11290,11290],"mapped",[11338]],[[11291,11291],"mapped",[11339]],[[11292,11292],"mapped",[11340]],[[11293,11293],"mapped",[11341]],[[11294,11294],"mapped",[11342]],[[11295,11295],"mapped",[11343]],[[11296,11296],"mapped",[11344]],[[11297,11297],"mapped",[11345]],[[11298,11298],"mapped",[11346]],[[11299,11299],"mapped",[11347]],[[11300,11300],"mapped",[11348]],[[11301,11301],"mapped",[11349]],[[11302,11302],"mapped",[11350]],[[11303,11303],"mapped",[11351]],[[11304,11304],"mapped",[11352]],[[11305,11305],"mapped",[11353]],[[11306,11306],"mapped",[11354]],[[11307,11307],"mapped",[11355]],[[11308,11308],"mapped",[11356]],[[11309,11309],"mapped",[11357]],[[11310,11310],"mapped",[11358]],[[11311,11311],"disallowed"],[[11312,11358],"valid"],[[11359,11359],"disallowed"],[[11360,11360],"mapped",[11361]],[[11361,11361],"valid"],[[11362,11362],"mapped",[619]],[[11363,11363],"mapped",[7549]],[[11364,11364],"mapped",[637]],[[11365,11366],"valid"],[[11367,11367],"mapped",[11368]],[[11368,11368],"valid"],[[11369,11369],"mapped",[11370]],[[11370,11370],"valid"],[[11371,11371],"mapped",[11372]],[[11372,11372],"valid"],[[11373,11373],"mapped",[593]],[[11374,11374],"mapped",[625]],[[11375,11375],"mapped",[592]],[[11376,11376],"mapped",[594]],[[11377,11377],"valid"],[[11378,11378],"mapped",[11379]],[[11379,11379],"valid"],[[11380,11380],"valid"],[[11381,11381],"mapped",[11382]],[[11382,11383],"valid"],[[11384,11387],"valid"],[[11388,11388],"mapped",[106]],[[11389,11389],"mapped",[118]],[[11390,11390],"mapped",[575]],[[11391,11391],"mapped",[576]],[[11392,11392],"mapped",[11393]],[[11393,11393],"valid"],[[11394,11394],"mapped",[11395]],[[11395,11395],"valid"],[[11396,11396],"mapped",[11397]],[[11397,11397],"valid"],[[11398,11398],"mapped",[11399]],[[11399,11399],"valid"],[[11400,11400],"mapped",[11401]],[[11401,11401],"valid"],[[11402,11402],"mapped",[11403]],[[11403,11403],"valid"],[[11404,11404],"mapped",[11405]],[[11405,11405],"valid"],[[11406,11406],"mapped",[11407]],[[11407,11407],"valid"],[[11408,11408],"mapped",[11409]],[[11409,11409],"valid"],[[11410,11410],"mapped",[11411]],[[11411,11411],"valid"],[[11412,11412],"mapped",[11413]],[[11413,11413],"valid"],[[11414,11414],"mapped",[11415]],[[11415,11415],"valid"],[[11416,11416],"mapped",[11417]],[[11417,11417],"valid"],[[11418,11418],"mapped",[11419]],[[11419,11419],"valid"],[[11420,11420],"mapped",[11421]],[[11421,11421],"valid"],[[11422,11422],"mapped",[11423]],[[11423,11423],"valid"],[[11424,11424],"mapped",[11425]],[[11425,11425],"valid"],[[11426,11426],"mapped",[11427]],[[11427,11427],"valid"],[[11428,11428],"mapped",[11429]],[[11429,11429],"valid"],[[11430,11430],"mapped",[11431]],[[11431,11431],"valid"],[[11432,11432],"mapped",[11433]],[[11433,11433],"valid"],[[11434,11434],"mapped",[11435]],[[11435,11435],"valid"],[[11436,11436],"mapped",[11437]],[[11437,11437],"valid"],[[11438,11438],"mapped",[11439]],[[11439,11439],"valid"],[[11440,11440],"mapped",[11441]],[[11441,11441],"valid"],[[11442,11442],"mapped",[11443]],[[11443,11443],"valid"],[[11444,11444],"mapped",[11445]],[[11445,11445],"valid"],[[11446,11446],"mapped",[11447]],[[11447,11447],"valid"],[[11448,11448],"mapped",[11449]],[[11449,11449],"valid"],[[11450,11450],"mapped",[11451]],[[11451,11451],"valid"],[[11452,11452],"mapped",[11453]],[[11453,11453],"valid"],[[11454,11454],"mapped",[11455]],[[11455,11455],"valid"],[[11456,11456],"mapped",[11457]],[[11457,11457],"valid"],[[11458,11458],"mapped",[11459]],[[11459,11459],"valid"],[[11460,11460],"mapped",[11461]],[[11461,11461],"valid"],[[11462,11462],"mapped",[11463]],[[11463,11463],"valid"],[[11464,11464],"mapped",[11465]],[[11465,11465],"valid"],[[11466,11466],"mapped",[11467]],[[11467,11467],"valid"],[[11468,11468],"mapped",[11469]],[[11469,11469],"valid"],[[11470,11470],"mapped",[11471]],[[11471,11471],"valid"],[[11472,11472],"mapped",[11473]],[[11473,11473],"valid"],[[11474,11474],"mapped",[11475]],[[11475,11475],"valid"],[[11476,11476],"mapped",[11477]],[[11477,11477],"valid"],[[11478,11478],"mapped",[11479]],[[11479,11479],"valid"],[[11480,11480],"mapped",[11481]],[[11481,11481],"valid"],[[11482,11482],"mapped",[11483]],[[11483,11483],"valid"],[[11484,11484],"mapped",[11485]],[[11485,11485],"valid"],[[11486,11486],"mapped",[11487]],[[11487,11487],"valid"],[[11488,11488],"mapped",[11489]],[[11489,11489],"valid"],[[11490,11490],"mapped",[11491]],[[11491,11492],"valid"],[[11493,11498],"valid",[],"NV8"],[[11499,11499],"mapped",[11500]],[[11500,11500],"valid"],[[11501,11501],"mapped",[11502]],[[11502,11505],"valid"],[[11506,11506],"mapped",[11507]],[[11507,11507],"valid"],[[11508,11512],"disallowed"],[[11513,11519],"valid",[],"NV8"],[[11520,11557],"valid"],[[11558,11558],"disallowed"],[[11559,11559],"valid"],[[11560,11564],"disallowed"],[[11565,11565],"valid"],[[11566,11567],"disallowed"],[[11568,11621],"valid"],[[11622,11623],"valid"],[[11624,11630],"disallowed"],[[11631,11631],"mapped",[11617]],[[11632,11632],"valid",[],"NV8"],[[11633,11646],"disallowed"],[[11647,11647],"valid"],[[11648,11670],"valid"],[[11671,11679],"disallowed"],[[11680,11686],"valid"],[[11687,11687],"disallowed"],[[11688,11694],"valid"],[[11695,11695],"disallowed"],[[11696,11702],"valid"],[[11703,11703],"disallowed"],[[11704,11710],"valid"],[[11711,11711],"disallowed"],[[11712,11718],"valid"],[[11719,11719],"disallowed"],[[11720,11726],"valid"],[[11727,11727],"disallowed"],[[11728,11734],"valid"],[[11735,11735],"disallowed"],[[11736,11742],"valid"],[[11743,11743],"disallowed"],[[11744,11775],"valid"],[[11776,11799],"valid",[],"NV8"],[[11800,11803],"valid",[],"NV8"],[[11804,11805],"valid",[],"NV8"],[[11806,11822],"valid",[],"NV8"],[[11823,11823],"valid"],[[11824,11824],"valid",[],"NV8"],[[11825,11825],"valid",[],"NV8"],[[11826,11835],"valid",[],"NV8"],[[11836,11842],"valid",[],"NV8"],[[11843,11903],"disallowed"],[[11904,11929],"valid",[],"NV8"],[[11930,11930],"disallowed"],[[11931,11934],"valid",[],"NV8"],[[11935,11935],"mapped",[27597]],[[11936,12018],"valid",[],"NV8"],[[12019,12019],"mapped",[40863]],[[12020,12031],"disallowed"],[[12032,12032],"mapped",[19968]],[[12033,12033],"mapped",[20008]],[[12034,12034],"mapped",[20022]],[[12035,12035],"mapped",[20031]],[[12036,12036],"mapped",[20057]],[[12037,12037],"mapped",[20101]],[[12038,12038],"mapped",[20108]],[[12039,12039],"mapped",[20128]],[[12040,12040],"mapped",[20154]],[[12041,12041],"mapped",[20799]],[[12042,12042],"mapped",[20837]],[[12043,12043],"mapped",[20843]],[[12044,12044],"mapped",[20866]],[[12045,12045],"mapped",[20886]],[[12046,12046],"mapped",[20907]],[[12047,12047],"mapped",[20960]],[[12048,12048],"mapped",[20981]],[[12049,12049],"mapped",[20992]],[[12050,12050],"mapped",[21147]],[[12051,12051],"mapped",[21241]],[[12052,12052],"mapped",[21269]],[[12053,12053],"mapped",[21274]],[[12054,12054],"mapped",[21304]],[[12055,12055],"mapped",[21313]],[[12056,12056],"mapped",[21340]],[[12057,12057],"mapped",[21353]],[[12058,12058],"mapped",[21378]],[[12059,12059],"mapped",[21430]],[[12060,12060],"mapped",[21448]],[[12061,12061],"mapped",[21475]],[[12062,12062],"mapped",[22231]],[[12063,12063],"mapped",[22303]],[[12064,12064],"mapped",[22763]],[[12065,12065],"mapped",[22786]],[[12066,12066],"mapped",[22794]],[[12067,12067],"mapped",[22805]],[[12068,12068],"mapped",[22823]],[[12069,12069],"mapped",[22899]],[[12070,12070],"mapped",[23376]],[[12071,12071],"mapped",[23424]],[[12072,12072],"mapped",[23544]],[[12073,12073],"mapped",[23567]],[[12074,12074],"mapped",[23586]],[[12075,12075],"mapped",[23608]],[[12076,12076],"mapped",[23662]],[[12077,12077],"mapped",[23665]],[[12078,12078],"mapped",[24027]],[[12079,12079],"mapped",[24037]],[[12080,12080],"mapped",[24049]],[[12081,12081],"mapped",[24062]],[[12082,12082],"mapped",[24178]],[[12083,12083],"mapped",[24186]],[[12084,12084],"mapped",[24191]],[[12085,12085],"mapped",[24308]],[[12086,12086],"mapped",[24318]],[[12087,12087],"mapped",[24331]],[[12088,12088],"mapped",[24339]],[[12089,12089],"mapped",[24400]],[[12090,12090],"mapped",[24417]],[[12091,12091],"mapped",[24435]],[[12092,12092],"mapped",[24515]],[[12093,12093],"mapped",[25096]],[[12094,12094],"mapped",[25142]],[[12095,12095],"mapped",[25163]],[[12096,12096],"mapped",[25903]],[[12097,12097],"mapped",[25908]],[[12098,12098],"mapped",[25991]],[[12099,12099],"mapped",[26007]],[[12100,12100],"mapped",[26020]],[[12101,12101],"mapped",[26041]],[[12102,12102],"mapped",[26080]],[[12103,12103],"mapped",[26085]],[[12104,12104],"mapped",[26352]],[[12105,12105],"mapped",[26376]],[[12106,12106],"mapped",[26408]],[[12107,12107],"mapped",[27424]],[[12108,12108],"mapped",[27490]],[[12109,12109],"mapped",[27513]],[[12110,12110],"mapped",[27571]],[[12111,12111],"mapped",[27595]],[[12112,12112],"mapped",[27604]],[[12113,12113],"mapped",[27611]],[[12114,12114],"mapped",[27663]],[[12115,12115],"mapped",[27668]],[[12116,12116],"mapped",[27700]],[[12117,12117],"mapped",[28779]],[[12118,12118],"mapped",[29226]],[[12119,12119],"mapped",[29238]],[[12120,12120],"mapped",[29243]],[[12121,12121],"mapped",[29247]],[[12122,12122],"mapped",[29255]],[[12123,12123],"mapped",[29273]],[[12124,12124],"mapped",[29275]],[[12125,12125],"mapped",[29356]],[[12126,12126],"mapped",[29572]],[[12127,12127],"mapped",[29577]],[[12128,12128],"mapped",[29916]],[[12129,12129],"mapped",[29926]],[[12130,12130],"mapped",[29976]],[[12131,12131],"mapped",[29983]],[[12132,12132],"mapped",[29992]],[[12133,12133],"mapped",[30000]],[[12134,12134],"mapped",[30091]],[[12135,12135],"mapped",[30098]],[[12136,12136],"mapped",[30326]],[[12137,12137],"mapped",[30333]],[[12138,12138],"mapped",[30382]],[[12139,12139],"mapped",[30399]],[[12140,12140],"mapped",[30446]],[[12141,12141],"mapped",[30683]],[[12142,12142],"mapped",[30690]],[[12143,12143],"mapped",[30707]],[[12144,12144],"mapped",[31034]],[[12145,12145],"mapped",[31160]],[[12146,12146],"mapped",[31166]],[[12147,12147],"mapped",[31348]],[[12148,12148],"mapped",[31435]],[[12149,12149],"mapped",[31481]],[[12150,12150],"mapped",[31859]],[[12151,12151],"mapped",[31992]],[[12152,12152],"mapped",[32566]],[[12153,12153],"mapped",[32593]],[[12154,12154],"mapped",[32650]],[[12155,12155],"mapped",[32701]],[[12156,12156],"mapped",[32769]],[[12157,12157],"mapped",[32780]],[[12158,12158],"mapped",[32786]],[[12159,12159],"mapped",[32819]],[[12160,12160],"mapped",[32895]],[[12161,12161],"mapped",[32905]],[[12162,12162],"mapped",[33251]],[[12163,12163],"mapped",[33258]],[[12164,12164],"mapped",[33267]],[[12165,12165],"mapped",[33276]],[[12166,12166],"mapped",[33292]],[[12167,12167],"mapped",[33307]],[[12168,12168],"mapped",[33311]],[[12169,12169],"mapped",[33390]],[[12170,12170],"mapped",[33394]],[[12171,12171],"mapped",[33400]],[[12172,12172],"mapped",[34381]],[[12173,12173],"mapped",[34411]],[[12174,12174],"mapped",[34880]],[[12175,12175],"mapped",[34892]],[[12176,12176],"mapped",[34915]],[[12177,12177],"mapped",[35198]],[[12178,12178],"mapped",[35211]],[[12179,12179],"mapped",[35282]],[[12180,12180],"mapped",[35328]],[[12181,12181],"mapped",[35895]],[[12182,12182],"mapped",[35910]],[[12183,12183],"mapped",[35925]],[[12184,12184],"mapped",[35960]],[[12185,12185],"mapped",[35997]],[[12186,12186],"mapped",[36196]],[[12187,12187],"mapped",[36208]],[[12188,12188],"mapped",[36275]],[[12189,12189],"mapped",[36523]],[[12190,12190],"mapped",[36554]],[[12191,12191],"mapped",[36763]],[[12192,12192],"mapped",[36784]],[[12193,12193],"mapped",[36789]],[[12194,12194],"mapped",[37009]],[[12195,12195],"mapped",[37193]],[[12196,12196],"mapped",[37318]],[[12197,12197],"mapped",[37324]],[[12198,12198],"mapped",[37329]],[[12199,12199],"mapped",[38263]],[[12200,12200],"mapped",[38272]],[[12201,12201],"mapped",[38428]],[[12202,12202],"mapped",[38582]],[[12203,12203],"mapped",[38585]],[[12204,12204],"mapped",[38632]],[[12205,12205],"mapped",[38737]],[[12206,12206],"mapped",[38750]],[[12207,12207],"mapped",[38754]],[[12208,12208],"mapped",[38761]],[[12209,12209],"mapped",[38859]],[[12210,12210],"mapped",[38893]],[[12211,12211],"mapped",[38899]],[[12212,12212],"mapped",[38913]],[[12213,12213],"mapped",[39080]],[[12214,12214],"mapped",[39131]],[[12215,12215],"mapped",[39135]],[[12216,12216],"mapped",[39318]],[[12217,12217],"mapped",[39321]],[[12218,12218],"mapped",[39340]],[[12219,12219],"mapped",[39592]],[[12220,12220],"mapped",[39640]],[[12221,12221],"mapped",[39647]],[[12222,12222],"mapped",[39717]],[[12223,12223],"mapped",[39727]],[[12224,12224],"mapped",[39730]],[[12225,12225],"mapped",[39740]],[[12226,12226],"mapped",[39770]],[[12227,12227],"mapped",[40165]],[[12228,12228],"mapped",[40565]],[[12229,12229],"mapped",[40575]],[[12230,12230],"mapped",[40613]],[[12231,12231],"mapped",[40635]],[[12232,12232],"mapped",[40643]],[[12233,12233],"mapped",[40653]],[[12234,12234],"mapped",[40657]],[[12235,12235],"mapped",[40697]],[[12236,12236],"mapped",[40701]],[[12237,12237],"mapped",[40718]],[[12238,12238],"mapped",[40723]],[[12239,12239],"mapped",[40736]],[[12240,12240],"mapped",[40763]],[[12241,12241],"mapped",[40778]],[[12242,12242],"mapped",[40786]],[[12243,12243],"mapped",[40845]],[[12244,12244],"mapped",[40860]],[[12245,12245],"mapped",[40864]],[[12246,12271],"disallowed"],[[12272,12283],"disallowed"],[[12284,12287],"disallowed"],[[12288,12288],"disallowed_STD3_mapped",[32]],[[12289,12289],"valid",[],"NV8"],[[12290,12290],"mapped",[46]],[[12291,12292],"valid",[],"NV8"],[[12293,12295],"valid"],[[12296,12329],"valid",[],"NV8"],[[12330,12333],"valid"],[[12334,12341],"valid",[],"NV8"],[[12342,12342],"mapped",[12306]],[[12343,12343],"valid",[],"NV8"],[[12344,12344],"mapped",[21313]],[[12345,12345],"mapped",[21316]],[[12346,12346],"mapped",[21317]],[[12347,12347],"valid",[],"NV8"],[[12348,12348],"valid"],[[12349,12349],"valid",[],"NV8"],[[12350,12350],"valid",[],"NV8"],[[12351,12351],"valid",[],"NV8"],[[12352,12352],"disallowed"],[[12353,12436],"valid"],[[12437,12438],"valid"],[[12439,12440],"disallowed"],[[12441,12442],"valid"],[[12443,12443],"disallowed_STD3_mapped",[32,12441]],[[12444,12444],"disallowed_STD3_mapped",[32,12442]],[[12445,12446],"valid"],[[12447,12447],"mapped",[12424,12426]],[[12448,12448],"valid",[],"NV8"],[[12449,12542],"valid"],[[12543,12543],"mapped",[12467,12488]],[[12544,12548],"disallowed"],[[12549,12588],"valid"],[[12589,12589],"valid"],[[12590,12592],"disallowed"],[[12593,12593],"mapped",[4352]],[[12594,12594],"mapped",[4353]],[[12595,12595],"mapped",[4522]],[[12596,12596],"mapped",[4354]],[[12597,12597],"mapped",[4524]],[[12598,12598],"mapped",[4525]],[[12599,12599],"mapped",[4355]],[[12600,12600],"mapped",[4356]],[[12601,12601],"mapped",[4357]],[[12602,12602],"mapped",[4528]],[[12603,12603],"mapped",[4529]],[[12604,12604],"mapped",[4530]],[[12605,12605],"mapped",[4531]],[[12606,12606],"mapped",[4532]],[[12607,12607],"mapped",[4533]],[[12608,12608],"mapped",[4378]],[[12609,12609],"mapped",[4358]],[[12610,12610],"mapped",[4359]],[[12611,12611],"mapped",[4360]],[[12612,12612],"mapped",[4385]],[[12613,12613],"mapped",[4361]],[[12614,12614],"mapped",[4362]],[[12615,12615],"mapped",[4363]],[[12616,12616],"mapped",[4364]],[[12617,12617],"mapped",[4365]],[[12618,12618],"mapped",[4366]],[[12619,12619],"mapped",[4367]],[[12620,12620],"mapped",[4368]],[[12621,12621],"mapped",[4369]],[[12622,12622],"mapped",[4370]],[[12623,12623],"mapped",[4449]],[[12624,12624],"mapped",[4450]],[[12625,12625],"mapped",[4451]],[[12626,12626],"mapped",[4452]],[[12627,12627],"mapped",[4453]],[[12628,12628],"mapped",[4454]],[[12629,12629],"mapped",[4455]],[[12630,12630],"mapped",[4456]],[[12631,12631],"mapped",[4457]],[[12632,12632],"mapped",[4458]],[[12633,12633],"mapped",[4459]],[[12634,12634],"mapped",[4460]],[[12635,12635],"mapped",[4461]],[[12636,12636],"mapped",[4462]],[[12637,12637],"mapped",[4463]],[[12638,12638],"mapped",[4464]],[[12639,12639],"mapped",[4465]],[[12640,12640],"mapped",[4466]],[[12641,12641],"mapped",[4467]],[[12642,12642],"mapped",[4468]],[[12643,12643],"mapped",[4469]],[[12644,12644],"disallowed"],[[12645,12645],"mapped",[4372]],[[12646,12646],"mapped",[4373]],[[12647,12647],"mapped",[4551]],[[12648,12648],"mapped",[4552]],[[12649,12649],"mapped",[4556]],[[12650,12650],"mapped",[4558]],[[12651,12651],"mapped",[4563]],[[12652,12652],"mapped",[4567]],[[12653,12653],"mapped",[4569]],[[12654,12654],"mapped",[4380]],[[12655,12655],"mapped",[4573]],[[12656,12656],"mapped",[4575]],[[12657,12657],"mapped",[4381]],[[12658,12658],"mapped",[4382]],[[12659,12659],"mapped",[4384]],[[12660,12660],"mapped",[4386]],[[12661,12661],"mapped",[4387]],[[12662,12662],"mapped",[4391]],[[12663,12663],"mapped",[4393]],[[12664,12664],"mapped",[4395]],[[12665,12665],"mapped",[4396]],[[12666,12666],"mapped",[4397]],[[12667,12667],"mapped",[4398]],[[12668,12668],"mapped",[4399]],[[12669,12669],"mapped",[4402]],[[12670,12670],"mapped",[4406]],[[12671,12671],"mapped",[4416]],[[12672,12672],"mapped",[4423]],[[12673,12673],"mapped",[4428]],[[12674,12674],"mapped",[4593]],[[12675,12675],"mapped",[4594]],[[12676,12676],"mapped",[4439]],[[12677,12677],"mapped",[4440]],[[12678,12678],"mapped",[4441]],[[12679,12679],"mapped",[4484]],[[12680,12680],"mapped",[4485]],[[12681,12681],"mapped",[4488]],[[12682,12682],"mapped",[4497]],[[12683,12683],"mapped",[4498]],[[12684,12684],"mapped",[4500]],[[12685,12685],"mapped",[4510]],[[12686,12686],"mapped",[4513]],[[12687,12687],"disallowed"],[[12688,12689],"valid",[],"NV8"],[[12690,12690],"mapped",[19968]],[[12691,12691],"mapped",[20108]],[[12692,12692],"mapped",[19977]],[[12693,12693],"mapped",[22235]],[[12694,12694],"mapped",[19978]],[[12695,12695],"mapped",[20013]],[[12696,12696],"mapped",[19979]],[[12697,12697],"mapped",[30002]],[[12698,12698],"mapped",[20057]],[[12699,12699],"mapped",[19993]],[[12700,12700],"mapped",[19969]],[[12701,12701],"mapped",[22825]],[[12702,12702],"mapped",[22320]],[[12703,12703],"mapped",[20154]],[[12704,12727],"valid"],[[12728,12730],"valid"],[[12731,12735],"disallowed"],[[12736,12751],"valid",[],"NV8"],[[12752,12771],"valid",[],"NV8"],[[12772,12783],"disallowed"],[[12784,12799],"valid"],[[12800,12800],"disallowed_STD3_mapped",[40,4352,41]],[[12801,12801],"disallowed_STD3_mapped",[40,4354,41]],[[12802,12802],"disallowed_STD3_mapped",[40,4355,41]],[[12803,12803],"disallowed_STD3_mapped",[40,4357,41]],[[12804,12804],"disallowed_STD3_mapped",[40,4358,41]],[[12805,12805],"disallowed_STD3_mapped",[40,4359,41]],[[12806,12806],"disallowed_STD3_mapped",[40,4361,41]],[[12807,12807],"disallowed_STD3_mapped",[40,4363,41]],[[12808,12808],"disallowed_STD3_mapped",[40,4364,41]],[[12809,12809],"disallowed_STD3_mapped",[40,4366,41]],[[12810,12810],"disallowed_STD3_mapped",[40,4367,41]],[[12811,12811],"disallowed_STD3_mapped",[40,4368,41]],[[12812,12812],"disallowed_STD3_mapped",[40,4369,41]],[[12813,12813],"disallowed_STD3_mapped",[40,4370,41]],[[12814,12814],"disallowed_STD3_mapped",[40,44032,41]],[[12815,12815],"disallowed_STD3_mapped",[40,45208,41]],[[12816,12816],"disallowed_STD3_mapped",[40,45796,41]],[[12817,12817],"disallowed_STD3_mapped",[40,46972,41]],[[12818,12818],"disallowed_STD3_mapped",[40,47560,41]],[[12819,12819],"disallowed_STD3_mapped",[40,48148,41]],[[12820,12820],"disallowed_STD3_mapped",[40,49324,41]],[[12821,12821],"disallowed_STD3_mapped",[40,50500,41]],[[12822,12822],"disallowed_STD3_mapped",[40,51088,41]],[[12823,12823],"disallowed_STD3_mapped",[40,52264,41]],[[12824,12824],"disallowed_STD3_mapped",[40,52852,41]],[[12825,12825],"disallowed_STD3_mapped",[40,53440,41]],[[12826,12826],"disallowed_STD3_mapped",[40,54028,41]],[[12827,12827],"disallowed_STD3_mapped",[40,54616,41]],[[12828,12828],"disallowed_STD3_mapped",[40,51452,41]],[[12829,12829],"disallowed_STD3_mapped",[40,50724,51204,41]],[[12830,12830],"disallowed_STD3_mapped",[40,50724,54980,41]],[[12831,12831],"disallowed"],[[12832,12832],"disallowed_STD3_mapped",[40,19968,41]],[[12833,12833],"disallowed_STD3_mapped",[40,20108,41]],[[12834,12834],"disallowed_STD3_mapped",[40,19977,41]],[[12835,12835],"disallowed_STD3_mapped",[40,22235,41]],[[12836,12836],"disallowed_STD3_mapped",[40,20116,41]],[[12837,12837],"disallowed_STD3_mapped",[40,20845,41]],[[12838,12838],"disallowed_STD3_mapped",[40,19971,41]],[[12839,12839],"disallowed_STD3_mapped",[40,20843,41]],[[12840,12840],"disallowed_STD3_mapped",[40,20061,41]],[[12841,12841],"disallowed_STD3_mapped",[40,21313,41]],[[12842,12842],"disallowed_STD3_mapped",[40,26376,41]],[[12843,12843],"disallowed_STD3_mapped",[40,28779,41]],[[12844,12844],"disallowed_STD3_mapped",[40,27700,41]],[[12845,12845],"disallowed_STD3_mapped",[40,26408,41]],[[12846,12846],"disallowed_STD3_mapped",[40,37329,41]],[[12847,12847],"disallowed_STD3_mapped",[40,22303,41]],[[12848,12848],"disallowed_STD3_mapped",[40,26085,41]],[[12849,12849],"disallowed_STD3_mapped",[40,26666,41]],[[12850,12850],"disallowed_STD3_mapped",[40,26377,41]],[[12851,12851],"disallowed_STD3_mapped",[40,31038,41]],[[12852,12852],"disallowed_STD3_mapped",[40,21517,41]],[[12853,12853],"disallowed_STD3_mapped",[40,29305,41]],[[12854,12854],"disallowed_STD3_mapped",[40,36001,41]],[[12855,12855],"disallowed_STD3_mapped",[40,31069,41]],[[12856,12856],"disallowed_STD3_mapped",[40,21172,41]],[[12857,12857],"disallowed_STD3_mapped",[40,20195,41]],[[12858,12858],"disallowed_STD3_mapped",[40,21628,41]],[[12859,12859],"disallowed_STD3_mapped",[40,23398,41]],[[12860,12860],"disallowed_STD3_mapped",[40,30435,41]],[[12861,12861],"disallowed_STD3_mapped",[40,20225,41]],[[12862,12862],"disallowed_STD3_mapped",[40,36039,41]],[[12863,12863],"disallowed_STD3_mapped",[40,21332,41]],[[12864,12864],"disallowed_STD3_mapped",[40,31085,41]],[[12865,12865],"disallowed_STD3_mapped",[40,20241,41]],[[12866,12866],"disallowed_STD3_mapped",[40,33258,41]],[[12867,12867],"disallowed_STD3_mapped",[40,33267,41]],[[12868,12868],"mapped",[21839]],[[12869,12869],"mapped",[24188]],[[12870,12870],"mapped",[25991]],[[12871,12871],"mapped",[31631]],[[12872,12879],"valid",[],"NV8"],[[12880,12880],"mapped",[112,116,101]],[[12881,12881],"mapped",[50,49]],[[12882,12882],"mapped",[50,50]],[[12883,12883],"mapped",[50,51]],[[12884,12884],"mapped",[50,52]],[[12885,12885],"mapped",[50,53]],[[12886,12886],"mapped",[50,54]],[[12887,12887],"mapped",[50,55]],[[12888,12888],"mapped",[50,56]],[[12889,12889],"mapped",[50,57]],[[12890,12890],"mapped",[51,48]],[[12891,12891],"mapped",[51,49]],[[12892,12892],"mapped",[51,50]],[[12893,12893],"mapped",[51,51]],[[12894,12894],"mapped",[51,52]],[[12895,12895],"mapped",[51,53]],[[12896,12896],"mapped",[4352]],[[12897,12897],"mapped",[4354]],[[12898,12898],"mapped",[4355]],[[12899,12899],"mapped",[4357]],[[12900,12900],"mapped",[4358]],[[12901,12901],"mapped",[4359]],[[12902,12902],"mapped",[4361]],[[12903,12903],"mapped",[4363]],[[12904,12904],"mapped",[4364]],[[12905,12905],"mapped",[4366]],[[12906,12906],"mapped",[4367]],[[12907,12907],"mapped",[4368]],[[12908,12908],"mapped",[4369]],[[12909,12909],"mapped",[4370]],[[12910,12910],"mapped",[44032]],[[12911,12911],"mapped",[45208]],[[12912,12912],"mapped",[45796]],[[12913,12913],"mapped",[46972]],[[12914,12914],"mapped",[47560]],[[12915,12915],"mapped",[48148]],[[12916,12916],"mapped",[49324]],[[12917,12917],"mapped",[50500]],[[12918,12918],"mapped",[51088]],[[12919,12919],"mapped",[52264]],[[12920,12920],"mapped",[52852]],[[12921,12921],"mapped",[53440]],[[12922,12922],"mapped",[54028]],[[12923,12923],"mapped",[54616]],[[12924,12924],"mapped",[52280,44256]],[[12925,12925],"mapped",[51452,51032]],[[12926,12926],"mapped",[50864]],[[12927,12927],"valid",[],"NV8"],[[12928,12928],"mapped",[19968]],[[12929,12929],"mapped",[20108]],[[12930,12930],"mapped",[19977]],[[12931,12931],"mapped",[22235]],[[12932,12932],"mapped",[20116]],[[12933,12933],"mapped",[20845]],[[12934,12934],"mapped",[19971]],[[12935,12935],"mapped",[20843]],[[12936,12936],"mapped",[20061]],[[12937,12937],"mapped",[21313]],[[12938,12938],"mapped",[26376]],[[12939,12939],"mapped",[28779]],[[12940,12940],"mapped",[27700]],[[12941,12941],"mapped",[26408]],[[12942,12942],"mapped",[37329]],[[12943,12943],"mapped",[22303]],[[12944,12944],"mapped",[26085]],[[12945,12945],"mapped",[26666]],[[12946,12946],"mapped",[26377]],[[12947,12947],"mapped",[31038]],[[12948,12948],"mapped",[21517]],[[12949,12949],"mapped",[29305]],[[12950,12950],"mapped",[36001]],[[12951,12951],"mapped",[31069]],[[12952,12952],"mapped",[21172]],[[12953,12953],"mapped",[31192]],[[12954,12954],"mapped",[30007]],[[12955,12955],"mapped",[22899]],[[12956,12956],"mapped",[36969]],[[12957,12957],"mapped",[20778]],[[12958,12958],"mapped",[21360]],[[12959,12959],"mapped",[27880]],[[12960,12960],"mapped",[38917]],[[12961,12961],"mapped",[20241]],[[12962,12962],"mapped",[20889]],[[12963,12963],"mapped",[27491]],[[12964,12964],"mapped",[19978]],[[12965,12965],"mapped",[20013]],[[12966,12966],"mapped",[19979]],[[12967,12967],"mapped",[24038]],[[12968,12968],"mapped",[21491]],[[12969,12969],"mapped",[21307]],[[12970,12970],"mapped",[23447]],[[12971,12971],"mapped",[23398]],[[12972,12972],"mapped",[30435]],[[12973,12973],"mapped",[20225]],[[12974,12974],"mapped",[36039]],[[12975,12975],"mapped",[21332]],[[12976,12976],"mapped",[22812]],[[12977,12977],"mapped",[51,54]],[[12978,12978],"mapped",[51,55]],[[12979,12979],"mapped",[51,56]],[[12980,12980],"mapped",[51,57]],[[12981,12981],"mapped",[52,48]],[[12982,12982],"mapped",[52,49]],[[12983,12983],"mapped",[52,50]],[[12984,12984],"mapped",[52,51]],[[12985,12985],"mapped",[52,52]],[[12986,12986],"mapped",[52,53]],[[12987,12987],"mapped",[52,54]],[[12988,12988],"mapped",[52,55]],[[12989,12989],"mapped",[52,56]],[[12990,12990],"mapped",[52,57]],[[12991,12991],"mapped",[53,48]],[[12992,12992],"mapped",[49,26376]],[[12993,12993],"mapped",[50,26376]],[[12994,12994],"mapped",[51,26376]],[[12995,12995],"mapped",[52,26376]],[[12996,12996],"mapped",[53,26376]],[[12997,12997],"mapped",[54,26376]],[[12998,12998],"mapped",[55,26376]],[[12999,12999],"mapped",[56,26376]],[[13000,13000],"mapped",[57,26376]],[[13001,13001],"mapped",[49,48,26376]],[[13002,13002],"mapped",[49,49,26376]],[[13003,13003],"mapped",[49,50,26376]],[[13004,13004],"mapped",[104,103]],[[13005,13005],"mapped",[101,114,103]],[[13006,13006],"mapped",[101,118]],[[13007,13007],"mapped",[108,116,100]],[[13008,13008],"mapped",[12450]],[[13009,13009],"mapped",[12452]],[[13010,13010],"mapped",[12454]],[[13011,13011],"mapped",[12456]],[[13012,13012],"mapped",[12458]],[[13013,13013],"mapped",[12459]],[[13014,13014],"mapped",[12461]],[[13015,13015],"mapped",[12463]],[[13016,13016],"mapped",[12465]],[[13017,13017],"mapped",[12467]],[[13018,13018],"mapped",[12469]],[[13019,13019],"mapped",[12471]],[[13020,13020],"mapped",[12473]],[[13021,13021],"mapped",[12475]],[[13022,13022],"mapped",[12477]],[[13023,13023],"mapped",[12479]],[[13024,13024],"mapped",[12481]],[[13025,13025],"mapped",[12484]],[[13026,13026],"mapped",[12486]],[[13027,13027],"mapped",[12488]],[[13028,13028],"mapped",[12490]],[[13029,13029],"mapped",[12491]],[[13030,13030],"mapped",[12492]],[[13031,13031],"mapped",[12493]],[[13032,13032],"mapped",[12494]],[[13033,13033],"mapped",[12495]],[[13034,13034],"mapped",[12498]],[[13035,13035],"mapped",[12501]],[[13036,13036],"mapped",[12504]],[[13037,13037],"mapped",[12507]],[[13038,13038],"mapped",[12510]],[[13039,13039],"mapped",[12511]],[[13040,13040],"mapped",[12512]],[[13041,13041],"mapped",[12513]],[[13042,13042],"mapped",[12514]],[[13043,13043],"mapped",[12516]],[[13044,13044],"mapped",[12518]],[[13045,13045],"mapped",[12520]],[[13046,13046],"mapped",[12521]],[[13047,13047],"mapped",[12522]],[[13048,13048],"mapped",[12523]],[[13049,13049],"mapped",[12524]],[[13050,13050],"mapped",[12525]],[[13051,13051],"mapped",[12527]],[[13052,13052],"mapped",[12528]],[[13053,13053],"mapped",[12529]],[[13054,13054],"mapped",[12530]],[[13055,13055],"disallowed"],[[13056,13056],"mapped",[12450,12497,12540,12488]],[[13057,13057],"mapped",[12450,12523,12501,12449]],[[13058,13058],"mapped",[12450,12531,12506,12450]],[[13059,13059],"mapped",[12450,12540,12523]],[[13060,13060],"mapped",[12452,12491,12531,12464]],[[13061,13061],"mapped",[12452,12531,12481]],[[13062,13062],"mapped",[12454,12457,12531]],[[13063,13063],"mapped",[12456,12473,12463,12540,12489]],[[13064,13064],"mapped",[12456,12540,12459,12540]],[[13065,13065],"mapped",[12458,12531,12473]],[[13066,13066],"mapped",[12458,12540,12512]],[[13067,13067],"mapped",[12459,12452,12522]],[[13068,13068],"mapped",[12459,12521,12483,12488]],[[13069,13069],"mapped",[12459,12525,12522,12540]],[[13070,13070],"mapped",[12460,12525,12531]],[[13071,13071],"mapped",[12460,12531,12510]],[[13072,13072],"mapped",[12462,12460]],[[13073,13073],"mapped",[12462,12491,12540]],[[13074,13074],"mapped",[12461,12517,12522,12540]],[[13075,13075],"mapped",[12462,12523,12480,12540]],[[13076,13076],"mapped",[12461,12525]],[[13077,13077],"mapped",[12461,12525,12464,12521,12512]],[[13078,13078],"mapped",[12461,12525,12513,12540,12488,12523]],[[13079,13079],"mapped",[12461,12525,12527,12483,12488]],[[13080,13080],"mapped",[12464,12521,12512]],[[13081,13081],"mapped",[12464,12521,12512,12488,12531]],[[13082,13082],"mapped",[12463,12523,12476,12452,12525]],[[13083,13083],"mapped",[12463,12525,12540,12493]],[[13084,13084],"mapped",[12465,12540,12473]],[[13085,13085],"mapped",[12467,12523,12490]],[[13086,13086],"mapped",[12467,12540,12509]],[[13087,13087],"mapped",[12469,12452,12463,12523]],[[13088,13088],"mapped",[12469,12531,12481,12540,12512]],[[13089,13089],"mapped",[12471,12522,12531,12464]],[[13090,13090],"mapped",[12475,12531,12481]],[[13091,13091],"mapped",[12475,12531,12488]],[[13092,13092],"mapped",[12480,12540,12473]],[[13093,13093],"mapped",[12487,12471]],[[13094,13094],"mapped",[12489,12523]],[[13095,13095],"mapped",[12488,12531]],[[13096,13096],"mapped",[12490,12494]],[[13097,13097],"mapped",[12494,12483,12488]],[[13098,13098],"mapped",[12495,12452,12484]],[[13099,13099],"mapped",[12497,12540,12475,12531,12488]],[[13100,13100],"mapped",[12497,12540,12484]],[[13101,13101],"mapped",[12496,12540,12524,12523]],[[13102,13102],"mapped",[12500,12450,12473,12488,12523]],[[13103,13103],"mapped",[12500,12463,12523]],[[13104,13104],"mapped",[12500,12467]],[[13105,13105],"mapped",[12499,12523]],[[13106,13106],"mapped",[12501,12449,12521,12483,12489]],[[13107,13107],"mapped",[12501,12451,12540,12488]],[[13108,13108],"mapped",[12502,12483,12471,12455,12523]],[[13109,13109],"mapped",[12501,12521,12531]],[[13110,13110],"mapped",[12504,12463,12479,12540,12523]],[[13111,13111],"mapped",[12506,12477]],[[13112,13112],"mapped",[12506,12491,12498]],[[13113,13113],"mapped",[12504,12523,12484]],[[13114,13114],"mapped",[12506,12531,12473]],[[13115,13115],"mapped",[12506,12540,12472]],[[13116,13116],"mapped",[12505,12540,12479]],[[13117,13117],"mapped",[12509,12452,12531,12488]],[[13118,13118],"mapped",[12508,12523,12488]],[[13119,13119],"mapped",[12507,12531]],[[13120,13120],"mapped",[12509,12531,12489]],[[13121,13121],"mapped",[12507,12540,12523]],[[13122,13122],"mapped",[12507,12540,12531]],[[13123,13123],"mapped",[12510,12452,12463,12525]],[[13124,13124],"mapped",[12510,12452,12523]],[[13125,13125],"mapped",[12510,12483,12495]],[[13126,13126],"mapped",[12510,12523,12463]],[[13127,13127],"mapped",[12510,12531,12471,12519,12531]],[[13128,13128],"mapped",[12511,12463,12525,12531]],[[13129,13129],"mapped",[12511,12522]],[[13130,13130],"mapped",[12511,12522,12496,12540,12523]],[[13131,13131],"mapped",[12513,12460]],[[13132,13132],"mapped",[12513,12460,12488,12531]],[[13133,13133],"mapped",[12513,12540,12488,12523]],[[13134,13134],"mapped",[12516,12540,12489]],[[13135,13135],"mapped",[12516,12540,12523]],[[13136,13136],"mapped",[12518,12450,12531]],[[13137,13137],"mapped",[12522,12483,12488,12523]],[[13138,13138],"mapped",[12522,12521]],[[13139,13139],"mapped",[12523,12500,12540]],[[13140,13140],"mapped",[12523,12540,12502,12523]],[[13141,13141],"mapped",[12524,12512]],[[13142,13142],"mapped",[12524,12531,12488,12466,12531]],[[13143,13143],"mapped",[12527,12483,12488]],[[13144,13144],"mapped",[48,28857]],[[13145,13145],"mapped",[49,28857]],[[13146,13146],"mapped",[50,28857]],[[13147,13147],"mapped",[51,28857]],[[13148,13148],"mapped",[52,28857]],[[13149,13149],"mapped",[53,28857]],[[13150,13150],"mapped",[54,28857]],[[13151,13151],"mapped",[55,28857]],[[13152,13152],"mapped",[56,28857]],[[13153,13153],"mapped",[57,28857]],[[13154,13154],"mapped",[49,48,28857]],[[13155,13155],"mapped",[49,49,28857]],[[13156,13156],"mapped",[49,50,28857]],[[13157,13157],"mapped",[49,51,28857]],[[13158,13158],"mapped",[49,52,28857]],[[13159,13159],"mapped",[49,53,28857]],[[13160,13160],"mapped",[49,54,28857]],[[13161,13161],"mapped",[49,55,28857]],[[13162,13162],"mapped",[49,56,28857]],[[13163,13163],"mapped",[49,57,28857]],[[13164,13164],"mapped",[50,48,28857]],[[13165,13165],"mapped",[50,49,28857]],[[13166,13166],"mapped",[50,50,28857]],[[13167,13167],"mapped",[50,51,28857]],[[13168,13168],"mapped",[50,52,28857]],[[13169,13169],"mapped",[104,112,97]],[[13170,13170],"mapped",[100,97]],[[13171,13171],"mapped",[97,117]],[[13172,13172],"mapped",[98,97,114]],[[13173,13173],"mapped",[111,118]],[[13174,13174],"mapped",[112,99]],[[13175,13175],"mapped",[100,109]],[[13176,13176],"mapped",[100,109,50]],[[13177,13177],"mapped",[100,109,51]],[[13178,13178],"mapped",[105,117]],[[13179,13179],"mapped",[24179,25104]],[[13180,13180],"mapped",[26157,21644]],[[13181,13181],"mapped",[22823,27491]],[[13182,13182],"mapped",[26126,27835]],[[13183,13183],"mapped",[26666,24335,20250,31038]],[[13184,13184],"mapped",[112,97]],[[13185,13185],"mapped",[110,97]],[[13186,13186],"mapped",[956,97]],[[13187,13187],"mapped",[109,97]],[[13188,13188],"mapped",[107,97]],[[13189,13189],"mapped",[107,98]],[[13190,13190],"mapped",[109,98]],[[13191,13191],"mapped",[103,98]],[[13192,13192],"mapped",[99,97,108]],[[13193,13193],"mapped",[107,99,97,108]],[[13194,13194],"mapped",[112,102]],[[13195,13195],"mapped",[110,102]],[[13196,13196],"mapped",[956,102]],[[13197,13197],"mapped",[956,103]],[[13198,13198],"mapped",[109,103]],[[13199,13199],"mapped",[107,103]],[[13200,13200],"mapped",[104,122]],[[13201,13201],"mapped",[107,104,122]],[[13202,13202],"mapped",[109,104,122]],[[13203,13203],"mapped",[103,104,122]],[[13204,13204],"mapped",[116,104,122]],[[13205,13205],"mapped",[956,108]],[[13206,13206],"mapped",[109,108]],[[13207,13207],"mapped",[100,108]],[[13208,13208],"mapped",[107,108]],[[13209,13209],"mapped",[102,109]],[[13210,13210],"mapped",[110,109]],[[13211,13211],"mapped",[956,109]],[[13212,13212],"mapped",[109,109]],[[13213,13213],"mapped",[99,109]],[[13214,13214],"mapped",[107,109]],[[13215,13215],"mapped",[109,109,50]],[[13216,13216],"mapped",[99,109,50]],[[13217,13217],"mapped",[109,50]],[[13218,13218],"mapped",[107,109,50]],[[13219,13219],"mapped",[109,109,51]],[[13220,13220],"mapped",[99,109,51]],[[13221,13221],"mapped",[109,51]],[[13222,13222],"mapped",[107,109,51]],[[13223,13223],"mapped",[109,8725,115]],[[13224,13224],"mapped",[109,8725,115,50]],[[13225,13225],"mapped",[112,97]],[[13226,13226],"mapped",[107,112,97]],[[13227,13227],"mapped",[109,112,97]],[[13228,13228],"mapped",[103,112,97]],[[13229,13229],"mapped",[114,97,100]],[[13230,13230],"mapped",[114,97,100,8725,115]],[[13231,13231],"mapped",[114,97,100,8725,115,50]],[[13232,13232],"mapped",[112,115]],[[13233,13233],"mapped",[110,115]],[[13234,13234],"mapped",[956,115]],[[13235,13235],"mapped",[109,115]],[[13236,13236],"mapped",[112,118]],[[13237,13237],"mapped",[110,118]],[[13238,13238],"mapped",[956,118]],[[13239,13239],"mapped",[109,118]],[[13240,13240],"mapped",[107,118]],[[13241,13241],"mapped",[109,118]],[[13242,13242],"mapped",[112,119]],[[13243,13243],"mapped",[110,119]],[[13244,13244],"mapped",[956,119]],[[13245,13245],"mapped",[109,119]],[[13246,13246],"mapped",[107,119]],[[13247,13247],"mapped",[109,119]],[[13248,13248],"mapped",[107,969]],[[13249,13249],"mapped",[109,969]],[[13250,13250],"disallowed"],[[13251,13251],"mapped",[98,113]],[[13252,13252],"mapped",[99,99]],[[13253,13253],"mapped",[99,100]],[[13254,13254],"mapped",[99,8725,107,103]],[[13255,13255],"disallowed"],[[13256,13256],"mapped",[100,98]],[[13257,13257],"mapped",[103,121]],[[13258,13258],"mapped",[104,97]],[[13259,13259],"mapped",[104,112]],[[13260,13260],"mapped",[105,110]],[[13261,13261],"mapped",[107,107]],[[13262,13262],"mapped",[107,109]],[[13263,13263],"mapped",[107,116]],[[13264,13264],"mapped",[108,109]],[[13265,13265],"mapped",[108,110]],[[13266,13266],"mapped",[108,111,103]],[[13267,13267],"mapped",[108,120]],[[13268,13268],"mapped",[109,98]],[[13269,13269],"mapped",[109,105,108]],[[13270,13270],"mapped",[109,111,108]],[[13271,13271],"mapped",[112,104]],[[13272,13272],"disallowed"],[[13273,13273],"mapped",[112,112,109]],[[13274,13274],"mapped",[112,114]],[[13275,13275],"mapped",[115,114]],[[13276,13276],"mapped",[115,118]],[[13277,13277],"mapped",[119,98]],[[13278,13278],"mapped",[118,8725,109]],[[13279,13279],"mapped",[97,8725,109]],[[13280,13280],"mapped",[49,26085]],[[13281,13281],"mapped",[50,26085]],[[13282,13282],"mapped",[51,26085]],[[13283,13283],"mapped",[52,26085]],[[13284,13284],"mapped",[53,26085]],[[13285,13285],"mapped",[54,26085]],[[13286,13286],"mapped",[55,26085]],[[13287,13287],"mapped",[56,26085]],[[13288,13288],"mapped",[57,26085]],[[13289,13289],"mapped",[49,48,26085]],[[13290,13290],"mapped",[49,49,26085]],[[13291,13291],"mapped",[49,50,26085]],[[13292,13292],"mapped",[49,51,26085]],[[13293,13293],"mapped",[49,52,26085]],[[13294,13294],"mapped",[49,53,26085]],[[13295,13295],"mapped",[49,54,26085]],[[13296,13296],"mapped",[49,55,26085]],[[13297,13297],"mapped",[49,56,26085]],[[13298,13298],"mapped",[49,57,26085]],[[13299,13299],"mapped",[50,48,26085]],[[13300,13300],"mapped",[50,49,26085]],[[13301,13301],"mapped",[50,50,26085]],[[13302,13302],"mapped",[50,51,26085]],[[13303,13303],"mapped",[50,52,26085]],[[13304,13304],"mapped",[50,53,26085]],[[13305,13305],"mapped",[50,54,26085]],[[13306,13306],"mapped",[50,55,26085]],[[13307,13307],"mapped",[50,56,26085]],[[13308,13308],"mapped",[50,57,26085]],[[13309,13309],"mapped",[51,48,26085]],[[13310,13310],"mapped",[51,49,26085]],[[13311,13311],"mapped",[103,97,108]],[[13312,19893],"valid"],[[19894,19903],"disallowed"],[[19904,19967],"valid",[],"NV8"],[[19968,40869],"valid"],[[40870,40891],"valid"],[[40892,40899],"valid"],[[40900,40907],"valid"],[[40908,40908],"valid"],[[40909,40917],"valid"],[[40918,40959],"disallowed"],[[40960,42124],"valid"],[[42125,42127],"disallowed"],[[42128,42145],"valid",[],"NV8"],[[42146,42147],"valid",[],"NV8"],[[42148,42163],"valid",[],"NV8"],[[42164,42164],"valid",[],"NV8"],[[42165,42176],"valid",[],"NV8"],[[42177,42177],"valid",[],"NV8"],[[42178,42180],"valid",[],"NV8"],[[42181,42181],"valid",[],"NV8"],[[42182,42182],"valid",[],"NV8"],[[42183,42191],"disallowed"],[[42192,42237],"valid"],[[42238,42239],"valid",[],"NV8"],[[42240,42508],"valid"],[[42509,42511],"valid",[],"NV8"],[[42512,42539],"valid"],[[42540,42559],"disallowed"],[[42560,42560],"mapped",[42561]],[[42561,42561],"valid"],[[42562,42562],"mapped",[42563]],[[42563,42563],"valid"],[[42564,42564],"mapped",[42565]],[[42565,42565],"valid"],[[42566,42566],"mapped",[42567]],[[42567,42567],"valid"],[[42568,42568],"mapped",[42569]],[[42569,42569],"valid"],[[42570,42570],"mapped",[42571]],[[42571,42571],"valid"],[[42572,42572],"mapped",[42573]],[[42573,42573],"valid"],[[42574,42574],"mapped",[42575]],[[42575,42575],"valid"],[[42576,42576],"mapped",[42577]],[[42577,42577],"valid"],[[42578,42578],"mapped",[42579]],[[42579,42579],"valid"],[[42580,42580],"mapped",[42581]],[[42581,42581],"valid"],[[42582,42582],"mapped",[42583]],[[42583,42583],"valid"],[[42584,42584],"mapped",[42585]],[[42585,42585],"valid"],[[42586,42586],"mapped",[42587]],[[42587,42587],"valid"],[[42588,42588],"mapped",[42589]],[[42589,42589],"valid"],[[42590,42590],"mapped",[42591]],[[42591,42591],"valid"],[[42592,42592],"mapped",[42593]],[[42593,42593],"valid"],[[42594,42594],"mapped",[42595]],[[42595,42595],"valid"],[[42596,42596],"mapped",[42597]],[[42597,42597],"valid"],[[42598,42598],"mapped",[42599]],[[42599,42599],"valid"],[[42600,42600],"mapped",[42601]],[[42601,42601],"valid"],[[42602,42602],"mapped",[42603]],[[42603,42603],"valid"],[[42604,42604],"mapped",[42605]],[[42605,42607],"valid"],[[42608,42611],"valid",[],"NV8"],[[42612,42619],"valid"],[[42620,42621],"valid"],[[42622,42622],"valid",[],"NV8"],[[42623,42623],"valid"],[[42624,42624],"mapped",[42625]],[[42625,42625],"valid"],[[42626,42626],"mapped",[42627]],[[42627,42627],"valid"],[[42628,42628],"mapped",[42629]],[[42629,42629],"valid"],[[42630,42630],"mapped",[42631]],[[42631,42631],"valid"],[[42632,42632],"mapped",[42633]],[[42633,42633],"valid"],[[42634,42634],"mapped",[42635]],[[42635,42635],"valid"],[[42636,42636],"mapped",[42637]],[[42637,42637],"valid"],[[42638,42638],"mapped",[42639]],[[42639,42639],"valid"],[[42640,42640],"mapped",[42641]],[[42641,42641],"valid"],[[42642,42642],"mapped",[42643]],[[42643,42643],"valid"],[[42644,42644],"mapped",[42645]],[[42645,42645],"valid"],[[42646,42646],"mapped",[42647]],[[42647,42647],"valid"],[[42648,42648],"mapped",[42649]],[[42649,42649],"valid"],[[42650,42650],"mapped",[42651]],[[42651,42651],"valid"],[[42652,42652],"mapped",[1098]],[[42653,42653],"mapped",[1100]],[[42654,42654],"valid"],[[42655,42655],"valid"],[[42656,42725],"valid"],[[42726,42735],"valid",[],"NV8"],[[42736,42737],"valid"],[[42738,42743],"valid",[],"NV8"],[[42744,42751],"disallowed"],[[42752,42774],"valid",[],"NV8"],[[42775,42778],"valid"],[[42779,42783],"valid"],[[42784,42785],"valid",[],"NV8"],[[42786,42786],"mapped",[42787]],[[42787,42787],"valid"],[[42788,42788],"mapped",[42789]],[[42789,42789],"valid"],[[42790,42790],"mapped",[42791]],[[42791,42791],"valid"],[[42792,42792],"mapped",[42793]],[[42793,42793],"valid"],[[42794,42794],"mapped",[42795]],[[42795,42795],"valid"],[[42796,42796],"mapped",[42797]],[[42797,42797],"valid"],[[42798,42798],"mapped",[42799]],[[42799,42801],"valid"],[[42802,42802],"mapped",[42803]],[[42803,42803],"valid"],[[42804,42804],"mapped",[42805]],[[42805,42805],"valid"],[[42806,42806],"mapped",[42807]],[[42807,42807],"valid"],[[42808,42808],"mapped",[42809]],[[42809,42809],"valid"],[[42810,42810],"mapped",[42811]],[[42811,42811],"valid"],[[42812,42812],"mapped",[42813]],[[42813,42813],"valid"],[[42814,42814],"mapped",[42815]],[[42815,42815],"valid"],[[42816,42816],"mapped",[42817]],[[42817,42817],"valid"],[[42818,42818],"mapped",[42819]],[[42819,42819],"valid"],[[42820,42820],"mapped",[42821]],[[42821,42821],"valid"],[[42822,42822],"mapped",[42823]],[[42823,42823],"valid"],[[42824,42824],"mapped",[42825]],[[42825,42825],"valid"],[[42826,42826],"mapped",[42827]],[[42827,42827],"valid"],[[42828,42828],"mapped",[42829]],[[42829,42829],"valid"],[[42830,42830],"mapped",[42831]],[[42831,42831],"valid"],[[42832,42832],"mapped",[42833]],[[42833,42833],"valid"],[[42834,42834],"mapped",[42835]],[[42835,42835],"valid"],[[42836,42836],"mapped",[42837]],[[42837,42837],"valid"],[[42838,42838],"mapped",[42839]],[[42839,42839],"valid"],[[42840,42840],"mapped",[42841]],[[42841,42841],"valid"],[[42842,42842],"mapped",[42843]],[[42843,42843],"valid"],[[42844,42844],"mapped",[42845]],[[42845,42845],"valid"],[[42846,42846],"mapped",[42847]],[[42847,42847],"valid"],[[42848,42848],"mapped",[42849]],[[42849,42849],"valid"],[[42850,42850],"mapped",[42851]],[[42851,42851],"valid"],[[42852,42852],"mapped",[42853]],[[42853,42853],"valid"],[[42854,42854],"mapped",[42855]],[[42855,42855],"valid"],[[42856,42856],"mapped",[42857]],[[42857,42857],"valid"],[[42858,42858],"mapped",[42859]],[[42859,42859],"valid"],[[42860,42860],"mapped",[42861]],[[42861,42861],"valid"],[[42862,42862],"mapped",[42863]],[[42863,42863],"valid"],[[42864,42864],"mapped",[42863]],[[42865,42872],"valid"],[[42873,42873],"mapped",[42874]],[[42874,42874],"valid"],[[42875,42875],"mapped",[42876]],[[42876,42876],"valid"],[[42877,42877],"mapped",[7545]],[[42878,42878],"mapped",[42879]],[[42879,42879],"valid"],[[42880,42880],"mapped",[42881]],[[42881,42881],"valid"],[[42882,42882],"mapped",[42883]],[[42883,42883],"valid"],[[42884,42884],"mapped",[42885]],[[42885,42885],"valid"],[[42886,42886],"mapped",[42887]],[[42887,42888],"valid"],[[42889,42890],"valid",[],"NV8"],[[42891,42891],"mapped",[42892]],[[42892,42892],"valid"],[[42893,42893],"mapped",[613]],[[42894,42894],"valid"],[[42895,42895],"valid"],[[42896,42896],"mapped",[42897]],[[42897,42897],"valid"],[[42898,42898],"mapped",[42899]],[[42899,42899],"valid"],[[42900,42901],"valid"],[[42902,42902],"mapped",[42903]],[[42903,42903],"valid"],[[42904,42904],"mapped",[42905]],[[42905,42905],"valid"],[[42906,42906],"mapped",[42907]],[[42907,42907],"valid"],[[42908,42908],"mapped",[42909]],[[42909,42909],"valid"],[[42910,42910],"mapped",[42911]],[[42911,42911],"valid"],[[42912,42912],"mapped",[42913]],[[42913,42913],"valid"],[[42914,42914],"mapped",[42915]],[[42915,42915],"valid"],[[42916,42916],"mapped",[42917]],[[42917,42917],"valid"],[[42918,42918],"mapped",[42919]],[[42919,42919],"valid"],[[42920,42920],"mapped",[42921]],[[42921,42921],"valid"],[[42922,42922],"mapped",[614]],[[42923,42923],"mapped",[604]],[[42924,42924],"mapped",[609]],[[42925,42925],"mapped",[620]],[[42926,42927],"disallowed"],[[42928,42928],"mapped",[670]],[[42929,42929],"mapped",[647]],[[42930,42930],"mapped",[669]],[[42931,42931],"mapped",[43859]],[[42932,42932],"mapped",[42933]],[[42933,42933],"valid"],[[42934,42934],"mapped",[42935]],[[42935,42935],"valid"],[[42936,42998],"disallowed"],[[42999,42999],"valid"],[[43000,43000],"mapped",[295]],[[43001,43001],"mapped",[339]],[[43002,43002],"valid"],[[43003,43007],"valid"],[[43008,43047],"valid"],[[43048,43051],"valid",[],"NV8"],[[43052,43055],"disallowed"],[[43056,43065],"valid",[],"NV8"],[[43066,43071],"disallowed"],[[43072,43123],"valid"],[[43124,43127],"valid",[],"NV8"],[[43128,43135],"disallowed"],[[43136,43204],"valid"],[[43205,43213],"disallowed"],[[43214,43215],"valid",[],"NV8"],[[43216,43225],"valid"],[[43226,43231],"disallowed"],[[43232,43255],"valid"],[[43256,43258],"valid",[],"NV8"],[[43259,43259],"valid"],[[43260,43260],"valid",[],"NV8"],[[43261,43261],"valid"],[[43262,43263],"disallowed"],[[43264,43309],"valid"],[[43310,43311],"valid",[],"NV8"],[[43312,43347],"valid"],[[43348,43358],"disallowed"],[[43359,43359],"valid",[],"NV8"],[[43360,43388],"valid",[],"NV8"],[[43389,43391],"disallowed"],[[43392,43456],"valid"],[[43457,43469],"valid",[],"NV8"],[[43470,43470],"disallowed"],[[43471,43481],"valid"],[[43482,43485],"disallowed"],[[43486,43487],"valid",[],"NV8"],[[43488,43518],"valid"],[[43519,43519],"disallowed"],[[43520,43574],"valid"],[[43575,43583],"disallowed"],[[43584,43597],"valid"],[[43598,43599],"disallowed"],[[43600,43609],"valid"],[[43610,43611],"disallowed"],[[43612,43615],"valid",[],"NV8"],[[43616,43638],"valid"],[[43639,43641],"valid",[],"NV8"],[[43642,43643],"valid"],[[43644,43647],"valid"],[[43648,43714],"valid"],[[43715,43738],"disallowed"],[[43739,43741],"valid"],[[43742,43743],"valid",[],"NV8"],[[43744,43759],"valid"],[[43760,43761],"valid",[],"NV8"],[[43762,43766],"valid"],[[43767,43776],"disallowed"],[[43777,43782],"valid"],[[43783,43784],"disallowed"],[[43785,43790],"valid"],[[43791,43792],"disallowed"],[[43793,43798],"valid"],[[43799,43807],"disallowed"],[[43808,43814],"valid"],[[43815,43815],"disallowed"],[[43816,43822],"valid"],[[43823,43823],"disallowed"],[[43824,43866],"valid"],[[43867,43867],"valid",[],"NV8"],[[43868,43868],"mapped",[42791]],[[43869,43869],"mapped",[43831]],[[43870,43870],"mapped",[619]],[[43871,43871],"mapped",[43858]],[[43872,43875],"valid"],[[43876,43877],"valid"],[[43878,43887],"disallowed"],[[43888,43888],"mapped",[5024]],[[43889,43889],"mapped",[5025]],[[43890,43890],"mapped",[5026]],[[43891,43891],"mapped",[5027]],[[43892,43892],"mapped",[5028]],[[43893,43893],"mapped",[5029]],[[43894,43894],"mapped",[5030]],[[43895,43895],"mapped",[5031]],[[43896,43896],"mapped",[5032]],[[43897,43897],"mapped",[5033]],[[43898,43898],"mapped",[5034]],[[43899,43899],"mapped",[5035]],[[43900,43900],"mapped",[5036]],[[43901,43901],"mapped",[5037]],[[43902,43902],"mapped",[5038]],[[43903,43903],"mapped",[5039]],[[43904,43904],"mapped",[5040]],[[43905,43905],"mapped",[5041]],[[43906,43906],"mapped",[5042]],[[43907,43907],"mapped",[5043]],[[43908,43908],"mapped",[5044]],[[43909,43909],"mapped",[5045]],[[43910,43910],"mapped",[5046]],[[43911,43911],"mapped",[5047]],[[43912,43912],"mapped",[5048]],[[43913,43913],"mapped",[5049]],[[43914,43914],"mapped",[5050]],[[43915,43915],"mapped",[5051]],[[43916,43916],"mapped",[5052]],[[43917,43917],"mapped",[5053]],[[43918,43918],"mapped",[5054]],[[43919,43919],"mapped",[5055]],[[43920,43920],"mapped",[5056]],[[43921,43921],"mapped",[5057]],[[43922,43922],"mapped",[5058]],[[43923,43923],"mapped",[5059]],[[43924,43924],"mapped",[5060]],[[43925,43925],"mapped",[5061]],[[43926,43926],"mapped",[5062]],[[43927,43927],"mapped",[5063]],[[43928,43928],"mapped",[5064]],[[43929,43929],"mapped",[5065]],[[43930,43930],"mapped",[5066]],[[43931,43931],"mapped",[5067]],[[43932,43932],"mapped",[5068]],[[43933,43933],"mapped",[5069]],[[43934,43934],"mapped",[5070]],[[43935,43935],"mapped",[5071]],[[43936,43936],"mapped",[5072]],[[43937,43937],"mapped",[5073]],[[43938,43938],"mapped",[5074]],[[43939,43939],"mapped",[5075]],[[43940,43940],"mapped",[5076]],[[43941,43941],"mapped",[5077]],[[43942,43942],"mapped",[5078]],[[43943,43943],"mapped",[5079]],[[43944,43944],"mapped",[5080]],[[43945,43945],"mapped",[5081]],[[43946,43946],"mapped",[5082]],[[43947,43947],"mapped",[5083]],[[43948,43948],"mapped",[5084]],[[43949,43949],"mapped",[5085]],[[43950,43950],"mapped",[5086]],[[43951,43951],"mapped",[5087]],[[43952,43952],"mapped",[5088]],[[43953,43953],"mapped",[5089]],[[43954,43954],"mapped",[5090]],[[43955,43955],"mapped",[5091]],[[43956,43956],"mapped",[5092]],[[43957,43957],"mapped",[5093]],[[43958,43958],"mapped",[5094]],[[43959,43959],"mapped",[5095]],[[43960,43960],"mapped",[5096]],[[43961,43961],"mapped",[5097]],[[43962,43962],"mapped",[5098]],[[43963,43963],"mapped",[5099]],[[43964,43964],"mapped",[5100]],[[43965,43965],"mapped",[5101]],[[43966,43966],"mapped",[5102]],[[43967,43967],"mapped",[5103]],[[43968,44010],"valid"],[[44011,44011],"valid",[],"NV8"],[[44012,44013],"valid"],[[44014,44015],"disallowed"],[[44016,44025],"valid"],[[44026,44031],"disallowed"],[[44032,55203],"valid"],[[55204,55215],"disallowed"],[[55216,55238],"valid",[],"NV8"],[[55239,55242],"disallowed"],[[55243,55291],"valid",[],"NV8"],[[55292,55295],"disallowed"],[[55296,57343],"disallowed"],[[57344,63743],"disallowed"],[[63744,63744],"mapped",[35912]],[[63745,63745],"mapped",[26356]],[[63746,63746],"mapped",[36554]],[[63747,63747],"mapped",[36040]],[[63748,63748],"mapped",[28369]],[[63749,63749],"mapped",[20018]],[[63750,63750],"mapped",[21477]],[[63751,63752],"mapped",[40860]],[[63753,63753],"mapped",[22865]],[[63754,63754],"mapped",[37329]],[[63755,63755],"mapped",[21895]],[[63756,63756],"mapped",[22856]],[[63757,63757],"mapped",[25078]],[[63758,63758],"mapped",[30313]],[[63759,63759],"mapped",[32645]],[[63760,63760],"mapped",[34367]],[[63761,63761],"mapped",[34746]],[[63762,63762],"mapped",[35064]],[[63763,63763],"mapped",[37007]],[[63764,63764],"mapped",[27138]],[[63765,63765],"mapped",[27931]],[[63766,63766],"mapped",[28889]],[[63767,63767],"mapped",[29662]],[[63768,63768],"mapped",[33853]],[[63769,63769],"mapped",[37226]],[[63770,63770],"mapped",[39409]],[[63771,63771],"mapped",[20098]],[[63772,63772],"mapped",[21365]],[[63773,63773],"mapped",[27396]],[[63774,63774],"mapped",[29211]],[[63775,63775],"mapped",[34349]],[[63776,63776],"mapped",[40478]],[[63777,63777],"mapped",[23888]],[[63778,63778],"mapped",[28651]],[[63779,63779],"mapped",[34253]],[[63780,63780],"mapped",[35172]],[[63781,63781],"mapped",[25289]],[[63782,63782],"mapped",[33240]],[[63783,63783],"mapped",[34847]],[[63784,63784],"mapped",[24266]],[[63785,63785],"mapped",[26391]],[[63786,63786],"mapped",[28010]],[[63787,63787],"mapped",[29436]],[[63788,63788],"mapped",[37070]],[[63789,63789],"mapped",[20358]],[[63790,63790],"mapped",[20919]],[[63791,63791],"mapped",[21214]],[[63792,63792],"mapped",[25796]],[[63793,63793],"mapped",[27347]],[[63794,63794],"mapped",[29200]],[[63795,63795],"mapped",[30439]],[[63796,63796],"mapped",[32769]],[[63797,63797],"mapped",[34310]],[[63798,63798],"mapped",[34396]],[[63799,63799],"mapped",[36335]],[[63800,63800],"mapped",[38706]],[[63801,63801],"mapped",[39791]],[[63802,63802],"mapped",[40442]],[[63803,63803],"mapped",[30860]],[[63804,63804],"mapped",[31103]],[[63805,63805],"mapped",[32160]],[[63806,63806],"mapped",[33737]],[[63807,63807],"mapped",[37636]],[[63808,63808],"mapped",[40575]],[[63809,63809],"mapped",[35542]],[[63810,63810],"mapped",[22751]],[[63811,63811],"mapped",[24324]],[[63812,63812],"mapped",[31840]],[[63813,63813],"mapped",[32894]],[[63814,63814],"mapped",[29282]],[[63815,63815],"mapped",[30922]],[[63816,63816],"mapped",[36034]],[[63817,63817],"mapped",[38647]],[[63818,63818],"mapped",[22744]],[[63819,63819],"mapped",[23650]],[[63820,63820],"mapped",[27155]],[[63821,63821],"mapped",[28122]],[[63822,63822],"mapped",[28431]],[[63823,63823],"mapped",[32047]],[[63824,63824],"mapped",[32311]],[[63825,63825],"mapped",[38475]],[[63826,63826],"mapped",[21202]],[[63827,63827],"mapped",[32907]],[[63828,63828],"mapped",[20956]],[[63829,63829],"mapped",[20940]],[[63830,63830],"mapped",[31260]],[[63831,63831],"mapped",[32190]],[[63832,63832],"mapped",[33777]],[[63833,63833],"mapped",[38517]],[[63834,63834],"mapped",[35712]],[[63835,63835],"mapped",[25295]],[[63836,63836],"mapped",[27138]],[[63837,63837],"mapped",[35582]],[[63838,63838],"mapped",[20025]],[[63839,63839],"mapped",[23527]],[[63840,63840],"mapped",[24594]],[[63841,63841],"mapped",[29575]],[[63842,63842],"mapped",[30064]],[[63843,63843],"mapped",[21271]],[[63844,63844],"mapped",[30971]],[[63845,63845],"mapped",[20415]],[[63846,63846],"mapped",[24489]],[[63847,63847],"mapped",[19981]],[[63848,63848],"mapped",[27852]],[[63849,63849],"mapped",[25976]],[[63850,63850],"mapped",[32034]],[[63851,63851],"mapped",[21443]],[[63852,63852],"mapped",[22622]],[[63853,63853],"mapped",[30465]],[[63854,63854],"mapped",[33865]],[[63855,63855],"mapped",[35498]],[[63856,63856],"mapped",[27578]],[[63857,63857],"mapped",[36784]],[[63858,63858],"mapped",[27784]],[[63859,63859],"mapped",[25342]],[[63860,63860],"mapped",[33509]],[[63861,63861],"mapped",[25504]],[[63862,63862],"mapped",[30053]],[[63863,63863],"mapped",[20142]],[[63864,63864],"mapped",[20841]],[[63865,63865],"mapped",[20937]],[[63866,63866],"mapped",[26753]],[[63867,63867],"mapped",[31975]],[[63868,63868],"mapped",[33391]],[[63869,63869],"mapped",[35538]],[[63870,63870],"mapped",[37327]],[[63871,63871],"mapped",[21237]],[[63872,63872],"mapped",[21570]],[[63873,63873],"mapped",[22899]],[[63874,63874],"mapped",[24300]],[[63875,63875],"mapped",[26053]],[[63876,63876],"mapped",[28670]],[[63877,63877],"mapped",[31018]],[[63878,63878],"mapped",[38317]],[[63879,63879],"mapped",[39530]],[[63880,63880],"mapped",[40599]],[[63881,63881],"mapped",[40654]],[[63882,63882],"mapped",[21147]],[[63883,63883],"mapped",[26310]],[[63884,63884],"mapped",[27511]],[[63885,63885],"mapped",[36706]],[[63886,63886],"mapped",[24180]],[[63887,63887],"mapped",[24976]],[[63888,63888],"mapped",[25088]],[[63889,63889],"mapped",[25754]],[[63890,63890],"mapped",[28451]],[[63891,63891],"mapped",[29001]],[[63892,63892],"mapped",[29833]],[[63893,63893],"mapped",[31178]],[[63894,63894],"mapped",[32244]],[[63895,63895],"mapped",[32879]],[[63896,63896],"mapped",[36646]],[[63897,63897],"mapped",[34030]],[[63898,63898],"mapped",[36899]],[[63899,63899],"mapped",[37706]],[[63900,63900],"mapped",[21015]],[[63901,63901],"mapped",[21155]],[[63902,63902],"mapped",[21693]],[[63903,63903],"mapped",[28872]],[[63904,63904],"mapped",[35010]],[[63905,63905],"mapped",[35498]],[[63906,63906],"mapped",[24265]],[[63907,63907],"mapped",[24565]],[[63908,63908],"mapped",[25467]],[[63909,63909],"mapped",[27566]],[[63910,63910],"mapped",[31806]],[[63911,63911],"mapped",[29557]],[[63912,63912],"mapped",[20196]],[[63913,63913],"mapped",[22265]],[[63914,63914],"mapped",[23527]],[[63915,63915],"mapped",[23994]],[[63916,63916],"mapped",[24604]],[[63917,63917],"mapped",[29618]],[[63918,63918],"mapped",[29801]],[[63919,63919],"mapped",[32666]],[[63920,63920],"mapped",[32838]],[[63921,63921],"mapped",[37428]],[[63922,63922],"mapped",[38646]],[[63923,63923],"mapped",[38728]],[[63924,63924],"mapped",[38936]],[[63925,63925],"mapped",[20363]],[[63926,63926],"mapped",[31150]],[[63927,63927],"mapped",[37300]],[[63928,63928],"mapped",[38584]],[[63929,63929],"mapped",[24801]],[[63930,63930],"mapped",[20102]],[[63931,63931],"mapped",[20698]],[[63932,63932],"mapped",[23534]],[[63933,63933],"mapped",[23615]],[[63934,63934],"mapped",[26009]],[[63935,63935],"mapped",[27138]],[[63936,63936],"mapped",[29134]],[[63937,63937],"mapped",[30274]],[[63938,63938],"mapped",[34044]],[[63939,63939],"mapped",[36988]],[[63940,63940],"mapped",[40845]],[[63941,63941],"mapped",[26248]],[[63942,63942],"mapped",[38446]],[[63943,63943],"mapped",[21129]],[[63944,63944],"mapped",[26491]],[[63945,63945],"mapped",[26611]],[[63946,63946],"mapped",[27969]],[[63947,63947],"mapped",[28316]],[[63948,63948],"mapped",[29705]],[[63949,63949],"mapped",[30041]],[[63950,63950],"mapped",[30827]],[[63951,63951],"mapped",[32016]],[[63952,63952],"mapped",[39006]],[[63953,63953],"mapped",[20845]],[[63954,63954],"mapped",[25134]],[[63955,63955],"mapped",[38520]],[[63956,63956],"mapped",[20523]],[[63957,63957],"mapped",[23833]],[[63958,63958],"mapped",[28138]],[[63959,63959],"mapped",[36650]],[[63960,63960],"mapped",[24459]],[[63961,63961],"mapped",[24900]],[[63962,63962],"mapped",[26647]],[[63963,63963],"mapped",[29575]],[[63964,63964],"mapped",[38534]],[[63965,63965],"mapped",[21033]],[[63966,63966],"mapped",[21519]],[[63967,63967],"mapped",[23653]],[[63968,63968],"mapped",[26131]],[[63969,63969],"mapped",[26446]],[[63970,63970],"mapped",[26792]],[[63971,63971],"mapped",[27877]],[[63972,63972],"mapped",[29702]],[[63973,63973],"mapped",[30178]],[[63974,63974],"mapped",[32633]],[[63975,63975],"mapped",[35023]],[[63976,63976],"mapped",[35041]],[[63977,63977],"mapped",[37324]],[[63978,63978],"mapped",[38626]],[[63979,63979],"mapped",[21311]],[[63980,63980],"mapped",[28346]],[[63981,63981],"mapped",[21533]],[[63982,63982],"mapped",[29136]],[[63983,63983],"mapped",[29848]],[[63984,63984],"mapped",[34298]],[[63985,63985],"mapped",[38563]],[[63986,63986],"mapped",[40023]],[[63987,63987],"mapped",[40607]],[[63988,63988],"mapped",[26519]],[[63989,63989],"mapped",[28107]],[[63990,63990],"mapped",[33256]],[[63991,63991],"mapped",[31435]],[[63992,63992],"mapped",[31520]],[[63993,63993],"mapped",[31890]],[[63994,63994],"mapped",[29376]],[[63995,63995],"mapped",[28825]],[[63996,63996],"mapped",[35672]],[[63997,63997],"mapped",[20160]],[[63998,63998],"mapped",[33590]],[[63999,63999],"mapped",[21050]],[[64000,64000],"mapped",[20999]],[[64001,64001],"mapped",[24230]],[[64002,64002],"mapped",[25299]],[[64003,64003],"mapped",[31958]],[[64004,64004],"mapped",[23429]],[[64005,64005],"mapped",[27934]],[[64006,64006],"mapped",[26292]],[[64007,64007],"mapped",[36667]],[[64008,64008],"mapped",[34892]],[[64009,64009],"mapped",[38477]],[[64010,64010],"mapped",[35211]],[[64011,64011],"mapped",[24275]],[[64012,64012],"mapped",[20800]],[[64013,64013],"mapped",[21952]],[[64014,64015],"valid"],[[64016,64016],"mapped",[22618]],[[64017,64017],"valid"],[[64018,64018],"mapped",[26228]],[[64019,64020],"valid"],[[64021,64021],"mapped",[20958]],[[64022,64022],"mapped",[29482]],[[64023,64023],"mapped",[30410]],[[64024,64024],"mapped",[31036]],[[64025,64025],"mapped",[31070]],[[64026,64026],"mapped",[31077]],[[64027,64027],"mapped",[31119]],[[64028,64028],"mapped",[38742]],[[64029,64029],"mapped",[31934]],[[64030,64030],"mapped",[32701]],[[64031,64031],"valid"],[[64032,64032],"mapped",[34322]],[[64033,64033],"valid"],[[64034,64034],"mapped",[35576]],[[64035,64036],"valid"],[[64037,64037],"mapped",[36920]],[[64038,64038],"mapped",[37117]],[[64039,64041],"valid"],[[64042,64042],"mapped",[39151]],[[64043,64043],"mapped",[39164]],[[64044,64044],"mapped",[39208]],[[64045,64045],"mapped",[40372]],[[64046,64046],"mapped",[37086]],[[64047,64047],"mapped",[38583]],[[64048,64048],"mapped",[20398]],[[64049,64049],"mapped",[20711]],[[64050,64050],"mapped",[20813]],[[64051,64051],"mapped",[21193]],[[64052,64052],"mapped",[21220]],[[64053,64053],"mapped",[21329]],[[64054,64054],"mapped",[21917]],[[64055,64055],"mapped",[22022]],[[64056,64056],"mapped",[22120]],[[64057,64057],"mapped",[22592]],[[64058,64058],"mapped",[22696]],[[64059,64059],"mapped",[23652]],[[64060,64060],"mapped",[23662]],[[64061,64061],"mapped",[24724]],[[64062,64062],"mapped",[24936]],[[64063,64063],"mapped",[24974]],[[64064,64064],"mapped",[25074]],[[64065,64065],"mapped",[25935]],[[64066,64066],"mapped",[26082]],[[64067,64067],"mapped",[26257]],[[64068,64068],"mapped",[26757]],[[64069,64069],"mapped",[28023]],[[64070,64070],"mapped",[28186]],[[64071,64071],"mapped",[28450]],[[64072,64072],"mapped",[29038]],[[64073,64073],"mapped",[29227]],[[64074,64074],"mapped",[29730]],[[64075,64075],"mapped",[30865]],[[64076,64076],"mapped",[31038]],[[64077,64077],"mapped",[31049]],[[64078,64078],"mapped",[31048]],[[64079,64079],"mapped",[31056]],[[64080,64080],"mapped",[31062]],[[64081,64081],"mapped",[31069]],[[64082,64082],"mapped",[31117]],[[64083,64083],"mapped",[31118]],[[64084,64084],"mapped",[31296]],[[64085,64085],"mapped",[31361]],[[64086,64086],"mapped",[31680]],[[64087,64087],"mapped",[32244]],[[64088,64088],"mapped",[32265]],[[64089,64089],"mapped",[32321]],[[64090,64090],"mapped",[32626]],[[64091,64091],"mapped",[32773]],[[64092,64092],"mapped",[33261]],[[64093,64094],"mapped",[33401]],[[64095,64095],"mapped",[33879]],[[64096,64096],"mapped",[35088]],[[64097,64097],"mapped",[35222]],[[64098,64098],"mapped",[35585]],[[64099,64099],"mapped",[35641]],[[64100,64100],"mapped",[36051]],[[64101,64101],"mapped",[36104]],[[64102,64102],"mapped",[36790]],[[64103,64103],"mapped",[36920]],[[64104,64104],"mapped",[38627]],[[64105,64105],"mapped",[38911]],[[64106,64106],"mapped",[38971]],[[64107,64107],"mapped",[24693]],[[64108,64108],"mapped",[148206]],[[64109,64109],"mapped",[33304]],[[64110,64111],"disallowed"],[[64112,64112],"mapped",[20006]],[[64113,64113],"mapped",[20917]],[[64114,64114],"mapped",[20840]],[[64115,64115],"mapped",[20352]],[[64116,64116],"mapped",[20805]],[[64117,64117],"mapped",[20864]],[[64118,64118],"mapped",[21191]],[[64119,64119],"mapped",[21242]],[[64120,64120],"mapped",[21917]],[[64121,64121],"mapped",[21845]],[[64122,64122],"mapped",[21913]],[[64123,64123],"mapped",[21986]],[[64124,64124],"mapped",[22618]],[[64125,64125],"mapped",[22707]],[[64126,64126],"mapped",[22852]],[[64127,64127],"mapped",[22868]],[[64128,64128],"mapped",[23138]],[[64129,64129],"mapped",[23336]],[[64130,64130],"mapped",[24274]],[[64131,64131],"mapped",[24281]],[[64132,64132],"mapped",[24425]],[[64133,64133],"mapped",[24493]],[[64134,64134],"mapped",[24792]],[[64135,64135],"mapped",[24910]],[[64136,64136],"mapped",[24840]],[[64137,64137],"mapped",[24974]],[[64138,64138],"mapped",[24928]],[[64139,64139],"mapped",[25074]],[[64140,64140],"mapped",[25140]],[[64141,64141],"mapped",[25540]],[[64142,64142],"mapped",[25628]],[[64143,64143],"mapped",[25682]],[[64144,64144],"mapped",[25942]],[[64145,64145],"mapped",[26228]],[[64146,64146],"mapped",[26391]],[[64147,64147],"mapped",[26395]],[[64148,64148],"mapped",[26454]],[[64149,64149],"mapped",[27513]],[[64150,64150],"mapped",[27578]],[[64151,64151],"mapped",[27969]],[[64152,64152],"mapped",[28379]],[[64153,64153],"mapped",[28363]],[[64154,64154],"mapped",[28450]],[[64155,64155],"mapped",[28702]],[[64156,64156],"mapped",[29038]],[[64157,64157],"mapped",[30631]],[[64158,64158],"mapped",[29237]],[[64159,64159],"mapped",[29359]],[[64160,64160],"mapped",[29482]],[[64161,64161],"mapped",[29809]],[[64162,64162],"mapped",[29958]],[[64163,64163],"mapped",[30011]],[[64164,64164],"mapped",[30237]],[[64165,64165],"mapped",[30239]],[[64166,64166],"mapped",[30410]],[[64167,64167],"mapped",[30427]],[[64168,64168],"mapped",[30452]],[[64169,64169],"mapped",[30538]],[[64170,64170],"mapped",[30528]],[[64171,64171],"mapped",[30924]],[[64172,64172],"mapped",[31409]],[[64173,64173],"mapped",[31680]],[[64174,64174],"mapped",[31867]],[[64175,64175],"mapped",[32091]],[[64176,64176],"mapped",[32244]],[[64177,64177],"mapped",[32574]],[[64178,64178],"mapped",[32773]],[[64179,64179],"mapped",[33618]],[[64180,64180],"mapped",[33775]],[[64181,64181],"mapped",[34681]],[[64182,64182],"mapped",[35137]],[[64183,64183],"mapped",[35206]],[[64184,64184],"mapped",[35222]],[[64185,64185],"mapped",[35519]],[[64186,64186],"mapped",[35576]],[[64187,64187],"mapped",[35531]],[[64188,64188],"mapped",[35585]],[[64189,64189],"mapped",[35582]],[[64190,64190],"mapped",[35565]],[[64191,64191],"mapped",[35641]],[[64192,64192],"mapped",[35722]],[[64193,64193],"mapped",[36104]],[[64194,64194],"mapped",[36664]],[[64195,64195],"mapped",[36978]],[[64196,64196],"mapped",[37273]],[[64197,64197],"mapped",[37494]],[[64198,64198],"mapped",[38524]],[[64199,64199],"mapped",[38627]],[[64200,64200],"mapped",[38742]],[[64201,64201],"mapped",[38875]],[[64202,64202],"mapped",[38911]],[[64203,64203],"mapped",[38923]],[[64204,64204],"mapped",[38971]],[[64205,64205],"mapped",[39698]],[[64206,64206],"mapped",[40860]],[[64207,64207],"mapped",[141386]],[[64208,64208],"mapped",[141380]],[[64209,64209],"mapped",[144341]],[[64210,64210],"mapped",[15261]],[[64211,64211],"mapped",[16408]],[[64212,64212],"mapped",[16441]],[[64213,64213],"mapped",[152137]],[[64214,64214],"mapped",[154832]],[[64215,64215],"mapped",[163539]],[[64216,64216],"mapped",[40771]],[[64217,64217],"mapped",[40846]],[[64218,64255],"disallowed"],[[64256,64256],"mapped",[102,102]],[[64257,64257],"mapped",[102,105]],[[64258,64258],"mapped",[102,108]],[[64259,64259],"mapped",[102,102,105]],[[64260,64260],"mapped",[102,102,108]],[[64261,64262],"mapped",[115,116]],[[64263,64274],"disallowed"],[[64275,64275],"mapped",[1396,1398]],[[64276,64276],"mapped",[1396,1381]],[[64277,64277],"mapped",[1396,1387]],[[64278,64278],"mapped",[1406,1398]],[[64279,64279],"mapped",[1396,1389]],[[64280,64284],"disallowed"],[[64285,64285],"mapped",[1497,1460]],[[64286,64286],"valid"],[[64287,64287],"mapped",[1522,1463]],[[64288,64288],"mapped",[1506]],[[64289,64289],"mapped",[1488]],[[64290,64290],"mapped",[1491]],[[64291,64291],"mapped",[1492]],[[64292,64292],"mapped",[1499]],[[64293,64293],"mapped",[1500]],[[64294,64294],"mapped",[1501]],[[64295,64295],"mapped",[1512]],[[64296,64296],"mapped",[1514]],[[64297,64297],"disallowed_STD3_mapped",[43]],[[64298,64298],"mapped",[1513,1473]],[[64299,64299],"mapped",[1513,1474]],[[64300,64300],"mapped",[1513,1468,1473]],[[64301,64301],"mapped",[1513,1468,1474]],[[64302,64302],"mapped",[1488,1463]],[[64303,64303],"mapped",[1488,1464]],[[64304,64304],"mapped",[1488,1468]],[[64305,64305],"mapped",[1489,1468]],[[64306,64306],"mapped",[1490,1468]],[[64307,64307],"mapped",[1491,1468]],[[64308,64308],"mapped",[1492,1468]],[[64309,64309],"mapped",[1493,1468]],[[64310,64310],"mapped",[1494,1468]],[[64311,64311],"disallowed"],[[64312,64312],"mapped",[1496,1468]],[[64313,64313],"mapped",[1497,1468]],[[64314,64314],"mapped",[1498,1468]],[[64315,64315],"mapped",[1499,1468]],[[64316,64316],"mapped",[1500,1468]],[[64317,64317],"disallowed"],[[64318,64318],"mapped",[1502,1468]],[[64319,64319],"disallowed"],[[64320,64320],"mapped",[1504,1468]],[[64321,64321],"mapped",[1505,1468]],[[64322,64322],"disallowed"],[[64323,64323],"mapped",[1507,1468]],[[64324,64324],"mapped",[1508,1468]],[[64325,64325],"disallowed"],[[64326,64326],"mapped",[1510,1468]],[[64327,64327],"mapped",[1511,1468]],[[64328,64328],"mapped",[1512,1468]],[[64329,64329],"mapped",[1513,1468]],[[64330,64330],"mapped",[1514,1468]],[[64331,64331],"mapped",[1493,1465]],[[64332,64332],"mapped",[1489,1471]],[[64333,64333],"mapped",[1499,1471]],[[64334,64334],"mapped",[1508,1471]],[[64335,64335],"mapped",[1488,1500]],[[64336,64337],"mapped",[1649]],[[64338,64341],"mapped",[1659]],[[64342,64345],"mapped",[1662]],[[64346,64349],"mapped",[1664]],[[64350,64353],"mapped",[1658]],[[64354,64357],"mapped",[1663]],[[64358,64361],"mapped",[1657]],[[64362,64365],"mapped",[1700]],[[64366,64369],"mapped",[1702]],[[64370,64373],"mapped",[1668]],[[64374,64377],"mapped",[1667]],[[64378,64381],"mapped",[1670]],[[64382,64385],"mapped",[1671]],[[64386,64387],"mapped",[1677]],[[64388,64389],"mapped",[1676]],[[64390,64391],"mapped",[1678]],[[64392,64393],"mapped",[1672]],[[64394,64395],"mapped",[1688]],[[64396,64397],"mapped",[1681]],[[64398,64401],"mapped",[1705]],[[64402,64405],"mapped",[1711]],[[64406,64409],"mapped",[1715]],[[64410,64413],"mapped",[1713]],[[64414,64415],"mapped",[1722]],[[64416,64419],"mapped",[1723]],[[64420,64421],"mapped",[1728]],[[64422,64425],"mapped",[1729]],[[64426,64429],"mapped",[1726]],[[64430,64431],"mapped",[1746]],[[64432,64433],"mapped",[1747]],[[64434,64449],"valid",[],"NV8"],[[64450,64466],"disallowed"],[[64467,64470],"mapped",[1709]],[[64471,64472],"mapped",[1735]],[[64473,64474],"mapped",[1734]],[[64475,64476],"mapped",[1736]],[[64477,64477],"mapped",[1735,1652]],[[64478,64479],"mapped",[1739]],[[64480,64481],"mapped",[1733]],[[64482,64483],"mapped",[1737]],[[64484,64487],"mapped",[1744]],[[64488,64489],"mapped",[1609]],[[64490,64491],"mapped",[1574,1575]],[[64492,64493],"mapped",[1574,1749]],[[64494,64495],"mapped",[1574,1608]],[[64496,64497],"mapped",[1574,1735]],[[64498,64499],"mapped",[1574,1734]],[[64500,64501],"mapped",[1574,1736]],[[64502,64504],"mapped",[1574,1744]],[[64505,64507],"mapped",[1574,1609]],[[64508,64511],"mapped",[1740]],[[64512,64512],"mapped",[1574,1580]],[[64513,64513],"mapped",[1574,1581]],[[64514,64514],"mapped",[1574,1605]],[[64515,64515],"mapped",[1574,1609]],[[64516,64516],"mapped",[1574,1610]],[[64517,64517],"mapped",[1576,1580]],[[64518,64518],"mapped",[1576,1581]],[[64519,64519],"mapped",[1576,1582]],[[64520,64520],"mapped",[1576,1605]],[[64521,64521],"mapped",[1576,1609]],[[64522,64522],"mapped",[1576,1610]],[[64523,64523],"mapped",[1578,1580]],[[64524,64524],"mapped",[1578,1581]],[[64525,64525],"mapped",[1578,1582]],[[64526,64526],"mapped",[1578,1605]],[[64527,64527],"mapped",[1578,1609]],[[64528,64528],"mapped",[1578,1610]],[[64529,64529],"mapped",[1579,1580]],[[64530,64530],"mapped",[1579,1605]],[[64531,64531],"mapped",[1579,1609]],[[64532,64532],"mapped",[1579,1610]],[[64533,64533],"mapped",[1580,1581]],[[64534,64534],"mapped",[1580,1605]],[[64535,64535],"mapped",[1581,1580]],[[64536,64536],"mapped",[1581,1605]],[[64537,64537],"mapped",[1582,1580]],[[64538,64538],"mapped",[1582,1581]],[[64539,64539],"mapped",[1582,1605]],[[64540,64540],"mapped",[1587,1580]],[[64541,64541],"mapped",[1587,1581]],[[64542,64542],"mapped",[1587,1582]],[[64543,64543],"mapped",[1587,1605]],[[64544,64544],"mapped",[1589,1581]],[[64545,64545],"mapped",[1589,1605]],[[64546,64546],"mapped",[1590,1580]],[[64547,64547],"mapped",[1590,1581]],[[64548,64548],"mapped",[1590,1582]],[[64549,64549],"mapped",[1590,1605]],[[64550,64550],"mapped",[1591,1581]],[[64551,64551],"mapped",[1591,1605]],[[64552,64552],"mapped",[1592,1605]],[[64553,64553],"mapped",[1593,1580]],[[64554,64554],"mapped",[1593,1605]],[[64555,64555],"mapped",[1594,1580]],[[64556,64556],"mapped",[1594,1605]],[[64557,64557],"mapped",[1601,1580]],[[64558,64558],"mapped",[1601,1581]],[[64559,64559],"mapped",[1601,1582]],[[64560,64560],"mapped",[1601,1605]],[[64561,64561],"mapped",[1601,1609]],[[64562,64562],"mapped",[1601,1610]],[[64563,64563],"mapped",[1602,1581]],[[64564,64564],"mapped",[1602,1605]],[[64565,64565],"mapped",[1602,1609]],[[64566,64566],"mapped",[1602,1610]],[[64567,64567],"mapped",[1603,1575]],[[64568,64568],"mapped",[1603,1580]],[[64569,64569],"mapped",[1603,1581]],[[64570,64570],"mapped",[1603,1582]],[[64571,64571],"mapped",[1603,1604]],[[64572,64572],"mapped",[1603,1605]],[[64573,64573],"mapped",[1603,1609]],[[64574,64574],"mapped",[1603,1610]],[[64575,64575],"mapped",[1604,1580]],[[64576,64576],"mapped",[1604,1581]],[[64577,64577],"mapped",[1604,1582]],[[64578,64578],"mapped",[1604,1605]],[[64579,64579],"mapped",[1604,1609]],[[64580,64580],"mapped",[1604,1610]],[[64581,64581],"mapped",[1605,1580]],[[64582,64582],"mapped",[1605,1581]],[[64583,64583],"mapped",[1605,1582]],[[64584,64584],"mapped",[1605,1605]],[[64585,64585],"mapped",[1605,1609]],[[64586,64586],"mapped",[1605,1610]],[[64587,64587],"mapped",[1606,1580]],[[64588,64588],"mapped",[1606,1581]],[[64589,64589],"mapped",[1606,1582]],[[64590,64590],"mapped",[1606,1605]],[[64591,64591],"mapped",[1606,1609]],[[64592,64592],"mapped",[1606,1610]],[[64593,64593],"mapped",[1607,1580]],[[64594,64594],"mapped",[1607,1605]],[[64595,64595],"mapped",[1607,1609]],[[64596,64596],"mapped",[1607,1610]],[[64597,64597],"mapped",[1610,1580]],[[64598,64598],"mapped",[1610,1581]],[[64599,64599],"mapped",[1610,1582]],[[64600,64600],"mapped",[1610,1605]],[[64601,64601],"mapped",[1610,1609]],[[64602,64602],"mapped",[1610,1610]],[[64603,64603],"mapped",[1584,1648]],[[64604,64604],"mapped",[1585,1648]],[[64605,64605],"mapped",[1609,1648]],[[64606,64606],"disallowed_STD3_mapped",[32,1612,1617]],[[64607,64607],"disallowed_STD3_mapped",[32,1613,1617]],[[64608,64608],"disallowed_STD3_mapped",[32,1614,1617]],[[64609,64609],"disallowed_STD3_mapped",[32,1615,1617]],[[64610,64610],"disallowed_STD3_mapped",[32,1616,1617]],[[64611,64611],"disallowed_STD3_mapped",[32,1617,1648]],[[64612,64612],"mapped",[1574,1585]],[[64613,64613],"mapped",[1574,1586]],[[64614,64614],"mapped",[1574,1605]],[[64615,64615],"mapped",[1574,1606]],[[64616,64616],"mapped",[1574,1609]],[[64617,64617],"mapped",[1574,1610]],[[64618,64618],"mapped",[1576,1585]],[[64619,64619],"mapped",[1576,1586]],[[64620,64620],"mapped",[1576,1605]],[[64621,64621],"mapped",[1576,1606]],[[64622,64622],"mapped",[1576,1609]],[[64623,64623],"mapped",[1576,1610]],[[64624,64624],"mapped",[1578,1585]],[[64625,64625],"mapped",[1578,1586]],[[64626,64626],"mapped",[1578,1605]],[[64627,64627],"mapped",[1578,1606]],[[64628,64628],"mapped",[1578,1609]],[[64629,64629],"mapped",[1578,1610]],[[64630,64630],"mapped",[1579,1585]],[[64631,64631],"mapped",[1579,1586]],[[64632,64632],"mapped",[1579,1605]],[[64633,64633],"mapped",[1579,1606]],[[64634,64634],"mapped",[1579,1609]],[[64635,64635],"mapped",[1579,1610]],[[64636,64636],"mapped",[1601,1609]],[[64637,64637],"mapped",[1601,1610]],[[64638,64638],"mapped",[1602,1609]],[[64639,64639],"mapped",[1602,1610]],[[64640,64640],"mapped",[1603,1575]],[[64641,64641],"mapped",[1603,1604]],[[64642,64642],"mapped",[1603,1605]],[[64643,64643],"mapped",[1603,1609]],[[64644,64644],"mapped",[1603,1610]],[[64645,64645],"mapped",[1604,1605]],[[64646,64646],"mapped",[1604,1609]],[[64647,64647],"mapped",[1604,1610]],[[64648,64648],"mapped",[1605,1575]],[[64649,64649],"mapped",[1605,1605]],[[64650,64650],"mapped",[1606,1585]],[[64651,64651],"mapped",[1606,1586]],[[64652,64652],"mapped",[1606,1605]],[[64653,64653],"mapped",[1606,1606]],[[64654,64654],"mapped",[1606,1609]],[[64655,64655],"mapped",[1606,1610]],[[64656,64656],"mapped",[1609,1648]],[[64657,64657],"mapped",[1610,1585]],[[64658,64658],"mapped",[1610,1586]],[[64659,64659],"mapped",[1610,1605]],[[64660,64660],"mapped",[1610,1606]],[[64661,64661],"mapped",[1610,1609]],[[64662,64662],"mapped",[1610,1610]],[[64663,64663],"mapped",[1574,1580]],[[64664,64664],"mapped",[1574,1581]],[[64665,64665],"mapped",[1574,1582]],[[64666,64666],"mapped",[1574,1605]],[[64667,64667],"mapped",[1574,1607]],[[64668,64668],"mapped",[1576,1580]],[[64669,64669],"mapped",[1576,1581]],[[64670,64670],"mapped",[1576,1582]],[[64671,64671],"mapped",[1576,1605]],[[64672,64672],"mapped",[1576,1607]],[[64673,64673],"mapped",[1578,1580]],[[64674,64674],"mapped",[1578,1581]],[[64675,64675],"mapped",[1578,1582]],[[64676,64676],"mapped",[1578,1605]],[[64677,64677],"mapped",[1578,1607]],[[64678,64678],"mapped",[1579,1605]],[[64679,64679],"mapped",[1580,1581]],[[64680,64680],"mapped",[1580,1605]],[[64681,64681],"mapped",[1581,1580]],[[64682,64682],"mapped",[1581,1605]],[[64683,64683],"mapped",[1582,1580]],[[64684,64684],"mapped",[1582,1605]],[[64685,64685],"mapped",[1587,1580]],[[64686,64686],"mapped",[1587,1581]],[[64687,64687],"mapped",[1587,1582]],[[64688,64688],"mapped",[1587,1605]],[[64689,64689],"mapped",[1589,1581]],[[64690,64690],"mapped",[1589,1582]],[[64691,64691],"mapped",[1589,1605]],[[64692,64692],"mapped",[1590,1580]],[[64693,64693],"mapped",[1590,1581]],[[64694,64694],"mapped",[1590,1582]],[[64695,64695],"mapped",[1590,1605]],[[64696,64696],"mapped",[1591,1581]],[[64697,64697],"mapped",[1592,1605]],[[64698,64698],"mapped",[1593,1580]],[[64699,64699],"mapped",[1593,1605]],[[64700,64700],"mapped",[1594,1580]],[[64701,64701],"mapped",[1594,1605]],[[64702,64702],"mapped",[1601,1580]],[[64703,64703],"mapped",[1601,1581]],[[64704,64704],"mapped",[1601,1582]],[[64705,64705],"mapped",[1601,1605]],[[64706,64706],"mapped",[1602,1581]],[[64707,64707],"mapped",[1602,1605]],[[64708,64708],"mapped",[1603,1580]],[[64709,64709],"mapped",[1603,1581]],[[64710,64710],"mapped",[1603,1582]],[[64711,64711],"mapped",[1603,1604]],[[64712,64712],"mapped",[1603,1605]],[[64713,64713],"mapped",[1604,1580]],[[64714,64714],"mapped",[1604,1581]],[[64715,64715],"mapped",[1604,1582]],[[64716,64716],"mapped",[1604,1605]],[[64717,64717],"mapped",[1604,1607]],[[64718,64718],"mapped",[1605,1580]],[[64719,64719],"mapped",[1605,1581]],[[64720,64720],"mapped",[1605,1582]],[[64721,64721],"mapped",[1605,1605]],[[64722,64722],"mapped",[1606,1580]],[[64723,64723],"mapped",[1606,1581]],[[64724,64724],"mapped",[1606,1582]],[[64725,64725],"mapped",[1606,1605]],[[64726,64726],"mapped",[1606,1607]],[[64727,64727],"mapped",[1607,1580]],[[64728,64728],"mapped",[1607,1605]],[[64729,64729],"mapped",[1607,1648]],[[64730,64730],"mapped",[1610,1580]],[[64731,64731],"mapped",[1610,1581]],[[64732,64732],"mapped",[1610,1582]],[[64733,64733],"mapped",[1610,1605]],[[64734,64734],"mapped",[1610,1607]],[[64735,64735],"mapped",[1574,1605]],[[64736,64736],"mapped",[1574,1607]],[[64737,64737],"mapped",[1576,1605]],[[64738,64738],"mapped",[1576,1607]],[[64739,64739],"mapped",[1578,1605]],[[64740,64740],"mapped",[1578,1607]],[[64741,64741],"mapped",[1579,1605]],[[64742,64742],"mapped",[1579,1607]],[[64743,64743],"mapped",[1587,1605]],[[64744,64744],"mapped",[1587,1607]],[[64745,64745],"mapped",[1588,1605]],[[64746,64746],"mapped",[1588,1607]],[[64747,64747],"mapped",[1603,1604]],[[64748,64748],"mapped",[1603,1605]],[[64749,64749],"mapped",[1604,1605]],[[64750,64750],"mapped",[1606,1605]],[[64751,64751],"mapped",[1606,1607]],[[64752,64752],"mapped",[1610,1605]],[[64753,64753],"mapped",[1610,1607]],[[64754,64754],"mapped",[1600,1614,1617]],[[64755,64755],"mapped",[1600,1615,1617]],[[64756,64756],"mapped",[1600,1616,1617]],[[64757,64757],"mapped",[1591,1609]],[[64758,64758],"mapped",[1591,1610]],[[64759,64759],"mapped",[1593,1609]],[[64760,64760],"mapped",[1593,1610]],[[64761,64761],"mapped",[1594,1609]],[[64762,64762],"mapped",[1594,1610]],[[64763,64763],"mapped",[1587,1609]],[[64764,64764],"mapped",[1587,1610]],[[64765,64765],"mapped",[1588,1609]],[[64766,64766],"mapped",[1588,1610]],[[64767,64767],"mapped",[1581,1609]],[[64768,64768],"mapped",[1581,1610]],[[64769,64769],"mapped",[1580,1609]],[[64770,64770],"mapped",[1580,1610]],[[64771,64771],"mapped",[1582,1609]],[[64772,64772],"mapped",[1582,1610]],[[64773,64773],"mapped",[1589,1609]],[[64774,64774],"mapped",[1589,1610]],[[64775,64775],"mapped",[1590,1609]],[[64776,64776],"mapped",[1590,1610]],[[64777,64777],"mapped",[1588,1580]],[[64778,64778],"mapped",[1588,1581]],[[64779,64779],"mapped",[1588,1582]],[[64780,64780],"mapped",[1588,1605]],[[64781,64781],"mapped",[1588,1585]],[[64782,64782],"mapped",[1587,1585]],[[64783,64783],"mapped",[1589,1585]],[[64784,64784],"mapped",[1590,1585]],[[64785,64785],"mapped",[1591,1609]],[[64786,64786],"mapped",[1591,1610]],[[64787,64787],"mapped",[1593,1609]],[[64788,64788],"mapped",[1593,1610]],[[64789,64789],"mapped",[1594,1609]],[[64790,64790],"mapped",[1594,1610]],[[64791,64791],"mapped",[1587,1609]],[[64792,64792],"mapped",[1587,1610]],[[64793,64793],"mapped",[1588,1609]],[[64794,64794],"mapped",[1588,1610]],[[64795,64795],"mapped",[1581,1609]],[[64796,64796],"mapped",[1581,1610]],[[64797,64797],"mapped",[1580,1609]],[[64798,64798],"mapped",[1580,1610]],[[64799,64799],"mapped",[1582,1609]],[[64800,64800],"mapped",[1582,1610]],[[64801,64801],"mapped",[1589,1609]],[[64802,64802],"mapped",[1589,1610]],[[64803,64803],"mapped",[1590,1609]],[[64804,64804],"mapped",[1590,1610]],[[64805,64805],"mapped",[1588,1580]],[[64806,64806],"mapped",[1588,1581]],[[64807,64807],"mapped",[1588,1582]],[[64808,64808],"mapped",[1588,1605]],[[64809,64809],"mapped",[1588,1585]],[[64810,64810],"mapped",[1587,1585]],[[64811,64811],"mapped",[1589,1585]],[[64812,64812],"mapped",[1590,1585]],[[64813,64813],"mapped",[1588,1580]],[[64814,64814],"mapped",[1588,1581]],[[64815,64815],"mapped",[1588,1582]],[[64816,64816],"mapped",[1588,1605]],[[64817,64817],"mapped",[1587,1607]],[[64818,64818],"mapped",[1588,1607]],[[64819,64819],"mapped",[1591,1605]],[[64820,64820],"mapped",[1587,1580]],[[64821,64821],"mapped",[1587,1581]],[[64822,64822],"mapped",[1587,1582]],[[64823,64823],"mapped",[1588,1580]],[[64824,64824],"mapped",[1588,1581]],[[64825,64825],"mapped",[1588,1582]],[[64826,64826],"mapped",[1591,1605]],[[64827,64827],"mapped",[1592,1605]],[[64828,64829],"mapped",[1575,1611]],[[64830,64831],"valid",[],"NV8"],[[64832,64847],"disallowed"],[[64848,64848],"mapped",[1578,1580,1605]],[[64849,64850],"mapped",[1578,1581,1580]],[[64851,64851],"mapped",[1578,1581,1605]],[[64852,64852],"mapped",[1578,1582,1605]],[[64853,64853],"mapped",[1578,1605,1580]],[[64854,64854],"mapped",[1578,1605,1581]],[[64855,64855],"mapped",[1578,1605,1582]],[[64856,64857],"mapped",[1580,1605,1581]],[[64858,64858],"mapped",[1581,1605,1610]],[[64859,64859],"mapped",[1581,1605,1609]],[[64860,64860],"mapped",[1587,1581,1580]],[[64861,64861],"mapped",[1587,1580,1581]],[[64862,64862],"mapped",[1587,1580,1609]],[[64863,64864],"mapped",[1587,1605,1581]],[[64865,64865],"mapped",[1587,1605,1580]],[[64866,64867],"mapped",[1587,1605,1605]],[[64868,64869],"mapped",[1589,1581,1581]],[[64870,64870],"mapped",[1589,1605,1605]],[[64871,64872],"mapped",[1588,1581,1605]],[[64873,64873],"mapped",[1588,1580,1610]],[[64874,64875],"mapped",[1588,1605,1582]],[[64876,64877],"mapped",[1588,1605,1605]],[[64878,64878],"mapped",[1590,1581,1609]],[[64879,64880],"mapped",[1590,1582,1605]],[[64881,64882],"mapped",[1591,1605,1581]],[[64883,64883],"mapped",[1591,1605,1605]],[[64884,64884],"mapped",[1591,1605,1610]],[[64885,64885],"mapped",[1593,1580,1605]],[[64886,64887],"mapped",[1593,1605,1605]],[[64888,64888],"mapped",[1593,1605,1609]],[[64889,64889],"mapped",[1594,1605,1605]],[[64890,64890],"mapped",[1594,1605,1610]],[[64891,64891],"mapped",[1594,1605,1609]],[[64892,64893],"mapped",[1601,1582,1605]],[[64894,64894],"mapped",[1602,1605,1581]],[[64895,64895],"mapped",[1602,1605,1605]],[[64896,64896],"mapped",[1604,1581,1605]],[[64897,64897],"mapped",[1604,1581,1610]],[[64898,64898],"mapped",[1604,1581,1609]],[[64899,64900],"mapped",[1604,1580,1580]],[[64901,64902],"mapped",[1604,1582,1605]],[[64903,64904],"mapped",[1604,1605,1581]],[[64905,64905],"mapped",[1605,1581,1580]],[[64906,64906],"mapped",[1605,1581,1605]],[[64907,64907],"mapped",[1605,1581,1610]],[[64908,64908],"mapped",[1605,1580,1581]],[[64909,64909],"mapped",[1605,1580,1605]],[[64910,64910],"mapped",[1605,1582,1580]],[[64911,64911],"mapped",[1605,1582,1605]],[[64912,64913],"disallowed"],[[64914,64914],"mapped",[1605,1580,1582]],[[64915,64915],"mapped",[1607,1605,1580]],[[64916,64916],"mapped",[1607,1605,1605]],[[64917,64917],"mapped",[1606,1581,1605]],[[64918,64918],"mapped",[1606,1581,1609]],[[64919,64920],"mapped",[1606,1580,1605]],[[64921,64921],"mapped",[1606,1580,1609]],[[64922,64922],"mapped",[1606,1605,1610]],[[64923,64923],"mapped",[1606,1605,1609]],[[64924,64925],"mapped",[1610,1605,1605]],[[64926,64926],"mapped",[1576,1582,1610]],[[64927,64927],"mapped",[1578,1580,1610]],[[64928,64928],"mapped",[1578,1580,1609]],[[64929,64929],"mapped",[1578,1582,1610]],[[64930,64930],"mapped",[1578,1582,1609]],[[64931,64931],"mapped",[1578,1605,1610]],[[64932,64932],"mapped",[1578,1605,1609]],[[64933,64933],"mapped",[1580,1605,1610]],[[64934,64934],"mapped",[1580,1581,1609]],[[64935,64935],"mapped",[1580,1605,1609]],[[64936,64936],"mapped",[1587,1582,1609]],[[64937,64937],"mapped",[1589,1581,1610]],[[64938,64938],"mapped",[1588,1581,1610]],[[64939,64939],"mapped",[1590,1581,1610]],[[64940,64940],"mapped",[1604,1580,1610]],[[64941,64941],"mapped",[1604,1605,1610]],[[64942,64942],"mapped",[1610,1581,1610]],[[64943,64943],"mapped",[1610,1580,1610]],[[64944,64944],"mapped",[1610,1605,1610]],[[64945,64945],"mapped",[1605,1605,1610]],[[64946,64946],"mapped",[1602,1605,1610]],[[64947,64947],"mapped",[1606,1581,1610]],[[64948,64948],"mapped",[1602,1605,1581]],[[64949,64949],"mapped",[1604,1581,1605]],[[64950,64950],"mapped",[1593,1605,1610]],[[64951,64951],"mapped",[1603,1605,1610]],[[64952,64952],"mapped",[1606,1580,1581]],[[64953,64953],"mapped",[1605,1582,1610]],[[64954,64954],"mapped",[1604,1580,1605]],[[64955,64955],"mapped",[1603,1605,1605]],[[64956,64956],"mapped",[1604,1580,1605]],[[64957,64957],"mapped",[1606,1580,1581]],[[64958,64958],"mapped",[1580,1581,1610]],[[64959,64959],"mapped",[1581,1580,1610]],[[64960,64960],"mapped",[1605,1580,1610]],[[64961,64961],"mapped",[1601,1605,1610]],[[64962,64962],"mapped",[1576,1581,1610]],[[64963,64963],"mapped",[1603,1605,1605]],[[64964,64964],"mapped",[1593,1580,1605]],[[64965,64965],"mapped",[1589,1605,1605]],[[64966,64966],"mapped",[1587,1582,1610]],[[64967,64967],"mapped",[1606,1580,1610]],[[64968,64975],"disallowed"],[[64976,65007],"disallowed"],[[65008,65008],"mapped",[1589,1604,1746]],[[65009,65009],"mapped",[1602,1604,1746]],[[65010,65010],"mapped",[1575,1604,1604,1607]],[[65011,65011],"mapped",[1575,1603,1576,1585]],[[65012,65012],"mapped",[1605,1581,1605,1583]],[[65013,65013],"mapped",[1589,1604,1593,1605]],[[65014,65014],"mapped",[1585,1587,1608,1604]],[[65015,65015],"mapped",[1593,1604,1610,1607]],[[65016,65016],"mapped",[1608,1587,1604,1605]],[[65017,65017],"mapped",[1589,1604,1609]],[[65018,65018],"disallowed_STD3_mapped",[1589,1604,1609,32,1575,1604,1604,1607,32,1593,1604,1610,1607,32,1608,1587,1604,1605]],[[65019,65019],"disallowed_STD3_mapped",[1580,1604,32,1580,1604,1575,1604,1607]],[[65020,65020],"mapped",[1585,1740,1575,1604]],[[65021,65021],"valid",[],"NV8"],[[65022,65023],"disallowed"],[[65024,65039],"ignored"],[[65040,65040],"disallowed_STD3_mapped",[44]],[[65041,65041],"mapped",[12289]],[[65042,65042],"disallowed"],[[65043,65043],"disallowed_STD3_mapped",[58]],[[65044,65044],"disallowed_STD3_mapped",[59]],[[65045,65045],"disallowed_STD3_mapped",[33]],[[65046,65046],"disallowed_STD3_mapped",[63]],[[65047,65047],"mapped",[12310]],[[65048,65048],"mapped",[12311]],[[65049,65049],"disallowed"],[[65050,65055],"disallowed"],[[65056,65059],"valid"],[[65060,65062],"valid"],[[65063,65069],"valid"],[[65070,65071],"valid"],[[65072,65072],"disallowed"],[[65073,65073],"mapped",[8212]],[[65074,65074],"mapped",[8211]],[[65075,65076],"disallowed_STD3_mapped",[95]],[[65077,65077],"disallowed_STD3_mapped",[40]],[[65078,65078],"disallowed_STD3_mapped",[41]],[[65079,65079],"disallowed_STD3_mapped",[123]],[[65080,65080],"disallowed_STD3_mapped",[125]],[[65081,65081],"mapped",[12308]],[[65082,65082],"mapped",[12309]],[[65083,65083],"mapped",[12304]],[[65084,65084],"mapped",[12305]],[[65085,65085],"mapped",[12298]],[[65086,65086],"mapped",[12299]],[[65087,65087],"mapped",[12296]],[[65088,65088],"mapped",[12297]],[[65089,65089],"mapped",[12300]],[[65090,65090],"mapped",[12301]],[[65091,65091],"mapped",[12302]],[[65092,65092],"mapped",[12303]],[[65093,65094],"valid",[],"NV8"],[[65095,65095],"disallowed_STD3_mapped",[91]],[[65096,65096],"disallowed_STD3_mapped",[93]],[[65097,65100],"disallowed_STD3_mapped",[32,773]],[[65101,65103],"disallowed_STD3_mapped",[95]],[[65104,65104],"disallowed_STD3_mapped",[44]],[[65105,65105],"mapped",[12289]],[[65106,65106],"disallowed"],[[65107,65107],"disallowed"],[[65108,65108],"disallowed_STD3_mapped",[59]],[[65109,65109],"disallowed_STD3_mapped",[58]],[[65110,65110],"disallowed_STD3_mapped",[63]],[[65111,65111],"disallowed_STD3_mapped",[33]],[[65112,65112],"mapped",[8212]],[[65113,65113],"disallowed_STD3_mapped",[40]],[[65114,65114],"disallowed_STD3_mapped",[41]],[[65115,65115],"disallowed_STD3_mapped",[123]],[[65116,65116],"disallowed_STD3_mapped",[125]],[[65117,65117],"mapped",[12308]],[[65118,65118],"mapped",[12309]],[[65119,65119],"disallowed_STD3_mapped",[35]],[[65120,65120],"disallowed_STD3_mapped",[38]],[[65121,65121],"disallowed_STD3_mapped",[42]],[[65122,65122],"disallowed_STD3_mapped",[43]],[[65123,65123],"mapped",[45]],[[65124,65124],"disallowed_STD3_mapped",[60]],[[65125,65125],"disallowed_STD3_mapped",[62]],[[65126,65126],"disallowed_STD3_mapped",[61]],[[65127,65127],"disallowed"],[[65128,65128],"disallowed_STD3_mapped",[92]],[[65129,65129],"disallowed_STD3_mapped",[36]],[[65130,65130],"disallowed_STD3_mapped",[37]],[[65131,65131],"disallowed_STD3_mapped",[64]],[[65132,65135],"disallowed"],[[65136,65136],"disallowed_STD3_mapped",[32,1611]],[[65137,65137],"mapped",[1600,1611]],[[65138,65138],"disallowed_STD3_mapped",[32,1612]],[[65139,65139],"valid"],[[65140,65140],"disallowed_STD3_mapped",[32,1613]],[[65141,65141],"disallowed"],[[65142,65142],"disallowed_STD3_mapped",[32,1614]],[[65143,65143],"mapped",[1600,1614]],[[65144,65144],"disallowed_STD3_mapped",[32,1615]],[[65145,65145],"mapped",[1600,1615]],[[65146,65146],"disallowed_STD3_mapped",[32,1616]],[[65147,65147],"mapped",[1600,1616]],[[65148,65148],"disallowed_STD3_mapped",[32,1617]],[[65149,65149],"mapped",[1600,1617]],[[65150,65150],"disallowed_STD3_mapped",[32,1618]],[[65151,65151],"mapped",[1600,1618]],[[65152,65152],"mapped",[1569]],[[65153,65154],"mapped",[1570]],[[65155,65156],"mapped",[1571]],[[65157,65158],"mapped",[1572]],[[65159,65160],"mapped",[1573]],[[65161,65164],"mapped",[1574]],[[65165,65166],"mapped",[1575]],[[65167,65170],"mapped",[1576]],[[65171,65172],"mapped",[1577]],[[65173,65176],"mapped",[1578]],[[65177,65180],"mapped",[1579]],[[65181,65184],"mapped",[1580]],[[65185,65188],"mapped",[1581]],[[65189,65192],"mapped",[1582]],[[65193,65194],"mapped",[1583]],[[65195,65196],"mapped",[1584]],[[65197,65198],"mapped",[1585]],[[65199,65200],"mapped",[1586]],[[65201,65204],"mapped",[1587]],[[65205,65208],"mapped",[1588]],[[65209,65212],"mapped",[1589]],[[65213,65216],"mapped",[1590]],[[65217,65220],"mapped",[1591]],[[65221,65224],"mapped",[1592]],[[65225,65228],"mapped",[1593]],[[65229,65232],"mapped",[1594]],[[65233,65236],"mapped",[1601]],[[65237,65240],"mapped",[1602]],[[65241,65244],"mapped",[1603]],[[65245,65248],"mapped",[1604]],[[65249,65252],"mapped",[1605]],[[65253,65256],"mapped",[1606]],[[65257,65260],"mapped",[1607]],[[65261,65262],"mapped",[1608]],[[65263,65264],"mapped",[1609]],[[65265,65268],"mapped",[1610]],[[65269,65270],"mapped",[1604,1570]],[[65271,65272],"mapped",[1604,1571]],[[65273,65274],"mapped",[1604,1573]],[[65275,65276],"mapped",[1604,1575]],[[65277,65278],"disallowed"],[[65279,65279],"ignored"],[[65280,65280],"disallowed"],[[65281,65281],"disallowed_STD3_mapped",[33]],[[65282,65282],"disallowed_STD3_mapped",[34]],[[65283,65283],"disallowed_STD3_mapped",[35]],[[65284,65284],"disallowed_STD3_mapped",[36]],[[65285,65285],"disallowed_STD3_mapped",[37]],[[65286,65286],"disallowed_STD3_mapped",[38]],[[65287,65287],"disallowed_STD3_mapped",[39]],[[65288,65288],"disallowed_STD3_mapped",[40]],[[65289,65289],"disallowed_STD3_mapped",[41]],[[65290,65290],"disallowed_STD3_mapped",[42]],[[65291,65291],"disallowed_STD3_mapped",[43]],[[65292,65292],"disallowed_STD3_mapped",[44]],[[65293,65293],"mapped",[45]],[[65294,65294],"mapped",[46]],[[65295,65295],"disallowed_STD3_mapped",[47]],[[65296,65296],"mapped",[48]],[[65297,65297],"mapped",[49]],[[65298,65298],"mapped",[50]],[[65299,65299],"mapped",[51]],[[65300,65300],"mapped",[52]],[[65301,65301],"mapped",[53]],[[65302,65302],"mapped",[54]],[[65303,65303],"mapped",[55]],[[65304,65304],"mapped",[56]],[[65305,65305],"mapped",[57]],[[65306,65306],"disallowed_STD3_mapped",[58]],[[65307,65307],"disallowed_STD3_mapped",[59]],[[65308,65308],"disallowed_STD3_mapped",[60]],[[65309,65309],"disallowed_STD3_mapped",[61]],[[65310,65310],"disallowed_STD3_mapped",[62]],[[65311,65311],"disallowed_STD3_mapped",[63]],[[65312,65312],"disallowed_STD3_mapped",[64]],[[65313,65313],"mapped",[97]],[[65314,65314],"mapped",[98]],[[65315,65315],"mapped",[99]],[[65316,65316],"mapped",[100]],[[65317,65317],"mapped",[101]],[[65318,65318],"mapped",[102]],[[65319,65319],"mapped",[103]],[[65320,65320],"mapped",[104]],[[65321,65321],"mapped",[105]],[[65322,65322],"mapped",[106]],[[65323,65323],"mapped",[107]],[[65324,65324],"mapped",[108]],[[65325,65325],"mapped",[109]],[[65326,65326],"mapped",[110]],[[65327,65327],"mapped",[111]],[[65328,65328],"mapped",[112]],[[65329,65329],"mapped",[113]],[[65330,65330],"mapped",[114]],[[65331,65331],"mapped",[115]],[[65332,65332],"mapped",[116]],[[65333,65333],"mapped",[117]],[[65334,65334],"mapped",[118]],[[65335,65335],"mapped",[119]],[[65336,65336],"mapped",[120]],[[65337,65337],"mapped",[121]],[[65338,65338],"mapped",[122]],[[65339,65339],"disallowed_STD3_mapped",[91]],[[65340,65340],"disallowed_STD3_mapped",[92]],[[65341,65341],"disallowed_STD3_mapped",[93]],[[65342,65342],"disallowed_STD3_mapped",[94]],[[65343,65343],"disallowed_STD3_mapped",[95]],[[65344,65344],"disallowed_STD3_mapped",[96]],[[65345,65345],"mapped",[97]],[[65346,65346],"mapped",[98]],[[65347,65347],"mapped",[99]],[[65348,65348],"mapped",[100]],[[65349,65349],"mapped",[101]],[[65350,65350],"mapped",[102]],[[65351,65351],"mapped",[103]],[[65352,65352],"mapped",[104]],[[65353,65353],"mapped",[105]],[[65354,65354],"mapped",[106]],[[65355,65355],"mapped",[107]],[[65356,65356],"mapped",[108]],[[65357,65357],"mapped",[109]],[[65358,65358],"mapped",[110]],[[65359,65359],"mapped",[111]],[[65360,65360],"mapped",[112]],[[65361,65361],"mapped",[113]],[[65362,65362],"mapped",[114]],[[65363,65363],"mapped",[115]],[[65364,65364],"mapped",[116]],[[65365,65365],"mapped",[117]],[[65366,65366],"mapped",[118]],[[65367,65367],"mapped",[119]],[[65368,65368],"mapped",[120]],[[65369,65369],"mapped",[121]],[[65370,65370],"mapped",[122]],[[65371,65371],"disallowed_STD3_mapped",[123]],[[65372,65372],"disallowed_STD3_mapped",[124]],[[65373,65373],"disallowed_STD3_mapped",[125]],[[65374,65374],"disallowed_STD3_mapped",[126]],[[65375,65375],"mapped",[10629]],[[65376,65376],"mapped",[10630]],[[65377,65377],"mapped",[46]],[[65378,65378],"mapped",[12300]],[[65379,65379],"mapped",[12301]],[[65380,65380],"mapped",[12289]],[[65381,65381],"mapped",[12539]],[[65382,65382],"mapped",[12530]],[[65383,65383],"mapped",[12449]],[[65384,65384],"mapped",[12451]],[[65385,65385],"mapped",[12453]],[[65386,65386],"mapped",[12455]],[[65387,65387],"mapped",[12457]],[[65388,65388],"mapped",[12515]],[[65389,65389],"mapped",[12517]],[[65390,65390],"mapped",[12519]],[[65391,65391],"mapped",[12483]],[[65392,65392],"mapped",[12540]],[[65393,65393],"mapped",[12450]],[[65394,65394],"mapped",[12452]],[[65395,65395],"mapped",[12454]],[[65396,65396],"mapped",[12456]],[[65397,65397],"mapped",[12458]],[[65398,65398],"mapped",[12459]],[[65399,65399],"mapped",[12461]],[[65400,65400],"mapped",[12463]],[[65401,65401],"mapped",[12465]],[[65402,65402],"mapped",[12467]],[[65403,65403],"mapped",[12469]],[[65404,65404],"mapped",[12471]],[[65405,65405],"mapped",[12473]],[[65406,65406],"mapped",[12475]],[[65407,65407],"mapped",[12477]],[[65408,65408],"mapped",[12479]],[[65409,65409],"mapped",[12481]],[[65410,65410],"mapped",[12484]],[[65411,65411],"mapped",[12486]],[[65412,65412],"mapped",[12488]],[[65413,65413],"mapped",[12490]],[[65414,65414],"mapped",[12491]],[[65415,65415],"mapped",[12492]],[[65416,65416],"mapped",[12493]],[[65417,65417],"mapped",[12494]],[[65418,65418],"mapped",[12495]],[[65419,65419],"mapped",[12498]],[[65420,65420],"mapped",[12501]],[[65421,65421],"mapped",[12504]],[[65422,65422],"mapped",[12507]],[[65423,65423],"mapped",[12510]],[[65424,65424],"mapped",[12511]],[[65425,65425],"mapped",[12512]],[[65426,65426],"mapped",[12513]],[[65427,65427],"mapped",[12514]],[[65428,65428],"mapped",[12516]],[[65429,65429],"mapped",[12518]],[[65430,65430],"mapped",[12520]],[[65431,65431],"mapped",[12521]],[[65432,65432],"mapped",[12522]],[[65433,65433],"mapped",[12523]],[[65434,65434],"mapped",[12524]],[[65435,65435],"mapped",[12525]],[[65436,65436],"mapped",[12527]],[[65437,65437],"mapped",[12531]],[[65438,65438],"mapped",[12441]],[[65439,65439],"mapped",[12442]],[[65440,65440],"disallowed"],[[65441,65441],"mapped",[4352]],[[65442,65442],"mapped",[4353]],[[65443,65443],"mapped",[4522]],[[65444,65444],"mapped",[4354]],[[65445,65445],"mapped",[4524]],[[65446,65446],"mapped",[4525]],[[65447,65447],"mapped",[4355]],[[65448,65448],"mapped",[4356]],[[65449,65449],"mapped",[4357]],[[65450,65450],"mapped",[4528]],[[65451,65451],"mapped",[4529]],[[65452,65452],"mapped",[4530]],[[65453,65453],"mapped",[4531]],[[65454,65454],"mapped",[4532]],[[65455,65455],"mapped",[4533]],[[65456,65456],"mapped",[4378]],[[65457,65457],"mapped",[4358]],[[65458,65458],"mapped",[4359]],[[65459,65459],"mapped",[4360]],[[65460,65460],"mapped",[4385]],[[65461,65461],"mapped",[4361]],[[65462,65462],"mapped",[4362]],[[65463,65463],"mapped",[4363]],[[65464,65464],"mapped",[4364]],[[65465,65465],"mapped",[4365]],[[65466,65466],"mapped",[4366]],[[65467,65467],"mapped",[4367]],[[65468,65468],"mapped",[4368]],[[65469,65469],"mapped",[4369]],[[65470,65470],"mapped",[4370]],[[65471,65473],"disallowed"],[[65474,65474],"mapped",[4449]],[[65475,65475],"mapped",[4450]],[[65476,65476],"mapped",[4451]],[[65477,65477],"mapped",[4452]],[[65478,65478],"mapped",[4453]],[[65479,65479],"mapped",[4454]],[[65480,65481],"disallowed"],[[65482,65482],"mapped",[4455]],[[65483,65483],"mapped",[4456]],[[65484,65484],"mapped",[4457]],[[65485,65485],"mapped",[4458]],[[65486,65486],"mapped",[4459]],[[65487,65487],"mapped",[4460]],[[65488,65489],"disallowed"],[[65490,65490],"mapped",[4461]],[[65491,65491],"mapped",[4462]],[[65492,65492],"mapped",[4463]],[[65493,65493],"mapped",[4464]],[[65494,65494],"mapped",[4465]],[[65495,65495],"mapped",[4466]],[[65496,65497],"disallowed"],[[65498,65498],"mapped",[4467]],[[65499,65499],"mapped",[4468]],[[65500,65500],"mapped",[4469]],[[65501,65503],"disallowed"],[[65504,65504],"mapped",[162]],[[65505,65505],"mapped",[163]],[[65506,65506],"mapped",[172]],[[65507,65507],"disallowed_STD3_mapped",[32,772]],[[65508,65508],"mapped",[166]],[[65509,65509],"mapped",[165]],[[65510,65510],"mapped",[8361]],[[65511,65511],"disallowed"],[[65512,65512],"mapped",[9474]],[[65513,65513],"mapped",[8592]],[[65514,65514],"mapped",[8593]],[[65515,65515],"mapped",[8594]],[[65516,65516],"mapped",[8595]],[[65517,65517],"mapped",[9632]],[[65518,65518],"mapped",[9675]],[[65519,65528],"disallowed"],[[65529,65531],"disallowed"],[[65532,65532],"disallowed"],[[65533,65533],"disallowed"],[[65534,65535],"disallowed"],[[65536,65547],"valid"],[[65548,65548],"disallowed"],[[65549,65574],"valid"],[[65575,65575],"disallowed"],[[65576,65594],"valid"],[[65595,65595],"disallowed"],[[65596,65597],"valid"],[[65598,65598],"disallowed"],[[65599,65613],"valid"],[[65614,65615],"disallowed"],[[65616,65629],"valid"],[[65630,65663],"disallowed"],[[65664,65786],"valid"],[[65787,65791],"disallowed"],[[65792,65794],"valid",[],"NV8"],[[65795,65798],"disallowed"],[[65799,65843],"valid",[],"NV8"],[[65844,65846],"disallowed"],[[65847,65855],"valid",[],"NV8"],[[65856,65930],"valid",[],"NV8"],[[65931,65932],"valid",[],"NV8"],[[65933,65935],"disallowed"],[[65936,65947],"valid",[],"NV8"],[[65948,65951],"disallowed"],[[65952,65952],"valid",[],"NV8"],[[65953,65999],"disallowed"],[[66000,66044],"valid",[],"NV8"],[[66045,66045],"valid"],[[66046,66175],"disallowed"],[[66176,66204],"valid"],[[66205,66207],"disallowed"],[[66208,66256],"valid"],[[66257,66271],"disallowed"],[[66272,66272],"valid"],[[66273,66299],"valid",[],"NV8"],[[66300,66303],"disallowed"],[[66304,66334],"valid"],[[66335,66335],"valid"],[[66336,66339],"valid",[],"NV8"],[[66340,66351],"disallowed"],[[66352,66368],"valid"],[[66369,66369],"valid",[],"NV8"],[[66370,66377],"valid"],[[66378,66378],"valid",[],"NV8"],[[66379,66383],"disallowed"],[[66384,66426],"valid"],[[66427,66431],"disallowed"],[[66432,66461],"valid"],[[66462,66462],"disallowed"],[[66463,66463],"valid",[],"NV8"],[[66464,66499],"valid"],[[66500,66503],"disallowed"],[[66504,66511],"valid"],[[66512,66517],"valid",[],"NV8"],[[66518,66559],"disallowed"],[[66560,66560],"mapped",[66600]],[[66561,66561],"mapped",[66601]],[[66562,66562],"mapped",[66602]],[[66563,66563],"mapped",[66603]],[[66564,66564],"mapped",[66604]],[[66565,66565],"mapped",[66605]],[[66566,66566],"mapped",[66606]],[[66567,66567],"mapped",[66607]],[[66568,66568],"mapped",[66608]],[[66569,66569],"mapped",[66609]],[[66570,66570],"mapped",[66610]],[[66571,66571],"mapped",[66611]],[[66572,66572],"mapped",[66612]],[[66573,66573],"mapped",[66613]],[[66574,66574],"mapped",[66614]],[[66575,66575],"mapped",[66615]],[[66576,66576],"mapped",[66616]],[[66577,66577],"mapped",[66617]],[[66578,66578],"mapped",[66618]],[[66579,66579],"mapped",[66619]],[[66580,66580],"mapped",[66620]],[[66581,66581],"mapped",[66621]],[[66582,66582],"mapped",[66622]],[[66583,66583],"mapped",[66623]],[[66584,66584],"mapped",[66624]],[[66585,66585],"mapped",[66625]],[[66586,66586],"mapped",[66626]],[[66587,66587],"mapped",[66627]],[[66588,66588],"mapped",[66628]],[[66589,66589],"mapped",[66629]],[[66590,66590],"mapped",[66630]],[[66591,66591],"mapped",[66631]],[[66592,66592],"mapped",[66632]],[[66593,66593],"mapped",[66633]],[[66594,66594],"mapped",[66634]],[[66595,66595],"mapped",[66635]],[[66596,66596],"mapped",[66636]],[[66597,66597],"mapped",[66637]],[[66598,66598],"mapped",[66638]],[[66599,66599],"mapped",[66639]],[[66600,66637],"valid"],[[66638,66717],"valid"],[[66718,66719],"disallowed"],[[66720,66729],"valid"],[[66730,66815],"disallowed"],[[66816,66855],"valid"],[[66856,66863],"disallowed"],[[66864,66915],"valid"],[[66916,66926],"disallowed"],[[66927,66927],"valid",[],"NV8"],[[66928,67071],"disallowed"],[[67072,67382],"valid"],[[67383,67391],"disallowed"],[[67392,67413],"valid"],[[67414,67423],"disallowed"],[[67424,67431],"valid"],[[67432,67583],"disallowed"],[[67584,67589],"valid"],[[67590,67591],"disallowed"],[[67592,67592],"valid"],[[67593,67593],"disallowed"],[[67594,67637],"valid"],[[67638,67638],"disallowed"],[[67639,67640],"valid"],[[67641,67643],"disallowed"],[[67644,67644],"valid"],[[67645,67646],"disallowed"],[[67647,67647],"valid"],[[67648,67669],"valid"],[[67670,67670],"disallowed"],[[67671,67679],"valid",[],"NV8"],[[67680,67702],"valid"],[[67703,67711],"valid",[],"NV8"],[[67712,67742],"valid"],[[67743,67750],"disallowed"],[[67751,67759],"valid",[],"NV8"],[[67760,67807],"disallowed"],[[67808,67826],"valid"],[[67827,67827],"disallowed"],[[67828,67829],"valid"],[[67830,67834],"disallowed"],[[67835,67839],"valid",[],"NV8"],[[67840,67861],"valid"],[[67862,67865],"valid",[],"NV8"],[[67866,67867],"valid",[],"NV8"],[[67868,67870],"disallowed"],[[67871,67871],"valid",[],"NV8"],[[67872,67897],"valid"],[[67898,67902],"disallowed"],[[67903,67903],"valid",[],"NV8"],[[67904,67967],"disallowed"],[[67968,68023],"valid"],[[68024,68027],"disallowed"],[[68028,68029],"valid",[],"NV8"],[[68030,68031],"valid"],[[68032,68047],"valid",[],"NV8"],[[68048,68049],"disallowed"],[[68050,68095],"valid",[],"NV8"],[[68096,68099],"valid"],[[68100,68100],"disallowed"],[[68101,68102],"valid"],[[68103,68107],"disallowed"],[[68108,68115],"valid"],[[68116,68116],"disallowed"],[[68117,68119],"valid"],[[68120,68120],"disallowed"],[[68121,68147],"valid"],[[68148,68151],"disallowed"],[[68152,68154],"valid"],[[68155,68158],"disallowed"],[[68159,68159],"valid"],[[68160,68167],"valid",[],"NV8"],[[68168,68175],"disallowed"],[[68176,68184],"valid",[],"NV8"],[[68185,68191],"disallowed"],[[68192,68220],"valid"],[[68221,68223],"valid",[],"NV8"],[[68224,68252],"valid"],[[68253,68255],"valid",[],"NV8"],[[68256,68287],"disallowed"],[[68288,68295],"valid"],[[68296,68296],"valid",[],"NV8"],[[68297,68326],"valid"],[[68327,68330],"disallowed"],[[68331,68342],"valid",[],"NV8"],[[68343,68351],"disallowed"],[[68352,68405],"valid"],[[68406,68408],"disallowed"],[[68409,68415],"valid",[],"NV8"],[[68416,68437],"valid"],[[68438,68439],"disallowed"],[[68440,68447],"valid",[],"NV8"],[[68448,68466],"valid"],[[68467,68471],"disallowed"],[[68472,68479],"valid",[],"NV8"],[[68480,68497],"valid"],[[68498,68504],"disallowed"],[[68505,68508],"valid",[],"NV8"],[[68509,68520],"disallowed"],[[68521,68527],"valid",[],"NV8"],[[68528,68607],"disallowed"],[[68608,68680],"valid"],[[68681,68735],"disallowed"],[[68736,68736],"mapped",[68800]],[[68737,68737],"mapped",[68801]],[[68738,68738],"mapped",[68802]],[[68739,68739],"mapped",[68803]],[[68740,68740],"mapped",[68804]],[[68741,68741],"mapped",[68805]],[[68742,68742],"mapped",[68806]],[[68743,68743],"mapped",[68807]],[[68744,68744],"mapped",[68808]],[[68745,68745],"mapped",[68809]],[[68746,68746],"mapped",[68810]],[[68747,68747],"mapped",[68811]],[[68748,68748],"mapped",[68812]],[[68749,68749],"mapped",[68813]],[[68750,68750],"mapped",[68814]],[[68751,68751],"mapped",[68815]],[[68752,68752],"mapped",[68816]],[[68753,68753],"mapped",[68817]],[[68754,68754],"mapped",[68818]],[[68755,68755],"mapped",[68819]],[[68756,68756],"mapped",[68820]],[[68757,68757],"mapped",[68821]],[[68758,68758],"mapped",[68822]],[[68759,68759],"mapped",[68823]],[[68760,68760],"mapped",[68824]],[[68761,68761],"mapped",[68825]],[[68762,68762],"mapped",[68826]],[[68763,68763],"mapped",[68827]],[[68764,68764],"mapped",[68828]],[[68765,68765],"mapped",[68829]],[[68766,68766],"mapped",[68830]],[[68767,68767],"mapped",[68831]],[[68768,68768],"mapped",[68832]],[[68769,68769],"mapped",[68833]],[[68770,68770],"mapped",[68834]],[[68771,68771],"mapped",[68835]],[[68772,68772],"mapped",[68836]],[[68773,68773],"mapped",[68837]],[[68774,68774],"mapped",[68838]],[[68775,68775],"mapped",[68839]],[[68776,68776],"mapped",[68840]],[[68777,68777],"mapped",[68841]],[[68778,68778],"mapped",[68842]],[[68779,68779],"mapped",[68843]],[[68780,68780],"mapped",[68844]],[[68781,68781],"mapped",[68845]],[[68782,68782],"mapped",[68846]],[[68783,68783],"mapped",[68847]],[[68784,68784],"mapped",[68848]],[[68785,68785],"mapped",[68849]],[[68786,68786],"mapped",[68850]],[[68787,68799],"disallowed"],[[68800,68850],"valid"],[[68851,68857],"disallowed"],[[68858,68863],"valid",[],"NV8"],[[68864,69215],"disallowed"],[[69216,69246],"valid",[],"NV8"],[[69247,69631],"disallowed"],[[69632,69702],"valid"],[[69703,69709],"valid",[],"NV8"],[[69710,69713],"disallowed"],[[69714,69733],"valid",[],"NV8"],[[69734,69743],"valid"],[[69744,69758],"disallowed"],[[69759,69759],"valid"],[[69760,69818],"valid"],[[69819,69820],"valid",[],"NV8"],[[69821,69821],"disallowed"],[[69822,69825],"valid",[],"NV8"],[[69826,69839],"disallowed"],[[69840,69864],"valid"],[[69865,69871],"disallowed"],[[69872,69881],"valid"],[[69882,69887],"disallowed"],[[69888,69940],"valid"],[[69941,69941],"disallowed"],[[69942,69951],"valid"],[[69952,69955],"valid",[],"NV8"],[[69956,69967],"disallowed"],[[69968,70003],"valid"],[[70004,70005],"valid",[],"NV8"],[[70006,70006],"valid"],[[70007,70015],"disallowed"],[[70016,70084],"valid"],[[70085,70088],"valid",[],"NV8"],[[70089,70089],"valid",[],"NV8"],[[70090,70092],"valid"],[[70093,70093],"valid",[],"NV8"],[[70094,70095],"disallowed"],[[70096,70105],"valid"],[[70106,70106],"valid"],[[70107,70107],"valid",[],"NV8"],[[70108,70108],"valid"],[[70109,70111],"valid",[],"NV8"],[[70112,70112],"disallowed"],[[70113,70132],"valid",[],"NV8"],[[70133,70143],"disallowed"],[[70144,70161],"valid"],[[70162,70162],"disallowed"],[[70163,70199],"valid"],[[70200,70205],"valid",[],"NV8"],[[70206,70271],"disallowed"],[[70272,70278],"valid"],[[70279,70279],"disallowed"],[[70280,70280],"valid"],[[70281,70281],"disallowed"],[[70282,70285],"valid"],[[70286,70286],"disallowed"],[[70287,70301],"valid"],[[70302,70302],"disallowed"],[[70303,70312],"valid"],[[70313,70313],"valid",[],"NV8"],[[70314,70319],"disallowed"],[[70320,70378],"valid"],[[70379,70383],"disallowed"],[[70384,70393],"valid"],[[70394,70399],"disallowed"],[[70400,70400],"valid"],[[70401,70403],"valid"],[[70404,70404],"disallowed"],[[70405,70412],"valid"],[[70413,70414],"disallowed"],[[70415,70416],"valid"],[[70417,70418],"disallowed"],[[70419,70440],"valid"],[[70441,70441],"disallowed"],[[70442,70448],"valid"],[[70449,70449],"disallowed"],[[70450,70451],"valid"],[[70452,70452],"disallowed"],[[70453,70457],"valid"],[[70458,70459],"disallowed"],[[70460,70468],"valid"],[[70469,70470],"disallowed"],[[70471,70472],"valid"],[[70473,70474],"disallowed"],[[70475,70477],"valid"],[[70478,70479],"disallowed"],[[70480,70480],"valid"],[[70481,70486],"disallowed"],[[70487,70487],"valid"],[[70488,70492],"disallowed"],[[70493,70499],"valid"],[[70500,70501],"disallowed"],[[70502,70508],"valid"],[[70509,70511],"disallowed"],[[70512,70516],"valid"],[[70517,70783],"disallowed"],[[70784,70853],"valid"],[[70854,70854],"valid",[],"NV8"],[[70855,70855],"valid"],[[70856,70863],"disallowed"],[[70864,70873],"valid"],[[70874,71039],"disallowed"],[[71040,71093],"valid"],[[71094,71095],"disallowed"],[[71096,71104],"valid"],[[71105,71113],"valid",[],"NV8"],[[71114,71127],"valid",[],"NV8"],[[71128,71133],"valid"],[[71134,71167],"disallowed"],[[71168,71232],"valid"],[[71233,71235],"valid",[],"NV8"],[[71236,71236],"valid"],[[71237,71247],"disallowed"],[[71248,71257],"valid"],[[71258,71295],"disallowed"],[[71296,71351],"valid"],[[71352,71359],"disallowed"],[[71360,71369],"valid"],[[71370,71423],"disallowed"],[[71424,71449],"valid"],[[71450,71452],"disallowed"],[[71453,71467],"valid"],[[71468,71471],"disallowed"],[[71472,71481],"valid"],[[71482,71487],"valid",[],"NV8"],[[71488,71839],"disallowed"],[[71840,71840],"mapped",[71872]],[[71841,71841],"mapped",[71873]],[[71842,71842],"mapped",[71874]],[[71843,71843],"mapped",[71875]],[[71844,71844],"mapped",[71876]],[[71845,71845],"mapped",[71877]],[[71846,71846],"mapped",[71878]],[[71847,71847],"mapped",[71879]],[[71848,71848],"mapped",[71880]],[[71849,71849],"mapped",[71881]],[[71850,71850],"mapped",[71882]],[[71851,71851],"mapped",[71883]],[[71852,71852],"mapped",[71884]],[[71853,71853],"mapped",[71885]],[[71854,71854],"mapped",[71886]],[[71855,71855],"mapped",[71887]],[[71856,71856],"mapped",[71888]],[[71857,71857],"mapped",[71889]],[[71858,71858],"mapped",[71890]],[[71859,71859],"mapped",[71891]],[[71860,71860],"mapped",[71892]],[[71861,71861],"mapped",[71893]],[[71862,71862],"mapped",[71894]],[[71863,71863],"mapped",[71895]],[[71864,71864],"mapped",[71896]],[[71865,71865],"mapped",[71897]],[[71866,71866],"mapped",[71898]],[[71867,71867],"mapped",[71899]],[[71868,71868],"mapped",[71900]],[[71869,71869],"mapped",[71901]],[[71870,71870],"mapped",[71902]],[[71871,71871],"mapped",[71903]],[[71872,71913],"valid"],[[71914,71922],"valid",[],"NV8"],[[71923,71934],"disallowed"],[[71935,71935],"valid"],[[71936,72383],"disallowed"],[[72384,72440],"valid"],[[72441,73727],"disallowed"],[[73728,74606],"valid"],[[74607,74648],"valid"],[[74649,74649],"valid"],[[74650,74751],"disallowed"],[[74752,74850],"valid",[],"NV8"],[[74851,74862],"valid",[],"NV8"],[[74863,74863],"disallowed"],[[74864,74867],"valid",[],"NV8"],[[74868,74868],"valid",[],"NV8"],[[74869,74879],"disallowed"],[[74880,75075],"valid"],[[75076,77823],"disallowed"],[[77824,78894],"valid"],[[78895,82943],"disallowed"],[[82944,83526],"valid"],[[83527,92159],"disallowed"],[[92160,92728],"valid"],[[92729,92735],"disallowed"],[[92736,92766],"valid"],[[92767,92767],"disallowed"],[[92768,92777],"valid"],[[92778,92781],"disallowed"],[[92782,92783],"valid",[],"NV8"],[[92784,92879],"disallowed"],[[92880,92909],"valid"],[[92910,92911],"disallowed"],[[92912,92916],"valid"],[[92917,92917],"valid",[],"NV8"],[[92918,92927],"disallowed"],[[92928,92982],"valid"],[[92983,92991],"valid",[],"NV8"],[[92992,92995],"valid"],[[92996,92997],"valid",[],"NV8"],[[92998,93007],"disallowed"],[[93008,93017],"valid"],[[93018,93018],"disallowed"],[[93019,93025],"valid",[],"NV8"],[[93026,93026],"disallowed"],[[93027,93047],"valid"],[[93048,93052],"disallowed"],[[93053,93071],"valid"],[[93072,93951],"disallowed"],[[93952,94020],"valid"],[[94021,94031],"disallowed"],[[94032,94078],"valid"],[[94079,94094],"disallowed"],[[94095,94111],"valid"],[[94112,110591],"disallowed"],[[110592,110593],"valid"],[[110594,113663],"disallowed"],[[113664,113770],"valid"],[[113771,113775],"disallowed"],[[113776,113788],"valid"],[[113789,113791],"disallowed"],[[113792,113800],"valid"],[[113801,113807],"disallowed"],[[113808,113817],"valid"],[[113818,113819],"disallowed"],[[113820,113820],"valid",[],"NV8"],[[113821,113822],"valid"],[[113823,113823],"valid",[],"NV8"],[[113824,113827],"ignored"],[[113828,118783],"disallowed"],[[118784,119029],"valid",[],"NV8"],[[119030,119039],"disallowed"],[[119040,119078],"valid",[],"NV8"],[[119079,119080],"disallowed"],[[119081,119081],"valid",[],"NV8"],[[119082,119133],"valid",[],"NV8"],[[119134,119134],"mapped",[119127,119141]],[[119135,119135],"mapped",[119128,119141]],[[119136,119136],"mapped",[119128,119141,119150]],[[119137,119137],"mapped",[119128,119141,119151]],[[119138,119138],"mapped",[119128,119141,119152]],[[119139,119139],"mapped",[119128,119141,119153]],[[119140,119140],"mapped",[119128,119141,119154]],[[119141,119154],"valid",[],"NV8"],[[119155,119162],"disallowed"],[[119163,119226],"valid",[],"NV8"],[[119227,119227],"mapped",[119225,119141]],[[119228,119228],"mapped",[119226,119141]],[[119229,119229],"mapped",[119225,119141,119150]],[[119230,119230],"mapped",[119226,119141,119150]],[[119231,119231],"mapped",[119225,119141,119151]],[[119232,119232],"mapped",[119226,119141,119151]],[[119233,119261],"valid",[],"NV8"],[[119262,119272],"valid",[],"NV8"],[[119273,119295],"disallowed"],[[119296,119365],"valid",[],"NV8"],[[119366,119551],"disallowed"],[[119552,119638],"valid",[],"NV8"],[[119639,119647],"disallowed"],[[119648,119665],"valid",[],"NV8"],[[119666,119807],"disallowed"],[[119808,119808],"mapped",[97]],[[119809,119809],"mapped",[98]],[[119810,119810],"mapped",[99]],[[119811,119811],"mapped",[100]],[[119812,119812],"mapped",[101]],[[119813,119813],"mapped",[102]],[[119814,119814],"mapped",[103]],[[119815,119815],"mapped",[104]],[[119816,119816],"mapped",[105]],[[119817,119817],"mapped",[106]],[[119818,119818],"mapped",[107]],[[119819,119819],"mapped",[108]],[[119820,119820],"mapped",[109]],[[119821,119821],"mapped",[110]],[[119822,119822],"mapped",[111]],[[119823,119823],"mapped",[112]],[[119824,119824],"mapped",[113]],[[119825,119825],"mapped",[114]],[[119826,119826],"mapped",[115]],[[119827,119827],"mapped",[116]],[[119828,119828],"mapped",[117]],[[119829,119829],"mapped",[118]],[[119830,119830],"mapped",[119]],[[119831,119831],"mapped",[120]],[[119832,119832],"mapped",[121]],[[119833,119833],"mapped",[122]],[[119834,119834],"mapped",[97]],[[119835,119835],"mapped",[98]],[[119836,119836],"mapped",[99]],[[119837,119837],"mapped",[100]],[[119838,119838],"mapped",[101]],[[119839,119839],"mapped",[102]],[[119840,119840],"mapped",[103]],[[119841,119841],"mapped",[104]],[[119842,119842],"mapped",[105]],[[119843,119843],"mapped",[106]],[[119844,119844],"mapped",[107]],[[119845,119845],"mapped",[108]],[[119846,119846],"mapped",[109]],[[119847,119847],"mapped",[110]],[[119848,119848],"mapped",[111]],[[119849,119849],"mapped",[112]],[[119850,119850],"mapped",[113]],[[119851,119851],"mapped",[114]],[[119852,119852],"mapped",[115]],[[119853,119853],"mapped",[116]],[[119854,119854],"mapped",[117]],[[119855,119855],"mapped",[118]],[[119856,119856],"mapped",[119]],[[119857,119857],"mapped",[120]],[[119858,119858],"mapped",[121]],[[119859,119859],"mapped",[122]],[[119860,119860],"mapped",[97]],[[119861,119861],"mapped",[98]],[[119862,119862],"mapped",[99]],[[119863,119863],"mapped",[100]],[[119864,119864],"mapped",[101]],[[119865,119865],"mapped",[102]],[[119866,119866],"mapped",[103]],[[119867,119867],"mapped",[104]],[[119868,119868],"mapped",[105]],[[119869,119869],"mapped",[106]],[[119870,119870],"mapped",[107]],[[119871,119871],"mapped",[108]],[[119872,119872],"mapped",[109]],[[119873,119873],"mapped",[110]],[[119874,119874],"mapped",[111]],[[119875,119875],"mapped",[112]],[[119876,119876],"mapped",[113]],[[119877,119877],"mapped",[114]],[[119878,119878],"mapped",[115]],[[119879,119879],"mapped",[116]],[[119880,119880],"mapped",[117]],[[119881,119881],"mapped",[118]],[[119882,119882],"mapped",[119]],[[119883,119883],"mapped",[120]],[[119884,119884],"mapped",[121]],[[119885,119885],"mapped",[122]],[[119886,119886],"mapped",[97]],[[119887,119887],"mapped",[98]],[[119888,119888],"mapped",[99]],[[119889,119889],"mapped",[100]],[[119890,119890],"mapped",[101]],[[119891,119891],"mapped",[102]],[[119892,119892],"mapped",[103]],[[119893,119893],"disallowed"],[[119894,119894],"mapped",[105]],[[119895,119895],"mapped",[106]],[[119896,119896],"mapped",[107]],[[119897,119897],"mapped",[108]],[[119898,119898],"mapped",[109]],[[119899,119899],"mapped",[110]],[[119900,119900],"mapped",[111]],[[119901,119901],"mapped",[112]],[[119902,119902],"mapped",[113]],[[119903,119903],"mapped",[114]],[[119904,119904],"mapped",[115]],[[119905,119905],"mapped",[116]],[[119906,119906],"mapped",[117]],[[119907,119907],"mapped",[118]],[[119908,119908],"mapped",[119]],[[119909,119909],"mapped",[120]],[[119910,119910],"mapped",[121]],[[119911,119911],"mapped",[122]],[[119912,119912],"mapped",[97]],[[119913,119913],"mapped",[98]],[[119914,119914],"mapped",[99]],[[119915,119915],"mapped",[100]],[[119916,119916],"mapped",[101]],[[119917,119917],"mapped",[102]],[[119918,119918],"mapped",[103]],[[119919,119919],"mapped",[104]],[[119920,119920],"mapped",[105]],[[119921,119921],"mapped",[106]],[[119922,119922],"mapped",[107]],[[119923,119923],"mapped",[108]],[[119924,119924],"mapped",[109]],[[119925,119925],"mapped",[110]],[[119926,119926],"mapped",[111]],[[119927,119927],"mapped",[112]],[[119928,119928],"mapped",[113]],[[119929,119929],"mapped",[114]],[[119930,119930],"mapped",[115]],[[119931,119931],"mapped",[116]],[[119932,119932],"mapped",[117]],[[119933,119933],"mapped",[118]],[[119934,119934],"mapped",[119]],[[119935,119935],"mapped",[120]],[[119936,119936],"mapped",[121]],[[119937,119937],"mapped",[122]],[[119938,119938],"mapped",[97]],[[119939,119939],"mapped",[98]],[[119940,119940],"mapped",[99]],[[119941,119941],"mapped",[100]],[[119942,119942],"mapped",[101]],[[119943,119943],"mapped",[102]],[[119944,119944],"mapped",[103]],[[119945,119945],"mapped",[104]],[[119946,119946],"mapped",[105]],[[119947,119947],"mapped",[106]],[[119948,119948],"mapped",[107]],[[119949,119949],"mapped",[108]],[[119950,119950],"mapped",[109]],[[119951,119951],"mapped",[110]],[[119952,119952],"mapped",[111]],[[119953,119953],"mapped",[112]],[[119954,119954],"mapped",[113]],[[119955,119955],"mapped",[114]],[[119956,119956],"mapped",[115]],[[119957,119957],"mapped",[116]],[[119958,119958],"mapped",[117]],[[119959,119959],"mapped",[118]],[[119960,119960],"mapped",[119]],[[119961,119961],"mapped",[120]],[[119962,119962],"mapped",[121]],[[119963,119963],"mapped",[122]],[[119964,119964],"mapped",[97]],[[119965,119965],"disallowed"],[[119966,119966],"mapped",[99]],[[119967,119967],"mapped",[100]],[[119968,119969],"disallowed"],[[119970,119970],"mapped",[103]],[[119971,119972],"disallowed"],[[119973,119973],"mapped",[106]],[[119974,119974],"mapped",[107]],[[119975,119976],"disallowed"],[[119977,119977],"mapped",[110]],[[119978,119978],"mapped",[111]],[[119979,119979],"mapped",[112]],[[119980,119980],"mapped",[113]],[[119981,119981],"disallowed"],[[119982,119982],"mapped",[115]],[[119983,119983],"mapped",[116]],[[119984,119984],"mapped",[117]],[[119985,119985],"mapped",[118]],[[119986,119986],"mapped",[119]],[[119987,119987],"mapped",[120]],[[119988,119988],"mapped",[121]],[[119989,119989],"mapped",[122]],[[119990,119990],"mapped",[97]],[[119991,119991],"mapped",[98]],[[119992,119992],"mapped",[99]],[[119993,119993],"mapped",[100]],[[119994,119994],"disallowed"],[[119995,119995],"mapped",[102]],[[119996,119996],"disallowed"],[[119997,119997],"mapped",[104]],[[119998,119998],"mapped",[105]],[[119999,119999],"mapped",[106]],[[120000,120000],"mapped",[107]],[[120001,120001],"mapped",[108]],[[120002,120002],"mapped",[109]],[[120003,120003],"mapped",[110]],[[120004,120004],"disallowed"],[[120005,120005],"mapped",[112]],[[120006,120006],"mapped",[113]],[[120007,120007],"mapped",[114]],[[120008,120008],"mapped",[115]],[[120009,120009],"mapped",[116]],[[120010,120010],"mapped",[117]],[[120011,120011],"mapped",[118]],[[120012,120012],"mapped",[119]],[[120013,120013],"mapped",[120]],[[120014,120014],"mapped",[121]],[[120015,120015],"mapped",[122]],[[120016,120016],"mapped",[97]],[[120017,120017],"mapped",[98]],[[120018,120018],"mapped",[99]],[[120019,120019],"mapped",[100]],[[120020,120020],"mapped",[101]],[[120021,120021],"mapped",[102]],[[120022,120022],"mapped",[103]],[[120023,120023],"mapped",[104]],[[120024,120024],"mapped",[105]],[[120025,120025],"mapped",[106]],[[120026,120026],"mapped",[107]],[[120027,120027],"mapped",[108]],[[120028,120028],"mapped",[109]],[[120029,120029],"mapped",[110]],[[120030,120030],"mapped",[111]],[[120031,120031],"mapped",[112]],[[120032,120032],"mapped",[113]],[[120033,120033],"mapped",[114]],[[120034,120034],"mapped",[115]],[[120035,120035],"mapped",[116]],[[120036,120036],"mapped",[117]],[[120037,120037],"mapped",[118]],[[120038,120038],"mapped",[119]],[[120039,120039],"mapped",[120]],[[120040,120040],"mapped",[121]],[[120041,120041],"mapped",[122]],[[120042,120042],"mapped",[97]],[[120043,120043],"mapped",[98]],[[120044,120044],"mapped",[99]],[[120045,120045],"mapped",[100]],[[120046,120046],"mapped",[101]],[[120047,120047],"mapped",[102]],[[120048,120048],"mapped",[103]],[[120049,120049],"mapped",[104]],[[120050,120050],"mapped",[105]],[[120051,120051],"mapped",[106]],[[120052,120052],"mapped",[107]],[[120053,120053],"mapped",[108]],[[120054,120054],"mapped",[109]],[[120055,120055],"mapped",[110]],[[120056,120056],"mapped",[111]],[[120057,120057],"mapped",[112]],[[120058,120058],"mapped",[113]],[[120059,120059],"mapped",[114]],[[120060,120060],"mapped",[115]],[[120061,120061],"mapped",[116]],[[120062,120062],"mapped",[117]],[[120063,120063],"mapped",[118]],[[120064,120064],"mapped",[119]],[[120065,120065],"mapped",[120]],[[120066,120066],"mapped",[121]],[[120067,120067],"mapped",[122]],[[120068,120068],"mapped",[97]],[[120069,120069],"mapped",[98]],[[120070,120070],"disallowed"],[[120071,120071],"mapped",[100]],[[120072,120072],"mapped",[101]],[[120073,120073],"mapped",[102]],[[120074,120074],"mapped",[103]],[[120075,120076],"disallowed"],[[120077,120077],"mapped",[106]],[[120078,120078],"mapped",[107]],[[120079,120079],"mapped",[108]],[[120080,120080],"mapped",[109]],[[120081,120081],"mapped",[110]],[[120082,120082],"mapped",[111]],[[120083,120083],"mapped",[112]],[[120084,120084],"mapped",[113]],[[120085,120085],"disallowed"],[[120086,120086],"mapped",[115]],[[120087,120087],"mapped",[116]],[[120088,120088],"mapped",[117]],[[120089,120089],"mapped",[118]],[[120090,120090],"mapped",[119]],[[120091,120091],"mapped",[120]],[[120092,120092],"mapped",[121]],[[120093,120093],"disallowed"],[[120094,120094],"mapped",[97]],[[120095,120095],"mapped",[98]],[[120096,120096],"mapped",[99]],[[120097,120097],"mapped",[100]],[[120098,120098],"mapped",[101]],[[120099,120099],"mapped",[102]],[[120100,120100],"mapped",[103]],[[120101,120101],"mapped",[104]],[[120102,120102],"mapped",[105]],[[120103,120103],"mapped",[106]],[[120104,120104],"mapped",[107]],[[120105,120105],"mapped",[108]],[[120106,120106],"mapped",[109]],[[120107,120107],"mapped",[110]],[[120108,120108],"mapped",[111]],[[120109,120109],"mapped",[112]],[[120110,120110],"mapped",[113]],[[120111,120111],"mapped",[114]],[[120112,120112],"mapped",[115]],[[120113,120113],"mapped",[116]],[[120114,120114],"mapped",[117]],[[120115,120115],"mapped",[118]],[[120116,120116],"mapped",[119]],[[120117,120117],"mapped",[120]],[[120118,120118],"mapped",[121]],[[120119,120119],"mapped",[122]],[[120120,120120],"mapped",[97]],[[120121,120121],"mapped",[98]],[[120122,120122],"disallowed"],[[120123,120123],"mapped",[100]],[[120124,120124],"mapped",[101]],[[120125,120125],"mapped",[102]],[[120126,120126],"mapped",[103]],[[120127,120127],"disallowed"],[[120128,120128],"mapped",[105]],[[120129,120129],"mapped",[106]],[[120130,120130],"mapped",[107]],[[120131,120131],"mapped",[108]],[[120132,120132],"mapped",[109]],[[120133,120133],"disallowed"],[[120134,120134],"mapped",[111]],[[120135,120137],"disallowed"],[[120138,120138],"mapped",[115]],[[120139,120139],"mapped",[116]],[[120140,120140],"mapped",[117]],[[120141,120141],"mapped",[118]],[[120142,120142],"mapped",[119]],[[120143,120143],"mapped",[120]],[[120144,120144],"mapped",[121]],[[120145,120145],"disallowed"],[[120146,120146],"mapped",[97]],[[120147,120147],"mapped",[98]],[[120148,120148],"mapped",[99]],[[120149,120149],"mapped",[100]],[[120150,120150],"mapped",[101]],[[120151,120151],"mapped",[102]],[[120152,120152],"mapped",[103]],[[120153,120153],"mapped",[104]],[[120154,120154],"mapped",[105]],[[120155,120155],"mapped",[106]],[[120156,120156],"mapped",[107]],[[120157,120157],"mapped",[108]],[[120158,120158],"mapped",[109]],[[120159,120159],"mapped",[110]],[[120160,120160],"mapped",[111]],[[120161,120161],"mapped",[112]],[[120162,120162],"mapped",[113]],[[120163,120163],"mapped",[114]],[[120164,120164],"mapped",[115]],[[120165,120165],"mapped",[116]],[[120166,120166],"mapped",[117]],[[120167,120167],"mapped",[118]],[[120168,120168],"mapped",[119]],[[120169,120169],"mapped",[120]],[[120170,120170],"mapped",[121]],[[120171,120171],"mapped",[122]],[[120172,120172],"mapped",[97]],[[120173,120173],"mapped",[98]],[[120174,120174],"mapped",[99]],[[120175,120175],"mapped",[100]],[[120176,120176],"mapped",[101]],[[120177,120177],"mapped",[102]],[[120178,120178],"mapped",[103]],[[120179,120179],"mapped",[104]],[[120180,120180],"mapped",[105]],[[120181,120181],"mapped",[106]],[[120182,120182],"mapped",[107]],[[120183,120183],"mapped",[108]],[[120184,120184],"mapped",[109]],[[120185,120185],"mapped",[110]],[[120186,120186],"mapped",[111]],[[120187,120187],"mapped",[112]],[[120188,120188],"mapped",[113]],[[120189,120189],"mapped",[114]],[[120190,120190],"mapped",[115]],[[120191,120191],"mapped",[116]],[[120192,120192],"mapped",[117]],[[120193,120193],"mapped",[118]],[[120194,120194],"mapped",[119]],[[120195,120195],"mapped",[120]],[[120196,120196],"mapped",[121]],[[120197,120197],"mapped",[122]],[[120198,120198],"mapped",[97]],[[120199,120199],"mapped",[98]],[[120200,120200],"mapped",[99]],[[120201,120201],"mapped",[100]],[[120202,120202],"mapped",[101]],[[120203,120203],"mapped",[102]],[[120204,120204],"mapped",[103]],[[120205,120205],"mapped",[104]],[[120206,120206],"mapped",[105]],[[120207,120207],"mapped",[106]],[[120208,120208],"mapped",[107]],[[120209,120209],"mapped",[108]],[[120210,120210],"mapped",[109]],[[120211,120211],"mapped",[110]],[[120212,120212],"mapped",[111]],[[120213,120213],"mapped",[112]],[[120214,120214],"mapped",[113]],[[120215,120215],"mapped",[114]],[[120216,120216],"mapped",[115]],[[120217,120217],"mapped",[116]],[[120218,120218],"mapped",[117]],[[120219,120219],"mapped",[118]],[[120220,120220],"mapped",[119]],[[120221,120221],"mapped",[120]],[[120222,120222],"mapped",[121]],[[120223,120223],"mapped",[122]],[[120224,120224],"mapped",[97]],[[120225,120225],"mapped",[98]],[[120226,120226],"mapped",[99]],[[120227,120227],"mapped",[100]],[[120228,120228],"mapped",[101]],[[120229,120229],"mapped",[102]],[[120230,120230],"mapped",[103]],[[120231,120231],"mapped",[104]],[[120232,120232],"mapped",[105]],[[120233,120233],"mapped",[106]],[[120234,120234],"mapped",[107]],[[120235,120235],"mapped",[108]],[[120236,120236],"mapped",[109]],[[120237,120237],"mapped",[110]],[[120238,120238],"mapped",[111]],[[120239,120239],"mapped",[112]],[[120240,120240],"mapped",[113]],[[120241,120241],"mapped",[114]],[[120242,120242],"mapped",[115]],[[120243,120243],"mapped",[116]],[[120244,120244],"mapped",[117]],[[120245,120245],"mapped",[118]],[[120246,120246],"mapped",[119]],[[120247,120247],"mapped",[120]],[[120248,120248],"mapped",[121]],[[120249,120249],"mapped",[122]],[[120250,120250],"mapped",[97]],[[120251,120251],"mapped",[98]],[[120252,120252],"mapped",[99]],[[120253,120253],"mapped",[100]],[[120254,120254],"mapped",[101]],[[120255,120255],"mapped",[102]],[[120256,120256],"mapped",[103]],[[120257,120257],"mapped",[104]],[[120258,120258],"mapped",[105]],[[120259,120259],"mapped",[106]],[[120260,120260],"mapped",[107]],[[120261,120261],"mapped",[108]],[[120262,120262],"mapped",[109]],[[120263,120263],"mapped",[110]],[[120264,120264],"mapped",[111]],[[120265,120265],"mapped",[112]],[[120266,120266],"mapped",[113]],[[120267,120267],"mapped",[114]],[[120268,120268],"mapped",[115]],[[120269,120269],"mapped",[116]],[[120270,120270],"mapped",[117]],[[120271,120271],"mapped",[118]],[[120272,120272],"mapped",[119]],[[120273,120273],"mapped",[120]],[[120274,120274],"mapped",[121]],[[120275,120275],"mapped",[122]],[[120276,120276],"mapped",[97]],[[120277,120277],"mapped",[98]],[[120278,120278],"mapped",[99]],[[120279,120279],"mapped",[100]],[[120280,120280],"mapped",[101]],[[120281,120281],"mapped",[102]],[[120282,120282],"mapped",[103]],[[120283,120283],"mapped",[104]],[[120284,120284],"mapped",[105]],[[120285,120285],"mapped",[106]],[[120286,120286],"mapped",[107]],[[120287,120287],"mapped",[108]],[[120288,120288],"mapped",[109]],[[120289,120289],"mapped",[110]],[[120290,120290],"mapped",[111]],[[120291,120291],"mapped",[112]],[[120292,120292],"mapped",[113]],[[120293,120293],"mapped",[114]],[[120294,120294],"mapped",[115]],[[120295,120295],"mapped",[116]],[[120296,120296],"mapped",[117]],[[120297,120297],"mapped",[118]],[[120298,120298],"mapped",[119]],[[120299,120299],"mapped",[120]],[[120300,120300],"mapped",[121]],[[120301,120301],"mapped",[122]],[[120302,120302],"mapped",[97]],[[120303,120303],"mapped",[98]],[[120304,120304],"mapped",[99]],[[120305,120305],"mapped",[100]],[[120306,120306],"mapped",[101]],[[120307,120307],"mapped",[102]],[[120308,120308],"mapped",[103]],[[120309,120309],"mapped",[104]],[[120310,120310],"mapped",[105]],[[120311,120311],"mapped",[106]],[[120312,120312],"mapped",[107]],[[120313,120313],"mapped",[108]],[[120314,120314],"mapped",[109]],[[120315,120315],"mapped",[110]],[[120316,120316],"mapped",[111]],[[120317,120317],"mapped",[112]],[[120318,120318],"mapped",[113]],[[120319,120319],"mapped",[114]],[[120320,120320],"mapped",[115]],[[120321,120321],"mapped",[116]],[[120322,120322],"mapped",[117]],[[120323,120323],"mapped",[118]],[[120324,120324],"mapped",[119]],[[120325,120325],"mapped",[120]],[[120326,120326],"mapped",[121]],[[120327,120327],"mapped",[122]],[[120328,120328],"mapped",[97]],[[120329,120329],"mapped",[98]],[[120330,120330],"mapped",[99]],[[120331,120331],"mapped",[100]],[[120332,120332],"mapped",[101]],[[120333,120333],"mapped",[102]],[[120334,120334],"mapped",[103]],[[120335,120335],"mapped",[104]],[[120336,120336],"mapped",[105]],[[120337,120337],"mapped",[106]],[[120338,120338],"mapped",[107]],[[120339,120339],"mapped",[108]],[[120340,120340],"mapped",[109]],[[120341,120341],"mapped",[110]],[[120342,120342],"mapped",[111]],[[120343,120343],"mapped",[112]],[[120344,120344],"mapped",[113]],[[120345,120345],"mapped",[114]],[[120346,120346],"mapped",[115]],[[120347,120347],"mapped",[116]],[[120348,120348],"mapped",[117]],[[120349,120349],"mapped",[118]],[[120350,120350],"mapped",[119]],[[120351,120351],"mapped",[120]],[[120352,120352],"mapped",[121]],[[120353,120353],"mapped",[122]],[[120354,120354],"mapped",[97]],[[120355,120355],"mapped",[98]],[[120356,120356],"mapped",[99]],[[120357,120357],"mapped",[100]],[[120358,120358],"mapped",[101]],[[120359,120359],"mapped",[102]],[[120360,120360],"mapped",[103]],[[120361,120361],"mapped",[104]],[[120362,120362],"mapped",[105]],[[120363,120363],"mapped",[106]],[[120364,120364],"mapped",[107]],[[120365,120365],"mapped",[108]],[[120366,120366],"mapped",[109]],[[120367,120367],"mapped",[110]],[[120368,120368],"mapped",[111]],[[120369,120369],"mapped",[112]],[[120370,120370],"mapped",[113]],[[120371,120371],"mapped",[114]],[[120372,120372],"mapped",[115]],[[120373,120373],"mapped",[116]],[[120374,120374],"mapped",[117]],[[120375,120375],"mapped",[118]],[[120376,120376],"mapped",[119]],[[120377,120377],"mapped",[120]],[[120378,120378],"mapped",[121]],[[120379,120379],"mapped",[122]],[[120380,120380],"mapped",[97]],[[120381,120381],"mapped",[98]],[[120382,120382],"mapped",[99]],[[120383,120383],"mapped",[100]],[[120384,120384],"mapped",[101]],[[120385,120385],"mapped",[102]],[[120386,120386],"mapped",[103]],[[120387,120387],"mapped",[104]],[[120388,120388],"mapped",[105]],[[120389,120389],"mapped",[106]],[[120390,120390],"mapped",[107]],[[120391,120391],"mapped",[108]],[[120392,120392],"mapped",[109]],[[120393,120393],"mapped",[110]],[[120394,120394],"mapped",[111]],[[120395,120395],"mapped",[112]],[[120396,120396],"mapped",[113]],[[120397,120397],"mapped",[114]],[[120398,120398],"mapped",[115]],[[120399,120399],"mapped",[116]],[[120400,120400],"mapped",[117]],[[120401,120401],"mapped",[118]],[[120402,120402],"mapped",[119]],[[120403,120403],"mapped",[120]],[[120404,120404],"mapped",[121]],[[120405,120405],"mapped",[122]],[[120406,120406],"mapped",[97]],[[120407,120407],"mapped",[98]],[[120408,120408],"mapped",[99]],[[120409,120409],"mapped",[100]],[[120410,120410],"mapped",[101]],[[120411,120411],"mapped",[102]],[[120412,120412],"mapped",[103]],[[120413,120413],"mapped",[104]],[[120414,120414],"mapped",[105]],[[120415,120415],"mapped",[106]],[[120416,120416],"mapped",[107]],[[120417,120417],"mapped",[108]],[[120418,120418],"mapped",[109]],[[120419,120419],"mapped",[110]],[[120420,120420],"mapped",[111]],[[120421,120421],"mapped",[112]],[[120422,120422],"mapped",[113]],[[120423,120423],"mapped",[114]],[[120424,120424],"mapped",[115]],[[120425,120425],"mapped",[116]],[[120426,120426],"mapped",[117]],[[120427,120427],"mapped",[118]],[[120428,120428],"mapped",[119]],[[120429,120429],"mapped",[120]],[[120430,120430],"mapped",[121]],[[120431,120431],"mapped",[122]],[[120432,120432],"mapped",[97]],[[120433,120433],"mapped",[98]],[[120434,120434],"mapped",[99]],[[120435,120435],"mapped",[100]],[[120436,120436],"mapped",[101]],[[120437,120437],"mapped",[102]],[[120438,120438],"mapped",[103]],[[120439,120439],"mapped",[104]],[[120440,120440],"mapped",[105]],[[120441,120441],"mapped",[106]],[[120442,120442],"mapped",[107]],[[120443,120443],"mapped",[108]],[[120444,120444],"mapped",[109]],[[120445,120445],"mapped",[110]],[[120446,120446],"mapped",[111]],[[120447,120447],"mapped",[112]],[[120448,120448],"mapped",[113]],[[120449,120449],"mapped",[114]],[[120450,120450],"mapped",[115]],[[120451,120451],"mapped",[116]],[[120452,120452],"mapped",[117]],[[120453,120453],"mapped",[118]],[[120454,120454],"mapped",[119]],[[120455,120455],"mapped",[120]],[[120456,120456],"mapped",[121]],[[120457,120457],"mapped",[122]],[[120458,120458],"mapped",[97]],[[120459,120459],"mapped",[98]],[[120460,120460],"mapped",[99]],[[120461,120461],"mapped",[100]],[[120462,120462],"mapped",[101]],[[120463,120463],"mapped",[102]],[[120464,120464],"mapped",[103]],[[120465,120465],"mapped",[104]],[[120466,120466],"mapped",[105]],[[120467,120467],"mapped",[106]],[[120468,120468],"mapped",[107]],[[120469,120469],"mapped",[108]],[[120470,120470],"mapped",[109]],[[120471,120471],"mapped",[110]],[[120472,120472],"mapped",[111]],[[120473,120473],"mapped",[112]],[[120474,120474],"mapped",[113]],[[120475,120475],"mapped",[114]],[[120476,120476],"mapped",[115]],[[120477,120477],"mapped",[116]],[[120478,120478],"mapped",[117]],[[120479,120479],"mapped",[118]],[[120480,120480],"mapped",[119]],[[120481,120481],"mapped",[120]],[[120482,120482],"mapped",[121]],[[120483,120483],"mapped",[122]],[[120484,120484],"mapped",[305]],[[120485,120485],"mapped",[567]],[[120486,120487],"disallowed"],[[120488,120488],"mapped",[945]],[[120489,120489],"mapped",[946]],[[120490,120490],"mapped",[947]],[[120491,120491],"mapped",[948]],[[120492,120492],"mapped",[949]],[[120493,120493],"mapped",[950]],[[120494,120494],"mapped",[951]],[[120495,120495],"mapped",[952]],[[120496,120496],"mapped",[953]],[[120497,120497],"mapped",[954]],[[120498,120498],"mapped",[955]],[[120499,120499],"mapped",[956]],[[120500,120500],"mapped",[957]],[[120501,120501],"mapped",[958]],[[120502,120502],"mapped",[959]],[[120503,120503],"mapped",[960]],[[120504,120504],"mapped",[961]],[[120505,120505],"mapped",[952]],[[120506,120506],"mapped",[963]],[[120507,120507],"mapped",[964]],[[120508,120508],"mapped",[965]],[[120509,120509],"mapped",[966]],[[120510,120510],"mapped",[967]],[[120511,120511],"mapped",[968]],[[120512,120512],"mapped",[969]],[[120513,120513],"mapped",[8711]],[[120514,120514],"mapped",[945]],[[120515,120515],"mapped",[946]],[[120516,120516],"mapped",[947]],[[120517,120517],"mapped",[948]],[[120518,120518],"mapped",[949]],[[120519,120519],"mapped",[950]],[[120520,120520],"mapped",[951]],[[120521,120521],"mapped",[952]],[[120522,120522],"mapped",[953]],[[120523,120523],"mapped",[954]],[[120524,120524],"mapped",[955]],[[120525,120525],"mapped",[956]],[[120526,120526],"mapped",[957]],[[120527,120527],"mapped",[958]],[[120528,120528],"mapped",[959]],[[120529,120529],"mapped",[960]],[[120530,120530],"mapped",[961]],[[120531,120532],"mapped",[963]],[[120533,120533],"mapped",[964]],[[120534,120534],"mapped",[965]],[[120535,120535],"mapped",[966]],[[120536,120536],"mapped",[967]],[[120537,120537],"mapped",[968]],[[120538,120538],"mapped",[969]],[[120539,120539],"mapped",[8706]],[[120540,120540],"mapped",[949]],[[120541,120541],"mapped",[952]],[[120542,120542],"mapped",[954]],[[120543,120543],"mapped",[966]],[[120544,120544],"mapped",[961]],[[120545,120545],"mapped",[960]],[[120546,120546],"mapped",[945]],[[120547,120547],"mapped",[946]],[[120548,120548],"mapped",[947]],[[120549,120549],"mapped",[948]],[[120550,120550],"mapped",[949]],[[120551,120551],"mapped",[950]],[[120552,120552],"mapped",[951]],[[120553,120553],"mapped",[952]],[[120554,120554],"mapped",[953]],[[120555,120555],"mapped",[954]],[[120556,120556],"mapped",[955]],[[120557,120557],"mapped",[956]],[[120558,120558],"mapped",[957]],[[120559,120559],"mapped",[958]],[[120560,120560],"mapped",[959]],[[120561,120561],"mapped",[960]],[[120562,120562],"mapped",[961]],[[120563,120563],"mapped",[952]],[[120564,120564],"mapped",[963]],[[120565,120565],"mapped",[964]],[[120566,120566],"mapped",[965]],[[120567,120567],"mapped",[966]],[[120568,120568],"mapped",[967]],[[120569,120569],"mapped",[968]],[[120570,120570],"mapped",[969]],[[120571,120571],"mapped",[8711]],[[120572,120572],"mapped",[945]],[[120573,120573],"mapped",[946]],[[120574,120574],"mapped",[947]],[[120575,120575],"mapped",[948]],[[120576,120576],"mapped",[949]],[[120577,120577],"mapped",[950]],[[120578,120578],"mapped",[951]],[[120579,120579],"mapped",[952]],[[120580,120580],"mapped",[953]],[[120581,120581],"mapped",[954]],[[120582,120582],"mapped",[955]],[[120583,120583],"mapped",[956]],[[120584,120584],"mapped",[957]],[[120585,120585],"mapped",[958]],[[120586,120586],"mapped",[959]],[[120587,120587],"mapped",[960]],[[120588,120588],"mapped",[961]],[[120589,120590],"mapped",[963]],[[120591,120591],"mapped",[964]],[[120592,120592],"mapped",[965]],[[120593,120593],"mapped",[966]],[[120594,120594],"mapped",[967]],[[120595,120595],"mapped",[968]],[[120596,120596],"mapped",[969]],[[120597,120597],"mapped",[8706]],[[120598,120598],"mapped",[949]],[[120599,120599],"mapped",[952]],[[120600,120600],"mapped",[954]],[[120601,120601],"mapped",[966]],[[120602,120602],"mapped",[961]],[[120603,120603],"mapped",[960]],[[120604,120604],"mapped",[945]],[[120605,120605],"mapped",[946]],[[120606,120606],"mapped",[947]],[[120607,120607],"mapped",[948]],[[120608,120608],"mapped",[949]],[[120609,120609],"mapped",[950]],[[120610,120610],"mapped",[951]],[[120611,120611],"mapped",[952]],[[120612,120612],"mapped",[953]],[[120613,120613],"mapped",[954]],[[120614,120614],"mapped",[955]],[[120615,120615],"mapped",[956]],[[120616,120616],"mapped",[957]],[[120617,120617],"mapped",[958]],[[120618,120618],"mapped",[959]],[[120619,120619],"mapped",[960]],[[120620,120620],"mapped",[961]],[[120621,120621],"mapped",[952]],[[120622,120622],"mapped",[963]],[[120623,120623],"mapped",[964]],[[120624,120624],"mapped",[965]],[[120625,120625],"mapped",[966]],[[120626,120626],"mapped",[967]],[[120627,120627],"mapped",[968]],[[120628,120628],"mapped",[969]],[[120629,120629],"mapped",[8711]],[[120630,120630],"mapped",[945]],[[120631,120631],"mapped",[946]],[[120632,120632],"mapped",[947]],[[120633,120633],"mapped",[948]],[[120634,120634],"mapped",[949]],[[120635,120635],"mapped",[950]],[[120636,120636],"mapped",[951]],[[120637,120637],"mapped",[952]],[[120638,120638],"mapped",[953]],[[120639,120639],"mapped",[954]],[[120640,120640],"mapped",[955]],[[120641,120641],"mapped",[956]],[[120642,120642],"mapped",[957]],[[120643,120643],"mapped",[958]],[[120644,120644],"mapped",[959]],[[120645,120645],"mapped",[960]],[[120646,120646],"mapped",[961]],[[120647,120648],"mapped",[963]],[[120649,120649],"mapped",[964]],[[120650,120650],"mapped",[965]],[[120651,120651],"mapped",[966]],[[120652,120652],"mapped",[967]],[[120653,120653],"mapped",[968]],[[120654,120654],"mapped",[969]],[[120655,120655],"mapped",[8706]],[[120656,120656],"mapped",[949]],[[120657,120657],"mapped",[952]],[[120658,120658],"mapped",[954]],[[120659,120659],"mapped",[966]],[[120660,120660],"mapped",[961]],[[120661,120661],"mapped",[960]],[[120662,120662],"mapped",[945]],[[120663,120663],"mapped",[946]],[[120664,120664],"mapped",[947]],[[120665,120665],"mapped",[948]],[[120666,120666],"mapped",[949]],[[120667,120667],"mapped",[950]],[[120668,120668],"mapped",[951]],[[120669,120669],"mapped",[952]],[[120670,120670],"mapped",[953]],[[120671,120671],"mapped",[954]],[[120672,120672],"mapped",[955]],[[120673,120673],"mapped",[956]],[[120674,120674],"mapped",[957]],[[120675,120675],"mapped",[958]],[[120676,120676],"mapped",[959]],[[120677,120677],"mapped",[960]],[[120678,120678],"mapped",[961]],[[120679,120679],"mapped",[952]],[[120680,120680],"mapped",[963]],[[120681,120681],"mapped",[964]],[[120682,120682],"mapped",[965]],[[120683,120683],"mapped",[966]],[[120684,120684],"mapped",[967]],[[120685,120685],"mapped",[968]],[[120686,120686],"mapped",[969]],[[120687,120687],"mapped",[8711]],[[120688,120688],"mapped",[945]],[[120689,120689],"mapped",[946]],[[120690,120690],"mapped",[947]],[[120691,120691],"mapped",[948]],[[120692,120692],"mapped",[949]],[[120693,120693],"mapped",[950]],[[120694,120694],"mapped",[951]],[[120695,120695],"mapped",[952]],[[120696,120696],"mapped",[953]],[[120697,120697],"mapped",[954]],[[120698,120698],"mapped",[955]],[[120699,120699],"mapped",[956]],[[120700,120700],"mapped",[957]],[[120701,120701],"mapped",[958]],[[120702,120702],"mapped",[959]],[[120703,120703],"mapped",[960]],[[120704,120704],"mapped",[961]],[[120705,120706],"mapped",[963]],[[120707,120707],"mapped",[964]],[[120708,120708],"mapped",[965]],[[120709,120709],"mapped",[966]],[[120710,120710],"mapped",[967]],[[120711,120711],"mapped",[968]],[[120712,120712],"mapped",[969]],[[120713,120713],"mapped",[8706]],[[120714,120714],"mapped",[949]],[[120715,120715],"mapped",[952]],[[120716,120716],"mapped",[954]],[[120717,120717],"mapped",[966]],[[120718,120718],"mapped",[961]],[[120719,120719],"mapped",[960]],[[120720,120720],"mapped",[945]],[[120721,120721],"mapped",[946]],[[120722,120722],"mapped",[947]],[[120723,120723],"mapped",[948]],[[120724,120724],"mapped",[949]],[[120725,120725],"mapped",[950]],[[120726,120726],"mapped",[951]],[[120727,120727],"mapped",[952]],[[120728,120728],"mapped",[953]],[[120729,120729],"mapped",[954]],[[120730,120730],"mapped",[955]],[[120731,120731],"mapped",[956]],[[120732,120732],"mapped",[957]],[[120733,120733],"mapped",[958]],[[120734,120734],"mapped",[959]],[[120735,120735],"mapped",[960]],[[120736,120736],"mapped",[961]],[[120737,120737],"mapped",[952]],[[120738,120738],"mapped",[963]],[[120739,120739],"mapped",[964]],[[120740,120740],"mapped",[965]],[[120741,120741],"mapped",[966]],[[120742,120742],"mapped",[967]],[[120743,120743],"mapped",[968]],[[120744,120744],"mapped",[969]],[[120745,120745],"mapped",[8711]],[[120746,120746],"mapped",[945]],[[120747,120747],"mapped",[946]],[[120748,120748],"mapped",[947]],[[120749,120749],"mapped",[948]],[[120750,120750],"mapped",[949]],[[120751,120751],"mapped",[950]],[[120752,120752],"mapped",[951]],[[120753,120753],"mapped",[952]],[[120754,120754],"mapped",[953]],[[120755,120755],"mapped",[954]],[[120756,120756],"mapped",[955]],[[120757,120757],"mapped",[956]],[[120758,120758],"mapped",[957]],[[120759,120759],"mapped",[958]],[[120760,120760],"mapped",[959]],[[120761,120761],"mapped",[960]],[[120762,120762],"mapped",[961]],[[120763,120764],"mapped",[963]],[[120765,120765],"mapped",[964]],[[120766,120766],"mapped",[965]],[[120767,120767],"mapped",[966]],[[120768,120768],"mapped",[967]],[[120769,120769],"mapped",[968]],[[120770,120770],"mapped",[969]],[[120771,120771],"mapped",[8706]],[[120772,120772],"mapped",[949]],[[120773,120773],"mapped",[952]],[[120774,120774],"mapped",[954]],[[120775,120775],"mapped",[966]],[[120776,120776],"mapped",[961]],[[120777,120777],"mapped",[960]],[[120778,120779],"mapped",[989]],[[120780,120781],"disallowed"],[[120782,120782],"mapped",[48]],[[120783,120783],"mapped",[49]],[[120784,120784],"mapped",[50]],[[120785,120785],"mapped",[51]],[[120786,120786],"mapped",[52]],[[120787,120787],"mapped",[53]],[[120788,120788],"mapped",[54]],[[120789,120789],"mapped",[55]],[[120790,120790],"mapped",[56]],[[120791,120791],"mapped",[57]],[[120792,120792],"mapped",[48]],[[120793,120793],"mapped",[49]],[[120794,120794],"mapped",[50]],[[120795,120795],"mapped",[51]],[[120796,120796],"mapped",[52]],[[120797,120797],"mapped",[53]],[[120798,120798],"mapped",[54]],[[120799,120799],"mapped",[55]],[[120800,120800],"mapped",[56]],[[120801,120801],"mapped",[57]],[[120802,120802],"mapped",[48]],[[120803,120803],"mapped",[49]],[[120804,120804],"mapped",[50]],[[120805,120805],"mapped",[51]],[[120806,120806],"mapped",[52]],[[120807,120807],"mapped",[53]],[[120808,120808],"mapped",[54]],[[120809,120809],"mapped",[55]],[[120810,120810],"mapped",[56]],[[120811,120811],"mapped",[57]],[[120812,120812],"mapped",[48]],[[120813,120813],"mapped",[49]],[[120814,120814],"mapped",[50]],[[120815,120815],"mapped",[51]],[[120816,120816],"mapped",[52]],[[120817,120817],"mapped",[53]],[[120818,120818],"mapped",[54]],[[120819,120819],"mapped",[55]],[[120820,120820],"mapped",[56]],[[120821,120821],"mapped",[57]],[[120822,120822],"mapped",[48]],[[120823,120823],"mapped",[49]],[[120824,120824],"mapped",[50]],[[120825,120825],"mapped",[51]],[[120826,120826],"mapped",[52]],[[120827,120827],"mapped",[53]],[[120828,120828],"mapped",[54]],[[120829,120829],"mapped",[55]],[[120830,120830],"mapped",[56]],[[120831,120831],"mapped",[57]],[[120832,121343],"valid",[],"NV8"],[[121344,121398],"valid"],[[121399,121402],"valid",[],"NV8"],[[121403,121452],"valid"],[[121453,121460],"valid",[],"NV8"],[[121461,121461],"valid"],[[121462,121475],"valid",[],"NV8"],[[121476,121476],"valid"],[[121477,121483],"valid",[],"NV8"],[[121484,121498],"disallowed"],[[121499,121503],"valid"],[[121504,121504],"disallowed"],[[121505,121519],"valid"],[[121520,124927],"disallowed"],[[124928,125124],"valid"],[[125125,125126],"disallowed"],[[125127,125135],"valid",[],"NV8"],[[125136,125142],"valid"],[[125143,126463],"disallowed"],[[126464,126464],"mapped",[1575]],[[126465,126465],"mapped",[1576]],[[126466,126466],"mapped",[1580]],[[126467,126467],"mapped",[1583]],[[126468,126468],"disallowed"],[[126469,126469],"mapped",[1608]],[[126470,126470],"mapped",[1586]],[[126471,126471],"mapped",[1581]],[[126472,126472],"mapped",[1591]],[[126473,126473],"mapped",[1610]],[[126474,126474],"mapped",[1603]],[[126475,126475],"mapped",[1604]],[[126476,126476],"mapped",[1605]],[[126477,126477],"mapped",[1606]],[[126478,126478],"mapped",[1587]],[[126479,126479],"mapped",[1593]],[[126480,126480],"mapped",[1601]],[[126481,126481],"mapped",[1589]],[[126482,126482],"mapped",[1602]],[[126483,126483],"mapped",[1585]],[[126484,126484],"mapped",[1588]],[[126485,126485],"mapped",[1578]],[[126486,126486],"mapped",[1579]],[[126487,126487],"mapped",[1582]],[[126488,126488],"mapped",[1584]],[[126489,126489],"mapped",[1590]],[[126490,126490],"mapped",[1592]],[[126491,126491],"mapped",[1594]],[[126492,126492],"mapped",[1646]],[[126493,126493],"mapped",[1722]],[[126494,126494],"mapped",[1697]],[[126495,126495],"mapped",[1647]],[[126496,126496],"disallowed"],[[126497,126497],"mapped",[1576]],[[126498,126498],"mapped",[1580]],[[126499,126499],"disallowed"],[[126500,126500],"mapped",[1607]],[[126501,126502],"disallowed"],[[126503,126503],"mapped",[1581]],[[126504,126504],"disallowed"],[[126505,126505],"mapped",[1610]],[[126506,126506],"mapped",[1603]],[[126507,126507],"mapped",[1604]],[[126508,126508],"mapped",[1605]],[[126509,126509],"mapped",[1606]],[[126510,126510],"mapped",[1587]],[[126511,126511],"mapped",[1593]],[[126512,126512],"mapped",[1601]],[[126513,126513],"mapped",[1589]],[[126514,126514],"mapped",[1602]],[[126515,126515],"disallowed"],[[126516,126516],"mapped",[1588]],[[126517,126517],"mapped",[1578]],[[126518,126518],"mapped",[1579]],[[126519,126519],"mapped",[1582]],[[126520,126520],"disallowed"],[[126521,126521],"mapped",[1590]],[[126522,126522],"disallowed"],[[126523,126523],"mapped",[1594]],[[126524,126529],"disallowed"],[[126530,126530],"mapped",[1580]],[[126531,126534],"disallowed"],[[126535,126535],"mapped",[1581]],[[126536,126536],"disallowed"],[[126537,126537],"mapped",[1610]],[[126538,126538],"disallowed"],[[126539,126539],"mapped",[1604]],[[126540,126540],"disallowed"],[[126541,126541],"mapped",[1606]],[[126542,126542],"mapped",[1587]],[[126543,126543],"mapped",[1593]],[[126544,126544],"disallowed"],[[126545,126545],"mapped",[1589]],[[126546,126546],"mapped",[1602]],[[126547,126547],"disallowed"],[[126548,126548],"mapped",[1588]],[[126549,126550],"disallowed"],[[126551,126551],"mapped",[1582]],[[126552,126552],"disallowed"],[[126553,126553],"mapped",[1590]],[[126554,126554],"disallowed"],[[126555,126555],"mapped",[1594]],[[126556,126556],"disallowed"],[[126557,126557],"mapped",[1722]],[[126558,126558],"disallowed"],[[126559,126559],"mapped",[1647]],[[126560,126560],"disallowed"],[[126561,126561],"mapped",[1576]],[[126562,126562],"mapped",[1580]],[[126563,126563],"disallowed"],[[126564,126564],"mapped",[1607]],[[126565,126566],"disallowed"],[[126567,126567],"mapped",[1581]],[[126568,126568],"mapped",[1591]],[[126569,126569],"mapped",[1610]],[[126570,126570],"mapped",[1603]],[[126571,126571],"disallowed"],[[126572,126572],"mapped",[1605]],[[126573,126573],"mapped",[1606]],[[126574,126574],"mapped",[1587]],[[126575,126575],"mapped",[1593]],[[126576,126576],"mapped",[1601]],[[126577,126577],"mapped",[1589]],[[126578,126578],"mapped",[1602]],[[126579,126579],"disallowed"],[[126580,126580],"mapped",[1588]],[[126581,126581],"mapped",[1578]],[[126582,126582],"mapped",[1579]],[[126583,126583],"mapped",[1582]],[[126584,126584],"disallowed"],[[126585,126585],"mapped",[1590]],[[126586,126586],"mapped",[1592]],[[126587,126587],"mapped",[1594]],[[126588,126588],"mapped",[1646]],[[126589,126589],"disallowed"],[[126590,126590],"mapped",[1697]],[[126591,126591],"disallowed"],[[126592,126592],"mapped",[1575]],[[126593,126593],"mapped",[1576]],[[126594,126594],"mapped",[1580]],[[126595,126595],"mapped",[1583]],[[126596,126596],"mapped",[1607]],[[126597,126597],"mapped",[1608]],[[126598,126598],"mapped",[1586]],[[126599,126599],"mapped",[1581]],[[126600,126600],"mapped",[1591]],[[126601,126601],"mapped",[1610]],[[126602,126602],"disallowed"],[[126603,126603],"mapped",[1604]],[[126604,126604],"mapped",[1605]],[[126605,126605],"mapped",[1606]],[[126606,126606],"mapped",[1587]],[[126607,126607],"mapped",[1593]],[[126608,126608],"mapped",[1601]],[[126609,126609],"mapped",[1589]],[[126610,126610],"mapped",[1602]],[[126611,126611],"mapped",[1585]],[[126612,126612],"mapped",[1588]],[[126613,126613],"mapped",[1578]],[[126614,126614],"mapped",[1579]],[[126615,126615],"mapped",[1582]],[[126616,126616],"mapped",[1584]],[[126617,126617],"mapped",[1590]],[[126618,126618],"mapped",[1592]],[[126619,126619],"mapped",[1594]],[[126620,126624],"disallowed"],[[126625,126625],"mapped",[1576]],[[126626,126626],"mapped",[1580]],[[126627,126627],"mapped",[1583]],[[126628,126628],"disallowed"],[[126629,126629],"mapped",[1608]],[[126630,126630],"mapped",[1586]],[[126631,126631],"mapped",[1581]],[[126632,126632],"mapped",[1591]],[[126633,126633],"mapped",[1610]],[[126634,126634],"disallowed"],[[126635,126635],"mapped",[1604]],[[126636,126636],"mapped",[1605]],[[126637,126637],"mapped",[1606]],[[126638,126638],"mapped",[1587]],[[126639,126639],"mapped",[1593]],[[126640,126640],"mapped",[1601]],[[126641,126641],"mapped",[1589]],[[126642,126642],"mapped",[1602]],[[126643,126643],"mapped",[1585]],[[126644,126644],"mapped",[1588]],[[126645,126645],"mapped",[1578]],[[126646,126646],"mapped",[1579]],[[126647,126647],"mapped",[1582]],[[126648,126648],"mapped",[1584]],[[126649,126649],"mapped",[1590]],[[126650,126650],"mapped",[1592]],[[126651,126651],"mapped",[1594]],[[126652,126703],"disallowed"],[[126704,126705],"valid",[],"NV8"],[[126706,126975],"disallowed"],[[126976,127019],"valid",[],"NV8"],[[127020,127023],"disallowed"],[[127024,127123],"valid",[],"NV8"],[[127124,127135],"disallowed"],[[127136,127150],"valid",[],"NV8"],[[127151,127152],"disallowed"],[[127153,127166],"valid",[],"NV8"],[[127167,127167],"valid",[],"NV8"],[[127168,127168],"disallowed"],[[127169,127183],"valid",[],"NV8"],[[127184,127184],"disallowed"],[[127185,127199],"valid",[],"NV8"],[[127200,127221],"valid",[],"NV8"],[[127222,127231],"disallowed"],[[127232,127232],"disallowed"],[[127233,127233],"disallowed_STD3_mapped",[48,44]],[[127234,127234],"disallowed_STD3_mapped",[49,44]],[[127235,127235],"disallowed_STD3_mapped",[50,44]],[[127236,127236],"disallowed_STD3_mapped",[51,44]],[[127237,127237],"disallowed_STD3_mapped",[52,44]],[[127238,127238],"disallowed_STD3_mapped",[53,44]],[[127239,127239],"disallowed_STD3_mapped",[54,44]],[[127240,127240],"disallowed_STD3_mapped",[55,44]],[[127241,127241],"disallowed_STD3_mapped",[56,44]],[[127242,127242],"disallowed_STD3_mapped",[57,44]],[[127243,127244],"valid",[],"NV8"],[[127245,127247],"disallowed"],[[127248,127248],"disallowed_STD3_mapped",[40,97,41]],[[127249,127249],"disallowed_STD3_mapped",[40,98,41]],[[127250,127250],"disallowed_STD3_mapped",[40,99,41]],[[127251,127251],"disallowed_STD3_mapped",[40,100,41]],[[127252,127252],"disallowed_STD3_mapped",[40,101,41]],[[127253,127253],"disallowed_STD3_mapped",[40,102,41]],[[127254,127254],"disallowed_STD3_mapped",[40,103,41]],[[127255,127255],"disallowed_STD3_mapped",[40,104,41]],[[127256,127256],"disallowed_STD3_mapped",[40,105,41]],[[127257,127257],"disallowed_STD3_mapped",[40,106,41]],[[127258,127258],"disallowed_STD3_mapped",[40,107,41]],[[127259,127259],"disallowed_STD3_mapped",[40,108,41]],[[127260,127260],"disallowed_STD3_mapped",[40,109,41]],[[127261,127261],"disallowed_STD3_mapped",[40,110,41]],[[127262,127262],"disallowed_STD3_mapped",[40,111,41]],[[127263,127263],"disallowed_STD3_mapped",[40,112,41]],[[127264,127264],"disallowed_STD3_mapped",[40,113,41]],[[127265,127265],"disallowed_STD3_mapped",[40,114,41]],[[127266,127266],"disallowed_STD3_mapped",[40,115,41]],[[127267,127267],"disallowed_STD3_mapped",[40,116,41]],[[127268,127268],"disallowed_STD3_mapped",[40,117,41]],[[127269,127269],"disallowed_STD3_mapped",[40,118,41]],[[127270,127270],"disallowed_STD3_mapped",[40,119,41]],[[127271,127271],"disallowed_STD3_mapped",[40,120,41]],[[127272,127272],"disallowed_STD3_mapped",[40,121,41]],[[127273,127273],"disallowed_STD3_mapped",[40,122,41]],[[127274,127274],"mapped",[12308,115,12309]],[[127275,127275],"mapped",[99]],[[127276,127276],"mapped",[114]],[[127277,127277],"mapped",[99,100]],[[127278,127278],"mapped",[119,122]],[[127279,127279],"disallowed"],[[127280,127280],"mapped",[97]],[[127281,127281],"mapped",[98]],[[127282,127282],"mapped",[99]],[[127283,127283],"mapped",[100]],[[127284,127284],"mapped",[101]],[[127285,127285],"mapped",[102]],[[127286,127286],"mapped",[103]],[[127287,127287],"mapped",[104]],[[127288,127288],"mapped",[105]],[[127289,127289],"mapped",[106]],[[127290,127290],"mapped",[107]],[[127291,127291],"mapped",[108]],[[127292,127292],"mapped",[109]],[[127293,127293],"mapped",[110]],[[127294,127294],"mapped",[111]],[[127295,127295],"mapped",[112]],[[127296,127296],"mapped",[113]],[[127297,127297],"mapped",[114]],[[127298,127298],"mapped",[115]],[[127299,127299],"mapped",[116]],[[127300,127300],"mapped",[117]],[[127301,127301],"mapped",[118]],[[127302,127302],"mapped",[119]],[[127303,127303],"mapped",[120]],[[127304,127304],"mapped",[121]],[[127305,127305],"mapped",[122]],[[127306,127306],"mapped",[104,118]],[[127307,127307],"mapped",[109,118]],[[127308,127308],"mapped",[115,100]],[[127309,127309],"mapped",[115,115]],[[127310,127310],"mapped",[112,112,118]],[[127311,127311],"mapped",[119,99]],[[127312,127318],"valid",[],"NV8"],[[127319,127319],"valid",[],"NV8"],[[127320,127326],"valid",[],"NV8"],[[127327,127327],"valid",[],"NV8"],[[127328,127337],"valid",[],"NV8"],[[127338,127338],"mapped",[109,99]],[[127339,127339],"mapped",[109,100]],[[127340,127343],"disallowed"],[[127344,127352],"valid",[],"NV8"],[[127353,127353],"valid",[],"NV8"],[[127354,127354],"valid",[],"NV8"],[[127355,127356],"valid",[],"NV8"],[[127357,127358],"valid",[],"NV8"],[[127359,127359],"valid",[],"NV8"],[[127360,127369],"valid",[],"NV8"],[[127370,127373],"valid",[],"NV8"],[[127374,127375],"valid",[],"NV8"],[[127376,127376],"mapped",[100,106]],[[127377,127386],"valid",[],"NV8"],[[127387,127461],"disallowed"],[[127462,127487],"valid",[],"NV8"],[[127488,127488],"mapped",[12411,12363]],[[127489,127489],"mapped",[12467,12467]],[[127490,127490],"mapped",[12469]],[[127491,127503],"disallowed"],[[127504,127504],"mapped",[25163]],[[127505,127505],"mapped",[23383]],[[127506,127506],"mapped",[21452]],[[127507,127507],"mapped",[12487]],[[127508,127508],"mapped",[20108]],[[127509,127509],"mapped",[22810]],[[127510,127510],"mapped",[35299]],[[127511,127511],"mapped",[22825]],[[127512,127512],"mapped",[20132]],[[127513,127513],"mapped",[26144]],[[127514,127514],"mapped",[28961]],[[127515,127515],"mapped",[26009]],[[127516,127516],"mapped",[21069]],[[127517,127517],"mapped",[24460]],[[127518,127518],"mapped",[20877]],[[127519,127519],"mapped",[26032]],[[127520,127520],"mapped",[21021]],[[127521,127521],"mapped",[32066]],[[127522,127522],"mapped",[29983]],[[127523,127523],"mapped",[36009]],[[127524,127524],"mapped",[22768]],[[127525,127525],"mapped",[21561]],[[127526,127526],"mapped",[28436]],[[127527,127527],"mapped",[25237]],[[127528,127528],"mapped",[25429]],[[127529,127529],"mapped",[19968]],[[127530,127530],"mapped",[19977]],[[127531,127531],"mapped",[36938]],[[127532,127532],"mapped",[24038]],[[127533,127533],"mapped",[20013]],[[127534,127534],"mapped",[21491]],[[127535,127535],"mapped",[25351]],[[127536,127536],"mapped",[36208]],[[127537,127537],"mapped",[25171]],[[127538,127538],"mapped",[31105]],[[127539,127539],"mapped",[31354]],[[127540,127540],"mapped",[21512]],[[127541,127541],"mapped",[28288]],[[127542,127542],"mapped",[26377]],[[127543,127543],"mapped",[26376]],[[127544,127544],"mapped",[30003]],[[127545,127545],"mapped",[21106]],[[127546,127546],"mapped",[21942]],[[127547,127551],"disallowed"],[[127552,127552],"mapped",[12308,26412,12309]],[[127553,127553],"mapped",[12308,19977,12309]],[[127554,127554],"mapped",[12308,20108,12309]],[[127555,127555],"mapped",[12308,23433,12309]],[[127556,127556],"mapped",[12308,28857,12309]],[[127557,127557],"mapped",[12308,25171,12309]],[[127558,127558],"mapped",[12308,30423,12309]],[[127559,127559],"mapped",[12308,21213,12309]],[[127560,127560],"mapped",[12308,25943,12309]],[[127561,127567],"disallowed"],[[127568,127568],"mapped",[24471]],[[127569,127569],"mapped",[21487]],[[127570,127743],"disallowed"],[[127744,127776],"valid",[],"NV8"],[[127777,127788],"valid",[],"NV8"],[[127789,127791],"valid",[],"NV8"],[[127792,127797],"valid",[],"NV8"],[[127798,127798],"valid",[],"NV8"],[[127799,127868],"valid",[],"NV8"],[[127869,127869],"valid",[],"NV8"],[[127870,127871],"valid",[],"NV8"],[[127872,127891],"valid",[],"NV8"],[[127892,127903],"valid",[],"NV8"],[[127904,127940],"valid",[],"NV8"],[[127941,127941],"valid",[],"NV8"],[[127942,127946],"valid",[],"NV8"],[[127947,127950],"valid",[],"NV8"],[[127951,127955],"valid",[],"NV8"],[[127956,127967],"valid",[],"NV8"],[[127968,127984],"valid",[],"NV8"],[[127985,127991],"valid",[],"NV8"],[[127992,127999],"valid",[],"NV8"],[[128000,128062],"valid",[],"NV8"],[[128063,128063],"valid",[],"NV8"],[[128064,128064],"valid",[],"NV8"],[[128065,128065],"valid",[],"NV8"],[[128066,128247],"valid",[],"NV8"],[[128248,128248],"valid",[],"NV8"],[[128249,128252],"valid",[],"NV8"],[[128253,128254],"valid",[],"NV8"],[[128255,128255],"valid",[],"NV8"],[[128256,128317],"valid",[],"NV8"],[[128318,128319],"valid",[],"NV8"],[[128320,128323],"valid",[],"NV8"],[[128324,128330],"valid",[],"NV8"],[[128331,128335],"valid",[],"NV8"],[[128336,128359],"valid",[],"NV8"],[[128360,128377],"valid",[],"NV8"],[[128378,128378],"disallowed"],[[128379,128419],"valid",[],"NV8"],[[128420,128420],"disallowed"],[[128421,128506],"valid",[],"NV8"],[[128507,128511],"valid",[],"NV8"],[[128512,128512],"valid",[],"NV8"],[[128513,128528],"valid",[],"NV8"],[[128529,128529],"valid",[],"NV8"],[[128530,128532],"valid",[],"NV8"],[[128533,128533],"valid",[],"NV8"],[[128534,128534],"valid",[],"NV8"],[[128535,128535],"valid",[],"NV8"],[[128536,128536],"valid",[],"NV8"],[[128537,128537],"valid",[],"NV8"],[[128538,128538],"valid",[],"NV8"],[[128539,128539],"valid",[],"NV8"],[[128540,128542],"valid",[],"NV8"],[[128543,128543],"valid",[],"NV8"],[[128544,128549],"valid",[],"NV8"],[[128550,128551],"valid",[],"NV8"],[[128552,128555],"valid",[],"NV8"],[[128556,128556],"valid",[],"NV8"],[[128557,128557],"valid",[],"NV8"],[[128558,128559],"valid",[],"NV8"],[[128560,128563],"valid",[],"NV8"],[[128564,128564],"valid",[],"NV8"],[[128565,128576],"valid",[],"NV8"],[[128577,128578],"valid",[],"NV8"],[[128579,128580],"valid",[],"NV8"],[[128581,128591],"valid",[],"NV8"],[[128592,128639],"valid",[],"NV8"],[[128640,128709],"valid",[],"NV8"],[[128710,128719],"valid",[],"NV8"],[[128720,128720],"valid",[],"NV8"],[[128721,128735],"disallowed"],[[128736,128748],"valid",[],"NV8"],[[128749,128751],"disallowed"],[[128752,128755],"valid",[],"NV8"],[[128756,128767],"disallowed"],[[128768,128883],"valid",[],"NV8"],[[128884,128895],"disallowed"],[[128896,128980],"valid",[],"NV8"],[[128981,129023],"disallowed"],[[129024,129035],"valid",[],"NV8"],[[129036,129039],"disallowed"],[[129040,129095],"valid",[],"NV8"],[[129096,129103],"disallowed"],[[129104,129113],"valid",[],"NV8"],[[129114,129119],"disallowed"],[[129120,129159],"valid",[],"NV8"],[[129160,129167],"disallowed"],[[129168,129197],"valid",[],"NV8"],[[129198,129295],"disallowed"],[[129296,129304],"valid",[],"NV8"],[[129305,129407],"disallowed"],[[129408,129412],"valid",[],"NV8"],[[129413,129471],"disallowed"],[[129472,129472],"valid",[],"NV8"],[[129473,131069],"disallowed"],[[131070,131071],"disallowed"],[[131072,173782],"valid"],[[173783,173823],"disallowed"],[[173824,177972],"valid"],[[177973,177983],"disallowed"],[[177984,178205],"valid"],[[178206,178207],"disallowed"],[[178208,183969],"valid"],[[183970,194559],"disallowed"],[[194560,194560],"mapped",[20029]],[[194561,194561],"mapped",[20024]],[[194562,194562],"mapped",[20033]],[[194563,194563],"mapped",[131362]],[[194564,194564],"mapped",[20320]],[[194565,194565],"mapped",[20398]],[[194566,194566],"mapped",[20411]],[[194567,194567],"mapped",[20482]],[[194568,194568],"mapped",[20602]],[[194569,194569],"mapped",[20633]],[[194570,194570],"mapped",[20711]],[[194571,194571],"mapped",[20687]],[[194572,194572],"mapped",[13470]],[[194573,194573],"mapped",[132666]],[[194574,194574],"mapped",[20813]],[[194575,194575],"mapped",[20820]],[[194576,194576],"mapped",[20836]],[[194577,194577],"mapped",[20855]],[[194578,194578],"mapped",[132380]],[[194579,194579],"mapped",[13497]],[[194580,194580],"mapped",[20839]],[[194581,194581],"mapped",[20877]],[[194582,194582],"mapped",[132427]],[[194583,194583],"mapped",[20887]],[[194584,194584],"mapped",[20900]],[[194585,194585],"mapped",[20172]],[[194586,194586],"mapped",[20908]],[[194587,194587],"mapped",[20917]],[[194588,194588],"mapped",[168415]],[[194589,194589],"mapped",[20981]],[[194590,194590],"mapped",[20995]],[[194591,194591],"mapped",[13535]],[[194592,194592],"mapped",[21051]],[[194593,194593],"mapped",[21062]],[[194594,194594],"mapped",[21106]],[[194595,194595],"mapped",[21111]],[[194596,194596],"mapped",[13589]],[[194597,194597],"mapped",[21191]],[[194598,194598],"mapped",[21193]],[[194599,194599],"mapped",[21220]],[[194600,194600],"mapped",[21242]],[[194601,194601],"mapped",[21253]],[[194602,194602],"mapped",[21254]],[[194603,194603],"mapped",[21271]],[[194604,194604],"mapped",[21321]],[[194605,194605],"mapped",[21329]],[[194606,194606],"mapped",[21338]],[[194607,194607],"mapped",[21363]],[[194608,194608],"mapped",[21373]],[[194609,194611],"mapped",[21375]],[[194612,194612],"mapped",[133676]],[[194613,194613],"mapped",[28784]],[[194614,194614],"mapped",[21450]],[[194615,194615],"mapped",[21471]],[[194616,194616],"mapped",[133987]],[[194617,194617],"mapped",[21483]],[[194618,194618],"mapped",[21489]],[[194619,194619],"mapped",[21510]],[[194620,194620],"mapped",[21662]],[[194621,194621],"mapped",[21560]],[[194622,194622],"mapped",[21576]],[[194623,194623],"mapped",[21608]],[[194624,194624],"mapped",[21666]],[[194625,194625],"mapped",[21750]],[[194626,194626],"mapped",[21776]],[[194627,194627],"mapped",[21843]],[[194628,194628],"mapped",[21859]],[[194629,194630],"mapped",[21892]],[[194631,194631],"mapped",[21913]],[[194632,194632],"mapped",[21931]],[[194633,194633],"mapped",[21939]],[[194634,194634],"mapped",[21954]],[[194635,194635],"mapped",[22294]],[[194636,194636],"mapped",[22022]],[[194637,194637],"mapped",[22295]],[[194638,194638],"mapped",[22097]],[[194639,194639],"mapped",[22132]],[[194640,194640],"mapped",[20999]],[[194641,194641],"mapped",[22766]],[[194642,194642],"mapped",[22478]],[[194643,194643],"mapped",[22516]],[[194644,194644],"mapped",[22541]],[[194645,194645],"mapped",[22411]],[[194646,194646],"mapped",[22578]],[[194647,194647],"mapped",[22577]],[[194648,194648],"mapped",[22700]],[[194649,194649],"mapped",[136420]],[[194650,194650],"mapped",[22770]],[[194651,194651],"mapped",[22775]],[[194652,194652],"mapped",[22790]],[[194653,194653],"mapped",[22810]],[[194654,194654],"mapped",[22818]],[[194655,194655],"mapped",[22882]],[[194656,194656],"mapped",[136872]],[[194657,194657],"mapped",[136938]],[[194658,194658],"mapped",[23020]],[[194659,194659],"mapped",[23067]],[[194660,194660],"mapped",[23079]],[[194661,194661],"mapped",[23000]],[[194662,194662],"mapped",[23142]],[[194663,194663],"mapped",[14062]],[[194664,194664],"disallowed"],[[194665,194665],"mapped",[23304]],[[194666,194667],"mapped",[23358]],[[194668,194668],"mapped",[137672]],[[194669,194669],"mapped",[23491]],[[194670,194670],"mapped",[23512]],[[194671,194671],"mapped",[23527]],[[194672,194672],"mapped",[23539]],[[194673,194673],"mapped",[138008]],[[194674,194674],"mapped",[23551]],[[194675,194675],"mapped",[23558]],[[194676,194676],"disallowed"],[[194677,194677],"mapped",[23586]],[[194678,194678],"mapped",[14209]],[[194679,194679],"mapped",[23648]],[[194680,194680],"mapped",[23662]],[[194681,194681],"mapped",[23744]],[[194682,194682],"mapped",[23693]],[[194683,194683],"mapped",[138724]],[[194684,194684],"mapped",[23875]],[[194685,194685],"mapped",[138726]],[[194686,194686],"mapped",[23918]],[[194687,194687],"mapped",[23915]],[[194688,194688],"mapped",[23932]],[[194689,194689],"mapped",[24033]],[[194690,194690],"mapped",[24034]],[[194691,194691],"mapped",[14383]],[[194692,194692],"mapped",[24061]],[[194693,194693],"mapped",[24104]],[[194694,194694],"mapped",[24125]],[[194695,194695],"mapped",[24169]],[[194696,194696],"mapped",[14434]],[[194697,194697],"mapped",[139651]],[[194698,194698],"mapped",[14460]],[[194699,194699],"mapped",[24240]],[[194700,194700],"mapped",[24243]],[[194701,194701],"mapped",[24246]],[[194702,194702],"mapped",[24266]],[[194703,194703],"mapped",[172946]],[[194704,194704],"mapped",[24318]],[[194705,194706],"mapped",[140081]],[[194707,194707],"mapped",[33281]],[[194708,194709],"mapped",[24354]],[[194710,194710],"mapped",[14535]],[[194711,194711],"mapped",[144056]],[[194712,194712],"mapped",[156122]],[[194713,194713],"mapped",[24418]],[[194714,194714],"mapped",[24427]],[[194715,194715],"mapped",[14563]],[[194716,194716],"mapped",[24474]],[[194717,194717],"mapped",[24525]],[[194718,194718],"mapped",[24535]],[[194719,194719],"mapped",[24569]],[[194720,194720],"mapped",[24705]],[[194721,194721],"mapped",[14650]],[[194722,194722],"mapped",[14620]],[[194723,194723],"mapped",[24724]],[[194724,194724],"mapped",[141012]],[[194725,194725],"mapped",[24775]],[[194726,194726],"mapped",[24904]],[[194727,194727],"mapped",[24908]],[[194728,194728],"mapped",[24910]],[[194729,194729],"mapped",[24908]],[[194730,194730],"mapped",[24954]],[[194731,194731],"mapped",[24974]],[[194732,194732],"mapped",[25010]],[[194733,194733],"mapped",[24996]],[[194734,194734],"mapped",[25007]],[[194735,194735],"mapped",[25054]],[[194736,194736],"mapped",[25074]],[[194737,194737],"mapped",[25078]],[[194738,194738],"mapped",[25104]],[[194739,194739],"mapped",[25115]],[[194740,194740],"mapped",[25181]],[[194741,194741],"mapped",[25265]],[[194742,194742],"mapped",[25300]],[[194743,194743],"mapped",[25424]],[[194744,194744],"mapped",[142092]],[[194745,194745],"mapped",[25405]],[[194746,194746],"mapped",[25340]],[[194747,194747],"mapped",[25448]],[[194748,194748],"mapped",[25475]],[[194749,194749],"mapped",[25572]],[[194750,194750],"mapped",[142321]],[[194751,194751],"mapped",[25634]],[[194752,194752],"mapped",[25541]],[[194753,194753],"mapped",[25513]],[[194754,194754],"mapped",[14894]],[[194755,194755],"mapped",[25705]],[[194756,194756],"mapped",[25726]],[[194757,194757],"mapped",[25757]],[[194758,194758],"mapped",[25719]],[[194759,194759],"mapped",[14956]],[[194760,194760],"mapped",[25935]],[[194761,194761],"mapped",[25964]],[[194762,194762],"mapped",[143370]],[[194763,194763],"mapped",[26083]],[[194764,194764],"mapped",[26360]],[[194765,194765],"mapped",[26185]],[[194766,194766],"mapped",[15129]],[[194767,194767],"mapped",[26257]],[[194768,194768],"mapped",[15112]],[[194769,194769],"mapped",[15076]],[[194770,194770],"mapped",[20882]],[[194771,194771],"mapped",[20885]],[[194772,194772],"mapped",[26368]],[[194773,194773],"mapped",[26268]],[[194774,194774],"mapped",[32941]],[[194775,194775],"mapped",[17369]],[[194776,194776],"mapped",[26391]],[[194777,194777],"mapped",[26395]],[[194778,194778],"mapped",[26401]],[[194779,194779],"mapped",[26462]],[[194780,194780],"mapped",[26451]],[[194781,194781],"mapped",[144323]],[[194782,194782],"mapped",[15177]],[[194783,194783],"mapped",[26618]],[[194784,194784],"mapped",[26501]],[[194785,194785],"mapped",[26706]],[[194786,194786],"mapped",[26757]],[[194787,194787],"mapped",[144493]],[[194788,194788],"mapped",[26766]],[[194789,194789],"mapped",[26655]],[[194790,194790],"mapped",[26900]],[[194791,194791],"mapped",[15261]],[[194792,194792],"mapped",[26946]],[[194793,194793],"mapped",[27043]],[[194794,194794],"mapped",[27114]],[[194795,194795],"mapped",[27304]],[[194796,194796],"mapped",[145059]],[[194797,194797],"mapped",[27355]],[[194798,194798],"mapped",[15384]],[[194799,194799],"mapped",[27425]],[[194800,194800],"mapped",[145575]],[[194801,194801],"mapped",[27476]],[[194802,194802],"mapped",[15438]],[[194803,194803],"mapped",[27506]],[[194804,194804],"mapped",[27551]],[[194805,194805],"mapped",[27578]],[[194806,194806],"mapped",[27579]],[[194807,194807],"mapped",[146061]],[[194808,194808],"mapped",[138507]],[[194809,194809],"mapped",[146170]],[[194810,194810],"mapped",[27726]],[[194811,194811],"mapped",[146620]],[[194812,194812],"mapped",[27839]],[[194813,194813],"mapped",[27853]],[[194814,194814],"mapped",[27751]],[[194815,194815],"mapped",[27926]],[[194816,194816],"mapped",[27966]],[[194817,194817],"mapped",[28023]],[[194818,194818],"mapped",[27969]],[[194819,194819],"mapped",[28009]],[[194820,194820],"mapped",[28024]],[[194821,194821],"mapped",[28037]],[[194822,194822],"mapped",[146718]],[[194823,194823],"mapped",[27956]],[[194824,194824],"mapped",[28207]],[[194825,194825],"mapped",[28270]],[[194826,194826],"mapped",[15667]],[[194827,194827],"mapped",[28363]],[[194828,194828],"mapped",[28359]],[[194829,194829],"mapped",[147153]],[[194830,194830],"mapped",[28153]],[[194831,194831],"mapped",[28526]],[[194832,194832],"mapped",[147294]],[[194833,194833],"mapped",[147342]],[[194834,194834],"mapped",[28614]],[[194835,194835],"mapped",[28729]],[[194836,194836],"mapped",[28702]],[[194837,194837],"mapped",[28699]],[[194838,194838],"mapped",[15766]],[[194839,194839],"mapped",[28746]],[[194840,194840],"mapped",[28797]],[[194841,194841],"mapped",[28791]],[[194842,194842],"mapped",[28845]],[[194843,194843],"mapped",[132389]],[[194844,194844],"mapped",[28997]],[[194845,194845],"mapped",[148067]],[[194846,194846],"mapped",[29084]],[[194847,194847],"disallowed"],[[194848,194848],"mapped",[29224]],[[194849,194849],"mapped",[29237]],[[194850,194850],"mapped",[29264]],[[194851,194851],"mapped",[149000]],[[194852,194852],"mapped",[29312]],[[194853,194853],"mapped",[29333]],[[194854,194854],"mapped",[149301]],[[194855,194855],"mapped",[149524]],[[194856,194856],"mapped",[29562]],[[194857,194857],"mapped",[29579]],[[194858,194858],"mapped",[16044]],[[194859,194859],"mapped",[29605]],[[194860,194861],"mapped",[16056]],[[194862,194862],"mapped",[29767]],[[194863,194863],"mapped",[29788]],[[194864,194864],"mapped",[29809]],[[194865,194865],"mapped",[29829]],[[194866,194866],"mapped",[29898]],[[194867,194867],"mapped",[16155]],[[194868,194868],"mapped",[29988]],[[194869,194869],"mapped",[150582]],[[194870,194870],"mapped",[30014]],[[194871,194871],"mapped",[150674]],[[194872,194872],"mapped",[30064]],[[194873,194873],"mapped",[139679]],[[194874,194874],"mapped",[30224]],[[194875,194875],"mapped",[151457]],[[194876,194876],"mapped",[151480]],[[194877,194877],"mapped",[151620]],[[194878,194878],"mapped",[16380]],[[194879,194879],"mapped",[16392]],[[194880,194880],"mapped",[30452]],[[194881,194881],"mapped",[151795]],[[194882,194882],"mapped",[151794]],[[194883,194883],"mapped",[151833]],[[194884,194884],"mapped",[151859]],[[194885,194885],"mapped",[30494]],[[194886,194887],"mapped",[30495]],[[194888,194888],"mapped",[30538]],[[194889,194889],"mapped",[16441]],[[194890,194890],"mapped",[30603]],[[194891,194891],"mapped",[16454]],[[194892,194892],"mapped",[16534]],[[194893,194893],"mapped",[152605]],[[194894,194894],"mapped",[30798]],[[194895,194895],"mapped",[30860]],[[194896,194896],"mapped",[30924]],[[194897,194897],"mapped",[16611]],[[194898,194898],"mapped",[153126]],[[194899,194899],"mapped",[31062]],[[194900,194900],"mapped",[153242]],[[194901,194901],"mapped",[153285]],[[194902,194902],"mapped",[31119]],[[194903,194903],"mapped",[31211]],[[194904,194904],"mapped",[16687]],[[194905,194905],"mapped",[31296]],[[194906,194906],"mapped",[31306]],[[194907,194907],"mapped",[31311]],[[194908,194908],"mapped",[153980]],[[194909,194910],"mapped",[154279]],[[194911,194911],"disallowed"],[[194912,194912],"mapped",[16898]],[[194913,194913],"mapped",[154539]],[[194914,194914],"mapped",[31686]],[[194915,194915],"mapped",[31689]],[[194916,194916],"mapped",[16935]],[[194917,194917],"mapped",[154752]],[[194918,194918],"mapped",[31954]],[[194919,194919],"mapped",[17056]],[[194920,194920],"mapped",[31976]],[[194921,194921],"mapped",[31971]],[[194922,194922],"mapped",[32000]],[[194923,194923],"mapped",[155526]],[[194924,194924],"mapped",[32099]],[[194925,194925],"mapped",[17153]],[[194926,194926],"mapped",[32199]],[[194927,194927],"mapped",[32258]],[[194928,194928],"mapped",[32325]],[[194929,194929],"mapped",[17204]],[[194930,194930],"mapped",[156200]],[[194931,194931],"mapped",[156231]],[[194932,194932],"mapped",[17241]],[[194933,194933],"mapped",[156377]],[[194934,194934],"mapped",[32634]],[[194935,194935],"mapped",[156478]],[[194936,194936],"mapped",[32661]],[[194937,194937],"mapped",[32762]],[[194938,194938],"mapped",[32773]],[[194939,194939],"mapped",[156890]],[[194940,194940],"mapped",[156963]],[[194941,194941],"mapped",[32864]],[[194942,194942],"mapped",[157096]],[[194943,194943],"mapped",[32880]],[[194944,194944],"mapped",[144223]],[[194945,194945],"mapped",[17365]],[[194946,194946],"mapped",[32946]],[[194947,194947],"mapped",[33027]],[[194948,194948],"mapped",[17419]],[[194949,194949],"mapped",[33086]],[[194950,194950],"mapped",[23221]],[[194951,194951],"mapped",[157607]],[[194952,194952],"mapped",[157621]],[[194953,194953],"mapped",[144275]],[[194954,194954],"mapped",[144284]],[[194955,194955],"mapped",[33281]],[[194956,194956],"mapped",[33284]],[[194957,194957],"mapped",[36766]],[[194958,194958],"mapped",[17515]],[[194959,194959],"mapped",[33425]],[[194960,194960],"mapped",[33419]],[[194961,194961],"mapped",[33437]],[[194962,194962],"mapped",[21171]],[[194963,194963],"mapped",[33457]],[[194964,194964],"mapped",[33459]],[[194965,194965],"mapped",[33469]],[[194966,194966],"mapped",[33510]],[[194967,194967],"mapped",[158524]],[[194968,194968],"mapped",[33509]],[[194969,194969],"mapped",[33565]],[[194970,194970],"mapped",[33635]],[[194971,194971],"mapped",[33709]],[[194972,194972],"mapped",[33571]],[[194973,194973],"mapped",[33725]],[[194974,194974],"mapped",[33767]],[[194975,194975],"mapped",[33879]],[[194976,194976],"mapped",[33619]],[[194977,194977],"mapped",[33738]],[[194978,194978],"mapped",[33740]],[[194979,194979],"mapped",[33756]],[[194980,194980],"mapped",[158774]],[[194981,194981],"mapped",[159083]],[[194982,194982],"mapped",[158933]],[[194983,194983],"mapped",[17707]],[[194984,194984],"mapped",[34033]],[[194985,194985],"mapped",[34035]],[[194986,194986],"mapped",[34070]],[[194987,194987],"mapped",[160714]],[[194988,194988],"mapped",[34148]],[[194989,194989],"mapped",[159532]],[[194990,194990],"mapped",[17757]],[[194991,194991],"mapped",[17761]],[[194992,194992],"mapped",[159665]],[[194993,194993],"mapped",[159954]],[[194994,194994],"mapped",[17771]],[[194995,194995],"mapped",[34384]],[[194996,194996],"mapped",[34396]],[[194997,194997],"mapped",[34407]],[[194998,194998],"mapped",[34409]],[[194999,194999],"mapped",[34473]],[[195000,195000],"mapped",[34440]],[[195001,195001],"mapped",[34574]],[[195002,195002],"mapped",[34530]],[[195003,195003],"mapped",[34681]],[[195004,195004],"mapped",[34600]],[[195005,195005],"mapped",[34667]],[[195006,195006],"mapped",[34694]],[[195007,195007],"disallowed"],[[195008,195008],"mapped",[34785]],[[195009,195009],"mapped",[34817]],[[195010,195010],"mapped",[17913]],[[195011,195011],"mapped",[34912]],[[195012,195012],"mapped",[34915]],[[195013,195013],"mapped",[161383]],[[195014,195014],"mapped",[35031]],[[195015,195015],"mapped",[35038]],[[195016,195016],"mapped",[17973]],[[195017,195017],"mapped",[35066]],[[195018,195018],"mapped",[13499]],[[195019,195019],"mapped",[161966]],[[195020,195020],"mapped",[162150]],[[195021,195021],"mapped",[18110]],[[195022,195022],"mapped",[18119]],[[195023,195023],"mapped",[35488]],[[195024,195024],"mapped",[35565]],[[195025,195025],"mapped",[35722]],[[195026,195026],"mapped",[35925]],[[195027,195027],"mapped",[162984]],[[195028,195028],"mapped",[36011]],[[195029,195029],"mapped",[36033]],[[195030,195030],"mapped",[36123]],[[195031,195031],"mapped",[36215]],[[195032,195032],"mapped",[163631]],[[195033,195033],"mapped",[133124]],[[195034,195034],"mapped",[36299]],[[195035,195035],"mapped",[36284]],[[195036,195036],"mapped",[36336]],[[195037,195037],"mapped",[133342]],[[195038,195038],"mapped",[36564]],[[195039,195039],"mapped",[36664]],[[195040,195040],"mapped",[165330]],[[195041,195041],"mapped",[165357]],[[195042,195042],"mapped",[37012]],[[195043,195043],"mapped",[37105]],[[195044,195044],"mapped",[37137]],[[195045,195045],"mapped",[165678]],[[195046,195046],"mapped",[37147]],[[195047,195047],"mapped",[37432]],[[195048,195048],"mapped",[37591]],[[195049,195049],"mapped",[37592]],[[195050,195050],"mapped",[37500]],[[195051,195051],"mapped",[37881]],[[195052,195052],"mapped",[37909]],[[195053,195053],"mapped",[166906]],[[195054,195054],"mapped",[38283]],[[195055,195055],"mapped",[18837]],[[195056,195056],"mapped",[38327]],[[195057,195057],"mapped",[167287]],[[195058,195058],"mapped",[18918]],[[195059,195059],"mapped",[38595]],[[195060,195060],"mapped",[23986]],[[195061,195061],"mapped",[38691]],[[195062,195062],"mapped",[168261]],[[195063,195063],"mapped",[168474]],[[195064,195064],"mapped",[19054]],[[195065,195065],"mapped",[19062]],[[195066,195066],"mapped",[38880]],[[195067,195067],"mapped",[168970]],[[195068,195068],"mapped",[19122]],[[195069,195069],"mapped",[169110]],[[195070,195071],"mapped",[38923]],[[195072,195072],"mapped",[38953]],[[195073,195073],"mapped",[169398]],[[195074,195074],"mapped",[39138]],[[195075,195075],"mapped",[19251]],[[195076,195076],"mapped",[39209]],[[195077,195077],"mapped",[39335]],[[195078,195078],"mapped",[39362]],[[195079,195079],"mapped",[39422]],[[195080,195080],"mapped",[19406]],[[195081,195081],"mapped",[170800]],[[195082,195082],"mapped",[39698]],[[195083,195083],"mapped",[40000]],[[195084,195084],"mapped",[40189]],[[195085,195085],"mapped",[19662]],[[195086,195086],"mapped",[19693]],[[195087,195087],"mapped",[40295]],[[195088,195088],"mapped",[172238]],[[195089,195089],"mapped",[19704]],[[195090,195090],"mapped",[172293]],[[195091,195091],"mapped",[172558]],[[195092,195092],"mapped",[172689]],[[195093,195093],"mapped",[40635]],[[195094,195094],"mapped",[19798]],[[195095,195095],"mapped",[40697]],[[195096,195096],"mapped",[40702]],[[195097,195097],"mapped",[40709]],[[195098,195098],"mapped",[40719]],[[195099,195099],"mapped",[40726]],[[195100,195100],"mapped",[40763]],[[195101,195101],"mapped",[173568]],[[195102,196605],"disallowed"],[[196606,196607],"disallowed"],[[196608,262141],"disallowed"],[[262142,262143],"disallowed"],[[262144,327677],"disallowed"],[[327678,327679],"disallowed"],[[327680,393213],"disallowed"],[[393214,393215],"disallowed"],[[393216,458749],"disallowed"],[[458750,458751],"disallowed"],[[458752,524285],"disallowed"],[[524286,524287],"disallowed"],[[524288,589821],"disallowed"],[[589822,589823],"disallowed"],[[589824,655357],"disallowed"],[[655358,655359],"disallowed"],[[655360,720893],"disallowed"],[[720894,720895],"disallowed"],[[720896,786429],"disallowed"],[[786430,786431],"disallowed"],[[786432,851965],"disallowed"],[[851966,851967],"disallowed"],[[851968,917501],"disallowed"],[[917502,917503],"disallowed"],[[917504,917504],"disallowed"],[[917505,917505],"disallowed"],[[917506,917535],"disallowed"],[[917536,917631],"disallowed"],[[917632,917759],"disallowed"],[[917760,917999],"ignored"],[[918000,983037],"disallowed"],[[983038,983039],"disallowed"],[[983040,1048573],"disallowed"],[[1048574,1048575],"disallowed"],[[1048576,1114109],"disallowed"],[[1114110,1114111],"disallowed"]]');
-
-/***/ })
-
-/******/ 	});
-/************************************************************************/
-/******/ 	// The module cache
-/******/ 	var __webpack_module_cache__ = {};
-/******/ 	
-/******/ 	// The require function
-/******/ 	function __nccwpck_require__(moduleId) {
-/******/ 		// Check if module is in cache
-/******/ 		var cachedModule = __webpack_module_cache__[moduleId];
-/******/ 		if (cachedModule !== undefined) {
-/******/ 			return cachedModule.exports;
-/******/ 		}
-/******/ 		// Create a new module (and put it into the cache)
-/******/ 		var module = __webpack_module_cache__[moduleId] = {
-/******/ 			// no module.id needed
-/******/ 			// no module.loaded needed
-/******/ 			exports: {}
-/******/ 		};
-/******/ 	
-/******/ 		// Execute the module function
-/******/ 		var threw = true;
-/******/ 		try {
-/******/ 			__webpack_modules__[moduleId].call(module.exports, module, module.exports, __nccwpck_require__);
-/******/ 			threw = false;
-/******/ 		} finally {
-/******/ 			if(threw) delete __webpack_module_cache__[moduleId];
-/******/ 		}
-/******/ 	
-/******/ 		// Return the exports of the module
-/******/ 		return module.exports;
-/******/ 	}
-/******/ 	
-/************************************************************************/
-/******/ 	/* webpack/runtime/compat */
-/******/ 	
-/******/ 	if (typeof __nccwpck_require__ !== 'undefined') __nccwpck_require__.ab = __dirname + "/";
-/******/ 	
-/************************************************************************/
-/******/ 	
-/******/ 	// startup
-/******/ 	// Load entry module and return exports
-/******/ 	// This entry module is referenced by other modules so it can't be inlined
-/******/ 	var __webpack_exports__ = __nccwpck_require__(8564);
-/******/ 	module.exports = __webpack_exports__;
-/******/ 	
-/******/ })()
-;
diff --git a/.github/actions/javascript/isStagingDeployLocked/index.js b/.github/actions/javascript/isStagingDeployLocked/index.js
index f71b89dc051c..9e823e8da5ae 100644
--- a/.github/actions/javascript/isStagingDeployLocked/index.js
+++ b/.github/actions/javascript/isStagingDeployLocked/index.js
@@ -6679,7 +6679,7 @@ FetchError.prototype.name = 'FetchError';
 
 let convert;
 try {
-	convert = (__nccwpck_require__(2877).convert);
+	convert = (__nccwpck_require__(3975).convert);
 } catch (e) {}
 
 const INTERNALS = Symbol('Body internals');
@@ -11501,7 +11501,22 @@ const CONST = {
         STAGING_DEPLOY: 'StagingDeployCash',
         DEPLOY_BLOCKER: 'DeployBlockerCash',
         INTERNAL_QA: 'InternalQA',
+        HELP_WANTED: 'Help Wanted',
+        CP_STAGING: 'CP Staging',
     },
+    ACTIONS: {
+        CREATED: 'created',
+        EDIT: 'edited',
+    },
+    EVENTS: {
+        ISSUE_COMMENT: 'issue_comment',
+    },
+    OPENAI_ROLES: {
+        USER: 'user',
+        ASSISTANT: 'assistant',
+    },
+    PROPOSAL_KEYWORD: 'Proposal',
+    OPENAI_THREAD_COMPLETED: 'completed',
     DATE_FORMAT_STRING: 'yyyy-MM-dd',
     PULL_REQUEST_REGEX: new RegExp(`${GITHUB_BASE_URL_REGEX.source}/.*/.*/pull/([0-9]+).*`),
     ISSUE_REGEX: new RegExp(`${GITHUB_BASE_URL_REGEX.source}/.*/.*/issues/([0-9]+).*`),
@@ -11509,6 +11524,9 @@ const CONST = {
     POLL_RATE: 10000,
     APP_REPO_URL: `https://github.com/${GIT_CONST.GITHUB_OWNER}/${GIT_CONST.APP_REPO}`,
     APP_REPO_GIT_URL: `git@github.com:${GIT_CONST.GITHUB_OWNER}/${GIT_CONST.APP_REPO}.git`,
+    NO_ACTION: 'NO_ACTION',
+    OPENAI_POLL_RATE: 1500,
+    OPENAI_POLL_TIMEOUT: 90000,
 };
 exports["default"] = CONST;
 
@@ -11558,13 +11576,11 @@ const CONST_1 = __importDefault(__nccwpck_require__(9873));
 class GithubUtils {
     static internalOctokit;
     /**
-     * Initialize internal octokit
-     *
-     * @private
+     * Initialize internal octokit.
+     * NOTE: When using GithubUtils in CI, you don't need to call this manually.
      */
-    static initOctokit() {
+    static initOctokitWithToken(token) {
         const Octokit = utils_1.GitHub.plugin(plugin_throttling_1.throttling, plugin_paginate_rest_1.paginateRest);
-        const token = core.getInput('GITHUB_TOKEN', { required: true });
         // Save a copy of octokit used in this class
         this.internalOctokit = new Octokit((0, utils_1.getOctokitOptions)(token, {
             throttle: {
@@ -11584,6 +11600,15 @@ class GithubUtils {
             },
         }));
     }
+    /**
+     * Default initialize method assuming running in CI, getting the token from an input.
+     *
+     * @private
+     */
+    static initOctokit() {
+        const token = core.getInput('GITHUB_TOKEN', { required: true });
+        this.initOctokitWithToken(token);
+    }
     /**
      * Either give an existing instance of Octokit rest or create a new one
      *
@@ -11878,12 +11903,6 @@ class GithubUtils {
         })
             .then((response) => response.data.workflow_runs[0]?.id);
     }
-    /**
-     * Generate the well-formatted body of a production release.
-     */
-    static getReleaseBody(pullRequests) {
-        return pullRequests.map((number) => `- ${this.getPullRequestURLFromNumber(number)}`).join('\r\n');
-    }
     /**
      * Generate the URL of an New Expensify pull request given the PR number.
      */
@@ -11939,12 +11958,31 @@ class GithubUtils {
             .then((events) => events.filter((event) => event.event === 'closed'))
             .then((closedEvents) => closedEvents.at(-1)?.actor?.login ?? '');
     }
-    static getArtifactByName(artefactName) {
-        return this.paginate(this.octokit.actions.listArtifactsForRepo, {
+    /**
+     * Returns a single artifact by name. If none is found, it returns undefined.
+     */
+    static getArtifactByName(artifactName) {
+        return this.octokit.actions
+            .listArtifactsForRepo({
             owner: CONST_1.default.GITHUB_OWNER,
             repo: CONST_1.default.APP_REPO,
-            per_page: 100,
-        }).then((artifacts) => artifacts.find((artifact) => artifact.name === artefactName));
+            per_page: 1,
+            name: artifactName,
+        })
+            .then((response) => response.data.artifacts[0]);
+    }
+    /**
+     * Given an artifact ID, returns the download URL to a zip file containing the artifact.
+     */
+    static getArtifactDownloadURL(artifactId) {
+        return this.octokit.actions
+            .downloadArtifact({
+            owner: CONST_1.default.GITHUB_OWNER,
+            repo: CONST_1.default.APP_REPO,
+            artifact_id: artifactId,
+            archive_format: 'zip',
+        })
+            .then((response) => response.url);
     }
 }
 exports["default"] = GithubUtils;
@@ -11985,27 +12023,27 @@ exports["default"] = arrayDifference;
 
 /***/ }),
 
-/***/ 2877:
+/***/ 9491:
 /***/ ((module) => {
 
-module.exports = eval("require")("encoding");
-
+"use strict";
+module.exports = require("assert");
 
 /***/ }),
 
-/***/ 9491:
+/***/ 6113:
 /***/ ((module) => {
 
 "use strict";
-module.exports = require("assert");
+module.exports = require("crypto");
 
 /***/ }),
 
-/***/ 6113:
+/***/ 3975:
 /***/ ((module) => {
 
 "use strict";
-module.exports = require("crypto");
+module.exports = require("encoding");
 
 /***/ }),
 
diff --git a/.github/actions/javascript/markPullRequestsAsDeployed/index.js b/.github/actions/javascript/markPullRequestsAsDeployed/index.js
index 804d3ea610f3..9f97e4a72d20 100644
--- a/.github/actions/javascript/markPullRequestsAsDeployed/index.js
+++ b/.github/actions/javascript/markPullRequestsAsDeployed/index.js
@@ -6555,6 +6555,1174 @@ function isPlainObject(o) {
 exports.isPlainObject = isPlainObject;
 
 
+/***/ }),
+
+/***/ 5902:
+/***/ ((module, __unused_webpack_exports, __nccwpck_require__) => {
+
+var hashClear = __nccwpck_require__(1789),
+    hashDelete = __nccwpck_require__(712),
+    hashGet = __nccwpck_require__(5395),
+    hashHas = __nccwpck_require__(5232),
+    hashSet = __nccwpck_require__(7320);
+
+/**
+ * Creates a hash object.
+ *
+ * @private
+ * @constructor
+ * @param {Array} [entries] The key-value pairs to cache.
+ */
+function Hash(entries) {
+  var index = -1,
+      length = entries == null ? 0 : entries.length;
+
+  this.clear();
+  while (++index < length) {
+    var entry = entries[index];
+    this.set(entry[0], entry[1]);
+  }
+}
+
+// Add methods to `Hash`.
+Hash.prototype.clear = hashClear;
+Hash.prototype['delete'] = hashDelete;
+Hash.prototype.get = hashGet;
+Hash.prototype.has = hashHas;
+Hash.prototype.set = hashSet;
+
+module.exports = Hash;
+
+
+/***/ }),
+
+/***/ 6608:
+/***/ ((module, __unused_webpack_exports, __nccwpck_require__) => {
+
+var listCacheClear = __nccwpck_require__(9792),
+    listCacheDelete = __nccwpck_require__(7716),
+    listCacheGet = __nccwpck_require__(5789),
+    listCacheHas = __nccwpck_require__(9386),
+    listCacheSet = __nccwpck_require__(7399);
+
+/**
+ * Creates an list cache object.
+ *
+ * @private
+ * @constructor
+ * @param {Array} [entries] The key-value pairs to cache.
+ */
+function ListCache(entries) {
+  var index = -1,
+      length = entries == null ? 0 : entries.length;
+
+  this.clear();
+  while (++index < length) {
+    var entry = entries[index];
+    this.set(entry[0], entry[1]);
+  }
+}
+
+// Add methods to `ListCache`.
+ListCache.prototype.clear = listCacheClear;
+ListCache.prototype['delete'] = listCacheDelete;
+ListCache.prototype.get = listCacheGet;
+ListCache.prototype.has = listCacheHas;
+ListCache.prototype.set = listCacheSet;
+
+module.exports = ListCache;
+
+
+/***/ }),
+
+/***/ 881:
+/***/ ((module, __unused_webpack_exports, __nccwpck_require__) => {
+
+var getNative = __nccwpck_require__(4479),
+    root = __nccwpck_require__(9882);
+
+/* Built-in method references that are verified to be native. */
+var Map = getNative(root, 'Map');
+
+module.exports = Map;
+
+
+/***/ }),
+
+/***/ 938:
+/***/ ((module, __unused_webpack_exports, __nccwpck_require__) => {
+
+var mapCacheClear = __nccwpck_require__(1610),
+    mapCacheDelete = __nccwpck_require__(6657),
+    mapCacheGet = __nccwpck_require__(1372),
+    mapCacheHas = __nccwpck_require__(609),
+    mapCacheSet = __nccwpck_require__(5582);
+
+/**
+ * Creates a map cache object to store key-value pairs.
+ *
+ * @private
+ * @constructor
+ * @param {Array} [entries] The key-value pairs to cache.
+ */
+function MapCache(entries) {
+  var index = -1,
+      length = entries == null ? 0 : entries.length;
+
+  this.clear();
+  while (++index < length) {
+    var entry = entries[index];
+    this.set(entry[0], entry[1]);
+  }
+}
+
+// Add methods to `MapCache`.
+MapCache.prototype.clear = mapCacheClear;
+MapCache.prototype['delete'] = mapCacheDelete;
+MapCache.prototype.get = mapCacheGet;
+MapCache.prototype.has = mapCacheHas;
+MapCache.prototype.set = mapCacheSet;
+
+module.exports = MapCache;
+
+
+/***/ }),
+
+/***/ 9213:
+/***/ ((module, __unused_webpack_exports, __nccwpck_require__) => {
+
+var root = __nccwpck_require__(9882);
+
+/** Built-in value references. */
+var Symbol = root.Symbol;
+
+module.exports = Symbol;
+
+
+/***/ }),
+
+/***/ 6752:
+/***/ ((module, __unused_webpack_exports, __nccwpck_require__) => {
+
+var eq = __nccwpck_require__(1901);
+
+/**
+ * Gets the index at which the `key` is found in `array` of key-value pairs.
+ *
+ * @private
+ * @param {Array} array The array to inspect.
+ * @param {*} key The key to search for.
+ * @returns {number} Returns the index of the matched value, else `-1`.
+ */
+function assocIndexOf(array, key) {
+  var length = array.length;
+  while (length--) {
+    if (eq(array[length][0], key)) {
+      return length;
+    }
+  }
+  return -1;
+}
+
+module.exports = assocIndexOf;
+
+
+/***/ }),
+
+/***/ 7497:
+/***/ ((module, __unused_webpack_exports, __nccwpck_require__) => {
+
+var Symbol = __nccwpck_require__(9213),
+    getRawTag = __nccwpck_require__(923),
+    objectToString = __nccwpck_require__(4200);
+
+/** `Object#toString` result references. */
+var nullTag = '[object Null]',
+    undefinedTag = '[object Undefined]';
+
+/** Built-in value references. */
+var symToStringTag = Symbol ? Symbol.toStringTag : undefined;
+
+/**
+ * The base implementation of `getTag` without fallbacks for buggy environments.
+ *
+ * @private
+ * @param {*} value The value to query.
+ * @returns {string} Returns the `toStringTag`.
+ */
+function baseGetTag(value) {
+  if (value == null) {
+    return value === undefined ? undefinedTag : nullTag;
+  }
+  return (symToStringTag && symToStringTag in Object(value))
+    ? getRawTag(value)
+    : objectToString(value);
+}
+
+module.exports = baseGetTag;
+
+
+/***/ }),
+
+/***/ 411:
+/***/ ((module, __unused_webpack_exports, __nccwpck_require__) => {
+
+var isFunction = __nccwpck_require__(7799),
+    isMasked = __nccwpck_require__(9058),
+    isObject = __nccwpck_require__(3334),
+    toSource = __nccwpck_require__(6928);
+
+/**
+ * Used to match `RegExp`
+ * [syntax characters](http://ecma-international.org/ecma-262/7.0/#sec-patterns).
+ */
+var reRegExpChar = /[\\^$.*+?()[\]{}|]/g;
+
+/** Used to detect host constructors (Safari). */
+var reIsHostCtor = /^\[object .+?Constructor\]$/;
+
+/** Used for built-in method references. */
+var funcProto = Function.prototype,
+    objectProto = Object.prototype;
+
+/** Used to resolve the decompiled source of functions. */
+var funcToString = funcProto.toString;
+
+/** Used to check objects for own properties. */
+var hasOwnProperty = objectProto.hasOwnProperty;
+
+/** Used to detect if a method is native. */
+var reIsNative = RegExp('^' +
+  funcToString.call(hasOwnProperty).replace(reRegExpChar, '\\$&')
+  .replace(/hasOwnProperty|(function).*?(?=\\\()| for .+?(?=\\\])/g, '$1.*?') + '$'
+);
+
+/**
+ * The base implementation of `_.isNative` without bad shim checks.
+ *
+ * @private
+ * @param {*} value The value to check.
+ * @returns {boolean} Returns `true` if `value` is a native function,
+ *  else `false`.
+ */
+function baseIsNative(value) {
+  if (!isObject(value) || isMasked(value)) {
+    return false;
+  }
+  var pattern = isFunction(value) ? reIsNative : reIsHostCtor;
+  return pattern.test(toSource(value));
+}
+
+module.exports = baseIsNative;
+
+
+/***/ }),
+
+/***/ 8380:
+/***/ ((module, __unused_webpack_exports, __nccwpck_require__) => {
+
+var root = __nccwpck_require__(9882);
+
+/** Used to detect overreaching core-js shims. */
+var coreJsData = root['__core-js_shared__'];
+
+module.exports = coreJsData;
+
+
+/***/ }),
+
+/***/ 2085:
+/***/ ((module) => {
+
+/** Detect free variable `global` from Node.js. */
+var freeGlobal = typeof global == 'object' && global && global.Object === Object && global;
+
+module.exports = freeGlobal;
+
+
+/***/ }),
+
+/***/ 9980:
+/***/ ((module, __unused_webpack_exports, __nccwpck_require__) => {
+
+var isKeyable = __nccwpck_require__(3308);
+
+/**
+ * Gets the data for `map`.
+ *
+ * @private
+ * @param {Object} map The map to query.
+ * @param {string} key The reference key.
+ * @returns {*} Returns the map data.
+ */
+function getMapData(map, key) {
+  var data = map.__data__;
+  return isKeyable(key)
+    ? data[typeof key == 'string' ? 'string' : 'hash']
+    : data.map;
+}
+
+module.exports = getMapData;
+
+
+/***/ }),
+
+/***/ 4479:
+/***/ ((module, __unused_webpack_exports, __nccwpck_require__) => {
+
+var baseIsNative = __nccwpck_require__(411),
+    getValue = __nccwpck_require__(3542);
+
+/**
+ * Gets the native function at `key` of `object`.
+ *
+ * @private
+ * @param {Object} object The object to query.
+ * @param {string} key The key of the method to get.
+ * @returns {*} Returns the function if it's native, else `undefined`.
+ */
+function getNative(object, key) {
+  var value = getValue(object, key);
+  return baseIsNative(value) ? value : undefined;
+}
+
+module.exports = getNative;
+
+
+/***/ }),
+
+/***/ 923:
+/***/ ((module, __unused_webpack_exports, __nccwpck_require__) => {
+
+var Symbol = __nccwpck_require__(9213);
+
+/** Used for built-in method references. */
+var objectProto = Object.prototype;
+
+/** Used to check objects for own properties. */
+var hasOwnProperty = objectProto.hasOwnProperty;
+
+/**
+ * Used to resolve the
+ * [`toStringTag`](http://ecma-international.org/ecma-262/7.0/#sec-object.prototype.tostring)
+ * of values.
+ */
+var nativeObjectToString = objectProto.toString;
+
+/** Built-in value references. */
+var symToStringTag = Symbol ? Symbol.toStringTag : undefined;
+
+/**
+ * A specialized version of `baseGetTag` which ignores `Symbol.toStringTag` values.
+ *
+ * @private
+ * @param {*} value The value to query.
+ * @returns {string} Returns the raw `toStringTag`.
+ */
+function getRawTag(value) {
+  var isOwn = hasOwnProperty.call(value, symToStringTag),
+      tag = value[symToStringTag];
+
+  try {
+    value[symToStringTag] = undefined;
+    var unmasked = true;
+  } catch (e) {}
+
+  var result = nativeObjectToString.call(value);
+  if (unmasked) {
+    if (isOwn) {
+      value[symToStringTag] = tag;
+    } else {
+      delete value[symToStringTag];
+    }
+  }
+  return result;
+}
+
+module.exports = getRawTag;
+
+
+/***/ }),
+
+/***/ 3542:
+/***/ ((module) => {
+
+/**
+ * Gets the value at `key` of `object`.
+ *
+ * @private
+ * @param {Object} [object] The object to query.
+ * @param {string} key The key of the property to get.
+ * @returns {*} Returns the property value.
+ */
+function getValue(object, key) {
+  return object == null ? undefined : object[key];
+}
+
+module.exports = getValue;
+
+
+/***/ }),
+
+/***/ 1789:
+/***/ ((module, __unused_webpack_exports, __nccwpck_require__) => {
+
+var nativeCreate = __nccwpck_require__(3041);
+
+/**
+ * Removes all key-value entries from the hash.
+ *
+ * @private
+ * @name clear
+ * @memberOf Hash
+ */
+function hashClear() {
+  this.__data__ = nativeCreate ? nativeCreate(null) : {};
+  this.size = 0;
+}
+
+module.exports = hashClear;
+
+
+/***/ }),
+
+/***/ 712:
+/***/ ((module) => {
+
+/**
+ * Removes `key` and its value from the hash.
+ *
+ * @private
+ * @name delete
+ * @memberOf Hash
+ * @param {Object} hash The hash to modify.
+ * @param {string} key The key of the value to remove.
+ * @returns {boolean} Returns `true` if the entry was removed, else `false`.
+ */
+function hashDelete(key) {
+  var result = this.has(key) && delete this.__data__[key];
+  this.size -= result ? 1 : 0;
+  return result;
+}
+
+module.exports = hashDelete;
+
+
+/***/ }),
+
+/***/ 5395:
+/***/ ((module, __unused_webpack_exports, __nccwpck_require__) => {
+
+var nativeCreate = __nccwpck_require__(3041);
+
+/** Used to stand-in for `undefined` hash values. */
+var HASH_UNDEFINED = '__lodash_hash_undefined__';
+
+/** Used for built-in method references. */
+var objectProto = Object.prototype;
+
+/** Used to check objects for own properties. */
+var hasOwnProperty = objectProto.hasOwnProperty;
+
+/**
+ * Gets the hash value for `key`.
+ *
+ * @private
+ * @name get
+ * @memberOf Hash
+ * @param {string} key The key of the value to get.
+ * @returns {*} Returns the entry value.
+ */
+function hashGet(key) {
+  var data = this.__data__;
+  if (nativeCreate) {
+    var result = data[key];
+    return result === HASH_UNDEFINED ? undefined : result;
+  }
+  return hasOwnProperty.call(data, key) ? data[key] : undefined;
+}
+
+module.exports = hashGet;
+
+
+/***/ }),
+
+/***/ 5232:
+/***/ ((module, __unused_webpack_exports, __nccwpck_require__) => {
+
+var nativeCreate = __nccwpck_require__(3041);
+
+/** Used for built-in method references. */
+var objectProto = Object.prototype;
+
+/** Used to check objects for own properties. */
+var hasOwnProperty = objectProto.hasOwnProperty;
+
+/**
+ * Checks if a hash value for `key` exists.
+ *
+ * @private
+ * @name has
+ * @memberOf Hash
+ * @param {string} key The key of the entry to check.
+ * @returns {boolean} Returns `true` if an entry for `key` exists, else `false`.
+ */
+function hashHas(key) {
+  var data = this.__data__;
+  return nativeCreate ? (data[key] !== undefined) : hasOwnProperty.call(data, key);
+}
+
+module.exports = hashHas;
+
+
+/***/ }),
+
+/***/ 7320:
+/***/ ((module, __unused_webpack_exports, __nccwpck_require__) => {
+
+var nativeCreate = __nccwpck_require__(3041);
+
+/** Used to stand-in for `undefined` hash values. */
+var HASH_UNDEFINED = '__lodash_hash_undefined__';
+
+/**
+ * Sets the hash `key` to `value`.
+ *
+ * @private
+ * @name set
+ * @memberOf Hash
+ * @param {string} key The key of the value to set.
+ * @param {*} value The value to set.
+ * @returns {Object} Returns the hash instance.
+ */
+function hashSet(key, value) {
+  var data = this.__data__;
+  this.size += this.has(key) ? 0 : 1;
+  data[key] = (nativeCreate && value === undefined) ? HASH_UNDEFINED : value;
+  return this;
+}
+
+module.exports = hashSet;
+
+
+/***/ }),
+
+/***/ 3308:
+/***/ ((module) => {
+
+/**
+ * Checks if `value` is suitable for use as unique object key.
+ *
+ * @private
+ * @param {*} value The value to check.
+ * @returns {boolean} Returns `true` if `value` is suitable, else `false`.
+ */
+function isKeyable(value) {
+  var type = typeof value;
+  return (type == 'string' || type == 'number' || type == 'symbol' || type == 'boolean')
+    ? (value !== '__proto__')
+    : (value === null);
+}
+
+module.exports = isKeyable;
+
+
+/***/ }),
+
+/***/ 9058:
+/***/ ((module, __unused_webpack_exports, __nccwpck_require__) => {
+
+var coreJsData = __nccwpck_require__(8380);
+
+/** Used to detect methods masquerading as native. */
+var maskSrcKey = (function() {
+  var uid = /[^.]+$/.exec(coreJsData && coreJsData.keys && coreJsData.keys.IE_PROTO || '');
+  return uid ? ('Symbol(src)_1.' + uid) : '';
+}());
+
+/**
+ * Checks if `func` has its source masked.
+ *
+ * @private
+ * @param {Function} func The function to check.
+ * @returns {boolean} Returns `true` if `func` is masked, else `false`.
+ */
+function isMasked(func) {
+  return !!maskSrcKey && (maskSrcKey in func);
+}
+
+module.exports = isMasked;
+
+
+/***/ }),
+
+/***/ 9792:
+/***/ ((module) => {
+
+/**
+ * Removes all key-value entries from the list cache.
+ *
+ * @private
+ * @name clear
+ * @memberOf ListCache
+ */
+function listCacheClear() {
+  this.__data__ = [];
+  this.size = 0;
+}
+
+module.exports = listCacheClear;
+
+
+/***/ }),
+
+/***/ 7716:
+/***/ ((module, __unused_webpack_exports, __nccwpck_require__) => {
+
+var assocIndexOf = __nccwpck_require__(6752);
+
+/** Used for built-in method references. */
+var arrayProto = Array.prototype;
+
+/** Built-in value references. */
+var splice = arrayProto.splice;
+
+/**
+ * Removes `key` and its value from the list cache.
+ *
+ * @private
+ * @name delete
+ * @memberOf ListCache
+ * @param {string} key The key of the value to remove.
+ * @returns {boolean} Returns `true` if the entry was removed, else `false`.
+ */
+function listCacheDelete(key) {
+  var data = this.__data__,
+      index = assocIndexOf(data, key);
+
+  if (index < 0) {
+    return false;
+  }
+  var lastIndex = data.length - 1;
+  if (index == lastIndex) {
+    data.pop();
+  } else {
+    splice.call(data, index, 1);
+  }
+  --this.size;
+  return true;
+}
+
+module.exports = listCacheDelete;
+
+
+/***/ }),
+
+/***/ 5789:
+/***/ ((module, __unused_webpack_exports, __nccwpck_require__) => {
+
+var assocIndexOf = __nccwpck_require__(6752);
+
+/**
+ * Gets the list cache value for `key`.
+ *
+ * @private
+ * @name get
+ * @memberOf ListCache
+ * @param {string} key The key of the value to get.
+ * @returns {*} Returns the entry value.
+ */
+function listCacheGet(key) {
+  var data = this.__data__,
+      index = assocIndexOf(data, key);
+
+  return index < 0 ? undefined : data[index][1];
+}
+
+module.exports = listCacheGet;
+
+
+/***/ }),
+
+/***/ 9386:
+/***/ ((module, __unused_webpack_exports, __nccwpck_require__) => {
+
+var assocIndexOf = __nccwpck_require__(6752);
+
+/**
+ * Checks if a list cache value for `key` exists.
+ *
+ * @private
+ * @name has
+ * @memberOf ListCache
+ * @param {string} key The key of the entry to check.
+ * @returns {boolean} Returns `true` if an entry for `key` exists, else `false`.
+ */
+function listCacheHas(key) {
+  return assocIndexOf(this.__data__, key) > -1;
+}
+
+module.exports = listCacheHas;
+
+
+/***/ }),
+
+/***/ 7399:
+/***/ ((module, __unused_webpack_exports, __nccwpck_require__) => {
+
+var assocIndexOf = __nccwpck_require__(6752);
+
+/**
+ * Sets the list cache `key` to `value`.
+ *
+ * @private
+ * @name set
+ * @memberOf ListCache
+ * @param {string} key The key of the value to set.
+ * @param {*} value The value to set.
+ * @returns {Object} Returns the list cache instance.
+ */
+function listCacheSet(key, value) {
+  var data = this.__data__,
+      index = assocIndexOf(data, key);
+
+  if (index < 0) {
+    ++this.size;
+    data.push([key, value]);
+  } else {
+    data[index][1] = value;
+  }
+  return this;
+}
+
+module.exports = listCacheSet;
+
+
+/***/ }),
+
+/***/ 1610:
+/***/ ((module, __unused_webpack_exports, __nccwpck_require__) => {
+
+var Hash = __nccwpck_require__(5902),
+    ListCache = __nccwpck_require__(6608),
+    Map = __nccwpck_require__(881);
+
+/**
+ * Removes all key-value entries from the map.
+ *
+ * @private
+ * @name clear
+ * @memberOf MapCache
+ */
+function mapCacheClear() {
+  this.size = 0;
+  this.__data__ = {
+    'hash': new Hash,
+    'map': new (Map || ListCache),
+    'string': new Hash
+  };
+}
+
+module.exports = mapCacheClear;
+
+
+/***/ }),
+
+/***/ 6657:
+/***/ ((module, __unused_webpack_exports, __nccwpck_require__) => {
+
+var getMapData = __nccwpck_require__(9980);
+
+/**
+ * Removes `key` and its value from the map.
+ *
+ * @private
+ * @name delete
+ * @memberOf MapCache
+ * @param {string} key The key of the value to remove.
+ * @returns {boolean} Returns `true` if the entry was removed, else `false`.
+ */
+function mapCacheDelete(key) {
+  var result = getMapData(this, key)['delete'](key);
+  this.size -= result ? 1 : 0;
+  return result;
+}
+
+module.exports = mapCacheDelete;
+
+
+/***/ }),
+
+/***/ 1372:
+/***/ ((module, __unused_webpack_exports, __nccwpck_require__) => {
+
+var getMapData = __nccwpck_require__(9980);
+
+/**
+ * Gets the map value for `key`.
+ *
+ * @private
+ * @name get
+ * @memberOf MapCache
+ * @param {string} key The key of the value to get.
+ * @returns {*} Returns the entry value.
+ */
+function mapCacheGet(key) {
+  return getMapData(this, key).get(key);
+}
+
+module.exports = mapCacheGet;
+
+
+/***/ }),
+
+/***/ 609:
+/***/ ((module, __unused_webpack_exports, __nccwpck_require__) => {
+
+var getMapData = __nccwpck_require__(9980);
+
+/**
+ * Checks if a map value for `key` exists.
+ *
+ * @private
+ * @name has
+ * @memberOf MapCache
+ * @param {string} key The key of the entry to check.
+ * @returns {boolean} Returns `true` if an entry for `key` exists, else `false`.
+ */
+function mapCacheHas(key) {
+  return getMapData(this, key).has(key);
+}
+
+module.exports = mapCacheHas;
+
+
+/***/ }),
+
+/***/ 5582:
+/***/ ((module, __unused_webpack_exports, __nccwpck_require__) => {
+
+var getMapData = __nccwpck_require__(9980);
+
+/**
+ * Sets the map `key` to `value`.
+ *
+ * @private
+ * @name set
+ * @memberOf MapCache
+ * @param {string} key The key of the value to set.
+ * @param {*} value The value to set.
+ * @returns {Object} Returns the map cache instance.
+ */
+function mapCacheSet(key, value) {
+  var data = getMapData(this, key),
+      size = data.size;
+
+  data.set(key, value);
+  this.size += data.size == size ? 0 : 1;
+  return this;
+}
+
+module.exports = mapCacheSet;
+
+
+/***/ }),
+
+/***/ 3041:
+/***/ ((module, __unused_webpack_exports, __nccwpck_require__) => {
+
+var getNative = __nccwpck_require__(4479);
+
+/* Built-in method references that are verified to be native. */
+var nativeCreate = getNative(Object, 'create');
+
+module.exports = nativeCreate;
+
+
+/***/ }),
+
+/***/ 4200:
+/***/ ((module) => {
+
+/** Used for built-in method references. */
+var objectProto = Object.prototype;
+
+/**
+ * Used to resolve the
+ * [`toStringTag`](http://ecma-international.org/ecma-262/7.0/#sec-object.prototype.tostring)
+ * of values.
+ */
+var nativeObjectToString = objectProto.toString;
+
+/**
+ * Converts `value` to a string using `Object.prototype.toString`.
+ *
+ * @private
+ * @param {*} value The value to convert.
+ * @returns {string} Returns the converted string.
+ */
+function objectToString(value) {
+  return nativeObjectToString.call(value);
+}
+
+module.exports = objectToString;
+
+
+/***/ }),
+
+/***/ 9882:
+/***/ ((module, __unused_webpack_exports, __nccwpck_require__) => {
+
+var freeGlobal = __nccwpck_require__(2085);
+
+/** Detect free variable `self`. */
+var freeSelf = typeof self == 'object' && self && self.Object === Object && self;
+
+/** Used as a reference to the global object. */
+var root = freeGlobal || freeSelf || Function('return this')();
+
+module.exports = root;
+
+
+/***/ }),
+
+/***/ 6928:
+/***/ ((module) => {
+
+/** Used for built-in method references. */
+var funcProto = Function.prototype;
+
+/** Used to resolve the decompiled source of functions. */
+var funcToString = funcProto.toString;
+
+/**
+ * Converts `func` to its source code.
+ *
+ * @private
+ * @param {Function} func The function to convert.
+ * @returns {string} Returns the source code.
+ */
+function toSource(func) {
+  if (func != null) {
+    try {
+      return funcToString.call(func);
+    } catch (e) {}
+    try {
+      return (func + '');
+    } catch (e) {}
+  }
+  return '';
+}
+
+module.exports = toSource;
+
+
+/***/ }),
+
+/***/ 1901:
+/***/ ((module) => {
+
+/**
+ * Performs a
+ * [`SameValueZero`](http://ecma-international.org/ecma-262/7.0/#sec-samevaluezero)
+ * comparison between two values to determine if they are equivalent.
+ *
+ * @static
+ * @memberOf _
+ * @since 4.0.0
+ * @category Lang
+ * @param {*} value The value to compare.
+ * @param {*} other The other value to compare.
+ * @returns {boolean} Returns `true` if the values are equivalent, else `false`.
+ * @example
+ *
+ * var object = { 'a': 1 };
+ * var other = { 'a': 1 };
+ *
+ * _.eq(object, object);
+ * // => true
+ *
+ * _.eq(object, other);
+ * // => false
+ *
+ * _.eq('a', 'a');
+ * // => true
+ *
+ * _.eq('a', Object('a'));
+ * // => false
+ *
+ * _.eq(NaN, NaN);
+ * // => true
+ */
+function eq(value, other) {
+  return value === other || (value !== value && other !== other);
+}
+
+module.exports = eq;
+
+
+/***/ }),
+
+/***/ 7799:
+/***/ ((module, __unused_webpack_exports, __nccwpck_require__) => {
+
+var baseGetTag = __nccwpck_require__(7497),
+    isObject = __nccwpck_require__(3334);
+
+/** `Object#toString` result references. */
+var asyncTag = '[object AsyncFunction]',
+    funcTag = '[object Function]',
+    genTag = '[object GeneratorFunction]',
+    proxyTag = '[object Proxy]';
+
+/**
+ * Checks if `value` is classified as a `Function` object.
+ *
+ * @static
+ * @memberOf _
+ * @since 0.1.0
+ * @category Lang
+ * @param {*} value The value to check.
+ * @returns {boolean} Returns `true` if `value` is a function, else `false`.
+ * @example
+ *
+ * _.isFunction(_);
+ * // => true
+ *
+ * _.isFunction(/abc/);
+ * // => false
+ */
+function isFunction(value) {
+  if (!isObject(value)) {
+    return false;
+  }
+  // The use of `Object#toString` avoids issues with the `typeof` operator
+  // in Safari 9 which returns 'object' for typed arrays and other constructors.
+  var tag = baseGetTag(value);
+  return tag == funcTag || tag == genTag || tag == asyncTag || tag == proxyTag;
+}
+
+module.exports = isFunction;
+
+
+/***/ }),
+
+/***/ 3334:
+/***/ ((module) => {
+
+/**
+ * Checks if `value` is the
+ * [language type](http://www.ecma-international.org/ecma-262/7.0/#sec-ecmascript-language-types)
+ * of `Object`. (e.g. arrays, functions, objects, regexes, `new Number(0)`, and `new String('')`)
+ *
+ * @static
+ * @memberOf _
+ * @since 0.1.0
+ * @category Lang
+ * @param {*} value The value to check.
+ * @returns {boolean} Returns `true` if `value` is an object, else `false`.
+ * @example
+ *
+ * _.isObject({});
+ * // => true
+ *
+ * _.isObject([1, 2, 3]);
+ * // => true
+ *
+ * _.isObject(_.noop);
+ * // => true
+ *
+ * _.isObject(null);
+ * // => false
+ */
+function isObject(value) {
+  var type = typeof value;
+  return value != null && (type == 'object' || type == 'function');
+}
+
+module.exports = isObject;
+
+
+/***/ }),
+
+/***/ 9885:
+/***/ ((module, __unused_webpack_exports, __nccwpck_require__) => {
+
+var MapCache = __nccwpck_require__(938);
+
+/** Error message constants. */
+var FUNC_ERROR_TEXT = 'Expected a function';
+
+/**
+ * Creates a function that memoizes the result of `func`. If `resolver` is
+ * provided, it determines the cache key for storing the result based on the
+ * arguments provided to the memoized function. By default, the first argument
+ * provided to the memoized function is used as the map cache key. The `func`
+ * is invoked with the `this` binding of the memoized function.
+ *
+ * **Note:** The cache is exposed as the `cache` property on the memoized
+ * function. Its creation may be customized by replacing the `_.memoize.Cache`
+ * constructor with one whose instances implement the
+ * [`Map`](http://ecma-international.org/ecma-262/7.0/#sec-properties-of-the-map-prototype-object)
+ * method interface of `clear`, `delete`, `get`, `has`, and `set`.
+ *
+ * @static
+ * @memberOf _
+ * @since 0.1.0
+ * @category Function
+ * @param {Function} func The function to have its output memoized.
+ * @param {Function} [resolver] The function to resolve the cache key.
+ * @returns {Function} Returns the new memoized function.
+ * @example
+ *
+ * var object = { 'a': 1, 'b': 2 };
+ * var other = { 'c': 3, 'd': 4 };
+ *
+ * var values = _.memoize(_.values);
+ * values(object);
+ * // => [1, 2]
+ *
+ * values(other);
+ * // => [3, 4]
+ *
+ * object.a = 2;
+ * values(object);
+ * // => [1, 2]
+ *
+ * // Modify the result cache.
+ * values.cache.set(object, ['a', 'b']);
+ * values(object);
+ * // => ['a', 'b']
+ *
+ * // Replace `_.memoize.Cache`.
+ * _.memoize.Cache = WeakMap;
+ */
+function memoize(func, resolver) {
+  if (typeof func != 'function' || (resolver != null && typeof resolver != 'function')) {
+    throw new TypeError(FUNC_ERROR_TEXT);
+  }
+  var memoized = function() {
+    var args = arguments,
+        key = resolver ? resolver.apply(this, args) : args[0],
+        cache = memoized.cache;
+
+    if (cache.has(key)) {
+      return cache.get(key);
+    }
+    var result = func.apply(this, args);
+    memoized.cache = cache.set(key, result) || cache;
+    return result;
+  };
+  memoized.cache = new (memoize.Cache || MapCache);
+  return memoized;
+}
+
+// Expose `MapCache`.
+memoize.Cache = MapCache;
+
+module.exports = memoize;
+
+
 /***/ }),
 
 /***/ 467:
@@ -6723,7 +7891,7 @@ FetchError.prototype.name = 'FetchError';
 
 let convert;
 try {
-	convert = (__nccwpck_require__(2877).convert);
+	convert = (__nccwpck_require__(3975).convert);
 } catch (e) {}
 
 const INTERNALS = Symbol('Body internals');
@@ -11500,6 +12668,7 @@ Object.defineProperty(exports, "__esModule", ({ value: true }));
 /* eslint-disable @typescript-eslint/naming-convention, import/no-import-module-exports */
 const core = __importStar(__nccwpck_require__(2186));
 const github_1 = __nccwpck_require__(5438);
+const memoize_1 = __importDefault(__nccwpck_require__(9885));
 const ActionUtils = __importStar(__nccwpck_require__(6981));
 const CONST_1 = __importDefault(__nccwpck_require__(9873));
 const GithubUtils_1 = __importDefault(__nccwpck_require__(9296));
@@ -11535,6 +12704,7 @@ async function commentPR(PR, message) {
     }
 }
 const workflowURL = `${process.env.GITHUB_SERVER_URL}/${process.env.GITHUB_REPOSITORY}/actions/runs/${process.env.GITHUB_RUN_ID}`;
+const getCommit = (0, memoize_1.default)(GithubUtils_1.default.octokit.git.getCommit);
 async function run() {
     const prList = ActionUtils.getJSONInput('PR_LIST', { required: true }).map((num) => Number.parseInt(num, 10));
     const isProd = ActionUtils.getJSONInput('IS_PRODUCTION_DEPLOY', { required: true });
@@ -11573,40 +12743,57 @@ async function run() {
         }
         return;
     }
-    // First find out if this is a normal staging deploy or a CP by looking at the commit message on the tag
     const { data: recentTags } = await GithubUtils_1.default.octokit.repos.listTags({
         owner: CONST_1.default.GITHUB_OWNER,
         repo: CONST_1.default.APP_REPO,
         per_page: 100,
     });
-    const currentTag = recentTags.find((tag) => tag.name === version);
-    if (!currentTag) {
-        const err = `Could not find tag matching ${version}`;
-        console.error(err);
-        core.setFailed(err);
-        return;
-    }
-    const { data: commit } = await GithubUtils_1.default.octokit.git.getCommit({
-        owner: CONST_1.default.GITHUB_OWNER,
-        repo: CONST_1.default.APP_REPO,
-        commit_sha: currentTag.commit.sha,
-    });
-    const isCP = /[\S\s]*\(cherry picked from commit .*\)/.test(commit.message);
     for (const prNumber of prList) {
         /*
          * Determine who the deployer for the PR is. The "deployer" for staging deploys is:
          *   1. For regular staging deploys, the person who merged the PR.
          *   2. For CPs, the person who committed the cherry-picked commit (not necessarily the author of the commit).
          */
-        const { data: pr } = await GithubUtils_1.default.octokit.pulls.get({
-            owner: CONST_1.default.GITHUB_OWNER,
-            repo: CONST_1.default.APP_REPO,
-            pull_number: prNumber,
-        });
-        const deployer = isCP ? commit.committer.name : pr.merged_by?.login;
-        const title = pr.title;
-        const deployMessage = deployer ? getDeployMessage(deployer, isCP ? 'Cherry-picked' : 'Deployed', title) : '';
-        await commentPR(prNumber, deployMessage);
+        try {
+            const { data: pr } = await GithubUtils_1.default.octokit.pulls.get({
+                owner: CONST_1.default.GITHUB_OWNER,
+                repo: CONST_1.default.APP_REPO,
+                pull_number: prNumber,
+            });
+            // Check for the CP Staging label on the issue to see if it was cherry-picked
+            const isCP = pr.labels.some(({ name: labelName }) => labelName === CONST_1.default.LABELS.CP_STAGING);
+            // Determine the deployer. For most PRs it will be whoever merged the PR.
+            // For CPs it will be whoever created the tag for the PR (i.e: whoever triggered the CP)
+            let deployer = pr.merged_by?.login;
+            if (isCP) {
+                for (const tag of recentTags) {
+                    const { data: commit } = await getCommit({
+                        owner: CONST_1.default.GITHUB_OWNER,
+                        repo: CONST_1.default.APP_REPO,
+                        commit_sha: tag.commit.sha,
+                    });
+                    const prNumForCPMergeCommit = commit.message.match(/Merge pull request #(\d+)[\S\s]*\(cherry picked from commit .*\)/);
+                    if (prNumForCPMergeCommit?.at(1) === String(prNumber)) {
+                        const cpActor = commit.message.match(/.*\(CP triggered by (.*)\)/)?.at(1);
+                        if (cpActor) {
+                            deployer = cpActor;
+                        }
+                        break;
+                    }
+                }
+            }
+            const title = pr.title;
+            const deployMessage = deployer ? getDeployMessage(deployer, isCP ? 'Cherry-picked' : 'Deployed', title) : '';
+            await commentPR(prNumber, deployMessage);
+        }
+        catch (error) {
+            if (error.status === 404) {
+                console.log(`Unable to comment on PR #${prNumber}. GitHub responded with 404.`);
+            }
+            else {
+                throw error;
+            }
+        }
     }
 }
 if (require.main === require.cache[eval('__filename')]) {
@@ -11698,7 +12885,22 @@ const CONST = {
         STAGING_DEPLOY: 'StagingDeployCash',
         DEPLOY_BLOCKER: 'DeployBlockerCash',
         INTERNAL_QA: 'InternalQA',
+        HELP_WANTED: 'Help Wanted',
+        CP_STAGING: 'CP Staging',
+    },
+    ACTIONS: {
+        CREATED: 'created',
+        EDIT: 'edited',
+    },
+    EVENTS: {
+        ISSUE_COMMENT: 'issue_comment',
+    },
+    OPENAI_ROLES: {
+        USER: 'user',
+        ASSISTANT: 'assistant',
     },
+    PROPOSAL_KEYWORD: 'Proposal',
+    OPENAI_THREAD_COMPLETED: 'completed',
     DATE_FORMAT_STRING: 'yyyy-MM-dd',
     PULL_REQUEST_REGEX: new RegExp(`${GITHUB_BASE_URL_REGEX.source}/.*/.*/pull/([0-9]+).*`),
     ISSUE_REGEX: new RegExp(`${GITHUB_BASE_URL_REGEX.source}/.*/.*/issues/([0-9]+).*`),
@@ -11706,6 +12908,9 @@ const CONST = {
     POLL_RATE: 10000,
     APP_REPO_URL: `https://github.com/${GIT_CONST.GITHUB_OWNER}/${GIT_CONST.APP_REPO}`,
     APP_REPO_GIT_URL: `git@github.com:${GIT_CONST.GITHUB_OWNER}/${GIT_CONST.APP_REPO}.git`,
+    NO_ACTION: 'NO_ACTION',
+    OPENAI_POLL_RATE: 1500,
+    OPENAI_POLL_TIMEOUT: 90000,
 };
 exports["default"] = CONST;
 
@@ -11755,13 +12960,11 @@ const CONST_1 = __importDefault(__nccwpck_require__(9873));
 class GithubUtils {
     static internalOctokit;
     /**
-     * Initialize internal octokit
-     *
-     * @private
+     * Initialize internal octokit.
+     * NOTE: When using GithubUtils in CI, you don't need to call this manually.
      */
-    static initOctokit() {
+    static initOctokitWithToken(token) {
         const Octokit = utils_1.GitHub.plugin(plugin_throttling_1.throttling, plugin_paginate_rest_1.paginateRest);
-        const token = core.getInput('GITHUB_TOKEN', { required: true });
         // Save a copy of octokit used in this class
         this.internalOctokit = new Octokit((0, utils_1.getOctokitOptions)(token, {
             throttle: {
@@ -11781,6 +12984,15 @@ class GithubUtils {
             },
         }));
     }
+    /**
+     * Default initialize method assuming running in CI, getting the token from an input.
+     *
+     * @private
+     */
+    static initOctokit() {
+        const token = core.getInput('GITHUB_TOKEN', { required: true });
+        this.initOctokitWithToken(token);
+    }
     /**
      * Either give an existing instance of Octokit rest or create a new one
      *
@@ -12075,12 +13287,6 @@ class GithubUtils {
         })
             .then((response) => response.data.workflow_runs[0]?.id);
     }
-    /**
-     * Generate the well-formatted body of a production release.
-     */
-    static getReleaseBody(pullRequests) {
-        return pullRequests.map((number) => `- ${this.getPullRequestURLFromNumber(number)}`).join('\r\n');
-    }
     /**
      * Generate the URL of an New Expensify pull request given the PR number.
      */
@@ -12136,12 +13342,31 @@ class GithubUtils {
             .then((events) => events.filter((event) => event.event === 'closed'))
             .then((closedEvents) => closedEvents.at(-1)?.actor?.login ?? '');
     }
-    static getArtifactByName(artefactName) {
-        return this.paginate(this.octokit.actions.listArtifactsForRepo, {
+    /**
+     * Returns a single artifact by name. If none is found, it returns undefined.
+     */
+    static getArtifactByName(artifactName) {
+        return this.octokit.actions
+            .listArtifactsForRepo({
             owner: CONST_1.default.GITHUB_OWNER,
             repo: CONST_1.default.APP_REPO,
-            per_page: 100,
-        }).then((artifacts) => artifacts.find((artifact) => artifact.name === artefactName));
+            per_page: 1,
+            name: artifactName,
+        })
+            .then((response) => response.data.artifacts[0]);
+    }
+    /**
+     * Given an artifact ID, returns the download URL to a zip file containing the artifact.
+     */
+    static getArtifactDownloadURL(artifactId) {
+        return this.octokit.actions
+            .downloadArtifact({
+            owner: CONST_1.default.GITHUB_OWNER,
+            repo: CONST_1.default.APP_REPO,
+            artifact_id: artifactId,
+            archive_format: 'zip',
+        })
+            .then((response) => response.url);
     }
 }
 exports["default"] = GithubUtils;
@@ -12182,27 +13407,27 @@ exports["default"] = arrayDifference;
 
 /***/ }),
 
-/***/ 2877:
+/***/ 9491:
 /***/ ((module) => {
 
-module.exports = eval("require")("encoding");
-
+"use strict";
+module.exports = require("assert");
 
 /***/ }),
 
-/***/ 9491:
+/***/ 6113:
 /***/ ((module) => {
 
 "use strict";
-module.exports = require("assert");
+module.exports = require("crypto");
 
 /***/ }),
 
-/***/ 6113:
+/***/ 3975:
 /***/ ((module) => {
 
 "use strict";
-module.exports = require("crypto");
+module.exports = require("encoding");
 
 /***/ }),
 
diff --git a/.github/actions/javascript/markPullRequestsAsDeployed/markPullRequestsAsDeployed.ts b/.github/actions/javascript/markPullRequestsAsDeployed/markPullRequestsAsDeployed.ts
index a312bae7e7df..71a5c7d5c6ee 100644
--- a/.github/actions/javascript/markPullRequestsAsDeployed/markPullRequestsAsDeployed.ts
+++ b/.github/actions/javascript/markPullRequestsAsDeployed/markPullRequestsAsDeployed.ts
@@ -1,6 +1,8 @@
 /* eslint-disable @typescript-eslint/naming-convention, import/no-import-module-exports */
 import * as core from '@actions/core';
 import {context} from '@actions/github';
+import type {RequestError} from '@octokit/types';
+import memoize from 'lodash/memoize';
 import * as ActionUtils from '@github/libs/ActionUtils';
 import CONST from '@github/libs/CONST';
 import GithubUtils from '@github/libs/GithubUtils';
@@ -41,6 +43,8 @@ async function commentPR(PR: number, message: string) {
 
 const workflowURL = `${process.env.GITHUB_SERVER_URL}/${process.env.GITHUB_REPOSITORY}/actions/runs/${process.env.GITHUB_RUN_ID}`;
 
+const getCommit = memoize(GithubUtils.octokit.git.getCommit);
+
 async function run() {
     const prList = (ActionUtils.getJSONInput('PR_LIST', {required: true}) as string[]).map((num) => Number.parseInt(num, 10));
     const isProd = ActionUtils.getJSONInput('IS_PRODUCTION_DEPLOY', {required: true}) as boolean;
@@ -87,25 +91,11 @@ async function run() {
         return;
     }
 
-    // First find out if this is a normal staging deploy or a CP by looking at the commit message on the tag
     const {data: recentTags} = await GithubUtils.octokit.repos.listTags({
         owner: CONST.GITHUB_OWNER,
         repo: CONST.APP_REPO,
         per_page: 100,
     });
-    const currentTag = recentTags.find((tag) => tag.name === version);
-    if (!currentTag) {
-        const err = `Could not find tag matching ${version}`;
-        console.error(err);
-        core.setFailed(err);
-        return;
-    }
-    const {data: commit} = await GithubUtils.octokit.git.getCommit({
-        owner: CONST.GITHUB_OWNER,
-        repo: CONST.APP_REPO,
-        commit_sha: currentTag.commit.sha,
-    });
-    const isCP = /[\S\s]*\(cherry picked from commit .*\)/.test(commit.message);
 
     for (const prNumber of prList) {
         /*
@@ -113,16 +103,47 @@ async function run() {
          *   1. For regular staging deploys, the person who merged the PR.
          *   2. For CPs, the person who committed the cherry-picked commit (not necessarily the author of the commit).
          */
-        const {data: pr} = await GithubUtils.octokit.pulls.get({
-            owner: CONST.GITHUB_OWNER,
-            repo: CONST.APP_REPO,
-            pull_number: prNumber,
-        });
-        const deployer = isCP ? commit.committer.name : pr.merged_by?.login;
-
-        const title = pr.title;
-        const deployMessage = deployer ? getDeployMessage(deployer, isCP ? 'Cherry-picked' : 'Deployed', title) : '';
-        await commentPR(prNumber, deployMessage);
+        try {
+            const {data: pr} = await GithubUtils.octokit.pulls.get({
+                owner: CONST.GITHUB_OWNER,
+                repo: CONST.APP_REPO,
+                pull_number: prNumber,
+            });
+
+            // Check for the CP Staging label on the issue to see if it was cherry-picked
+            const isCP = pr.labels.some(({name: labelName}) => labelName === CONST.LABELS.CP_STAGING);
+
+            // Determine the deployer. For most PRs it will be whoever merged the PR.
+            // For CPs it will be whoever created the tag for the PR (i.e: whoever triggered the CP)
+            let deployer = pr.merged_by?.login;
+            if (isCP) {
+                for (const tag of recentTags) {
+                    const {data: commit} = await getCommit({
+                        owner: CONST.GITHUB_OWNER,
+                        repo: CONST.APP_REPO,
+                        commit_sha: tag.commit.sha,
+                    });
+                    const prNumForCPMergeCommit = commit.message.match(/Merge pull request #(\d+)[\S\s]*\(cherry picked from commit .*\)/);
+                    if (prNumForCPMergeCommit?.at(1) === String(prNumber)) {
+                        const cpActor = commit.message.match(/.*\(CP triggered by (.*)\)/)?.at(1);
+                        if (cpActor) {
+                            deployer = cpActor;
+                        }
+                        break;
+                    }
+                }
+            }
+
+            const title = pr.title;
+            const deployMessage = deployer ? getDeployMessage(deployer, isCP ? 'Cherry-picked' : 'Deployed', title) : '';
+            await commentPR(prNumber, deployMessage);
+        } catch (error) {
+            if ((error as RequestError).status === 404) {
+                console.log(`Unable to comment on PR #${prNumber}. GitHub responded with 404.`);
+            } else {
+                throw error;
+            }
+        }
     }
 }
 
diff --git a/.github/actions/javascript/postTestBuildComment/index.js b/.github/actions/javascript/postTestBuildComment/index.js
index 0b8eb29f1750..4f62879a4419 100644
--- a/.github/actions/javascript/postTestBuildComment/index.js
+++ b/.github/actions/javascript/postTestBuildComment/index.js
@@ -6723,7 +6723,7 @@ FetchError.prototype.name = 'FetchError';
 
 let convert;
 try {
-	convert = (__nccwpck_require__(2877).convert);
+	convert = (__nccwpck_require__(3975).convert);
 } catch (e) {}
 
 const INTERNALS = Symbol('Body internals');
@@ -11600,7 +11600,22 @@ const CONST = {
         STAGING_DEPLOY: 'StagingDeployCash',
         DEPLOY_BLOCKER: 'DeployBlockerCash',
         INTERNAL_QA: 'InternalQA',
+        HELP_WANTED: 'Help Wanted',
+        CP_STAGING: 'CP Staging',
     },
+    ACTIONS: {
+        CREATED: 'created',
+        EDIT: 'edited',
+    },
+    EVENTS: {
+        ISSUE_COMMENT: 'issue_comment',
+    },
+    OPENAI_ROLES: {
+        USER: 'user',
+        ASSISTANT: 'assistant',
+    },
+    PROPOSAL_KEYWORD: 'Proposal',
+    OPENAI_THREAD_COMPLETED: 'completed',
     DATE_FORMAT_STRING: 'yyyy-MM-dd',
     PULL_REQUEST_REGEX: new RegExp(`${GITHUB_BASE_URL_REGEX.source}/.*/.*/pull/([0-9]+).*`),
     ISSUE_REGEX: new RegExp(`${GITHUB_BASE_URL_REGEX.source}/.*/.*/issues/([0-9]+).*`),
@@ -11608,6 +11623,9 @@ const CONST = {
     POLL_RATE: 10000,
     APP_REPO_URL: `https://github.com/${GIT_CONST.GITHUB_OWNER}/${GIT_CONST.APP_REPO}`,
     APP_REPO_GIT_URL: `git@github.com:${GIT_CONST.GITHUB_OWNER}/${GIT_CONST.APP_REPO}.git`,
+    NO_ACTION: 'NO_ACTION',
+    OPENAI_POLL_RATE: 1500,
+    OPENAI_POLL_TIMEOUT: 90000,
 };
 exports["default"] = CONST;
 
@@ -11657,13 +11675,11 @@ const CONST_1 = __importDefault(__nccwpck_require__(9873));
 class GithubUtils {
     static internalOctokit;
     /**
-     * Initialize internal octokit
-     *
-     * @private
+     * Initialize internal octokit.
+     * NOTE: When using GithubUtils in CI, you don't need to call this manually.
      */
-    static initOctokit() {
+    static initOctokitWithToken(token) {
         const Octokit = utils_1.GitHub.plugin(plugin_throttling_1.throttling, plugin_paginate_rest_1.paginateRest);
-        const token = core.getInput('GITHUB_TOKEN', { required: true });
         // Save a copy of octokit used in this class
         this.internalOctokit = new Octokit((0, utils_1.getOctokitOptions)(token, {
             throttle: {
@@ -11683,6 +11699,15 @@ class GithubUtils {
             },
         }));
     }
+    /**
+     * Default initialize method assuming running in CI, getting the token from an input.
+     *
+     * @private
+     */
+    static initOctokit() {
+        const token = core.getInput('GITHUB_TOKEN', { required: true });
+        this.initOctokitWithToken(token);
+    }
     /**
      * Either give an existing instance of Octokit rest or create a new one
      *
@@ -11977,12 +12002,6 @@ class GithubUtils {
         })
             .then((response) => response.data.workflow_runs[0]?.id);
     }
-    /**
-     * Generate the well-formatted body of a production release.
-     */
-    static getReleaseBody(pullRequests) {
-        return pullRequests.map((number) => `- ${this.getPullRequestURLFromNumber(number)}`).join('\r\n');
-    }
     /**
      * Generate the URL of an New Expensify pull request given the PR number.
      */
@@ -12038,12 +12057,31 @@ class GithubUtils {
             .then((events) => events.filter((event) => event.event === 'closed'))
             .then((closedEvents) => closedEvents.at(-1)?.actor?.login ?? '');
     }
-    static getArtifactByName(artefactName) {
-        return this.paginate(this.octokit.actions.listArtifactsForRepo, {
+    /**
+     * Returns a single artifact by name. If none is found, it returns undefined.
+     */
+    static getArtifactByName(artifactName) {
+        return this.octokit.actions
+            .listArtifactsForRepo({
             owner: CONST_1.default.GITHUB_OWNER,
             repo: CONST_1.default.APP_REPO,
-            per_page: 100,
-        }).then((artifacts) => artifacts.find((artifact) => artifact.name === artefactName));
+            per_page: 1,
+            name: artifactName,
+        })
+            .then((response) => response.data.artifacts[0]);
+    }
+    /**
+     * Given an artifact ID, returns the download URL to a zip file containing the artifact.
+     */
+    static getArtifactDownloadURL(artifactId) {
+        return this.octokit.actions
+            .downloadArtifact({
+            owner: CONST_1.default.GITHUB_OWNER,
+            repo: CONST_1.default.APP_REPO,
+            artifact_id: artifactId,
+            archive_format: 'zip',
+        })
+            .then((response) => response.url);
     }
 }
 exports["default"] = GithubUtils;
@@ -12084,27 +12122,27 @@ exports["default"] = arrayDifference;
 
 /***/ }),
 
-/***/ 2877:
+/***/ 9491:
 /***/ ((module) => {
 
-module.exports = eval("require")("encoding");
-
+"use strict";
+module.exports = require("assert");
 
 /***/ }),
 
-/***/ 9491:
+/***/ 6113:
 /***/ ((module) => {
 
 "use strict";
-module.exports = require("assert");
+module.exports = require("crypto");
 
 /***/ }),
 
-/***/ 6113:
+/***/ 3975:
 /***/ ((module) => {
 
 "use strict";
-module.exports = require("crypto");
+module.exports = require("encoding");
 
 /***/ }),
 
diff --git a/.github/actions/javascript/proposalPoliceComment/action.yml b/.github/actions/javascript/proposalPoliceComment/action.yml
new file mode 100644
index 000000000000..ab649f9bd44f
--- /dev/null
+++ b/.github/actions/javascript/proposalPoliceComment/action.yml
@@ -0,0 +1,15 @@
+name: 'ProposalPolice™ Comment Check Script'
+description: 'Verifies whether a proposal comment follows the template OR an updated proposal had substantial changes'
+inputs:
+  GITHUB_TOKEN:
+    description: 'Auth token for New Expensify Github'
+    required: true
+  PROPOSAL_POLICE_API_KEY:
+    description: 'OpenAI API key for accessing AI services'
+    required: true
+  PROPOSAL_POLICE_ASSISTANT_ID:
+    description: 'OpenAI Assistant ID for personalized AI assistant'
+    required: true
+runs:
+  using: 'node20'
+  main: './index.js'
diff --git a/.github/actions/javascript/proposalPoliceComment/index.js b/.github/actions/javascript/proposalPoliceComment/index.js
new file mode 100644
index 000000000000..9b5b56f11a11
--- /dev/null
+++ b/.github/actions/javascript/proposalPoliceComment/index.js
@@ -0,0 +1,25897 @@
+/**
+ * NOTE: This is a compiled file. DO NOT directly edit this file.
+ */
+/******/ (() => { // webpackBootstrap
+/******/ 	var __webpack_modules__ = ({
+
+/***/ 7351:
+/***/ (function(__unused_webpack_module, exports, __nccwpck_require__) {
+
+"use strict";
+
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
+Object.defineProperty(exports, "__esModule", ({ value: true }));
+exports.issue = exports.issueCommand = void 0;
+const os = __importStar(__nccwpck_require__(2037));
+const utils_1 = __nccwpck_require__(5278);
+/**
+ * Commands
+ *
+ * Command Format:
+ *   ::name key=value,key=value::message
+ *
+ * Examples:
+ *   ::warning::This is the message
+ *   ::set-env name=MY_VAR::some value
+ */
+function issueCommand(command, properties, message) {
+    const cmd = new Command(command, properties, message);
+    process.stdout.write(cmd.toString() + os.EOL);
+}
+exports.issueCommand = issueCommand;
+function issue(name, message = '') {
+    issueCommand(name, {}, message);
+}
+exports.issue = issue;
+const CMD_STRING = '::';
+class Command {
+    constructor(command, properties, message) {
+        if (!command) {
+            command = 'missing.command';
+        }
+        this.command = command;
+        this.properties = properties;
+        this.message = message;
+    }
+    toString() {
+        let cmdStr = CMD_STRING + this.command;
+        if (this.properties && Object.keys(this.properties).length > 0) {
+            cmdStr += ' ';
+            let first = true;
+            for (const key in this.properties) {
+                if (this.properties.hasOwnProperty(key)) {
+                    const val = this.properties[key];
+                    if (val) {
+                        if (first) {
+                            first = false;
+                        }
+                        else {
+                            cmdStr += ',';
+                        }
+                        cmdStr += `${key}=${escapeProperty(val)}`;
+                    }
+                }
+            }
+        }
+        cmdStr += `${CMD_STRING}${escapeData(this.message)}`;
+        return cmdStr;
+    }
+}
+function escapeData(s) {
+    return utils_1.toCommandValue(s)
+        .replace(/%/g, '%25')
+        .replace(/\r/g, '%0D')
+        .replace(/\n/g, '%0A');
+}
+function escapeProperty(s) {
+    return utils_1.toCommandValue(s)
+        .replace(/%/g, '%25')
+        .replace(/\r/g, '%0D')
+        .replace(/\n/g, '%0A')
+        .replace(/:/g, '%3A')
+        .replace(/,/g, '%2C');
+}
+//# sourceMappingURL=command.js.map
+
+/***/ }),
+
+/***/ 2186:
+/***/ (function(__unused_webpack_module, exports, __nccwpck_require__) {
+
+"use strict";
+
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+Object.defineProperty(exports, "__esModule", ({ value: true }));
+exports.getIDToken = exports.getState = exports.saveState = exports.group = exports.endGroup = exports.startGroup = exports.info = exports.notice = exports.warning = exports.error = exports.debug = exports.isDebug = exports.setFailed = exports.setCommandEcho = exports.setOutput = exports.getBooleanInput = exports.getMultilineInput = exports.getInput = exports.addPath = exports.setSecret = exports.exportVariable = exports.ExitCode = void 0;
+const command_1 = __nccwpck_require__(7351);
+const file_command_1 = __nccwpck_require__(717);
+const utils_1 = __nccwpck_require__(5278);
+const os = __importStar(__nccwpck_require__(2037));
+const path = __importStar(__nccwpck_require__(1017));
+const oidc_utils_1 = __nccwpck_require__(8041);
+/**
+ * The code to exit an action
+ */
+var ExitCode;
+(function (ExitCode) {
+    /**
+     * A code indicating that the action was successful
+     */
+    ExitCode[ExitCode["Success"] = 0] = "Success";
+    /**
+     * A code indicating that the action was a failure
+     */
+    ExitCode[ExitCode["Failure"] = 1] = "Failure";
+})(ExitCode = exports.ExitCode || (exports.ExitCode = {}));
+//-----------------------------------------------------------------------
+// Variables
+//-----------------------------------------------------------------------
+/**
+ * Sets env variable for this action and future actions in the job
+ * @param name the name of the variable to set
+ * @param val the value of the variable. Non-string values will be converted to a string via JSON.stringify
+ */
+// eslint-disable-next-line @typescript-eslint/no-explicit-any
+function exportVariable(name, val) {
+    const convertedVal = utils_1.toCommandValue(val);
+    process.env[name] = convertedVal;
+    const filePath = process.env['GITHUB_ENV'] || '';
+    if (filePath) {
+        return file_command_1.issueFileCommand('ENV', file_command_1.prepareKeyValueMessage(name, val));
+    }
+    command_1.issueCommand('set-env', { name }, convertedVal);
+}
+exports.exportVariable = exportVariable;
+/**
+ * Registers a secret which will get masked from logs
+ * @param secret value of the secret
+ */
+function setSecret(secret) {
+    command_1.issueCommand('add-mask', {}, secret);
+}
+exports.setSecret = setSecret;
+/**
+ * Prepends inputPath to the PATH (for this action and future actions)
+ * @param inputPath
+ */
+function addPath(inputPath) {
+    const filePath = process.env['GITHUB_PATH'] || '';
+    if (filePath) {
+        file_command_1.issueFileCommand('PATH', inputPath);
+    }
+    else {
+        command_1.issueCommand('add-path', {}, inputPath);
+    }
+    process.env['PATH'] = `${inputPath}${path.delimiter}${process.env['PATH']}`;
+}
+exports.addPath = addPath;
+/**
+ * Gets the value of an input.
+ * Unless trimWhitespace is set to false in InputOptions, the value is also trimmed.
+ * Returns an empty string if the value is not defined.
+ *
+ * @param     name     name of the input to get
+ * @param     options  optional. See InputOptions.
+ * @returns   string
+ */
+function getInput(name, options) {
+    const val = process.env[`INPUT_${name.replace(/ /g, '_').toUpperCase()}`] || '';
+    if (options && options.required && !val) {
+        throw new Error(`Input required and not supplied: ${name}`);
+    }
+    if (options && options.trimWhitespace === false) {
+        return val;
+    }
+    return val.trim();
+}
+exports.getInput = getInput;
+/**
+ * Gets the values of an multiline input.  Each value is also trimmed.
+ *
+ * @param     name     name of the input to get
+ * @param     options  optional. See InputOptions.
+ * @returns   string[]
+ *
+ */
+function getMultilineInput(name, options) {
+    const inputs = getInput(name, options)
+        .split('\n')
+        .filter(x => x !== '');
+    if (options && options.trimWhitespace === false) {
+        return inputs;
+    }
+    return inputs.map(input => input.trim());
+}
+exports.getMultilineInput = getMultilineInput;
+/**
+ * Gets the input value of the boolean type in the YAML 1.2 "core schema" specification.
+ * Support boolean input list: `true | True | TRUE | false | False | FALSE` .
+ * The return value is also in boolean type.
+ * ref: https://yaml.org/spec/1.2/spec.html#id2804923
+ *
+ * @param     name     name of the input to get
+ * @param     options  optional. See InputOptions.
+ * @returns   boolean
+ */
+function getBooleanInput(name, options) {
+    const trueValue = ['true', 'True', 'TRUE'];
+    const falseValue = ['false', 'False', 'FALSE'];
+    const val = getInput(name, options);
+    if (trueValue.includes(val))
+        return true;
+    if (falseValue.includes(val))
+        return false;
+    throw new TypeError(`Input does not meet YAML 1.2 "Core Schema" specification: ${name}\n` +
+        `Support boolean input list: \`true | True | TRUE | false | False | FALSE\``);
+}
+exports.getBooleanInput = getBooleanInput;
+/**
+ * Sets the value of an output.
+ *
+ * @param     name     name of the output to set
+ * @param     value    value to store. Non-string values will be converted to a string via JSON.stringify
+ */
+// eslint-disable-next-line @typescript-eslint/no-explicit-any
+function setOutput(name, value) {
+    const filePath = process.env['GITHUB_OUTPUT'] || '';
+    if (filePath) {
+        return file_command_1.issueFileCommand('OUTPUT', file_command_1.prepareKeyValueMessage(name, value));
+    }
+    process.stdout.write(os.EOL);
+    command_1.issueCommand('set-output', { name }, utils_1.toCommandValue(value));
+}
+exports.setOutput = setOutput;
+/**
+ * Enables or disables the echoing of commands into stdout for the rest of the step.
+ * Echoing is disabled by default if ACTIONS_STEP_DEBUG is not set.
+ *
+ */
+function setCommandEcho(enabled) {
+    command_1.issue('echo', enabled ? 'on' : 'off');
+}
+exports.setCommandEcho = setCommandEcho;
+//-----------------------------------------------------------------------
+// Results
+//-----------------------------------------------------------------------
+/**
+ * Sets the action status to failed.
+ * When the action exits it will be with an exit code of 1
+ * @param message add error issue message
+ */
+function setFailed(message) {
+    process.exitCode = ExitCode.Failure;
+    error(message);
+}
+exports.setFailed = setFailed;
+//-----------------------------------------------------------------------
+// Logging Commands
+//-----------------------------------------------------------------------
+/**
+ * Gets whether Actions Step Debug is on or not
+ */
+function isDebug() {
+    return process.env['RUNNER_DEBUG'] === '1';
+}
+exports.isDebug = isDebug;
+/**
+ * Writes debug message to user log
+ * @param message debug message
+ */
+function debug(message) {
+    command_1.issueCommand('debug', {}, message);
+}
+exports.debug = debug;
+/**
+ * Adds an error issue
+ * @param message error issue message. Errors will be converted to string via toString()
+ * @param properties optional properties to add to the annotation.
+ */
+function error(message, properties = {}) {
+    command_1.issueCommand('error', utils_1.toCommandProperties(properties), message instanceof Error ? message.toString() : message);
+}
+exports.error = error;
+/**
+ * Adds a warning issue
+ * @param message warning issue message. Errors will be converted to string via toString()
+ * @param properties optional properties to add to the annotation.
+ */
+function warning(message, properties = {}) {
+    command_1.issueCommand('warning', utils_1.toCommandProperties(properties), message instanceof Error ? message.toString() : message);
+}
+exports.warning = warning;
+/**
+ * Adds a notice issue
+ * @param message notice issue message. Errors will be converted to string via toString()
+ * @param properties optional properties to add to the annotation.
+ */
+function notice(message, properties = {}) {
+    command_1.issueCommand('notice', utils_1.toCommandProperties(properties), message instanceof Error ? message.toString() : message);
+}
+exports.notice = notice;
+/**
+ * Writes info to log with console.log.
+ * @param message info message
+ */
+function info(message) {
+    process.stdout.write(message + os.EOL);
+}
+exports.info = info;
+/**
+ * Begin an output group.
+ *
+ * Output until the next `groupEnd` will be foldable in this group
+ *
+ * @param name The name of the output group
+ */
+function startGroup(name) {
+    command_1.issue('group', name);
+}
+exports.startGroup = startGroup;
+/**
+ * End an output group.
+ */
+function endGroup() {
+    command_1.issue('endgroup');
+}
+exports.endGroup = endGroup;
+/**
+ * Wrap an asynchronous function call in a group.
+ *
+ * Returns the same type as the function itself.
+ *
+ * @param name The name of the group
+ * @param fn The function to wrap in the group
+ */
+function group(name, fn) {
+    return __awaiter(this, void 0, void 0, function* () {
+        startGroup(name);
+        let result;
+        try {
+            result = yield fn();
+        }
+        finally {
+            endGroup();
+        }
+        return result;
+    });
+}
+exports.group = group;
+//-----------------------------------------------------------------------
+// Wrapper action state
+//-----------------------------------------------------------------------
+/**
+ * Saves state for current action, the state can only be retrieved by this action's post job execution.
+ *
+ * @param     name     name of the state to store
+ * @param     value    value to store. Non-string values will be converted to a string via JSON.stringify
+ */
+// eslint-disable-next-line @typescript-eslint/no-explicit-any
+function saveState(name, value) {
+    const filePath = process.env['GITHUB_STATE'] || '';
+    if (filePath) {
+        return file_command_1.issueFileCommand('STATE', file_command_1.prepareKeyValueMessage(name, value));
+    }
+    command_1.issueCommand('save-state', { name }, utils_1.toCommandValue(value));
+}
+exports.saveState = saveState;
+/**
+ * Gets the value of an state set by this action's main execution.
+ *
+ * @param     name     name of the state to get
+ * @returns   string
+ */
+function getState(name) {
+    return process.env[`STATE_${name}`] || '';
+}
+exports.getState = getState;
+function getIDToken(aud) {
+    return __awaiter(this, void 0, void 0, function* () {
+        return yield oidc_utils_1.OidcClient.getIDToken(aud);
+    });
+}
+exports.getIDToken = getIDToken;
+/**
+ * Summary exports
+ */
+var summary_1 = __nccwpck_require__(1327);
+Object.defineProperty(exports, "summary", ({ enumerable: true, get: function () { return summary_1.summary; } }));
+/**
+ * @deprecated use core.summary
+ */
+var summary_2 = __nccwpck_require__(1327);
+Object.defineProperty(exports, "markdownSummary", ({ enumerable: true, get: function () { return summary_2.markdownSummary; } }));
+/**
+ * Path exports
+ */
+var path_utils_1 = __nccwpck_require__(2981);
+Object.defineProperty(exports, "toPosixPath", ({ enumerable: true, get: function () { return path_utils_1.toPosixPath; } }));
+Object.defineProperty(exports, "toWin32Path", ({ enumerable: true, get: function () { return path_utils_1.toWin32Path; } }));
+Object.defineProperty(exports, "toPlatformPath", ({ enumerable: true, get: function () { return path_utils_1.toPlatformPath; } }));
+//# sourceMappingURL=core.js.map
+
+/***/ }),
+
+/***/ 717:
+/***/ (function(__unused_webpack_module, exports, __nccwpck_require__) {
+
+"use strict";
+
+// For internal use, subject to change.
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
+Object.defineProperty(exports, "__esModule", ({ value: true }));
+exports.prepareKeyValueMessage = exports.issueFileCommand = void 0;
+// We use any as a valid input type
+/* eslint-disable @typescript-eslint/no-explicit-any */
+const fs = __importStar(__nccwpck_require__(7147));
+const os = __importStar(__nccwpck_require__(2037));
+const uuid_1 = __nccwpck_require__(5840);
+const utils_1 = __nccwpck_require__(5278);
+function issueFileCommand(command, message) {
+    const filePath = process.env[`GITHUB_${command}`];
+    if (!filePath) {
+        throw new Error(`Unable to find environment variable for file command ${command}`);
+    }
+    if (!fs.existsSync(filePath)) {
+        throw new Error(`Missing file at path: ${filePath}`);
+    }
+    fs.appendFileSync(filePath, `${utils_1.toCommandValue(message)}${os.EOL}`, {
+        encoding: 'utf8'
+    });
+}
+exports.issueFileCommand = issueFileCommand;
+function prepareKeyValueMessage(key, value) {
+    const delimiter = `ghadelimiter_${uuid_1.v4()}`;
+    const convertedValue = utils_1.toCommandValue(value);
+    // These should realistically never happen, but just in case someone finds a
+    // way to exploit uuid generation let's not allow keys or values that contain
+    // the delimiter.
+    if (key.includes(delimiter)) {
+        throw new Error(`Unexpected input: name should not contain the delimiter "${delimiter}"`);
+    }
+    if (convertedValue.includes(delimiter)) {
+        throw new Error(`Unexpected input: value should not contain the delimiter "${delimiter}"`);
+    }
+    return `${key}<<${delimiter}${os.EOL}${convertedValue}${os.EOL}${delimiter}`;
+}
+exports.prepareKeyValueMessage = prepareKeyValueMessage;
+//# sourceMappingURL=file-command.js.map
+
+/***/ }),
+
+/***/ 8041:
+/***/ (function(__unused_webpack_module, exports, __nccwpck_require__) {
+
+"use strict";
+
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+Object.defineProperty(exports, "__esModule", ({ value: true }));
+exports.OidcClient = void 0;
+const http_client_1 = __nccwpck_require__(6255);
+const auth_1 = __nccwpck_require__(5526);
+const core_1 = __nccwpck_require__(2186);
+class OidcClient {
+    static createHttpClient(allowRetry = true, maxRetry = 10) {
+        const requestOptions = {
+            allowRetries: allowRetry,
+            maxRetries: maxRetry
+        };
+        return new http_client_1.HttpClient('actions/oidc-client', [new auth_1.BearerCredentialHandler(OidcClient.getRequestToken())], requestOptions);
+    }
+    static getRequestToken() {
+        const token = process.env['ACTIONS_ID_TOKEN_REQUEST_TOKEN'];
+        if (!token) {
+            throw new Error('Unable to get ACTIONS_ID_TOKEN_REQUEST_TOKEN env variable');
+        }
+        return token;
+    }
+    static getIDTokenUrl() {
+        const runtimeUrl = process.env['ACTIONS_ID_TOKEN_REQUEST_URL'];
+        if (!runtimeUrl) {
+            throw new Error('Unable to get ACTIONS_ID_TOKEN_REQUEST_URL env variable');
+        }
+        return runtimeUrl;
+    }
+    static getCall(id_token_url) {
+        var _a;
+        return __awaiter(this, void 0, void 0, function* () {
+            const httpclient = OidcClient.createHttpClient();
+            const res = yield httpclient
+                .getJson(id_token_url)
+                .catch(error => {
+                throw new Error(`Failed to get ID Token. \n 
+        Error Code : ${error.statusCode}\n 
+        Error Message: ${error.result.message}`);
+            });
+            const id_token = (_a = res.result) === null || _a === void 0 ? void 0 : _a.value;
+            if (!id_token) {
+                throw new Error('Response json body do not have ID Token field');
+            }
+            return id_token;
+        });
+    }
+    static getIDToken(audience) {
+        return __awaiter(this, void 0, void 0, function* () {
+            try {
+                // New ID Token is requested from action service
+                let id_token_url = OidcClient.getIDTokenUrl();
+                if (audience) {
+                    const encodedAudience = encodeURIComponent(audience);
+                    id_token_url = `${id_token_url}&audience=${encodedAudience}`;
+                }
+                core_1.debug(`ID token url is ${id_token_url}`);
+                const id_token = yield OidcClient.getCall(id_token_url);
+                core_1.setSecret(id_token);
+                return id_token;
+            }
+            catch (error) {
+                throw new Error(`Error message: ${error.message}`);
+            }
+        });
+    }
+}
+exports.OidcClient = OidcClient;
+//# sourceMappingURL=oidc-utils.js.map
+
+/***/ }),
+
+/***/ 2981:
+/***/ (function(__unused_webpack_module, exports, __nccwpck_require__) {
+
+"use strict";
+
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
+Object.defineProperty(exports, "__esModule", ({ value: true }));
+exports.toPlatformPath = exports.toWin32Path = exports.toPosixPath = void 0;
+const path = __importStar(__nccwpck_require__(1017));
+/**
+ * toPosixPath converts the given path to the posix form. On Windows, \\ will be
+ * replaced with /.
+ *
+ * @param pth. Path to transform.
+ * @return string Posix path.
+ */
+function toPosixPath(pth) {
+    return pth.replace(/[\\]/g, '/');
+}
+exports.toPosixPath = toPosixPath;
+/**
+ * toWin32Path converts the given path to the win32 form. On Linux, / will be
+ * replaced with \\.
+ *
+ * @param pth. Path to transform.
+ * @return string Win32 path.
+ */
+function toWin32Path(pth) {
+    return pth.replace(/[/]/g, '\\');
+}
+exports.toWin32Path = toWin32Path;
+/**
+ * toPlatformPath converts the given path to a platform-specific path. It does
+ * this by replacing instances of / and \ with the platform-specific path
+ * separator.
+ *
+ * @param pth The path to platformize.
+ * @return string The platform-specific path.
+ */
+function toPlatformPath(pth) {
+    return pth.replace(/[/\\]/g, path.sep);
+}
+exports.toPlatformPath = toPlatformPath;
+//# sourceMappingURL=path-utils.js.map
+
+/***/ }),
+
+/***/ 1327:
+/***/ (function(__unused_webpack_module, exports, __nccwpck_require__) {
+
+"use strict";
+
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+Object.defineProperty(exports, "__esModule", ({ value: true }));
+exports.summary = exports.markdownSummary = exports.SUMMARY_DOCS_URL = exports.SUMMARY_ENV_VAR = void 0;
+const os_1 = __nccwpck_require__(2037);
+const fs_1 = __nccwpck_require__(7147);
+const { access, appendFile, writeFile } = fs_1.promises;
+exports.SUMMARY_ENV_VAR = 'GITHUB_STEP_SUMMARY';
+exports.SUMMARY_DOCS_URL = 'https://docs.github.com/actions/using-workflows/workflow-commands-for-github-actions#adding-a-job-summary';
+class Summary {
+    constructor() {
+        this._buffer = '';
+    }
+    /**
+     * Finds the summary file path from the environment, rejects if env var is not found or file does not exist
+     * Also checks r/w permissions.
+     *
+     * @returns step summary file path
+     */
+    filePath() {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (this._filePath) {
+                return this._filePath;
+            }
+            const pathFromEnv = process.env[exports.SUMMARY_ENV_VAR];
+            if (!pathFromEnv) {
+                throw new Error(`Unable to find environment variable for $${exports.SUMMARY_ENV_VAR}. Check if your runtime environment supports job summaries.`);
+            }
+            try {
+                yield access(pathFromEnv, fs_1.constants.R_OK | fs_1.constants.W_OK);
+            }
+            catch (_a) {
+                throw new Error(`Unable to access summary file: '${pathFromEnv}'. Check if the file has correct read/write permissions.`);
+            }
+            this._filePath = pathFromEnv;
+            return this._filePath;
+        });
+    }
+    /**
+     * Wraps content in an HTML tag, adding any HTML attributes
+     *
+     * @param {string} tag HTML tag to wrap
+     * @param {string | null} content content within the tag
+     * @param {[attribute: string]: string} attrs key-value list of HTML attributes to add
+     *
+     * @returns {string} content wrapped in HTML element
+     */
+    wrap(tag, content, attrs = {}) {
+        const htmlAttrs = Object.entries(attrs)
+            .map(([key, value]) => ` ${key}="${value}"`)
+            .join('');
+        if (!content) {
+            return `<${tag}${htmlAttrs}>`;
+        }
+        return `<${tag}${htmlAttrs}>${content}</${tag}>`;
+    }
+    /**
+     * Writes text in the buffer to the summary buffer file and empties buffer. Will append by default.
+     *
+     * @param {SummaryWriteOptions} [options] (optional) options for write operation
+     *
+     * @returns {Promise<Summary>} summary instance
+     */
+    write(options) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const overwrite = !!(options === null || options === void 0 ? void 0 : options.overwrite);
+            const filePath = yield this.filePath();
+            const writeFunc = overwrite ? writeFile : appendFile;
+            yield writeFunc(filePath, this._buffer, { encoding: 'utf8' });
+            return this.emptyBuffer();
+        });
+    }
+    /**
+     * Clears the summary buffer and wipes the summary file
+     *
+     * @returns {Summary} summary instance
+     */
+    clear() {
+        return __awaiter(this, void 0, void 0, function* () {
+            return this.emptyBuffer().write({ overwrite: true });
+        });
+    }
+    /**
+     * Returns the current summary buffer as a string
+     *
+     * @returns {string} string of summary buffer
+     */
+    stringify() {
+        return this._buffer;
+    }
+    /**
+     * If the summary buffer is empty
+     *
+     * @returns {boolen} true if the buffer is empty
+     */
+    isEmptyBuffer() {
+        return this._buffer.length === 0;
+    }
+    /**
+     * Resets the summary buffer without writing to summary file
+     *
+     * @returns {Summary} summary instance
+     */
+    emptyBuffer() {
+        this._buffer = '';
+        return this;
+    }
+    /**
+     * Adds raw text to the summary buffer
+     *
+     * @param {string} text content to add
+     * @param {boolean} [addEOL=false] (optional) append an EOL to the raw text (default: false)
+     *
+     * @returns {Summary} summary instance
+     */
+    addRaw(text, addEOL = false) {
+        this._buffer += text;
+        return addEOL ? this.addEOL() : this;
+    }
+    /**
+     * Adds the operating system-specific end-of-line marker to the buffer
+     *
+     * @returns {Summary} summary instance
+     */
+    addEOL() {
+        return this.addRaw(os_1.EOL);
+    }
+    /**
+     * Adds an HTML codeblock to the summary buffer
+     *
+     * @param {string} code content to render within fenced code block
+     * @param {string} lang (optional) language to syntax highlight code
+     *
+     * @returns {Summary} summary instance
+     */
+    addCodeBlock(code, lang) {
+        const attrs = Object.assign({}, (lang && { lang }));
+        const element = this.wrap('pre', this.wrap('code', code), attrs);
+        return this.addRaw(element).addEOL();
+    }
+    /**
+     * Adds an HTML list to the summary buffer
+     *
+     * @param {string[]} items list of items to render
+     * @param {boolean} [ordered=false] (optional) if the rendered list should be ordered or not (default: false)
+     *
+     * @returns {Summary} summary instance
+     */
+    addList(items, ordered = false) {
+        const tag = ordered ? 'ol' : 'ul';
+        const listItems = items.map(item => this.wrap('li', item)).join('');
+        const element = this.wrap(tag, listItems);
+        return this.addRaw(element).addEOL();
+    }
+    /**
+     * Adds an HTML table to the summary buffer
+     *
+     * @param {SummaryTableCell[]} rows table rows
+     *
+     * @returns {Summary} summary instance
+     */
+    addTable(rows) {
+        const tableBody = rows
+            .map(row => {
+            const cells = row
+                .map(cell => {
+                if (typeof cell === 'string') {
+                    return this.wrap('td', cell);
+                }
+                const { header, data, colspan, rowspan } = cell;
+                const tag = header ? 'th' : 'td';
+                const attrs = Object.assign(Object.assign({}, (colspan && { colspan })), (rowspan && { rowspan }));
+                return this.wrap(tag, data, attrs);
+            })
+                .join('');
+            return this.wrap('tr', cells);
+        })
+            .join('');
+        const element = this.wrap('table', tableBody);
+        return this.addRaw(element).addEOL();
+    }
+    /**
+     * Adds a collapsable HTML details element to the summary buffer
+     *
+     * @param {string} label text for the closed state
+     * @param {string} content collapsable content
+     *
+     * @returns {Summary} summary instance
+     */
+    addDetails(label, content) {
+        const element = this.wrap('details', this.wrap('summary', label) + content);
+        return this.addRaw(element).addEOL();
+    }
+    /**
+     * Adds an HTML image tag to the summary buffer
+     *
+     * @param {string} src path to the image you to embed
+     * @param {string} alt text description of the image
+     * @param {SummaryImageOptions} options (optional) addition image attributes
+     *
+     * @returns {Summary} summary instance
+     */
+    addImage(src, alt, options) {
+        const { width, height } = options || {};
+        const attrs = Object.assign(Object.assign({}, (width && { width })), (height && { height }));
+        const element = this.wrap('img', null, Object.assign({ src, alt }, attrs));
+        return this.addRaw(element).addEOL();
+    }
+    /**
+     * Adds an HTML section heading element
+     *
+     * @param {string} text heading text
+     * @param {number | string} [level=1] (optional) the heading level, default: 1
+     *
+     * @returns {Summary} summary instance
+     */
+    addHeading(text, level) {
+        const tag = `h${level}`;
+        const allowedTag = ['h1', 'h2', 'h3', 'h4', 'h5', 'h6'].includes(tag)
+            ? tag
+            : 'h1';
+        const element = this.wrap(allowedTag, text);
+        return this.addRaw(element).addEOL();
+    }
+    /**
+     * Adds an HTML thematic break (<hr>) to the summary buffer
+     *
+     * @returns {Summary} summary instance
+     */
+    addSeparator() {
+        const element = this.wrap('hr', null);
+        return this.addRaw(element).addEOL();
+    }
+    /**
+     * Adds an HTML line break (<br>) to the summary buffer
+     *
+     * @returns {Summary} summary instance
+     */
+    addBreak() {
+        const element = this.wrap('br', null);
+        return this.addRaw(element).addEOL();
+    }
+    /**
+     * Adds an HTML blockquote to the summary buffer
+     *
+     * @param {string} text quote text
+     * @param {string} cite (optional) citation url
+     *
+     * @returns {Summary} summary instance
+     */
+    addQuote(text, cite) {
+        const attrs = Object.assign({}, (cite && { cite }));
+        const element = this.wrap('blockquote', text, attrs);
+        return this.addRaw(element).addEOL();
+    }
+    /**
+     * Adds an HTML anchor tag to the summary buffer
+     *
+     * @param {string} text link text/content
+     * @param {string} href hyperlink
+     *
+     * @returns {Summary} summary instance
+     */
+    addLink(text, href) {
+        const element = this.wrap('a', text, { href });
+        return this.addRaw(element).addEOL();
+    }
+}
+const _summary = new Summary();
+/**
+ * @deprecated use `core.summary`
+ */
+exports.markdownSummary = _summary;
+exports.summary = _summary;
+//# sourceMappingURL=summary.js.map
+
+/***/ }),
+
+/***/ 5278:
+/***/ ((__unused_webpack_module, exports) => {
+
+"use strict";
+
+// We use any as a valid input type
+/* eslint-disable @typescript-eslint/no-explicit-any */
+Object.defineProperty(exports, "__esModule", ({ value: true }));
+exports.toCommandProperties = exports.toCommandValue = void 0;
+/**
+ * Sanitizes an input into a string so it can be passed into issueCommand safely
+ * @param input input to sanitize into a string
+ */
+function toCommandValue(input) {
+    if (input === null || input === undefined) {
+        return '';
+    }
+    else if (typeof input === 'string' || input instanceof String) {
+        return input;
+    }
+    return JSON.stringify(input);
+}
+exports.toCommandValue = toCommandValue;
+/**
+ *
+ * @param annotationProperties
+ * @returns The command properties to send with the actual annotation command
+ * See IssueCommandProperties: https://github.com/actions/runner/blob/main/src/Runner.Worker/ActionCommandManager.cs#L646
+ */
+function toCommandProperties(annotationProperties) {
+    if (!Object.keys(annotationProperties).length) {
+        return {};
+    }
+    return {
+        title: annotationProperties.title,
+        file: annotationProperties.file,
+        line: annotationProperties.startLine,
+        endLine: annotationProperties.endLine,
+        col: annotationProperties.startColumn,
+        endColumn: annotationProperties.endColumn
+    };
+}
+exports.toCommandProperties = toCommandProperties;
+//# sourceMappingURL=utils.js.map
+
+/***/ }),
+
+/***/ 4087:
+/***/ ((__unused_webpack_module, exports, __nccwpck_require__) => {
+
+"use strict";
+
+Object.defineProperty(exports, "__esModule", ({ value: true }));
+exports.Context = void 0;
+const fs_1 = __nccwpck_require__(7147);
+const os_1 = __nccwpck_require__(2037);
+class Context {
+    /**
+     * Hydrate the context from the environment
+     */
+    constructor() {
+        var _a, _b, _c;
+        this.payload = {};
+        if (process.env.GITHUB_EVENT_PATH) {
+            if (fs_1.existsSync(process.env.GITHUB_EVENT_PATH)) {
+                this.payload = JSON.parse(fs_1.readFileSync(process.env.GITHUB_EVENT_PATH, { encoding: 'utf8' }));
+            }
+            else {
+                const path = process.env.GITHUB_EVENT_PATH;
+                process.stdout.write(`GITHUB_EVENT_PATH ${path} does not exist${os_1.EOL}`);
+            }
+        }
+        this.eventName = process.env.GITHUB_EVENT_NAME;
+        this.sha = process.env.GITHUB_SHA;
+        this.ref = process.env.GITHUB_REF;
+        this.workflow = process.env.GITHUB_WORKFLOW;
+        this.action = process.env.GITHUB_ACTION;
+        this.actor = process.env.GITHUB_ACTOR;
+        this.job = process.env.GITHUB_JOB;
+        this.runNumber = parseInt(process.env.GITHUB_RUN_NUMBER, 10);
+        this.runId = parseInt(process.env.GITHUB_RUN_ID, 10);
+        this.apiUrl = (_a = process.env.GITHUB_API_URL) !== null && _a !== void 0 ? _a : `https://api.github.com`;
+        this.serverUrl = (_b = process.env.GITHUB_SERVER_URL) !== null && _b !== void 0 ? _b : `https://github.com`;
+        this.graphqlUrl = (_c = process.env.GITHUB_GRAPHQL_URL) !== null && _c !== void 0 ? _c : `https://api.github.com/graphql`;
+    }
+    get issue() {
+        const payload = this.payload;
+        return Object.assign(Object.assign({}, this.repo), { number: (payload.issue || payload.pull_request || payload).number });
+    }
+    get repo() {
+        if (process.env.GITHUB_REPOSITORY) {
+            const [owner, repo] = process.env.GITHUB_REPOSITORY.split('/');
+            return { owner, repo };
+        }
+        if (this.payload.repository) {
+            return {
+                owner: this.payload.repository.owner.login,
+                repo: this.payload.repository.name
+            };
+        }
+        throw new Error("context.repo requires a GITHUB_REPOSITORY environment variable like 'owner/repo'");
+    }
+}
+exports.Context = Context;
+//# sourceMappingURL=context.js.map
+
+/***/ }),
+
+/***/ 5438:
+/***/ (function(__unused_webpack_module, exports, __nccwpck_require__) {
+
+"use strict";
+
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
+Object.defineProperty(exports, "__esModule", ({ value: true }));
+exports.getOctokit = exports.context = void 0;
+const Context = __importStar(__nccwpck_require__(4087));
+const utils_1 = __nccwpck_require__(3030);
+exports.context = new Context.Context();
+/**
+ * Returns a hydrated octokit ready to use for GitHub Actions
+ *
+ * @param     token    the repo PAT or GITHUB_TOKEN
+ * @param     options  other options to set
+ */
+function getOctokit(token, options, ...additionalPlugins) {
+    const GitHubWithPlugins = utils_1.GitHub.plugin(...additionalPlugins);
+    return new GitHubWithPlugins(utils_1.getOctokitOptions(token, options));
+}
+exports.getOctokit = getOctokit;
+//# sourceMappingURL=github.js.map
+
+/***/ }),
+
+/***/ 7914:
+/***/ (function(__unused_webpack_module, exports, __nccwpck_require__) {
+
+"use strict";
+
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
+Object.defineProperty(exports, "__esModule", ({ value: true }));
+exports.getApiBaseUrl = exports.getProxyAgent = exports.getAuthString = void 0;
+const httpClient = __importStar(__nccwpck_require__(6255));
+function getAuthString(token, options) {
+    if (!token && !options.auth) {
+        throw new Error('Parameter token or opts.auth is required');
+    }
+    else if (token && options.auth) {
+        throw new Error('Parameters token and opts.auth may not both be specified');
+    }
+    return typeof options.auth === 'string' ? options.auth : `token ${token}`;
+}
+exports.getAuthString = getAuthString;
+function getProxyAgent(destinationUrl) {
+    const hc = new httpClient.HttpClient();
+    return hc.getAgent(destinationUrl);
+}
+exports.getProxyAgent = getProxyAgent;
+function getApiBaseUrl() {
+    return process.env['GITHUB_API_URL'] || 'https://api.github.com';
+}
+exports.getApiBaseUrl = getApiBaseUrl;
+//# sourceMappingURL=utils.js.map
+
+/***/ }),
+
+/***/ 3030:
+/***/ (function(__unused_webpack_module, exports, __nccwpck_require__) {
+
+"use strict";
+
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
+Object.defineProperty(exports, "__esModule", ({ value: true }));
+exports.getOctokitOptions = exports.GitHub = exports.defaults = exports.context = void 0;
+const Context = __importStar(__nccwpck_require__(4087));
+const Utils = __importStar(__nccwpck_require__(7914));
+// octokit + plugins
+const core_1 = __nccwpck_require__(8525);
+const plugin_rest_endpoint_methods_1 = __nccwpck_require__(3044);
+const plugin_paginate_rest_1 = __nccwpck_require__(8945);
+exports.context = new Context.Context();
+const baseUrl = Utils.getApiBaseUrl();
+exports.defaults = {
+    baseUrl,
+    request: {
+        agent: Utils.getProxyAgent(baseUrl)
+    }
+};
+exports.GitHub = core_1.Octokit.plugin(plugin_rest_endpoint_methods_1.restEndpointMethods, plugin_paginate_rest_1.paginateRest).defaults(exports.defaults);
+/**
+ * Convience function to correctly format Octokit Options to pass into the constructor.
+ *
+ * @param     token    the repo PAT or GITHUB_TOKEN
+ * @param     options  other options to set
+ */
+function getOctokitOptions(token, options) {
+    const opts = Object.assign({}, options || {}); // Shallow clone - don't mutate the object provided by the caller
+    // Auth
+    const auth = Utils.getAuthString(token, opts);
+    if (auth) {
+        opts.auth = auth;
+    }
+    return opts;
+}
+exports.getOctokitOptions = getOctokitOptions;
+//# sourceMappingURL=utils.js.map
+
+/***/ }),
+
+/***/ 673:
+/***/ ((__unused_webpack_module, exports) => {
+
+"use strict";
+
+
+Object.defineProperty(exports, "__esModule", ({ value: true }));
+
+const REGEX_IS_INSTALLATION_LEGACY = /^v1\./;
+const REGEX_IS_INSTALLATION = /^ghs_/;
+const REGEX_IS_USER_TO_SERVER = /^ghu_/;
+async function auth(token) {
+  const isApp = token.split(/\./).length === 3;
+  const isInstallation = REGEX_IS_INSTALLATION_LEGACY.test(token) || REGEX_IS_INSTALLATION.test(token);
+  const isUserToServer = REGEX_IS_USER_TO_SERVER.test(token);
+  const tokenType = isApp ? "app" : isInstallation ? "installation" : isUserToServer ? "user-to-server" : "oauth";
+  return {
+    type: "token",
+    token: token,
+    tokenType
+  };
+}
+
+/**
+ * Prefix token for usage in the Authorization header
+ *
+ * @param token OAuth token or JSON Web Token
+ */
+function withAuthorizationPrefix(token) {
+  if (token.split(/\./).length === 3) {
+    return `bearer ${token}`;
+  }
+
+  return `token ${token}`;
+}
+
+async function hook(token, request, route, parameters) {
+  const endpoint = request.endpoint.merge(route, parameters);
+  endpoint.headers.authorization = withAuthorizationPrefix(token);
+  return request(endpoint);
+}
+
+const createTokenAuth = function createTokenAuth(token) {
+  if (!token) {
+    throw new Error("[@octokit/auth-token] No token passed to createTokenAuth");
+  }
+
+  if (typeof token !== "string") {
+    throw new Error("[@octokit/auth-token] Token passed to createTokenAuth is not a string");
+  }
+
+  token = token.replace(/^(token|bearer) +/i, "");
+  return Object.assign(auth.bind(null, token), {
+    hook: hook.bind(null, token)
+  });
+};
+
+exports.createTokenAuth = createTokenAuth;
+//# sourceMappingURL=index.js.map
+
+
+/***/ }),
+
+/***/ 8525:
+/***/ ((__unused_webpack_module, exports, __nccwpck_require__) => {
+
+"use strict";
+
+
+Object.defineProperty(exports, "__esModule", ({ value: true }));
+
+var universalUserAgent = __nccwpck_require__(5030);
+var beforeAfterHook = __nccwpck_require__(3682);
+var request = __nccwpck_require__(9353);
+var graphql = __nccwpck_require__(6422);
+var authToken = __nccwpck_require__(673);
+
+function _objectWithoutPropertiesLoose(source, excluded) {
+  if (source == null) return {};
+  var target = {};
+  var sourceKeys = Object.keys(source);
+  var key, i;
+
+  for (i = 0; i < sourceKeys.length; i++) {
+    key = sourceKeys[i];
+    if (excluded.indexOf(key) >= 0) continue;
+    target[key] = source[key];
+  }
+
+  return target;
+}
+
+function _objectWithoutProperties(source, excluded) {
+  if (source == null) return {};
+
+  var target = _objectWithoutPropertiesLoose(source, excluded);
+
+  var key, i;
+
+  if (Object.getOwnPropertySymbols) {
+    var sourceSymbolKeys = Object.getOwnPropertySymbols(source);
+
+    for (i = 0; i < sourceSymbolKeys.length; i++) {
+      key = sourceSymbolKeys[i];
+      if (excluded.indexOf(key) >= 0) continue;
+      if (!Object.prototype.propertyIsEnumerable.call(source, key)) continue;
+      target[key] = source[key];
+    }
+  }
+
+  return target;
+}
+
+const VERSION = "3.6.0";
+
+const _excluded = ["authStrategy"];
+class Octokit {
+  constructor(options = {}) {
+    const hook = new beforeAfterHook.Collection();
+    const requestDefaults = {
+      baseUrl: request.request.endpoint.DEFAULTS.baseUrl,
+      headers: {},
+      request: Object.assign({}, options.request, {
+        // @ts-ignore internal usage only, no need to type
+        hook: hook.bind(null, "request")
+      }),
+      mediaType: {
+        previews: [],
+        format: ""
+      }
+    }; // prepend default user agent with `options.userAgent` if set
+
+    requestDefaults.headers["user-agent"] = [options.userAgent, `octokit-core.js/${VERSION} ${universalUserAgent.getUserAgent()}`].filter(Boolean).join(" ");
+
+    if (options.baseUrl) {
+      requestDefaults.baseUrl = options.baseUrl;
+    }
+
+    if (options.previews) {
+      requestDefaults.mediaType.previews = options.previews;
+    }
+
+    if (options.timeZone) {
+      requestDefaults.headers["time-zone"] = options.timeZone;
+    }
+
+    this.request = request.request.defaults(requestDefaults);
+    this.graphql = graphql.withCustomRequest(this.request).defaults(requestDefaults);
+    this.log = Object.assign({
+      debug: () => {},
+      info: () => {},
+      warn: console.warn.bind(console),
+      error: console.error.bind(console)
+    }, options.log);
+    this.hook = hook; // (1) If neither `options.authStrategy` nor `options.auth` are set, the `octokit` instance
+    //     is unauthenticated. The `this.auth()` method is a no-op and no request hook is registered.
+    // (2) If only `options.auth` is set, use the default token authentication strategy.
+    // (3) If `options.authStrategy` is set then use it and pass in `options.auth`. Always pass own request as many strategies accept a custom request instance.
+    // TODO: type `options.auth` based on `options.authStrategy`.
+
+    if (!options.authStrategy) {
+      if (!options.auth) {
+        // (1)
+        this.auth = async () => ({
+          type: "unauthenticated"
+        });
+      } else {
+        // (2)
+        const auth = authToken.createTokenAuth(options.auth); // @ts-ignore  ¯\_(ツ)_/¯
+
+        hook.wrap("request", auth.hook);
+        this.auth = auth;
+      }
+    } else {
+      const {
+        authStrategy
+      } = options,
+            otherOptions = _objectWithoutProperties(options, _excluded);
+
+      const auth = authStrategy(Object.assign({
+        request: this.request,
+        log: this.log,
+        // we pass the current octokit instance as well as its constructor options
+        // to allow for authentication strategies that return a new octokit instance
+        // that shares the same internal state as the current one. The original
+        // requirement for this was the "event-octokit" authentication strategy
+        // of https://github.com/probot/octokit-auth-probot.
+        octokit: this,
+        octokitOptions: otherOptions
+      }, options.auth)); // @ts-ignore  ¯\_(ツ)_/¯
+
+      hook.wrap("request", auth.hook);
+      this.auth = auth;
+    } // apply plugins
+    // https://stackoverflow.com/a/16345172
+
+
+    const classConstructor = this.constructor;
+    classConstructor.plugins.forEach(plugin => {
+      Object.assign(this, plugin(this, options));
+    });
+  }
+
+  static defaults(defaults) {
+    const OctokitWithDefaults = class extends this {
+      constructor(...args) {
+        const options = args[0] || {};
+
+        if (typeof defaults === "function") {
+          super(defaults(options));
+          return;
+        }
+
+        super(Object.assign({}, defaults, options, options.userAgent && defaults.userAgent ? {
+          userAgent: `${options.userAgent} ${defaults.userAgent}`
+        } : null));
+      }
+
+    };
+    return OctokitWithDefaults;
+  }
+  /**
+   * Attach a plugin (or many) to your Octokit instance.
+   *
+   * @example
+   * const API = Octokit.plugin(plugin1, plugin2, plugin3, ...)
+   */
+
+
+  static plugin(...newPlugins) {
+    var _a;
+
+    const currentPlugins = this.plugins;
+    const NewOctokit = (_a = class extends this {}, _a.plugins = currentPlugins.concat(newPlugins.filter(plugin => !currentPlugins.includes(plugin))), _a);
+    return NewOctokit;
+  }
+
+}
+Octokit.VERSION = VERSION;
+Octokit.plugins = [];
+
+exports.Octokit = Octokit;
+//# sourceMappingURL=index.js.map
+
+
+/***/ }),
+
+/***/ 8713:
+/***/ ((__unused_webpack_module, exports, __nccwpck_require__) => {
+
+"use strict";
+
+
+Object.defineProperty(exports, "__esModule", ({ value: true }));
+
+var isPlainObject = __nccwpck_require__(3287);
+var universalUserAgent = __nccwpck_require__(5030);
+
+function lowercaseKeys(object) {
+  if (!object) {
+    return {};
+  }
+
+  return Object.keys(object).reduce((newObj, key) => {
+    newObj[key.toLowerCase()] = object[key];
+    return newObj;
+  }, {});
+}
+
+function mergeDeep(defaults, options) {
+  const result = Object.assign({}, defaults);
+  Object.keys(options).forEach(key => {
+    if (isPlainObject.isPlainObject(options[key])) {
+      if (!(key in defaults)) Object.assign(result, {
+        [key]: options[key]
+      });else result[key] = mergeDeep(defaults[key], options[key]);
+    } else {
+      Object.assign(result, {
+        [key]: options[key]
+      });
+    }
+  });
+  return result;
+}
+
+function removeUndefinedProperties(obj) {
+  for (const key in obj) {
+    if (obj[key] === undefined) {
+      delete obj[key];
+    }
+  }
+
+  return obj;
+}
+
+function merge(defaults, route, options) {
+  if (typeof route === "string") {
+    let [method, url] = route.split(" ");
+    options = Object.assign(url ? {
+      method,
+      url
+    } : {
+      url: method
+    }, options);
+  } else {
+    options = Object.assign({}, route);
+  } // lowercase header names before merging with defaults to avoid duplicates
+
+
+  options.headers = lowercaseKeys(options.headers); // remove properties with undefined values before merging
+
+  removeUndefinedProperties(options);
+  removeUndefinedProperties(options.headers);
+  const mergedOptions = mergeDeep(defaults || {}, options); // mediaType.previews arrays are merged, instead of overwritten
+
+  if (defaults && defaults.mediaType.previews.length) {
+    mergedOptions.mediaType.previews = defaults.mediaType.previews.filter(preview => !mergedOptions.mediaType.previews.includes(preview)).concat(mergedOptions.mediaType.previews);
+  }
+
+  mergedOptions.mediaType.previews = mergedOptions.mediaType.previews.map(preview => preview.replace(/-preview/, ""));
+  return mergedOptions;
+}
+
+function addQueryParameters(url, parameters) {
+  const separator = /\?/.test(url) ? "&" : "?";
+  const names = Object.keys(parameters);
+
+  if (names.length === 0) {
+    return url;
+  }
+
+  return url + separator + names.map(name => {
+    if (name === "q") {
+      return "q=" + parameters.q.split("+").map(encodeURIComponent).join("+");
+    }
+
+    return `${name}=${encodeURIComponent(parameters[name])}`;
+  }).join("&");
+}
+
+const urlVariableRegex = /\{[^}]+\}/g;
+
+function removeNonChars(variableName) {
+  return variableName.replace(/^\W+|\W+$/g, "").split(/,/);
+}
+
+function extractUrlVariableNames(url) {
+  const matches = url.match(urlVariableRegex);
+
+  if (!matches) {
+    return [];
+  }
+
+  return matches.map(removeNonChars).reduce((a, b) => a.concat(b), []);
+}
+
+function omit(object, keysToOmit) {
+  return Object.keys(object).filter(option => !keysToOmit.includes(option)).reduce((obj, key) => {
+    obj[key] = object[key];
+    return obj;
+  }, {});
+}
+
+// Based on https://github.com/bramstein/url-template, licensed under BSD
+// TODO: create separate package.
+//
+// Copyright (c) 2012-2014, Bram Stein
+// All rights reserved.
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions
+// are met:
+//  1. Redistributions of source code must retain the above copyright
+//     notice, this list of conditions and the following disclaimer.
+//  2. Redistributions in binary form must reproduce the above copyright
+//     notice, this list of conditions and the following disclaimer in the
+//     documentation and/or other materials provided with the distribution.
+//  3. The name of the author may not be used to endorse or promote products
+//     derived from this software without specific prior written permission.
+// THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
+// WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+// MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
+// EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
+// INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+// BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
+// OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+// NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
+// EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+/* istanbul ignore file */
+function encodeReserved(str) {
+  return str.split(/(%[0-9A-Fa-f]{2})/g).map(function (part) {
+    if (!/%[0-9A-Fa-f]/.test(part)) {
+      part = encodeURI(part).replace(/%5B/g, "[").replace(/%5D/g, "]");
+    }
+
+    return part;
+  }).join("");
+}
+
+function encodeUnreserved(str) {
+  return encodeURIComponent(str).replace(/[!'()*]/g, function (c) {
+    return "%" + c.charCodeAt(0).toString(16).toUpperCase();
+  });
+}
+
+function encodeValue(operator, value, key) {
+  value = operator === "+" || operator === "#" ? encodeReserved(value) : encodeUnreserved(value);
+
+  if (key) {
+    return encodeUnreserved(key) + "=" + value;
+  } else {
+    return value;
+  }
+}
+
+function isDefined(value) {
+  return value !== undefined && value !== null;
+}
+
+function isKeyOperator(operator) {
+  return operator === ";" || operator === "&" || operator === "?";
+}
+
+function getValues(context, operator, key, modifier) {
+  var value = context[key],
+      result = [];
+
+  if (isDefined(value) && value !== "") {
+    if (typeof value === "string" || typeof value === "number" || typeof value === "boolean") {
+      value = value.toString();
+
+      if (modifier && modifier !== "*") {
+        value = value.substring(0, parseInt(modifier, 10));
+      }
+
+      result.push(encodeValue(operator, value, isKeyOperator(operator) ? key : ""));
+    } else {
+      if (modifier === "*") {
+        if (Array.isArray(value)) {
+          value.filter(isDefined).forEach(function (value) {
+            result.push(encodeValue(operator, value, isKeyOperator(operator) ? key : ""));
+          });
+        } else {
+          Object.keys(value).forEach(function (k) {
+            if (isDefined(value[k])) {
+              result.push(encodeValue(operator, value[k], k));
+            }
+          });
+        }
+      } else {
+        const tmp = [];
+
+        if (Array.isArray(value)) {
+          value.filter(isDefined).forEach(function (value) {
+            tmp.push(encodeValue(operator, value));
+          });
+        } else {
+          Object.keys(value).forEach(function (k) {
+            if (isDefined(value[k])) {
+              tmp.push(encodeUnreserved(k));
+              tmp.push(encodeValue(operator, value[k].toString()));
+            }
+          });
+        }
+
+        if (isKeyOperator(operator)) {
+          result.push(encodeUnreserved(key) + "=" + tmp.join(","));
+        } else if (tmp.length !== 0) {
+          result.push(tmp.join(","));
+        }
+      }
+    }
+  } else {
+    if (operator === ";") {
+      if (isDefined(value)) {
+        result.push(encodeUnreserved(key));
+      }
+    } else if (value === "" && (operator === "&" || operator === "?")) {
+      result.push(encodeUnreserved(key) + "=");
+    } else if (value === "") {
+      result.push("");
+    }
+  }
+
+  return result;
+}
+
+function parseUrl(template) {
+  return {
+    expand: expand.bind(null, template)
+  };
+}
+
+function expand(template, context) {
+  var operators = ["+", "#", ".", "/", ";", "?", "&"];
+  return template.replace(/\{([^\{\}]+)\}|([^\{\}]+)/g, function (_, expression, literal) {
+    if (expression) {
+      let operator = "";
+      const values = [];
+
+      if (operators.indexOf(expression.charAt(0)) !== -1) {
+        operator = expression.charAt(0);
+        expression = expression.substr(1);
+      }
+
+      expression.split(/,/g).forEach(function (variable) {
+        var tmp = /([^:\*]*)(?::(\d+)|(\*))?/.exec(variable);
+        values.push(getValues(context, operator, tmp[1], tmp[2] || tmp[3]));
+      });
+
+      if (operator && operator !== "+") {
+        var separator = ",";
+
+        if (operator === "?") {
+          separator = "&";
+        } else if (operator !== "#") {
+          separator = operator;
+        }
+
+        return (values.length !== 0 ? operator : "") + values.join(separator);
+      } else {
+        return values.join(",");
+      }
+    } else {
+      return encodeReserved(literal);
+    }
+  });
+}
+
+function parse(options) {
+  // https://fetch.spec.whatwg.org/#methods
+  let method = options.method.toUpperCase(); // replace :varname with {varname} to make it RFC 6570 compatible
+
+  let url = (options.url || "/").replace(/:([a-z]\w+)/g, "{$1}");
+  let headers = Object.assign({}, options.headers);
+  let body;
+  let parameters = omit(options, ["method", "baseUrl", "url", "headers", "request", "mediaType"]); // extract variable names from URL to calculate remaining variables later
+
+  const urlVariableNames = extractUrlVariableNames(url);
+  url = parseUrl(url).expand(parameters);
+
+  if (!/^http/.test(url)) {
+    url = options.baseUrl + url;
+  }
+
+  const omittedParameters = Object.keys(options).filter(option => urlVariableNames.includes(option)).concat("baseUrl");
+  const remainingParameters = omit(parameters, omittedParameters);
+  const isBinaryRequest = /application\/octet-stream/i.test(headers.accept);
+
+  if (!isBinaryRequest) {
+    if (options.mediaType.format) {
+      // e.g. application/vnd.github.v3+json => application/vnd.github.v3.raw
+      headers.accept = headers.accept.split(/,/).map(preview => preview.replace(/application\/vnd(\.\w+)(\.v3)?(\.\w+)?(\+json)?$/, `application/vnd$1$2.${options.mediaType.format}`)).join(",");
+    }
+
+    if (options.mediaType.previews.length) {
+      const previewsFromAcceptHeader = headers.accept.match(/[\w-]+(?=-preview)/g) || [];
+      headers.accept = previewsFromAcceptHeader.concat(options.mediaType.previews).map(preview => {
+        const format = options.mediaType.format ? `.${options.mediaType.format}` : "+json";
+        return `application/vnd.github.${preview}-preview${format}`;
+      }).join(",");
+    }
+  } // for GET/HEAD requests, set URL query parameters from remaining parameters
+  // for PATCH/POST/PUT/DELETE requests, set request body from remaining parameters
+
+
+  if (["GET", "HEAD"].includes(method)) {
+    url = addQueryParameters(url, remainingParameters);
+  } else {
+    if ("data" in remainingParameters) {
+      body = remainingParameters.data;
+    } else {
+      if (Object.keys(remainingParameters).length) {
+        body = remainingParameters;
+      } else {
+        headers["content-length"] = 0;
+      }
+    }
+  } // default content-type for JSON if body is set
+
+
+  if (!headers["content-type"] && typeof body !== "undefined") {
+    headers["content-type"] = "application/json; charset=utf-8";
+  } // GitHub expects 'content-length: 0' header for PUT/PATCH requests without body.
+  // fetch does not allow to set `content-length` header, but we can set body to an empty string
+
+
+  if (["PATCH", "PUT"].includes(method) && typeof body === "undefined") {
+    body = "";
+  } // Only return body/request keys if present
+
+
+  return Object.assign({
+    method,
+    url,
+    headers
+  }, typeof body !== "undefined" ? {
+    body
+  } : null, options.request ? {
+    request: options.request
+  } : null);
+}
+
+function endpointWithDefaults(defaults, route, options) {
+  return parse(merge(defaults, route, options));
+}
+
+function withDefaults(oldDefaults, newDefaults) {
+  const DEFAULTS = merge(oldDefaults, newDefaults);
+  const endpoint = endpointWithDefaults.bind(null, DEFAULTS);
+  return Object.assign(endpoint, {
+    DEFAULTS,
+    defaults: withDefaults.bind(null, DEFAULTS),
+    merge: merge.bind(null, DEFAULTS),
+    parse
+  });
+}
+
+const VERSION = "6.0.12";
+
+const userAgent = `octokit-endpoint.js/${VERSION} ${universalUserAgent.getUserAgent()}`; // DEFAULTS has all properties set that EndpointOptions has, except url.
+// So we use RequestParameters and add method as additional required property.
+
+const DEFAULTS = {
+  method: "GET",
+  baseUrl: "https://api.github.com",
+  headers: {
+    accept: "application/vnd.github.v3+json",
+    "user-agent": userAgent
+  },
+  mediaType: {
+    format: "",
+    previews: []
+  }
+};
+
+const endpoint = withDefaults(null, DEFAULTS);
+
+exports.endpoint = endpoint;
+//# sourceMappingURL=index.js.map
+
+
+/***/ }),
+
+/***/ 6422:
+/***/ ((__unused_webpack_module, exports, __nccwpck_require__) => {
+
+"use strict";
+
+
+Object.defineProperty(exports, "__esModule", ({ value: true }));
+
+var request = __nccwpck_require__(9353);
+var universalUserAgent = __nccwpck_require__(5030);
+
+const VERSION = "4.8.0";
+
+function _buildMessageForResponseErrors(data) {
+  return `Request failed due to following response errors:\n` + data.errors.map(e => ` - ${e.message}`).join("\n");
+}
+
+class GraphqlResponseError extends Error {
+  constructor(request, headers, response) {
+    super(_buildMessageForResponseErrors(response));
+    this.request = request;
+    this.headers = headers;
+    this.response = response;
+    this.name = "GraphqlResponseError"; // Expose the errors and response data in their shorthand properties.
+
+    this.errors = response.errors;
+    this.data = response.data; // Maintains proper stack trace (only available on V8)
+
+    /* istanbul ignore next */
+
+    if (Error.captureStackTrace) {
+      Error.captureStackTrace(this, this.constructor);
+    }
+  }
+
+}
+
+const NON_VARIABLE_OPTIONS = ["method", "baseUrl", "url", "headers", "request", "query", "mediaType"];
+const FORBIDDEN_VARIABLE_OPTIONS = ["query", "method", "url"];
+const GHES_V3_SUFFIX_REGEX = /\/api\/v3\/?$/;
+function graphql(request, query, options) {
+  if (options) {
+    if (typeof query === "string" && "query" in options) {
+      return Promise.reject(new Error(`[@octokit/graphql] "query" cannot be used as variable name`));
+    }
+
+    for (const key in options) {
+      if (!FORBIDDEN_VARIABLE_OPTIONS.includes(key)) continue;
+      return Promise.reject(new Error(`[@octokit/graphql] "${key}" cannot be used as variable name`));
+    }
+  }
+
+  const parsedOptions = typeof query === "string" ? Object.assign({
+    query
+  }, options) : query;
+  const requestOptions = Object.keys(parsedOptions).reduce((result, key) => {
+    if (NON_VARIABLE_OPTIONS.includes(key)) {
+      result[key] = parsedOptions[key];
+      return result;
+    }
+
+    if (!result.variables) {
+      result.variables = {};
+    }
+
+    result.variables[key] = parsedOptions[key];
+    return result;
+  }, {}); // workaround for GitHub Enterprise baseUrl set with /api/v3 suffix
+  // https://github.com/octokit/auth-app.js/issues/111#issuecomment-657610451
+
+  const baseUrl = parsedOptions.baseUrl || request.endpoint.DEFAULTS.baseUrl;
+
+  if (GHES_V3_SUFFIX_REGEX.test(baseUrl)) {
+    requestOptions.url = baseUrl.replace(GHES_V3_SUFFIX_REGEX, "/api/graphql");
+  }
+
+  return request(requestOptions).then(response => {
+    if (response.data.errors) {
+      const headers = {};
+
+      for (const key of Object.keys(response.headers)) {
+        headers[key] = response.headers[key];
+      }
+
+      throw new GraphqlResponseError(requestOptions, headers, response.data);
+    }
+
+    return response.data.data;
+  });
+}
+
+function withDefaults(request$1, newDefaults) {
+  const newRequest = request$1.defaults(newDefaults);
+
+  const newApi = (query, options) => {
+    return graphql(newRequest, query, options);
+  };
+
+  return Object.assign(newApi, {
+    defaults: withDefaults.bind(null, newRequest),
+    endpoint: request.request.endpoint
+  });
+}
+
+const graphql$1 = withDefaults(request.request, {
+  headers: {
+    "user-agent": `octokit-graphql.js/${VERSION} ${universalUserAgent.getUserAgent()}`
+  },
+  method: "POST",
+  url: "/graphql"
+});
+function withCustomRequest(customRequest) {
+  return withDefaults(customRequest, {
+    method: "POST",
+    url: "/graphql"
+  });
+}
+
+exports.GraphqlResponseError = GraphqlResponseError;
+exports.graphql = graphql$1;
+exports.withCustomRequest = withCustomRequest;
+//# sourceMappingURL=index.js.map
+
+
+/***/ }),
+
+/***/ 8945:
+/***/ ((__unused_webpack_module, exports) => {
+
+"use strict";
+
+
+Object.defineProperty(exports, "__esModule", ({ value: true }));
+
+const VERSION = "2.21.3";
+
+function ownKeys(object, enumerableOnly) {
+  var keys = Object.keys(object);
+
+  if (Object.getOwnPropertySymbols) {
+    var symbols = Object.getOwnPropertySymbols(object);
+    enumerableOnly && (symbols = symbols.filter(function (sym) {
+      return Object.getOwnPropertyDescriptor(object, sym).enumerable;
+    })), keys.push.apply(keys, symbols);
+  }
+
+  return keys;
+}
+
+function _objectSpread2(target) {
+  for (var i = 1; i < arguments.length; i++) {
+    var source = null != arguments[i] ? arguments[i] : {};
+    i % 2 ? ownKeys(Object(source), !0).forEach(function (key) {
+      _defineProperty(target, key, source[key]);
+    }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) {
+      Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key));
+    });
+  }
+
+  return target;
+}
+
+function _defineProperty(obj, key, value) {
+  if (key in obj) {
+    Object.defineProperty(obj, key, {
+      value: value,
+      enumerable: true,
+      configurable: true,
+      writable: true
+    });
+  } else {
+    obj[key] = value;
+  }
+
+  return obj;
+}
+
+/**
+ * Some “list” response that can be paginated have a different response structure
+ *
+ * They have a `total_count` key in the response (search also has `incomplete_results`,
+ * /installation/repositories also has `repository_selection`), as well as a key with
+ * the list of the items which name varies from endpoint to endpoint.
+ *
+ * Octokit normalizes these responses so that paginated results are always returned following
+ * the same structure. One challenge is that if the list response has only one page, no Link
+ * header is provided, so this header alone is not sufficient to check wether a response is
+ * paginated or not.
+ *
+ * We check if a "total_count" key is present in the response data, but also make sure that
+ * a "url" property is not, as the "Get the combined status for a specific ref" endpoint would
+ * otherwise match: https://developer.github.com/v3/repos/statuses/#get-the-combined-status-for-a-specific-ref
+ */
+function normalizePaginatedListResponse(response) {
+  // endpoints can respond with 204 if repository is empty
+  if (!response.data) {
+    return _objectSpread2(_objectSpread2({}, response), {}, {
+      data: []
+    });
+  }
+
+  const responseNeedsNormalization = "total_count" in response.data && !("url" in response.data);
+  if (!responseNeedsNormalization) return response; // keep the additional properties intact as there is currently no other way
+  // to retrieve the same information.
+
+  const incompleteResults = response.data.incomplete_results;
+  const repositorySelection = response.data.repository_selection;
+  const totalCount = response.data.total_count;
+  delete response.data.incomplete_results;
+  delete response.data.repository_selection;
+  delete response.data.total_count;
+  const namespaceKey = Object.keys(response.data)[0];
+  const data = response.data[namespaceKey];
+  response.data = data;
+
+  if (typeof incompleteResults !== "undefined") {
+    response.data.incomplete_results = incompleteResults;
+  }
+
+  if (typeof repositorySelection !== "undefined") {
+    response.data.repository_selection = repositorySelection;
+  }
+
+  response.data.total_count = totalCount;
+  return response;
+}
+
+function iterator(octokit, route, parameters) {
+  const options = typeof route === "function" ? route.endpoint(parameters) : octokit.request.endpoint(route, parameters);
+  const requestMethod = typeof route === "function" ? route : octokit.request;
+  const method = options.method;
+  const headers = options.headers;
+  let url = options.url;
+  return {
+    [Symbol.asyncIterator]: () => ({
+      async next() {
+        if (!url) return {
+          done: true
+        };
+
+        try {
+          const response = await requestMethod({
+            method,
+            url,
+            headers
+          });
+          const normalizedResponse = normalizePaginatedListResponse(response); // `response.headers.link` format:
+          // '<https://api.github.com/users/aseemk/followers?page=2>; rel="next", <https://api.github.com/users/aseemk/followers?page=2>; rel="last"'
+          // sets `url` to undefined if "next" URL is not present or `link` header is not set
+
+          url = ((normalizedResponse.headers.link || "").match(/<([^>]+)>;\s*rel="next"/) || [])[1];
+          return {
+            value: normalizedResponse
+          };
+        } catch (error) {
+          if (error.status !== 409) throw error;
+          url = "";
+          return {
+            value: {
+              status: 200,
+              headers: {},
+              data: []
+            }
+          };
+        }
+      }
+
+    })
+  };
+}
+
+function paginate(octokit, route, parameters, mapFn) {
+  if (typeof parameters === "function") {
+    mapFn = parameters;
+    parameters = undefined;
+  }
+
+  return gather(octokit, [], iterator(octokit, route, parameters)[Symbol.asyncIterator](), mapFn);
+}
+
+function gather(octokit, results, iterator, mapFn) {
+  return iterator.next().then(result => {
+    if (result.done) {
+      return results;
+    }
+
+    let earlyExit = false;
+
+    function done() {
+      earlyExit = true;
+    }
+
+    results = results.concat(mapFn ? mapFn(result.value, done) : result.value.data);
+
+    if (earlyExit) {
+      return results;
+    }
+
+    return gather(octokit, results, iterator, mapFn);
+  });
+}
+
+const composePaginateRest = Object.assign(paginate, {
+  iterator
+});
+
+const paginatingEndpoints = ["GET /app/hook/deliveries", "GET /app/installations", "GET /applications/grants", "GET /authorizations", "GET /enterprises/{enterprise}/actions/permissions/organizations", "GET /enterprises/{enterprise}/actions/runner-groups", "GET /enterprises/{enterprise}/actions/runner-groups/{runner_group_id}/organizations", "GET /enterprises/{enterprise}/actions/runner-groups/{runner_group_id}/runners", "GET /enterprises/{enterprise}/actions/runners", "GET /enterprises/{enterprise}/audit-log", "GET /enterprises/{enterprise}/secret-scanning/alerts", "GET /enterprises/{enterprise}/settings/billing/advanced-security", "GET /events", "GET /gists", "GET /gists/public", "GET /gists/starred", "GET /gists/{gist_id}/comments", "GET /gists/{gist_id}/commits", "GET /gists/{gist_id}/forks", "GET /installation/repositories", "GET /issues", "GET /licenses", "GET /marketplace_listing/plans", "GET /marketplace_listing/plans/{plan_id}/accounts", "GET /marketplace_listing/stubbed/plans", "GET /marketplace_listing/stubbed/plans/{plan_id}/accounts", "GET /networks/{owner}/{repo}/events", "GET /notifications", "GET /organizations", "GET /orgs/{org}/actions/cache/usage-by-repository", "GET /orgs/{org}/actions/permissions/repositories", "GET /orgs/{org}/actions/runner-groups", "GET /orgs/{org}/actions/runner-groups/{runner_group_id}/repositories", "GET /orgs/{org}/actions/runner-groups/{runner_group_id}/runners", "GET /orgs/{org}/actions/runners", "GET /orgs/{org}/actions/secrets", "GET /orgs/{org}/actions/secrets/{secret_name}/repositories", "GET /orgs/{org}/audit-log", "GET /orgs/{org}/blocks", "GET /orgs/{org}/code-scanning/alerts", "GET /orgs/{org}/codespaces", "GET /orgs/{org}/credential-authorizations", "GET /orgs/{org}/dependabot/secrets", "GET /orgs/{org}/dependabot/secrets/{secret_name}/repositories", "GET /orgs/{org}/events", "GET /orgs/{org}/external-groups", "GET /orgs/{org}/failed_invitations", "GET /orgs/{org}/hooks", "GET /orgs/{org}/hooks/{hook_id}/deliveries", "GET /orgs/{org}/installations", "GET /orgs/{org}/invitations", "GET /orgs/{org}/invitations/{invitation_id}/teams", "GET /orgs/{org}/issues", "GET /orgs/{org}/members", "GET /orgs/{org}/migrations", "GET /orgs/{org}/migrations/{migration_id}/repositories", "GET /orgs/{org}/outside_collaborators", "GET /orgs/{org}/packages", "GET /orgs/{org}/packages/{package_type}/{package_name}/versions", "GET /orgs/{org}/projects", "GET /orgs/{org}/public_members", "GET /orgs/{org}/repos", "GET /orgs/{org}/secret-scanning/alerts", "GET /orgs/{org}/settings/billing/advanced-security", "GET /orgs/{org}/team-sync/groups", "GET /orgs/{org}/teams", "GET /orgs/{org}/teams/{team_slug}/discussions", "GET /orgs/{org}/teams/{team_slug}/discussions/{discussion_number}/comments", "GET /orgs/{org}/teams/{team_slug}/discussions/{discussion_number}/comments/{comment_number}/reactions", "GET /orgs/{org}/teams/{team_slug}/discussions/{discussion_number}/reactions", "GET /orgs/{org}/teams/{team_slug}/invitations", "GET /orgs/{org}/teams/{team_slug}/members", "GET /orgs/{org}/teams/{team_slug}/projects", "GET /orgs/{org}/teams/{team_slug}/repos", "GET /orgs/{org}/teams/{team_slug}/teams", "GET /projects/columns/{column_id}/cards", "GET /projects/{project_id}/collaborators", "GET /projects/{project_id}/columns", "GET /repos/{owner}/{repo}/actions/artifacts", "GET /repos/{owner}/{repo}/actions/caches", "GET /repos/{owner}/{repo}/actions/runners", "GET /repos/{owner}/{repo}/actions/runs", "GET /repos/{owner}/{repo}/actions/runs/{run_id}/artifacts", "GET /repos/{owner}/{repo}/actions/runs/{run_id}/attempts/{attempt_number}/jobs", "GET /repos/{owner}/{repo}/actions/runs/{run_id}/jobs", "GET /repos/{owner}/{repo}/actions/secrets", "GET /repos/{owner}/{repo}/actions/workflows", "GET /repos/{owner}/{repo}/actions/workflows/{workflow_id}/runs", "GET /repos/{owner}/{repo}/assignees", "GET /repos/{owner}/{repo}/branches", "GET /repos/{owner}/{repo}/check-runs/{check_run_id}/annotations", "GET /repos/{owner}/{repo}/check-suites/{check_suite_id}/check-runs", "GET /repos/{owner}/{repo}/code-scanning/alerts", "GET /repos/{owner}/{repo}/code-scanning/alerts/{alert_number}/instances", "GET /repos/{owner}/{repo}/code-scanning/analyses", "GET /repos/{owner}/{repo}/codespaces", "GET /repos/{owner}/{repo}/codespaces/devcontainers", "GET /repos/{owner}/{repo}/codespaces/secrets", "GET /repos/{owner}/{repo}/collaborators", "GET /repos/{owner}/{repo}/comments", "GET /repos/{owner}/{repo}/comments/{comment_id}/reactions", "GET /repos/{owner}/{repo}/commits", "GET /repos/{owner}/{repo}/commits/{commit_sha}/comments", "GET /repos/{owner}/{repo}/commits/{commit_sha}/pulls", "GET /repos/{owner}/{repo}/commits/{ref}/check-runs", "GET /repos/{owner}/{repo}/commits/{ref}/check-suites", "GET /repos/{owner}/{repo}/commits/{ref}/status", "GET /repos/{owner}/{repo}/commits/{ref}/statuses", "GET /repos/{owner}/{repo}/contributors", "GET /repos/{owner}/{repo}/dependabot/secrets", "GET /repos/{owner}/{repo}/deployments", "GET /repos/{owner}/{repo}/deployments/{deployment_id}/statuses", "GET /repos/{owner}/{repo}/environments", "GET /repos/{owner}/{repo}/events", "GET /repos/{owner}/{repo}/forks", "GET /repos/{owner}/{repo}/git/matching-refs/{ref}", "GET /repos/{owner}/{repo}/hooks", "GET /repos/{owner}/{repo}/hooks/{hook_id}/deliveries", "GET /repos/{owner}/{repo}/invitations", "GET /repos/{owner}/{repo}/issues", "GET /repos/{owner}/{repo}/issues/comments", "GET /repos/{owner}/{repo}/issues/comments/{comment_id}/reactions", "GET /repos/{owner}/{repo}/issues/events", "GET /repos/{owner}/{repo}/issues/{issue_number}/comments", "GET /repos/{owner}/{repo}/issues/{issue_number}/events", "GET /repos/{owner}/{repo}/issues/{issue_number}/labels", "GET /repos/{owner}/{repo}/issues/{issue_number}/reactions", "GET /repos/{owner}/{repo}/issues/{issue_number}/timeline", "GET /repos/{owner}/{repo}/keys", "GET /repos/{owner}/{repo}/labels", "GET /repos/{owner}/{repo}/milestones", "GET /repos/{owner}/{repo}/milestones/{milestone_number}/labels", "GET /repos/{owner}/{repo}/notifications", "GET /repos/{owner}/{repo}/pages/builds", "GET /repos/{owner}/{repo}/projects", "GET /repos/{owner}/{repo}/pulls", "GET /repos/{owner}/{repo}/pulls/comments", "GET /repos/{owner}/{repo}/pulls/comments/{comment_id}/reactions", "GET /repos/{owner}/{repo}/pulls/{pull_number}/comments", "GET /repos/{owner}/{repo}/pulls/{pull_number}/commits", "GET /repos/{owner}/{repo}/pulls/{pull_number}/files", "GET /repos/{owner}/{repo}/pulls/{pull_number}/requested_reviewers", "GET /repos/{owner}/{repo}/pulls/{pull_number}/reviews", "GET /repos/{owner}/{repo}/pulls/{pull_number}/reviews/{review_id}/comments", "GET /repos/{owner}/{repo}/releases", "GET /repos/{owner}/{repo}/releases/{release_id}/assets", "GET /repos/{owner}/{repo}/releases/{release_id}/reactions", "GET /repos/{owner}/{repo}/secret-scanning/alerts", "GET /repos/{owner}/{repo}/secret-scanning/alerts/{alert_number}/locations", "GET /repos/{owner}/{repo}/stargazers", "GET /repos/{owner}/{repo}/subscribers", "GET /repos/{owner}/{repo}/tags", "GET /repos/{owner}/{repo}/teams", "GET /repos/{owner}/{repo}/topics", "GET /repositories", "GET /repositories/{repository_id}/environments/{environment_name}/secrets", "GET /search/code", "GET /search/commits", "GET /search/issues", "GET /search/labels", "GET /search/repositories", "GET /search/topics", "GET /search/users", "GET /teams/{team_id}/discussions", "GET /teams/{team_id}/discussions/{discussion_number}/comments", "GET /teams/{team_id}/discussions/{discussion_number}/comments/{comment_number}/reactions", "GET /teams/{team_id}/discussions/{discussion_number}/reactions", "GET /teams/{team_id}/invitations", "GET /teams/{team_id}/members", "GET /teams/{team_id}/projects", "GET /teams/{team_id}/repos", "GET /teams/{team_id}/teams", "GET /user/blocks", "GET /user/codespaces", "GET /user/codespaces/secrets", "GET /user/emails", "GET /user/followers", "GET /user/following", "GET /user/gpg_keys", "GET /user/installations", "GET /user/installations/{installation_id}/repositories", "GET /user/issues", "GET /user/keys", "GET /user/marketplace_purchases", "GET /user/marketplace_purchases/stubbed", "GET /user/memberships/orgs", "GET /user/migrations", "GET /user/migrations/{migration_id}/repositories", "GET /user/orgs", "GET /user/packages", "GET /user/packages/{package_type}/{package_name}/versions", "GET /user/public_emails", "GET /user/repos", "GET /user/repository_invitations", "GET /user/starred", "GET /user/subscriptions", "GET /user/teams", "GET /users", "GET /users/{username}/events", "GET /users/{username}/events/orgs/{org}", "GET /users/{username}/events/public", "GET /users/{username}/followers", "GET /users/{username}/following", "GET /users/{username}/gists", "GET /users/{username}/gpg_keys", "GET /users/{username}/keys", "GET /users/{username}/orgs", "GET /users/{username}/packages", "GET /users/{username}/projects", "GET /users/{username}/received_events", "GET /users/{username}/received_events/public", "GET /users/{username}/repos", "GET /users/{username}/starred", "GET /users/{username}/subscriptions"];
+
+function isPaginatingEndpoint(arg) {
+  if (typeof arg === "string") {
+    return paginatingEndpoints.includes(arg);
+  } else {
+    return false;
+  }
+}
+
+/**
+ * @param octokit Octokit instance
+ * @param options Options passed to Octokit constructor
+ */
+
+function paginateRest(octokit) {
+  return {
+    paginate: Object.assign(paginate.bind(null, octokit), {
+      iterator: iterator.bind(null, octokit)
+    })
+  };
+}
+paginateRest.VERSION = VERSION;
+
+exports.composePaginateRest = composePaginateRest;
+exports.isPaginatingEndpoint = isPaginatingEndpoint;
+exports.paginateRest = paginateRest;
+exports.paginatingEndpoints = paginatingEndpoints;
+//# sourceMappingURL=index.js.map
+
+
+/***/ }),
+
+/***/ 7471:
+/***/ ((__unused_webpack_module, exports, __nccwpck_require__) => {
+
+"use strict";
+
+
+Object.defineProperty(exports, "__esModule", ({ value: true }));
+
+function _interopDefault (ex) { return (ex && (typeof ex === 'object') && 'default' in ex) ? ex['default'] : ex; }
+
+var deprecation = __nccwpck_require__(8932);
+var once = _interopDefault(__nccwpck_require__(1223));
+
+const logOnceCode = once(deprecation => console.warn(deprecation));
+const logOnceHeaders = once(deprecation => console.warn(deprecation));
+/**
+ * Error with extra properties to help with debugging
+ */
+
+class RequestError extends Error {
+  constructor(message, statusCode, options) {
+    super(message); // Maintains proper stack trace (only available on V8)
+
+    /* istanbul ignore next */
+
+    if (Error.captureStackTrace) {
+      Error.captureStackTrace(this, this.constructor);
+    }
+
+    this.name = "HttpError";
+    this.status = statusCode;
+    let headers;
+
+    if ("headers" in options && typeof options.headers !== "undefined") {
+      headers = options.headers;
+    }
+
+    if ("response" in options) {
+      this.response = options.response;
+      headers = options.response.headers;
+    } // redact request credentials without mutating original request options
+
+
+    const requestCopy = Object.assign({}, options.request);
+
+    if (options.request.headers.authorization) {
+      requestCopy.headers = Object.assign({}, options.request.headers, {
+        authorization: options.request.headers.authorization.replace(/ .*$/, " [REDACTED]")
+      });
+    }
+
+    requestCopy.url = requestCopy.url // client_id & client_secret can be passed as URL query parameters to increase rate limit
+    // see https://developer.github.com/v3/#increasing-the-unauthenticated-rate-limit-for-oauth-applications
+    .replace(/\bclient_secret=\w+/g, "client_secret=[REDACTED]") // OAuth tokens can be passed as URL query parameters, although it is not recommended
+    // see https://developer.github.com/v3/#oauth2-token-sent-in-a-header
+    .replace(/\baccess_token=\w+/g, "access_token=[REDACTED]");
+    this.request = requestCopy; // deprecations
+
+    Object.defineProperty(this, "code", {
+      get() {
+        logOnceCode(new deprecation.Deprecation("[@octokit/request-error] `error.code` is deprecated, use `error.status`."));
+        return statusCode;
+      }
+
+    });
+    Object.defineProperty(this, "headers", {
+      get() {
+        logOnceHeaders(new deprecation.Deprecation("[@octokit/request-error] `error.headers` is deprecated, use `error.response.headers`."));
+        return headers || {};
+      }
+
+    });
+  }
+
+}
+
+exports.RequestError = RequestError;
+//# sourceMappingURL=index.js.map
+
+
+/***/ }),
+
+/***/ 9353:
+/***/ ((__unused_webpack_module, exports, __nccwpck_require__) => {
+
+"use strict";
+
+
+Object.defineProperty(exports, "__esModule", ({ value: true }));
+
+function _interopDefault (ex) { return (ex && (typeof ex === 'object') && 'default' in ex) ? ex['default'] : ex; }
+
+var endpoint = __nccwpck_require__(8713);
+var universalUserAgent = __nccwpck_require__(5030);
+var isPlainObject = __nccwpck_require__(3287);
+var nodeFetch = _interopDefault(__nccwpck_require__(467));
+var requestError = __nccwpck_require__(7471);
+
+const VERSION = "5.6.3";
+
+function getBufferResponse(response) {
+  return response.arrayBuffer();
+}
+
+function fetchWrapper(requestOptions) {
+  const log = requestOptions.request && requestOptions.request.log ? requestOptions.request.log : console;
+
+  if (isPlainObject.isPlainObject(requestOptions.body) || Array.isArray(requestOptions.body)) {
+    requestOptions.body = JSON.stringify(requestOptions.body);
+  }
+
+  let headers = {};
+  let status;
+  let url;
+  const fetch = requestOptions.request && requestOptions.request.fetch || nodeFetch;
+  return fetch(requestOptions.url, Object.assign({
+    method: requestOptions.method,
+    body: requestOptions.body,
+    headers: requestOptions.headers,
+    redirect: requestOptions.redirect
+  }, // `requestOptions.request.agent` type is incompatible
+  // see https://github.com/octokit/types.ts/pull/264
+  requestOptions.request)).then(async response => {
+    url = response.url;
+    status = response.status;
+
+    for (const keyAndValue of response.headers) {
+      headers[keyAndValue[0]] = keyAndValue[1];
+    }
+
+    if ("deprecation" in headers) {
+      const matches = headers.link && headers.link.match(/<([^>]+)>; rel="deprecation"/);
+      const deprecationLink = matches && matches.pop();
+      log.warn(`[@octokit/request] "${requestOptions.method} ${requestOptions.url}" is deprecated. It is scheduled to be removed on ${headers.sunset}${deprecationLink ? `. See ${deprecationLink}` : ""}`);
+    }
+
+    if (status === 204 || status === 205) {
+      return;
+    } // GitHub API returns 200 for HEAD requests
+
+
+    if (requestOptions.method === "HEAD") {
+      if (status < 400) {
+        return;
+      }
+
+      throw new requestError.RequestError(response.statusText, status, {
+        response: {
+          url,
+          status,
+          headers,
+          data: undefined
+        },
+        request: requestOptions
+      });
+    }
+
+    if (status === 304) {
+      throw new requestError.RequestError("Not modified", status, {
+        response: {
+          url,
+          status,
+          headers,
+          data: await getResponseData(response)
+        },
+        request: requestOptions
+      });
+    }
+
+    if (status >= 400) {
+      const data = await getResponseData(response);
+      const error = new requestError.RequestError(toErrorMessage(data), status, {
+        response: {
+          url,
+          status,
+          headers,
+          data
+        },
+        request: requestOptions
+      });
+      throw error;
+    }
+
+    return getResponseData(response);
+  }).then(data => {
+    return {
+      status,
+      url,
+      headers,
+      data
+    };
+  }).catch(error => {
+    if (error instanceof requestError.RequestError) throw error;
+    throw new requestError.RequestError(error.message, 500, {
+      request: requestOptions
+    });
+  });
+}
+
+async function getResponseData(response) {
+  const contentType = response.headers.get("content-type");
+
+  if (/application\/json/.test(contentType)) {
+    return response.json();
+  }
+
+  if (!contentType || /^text\/|charset=utf-8$/.test(contentType)) {
+    return response.text();
+  }
+
+  return getBufferResponse(response);
+}
+
+function toErrorMessage(data) {
+  if (typeof data === "string") return data; // istanbul ignore else - just in case
+
+  if ("message" in data) {
+    if (Array.isArray(data.errors)) {
+      return `${data.message}: ${data.errors.map(JSON.stringify).join(", ")}`;
+    }
+
+    return data.message;
+  } // istanbul ignore next - just in case
+
+
+  return `Unknown error: ${JSON.stringify(data)}`;
+}
+
+function withDefaults(oldEndpoint, newDefaults) {
+  const endpoint = oldEndpoint.defaults(newDefaults);
+
+  const newApi = function (route, parameters) {
+    const endpointOptions = endpoint.merge(route, parameters);
+
+    if (!endpointOptions.request || !endpointOptions.request.hook) {
+      return fetchWrapper(endpoint.parse(endpointOptions));
+    }
+
+    const request = (route, parameters) => {
+      return fetchWrapper(endpoint.parse(endpoint.merge(route, parameters)));
+    };
+
+    Object.assign(request, {
+      endpoint,
+      defaults: withDefaults.bind(null, endpoint)
+    });
+    return endpointOptions.request.hook(request, endpointOptions);
+  };
+
+  return Object.assign(newApi, {
+    endpoint,
+    defaults: withDefaults.bind(null, endpoint)
+  });
+}
+
+const request = withDefaults(endpoint.endpoint, {
+  headers: {
+    "user-agent": `octokit-request.js/${VERSION} ${universalUserAgent.getUserAgent()}`
+  }
+});
+
+exports.request = request;
+//# sourceMappingURL=index.js.map
+
+
+/***/ }),
+
+/***/ 5526:
+/***/ (function(__unused_webpack_module, exports) {
+
+"use strict";
+
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+Object.defineProperty(exports, "__esModule", ({ value: true }));
+exports.PersonalAccessTokenCredentialHandler = exports.BearerCredentialHandler = exports.BasicCredentialHandler = void 0;
+class BasicCredentialHandler {
+    constructor(username, password) {
+        this.username = username;
+        this.password = password;
+    }
+    prepareRequest(options) {
+        if (!options.headers) {
+            throw Error('The request has no headers');
+        }
+        options.headers['Authorization'] = `Basic ${Buffer.from(`${this.username}:${this.password}`).toString('base64')}`;
+    }
+    // This handler cannot handle 401
+    canHandleAuthentication() {
+        return false;
+    }
+    handleAuthentication() {
+        return __awaiter(this, void 0, void 0, function* () {
+            throw new Error('not implemented');
+        });
+    }
+}
+exports.BasicCredentialHandler = BasicCredentialHandler;
+class BearerCredentialHandler {
+    constructor(token) {
+        this.token = token;
+    }
+    // currently implements pre-authorization
+    // TODO: support preAuth = false where it hooks on 401
+    prepareRequest(options) {
+        if (!options.headers) {
+            throw Error('The request has no headers');
+        }
+        options.headers['Authorization'] = `Bearer ${this.token}`;
+    }
+    // This handler cannot handle 401
+    canHandleAuthentication() {
+        return false;
+    }
+    handleAuthentication() {
+        return __awaiter(this, void 0, void 0, function* () {
+            throw new Error('not implemented');
+        });
+    }
+}
+exports.BearerCredentialHandler = BearerCredentialHandler;
+class PersonalAccessTokenCredentialHandler {
+    constructor(token) {
+        this.token = token;
+    }
+    // currently implements pre-authorization
+    // TODO: support preAuth = false where it hooks on 401
+    prepareRequest(options) {
+        if (!options.headers) {
+            throw Error('The request has no headers');
+        }
+        options.headers['Authorization'] = `Basic ${Buffer.from(`PAT:${this.token}`).toString('base64')}`;
+    }
+    // This handler cannot handle 401
+    canHandleAuthentication() {
+        return false;
+    }
+    handleAuthentication() {
+        return __awaiter(this, void 0, void 0, function* () {
+            throw new Error('not implemented');
+        });
+    }
+}
+exports.PersonalAccessTokenCredentialHandler = PersonalAccessTokenCredentialHandler;
+//# sourceMappingURL=auth.js.map
+
+/***/ }),
+
+/***/ 6255:
+/***/ (function(__unused_webpack_module, exports, __nccwpck_require__) {
+
+"use strict";
+
+/* eslint-disable @typescript-eslint/no-explicit-any */
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+Object.defineProperty(exports, "__esModule", ({ value: true }));
+exports.HttpClient = exports.isHttps = exports.HttpClientResponse = exports.HttpClientError = exports.getProxyUrl = exports.MediaTypes = exports.Headers = exports.HttpCodes = void 0;
+const http = __importStar(__nccwpck_require__(3685));
+const https = __importStar(__nccwpck_require__(5687));
+const pm = __importStar(__nccwpck_require__(9835));
+const tunnel = __importStar(__nccwpck_require__(4294));
+var HttpCodes;
+(function (HttpCodes) {
+    HttpCodes[HttpCodes["OK"] = 200] = "OK";
+    HttpCodes[HttpCodes["MultipleChoices"] = 300] = "MultipleChoices";
+    HttpCodes[HttpCodes["MovedPermanently"] = 301] = "MovedPermanently";
+    HttpCodes[HttpCodes["ResourceMoved"] = 302] = "ResourceMoved";
+    HttpCodes[HttpCodes["SeeOther"] = 303] = "SeeOther";
+    HttpCodes[HttpCodes["NotModified"] = 304] = "NotModified";
+    HttpCodes[HttpCodes["UseProxy"] = 305] = "UseProxy";
+    HttpCodes[HttpCodes["SwitchProxy"] = 306] = "SwitchProxy";
+    HttpCodes[HttpCodes["TemporaryRedirect"] = 307] = "TemporaryRedirect";
+    HttpCodes[HttpCodes["PermanentRedirect"] = 308] = "PermanentRedirect";
+    HttpCodes[HttpCodes["BadRequest"] = 400] = "BadRequest";
+    HttpCodes[HttpCodes["Unauthorized"] = 401] = "Unauthorized";
+    HttpCodes[HttpCodes["PaymentRequired"] = 402] = "PaymentRequired";
+    HttpCodes[HttpCodes["Forbidden"] = 403] = "Forbidden";
+    HttpCodes[HttpCodes["NotFound"] = 404] = "NotFound";
+    HttpCodes[HttpCodes["MethodNotAllowed"] = 405] = "MethodNotAllowed";
+    HttpCodes[HttpCodes["NotAcceptable"] = 406] = "NotAcceptable";
+    HttpCodes[HttpCodes["ProxyAuthenticationRequired"] = 407] = "ProxyAuthenticationRequired";
+    HttpCodes[HttpCodes["RequestTimeout"] = 408] = "RequestTimeout";
+    HttpCodes[HttpCodes["Conflict"] = 409] = "Conflict";
+    HttpCodes[HttpCodes["Gone"] = 410] = "Gone";
+    HttpCodes[HttpCodes["TooManyRequests"] = 429] = "TooManyRequests";
+    HttpCodes[HttpCodes["InternalServerError"] = 500] = "InternalServerError";
+    HttpCodes[HttpCodes["NotImplemented"] = 501] = "NotImplemented";
+    HttpCodes[HttpCodes["BadGateway"] = 502] = "BadGateway";
+    HttpCodes[HttpCodes["ServiceUnavailable"] = 503] = "ServiceUnavailable";
+    HttpCodes[HttpCodes["GatewayTimeout"] = 504] = "GatewayTimeout";
+})(HttpCodes = exports.HttpCodes || (exports.HttpCodes = {}));
+var Headers;
+(function (Headers) {
+    Headers["Accept"] = "accept";
+    Headers["ContentType"] = "content-type";
+})(Headers = exports.Headers || (exports.Headers = {}));
+var MediaTypes;
+(function (MediaTypes) {
+    MediaTypes["ApplicationJson"] = "application/json";
+})(MediaTypes = exports.MediaTypes || (exports.MediaTypes = {}));
+/**
+ * Returns the proxy URL, depending upon the supplied url and proxy environment variables.
+ * @param serverUrl  The server URL where the request will be sent. For example, https://api.github.com
+ */
+function getProxyUrl(serverUrl) {
+    const proxyUrl = pm.getProxyUrl(new URL(serverUrl));
+    return proxyUrl ? proxyUrl.href : '';
+}
+exports.getProxyUrl = getProxyUrl;
+const HttpRedirectCodes = [
+    HttpCodes.MovedPermanently,
+    HttpCodes.ResourceMoved,
+    HttpCodes.SeeOther,
+    HttpCodes.TemporaryRedirect,
+    HttpCodes.PermanentRedirect
+];
+const HttpResponseRetryCodes = [
+    HttpCodes.BadGateway,
+    HttpCodes.ServiceUnavailable,
+    HttpCodes.GatewayTimeout
+];
+const RetryableHttpVerbs = ['OPTIONS', 'GET', 'DELETE', 'HEAD'];
+const ExponentialBackoffCeiling = 10;
+const ExponentialBackoffTimeSlice = 5;
+class HttpClientError extends Error {
+    constructor(message, statusCode) {
+        super(message);
+        this.name = 'HttpClientError';
+        this.statusCode = statusCode;
+        Object.setPrototypeOf(this, HttpClientError.prototype);
+    }
+}
+exports.HttpClientError = HttpClientError;
+class HttpClientResponse {
+    constructor(message) {
+        this.message = message;
+    }
+    readBody() {
+        return __awaiter(this, void 0, void 0, function* () {
+            return new Promise((resolve) => __awaiter(this, void 0, void 0, function* () {
+                let output = Buffer.alloc(0);
+                this.message.on('data', (chunk) => {
+                    output = Buffer.concat([output, chunk]);
+                });
+                this.message.on('end', () => {
+                    resolve(output.toString());
+                });
+            }));
+        });
+    }
+}
+exports.HttpClientResponse = HttpClientResponse;
+function isHttps(requestUrl) {
+    const parsedUrl = new URL(requestUrl);
+    return parsedUrl.protocol === 'https:';
+}
+exports.isHttps = isHttps;
+class HttpClient {
+    constructor(userAgent, handlers, requestOptions) {
+        this._ignoreSslError = false;
+        this._allowRedirects = true;
+        this._allowRedirectDowngrade = false;
+        this._maxRedirects = 50;
+        this._allowRetries = false;
+        this._maxRetries = 1;
+        this._keepAlive = false;
+        this._disposed = false;
+        this.userAgent = userAgent;
+        this.handlers = handlers || [];
+        this.requestOptions = requestOptions;
+        if (requestOptions) {
+            if (requestOptions.ignoreSslError != null) {
+                this._ignoreSslError = requestOptions.ignoreSslError;
+            }
+            this._socketTimeout = requestOptions.socketTimeout;
+            if (requestOptions.allowRedirects != null) {
+                this._allowRedirects = requestOptions.allowRedirects;
+            }
+            if (requestOptions.allowRedirectDowngrade != null) {
+                this._allowRedirectDowngrade = requestOptions.allowRedirectDowngrade;
+            }
+            if (requestOptions.maxRedirects != null) {
+                this._maxRedirects = Math.max(requestOptions.maxRedirects, 0);
+            }
+            if (requestOptions.keepAlive != null) {
+                this._keepAlive = requestOptions.keepAlive;
+            }
+            if (requestOptions.allowRetries != null) {
+                this._allowRetries = requestOptions.allowRetries;
+            }
+            if (requestOptions.maxRetries != null) {
+                this._maxRetries = requestOptions.maxRetries;
+            }
+        }
+    }
+    options(requestUrl, additionalHeaders) {
+        return __awaiter(this, void 0, void 0, function* () {
+            return this.request('OPTIONS', requestUrl, null, additionalHeaders || {});
+        });
+    }
+    get(requestUrl, additionalHeaders) {
+        return __awaiter(this, void 0, void 0, function* () {
+            return this.request('GET', requestUrl, null, additionalHeaders || {});
+        });
+    }
+    del(requestUrl, additionalHeaders) {
+        return __awaiter(this, void 0, void 0, function* () {
+            return this.request('DELETE', requestUrl, null, additionalHeaders || {});
+        });
+    }
+    post(requestUrl, data, additionalHeaders) {
+        return __awaiter(this, void 0, void 0, function* () {
+            return this.request('POST', requestUrl, data, additionalHeaders || {});
+        });
+    }
+    patch(requestUrl, data, additionalHeaders) {
+        return __awaiter(this, void 0, void 0, function* () {
+            return this.request('PATCH', requestUrl, data, additionalHeaders || {});
+        });
+    }
+    put(requestUrl, data, additionalHeaders) {
+        return __awaiter(this, void 0, void 0, function* () {
+            return this.request('PUT', requestUrl, data, additionalHeaders || {});
+        });
+    }
+    head(requestUrl, additionalHeaders) {
+        return __awaiter(this, void 0, void 0, function* () {
+            return this.request('HEAD', requestUrl, null, additionalHeaders || {});
+        });
+    }
+    sendStream(verb, requestUrl, stream, additionalHeaders) {
+        return __awaiter(this, void 0, void 0, function* () {
+            return this.request(verb, requestUrl, stream, additionalHeaders);
+        });
+    }
+    /**
+     * Gets a typed object from an endpoint
+     * Be aware that not found returns a null.  Other errors (4xx, 5xx) reject the promise
+     */
+    getJson(requestUrl, additionalHeaders = {}) {
+        return __awaiter(this, void 0, void 0, function* () {
+            additionalHeaders[Headers.Accept] = this._getExistingOrDefaultHeader(additionalHeaders, Headers.Accept, MediaTypes.ApplicationJson);
+            const res = yield this.get(requestUrl, additionalHeaders);
+            return this._processResponse(res, this.requestOptions);
+        });
+    }
+    postJson(requestUrl, obj, additionalHeaders = {}) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const data = JSON.stringify(obj, null, 2);
+            additionalHeaders[Headers.Accept] = this._getExistingOrDefaultHeader(additionalHeaders, Headers.Accept, MediaTypes.ApplicationJson);
+            additionalHeaders[Headers.ContentType] = this._getExistingOrDefaultHeader(additionalHeaders, Headers.ContentType, MediaTypes.ApplicationJson);
+            const res = yield this.post(requestUrl, data, additionalHeaders);
+            return this._processResponse(res, this.requestOptions);
+        });
+    }
+    putJson(requestUrl, obj, additionalHeaders = {}) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const data = JSON.stringify(obj, null, 2);
+            additionalHeaders[Headers.Accept] = this._getExistingOrDefaultHeader(additionalHeaders, Headers.Accept, MediaTypes.ApplicationJson);
+            additionalHeaders[Headers.ContentType] = this._getExistingOrDefaultHeader(additionalHeaders, Headers.ContentType, MediaTypes.ApplicationJson);
+            const res = yield this.put(requestUrl, data, additionalHeaders);
+            return this._processResponse(res, this.requestOptions);
+        });
+    }
+    patchJson(requestUrl, obj, additionalHeaders = {}) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const data = JSON.stringify(obj, null, 2);
+            additionalHeaders[Headers.Accept] = this._getExistingOrDefaultHeader(additionalHeaders, Headers.Accept, MediaTypes.ApplicationJson);
+            additionalHeaders[Headers.ContentType] = this._getExistingOrDefaultHeader(additionalHeaders, Headers.ContentType, MediaTypes.ApplicationJson);
+            const res = yield this.patch(requestUrl, data, additionalHeaders);
+            return this._processResponse(res, this.requestOptions);
+        });
+    }
+    /**
+     * Makes a raw http request.
+     * All other methods such as get, post, patch, and request ultimately call this.
+     * Prefer get, del, post and patch
+     */
+    request(verb, requestUrl, data, headers) {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (this._disposed) {
+                throw new Error('Client has already been disposed.');
+            }
+            const parsedUrl = new URL(requestUrl);
+            let info = this._prepareRequest(verb, parsedUrl, headers);
+            // Only perform retries on reads since writes may not be idempotent.
+            const maxTries = this._allowRetries && RetryableHttpVerbs.includes(verb)
+                ? this._maxRetries + 1
+                : 1;
+            let numTries = 0;
+            let response;
+            do {
+                response = yield this.requestRaw(info, data);
+                // Check if it's an authentication challenge
+                if (response &&
+                    response.message &&
+                    response.message.statusCode === HttpCodes.Unauthorized) {
+                    let authenticationHandler;
+                    for (const handler of this.handlers) {
+                        if (handler.canHandleAuthentication(response)) {
+                            authenticationHandler = handler;
+                            break;
+                        }
+                    }
+                    if (authenticationHandler) {
+                        return authenticationHandler.handleAuthentication(this, info, data);
+                    }
+                    else {
+                        // We have received an unauthorized response but have no handlers to handle it.
+                        // Let the response return to the caller.
+                        return response;
+                    }
+                }
+                let redirectsRemaining = this._maxRedirects;
+                while (response.message.statusCode &&
+                    HttpRedirectCodes.includes(response.message.statusCode) &&
+                    this._allowRedirects &&
+                    redirectsRemaining > 0) {
+                    const redirectUrl = response.message.headers['location'];
+                    if (!redirectUrl) {
+                        // if there's no location to redirect to, we won't
+                        break;
+                    }
+                    const parsedRedirectUrl = new URL(redirectUrl);
+                    if (parsedUrl.protocol === 'https:' &&
+                        parsedUrl.protocol !== parsedRedirectUrl.protocol &&
+                        !this._allowRedirectDowngrade) {
+                        throw new Error('Redirect from HTTPS to HTTP protocol. This downgrade is not allowed for security reasons. If you want to allow this behavior, set the allowRedirectDowngrade option to true.');
+                    }
+                    // we need to finish reading the response before reassigning response
+                    // which will leak the open socket.
+                    yield response.readBody();
+                    // strip authorization header if redirected to a different hostname
+                    if (parsedRedirectUrl.hostname !== parsedUrl.hostname) {
+                        for (const header in headers) {
+                            // header names are case insensitive
+                            if (header.toLowerCase() === 'authorization') {
+                                delete headers[header];
+                            }
+                        }
+                    }
+                    // let's make the request with the new redirectUrl
+                    info = this._prepareRequest(verb, parsedRedirectUrl, headers);
+                    response = yield this.requestRaw(info, data);
+                    redirectsRemaining--;
+                }
+                if (!response.message.statusCode ||
+                    !HttpResponseRetryCodes.includes(response.message.statusCode)) {
+                    // If not a retry code, return immediately instead of retrying
+                    return response;
+                }
+                numTries += 1;
+                if (numTries < maxTries) {
+                    yield response.readBody();
+                    yield this._performExponentialBackoff(numTries);
+                }
+            } while (numTries < maxTries);
+            return response;
+        });
+    }
+    /**
+     * Needs to be called if keepAlive is set to true in request options.
+     */
+    dispose() {
+        if (this._agent) {
+            this._agent.destroy();
+        }
+        this._disposed = true;
+    }
+    /**
+     * Raw request.
+     * @param info
+     * @param data
+     */
+    requestRaw(info, data) {
+        return __awaiter(this, void 0, void 0, function* () {
+            return new Promise((resolve, reject) => {
+                function callbackForResult(err, res) {
+                    if (err) {
+                        reject(err);
+                    }
+                    else if (!res) {
+                        // If `err` is not passed, then `res` must be passed.
+                        reject(new Error('Unknown error'));
+                    }
+                    else {
+                        resolve(res);
+                    }
+                }
+                this.requestRawWithCallback(info, data, callbackForResult);
+            });
+        });
+    }
+    /**
+     * Raw request with callback.
+     * @param info
+     * @param data
+     * @param onResult
+     */
+    requestRawWithCallback(info, data, onResult) {
+        if (typeof data === 'string') {
+            if (!info.options.headers) {
+                info.options.headers = {};
+            }
+            info.options.headers['Content-Length'] = Buffer.byteLength(data, 'utf8');
+        }
+        let callbackCalled = false;
+        function handleResult(err, res) {
+            if (!callbackCalled) {
+                callbackCalled = true;
+                onResult(err, res);
+            }
+        }
+        const req = info.httpModule.request(info.options, (msg) => {
+            const res = new HttpClientResponse(msg);
+            handleResult(undefined, res);
+        });
+        let socket;
+        req.on('socket', sock => {
+            socket = sock;
+        });
+        // If we ever get disconnected, we want the socket to timeout eventually
+        req.setTimeout(this._socketTimeout || 3 * 60000, () => {
+            if (socket) {
+                socket.end();
+            }
+            handleResult(new Error(`Request timeout: ${info.options.path}`));
+        });
+        req.on('error', function (err) {
+            // err has statusCode property
+            // res should have headers
+            handleResult(err);
+        });
+        if (data && typeof data === 'string') {
+            req.write(data, 'utf8');
+        }
+        if (data && typeof data !== 'string') {
+            data.on('close', function () {
+                req.end();
+            });
+            data.pipe(req);
+        }
+        else {
+            req.end();
+        }
+    }
+    /**
+     * Gets an http agent. This function is useful when you need an http agent that handles
+     * routing through a proxy server - depending upon the url and proxy environment variables.
+     * @param serverUrl  The server URL where the request will be sent. For example, https://api.github.com
+     */
+    getAgent(serverUrl) {
+        const parsedUrl = new URL(serverUrl);
+        return this._getAgent(parsedUrl);
+    }
+    _prepareRequest(method, requestUrl, headers) {
+        const info = {};
+        info.parsedUrl = requestUrl;
+        const usingSsl = info.parsedUrl.protocol === 'https:';
+        info.httpModule = usingSsl ? https : http;
+        const defaultPort = usingSsl ? 443 : 80;
+        info.options = {};
+        info.options.host = info.parsedUrl.hostname;
+        info.options.port = info.parsedUrl.port
+            ? parseInt(info.parsedUrl.port)
+            : defaultPort;
+        info.options.path =
+            (info.parsedUrl.pathname || '') + (info.parsedUrl.search || '');
+        info.options.method = method;
+        info.options.headers = this._mergeHeaders(headers);
+        if (this.userAgent != null) {
+            info.options.headers['user-agent'] = this.userAgent;
+        }
+        info.options.agent = this._getAgent(info.parsedUrl);
+        // gives handlers an opportunity to participate
+        if (this.handlers) {
+            for (const handler of this.handlers) {
+                handler.prepareRequest(info.options);
+            }
+        }
+        return info;
+    }
+    _mergeHeaders(headers) {
+        if (this.requestOptions && this.requestOptions.headers) {
+            return Object.assign({}, lowercaseKeys(this.requestOptions.headers), lowercaseKeys(headers || {}));
+        }
+        return lowercaseKeys(headers || {});
+    }
+    _getExistingOrDefaultHeader(additionalHeaders, header, _default) {
+        let clientHeader;
+        if (this.requestOptions && this.requestOptions.headers) {
+            clientHeader = lowercaseKeys(this.requestOptions.headers)[header];
+        }
+        return additionalHeaders[header] || clientHeader || _default;
+    }
+    _getAgent(parsedUrl) {
+        let agent;
+        const proxyUrl = pm.getProxyUrl(parsedUrl);
+        const useProxy = proxyUrl && proxyUrl.hostname;
+        if (this._keepAlive && useProxy) {
+            agent = this._proxyAgent;
+        }
+        if (this._keepAlive && !useProxy) {
+            agent = this._agent;
+        }
+        // if agent is already assigned use that agent.
+        if (agent) {
+            return agent;
+        }
+        const usingSsl = parsedUrl.protocol === 'https:';
+        let maxSockets = 100;
+        if (this.requestOptions) {
+            maxSockets = this.requestOptions.maxSockets || http.globalAgent.maxSockets;
+        }
+        // This is `useProxy` again, but we need to check `proxyURl` directly for TypeScripts's flow analysis.
+        if (proxyUrl && proxyUrl.hostname) {
+            const agentOptions = {
+                maxSockets,
+                keepAlive: this._keepAlive,
+                proxy: Object.assign(Object.assign({}, ((proxyUrl.username || proxyUrl.password) && {
+                    proxyAuth: `${proxyUrl.username}:${proxyUrl.password}`
+                })), { host: proxyUrl.hostname, port: proxyUrl.port })
+            };
+            let tunnelAgent;
+            const overHttps = proxyUrl.protocol === 'https:';
+            if (usingSsl) {
+                tunnelAgent = overHttps ? tunnel.httpsOverHttps : tunnel.httpsOverHttp;
+            }
+            else {
+                tunnelAgent = overHttps ? tunnel.httpOverHttps : tunnel.httpOverHttp;
+            }
+            agent = tunnelAgent(agentOptions);
+            this._proxyAgent = agent;
+        }
+        // if reusing agent across request and tunneling agent isn't assigned create a new agent
+        if (this._keepAlive && !agent) {
+            const options = { keepAlive: this._keepAlive, maxSockets };
+            agent = usingSsl ? new https.Agent(options) : new http.Agent(options);
+            this._agent = agent;
+        }
+        // if not using private agent and tunnel agent isn't setup then use global agent
+        if (!agent) {
+            agent = usingSsl ? https.globalAgent : http.globalAgent;
+        }
+        if (usingSsl && this._ignoreSslError) {
+            // we don't want to set NODE_TLS_REJECT_UNAUTHORIZED=0 since that will affect request for entire process
+            // http.RequestOptions doesn't expose a way to modify RequestOptions.agent.options
+            // we have to cast it to any and change it directly
+            agent.options = Object.assign(agent.options || {}, {
+                rejectUnauthorized: false
+            });
+        }
+        return agent;
+    }
+    _performExponentialBackoff(retryNumber) {
+        return __awaiter(this, void 0, void 0, function* () {
+            retryNumber = Math.min(ExponentialBackoffCeiling, retryNumber);
+            const ms = ExponentialBackoffTimeSlice * Math.pow(2, retryNumber);
+            return new Promise(resolve => setTimeout(() => resolve(), ms));
+        });
+    }
+    _processResponse(res, options) {
+        return __awaiter(this, void 0, void 0, function* () {
+            return new Promise((resolve, reject) => __awaiter(this, void 0, void 0, function* () {
+                const statusCode = res.message.statusCode || 0;
+                const response = {
+                    statusCode,
+                    result: null,
+                    headers: {}
+                };
+                // not found leads to null obj returned
+                if (statusCode === HttpCodes.NotFound) {
+                    resolve(response);
+                }
+                // get the result from the body
+                function dateTimeDeserializer(key, value) {
+                    if (typeof value === 'string') {
+                        const a = new Date(value);
+                        if (!isNaN(a.valueOf())) {
+                            return a;
+                        }
+                    }
+                    return value;
+                }
+                let obj;
+                let contents;
+                try {
+                    contents = yield res.readBody();
+                    if (contents && contents.length > 0) {
+                        if (options && options.deserializeDates) {
+                            obj = JSON.parse(contents, dateTimeDeserializer);
+                        }
+                        else {
+                            obj = JSON.parse(contents);
+                        }
+                        response.result = obj;
+                    }
+                    response.headers = res.message.headers;
+                }
+                catch (err) {
+                    // Invalid resource (contents not json);  leaving result obj null
+                }
+                // note that 3xx redirects are handled by the http layer.
+                if (statusCode > 299) {
+                    let msg;
+                    // if exception/error in body, attempt to get better error
+                    if (obj && obj.message) {
+                        msg = obj.message;
+                    }
+                    else if (contents && contents.length > 0) {
+                        // it may be the case that the exception is in the body message as string
+                        msg = contents;
+                    }
+                    else {
+                        msg = `Failed request: (${statusCode})`;
+                    }
+                    const err = new HttpClientError(msg, statusCode);
+                    err.result = response.result;
+                    reject(err);
+                }
+                else {
+                    resolve(response);
+                }
+            }));
+        });
+    }
+}
+exports.HttpClient = HttpClient;
+const lowercaseKeys = (obj) => Object.keys(obj).reduce((c, k) => ((c[k.toLowerCase()] = obj[k]), c), {});
+//# sourceMappingURL=index.js.map
+
+/***/ }),
+
+/***/ 9835:
+/***/ ((__unused_webpack_module, exports) => {
+
+"use strict";
+
+Object.defineProperty(exports, "__esModule", ({ value: true }));
+exports.checkBypass = exports.getProxyUrl = void 0;
+function getProxyUrl(reqUrl) {
+    const usingSsl = reqUrl.protocol === 'https:';
+    if (checkBypass(reqUrl)) {
+        return undefined;
+    }
+    const proxyVar = (() => {
+        if (usingSsl) {
+            return process.env['https_proxy'] || process.env['HTTPS_PROXY'];
+        }
+        else {
+            return process.env['http_proxy'] || process.env['HTTP_PROXY'];
+        }
+    })();
+    if (proxyVar) {
+        return new URL(proxyVar);
+    }
+    else {
+        return undefined;
+    }
+}
+exports.getProxyUrl = getProxyUrl;
+function checkBypass(reqUrl) {
+    if (!reqUrl.hostname) {
+        return false;
+    }
+    const noProxy = process.env['no_proxy'] || process.env['NO_PROXY'] || '';
+    if (!noProxy) {
+        return false;
+    }
+    // Determine the request port
+    let reqPort;
+    if (reqUrl.port) {
+        reqPort = Number(reqUrl.port);
+    }
+    else if (reqUrl.protocol === 'http:') {
+        reqPort = 80;
+    }
+    else if (reqUrl.protocol === 'https:') {
+        reqPort = 443;
+    }
+    // Format the request hostname and hostname with port
+    const upperReqHosts = [reqUrl.hostname.toUpperCase()];
+    if (typeof reqPort === 'number') {
+        upperReqHosts.push(`${upperReqHosts[0]}:${reqPort}`);
+    }
+    // Compare request host against noproxy
+    for (const upperNoProxyItem of noProxy
+        .split(',')
+        .map(x => x.trim().toUpperCase())
+        .filter(x => x)) {
+        if (upperReqHosts.some(x => x === upperNoProxyItem)) {
+            return true;
+        }
+    }
+    return false;
+}
+exports.checkBypass = checkBypass;
+//# sourceMappingURL=proxy.js.map
+
+/***/ }),
+
+/***/ 4193:
+/***/ ((__unused_webpack_module, exports) => {
+
+"use strict";
+
+
+Object.defineProperty(exports, "__esModule", ({ value: true }));
+
+const VERSION = "3.1.0";
+
+/**
+ * Some “list” response that can be paginated have a different response structure
+ *
+ * They have a `total_count` key in the response (search also has `incomplete_results`,
+ * /installation/repositories also has `repository_selection`), as well as a key with
+ * the list of the items which name varies from endpoint to endpoint.
+ *
+ * Octokit normalizes these responses so that paginated results are always returned following
+ * the same structure. One challenge is that if the list response has only one page, no Link
+ * header is provided, so this header alone is not sufficient to check wether a response is
+ * paginated or not.
+ *
+ * We check if a "total_count" key is present in the response data, but also make sure that
+ * a "url" property is not, as the "Get the combined status for a specific ref" endpoint would
+ * otherwise match: https://developer.github.com/v3/repos/statuses/#get-the-combined-status-for-a-specific-ref
+ */
+function normalizePaginatedListResponse(response) {
+  // endpoints can respond with 204 if repository is empty
+  if (!response.data) {
+    return { ...response,
+      data: []
+    };
+  }
+
+  const responseNeedsNormalization = "total_count" in response.data && !("url" in response.data);
+  if (!responseNeedsNormalization) return response; // keep the additional properties intact as there is currently no other way
+  // to retrieve the same information.
+
+  const incompleteResults = response.data.incomplete_results;
+  const repositorySelection = response.data.repository_selection;
+  const totalCount = response.data.total_count;
+  delete response.data.incomplete_results;
+  delete response.data.repository_selection;
+  delete response.data.total_count;
+  const namespaceKey = Object.keys(response.data)[0];
+  const data = response.data[namespaceKey];
+  response.data = data;
+
+  if (typeof incompleteResults !== "undefined") {
+    response.data.incomplete_results = incompleteResults;
+  }
+
+  if (typeof repositorySelection !== "undefined") {
+    response.data.repository_selection = repositorySelection;
+  }
+
+  response.data.total_count = totalCount;
+  return response;
+}
+
+function iterator(octokit, route, parameters) {
+  const options = typeof route === "function" ? route.endpoint(parameters) : octokit.request.endpoint(route, parameters);
+  const requestMethod = typeof route === "function" ? route : octokit.request;
+  const method = options.method;
+  const headers = options.headers;
+  let url = options.url;
+  return {
+    [Symbol.asyncIterator]: () => ({
+      async next() {
+        if (!url) return {
+          done: true
+        };
+
+        try {
+          const response = await requestMethod({
+            method,
+            url,
+            headers
+          });
+          const normalizedResponse = normalizePaginatedListResponse(response); // `response.headers.link` format:
+          // '<https://api.github.com/users/aseemk/followers?page=2>; rel="next", <https://api.github.com/users/aseemk/followers?page=2>; rel="last"'
+          // sets `url` to undefined if "next" URL is not present or `link` header is not set
+
+          url = ((normalizedResponse.headers.link || "").match(/<([^>]+)>;\s*rel="next"/) || [])[1];
+          return {
+            value: normalizedResponse
+          };
+        } catch (error) {
+          if (error.status !== 409) throw error;
+          url = "";
+          return {
+            value: {
+              status: 200,
+              headers: {},
+              data: []
+            }
+          };
+        }
+      }
+
+    })
+  };
+}
+
+function paginate(octokit, route, parameters, mapFn) {
+  if (typeof parameters === "function") {
+    mapFn = parameters;
+    parameters = undefined;
+  }
+
+  return gather(octokit, [], iterator(octokit, route, parameters)[Symbol.asyncIterator](), mapFn);
+}
+
+function gather(octokit, results, iterator, mapFn) {
+  return iterator.next().then(result => {
+    if (result.done) {
+      return results;
+    }
+
+    let earlyExit = false;
+
+    function done() {
+      earlyExit = true;
+    }
+
+    results = results.concat(mapFn ? mapFn(result.value, done) : result.value.data);
+
+    if (earlyExit) {
+      return results;
+    }
+
+    return gather(octokit, results, iterator, mapFn);
+  });
+}
+
+const composePaginateRest = Object.assign(paginate, {
+  iterator
+});
+
+const paginatingEndpoints = ["GET /app/hook/deliveries", "GET /app/installations", "GET /applications/grants", "GET /authorizations", "GET /enterprises/{enterprise}/actions/permissions/organizations", "GET /enterprises/{enterprise}/actions/runner-groups", "GET /enterprises/{enterprise}/actions/runner-groups/{runner_group_id}/organizations", "GET /enterprises/{enterprise}/actions/runner-groups/{runner_group_id}/runners", "GET /enterprises/{enterprise}/actions/runners", "GET /enterprises/{enterprise}/audit-log", "GET /enterprises/{enterprise}/code-scanning/alerts", "GET /enterprises/{enterprise}/secret-scanning/alerts", "GET /enterprises/{enterprise}/settings/billing/advanced-security", "GET /events", "GET /gists", "GET /gists/public", "GET /gists/starred", "GET /gists/{gist_id}/comments", "GET /gists/{gist_id}/commits", "GET /gists/{gist_id}/forks", "GET /installation/repositories", "GET /issues", "GET /licenses", "GET /marketplace_listing/plans", "GET /marketplace_listing/plans/{plan_id}/accounts", "GET /marketplace_listing/stubbed/plans", "GET /marketplace_listing/stubbed/plans/{plan_id}/accounts", "GET /networks/{owner}/{repo}/events", "GET /notifications", "GET /organizations", "GET /orgs/{org}/actions/cache/usage-by-repository", "GET /orgs/{org}/actions/permissions/repositories", "GET /orgs/{org}/actions/runner-groups", "GET /orgs/{org}/actions/runner-groups/{runner_group_id}/repositories", "GET /orgs/{org}/actions/runner-groups/{runner_group_id}/runners", "GET /orgs/{org}/actions/runners", "GET /orgs/{org}/actions/secrets", "GET /orgs/{org}/actions/secrets/{secret_name}/repositories", "GET /orgs/{org}/audit-log", "GET /orgs/{org}/blocks", "GET /orgs/{org}/code-scanning/alerts", "GET /orgs/{org}/codespaces", "GET /orgs/{org}/credential-authorizations", "GET /orgs/{org}/dependabot/secrets", "GET /orgs/{org}/dependabot/secrets/{secret_name}/repositories", "GET /orgs/{org}/events", "GET /orgs/{org}/external-groups", "GET /orgs/{org}/failed_invitations", "GET /orgs/{org}/hooks", "GET /orgs/{org}/hooks/{hook_id}/deliveries", "GET /orgs/{org}/installations", "GET /orgs/{org}/invitations", "GET /orgs/{org}/invitations/{invitation_id}/teams", "GET /orgs/{org}/issues", "GET /orgs/{org}/members", "GET /orgs/{org}/migrations", "GET /orgs/{org}/migrations/{migration_id}/repositories", "GET /orgs/{org}/outside_collaborators", "GET /orgs/{org}/packages", "GET /orgs/{org}/packages/{package_type}/{package_name}/versions", "GET /orgs/{org}/projects", "GET /orgs/{org}/public_members", "GET /orgs/{org}/repos", "GET /orgs/{org}/secret-scanning/alerts", "GET /orgs/{org}/settings/billing/advanced-security", "GET /orgs/{org}/team-sync/groups", "GET /orgs/{org}/teams", "GET /orgs/{org}/teams/{team_slug}/discussions", "GET /orgs/{org}/teams/{team_slug}/discussions/{discussion_number}/comments", "GET /orgs/{org}/teams/{team_slug}/discussions/{discussion_number}/comments/{comment_number}/reactions", "GET /orgs/{org}/teams/{team_slug}/discussions/{discussion_number}/reactions", "GET /orgs/{org}/teams/{team_slug}/invitations", "GET /orgs/{org}/teams/{team_slug}/members", "GET /orgs/{org}/teams/{team_slug}/projects", "GET /orgs/{org}/teams/{team_slug}/repos", "GET /orgs/{org}/teams/{team_slug}/teams", "GET /projects/columns/{column_id}/cards", "GET /projects/{project_id}/collaborators", "GET /projects/{project_id}/columns", "GET /repos/{owner}/{repo}/actions/artifacts", "GET /repos/{owner}/{repo}/actions/caches", "GET /repos/{owner}/{repo}/actions/runners", "GET /repos/{owner}/{repo}/actions/runs", "GET /repos/{owner}/{repo}/actions/runs/{run_id}/artifacts", "GET /repos/{owner}/{repo}/actions/runs/{run_id}/attempts/{attempt_number}/jobs", "GET /repos/{owner}/{repo}/actions/runs/{run_id}/jobs", "GET /repos/{owner}/{repo}/actions/secrets", "GET /repos/{owner}/{repo}/actions/workflows", "GET /repos/{owner}/{repo}/actions/workflows/{workflow_id}/runs", "GET /repos/{owner}/{repo}/assignees", "GET /repos/{owner}/{repo}/branches", "GET /repos/{owner}/{repo}/check-runs/{check_run_id}/annotations", "GET /repos/{owner}/{repo}/check-suites/{check_suite_id}/check-runs", "GET /repos/{owner}/{repo}/code-scanning/alerts", "GET /repos/{owner}/{repo}/code-scanning/alerts/{alert_number}/instances", "GET /repos/{owner}/{repo}/code-scanning/analyses", "GET /repos/{owner}/{repo}/codespaces", "GET /repos/{owner}/{repo}/codespaces/devcontainers", "GET /repos/{owner}/{repo}/codespaces/secrets", "GET /repos/{owner}/{repo}/collaborators", "GET /repos/{owner}/{repo}/comments", "GET /repos/{owner}/{repo}/comments/{comment_id}/reactions", "GET /repos/{owner}/{repo}/commits", "GET /repos/{owner}/{repo}/commits/{commit_sha}/comments", "GET /repos/{owner}/{repo}/commits/{commit_sha}/pulls", "GET /repos/{owner}/{repo}/commits/{ref}/check-runs", "GET /repos/{owner}/{repo}/commits/{ref}/check-suites", "GET /repos/{owner}/{repo}/commits/{ref}/status", "GET /repos/{owner}/{repo}/commits/{ref}/statuses", "GET /repos/{owner}/{repo}/contributors", "GET /repos/{owner}/{repo}/dependabot/secrets", "GET /repos/{owner}/{repo}/deployments", "GET /repos/{owner}/{repo}/deployments/{deployment_id}/statuses", "GET /repos/{owner}/{repo}/environments", "GET /repos/{owner}/{repo}/events", "GET /repos/{owner}/{repo}/forks", "GET /repos/{owner}/{repo}/git/matching-refs/{ref}", "GET /repos/{owner}/{repo}/hooks", "GET /repos/{owner}/{repo}/hooks/{hook_id}/deliveries", "GET /repos/{owner}/{repo}/invitations", "GET /repos/{owner}/{repo}/issues", "GET /repos/{owner}/{repo}/issues/comments", "GET /repos/{owner}/{repo}/issues/comments/{comment_id}/reactions", "GET /repos/{owner}/{repo}/issues/events", "GET /repos/{owner}/{repo}/issues/{issue_number}/comments", "GET /repos/{owner}/{repo}/issues/{issue_number}/events", "GET /repos/{owner}/{repo}/issues/{issue_number}/labels", "GET /repos/{owner}/{repo}/issues/{issue_number}/reactions", "GET /repos/{owner}/{repo}/issues/{issue_number}/timeline", "GET /repos/{owner}/{repo}/keys", "GET /repos/{owner}/{repo}/labels", "GET /repos/{owner}/{repo}/milestones", "GET /repos/{owner}/{repo}/milestones/{milestone_number}/labels", "GET /repos/{owner}/{repo}/notifications", "GET /repos/{owner}/{repo}/pages/builds", "GET /repos/{owner}/{repo}/projects", "GET /repos/{owner}/{repo}/pulls", "GET /repos/{owner}/{repo}/pulls/comments", "GET /repos/{owner}/{repo}/pulls/comments/{comment_id}/reactions", "GET /repos/{owner}/{repo}/pulls/{pull_number}/comments", "GET /repos/{owner}/{repo}/pulls/{pull_number}/commits", "GET /repos/{owner}/{repo}/pulls/{pull_number}/files", "GET /repos/{owner}/{repo}/pulls/{pull_number}/requested_reviewers", "GET /repos/{owner}/{repo}/pulls/{pull_number}/reviews", "GET /repos/{owner}/{repo}/pulls/{pull_number}/reviews/{review_id}/comments", "GET /repos/{owner}/{repo}/releases", "GET /repos/{owner}/{repo}/releases/{release_id}/assets", "GET /repos/{owner}/{repo}/releases/{release_id}/reactions", "GET /repos/{owner}/{repo}/secret-scanning/alerts", "GET /repos/{owner}/{repo}/secret-scanning/alerts/{alert_number}/locations", "GET /repos/{owner}/{repo}/stargazers", "GET /repos/{owner}/{repo}/subscribers", "GET /repos/{owner}/{repo}/tags", "GET /repos/{owner}/{repo}/teams", "GET /repos/{owner}/{repo}/topics", "GET /repositories", "GET /repositories/{repository_id}/environments/{environment_name}/secrets", "GET /search/code", "GET /search/commits", "GET /search/issues", "GET /search/labels", "GET /search/repositories", "GET /search/topics", "GET /search/users", "GET /teams/{team_id}/discussions", "GET /teams/{team_id}/discussions/{discussion_number}/comments", "GET /teams/{team_id}/discussions/{discussion_number}/comments/{comment_number}/reactions", "GET /teams/{team_id}/discussions/{discussion_number}/reactions", "GET /teams/{team_id}/invitations", "GET /teams/{team_id}/members", "GET /teams/{team_id}/projects", "GET /teams/{team_id}/repos", "GET /teams/{team_id}/teams", "GET /user/blocks", "GET /user/codespaces", "GET /user/codespaces/secrets", "GET /user/emails", "GET /user/followers", "GET /user/following", "GET /user/gpg_keys", "GET /user/installations", "GET /user/installations/{installation_id}/repositories", "GET /user/issues", "GET /user/keys", "GET /user/marketplace_purchases", "GET /user/marketplace_purchases/stubbed", "GET /user/memberships/orgs", "GET /user/migrations", "GET /user/migrations/{migration_id}/repositories", "GET /user/orgs", "GET /user/packages", "GET /user/packages/{package_type}/{package_name}/versions", "GET /user/public_emails", "GET /user/repos", "GET /user/repository_invitations", "GET /user/starred", "GET /user/subscriptions", "GET /user/teams", "GET /users", "GET /users/{username}/events", "GET /users/{username}/events/orgs/{org}", "GET /users/{username}/events/public", "GET /users/{username}/followers", "GET /users/{username}/following", "GET /users/{username}/gists", "GET /users/{username}/gpg_keys", "GET /users/{username}/keys", "GET /users/{username}/orgs", "GET /users/{username}/packages", "GET /users/{username}/projects", "GET /users/{username}/received_events", "GET /users/{username}/received_events/public", "GET /users/{username}/repos", "GET /users/{username}/starred", "GET /users/{username}/subscriptions"];
+
+function isPaginatingEndpoint(arg) {
+  if (typeof arg === "string") {
+    return paginatingEndpoints.includes(arg);
+  } else {
+    return false;
+  }
+}
+
+/**
+ * @param octokit Octokit instance
+ * @param options Options passed to Octokit constructor
+ */
+
+function paginateRest(octokit) {
+  return {
+    paginate: Object.assign(paginate.bind(null, octokit), {
+      iterator: iterator.bind(null, octokit)
+    })
+  };
+}
+paginateRest.VERSION = VERSION;
+
+exports.composePaginateRest = composePaginateRest;
+exports.isPaginatingEndpoint = isPaginatingEndpoint;
+exports.paginateRest = paginateRest;
+exports.paginatingEndpoints = paginatingEndpoints;
+//# sourceMappingURL=index.js.map
+
+
+/***/ }),
+
+/***/ 3044:
+/***/ ((__unused_webpack_module, exports) => {
+
+"use strict";
+
+
+Object.defineProperty(exports, "__esModule", ({ value: true }));
+
+function ownKeys(object, enumerableOnly) {
+  var keys = Object.keys(object);
+
+  if (Object.getOwnPropertySymbols) {
+    var symbols = Object.getOwnPropertySymbols(object);
+
+    if (enumerableOnly) {
+      symbols = symbols.filter(function (sym) {
+        return Object.getOwnPropertyDescriptor(object, sym).enumerable;
+      });
+    }
+
+    keys.push.apply(keys, symbols);
+  }
+
+  return keys;
+}
+
+function _objectSpread2(target) {
+  for (var i = 1; i < arguments.length; i++) {
+    var source = arguments[i] != null ? arguments[i] : {};
+
+    if (i % 2) {
+      ownKeys(Object(source), true).forEach(function (key) {
+        _defineProperty(target, key, source[key]);
+      });
+    } else if (Object.getOwnPropertyDescriptors) {
+      Object.defineProperties(target, Object.getOwnPropertyDescriptors(source));
+    } else {
+      ownKeys(Object(source)).forEach(function (key) {
+        Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key));
+      });
+    }
+  }
+
+  return target;
+}
+
+function _defineProperty(obj, key, value) {
+  if (key in obj) {
+    Object.defineProperty(obj, key, {
+      value: value,
+      enumerable: true,
+      configurable: true,
+      writable: true
+    });
+  } else {
+    obj[key] = value;
+  }
+
+  return obj;
+}
+
+const Endpoints = {
+  actions: {
+    addCustomLabelsToSelfHostedRunnerForOrg: ["POST /orgs/{org}/actions/runners/{runner_id}/labels"],
+    addCustomLabelsToSelfHostedRunnerForRepo: ["POST /repos/{owner}/{repo}/actions/runners/{runner_id}/labels"],
+    addSelectedRepoToOrgSecret: ["PUT /orgs/{org}/actions/secrets/{secret_name}/repositories/{repository_id}"],
+    approveWorkflowRun: ["POST /repos/{owner}/{repo}/actions/runs/{run_id}/approve"],
+    cancelWorkflowRun: ["POST /repos/{owner}/{repo}/actions/runs/{run_id}/cancel"],
+    createOrUpdateEnvironmentSecret: ["PUT /repositories/{repository_id}/environments/{environment_name}/secrets/{secret_name}"],
+    createOrUpdateOrgSecret: ["PUT /orgs/{org}/actions/secrets/{secret_name}"],
+    createOrUpdateRepoSecret: ["PUT /repos/{owner}/{repo}/actions/secrets/{secret_name}"],
+    createRegistrationTokenForOrg: ["POST /orgs/{org}/actions/runners/registration-token"],
+    createRegistrationTokenForRepo: ["POST /repos/{owner}/{repo}/actions/runners/registration-token"],
+    createRemoveTokenForOrg: ["POST /orgs/{org}/actions/runners/remove-token"],
+    createRemoveTokenForRepo: ["POST /repos/{owner}/{repo}/actions/runners/remove-token"],
+    createWorkflowDispatch: ["POST /repos/{owner}/{repo}/actions/workflows/{workflow_id}/dispatches"],
+    deleteActionsCacheById: ["DELETE /repos/{owner}/{repo}/actions/caches/{cache_id}"],
+    deleteActionsCacheByKey: ["DELETE /repos/{owner}/{repo}/actions/caches{?key,ref}"],
+    deleteArtifact: ["DELETE /repos/{owner}/{repo}/actions/artifacts/{artifact_id}"],
+    deleteEnvironmentSecret: ["DELETE /repositories/{repository_id}/environments/{environment_name}/secrets/{secret_name}"],
+    deleteOrgSecret: ["DELETE /orgs/{org}/actions/secrets/{secret_name}"],
+    deleteRepoSecret: ["DELETE /repos/{owner}/{repo}/actions/secrets/{secret_name}"],
+    deleteSelfHostedRunnerFromOrg: ["DELETE /orgs/{org}/actions/runners/{runner_id}"],
+    deleteSelfHostedRunnerFromRepo: ["DELETE /repos/{owner}/{repo}/actions/runners/{runner_id}"],
+    deleteWorkflowRun: ["DELETE /repos/{owner}/{repo}/actions/runs/{run_id}"],
+    deleteWorkflowRunLogs: ["DELETE /repos/{owner}/{repo}/actions/runs/{run_id}/logs"],
+    disableSelectedRepositoryGithubActionsOrganization: ["DELETE /orgs/{org}/actions/permissions/repositories/{repository_id}"],
+    disableWorkflow: ["PUT /repos/{owner}/{repo}/actions/workflows/{workflow_id}/disable"],
+    downloadArtifact: ["GET /repos/{owner}/{repo}/actions/artifacts/{artifact_id}/{archive_format}"],
+    downloadJobLogsForWorkflowRun: ["GET /repos/{owner}/{repo}/actions/jobs/{job_id}/logs"],
+    downloadWorkflowRunAttemptLogs: ["GET /repos/{owner}/{repo}/actions/runs/{run_id}/attempts/{attempt_number}/logs"],
+    downloadWorkflowRunLogs: ["GET /repos/{owner}/{repo}/actions/runs/{run_id}/logs"],
+    enableSelectedRepositoryGithubActionsOrganization: ["PUT /orgs/{org}/actions/permissions/repositories/{repository_id}"],
+    enableWorkflow: ["PUT /repos/{owner}/{repo}/actions/workflows/{workflow_id}/enable"],
+    getActionsCacheList: ["GET /repos/{owner}/{repo}/actions/caches"],
+    getActionsCacheUsage: ["GET /repos/{owner}/{repo}/actions/cache/usage"],
+    getActionsCacheUsageByRepoForOrg: ["GET /orgs/{org}/actions/cache/usage-by-repository"],
+    getActionsCacheUsageForEnterprise: ["GET /enterprises/{enterprise}/actions/cache/usage"],
+    getActionsCacheUsageForOrg: ["GET /orgs/{org}/actions/cache/usage"],
+    getAllowedActionsOrganization: ["GET /orgs/{org}/actions/permissions/selected-actions"],
+    getAllowedActionsRepository: ["GET /repos/{owner}/{repo}/actions/permissions/selected-actions"],
+    getArtifact: ["GET /repos/{owner}/{repo}/actions/artifacts/{artifact_id}"],
+    getEnvironmentPublicKey: ["GET /repositories/{repository_id}/environments/{environment_name}/secrets/public-key"],
+    getEnvironmentSecret: ["GET /repositories/{repository_id}/environments/{environment_name}/secrets/{secret_name}"],
+    getGithubActionsDefaultWorkflowPermissionsEnterprise: ["GET /enterprises/{enterprise}/actions/permissions/workflow"],
+    getGithubActionsDefaultWorkflowPermissionsOrganization: ["GET /orgs/{org}/actions/permissions/workflow"],
+    getGithubActionsDefaultWorkflowPermissionsRepository: ["GET /repos/{owner}/{repo}/actions/permissions/workflow"],
+    getGithubActionsPermissionsOrganization: ["GET /orgs/{org}/actions/permissions"],
+    getGithubActionsPermissionsRepository: ["GET /repos/{owner}/{repo}/actions/permissions"],
+    getJobForWorkflowRun: ["GET /repos/{owner}/{repo}/actions/jobs/{job_id}"],
+    getOrgPublicKey: ["GET /orgs/{org}/actions/secrets/public-key"],
+    getOrgSecret: ["GET /orgs/{org}/actions/secrets/{secret_name}"],
+    getPendingDeploymentsForRun: ["GET /repos/{owner}/{repo}/actions/runs/{run_id}/pending_deployments"],
+    getRepoPermissions: ["GET /repos/{owner}/{repo}/actions/permissions", {}, {
+      renamed: ["actions", "getGithubActionsPermissionsRepository"]
+    }],
+    getRepoPublicKey: ["GET /repos/{owner}/{repo}/actions/secrets/public-key"],
+    getRepoSecret: ["GET /repos/{owner}/{repo}/actions/secrets/{secret_name}"],
+    getReviewsForRun: ["GET /repos/{owner}/{repo}/actions/runs/{run_id}/approvals"],
+    getSelfHostedRunnerForOrg: ["GET /orgs/{org}/actions/runners/{runner_id}"],
+    getSelfHostedRunnerForRepo: ["GET /repos/{owner}/{repo}/actions/runners/{runner_id}"],
+    getWorkflow: ["GET /repos/{owner}/{repo}/actions/workflows/{workflow_id}"],
+    getWorkflowAccessToRepository: ["GET /repos/{owner}/{repo}/actions/permissions/access"],
+    getWorkflowRun: ["GET /repos/{owner}/{repo}/actions/runs/{run_id}"],
+    getWorkflowRunAttempt: ["GET /repos/{owner}/{repo}/actions/runs/{run_id}/attempts/{attempt_number}"],
+    getWorkflowRunUsage: ["GET /repos/{owner}/{repo}/actions/runs/{run_id}/timing"],
+    getWorkflowUsage: ["GET /repos/{owner}/{repo}/actions/workflows/{workflow_id}/timing"],
+    listArtifactsForRepo: ["GET /repos/{owner}/{repo}/actions/artifacts"],
+    listEnvironmentSecrets: ["GET /repositories/{repository_id}/environments/{environment_name}/secrets"],
+    listJobsForWorkflowRun: ["GET /repos/{owner}/{repo}/actions/runs/{run_id}/jobs"],
+    listJobsForWorkflowRunAttempt: ["GET /repos/{owner}/{repo}/actions/runs/{run_id}/attempts/{attempt_number}/jobs"],
+    listLabelsForSelfHostedRunnerForOrg: ["GET /orgs/{org}/actions/runners/{runner_id}/labels"],
+    listLabelsForSelfHostedRunnerForRepo: ["GET /repos/{owner}/{repo}/actions/runners/{runner_id}/labels"],
+    listOrgSecrets: ["GET /orgs/{org}/actions/secrets"],
+    listRepoSecrets: ["GET /repos/{owner}/{repo}/actions/secrets"],
+    listRepoWorkflows: ["GET /repos/{owner}/{repo}/actions/workflows"],
+    listRunnerApplicationsForOrg: ["GET /orgs/{org}/actions/runners/downloads"],
+    listRunnerApplicationsForRepo: ["GET /repos/{owner}/{repo}/actions/runners/downloads"],
+    listSelectedReposForOrgSecret: ["GET /orgs/{org}/actions/secrets/{secret_name}/repositories"],
+    listSelectedRepositoriesEnabledGithubActionsOrganization: ["GET /orgs/{org}/actions/permissions/repositories"],
+    listSelfHostedRunnersForOrg: ["GET /orgs/{org}/actions/runners"],
+    listSelfHostedRunnersForRepo: ["GET /repos/{owner}/{repo}/actions/runners"],
+    listWorkflowRunArtifacts: ["GET /repos/{owner}/{repo}/actions/runs/{run_id}/artifacts"],
+    listWorkflowRuns: ["GET /repos/{owner}/{repo}/actions/workflows/{workflow_id}/runs"],
+    listWorkflowRunsForRepo: ["GET /repos/{owner}/{repo}/actions/runs"],
+    reRunJobForWorkflowRun: ["POST /repos/{owner}/{repo}/actions/jobs/{job_id}/rerun"],
+    reRunWorkflow: ["POST /repos/{owner}/{repo}/actions/runs/{run_id}/rerun"],
+    reRunWorkflowFailedJobs: ["POST /repos/{owner}/{repo}/actions/runs/{run_id}/rerun-failed-jobs"],
+    removeAllCustomLabelsFromSelfHostedRunnerForOrg: ["DELETE /orgs/{org}/actions/runners/{runner_id}/labels"],
+    removeAllCustomLabelsFromSelfHostedRunnerForRepo: ["DELETE /repos/{owner}/{repo}/actions/runners/{runner_id}/labels"],
+    removeCustomLabelFromSelfHostedRunnerForOrg: ["DELETE /orgs/{org}/actions/runners/{runner_id}/labels/{name}"],
+    removeCustomLabelFromSelfHostedRunnerForRepo: ["DELETE /repos/{owner}/{repo}/actions/runners/{runner_id}/labels/{name}"],
+    removeSelectedRepoFromOrgSecret: ["DELETE /orgs/{org}/actions/secrets/{secret_name}/repositories/{repository_id}"],
+    reviewPendingDeploymentsForRun: ["POST /repos/{owner}/{repo}/actions/runs/{run_id}/pending_deployments"],
+    setAllowedActionsOrganization: ["PUT /orgs/{org}/actions/permissions/selected-actions"],
+    setAllowedActionsRepository: ["PUT /repos/{owner}/{repo}/actions/permissions/selected-actions"],
+    setCustomLabelsForSelfHostedRunnerForOrg: ["PUT /orgs/{org}/actions/runners/{runner_id}/labels"],
+    setCustomLabelsForSelfHostedRunnerForRepo: ["PUT /repos/{owner}/{repo}/actions/runners/{runner_id}/labels"],
+    setGithubActionsDefaultWorkflowPermissionsEnterprise: ["PUT /enterprises/{enterprise}/actions/permissions/workflow"],
+    setGithubActionsDefaultWorkflowPermissionsOrganization: ["PUT /orgs/{org}/actions/permissions/workflow"],
+    setGithubActionsDefaultWorkflowPermissionsRepository: ["PUT /repos/{owner}/{repo}/actions/permissions/workflow"],
+    setGithubActionsPermissionsOrganization: ["PUT /orgs/{org}/actions/permissions"],
+    setGithubActionsPermissionsRepository: ["PUT /repos/{owner}/{repo}/actions/permissions"],
+    setSelectedReposForOrgSecret: ["PUT /orgs/{org}/actions/secrets/{secret_name}/repositories"],
+    setSelectedRepositoriesEnabledGithubActionsOrganization: ["PUT /orgs/{org}/actions/permissions/repositories"],
+    setWorkflowAccessToRepository: ["PUT /repos/{owner}/{repo}/actions/permissions/access"]
+  },
+  activity: {
+    checkRepoIsStarredByAuthenticatedUser: ["GET /user/starred/{owner}/{repo}"],
+    deleteRepoSubscription: ["DELETE /repos/{owner}/{repo}/subscription"],
+    deleteThreadSubscription: ["DELETE /notifications/threads/{thread_id}/subscription"],
+    getFeeds: ["GET /feeds"],
+    getRepoSubscription: ["GET /repos/{owner}/{repo}/subscription"],
+    getThread: ["GET /notifications/threads/{thread_id}"],
+    getThreadSubscriptionForAuthenticatedUser: ["GET /notifications/threads/{thread_id}/subscription"],
+    listEventsForAuthenticatedUser: ["GET /users/{username}/events"],
+    listNotificationsForAuthenticatedUser: ["GET /notifications"],
+    listOrgEventsForAuthenticatedUser: ["GET /users/{username}/events/orgs/{org}"],
+    listPublicEvents: ["GET /events"],
+    listPublicEventsForRepoNetwork: ["GET /networks/{owner}/{repo}/events"],
+    listPublicEventsForUser: ["GET /users/{username}/events/public"],
+    listPublicOrgEvents: ["GET /orgs/{org}/events"],
+    listReceivedEventsForUser: ["GET /users/{username}/received_events"],
+    listReceivedPublicEventsForUser: ["GET /users/{username}/received_events/public"],
+    listRepoEvents: ["GET /repos/{owner}/{repo}/events"],
+    listRepoNotificationsForAuthenticatedUser: ["GET /repos/{owner}/{repo}/notifications"],
+    listReposStarredByAuthenticatedUser: ["GET /user/starred"],
+    listReposStarredByUser: ["GET /users/{username}/starred"],
+    listReposWatchedByUser: ["GET /users/{username}/subscriptions"],
+    listStargazersForRepo: ["GET /repos/{owner}/{repo}/stargazers"],
+    listWatchedReposForAuthenticatedUser: ["GET /user/subscriptions"],
+    listWatchersForRepo: ["GET /repos/{owner}/{repo}/subscribers"],
+    markNotificationsAsRead: ["PUT /notifications"],
+    markRepoNotificationsAsRead: ["PUT /repos/{owner}/{repo}/notifications"],
+    markThreadAsRead: ["PATCH /notifications/threads/{thread_id}"],
+    setRepoSubscription: ["PUT /repos/{owner}/{repo}/subscription"],
+    setThreadSubscription: ["PUT /notifications/threads/{thread_id}/subscription"],
+    starRepoForAuthenticatedUser: ["PUT /user/starred/{owner}/{repo}"],
+    unstarRepoForAuthenticatedUser: ["DELETE /user/starred/{owner}/{repo}"]
+  },
+  apps: {
+    addRepoToInstallation: ["PUT /user/installations/{installation_id}/repositories/{repository_id}", {}, {
+      renamed: ["apps", "addRepoToInstallationForAuthenticatedUser"]
+    }],
+    addRepoToInstallationForAuthenticatedUser: ["PUT /user/installations/{installation_id}/repositories/{repository_id}"],
+    checkToken: ["POST /applications/{client_id}/token"],
+    createFromManifest: ["POST /app-manifests/{code}/conversions"],
+    createInstallationAccessToken: ["POST /app/installations/{installation_id}/access_tokens"],
+    deleteAuthorization: ["DELETE /applications/{client_id}/grant"],
+    deleteInstallation: ["DELETE /app/installations/{installation_id}"],
+    deleteToken: ["DELETE /applications/{client_id}/token"],
+    getAuthenticated: ["GET /app"],
+    getBySlug: ["GET /apps/{app_slug}"],
+    getInstallation: ["GET /app/installations/{installation_id}"],
+    getOrgInstallation: ["GET /orgs/{org}/installation"],
+    getRepoInstallation: ["GET /repos/{owner}/{repo}/installation"],
+    getSubscriptionPlanForAccount: ["GET /marketplace_listing/accounts/{account_id}"],
+    getSubscriptionPlanForAccountStubbed: ["GET /marketplace_listing/stubbed/accounts/{account_id}"],
+    getUserInstallation: ["GET /users/{username}/installation"],
+    getWebhookConfigForApp: ["GET /app/hook/config"],
+    getWebhookDelivery: ["GET /app/hook/deliveries/{delivery_id}"],
+    listAccountsForPlan: ["GET /marketplace_listing/plans/{plan_id}/accounts"],
+    listAccountsForPlanStubbed: ["GET /marketplace_listing/stubbed/plans/{plan_id}/accounts"],
+    listInstallationReposForAuthenticatedUser: ["GET /user/installations/{installation_id}/repositories"],
+    listInstallations: ["GET /app/installations"],
+    listInstallationsForAuthenticatedUser: ["GET /user/installations"],
+    listPlans: ["GET /marketplace_listing/plans"],
+    listPlansStubbed: ["GET /marketplace_listing/stubbed/plans"],
+    listReposAccessibleToInstallation: ["GET /installation/repositories"],
+    listSubscriptionsForAuthenticatedUser: ["GET /user/marketplace_purchases"],
+    listSubscriptionsForAuthenticatedUserStubbed: ["GET /user/marketplace_purchases/stubbed"],
+    listWebhookDeliveries: ["GET /app/hook/deliveries"],
+    redeliverWebhookDelivery: ["POST /app/hook/deliveries/{delivery_id}/attempts"],
+    removeRepoFromInstallation: ["DELETE /user/installations/{installation_id}/repositories/{repository_id}", {}, {
+      renamed: ["apps", "removeRepoFromInstallationForAuthenticatedUser"]
+    }],
+    removeRepoFromInstallationForAuthenticatedUser: ["DELETE /user/installations/{installation_id}/repositories/{repository_id}"],
+    resetToken: ["PATCH /applications/{client_id}/token"],
+    revokeInstallationAccessToken: ["DELETE /installation/token"],
+    scopeToken: ["POST /applications/{client_id}/token/scoped"],
+    suspendInstallation: ["PUT /app/installations/{installation_id}/suspended"],
+    unsuspendInstallation: ["DELETE /app/installations/{installation_id}/suspended"],
+    updateWebhookConfigForApp: ["PATCH /app/hook/config"]
+  },
+  billing: {
+    getGithubActionsBillingOrg: ["GET /orgs/{org}/settings/billing/actions"],
+    getGithubActionsBillingUser: ["GET /users/{username}/settings/billing/actions"],
+    getGithubAdvancedSecurityBillingGhe: ["GET /enterprises/{enterprise}/settings/billing/advanced-security"],
+    getGithubAdvancedSecurityBillingOrg: ["GET /orgs/{org}/settings/billing/advanced-security"],
+    getGithubPackagesBillingOrg: ["GET /orgs/{org}/settings/billing/packages"],
+    getGithubPackagesBillingUser: ["GET /users/{username}/settings/billing/packages"],
+    getSharedStorageBillingOrg: ["GET /orgs/{org}/settings/billing/shared-storage"],
+    getSharedStorageBillingUser: ["GET /users/{username}/settings/billing/shared-storage"]
+  },
+  checks: {
+    create: ["POST /repos/{owner}/{repo}/check-runs"],
+    createSuite: ["POST /repos/{owner}/{repo}/check-suites"],
+    get: ["GET /repos/{owner}/{repo}/check-runs/{check_run_id}"],
+    getSuite: ["GET /repos/{owner}/{repo}/check-suites/{check_suite_id}"],
+    listAnnotations: ["GET /repos/{owner}/{repo}/check-runs/{check_run_id}/annotations"],
+    listForRef: ["GET /repos/{owner}/{repo}/commits/{ref}/check-runs"],
+    listForSuite: ["GET /repos/{owner}/{repo}/check-suites/{check_suite_id}/check-runs"],
+    listSuitesForRef: ["GET /repos/{owner}/{repo}/commits/{ref}/check-suites"],
+    rerequestRun: ["POST /repos/{owner}/{repo}/check-runs/{check_run_id}/rerequest"],
+    rerequestSuite: ["POST /repos/{owner}/{repo}/check-suites/{check_suite_id}/rerequest"],
+    setSuitesPreferences: ["PATCH /repos/{owner}/{repo}/check-suites/preferences"],
+    update: ["PATCH /repos/{owner}/{repo}/check-runs/{check_run_id}"]
+  },
+  codeScanning: {
+    deleteAnalysis: ["DELETE /repos/{owner}/{repo}/code-scanning/analyses/{analysis_id}{?confirm_delete}"],
+    getAlert: ["GET /repos/{owner}/{repo}/code-scanning/alerts/{alert_number}", {}, {
+      renamedParameters: {
+        alert_id: "alert_number"
+      }
+    }],
+    getAnalysis: ["GET /repos/{owner}/{repo}/code-scanning/analyses/{analysis_id}"],
+    getSarif: ["GET /repos/{owner}/{repo}/code-scanning/sarifs/{sarif_id}"],
+    listAlertInstances: ["GET /repos/{owner}/{repo}/code-scanning/alerts/{alert_number}/instances"],
+    listAlertsForOrg: ["GET /orgs/{org}/code-scanning/alerts"],
+    listAlertsForRepo: ["GET /repos/{owner}/{repo}/code-scanning/alerts"],
+    listAlertsInstances: ["GET /repos/{owner}/{repo}/code-scanning/alerts/{alert_number}/instances", {}, {
+      renamed: ["codeScanning", "listAlertInstances"]
+    }],
+    listRecentAnalyses: ["GET /repos/{owner}/{repo}/code-scanning/analyses"],
+    updateAlert: ["PATCH /repos/{owner}/{repo}/code-scanning/alerts/{alert_number}"],
+    uploadSarif: ["POST /repos/{owner}/{repo}/code-scanning/sarifs"]
+  },
+  codesOfConduct: {
+    getAllCodesOfConduct: ["GET /codes_of_conduct"],
+    getConductCode: ["GET /codes_of_conduct/{key}"]
+  },
+  codespaces: {
+    addRepositoryForSecretForAuthenticatedUser: ["PUT /user/codespaces/secrets/{secret_name}/repositories/{repository_id}"],
+    codespaceMachinesForAuthenticatedUser: ["GET /user/codespaces/{codespace_name}/machines"],
+    createForAuthenticatedUser: ["POST /user/codespaces"],
+    createOrUpdateRepoSecret: ["PUT /repos/{owner}/{repo}/codespaces/secrets/{secret_name}"],
+    createOrUpdateSecretForAuthenticatedUser: ["PUT /user/codespaces/secrets/{secret_name}"],
+    createWithPrForAuthenticatedUser: ["POST /repos/{owner}/{repo}/pulls/{pull_number}/codespaces"],
+    createWithRepoForAuthenticatedUser: ["POST /repos/{owner}/{repo}/codespaces"],
+    deleteForAuthenticatedUser: ["DELETE /user/codespaces/{codespace_name}"],
+    deleteFromOrganization: ["DELETE /orgs/{org}/members/{username}/codespaces/{codespace_name}"],
+    deleteRepoSecret: ["DELETE /repos/{owner}/{repo}/codespaces/secrets/{secret_name}"],
+    deleteSecretForAuthenticatedUser: ["DELETE /user/codespaces/secrets/{secret_name}"],
+    exportForAuthenticatedUser: ["POST /user/codespaces/{codespace_name}/exports"],
+    getExportDetailsForAuthenticatedUser: ["GET /user/codespaces/{codespace_name}/exports/{export_id}"],
+    getForAuthenticatedUser: ["GET /user/codespaces/{codespace_name}"],
+    getPublicKeyForAuthenticatedUser: ["GET /user/codespaces/secrets/public-key"],
+    getRepoPublicKey: ["GET /repos/{owner}/{repo}/codespaces/secrets/public-key"],
+    getRepoSecret: ["GET /repos/{owner}/{repo}/codespaces/secrets/{secret_name}"],
+    getSecretForAuthenticatedUser: ["GET /user/codespaces/secrets/{secret_name}"],
+    listDevcontainersInRepositoryForAuthenticatedUser: ["GET /repos/{owner}/{repo}/codespaces/devcontainers"],
+    listForAuthenticatedUser: ["GET /user/codespaces"],
+    listInOrganization: ["GET /orgs/{org}/codespaces", {}, {
+      renamedParameters: {
+        org_id: "org"
+      }
+    }],
+    listInRepositoryForAuthenticatedUser: ["GET /repos/{owner}/{repo}/codespaces"],
+    listRepoSecrets: ["GET /repos/{owner}/{repo}/codespaces/secrets"],
+    listRepositoriesForSecretForAuthenticatedUser: ["GET /user/codespaces/secrets/{secret_name}/repositories"],
+    listSecretsForAuthenticatedUser: ["GET /user/codespaces/secrets"],
+    removeRepositoryForSecretForAuthenticatedUser: ["DELETE /user/codespaces/secrets/{secret_name}/repositories/{repository_id}"],
+    repoMachinesForAuthenticatedUser: ["GET /repos/{owner}/{repo}/codespaces/machines"],
+    setRepositoriesForSecretForAuthenticatedUser: ["PUT /user/codespaces/secrets/{secret_name}/repositories"],
+    startForAuthenticatedUser: ["POST /user/codespaces/{codespace_name}/start"],
+    stopForAuthenticatedUser: ["POST /user/codespaces/{codespace_name}/stop"],
+    stopInOrganization: ["POST /orgs/{org}/members/{username}/codespaces/{codespace_name}/stop"],
+    updateForAuthenticatedUser: ["PATCH /user/codespaces/{codespace_name}"]
+  },
+  dependabot: {
+    addSelectedRepoToOrgSecret: ["PUT /orgs/{org}/dependabot/secrets/{secret_name}/repositories/{repository_id}"],
+    createOrUpdateOrgSecret: ["PUT /orgs/{org}/dependabot/secrets/{secret_name}"],
+    createOrUpdateRepoSecret: ["PUT /repos/{owner}/{repo}/dependabot/secrets/{secret_name}"],
+    deleteOrgSecret: ["DELETE /orgs/{org}/dependabot/secrets/{secret_name}"],
+    deleteRepoSecret: ["DELETE /repos/{owner}/{repo}/dependabot/secrets/{secret_name}"],
+    getOrgPublicKey: ["GET /orgs/{org}/dependabot/secrets/public-key"],
+    getOrgSecret: ["GET /orgs/{org}/dependabot/secrets/{secret_name}"],
+    getRepoPublicKey: ["GET /repos/{owner}/{repo}/dependabot/secrets/public-key"],
+    getRepoSecret: ["GET /repos/{owner}/{repo}/dependabot/secrets/{secret_name}"],
+    listOrgSecrets: ["GET /orgs/{org}/dependabot/secrets"],
+    listRepoSecrets: ["GET /repos/{owner}/{repo}/dependabot/secrets"],
+    listSelectedReposForOrgSecret: ["GET /orgs/{org}/dependabot/secrets/{secret_name}/repositories"],
+    removeSelectedRepoFromOrgSecret: ["DELETE /orgs/{org}/dependabot/secrets/{secret_name}/repositories/{repository_id}"],
+    setSelectedReposForOrgSecret: ["PUT /orgs/{org}/dependabot/secrets/{secret_name}/repositories"]
+  },
+  dependencyGraph: {
+    createRepositorySnapshot: ["POST /repos/{owner}/{repo}/dependency-graph/snapshots"],
+    diffRange: ["GET /repos/{owner}/{repo}/dependency-graph/compare/{basehead}"]
+  },
+  emojis: {
+    get: ["GET /emojis"]
+  },
+  enterpriseAdmin: {
+    addCustomLabelsToSelfHostedRunnerForEnterprise: ["POST /enterprises/{enterprise}/actions/runners/{runner_id}/labels"],
+    disableSelectedOrganizationGithubActionsEnterprise: ["DELETE /enterprises/{enterprise}/actions/permissions/organizations/{org_id}"],
+    enableSelectedOrganizationGithubActionsEnterprise: ["PUT /enterprises/{enterprise}/actions/permissions/organizations/{org_id}"],
+    getAllowedActionsEnterprise: ["GET /enterprises/{enterprise}/actions/permissions/selected-actions"],
+    getGithubActionsPermissionsEnterprise: ["GET /enterprises/{enterprise}/actions/permissions"],
+    getServerStatistics: ["GET /enterprise-installation/{enterprise_or_org}/server-statistics"],
+    listLabelsForSelfHostedRunnerForEnterprise: ["GET /enterprises/{enterprise}/actions/runners/{runner_id}/labels"],
+    listSelectedOrganizationsEnabledGithubActionsEnterprise: ["GET /enterprises/{enterprise}/actions/permissions/organizations"],
+    removeAllCustomLabelsFromSelfHostedRunnerForEnterprise: ["DELETE /enterprises/{enterprise}/actions/runners/{runner_id}/labels"],
+    removeCustomLabelFromSelfHostedRunnerForEnterprise: ["DELETE /enterprises/{enterprise}/actions/runners/{runner_id}/labels/{name}"],
+    setAllowedActionsEnterprise: ["PUT /enterprises/{enterprise}/actions/permissions/selected-actions"],
+    setCustomLabelsForSelfHostedRunnerForEnterprise: ["PUT /enterprises/{enterprise}/actions/runners/{runner_id}/labels"],
+    setGithubActionsPermissionsEnterprise: ["PUT /enterprises/{enterprise}/actions/permissions"],
+    setSelectedOrganizationsEnabledGithubActionsEnterprise: ["PUT /enterprises/{enterprise}/actions/permissions/organizations"]
+  },
+  gists: {
+    checkIsStarred: ["GET /gists/{gist_id}/star"],
+    create: ["POST /gists"],
+    createComment: ["POST /gists/{gist_id}/comments"],
+    delete: ["DELETE /gists/{gist_id}"],
+    deleteComment: ["DELETE /gists/{gist_id}/comments/{comment_id}"],
+    fork: ["POST /gists/{gist_id}/forks"],
+    get: ["GET /gists/{gist_id}"],
+    getComment: ["GET /gists/{gist_id}/comments/{comment_id}"],
+    getRevision: ["GET /gists/{gist_id}/{sha}"],
+    list: ["GET /gists"],
+    listComments: ["GET /gists/{gist_id}/comments"],
+    listCommits: ["GET /gists/{gist_id}/commits"],
+    listForUser: ["GET /users/{username}/gists"],
+    listForks: ["GET /gists/{gist_id}/forks"],
+    listPublic: ["GET /gists/public"],
+    listStarred: ["GET /gists/starred"],
+    star: ["PUT /gists/{gist_id}/star"],
+    unstar: ["DELETE /gists/{gist_id}/star"],
+    update: ["PATCH /gists/{gist_id}"],
+    updateComment: ["PATCH /gists/{gist_id}/comments/{comment_id}"]
+  },
+  git: {
+    createBlob: ["POST /repos/{owner}/{repo}/git/blobs"],
+    createCommit: ["POST /repos/{owner}/{repo}/git/commits"],
+    createRef: ["POST /repos/{owner}/{repo}/git/refs"],
+    createTag: ["POST /repos/{owner}/{repo}/git/tags"],
+    createTree: ["POST /repos/{owner}/{repo}/git/trees"],
+    deleteRef: ["DELETE /repos/{owner}/{repo}/git/refs/{ref}"],
+    getBlob: ["GET /repos/{owner}/{repo}/git/blobs/{file_sha}"],
+    getCommit: ["GET /repos/{owner}/{repo}/git/commits/{commit_sha}"],
+    getRef: ["GET /repos/{owner}/{repo}/git/ref/{ref}"],
+    getTag: ["GET /repos/{owner}/{repo}/git/tags/{tag_sha}"],
+    getTree: ["GET /repos/{owner}/{repo}/git/trees/{tree_sha}"],
+    listMatchingRefs: ["GET /repos/{owner}/{repo}/git/matching-refs/{ref}"],
+    updateRef: ["PATCH /repos/{owner}/{repo}/git/refs/{ref}"]
+  },
+  gitignore: {
+    getAllTemplates: ["GET /gitignore/templates"],
+    getTemplate: ["GET /gitignore/templates/{name}"]
+  },
+  interactions: {
+    getRestrictionsForAuthenticatedUser: ["GET /user/interaction-limits"],
+    getRestrictionsForOrg: ["GET /orgs/{org}/interaction-limits"],
+    getRestrictionsForRepo: ["GET /repos/{owner}/{repo}/interaction-limits"],
+    getRestrictionsForYourPublicRepos: ["GET /user/interaction-limits", {}, {
+      renamed: ["interactions", "getRestrictionsForAuthenticatedUser"]
+    }],
+    removeRestrictionsForAuthenticatedUser: ["DELETE /user/interaction-limits"],
+    removeRestrictionsForOrg: ["DELETE /orgs/{org}/interaction-limits"],
+    removeRestrictionsForRepo: ["DELETE /repos/{owner}/{repo}/interaction-limits"],
+    removeRestrictionsForYourPublicRepos: ["DELETE /user/interaction-limits", {}, {
+      renamed: ["interactions", "removeRestrictionsForAuthenticatedUser"]
+    }],
+    setRestrictionsForAuthenticatedUser: ["PUT /user/interaction-limits"],
+    setRestrictionsForOrg: ["PUT /orgs/{org}/interaction-limits"],
+    setRestrictionsForRepo: ["PUT /repos/{owner}/{repo}/interaction-limits"],
+    setRestrictionsForYourPublicRepos: ["PUT /user/interaction-limits", {}, {
+      renamed: ["interactions", "setRestrictionsForAuthenticatedUser"]
+    }]
+  },
+  issues: {
+    addAssignees: ["POST /repos/{owner}/{repo}/issues/{issue_number}/assignees"],
+    addLabels: ["POST /repos/{owner}/{repo}/issues/{issue_number}/labels"],
+    checkUserCanBeAssigned: ["GET /repos/{owner}/{repo}/assignees/{assignee}"],
+    create: ["POST /repos/{owner}/{repo}/issues"],
+    createComment: ["POST /repos/{owner}/{repo}/issues/{issue_number}/comments"],
+    createLabel: ["POST /repos/{owner}/{repo}/labels"],
+    createMilestone: ["POST /repos/{owner}/{repo}/milestones"],
+    deleteComment: ["DELETE /repos/{owner}/{repo}/issues/comments/{comment_id}"],
+    deleteLabel: ["DELETE /repos/{owner}/{repo}/labels/{name}"],
+    deleteMilestone: ["DELETE /repos/{owner}/{repo}/milestones/{milestone_number}"],
+    get: ["GET /repos/{owner}/{repo}/issues/{issue_number}"],
+    getComment: ["GET /repos/{owner}/{repo}/issues/comments/{comment_id}"],
+    getEvent: ["GET /repos/{owner}/{repo}/issues/events/{event_id}"],
+    getLabel: ["GET /repos/{owner}/{repo}/labels/{name}"],
+    getMilestone: ["GET /repos/{owner}/{repo}/milestones/{milestone_number}"],
+    list: ["GET /issues"],
+    listAssignees: ["GET /repos/{owner}/{repo}/assignees"],
+    listComments: ["GET /repos/{owner}/{repo}/issues/{issue_number}/comments"],
+    listCommentsForRepo: ["GET /repos/{owner}/{repo}/issues/comments"],
+    listEvents: ["GET /repos/{owner}/{repo}/issues/{issue_number}/events"],
+    listEventsForRepo: ["GET /repos/{owner}/{repo}/issues/events"],
+    listEventsForTimeline: ["GET /repos/{owner}/{repo}/issues/{issue_number}/timeline"],
+    listForAuthenticatedUser: ["GET /user/issues"],
+    listForOrg: ["GET /orgs/{org}/issues"],
+    listForRepo: ["GET /repos/{owner}/{repo}/issues"],
+    listLabelsForMilestone: ["GET /repos/{owner}/{repo}/milestones/{milestone_number}/labels"],
+    listLabelsForRepo: ["GET /repos/{owner}/{repo}/labels"],
+    listLabelsOnIssue: ["GET /repos/{owner}/{repo}/issues/{issue_number}/labels"],
+    listMilestones: ["GET /repos/{owner}/{repo}/milestones"],
+    lock: ["PUT /repos/{owner}/{repo}/issues/{issue_number}/lock"],
+    removeAllLabels: ["DELETE /repos/{owner}/{repo}/issues/{issue_number}/labels"],
+    removeAssignees: ["DELETE /repos/{owner}/{repo}/issues/{issue_number}/assignees"],
+    removeLabel: ["DELETE /repos/{owner}/{repo}/issues/{issue_number}/labels/{name}"],
+    setLabels: ["PUT /repos/{owner}/{repo}/issues/{issue_number}/labels"],
+    unlock: ["DELETE /repos/{owner}/{repo}/issues/{issue_number}/lock"],
+    update: ["PATCH /repos/{owner}/{repo}/issues/{issue_number}"],
+    updateComment: ["PATCH /repos/{owner}/{repo}/issues/comments/{comment_id}"],
+    updateLabel: ["PATCH /repos/{owner}/{repo}/labels/{name}"],
+    updateMilestone: ["PATCH /repos/{owner}/{repo}/milestones/{milestone_number}"]
+  },
+  licenses: {
+    get: ["GET /licenses/{license}"],
+    getAllCommonlyUsed: ["GET /licenses"],
+    getForRepo: ["GET /repos/{owner}/{repo}/license"]
+  },
+  markdown: {
+    render: ["POST /markdown"],
+    renderRaw: ["POST /markdown/raw", {
+      headers: {
+        "content-type": "text/plain; charset=utf-8"
+      }
+    }]
+  },
+  meta: {
+    get: ["GET /meta"],
+    getOctocat: ["GET /octocat"],
+    getZen: ["GET /zen"],
+    root: ["GET /"]
+  },
+  migrations: {
+    cancelImport: ["DELETE /repos/{owner}/{repo}/import"],
+    deleteArchiveForAuthenticatedUser: ["DELETE /user/migrations/{migration_id}/archive"],
+    deleteArchiveForOrg: ["DELETE /orgs/{org}/migrations/{migration_id}/archive"],
+    downloadArchiveForOrg: ["GET /orgs/{org}/migrations/{migration_id}/archive"],
+    getArchiveForAuthenticatedUser: ["GET /user/migrations/{migration_id}/archive"],
+    getCommitAuthors: ["GET /repos/{owner}/{repo}/import/authors"],
+    getImportStatus: ["GET /repos/{owner}/{repo}/import"],
+    getLargeFiles: ["GET /repos/{owner}/{repo}/import/large_files"],
+    getStatusForAuthenticatedUser: ["GET /user/migrations/{migration_id}"],
+    getStatusForOrg: ["GET /orgs/{org}/migrations/{migration_id}"],
+    listForAuthenticatedUser: ["GET /user/migrations"],
+    listForOrg: ["GET /orgs/{org}/migrations"],
+    listReposForAuthenticatedUser: ["GET /user/migrations/{migration_id}/repositories"],
+    listReposForOrg: ["GET /orgs/{org}/migrations/{migration_id}/repositories"],
+    listReposForUser: ["GET /user/migrations/{migration_id}/repositories", {}, {
+      renamed: ["migrations", "listReposForAuthenticatedUser"]
+    }],
+    mapCommitAuthor: ["PATCH /repos/{owner}/{repo}/import/authors/{author_id}"],
+    setLfsPreference: ["PATCH /repos/{owner}/{repo}/import/lfs"],
+    startForAuthenticatedUser: ["POST /user/migrations"],
+    startForOrg: ["POST /orgs/{org}/migrations"],
+    startImport: ["PUT /repos/{owner}/{repo}/import"],
+    unlockRepoForAuthenticatedUser: ["DELETE /user/migrations/{migration_id}/repos/{repo_name}/lock"],
+    unlockRepoForOrg: ["DELETE /orgs/{org}/migrations/{migration_id}/repos/{repo_name}/lock"],
+    updateImport: ["PATCH /repos/{owner}/{repo}/import"]
+  },
+  orgs: {
+    blockUser: ["PUT /orgs/{org}/blocks/{username}"],
+    cancelInvitation: ["DELETE /orgs/{org}/invitations/{invitation_id}"],
+    checkBlockedUser: ["GET /orgs/{org}/blocks/{username}"],
+    checkMembershipForUser: ["GET /orgs/{org}/members/{username}"],
+    checkPublicMembershipForUser: ["GET /orgs/{org}/public_members/{username}"],
+    convertMemberToOutsideCollaborator: ["PUT /orgs/{org}/outside_collaborators/{username}"],
+    createInvitation: ["POST /orgs/{org}/invitations"],
+    createWebhook: ["POST /orgs/{org}/hooks"],
+    deleteWebhook: ["DELETE /orgs/{org}/hooks/{hook_id}"],
+    get: ["GET /orgs/{org}"],
+    getMembershipForAuthenticatedUser: ["GET /user/memberships/orgs/{org}"],
+    getMembershipForUser: ["GET /orgs/{org}/memberships/{username}"],
+    getWebhook: ["GET /orgs/{org}/hooks/{hook_id}"],
+    getWebhookConfigForOrg: ["GET /orgs/{org}/hooks/{hook_id}/config"],
+    getWebhookDelivery: ["GET /orgs/{org}/hooks/{hook_id}/deliveries/{delivery_id}"],
+    list: ["GET /organizations"],
+    listAppInstallations: ["GET /orgs/{org}/installations"],
+    listBlockedUsers: ["GET /orgs/{org}/blocks"],
+    listCustomRoles: ["GET /organizations/{organization_id}/custom_roles"],
+    listFailedInvitations: ["GET /orgs/{org}/failed_invitations"],
+    listForAuthenticatedUser: ["GET /user/orgs"],
+    listForUser: ["GET /users/{username}/orgs"],
+    listInvitationTeams: ["GET /orgs/{org}/invitations/{invitation_id}/teams"],
+    listMembers: ["GET /orgs/{org}/members"],
+    listMembershipsForAuthenticatedUser: ["GET /user/memberships/orgs"],
+    listOutsideCollaborators: ["GET /orgs/{org}/outside_collaborators"],
+    listPendingInvitations: ["GET /orgs/{org}/invitations"],
+    listPublicMembers: ["GET /orgs/{org}/public_members"],
+    listWebhookDeliveries: ["GET /orgs/{org}/hooks/{hook_id}/deliveries"],
+    listWebhooks: ["GET /orgs/{org}/hooks"],
+    pingWebhook: ["POST /orgs/{org}/hooks/{hook_id}/pings"],
+    redeliverWebhookDelivery: ["POST /orgs/{org}/hooks/{hook_id}/deliveries/{delivery_id}/attempts"],
+    removeMember: ["DELETE /orgs/{org}/members/{username}"],
+    removeMembershipForUser: ["DELETE /orgs/{org}/memberships/{username}"],
+    removeOutsideCollaborator: ["DELETE /orgs/{org}/outside_collaborators/{username}"],
+    removePublicMembershipForAuthenticatedUser: ["DELETE /orgs/{org}/public_members/{username}"],
+    setMembershipForUser: ["PUT /orgs/{org}/memberships/{username}"],
+    setPublicMembershipForAuthenticatedUser: ["PUT /orgs/{org}/public_members/{username}"],
+    unblockUser: ["DELETE /orgs/{org}/blocks/{username}"],
+    update: ["PATCH /orgs/{org}"],
+    updateMembershipForAuthenticatedUser: ["PATCH /user/memberships/orgs/{org}"],
+    updateWebhook: ["PATCH /orgs/{org}/hooks/{hook_id}"],
+    updateWebhookConfigForOrg: ["PATCH /orgs/{org}/hooks/{hook_id}/config"]
+  },
+  packages: {
+    deletePackageForAuthenticatedUser: ["DELETE /user/packages/{package_type}/{package_name}"],
+    deletePackageForOrg: ["DELETE /orgs/{org}/packages/{package_type}/{package_name}"],
+    deletePackageForUser: ["DELETE /users/{username}/packages/{package_type}/{package_name}"],
+    deletePackageVersionForAuthenticatedUser: ["DELETE /user/packages/{package_type}/{package_name}/versions/{package_version_id}"],
+    deletePackageVersionForOrg: ["DELETE /orgs/{org}/packages/{package_type}/{package_name}/versions/{package_version_id}"],
+    deletePackageVersionForUser: ["DELETE /users/{username}/packages/{package_type}/{package_name}/versions/{package_version_id}"],
+    getAllPackageVersionsForAPackageOwnedByAnOrg: ["GET /orgs/{org}/packages/{package_type}/{package_name}/versions", {}, {
+      renamed: ["packages", "getAllPackageVersionsForPackageOwnedByOrg"]
+    }],
+    getAllPackageVersionsForAPackageOwnedByTheAuthenticatedUser: ["GET /user/packages/{package_type}/{package_name}/versions", {}, {
+      renamed: ["packages", "getAllPackageVersionsForPackageOwnedByAuthenticatedUser"]
+    }],
+    getAllPackageVersionsForPackageOwnedByAuthenticatedUser: ["GET /user/packages/{package_type}/{package_name}/versions"],
+    getAllPackageVersionsForPackageOwnedByOrg: ["GET /orgs/{org}/packages/{package_type}/{package_name}/versions"],
+    getAllPackageVersionsForPackageOwnedByUser: ["GET /users/{username}/packages/{package_type}/{package_name}/versions"],
+    getPackageForAuthenticatedUser: ["GET /user/packages/{package_type}/{package_name}"],
+    getPackageForOrganization: ["GET /orgs/{org}/packages/{package_type}/{package_name}"],
+    getPackageForUser: ["GET /users/{username}/packages/{package_type}/{package_name}"],
+    getPackageVersionForAuthenticatedUser: ["GET /user/packages/{package_type}/{package_name}/versions/{package_version_id}"],
+    getPackageVersionForOrganization: ["GET /orgs/{org}/packages/{package_type}/{package_name}/versions/{package_version_id}"],
+    getPackageVersionForUser: ["GET /users/{username}/packages/{package_type}/{package_name}/versions/{package_version_id}"],
+    listPackagesForAuthenticatedUser: ["GET /user/packages"],
+    listPackagesForOrganization: ["GET /orgs/{org}/packages"],
+    listPackagesForUser: ["GET /users/{username}/packages"],
+    restorePackageForAuthenticatedUser: ["POST /user/packages/{package_type}/{package_name}/restore{?token}"],
+    restorePackageForOrg: ["POST /orgs/{org}/packages/{package_type}/{package_name}/restore{?token}"],
+    restorePackageForUser: ["POST /users/{username}/packages/{package_type}/{package_name}/restore{?token}"],
+    restorePackageVersionForAuthenticatedUser: ["POST /user/packages/{package_type}/{package_name}/versions/{package_version_id}/restore"],
+    restorePackageVersionForOrg: ["POST /orgs/{org}/packages/{package_type}/{package_name}/versions/{package_version_id}/restore"],
+    restorePackageVersionForUser: ["POST /users/{username}/packages/{package_type}/{package_name}/versions/{package_version_id}/restore"]
+  },
+  projects: {
+    addCollaborator: ["PUT /projects/{project_id}/collaborators/{username}"],
+    createCard: ["POST /projects/columns/{column_id}/cards"],
+    createColumn: ["POST /projects/{project_id}/columns"],
+    createForAuthenticatedUser: ["POST /user/projects"],
+    createForOrg: ["POST /orgs/{org}/projects"],
+    createForRepo: ["POST /repos/{owner}/{repo}/projects"],
+    delete: ["DELETE /projects/{project_id}"],
+    deleteCard: ["DELETE /projects/columns/cards/{card_id}"],
+    deleteColumn: ["DELETE /projects/columns/{column_id}"],
+    get: ["GET /projects/{project_id}"],
+    getCard: ["GET /projects/columns/cards/{card_id}"],
+    getColumn: ["GET /projects/columns/{column_id}"],
+    getPermissionForUser: ["GET /projects/{project_id}/collaborators/{username}/permission"],
+    listCards: ["GET /projects/columns/{column_id}/cards"],
+    listCollaborators: ["GET /projects/{project_id}/collaborators"],
+    listColumns: ["GET /projects/{project_id}/columns"],
+    listForOrg: ["GET /orgs/{org}/projects"],
+    listForRepo: ["GET /repos/{owner}/{repo}/projects"],
+    listForUser: ["GET /users/{username}/projects"],
+    moveCard: ["POST /projects/columns/cards/{card_id}/moves"],
+    moveColumn: ["POST /projects/columns/{column_id}/moves"],
+    removeCollaborator: ["DELETE /projects/{project_id}/collaborators/{username}"],
+    update: ["PATCH /projects/{project_id}"],
+    updateCard: ["PATCH /projects/columns/cards/{card_id}"],
+    updateColumn: ["PATCH /projects/columns/{column_id}"]
+  },
+  pulls: {
+    checkIfMerged: ["GET /repos/{owner}/{repo}/pulls/{pull_number}/merge"],
+    create: ["POST /repos/{owner}/{repo}/pulls"],
+    createReplyForReviewComment: ["POST /repos/{owner}/{repo}/pulls/{pull_number}/comments/{comment_id}/replies"],
+    createReview: ["POST /repos/{owner}/{repo}/pulls/{pull_number}/reviews"],
+    createReviewComment: ["POST /repos/{owner}/{repo}/pulls/{pull_number}/comments"],
+    deletePendingReview: ["DELETE /repos/{owner}/{repo}/pulls/{pull_number}/reviews/{review_id}"],
+    deleteReviewComment: ["DELETE /repos/{owner}/{repo}/pulls/comments/{comment_id}"],
+    dismissReview: ["PUT /repos/{owner}/{repo}/pulls/{pull_number}/reviews/{review_id}/dismissals"],
+    get: ["GET /repos/{owner}/{repo}/pulls/{pull_number}"],
+    getReview: ["GET /repos/{owner}/{repo}/pulls/{pull_number}/reviews/{review_id}"],
+    getReviewComment: ["GET /repos/{owner}/{repo}/pulls/comments/{comment_id}"],
+    list: ["GET /repos/{owner}/{repo}/pulls"],
+    listCommentsForReview: ["GET /repos/{owner}/{repo}/pulls/{pull_number}/reviews/{review_id}/comments"],
+    listCommits: ["GET /repos/{owner}/{repo}/pulls/{pull_number}/commits"],
+    listFiles: ["GET /repos/{owner}/{repo}/pulls/{pull_number}/files"],
+    listRequestedReviewers: ["GET /repos/{owner}/{repo}/pulls/{pull_number}/requested_reviewers"],
+    listReviewComments: ["GET /repos/{owner}/{repo}/pulls/{pull_number}/comments"],
+    listReviewCommentsForRepo: ["GET /repos/{owner}/{repo}/pulls/comments"],
+    listReviews: ["GET /repos/{owner}/{repo}/pulls/{pull_number}/reviews"],
+    merge: ["PUT /repos/{owner}/{repo}/pulls/{pull_number}/merge"],
+    removeRequestedReviewers: ["DELETE /repos/{owner}/{repo}/pulls/{pull_number}/requested_reviewers"],
+    requestReviewers: ["POST /repos/{owner}/{repo}/pulls/{pull_number}/requested_reviewers"],
+    submitReview: ["POST /repos/{owner}/{repo}/pulls/{pull_number}/reviews/{review_id}/events"],
+    update: ["PATCH /repos/{owner}/{repo}/pulls/{pull_number}"],
+    updateBranch: ["PUT /repos/{owner}/{repo}/pulls/{pull_number}/update-branch"],
+    updateReview: ["PUT /repos/{owner}/{repo}/pulls/{pull_number}/reviews/{review_id}"],
+    updateReviewComment: ["PATCH /repos/{owner}/{repo}/pulls/comments/{comment_id}"]
+  },
+  rateLimit: {
+    get: ["GET /rate_limit"]
+  },
+  reactions: {
+    createForCommitComment: ["POST /repos/{owner}/{repo}/comments/{comment_id}/reactions"],
+    createForIssue: ["POST /repos/{owner}/{repo}/issues/{issue_number}/reactions"],
+    createForIssueComment: ["POST /repos/{owner}/{repo}/issues/comments/{comment_id}/reactions"],
+    createForPullRequestReviewComment: ["POST /repos/{owner}/{repo}/pulls/comments/{comment_id}/reactions"],
+    createForRelease: ["POST /repos/{owner}/{repo}/releases/{release_id}/reactions"],
+    createForTeamDiscussionCommentInOrg: ["POST /orgs/{org}/teams/{team_slug}/discussions/{discussion_number}/comments/{comment_number}/reactions"],
+    createForTeamDiscussionInOrg: ["POST /orgs/{org}/teams/{team_slug}/discussions/{discussion_number}/reactions"],
+    deleteForCommitComment: ["DELETE /repos/{owner}/{repo}/comments/{comment_id}/reactions/{reaction_id}"],
+    deleteForIssue: ["DELETE /repos/{owner}/{repo}/issues/{issue_number}/reactions/{reaction_id}"],
+    deleteForIssueComment: ["DELETE /repos/{owner}/{repo}/issues/comments/{comment_id}/reactions/{reaction_id}"],
+    deleteForPullRequestComment: ["DELETE /repos/{owner}/{repo}/pulls/comments/{comment_id}/reactions/{reaction_id}"],
+    deleteForRelease: ["DELETE /repos/{owner}/{repo}/releases/{release_id}/reactions/{reaction_id}"],
+    deleteForTeamDiscussion: ["DELETE /orgs/{org}/teams/{team_slug}/discussions/{discussion_number}/reactions/{reaction_id}"],
+    deleteForTeamDiscussionComment: ["DELETE /orgs/{org}/teams/{team_slug}/discussions/{discussion_number}/comments/{comment_number}/reactions/{reaction_id}"],
+    listForCommitComment: ["GET /repos/{owner}/{repo}/comments/{comment_id}/reactions"],
+    listForIssue: ["GET /repos/{owner}/{repo}/issues/{issue_number}/reactions"],
+    listForIssueComment: ["GET /repos/{owner}/{repo}/issues/comments/{comment_id}/reactions"],
+    listForPullRequestReviewComment: ["GET /repos/{owner}/{repo}/pulls/comments/{comment_id}/reactions"],
+    listForRelease: ["GET /repos/{owner}/{repo}/releases/{release_id}/reactions"],
+    listForTeamDiscussionCommentInOrg: ["GET /orgs/{org}/teams/{team_slug}/discussions/{discussion_number}/comments/{comment_number}/reactions"],
+    listForTeamDiscussionInOrg: ["GET /orgs/{org}/teams/{team_slug}/discussions/{discussion_number}/reactions"]
+  },
+  repos: {
+    acceptInvitation: ["PATCH /user/repository_invitations/{invitation_id}", {}, {
+      renamed: ["repos", "acceptInvitationForAuthenticatedUser"]
+    }],
+    acceptInvitationForAuthenticatedUser: ["PATCH /user/repository_invitations/{invitation_id}"],
+    addAppAccessRestrictions: ["POST /repos/{owner}/{repo}/branches/{branch}/protection/restrictions/apps", {}, {
+      mapToData: "apps"
+    }],
+    addCollaborator: ["PUT /repos/{owner}/{repo}/collaborators/{username}"],
+    addStatusCheckContexts: ["POST /repos/{owner}/{repo}/branches/{branch}/protection/required_status_checks/contexts", {}, {
+      mapToData: "contexts"
+    }],
+    addTeamAccessRestrictions: ["POST /repos/{owner}/{repo}/branches/{branch}/protection/restrictions/teams", {}, {
+      mapToData: "teams"
+    }],
+    addUserAccessRestrictions: ["POST /repos/{owner}/{repo}/branches/{branch}/protection/restrictions/users", {}, {
+      mapToData: "users"
+    }],
+    checkCollaborator: ["GET /repos/{owner}/{repo}/collaborators/{username}"],
+    checkVulnerabilityAlerts: ["GET /repos/{owner}/{repo}/vulnerability-alerts"],
+    codeownersErrors: ["GET /repos/{owner}/{repo}/codeowners/errors"],
+    compareCommits: ["GET /repos/{owner}/{repo}/compare/{base}...{head}"],
+    compareCommitsWithBasehead: ["GET /repos/{owner}/{repo}/compare/{basehead}"],
+    createAutolink: ["POST /repos/{owner}/{repo}/autolinks"],
+    createCommitComment: ["POST /repos/{owner}/{repo}/commits/{commit_sha}/comments"],
+    createCommitSignatureProtection: ["POST /repos/{owner}/{repo}/branches/{branch}/protection/required_signatures"],
+    createCommitStatus: ["POST /repos/{owner}/{repo}/statuses/{sha}"],
+    createDeployKey: ["POST /repos/{owner}/{repo}/keys"],
+    createDeployment: ["POST /repos/{owner}/{repo}/deployments"],
+    createDeploymentStatus: ["POST /repos/{owner}/{repo}/deployments/{deployment_id}/statuses"],
+    createDispatchEvent: ["POST /repos/{owner}/{repo}/dispatches"],
+    createForAuthenticatedUser: ["POST /user/repos"],
+    createFork: ["POST /repos/{owner}/{repo}/forks"],
+    createInOrg: ["POST /orgs/{org}/repos"],
+    createOrUpdateEnvironment: ["PUT /repos/{owner}/{repo}/environments/{environment_name}"],
+    createOrUpdateFileContents: ["PUT /repos/{owner}/{repo}/contents/{path}"],
+    createPagesSite: ["POST /repos/{owner}/{repo}/pages"],
+    createRelease: ["POST /repos/{owner}/{repo}/releases"],
+    createTagProtection: ["POST /repos/{owner}/{repo}/tags/protection"],
+    createUsingTemplate: ["POST /repos/{template_owner}/{template_repo}/generate"],
+    createWebhook: ["POST /repos/{owner}/{repo}/hooks"],
+    declineInvitation: ["DELETE /user/repository_invitations/{invitation_id}", {}, {
+      renamed: ["repos", "declineInvitationForAuthenticatedUser"]
+    }],
+    declineInvitationForAuthenticatedUser: ["DELETE /user/repository_invitations/{invitation_id}"],
+    delete: ["DELETE /repos/{owner}/{repo}"],
+    deleteAccessRestrictions: ["DELETE /repos/{owner}/{repo}/branches/{branch}/protection/restrictions"],
+    deleteAdminBranchProtection: ["DELETE /repos/{owner}/{repo}/branches/{branch}/protection/enforce_admins"],
+    deleteAnEnvironment: ["DELETE /repos/{owner}/{repo}/environments/{environment_name}"],
+    deleteAutolink: ["DELETE /repos/{owner}/{repo}/autolinks/{autolink_id}"],
+    deleteBranchProtection: ["DELETE /repos/{owner}/{repo}/branches/{branch}/protection"],
+    deleteCommitComment: ["DELETE /repos/{owner}/{repo}/comments/{comment_id}"],
+    deleteCommitSignatureProtection: ["DELETE /repos/{owner}/{repo}/branches/{branch}/protection/required_signatures"],
+    deleteDeployKey: ["DELETE /repos/{owner}/{repo}/keys/{key_id}"],
+    deleteDeployment: ["DELETE /repos/{owner}/{repo}/deployments/{deployment_id}"],
+    deleteFile: ["DELETE /repos/{owner}/{repo}/contents/{path}"],
+    deleteInvitation: ["DELETE /repos/{owner}/{repo}/invitations/{invitation_id}"],
+    deletePagesSite: ["DELETE /repos/{owner}/{repo}/pages"],
+    deletePullRequestReviewProtection: ["DELETE /repos/{owner}/{repo}/branches/{branch}/protection/required_pull_request_reviews"],
+    deleteRelease: ["DELETE /repos/{owner}/{repo}/releases/{release_id}"],
+    deleteReleaseAsset: ["DELETE /repos/{owner}/{repo}/releases/assets/{asset_id}"],
+    deleteTagProtection: ["DELETE /repos/{owner}/{repo}/tags/protection/{tag_protection_id}"],
+    deleteWebhook: ["DELETE /repos/{owner}/{repo}/hooks/{hook_id}"],
+    disableAutomatedSecurityFixes: ["DELETE /repos/{owner}/{repo}/automated-security-fixes"],
+    disableLfsForRepo: ["DELETE /repos/{owner}/{repo}/lfs"],
+    disableVulnerabilityAlerts: ["DELETE /repos/{owner}/{repo}/vulnerability-alerts"],
+    downloadArchive: ["GET /repos/{owner}/{repo}/zipball/{ref}", {}, {
+      renamed: ["repos", "downloadZipballArchive"]
+    }],
+    downloadTarballArchive: ["GET /repos/{owner}/{repo}/tarball/{ref}"],
+    downloadZipballArchive: ["GET /repos/{owner}/{repo}/zipball/{ref}"],
+    enableAutomatedSecurityFixes: ["PUT /repos/{owner}/{repo}/automated-security-fixes"],
+    enableLfsForRepo: ["PUT /repos/{owner}/{repo}/lfs"],
+    enableVulnerabilityAlerts: ["PUT /repos/{owner}/{repo}/vulnerability-alerts"],
+    generateReleaseNotes: ["POST /repos/{owner}/{repo}/releases/generate-notes"],
+    get: ["GET /repos/{owner}/{repo}"],
+    getAccessRestrictions: ["GET /repos/{owner}/{repo}/branches/{branch}/protection/restrictions"],
+    getAdminBranchProtection: ["GET /repos/{owner}/{repo}/branches/{branch}/protection/enforce_admins"],
+    getAllEnvironments: ["GET /repos/{owner}/{repo}/environments"],
+    getAllStatusCheckContexts: ["GET /repos/{owner}/{repo}/branches/{branch}/protection/required_status_checks/contexts"],
+    getAllTopics: ["GET /repos/{owner}/{repo}/topics"],
+    getAppsWithAccessToProtectedBranch: ["GET /repos/{owner}/{repo}/branches/{branch}/protection/restrictions/apps"],
+    getAutolink: ["GET /repos/{owner}/{repo}/autolinks/{autolink_id}"],
+    getBranch: ["GET /repos/{owner}/{repo}/branches/{branch}"],
+    getBranchProtection: ["GET /repos/{owner}/{repo}/branches/{branch}/protection"],
+    getClones: ["GET /repos/{owner}/{repo}/traffic/clones"],
+    getCodeFrequencyStats: ["GET /repos/{owner}/{repo}/stats/code_frequency"],
+    getCollaboratorPermissionLevel: ["GET /repos/{owner}/{repo}/collaborators/{username}/permission"],
+    getCombinedStatusForRef: ["GET /repos/{owner}/{repo}/commits/{ref}/status"],
+    getCommit: ["GET /repos/{owner}/{repo}/commits/{ref}"],
+    getCommitActivityStats: ["GET /repos/{owner}/{repo}/stats/commit_activity"],
+    getCommitComment: ["GET /repos/{owner}/{repo}/comments/{comment_id}"],
+    getCommitSignatureProtection: ["GET /repos/{owner}/{repo}/branches/{branch}/protection/required_signatures"],
+    getCommunityProfileMetrics: ["GET /repos/{owner}/{repo}/community/profile"],
+    getContent: ["GET /repos/{owner}/{repo}/contents/{path}"],
+    getContributorsStats: ["GET /repos/{owner}/{repo}/stats/contributors"],
+    getDeployKey: ["GET /repos/{owner}/{repo}/keys/{key_id}"],
+    getDeployment: ["GET /repos/{owner}/{repo}/deployments/{deployment_id}"],
+    getDeploymentStatus: ["GET /repos/{owner}/{repo}/deployments/{deployment_id}/statuses/{status_id}"],
+    getEnvironment: ["GET /repos/{owner}/{repo}/environments/{environment_name}"],
+    getLatestPagesBuild: ["GET /repos/{owner}/{repo}/pages/builds/latest"],
+    getLatestRelease: ["GET /repos/{owner}/{repo}/releases/latest"],
+    getPages: ["GET /repos/{owner}/{repo}/pages"],
+    getPagesBuild: ["GET /repos/{owner}/{repo}/pages/builds/{build_id}"],
+    getPagesHealthCheck: ["GET /repos/{owner}/{repo}/pages/health"],
+    getParticipationStats: ["GET /repos/{owner}/{repo}/stats/participation"],
+    getPullRequestReviewProtection: ["GET /repos/{owner}/{repo}/branches/{branch}/protection/required_pull_request_reviews"],
+    getPunchCardStats: ["GET /repos/{owner}/{repo}/stats/punch_card"],
+    getReadme: ["GET /repos/{owner}/{repo}/readme"],
+    getReadmeInDirectory: ["GET /repos/{owner}/{repo}/readme/{dir}"],
+    getRelease: ["GET /repos/{owner}/{repo}/releases/{release_id}"],
+    getReleaseAsset: ["GET /repos/{owner}/{repo}/releases/assets/{asset_id}"],
+    getReleaseByTag: ["GET /repos/{owner}/{repo}/releases/tags/{tag}"],
+    getStatusChecksProtection: ["GET /repos/{owner}/{repo}/branches/{branch}/protection/required_status_checks"],
+    getTeamsWithAccessToProtectedBranch: ["GET /repos/{owner}/{repo}/branches/{branch}/protection/restrictions/teams"],
+    getTopPaths: ["GET /repos/{owner}/{repo}/traffic/popular/paths"],
+    getTopReferrers: ["GET /repos/{owner}/{repo}/traffic/popular/referrers"],
+    getUsersWithAccessToProtectedBranch: ["GET /repos/{owner}/{repo}/branches/{branch}/protection/restrictions/users"],
+    getViews: ["GET /repos/{owner}/{repo}/traffic/views"],
+    getWebhook: ["GET /repos/{owner}/{repo}/hooks/{hook_id}"],
+    getWebhookConfigForRepo: ["GET /repos/{owner}/{repo}/hooks/{hook_id}/config"],
+    getWebhookDelivery: ["GET /repos/{owner}/{repo}/hooks/{hook_id}/deliveries/{delivery_id}"],
+    listAutolinks: ["GET /repos/{owner}/{repo}/autolinks"],
+    listBranches: ["GET /repos/{owner}/{repo}/branches"],
+    listBranchesForHeadCommit: ["GET /repos/{owner}/{repo}/commits/{commit_sha}/branches-where-head"],
+    listCollaborators: ["GET /repos/{owner}/{repo}/collaborators"],
+    listCommentsForCommit: ["GET /repos/{owner}/{repo}/commits/{commit_sha}/comments"],
+    listCommitCommentsForRepo: ["GET /repos/{owner}/{repo}/comments"],
+    listCommitStatusesForRef: ["GET /repos/{owner}/{repo}/commits/{ref}/statuses"],
+    listCommits: ["GET /repos/{owner}/{repo}/commits"],
+    listContributors: ["GET /repos/{owner}/{repo}/contributors"],
+    listDeployKeys: ["GET /repos/{owner}/{repo}/keys"],
+    listDeploymentStatuses: ["GET /repos/{owner}/{repo}/deployments/{deployment_id}/statuses"],
+    listDeployments: ["GET /repos/{owner}/{repo}/deployments"],
+    listForAuthenticatedUser: ["GET /user/repos"],
+    listForOrg: ["GET /orgs/{org}/repos"],
+    listForUser: ["GET /users/{username}/repos"],
+    listForks: ["GET /repos/{owner}/{repo}/forks"],
+    listInvitations: ["GET /repos/{owner}/{repo}/invitations"],
+    listInvitationsForAuthenticatedUser: ["GET /user/repository_invitations"],
+    listLanguages: ["GET /repos/{owner}/{repo}/languages"],
+    listPagesBuilds: ["GET /repos/{owner}/{repo}/pages/builds"],
+    listPublic: ["GET /repositories"],
+    listPullRequestsAssociatedWithCommit: ["GET /repos/{owner}/{repo}/commits/{commit_sha}/pulls"],
+    listReleaseAssets: ["GET /repos/{owner}/{repo}/releases/{release_id}/assets"],
+    listReleases: ["GET /repos/{owner}/{repo}/releases"],
+    listTagProtection: ["GET /repos/{owner}/{repo}/tags/protection"],
+    listTags: ["GET /repos/{owner}/{repo}/tags"],
+    listTeams: ["GET /repos/{owner}/{repo}/teams"],
+    listWebhookDeliveries: ["GET /repos/{owner}/{repo}/hooks/{hook_id}/deliveries"],
+    listWebhooks: ["GET /repos/{owner}/{repo}/hooks"],
+    merge: ["POST /repos/{owner}/{repo}/merges"],
+    mergeUpstream: ["POST /repos/{owner}/{repo}/merge-upstream"],
+    pingWebhook: ["POST /repos/{owner}/{repo}/hooks/{hook_id}/pings"],
+    redeliverWebhookDelivery: ["POST /repos/{owner}/{repo}/hooks/{hook_id}/deliveries/{delivery_id}/attempts"],
+    removeAppAccessRestrictions: ["DELETE /repos/{owner}/{repo}/branches/{branch}/protection/restrictions/apps", {}, {
+      mapToData: "apps"
+    }],
+    removeCollaborator: ["DELETE /repos/{owner}/{repo}/collaborators/{username}"],
+    removeStatusCheckContexts: ["DELETE /repos/{owner}/{repo}/branches/{branch}/protection/required_status_checks/contexts", {}, {
+      mapToData: "contexts"
+    }],
+    removeStatusCheckProtection: ["DELETE /repos/{owner}/{repo}/branches/{branch}/protection/required_status_checks"],
+    removeTeamAccessRestrictions: ["DELETE /repos/{owner}/{repo}/branches/{branch}/protection/restrictions/teams", {}, {
+      mapToData: "teams"
+    }],
+    removeUserAccessRestrictions: ["DELETE /repos/{owner}/{repo}/branches/{branch}/protection/restrictions/users", {}, {
+      mapToData: "users"
+    }],
+    renameBranch: ["POST /repos/{owner}/{repo}/branches/{branch}/rename"],
+    replaceAllTopics: ["PUT /repos/{owner}/{repo}/topics"],
+    requestPagesBuild: ["POST /repos/{owner}/{repo}/pages/builds"],
+    setAdminBranchProtection: ["POST /repos/{owner}/{repo}/branches/{branch}/protection/enforce_admins"],
+    setAppAccessRestrictions: ["PUT /repos/{owner}/{repo}/branches/{branch}/protection/restrictions/apps", {}, {
+      mapToData: "apps"
+    }],
+    setStatusCheckContexts: ["PUT /repos/{owner}/{repo}/branches/{branch}/protection/required_status_checks/contexts", {}, {
+      mapToData: "contexts"
+    }],
+    setTeamAccessRestrictions: ["PUT /repos/{owner}/{repo}/branches/{branch}/protection/restrictions/teams", {}, {
+      mapToData: "teams"
+    }],
+    setUserAccessRestrictions: ["PUT /repos/{owner}/{repo}/branches/{branch}/protection/restrictions/users", {}, {
+      mapToData: "users"
+    }],
+    testPushWebhook: ["POST /repos/{owner}/{repo}/hooks/{hook_id}/tests"],
+    transfer: ["POST /repos/{owner}/{repo}/transfer"],
+    update: ["PATCH /repos/{owner}/{repo}"],
+    updateBranchProtection: ["PUT /repos/{owner}/{repo}/branches/{branch}/protection"],
+    updateCommitComment: ["PATCH /repos/{owner}/{repo}/comments/{comment_id}"],
+    updateInformationAboutPagesSite: ["PUT /repos/{owner}/{repo}/pages"],
+    updateInvitation: ["PATCH /repos/{owner}/{repo}/invitations/{invitation_id}"],
+    updatePullRequestReviewProtection: ["PATCH /repos/{owner}/{repo}/branches/{branch}/protection/required_pull_request_reviews"],
+    updateRelease: ["PATCH /repos/{owner}/{repo}/releases/{release_id}"],
+    updateReleaseAsset: ["PATCH /repos/{owner}/{repo}/releases/assets/{asset_id}"],
+    updateStatusCheckPotection: ["PATCH /repos/{owner}/{repo}/branches/{branch}/protection/required_status_checks", {}, {
+      renamed: ["repos", "updateStatusCheckProtection"]
+    }],
+    updateStatusCheckProtection: ["PATCH /repos/{owner}/{repo}/branches/{branch}/protection/required_status_checks"],
+    updateWebhook: ["PATCH /repos/{owner}/{repo}/hooks/{hook_id}"],
+    updateWebhookConfigForRepo: ["PATCH /repos/{owner}/{repo}/hooks/{hook_id}/config"],
+    uploadReleaseAsset: ["POST /repos/{owner}/{repo}/releases/{release_id}/assets{?name,label}", {
+      baseUrl: "https://uploads.github.com"
+    }]
+  },
+  search: {
+    code: ["GET /search/code"],
+    commits: ["GET /search/commits"],
+    issuesAndPullRequests: ["GET /search/issues"],
+    labels: ["GET /search/labels"],
+    repos: ["GET /search/repositories"],
+    topics: ["GET /search/topics"],
+    users: ["GET /search/users"]
+  },
+  secretScanning: {
+    getAlert: ["GET /repos/{owner}/{repo}/secret-scanning/alerts/{alert_number}"],
+    listAlertsForEnterprise: ["GET /enterprises/{enterprise}/secret-scanning/alerts"],
+    listAlertsForOrg: ["GET /orgs/{org}/secret-scanning/alerts"],
+    listAlertsForRepo: ["GET /repos/{owner}/{repo}/secret-scanning/alerts"],
+    listLocationsForAlert: ["GET /repos/{owner}/{repo}/secret-scanning/alerts/{alert_number}/locations"],
+    updateAlert: ["PATCH /repos/{owner}/{repo}/secret-scanning/alerts/{alert_number}"]
+  },
+  teams: {
+    addOrUpdateMembershipForUserInOrg: ["PUT /orgs/{org}/teams/{team_slug}/memberships/{username}"],
+    addOrUpdateProjectPermissionsInOrg: ["PUT /orgs/{org}/teams/{team_slug}/projects/{project_id}"],
+    addOrUpdateRepoPermissionsInOrg: ["PUT /orgs/{org}/teams/{team_slug}/repos/{owner}/{repo}"],
+    checkPermissionsForProjectInOrg: ["GET /orgs/{org}/teams/{team_slug}/projects/{project_id}"],
+    checkPermissionsForRepoInOrg: ["GET /orgs/{org}/teams/{team_slug}/repos/{owner}/{repo}"],
+    create: ["POST /orgs/{org}/teams"],
+    createDiscussionCommentInOrg: ["POST /orgs/{org}/teams/{team_slug}/discussions/{discussion_number}/comments"],
+    createDiscussionInOrg: ["POST /orgs/{org}/teams/{team_slug}/discussions"],
+    deleteDiscussionCommentInOrg: ["DELETE /orgs/{org}/teams/{team_slug}/discussions/{discussion_number}/comments/{comment_number}"],
+    deleteDiscussionInOrg: ["DELETE /orgs/{org}/teams/{team_slug}/discussions/{discussion_number}"],
+    deleteInOrg: ["DELETE /orgs/{org}/teams/{team_slug}"],
+    getByName: ["GET /orgs/{org}/teams/{team_slug}"],
+    getDiscussionCommentInOrg: ["GET /orgs/{org}/teams/{team_slug}/discussions/{discussion_number}/comments/{comment_number}"],
+    getDiscussionInOrg: ["GET /orgs/{org}/teams/{team_slug}/discussions/{discussion_number}"],
+    getMembershipForUserInOrg: ["GET /orgs/{org}/teams/{team_slug}/memberships/{username}"],
+    list: ["GET /orgs/{org}/teams"],
+    listChildInOrg: ["GET /orgs/{org}/teams/{team_slug}/teams"],
+    listDiscussionCommentsInOrg: ["GET /orgs/{org}/teams/{team_slug}/discussions/{discussion_number}/comments"],
+    listDiscussionsInOrg: ["GET /orgs/{org}/teams/{team_slug}/discussions"],
+    listForAuthenticatedUser: ["GET /user/teams"],
+    listMembersInOrg: ["GET /orgs/{org}/teams/{team_slug}/members"],
+    listPendingInvitationsInOrg: ["GET /orgs/{org}/teams/{team_slug}/invitations"],
+    listProjectsInOrg: ["GET /orgs/{org}/teams/{team_slug}/projects"],
+    listReposInOrg: ["GET /orgs/{org}/teams/{team_slug}/repos"],
+    removeMembershipForUserInOrg: ["DELETE /orgs/{org}/teams/{team_slug}/memberships/{username}"],
+    removeProjectInOrg: ["DELETE /orgs/{org}/teams/{team_slug}/projects/{project_id}"],
+    removeRepoInOrg: ["DELETE /orgs/{org}/teams/{team_slug}/repos/{owner}/{repo}"],
+    updateDiscussionCommentInOrg: ["PATCH /orgs/{org}/teams/{team_slug}/discussions/{discussion_number}/comments/{comment_number}"],
+    updateDiscussionInOrg: ["PATCH /orgs/{org}/teams/{team_slug}/discussions/{discussion_number}"],
+    updateInOrg: ["PATCH /orgs/{org}/teams/{team_slug}"]
+  },
+  users: {
+    addEmailForAuthenticated: ["POST /user/emails", {}, {
+      renamed: ["users", "addEmailForAuthenticatedUser"]
+    }],
+    addEmailForAuthenticatedUser: ["POST /user/emails"],
+    block: ["PUT /user/blocks/{username}"],
+    checkBlocked: ["GET /user/blocks/{username}"],
+    checkFollowingForUser: ["GET /users/{username}/following/{target_user}"],
+    checkPersonIsFollowedByAuthenticated: ["GET /user/following/{username}"],
+    createGpgKeyForAuthenticated: ["POST /user/gpg_keys", {}, {
+      renamed: ["users", "createGpgKeyForAuthenticatedUser"]
+    }],
+    createGpgKeyForAuthenticatedUser: ["POST /user/gpg_keys"],
+    createPublicSshKeyForAuthenticated: ["POST /user/keys", {}, {
+      renamed: ["users", "createPublicSshKeyForAuthenticatedUser"]
+    }],
+    createPublicSshKeyForAuthenticatedUser: ["POST /user/keys"],
+    deleteEmailForAuthenticated: ["DELETE /user/emails", {}, {
+      renamed: ["users", "deleteEmailForAuthenticatedUser"]
+    }],
+    deleteEmailForAuthenticatedUser: ["DELETE /user/emails"],
+    deleteGpgKeyForAuthenticated: ["DELETE /user/gpg_keys/{gpg_key_id}", {}, {
+      renamed: ["users", "deleteGpgKeyForAuthenticatedUser"]
+    }],
+    deleteGpgKeyForAuthenticatedUser: ["DELETE /user/gpg_keys/{gpg_key_id}"],
+    deletePublicSshKeyForAuthenticated: ["DELETE /user/keys/{key_id}", {}, {
+      renamed: ["users", "deletePublicSshKeyForAuthenticatedUser"]
+    }],
+    deletePublicSshKeyForAuthenticatedUser: ["DELETE /user/keys/{key_id}"],
+    follow: ["PUT /user/following/{username}"],
+    getAuthenticated: ["GET /user"],
+    getByUsername: ["GET /users/{username}"],
+    getContextForUser: ["GET /users/{username}/hovercard"],
+    getGpgKeyForAuthenticated: ["GET /user/gpg_keys/{gpg_key_id}", {}, {
+      renamed: ["users", "getGpgKeyForAuthenticatedUser"]
+    }],
+    getGpgKeyForAuthenticatedUser: ["GET /user/gpg_keys/{gpg_key_id}"],
+    getPublicSshKeyForAuthenticated: ["GET /user/keys/{key_id}", {}, {
+      renamed: ["users", "getPublicSshKeyForAuthenticatedUser"]
+    }],
+    getPublicSshKeyForAuthenticatedUser: ["GET /user/keys/{key_id}"],
+    list: ["GET /users"],
+    listBlockedByAuthenticated: ["GET /user/blocks", {}, {
+      renamed: ["users", "listBlockedByAuthenticatedUser"]
+    }],
+    listBlockedByAuthenticatedUser: ["GET /user/blocks"],
+    listEmailsForAuthenticated: ["GET /user/emails", {}, {
+      renamed: ["users", "listEmailsForAuthenticatedUser"]
+    }],
+    listEmailsForAuthenticatedUser: ["GET /user/emails"],
+    listFollowedByAuthenticated: ["GET /user/following", {}, {
+      renamed: ["users", "listFollowedByAuthenticatedUser"]
+    }],
+    listFollowedByAuthenticatedUser: ["GET /user/following"],
+    listFollowersForAuthenticatedUser: ["GET /user/followers"],
+    listFollowersForUser: ["GET /users/{username}/followers"],
+    listFollowingForUser: ["GET /users/{username}/following"],
+    listGpgKeysForAuthenticated: ["GET /user/gpg_keys", {}, {
+      renamed: ["users", "listGpgKeysForAuthenticatedUser"]
+    }],
+    listGpgKeysForAuthenticatedUser: ["GET /user/gpg_keys"],
+    listGpgKeysForUser: ["GET /users/{username}/gpg_keys"],
+    listPublicEmailsForAuthenticated: ["GET /user/public_emails", {}, {
+      renamed: ["users", "listPublicEmailsForAuthenticatedUser"]
+    }],
+    listPublicEmailsForAuthenticatedUser: ["GET /user/public_emails"],
+    listPublicKeysForUser: ["GET /users/{username}/keys"],
+    listPublicSshKeysForAuthenticated: ["GET /user/keys", {}, {
+      renamed: ["users", "listPublicSshKeysForAuthenticatedUser"]
+    }],
+    listPublicSshKeysForAuthenticatedUser: ["GET /user/keys"],
+    setPrimaryEmailVisibilityForAuthenticated: ["PATCH /user/email/visibility", {}, {
+      renamed: ["users", "setPrimaryEmailVisibilityForAuthenticatedUser"]
+    }],
+    setPrimaryEmailVisibilityForAuthenticatedUser: ["PATCH /user/email/visibility"],
+    unblock: ["DELETE /user/blocks/{username}"],
+    unfollow: ["DELETE /user/following/{username}"],
+    updateAuthenticated: ["PATCH /user"]
+  }
+};
+
+const VERSION = "5.16.2";
+
+function endpointsToMethods(octokit, endpointsMap) {
+  const newMethods = {};
+
+  for (const [scope, endpoints] of Object.entries(endpointsMap)) {
+    for (const [methodName, endpoint] of Object.entries(endpoints)) {
+      const [route, defaults, decorations] = endpoint;
+      const [method, url] = route.split(/ /);
+      const endpointDefaults = Object.assign({
+        method,
+        url
+      }, defaults);
+
+      if (!newMethods[scope]) {
+        newMethods[scope] = {};
+      }
+
+      const scopeMethods = newMethods[scope];
+
+      if (decorations) {
+        scopeMethods[methodName] = decorate(octokit, scope, methodName, endpointDefaults, decorations);
+        continue;
+      }
+
+      scopeMethods[methodName] = octokit.request.defaults(endpointDefaults);
+    }
+  }
+
+  return newMethods;
+}
+
+function decorate(octokit, scope, methodName, defaults, decorations) {
+  const requestWithDefaults = octokit.request.defaults(defaults);
+  /* istanbul ignore next */
+
+  function withDecorations(...args) {
+    // @ts-ignore https://github.com/microsoft/TypeScript/issues/25488
+    let options = requestWithDefaults.endpoint.merge(...args); // There are currently no other decorations than `.mapToData`
+
+    if (decorations.mapToData) {
+      options = Object.assign({}, options, {
+        data: options[decorations.mapToData],
+        [decorations.mapToData]: undefined
+      });
+      return requestWithDefaults(options);
+    }
+
+    if (decorations.renamed) {
+      const [newScope, newMethodName] = decorations.renamed;
+      octokit.log.warn(`octokit.${scope}.${methodName}() has been renamed to octokit.${newScope}.${newMethodName}()`);
+    }
+
+    if (decorations.deprecated) {
+      octokit.log.warn(decorations.deprecated);
+    }
+
+    if (decorations.renamedParameters) {
+      // @ts-ignore https://github.com/microsoft/TypeScript/issues/25488
+      const options = requestWithDefaults.endpoint.merge(...args);
+
+      for (const [name, alias] of Object.entries(decorations.renamedParameters)) {
+        if (name in options) {
+          octokit.log.warn(`"${name}" parameter is deprecated for "octokit.${scope}.${methodName}()". Use "${alias}" instead`);
+
+          if (!(alias in options)) {
+            options[alias] = options[name];
+          }
+
+          delete options[name];
+        }
+      }
+
+      return requestWithDefaults(options);
+    } // @ts-ignore https://github.com/microsoft/TypeScript/issues/25488
+
+
+    return requestWithDefaults(...args);
+  }
+
+  return Object.assign(withDecorations, requestWithDefaults);
+}
+
+function restEndpointMethods(octokit) {
+  const api = endpointsToMethods(octokit, Endpoints);
+  return {
+    rest: api
+  };
+}
+restEndpointMethods.VERSION = VERSION;
+function legacyRestEndpointMethods(octokit) {
+  const api = endpointsToMethods(octokit, Endpoints);
+  return _objectSpread2(_objectSpread2({}, api), {}, {
+    rest: api
+  });
+}
+legacyRestEndpointMethods.VERSION = VERSION;
+
+exports.legacyRestEndpointMethods = legacyRestEndpointMethods;
+exports.restEndpointMethods = restEndpointMethods;
+//# sourceMappingURL=index.js.map
+
+
+/***/ }),
+
+/***/ 9968:
+/***/ ((__unused_webpack_module, exports, __nccwpck_require__) => {
+
+"use strict";
+
+
+Object.defineProperty(exports, "__esModule", ({ value: true }));
+
+function _interopDefault (ex) { return (ex && (typeof ex === 'object') && 'default' in ex) ? ex['default'] : ex; }
+
+var BottleneckLight = _interopDefault(__nccwpck_require__(1174));
+
+const VERSION = "4.1.0";
+
+const noop = () => Promise.resolve(); // @ts-expect-error
+
+
+function wrapRequest(state, request, options) {
+  return state.retryLimiter.schedule(doRequest, state, request, options);
+} // @ts-expect-error
+
+async function doRequest(state, request, options) {
+  const isWrite = options.method !== "GET" && options.method !== "HEAD";
+  const {
+    pathname
+  } = new URL(options.url, "http://github.test");
+  const isSearch = options.method === "GET" && pathname.startsWith("/search/");
+  const isGraphQL = pathname.startsWith("/graphql");
+  const retryCount = ~~options.request.retryCount;
+  const jobOptions = retryCount > 0 ? {
+    priority: 0,
+    weight: 0
+  } : {};
+
+  if (state.clustering) {
+    // Remove a job from Redis if it has not completed or failed within 60s
+    // Examples: Node process terminated, client disconnected, etc.
+    // @ts-expect-error
+    jobOptions.expiration = 1000 * 60;
+  } // Guarantee at least 1000ms between writes
+  // GraphQL can also trigger writes
+
+
+  if (isWrite || isGraphQL) {
+    await state.write.key(state.id).schedule(jobOptions, noop);
+  } // Guarantee at least 3000ms between requests that trigger notifications
+
+
+  if (isWrite && state.triggersNotification(pathname)) {
+    await state.notifications.key(state.id).schedule(jobOptions, noop);
+  } // Guarantee at least 2000ms between search requests
+
+
+  if (isSearch) {
+    await state.search.key(state.id).schedule(jobOptions, noop);
+  }
+
+  const req = state.global.key(state.id).schedule(jobOptions, request, options);
+
+  if (isGraphQL) {
+    const res = await req;
+
+    if (res.data.errors != null && // @ts-expect-error
+    res.data.errors.some(error => error.type === "RATE_LIMITED")) {
+      const error = Object.assign(new Error("GraphQL Rate Limit Exceeded"), {
+        response: res,
+        data: res.data
+      });
+      throw error;
+    }
+  }
+
+  return req;
+}
+
+var triggersNotificationPaths = ["/orgs/{org}/invitations", "/orgs/{org}/invitations/{invitation_id}", "/orgs/{org}/teams/{team_slug}/discussions", "/orgs/{org}/teams/{team_slug}/discussions/{discussion_number}/comments", "/repos/{owner}/{repo}/collaborators/{username}", "/repos/{owner}/{repo}/commits/{commit_sha}/comments", "/repos/{owner}/{repo}/issues", "/repos/{owner}/{repo}/issues/{issue_number}/comments", "/repos/{owner}/{repo}/pulls", "/repos/{owner}/{repo}/pulls/{pull_number}/comments", "/repos/{owner}/{repo}/pulls/{pull_number}/comments/{comment_id}/replies", "/repos/{owner}/{repo}/pulls/{pull_number}/merge", "/repos/{owner}/{repo}/pulls/{pull_number}/requested_reviewers", "/repos/{owner}/{repo}/pulls/{pull_number}/reviews", "/repos/{owner}/{repo}/releases", "/teams/{team_id}/discussions", "/teams/{team_id}/discussions/{discussion_number}/comments"];
+
+function routeMatcher(paths) {
+  // EXAMPLE. For the following paths:
+
+  /* [
+      "/orgs/{org}/invitations",
+      "/repos/{owner}/{repo}/collaborators/{username}"
+  ] */
+  const regexes = paths.map(path => path.split("/").map(c => c.startsWith("{") ? "(?:.+?)" : c).join("/")); // 'regexes' would contain:
+
+  /* [
+      '/orgs/(?:.+?)/invitations',
+      '/repos/(?:.+?)/(?:.+?)/collaborators/(?:.+?)'
+  ] */
+
+  const regex = `^(?:${regexes.map(r => `(?:${r})`).join("|")})[^/]*$`; // 'regex' would contain:
+
+  /*
+    ^(?:(?:\/orgs\/(?:.+?)\/invitations)|(?:\/repos\/(?:.+?)\/(?:.+?)\/collaborators\/(?:.+?)))[^\/]*$
+       It may look scary, but paste it into https://www.debuggex.com/
+    and it will make a lot more sense!
+  */
+
+  return new RegExp(regex, "i");
+}
+
+// @ts-expect-error
+
+const regex = routeMatcher(triggersNotificationPaths);
+const triggersNotification = regex.test.bind(regex);
+const groups = {}; // @ts-expect-error
+
+const createGroups = function (Bottleneck, common) {
+  groups.global = new Bottleneck.Group({
+    id: "octokit-global",
+    maxConcurrent: 10,
+    ...common
+  });
+  groups.search = new Bottleneck.Group({
+    id: "octokit-search",
+    maxConcurrent: 1,
+    minTime: 2000,
+    ...common
+  });
+  groups.write = new Bottleneck.Group({
+    id: "octokit-write",
+    maxConcurrent: 1,
+    minTime: 1000,
+    ...common
+  });
+  groups.notifications = new Bottleneck.Group({
+    id: "octokit-notifications",
+    maxConcurrent: 1,
+    minTime: 3000,
+    ...common
+  });
+};
+
+function throttling(octokit, octokitOptions) {
+  const {
+    enabled = true,
+    Bottleneck = BottleneckLight,
+    id = "no-id",
+    timeout = 1000 * 60 * 2,
+    // Redis TTL: 2 minutes
+    connection
+  } = octokitOptions.throttle || {};
+
+  if (!enabled) {
+    return {};
+  }
+
+  const common = {
+    connection,
+    timeout
+  };
+
+  if (groups.global == null) {
+    createGroups(Bottleneck, common);
+  }
+
+  const state = Object.assign({
+    clustering: connection != null,
+    triggersNotification,
+    minimumSecondaryRateRetryAfter: 5,
+    retryAfterBaseValue: 1000,
+    retryLimiter: new Bottleneck(),
+    id,
+    ...groups
+  }, octokitOptions.throttle);
+  const isUsingDeprecatedOnAbuseLimitHandler = typeof state.onAbuseLimit === "function" && state.onAbuseLimit;
+
+  if (typeof (isUsingDeprecatedOnAbuseLimitHandler ? state.onAbuseLimit : state.onSecondaryRateLimit) !== "function" || typeof state.onRateLimit !== "function") {
+    throw new Error(`octokit/plugin-throttling error:
+        You must pass the onSecondaryRateLimit and onRateLimit error handlers.
+        See https://github.com/octokit/rest.js#throttling
+
+        const octokit = new Octokit({
+          throttle: {
+            onSecondaryRateLimit: (retryAfter, options) => {/* ... */},
+            onRateLimit: (retryAfter, options) => {/* ... */}
+          }
+        })
+    `);
+  }
+
+  const events = {};
+  const emitter = new Bottleneck.Events(events); // @ts-expect-error
+
+  events.on("secondary-limit", isUsingDeprecatedOnAbuseLimitHandler ? function (...args) {
+    octokit.log.warn("[@octokit/plugin-throttling] `onAbuseLimit()` is deprecated and will be removed in a future release of `@octokit/plugin-throttling`, please use the `onSecondaryRateLimit` handler instead");
+    return state.onAbuseLimit(...args);
+  } : state.onSecondaryRateLimit); // @ts-expect-error
+
+  events.on("rate-limit", state.onRateLimit); // @ts-expect-error
+
+  events.on("error", e => octokit.log.warn("Error in throttling-plugin limit handler", e)); // @ts-expect-error
+
+  state.retryLimiter.on("failed", async function (error, info) {
+    const options = info.args[info.args.length - 1];
+    const {
+      pathname
+    } = new URL(options.url, "http://github.test");
+    const shouldRetryGraphQL = pathname.startsWith("/graphql") && error.status !== 401;
+
+    if (!(shouldRetryGraphQL || error.status === 403)) {
+      return;
+    }
+
+    const retryCount = ~~options.request.retryCount;
+    options.request.retryCount = retryCount;
+    const {
+      wantRetry,
+      retryAfter = 0
+    } = await async function () {
+      if (/\bsecondary rate\b/i.test(error.message)) {
+        // The user has hit the secondary rate limit. (REST and GraphQL)
+        // https://docs.github.com/en/rest/overview/resources-in-the-rest-api#secondary-rate-limits
+        // The Retry-After header can sometimes be blank when hitting a secondary rate limit,
+        // but is always present after 2-3s, so make sure to set `retryAfter` to at least 5s by default.
+        const retryAfter = Math.max(~~error.response.headers["retry-after"], state.minimumSecondaryRateRetryAfter);
+        const wantRetry = await emitter.trigger("secondary-limit", retryAfter, options, octokit);
+        return {
+          wantRetry,
+          retryAfter
+        };
+      }
+
+      if (error.response.headers != null && error.response.headers["x-ratelimit-remaining"] === "0") {
+        // The user has used all their allowed calls for the current time period (REST and GraphQL)
+        // https://docs.github.com/en/rest/reference/rate-limit (REST)
+        // https://docs.github.com/en/graphql/overview/resource-limitations#rate-limit (GraphQL)
+        const rateLimitReset = new Date(~~error.response.headers["x-ratelimit-reset"] * 1000).getTime();
+        const retryAfter = Math.max(Math.ceil((rateLimitReset - Date.now()) / 1000), 0);
+        const wantRetry = await emitter.trigger("rate-limit", retryAfter, options, octokit);
+        return {
+          wantRetry,
+          retryAfter
+        };
+      }
+
+      return {};
+    }();
+
+    if (wantRetry) {
+      options.request.retryCount++;
+      return retryAfter * state.retryAfterBaseValue;
+    }
+  });
+  octokit.hook.wrap("request", wrapRequest.bind(null, state));
+  return {};
+}
+throttling.VERSION = VERSION;
+throttling.triggersNotification = triggersNotification;
+
+exports.throttling = throttling;
+//# sourceMappingURL=index.js.map
+
+
+/***/ }),
+
+/***/ 1659:
+/***/ ((module, exports, __nccwpck_require__) => {
+
+"use strict";
+/**
+ * @author Toru Nagashima <https://github.com/mysticatea>
+ * See LICENSE file in root directory for full license.
+ */
+
+
+Object.defineProperty(exports, "__esModule", ({ value: true }));
+
+var eventTargetShim = __nccwpck_require__(4697);
+
+/**
+ * The signal class.
+ * @see https://dom.spec.whatwg.org/#abortsignal
+ */
+class AbortSignal extends eventTargetShim.EventTarget {
+    /**
+     * AbortSignal cannot be constructed directly.
+     */
+    constructor() {
+        super();
+        throw new TypeError("AbortSignal cannot be constructed directly");
+    }
+    /**
+     * Returns `true` if this `AbortSignal`'s `AbortController` has signaled to abort, and `false` otherwise.
+     */
+    get aborted() {
+        const aborted = abortedFlags.get(this);
+        if (typeof aborted !== "boolean") {
+            throw new TypeError(`Expected 'this' to be an 'AbortSignal' object, but got ${this === null ? "null" : typeof this}`);
+        }
+        return aborted;
+    }
+}
+eventTargetShim.defineEventAttribute(AbortSignal.prototype, "abort");
+/**
+ * Create an AbortSignal object.
+ */
+function createAbortSignal() {
+    const signal = Object.create(AbortSignal.prototype);
+    eventTargetShim.EventTarget.call(signal);
+    abortedFlags.set(signal, false);
+    return signal;
+}
+/**
+ * Abort a given signal.
+ */
+function abortSignal(signal) {
+    if (abortedFlags.get(signal) !== false) {
+        return;
+    }
+    abortedFlags.set(signal, true);
+    signal.dispatchEvent({ type: "abort" });
+}
+/**
+ * Aborted flag for each instances.
+ */
+const abortedFlags = new WeakMap();
+// Properties should be enumerable.
+Object.defineProperties(AbortSignal.prototype, {
+    aborted: { enumerable: true },
+});
+// `toString()` should return `"[object AbortSignal]"`
+if (typeof Symbol === "function" && typeof Symbol.toStringTag === "symbol") {
+    Object.defineProperty(AbortSignal.prototype, Symbol.toStringTag, {
+        configurable: true,
+        value: "AbortSignal",
+    });
+}
+
+/**
+ * The AbortController.
+ * @see https://dom.spec.whatwg.org/#abortcontroller
+ */
+class AbortController {
+    /**
+     * Initialize this controller.
+     */
+    constructor() {
+        signals.set(this, createAbortSignal());
+    }
+    /**
+     * Returns the `AbortSignal` object associated with this object.
+     */
+    get signal() {
+        return getSignal(this);
+    }
+    /**
+     * Abort and signal to any observers that the associated activity is to be aborted.
+     */
+    abort() {
+        abortSignal(getSignal(this));
+    }
+}
+/**
+ * Associated signals.
+ */
+const signals = new WeakMap();
+/**
+ * Get the associated signal of a given controller.
+ */
+function getSignal(controller) {
+    const signal = signals.get(controller);
+    if (signal == null) {
+        throw new TypeError(`Expected 'this' to be an 'AbortController' object, but got ${controller === null ? "null" : typeof controller}`);
+    }
+    return signal;
+}
+// Properties should be enumerable.
+Object.defineProperties(AbortController.prototype, {
+    signal: { enumerable: true },
+    abort: { enumerable: true },
+});
+if (typeof Symbol === "function" && typeof Symbol.toStringTag === "symbol") {
+    Object.defineProperty(AbortController.prototype, Symbol.toStringTag, {
+        configurable: true,
+        value: "AbortController",
+    });
+}
+
+exports.AbortController = AbortController;
+exports.AbortSignal = AbortSignal;
+exports["default"] = AbortController;
+
+module.exports = AbortController
+module.exports.AbortController = module.exports["default"] = AbortController
+module.exports.AbortSignal = AbortSignal
+//# sourceMappingURL=abort-controller.js.map
+
+
+/***/ }),
+
+/***/ 4623:
+/***/ ((module, __unused_webpack_exports, __nccwpck_require__) => {
+
+"use strict";
+
+
+module.exports = __nccwpck_require__(5006);
+module.exports.HttpsAgent = __nccwpck_require__(5500);
+module.exports.constants = __nccwpck_require__(7757);
+
+
+/***/ }),
+
+/***/ 5006:
+/***/ ((module, __unused_webpack_exports, __nccwpck_require__) => {
+
+"use strict";
+
+
+const OriginalAgent = (__nccwpck_require__(3685).Agent);
+const ms = __nccwpck_require__(845);
+const debug = (__nccwpck_require__(3837).debuglog)('agentkeepalive');
+const {
+  INIT_SOCKET,
+  CURRENT_ID,
+  CREATE_ID,
+  SOCKET_CREATED_TIME,
+  SOCKET_NAME,
+  SOCKET_REQUEST_COUNT,
+  SOCKET_REQUEST_FINISHED_COUNT,
+} = __nccwpck_require__(7757);
+
+// OriginalAgent come from
+// - https://github.com/nodejs/node/blob/v8.12.0/lib/_http_agent.js
+// - https://github.com/nodejs/node/blob/v10.12.0/lib/_http_agent.js
+
+// node <= 10
+let defaultTimeoutListenerCount = 1;
+const majorVersion = parseInt(process.version.split('.', 1)[0].substring(1));
+if (majorVersion >= 11 && majorVersion <= 12) {
+  defaultTimeoutListenerCount = 2;
+} else if (majorVersion >= 13) {
+  defaultTimeoutListenerCount = 3;
+}
+
+function deprecate(message) {
+  console.log('[agentkeepalive:deprecated] %s', message);
+}
+
+class Agent extends OriginalAgent {
+  constructor(options) {
+    options = options || {};
+    options.keepAlive = options.keepAlive !== false;
+    // default is keep-alive and 4s free socket timeout
+    // see https://medium.com/ssense-tech/reduce-networking-errors-in-nodejs-23b4eb9f2d83
+    if (options.freeSocketTimeout === undefined) {
+      options.freeSocketTimeout = 4000;
+    }
+    // Legacy API: keepAliveTimeout should be rename to `freeSocketTimeout`
+    if (options.keepAliveTimeout) {
+      deprecate('options.keepAliveTimeout is deprecated, please use options.freeSocketTimeout instead');
+      options.freeSocketTimeout = options.keepAliveTimeout;
+      delete options.keepAliveTimeout;
+    }
+    // Legacy API: freeSocketKeepAliveTimeout should be rename to `freeSocketTimeout`
+    if (options.freeSocketKeepAliveTimeout) {
+      deprecate('options.freeSocketKeepAliveTimeout is deprecated, please use options.freeSocketTimeout instead');
+      options.freeSocketTimeout = options.freeSocketKeepAliveTimeout;
+      delete options.freeSocketKeepAliveTimeout;
+    }
+
+    // Sets the socket to timeout after timeout milliseconds of inactivity on the socket.
+    // By default is double free socket timeout.
+    if (options.timeout === undefined) {
+      // make sure socket default inactivity timeout >= 8s
+      options.timeout = Math.max(options.freeSocketTimeout * 2, 8000);
+    }
+
+    // support humanize format
+    options.timeout = ms(options.timeout);
+    options.freeSocketTimeout = ms(options.freeSocketTimeout);
+    options.socketActiveTTL = options.socketActiveTTL ? ms(options.socketActiveTTL) : 0;
+
+    super(options);
+
+    this[CURRENT_ID] = 0;
+
+    // create socket success counter
+    this.createSocketCount = 0;
+    this.createSocketCountLastCheck = 0;
+
+    this.createSocketErrorCount = 0;
+    this.createSocketErrorCountLastCheck = 0;
+
+    this.closeSocketCount = 0;
+    this.closeSocketCountLastCheck = 0;
+
+    // socket error event count
+    this.errorSocketCount = 0;
+    this.errorSocketCountLastCheck = 0;
+
+    // request finished counter
+    this.requestCount = 0;
+    this.requestCountLastCheck = 0;
+
+    // including free socket timeout counter
+    this.timeoutSocketCount = 0;
+    this.timeoutSocketCountLastCheck = 0;
+
+    this.on('free', socket => {
+      // https://github.com/nodejs/node/pull/32000
+      // Node.js native agent will check socket timeout eqs agent.options.timeout.
+      // Use the ttl or freeSocketTimeout to overwrite.
+      const timeout = this.calcSocketTimeout(socket);
+      if (timeout > 0 && socket.timeout !== timeout) {
+        socket.setTimeout(timeout);
+      }
+    });
+  }
+
+  get freeSocketKeepAliveTimeout() {
+    deprecate('agent.freeSocketKeepAliveTimeout is deprecated, please use agent.options.freeSocketTimeout instead');
+    return this.options.freeSocketTimeout;
+  }
+
+  get timeout() {
+    deprecate('agent.timeout is deprecated, please use agent.options.timeout instead');
+    return this.options.timeout;
+  }
+
+  get socketActiveTTL() {
+    deprecate('agent.socketActiveTTL is deprecated, please use agent.options.socketActiveTTL instead');
+    return this.options.socketActiveTTL;
+  }
+
+  calcSocketTimeout(socket) {
+    /**
+     * return <= 0: should free socket
+     * return > 0: should update socket timeout
+     * return undefined: not find custom timeout
+     */
+    let freeSocketTimeout = this.options.freeSocketTimeout;
+    const socketActiveTTL = this.options.socketActiveTTL;
+    if (socketActiveTTL) {
+      // check socketActiveTTL
+      const aliveTime = Date.now() - socket[SOCKET_CREATED_TIME];
+      const diff = socketActiveTTL - aliveTime;
+      if (diff <= 0) {
+        return diff;
+      }
+      if (freeSocketTimeout && diff < freeSocketTimeout) {
+        freeSocketTimeout = diff;
+      }
+    }
+    // set freeSocketTimeout
+    if (freeSocketTimeout) {
+      // set free keepalive timer
+      // try to use socket custom freeSocketTimeout first, support headers['keep-alive']
+      // https://github.com/node-modules/urllib/blob/b76053020923f4d99a1c93cf2e16e0c5ba10bacf/lib/urllib.js#L498
+      const customFreeSocketTimeout = socket.freeSocketTimeout || socket.freeSocketKeepAliveTimeout;
+      return customFreeSocketTimeout || freeSocketTimeout;
+    }
+  }
+
+  keepSocketAlive(socket) {
+    const result = super.keepSocketAlive(socket);
+    // should not keepAlive, do nothing
+    if (!result) return result;
+
+    const customTimeout = this.calcSocketTimeout(socket);
+    if (typeof customTimeout === 'undefined') {
+      return true;
+    }
+    if (customTimeout <= 0) {
+      debug('%s(requests: %s, finished: %s) free but need to destroy by TTL, request count %s, diff is %s',
+        socket[SOCKET_NAME], socket[SOCKET_REQUEST_COUNT], socket[SOCKET_REQUEST_FINISHED_COUNT], customTimeout);
+      return false;
+    }
+    if (socket.timeout !== customTimeout) {
+      socket.setTimeout(customTimeout);
+    }
+    return true;
+  }
+
+  // only call on addRequest
+  reuseSocket(...args) {
+    // reuseSocket(socket, req)
+    super.reuseSocket(...args);
+    const socket = args[0];
+    const req = args[1];
+    req.reusedSocket = true;
+    const agentTimeout = this.options.timeout;
+    if (getSocketTimeout(socket) !== agentTimeout) {
+      // reset timeout before use
+      socket.setTimeout(agentTimeout);
+      debug('%s reset timeout to %sms', socket[SOCKET_NAME], agentTimeout);
+    }
+    socket[SOCKET_REQUEST_COUNT]++;
+    debug('%s(requests: %s, finished: %s) reuse on addRequest, timeout %sms',
+      socket[SOCKET_NAME], socket[SOCKET_REQUEST_COUNT], socket[SOCKET_REQUEST_FINISHED_COUNT],
+      getSocketTimeout(socket));
+  }
+
+  [CREATE_ID]() {
+    const id = this[CURRENT_ID]++;
+    if (this[CURRENT_ID] === Number.MAX_SAFE_INTEGER) this[CURRENT_ID] = 0;
+    return id;
+  }
+
+  [INIT_SOCKET](socket, options) {
+    // bugfix here.
+    // https on node 8, 10 won't set agent.options.timeout by default
+    // TODO: need to fix on node itself
+    if (options.timeout) {
+      const timeout = getSocketTimeout(socket);
+      if (!timeout) {
+        socket.setTimeout(options.timeout);
+      }
+    }
+
+    if (this.options.keepAlive) {
+      // Disable Nagle's algorithm: http://blog.caustik.com/2012/04/08/scaling-node-js-to-100k-concurrent-connections/
+      // https://fengmk2.com/benchmark/nagle-algorithm-delayed-ack-mock.html
+      socket.setNoDelay(true);
+    }
+    this.createSocketCount++;
+    if (this.options.socketActiveTTL) {
+      socket[SOCKET_CREATED_TIME] = Date.now();
+    }
+    // don't show the hole '-----BEGIN CERTIFICATE----' key string
+    socket[SOCKET_NAME] = `sock[${this[CREATE_ID]()}#${options._agentKey}]`.split('-----BEGIN', 1)[0];
+    socket[SOCKET_REQUEST_COUNT] = 1;
+    socket[SOCKET_REQUEST_FINISHED_COUNT] = 0;
+    installListeners(this, socket, options);
+  }
+
+  createConnection(options, oncreate) {
+    let called = false;
+    const onNewCreate = (err, socket) => {
+      if (called) return;
+      called = true;
+
+      if (err) {
+        this.createSocketErrorCount++;
+        return oncreate(err);
+      }
+      this[INIT_SOCKET](socket, options);
+      oncreate(err, socket);
+    };
+
+    const newSocket = super.createConnection(options, onNewCreate);
+    if (newSocket) onNewCreate(null, newSocket);
+    return newSocket;
+  }
+
+  get statusChanged() {
+    const changed = this.createSocketCount !== this.createSocketCountLastCheck ||
+      this.createSocketErrorCount !== this.createSocketErrorCountLastCheck ||
+      this.closeSocketCount !== this.closeSocketCountLastCheck ||
+      this.errorSocketCount !== this.errorSocketCountLastCheck ||
+      this.timeoutSocketCount !== this.timeoutSocketCountLastCheck ||
+      this.requestCount !== this.requestCountLastCheck;
+    if (changed) {
+      this.createSocketCountLastCheck = this.createSocketCount;
+      this.createSocketErrorCountLastCheck = this.createSocketErrorCount;
+      this.closeSocketCountLastCheck = this.closeSocketCount;
+      this.errorSocketCountLastCheck = this.errorSocketCount;
+      this.timeoutSocketCountLastCheck = this.timeoutSocketCount;
+      this.requestCountLastCheck = this.requestCount;
+    }
+    return changed;
+  }
+
+  getCurrentStatus() {
+    return {
+      createSocketCount: this.createSocketCount,
+      createSocketErrorCount: this.createSocketErrorCount,
+      closeSocketCount: this.closeSocketCount,
+      errorSocketCount: this.errorSocketCount,
+      timeoutSocketCount: this.timeoutSocketCount,
+      requestCount: this.requestCount,
+      freeSockets: inspect(this.freeSockets),
+      sockets: inspect(this.sockets),
+      requests: inspect(this.requests),
+    };
+  }
+}
+
+// node 8 don't has timeout attribute on socket
+// https://github.com/nodejs/node/pull/21204/files#diff-e6ef024c3775d787c38487a6309e491dR408
+function getSocketTimeout(socket) {
+  return socket.timeout || socket._idleTimeout;
+}
+
+function installListeners(agent, socket, options) {
+  debug('%s create, timeout %sms', socket[SOCKET_NAME], getSocketTimeout(socket));
+
+  // listener socket events: close, timeout, error, free
+  function onFree() {
+    // create and socket.emit('free') logic
+    // https://github.com/nodejs/node/blob/master/lib/_http_agent.js#L311
+    // no req on the socket, it should be the new socket
+    if (!socket._httpMessage && socket[SOCKET_REQUEST_COUNT] === 1) return;
+
+    socket[SOCKET_REQUEST_FINISHED_COUNT]++;
+    agent.requestCount++;
+    debug('%s(requests: %s, finished: %s) free',
+      socket[SOCKET_NAME], socket[SOCKET_REQUEST_COUNT], socket[SOCKET_REQUEST_FINISHED_COUNT]);
+
+    // should reuse on pedding requests?
+    const name = agent.getName(options);
+    if (socket.writable && agent.requests[name] && agent.requests[name].length) {
+      // will be reuse on agent free listener
+      socket[SOCKET_REQUEST_COUNT]++;
+      debug('%s(requests: %s, finished: %s) will be reuse on agent free event',
+        socket[SOCKET_NAME], socket[SOCKET_REQUEST_COUNT], socket[SOCKET_REQUEST_FINISHED_COUNT]);
+    }
+  }
+  socket.on('free', onFree);
+
+  function onClose(isError) {
+    debug('%s(requests: %s, finished: %s) close, isError: %s',
+      socket[SOCKET_NAME], socket[SOCKET_REQUEST_COUNT], socket[SOCKET_REQUEST_FINISHED_COUNT], isError);
+    agent.closeSocketCount++;
+  }
+  socket.on('close', onClose);
+
+  // start socket timeout handler
+  function onTimeout() {
+    // onTimeout and emitRequestTimeout(_http_client.js)
+    // https://github.com/nodejs/node/blob/v12.x/lib/_http_client.js#L711
+    const listenerCount = socket.listeners('timeout').length;
+    // node <= 10, default listenerCount is 1, onTimeout
+    // 11 < node <= 12, default listenerCount is 2, onTimeout and emitRequestTimeout
+    // node >= 13, default listenerCount is 3, onTimeout,
+    //   onTimeout(https://github.com/nodejs/node/pull/32000/files#diff-5f7fb0850412c6be189faeddea6c5359R333)
+    //   and emitRequestTimeout
+    const timeout = getSocketTimeout(socket);
+    const req = socket._httpMessage;
+    const reqTimeoutListenerCount = req && req.listeners('timeout').length || 0;
+    debug('%s(requests: %s, finished: %s) timeout after %sms, listeners %s, defaultTimeoutListenerCount %s, hasHttpRequest %s, HttpRequest timeoutListenerCount %s',
+      socket[SOCKET_NAME], socket[SOCKET_REQUEST_COUNT], socket[SOCKET_REQUEST_FINISHED_COUNT],
+      timeout, listenerCount, defaultTimeoutListenerCount, !!req, reqTimeoutListenerCount);
+    if (debug.enabled) {
+      debug('timeout listeners: %s', socket.listeners('timeout').map(f => f.name).join(', '));
+    }
+    agent.timeoutSocketCount++;
+    const name = agent.getName(options);
+    if (agent.freeSockets[name] && agent.freeSockets[name].indexOf(socket) !== -1) {
+      // free socket timeout, destroy quietly
+      socket.destroy();
+      // Remove it from freeSockets list immediately to prevent new requests
+      // from being sent through this socket.
+      agent.removeSocket(socket, options);
+      debug('%s is free, destroy quietly', socket[SOCKET_NAME]);
+    } else {
+      // if there is no any request socket timeout handler,
+      // agent need to handle socket timeout itself.
+      //
+      // custom request socket timeout handle logic must follow these rules:
+      //  1. Destroy socket first
+      //  2. Must emit socket 'agentRemove' event tell agent remove socket
+      //     from freeSockets list immediately.
+      //     Otherise you may be get 'socket hang up' error when reuse
+      //     free socket and timeout happen in the same time.
+      if (reqTimeoutListenerCount === 0) {
+        const error = new Error('Socket timeout');
+        error.code = 'ERR_SOCKET_TIMEOUT';
+        error.timeout = timeout;
+        // must manually call socket.end() or socket.destroy() to end the connection.
+        // https://nodejs.org/dist/latest-v10.x/docs/api/net.html#net_socket_settimeout_timeout_callback
+        socket.destroy(error);
+        agent.removeSocket(socket, options);
+        debug('%s destroy with timeout error', socket[SOCKET_NAME]);
+      }
+    }
+  }
+  socket.on('timeout', onTimeout);
+
+  function onError(err) {
+    const listenerCount = socket.listeners('error').length;
+    debug('%s(requests: %s, finished: %s) error: %s, listenerCount: %s',
+      socket[SOCKET_NAME], socket[SOCKET_REQUEST_COUNT], socket[SOCKET_REQUEST_FINISHED_COUNT],
+      err, listenerCount);
+    agent.errorSocketCount++;
+    if (listenerCount === 1) {
+      // if socket don't contain error event handler, don't catch it, emit it again
+      debug('%s emit uncaught error event', socket[SOCKET_NAME]);
+      socket.removeListener('error', onError);
+      socket.emit('error', err);
+    }
+  }
+  socket.on('error', onError);
+
+  function onRemove() {
+    debug('%s(requests: %s, finished: %s) agentRemove',
+      socket[SOCKET_NAME],
+      socket[SOCKET_REQUEST_COUNT], socket[SOCKET_REQUEST_FINISHED_COUNT]);
+    // We need this function for cases like HTTP 'upgrade'
+    // (defined by WebSockets) where we need to remove a socket from the
+    // pool because it'll be locked up indefinitely
+    socket.removeListener('close', onClose);
+    socket.removeListener('error', onError);
+    socket.removeListener('free', onFree);
+    socket.removeListener('timeout', onTimeout);
+    socket.removeListener('agentRemove', onRemove);
+  }
+  socket.on('agentRemove', onRemove);
+}
+
+module.exports = Agent;
+
+function inspect(obj) {
+  const res = {};
+  for (const key in obj) {
+    res[key] = obj[key].length;
+  }
+  return res;
+}
+
+
+/***/ }),
+
+/***/ 7757:
+/***/ ((module) => {
+
+"use strict";
+
+
+module.exports = {
+  // agent
+  CURRENT_ID: Symbol('agentkeepalive#currentId'),
+  CREATE_ID: Symbol('agentkeepalive#createId'),
+  INIT_SOCKET: Symbol('agentkeepalive#initSocket'),
+  CREATE_HTTPS_CONNECTION: Symbol('agentkeepalive#createHttpsConnection'),
+  // socket
+  SOCKET_CREATED_TIME: Symbol('agentkeepalive#socketCreatedTime'),
+  SOCKET_NAME: Symbol('agentkeepalive#socketName'),
+  SOCKET_REQUEST_COUNT: Symbol('agentkeepalive#socketRequestCount'),
+  SOCKET_REQUEST_FINISHED_COUNT: Symbol('agentkeepalive#socketRequestFinishedCount'),
+};
+
+
+/***/ }),
+
+/***/ 5500:
+/***/ ((module, __unused_webpack_exports, __nccwpck_require__) => {
+
+"use strict";
+
+
+const OriginalHttpsAgent = (__nccwpck_require__(5687).Agent);
+const HttpAgent = __nccwpck_require__(5006);
+const {
+  INIT_SOCKET,
+  CREATE_HTTPS_CONNECTION,
+} = __nccwpck_require__(7757);
+
+class HttpsAgent extends HttpAgent {
+  constructor(options) {
+    super(options);
+
+    this.defaultPort = 443;
+    this.protocol = 'https:';
+    this.maxCachedSessions = this.options.maxCachedSessions;
+    /* istanbul ignore next */
+    if (this.maxCachedSessions === undefined) {
+      this.maxCachedSessions = 100;
+    }
+
+    this._sessionCache = {
+      map: {},
+      list: [],
+    };
+  }
+
+  createConnection(options, oncreate) {
+    const socket = this[CREATE_HTTPS_CONNECTION](options, oncreate);
+    this[INIT_SOCKET](socket, options);
+    return socket;
+  }
+}
+
+// https://github.com/nodejs/node/blob/master/lib/https.js#L89
+HttpsAgent.prototype[CREATE_HTTPS_CONNECTION] = OriginalHttpsAgent.prototype.createConnection;
+
+[
+  'getName',
+  '_getSession',
+  '_cacheSession',
+  // https://github.com/nodejs/node/pull/4982
+  '_evictSession',
+].forEach(function(method) {
+  /* istanbul ignore next */
+  if (typeof OriginalHttpsAgent.prototype[method] === 'function') {
+    HttpsAgent.prototype[method] = OriginalHttpsAgent.prototype[method];
+  }
+});
+
+module.exports = HttpsAgent;
+
+
+/***/ }),
+
+/***/ 3682:
+/***/ ((module, __unused_webpack_exports, __nccwpck_require__) => {
+
+var register = __nccwpck_require__(4670)
+var addHook = __nccwpck_require__(5549)
+var removeHook = __nccwpck_require__(6819)
+
+// bind with array of arguments: https://stackoverflow.com/a/21792913
+var bind = Function.bind
+var bindable = bind.bind(bind)
+
+function bindApi (hook, state, name) {
+  var removeHookRef = bindable(removeHook, null).apply(null, name ? [state, name] : [state])
+  hook.api = { remove: removeHookRef }
+  hook.remove = removeHookRef
+
+  ;['before', 'error', 'after', 'wrap'].forEach(function (kind) {
+    var args = name ? [state, kind, name] : [state, kind]
+    hook[kind] = hook.api[kind] = bindable(addHook, null).apply(null, args)
+  })
+}
+
+function HookSingular () {
+  var singularHookName = 'h'
+  var singularHookState = {
+    registry: {}
+  }
+  var singularHook = register.bind(null, singularHookState, singularHookName)
+  bindApi(singularHook, singularHookState, singularHookName)
+  return singularHook
+}
+
+function HookCollection () {
+  var state = {
+    registry: {}
+  }
+
+  var hook = register.bind(null, state)
+  bindApi(hook, state)
+
+  return hook
+}
+
+var collectionHookDeprecationMessageDisplayed = false
+function Hook () {
+  if (!collectionHookDeprecationMessageDisplayed) {
+    console.warn('[before-after-hook]: "Hook()" repurposing warning, use "Hook.Collection()". Read more: https://git.io/upgrade-before-after-hook-to-1.4')
+    collectionHookDeprecationMessageDisplayed = true
+  }
+  return HookCollection()
+}
+
+Hook.Singular = HookSingular.bind()
+Hook.Collection = HookCollection.bind()
+
+module.exports = Hook
+// expose constructors as a named property for TypeScript
+module.exports.Hook = Hook
+module.exports.Singular = Hook.Singular
+module.exports.Collection = Hook.Collection
+
+
+/***/ }),
+
+/***/ 5549:
+/***/ ((module) => {
+
+module.exports = addHook;
+
+function addHook(state, kind, name, hook) {
+  var orig = hook;
+  if (!state.registry[name]) {
+    state.registry[name] = [];
+  }
+
+  if (kind === "before") {
+    hook = function (method, options) {
+      return Promise.resolve()
+        .then(orig.bind(null, options))
+        .then(method.bind(null, options));
+    };
+  }
+
+  if (kind === "after") {
+    hook = function (method, options) {
+      var result;
+      return Promise.resolve()
+        .then(method.bind(null, options))
+        .then(function (result_) {
+          result = result_;
+          return orig(result, options);
+        })
+        .then(function () {
+          return result;
+        });
+    };
+  }
+
+  if (kind === "error") {
+    hook = function (method, options) {
+      return Promise.resolve()
+        .then(method.bind(null, options))
+        .catch(function (error) {
+          return orig(error, options);
+        });
+    };
+  }
+
+  state.registry[name].push({
+    hook: hook,
+    orig: orig,
+  });
+}
+
+
+/***/ }),
+
+/***/ 4670:
+/***/ ((module) => {
+
+module.exports = register;
+
+function register(state, name, method, options) {
+  if (typeof method !== "function") {
+    throw new Error("method for before hook must be a function");
+  }
+
+  if (!options) {
+    options = {};
+  }
+
+  if (Array.isArray(name)) {
+    return name.reverse().reduce(function (callback, name) {
+      return register.bind(null, state, name, callback, options);
+    }, method)();
+  }
+
+  return Promise.resolve().then(function () {
+    if (!state.registry[name]) {
+      return method(options);
+    }
+
+    return state.registry[name].reduce(function (method, registered) {
+      return registered.hook.bind(null, method, options);
+    }, method)();
+  });
+}
+
+
+/***/ }),
+
+/***/ 6819:
+/***/ ((module) => {
+
+module.exports = removeHook;
+
+function removeHook(state, name, method) {
+  if (!state.registry[name]) {
+    return;
+  }
+
+  var index = state.registry[name]
+    .map(function (registered) {
+      return registered.orig;
+    })
+    .indexOf(method);
+
+  if (index === -1) {
+    return;
+  }
+
+  state.registry[name].splice(index, 1);
+}
+
+
+/***/ }),
+
+/***/ 1174:
+/***/ (function(module) {
+
+/**
+  * This file contains the Bottleneck library (MIT), compiled to ES2017, and without Clustering support.
+  * https://github.com/SGrondin/bottleneck
+  */
+(function (global, factory) {
+	 true ? module.exports = factory() :
+	0;
+}(this, (function () { 'use strict';
+
+	var commonjsGlobal = typeof globalThis !== 'undefined' ? globalThis : typeof window !== 'undefined' ? window : typeof global !== 'undefined' ? global : typeof self !== 'undefined' ? self : {};
+
+	function getCjsExportFromNamespace (n) {
+		return n && n['default'] || n;
+	}
+
+	var load = function(received, defaults, onto = {}) {
+	  var k, ref, v;
+	  for (k in defaults) {
+	    v = defaults[k];
+	    onto[k] = (ref = received[k]) != null ? ref : v;
+	  }
+	  return onto;
+	};
+
+	var overwrite = function(received, defaults, onto = {}) {
+	  var k, v;
+	  for (k in received) {
+	    v = received[k];
+	    if (defaults[k] !== void 0) {
+	      onto[k] = v;
+	    }
+	  }
+	  return onto;
+	};
+
+	var parser = {
+		load: load,
+		overwrite: overwrite
+	};
+
+	var DLList;
+
+	DLList = class DLList {
+	  constructor(incr, decr) {
+	    this.incr = incr;
+	    this.decr = decr;
+	    this._first = null;
+	    this._last = null;
+	    this.length = 0;
+	  }
+
+	  push(value) {
+	    var node;
+	    this.length++;
+	    if (typeof this.incr === "function") {
+	      this.incr();
+	    }
+	    node = {
+	      value,
+	      prev: this._last,
+	      next: null
+	    };
+	    if (this._last != null) {
+	      this._last.next = node;
+	      this._last = node;
+	    } else {
+	      this._first = this._last = node;
+	    }
+	    return void 0;
+	  }
+
+	  shift() {
+	    var value;
+	    if (this._first == null) {
+	      return;
+	    } else {
+	      this.length--;
+	      if (typeof this.decr === "function") {
+	        this.decr();
+	      }
+	    }
+	    value = this._first.value;
+	    if ((this._first = this._first.next) != null) {
+	      this._first.prev = null;
+	    } else {
+	      this._last = null;
+	    }
+	    return value;
+	  }
+
+	  first() {
+	    if (this._first != null) {
+	      return this._first.value;
+	    }
+	  }
+
+	  getArray() {
+	    var node, ref, results;
+	    node = this._first;
+	    results = [];
+	    while (node != null) {
+	      results.push((ref = node, node = node.next, ref.value));
+	    }
+	    return results;
+	  }
+
+	  forEachShift(cb) {
+	    var node;
+	    node = this.shift();
+	    while (node != null) {
+	      (cb(node), node = this.shift());
+	    }
+	    return void 0;
+	  }
+
+	  debug() {
+	    var node, ref, ref1, ref2, results;
+	    node = this._first;
+	    results = [];
+	    while (node != null) {
+	      results.push((ref = node, node = node.next, {
+	        value: ref.value,
+	        prev: (ref1 = ref.prev) != null ? ref1.value : void 0,
+	        next: (ref2 = ref.next) != null ? ref2.value : void 0
+	      }));
+	    }
+	    return results;
+	  }
+
+	};
+
+	var DLList_1 = DLList;
+
+	var Events;
+
+	Events = class Events {
+	  constructor(instance) {
+	    this.instance = instance;
+	    this._events = {};
+	    if ((this.instance.on != null) || (this.instance.once != null) || (this.instance.removeAllListeners != null)) {
+	      throw new Error("An Emitter already exists for this object");
+	    }
+	    this.instance.on = (name, cb) => {
+	      return this._addListener(name, "many", cb);
+	    };
+	    this.instance.once = (name, cb) => {
+	      return this._addListener(name, "once", cb);
+	    };
+	    this.instance.removeAllListeners = (name = null) => {
+	      if (name != null) {
+	        return delete this._events[name];
+	      } else {
+	        return this._events = {};
+	      }
+	    };
+	  }
+
+	  _addListener(name, status, cb) {
+	    var base;
+	    if ((base = this._events)[name] == null) {
+	      base[name] = [];
+	    }
+	    this._events[name].push({cb, status});
+	    return this.instance;
+	  }
+
+	  listenerCount(name) {
+	    if (this._events[name] != null) {
+	      return this._events[name].length;
+	    } else {
+	      return 0;
+	    }
+	  }
+
+	  async trigger(name, ...args) {
+	    var e, promises;
+	    try {
+	      if (name !== "debug") {
+	        this.trigger("debug", `Event triggered: ${name}`, args);
+	      }
+	      if (this._events[name] == null) {
+	        return;
+	      }
+	      this._events[name] = this._events[name].filter(function(listener) {
+	        return listener.status !== "none";
+	      });
+	      promises = this._events[name].map(async(listener) => {
+	        var e, returned;
+	        if (listener.status === "none") {
+	          return;
+	        }
+	        if (listener.status === "once") {
+	          listener.status = "none";
+	        }
+	        try {
+	          returned = typeof listener.cb === "function" ? listener.cb(...args) : void 0;
+	          if (typeof (returned != null ? returned.then : void 0) === "function") {
+	            return (await returned);
+	          } else {
+	            return returned;
+	          }
+	        } catch (error) {
+	          e = error;
+	          {
+	            this.trigger("error", e);
+	          }
+	          return null;
+	        }
+	      });
+	      return ((await Promise.all(promises))).find(function(x) {
+	        return x != null;
+	      });
+	    } catch (error) {
+	      e = error;
+	      {
+	        this.trigger("error", e);
+	      }
+	      return null;
+	    }
+	  }
+
+	};
+
+	var Events_1 = Events;
+
+	var DLList$1, Events$1, Queues;
+
+	DLList$1 = DLList_1;
+
+	Events$1 = Events_1;
+
+	Queues = class Queues {
+	  constructor(num_priorities) {
+	    var i;
+	    this.Events = new Events$1(this);
+	    this._length = 0;
+	    this._lists = (function() {
+	      var j, ref, results;
+	      results = [];
+	      for (i = j = 1, ref = num_priorities; (1 <= ref ? j <= ref : j >= ref); i = 1 <= ref ? ++j : --j) {
+	        results.push(new DLList$1((() => {
+	          return this.incr();
+	        }), (() => {
+	          return this.decr();
+	        })));
+	      }
+	      return results;
+	    }).call(this);
+	  }
+
+	  incr() {
+	    if (this._length++ === 0) {
+	      return this.Events.trigger("leftzero");
+	    }
+	  }
+
+	  decr() {
+	    if (--this._length === 0) {
+	      return this.Events.trigger("zero");
+	    }
+	  }
+
+	  push(job) {
+	    return this._lists[job.options.priority].push(job);
+	  }
+
+	  queued(priority) {
+	    if (priority != null) {
+	      return this._lists[priority].length;
+	    } else {
+	      return this._length;
+	    }
+	  }
+
+	  shiftAll(fn) {
+	    return this._lists.forEach(function(list) {
+	      return list.forEachShift(fn);
+	    });
+	  }
+
+	  getFirst(arr = this._lists) {
+	    var j, len, list;
+	    for (j = 0, len = arr.length; j < len; j++) {
+	      list = arr[j];
+	      if (list.length > 0) {
+	        return list;
+	      }
+	    }
+	    return [];
+	  }
+
+	  shiftLastFrom(priority) {
+	    return this.getFirst(this._lists.slice(priority).reverse()).shift();
+	  }
+
+	};
+
+	var Queues_1 = Queues;
+
+	var BottleneckError;
+
+	BottleneckError = class BottleneckError extends Error {};
+
+	var BottleneckError_1 = BottleneckError;
+
+	var BottleneckError$1, DEFAULT_PRIORITY, Job, NUM_PRIORITIES, parser$1;
+
+	NUM_PRIORITIES = 10;
+
+	DEFAULT_PRIORITY = 5;
+
+	parser$1 = parser;
+
+	BottleneckError$1 = BottleneckError_1;
+
+	Job = class Job {
+	  constructor(task, args, options, jobDefaults, rejectOnDrop, Events, _states, Promise) {
+	    this.task = task;
+	    this.args = args;
+	    this.rejectOnDrop = rejectOnDrop;
+	    this.Events = Events;
+	    this._states = _states;
+	    this.Promise = Promise;
+	    this.options = parser$1.load(options, jobDefaults);
+	    this.options.priority = this._sanitizePriority(this.options.priority);
+	    if (this.options.id === jobDefaults.id) {
+	      this.options.id = `${this.options.id}-${this._randomIndex()}`;
+	    }
+	    this.promise = new this.Promise((_resolve, _reject) => {
+	      this._resolve = _resolve;
+	      this._reject = _reject;
+	    });
+	    this.retryCount = 0;
+	  }
+
+	  _sanitizePriority(priority) {
+	    var sProperty;
+	    sProperty = ~~priority !== priority ? DEFAULT_PRIORITY : priority;
+	    if (sProperty < 0) {
+	      return 0;
+	    } else if (sProperty > NUM_PRIORITIES - 1) {
+	      return NUM_PRIORITIES - 1;
+	    } else {
+	      return sProperty;
+	    }
+	  }
+
+	  _randomIndex() {
+	    return Math.random().toString(36).slice(2);
+	  }
+
+	  doDrop({error, message = "This job has been dropped by Bottleneck"} = {}) {
+	    if (this._states.remove(this.options.id)) {
+	      if (this.rejectOnDrop) {
+	        this._reject(error != null ? error : new BottleneckError$1(message));
+	      }
+	      this.Events.trigger("dropped", {args: this.args, options: this.options, task: this.task, promise: this.promise});
+	      return true;
+	    } else {
+	      return false;
+	    }
+	  }
+
+	  _assertStatus(expected) {
+	    var status;
+	    status = this._states.jobStatus(this.options.id);
+	    if (!(status === expected || (expected === "DONE" && status === null))) {
+	      throw new BottleneckError$1(`Invalid job status ${status}, expected ${expected}. Please open an issue at https://github.com/SGrondin/bottleneck/issues`);
+	    }
+	  }
+
+	  doReceive() {
+	    this._states.start(this.options.id);
+	    return this.Events.trigger("received", {args: this.args, options: this.options});
+	  }
+
+	  doQueue(reachedHWM, blocked) {
+	    this._assertStatus("RECEIVED");
+	    this._states.next(this.options.id);
+	    return this.Events.trigger("queued", {args: this.args, options: this.options, reachedHWM, blocked});
+	  }
+
+	  doRun() {
+	    if (this.retryCount === 0) {
+	      this._assertStatus("QUEUED");
+	      this._states.next(this.options.id);
+	    } else {
+	      this._assertStatus("EXECUTING");
+	    }
+	    return this.Events.trigger("scheduled", {args: this.args, options: this.options});
+	  }
+
+	  async doExecute(chained, clearGlobalState, run, free) {
+	    var error, eventInfo, passed;
+	    if (this.retryCount === 0) {
+	      this._assertStatus("RUNNING");
+	      this._states.next(this.options.id);
+	    } else {
+	      this._assertStatus("EXECUTING");
+	    }
+	    eventInfo = {args: this.args, options: this.options, retryCount: this.retryCount};
+	    this.Events.trigger("executing", eventInfo);
+	    try {
+	      passed = (await (chained != null ? chained.schedule(this.options, this.task, ...this.args) : this.task(...this.args)));
+	      if (clearGlobalState()) {
+	        this.doDone(eventInfo);
+	        await free(this.options, eventInfo);
+	        this._assertStatus("DONE");
+	        return this._resolve(passed);
+	      }
+	    } catch (error1) {
+	      error = error1;
+	      return this._onFailure(error, eventInfo, clearGlobalState, run, free);
+	    }
+	  }
+
+	  doExpire(clearGlobalState, run, free) {
+	    var error, eventInfo;
+	    if (this._states.jobStatus(this.options.id === "RUNNING")) {
+	      this._states.next(this.options.id);
+	    }
+	    this._assertStatus("EXECUTING");
+	    eventInfo = {args: this.args, options: this.options, retryCount: this.retryCount};
+	    error = new BottleneckError$1(`This job timed out after ${this.options.expiration} ms.`);
+	    return this._onFailure(error, eventInfo, clearGlobalState, run, free);
+	  }
+
+	  async _onFailure(error, eventInfo, clearGlobalState, run, free) {
+	    var retry, retryAfter;
+	    if (clearGlobalState()) {
+	      retry = (await this.Events.trigger("failed", error, eventInfo));
+	      if (retry != null) {
+	        retryAfter = ~~retry;
+	        this.Events.trigger("retry", `Retrying ${this.options.id} after ${retryAfter} ms`, eventInfo);
+	        this.retryCount++;
+	        return run(retryAfter);
+	      } else {
+	        this.doDone(eventInfo);
+	        await free(this.options, eventInfo);
+	        this._assertStatus("DONE");
+	        return this._reject(error);
+	      }
+	    }
+	  }
+
+	  doDone(eventInfo) {
+	    this._assertStatus("EXECUTING");
+	    this._states.next(this.options.id);
+	    return this.Events.trigger("done", eventInfo);
+	  }
+
+	};
+
+	var Job_1 = Job;
+
+	var BottleneckError$2, LocalDatastore, parser$2;
+
+	parser$2 = parser;
+
+	BottleneckError$2 = BottleneckError_1;
+
+	LocalDatastore = class LocalDatastore {
+	  constructor(instance, storeOptions, storeInstanceOptions) {
+	    this.instance = instance;
+	    this.storeOptions = storeOptions;
+	    this.clientId = this.instance._randomIndex();
+	    parser$2.load(storeInstanceOptions, storeInstanceOptions, this);
+	    this._nextRequest = this._lastReservoirRefresh = this._lastReservoirIncrease = Date.now();
+	    this._running = 0;
+	    this._done = 0;
+	    this._unblockTime = 0;
+	    this.ready = this.Promise.resolve();
+	    this.clients = {};
+	    this._startHeartbeat();
+	  }
+
+	  _startHeartbeat() {
+	    var base;
+	    if ((this.heartbeat == null) && (((this.storeOptions.reservoirRefreshInterval != null) && (this.storeOptions.reservoirRefreshAmount != null)) || ((this.storeOptions.reservoirIncreaseInterval != null) && (this.storeOptions.reservoirIncreaseAmount != null)))) {
+	      return typeof (base = (this.heartbeat = setInterval(() => {
+	        var amount, incr, maximum, now, reservoir;
+	        now = Date.now();
+	        if ((this.storeOptions.reservoirRefreshInterval != null) && now >= this._lastReservoirRefresh + this.storeOptions.reservoirRefreshInterval) {
+	          this._lastReservoirRefresh = now;
+	          this.storeOptions.reservoir = this.storeOptions.reservoirRefreshAmount;
+	          this.instance._drainAll(this.computeCapacity());
+	        }
+	        if ((this.storeOptions.reservoirIncreaseInterval != null) && now >= this._lastReservoirIncrease + this.storeOptions.reservoirIncreaseInterval) {
+	          ({
+	            reservoirIncreaseAmount: amount,
+	            reservoirIncreaseMaximum: maximum,
+	            reservoir
+	          } = this.storeOptions);
+	          this._lastReservoirIncrease = now;
+	          incr = maximum != null ? Math.min(amount, maximum - reservoir) : amount;
+	          if (incr > 0) {
+	            this.storeOptions.reservoir += incr;
+	            return this.instance._drainAll(this.computeCapacity());
+	          }
+	        }
+	      }, this.heartbeatInterval))).unref === "function" ? base.unref() : void 0;
+	    } else {
+	      return clearInterval(this.heartbeat);
+	    }
+	  }
+
+	  async __publish__(message) {
+	    await this.yieldLoop();
+	    return this.instance.Events.trigger("message", message.toString());
+	  }
+
+	  async __disconnect__(flush) {
+	    await this.yieldLoop();
+	    clearInterval(this.heartbeat);
+	    return this.Promise.resolve();
+	  }
+
+	  yieldLoop(t = 0) {
+	    return new this.Promise(function(resolve, reject) {
+	      return setTimeout(resolve, t);
+	    });
+	  }
+
+	  computePenalty() {
+	    var ref;
+	    return (ref = this.storeOptions.penalty) != null ? ref : (15 * this.storeOptions.minTime) || 5000;
+	  }
+
+	  async __updateSettings__(options) {
+	    await this.yieldLoop();
+	    parser$2.overwrite(options, options, this.storeOptions);
+	    this._startHeartbeat();
+	    this.instance._drainAll(this.computeCapacity());
+	    return true;
+	  }
+
+	  async __running__() {
+	    await this.yieldLoop();
+	    return this._running;
+	  }
+
+	  async __queued__() {
+	    await this.yieldLoop();
+	    return this.instance.queued();
+	  }
+
+	  async __done__() {
+	    await this.yieldLoop();
+	    return this._done;
+	  }
+
+	  async __groupCheck__(time) {
+	    await this.yieldLoop();
+	    return (this._nextRequest + this.timeout) < time;
+	  }
+
+	  computeCapacity() {
+	    var maxConcurrent, reservoir;
+	    ({maxConcurrent, reservoir} = this.storeOptions);
+	    if ((maxConcurrent != null) && (reservoir != null)) {
+	      return Math.min(maxConcurrent - this._running, reservoir);
+	    } else if (maxConcurrent != null) {
+	      return maxConcurrent - this._running;
+	    } else if (reservoir != null) {
+	      return reservoir;
+	    } else {
+	      return null;
+	    }
+	  }
+
+	  conditionsCheck(weight) {
+	    var capacity;
+	    capacity = this.computeCapacity();
+	    return (capacity == null) || weight <= capacity;
+	  }
+
+	  async __incrementReservoir__(incr) {
+	    var reservoir;
+	    await this.yieldLoop();
+	    reservoir = this.storeOptions.reservoir += incr;
+	    this.instance._drainAll(this.computeCapacity());
+	    return reservoir;
+	  }
+
+	  async __currentReservoir__() {
+	    await this.yieldLoop();
+	    return this.storeOptions.reservoir;
+	  }
+
+	  isBlocked(now) {
+	    return this._unblockTime >= now;
+	  }
+
+	  check(weight, now) {
+	    return this.conditionsCheck(weight) && (this._nextRequest - now) <= 0;
+	  }
+
+	  async __check__(weight) {
+	    var now;
+	    await this.yieldLoop();
+	    now = Date.now();
+	    return this.check(weight, now);
+	  }
+
+	  async __register__(index, weight, expiration) {
+	    var now, wait;
+	    await this.yieldLoop();
+	    now = Date.now();
+	    if (this.conditionsCheck(weight)) {
+	      this._running += weight;
+	      if (this.storeOptions.reservoir != null) {
+	        this.storeOptions.reservoir -= weight;
+	      }
+	      wait = Math.max(this._nextRequest - now, 0);
+	      this._nextRequest = now + wait + this.storeOptions.minTime;
+	      return {
+	        success: true,
+	        wait,
+	        reservoir: this.storeOptions.reservoir
+	      };
+	    } else {
+	      return {
+	        success: false
+	      };
+	    }
+	  }
+
+	  strategyIsBlock() {
+	    return this.storeOptions.strategy === 3;
+	  }
+
+	  async __submit__(queueLength, weight) {
+	    var blocked, now, reachedHWM;
+	    await this.yieldLoop();
+	    if ((this.storeOptions.maxConcurrent != null) && weight > this.storeOptions.maxConcurrent) {
+	      throw new BottleneckError$2(`Impossible to add a job having a weight of ${weight} to a limiter having a maxConcurrent setting of ${this.storeOptions.maxConcurrent}`);
+	    }
+	    now = Date.now();
+	    reachedHWM = (this.storeOptions.highWater != null) && queueLength === this.storeOptions.highWater && !this.check(weight, now);
+	    blocked = this.strategyIsBlock() && (reachedHWM || this.isBlocked(now));
+	    if (blocked) {
+	      this._unblockTime = now + this.computePenalty();
+	      this._nextRequest = this._unblockTime + this.storeOptions.minTime;
+	      this.instance._dropAllQueued();
+	    }
+	    return {
+	      reachedHWM,
+	      blocked,
+	      strategy: this.storeOptions.strategy
+	    };
+	  }
+
+	  async __free__(index, weight) {
+	    await this.yieldLoop();
+	    this._running -= weight;
+	    this._done += weight;
+	    this.instance._drainAll(this.computeCapacity());
+	    return {
+	      running: this._running
+	    };
+	  }
+
+	};
+
+	var LocalDatastore_1 = LocalDatastore;
+
+	var BottleneckError$3, States;
+
+	BottleneckError$3 = BottleneckError_1;
+
+	States = class States {
+	  constructor(status1) {
+	    this.status = status1;
+	    this._jobs = {};
+	    this.counts = this.status.map(function() {
+	      return 0;
+	    });
+	  }
+
+	  next(id) {
+	    var current, next;
+	    current = this._jobs[id];
+	    next = current + 1;
+	    if ((current != null) && next < this.status.length) {
+	      this.counts[current]--;
+	      this.counts[next]++;
+	      return this._jobs[id]++;
+	    } else if (current != null) {
+	      this.counts[current]--;
+	      return delete this._jobs[id];
+	    }
+	  }
+
+	  start(id) {
+	    var initial;
+	    initial = 0;
+	    this._jobs[id] = initial;
+	    return this.counts[initial]++;
+	  }
+
+	  remove(id) {
+	    var current;
+	    current = this._jobs[id];
+	    if (current != null) {
+	      this.counts[current]--;
+	      delete this._jobs[id];
+	    }
+	    return current != null;
+	  }
+
+	  jobStatus(id) {
+	    var ref;
+	    return (ref = this.status[this._jobs[id]]) != null ? ref : null;
+	  }
+
+	  statusJobs(status) {
+	    var k, pos, ref, results, v;
+	    if (status != null) {
+	      pos = this.status.indexOf(status);
+	      if (pos < 0) {
+	        throw new BottleneckError$3(`status must be one of ${this.status.join(', ')}`);
+	      }
+	      ref = this._jobs;
+	      results = [];
+	      for (k in ref) {
+	        v = ref[k];
+	        if (v === pos) {
+	          results.push(k);
+	        }
+	      }
+	      return results;
+	    } else {
+	      return Object.keys(this._jobs);
+	    }
+	  }
+
+	  statusCounts() {
+	    return this.counts.reduce(((acc, v, i) => {
+	      acc[this.status[i]] = v;
+	      return acc;
+	    }), {});
+	  }
+
+	};
+
+	var States_1 = States;
+
+	var DLList$2, Sync;
+
+	DLList$2 = DLList_1;
+
+	Sync = class Sync {
+	  constructor(name, Promise) {
+	    this.schedule = this.schedule.bind(this);
+	    this.name = name;
+	    this.Promise = Promise;
+	    this._running = 0;
+	    this._queue = new DLList$2();
+	  }
+
+	  isEmpty() {
+	    return this._queue.length === 0;
+	  }
+
+	  async _tryToRun() {
+	    var args, cb, error, reject, resolve, returned, task;
+	    if ((this._running < 1) && this._queue.length > 0) {
+	      this._running++;
+	      ({task, args, resolve, reject} = this._queue.shift());
+	      cb = (await (async function() {
+	        try {
+	          returned = (await task(...args));
+	          return function() {
+	            return resolve(returned);
+	          };
+	        } catch (error1) {
+	          error = error1;
+	          return function() {
+	            return reject(error);
+	          };
+	        }
+	      })());
+	      this._running--;
+	      this._tryToRun();
+	      return cb();
+	    }
+	  }
+
+	  schedule(task, ...args) {
+	    var promise, reject, resolve;
+	    resolve = reject = null;
+	    promise = new this.Promise(function(_resolve, _reject) {
+	      resolve = _resolve;
+	      return reject = _reject;
+	    });
+	    this._queue.push({task, args, resolve, reject});
+	    this._tryToRun();
+	    return promise;
+	  }
+
+	};
+
+	var Sync_1 = Sync;
+
+	var version = "2.19.5";
+	var version$1 = {
+		version: version
+	};
+
+	var version$2 = /*#__PURE__*/Object.freeze({
+		version: version,
+		default: version$1
+	});
+
+	var require$$2 = () => console.log('You must import the full version of Bottleneck in order to use this feature.');
+
+	var require$$3 = () => console.log('You must import the full version of Bottleneck in order to use this feature.');
+
+	var require$$4 = () => console.log('You must import the full version of Bottleneck in order to use this feature.');
+
+	var Events$2, Group, IORedisConnection$1, RedisConnection$1, Scripts$1, parser$3;
+
+	parser$3 = parser;
+
+	Events$2 = Events_1;
+
+	RedisConnection$1 = require$$2;
+
+	IORedisConnection$1 = require$$3;
+
+	Scripts$1 = require$$4;
+
+	Group = (function() {
+	  class Group {
+	    constructor(limiterOptions = {}) {
+	      this.deleteKey = this.deleteKey.bind(this);
+	      this.limiterOptions = limiterOptions;
+	      parser$3.load(this.limiterOptions, this.defaults, this);
+	      this.Events = new Events$2(this);
+	      this.instances = {};
+	      this.Bottleneck = Bottleneck_1;
+	      this._startAutoCleanup();
+	      this.sharedConnection = this.connection != null;
+	      if (this.connection == null) {
+	        if (this.limiterOptions.datastore === "redis") {
+	          this.connection = new RedisConnection$1(Object.assign({}, this.limiterOptions, {Events: this.Events}));
+	        } else if (this.limiterOptions.datastore === "ioredis") {
+	          this.connection = new IORedisConnection$1(Object.assign({}, this.limiterOptions, {Events: this.Events}));
+	        }
+	      }
+	    }
+
+	    key(key = "") {
+	      var ref;
+	      return (ref = this.instances[key]) != null ? ref : (() => {
+	        var limiter;
+	        limiter = this.instances[key] = new this.Bottleneck(Object.assign(this.limiterOptions, {
+	          id: `${this.id}-${key}`,
+	          timeout: this.timeout,
+	          connection: this.connection
+	        }));
+	        this.Events.trigger("created", limiter, key);
+	        return limiter;
+	      })();
+	    }
+
+	    async deleteKey(key = "") {
+	      var deleted, instance;
+	      instance = this.instances[key];
+	      if (this.connection) {
+	        deleted = (await this.connection.__runCommand__(['del', ...Scripts$1.allKeys(`${this.id}-${key}`)]));
+	      }
+	      if (instance != null) {
+	        delete this.instances[key];
+	        await instance.disconnect();
+	      }
+	      return (instance != null) || deleted > 0;
+	    }
+
+	    limiters() {
+	      var k, ref, results, v;
+	      ref = this.instances;
+	      results = [];
+	      for (k in ref) {
+	        v = ref[k];
+	        results.push({
+	          key: k,
+	          limiter: v
+	        });
+	      }
+	      return results;
+	    }
+
+	    keys() {
+	      return Object.keys(this.instances);
+	    }
+
+	    async clusterKeys() {
+	      var cursor, end, found, i, k, keys, len, next, start;
+	      if (this.connection == null) {
+	        return this.Promise.resolve(this.keys());
+	      }
+	      keys = [];
+	      cursor = null;
+	      start = `b_${this.id}-`.length;
+	      end = "_settings".length;
+	      while (cursor !== 0) {
+	        [next, found] = (await this.connection.__runCommand__(["scan", cursor != null ? cursor : 0, "match", `b_${this.id}-*_settings`, "count", 10000]));
+	        cursor = ~~next;
+	        for (i = 0, len = found.length; i < len; i++) {
+	          k = found[i];
+	          keys.push(k.slice(start, -end));
+	        }
+	      }
+	      return keys;
+	    }
+
+	    _startAutoCleanup() {
+	      var base;
+	      clearInterval(this.interval);
+	      return typeof (base = (this.interval = setInterval(async() => {
+	        var e, k, ref, results, time, v;
+	        time = Date.now();
+	        ref = this.instances;
+	        results = [];
+	        for (k in ref) {
+	          v = ref[k];
+	          try {
+	            if ((await v._store.__groupCheck__(time))) {
+	              results.push(this.deleteKey(k));
+	            } else {
+	              results.push(void 0);
+	            }
+	          } catch (error) {
+	            e = error;
+	            results.push(v.Events.trigger("error", e));
+	          }
+	        }
+	        return results;
+	      }, this.timeout / 2))).unref === "function" ? base.unref() : void 0;
+	    }
+
+	    updateSettings(options = {}) {
+	      parser$3.overwrite(options, this.defaults, this);
+	      parser$3.overwrite(options, options, this.limiterOptions);
+	      if (options.timeout != null) {
+	        return this._startAutoCleanup();
+	      }
+	    }
+
+	    disconnect(flush = true) {
+	      var ref;
+	      if (!this.sharedConnection) {
+	        return (ref = this.connection) != null ? ref.disconnect(flush) : void 0;
+	      }
+	    }
+
+	  }
+	  Group.prototype.defaults = {
+	    timeout: 1000 * 60 * 5,
+	    connection: null,
+	    Promise: Promise,
+	    id: "group-key"
+	  };
+
+	  return Group;
+
+	}).call(commonjsGlobal);
+
+	var Group_1 = Group;
+
+	var Batcher, Events$3, parser$4;
+
+	parser$4 = parser;
+
+	Events$3 = Events_1;
+
+	Batcher = (function() {
+	  class Batcher {
+	    constructor(options = {}) {
+	      this.options = options;
+	      parser$4.load(this.options, this.defaults, this);
+	      this.Events = new Events$3(this);
+	      this._arr = [];
+	      this._resetPromise();
+	      this._lastFlush = Date.now();
+	    }
+
+	    _resetPromise() {
+	      return this._promise = new this.Promise((res, rej) => {
+	        return this._resolve = res;
+	      });
+	    }
+
+	    _flush() {
+	      clearTimeout(this._timeout);
+	      this._lastFlush = Date.now();
+	      this._resolve();
+	      this.Events.trigger("batch", this._arr);
+	      this._arr = [];
+	      return this._resetPromise();
+	    }
+
+	    add(data) {
+	      var ret;
+	      this._arr.push(data);
+	      ret = this._promise;
+	      if (this._arr.length === this.maxSize) {
+	        this._flush();
+	      } else if ((this.maxTime != null) && this._arr.length === 1) {
+	        this._timeout = setTimeout(() => {
+	          return this._flush();
+	        }, this.maxTime);
+	      }
+	      return ret;
+	    }
+
+	  }
+	  Batcher.prototype.defaults = {
+	    maxTime: null,
+	    maxSize: null,
+	    Promise: Promise
+	  };
+
+	  return Batcher;
+
+	}).call(commonjsGlobal);
+
+	var Batcher_1 = Batcher;
+
+	var require$$4$1 = () => console.log('You must import the full version of Bottleneck in order to use this feature.');
+
+	var require$$8 = getCjsExportFromNamespace(version$2);
+
+	var Bottleneck, DEFAULT_PRIORITY$1, Events$4, Job$1, LocalDatastore$1, NUM_PRIORITIES$1, Queues$1, RedisDatastore$1, States$1, Sync$1, parser$5,
+	  splice = [].splice;
+
+	NUM_PRIORITIES$1 = 10;
+
+	DEFAULT_PRIORITY$1 = 5;
+
+	parser$5 = parser;
+
+	Queues$1 = Queues_1;
+
+	Job$1 = Job_1;
+
+	LocalDatastore$1 = LocalDatastore_1;
+
+	RedisDatastore$1 = require$$4$1;
+
+	Events$4 = Events_1;
+
+	States$1 = States_1;
+
+	Sync$1 = Sync_1;
+
+	Bottleneck = (function() {
+	  class Bottleneck {
+	    constructor(options = {}, ...invalid) {
+	      var storeInstanceOptions, storeOptions;
+	      this._addToQueue = this._addToQueue.bind(this);
+	      this._validateOptions(options, invalid);
+	      parser$5.load(options, this.instanceDefaults, this);
+	      this._queues = new Queues$1(NUM_PRIORITIES$1);
+	      this._scheduled = {};
+	      this._states = new States$1(["RECEIVED", "QUEUED", "RUNNING", "EXECUTING"].concat(this.trackDoneStatus ? ["DONE"] : []));
+	      this._limiter = null;
+	      this.Events = new Events$4(this);
+	      this._submitLock = new Sync$1("submit", this.Promise);
+	      this._registerLock = new Sync$1("register", this.Promise);
+	      storeOptions = parser$5.load(options, this.storeDefaults, {});
+	      this._store = (function() {
+	        if (this.datastore === "redis" || this.datastore === "ioredis" || (this.connection != null)) {
+	          storeInstanceOptions = parser$5.load(options, this.redisStoreDefaults, {});
+	          return new RedisDatastore$1(this, storeOptions, storeInstanceOptions);
+	        } else if (this.datastore === "local") {
+	          storeInstanceOptions = parser$5.load(options, this.localStoreDefaults, {});
+	          return new LocalDatastore$1(this, storeOptions, storeInstanceOptions);
+	        } else {
+	          throw new Bottleneck.prototype.BottleneckError(`Invalid datastore type: ${this.datastore}`);
+	        }
+	      }).call(this);
+	      this._queues.on("leftzero", () => {
+	        var ref;
+	        return (ref = this._store.heartbeat) != null ? typeof ref.ref === "function" ? ref.ref() : void 0 : void 0;
+	      });
+	      this._queues.on("zero", () => {
+	        var ref;
+	        return (ref = this._store.heartbeat) != null ? typeof ref.unref === "function" ? ref.unref() : void 0 : void 0;
+	      });
+	    }
+
+	    _validateOptions(options, invalid) {
+	      if (!((options != null) && typeof options === "object" && invalid.length === 0)) {
+	        throw new Bottleneck.prototype.BottleneckError("Bottleneck v2 takes a single object argument. Refer to https://github.com/SGrondin/bottleneck#upgrading-to-v2 if you're upgrading from Bottleneck v1.");
+	      }
+	    }
+
+	    ready() {
+	      return this._store.ready;
+	    }
+
+	    clients() {
+	      return this._store.clients;
+	    }
+
+	    channel() {
+	      return `b_${this.id}`;
+	    }
+
+	    channel_client() {
+	      return `b_${this.id}_${this._store.clientId}`;
+	    }
+
+	    publish(message) {
+	      return this._store.__publish__(message);
+	    }
+
+	    disconnect(flush = true) {
+	      return this._store.__disconnect__(flush);
+	    }
+
+	    chain(_limiter) {
+	      this._limiter = _limiter;
+	      return this;
+	    }
+
+	    queued(priority) {
+	      return this._queues.queued(priority);
+	    }
+
+	    clusterQueued() {
+	      return this._store.__queued__();
+	    }
+
+	    empty() {
+	      return this.queued() === 0 && this._submitLock.isEmpty();
+	    }
+
+	    running() {
+	      return this._store.__running__();
+	    }
+
+	    done() {
+	      return this._store.__done__();
+	    }
+
+	    jobStatus(id) {
+	      return this._states.jobStatus(id);
+	    }
+
+	    jobs(status) {
+	      return this._states.statusJobs(status);
+	    }
+
+	    counts() {
+	      return this._states.statusCounts();
+	    }
+
+	    _randomIndex() {
+	      return Math.random().toString(36).slice(2);
+	    }
+
+	    check(weight = 1) {
+	      return this._store.__check__(weight);
+	    }
+
+	    _clearGlobalState(index) {
+	      if (this._scheduled[index] != null) {
+	        clearTimeout(this._scheduled[index].expiration);
+	        delete this._scheduled[index];
+	        return true;
+	      } else {
+	        return false;
+	      }
+	    }
+
+	    async _free(index, job, options, eventInfo) {
+	      var e, running;
+	      try {
+	        ({running} = (await this._store.__free__(index, options.weight)));
+	        this.Events.trigger("debug", `Freed ${options.id}`, eventInfo);
+	        if (running === 0 && this.empty()) {
+	          return this.Events.trigger("idle");
+	        }
+	      } catch (error1) {
+	        e = error1;
+	        return this.Events.trigger("error", e);
+	      }
+	    }
+
+	    _run(index, job, wait) {
+	      var clearGlobalState, free, run;
+	      job.doRun();
+	      clearGlobalState = this._clearGlobalState.bind(this, index);
+	      run = this._run.bind(this, index, job);
+	      free = this._free.bind(this, index, job);
+	      return this._scheduled[index] = {
+	        timeout: setTimeout(() => {
+	          return job.doExecute(this._limiter, clearGlobalState, run, free);
+	        }, wait),
+	        expiration: job.options.expiration != null ? setTimeout(function() {
+	          return job.doExpire(clearGlobalState, run, free);
+	        }, wait + job.options.expiration) : void 0,
+	        job: job
+	      };
+	    }
+
+	    _drainOne(capacity) {
+	      return this._registerLock.schedule(() => {
+	        var args, index, next, options, queue;
+	        if (this.queued() === 0) {
+	          return this.Promise.resolve(null);
+	        }
+	        queue = this._queues.getFirst();
+	        ({options, args} = next = queue.first());
+	        if ((capacity != null) && options.weight > capacity) {
+	          return this.Promise.resolve(null);
+	        }
+	        this.Events.trigger("debug", `Draining ${options.id}`, {args, options});
+	        index = this._randomIndex();
+	        return this._store.__register__(index, options.weight, options.expiration).then(({success, wait, reservoir}) => {
+	          var empty;
+	          this.Events.trigger("debug", `Drained ${options.id}`, {success, args, options});
+	          if (success) {
+	            queue.shift();
+	            empty = this.empty();
+	            if (empty) {
+	              this.Events.trigger("empty");
+	            }
+	            if (reservoir === 0) {
+	              this.Events.trigger("depleted", empty);
+	            }
+	            this._run(index, next, wait);
+	            return this.Promise.resolve(options.weight);
+	          } else {
+	            return this.Promise.resolve(null);
+	          }
+	        });
+	      });
+	    }
+
+	    _drainAll(capacity, total = 0) {
+	      return this._drainOne(capacity).then((drained) => {
+	        var newCapacity;
+	        if (drained != null) {
+	          newCapacity = capacity != null ? capacity - drained : capacity;
+	          return this._drainAll(newCapacity, total + drained);
+	        } else {
+	          return this.Promise.resolve(total);
+	        }
+	      }).catch((e) => {
+	        return this.Events.trigger("error", e);
+	      });
+	    }
+
+	    _dropAllQueued(message) {
+	      return this._queues.shiftAll(function(job) {
+	        return job.doDrop({message});
+	      });
+	    }
+
+	    stop(options = {}) {
+	      var done, waitForExecuting;
+	      options = parser$5.load(options, this.stopDefaults);
+	      waitForExecuting = (at) => {
+	        var finished;
+	        finished = () => {
+	          var counts;
+	          counts = this._states.counts;
+	          return (counts[0] + counts[1] + counts[2] + counts[3]) === at;
+	        };
+	        return new this.Promise((resolve, reject) => {
+	          if (finished()) {
+	            return resolve();
+	          } else {
+	            return this.on("done", () => {
+	              if (finished()) {
+	                this.removeAllListeners("done");
+	                return resolve();
+	              }
+	            });
+	          }
+	        });
+	      };
+	      done = options.dropWaitingJobs ? (this._run = function(index, next) {
+	        return next.doDrop({
+	          message: options.dropErrorMessage
+	        });
+	      }, this._drainOne = () => {
+	        return this.Promise.resolve(null);
+	      }, this._registerLock.schedule(() => {
+	        return this._submitLock.schedule(() => {
+	          var k, ref, v;
+	          ref = this._scheduled;
+	          for (k in ref) {
+	            v = ref[k];
+	            if (this.jobStatus(v.job.options.id) === "RUNNING") {
+	              clearTimeout(v.timeout);
+	              clearTimeout(v.expiration);
+	              v.job.doDrop({
+	                message: options.dropErrorMessage
+	              });
+	            }
+	          }
+	          this._dropAllQueued(options.dropErrorMessage);
+	          return waitForExecuting(0);
+	        });
+	      })) : this.schedule({
+	        priority: NUM_PRIORITIES$1 - 1,
+	        weight: 0
+	      }, () => {
+	        return waitForExecuting(1);
+	      });
+	      this._receive = function(job) {
+	        return job._reject(new Bottleneck.prototype.BottleneckError(options.enqueueErrorMessage));
+	      };
+	      this.stop = () => {
+	        return this.Promise.reject(new Bottleneck.prototype.BottleneckError("stop() has already been called"));
+	      };
+	      return done;
+	    }
+
+	    async _addToQueue(job) {
+	      var args, blocked, error, options, reachedHWM, shifted, strategy;
+	      ({args, options} = job);
+	      try {
+	        ({reachedHWM, blocked, strategy} = (await this._store.__submit__(this.queued(), options.weight)));
+	      } catch (error1) {
+	        error = error1;
+	        this.Events.trigger("debug", `Could not queue ${options.id}`, {args, options, error});
+	        job.doDrop({error});
+	        return false;
+	      }
+	      if (blocked) {
+	        job.doDrop();
+	        return true;
+	      } else if (reachedHWM) {
+	        shifted = strategy === Bottleneck.prototype.strategy.LEAK ? this._queues.shiftLastFrom(options.priority) : strategy === Bottleneck.prototype.strategy.OVERFLOW_PRIORITY ? this._queues.shiftLastFrom(options.priority + 1) : strategy === Bottleneck.prototype.strategy.OVERFLOW ? job : void 0;
+	        if (shifted != null) {
+	          shifted.doDrop();
+	        }
+	        if ((shifted == null) || strategy === Bottleneck.prototype.strategy.OVERFLOW) {
+	          if (shifted == null) {
+	            job.doDrop();
+	          }
+	          return reachedHWM;
+	        }
+	      }
+	      job.doQueue(reachedHWM, blocked);
+	      this._queues.push(job);
+	      await this._drainAll();
+	      return reachedHWM;
+	    }
+
+	    _receive(job) {
+	      if (this._states.jobStatus(job.options.id) != null) {
+	        job._reject(new Bottleneck.prototype.BottleneckError(`A job with the same id already exists (id=${job.options.id})`));
+	        return false;
+	      } else {
+	        job.doReceive();
+	        return this._submitLock.schedule(this._addToQueue, job);
+	      }
+	    }
+
+	    submit(...args) {
+	      var cb, fn, job, options, ref, ref1, task;
+	      if (typeof args[0] === "function") {
+	        ref = args, [fn, ...args] = ref, [cb] = splice.call(args, -1);
+	        options = parser$5.load({}, this.jobDefaults);
+	      } else {
+	        ref1 = args, [options, fn, ...args] = ref1, [cb] = splice.call(args, -1);
+	        options = parser$5.load(options, this.jobDefaults);
+	      }
+	      task = (...args) => {
+	        return new this.Promise(function(resolve, reject) {
+	          return fn(...args, function(...args) {
+	            return (args[0] != null ? reject : resolve)(args);
+	          });
+	        });
+	      };
+	      job = new Job$1(task, args, options, this.jobDefaults, this.rejectOnDrop, this.Events, this._states, this.Promise);
+	      job.promise.then(function(args) {
+	        return typeof cb === "function" ? cb(...args) : void 0;
+	      }).catch(function(args) {
+	        if (Array.isArray(args)) {
+	          return typeof cb === "function" ? cb(...args) : void 0;
+	        } else {
+	          return typeof cb === "function" ? cb(args) : void 0;
+	        }
+	      });
+	      return this._receive(job);
+	    }
+
+	    schedule(...args) {
+	      var job, options, task;
+	      if (typeof args[0] === "function") {
+	        [task, ...args] = args;
+	        options = {};
+	      } else {
+	        [options, task, ...args] = args;
+	      }
+	      job = new Job$1(task, args, options, this.jobDefaults, this.rejectOnDrop, this.Events, this._states, this.Promise);
+	      this._receive(job);
+	      return job.promise;
+	    }
+
+	    wrap(fn) {
+	      var schedule, wrapped;
+	      schedule = this.schedule.bind(this);
+	      wrapped = function(...args) {
+	        return schedule(fn.bind(this), ...args);
+	      };
+	      wrapped.withOptions = function(options, ...args) {
+	        return schedule(options, fn, ...args);
+	      };
+	      return wrapped;
+	    }
+
+	    async updateSettings(options = {}) {
+	      await this._store.__updateSettings__(parser$5.overwrite(options, this.storeDefaults));
+	      parser$5.overwrite(options, this.instanceDefaults, this);
+	      return this;
+	    }
+
+	    currentReservoir() {
+	      return this._store.__currentReservoir__();
+	    }
+
+	    incrementReservoir(incr = 0) {
+	      return this._store.__incrementReservoir__(incr);
+	    }
+
+	  }
+	  Bottleneck.default = Bottleneck;
+
+	  Bottleneck.Events = Events$4;
+
+	  Bottleneck.version = Bottleneck.prototype.version = require$$8.version;
+
+	  Bottleneck.strategy = Bottleneck.prototype.strategy = {
+	    LEAK: 1,
+	    OVERFLOW: 2,
+	    OVERFLOW_PRIORITY: 4,
+	    BLOCK: 3
+	  };
+
+	  Bottleneck.BottleneckError = Bottleneck.prototype.BottleneckError = BottleneckError_1;
+
+	  Bottleneck.Group = Bottleneck.prototype.Group = Group_1;
+
+	  Bottleneck.RedisConnection = Bottleneck.prototype.RedisConnection = require$$2;
+
+	  Bottleneck.IORedisConnection = Bottleneck.prototype.IORedisConnection = require$$3;
+
+	  Bottleneck.Batcher = Bottleneck.prototype.Batcher = Batcher_1;
+
+	  Bottleneck.prototype.jobDefaults = {
+	    priority: DEFAULT_PRIORITY$1,
+	    weight: 1,
+	    expiration: null,
+	    id: "<no-id>"
+	  };
+
+	  Bottleneck.prototype.storeDefaults = {
+	    maxConcurrent: null,
+	    minTime: 0,
+	    highWater: null,
+	    strategy: Bottleneck.prototype.strategy.LEAK,
+	    penalty: null,
+	    reservoir: null,
+	    reservoirRefreshInterval: null,
+	    reservoirRefreshAmount: null,
+	    reservoirIncreaseInterval: null,
+	    reservoirIncreaseAmount: null,
+	    reservoirIncreaseMaximum: null
+	  };
+
+	  Bottleneck.prototype.localStoreDefaults = {
+	    Promise: Promise,
+	    timeout: null,
+	    heartbeatInterval: 250
+	  };
+
+	  Bottleneck.prototype.redisStoreDefaults = {
+	    Promise: Promise,
+	    timeout: null,
+	    heartbeatInterval: 5000,
+	    clientTimeout: 10000,
+	    Redis: null,
+	    clientOptions: {},
+	    clusterNodes: null,
+	    clearDatastore: false,
+	    connection: null
+	  };
+
+	  Bottleneck.prototype.instanceDefaults = {
+	    datastore: "local",
+	    connection: null,
+	    id: "<no-id>",
+	    rejectOnDrop: true,
+	    trackDoneStatus: false,
+	    Promise: Promise
+	  };
+
+	  Bottleneck.prototype.stopDefaults = {
+	    enqueueErrorMessage: "This limiter has been stopped and cannot accept new jobs.",
+	    dropWaitingJobs: true,
+	    dropErrorMessage: "This limiter has been stopped."
+	  };
+
+	  return Bottleneck;
+
+	}).call(commonjsGlobal);
+
+	var Bottleneck_1 = Bottleneck;
+
+	var lib = Bottleneck_1;
+
+	return lib;
+
+})));
+
+
+/***/ }),
+
+/***/ 8932:
+/***/ ((__unused_webpack_module, exports) => {
+
+"use strict";
+
+
+Object.defineProperty(exports, "__esModule", ({ value: true }));
+
+class Deprecation extends Error {
+  constructor(message) {
+    super(message); // Maintains proper stack trace (only available on V8)
+
+    /* istanbul ignore next */
+
+    if (Error.captureStackTrace) {
+      Error.captureStackTrace(this, this.constructor);
+    }
+
+    this.name = 'Deprecation';
+  }
+
+}
+
+exports.Deprecation = Deprecation;
+
+
+/***/ }),
+
+/***/ 4697:
+/***/ ((module, exports) => {
+
+"use strict";
+/**
+ * @author Toru Nagashima <https://github.com/mysticatea>
+ * @copyright 2015 Toru Nagashima. All rights reserved.
+ * See LICENSE file in root directory for full license.
+ */
+
+
+Object.defineProperty(exports, "__esModule", ({ value: true }));
+
+/**
+ * @typedef {object} PrivateData
+ * @property {EventTarget} eventTarget The event target.
+ * @property {{type:string}} event The original event object.
+ * @property {number} eventPhase The current event phase.
+ * @property {EventTarget|null} currentTarget The current event target.
+ * @property {boolean} canceled The flag to prevent default.
+ * @property {boolean} stopped The flag to stop propagation.
+ * @property {boolean} immediateStopped The flag to stop propagation immediately.
+ * @property {Function|null} passiveListener The listener if the current listener is passive. Otherwise this is null.
+ * @property {number} timeStamp The unix time.
+ * @private
+ */
+
+/**
+ * Private data for event wrappers.
+ * @type {WeakMap<Event, PrivateData>}
+ * @private
+ */
+const privateData = new WeakMap();
+
+/**
+ * Cache for wrapper classes.
+ * @type {WeakMap<Object, Function>}
+ * @private
+ */
+const wrappers = new WeakMap();
+
+/**
+ * Get private data.
+ * @param {Event} event The event object to get private data.
+ * @returns {PrivateData} The private data of the event.
+ * @private
+ */
+function pd(event) {
+    const retv = privateData.get(event);
+    console.assert(
+        retv != null,
+        "'this' is expected an Event object, but got",
+        event
+    );
+    return retv
+}
+
+/**
+ * https://dom.spec.whatwg.org/#set-the-canceled-flag
+ * @param data {PrivateData} private data.
+ */
+function setCancelFlag(data) {
+    if (data.passiveListener != null) {
+        if (
+            typeof console !== "undefined" &&
+            typeof console.error === "function"
+        ) {
+            console.error(
+                "Unable to preventDefault inside passive event listener invocation.",
+                data.passiveListener
+            );
+        }
+        return
+    }
+    if (!data.event.cancelable) {
+        return
+    }
+
+    data.canceled = true;
+    if (typeof data.event.preventDefault === "function") {
+        data.event.preventDefault();
+    }
+}
+
+/**
+ * @see https://dom.spec.whatwg.org/#interface-event
+ * @private
+ */
+/**
+ * The event wrapper.
+ * @constructor
+ * @param {EventTarget} eventTarget The event target of this dispatching.
+ * @param {Event|{type:string}} event The original event to wrap.
+ */
+function Event(eventTarget, event) {
+    privateData.set(this, {
+        eventTarget,
+        event,
+        eventPhase: 2,
+        currentTarget: eventTarget,
+        canceled: false,
+        stopped: false,
+        immediateStopped: false,
+        passiveListener: null,
+        timeStamp: event.timeStamp || Date.now(),
+    });
+
+    // https://heycam.github.io/webidl/#Unforgeable
+    Object.defineProperty(this, "isTrusted", { value: false, enumerable: true });
+
+    // Define accessors
+    const keys = Object.keys(event);
+    for (let i = 0; i < keys.length; ++i) {
+        const key = keys[i];
+        if (!(key in this)) {
+            Object.defineProperty(this, key, defineRedirectDescriptor(key));
+        }
+    }
+}
+
+// Should be enumerable, but class methods are not enumerable.
+Event.prototype = {
+    /**
+     * The type of this event.
+     * @type {string}
+     */
+    get type() {
+        return pd(this).event.type
+    },
+
+    /**
+     * The target of this event.
+     * @type {EventTarget}
+     */
+    get target() {
+        return pd(this).eventTarget
+    },
+
+    /**
+     * The target of this event.
+     * @type {EventTarget}
+     */
+    get currentTarget() {
+        return pd(this).currentTarget
+    },
+
+    /**
+     * @returns {EventTarget[]} The composed path of this event.
+     */
+    composedPath() {
+        const currentTarget = pd(this).currentTarget;
+        if (currentTarget == null) {
+            return []
+        }
+        return [currentTarget]
+    },
+
+    /**
+     * Constant of NONE.
+     * @type {number}
+     */
+    get NONE() {
+        return 0
+    },
+
+    /**
+     * Constant of CAPTURING_PHASE.
+     * @type {number}
+     */
+    get CAPTURING_PHASE() {
+        return 1
+    },
+
+    /**
+     * Constant of AT_TARGET.
+     * @type {number}
+     */
+    get AT_TARGET() {
+        return 2
+    },
+
+    /**
+     * Constant of BUBBLING_PHASE.
+     * @type {number}
+     */
+    get BUBBLING_PHASE() {
+        return 3
+    },
+
+    /**
+     * The target of this event.
+     * @type {number}
+     */
+    get eventPhase() {
+        return pd(this).eventPhase
+    },
+
+    /**
+     * Stop event bubbling.
+     * @returns {void}
+     */
+    stopPropagation() {
+        const data = pd(this);
+
+        data.stopped = true;
+        if (typeof data.event.stopPropagation === "function") {
+            data.event.stopPropagation();
+        }
+    },
+
+    /**
+     * Stop event bubbling.
+     * @returns {void}
+     */
+    stopImmediatePropagation() {
+        const data = pd(this);
+
+        data.stopped = true;
+        data.immediateStopped = true;
+        if (typeof data.event.stopImmediatePropagation === "function") {
+            data.event.stopImmediatePropagation();
+        }
+    },
+
+    /**
+     * The flag to be bubbling.
+     * @type {boolean}
+     */
+    get bubbles() {
+        return Boolean(pd(this).event.bubbles)
+    },
+
+    /**
+     * The flag to be cancelable.
+     * @type {boolean}
+     */
+    get cancelable() {
+        return Boolean(pd(this).event.cancelable)
+    },
+
+    /**
+     * Cancel this event.
+     * @returns {void}
+     */
+    preventDefault() {
+        setCancelFlag(pd(this));
+    },
+
+    /**
+     * The flag to indicate cancellation state.
+     * @type {boolean}
+     */
+    get defaultPrevented() {
+        return pd(this).canceled
+    },
+
+    /**
+     * The flag to be composed.
+     * @type {boolean}
+     */
+    get composed() {
+        return Boolean(pd(this).event.composed)
+    },
+
+    /**
+     * The unix time of this event.
+     * @type {number}
+     */
+    get timeStamp() {
+        return pd(this).timeStamp
+    },
+
+    /**
+     * The target of this event.
+     * @type {EventTarget}
+     * @deprecated
+     */
+    get srcElement() {
+        return pd(this).eventTarget
+    },
+
+    /**
+     * The flag to stop event bubbling.
+     * @type {boolean}
+     * @deprecated
+     */
+    get cancelBubble() {
+        return pd(this).stopped
+    },
+    set cancelBubble(value) {
+        if (!value) {
+            return
+        }
+        const data = pd(this);
+
+        data.stopped = true;
+        if (typeof data.event.cancelBubble === "boolean") {
+            data.event.cancelBubble = true;
+        }
+    },
+
+    /**
+     * The flag to indicate cancellation state.
+     * @type {boolean}
+     * @deprecated
+     */
+    get returnValue() {
+        return !pd(this).canceled
+    },
+    set returnValue(value) {
+        if (!value) {
+            setCancelFlag(pd(this));
+        }
+    },
+
+    /**
+     * Initialize this event object. But do nothing under event dispatching.
+     * @param {string} type The event type.
+     * @param {boolean} [bubbles=false] The flag to be possible to bubble up.
+     * @param {boolean} [cancelable=false] The flag to be possible to cancel.
+     * @deprecated
+     */
+    initEvent() {
+        // Do nothing.
+    },
+};
+
+// `constructor` is not enumerable.
+Object.defineProperty(Event.prototype, "constructor", {
+    value: Event,
+    configurable: true,
+    writable: true,
+});
+
+// Ensure `event instanceof window.Event` is `true`.
+if (typeof window !== "undefined" && typeof window.Event !== "undefined") {
+    Object.setPrototypeOf(Event.prototype, window.Event.prototype);
+
+    // Make association for wrappers.
+    wrappers.set(window.Event.prototype, Event);
+}
+
+/**
+ * Get the property descriptor to redirect a given property.
+ * @param {string} key Property name to define property descriptor.
+ * @returns {PropertyDescriptor} The property descriptor to redirect the property.
+ * @private
+ */
+function defineRedirectDescriptor(key) {
+    return {
+        get() {
+            return pd(this).event[key]
+        },
+        set(value) {
+            pd(this).event[key] = value;
+        },
+        configurable: true,
+        enumerable: true,
+    }
+}
+
+/**
+ * Get the property descriptor to call a given method property.
+ * @param {string} key Property name to define property descriptor.
+ * @returns {PropertyDescriptor} The property descriptor to call the method property.
+ * @private
+ */
+function defineCallDescriptor(key) {
+    return {
+        value() {
+            const event = pd(this).event;
+            return event[key].apply(event, arguments)
+        },
+        configurable: true,
+        enumerable: true,
+    }
+}
+
+/**
+ * Define new wrapper class.
+ * @param {Function} BaseEvent The base wrapper class.
+ * @param {Object} proto The prototype of the original event.
+ * @returns {Function} The defined wrapper class.
+ * @private
+ */
+function defineWrapper(BaseEvent, proto) {
+    const keys = Object.keys(proto);
+    if (keys.length === 0) {
+        return BaseEvent
+    }
+
+    /** CustomEvent */
+    function CustomEvent(eventTarget, event) {
+        BaseEvent.call(this, eventTarget, event);
+    }
+
+    CustomEvent.prototype = Object.create(BaseEvent.prototype, {
+        constructor: { value: CustomEvent, configurable: true, writable: true },
+    });
+
+    // Define accessors.
+    for (let i = 0; i < keys.length; ++i) {
+        const key = keys[i];
+        if (!(key in BaseEvent.prototype)) {
+            const descriptor = Object.getOwnPropertyDescriptor(proto, key);
+            const isFunc = typeof descriptor.value === "function";
+            Object.defineProperty(
+                CustomEvent.prototype,
+                key,
+                isFunc
+                    ? defineCallDescriptor(key)
+                    : defineRedirectDescriptor(key)
+            );
+        }
+    }
+
+    return CustomEvent
+}
+
+/**
+ * Get the wrapper class of a given prototype.
+ * @param {Object} proto The prototype of the original event to get its wrapper.
+ * @returns {Function} The wrapper class.
+ * @private
+ */
+function getWrapper(proto) {
+    if (proto == null || proto === Object.prototype) {
+        return Event
+    }
+
+    let wrapper = wrappers.get(proto);
+    if (wrapper == null) {
+        wrapper = defineWrapper(getWrapper(Object.getPrototypeOf(proto)), proto);
+        wrappers.set(proto, wrapper);
+    }
+    return wrapper
+}
+
+/**
+ * Wrap a given event to management a dispatching.
+ * @param {EventTarget} eventTarget The event target of this dispatching.
+ * @param {Object} event The event to wrap.
+ * @returns {Event} The wrapper instance.
+ * @private
+ */
+function wrapEvent(eventTarget, event) {
+    const Wrapper = getWrapper(Object.getPrototypeOf(event));
+    return new Wrapper(eventTarget, event)
+}
+
+/**
+ * Get the immediateStopped flag of a given event.
+ * @param {Event} event The event to get.
+ * @returns {boolean} The flag to stop propagation immediately.
+ * @private
+ */
+function isStopped(event) {
+    return pd(event).immediateStopped
+}
+
+/**
+ * Set the current event phase of a given event.
+ * @param {Event} event The event to set current target.
+ * @param {number} eventPhase New event phase.
+ * @returns {void}
+ * @private
+ */
+function setEventPhase(event, eventPhase) {
+    pd(event).eventPhase = eventPhase;
+}
+
+/**
+ * Set the current target of a given event.
+ * @param {Event} event The event to set current target.
+ * @param {EventTarget|null} currentTarget New current target.
+ * @returns {void}
+ * @private
+ */
+function setCurrentTarget(event, currentTarget) {
+    pd(event).currentTarget = currentTarget;
+}
+
+/**
+ * Set a passive listener of a given event.
+ * @param {Event} event The event to set current target.
+ * @param {Function|null} passiveListener New passive listener.
+ * @returns {void}
+ * @private
+ */
+function setPassiveListener(event, passiveListener) {
+    pd(event).passiveListener = passiveListener;
+}
+
+/**
+ * @typedef {object} ListenerNode
+ * @property {Function} listener
+ * @property {1|2|3} listenerType
+ * @property {boolean} passive
+ * @property {boolean} once
+ * @property {ListenerNode|null} next
+ * @private
+ */
+
+/**
+ * @type {WeakMap<object, Map<string, ListenerNode>>}
+ * @private
+ */
+const listenersMap = new WeakMap();
+
+// Listener types
+const CAPTURE = 1;
+const BUBBLE = 2;
+const ATTRIBUTE = 3;
+
+/**
+ * Check whether a given value is an object or not.
+ * @param {any} x The value to check.
+ * @returns {boolean} `true` if the value is an object.
+ */
+function isObject(x) {
+    return x !== null && typeof x === "object" //eslint-disable-line no-restricted-syntax
+}
+
+/**
+ * Get listeners.
+ * @param {EventTarget} eventTarget The event target to get.
+ * @returns {Map<string, ListenerNode>} The listeners.
+ * @private
+ */
+function getListeners(eventTarget) {
+    const listeners = listenersMap.get(eventTarget);
+    if (listeners == null) {
+        throw new TypeError(
+            "'this' is expected an EventTarget object, but got another value."
+        )
+    }
+    return listeners
+}
+
+/**
+ * Get the property descriptor for the event attribute of a given event.
+ * @param {string} eventName The event name to get property descriptor.
+ * @returns {PropertyDescriptor} The property descriptor.
+ * @private
+ */
+function defineEventAttributeDescriptor(eventName) {
+    return {
+        get() {
+            const listeners = getListeners(this);
+            let node = listeners.get(eventName);
+            while (node != null) {
+                if (node.listenerType === ATTRIBUTE) {
+                    return node.listener
+                }
+                node = node.next;
+            }
+            return null
+        },
+
+        set(listener) {
+            if (typeof listener !== "function" && !isObject(listener)) {
+                listener = null; // eslint-disable-line no-param-reassign
+            }
+            const listeners = getListeners(this);
+
+            // Traverse to the tail while removing old value.
+            let prev = null;
+            let node = listeners.get(eventName);
+            while (node != null) {
+                if (node.listenerType === ATTRIBUTE) {
+                    // Remove old value.
+                    if (prev !== null) {
+                        prev.next = node.next;
+                    } else if (node.next !== null) {
+                        listeners.set(eventName, node.next);
+                    } else {
+                        listeners.delete(eventName);
+                    }
+                } else {
+                    prev = node;
+                }
+
+                node = node.next;
+            }
+
+            // Add new value.
+            if (listener !== null) {
+                const newNode = {
+                    listener,
+                    listenerType: ATTRIBUTE,
+                    passive: false,
+                    once: false,
+                    next: null,
+                };
+                if (prev === null) {
+                    listeners.set(eventName, newNode);
+                } else {
+                    prev.next = newNode;
+                }
+            }
+        },
+        configurable: true,
+        enumerable: true,
+    }
+}
+
+/**
+ * Define an event attribute (e.g. `eventTarget.onclick`).
+ * @param {Object} eventTargetPrototype The event target prototype to define an event attrbite.
+ * @param {string} eventName The event name to define.
+ * @returns {void}
+ */
+function defineEventAttribute(eventTargetPrototype, eventName) {
+    Object.defineProperty(
+        eventTargetPrototype,
+        `on${eventName}`,
+        defineEventAttributeDescriptor(eventName)
+    );
+}
+
+/**
+ * Define a custom EventTarget with event attributes.
+ * @param {string[]} eventNames Event names for event attributes.
+ * @returns {EventTarget} The custom EventTarget.
+ * @private
+ */
+function defineCustomEventTarget(eventNames) {
+    /** CustomEventTarget */
+    function CustomEventTarget() {
+        EventTarget.call(this);
+    }
+
+    CustomEventTarget.prototype = Object.create(EventTarget.prototype, {
+        constructor: {
+            value: CustomEventTarget,
+            configurable: true,
+            writable: true,
+        },
+    });
+
+    for (let i = 0; i < eventNames.length; ++i) {
+        defineEventAttribute(CustomEventTarget.prototype, eventNames[i]);
+    }
+
+    return CustomEventTarget
+}
+
+/**
+ * EventTarget.
+ *
+ * - This is constructor if no arguments.
+ * - This is a function which returns a CustomEventTarget constructor if there are arguments.
+ *
+ * For example:
+ *
+ *     class A extends EventTarget {}
+ *     class B extends EventTarget("message") {}
+ *     class C extends EventTarget("message", "error") {}
+ *     class D extends EventTarget(["message", "error"]) {}
+ */
+function EventTarget() {
+    /*eslint-disable consistent-return */
+    if (this instanceof EventTarget) {
+        listenersMap.set(this, new Map());
+        return
+    }
+    if (arguments.length === 1 && Array.isArray(arguments[0])) {
+        return defineCustomEventTarget(arguments[0])
+    }
+    if (arguments.length > 0) {
+        const types = new Array(arguments.length);
+        for (let i = 0; i < arguments.length; ++i) {
+            types[i] = arguments[i];
+        }
+        return defineCustomEventTarget(types)
+    }
+    throw new TypeError("Cannot call a class as a function")
+    /*eslint-enable consistent-return */
+}
+
+// Should be enumerable, but class methods are not enumerable.
+EventTarget.prototype = {
+    /**
+     * Add a given listener to this event target.
+     * @param {string} eventName The event name to add.
+     * @param {Function} listener The listener to add.
+     * @param {boolean|{capture?:boolean,passive?:boolean,once?:boolean}} [options] The options for this listener.
+     * @returns {void}
+     */
+    addEventListener(eventName, listener, options) {
+        if (listener == null) {
+            return
+        }
+        if (typeof listener !== "function" && !isObject(listener)) {
+            throw new TypeError("'listener' should be a function or an object.")
+        }
+
+        const listeners = getListeners(this);
+        const optionsIsObj = isObject(options);
+        const capture = optionsIsObj
+            ? Boolean(options.capture)
+            : Boolean(options);
+        const listenerType = capture ? CAPTURE : BUBBLE;
+        const newNode = {
+            listener,
+            listenerType,
+            passive: optionsIsObj && Boolean(options.passive),
+            once: optionsIsObj && Boolean(options.once),
+            next: null,
+        };
+
+        // Set it as the first node if the first node is null.
+        let node = listeners.get(eventName);
+        if (node === undefined) {
+            listeners.set(eventName, newNode);
+            return
+        }
+
+        // Traverse to the tail while checking duplication..
+        let prev = null;
+        while (node != null) {
+            if (
+                node.listener === listener &&
+                node.listenerType === listenerType
+            ) {
+                // Should ignore duplication.
+                return
+            }
+            prev = node;
+            node = node.next;
+        }
+
+        // Add it.
+        prev.next = newNode;
+    },
+
+    /**
+     * Remove a given listener from this event target.
+     * @param {string} eventName The event name to remove.
+     * @param {Function} listener The listener to remove.
+     * @param {boolean|{capture?:boolean,passive?:boolean,once?:boolean}} [options] The options for this listener.
+     * @returns {void}
+     */
+    removeEventListener(eventName, listener, options) {
+        if (listener == null) {
+            return
+        }
+
+        const listeners = getListeners(this);
+        const capture = isObject(options)
+            ? Boolean(options.capture)
+            : Boolean(options);
+        const listenerType = capture ? CAPTURE : BUBBLE;
+
+        let prev = null;
+        let node = listeners.get(eventName);
+        while (node != null) {
+            if (
+                node.listener === listener &&
+                node.listenerType === listenerType
+            ) {
+                if (prev !== null) {
+                    prev.next = node.next;
+                } else if (node.next !== null) {
+                    listeners.set(eventName, node.next);
+                } else {
+                    listeners.delete(eventName);
+                }
+                return
+            }
+
+            prev = node;
+            node = node.next;
+        }
+    },
+
+    /**
+     * Dispatch a given event.
+     * @param {Event|{type:string}} event The event to dispatch.
+     * @returns {boolean} `false` if canceled.
+     */
+    dispatchEvent(event) {
+        if (event == null || typeof event.type !== "string") {
+            throw new TypeError('"event.type" should be a string.')
+        }
+
+        // If listeners aren't registered, terminate.
+        const listeners = getListeners(this);
+        const eventName = event.type;
+        let node = listeners.get(eventName);
+        if (node == null) {
+            return true
+        }
+
+        // Since we cannot rewrite several properties, so wrap object.
+        const wrappedEvent = wrapEvent(this, event);
+
+        // This doesn't process capturing phase and bubbling phase.
+        // This isn't participating in a tree.
+        let prev = null;
+        while (node != null) {
+            // Remove this listener if it's once
+            if (node.once) {
+                if (prev !== null) {
+                    prev.next = node.next;
+                } else if (node.next !== null) {
+                    listeners.set(eventName, node.next);
+                } else {
+                    listeners.delete(eventName);
+                }
+            } else {
+                prev = node;
+            }
+
+            // Call this listener
+            setPassiveListener(
+                wrappedEvent,
+                node.passive ? node.listener : null
+            );
+            if (typeof node.listener === "function") {
+                try {
+                    node.listener.call(this, wrappedEvent);
+                } catch (err) {
+                    if (
+                        typeof console !== "undefined" &&
+                        typeof console.error === "function"
+                    ) {
+                        console.error(err);
+                    }
+                }
+            } else if (
+                node.listenerType !== ATTRIBUTE &&
+                typeof node.listener.handleEvent === "function"
+            ) {
+                node.listener.handleEvent(wrappedEvent);
+            }
+
+            // Break if `event.stopImmediatePropagation` was called.
+            if (isStopped(wrappedEvent)) {
+                break
+            }
+
+            node = node.next;
+        }
+        setPassiveListener(wrappedEvent, null);
+        setEventPhase(wrappedEvent, 0);
+        setCurrentTarget(wrappedEvent, null);
+
+        return !wrappedEvent.defaultPrevented
+    },
+};
+
+// `constructor` is not enumerable.
+Object.defineProperty(EventTarget.prototype, "constructor", {
+    value: EventTarget,
+    configurable: true,
+    writable: true,
+});
+
+// Ensure `eventTarget instanceof window.EventTarget` is `true`.
+if (
+    typeof window !== "undefined" &&
+    typeof window.EventTarget !== "undefined"
+) {
+    Object.setPrototypeOf(EventTarget.prototype, window.EventTarget.prototype);
+}
+
+exports.defineEventAttribute = defineEventAttribute;
+exports.EventTarget = EventTarget;
+exports["default"] = EventTarget;
+
+module.exports = EventTarget
+module.exports.EventTarget = module.exports["default"] = EventTarget
+module.exports.defineEventAttribute = defineEventAttribute
+//# sourceMappingURL=event-target-shim.js.map
+
+
+/***/ }),
+
+/***/ 6993:
+/***/ (function(__unused_webpack_module, exports) {
+
+/**
+ * @license
+ * web-streams-polyfill v4.0.0-beta.3
+ * Copyright 2021 Mattias Buelens, Diwank Singh Tomer and other contributors.
+ * This code is released under the MIT license.
+ * SPDX-License-Identifier: MIT
+ */
+!function(e,t){ true?t(exports):0}(this,(function(e){"use strict";const t="function"==typeof Symbol&&"symbol"==typeof Symbol.iterator?Symbol:e=>`Symbol(${e})`;function r(){}function o(e){return"object"==typeof e&&null!==e||"function"==typeof e}const n=r;function a(e,t){try{Object.defineProperty(e,"name",{value:t,configurable:!0})}catch(e){}}const i=Promise,l=Promise.prototype.then,s=Promise.resolve.bind(i),u=Promise.reject.bind(i);function c(e){return new i(e)}function d(e){return s(e)}function f(e){return u(e)}function b(e,t,r){return l.call(e,t,r)}function h(e,t,r){b(b(e,t,r),void 0,n)}function _(e,t){h(e,t)}function p(e,t){h(e,void 0,t)}function m(e,t,r){return b(e,t,r)}function y(e){b(e,void 0,n)}let g=e=>{if("function"==typeof queueMicrotask)g=queueMicrotask;else{const e=d(void 0);g=t=>b(e,t)}return g(e)};function S(e,t,r){if("function"!=typeof e)throw new TypeError("Argument is not a function");return Function.prototype.apply.call(e,t,r)}function w(e,t,r){try{return d(S(e,t,r))}catch(e){return f(e)}}class v{constructor(){this._cursor=0,this._size=0,this._front={_elements:[],_next:void 0},this._back=this._front,this._cursor=0,this._size=0}get length(){return this._size}push(e){const t=this._back;let r=t;16383===t._elements.length&&(r={_elements:[],_next:void 0}),t._elements.push(e),r!==t&&(this._back=r,t._next=r),++this._size}shift(){const e=this._front;let t=e;const r=this._cursor;let o=r+1;const n=e._elements,a=n[r];return 16384===o&&(t=e._next,o=0),--this._size,this._cursor=o,e!==t&&(this._front=t),n[r]=void 0,a}forEach(e){let t=this._cursor,r=this._front,o=r._elements;for(;!(t===o.length&&void 0===r._next||t===o.length&&(r=r._next,o=r._elements,t=0,0===o.length));)e(o[t]),++t}peek(){const e=this._front,t=this._cursor;return e._elements[t]}}const R=t("[[AbortSteps]]"),T=t("[[ErrorSteps]]"),q=t("[[CancelSteps]]"),C=t("[[PullSteps]]"),P=t("[[ReleaseSteps]]");function E(e,t){e._ownerReadableStream=t,t._reader=e,"readable"===t._state?B(e):"closed"===t._state?function(e){B(e),z(e)}(e):A(e,t._storedError)}function W(e,t){return Xt(e._ownerReadableStream,t)}function O(e){const t=e._ownerReadableStream;"readable"===t._state?j(e,new TypeError("Reader was released and can no longer be used to monitor the stream's closedness")):function(e,t){A(e,t)}(e,new TypeError("Reader was released and can no longer be used to monitor the stream's closedness")),t._readableStreamController[P](),t._reader=void 0,e._ownerReadableStream=void 0}function k(e){return new TypeError("Cannot "+e+" a stream using a released reader")}function B(e){e._closedPromise=c(((t,r)=>{e._closedPromise_resolve=t,e._closedPromise_reject=r}))}function A(e,t){B(e),j(e,t)}function j(e,t){void 0!==e._closedPromise_reject&&(y(e._closedPromise),e._closedPromise_reject(t),e._closedPromise_resolve=void 0,e._closedPromise_reject=void 0)}function z(e){void 0!==e._closedPromise_resolve&&(e._closedPromise_resolve(void 0),e._closedPromise_resolve=void 0,e._closedPromise_reject=void 0)}const L=Number.isFinite||function(e){return"number"==typeof e&&isFinite(e)},F=Math.trunc||function(e){return e<0?Math.ceil(e):Math.floor(e)};function D(e,t){if(void 0!==e&&("object"!=typeof(r=e)&&"function"!=typeof r))throw new TypeError(`${t} is not an object.`);var r}function I(e,t){if("function"!=typeof e)throw new TypeError(`${t} is not a function.`)}function $(e,t){if(!function(e){return"object"==typeof e&&null!==e||"function"==typeof e}(e))throw new TypeError(`${t} is not an object.`)}function M(e,t,r){if(void 0===e)throw new TypeError(`Parameter ${t} is required in '${r}'.`)}function Y(e,t,r){if(void 0===e)throw new TypeError(`${t} is required in '${r}'.`)}function Q(e){return Number(e)}function N(e){return 0===e?0:e}function x(e,t){const r=Number.MAX_SAFE_INTEGER;let o=Number(e);if(o=N(o),!L(o))throw new TypeError(`${t} is not a finite number`);if(o=function(e){return N(F(e))}(o),o<0||o>r)throw new TypeError(`${t} is outside the accepted range of 0 to ${r}, inclusive`);return L(o)&&0!==o?o:0}function H(e){if(!o(e))return!1;if("function"!=typeof e.getReader)return!1;try{return"boolean"==typeof e.locked}catch(e){return!1}}function V(e){if(!o(e))return!1;if("function"!=typeof e.getWriter)return!1;try{return"boolean"==typeof e.locked}catch(e){return!1}}function U(e,t){if(!Ut(e))throw new TypeError(`${t} is not a ReadableStream.`)}function G(e,t){e._reader._readRequests.push(t)}function X(e,t,r){const o=e._reader._readRequests.shift();r?o._closeSteps():o._chunkSteps(t)}function J(e){return e._reader._readRequests.length}function K(e){const t=e._reader;return void 0!==t&&!!Z(t)}class ReadableStreamDefaultReader{constructor(e){if(M(e,1,"ReadableStreamDefaultReader"),U(e,"First parameter"),Gt(e))throw new TypeError("This stream has already been locked for exclusive reading by another reader");E(this,e),this._readRequests=new v}get closed(){return Z(this)?this._closedPromise:f(te("closed"))}cancel(e){return Z(this)?void 0===this._ownerReadableStream?f(k("cancel")):W(this,e):f(te("cancel"))}read(){if(!Z(this))return f(te("read"));if(void 0===this._ownerReadableStream)return f(k("read from"));let e,t;const r=c(((r,o)=>{e=r,t=o}));return function(e,t){const r=e._ownerReadableStream;r._disturbed=!0,"closed"===r._state?t._closeSteps():"errored"===r._state?t._errorSteps(r._storedError):r._readableStreamController[C](t)}(this,{_chunkSteps:t=>e({value:t,done:!1}),_closeSteps:()=>e({value:void 0,done:!0}),_errorSteps:e=>t(e)}),r}releaseLock(){if(!Z(this))throw te("releaseLock");void 0!==this._ownerReadableStream&&function(e){O(e);const t=new TypeError("Reader was released");ee(e,t)}(this)}}function Z(e){return!!o(e)&&(!!Object.prototype.hasOwnProperty.call(e,"_readRequests")&&e instanceof ReadableStreamDefaultReader)}function ee(e,t){const r=e._readRequests;e._readRequests=new v,r.forEach((e=>{e._errorSteps(t)}))}function te(e){return new TypeError(`ReadableStreamDefaultReader.prototype.${e} can only be used on a ReadableStreamDefaultReader`)}Object.defineProperties(ReadableStreamDefaultReader.prototype,{cancel:{enumerable:!0},read:{enumerable:!0},releaseLock:{enumerable:!0},closed:{enumerable:!0}}),a(ReadableStreamDefaultReader.prototype.cancel,"cancel"),a(ReadableStreamDefaultReader.prototype.read,"read"),a(ReadableStreamDefaultReader.prototype.releaseLock,"releaseLock"),"symbol"==typeof t.toStringTag&&Object.defineProperty(ReadableStreamDefaultReader.prototype,t.toStringTag,{value:"ReadableStreamDefaultReader",configurable:!0});class re{constructor(e,t){this._ongoingPromise=void 0,this._isFinished=!1,this._reader=e,this._preventCancel=t}next(){const e=()=>this._nextSteps();return this._ongoingPromise=this._ongoingPromise?m(this._ongoingPromise,e,e):e(),this._ongoingPromise}return(e){const t=()=>this._returnSteps(e);return this._ongoingPromise?m(this._ongoingPromise,t,t):t()}_nextSteps(){if(this._isFinished)return Promise.resolve({value:void 0,done:!0});const e=this._reader;return void 0===e?f(k("iterate")):b(e.read(),(e=>{var t;return this._ongoingPromise=void 0,e.done&&(this._isFinished=!0,null===(t=this._reader)||void 0===t||t.releaseLock(),this._reader=void 0),e}),(e=>{var t;throw this._ongoingPromise=void 0,this._isFinished=!0,null===(t=this._reader)||void 0===t||t.releaseLock(),this._reader=void 0,e}))}_returnSteps(e){if(this._isFinished)return Promise.resolve({value:e,done:!0});this._isFinished=!0;const t=this._reader;if(void 0===t)return f(k("finish iterating"));if(this._reader=void 0,!this._preventCancel){const r=t.cancel(e);return t.releaseLock(),m(r,(()=>({value:e,done:!0})))}return t.releaseLock(),d({value:e,done:!0})}}const oe={next(){return ne(this)?this._asyncIteratorImpl.next():f(ae("next"))},return(e){return ne(this)?this._asyncIteratorImpl.return(e):f(ae("return"))}};function ne(e){if(!o(e))return!1;if(!Object.prototype.hasOwnProperty.call(e,"_asyncIteratorImpl"))return!1;try{return e._asyncIteratorImpl instanceof re}catch(e){return!1}}function ae(e){return new TypeError(`ReadableStreamAsyncIterator.${e} can only be used on a ReadableSteamAsyncIterator`)}"symbol"==typeof t.asyncIterator&&Object.defineProperty(oe,t.asyncIterator,{value(){return this},writable:!0,configurable:!0});const ie=Number.isNaN||function(e){return e!=e};function le(e,t,r,o,n){new Uint8Array(e).set(new Uint8Array(r,o,n),t)}function se(e){const t=function(e,t,r){if(e.slice)return e.slice(t,r);const o=r-t,n=new ArrayBuffer(o);return le(n,0,e,t,o),n}(e.buffer,e.byteOffset,e.byteOffset+e.byteLength);return new Uint8Array(t)}function ue(e){const t=e._queue.shift();return e._queueTotalSize-=t.size,e._queueTotalSize<0&&(e._queueTotalSize=0),t.value}function ce(e,t,r){if("number"!=typeof(o=r)||ie(o)||o<0||r===1/0)throw new RangeError("Size must be a finite, non-NaN, non-negative number.");var o;e._queue.push({value:t,size:r}),e._queueTotalSize+=r}function de(e){e._queue=new v,e._queueTotalSize=0}class ReadableStreamBYOBRequest{constructor(){throw new TypeError("Illegal constructor")}get view(){if(!be(this))throw Ae("view");return this._view}respond(e){if(!be(this))throw Ae("respond");if(M(e,1,"respond"),e=x(e,"First parameter"),void 0===this._associatedReadableByteStreamController)throw new TypeError("This BYOB request has been invalidated");this._view.buffer,function(e,t){const r=e._pendingPullIntos.peek();if("closed"===e._controlledReadableByteStream._state){if(0!==t)throw new TypeError("bytesWritten must be 0 when calling respond() on a closed stream")}else{if(0===t)throw new TypeError("bytesWritten must be greater than 0 when calling respond() on a readable stream");if(r.bytesFilled+t>r.byteLength)throw new RangeError("bytesWritten out of range")}r.buffer=r.buffer,Ce(e,t)}(this._associatedReadableByteStreamController,e)}respondWithNewView(e){if(!be(this))throw Ae("respondWithNewView");if(M(e,1,"respondWithNewView"),!ArrayBuffer.isView(e))throw new TypeError("You can only respond with array buffer views");if(void 0===this._associatedReadableByteStreamController)throw new TypeError("This BYOB request has been invalidated");e.buffer,function(e,t){const r=e._pendingPullIntos.peek();if("closed"===e._controlledReadableByteStream._state){if(0!==t.byteLength)throw new TypeError("The view's length must be 0 when calling respondWithNewView() on a closed stream")}else if(0===t.byteLength)throw new TypeError("The view's length must be greater than 0 when calling respondWithNewView() on a readable stream");if(r.byteOffset+r.bytesFilled!==t.byteOffset)throw new RangeError("The region specified by view does not match byobRequest");if(r.bufferByteLength!==t.buffer.byteLength)throw new RangeError("The buffer of view has different capacity than byobRequest");if(r.bytesFilled+t.byteLength>r.byteLength)throw new RangeError("The region specified by view is larger than byobRequest");const o=t.byteLength;r.buffer=t.buffer,Ce(e,o)}(this._associatedReadableByteStreamController,e)}}Object.defineProperties(ReadableStreamBYOBRequest.prototype,{respond:{enumerable:!0},respondWithNewView:{enumerable:!0},view:{enumerable:!0}}),a(ReadableStreamBYOBRequest.prototype.respond,"respond"),a(ReadableStreamBYOBRequest.prototype.respondWithNewView,"respondWithNewView"),"symbol"==typeof t.toStringTag&&Object.defineProperty(ReadableStreamBYOBRequest.prototype,t.toStringTag,{value:"ReadableStreamBYOBRequest",configurable:!0});class ReadableByteStreamController{constructor(){throw new TypeError("Illegal constructor")}get byobRequest(){if(!fe(this))throw je("byobRequest");return function(e){if(null===e._byobRequest&&e._pendingPullIntos.length>0){const t=e._pendingPullIntos.peek(),r=new Uint8Array(t.buffer,t.byteOffset+t.bytesFilled,t.byteLength-t.bytesFilled),o=Object.create(ReadableStreamBYOBRequest.prototype);!function(e,t,r){e._associatedReadableByteStreamController=t,e._view=r}(o,e,r),e._byobRequest=o}return e._byobRequest}(this)}get desiredSize(){if(!fe(this))throw je("desiredSize");return ke(this)}close(){if(!fe(this))throw je("close");if(this._closeRequested)throw new TypeError("The stream has already been closed; do not close it again!");const e=this._controlledReadableByteStream._state;if("readable"!==e)throw new TypeError(`The stream (in ${e} state) is not in the readable state and cannot be closed`);!function(e){const t=e._controlledReadableByteStream;if(e._closeRequested||"readable"!==t._state)return;if(e._queueTotalSize>0)return void(e._closeRequested=!0);if(e._pendingPullIntos.length>0){if(e._pendingPullIntos.peek().bytesFilled>0){const t=new TypeError("Insufficient bytes to fill elements in the given buffer");throw We(e,t),t}}Ee(e),Jt(t)}(this)}enqueue(e){if(!fe(this))throw je("enqueue");if(M(e,1,"enqueue"),!ArrayBuffer.isView(e))throw new TypeError("chunk must be an array buffer view");if(0===e.byteLength)throw new TypeError("chunk must have non-zero byteLength");if(0===e.buffer.byteLength)throw new TypeError("chunk's buffer must have non-zero byteLength");if(this._closeRequested)throw new TypeError("stream is closed or draining");const t=this._controlledReadableByteStream._state;if("readable"!==t)throw new TypeError(`The stream (in ${t} state) is not in the readable state and cannot be enqueued to`);!function(e,t){const r=e._controlledReadableByteStream;if(e._closeRequested||"readable"!==r._state)return;const o=t.buffer,n=t.byteOffset,a=t.byteLength,i=o;if(e._pendingPullIntos.length>0){const t=e._pendingPullIntos.peek();t.buffer,0,Te(e),t.buffer=t.buffer,"none"===t.readerType&&Se(e,t)}if(K(r))if(function(e){const t=e._controlledReadableByteStream._reader;for(;t._readRequests.length>0;){if(0===e._queueTotalSize)return;Oe(e,t._readRequests.shift())}}(e),0===J(r))ye(e,i,n,a);else{e._pendingPullIntos.length>0&&Pe(e);X(r,new Uint8Array(i,n,a),!1)}else Fe(r)?(ye(e,i,n,a),qe(e)):ye(e,i,n,a);he(e)}(this,e)}error(e){if(!fe(this))throw je("error");We(this,e)}[q](e){_e(this),de(this);const t=this._cancelAlgorithm(e);return Ee(this),t}[C](e){const t=this._controlledReadableByteStream;if(this._queueTotalSize>0)return void Oe(this,e);const r=this._autoAllocateChunkSize;if(void 0!==r){let t;try{t=new ArrayBuffer(r)}catch(t){return void e._errorSteps(t)}const o={buffer:t,bufferByteLength:r,byteOffset:0,byteLength:r,bytesFilled:0,elementSize:1,viewConstructor:Uint8Array,readerType:"default"};this._pendingPullIntos.push(o)}G(t,e),he(this)}[P](){if(this._pendingPullIntos.length>0){const e=this._pendingPullIntos.peek();e.readerType="none",this._pendingPullIntos=new v,this._pendingPullIntos.push(e)}}}function fe(e){return!!o(e)&&(!!Object.prototype.hasOwnProperty.call(e,"_controlledReadableByteStream")&&e instanceof ReadableByteStreamController)}function be(e){return!!o(e)&&(!!Object.prototype.hasOwnProperty.call(e,"_associatedReadableByteStreamController")&&e instanceof ReadableStreamBYOBRequest)}function he(e){const t=function(e){const t=e._controlledReadableByteStream;if("readable"!==t._state)return!1;if(e._closeRequested)return!1;if(!e._started)return!1;if(K(t)&&J(t)>0)return!0;if(Fe(t)&&Le(t)>0)return!0;if(ke(e)>0)return!0;return!1}(e);if(!t)return;if(e._pulling)return void(e._pullAgain=!0);e._pulling=!0;h(e._pullAlgorithm(),(()=>(e._pulling=!1,e._pullAgain&&(e._pullAgain=!1,he(e)),null)),(t=>(We(e,t),null)))}function _e(e){Te(e),e._pendingPullIntos=new v}function pe(e,t){let r=!1;"closed"===e._state&&(r=!0);const o=me(t);"default"===t.readerType?X(e,o,r):function(e,t,r){const o=e._reader._readIntoRequests.shift();r?o._closeSteps(t):o._chunkSteps(t)}(e,o,r)}function me(e){const t=e.bytesFilled,r=e.elementSize;return new e.viewConstructor(e.buffer,e.byteOffset,t/r)}function ye(e,t,r,o){e._queue.push({buffer:t,byteOffset:r,byteLength:o}),e._queueTotalSize+=o}function ge(e,t,r,o){let n;try{n=t.slice(r,r+o)}catch(t){throw We(e,t),t}ye(e,n,0,o)}function Se(e,t){t.bytesFilled>0&&ge(e,t.buffer,t.byteOffset,t.bytesFilled),Pe(e)}function we(e,t){const r=t.elementSize,o=t.bytesFilled-t.bytesFilled%r,n=Math.min(e._queueTotalSize,t.byteLength-t.bytesFilled),a=t.bytesFilled+n,i=a-a%r;let l=n,s=!1;i>o&&(l=i-t.bytesFilled,s=!0);const u=e._queue;for(;l>0;){const r=u.peek(),o=Math.min(l,r.byteLength),n=t.byteOffset+t.bytesFilled;le(t.buffer,n,r.buffer,r.byteOffset,o),r.byteLength===o?u.shift():(r.byteOffset+=o,r.byteLength-=o),e._queueTotalSize-=o,ve(e,o,t),l-=o}return s}function ve(e,t,r){r.bytesFilled+=t}function Re(e){0===e._queueTotalSize&&e._closeRequested?(Ee(e),Jt(e._controlledReadableByteStream)):he(e)}function Te(e){null!==e._byobRequest&&(e._byobRequest._associatedReadableByteStreamController=void 0,e._byobRequest._view=null,e._byobRequest=null)}function qe(e){for(;e._pendingPullIntos.length>0;){if(0===e._queueTotalSize)return;const t=e._pendingPullIntos.peek();we(e,t)&&(Pe(e),pe(e._controlledReadableByteStream,t))}}function Ce(e,t){const r=e._pendingPullIntos.peek();Te(e);"closed"===e._controlledReadableByteStream._state?function(e,t){"none"===t.readerType&&Pe(e);const r=e._controlledReadableByteStream;if(Fe(r))for(;Le(r)>0;)pe(r,Pe(e))}(e,r):function(e,t,r){if(ve(0,t,r),"none"===r.readerType)return Se(e,r),void qe(e);if(r.bytesFilled<r.elementSize)return;Pe(e);const o=r.bytesFilled%r.elementSize;if(o>0){const t=r.byteOffset+r.bytesFilled;ge(e,r.buffer,t-o,o)}r.bytesFilled-=o,pe(e._controlledReadableByteStream,r),qe(e)}(e,t,r),he(e)}function Pe(e){return e._pendingPullIntos.shift()}function Ee(e){e._pullAlgorithm=void 0,e._cancelAlgorithm=void 0}function We(e,t){const r=e._controlledReadableByteStream;"readable"===r._state&&(_e(e),de(e),Ee(e),Kt(r,t))}function Oe(e,t){const r=e._queue.shift();e._queueTotalSize-=r.byteLength,Re(e);const o=new Uint8Array(r.buffer,r.byteOffset,r.byteLength);t._chunkSteps(o)}function ke(e){const t=e._controlledReadableByteStream._state;return"errored"===t?null:"closed"===t?0:e._strategyHWM-e._queueTotalSize}function Be(e,t,r){const o=Object.create(ReadableByteStreamController.prototype);let n,a,i;n=void 0!==t.start?()=>t.start(o):()=>{},a=void 0!==t.pull?()=>t.pull(o):()=>d(void 0),i=void 0!==t.cancel?e=>t.cancel(e):()=>d(void 0);const l=t.autoAllocateChunkSize;if(0===l)throw new TypeError("autoAllocateChunkSize must be greater than 0");!function(e,t,r,o,n,a,i){t._controlledReadableByteStream=e,t._pullAgain=!1,t._pulling=!1,t._byobRequest=null,t._queue=t._queueTotalSize=void 0,de(t),t._closeRequested=!1,t._started=!1,t._strategyHWM=a,t._pullAlgorithm=o,t._cancelAlgorithm=n,t._autoAllocateChunkSize=i,t._pendingPullIntos=new v,e._readableStreamController=t,h(d(r()),(()=>(t._started=!0,he(t),null)),(e=>(We(t,e),null)))}(e,o,n,a,i,r,l)}function Ae(e){return new TypeError(`ReadableStreamBYOBRequest.prototype.${e} can only be used on a ReadableStreamBYOBRequest`)}function je(e){return new TypeError(`ReadableByteStreamController.prototype.${e} can only be used on a ReadableByteStreamController`)}function ze(e,t){e._reader._readIntoRequests.push(t)}function Le(e){return e._reader._readIntoRequests.length}function Fe(e){const t=e._reader;return void 0!==t&&!!De(t)}Object.defineProperties(ReadableByteStreamController.prototype,{close:{enumerable:!0},enqueue:{enumerable:!0},error:{enumerable:!0},byobRequest:{enumerable:!0},desiredSize:{enumerable:!0}}),a(ReadableByteStreamController.prototype.close,"close"),a(ReadableByteStreamController.prototype.enqueue,"enqueue"),a(ReadableByteStreamController.prototype.error,"error"),"symbol"==typeof t.toStringTag&&Object.defineProperty(ReadableByteStreamController.prototype,t.toStringTag,{value:"ReadableByteStreamController",configurable:!0});class ReadableStreamBYOBReader{constructor(e){if(M(e,1,"ReadableStreamBYOBReader"),U(e,"First parameter"),Gt(e))throw new TypeError("This stream has already been locked for exclusive reading by another reader");if(!fe(e._readableStreamController))throw new TypeError("Cannot construct a ReadableStreamBYOBReader for a stream not constructed with a byte source");E(this,e),this._readIntoRequests=new v}get closed(){return De(this)?this._closedPromise:f($e("closed"))}cancel(e){return De(this)?void 0===this._ownerReadableStream?f(k("cancel")):W(this,e):f($e("cancel"))}read(e){if(!De(this))return f($e("read"));if(!ArrayBuffer.isView(e))return f(new TypeError("view must be an array buffer view"));if(0===e.byteLength)return f(new TypeError("view must have non-zero byteLength"));if(0===e.buffer.byteLength)return f(new TypeError("view's buffer must have non-zero byteLength"));if(e.buffer,void 0===this._ownerReadableStream)return f(k("read from"));let t,r;const o=c(((e,o)=>{t=e,r=o}));return function(e,t,r){const o=e._ownerReadableStream;o._disturbed=!0,"errored"===o._state?r._errorSteps(o._storedError):function(e,t,r){const o=e._controlledReadableByteStream;let n=1;t.constructor!==DataView&&(n=t.constructor.BYTES_PER_ELEMENT);const a=t.constructor,i=t.buffer,l={buffer:i,bufferByteLength:i.byteLength,byteOffset:t.byteOffset,byteLength:t.byteLength,bytesFilled:0,elementSize:n,viewConstructor:a,readerType:"byob"};if(e._pendingPullIntos.length>0)return e._pendingPullIntos.push(l),void ze(o,r);if("closed"!==o._state){if(e._queueTotalSize>0){if(we(e,l)){const t=me(l);return Re(e),void r._chunkSteps(t)}if(e._closeRequested){const t=new TypeError("Insufficient bytes to fill elements in the given buffer");return We(e,t),void r._errorSteps(t)}}e._pendingPullIntos.push(l),ze(o,r),he(e)}else{const e=new a(l.buffer,l.byteOffset,0);r._closeSteps(e)}}(o._readableStreamController,t,r)}(this,e,{_chunkSteps:e=>t({value:e,done:!1}),_closeSteps:e=>t({value:e,done:!0}),_errorSteps:e=>r(e)}),o}releaseLock(){if(!De(this))throw $e("releaseLock");void 0!==this._ownerReadableStream&&function(e){O(e);const t=new TypeError("Reader was released");Ie(e,t)}(this)}}function De(e){return!!o(e)&&(!!Object.prototype.hasOwnProperty.call(e,"_readIntoRequests")&&e instanceof ReadableStreamBYOBReader)}function Ie(e,t){const r=e._readIntoRequests;e._readIntoRequests=new v,r.forEach((e=>{e._errorSteps(t)}))}function $e(e){return new TypeError(`ReadableStreamBYOBReader.prototype.${e} can only be used on a ReadableStreamBYOBReader`)}function Me(e,t){const{highWaterMark:r}=e;if(void 0===r)return t;if(ie(r)||r<0)throw new RangeError("Invalid highWaterMark");return r}function Ye(e){const{size:t}=e;return t||(()=>1)}function Qe(e,t){D(e,t);const r=null==e?void 0:e.highWaterMark,o=null==e?void 0:e.size;return{highWaterMark:void 0===r?void 0:Q(r),size:void 0===o?void 0:Ne(o,`${t} has member 'size' that`)}}function Ne(e,t){return I(e,t),t=>Q(e(t))}function xe(e,t,r){return I(e,r),r=>w(e,t,[r])}function He(e,t,r){return I(e,r),()=>w(e,t,[])}function Ve(e,t,r){return I(e,r),r=>S(e,t,[r])}function Ue(e,t,r){return I(e,r),(r,o)=>w(e,t,[r,o])}Object.defineProperties(ReadableStreamBYOBReader.prototype,{cancel:{enumerable:!0},read:{enumerable:!0},releaseLock:{enumerable:!0},closed:{enumerable:!0}}),a(ReadableStreamBYOBReader.prototype.cancel,"cancel"),a(ReadableStreamBYOBReader.prototype.read,"read"),a(ReadableStreamBYOBReader.prototype.releaseLock,"releaseLock"),"symbol"==typeof t.toStringTag&&Object.defineProperty(ReadableStreamBYOBReader.prototype,t.toStringTag,{value:"ReadableStreamBYOBReader",configurable:!0});const Ge="function"==typeof AbortController;class WritableStream{constructor(e={},t={}){void 0===e?e=null:$(e,"First parameter");const r=Qe(t,"Second parameter"),o=function(e,t){D(e,t);const r=null==e?void 0:e.abort,o=null==e?void 0:e.close,n=null==e?void 0:e.start,a=null==e?void 0:e.type,i=null==e?void 0:e.write;return{abort:void 0===r?void 0:xe(r,e,`${t} has member 'abort' that`),close:void 0===o?void 0:He(o,e,`${t} has member 'close' that`),start:void 0===n?void 0:Ve(n,e,`${t} has member 'start' that`),write:void 0===i?void 0:Ue(i,e,`${t} has member 'write' that`),type:a}}(e,"First parameter");var n;(n=this)._state="writable",n._storedError=void 0,n._writer=void 0,n._writableStreamController=void 0,n._writeRequests=new v,n._inFlightWriteRequest=void 0,n._closeRequest=void 0,n._inFlightCloseRequest=void 0,n._pendingAbortRequest=void 0,n._backpressure=!1;if(void 0!==o.type)throw new RangeError("Invalid type is specified");const a=Ye(r);!function(e,t,r,o){const n=Object.create(WritableStreamDefaultController.prototype);let a,i,l,s;a=void 0!==t.start?()=>t.start(n):()=>{};i=void 0!==t.write?e=>t.write(e,n):()=>d(void 0);l=void 0!==t.close?()=>t.close():()=>d(void 0);s=void 0!==t.abort?e=>t.abort(e):()=>d(void 0);!function(e,t,r,o,n,a,i,l){t._controlledWritableStream=e,e._writableStreamController=t,t._queue=void 0,t._queueTotalSize=void 0,de(t),t._abortReason=void 0,t._abortController=function(){if(Ge)return new AbortController}(),t._started=!1,t._strategySizeAlgorithm=l,t._strategyHWM=i,t._writeAlgorithm=o,t._closeAlgorithm=n,t._abortAlgorithm=a;const s=ht(t);at(e,s);const u=r();h(d(u),(()=>(t._started=!0,ft(t),null)),(r=>(t._started=!0,et(e,r),null)))}(e,n,a,i,l,s,r,o)}(this,o,Me(r,1),a)}get locked(){if(!Xe(this))throw pt("locked");return Je(this)}abort(e){return Xe(this)?Je(this)?f(new TypeError("Cannot abort a stream that already has a writer")):Ke(this,e):f(pt("abort"))}close(){return Xe(this)?Je(this)?f(new TypeError("Cannot close a stream that already has a writer")):ot(this)?f(new TypeError("Cannot close an already-closing stream")):Ze(this):f(pt("close"))}getWriter(){if(!Xe(this))throw pt("getWriter");return new WritableStreamDefaultWriter(this)}}function Xe(e){return!!o(e)&&(!!Object.prototype.hasOwnProperty.call(e,"_writableStreamController")&&e instanceof WritableStream)}function Je(e){return void 0!==e._writer}function Ke(e,t){var r;if("closed"===e._state||"errored"===e._state)return d(void 0);e._writableStreamController._abortReason=t,null===(r=e._writableStreamController._abortController)||void 0===r||r.abort(t);const o=e._state;if("closed"===o||"errored"===o)return d(void 0);if(void 0!==e._pendingAbortRequest)return e._pendingAbortRequest._promise;let n=!1;"erroring"===o&&(n=!0,t=void 0);const a=c(((r,o)=>{e._pendingAbortRequest={_promise:void 0,_resolve:r,_reject:o,_reason:t,_wasAlreadyErroring:n}}));return e._pendingAbortRequest._promise=a,n||tt(e,t),a}function Ze(e){const t=e._state;if("closed"===t||"errored"===t)return f(new TypeError(`The stream (in ${t} state) is not in the writable state and cannot be closed`));const r=c(((t,r)=>{const o={_resolve:t,_reject:r};e._closeRequest=o})),o=e._writer;var n;return void 0!==o&&e._backpressure&&"writable"===t&&Et(o),ce(n=e._writableStreamController,st,0),ft(n),r}function et(e,t){"writable"!==e._state?rt(e):tt(e,t)}function tt(e,t){const r=e._writableStreamController;e._state="erroring",e._storedError=t;const o=e._writer;void 0!==o&&lt(o,t),!function(e){if(void 0===e._inFlightWriteRequest&&void 0===e._inFlightCloseRequest)return!1;return!0}(e)&&r._started&&rt(e)}function rt(e){e._state="errored",e._writableStreamController[T]();const t=e._storedError;if(e._writeRequests.forEach((e=>{e._reject(t)})),e._writeRequests=new v,void 0===e._pendingAbortRequest)return void nt(e);const r=e._pendingAbortRequest;if(e._pendingAbortRequest=void 0,r._wasAlreadyErroring)return r._reject(t),void nt(e);h(e._writableStreamController[R](r._reason),(()=>(r._resolve(),nt(e),null)),(t=>(r._reject(t),nt(e),null)))}function ot(e){return void 0!==e._closeRequest||void 0!==e._inFlightCloseRequest}function nt(e){void 0!==e._closeRequest&&(e._closeRequest._reject(e._storedError),e._closeRequest=void 0);const t=e._writer;void 0!==t&&vt(t,e._storedError)}function at(e,t){const r=e._writer;void 0!==r&&t!==e._backpressure&&(t?function(e){Tt(e)}(r):Et(r)),e._backpressure=t}Object.defineProperties(WritableStream.prototype,{abort:{enumerable:!0},close:{enumerable:!0},getWriter:{enumerable:!0},locked:{enumerable:!0}}),a(WritableStream.prototype.abort,"abort"),a(WritableStream.prototype.close,"close"),a(WritableStream.prototype.getWriter,"getWriter"),"symbol"==typeof t.toStringTag&&Object.defineProperty(WritableStream.prototype,t.toStringTag,{value:"WritableStream",configurable:!0});class WritableStreamDefaultWriter{constructor(e){if(M(e,1,"WritableStreamDefaultWriter"),function(e,t){if(!Xe(e))throw new TypeError(`${t} is not a WritableStream.`)}(e,"First parameter"),Je(e))throw new TypeError("This stream has already been locked for exclusive writing by another writer");this._ownerWritableStream=e,e._writer=this;const t=e._state;if("writable"===t)!ot(e)&&e._backpressure?Tt(this):Ct(this),St(this);else if("erroring"===t)qt(this,e._storedError),St(this);else if("closed"===t)Ct(this),St(r=this),Rt(r);else{const t=e._storedError;qt(this,t),wt(this,t)}var r}get closed(){return it(this)?this._closedPromise:f(yt("closed"))}get desiredSize(){if(!it(this))throw yt("desiredSize");if(void 0===this._ownerWritableStream)throw gt("desiredSize");return function(e){const t=e._ownerWritableStream,r=t._state;if("errored"===r||"erroring"===r)return null;if("closed"===r)return 0;return dt(t._writableStreamController)}(this)}get ready(){return it(this)?this._readyPromise:f(yt("ready"))}abort(e){return it(this)?void 0===this._ownerWritableStream?f(gt("abort")):function(e,t){return Ke(e._ownerWritableStream,t)}(this,e):f(yt("abort"))}close(){if(!it(this))return f(yt("close"));const e=this._ownerWritableStream;return void 0===e?f(gt("close")):ot(e)?f(new TypeError("Cannot close an already-closing stream")):Ze(this._ownerWritableStream)}releaseLock(){if(!it(this))throw yt("releaseLock");void 0!==this._ownerWritableStream&&function(e){const t=e._ownerWritableStream,r=new TypeError("Writer was released and can no longer be used to monitor the stream's closedness");lt(e,r),function(e,t){"pending"===e._closedPromiseState?vt(e,t):function(e,t){wt(e,t)}(e,t)}(e,r),t._writer=void 0,e._ownerWritableStream=void 0}(this)}write(e){return it(this)?void 0===this._ownerWritableStream?f(gt("write to")):function(e,t){const r=e._ownerWritableStream,o=r._writableStreamController,n=function(e,t){try{return e._strategySizeAlgorithm(t)}catch(t){return bt(e,t),1}}(o,t);if(r!==e._ownerWritableStream)return f(gt("write to"));const a=r._state;if("errored"===a)return f(r._storedError);if(ot(r)||"closed"===a)return f(new TypeError("The stream is closing or closed and cannot be written to"));if("erroring"===a)return f(r._storedError);const i=function(e){return c(((t,r)=>{const o={_resolve:t,_reject:r};e._writeRequests.push(o)}))}(r);return function(e,t,r){try{ce(e,t,r)}catch(t){return void bt(e,t)}const o=e._controlledWritableStream;if(!ot(o)&&"writable"===o._state){at(o,ht(e))}ft(e)}(o,t,n),i}(this,e):f(yt("write"))}}function it(e){return!!o(e)&&(!!Object.prototype.hasOwnProperty.call(e,"_ownerWritableStream")&&e instanceof WritableStreamDefaultWriter)}function lt(e,t){"pending"===e._readyPromiseState?Pt(e,t):function(e,t){qt(e,t)}(e,t)}Object.defineProperties(WritableStreamDefaultWriter.prototype,{abort:{enumerable:!0},close:{enumerable:!0},releaseLock:{enumerable:!0},write:{enumerable:!0},closed:{enumerable:!0},desiredSize:{enumerable:!0},ready:{enumerable:!0}}),a(WritableStreamDefaultWriter.prototype.abort,"abort"),a(WritableStreamDefaultWriter.prototype.close,"close"),a(WritableStreamDefaultWriter.prototype.releaseLock,"releaseLock"),a(WritableStreamDefaultWriter.prototype.write,"write"),"symbol"==typeof t.toStringTag&&Object.defineProperty(WritableStreamDefaultWriter.prototype,t.toStringTag,{value:"WritableStreamDefaultWriter",configurable:!0});const st={};class WritableStreamDefaultController{constructor(){throw new TypeError("Illegal constructor")}get abortReason(){if(!ut(this))throw mt("abortReason");return this._abortReason}get signal(){if(!ut(this))throw mt("signal");if(void 0===this._abortController)throw new TypeError("WritableStreamDefaultController.prototype.signal is not supported");return this._abortController.signal}error(e){if(!ut(this))throw mt("error");"writable"===this._controlledWritableStream._state&&_t(this,e)}[R](e){const t=this._abortAlgorithm(e);return ct(this),t}[T](){de(this)}}function ut(e){return!!o(e)&&(!!Object.prototype.hasOwnProperty.call(e,"_controlledWritableStream")&&e instanceof WritableStreamDefaultController)}function ct(e){e._writeAlgorithm=void 0,e._closeAlgorithm=void 0,e._abortAlgorithm=void 0,e._strategySizeAlgorithm=void 0}function dt(e){return e._strategyHWM-e._queueTotalSize}function ft(e){const t=e._controlledWritableStream;if(!e._started)return;if(void 0!==t._inFlightWriteRequest)return;if("erroring"===t._state)return void rt(t);if(0===e._queue.length)return;const r=e._queue.peek().value;r===st?function(e){const t=e._controlledWritableStream;(function(e){e._inFlightCloseRequest=e._closeRequest,e._closeRequest=void 0})(t),ue(e);const r=e._closeAlgorithm();ct(e),h(r,(()=>(function(e){e._inFlightCloseRequest._resolve(void 0),e._inFlightCloseRequest=void 0,"erroring"===e._state&&(e._storedError=void 0,void 0!==e._pendingAbortRequest&&(e._pendingAbortRequest._resolve(),e._pendingAbortRequest=void 0)),e._state="closed";const t=e._writer;void 0!==t&&Rt(t)}(t),null)),(e=>(function(e,t){e._inFlightCloseRequest._reject(t),e._inFlightCloseRequest=void 0,void 0!==e._pendingAbortRequest&&(e._pendingAbortRequest._reject(t),e._pendingAbortRequest=void 0),et(e,t)}(t,e),null)))}(e):function(e,t){const r=e._controlledWritableStream;!function(e){e._inFlightWriteRequest=e._writeRequests.shift()}(r);h(e._writeAlgorithm(t),(()=>{!function(e){e._inFlightWriteRequest._resolve(void 0),e._inFlightWriteRequest=void 0}(r);const t=r._state;if(ue(e),!ot(r)&&"writable"===t){const t=ht(e);at(r,t)}return ft(e),null}),(t=>("writable"===r._state&&ct(e),function(e,t){e._inFlightWriteRequest._reject(t),e._inFlightWriteRequest=void 0,et(e,t)}(r,t),null)))}(e,r)}function bt(e,t){"writable"===e._controlledWritableStream._state&&_t(e,t)}function ht(e){return dt(e)<=0}function _t(e,t){const r=e._controlledWritableStream;ct(e),tt(r,t)}function pt(e){return new TypeError(`WritableStream.prototype.${e} can only be used on a WritableStream`)}function mt(e){return new TypeError(`WritableStreamDefaultController.prototype.${e} can only be used on a WritableStreamDefaultController`)}function yt(e){return new TypeError(`WritableStreamDefaultWriter.prototype.${e} can only be used on a WritableStreamDefaultWriter`)}function gt(e){return new TypeError("Cannot "+e+" a stream using a released writer")}function St(e){e._closedPromise=c(((t,r)=>{e._closedPromise_resolve=t,e._closedPromise_reject=r,e._closedPromiseState="pending"}))}function wt(e,t){St(e),vt(e,t)}function vt(e,t){void 0!==e._closedPromise_reject&&(y(e._closedPromise),e._closedPromise_reject(t),e._closedPromise_resolve=void 0,e._closedPromise_reject=void 0,e._closedPromiseState="rejected")}function Rt(e){void 0!==e._closedPromise_resolve&&(e._closedPromise_resolve(void 0),e._closedPromise_resolve=void 0,e._closedPromise_reject=void 0,e._closedPromiseState="resolved")}function Tt(e){e._readyPromise=c(((t,r)=>{e._readyPromise_resolve=t,e._readyPromise_reject=r})),e._readyPromiseState="pending"}function qt(e,t){Tt(e),Pt(e,t)}function Ct(e){Tt(e),Et(e)}function Pt(e,t){void 0!==e._readyPromise_reject&&(y(e._readyPromise),e._readyPromise_reject(t),e._readyPromise_resolve=void 0,e._readyPromise_reject=void 0,e._readyPromiseState="rejected")}function Et(e){void 0!==e._readyPromise_resolve&&(e._readyPromise_resolve(void 0),e._readyPromise_resolve=void 0,e._readyPromise_reject=void 0,e._readyPromiseState="fulfilled")}Object.defineProperties(WritableStreamDefaultController.prototype,{abortReason:{enumerable:!0},signal:{enumerable:!0},error:{enumerable:!0}}),"symbol"==typeof t.toStringTag&&Object.defineProperty(WritableStreamDefaultController.prototype,t.toStringTag,{value:"WritableStreamDefaultController",configurable:!0});const Wt="undefined"!=typeof DOMException?DOMException:void 0;const Ot=function(e){if("function"!=typeof e&&"object"!=typeof e)return!1;try{return new e,!0}catch(e){return!1}}(Wt)?Wt:function(){const e=function(e,t){this.message=e||"",this.name=t||"Error",Error.captureStackTrace&&Error.captureStackTrace(this,this.constructor)};return e.prototype=Object.create(Error.prototype),Object.defineProperty(e.prototype,"constructor",{value:e,writable:!0,configurable:!0}),e}();function kt(e,t,r,o,n,a){const i=e.getReader(),l=t.getWriter();Ut(e)&&(e._disturbed=!0);let s,u,p,S=!1,w=!1,v="readable",R="writable",T=!1,q=!1;const C=c((e=>{p=e}));let P=Promise.resolve(void 0);return c(((E,W)=>{let O;function k(){if(S)return;const e=c(((e,t)=>{!function r(o){o?e():b(function(){if(S)return d(!0);return b(l.ready,(()=>b(i.read(),(e=>!!e.done||(P=l.write(e.value),y(P),!1)))))}(),r,t)}(!1)}));y(e)}function B(){return v="closed",r?L():z((()=>(Xe(t)&&(T=ot(t),R=t._state),T||"closed"===R?d(void 0):"erroring"===R||"errored"===R?f(u):(T=!0,l.close()))),!1,void 0),null}function A(e){return S||(v="errored",s=e,o?L(!0,e):z((()=>l.abort(e)),!0,e)),null}function j(e){return w||(R="errored",u=e,n?L(!0,e):z((()=>i.cancel(e)),!0,e)),null}if(void 0!==a&&(O=()=>{const e=void 0!==a.reason?a.reason:new Ot("Aborted","AbortError"),t=[];o||t.push((()=>"writable"===R?l.abort(e):d(void 0))),n||t.push((()=>"readable"===v?i.cancel(e):d(void 0))),z((()=>Promise.all(t.map((e=>e())))),!0,e)},a.aborted?O():a.addEventListener("abort",O)),Ut(e)&&(v=e._state,s=e._storedError),Xe(t)&&(R=t._state,u=t._storedError,T=ot(t)),Ut(e)&&Xe(t)&&(q=!0,p()),"errored"===v)A(s);else if("erroring"===R||"errored"===R)j(u);else if("closed"===v)B();else if(T||"closed"===R){const e=new TypeError("the destination writable stream closed before all data could be piped to it");n?L(!0,e):z((()=>i.cancel(e)),!0,e)}function z(e,t,r){function o(){return"writable"!==R||T?n():_(function(){let e;return d(function t(){if(e!==P)return e=P,m(P,t,t)}())}(),n),null}function n(){return e?h(e(),(()=>F(t,r)),(e=>F(!0,e))):F(t,r),null}S||(S=!0,q?o():_(C,o))}function L(e,t){z(void 0,e,t)}function F(e,t){return w=!0,l.releaseLock(),i.releaseLock(),void 0!==a&&a.removeEventListener("abort",O),e?W(t):E(void 0),null}S||(h(i.closed,B,A),h(l.closed,(function(){return w||(R="closed"),null}),j)),q?k():g((()=>{q=!0,p(),k()}))}))}function Bt(e,t){return function(e){try{return e.getReader({mode:"byob"}).releaseLock(),!0}catch(e){return!1}}(e)?function(e){let t,r,o,n,a,i=e.getReader(),l=!1,s=!1,u=!1,f=!1,b=!1,_=!1;const m=c((e=>{a=e}));function y(e){p(e.closed,(t=>(e!==i||(o.error(t),n.error(t),b&&_||a(void 0)),null)))}function g(){l&&(i.releaseLock(),i=e.getReader(),y(i),l=!1),h(i.read(),(e=>{var t,r;if(u=!1,f=!1,e.done)return b||o.close(),_||n.close(),null===(t=o.byobRequest)||void 0===t||t.respond(0),null===(r=n.byobRequest)||void 0===r||r.respond(0),b&&_||a(void 0),null;const l=e.value,c=l;let d=l;if(!b&&!_)try{d=se(l)}catch(e){return o.error(e),n.error(e),a(i.cancel(e)),null}return b||o.enqueue(c),_||n.enqueue(d),s=!1,u?w():f&&v(),null}),(()=>(s=!1,null)))}function S(t,r){l||(i.releaseLock(),i=e.getReader({mode:"byob"}),y(i),l=!0);const c=r?n:o,d=r?o:n;h(i.read(t),(e=>{var t;u=!1,f=!1;const o=r?_:b,n=r?b:_;if(e.done){o||c.close(),n||d.close();const r=e.value;return void 0!==r&&(o||c.byobRequest.respondWithNewView(r),n||null===(t=d.byobRequest)||void 0===t||t.respond(0)),o&&n||a(void 0),null}const l=e.value;if(n)o||c.byobRequest.respondWithNewView(l);else{let e;try{e=se(l)}catch(e){return c.error(e),d.error(e),a(i.cancel(e)),null}o||c.byobRequest.respondWithNewView(l),d.enqueue(e)}return s=!1,u?w():f&&v(),null}),(()=>(s=!1,null)))}function w(){if(s)return u=!0,d(void 0);s=!0;const e=o.byobRequest;return null===e?g():S(e.view,!1),d(void 0)}function v(){if(s)return f=!0,d(void 0);s=!0;const e=n.byobRequest;return null===e?g():S(e.view,!0),d(void 0)}function R(e){if(b=!0,t=e,_){const e=[t,r],o=i.cancel(e);a(o)}return m}function T(e){if(_=!0,r=e,b){const e=[t,r],o=i.cancel(e);a(o)}return m}const q=new ReadableStream({type:"bytes",start(e){o=e},pull:w,cancel:R}),C=new ReadableStream({type:"bytes",start(e){n=e},pull:v,cancel:T});return y(i),[q,C]}(e):function(e,t){const r=e.getReader();let o,n,a,i,l,s=!1,u=!1,f=!1,b=!1;const _=c((e=>{l=e}));function m(){return s?(u=!0,d(void 0)):(s=!0,h(r.read(),(e=>{if(u=!1,e.done)return f||a.close(),b||i.close(),f&&b||l(void 0),null;const t=e.value,r=t,o=t;return f||a.enqueue(r),b||i.enqueue(o),s=!1,u&&m(),null}),(()=>(s=!1,null))),d(void 0))}function y(e){if(f=!0,o=e,b){const e=[o,n],t=r.cancel(e);l(t)}return _}function g(e){if(b=!0,n=e,f){const e=[o,n],t=r.cancel(e);l(t)}return _}const S=new ReadableStream({start(e){a=e},pull:m,cancel:y}),w=new ReadableStream({start(e){i=e},pull:m,cancel:g});return p(r.closed,(e=>(a.error(e),i.error(e),f&&b||l(void 0),null))),[S,w]}(e)}class ReadableStreamDefaultController{constructor(){throw new TypeError("Illegal constructor")}get desiredSize(){if(!At(this))throw $t("desiredSize");return Ft(this)}close(){if(!At(this))throw $t("close");if(!Dt(this))throw new TypeError("The stream is not in a state that permits close");!function(e){if(!Dt(e))return;const t=e._controlledReadableStream;e._closeRequested=!0,0===e._queue.length&&(zt(e),Jt(t))}(this)}enqueue(e){if(!At(this))throw $t("enqueue");if(!Dt(this))throw new TypeError("The stream is not in a state that permits enqueue");return function(e,t){if(!Dt(e))return;const r=e._controlledReadableStream;if(Gt(r)&&J(r)>0)X(r,t,!1);else{let r;try{r=e._strategySizeAlgorithm(t)}catch(t){throw Lt(e,t),t}try{ce(e,t,r)}catch(t){throw Lt(e,t),t}}jt(e)}(this,e)}error(e){if(!At(this))throw $t("error");Lt(this,e)}[q](e){de(this);const t=this._cancelAlgorithm(e);return zt(this),t}[C](e){const t=this._controlledReadableStream;if(this._queue.length>0){const r=ue(this);this._closeRequested&&0===this._queue.length?(zt(this),Jt(t)):jt(this),e._chunkSteps(r)}else G(t,e),jt(this)}[P](){}}function At(e){return!!o(e)&&(!!Object.prototype.hasOwnProperty.call(e,"_controlledReadableStream")&&e instanceof ReadableStreamDefaultController)}function jt(e){const t=function(e){const t=e._controlledReadableStream;if(!Dt(e))return!1;if(!e._started)return!1;if(Gt(t)&&J(t)>0)return!0;if(Ft(e)>0)return!0;return!1}(e);if(!t)return;if(e._pulling)return void(e._pullAgain=!0);e._pulling=!0;h(e._pullAlgorithm(),(()=>(e._pulling=!1,e._pullAgain&&(e._pullAgain=!1,jt(e)),null)),(t=>(Lt(e,t),null)))}function zt(e){e._pullAlgorithm=void 0,e._cancelAlgorithm=void 0,e._strategySizeAlgorithm=void 0}function Lt(e,t){const r=e._controlledReadableStream;"readable"===r._state&&(de(e),zt(e),Kt(r,t))}function Ft(e){const t=e._controlledReadableStream._state;return"errored"===t?null:"closed"===t?0:e._strategyHWM-e._queueTotalSize}function Dt(e){return!e._closeRequested&&"readable"===e._controlledReadableStream._state}function It(e,t,r,o){const n=Object.create(ReadableStreamDefaultController.prototype);let a,i,l;a=void 0!==t.start?()=>t.start(n):()=>{},i=void 0!==t.pull?()=>t.pull(n):()=>d(void 0),l=void 0!==t.cancel?e=>t.cancel(e):()=>d(void 0),function(e,t,r,o,n,a,i){t._controlledReadableStream=e,t._queue=void 0,t._queueTotalSize=void 0,de(t),t._started=!1,t._closeRequested=!1,t._pullAgain=!1,t._pulling=!1,t._strategySizeAlgorithm=i,t._strategyHWM=a,t._pullAlgorithm=o,t._cancelAlgorithm=n,e._readableStreamController=t,h(d(r()),(()=>(t._started=!0,jt(t),null)),(e=>(Lt(t,e),null)))}(e,n,a,i,l,r,o)}function $t(e){return new TypeError(`ReadableStreamDefaultController.prototype.${e} can only be used on a ReadableStreamDefaultController`)}function Mt(e,t,r){return I(e,r),r=>w(e,t,[r])}function Yt(e,t,r){return I(e,r),r=>w(e,t,[r])}function Qt(e,t,r){return I(e,r),r=>S(e,t,[r])}function Nt(e,t){if("bytes"!==(e=`${e}`))throw new TypeError(`${t} '${e}' is not a valid enumeration value for ReadableStreamType`);return e}function xt(e,t){if("byob"!==(e=`${e}`))throw new TypeError(`${t} '${e}' is not a valid enumeration value for ReadableStreamReaderMode`);return e}function Ht(e,t){D(e,t);const r=null==e?void 0:e.preventAbort,o=null==e?void 0:e.preventCancel,n=null==e?void 0:e.preventClose,a=null==e?void 0:e.signal;return void 0!==a&&function(e,t){if(!function(e){if("object"!=typeof e||null===e)return!1;try{return"boolean"==typeof e.aborted}catch(e){return!1}}(e))throw new TypeError(`${t} is not an AbortSignal.`)}(a,`${t} has member 'signal' that`),{preventAbort:Boolean(r),preventCancel:Boolean(o),preventClose:Boolean(n),signal:a}}function Vt(e,t){D(e,t);const r=null==e?void 0:e.readable;Y(r,"readable","ReadableWritablePair"),function(e,t){if(!H(e))throw new TypeError(`${t} is not a ReadableStream.`)}(r,`${t} has member 'readable' that`);const o=null==e?void 0:e.writable;return Y(o,"writable","ReadableWritablePair"),function(e,t){if(!V(e))throw new TypeError(`${t} is not a WritableStream.`)}(o,`${t} has member 'writable' that`),{readable:r,writable:o}}Object.defineProperties(ReadableStreamDefaultController.prototype,{close:{enumerable:!0},enqueue:{enumerable:!0},error:{enumerable:!0},desiredSize:{enumerable:!0}}),a(ReadableStreamDefaultController.prototype.close,"close"),a(ReadableStreamDefaultController.prototype.enqueue,"enqueue"),a(ReadableStreamDefaultController.prototype.error,"error"),"symbol"==typeof t.toStringTag&&Object.defineProperty(ReadableStreamDefaultController.prototype,t.toStringTag,{value:"ReadableStreamDefaultController",configurable:!0});class ReadableStream{constructor(e={},t={}){void 0===e?e=null:$(e,"First parameter");const r=Qe(t,"Second parameter"),o=function(e,t){D(e,t);const r=e,o=null==r?void 0:r.autoAllocateChunkSize,n=null==r?void 0:r.cancel,a=null==r?void 0:r.pull,i=null==r?void 0:r.start,l=null==r?void 0:r.type;return{autoAllocateChunkSize:void 0===o?void 0:x(o,`${t} has member 'autoAllocateChunkSize' that`),cancel:void 0===n?void 0:Mt(n,r,`${t} has member 'cancel' that`),pull:void 0===a?void 0:Yt(a,r,`${t} has member 'pull' that`),start:void 0===i?void 0:Qt(i,r,`${t} has member 'start' that`),type:void 0===l?void 0:Nt(l,`${t} has member 'type' that`)}}(e,"First parameter");var n;if((n=this)._state="readable",n._reader=void 0,n._storedError=void 0,n._disturbed=!1,"bytes"===o.type){if(void 0!==r.size)throw new RangeError("The strategy for a byte stream cannot have a size function");Be(this,o,Me(r,0))}else{const e=Ye(r);It(this,o,Me(r,1),e)}}get locked(){if(!Ut(this))throw Zt("locked");return Gt(this)}cancel(e){return Ut(this)?Gt(this)?f(new TypeError("Cannot cancel a stream that already has a reader")):Xt(this,e):f(Zt("cancel"))}getReader(e){if(!Ut(this))throw Zt("getReader");return void 0===function(e,t){D(e,t);const r=null==e?void 0:e.mode;return{mode:void 0===r?void 0:xt(r,`${t} has member 'mode' that`)}}(e,"First parameter").mode?new ReadableStreamDefaultReader(this):function(e){return new ReadableStreamBYOBReader(e)}(this)}pipeThrough(e,t={}){if(!H(this))throw Zt("pipeThrough");M(e,1,"pipeThrough");const r=Vt(e,"First parameter"),o=Ht(t,"Second parameter");if(this.locked)throw new TypeError("ReadableStream.prototype.pipeThrough cannot be used on a locked ReadableStream");if(r.writable.locked)throw new TypeError("ReadableStream.prototype.pipeThrough cannot be used on a locked WritableStream");return y(kt(this,r.writable,o.preventClose,o.preventAbort,o.preventCancel,o.signal)),r.readable}pipeTo(e,t={}){if(!H(this))return f(Zt("pipeTo"));if(void 0===e)return f("Parameter 1 is required in 'pipeTo'.");if(!V(e))return f(new TypeError("ReadableStream.prototype.pipeTo's first argument must be a WritableStream"));let r;try{r=Ht(t,"Second parameter")}catch(e){return f(e)}return this.locked?f(new TypeError("ReadableStream.prototype.pipeTo cannot be used on a locked ReadableStream")):e.locked?f(new TypeError("ReadableStream.prototype.pipeTo cannot be used on a locked WritableStream")):kt(this,e,r.preventClose,r.preventAbort,r.preventCancel,r.signal)}tee(){if(!H(this))throw Zt("tee");if(this.locked)throw new TypeError("Cannot tee a stream that already has a reader");return Bt(this)}values(e){if(!H(this))throw Zt("values");return function(e,t){const r=e.getReader(),o=new re(r,t),n=Object.create(oe);return n._asyncIteratorImpl=o,n}(this,function(e,t){D(e,t);const r=null==e?void 0:e.preventCancel;return{preventCancel:Boolean(r)}}(e,"First parameter").preventCancel)}}function Ut(e){return!!o(e)&&(!!Object.prototype.hasOwnProperty.call(e,"_readableStreamController")&&e instanceof ReadableStream)}function Gt(e){return void 0!==e._reader}function Xt(e,t){if(e._disturbed=!0,"closed"===e._state)return d(void 0);if("errored"===e._state)return f(e._storedError);Jt(e);const o=e._reader;if(void 0!==o&&De(o)){const e=o._readIntoRequests;o._readIntoRequests=new v,e.forEach((e=>{e._closeSteps(void 0)}))}return m(e._readableStreamController[q](t),r)}function Jt(e){e._state="closed";const t=e._reader;if(void 0!==t&&(z(t),Z(t))){const e=t._readRequests;t._readRequests=new v,e.forEach((e=>{e._closeSteps()}))}}function Kt(e,t){e._state="errored",e._storedError=t;const r=e._reader;void 0!==r&&(j(r,t),Z(r)?ee(r,t):Ie(r,t))}function Zt(e){return new TypeError(`ReadableStream.prototype.${e} can only be used on a ReadableStream`)}function er(e,t){D(e,t);const r=null==e?void 0:e.highWaterMark;return Y(r,"highWaterMark","QueuingStrategyInit"),{highWaterMark:Q(r)}}Object.defineProperties(ReadableStream.prototype,{cancel:{enumerable:!0},getReader:{enumerable:!0},pipeThrough:{enumerable:!0},pipeTo:{enumerable:!0},tee:{enumerable:!0},values:{enumerable:!0},locked:{enumerable:!0}}),a(ReadableStream.prototype.cancel,"cancel"),a(ReadableStream.prototype.getReader,"getReader"),a(ReadableStream.prototype.pipeThrough,"pipeThrough"),a(ReadableStream.prototype.pipeTo,"pipeTo"),a(ReadableStream.prototype.tee,"tee"),a(ReadableStream.prototype.values,"values"),"symbol"==typeof t.toStringTag&&Object.defineProperty(ReadableStream.prototype,t.toStringTag,{value:"ReadableStream",configurable:!0}),"symbol"==typeof t.asyncIterator&&Object.defineProperty(ReadableStream.prototype,t.asyncIterator,{value:ReadableStream.prototype.values,writable:!0,configurable:!0});const tr=e=>e.byteLength;a(tr,"size");class ByteLengthQueuingStrategy{constructor(e){M(e,1,"ByteLengthQueuingStrategy"),e=er(e,"First parameter"),this._byteLengthQueuingStrategyHighWaterMark=e.highWaterMark}get highWaterMark(){if(!or(this))throw rr("highWaterMark");return this._byteLengthQueuingStrategyHighWaterMark}get size(){if(!or(this))throw rr("size");return tr}}function rr(e){return new TypeError(`ByteLengthQueuingStrategy.prototype.${e} can only be used on a ByteLengthQueuingStrategy`)}function or(e){return!!o(e)&&(!!Object.prototype.hasOwnProperty.call(e,"_byteLengthQueuingStrategyHighWaterMark")&&e instanceof ByteLengthQueuingStrategy)}Object.defineProperties(ByteLengthQueuingStrategy.prototype,{highWaterMark:{enumerable:!0},size:{enumerable:!0}}),"symbol"==typeof t.toStringTag&&Object.defineProperty(ByteLengthQueuingStrategy.prototype,t.toStringTag,{value:"ByteLengthQueuingStrategy",configurable:!0});const nr=()=>1;a(nr,"size");class CountQueuingStrategy{constructor(e){M(e,1,"CountQueuingStrategy"),e=er(e,"First parameter"),this._countQueuingStrategyHighWaterMark=e.highWaterMark}get highWaterMark(){if(!ir(this))throw ar("highWaterMark");return this._countQueuingStrategyHighWaterMark}get size(){if(!ir(this))throw ar("size");return nr}}function ar(e){return new TypeError(`CountQueuingStrategy.prototype.${e} can only be used on a CountQueuingStrategy`)}function ir(e){return!!o(e)&&(!!Object.prototype.hasOwnProperty.call(e,"_countQueuingStrategyHighWaterMark")&&e instanceof CountQueuingStrategy)}function lr(e,t,r){return I(e,r),r=>w(e,t,[r])}function sr(e,t,r){return I(e,r),r=>S(e,t,[r])}function ur(e,t,r){return I(e,r),(r,o)=>w(e,t,[r,o])}Object.defineProperties(CountQueuingStrategy.prototype,{highWaterMark:{enumerable:!0},size:{enumerable:!0}}),"symbol"==typeof t.toStringTag&&Object.defineProperty(CountQueuingStrategy.prototype,t.toStringTag,{value:"CountQueuingStrategy",configurable:!0});class TransformStream{constructor(e={},t={},r={}){void 0===e&&(e=null);const o=Qe(t,"Second parameter"),n=Qe(r,"Third parameter"),a=function(e,t){D(e,t);const r=null==e?void 0:e.flush,o=null==e?void 0:e.readableType,n=null==e?void 0:e.start,a=null==e?void 0:e.transform,i=null==e?void 0:e.writableType;return{flush:void 0===r?void 0:lr(r,e,`${t} has member 'flush' that`),readableType:o,start:void 0===n?void 0:sr(n,e,`${t} has member 'start' that`),transform:void 0===a?void 0:ur(a,e,`${t} has member 'transform' that`),writableType:i}}(e,"First parameter");if(void 0!==a.readableType)throw new RangeError("Invalid readableType specified");if(void 0!==a.writableType)throw new RangeError("Invalid writableType specified");const i=Me(n,0),l=Ye(n),s=Me(o,1),u=Ye(o);let b;!function(e,t,r,o,n,a){function i(){return t}function l(t){return function(e,t){const r=e._transformStreamController;if(e._backpressure){return m(e._backpressureChangePromise,(()=>{if("erroring"===(Xe(e._writable)?e._writable._state:e._writableState))throw Xe(e._writable)?e._writable._storedError:e._writableStoredError;return mr(r,t)}))}return mr(r,t)}(e,t)}function s(t){return function(e,t){return dr(e,t),d(void 0)}(e,t)}function u(){return function(e){const t=e._transformStreamController,r=t._flushAlgorithm();return _r(t),m(r,(()=>{if("errored"===e._readableState)throw e._readableStoredError;Sr(e)&&wr(e)}),(t=>{throw dr(e,t),e._readableStoredError}))}(e)}function c(){return function(e){return br(e,!1),e._backpressureChangePromise}(e)}function f(t){return fr(e,t),d(void 0)}e._writableState="writable",e._writableStoredError=void 0,e._writableHasInFlightOperation=!1,e._writableStarted=!1,e._writable=function(e,t,r,o,n,a,i){return new WritableStream({start(r){e._writableController=r;try{const t=r.signal;void 0!==t&&t.addEventListener("abort",(()=>{"writable"===e._writableState&&(e._writableState="erroring",t.reason&&(e._writableStoredError=t.reason))}))}catch(e){}return m(t(),(()=>(e._writableStarted=!0,Pr(e),null)),(t=>{throw e._writableStarted=!0,Tr(e,t),t}))},write:t=>(function(e){e._writableHasInFlightOperation=!0}(e),m(r(t),(()=>(function(e){e._writableHasInFlightOperation=!1}(e),Pr(e),null)),(t=>{throw function(e,t){e._writableHasInFlightOperation=!1,Tr(e,t)}(e,t),t}))),close:()=>(function(e){e._writableHasInFlightOperation=!0}(e),m(o(),(()=>(function(e){e._writableHasInFlightOperation=!1;"erroring"===e._writableState&&(e._writableStoredError=void 0);e._writableState="closed"}(e),null)),(t=>{throw function(e,t){e._writableHasInFlightOperation=!1,e._writableState,Tr(e,t)}(e,t),t}))),abort:t=>(e._writableState="errored",e._writableStoredError=t,n(t))},{highWaterMark:a,size:i})}(e,i,l,u,s,r,o),e._readableState="readable",e._readableStoredError=void 0,e._readableCloseRequested=!1,e._readablePulling=!1,e._readable=function(e,t,r,o,n,a){return new ReadableStream({start:r=>(e._readableController=r,t().catch((t=>{vr(e,t)}))),pull:()=>(e._readablePulling=!0,r().catch((t=>{vr(e,t)}))),cancel:t=>(e._readableState="closed",o(t))},{highWaterMark:n,size:a})}(e,i,c,f,n,a),e._backpressure=void 0,e._backpressureChangePromise=void 0,e._backpressureChangePromise_resolve=void 0,br(e,!0),e._transformStreamController=void 0}(this,c((e=>{b=e})),s,u,i,l),function(e,t){const r=Object.create(TransformStreamDefaultController.prototype);let o,n;o=void 0!==t.transform?e=>t.transform(e,r):e=>{try{return pr(r,e),d(void 0)}catch(e){return f(e)}};n=void 0!==t.flush?()=>t.flush(r):()=>d(void 0);!function(e,t,r,o){t._controlledTransformStream=e,e._transformStreamController=t,t._transformAlgorithm=r,t._flushAlgorithm=o}(e,r,o,n)}(this,a),void 0!==a.start?b(a.start(this._transformStreamController)):b(void 0)}get readable(){if(!cr(this))throw gr("readable");return this._readable}get writable(){if(!cr(this))throw gr("writable");return this._writable}}function cr(e){return!!o(e)&&(!!Object.prototype.hasOwnProperty.call(e,"_transformStreamController")&&e instanceof TransformStream)}function dr(e,t){vr(e,t),fr(e,t)}function fr(e,t){_r(e._transformStreamController),function(e,t){e._writableController.error(t);"writable"===e._writableState&&qr(e,t)}(e,t),e._backpressure&&br(e,!1)}function br(e,t){void 0!==e._backpressureChangePromise&&e._backpressureChangePromise_resolve(),e._backpressureChangePromise=c((t=>{e._backpressureChangePromise_resolve=t})),e._backpressure=t}Object.defineProperties(TransformStream.prototype,{readable:{enumerable:!0},writable:{enumerable:!0}}),"symbol"==typeof t.toStringTag&&Object.defineProperty(TransformStream.prototype,t.toStringTag,{value:"TransformStream",configurable:!0});class TransformStreamDefaultController{constructor(){throw new TypeError("Illegal constructor")}get desiredSize(){if(!hr(this))throw yr("desiredSize");return Rr(this._controlledTransformStream)}enqueue(e){if(!hr(this))throw yr("enqueue");pr(this,e)}error(e){if(!hr(this))throw yr("error");var t;t=e,dr(this._controlledTransformStream,t)}terminate(){if(!hr(this))throw yr("terminate");!function(e){const t=e._controlledTransformStream;Sr(t)&&wr(t);const r=new TypeError("TransformStream terminated");fr(t,r)}(this)}}function hr(e){return!!o(e)&&(!!Object.prototype.hasOwnProperty.call(e,"_controlledTransformStream")&&e instanceof TransformStreamDefaultController)}function _r(e){e._transformAlgorithm=void 0,e._flushAlgorithm=void 0}function pr(e,t){const r=e._controlledTransformStream;if(!Sr(r))throw new TypeError("Readable side is not in a state that permits enqueue");try{!function(e,t){e._readablePulling=!1;try{e._readableController.enqueue(t)}catch(t){throw vr(e,t),t}}(r,t)}catch(e){throw fr(r,e),r._readableStoredError}const o=function(e){return!function(e){if(!Sr(e))return!1;if(e._readablePulling)return!0;if(Rr(e)>0)return!0;return!1}(e)}(r);o!==r._backpressure&&br(r,!0)}function mr(e,t){return m(e._transformAlgorithm(t),void 0,(t=>{throw dr(e._controlledTransformStream,t),t}))}function yr(e){return new TypeError(`TransformStreamDefaultController.prototype.${e} can only be used on a TransformStreamDefaultController`)}function gr(e){return new TypeError(`TransformStream.prototype.${e} can only be used on a TransformStream`)}function Sr(e){return!e._readableCloseRequested&&"readable"===e._readableState}function wr(e){e._readableState="closed",e._readableCloseRequested=!0,e._readableController.close()}function vr(e,t){"readable"===e._readableState&&(e._readableState="errored",e._readableStoredError=t),e._readableController.error(t)}function Rr(e){return e._readableController.desiredSize}function Tr(e,t){"writable"!==e._writableState?Cr(e):qr(e,t)}function qr(e,t){e._writableState="erroring",e._writableStoredError=t,!function(e){return e._writableHasInFlightOperation}(e)&&e._writableStarted&&Cr(e)}function Cr(e){e._writableState="errored"}function Pr(e){"erroring"===e._writableState&&Cr(e)}Object.defineProperties(TransformStreamDefaultController.prototype,{enqueue:{enumerable:!0},error:{enumerable:!0},terminate:{enumerable:!0},desiredSize:{enumerable:!0}}),a(TransformStreamDefaultController.prototype.enqueue,"enqueue"),a(TransformStreamDefaultController.prototype.error,"error"),a(TransformStreamDefaultController.prototype.terminate,"terminate"),"symbol"==typeof t.toStringTag&&Object.defineProperty(TransformStreamDefaultController.prototype,t.toStringTag,{value:"TransformStreamDefaultController",configurable:!0}),e.ByteLengthQueuingStrategy=ByteLengthQueuingStrategy,e.CountQueuingStrategy=CountQueuingStrategy,e.ReadableByteStreamController=ReadableByteStreamController,e.ReadableStream=ReadableStream,e.ReadableStreamBYOBReader=ReadableStreamBYOBReader,e.ReadableStreamBYOBRequest=ReadableStreamBYOBRequest,e.ReadableStreamDefaultController=ReadableStreamDefaultController,e.ReadableStreamDefaultReader=ReadableStreamDefaultReader,e.TransformStream=TransformStream,e.TransformStreamDefaultController=TransformStreamDefaultController,e.WritableStream=WritableStream,e.WritableStreamDefaultController=WritableStreamDefaultController,e.WritableStreamDefaultWriter=WritableStreamDefaultWriter,Object.defineProperty(e,"__esModule",{value:!0})}));
+
+
+/***/ }),
+
+/***/ 845:
+/***/ ((module, __unused_webpack_exports, __nccwpck_require__) => {
+
+"use strict";
+/*!
+ * humanize-ms - index.js
+ * Copyright(c) 2014 dead_horse <dead_horse@qq.com>
+ * MIT Licensed
+ */
+
+
+
+/**
+ * Module dependencies.
+ */
+
+var util = __nccwpck_require__(3837);
+var ms = __nccwpck_require__(900);
+
+module.exports = function (t) {
+  if (typeof t === 'number') return t;
+  var r = ms(t);
+  if (r === undefined) {
+    var err = new Error(util.format('humanize-ms(%j) result undefined', t));
+    console.warn(err.stack);
+  }
+  return r;
+};
+
+
+/***/ }),
+
+/***/ 3287:
+/***/ ((__unused_webpack_module, exports) => {
+
+"use strict";
+
+
+Object.defineProperty(exports, "__esModule", ({ value: true }));
+
+/*!
+ * is-plain-object <https://github.com/jonschlinkert/is-plain-object>
+ *
+ * Copyright (c) 2014-2017, Jon Schlinkert.
+ * Released under the MIT License.
+ */
+
+function isObject(o) {
+  return Object.prototype.toString.call(o) === '[object Object]';
+}
+
+function isPlainObject(o) {
+  var ctor,prot;
+
+  if (isObject(o) === false) return false;
+
+  // If has modified constructor
+  ctor = o.constructor;
+  if (ctor === undefined) return true;
+
+  // If has modified prototype
+  prot = ctor.prototype;
+  if (isObject(prot) === false) return false;
+
+  // If constructor does not have an Object-specific method
+  if (prot.hasOwnProperty('isPrototypeOf') === false) {
+    return false;
+  }
+
+  // Most likely a plain Object
+  return true;
+}
+
+exports.isPlainObject = isPlainObject;
+
+
+/***/ }),
+
+/***/ 900:
+/***/ ((module) => {
+
+/**
+ * Helpers.
+ */
+
+var s = 1000;
+var m = s * 60;
+var h = m * 60;
+var d = h * 24;
+var w = d * 7;
+var y = d * 365.25;
+
+/**
+ * Parse or format the given `val`.
+ *
+ * Options:
+ *
+ *  - `long` verbose formatting [false]
+ *
+ * @param {String|Number} val
+ * @param {Object} [options]
+ * @throws {Error} throw an error if val is not a non-empty string or a number
+ * @return {String|Number}
+ * @api public
+ */
+
+module.exports = function(val, options) {
+  options = options || {};
+  var type = typeof val;
+  if (type === 'string' && val.length > 0) {
+    return parse(val);
+  } else if (type === 'number' && isFinite(val)) {
+    return options.long ? fmtLong(val) : fmtShort(val);
+  }
+  throw new Error(
+    'val is not a non-empty string or a valid number. val=' +
+      JSON.stringify(val)
+  );
+};
+
+/**
+ * Parse the given `str` and return milliseconds.
+ *
+ * @param {String} str
+ * @return {Number}
+ * @api private
+ */
+
+function parse(str) {
+  str = String(str);
+  if (str.length > 100) {
+    return;
+  }
+  var match = /^(-?(?:\d+)?\.?\d+) *(milliseconds?|msecs?|ms|seconds?|secs?|s|minutes?|mins?|m|hours?|hrs?|h|days?|d|weeks?|w|years?|yrs?|y)?$/i.exec(
+    str
+  );
+  if (!match) {
+    return;
+  }
+  var n = parseFloat(match[1]);
+  var type = (match[2] || 'ms').toLowerCase();
+  switch (type) {
+    case 'years':
+    case 'year':
+    case 'yrs':
+    case 'yr':
+    case 'y':
+      return n * y;
+    case 'weeks':
+    case 'week':
+    case 'w':
+      return n * w;
+    case 'days':
+    case 'day':
+    case 'd':
+      return n * d;
+    case 'hours':
+    case 'hour':
+    case 'hrs':
+    case 'hr':
+    case 'h':
+      return n * h;
+    case 'minutes':
+    case 'minute':
+    case 'mins':
+    case 'min':
+    case 'm':
+      return n * m;
+    case 'seconds':
+    case 'second':
+    case 'secs':
+    case 'sec':
+    case 's':
+      return n * s;
+    case 'milliseconds':
+    case 'millisecond':
+    case 'msecs':
+    case 'msec':
+    case 'ms':
+      return n;
+    default:
+      return undefined;
+  }
+}
+
+/**
+ * Short format for `ms`.
+ *
+ * @param {Number} ms
+ * @return {String}
+ * @api private
+ */
+
+function fmtShort(ms) {
+  var msAbs = Math.abs(ms);
+  if (msAbs >= d) {
+    return Math.round(ms / d) + 'd';
+  }
+  if (msAbs >= h) {
+    return Math.round(ms / h) + 'h';
+  }
+  if (msAbs >= m) {
+    return Math.round(ms / m) + 'm';
+  }
+  if (msAbs >= s) {
+    return Math.round(ms / s) + 's';
+  }
+  return ms + 'ms';
+}
+
+/**
+ * Long format for `ms`.
+ *
+ * @param {Number} ms
+ * @return {String}
+ * @api private
+ */
+
+function fmtLong(ms) {
+  var msAbs = Math.abs(ms);
+  if (msAbs >= d) {
+    return plural(ms, msAbs, d, 'day');
+  }
+  if (msAbs >= h) {
+    return plural(ms, msAbs, h, 'hour');
+  }
+  if (msAbs >= m) {
+    return plural(ms, msAbs, m, 'minute');
+  }
+  if (msAbs >= s) {
+    return plural(ms, msAbs, s, 'second');
+  }
+  return ms + ' ms';
+}
+
+/**
+ * Pluralization helper.
+ */
+
+function plural(ms, msAbs, n, name) {
+  var isPlural = msAbs >= n * 1.5;
+  return Math.round(ms / n) + ' ' + name + (isPlural ? 's' : '');
+}
+
+
+/***/ }),
+
+/***/ 7760:
+/***/ ((module, __unused_webpack_exports, __nccwpck_require__) => {
+
+/*! node-domexception. MIT License. Jimmy Wärting <https://jimmy.warting.se/opensource> */
+
+if (!globalThis.DOMException) {
+  try {
+    const { MessageChannel } = __nccwpck_require__(1267),
+    port = new MessageChannel().port1,
+    ab = new ArrayBuffer()
+    port.postMessage(ab, [ab, ab])
+  } catch (err) {
+    err.constructor.name === 'DOMException' && (
+      globalThis.DOMException = err.constructor
+    )
+  }
+}
+
+module.exports = globalThis.DOMException
+
+
+/***/ }),
+
+/***/ 467:
+/***/ ((module, exports, __nccwpck_require__) => {
+
+"use strict";
+
+
+Object.defineProperty(exports, "__esModule", ({ value: true }));
+
+function _interopDefault (ex) { return (ex && (typeof ex === 'object') && 'default' in ex) ? ex['default'] : ex; }
+
+var Stream = _interopDefault(__nccwpck_require__(2781));
+var http = _interopDefault(__nccwpck_require__(3685));
+var Url = _interopDefault(__nccwpck_require__(7310));
+var whatwgUrl = _interopDefault(__nccwpck_require__(3323));
+var https = _interopDefault(__nccwpck_require__(5687));
+var zlib = _interopDefault(__nccwpck_require__(9796));
+
+// Based on https://github.com/tmpvar/jsdom/blob/aa85b2abf07766ff7bf5c1f6daafb3726f2f2db5/lib/jsdom/living/blob.js
+
+// fix for "Readable" isn't a named export issue
+const Readable = Stream.Readable;
+
+const BUFFER = Symbol('buffer');
+const TYPE = Symbol('type');
+
+class Blob {
+	constructor() {
+		this[TYPE] = '';
+
+		const blobParts = arguments[0];
+		const options = arguments[1];
+
+		const buffers = [];
+		let size = 0;
+
+		if (blobParts) {
+			const a = blobParts;
+			const length = Number(a.length);
+			for (let i = 0; i < length; i++) {
+				const element = a[i];
+				let buffer;
+				if (element instanceof Buffer) {
+					buffer = element;
+				} else if (ArrayBuffer.isView(element)) {
+					buffer = Buffer.from(element.buffer, element.byteOffset, element.byteLength);
+				} else if (element instanceof ArrayBuffer) {
+					buffer = Buffer.from(element);
+				} else if (element instanceof Blob) {
+					buffer = element[BUFFER];
+				} else {
+					buffer = Buffer.from(typeof element === 'string' ? element : String(element));
+				}
+				size += buffer.length;
+				buffers.push(buffer);
+			}
+		}
+
+		this[BUFFER] = Buffer.concat(buffers);
+
+		let type = options && options.type !== undefined && String(options.type).toLowerCase();
+		if (type && !/[^\u0020-\u007E]/.test(type)) {
+			this[TYPE] = type;
+		}
+	}
+	get size() {
+		return this[BUFFER].length;
+	}
+	get type() {
+		return this[TYPE];
+	}
+	text() {
+		return Promise.resolve(this[BUFFER].toString());
+	}
+	arrayBuffer() {
+		const buf = this[BUFFER];
+		const ab = buf.buffer.slice(buf.byteOffset, buf.byteOffset + buf.byteLength);
+		return Promise.resolve(ab);
+	}
+	stream() {
+		const readable = new Readable();
+		readable._read = function () {};
+		readable.push(this[BUFFER]);
+		readable.push(null);
+		return readable;
+	}
+	toString() {
+		return '[object Blob]';
+	}
+	slice() {
+		const size = this.size;
+
+		const start = arguments[0];
+		const end = arguments[1];
+		let relativeStart, relativeEnd;
+		if (start === undefined) {
+			relativeStart = 0;
+		} else if (start < 0) {
+			relativeStart = Math.max(size + start, 0);
+		} else {
+			relativeStart = Math.min(start, size);
+		}
+		if (end === undefined) {
+			relativeEnd = size;
+		} else if (end < 0) {
+			relativeEnd = Math.max(size + end, 0);
+		} else {
+			relativeEnd = Math.min(end, size);
+		}
+		const span = Math.max(relativeEnd - relativeStart, 0);
+
+		const buffer = this[BUFFER];
+		const slicedBuffer = buffer.slice(relativeStart, relativeStart + span);
+		const blob = new Blob([], { type: arguments[2] });
+		blob[BUFFER] = slicedBuffer;
+		return blob;
+	}
+}
+
+Object.defineProperties(Blob.prototype, {
+	size: { enumerable: true },
+	type: { enumerable: true },
+	slice: { enumerable: true }
+});
+
+Object.defineProperty(Blob.prototype, Symbol.toStringTag, {
+	value: 'Blob',
+	writable: false,
+	enumerable: false,
+	configurable: true
+});
+
+/**
+ * fetch-error.js
+ *
+ * FetchError interface for operational errors
+ */
+
+/**
+ * Create FetchError instance
+ *
+ * @param   String      message      Error message for human
+ * @param   String      type         Error type for machine
+ * @param   String      systemError  For Node.js system error
+ * @return  FetchError
+ */
+function FetchError(message, type, systemError) {
+  Error.call(this, message);
+
+  this.message = message;
+  this.type = type;
+
+  // when err.type is `system`, err.code contains system error code
+  if (systemError) {
+    this.code = this.errno = systemError.code;
+  }
+
+  // hide custom error implementation details from end-users
+  Error.captureStackTrace(this, this.constructor);
+}
+
+FetchError.prototype = Object.create(Error.prototype);
+FetchError.prototype.constructor = FetchError;
+FetchError.prototype.name = 'FetchError';
+
+let convert;
+try {
+	convert = (__nccwpck_require__(3975).convert);
+} catch (e) {}
+
+const INTERNALS = Symbol('Body internals');
+
+// fix an issue where "PassThrough" isn't a named export for node <10
+const PassThrough = Stream.PassThrough;
+
+/**
+ * Body mixin
+ *
+ * Ref: https://fetch.spec.whatwg.org/#body
+ *
+ * @param   Stream  body  Readable stream
+ * @param   Object  opts  Response options
+ * @return  Void
+ */
+function Body(body) {
+	var _this = this;
+
+	var _ref = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {},
+	    _ref$size = _ref.size;
+
+	let size = _ref$size === undefined ? 0 : _ref$size;
+	var _ref$timeout = _ref.timeout;
+	let timeout = _ref$timeout === undefined ? 0 : _ref$timeout;
+
+	if (body == null) {
+		// body is undefined or null
+		body = null;
+	} else if (isURLSearchParams(body)) {
+		// body is a URLSearchParams
+		body = Buffer.from(body.toString());
+	} else if (isBlob(body)) ; else if (Buffer.isBuffer(body)) ; else if (Object.prototype.toString.call(body) === '[object ArrayBuffer]') {
+		// body is ArrayBuffer
+		body = Buffer.from(body);
+	} else if (ArrayBuffer.isView(body)) {
+		// body is ArrayBufferView
+		body = Buffer.from(body.buffer, body.byteOffset, body.byteLength);
+	} else if (body instanceof Stream) ; else {
+		// none of the above
+		// coerce to string then buffer
+		body = Buffer.from(String(body));
+	}
+	this[INTERNALS] = {
+		body,
+		disturbed: false,
+		error: null
+	};
+	this.size = size;
+	this.timeout = timeout;
+
+	if (body instanceof Stream) {
+		body.on('error', function (err) {
+			const error = err.name === 'AbortError' ? err : new FetchError(`Invalid response body while trying to fetch ${_this.url}: ${err.message}`, 'system', err);
+			_this[INTERNALS].error = error;
+		});
+	}
+}
+
+Body.prototype = {
+	get body() {
+		return this[INTERNALS].body;
+	},
+
+	get bodyUsed() {
+		return this[INTERNALS].disturbed;
+	},
+
+	/**
+  * Decode response as ArrayBuffer
+  *
+  * @return  Promise
+  */
+	arrayBuffer() {
+		return consumeBody.call(this).then(function (buf) {
+			return buf.buffer.slice(buf.byteOffset, buf.byteOffset + buf.byteLength);
+		});
+	},
+
+	/**
+  * Return raw response as Blob
+  *
+  * @return Promise
+  */
+	blob() {
+		let ct = this.headers && this.headers.get('content-type') || '';
+		return consumeBody.call(this).then(function (buf) {
+			return Object.assign(
+			// Prevent copying
+			new Blob([], {
+				type: ct.toLowerCase()
+			}), {
+				[BUFFER]: buf
+			});
+		});
+	},
+
+	/**
+  * Decode response as json
+  *
+  * @return  Promise
+  */
+	json() {
+		var _this2 = this;
+
+		return consumeBody.call(this).then(function (buffer) {
+			try {
+				return JSON.parse(buffer.toString());
+			} catch (err) {
+				return Body.Promise.reject(new FetchError(`invalid json response body at ${_this2.url} reason: ${err.message}`, 'invalid-json'));
+			}
+		});
+	},
+
+	/**
+  * Decode response as text
+  *
+  * @return  Promise
+  */
+	text() {
+		return consumeBody.call(this).then(function (buffer) {
+			return buffer.toString();
+		});
+	},
+
+	/**
+  * Decode response as buffer (non-spec api)
+  *
+  * @return  Promise
+  */
+	buffer() {
+		return consumeBody.call(this);
+	},
+
+	/**
+  * Decode response as text, while automatically detecting the encoding and
+  * trying to decode to UTF-8 (non-spec api)
+  *
+  * @return  Promise
+  */
+	textConverted() {
+		var _this3 = this;
+
+		return consumeBody.call(this).then(function (buffer) {
+			return convertBody(buffer, _this3.headers);
+		});
+	}
+};
+
+// In browsers, all properties are enumerable.
+Object.defineProperties(Body.prototype, {
+	body: { enumerable: true },
+	bodyUsed: { enumerable: true },
+	arrayBuffer: { enumerable: true },
+	blob: { enumerable: true },
+	json: { enumerable: true },
+	text: { enumerable: true }
+});
+
+Body.mixIn = function (proto) {
+	for (const name of Object.getOwnPropertyNames(Body.prototype)) {
+		// istanbul ignore else: future proof
+		if (!(name in proto)) {
+			const desc = Object.getOwnPropertyDescriptor(Body.prototype, name);
+			Object.defineProperty(proto, name, desc);
+		}
+	}
+};
+
+/**
+ * Consume and convert an entire Body to a Buffer.
+ *
+ * Ref: https://fetch.spec.whatwg.org/#concept-body-consume-body
+ *
+ * @return  Promise
+ */
+function consumeBody() {
+	var _this4 = this;
+
+	if (this[INTERNALS].disturbed) {
+		return Body.Promise.reject(new TypeError(`body used already for: ${this.url}`));
+	}
+
+	this[INTERNALS].disturbed = true;
+
+	if (this[INTERNALS].error) {
+		return Body.Promise.reject(this[INTERNALS].error);
+	}
+
+	let body = this.body;
+
+	// body is null
+	if (body === null) {
+		return Body.Promise.resolve(Buffer.alloc(0));
+	}
+
+	// body is blob
+	if (isBlob(body)) {
+		body = body.stream();
+	}
+
+	// body is buffer
+	if (Buffer.isBuffer(body)) {
+		return Body.Promise.resolve(body);
+	}
+
+	// istanbul ignore if: should never happen
+	if (!(body instanceof Stream)) {
+		return Body.Promise.resolve(Buffer.alloc(0));
+	}
+
+	// body is stream
+	// get ready to actually consume the body
+	let accum = [];
+	let accumBytes = 0;
+	let abort = false;
+
+	return new Body.Promise(function (resolve, reject) {
+		let resTimeout;
+
+		// allow timeout on slow response body
+		if (_this4.timeout) {
+			resTimeout = setTimeout(function () {
+				abort = true;
+				reject(new FetchError(`Response timeout while trying to fetch ${_this4.url} (over ${_this4.timeout}ms)`, 'body-timeout'));
+			}, _this4.timeout);
+		}
+
+		// handle stream errors
+		body.on('error', function (err) {
+			if (err.name === 'AbortError') {
+				// if the request was aborted, reject with this Error
+				abort = true;
+				reject(err);
+			} else {
+				// other errors, such as incorrect content-encoding
+				reject(new FetchError(`Invalid response body while trying to fetch ${_this4.url}: ${err.message}`, 'system', err));
+			}
+		});
+
+		body.on('data', function (chunk) {
+			if (abort || chunk === null) {
+				return;
+			}
+
+			if (_this4.size && accumBytes + chunk.length > _this4.size) {
+				abort = true;
+				reject(new FetchError(`content size at ${_this4.url} over limit: ${_this4.size}`, 'max-size'));
+				return;
+			}
+
+			accumBytes += chunk.length;
+			accum.push(chunk);
+		});
+
+		body.on('end', function () {
+			if (abort) {
+				return;
+			}
+
+			clearTimeout(resTimeout);
+
+			try {
+				resolve(Buffer.concat(accum, accumBytes));
+			} catch (err) {
+				// handle streams that have accumulated too much data (issue #414)
+				reject(new FetchError(`Could not create Buffer from response body for ${_this4.url}: ${err.message}`, 'system', err));
+			}
+		});
+	});
+}
+
+/**
+ * Detect buffer encoding and convert to target encoding
+ * ref: http://www.w3.org/TR/2011/WD-html5-20110113/parsing.html#determining-the-character-encoding
+ *
+ * @param   Buffer  buffer    Incoming buffer
+ * @param   String  encoding  Target encoding
+ * @return  String
+ */
+function convertBody(buffer, headers) {
+	if (typeof convert !== 'function') {
+		throw new Error('The package `encoding` must be installed to use the textConverted() function');
+	}
+
+	const ct = headers.get('content-type');
+	let charset = 'utf-8';
+	let res, str;
+
+	// header
+	if (ct) {
+		res = /charset=([^;]*)/i.exec(ct);
+	}
+
+	// no charset in content type, peek at response body for at most 1024 bytes
+	str = buffer.slice(0, 1024).toString();
+
+	// html5
+	if (!res && str) {
+		res = /<meta.+?charset=(['"])(.+?)\1/i.exec(str);
+	}
+
+	// html4
+	if (!res && str) {
+		res = /<meta[\s]+?http-equiv=(['"])content-type\1[\s]+?content=(['"])(.+?)\2/i.exec(str);
+		if (!res) {
+			res = /<meta[\s]+?content=(['"])(.+?)\1[\s]+?http-equiv=(['"])content-type\3/i.exec(str);
+			if (res) {
+				res.pop(); // drop last quote
+			}
+		}
+
+		if (res) {
+			res = /charset=(.*)/i.exec(res.pop());
+		}
+	}
+
+	// xml
+	if (!res && str) {
+		res = /<\?xml.+?encoding=(['"])(.+?)\1/i.exec(str);
+	}
+
+	// found charset
+	if (res) {
+		charset = res.pop();
+
+		// prevent decode issues when sites use incorrect encoding
+		// ref: https://hsivonen.fi/encoding-menu/
+		if (charset === 'gb2312' || charset === 'gbk') {
+			charset = 'gb18030';
+		}
+	}
+
+	// turn raw buffers into a single utf-8 buffer
+	return convert(buffer, 'UTF-8', charset).toString();
+}
+
+/**
+ * Detect a URLSearchParams object
+ * ref: https://github.com/bitinn/node-fetch/issues/296#issuecomment-307598143
+ *
+ * @param   Object  obj     Object to detect by type or brand
+ * @return  String
+ */
+function isURLSearchParams(obj) {
+	// Duck-typing as a necessary condition.
+	if (typeof obj !== 'object' || typeof obj.append !== 'function' || typeof obj.delete !== 'function' || typeof obj.get !== 'function' || typeof obj.getAll !== 'function' || typeof obj.has !== 'function' || typeof obj.set !== 'function') {
+		return false;
+	}
+
+	// Brand-checking and more duck-typing as optional condition.
+	return obj.constructor.name === 'URLSearchParams' || Object.prototype.toString.call(obj) === '[object URLSearchParams]' || typeof obj.sort === 'function';
+}
+
+/**
+ * Check if `obj` is a W3C `Blob` object (which `File` inherits from)
+ * @param  {*} obj
+ * @return {boolean}
+ */
+function isBlob(obj) {
+	return typeof obj === 'object' && typeof obj.arrayBuffer === 'function' && typeof obj.type === 'string' && typeof obj.stream === 'function' && typeof obj.constructor === 'function' && typeof obj.constructor.name === 'string' && /^(Blob|File)$/.test(obj.constructor.name) && /^(Blob|File)$/.test(obj[Symbol.toStringTag]);
+}
+
+/**
+ * Clone body given Res/Req instance
+ *
+ * @param   Mixed  instance  Response or Request instance
+ * @return  Mixed
+ */
+function clone(instance) {
+	let p1, p2;
+	let body = instance.body;
+
+	// don't allow cloning a used body
+	if (instance.bodyUsed) {
+		throw new Error('cannot clone body after it is used');
+	}
+
+	// check that body is a stream and not form-data object
+	// note: we can't clone the form-data object without having it as a dependency
+	if (body instanceof Stream && typeof body.getBoundary !== 'function') {
+		// tee instance body
+		p1 = new PassThrough();
+		p2 = new PassThrough();
+		body.pipe(p1);
+		body.pipe(p2);
+		// set instance body to teed body and return the other teed body
+		instance[INTERNALS].body = p1;
+		body = p2;
+	}
+
+	return body;
+}
+
+/**
+ * Performs the operation "extract a `Content-Type` value from |object|" as
+ * specified in the specification:
+ * https://fetch.spec.whatwg.org/#concept-bodyinit-extract
+ *
+ * This function assumes that instance.body is present.
+ *
+ * @param   Mixed  instance  Any options.body input
+ */
+function extractContentType(body) {
+	if (body === null) {
+		// body is null
+		return null;
+	} else if (typeof body === 'string') {
+		// body is string
+		return 'text/plain;charset=UTF-8';
+	} else if (isURLSearchParams(body)) {
+		// body is a URLSearchParams
+		return 'application/x-www-form-urlencoded;charset=UTF-8';
+	} else if (isBlob(body)) {
+		// body is blob
+		return body.type || null;
+	} else if (Buffer.isBuffer(body)) {
+		// body is buffer
+		return null;
+	} else if (Object.prototype.toString.call(body) === '[object ArrayBuffer]') {
+		// body is ArrayBuffer
+		return null;
+	} else if (ArrayBuffer.isView(body)) {
+		// body is ArrayBufferView
+		return null;
+	} else if (typeof body.getBoundary === 'function') {
+		// detect form data input from form-data module
+		return `multipart/form-data;boundary=${body.getBoundary()}`;
+	} else if (body instanceof Stream) {
+		// body is stream
+		// can't really do much about this
+		return null;
+	} else {
+		// Body constructor defaults other things to string
+		return 'text/plain;charset=UTF-8';
+	}
+}
+
+/**
+ * The Fetch Standard treats this as if "total bytes" is a property on the body.
+ * For us, we have to explicitly get it with a function.
+ *
+ * ref: https://fetch.spec.whatwg.org/#concept-body-total-bytes
+ *
+ * @param   Body    instance   Instance of Body
+ * @return  Number?            Number of bytes, or null if not possible
+ */
+function getTotalBytes(instance) {
+	const body = instance.body;
+
+
+	if (body === null) {
+		// body is null
+		return 0;
+	} else if (isBlob(body)) {
+		return body.size;
+	} else if (Buffer.isBuffer(body)) {
+		// body is buffer
+		return body.length;
+	} else if (body && typeof body.getLengthSync === 'function') {
+		// detect form data input from form-data module
+		if (body._lengthRetrievers && body._lengthRetrievers.length == 0 || // 1.x
+		body.hasKnownLength && body.hasKnownLength()) {
+			// 2.x
+			return body.getLengthSync();
+		}
+		return null;
+	} else {
+		// body is stream
+		return null;
+	}
+}
+
+/**
+ * Write a Body to a Node.js WritableStream (e.g. http.Request) object.
+ *
+ * @param   Body    instance   Instance of Body
+ * @return  Void
+ */
+function writeToStream(dest, instance) {
+	const body = instance.body;
+
+
+	if (body === null) {
+		// body is null
+		dest.end();
+	} else if (isBlob(body)) {
+		body.stream().pipe(dest);
+	} else if (Buffer.isBuffer(body)) {
+		// body is buffer
+		dest.write(body);
+		dest.end();
+	} else {
+		// body is stream
+		body.pipe(dest);
+	}
+}
+
+// expose Promise
+Body.Promise = global.Promise;
+
+/**
+ * headers.js
+ *
+ * Headers class offers convenient helpers
+ */
+
+const invalidTokenRegex = /[^\^_`a-zA-Z\-0-9!#$%&'*+.|~]/;
+const invalidHeaderCharRegex = /[^\t\x20-\x7e\x80-\xff]/;
+
+function validateName(name) {
+	name = `${name}`;
+	if (invalidTokenRegex.test(name) || name === '') {
+		throw new TypeError(`${name} is not a legal HTTP header name`);
+	}
+}
+
+function validateValue(value) {
+	value = `${value}`;
+	if (invalidHeaderCharRegex.test(value)) {
+		throw new TypeError(`${value} is not a legal HTTP header value`);
+	}
+}
+
+/**
+ * Find the key in the map object given a header name.
+ *
+ * Returns undefined if not found.
+ *
+ * @param   String  name  Header name
+ * @return  String|Undefined
+ */
+function find(map, name) {
+	name = name.toLowerCase();
+	for (const key in map) {
+		if (key.toLowerCase() === name) {
+			return key;
+		}
+	}
+	return undefined;
+}
+
+const MAP = Symbol('map');
+class Headers {
+	/**
+  * Headers class
+  *
+  * @param   Object  headers  Response headers
+  * @return  Void
+  */
+	constructor() {
+		let init = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : undefined;
+
+		this[MAP] = Object.create(null);
+
+		if (init instanceof Headers) {
+			const rawHeaders = init.raw();
+			const headerNames = Object.keys(rawHeaders);
+
+			for (const headerName of headerNames) {
+				for (const value of rawHeaders[headerName]) {
+					this.append(headerName, value);
+				}
+			}
+
+			return;
+		}
+
+		// We don't worry about converting prop to ByteString here as append()
+		// will handle it.
+		if (init == null) ; else if (typeof init === 'object') {
+			const method = init[Symbol.iterator];
+			if (method != null) {
+				if (typeof method !== 'function') {
+					throw new TypeError('Header pairs must be iterable');
+				}
+
+				// sequence<sequence<ByteString>>
+				// Note: per spec we have to first exhaust the lists then process them
+				const pairs = [];
+				for (const pair of init) {
+					if (typeof pair !== 'object' || typeof pair[Symbol.iterator] !== 'function') {
+						throw new TypeError('Each header pair must be iterable');
+					}
+					pairs.push(Array.from(pair));
+				}
+
+				for (const pair of pairs) {
+					if (pair.length !== 2) {
+						throw new TypeError('Each header pair must be a name/value tuple');
+					}
+					this.append(pair[0], pair[1]);
+				}
+			} else {
+				// record<ByteString, ByteString>
+				for (const key of Object.keys(init)) {
+					const value = init[key];
+					this.append(key, value);
+				}
+			}
+		} else {
+			throw new TypeError('Provided initializer must be an object');
+		}
+	}
+
+	/**
+  * Return combined header value given name
+  *
+  * @param   String  name  Header name
+  * @return  Mixed
+  */
+	get(name) {
+		name = `${name}`;
+		validateName(name);
+		const key = find(this[MAP], name);
+		if (key === undefined) {
+			return null;
+		}
+
+		return this[MAP][key].join(', ');
+	}
+
+	/**
+  * Iterate over all headers
+  *
+  * @param   Function  callback  Executed for each item with parameters (value, name, thisArg)
+  * @param   Boolean   thisArg   `this` context for callback function
+  * @return  Void
+  */
+	forEach(callback) {
+		let thisArg = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : undefined;
+
+		let pairs = getHeaders(this);
+		let i = 0;
+		while (i < pairs.length) {
+			var _pairs$i = pairs[i];
+			const name = _pairs$i[0],
+			      value = _pairs$i[1];
+
+			callback.call(thisArg, value, name, this);
+			pairs = getHeaders(this);
+			i++;
+		}
+	}
+
+	/**
+  * Overwrite header values given name
+  *
+  * @param   String  name   Header name
+  * @param   String  value  Header value
+  * @return  Void
+  */
+	set(name, value) {
+		name = `${name}`;
+		value = `${value}`;
+		validateName(name);
+		validateValue(value);
+		const key = find(this[MAP], name);
+		this[MAP][key !== undefined ? key : name] = [value];
+	}
+
+	/**
+  * Append a value onto existing header
+  *
+  * @param   String  name   Header name
+  * @param   String  value  Header value
+  * @return  Void
+  */
+	append(name, value) {
+		name = `${name}`;
+		value = `${value}`;
+		validateName(name);
+		validateValue(value);
+		const key = find(this[MAP], name);
+		if (key !== undefined) {
+			this[MAP][key].push(value);
+		} else {
+			this[MAP][name] = [value];
+		}
+	}
+
+	/**
+  * Check for header name existence
+  *
+  * @param   String   name  Header name
+  * @return  Boolean
+  */
+	has(name) {
+		name = `${name}`;
+		validateName(name);
+		return find(this[MAP], name) !== undefined;
+	}
+
+	/**
+  * Delete all header values given name
+  *
+  * @param   String  name  Header name
+  * @return  Void
+  */
+	delete(name) {
+		name = `${name}`;
+		validateName(name);
+		const key = find(this[MAP], name);
+		if (key !== undefined) {
+			delete this[MAP][key];
+		}
+	}
+
+	/**
+  * Return raw headers (non-spec api)
+  *
+  * @return  Object
+  */
+	raw() {
+		return this[MAP];
+	}
+
+	/**
+  * Get an iterator on keys.
+  *
+  * @return  Iterator
+  */
+	keys() {
+		return createHeadersIterator(this, 'key');
+	}
+
+	/**
+  * Get an iterator on values.
+  *
+  * @return  Iterator
+  */
+	values() {
+		return createHeadersIterator(this, 'value');
+	}
+
+	/**
+  * Get an iterator on entries.
+  *
+  * This is the default iterator of the Headers object.
+  *
+  * @return  Iterator
+  */
+	[Symbol.iterator]() {
+		return createHeadersIterator(this, 'key+value');
+	}
+}
+Headers.prototype.entries = Headers.prototype[Symbol.iterator];
+
+Object.defineProperty(Headers.prototype, Symbol.toStringTag, {
+	value: 'Headers',
+	writable: false,
+	enumerable: false,
+	configurable: true
+});
+
+Object.defineProperties(Headers.prototype, {
+	get: { enumerable: true },
+	forEach: { enumerable: true },
+	set: { enumerable: true },
+	append: { enumerable: true },
+	has: { enumerable: true },
+	delete: { enumerable: true },
+	keys: { enumerable: true },
+	values: { enumerable: true },
+	entries: { enumerable: true }
+});
+
+function getHeaders(headers) {
+	let kind = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 'key+value';
+
+	const keys = Object.keys(headers[MAP]).sort();
+	return keys.map(kind === 'key' ? function (k) {
+		return k.toLowerCase();
+	} : kind === 'value' ? function (k) {
+		return headers[MAP][k].join(', ');
+	} : function (k) {
+		return [k.toLowerCase(), headers[MAP][k].join(', ')];
+	});
+}
+
+const INTERNAL = Symbol('internal');
+
+function createHeadersIterator(target, kind) {
+	const iterator = Object.create(HeadersIteratorPrototype);
+	iterator[INTERNAL] = {
+		target,
+		kind,
+		index: 0
+	};
+	return iterator;
+}
+
+const HeadersIteratorPrototype = Object.setPrototypeOf({
+	next() {
+		// istanbul ignore if
+		if (!this || Object.getPrototypeOf(this) !== HeadersIteratorPrototype) {
+			throw new TypeError('Value of `this` is not a HeadersIterator');
+		}
+
+		var _INTERNAL = this[INTERNAL];
+		const target = _INTERNAL.target,
+		      kind = _INTERNAL.kind,
+		      index = _INTERNAL.index;
+
+		const values = getHeaders(target, kind);
+		const len = values.length;
+		if (index >= len) {
+			return {
+				value: undefined,
+				done: true
+			};
+		}
+
+		this[INTERNAL].index = index + 1;
+
+		return {
+			value: values[index],
+			done: false
+		};
+	}
+}, Object.getPrototypeOf(Object.getPrototypeOf([][Symbol.iterator]())));
+
+Object.defineProperty(HeadersIteratorPrototype, Symbol.toStringTag, {
+	value: 'HeadersIterator',
+	writable: false,
+	enumerable: false,
+	configurable: true
+});
+
+/**
+ * Export the Headers object in a form that Node.js can consume.
+ *
+ * @param   Headers  headers
+ * @return  Object
+ */
+function exportNodeCompatibleHeaders(headers) {
+	const obj = Object.assign({ __proto__: null }, headers[MAP]);
+
+	// http.request() only supports string as Host header. This hack makes
+	// specifying custom Host header possible.
+	const hostHeaderKey = find(headers[MAP], 'Host');
+	if (hostHeaderKey !== undefined) {
+		obj[hostHeaderKey] = obj[hostHeaderKey][0];
+	}
+
+	return obj;
+}
+
+/**
+ * Create a Headers object from an object of headers, ignoring those that do
+ * not conform to HTTP grammar productions.
+ *
+ * @param   Object  obj  Object of headers
+ * @return  Headers
+ */
+function createHeadersLenient(obj) {
+	const headers = new Headers();
+	for (const name of Object.keys(obj)) {
+		if (invalidTokenRegex.test(name)) {
+			continue;
+		}
+		if (Array.isArray(obj[name])) {
+			for (const val of obj[name]) {
+				if (invalidHeaderCharRegex.test(val)) {
+					continue;
+				}
+				if (headers[MAP][name] === undefined) {
+					headers[MAP][name] = [val];
+				} else {
+					headers[MAP][name].push(val);
+				}
+			}
+		} else if (!invalidHeaderCharRegex.test(obj[name])) {
+			headers[MAP][name] = [obj[name]];
+		}
+	}
+	return headers;
+}
+
+const INTERNALS$1 = Symbol('Response internals');
+
+// fix an issue where "STATUS_CODES" aren't a named export for node <10
+const STATUS_CODES = http.STATUS_CODES;
+
+/**
+ * Response class
+ *
+ * @param   Stream  body  Readable stream
+ * @param   Object  opts  Response options
+ * @return  Void
+ */
+class Response {
+	constructor() {
+		let body = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : null;
+		let opts = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
+
+		Body.call(this, body, opts);
+
+		const status = opts.status || 200;
+		const headers = new Headers(opts.headers);
+
+		if (body != null && !headers.has('Content-Type')) {
+			const contentType = extractContentType(body);
+			if (contentType) {
+				headers.append('Content-Type', contentType);
+			}
+		}
+
+		this[INTERNALS$1] = {
+			url: opts.url,
+			status,
+			statusText: opts.statusText || STATUS_CODES[status],
+			headers,
+			counter: opts.counter
+		};
+	}
+
+	get url() {
+		return this[INTERNALS$1].url || '';
+	}
+
+	get status() {
+		return this[INTERNALS$1].status;
+	}
+
+	/**
+  * Convenience property representing if the request ended normally
+  */
+	get ok() {
+		return this[INTERNALS$1].status >= 200 && this[INTERNALS$1].status < 300;
+	}
+
+	get redirected() {
+		return this[INTERNALS$1].counter > 0;
+	}
+
+	get statusText() {
+		return this[INTERNALS$1].statusText;
+	}
+
+	get headers() {
+		return this[INTERNALS$1].headers;
+	}
+
+	/**
+  * Clone this response
+  *
+  * @return  Response
+  */
+	clone() {
+		return new Response(clone(this), {
+			url: this.url,
+			status: this.status,
+			statusText: this.statusText,
+			headers: this.headers,
+			ok: this.ok,
+			redirected: this.redirected
+		});
+	}
+}
+
+Body.mixIn(Response.prototype);
+
+Object.defineProperties(Response.prototype, {
+	url: { enumerable: true },
+	status: { enumerable: true },
+	ok: { enumerable: true },
+	redirected: { enumerable: true },
+	statusText: { enumerable: true },
+	headers: { enumerable: true },
+	clone: { enumerable: true }
+});
+
+Object.defineProperty(Response.prototype, Symbol.toStringTag, {
+	value: 'Response',
+	writable: false,
+	enumerable: false,
+	configurable: true
+});
+
+const INTERNALS$2 = Symbol('Request internals');
+const URL = Url.URL || whatwgUrl.URL;
+
+// fix an issue where "format", "parse" aren't a named export for node <10
+const parse_url = Url.parse;
+const format_url = Url.format;
+
+/**
+ * Wrapper around `new URL` to handle arbitrary URLs
+ *
+ * @param  {string} urlStr
+ * @return {void}
+ */
+function parseURL(urlStr) {
+	/*
+ 	Check whether the URL is absolute or not
+ 		Scheme: https://tools.ietf.org/html/rfc3986#section-3.1
+ 	Absolute URL: https://tools.ietf.org/html/rfc3986#section-4.3
+ */
+	if (/^[a-zA-Z][a-zA-Z\d+\-.]*:/.exec(urlStr)) {
+		urlStr = new URL(urlStr).toString();
+	}
+
+	// Fallback to old implementation for arbitrary URLs
+	return parse_url(urlStr);
+}
+
+const streamDestructionSupported = 'destroy' in Stream.Readable.prototype;
+
+/**
+ * Check if a value is an instance of Request.
+ *
+ * @param   Mixed   input
+ * @return  Boolean
+ */
+function isRequest(input) {
+	return typeof input === 'object' && typeof input[INTERNALS$2] === 'object';
+}
+
+function isAbortSignal(signal) {
+	const proto = signal && typeof signal === 'object' && Object.getPrototypeOf(signal);
+	return !!(proto && proto.constructor.name === 'AbortSignal');
+}
+
+/**
+ * Request class
+ *
+ * @param   Mixed   input  Url or Request instance
+ * @param   Object  init   Custom options
+ * @return  Void
+ */
+class Request {
+	constructor(input) {
+		let init = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
+
+		let parsedURL;
+
+		// normalize input
+		if (!isRequest(input)) {
+			if (input && input.href) {
+				// in order to support Node.js' Url objects; though WHATWG's URL objects
+				// will fall into this branch also (since their `toString()` will return
+				// `href` property anyway)
+				parsedURL = parseURL(input.href);
+			} else {
+				// coerce input to a string before attempting to parse
+				parsedURL = parseURL(`${input}`);
+			}
+			input = {};
+		} else {
+			parsedURL = parseURL(input.url);
+		}
+
+		let method = init.method || input.method || 'GET';
+		method = method.toUpperCase();
+
+		if ((init.body != null || isRequest(input) && input.body !== null) && (method === 'GET' || method === 'HEAD')) {
+			throw new TypeError('Request with GET/HEAD method cannot have body');
+		}
+
+		let inputBody = init.body != null ? init.body : isRequest(input) && input.body !== null ? clone(input) : null;
+
+		Body.call(this, inputBody, {
+			timeout: init.timeout || input.timeout || 0,
+			size: init.size || input.size || 0
+		});
+
+		const headers = new Headers(init.headers || input.headers || {});
+
+		if (inputBody != null && !headers.has('Content-Type')) {
+			const contentType = extractContentType(inputBody);
+			if (contentType) {
+				headers.append('Content-Type', contentType);
+			}
+		}
+
+		let signal = isRequest(input) ? input.signal : null;
+		if ('signal' in init) signal = init.signal;
+
+		if (signal != null && !isAbortSignal(signal)) {
+			throw new TypeError('Expected signal to be an instanceof AbortSignal');
+		}
+
+		this[INTERNALS$2] = {
+			method,
+			redirect: init.redirect || input.redirect || 'follow',
+			headers,
+			parsedURL,
+			signal
+		};
+
+		// node-fetch-only options
+		this.follow = init.follow !== undefined ? init.follow : input.follow !== undefined ? input.follow : 20;
+		this.compress = init.compress !== undefined ? init.compress : input.compress !== undefined ? input.compress : true;
+		this.counter = init.counter || input.counter || 0;
+		this.agent = init.agent || input.agent;
+	}
+
+	get method() {
+		return this[INTERNALS$2].method;
+	}
+
+	get url() {
+		return format_url(this[INTERNALS$2].parsedURL);
+	}
+
+	get headers() {
+		return this[INTERNALS$2].headers;
+	}
+
+	get redirect() {
+		return this[INTERNALS$2].redirect;
+	}
+
+	get signal() {
+		return this[INTERNALS$2].signal;
+	}
+
+	/**
+  * Clone this request
+  *
+  * @return  Request
+  */
+	clone() {
+		return new Request(this);
+	}
+}
+
+Body.mixIn(Request.prototype);
+
+Object.defineProperty(Request.prototype, Symbol.toStringTag, {
+	value: 'Request',
+	writable: false,
+	enumerable: false,
+	configurable: true
+});
+
+Object.defineProperties(Request.prototype, {
+	method: { enumerable: true },
+	url: { enumerable: true },
+	headers: { enumerable: true },
+	redirect: { enumerable: true },
+	clone: { enumerable: true },
+	signal: { enumerable: true }
+});
+
+/**
+ * Convert a Request to Node.js http request options.
+ *
+ * @param   Request  A Request instance
+ * @return  Object   The options object to be passed to http.request
+ */
+function getNodeRequestOptions(request) {
+	const parsedURL = request[INTERNALS$2].parsedURL;
+	const headers = new Headers(request[INTERNALS$2].headers);
+
+	// fetch step 1.3
+	if (!headers.has('Accept')) {
+		headers.set('Accept', '*/*');
+	}
+
+	// Basic fetch
+	if (!parsedURL.protocol || !parsedURL.hostname) {
+		throw new TypeError('Only absolute URLs are supported');
+	}
+
+	if (!/^https?:$/.test(parsedURL.protocol)) {
+		throw new TypeError('Only HTTP(S) protocols are supported');
+	}
+
+	if (request.signal && request.body instanceof Stream.Readable && !streamDestructionSupported) {
+		throw new Error('Cancellation of streamed requests with AbortSignal is not supported in node < 8');
+	}
+
+	// HTTP-network-or-cache fetch steps 2.4-2.7
+	let contentLengthValue = null;
+	if (request.body == null && /^(POST|PUT)$/i.test(request.method)) {
+		contentLengthValue = '0';
+	}
+	if (request.body != null) {
+		const totalBytes = getTotalBytes(request);
+		if (typeof totalBytes === 'number') {
+			contentLengthValue = String(totalBytes);
+		}
+	}
+	if (contentLengthValue) {
+		headers.set('Content-Length', contentLengthValue);
+	}
+
+	// HTTP-network-or-cache fetch step 2.11
+	if (!headers.has('User-Agent')) {
+		headers.set('User-Agent', 'node-fetch/1.0 (+https://github.com/bitinn/node-fetch)');
+	}
+
+	// HTTP-network-or-cache fetch step 2.15
+	if (request.compress && !headers.has('Accept-Encoding')) {
+		headers.set('Accept-Encoding', 'gzip,deflate');
+	}
+
+	let agent = request.agent;
+	if (typeof agent === 'function') {
+		agent = agent(parsedURL);
+	}
+
+	if (!headers.has('Connection') && !agent) {
+		headers.set('Connection', 'close');
+	}
+
+	// HTTP-network fetch step 4.2
+	// chunked encoding is handled by Node.js
+
+	return Object.assign({}, parsedURL, {
+		method: request.method,
+		headers: exportNodeCompatibleHeaders(headers),
+		agent
+	});
+}
+
+/**
+ * abort-error.js
+ *
+ * AbortError interface for cancelled requests
+ */
+
+/**
+ * Create AbortError instance
+ *
+ * @param   String      message      Error message for human
+ * @return  AbortError
+ */
+function AbortError(message) {
+  Error.call(this, message);
+
+  this.type = 'aborted';
+  this.message = message;
+
+  // hide custom error implementation details from end-users
+  Error.captureStackTrace(this, this.constructor);
+}
+
+AbortError.prototype = Object.create(Error.prototype);
+AbortError.prototype.constructor = AbortError;
+AbortError.prototype.name = 'AbortError';
+
+const URL$1 = Url.URL || whatwgUrl.URL;
+
+// fix an issue where "PassThrough", "resolve" aren't a named export for node <10
+const PassThrough$1 = Stream.PassThrough;
+
+const isDomainOrSubdomain = function isDomainOrSubdomain(destination, original) {
+	const orig = new URL$1(original).hostname;
+	const dest = new URL$1(destination).hostname;
+
+	return orig === dest || orig[orig.length - dest.length - 1] === '.' && orig.endsWith(dest);
+};
+
+/**
+ * Fetch function
+ *
+ * @param   Mixed    url   Absolute url or Request instance
+ * @param   Object   opts  Fetch options
+ * @return  Promise
+ */
+function fetch(url, opts) {
+
+	// allow custom promise
+	if (!fetch.Promise) {
+		throw new Error('native promise missing, set fetch.Promise to your favorite alternative');
+	}
+
+	Body.Promise = fetch.Promise;
+
+	// wrap http.request into fetch
+	return new fetch.Promise(function (resolve, reject) {
+		// build request object
+		const request = new Request(url, opts);
+		const options = getNodeRequestOptions(request);
+
+		const send = (options.protocol === 'https:' ? https : http).request;
+		const signal = request.signal;
+
+		let response = null;
+
+		const abort = function abort() {
+			let error = new AbortError('The user aborted a request.');
+			reject(error);
+			if (request.body && request.body instanceof Stream.Readable) {
+				request.body.destroy(error);
+			}
+			if (!response || !response.body) return;
+			response.body.emit('error', error);
+		};
+
+		if (signal && signal.aborted) {
+			abort();
+			return;
+		}
+
+		const abortAndFinalize = function abortAndFinalize() {
+			abort();
+			finalize();
+		};
+
+		// send request
+		const req = send(options);
+		let reqTimeout;
+
+		if (signal) {
+			signal.addEventListener('abort', abortAndFinalize);
+		}
+
+		function finalize() {
+			req.abort();
+			if (signal) signal.removeEventListener('abort', abortAndFinalize);
+			clearTimeout(reqTimeout);
+		}
+
+		if (request.timeout) {
+			req.once('socket', function (socket) {
+				reqTimeout = setTimeout(function () {
+					reject(new FetchError(`network timeout at: ${request.url}`, 'request-timeout'));
+					finalize();
+				}, request.timeout);
+			});
+		}
+
+		req.on('error', function (err) {
+			reject(new FetchError(`request to ${request.url} failed, reason: ${err.message}`, 'system', err));
+			finalize();
+		});
+
+		req.on('response', function (res) {
+			clearTimeout(reqTimeout);
+
+			const headers = createHeadersLenient(res.headers);
+
+			// HTTP fetch step 5
+			if (fetch.isRedirect(res.statusCode)) {
+				// HTTP fetch step 5.2
+				const location = headers.get('Location');
+
+				// HTTP fetch step 5.3
+				let locationURL = null;
+				try {
+					locationURL = location === null ? null : new URL$1(location, request.url).toString();
+				} catch (err) {
+					// error here can only be invalid URL in Location: header
+					// do not throw when options.redirect == manual
+					// let the user extract the errorneous redirect URL
+					if (request.redirect !== 'manual') {
+						reject(new FetchError(`uri requested responds with an invalid redirect URL: ${location}`, 'invalid-redirect'));
+						finalize();
+						return;
+					}
+				}
+
+				// HTTP fetch step 5.5
+				switch (request.redirect) {
+					case 'error':
+						reject(new FetchError(`uri requested responds with a redirect, redirect mode is set to error: ${request.url}`, 'no-redirect'));
+						finalize();
+						return;
+					case 'manual':
+						// node-fetch-specific step: make manual redirect a bit easier to use by setting the Location header value to the resolved URL.
+						if (locationURL !== null) {
+							// handle corrupted header
+							try {
+								headers.set('Location', locationURL);
+							} catch (err) {
+								// istanbul ignore next: nodejs server prevent invalid response headers, we can't test this through normal request
+								reject(err);
+							}
+						}
+						break;
+					case 'follow':
+						// HTTP-redirect fetch step 2
+						if (locationURL === null) {
+							break;
+						}
+
+						// HTTP-redirect fetch step 5
+						if (request.counter >= request.follow) {
+							reject(new FetchError(`maximum redirect reached at: ${request.url}`, 'max-redirect'));
+							finalize();
+							return;
+						}
+
+						// HTTP-redirect fetch step 6 (counter increment)
+						// Create a new Request object.
+						const requestOpts = {
+							headers: new Headers(request.headers),
+							follow: request.follow,
+							counter: request.counter + 1,
+							agent: request.agent,
+							compress: request.compress,
+							method: request.method,
+							body: request.body,
+							signal: request.signal,
+							timeout: request.timeout,
+							size: request.size
+						};
+
+						if (!isDomainOrSubdomain(request.url, locationURL)) {
+							for (const name of ['authorization', 'www-authenticate', 'cookie', 'cookie2']) {
+								requestOpts.headers.delete(name);
+							}
+						}
+
+						// HTTP-redirect fetch step 9
+						if (res.statusCode !== 303 && request.body && getTotalBytes(request) === null) {
+							reject(new FetchError('Cannot follow redirect with body being a readable stream', 'unsupported-redirect'));
+							finalize();
+							return;
+						}
+
+						// HTTP-redirect fetch step 11
+						if (res.statusCode === 303 || (res.statusCode === 301 || res.statusCode === 302) && request.method === 'POST') {
+							requestOpts.method = 'GET';
+							requestOpts.body = undefined;
+							requestOpts.headers.delete('content-length');
+						}
+
+						// HTTP-redirect fetch step 15
+						resolve(fetch(new Request(locationURL, requestOpts)));
+						finalize();
+						return;
+				}
+			}
+
+			// prepare response
+			res.once('end', function () {
+				if (signal) signal.removeEventListener('abort', abortAndFinalize);
+			});
+			let body = res.pipe(new PassThrough$1());
+
+			const response_options = {
+				url: request.url,
+				status: res.statusCode,
+				statusText: res.statusMessage,
+				headers: headers,
+				size: request.size,
+				timeout: request.timeout,
+				counter: request.counter
+			};
+
+			// HTTP-network fetch step 12.1.1.3
+			const codings = headers.get('Content-Encoding');
+
+			// HTTP-network fetch step 12.1.1.4: handle content codings
+
+			// in following scenarios we ignore compression support
+			// 1. compression support is disabled
+			// 2. HEAD request
+			// 3. no Content-Encoding header
+			// 4. no content response (204)
+			// 5. content not modified response (304)
+			if (!request.compress || request.method === 'HEAD' || codings === null || res.statusCode === 204 || res.statusCode === 304) {
+				response = new Response(body, response_options);
+				resolve(response);
+				return;
+			}
+
+			// For Node v6+
+			// Be less strict when decoding compressed responses, since sometimes
+			// servers send slightly invalid responses that are still accepted
+			// by common browsers.
+			// Always using Z_SYNC_FLUSH is what cURL does.
+			const zlibOptions = {
+				flush: zlib.Z_SYNC_FLUSH,
+				finishFlush: zlib.Z_SYNC_FLUSH
+			};
+
+			// for gzip
+			if (codings == 'gzip' || codings == 'x-gzip') {
+				body = body.pipe(zlib.createGunzip(zlibOptions));
+				response = new Response(body, response_options);
+				resolve(response);
+				return;
+			}
+
+			// for deflate
+			if (codings == 'deflate' || codings == 'x-deflate') {
+				// handle the infamous raw deflate response from old servers
+				// a hack for old IIS and Apache servers
+				const raw = res.pipe(new PassThrough$1());
+				raw.once('data', function (chunk) {
+					// see http://stackoverflow.com/questions/37519828
+					if ((chunk[0] & 0x0F) === 0x08) {
+						body = body.pipe(zlib.createInflate());
+					} else {
+						body = body.pipe(zlib.createInflateRaw());
+					}
+					response = new Response(body, response_options);
+					resolve(response);
+				});
+				return;
+			}
+
+			// for br
+			if (codings == 'br' && typeof zlib.createBrotliDecompress === 'function') {
+				body = body.pipe(zlib.createBrotliDecompress());
+				response = new Response(body, response_options);
+				resolve(response);
+				return;
+			}
+
+			// otherwise, use response as-is
+			response = new Response(body, response_options);
+			resolve(response);
+		});
+
+		writeToStream(req, request);
+	});
+}
+/**
+ * Redirect code matching
+ *
+ * @param   Number   code  Status code
+ * @return  Boolean
+ */
+fetch.isRedirect = function (code) {
+	return code === 301 || code === 302 || code === 303 || code === 307 || code === 308;
+};
+
+// expose Promise
+fetch.Promise = global.Promise;
+
+module.exports = exports = fetch;
+Object.defineProperty(exports, "__esModule", ({ value: true }));
+exports["default"] = exports;
+exports.Headers = Headers;
+exports.Request = Request;
+exports.Response = Response;
+exports.FetchError = FetchError;
+
+
+/***/ }),
+
+/***/ 2299:
+/***/ ((module, __unused_webpack_exports, __nccwpck_require__) => {
+
+"use strict";
+
+
+var punycode = __nccwpck_require__(5477);
+var mappingTable = __nccwpck_require__(1907);
+
+var PROCESSING_OPTIONS = {
+  TRANSITIONAL: 0,
+  NONTRANSITIONAL: 1
+};
+
+function normalize(str) { // fix bug in v8
+  return str.split('\u0000').map(function (s) { return s.normalize('NFC'); }).join('\u0000');
+}
+
+function findStatus(val) {
+  var start = 0;
+  var end = mappingTable.length - 1;
+
+  while (start <= end) {
+    var mid = Math.floor((start + end) / 2);
+
+    var target = mappingTable[mid];
+    if (target[0][0] <= val && target[0][1] >= val) {
+      return target;
+    } else if (target[0][0] > val) {
+      end = mid - 1;
+    } else {
+      start = mid + 1;
+    }
+  }
+
+  return null;
+}
+
+var regexAstralSymbols = /[\uD800-\uDBFF][\uDC00-\uDFFF]/g;
+
+function countSymbols(string) {
+  return string
+    // replace every surrogate pair with a BMP symbol
+    .replace(regexAstralSymbols, '_')
+    // then get the length
+    .length;
+}
+
+function mapChars(domain_name, useSTD3, processing_option) {
+  var hasError = false;
+  var processed = "";
+
+  var len = countSymbols(domain_name);
+  for (var i = 0; i < len; ++i) {
+    var codePoint = domain_name.codePointAt(i);
+    var status = findStatus(codePoint);
+
+    switch (status[1]) {
+      case "disallowed":
+        hasError = true;
+        processed += String.fromCodePoint(codePoint);
+        break;
+      case "ignored":
+        break;
+      case "mapped":
+        processed += String.fromCodePoint.apply(String, status[2]);
+        break;
+      case "deviation":
+        if (processing_option === PROCESSING_OPTIONS.TRANSITIONAL) {
+          processed += String.fromCodePoint.apply(String, status[2]);
+        } else {
+          processed += String.fromCodePoint(codePoint);
+        }
+        break;
+      case "valid":
+        processed += String.fromCodePoint(codePoint);
+        break;
+      case "disallowed_STD3_mapped":
+        if (useSTD3) {
+          hasError = true;
+          processed += String.fromCodePoint(codePoint);
+        } else {
+          processed += String.fromCodePoint.apply(String, status[2]);
+        }
+        break;
+      case "disallowed_STD3_valid":
+        if (useSTD3) {
+          hasError = true;
+        }
+
+        processed += String.fromCodePoint(codePoint);
+        break;
+    }
+  }
+
+  return {
+    string: processed,
+    error: hasError
+  };
+}
+
+var combiningMarksRegex = /[\u0300-\u036F\u0483-\u0489\u0591-\u05BD\u05BF\u05C1\u05C2\u05C4\u05C5\u05C7\u0610-\u061A\u064B-\u065F\u0670\u06D6-\u06DC\u06DF-\u06E4\u06E7\u06E8\u06EA-\u06ED\u0711\u0730-\u074A\u07A6-\u07B0\u07EB-\u07F3\u0816-\u0819\u081B-\u0823\u0825-\u0827\u0829-\u082D\u0859-\u085B\u08E4-\u0903\u093A-\u093C\u093E-\u094F\u0951-\u0957\u0962\u0963\u0981-\u0983\u09BC\u09BE-\u09C4\u09C7\u09C8\u09CB-\u09CD\u09D7\u09E2\u09E3\u0A01-\u0A03\u0A3C\u0A3E-\u0A42\u0A47\u0A48\u0A4B-\u0A4D\u0A51\u0A70\u0A71\u0A75\u0A81-\u0A83\u0ABC\u0ABE-\u0AC5\u0AC7-\u0AC9\u0ACB-\u0ACD\u0AE2\u0AE3\u0B01-\u0B03\u0B3C\u0B3E-\u0B44\u0B47\u0B48\u0B4B-\u0B4D\u0B56\u0B57\u0B62\u0B63\u0B82\u0BBE-\u0BC2\u0BC6-\u0BC8\u0BCA-\u0BCD\u0BD7\u0C00-\u0C03\u0C3E-\u0C44\u0C46-\u0C48\u0C4A-\u0C4D\u0C55\u0C56\u0C62\u0C63\u0C81-\u0C83\u0CBC\u0CBE-\u0CC4\u0CC6-\u0CC8\u0CCA-\u0CCD\u0CD5\u0CD6\u0CE2\u0CE3\u0D01-\u0D03\u0D3E-\u0D44\u0D46-\u0D48\u0D4A-\u0D4D\u0D57\u0D62\u0D63\u0D82\u0D83\u0DCA\u0DCF-\u0DD4\u0DD6\u0DD8-\u0DDF\u0DF2\u0DF3\u0E31\u0E34-\u0E3A\u0E47-\u0E4E\u0EB1\u0EB4-\u0EB9\u0EBB\u0EBC\u0EC8-\u0ECD\u0F18\u0F19\u0F35\u0F37\u0F39\u0F3E\u0F3F\u0F71-\u0F84\u0F86\u0F87\u0F8D-\u0F97\u0F99-\u0FBC\u0FC6\u102B-\u103E\u1056-\u1059\u105E-\u1060\u1062-\u1064\u1067-\u106D\u1071-\u1074\u1082-\u108D\u108F\u109A-\u109D\u135D-\u135F\u1712-\u1714\u1732-\u1734\u1752\u1753\u1772\u1773\u17B4-\u17D3\u17DD\u180B-\u180D\u18A9\u1920-\u192B\u1930-\u193B\u19B0-\u19C0\u19C8\u19C9\u1A17-\u1A1B\u1A55-\u1A5E\u1A60-\u1A7C\u1A7F\u1AB0-\u1ABE\u1B00-\u1B04\u1B34-\u1B44\u1B6B-\u1B73\u1B80-\u1B82\u1BA1-\u1BAD\u1BE6-\u1BF3\u1C24-\u1C37\u1CD0-\u1CD2\u1CD4-\u1CE8\u1CED\u1CF2-\u1CF4\u1CF8\u1CF9\u1DC0-\u1DF5\u1DFC-\u1DFF\u20D0-\u20F0\u2CEF-\u2CF1\u2D7F\u2DE0-\u2DFF\u302A-\u302F\u3099\u309A\uA66F-\uA672\uA674-\uA67D\uA69F\uA6F0\uA6F1\uA802\uA806\uA80B\uA823-\uA827\uA880\uA881\uA8B4-\uA8C4\uA8E0-\uA8F1\uA926-\uA92D\uA947-\uA953\uA980-\uA983\uA9B3-\uA9C0\uA9E5\uAA29-\uAA36\uAA43\uAA4C\uAA4D\uAA7B-\uAA7D\uAAB0\uAAB2-\uAAB4\uAAB7\uAAB8\uAABE\uAABF\uAAC1\uAAEB-\uAAEF\uAAF5\uAAF6\uABE3-\uABEA\uABEC\uABED\uFB1E\uFE00-\uFE0F\uFE20-\uFE2D]|\uD800[\uDDFD\uDEE0\uDF76-\uDF7A]|\uD802[\uDE01-\uDE03\uDE05\uDE06\uDE0C-\uDE0F\uDE38-\uDE3A\uDE3F\uDEE5\uDEE6]|\uD804[\uDC00-\uDC02\uDC38-\uDC46\uDC7F-\uDC82\uDCB0-\uDCBA\uDD00-\uDD02\uDD27-\uDD34\uDD73\uDD80-\uDD82\uDDB3-\uDDC0\uDE2C-\uDE37\uDEDF-\uDEEA\uDF01-\uDF03\uDF3C\uDF3E-\uDF44\uDF47\uDF48\uDF4B-\uDF4D\uDF57\uDF62\uDF63\uDF66-\uDF6C\uDF70-\uDF74]|\uD805[\uDCB0-\uDCC3\uDDAF-\uDDB5\uDDB8-\uDDC0\uDE30-\uDE40\uDEAB-\uDEB7]|\uD81A[\uDEF0-\uDEF4\uDF30-\uDF36]|\uD81B[\uDF51-\uDF7E\uDF8F-\uDF92]|\uD82F[\uDC9D\uDC9E]|\uD834[\uDD65-\uDD69\uDD6D-\uDD72\uDD7B-\uDD82\uDD85-\uDD8B\uDDAA-\uDDAD\uDE42-\uDE44]|\uD83A[\uDCD0-\uDCD6]|\uDB40[\uDD00-\uDDEF]/;
+
+function validateLabel(label, processing_option) {
+  if (label.substr(0, 4) === "xn--") {
+    label = punycode.toUnicode(label);
+    processing_option = PROCESSING_OPTIONS.NONTRANSITIONAL;
+  }
+
+  var error = false;
+
+  if (normalize(label) !== label ||
+      (label[3] === "-" && label[4] === "-") ||
+      label[0] === "-" || label[label.length - 1] === "-" ||
+      label.indexOf(".") !== -1 ||
+      label.search(combiningMarksRegex) === 0) {
+    error = true;
+  }
+
+  var len = countSymbols(label);
+  for (var i = 0; i < len; ++i) {
+    var status = findStatus(label.codePointAt(i));
+    if ((processing === PROCESSING_OPTIONS.TRANSITIONAL && status[1] !== "valid") ||
+        (processing === PROCESSING_OPTIONS.NONTRANSITIONAL &&
+         status[1] !== "valid" && status[1] !== "deviation")) {
+      error = true;
+      break;
+    }
+  }
+
+  return {
+    label: label,
+    error: error
+  };
+}
+
+function processing(domain_name, useSTD3, processing_option) {
+  var result = mapChars(domain_name, useSTD3, processing_option);
+  result.string = normalize(result.string);
+
+  var labels = result.string.split(".");
+  for (var i = 0; i < labels.length; ++i) {
+    try {
+      var validation = validateLabel(labels[i]);
+      labels[i] = validation.label;
+      result.error = result.error || validation.error;
+    } catch(e) {
+      result.error = true;
+    }
+  }
+
+  return {
+    string: labels.join("."),
+    error: result.error
+  };
+}
+
+module.exports.toASCII = function(domain_name, useSTD3, processing_option, verifyDnsLength) {
+  var result = processing(domain_name, useSTD3, processing_option);
+  var labels = result.string.split(".");
+  labels = labels.map(function(l) {
+    try {
+      return punycode.toASCII(l);
+    } catch(e) {
+      result.error = true;
+      return l;
+    }
+  });
+
+  if (verifyDnsLength) {
+    var total = labels.slice(0, labels.length - 1).join(".").length;
+    if (total.length > 253 || total.length === 0) {
+      result.error = true;
+    }
+
+    for (var i=0; i < labels.length; ++i) {
+      if (labels.length > 63 || labels.length === 0) {
+        result.error = true;
+        break;
+      }
+    }
+  }
+
+  if (result.error) return null;
+  return labels.join(".");
+};
+
+module.exports.toUnicode = function(domain_name, useSTD3) {
+  var result = processing(domain_name, useSTD3, PROCESSING_OPTIONS.NONTRANSITIONAL);
+
+  return {
+    domain: result.string,
+    error: result.error
+  };
+};
+
+module.exports.PROCESSING_OPTIONS = PROCESSING_OPTIONS;
+
+
+/***/ }),
+
+/***/ 5871:
+/***/ ((module) => {
+
+"use strict";
+
+
+var conversions = {};
+module.exports = conversions;
+
+function sign(x) {
+    return x < 0 ? -1 : 1;
+}
+
+function evenRound(x) {
+    // Round x to the nearest integer, choosing the even integer if it lies halfway between two.
+    if ((x % 1) === 0.5 && (x & 1) === 0) { // [even number].5; round down (i.e. floor)
+        return Math.floor(x);
+    } else {
+        return Math.round(x);
+    }
+}
+
+function createNumberConversion(bitLength, typeOpts) {
+    if (!typeOpts.unsigned) {
+        --bitLength;
+    }
+    const lowerBound = typeOpts.unsigned ? 0 : -Math.pow(2, bitLength);
+    const upperBound = Math.pow(2, bitLength) - 1;
+
+    const moduloVal = typeOpts.moduloBitLength ? Math.pow(2, typeOpts.moduloBitLength) : Math.pow(2, bitLength);
+    const moduloBound = typeOpts.moduloBitLength ? Math.pow(2, typeOpts.moduloBitLength - 1) : Math.pow(2, bitLength - 1);
+
+    return function(V, opts) {
+        if (!opts) opts = {};
+
+        let x = +V;
+
+        if (opts.enforceRange) {
+            if (!Number.isFinite(x)) {
+                throw new TypeError("Argument is not a finite number");
+            }
+
+            x = sign(x) * Math.floor(Math.abs(x));
+            if (x < lowerBound || x > upperBound) {
+                throw new TypeError("Argument is not in byte range");
+            }
+
+            return x;
+        }
+
+        if (!isNaN(x) && opts.clamp) {
+            x = evenRound(x);
+
+            if (x < lowerBound) x = lowerBound;
+            if (x > upperBound) x = upperBound;
+            return x;
+        }
+
+        if (!Number.isFinite(x) || x === 0) {
+            return 0;
+        }
+
+        x = sign(x) * Math.floor(Math.abs(x));
+        x = x % moduloVal;
+
+        if (!typeOpts.unsigned && x >= moduloBound) {
+            return x - moduloVal;
+        } else if (typeOpts.unsigned) {
+            if (x < 0) {
+              x += moduloVal;
+            } else if (x === -0) { // don't return negative zero
+              return 0;
+            }
+        }
+
+        return x;
+    }
+}
+
+conversions["void"] = function () {
+    return undefined;
+};
+
+conversions["boolean"] = function (val) {
+    return !!val;
+};
+
+conversions["byte"] = createNumberConversion(8, { unsigned: false });
+conversions["octet"] = createNumberConversion(8, { unsigned: true });
+
+conversions["short"] = createNumberConversion(16, { unsigned: false });
+conversions["unsigned short"] = createNumberConversion(16, { unsigned: true });
+
+conversions["long"] = createNumberConversion(32, { unsigned: false });
+conversions["unsigned long"] = createNumberConversion(32, { unsigned: true });
+
+conversions["long long"] = createNumberConversion(32, { unsigned: false, moduloBitLength: 64 });
+conversions["unsigned long long"] = createNumberConversion(32, { unsigned: true, moduloBitLength: 64 });
+
+conversions["double"] = function (V) {
+    const x = +V;
+
+    if (!Number.isFinite(x)) {
+        throw new TypeError("Argument is not a finite floating-point value");
+    }
+
+    return x;
+};
+
+conversions["unrestricted double"] = function (V) {
+    const x = +V;
+
+    if (isNaN(x)) {
+        throw new TypeError("Argument is NaN");
+    }
+
+    return x;
+};
+
+// not quite valid, but good enough for JS
+conversions["float"] = conversions["double"];
+conversions["unrestricted float"] = conversions["unrestricted double"];
+
+conversions["DOMString"] = function (V, opts) {
+    if (!opts) opts = {};
+
+    if (opts.treatNullAsEmptyString && V === null) {
+        return "";
+    }
+
+    return String(V);
+};
+
+conversions["ByteString"] = function (V, opts) {
+    const x = String(V);
+    let c = undefined;
+    for (let i = 0; (c = x.codePointAt(i)) !== undefined; ++i) {
+        if (c > 255) {
+            throw new TypeError("Argument is not a valid bytestring");
+        }
+    }
+
+    return x;
+};
+
+conversions["USVString"] = function (V) {
+    const S = String(V);
+    const n = S.length;
+    const U = [];
+    for (let i = 0; i < n; ++i) {
+        const c = S.charCodeAt(i);
+        if (c < 0xD800 || c > 0xDFFF) {
+            U.push(String.fromCodePoint(c));
+        } else if (0xDC00 <= c && c <= 0xDFFF) {
+            U.push(String.fromCodePoint(0xFFFD));
+        } else {
+            if (i === n - 1) {
+                U.push(String.fromCodePoint(0xFFFD));
+            } else {
+                const d = S.charCodeAt(i + 1);
+                if (0xDC00 <= d && d <= 0xDFFF) {
+                    const a = c & 0x3FF;
+                    const b = d & 0x3FF;
+                    U.push(String.fromCodePoint((2 << 15) + (2 << 9) * a + b));
+                    ++i;
+                } else {
+                    U.push(String.fromCodePoint(0xFFFD));
+                }
+            }
+        }
+    }
+
+    return U.join('');
+};
+
+conversions["Date"] = function (V, opts) {
+    if (!(V instanceof Date)) {
+        throw new TypeError("Argument is not a Date object");
+    }
+    if (isNaN(V)) {
+        return undefined;
+    }
+
+    return V;
+};
+
+conversions["RegExp"] = function (V, opts) {
+    if (!(V instanceof RegExp)) {
+        V = new RegExp(V);
+    }
+
+    return V;
+};
+
+
+/***/ }),
+
+/***/ 8262:
+/***/ ((__unused_webpack_module, exports, __nccwpck_require__) => {
+
+"use strict";
+
+const usm = __nccwpck_require__(33);
+
+exports.implementation = class URLImpl {
+  constructor(constructorArgs) {
+    const url = constructorArgs[0];
+    const base = constructorArgs[1];
+
+    let parsedBase = null;
+    if (base !== undefined) {
+      parsedBase = usm.basicURLParse(base);
+      if (parsedBase === "failure") {
+        throw new TypeError("Invalid base URL");
+      }
+    }
+
+    const parsedURL = usm.basicURLParse(url, { baseURL: parsedBase });
+    if (parsedURL === "failure") {
+      throw new TypeError("Invalid URL");
+    }
+
+    this._url = parsedURL;
+
+    // TODO: query stuff
+  }
+
+  get href() {
+    return usm.serializeURL(this._url);
+  }
+
+  set href(v) {
+    const parsedURL = usm.basicURLParse(v);
+    if (parsedURL === "failure") {
+      throw new TypeError("Invalid URL");
+    }
+
+    this._url = parsedURL;
+  }
+
+  get origin() {
+    return usm.serializeURLOrigin(this._url);
+  }
+
+  get protocol() {
+    return this._url.scheme + ":";
+  }
+
+  set protocol(v) {
+    usm.basicURLParse(v + ":", { url: this._url, stateOverride: "scheme start" });
+  }
+
+  get username() {
+    return this._url.username;
+  }
+
+  set username(v) {
+    if (usm.cannotHaveAUsernamePasswordPort(this._url)) {
+      return;
+    }
+
+    usm.setTheUsername(this._url, v);
+  }
+
+  get password() {
+    return this._url.password;
+  }
+
+  set password(v) {
+    if (usm.cannotHaveAUsernamePasswordPort(this._url)) {
+      return;
+    }
+
+    usm.setThePassword(this._url, v);
+  }
+
+  get host() {
+    const url = this._url;
+
+    if (url.host === null) {
+      return "";
+    }
+
+    if (url.port === null) {
+      return usm.serializeHost(url.host);
+    }
+
+    return usm.serializeHost(url.host) + ":" + usm.serializeInteger(url.port);
+  }
+
+  set host(v) {
+    if (this._url.cannotBeABaseURL) {
+      return;
+    }
+
+    usm.basicURLParse(v, { url: this._url, stateOverride: "host" });
+  }
+
+  get hostname() {
+    if (this._url.host === null) {
+      return "";
+    }
+
+    return usm.serializeHost(this._url.host);
+  }
+
+  set hostname(v) {
+    if (this._url.cannotBeABaseURL) {
+      return;
+    }
+
+    usm.basicURLParse(v, { url: this._url, stateOverride: "hostname" });
+  }
+
+  get port() {
+    if (this._url.port === null) {
+      return "";
+    }
+
+    return usm.serializeInteger(this._url.port);
+  }
+
+  set port(v) {
+    if (usm.cannotHaveAUsernamePasswordPort(this._url)) {
+      return;
+    }
+
+    if (v === "") {
+      this._url.port = null;
+    } else {
+      usm.basicURLParse(v, { url: this._url, stateOverride: "port" });
+    }
+  }
+
+  get pathname() {
+    if (this._url.cannotBeABaseURL) {
+      return this._url.path[0];
+    }
+
+    if (this._url.path.length === 0) {
+      return "";
+    }
+
+    return "/" + this._url.path.join("/");
+  }
+
+  set pathname(v) {
+    if (this._url.cannotBeABaseURL) {
+      return;
+    }
+
+    this._url.path = [];
+    usm.basicURLParse(v, { url: this._url, stateOverride: "path start" });
+  }
+
+  get search() {
+    if (this._url.query === null || this._url.query === "") {
+      return "";
+    }
+
+    return "?" + this._url.query;
+  }
+
+  set search(v) {
+    // TODO: query stuff
+
+    const url = this._url;
+
+    if (v === "") {
+      url.query = null;
+      return;
+    }
+
+    const input = v[0] === "?" ? v.substring(1) : v;
+    url.query = "";
+    usm.basicURLParse(input, { url, stateOverride: "query" });
+  }
+
+  get hash() {
+    if (this._url.fragment === null || this._url.fragment === "") {
+      return "";
+    }
+
+    return "#" + this._url.fragment;
+  }
+
+  set hash(v) {
+    if (v === "") {
+      this._url.fragment = null;
+      return;
+    }
+
+    const input = v[0] === "#" ? v.substring(1) : v;
+    this._url.fragment = "";
+    usm.basicURLParse(input, { url: this._url, stateOverride: "fragment" });
+  }
+
+  toJSON() {
+    return this.href;
+  }
+};
+
+
+/***/ }),
+
+/***/ 653:
+/***/ ((module, __unused_webpack_exports, __nccwpck_require__) => {
+
+"use strict";
+
+
+const conversions = __nccwpck_require__(5871);
+const utils = __nccwpck_require__(276);
+const Impl = __nccwpck_require__(8262);
+
+const impl = utils.implSymbol;
+
+function URL(url) {
+  if (!this || this[impl] || !(this instanceof URL)) {
+    throw new TypeError("Failed to construct 'URL': Please use the 'new' operator, this DOM object constructor cannot be called as a function.");
+  }
+  if (arguments.length < 1) {
+    throw new TypeError("Failed to construct 'URL': 1 argument required, but only " + arguments.length + " present.");
+  }
+  const args = [];
+  for (let i = 0; i < arguments.length && i < 2; ++i) {
+    args[i] = arguments[i];
+  }
+  args[0] = conversions["USVString"](args[0]);
+  if (args[1] !== undefined) {
+  args[1] = conversions["USVString"](args[1]);
+  }
+
+  module.exports.setup(this, args);
+}
+
+URL.prototype.toJSON = function toJSON() {
+  if (!this || !module.exports.is(this)) {
+    throw new TypeError("Illegal invocation");
+  }
+  const args = [];
+  for (let i = 0; i < arguments.length && i < 0; ++i) {
+    args[i] = arguments[i];
+  }
+  return this[impl].toJSON.apply(this[impl], args);
+};
+Object.defineProperty(URL.prototype, "href", {
+  get() {
+    return this[impl].href;
+  },
+  set(V) {
+    V = conversions["USVString"](V);
+    this[impl].href = V;
+  },
+  enumerable: true,
+  configurable: true
+});
+
+URL.prototype.toString = function () {
+  if (!this || !module.exports.is(this)) {
+    throw new TypeError("Illegal invocation");
+  }
+  return this.href;
+};
+
+Object.defineProperty(URL.prototype, "origin", {
+  get() {
+    return this[impl].origin;
+  },
+  enumerable: true,
+  configurable: true
+});
+
+Object.defineProperty(URL.prototype, "protocol", {
+  get() {
+    return this[impl].protocol;
+  },
+  set(V) {
+    V = conversions["USVString"](V);
+    this[impl].protocol = V;
+  },
+  enumerable: true,
+  configurable: true
+});
+
+Object.defineProperty(URL.prototype, "username", {
+  get() {
+    return this[impl].username;
+  },
+  set(V) {
+    V = conversions["USVString"](V);
+    this[impl].username = V;
+  },
+  enumerable: true,
+  configurable: true
+});
+
+Object.defineProperty(URL.prototype, "password", {
+  get() {
+    return this[impl].password;
+  },
+  set(V) {
+    V = conversions["USVString"](V);
+    this[impl].password = V;
+  },
+  enumerable: true,
+  configurable: true
+});
+
+Object.defineProperty(URL.prototype, "host", {
+  get() {
+    return this[impl].host;
+  },
+  set(V) {
+    V = conversions["USVString"](V);
+    this[impl].host = V;
+  },
+  enumerable: true,
+  configurable: true
+});
+
+Object.defineProperty(URL.prototype, "hostname", {
+  get() {
+    return this[impl].hostname;
+  },
+  set(V) {
+    V = conversions["USVString"](V);
+    this[impl].hostname = V;
+  },
+  enumerable: true,
+  configurable: true
+});
+
+Object.defineProperty(URL.prototype, "port", {
+  get() {
+    return this[impl].port;
+  },
+  set(V) {
+    V = conversions["USVString"](V);
+    this[impl].port = V;
+  },
+  enumerable: true,
+  configurable: true
+});
+
+Object.defineProperty(URL.prototype, "pathname", {
+  get() {
+    return this[impl].pathname;
+  },
+  set(V) {
+    V = conversions["USVString"](V);
+    this[impl].pathname = V;
+  },
+  enumerable: true,
+  configurable: true
+});
+
+Object.defineProperty(URL.prototype, "search", {
+  get() {
+    return this[impl].search;
+  },
+  set(V) {
+    V = conversions["USVString"](V);
+    this[impl].search = V;
+  },
+  enumerable: true,
+  configurable: true
+});
+
+Object.defineProperty(URL.prototype, "hash", {
+  get() {
+    return this[impl].hash;
+  },
+  set(V) {
+    V = conversions["USVString"](V);
+    this[impl].hash = V;
+  },
+  enumerable: true,
+  configurable: true
+});
+
+
+module.exports = {
+  is(obj) {
+    return !!obj && obj[impl] instanceof Impl.implementation;
+  },
+  create(constructorArgs, privateData) {
+    let obj = Object.create(URL.prototype);
+    this.setup(obj, constructorArgs, privateData);
+    return obj;
+  },
+  setup(obj, constructorArgs, privateData) {
+    if (!privateData) privateData = {};
+    privateData.wrapper = obj;
+
+    obj[impl] = new Impl.implementation(constructorArgs, privateData);
+    obj[impl][utils.wrapperSymbol] = obj;
+  },
+  interface: URL,
+  expose: {
+    Window: { URL: URL },
+    Worker: { URL: URL }
+  }
+};
+
+
+
+/***/ }),
+
+/***/ 3323:
+/***/ ((__unused_webpack_module, exports, __nccwpck_require__) => {
+
+"use strict";
+
+
+exports.URL = __nccwpck_require__(653)["interface"];
+exports.serializeURL = __nccwpck_require__(33).serializeURL;
+exports.serializeURLOrigin = __nccwpck_require__(33).serializeURLOrigin;
+exports.basicURLParse = __nccwpck_require__(33).basicURLParse;
+exports.setTheUsername = __nccwpck_require__(33).setTheUsername;
+exports.setThePassword = __nccwpck_require__(33).setThePassword;
+exports.serializeHost = __nccwpck_require__(33).serializeHost;
+exports.serializeInteger = __nccwpck_require__(33).serializeInteger;
+exports.parseURL = __nccwpck_require__(33).parseURL;
+
+
+/***/ }),
+
+/***/ 33:
+/***/ ((module, __unused_webpack_exports, __nccwpck_require__) => {
+
+"use strict";
+
+const punycode = __nccwpck_require__(5477);
+const tr46 = __nccwpck_require__(2299);
+
+const specialSchemes = {
+  ftp: 21,
+  file: null,
+  gopher: 70,
+  http: 80,
+  https: 443,
+  ws: 80,
+  wss: 443
+};
+
+const failure = Symbol("failure");
+
+function countSymbols(str) {
+  return punycode.ucs2.decode(str).length;
+}
+
+function at(input, idx) {
+  const c = input[idx];
+  return isNaN(c) ? undefined : String.fromCodePoint(c);
+}
+
+function isASCIIDigit(c) {
+  return c >= 0x30 && c <= 0x39;
+}
+
+function isASCIIAlpha(c) {
+  return (c >= 0x41 && c <= 0x5A) || (c >= 0x61 && c <= 0x7A);
+}
+
+function isASCIIAlphanumeric(c) {
+  return isASCIIAlpha(c) || isASCIIDigit(c);
+}
+
+function isASCIIHex(c) {
+  return isASCIIDigit(c) || (c >= 0x41 && c <= 0x46) || (c >= 0x61 && c <= 0x66);
+}
+
+function isSingleDot(buffer) {
+  return buffer === "." || buffer.toLowerCase() === "%2e";
+}
+
+function isDoubleDot(buffer) {
+  buffer = buffer.toLowerCase();
+  return buffer === ".." || buffer === "%2e." || buffer === ".%2e" || buffer === "%2e%2e";
+}
+
+function isWindowsDriveLetterCodePoints(cp1, cp2) {
+  return isASCIIAlpha(cp1) && (cp2 === 58 || cp2 === 124);
+}
+
+function isWindowsDriveLetterString(string) {
+  return string.length === 2 && isASCIIAlpha(string.codePointAt(0)) && (string[1] === ":" || string[1] === "|");
+}
+
+function isNormalizedWindowsDriveLetterString(string) {
+  return string.length === 2 && isASCIIAlpha(string.codePointAt(0)) && string[1] === ":";
+}
+
+function containsForbiddenHostCodePoint(string) {
+  return string.search(/\u0000|\u0009|\u000A|\u000D|\u0020|#|%|\/|:|\?|@|\[|\\|\]/) !== -1;
+}
+
+function containsForbiddenHostCodePointExcludingPercent(string) {
+  return string.search(/\u0000|\u0009|\u000A|\u000D|\u0020|#|\/|:|\?|@|\[|\\|\]/) !== -1;
+}
+
+function isSpecialScheme(scheme) {
+  return specialSchemes[scheme] !== undefined;
+}
+
+function isSpecial(url) {
+  return isSpecialScheme(url.scheme);
+}
+
+function defaultPort(scheme) {
+  return specialSchemes[scheme];
+}
+
+function percentEncode(c) {
+  let hex = c.toString(16).toUpperCase();
+  if (hex.length === 1) {
+    hex = "0" + hex;
+  }
+
+  return "%" + hex;
+}
+
+function utf8PercentEncode(c) {
+  const buf = new Buffer(c);
+
+  let str = "";
+
+  for (let i = 0; i < buf.length; ++i) {
+    str += percentEncode(buf[i]);
+  }
+
+  return str;
+}
+
+function utf8PercentDecode(str) {
+  const input = new Buffer(str);
+  const output = [];
+  for (let i = 0; i < input.length; ++i) {
+    if (input[i] !== 37) {
+      output.push(input[i]);
+    } else if (input[i] === 37 && isASCIIHex(input[i + 1]) && isASCIIHex(input[i + 2])) {
+      output.push(parseInt(input.slice(i + 1, i + 3).toString(), 16));
+      i += 2;
+    } else {
+      output.push(input[i]);
+    }
+  }
+  return new Buffer(output).toString();
+}
+
+function isC0ControlPercentEncode(c) {
+  return c <= 0x1F || c > 0x7E;
+}
+
+const extraPathPercentEncodeSet = new Set([32, 34, 35, 60, 62, 63, 96, 123, 125]);
+function isPathPercentEncode(c) {
+  return isC0ControlPercentEncode(c) || extraPathPercentEncodeSet.has(c);
+}
+
+const extraUserinfoPercentEncodeSet =
+  new Set([47, 58, 59, 61, 64, 91, 92, 93, 94, 124]);
+function isUserinfoPercentEncode(c) {
+  return isPathPercentEncode(c) || extraUserinfoPercentEncodeSet.has(c);
+}
+
+function percentEncodeChar(c, encodeSetPredicate) {
+  const cStr = String.fromCodePoint(c);
+
+  if (encodeSetPredicate(c)) {
+    return utf8PercentEncode(cStr);
+  }
+
+  return cStr;
+}
+
+function parseIPv4Number(input) {
+  let R = 10;
+
+  if (input.length >= 2 && input.charAt(0) === "0" && input.charAt(1).toLowerCase() === "x") {
+    input = input.substring(2);
+    R = 16;
+  } else if (input.length >= 2 && input.charAt(0) === "0") {
+    input = input.substring(1);
+    R = 8;
+  }
+
+  if (input === "") {
+    return 0;
+  }
+
+  const regex = R === 10 ? /[^0-9]/ : (R === 16 ? /[^0-9A-Fa-f]/ : /[^0-7]/);
+  if (regex.test(input)) {
+    return failure;
+  }
+
+  return parseInt(input, R);
+}
+
+function parseIPv4(input) {
+  const parts = input.split(".");
+  if (parts[parts.length - 1] === "") {
+    if (parts.length > 1) {
+      parts.pop();
+    }
+  }
+
+  if (parts.length > 4) {
+    return input;
+  }
+
+  const numbers = [];
+  for (const part of parts) {
+    if (part === "") {
+      return input;
+    }
+    const n = parseIPv4Number(part);
+    if (n === failure) {
+      return input;
+    }
+
+    numbers.push(n);
+  }
+
+  for (let i = 0; i < numbers.length - 1; ++i) {
+    if (numbers[i] > 255) {
+      return failure;
+    }
+  }
+  if (numbers[numbers.length - 1] >= Math.pow(256, 5 - numbers.length)) {
+    return failure;
+  }
+
+  let ipv4 = numbers.pop();
+  let counter = 0;
+
+  for (const n of numbers) {
+    ipv4 += n * Math.pow(256, 3 - counter);
+    ++counter;
+  }
+
+  return ipv4;
+}
+
+function serializeIPv4(address) {
+  let output = "";
+  let n = address;
+
+  for (let i = 1; i <= 4; ++i) {
+    output = String(n % 256) + output;
+    if (i !== 4) {
+      output = "." + output;
+    }
+    n = Math.floor(n / 256);
+  }
+
+  return output;
+}
+
+function parseIPv6(input) {
+  const address = [0, 0, 0, 0, 0, 0, 0, 0];
+  let pieceIndex = 0;
+  let compress = null;
+  let pointer = 0;
+
+  input = punycode.ucs2.decode(input);
+
+  if (input[pointer] === 58) {
+    if (input[pointer + 1] !== 58) {
+      return failure;
+    }
+
+    pointer += 2;
+    ++pieceIndex;
+    compress = pieceIndex;
+  }
+
+  while (pointer < input.length) {
+    if (pieceIndex === 8) {
+      return failure;
+    }
+
+    if (input[pointer] === 58) {
+      if (compress !== null) {
+        return failure;
+      }
+      ++pointer;
+      ++pieceIndex;
+      compress = pieceIndex;
+      continue;
+    }
+
+    let value = 0;
+    let length = 0;
+
+    while (length < 4 && isASCIIHex(input[pointer])) {
+      value = value * 0x10 + parseInt(at(input, pointer), 16);
+      ++pointer;
+      ++length;
+    }
+
+    if (input[pointer] === 46) {
+      if (length === 0) {
+        return failure;
+      }
+
+      pointer -= length;
+
+      if (pieceIndex > 6) {
+        return failure;
+      }
+
+      let numbersSeen = 0;
+
+      while (input[pointer] !== undefined) {
+        let ipv4Piece = null;
+
+        if (numbersSeen > 0) {
+          if (input[pointer] === 46 && numbersSeen < 4) {
+            ++pointer;
+          } else {
+            return failure;
+          }
+        }
+
+        if (!isASCIIDigit(input[pointer])) {
+          return failure;
+        }
+
+        while (isASCIIDigit(input[pointer])) {
+          const number = parseInt(at(input, pointer));
+          if (ipv4Piece === null) {
+            ipv4Piece = number;
+          } else if (ipv4Piece === 0) {
+            return failure;
+          } else {
+            ipv4Piece = ipv4Piece * 10 + number;
+          }
+          if (ipv4Piece > 255) {
+            return failure;
+          }
+          ++pointer;
+        }
+
+        address[pieceIndex] = address[pieceIndex] * 0x100 + ipv4Piece;
+
+        ++numbersSeen;
+
+        if (numbersSeen === 2 || numbersSeen === 4) {
+          ++pieceIndex;
+        }
+      }
+
+      if (numbersSeen !== 4) {
+        return failure;
+      }
+
+      break;
+    } else if (input[pointer] === 58) {
+      ++pointer;
+      if (input[pointer] === undefined) {
+        return failure;
+      }
+    } else if (input[pointer] !== undefined) {
+      return failure;
+    }
+
+    address[pieceIndex] = value;
+    ++pieceIndex;
+  }
+
+  if (compress !== null) {
+    let swaps = pieceIndex - compress;
+    pieceIndex = 7;
+    while (pieceIndex !== 0 && swaps > 0) {
+      const temp = address[compress + swaps - 1];
+      address[compress + swaps - 1] = address[pieceIndex];
+      address[pieceIndex] = temp;
+      --pieceIndex;
+      --swaps;
+    }
+  } else if (compress === null && pieceIndex !== 8) {
+    return failure;
+  }
+
+  return address;
+}
+
+function serializeIPv6(address) {
+  let output = "";
+  const seqResult = findLongestZeroSequence(address);
+  const compress = seqResult.idx;
+  let ignore0 = false;
+
+  for (let pieceIndex = 0; pieceIndex <= 7; ++pieceIndex) {
+    if (ignore0 && address[pieceIndex] === 0) {
+      continue;
+    } else if (ignore0) {
+      ignore0 = false;
+    }
+
+    if (compress === pieceIndex) {
+      const separator = pieceIndex === 0 ? "::" : ":";
+      output += separator;
+      ignore0 = true;
+      continue;
+    }
+
+    output += address[pieceIndex].toString(16);
+
+    if (pieceIndex !== 7) {
+      output += ":";
+    }
+  }
+
+  return output;
+}
+
+function parseHost(input, isSpecialArg) {
+  if (input[0] === "[") {
+    if (input[input.length - 1] !== "]") {
+      return failure;
+    }
+
+    return parseIPv6(input.substring(1, input.length - 1));
+  }
+
+  if (!isSpecialArg) {
+    return parseOpaqueHost(input);
+  }
+
+  const domain = utf8PercentDecode(input);
+  const asciiDomain = tr46.toASCII(domain, false, tr46.PROCESSING_OPTIONS.NONTRANSITIONAL, false);
+  if (asciiDomain === null) {
+    return failure;
+  }
+
+  if (containsForbiddenHostCodePoint(asciiDomain)) {
+    return failure;
+  }
+
+  const ipv4Host = parseIPv4(asciiDomain);
+  if (typeof ipv4Host === "number" || ipv4Host === failure) {
+    return ipv4Host;
+  }
+
+  return asciiDomain;
+}
+
+function parseOpaqueHost(input) {
+  if (containsForbiddenHostCodePointExcludingPercent(input)) {
+    return failure;
+  }
+
+  let output = "";
+  const decoded = punycode.ucs2.decode(input);
+  for (let i = 0; i < decoded.length; ++i) {
+    output += percentEncodeChar(decoded[i], isC0ControlPercentEncode);
+  }
+  return output;
+}
+
+function findLongestZeroSequence(arr) {
+  let maxIdx = null;
+  let maxLen = 1; // only find elements > 1
+  let currStart = null;
+  let currLen = 0;
+
+  for (let i = 0; i < arr.length; ++i) {
+    if (arr[i] !== 0) {
+      if (currLen > maxLen) {
+        maxIdx = currStart;
+        maxLen = currLen;
+      }
+
+      currStart = null;
+      currLen = 0;
+    } else {
+      if (currStart === null) {
+        currStart = i;
+      }
+      ++currLen;
+    }
+  }
+
+  // if trailing zeros
+  if (currLen > maxLen) {
+    maxIdx = currStart;
+    maxLen = currLen;
+  }
+
+  return {
+    idx: maxIdx,
+    len: maxLen
+  };
+}
+
+function serializeHost(host) {
+  if (typeof host === "number") {
+    return serializeIPv4(host);
+  }
+
+  // IPv6 serializer
+  if (host instanceof Array) {
+    return "[" + serializeIPv6(host) + "]";
+  }
+
+  return host;
+}
+
+function trimControlChars(url) {
+  return url.replace(/^[\u0000-\u001F\u0020]+|[\u0000-\u001F\u0020]+$/g, "");
+}
+
+function trimTabAndNewline(url) {
+  return url.replace(/\u0009|\u000A|\u000D/g, "");
+}
+
+function shortenPath(url) {
+  const path = url.path;
+  if (path.length === 0) {
+    return;
+  }
+  if (url.scheme === "file" && path.length === 1 && isNormalizedWindowsDriveLetter(path[0])) {
+    return;
+  }
+
+  path.pop();
+}
+
+function includesCredentials(url) {
+  return url.username !== "" || url.password !== "";
+}
+
+function cannotHaveAUsernamePasswordPort(url) {
+  return url.host === null || url.host === "" || url.cannotBeABaseURL || url.scheme === "file";
+}
+
+function isNormalizedWindowsDriveLetter(string) {
+  return /^[A-Za-z]:$/.test(string);
+}
+
+function URLStateMachine(input, base, encodingOverride, url, stateOverride) {
+  this.pointer = 0;
+  this.input = input;
+  this.base = base || null;
+  this.encodingOverride = encodingOverride || "utf-8";
+  this.stateOverride = stateOverride;
+  this.url = url;
+  this.failure = false;
+  this.parseError = false;
+
+  if (!this.url) {
+    this.url = {
+      scheme: "",
+      username: "",
+      password: "",
+      host: null,
+      port: null,
+      path: [],
+      query: null,
+      fragment: null,
+
+      cannotBeABaseURL: false
+    };
+
+    const res = trimControlChars(this.input);
+    if (res !== this.input) {
+      this.parseError = true;
+    }
+    this.input = res;
+  }
+
+  const res = trimTabAndNewline(this.input);
+  if (res !== this.input) {
+    this.parseError = true;
+  }
+  this.input = res;
+
+  this.state = stateOverride || "scheme start";
+
+  this.buffer = "";
+  this.atFlag = false;
+  this.arrFlag = false;
+  this.passwordTokenSeenFlag = false;
+
+  this.input = punycode.ucs2.decode(this.input);
+
+  for (; this.pointer <= this.input.length; ++this.pointer) {
+    const c = this.input[this.pointer];
+    const cStr = isNaN(c) ? undefined : String.fromCodePoint(c);
+
+    // exec state machine
+    const ret = this["parse " + this.state](c, cStr);
+    if (!ret) {
+      break; // terminate algorithm
+    } else if (ret === failure) {
+      this.failure = true;
+      break;
+    }
+  }
+}
+
+URLStateMachine.prototype["parse scheme start"] = function parseSchemeStart(c, cStr) {
+  if (isASCIIAlpha(c)) {
+    this.buffer += cStr.toLowerCase();
+    this.state = "scheme";
+  } else if (!this.stateOverride) {
+    this.state = "no scheme";
+    --this.pointer;
+  } else {
+    this.parseError = true;
+    return failure;
+  }
+
+  return true;
+};
+
+URLStateMachine.prototype["parse scheme"] = function parseScheme(c, cStr) {
+  if (isASCIIAlphanumeric(c) || c === 43 || c === 45 || c === 46) {
+    this.buffer += cStr.toLowerCase();
+  } else if (c === 58) {
+    if (this.stateOverride) {
+      if (isSpecial(this.url) && !isSpecialScheme(this.buffer)) {
+        return false;
+      }
+
+      if (!isSpecial(this.url) && isSpecialScheme(this.buffer)) {
+        return false;
+      }
+
+      if ((includesCredentials(this.url) || this.url.port !== null) && this.buffer === "file") {
+        return false;
+      }
+
+      if (this.url.scheme === "file" && (this.url.host === "" || this.url.host === null)) {
+        return false;
+      }
+    }
+    this.url.scheme = this.buffer;
+    this.buffer = "";
+    if (this.stateOverride) {
+      return false;
+    }
+    if (this.url.scheme === "file") {
+      if (this.input[this.pointer + 1] !== 47 || this.input[this.pointer + 2] !== 47) {
+        this.parseError = true;
+      }
+      this.state = "file";
+    } else if (isSpecial(this.url) && this.base !== null && this.base.scheme === this.url.scheme) {
+      this.state = "special relative or authority";
+    } else if (isSpecial(this.url)) {
+      this.state = "special authority slashes";
+    } else if (this.input[this.pointer + 1] === 47) {
+      this.state = "path or authority";
+      ++this.pointer;
+    } else {
+      this.url.cannotBeABaseURL = true;
+      this.url.path.push("");
+      this.state = "cannot-be-a-base-URL path";
+    }
+  } else if (!this.stateOverride) {
+    this.buffer = "";
+    this.state = "no scheme";
+    this.pointer = -1;
+  } else {
+    this.parseError = true;
+    return failure;
+  }
+
+  return true;
+};
+
+URLStateMachine.prototype["parse no scheme"] = function parseNoScheme(c) {
+  if (this.base === null || (this.base.cannotBeABaseURL && c !== 35)) {
+    return failure;
+  } else if (this.base.cannotBeABaseURL && c === 35) {
+    this.url.scheme = this.base.scheme;
+    this.url.path = this.base.path.slice();
+    this.url.query = this.base.query;
+    this.url.fragment = "";
+    this.url.cannotBeABaseURL = true;
+    this.state = "fragment";
+  } else if (this.base.scheme === "file") {
+    this.state = "file";
+    --this.pointer;
+  } else {
+    this.state = "relative";
+    --this.pointer;
+  }
+
+  return true;
+};
+
+URLStateMachine.prototype["parse special relative or authority"] = function parseSpecialRelativeOrAuthority(c) {
+  if (c === 47 && this.input[this.pointer + 1] === 47) {
+    this.state = "special authority ignore slashes";
+    ++this.pointer;
+  } else {
+    this.parseError = true;
+    this.state = "relative";
+    --this.pointer;
+  }
+
+  return true;
+};
+
+URLStateMachine.prototype["parse path or authority"] = function parsePathOrAuthority(c) {
+  if (c === 47) {
+    this.state = "authority";
+  } else {
+    this.state = "path";
+    --this.pointer;
+  }
+
+  return true;
+};
+
+URLStateMachine.prototype["parse relative"] = function parseRelative(c) {
+  this.url.scheme = this.base.scheme;
+  if (isNaN(c)) {
+    this.url.username = this.base.username;
+    this.url.password = this.base.password;
+    this.url.host = this.base.host;
+    this.url.port = this.base.port;
+    this.url.path = this.base.path.slice();
+    this.url.query = this.base.query;
+  } else if (c === 47) {
+    this.state = "relative slash";
+  } else if (c === 63) {
+    this.url.username = this.base.username;
+    this.url.password = this.base.password;
+    this.url.host = this.base.host;
+    this.url.port = this.base.port;
+    this.url.path = this.base.path.slice();
+    this.url.query = "";
+    this.state = "query";
+  } else if (c === 35) {
+    this.url.username = this.base.username;
+    this.url.password = this.base.password;
+    this.url.host = this.base.host;
+    this.url.port = this.base.port;
+    this.url.path = this.base.path.slice();
+    this.url.query = this.base.query;
+    this.url.fragment = "";
+    this.state = "fragment";
+  } else if (isSpecial(this.url) && c === 92) {
+    this.parseError = true;
+    this.state = "relative slash";
+  } else {
+    this.url.username = this.base.username;
+    this.url.password = this.base.password;
+    this.url.host = this.base.host;
+    this.url.port = this.base.port;
+    this.url.path = this.base.path.slice(0, this.base.path.length - 1);
+
+    this.state = "path";
+    --this.pointer;
+  }
+
+  return true;
+};
+
+URLStateMachine.prototype["parse relative slash"] = function parseRelativeSlash(c) {
+  if (isSpecial(this.url) && (c === 47 || c === 92)) {
+    if (c === 92) {
+      this.parseError = true;
+    }
+    this.state = "special authority ignore slashes";
+  } else if (c === 47) {
+    this.state = "authority";
+  } else {
+    this.url.username = this.base.username;
+    this.url.password = this.base.password;
+    this.url.host = this.base.host;
+    this.url.port = this.base.port;
+    this.state = "path";
+    --this.pointer;
+  }
+
+  return true;
+};
+
+URLStateMachine.prototype["parse special authority slashes"] = function parseSpecialAuthoritySlashes(c) {
+  if (c === 47 && this.input[this.pointer + 1] === 47) {
+    this.state = "special authority ignore slashes";
+    ++this.pointer;
+  } else {
+    this.parseError = true;
+    this.state = "special authority ignore slashes";
+    --this.pointer;
+  }
+
+  return true;
+};
+
+URLStateMachine.prototype["parse special authority ignore slashes"] = function parseSpecialAuthorityIgnoreSlashes(c) {
+  if (c !== 47 && c !== 92) {
+    this.state = "authority";
+    --this.pointer;
+  } else {
+    this.parseError = true;
+  }
+
+  return true;
+};
+
+URLStateMachine.prototype["parse authority"] = function parseAuthority(c, cStr) {
+  if (c === 64) {
+    this.parseError = true;
+    if (this.atFlag) {
+      this.buffer = "%40" + this.buffer;
+    }
+    this.atFlag = true;
+
+    // careful, this is based on buffer and has its own pointer (this.pointer != pointer) and inner chars
+    const len = countSymbols(this.buffer);
+    for (let pointer = 0; pointer < len; ++pointer) {
+      const codePoint = this.buffer.codePointAt(pointer);
+
+      if (codePoint === 58 && !this.passwordTokenSeenFlag) {
+        this.passwordTokenSeenFlag = true;
+        continue;
+      }
+      const encodedCodePoints = percentEncodeChar(codePoint, isUserinfoPercentEncode);
+      if (this.passwordTokenSeenFlag) {
+        this.url.password += encodedCodePoints;
+      } else {
+        this.url.username += encodedCodePoints;
+      }
+    }
+    this.buffer = "";
+  } else if (isNaN(c) || c === 47 || c === 63 || c === 35 ||
+             (isSpecial(this.url) && c === 92)) {
+    if (this.atFlag && this.buffer === "") {
+      this.parseError = true;
+      return failure;
+    }
+    this.pointer -= countSymbols(this.buffer) + 1;
+    this.buffer = "";
+    this.state = "host";
+  } else {
+    this.buffer += cStr;
+  }
+
+  return true;
+};
+
+URLStateMachine.prototype["parse hostname"] =
+URLStateMachine.prototype["parse host"] = function parseHostName(c, cStr) {
+  if (this.stateOverride && this.url.scheme === "file") {
+    --this.pointer;
+    this.state = "file host";
+  } else if (c === 58 && !this.arrFlag) {
+    if (this.buffer === "") {
+      this.parseError = true;
+      return failure;
+    }
+
+    const host = parseHost(this.buffer, isSpecial(this.url));
+    if (host === failure) {
+      return failure;
+    }
+
+    this.url.host = host;
+    this.buffer = "";
+    this.state = "port";
+    if (this.stateOverride === "hostname") {
+      return false;
+    }
+  } else if (isNaN(c) || c === 47 || c === 63 || c === 35 ||
+             (isSpecial(this.url) && c === 92)) {
+    --this.pointer;
+    if (isSpecial(this.url) && this.buffer === "") {
+      this.parseError = true;
+      return failure;
+    } else if (this.stateOverride && this.buffer === "" &&
+               (includesCredentials(this.url) || this.url.port !== null)) {
+      this.parseError = true;
+      return false;
+    }
+
+    const host = parseHost(this.buffer, isSpecial(this.url));
+    if (host === failure) {
+      return failure;
+    }
+
+    this.url.host = host;
+    this.buffer = "";
+    this.state = "path start";
+    if (this.stateOverride) {
+      return false;
+    }
+  } else {
+    if (c === 91) {
+      this.arrFlag = true;
+    } else if (c === 93) {
+      this.arrFlag = false;
+    }
+    this.buffer += cStr;
+  }
+
+  return true;
+};
+
+URLStateMachine.prototype["parse port"] = function parsePort(c, cStr) {
+  if (isASCIIDigit(c)) {
+    this.buffer += cStr;
+  } else if (isNaN(c) || c === 47 || c === 63 || c === 35 ||
+             (isSpecial(this.url) && c === 92) ||
+             this.stateOverride) {
+    if (this.buffer !== "") {
+      const port = parseInt(this.buffer);
+      if (port > Math.pow(2, 16) - 1) {
+        this.parseError = true;
+        return failure;
+      }
+      this.url.port = port === defaultPort(this.url.scheme) ? null : port;
+      this.buffer = "";
+    }
+    if (this.stateOverride) {
+      return false;
+    }
+    this.state = "path start";
+    --this.pointer;
+  } else {
+    this.parseError = true;
+    return failure;
+  }
+
+  return true;
+};
+
+const fileOtherwiseCodePoints = new Set([47, 92, 63, 35]);
+
+URLStateMachine.prototype["parse file"] = function parseFile(c) {
+  this.url.scheme = "file";
+
+  if (c === 47 || c === 92) {
+    if (c === 92) {
+      this.parseError = true;
+    }
+    this.state = "file slash";
+  } else if (this.base !== null && this.base.scheme === "file") {
+    if (isNaN(c)) {
+      this.url.host = this.base.host;
+      this.url.path = this.base.path.slice();
+      this.url.query = this.base.query;
+    } else if (c === 63) {
+      this.url.host = this.base.host;
+      this.url.path = this.base.path.slice();
+      this.url.query = "";
+      this.state = "query";
+    } else if (c === 35) {
+      this.url.host = this.base.host;
+      this.url.path = this.base.path.slice();
+      this.url.query = this.base.query;
+      this.url.fragment = "";
+      this.state = "fragment";
+    } else {
+      if (this.input.length - this.pointer - 1 === 0 || // remaining consists of 0 code points
+          !isWindowsDriveLetterCodePoints(c, this.input[this.pointer + 1]) ||
+          (this.input.length - this.pointer - 1 >= 2 && // remaining has at least 2 code points
+           !fileOtherwiseCodePoints.has(this.input[this.pointer + 2]))) {
+        this.url.host = this.base.host;
+        this.url.path = this.base.path.slice();
+        shortenPath(this.url);
+      } else {
+        this.parseError = true;
+      }
+
+      this.state = "path";
+      --this.pointer;
+    }
+  } else {
+    this.state = "path";
+    --this.pointer;
+  }
+
+  return true;
+};
+
+URLStateMachine.prototype["parse file slash"] = function parseFileSlash(c) {
+  if (c === 47 || c === 92) {
+    if (c === 92) {
+      this.parseError = true;
+    }
+    this.state = "file host";
+  } else {
+    if (this.base !== null && this.base.scheme === "file") {
+      if (isNormalizedWindowsDriveLetterString(this.base.path[0])) {
+        this.url.path.push(this.base.path[0]);
+      } else {
+        this.url.host = this.base.host;
+      }
+    }
+    this.state = "path";
+    --this.pointer;
+  }
+
+  return true;
+};
+
+URLStateMachine.prototype["parse file host"] = function parseFileHost(c, cStr) {
+  if (isNaN(c) || c === 47 || c === 92 || c === 63 || c === 35) {
+    --this.pointer;
+    if (!this.stateOverride && isWindowsDriveLetterString(this.buffer)) {
+      this.parseError = true;
+      this.state = "path";
+    } else if (this.buffer === "") {
+      this.url.host = "";
+      if (this.stateOverride) {
+        return false;
+      }
+      this.state = "path start";
+    } else {
+      let host = parseHost(this.buffer, isSpecial(this.url));
+      if (host === failure) {
+        return failure;
+      }
+      if (host === "localhost") {
+        host = "";
+      }
+      this.url.host = host;
+
+      if (this.stateOverride) {
+        return false;
+      }
+
+      this.buffer = "";
+      this.state = "path start";
+    }
+  } else {
+    this.buffer += cStr;
+  }
+
+  return true;
+};
+
+URLStateMachine.prototype["parse path start"] = function parsePathStart(c) {
+  if (isSpecial(this.url)) {
+    if (c === 92) {
+      this.parseError = true;
+    }
+    this.state = "path";
+
+    if (c !== 47 && c !== 92) {
+      --this.pointer;
+    }
+  } else if (!this.stateOverride && c === 63) {
+    this.url.query = "";
+    this.state = "query";
+  } else if (!this.stateOverride && c === 35) {
+    this.url.fragment = "";
+    this.state = "fragment";
+  } else if (c !== undefined) {
+    this.state = "path";
+    if (c !== 47) {
+      --this.pointer;
+    }
+  }
+
+  return true;
+};
+
+URLStateMachine.prototype["parse path"] = function parsePath(c) {
+  if (isNaN(c) || c === 47 || (isSpecial(this.url) && c === 92) ||
+      (!this.stateOverride && (c === 63 || c === 35))) {
+    if (isSpecial(this.url) && c === 92) {
+      this.parseError = true;
+    }
+
+    if (isDoubleDot(this.buffer)) {
+      shortenPath(this.url);
+      if (c !== 47 && !(isSpecial(this.url) && c === 92)) {
+        this.url.path.push("");
+      }
+    } else if (isSingleDot(this.buffer) && c !== 47 &&
+               !(isSpecial(this.url) && c === 92)) {
+      this.url.path.push("");
+    } else if (!isSingleDot(this.buffer)) {
+      if (this.url.scheme === "file" && this.url.path.length === 0 && isWindowsDriveLetterString(this.buffer)) {
+        if (this.url.host !== "" && this.url.host !== null) {
+          this.parseError = true;
+          this.url.host = "";
+        }
+        this.buffer = this.buffer[0] + ":";
+      }
+      this.url.path.push(this.buffer);
+    }
+    this.buffer = "";
+    if (this.url.scheme === "file" && (c === undefined || c === 63 || c === 35)) {
+      while (this.url.path.length > 1 && this.url.path[0] === "") {
+        this.parseError = true;
+        this.url.path.shift();
+      }
+    }
+    if (c === 63) {
+      this.url.query = "";
+      this.state = "query";
+    }
+    if (c === 35) {
+      this.url.fragment = "";
+      this.state = "fragment";
+    }
+  } else {
+    // TODO: If c is not a URL code point and not "%", parse error.
+
+    if (c === 37 &&
+      (!isASCIIHex(this.input[this.pointer + 1]) ||
+        !isASCIIHex(this.input[this.pointer + 2]))) {
+      this.parseError = true;
+    }
+
+    this.buffer += percentEncodeChar(c, isPathPercentEncode);
+  }
+
+  return true;
+};
+
+URLStateMachine.prototype["parse cannot-be-a-base-URL path"] = function parseCannotBeABaseURLPath(c) {
+  if (c === 63) {
+    this.url.query = "";
+    this.state = "query";
+  } else if (c === 35) {
+    this.url.fragment = "";
+    this.state = "fragment";
+  } else {
+    // TODO: Add: not a URL code point
+    if (!isNaN(c) && c !== 37) {
+      this.parseError = true;
+    }
+
+    if (c === 37 &&
+        (!isASCIIHex(this.input[this.pointer + 1]) ||
+         !isASCIIHex(this.input[this.pointer + 2]))) {
+      this.parseError = true;
+    }
+
+    if (!isNaN(c)) {
+      this.url.path[0] = this.url.path[0] + percentEncodeChar(c, isC0ControlPercentEncode);
+    }
+  }
+
+  return true;
+};
+
+URLStateMachine.prototype["parse query"] = function parseQuery(c, cStr) {
+  if (isNaN(c) || (!this.stateOverride && c === 35)) {
+    if (!isSpecial(this.url) || this.url.scheme === "ws" || this.url.scheme === "wss") {
+      this.encodingOverride = "utf-8";
+    }
+
+    const buffer = new Buffer(this.buffer); // TODO: Use encoding override instead
+    for (let i = 0; i < buffer.length; ++i) {
+      if (buffer[i] < 0x21 || buffer[i] > 0x7E || buffer[i] === 0x22 || buffer[i] === 0x23 ||
+          buffer[i] === 0x3C || buffer[i] === 0x3E) {
+        this.url.query += percentEncode(buffer[i]);
+      } else {
+        this.url.query += String.fromCodePoint(buffer[i]);
+      }
+    }
+
+    this.buffer = "";
+    if (c === 35) {
+      this.url.fragment = "";
+      this.state = "fragment";
+    }
+  } else {
+    // TODO: If c is not a URL code point and not "%", parse error.
+    if (c === 37 &&
+      (!isASCIIHex(this.input[this.pointer + 1]) ||
+        !isASCIIHex(this.input[this.pointer + 2]))) {
+      this.parseError = true;
+    }
+
+    this.buffer += cStr;
+  }
+
+  return true;
+};
+
+URLStateMachine.prototype["parse fragment"] = function parseFragment(c) {
+  if (isNaN(c)) { // do nothing
+  } else if (c === 0x0) {
+    this.parseError = true;
+  } else {
+    // TODO: If c is not a URL code point and not "%", parse error.
+    if (c === 37 &&
+      (!isASCIIHex(this.input[this.pointer + 1]) ||
+        !isASCIIHex(this.input[this.pointer + 2]))) {
+      this.parseError = true;
+    }
+
+    this.url.fragment += percentEncodeChar(c, isC0ControlPercentEncode);
+  }
+
+  return true;
+};
+
+function serializeURL(url, excludeFragment) {
+  let output = url.scheme + ":";
+  if (url.host !== null) {
+    output += "//";
+
+    if (url.username !== "" || url.password !== "") {
+      output += url.username;
+      if (url.password !== "") {
+        output += ":" + url.password;
+      }
+      output += "@";
+    }
+
+    output += serializeHost(url.host);
+
+    if (url.port !== null) {
+      output += ":" + url.port;
+    }
+  } else if (url.host === null && url.scheme === "file") {
+    output += "//";
+  }
+
+  if (url.cannotBeABaseURL) {
+    output += url.path[0];
+  } else {
+    for (const string of url.path) {
+      output += "/" + string;
+    }
+  }
+
+  if (url.query !== null) {
+    output += "?" + url.query;
+  }
+
+  if (!excludeFragment && url.fragment !== null) {
+    output += "#" + url.fragment;
+  }
+
+  return output;
+}
+
+function serializeOrigin(tuple) {
+  let result = tuple.scheme + "://";
+  result += serializeHost(tuple.host);
+
+  if (tuple.port !== null) {
+    result += ":" + tuple.port;
+  }
+
+  return result;
+}
+
+module.exports.serializeURL = serializeURL;
+
+module.exports.serializeURLOrigin = function (url) {
+  // https://url.spec.whatwg.org/#concept-url-origin
+  switch (url.scheme) {
+    case "blob":
+      try {
+        return module.exports.serializeURLOrigin(module.exports.parseURL(url.path[0]));
+      } catch (e) {
+        // serializing an opaque origin returns "null"
+        return "null";
+      }
+    case "ftp":
+    case "gopher":
+    case "http":
+    case "https":
+    case "ws":
+    case "wss":
+      return serializeOrigin({
+        scheme: url.scheme,
+        host: url.host,
+        port: url.port
+      });
+    case "file":
+      // spec says "exercise to the reader", chrome says "file://"
+      return "file://";
+    default:
+      // serializing an opaque origin returns "null"
+      return "null";
+  }
+};
+
+module.exports.basicURLParse = function (input, options) {
+  if (options === undefined) {
+    options = {};
+  }
+
+  const usm = new URLStateMachine(input, options.baseURL, options.encodingOverride, options.url, options.stateOverride);
+  if (usm.failure) {
+    return "failure";
+  }
+
+  return usm.url;
+};
+
+module.exports.setTheUsername = function (url, username) {
+  url.username = "";
+  const decoded = punycode.ucs2.decode(username);
+  for (let i = 0; i < decoded.length; ++i) {
+    url.username += percentEncodeChar(decoded[i], isUserinfoPercentEncode);
+  }
+};
+
+module.exports.setThePassword = function (url, password) {
+  url.password = "";
+  const decoded = punycode.ucs2.decode(password);
+  for (let i = 0; i < decoded.length; ++i) {
+    url.password += percentEncodeChar(decoded[i], isUserinfoPercentEncode);
+  }
+};
+
+module.exports.serializeHost = serializeHost;
+
+module.exports.cannotHaveAUsernamePasswordPort = cannotHaveAUsernamePasswordPort;
+
+module.exports.serializeInteger = function (integer) {
+  return String(integer);
+};
+
+module.exports.parseURL = function (input, options) {
+  if (options === undefined) {
+    options = {};
+  }
+
+  // We don't handle blobs, so this just delegates:
+  return module.exports.basicURLParse(input, { baseURL: options.baseURL, encodingOverride: options.encodingOverride });
+};
+
+
+/***/ }),
+
+/***/ 276:
+/***/ ((module) => {
+
+"use strict";
+
+
+module.exports.mixin = function mixin(target, source) {
+  const keys = Object.getOwnPropertyNames(source);
+  for (let i = 0; i < keys.length; ++i) {
+    Object.defineProperty(target, keys[i], Object.getOwnPropertyDescriptor(source, keys[i]));
+  }
+};
+
+module.exports.wrapperSymbol = Symbol("wrapper");
+module.exports.implSymbol = Symbol("impl");
+
+module.exports.wrapperForImpl = function (impl) {
+  return impl[module.exports.wrapperSymbol];
+};
+
+module.exports.implForWrapper = function (wrapper) {
+  return wrapper[module.exports.implSymbol];
+};
+
+
+
+/***/ }),
+
+/***/ 1223:
+/***/ ((module, __unused_webpack_exports, __nccwpck_require__) => {
+
+var wrappy = __nccwpck_require__(2940)
+module.exports = wrappy(once)
+module.exports.strict = wrappy(onceStrict)
+
+once.proto = once(function () {
+  Object.defineProperty(Function.prototype, 'once', {
+    value: function () {
+      return once(this)
+    },
+    configurable: true
+  })
+
+  Object.defineProperty(Function.prototype, 'onceStrict', {
+    value: function () {
+      return onceStrict(this)
+    },
+    configurable: true
+  })
+})
+
+function once (fn) {
+  var f = function () {
+    if (f.called) return f.value
+    f.called = true
+    return f.value = fn.apply(this, arguments)
+  }
+  f.called = false
+  return f
+}
+
+function onceStrict (fn) {
+  var f = function () {
+    if (f.called)
+      throw new Error(f.onceError)
+    f.called = true
+    return f.value = fn.apply(this, arguments)
+  }
+  var name = fn.name || 'Function wrapped with `once`'
+  f.onceError = name + " shouldn't be called more than once"
+  f.called = false
+  return f
+}
+
+
+/***/ }),
+
+/***/ 4294:
+/***/ ((module, __unused_webpack_exports, __nccwpck_require__) => {
+
+module.exports = __nccwpck_require__(4219);
+
+
+/***/ }),
+
+/***/ 4219:
+/***/ ((__unused_webpack_module, exports, __nccwpck_require__) => {
+
+"use strict";
+
+
+var net = __nccwpck_require__(1808);
+var tls = __nccwpck_require__(4404);
+var http = __nccwpck_require__(3685);
+var https = __nccwpck_require__(5687);
+var events = __nccwpck_require__(2361);
+var assert = __nccwpck_require__(9491);
+var util = __nccwpck_require__(3837);
+
+
+exports.httpOverHttp = httpOverHttp;
+exports.httpsOverHttp = httpsOverHttp;
+exports.httpOverHttps = httpOverHttps;
+exports.httpsOverHttps = httpsOverHttps;
+
+
+function httpOverHttp(options) {
+  var agent = new TunnelingAgent(options);
+  agent.request = http.request;
+  return agent;
+}
+
+function httpsOverHttp(options) {
+  var agent = new TunnelingAgent(options);
+  agent.request = http.request;
+  agent.createSocket = createSecureSocket;
+  agent.defaultPort = 443;
+  return agent;
+}
+
+function httpOverHttps(options) {
+  var agent = new TunnelingAgent(options);
+  agent.request = https.request;
+  return agent;
+}
+
+function httpsOverHttps(options) {
+  var agent = new TunnelingAgent(options);
+  agent.request = https.request;
+  agent.createSocket = createSecureSocket;
+  agent.defaultPort = 443;
+  return agent;
+}
+
+
+function TunnelingAgent(options) {
+  var self = this;
+  self.options = options || {};
+  self.proxyOptions = self.options.proxy || {};
+  self.maxSockets = self.options.maxSockets || http.Agent.defaultMaxSockets;
+  self.requests = [];
+  self.sockets = [];
+
+  self.on('free', function onFree(socket, host, port, localAddress) {
+    var options = toOptions(host, port, localAddress);
+    for (var i = 0, len = self.requests.length; i < len; ++i) {
+      var pending = self.requests[i];
+      if (pending.host === options.host && pending.port === options.port) {
+        // Detect the request to connect same origin server,
+        // reuse the connection.
+        self.requests.splice(i, 1);
+        pending.request.onSocket(socket);
+        return;
+      }
+    }
+    socket.destroy();
+    self.removeSocket(socket);
+  });
+}
+util.inherits(TunnelingAgent, events.EventEmitter);
+
+TunnelingAgent.prototype.addRequest = function addRequest(req, host, port, localAddress) {
+  var self = this;
+  var options = mergeOptions({request: req}, self.options, toOptions(host, port, localAddress));
+
+  if (self.sockets.length >= this.maxSockets) {
+    // We are over limit so we'll add it to the queue.
+    self.requests.push(options);
+    return;
+  }
+
+  // If we are under maxSockets create a new one.
+  self.createSocket(options, function(socket) {
+    socket.on('free', onFree);
+    socket.on('close', onCloseOrRemove);
+    socket.on('agentRemove', onCloseOrRemove);
+    req.onSocket(socket);
+
+    function onFree() {
+      self.emit('free', socket, options);
+    }
+
+    function onCloseOrRemove(err) {
+      self.removeSocket(socket);
+      socket.removeListener('free', onFree);
+      socket.removeListener('close', onCloseOrRemove);
+      socket.removeListener('agentRemove', onCloseOrRemove);
+    }
+  });
+};
+
+TunnelingAgent.prototype.createSocket = function createSocket(options, cb) {
+  var self = this;
+  var placeholder = {};
+  self.sockets.push(placeholder);
+
+  var connectOptions = mergeOptions({}, self.proxyOptions, {
+    method: 'CONNECT',
+    path: options.host + ':' + options.port,
+    agent: false,
+    headers: {
+      host: options.host + ':' + options.port
+    }
+  });
+  if (options.localAddress) {
+    connectOptions.localAddress = options.localAddress;
+  }
+  if (connectOptions.proxyAuth) {
+    connectOptions.headers = connectOptions.headers || {};
+    connectOptions.headers['Proxy-Authorization'] = 'Basic ' +
+        new Buffer(connectOptions.proxyAuth).toString('base64');
+  }
+
+  debug('making CONNECT request');
+  var connectReq = self.request(connectOptions);
+  connectReq.useChunkedEncodingByDefault = false; // for v0.6
+  connectReq.once('response', onResponse); // for v0.6
+  connectReq.once('upgrade', onUpgrade);   // for v0.6
+  connectReq.once('connect', onConnect);   // for v0.7 or later
+  connectReq.once('error', onError);
+  connectReq.end();
+
+  function onResponse(res) {
+    // Very hacky. This is necessary to avoid http-parser leaks.
+    res.upgrade = true;
+  }
+
+  function onUpgrade(res, socket, head) {
+    // Hacky.
+    process.nextTick(function() {
+      onConnect(res, socket, head);
+    });
+  }
+
+  function onConnect(res, socket, head) {
+    connectReq.removeAllListeners();
+    socket.removeAllListeners();
+
+    if (res.statusCode !== 200) {
+      debug('tunneling socket could not be established, statusCode=%d',
+        res.statusCode);
+      socket.destroy();
+      var error = new Error('tunneling socket could not be established, ' +
+        'statusCode=' + res.statusCode);
+      error.code = 'ECONNRESET';
+      options.request.emit('error', error);
+      self.removeSocket(placeholder);
+      return;
+    }
+    if (head.length > 0) {
+      debug('got illegal response body from proxy');
+      socket.destroy();
+      var error = new Error('got illegal response body from proxy');
+      error.code = 'ECONNRESET';
+      options.request.emit('error', error);
+      self.removeSocket(placeholder);
+      return;
+    }
+    debug('tunneling connection has established');
+    self.sockets[self.sockets.indexOf(placeholder)] = socket;
+    return cb(socket);
+  }
+
+  function onError(cause) {
+    connectReq.removeAllListeners();
+
+    debug('tunneling socket could not be established, cause=%s\n',
+          cause.message, cause.stack);
+    var error = new Error('tunneling socket could not be established, ' +
+                          'cause=' + cause.message);
+    error.code = 'ECONNRESET';
+    options.request.emit('error', error);
+    self.removeSocket(placeholder);
+  }
+};
+
+TunnelingAgent.prototype.removeSocket = function removeSocket(socket) {
+  var pos = this.sockets.indexOf(socket)
+  if (pos === -1) {
+    return;
+  }
+  this.sockets.splice(pos, 1);
+
+  var pending = this.requests.shift();
+  if (pending) {
+    // If we have pending requests and a socket gets closed a new one
+    // needs to be created to take over in the pool for the one that closed.
+    this.createSocket(pending, function(socket) {
+      pending.request.onSocket(socket);
+    });
+  }
+};
+
+function createSecureSocket(options, cb) {
+  var self = this;
+  TunnelingAgent.prototype.createSocket.call(self, options, function(socket) {
+    var hostHeader = options.request.getHeader('host');
+    var tlsOptions = mergeOptions({}, self.options, {
+      socket: socket,
+      servername: hostHeader ? hostHeader.replace(/:.*$/, '') : options.host
+    });
+
+    // 0 is dummy port for v0.6
+    var secureSocket = tls.connect(0, tlsOptions);
+    self.sockets[self.sockets.indexOf(socket)] = secureSocket;
+    cb(secureSocket);
+  });
+}
+
+
+function toOptions(host, port, localAddress) {
+  if (typeof host === 'string') { // since v0.10
+    return {
+      host: host,
+      port: port,
+      localAddress: localAddress
+    };
+  }
+  return host; // for v0.11 or later
+}
+
+function mergeOptions(target) {
+  for (var i = 1, len = arguments.length; i < len; ++i) {
+    var overrides = arguments[i];
+    if (typeof overrides === 'object') {
+      var keys = Object.keys(overrides);
+      for (var j = 0, keyLen = keys.length; j < keyLen; ++j) {
+        var k = keys[j];
+        if (overrides[k] !== undefined) {
+          target[k] = overrides[k];
+        }
+      }
+    }
+  }
+  return target;
+}
+
+
+var debug;
+if (process.env.NODE_DEBUG && /\btunnel\b/.test(process.env.NODE_DEBUG)) {
+  debug = function() {
+    var args = Array.prototype.slice.call(arguments);
+    if (typeof args[0] === 'string') {
+      args[0] = 'TUNNEL: ' + args[0];
+    } else {
+      args.unshift('TUNNEL:');
+    }
+    console.error.apply(console, args);
+  }
+} else {
+  debug = function() {};
+}
+exports.debug = debug; // for test
+
+
+/***/ }),
+
+/***/ 5030:
+/***/ ((__unused_webpack_module, exports) => {
+
+"use strict";
+
+
+Object.defineProperty(exports, "__esModule", ({ value: true }));
+
+function getUserAgent() {
+  if (typeof navigator === "object" && "userAgent" in navigator) {
+    return navigator.userAgent;
+  }
+
+  if (typeof process === "object" && "version" in process) {
+    return `Node.js/${process.version.substr(1)} (${process.platform}; ${process.arch})`;
+  }
+
+  return "<environment undetectable>";
+}
+
+exports.getUserAgent = getUserAgent;
+//# sourceMappingURL=index.js.map
+
+
+/***/ }),
+
+/***/ 5840:
+/***/ ((__unused_webpack_module, exports, __nccwpck_require__) => {
+
+"use strict";
+
+
+Object.defineProperty(exports, "__esModule", ({
+  value: true
+}));
+Object.defineProperty(exports, "v1", ({
+  enumerable: true,
+  get: function () {
+    return _v.default;
+  }
+}));
+Object.defineProperty(exports, "v3", ({
+  enumerable: true,
+  get: function () {
+    return _v2.default;
+  }
+}));
+Object.defineProperty(exports, "v4", ({
+  enumerable: true,
+  get: function () {
+    return _v3.default;
+  }
+}));
+Object.defineProperty(exports, "v5", ({
+  enumerable: true,
+  get: function () {
+    return _v4.default;
+  }
+}));
+Object.defineProperty(exports, "NIL", ({
+  enumerable: true,
+  get: function () {
+    return _nil.default;
+  }
+}));
+Object.defineProperty(exports, "version", ({
+  enumerable: true,
+  get: function () {
+    return _version.default;
+  }
+}));
+Object.defineProperty(exports, "validate", ({
+  enumerable: true,
+  get: function () {
+    return _validate.default;
+  }
+}));
+Object.defineProperty(exports, "stringify", ({
+  enumerable: true,
+  get: function () {
+    return _stringify.default;
+  }
+}));
+Object.defineProperty(exports, "parse", ({
+  enumerable: true,
+  get: function () {
+    return _parse.default;
+  }
+}));
+
+var _v = _interopRequireDefault(__nccwpck_require__(8628));
+
+var _v2 = _interopRequireDefault(__nccwpck_require__(6409));
+
+var _v3 = _interopRequireDefault(__nccwpck_require__(5122));
+
+var _v4 = _interopRequireDefault(__nccwpck_require__(9120));
+
+var _nil = _interopRequireDefault(__nccwpck_require__(5332));
+
+var _version = _interopRequireDefault(__nccwpck_require__(1595));
+
+var _validate = _interopRequireDefault(__nccwpck_require__(6900));
+
+var _stringify = _interopRequireDefault(__nccwpck_require__(8950));
+
+var _parse = _interopRequireDefault(__nccwpck_require__(2746));
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+
+/***/ }),
+
+/***/ 4569:
+/***/ ((__unused_webpack_module, exports, __nccwpck_require__) => {
+
+"use strict";
+
+
+Object.defineProperty(exports, "__esModule", ({
+  value: true
+}));
+exports["default"] = void 0;
+
+var _crypto = _interopRequireDefault(__nccwpck_require__(6113));
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+
+function md5(bytes) {
+  if (Array.isArray(bytes)) {
+    bytes = Buffer.from(bytes);
+  } else if (typeof bytes === 'string') {
+    bytes = Buffer.from(bytes, 'utf8');
+  }
+
+  return _crypto.default.createHash('md5').update(bytes).digest();
+}
+
+var _default = md5;
+exports["default"] = _default;
+
+/***/ }),
+
+/***/ 5332:
+/***/ ((__unused_webpack_module, exports) => {
+
+"use strict";
+
+
+Object.defineProperty(exports, "__esModule", ({
+  value: true
+}));
+exports["default"] = void 0;
+var _default = '00000000-0000-0000-0000-000000000000';
+exports["default"] = _default;
+
+/***/ }),
+
+/***/ 2746:
+/***/ ((__unused_webpack_module, exports, __nccwpck_require__) => {
+
+"use strict";
+
+
+Object.defineProperty(exports, "__esModule", ({
+  value: true
+}));
+exports["default"] = void 0;
+
+var _validate = _interopRequireDefault(__nccwpck_require__(6900));
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+
+function parse(uuid) {
+  if (!(0, _validate.default)(uuid)) {
+    throw TypeError('Invalid UUID');
+  }
+
+  let v;
+  const arr = new Uint8Array(16); // Parse ########-....-....-....-............
+
+  arr[0] = (v = parseInt(uuid.slice(0, 8), 16)) >>> 24;
+  arr[1] = v >>> 16 & 0xff;
+  arr[2] = v >>> 8 & 0xff;
+  arr[3] = v & 0xff; // Parse ........-####-....-....-............
+
+  arr[4] = (v = parseInt(uuid.slice(9, 13), 16)) >>> 8;
+  arr[5] = v & 0xff; // Parse ........-....-####-....-............
+
+  arr[6] = (v = parseInt(uuid.slice(14, 18), 16)) >>> 8;
+  arr[7] = v & 0xff; // Parse ........-....-....-####-............
+
+  arr[8] = (v = parseInt(uuid.slice(19, 23), 16)) >>> 8;
+  arr[9] = v & 0xff; // Parse ........-....-....-....-############
+  // (Use "/" to avoid 32-bit truncation when bit-shifting high-order bytes)
+
+  arr[10] = (v = parseInt(uuid.slice(24, 36), 16)) / 0x10000000000 & 0xff;
+  arr[11] = v / 0x100000000 & 0xff;
+  arr[12] = v >>> 24 & 0xff;
+  arr[13] = v >>> 16 & 0xff;
+  arr[14] = v >>> 8 & 0xff;
+  arr[15] = v & 0xff;
+  return arr;
+}
+
+var _default = parse;
+exports["default"] = _default;
+
+/***/ }),
+
+/***/ 814:
+/***/ ((__unused_webpack_module, exports) => {
+
+"use strict";
+
+
+Object.defineProperty(exports, "__esModule", ({
+  value: true
+}));
+exports["default"] = void 0;
+var _default = /^(?:[0-9a-f]{8}-[0-9a-f]{4}-[1-5][0-9a-f]{3}-[89ab][0-9a-f]{3}-[0-9a-f]{12}|00000000-0000-0000-0000-000000000000)$/i;
+exports["default"] = _default;
+
+/***/ }),
+
+/***/ 807:
+/***/ ((__unused_webpack_module, exports, __nccwpck_require__) => {
+
+"use strict";
+
+
+Object.defineProperty(exports, "__esModule", ({
+  value: true
+}));
+exports["default"] = rng;
+
+var _crypto = _interopRequireDefault(__nccwpck_require__(6113));
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+
+const rnds8Pool = new Uint8Array(256); // # of random values to pre-allocate
+
+let poolPtr = rnds8Pool.length;
+
+function rng() {
+  if (poolPtr > rnds8Pool.length - 16) {
+    _crypto.default.randomFillSync(rnds8Pool);
+
+    poolPtr = 0;
+  }
+
+  return rnds8Pool.slice(poolPtr, poolPtr += 16);
+}
+
+/***/ }),
+
+/***/ 5274:
+/***/ ((__unused_webpack_module, exports, __nccwpck_require__) => {
+
+"use strict";
+
+
+Object.defineProperty(exports, "__esModule", ({
+  value: true
+}));
+exports["default"] = void 0;
+
+var _crypto = _interopRequireDefault(__nccwpck_require__(6113));
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+
+function sha1(bytes) {
+  if (Array.isArray(bytes)) {
+    bytes = Buffer.from(bytes);
+  } else if (typeof bytes === 'string') {
+    bytes = Buffer.from(bytes, 'utf8');
+  }
+
+  return _crypto.default.createHash('sha1').update(bytes).digest();
+}
+
+var _default = sha1;
+exports["default"] = _default;
+
+/***/ }),
+
+/***/ 8950:
+/***/ ((__unused_webpack_module, exports, __nccwpck_require__) => {
+
+"use strict";
+
+
+Object.defineProperty(exports, "__esModule", ({
+  value: true
+}));
+exports["default"] = void 0;
+
+var _validate = _interopRequireDefault(__nccwpck_require__(6900));
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+
+/**
+ * Convert array of 16 byte values to UUID string format of the form:
+ * XXXXXXXX-XXXX-XXXX-XXXX-XXXXXXXXXXXX
+ */
+const byteToHex = [];
+
+for (let i = 0; i < 256; ++i) {
+  byteToHex.push((i + 0x100).toString(16).substr(1));
+}
+
+function stringify(arr, offset = 0) {
+  // Note: Be careful editing this code!  It's been tuned for performance
+  // and works in ways you may not expect. See https://github.com/uuidjs/uuid/pull/434
+  const uuid = (byteToHex[arr[offset + 0]] + byteToHex[arr[offset + 1]] + byteToHex[arr[offset + 2]] + byteToHex[arr[offset + 3]] + '-' + byteToHex[arr[offset + 4]] + byteToHex[arr[offset + 5]] + '-' + byteToHex[arr[offset + 6]] + byteToHex[arr[offset + 7]] + '-' + byteToHex[arr[offset + 8]] + byteToHex[arr[offset + 9]] + '-' + byteToHex[arr[offset + 10]] + byteToHex[arr[offset + 11]] + byteToHex[arr[offset + 12]] + byteToHex[arr[offset + 13]] + byteToHex[arr[offset + 14]] + byteToHex[arr[offset + 15]]).toLowerCase(); // Consistency check for valid UUID.  If this throws, it's likely due to one
+  // of the following:
+  // - One or more input array values don't map to a hex octet (leading to
+  // "undefined" in the uuid)
+  // - Invalid input values for the RFC `version` or `variant` fields
+
+  if (!(0, _validate.default)(uuid)) {
+    throw TypeError('Stringified UUID is invalid');
+  }
+
+  return uuid;
+}
+
+var _default = stringify;
+exports["default"] = _default;
+
+/***/ }),
+
+/***/ 8628:
+/***/ ((__unused_webpack_module, exports, __nccwpck_require__) => {
+
+"use strict";
+
+
+Object.defineProperty(exports, "__esModule", ({
+  value: true
+}));
+exports["default"] = void 0;
+
+var _rng = _interopRequireDefault(__nccwpck_require__(807));
+
+var _stringify = _interopRequireDefault(__nccwpck_require__(8950));
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+
+// **`v1()` - Generate time-based UUID**
+//
+// Inspired by https://github.com/LiosK/UUID.js
+// and http://docs.python.org/library/uuid.html
+let _nodeId;
+
+let _clockseq; // Previous uuid creation time
+
+
+let _lastMSecs = 0;
+let _lastNSecs = 0; // See https://github.com/uuidjs/uuid for API details
+
+function v1(options, buf, offset) {
+  let i = buf && offset || 0;
+  const b = buf || new Array(16);
+  options = options || {};
+  let node = options.node || _nodeId;
+  let clockseq = options.clockseq !== undefined ? options.clockseq : _clockseq; // node and clockseq need to be initialized to random values if they're not
+  // specified.  We do this lazily to minimize issues related to insufficient
+  // system entropy.  See #189
+
+  if (node == null || clockseq == null) {
+    const seedBytes = options.random || (options.rng || _rng.default)();
+
+    if (node == null) {
+      // Per 4.5, create and 48-bit node id, (47 random bits + multicast bit = 1)
+      node = _nodeId = [seedBytes[0] | 0x01, seedBytes[1], seedBytes[2], seedBytes[3], seedBytes[4], seedBytes[5]];
+    }
+
+    if (clockseq == null) {
+      // Per 4.2.2, randomize (14 bit) clockseq
+      clockseq = _clockseq = (seedBytes[6] << 8 | seedBytes[7]) & 0x3fff;
+    }
+  } // UUID timestamps are 100 nano-second units since the Gregorian epoch,
+  // (1582-10-15 00:00).  JSNumbers aren't precise enough for this, so
+  // time is handled internally as 'msecs' (integer milliseconds) and 'nsecs'
+  // (100-nanoseconds offset from msecs) since unix epoch, 1970-01-01 00:00.
+
+
+  let msecs = options.msecs !== undefined ? options.msecs : Date.now(); // Per 4.2.1.2, use count of uuid's generated during the current clock
+  // cycle to simulate higher resolution clock
+
+  let nsecs = options.nsecs !== undefined ? options.nsecs : _lastNSecs + 1; // Time since last uuid creation (in msecs)
+
+  const dt = msecs - _lastMSecs + (nsecs - _lastNSecs) / 10000; // Per 4.2.1.2, Bump clockseq on clock regression
+
+  if (dt < 0 && options.clockseq === undefined) {
+    clockseq = clockseq + 1 & 0x3fff;
+  } // Reset nsecs if clock regresses (new clockseq) or we've moved onto a new
+  // time interval
+
+
+  if ((dt < 0 || msecs > _lastMSecs) && options.nsecs === undefined) {
+    nsecs = 0;
+  } // Per 4.2.1.2 Throw error if too many uuids are requested
+
+
+  if (nsecs >= 10000) {
+    throw new Error("uuid.v1(): Can't create more than 10M uuids/sec");
+  }
+
+  _lastMSecs = msecs;
+  _lastNSecs = nsecs;
+  _clockseq = clockseq; // Per 4.1.4 - Convert from unix epoch to Gregorian epoch
+
+  msecs += 12219292800000; // `time_low`
+
+  const tl = ((msecs & 0xfffffff) * 10000 + nsecs) % 0x100000000;
+  b[i++] = tl >>> 24 & 0xff;
+  b[i++] = tl >>> 16 & 0xff;
+  b[i++] = tl >>> 8 & 0xff;
+  b[i++] = tl & 0xff; // `time_mid`
+
+  const tmh = msecs / 0x100000000 * 10000 & 0xfffffff;
+  b[i++] = tmh >>> 8 & 0xff;
+  b[i++] = tmh & 0xff; // `time_high_and_version`
+
+  b[i++] = tmh >>> 24 & 0xf | 0x10; // include version
+
+  b[i++] = tmh >>> 16 & 0xff; // `clock_seq_hi_and_reserved` (Per 4.2.2 - include variant)
+
+  b[i++] = clockseq >>> 8 | 0x80; // `clock_seq_low`
+
+  b[i++] = clockseq & 0xff; // `node`
+
+  for (let n = 0; n < 6; ++n) {
+    b[i + n] = node[n];
+  }
+
+  return buf || (0, _stringify.default)(b);
+}
+
+var _default = v1;
+exports["default"] = _default;
+
+/***/ }),
+
+/***/ 6409:
+/***/ ((__unused_webpack_module, exports, __nccwpck_require__) => {
+
+"use strict";
+
+
+Object.defineProperty(exports, "__esModule", ({
+  value: true
+}));
+exports["default"] = void 0;
+
+var _v = _interopRequireDefault(__nccwpck_require__(5998));
+
+var _md = _interopRequireDefault(__nccwpck_require__(4569));
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+
+const v3 = (0, _v.default)('v3', 0x30, _md.default);
+var _default = v3;
+exports["default"] = _default;
+
+/***/ }),
+
+/***/ 5998:
+/***/ ((__unused_webpack_module, exports, __nccwpck_require__) => {
+
+"use strict";
+
+
+Object.defineProperty(exports, "__esModule", ({
+  value: true
+}));
+exports["default"] = _default;
+exports.URL = exports.DNS = void 0;
+
+var _stringify = _interopRequireDefault(__nccwpck_require__(8950));
+
+var _parse = _interopRequireDefault(__nccwpck_require__(2746));
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+
+function stringToBytes(str) {
+  str = unescape(encodeURIComponent(str)); // UTF8 escape
+
+  const bytes = [];
+
+  for (let i = 0; i < str.length; ++i) {
+    bytes.push(str.charCodeAt(i));
+  }
+
+  return bytes;
+}
+
+const DNS = '6ba7b810-9dad-11d1-80b4-00c04fd430c8';
+exports.DNS = DNS;
+const URL = '6ba7b811-9dad-11d1-80b4-00c04fd430c8';
+exports.URL = URL;
+
+function _default(name, version, hashfunc) {
+  function generateUUID(value, namespace, buf, offset) {
+    if (typeof value === 'string') {
+      value = stringToBytes(value);
+    }
+
+    if (typeof namespace === 'string') {
+      namespace = (0, _parse.default)(namespace);
+    }
+
+    if (namespace.length !== 16) {
+      throw TypeError('Namespace must be array-like (16 iterable integer values, 0-255)');
+    } // Compute hash of namespace and value, Per 4.3
+    // Future: Use spread syntax when supported on all platforms, e.g. `bytes =
+    // hashfunc([...namespace, ... value])`
+
+
+    let bytes = new Uint8Array(16 + value.length);
+    bytes.set(namespace);
+    bytes.set(value, namespace.length);
+    bytes = hashfunc(bytes);
+    bytes[6] = bytes[6] & 0x0f | version;
+    bytes[8] = bytes[8] & 0x3f | 0x80;
+
+    if (buf) {
+      offset = offset || 0;
+
+      for (let i = 0; i < 16; ++i) {
+        buf[offset + i] = bytes[i];
+      }
+
+      return buf;
+    }
+
+    return (0, _stringify.default)(bytes);
+  } // Function#name is not settable on some platforms (#270)
+
+
+  try {
+    generateUUID.name = name; // eslint-disable-next-line no-empty
+  } catch (err) {} // For CommonJS default export support
+
+
+  generateUUID.DNS = DNS;
+  generateUUID.URL = URL;
+  return generateUUID;
+}
+
+/***/ }),
+
+/***/ 5122:
+/***/ ((__unused_webpack_module, exports, __nccwpck_require__) => {
+
+"use strict";
+
+
+Object.defineProperty(exports, "__esModule", ({
+  value: true
+}));
+exports["default"] = void 0;
+
+var _rng = _interopRequireDefault(__nccwpck_require__(807));
+
+var _stringify = _interopRequireDefault(__nccwpck_require__(8950));
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+
+function v4(options, buf, offset) {
+  options = options || {};
+
+  const rnds = options.random || (options.rng || _rng.default)(); // Per 4.4, set bits for version and `clock_seq_hi_and_reserved`
+
+
+  rnds[6] = rnds[6] & 0x0f | 0x40;
+  rnds[8] = rnds[8] & 0x3f | 0x80; // Copy bytes to buffer, if provided
+
+  if (buf) {
+    offset = offset || 0;
+
+    for (let i = 0; i < 16; ++i) {
+      buf[offset + i] = rnds[i];
+    }
+
+    return buf;
+  }
+
+  return (0, _stringify.default)(rnds);
+}
+
+var _default = v4;
+exports["default"] = _default;
+
+/***/ }),
+
+/***/ 9120:
+/***/ ((__unused_webpack_module, exports, __nccwpck_require__) => {
+
+"use strict";
+
+
+Object.defineProperty(exports, "__esModule", ({
+  value: true
+}));
+exports["default"] = void 0;
+
+var _v = _interopRequireDefault(__nccwpck_require__(5998));
+
+var _sha = _interopRequireDefault(__nccwpck_require__(5274));
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+
+const v5 = (0, _v.default)('v5', 0x50, _sha.default);
+var _default = v5;
+exports["default"] = _default;
+
+/***/ }),
+
+/***/ 6900:
+/***/ ((__unused_webpack_module, exports, __nccwpck_require__) => {
+
+"use strict";
+
+
+Object.defineProperty(exports, "__esModule", ({
+  value: true
+}));
+exports["default"] = void 0;
+
+var _regex = _interopRequireDefault(__nccwpck_require__(814));
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+
+function validate(uuid) {
+  return typeof uuid === 'string' && _regex.default.test(uuid);
+}
+
+var _default = validate;
+exports["default"] = _default;
+
+/***/ }),
+
+/***/ 1595:
+/***/ ((__unused_webpack_module, exports, __nccwpck_require__) => {
+
+"use strict";
+
+
+Object.defineProperty(exports, "__esModule", ({
+  value: true
+}));
+exports["default"] = void 0;
+
+var _validate = _interopRequireDefault(__nccwpck_require__(6900));
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+
+function version(uuid) {
+  if (!(0, _validate.default)(uuid)) {
+    throw TypeError('Invalid UUID');
+  }
+
+  return parseInt(uuid.substr(14, 1), 16);
+}
+
+var _default = version;
+exports["default"] = _default;
+
+/***/ }),
+
+/***/ 1452:
+/***/ (function(__unused_webpack_module, exports) {
+
+/**
+ * @license
+ * web-streams-polyfill v3.3.3
+ * Copyright 2024 Mattias Buelens, Diwank Singh Tomer and other contributors.
+ * This code is released under the MIT license.
+ * SPDX-License-Identifier: MIT
+ */
+(function (global, factory) {
+     true ? factory(exports) :
+    0;
+})(this, (function (exports) { 'use strict';
+
+    function noop() {
+        return undefined;
+    }
+
+    function typeIsObject(x) {
+        return (typeof x === 'object' && x !== null) || typeof x === 'function';
+    }
+    const rethrowAssertionErrorRejection = noop;
+    function setFunctionName(fn, name) {
+        try {
+            Object.defineProperty(fn, 'name', {
+                value: name,
+                configurable: true
+            });
+        }
+        catch (_a) {
+            // This property is non-configurable in older browsers, so ignore if this throws.
+            // https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Function/name#browser_compatibility
+        }
+    }
+
+    const originalPromise = Promise;
+    const originalPromiseThen = Promise.prototype.then;
+    const originalPromiseReject = Promise.reject.bind(originalPromise);
+    // https://webidl.spec.whatwg.org/#a-new-promise
+    function newPromise(executor) {
+        return new originalPromise(executor);
+    }
+    // https://webidl.spec.whatwg.org/#a-promise-resolved-with
+    function promiseResolvedWith(value) {
+        return newPromise(resolve => resolve(value));
+    }
+    // https://webidl.spec.whatwg.org/#a-promise-rejected-with
+    function promiseRejectedWith(reason) {
+        return originalPromiseReject(reason);
+    }
+    function PerformPromiseThen(promise, onFulfilled, onRejected) {
+        // There doesn't appear to be any way to correctly emulate the behaviour from JavaScript, so this is just an
+        // approximation.
+        return originalPromiseThen.call(promise, onFulfilled, onRejected);
+    }
+    // Bluebird logs a warning when a promise is created within a fulfillment handler, but then isn't returned
+    // from that handler. To prevent this, return null instead of void from all handlers.
+    // http://bluebirdjs.com/docs/warning-explanations.html#warning-a-promise-was-created-in-a-handler-but-was-not-returned-from-it
+    function uponPromise(promise, onFulfilled, onRejected) {
+        PerformPromiseThen(PerformPromiseThen(promise, onFulfilled, onRejected), undefined, rethrowAssertionErrorRejection);
+    }
+    function uponFulfillment(promise, onFulfilled) {
+        uponPromise(promise, onFulfilled);
+    }
+    function uponRejection(promise, onRejected) {
+        uponPromise(promise, undefined, onRejected);
+    }
+    function transformPromiseWith(promise, fulfillmentHandler, rejectionHandler) {
+        return PerformPromiseThen(promise, fulfillmentHandler, rejectionHandler);
+    }
+    function setPromiseIsHandledToTrue(promise) {
+        PerformPromiseThen(promise, undefined, rethrowAssertionErrorRejection);
+    }
+    let _queueMicrotask = callback => {
+        if (typeof queueMicrotask === 'function') {
+            _queueMicrotask = queueMicrotask;
+        }
+        else {
+            const resolvedPromise = promiseResolvedWith(undefined);
+            _queueMicrotask = cb => PerformPromiseThen(resolvedPromise, cb);
+        }
+        return _queueMicrotask(callback);
+    };
+    function reflectCall(F, V, args) {
+        if (typeof F !== 'function') {
+            throw new TypeError('Argument is not a function');
+        }
+        return Function.prototype.apply.call(F, V, args);
+    }
+    function promiseCall(F, V, args) {
+        try {
+            return promiseResolvedWith(reflectCall(F, V, args));
+        }
+        catch (value) {
+            return promiseRejectedWith(value);
+        }
+    }
+
+    // Original from Chromium
+    // https://chromium.googlesource.com/chromium/src/+/0aee4434a4dba42a42abaea9bfbc0cd196a63bc1/third_party/blink/renderer/core/streams/SimpleQueue.js
+    const QUEUE_MAX_ARRAY_SIZE = 16384;
+    /**
+     * Simple queue structure.
+     *
+     * Avoids scalability issues with using a packed array directly by using
+     * multiple arrays in a linked list and keeping the array size bounded.
+     */
+    class SimpleQueue {
+        constructor() {
+            this._cursor = 0;
+            this._size = 0;
+            // _front and _back are always defined.
+            this._front = {
+                _elements: [],
+                _next: undefined
+            };
+            this._back = this._front;
+            // The cursor is used to avoid calling Array.shift().
+            // It contains the index of the front element of the array inside the
+            // front-most node. It is always in the range [0, QUEUE_MAX_ARRAY_SIZE).
+            this._cursor = 0;
+            // When there is only one node, size === elements.length - cursor.
+            this._size = 0;
+        }
+        get length() {
+            return this._size;
+        }
+        // For exception safety, this method is structured in order:
+        // 1. Read state
+        // 2. Calculate required state mutations
+        // 3. Perform state mutations
+        push(element) {
+            const oldBack = this._back;
+            let newBack = oldBack;
+            if (oldBack._elements.length === QUEUE_MAX_ARRAY_SIZE - 1) {
+                newBack = {
+                    _elements: [],
+                    _next: undefined
+                };
+            }
+            // push() is the mutation most likely to throw an exception, so it
+            // goes first.
+            oldBack._elements.push(element);
+            if (newBack !== oldBack) {
+                this._back = newBack;
+                oldBack._next = newBack;
+            }
+            ++this._size;
+        }
+        // Like push(), shift() follows the read -> calculate -> mutate pattern for
+        // exception safety.
+        shift() { // must not be called on an empty queue
+            const oldFront = this._front;
+            let newFront = oldFront;
+            const oldCursor = this._cursor;
+            let newCursor = oldCursor + 1;
+            const elements = oldFront._elements;
+            const element = elements[oldCursor];
+            if (newCursor === QUEUE_MAX_ARRAY_SIZE) {
+                newFront = oldFront._next;
+                newCursor = 0;
+            }
+            // No mutations before this point.
+            --this._size;
+            this._cursor = newCursor;
+            if (oldFront !== newFront) {
+                this._front = newFront;
+            }
+            // Permit shifted element to be garbage collected.
+            elements[oldCursor] = undefined;
+            return element;
+        }
+        // The tricky thing about forEach() is that it can be called
+        // re-entrantly. The queue may be mutated inside the callback. It is easy to
+        // see that push() within the callback has no negative effects since the end
+        // of the queue is checked for on every iteration. If shift() is called
+        // repeatedly within the callback then the next iteration may return an
+        // element that has been removed. In this case the callback will be called
+        // with undefined values until we either "catch up" with elements that still
+        // exist or reach the back of the queue.
+        forEach(callback) {
+            let i = this._cursor;
+            let node = this._front;
+            let elements = node._elements;
+            while (i !== elements.length || node._next !== undefined) {
+                if (i === elements.length) {
+                    node = node._next;
+                    elements = node._elements;
+                    i = 0;
+                    if (elements.length === 0) {
+                        break;
+                    }
+                }
+                callback(elements[i]);
+                ++i;
+            }
+        }
+        // Return the element that would be returned if shift() was called now,
+        // without modifying the queue.
+        peek() { // must not be called on an empty queue
+            const front = this._front;
+            const cursor = this._cursor;
+            return front._elements[cursor];
+        }
+    }
+
+    const AbortSteps = Symbol('[[AbortSteps]]');
+    const ErrorSteps = Symbol('[[ErrorSteps]]');
+    const CancelSteps = Symbol('[[CancelSteps]]');
+    const PullSteps = Symbol('[[PullSteps]]');
+    const ReleaseSteps = Symbol('[[ReleaseSteps]]');
+
+    function ReadableStreamReaderGenericInitialize(reader, stream) {
+        reader._ownerReadableStream = stream;
+        stream._reader = reader;
+        if (stream._state === 'readable') {
+            defaultReaderClosedPromiseInitialize(reader);
+        }
+        else if (stream._state === 'closed') {
+            defaultReaderClosedPromiseInitializeAsResolved(reader);
+        }
+        else {
+            defaultReaderClosedPromiseInitializeAsRejected(reader, stream._storedError);
+        }
+    }
+    // A client of ReadableStreamDefaultReader and ReadableStreamBYOBReader may use these functions directly to bypass state
+    // check.
+    function ReadableStreamReaderGenericCancel(reader, reason) {
+        const stream = reader._ownerReadableStream;
+        return ReadableStreamCancel(stream, reason);
+    }
+    function ReadableStreamReaderGenericRelease(reader) {
+        const stream = reader._ownerReadableStream;
+        if (stream._state === 'readable') {
+            defaultReaderClosedPromiseReject(reader, new TypeError(`Reader was released and can no longer be used to monitor the stream's closedness`));
+        }
+        else {
+            defaultReaderClosedPromiseResetToRejected(reader, new TypeError(`Reader was released and can no longer be used to monitor the stream's closedness`));
+        }
+        stream._readableStreamController[ReleaseSteps]();
+        stream._reader = undefined;
+        reader._ownerReadableStream = undefined;
+    }
+    // Helper functions for the readers.
+    function readerLockException(name) {
+        return new TypeError('Cannot ' + name + ' a stream using a released reader');
+    }
+    // Helper functions for the ReadableStreamDefaultReader.
+    function defaultReaderClosedPromiseInitialize(reader) {
+        reader._closedPromise = newPromise((resolve, reject) => {
+            reader._closedPromise_resolve = resolve;
+            reader._closedPromise_reject = reject;
+        });
+    }
+    function defaultReaderClosedPromiseInitializeAsRejected(reader, reason) {
+        defaultReaderClosedPromiseInitialize(reader);
+        defaultReaderClosedPromiseReject(reader, reason);
+    }
+    function defaultReaderClosedPromiseInitializeAsResolved(reader) {
+        defaultReaderClosedPromiseInitialize(reader);
+        defaultReaderClosedPromiseResolve(reader);
+    }
+    function defaultReaderClosedPromiseReject(reader, reason) {
+        if (reader._closedPromise_reject === undefined) {
+            return;
+        }
+        setPromiseIsHandledToTrue(reader._closedPromise);
+        reader._closedPromise_reject(reason);
+        reader._closedPromise_resolve = undefined;
+        reader._closedPromise_reject = undefined;
+    }
+    function defaultReaderClosedPromiseResetToRejected(reader, reason) {
+        defaultReaderClosedPromiseInitializeAsRejected(reader, reason);
+    }
+    function defaultReaderClosedPromiseResolve(reader) {
+        if (reader._closedPromise_resolve === undefined) {
+            return;
+        }
+        reader._closedPromise_resolve(undefined);
+        reader._closedPromise_resolve = undefined;
+        reader._closedPromise_reject = undefined;
+    }
+
+    /// <reference lib="es2015.core" />
+    // https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Number/isFinite#Polyfill
+    const NumberIsFinite = Number.isFinite || function (x) {
+        return typeof x === 'number' && isFinite(x);
+    };
+
+    /// <reference lib="es2015.core" />
+    // https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Math/trunc#Polyfill
+    const MathTrunc = Math.trunc || function (v) {
+        return v < 0 ? Math.ceil(v) : Math.floor(v);
+    };
+
+    // https://heycam.github.io/webidl/#idl-dictionaries
+    function isDictionary(x) {
+        return typeof x === 'object' || typeof x === 'function';
+    }
+    function assertDictionary(obj, context) {
+        if (obj !== undefined && !isDictionary(obj)) {
+            throw new TypeError(`${context} is not an object.`);
+        }
+    }
+    // https://heycam.github.io/webidl/#idl-callback-functions
+    function assertFunction(x, context) {
+        if (typeof x !== 'function') {
+            throw new TypeError(`${context} is not a function.`);
+        }
+    }
+    // https://heycam.github.io/webidl/#idl-object
+    function isObject(x) {
+        return (typeof x === 'object' && x !== null) || typeof x === 'function';
+    }
+    function assertObject(x, context) {
+        if (!isObject(x)) {
+            throw new TypeError(`${context} is not an object.`);
+        }
+    }
+    function assertRequiredArgument(x, position, context) {
+        if (x === undefined) {
+            throw new TypeError(`Parameter ${position} is required in '${context}'.`);
+        }
+    }
+    function assertRequiredField(x, field, context) {
+        if (x === undefined) {
+            throw new TypeError(`${field} is required in '${context}'.`);
+        }
+    }
+    // https://heycam.github.io/webidl/#idl-unrestricted-double
+    function convertUnrestrictedDouble(value) {
+        return Number(value);
+    }
+    function censorNegativeZero(x) {
+        return x === 0 ? 0 : x;
+    }
+    function integerPart(x) {
+        return censorNegativeZero(MathTrunc(x));
+    }
+    // https://heycam.github.io/webidl/#idl-unsigned-long-long
+    function convertUnsignedLongLongWithEnforceRange(value, context) {
+        const lowerBound = 0;
+        const upperBound = Number.MAX_SAFE_INTEGER;
+        let x = Number(value);
+        x = censorNegativeZero(x);
+        if (!NumberIsFinite(x)) {
+            throw new TypeError(`${context} is not a finite number`);
+        }
+        x = integerPart(x);
+        if (x < lowerBound || x > upperBound) {
+            throw new TypeError(`${context} is outside the accepted range of ${lowerBound} to ${upperBound}, inclusive`);
+        }
+        if (!NumberIsFinite(x) || x === 0) {
+            return 0;
+        }
+        // TODO Use BigInt if supported?
+        // let xBigInt = BigInt(integerPart(x));
+        // xBigInt = BigInt.asUintN(64, xBigInt);
+        // return Number(xBigInt);
+        return x;
+    }
+
+    function assertReadableStream(x, context) {
+        if (!IsReadableStream(x)) {
+            throw new TypeError(`${context} is not a ReadableStream.`);
+        }
+    }
+
+    // Abstract operations for the ReadableStream.
+    function AcquireReadableStreamDefaultReader(stream) {
+        return new ReadableStreamDefaultReader(stream);
+    }
+    // ReadableStream API exposed for controllers.
+    function ReadableStreamAddReadRequest(stream, readRequest) {
+        stream._reader._readRequests.push(readRequest);
+    }
+    function ReadableStreamFulfillReadRequest(stream, chunk, done) {
+        const reader = stream._reader;
+        const readRequest = reader._readRequests.shift();
+        if (done) {
+            readRequest._closeSteps();
+        }
+        else {
+            readRequest._chunkSteps(chunk);
+        }
+    }
+    function ReadableStreamGetNumReadRequests(stream) {
+        return stream._reader._readRequests.length;
+    }
+    function ReadableStreamHasDefaultReader(stream) {
+        const reader = stream._reader;
+        if (reader === undefined) {
+            return false;
+        }
+        if (!IsReadableStreamDefaultReader(reader)) {
+            return false;
+        }
+        return true;
+    }
+    /**
+     * A default reader vended by a {@link ReadableStream}.
+     *
+     * @public
+     */
+    class ReadableStreamDefaultReader {
+        constructor(stream) {
+            assertRequiredArgument(stream, 1, 'ReadableStreamDefaultReader');
+            assertReadableStream(stream, 'First parameter');
+            if (IsReadableStreamLocked(stream)) {
+                throw new TypeError('This stream has already been locked for exclusive reading by another reader');
+            }
+            ReadableStreamReaderGenericInitialize(this, stream);
+            this._readRequests = new SimpleQueue();
+        }
+        /**
+         * Returns a promise that will be fulfilled when the stream becomes closed,
+         * or rejected if the stream ever errors or the reader's lock is released before the stream finishes closing.
+         */
+        get closed() {
+            if (!IsReadableStreamDefaultReader(this)) {
+                return promiseRejectedWith(defaultReaderBrandCheckException('closed'));
+            }
+            return this._closedPromise;
+        }
+        /**
+         * If the reader is active, behaves the same as {@link ReadableStream.cancel | stream.cancel(reason)}.
+         */
+        cancel(reason = undefined) {
+            if (!IsReadableStreamDefaultReader(this)) {
+                return promiseRejectedWith(defaultReaderBrandCheckException('cancel'));
+            }
+            if (this._ownerReadableStream === undefined) {
+                return promiseRejectedWith(readerLockException('cancel'));
+            }
+            return ReadableStreamReaderGenericCancel(this, reason);
+        }
+        /**
+         * Returns a promise that allows access to the next chunk from the stream's internal queue, if available.
+         *
+         * If reading a chunk causes the queue to become empty, more data will be pulled from the underlying source.
+         */
+        read() {
+            if (!IsReadableStreamDefaultReader(this)) {
+                return promiseRejectedWith(defaultReaderBrandCheckException('read'));
+            }
+            if (this._ownerReadableStream === undefined) {
+                return promiseRejectedWith(readerLockException('read from'));
+            }
+            let resolvePromise;
+            let rejectPromise;
+            const promise = newPromise((resolve, reject) => {
+                resolvePromise = resolve;
+                rejectPromise = reject;
+            });
+            const readRequest = {
+                _chunkSteps: chunk => resolvePromise({ value: chunk, done: false }),
+                _closeSteps: () => resolvePromise({ value: undefined, done: true }),
+                _errorSteps: e => rejectPromise(e)
+            };
+            ReadableStreamDefaultReaderRead(this, readRequest);
+            return promise;
+        }
+        /**
+         * Releases the reader's lock on the corresponding stream. After the lock is released, the reader is no longer active.
+         * If the associated stream is errored when the lock is released, the reader will appear errored in the same way
+         * from now on; otherwise, the reader will appear closed.
+         *
+         * A reader's lock cannot be released while it still has a pending read request, i.e., if a promise returned by
+         * the reader's {@link ReadableStreamDefaultReader.read | read()} method has not yet been settled. Attempting to
+         * do so will throw a `TypeError` and leave the reader locked to the stream.
+         */
+        releaseLock() {
+            if (!IsReadableStreamDefaultReader(this)) {
+                throw defaultReaderBrandCheckException('releaseLock');
+            }
+            if (this._ownerReadableStream === undefined) {
+                return;
+            }
+            ReadableStreamDefaultReaderRelease(this);
+        }
+    }
+    Object.defineProperties(ReadableStreamDefaultReader.prototype, {
+        cancel: { enumerable: true },
+        read: { enumerable: true },
+        releaseLock: { enumerable: true },
+        closed: { enumerable: true }
+    });
+    setFunctionName(ReadableStreamDefaultReader.prototype.cancel, 'cancel');
+    setFunctionName(ReadableStreamDefaultReader.prototype.read, 'read');
+    setFunctionName(ReadableStreamDefaultReader.prototype.releaseLock, 'releaseLock');
+    if (typeof Symbol.toStringTag === 'symbol') {
+        Object.defineProperty(ReadableStreamDefaultReader.prototype, Symbol.toStringTag, {
+            value: 'ReadableStreamDefaultReader',
+            configurable: true
+        });
+    }
+    // Abstract operations for the readers.
+    function IsReadableStreamDefaultReader(x) {
+        if (!typeIsObject(x)) {
+            return false;
+        }
+        if (!Object.prototype.hasOwnProperty.call(x, '_readRequests')) {
+            return false;
+        }
+        return x instanceof ReadableStreamDefaultReader;
+    }
+    function ReadableStreamDefaultReaderRead(reader, readRequest) {
+        const stream = reader._ownerReadableStream;
+        stream._disturbed = true;
+        if (stream._state === 'closed') {
+            readRequest._closeSteps();
+        }
+        else if (stream._state === 'errored') {
+            readRequest._errorSteps(stream._storedError);
+        }
+        else {
+            stream._readableStreamController[PullSteps](readRequest);
+        }
+    }
+    function ReadableStreamDefaultReaderRelease(reader) {
+        ReadableStreamReaderGenericRelease(reader);
+        const e = new TypeError('Reader was released');
+        ReadableStreamDefaultReaderErrorReadRequests(reader, e);
+    }
+    function ReadableStreamDefaultReaderErrorReadRequests(reader, e) {
+        const readRequests = reader._readRequests;
+        reader._readRequests = new SimpleQueue();
+        readRequests.forEach(readRequest => {
+            readRequest._errorSteps(e);
+        });
+    }
+    // Helper functions for the ReadableStreamDefaultReader.
+    function defaultReaderBrandCheckException(name) {
+        return new TypeError(`ReadableStreamDefaultReader.prototype.${name} can only be used on a ReadableStreamDefaultReader`);
+    }
+
+    /// <reference lib="es2018.asynciterable" />
+    /* eslint-disable @typescript-eslint/no-empty-function */
+    const AsyncIteratorPrototype = Object.getPrototypeOf(Object.getPrototypeOf(async function* () { }).prototype);
+
+    /// <reference lib="es2018.asynciterable" />
+    class ReadableStreamAsyncIteratorImpl {
+        constructor(reader, preventCancel) {
+            this._ongoingPromise = undefined;
+            this._isFinished = false;
+            this._reader = reader;
+            this._preventCancel = preventCancel;
+        }
+        next() {
+            const nextSteps = () => this._nextSteps();
+            this._ongoingPromise = this._ongoingPromise ?
+                transformPromiseWith(this._ongoingPromise, nextSteps, nextSteps) :
+                nextSteps();
+            return this._ongoingPromise;
+        }
+        return(value) {
+            const returnSteps = () => this._returnSteps(value);
+            return this._ongoingPromise ?
+                transformPromiseWith(this._ongoingPromise, returnSteps, returnSteps) :
+                returnSteps();
+        }
+        _nextSteps() {
+            if (this._isFinished) {
+                return Promise.resolve({ value: undefined, done: true });
+            }
+            const reader = this._reader;
+            let resolvePromise;
+            let rejectPromise;
+            const promise = newPromise((resolve, reject) => {
+                resolvePromise = resolve;
+                rejectPromise = reject;
+            });
+            const readRequest = {
+                _chunkSteps: chunk => {
+                    this._ongoingPromise = undefined;
+                    // This needs to be delayed by one microtask, otherwise we stop pulling too early which breaks a test.
+                    // FIXME Is this a bug in the specification, or in the test?
+                    _queueMicrotask(() => resolvePromise({ value: chunk, done: false }));
+                },
+                _closeSteps: () => {
+                    this._ongoingPromise = undefined;
+                    this._isFinished = true;
+                    ReadableStreamReaderGenericRelease(reader);
+                    resolvePromise({ value: undefined, done: true });
+                },
+                _errorSteps: reason => {
+                    this._ongoingPromise = undefined;
+                    this._isFinished = true;
+                    ReadableStreamReaderGenericRelease(reader);
+                    rejectPromise(reason);
+                }
+            };
+            ReadableStreamDefaultReaderRead(reader, readRequest);
+            return promise;
+        }
+        _returnSteps(value) {
+            if (this._isFinished) {
+                return Promise.resolve({ value, done: true });
+            }
+            this._isFinished = true;
+            const reader = this._reader;
+            if (!this._preventCancel) {
+                const result = ReadableStreamReaderGenericCancel(reader, value);
+                ReadableStreamReaderGenericRelease(reader);
+                return transformPromiseWith(result, () => ({ value, done: true }));
+            }
+            ReadableStreamReaderGenericRelease(reader);
+            return promiseResolvedWith({ value, done: true });
+        }
+    }
+    const ReadableStreamAsyncIteratorPrototype = {
+        next() {
+            if (!IsReadableStreamAsyncIterator(this)) {
+                return promiseRejectedWith(streamAsyncIteratorBrandCheckException('next'));
+            }
+            return this._asyncIteratorImpl.next();
+        },
+        return(value) {
+            if (!IsReadableStreamAsyncIterator(this)) {
+                return promiseRejectedWith(streamAsyncIteratorBrandCheckException('return'));
+            }
+            return this._asyncIteratorImpl.return(value);
+        }
+    };
+    Object.setPrototypeOf(ReadableStreamAsyncIteratorPrototype, AsyncIteratorPrototype);
+    // Abstract operations for the ReadableStream.
+    function AcquireReadableStreamAsyncIterator(stream, preventCancel) {
+        const reader = AcquireReadableStreamDefaultReader(stream);
+        const impl = new ReadableStreamAsyncIteratorImpl(reader, preventCancel);
+        const iterator = Object.create(ReadableStreamAsyncIteratorPrototype);
+        iterator._asyncIteratorImpl = impl;
+        return iterator;
+    }
+    function IsReadableStreamAsyncIterator(x) {
+        if (!typeIsObject(x)) {
+            return false;
+        }
+        if (!Object.prototype.hasOwnProperty.call(x, '_asyncIteratorImpl')) {
+            return false;
+        }
+        try {
+            // noinspection SuspiciousTypeOfGuard
+            return x._asyncIteratorImpl instanceof
+                ReadableStreamAsyncIteratorImpl;
+        }
+        catch (_a) {
+            return false;
+        }
+    }
+    // Helper functions for the ReadableStream.
+    function streamAsyncIteratorBrandCheckException(name) {
+        return new TypeError(`ReadableStreamAsyncIterator.${name} can only be used on a ReadableSteamAsyncIterator`);
+    }
+
+    /// <reference lib="es2015.core" />
+    // https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Number/isNaN#Polyfill
+    const NumberIsNaN = Number.isNaN || function (x) {
+        // eslint-disable-next-line no-self-compare
+        return x !== x;
+    };
+
+    var _a, _b, _c;
+    function CreateArrayFromList(elements) {
+        // We use arrays to represent lists, so this is basically a no-op.
+        // Do a slice though just in case we happen to depend on the unique-ness.
+        return elements.slice();
+    }
+    function CopyDataBlockBytes(dest, destOffset, src, srcOffset, n) {
+        new Uint8Array(dest).set(new Uint8Array(src, srcOffset, n), destOffset);
+    }
+    let TransferArrayBuffer = (O) => {
+        if (typeof O.transfer === 'function') {
+            TransferArrayBuffer = buffer => buffer.transfer();
+        }
+        else if (typeof structuredClone === 'function') {
+            TransferArrayBuffer = buffer => structuredClone(buffer, { transfer: [buffer] });
+        }
+        else {
+            // Not implemented correctly
+            TransferArrayBuffer = buffer => buffer;
+        }
+        return TransferArrayBuffer(O);
+    };
+    let IsDetachedBuffer = (O) => {
+        if (typeof O.detached === 'boolean') {
+            IsDetachedBuffer = buffer => buffer.detached;
+        }
+        else {
+            // Not implemented correctly
+            IsDetachedBuffer = buffer => buffer.byteLength === 0;
+        }
+        return IsDetachedBuffer(O);
+    };
+    function ArrayBufferSlice(buffer, begin, end) {
+        // ArrayBuffer.prototype.slice is not available on IE10
+        // https://www.caniuse.com/mdn-javascript_builtins_arraybuffer_slice
+        if (buffer.slice) {
+            return buffer.slice(begin, end);
+        }
+        const length = end - begin;
+        const slice = new ArrayBuffer(length);
+        CopyDataBlockBytes(slice, 0, buffer, begin, length);
+        return slice;
+    }
+    function GetMethod(receiver, prop) {
+        const func = receiver[prop];
+        if (func === undefined || func === null) {
+            return undefined;
+        }
+        if (typeof func !== 'function') {
+            throw new TypeError(`${String(prop)} is not a function`);
+        }
+        return func;
+    }
+    function CreateAsyncFromSyncIterator(syncIteratorRecord) {
+        // Instead of re-implementing CreateAsyncFromSyncIterator and %AsyncFromSyncIteratorPrototype%,
+        // we use yield* inside an async generator function to achieve the same result.
+        // Wrap the sync iterator inside a sync iterable, so we can use it with yield*.
+        const syncIterable = {
+            [Symbol.iterator]: () => syncIteratorRecord.iterator
+        };
+        // Create an async generator function and immediately invoke it.
+        const asyncIterator = (async function* () {
+            return yield* syncIterable;
+        }());
+        // Return as an async iterator record.
+        const nextMethod = asyncIterator.next;
+        return { iterator: asyncIterator, nextMethod, done: false };
+    }
+    // Aligns with core-js/modules/es.symbol.async-iterator.js
+    const SymbolAsyncIterator = (_c = (_a = Symbol.asyncIterator) !== null && _a !== void 0 ? _a : (_b = Symbol.for) === null || _b === void 0 ? void 0 : _b.call(Symbol, 'Symbol.asyncIterator')) !== null && _c !== void 0 ? _c : '@@asyncIterator';
+    function GetIterator(obj, hint = 'sync', method) {
+        if (method === undefined) {
+            if (hint === 'async') {
+                method = GetMethod(obj, SymbolAsyncIterator);
+                if (method === undefined) {
+                    const syncMethod = GetMethod(obj, Symbol.iterator);
+                    const syncIteratorRecord = GetIterator(obj, 'sync', syncMethod);
+                    return CreateAsyncFromSyncIterator(syncIteratorRecord);
+                }
+            }
+            else {
+                method = GetMethod(obj, Symbol.iterator);
+            }
+        }
+        if (method === undefined) {
+            throw new TypeError('The object is not iterable');
+        }
+        const iterator = reflectCall(method, obj, []);
+        if (!typeIsObject(iterator)) {
+            throw new TypeError('The iterator method must return an object');
+        }
+        const nextMethod = iterator.next;
+        return { iterator, nextMethod, done: false };
+    }
+    function IteratorNext(iteratorRecord) {
+        const result = reflectCall(iteratorRecord.nextMethod, iteratorRecord.iterator, []);
+        if (!typeIsObject(result)) {
+            throw new TypeError('The iterator.next() method must return an object');
+        }
+        return result;
+    }
+    function IteratorComplete(iterResult) {
+        return Boolean(iterResult.done);
+    }
+    function IteratorValue(iterResult) {
+        return iterResult.value;
+    }
+
+    function IsNonNegativeNumber(v) {
+        if (typeof v !== 'number') {
+            return false;
+        }
+        if (NumberIsNaN(v)) {
+            return false;
+        }
+        if (v < 0) {
+            return false;
+        }
+        return true;
+    }
+    function CloneAsUint8Array(O) {
+        const buffer = ArrayBufferSlice(O.buffer, O.byteOffset, O.byteOffset + O.byteLength);
+        return new Uint8Array(buffer);
+    }
+
+    function DequeueValue(container) {
+        const pair = container._queue.shift();
+        container._queueTotalSize -= pair.size;
+        if (container._queueTotalSize < 0) {
+            container._queueTotalSize = 0;
+        }
+        return pair.value;
+    }
+    function EnqueueValueWithSize(container, value, size) {
+        if (!IsNonNegativeNumber(size) || size === Infinity) {
+            throw new RangeError('Size must be a finite, non-NaN, non-negative number.');
+        }
+        container._queue.push({ value, size });
+        container._queueTotalSize += size;
+    }
+    function PeekQueueValue(container) {
+        const pair = container._queue.peek();
+        return pair.value;
+    }
+    function ResetQueue(container) {
+        container._queue = new SimpleQueue();
+        container._queueTotalSize = 0;
+    }
+
+    function isDataViewConstructor(ctor) {
+        return ctor === DataView;
+    }
+    function isDataView(view) {
+        return isDataViewConstructor(view.constructor);
+    }
+    function arrayBufferViewElementSize(ctor) {
+        if (isDataViewConstructor(ctor)) {
+            return 1;
+        }
+        return ctor.BYTES_PER_ELEMENT;
+    }
+
+    /**
+     * A pull-into request in a {@link ReadableByteStreamController}.
+     *
+     * @public
+     */
+    class ReadableStreamBYOBRequest {
+        constructor() {
+            throw new TypeError('Illegal constructor');
+        }
+        /**
+         * Returns the view for writing in to, or `null` if the BYOB request has already been responded to.
+         */
+        get view() {
+            if (!IsReadableStreamBYOBRequest(this)) {
+                throw byobRequestBrandCheckException('view');
+            }
+            return this._view;
+        }
+        respond(bytesWritten) {
+            if (!IsReadableStreamBYOBRequest(this)) {
+                throw byobRequestBrandCheckException('respond');
+            }
+            assertRequiredArgument(bytesWritten, 1, 'respond');
+            bytesWritten = convertUnsignedLongLongWithEnforceRange(bytesWritten, 'First parameter');
+            if (this._associatedReadableByteStreamController === undefined) {
+                throw new TypeError('This BYOB request has been invalidated');
+            }
+            if (IsDetachedBuffer(this._view.buffer)) {
+                throw new TypeError(`The BYOB request's buffer has been detached and so cannot be used as a response`);
+            }
+            ReadableByteStreamControllerRespond(this._associatedReadableByteStreamController, bytesWritten);
+        }
+        respondWithNewView(view) {
+            if (!IsReadableStreamBYOBRequest(this)) {
+                throw byobRequestBrandCheckException('respondWithNewView');
+            }
+            assertRequiredArgument(view, 1, 'respondWithNewView');
+            if (!ArrayBuffer.isView(view)) {
+                throw new TypeError('You can only respond with array buffer views');
+            }
+            if (this._associatedReadableByteStreamController === undefined) {
+                throw new TypeError('This BYOB request has been invalidated');
+            }
+            if (IsDetachedBuffer(view.buffer)) {
+                throw new TypeError('The given view\'s buffer has been detached and so cannot be used as a response');
+            }
+            ReadableByteStreamControllerRespondWithNewView(this._associatedReadableByteStreamController, view);
+        }
+    }
+    Object.defineProperties(ReadableStreamBYOBRequest.prototype, {
+        respond: { enumerable: true },
+        respondWithNewView: { enumerable: true },
+        view: { enumerable: true }
+    });
+    setFunctionName(ReadableStreamBYOBRequest.prototype.respond, 'respond');
+    setFunctionName(ReadableStreamBYOBRequest.prototype.respondWithNewView, 'respondWithNewView');
+    if (typeof Symbol.toStringTag === 'symbol') {
+        Object.defineProperty(ReadableStreamBYOBRequest.prototype, Symbol.toStringTag, {
+            value: 'ReadableStreamBYOBRequest',
+            configurable: true
+        });
+    }
+    /**
+     * Allows control of a {@link ReadableStream | readable byte stream}'s state and internal queue.
+     *
+     * @public
+     */
+    class ReadableByteStreamController {
+        constructor() {
+            throw new TypeError('Illegal constructor');
+        }
+        /**
+         * Returns the current BYOB pull request, or `null` if there isn't one.
+         */
+        get byobRequest() {
+            if (!IsReadableByteStreamController(this)) {
+                throw byteStreamControllerBrandCheckException('byobRequest');
+            }
+            return ReadableByteStreamControllerGetBYOBRequest(this);
+        }
+        /**
+         * Returns the desired size to fill the controlled stream's internal queue. It can be negative, if the queue is
+         * over-full. An underlying byte source ought to use this information to determine when and how to apply backpressure.
+         */
+        get desiredSize() {
+            if (!IsReadableByteStreamController(this)) {
+                throw byteStreamControllerBrandCheckException('desiredSize');
+            }
+            return ReadableByteStreamControllerGetDesiredSize(this);
+        }
+        /**
+         * Closes the controlled readable stream. Consumers will still be able to read any previously-enqueued chunks from
+         * the stream, but once those are read, the stream will become closed.
+         */
+        close() {
+            if (!IsReadableByteStreamController(this)) {
+                throw byteStreamControllerBrandCheckException('close');
+            }
+            if (this._closeRequested) {
+                throw new TypeError('The stream has already been closed; do not close it again!');
+            }
+            const state = this._controlledReadableByteStream._state;
+            if (state !== 'readable') {
+                throw new TypeError(`The stream (in ${state} state) is not in the readable state and cannot be closed`);
+            }
+            ReadableByteStreamControllerClose(this);
+        }
+        enqueue(chunk) {
+            if (!IsReadableByteStreamController(this)) {
+                throw byteStreamControllerBrandCheckException('enqueue');
+            }
+            assertRequiredArgument(chunk, 1, 'enqueue');
+            if (!ArrayBuffer.isView(chunk)) {
+                throw new TypeError('chunk must be an array buffer view');
+            }
+            if (chunk.byteLength === 0) {
+                throw new TypeError('chunk must have non-zero byteLength');
+            }
+            if (chunk.buffer.byteLength === 0) {
+                throw new TypeError(`chunk's buffer must have non-zero byteLength`);
+            }
+            if (this._closeRequested) {
+                throw new TypeError('stream is closed or draining');
+            }
+            const state = this._controlledReadableByteStream._state;
+            if (state !== 'readable') {
+                throw new TypeError(`The stream (in ${state} state) is not in the readable state and cannot be enqueued to`);
+            }
+            ReadableByteStreamControllerEnqueue(this, chunk);
+        }
+        /**
+         * Errors the controlled readable stream, making all future interactions with it fail with the given error `e`.
+         */
+        error(e = undefined) {
+            if (!IsReadableByteStreamController(this)) {
+                throw byteStreamControllerBrandCheckException('error');
+            }
+            ReadableByteStreamControllerError(this, e);
+        }
+        /** @internal */
+        [CancelSteps](reason) {
+            ReadableByteStreamControllerClearPendingPullIntos(this);
+            ResetQueue(this);
+            const result = this._cancelAlgorithm(reason);
+            ReadableByteStreamControllerClearAlgorithms(this);
+            return result;
+        }
+        /** @internal */
+        [PullSteps](readRequest) {
+            const stream = this._controlledReadableByteStream;
+            if (this._queueTotalSize > 0) {
+                ReadableByteStreamControllerFillReadRequestFromQueue(this, readRequest);
+                return;
+            }
+            const autoAllocateChunkSize = this._autoAllocateChunkSize;
+            if (autoAllocateChunkSize !== undefined) {
+                let buffer;
+                try {
+                    buffer = new ArrayBuffer(autoAllocateChunkSize);
+                }
+                catch (bufferE) {
+                    readRequest._errorSteps(bufferE);
+                    return;
+                }
+                const pullIntoDescriptor = {
+                    buffer,
+                    bufferByteLength: autoAllocateChunkSize,
+                    byteOffset: 0,
+                    byteLength: autoAllocateChunkSize,
+                    bytesFilled: 0,
+                    minimumFill: 1,
+                    elementSize: 1,
+                    viewConstructor: Uint8Array,
+                    readerType: 'default'
+                };
+                this._pendingPullIntos.push(pullIntoDescriptor);
+            }
+            ReadableStreamAddReadRequest(stream, readRequest);
+            ReadableByteStreamControllerCallPullIfNeeded(this);
+        }
+        /** @internal */
+        [ReleaseSteps]() {
+            if (this._pendingPullIntos.length > 0) {
+                const firstPullInto = this._pendingPullIntos.peek();
+                firstPullInto.readerType = 'none';
+                this._pendingPullIntos = new SimpleQueue();
+                this._pendingPullIntos.push(firstPullInto);
+            }
+        }
+    }
+    Object.defineProperties(ReadableByteStreamController.prototype, {
+        close: { enumerable: true },
+        enqueue: { enumerable: true },
+        error: { enumerable: true },
+        byobRequest: { enumerable: true },
+        desiredSize: { enumerable: true }
+    });
+    setFunctionName(ReadableByteStreamController.prototype.close, 'close');
+    setFunctionName(ReadableByteStreamController.prototype.enqueue, 'enqueue');
+    setFunctionName(ReadableByteStreamController.prototype.error, 'error');
+    if (typeof Symbol.toStringTag === 'symbol') {
+        Object.defineProperty(ReadableByteStreamController.prototype, Symbol.toStringTag, {
+            value: 'ReadableByteStreamController',
+            configurable: true
+        });
+    }
+    // Abstract operations for the ReadableByteStreamController.
+    function IsReadableByteStreamController(x) {
+        if (!typeIsObject(x)) {
+            return false;
+        }
+        if (!Object.prototype.hasOwnProperty.call(x, '_controlledReadableByteStream')) {
+            return false;
+        }
+        return x instanceof ReadableByteStreamController;
+    }
+    function IsReadableStreamBYOBRequest(x) {
+        if (!typeIsObject(x)) {
+            return false;
+        }
+        if (!Object.prototype.hasOwnProperty.call(x, '_associatedReadableByteStreamController')) {
+            return false;
+        }
+        return x instanceof ReadableStreamBYOBRequest;
+    }
+    function ReadableByteStreamControllerCallPullIfNeeded(controller) {
+        const shouldPull = ReadableByteStreamControllerShouldCallPull(controller);
+        if (!shouldPull) {
+            return;
+        }
+        if (controller._pulling) {
+            controller._pullAgain = true;
+            return;
+        }
+        controller._pulling = true;
+        // TODO: Test controller argument
+        const pullPromise = controller._pullAlgorithm();
+        uponPromise(pullPromise, () => {
+            controller._pulling = false;
+            if (controller._pullAgain) {
+                controller._pullAgain = false;
+                ReadableByteStreamControllerCallPullIfNeeded(controller);
+            }
+            return null;
+        }, e => {
+            ReadableByteStreamControllerError(controller, e);
+            return null;
+        });
+    }
+    function ReadableByteStreamControllerClearPendingPullIntos(controller) {
+        ReadableByteStreamControllerInvalidateBYOBRequest(controller);
+        controller._pendingPullIntos = new SimpleQueue();
+    }
+    function ReadableByteStreamControllerCommitPullIntoDescriptor(stream, pullIntoDescriptor) {
+        let done = false;
+        if (stream._state === 'closed') {
+            done = true;
+        }
+        const filledView = ReadableByteStreamControllerConvertPullIntoDescriptor(pullIntoDescriptor);
+        if (pullIntoDescriptor.readerType === 'default') {
+            ReadableStreamFulfillReadRequest(stream, filledView, done);
+        }
+        else {
+            ReadableStreamFulfillReadIntoRequest(stream, filledView, done);
+        }
+    }
+    function ReadableByteStreamControllerConvertPullIntoDescriptor(pullIntoDescriptor) {
+        const bytesFilled = pullIntoDescriptor.bytesFilled;
+        const elementSize = pullIntoDescriptor.elementSize;
+        return new pullIntoDescriptor.viewConstructor(pullIntoDescriptor.buffer, pullIntoDescriptor.byteOffset, bytesFilled / elementSize);
+    }
+    function ReadableByteStreamControllerEnqueueChunkToQueue(controller, buffer, byteOffset, byteLength) {
+        controller._queue.push({ buffer, byteOffset, byteLength });
+        controller._queueTotalSize += byteLength;
+    }
+    function ReadableByteStreamControllerEnqueueClonedChunkToQueue(controller, buffer, byteOffset, byteLength) {
+        let clonedChunk;
+        try {
+            clonedChunk = ArrayBufferSlice(buffer, byteOffset, byteOffset + byteLength);
+        }
+        catch (cloneE) {
+            ReadableByteStreamControllerError(controller, cloneE);
+            throw cloneE;
+        }
+        ReadableByteStreamControllerEnqueueChunkToQueue(controller, clonedChunk, 0, byteLength);
+    }
+    function ReadableByteStreamControllerEnqueueDetachedPullIntoToQueue(controller, firstDescriptor) {
+        if (firstDescriptor.bytesFilled > 0) {
+            ReadableByteStreamControllerEnqueueClonedChunkToQueue(controller, firstDescriptor.buffer, firstDescriptor.byteOffset, firstDescriptor.bytesFilled);
+        }
+        ReadableByteStreamControllerShiftPendingPullInto(controller);
+    }
+    function ReadableByteStreamControllerFillPullIntoDescriptorFromQueue(controller, pullIntoDescriptor) {
+        const maxBytesToCopy = Math.min(controller._queueTotalSize, pullIntoDescriptor.byteLength - pullIntoDescriptor.bytesFilled);
+        const maxBytesFilled = pullIntoDescriptor.bytesFilled + maxBytesToCopy;
+        let totalBytesToCopyRemaining = maxBytesToCopy;
+        let ready = false;
+        const remainderBytes = maxBytesFilled % pullIntoDescriptor.elementSize;
+        const maxAlignedBytes = maxBytesFilled - remainderBytes;
+        // A descriptor for a read() request that is not yet filled up to its minimum length will stay at the head
+        // of the queue, so the underlying source can keep filling it.
+        if (maxAlignedBytes >= pullIntoDescriptor.minimumFill) {
+            totalBytesToCopyRemaining = maxAlignedBytes - pullIntoDescriptor.bytesFilled;
+            ready = true;
+        }
+        const queue = controller._queue;
+        while (totalBytesToCopyRemaining > 0) {
+            const headOfQueue = queue.peek();
+            const bytesToCopy = Math.min(totalBytesToCopyRemaining, headOfQueue.byteLength);
+            const destStart = pullIntoDescriptor.byteOffset + pullIntoDescriptor.bytesFilled;
+            CopyDataBlockBytes(pullIntoDescriptor.buffer, destStart, headOfQueue.buffer, headOfQueue.byteOffset, bytesToCopy);
+            if (headOfQueue.byteLength === bytesToCopy) {
+                queue.shift();
+            }
+            else {
+                headOfQueue.byteOffset += bytesToCopy;
+                headOfQueue.byteLength -= bytesToCopy;
+            }
+            controller._queueTotalSize -= bytesToCopy;
+            ReadableByteStreamControllerFillHeadPullIntoDescriptor(controller, bytesToCopy, pullIntoDescriptor);
+            totalBytesToCopyRemaining -= bytesToCopy;
+        }
+        return ready;
+    }
+    function ReadableByteStreamControllerFillHeadPullIntoDescriptor(controller, size, pullIntoDescriptor) {
+        pullIntoDescriptor.bytesFilled += size;
+    }
+    function ReadableByteStreamControllerHandleQueueDrain(controller) {
+        if (controller._queueTotalSize === 0 && controller._closeRequested) {
+            ReadableByteStreamControllerClearAlgorithms(controller);
+            ReadableStreamClose(controller._controlledReadableByteStream);
+        }
+        else {
+            ReadableByteStreamControllerCallPullIfNeeded(controller);
+        }
+    }
+    function ReadableByteStreamControllerInvalidateBYOBRequest(controller) {
+        if (controller._byobRequest === null) {
+            return;
+        }
+        controller._byobRequest._associatedReadableByteStreamController = undefined;
+        controller._byobRequest._view = null;
+        controller._byobRequest = null;
+    }
+    function ReadableByteStreamControllerProcessPullIntoDescriptorsUsingQueue(controller) {
+        while (controller._pendingPullIntos.length > 0) {
+            if (controller._queueTotalSize === 0) {
+                return;
+            }
+            const pullIntoDescriptor = controller._pendingPullIntos.peek();
+            if (ReadableByteStreamControllerFillPullIntoDescriptorFromQueue(controller, pullIntoDescriptor)) {
+                ReadableByteStreamControllerShiftPendingPullInto(controller);
+                ReadableByteStreamControllerCommitPullIntoDescriptor(controller._controlledReadableByteStream, pullIntoDescriptor);
+            }
+        }
+    }
+    function ReadableByteStreamControllerProcessReadRequestsUsingQueue(controller) {
+        const reader = controller._controlledReadableByteStream._reader;
+        while (reader._readRequests.length > 0) {
+            if (controller._queueTotalSize === 0) {
+                return;
+            }
+            const readRequest = reader._readRequests.shift();
+            ReadableByteStreamControllerFillReadRequestFromQueue(controller, readRequest);
+        }
+    }
+    function ReadableByteStreamControllerPullInto(controller, view, min, readIntoRequest) {
+        const stream = controller._controlledReadableByteStream;
+        const ctor = view.constructor;
+        const elementSize = arrayBufferViewElementSize(ctor);
+        const { byteOffset, byteLength } = view;
+        const minimumFill = min * elementSize;
+        let buffer;
+        try {
+            buffer = TransferArrayBuffer(view.buffer);
+        }
+        catch (e) {
+            readIntoRequest._errorSteps(e);
+            return;
+        }
+        const pullIntoDescriptor = {
+            buffer,
+            bufferByteLength: buffer.byteLength,
+            byteOffset,
+            byteLength,
+            bytesFilled: 0,
+            minimumFill,
+            elementSize,
+            viewConstructor: ctor,
+            readerType: 'byob'
+        };
+        if (controller._pendingPullIntos.length > 0) {
+            controller._pendingPullIntos.push(pullIntoDescriptor);
+            // No ReadableByteStreamControllerCallPullIfNeeded() call since:
+            // - No change happens on desiredSize
+            // - The source has already been notified of that there's at least 1 pending read(view)
+            ReadableStreamAddReadIntoRequest(stream, readIntoRequest);
+            return;
+        }
+        if (stream._state === 'closed') {
+            const emptyView = new ctor(pullIntoDescriptor.buffer, pullIntoDescriptor.byteOffset, 0);
+            readIntoRequest._closeSteps(emptyView);
+            return;
+        }
+        if (controller._queueTotalSize > 0) {
+            if (ReadableByteStreamControllerFillPullIntoDescriptorFromQueue(controller, pullIntoDescriptor)) {
+                const filledView = ReadableByteStreamControllerConvertPullIntoDescriptor(pullIntoDescriptor);
+                ReadableByteStreamControllerHandleQueueDrain(controller);
+                readIntoRequest._chunkSteps(filledView);
+                return;
+            }
+            if (controller._closeRequested) {
+                const e = new TypeError('Insufficient bytes to fill elements in the given buffer');
+                ReadableByteStreamControllerError(controller, e);
+                readIntoRequest._errorSteps(e);
+                return;
+            }
+        }
+        controller._pendingPullIntos.push(pullIntoDescriptor);
+        ReadableStreamAddReadIntoRequest(stream, readIntoRequest);
+        ReadableByteStreamControllerCallPullIfNeeded(controller);
+    }
+    function ReadableByteStreamControllerRespondInClosedState(controller, firstDescriptor) {
+        if (firstDescriptor.readerType === 'none') {
+            ReadableByteStreamControllerShiftPendingPullInto(controller);
+        }
+        const stream = controller._controlledReadableByteStream;
+        if (ReadableStreamHasBYOBReader(stream)) {
+            while (ReadableStreamGetNumReadIntoRequests(stream) > 0) {
+                const pullIntoDescriptor = ReadableByteStreamControllerShiftPendingPullInto(controller);
+                ReadableByteStreamControllerCommitPullIntoDescriptor(stream, pullIntoDescriptor);
+            }
+        }
+    }
+    function ReadableByteStreamControllerRespondInReadableState(controller, bytesWritten, pullIntoDescriptor) {
+        ReadableByteStreamControllerFillHeadPullIntoDescriptor(controller, bytesWritten, pullIntoDescriptor);
+        if (pullIntoDescriptor.readerType === 'none') {
+            ReadableByteStreamControllerEnqueueDetachedPullIntoToQueue(controller, pullIntoDescriptor);
+            ReadableByteStreamControllerProcessPullIntoDescriptorsUsingQueue(controller);
+            return;
+        }
+        if (pullIntoDescriptor.bytesFilled < pullIntoDescriptor.minimumFill) {
+            // A descriptor for a read() request that is not yet filled up to its minimum length will stay at the head
+            // of the queue, so the underlying source can keep filling it.
+            return;
+        }
+        ReadableByteStreamControllerShiftPendingPullInto(controller);
+        const remainderSize = pullIntoDescriptor.bytesFilled % pullIntoDescriptor.elementSize;
+        if (remainderSize > 0) {
+            const end = pullIntoDescriptor.byteOffset + pullIntoDescriptor.bytesFilled;
+            ReadableByteStreamControllerEnqueueClonedChunkToQueue(controller, pullIntoDescriptor.buffer, end - remainderSize, remainderSize);
+        }
+        pullIntoDescriptor.bytesFilled -= remainderSize;
+        ReadableByteStreamControllerCommitPullIntoDescriptor(controller._controlledReadableByteStream, pullIntoDescriptor);
+        ReadableByteStreamControllerProcessPullIntoDescriptorsUsingQueue(controller);
+    }
+    function ReadableByteStreamControllerRespondInternal(controller, bytesWritten) {
+        const firstDescriptor = controller._pendingPullIntos.peek();
+        ReadableByteStreamControllerInvalidateBYOBRequest(controller);
+        const state = controller._controlledReadableByteStream._state;
+        if (state === 'closed') {
+            ReadableByteStreamControllerRespondInClosedState(controller, firstDescriptor);
+        }
+        else {
+            ReadableByteStreamControllerRespondInReadableState(controller, bytesWritten, firstDescriptor);
+        }
+        ReadableByteStreamControllerCallPullIfNeeded(controller);
+    }
+    function ReadableByteStreamControllerShiftPendingPullInto(controller) {
+        const descriptor = controller._pendingPullIntos.shift();
+        return descriptor;
+    }
+    function ReadableByteStreamControllerShouldCallPull(controller) {
+        const stream = controller._controlledReadableByteStream;
+        if (stream._state !== 'readable') {
+            return false;
+        }
+        if (controller._closeRequested) {
+            return false;
+        }
+        if (!controller._started) {
+            return false;
+        }
+        if (ReadableStreamHasDefaultReader(stream) && ReadableStreamGetNumReadRequests(stream) > 0) {
+            return true;
+        }
+        if (ReadableStreamHasBYOBReader(stream) && ReadableStreamGetNumReadIntoRequests(stream) > 0) {
+            return true;
+        }
+        const desiredSize = ReadableByteStreamControllerGetDesiredSize(controller);
+        if (desiredSize > 0) {
+            return true;
+        }
+        return false;
+    }
+    function ReadableByteStreamControllerClearAlgorithms(controller) {
+        controller._pullAlgorithm = undefined;
+        controller._cancelAlgorithm = undefined;
+    }
+    // A client of ReadableByteStreamController may use these functions directly to bypass state check.
+    function ReadableByteStreamControllerClose(controller) {
+        const stream = controller._controlledReadableByteStream;
+        if (controller._closeRequested || stream._state !== 'readable') {
+            return;
+        }
+        if (controller._queueTotalSize > 0) {
+            controller._closeRequested = true;
+            return;
+        }
+        if (controller._pendingPullIntos.length > 0) {
+            const firstPendingPullInto = controller._pendingPullIntos.peek();
+            if (firstPendingPullInto.bytesFilled % firstPendingPullInto.elementSize !== 0) {
+                const e = new TypeError('Insufficient bytes to fill elements in the given buffer');
+                ReadableByteStreamControllerError(controller, e);
+                throw e;
+            }
+        }
+        ReadableByteStreamControllerClearAlgorithms(controller);
+        ReadableStreamClose(stream);
+    }
+    function ReadableByteStreamControllerEnqueue(controller, chunk) {
+        const stream = controller._controlledReadableByteStream;
+        if (controller._closeRequested || stream._state !== 'readable') {
+            return;
+        }
+        const { buffer, byteOffset, byteLength } = chunk;
+        if (IsDetachedBuffer(buffer)) {
+            throw new TypeError('chunk\'s buffer is detached and so cannot be enqueued');
+        }
+        const transferredBuffer = TransferArrayBuffer(buffer);
+        if (controller._pendingPullIntos.length > 0) {
+            const firstPendingPullInto = controller._pendingPullIntos.peek();
+            if (IsDetachedBuffer(firstPendingPullInto.buffer)) {
+                throw new TypeError('The BYOB request\'s buffer has been detached and so cannot be filled with an enqueued chunk');
+            }
+            ReadableByteStreamControllerInvalidateBYOBRequest(controller);
+            firstPendingPullInto.buffer = TransferArrayBuffer(firstPendingPullInto.buffer);
+            if (firstPendingPullInto.readerType === 'none') {
+                ReadableByteStreamControllerEnqueueDetachedPullIntoToQueue(controller, firstPendingPullInto);
+            }
+        }
+        if (ReadableStreamHasDefaultReader(stream)) {
+            ReadableByteStreamControllerProcessReadRequestsUsingQueue(controller);
+            if (ReadableStreamGetNumReadRequests(stream) === 0) {
+                ReadableByteStreamControllerEnqueueChunkToQueue(controller, transferredBuffer, byteOffset, byteLength);
+            }
+            else {
+                if (controller._pendingPullIntos.length > 0) {
+                    ReadableByteStreamControllerShiftPendingPullInto(controller);
+                }
+                const transferredView = new Uint8Array(transferredBuffer, byteOffset, byteLength);
+                ReadableStreamFulfillReadRequest(stream, transferredView, false);
+            }
+        }
+        else if (ReadableStreamHasBYOBReader(stream)) {
+            // TODO: Ideally in this branch detaching should happen only if the buffer is not consumed fully.
+            ReadableByteStreamControllerEnqueueChunkToQueue(controller, transferredBuffer, byteOffset, byteLength);
+            ReadableByteStreamControllerProcessPullIntoDescriptorsUsingQueue(controller);
+        }
+        else {
+            ReadableByteStreamControllerEnqueueChunkToQueue(controller, transferredBuffer, byteOffset, byteLength);
+        }
+        ReadableByteStreamControllerCallPullIfNeeded(controller);
+    }
+    function ReadableByteStreamControllerError(controller, e) {
+        const stream = controller._controlledReadableByteStream;
+        if (stream._state !== 'readable') {
+            return;
+        }
+        ReadableByteStreamControllerClearPendingPullIntos(controller);
+        ResetQueue(controller);
+        ReadableByteStreamControllerClearAlgorithms(controller);
+        ReadableStreamError(stream, e);
+    }
+    function ReadableByteStreamControllerFillReadRequestFromQueue(controller, readRequest) {
+        const entry = controller._queue.shift();
+        controller._queueTotalSize -= entry.byteLength;
+        ReadableByteStreamControllerHandleQueueDrain(controller);
+        const view = new Uint8Array(entry.buffer, entry.byteOffset, entry.byteLength);
+        readRequest._chunkSteps(view);
+    }
+    function ReadableByteStreamControllerGetBYOBRequest(controller) {
+        if (controller._byobRequest === null && controller._pendingPullIntos.length > 0) {
+            const firstDescriptor = controller._pendingPullIntos.peek();
+            const view = new Uint8Array(firstDescriptor.buffer, firstDescriptor.byteOffset + firstDescriptor.bytesFilled, firstDescriptor.byteLength - firstDescriptor.bytesFilled);
+            const byobRequest = Object.create(ReadableStreamBYOBRequest.prototype);
+            SetUpReadableStreamBYOBRequest(byobRequest, controller, view);
+            controller._byobRequest = byobRequest;
+        }
+        return controller._byobRequest;
+    }
+    function ReadableByteStreamControllerGetDesiredSize(controller) {
+        const state = controller._controlledReadableByteStream._state;
+        if (state === 'errored') {
+            return null;
+        }
+        if (state === 'closed') {
+            return 0;
+        }
+        return controller._strategyHWM - controller._queueTotalSize;
+    }
+    function ReadableByteStreamControllerRespond(controller, bytesWritten) {
+        const firstDescriptor = controller._pendingPullIntos.peek();
+        const state = controller._controlledReadableByteStream._state;
+        if (state === 'closed') {
+            if (bytesWritten !== 0) {
+                throw new TypeError('bytesWritten must be 0 when calling respond() on a closed stream');
+            }
+        }
+        else {
+            if (bytesWritten === 0) {
+                throw new TypeError('bytesWritten must be greater than 0 when calling respond() on a readable stream');
+            }
+            if (firstDescriptor.bytesFilled + bytesWritten > firstDescriptor.byteLength) {
+                throw new RangeError('bytesWritten out of range');
+            }
+        }
+        firstDescriptor.buffer = TransferArrayBuffer(firstDescriptor.buffer);
+        ReadableByteStreamControllerRespondInternal(controller, bytesWritten);
+    }
+    function ReadableByteStreamControllerRespondWithNewView(controller, view) {
+        const firstDescriptor = controller._pendingPullIntos.peek();
+        const state = controller._controlledReadableByteStream._state;
+        if (state === 'closed') {
+            if (view.byteLength !== 0) {
+                throw new TypeError('The view\'s length must be 0 when calling respondWithNewView() on a closed stream');
+            }
+        }
+        else {
+            if (view.byteLength === 0) {
+                throw new TypeError('The view\'s length must be greater than 0 when calling respondWithNewView() on a readable stream');
+            }
+        }
+        if (firstDescriptor.byteOffset + firstDescriptor.bytesFilled !== view.byteOffset) {
+            throw new RangeError('The region specified by view does not match byobRequest');
+        }
+        if (firstDescriptor.bufferByteLength !== view.buffer.byteLength) {
+            throw new RangeError('The buffer of view has different capacity than byobRequest');
+        }
+        if (firstDescriptor.bytesFilled + view.byteLength > firstDescriptor.byteLength) {
+            throw new RangeError('The region specified by view is larger than byobRequest');
+        }
+        const viewByteLength = view.byteLength;
+        firstDescriptor.buffer = TransferArrayBuffer(view.buffer);
+        ReadableByteStreamControllerRespondInternal(controller, viewByteLength);
+    }
+    function SetUpReadableByteStreamController(stream, controller, startAlgorithm, pullAlgorithm, cancelAlgorithm, highWaterMark, autoAllocateChunkSize) {
+        controller._controlledReadableByteStream = stream;
+        controller._pullAgain = false;
+        controller._pulling = false;
+        controller._byobRequest = null;
+        // Need to set the slots so that the assert doesn't fire. In the spec the slots already exist implicitly.
+        controller._queue = controller._queueTotalSize = undefined;
+        ResetQueue(controller);
+        controller._closeRequested = false;
+        controller._started = false;
+        controller._strategyHWM = highWaterMark;
+        controller._pullAlgorithm = pullAlgorithm;
+        controller._cancelAlgorithm = cancelAlgorithm;
+        controller._autoAllocateChunkSize = autoAllocateChunkSize;
+        controller._pendingPullIntos = new SimpleQueue();
+        stream._readableStreamController = controller;
+        const startResult = startAlgorithm();
+        uponPromise(promiseResolvedWith(startResult), () => {
+            controller._started = true;
+            ReadableByteStreamControllerCallPullIfNeeded(controller);
+            return null;
+        }, r => {
+            ReadableByteStreamControllerError(controller, r);
+            return null;
+        });
+    }
+    function SetUpReadableByteStreamControllerFromUnderlyingSource(stream, underlyingByteSource, highWaterMark) {
+        const controller = Object.create(ReadableByteStreamController.prototype);
+        let startAlgorithm;
+        let pullAlgorithm;
+        let cancelAlgorithm;
+        if (underlyingByteSource.start !== undefined) {
+            startAlgorithm = () => underlyingByteSource.start(controller);
+        }
+        else {
+            startAlgorithm = () => undefined;
+        }
+        if (underlyingByteSource.pull !== undefined) {
+            pullAlgorithm = () => underlyingByteSource.pull(controller);
+        }
+        else {
+            pullAlgorithm = () => promiseResolvedWith(undefined);
+        }
+        if (underlyingByteSource.cancel !== undefined) {
+            cancelAlgorithm = reason => underlyingByteSource.cancel(reason);
+        }
+        else {
+            cancelAlgorithm = () => promiseResolvedWith(undefined);
+        }
+        const autoAllocateChunkSize = underlyingByteSource.autoAllocateChunkSize;
+        if (autoAllocateChunkSize === 0) {
+            throw new TypeError('autoAllocateChunkSize must be greater than 0');
+        }
+        SetUpReadableByteStreamController(stream, controller, startAlgorithm, pullAlgorithm, cancelAlgorithm, highWaterMark, autoAllocateChunkSize);
+    }
+    function SetUpReadableStreamBYOBRequest(request, controller, view) {
+        request._associatedReadableByteStreamController = controller;
+        request._view = view;
+    }
+    // Helper functions for the ReadableStreamBYOBRequest.
+    function byobRequestBrandCheckException(name) {
+        return new TypeError(`ReadableStreamBYOBRequest.prototype.${name} can only be used on a ReadableStreamBYOBRequest`);
+    }
+    // Helper functions for the ReadableByteStreamController.
+    function byteStreamControllerBrandCheckException(name) {
+        return new TypeError(`ReadableByteStreamController.prototype.${name} can only be used on a ReadableByteStreamController`);
+    }
+
+    function convertReaderOptions(options, context) {
+        assertDictionary(options, context);
+        const mode = options === null || options === void 0 ? void 0 : options.mode;
+        return {
+            mode: mode === undefined ? undefined : convertReadableStreamReaderMode(mode, `${context} has member 'mode' that`)
+        };
+    }
+    function convertReadableStreamReaderMode(mode, context) {
+        mode = `${mode}`;
+        if (mode !== 'byob') {
+            throw new TypeError(`${context} '${mode}' is not a valid enumeration value for ReadableStreamReaderMode`);
+        }
+        return mode;
+    }
+    function convertByobReadOptions(options, context) {
+        var _a;
+        assertDictionary(options, context);
+        const min = (_a = options === null || options === void 0 ? void 0 : options.min) !== null && _a !== void 0 ? _a : 1;
+        return {
+            min: convertUnsignedLongLongWithEnforceRange(min, `${context} has member 'min' that`)
+        };
+    }
+
+    // Abstract operations for the ReadableStream.
+    function AcquireReadableStreamBYOBReader(stream) {
+        return new ReadableStreamBYOBReader(stream);
+    }
+    // ReadableStream API exposed for controllers.
+    function ReadableStreamAddReadIntoRequest(stream, readIntoRequest) {
+        stream._reader._readIntoRequests.push(readIntoRequest);
+    }
+    function ReadableStreamFulfillReadIntoRequest(stream, chunk, done) {
+        const reader = stream._reader;
+        const readIntoRequest = reader._readIntoRequests.shift();
+        if (done) {
+            readIntoRequest._closeSteps(chunk);
+        }
+        else {
+            readIntoRequest._chunkSteps(chunk);
+        }
+    }
+    function ReadableStreamGetNumReadIntoRequests(stream) {
+        return stream._reader._readIntoRequests.length;
+    }
+    function ReadableStreamHasBYOBReader(stream) {
+        const reader = stream._reader;
+        if (reader === undefined) {
+            return false;
+        }
+        if (!IsReadableStreamBYOBReader(reader)) {
+            return false;
+        }
+        return true;
+    }
+    /**
+     * A BYOB reader vended by a {@link ReadableStream}.
+     *
+     * @public
+     */
+    class ReadableStreamBYOBReader {
+        constructor(stream) {
+            assertRequiredArgument(stream, 1, 'ReadableStreamBYOBReader');
+            assertReadableStream(stream, 'First parameter');
+            if (IsReadableStreamLocked(stream)) {
+                throw new TypeError('This stream has already been locked for exclusive reading by another reader');
+            }
+            if (!IsReadableByteStreamController(stream._readableStreamController)) {
+                throw new TypeError('Cannot construct a ReadableStreamBYOBReader for a stream not constructed with a byte ' +
+                    'source');
+            }
+            ReadableStreamReaderGenericInitialize(this, stream);
+            this._readIntoRequests = new SimpleQueue();
+        }
+        /**
+         * Returns a promise that will be fulfilled when the stream becomes closed, or rejected if the stream ever errors or
+         * the reader's lock is released before the stream finishes closing.
+         */
+        get closed() {
+            if (!IsReadableStreamBYOBReader(this)) {
+                return promiseRejectedWith(byobReaderBrandCheckException('closed'));
+            }
+            return this._closedPromise;
+        }
+        /**
+         * If the reader is active, behaves the same as {@link ReadableStream.cancel | stream.cancel(reason)}.
+         */
+        cancel(reason = undefined) {
+            if (!IsReadableStreamBYOBReader(this)) {
+                return promiseRejectedWith(byobReaderBrandCheckException('cancel'));
+            }
+            if (this._ownerReadableStream === undefined) {
+                return promiseRejectedWith(readerLockException('cancel'));
+            }
+            return ReadableStreamReaderGenericCancel(this, reason);
+        }
+        read(view, rawOptions = {}) {
+            if (!IsReadableStreamBYOBReader(this)) {
+                return promiseRejectedWith(byobReaderBrandCheckException('read'));
+            }
+            if (!ArrayBuffer.isView(view)) {
+                return promiseRejectedWith(new TypeError('view must be an array buffer view'));
+            }
+            if (view.byteLength === 0) {
+                return promiseRejectedWith(new TypeError('view must have non-zero byteLength'));
+            }
+            if (view.buffer.byteLength === 0) {
+                return promiseRejectedWith(new TypeError(`view's buffer must have non-zero byteLength`));
+            }
+            if (IsDetachedBuffer(view.buffer)) {
+                return promiseRejectedWith(new TypeError('view\'s buffer has been detached'));
+            }
+            let options;
+            try {
+                options = convertByobReadOptions(rawOptions, 'options');
+            }
+            catch (e) {
+                return promiseRejectedWith(e);
+            }
+            const min = options.min;
+            if (min === 0) {
+                return promiseRejectedWith(new TypeError('options.min must be greater than 0'));
+            }
+            if (!isDataView(view)) {
+                if (min > view.length) {
+                    return promiseRejectedWith(new RangeError('options.min must be less than or equal to view\'s length'));
+                }
+            }
+            else if (min > view.byteLength) {
+                return promiseRejectedWith(new RangeError('options.min must be less than or equal to view\'s byteLength'));
+            }
+            if (this._ownerReadableStream === undefined) {
+                return promiseRejectedWith(readerLockException('read from'));
+            }
+            let resolvePromise;
+            let rejectPromise;
+            const promise = newPromise((resolve, reject) => {
+                resolvePromise = resolve;
+                rejectPromise = reject;
+            });
+            const readIntoRequest = {
+                _chunkSteps: chunk => resolvePromise({ value: chunk, done: false }),
+                _closeSteps: chunk => resolvePromise({ value: chunk, done: true }),
+                _errorSteps: e => rejectPromise(e)
+            };
+            ReadableStreamBYOBReaderRead(this, view, min, readIntoRequest);
+            return promise;
+        }
+        /**
+         * Releases the reader's lock on the corresponding stream. After the lock is released, the reader is no longer active.
+         * If the associated stream is errored when the lock is released, the reader will appear errored in the same way
+         * from now on; otherwise, the reader will appear closed.
+         *
+         * A reader's lock cannot be released while it still has a pending read request, i.e., if a promise returned by
+         * the reader's {@link ReadableStreamBYOBReader.read | read()} method has not yet been settled. Attempting to
+         * do so will throw a `TypeError` and leave the reader locked to the stream.
+         */
+        releaseLock() {
+            if (!IsReadableStreamBYOBReader(this)) {
+                throw byobReaderBrandCheckException('releaseLock');
+            }
+            if (this._ownerReadableStream === undefined) {
+                return;
+            }
+            ReadableStreamBYOBReaderRelease(this);
+        }
+    }
+    Object.defineProperties(ReadableStreamBYOBReader.prototype, {
+        cancel: { enumerable: true },
+        read: { enumerable: true },
+        releaseLock: { enumerable: true },
+        closed: { enumerable: true }
+    });
+    setFunctionName(ReadableStreamBYOBReader.prototype.cancel, 'cancel');
+    setFunctionName(ReadableStreamBYOBReader.prototype.read, 'read');
+    setFunctionName(ReadableStreamBYOBReader.prototype.releaseLock, 'releaseLock');
+    if (typeof Symbol.toStringTag === 'symbol') {
+        Object.defineProperty(ReadableStreamBYOBReader.prototype, Symbol.toStringTag, {
+            value: 'ReadableStreamBYOBReader',
+            configurable: true
+        });
+    }
+    // Abstract operations for the readers.
+    function IsReadableStreamBYOBReader(x) {
+        if (!typeIsObject(x)) {
+            return false;
+        }
+        if (!Object.prototype.hasOwnProperty.call(x, '_readIntoRequests')) {
+            return false;
+        }
+        return x instanceof ReadableStreamBYOBReader;
+    }
+    function ReadableStreamBYOBReaderRead(reader, view, min, readIntoRequest) {
+        const stream = reader._ownerReadableStream;
+        stream._disturbed = true;
+        if (stream._state === 'errored') {
+            readIntoRequest._errorSteps(stream._storedError);
+        }
+        else {
+            ReadableByteStreamControllerPullInto(stream._readableStreamController, view, min, readIntoRequest);
+        }
+    }
+    function ReadableStreamBYOBReaderRelease(reader) {
+        ReadableStreamReaderGenericRelease(reader);
+        const e = new TypeError('Reader was released');
+        ReadableStreamBYOBReaderErrorReadIntoRequests(reader, e);
+    }
+    function ReadableStreamBYOBReaderErrorReadIntoRequests(reader, e) {
+        const readIntoRequests = reader._readIntoRequests;
+        reader._readIntoRequests = new SimpleQueue();
+        readIntoRequests.forEach(readIntoRequest => {
+            readIntoRequest._errorSteps(e);
+        });
+    }
+    // Helper functions for the ReadableStreamBYOBReader.
+    function byobReaderBrandCheckException(name) {
+        return new TypeError(`ReadableStreamBYOBReader.prototype.${name} can only be used on a ReadableStreamBYOBReader`);
+    }
+
+    function ExtractHighWaterMark(strategy, defaultHWM) {
+        const { highWaterMark } = strategy;
+        if (highWaterMark === undefined) {
+            return defaultHWM;
+        }
+        if (NumberIsNaN(highWaterMark) || highWaterMark < 0) {
+            throw new RangeError('Invalid highWaterMark');
+        }
+        return highWaterMark;
+    }
+    function ExtractSizeAlgorithm(strategy) {
+        const { size } = strategy;
+        if (!size) {
+            return () => 1;
+        }
+        return size;
+    }
+
+    function convertQueuingStrategy(init, context) {
+        assertDictionary(init, context);
+        const highWaterMark = init === null || init === void 0 ? void 0 : init.highWaterMark;
+        const size = init === null || init === void 0 ? void 0 : init.size;
+        return {
+            highWaterMark: highWaterMark === undefined ? undefined : convertUnrestrictedDouble(highWaterMark),
+            size: size === undefined ? undefined : convertQueuingStrategySize(size, `${context} has member 'size' that`)
+        };
+    }
+    function convertQueuingStrategySize(fn, context) {
+        assertFunction(fn, context);
+        return chunk => convertUnrestrictedDouble(fn(chunk));
+    }
+
+    function convertUnderlyingSink(original, context) {
+        assertDictionary(original, context);
+        const abort = original === null || original === void 0 ? void 0 : original.abort;
+        const close = original === null || original === void 0 ? void 0 : original.close;
+        const start = original === null || original === void 0 ? void 0 : original.start;
+        const type = original === null || original === void 0 ? void 0 : original.type;
+        const write = original === null || original === void 0 ? void 0 : original.write;
+        return {
+            abort: abort === undefined ?
+                undefined :
+                convertUnderlyingSinkAbortCallback(abort, original, `${context} has member 'abort' that`),
+            close: close === undefined ?
+                undefined :
+                convertUnderlyingSinkCloseCallback(close, original, `${context} has member 'close' that`),
+            start: start === undefined ?
+                undefined :
+                convertUnderlyingSinkStartCallback(start, original, `${context} has member 'start' that`),
+            write: write === undefined ?
+                undefined :
+                convertUnderlyingSinkWriteCallback(write, original, `${context} has member 'write' that`),
+            type
+        };
+    }
+    function convertUnderlyingSinkAbortCallback(fn, original, context) {
+        assertFunction(fn, context);
+        return (reason) => promiseCall(fn, original, [reason]);
+    }
+    function convertUnderlyingSinkCloseCallback(fn, original, context) {
+        assertFunction(fn, context);
+        return () => promiseCall(fn, original, []);
+    }
+    function convertUnderlyingSinkStartCallback(fn, original, context) {
+        assertFunction(fn, context);
+        return (controller) => reflectCall(fn, original, [controller]);
+    }
+    function convertUnderlyingSinkWriteCallback(fn, original, context) {
+        assertFunction(fn, context);
+        return (chunk, controller) => promiseCall(fn, original, [chunk, controller]);
+    }
+
+    function assertWritableStream(x, context) {
+        if (!IsWritableStream(x)) {
+            throw new TypeError(`${context} is not a WritableStream.`);
+        }
+    }
+
+    function isAbortSignal(value) {
+        if (typeof value !== 'object' || value === null) {
+            return false;
+        }
+        try {
+            return typeof value.aborted === 'boolean';
+        }
+        catch (_a) {
+            // AbortSignal.prototype.aborted throws if its brand check fails
+            return false;
+        }
+    }
+    const supportsAbortController = typeof AbortController === 'function';
+    /**
+     * Construct a new AbortController, if supported by the platform.
+     *
+     * @internal
+     */
+    function createAbortController() {
+        if (supportsAbortController) {
+            return new AbortController();
+        }
+        return undefined;
+    }
+
+    /**
+     * A writable stream represents a destination for data, into which you can write.
+     *
+     * @public
+     */
+    class WritableStream {
+        constructor(rawUnderlyingSink = {}, rawStrategy = {}) {
+            if (rawUnderlyingSink === undefined) {
+                rawUnderlyingSink = null;
+            }
+            else {
+                assertObject(rawUnderlyingSink, 'First parameter');
+            }
+            const strategy = convertQueuingStrategy(rawStrategy, 'Second parameter');
+            const underlyingSink = convertUnderlyingSink(rawUnderlyingSink, 'First parameter');
+            InitializeWritableStream(this);
+            const type = underlyingSink.type;
+            if (type !== undefined) {
+                throw new RangeError('Invalid type is specified');
+            }
+            const sizeAlgorithm = ExtractSizeAlgorithm(strategy);
+            const highWaterMark = ExtractHighWaterMark(strategy, 1);
+            SetUpWritableStreamDefaultControllerFromUnderlyingSink(this, underlyingSink, highWaterMark, sizeAlgorithm);
+        }
+        /**
+         * Returns whether or not the writable stream is locked to a writer.
+         */
+        get locked() {
+            if (!IsWritableStream(this)) {
+                throw streamBrandCheckException$2('locked');
+            }
+            return IsWritableStreamLocked(this);
+        }
+        /**
+         * Aborts the stream, signaling that the producer can no longer successfully write to the stream and it is to be
+         * immediately moved to an errored state, with any queued-up writes discarded. This will also execute any abort
+         * mechanism of the underlying sink.
+         *
+         * The returned promise will fulfill if the stream shuts down successfully, or reject if the underlying sink signaled
+         * that there was an error doing so. Additionally, it will reject with a `TypeError` (without attempting to cancel
+         * the stream) if the stream is currently locked.
+         */
+        abort(reason = undefined) {
+            if (!IsWritableStream(this)) {
+                return promiseRejectedWith(streamBrandCheckException$2('abort'));
+            }
+            if (IsWritableStreamLocked(this)) {
+                return promiseRejectedWith(new TypeError('Cannot abort a stream that already has a writer'));
+            }
+            return WritableStreamAbort(this, reason);
+        }
+        /**
+         * Closes the stream. The underlying sink will finish processing any previously-written chunks, before invoking its
+         * close behavior. During this time any further attempts to write will fail (without erroring the stream).
+         *
+         * The method returns a promise that will fulfill if all remaining chunks are successfully written and the stream
+         * successfully closes, or rejects if an error is encountered during this process. Additionally, it will reject with
+         * a `TypeError` (without attempting to cancel the stream) if the stream is currently locked.
+         */
+        close() {
+            if (!IsWritableStream(this)) {
+                return promiseRejectedWith(streamBrandCheckException$2('close'));
+            }
+            if (IsWritableStreamLocked(this)) {
+                return promiseRejectedWith(new TypeError('Cannot close a stream that already has a writer'));
+            }
+            if (WritableStreamCloseQueuedOrInFlight(this)) {
+                return promiseRejectedWith(new TypeError('Cannot close an already-closing stream'));
+            }
+            return WritableStreamClose(this);
+        }
+        /**
+         * Creates a {@link WritableStreamDefaultWriter | writer} and locks the stream to the new writer. While the stream
+         * is locked, no other writer can be acquired until this one is released.
+         *
+         * This functionality is especially useful for creating abstractions that desire the ability to write to a stream
+         * without interruption or interleaving. By getting a writer for the stream, you can ensure nobody else can write at
+         * the same time, which would cause the resulting written data to be unpredictable and probably useless.
+         */
+        getWriter() {
+            if (!IsWritableStream(this)) {
+                throw streamBrandCheckException$2('getWriter');
+            }
+            return AcquireWritableStreamDefaultWriter(this);
+        }
+    }
+    Object.defineProperties(WritableStream.prototype, {
+        abort: { enumerable: true },
+        close: { enumerable: true },
+        getWriter: { enumerable: true },
+        locked: { enumerable: true }
+    });
+    setFunctionName(WritableStream.prototype.abort, 'abort');
+    setFunctionName(WritableStream.prototype.close, 'close');
+    setFunctionName(WritableStream.prototype.getWriter, 'getWriter');
+    if (typeof Symbol.toStringTag === 'symbol') {
+        Object.defineProperty(WritableStream.prototype, Symbol.toStringTag, {
+            value: 'WritableStream',
+            configurable: true
+        });
+    }
+    // Abstract operations for the WritableStream.
+    function AcquireWritableStreamDefaultWriter(stream) {
+        return new WritableStreamDefaultWriter(stream);
+    }
+    // Throws if and only if startAlgorithm throws.
+    function CreateWritableStream(startAlgorithm, writeAlgorithm, closeAlgorithm, abortAlgorithm, highWaterMark = 1, sizeAlgorithm = () => 1) {
+        const stream = Object.create(WritableStream.prototype);
+        InitializeWritableStream(stream);
+        const controller = Object.create(WritableStreamDefaultController.prototype);
+        SetUpWritableStreamDefaultController(stream, controller, startAlgorithm, writeAlgorithm, closeAlgorithm, abortAlgorithm, highWaterMark, sizeAlgorithm);
+        return stream;
+    }
+    function InitializeWritableStream(stream) {
+        stream._state = 'writable';
+        // The error that will be reported by new method calls once the state becomes errored. Only set when [[state]] is
+        // 'erroring' or 'errored'. May be set to an undefined value.
+        stream._storedError = undefined;
+        stream._writer = undefined;
+        // Initialize to undefined first because the constructor of the controller checks this
+        // variable to validate the caller.
+        stream._writableStreamController = undefined;
+        // This queue is placed here instead of the writer class in order to allow for passing a writer to the next data
+        // producer without waiting for the queued writes to finish.
+        stream._writeRequests = new SimpleQueue();
+        // Write requests are removed from _writeRequests when write() is called on the underlying sink. This prevents
+        // them from being erroneously rejected on error. If a write() call is in-flight, the request is stored here.
+        stream._inFlightWriteRequest = undefined;
+        // The promise that was returned from writer.close(). Stored here because it may be fulfilled after the writer
+        // has been detached.
+        stream._closeRequest = undefined;
+        // Close request is removed from _closeRequest when close() is called on the underlying sink. This prevents it
+        // from being erroneously rejected on error. If a close() call is in-flight, the request is stored here.
+        stream._inFlightCloseRequest = undefined;
+        // The promise that was returned from writer.abort(). This may also be fulfilled after the writer has detached.
+        stream._pendingAbortRequest = undefined;
+        // The backpressure signal set by the controller.
+        stream._backpressure = false;
+    }
+    function IsWritableStream(x) {
+        if (!typeIsObject(x)) {
+            return false;
+        }
+        if (!Object.prototype.hasOwnProperty.call(x, '_writableStreamController')) {
+            return false;
+        }
+        return x instanceof WritableStream;
+    }
+    function IsWritableStreamLocked(stream) {
+        if (stream._writer === undefined) {
+            return false;
+        }
+        return true;
+    }
+    function WritableStreamAbort(stream, reason) {
+        var _a;
+        if (stream._state === 'closed' || stream._state === 'errored') {
+            return promiseResolvedWith(undefined);
+        }
+        stream._writableStreamController._abortReason = reason;
+        (_a = stream._writableStreamController._abortController) === null || _a === void 0 ? void 0 : _a.abort(reason);
+        // TypeScript narrows the type of `stream._state` down to 'writable' | 'erroring',
+        // but it doesn't know that signaling abort runs author code that might have changed the state.
+        // Widen the type again by casting to WritableStreamState.
+        const state = stream._state;
+        if (state === 'closed' || state === 'errored') {
+            return promiseResolvedWith(undefined);
+        }
+        if (stream._pendingAbortRequest !== undefined) {
+            return stream._pendingAbortRequest._promise;
+        }
+        let wasAlreadyErroring = false;
+        if (state === 'erroring') {
+            wasAlreadyErroring = true;
+            // reason will not be used, so don't keep a reference to it.
+            reason = undefined;
+        }
+        const promise = newPromise((resolve, reject) => {
+            stream._pendingAbortRequest = {
+                _promise: undefined,
+                _resolve: resolve,
+                _reject: reject,
+                _reason: reason,
+                _wasAlreadyErroring: wasAlreadyErroring
+            };
+        });
+        stream._pendingAbortRequest._promise = promise;
+        if (!wasAlreadyErroring) {
+            WritableStreamStartErroring(stream, reason);
+        }
+        return promise;
+    }
+    function WritableStreamClose(stream) {
+        const state = stream._state;
+        if (state === 'closed' || state === 'errored') {
+            return promiseRejectedWith(new TypeError(`The stream (in ${state} state) is not in the writable state and cannot be closed`));
+        }
+        const promise = newPromise((resolve, reject) => {
+            const closeRequest = {
+                _resolve: resolve,
+                _reject: reject
+            };
+            stream._closeRequest = closeRequest;
+        });
+        const writer = stream._writer;
+        if (writer !== undefined && stream._backpressure && state === 'writable') {
+            defaultWriterReadyPromiseResolve(writer);
+        }
+        WritableStreamDefaultControllerClose(stream._writableStreamController);
+        return promise;
+    }
+    // WritableStream API exposed for controllers.
+    function WritableStreamAddWriteRequest(stream) {
+        const promise = newPromise((resolve, reject) => {
+            const writeRequest = {
+                _resolve: resolve,
+                _reject: reject
+            };
+            stream._writeRequests.push(writeRequest);
+        });
+        return promise;
+    }
+    function WritableStreamDealWithRejection(stream, error) {
+        const state = stream._state;
+        if (state === 'writable') {
+            WritableStreamStartErroring(stream, error);
+            return;
+        }
+        WritableStreamFinishErroring(stream);
+    }
+    function WritableStreamStartErroring(stream, reason) {
+        const controller = stream._writableStreamController;
+        stream._state = 'erroring';
+        stream._storedError = reason;
+        const writer = stream._writer;
+        if (writer !== undefined) {
+            WritableStreamDefaultWriterEnsureReadyPromiseRejected(writer, reason);
+        }
+        if (!WritableStreamHasOperationMarkedInFlight(stream) && controller._started) {
+            WritableStreamFinishErroring(stream);
+        }
+    }
+    function WritableStreamFinishErroring(stream) {
+        stream._state = 'errored';
+        stream._writableStreamController[ErrorSteps]();
+        const storedError = stream._storedError;
+        stream._writeRequests.forEach(writeRequest => {
+            writeRequest._reject(storedError);
+        });
+        stream._writeRequests = new SimpleQueue();
+        if (stream._pendingAbortRequest === undefined) {
+            WritableStreamRejectCloseAndClosedPromiseIfNeeded(stream);
+            return;
+        }
+        const abortRequest = stream._pendingAbortRequest;
+        stream._pendingAbortRequest = undefined;
+        if (abortRequest._wasAlreadyErroring) {
+            abortRequest._reject(storedError);
+            WritableStreamRejectCloseAndClosedPromiseIfNeeded(stream);
+            return;
+        }
+        const promise = stream._writableStreamController[AbortSteps](abortRequest._reason);
+        uponPromise(promise, () => {
+            abortRequest._resolve();
+            WritableStreamRejectCloseAndClosedPromiseIfNeeded(stream);
+            return null;
+        }, (reason) => {
+            abortRequest._reject(reason);
+            WritableStreamRejectCloseAndClosedPromiseIfNeeded(stream);
+            return null;
+        });
+    }
+    function WritableStreamFinishInFlightWrite(stream) {
+        stream._inFlightWriteRequest._resolve(undefined);
+        stream._inFlightWriteRequest = undefined;
+    }
+    function WritableStreamFinishInFlightWriteWithError(stream, error) {
+        stream._inFlightWriteRequest._reject(error);
+        stream._inFlightWriteRequest = undefined;
+        WritableStreamDealWithRejection(stream, error);
+    }
+    function WritableStreamFinishInFlightClose(stream) {
+        stream._inFlightCloseRequest._resolve(undefined);
+        stream._inFlightCloseRequest = undefined;
+        const state = stream._state;
+        if (state === 'erroring') {
+            // The error was too late to do anything, so it is ignored.
+            stream._storedError = undefined;
+            if (stream._pendingAbortRequest !== undefined) {
+                stream._pendingAbortRequest._resolve();
+                stream._pendingAbortRequest = undefined;
+            }
+        }
+        stream._state = 'closed';
+        const writer = stream._writer;
+        if (writer !== undefined) {
+            defaultWriterClosedPromiseResolve(writer);
+        }
+    }
+    function WritableStreamFinishInFlightCloseWithError(stream, error) {
+        stream._inFlightCloseRequest._reject(error);
+        stream._inFlightCloseRequest = undefined;
+        // Never execute sink abort() after sink close().
+        if (stream._pendingAbortRequest !== undefined) {
+            stream._pendingAbortRequest._reject(error);
+            stream._pendingAbortRequest = undefined;
+        }
+        WritableStreamDealWithRejection(stream, error);
+    }
+    // TODO(ricea): Fix alphabetical order.
+    function WritableStreamCloseQueuedOrInFlight(stream) {
+        if (stream._closeRequest === undefined && stream._inFlightCloseRequest === undefined) {
+            return false;
+        }
+        return true;
+    }
+    function WritableStreamHasOperationMarkedInFlight(stream) {
+        if (stream._inFlightWriteRequest === undefined && stream._inFlightCloseRequest === undefined) {
+            return false;
+        }
+        return true;
+    }
+    function WritableStreamMarkCloseRequestInFlight(stream) {
+        stream._inFlightCloseRequest = stream._closeRequest;
+        stream._closeRequest = undefined;
+    }
+    function WritableStreamMarkFirstWriteRequestInFlight(stream) {
+        stream._inFlightWriteRequest = stream._writeRequests.shift();
+    }
+    function WritableStreamRejectCloseAndClosedPromiseIfNeeded(stream) {
+        if (stream._closeRequest !== undefined) {
+            stream._closeRequest._reject(stream._storedError);
+            stream._closeRequest = undefined;
+        }
+        const writer = stream._writer;
+        if (writer !== undefined) {
+            defaultWriterClosedPromiseReject(writer, stream._storedError);
+        }
+    }
+    function WritableStreamUpdateBackpressure(stream, backpressure) {
+        const writer = stream._writer;
+        if (writer !== undefined && backpressure !== stream._backpressure) {
+            if (backpressure) {
+                defaultWriterReadyPromiseReset(writer);
+            }
+            else {
+                defaultWriterReadyPromiseResolve(writer);
+            }
+        }
+        stream._backpressure = backpressure;
+    }
+    /**
+     * A default writer vended by a {@link WritableStream}.
+     *
+     * @public
+     */
+    class WritableStreamDefaultWriter {
+        constructor(stream) {
+            assertRequiredArgument(stream, 1, 'WritableStreamDefaultWriter');
+            assertWritableStream(stream, 'First parameter');
+            if (IsWritableStreamLocked(stream)) {
+                throw new TypeError('This stream has already been locked for exclusive writing by another writer');
+            }
+            this._ownerWritableStream = stream;
+            stream._writer = this;
+            const state = stream._state;
+            if (state === 'writable') {
+                if (!WritableStreamCloseQueuedOrInFlight(stream) && stream._backpressure) {
+                    defaultWriterReadyPromiseInitialize(this);
+                }
+                else {
+                    defaultWriterReadyPromiseInitializeAsResolved(this);
+                }
+                defaultWriterClosedPromiseInitialize(this);
+            }
+            else if (state === 'erroring') {
+                defaultWriterReadyPromiseInitializeAsRejected(this, stream._storedError);
+                defaultWriterClosedPromiseInitialize(this);
+            }
+            else if (state === 'closed') {
+                defaultWriterReadyPromiseInitializeAsResolved(this);
+                defaultWriterClosedPromiseInitializeAsResolved(this);
+            }
+            else {
+                const storedError = stream._storedError;
+                defaultWriterReadyPromiseInitializeAsRejected(this, storedError);
+                defaultWriterClosedPromiseInitializeAsRejected(this, storedError);
+            }
+        }
+        /**
+         * Returns a promise that will be fulfilled when the stream becomes closed, or rejected if the stream ever errors or
+         * the writer’s lock is released before the stream finishes closing.
+         */
+        get closed() {
+            if (!IsWritableStreamDefaultWriter(this)) {
+                return promiseRejectedWith(defaultWriterBrandCheckException('closed'));
+            }
+            return this._closedPromise;
+        }
+        /**
+         * Returns the desired size to fill the stream’s internal queue. It can be negative, if the queue is over-full.
+         * A producer can use this information to determine the right amount of data to write.
+         *
+         * It will be `null` if the stream cannot be successfully written to (due to either being errored, or having an abort
+         * queued up). It will return zero if the stream is closed. And the getter will throw an exception if invoked when
+         * the writer’s lock is released.
+         */
+        get desiredSize() {
+            if (!IsWritableStreamDefaultWriter(this)) {
+                throw defaultWriterBrandCheckException('desiredSize');
+            }
+            if (this._ownerWritableStream === undefined) {
+                throw defaultWriterLockException('desiredSize');
+            }
+            return WritableStreamDefaultWriterGetDesiredSize(this);
+        }
+        /**
+         * Returns a promise that will be fulfilled when the desired size to fill the stream’s internal queue transitions
+         * from non-positive to positive, signaling that it is no longer applying backpressure. Once the desired size dips
+         * back to zero or below, the getter will return a new promise that stays pending until the next transition.
+         *
+         * If the stream becomes errored or aborted, or the writer’s lock is released, the returned promise will become
+         * rejected.
+         */
+        get ready() {
+            if (!IsWritableStreamDefaultWriter(this)) {
+                return promiseRejectedWith(defaultWriterBrandCheckException('ready'));
+            }
+            return this._readyPromise;
+        }
+        /**
+         * If the reader is active, behaves the same as {@link WritableStream.abort | stream.abort(reason)}.
+         */
+        abort(reason = undefined) {
+            if (!IsWritableStreamDefaultWriter(this)) {
+                return promiseRejectedWith(defaultWriterBrandCheckException('abort'));
+            }
+            if (this._ownerWritableStream === undefined) {
+                return promiseRejectedWith(defaultWriterLockException('abort'));
+            }
+            return WritableStreamDefaultWriterAbort(this, reason);
+        }
+        /**
+         * If the reader is active, behaves the same as {@link WritableStream.close | stream.close()}.
+         */
+        close() {
+            if (!IsWritableStreamDefaultWriter(this)) {
+                return promiseRejectedWith(defaultWriterBrandCheckException('close'));
+            }
+            const stream = this._ownerWritableStream;
+            if (stream === undefined) {
+                return promiseRejectedWith(defaultWriterLockException('close'));
+            }
+            if (WritableStreamCloseQueuedOrInFlight(stream)) {
+                return promiseRejectedWith(new TypeError('Cannot close an already-closing stream'));
+            }
+            return WritableStreamDefaultWriterClose(this);
+        }
+        /**
+         * Releases the writer’s lock on the corresponding stream. After the lock is released, the writer is no longer active.
+         * If the associated stream is errored when the lock is released, the writer will appear errored in the same way from
+         * now on; otherwise, the writer will appear closed.
+         *
+         * Note that the lock can still be released even if some ongoing writes have not yet finished (i.e. even if the
+         * promises returned from previous calls to {@link WritableStreamDefaultWriter.write | write()} have not yet settled).
+         * It’s not necessary to hold the lock on the writer for the duration of the write; the lock instead simply prevents
+         * other producers from writing in an interleaved manner.
+         */
+        releaseLock() {
+            if (!IsWritableStreamDefaultWriter(this)) {
+                throw defaultWriterBrandCheckException('releaseLock');
+            }
+            const stream = this._ownerWritableStream;
+            if (stream === undefined) {
+                return;
+            }
+            WritableStreamDefaultWriterRelease(this);
+        }
+        write(chunk = undefined) {
+            if (!IsWritableStreamDefaultWriter(this)) {
+                return promiseRejectedWith(defaultWriterBrandCheckException('write'));
+            }
+            if (this._ownerWritableStream === undefined) {
+                return promiseRejectedWith(defaultWriterLockException('write to'));
+            }
+            return WritableStreamDefaultWriterWrite(this, chunk);
+        }
+    }
+    Object.defineProperties(WritableStreamDefaultWriter.prototype, {
+        abort: { enumerable: true },
+        close: { enumerable: true },
+        releaseLock: { enumerable: true },
+        write: { enumerable: true },
+        closed: { enumerable: true },
+        desiredSize: { enumerable: true },
+        ready: { enumerable: true }
+    });
+    setFunctionName(WritableStreamDefaultWriter.prototype.abort, 'abort');
+    setFunctionName(WritableStreamDefaultWriter.prototype.close, 'close');
+    setFunctionName(WritableStreamDefaultWriter.prototype.releaseLock, 'releaseLock');
+    setFunctionName(WritableStreamDefaultWriter.prototype.write, 'write');
+    if (typeof Symbol.toStringTag === 'symbol') {
+        Object.defineProperty(WritableStreamDefaultWriter.prototype, Symbol.toStringTag, {
+            value: 'WritableStreamDefaultWriter',
+            configurable: true
+        });
+    }
+    // Abstract operations for the WritableStreamDefaultWriter.
+    function IsWritableStreamDefaultWriter(x) {
+        if (!typeIsObject(x)) {
+            return false;
+        }
+        if (!Object.prototype.hasOwnProperty.call(x, '_ownerWritableStream')) {
+            return false;
+        }
+        return x instanceof WritableStreamDefaultWriter;
+    }
+    // A client of WritableStreamDefaultWriter may use these functions directly to bypass state check.
+    function WritableStreamDefaultWriterAbort(writer, reason) {
+        const stream = writer._ownerWritableStream;
+        return WritableStreamAbort(stream, reason);
+    }
+    function WritableStreamDefaultWriterClose(writer) {
+        const stream = writer._ownerWritableStream;
+        return WritableStreamClose(stream);
+    }
+    function WritableStreamDefaultWriterCloseWithErrorPropagation(writer) {
+        const stream = writer._ownerWritableStream;
+        const state = stream._state;
+        if (WritableStreamCloseQueuedOrInFlight(stream) || state === 'closed') {
+            return promiseResolvedWith(undefined);
+        }
+        if (state === 'errored') {
+            return promiseRejectedWith(stream._storedError);
+        }
+        return WritableStreamDefaultWriterClose(writer);
+    }
+    function WritableStreamDefaultWriterEnsureClosedPromiseRejected(writer, error) {
+        if (writer._closedPromiseState === 'pending') {
+            defaultWriterClosedPromiseReject(writer, error);
+        }
+        else {
+            defaultWriterClosedPromiseResetToRejected(writer, error);
+        }
+    }
+    function WritableStreamDefaultWriterEnsureReadyPromiseRejected(writer, error) {
+        if (writer._readyPromiseState === 'pending') {
+            defaultWriterReadyPromiseReject(writer, error);
+        }
+        else {
+            defaultWriterReadyPromiseResetToRejected(writer, error);
+        }
+    }
+    function WritableStreamDefaultWriterGetDesiredSize(writer) {
+        const stream = writer._ownerWritableStream;
+        const state = stream._state;
+        if (state === 'errored' || state === 'erroring') {
+            return null;
+        }
+        if (state === 'closed') {
+            return 0;
+        }
+        return WritableStreamDefaultControllerGetDesiredSize(stream._writableStreamController);
+    }
+    function WritableStreamDefaultWriterRelease(writer) {
+        const stream = writer._ownerWritableStream;
+        const releasedError = new TypeError(`Writer was released and can no longer be used to monitor the stream's closedness`);
+        WritableStreamDefaultWriterEnsureReadyPromiseRejected(writer, releasedError);
+        // The state transitions to "errored" before the sink abort() method runs, but the writer.closed promise is not
+        // rejected until afterwards. This means that simply testing state will not work.
+        WritableStreamDefaultWriterEnsureClosedPromiseRejected(writer, releasedError);
+        stream._writer = undefined;
+        writer._ownerWritableStream = undefined;
+    }
+    function WritableStreamDefaultWriterWrite(writer, chunk) {
+        const stream = writer._ownerWritableStream;
+        const controller = stream._writableStreamController;
+        const chunkSize = WritableStreamDefaultControllerGetChunkSize(controller, chunk);
+        if (stream !== writer._ownerWritableStream) {
+            return promiseRejectedWith(defaultWriterLockException('write to'));
+        }
+        const state = stream._state;
+        if (state === 'errored') {
+            return promiseRejectedWith(stream._storedError);
+        }
+        if (WritableStreamCloseQueuedOrInFlight(stream) || state === 'closed') {
+            return promiseRejectedWith(new TypeError('The stream is closing or closed and cannot be written to'));
+        }
+        if (state === 'erroring') {
+            return promiseRejectedWith(stream._storedError);
+        }
+        const promise = WritableStreamAddWriteRequest(stream);
+        WritableStreamDefaultControllerWrite(controller, chunk, chunkSize);
+        return promise;
+    }
+    const closeSentinel = {};
+    /**
+     * Allows control of a {@link WritableStream | writable stream}'s state and internal queue.
+     *
+     * @public
+     */
+    class WritableStreamDefaultController {
+        constructor() {
+            throw new TypeError('Illegal constructor');
+        }
+        /**
+         * The reason which was passed to `WritableStream.abort(reason)` when the stream was aborted.
+         *
+         * @deprecated
+         *  This property has been removed from the specification, see https://github.com/whatwg/streams/pull/1177.
+         *  Use {@link WritableStreamDefaultController.signal}'s `reason` instead.
+         */
+        get abortReason() {
+            if (!IsWritableStreamDefaultController(this)) {
+                throw defaultControllerBrandCheckException$2('abortReason');
+            }
+            return this._abortReason;
+        }
+        /**
+         * An `AbortSignal` that can be used to abort the pending write or close operation when the stream is aborted.
+         */
+        get signal() {
+            if (!IsWritableStreamDefaultController(this)) {
+                throw defaultControllerBrandCheckException$2('signal');
+            }
+            if (this._abortController === undefined) {
+                // Older browsers or older Node versions may not support `AbortController` or `AbortSignal`.
+                // We don't want to bundle and ship an `AbortController` polyfill together with our polyfill,
+                // so instead we only implement support for `signal` if we find a global `AbortController` constructor.
+                throw new TypeError('WritableStreamDefaultController.prototype.signal is not supported');
+            }
+            return this._abortController.signal;
+        }
+        /**
+         * Closes the controlled writable stream, making all future interactions with it fail with the given error `e`.
+         *
+         * This method is rarely used, since usually it suffices to return a rejected promise from one of the underlying
+         * sink's methods. However, it can be useful for suddenly shutting down a stream in response to an event outside the
+         * normal lifecycle of interactions with the underlying sink.
+         */
+        error(e = undefined) {
+            if (!IsWritableStreamDefaultController(this)) {
+                throw defaultControllerBrandCheckException$2('error');
+            }
+            const state = this._controlledWritableStream._state;
+            if (state !== 'writable') {
+                // The stream is closed, errored or will be soon. The sink can't do anything useful if it gets an error here, so
+                // just treat it as a no-op.
+                return;
+            }
+            WritableStreamDefaultControllerError(this, e);
+        }
+        /** @internal */
+        [AbortSteps](reason) {
+            const result = this._abortAlgorithm(reason);
+            WritableStreamDefaultControllerClearAlgorithms(this);
+            return result;
+        }
+        /** @internal */
+        [ErrorSteps]() {
+            ResetQueue(this);
+        }
+    }
+    Object.defineProperties(WritableStreamDefaultController.prototype, {
+        abortReason: { enumerable: true },
+        signal: { enumerable: true },
+        error: { enumerable: true }
+    });
+    if (typeof Symbol.toStringTag === 'symbol') {
+        Object.defineProperty(WritableStreamDefaultController.prototype, Symbol.toStringTag, {
+            value: 'WritableStreamDefaultController',
+            configurable: true
+        });
+    }
+    // Abstract operations implementing interface required by the WritableStream.
+    function IsWritableStreamDefaultController(x) {
+        if (!typeIsObject(x)) {
+            return false;
+        }
+        if (!Object.prototype.hasOwnProperty.call(x, '_controlledWritableStream')) {
+            return false;
+        }
+        return x instanceof WritableStreamDefaultController;
+    }
+    function SetUpWritableStreamDefaultController(stream, controller, startAlgorithm, writeAlgorithm, closeAlgorithm, abortAlgorithm, highWaterMark, sizeAlgorithm) {
+        controller._controlledWritableStream = stream;
+        stream._writableStreamController = controller;
+        // Need to set the slots so that the assert doesn't fire. In the spec the slots already exist implicitly.
+        controller._queue = undefined;
+        controller._queueTotalSize = undefined;
+        ResetQueue(controller);
+        controller._abortReason = undefined;
+        controller._abortController = createAbortController();
+        controller._started = false;
+        controller._strategySizeAlgorithm = sizeAlgorithm;
+        controller._strategyHWM = highWaterMark;
+        controller._writeAlgorithm = writeAlgorithm;
+        controller._closeAlgorithm = closeAlgorithm;
+        controller._abortAlgorithm = abortAlgorithm;
+        const backpressure = WritableStreamDefaultControllerGetBackpressure(controller);
+        WritableStreamUpdateBackpressure(stream, backpressure);
+        const startResult = startAlgorithm();
+        const startPromise = promiseResolvedWith(startResult);
+        uponPromise(startPromise, () => {
+            controller._started = true;
+            WritableStreamDefaultControllerAdvanceQueueIfNeeded(controller);
+            return null;
+        }, r => {
+            controller._started = true;
+            WritableStreamDealWithRejection(stream, r);
+            return null;
+        });
+    }
+    function SetUpWritableStreamDefaultControllerFromUnderlyingSink(stream, underlyingSink, highWaterMark, sizeAlgorithm) {
+        const controller = Object.create(WritableStreamDefaultController.prototype);
+        let startAlgorithm;
+        let writeAlgorithm;
+        let closeAlgorithm;
+        let abortAlgorithm;
+        if (underlyingSink.start !== undefined) {
+            startAlgorithm = () => underlyingSink.start(controller);
+        }
+        else {
+            startAlgorithm = () => undefined;
+        }
+        if (underlyingSink.write !== undefined) {
+            writeAlgorithm = chunk => underlyingSink.write(chunk, controller);
+        }
+        else {
+            writeAlgorithm = () => promiseResolvedWith(undefined);
+        }
+        if (underlyingSink.close !== undefined) {
+            closeAlgorithm = () => underlyingSink.close();
+        }
+        else {
+            closeAlgorithm = () => promiseResolvedWith(undefined);
+        }
+        if (underlyingSink.abort !== undefined) {
+            abortAlgorithm = reason => underlyingSink.abort(reason);
+        }
+        else {
+            abortAlgorithm = () => promiseResolvedWith(undefined);
+        }
+        SetUpWritableStreamDefaultController(stream, controller, startAlgorithm, writeAlgorithm, closeAlgorithm, abortAlgorithm, highWaterMark, sizeAlgorithm);
+    }
+    // ClearAlgorithms may be called twice. Erroring the same stream in multiple ways will often result in redundant calls.
+    function WritableStreamDefaultControllerClearAlgorithms(controller) {
+        controller._writeAlgorithm = undefined;
+        controller._closeAlgorithm = undefined;
+        controller._abortAlgorithm = undefined;
+        controller._strategySizeAlgorithm = undefined;
+    }
+    function WritableStreamDefaultControllerClose(controller) {
+        EnqueueValueWithSize(controller, closeSentinel, 0);
+        WritableStreamDefaultControllerAdvanceQueueIfNeeded(controller);
+    }
+    function WritableStreamDefaultControllerGetChunkSize(controller, chunk) {
+        try {
+            return controller._strategySizeAlgorithm(chunk);
+        }
+        catch (chunkSizeE) {
+            WritableStreamDefaultControllerErrorIfNeeded(controller, chunkSizeE);
+            return 1;
+        }
+    }
+    function WritableStreamDefaultControllerGetDesiredSize(controller) {
+        return controller._strategyHWM - controller._queueTotalSize;
+    }
+    function WritableStreamDefaultControllerWrite(controller, chunk, chunkSize) {
+        try {
+            EnqueueValueWithSize(controller, chunk, chunkSize);
+        }
+        catch (enqueueE) {
+            WritableStreamDefaultControllerErrorIfNeeded(controller, enqueueE);
+            return;
+        }
+        const stream = controller._controlledWritableStream;
+        if (!WritableStreamCloseQueuedOrInFlight(stream) && stream._state === 'writable') {
+            const backpressure = WritableStreamDefaultControllerGetBackpressure(controller);
+            WritableStreamUpdateBackpressure(stream, backpressure);
+        }
+        WritableStreamDefaultControllerAdvanceQueueIfNeeded(controller);
+    }
+    // Abstract operations for the WritableStreamDefaultController.
+    function WritableStreamDefaultControllerAdvanceQueueIfNeeded(controller) {
+        const stream = controller._controlledWritableStream;
+        if (!controller._started) {
+            return;
+        }
+        if (stream._inFlightWriteRequest !== undefined) {
+            return;
+        }
+        const state = stream._state;
+        if (state === 'erroring') {
+            WritableStreamFinishErroring(stream);
+            return;
+        }
+        if (controller._queue.length === 0) {
+            return;
+        }
+        const value = PeekQueueValue(controller);
+        if (value === closeSentinel) {
+            WritableStreamDefaultControllerProcessClose(controller);
+        }
+        else {
+            WritableStreamDefaultControllerProcessWrite(controller, value);
+        }
+    }
+    function WritableStreamDefaultControllerErrorIfNeeded(controller, error) {
+        if (controller._controlledWritableStream._state === 'writable') {
+            WritableStreamDefaultControllerError(controller, error);
+        }
+    }
+    function WritableStreamDefaultControllerProcessClose(controller) {
+        const stream = controller._controlledWritableStream;
+        WritableStreamMarkCloseRequestInFlight(stream);
+        DequeueValue(controller);
+        const sinkClosePromise = controller._closeAlgorithm();
+        WritableStreamDefaultControllerClearAlgorithms(controller);
+        uponPromise(sinkClosePromise, () => {
+            WritableStreamFinishInFlightClose(stream);
+            return null;
+        }, reason => {
+            WritableStreamFinishInFlightCloseWithError(stream, reason);
+            return null;
+        });
+    }
+    function WritableStreamDefaultControllerProcessWrite(controller, chunk) {
+        const stream = controller._controlledWritableStream;
+        WritableStreamMarkFirstWriteRequestInFlight(stream);
+        const sinkWritePromise = controller._writeAlgorithm(chunk);
+        uponPromise(sinkWritePromise, () => {
+            WritableStreamFinishInFlightWrite(stream);
+            const state = stream._state;
+            DequeueValue(controller);
+            if (!WritableStreamCloseQueuedOrInFlight(stream) && state === 'writable') {
+                const backpressure = WritableStreamDefaultControllerGetBackpressure(controller);
+                WritableStreamUpdateBackpressure(stream, backpressure);
+            }
+            WritableStreamDefaultControllerAdvanceQueueIfNeeded(controller);
+            return null;
+        }, reason => {
+            if (stream._state === 'writable') {
+                WritableStreamDefaultControllerClearAlgorithms(controller);
+            }
+            WritableStreamFinishInFlightWriteWithError(stream, reason);
+            return null;
+        });
+    }
+    function WritableStreamDefaultControllerGetBackpressure(controller) {
+        const desiredSize = WritableStreamDefaultControllerGetDesiredSize(controller);
+        return desiredSize <= 0;
+    }
+    // A client of WritableStreamDefaultController may use these functions directly to bypass state check.
+    function WritableStreamDefaultControllerError(controller, error) {
+        const stream = controller._controlledWritableStream;
+        WritableStreamDefaultControllerClearAlgorithms(controller);
+        WritableStreamStartErroring(stream, error);
+    }
+    // Helper functions for the WritableStream.
+    function streamBrandCheckException$2(name) {
+        return new TypeError(`WritableStream.prototype.${name} can only be used on a WritableStream`);
+    }
+    // Helper functions for the WritableStreamDefaultController.
+    function defaultControllerBrandCheckException$2(name) {
+        return new TypeError(`WritableStreamDefaultController.prototype.${name} can only be used on a WritableStreamDefaultController`);
+    }
+    // Helper functions for the WritableStreamDefaultWriter.
+    function defaultWriterBrandCheckException(name) {
+        return new TypeError(`WritableStreamDefaultWriter.prototype.${name} can only be used on a WritableStreamDefaultWriter`);
+    }
+    function defaultWriterLockException(name) {
+        return new TypeError('Cannot ' + name + ' a stream using a released writer');
+    }
+    function defaultWriterClosedPromiseInitialize(writer) {
+        writer._closedPromise = newPromise((resolve, reject) => {
+            writer._closedPromise_resolve = resolve;
+            writer._closedPromise_reject = reject;
+            writer._closedPromiseState = 'pending';
+        });
+    }
+    function defaultWriterClosedPromiseInitializeAsRejected(writer, reason) {
+        defaultWriterClosedPromiseInitialize(writer);
+        defaultWriterClosedPromiseReject(writer, reason);
+    }
+    function defaultWriterClosedPromiseInitializeAsResolved(writer) {
+        defaultWriterClosedPromiseInitialize(writer);
+        defaultWriterClosedPromiseResolve(writer);
+    }
+    function defaultWriterClosedPromiseReject(writer, reason) {
+        if (writer._closedPromise_reject === undefined) {
+            return;
+        }
+        setPromiseIsHandledToTrue(writer._closedPromise);
+        writer._closedPromise_reject(reason);
+        writer._closedPromise_resolve = undefined;
+        writer._closedPromise_reject = undefined;
+        writer._closedPromiseState = 'rejected';
+    }
+    function defaultWriterClosedPromiseResetToRejected(writer, reason) {
+        defaultWriterClosedPromiseInitializeAsRejected(writer, reason);
+    }
+    function defaultWriterClosedPromiseResolve(writer) {
+        if (writer._closedPromise_resolve === undefined) {
+            return;
+        }
+        writer._closedPromise_resolve(undefined);
+        writer._closedPromise_resolve = undefined;
+        writer._closedPromise_reject = undefined;
+        writer._closedPromiseState = 'resolved';
+    }
+    function defaultWriterReadyPromiseInitialize(writer) {
+        writer._readyPromise = newPromise((resolve, reject) => {
+            writer._readyPromise_resolve = resolve;
+            writer._readyPromise_reject = reject;
+        });
+        writer._readyPromiseState = 'pending';
+    }
+    function defaultWriterReadyPromiseInitializeAsRejected(writer, reason) {
+        defaultWriterReadyPromiseInitialize(writer);
+        defaultWriterReadyPromiseReject(writer, reason);
+    }
+    function defaultWriterReadyPromiseInitializeAsResolved(writer) {
+        defaultWriterReadyPromiseInitialize(writer);
+        defaultWriterReadyPromiseResolve(writer);
+    }
+    function defaultWriterReadyPromiseReject(writer, reason) {
+        if (writer._readyPromise_reject === undefined) {
+            return;
+        }
+        setPromiseIsHandledToTrue(writer._readyPromise);
+        writer._readyPromise_reject(reason);
+        writer._readyPromise_resolve = undefined;
+        writer._readyPromise_reject = undefined;
+        writer._readyPromiseState = 'rejected';
+    }
+    function defaultWriterReadyPromiseReset(writer) {
+        defaultWriterReadyPromiseInitialize(writer);
+    }
+    function defaultWriterReadyPromiseResetToRejected(writer, reason) {
+        defaultWriterReadyPromiseInitializeAsRejected(writer, reason);
+    }
+    function defaultWriterReadyPromiseResolve(writer) {
+        if (writer._readyPromise_resolve === undefined) {
+            return;
+        }
+        writer._readyPromise_resolve(undefined);
+        writer._readyPromise_resolve = undefined;
+        writer._readyPromise_reject = undefined;
+        writer._readyPromiseState = 'fulfilled';
+    }
+
+    /// <reference lib="dom" />
+    function getGlobals() {
+        if (typeof globalThis !== 'undefined') {
+            return globalThis;
+        }
+        else if (typeof self !== 'undefined') {
+            return self;
+        }
+        else if (typeof global !== 'undefined') {
+            return global;
+        }
+        return undefined;
+    }
+    const globals = getGlobals();
+
+    /// <reference types="node" />
+    function isDOMExceptionConstructor(ctor) {
+        if (!(typeof ctor === 'function' || typeof ctor === 'object')) {
+            return false;
+        }
+        if (ctor.name !== 'DOMException') {
+            return false;
+        }
+        try {
+            new ctor();
+            return true;
+        }
+        catch (_a) {
+            return false;
+        }
+    }
+    /**
+     * Support:
+     * - Web browsers
+     * - Node 18 and higher (https://github.com/nodejs/node/commit/e4b1fb5e6422c1ff151234bb9de792d45dd88d87)
+     */
+    function getFromGlobal() {
+        const ctor = globals === null || globals === void 0 ? void 0 : globals.DOMException;
+        return isDOMExceptionConstructor(ctor) ? ctor : undefined;
+    }
+    /**
+     * Support:
+     * - All platforms
+     */
+    function createPolyfill() {
+        // eslint-disable-next-line @typescript-eslint/no-shadow
+        const ctor = function DOMException(message, name) {
+            this.message = message || '';
+            this.name = name || 'Error';
+            if (Error.captureStackTrace) {
+                Error.captureStackTrace(this, this.constructor);
+            }
+        };
+        setFunctionName(ctor, 'DOMException');
+        ctor.prototype = Object.create(Error.prototype);
+        Object.defineProperty(ctor.prototype, 'constructor', { value: ctor, writable: true, configurable: true });
+        return ctor;
+    }
+    // eslint-disable-next-line @typescript-eslint/no-redeclare
+    const DOMException = getFromGlobal() || createPolyfill();
+
+    function ReadableStreamPipeTo(source, dest, preventClose, preventAbort, preventCancel, signal) {
+        const reader = AcquireReadableStreamDefaultReader(source);
+        const writer = AcquireWritableStreamDefaultWriter(dest);
+        source._disturbed = true;
+        let shuttingDown = false;
+        // This is used to keep track of the spec's requirement that we wait for ongoing writes during shutdown.
+        let currentWrite = promiseResolvedWith(undefined);
+        return newPromise((resolve, reject) => {
+            let abortAlgorithm;
+            if (signal !== undefined) {
+                abortAlgorithm = () => {
+                    const error = signal.reason !== undefined ? signal.reason : new DOMException('Aborted', 'AbortError');
+                    const actions = [];
+                    if (!preventAbort) {
+                        actions.push(() => {
+                            if (dest._state === 'writable') {
+                                return WritableStreamAbort(dest, error);
+                            }
+                            return promiseResolvedWith(undefined);
+                        });
+                    }
+                    if (!preventCancel) {
+                        actions.push(() => {
+                            if (source._state === 'readable') {
+                                return ReadableStreamCancel(source, error);
+                            }
+                            return promiseResolvedWith(undefined);
+                        });
+                    }
+                    shutdownWithAction(() => Promise.all(actions.map(action => action())), true, error);
+                };
+                if (signal.aborted) {
+                    abortAlgorithm();
+                    return;
+                }
+                signal.addEventListener('abort', abortAlgorithm);
+            }
+            // Using reader and writer, read all chunks from this and write them to dest
+            // - Backpressure must be enforced
+            // - Shutdown must stop all activity
+            function pipeLoop() {
+                return newPromise((resolveLoop, rejectLoop) => {
+                    function next(done) {
+                        if (done) {
+                            resolveLoop();
+                        }
+                        else {
+                            // Use `PerformPromiseThen` instead of `uponPromise` to avoid
+                            // adding unnecessary `.catch(rethrowAssertionErrorRejection)` handlers
+                            PerformPromiseThen(pipeStep(), next, rejectLoop);
+                        }
+                    }
+                    next(false);
+                });
+            }
+            function pipeStep() {
+                if (shuttingDown) {
+                    return promiseResolvedWith(true);
+                }
+                return PerformPromiseThen(writer._readyPromise, () => {
+                    return newPromise((resolveRead, rejectRead) => {
+                        ReadableStreamDefaultReaderRead(reader, {
+                            _chunkSteps: chunk => {
+                                currentWrite = PerformPromiseThen(WritableStreamDefaultWriterWrite(writer, chunk), undefined, noop);
+                                resolveRead(false);
+                            },
+                            _closeSteps: () => resolveRead(true),
+                            _errorSteps: rejectRead
+                        });
+                    });
+                });
+            }
+            // Errors must be propagated forward
+            isOrBecomesErrored(source, reader._closedPromise, storedError => {
+                if (!preventAbort) {
+                    shutdownWithAction(() => WritableStreamAbort(dest, storedError), true, storedError);
+                }
+                else {
+                    shutdown(true, storedError);
+                }
+                return null;
+            });
+            // Errors must be propagated backward
+            isOrBecomesErrored(dest, writer._closedPromise, storedError => {
+                if (!preventCancel) {
+                    shutdownWithAction(() => ReadableStreamCancel(source, storedError), true, storedError);
+                }
+                else {
+                    shutdown(true, storedError);
+                }
+                return null;
+            });
+            // Closing must be propagated forward
+            isOrBecomesClosed(source, reader._closedPromise, () => {
+                if (!preventClose) {
+                    shutdownWithAction(() => WritableStreamDefaultWriterCloseWithErrorPropagation(writer));
+                }
+                else {
+                    shutdown();
+                }
+                return null;
+            });
+            // Closing must be propagated backward
+            if (WritableStreamCloseQueuedOrInFlight(dest) || dest._state === 'closed') {
+                const destClosed = new TypeError('the destination writable stream closed before all data could be piped to it');
+                if (!preventCancel) {
+                    shutdownWithAction(() => ReadableStreamCancel(source, destClosed), true, destClosed);
+                }
+                else {
+                    shutdown(true, destClosed);
+                }
+            }
+            setPromiseIsHandledToTrue(pipeLoop());
+            function waitForWritesToFinish() {
+                // Another write may have started while we were waiting on this currentWrite, so we have to be sure to wait
+                // for that too.
+                const oldCurrentWrite = currentWrite;
+                return PerformPromiseThen(currentWrite, () => oldCurrentWrite !== currentWrite ? waitForWritesToFinish() : undefined);
+            }
+            function isOrBecomesErrored(stream, promise, action) {
+                if (stream._state === 'errored') {
+                    action(stream._storedError);
+                }
+                else {
+                    uponRejection(promise, action);
+                }
+            }
+            function isOrBecomesClosed(stream, promise, action) {
+                if (stream._state === 'closed') {
+                    action();
+                }
+                else {
+                    uponFulfillment(promise, action);
+                }
+            }
+            function shutdownWithAction(action, originalIsError, originalError) {
+                if (shuttingDown) {
+                    return;
+                }
+                shuttingDown = true;
+                if (dest._state === 'writable' && !WritableStreamCloseQueuedOrInFlight(dest)) {
+                    uponFulfillment(waitForWritesToFinish(), doTheRest);
+                }
+                else {
+                    doTheRest();
+                }
+                function doTheRest() {
+                    uponPromise(action(), () => finalize(originalIsError, originalError), newError => finalize(true, newError));
+                    return null;
+                }
+            }
+            function shutdown(isError, error) {
+                if (shuttingDown) {
+                    return;
+                }
+                shuttingDown = true;
+                if (dest._state === 'writable' && !WritableStreamCloseQueuedOrInFlight(dest)) {
+                    uponFulfillment(waitForWritesToFinish(), () => finalize(isError, error));
+                }
+                else {
+                    finalize(isError, error);
+                }
+            }
+            function finalize(isError, error) {
+                WritableStreamDefaultWriterRelease(writer);
+                ReadableStreamReaderGenericRelease(reader);
+                if (signal !== undefined) {
+                    signal.removeEventListener('abort', abortAlgorithm);
+                }
+                if (isError) {
+                    reject(error);
+                }
+                else {
+                    resolve(undefined);
+                }
+                return null;
+            }
+        });
+    }
+
+    /**
+     * Allows control of a {@link ReadableStream | readable stream}'s state and internal queue.
+     *
+     * @public
+     */
+    class ReadableStreamDefaultController {
+        constructor() {
+            throw new TypeError('Illegal constructor');
+        }
+        /**
+         * Returns the desired size to fill the controlled stream's internal queue. It can be negative, if the queue is
+         * over-full. An underlying source ought to use this information to determine when and how to apply backpressure.
+         */
+        get desiredSize() {
+            if (!IsReadableStreamDefaultController(this)) {
+                throw defaultControllerBrandCheckException$1('desiredSize');
+            }
+            return ReadableStreamDefaultControllerGetDesiredSize(this);
+        }
+        /**
+         * Closes the controlled readable stream. Consumers will still be able to read any previously-enqueued chunks from
+         * the stream, but once those are read, the stream will become closed.
+         */
+        close() {
+            if (!IsReadableStreamDefaultController(this)) {
+                throw defaultControllerBrandCheckException$1('close');
+            }
+            if (!ReadableStreamDefaultControllerCanCloseOrEnqueue(this)) {
+                throw new TypeError('The stream is not in a state that permits close');
+            }
+            ReadableStreamDefaultControllerClose(this);
+        }
+        enqueue(chunk = undefined) {
+            if (!IsReadableStreamDefaultController(this)) {
+                throw defaultControllerBrandCheckException$1('enqueue');
+            }
+            if (!ReadableStreamDefaultControllerCanCloseOrEnqueue(this)) {
+                throw new TypeError('The stream is not in a state that permits enqueue');
+            }
+            return ReadableStreamDefaultControllerEnqueue(this, chunk);
+        }
+        /**
+         * Errors the controlled readable stream, making all future interactions with it fail with the given error `e`.
+         */
+        error(e = undefined) {
+            if (!IsReadableStreamDefaultController(this)) {
+                throw defaultControllerBrandCheckException$1('error');
+            }
+            ReadableStreamDefaultControllerError(this, e);
+        }
+        /** @internal */
+        [CancelSteps](reason) {
+            ResetQueue(this);
+            const result = this._cancelAlgorithm(reason);
+            ReadableStreamDefaultControllerClearAlgorithms(this);
+            return result;
+        }
+        /** @internal */
+        [PullSteps](readRequest) {
+            const stream = this._controlledReadableStream;
+            if (this._queue.length > 0) {
+                const chunk = DequeueValue(this);
+                if (this._closeRequested && this._queue.length === 0) {
+                    ReadableStreamDefaultControllerClearAlgorithms(this);
+                    ReadableStreamClose(stream);
+                }
+                else {
+                    ReadableStreamDefaultControllerCallPullIfNeeded(this);
+                }
+                readRequest._chunkSteps(chunk);
+            }
+            else {
+                ReadableStreamAddReadRequest(stream, readRequest);
+                ReadableStreamDefaultControllerCallPullIfNeeded(this);
+            }
+        }
+        /** @internal */
+        [ReleaseSteps]() {
+            // Do nothing.
+        }
+    }
+    Object.defineProperties(ReadableStreamDefaultController.prototype, {
+        close: { enumerable: true },
+        enqueue: { enumerable: true },
+        error: { enumerable: true },
+        desiredSize: { enumerable: true }
+    });
+    setFunctionName(ReadableStreamDefaultController.prototype.close, 'close');
+    setFunctionName(ReadableStreamDefaultController.prototype.enqueue, 'enqueue');
+    setFunctionName(ReadableStreamDefaultController.prototype.error, 'error');
+    if (typeof Symbol.toStringTag === 'symbol') {
+        Object.defineProperty(ReadableStreamDefaultController.prototype, Symbol.toStringTag, {
+            value: 'ReadableStreamDefaultController',
+            configurable: true
+        });
+    }
+    // Abstract operations for the ReadableStreamDefaultController.
+    function IsReadableStreamDefaultController(x) {
+        if (!typeIsObject(x)) {
+            return false;
+        }
+        if (!Object.prototype.hasOwnProperty.call(x, '_controlledReadableStream')) {
+            return false;
+        }
+        return x instanceof ReadableStreamDefaultController;
+    }
+    function ReadableStreamDefaultControllerCallPullIfNeeded(controller) {
+        const shouldPull = ReadableStreamDefaultControllerShouldCallPull(controller);
+        if (!shouldPull) {
+            return;
+        }
+        if (controller._pulling) {
+            controller._pullAgain = true;
+            return;
+        }
+        controller._pulling = true;
+        const pullPromise = controller._pullAlgorithm();
+        uponPromise(pullPromise, () => {
+            controller._pulling = false;
+            if (controller._pullAgain) {
+                controller._pullAgain = false;
+                ReadableStreamDefaultControllerCallPullIfNeeded(controller);
+            }
+            return null;
+        }, e => {
+            ReadableStreamDefaultControllerError(controller, e);
+            return null;
+        });
+    }
+    function ReadableStreamDefaultControllerShouldCallPull(controller) {
+        const stream = controller._controlledReadableStream;
+        if (!ReadableStreamDefaultControllerCanCloseOrEnqueue(controller)) {
+            return false;
+        }
+        if (!controller._started) {
+            return false;
+        }
+        if (IsReadableStreamLocked(stream) && ReadableStreamGetNumReadRequests(stream) > 0) {
+            return true;
+        }
+        const desiredSize = ReadableStreamDefaultControllerGetDesiredSize(controller);
+        if (desiredSize > 0) {
+            return true;
+        }
+        return false;
+    }
+    function ReadableStreamDefaultControllerClearAlgorithms(controller) {
+        controller._pullAlgorithm = undefined;
+        controller._cancelAlgorithm = undefined;
+        controller._strategySizeAlgorithm = undefined;
+    }
+    // A client of ReadableStreamDefaultController may use these functions directly to bypass state check.
+    function ReadableStreamDefaultControllerClose(controller) {
+        if (!ReadableStreamDefaultControllerCanCloseOrEnqueue(controller)) {
+            return;
+        }
+        const stream = controller._controlledReadableStream;
+        controller._closeRequested = true;
+        if (controller._queue.length === 0) {
+            ReadableStreamDefaultControllerClearAlgorithms(controller);
+            ReadableStreamClose(stream);
+        }
+    }
+    function ReadableStreamDefaultControllerEnqueue(controller, chunk) {
+        if (!ReadableStreamDefaultControllerCanCloseOrEnqueue(controller)) {
+            return;
+        }
+        const stream = controller._controlledReadableStream;
+        if (IsReadableStreamLocked(stream) && ReadableStreamGetNumReadRequests(stream) > 0) {
+            ReadableStreamFulfillReadRequest(stream, chunk, false);
+        }
+        else {
+            let chunkSize;
+            try {
+                chunkSize = controller._strategySizeAlgorithm(chunk);
+            }
+            catch (chunkSizeE) {
+                ReadableStreamDefaultControllerError(controller, chunkSizeE);
+                throw chunkSizeE;
+            }
+            try {
+                EnqueueValueWithSize(controller, chunk, chunkSize);
+            }
+            catch (enqueueE) {
+                ReadableStreamDefaultControllerError(controller, enqueueE);
+                throw enqueueE;
+            }
+        }
+        ReadableStreamDefaultControllerCallPullIfNeeded(controller);
+    }
+    function ReadableStreamDefaultControllerError(controller, e) {
+        const stream = controller._controlledReadableStream;
+        if (stream._state !== 'readable') {
+            return;
+        }
+        ResetQueue(controller);
+        ReadableStreamDefaultControllerClearAlgorithms(controller);
+        ReadableStreamError(stream, e);
+    }
+    function ReadableStreamDefaultControllerGetDesiredSize(controller) {
+        const state = controller._controlledReadableStream._state;
+        if (state === 'errored') {
+            return null;
+        }
+        if (state === 'closed') {
+            return 0;
+        }
+        return controller._strategyHWM - controller._queueTotalSize;
+    }
+    // This is used in the implementation of TransformStream.
+    function ReadableStreamDefaultControllerHasBackpressure(controller) {
+        if (ReadableStreamDefaultControllerShouldCallPull(controller)) {
+            return false;
+        }
+        return true;
+    }
+    function ReadableStreamDefaultControllerCanCloseOrEnqueue(controller) {
+        const state = controller._controlledReadableStream._state;
+        if (!controller._closeRequested && state === 'readable') {
+            return true;
+        }
+        return false;
+    }
+    function SetUpReadableStreamDefaultController(stream, controller, startAlgorithm, pullAlgorithm, cancelAlgorithm, highWaterMark, sizeAlgorithm) {
+        controller._controlledReadableStream = stream;
+        controller._queue = undefined;
+        controller._queueTotalSize = undefined;
+        ResetQueue(controller);
+        controller._started = false;
+        controller._closeRequested = false;
+        controller._pullAgain = false;
+        controller._pulling = false;
+        controller._strategySizeAlgorithm = sizeAlgorithm;
+        controller._strategyHWM = highWaterMark;
+        controller._pullAlgorithm = pullAlgorithm;
+        controller._cancelAlgorithm = cancelAlgorithm;
+        stream._readableStreamController = controller;
+        const startResult = startAlgorithm();
+        uponPromise(promiseResolvedWith(startResult), () => {
+            controller._started = true;
+            ReadableStreamDefaultControllerCallPullIfNeeded(controller);
+            return null;
+        }, r => {
+            ReadableStreamDefaultControllerError(controller, r);
+            return null;
+        });
+    }
+    function SetUpReadableStreamDefaultControllerFromUnderlyingSource(stream, underlyingSource, highWaterMark, sizeAlgorithm) {
+        const controller = Object.create(ReadableStreamDefaultController.prototype);
+        let startAlgorithm;
+        let pullAlgorithm;
+        let cancelAlgorithm;
+        if (underlyingSource.start !== undefined) {
+            startAlgorithm = () => underlyingSource.start(controller);
+        }
+        else {
+            startAlgorithm = () => undefined;
+        }
+        if (underlyingSource.pull !== undefined) {
+            pullAlgorithm = () => underlyingSource.pull(controller);
+        }
+        else {
+            pullAlgorithm = () => promiseResolvedWith(undefined);
+        }
+        if (underlyingSource.cancel !== undefined) {
+            cancelAlgorithm = reason => underlyingSource.cancel(reason);
+        }
+        else {
+            cancelAlgorithm = () => promiseResolvedWith(undefined);
+        }
+        SetUpReadableStreamDefaultController(stream, controller, startAlgorithm, pullAlgorithm, cancelAlgorithm, highWaterMark, sizeAlgorithm);
+    }
+    // Helper functions for the ReadableStreamDefaultController.
+    function defaultControllerBrandCheckException$1(name) {
+        return new TypeError(`ReadableStreamDefaultController.prototype.${name} can only be used on a ReadableStreamDefaultController`);
+    }
+
+    function ReadableStreamTee(stream, cloneForBranch2) {
+        if (IsReadableByteStreamController(stream._readableStreamController)) {
+            return ReadableByteStreamTee(stream);
+        }
+        return ReadableStreamDefaultTee(stream);
+    }
+    function ReadableStreamDefaultTee(stream, cloneForBranch2) {
+        const reader = AcquireReadableStreamDefaultReader(stream);
+        let reading = false;
+        let readAgain = false;
+        let canceled1 = false;
+        let canceled2 = false;
+        let reason1;
+        let reason2;
+        let branch1;
+        let branch2;
+        let resolveCancelPromise;
+        const cancelPromise = newPromise(resolve => {
+            resolveCancelPromise = resolve;
+        });
+        function pullAlgorithm() {
+            if (reading) {
+                readAgain = true;
+                return promiseResolvedWith(undefined);
+            }
+            reading = true;
+            const readRequest = {
+                _chunkSteps: chunk => {
+                    // This needs to be delayed a microtask because it takes at least a microtask to detect errors (using
+                    // reader._closedPromise below), and we want errors in stream to error both branches immediately. We cannot let
+                    // successful synchronously-available reads get ahead of asynchronously-available errors.
+                    _queueMicrotask(() => {
+                        readAgain = false;
+                        const chunk1 = chunk;
+                        const chunk2 = chunk;
+                        // There is no way to access the cloning code right now in the reference implementation.
+                        // If we add one then we'll need an implementation for serializable objects.
+                        // if (!canceled2 && cloneForBranch2) {
+                        //   chunk2 = StructuredDeserialize(StructuredSerialize(chunk2));
+                        // }
+                        if (!canceled1) {
+                            ReadableStreamDefaultControllerEnqueue(branch1._readableStreamController, chunk1);
+                        }
+                        if (!canceled2) {
+                            ReadableStreamDefaultControllerEnqueue(branch2._readableStreamController, chunk2);
+                        }
+                        reading = false;
+                        if (readAgain) {
+                            pullAlgorithm();
+                        }
+                    });
+                },
+                _closeSteps: () => {
+                    reading = false;
+                    if (!canceled1) {
+                        ReadableStreamDefaultControllerClose(branch1._readableStreamController);
+                    }
+                    if (!canceled2) {
+                        ReadableStreamDefaultControllerClose(branch2._readableStreamController);
+                    }
+                    if (!canceled1 || !canceled2) {
+                        resolveCancelPromise(undefined);
+                    }
+                },
+                _errorSteps: () => {
+                    reading = false;
+                }
+            };
+            ReadableStreamDefaultReaderRead(reader, readRequest);
+            return promiseResolvedWith(undefined);
+        }
+        function cancel1Algorithm(reason) {
+            canceled1 = true;
+            reason1 = reason;
+            if (canceled2) {
+                const compositeReason = CreateArrayFromList([reason1, reason2]);
+                const cancelResult = ReadableStreamCancel(stream, compositeReason);
+                resolveCancelPromise(cancelResult);
+            }
+            return cancelPromise;
+        }
+        function cancel2Algorithm(reason) {
+            canceled2 = true;
+            reason2 = reason;
+            if (canceled1) {
+                const compositeReason = CreateArrayFromList([reason1, reason2]);
+                const cancelResult = ReadableStreamCancel(stream, compositeReason);
+                resolveCancelPromise(cancelResult);
+            }
+            return cancelPromise;
+        }
+        function startAlgorithm() {
+            // do nothing
+        }
+        branch1 = CreateReadableStream(startAlgorithm, pullAlgorithm, cancel1Algorithm);
+        branch2 = CreateReadableStream(startAlgorithm, pullAlgorithm, cancel2Algorithm);
+        uponRejection(reader._closedPromise, (r) => {
+            ReadableStreamDefaultControllerError(branch1._readableStreamController, r);
+            ReadableStreamDefaultControllerError(branch2._readableStreamController, r);
+            if (!canceled1 || !canceled2) {
+                resolveCancelPromise(undefined);
+            }
+            return null;
+        });
+        return [branch1, branch2];
+    }
+    function ReadableByteStreamTee(stream) {
+        let reader = AcquireReadableStreamDefaultReader(stream);
+        let reading = false;
+        let readAgainForBranch1 = false;
+        let readAgainForBranch2 = false;
+        let canceled1 = false;
+        let canceled2 = false;
+        let reason1;
+        let reason2;
+        let branch1;
+        let branch2;
+        let resolveCancelPromise;
+        const cancelPromise = newPromise(resolve => {
+            resolveCancelPromise = resolve;
+        });
+        function forwardReaderError(thisReader) {
+            uponRejection(thisReader._closedPromise, r => {
+                if (thisReader !== reader) {
+                    return null;
+                }
+                ReadableByteStreamControllerError(branch1._readableStreamController, r);
+                ReadableByteStreamControllerError(branch2._readableStreamController, r);
+                if (!canceled1 || !canceled2) {
+                    resolveCancelPromise(undefined);
+                }
+                return null;
+            });
+        }
+        function pullWithDefaultReader() {
+            if (IsReadableStreamBYOBReader(reader)) {
+                ReadableStreamReaderGenericRelease(reader);
+                reader = AcquireReadableStreamDefaultReader(stream);
+                forwardReaderError(reader);
+            }
+            const readRequest = {
+                _chunkSteps: chunk => {
+                    // This needs to be delayed a microtask because it takes at least a microtask to detect errors (using
+                    // reader._closedPromise below), and we want errors in stream to error both branches immediately. We cannot let
+                    // successful synchronously-available reads get ahead of asynchronously-available errors.
+                    _queueMicrotask(() => {
+                        readAgainForBranch1 = false;
+                        readAgainForBranch2 = false;
+                        const chunk1 = chunk;
+                        let chunk2 = chunk;
+                        if (!canceled1 && !canceled2) {
+                            try {
+                                chunk2 = CloneAsUint8Array(chunk);
+                            }
+                            catch (cloneE) {
+                                ReadableByteStreamControllerError(branch1._readableStreamController, cloneE);
+                                ReadableByteStreamControllerError(branch2._readableStreamController, cloneE);
+                                resolveCancelPromise(ReadableStreamCancel(stream, cloneE));
+                                return;
+                            }
+                        }
+                        if (!canceled1) {
+                            ReadableByteStreamControllerEnqueue(branch1._readableStreamController, chunk1);
+                        }
+                        if (!canceled2) {
+                            ReadableByteStreamControllerEnqueue(branch2._readableStreamController, chunk2);
+                        }
+                        reading = false;
+                        if (readAgainForBranch1) {
+                            pull1Algorithm();
+                        }
+                        else if (readAgainForBranch2) {
+                            pull2Algorithm();
+                        }
+                    });
+                },
+                _closeSteps: () => {
+                    reading = false;
+                    if (!canceled1) {
+                        ReadableByteStreamControllerClose(branch1._readableStreamController);
+                    }
+                    if (!canceled2) {
+                        ReadableByteStreamControllerClose(branch2._readableStreamController);
+                    }
+                    if (branch1._readableStreamController._pendingPullIntos.length > 0) {
+                        ReadableByteStreamControllerRespond(branch1._readableStreamController, 0);
+                    }
+                    if (branch2._readableStreamController._pendingPullIntos.length > 0) {
+                        ReadableByteStreamControllerRespond(branch2._readableStreamController, 0);
+                    }
+                    if (!canceled1 || !canceled2) {
+                        resolveCancelPromise(undefined);
+                    }
+                },
+                _errorSteps: () => {
+                    reading = false;
+                }
+            };
+            ReadableStreamDefaultReaderRead(reader, readRequest);
+        }
+        function pullWithBYOBReader(view, forBranch2) {
+            if (IsReadableStreamDefaultReader(reader)) {
+                ReadableStreamReaderGenericRelease(reader);
+                reader = AcquireReadableStreamBYOBReader(stream);
+                forwardReaderError(reader);
+            }
+            const byobBranch = forBranch2 ? branch2 : branch1;
+            const otherBranch = forBranch2 ? branch1 : branch2;
+            const readIntoRequest = {
+                _chunkSteps: chunk => {
+                    // This needs to be delayed a microtask because it takes at least a microtask to detect errors (using
+                    // reader._closedPromise below), and we want errors in stream to error both branches immediately. We cannot let
+                    // successful synchronously-available reads get ahead of asynchronously-available errors.
+                    _queueMicrotask(() => {
+                        readAgainForBranch1 = false;
+                        readAgainForBranch2 = false;
+                        const byobCanceled = forBranch2 ? canceled2 : canceled1;
+                        const otherCanceled = forBranch2 ? canceled1 : canceled2;
+                        if (!otherCanceled) {
+                            let clonedChunk;
+                            try {
+                                clonedChunk = CloneAsUint8Array(chunk);
+                            }
+                            catch (cloneE) {
+                                ReadableByteStreamControllerError(byobBranch._readableStreamController, cloneE);
+                                ReadableByteStreamControllerError(otherBranch._readableStreamController, cloneE);
+                                resolveCancelPromise(ReadableStreamCancel(stream, cloneE));
+                                return;
+                            }
+                            if (!byobCanceled) {
+                                ReadableByteStreamControllerRespondWithNewView(byobBranch._readableStreamController, chunk);
+                            }
+                            ReadableByteStreamControllerEnqueue(otherBranch._readableStreamController, clonedChunk);
+                        }
+                        else if (!byobCanceled) {
+                            ReadableByteStreamControllerRespondWithNewView(byobBranch._readableStreamController, chunk);
+                        }
+                        reading = false;
+                        if (readAgainForBranch1) {
+                            pull1Algorithm();
+                        }
+                        else if (readAgainForBranch2) {
+                            pull2Algorithm();
+                        }
+                    });
+                },
+                _closeSteps: chunk => {
+                    reading = false;
+                    const byobCanceled = forBranch2 ? canceled2 : canceled1;
+                    const otherCanceled = forBranch2 ? canceled1 : canceled2;
+                    if (!byobCanceled) {
+                        ReadableByteStreamControllerClose(byobBranch._readableStreamController);
+                    }
+                    if (!otherCanceled) {
+                        ReadableByteStreamControllerClose(otherBranch._readableStreamController);
+                    }
+                    if (chunk !== undefined) {
+                        if (!byobCanceled) {
+                            ReadableByteStreamControllerRespondWithNewView(byobBranch._readableStreamController, chunk);
+                        }
+                        if (!otherCanceled && otherBranch._readableStreamController._pendingPullIntos.length > 0) {
+                            ReadableByteStreamControllerRespond(otherBranch._readableStreamController, 0);
+                        }
+                    }
+                    if (!byobCanceled || !otherCanceled) {
+                        resolveCancelPromise(undefined);
+                    }
+                },
+                _errorSteps: () => {
+                    reading = false;
+                }
+            };
+            ReadableStreamBYOBReaderRead(reader, view, 1, readIntoRequest);
+        }
+        function pull1Algorithm() {
+            if (reading) {
+                readAgainForBranch1 = true;
+                return promiseResolvedWith(undefined);
+            }
+            reading = true;
+            const byobRequest = ReadableByteStreamControllerGetBYOBRequest(branch1._readableStreamController);
+            if (byobRequest === null) {
+                pullWithDefaultReader();
+            }
+            else {
+                pullWithBYOBReader(byobRequest._view, false);
+            }
+            return promiseResolvedWith(undefined);
+        }
+        function pull2Algorithm() {
+            if (reading) {
+                readAgainForBranch2 = true;
+                return promiseResolvedWith(undefined);
+            }
+            reading = true;
+            const byobRequest = ReadableByteStreamControllerGetBYOBRequest(branch2._readableStreamController);
+            if (byobRequest === null) {
+                pullWithDefaultReader();
+            }
+            else {
+                pullWithBYOBReader(byobRequest._view, true);
+            }
+            return promiseResolvedWith(undefined);
+        }
+        function cancel1Algorithm(reason) {
+            canceled1 = true;
+            reason1 = reason;
+            if (canceled2) {
+                const compositeReason = CreateArrayFromList([reason1, reason2]);
+                const cancelResult = ReadableStreamCancel(stream, compositeReason);
+                resolveCancelPromise(cancelResult);
+            }
+            return cancelPromise;
+        }
+        function cancel2Algorithm(reason) {
+            canceled2 = true;
+            reason2 = reason;
+            if (canceled1) {
+                const compositeReason = CreateArrayFromList([reason1, reason2]);
+                const cancelResult = ReadableStreamCancel(stream, compositeReason);
+                resolveCancelPromise(cancelResult);
+            }
+            return cancelPromise;
+        }
+        function startAlgorithm() {
+            return;
+        }
+        branch1 = CreateReadableByteStream(startAlgorithm, pull1Algorithm, cancel1Algorithm);
+        branch2 = CreateReadableByteStream(startAlgorithm, pull2Algorithm, cancel2Algorithm);
+        forwardReaderError(reader);
+        return [branch1, branch2];
+    }
+
+    function isReadableStreamLike(stream) {
+        return typeIsObject(stream) && typeof stream.getReader !== 'undefined';
+    }
+
+    function ReadableStreamFrom(source) {
+        if (isReadableStreamLike(source)) {
+            return ReadableStreamFromDefaultReader(source.getReader());
+        }
+        return ReadableStreamFromIterable(source);
+    }
+    function ReadableStreamFromIterable(asyncIterable) {
+        let stream;
+        const iteratorRecord = GetIterator(asyncIterable, 'async');
+        const startAlgorithm = noop;
+        function pullAlgorithm() {
+            let nextResult;
+            try {
+                nextResult = IteratorNext(iteratorRecord);
+            }
+            catch (e) {
+                return promiseRejectedWith(e);
+            }
+            const nextPromise = promiseResolvedWith(nextResult);
+            return transformPromiseWith(nextPromise, iterResult => {
+                if (!typeIsObject(iterResult)) {
+                    throw new TypeError('The promise returned by the iterator.next() method must fulfill with an object');
+                }
+                const done = IteratorComplete(iterResult);
+                if (done) {
+                    ReadableStreamDefaultControllerClose(stream._readableStreamController);
+                }
+                else {
+                    const value = IteratorValue(iterResult);
+                    ReadableStreamDefaultControllerEnqueue(stream._readableStreamController, value);
+                }
+            });
+        }
+        function cancelAlgorithm(reason) {
+            const iterator = iteratorRecord.iterator;
+            let returnMethod;
+            try {
+                returnMethod = GetMethod(iterator, 'return');
+            }
+            catch (e) {
+                return promiseRejectedWith(e);
+            }
+            if (returnMethod === undefined) {
+                return promiseResolvedWith(undefined);
+            }
+            let returnResult;
+            try {
+                returnResult = reflectCall(returnMethod, iterator, [reason]);
+            }
+            catch (e) {
+                return promiseRejectedWith(e);
+            }
+            const returnPromise = promiseResolvedWith(returnResult);
+            return transformPromiseWith(returnPromise, iterResult => {
+                if (!typeIsObject(iterResult)) {
+                    throw new TypeError('The promise returned by the iterator.return() method must fulfill with an object');
+                }
+                return undefined;
+            });
+        }
+        stream = CreateReadableStream(startAlgorithm, pullAlgorithm, cancelAlgorithm, 0);
+        return stream;
+    }
+    function ReadableStreamFromDefaultReader(reader) {
+        let stream;
+        const startAlgorithm = noop;
+        function pullAlgorithm() {
+            let readPromise;
+            try {
+                readPromise = reader.read();
+            }
+            catch (e) {
+                return promiseRejectedWith(e);
+            }
+            return transformPromiseWith(readPromise, readResult => {
+                if (!typeIsObject(readResult)) {
+                    throw new TypeError('The promise returned by the reader.read() method must fulfill with an object');
+                }
+                if (readResult.done) {
+                    ReadableStreamDefaultControllerClose(stream._readableStreamController);
+                }
+                else {
+                    const value = readResult.value;
+                    ReadableStreamDefaultControllerEnqueue(stream._readableStreamController, value);
+                }
+            });
+        }
+        function cancelAlgorithm(reason) {
+            try {
+                return promiseResolvedWith(reader.cancel(reason));
+            }
+            catch (e) {
+                return promiseRejectedWith(e);
+            }
+        }
+        stream = CreateReadableStream(startAlgorithm, pullAlgorithm, cancelAlgorithm, 0);
+        return stream;
+    }
+
+    function convertUnderlyingDefaultOrByteSource(source, context) {
+        assertDictionary(source, context);
+        const original = source;
+        const autoAllocateChunkSize = original === null || original === void 0 ? void 0 : original.autoAllocateChunkSize;
+        const cancel = original === null || original === void 0 ? void 0 : original.cancel;
+        const pull = original === null || original === void 0 ? void 0 : original.pull;
+        const start = original === null || original === void 0 ? void 0 : original.start;
+        const type = original === null || original === void 0 ? void 0 : original.type;
+        return {
+            autoAllocateChunkSize: autoAllocateChunkSize === undefined ?
+                undefined :
+                convertUnsignedLongLongWithEnforceRange(autoAllocateChunkSize, `${context} has member 'autoAllocateChunkSize' that`),
+            cancel: cancel === undefined ?
+                undefined :
+                convertUnderlyingSourceCancelCallback(cancel, original, `${context} has member 'cancel' that`),
+            pull: pull === undefined ?
+                undefined :
+                convertUnderlyingSourcePullCallback(pull, original, `${context} has member 'pull' that`),
+            start: start === undefined ?
+                undefined :
+                convertUnderlyingSourceStartCallback(start, original, `${context} has member 'start' that`),
+            type: type === undefined ? undefined : convertReadableStreamType(type, `${context} has member 'type' that`)
+        };
+    }
+    function convertUnderlyingSourceCancelCallback(fn, original, context) {
+        assertFunction(fn, context);
+        return (reason) => promiseCall(fn, original, [reason]);
+    }
+    function convertUnderlyingSourcePullCallback(fn, original, context) {
+        assertFunction(fn, context);
+        return (controller) => promiseCall(fn, original, [controller]);
+    }
+    function convertUnderlyingSourceStartCallback(fn, original, context) {
+        assertFunction(fn, context);
+        return (controller) => reflectCall(fn, original, [controller]);
+    }
+    function convertReadableStreamType(type, context) {
+        type = `${type}`;
+        if (type !== 'bytes') {
+            throw new TypeError(`${context} '${type}' is not a valid enumeration value for ReadableStreamType`);
+        }
+        return type;
+    }
+
+    function convertIteratorOptions(options, context) {
+        assertDictionary(options, context);
+        const preventCancel = options === null || options === void 0 ? void 0 : options.preventCancel;
+        return { preventCancel: Boolean(preventCancel) };
+    }
+
+    function convertPipeOptions(options, context) {
+        assertDictionary(options, context);
+        const preventAbort = options === null || options === void 0 ? void 0 : options.preventAbort;
+        const preventCancel = options === null || options === void 0 ? void 0 : options.preventCancel;
+        const preventClose = options === null || options === void 0 ? void 0 : options.preventClose;
+        const signal = options === null || options === void 0 ? void 0 : options.signal;
+        if (signal !== undefined) {
+            assertAbortSignal(signal, `${context} has member 'signal' that`);
+        }
+        return {
+            preventAbort: Boolean(preventAbort),
+            preventCancel: Boolean(preventCancel),
+            preventClose: Boolean(preventClose),
+            signal
+        };
+    }
+    function assertAbortSignal(signal, context) {
+        if (!isAbortSignal(signal)) {
+            throw new TypeError(`${context} is not an AbortSignal.`);
+        }
+    }
+
+    function convertReadableWritablePair(pair, context) {
+        assertDictionary(pair, context);
+        const readable = pair === null || pair === void 0 ? void 0 : pair.readable;
+        assertRequiredField(readable, 'readable', 'ReadableWritablePair');
+        assertReadableStream(readable, `${context} has member 'readable' that`);
+        const writable = pair === null || pair === void 0 ? void 0 : pair.writable;
+        assertRequiredField(writable, 'writable', 'ReadableWritablePair');
+        assertWritableStream(writable, `${context} has member 'writable' that`);
+        return { readable, writable };
+    }
+
+    /**
+     * A readable stream represents a source of data, from which you can read.
+     *
+     * @public
+     */
+    class ReadableStream {
+        constructor(rawUnderlyingSource = {}, rawStrategy = {}) {
+            if (rawUnderlyingSource === undefined) {
+                rawUnderlyingSource = null;
+            }
+            else {
+                assertObject(rawUnderlyingSource, 'First parameter');
+            }
+            const strategy = convertQueuingStrategy(rawStrategy, 'Second parameter');
+            const underlyingSource = convertUnderlyingDefaultOrByteSource(rawUnderlyingSource, 'First parameter');
+            InitializeReadableStream(this);
+            if (underlyingSource.type === 'bytes') {
+                if (strategy.size !== undefined) {
+                    throw new RangeError('The strategy for a byte stream cannot have a size function');
+                }
+                const highWaterMark = ExtractHighWaterMark(strategy, 0);
+                SetUpReadableByteStreamControllerFromUnderlyingSource(this, underlyingSource, highWaterMark);
+            }
+            else {
+                const sizeAlgorithm = ExtractSizeAlgorithm(strategy);
+                const highWaterMark = ExtractHighWaterMark(strategy, 1);
+                SetUpReadableStreamDefaultControllerFromUnderlyingSource(this, underlyingSource, highWaterMark, sizeAlgorithm);
+            }
+        }
+        /**
+         * Whether or not the readable stream is locked to a {@link ReadableStreamDefaultReader | reader}.
+         */
+        get locked() {
+            if (!IsReadableStream(this)) {
+                throw streamBrandCheckException$1('locked');
+            }
+            return IsReadableStreamLocked(this);
+        }
+        /**
+         * Cancels the stream, signaling a loss of interest in the stream by a consumer.
+         *
+         * The supplied `reason` argument will be given to the underlying source's {@link UnderlyingSource.cancel | cancel()}
+         * method, which might or might not use it.
+         */
+        cancel(reason = undefined) {
+            if (!IsReadableStream(this)) {
+                return promiseRejectedWith(streamBrandCheckException$1('cancel'));
+            }
+            if (IsReadableStreamLocked(this)) {
+                return promiseRejectedWith(new TypeError('Cannot cancel a stream that already has a reader'));
+            }
+            return ReadableStreamCancel(this, reason);
+        }
+        getReader(rawOptions = undefined) {
+            if (!IsReadableStream(this)) {
+                throw streamBrandCheckException$1('getReader');
+            }
+            const options = convertReaderOptions(rawOptions, 'First parameter');
+            if (options.mode === undefined) {
+                return AcquireReadableStreamDefaultReader(this);
+            }
+            return AcquireReadableStreamBYOBReader(this);
+        }
+        pipeThrough(rawTransform, rawOptions = {}) {
+            if (!IsReadableStream(this)) {
+                throw streamBrandCheckException$1('pipeThrough');
+            }
+            assertRequiredArgument(rawTransform, 1, 'pipeThrough');
+            const transform = convertReadableWritablePair(rawTransform, 'First parameter');
+            const options = convertPipeOptions(rawOptions, 'Second parameter');
+            if (IsReadableStreamLocked(this)) {
+                throw new TypeError('ReadableStream.prototype.pipeThrough cannot be used on a locked ReadableStream');
+            }
+            if (IsWritableStreamLocked(transform.writable)) {
+                throw new TypeError('ReadableStream.prototype.pipeThrough cannot be used on a locked WritableStream');
+            }
+            const promise = ReadableStreamPipeTo(this, transform.writable, options.preventClose, options.preventAbort, options.preventCancel, options.signal);
+            setPromiseIsHandledToTrue(promise);
+            return transform.readable;
+        }
+        pipeTo(destination, rawOptions = {}) {
+            if (!IsReadableStream(this)) {
+                return promiseRejectedWith(streamBrandCheckException$1('pipeTo'));
+            }
+            if (destination === undefined) {
+                return promiseRejectedWith(`Parameter 1 is required in 'pipeTo'.`);
+            }
+            if (!IsWritableStream(destination)) {
+                return promiseRejectedWith(new TypeError(`ReadableStream.prototype.pipeTo's first argument must be a WritableStream`));
+            }
+            let options;
+            try {
+                options = convertPipeOptions(rawOptions, 'Second parameter');
+            }
+            catch (e) {
+                return promiseRejectedWith(e);
+            }
+            if (IsReadableStreamLocked(this)) {
+                return promiseRejectedWith(new TypeError('ReadableStream.prototype.pipeTo cannot be used on a locked ReadableStream'));
+            }
+            if (IsWritableStreamLocked(destination)) {
+                return promiseRejectedWith(new TypeError('ReadableStream.prototype.pipeTo cannot be used on a locked WritableStream'));
+            }
+            return ReadableStreamPipeTo(this, destination, options.preventClose, options.preventAbort, options.preventCancel, options.signal);
+        }
+        /**
+         * Tees this readable stream, returning a two-element array containing the two resulting branches as
+         * new {@link ReadableStream} instances.
+         *
+         * Teeing a stream will lock it, preventing any other consumer from acquiring a reader.
+         * To cancel the stream, cancel both of the resulting branches; a composite cancellation reason will then be
+         * propagated to the stream's underlying source.
+         *
+         * Note that the chunks seen in each branch will be the same object. If the chunks are not immutable,
+         * this could allow interference between the two branches.
+         */
+        tee() {
+            if (!IsReadableStream(this)) {
+                throw streamBrandCheckException$1('tee');
+            }
+            const branches = ReadableStreamTee(this);
+            return CreateArrayFromList(branches);
+        }
+        values(rawOptions = undefined) {
+            if (!IsReadableStream(this)) {
+                throw streamBrandCheckException$1('values');
+            }
+            const options = convertIteratorOptions(rawOptions, 'First parameter');
+            return AcquireReadableStreamAsyncIterator(this, options.preventCancel);
+        }
+        [SymbolAsyncIterator](options) {
+            // Stub implementation, overridden below
+            return this.values(options);
+        }
+        /**
+         * Creates a new ReadableStream wrapping the provided iterable or async iterable.
+         *
+         * This can be used to adapt various kinds of objects into a readable stream,
+         * such as an array, an async generator, or a Node.js readable stream.
+         */
+        static from(asyncIterable) {
+            return ReadableStreamFrom(asyncIterable);
+        }
+    }
+    Object.defineProperties(ReadableStream, {
+        from: { enumerable: true }
+    });
+    Object.defineProperties(ReadableStream.prototype, {
+        cancel: { enumerable: true },
+        getReader: { enumerable: true },
+        pipeThrough: { enumerable: true },
+        pipeTo: { enumerable: true },
+        tee: { enumerable: true },
+        values: { enumerable: true },
+        locked: { enumerable: true }
+    });
+    setFunctionName(ReadableStream.from, 'from');
+    setFunctionName(ReadableStream.prototype.cancel, 'cancel');
+    setFunctionName(ReadableStream.prototype.getReader, 'getReader');
+    setFunctionName(ReadableStream.prototype.pipeThrough, 'pipeThrough');
+    setFunctionName(ReadableStream.prototype.pipeTo, 'pipeTo');
+    setFunctionName(ReadableStream.prototype.tee, 'tee');
+    setFunctionName(ReadableStream.prototype.values, 'values');
+    if (typeof Symbol.toStringTag === 'symbol') {
+        Object.defineProperty(ReadableStream.prototype, Symbol.toStringTag, {
+            value: 'ReadableStream',
+            configurable: true
+        });
+    }
+    Object.defineProperty(ReadableStream.prototype, SymbolAsyncIterator, {
+        value: ReadableStream.prototype.values,
+        writable: true,
+        configurable: true
+    });
+    // Abstract operations for the ReadableStream.
+    // Throws if and only if startAlgorithm throws.
+    function CreateReadableStream(startAlgorithm, pullAlgorithm, cancelAlgorithm, highWaterMark = 1, sizeAlgorithm = () => 1) {
+        const stream = Object.create(ReadableStream.prototype);
+        InitializeReadableStream(stream);
+        const controller = Object.create(ReadableStreamDefaultController.prototype);
+        SetUpReadableStreamDefaultController(stream, controller, startAlgorithm, pullAlgorithm, cancelAlgorithm, highWaterMark, sizeAlgorithm);
+        return stream;
+    }
+    // Throws if and only if startAlgorithm throws.
+    function CreateReadableByteStream(startAlgorithm, pullAlgorithm, cancelAlgorithm) {
+        const stream = Object.create(ReadableStream.prototype);
+        InitializeReadableStream(stream);
+        const controller = Object.create(ReadableByteStreamController.prototype);
+        SetUpReadableByteStreamController(stream, controller, startAlgorithm, pullAlgorithm, cancelAlgorithm, 0, undefined);
+        return stream;
+    }
+    function InitializeReadableStream(stream) {
+        stream._state = 'readable';
+        stream._reader = undefined;
+        stream._storedError = undefined;
+        stream._disturbed = false;
+    }
+    function IsReadableStream(x) {
+        if (!typeIsObject(x)) {
+            return false;
+        }
+        if (!Object.prototype.hasOwnProperty.call(x, '_readableStreamController')) {
+            return false;
+        }
+        return x instanceof ReadableStream;
+    }
+    function IsReadableStreamLocked(stream) {
+        if (stream._reader === undefined) {
+            return false;
+        }
+        return true;
+    }
+    // ReadableStream API exposed for controllers.
+    function ReadableStreamCancel(stream, reason) {
+        stream._disturbed = true;
+        if (stream._state === 'closed') {
+            return promiseResolvedWith(undefined);
+        }
+        if (stream._state === 'errored') {
+            return promiseRejectedWith(stream._storedError);
+        }
+        ReadableStreamClose(stream);
+        const reader = stream._reader;
+        if (reader !== undefined && IsReadableStreamBYOBReader(reader)) {
+            const readIntoRequests = reader._readIntoRequests;
+            reader._readIntoRequests = new SimpleQueue();
+            readIntoRequests.forEach(readIntoRequest => {
+                readIntoRequest._closeSteps(undefined);
+            });
+        }
+        const sourceCancelPromise = stream._readableStreamController[CancelSteps](reason);
+        return transformPromiseWith(sourceCancelPromise, noop);
+    }
+    function ReadableStreamClose(stream) {
+        stream._state = 'closed';
+        const reader = stream._reader;
+        if (reader === undefined) {
+            return;
+        }
+        defaultReaderClosedPromiseResolve(reader);
+        if (IsReadableStreamDefaultReader(reader)) {
+            const readRequests = reader._readRequests;
+            reader._readRequests = new SimpleQueue();
+            readRequests.forEach(readRequest => {
+                readRequest._closeSteps();
+            });
+        }
+    }
+    function ReadableStreamError(stream, e) {
+        stream._state = 'errored';
+        stream._storedError = e;
+        const reader = stream._reader;
+        if (reader === undefined) {
+            return;
+        }
+        defaultReaderClosedPromiseReject(reader, e);
+        if (IsReadableStreamDefaultReader(reader)) {
+            ReadableStreamDefaultReaderErrorReadRequests(reader, e);
+        }
+        else {
+            ReadableStreamBYOBReaderErrorReadIntoRequests(reader, e);
+        }
+    }
+    // Helper functions for the ReadableStream.
+    function streamBrandCheckException$1(name) {
+        return new TypeError(`ReadableStream.prototype.${name} can only be used on a ReadableStream`);
+    }
+
+    function convertQueuingStrategyInit(init, context) {
+        assertDictionary(init, context);
+        const highWaterMark = init === null || init === void 0 ? void 0 : init.highWaterMark;
+        assertRequiredField(highWaterMark, 'highWaterMark', 'QueuingStrategyInit');
+        return {
+            highWaterMark: convertUnrestrictedDouble(highWaterMark)
+        };
+    }
+
+    // The size function must not have a prototype property nor be a constructor
+    const byteLengthSizeFunction = (chunk) => {
+        return chunk.byteLength;
+    };
+    setFunctionName(byteLengthSizeFunction, 'size');
+    /**
+     * A queuing strategy that counts the number of bytes in each chunk.
+     *
+     * @public
+     */
+    class ByteLengthQueuingStrategy {
+        constructor(options) {
+            assertRequiredArgument(options, 1, 'ByteLengthQueuingStrategy');
+            options = convertQueuingStrategyInit(options, 'First parameter');
+            this._byteLengthQueuingStrategyHighWaterMark = options.highWaterMark;
+        }
+        /**
+         * Returns the high water mark provided to the constructor.
+         */
+        get highWaterMark() {
+            if (!IsByteLengthQueuingStrategy(this)) {
+                throw byteLengthBrandCheckException('highWaterMark');
+            }
+            return this._byteLengthQueuingStrategyHighWaterMark;
+        }
+        /**
+         * Measures the size of `chunk` by returning the value of its `byteLength` property.
+         */
+        get size() {
+            if (!IsByteLengthQueuingStrategy(this)) {
+                throw byteLengthBrandCheckException('size');
+            }
+            return byteLengthSizeFunction;
+        }
+    }
+    Object.defineProperties(ByteLengthQueuingStrategy.prototype, {
+        highWaterMark: { enumerable: true },
+        size: { enumerable: true }
+    });
+    if (typeof Symbol.toStringTag === 'symbol') {
+        Object.defineProperty(ByteLengthQueuingStrategy.prototype, Symbol.toStringTag, {
+            value: 'ByteLengthQueuingStrategy',
+            configurable: true
+        });
+    }
+    // Helper functions for the ByteLengthQueuingStrategy.
+    function byteLengthBrandCheckException(name) {
+        return new TypeError(`ByteLengthQueuingStrategy.prototype.${name} can only be used on a ByteLengthQueuingStrategy`);
+    }
+    function IsByteLengthQueuingStrategy(x) {
+        if (!typeIsObject(x)) {
+            return false;
+        }
+        if (!Object.prototype.hasOwnProperty.call(x, '_byteLengthQueuingStrategyHighWaterMark')) {
+            return false;
+        }
+        return x instanceof ByteLengthQueuingStrategy;
+    }
+
+    // The size function must not have a prototype property nor be a constructor
+    const countSizeFunction = () => {
+        return 1;
+    };
+    setFunctionName(countSizeFunction, 'size');
+    /**
+     * A queuing strategy that counts the number of chunks.
+     *
+     * @public
+     */
+    class CountQueuingStrategy {
+        constructor(options) {
+            assertRequiredArgument(options, 1, 'CountQueuingStrategy');
+            options = convertQueuingStrategyInit(options, 'First parameter');
+            this._countQueuingStrategyHighWaterMark = options.highWaterMark;
+        }
+        /**
+         * Returns the high water mark provided to the constructor.
+         */
+        get highWaterMark() {
+            if (!IsCountQueuingStrategy(this)) {
+                throw countBrandCheckException('highWaterMark');
+            }
+            return this._countQueuingStrategyHighWaterMark;
+        }
+        /**
+         * Measures the size of `chunk` by always returning 1.
+         * This ensures that the total queue size is a count of the number of chunks in the queue.
+         */
+        get size() {
+            if (!IsCountQueuingStrategy(this)) {
+                throw countBrandCheckException('size');
+            }
+            return countSizeFunction;
+        }
+    }
+    Object.defineProperties(CountQueuingStrategy.prototype, {
+        highWaterMark: { enumerable: true },
+        size: { enumerable: true }
+    });
+    if (typeof Symbol.toStringTag === 'symbol') {
+        Object.defineProperty(CountQueuingStrategy.prototype, Symbol.toStringTag, {
+            value: 'CountQueuingStrategy',
+            configurable: true
+        });
+    }
+    // Helper functions for the CountQueuingStrategy.
+    function countBrandCheckException(name) {
+        return new TypeError(`CountQueuingStrategy.prototype.${name} can only be used on a CountQueuingStrategy`);
+    }
+    function IsCountQueuingStrategy(x) {
+        if (!typeIsObject(x)) {
+            return false;
+        }
+        if (!Object.prototype.hasOwnProperty.call(x, '_countQueuingStrategyHighWaterMark')) {
+            return false;
+        }
+        return x instanceof CountQueuingStrategy;
+    }
+
+    function convertTransformer(original, context) {
+        assertDictionary(original, context);
+        const cancel = original === null || original === void 0 ? void 0 : original.cancel;
+        const flush = original === null || original === void 0 ? void 0 : original.flush;
+        const readableType = original === null || original === void 0 ? void 0 : original.readableType;
+        const start = original === null || original === void 0 ? void 0 : original.start;
+        const transform = original === null || original === void 0 ? void 0 : original.transform;
+        const writableType = original === null || original === void 0 ? void 0 : original.writableType;
+        return {
+            cancel: cancel === undefined ?
+                undefined :
+                convertTransformerCancelCallback(cancel, original, `${context} has member 'cancel' that`),
+            flush: flush === undefined ?
+                undefined :
+                convertTransformerFlushCallback(flush, original, `${context} has member 'flush' that`),
+            readableType,
+            start: start === undefined ?
+                undefined :
+                convertTransformerStartCallback(start, original, `${context} has member 'start' that`),
+            transform: transform === undefined ?
+                undefined :
+                convertTransformerTransformCallback(transform, original, `${context} has member 'transform' that`),
+            writableType
+        };
+    }
+    function convertTransformerFlushCallback(fn, original, context) {
+        assertFunction(fn, context);
+        return (controller) => promiseCall(fn, original, [controller]);
+    }
+    function convertTransformerStartCallback(fn, original, context) {
+        assertFunction(fn, context);
+        return (controller) => reflectCall(fn, original, [controller]);
+    }
+    function convertTransformerTransformCallback(fn, original, context) {
+        assertFunction(fn, context);
+        return (chunk, controller) => promiseCall(fn, original, [chunk, controller]);
+    }
+    function convertTransformerCancelCallback(fn, original, context) {
+        assertFunction(fn, context);
+        return (reason) => promiseCall(fn, original, [reason]);
+    }
+
+    // Class TransformStream
+    /**
+     * A transform stream consists of a pair of streams: a {@link WritableStream | writable stream},
+     * known as its writable side, and a {@link ReadableStream | readable stream}, known as its readable side.
+     * In a manner specific to the transform stream in question, writes to the writable side result in new data being
+     * made available for reading from the readable side.
+     *
+     * @public
+     */
+    class TransformStream {
+        constructor(rawTransformer = {}, rawWritableStrategy = {}, rawReadableStrategy = {}) {
+            if (rawTransformer === undefined) {
+                rawTransformer = null;
+            }
+            const writableStrategy = convertQueuingStrategy(rawWritableStrategy, 'Second parameter');
+            const readableStrategy = convertQueuingStrategy(rawReadableStrategy, 'Third parameter');
+            const transformer = convertTransformer(rawTransformer, 'First parameter');
+            if (transformer.readableType !== undefined) {
+                throw new RangeError('Invalid readableType specified');
+            }
+            if (transformer.writableType !== undefined) {
+                throw new RangeError('Invalid writableType specified');
+            }
+            const readableHighWaterMark = ExtractHighWaterMark(readableStrategy, 0);
+            const readableSizeAlgorithm = ExtractSizeAlgorithm(readableStrategy);
+            const writableHighWaterMark = ExtractHighWaterMark(writableStrategy, 1);
+            const writableSizeAlgorithm = ExtractSizeAlgorithm(writableStrategy);
+            let startPromise_resolve;
+            const startPromise = newPromise(resolve => {
+                startPromise_resolve = resolve;
+            });
+            InitializeTransformStream(this, startPromise, writableHighWaterMark, writableSizeAlgorithm, readableHighWaterMark, readableSizeAlgorithm);
+            SetUpTransformStreamDefaultControllerFromTransformer(this, transformer);
+            if (transformer.start !== undefined) {
+                startPromise_resolve(transformer.start(this._transformStreamController));
+            }
+            else {
+                startPromise_resolve(undefined);
+            }
+        }
+        /**
+         * The readable side of the transform stream.
+         */
+        get readable() {
+            if (!IsTransformStream(this)) {
+                throw streamBrandCheckException('readable');
+            }
+            return this._readable;
+        }
+        /**
+         * The writable side of the transform stream.
+         */
+        get writable() {
+            if (!IsTransformStream(this)) {
+                throw streamBrandCheckException('writable');
+            }
+            return this._writable;
+        }
+    }
+    Object.defineProperties(TransformStream.prototype, {
+        readable: { enumerable: true },
+        writable: { enumerable: true }
+    });
+    if (typeof Symbol.toStringTag === 'symbol') {
+        Object.defineProperty(TransformStream.prototype, Symbol.toStringTag, {
+            value: 'TransformStream',
+            configurable: true
+        });
+    }
+    function InitializeTransformStream(stream, startPromise, writableHighWaterMark, writableSizeAlgorithm, readableHighWaterMark, readableSizeAlgorithm) {
+        function startAlgorithm() {
+            return startPromise;
+        }
+        function writeAlgorithm(chunk) {
+            return TransformStreamDefaultSinkWriteAlgorithm(stream, chunk);
+        }
+        function abortAlgorithm(reason) {
+            return TransformStreamDefaultSinkAbortAlgorithm(stream, reason);
+        }
+        function closeAlgorithm() {
+            return TransformStreamDefaultSinkCloseAlgorithm(stream);
+        }
+        stream._writable = CreateWritableStream(startAlgorithm, writeAlgorithm, closeAlgorithm, abortAlgorithm, writableHighWaterMark, writableSizeAlgorithm);
+        function pullAlgorithm() {
+            return TransformStreamDefaultSourcePullAlgorithm(stream);
+        }
+        function cancelAlgorithm(reason) {
+            return TransformStreamDefaultSourceCancelAlgorithm(stream, reason);
+        }
+        stream._readable = CreateReadableStream(startAlgorithm, pullAlgorithm, cancelAlgorithm, readableHighWaterMark, readableSizeAlgorithm);
+        // The [[backpressure]] slot is set to undefined so that it can be initialised by TransformStreamSetBackpressure.
+        stream._backpressure = undefined;
+        stream._backpressureChangePromise = undefined;
+        stream._backpressureChangePromise_resolve = undefined;
+        TransformStreamSetBackpressure(stream, true);
+        stream._transformStreamController = undefined;
+    }
+    function IsTransformStream(x) {
+        if (!typeIsObject(x)) {
+            return false;
+        }
+        if (!Object.prototype.hasOwnProperty.call(x, '_transformStreamController')) {
+            return false;
+        }
+        return x instanceof TransformStream;
+    }
+    // This is a no-op if both sides are already errored.
+    function TransformStreamError(stream, e) {
+        ReadableStreamDefaultControllerError(stream._readable._readableStreamController, e);
+        TransformStreamErrorWritableAndUnblockWrite(stream, e);
+    }
+    function TransformStreamErrorWritableAndUnblockWrite(stream, e) {
+        TransformStreamDefaultControllerClearAlgorithms(stream._transformStreamController);
+        WritableStreamDefaultControllerErrorIfNeeded(stream._writable._writableStreamController, e);
+        TransformStreamUnblockWrite(stream);
+    }
+    function TransformStreamUnblockWrite(stream) {
+        if (stream._backpressure) {
+            // Pretend that pull() was called to permit any pending write() calls to complete. TransformStreamSetBackpressure()
+            // cannot be called from enqueue() or pull() once the ReadableStream is errored, so this will will be the final time
+            // _backpressure is set.
+            TransformStreamSetBackpressure(stream, false);
+        }
+    }
+    function TransformStreamSetBackpressure(stream, backpressure) {
+        // Passes also when called during construction.
+        if (stream._backpressureChangePromise !== undefined) {
+            stream._backpressureChangePromise_resolve();
+        }
+        stream._backpressureChangePromise = newPromise(resolve => {
+            stream._backpressureChangePromise_resolve = resolve;
+        });
+        stream._backpressure = backpressure;
+    }
+    // Class TransformStreamDefaultController
+    /**
+     * Allows control of the {@link ReadableStream} and {@link WritableStream} of the associated {@link TransformStream}.
+     *
+     * @public
+     */
+    class TransformStreamDefaultController {
+        constructor() {
+            throw new TypeError('Illegal constructor');
+        }
+        /**
+         * Returns the desired size to fill the readable side’s internal queue. It can be negative, if the queue is over-full.
+         */
+        get desiredSize() {
+            if (!IsTransformStreamDefaultController(this)) {
+                throw defaultControllerBrandCheckException('desiredSize');
+            }
+            const readableController = this._controlledTransformStream._readable._readableStreamController;
+            return ReadableStreamDefaultControllerGetDesiredSize(readableController);
+        }
+        enqueue(chunk = undefined) {
+            if (!IsTransformStreamDefaultController(this)) {
+                throw defaultControllerBrandCheckException('enqueue');
+            }
+            TransformStreamDefaultControllerEnqueue(this, chunk);
+        }
+        /**
+         * Errors both the readable side and the writable side of the controlled transform stream, making all future
+         * interactions with it fail with the given error `e`. Any chunks queued for transformation will be discarded.
+         */
+        error(reason = undefined) {
+            if (!IsTransformStreamDefaultController(this)) {
+                throw defaultControllerBrandCheckException('error');
+            }
+            TransformStreamDefaultControllerError(this, reason);
+        }
+        /**
+         * Closes the readable side and errors the writable side of the controlled transform stream. This is useful when the
+         * transformer only needs to consume a portion of the chunks written to the writable side.
+         */
+        terminate() {
+            if (!IsTransformStreamDefaultController(this)) {
+                throw defaultControllerBrandCheckException('terminate');
+            }
+            TransformStreamDefaultControllerTerminate(this);
+        }
+    }
+    Object.defineProperties(TransformStreamDefaultController.prototype, {
+        enqueue: { enumerable: true },
+        error: { enumerable: true },
+        terminate: { enumerable: true },
+        desiredSize: { enumerable: true }
+    });
+    setFunctionName(TransformStreamDefaultController.prototype.enqueue, 'enqueue');
+    setFunctionName(TransformStreamDefaultController.prototype.error, 'error');
+    setFunctionName(TransformStreamDefaultController.prototype.terminate, 'terminate');
+    if (typeof Symbol.toStringTag === 'symbol') {
+        Object.defineProperty(TransformStreamDefaultController.prototype, Symbol.toStringTag, {
+            value: 'TransformStreamDefaultController',
+            configurable: true
+        });
+    }
+    // Transform Stream Default Controller Abstract Operations
+    function IsTransformStreamDefaultController(x) {
+        if (!typeIsObject(x)) {
+            return false;
+        }
+        if (!Object.prototype.hasOwnProperty.call(x, '_controlledTransformStream')) {
+            return false;
+        }
+        return x instanceof TransformStreamDefaultController;
+    }
+    function SetUpTransformStreamDefaultController(stream, controller, transformAlgorithm, flushAlgorithm, cancelAlgorithm) {
+        controller._controlledTransformStream = stream;
+        stream._transformStreamController = controller;
+        controller._transformAlgorithm = transformAlgorithm;
+        controller._flushAlgorithm = flushAlgorithm;
+        controller._cancelAlgorithm = cancelAlgorithm;
+        controller._finishPromise = undefined;
+        controller._finishPromise_resolve = undefined;
+        controller._finishPromise_reject = undefined;
+    }
+    function SetUpTransformStreamDefaultControllerFromTransformer(stream, transformer) {
+        const controller = Object.create(TransformStreamDefaultController.prototype);
+        let transformAlgorithm;
+        let flushAlgorithm;
+        let cancelAlgorithm;
+        if (transformer.transform !== undefined) {
+            transformAlgorithm = chunk => transformer.transform(chunk, controller);
+        }
+        else {
+            transformAlgorithm = chunk => {
+                try {
+                    TransformStreamDefaultControllerEnqueue(controller, chunk);
+                    return promiseResolvedWith(undefined);
+                }
+                catch (transformResultE) {
+                    return promiseRejectedWith(transformResultE);
+                }
+            };
+        }
+        if (transformer.flush !== undefined) {
+            flushAlgorithm = () => transformer.flush(controller);
+        }
+        else {
+            flushAlgorithm = () => promiseResolvedWith(undefined);
+        }
+        if (transformer.cancel !== undefined) {
+            cancelAlgorithm = reason => transformer.cancel(reason);
+        }
+        else {
+            cancelAlgorithm = () => promiseResolvedWith(undefined);
+        }
+        SetUpTransformStreamDefaultController(stream, controller, transformAlgorithm, flushAlgorithm, cancelAlgorithm);
+    }
+    function TransformStreamDefaultControllerClearAlgorithms(controller) {
+        controller._transformAlgorithm = undefined;
+        controller._flushAlgorithm = undefined;
+        controller._cancelAlgorithm = undefined;
+    }
+    function TransformStreamDefaultControllerEnqueue(controller, chunk) {
+        const stream = controller._controlledTransformStream;
+        const readableController = stream._readable._readableStreamController;
+        if (!ReadableStreamDefaultControllerCanCloseOrEnqueue(readableController)) {
+            throw new TypeError('Readable side is not in a state that permits enqueue');
+        }
+        // We throttle transform invocations based on the backpressure of the ReadableStream, but we still
+        // accept TransformStreamDefaultControllerEnqueue() calls.
+        try {
+            ReadableStreamDefaultControllerEnqueue(readableController, chunk);
+        }
+        catch (e) {
+            // This happens when readableStrategy.size() throws.
+            TransformStreamErrorWritableAndUnblockWrite(stream, e);
+            throw stream._readable._storedError;
+        }
+        const backpressure = ReadableStreamDefaultControllerHasBackpressure(readableController);
+        if (backpressure !== stream._backpressure) {
+            TransformStreamSetBackpressure(stream, true);
+        }
+    }
+    function TransformStreamDefaultControllerError(controller, e) {
+        TransformStreamError(controller._controlledTransformStream, e);
+    }
+    function TransformStreamDefaultControllerPerformTransform(controller, chunk) {
+        const transformPromise = controller._transformAlgorithm(chunk);
+        return transformPromiseWith(transformPromise, undefined, r => {
+            TransformStreamError(controller._controlledTransformStream, r);
+            throw r;
+        });
+    }
+    function TransformStreamDefaultControllerTerminate(controller) {
+        const stream = controller._controlledTransformStream;
+        const readableController = stream._readable._readableStreamController;
+        ReadableStreamDefaultControllerClose(readableController);
+        const error = new TypeError('TransformStream terminated');
+        TransformStreamErrorWritableAndUnblockWrite(stream, error);
+    }
+    // TransformStreamDefaultSink Algorithms
+    function TransformStreamDefaultSinkWriteAlgorithm(stream, chunk) {
+        const controller = stream._transformStreamController;
+        if (stream._backpressure) {
+            const backpressureChangePromise = stream._backpressureChangePromise;
+            return transformPromiseWith(backpressureChangePromise, () => {
+                const writable = stream._writable;
+                const state = writable._state;
+                if (state === 'erroring') {
+                    throw writable._storedError;
+                }
+                return TransformStreamDefaultControllerPerformTransform(controller, chunk);
+            });
+        }
+        return TransformStreamDefaultControllerPerformTransform(controller, chunk);
+    }
+    function TransformStreamDefaultSinkAbortAlgorithm(stream, reason) {
+        const controller = stream._transformStreamController;
+        if (controller._finishPromise !== undefined) {
+            return controller._finishPromise;
+        }
+        // stream._readable cannot change after construction, so caching it across a call to user code is safe.
+        const readable = stream._readable;
+        // Assign the _finishPromise now so that if _cancelAlgorithm calls readable.cancel() internally,
+        // we don't run the _cancelAlgorithm again.
+        controller._finishPromise = newPromise((resolve, reject) => {
+            controller._finishPromise_resolve = resolve;
+            controller._finishPromise_reject = reject;
+        });
+        const cancelPromise = controller._cancelAlgorithm(reason);
+        TransformStreamDefaultControllerClearAlgorithms(controller);
+        uponPromise(cancelPromise, () => {
+            if (readable._state === 'errored') {
+                defaultControllerFinishPromiseReject(controller, readable._storedError);
+            }
+            else {
+                ReadableStreamDefaultControllerError(readable._readableStreamController, reason);
+                defaultControllerFinishPromiseResolve(controller);
+            }
+            return null;
+        }, r => {
+            ReadableStreamDefaultControllerError(readable._readableStreamController, r);
+            defaultControllerFinishPromiseReject(controller, r);
+            return null;
+        });
+        return controller._finishPromise;
+    }
+    function TransformStreamDefaultSinkCloseAlgorithm(stream) {
+        const controller = stream._transformStreamController;
+        if (controller._finishPromise !== undefined) {
+            return controller._finishPromise;
+        }
+        // stream._readable cannot change after construction, so caching it across a call to user code is safe.
+        const readable = stream._readable;
+        // Assign the _finishPromise now so that if _flushAlgorithm calls readable.cancel() internally,
+        // we don't also run the _cancelAlgorithm.
+        controller._finishPromise = newPromise((resolve, reject) => {
+            controller._finishPromise_resolve = resolve;
+            controller._finishPromise_reject = reject;
+        });
+        const flushPromise = controller._flushAlgorithm();
+        TransformStreamDefaultControllerClearAlgorithms(controller);
+        uponPromise(flushPromise, () => {
+            if (readable._state === 'errored') {
+                defaultControllerFinishPromiseReject(controller, readable._storedError);
+            }
+            else {
+                ReadableStreamDefaultControllerClose(readable._readableStreamController);
+                defaultControllerFinishPromiseResolve(controller);
+            }
+            return null;
+        }, r => {
+            ReadableStreamDefaultControllerError(readable._readableStreamController, r);
+            defaultControllerFinishPromiseReject(controller, r);
+            return null;
+        });
+        return controller._finishPromise;
+    }
+    // TransformStreamDefaultSource Algorithms
+    function TransformStreamDefaultSourcePullAlgorithm(stream) {
+        // Invariant. Enforced by the promises returned by start() and pull().
+        TransformStreamSetBackpressure(stream, false);
+        // Prevent the next pull() call until there is backpressure.
+        return stream._backpressureChangePromise;
+    }
+    function TransformStreamDefaultSourceCancelAlgorithm(stream, reason) {
+        const controller = stream._transformStreamController;
+        if (controller._finishPromise !== undefined) {
+            return controller._finishPromise;
+        }
+        // stream._writable cannot change after construction, so caching it across a call to user code is safe.
+        const writable = stream._writable;
+        // Assign the _finishPromise now so that if _flushAlgorithm calls writable.abort() or
+        // writable.cancel() internally, we don't run the _cancelAlgorithm again, or also run the
+        // _flushAlgorithm.
+        controller._finishPromise = newPromise((resolve, reject) => {
+            controller._finishPromise_resolve = resolve;
+            controller._finishPromise_reject = reject;
+        });
+        const cancelPromise = controller._cancelAlgorithm(reason);
+        TransformStreamDefaultControllerClearAlgorithms(controller);
+        uponPromise(cancelPromise, () => {
+            if (writable._state === 'errored') {
+                defaultControllerFinishPromiseReject(controller, writable._storedError);
+            }
+            else {
+                WritableStreamDefaultControllerErrorIfNeeded(writable._writableStreamController, reason);
+                TransformStreamUnblockWrite(stream);
+                defaultControllerFinishPromiseResolve(controller);
+            }
+            return null;
+        }, r => {
+            WritableStreamDefaultControllerErrorIfNeeded(writable._writableStreamController, r);
+            TransformStreamUnblockWrite(stream);
+            defaultControllerFinishPromiseReject(controller, r);
+            return null;
+        });
+        return controller._finishPromise;
+    }
+    // Helper functions for the TransformStreamDefaultController.
+    function defaultControllerBrandCheckException(name) {
+        return new TypeError(`TransformStreamDefaultController.prototype.${name} can only be used on a TransformStreamDefaultController`);
+    }
+    function defaultControllerFinishPromiseResolve(controller) {
+        if (controller._finishPromise_resolve === undefined) {
+            return;
+        }
+        controller._finishPromise_resolve();
+        controller._finishPromise_resolve = undefined;
+        controller._finishPromise_reject = undefined;
+    }
+    function defaultControllerFinishPromiseReject(controller, reason) {
+        if (controller._finishPromise_reject === undefined) {
+            return;
+        }
+        setPromiseIsHandledToTrue(controller._finishPromise);
+        controller._finishPromise_reject(reason);
+        controller._finishPromise_resolve = undefined;
+        controller._finishPromise_reject = undefined;
+    }
+    // Helper functions for the TransformStream.
+    function streamBrandCheckException(name) {
+        return new TypeError(`TransformStream.prototype.${name} can only be used on a TransformStream`);
+    }
+
+    exports.ByteLengthQueuingStrategy = ByteLengthQueuingStrategy;
+    exports.CountQueuingStrategy = CountQueuingStrategy;
+    exports.ReadableByteStreamController = ReadableByteStreamController;
+    exports.ReadableStream = ReadableStream;
+    exports.ReadableStreamBYOBReader = ReadableStreamBYOBReader;
+    exports.ReadableStreamBYOBRequest = ReadableStreamBYOBRequest;
+    exports.ReadableStreamDefaultController = ReadableStreamDefaultController;
+    exports.ReadableStreamDefaultReader = ReadableStreamDefaultReader;
+    exports.TransformStream = TransformStream;
+    exports.TransformStreamDefaultController = TransformStreamDefaultController;
+    exports.WritableStream = WritableStream;
+    exports.WritableStreamDefaultController = WritableStreamDefaultController;
+    exports.WritableStreamDefaultWriter = WritableStreamDefaultWriter;
+
+}));
+//# sourceMappingURL=ponyfill.es2018.js.map
+
+
+/***/ }),
+
+/***/ 2940:
+/***/ ((module) => {
+
+// Returns a wrapper function that returns a wrapped callback
+// The wrapper function should do some stuff, and return a
+// presumably different callback function.
+// This makes sure that own properties are retained, so that
+// decorations and such are not lost along the way.
+module.exports = wrappy
+function wrappy (fn, cb) {
+  if (fn && cb) return wrappy(fn)(cb)
+
+  if (typeof fn !== 'function')
+    throw new TypeError('need wrapper function')
+
+  Object.keys(fn).forEach(function (k) {
+    wrapper[k] = fn[k]
+  })
+
+  return wrapper
+
+  function wrapper() {
+    var args = new Array(arguments.length)
+    for (var i = 0; i < args.length; i++) {
+      args[i] = arguments[i]
+    }
+    var ret = fn.apply(this, args)
+    var cb = args[args.length-1]
+    if (typeof ret === 'function' && ret !== cb) {
+      Object.keys(cb).forEach(function (k) {
+        ret[k] = cb[k]
+      })
+    }
+    return ret
+  }
+}
+
+
+/***/ }),
+
+/***/ 2644:
+/***/ (function(__unused_webpack_module, exports, __nccwpck_require__) {
+
+"use strict";
+
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", ({ value: true }));
+const core_1 = __nccwpck_require__(2186);
+const github_1 = __nccwpck_require__(5438);
+const CONST_1 = __importDefault(__nccwpck_require__(9873));
+const GithubUtils_1 = __importDefault(__nccwpck_require__(9296));
+const OpenAIUtils_1 = __importDefault(__nccwpck_require__(3));
+function isCommentCreatedOrEditedEvent(payload) {
+    return payload.action === CONST_1.default.ACTIONS.CREATED || payload.action === CONST_1.default.ACTIONS.EDIT;
+}
+function isCommentCreatedEvent(payload) {
+    return payload.action === CONST_1.default.ACTIONS.CREATED;
+}
+// Main function to process the workflow event
+async function run() {
+    // get date early, as soon as the workflow starts running
+    const date = new Date();
+    // Verify this is running for an expected webhook event
+    if (github_1.context.eventName !== CONST_1.default.EVENTS.ISSUE_COMMENT) {
+        throw new Error('ProposalPolice™ only supports the issue_comment webhook event');
+    }
+    const payload = github_1.context.payload;
+    // check if the issue is open and the has labels
+    if (payload.issue?.state !== 'open' && !payload.issue?.labels.some((issueLabel) => issueLabel.name === CONST_1.default.LABELS.HELP_WANTED)) {
+        return;
+    }
+    // Verify that the comment is not empty and contains the case sensitive `Proposal` keyword
+    if (!payload.comment?.body.trim() || !payload.comment?.body.includes(CONST_1.default.PROPOSAL_KEYWORD)) {
+        console.log('Comment body is either empty or doesn\'t contain the keyword "Proposal": ', payload.comment?.body);
+        return;
+    }
+    console.log('ProposalPolice™ Action triggered for comment:', payload.comment?.body);
+    console.log('-> GitHub Action Type: ', payload.action?.toUpperCase());
+    if (!isCommentCreatedOrEditedEvent(payload)) {
+        console.error('Unsupported action type:', payload?.action);
+        (0, core_1.setFailed)(new Error(`Unsupported action type ${payload?.action}`));
+        return;
+    }
+    const prompt = isCommentCreatedEvent(payload)
+        ? `I NEED HELP WITH CASE (1.), CHECK IF COMMENT IS PROPOSAL AND IF TEMPLATE IS FOLLOWED AS PER INSTRUCTIONS. IT IS MANDATORY THAT YOU RESPOND ONLY WITH "${CONST_1.default.NO_ACTION}" IN CASE THE COMMENT IS NOT A PROPOSAL. Comment content: ${payload.comment?.body}`
+        : `I NEED HELP WITH CASE (2.) WHEN A USER THAT POSTED AN INITIAL PROPOSAL OR COMMENT (UNEDITED) THEN EDITS THE COMMENT - WE NEED TO CLASSIFY THE COMMENT BASED IN THE GIVEN INSTRUCTIONS AND IF TEMPLATE IS FOLLOWED AS PER INSTRUCTIONS. IT IS MANDATORY THAT YOU RESPOND ONLY WITH "${CONST_1.default.NO_ACTION}" IN CASE THE COMMENT IS NOT A PROPOSAL. \n\nPrevious comment content: ${payload.changes.body?.from}.\n\nEdited comment content: ${payload.comment?.body}`;
+    const assistantResponse = await OpenAIUtils_1.default.prompt(prompt);
+    // check if assistant response is either NO_ACTION or "NO_ACTION" strings
+    // as sometimes the assistant response varies
+    const isNoAction = assistantResponse.trim().replaceAll(' ', '_').replaceAll('"', '').toUpperCase() === CONST_1.default.NO_ACTION;
+    // If assistant response is NO_ACTION, do nothing
+    if (isNoAction) {
+        console.log('Detected NO_ACTION for comment, returning early');
+        return;
+    }
+    // if the assistant responded with no action but there's some context in the response
+    if (assistantResponse.includes(`[${CONST_1.default.NO_ACTION}]`)) {
+        // extract the text after [NO_ACTION] from assistantResponse since this is a
+        // bot related action keyword
+        const noActionContext = assistantResponse.split(`[${CONST_1.default.NO_ACTION}] `)?.[1]?.replace('"', '');
+        console.log('[NO_ACTION] w/ context: ', noActionContext);
+        return;
+    }
+    if (isCommentCreatedEvent(payload)) {
+        const formattedResponse = assistantResponse
+            // replace {user} from response template with @username
+            .replaceAll('{user}', `@${payload.comment?.user.login}`)
+            // replace {proposalLink} from response template with the link to the comment
+            .replaceAll('{proposalLink}', payload.comment?.html_url)
+            // remove any double quotes from the final comment because sometimes the assistant's
+            // response contains double quotes / sometimes it doesn't
+            .replaceAll('"', '');
+        // Create a comment with the assistant's response
+        console.log('ProposalPolice™ commenting on issue...');
+        await GithubUtils_1.default.createComment(CONST_1.default.APP_REPO, github_1.context.issue.number, formattedResponse);
+        // edit comment if assistant detected substantial changes and if the comment was not edited already by the bot
+    }
+    else if (assistantResponse.includes('[EDIT_COMMENT]') && !payload.comment?.body.includes('Edited by **proposal-police**')) {
+        // extract the text after [EDIT_COMMENT] from assistantResponse since this is a
+        // bot related action keyword
+        let extractedNotice = assistantResponse.split('[EDIT_COMMENT] ')?.[1]?.replace('"', '');
+        // format the date like: 2024-01-24 13:15:24 UTC not 2024-01-28 18:18:28.000 UTC
+        const formattedDate = `${date.toISOString()?.split('.')?.[0]?.replace('T', ' ')} UTC`;
+        extractedNotice = extractedNotice.replace('{updated_timestamp}', formattedDate);
+        console.log('ProposalPolice™ editing issue comment...', payload.comment.id);
+        await GithubUtils_1.default.octokit.issues.updateComment({
+            ...github_1.context.repo,
+            /* eslint-disable @typescript-eslint/naming-convention */
+            comment_id: payload.comment.id,
+            body: `${extractedNotice}\n\n${payload.comment?.body}`,
+        });
+    }
+}
+run().catch((error) => {
+    console.error(error);
+    // Zero status ensures that the action is marked as successful regardless the outcome
+    // which means that no failure notification is sent to issue's subscribers
+    process.exit(0);
+});
+
+
+/***/ }),
+
+/***/ 9873:
+/***/ ((__unused_webpack_module, exports) => {
+
+"use strict";
+
+Object.defineProperty(exports, "__esModule", ({ value: true }));
+const GITHUB_BASE_URL_REGEX = new RegExp('https?://(?:github\\.com|api\\.github\\.com)');
+const GIT_CONST = {
+    GITHUB_OWNER: 'Expensify',
+    APP_REPO: 'App',
+};
+const CONST = {
+    ...GIT_CONST,
+    APPLAUSE_BOT: 'applausebot',
+    OS_BOTIFY: 'OSBotify',
+    LABELS: {
+        STAGING_DEPLOY: 'StagingDeployCash',
+        DEPLOY_BLOCKER: 'DeployBlockerCash',
+        INTERNAL_QA: 'InternalQA',
+        HELP_WANTED: 'Help Wanted',
+        CP_STAGING: 'CP Staging',
+    },
+    ACTIONS: {
+        CREATED: 'created',
+        EDIT: 'edited',
+    },
+    EVENTS: {
+        ISSUE_COMMENT: 'issue_comment',
+    },
+    OPENAI_ROLES: {
+        USER: 'user',
+        ASSISTANT: 'assistant',
+    },
+    PROPOSAL_KEYWORD: 'Proposal',
+    OPENAI_THREAD_COMPLETED: 'completed',
+    DATE_FORMAT_STRING: 'yyyy-MM-dd',
+    PULL_REQUEST_REGEX: new RegExp(`${GITHUB_BASE_URL_REGEX.source}/.*/.*/pull/([0-9]+).*`),
+    ISSUE_REGEX: new RegExp(`${GITHUB_BASE_URL_REGEX.source}/.*/.*/issues/([0-9]+).*`),
+    ISSUE_OR_PULL_REQUEST_REGEX: new RegExp(`${GITHUB_BASE_URL_REGEX.source}/.*/.*/(?:pull|issues)/([0-9]+).*`),
+    POLL_RATE: 10000,
+    APP_REPO_URL: `https://github.com/${GIT_CONST.GITHUB_OWNER}/${GIT_CONST.APP_REPO}`,
+    APP_REPO_GIT_URL: `git@github.com:${GIT_CONST.GITHUB_OWNER}/${GIT_CONST.APP_REPO}.git`,
+    NO_ACTION: 'NO_ACTION',
+    OPENAI_POLL_RATE: 1500,
+    OPENAI_POLL_TIMEOUT: 90000,
+};
+exports["default"] = CONST;
+
+
+/***/ }),
+
+/***/ 9296:
+/***/ (function(__unused_webpack_module, exports, __nccwpck_require__) {
+
+"use strict";
+
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", ({ value: true }));
+/* eslint-disable @typescript-eslint/naming-convention, import/no-import-module-exports */
+const core = __importStar(__nccwpck_require__(2186));
+const utils_1 = __nccwpck_require__(3030);
+const plugin_paginate_rest_1 = __nccwpck_require__(4193);
+const plugin_throttling_1 = __nccwpck_require__(9968);
+const EmptyObject_1 = __nccwpck_require__(8227);
+const arrayDifference_1 = __importDefault(__nccwpck_require__(7034));
+const CONST_1 = __importDefault(__nccwpck_require__(9873));
+class GithubUtils {
+    static internalOctokit;
+    /**
+     * Initialize internal octokit.
+     * NOTE: When using GithubUtils in CI, you don't need to call this manually.
+     */
+    static initOctokitWithToken(token) {
+        const Octokit = utils_1.GitHub.plugin(plugin_throttling_1.throttling, plugin_paginate_rest_1.paginateRest);
+        // Save a copy of octokit used in this class
+        this.internalOctokit = new Octokit((0, utils_1.getOctokitOptions)(token, {
+            throttle: {
+                retryAfterBaseValue: 2000,
+                onRateLimit: (retryAfter, options) => {
+                    console.warn(`Request quota exhausted for request ${options.method} ${options.url}`);
+                    // Retry five times when hitting a rate limit error, then give up
+                    if (options.request.retryCount <= 5) {
+                        console.log(`Retrying after ${retryAfter} seconds!`);
+                        return true;
+                    }
+                },
+                onAbuseLimit: (retryAfter, options) => {
+                    // does not retry, only logs a warning
+                    console.warn(`Abuse detected for request ${options.method} ${options.url}`);
+                },
+            },
+        }));
+    }
+    /**
+     * Default initialize method assuming running in CI, getting the token from an input.
+     *
+     * @private
+     */
+    static initOctokit() {
+        const token = core.getInput('GITHUB_TOKEN', { required: true });
+        this.initOctokitWithToken(token);
+    }
+    /**
+     * Either give an existing instance of Octokit rest or create a new one
+     *
+     * @readonly
+     * @static
+     */
+    static get octokit() {
+        if (!this.internalOctokit) {
+            this.initOctokit();
+        }
+        // eslint-disable-next-line @typescript-eslint/non-nullable-type-assertion-style
+        return this.internalOctokit.rest;
+    }
+    /**
+     * Get the graphql instance from internal octokit.
+     * @readonly
+     * @static
+     */
+    static get graphql() {
+        if (!this.internalOctokit) {
+            this.initOctokit();
+        }
+        // eslint-disable-next-line @typescript-eslint/non-nullable-type-assertion-style
+        return this.internalOctokit.graphql;
+    }
+    /**
+     * Either give an existing instance of Octokit paginate or create a new one
+     *
+     * @readonly
+     * @static
+     */
+    static get paginate() {
+        if (!this.internalOctokit) {
+            this.initOctokit();
+        }
+        // eslint-disable-next-line @typescript-eslint/non-nullable-type-assertion-style
+        return this.internalOctokit.paginate;
+    }
+    /**
+     * Finds one open `StagingDeployCash` issue via GitHub octokit library.
+     */
+    static getStagingDeployCash() {
+        return this.octokit.issues
+            .listForRepo({
+            owner: CONST_1.default.GITHUB_OWNER,
+            repo: CONST_1.default.APP_REPO,
+            labels: CONST_1.default.LABELS.STAGING_DEPLOY,
+            state: 'open',
+        })
+            .then(({ data }) => {
+            if (!data.length) {
+                throw new Error(`Unable to find ${CONST_1.default.LABELS.STAGING_DEPLOY} issue.`);
+            }
+            if (data.length > 1) {
+                throw new Error(`Found more than one ${CONST_1.default.LABELS.STAGING_DEPLOY} issue.`);
+            }
+            return this.getStagingDeployCashData(data[0]);
+        });
+    }
+    /**
+     * Takes in a GitHub issue object and returns the data we want.
+     */
+    static getStagingDeployCashData(issue) {
+        try {
+            const versionRegex = new RegExp('([0-9]+)\\.([0-9]+)\\.([0-9]+)(?:-([0-9]+))?', 'g');
+            const tag = issue.body?.match(versionRegex)?.[0].replace(/`/g, '');
+            return {
+                title: issue.title,
+                url: issue.url,
+                number: this.getIssueOrPullRequestNumberFromURL(issue.url),
+                labels: issue.labels,
+                PRList: this.getStagingDeployCashPRList(issue),
+                deployBlockers: this.getStagingDeployCashDeployBlockers(issue),
+                internalQAPRList: this.getStagingDeployCashInternalQA(issue),
+                isTimingDashboardChecked: issue.body ? /-\s\[x]\sI checked the \[App Timing Dashboard]/.test(issue.body) : false,
+                isFirebaseChecked: issue.body ? /-\s\[x]\sI checked \[Firebase Crashlytics]/.test(issue.body) : false,
+                isGHStatusChecked: issue.body ? /-\s\[x]\sI checked \[GitHub Status]/.test(issue.body) : false,
+                tag,
+            };
+        }
+        catch (exception) {
+            throw new Error(`Unable to find ${CONST_1.default.LABELS.STAGING_DEPLOY} issue with correct data.`);
+        }
+    }
+    /**
+     * Parse the PRList and Internal QA section of the StagingDeployCash issue body.
+     *
+     * @private
+     */
+    static getStagingDeployCashPRList(issue) {
+        let PRListSection = issue.body?.match(/pull requests:\*\*\r?\n((?:-.*\r?\n)+)\r?\n\r?\n?/) ?? null;
+        if (PRListSection?.length !== 2) {
+            // No PRs, return an empty array
+            console.log('Hmmm...The open StagingDeployCash does not list any pull requests, continuing...');
+            return [];
+        }
+        PRListSection = PRListSection[1];
+        const PRList = [...PRListSection.matchAll(new RegExp(`- \\[([ x])] (${CONST_1.default.PULL_REQUEST_REGEX.source})`, 'g'))].map((match) => ({
+            url: match[2],
+            number: Number.parseInt(match[3], 10),
+            isVerified: match[1] === 'x',
+        }));
+        return PRList.sort((a, b) => a.number - b.number);
+    }
+    /**
+     * Parse DeployBlocker section of the StagingDeployCash issue body.
+     *
+     * @private
+     */
+    static getStagingDeployCashDeployBlockers(issue) {
+        let deployBlockerSection = issue.body?.match(/Deploy Blockers:\*\*\r?\n((?:-.*\r?\n)+)/) ?? null;
+        if (deployBlockerSection?.length !== 2) {
+            return [];
+        }
+        deployBlockerSection = deployBlockerSection[1];
+        const deployBlockers = [...deployBlockerSection.matchAll(new RegExp(`- \\[([ x])]\\s(${CONST_1.default.ISSUE_OR_PULL_REQUEST_REGEX.source})`, 'g'))].map((match) => ({
+            url: match[2],
+            number: Number.parseInt(match[3], 10),
+            isResolved: match[1] === 'x',
+        }));
+        return deployBlockers.sort((a, b) => a.number - b.number);
+    }
+    /**
+     * Parse InternalQA section of the StagingDeployCash issue body.
+     *
+     * @private
+     */
+    static getStagingDeployCashInternalQA(issue) {
+        let internalQASection = issue.body?.match(/Internal QA:\*\*\r?\n((?:- \[[ x]].*\r?\n)+)/) ?? null;
+        if (internalQASection?.length !== 2) {
+            return [];
+        }
+        internalQASection = internalQASection[1];
+        const internalQAPRs = [...internalQASection.matchAll(new RegExp(`- \\[([ x])]\\s(${CONST_1.default.PULL_REQUEST_REGEX.source})`, 'g'))].map((match) => ({
+            url: match[2].split('-')[0].trim(),
+            number: Number.parseInt(match[3], 10),
+            isResolved: match[1] === 'x',
+        }));
+        return internalQAPRs.sort((a, b) => a.number - b.number);
+    }
+    /**
+     * Generate the issue body and assignees for a StagingDeployCash.
+     */
+    static generateStagingDeployCashBodyAndAssignees(tag, PRList, verifiedPRList = [], deployBlockers = [], resolvedDeployBlockers = [], resolvedInternalQAPRs = [], isTimingDashboardChecked = false, isFirebaseChecked = false, isGHStatusChecked = false) {
+        return this.fetchAllPullRequests(PRList.map((pr) => this.getPullRequestNumberFromURL(pr)))
+            .then((data) => {
+            const internalQAPRs = Array.isArray(data) ? data.filter((pr) => !(0, EmptyObject_1.isEmptyObject)(pr.labels.find((item) => item.name === CONST_1.default.LABELS.INTERNAL_QA))) : [];
+            return Promise.all(internalQAPRs.map((pr) => this.getPullRequestMergerLogin(pr.number).then((mergerLogin) => ({ url: pr.html_url, mergerLogin })))).then((results) => {
+                // The format of this map is following:
+                // {
+                //    'https://github.com/Expensify/App/pull/9641': 'PauloGasparSv',
+                //    'https://github.com/Expensify/App/pull/9642': 'mountiny'
+                // }
+                const internalQAPRMap = results.reduce((acc, { url, mergerLogin }) => {
+                    acc[url] = mergerLogin;
+                    return acc;
+                }, {});
+                console.log('Found the following Internal QA PRs:', internalQAPRMap);
+                const noQAPRs = Array.isArray(data) ? data.filter((PR) => /\[No\s?QA]/i.test(PR.title)).map((item) => item.html_url) : [];
+                console.log('Found the following NO QA PRs:', noQAPRs);
+                const verifiedOrNoQAPRs = [...new Set([...verifiedPRList, ...noQAPRs])];
+                const sortedPRList = [...new Set((0, arrayDifference_1.default)(PRList, Object.keys(internalQAPRMap)))].sort((a, b) => GithubUtils.getPullRequestNumberFromURL(a) - GithubUtils.getPullRequestNumberFromURL(b));
+                const sortedDeployBlockers = [...new Set(deployBlockers)].sort((a, b) => GithubUtils.getIssueOrPullRequestNumberFromURL(a) - GithubUtils.getIssueOrPullRequestNumberFromURL(b));
+                // Tag version and comparison URL
+                // eslint-disable-next-line max-len
+                let issueBody = `**Release Version:** \`${tag}\`\r\n**Compare Changes:** https://github.com/Expensify/App/compare/production...staging\r\n`;
+                // PR list
+                if (sortedPRList.length > 0) {
+                    issueBody += '\r\n**This release contains changes from the following pull requests:**\r\n';
+                    sortedPRList.forEach((URL) => {
+                        issueBody += verifiedOrNoQAPRs.includes(URL) ? '- [x]' : '- [ ]';
+                        issueBody += ` ${URL}\r\n`;
+                    });
+                    issueBody += '\r\n\r\n';
+                }
+                // Internal QA PR list
+                if (!(0, EmptyObject_1.isEmptyObject)(internalQAPRMap)) {
+                    console.log('Found the following verified Internal QA PRs:', resolvedInternalQAPRs);
+                    issueBody += '**Internal QA:**\r\n';
+                    Object.keys(internalQAPRMap).forEach((URL) => {
+                        const merger = internalQAPRMap[URL];
+                        const mergerMention = `@${merger}`;
+                        issueBody += `${resolvedInternalQAPRs.includes(URL) ? '- [x]' : '- [ ]'} `;
+                        issueBody += `${URL}`;
+                        issueBody += ` - ${mergerMention}`;
+                        issueBody += '\r\n';
+                    });
+                    issueBody += '\r\n\r\n';
+                }
+                // Deploy blockers
+                if (deployBlockers.length > 0) {
+                    issueBody += '**Deploy Blockers:**\r\n';
+                    sortedDeployBlockers.forEach((URL) => {
+                        issueBody += resolvedDeployBlockers.includes(URL) ? '- [x] ' : '- [ ] ';
+                        issueBody += URL;
+                        issueBody += '\r\n';
+                    });
+                    issueBody += '\r\n\r\n';
+                }
+                issueBody += '**Deployer verifications:**';
+                // eslint-disable-next-line max-len
+                issueBody += `\r\n- [${isTimingDashboardChecked ? 'x' : ' '}] I checked the [App Timing Dashboard](https://graphs.expensify.com/grafana/d/yj2EobAGz/app-timing?orgId=1) and verified this release does not cause a noticeable performance regression.`;
+                // eslint-disable-next-line max-len
+                issueBody += `\r\n- [${isFirebaseChecked ? 'x' : ' '}] I checked [Firebase Crashlytics](https://console.firebase.google.com/u/0/project/expensify-chat/crashlytics/app/android:com.expensify.chat/issues?state=open&time=last-seven-days&tag=all) and verified that this release does not introduce any new crashes. More detailed instructions on this verification can be found [here](https://stackoverflowteams.com/c/expensify/questions/15095/15096).`;
+                // eslint-disable-next-line max-len
+                issueBody += `\r\n- [${isGHStatusChecked ? 'x' : ' '}] I checked [GitHub Status](https://www.githubstatus.com/) and verified there is no reported incident with Actions.`;
+                issueBody += '\r\n\r\ncc @Expensify/applauseleads\r\n';
+                const issueAssignees = [...new Set(Object.values(internalQAPRMap))];
+                const issue = { issueBody, issueAssignees };
+                return issue;
+            });
+        })
+            .catch((err) => console.warn('Error generating StagingDeployCash issue body! Continuing...', err));
+    }
+    /**
+     * Fetch all pull requests given a list of PR numbers.
+     */
+    static fetchAllPullRequests(pullRequestNumbers) {
+        const oldestPR = pullRequestNumbers.sort((a, b) => a - b)[0];
+        return this.paginate(this.octokit.pulls.list, {
+            owner: CONST_1.default.GITHUB_OWNER,
+            repo: CONST_1.default.APP_REPO,
+            state: 'all',
+            sort: 'created',
+            direction: 'desc',
+            per_page: 100,
+        }, ({ data }, done) => {
+            if (data.find((pr) => pr.number === oldestPR)) {
+                done();
+            }
+            return data;
+        })
+            .then((prList) => prList.filter((pr) => pullRequestNumbers.includes(pr.number)))
+            .catch((err) => console.error('Failed to get PR list', err));
+    }
+    static getPullRequestMergerLogin(pullRequestNumber) {
+        return this.octokit.pulls
+            .get({
+            owner: CONST_1.default.GITHUB_OWNER,
+            repo: CONST_1.default.APP_REPO,
+            pull_number: pullRequestNumber,
+        })
+            .then(({ data: pullRequest }) => pullRequest.merged_by?.login);
+    }
+    static getPullRequestBody(pullRequestNumber) {
+        return this.octokit.pulls
+            .get({
+            owner: CONST_1.default.GITHUB_OWNER,
+            repo: CONST_1.default.APP_REPO,
+            pull_number: pullRequestNumber,
+        })
+            .then(({ data: pullRequestComment }) => pullRequestComment.body);
+    }
+    static getAllReviewComments(pullRequestNumber) {
+        return this.paginate(this.octokit.pulls.listReviews, {
+            owner: CONST_1.default.GITHUB_OWNER,
+            repo: CONST_1.default.APP_REPO,
+            pull_number: pullRequestNumber,
+            per_page: 100,
+        }, (response) => response.data.map((review) => review.body));
+    }
+    static getAllComments(issueNumber) {
+        return this.paginate(this.octokit.issues.listComments, {
+            owner: CONST_1.default.GITHUB_OWNER,
+            repo: CONST_1.default.APP_REPO,
+            issue_number: issueNumber,
+            per_page: 100,
+        }, (response) => response.data.map((comment) => comment.body));
+    }
+    /**
+     * Create comment on pull request
+     */
+    static createComment(repo, number, messageBody) {
+        console.log(`Writing comment on #${number}`);
+        return this.octokit.issues.createComment({
+            owner: CONST_1.default.GITHUB_OWNER,
+            repo,
+            issue_number: number,
+            body: messageBody,
+        });
+    }
+    /**
+     * Get the most recent workflow run for the given New Expensify workflow.
+     */
+    static getLatestWorkflowRunID(workflow) {
+        console.log(`Fetching New Expensify workflow runs for ${workflow}...`);
+        return this.octokit.actions
+            .listWorkflowRuns({
+            owner: CONST_1.default.GITHUB_OWNER,
+            repo: CONST_1.default.APP_REPO,
+            workflow_id: workflow,
+        })
+            .then((response) => response.data.workflow_runs[0]?.id);
+    }
+    /**
+     * Generate the URL of an New Expensify pull request given the PR number.
+     */
+    static getPullRequestURLFromNumber(value) {
+        return `${CONST_1.default.APP_REPO_URL}/pull/${value}`;
+    }
+    /**
+     * Parse the pull request number from a URL.
+     *
+     * @throws {Error} If the URL is not a valid Github Pull Request.
+     */
+    static getPullRequestNumberFromURL(URL) {
+        const matches = URL.match(CONST_1.default.PULL_REQUEST_REGEX);
+        if (!Array.isArray(matches) || matches.length !== 2) {
+            throw new Error(`Provided URL ${URL} is not a Github Pull Request!`);
+        }
+        return Number.parseInt(matches[1], 10);
+    }
+    /**
+     * Parse the issue number from a URL.
+     *
+     * @throws {Error} If the URL is not a valid Github Issue.
+     */
+    static getIssueNumberFromURL(URL) {
+        const matches = URL.match(CONST_1.default.ISSUE_REGEX);
+        if (!Array.isArray(matches) || matches.length !== 2) {
+            throw new Error(`Provided URL ${URL} is not a Github Issue!`);
+        }
+        return Number.parseInt(matches[1], 10);
+    }
+    /**
+     * Parse the issue or pull request number from a URL.
+     *
+     * @throws {Error} If the URL is not a valid Github Issue or Pull Request.
+     */
+    static getIssueOrPullRequestNumberFromURL(URL) {
+        const matches = URL.match(CONST_1.default.ISSUE_OR_PULL_REQUEST_REGEX);
+        if (!Array.isArray(matches) || matches.length !== 2) {
+            throw new Error(`Provided URL ${URL} is not a valid Github Issue or Pull Request!`);
+        }
+        return Number.parseInt(matches[1], 10);
+    }
+    /**
+     * Return the login of the actor who closed an issue or PR. If the issue is not closed, return an empty string.
+     */
+    static getActorWhoClosedIssue(issueNumber) {
+        return this.paginate(this.octokit.issues.listEvents, {
+            owner: CONST_1.default.GITHUB_OWNER,
+            repo: CONST_1.default.APP_REPO,
+            issue_number: issueNumber,
+            per_page: 100,
+        })
+            .then((events) => events.filter((event) => event.event === 'closed'))
+            .then((closedEvents) => closedEvents.at(-1)?.actor?.login ?? '');
+    }
+    /**
+     * Returns a single artifact by name. If none is found, it returns undefined.
+     */
+    static getArtifactByName(artifactName) {
+        return this.octokit.actions
+            .listArtifactsForRepo({
+            owner: CONST_1.default.GITHUB_OWNER,
+            repo: CONST_1.default.APP_REPO,
+            per_page: 1,
+            name: artifactName,
+        })
+            .then((response) => response.data.artifacts[0]);
+    }
+    /**
+     * Given an artifact ID, returns the download URL to a zip file containing the artifact.
+     */
+    static getArtifactDownloadURL(artifactId) {
+        return this.octokit.actions
+            .downloadArtifact({
+            owner: CONST_1.default.GITHUB_OWNER,
+            repo: CONST_1.default.APP_REPO,
+            artifact_id: artifactId,
+            archive_format: 'zip',
+        })
+            .then((response) => response.url);
+    }
+}
+exports["default"] = GithubUtils;
+
+
+/***/ }),
+
+/***/ 3:
+/***/ (function(__unused_webpack_module, exports, __nccwpck_require__) {
+
+"use strict";
+
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", ({ value: true }));
+const core_1 = __nccwpck_require__(2186);
+const openai_1 = __importDefault(__nccwpck_require__(47));
+const CONST_1 = __importDefault(__nccwpck_require__(9873));
+const MAX_POLL_COUNT = Math.floor(CONST_1.default.OPENAI_POLL_TIMEOUT / CONST_1.default.OPENAI_POLL_RATE);
+class OpenAIUtils {
+    static ai;
+    static assistantID;
+    static init(apiKey, assistantID) {
+        const key = apiKey ?? (0, core_1.getInput)('PROPOSAL_POLICE_API_KEY', { required: true });
+        if (!key) {
+            throw new Error('Could not initialize OpenAI: No key provided.');
+        }
+        this.ai = new openai_1.default({ apiKey: key });
+        this.assistantID = assistantID ?? (0, core_1.getInput)('PROPOSAL_POLICE_ASSISTANT_ID', { required: true });
+    }
+    static get openAI() {
+        if (!this.ai) {
+            this.init();
+        }
+        return this.ai;
+    }
+    static async prompt(userMessage) {
+        // start a thread run
+        let threadRun = await this.openAI.beta.threads.createAndRun({
+            /* eslint-disable @typescript-eslint/naming-convention */
+            assistant_id: this.assistantID,
+            thread: { messages: [{ role: CONST_1.default.OPENAI_ROLES.USER, content: userMessage }] },
+        });
+        // poll for run completion
+        let response = '';
+        let count = 0;
+        while (!response && count < MAX_POLL_COUNT) {
+            // await thread run completion
+            threadRun = await this.openAI.beta.threads.runs.retrieve(threadRun.thread_id, threadRun.id);
+            if (threadRun.status !== CONST_1.default.OPENAI_THREAD_COMPLETED) {
+                count++;
+                await new Promise((resolve) => {
+                    setTimeout(resolve, CONST_1.default.OPENAI_POLL_RATE);
+                });
+                continue;
+            }
+            for await (const message of this.openAI.beta.threads.messages.list(threadRun.thread_id)) {
+                if (message.role !== CONST_1.default.OPENAI_ROLES.ASSISTANT) {
+                    continue;
+                }
+                response += message.content
+                    .map((contentBlock) => this.isTextContentBlock(contentBlock) && contentBlock.text.value)
+                    .join('\n')
+                    .trim();
+                console.log('Parsed assistant response:', response);
+            }
+            if (!response) {
+                throw new Error('Assistant response is empty or had no text content. This is unexpected.');
+            }
+        }
+        return response;
+    }
+    static isTextContentBlock(contentBlock) {
+        return contentBlock?.type === 'text';
+    }
+}
+exports["default"] = OpenAIUtils;
+
+
+/***/ }),
+
+/***/ 8227:
+/***/ ((__unused_webpack_module, exports) => {
+
+"use strict";
+
+Object.defineProperty(exports, "__esModule", ({ value: true }));
+exports.isEmptyObject = void 0;
+function isEmptyObject(obj) {
+    return Object.keys(obj ?? {}).length === 0;
+}
+exports.isEmptyObject = isEmptyObject;
+
+
+/***/ }),
+
+/***/ 7034:
+/***/ ((__unused_webpack_module, exports) => {
+
+"use strict";
+
+Object.defineProperty(exports, "__esModule", ({ value: true }));
+/**
+ * This function is an equivalent of _.difference, it takes two arrays and returns the difference between them.
+ * It returns an array of items that are in the first array but not in the second array.
+ */
+function arrayDifference(array1, array2) {
+    return [array1, array2].reduce((a, b) => a.filter((c) => !b.includes(c)));
+}
+exports["default"] = arrayDifference;
+
+
+/***/ }),
+
+/***/ 9491:
+/***/ ((module) => {
+
+"use strict";
+module.exports = require("assert");
+
+/***/ }),
+
+/***/ 6113:
+/***/ ((module) => {
+
+"use strict";
+module.exports = require("crypto");
+
+/***/ }),
+
+/***/ 3975:
+/***/ ((module) => {
+
+"use strict";
+module.exports = require("encoding");
+
+/***/ }),
+
+/***/ 2361:
+/***/ ((module) => {
+
+"use strict";
+module.exports = require("events");
+
+/***/ }),
+
+/***/ 7147:
+/***/ ((module) => {
+
+"use strict";
+module.exports = require("fs");
+
+/***/ }),
+
+/***/ 3685:
+/***/ ((module) => {
+
+"use strict";
+module.exports = require("http");
+
+/***/ }),
+
+/***/ 5687:
+/***/ ((module) => {
+
+"use strict";
+module.exports = require("https");
+
+/***/ }),
+
+/***/ 1808:
+/***/ ((module) => {
+
+"use strict";
+module.exports = require("net");
+
+/***/ }),
+
+/***/ 7561:
+/***/ ((module) => {
+
+"use strict";
+module.exports = require("node:fs");
+
+/***/ }),
+
+/***/ 4492:
+/***/ ((module) => {
+
+"use strict";
+module.exports = require("node:stream");
+
+/***/ }),
+
+/***/ 2037:
+/***/ ((module) => {
+
+"use strict";
+module.exports = require("os");
+
+/***/ }),
+
+/***/ 1017:
+/***/ ((module) => {
+
+"use strict";
+module.exports = require("path");
+
+/***/ }),
+
+/***/ 5477:
+/***/ ((module) => {
+
+"use strict";
+module.exports = require("punycode");
+
+/***/ }),
+
+/***/ 2781:
+/***/ ((module) => {
+
+"use strict";
+module.exports = require("stream");
+
+/***/ }),
+
+/***/ 4404:
+/***/ ((module) => {
+
+"use strict";
+module.exports = require("tls");
+
+/***/ }),
+
+/***/ 7310:
+/***/ ((module) => {
+
+"use strict";
+module.exports = require("url");
+
+/***/ }),
+
+/***/ 3837:
+/***/ ((module) => {
+
+"use strict";
+module.exports = require("util");
+
+/***/ }),
+
+/***/ 1267:
+/***/ ((module) => {
+
+"use strict";
+module.exports = require("worker_threads");
+
+/***/ }),
+
+/***/ 9796:
+/***/ ((module) => {
+
+"use strict";
+module.exports = require("zlib");
+
+/***/ }),
+
+/***/ 1778:
+/***/ ((__unused_webpack_module, exports) => {
+
+"use strict";
+
+Object.defineProperty(exports, "__esModule", ({ value: true }));
+
+
+/***/ }),
+
+/***/ 5860:
+/***/ (function(__unused_webpack_module, exports, __nccwpck_require__) {
+
+"use strict";
+
+var __classPrivateFieldSet = (this && this.__classPrivateFieldSet) || function (receiver, state, value, kind, f) {
+    if (kind === "m") throw new TypeError("Private method is not writable");
+    if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a setter");
+    if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot write private member to an object whose class did not declare it");
+    return (kind === "a" ? f.call(receiver, value) : f ? f.value = value : state.set(receiver, value)), value;
+};
+var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (receiver, state, kind, f) {
+    if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a getter");
+    if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
+    return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
+};
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+var _FormDataEncoder_instances, _FormDataEncoder_CRLF, _FormDataEncoder_CRLF_BYTES, _FormDataEncoder_CRLF_BYTES_LENGTH, _FormDataEncoder_DASHES, _FormDataEncoder_encoder, _FormDataEncoder_footer, _FormDataEncoder_form, _FormDataEncoder_options, _FormDataEncoder_getFieldHeader;
+Object.defineProperty(exports, "__esModule", ({ value: true }));
+exports.Encoder = exports.FormDataEncoder = void 0;
+const createBoundary_1 = __importDefault(__nccwpck_require__(7956));
+const isPlainObject_1 = __importDefault(__nccwpck_require__(5240));
+const normalizeValue_1 = __importDefault(__nccwpck_require__(1391));
+const escapeName_1 = __importDefault(__nccwpck_require__(3864));
+const isFileLike_1 = __nccwpck_require__(6860);
+const isFormData_1 = __nccwpck_require__(1633);
+const defaultOptions = {
+    enableAdditionalHeaders: false
+};
+class FormDataEncoder {
+    constructor(form, boundaryOrOptions, options) {
+        _FormDataEncoder_instances.add(this);
+        _FormDataEncoder_CRLF.set(this, "\r\n");
+        _FormDataEncoder_CRLF_BYTES.set(this, void 0);
+        _FormDataEncoder_CRLF_BYTES_LENGTH.set(this, void 0);
+        _FormDataEncoder_DASHES.set(this, "-".repeat(2));
+        _FormDataEncoder_encoder.set(this, new TextEncoder());
+        _FormDataEncoder_footer.set(this, void 0);
+        _FormDataEncoder_form.set(this, void 0);
+        _FormDataEncoder_options.set(this, void 0);
+        if (!(0, isFormData_1.isFormData)(form)) {
+            throw new TypeError("Expected first argument to be a FormData instance.");
+        }
+        let boundary;
+        if ((0, isPlainObject_1.default)(boundaryOrOptions)) {
+            options = boundaryOrOptions;
+        }
+        else {
+            boundary = boundaryOrOptions;
+        }
+        if (!boundary) {
+            boundary = (0, createBoundary_1.default)();
+        }
+        if (typeof boundary !== "string") {
+            throw new TypeError("Expected boundary argument to be a string.");
+        }
+        if (options && !(0, isPlainObject_1.default)(options)) {
+            throw new TypeError("Expected options argument to be an object.");
+        }
+        __classPrivateFieldSet(this, _FormDataEncoder_form, form, "f");
+        __classPrivateFieldSet(this, _FormDataEncoder_options, { ...defaultOptions, ...options }, "f");
+        __classPrivateFieldSet(this, _FormDataEncoder_CRLF_BYTES, __classPrivateFieldGet(this, _FormDataEncoder_encoder, "f").encode(__classPrivateFieldGet(this, _FormDataEncoder_CRLF, "f")), "f");
+        __classPrivateFieldSet(this, _FormDataEncoder_CRLF_BYTES_LENGTH, __classPrivateFieldGet(this, _FormDataEncoder_CRLF_BYTES, "f").byteLength, "f");
+        this.boundary = `form-data-boundary-${boundary}`;
+        this.contentType = `multipart/form-data; boundary=${this.boundary}`;
+        __classPrivateFieldSet(this, _FormDataEncoder_footer, __classPrivateFieldGet(this, _FormDataEncoder_encoder, "f").encode(`${__classPrivateFieldGet(this, _FormDataEncoder_DASHES, "f")}${this.boundary}${__classPrivateFieldGet(this, _FormDataEncoder_DASHES, "f")}${__classPrivateFieldGet(this, _FormDataEncoder_CRLF, "f").repeat(2)}`), "f");
+        this.contentLength = String(this.getContentLength());
+        this.headers = Object.freeze({
+            "Content-Type": this.contentType,
+            "Content-Length": this.contentLength
+        });
+        Object.defineProperties(this, {
+            boundary: { writable: false, configurable: false },
+            contentType: { writable: false, configurable: false },
+            contentLength: { writable: false, configurable: false },
+            headers: { writable: false, configurable: false }
+        });
+    }
+    getContentLength() {
+        let length = 0;
+        for (const [name, raw] of __classPrivateFieldGet(this, _FormDataEncoder_form, "f")) {
+            const value = (0, isFileLike_1.isFileLike)(raw) ? raw : __classPrivateFieldGet(this, _FormDataEncoder_encoder, "f").encode((0, normalizeValue_1.default)(raw));
+            length += __classPrivateFieldGet(this, _FormDataEncoder_instances, "m", _FormDataEncoder_getFieldHeader).call(this, name, value).byteLength;
+            length += (0, isFileLike_1.isFileLike)(value) ? value.size : value.byteLength;
+            length += __classPrivateFieldGet(this, _FormDataEncoder_CRLF_BYTES_LENGTH, "f");
+        }
+        return length + __classPrivateFieldGet(this, _FormDataEncoder_footer, "f").byteLength;
+    }
+    *values() {
+        for (const [name, raw] of __classPrivateFieldGet(this, _FormDataEncoder_form, "f").entries()) {
+            const value = (0, isFileLike_1.isFileLike)(raw) ? raw : __classPrivateFieldGet(this, _FormDataEncoder_encoder, "f").encode((0, normalizeValue_1.default)(raw));
+            yield __classPrivateFieldGet(this, _FormDataEncoder_instances, "m", _FormDataEncoder_getFieldHeader).call(this, name, value);
+            yield value;
+            yield __classPrivateFieldGet(this, _FormDataEncoder_CRLF_BYTES, "f");
+        }
+        yield __classPrivateFieldGet(this, _FormDataEncoder_footer, "f");
+    }
+    async *encode() {
+        for (const part of this.values()) {
+            if ((0, isFileLike_1.isFileLike)(part)) {
+                yield* part.stream();
+            }
+            else {
+                yield part;
+            }
+        }
+    }
+    [(_FormDataEncoder_CRLF = new WeakMap(), _FormDataEncoder_CRLF_BYTES = new WeakMap(), _FormDataEncoder_CRLF_BYTES_LENGTH = new WeakMap(), _FormDataEncoder_DASHES = new WeakMap(), _FormDataEncoder_encoder = new WeakMap(), _FormDataEncoder_footer = new WeakMap(), _FormDataEncoder_form = new WeakMap(), _FormDataEncoder_options = new WeakMap(), _FormDataEncoder_instances = new WeakSet(), _FormDataEncoder_getFieldHeader = function _FormDataEncoder_getFieldHeader(name, value) {
+        let header = "";
+        header += `${__classPrivateFieldGet(this, _FormDataEncoder_DASHES, "f")}${this.boundary}${__classPrivateFieldGet(this, _FormDataEncoder_CRLF, "f")}`;
+        header += `Content-Disposition: form-data; name="${(0, escapeName_1.default)(name)}"`;
+        if ((0, isFileLike_1.isFileLike)(value)) {
+            header += `; filename="${(0, escapeName_1.default)(value.name)}"${__classPrivateFieldGet(this, _FormDataEncoder_CRLF, "f")}`;
+            header += `Content-Type: ${value.type || "application/octet-stream"}`;
+        }
+        if (__classPrivateFieldGet(this, _FormDataEncoder_options, "f").enableAdditionalHeaders === true) {
+            header += `${__classPrivateFieldGet(this, _FormDataEncoder_CRLF, "f")}Content-Length: ${(0, isFileLike_1.isFileLike)(value) ? value.size : value.byteLength}`;
+        }
+        return __classPrivateFieldGet(this, _FormDataEncoder_encoder, "f").encode(`${header}${__classPrivateFieldGet(this, _FormDataEncoder_CRLF, "f").repeat(2)}`);
+    }, Symbol.iterator)]() {
+        return this.values();
+    }
+    [Symbol.asyncIterator]() {
+        return this.encode();
+    }
+}
+exports.FormDataEncoder = FormDataEncoder;
+exports.Encoder = FormDataEncoder;
+
+
+/***/ }),
+
+/***/ 6921:
+/***/ ((__unused_webpack_module, exports) => {
+
+"use strict";
+
+Object.defineProperty(exports, "__esModule", ({ value: true }));
+
+
+/***/ }),
+
+/***/ 8824:
+/***/ (function(__unused_webpack_module, exports, __nccwpck_require__) {
+
+"use strict";
+
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __exportStar = (this && this.__exportStar) || function(m, exports) {
+    for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
+};
+Object.defineProperty(exports, "__esModule", ({ value: true }));
+__exportStar(__nccwpck_require__(5860), exports);
+__exportStar(__nccwpck_require__(1778), exports);
+__exportStar(__nccwpck_require__(6921), exports);
+__exportStar(__nccwpck_require__(6860), exports);
+__exportStar(__nccwpck_require__(1633), exports);
+
+
+/***/ }),
+
+/***/ 7956:
+/***/ ((__unused_webpack_module, exports) => {
+
+"use strict";
+
+Object.defineProperty(exports, "__esModule", ({ value: true }));
+const alphabet = "abcdefghijklmnopqrstuvwxyz0123456789";
+function createBoundary() {
+    let size = 16;
+    let res = "";
+    while (size--) {
+        res += alphabet[(Math.random() * alphabet.length) << 0];
+    }
+    return res;
+}
+exports["default"] = createBoundary;
+
+
+/***/ }),
+
+/***/ 3864:
+/***/ ((__unused_webpack_module, exports) => {
+
+"use strict";
+
+Object.defineProperty(exports, "__esModule", ({ value: true }));
+const escapeName = (name) => String(name)
+    .replace(/\r/g, "%0D")
+    .replace(/\n/g, "%0A")
+    .replace(/"/g, "%22");
+exports["default"] = escapeName;
+
+
+/***/ }),
+
+/***/ 6860:
+/***/ (function(__unused_webpack_module, exports, __nccwpck_require__) {
+
+"use strict";
+
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", ({ value: true }));
+exports.isFileLike = void 0;
+const isFunction_1 = __importDefault(__nccwpck_require__(2498));
+const isFileLike = (value) => Boolean(value
+    && typeof value === "object"
+    && (0, isFunction_1.default)(value.constructor)
+    && value[Symbol.toStringTag] === "File"
+    && (0, isFunction_1.default)(value.stream)
+    && value.name != null
+    && value.size != null
+    && value.lastModified != null);
+exports.isFileLike = isFileLike;
+
+
+/***/ }),
+
+/***/ 1633:
+/***/ (function(__unused_webpack_module, exports, __nccwpck_require__) {
+
+"use strict";
+
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", ({ value: true }));
+exports.isFormDataLike = exports.isFormData = void 0;
+const isFunction_1 = __importDefault(__nccwpck_require__(2498));
+const isFormData = (value) => Boolean(value
+    && (0, isFunction_1.default)(value.constructor)
+    && value[Symbol.toStringTag] === "FormData"
+    && (0, isFunction_1.default)(value.append)
+    && (0, isFunction_1.default)(value.getAll)
+    && (0, isFunction_1.default)(value.entries)
+    && (0, isFunction_1.default)(value[Symbol.iterator]));
+exports.isFormData = isFormData;
+exports.isFormDataLike = exports.isFormData;
+
+
+/***/ }),
+
+/***/ 2498:
+/***/ ((__unused_webpack_module, exports) => {
+
+"use strict";
+
+Object.defineProperty(exports, "__esModule", ({ value: true }));
+const isFunction = (value) => (typeof value === "function");
+exports["default"] = isFunction;
+
+
+/***/ }),
+
+/***/ 5240:
+/***/ ((__unused_webpack_module, exports) => {
+
+"use strict";
+
+Object.defineProperty(exports, "__esModule", ({ value: true }));
+const getType = (value) => (Object.prototype.toString.call(value).slice(8, -1).toLowerCase());
+function isPlainObject(value) {
+    if (getType(value) !== "object") {
+        return false;
+    }
+    const pp = Object.getPrototypeOf(value);
+    if (pp === null || pp === undefined) {
+        return true;
+    }
+    const Ctor = pp.constructor && pp.constructor.toString();
+    return Ctor === Object.toString();
+}
+exports["default"] = isPlainObject;
+
+
+/***/ }),
+
+/***/ 1391:
+/***/ ((__unused_webpack_module, exports) => {
+
+"use strict";
+
+Object.defineProperty(exports, "__esModule", ({ value: true }));
+const normalizeValue = (value) => String(value)
+    .replace(/\r|\n/g, (match, i, str) => {
+    if ((match === "\r" && str[i + 1] !== "\n")
+        || (match === "\n" && str[i - 1] !== "\r")) {
+        return "\r\n";
+    }
+    return match;
+});
+exports["default"] = normalizeValue;
+
+
+/***/ }),
+
+/***/ 6637:
+/***/ (function(__unused_webpack_module, exports, __nccwpck_require__) {
+
+"use strict";
+
+/*! Based on fetch-blob. MIT License. Jimmy Wärting <https://jimmy.warting.se/opensource> & David Frank */
+var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (receiver, state, kind, f) {
+    if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a getter");
+    if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
+    return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
+};
+var __classPrivateFieldSet = (this && this.__classPrivateFieldSet) || function (receiver, state, value, kind, f) {
+    if (kind === "m") throw new TypeError("Private method is not writable");
+    if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a setter");
+    if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot write private member to an object whose class did not declare it");
+    return (kind === "a" ? f.call(receiver, value) : f ? f.value = value : state.set(receiver, value)), value;
+};
+var _Blob_parts, _Blob_type, _Blob_size;
+Object.defineProperty(exports, "__esModule", ({ value: true }));
+exports.Blob = void 0;
+const web_streams_polyfill_1 = __nccwpck_require__(6993);
+const isFunction_1 = __nccwpck_require__(4245);
+const blobHelpers_1 = __nccwpck_require__(7058);
+class Blob {
+    constructor(blobParts = [], options = {}) {
+        _Blob_parts.set(this, []);
+        _Blob_type.set(this, "");
+        _Blob_size.set(this, 0);
+        options !== null && options !== void 0 ? options : (options = {});
+        if (typeof blobParts !== "object" || blobParts === null) {
+            throw new TypeError("Failed to construct 'Blob': "
+                + "The provided value cannot be converted to a sequence.");
+        }
+        if (!(0, isFunction_1.isFunction)(blobParts[Symbol.iterator])) {
+            throw new TypeError("Failed to construct 'Blob': "
+                + "The object must have a callable @@iterator property.");
+        }
+        if (typeof options !== "object" && !(0, isFunction_1.isFunction)(options)) {
+            throw new TypeError("Failed to construct 'Blob': parameter 2 cannot convert to dictionary.");
+        }
+        const encoder = new TextEncoder();
+        for (const raw of blobParts) {
+            let part;
+            if (ArrayBuffer.isView(raw)) {
+                part = new Uint8Array(raw.buffer.slice(raw.byteOffset, raw.byteOffset + raw.byteLength));
+            }
+            else if (raw instanceof ArrayBuffer) {
+                part = new Uint8Array(raw.slice(0));
+            }
+            else if (raw instanceof Blob) {
+                part = raw;
+            }
+            else {
+                part = encoder.encode(String(raw));
+            }
+            __classPrivateFieldSet(this, _Blob_size, __classPrivateFieldGet(this, _Blob_size, "f") + (ArrayBuffer.isView(part) ? part.byteLength : part.size), "f");
+            __classPrivateFieldGet(this, _Blob_parts, "f").push(part);
+        }
+        const type = options.type === undefined ? "" : String(options.type);
+        __classPrivateFieldSet(this, _Blob_type, /^[\x20-\x7E]*$/.test(type) ? type : "", "f");
+    }
+    static [(_Blob_parts = new WeakMap(), _Blob_type = new WeakMap(), _Blob_size = new WeakMap(), Symbol.hasInstance)](value) {
+        return Boolean(value
+            && typeof value === "object"
+            && (0, isFunction_1.isFunction)(value.constructor)
+            && ((0, isFunction_1.isFunction)(value.stream)
+                || (0, isFunction_1.isFunction)(value.arrayBuffer))
+            && /^(Blob|File)$/.test(value[Symbol.toStringTag]));
+    }
+    get type() {
+        return __classPrivateFieldGet(this, _Blob_type, "f");
+    }
+    get size() {
+        return __classPrivateFieldGet(this, _Blob_size, "f");
+    }
+    slice(start, end, contentType) {
+        return new Blob((0, blobHelpers_1.sliceBlob)(__classPrivateFieldGet(this, _Blob_parts, "f"), this.size, start, end), {
+            type: contentType
+        });
+    }
+    async text() {
+        const decoder = new TextDecoder();
+        let result = "";
+        for await (const chunk of (0, blobHelpers_1.consumeBlobParts)(__classPrivateFieldGet(this, _Blob_parts, "f"))) {
+            result += decoder.decode(chunk, { stream: true });
+        }
+        result += decoder.decode();
+        return result;
+    }
+    async arrayBuffer() {
+        const view = new Uint8Array(this.size);
+        let offset = 0;
+        for await (const chunk of (0, blobHelpers_1.consumeBlobParts)(__classPrivateFieldGet(this, _Blob_parts, "f"))) {
+            view.set(chunk, offset);
+            offset += chunk.length;
+        }
+        return view.buffer;
+    }
+    stream() {
+        const iterator = (0, blobHelpers_1.consumeBlobParts)(__classPrivateFieldGet(this, _Blob_parts, "f"), true);
+        return new web_streams_polyfill_1.ReadableStream({
+            async pull(controller) {
+                const { value, done } = await iterator.next();
+                if (done) {
+                    return queueMicrotask(() => controller.close());
+                }
+                controller.enqueue(value);
+            },
+            async cancel() {
+                await iterator.return();
+            }
+        });
+    }
+    get [Symbol.toStringTag]() {
+        return "Blob";
+    }
+}
+exports.Blob = Blob;
+Object.defineProperties(Blob.prototype, {
+    type: { enumerable: true },
+    size: { enumerable: true },
+    slice: { enumerable: true },
+    stream: { enumerable: true },
+    text: { enumerable: true },
+    arrayBuffer: { enumerable: true }
+});
+
+
+/***/ }),
+
+/***/ 3637:
+/***/ (function(__unused_webpack_module, exports, __nccwpck_require__) {
+
+"use strict";
+
+var __classPrivateFieldSet = (this && this.__classPrivateFieldSet) || function (receiver, state, value, kind, f) {
+    if (kind === "m") throw new TypeError("Private method is not writable");
+    if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a setter");
+    if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot write private member to an object whose class did not declare it");
+    return (kind === "a" ? f.call(receiver, value) : f ? f.value = value : state.set(receiver, value)), value;
+};
+var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (receiver, state, kind, f) {
+    if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a getter");
+    if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
+    return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
+};
+var _File_name, _File_lastModified;
+Object.defineProperty(exports, "__esModule", ({ value: true }));
+exports.File = void 0;
+const Blob_1 = __nccwpck_require__(6637);
+class File extends Blob_1.Blob {
+    constructor(fileBits, name, options = {}) {
+        super(fileBits, options);
+        _File_name.set(this, void 0);
+        _File_lastModified.set(this, 0);
+        if (arguments.length < 2) {
+            throw new TypeError("Failed to construct 'File': 2 arguments required, "
+                + `but only ${arguments.length} present.`);
+        }
+        __classPrivateFieldSet(this, _File_name, String(name), "f");
+        const lastModified = options.lastModified === undefined
+            ? Date.now()
+            : Number(options.lastModified);
+        if (!Number.isNaN(lastModified)) {
+            __classPrivateFieldSet(this, _File_lastModified, lastModified, "f");
+        }
+    }
+    static [(_File_name = new WeakMap(), _File_lastModified = new WeakMap(), Symbol.hasInstance)](value) {
+        return value instanceof Blob_1.Blob
+            && value[Symbol.toStringTag] === "File"
+            && typeof value.name === "string";
+    }
+    get name() {
+        return __classPrivateFieldGet(this, _File_name, "f");
+    }
+    get lastModified() {
+        return __classPrivateFieldGet(this, _File_lastModified, "f");
+    }
+    get webkitRelativePath() {
+        return "";
+    }
+    get [Symbol.toStringTag]() {
+        return "File";
+    }
+}
+exports.File = File;
+
+
+/***/ }),
+
+/***/ 7268:
+/***/ (function(__unused_webpack_module, exports, __nccwpck_require__) {
+
+"use strict";
+
+var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (receiver, state, kind, f) {
+    if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a getter");
+    if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
+    return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
+};
+var _FormData_instances, _FormData_entries, _FormData_setEntry;
+Object.defineProperty(exports, "__esModule", ({ value: true }));
+exports.FormData = void 0;
+const util_1 = __nccwpck_require__(3837);
+const File_1 = __nccwpck_require__(3637);
+const isFile_1 = __nccwpck_require__(4529);
+const isBlob_1 = __nccwpck_require__(5493);
+const isFunction_1 = __nccwpck_require__(4245);
+const deprecateConstructorEntries_1 = __nccwpck_require__(2689);
+class FormData {
+    constructor(entries) {
+        _FormData_instances.add(this);
+        _FormData_entries.set(this, new Map());
+        if (entries) {
+            (0, deprecateConstructorEntries_1.deprecateConstructorEntries)();
+            entries.forEach(({ name, value, fileName }) => this.append(name, value, fileName));
+        }
+    }
+    static [(_FormData_entries = new WeakMap(), _FormData_instances = new WeakSet(), Symbol.hasInstance)](value) {
+        return Boolean(value
+            && (0, isFunction_1.isFunction)(value.constructor)
+            && value[Symbol.toStringTag] === "FormData"
+            && (0, isFunction_1.isFunction)(value.append)
+            && (0, isFunction_1.isFunction)(value.set)
+            && (0, isFunction_1.isFunction)(value.get)
+            && (0, isFunction_1.isFunction)(value.getAll)
+            && (0, isFunction_1.isFunction)(value.has)
+            && (0, isFunction_1.isFunction)(value.delete)
+            && (0, isFunction_1.isFunction)(value.entries)
+            && (0, isFunction_1.isFunction)(value.values)
+            && (0, isFunction_1.isFunction)(value.keys)
+            && (0, isFunction_1.isFunction)(value[Symbol.iterator])
+            && (0, isFunction_1.isFunction)(value.forEach));
+    }
+    append(name, value, fileName) {
+        __classPrivateFieldGet(this, _FormData_instances, "m", _FormData_setEntry).call(this, {
+            name,
+            fileName,
+            append: true,
+            rawValue: value,
+            argsLength: arguments.length
+        });
+    }
+    set(name, value, fileName) {
+        __classPrivateFieldGet(this, _FormData_instances, "m", _FormData_setEntry).call(this, {
+            name,
+            fileName,
+            append: false,
+            rawValue: value,
+            argsLength: arguments.length
+        });
+    }
+    get(name) {
+        const field = __classPrivateFieldGet(this, _FormData_entries, "f").get(String(name));
+        if (!field) {
+            return null;
+        }
+        return field[0];
+    }
+    getAll(name) {
+        const field = __classPrivateFieldGet(this, _FormData_entries, "f").get(String(name));
+        if (!field) {
+            return [];
+        }
+        return field.slice();
+    }
+    has(name) {
+        return __classPrivateFieldGet(this, _FormData_entries, "f").has(String(name));
+    }
+    delete(name) {
+        __classPrivateFieldGet(this, _FormData_entries, "f").delete(String(name));
+    }
+    *keys() {
+        for (const key of __classPrivateFieldGet(this, _FormData_entries, "f").keys()) {
+            yield key;
+        }
+    }
+    *entries() {
+        for (const name of this.keys()) {
+            const values = this.getAll(name);
+            for (const value of values) {
+                yield [name, value];
+            }
+        }
+    }
+    *values() {
+        for (const [, value] of this) {
+            yield value;
+        }
+    }
+    [(_FormData_setEntry = function _FormData_setEntry({ name, rawValue, append, fileName, argsLength }) {
+        const methodName = append ? "append" : "set";
+        if (argsLength < 2) {
+            throw new TypeError(`Failed to execute '${methodName}' on 'FormData': `
+                + `2 arguments required, but only ${argsLength} present.`);
+        }
+        name = String(name);
+        let value;
+        if ((0, isFile_1.isFile)(rawValue)) {
+            value = fileName === undefined
+                ? rawValue
+                : new File_1.File([rawValue], fileName, {
+                    type: rawValue.type,
+                    lastModified: rawValue.lastModified
+                });
+        }
+        else if ((0, isBlob_1.isBlob)(rawValue)) {
+            value = new File_1.File([rawValue], fileName === undefined ? "blob" : fileName, {
+                type: rawValue.type
+            });
+        }
+        else if (fileName) {
+            throw new TypeError(`Failed to execute '${methodName}' on 'FormData': `
+                + "parameter 2 is not of type 'Blob'.");
+        }
+        else {
+            value = String(rawValue);
+        }
+        const values = __classPrivateFieldGet(this, _FormData_entries, "f").get(name);
+        if (!values) {
+            return void __classPrivateFieldGet(this, _FormData_entries, "f").set(name, [value]);
+        }
+        if (!append) {
+            return void __classPrivateFieldGet(this, _FormData_entries, "f").set(name, [value]);
+        }
+        values.push(value);
+    }, Symbol.iterator)]() {
+        return this.entries();
+    }
+    forEach(callback, thisArg) {
+        for (const [name, value] of this) {
+            callback.call(thisArg, value, name, this);
+        }
+    }
+    get [Symbol.toStringTag]() {
+        return "FormData";
+    }
+    [util_1.inspect.custom]() {
+        return this[Symbol.toStringTag];
+    }
+}
+exports.FormData = FormData;
+
+
+/***/ }),
+
+/***/ 7058:
+/***/ ((__unused_webpack_module, exports, __nccwpck_require__) => {
+
+"use strict";
+
+/*! Based on fetch-blob. MIT License. Jimmy Wärting <https://jimmy.warting.se/opensource> & David Frank */
+Object.defineProperty(exports, "__esModule", ({ value: true }));
+exports.sliceBlob = exports.consumeBlobParts = void 0;
+const isFunction_1 = __nccwpck_require__(4245);
+const CHUNK_SIZE = 65536;
+async function* clonePart(part) {
+    const end = part.byteOffset + part.byteLength;
+    let position = part.byteOffset;
+    while (position !== end) {
+        const size = Math.min(end - position, CHUNK_SIZE);
+        const chunk = part.buffer.slice(position, position + size);
+        position += chunk.byteLength;
+        yield new Uint8Array(chunk);
+    }
+}
+async function* consumeNodeBlob(blob) {
+    let position = 0;
+    while (position !== blob.size) {
+        const chunk = blob.slice(position, Math.min(blob.size, position + CHUNK_SIZE));
+        const buffer = await chunk.arrayBuffer();
+        position += buffer.byteLength;
+        yield new Uint8Array(buffer);
+    }
+}
+async function* consumeBlobParts(parts, clone = false) {
+    for (const part of parts) {
+        if (ArrayBuffer.isView(part)) {
+            if (clone) {
+                yield* clonePart(part);
+            }
+            else {
+                yield part;
+            }
+        }
+        else if ((0, isFunction_1.isFunction)(part.stream)) {
+            yield* part.stream();
+        }
+        else {
+            yield* consumeNodeBlob(part);
+        }
+    }
+}
+exports.consumeBlobParts = consumeBlobParts;
+function* sliceBlob(blobParts, blobSize, start = 0, end) {
+    end !== null && end !== void 0 ? end : (end = blobSize);
+    let relativeStart = start < 0
+        ? Math.max(blobSize + start, 0)
+        : Math.min(start, blobSize);
+    let relativeEnd = end < 0
+        ? Math.max(blobSize + end, 0)
+        : Math.min(end, blobSize);
+    const span = Math.max(relativeEnd - relativeStart, 0);
+    let added = 0;
+    for (const part of blobParts) {
+        if (added >= span) {
+            break;
+        }
+        const partSize = ArrayBuffer.isView(part) ? part.byteLength : part.size;
+        if (relativeStart && partSize <= relativeStart) {
+            relativeStart -= partSize;
+            relativeEnd -= partSize;
+        }
+        else {
+            let chunk;
+            if (ArrayBuffer.isView(part)) {
+                chunk = part.subarray(relativeStart, Math.min(partSize, relativeEnd));
+                added += chunk.byteLength;
+            }
+            else {
+                chunk = part.slice(relativeStart, Math.min(partSize, relativeEnd));
+                added += chunk.size;
+            }
+            relativeEnd -= partSize;
+            relativeStart = 0;
+            yield chunk;
+        }
+    }
+}
+exports.sliceBlob = sliceBlob;
+
+
+/***/ }),
+
+/***/ 2689:
+/***/ ((__unused_webpack_module, exports, __nccwpck_require__) => {
+
+"use strict";
+
+Object.defineProperty(exports, "__esModule", ({ value: true }));
+exports.deprecateConstructorEntries = void 0;
+const util_1 = __nccwpck_require__(3837);
+exports.deprecateConstructorEntries = (0, util_1.deprecate)(() => { }, "Constructor \"entries\" argument is not spec-compliant "
+    + "and will be removed in next major release.");
+
+
+/***/ }),
+
+/***/ 8735:
+/***/ (function(__unused_webpack_module, exports, __nccwpck_require__) {
+
+"use strict";
+
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __exportStar = (this && this.__exportStar) || function(m, exports) {
+    for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
+};
+var __classPrivateFieldSet = (this && this.__classPrivateFieldSet) || function (receiver, state, value, kind, f) {
+    if (kind === "m") throw new TypeError("Private method is not writable");
+    if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a setter");
+    if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot write private member to an object whose class did not declare it");
+    return (kind === "a" ? f.call(receiver, value) : f ? f.value = value : state.set(receiver, value)), value;
+};
+var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (receiver, state, kind, f) {
+    if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a getter");
+    if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
+    return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
+};
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+var _FileFromPath_path, _FileFromPath_start;
+Object.defineProperty(exports, "__esModule", ({ value: true }));
+exports.fileFromPath = exports.fileFromPathSync = void 0;
+const fs_1 = __nccwpck_require__(7147);
+const path_1 = __nccwpck_require__(1017);
+const node_domexception_1 = __importDefault(__nccwpck_require__(7760));
+const File_1 = __nccwpck_require__(3637);
+const isPlainObject_1 = __importDefault(__nccwpck_require__(4722));
+__exportStar(__nccwpck_require__(4529), exports);
+const MESSAGE = "The requested file could not be read, "
+    + "typically due to permission problems that have occurred after a reference "
+    + "to a file was acquired.";
+class FileFromPath {
+    constructor(input) {
+        _FileFromPath_path.set(this, void 0);
+        _FileFromPath_start.set(this, void 0);
+        __classPrivateFieldSet(this, _FileFromPath_path, input.path, "f");
+        __classPrivateFieldSet(this, _FileFromPath_start, input.start || 0, "f");
+        this.name = (0, path_1.basename)(__classPrivateFieldGet(this, _FileFromPath_path, "f"));
+        this.size = input.size;
+        this.lastModified = input.lastModified;
+    }
+    slice(start, end) {
+        return new FileFromPath({
+            path: __classPrivateFieldGet(this, _FileFromPath_path, "f"),
+            lastModified: this.lastModified,
+            size: end - start,
+            start
+        });
+    }
+    async *stream() {
+        const { mtimeMs } = await fs_1.promises.stat(__classPrivateFieldGet(this, _FileFromPath_path, "f"));
+        if (mtimeMs > this.lastModified) {
+            throw new node_domexception_1.default(MESSAGE, "NotReadableError");
+        }
+        if (this.size) {
+            yield* (0, fs_1.createReadStream)(__classPrivateFieldGet(this, _FileFromPath_path, "f"), {
+                start: __classPrivateFieldGet(this, _FileFromPath_start, "f"),
+                end: __classPrivateFieldGet(this, _FileFromPath_start, "f") + this.size - 1
+            });
+        }
+    }
+    get [(_FileFromPath_path = new WeakMap(), _FileFromPath_start = new WeakMap(), Symbol.toStringTag)]() {
+        return "File";
+    }
+}
+function createFileFromPath(path, { mtimeMs, size }, filenameOrOptions, options = {}) {
+    let filename;
+    if ((0, isPlainObject_1.default)(filenameOrOptions)) {
+        [options, filename] = [filenameOrOptions, undefined];
+    }
+    else {
+        filename = filenameOrOptions;
+    }
+    const file = new FileFromPath({ path, size, lastModified: mtimeMs });
+    if (!filename) {
+        filename = file.name;
+    }
+    return new File_1.File([file], filename, {
+        ...options, lastModified: file.lastModified
+    });
+}
+function fileFromPathSync(path, filenameOrOptions, options = {}) {
+    const stats = (0, fs_1.statSync)(path);
+    return createFileFromPath(path, stats, filenameOrOptions, options);
+}
+exports.fileFromPathSync = fileFromPathSync;
+async function fileFromPath(path, filenameOrOptions, options) {
+    const stats = await fs_1.promises.stat(path);
+    return createFileFromPath(path, stats, filenameOrOptions, options);
+}
+exports.fileFromPath = fileFromPath;
+
+
+/***/ }),
+
+/***/ 880:
+/***/ (function(__unused_webpack_module, exports, __nccwpck_require__) {
+
+"use strict";
+
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __exportStar = (this && this.__exportStar) || function(m, exports) {
+    for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
+};
+Object.defineProperty(exports, "__esModule", ({ value: true }));
+__exportStar(__nccwpck_require__(7268), exports);
+__exportStar(__nccwpck_require__(6637), exports);
+__exportStar(__nccwpck_require__(3637), exports);
+
+
+/***/ }),
+
+/***/ 5493:
+/***/ ((__unused_webpack_module, exports, __nccwpck_require__) => {
+
+"use strict";
+
+Object.defineProperty(exports, "__esModule", ({ value: true }));
+exports.isBlob = void 0;
+const Blob_1 = __nccwpck_require__(6637);
+const isBlob = (value) => value instanceof Blob_1.Blob;
+exports.isBlob = isBlob;
+
+
+/***/ }),
+
+/***/ 4529:
+/***/ ((__unused_webpack_module, exports, __nccwpck_require__) => {
+
+"use strict";
+
+Object.defineProperty(exports, "__esModule", ({ value: true }));
+exports.isFile = void 0;
+const File_1 = __nccwpck_require__(3637);
+const isFile = (value) => value instanceof File_1.File;
+exports.isFile = isFile;
+
+
+/***/ }),
+
+/***/ 4245:
+/***/ ((__unused_webpack_module, exports) => {
+
+"use strict";
+
+Object.defineProperty(exports, "__esModule", ({ value: true }));
+exports.isFunction = void 0;
+const isFunction = (value) => (typeof value === "function");
+exports.isFunction = isFunction;
+
+
+/***/ }),
+
+/***/ 4722:
+/***/ ((__unused_webpack_module, exports) => {
+
+"use strict";
+
+Object.defineProperty(exports, "__esModule", ({ value: true }));
+const getType = (value) => (Object.prototype.toString.call(value).slice(8, -1).toLowerCase());
+function isPlainObject(value) {
+    if (getType(value) !== "object") {
+        return false;
+    }
+    const pp = Object.getPrototypeOf(value);
+    if (pp === null || pp === undefined) {
+        return true;
+    }
+    const Ctor = pp.constructor && pp.constructor.toString();
+    return Ctor === Object.toString();
+}
+exports["default"] = isPlainObject;
+
+
+/***/ }),
+
+/***/ 4595:
+/***/ ((__unused_webpack_module, exports) => {
+
+"use strict";
+
+Object.defineProperty(exports, "__esModule", ({ value: true }));
+exports.MultipartBody = void 0;
+/**
+ * Disclaimer: modules in _shims aren't intended to be imported by SDK users.
+ */
+class MultipartBody {
+    constructor(body) {
+        this.body = body;
+    }
+    get [Symbol.toStringTag]() {
+        return 'MultipartBody';
+    }
+}
+exports.MultipartBody = MultipartBody;
+//# sourceMappingURL=MultipartBody.js.map
+
+/***/ }),
+
+/***/ 3506:
+/***/ (function(__unused_webpack_module, exports, __nccwpck_require__) {
+
+"use strict";
+
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __exportStar = (this && this.__exportStar) || function(m, exports) {
+    for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
+};
+Object.defineProperty(exports, "__esModule", ({ value: true }));
+/**
+ * Disclaimer: modules in _shims aren't intended to be imported by SDK users.
+ */
+__exportStar(__nccwpck_require__(1749), exports);
+//# sourceMappingURL=runtime-node.js.map
+
+/***/ }),
+
+/***/ 6678:
+/***/ ((__unused_webpack_module, exports, __nccwpck_require__) => {
+
+/**
+ * Disclaimer: modules in _shims aren't intended to be imported by SDK users.
+ */
+const shims = __nccwpck_require__(4437);
+const auto = __nccwpck_require__(3506);
+if (!shims.kind) shims.setShims(auto.getRuntime(), { auto: true });
+for (const property of Object.keys(shims)) {
+  Object.defineProperty(exports, property, {
+    get() {
+      return shims[property];
+    },
+  });
+}
+
+
+/***/ }),
+
+/***/ 1749:
+/***/ (function(__unused_webpack_module, exports, __nccwpck_require__) {
+
+"use strict";
+
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", ({ value: true }));
+exports.getRuntime = void 0;
+/**
+ * Disclaimer: modules in _shims aren't intended to be imported by SDK users.
+ */
+const nf = __importStar(__nccwpck_require__(467));
+const fd = __importStar(__nccwpck_require__(880));
+const agentkeepalive_1 = __importDefault(__nccwpck_require__(4623));
+const abort_controller_1 = __nccwpck_require__(1659);
+const node_fs_1 = __nccwpck_require__(7561);
+const form_data_encoder_1 = __nccwpck_require__(8824);
+const node_stream_1 = __nccwpck_require__(4492);
+const MultipartBody_1 = __nccwpck_require__(4595);
+// @ts-ignore (this package does not have proper export maps for this export)
+const ponyfill_es2018_js_1 = __nccwpck_require__(1452);
+let fileFromPathWarned = false;
+async function fileFromPath(path, ...args) {
+    // this import fails in environments that don't handle export maps correctly, like old versions of Jest
+    const { fileFromPath: _fileFromPath } = await Promise.resolve().then(() => __importStar(__nccwpck_require__(8735)));
+    if (!fileFromPathWarned) {
+        console.warn(`fileFromPath is deprecated; use fs.createReadStream(${JSON.stringify(path)}) instead`);
+        fileFromPathWarned = true;
+    }
+    // @ts-ignore
+    return await _fileFromPath(path, ...args);
+}
+const defaultHttpAgent = new agentkeepalive_1.default({ keepAlive: true, timeout: 5 * 60 * 1000 });
+const defaultHttpsAgent = new agentkeepalive_1.default.HttpsAgent({ keepAlive: true, timeout: 5 * 60 * 1000 });
+async function getMultipartRequestOptions(form, opts) {
+    const encoder = new form_data_encoder_1.FormDataEncoder(form);
+    const readable = node_stream_1.Readable.from(encoder);
+    const body = new MultipartBody_1.MultipartBody(readable);
+    const headers = {
+        ...opts.headers,
+        ...encoder.headers,
+        'Content-Length': encoder.contentLength,
+    };
+    return { ...opts, body: body, headers };
+}
+function getRuntime() {
+    // Polyfill global object if needed.
+    if (typeof AbortController === 'undefined') {
+        // @ts-expect-error (the types are subtly different, but compatible in practice)
+        globalThis.AbortController = abort_controller_1.AbortController;
+    }
+    return {
+        kind: 'node',
+        fetch: nf.default,
+        Request: nf.Request,
+        Response: nf.Response,
+        Headers: nf.Headers,
+        FormData: fd.FormData,
+        Blob: fd.Blob,
+        File: fd.File,
+        ReadableStream: ponyfill_es2018_js_1.ReadableStream,
+        getMultipartRequestOptions,
+        getDefaultAgent: (url) => (url.startsWith('https') ? defaultHttpsAgent : defaultHttpAgent),
+        fileFromPath,
+        isFsReadStream: (value) => value instanceof node_fs_1.ReadStream,
+    };
+}
+exports.getRuntime = getRuntime;
+//# sourceMappingURL=node-runtime.js.map
+
+/***/ }),
+
+/***/ 4437:
+/***/ ((__unused_webpack_module, exports) => {
+
+"use strict";
+
+Object.defineProperty(exports, "__esModule", ({ value: true }));
+exports.setShims = exports.isFsReadStream = exports.fileFromPath = exports.getDefaultAgent = exports.getMultipartRequestOptions = exports.ReadableStream = exports.File = exports.Blob = exports.FormData = exports.Headers = exports.Response = exports.Request = exports.fetch = exports.kind = exports.auto = void 0;
+exports.auto = false;
+exports.kind = undefined;
+exports.fetch = undefined;
+exports.Request = undefined;
+exports.Response = undefined;
+exports.Headers = undefined;
+exports.FormData = undefined;
+exports.Blob = undefined;
+exports.File = undefined;
+exports.ReadableStream = undefined;
+exports.getMultipartRequestOptions = undefined;
+exports.getDefaultAgent = undefined;
+exports.fileFromPath = undefined;
+exports.isFsReadStream = undefined;
+function setShims(shims, options = { auto: false }) {
+    if (exports.auto) {
+        throw new Error(`you must \`import 'openai/shims/${shims.kind}'\` before importing anything else from openai`);
+    }
+    if (exports.kind) {
+        throw new Error(`can't \`import 'openai/shims/${shims.kind}'\` after \`import 'openai/shims/${exports.kind}'\``);
+    }
+    exports.auto = options.auto;
+    exports.kind = shims.kind;
+    exports.fetch = shims.fetch;
+    exports.Request = shims.Request;
+    exports.Response = shims.Response;
+    exports.Headers = shims.Headers;
+    exports.FormData = shims.FormData;
+    exports.Blob = shims.Blob;
+    exports.File = shims.File;
+    exports.ReadableStream = shims.ReadableStream;
+    exports.getMultipartRequestOptions = shims.getMultipartRequestOptions;
+    exports.getDefaultAgent = shims.getDefaultAgent;
+    exports.fileFromPath = shims.fileFromPath;
+    exports.isFsReadStream = shims.isFsReadStream;
+}
+exports.setShims = setShims;
+//# sourceMappingURL=registry.js.map
+
+/***/ }),
+
+/***/ 1798:
+/***/ (function(__unused_webpack_module, exports, __nccwpck_require__) {
+
+"use strict";
+
+var __classPrivateFieldSet = (this && this.__classPrivateFieldSet) || function (receiver, state, value, kind, f) {
+    if (kind === "m") throw new TypeError("Private method is not writable");
+    if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a setter");
+    if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot write private member to an object whose class did not declare it");
+    return (kind === "a" ? f.call(receiver, value) : f ? f.value = value : state.set(receiver, value)), value;
+};
+var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (receiver, state, kind, f) {
+    if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a getter");
+    if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
+    return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
+};
+var _AbstractPage_client;
+Object.defineProperty(exports, "__esModule", ({ value: true }));
+exports.isObj = exports.toBase64 = exports.getRequiredHeader = exports.isHeadersProtocol = exports.isRunningInBrowser = exports.debug = exports.hasOwn = exports.isEmptyObj = exports.maybeCoerceBoolean = exports.maybeCoerceFloat = exports.maybeCoerceInteger = exports.coerceBoolean = exports.coerceFloat = exports.coerceInteger = exports.readEnv = exports.ensurePresent = exports.castToError = exports.sleep = exports.safeJSON = exports.isRequestOptions = exports.createResponseHeaders = exports.PagePromise = exports.AbstractPage = exports.APIClient = exports.APIPromise = exports.createForm = exports.multipartFormRequestOptions = exports.maybeMultipartFormRequestOptions = void 0;
+const version_1 = __nccwpck_require__(6417);
+const streaming_1 = __nccwpck_require__(884);
+const error_1 = __nccwpck_require__(8905);
+const index_1 = __nccwpck_require__(6678);
+const uploads_1 = __nccwpck_require__(3394);
+var uploads_2 = __nccwpck_require__(3394);
+Object.defineProperty(exports, "maybeMultipartFormRequestOptions", ({ enumerable: true, get: function () { return uploads_2.maybeMultipartFormRequestOptions; } }));
+Object.defineProperty(exports, "multipartFormRequestOptions", ({ enumerable: true, get: function () { return uploads_2.multipartFormRequestOptions; } }));
+Object.defineProperty(exports, "createForm", ({ enumerable: true, get: function () { return uploads_2.createForm; } }));
+async function defaultParseResponse(props) {
+    const { response } = props;
+    if (props.options.stream) {
+        debug('response', response.status, response.url, response.headers, response.body);
+        // Note: there is an invariant here that isn't represented in the type system
+        // that if you set `stream: true` the response type must also be `Stream<T>`
+        if (props.options.__streamClass) {
+            return props.options.__streamClass.fromSSEResponse(response, props.controller);
+        }
+        return streaming_1.Stream.fromSSEResponse(response, props.controller);
+    }
+    // fetch refuses to read the body when the status code is 204.
+    if (response.status === 204) {
+        return null;
+    }
+    if (props.options.__binaryResponse) {
+        return response;
+    }
+    const contentType = response.headers.get('content-type');
+    const isJSON = contentType?.includes('application/json') || contentType?.includes('application/vnd.api+json');
+    if (isJSON) {
+        const json = await response.json();
+        debug('response', response.status, response.url, response.headers, json);
+        return json;
+    }
+    const text = await response.text();
+    debug('response', response.status, response.url, response.headers, text);
+    // TODO handle blob, arraybuffer, other content types, etc.
+    return text;
+}
+/**
+ * A subclass of `Promise` providing additional helper methods
+ * for interacting with the SDK.
+ */
+class APIPromise extends Promise {
+    constructor(responsePromise, parseResponse = defaultParseResponse) {
+        super((resolve) => {
+            // this is maybe a bit weird but this has to be a no-op to not implicitly
+            // parse the response body; instead .then, .catch, .finally are overridden
+            // to parse the response
+            resolve(null);
+        });
+        this.responsePromise = responsePromise;
+        this.parseResponse = parseResponse;
+    }
+    _thenUnwrap(transform) {
+        return new APIPromise(this.responsePromise, async (props) => transform(await this.parseResponse(props)));
+    }
+    /**
+     * Gets the raw `Response` instance instead of parsing the response
+     * data.
+     *
+     * If you want to parse the response body but still get the `Response`
+     * instance, you can use {@link withResponse()}.
+     *
+     * 👋 Getting the wrong TypeScript type for `Response`?
+     * Try setting `"moduleResolution": "NodeNext"` if you can,
+     * or add one of these imports before your first `import … from 'openai'`:
+     * - `import 'openai/shims/node'` (if you're running on Node)
+     * - `import 'openai/shims/web'` (otherwise)
+     */
+    asResponse() {
+        return this.responsePromise.then((p) => p.response);
+    }
+    /**
+     * Gets the parsed response data and the raw `Response` instance.
+     *
+     * If you just want to get the raw `Response` instance without parsing it,
+     * you can use {@link asResponse()}.
+     *
+     *
+     * 👋 Getting the wrong TypeScript type for `Response`?
+     * Try setting `"moduleResolution": "NodeNext"` if you can,
+     * or add one of these imports before your first `import … from 'openai'`:
+     * - `import 'openai/shims/node'` (if you're running on Node)
+     * - `import 'openai/shims/web'` (otherwise)
+     */
+    async withResponse() {
+        const [data, response] = await Promise.all([this.parse(), this.asResponse()]);
+        return { data, response };
+    }
+    parse() {
+        if (!this.parsedPromise) {
+            this.parsedPromise = this.responsePromise.then(this.parseResponse);
+        }
+        return this.parsedPromise;
+    }
+    then(onfulfilled, onrejected) {
+        return this.parse().then(onfulfilled, onrejected);
+    }
+    catch(onrejected) {
+        return this.parse().catch(onrejected);
+    }
+    finally(onfinally) {
+        return this.parse().finally(onfinally);
+    }
+}
+exports.APIPromise = APIPromise;
+class APIClient {
+    constructor({ baseURL, maxRetries = 2, timeout = 600000, // 10 minutes
+    httpAgent, fetch: overridenFetch, }) {
+        this.baseURL = baseURL;
+        this.maxRetries = validatePositiveInteger('maxRetries', maxRetries);
+        this.timeout = validatePositiveInteger('timeout', timeout);
+        this.httpAgent = httpAgent;
+        this.fetch = overridenFetch ?? index_1.fetch;
+    }
+    authHeaders(opts) {
+        return {};
+    }
+    /**
+     * Override this to add your own default headers, for example:
+     *
+     *  {
+     *    ...super.defaultHeaders(),
+     *    Authorization: 'Bearer 123',
+     *  }
+     */
+    defaultHeaders(opts) {
+        return {
+            Accept: 'application/json',
+            'Content-Type': 'application/json',
+            'User-Agent': this.getUserAgent(),
+            ...getPlatformHeaders(),
+            ...this.authHeaders(opts),
+        };
+    }
+    /**
+     * Override this to add your own headers validation:
+     */
+    validateHeaders(headers, customHeaders) { }
+    defaultIdempotencyKey() {
+        return `stainless-node-retry-${uuid4()}`;
+    }
+    get(path, opts) {
+        return this.methodRequest('get', path, opts);
+    }
+    post(path, opts) {
+        return this.methodRequest('post', path, opts);
+    }
+    patch(path, opts) {
+        return this.methodRequest('patch', path, opts);
+    }
+    put(path, opts) {
+        return this.methodRequest('put', path, opts);
+    }
+    delete(path, opts) {
+        return this.methodRequest('delete', path, opts);
+    }
+    methodRequest(method, path, opts) {
+        return this.request(Promise.resolve(opts).then((opts) => ({ method, path, ...opts })));
+    }
+    getAPIList(path, Page, opts) {
+        return this.requestAPIList(Page, { method: 'get', path, ...opts });
+    }
+    calculateContentLength(body) {
+        if (typeof body === 'string') {
+            if (typeof Buffer !== 'undefined') {
+                return Buffer.byteLength(body, 'utf8').toString();
+            }
+            if (typeof TextEncoder !== 'undefined') {
+                const encoder = new TextEncoder();
+                const encoded = encoder.encode(body);
+                return encoded.length.toString();
+            }
+        }
+        return null;
+    }
+    buildRequest(options) {
+        const { method, path, query, headers: headers = {} } = options;
+        const body = (0, uploads_1.isMultipartBody)(options.body) ? options.body.body
+            : options.body ? JSON.stringify(options.body, null, 2)
+                : null;
+        const contentLength = this.calculateContentLength(body);
+        const url = this.buildURL(path, query);
+        if ('timeout' in options)
+            validatePositiveInteger('timeout', options.timeout);
+        const timeout = options.timeout ?? this.timeout;
+        const httpAgent = options.httpAgent ?? this.httpAgent ?? (0, index_1.getDefaultAgent)(url);
+        const minAgentTimeout = timeout + 1000;
+        if (typeof httpAgent?.options?.timeout === 'number' &&
+            minAgentTimeout > (httpAgent.options.timeout ?? 0)) {
+            // Allow any given request to bump our agent active socket timeout.
+            // This may seem strange, but leaking active sockets should be rare and not particularly problematic,
+            // and without mutating agent we would need to create more of them.
+            // This tradeoff optimizes for performance.
+            httpAgent.options.timeout = minAgentTimeout;
+        }
+        if (this.idempotencyHeader && method !== 'get') {
+            if (!options.idempotencyKey)
+                options.idempotencyKey = this.defaultIdempotencyKey();
+            headers[this.idempotencyHeader] = options.idempotencyKey;
+        }
+        const reqHeaders = this.buildHeaders({ options, headers, contentLength });
+        const req = {
+            method,
+            ...(body && { body: body }),
+            headers: reqHeaders,
+            ...(httpAgent && { agent: httpAgent }),
+            // @ts-ignore node-fetch uses a custom AbortSignal type that is
+            // not compatible with standard web types
+            signal: options.signal ?? null,
+        };
+        return { req, url, timeout };
+    }
+    buildHeaders({ options, headers, contentLength, }) {
+        const reqHeaders = {};
+        if (contentLength) {
+            reqHeaders['content-length'] = contentLength;
+        }
+        const defaultHeaders = this.defaultHeaders(options);
+        applyHeadersMut(reqHeaders, defaultHeaders);
+        applyHeadersMut(reqHeaders, headers);
+        // let builtin fetch set the Content-Type for multipart bodies
+        if ((0, uploads_1.isMultipartBody)(options.body) && index_1.kind !== 'node') {
+            delete reqHeaders['content-type'];
+        }
+        this.validateHeaders(reqHeaders, headers);
+        return reqHeaders;
+    }
+    /**
+     * Used as a callback for mutating the given `FinalRequestOptions` object.
+     */
+    async prepareOptions(options) { }
+    /**
+     * Used as a callback for mutating the given `RequestInit` object.
+     *
+     * This is useful for cases where you want to add certain headers based off of
+     * the request properties, e.g. `method` or `url`.
+     */
+    async prepareRequest(request, { url, options }) { }
+    parseHeaders(headers) {
+        return (!headers ? {}
+            : Symbol.iterator in headers ?
+                Object.fromEntries(Array.from(headers).map((header) => [...header]))
+                : { ...headers });
+    }
+    makeStatusError(status, error, message, headers) {
+        return error_1.APIError.generate(status, error, message, headers);
+    }
+    request(options, remainingRetries = null) {
+        return new APIPromise(this.makeRequest(options, remainingRetries));
+    }
+    async makeRequest(optionsInput, retriesRemaining) {
+        const options = await optionsInput;
+        if (retriesRemaining == null) {
+            retriesRemaining = options.maxRetries ?? this.maxRetries;
+        }
+        await this.prepareOptions(options);
+        const { req, url, timeout } = this.buildRequest(options);
+        await this.prepareRequest(req, { url, options });
+        debug('request', url, options, req.headers);
+        if (options.signal?.aborted) {
+            throw new error_1.APIUserAbortError();
+        }
+        const controller = new AbortController();
+        const response = await this.fetchWithTimeout(url, req, timeout, controller).catch(exports.castToError);
+        if (response instanceof Error) {
+            if (options.signal?.aborted) {
+                throw new error_1.APIUserAbortError();
+            }
+            if (retriesRemaining) {
+                return this.retryRequest(options, retriesRemaining);
+            }
+            if (response.name === 'AbortError') {
+                throw new error_1.APIConnectionTimeoutError();
+            }
+            throw new error_1.APIConnectionError({ cause: response });
+        }
+        const responseHeaders = (0, exports.createResponseHeaders)(response.headers);
+        if (!response.ok) {
+            if (retriesRemaining && this.shouldRetry(response)) {
+                const retryMessage = `retrying, ${retriesRemaining} attempts remaining`;
+                debug(`response (error; ${retryMessage})`, response.status, url, responseHeaders);
+                return this.retryRequest(options, retriesRemaining, responseHeaders);
+            }
+            const errText = await response.text().catch((e) => (0, exports.castToError)(e).message);
+            const errJSON = (0, exports.safeJSON)(errText);
+            const errMessage = errJSON ? undefined : errText;
+            const retryMessage = retriesRemaining ? `(error; no more retries left)` : `(error; not retryable)`;
+            debug(`response (error; ${retryMessage})`, response.status, url, responseHeaders, errMessage);
+            const err = this.makeStatusError(response.status, errJSON, errMessage, responseHeaders);
+            throw err;
+        }
+        return { response, options, controller };
+    }
+    requestAPIList(Page, options) {
+        const request = this.makeRequest(options, null);
+        return new PagePromise(this, request, Page);
+    }
+    buildURL(path, query) {
+        const url = isAbsoluteURL(path) ?
+            new URL(path)
+            : new URL(this.baseURL + (this.baseURL.endsWith('/') && path.startsWith('/') ? path.slice(1) : path));
+        const defaultQuery = this.defaultQuery();
+        if (!isEmptyObj(defaultQuery)) {
+            query = { ...defaultQuery, ...query };
+        }
+        if (typeof query === 'object' && query && !Array.isArray(query)) {
+            url.search = this.stringifyQuery(query);
+        }
+        return url.toString();
+    }
+    stringifyQuery(query) {
+        return Object.entries(query)
+            .filter(([_, value]) => typeof value !== 'undefined')
+            .map(([key, value]) => {
+            if (typeof value === 'string' || typeof value === 'number' || typeof value === 'boolean') {
+                return `${encodeURIComponent(key)}=${encodeURIComponent(value)}`;
+            }
+            if (value === null) {
+                return `${encodeURIComponent(key)}=`;
+            }
+            throw new error_1.OpenAIError(`Cannot stringify type ${typeof value}; Expected string, number, boolean, or null. If you need to pass nested query parameters, you can manually encode them, e.g. { query: { 'foo[key1]': value1, 'foo[key2]': value2 } }, and please open a GitHub issue requesting better support for your use case.`);
+        })
+            .join('&');
+    }
+    async fetchWithTimeout(url, init, ms, controller) {
+        const { signal, ...options } = init || {};
+        if (signal)
+            signal.addEventListener('abort', () => controller.abort());
+        const timeout = setTimeout(() => controller.abort(), ms);
+        return (this.getRequestClient()
+            // use undefined this binding; fetch errors if bound to something else in browser/cloudflare
+            .fetch.call(undefined, url, { signal: controller.signal, ...options })
+            .finally(() => {
+            clearTimeout(timeout);
+        }));
+    }
+    getRequestClient() {
+        return { fetch: this.fetch };
+    }
+    shouldRetry(response) {
+        // Note this is not a standard header.
+        const shouldRetryHeader = response.headers.get('x-should-retry');
+        // If the server explicitly says whether or not to retry, obey.
+        if (shouldRetryHeader === 'true')
+            return true;
+        if (shouldRetryHeader === 'false')
+            return false;
+        // Retry on request timeouts.
+        if (response.status === 408)
+            return true;
+        // Retry on lock timeouts.
+        if (response.status === 409)
+            return true;
+        // Retry on rate limits.
+        if (response.status === 429)
+            return true;
+        // Retry internal errors.
+        if (response.status >= 500)
+            return true;
+        return false;
+    }
+    async retryRequest(options, retriesRemaining, responseHeaders) {
+        let timeoutMillis;
+        // Note the `retry-after-ms` header may not be standard, but is a good idea and we'd like proactive support for it.
+        const retryAfterMillisHeader = responseHeaders?.['retry-after-ms'];
+        if (retryAfterMillisHeader) {
+            const timeoutMs = parseFloat(retryAfterMillisHeader);
+            if (!Number.isNaN(timeoutMs)) {
+                timeoutMillis = timeoutMs;
+            }
+        }
+        // About the Retry-After header: https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Retry-After
+        const retryAfterHeader = responseHeaders?.['retry-after'];
+        if (retryAfterHeader && !timeoutMillis) {
+            const timeoutSeconds = parseFloat(retryAfterHeader);
+            if (!Number.isNaN(timeoutSeconds)) {
+                timeoutMillis = timeoutSeconds * 1000;
+            }
+            else {
+                timeoutMillis = Date.parse(retryAfterHeader) - Date.now();
+            }
+        }
+        // If the API asks us to wait a certain amount of time (and it's a reasonable amount),
+        // just do what it says, but otherwise calculate a default
+        if (!(timeoutMillis && 0 <= timeoutMillis && timeoutMillis < 60 * 1000)) {
+            const maxRetries = options.maxRetries ?? this.maxRetries;
+            timeoutMillis = this.calculateDefaultRetryTimeoutMillis(retriesRemaining, maxRetries);
+        }
+        await (0, exports.sleep)(timeoutMillis);
+        return this.makeRequest(options, retriesRemaining - 1);
+    }
+    calculateDefaultRetryTimeoutMillis(retriesRemaining, maxRetries) {
+        const initialRetryDelay = 0.5;
+        const maxRetryDelay = 8.0;
+        const numRetries = maxRetries - retriesRemaining;
+        // Apply exponential backoff, but not more than the max.
+        const sleepSeconds = Math.min(initialRetryDelay * Math.pow(2, numRetries), maxRetryDelay);
+        // Apply some jitter, take up to at most 25 percent of the retry time.
+        const jitter = 1 - Math.random() * 0.25;
+        return sleepSeconds * jitter * 1000;
+    }
+    getUserAgent() {
+        return `${this.constructor.name}/JS ${version_1.VERSION}`;
+    }
+}
+exports.APIClient = APIClient;
+class AbstractPage {
+    constructor(client, response, body, options) {
+        _AbstractPage_client.set(this, void 0);
+        __classPrivateFieldSet(this, _AbstractPage_client, client, "f");
+        this.options = options;
+        this.response = response;
+        this.body = body;
+    }
+    hasNextPage() {
+        const items = this.getPaginatedItems();
+        if (!items.length)
+            return false;
+        return this.nextPageInfo() != null;
+    }
+    async getNextPage() {
+        const nextInfo = this.nextPageInfo();
+        if (!nextInfo) {
+            throw new error_1.OpenAIError('No next page expected; please check `.hasNextPage()` before calling `.getNextPage()`.');
+        }
+        const nextOptions = { ...this.options };
+        if ('params' in nextInfo && typeof nextOptions.query === 'object') {
+            nextOptions.query = { ...nextOptions.query, ...nextInfo.params };
+        }
+        else if ('url' in nextInfo) {
+            const params = [...Object.entries(nextOptions.query || {}), ...nextInfo.url.searchParams.entries()];
+            for (const [key, value] of params) {
+                nextInfo.url.searchParams.set(key, value);
+            }
+            nextOptions.query = undefined;
+            nextOptions.path = nextInfo.url.toString();
+        }
+        return await __classPrivateFieldGet(this, _AbstractPage_client, "f").requestAPIList(this.constructor, nextOptions);
+    }
+    async *iterPages() {
+        // eslint-disable-next-line @typescript-eslint/no-this-alias
+        let page = this;
+        yield page;
+        while (page.hasNextPage()) {
+            page = await page.getNextPage();
+            yield page;
+        }
+    }
+    async *[(_AbstractPage_client = new WeakMap(), Symbol.asyncIterator)]() {
+        for await (const page of this.iterPages()) {
+            for (const item of page.getPaginatedItems()) {
+                yield item;
+            }
+        }
+    }
+}
+exports.AbstractPage = AbstractPage;
+/**
+ * This subclass of Promise will resolve to an instantiated Page once the request completes.
+ *
+ * It also implements AsyncIterable to allow auto-paginating iteration on an unawaited list call, eg:
+ *
+ *    for await (const item of client.items.list()) {
+ *      console.log(item)
+ *    }
+ */
+class PagePromise extends APIPromise {
+    constructor(client, request, Page) {
+        super(request, async (props) => new Page(client, props.response, await defaultParseResponse(props), props.options));
+    }
+    /**
+     * Allow auto-paginating iteration on an unawaited list call, eg:
+     *
+     *    for await (const item of client.items.list()) {
+     *      console.log(item)
+     *    }
+     */
+    async *[Symbol.asyncIterator]() {
+        const page = await this;
+        for await (const item of page) {
+            yield item;
+        }
+    }
+}
+exports.PagePromise = PagePromise;
+const createResponseHeaders = (headers) => {
+    return new Proxy(Object.fromEntries(
+    // @ts-ignore
+    headers.entries()), {
+        get(target, name) {
+            const key = name.toString();
+            return target[key.toLowerCase()] || target[key];
+        },
+    });
+};
+exports.createResponseHeaders = createResponseHeaders;
+// This is required so that we can determine if a given object matches the RequestOptions
+// type at runtime. While this requires duplication, it is enforced by the TypeScript
+// compiler such that any missing / extraneous keys will cause an error.
+const requestOptionsKeys = {
+    method: true,
+    path: true,
+    query: true,
+    body: true,
+    headers: true,
+    maxRetries: true,
+    stream: true,
+    timeout: true,
+    httpAgent: true,
+    signal: true,
+    idempotencyKey: true,
+    __binaryResponse: true,
+    __streamClass: true,
+};
+const isRequestOptions = (obj) => {
+    return (typeof obj === 'object' &&
+        obj !== null &&
+        !isEmptyObj(obj) &&
+        Object.keys(obj).every((k) => hasOwn(requestOptionsKeys, k)));
+};
+exports.isRequestOptions = isRequestOptions;
+const getPlatformProperties = () => {
+    if (typeof Deno !== 'undefined' && Deno.build != null) {
+        return {
+            'X-Stainless-Lang': 'js',
+            'X-Stainless-Package-Version': version_1.VERSION,
+            'X-Stainless-OS': normalizePlatform(Deno.build.os),
+            'X-Stainless-Arch': normalizeArch(Deno.build.arch),
+            'X-Stainless-Runtime': 'deno',
+            'X-Stainless-Runtime-Version': typeof Deno.version === 'string' ? Deno.version : Deno.version?.deno ?? 'unknown',
+        };
+    }
+    if (typeof EdgeRuntime !== 'undefined') {
+        return {
+            'X-Stainless-Lang': 'js',
+            'X-Stainless-Package-Version': version_1.VERSION,
+            'X-Stainless-OS': 'Unknown',
+            'X-Stainless-Arch': `other:${EdgeRuntime}`,
+            'X-Stainless-Runtime': 'edge',
+            'X-Stainless-Runtime-Version': process.version,
+        };
+    }
+    // Check if Node.js
+    if (Object.prototype.toString.call(typeof process !== 'undefined' ? process : 0) === '[object process]') {
+        return {
+            'X-Stainless-Lang': 'js',
+            'X-Stainless-Package-Version': version_1.VERSION,
+            'X-Stainless-OS': normalizePlatform(process.platform),
+            'X-Stainless-Arch': normalizeArch(process.arch),
+            'X-Stainless-Runtime': 'node',
+            'X-Stainless-Runtime-Version': process.version,
+        };
+    }
+    const browserInfo = getBrowserInfo();
+    if (browserInfo) {
+        return {
+            'X-Stainless-Lang': 'js',
+            'X-Stainless-Package-Version': version_1.VERSION,
+            'X-Stainless-OS': 'Unknown',
+            'X-Stainless-Arch': 'unknown',
+            'X-Stainless-Runtime': `browser:${browserInfo.browser}`,
+            'X-Stainless-Runtime-Version': browserInfo.version,
+        };
+    }
+    // TODO add support for Cloudflare workers, etc.
+    return {
+        'X-Stainless-Lang': 'js',
+        'X-Stainless-Package-Version': version_1.VERSION,
+        'X-Stainless-OS': 'Unknown',
+        'X-Stainless-Arch': 'unknown',
+        'X-Stainless-Runtime': 'unknown',
+        'X-Stainless-Runtime-Version': 'unknown',
+    };
+};
+// Note: modified from https://github.com/JS-DevTools/host-environment/blob/b1ab79ecde37db5d6e163c050e54fe7d287d7c92/src/isomorphic.browser.ts
+function getBrowserInfo() {
+    if (typeof navigator === 'undefined' || !navigator) {
+        return null;
+    }
+    // NOTE: The order matters here!
+    const browserPatterns = [
+        { key: 'edge', pattern: /Edge(?:\W+(\d+)\.(\d+)(?:\.(\d+))?)?/ },
+        { key: 'ie', pattern: /MSIE(?:\W+(\d+)\.(\d+)(?:\.(\d+))?)?/ },
+        { key: 'ie', pattern: /Trident(?:.*rv\:(\d+)\.(\d+)(?:\.(\d+))?)?/ },
+        { key: 'chrome', pattern: /Chrome(?:\W+(\d+)\.(\d+)(?:\.(\d+))?)?/ },
+        { key: 'firefox', pattern: /Firefox(?:\W+(\d+)\.(\d+)(?:\.(\d+))?)?/ },
+        { key: 'safari', pattern: /(?:Version\W+(\d+)\.(\d+)(?:\.(\d+))?)?(?:\W+Mobile\S*)?\W+Safari/ },
+    ];
+    // Find the FIRST matching browser
+    for (const { key, pattern } of browserPatterns) {
+        const match = pattern.exec(navigator.userAgent);
+        if (match) {
+            const major = match[1] || 0;
+            const minor = match[2] || 0;
+            const patch = match[3] || 0;
+            return { browser: key, version: `${major}.${minor}.${patch}` };
+        }
+    }
+    return null;
+}
+const normalizeArch = (arch) => {
+    // Node docs:
+    // - https://nodejs.org/api/process.html#processarch
+    // Deno docs:
+    // - https://doc.deno.land/deno/stable/~/Deno.build
+    if (arch === 'x32')
+        return 'x32';
+    if (arch === 'x86_64' || arch === 'x64')
+        return 'x64';
+    if (arch === 'arm')
+        return 'arm';
+    if (arch === 'aarch64' || arch === 'arm64')
+        return 'arm64';
+    if (arch)
+        return `other:${arch}`;
+    return 'unknown';
+};
+const normalizePlatform = (platform) => {
+    // Node platforms:
+    // - https://nodejs.org/api/process.html#processplatform
+    // Deno platforms:
+    // - https://doc.deno.land/deno/stable/~/Deno.build
+    // - https://github.com/denoland/deno/issues/14799
+    platform = platform.toLowerCase();
+    // NOTE: this iOS check is untested and may not work
+    // Node does not work natively on IOS, there is a fork at
+    // https://github.com/nodejs-mobile/nodejs-mobile
+    // however it is unknown at the time of writing how to detect if it is running
+    if (platform.includes('ios'))
+        return 'iOS';
+    if (platform === 'android')
+        return 'Android';
+    if (platform === 'darwin')
+        return 'MacOS';
+    if (platform === 'win32')
+        return 'Windows';
+    if (platform === 'freebsd')
+        return 'FreeBSD';
+    if (platform === 'openbsd')
+        return 'OpenBSD';
+    if (platform === 'linux')
+        return 'Linux';
+    if (platform)
+        return `Other:${platform}`;
+    return 'Unknown';
+};
+let _platformHeaders;
+const getPlatformHeaders = () => {
+    return (_platformHeaders ?? (_platformHeaders = getPlatformProperties()));
+};
+const safeJSON = (text) => {
+    try {
+        return JSON.parse(text);
+    }
+    catch (err) {
+        return undefined;
+    }
+};
+exports.safeJSON = safeJSON;
+// https://stackoverflow.com/a/19709846
+const startsWithSchemeRegexp = new RegExp('^(?:[a-z]+:)?//', 'i');
+const isAbsoluteURL = (url) => {
+    return startsWithSchemeRegexp.test(url);
+};
+const sleep = (ms) => new Promise((resolve) => setTimeout(resolve, ms));
+exports.sleep = sleep;
+const validatePositiveInteger = (name, n) => {
+    if (typeof n !== 'number' || !Number.isInteger(n)) {
+        throw new error_1.OpenAIError(`${name} must be an integer`);
+    }
+    if (n < 0) {
+        throw new error_1.OpenAIError(`${name} must be a positive integer`);
+    }
+    return n;
+};
+const castToError = (err) => {
+    if (err instanceof Error)
+        return err;
+    return new Error(err);
+};
+exports.castToError = castToError;
+const ensurePresent = (value) => {
+    if (value == null)
+        throw new error_1.OpenAIError(`Expected a value to be given but received ${value} instead.`);
+    return value;
+};
+exports.ensurePresent = ensurePresent;
+/**
+ * Read an environment variable.
+ *
+ * Trims beginning and trailing whitespace.
+ *
+ * Will return undefined if the environment variable doesn't exist or cannot be accessed.
+ */
+const readEnv = (env) => {
+    if (typeof process !== 'undefined') {
+        return process.env?.[env]?.trim() ?? undefined;
+    }
+    if (typeof Deno !== 'undefined') {
+        return Deno.env?.get?.(env)?.trim();
+    }
+    return undefined;
+};
+exports.readEnv = readEnv;
+const coerceInteger = (value) => {
+    if (typeof value === 'number')
+        return Math.round(value);
+    if (typeof value === 'string')
+        return parseInt(value, 10);
+    throw new error_1.OpenAIError(`Could not coerce ${value} (type: ${typeof value}) into a number`);
+};
+exports.coerceInteger = coerceInteger;
+const coerceFloat = (value) => {
+    if (typeof value === 'number')
+        return value;
+    if (typeof value === 'string')
+        return parseFloat(value);
+    throw new error_1.OpenAIError(`Could not coerce ${value} (type: ${typeof value}) into a number`);
+};
+exports.coerceFloat = coerceFloat;
+const coerceBoolean = (value) => {
+    if (typeof value === 'boolean')
+        return value;
+    if (typeof value === 'string')
+        return value === 'true';
+    return Boolean(value);
+};
+exports.coerceBoolean = coerceBoolean;
+const maybeCoerceInteger = (value) => {
+    if (value === undefined) {
+        return undefined;
+    }
+    return (0, exports.coerceInteger)(value);
+};
+exports.maybeCoerceInteger = maybeCoerceInteger;
+const maybeCoerceFloat = (value) => {
+    if (value === undefined) {
+        return undefined;
+    }
+    return (0, exports.coerceFloat)(value);
+};
+exports.maybeCoerceFloat = maybeCoerceFloat;
+const maybeCoerceBoolean = (value) => {
+    if (value === undefined) {
+        return undefined;
+    }
+    return (0, exports.coerceBoolean)(value);
+};
+exports.maybeCoerceBoolean = maybeCoerceBoolean;
+// https://stackoverflow.com/a/34491287
+function isEmptyObj(obj) {
+    if (!obj)
+        return true;
+    for (const _k in obj)
+        return false;
+    return true;
+}
+exports.isEmptyObj = isEmptyObj;
+// https://eslint.org/docs/latest/rules/no-prototype-builtins
+function hasOwn(obj, key) {
+    return Object.prototype.hasOwnProperty.call(obj, key);
+}
+exports.hasOwn = hasOwn;
+/**
+ * Copies headers from "newHeaders" onto "targetHeaders",
+ * using lower-case for all properties,
+ * ignoring any keys with undefined values,
+ * and deleting any keys with null values.
+ */
+function applyHeadersMut(targetHeaders, newHeaders) {
+    for (const k in newHeaders) {
+        if (!hasOwn(newHeaders, k))
+            continue;
+        const lowerKey = k.toLowerCase();
+        if (!lowerKey)
+            continue;
+        const val = newHeaders[k];
+        if (val === null) {
+            delete targetHeaders[lowerKey];
+        }
+        else if (val !== undefined) {
+            targetHeaders[lowerKey] = val;
+        }
+    }
+}
+function debug(action, ...args) {
+    if (typeof process !== 'undefined' && process?.env?.['DEBUG'] === 'true') {
+        console.log(`OpenAI:DEBUG:${action}`, ...args);
+    }
+}
+exports.debug = debug;
+/**
+ * https://stackoverflow.com/a/2117523
+ */
+const uuid4 = () => {
+    return 'xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx'.replace(/[xy]/g, (c) => {
+        const r = (Math.random() * 16) | 0;
+        const v = c === 'x' ? r : (r & 0x3) | 0x8;
+        return v.toString(16);
+    });
+};
+const isRunningInBrowser = () => {
+    return (
+    // @ts-ignore
+    typeof window !== 'undefined' &&
+        // @ts-ignore
+        typeof window.document !== 'undefined' &&
+        // @ts-ignore
+        typeof navigator !== 'undefined');
+};
+exports.isRunningInBrowser = isRunningInBrowser;
+const isHeadersProtocol = (headers) => {
+    return typeof headers?.get === 'function';
+};
+exports.isHeadersProtocol = isHeadersProtocol;
+const getRequiredHeader = (headers, header) => {
+    const lowerCasedHeader = header.toLowerCase();
+    if ((0, exports.isHeadersProtocol)(headers)) {
+        // to deal with the case where the header looks like Stainless-Event-Id
+        const intercapsHeader = header[0]?.toUpperCase() +
+            header.substring(1).replace(/([^\w])(\w)/g, (_m, g1, g2) => g1 + g2.toUpperCase());
+        for (const key of [header, lowerCasedHeader, header.toUpperCase(), intercapsHeader]) {
+            const value = headers.get(key);
+            if (value) {
+                return value;
+            }
+        }
+    }
+    for (const [key, value] of Object.entries(headers)) {
+        if (key.toLowerCase() === lowerCasedHeader) {
+            if (Array.isArray(value)) {
+                if (value.length <= 1)
+                    return value[0];
+                console.warn(`Received ${value.length} entries for the ${header} header, using the first entry.`);
+                return value[0];
+            }
+            return value;
+        }
+    }
+    throw new Error(`Could not find ${header} header`);
+};
+exports.getRequiredHeader = getRequiredHeader;
+/**
+ * Encodes a string to Base64 format.
+ */
+const toBase64 = (str) => {
+    if (!str)
+        return '';
+    if (typeof Buffer !== 'undefined') {
+        return Buffer.from(str).toString('base64');
+    }
+    if (typeof btoa !== 'undefined') {
+        return btoa(str);
+    }
+    throw new error_1.OpenAIError('Cannot generate b64 string; Expected `Buffer` or `btoa` to be defined');
+};
+exports.toBase64 = toBase64;
+function isObj(obj) {
+    return obj != null && typeof obj === 'object' && !Array.isArray(obj);
+}
+exports.isObj = isObj;
+//# sourceMappingURL=core.js.map
+
+/***/ }),
+
+/***/ 8905:
+/***/ ((__unused_webpack_module, exports, __nccwpck_require__) => {
+
+"use strict";
+
+// File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+Object.defineProperty(exports, "__esModule", ({ value: true }));
+exports.InternalServerError = exports.RateLimitError = exports.UnprocessableEntityError = exports.ConflictError = exports.NotFoundError = exports.PermissionDeniedError = exports.AuthenticationError = exports.BadRequestError = exports.APIConnectionTimeoutError = exports.APIConnectionError = exports.APIUserAbortError = exports.APIError = exports.OpenAIError = void 0;
+const core_1 = __nccwpck_require__(1798);
+class OpenAIError extends Error {
+}
+exports.OpenAIError = OpenAIError;
+class APIError extends OpenAIError {
+    constructor(status, error, message, headers) {
+        super(`${APIError.makeMessage(status, error, message)}`);
+        this.status = status;
+        this.headers = headers;
+        this.request_id = headers?.['x-request-id'];
+        const data = error;
+        this.error = data;
+        this.code = data?.['code'];
+        this.param = data?.['param'];
+        this.type = data?.['type'];
+    }
+    static makeMessage(status, error, message) {
+        const msg = error?.message ?
+            typeof error.message === 'string' ?
+                error.message
+                : JSON.stringify(error.message)
+            : error ? JSON.stringify(error)
+                : message;
+        if (status && msg) {
+            return `${status} ${msg}`;
+        }
+        if (status) {
+            return `${status} status code (no body)`;
+        }
+        if (msg) {
+            return msg;
+        }
+        return '(no status code or body)';
+    }
+    static generate(status, errorResponse, message, headers) {
+        if (!status) {
+            return new APIConnectionError({ cause: (0, core_1.castToError)(errorResponse) });
+        }
+        const error = errorResponse?.['error'];
+        if (status === 400) {
+            return new BadRequestError(status, error, message, headers);
+        }
+        if (status === 401) {
+            return new AuthenticationError(status, error, message, headers);
+        }
+        if (status === 403) {
+            return new PermissionDeniedError(status, error, message, headers);
+        }
+        if (status === 404) {
+            return new NotFoundError(status, error, message, headers);
+        }
+        if (status === 409) {
+            return new ConflictError(status, error, message, headers);
+        }
+        if (status === 422) {
+            return new UnprocessableEntityError(status, error, message, headers);
+        }
+        if (status === 429) {
+            return new RateLimitError(status, error, message, headers);
+        }
+        if (status >= 500) {
+            return new InternalServerError(status, error, message, headers);
+        }
+        return new APIError(status, error, message, headers);
+    }
+}
+exports.APIError = APIError;
+class APIUserAbortError extends APIError {
+    constructor({ message } = {}) {
+        super(undefined, undefined, message || 'Request was aborted.', undefined);
+        this.status = undefined;
+    }
+}
+exports.APIUserAbortError = APIUserAbortError;
+class APIConnectionError extends APIError {
+    constructor({ message, cause }) {
+        super(undefined, undefined, message || 'Connection error.', undefined);
+        this.status = undefined;
+        // in some environments the 'cause' property is already declared
+        // @ts-ignore
+        if (cause)
+            this.cause = cause;
+    }
+}
+exports.APIConnectionError = APIConnectionError;
+class APIConnectionTimeoutError extends APIConnectionError {
+    constructor({ message } = {}) {
+        super({ message: message ?? 'Request timed out.' });
+    }
+}
+exports.APIConnectionTimeoutError = APIConnectionTimeoutError;
+class BadRequestError extends APIError {
+    constructor() {
+        super(...arguments);
+        this.status = 400;
+    }
+}
+exports.BadRequestError = BadRequestError;
+class AuthenticationError extends APIError {
+    constructor() {
+        super(...arguments);
+        this.status = 401;
+    }
+}
+exports.AuthenticationError = AuthenticationError;
+class PermissionDeniedError extends APIError {
+    constructor() {
+        super(...arguments);
+        this.status = 403;
+    }
+}
+exports.PermissionDeniedError = PermissionDeniedError;
+class NotFoundError extends APIError {
+    constructor() {
+        super(...arguments);
+        this.status = 404;
+    }
+}
+exports.NotFoundError = NotFoundError;
+class ConflictError extends APIError {
+    constructor() {
+        super(...arguments);
+        this.status = 409;
+    }
+}
+exports.ConflictError = ConflictError;
+class UnprocessableEntityError extends APIError {
+    constructor() {
+        super(...arguments);
+        this.status = 422;
+    }
+}
+exports.UnprocessableEntityError = UnprocessableEntityError;
+class RateLimitError extends APIError {
+    constructor() {
+        super(...arguments);
+        this.status = 429;
+    }
+}
+exports.RateLimitError = RateLimitError;
+class InternalServerError extends APIError {
+}
+exports.InternalServerError = InternalServerError;
+//# sourceMappingURL=error.js.map
+
+/***/ }),
+
+/***/ 47:
+/***/ (function(module, exports, __nccwpck_require__) {
+
+"use strict";
+
+// File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
+var _a;
+Object.defineProperty(exports, "__esModule", ({ value: true }));
+exports.AzureOpenAI = exports.fileFromPath = exports.toFile = exports.UnprocessableEntityError = exports.PermissionDeniedError = exports.InternalServerError = exports.AuthenticationError = exports.BadRequestError = exports.RateLimitError = exports.ConflictError = exports.NotFoundError = exports.APIUserAbortError = exports.APIConnectionTimeoutError = exports.APIConnectionError = exports.APIError = exports.OpenAIError = exports.OpenAI = void 0;
+const Core = __importStar(__nccwpck_require__(1798));
+const Errors = __importStar(__nccwpck_require__(8905));
+const Uploads = __importStar(__nccwpck_require__(3394));
+const Pagination = __importStar(__nccwpck_require__(7401));
+const API = __importStar(__nccwpck_require__(5690));
+/** API Client for interfacing with the OpenAI API. */
+class OpenAI extends Core.APIClient {
+    /**
+     * API Client for interfacing with the OpenAI API.
+     *
+     * @param {string | undefined} [opts.apiKey=process.env['OPENAI_API_KEY'] ?? undefined]
+     * @param {string | null | undefined} [opts.organization=process.env['OPENAI_ORG_ID'] ?? null]
+     * @param {string | null | undefined} [opts.project=process.env['OPENAI_PROJECT_ID'] ?? null]
+     * @param {string} [opts.baseURL=process.env['OPENAI_BASE_URL'] ?? https://api.openai.com/v1] - Override the default base URL for the API.
+     * @param {number} [opts.timeout=10 minutes] - The maximum amount of time (in milliseconds) the client will wait for a response before timing out.
+     * @param {number} [opts.httpAgent] - An HTTP agent used to manage HTTP(s) connections.
+     * @param {Core.Fetch} [opts.fetch] - Specify a custom `fetch` function implementation.
+     * @param {number} [opts.maxRetries=2] - The maximum number of times the client will retry a request.
+     * @param {Core.Headers} opts.defaultHeaders - Default headers to include with every request to the API.
+     * @param {Core.DefaultQuery} opts.defaultQuery - Default query parameters to include with every request to the API.
+     * @param {boolean} [opts.dangerouslyAllowBrowser=false] - By default, client-side use of this library is not allowed, as it risks exposing your secret API credentials to attackers.
+     */
+    constructor({ baseURL = Core.readEnv('OPENAI_BASE_URL'), apiKey = Core.readEnv('OPENAI_API_KEY'), organization = Core.readEnv('OPENAI_ORG_ID') ?? null, project = Core.readEnv('OPENAI_PROJECT_ID') ?? null, ...opts } = {}) {
+        if (apiKey === undefined) {
+            throw new Errors.OpenAIError("The OPENAI_API_KEY environment variable is missing or empty; either provide it, or instantiate the OpenAI client with an apiKey option, like new OpenAI({ apiKey: 'My API Key' }).");
+        }
+        const options = {
+            apiKey,
+            organization,
+            project,
+            ...opts,
+            baseURL: baseURL || `https://api.openai.com/v1`,
+        };
+        if (!options.dangerouslyAllowBrowser && Core.isRunningInBrowser()) {
+            throw new Errors.OpenAIError("It looks like you're running in a browser-like environment.\n\nThis is disabled by default, as it risks exposing your secret API credentials to attackers.\nIf you understand the risks and have appropriate mitigations in place,\nyou can set the `dangerouslyAllowBrowser` option to `true`, e.g.,\n\nnew OpenAI({ apiKey, dangerouslyAllowBrowser: true });\n\nhttps://help.openai.com/en/articles/5112595-best-practices-for-api-key-safety\n");
+        }
+        super({
+            baseURL: options.baseURL,
+            timeout: options.timeout ?? 600000 /* 10 minutes */,
+            httpAgent: options.httpAgent,
+            maxRetries: options.maxRetries,
+            fetch: options.fetch,
+        });
+        this.completions = new API.Completions(this);
+        this.chat = new API.Chat(this);
+        this.embeddings = new API.Embeddings(this);
+        this.files = new API.Files(this);
+        this.images = new API.Images(this);
+        this.audio = new API.Audio(this);
+        this.moderations = new API.Moderations(this);
+        this.models = new API.Models(this);
+        this.fineTuning = new API.FineTuning(this);
+        this.beta = new API.Beta(this);
+        this.batches = new API.Batches(this);
+        this._options = options;
+        this.apiKey = apiKey;
+        this.organization = organization;
+        this.project = project;
+    }
+    defaultQuery() {
+        return this._options.defaultQuery;
+    }
+    defaultHeaders(opts) {
+        return {
+            ...super.defaultHeaders(opts),
+            'OpenAI-Organization': this.organization,
+            'OpenAI-Project': this.project,
+            ...this._options.defaultHeaders,
+        };
+    }
+    authHeaders(opts) {
+        return { Authorization: `Bearer ${this.apiKey}` };
+    }
+}
+exports.OpenAI = OpenAI;
+_a = OpenAI;
+OpenAI.OpenAI = _a;
+OpenAI.OpenAIError = Errors.OpenAIError;
+OpenAI.APIError = Errors.APIError;
+OpenAI.APIConnectionError = Errors.APIConnectionError;
+OpenAI.APIConnectionTimeoutError = Errors.APIConnectionTimeoutError;
+OpenAI.APIUserAbortError = Errors.APIUserAbortError;
+OpenAI.NotFoundError = Errors.NotFoundError;
+OpenAI.ConflictError = Errors.ConflictError;
+OpenAI.RateLimitError = Errors.RateLimitError;
+OpenAI.BadRequestError = Errors.BadRequestError;
+OpenAI.AuthenticationError = Errors.AuthenticationError;
+OpenAI.InternalServerError = Errors.InternalServerError;
+OpenAI.PermissionDeniedError = Errors.PermissionDeniedError;
+OpenAI.UnprocessableEntityError = Errors.UnprocessableEntityError;
+OpenAI.toFile = Uploads.toFile;
+OpenAI.fileFromPath = Uploads.fileFromPath;
+exports.OpenAIError = Errors.OpenAIError, exports.APIError = Errors.APIError, exports.APIConnectionError = Errors.APIConnectionError, exports.APIConnectionTimeoutError = Errors.APIConnectionTimeoutError, exports.APIUserAbortError = Errors.APIUserAbortError, exports.NotFoundError = Errors.NotFoundError, exports.ConflictError = Errors.ConflictError, exports.RateLimitError = Errors.RateLimitError, exports.BadRequestError = Errors.BadRequestError, exports.AuthenticationError = Errors.AuthenticationError, exports.InternalServerError = Errors.InternalServerError, exports.PermissionDeniedError = Errors.PermissionDeniedError, exports.UnprocessableEntityError = Errors.UnprocessableEntityError;
+exports.toFile = Uploads.toFile;
+exports.fileFromPath = Uploads.fileFromPath;
+(function (OpenAI) {
+    OpenAI.Page = Pagination.Page;
+    OpenAI.CursorPage = Pagination.CursorPage;
+    OpenAI.Completions = API.Completions;
+    OpenAI.Chat = API.Chat;
+    OpenAI.Embeddings = API.Embeddings;
+    OpenAI.Files = API.Files;
+    OpenAI.FileObjectsPage = API.FileObjectsPage;
+    OpenAI.Images = API.Images;
+    OpenAI.Audio = API.Audio;
+    OpenAI.Moderations = API.Moderations;
+    OpenAI.Models = API.Models;
+    OpenAI.ModelsPage = API.ModelsPage;
+    OpenAI.FineTuning = API.FineTuning;
+    OpenAI.Beta = API.Beta;
+    OpenAI.Batches = API.Batches;
+    OpenAI.BatchesPage = API.BatchesPage;
+})(OpenAI = exports.OpenAI || (exports.OpenAI = {}));
+/** API Client for interfacing with the Azure OpenAI API. */
+class AzureOpenAI extends OpenAI {
+    /**
+     * API Client for interfacing with the Azure OpenAI API.
+     *
+     * @param {string | undefined} [opts.apiVersion=process.env['OPENAI_API_VERSION'] ?? undefined]
+     * @param {string | undefined} [opts.endpoint=process.env['AZURE_OPENAI_ENDPOINT'] ?? undefined] - Your Azure endpoint, including the resource, e.g. `https://example-resource.azure.openai.com/`
+     * @param {string | undefined} [opts.apiKey=process.env['AZURE_OPENAI_API_KEY'] ?? undefined]
+     * @param {string | undefined} opts.deployment - A model deployment, if given, sets the base client URL to include `/deployments/{deployment}`.
+     * @param {string | null | undefined} [opts.organization=process.env['OPENAI_ORG_ID'] ?? null]
+     * @param {string} [opts.baseURL=process.env['OPENAI_BASE_URL']] - Sets the base URL for the API.
+     * @param {number} [opts.timeout=10 minutes] - The maximum amount of time (in milliseconds) the client will wait for a response before timing out.
+     * @param {number} [opts.httpAgent] - An HTTP agent used to manage HTTP(s) connections.
+     * @param {Core.Fetch} [opts.fetch] - Specify a custom `fetch` function implementation.
+     * @param {number} [opts.maxRetries=2] - The maximum number of times the client will retry a request.
+     * @param {Core.Headers} opts.defaultHeaders - Default headers to include with every request to the API.
+     * @param {Core.DefaultQuery} opts.defaultQuery - Default query parameters to include with every request to the API.
+     * @param {boolean} [opts.dangerouslyAllowBrowser=false] - By default, client-side use of this library is not allowed, as it risks exposing your secret API credentials to attackers.
+     */
+    constructor({ baseURL = Core.readEnv('OPENAI_BASE_URL'), apiKey = Core.readEnv('AZURE_OPENAI_API_KEY'), apiVersion = Core.readEnv('OPENAI_API_VERSION'), endpoint, deployment, azureADTokenProvider, dangerouslyAllowBrowser, ...opts } = {}) {
+        if (!apiVersion) {
+            throw new Errors.OpenAIError("The OPENAI_API_VERSION environment variable is missing or empty; either provide it, or instantiate the AzureOpenAI client with an apiVersion option, like new AzureOpenAI({ apiVersion: 'My API Version' }).");
+        }
+        if (typeof azureADTokenProvider === 'function') {
+            dangerouslyAllowBrowser = true;
+        }
+        if (!azureADTokenProvider && !apiKey) {
+            throw new Errors.OpenAIError('Missing credentials. Please pass one of `apiKey` and `azureADTokenProvider`, or set the `AZURE_OPENAI_API_KEY` environment variable.');
+        }
+        if (azureADTokenProvider && apiKey) {
+            throw new Errors.OpenAIError('The `apiKey` and `azureADTokenProvider` arguments are mutually exclusive; only one can be passed at a time.');
+        }
+        // define a sentinel value to avoid any typing issues
+        apiKey ?? (apiKey = API_KEY_SENTINEL);
+        opts.defaultQuery = { ...opts.defaultQuery, 'api-version': apiVersion };
+        if (!baseURL) {
+            if (!endpoint) {
+                endpoint = process.env['AZURE_OPENAI_ENDPOINT'];
+            }
+            if (!endpoint) {
+                throw new Errors.OpenAIError('Must provide one of the `baseURL` or `endpoint` arguments, or the `AZURE_OPENAI_ENDPOINT` environment variable');
+            }
+            baseURL = `${endpoint}/openai`;
+        }
+        else {
+            if (endpoint) {
+                throw new Errors.OpenAIError('baseURL and endpoint are mutually exclusive');
+            }
+        }
+        super({
+            apiKey,
+            baseURL,
+            ...opts,
+            ...(dangerouslyAllowBrowser !== undefined ? { dangerouslyAllowBrowser } : {}),
+        });
+        this.apiVersion = '';
+        this._azureADTokenProvider = azureADTokenProvider;
+        this.apiVersion = apiVersion;
+        this._deployment = deployment;
+    }
+    buildRequest(options) {
+        if (_deployments_endpoints.has(options.path) && options.method === 'post' && options.body !== undefined) {
+            if (!Core.isObj(options.body)) {
+                throw new Error('Expected request body to be an object');
+            }
+            const model = this._deployment || options.body['model'];
+            delete options.body['model'];
+            if (model !== undefined && !this.baseURL.includes('/deployments')) {
+                options.path = `/deployments/${model}${options.path}`;
+            }
+        }
+        return super.buildRequest(options);
+    }
+    async _getAzureADToken() {
+        if (typeof this._azureADTokenProvider === 'function') {
+            const token = await this._azureADTokenProvider();
+            if (!token || typeof token !== 'string') {
+                throw new Errors.OpenAIError(`Expected 'azureADTokenProvider' argument to return a string but it returned ${token}`);
+            }
+            return token;
+        }
+        return undefined;
+    }
+    authHeaders(opts) {
+        return {};
+    }
+    async prepareOptions(opts) {
+        if (opts.headers?.['Authorization'] || opts.headers?.['api-key']) {
+            return super.prepareOptions(opts);
+        }
+        const token = await this._getAzureADToken();
+        opts.headers ?? (opts.headers = {});
+        if (token) {
+            opts.headers['Authorization'] = `Bearer ${token}`;
+        }
+        else if (this.apiKey !== API_KEY_SENTINEL) {
+            opts.headers['api-key'] = this.apiKey;
+        }
+        else {
+            throw new Errors.OpenAIError('Unable to handle auth');
+        }
+        return super.prepareOptions(opts);
+    }
+}
+exports.AzureOpenAI = AzureOpenAI;
+const _deployments_endpoints = new Set([
+    '/completions',
+    '/chat/completions',
+    '/embeddings',
+    '/audio/transcriptions',
+    '/audio/translations',
+    '/audio/speech',
+    '/images/generations',
+    '/batches',
+]);
+const API_KEY_SENTINEL = '<Missing Key>';
+// ---------------------- End Azure ----------------------
+exports = module.exports = OpenAI;
+module.exports.AzureOpenAI = AzureOpenAI;
+exports["default"] = OpenAI;
+//# sourceMappingURL=index.js.map
+
+/***/ }),
+
+/***/ 9365:
+/***/ (function(__unused_webpack_module, exports, __nccwpck_require__) {
+
+"use strict";
+
+var __classPrivateFieldSet = (this && this.__classPrivateFieldSet) || function (receiver, state, value, kind, f) {
+    if (kind === "m") throw new TypeError("Private method is not writable");
+    if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a setter");
+    if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot write private member to an object whose class did not declare it");
+    return (kind === "a" ? f.call(receiver, value) : f ? f.value = value : state.set(receiver, value)), value;
+};
+var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (receiver, state, kind, f) {
+    if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a getter");
+    if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
+    return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
+};
+var _AbstractAssistantStreamRunner_connectedPromise, _AbstractAssistantStreamRunner_resolveConnectedPromise, _AbstractAssistantStreamRunner_rejectConnectedPromise, _AbstractAssistantStreamRunner_endPromise, _AbstractAssistantStreamRunner_resolveEndPromise, _AbstractAssistantStreamRunner_rejectEndPromise, _AbstractAssistantStreamRunner_listeners, _AbstractAssistantStreamRunner_ended, _AbstractAssistantStreamRunner_errored, _AbstractAssistantStreamRunner_aborted, _AbstractAssistantStreamRunner_catchingPromiseCreated, _AbstractAssistantStreamRunner_handleError;
+Object.defineProperty(exports, "__esModule", ({ value: true }));
+exports.AbstractAssistantStreamRunner = void 0;
+const error_1 = __nccwpck_require__(8905);
+class AbstractAssistantStreamRunner {
+    constructor() {
+        this.controller = new AbortController();
+        _AbstractAssistantStreamRunner_connectedPromise.set(this, void 0);
+        _AbstractAssistantStreamRunner_resolveConnectedPromise.set(this, () => { });
+        _AbstractAssistantStreamRunner_rejectConnectedPromise.set(this, () => { });
+        _AbstractAssistantStreamRunner_endPromise.set(this, void 0);
+        _AbstractAssistantStreamRunner_resolveEndPromise.set(this, () => { });
+        _AbstractAssistantStreamRunner_rejectEndPromise.set(this, () => { });
+        _AbstractAssistantStreamRunner_listeners.set(this, {});
+        _AbstractAssistantStreamRunner_ended.set(this, false);
+        _AbstractAssistantStreamRunner_errored.set(this, false);
+        _AbstractAssistantStreamRunner_aborted.set(this, false);
+        _AbstractAssistantStreamRunner_catchingPromiseCreated.set(this, false);
+        _AbstractAssistantStreamRunner_handleError.set(this, (error) => {
+            __classPrivateFieldSet(this, _AbstractAssistantStreamRunner_errored, true, "f");
+            if (error instanceof Error && error.name === 'AbortError') {
+                error = new error_1.APIUserAbortError();
+            }
+            if (error instanceof error_1.APIUserAbortError) {
+                __classPrivateFieldSet(this, _AbstractAssistantStreamRunner_aborted, true, "f");
+                return this._emit('abort', error);
+            }
+            if (error instanceof error_1.OpenAIError) {
+                return this._emit('error', error);
+            }
+            if (error instanceof Error) {
+                const openAIError = new error_1.OpenAIError(error.message);
+                // @ts-ignore
+                openAIError.cause = error;
+                return this._emit('error', openAIError);
+            }
+            return this._emit('error', new error_1.OpenAIError(String(error)));
+        });
+        __classPrivateFieldSet(this, _AbstractAssistantStreamRunner_connectedPromise, new Promise((resolve, reject) => {
+            __classPrivateFieldSet(this, _AbstractAssistantStreamRunner_resolveConnectedPromise, resolve, "f");
+            __classPrivateFieldSet(this, _AbstractAssistantStreamRunner_rejectConnectedPromise, reject, "f");
+        }), "f");
+        __classPrivateFieldSet(this, _AbstractAssistantStreamRunner_endPromise, new Promise((resolve, reject) => {
+            __classPrivateFieldSet(this, _AbstractAssistantStreamRunner_resolveEndPromise, resolve, "f");
+            __classPrivateFieldSet(this, _AbstractAssistantStreamRunner_rejectEndPromise, reject, "f");
+        }), "f");
+        // Don't let these promises cause unhandled rejection errors.
+        // we will manually cause an unhandled rejection error later
+        // if the user hasn't registered any error listener or called
+        // any promise-returning method.
+        __classPrivateFieldGet(this, _AbstractAssistantStreamRunner_connectedPromise, "f").catch(() => { });
+        __classPrivateFieldGet(this, _AbstractAssistantStreamRunner_endPromise, "f").catch(() => { });
+    }
+    _run(executor) {
+        // Unfortunately if we call `executor()` immediately we get runtime errors about
+        // references to `this` before the `super()` constructor call returns.
+        setTimeout(() => {
+            executor().then(() => {
+                // this._emitFinal();
+                this._emit('end');
+            }, __classPrivateFieldGet(this, _AbstractAssistantStreamRunner_handleError, "f"));
+        }, 0);
+    }
+    _addRun(run) {
+        return run;
+    }
+    _connected() {
+        if (this.ended)
+            return;
+        __classPrivateFieldGet(this, _AbstractAssistantStreamRunner_resolveConnectedPromise, "f").call(this);
+        this._emit('connect');
+    }
+    get ended() {
+        return __classPrivateFieldGet(this, _AbstractAssistantStreamRunner_ended, "f");
+    }
+    get errored() {
+        return __classPrivateFieldGet(this, _AbstractAssistantStreamRunner_errored, "f");
+    }
+    get aborted() {
+        return __classPrivateFieldGet(this, _AbstractAssistantStreamRunner_aborted, "f");
+    }
+    abort() {
+        this.controller.abort();
+    }
+    /**
+     * Adds the listener function to the end of the listeners array for the event.
+     * No checks are made to see if the listener has already been added. Multiple calls passing
+     * the same combination of event and listener will result in the listener being added, and
+     * called, multiple times.
+     * @returns this ChatCompletionStream, so that calls can be chained
+     */
+    on(event, listener) {
+        const listeners = __classPrivateFieldGet(this, _AbstractAssistantStreamRunner_listeners, "f")[event] || (__classPrivateFieldGet(this, _AbstractAssistantStreamRunner_listeners, "f")[event] = []);
+        listeners.push({ listener });
+        return this;
+    }
+    /**
+     * Removes the specified listener from the listener array for the event.
+     * off() will remove, at most, one instance of a listener from the listener array. If any single
+     * listener has been added multiple times to the listener array for the specified event, then
+     * off() must be called multiple times to remove each instance.
+     * @returns this ChatCompletionStream, so that calls can be chained
+     */
+    off(event, listener) {
+        const listeners = __classPrivateFieldGet(this, _AbstractAssistantStreamRunner_listeners, "f")[event];
+        if (!listeners)
+            return this;
+        const index = listeners.findIndex((l) => l.listener === listener);
+        if (index >= 0)
+            listeners.splice(index, 1);
+        return this;
+    }
+    /**
+     * Adds a one-time listener function for the event. The next time the event is triggered,
+     * this listener is removed and then invoked.
+     * @returns this ChatCompletionStream, so that calls can be chained
+     */
+    once(event, listener) {
+        const listeners = __classPrivateFieldGet(this, _AbstractAssistantStreamRunner_listeners, "f")[event] || (__classPrivateFieldGet(this, _AbstractAssistantStreamRunner_listeners, "f")[event] = []);
+        listeners.push({ listener, once: true });
+        return this;
+    }
+    /**
+     * This is similar to `.once()`, but returns a Promise that resolves the next time
+     * the event is triggered, instead of calling a listener callback.
+     * @returns a Promise that resolves the next time given event is triggered,
+     * or rejects if an error is emitted.  (If you request the 'error' event,
+     * returns a promise that resolves with the error).
+     *
+     * Example:
+     *
+     *   const message = await stream.emitted('message') // rejects if the stream errors
+     */
+    emitted(event) {
+        return new Promise((resolve, reject) => {
+            __classPrivateFieldSet(this, _AbstractAssistantStreamRunner_catchingPromiseCreated, true, "f");
+            if (event !== 'error')
+                this.once('error', reject);
+            this.once(event, resolve);
+        });
+    }
+    async done() {
+        __classPrivateFieldSet(this, _AbstractAssistantStreamRunner_catchingPromiseCreated, true, "f");
+        await __classPrivateFieldGet(this, _AbstractAssistantStreamRunner_endPromise, "f");
+    }
+    _emit(event, ...args) {
+        // make sure we don't emit any events after end
+        if (__classPrivateFieldGet(this, _AbstractAssistantStreamRunner_ended, "f")) {
+            return;
+        }
+        if (event === 'end') {
+            __classPrivateFieldSet(this, _AbstractAssistantStreamRunner_ended, true, "f");
+            __classPrivateFieldGet(this, _AbstractAssistantStreamRunner_resolveEndPromise, "f").call(this);
+        }
+        const listeners = __classPrivateFieldGet(this, _AbstractAssistantStreamRunner_listeners, "f")[event];
+        if (listeners) {
+            __classPrivateFieldGet(this, _AbstractAssistantStreamRunner_listeners, "f")[event] = listeners.filter((l) => !l.once);
+            listeners.forEach(({ listener }) => listener(...args));
+        }
+        if (event === 'abort') {
+            const error = args[0];
+            if (!__classPrivateFieldGet(this, _AbstractAssistantStreamRunner_catchingPromiseCreated, "f") && !listeners?.length) {
+                Promise.reject(error);
+            }
+            __classPrivateFieldGet(this, _AbstractAssistantStreamRunner_rejectConnectedPromise, "f").call(this, error);
+            __classPrivateFieldGet(this, _AbstractAssistantStreamRunner_rejectEndPromise, "f").call(this, error);
+            this._emit('end');
+            return;
+        }
+        if (event === 'error') {
+            // NOTE: _emit('error', error) should only be called from #handleError().
+            const error = args[0];
+            if (!__classPrivateFieldGet(this, _AbstractAssistantStreamRunner_catchingPromiseCreated, "f") && !listeners?.length) {
+                // Trigger an unhandled rejection if the user hasn't registered any error handlers.
+                // If you are seeing stack traces here, make sure to handle errors via either:
+                // - runner.on('error', () => ...)
+                // - await runner.done()
+                // - await runner.finalChatCompletion()
+                // - etc.
+                Promise.reject(error);
+            }
+            __classPrivateFieldGet(this, _AbstractAssistantStreamRunner_rejectConnectedPromise, "f").call(this, error);
+            __classPrivateFieldGet(this, _AbstractAssistantStreamRunner_rejectEndPromise, "f").call(this, error);
+            this._emit('end');
+        }
+    }
+    async _threadAssistantStream(body, thread, options) {
+        return await this._createThreadAssistantStream(thread, body, options);
+    }
+    async _runAssistantStream(threadId, runs, params, options) {
+        return await this._createAssistantStream(runs, threadId, params, options);
+    }
+    async _runToolAssistantStream(threadId, runId, runs, params, options) {
+        return await this._createToolAssistantStream(runs, threadId, runId, params, options);
+    }
+    async _createThreadAssistantStream(thread, body, options) {
+        const signal = options?.signal;
+        if (signal) {
+            if (signal.aborted)
+                this.controller.abort();
+            signal.addEventListener('abort', () => this.controller.abort());
+        }
+        // this.#validateParams(params);
+        const runResult = await thread.createAndRun({ ...body, stream: false }, { ...options, signal: this.controller.signal });
+        this._connected();
+        return this._addRun(runResult);
+    }
+    async _createToolAssistantStream(run, threadId, runId, params, options) {
+        const signal = options?.signal;
+        if (signal) {
+            if (signal.aborted)
+                this.controller.abort();
+            signal.addEventListener('abort', () => this.controller.abort());
+        }
+        const runResult = await run.submitToolOutputs(threadId, runId, { ...params, stream: false }, { ...options, signal: this.controller.signal });
+        this._connected();
+        return this._addRun(runResult);
+    }
+    async _createAssistantStream(run, threadId, params, options) {
+        const signal = options?.signal;
+        if (signal) {
+            if (signal.aborted)
+                this.controller.abort();
+            signal.addEventListener('abort', () => this.controller.abort());
+        }
+        // this.#validateParams(params);
+        const runResult = await run.create(threadId, { ...params, stream: false }, { ...options, signal: this.controller.signal });
+        this._connected();
+        return this._addRun(runResult);
+    }
+}
+exports.AbstractAssistantStreamRunner = AbstractAssistantStreamRunner;
+_AbstractAssistantStreamRunner_connectedPromise = new WeakMap(), _AbstractAssistantStreamRunner_resolveConnectedPromise = new WeakMap(), _AbstractAssistantStreamRunner_rejectConnectedPromise = new WeakMap(), _AbstractAssistantStreamRunner_endPromise = new WeakMap(), _AbstractAssistantStreamRunner_resolveEndPromise = new WeakMap(), _AbstractAssistantStreamRunner_rejectEndPromise = new WeakMap(), _AbstractAssistantStreamRunner_listeners = new WeakMap(), _AbstractAssistantStreamRunner_ended = new WeakMap(), _AbstractAssistantStreamRunner_errored = new WeakMap(), _AbstractAssistantStreamRunner_aborted = new WeakMap(), _AbstractAssistantStreamRunner_catchingPromiseCreated = new WeakMap(), _AbstractAssistantStreamRunner_handleError = new WeakMap();
+//# sourceMappingURL=AbstractAssistantStreamRunner.js.map
+
+/***/ }),
+
+/***/ 8398:
+/***/ (function(__unused_webpack_module, exports, __nccwpck_require__) {
+
+"use strict";
+
+var __classPrivateFieldSet = (this && this.__classPrivateFieldSet) || function (receiver, state, value, kind, f) {
+    if (kind === "m") throw new TypeError("Private method is not writable");
+    if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a setter");
+    if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot write private member to an object whose class did not declare it");
+    return (kind === "a" ? f.call(receiver, value) : f ? f.value = value : state.set(receiver, value)), value;
+};
+var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (receiver, state, kind, f) {
+    if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a getter");
+    if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
+    return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
+};
+var _AbstractChatCompletionRunner_instances, _AbstractChatCompletionRunner_connectedPromise, _AbstractChatCompletionRunner_resolveConnectedPromise, _AbstractChatCompletionRunner_rejectConnectedPromise, _AbstractChatCompletionRunner_endPromise, _AbstractChatCompletionRunner_resolveEndPromise, _AbstractChatCompletionRunner_rejectEndPromise, _AbstractChatCompletionRunner_listeners, _AbstractChatCompletionRunner_ended, _AbstractChatCompletionRunner_errored, _AbstractChatCompletionRunner_aborted, _AbstractChatCompletionRunner_catchingPromiseCreated, _AbstractChatCompletionRunner_getFinalContent, _AbstractChatCompletionRunner_getFinalMessage, _AbstractChatCompletionRunner_getFinalFunctionCall, _AbstractChatCompletionRunner_getFinalFunctionCallResult, _AbstractChatCompletionRunner_calculateTotalUsage, _AbstractChatCompletionRunner_handleError, _AbstractChatCompletionRunner_validateParams, _AbstractChatCompletionRunner_stringifyFunctionCallResult;
+Object.defineProperty(exports, "__esModule", ({ value: true }));
+exports.AbstractChatCompletionRunner = void 0;
+const error_1 = __nccwpck_require__(8905);
+const RunnableFunction_1 = __nccwpck_require__(5464);
+const chatCompletionUtils_1 = __nccwpck_require__(7858);
+const DEFAULT_MAX_CHAT_COMPLETIONS = 10;
+class AbstractChatCompletionRunner {
+    constructor() {
+        _AbstractChatCompletionRunner_instances.add(this);
+        this.controller = new AbortController();
+        _AbstractChatCompletionRunner_connectedPromise.set(this, void 0);
+        _AbstractChatCompletionRunner_resolveConnectedPromise.set(this, () => { });
+        _AbstractChatCompletionRunner_rejectConnectedPromise.set(this, () => { });
+        _AbstractChatCompletionRunner_endPromise.set(this, void 0);
+        _AbstractChatCompletionRunner_resolveEndPromise.set(this, () => { });
+        _AbstractChatCompletionRunner_rejectEndPromise.set(this, () => { });
+        _AbstractChatCompletionRunner_listeners.set(this, {});
+        this._chatCompletions = [];
+        this.messages = [];
+        _AbstractChatCompletionRunner_ended.set(this, false);
+        _AbstractChatCompletionRunner_errored.set(this, false);
+        _AbstractChatCompletionRunner_aborted.set(this, false);
+        _AbstractChatCompletionRunner_catchingPromiseCreated.set(this, false);
+        _AbstractChatCompletionRunner_handleError.set(this, (error) => {
+            __classPrivateFieldSet(this, _AbstractChatCompletionRunner_errored, true, "f");
+            if (error instanceof Error && error.name === 'AbortError') {
+                error = new error_1.APIUserAbortError();
+            }
+            if (error instanceof error_1.APIUserAbortError) {
+                __classPrivateFieldSet(this, _AbstractChatCompletionRunner_aborted, true, "f");
+                return this._emit('abort', error);
+            }
+            if (error instanceof error_1.OpenAIError) {
+                return this._emit('error', error);
+            }
+            if (error instanceof Error) {
+                const openAIError = new error_1.OpenAIError(error.message);
+                // @ts-ignore
+                openAIError.cause = error;
+                return this._emit('error', openAIError);
+            }
+            return this._emit('error', new error_1.OpenAIError(String(error)));
+        });
+        __classPrivateFieldSet(this, _AbstractChatCompletionRunner_connectedPromise, new Promise((resolve, reject) => {
+            __classPrivateFieldSet(this, _AbstractChatCompletionRunner_resolveConnectedPromise, resolve, "f");
+            __classPrivateFieldSet(this, _AbstractChatCompletionRunner_rejectConnectedPromise, reject, "f");
+        }), "f");
+        __classPrivateFieldSet(this, _AbstractChatCompletionRunner_endPromise, new Promise((resolve, reject) => {
+            __classPrivateFieldSet(this, _AbstractChatCompletionRunner_resolveEndPromise, resolve, "f");
+            __classPrivateFieldSet(this, _AbstractChatCompletionRunner_rejectEndPromise, reject, "f");
+        }), "f");
+        // Don't let these promises cause unhandled rejection errors.
+        // we will manually cause an unhandled rejection error later
+        // if the user hasn't registered any error listener or called
+        // any promise-returning method.
+        __classPrivateFieldGet(this, _AbstractChatCompletionRunner_connectedPromise, "f").catch(() => { });
+        __classPrivateFieldGet(this, _AbstractChatCompletionRunner_endPromise, "f").catch(() => { });
+    }
+    _run(executor) {
+        // Unfortunately if we call `executor()` immediately we get runtime errors about
+        // references to `this` before the `super()` constructor call returns.
+        setTimeout(() => {
+            executor().then(() => {
+                this._emitFinal();
+                this._emit('end');
+            }, __classPrivateFieldGet(this, _AbstractChatCompletionRunner_handleError, "f"));
+        }, 0);
+    }
+    _addChatCompletion(chatCompletion) {
+        this._chatCompletions.push(chatCompletion);
+        this._emit('chatCompletion', chatCompletion);
+        const message = chatCompletion.choices[0]?.message;
+        if (message)
+            this._addMessage(message);
+        return chatCompletion;
+    }
+    _addMessage(message, emit = true) {
+        if (!('content' in message))
+            message.content = null;
+        this.messages.push(message);
+        if (emit) {
+            this._emit('message', message);
+            if (((0, chatCompletionUtils_1.isFunctionMessage)(message) || (0, chatCompletionUtils_1.isToolMessage)(message)) && message.content) {
+                // Note, this assumes that {role: 'tool', content: …} is always the result of a call of tool of type=function.
+                this._emit('functionCallResult', message.content);
+            }
+            else if ((0, chatCompletionUtils_1.isAssistantMessage)(message) && message.function_call) {
+                this._emit('functionCall', message.function_call);
+            }
+            else if ((0, chatCompletionUtils_1.isAssistantMessage)(message) && message.tool_calls) {
+                for (const tool_call of message.tool_calls) {
+                    if (tool_call.type === 'function') {
+                        this._emit('functionCall', tool_call.function);
+                    }
+                }
+            }
+        }
+    }
+    _connected() {
+        if (this.ended)
+            return;
+        __classPrivateFieldGet(this, _AbstractChatCompletionRunner_resolveConnectedPromise, "f").call(this);
+        this._emit('connect');
+    }
+    get ended() {
+        return __classPrivateFieldGet(this, _AbstractChatCompletionRunner_ended, "f");
+    }
+    get errored() {
+        return __classPrivateFieldGet(this, _AbstractChatCompletionRunner_errored, "f");
+    }
+    get aborted() {
+        return __classPrivateFieldGet(this, _AbstractChatCompletionRunner_aborted, "f");
+    }
+    abort() {
+        this.controller.abort();
+    }
+    /**
+     * Adds the listener function to the end of the listeners array for the event.
+     * No checks are made to see if the listener has already been added. Multiple calls passing
+     * the same combination of event and listener will result in the listener being added, and
+     * called, multiple times.
+     * @returns this ChatCompletionStream, so that calls can be chained
+     */
+    on(event, listener) {
+        const listeners = __classPrivateFieldGet(this, _AbstractChatCompletionRunner_listeners, "f")[event] || (__classPrivateFieldGet(this, _AbstractChatCompletionRunner_listeners, "f")[event] = []);
+        listeners.push({ listener });
+        return this;
+    }
+    /**
+     * Removes the specified listener from the listener array for the event.
+     * off() will remove, at most, one instance of a listener from the listener array. If any single
+     * listener has been added multiple times to the listener array for the specified event, then
+     * off() must be called multiple times to remove each instance.
+     * @returns this ChatCompletionStream, so that calls can be chained
+     */
+    off(event, listener) {
+        const listeners = __classPrivateFieldGet(this, _AbstractChatCompletionRunner_listeners, "f")[event];
+        if (!listeners)
+            return this;
+        const index = listeners.findIndex((l) => l.listener === listener);
+        if (index >= 0)
+            listeners.splice(index, 1);
+        return this;
+    }
+    /**
+     * Adds a one-time listener function for the event. The next time the event is triggered,
+     * this listener is removed and then invoked.
+     * @returns this ChatCompletionStream, so that calls can be chained
+     */
+    once(event, listener) {
+        const listeners = __classPrivateFieldGet(this, _AbstractChatCompletionRunner_listeners, "f")[event] || (__classPrivateFieldGet(this, _AbstractChatCompletionRunner_listeners, "f")[event] = []);
+        listeners.push({ listener, once: true });
+        return this;
+    }
+    /**
+     * This is similar to `.once()`, but returns a Promise that resolves the next time
+     * the event is triggered, instead of calling a listener callback.
+     * @returns a Promise that resolves the next time given event is triggered,
+     * or rejects if an error is emitted.  (If you request the 'error' event,
+     * returns a promise that resolves with the error).
+     *
+     * Example:
+     *
+     *   const message = await stream.emitted('message') // rejects if the stream errors
+     */
+    emitted(event) {
+        return new Promise((resolve, reject) => {
+            __classPrivateFieldSet(this, _AbstractChatCompletionRunner_catchingPromiseCreated, true, "f");
+            if (event !== 'error')
+                this.once('error', reject);
+            this.once(event, resolve);
+        });
+    }
+    async done() {
+        __classPrivateFieldSet(this, _AbstractChatCompletionRunner_catchingPromiseCreated, true, "f");
+        await __classPrivateFieldGet(this, _AbstractChatCompletionRunner_endPromise, "f");
+    }
+    /**
+     * @returns a promise that resolves with the final ChatCompletion, or rejects
+     * if an error occurred or the stream ended prematurely without producing a ChatCompletion.
+     */
+    async finalChatCompletion() {
+        await this.done();
+        const completion = this._chatCompletions[this._chatCompletions.length - 1];
+        if (!completion)
+            throw new error_1.OpenAIError('stream ended without producing a ChatCompletion');
+        return completion;
+    }
+    /**
+     * @returns a promise that resolves with the content of the final ChatCompletionMessage, or rejects
+     * if an error occurred or the stream ended prematurely without producing a ChatCompletionMessage.
+     */
+    async finalContent() {
+        await this.done();
+        return __classPrivateFieldGet(this, _AbstractChatCompletionRunner_instances, "m", _AbstractChatCompletionRunner_getFinalContent).call(this);
+    }
+    /**
+     * @returns a promise that resolves with the the final assistant ChatCompletionMessage response,
+     * or rejects if an error occurred or the stream ended prematurely without producing a ChatCompletionMessage.
+     */
+    async finalMessage() {
+        await this.done();
+        return __classPrivateFieldGet(this, _AbstractChatCompletionRunner_instances, "m", _AbstractChatCompletionRunner_getFinalMessage).call(this);
+    }
+    /**
+     * @returns a promise that resolves with the content of the final FunctionCall, or rejects
+     * if an error occurred or the stream ended prematurely without producing a ChatCompletionMessage.
+     */
+    async finalFunctionCall() {
+        await this.done();
+        return __classPrivateFieldGet(this, _AbstractChatCompletionRunner_instances, "m", _AbstractChatCompletionRunner_getFinalFunctionCall).call(this);
+    }
+    async finalFunctionCallResult() {
+        await this.done();
+        return __classPrivateFieldGet(this, _AbstractChatCompletionRunner_instances, "m", _AbstractChatCompletionRunner_getFinalFunctionCallResult).call(this);
+    }
+    async totalUsage() {
+        await this.done();
+        return __classPrivateFieldGet(this, _AbstractChatCompletionRunner_instances, "m", _AbstractChatCompletionRunner_calculateTotalUsage).call(this);
+    }
+    allChatCompletions() {
+        return [...this._chatCompletions];
+    }
+    _emit(event, ...args) {
+        // make sure we don't emit any events after end
+        if (__classPrivateFieldGet(this, _AbstractChatCompletionRunner_ended, "f")) {
+            return;
+        }
+        if (event === 'end') {
+            __classPrivateFieldSet(this, _AbstractChatCompletionRunner_ended, true, "f");
+            __classPrivateFieldGet(this, _AbstractChatCompletionRunner_resolveEndPromise, "f").call(this);
+        }
+        const listeners = __classPrivateFieldGet(this, _AbstractChatCompletionRunner_listeners, "f")[event];
+        if (listeners) {
+            __classPrivateFieldGet(this, _AbstractChatCompletionRunner_listeners, "f")[event] = listeners.filter((l) => !l.once);
+            listeners.forEach(({ listener }) => listener(...args));
+        }
+        if (event === 'abort') {
+            const error = args[0];
+            if (!__classPrivateFieldGet(this, _AbstractChatCompletionRunner_catchingPromiseCreated, "f") && !listeners?.length) {
+                Promise.reject(error);
+            }
+            __classPrivateFieldGet(this, _AbstractChatCompletionRunner_rejectConnectedPromise, "f").call(this, error);
+            __classPrivateFieldGet(this, _AbstractChatCompletionRunner_rejectEndPromise, "f").call(this, error);
+            this._emit('end');
+            return;
+        }
+        if (event === 'error') {
+            // NOTE: _emit('error', error) should only be called from #handleError().
+            const error = args[0];
+            if (!__classPrivateFieldGet(this, _AbstractChatCompletionRunner_catchingPromiseCreated, "f") && !listeners?.length) {
+                // Trigger an unhandled rejection if the user hasn't registered any error handlers.
+                // If you are seeing stack traces here, make sure to handle errors via either:
+                // - runner.on('error', () => ...)
+                // - await runner.done()
+                // - await runner.finalChatCompletion()
+                // - etc.
+                Promise.reject(error);
+            }
+            __classPrivateFieldGet(this, _AbstractChatCompletionRunner_rejectConnectedPromise, "f").call(this, error);
+            __classPrivateFieldGet(this, _AbstractChatCompletionRunner_rejectEndPromise, "f").call(this, error);
+            this._emit('end');
+        }
+    }
+    _emitFinal() {
+        const completion = this._chatCompletions[this._chatCompletions.length - 1];
+        if (completion)
+            this._emit('finalChatCompletion', completion);
+        const finalMessage = __classPrivateFieldGet(this, _AbstractChatCompletionRunner_instances, "m", _AbstractChatCompletionRunner_getFinalMessage).call(this);
+        if (finalMessage)
+            this._emit('finalMessage', finalMessage);
+        const finalContent = __classPrivateFieldGet(this, _AbstractChatCompletionRunner_instances, "m", _AbstractChatCompletionRunner_getFinalContent).call(this);
+        if (finalContent)
+            this._emit('finalContent', finalContent);
+        const finalFunctionCall = __classPrivateFieldGet(this, _AbstractChatCompletionRunner_instances, "m", _AbstractChatCompletionRunner_getFinalFunctionCall).call(this);
+        if (finalFunctionCall)
+            this._emit('finalFunctionCall', finalFunctionCall);
+        const finalFunctionCallResult = __classPrivateFieldGet(this, _AbstractChatCompletionRunner_instances, "m", _AbstractChatCompletionRunner_getFinalFunctionCallResult).call(this);
+        if (finalFunctionCallResult != null)
+            this._emit('finalFunctionCallResult', finalFunctionCallResult);
+        if (this._chatCompletions.some((c) => c.usage)) {
+            this._emit('totalUsage', __classPrivateFieldGet(this, _AbstractChatCompletionRunner_instances, "m", _AbstractChatCompletionRunner_calculateTotalUsage).call(this));
+        }
+    }
+    async _createChatCompletion(completions, params, options) {
+        const signal = options?.signal;
+        if (signal) {
+            if (signal.aborted)
+                this.controller.abort();
+            signal.addEventListener('abort', () => this.controller.abort());
+        }
+        __classPrivateFieldGet(this, _AbstractChatCompletionRunner_instances, "m", _AbstractChatCompletionRunner_validateParams).call(this, params);
+        const chatCompletion = await completions.create({ ...params, stream: false }, { ...options, signal: this.controller.signal });
+        this._connected();
+        return this._addChatCompletion(chatCompletion);
+    }
+    async _runChatCompletion(completions, params, options) {
+        for (const message of params.messages) {
+            this._addMessage(message, false);
+        }
+        return await this._createChatCompletion(completions, params, options);
+    }
+    async _runFunctions(completions, params, options) {
+        const role = 'function';
+        const { function_call = 'auto', stream, ...restParams } = params;
+        const singleFunctionToCall = typeof function_call !== 'string' && function_call?.name;
+        const { maxChatCompletions = DEFAULT_MAX_CHAT_COMPLETIONS } = options || {};
+        const functionsByName = {};
+        for (const f of params.functions) {
+            functionsByName[f.name || f.function.name] = f;
+        }
+        const functions = params.functions.map((f) => ({
+            name: f.name || f.function.name,
+            parameters: f.parameters,
+            description: f.description,
+        }));
+        for (const message of params.messages) {
+            this._addMessage(message, false);
+        }
+        for (let i = 0; i < maxChatCompletions; ++i) {
+            const chatCompletion = await this._createChatCompletion(completions, {
+                ...restParams,
+                function_call,
+                functions,
+                messages: [...this.messages],
+            }, options);
+            const message = chatCompletion.choices[0]?.message;
+            if (!message) {
+                throw new error_1.OpenAIError(`missing message in ChatCompletion response`);
+            }
+            if (!message.function_call)
+                return;
+            const { name, arguments: args } = message.function_call;
+            const fn = functionsByName[name];
+            if (!fn) {
+                const content = `Invalid function_call: ${JSON.stringify(name)}. Available options are: ${functions
+                    .map((f) => JSON.stringify(f.name))
+                    .join(', ')}. Please try again`;
+                this._addMessage({ role, name, content });
+                continue;
+            }
+            else if (singleFunctionToCall && singleFunctionToCall !== name) {
+                const content = `Invalid function_call: ${JSON.stringify(name)}. ${JSON.stringify(singleFunctionToCall)} requested. Please try again`;
+                this._addMessage({ role, name, content });
+                continue;
+            }
+            let parsed;
+            try {
+                parsed = (0, RunnableFunction_1.isRunnableFunctionWithParse)(fn) ? await fn.parse(args) : args;
+            }
+            catch (error) {
+                this._addMessage({
+                    role,
+                    name,
+                    content: error instanceof Error ? error.message : String(error),
+                });
+                continue;
+            }
+            // @ts-expect-error it can't rule out `never` type.
+            const rawContent = await fn.function(parsed, this);
+            const content = __classPrivateFieldGet(this, _AbstractChatCompletionRunner_instances, "m", _AbstractChatCompletionRunner_stringifyFunctionCallResult).call(this, rawContent);
+            this._addMessage({ role, name, content });
+            if (singleFunctionToCall)
+                return;
+        }
+    }
+    async _runTools(completions, params, options) {
+        const role = 'tool';
+        const { tool_choice = 'auto', stream, ...restParams } = params;
+        const singleFunctionToCall = typeof tool_choice !== 'string' && tool_choice?.function?.name;
+        const { maxChatCompletions = DEFAULT_MAX_CHAT_COMPLETIONS } = options || {};
+        const functionsByName = {};
+        for (const f of params.tools) {
+            if (f.type === 'function') {
+                functionsByName[f.function.name || f.function.function.name] = f.function;
+            }
+        }
+        const tools = 'tools' in params ?
+            params.tools.map((t) => t.type === 'function' ?
+                {
+                    type: 'function',
+                    function: {
+                        name: t.function.name || t.function.function.name,
+                        parameters: t.function.parameters,
+                        description: t.function.description,
+                    },
+                }
+                : t)
+            : undefined;
+        for (const message of params.messages) {
+            this._addMessage(message, false);
+        }
+        for (let i = 0; i < maxChatCompletions; ++i) {
+            const chatCompletion = await this._createChatCompletion(completions, {
+                ...restParams,
+                tool_choice,
+                tools,
+                messages: [...this.messages],
+            }, options);
+            const message = chatCompletion.choices[0]?.message;
+            if (!message) {
+                throw new error_1.OpenAIError(`missing message in ChatCompletion response`);
+            }
+            if (!message.tool_calls) {
+                return;
+            }
+            for (const tool_call of message.tool_calls) {
+                if (tool_call.type !== 'function')
+                    continue;
+                const tool_call_id = tool_call.id;
+                const { name, arguments: args } = tool_call.function;
+                const fn = functionsByName[name];
+                if (!fn) {
+                    const content = `Invalid tool_call: ${JSON.stringify(name)}. Available options are: ${tools
+                        .map((f) => JSON.stringify(f.function.name))
+                        .join(', ')}. Please try again`;
+                    this._addMessage({ role, tool_call_id, content });
+                    continue;
+                }
+                else if (singleFunctionToCall && singleFunctionToCall !== name) {
+                    const content = `Invalid tool_call: ${JSON.stringify(name)}. ${JSON.stringify(singleFunctionToCall)} requested. Please try again`;
+                    this._addMessage({ role, tool_call_id, content });
+                    continue;
+                }
+                let parsed;
+                try {
+                    parsed = (0, RunnableFunction_1.isRunnableFunctionWithParse)(fn) ? await fn.parse(args) : args;
+                }
+                catch (error) {
+                    const content = error instanceof Error ? error.message : String(error);
+                    this._addMessage({ role, tool_call_id, content });
+                    continue;
+                }
+                // @ts-expect-error it can't rule out `never` type.
+                const rawContent = await fn.function(parsed, this);
+                const content = __classPrivateFieldGet(this, _AbstractChatCompletionRunner_instances, "m", _AbstractChatCompletionRunner_stringifyFunctionCallResult).call(this, rawContent);
+                this._addMessage({ role, tool_call_id, content });
+                if (singleFunctionToCall) {
+                    return;
+                }
+            }
+        }
+        return;
+    }
+}
+exports.AbstractChatCompletionRunner = AbstractChatCompletionRunner;
+_AbstractChatCompletionRunner_connectedPromise = new WeakMap(), _AbstractChatCompletionRunner_resolveConnectedPromise = new WeakMap(), _AbstractChatCompletionRunner_rejectConnectedPromise = new WeakMap(), _AbstractChatCompletionRunner_endPromise = new WeakMap(), _AbstractChatCompletionRunner_resolveEndPromise = new WeakMap(), _AbstractChatCompletionRunner_rejectEndPromise = new WeakMap(), _AbstractChatCompletionRunner_listeners = new WeakMap(), _AbstractChatCompletionRunner_ended = new WeakMap(), _AbstractChatCompletionRunner_errored = new WeakMap(), _AbstractChatCompletionRunner_aborted = new WeakMap(), _AbstractChatCompletionRunner_catchingPromiseCreated = new WeakMap(), _AbstractChatCompletionRunner_handleError = new WeakMap(), _AbstractChatCompletionRunner_instances = new WeakSet(), _AbstractChatCompletionRunner_getFinalContent = function _AbstractChatCompletionRunner_getFinalContent() {
+    return __classPrivateFieldGet(this, _AbstractChatCompletionRunner_instances, "m", _AbstractChatCompletionRunner_getFinalMessage).call(this).content ?? null;
+}, _AbstractChatCompletionRunner_getFinalMessage = function _AbstractChatCompletionRunner_getFinalMessage() {
+    let i = this.messages.length;
+    while (i-- > 0) {
+        const message = this.messages[i];
+        if ((0, chatCompletionUtils_1.isAssistantMessage)(message)) {
+            return { ...message, content: message.content ?? null };
+        }
+    }
+    throw new error_1.OpenAIError('stream ended without producing a ChatCompletionMessage with role=assistant');
+}, _AbstractChatCompletionRunner_getFinalFunctionCall = function _AbstractChatCompletionRunner_getFinalFunctionCall() {
+    for (let i = this.messages.length - 1; i >= 0; i--) {
+        const message = this.messages[i];
+        if ((0, chatCompletionUtils_1.isAssistantMessage)(message) && message?.function_call) {
+            return message.function_call;
+        }
+        if ((0, chatCompletionUtils_1.isAssistantMessage)(message) && message?.tool_calls?.length) {
+            return message.tool_calls.at(-1)?.function;
+        }
+    }
+    return;
+}, _AbstractChatCompletionRunner_getFinalFunctionCallResult = function _AbstractChatCompletionRunner_getFinalFunctionCallResult() {
+    for (let i = this.messages.length - 1; i >= 0; i--) {
+        const message = this.messages[i];
+        if ((0, chatCompletionUtils_1.isFunctionMessage)(message) && message.content != null) {
+            return message.content;
+        }
+        if ((0, chatCompletionUtils_1.isToolMessage)(message) &&
+            message.content != null &&
+            this.messages.some((x) => x.role === 'assistant' &&
+                x.tool_calls?.some((y) => y.type === 'function' && y.id === message.tool_call_id))) {
+            return message.content;
+        }
+    }
+    return;
+}, _AbstractChatCompletionRunner_calculateTotalUsage = function _AbstractChatCompletionRunner_calculateTotalUsage() {
+    const total = {
+        completion_tokens: 0,
+        prompt_tokens: 0,
+        total_tokens: 0,
+    };
+    for (const { usage } of this._chatCompletions) {
+        if (usage) {
+            total.completion_tokens += usage.completion_tokens;
+            total.prompt_tokens += usage.prompt_tokens;
+            total.total_tokens += usage.total_tokens;
+        }
+    }
+    return total;
+}, _AbstractChatCompletionRunner_validateParams = function _AbstractChatCompletionRunner_validateParams(params) {
+    if (params.n != null && params.n > 1) {
+        throw new error_1.OpenAIError('ChatCompletion convenience helpers only support n=1 at this time. To use n>1, please use chat.completions.create() directly.');
+    }
+}, _AbstractChatCompletionRunner_stringifyFunctionCallResult = function _AbstractChatCompletionRunner_stringifyFunctionCallResult(rawContent) {
+    return (typeof rawContent === 'string' ? rawContent
+        : rawContent === undefined ? 'undefined'
+            : JSON.stringify(rawContent));
+};
+//# sourceMappingURL=AbstractChatCompletionRunner.js.map
+
+/***/ }),
+
+/***/ 7514:
+/***/ (function(__unused_webpack_module, exports, __nccwpck_require__) {
+
+"use strict";
+
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
+var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (receiver, state, kind, f) {
+    if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a getter");
+    if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
+    return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
+};
+var __classPrivateFieldSet = (this && this.__classPrivateFieldSet) || function (receiver, state, value, kind, f) {
+    if (kind === "m") throw new TypeError("Private method is not writable");
+    if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a setter");
+    if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot write private member to an object whose class did not declare it");
+    return (kind === "a" ? f.call(receiver, value) : f ? f.value = value : state.set(receiver, value)), value;
+};
+var _AssistantStream_instances, _AssistantStream_events, _AssistantStream_runStepSnapshots, _AssistantStream_messageSnapshots, _AssistantStream_messageSnapshot, _AssistantStream_finalRun, _AssistantStream_currentContentIndex, _AssistantStream_currentContent, _AssistantStream_currentToolCallIndex, _AssistantStream_currentToolCall, _AssistantStream_currentEvent, _AssistantStream_currentRunSnapshot, _AssistantStream_currentRunStepSnapshot, _AssistantStream_addEvent, _AssistantStream_endRequest, _AssistantStream_handleMessage, _AssistantStream_handleRunStep, _AssistantStream_handleEvent, _AssistantStream_accumulateRunStep, _AssistantStream_accumulateMessage, _AssistantStream_accumulateContent, _AssistantStream_handleRun;
+Object.defineProperty(exports, "__esModule", ({ value: true }));
+exports.AssistantStream = void 0;
+const Core = __importStar(__nccwpck_require__(1798));
+const AbstractAssistantStreamRunner_1 = __nccwpck_require__(9365);
+const streaming_1 = __nccwpck_require__(884);
+const error_1 = __nccwpck_require__(8905);
+class AssistantStream extends AbstractAssistantStreamRunner_1.AbstractAssistantStreamRunner {
+    constructor() {
+        super(...arguments);
+        _AssistantStream_instances.add(this);
+        //Track all events in a single list for reference
+        _AssistantStream_events.set(this, []);
+        //Used to accumulate deltas
+        //We are accumulating many types so the value here is not strict
+        _AssistantStream_runStepSnapshots.set(this, {});
+        _AssistantStream_messageSnapshots.set(this, {});
+        _AssistantStream_messageSnapshot.set(this, void 0);
+        _AssistantStream_finalRun.set(this, void 0);
+        _AssistantStream_currentContentIndex.set(this, void 0);
+        _AssistantStream_currentContent.set(this, void 0);
+        _AssistantStream_currentToolCallIndex.set(this, void 0);
+        _AssistantStream_currentToolCall.set(this, void 0);
+        //For current snapshot methods
+        _AssistantStream_currentEvent.set(this, void 0);
+        _AssistantStream_currentRunSnapshot.set(this, void 0);
+        _AssistantStream_currentRunStepSnapshot.set(this, void 0);
+    }
+    [(_AssistantStream_events = new WeakMap(), _AssistantStream_runStepSnapshots = new WeakMap(), _AssistantStream_messageSnapshots = new WeakMap(), _AssistantStream_messageSnapshot = new WeakMap(), _AssistantStream_finalRun = new WeakMap(), _AssistantStream_currentContentIndex = new WeakMap(), _AssistantStream_currentContent = new WeakMap(), _AssistantStream_currentToolCallIndex = new WeakMap(), _AssistantStream_currentToolCall = new WeakMap(), _AssistantStream_currentEvent = new WeakMap(), _AssistantStream_currentRunSnapshot = new WeakMap(), _AssistantStream_currentRunStepSnapshot = new WeakMap(), _AssistantStream_instances = new WeakSet(), Symbol.asyncIterator)]() {
+        const pushQueue = [];
+        const readQueue = [];
+        let done = false;
+        //Catch all for passing along all events
+        this.on('event', (event) => {
+            const reader = readQueue.shift();
+            if (reader) {
+                reader.resolve(event);
+            }
+            else {
+                pushQueue.push(event);
+            }
+        });
+        this.on('end', () => {
+            done = true;
+            for (const reader of readQueue) {
+                reader.resolve(undefined);
+            }
+            readQueue.length = 0;
+        });
+        this.on('abort', (err) => {
+            done = true;
+            for (const reader of readQueue) {
+                reader.reject(err);
+            }
+            readQueue.length = 0;
+        });
+        this.on('error', (err) => {
+            done = true;
+            for (const reader of readQueue) {
+                reader.reject(err);
+            }
+            readQueue.length = 0;
+        });
+        return {
+            next: async () => {
+                if (!pushQueue.length) {
+                    if (done) {
+                        return { value: undefined, done: true };
+                    }
+                    return new Promise((resolve, reject) => readQueue.push({ resolve, reject })).then((chunk) => (chunk ? { value: chunk, done: false } : { value: undefined, done: true }));
+                }
+                const chunk = pushQueue.shift();
+                return { value: chunk, done: false };
+            },
+            return: async () => {
+                this.abort();
+                return { value: undefined, done: true };
+            },
+        };
+    }
+    static fromReadableStream(stream) {
+        const runner = new AssistantStream();
+        runner._run(() => runner._fromReadableStream(stream));
+        return runner;
+    }
+    async _fromReadableStream(readableStream, options) {
+        const signal = options?.signal;
+        if (signal) {
+            if (signal.aborted)
+                this.controller.abort();
+            signal.addEventListener('abort', () => this.controller.abort());
+        }
+        this._connected();
+        const stream = streaming_1.Stream.fromReadableStream(readableStream, this.controller);
+        for await (const event of stream) {
+            __classPrivateFieldGet(this, _AssistantStream_instances, "m", _AssistantStream_addEvent).call(this, event);
+        }
+        if (stream.controller.signal?.aborted) {
+            throw new error_1.APIUserAbortError();
+        }
+        return this._addRun(__classPrivateFieldGet(this, _AssistantStream_instances, "m", _AssistantStream_endRequest).call(this));
+    }
+    toReadableStream() {
+        const stream = new streaming_1.Stream(this[Symbol.asyncIterator].bind(this), this.controller);
+        return stream.toReadableStream();
+    }
+    static createToolAssistantStream(threadId, runId, runs, body, options) {
+        const runner = new AssistantStream();
+        runner._run(() => runner._runToolAssistantStream(threadId, runId, runs, body, {
+            ...options,
+            headers: { ...options?.headers, 'X-Stainless-Helper-Method': 'stream' },
+        }));
+        return runner;
+    }
+    async _createToolAssistantStream(run, threadId, runId, params, options) {
+        const signal = options?.signal;
+        if (signal) {
+            if (signal.aborted)
+                this.controller.abort();
+            signal.addEventListener('abort', () => this.controller.abort());
+        }
+        const body = { ...params, stream: true };
+        const stream = await run.submitToolOutputs(threadId, runId, body, {
+            ...options,
+            signal: this.controller.signal,
+        });
+        this._connected();
+        for await (const event of stream) {
+            __classPrivateFieldGet(this, _AssistantStream_instances, "m", _AssistantStream_addEvent).call(this, event);
+        }
+        if (stream.controller.signal?.aborted) {
+            throw new error_1.APIUserAbortError();
+        }
+        return this._addRun(__classPrivateFieldGet(this, _AssistantStream_instances, "m", _AssistantStream_endRequest).call(this));
+    }
+    static createThreadAssistantStream(body, thread, options) {
+        const runner = new AssistantStream();
+        runner._run(() => runner._threadAssistantStream(body, thread, {
+            ...options,
+            headers: { ...options?.headers, 'X-Stainless-Helper-Method': 'stream' },
+        }));
+        return runner;
+    }
+    static createAssistantStream(threadId, runs, params, options) {
+        const runner = new AssistantStream();
+        runner._run(() => runner._runAssistantStream(threadId, runs, params, {
+            ...options,
+            headers: { ...options?.headers, 'X-Stainless-Helper-Method': 'stream' },
+        }));
+        return runner;
+    }
+    currentEvent() {
+        return __classPrivateFieldGet(this, _AssistantStream_currentEvent, "f");
+    }
+    currentRun() {
+        return __classPrivateFieldGet(this, _AssistantStream_currentRunSnapshot, "f");
+    }
+    currentMessageSnapshot() {
+        return __classPrivateFieldGet(this, _AssistantStream_messageSnapshot, "f");
+    }
+    currentRunStepSnapshot() {
+        return __classPrivateFieldGet(this, _AssistantStream_currentRunStepSnapshot, "f");
+    }
+    async finalRunSteps() {
+        await this.done();
+        return Object.values(__classPrivateFieldGet(this, _AssistantStream_runStepSnapshots, "f"));
+    }
+    async finalMessages() {
+        await this.done();
+        return Object.values(__classPrivateFieldGet(this, _AssistantStream_messageSnapshots, "f"));
+    }
+    async finalRun() {
+        await this.done();
+        if (!__classPrivateFieldGet(this, _AssistantStream_finalRun, "f"))
+            throw Error('Final run was not received.');
+        return __classPrivateFieldGet(this, _AssistantStream_finalRun, "f");
+    }
+    async _createThreadAssistantStream(thread, params, options) {
+        const signal = options?.signal;
+        if (signal) {
+            if (signal.aborted)
+                this.controller.abort();
+            signal.addEventListener('abort', () => this.controller.abort());
+        }
+        const body = { ...params, stream: true };
+        const stream = await thread.createAndRun(body, { ...options, signal: this.controller.signal });
+        this._connected();
+        for await (const event of stream) {
+            __classPrivateFieldGet(this, _AssistantStream_instances, "m", _AssistantStream_addEvent).call(this, event);
+        }
+        if (stream.controller.signal?.aborted) {
+            throw new error_1.APIUserAbortError();
+        }
+        return this._addRun(__classPrivateFieldGet(this, _AssistantStream_instances, "m", _AssistantStream_endRequest).call(this));
+    }
+    async _createAssistantStream(run, threadId, params, options) {
+        const signal = options?.signal;
+        if (signal) {
+            if (signal.aborted)
+                this.controller.abort();
+            signal.addEventListener('abort', () => this.controller.abort());
+        }
+        const body = { ...params, stream: true };
+        const stream = await run.create(threadId, body, { ...options, signal: this.controller.signal });
+        this._connected();
+        for await (const event of stream) {
+            __classPrivateFieldGet(this, _AssistantStream_instances, "m", _AssistantStream_addEvent).call(this, event);
+        }
+        if (stream.controller.signal?.aborted) {
+            throw new error_1.APIUserAbortError();
+        }
+        return this._addRun(__classPrivateFieldGet(this, _AssistantStream_instances, "m", _AssistantStream_endRequest).call(this));
+    }
+    static accumulateDelta(acc, delta) {
+        for (const [key, deltaValue] of Object.entries(delta)) {
+            if (!acc.hasOwnProperty(key)) {
+                acc[key] = deltaValue;
+                continue;
+            }
+            let accValue = acc[key];
+            if (accValue === null || accValue === undefined) {
+                acc[key] = deltaValue;
+                continue;
+            }
+            // We don't accumulate these special properties
+            if (key === 'index' || key === 'type') {
+                acc[key] = deltaValue;
+                continue;
+            }
+            // Type-specific accumulation logic
+            if (typeof accValue === 'string' && typeof deltaValue === 'string') {
+                accValue += deltaValue;
+            }
+            else if (typeof accValue === 'number' && typeof deltaValue === 'number') {
+                accValue += deltaValue;
+            }
+            else if (Core.isObj(accValue) && Core.isObj(deltaValue)) {
+                accValue = this.accumulateDelta(accValue, deltaValue);
+            }
+            else if (Array.isArray(accValue) && Array.isArray(deltaValue)) {
+                if (accValue.every((x) => typeof x === 'string' || typeof x === 'number')) {
+                    accValue.push(...deltaValue); // Use spread syntax for efficient addition
+                    continue;
+                }
+            }
+            else {
+                throw Error(`Unhandled record type: ${key}, deltaValue: ${deltaValue}, accValue: ${accValue}`);
+            }
+            acc[key] = accValue;
+        }
+        return acc;
+    }
+}
+exports.AssistantStream = AssistantStream;
+_AssistantStream_addEvent = function _AssistantStream_addEvent(event) {
+    if (this.ended)
+        return;
+    __classPrivateFieldSet(this, _AssistantStream_currentEvent, event, "f");
+    __classPrivateFieldGet(this, _AssistantStream_instances, "m", _AssistantStream_handleEvent).call(this, event);
+    switch (event.event) {
+        case 'thread.created':
+            //No action on this event.
+            break;
+        case 'thread.run.created':
+        case 'thread.run.queued':
+        case 'thread.run.in_progress':
+        case 'thread.run.requires_action':
+        case 'thread.run.completed':
+        case 'thread.run.failed':
+        case 'thread.run.cancelling':
+        case 'thread.run.cancelled':
+        case 'thread.run.expired':
+            __classPrivateFieldGet(this, _AssistantStream_instances, "m", _AssistantStream_handleRun).call(this, event);
+            break;
+        case 'thread.run.step.created':
+        case 'thread.run.step.in_progress':
+        case 'thread.run.step.delta':
+        case 'thread.run.step.completed':
+        case 'thread.run.step.failed':
+        case 'thread.run.step.cancelled':
+        case 'thread.run.step.expired':
+            __classPrivateFieldGet(this, _AssistantStream_instances, "m", _AssistantStream_handleRunStep).call(this, event);
+            break;
+        case 'thread.message.created':
+        case 'thread.message.in_progress':
+        case 'thread.message.delta':
+        case 'thread.message.completed':
+        case 'thread.message.incomplete':
+            __classPrivateFieldGet(this, _AssistantStream_instances, "m", _AssistantStream_handleMessage).call(this, event);
+            break;
+        case 'error':
+            //This is included for completeness, but errors are processed in the SSE event processing so this should not occur
+            throw new Error('Encountered an error event in event processing - errors should be processed earlier');
+    }
+}, _AssistantStream_endRequest = function _AssistantStream_endRequest() {
+    if (this.ended) {
+        throw new error_1.OpenAIError(`stream has ended, this shouldn't happen`);
+    }
+    if (!__classPrivateFieldGet(this, _AssistantStream_finalRun, "f"))
+        throw Error('Final run has not been received');
+    return __classPrivateFieldGet(this, _AssistantStream_finalRun, "f");
+}, _AssistantStream_handleMessage = function _AssistantStream_handleMessage(event) {
+    const [accumulatedMessage, newContent] = __classPrivateFieldGet(this, _AssistantStream_instances, "m", _AssistantStream_accumulateMessage).call(this, event, __classPrivateFieldGet(this, _AssistantStream_messageSnapshot, "f"));
+    __classPrivateFieldSet(this, _AssistantStream_messageSnapshot, accumulatedMessage, "f");
+    __classPrivateFieldGet(this, _AssistantStream_messageSnapshots, "f")[accumulatedMessage.id] = accumulatedMessage;
+    for (const content of newContent) {
+        const snapshotContent = accumulatedMessage.content[content.index];
+        if (snapshotContent?.type == 'text') {
+            this._emit('textCreated', snapshotContent.text);
+        }
+    }
+    switch (event.event) {
+        case 'thread.message.created':
+            this._emit('messageCreated', event.data);
+            break;
+        case 'thread.message.in_progress':
+            break;
+        case 'thread.message.delta':
+            this._emit('messageDelta', event.data.delta, accumulatedMessage);
+            if (event.data.delta.content) {
+                for (const content of event.data.delta.content) {
+                    //If it is text delta, emit a text delta event
+                    if (content.type == 'text' && content.text) {
+                        let textDelta = content.text;
+                        let snapshot = accumulatedMessage.content[content.index];
+                        if (snapshot && snapshot.type == 'text') {
+                            this._emit('textDelta', textDelta, snapshot.text);
+                        }
+                        else {
+                            throw Error('The snapshot associated with this text delta is not text or missing');
+                        }
+                    }
+                    if (content.index != __classPrivateFieldGet(this, _AssistantStream_currentContentIndex, "f")) {
+                        //See if we have in progress content
+                        if (__classPrivateFieldGet(this, _AssistantStream_currentContent, "f")) {
+                            switch (__classPrivateFieldGet(this, _AssistantStream_currentContent, "f").type) {
+                                case 'text':
+                                    this._emit('textDone', __classPrivateFieldGet(this, _AssistantStream_currentContent, "f").text, __classPrivateFieldGet(this, _AssistantStream_messageSnapshot, "f"));
+                                    break;
+                                case 'image_file':
+                                    this._emit('imageFileDone', __classPrivateFieldGet(this, _AssistantStream_currentContent, "f").image_file, __classPrivateFieldGet(this, _AssistantStream_messageSnapshot, "f"));
+                                    break;
+                            }
+                        }
+                        __classPrivateFieldSet(this, _AssistantStream_currentContentIndex, content.index, "f");
+                    }
+                    __classPrivateFieldSet(this, _AssistantStream_currentContent, accumulatedMessage.content[content.index], "f");
+                }
+            }
+            break;
+        case 'thread.message.completed':
+        case 'thread.message.incomplete':
+            //We emit the latest content we were working on on completion (including incomplete)
+            if (__classPrivateFieldGet(this, _AssistantStream_currentContentIndex, "f") !== undefined) {
+                const currentContent = event.data.content[__classPrivateFieldGet(this, _AssistantStream_currentContentIndex, "f")];
+                if (currentContent) {
+                    switch (currentContent.type) {
+                        case 'image_file':
+                            this._emit('imageFileDone', currentContent.image_file, __classPrivateFieldGet(this, _AssistantStream_messageSnapshot, "f"));
+                            break;
+                        case 'text':
+                            this._emit('textDone', currentContent.text, __classPrivateFieldGet(this, _AssistantStream_messageSnapshot, "f"));
+                            break;
+                    }
+                }
+            }
+            if (__classPrivateFieldGet(this, _AssistantStream_messageSnapshot, "f")) {
+                this._emit('messageDone', event.data);
+            }
+            __classPrivateFieldSet(this, _AssistantStream_messageSnapshot, undefined, "f");
+    }
+}, _AssistantStream_handleRunStep = function _AssistantStream_handleRunStep(event) {
+    const accumulatedRunStep = __classPrivateFieldGet(this, _AssistantStream_instances, "m", _AssistantStream_accumulateRunStep).call(this, event);
+    __classPrivateFieldSet(this, _AssistantStream_currentRunStepSnapshot, accumulatedRunStep, "f");
+    switch (event.event) {
+        case 'thread.run.step.created':
+            this._emit('runStepCreated', event.data);
+            break;
+        case 'thread.run.step.delta':
+            const delta = event.data.delta;
+            if (delta.step_details &&
+                delta.step_details.type == 'tool_calls' &&
+                delta.step_details.tool_calls &&
+                accumulatedRunStep.step_details.type == 'tool_calls') {
+                for (const toolCall of delta.step_details.tool_calls) {
+                    if (toolCall.index == __classPrivateFieldGet(this, _AssistantStream_currentToolCallIndex, "f")) {
+                        this._emit('toolCallDelta', toolCall, accumulatedRunStep.step_details.tool_calls[toolCall.index]);
+                    }
+                    else {
+                        if (__classPrivateFieldGet(this, _AssistantStream_currentToolCall, "f")) {
+                            this._emit('toolCallDone', __classPrivateFieldGet(this, _AssistantStream_currentToolCall, "f"));
+                        }
+                        __classPrivateFieldSet(this, _AssistantStream_currentToolCallIndex, toolCall.index, "f");
+                        __classPrivateFieldSet(this, _AssistantStream_currentToolCall, accumulatedRunStep.step_details.tool_calls[toolCall.index], "f");
+                        if (__classPrivateFieldGet(this, _AssistantStream_currentToolCall, "f"))
+                            this._emit('toolCallCreated', __classPrivateFieldGet(this, _AssistantStream_currentToolCall, "f"));
+                    }
+                }
+            }
+            this._emit('runStepDelta', event.data.delta, accumulatedRunStep);
+            break;
+        case 'thread.run.step.completed':
+        case 'thread.run.step.failed':
+        case 'thread.run.step.cancelled':
+        case 'thread.run.step.expired':
+            __classPrivateFieldSet(this, _AssistantStream_currentRunStepSnapshot, undefined, "f");
+            const details = event.data.step_details;
+            if (details.type == 'tool_calls') {
+                if (__classPrivateFieldGet(this, _AssistantStream_currentToolCall, "f")) {
+                    this._emit('toolCallDone', __classPrivateFieldGet(this, _AssistantStream_currentToolCall, "f"));
+                    __classPrivateFieldSet(this, _AssistantStream_currentToolCall, undefined, "f");
+                }
+            }
+            this._emit('runStepDone', event.data, accumulatedRunStep);
+            break;
+        case 'thread.run.step.in_progress':
+            break;
+    }
+}, _AssistantStream_handleEvent = function _AssistantStream_handleEvent(event) {
+    __classPrivateFieldGet(this, _AssistantStream_events, "f").push(event);
+    this._emit('event', event);
+}, _AssistantStream_accumulateRunStep = function _AssistantStream_accumulateRunStep(event) {
+    switch (event.event) {
+        case 'thread.run.step.created':
+            __classPrivateFieldGet(this, _AssistantStream_runStepSnapshots, "f")[event.data.id] = event.data;
+            return event.data;
+        case 'thread.run.step.delta':
+            let snapshot = __classPrivateFieldGet(this, _AssistantStream_runStepSnapshots, "f")[event.data.id];
+            if (!snapshot) {
+                throw Error('Received a RunStepDelta before creation of a snapshot');
+            }
+            let data = event.data;
+            if (data.delta) {
+                const accumulated = AssistantStream.accumulateDelta(snapshot, data.delta);
+                __classPrivateFieldGet(this, _AssistantStream_runStepSnapshots, "f")[event.data.id] = accumulated;
+            }
+            return __classPrivateFieldGet(this, _AssistantStream_runStepSnapshots, "f")[event.data.id];
+        case 'thread.run.step.completed':
+        case 'thread.run.step.failed':
+        case 'thread.run.step.cancelled':
+        case 'thread.run.step.expired':
+        case 'thread.run.step.in_progress':
+            __classPrivateFieldGet(this, _AssistantStream_runStepSnapshots, "f")[event.data.id] = event.data;
+            break;
+    }
+    if (__classPrivateFieldGet(this, _AssistantStream_runStepSnapshots, "f")[event.data.id])
+        return __classPrivateFieldGet(this, _AssistantStream_runStepSnapshots, "f")[event.data.id];
+    throw new Error('No snapshot available');
+}, _AssistantStream_accumulateMessage = function _AssistantStream_accumulateMessage(event, snapshot) {
+    let newContent = [];
+    switch (event.event) {
+        case 'thread.message.created':
+            //On creation the snapshot is just the initial message
+            return [event.data, newContent];
+        case 'thread.message.delta':
+            if (!snapshot) {
+                throw Error('Received a delta with no existing snapshot (there should be one from message creation)');
+            }
+            let data = event.data;
+            //If this delta does not have content, nothing to process
+            if (data.delta.content) {
+                for (const contentElement of data.delta.content) {
+                    if (contentElement.index in snapshot.content) {
+                        let currentContent = snapshot.content[contentElement.index];
+                        snapshot.content[contentElement.index] = __classPrivateFieldGet(this, _AssistantStream_instances, "m", _AssistantStream_accumulateContent).call(this, contentElement, currentContent);
+                    }
+                    else {
+                        snapshot.content[contentElement.index] = contentElement;
+                        // This is a new element
+                        newContent.push(contentElement);
+                    }
+                }
+            }
+            return [snapshot, newContent];
+        case 'thread.message.in_progress':
+        case 'thread.message.completed':
+        case 'thread.message.incomplete':
+            //No changes on other thread events
+            if (snapshot) {
+                return [snapshot, newContent];
+            }
+            else {
+                throw Error('Received thread message event with no existing snapshot');
+            }
+    }
+    throw Error('Tried to accumulate a non-message event');
+}, _AssistantStream_accumulateContent = function _AssistantStream_accumulateContent(contentElement, currentContent) {
+    return AssistantStream.accumulateDelta(currentContent, contentElement);
+}, _AssistantStream_handleRun = function _AssistantStream_handleRun(event) {
+    __classPrivateFieldSet(this, _AssistantStream_currentRunSnapshot, event.data, "f");
+    switch (event.event) {
+        case 'thread.run.created':
+            break;
+        case 'thread.run.queued':
+            break;
+        case 'thread.run.in_progress':
+            break;
+        case 'thread.run.requires_action':
+        case 'thread.run.cancelled':
+        case 'thread.run.failed':
+        case 'thread.run.completed':
+        case 'thread.run.expired':
+            __classPrivateFieldSet(this, _AssistantStream_finalRun, event.data, "f");
+            if (__classPrivateFieldGet(this, _AssistantStream_currentToolCall, "f")) {
+                this._emit('toolCallDone', __classPrivateFieldGet(this, _AssistantStream_currentToolCall, "f"));
+                __classPrivateFieldSet(this, _AssistantStream_currentToolCall, undefined, "f");
+            }
+            break;
+        case 'thread.run.cancelling':
+            break;
+    }
+};
+//# sourceMappingURL=AssistantStream.js.map
+
+/***/ }),
+
+/***/ 5575:
+/***/ ((__unused_webpack_module, exports, __nccwpck_require__) => {
+
+"use strict";
+
+Object.defineProperty(exports, "__esModule", ({ value: true }));
+exports.ChatCompletionRunner = void 0;
+const AbstractChatCompletionRunner_1 = __nccwpck_require__(8398);
+const chatCompletionUtils_1 = __nccwpck_require__(7858);
+class ChatCompletionRunner extends AbstractChatCompletionRunner_1.AbstractChatCompletionRunner {
+    /** @deprecated - please use `runTools` instead. */
+    static runFunctions(completions, params, options) {
+        const runner = new ChatCompletionRunner();
+        const opts = {
+            ...options,
+            headers: { ...options?.headers, 'X-Stainless-Helper-Method': 'runFunctions' },
+        };
+        runner._run(() => runner._runFunctions(completions, params, opts));
+        return runner;
+    }
+    static runTools(completions, params, options) {
+        const runner = new ChatCompletionRunner();
+        const opts = {
+            ...options,
+            headers: { ...options?.headers, 'X-Stainless-Helper-Method': 'runTools' },
+        };
+        runner._run(() => runner._runTools(completions, params, opts));
+        return runner;
+    }
+    _addMessage(message) {
+        super._addMessage(message);
+        if ((0, chatCompletionUtils_1.isAssistantMessage)(message) && message.content) {
+            this._emit('content', message.content);
+        }
+    }
+}
+exports.ChatCompletionRunner = ChatCompletionRunner;
+//# sourceMappingURL=ChatCompletionRunner.js.map
+
+/***/ }),
+
+/***/ 7823:
+/***/ (function(__unused_webpack_module, exports, __nccwpck_require__) {
+
+"use strict";
+
+var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (receiver, state, kind, f) {
+    if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a getter");
+    if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
+    return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
+};
+var __classPrivateFieldSet = (this && this.__classPrivateFieldSet) || function (receiver, state, value, kind, f) {
+    if (kind === "m") throw new TypeError("Private method is not writable");
+    if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a setter");
+    if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot write private member to an object whose class did not declare it");
+    return (kind === "a" ? f.call(receiver, value) : f ? f.value = value : state.set(receiver, value)), value;
+};
+var _ChatCompletionStream_instances, _ChatCompletionStream_currentChatCompletionSnapshot, _ChatCompletionStream_beginRequest, _ChatCompletionStream_addChunk, _ChatCompletionStream_endRequest, _ChatCompletionStream_accumulateChatCompletion;
+Object.defineProperty(exports, "__esModule", ({ value: true }));
+exports.ChatCompletionStream = void 0;
+const error_1 = __nccwpck_require__(8905);
+const AbstractChatCompletionRunner_1 = __nccwpck_require__(8398);
+const streaming_1 = __nccwpck_require__(884);
+class ChatCompletionStream extends AbstractChatCompletionRunner_1.AbstractChatCompletionRunner {
+    constructor() {
+        super(...arguments);
+        _ChatCompletionStream_instances.add(this);
+        _ChatCompletionStream_currentChatCompletionSnapshot.set(this, void 0);
+    }
+    get currentChatCompletionSnapshot() {
+        return __classPrivateFieldGet(this, _ChatCompletionStream_currentChatCompletionSnapshot, "f");
+    }
+    /**
+     * Intended for use on the frontend, consuming a stream produced with
+     * `.toReadableStream()` on the backend.
+     *
+     * Note that messages sent to the model do not appear in `.on('message')`
+     * in this context.
+     */
+    static fromReadableStream(stream) {
+        const runner = new ChatCompletionStream();
+        runner._run(() => runner._fromReadableStream(stream));
+        return runner;
+    }
+    static createChatCompletion(completions, params, options) {
+        const runner = new ChatCompletionStream();
+        runner._run(() => runner._runChatCompletion(completions, { ...params, stream: true }, { ...options, headers: { ...options?.headers, 'X-Stainless-Helper-Method': 'stream' } }));
+        return runner;
+    }
+    async _createChatCompletion(completions, params, options) {
+        const signal = options?.signal;
+        if (signal) {
+            if (signal.aborted)
+                this.controller.abort();
+            signal.addEventListener('abort', () => this.controller.abort());
+        }
+        __classPrivateFieldGet(this, _ChatCompletionStream_instances, "m", _ChatCompletionStream_beginRequest).call(this);
+        const stream = await completions.create({ ...params, stream: true }, { ...options, signal: this.controller.signal });
+        this._connected();
+        for await (const chunk of stream) {
+            __classPrivateFieldGet(this, _ChatCompletionStream_instances, "m", _ChatCompletionStream_addChunk).call(this, chunk);
+        }
+        if (stream.controller.signal?.aborted) {
+            throw new error_1.APIUserAbortError();
+        }
+        return this._addChatCompletion(__classPrivateFieldGet(this, _ChatCompletionStream_instances, "m", _ChatCompletionStream_endRequest).call(this));
+    }
+    async _fromReadableStream(readableStream, options) {
+        const signal = options?.signal;
+        if (signal) {
+            if (signal.aborted)
+                this.controller.abort();
+            signal.addEventListener('abort', () => this.controller.abort());
+        }
+        __classPrivateFieldGet(this, _ChatCompletionStream_instances, "m", _ChatCompletionStream_beginRequest).call(this);
+        this._connected();
+        const stream = streaming_1.Stream.fromReadableStream(readableStream, this.controller);
+        let chatId;
+        for await (const chunk of stream) {
+            if (chatId && chatId !== chunk.id) {
+                // A new request has been made.
+                this._addChatCompletion(__classPrivateFieldGet(this, _ChatCompletionStream_instances, "m", _ChatCompletionStream_endRequest).call(this));
+            }
+            __classPrivateFieldGet(this, _ChatCompletionStream_instances, "m", _ChatCompletionStream_addChunk).call(this, chunk);
+            chatId = chunk.id;
+        }
+        if (stream.controller.signal?.aborted) {
+            throw new error_1.APIUserAbortError();
+        }
+        return this._addChatCompletion(__classPrivateFieldGet(this, _ChatCompletionStream_instances, "m", _ChatCompletionStream_endRequest).call(this));
+    }
+    [(_ChatCompletionStream_currentChatCompletionSnapshot = new WeakMap(), _ChatCompletionStream_instances = new WeakSet(), _ChatCompletionStream_beginRequest = function _ChatCompletionStream_beginRequest() {
+        if (this.ended)
+            return;
+        __classPrivateFieldSet(this, _ChatCompletionStream_currentChatCompletionSnapshot, undefined, "f");
+    }, _ChatCompletionStream_addChunk = function _ChatCompletionStream_addChunk(chunk) {
+        if (this.ended)
+            return;
+        const completion = __classPrivateFieldGet(this, _ChatCompletionStream_instances, "m", _ChatCompletionStream_accumulateChatCompletion).call(this, chunk);
+        this._emit('chunk', chunk, completion);
+        const delta = chunk.choices[0]?.delta?.content;
+        const snapshot = completion.choices[0]?.message;
+        if (delta != null && snapshot?.role === 'assistant' && snapshot?.content) {
+            this._emit('content', delta, snapshot.content);
+        }
+    }, _ChatCompletionStream_endRequest = function _ChatCompletionStream_endRequest() {
+        if (this.ended) {
+            throw new error_1.OpenAIError(`stream has ended, this shouldn't happen`);
+        }
+        const snapshot = __classPrivateFieldGet(this, _ChatCompletionStream_currentChatCompletionSnapshot, "f");
+        if (!snapshot) {
+            throw new error_1.OpenAIError(`request ended without sending any chunks`);
+        }
+        __classPrivateFieldSet(this, _ChatCompletionStream_currentChatCompletionSnapshot, undefined, "f");
+        return finalizeChatCompletion(snapshot);
+    }, _ChatCompletionStream_accumulateChatCompletion = function _ChatCompletionStream_accumulateChatCompletion(chunk) {
+        var _a, _b, _c;
+        let snapshot = __classPrivateFieldGet(this, _ChatCompletionStream_currentChatCompletionSnapshot, "f");
+        const { choices, ...rest } = chunk;
+        if (!snapshot) {
+            snapshot = __classPrivateFieldSet(this, _ChatCompletionStream_currentChatCompletionSnapshot, {
+                ...rest,
+                choices: [],
+            }, "f");
+        }
+        else {
+            Object.assign(snapshot, rest);
+        }
+        for (const { delta, finish_reason, index, logprobs = null, ...other } of chunk.choices) {
+            let choice = snapshot.choices[index];
+            if (!choice) {
+                choice = snapshot.choices[index] = { finish_reason, index, message: {}, logprobs, ...other };
+            }
+            if (logprobs) {
+                if (!choice.logprobs) {
+                    choice.logprobs = Object.assign({}, logprobs);
+                }
+                else {
+                    const { content, ...rest } = logprobs;
+                    Object.assign(choice.logprobs, rest);
+                    if (content) {
+                        (_a = choice.logprobs).content ?? (_a.content = []);
+                        choice.logprobs.content.push(...content);
+                    }
+                }
+            }
+            if (finish_reason)
+                choice.finish_reason = finish_reason;
+            Object.assign(choice, other);
+            if (!delta)
+                continue; // Shouldn't happen; just in case.
+            const { content, function_call, role, tool_calls, ...rest } = delta;
+            Object.assign(choice.message, rest);
+            if (content)
+                choice.message.content = (choice.message.content || '') + content;
+            if (role)
+                choice.message.role = role;
+            if (function_call) {
+                if (!choice.message.function_call) {
+                    choice.message.function_call = function_call;
+                }
+                else {
+                    if (function_call.name)
+                        choice.message.function_call.name = function_call.name;
+                    if (function_call.arguments) {
+                        (_b = choice.message.function_call).arguments ?? (_b.arguments = '');
+                        choice.message.function_call.arguments += function_call.arguments;
+                    }
+                }
+            }
+            if (tool_calls) {
+                if (!choice.message.tool_calls)
+                    choice.message.tool_calls = [];
+                for (const { index, id, type, function: fn, ...rest } of tool_calls) {
+                    const tool_call = ((_c = choice.message.tool_calls)[index] ?? (_c[index] = {}));
+                    Object.assign(tool_call, rest);
+                    if (id)
+                        tool_call.id = id;
+                    if (type)
+                        tool_call.type = type;
+                    if (fn)
+                        tool_call.function ?? (tool_call.function = { arguments: '' });
+                    if (fn?.name)
+                        tool_call.function.name = fn.name;
+                    if (fn?.arguments)
+                        tool_call.function.arguments += fn.arguments;
+                }
+            }
+        }
+        return snapshot;
+    }, Symbol.asyncIterator)]() {
+        const pushQueue = [];
+        const readQueue = [];
+        let done = false;
+        this.on('chunk', (chunk) => {
+            const reader = readQueue.shift();
+            if (reader) {
+                reader.resolve(chunk);
+            }
+            else {
+                pushQueue.push(chunk);
+            }
+        });
+        this.on('end', () => {
+            done = true;
+            for (const reader of readQueue) {
+                reader.resolve(undefined);
+            }
+            readQueue.length = 0;
+        });
+        this.on('abort', (err) => {
+            done = true;
+            for (const reader of readQueue) {
+                reader.reject(err);
+            }
+            readQueue.length = 0;
+        });
+        this.on('error', (err) => {
+            done = true;
+            for (const reader of readQueue) {
+                reader.reject(err);
+            }
+            readQueue.length = 0;
+        });
+        return {
+            next: async () => {
+                if (!pushQueue.length) {
+                    if (done) {
+                        return { value: undefined, done: true };
+                    }
+                    return new Promise((resolve, reject) => readQueue.push({ resolve, reject })).then((chunk) => (chunk ? { value: chunk, done: false } : { value: undefined, done: true }));
+                }
+                const chunk = pushQueue.shift();
+                return { value: chunk, done: false };
+            },
+            return: async () => {
+                this.abort();
+                return { value: undefined, done: true };
+            },
+        };
+    }
+    toReadableStream() {
+        const stream = new streaming_1.Stream(this[Symbol.asyncIterator].bind(this), this.controller);
+        return stream.toReadableStream();
+    }
+}
+exports.ChatCompletionStream = ChatCompletionStream;
+function finalizeChatCompletion(snapshot) {
+    const { id, choices, created, model, system_fingerprint, ...rest } = snapshot;
+    return {
+        ...rest,
+        id,
+        choices: choices.map(({ message, finish_reason, index, logprobs, ...choiceRest }) => {
+            if (!finish_reason)
+                throw new error_1.OpenAIError(`missing finish_reason for choice ${index}`);
+            const { content = null, function_call, tool_calls, ...messageRest } = message;
+            const role = message.role; // this is what we expect; in theory it could be different which would make our types a slight lie but would be fine.
+            if (!role)
+                throw new error_1.OpenAIError(`missing role for choice ${index}`);
+            if (function_call) {
+                const { arguments: args, name } = function_call;
+                if (args == null)
+                    throw new error_1.OpenAIError(`missing function_call.arguments for choice ${index}`);
+                if (!name)
+                    throw new error_1.OpenAIError(`missing function_call.name for choice ${index}`);
+                return {
+                    ...choiceRest,
+                    message: { content, function_call: { arguments: args, name }, role },
+                    finish_reason,
+                    index,
+                    logprobs,
+                };
+            }
+            if (tool_calls) {
+                return {
+                    ...choiceRest,
+                    index,
+                    finish_reason,
+                    logprobs,
+                    message: {
+                        ...messageRest,
+                        role,
+                        content,
+                        tool_calls: tool_calls.map((tool_call, i) => {
+                            const { function: fn, type, id, ...toolRest } = tool_call;
+                            const { arguments: args, name, ...fnRest } = fn || {};
+                            if (id == null)
+                                throw new error_1.OpenAIError(`missing choices[${index}].tool_calls[${i}].id\n${str(snapshot)}`);
+                            if (type == null)
+                                throw new error_1.OpenAIError(`missing choices[${index}].tool_calls[${i}].type\n${str(snapshot)}`);
+                            if (name == null)
+                                throw new error_1.OpenAIError(`missing choices[${index}].tool_calls[${i}].function.name\n${str(snapshot)}`);
+                            if (args == null)
+                                throw new error_1.OpenAIError(`missing choices[${index}].tool_calls[${i}].function.arguments\n${str(snapshot)}`);
+                            return { ...toolRest, id, type, function: { ...fnRest, name, arguments: args } };
+                        }),
+                    },
+                };
+            }
+            return {
+                ...choiceRest,
+                message: { ...messageRest, content, role },
+                finish_reason,
+                index,
+                logprobs,
+            };
+        }),
+        created,
+        model,
+        object: 'chat.completion',
+        ...(system_fingerprint ? { system_fingerprint } : {}),
+    };
+}
+function str(x) {
+    return JSON.stringify(x);
+}
+//# sourceMappingURL=ChatCompletionStream.js.map
+
+/***/ }),
+
+/***/ 794:
+/***/ ((__unused_webpack_module, exports, __nccwpck_require__) => {
+
+"use strict";
+
+Object.defineProperty(exports, "__esModule", ({ value: true }));
+exports.ChatCompletionStreamingRunner = void 0;
+const ChatCompletionStream_1 = __nccwpck_require__(7823);
+class ChatCompletionStreamingRunner extends ChatCompletionStream_1.ChatCompletionStream {
+    static fromReadableStream(stream) {
+        const runner = new ChatCompletionStreamingRunner();
+        runner._run(() => runner._fromReadableStream(stream));
+        return runner;
+    }
+    /** @deprecated - please use `runTools` instead. */
+    static runFunctions(completions, params, options) {
+        const runner = new ChatCompletionStreamingRunner();
+        const opts = {
+            ...options,
+            headers: { ...options?.headers, 'X-Stainless-Helper-Method': 'runFunctions' },
+        };
+        runner._run(() => runner._runFunctions(completions, params, opts));
+        return runner;
+    }
+    static runTools(completions, params, options) {
+        const runner = new ChatCompletionStreamingRunner();
+        const opts = {
+            ...options,
+            headers: { ...options?.headers, 'X-Stainless-Helper-Method': 'runTools' },
+        };
+        runner._run(() => runner._runTools(completions, params, opts));
+        return runner;
+    }
+}
+exports.ChatCompletionStreamingRunner = ChatCompletionStreamingRunner;
+//# sourceMappingURL=ChatCompletionStreamingRunner.js.map
+
+/***/ }),
+
+/***/ 5464:
+/***/ ((__unused_webpack_module, exports) => {
+
+"use strict";
+
+Object.defineProperty(exports, "__esModule", ({ value: true }));
+exports.ParsingToolFunction = exports.ParsingFunction = exports.isRunnableFunctionWithParse = void 0;
+function isRunnableFunctionWithParse(fn) {
+    return typeof fn.parse === 'function';
+}
+exports.isRunnableFunctionWithParse = isRunnableFunctionWithParse;
+/**
+ * This is helper class for passing a `function` and `parse` where the `function`
+ * argument type matches the `parse` return type.
+ *
+ * @deprecated - please use ParsingToolFunction instead.
+ */
+class ParsingFunction {
+    constructor(input) {
+        this.function = input.function;
+        this.parse = input.parse;
+        this.parameters = input.parameters;
+        this.description = input.description;
+        this.name = input.name;
+    }
+}
+exports.ParsingFunction = ParsingFunction;
+/**
+ * This is helper class for passing a `function` and `parse` where the `function`
+ * argument type matches the `parse` return type.
+ */
+class ParsingToolFunction {
+    constructor(input) {
+        this.type = 'function';
+        this.function = input;
+    }
+}
+exports.ParsingToolFunction = ParsingToolFunction;
+//# sourceMappingURL=RunnableFunction.js.map
+
+/***/ }),
+
+/***/ 2626:
+/***/ ((__unused_webpack_module, exports) => {
+
+"use strict";
+
+Object.defineProperty(exports, "__esModule", ({ value: true }));
+exports.allSettledWithThrow = void 0;
+/**
+ * Like `Promise.allSettled()` but throws an error if any promises are rejected.
+ */
+const allSettledWithThrow = async (promises) => {
+    const results = await Promise.allSettled(promises);
+    const rejected = results.filter((result) => result.status === 'rejected');
+    if (rejected.length) {
+        for (const result of rejected) {
+            console.error(result.reason);
+        }
+        throw new Error(`${rejected.length} promise(s) failed - see the above errors`);
+    }
+    // Note: TS was complaining about using `.filter().map()` here for some reason
+    const values = [];
+    for (const result of results) {
+        if (result.status === 'fulfilled') {
+            values.push(result.value);
+        }
+    }
+    return values;
+};
+exports.allSettledWithThrow = allSettledWithThrow;
+//# sourceMappingURL=Util.js.map
+
+/***/ }),
+
+/***/ 7858:
+/***/ ((__unused_webpack_module, exports) => {
+
+"use strict";
+
+Object.defineProperty(exports, "__esModule", ({ value: true }));
+exports.isPresent = exports.isToolMessage = exports.isFunctionMessage = exports.isAssistantMessage = void 0;
+const isAssistantMessage = (message) => {
+    return message?.role === 'assistant';
+};
+exports.isAssistantMessage = isAssistantMessage;
+const isFunctionMessage = (message) => {
+    return message?.role === 'function';
+};
+exports.isFunctionMessage = isFunctionMessage;
+const isToolMessage = (message) => {
+    return message?.role === 'tool';
+};
+exports.isToolMessage = isToolMessage;
+function isPresent(obj) {
+    return obj != null;
+}
+exports.isPresent = isPresent;
+//# sourceMappingURL=chatCompletionUtils.js.map
+
+/***/ }),
+
+/***/ 7401:
+/***/ ((__unused_webpack_module, exports, __nccwpck_require__) => {
+
+"use strict";
+
+// File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+Object.defineProperty(exports, "__esModule", ({ value: true }));
+exports.CursorPage = exports.Page = void 0;
+const core_1 = __nccwpck_require__(1798);
+/**
+ * Note: no pagination actually occurs yet, this is for forwards-compatibility.
+ */
+class Page extends core_1.AbstractPage {
+    constructor(client, response, body, options) {
+        super(client, response, body, options);
+        this.data = body.data || [];
+        this.object = body.object;
+    }
+    getPaginatedItems() {
+        return this.data ?? [];
+    }
+    // @deprecated Please use `nextPageInfo()` instead
+    /**
+     * This page represents a response that isn't actually paginated at the API level
+     * so there will never be any next page params.
+     */
+    nextPageParams() {
+        return null;
+    }
+    nextPageInfo() {
+        return null;
+    }
+}
+exports.Page = Page;
+class CursorPage extends core_1.AbstractPage {
+    constructor(client, response, body, options) {
+        super(client, response, body, options);
+        this.data = body.data || [];
+    }
+    getPaginatedItems() {
+        return this.data ?? [];
+    }
+    // @deprecated Please use `nextPageInfo()` instead
+    nextPageParams() {
+        const info = this.nextPageInfo();
+        if (!info)
+            return null;
+        if ('params' in info)
+            return info.params;
+        const params = Object.fromEntries(info.url.searchParams);
+        if (!Object.keys(params).length)
+            return null;
+        return params;
+    }
+    nextPageInfo() {
+        const data = this.getPaginatedItems();
+        if (!data.length) {
+            return null;
+        }
+        const id = data[data.length - 1]?.id;
+        if (!id) {
+            return null;
+        }
+        return { params: { after: id } };
+    }
+}
+exports.CursorPage = CursorPage;
+//# sourceMappingURL=pagination.js.map
+
+/***/ }),
+
+/***/ 9593:
+/***/ ((__unused_webpack_module, exports) => {
+
+"use strict";
+
+// File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+Object.defineProperty(exports, "__esModule", ({ value: true }));
+exports.APIResource = void 0;
+class APIResource {
+    constructor(client) {
+        this._client = client;
+    }
+}
+exports.APIResource = APIResource;
+//# sourceMappingURL=resource.js.map
+
+/***/ }),
+
+/***/ 6376:
+/***/ (function(__unused_webpack_module, exports, __nccwpck_require__) {
+
+"use strict";
+
+// File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
+Object.defineProperty(exports, "__esModule", ({ value: true }));
+exports.Audio = void 0;
+const resource_1 = __nccwpck_require__(9593);
+const SpeechAPI = __importStar(__nccwpck_require__(4117));
+const TranscriptionsAPI = __importStar(__nccwpck_require__(5622));
+const TranslationsAPI = __importStar(__nccwpck_require__(7735));
+class Audio extends resource_1.APIResource {
+    constructor() {
+        super(...arguments);
+        this.transcriptions = new TranscriptionsAPI.Transcriptions(this._client);
+        this.translations = new TranslationsAPI.Translations(this._client);
+        this.speech = new SpeechAPI.Speech(this._client);
+    }
+}
+exports.Audio = Audio;
+(function (Audio) {
+    Audio.Transcriptions = TranscriptionsAPI.Transcriptions;
+    Audio.Translations = TranslationsAPI.Translations;
+    Audio.Speech = SpeechAPI.Speech;
+})(Audio = exports.Audio || (exports.Audio = {}));
+//# sourceMappingURL=audio.js.map
+
+/***/ }),
+
+/***/ 4117:
+/***/ ((__unused_webpack_module, exports, __nccwpck_require__) => {
+
+"use strict";
+
+// File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+Object.defineProperty(exports, "__esModule", ({ value: true }));
+exports.Speech = void 0;
+const resource_1 = __nccwpck_require__(9593);
+class Speech extends resource_1.APIResource {
+    /**
+     * Generates audio from the input text.
+     */
+    create(body, options) {
+        return this._client.post('/audio/speech', { body, ...options, __binaryResponse: true });
+    }
+}
+exports.Speech = Speech;
+(function (Speech) {
+})(Speech = exports.Speech || (exports.Speech = {}));
+//# sourceMappingURL=speech.js.map
+
+/***/ }),
+
+/***/ 5622:
+/***/ ((__unused_webpack_module, exports, __nccwpck_require__) => {
+
+"use strict";
+
+// File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+Object.defineProperty(exports, "__esModule", ({ value: true }));
+exports.Transcriptions = void 0;
+const resource_1 = __nccwpck_require__(9593);
+const core_1 = __nccwpck_require__(1798);
+class Transcriptions extends resource_1.APIResource {
+    /**
+     * Transcribes audio into the input language.
+     */
+    create(body, options) {
+        return this._client.post('/audio/transcriptions', (0, core_1.multipartFormRequestOptions)({ body, ...options }));
+    }
+}
+exports.Transcriptions = Transcriptions;
+(function (Transcriptions) {
+})(Transcriptions = exports.Transcriptions || (exports.Transcriptions = {}));
+//# sourceMappingURL=transcriptions.js.map
+
+/***/ }),
+
+/***/ 7735:
+/***/ ((__unused_webpack_module, exports, __nccwpck_require__) => {
+
+"use strict";
+
+// File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+Object.defineProperty(exports, "__esModule", ({ value: true }));
+exports.Translations = void 0;
+const resource_1 = __nccwpck_require__(9593);
+const core_1 = __nccwpck_require__(1798);
+class Translations extends resource_1.APIResource {
+    /**
+     * Translates audio into English.
+     */
+    create(body, options) {
+        return this._client.post('/audio/translations', (0, core_1.multipartFormRequestOptions)({ body, ...options }));
+    }
+}
+exports.Translations = Translations;
+(function (Translations) {
+})(Translations = exports.Translations || (exports.Translations = {}));
+//# sourceMappingURL=translations.js.map
+
+/***/ }),
+
+/***/ 341:
+/***/ (function(__unused_webpack_module, exports, __nccwpck_require__) {
+
+"use strict";
+
+// File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
+Object.defineProperty(exports, "__esModule", ({ value: true }));
+exports.BatchesPage = exports.Batches = void 0;
+const resource_1 = __nccwpck_require__(9593);
+const core_1 = __nccwpck_require__(1798);
+const BatchesAPI = __importStar(__nccwpck_require__(341));
+const pagination_1 = __nccwpck_require__(7401);
+class Batches extends resource_1.APIResource {
+    /**
+     * Creates and executes a batch from an uploaded file of requests
+     */
+    create(body, options) {
+        return this._client.post('/batches', { body, ...options });
+    }
+    /**
+     * Retrieves a batch.
+     */
+    retrieve(batchId, options) {
+        return this._client.get(`/batches/${batchId}`, options);
+    }
+    list(query = {}, options) {
+        if ((0, core_1.isRequestOptions)(query)) {
+            return this.list({}, query);
+        }
+        return this._client.getAPIList('/batches', BatchesPage, { query, ...options });
+    }
+    /**
+     * Cancels an in-progress batch.
+     */
+    cancel(batchId, options) {
+        return this._client.post(`/batches/${batchId}/cancel`, options);
+    }
+}
+exports.Batches = Batches;
+class BatchesPage extends pagination_1.CursorPage {
+}
+exports.BatchesPage = BatchesPage;
+(function (Batches) {
+    Batches.BatchesPage = BatchesAPI.BatchesPage;
+})(Batches = exports.Batches || (exports.Batches = {}));
+//# sourceMappingURL=batches.js.map
+
+/***/ }),
+
+/***/ 616:
+/***/ (function(__unused_webpack_module, exports, __nccwpck_require__) {
+
+"use strict";
+
+// File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
+Object.defineProperty(exports, "__esModule", ({ value: true }));
+exports.AssistantsPage = exports.Assistants = void 0;
+const resource_1 = __nccwpck_require__(9593);
+const core_1 = __nccwpck_require__(1798);
+const AssistantsAPI = __importStar(__nccwpck_require__(616));
+const pagination_1 = __nccwpck_require__(7401);
+class Assistants extends resource_1.APIResource {
+    /**
+     * Create an assistant with a model and instructions.
+     */
+    create(body, options) {
+        return this._client.post('/assistants', {
+            body,
+            ...options,
+            headers: { 'OpenAI-Beta': 'assistants=v2', ...options?.headers },
+        });
+    }
+    /**
+     * Retrieves an assistant.
+     */
+    retrieve(assistantId, options) {
+        return this._client.get(`/assistants/${assistantId}`, {
+            ...options,
+            headers: { 'OpenAI-Beta': 'assistants=v2', ...options?.headers },
+        });
+    }
+    /**
+     * Modifies an assistant.
+     */
+    update(assistantId, body, options) {
+        return this._client.post(`/assistants/${assistantId}`, {
+            body,
+            ...options,
+            headers: { 'OpenAI-Beta': 'assistants=v2', ...options?.headers },
+        });
+    }
+    list(query = {}, options) {
+        if ((0, core_1.isRequestOptions)(query)) {
+            return this.list({}, query);
+        }
+        return this._client.getAPIList('/assistants', AssistantsPage, {
+            query,
+            ...options,
+            headers: { 'OpenAI-Beta': 'assistants=v2', ...options?.headers },
+        });
+    }
+    /**
+     * Delete an assistant.
+     */
+    del(assistantId, options) {
+        return this._client.delete(`/assistants/${assistantId}`, {
+            ...options,
+            headers: { 'OpenAI-Beta': 'assistants=v2', ...options?.headers },
+        });
+    }
+}
+exports.Assistants = Assistants;
+class AssistantsPage extends pagination_1.CursorPage {
+}
+exports.AssistantsPage = AssistantsPage;
+(function (Assistants) {
+    Assistants.AssistantsPage = AssistantsAPI.AssistantsPage;
+})(Assistants = exports.Assistants || (exports.Assistants = {}));
+//# sourceMappingURL=assistants.js.map
+
+/***/ }),
+
+/***/ 853:
+/***/ (function(__unused_webpack_module, exports, __nccwpck_require__) {
+
+"use strict";
+
+// File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
+Object.defineProperty(exports, "__esModule", ({ value: true }));
+exports.Beta = void 0;
+const resource_1 = __nccwpck_require__(9593);
+const AssistantsAPI = __importStar(__nccwpck_require__(616));
+const ChatAPI = __importStar(__nccwpck_require__(8691));
+const ThreadsAPI = __importStar(__nccwpck_require__(1931));
+const VectorStoresAPI = __importStar(__nccwpck_require__(5822));
+class Beta extends resource_1.APIResource {
+    constructor() {
+        super(...arguments);
+        this.vectorStores = new VectorStoresAPI.VectorStores(this._client);
+        this.chat = new ChatAPI.Chat(this._client);
+        this.assistants = new AssistantsAPI.Assistants(this._client);
+        this.threads = new ThreadsAPI.Threads(this._client);
+    }
+}
+exports.Beta = Beta;
+(function (Beta) {
+    Beta.VectorStores = VectorStoresAPI.VectorStores;
+    Beta.VectorStoresPage = VectorStoresAPI.VectorStoresPage;
+    Beta.Chat = ChatAPI.Chat;
+    Beta.Assistants = AssistantsAPI.Assistants;
+    Beta.AssistantsPage = AssistantsAPI.AssistantsPage;
+    Beta.Threads = ThreadsAPI.Threads;
+})(Beta = exports.Beta || (exports.Beta = {}));
+//# sourceMappingURL=beta.js.map
+
+/***/ }),
+
+/***/ 8691:
+/***/ (function(__unused_webpack_module, exports, __nccwpck_require__) {
+
+"use strict";
+
+// File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
+Object.defineProperty(exports, "__esModule", ({ value: true }));
+exports.Chat = void 0;
+const resource_1 = __nccwpck_require__(9593);
+const CompletionsAPI = __importStar(__nccwpck_require__(559));
+class Chat extends resource_1.APIResource {
+    constructor() {
+        super(...arguments);
+        this.completions = new CompletionsAPI.Completions(this._client);
+    }
+}
+exports.Chat = Chat;
+(function (Chat) {
+    Chat.Completions = CompletionsAPI.Completions;
+})(Chat = exports.Chat || (exports.Chat = {}));
+//# sourceMappingURL=chat.js.map
+
+/***/ }),
+
+/***/ 559:
+/***/ ((__unused_webpack_module, exports, __nccwpck_require__) => {
+
+"use strict";
+
+// File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+Object.defineProperty(exports, "__esModule", ({ value: true }));
+exports.Completions = exports.ChatCompletionStream = exports.ParsingToolFunction = exports.ParsingFunction = exports.ChatCompletionStreamingRunner = exports.ChatCompletionRunner = void 0;
+const resource_1 = __nccwpck_require__(9593);
+const ChatCompletionRunner_1 = __nccwpck_require__(5575);
+var ChatCompletionRunner_2 = __nccwpck_require__(5575);
+Object.defineProperty(exports, "ChatCompletionRunner", ({ enumerable: true, get: function () { return ChatCompletionRunner_2.ChatCompletionRunner; } }));
+const ChatCompletionStreamingRunner_1 = __nccwpck_require__(794);
+var ChatCompletionStreamingRunner_2 = __nccwpck_require__(794);
+Object.defineProperty(exports, "ChatCompletionStreamingRunner", ({ enumerable: true, get: function () { return ChatCompletionStreamingRunner_2.ChatCompletionStreamingRunner; } }));
+var RunnableFunction_1 = __nccwpck_require__(5464);
+Object.defineProperty(exports, "ParsingFunction", ({ enumerable: true, get: function () { return RunnableFunction_1.ParsingFunction; } }));
+Object.defineProperty(exports, "ParsingToolFunction", ({ enumerable: true, get: function () { return RunnableFunction_1.ParsingToolFunction; } }));
+const ChatCompletionStream_1 = __nccwpck_require__(7823);
+var ChatCompletionStream_2 = __nccwpck_require__(7823);
+Object.defineProperty(exports, "ChatCompletionStream", ({ enumerable: true, get: function () { return ChatCompletionStream_2.ChatCompletionStream; } }));
+class Completions extends resource_1.APIResource {
+    runFunctions(body, options) {
+        if (body.stream) {
+            return ChatCompletionStreamingRunner_1.ChatCompletionStreamingRunner.runFunctions(this._client.chat.completions, body, options);
+        }
+        return ChatCompletionRunner_1.ChatCompletionRunner.runFunctions(this._client.chat.completions, body, options);
+    }
+    runTools(body, options) {
+        if (body.stream) {
+            return ChatCompletionStreamingRunner_1.ChatCompletionStreamingRunner.runTools(this._client.chat.completions, body, options);
+        }
+        return ChatCompletionRunner_1.ChatCompletionRunner.runTools(this._client.chat.completions, body, options);
+    }
+    /**
+     * Creates a chat completion stream
+     */
+    stream(body, options) {
+        return ChatCompletionStream_1.ChatCompletionStream.createChatCompletion(this._client.chat.completions, body, options);
+    }
+}
+exports.Completions = Completions;
+//# sourceMappingURL=completions.js.map
+
+/***/ }),
+
+/***/ 1787:
+/***/ (function(__unused_webpack_module, exports, __nccwpck_require__) {
+
+"use strict";
+
+// File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
+Object.defineProperty(exports, "__esModule", ({ value: true }));
+exports.MessagesPage = exports.Messages = void 0;
+const resource_1 = __nccwpck_require__(9593);
+const core_1 = __nccwpck_require__(1798);
+const MessagesAPI = __importStar(__nccwpck_require__(1787));
+const pagination_1 = __nccwpck_require__(7401);
+class Messages extends resource_1.APIResource {
+    /**
+     * Create a message.
+     */
+    create(threadId, body, options) {
+        return this._client.post(`/threads/${threadId}/messages`, {
+            body,
+            ...options,
+            headers: { 'OpenAI-Beta': 'assistants=v2', ...options?.headers },
+        });
+    }
+    /**
+     * Retrieve a message.
+     */
+    retrieve(threadId, messageId, options) {
+        return this._client.get(`/threads/${threadId}/messages/${messageId}`, {
+            ...options,
+            headers: { 'OpenAI-Beta': 'assistants=v2', ...options?.headers },
+        });
+    }
+    /**
+     * Modifies a message.
+     */
+    update(threadId, messageId, body, options) {
+        return this._client.post(`/threads/${threadId}/messages/${messageId}`, {
+            body,
+            ...options,
+            headers: { 'OpenAI-Beta': 'assistants=v2', ...options?.headers },
+        });
+    }
+    list(threadId, query = {}, options) {
+        if ((0, core_1.isRequestOptions)(query)) {
+            return this.list(threadId, {}, query);
+        }
+        return this._client.getAPIList(`/threads/${threadId}/messages`, MessagesPage, {
+            query,
+            ...options,
+            headers: { 'OpenAI-Beta': 'assistants=v2', ...options?.headers },
+        });
+    }
+    /**
+     * Deletes a message.
+     */
+    del(threadId, messageId, options) {
+        return this._client.delete(`/threads/${threadId}/messages/${messageId}`, {
+            ...options,
+            headers: { 'OpenAI-Beta': 'assistants=v2', ...options?.headers },
+        });
+    }
+}
+exports.Messages = Messages;
+class MessagesPage extends pagination_1.CursorPage {
+}
+exports.MessagesPage = MessagesPage;
+(function (Messages) {
+    Messages.MessagesPage = MessagesAPI.MessagesPage;
+})(Messages = exports.Messages || (exports.Messages = {}));
+//# sourceMappingURL=messages.js.map
+
+/***/ }),
+
+/***/ 3187:
+/***/ (function(__unused_webpack_module, exports, __nccwpck_require__) {
+
+"use strict";
+
+// File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
+Object.defineProperty(exports, "__esModule", ({ value: true }));
+exports.RunsPage = exports.Runs = void 0;
+const resource_1 = __nccwpck_require__(9593);
+const core_1 = __nccwpck_require__(1798);
+const AssistantStream_1 = __nccwpck_require__(7514);
+const core_2 = __nccwpck_require__(1798);
+const RunsAPI = __importStar(__nccwpck_require__(3187));
+const StepsAPI = __importStar(__nccwpck_require__(2630));
+const pagination_1 = __nccwpck_require__(7401);
+class Runs extends resource_1.APIResource {
+    constructor() {
+        super(...arguments);
+        this.steps = new StepsAPI.Steps(this._client);
+    }
+    create(threadId, body, options) {
+        return this._client.post(`/threads/${threadId}/runs`, {
+            body,
+            ...options,
+            headers: { 'OpenAI-Beta': 'assistants=v2', ...options?.headers },
+            stream: body.stream ?? false,
+        });
+    }
+    /**
+     * Retrieves a run.
+     */
+    retrieve(threadId, runId, options) {
+        return this._client.get(`/threads/${threadId}/runs/${runId}`, {
+            ...options,
+            headers: { 'OpenAI-Beta': 'assistants=v2', ...options?.headers },
+        });
+    }
+    /**
+     * Modifies a run.
+     */
+    update(threadId, runId, body, options) {
+        return this._client.post(`/threads/${threadId}/runs/${runId}`, {
+            body,
+            ...options,
+            headers: { 'OpenAI-Beta': 'assistants=v2', ...options?.headers },
+        });
+    }
+    list(threadId, query = {}, options) {
+        if ((0, core_1.isRequestOptions)(query)) {
+            return this.list(threadId, {}, query);
+        }
+        return this._client.getAPIList(`/threads/${threadId}/runs`, RunsPage, {
+            query,
+            ...options,
+            headers: { 'OpenAI-Beta': 'assistants=v2', ...options?.headers },
+        });
+    }
+    /**
+     * Cancels a run that is `in_progress`.
+     */
+    cancel(threadId, runId, options) {
+        return this._client.post(`/threads/${threadId}/runs/${runId}/cancel`, {
+            ...options,
+            headers: { 'OpenAI-Beta': 'assistants=v2', ...options?.headers },
+        });
+    }
+    /**
+     * A helper to create a run an poll for a terminal state. More information on Run
+     * lifecycles can be found here:
+     * https://platform.openai.com/docs/assistants/how-it-works/runs-and-run-steps
+     */
+    async createAndPoll(threadId, body, options) {
+        const run = await this.create(threadId, body, options);
+        return await this.poll(threadId, run.id, options);
+    }
+    /**
+     * Create a Run stream
+     *
+     * @deprecated use `stream` instead
+     */
+    createAndStream(threadId, body, options) {
+        return AssistantStream_1.AssistantStream.createAssistantStream(threadId, this._client.beta.threads.runs, body, options);
+    }
+    /**
+     * A helper to poll a run status until it reaches a terminal state. More
+     * information on Run lifecycles can be found here:
+     * https://platform.openai.com/docs/assistants/how-it-works/runs-and-run-steps
+     */
+    async poll(threadId, runId, options) {
+        const headers = { ...options?.headers, 'X-Stainless-Poll-Helper': 'true' };
+        if (options?.pollIntervalMs) {
+            headers['X-Stainless-Custom-Poll-Interval'] = options.pollIntervalMs.toString();
+        }
+        while (true) {
+            const { data: run, response } = await this.retrieve(threadId, runId, {
+                ...options,
+                headers: { ...options?.headers, ...headers },
+            }).withResponse();
+            switch (run.status) {
+                //If we are in any sort of intermediate state we poll
+                case 'queued':
+                case 'in_progress':
+                case 'cancelling':
+                    let sleepInterval = 5000;
+                    if (options?.pollIntervalMs) {
+                        sleepInterval = options.pollIntervalMs;
+                    }
+                    else {
+                        const headerInterval = response.headers.get('openai-poll-after-ms');
+                        if (headerInterval) {
+                            const headerIntervalMs = parseInt(headerInterval);
+                            if (!isNaN(headerIntervalMs)) {
+                                sleepInterval = headerIntervalMs;
+                            }
+                        }
+                    }
+                    await (0, core_2.sleep)(sleepInterval);
+                    break;
+                //We return the run in any terminal state.
+                case 'requires_action':
+                case 'incomplete':
+                case 'cancelled':
+                case 'completed':
+                case 'failed':
+                case 'expired':
+                    return run;
+            }
+        }
+    }
+    /**
+     * Create a Run stream
+     */
+    stream(threadId, body, options) {
+        return AssistantStream_1.AssistantStream.createAssistantStream(threadId, this._client.beta.threads.runs, body, options);
+    }
+    submitToolOutputs(threadId, runId, body, options) {
+        return this._client.post(`/threads/${threadId}/runs/${runId}/submit_tool_outputs`, {
+            body,
+            ...options,
+            headers: { 'OpenAI-Beta': 'assistants=v2', ...options?.headers },
+            stream: body.stream ?? false,
+        });
+    }
+    /**
+     * A helper to submit a tool output to a run and poll for a terminal run state.
+     * More information on Run lifecycles can be found here:
+     * https://platform.openai.com/docs/assistants/how-it-works/runs-and-run-steps
+     */
+    async submitToolOutputsAndPoll(threadId, runId, body, options) {
+        const run = await this.submitToolOutputs(threadId, runId, body, options);
+        return await this.poll(threadId, run.id, options);
+    }
+    /**
+     * Submit the tool outputs from a previous run and stream the run to a terminal
+     * state. More information on Run lifecycles can be found here:
+     * https://platform.openai.com/docs/assistants/how-it-works/runs-and-run-steps
+     */
+    submitToolOutputsStream(threadId, runId, body, options) {
+        return AssistantStream_1.AssistantStream.createToolAssistantStream(threadId, runId, this._client.beta.threads.runs, body, options);
+    }
+}
+exports.Runs = Runs;
+class RunsPage extends pagination_1.CursorPage {
+}
+exports.RunsPage = RunsPage;
+(function (Runs) {
+    Runs.RunsPage = RunsAPI.RunsPage;
+    Runs.Steps = StepsAPI.Steps;
+    Runs.RunStepsPage = StepsAPI.RunStepsPage;
+})(Runs = exports.Runs || (exports.Runs = {}));
+//# sourceMappingURL=runs.js.map
+
+/***/ }),
+
+/***/ 2630:
+/***/ (function(__unused_webpack_module, exports, __nccwpck_require__) {
+
+"use strict";
+
+// File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
+Object.defineProperty(exports, "__esModule", ({ value: true }));
+exports.RunStepsPage = exports.Steps = void 0;
+const resource_1 = __nccwpck_require__(9593);
+const core_1 = __nccwpck_require__(1798);
+const StepsAPI = __importStar(__nccwpck_require__(2630));
+const pagination_1 = __nccwpck_require__(7401);
+class Steps extends resource_1.APIResource {
+    /**
+     * Retrieves a run step.
+     */
+    retrieve(threadId, runId, stepId, options) {
+        return this._client.get(`/threads/${threadId}/runs/${runId}/steps/${stepId}`, {
+            ...options,
+            headers: { 'OpenAI-Beta': 'assistants=v2', ...options?.headers },
+        });
+    }
+    list(threadId, runId, query = {}, options) {
+        if ((0, core_1.isRequestOptions)(query)) {
+            return this.list(threadId, runId, {}, query);
+        }
+        return this._client.getAPIList(`/threads/${threadId}/runs/${runId}/steps`, RunStepsPage, {
+            query,
+            ...options,
+            headers: { 'OpenAI-Beta': 'assistants=v2', ...options?.headers },
+        });
+    }
+}
+exports.Steps = Steps;
+class RunStepsPage extends pagination_1.CursorPage {
+}
+exports.RunStepsPage = RunStepsPage;
+(function (Steps) {
+    Steps.RunStepsPage = StepsAPI.RunStepsPage;
+})(Steps = exports.Steps || (exports.Steps = {}));
+//# sourceMappingURL=steps.js.map
+
+/***/ }),
+
+/***/ 1931:
+/***/ (function(__unused_webpack_module, exports, __nccwpck_require__) {
+
+"use strict";
+
+// File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
+Object.defineProperty(exports, "__esModule", ({ value: true }));
+exports.Threads = void 0;
+const resource_1 = __nccwpck_require__(9593);
+const core_1 = __nccwpck_require__(1798);
+const AssistantStream_1 = __nccwpck_require__(7514);
+const MessagesAPI = __importStar(__nccwpck_require__(1787));
+const RunsAPI = __importStar(__nccwpck_require__(3187));
+class Threads extends resource_1.APIResource {
+    constructor() {
+        super(...arguments);
+        this.runs = new RunsAPI.Runs(this._client);
+        this.messages = new MessagesAPI.Messages(this._client);
+    }
+    create(body = {}, options) {
+        if ((0, core_1.isRequestOptions)(body)) {
+            return this.create({}, body);
+        }
+        return this._client.post('/threads', {
+            body,
+            ...options,
+            headers: { 'OpenAI-Beta': 'assistants=v2', ...options?.headers },
+        });
+    }
+    /**
+     * Retrieves a thread.
+     */
+    retrieve(threadId, options) {
+        return this._client.get(`/threads/${threadId}`, {
+            ...options,
+            headers: { 'OpenAI-Beta': 'assistants=v2', ...options?.headers },
+        });
+    }
+    /**
+     * Modifies a thread.
+     */
+    update(threadId, body, options) {
+        return this._client.post(`/threads/${threadId}`, {
+            body,
+            ...options,
+            headers: { 'OpenAI-Beta': 'assistants=v2', ...options?.headers },
+        });
+    }
+    /**
+     * Delete a thread.
+     */
+    del(threadId, options) {
+        return this._client.delete(`/threads/${threadId}`, {
+            ...options,
+            headers: { 'OpenAI-Beta': 'assistants=v2', ...options?.headers },
+        });
+    }
+    createAndRun(body, options) {
+        return this._client.post('/threads/runs', {
+            body,
+            ...options,
+            headers: { 'OpenAI-Beta': 'assistants=v2', ...options?.headers },
+            stream: body.stream ?? false,
+        });
+    }
+    /**
+     * A helper to create a thread, start a run and then poll for a terminal state.
+     * More information on Run lifecycles can be found here:
+     * https://platform.openai.com/docs/assistants/how-it-works/runs-and-run-steps
+     */
+    async createAndRunPoll(body, options) {
+        const run = await this.createAndRun(body, options);
+        return await this.runs.poll(run.thread_id, run.id, options);
+    }
+    /**
+     * Create a thread and stream the run back
+     */
+    createAndRunStream(body, options) {
+        return AssistantStream_1.AssistantStream.createThreadAssistantStream(body, this._client.beta.threads, options);
+    }
+}
+exports.Threads = Threads;
+(function (Threads) {
+    Threads.Runs = RunsAPI.Runs;
+    Threads.RunsPage = RunsAPI.RunsPage;
+    Threads.Messages = MessagesAPI.Messages;
+    Threads.MessagesPage = MessagesAPI.MessagesPage;
+})(Threads = exports.Threads || (exports.Threads = {}));
+//# sourceMappingURL=threads.js.map
+
+/***/ }),
+
+/***/ 3922:
+/***/ ((__unused_webpack_module, exports, __nccwpck_require__) => {
+
+"use strict";
+
+// File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+Object.defineProperty(exports, "__esModule", ({ value: true }));
+exports.VectorStoreFilesPage = exports.FileBatches = void 0;
+const resource_1 = __nccwpck_require__(9593);
+const core_1 = __nccwpck_require__(1798);
+const core_2 = __nccwpck_require__(1798);
+const Util_1 = __nccwpck_require__(2626);
+const files_1 = __nccwpck_require__(9180);
+Object.defineProperty(exports, "VectorStoreFilesPage", ({ enumerable: true, get: function () { return files_1.VectorStoreFilesPage; } }));
+class FileBatches extends resource_1.APIResource {
+    /**
+     * Create a vector store file batch.
+     */
+    create(vectorStoreId, body, options) {
+        return this._client.post(`/vector_stores/${vectorStoreId}/file_batches`, {
+            body,
+            ...options,
+            headers: { 'OpenAI-Beta': 'assistants=v2', ...options?.headers },
+        });
+    }
+    /**
+     * Retrieves a vector store file batch.
+     */
+    retrieve(vectorStoreId, batchId, options) {
+        return this._client.get(`/vector_stores/${vectorStoreId}/file_batches/${batchId}`, {
+            ...options,
+            headers: { 'OpenAI-Beta': 'assistants=v2', ...options?.headers },
+        });
+    }
+    /**
+     * Cancel a vector store file batch. This attempts to cancel the processing of
+     * files in this batch as soon as possible.
+     */
+    cancel(vectorStoreId, batchId, options) {
+        return this._client.post(`/vector_stores/${vectorStoreId}/file_batches/${batchId}/cancel`, {
+            ...options,
+            headers: { 'OpenAI-Beta': 'assistants=v2', ...options?.headers },
+        });
+    }
+    /**
+     * Create a vector store batch and poll until all files have been processed.
+     */
+    async createAndPoll(vectorStoreId, body, options) {
+        const batch = await this.create(vectorStoreId, body);
+        return await this.poll(vectorStoreId, batch.id, options);
+    }
+    listFiles(vectorStoreId, batchId, query = {}, options) {
+        if ((0, core_1.isRequestOptions)(query)) {
+            return this.listFiles(vectorStoreId, batchId, {}, query);
+        }
+        return this._client.getAPIList(`/vector_stores/${vectorStoreId}/file_batches/${batchId}/files`, files_1.VectorStoreFilesPage, { query, ...options, headers: { 'OpenAI-Beta': 'assistants=v2', ...options?.headers } });
+    }
+    /**
+     * Wait for the given file batch to be processed.
+     *
+     * Note: this will return even if one of the files failed to process, you need to
+     * check batch.file_counts.failed_count to handle this case.
+     */
+    async poll(vectorStoreId, batchId, options) {
+        const headers = { ...options?.headers, 'X-Stainless-Poll-Helper': 'true' };
+        if (options?.pollIntervalMs) {
+            headers['X-Stainless-Custom-Poll-Interval'] = options.pollIntervalMs.toString();
+        }
+        while (true) {
+            const { data: batch, response } = await this.retrieve(vectorStoreId, batchId, {
+                ...options,
+                headers,
+            }).withResponse();
+            switch (batch.status) {
+                case 'in_progress':
+                    let sleepInterval = 5000;
+                    if (options?.pollIntervalMs) {
+                        sleepInterval = options.pollIntervalMs;
+                    }
+                    else {
+                        const headerInterval = response.headers.get('openai-poll-after-ms');
+                        if (headerInterval) {
+                            const headerIntervalMs = parseInt(headerInterval);
+                            if (!isNaN(headerIntervalMs)) {
+                                sleepInterval = headerIntervalMs;
+                            }
+                        }
+                    }
+                    await (0, core_2.sleep)(sleepInterval);
+                    break;
+                case 'failed':
+                case 'cancelled':
+                case 'completed':
+                    return batch;
+            }
+        }
+    }
+    /**
+     * Uploads the given files concurrently and then creates a vector store file batch.
+     *
+     * The concurrency limit is configurable using the `maxConcurrency` parameter.
+     */
+    async uploadAndPoll(vectorStoreId, { files, fileIds = [] }, options) {
+        if (files === null || files.length == 0) {
+            throw new Error('No files provided to process.');
+        }
+        const configuredConcurrency = options?.maxConcurrency ?? 5;
+        //We cap the number of workers at the number of files (so we don't start any unnecessary workers)
+        const concurrencyLimit = Math.min(configuredConcurrency, files.length);
+        const client = this._client;
+        const fileIterator = files.values();
+        const allFileIds = [...fileIds];
+        //This code is based on this design. The libraries don't accommodate our environment limits.
+        // https://stackoverflow.com/questions/40639432/what-is-the-best-way-to-limit-concurrency-when-using-es6s-promise-all
+        async function processFiles(iterator) {
+            for (let item of iterator) {
+                const fileObj = await client.files.create({ file: item, purpose: 'assistants' }, options);
+                allFileIds.push(fileObj.id);
+            }
+        }
+        //Start workers to process results
+        const workers = Array(concurrencyLimit).fill(fileIterator).map(processFiles);
+        //Wait for all processing to complete.
+        await (0, Util_1.allSettledWithThrow)(workers);
+        return await this.createAndPoll(vectorStoreId, {
+            file_ids: allFileIds,
+        });
+    }
+}
+exports.FileBatches = FileBatches;
+(function (FileBatches) {
+})(FileBatches = exports.FileBatches || (exports.FileBatches = {}));
+//# sourceMappingURL=file-batches.js.map
+
+/***/ }),
+
+/***/ 9180:
+/***/ (function(__unused_webpack_module, exports, __nccwpck_require__) {
+
+"use strict";
+
+// File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
+Object.defineProperty(exports, "__esModule", ({ value: true }));
+exports.VectorStoreFilesPage = exports.Files = void 0;
+const resource_1 = __nccwpck_require__(9593);
+const core_1 = __nccwpck_require__(1798);
+const core_2 = __nccwpck_require__(1798);
+const FilesAPI = __importStar(__nccwpck_require__(9180));
+const pagination_1 = __nccwpck_require__(7401);
+class Files extends resource_1.APIResource {
+    /**
+     * Create a vector store file by attaching a
+     * [File](https://platform.openai.com/docs/api-reference/files) to a
+     * [vector store](https://platform.openai.com/docs/api-reference/vector-stores/object).
+     */
+    create(vectorStoreId, body, options) {
+        return this._client.post(`/vector_stores/${vectorStoreId}/files`, {
+            body,
+            ...options,
+            headers: { 'OpenAI-Beta': 'assistants=v2', ...options?.headers },
+        });
+    }
+    /**
+     * Retrieves a vector store file.
+     */
+    retrieve(vectorStoreId, fileId, options) {
+        return this._client.get(`/vector_stores/${vectorStoreId}/files/${fileId}`, {
+            ...options,
+            headers: { 'OpenAI-Beta': 'assistants=v2', ...options?.headers },
+        });
+    }
+    list(vectorStoreId, query = {}, options) {
+        if ((0, core_1.isRequestOptions)(query)) {
+            return this.list(vectorStoreId, {}, query);
+        }
+        return this._client.getAPIList(`/vector_stores/${vectorStoreId}/files`, VectorStoreFilesPage, {
+            query,
+            ...options,
+            headers: { 'OpenAI-Beta': 'assistants=v2', ...options?.headers },
+        });
+    }
+    /**
+     * Delete a vector store file. This will remove the file from the vector store but
+     * the file itself will not be deleted. To delete the file, use the
+     * [delete file](https://platform.openai.com/docs/api-reference/files/delete)
+     * endpoint.
+     */
+    del(vectorStoreId, fileId, options) {
+        return this._client.delete(`/vector_stores/${vectorStoreId}/files/${fileId}`, {
+            ...options,
+            headers: { 'OpenAI-Beta': 'assistants=v2', ...options?.headers },
+        });
+    }
+    /**
+     * Attach a file to the given vector store and wait for it to be processed.
+     */
+    async createAndPoll(vectorStoreId, body, options) {
+        const file = await this.create(vectorStoreId, body, options);
+        return await this.poll(vectorStoreId, file.id, options);
+    }
+    /**
+     * Wait for the vector store file to finish processing.
+     *
+     * Note: this will return even if the file failed to process, you need to check
+     * file.last_error and file.status to handle these cases
+     */
+    async poll(vectorStoreId, fileId, options) {
+        const headers = { ...options?.headers, 'X-Stainless-Poll-Helper': 'true' };
+        if (options?.pollIntervalMs) {
+            headers['X-Stainless-Custom-Poll-Interval'] = options.pollIntervalMs.toString();
+        }
+        while (true) {
+            const fileResponse = await this.retrieve(vectorStoreId, fileId, {
+                ...options,
+                headers,
+            }).withResponse();
+            const file = fileResponse.data;
+            switch (file.status) {
+                case 'in_progress':
+                    let sleepInterval = 5000;
+                    if (options?.pollIntervalMs) {
+                        sleepInterval = options.pollIntervalMs;
+                    }
+                    else {
+                        const headerInterval = fileResponse.response.headers.get('openai-poll-after-ms');
+                        if (headerInterval) {
+                            const headerIntervalMs = parseInt(headerInterval);
+                            if (!isNaN(headerIntervalMs)) {
+                                sleepInterval = headerIntervalMs;
+                            }
+                        }
+                    }
+                    await (0, core_2.sleep)(sleepInterval);
+                    break;
+                case 'failed':
+                case 'completed':
+                    return file;
+            }
+        }
+    }
+    /**
+     * Upload a file to the `files` API and then attach it to the given vector store.
+     *
+     * Note the file will be asynchronously processed (you can use the alternative
+     * polling helper method to wait for processing to complete).
+     */
+    async upload(vectorStoreId, file, options) {
+        const fileInfo = await this._client.files.create({ file: file, purpose: 'assistants' }, options);
+        return this.create(vectorStoreId, { file_id: fileInfo.id }, options);
+    }
+    /**
+     * Add a file to a vector store and poll until processing is complete.
+     */
+    async uploadAndPoll(vectorStoreId, file, options) {
+        const fileInfo = await this.upload(vectorStoreId, file, options);
+        return await this.poll(vectorStoreId, fileInfo.id, options);
+    }
+}
+exports.Files = Files;
+class VectorStoreFilesPage extends pagination_1.CursorPage {
+}
+exports.VectorStoreFilesPage = VectorStoreFilesPage;
+(function (Files) {
+    Files.VectorStoreFilesPage = FilesAPI.VectorStoreFilesPage;
+})(Files = exports.Files || (exports.Files = {}));
+//# sourceMappingURL=files.js.map
+
+/***/ }),
+
+/***/ 5822:
+/***/ (function(__unused_webpack_module, exports, __nccwpck_require__) {
+
+"use strict";
+
+// File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
+Object.defineProperty(exports, "__esModule", ({ value: true }));
+exports.VectorStoresPage = exports.VectorStores = void 0;
+const resource_1 = __nccwpck_require__(9593);
+const core_1 = __nccwpck_require__(1798);
+const VectorStoresAPI = __importStar(__nccwpck_require__(5822));
+const FileBatchesAPI = __importStar(__nccwpck_require__(3922));
+const FilesAPI = __importStar(__nccwpck_require__(9180));
+const pagination_1 = __nccwpck_require__(7401);
+class VectorStores extends resource_1.APIResource {
+    constructor() {
+        super(...arguments);
+        this.files = new FilesAPI.Files(this._client);
+        this.fileBatches = new FileBatchesAPI.FileBatches(this._client);
+    }
+    /**
+     * Create a vector store.
+     */
+    create(body, options) {
+        return this._client.post('/vector_stores', {
+            body,
+            ...options,
+            headers: { 'OpenAI-Beta': 'assistants=v2', ...options?.headers },
+        });
+    }
+    /**
+     * Retrieves a vector store.
+     */
+    retrieve(vectorStoreId, options) {
+        return this._client.get(`/vector_stores/${vectorStoreId}`, {
+            ...options,
+            headers: { 'OpenAI-Beta': 'assistants=v2', ...options?.headers },
+        });
+    }
+    /**
+     * Modifies a vector store.
+     */
+    update(vectorStoreId, body, options) {
+        return this._client.post(`/vector_stores/${vectorStoreId}`, {
+            body,
+            ...options,
+            headers: { 'OpenAI-Beta': 'assistants=v2', ...options?.headers },
+        });
+    }
+    list(query = {}, options) {
+        if ((0, core_1.isRequestOptions)(query)) {
+            return this.list({}, query);
+        }
+        return this._client.getAPIList('/vector_stores', VectorStoresPage, {
+            query,
+            ...options,
+            headers: { 'OpenAI-Beta': 'assistants=v2', ...options?.headers },
+        });
+    }
+    /**
+     * Delete a vector store.
+     */
+    del(vectorStoreId, options) {
+        return this._client.delete(`/vector_stores/${vectorStoreId}`, {
+            ...options,
+            headers: { 'OpenAI-Beta': 'assistants=v2', ...options?.headers },
+        });
+    }
+}
+exports.VectorStores = VectorStores;
+class VectorStoresPage extends pagination_1.CursorPage {
+}
+exports.VectorStoresPage = VectorStoresPage;
+(function (VectorStores) {
+    VectorStores.VectorStoresPage = VectorStoresAPI.VectorStoresPage;
+    VectorStores.Files = FilesAPI.Files;
+    VectorStores.VectorStoreFilesPage = FilesAPI.VectorStoreFilesPage;
+    VectorStores.FileBatches = FileBatchesAPI.FileBatches;
+})(VectorStores = exports.VectorStores || (exports.VectorStores = {}));
+//# sourceMappingURL=vector-stores.js.map
+
+/***/ }),
+
+/***/ 7670:
+/***/ (function(__unused_webpack_module, exports, __nccwpck_require__) {
+
+"use strict";
+
+// File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
+Object.defineProperty(exports, "__esModule", ({ value: true }));
+exports.Chat = void 0;
+const resource_1 = __nccwpck_require__(9593);
+const CompletionsAPI = __importStar(__nccwpck_require__(2875));
+class Chat extends resource_1.APIResource {
+    constructor() {
+        super(...arguments);
+        this.completions = new CompletionsAPI.Completions(this._client);
+    }
+}
+exports.Chat = Chat;
+(function (Chat) {
+    Chat.Completions = CompletionsAPI.Completions;
+})(Chat = exports.Chat || (exports.Chat = {}));
+//# sourceMappingURL=chat.js.map
+
+/***/ }),
+
+/***/ 2875:
+/***/ ((__unused_webpack_module, exports, __nccwpck_require__) => {
+
+"use strict";
+
+// File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+Object.defineProperty(exports, "__esModule", ({ value: true }));
+exports.Completions = void 0;
+const resource_1 = __nccwpck_require__(9593);
+class Completions extends resource_1.APIResource {
+    create(body, options) {
+        return this._client.post('/chat/completions', { body, ...options, stream: body.stream ?? false });
+    }
+}
+exports.Completions = Completions;
+(function (Completions) {
+})(Completions = exports.Completions || (exports.Completions = {}));
+//# sourceMappingURL=completions.js.map
+
+/***/ }),
+
+/***/ 8240:
+/***/ ((__unused_webpack_module, exports, __nccwpck_require__) => {
+
+"use strict";
+
+// File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+Object.defineProperty(exports, "__esModule", ({ value: true }));
+exports.Chat = exports.Completions = void 0;
+var completions_1 = __nccwpck_require__(2875);
+Object.defineProperty(exports, "Completions", ({ enumerable: true, get: function () { return completions_1.Completions; } }));
+var chat_1 = __nccwpck_require__(7670);
+Object.defineProperty(exports, "Chat", ({ enumerable: true, get: function () { return chat_1.Chat; } }));
+//# sourceMappingURL=index.js.map
+
+/***/ }),
+
+/***/ 9327:
+/***/ ((__unused_webpack_module, exports, __nccwpck_require__) => {
+
+"use strict";
+
+// File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+Object.defineProperty(exports, "__esModule", ({ value: true }));
+exports.Completions = void 0;
+const resource_1 = __nccwpck_require__(9593);
+class Completions extends resource_1.APIResource {
+    create(body, options) {
+        return this._client.post('/completions', { body, ...options, stream: body.stream ?? false });
+    }
+}
+exports.Completions = Completions;
+(function (Completions) {
+})(Completions = exports.Completions || (exports.Completions = {}));
+//# sourceMappingURL=completions.js.map
+
+/***/ }),
+
+/***/ 8064:
+/***/ ((__unused_webpack_module, exports, __nccwpck_require__) => {
+
+"use strict";
+
+// File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+Object.defineProperty(exports, "__esModule", ({ value: true }));
+exports.Embeddings = void 0;
+const resource_1 = __nccwpck_require__(9593);
+class Embeddings extends resource_1.APIResource {
+    /**
+     * Creates an embedding vector representing the input text.
+     */
+    create(body, options) {
+        return this._client.post('/embeddings', { body, ...options });
+    }
+}
+exports.Embeddings = Embeddings;
+(function (Embeddings) {
+})(Embeddings = exports.Embeddings || (exports.Embeddings = {}));
+//# sourceMappingURL=embeddings.js.map
+
+/***/ }),
+
+/***/ 3873:
+/***/ (function(__unused_webpack_module, exports, __nccwpck_require__) {
+
+"use strict";
+
+// File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
+Object.defineProperty(exports, "__esModule", ({ value: true }));
+exports.FileObjectsPage = exports.Files = void 0;
+const resource_1 = __nccwpck_require__(9593);
+const core_1 = __nccwpck_require__(1798);
+const core_2 = __nccwpck_require__(1798);
+const error_1 = __nccwpck_require__(8905);
+const FilesAPI = __importStar(__nccwpck_require__(3873));
+const core_3 = __nccwpck_require__(1798);
+const pagination_1 = __nccwpck_require__(7401);
+class Files extends resource_1.APIResource {
+    /**
+     * Upload a file that can be used across various endpoints. Individual files can be
+     * up to 512 MB, and the size of all files uploaded by one organization can be up
+     * to 100 GB.
+     *
+     * The Assistants API supports files up to 2 million tokens and of specific file
+     * types. See the
+     * [Assistants Tools guide](https://platform.openai.com/docs/assistants/tools) for
+     * details.
+     *
+     * The Fine-tuning API only supports `.jsonl` files.
+     *
+     * The Batch API only supports `.jsonl` files up to 100 MB in size.
+     *
+     * Please [contact us](https://help.openai.com/) if you need to increase these
+     * storage limits.
+     */
+    create(body, options) {
+        return this._client.post('/files', (0, core_3.multipartFormRequestOptions)({ body, ...options }));
+    }
+    /**
+     * Returns information about a specific file.
+     */
+    retrieve(fileId, options) {
+        return this._client.get(`/files/${fileId}`, options);
+    }
+    list(query = {}, options) {
+        if ((0, core_1.isRequestOptions)(query)) {
+            return this.list({}, query);
+        }
+        return this._client.getAPIList('/files', FileObjectsPage, { query, ...options });
+    }
+    /**
+     * Delete a file.
+     */
+    del(fileId, options) {
+        return this._client.delete(`/files/${fileId}`, options);
+    }
+    /**
+     * Returns the contents of the specified file.
+     */
+    content(fileId, options) {
+        return this._client.get(`/files/${fileId}/content`, { ...options, __binaryResponse: true });
+    }
+    /**
+     * Returns the contents of the specified file.
+     *
+     * @deprecated The `.content()` method should be used instead
+     */
+    retrieveContent(fileId, options) {
+        return this._client.get(`/files/${fileId}/content`, {
+            ...options,
+            headers: { Accept: 'application/json', ...options?.headers },
+        });
+    }
+    /**
+     * Waits for the given file to be processed, default timeout is 30 mins.
+     */
+    async waitForProcessing(id, { pollInterval = 5000, maxWait = 30 * 60 * 1000 } = {}) {
+        const TERMINAL_STATES = new Set(['processed', 'error', 'deleted']);
+        const start = Date.now();
+        let file = await this.retrieve(id);
+        while (!file.status || !TERMINAL_STATES.has(file.status)) {
+            await (0, core_2.sleep)(pollInterval);
+            file = await this.retrieve(id);
+            if (Date.now() - start > maxWait) {
+                throw new error_1.APIConnectionTimeoutError({
+                    message: `Giving up on waiting for file ${id} to finish processing after ${maxWait} milliseconds.`,
+                });
+            }
+        }
+        return file;
+    }
+}
+exports.Files = Files;
+/**
+ * Note: no pagination actually occurs yet, this is for forwards-compatibility.
+ */
+class FileObjectsPage extends pagination_1.Page {
+}
+exports.FileObjectsPage = FileObjectsPage;
+(function (Files) {
+    Files.FileObjectsPage = FilesAPI.FileObjectsPage;
+})(Files = exports.Files || (exports.Files = {}));
+//# sourceMappingURL=files.js.map
+
+/***/ }),
+
+/***/ 1364:
+/***/ (function(__unused_webpack_module, exports, __nccwpck_require__) {
+
+"use strict";
+
+// File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
+Object.defineProperty(exports, "__esModule", ({ value: true }));
+exports.FineTuning = void 0;
+const resource_1 = __nccwpck_require__(9593);
+const JobsAPI = __importStar(__nccwpck_require__(816));
+class FineTuning extends resource_1.APIResource {
+    constructor() {
+        super(...arguments);
+        this.jobs = new JobsAPI.Jobs(this._client);
+    }
+}
+exports.FineTuning = FineTuning;
+(function (FineTuning) {
+    FineTuning.Jobs = JobsAPI.Jobs;
+    FineTuning.FineTuningJobsPage = JobsAPI.FineTuningJobsPage;
+    FineTuning.FineTuningJobEventsPage = JobsAPI.FineTuningJobEventsPage;
+})(FineTuning = exports.FineTuning || (exports.FineTuning = {}));
+//# sourceMappingURL=fine-tuning.js.map
+
+/***/ }),
+
+/***/ 3104:
+/***/ (function(__unused_webpack_module, exports, __nccwpck_require__) {
+
+"use strict";
+
+// File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
+Object.defineProperty(exports, "__esModule", ({ value: true }));
+exports.FineTuningJobCheckpointsPage = exports.Checkpoints = void 0;
+const resource_1 = __nccwpck_require__(9593);
+const core_1 = __nccwpck_require__(1798);
+const CheckpointsAPI = __importStar(__nccwpck_require__(3104));
+const pagination_1 = __nccwpck_require__(7401);
+class Checkpoints extends resource_1.APIResource {
+    list(fineTuningJobId, query = {}, options) {
+        if ((0, core_1.isRequestOptions)(query)) {
+            return this.list(fineTuningJobId, {}, query);
+        }
+        return this._client.getAPIList(`/fine_tuning/jobs/${fineTuningJobId}/checkpoints`, FineTuningJobCheckpointsPage, { query, ...options });
+    }
+}
+exports.Checkpoints = Checkpoints;
+class FineTuningJobCheckpointsPage extends pagination_1.CursorPage {
+}
+exports.FineTuningJobCheckpointsPage = FineTuningJobCheckpointsPage;
+(function (Checkpoints) {
+    Checkpoints.FineTuningJobCheckpointsPage = CheckpointsAPI.FineTuningJobCheckpointsPage;
+})(Checkpoints = exports.Checkpoints || (exports.Checkpoints = {}));
+//# sourceMappingURL=checkpoints.js.map
+
+/***/ }),
+
+/***/ 816:
+/***/ (function(__unused_webpack_module, exports, __nccwpck_require__) {
+
+"use strict";
+
+// File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
+Object.defineProperty(exports, "__esModule", ({ value: true }));
+exports.FineTuningJobEventsPage = exports.FineTuningJobsPage = exports.Jobs = void 0;
+const resource_1 = __nccwpck_require__(9593);
+const core_1 = __nccwpck_require__(1798);
+const JobsAPI = __importStar(__nccwpck_require__(816));
+const CheckpointsAPI = __importStar(__nccwpck_require__(3104));
+const pagination_1 = __nccwpck_require__(7401);
+class Jobs extends resource_1.APIResource {
+    constructor() {
+        super(...arguments);
+        this.checkpoints = new CheckpointsAPI.Checkpoints(this._client);
+    }
+    /**
+     * Creates a fine-tuning job which begins the process of creating a new model from
+     * a given dataset.
+     *
+     * Response includes details of the enqueued job including job status and the name
+     * of the fine-tuned models once complete.
+     *
+     * [Learn more about fine-tuning](https://platform.openai.com/docs/guides/fine-tuning)
+     */
+    create(body, options) {
+        return this._client.post('/fine_tuning/jobs', { body, ...options });
+    }
+    /**
+     * Get info about a fine-tuning job.
+     *
+     * [Learn more about fine-tuning](https://platform.openai.com/docs/guides/fine-tuning)
+     */
+    retrieve(fineTuningJobId, options) {
+        return this._client.get(`/fine_tuning/jobs/${fineTuningJobId}`, options);
+    }
+    list(query = {}, options) {
+        if ((0, core_1.isRequestOptions)(query)) {
+            return this.list({}, query);
+        }
+        return this._client.getAPIList('/fine_tuning/jobs', FineTuningJobsPage, { query, ...options });
+    }
+    /**
+     * Immediately cancel a fine-tune job.
+     */
+    cancel(fineTuningJobId, options) {
+        return this._client.post(`/fine_tuning/jobs/${fineTuningJobId}/cancel`, options);
+    }
+    listEvents(fineTuningJobId, query = {}, options) {
+        if ((0, core_1.isRequestOptions)(query)) {
+            return this.listEvents(fineTuningJobId, {}, query);
+        }
+        return this._client.getAPIList(`/fine_tuning/jobs/${fineTuningJobId}/events`, FineTuningJobEventsPage, {
+            query,
+            ...options,
+        });
+    }
+}
+exports.Jobs = Jobs;
+class FineTuningJobsPage extends pagination_1.CursorPage {
+}
+exports.FineTuningJobsPage = FineTuningJobsPage;
+class FineTuningJobEventsPage extends pagination_1.CursorPage {
+}
+exports.FineTuningJobEventsPage = FineTuningJobEventsPage;
+(function (Jobs) {
+    Jobs.FineTuningJobsPage = JobsAPI.FineTuningJobsPage;
+    Jobs.FineTuningJobEventsPage = JobsAPI.FineTuningJobEventsPage;
+    Jobs.Checkpoints = CheckpointsAPI.Checkpoints;
+    Jobs.FineTuningJobCheckpointsPage = CheckpointsAPI.FineTuningJobCheckpointsPage;
+})(Jobs = exports.Jobs || (exports.Jobs = {}));
+//# sourceMappingURL=jobs.js.map
+
+/***/ }),
+
+/***/ 2621:
+/***/ ((__unused_webpack_module, exports, __nccwpck_require__) => {
+
+"use strict";
+
+// File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+Object.defineProperty(exports, "__esModule", ({ value: true }));
+exports.Images = void 0;
+const resource_1 = __nccwpck_require__(9593);
+const core_1 = __nccwpck_require__(1798);
+class Images extends resource_1.APIResource {
+    /**
+     * Creates a variation of a given image.
+     */
+    createVariation(body, options) {
+        return this._client.post('/images/variations', (0, core_1.multipartFormRequestOptions)({ body, ...options }));
+    }
+    /**
+     * Creates an edited or extended image given an original image and a prompt.
+     */
+    edit(body, options) {
+        return this._client.post('/images/edits', (0, core_1.multipartFormRequestOptions)({ body, ...options }));
+    }
+    /**
+     * Creates an image given a prompt.
+     */
+    generate(body, options) {
+        return this._client.post('/images/generations', { body, ...options });
+    }
+}
+exports.Images = Images;
+(function (Images) {
+})(Images = exports.Images || (exports.Images = {}));
+//# sourceMappingURL=images.js.map
+
+/***/ }),
+
+/***/ 5690:
+/***/ (function(__unused_webpack_module, exports, __nccwpck_require__) {
+
+"use strict";
+
+// File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __exportStar = (this && this.__exportStar) || function(m, exports) {
+    for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
+};
+Object.defineProperty(exports, "__esModule", ({ value: true }));
+exports.Moderations = exports.Models = exports.ModelsPage = exports.Images = exports.FineTuning = exports.Files = exports.FileObjectsPage = exports.Embeddings = exports.Completions = exports.Beta = exports.Batches = exports.BatchesPage = exports.Audio = void 0;
+__exportStar(__nccwpck_require__(8240), exports);
+__exportStar(__nccwpck_require__(4866), exports);
+var audio_1 = __nccwpck_require__(6376);
+Object.defineProperty(exports, "Audio", ({ enumerable: true, get: function () { return audio_1.Audio; } }));
+var batches_1 = __nccwpck_require__(341);
+Object.defineProperty(exports, "BatchesPage", ({ enumerable: true, get: function () { return batches_1.BatchesPage; } }));
+Object.defineProperty(exports, "Batches", ({ enumerable: true, get: function () { return batches_1.Batches; } }));
+var beta_1 = __nccwpck_require__(853);
+Object.defineProperty(exports, "Beta", ({ enumerable: true, get: function () { return beta_1.Beta; } }));
+var completions_1 = __nccwpck_require__(9327);
+Object.defineProperty(exports, "Completions", ({ enumerable: true, get: function () { return completions_1.Completions; } }));
+var embeddings_1 = __nccwpck_require__(8064);
+Object.defineProperty(exports, "Embeddings", ({ enumerable: true, get: function () { return embeddings_1.Embeddings; } }));
+var files_1 = __nccwpck_require__(3873);
+Object.defineProperty(exports, "FileObjectsPage", ({ enumerable: true, get: function () { return files_1.FileObjectsPage; } }));
+Object.defineProperty(exports, "Files", ({ enumerable: true, get: function () { return files_1.Files; } }));
+var fine_tuning_1 = __nccwpck_require__(1364);
+Object.defineProperty(exports, "FineTuning", ({ enumerable: true, get: function () { return fine_tuning_1.FineTuning; } }));
+var images_1 = __nccwpck_require__(2621);
+Object.defineProperty(exports, "Images", ({ enumerable: true, get: function () { return images_1.Images; } }));
+var models_1 = __nccwpck_require__(6467);
+Object.defineProperty(exports, "ModelsPage", ({ enumerable: true, get: function () { return models_1.ModelsPage; } }));
+Object.defineProperty(exports, "Models", ({ enumerable: true, get: function () { return models_1.Models; } }));
+var moderations_1 = __nccwpck_require__(2085);
+Object.defineProperty(exports, "Moderations", ({ enumerable: true, get: function () { return moderations_1.Moderations; } }));
+//# sourceMappingURL=index.js.map
+
+/***/ }),
+
+/***/ 6467:
+/***/ (function(__unused_webpack_module, exports, __nccwpck_require__) {
+
+"use strict";
+
+// File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
+Object.defineProperty(exports, "__esModule", ({ value: true }));
+exports.ModelsPage = exports.Models = void 0;
+const resource_1 = __nccwpck_require__(9593);
+const ModelsAPI = __importStar(__nccwpck_require__(6467));
+const pagination_1 = __nccwpck_require__(7401);
+class Models extends resource_1.APIResource {
+    /**
+     * Retrieves a model instance, providing basic information about the model such as
+     * the owner and permissioning.
+     */
+    retrieve(model, options) {
+        return this._client.get(`/models/${model}`, options);
+    }
+    /**
+     * Lists the currently available models, and provides basic information about each
+     * one such as the owner and availability.
+     */
+    list(options) {
+        return this._client.getAPIList('/models', ModelsPage, options);
+    }
+    /**
+     * Delete a fine-tuned model. You must have the Owner role in your organization to
+     * delete a model.
+     */
+    del(model, options) {
+        return this._client.delete(`/models/${model}`, options);
+    }
+}
+exports.Models = Models;
+/**
+ * Note: no pagination actually occurs yet, this is for forwards-compatibility.
+ */
+class ModelsPage extends pagination_1.Page {
+}
+exports.ModelsPage = ModelsPage;
+(function (Models) {
+    Models.ModelsPage = ModelsAPI.ModelsPage;
+})(Models = exports.Models || (exports.Models = {}));
+//# sourceMappingURL=models.js.map
+
+/***/ }),
+
+/***/ 2085:
+/***/ ((__unused_webpack_module, exports, __nccwpck_require__) => {
+
+"use strict";
+
+// File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+Object.defineProperty(exports, "__esModule", ({ value: true }));
+exports.Moderations = void 0;
+const resource_1 = __nccwpck_require__(9593);
+class Moderations extends resource_1.APIResource {
+    /**
+     * Classifies if text is potentially harmful.
+     */
+    create(body, options) {
+        return this._client.post('/moderations', { body, ...options });
+    }
+}
+exports.Moderations = Moderations;
+(function (Moderations) {
+})(Moderations = exports.Moderations || (exports.Moderations = {}));
+//# sourceMappingURL=moderations.js.map
+
+/***/ }),
+
+/***/ 4866:
+/***/ ((__unused_webpack_module, exports) => {
+
+"use strict";
+
+// File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+Object.defineProperty(exports, "__esModule", ({ value: true }));
+//# sourceMappingURL=shared.js.map
+
+/***/ }),
+
+/***/ 884:
+/***/ ((__unused_webpack_module, exports, __nccwpck_require__) => {
+
+"use strict";
+
+Object.defineProperty(exports, "__esModule", ({ value: true }));
+exports.readableStreamAsyncIterable = exports._decodeChunks = exports._iterSSEMessages = exports.Stream = void 0;
+const index_1 = __nccwpck_require__(6678);
+const error_1 = __nccwpck_require__(8905);
+const error_2 = __nccwpck_require__(8905);
+class Stream {
+    constructor(iterator, controller) {
+        this.iterator = iterator;
+        this.controller = controller;
+    }
+    static fromSSEResponse(response, controller) {
+        let consumed = false;
+        async function* iterator() {
+            if (consumed) {
+                throw new Error('Cannot iterate over a consumed stream, use `.tee()` to split the stream.');
+            }
+            consumed = true;
+            let done = false;
+            try {
+                for await (const sse of _iterSSEMessages(response, controller)) {
+                    if (done)
+                        continue;
+                    if (sse.data.startsWith('[DONE]')) {
+                        done = true;
+                        continue;
+                    }
+                    if (sse.event === null) {
+                        let data;
+                        try {
+                            data = JSON.parse(sse.data);
+                        }
+                        catch (e) {
+                            console.error(`Could not parse message into JSON:`, sse.data);
+                            console.error(`From chunk:`, sse.raw);
+                            throw e;
+                        }
+                        if (data && data.error) {
+                            throw new error_2.APIError(undefined, data.error, undefined, undefined);
+                        }
+                        yield data;
+                    }
+                    else {
+                        let data;
+                        try {
+                            data = JSON.parse(sse.data);
+                        }
+                        catch (e) {
+                            console.error(`Could not parse message into JSON:`, sse.data);
+                            console.error(`From chunk:`, sse.raw);
+                            throw e;
+                        }
+                        // TODO: Is this where the error should be thrown?
+                        if (sse.event == 'error') {
+                            throw new error_2.APIError(undefined, data.error, data.message, undefined);
+                        }
+                        yield { event: sse.event, data: data };
+                    }
+                }
+                done = true;
+            }
+            catch (e) {
+                // If the user calls `stream.controller.abort()`, we should exit without throwing.
+                if (e instanceof Error && e.name === 'AbortError')
+                    return;
+                throw e;
+            }
+            finally {
+                // If the user `break`s, abort the ongoing request.
+                if (!done)
+                    controller.abort();
+            }
+        }
+        return new Stream(iterator, controller);
+    }
+    /**
+     * Generates a Stream from a newline-separated ReadableStream
+     * where each item is a JSON value.
+     */
+    static fromReadableStream(readableStream, controller) {
+        let consumed = false;
+        async function* iterLines() {
+            const lineDecoder = new LineDecoder();
+            const iter = readableStreamAsyncIterable(readableStream);
+            for await (const chunk of iter) {
+                for (const line of lineDecoder.decode(chunk)) {
+                    yield line;
+                }
+            }
+            for (const line of lineDecoder.flush()) {
+                yield line;
+            }
+        }
+        async function* iterator() {
+            if (consumed) {
+                throw new Error('Cannot iterate over a consumed stream, use `.tee()` to split the stream.');
+            }
+            consumed = true;
+            let done = false;
+            try {
+                for await (const line of iterLines()) {
+                    if (done)
+                        continue;
+                    if (line)
+                        yield JSON.parse(line);
+                }
+                done = true;
+            }
+            catch (e) {
+                // If the user calls `stream.controller.abort()`, we should exit without throwing.
+                if (e instanceof Error && e.name === 'AbortError')
+                    return;
+                throw e;
+            }
+            finally {
+                // If the user `break`s, abort the ongoing request.
+                if (!done)
+                    controller.abort();
+            }
+        }
+        return new Stream(iterator, controller);
+    }
+    [Symbol.asyncIterator]() {
+        return this.iterator();
+    }
+    /**
+     * Splits the stream into two streams which can be
+     * independently read from at different speeds.
+     */
+    tee() {
+        const left = [];
+        const right = [];
+        const iterator = this.iterator();
+        const teeIterator = (queue) => {
+            return {
+                next: () => {
+                    if (queue.length === 0) {
+                        const result = iterator.next();
+                        left.push(result);
+                        right.push(result);
+                    }
+                    return queue.shift();
+                },
+            };
+        };
+        return [
+            new Stream(() => teeIterator(left), this.controller),
+            new Stream(() => teeIterator(right), this.controller),
+        ];
+    }
+    /**
+     * Converts this stream to a newline-separated ReadableStream of
+     * JSON stringified values in the stream
+     * which can be turned back into a Stream with `Stream.fromReadableStream()`.
+     */
+    toReadableStream() {
+        const self = this;
+        let iter;
+        const encoder = new TextEncoder();
+        return new index_1.ReadableStream({
+            async start() {
+                iter = self[Symbol.asyncIterator]();
+            },
+            async pull(ctrl) {
+                try {
+                    const { value, done } = await iter.next();
+                    if (done)
+                        return ctrl.close();
+                    const bytes = encoder.encode(JSON.stringify(value) + '\n');
+                    ctrl.enqueue(bytes);
+                }
+                catch (err) {
+                    ctrl.error(err);
+                }
+            },
+            async cancel() {
+                await iter.return?.();
+            },
+        });
+    }
+}
+exports.Stream = Stream;
+async function* _iterSSEMessages(response, controller) {
+    if (!response.body) {
+        controller.abort();
+        throw new error_1.OpenAIError(`Attempted to iterate over a response with no body`);
+    }
+    const sseDecoder = new SSEDecoder();
+    const lineDecoder = new LineDecoder();
+    const iter = readableStreamAsyncIterable(response.body);
+    for await (const sseChunk of iterSSEChunks(iter)) {
+        for (const line of lineDecoder.decode(sseChunk)) {
+            const sse = sseDecoder.decode(line);
+            if (sse)
+                yield sse;
+        }
+    }
+    for (const line of lineDecoder.flush()) {
+        const sse = sseDecoder.decode(line);
+        if (sse)
+            yield sse;
+    }
+}
+exports._iterSSEMessages = _iterSSEMessages;
+/**
+ * Given an async iterable iterator, iterates over it and yields full
+ * SSE chunks, i.e. yields when a double new-line is encountered.
+ */
+async function* iterSSEChunks(iterator) {
+    let data = new Uint8Array();
+    for await (const chunk of iterator) {
+        if (chunk == null) {
+            continue;
+        }
+        const binaryChunk = chunk instanceof ArrayBuffer ? new Uint8Array(chunk)
+            : typeof chunk === 'string' ? new TextEncoder().encode(chunk)
+                : chunk;
+        let newData = new Uint8Array(data.length + binaryChunk.length);
+        newData.set(data);
+        newData.set(binaryChunk, data.length);
+        data = newData;
+        let patternIndex;
+        while ((patternIndex = findDoubleNewlineIndex(data)) !== -1) {
+            yield data.slice(0, patternIndex);
+            data = data.slice(patternIndex);
+        }
+    }
+    if (data.length > 0) {
+        yield data;
+    }
+}
+function findDoubleNewlineIndex(buffer) {
+    // This function searches the buffer for the end patterns (\r\r, \n\n, \r\n\r\n)
+    // and returns the index right after the first occurrence of any pattern,
+    // or -1 if none of the patterns are found.
+    const newline = 0x0a; // \n
+    const carriage = 0x0d; // \r
+    for (let i = 0; i < buffer.length - 2; i++) {
+        if (buffer[i] === newline && buffer[i + 1] === newline) {
+            // \n\n
+            return i + 2;
+        }
+        if (buffer[i] === carriage && buffer[i + 1] === carriage) {
+            // \r\r
+            return i + 2;
+        }
+        if (buffer[i] === carriage &&
+            buffer[i + 1] === newline &&
+            i + 3 < buffer.length &&
+            buffer[i + 2] === carriage &&
+            buffer[i + 3] === newline) {
+            // \r\n\r\n
+            return i + 4;
+        }
+    }
+    return -1;
+}
+class SSEDecoder {
+    constructor() {
+        this.event = null;
+        this.data = [];
+        this.chunks = [];
+    }
+    decode(line) {
+        if (line.endsWith('\r')) {
+            line = line.substring(0, line.length - 1);
+        }
+        if (!line) {
+            // empty line and we didn't previously encounter any messages
+            if (!this.event && !this.data.length)
+                return null;
+            const sse = {
+                event: this.event,
+                data: this.data.join('\n'),
+                raw: this.chunks,
+            };
+            this.event = null;
+            this.data = [];
+            this.chunks = [];
+            return sse;
+        }
+        this.chunks.push(line);
+        if (line.startsWith(':')) {
+            return null;
+        }
+        let [fieldname, _, value] = partition(line, ':');
+        if (value.startsWith(' ')) {
+            value = value.substring(1);
+        }
+        if (fieldname === 'event') {
+            this.event = value;
+        }
+        else if (fieldname === 'data') {
+            this.data.push(value);
+        }
+        return null;
+    }
+}
+/**
+ * A re-implementation of httpx's `LineDecoder` in Python that handles incrementally
+ * reading lines from text.
+ *
+ * https://github.com/encode/httpx/blob/920333ea98118e9cf617f246905d7b202510941c/httpx/_decoders.py#L258
+ */
+class LineDecoder {
+    constructor() {
+        this.buffer = [];
+        this.trailingCR = false;
+    }
+    decode(chunk) {
+        let text = this.decodeText(chunk);
+        if (this.trailingCR) {
+            text = '\r' + text;
+            this.trailingCR = false;
+        }
+        if (text.endsWith('\r')) {
+            this.trailingCR = true;
+            text = text.slice(0, -1);
+        }
+        if (!text) {
+            return [];
+        }
+        const trailingNewline = LineDecoder.NEWLINE_CHARS.has(text[text.length - 1] || '');
+        let lines = text.split(LineDecoder.NEWLINE_REGEXP);
+        // if there is a trailing new line then the last entry will be an empty
+        // string which we don't care about
+        if (trailingNewline) {
+            lines.pop();
+        }
+        if (lines.length === 1 && !trailingNewline) {
+            this.buffer.push(lines[0]);
+            return [];
+        }
+        if (this.buffer.length > 0) {
+            lines = [this.buffer.join('') + lines[0], ...lines.slice(1)];
+            this.buffer = [];
+        }
+        if (!trailingNewline) {
+            this.buffer = [lines.pop() || ''];
+        }
+        return lines;
+    }
+    decodeText(bytes) {
+        if (bytes == null)
+            return '';
+        if (typeof bytes === 'string')
+            return bytes;
+        // Node:
+        if (typeof Buffer !== 'undefined') {
+            if (bytes instanceof Buffer) {
+                return bytes.toString();
+            }
+            if (bytes instanceof Uint8Array) {
+                return Buffer.from(bytes).toString();
+            }
+            throw new error_1.OpenAIError(`Unexpected: received non-Uint8Array (${bytes.constructor.name}) stream chunk in an environment with a global "Buffer" defined, which this library assumes to be Node. Please report this error.`);
+        }
+        // Browser
+        if (typeof TextDecoder !== 'undefined') {
+            if (bytes instanceof Uint8Array || bytes instanceof ArrayBuffer) {
+                this.textDecoder ?? (this.textDecoder = new TextDecoder('utf8'));
+                return this.textDecoder.decode(bytes);
+            }
+            throw new error_1.OpenAIError(`Unexpected: received non-Uint8Array/ArrayBuffer (${bytes.constructor.name}) in a web platform. Please report this error.`);
+        }
+        throw new error_1.OpenAIError(`Unexpected: neither Buffer nor TextDecoder are available as globals. Please report this error.`);
+    }
+    flush() {
+        if (!this.buffer.length && !this.trailingCR) {
+            return [];
+        }
+        const lines = [this.buffer.join('')];
+        this.buffer = [];
+        this.trailingCR = false;
+        return lines;
+    }
+}
+// prettier-ignore
+LineDecoder.NEWLINE_CHARS = new Set(['\n', '\r']);
+LineDecoder.NEWLINE_REGEXP = /\r\n|[\n\r]/g;
+/** This is an internal helper function that's just used for testing */
+function _decodeChunks(chunks) {
+    const decoder = new LineDecoder();
+    const lines = [];
+    for (const chunk of chunks) {
+        lines.push(...decoder.decode(chunk));
+    }
+    return lines;
+}
+exports._decodeChunks = _decodeChunks;
+function partition(str, delimiter) {
+    const index = str.indexOf(delimiter);
+    if (index !== -1) {
+        return [str.substring(0, index), delimiter, str.substring(index + delimiter.length)];
+    }
+    return [str, '', ''];
+}
+/**
+ * Most browsers don't yet have async iterable support for ReadableStream,
+ * and Node has a very different way of reading bytes from its "ReadableStream".
+ *
+ * This polyfill was pulled from https://github.com/MattiasBuelens/web-streams-polyfill/pull/122#issuecomment-1627354490
+ */
+function readableStreamAsyncIterable(stream) {
+    if (stream[Symbol.asyncIterator])
+        return stream;
+    const reader = stream.getReader();
+    return {
+        async next() {
+            try {
+                const result = await reader.read();
+                if (result?.done)
+                    reader.releaseLock(); // release lock when stream becomes closed
+                return result;
+            }
+            catch (e) {
+                reader.releaseLock(); // release lock when stream becomes errored
+                throw e;
+            }
+        },
+        async return() {
+            const cancelPromise = reader.cancel();
+            reader.releaseLock();
+            await cancelPromise;
+            return { done: true, value: undefined };
+        },
+        [Symbol.asyncIterator]() {
+            return this;
+        },
+    };
+}
+exports.readableStreamAsyncIterable = readableStreamAsyncIterable;
+//# sourceMappingURL=streaming.js.map
+
+/***/ }),
+
+/***/ 3394:
+/***/ ((__unused_webpack_module, exports, __nccwpck_require__) => {
+
+"use strict";
+
+Object.defineProperty(exports, "__esModule", ({ value: true }));
+exports.createForm = exports.multipartFormRequestOptions = exports.maybeMultipartFormRequestOptions = exports.isMultipartBody = exports.toFile = exports.isUploadable = exports.isBlobLike = exports.isFileLike = exports.isResponseLike = exports.fileFromPath = void 0;
+const index_1 = __nccwpck_require__(6678);
+var index_2 = __nccwpck_require__(6678);
+Object.defineProperty(exports, "fileFromPath", ({ enumerable: true, get: function () { return index_2.fileFromPath; } }));
+const isResponseLike = (value) => value != null &&
+    typeof value === 'object' &&
+    typeof value.url === 'string' &&
+    typeof value.blob === 'function';
+exports.isResponseLike = isResponseLike;
+const isFileLike = (value) => value != null &&
+    typeof value === 'object' &&
+    typeof value.name === 'string' &&
+    typeof value.lastModified === 'number' &&
+    (0, exports.isBlobLike)(value);
+exports.isFileLike = isFileLike;
+/**
+ * The BlobLike type omits arrayBuffer() because @types/node-fetch@^2.6.4 lacks it; but this check
+ * adds the arrayBuffer() method type because it is available and used at runtime
+ */
+const isBlobLike = (value) => value != null &&
+    typeof value === 'object' &&
+    typeof value.size === 'number' &&
+    typeof value.type === 'string' &&
+    typeof value.text === 'function' &&
+    typeof value.slice === 'function' &&
+    typeof value.arrayBuffer === 'function';
+exports.isBlobLike = isBlobLike;
+const isUploadable = (value) => {
+    return (0, exports.isFileLike)(value) || (0, exports.isResponseLike)(value) || (0, index_1.isFsReadStream)(value);
+};
+exports.isUploadable = isUploadable;
+/**
+ * Helper for creating a {@link File} to pass to an SDK upload method from a variety of different data formats
+ * @param value the raw content of the file.  Can be an {@link Uploadable}, {@link BlobLikePart}, or {@link AsyncIterable} of {@link BlobLikePart}s
+ * @param {string=} name the name of the file. If omitted, toFile will try to determine a file name from bits if possible
+ * @param {Object=} options additional properties
+ * @param {string=} options.type the MIME type of the content
+ * @param {number=} options.lastModified the last modified timestamp
+ * @returns a {@link File} with the given properties
+ */
+async function toFile(value, name, options) {
+    // If it's a promise, resolve it.
+    value = await value;
+    // Use the file's options if there isn't one provided
+    options ?? (options = (0, exports.isFileLike)(value) ? { lastModified: value.lastModified, type: value.type } : {});
+    if ((0, exports.isResponseLike)(value)) {
+        const blob = await value.blob();
+        name || (name = new URL(value.url).pathname.split(/[\\/]/).pop() ?? 'unknown_file');
+        return new index_1.File([blob], name, options);
+    }
+    const bits = await getBytes(value);
+    name || (name = getName(value) ?? 'unknown_file');
+    if (!options.type) {
+        const type = bits[0]?.type;
+        if (typeof type === 'string') {
+            options = { ...options, type };
+        }
+    }
+    return new index_1.File(bits, name, options);
+}
+exports.toFile = toFile;
+async function getBytes(value) {
+    let parts = [];
+    if (typeof value === 'string' ||
+        ArrayBuffer.isView(value) || // includes Uint8Array, Buffer, etc.
+        value instanceof ArrayBuffer) {
+        parts.push(value);
+    }
+    else if ((0, exports.isBlobLike)(value)) {
+        parts.push(await value.arrayBuffer());
+    }
+    else if (isAsyncIterableIterator(value) // includes Readable, ReadableStream, etc.
+    ) {
+        for await (const chunk of value) {
+            parts.push(chunk); // TODO, consider validating?
+        }
+    }
+    else {
+        throw new Error(`Unexpected data type: ${typeof value}; constructor: ${value?.constructor
+            ?.name}; props: ${propsForError(value)}`);
+    }
+    return parts;
+}
+function propsForError(value) {
+    const props = Object.getOwnPropertyNames(value);
+    return `[${props.map((p) => `"${p}"`).join(', ')}]`;
+}
+function getName(value) {
+    return (getStringFromMaybeBuffer(value.name) ||
+        getStringFromMaybeBuffer(value.filename) ||
+        // For fs.ReadStream
+        getStringFromMaybeBuffer(value.path)?.split(/[\\/]/).pop());
+}
+const getStringFromMaybeBuffer = (x) => {
+    if (typeof x === 'string')
+        return x;
+    if (typeof Buffer !== 'undefined' && x instanceof Buffer)
+        return String(x);
+    return undefined;
+};
+const isAsyncIterableIterator = (value) => value != null && typeof value === 'object' && typeof value[Symbol.asyncIterator] === 'function';
+const isMultipartBody = (body) => body && typeof body === 'object' && body.body && body[Symbol.toStringTag] === 'MultipartBody';
+exports.isMultipartBody = isMultipartBody;
+/**
+ * Returns a multipart/form-data request if any part of the given request body contains a File / Blob value.
+ * Otherwise returns the request as is.
+ */
+const maybeMultipartFormRequestOptions = async (opts) => {
+    if (!hasUploadableValue(opts.body))
+        return opts;
+    const form = await (0, exports.createForm)(opts.body);
+    return (0, index_1.getMultipartRequestOptions)(form, opts);
+};
+exports.maybeMultipartFormRequestOptions = maybeMultipartFormRequestOptions;
+const multipartFormRequestOptions = async (opts) => {
+    const form = await (0, exports.createForm)(opts.body);
+    return (0, index_1.getMultipartRequestOptions)(form, opts);
+};
+exports.multipartFormRequestOptions = multipartFormRequestOptions;
+const createForm = async (body) => {
+    const form = new index_1.FormData();
+    await Promise.all(Object.entries(body || {}).map(([key, value]) => addFormValue(form, key, value)));
+    return form;
+};
+exports.createForm = createForm;
+const hasUploadableValue = (value) => {
+    if ((0, exports.isUploadable)(value))
+        return true;
+    if (Array.isArray(value))
+        return value.some(hasUploadableValue);
+    if (value && typeof value === 'object') {
+        for (const k in value) {
+            if (hasUploadableValue(value[k]))
+                return true;
+        }
+    }
+    return false;
+};
+const addFormValue = async (form, key, value) => {
+    if (value === undefined)
+        return;
+    if (value == null) {
+        throw new TypeError(`Received null for "${key}"; to pass null in FormData, you must use the string 'null'`);
+    }
+    // TODO: make nested formats configurable
+    if (typeof value === 'string' || typeof value === 'number' || typeof value === 'boolean') {
+        form.append(key, String(value));
+    }
+    else if ((0, exports.isUploadable)(value)) {
+        const file = await toFile(value);
+        form.append(key, file);
+    }
+    else if (Array.isArray(value)) {
+        await Promise.all(value.map((entry) => addFormValue(form, key + '[]', entry)));
+    }
+    else if (typeof value === 'object') {
+        await Promise.all(Object.entries(value).map(([name, prop]) => addFormValue(form, `${key}[${name}]`, prop)));
+    }
+    else {
+        throw new TypeError(`Invalid value given to form, expected a string, number, boolean, object, Array, File or Blob but got ${value} instead`);
+    }
+};
+//# sourceMappingURL=uploads.js.map
+
+/***/ }),
+
+/***/ 6417:
+/***/ ((__unused_webpack_module, exports) => {
+
+"use strict";
+
+Object.defineProperty(exports, "__esModule", ({ value: true }));
+exports.VERSION = void 0;
+exports.VERSION = '4.47.2'; // x-release-please-version
+//# sourceMappingURL=version.js.map
+
+/***/ }),
+
+/***/ 1907:
+/***/ ((module) => {
+
+"use strict";
+module.exports = JSON.parse('[[[0,44],"disallowed_STD3_valid"],[[45,46],"valid"],[[47,47],"disallowed_STD3_valid"],[[48,57],"valid"],[[58,64],"disallowed_STD3_valid"],[[65,65],"mapped",[97]],[[66,66],"mapped",[98]],[[67,67],"mapped",[99]],[[68,68],"mapped",[100]],[[69,69],"mapped",[101]],[[70,70],"mapped",[102]],[[71,71],"mapped",[103]],[[72,72],"mapped",[104]],[[73,73],"mapped",[105]],[[74,74],"mapped",[106]],[[75,75],"mapped",[107]],[[76,76],"mapped",[108]],[[77,77],"mapped",[109]],[[78,78],"mapped",[110]],[[79,79],"mapped",[111]],[[80,80],"mapped",[112]],[[81,81],"mapped",[113]],[[82,82],"mapped",[114]],[[83,83],"mapped",[115]],[[84,84],"mapped",[116]],[[85,85],"mapped",[117]],[[86,86],"mapped",[118]],[[87,87],"mapped",[119]],[[88,88],"mapped",[120]],[[89,89],"mapped",[121]],[[90,90],"mapped",[122]],[[91,96],"disallowed_STD3_valid"],[[97,122],"valid"],[[123,127],"disallowed_STD3_valid"],[[128,159],"disallowed"],[[160,160],"disallowed_STD3_mapped",[32]],[[161,167],"valid",[],"NV8"],[[168,168],"disallowed_STD3_mapped",[32,776]],[[169,169],"valid",[],"NV8"],[[170,170],"mapped",[97]],[[171,172],"valid",[],"NV8"],[[173,173],"ignored"],[[174,174],"valid",[],"NV8"],[[175,175],"disallowed_STD3_mapped",[32,772]],[[176,177],"valid",[],"NV8"],[[178,178],"mapped",[50]],[[179,179],"mapped",[51]],[[180,180],"disallowed_STD3_mapped",[32,769]],[[181,181],"mapped",[956]],[[182,182],"valid",[],"NV8"],[[183,183],"valid"],[[184,184],"disallowed_STD3_mapped",[32,807]],[[185,185],"mapped",[49]],[[186,186],"mapped",[111]],[[187,187],"valid",[],"NV8"],[[188,188],"mapped",[49,8260,52]],[[189,189],"mapped",[49,8260,50]],[[190,190],"mapped",[51,8260,52]],[[191,191],"valid",[],"NV8"],[[192,192],"mapped",[224]],[[193,193],"mapped",[225]],[[194,194],"mapped",[226]],[[195,195],"mapped",[227]],[[196,196],"mapped",[228]],[[197,197],"mapped",[229]],[[198,198],"mapped",[230]],[[199,199],"mapped",[231]],[[200,200],"mapped",[232]],[[201,201],"mapped",[233]],[[202,202],"mapped",[234]],[[203,203],"mapped",[235]],[[204,204],"mapped",[236]],[[205,205],"mapped",[237]],[[206,206],"mapped",[238]],[[207,207],"mapped",[239]],[[208,208],"mapped",[240]],[[209,209],"mapped",[241]],[[210,210],"mapped",[242]],[[211,211],"mapped",[243]],[[212,212],"mapped",[244]],[[213,213],"mapped",[245]],[[214,214],"mapped",[246]],[[215,215],"valid",[],"NV8"],[[216,216],"mapped",[248]],[[217,217],"mapped",[249]],[[218,218],"mapped",[250]],[[219,219],"mapped",[251]],[[220,220],"mapped",[252]],[[221,221],"mapped",[253]],[[222,222],"mapped",[254]],[[223,223],"deviation",[115,115]],[[224,246],"valid"],[[247,247],"valid",[],"NV8"],[[248,255],"valid"],[[256,256],"mapped",[257]],[[257,257],"valid"],[[258,258],"mapped",[259]],[[259,259],"valid"],[[260,260],"mapped",[261]],[[261,261],"valid"],[[262,262],"mapped",[263]],[[263,263],"valid"],[[264,264],"mapped",[265]],[[265,265],"valid"],[[266,266],"mapped",[267]],[[267,267],"valid"],[[268,268],"mapped",[269]],[[269,269],"valid"],[[270,270],"mapped",[271]],[[271,271],"valid"],[[272,272],"mapped",[273]],[[273,273],"valid"],[[274,274],"mapped",[275]],[[275,275],"valid"],[[276,276],"mapped",[277]],[[277,277],"valid"],[[278,278],"mapped",[279]],[[279,279],"valid"],[[280,280],"mapped",[281]],[[281,281],"valid"],[[282,282],"mapped",[283]],[[283,283],"valid"],[[284,284],"mapped",[285]],[[285,285],"valid"],[[286,286],"mapped",[287]],[[287,287],"valid"],[[288,288],"mapped",[289]],[[289,289],"valid"],[[290,290],"mapped",[291]],[[291,291],"valid"],[[292,292],"mapped",[293]],[[293,293],"valid"],[[294,294],"mapped",[295]],[[295,295],"valid"],[[296,296],"mapped",[297]],[[297,297],"valid"],[[298,298],"mapped",[299]],[[299,299],"valid"],[[300,300],"mapped",[301]],[[301,301],"valid"],[[302,302],"mapped",[303]],[[303,303],"valid"],[[304,304],"mapped",[105,775]],[[305,305],"valid"],[[306,307],"mapped",[105,106]],[[308,308],"mapped",[309]],[[309,309],"valid"],[[310,310],"mapped",[311]],[[311,312],"valid"],[[313,313],"mapped",[314]],[[314,314],"valid"],[[315,315],"mapped",[316]],[[316,316],"valid"],[[317,317],"mapped",[318]],[[318,318],"valid"],[[319,320],"mapped",[108,183]],[[321,321],"mapped",[322]],[[322,322],"valid"],[[323,323],"mapped",[324]],[[324,324],"valid"],[[325,325],"mapped",[326]],[[326,326],"valid"],[[327,327],"mapped",[328]],[[328,328],"valid"],[[329,329],"mapped",[700,110]],[[330,330],"mapped",[331]],[[331,331],"valid"],[[332,332],"mapped",[333]],[[333,333],"valid"],[[334,334],"mapped",[335]],[[335,335],"valid"],[[336,336],"mapped",[337]],[[337,337],"valid"],[[338,338],"mapped",[339]],[[339,339],"valid"],[[340,340],"mapped",[341]],[[341,341],"valid"],[[342,342],"mapped",[343]],[[343,343],"valid"],[[344,344],"mapped",[345]],[[345,345],"valid"],[[346,346],"mapped",[347]],[[347,347],"valid"],[[348,348],"mapped",[349]],[[349,349],"valid"],[[350,350],"mapped",[351]],[[351,351],"valid"],[[352,352],"mapped",[353]],[[353,353],"valid"],[[354,354],"mapped",[355]],[[355,355],"valid"],[[356,356],"mapped",[357]],[[357,357],"valid"],[[358,358],"mapped",[359]],[[359,359],"valid"],[[360,360],"mapped",[361]],[[361,361],"valid"],[[362,362],"mapped",[363]],[[363,363],"valid"],[[364,364],"mapped",[365]],[[365,365],"valid"],[[366,366],"mapped",[367]],[[367,367],"valid"],[[368,368],"mapped",[369]],[[369,369],"valid"],[[370,370],"mapped",[371]],[[371,371],"valid"],[[372,372],"mapped",[373]],[[373,373],"valid"],[[374,374],"mapped",[375]],[[375,375],"valid"],[[376,376],"mapped",[255]],[[377,377],"mapped",[378]],[[378,378],"valid"],[[379,379],"mapped",[380]],[[380,380],"valid"],[[381,381],"mapped",[382]],[[382,382],"valid"],[[383,383],"mapped",[115]],[[384,384],"valid"],[[385,385],"mapped",[595]],[[386,386],"mapped",[387]],[[387,387],"valid"],[[388,388],"mapped",[389]],[[389,389],"valid"],[[390,390],"mapped",[596]],[[391,391],"mapped",[392]],[[392,392],"valid"],[[393,393],"mapped",[598]],[[394,394],"mapped",[599]],[[395,395],"mapped",[396]],[[396,397],"valid"],[[398,398],"mapped",[477]],[[399,399],"mapped",[601]],[[400,400],"mapped",[603]],[[401,401],"mapped",[402]],[[402,402],"valid"],[[403,403],"mapped",[608]],[[404,404],"mapped",[611]],[[405,405],"valid"],[[406,406],"mapped",[617]],[[407,407],"mapped",[616]],[[408,408],"mapped",[409]],[[409,411],"valid"],[[412,412],"mapped",[623]],[[413,413],"mapped",[626]],[[414,414],"valid"],[[415,415],"mapped",[629]],[[416,416],"mapped",[417]],[[417,417],"valid"],[[418,418],"mapped",[419]],[[419,419],"valid"],[[420,420],"mapped",[421]],[[421,421],"valid"],[[422,422],"mapped",[640]],[[423,423],"mapped",[424]],[[424,424],"valid"],[[425,425],"mapped",[643]],[[426,427],"valid"],[[428,428],"mapped",[429]],[[429,429],"valid"],[[430,430],"mapped",[648]],[[431,431],"mapped",[432]],[[432,432],"valid"],[[433,433],"mapped",[650]],[[434,434],"mapped",[651]],[[435,435],"mapped",[436]],[[436,436],"valid"],[[437,437],"mapped",[438]],[[438,438],"valid"],[[439,439],"mapped",[658]],[[440,440],"mapped",[441]],[[441,443],"valid"],[[444,444],"mapped",[445]],[[445,451],"valid"],[[452,454],"mapped",[100,382]],[[455,457],"mapped",[108,106]],[[458,460],"mapped",[110,106]],[[461,461],"mapped",[462]],[[462,462],"valid"],[[463,463],"mapped",[464]],[[464,464],"valid"],[[465,465],"mapped",[466]],[[466,466],"valid"],[[467,467],"mapped",[468]],[[468,468],"valid"],[[469,469],"mapped",[470]],[[470,470],"valid"],[[471,471],"mapped",[472]],[[472,472],"valid"],[[473,473],"mapped",[474]],[[474,474],"valid"],[[475,475],"mapped",[476]],[[476,477],"valid"],[[478,478],"mapped",[479]],[[479,479],"valid"],[[480,480],"mapped",[481]],[[481,481],"valid"],[[482,482],"mapped",[483]],[[483,483],"valid"],[[484,484],"mapped",[485]],[[485,485],"valid"],[[486,486],"mapped",[487]],[[487,487],"valid"],[[488,488],"mapped",[489]],[[489,489],"valid"],[[490,490],"mapped",[491]],[[491,491],"valid"],[[492,492],"mapped",[493]],[[493,493],"valid"],[[494,494],"mapped",[495]],[[495,496],"valid"],[[497,499],"mapped",[100,122]],[[500,500],"mapped",[501]],[[501,501],"valid"],[[502,502],"mapped",[405]],[[503,503],"mapped",[447]],[[504,504],"mapped",[505]],[[505,505],"valid"],[[506,506],"mapped",[507]],[[507,507],"valid"],[[508,508],"mapped",[509]],[[509,509],"valid"],[[510,510],"mapped",[511]],[[511,511],"valid"],[[512,512],"mapped",[513]],[[513,513],"valid"],[[514,514],"mapped",[515]],[[515,515],"valid"],[[516,516],"mapped",[517]],[[517,517],"valid"],[[518,518],"mapped",[519]],[[519,519],"valid"],[[520,520],"mapped",[521]],[[521,521],"valid"],[[522,522],"mapped",[523]],[[523,523],"valid"],[[524,524],"mapped",[525]],[[525,525],"valid"],[[526,526],"mapped",[527]],[[527,527],"valid"],[[528,528],"mapped",[529]],[[529,529],"valid"],[[530,530],"mapped",[531]],[[531,531],"valid"],[[532,532],"mapped",[533]],[[533,533],"valid"],[[534,534],"mapped",[535]],[[535,535],"valid"],[[536,536],"mapped",[537]],[[537,537],"valid"],[[538,538],"mapped",[539]],[[539,539],"valid"],[[540,540],"mapped",[541]],[[541,541],"valid"],[[542,542],"mapped",[543]],[[543,543],"valid"],[[544,544],"mapped",[414]],[[545,545],"valid"],[[546,546],"mapped",[547]],[[547,547],"valid"],[[548,548],"mapped",[549]],[[549,549],"valid"],[[550,550],"mapped",[551]],[[551,551],"valid"],[[552,552],"mapped",[553]],[[553,553],"valid"],[[554,554],"mapped",[555]],[[555,555],"valid"],[[556,556],"mapped",[557]],[[557,557],"valid"],[[558,558],"mapped",[559]],[[559,559],"valid"],[[560,560],"mapped",[561]],[[561,561],"valid"],[[562,562],"mapped",[563]],[[563,563],"valid"],[[564,566],"valid"],[[567,569],"valid"],[[570,570],"mapped",[11365]],[[571,571],"mapped",[572]],[[572,572],"valid"],[[573,573],"mapped",[410]],[[574,574],"mapped",[11366]],[[575,576],"valid"],[[577,577],"mapped",[578]],[[578,578],"valid"],[[579,579],"mapped",[384]],[[580,580],"mapped",[649]],[[581,581],"mapped",[652]],[[582,582],"mapped",[583]],[[583,583],"valid"],[[584,584],"mapped",[585]],[[585,585],"valid"],[[586,586],"mapped",[587]],[[587,587],"valid"],[[588,588],"mapped",[589]],[[589,589],"valid"],[[590,590],"mapped",[591]],[[591,591],"valid"],[[592,680],"valid"],[[681,685],"valid"],[[686,687],"valid"],[[688,688],"mapped",[104]],[[689,689],"mapped",[614]],[[690,690],"mapped",[106]],[[691,691],"mapped",[114]],[[692,692],"mapped",[633]],[[693,693],"mapped",[635]],[[694,694],"mapped",[641]],[[695,695],"mapped",[119]],[[696,696],"mapped",[121]],[[697,705],"valid"],[[706,709],"valid",[],"NV8"],[[710,721],"valid"],[[722,727],"valid",[],"NV8"],[[728,728],"disallowed_STD3_mapped",[32,774]],[[729,729],"disallowed_STD3_mapped",[32,775]],[[730,730],"disallowed_STD3_mapped",[32,778]],[[731,731],"disallowed_STD3_mapped",[32,808]],[[732,732],"disallowed_STD3_mapped",[32,771]],[[733,733],"disallowed_STD3_mapped",[32,779]],[[734,734],"valid",[],"NV8"],[[735,735],"valid",[],"NV8"],[[736,736],"mapped",[611]],[[737,737],"mapped",[108]],[[738,738],"mapped",[115]],[[739,739],"mapped",[120]],[[740,740],"mapped",[661]],[[741,745],"valid",[],"NV8"],[[746,747],"valid",[],"NV8"],[[748,748],"valid"],[[749,749],"valid",[],"NV8"],[[750,750],"valid"],[[751,767],"valid",[],"NV8"],[[768,831],"valid"],[[832,832],"mapped",[768]],[[833,833],"mapped",[769]],[[834,834],"valid"],[[835,835],"mapped",[787]],[[836,836],"mapped",[776,769]],[[837,837],"mapped",[953]],[[838,846],"valid"],[[847,847],"ignored"],[[848,855],"valid"],[[856,860],"valid"],[[861,863],"valid"],[[864,865],"valid"],[[866,866],"valid"],[[867,879],"valid"],[[880,880],"mapped",[881]],[[881,881],"valid"],[[882,882],"mapped",[883]],[[883,883],"valid"],[[884,884],"mapped",[697]],[[885,885],"valid"],[[886,886],"mapped",[887]],[[887,887],"valid"],[[888,889],"disallowed"],[[890,890],"disallowed_STD3_mapped",[32,953]],[[891,893],"valid"],[[894,894],"disallowed_STD3_mapped",[59]],[[895,895],"mapped",[1011]],[[896,899],"disallowed"],[[900,900],"disallowed_STD3_mapped",[32,769]],[[901,901],"disallowed_STD3_mapped",[32,776,769]],[[902,902],"mapped",[940]],[[903,903],"mapped",[183]],[[904,904],"mapped",[941]],[[905,905],"mapped",[942]],[[906,906],"mapped",[943]],[[907,907],"disallowed"],[[908,908],"mapped",[972]],[[909,909],"disallowed"],[[910,910],"mapped",[973]],[[911,911],"mapped",[974]],[[912,912],"valid"],[[913,913],"mapped",[945]],[[914,914],"mapped",[946]],[[915,915],"mapped",[947]],[[916,916],"mapped",[948]],[[917,917],"mapped",[949]],[[918,918],"mapped",[950]],[[919,919],"mapped",[951]],[[920,920],"mapped",[952]],[[921,921],"mapped",[953]],[[922,922],"mapped",[954]],[[923,923],"mapped",[955]],[[924,924],"mapped",[956]],[[925,925],"mapped",[957]],[[926,926],"mapped",[958]],[[927,927],"mapped",[959]],[[928,928],"mapped",[960]],[[929,929],"mapped",[961]],[[930,930],"disallowed"],[[931,931],"mapped",[963]],[[932,932],"mapped",[964]],[[933,933],"mapped",[965]],[[934,934],"mapped",[966]],[[935,935],"mapped",[967]],[[936,936],"mapped",[968]],[[937,937],"mapped",[969]],[[938,938],"mapped",[970]],[[939,939],"mapped",[971]],[[940,961],"valid"],[[962,962],"deviation",[963]],[[963,974],"valid"],[[975,975],"mapped",[983]],[[976,976],"mapped",[946]],[[977,977],"mapped",[952]],[[978,978],"mapped",[965]],[[979,979],"mapped",[973]],[[980,980],"mapped",[971]],[[981,981],"mapped",[966]],[[982,982],"mapped",[960]],[[983,983],"valid"],[[984,984],"mapped",[985]],[[985,985],"valid"],[[986,986],"mapped",[987]],[[987,987],"valid"],[[988,988],"mapped",[989]],[[989,989],"valid"],[[990,990],"mapped",[991]],[[991,991],"valid"],[[992,992],"mapped",[993]],[[993,993],"valid"],[[994,994],"mapped",[995]],[[995,995],"valid"],[[996,996],"mapped",[997]],[[997,997],"valid"],[[998,998],"mapped",[999]],[[999,999],"valid"],[[1000,1000],"mapped",[1001]],[[1001,1001],"valid"],[[1002,1002],"mapped",[1003]],[[1003,1003],"valid"],[[1004,1004],"mapped",[1005]],[[1005,1005],"valid"],[[1006,1006],"mapped",[1007]],[[1007,1007],"valid"],[[1008,1008],"mapped",[954]],[[1009,1009],"mapped",[961]],[[1010,1010],"mapped",[963]],[[1011,1011],"valid"],[[1012,1012],"mapped",[952]],[[1013,1013],"mapped",[949]],[[1014,1014],"valid",[],"NV8"],[[1015,1015],"mapped",[1016]],[[1016,1016],"valid"],[[1017,1017],"mapped",[963]],[[1018,1018],"mapped",[1019]],[[1019,1019],"valid"],[[1020,1020],"valid"],[[1021,1021],"mapped",[891]],[[1022,1022],"mapped",[892]],[[1023,1023],"mapped",[893]],[[1024,1024],"mapped",[1104]],[[1025,1025],"mapped",[1105]],[[1026,1026],"mapped",[1106]],[[1027,1027],"mapped",[1107]],[[1028,1028],"mapped",[1108]],[[1029,1029],"mapped",[1109]],[[1030,1030],"mapped",[1110]],[[1031,1031],"mapped",[1111]],[[1032,1032],"mapped",[1112]],[[1033,1033],"mapped",[1113]],[[1034,1034],"mapped",[1114]],[[1035,1035],"mapped",[1115]],[[1036,1036],"mapped",[1116]],[[1037,1037],"mapped",[1117]],[[1038,1038],"mapped",[1118]],[[1039,1039],"mapped",[1119]],[[1040,1040],"mapped",[1072]],[[1041,1041],"mapped",[1073]],[[1042,1042],"mapped",[1074]],[[1043,1043],"mapped",[1075]],[[1044,1044],"mapped",[1076]],[[1045,1045],"mapped",[1077]],[[1046,1046],"mapped",[1078]],[[1047,1047],"mapped",[1079]],[[1048,1048],"mapped",[1080]],[[1049,1049],"mapped",[1081]],[[1050,1050],"mapped",[1082]],[[1051,1051],"mapped",[1083]],[[1052,1052],"mapped",[1084]],[[1053,1053],"mapped",[1085]],[[1054,1054],"mapped",[1086]],[[1055,1055],"mapped",[1087]],[[1056,1056],"mapped",[1088]],[[1057,1057],"mapped",[1089]],[[1058,1058],"mapped",[1090]],[[1059,1059],"mapped",[1091]],[[1060,1060],"mapped",[1092]],[[1061,1061],"mapped",[1093]],[[1062,1062],"mapped",[1094]],[[1063,1063],"mapped",[1095]],[[1064,1064],"mapped",[1096]],[[1065,1065],"mapped",[1097]],[[1066,1066],"mapped",[1098]],[[1067,1067],"mapped",[1099]],[[1068,1068],"mapped",[1100]],[[1069,1069],"mapped",[1101]],[[1070,1070],"mapped",[1102]],[[1071,1071],"mapped",[1103]],[[1072,1103],"valid"],[[1104,1104],"valid"],[[1105,1116],"valid"],[[1117,1117],"valid"],[[1118,1119],"valid"],[[1120,1120],"mapped",[1121]],[[1121,1121],"valid"],[[1122,1122],"mapped",[1123]],[[1123,1123],"valid"],[[1124,1124],"mapped",[1125]],[[1125,1125],"valid"],[[1126,1126],"mapped",[1127]],[[1127,1127],"valid"],[[1128,1128],"mapped",[1129]],[[1129,1129],"valid"],[[1130,1130],"mapped",[1131]],[[1131,1131],"valid"],[[1132,1132],"mapped",[1133]],[[1133,1133],"valid"],[[1134,1134],"mapped",[1135]],[[1135,1135],"valid"],[[1136,1136],"mapped",[1137]],[[1137,1137],"valid"],[[1138,1138],"mapped",[1139]],[[1139,1139],"valid"],[[1140,1140],"mapped",[1141]],[[1141,1141],"valid"],[[1142,1142],"mapped",[1143]],[[1143,1143],"valid"],[[1144,1144],"mapped",[1145]],[[1145,1145],"valid"],[[1146,1146],"mapped",[1147]],[[1147,1147],"valid"],[[1148,1148],"mapped",[1149]],[[1149,1149],"valid"],[[1150,1150],"mapped",[1151]],[[1151,1151],"valid"],[[1152,1152],"mapped",[1153]],[[1153,1153],"valid"],[[1154,1154],"valid",[],"NV8"],[[1155,1158],"valid"],[[1159,1159],"valid"],[[1160,1161],"valid",[],"NV8"],[[1162,1162],"mapped",[1163]],[[1163,1163],"valid"],[[1164,1164],"mapped",[1165]],[[1165,1165],"valid"],[[1166,1166],"mapped",[1167]],[[1167,1167],"valid"],[[1168,1168],"mapped",[1169]],[[1169,1169],"valid"],[[1170,1170],"mapped",[1171]],[[1171,1171],"valid"],[[1172,1172],"mapped",[1173]],[[1173,1173],"valid"],[[1174,1174],"mapped",[1175]],[[1175,1175],"valid"],[[1176,1176],"mapped",[1177]],[[1177,1177],"valid"],[[1178,1178],"mapped",[1179]],[[1179,1179],"valid"],[[1180,1180],"mapped",[1181]],[[1181,1181],"valid"],[[1182,1182],"mapped",[1183]],[[1183,1183],"valid"],[[1184,1184],"mapped",[1185]],[[1185,1185],"valid"],[[1186,1186],"mapped",[1187]],[[1187,1187],"valid"],[[1188,1188],"mapped",[1189]],[[1189,1189],"valid"],[[1190,1190],"mapped",[1191]],[[1191,1191],"valid"],[[1192,1192],"mapped",[1193]],[[1193,1193],"valid"],[[1194,1194],"mapped",[1195]],[[1195,1195],"valid"],[[1196,1196],"mapped",[1197]],[[1197,1197],"valid"],[[1198,1198],"mapped",[1199]],[[1199,1199],"valid"],[[1200,1200],"mapped",[1201]],[[1201,1201],"valid"],[[1202,1202],"mapped",[1203]],[[1203,1203],"valid"],[[1204,1204],"mapped",[1205]],[[1205,1205],"valid"],[[1206,1206],"mapped",[1207]],[[1207,1207],"valid"],[[1208,1208],"mapped",[1209]],[[1209,1209],"valid"],[[1210,1210],"mapped",[1211]],[[1211,1211],"valid"],[[1212,1212],"mapped",[1213]],[[1213,1213],"valid"],[[1214,1214],"mapped",[1215]],[[1215,1215],"valid"],[[1216,1216],"disallowed"],[[1217,1217],"mapped",[1218]],[[1218,1218],"valid"],[[1219,1219],"mapped",[1220]],[[1220,1220],"valid"],[[1221,1221],"mapped",[1222]],[[1222,1222],"valid"],[[1223,1223],"mapped",[1224]],[[1224,1224],"valid"],[[1225,1225],"mapped",[1226]],[[1226,1226],"valid"],[[1227,1227],"mapped",[1228]],[[1228,1228],"valid"],[[1229,1229],"mapped",[1230]],[[1230,1230],"valid"],[[1231,1231],"valid"],[[1232,1232],"mapped",[1233]],[[1233,1233],"valid"],[[1234,1234],"mapped",[1235]],[[1235,1235],"valid"],[[1236,1236],"mapped",[1237]],[[1237,1237],"valid"],[[1238,1238],"mapped",[1239]],[[1239,1239],"valid"],[[1240,1240],"mapped",[1241]],[[1241,1241],"valid"],[[1242,1242],"mapped",[1243]],[[1243,1243],"valid"],[[1244,1244],"mapped",[1245]],[[1245,1245],"valid"],[[1246,1246],"mapped",[1247]],[[1247,1247],"valid"],[[1248,1248],"mapped",[1249]],[[1249,1249],"valid"],[[1250,1250],"mapped",[1251]],[[1251,1251],"valid"],[[1252,1252],"mapped",[1253]],[[1253,1253],"valid"],[[1254,1254],"mapped",[1255]],[[1255,1255],"valid"],[[1256,1256],"mapped",[1257]],[[1257,1257],"valid"],[[1258,1258],"mapped",[1259]],[[1259,1259],"valid"],[[1260,1260],"mapped",[1261]],[[1261,1261],"valid"],[[1262,1262],"mapped",[1263]],[[1263,1263],"valid"],[[1264,1264],"mapped",[1265]],[[1265,1265],"valid"],[[1266,1266],"mapped",[1267]],[[1267,1267],"valid"],[[1268,1268],"mapped",[1269]],[[1269,1269],"valid"],[[1270,1270],"mapped",[1271]],[[1271,1271],"valid"],[[1272,1272],"mapped",[1273]],[[1273,1273],"valid"],[[1274,1274],"mapped",[1275]],[[1275,1275],"valid"],[[1276,1276],"mapped",[1277]],[[1277,1277],"valid"],[[1278,1278],"mapped",[1279]],[[1279,1279],"valid"],[[1280,1280],"mapped",[1281]],[[1281,1281],"valid"],[[1282,1282],"mapped",[1283]],[[1283,1283],"valid"],[[1284,1284],"mapped",[1285]],[[1285,1285],"valid"],[[1286,1286],"mapped",[1287]],[[1287,1287],"valid"],[[1288,1288],"mapped",[1289]],[[1289,1289],"valid"],[[1290,1290],"mapped",[1291]],[[1291,1291],"valid"],[[1292,1292],"mapped",[1293]],[[1293,1293],"valid"],[[1294,1294],"mapped",[1295]],[[1295,1295],"valid"],[[1296,1296],"mapped",[1297]],[[1297,1297],"valid"],[[1298,1298],"mapped",[1299]],[[1299,1299],"valid"],[[1300,1300],"mapped",[1301]],[[1301,1301],"valid"],[[1302,1302],"mapped",[1303]],[[1303,1303],"valid"],[[1304,1304],"mapped",[1305]],[[1305,1305],"valid"],[[1306,1306],"mapped",[1307]],[[1307,1307],"valid"],[[1308,1308],"mapped",[1309]],[[1309,1309],"valid"],[[1310,1310],"mapped",[1311]],[[1311,1311],"valid"],[[1312,1312],"mapped",[1313]],[[1313,1313],"valid"],[[1314,1314],"mapped",[1315]],[[1315,1315],"valid"],[[1316,1316],"mapped",[1317]],[[1317,1317],"valid"],[[1318,1318],"mapped",[1319]],[[1319,1319],"valid"],[[1320,1320],"mapped",[1321]],[[1321,1321],"valid"],[[1322,1322],"mapped",[1323]],[[1323,1323],"valid"],[[1324,1324],"mapped",[1325]],[[1325,1325],"valid"],[[1326,1326],"mapped",[1327]],[[1327,1327],"valid"],[[1328,1328],"disallowed"],[[1329,1329],"mapped",[1377]],[[1330,1330],"mapped",[1378]],[[1331,1331],"mapped",[1379]],[[1332,1332],"mapped",[1380]],[[1333,1333],"mapped",[1381]],[[1334,1334],"mapped",[1382]],[[1335,1335],"mapped",[1383]],[[1336,1336],"mapped",[1384]],[[1337,1337],"mapped",[1385]],[[1338,1338],"mapped",[1386]],[[1339,1339],"mapped",[1387]],[[1340,1340],"mapped",[1388]],[[1341,1341],"mapped",[1389]],[[1342,1342],"mapped",[1390]],[[1343,1343],"mapped",[1391]],[[1344,1344],"mapped",[1392]],[[1345,1345],"mapped",[1393]],[[1346,1346],"mapped",[1394]],[[1347,1347],"mapped",[1395]],[[1348,1348],"mapped",[1396]],[[1349,1349],"mapped",[1397]],[[1350,1350],"mapped",[1398]],[[1351,1351],"mapped",[1399]],[[1352,1352],"mapped",[1400]],[[1353,1353],"mapped",[1401]],[[1354,1354],"mapped",[1402]],[[1355,1355],"mapped",[1403]],[[1356,1356],"mapped",[1404]],[[1357,1357],"mapped",[1405]],[[1358,1358],"mapped",[1406]],[[1359,1359],"mapped",[1407]],[[1360,1360],"mapped",[1408]],[[1361,1361],"mapped",[1409]],[[1362,1362],"mapped",[1410]],[[1363,1363],"mapped",[1411]],[[1364,1364],"mapped",[1412]],[[1365,1365],"mapped",[1413]],[[1366,1366],"mapped",[1414]],[[1367,1368],"disallowed"],[[1369,1369],"valid"],[[1370,1375],"valid",[],"NV8"],[[1376,1376],"disallowed"],[[1377,1414],"valid"],[[1415,1415],"mapped",[1381,1410]],[[1416,1416],"disallowed"],[[1417,1417],"valid",[],"NV8"],[[1418,1418],"valid",[],"NV8"],[[1419,1420],"disallowed"],[[1421,1422],"valid",[],"NV8"],[[1423,1423],"valid",[],"NV8"],[[1424,1424],"disallowed"],[[1425,1441],"valid"],[[1442,1442],"valid"],[[1443,1455],"valid"],[[1456,1465],"valid"],[[1466,1466],"valid"],[[1467,1469],"valid"],[[1470,1470],"valid",[],"NV8"],[[1471,1471],"valid"],[[1472,1472],"valid",[],"NV8"],[[1473,1474],"valid"],[[1475,1475],"valid",[],"NV8"],[[1476,1476],"valid"],[[1477,1477],"valid"],[[1478,1478],"valid",[],"NV8"],[[1479,1479],"valid"],[[1480,1487],"disallowed"],[[1488,1514],"valid"],[[1515,1519],"disallowed"],[[1520,1524],"valid"],[[1525,1535],"disallowed"],[[1536,1539],"disallowed"],[[1540,1540],"disallowed"],[[1541,1541],"disallowed"],[[1542,1546],"valid",[],"NV8"],[[1547,1547],"valid",[],"NV8"],[[1548,1548],"valid",[],"NV8"],[[1549,1551],"valid",[],"NV8"],[[1552,1557],"valid"],[[1558,1562],"valid"],[[1563,1563],"valid",[],"NV8"],[[1564,1564],"disallowed"],[[1565,1565],"disallowed"],[[1566,1566],"valid",[],"NV8"],[[1567,1567],"valid",[],"NV8"],[[1568,1568],"valid"],[[1569,1594],"valid"],[[1595,1599],"valid"],[[1600,1600],"valid",[],"NV8"],[[1601,1618],"valid"],[[1619,1621],"valid"],[[1622,1624],"valid"],[[1625,1630],"valid"],[[1631,1631],"valid"],[[1632,1641],"valid"],[[1642,1645],"valid",[],"NV8"],[[1646,1647],"valid"],[[1648,1652],"valid"],[[1653,1653],"mapped",[1575,1652]],[[1654,1654],"mapped",[1608,1652]],[[1655,1655],"mapped",[1735,1652]],[[1656,1656],"mapped",[1610,1652]],[[1657,1719],"valid"],[[1720,1721],"valid"],[[1722,1726],"valid"],[[1727,1727],"valid"],[[1728,1742],"valid"],[[1743,1743],"valid"],[[1744,1747],"valid"],[[1748,1748],"valid",[],"NV8"],[[1749,1756],"valid"],[[1757,1757],"disallowed"],[[1758,1758],"valid",[],"NV8"],[[1759,1768],"valid"],[[1769,1769],"valid",[],"NV8"],[[1770,1773],"valid"],[[1774,1775],"valid"],[[1776,1785],"valid"],[[1786,1790],"valid"],[[1791,1791],"valid"],[[1792,1805],"valid",[],"NV8"],[[1806,1806],"disallowed"],[[1807,1807],"disallowed"],[[1808,1836],"valid"],[[1837,1839],"valid"],[[1840,1866],"valid"],[[1867,1868],"disallowed"],[[1869,1871],"valid"],[[1872,1901],"valid"],[[1902,1919],"valid"],[[1920,1968],"valid"],[[1969,1969],"valid"],[[1970,1983],"disallowed"],[[1984,2037],"valid"],[[2038,2042],"valid",[],"NV8"],[[2043,2047],"disallowed"],[[2048,2093],"valid"],[[2094,2095],"disallowed"],[[2096,2110],"valid",[],"NV8"],[[2111,2111],"disallowed"],[[2112,2139],"valid"],[[2140,2141],"disallowed"],[[2142,2142],"valid",[],"NV8"],[[2143,2207],"disallowed"],[[2208,2208],"valid"],[[2209,2209],"valid"],[[2210,2220],"valid"],[[2221,2226],"valid"],[[2227,2228],"valid"],[[2229,2274],"disallowed"],[[2275,2275],"valid"],[[2276,2302],"valid"],[[2303,2303],"valid"],[[2304,2304],"valid"],[[2305,2307],"valid"],[[2308,2308],"valid"],[[2309,2361],"valid"],[[2362,2363],"valid"],[[2364,2381],"valid"],[[2382,2382],"valid"],[[2383,2383],"valid"],[[2384,2388],"valid"],[[2389,2389],"valid"],[[2390,2391],"valid"],[[2392,2392],"mapped",[2325,2364]],[[2393,2393],"mapped",[2326,2364]],[[2394,2394],"mapped",[2327,2364]],[[2395,2395],"mapped",[2332,2364]],[[2396,2396],"mapped",[2337,2364]],[[2397,2397],"mapped",[2338,2364]],[[2398,2398],"mapped",[2347,2364]],[[2399,2399],"mapped",[2351,2364]],[[2400,2403],"valid"],[[2404,2405],"valid",[],"NV8"],[[2406,2415],"valid"],[[2416,2416],"valid",[],"NV8"],[[2417,2418],"valid"],[[2419,2423],"valid"],[[2424,2424],"valid"],[[2425,2426],"valid"],[[2427,2428],"valid"],[[2429,2429],"valid"],[[2430,2431],"valid"],[[2432,2432],"valid"],[[2433,2435],"valid"],[[2436,2436],"disallowed"],[[2437,2444],"valid"],[[2445,2446],"disallowed"],[[2447,2448],"valid"],[[2449,2450],"disallowed"],[[2451,2472],"valid"],[[2473,2473],"disallowed"],[[2474,2480],"valid"],[[2481,2481],"disallowed"],[[2482,2482],"valid"],[[2483,2485],"disallowed"],[[2486,2489],"valid"],[[2490,2491],"disallowed"],[[2492,2492],"valid"],[[2493,2493],"valid"],[[2494,2500],"valid"],[[2501,2502],"disallowed"],[[2503,2504],"valid"],[[2505,2506],"disallowed"],[[2507,2509],"valid"],[[2510,2510],"valid"],[[2511,2518],"disallowed"],[[2519,2519],"valid"],[[2520,2523],"disallowed"],[[2524,2524],"mapped",[2465,2492]],[[2525,2525],"mapped",[2466,2492]],[[2526,2526],"disallowed"],[[2527,2527],"mapped",[2479,2492]],[[2528,2531],"valid"],[[2532,2533],"disallowed"],[[2534,2545],"valid"],[[2546,2554],"valid",[],"NV8"],[[2555,2555],"valid",[],"NV8"],[[2556,2560],"disallowed"],[[2561,2561],"valid"],[[2562,2562],"valid"],[[2563,2563],"valid"],[[2564,2564],"disallowed"],[[2565,2570],"valid"],[[2571,2574],"disallowed"],[[2575,2576],"valid"],[[2577,2578],"disallowed"],[[2579,2600],"valid"],[[2601,2601],"disallowed"],[[2602,2608],"valid"],[[2609,2609],"disallowed"],[[2610,2610],"valid"],[[2611,2611],"mapped",[2610,2620]],[[2612,2612],"disallowed"],[[2613,2613],"valid"],[[2614,2614],"mapped",[2616,2620]],[[2615,2615],"disallowed"],[[2616,2617],"valid"],[[2618,2619],"disallowed"],[[2620,2620],"valid"],[[2621,2621],"disallowed"],[[2622,2626],"valid"],[[2627,2630],"disallowed"],[[2631,2632],"valid"],[[2633,2634],"disallowed"],[[2635,2637],"valid"],[[2638,2640],"disallowed"],[[2641,2641],"valid"],[[2642,2648],"disallowed"],[[2649,2649],"mapped",[2582,2620]],[[2650,2650],"mapped",[2583,2620]],[[2651,2651],"mapped",[2588,2620]],[[2652,2652],"valid"],[[2653,2653],"disallowed"],[[2654,2654],"mapped",[2603,2620]],[[2655,2661],"disallowed"],[[2662,2676],"valid"],[[2677,2677],"valid"],[[2678,2688],"disallowed"],[[2689,2691],"valid"],[[2692,2692],"disallowed"],[[2693,2699],"valid"],[[2700,2700],"valid"],[[2701,2701],"valid"],[[2702,2702],"disallowed"],[[2703,2705],"valid"],[[2706,2706],"disallowed"],[[2707,2728],"valid"],[[2729,2729],"disallowed"],[[2730,2736],"valid"],[[2737,2737],"disallowed"],[[2738,2739],"valid"],[[2740,2740],"disallowed"],[[2741,2745],"valid"],[[2746,2747],"disallowed"],[[2748,2757],"valid"],[[2758,2758],"disallowed"],[[2759,2761],"valid"],[[2762,2762],"disallowed"],[[2763,2765],"valid"],[[2766,2767],"disallowed"],[[2768,2768],"valid"],[[2769,2783],"disallowed"],[[2784,2784],"valid"],[[2785,2787],"valid"],[[2788,2789],"disallowed"],[[2790,2799],"valid"],[[2800,2800],"valid",[],"NV8"],[[2801,2801],"valid",[],"NV8"],[[2802,2808],"disallowed"],[[2809,2809],"valid"],[[2810,2816],"disallowed"],[[2817,2819],"valid"],[[2820,2820],"disallowed"],[[2821,2828],"valid"],[[2829,2830],"disallowed"],[[2831,2832],"valid"],[[2833,2834],"disallowed"],[[2835,2856],"valid"],[[2857,2857],"disallowed"],[[2858,2864],"valid"],[[2865,2865],"disallowed"],[[2866,2867],"valid"],[[2868,2868],"disallowed"],[[2869,2869],"valid"],[[2870,2873],"valid"],[[2874,2875],"disallowed"],[[2876,2883],"valid"],[[2884,2884],"valid"],[[2885,2886],"disallowed"],[[2887,2888],"valid"],[[2889,2890],"disallowed"],[[2891,2893],"valid"],[[2894,2901],"disallowed"],[[2902,2903],"valid"],[[2904,2907],"disallowed"],[[2908,2908],"mapped",[2849,2876]],[[2909,2909],"mapped",[2850,2876]],[[2910,2910],"disallowed"],[[2911,2913],"valid"],[[2914,2915],"valid"],[[2916,2917],"disallowed"],[[2918,2927],"valid"],[[2928,2928],"valid",[],"NV8"],[[2929,2929],"valid"],[[2930,2935],"valid",[],"NV8"],[[2936,2945],"disallowed"],[[2946,2947],"valid"],[[2948,2948],"disallowed"],[[2949,2954],"valid"],[[2955,2957],"disallowed"],[[2958,2960],"valid"],[[2961,2961],"disallowed"],[[2962,2965],"valid"],[[2966,2968],"disallowed"],[[2969,2970],"valid"],[[2971,2971],"disallowed"],[[2972,2972],"valid"],[[2973,2973],"disallowed"],[[2974,2975],"valid"],[[2976,2978],"disallowed"],[[2979,2980],"valid"],[[2981,2983],"disallowed"],[[2984,2986],"valid"],[[2987,2989],"disallowed"],[[2990,2997],"valid"],[[2998,2998],"valid"],[[2999,3001],"valid"],[[3002,3005],"disallowed"],[[3006,3010],"valid"],[[3011,3013],"disallowed"],[[3014,3016],"valid"],[[3017,3017],"disallowed"],[[3018,3021],"valid"],[[3022,3023],"disallowed"],[[3024,3024],"valid"],[[3025,3030],"disallowed"],[[3031,3031],"valid"],[[3032,3045],"disallowed"],[[3046,3046],"valid"],[[3047,3055],"valid"],[[3056,3058],"valid",[],"NV8"],[[3059,3066],"valid",[],"NV8"],[[3067,3071],"disallowed"],[[3072,3072],"valid"],[[3073,3075],"valid"],[[3076,3076],"disallowed"],[[3077,3084],"valid"],[[3085,3085],"disallowed"],[[3086,3088],"valid"],[[3089,3089],"disallowed"],[[3090,3112],"valid"],[[3113,3113],"disallowed"],[[3114,3123],"valid"],[[3124,3124],"valid"],[[3125,3129],"valid"],[[3130,3132],"disallowed"],[[3133,3133],"valid"],[[3134,3140],"valid"],[[3141,3141],"disallowed"],[[3142,3144],"valid"],[[3145,3145],"disallowed"],[[3146,3149],"valid"],[[3150,3156],"disallowed"],[[3157,3158],"valid"],[[3159,3159],"disallowed"],[[3160,3161],"valid"],[[3162,3162],"valid"],[[3163,3167],"disallowed"],[[3168,3169],"valid"],[[3170,3171],"valid"],[[3172,3173],"disallowed"],[[3174,3183],"valid"],[[3184,3191],"disallowed"],[[3192,3199],"valid",[],"NV8"],[[3200,3200],"disallowed"],[[3201,3201],"valid"],[[3202,3203],"valid"],[[3204,3204],"disallowed"],[[3205,3212],"valid"],[[3213,3213],"disallowed"],[[3214,3216],"valid"],[[3217,3217],"disallowed"],[[3218,3240],"valid"],[[3241,3241],"disallowed"],[[3242,3251],"valid"],[[3252,3252],"disallowed"],[[3253,3257],"valid"],[[3258,3259],"disallowed"],[[3260,3261],"valid"],[[3262,3268],"valid"],[[3269,3269],"disallowed"],[[3270,3272],"valid"],[[3273,3273],"disallowed"],[[3274,3277],"valid"],[[3278,3284],"disallowed"],[[3285,3286],"valid"],[[3287,3293],"disallowed"],[[3294,3294],"valid"],[[3295,3295],"disallowed"],[[3296,3297],"valid"],[[3298,3299],"valid"],[[3300,3301],"disallowed"],[[3302,3311],"valid"],[[3312,3312],"disallowed"],[[3313,3314],"valid"],[[3315,3328],"disallowed"],[[3329,3329],"valid"],[[3330,3331],"valid"],[[3332,3332],"disallowed"],[[3333,3340],"valid"],[[3341,3341],"disallowed"],[[3342,3344],"valid"],[[3345,3345],"disallowed"],[[3346,3368],"valid"],[[3369,3369],"valid"],[[3370,3385],"valid"],[[3386,3386],"valid"],[[3387,3388],"disallowed"],[[3389,3389],"valid"],[[3390,3395],"valid"],[[3396,3396],"valid"],[[3397,3397],"disallowed"],[[3398,3400],"valid"],[[3401,3401],"disallowed"],[[3402,3405],"valid"],[[3406,3406],"valid"],[[3407,3414],"disallowed"],[[3415,3415],"valid"],[[3416,3422],"disallowed"],[[3423,3423],"valid"],[[3424,3425],"valid"],[[3426,3427],"valid"],[[3428,3429],"disallowed"],[[3430,3439],"valid"],[[3440,3445],"valid",[],"NV8"],[[3446,3448],"disallowed"],[[3449,3449],"valid",[],"NV8"],[[3450,3455],"valid"],[[3456,3457],"disallowed"],[[3458,3459],"valid"],[[3460,3460],"disallowed"],[[3461,3478],"valid"],[[3479,3481],"disallowed"],[[3482,3505],"valid"],[[3506,3506],"disallowed"],[[3507,3515],"valid"],[[3516,3516],"disallowed"],[[3517,3517],"valid"],[[3518,3519],"disallowed"],[[3520,3526],"valid"],[[3527,3529],"disallowed"],[[3530,3530],"valid"],[[3531,3534],"disallowed"],[[3535,3540],"valid"],[[3541,3541],"disallowed"],[[3542,3542],"valid"],[[3543,3543],"disallowed"],[[3544,3551],"valid"],[[3552,3557],"disallowed"],[[3558,3567],"valid"],[[3568,3569],"disallowed"],[[3570,3571],"valid"],[[3572,3572],"valid",[],"NV8"],[[3573,3584],"disallowed"],[[3585,3634],"valid"],[[3635,3635],"mapped",[3661,3634]],[[3636,3642],"valid"],[[3643,3646],"disallowed"],[[3647,3647],"valid",[],"NV8"],[[3648,3662],"valid"],[[3663,3663],"valid",[],"NV8"],[[3664,3673],"valid"],[[3674,3675],"valid",[],"NV8"],[[3676,3712],"disallowed"],[[3713,3714],"valid"],[[3715,3715],"disallowed"],[[3716,3716],"valid"],[[3717,3718],"disallowed"],[[3719,3720],"valid"],[[3721,3721],"disallowed"],[[3722,3722],"valid"],[[3723,3724],"disallowed"],[[3725,3725],"valid"],[[3726,3731],"disallowed"],[[3732,3735],"valid"],[[3736,3736],"disallowed"],[[3737,3743],"valid"],[[3744,3744],"disallowed"],[[3745,3747],"valid"],[[3748,3748],"disallowed"],[[3749,3749],"valid"],[[3750,3750],"disallowed"],[[3751,3751],"valid"],[[3752,3753],"disallowed"],[[3754,3755],"valid"],[[3756,3756],"disallowed"],[[3757,3762],"valid"],[[3763,3763],"mapped",[3789,3762]],[[3764,3769],"valid"],[[3770,3770],"disallowed"],[[3771,3773],"valid"],[[3774,3775],"disallowed"],[[3776,3780],"valid"],[[3781,3781],"disallowed"],[[3782,3782],"valid"],[[3783,3783],"disallowed"],[[3784,3789],"valid"],[[3790,3791],"disallowed"],[[3792,3801],"valid"],[[3802,3803],"disallowed"],[[3804,3804],"mapped",[3755,3737]],[[3805,3805],"mapped",[3755,3745]],[[3806,3807],"valid"],[[3808,3839],"disallowed"],[[3840,3840],"valid"],[[3841,3850],"valid",[],"NV8"],[[3851,3851],"valid"],[[3852,3852],"mapped",[3851]],[[3853,3863],"valid",[],"NV8"],[[3864,3865],"valid"],[[3866,3871],"valid",[],"NV8"],[[3872,3881],"valid"],[[3882,3892],"valid",[],"NV8"],[[3893,3893],"valid"],[[3894,3894],"valid",[],"NV8"],[[3895,3895],"valid"],[[3896,3896],"valid",[],"NV8"],[[3897,3897],"valid"],[[3898,3901],"valid",[],"NV8"],[[3902,3906],"valid"],[[3907,3907],"mapped",[3906,4023]],[[3908,3911],"valid"],[[3912,3912],"disallowed"],[[3913,3916],"valid"],[[3917,3917],"mapped",[3916,4023]],[[3918,3921],"valid"],[[3922,3922],"mapped",[3921,4023]],[[3923,3926],"valid"],[[3927,3927],"mapped",[3926,4023]],[[3928,3931],"valid"],[[3932,3932],"mapped",[3931,4023]],[[3933,3944],"valid"],[[3945,3945],"mapped",[3904,4021]],[[3946,3946],"valid"],[[3947,3948],"valid"],[[3949,3952],"disallowed"],[[3953,3954],"valid"],[[3955,3955],"mapped",[3953,3954]],[[3956,3956],"valid"],[[3957,3957],"mapped",[3953,3956]],[[3958,3958],"mapped",[4018,3968]],[[3959,3959],"mapped",[4018,3953,3968]],[[3960,3960],"mapped",[4019,3968]],[[3961,3961],"mapped",[4019,3953,3968]],[[3962,3968],"valid"],[[3969,3969],"mapped",[3953,3968]],[[3970,3972],"valid"],[[3973,3973],"valid",[],"NV8"],[[3974,3979],"valid"],[[3980,3983],"valid"],[[3984,3986],"valid"],[[3987,3987],"mapped",[3986,4023]],[[3988,3989],"valid"],[[3990,3990],"valid"],[[3991,3991],"valid"],[[3992,3992],"disallowed"],[[3993,3996],"valid"],[[3997,3997],"mapped",[3996,4023]],[[3998,4001],"valid"],[[4002,4002],"mapped",[4001,4023]],[[4003,4006],"valid"],[[4007,4007],"mapped",[4006,4023]],[[4008,4011],"valid"],[[4012,4012],"mapped",[4011,4023]],[[4013,4013],"valid"],[[4014,4016],"valid"],[[4017,4023],"valid"],[[4024,4024],"valid"],[[4025,4025],"mapped",[3984,4021]],[[4026,4028],"valid"],[[4029,4029],"disallowed"],[[4030,4037],"valid",[],"NV8"],[[4038,4038],"valid"],[[4039,4044],"valid",[],"NV8"],[[4045,4045],"disallowed"],[[4046,4046],"valid",[],"NV8"],[[4047,4047],"valid",[],"NV8"],[[4048,4049],"valid",[],"NV8"],[[4050,4052],"valid",[],"NV8"],[[4053,4056],"valid",[],"NV8"],[[4057,4058],"valid",[],"NV8"],[[4059,4095],"disallowed"],[[4096,4129],"valid"],[[4130,4130],"valid"],[[4131,4135],"valid"],[[4136,4136],"valid"],[[4137,4138],"valid"],[[4139,4139],"valid"],[[4140,4146],"valid"],[[4147,4149],"valid"],[[4150,4153],"valid"],[[4154,4159],"valid"],[[4160,4169],"valid"],[[4170,4175],"valid",[],"NV8"],[[4176,4185],"valid"],[[4186,4249],"valid"],[[4250,4253],"valid"],[[4254,4255],"valid",[],"NV8"],[[4256,4293],"disallowed"],[[4294,4294],"disallowed"],[[4295,4295],"mapped",[11559]],[[4296,4300],"disallowed"],[[4301,4301],"mapped",[11565]],[[4302,4303],"disallowed"],[[4304,4342],"valid"],[[4343,4344],"valid"],[[4345,4346],"valid"],[[4347,4347],"valid",[],"NV8"],[[4348,4348],"mapped",[4316]],[[4349,4351],"valid"],[[4352,4441],"valid",[],"NV8"],[[4442,4446],"valid",[],"NV8"],[[4447,4448],"disallowed"],[[4449,4514],"valid",[],"NV8"],[[4515,4519],"valid",[],"NV8"],[[4520,4601],"valid",[],"NV8"],[[4602,4607],"valid",[],"NV8"],[[4608,4614],"valid"],[[4615,4615],"valid"],[[4616,4678],"valid"],[[4679,4679],"valid"],[[4680,4680],"valid"],[[4681,4681],"disallowed"],[[4682,4685],"valid"],[[4686,4687],"disallowed"],[[4688,4694],"valid"],[[4695,4695],"disallowed"],[[4696,4696],"valid"],[[4697,4697],"disallowed"],[[4698,4701],"valid"],[[4702,4703],"disallowed"],[[4704,4742],"valid"],[[4743,4743],"valid"],[[4744,4744],"valid"],[[4745,4745],"disallowed"],[[4746,4749],"valid"],[[4750,4751],"disallowed"],[[4752,4782],"valid"],[[4783,4783],"valid"],[[4784,4784],"valid"],[[4785,4785],"disallowed"],[[4786,4789],"valid"],[[4790,4791],"disallowed"],[[4792,4798],"valid"],[[4799,4799],"disallowed"],[[4800,4800],"valid"],[[4801,4801],"disallowed"],[[4802,4805],"valid"],[[4806,4807],"disallowed"],[[4808,4814],"valid"],[[4815,4815],"valid"],[[4816,4822],"valid"],[[4823,4823],"disallowed"],[[4824,4846],"valid"],[[4847,4847],"valid"],[[4848,4878],"valid"],[[4879,4879],"valid"],[[4880,4880],"valid"],[[4881,4881],"disallowed"],[[4882,4885],"valid"],[[4886,4887],"disallowed"],[[4888,4894],"valid"],[[4895,4895],"valid"],[[4896,4934],"valid"],[[4935,4935],"valid"],[[4936,4954],"valid"],[[4955,4956],"disallowed"],[[4957,4958],"valid"],[[4959,4959],"valid"],[[4960,4960],"valid",[],"NV8"],[[4961,4988],"valid",[],"NV8"],[[4989,4991],"disallowed"],[[4992,5007],"valid"],[[5008,5017],"valid",[],"NV8"],[[5018,5023],"disallowed"],[[5024,5108],"valid"],[[5109,5109],"valid"],[[5110,5111],"disallowed"],[[5112,5112],"mapped",[5104]],[[5113,5113],"mapped",[5105]],[[5114,5114],"mapped",[5106]],[[5115,5115],"mapped",[5107]],[[5116,5116],"mapped",[5108]],[[5117,5117],"mapped",[5109]],[[5118,5119],"disallowed"],[[5120,5120],"valid",[],"NV8"],[[5121,5740],"valid"],[[5741,5742],"valid",[],"NV8"],[[5743,5750],"valid"],[[5751,5759],"valid"],[[5760,5760],"disallowed"],[[5761,5786],"valid"],[[5787,5788],"valid",[],"NV8"],[[5789,5791],"disallowed"],[[5792,5866],"valid"],[[5867,5872],"valid",[],"NV8"],[[5873,5880],"valid"],[[5881,5887],"disallowed"],[[5888,5900],"valid"],[[5901,5901],"disallowed"],[[5902,5908],"valid"],[[5909,5919],"disallowed"],[[5920,5940],"valid"],[[5941,5942],"valid",[],"NV8"],[[5943,5951],"disallowed"],[[5952,5971],"valid"],[[5972,5983],"disallowed"],[[5984,5996],"valid"],[[5997,5997],"disallowed"],[[5998,6000],"valid"],[[6001,6001],"disallowed"],[[6002,6003],"valid"],[[6004,6015],"disallowed"],[[6016,6067],"valid"],[[6068,6069],"disallowed"],[[6070,6099],"valid"],[[6100,6102],"valid",[],"NV8"],[[6103,6103],"valid"],[[6104,6107],"valid",[],"NV8"],[[6108,6108],"valid"],[[6109,6109],"valid"],[[6110,6111],"disallowed"],[[6112,6121],"valid"],[[6122,6127],"disallowed"],[[6128,6137],"valid",[],"NV8"],[[6138,6143],"disallowed"],[[6144,6149],"valid",[],"NV8"],[[6150,6150],"disallowed"],[[6151,6154],"valid",[],"NV8"],[[6155,6157],"ignored"],[[6158,6158],"disallowed"],[[6159,6159],"disallowed"],[[6160,6169],"valid"],[[6170,6175],"disallowed"],[[6176,6263],"valid"],[[6264,6271],"disallowed"],[[6272,6313],"valid"],[[6314,6314],"valid"],[[6315,6319],"disallowed"],[[6320,6389],"valid"],[[6390,6399],"disallowed"],[[6400,6428],"valid"],[[6429,6430],"valid"],[[6431,6431],"disallowed"],[[6432,6443],"valid"],[[6444,6447],"disallowed"],[[6448,6459],"valid"],[[6460,6463],"disallowed"],[[6464,6464],"valid",[],"NV8"],[[6465,6467],"disallowed"],[[6468,6469],"valid",[],"NV8"],[[6470,6509],"valid"],[[6510,6511],"disallowed"],[[6512,6516],"valid"],[[6517,6527],"disallowed"],[[6528,6569],"valid"],[[6570,6571],"valid"],[[6572,6575],"disallowed"],[[6576,6601],"valid"],[[6602,6607],"disallowed"],[[6608,6617],"valid"],[[6618,6618],"valid",[],"XV8"],[[6619,6621],"disallowed"],[[6622,6623],"valid",[],"NV8"],[[6624,6655],"valid",[],"NV8"],[[6656,6683],"valid"],[[6684,6685],"disallowed"],[[6686,6687],"valid",[],"NV8"],[[6688,6750],"valid"],[[6751,6751],"disallowed"],[[6752,6780],"valid"],[[6781,6782],"disallowed"],[[6783,6793],"valid"],[[6794,6799],"disallowed"],[[6800,6809],"valid"],[[6810,6815],"disallowed"],[[6816,6822],"valid",[],"NV8"],[[6823,6823],"valid"],[[6824,6829],"valid",[],"NV8"],[[6830,6831],"disallowed"],[[6832,6845],"valid"],[[6846,6846],"valid",[],"NV8"],[[6847,6911],"disallowed"],[[6912,6987],"valid"],[[6988,6991],"disallowed"],[[6992,7001],"valid"],[[7002,7018],"valid",[],"NV8"],[[7019,7027],"valid"],[[7028,7036],"valid",[],"NV8"],[[7037,7039],"disallowed"],[[7040,7082],"valid"],[[7083,7085],"valid"],[[7086,7097],"valid"],[[7098,7103],"valid"],[[7104,7155],"valid"],[[7156,7163],"disallowed"],[[7164,7167],"valid",[],"NV8"],[[7168,7223],"valid"],[[7224,7226],"disallowed"],[[7227,7231],"valid",[],"NV8"],[[7232,7241],"valid"],[[7242,7244],"disallowed"],[[7245,7293],"valid"],[[7294,7295],"valid",[],"NV8"],[[7296,7359],"disallowed"],[[7360,7367],"valid",[],"NV8"],[[7368,7375],"disallowed"],[[7376,7378],"valid"],[[7379,7379],"valid",[],"NV8"],[[7380,7410],"valid"],[[7411,7414],"valid"],[[7415,7415],"disallowed"],[[7416,7417],"valid"],[[7418,7423],"disallowed"],[[7424,7467],"valid"],[[7468,7468],"mapped",[97]],[[7469,7469],"mapped",[230]],[[7470,7470],"mapped",[98]],[[7471,7471],"valid"],[[7472,7472],"mapped",[100]],[[7473,7473],"mapped",[101]],[[7474,7474],"mapped",[477]],[[7475,7475],"mapped",[103]],[[7476,7476],"mapped",[104]],[[7477,7477],"mapped",[105]],[[7478,7478],"mapped",[106]],[[7479,7479],"mapped",[107]],[[7480,7480],"mapped",[108]],[[7481,7481],"mapped",[109]],[[7482,7482],"mapped",[110]],[[7483,7483],"valid"],[[7484,7484],"mapped",[111]],[[7485,7485],"mapped",[547]],[[7486,7486],"mapped",[112]],[[7487,7487],"mapped",[114]],[[7488,7488],"mapped",[116]],[[7489,7489],"mapped",[117]],[[7490,7490],"mapped",[119]],[[7491,7491],"mapped",[97]],[[7492,7492],"mapped",[592]],[[7493,7493],"mapped",[593]],[[7494,7494],"mapped",[7426]],[[7495,7495],"mapped",[98]],[[7496,7496],"mapped",[100]],[[7497,7497],"mapped",[101]],[[7498,7498],"mapped",[601]],[[7499,7499],"mapped",[603]],[[7500,7500],"mapped",[604]],[[7501,7501],"mapped",[103]],[[7502,7502],"valid"],[[7503,7503],"mapped",[107]],[[7504,7504],"mapped",[109]],[[7505,7505],"mapped",[331]],[[7506,7506],"mapped",[111]],[[7507,7507],"mapped",[596]],[[7508,7508],"mapped",[7446]],[[7509,7509],"mapped",[7447]],[[7510,7510],"mapped",[112]],[[7511,7511],"mapped",[116]],[[7512,7512],"mapped",[117]],[[7513,7513],"mapped",[7453]],[[7514,7514],"mapped",[623]],[[7515,7515],"mapped",[118]],[[7516,7516],"mapped",[7461]],[[7517,7517],"mapped",[946]],[[7518,7518],"mapped",[947]],[[7519,7519],"mapped",[948]],[[7520,7520],"mapped",[966]],[[7521,7521],"mapped",[967]],[[7522,7522],"mapped",[105]],[[7523,7523],"mapped",[114]],[[7524,7524],"mapped",[117]],[[7525,7525],"mapped",[118]],[[7526,7526],"mapped",[946]],[[7527,7527],"mapped",[947]],[[7528,7528],"mapped",[961]],[[7529,7529],"mapped",[966]],[[7530,7530],"mapped",[967]],[[7531,7531],"valid"],[[7532,7543],"valid"],[[7544,7544],"mapped",[1085]],[[7545,7578],"valid"],[[7579,7579],"mapped",[594]],[[7580,7580],"mapped",[99]],[[7581,7581],"mapped",[597]],[[7582,7582],"mapped",[240]],[[7583,7583],"mapped",[604]],[[7584,7584],"mapped",[102]],[[7585,7585],"mapped",[607]],[[7586,7586],"mapped",[609]],[[7587,7587],"mapped",[613]],[[7588,7588],"mapped",[616]],[[7589,7589],"mapped",[617]],[[7590,7590],"mapped",[618]],[[7591,7591],"mapped",[7547]],[[7592,7592],"mapped",[669]],[[7593,7593],"mapped",[621]],[[7594,7594],"mapped",[7557]],[[7595,7595],"mapped",[671]],[[7596,7596],"mapped",[625]],[[7597,7597],"mapped",[624]],[[7598,7598],"mapped",[626]],[[7599,7599],"mapped",[627]],[[7600,7600],"mapped",[628]],[[7601,7601],"mapped",[629]],[[7602,7602],"mapped",[632]],[[7603,7603],"mapped",[642]],[[7604,7604],"mapped",[643]],[[7605,7605],"mapped",[427]],[[7606,7606],"mapped",[649]],[[7607,7607],"mapped",[650]],[[7608,7608],"mapped",[7452]],[[7609,7609],"mapped",[651]],[[7610,7610],"mapped",[652]],[[7611,7611],"mapped",[122]],[[7612,7612],"mapped",[656]],[[7613,7613],"mapped",[657]],[[7614,7614],"mapped",[658]],[[7615,7615],"mapped",[952]],[[7616,7619],"valid"],[[7620,7626],"valid"],[[7627,7654],"valid"],[[7655,7669],"valid"],[[7670,7675],"disallowed"],[[7676,7676],"valid"],[[7677,7677],"valid"],[[7678,7679],"valid"],[[7680,7680],"mapped",[7681]],[[7681,7681],"valid"],[[7682,7682],"mapped",[7683]],[[7683,7683],"valid"],[[7684,7684],"mapped",[7685]],[[7685,7685],"valid"],[[7686,7686],"mapped",[7687]],[[7687,7687],"valid"],[[7688,7688],"mapped",[7689]],[[7689,7689],"valid"],[[7690,7690],"mapped",[7691]],[[7691,7691],"valid"],[[7692,7692],"mapped",[7693]],[[7693,7693],"valid"],[[7694,7694],"mapped",[7695]],[[7695,7695],"valid"],[[7696,7696],"mapped",[7697]],[[7697,7697],"valid"],[[7698,7698],"mapped",[7699]],[[7699,7699],"valid"],[[7700,7700],"mapped",[7701]],[[7701,7701],"valid"],[[7702,7702],"mapped",[7703]],[[7703,7703],"valid"],[[7704,7704],"mapped",[7705]],[[7705,7705],"valid"],[[7706,7706],"mapped",[7707]],[[7707,7707],"valid"],[[7708,7708],"mapped",[7709]],[[7709,7709],"valid"],[[7710,7710],"mapped",[7711]],[[7711,7711],"valid"],[[7712,7712],"mapped",[7713]],[[7713,7713],"valid"],[[7714,7714],"mapped",[7715]],[[7715,7715],"valid"],[[7716,7716],"mapped",[7717]],[[7717,7717],"valid"],[[7718,7718],"mapped",[7719]],[[7719,7719],"valid"],[[7720,7720],"mapped",[7721]],[[7721,7721],"valid"],[[7722,7722],"mapped",[7723]],[[7723,7723],"valid"],[[7724,7724],"mapped",[7725]],[[7725,7725],"valid"],[[7726,7726],"mapped",[7727]],[[7727,7727],"valid"],[[7728,7728],"mapped",[7729]],[[7729,7729],"valid"],[[7730,7730],"mapped",[7731]],[[7731,7731],"valid"],[[7732,7732],"mapped",[7733]],[[7733,7733],"valid"],[[7734,7734],"mapped",[7735]],[[7735,7735],"valid"],[[7736,7736],"mapped",[7737]],[[7737,7737],"valid"],[[7738,7738],"mapped",[7739]],[[7739,7739],"valid"],[[7740,7740],"mapped",[7741]],[[7741,7741],"valid"],[[7742,7742],"mapped",[7743]],[[7743,7743],"valid"],[[7744,7744],"mapped",[7745]],[[7745,7745],"valid"],[[7746,7746],"mapped",[7747]],[[7747,7747],"valid"],[[7748,7748],"mapped",[7749]],[[7749,7749],"valid"],[[7750,7750],"mapped",[7751]],[[7751,7751],"valid"],[[7752,7752],"mapped",[7753]],[[7753,7753],"valid"],[[7754,7754],"mapped",[7755]],[[7755,7755],"valid"],[[7756,7756],"mapped",[7757]],[[7757,7757],"valid"],[[7758,7758],"mapped",[7759]],[[7759,7759],"valid"],[[7760,7760],"mapped",[7761]],[[7761,7761],"valid"],[[7762,7762],"mapped",[7763]],[[7763,7763],"valid"],[[7764,7764],"mapped",[7765]],[[7765,7765],"valid"],[[7766,7766],"mapped",[7767]],[[7767,7767],"valid"],[[7768,7768],"mapped",[7769]],[[7769,7769],"valid"],[[7770,7770],"mapped",[7771]],[[7771,7771],"valid"],[[7772,7772],"mapped",[7773]],[[7773,7773],"valid"],[[7774,7774],"mapped",[7775]],[[7775,7775],"valid"],[[7776,7776],"mapped",[7777]],[[7777,7777],"valid"],[[7778,7778],"mapped",[7779]],[[7779,7779],"valid"],[[7780,7780],"mapped",[7781]],[[7781,7781],"valid"],[[7782,7782],"mapped",[7783]],[[7783,7783],"valid"],[[7784,7784],"mapped",[7785]],[[7785,7785],"valid"],[[7786,7786],"mapped",[7787]],[[7787,7787],"valid"],[[7788,7788],"mapped",[7789]],[[7789,7789],"valid"],[[7790,7790],"mapped",[7791]],[[7791,7791],"valid"],[[7792,7792],"mapped",[7793]],[[7793,7793],"valid"],[[7794,7794],"mapped",[7795]],[[7795,7795],"valid"],[[7796,7796],"mapped",[7797]],[[7797,7797],"valid"],[[7798,7798],"mapped",[7799]],[[7799,7799],"valid"],[[7800,7800],"mapped",[7801]],[[7801,7801],"valid"],[[7802,7802],"mapped",[7803]],[[7803,7803],"valid"],[[7804,7804],"mapped",[7805]],[[7805,7805],"valid"],[[7806,7806],"mapped",[7807]],[[7807,7807],"valid"],[[7808,7808],"mapped",[7809]],[[7809,7809],"valid"],[[7810,7810],"mapped",[7811]],[[7811,7811],"valid"],[[7812,7812],"mapped",[7813]],[[7813,7813],"valid"],[[7814,7814],"mapped",[7815]],[[7815,7815],"valid"],[[7816,7816],"mapped",[7817]],[[7817,7817],"valid"],[[7818,7818],"mapped",[7819]],[[7819,7819],"valid"],[[7820,7820],"mapped",[7821]],[[7821,7821],"valid"],[[7822,7822],"mapped",[7823]],[[7823,7823],"valid"],[[7824,7824],"mapped",[7825]],[[7825,7825],"valid"],[[7826,7826],"mapped",[7827]],[[7827,7827],"valid"],[[7828,7828],"mapped",[7829]],[[7829,7833],"valid"],[[7834,7834],"mapped",[97,702]],[[7835,7835],"mapped",[7777]],[[7836,7837],"valid"],[[7838,7838],"mapped",[115,115]],[[7839,7839],"valid"],[[7840,7840],"mapped",[7841]],[[7841,7841],"valid"],[[7842,7842],"mapped",[7843]],[[7843,7843],"valid"],[[7844,7844],"mapped",[7845]],[[7845,7845],"valid"],[[7846,7846],"mapped",[7847]],[[7847,7847],"valid"],[[7848,7848],"mapped",[7849]],[[7849,7849],"valid"],[[7850,7850],"mapped",[7851]],[[7851,7851],"valid"],[[7852,7852],"mapped",[7853]],[[7853,7853],"valid"],[[7854,7854],"mapped",[7855]],[[7855,7855],"valid"],[[7856,7856],"mapped",[7857]],[[7857,7857],"valid"],[[7858,7858],"mapped",[7859]],[[7859,7859],"valid"],[[7860,7860],"mapped",[7861]],[[7861,7861],"valid"],[[7862,7862],"mapped",[7863]],[[7863,7863],"valid"],[[7864,7864],"mapped",[7865]],[[7865,7865],"valid"],[[7866,7866],"mapped",[7867]],[[7867,7867],"valid"],[[7868,7868],"mapped",[7869]],[[7869,7869],"valid"],[[7870,7870],"mapped",[7871]],[[7871,7871],"valid"],[[7872,7872],"mapped",[7873]],[[7873,7873],"valid"],[[7874,7874],"mapped",[7875]],[[7875,7875],"valid"],[[7876,7876],"mapped",[7877]],[[7877,7877],"valid"],[[7878,7878],"mapped",[7879]],[[7879,7879],"valid"],[[7880,7880],"mapped",[7881]],[[7881,7881],"valid"],[[7882,7882],"mapped",[7883]],[[7883,7883],"valid"],[[7884,7884],"mapped",[7885]],[[7885,7885],"valid"],[[7886,7886],"mapped",[7887]],[[7887,7887],"valid"],[[7888,7888],"mapped",[7889]],[[7889,7889],"valid"],[[7890,7890],"mapped",[7891]],[[7891,7891],"valid"],[[7892,7892],"mapped",[7893]],[[7893,7893],"valid"],[[7894,7894],"mapped",[7895]],[[7895,7895],"valid"],[[7896,7896],"mapped",[7897]],[[7897,7897],"valid"],[[7898,7898],"mapped",[7899]],[[7899,7899],"valid"],[[7900,7900],"mapped",[7901]],[[7901,7901],"valid"],[[7902,7902],"mapped",[7903]],[[7903,7903],"valid"],[[7904,7904],"mapped",[7905]],[[7905,7905],"valid"],[[7906,7906],"mapped",[7907]],[[7907,7907],"valid"],[[7908,7908],"mapped",[7909]],[[7909,7909],"valid"],[[7910,7910],"mapped",[7911]],[[7911,7911],"valid"],[[7912,7912],"mapped",[7913]],[[7913,7913],"valid"],[[7914,7914],"mapped",[7915]],[[7915,7915],"valid"],[[7916,7916],"mapped",[7917]],[[7917,7917],"valid"],[[7918,7918],"mapped",[7919]],[[7919,7919],"valid"],[[7920,7920],"mapped",[7921]],[[7921,7921],"valid"],[[7922,7922],"mapped",[7923]],[[7923,7923],"valid"],[[7924,7924],"mapped",[7925]],[[7925,7925],"valid"],[[7926,7926],"mapped",[7927]],[[7927,7927],"valid"],[[7928,7928],"mapped",[7929]],[[7929,7929],"valid"],[[7930,7930],"mapped",[7931]],[[7931,7931],"valid"],[[7932,7932],"mapped",[7933]],[[7933,7933],"valid"],[[7934,7934],"mapped",[7935]],[[7935,7935],"valid"],[[7936,7943],"valid"],[[7944,7944],"mapped",[7936]],[[7945,7945],"mapped",[7937]],[[7946,7946],"mapped",[7938]],[[7947,7947],"mapped",[7939]],[[7948,7948],"mapped",[7940]],[[7949,7949],"mapped",[7941]],[[7950,7950],"mapped",[7942]],[[7951,7951],"mapped",[7943]],[[7952,7957],"valid"],[[7958,7959],"disallowed"],[[7960,7960],"mapped",[7952]],[[7961,7961],"mapped",[7953]],[[7962,7962],"mapped",[7954]],[[7963,7963],"mapped",[7955]],[[7964,7964],"mapped",[7956]],[[7965,7965],"mapped",[7957]],[[7966,7967],"disallowed"],[[7968,7975],"valid"],[[7976,7976],"mapped",[7968]],[[7977,7977],"mapped",[7969]],[[7978,7978],"mapped",[7970]],[[7979,7979],"mapped",[7971]],[[7980,7980],"mapped",[7972]],[[7981,7981],"mapped",[7973]],[[7982,7982],"mapped",[7974]],[[7983,7983],"mapped",[7975]],[[7984,7991],"valid"],[[7992,7992],"mapped",[7984]],[[7993,7993],"mapped",[7985]],[[7994,7994],"mapped",[7986]],[[7995,7995],"mapped",[7987]],[[7996,7996],"mapped",[7988]],[[7997,7997],"mapped",[7989]],[[7998,7998],"mapped",[7990]],[[7999,7999],"mapped",[7991]],[[8000,8005],"valid"],[[8006,8007],"disallowed"],[[8008,8008],"mapped",[8000]],[[8009,8009],"mapped",[8001]],[[8010,8010],"mapped",[8002]],[[8011,8011],"mapped",[8003]],[[8012,8012],"mapped",[8004]],[[8013,8013],"mapped",[8005]],[[8014,8015],"disallowed"],[[8016,8023],"valid"],[[8024,8024],"disallowed"],[[8025,8025],"mapped",[8017]],[[8026,8026],"disallowed"],[[8027,8027],"mapped",[8019]],[[8028,8028],"disallowed"],[[8029,8029],"mapped",[8021]],[[8030,8030],"disallowed"],[[8031,8031],"mapped",[8023]],[[8032,8039],"valid"],[[8040,8040],"mapped",[8032]],[[8041,8041],"mapped",[8033]],[[8042,8042],"mapped",[8034]],[[8043,8043],"mapped",[8035]],[[8044,8044],"mapped",[8036]],[[8045,8045],"mapped",[8037]],[[8046,8046],"mapped",[8038]],[[8047,8047],"mapped",[8039]],[[8048,8048],"valid"],[[8049,8049],"mapped",[940]],[[8050,8050],"valid"],[[8051,8051],"mapped",[941]],[[8052,8052],"valid"],[[8053,8053],"mapped",[942]],[[8054,8054],"valid"],[[8055,8055],"mapped",[943]],[[8056,8056],"valid"],[[8057,8057],"mapped",[972]],[[8058,8058],"valid"],[[8059,8059],"mapped",[973]],[[8060,8060],"valid"],[[8061,8061],"mapped",[974]],[[8062,8063],"disallowed"],[[8064,8064],"mapped",[7936,953]],[[8065,8065],"mapped",[7937,953]],[[8066,8066],"mapped",[7938,953]],[[8067,8067],"mapped",[7939,953]],[[8068,8068],"mapped",[7940,953]],[[8069,8069],"mapped",[7941,953]],[[8070,8070],"mapped",[7942,953]],[[8071,8071],"mapped",[7943,953]],[[8072,8072],"mapped",[7936,953]],[[8073,8073],"mapped",[7937,953]],[[8074,8074],"mapped",[7938,953]],[[8075,8075],"mapped",[7939,953]],[[8076,8076],"mapped",[7940,953]],[[8077,8077],"mapped",[7941,953]],[[8078,8078],"mapped",[7942,953]],[[8079,8079],"mapped",[7943,953]],[[8080,8080],"mapped",[7968,953]],[[8081,8081],"mapped",[7969,953]],[[8082,8082],"mapped",[7970,953]],[[8083,8083],"mapped",[7971,953]],[[8084,8084],"mapped",[7972,953]],[[8085,8085],"mapped",[7973,953]],[[8086,8086],"mapped",[7974,953]],[[8087,8087],"mapped",[7975,953]],[[8088,8088],"mapped",[7968,953]],[[8089,8089],"mapped",[7969,953]],[[8090,8090],"mapped",[7970,953]],[[8091,8091],"mapped",[7971,953]],[[8092,8092],"mapped",[7972,953]],[[8093,8093],"mapped",[7973,953]],[[8094,8094],"mapped",[7974,953]],[[8095,8095],"mapped",[7975,953]],[[8096,8096],"mapped",[8032,953]],[[8097,8097],"mapped",[8033,953]],[[8098,8098],"mapped",[8034,953]],[[8099,8099],"mapped",[8035,953]],[[8100,8100],"mapped",[8036,953]],[[8101,8101],"mapped",[8037,953]],[[8102,8102],"mapped",[8038,953]],[[8103,8103],"mapped",[8039,953]],[[8104,8104],"mapped",[8032,953]],[[8105,8105],"mapped",[8033,953]],[[8106,8106],"mapped",[8034,953]],[[8107,8107],"mapped",[8035,953]],[[8108,8108],"mapped",[8036,953]],[[8109,8109],"mapped",[8037,953]],[[8110,8110],"mapped",[8038,953]],[[8111,8111],"mapped",[8039,953]],[[8112,8113],"valid"],[[8114,8114],"mapped",[8048,953]],[[8115,8115],"mapped",[945,953]],[[8116,8116],"mapped",[940,953]],[[8117,8117],"disallowed"],[[8118,8118],"valid"],[[8119,8119],"mapped",[8118,953]],[[8120,8120],"mapped",[8112]],[[8121,8121],"mapped",[8113]],[[8122,8122],"mapped",[8048]],[[8123,8123],"mapped",[940]],[[8124,8124],"mapped",[945,953]],[[8125,8125],"disallowed_STD3_mapped",[32,787]],[[8126,8126],"mapped",[953]],[[8127,8127],"disallowed_STD3_mapped",[32,787]],[[8128,8128],"disallowed_STD3_mapped",[32,834]],[[8129,8129],"disallowed_STD3_mapped",[32,776,834]],[[8130,8130],"mapped",[8052,953]],[[8131,8131],"mapped",[951,953]],[[8132,8132],"mapped",[942,953]],[[8133,8133],"disallowed"],[[8134,8134],"valid"],[[8135,8135],"mapped",[8134,953]],[[8136,8136],"mapped",[8050]],[[8137,8137],"mapped",[941]],[[8138,8138],"mapped",[8052]],[[8139,8139],"mapped",[942]],[[8140,8140],"mapped",[951,953]],[[8141,8141],"disallowed_STD3_mapped",[32,787,768]],[[8142,8142],"disallowed_STD3_mapped",[32,787,769]],[[8143,8143],"disallowed_STD3_mapped",[32,787,834]],[[8144,8146],"valid"],[[8147,8147],"mapped",[912]],[[8148,8149],"disallowed"],[[8150,8151],"valid"],[[8152,8152],"mapped",[8144]],[[8153,8153],"mapped",[8145]],[[8154,8154],"mapped",[8054]],[[8155,8155],"mapped",[943]],[[8156,8156],"disallowed"],[[8157,8157],"disallowed_STD3_mapped",[32,788,768]],[[8158,8158],"disallowed_STD3_mapped",[32,788,769]],[[8159,8159],"disallowed_STD3_mapped",[32,788,834]],[[8160,8162],"valid"],[[8163,8163],"mapped",[944]],[[8164,8167],"valid"],[[8168,8168],"mapped",[8160]],[[8169,8169],"mapped",[8161]],[[8170,8170],"mapped",[8058]],[[8171,8171],"mapped",[973]],[[8172,8172],"mapped",[8165]],[[8173,8173],"disallowed_STD3_mapped",[32,776,768]],[[8174,8174],"disallowed_STD3_mapped",[32,776,769]],[[8175,8175],"disallowed_STD3_mapped",[96]],[[8176,8177],"disallowed"],[[8178,8178],"mapped",[8060,953]],[[8179,8179],"mapped",[969,953]],[[8180,8180],"mapped",[974,953]],[[8181,8181],"disallowed"],[[8182,8182],"valid"],[[8183,8183],"mapped",[8182,953]],[[8184,8184],"mapped",[8056]],[[8185,8185],"mapped",[972]],[[8186,8186],"mapped",[8060]],[[8187,8187],"mapped",[974]],[[8188,8188],"mapped",[969,953]],[[8189,8189],"disallowed_STD3_mapped",[32,769]],[[8190,8190],"disallowed_STD3_mapped",[32,788]],[[8191,8191],"disallowed"],[[8192,8202],"disallowed_STD3_mapped",[32]],[[8203,8203],"ignored"],[[8204,8205],"deviation",[]],[[8206,8207],"disallowed"],[[8208,8208],"valid",[],"NV8"],[[8209,8209],"mapped",[8208]],[[8210,8214],"valid",[],"NV8"],[[8215,8215],"disallowed_STD3_mapped",[32,819]],[[8216,8227],"valid",[],"NV8"],[[8228,8230],"disallowed"],[[8231,8231],"valid",[],"NV8"],[[8232,8238],"disallowed"],[[8239,8239],"disallowed_STD3_mapped",[32]],[[8240,8242],"valid",[],"NV8"],[[8243,8243],"mapped",[8242,8242]],[[8244,8244],"mapped",[8242,8242,8242]],[[8245,8245],"valid",[],"NV8"],[[8246,8246],"mapped",[8245,8245]],[[8247,8247],"mapped",[8245,8245,8245]],[[8248,8251],"valid",[],"NV8"],[[8252,8252],"disallowed_STD3_mapped",[33,33]],[[8253,8253],"valid",[],"NV8"],[[8254,8254],"disallowed_STD3_mapped",[32,773]],[[8255,8262],"valid",[],"NV8"],[[8263,8263],"disallowed_STD3_mapped",[63,63]],[[8264,8264],"disallowed_STD3_mapped",[63,33]],[[8265,8265],"disallowed_STD3_mapped",[33,63]],[[8266,8269],"valid",[],"NV8"],[[8270,8274],"valid",[],"NV8"],[[8275,8276],"valid",[],"NV8"],[[8277,8278],"valid",[],"NV8"],[[8279,8279],"mapped",[8242,8242,8242,8242]],[[8280,8286],"valid",[],"NV8"],[[8287,8287],"disallowed_STD3_mapped",[32]],[[8288,8288],"ignored"],[[8289,8291],"disallowed"],[[8292,8292],"ignored"],[[8293,8293],"disallowed"],[[8294,8297],"disallowed"],[[8298,8303],"disallowed"],[[8304,8304],"mapped",[48]],[[8305,8305],"mapped",[105]],[[8306,8307],"disallowed"],[[8308,8308],"mapped",[52]],[[8309,8309],"mapped",[53]],[[8310,8310],"mapped",[54]],[[8311,8311],"mapped",[55]],[[8312,8312],"mapped",[56]],[[8313,8313],"mapped",[57]],[[8314,8314],"disallowed_STD3_mapped",[43]],[[8315,8315],"mapped",[8722]],[[8316,8316],"disallowed_STD3_mapped",[61]],[[8317,8317],"disallowed_STD3_mapped",[40]],[[8318,8318],"disallowed_STD3_mapped",[41]],[[8319,8319],"mapped",[110]],[[8320,8320],"mapped",[48]],[[8321,8321],"mapped",[49]],[[8322,8322],"mapped",[50]],[[8323,8323],"mapped",[51]],[[8324,8324],"mapped",[52]],[[8325,8325],"mapped",[53]],[[8326,8326],"mapped",[54]],[[8327,8327],"mapped",[55]],[[8328,8328],"mapped",[56]],[[8329,8329],"mapped",[57]],[[8330,8330],"disallowed_STD3_mapped",[43]],[[8331,8331],"mapped",[8722]],[[8332,8332],"disallowed_STD3_mapped",[61]],[[8333,8333],"disallowed_STD3_mapped",[40]],[[8334,8334],"disallowed_STD3_mapped",[41]],[[8335,8335],"disallowed"],[[8336,8336],"mapped",[97]],[[8337,8337],"mapped",[101]],[[8338,8338],"mapped",[111]],[[8339,8339],"mapped",[120]],[[8340,8340],"mapped",[601]],[[8341,8341],"mapped",[104]],[[8342,8342],"mapped",[107]],[[8343,8343],"mapped",[108]],[[8344,8344],"mapped",[109]],[[8345,8345],"mapped",[110]],[[8346,8346],"mapped",[112]],[[8347,8347],"mapped",[115]],[[8348,8348],"mapped",[116]],[[8349,8351],"disallowed"],[[8352,8359],"valid",[],"NV8"],[[8360,8360],"mapped",[114,115]],[[8361,8362],"valid",[],"NV8"],[[8363,8363],"valid",[],"NV8"],[[8364,8364],"valid",[],"NV8"],[[8365,8367],"valid",[],"NV8"],[[8368,8369],"valid",[],"NV8"],[[8370,8373],"valid",[],"NV8"],[[8374,8376],"valid",[],"NV8"],[[8377,8377],"valid",[],"NV8"],[[8378,8378],"valid",[],"NV8"],[[8379,8381],"valid",[],"NV8"],[[8382,8382],"valid",[],"NV8"],[[8383,8399],"disallowed"],[[8400,8417],"valid",[],"NV8"],[[8418,8419],"valid",[],"NV8"],[[8420,8426],"valid",[],"NV8"],[[8427,8427],"valid",[],"NV8"],[[8428,8431],"valid",[],"NV8"],[[8432,8432],"valid",[],"NV8"],[[8433,8447],"disallowed"],[[8448,8448],"disallowed_STD3_mapped",[97,47,99]],[[8449,8449],"disallowed_STD3_mapped",[97,47,115]],[[8450,8450],"mapped",[99]],[[8451,8451],"mapped",[176,99]],[[8452,8452],"valid",[],"NV8"],[[8453,8453],"disallowed_STD3_mapped",[99,47,111]],[[8454,8454],"disallowed_STD3_mapped",[99,47,117]],[[8455,8455],"mapped",[603]],[[8456,8456],"valid",[],"NV8"],[[8457,8457],"mapped",[176,102]],[[8458,8458],"mapped",[103]],[[8459,8462],"mapped",[104]],[[8463,8463],"mapped",[295]],[[8464,8465],"mapped",[105]],[[8466,8467],"mapped",[108]],[[8468,8468],"valid",[],"NV8"],[[8469,8469],"mapped",[110]],[[8470,8470],"mapped",[110,111]],[[8471,8472],"valid",[],"NV8"],[[8473,8473],"mapped",[112]],[[8474,8474],"mapped",[113]],[[8475,8477],"mapped",[114]],[[8478,8479],"valid",[],"NV8"],[[8480,8480],"mapped",[115,109]],[[8481,8481],"mapped",[116,101,108]],[[8482,8482],"mapped",[116,109]],[[8483,8483],"valid",[],"NV8"],[[8484,8484],"mapped",[122]],[[8485,8485],"valid",[],"NV8"],[[8486,8486],"mapped",[969]],[[8487,8487],"valid",[],"NV8"],[[8488,8488],"mapped",[122]],[[8489,8489],"valid",[],"NV8"],[[8490,8490],"mapped",[107]],[[8491,8491],"mapped",[229]],[[8492,8492],"mapped",[98]],[[8493,8493],"mapped",[99]],[[8494,8494],"valid",[],"NV8"],[[8495,8496],"mapped",[101]],[[8497,8497],"mapped",[102]],[[8498,8498],"disallowed"],[[8499,8499],"mapped",[109]],[[8500,8500],"mapped",[111]],[[8501,8501],"mapped",[1488]],[[8502,8502],"mapped",[1489]],[[8503,8503],"mapped",[1490]],[[8504,8504],"mapped",[1491]],[[8505,8505],"mapped",[105]],[[8506,8506],"valid",[],"NV8"],[[8507,8507],"mapped",[102,97,120]],[[8508,8508],"mapped",[960]],[[8509,8510],"mapped",[947]],[[8511,8511],"mapped",[960]],[[8512,8512],"mapped",[8721]],[[8513,8516],"valid",[],"NV8"],[[8517,8518],"mapped",[100]],[[8519,8519],"mapped",[101]],[[8520,8520],"mapped",[105]],[[8521,8521],"mapped",[106]],[[8522,8523],"valid",[],"NV8"],[[8524,8524],"valid",[],"NV8"],[[8525,8525],"valid",[],"NV8"],[[8526,8526],"valid"],[[8527,8527],"valid",[],"NV8"],[[8528,8528],"mapped",[49,8260,55]],[[8529,8529],"mapped",[49,8260,57]],[[8530,8530],"mapped",[49,8260,49,48]],[[8531,8531],"mapped",[49,8260,51]],[[8532,8532],"mapped",[50,8260,51]],[[8533,8533],"mapped",[49,8260,53]],[[8534,8534],"mapped",[50,8260,53]],[[8535,8535],"mapped",[51,8260,53]],[[8536,8536],"mapped",[52,8260,53]],[[8537,8537],"mapped",[49,8260,54]],[[8538,8538],"mapped",[53,8260,54]],[[8539,8539],"mapped",[49,8260,56]],[[8540,8540],"mapped",[51,8260,56]],[[8541,8541],"mapped",[53,8260,56]],[[8542,8542],"mapped",[55,8260,56]],[[8543,8543],"mapped",[49,8260]],[[8544,8544],"mapped",[105]],[[8545,8545],"mapped",[105,105]],[[8546,8546],"mapped",[105,105,105]],[[8547,8547],"mapped",[105,118]],[[8548,8548],"mapped",[118]],[[8549,8549],"mapped",[118,105]],[[8550,8550],"mapped",[118,105,105]],[[8551,8551],"mapped",[118,105,105,105]],[[8552,8552],"mapped",[105,120]],[[8553,8553],"mapped",[120]],[[8554,8554],"mapped",[120,105]],[[8555,8555],"mapped",[120,105,105]],[[8556,8556],"mapped",[108]],[[8557,8557],"mapped",[99]],[[8558,8558],"mapped",[100]],[[8559,8559],"mapped",[109]],[[8560,8560],"mapped",[105]],[[8561,8561],"mapped",[105,105]],[[8562,8562],"mapped",[105,105,105]],[[8563,8563],"mapped",[105,118]],[[8564,8564],"mapped",[118]],[[8565,8565],"mapped",[118,105]],[[8566,8566],"mapped",[118,105,105]],[[8567,8567],"mapped",[118,105,105,105]],[[8568,8568],"mapped",[105,120]],[[8569,8569],"mapped",[120]],[[8570,8570],"mapped",[120,105]],[[8571,8571],"mapped",[120,105,105]],[[8572,8572],"mapped",[108]],[[8573,8573],"mapped",[99]],[[8574,8574],"mapped",[100]],[[8575,8575],"mapped",[109]],[[8576,8578],"valid",[],"NV8"],[[8579,8579],"disallowed"],[[8580,8580],"valid"],[[8581,8584],"valid",[],"NV8"],[[8585,8585],"mapped",[48,8260,51]],[[8586,8587],"valid",[],"NV8"],[[8588,8591],"disallowed"],[[8592,8682],"valid",[],"NV8"],[[8683,8691],"valid",[],"NV8"],[[8692,8703],"valid",[],"NV8"],[[8704,8747],"valid",[],"NV8"],[[8748,8748],"mapped",[8747,8747]],[[8749,8749],"mapped",[8747,8747,8747]],[[8750,8750],"valid",[],"NV8"],[[8751,8751],"mapped",[8750,8750]],[[8752,8752],"mapped",[8750,8750,8750]],[[8753,8799],"valid",[],"NV8"],[[8800,8800],"disallowed_STD3_valid"],[[8801,8813],"valid",[],"NV8"],[[8814,8815],"disallowed_STD3_valid"],[[8816,8945],"valid",[],"NV8"],[[8946,8959],"valid",[],"NV8"],[[8960,8960],"valid",[],"NV8"],[[8961,8961],"valid",[],"NV8"],[[8962,9000],"valid",[],"NV8"],[[9001,9001],"mapped",[12296]],[[9002,9002],"mapped",[12297]],[[9003,9082],"valid",[],"NV8"],[[9083,9083],"valid",[],"NV8"],[[9084,9084],"valid",[],"NV8"],[[9085,9114],"valid",[],"NV8"],[[9115,9166],"valid",[],"NV8"],[[9167,9168],"valid",[],"NV8"],[[9169,9179],"valid",[],"NV8"],[[9180,9191],"valid",[],"NV8"],[[9192,9192],"valid",[],"NV8"],[[9193,9203],"valid",[],"NV8"],[[9204,9210],"valid",[],"NV8"],[[9211,9215],"disallowed"],[[9216,9252],"valid",[],"NV8"],[[9253,9254],"valid",[],"NV8"],[[9255,9279],"disallowed"],[[9280,9290],"valid",[],"NV8"],[[9291,9311],"disallowed"],[[9312,9312],"mapped",[49]],[[9313,9313],"mapped",[50]],[[9314,9314],"mapped",[51]],[[9315,9315],"mapped",[52]],[[9316,9316],"mapped",[53]],[[9317,9317],"mapped",[54]],[[9318,9318],"mapped",[55]],[[9319,9319],"mapped",[56]],[[9320,9320],"mapped",[57]],[[9321,9321],"mapped",[49,48]],[[9322,9322],"mapped",[49,49]],[[9323,9323],"mapped",[49,50]],[[9324,9324],"mapped",[49,51]],[[9325,9325],"mapped",[49,52]],[[9326,9326],"mapped",[49,53]],[[9327,9327],"mapped",[49,54]],[[9328,9328],"mapped",[49,55]],[[9329,9329],"mapped",[49,56]],[[9330,9330],"mapped",[49,57]],[[9331,9331],"mapped",[50,48]],[[9332,9332],"disallowed_STD3_mapped",[40,49,41]],[[9333,9333],"disallowed_STD3_mapped",[40,50,41]],[[9334,9334],"disallowed_STD3_mapped",[40,51,41]],[[9335,9335],"disallowed_STD3_mapped",[40,52,41]],[[9336,9336],"disallowed_STD3_mapped",[40,53,41]],[[9337,9337],"disallowed_STD3_mapped",[40,54,41]],[[9338,9338],"disallowed_STD3_mapped",[40,55,41]],[[9339,9339],"disallowed_STD3_mapped",[40,56,41]],[[9340,9340],"disallowed_STD3_mapped",[40,57,41]],[[9341,9341],"disallowed_STD3_mapped",[40,49,48,41]],[[9342,9342],"disallowed_STD3_mapped",[40,49,49,41]],[[9343,9343],"disallowed_STD3_mapped",[40,49,50,41]],[[9344,9344],"disallowed_STD3_mapped",[40,49,51,41]],[[9345,9345],"disallowed_STD3_mapped",[40,49,52,41]],[[9346,9346],"disallowed_STD3_mapped",[40,49,53,41]],[[9347,9347],"disallowed_STD3_mapped",[40,49,54,41]],[[9348,9348],"disallowed_STD3_mapped",[40,49,55,41]],[[9349,9349],"disallowed_STD3_mapped",[40,49,56,41]],[[9350,9350],"disallowed_STD3_mapped",[40,49,57,41]],[[9351,9351],"disallowed_STD3_mapped",[40,50,48,41]],[[9352,9371],"disallowed"],[[9372,9372],"disallowed_STD3_mapped",[40,97,41]],[[9373,9373],"disallowed_STD3_mapped",[40,98,41]],[[9374,9374],"disallowed_STD3_mapped",[40,99,41]],[[9375,9375],"disallowed_STD3_mapped",[40,100,41]],[[9376,9376],"disallowed_STD3_mapped",[40,101,41]],[[9377,9377],"disallowed_STD3_mapped",[40,102,41]],[[9378,9378],"disallowed_STD3_mapped",[40,103,41]],[[9379,9379],"disallowed_STD3_mapped",[40,104,41]],[[9380,9380],"disallowed_STD3_mapped",[40,105,41]],[[9381,9381],"disallowed_STD3_mapped",[40,106,41]],[[9382,9382],"disallowed_STD3_mapped",[40,107,41]],[[9383,9383],"disallowed_STD3_mapped",[40,108,41]],[[9384,9384],"disallowed_STD3_mapped",[40,109,41]],[[9385,9385],"disallowed_STD3_mapped",[40,110,41]],[[9386,9386],"disallowed_STD3_mapped",[40,111,41]],[[9387,9387],"disallowed_STD3_mapped",[40,112,41]],[[9388,9388],"disallowed_STD3_mapped",[40,113,41]],[[9389,9389],"disallowed_STD3_mapped",[40,114,41]],[[9390,9390],"disallowed_STD3_mapped",[40,115,41]],[[9391,9391],"disallowed_STD3_mapped",[40,116,41]],[[9392,9392],"disallowed_STD3_mapped",[40,117,41]],[[9393,9393],"disallowed_STD3_mapped",[40,118,41]],[[9394,9394],"disallowed_STD3_mapped",[40,119,41]],[[9395,9395],"disallowed_STD3_mapped",[40,120,41]],[[9396,9396],"disallowed_STD3_mapped",[40,121,41]],[[9397,9397],"disallowed_STD3_mapped",[40,122,41]],[[9398,9398],"mapped",[97]],[[9399,9399],"mapped",[98]],[[9400,9400],"mapped",[99]],[[9401,9401],"mapped",[100]],[[9402,9402],"mapped",[101]],[[9403,9403],"mapped",[102]],[[9404,9404],"mapped",[103]],[[9405,9405],"mapped",[104]],[[9406,9406],"mapped",[105]],[[9407,9407],"mapped",[106]],[[9408,9408],"mapped",[107]],[[9409,9409],"mapped",[108]],[[9410,9410],"mapped",[109]],[[9411,9411],"mapped",[110]],[[9412,9412],"mapped",[111]],[[9413,9413],"mapped",[112]],[[9414,9414],"mapped",[113]],[[9415,9415],"mapped",[114]],[[9416,9416],"mapped",[115]],[[9417,9417],"mapped",[116]],[[9418,9418],"mapped",[117]],[[9419,9419],"mapped",[118]],[[9420,9420],"mapped",[119]],[[9421,9421],"mapped",[120]],[[9422,9422],"mapped",[121]],[[9423,9423],"mapped",[122]],[[9424,9424],"mapped",[97]],[[9425,9425],"mapped",[98]],[[9426,9426],"mapped",[99]],[[9427,9427],"mapped",[100]],[[9428,9428],"mapped",[101]],[[9429,9429],"mapped",[102]],[[9430,9430],"mapped",[103]],[[9431,9431],"mapped",[104]],[[9432,9432],"mapped",[105]],[[9433,9433],"mapped",[106]],[[9434,9434],"mapped",[107]],[[9435,9435],"mapped",[108]],[[9436,9436],"mapped",[109]],[[9437,9437],"mapped",[110]],[[9438,9438],"mapped",[111]],[[9439,9439],"mapped",[112]],[[9440,9440],"mapped",[113]],[[9441,9441],"mapped",[114]],[[9442,9442],"mapped",[115]],[[9443,9443],"mapped",[116]],[[9444,9444],"mapped",[117]],[[9445,9445],"mapped",[118]],[[9446,9446],"mapped",[119]],[[9447,9447],"mapped",[120]],[[9448,9448],"mapped",[121]],[[9449,9449],"mapped",[122]],[[9450,9450],"mapped",[48]],[[9451,9470],"valid",[],"NV8"],[[9471,9471],"valid",[],"NV8"],[[9472,9621],"valid",[],"NV8"],[[9622,9631],"valid",[],"NV8"],[[9632,9711],"valid",[],"NV8"],[[9712,9719],"valid",[],"NV8"],[[9720,9727],"valid",[],"NV8"],[[9728,9747],"valid",[],"NV8"],[[9748,9749],"valid",[],"NV8"],[[9750,9751],"valid",[],"NV8"],[[9752,9752],"valid",[],"NV8"],[[9753,9753],"valid",[],"NV8"],[[9754,9839],"valid",[],"NV8"],[[9840,9841],"valid",[],"NV8"],[[9842,9853],"valid",[],"NV8"],[[9854,9855],"valid",[],"NV8"],[[9856,9865],"valid",[],"NV8"],[[9866,9873],"valid",[],"NV8"],[[9874,9884],"valid",[],"NV8"],[[9885,9885],"valid",[],"NV8"],[[9886,9887],"valid",[],"NV8"],[[9888,9889],"valid",[],"NV8"],[[9890,9905],"valid",[],"NV8"],[[9906,9906],"valid",[],"NV8"],[[9907,9916],"valid",[],"NV8"],[[9917,9919],"valid",[],"NV8"],[[9920,9923],"valid",[],"NV8"],[[9924,9933],"valid",[],"NV8"],[[9934,9934],"valid",[],"NV8"],[[9935,9953],"valid",[],"NV8"],[[9954,9954],"valid",[],"NV8"],[[9955,9955],"valid",[],"NV8"],[[9956,9959],"valid",[],"NV8"],[[9960,9983],"valid",[],"NV8"],[[9984,9984],"valid",[],"NV8"],[[9985,9988],"valid",[],"NV8"],[[9989,9989],"valid",[],"NV8"],[[9990,9993],"valid",[],"NV8"],[[9994,9995],"valid",[],"NV8"],[[9996,10023],"valid",[],"NV8"],[[10024,10024],"valid",[],"NV8"],[[10025,10059],"valid",[],"NV8"],[[10060,10060],"valid",[],"NV8"],[[10061,10061],"valid",[],"NV8"],[[10062,10062],"valid",[],"NV8"],[[10063,10066],"valid",[],"NV8"],[[10067,10069],"valid",[],"NV8"],[[10070,10070],"valid",[],"NV8"],[[10071,10071],"valid",[],"NV8"],[[10072,10078],"valid",[],"NV8"],[[10079,10080],"valid",[],"NV8"],[[10081,10087],"valid",[],"NV8"],[[10088,10101],"valid",[],"NV8"],[[10102,10132],"valid",[],"NV8"],[[10133,10135],"valid",[],"NV8"],[[10136,10159],"valid",[],"NV8"],[[10160,10160],"valid",[],"NV8"],[[10161,10174],"valid",[],"NV8"],[[10175,10175],"valid",[],"NV8"],[[10176,10182],"valid",[],"NV8"],[[10183,10186],"valid",[],"NV8"],[[10187,10187],"valid",[],"NV8"],[[10188,10188],"valid",[],"NV8"],[[10189,10189],"valid",[],"NV8"],[[10190,10191],"valid",[],"NV8"],[[10192,10219],"valid",[],"NV8"],[[10220,10223],"valid",[],"NV8"],[[10224,10239],"valid",[],"NV8"],[[10240,10495],"valid",[],"NV8"],[[10496,10763],"valid",[],"NV8"],[[10764,10764],"mapped",[8747,8747,8747,8747]],[[10765,10867],"valid",[],"NV8"],[[10868,10868],"disallowed_STD3_mapped",[58,58,61]],[[10869,10869],"disallowed_STD3_mapped",[61,61]],[[10870,10870],"disallowed_STD3_mapped",[61,61,61]],[[10871,10971],"valid",[],"NV8"],[[10972,10972],"mapped",[10973,824]],[[10973,11007],"valid",[],"NV8"],[[11008,11021],"valid",[],"NV8"],[[11022,11027],"valid",[],"NV8"],[[11028,11034],"valid",[],"NV8"],[[11035,11039],"valid",[],"NV8"],[[11040,11043],"valid",[],"NV8"],[[11044,11084],"valid",[],"NV8"],[[11085,11087],"valid",[],"NV8"],[[11088,11092],"valid",[],"NV8"],[[11093,11097],"valid",[],"NV8"],[[11098,11123],"valid",[],"NV8"],[[11124,11125],"disallowed"],[[11126,11157],"valid",[],"NV8"],[[11158,11159],"disallowed"],[[11160,11193],"valid",[],"NV8"],[[11194,11196],"disallowed"],[[11197,11208],"valid",[],"NV8"],[[11209,11209],"disallowed"],[[11210,11217],"valid",[],"NV8"],[[11218,11243],"disallowed"],[[11244,11247],"valid",[],"NV8"],[[11248,11263],"disallowed"],[[11264,11264],"mapped",[11312]],[[11265,11265],"mapped",[11313]],[[11266,11266],"mapped",[11314]],[[11267,11267],"mapped",[11315]],[[11268,11268],"mapped",[11316]],[[11269,11269],"mapped",[11317]],[[11270,11270],"mapped",[11318]],[[11271,11271],"mapped",[11319]],[[11272,11272],"mapped",[11320]],[[11273,11273],"mapped",[11321]],[[11274,11274],"mapped",[11322]],[[11275,11275],"mapped",[11323]],[[11276,11276],"mapped",[11324]],[[11277,11277],"mapped",[11325]],[[11278,11278],"mapped",[11326]],[[11279,11279],"mapped",[11327]],[[11280,11280],"mapped",[11328]],[[11281,11281],"mapped",[11329]],[[11282,11282],"mapped",[11330]],[[11283,11283],"mapped",[11331]],[[11284,11284],"mapped",[11332]],[[11285,11285],"mapped",[11333]],[[11286,11286],"mapped",[11334]],[[11287,11287],"mapped",[11335]],[[11288,11288],"mapped",[11336]],[[11289,11289],"mapped",[11337]],[[11290,11290],"mapped",[11338]],[[11291,11291],"mapped",[11339]],[[11292,11292],"mapped",[11340]],[[11293,11293],"mapped",[11341]],[[11294,11294],"mapped",[11342]],[[11295,11295],"mapped",[11343]],[[11296,11296],"mapped",[11344]],[[11297,11297],"mapped",[11345]],[[11298,11298],"mapped",[11346]],[[11299,11299],"mapped",[11347]],[[11300,11300],"mapped",[11348]],[[11301,11301],"mapped",[11349]],[[11302,11302],"mapped",[11350]],[[11303,11303],"mapped",[11351]],[[11304,11304],"mapped",[11352]],[[11305,11305],"mapped",[11353]],[[11306,11306],"mapped",[11354]],[[11307,11307],"mapped",[11355]],[[11308,11308],"mapped",[11356]],[[11309,11309],"mapped",[11357]],[[11310,11310],"mapped",[11358]],[[11311,11311],"disallowed"],[[11312,11358],"valid"],[[11359,11359],"disallowed"],[[11360,11360],"mapped",[11361]],[[11361,11361],"valid"],[[11362,11362],"mapped",[619]],[[11363,11363],"mapped",[7549]],[[11364,11364],"mapped",[637]],[[11365,11366],"valid"],[[11367,11367],"mapped",[11368]],[[11368,11368],"valid"],[[11369,11369],"mapped",[11370]],[[11370,11370],"valid"],[[11371,11371],"mapped",[11372]],[[11372,11372],"valid"],[[11373,11373],"mapped",[593]],[[11374,11374],"mapped",[625]],[[11375,11375],"mapped",[592]],[[11376,11376],"mapped",[594]],[[11377,11377],"valid"],[[11378,11378],"mapped",[11379]],[[11379,11379],"valid"],[[11380,11380],"valid"],[[11381,11381],"mapped",[11382]],[[11382,11383],"valid"],[[11384,11387],"valid"],[[11388,11388],"mapped",[106]],[[11389,11389],"mapped",[118]],[[11390,11390],"mapped",[575]],[[11391,11391],"mapped",[576]],[[11392,11392],"mapped",[11393]],[[11393,11393],"valid"],[[11394,11394],"mapped",[11395]],[[11395,11395],"valid"],[[11396,11396],"mapped",[11397]],[[11397,11397],"valid"],[[11398,11398],"mapped",[11399]],[[11399,11399],"valid"],[[11400,11400],"mapped",[11401]],[[11401,11401],"valid"],[[11402,11402],"mapped",[11403]],[[11403,11403],"valid"],[[11404,11404],"mapped",[11405]],[[11405,11405],"valid"],[[11406,11406],"mapped",[11407]],[[11407,11407],"valid"],[[11408,11408],"mapped",[11409]],[[11409,11409],"valid"],[[11410,11410],"mapped",[11411]],[[11411,11411],"valid"],[[11412,11412],"mapped",[11413]],[[11413,11413],"valid"],[[11414,11414],"mapped",[11415]],[[11415,11415],"valid"],[[11416,11416],"mapped",[11417]],[[11417,11417],"valid"],[[11418,11418],"mapped",[11419]],[[11419,11419],"valid"],[[11420,11420],"mapped",[11421]],[[11421,11421],"valid"],[[11422,11422],"mapped",[11423]],[[11423,11423],"valid"],[[11424,11424],"mapped",[11425]],[[11425,11425],"valid"],[[11426,11426],"mapped",[11427]],[[11427,11427],"valid"],[[11428,11428],"mapped",[11429]],[[11429,11429],"valid"],[[11430,11430],"mapped",[11431]],[[11431,11431],"valid"],[[11432,11432],"mapped",[11433]],[[11433,11433],"valid"],[[11434,11434],"mapped",[11435]],[[11435,11435],"valid"],[[11436,11436],"mapped",[11437]],[[11437,11437],"valid"],[[11438,11438],"mapped",[11439]],[[11439,11439],"valid"],[[11440,11440],"mapped",[11441]],[[11441,11441],"valid"],[[11442,11442],"mapped",[11443]],[[11443,11443],"valid"],[[11444,11444],"mapped",[11445]],[[11445,11445],"valid"],[[11446,11446],"mapped",[11447]],[[11447,11447],"valid"],[[11448,11448],"mapped",[11449]],[[11449,11449],"valid"],[[11450,11450],"mapped",[11451]],[[11451,11451],"valid"],[[11452,11452],"mapped",[11453]],[[11453,11453],"valid"],[[11454,11454],"mapped",[11455]],[[11455,11455],"valid"],[[11456,11456],"mapped",[11457]],[[11457,11457],"valid"],[[11458,11458],"mapped",[11459]],[[11459,11459],"valid"],[[11460,11460],"mapped",[11461]],[[11461,11461],"valid"],[[11462,11462],"mapped",[11463]],[[11463,11463],"valid"],[[11464,11464],"mapped",[11465]],[[11465,11465],"valid"],[[11466,11466],"mapped",[11467]],[[11467,11467],"valid"],[[11468,11468],"mapped",[11469]],[[11469,11469],"valid"],[[11470,11470],"mapped",[11471]],[[11471,11471],"valid"],[[11472,11472],"mapped",[11473]],[[11473,11473],"valid"],[[11474,11474],"mapped",[11475]],[[11475,11475],"valid"],[[11476,11476],"mapped",[11477]],[[11477,11477],"valid"],[[11478,11478],"mapped",[11479]],[[11479,11479],"valid"],[[11480,11480],"mapped",[11481]],[[11481,11481],"valid"],[[11482,11482],"mapped",[11483]],[[11483,11483],"valid"],[[11484,11484],"mapped",[11485]],[[11485,11485],"valid"],[[11486,11486],"mapped",[11487]],[[11487,11487],"valid"],[[11488,11488],"mapped",[11489]],[[11489,11489],"valid"],[[11490,11490],"mapped",[11491]],[[11491,11492],"valid"],[[11493,11498],"valid",[],"NV8"],[[11499,11499],"mapped",[11500]],[[11500,11500],"valid"],[[11501,11501],"mapped",[11502]],[[11502,11505],"valid"],[[11506,11506],"mapped",[11507]],[[11507,11507],"valid"],[[11508,11512],"disallowed"],[[11513,11519],"valid",[],"NV8"],[[11520,11557],"valid"],[[11558,11558],"disallowed"],[[11559,11559],"valid"],[[11560,11564],"disallowed"],[[11565,11565],"valid"],[[11566,11567],"disallowed"],[[11568,11621],"valid"],[[11622,11623],"valid"],[[11624,11630],"disallowed"],[[11631,11631],"mapped",[11617]],[[11632,11632],"valid",[],"NV8"],[[11633,11646],"disallowed"],[[11647,11647],"valid"],[[11648,11670],"valid"],[[11671,11679],"disallowed"],[[11680,11686],"valid"],[[11687,11687],"disallowed"],[[11688,11694],"valid"],[[11695,11695],"disallowed"],[[11696,11702],"valid"],[[11703,11703],"disallowed"],[[11704,11710],"valid"],[[11711,11711],"disallowed"],[[11712,11718],"valid"],[[11719,11719],"disallowed"],[[11720,11726],"valid"],[[11727,11727],"disallowed"],[[11728,11734],"valid"],[[11735,11735],"disallowed"],[[11736,11742],"valid"],[[11743,11743],"disallowed"],[[11744,11775],"valid"],[[11776,11799],"valid",[],"NV8"],[[11800,11803],"valid",[],"NV8"],[[11804,11805],"valid",[],"NV8"],[[11806,11822],"valid",[],"NV8"],[[11823,11823],"valid"],[[11824,11824],"valid",[],"NV8"],[[11825,11825],"valid",[],"NV8"],[[11826,11835],"valid",[],"NV8"],[[11836,11842],"valid",[],"NV8"],[[11843,11903],"disallowed"],[[11904,11929],"valid",[],"NV8"],[[11930,11930],"disallowed"],[[11931,11934],"valid",[],"NV8"],[[11935,11935],"mapped",[27597]],[[11936,12018],"valid",[],"NV8"],[[12019,12019],"mapped",[40863]],[[12020,12031],"disallowed"],[[12032,12032],"mapped",[19968]],[[12033,12033],"mapped",[20008]],[[12034,12034],"mapped",[20022]],[[12035,12035],"mapped",[20031]],[[12036,12036],"mapped",[20057]],[[12037,12037],"mapped",[20101]],[[12038,12038],"mapped",[20108]],[[12039,12039],"mapped",[20128]],[[12040,12040],"mapped",[20154]],[[12041,12041],"mapped",[20799]],[[12042,12042],"mapped",[20837]],[[12043,12043],"mapped",[20843]],[[12044,12044],"mapped",[20866]],[[12045,12045],"mapped",[20886]],[[12046,12046],"mapped",[20907]],[[12047,12047],"mapped",[20960]],[[12048,12048],"mapped",[20981]],[[12049,12049],"mapped",[20992]],[[12050,12050],"mapped",[21147]],[[12051,12051],"mapped",[21241]],[[12052,12052],"mapped",[21269]],[[12053,12053],"mapped",[21274]],[[12054,12054],"mapped",[21304]],[[12055,12055],"mapped",[21313]],[[12056,12056],"mapped",[21340]],[[12057,12057],"mapped",[21353]],[[12058,12058],"mapped",[21378]],[[12059,12059],"mapped",[21430]],[[12060,12060],"mapped",[21448]],[[12061,12061],"mapped",[21475]],[[12062,12062],"mapped",[22231]],[[12063,12063],"mapped",[22303]],[[12064,12064],"mapped",[22763]],[[12065,12065],"mapped",[22786]],[[12066,12066],"mapped",[22794]],[[12067,12067],"mapped",[22805]],[[12068,12068],"mapped",[22823]],[[12069,12069],"mapped",[22899]],[[12070,12070],"mapped",[23376]],[[12071,12071],"mapped",[23424]],[[12072,12072],"mapped",[23544]],[[12073,12073],"mapped",[23567]],[[12074,12074],"mapped",[23586]],[[12075,12075],"mapped",[23608]],[[12076,12076],"mapped",[23662]],[[12077,12077],"mapped",[23665]],[[12078,12078],"mapped",[24027]],[[12079,12079],"mapped",[24037]],[[12080,12080],"mapped",[24049]],[[12081,12081],"mapped",[24062]],[[12082,12082],"mapped",[24178]],[[12083,12083],"mapped",[24186]],[[12084,12084],"mapped",[24191]],[[12085,12085],"mapped",[24308]],[[12086,12086],"mapped",[24318]],[[12087,12087],"mapped",[24331]],[[12088,12088],"mapped",[24339]],[[12089,12089],"mapped",[24400]],[[12090,12090],"mapped",[24417]],[[12091,12091],"mapped",[24435]],[[12092,12092],"mapped",[24515]],[[12093,12093],"mapped",[25096]],[[12094,12094],"mapped",[25142]],[[12095,12095],"mapped",[25163]],[[12096,12096],"mapped",[25903]],[[12097,12097],"mapped",[25908]],[[12098,12098],"mapped",[25991]],[[12099,12099],"mapped",[26007]],[[12100,12100],"mapped",[26020]],[[12101,12101],"mapped",[26041]],[[12102,12102],"mapped",[26080]],[[12103,12103],"mapped",[26085]],[[12104,12104],"mapped",[26352]],[[12105,12105],"mapped",[26376]],[[12106,12106],"mapped",[26408]],[[12107,12107],"mapped",[27424]],[[12108,12108],"mapped",[27490]],[[12109,12109],"mapped",[27513]],[[12110,12110],"mapped",[27571]],[[12111,12111],"mapped",[27595]],[[12112,12112],"mapped",[27604]],[[12113,12113],"mapped",[27611]],[[12114,12114],"mapped",[27663]],[[12115,12115],"mapped",[27668]],[[12116,12116],"mapped",[27700]],[[12117,12117],"mapped",[28779]],[[12118,12118],"mapped",[29226]],[[12119,12119],"mapped",[29238]],[[12120,12120],"mapped",[29243]],[[12121,12121],"mapped",[29247]],[[12122,12122],"mapped",[29255]],[[12123,12123],"mapped",[29273]],[[12124,12124],"mapped",[29275]],[[12125,12125],"mapped",[29356]],[[12126,12126],"mapped",[29572]],[[12127,12127],"mapped",[29577]],[[12128,12128],"mapped",[29916]],[[12129,12129],"mapped",[29926]],[[12130,12130],"mapped",[29976]],[[12131,12131],"mapped",[29983]],[[12132,12132],"mapped",[29992]],[[12133,12133],"mapped",[30000]],[[12134,12134],"mapped",[30091]],[[12135,12135],"mapped",[30098]],[[12136,12136],"mapped",[30326]],[[12137,12137],"mapped",[30333]],[[12138,12138],"mapped",[30382]],[[12139,12139],"mapped",[30399]],[[12140,12140],"mapped",[30446]],[[12141,12141],"mapped",[30683]],[[12142,12142],"mapped",[30690]],[[12143,12143],"mapped",[30707]],[[12144,12144],"mapped",[31034]],[[12145,12145],"mapped",[31160]],[[12146,12146],"mapped",[31166]],[[12147,12147],"mapped",[31348]],[[12148,12148],"mapped",[31435]],[[12149,12149],"mapped",[31481]],[[12150,12150],"mapped",[31859]],[[12151,12151],"mapped",[31992]],[[12152,12152],"mapped",[32566]],[[12153,12153],"mapped",[32593]],[[12154,12154],"mapped",[32650]],[[12155,12155],"mapped",[32701]],[[12156,12156],"mapped",[32769]],[[12157,12157],"mapped",[32780]],[[12158,12158],"mapped",[32786]],[[12159,12159],"mapped",[32819]],[[12160,12160],"mapped",[32895]],[[12161,12161],"mapped",[32905]],[[12162,12162],"mapped",[33251]],[[12163,12163],"mapped",[33258]],[[12164,12164],"mapped",[33267]],[[12165,12165],"mapped",[33276]],[[12166,12166],"mapped",[33292]],[[12167,12167],"mapped",[33307]],[[12168,12168],"mapped",[33311]],[[12169,12169],"mapped",[33390]],[[12170,12170],"mapped",[33394]],[[12171,12171],"mapped",[33400]],[[12172,12172],"mapped",[34381]],[[12173,12173],"mapped",[34411]],[[12174,12174],"mapped",[34880]],[[12175,12175],"mapped",[34892]],[[12176,12176],"mapped",[34915]],[[12177,12177],"mapped",[35198]],[[12178,12178],"mapped",[35211]],[[12179,12179],"mapped",[35282]],[[12180,12180],"mapped",[35328]],[[12181,12181],"mapped",[35895]],[[12182,12182],"mapped",[35910]],[[12183,12183],"mapped",[35925]],[[12184,12184],"mapped",[35960]],[[12185,12185],"mapped",[35997]],[[12186,12186],"mapped",[36196]],[[12187,12187],"mapped",[36208]],[[12188,12188],"mapped",[36275]],[[12189,12189],"mapped",[36523]],[[12190,12190],"mapped",[36554]],[[12191,12191],"mapped",[36763]],[[12192,12192],"mapped",[36784]],[[12193,12193],"mapped",[36789]],[[12194,12194],"mapped",[37009]],[[12195,12195],"mapped",[37193]],[[12196,12196],"mapped",[37318]],[[12197,12197],"mapped",[37324]],[[12198,12198],"mapped",[37329]],[[12199,12199],"mapped",[38263]],[[12200,12200],"mapped",[38272]],[[12201,12201],"mapped",[38428]],[[12202,12202],"mapped",[38582]],[[12203,12203],"mapped",[38585]],[[12204,12204],"mapped",[38632]],[[12205,12205],"mapped",[38737]],[[12206,12206],"mapped",[38750]],[[12207,12207],"mapped",[38754]],[[12208,12208],"mapped",[38761]],[[12209,12209],"mapped",[38859]],[[12210,12210],"mapped",[38893]],[[12211,12211],"mapped",[38899]],[[12212,12212],"mapped",[38913]],[[12213,12213],"mapped",[39080]],[[12214,12214],"mapped",[39131]],[[12215,12215],"mapped",[39135]],[[12216,12216],"mapped",[39318]],[[12217,12217],"mapped",[39321]],[[12218,12218],"mapped",[39340]],[[12219,12219],"mapped",[39592]],[[12220,12220],"mapped",[39640]],[[12221,12221],"mapped",[39647]],[[12222,12222],"mapped",[39717]],[[12223,12223],"mapped",[39727]],[[12224,12224],"mapped",[39730]],[[12225,12225],"mapped",[39740]],[[12226,12226],"mapped",[39770]],[[12227,12227],"mapped",[40165]],[[12228,12228],"mapped",[40565]],[[12229,12229],"mapped",[40575]],[[12230,12230],"mapped",[40613]],[[12231,12231],"mapped",[40635]],[[12232,12232],"mapped",[40643]],[[12233,12233],"mapped",[40653]],[[12234,12234],"mapped",[40657]],[[12235,12235],"mapped",[40697]],[[12236,12236],"mapped",[40701]],[[12237,12237],"mapped",[40718]],[[12238,12238],"mapped",[40723]],[[12239,12239],"mapped",[40736]],[[12240,12240],"mapped",[40763]],[[12241,12241],"mapped",[40778]],[[12242,12242],"mapped",[40786]],[[12243,12243],"mapped",[40845]],[[12244,12244],"mapped",[40860]],[[12245,12245],"mapped",[40864]],[[12246,12271],"disallowed"],[[12272,12283],"disallowed"],[[12284,12287],"disallowed"],[[12288,12288],"disallowed_STD3_mapped",[32]],[[12289,12289],"valid",[],"NV8"],[[12290,12290],"mapped",[46]],[[12291,12292],"valid",[],"NV8"],[[12293,12295],"valid"],[[12296,12329],"valid",[],"NV8"],[[12330,12333],"valid"],[[12334,12341],"valid",[],"NV8"],[[12342,12342],"mapped",[12306]],[[12343,12343],"valid",[],"NV8"],[[12344,12344],"mapped",[21313]],[[12345,12345],"mapped",[21316]],[[12346,12346],"mapped",[21317]],[[12347,12347],"valid",[],"NV8"],[[12348,12348],"valid"],[[12349,12349],"valid",[],"NV8"],[[12350,12350],"valid",[],"NV8"],[[12351,12351],"valid",[],"NV8"],[[12352,12352],"disallowed"],[[12353,12436],"valid"],[[12437,12438],"valid"],[[12439,12440],"disallowed"],[[12441,12442],"valid"],[[12443,12443],"disallowed_STD3_mapped",[32,12441]],[[12444,12444],"disallowed_STD3_mapped",[32,12442]],[[12445,12446],"valid"],[[12447,12447],"mapped",[12424,12426]],[[12448,12448],"valid",[],"NV8"],[[12449,12542],"valid"],[[12543,12543],"mapped",[12467,12488]],[[12544,12548],"disallowed"],[[12549,12588],"valid"],[[12589,12589],"valid"],[[12590,12592],"disallowed"],[[12593,12593],"mapped",[4352]],[[12594,12594],"mapped",[4353]],[[12595,12595],"mapped",[4522]],[[12596,12596],"mapped",[4354]],[[12597,12597],"mapped",[4524]],[[12598,12598],"mapped",[4525]],[[12599,12599],"mapped",[4355]],[[12600,12600],"mapped",[4356]],[[12601,12601],"mapped",[4357]],[[12602,12602],"mapped",[4528]],[[12603,12603],"mapped",[4529]],[[12604,12604],"mapped",[4530]],[[12605,12605],"mapped",[4531]],[[12606,12606],"mapped",[4532]],[[12607,12607],"mapped",[4533]],[[12608,12608],"mapped",[4378]],[[12609,12609],"mapped",[4358]],[[12610,12610],"mapped",[4359]],[[12611,12611],"mapped",[4360]],[[12612,12612],"mapped",[4385]],[[12613,12613],"mapped",[4361]],[[12614,12614],"mapped",[4362]],[[12615,12615],"mapped",[4363]],[[12616,12616],"mapped",[4364]],[[12617,12617],"mapped",[4365]],[[12618,12618],"mapped",[4366]],[[12619,12619],"mapped",[4367]],[[12620,12620],"mapped",[4368]],[[12621,12621],"mapped",[4369]],[[12622,12622],"mapped",[4370]],[[12623,12623],"mapped",[4449]],[[12624,12624],"mapped",[4450]],[[12625,12625],"mapped",[4451]],[[12626,12626],"mapped",[4452]],[[12627,12627],"mapped",[4453]],[[12628,12628],"mapped",[4454]],[[12629,12629],"mapped",[4455]],[[12630,12630],"mapped",[4456]],[[12631,12631],"mapped",[4457]],[[12632,12632],"mapped",[4458]],[[12633,12633],"mapped",[4459]],[[12634,12634],"mapped",[4460]],[[12635,12635],"mapped",[4461]],[[12636,12636],"mapped",[4462]],[[12637,12637],"mapped",[4463]],[[12638,12638],"mapped",[4464]],[[12639,12639],"mapped",[4465]],[[12640,12640],"mapped",[4466]],[[12641,12641],"mapped",[4467]],[[12642,12642],"mapped",[4468]],[[12643,12643],"mapped",[4469]],[[12644,12644],"disallowed"],[[12645,12645],"mapped",[4372]],[[12646,12646],"mapped",[4373]],[[12647,12647],"mapped",[4551]],[[12648,12648],"mapped",[4552]],[[12649,12649],"mapped",[4556]],[[12650,12650],"mapped",[4558]],[[12651,12651],"mapped",[4563]],[[12652,12652],"mapped",[4567]],[[12653,12653],"mapped",[4569]],[[12654,12654],"mapped",[4380]],[[12655,12655],"mapped",[4573]],[[12656,12656],"mapped",[4575]],[[12657,12657],"mapped",[4381]],[[12658,12658],"mapped",[4382]],[[12659,12659],"mapped",[4384]],[[12660,12660],"mapped",[4386]],[[12661,12661],"mapped",[4387]],[[12662,12662],"mapped",[4391]],[[12663,12663],"mapped",[4393]],[[12664,12664],"mapped",[4395]],[[12665,12665],"mapped",[4396]],[[12666,12666],"mapped",[4397]],[[12667,12667],"mapped",[4398]],[[12668,12668],"mapped",[4399]],[[12669,12669],"mapped",[4402]],[[12670,12670],"mapped",[4406]],[[12671,12671],"mapped",[4416]],[[12672,12672],"mapped",[4423]],[[12673,12673],"mapped",[4428]],[[12674,12674],"mapped",[4593]],[[12675,12675],"mapped",[4594]],[[12676,12676],"mapped",[4439]],[[12677,12677],"mapped",[4440]],[[12678,12678],"mapped",[4441]],[[12679,12679],"mapped",[4484]],[[12680,12680],"mapped",[4485]],[[12681,12681],"mapped",[4488]],[[12682,12682],"mapped",[4497]],[[12683,12683],"mapped",[4498]],[[12684,12684],"mapped",[4500]],[[12685,12685],"mapped",[4510]],[[12686,12686],"mapped",[4513]],[[12687,12687],"disallowed"],[[12688,12689],"valid",[],"NV8"],[[12690,12690],"mapped",[19968]],[[12691,12691],"mapped",[20108]],[[12692,12692],"mapped",[19977]],[[12693,12693],"mapped",[22235]],[[12694,12694],"mapped",[19978]],[[12695,12695],"mapped",[20013]],[[12696,12696],"mapped",[19979]],[[12697,12697],"mapped",[30002]],[[12698,12698],"mapped",[20057]],[[12699,12699],"mapped",[19993]],[[12700,12700],"mapped",[19969]],[[12701,12701],"mapped",[22825]],[[12702,12702],"mapped",[22320]],[[12703,12703],"mapped",[20154]],[[12704,12727],"valid"],[[12728,12730],"valid"],[[12731,12735],"disallowed"],[[12736,12751],"valid",[],"NV8"],[[12752,12771],"valid",[],"NV8"],[[12772,12783],"disallowed"],[[12784,12799],"valid"],[[12800,12800],"disallowed_STD3_mapped",[40,4352,41]],[[12801,12801],"disallowed_STD3_mapped",[40,4354,41]],[[12802,12802],"disallowed_STD3_mapped",[40,4355,41]],[[12803,12803],"disallowed_STD3_mapped",[40,4357,41]],[[12804,12804],"disallowed_STD3_mapped",[40,4358,41]],[[12805,12805],"disallowed_STD3_mapped",[40,4359,41]],[[12806,12806],"disallowed_STD3_mapped",[40,4361,41]],[[12807,12807],"disallowed_STD3_mapped",[40,4363,41]],[[12808,12808],"disallowed_STD3_mapped",[40,4364,41]],[[12809,12809],"disallowed_STD3_mapped",[40,4366,41]],[[12810,12810],"disallowed_STD3_mapped",[40,4367,41]],[[12811,12811],"disallowed_STD3_mapped",[40,4368,41]],[[12812,12812],"disallowed_STD3_mapped",[40,4369,41]],[[12813,12813],"disallowed_STD3_mapped",[40,4370,41]],[[12814,12814],"disallowed_STD3_mapped",[40,44032,41]],[[12815,12815],"disallowed_STD3_mapped",[40,45208,41]],[[12816,12816],"disallowed_STD3_mapped",[40,45796,41]],[[12817,12817],"disallowed_STD3_mapped",[40,46972,41]],[[12818,12818],"disallowed_STD3_mapped",[40,47560,41]],[[12819,12819],"disallowed_STD3_mapped",[40,48148,41]],[[12820,12820],"disallowed_STD3_mapped",[40,49324,41]],[[12821,12821],"disallowed_STD3_mapped",[40,50500,41]],[[12822,12822],"disallowed_STD3_mapped",[40,51088,41]],[[12823,12823],"disallowed_STD3_mapped",[40,52264,41]],[[12824,12824],"disallowed_STD3_mapped",[40,52852,41]],[[12825,12825],"disallowed_STD3_mapped",[40,53440,41]],[[12826,12826],"disallowed_STD3_mapped",[40,54028,41]],[[12827,12827],"disallowed_STD3_mapped",[40,54616,41]],[[12828,12828],"disallowed_STD3_mapped",[40,51452,41]],[[12829,12829],"disallowed_STD3_mapped",[40,50724,51204,41]],[[12830,12830],"disallowed_STD3_mapped",[40,50724,54980,41]],[[12831,12831],"disallowed"],[[12832,12832],"disallowed_STD3_mapped",[40,19968,41]],[[12833,12833],"disallowed_STD3_mapped",[40,20108,41]],[[12834,12834],"disallowed_STD3_mapped",[40,19977,41]],[[12835,12835],"disallowed_STD3_mapped",[40,22235,41]],[[12836,12836],"disallowed_STD3_mapped",[40,20116,41]],[[12837,12837],"disallowed_STD3_mapped",[40,20845,41]],[[12838,12838],"disallowed_STD3_mapped",[40,19971,41]],[[12839,12839],"disallowed_STD3_mapped",[40,20843,41]],[[12840,12840],"disallowed_STD3_mapped",[40,20061,41]],[[12841,12841],"disallowed_STD3_mapped",[40,21313,41]],[[12842,12842],"disallowed_STD3_mapped",[40,26376,41]],[[12843,12843],"disallowed_STD3_mapped",[40,28779,41]],[[12844,12844],"disallowed_STD3_mapped",[40,27700,41]],[[12845,12845],"disallowed_STD3_mapped",[40,26408,41]],[[12846,12846],"disallowed_STD3_mapped",[40,37329,41]],[[12847,12847],"disallowed_STD3_mapped",[40,22303,41]],[[12848,12848],"disallowed_STD3_mapped",[40,26085,41]],[[12849,12849],"disallowed_STD3_mapped",[40,26666,41]],[[12850,12850],"disallowed_STD3_mapped",[40,26377,41]],[[12851,12851],"disallowed_STD3_mapped",[40,31038,41]],[[12852,12852],"disallowed_STD3_mapped",[40,21517,41]],[[12853,12853],"disallowed_STD3_mapped",[40,29305,41]],[[12854,12854],"disallowed_STD3_mapped",[40,36001,41]],[[12855,12855],"disallowed_STD3_mapped",[40,31069,41]],[[12856,12856],"disallowed_STD3_mapped",[40,21172,41]],[[12857,12857],"disallowed_STD3_mapped",[40,20195,41]],[[12858,12858],"disallowed_STD3_mapped",[40,21628,41]],[[12859,12859],"disallowed_STD3_mapped",[40,23398,41]],[[12860,12860],"disallowed_STD3_mapped",[40,30435,41]],[[12861,12861],"disallowed_STD3_mapped",[40,20225,41]],[[12862,12862],"disallowed_STD3_mapped",[40,36039,41]],[[12863,12863],"disallowed_STD3_mapped",[40,21332,41]],[[12864,12864],"disallowed_STD3_mapped",[40,31085,41]],[[12865,12865],"disallowed_STD3_mapped",[40,20241,41]],[[12866,12866],"disallowed_STD3_mapped",[40,33258,41]],[[12867,12867],"disallowed_STD3_mapped",[40,33267,41]],[[12868,12868],"mapped",[21839]],[[12869,12869],"mapped",[24188]],[[12870,12870],"mapped",[25991]],[[12871,12871],"mapped",[31631]],[[12872,12879],"valid",[],"NV8"],[[12880,12880],"mapped",[112,116,101]],[[12881,12881],"mapped",[50,49]],[[12882,12882],"mapped",[50,50]],[[12883,12883],"mapped",[50,51]],[[12884,12884],"mapped",[50,52]],[[12885,12885],"mapped",[50,53]],[[12886,12886],"mapped",[50,54]],[[12887,12887],"mapped",[50,55]],[[12888,12888],"mapped",[50,56]],[[12889,12889],"mapped",[50,57]],[[12890,12890],"mapped",[51,48]],[[12891,12891],"mapped",[51,49]],[[12892,12892],"mapped",[51,50]],[[12893,12893],"mapped",[51,51]],[[12894,12894],"mapped",[51,52]],[[12895,12895],"mapped",[51,53]],[[12896,12896],"mapped",[4352]],[[12897,12897],"mapped",[4354]],[[12898,12898],"mapped",[4355]],[[12899,12899],"mapped",[4357]],[[12900,12900],"mapped",[4358]],[[12901,12901],"mapped",[4359]],[[12902,12902],"mapped",[4361]],[[12903,12903],"mapped",[4363]],[[12904,12904],"mapped",[4364]],[[12905,12905],"mapped",[4366]],[[12906,12906],"mapped",[4367]],[[12907,12907],"mapped",[4368]],[[12908,12908],"mapped",[4369]],[[12909,12909],"mapped",[4370]],[[12910,12910],"mapped",[44032]],[[12911,12911],"mapped",[45208]],[[12912,12912],"mapped",[45796]],[[12913,12913],"mapped",[46972]],[[12914,12914],"mapped",[47560]],[[12915,12915],"mapped",[48148]],[[12916,12916],"mapped",[49324]],[[12917,12917],"mapped",[50500]],[[12918,12918],"mapped",[51088]],[[12919,12919],"mapped",[52264]],[[12920,12920],"mapped",[52852]],[[12921,12921],"mapped",[53440]],[[12922,12922],"mapped",[54028]],[[12923,12923],"mapped",[54616]],[[12924,12924],"mapped",[52280,44256]],[[12925,12925],"mapped",[51452,51032]],[[12926,12926],"mapped",[50864]],[[12927,12927],"valid",[],"NV8"],[[12928,12928],"mapped",[19968]],[[12929,12929],"mapped",[20108]],[[12930,12930],"mapped",[19977]],[[12931,12931],"mapped",[22235]],[[12932,12932],"mapped",[20116]],[[12933,12933],"mapped",[20845]],[[12934,12934],"mapped",[19971]],[[12935,12935],"mapped",[20843]],[[12936,12936],"mapped",[20061]],[[12937,12937],"mapped",[21313]],[[12938,12938],"mapped",[26376]],[[12939,12939],"mapped",[28779]],[[12940,12940],"mapped",[27700]],[[12941,12941],"mapped",[26408]],[[12942,12942],"mapped",[37329]],[[12943,12943],"mapped",[22303]],[[12944,12944],"mapped",[26085]],[[12945,12945],"mapped",[26666]],[[12946,12946],"mapped",[26377]],[[12947,12947],"mapped",[31038]],[[12948,12948],"mapped",[21517]],[[12949,12949],"mapped",[29305]],[[12950,12950],"mapped",[36001]],[[12951,12951],"mapped",[31069]],[[12952,12952],"mapped",[21172]],[[12953,12953],"mapped",[31192]],[[12954,12954],"mapped",[30007]],[[12955,12955],"mapped",[22899]],[[12956,12956],"mapped",[36969]],[[12957,12957],"mapped",[20778]],[[12958,12958],"mapped",[21360]],[[12959,12959],"mapped",[27880]],[[12960,12960],"mapped",[38917]],[[12961,12961],"mapped",[20241]],[[12962,12962],"mapped",[20889]],[[12963,12963],"mapped",[27491]],[[12964,12964],"mapped",[19978]],[[12965,12965],"mapped",[20013]],[[12966,12966],"mapped",[19979]],[[12967,12967],"mapped",[24038]],[[12968,12968],"mapped",[21491]],[[12969,12969],"mapped",[21307]],[[12970,12970],"mapped",[23447]],[[12971,12971],"mapped",[23398]],[[12972,12972],"mapped",[30435]],[[12973,12973],"mapped",[20225]],[[12974,12974],"mapped",[36039]],[[12975,12975],"mapped",[21332]],[[12976,12976],"mapped",[22812]],[[12977,12977],"mapped",[51,54]],[[12978,12978],"mapped",[51,55]],[[12979,12979],"mapped",[51,56]],[[12980,12980],"mapped",[51,57]],[[12981,12981],"mapped",[52,48]],[[12982,12982],"mapped",[52,49]],[[12983,12983],"mapped",[52,50]],[[12984,12984],"mapped",[52,51]],[[12985,12985],"mapped",[52,52]],[[12986,12986],"mapped",[52,53]],[[12987,12987],"mapped",[52,54]],[[12988,12988],"mapped",[52,55]],[[12989,12989],"mapped",[52,56]],[[12990,12990],"mapped",[52,57]],[[12991,12991],"mapped",[53,48]],[[12992,12992],"mapped",[49,26376]],[[12993,12993],"mapped",[50,26376]],[[12994,12994],"mapped",[51,26376]],[[12995,12995],"mapped",[52,26376]],[[12996,12996],"mapped",[53,26376]],[[12997,12997],"mapped",[54,26376]],[[12998,12998],"mapped",[55,26376]],[[12999,12999],"mapped",[56,26376]],[[13000,13000],"mapped",[57,26376]],[[13001,13001],"mapped",[49,48,26376]],[[13002,13002],"mapped",[49,49,26376]],[[13003,13003],"mapped",[49,50,26376]],[[13004,13004],"mapped",[104,103]],[[13005,13005],"mapped",[101,114,103]],[[13006,13006],"mapped",[101,118]],[[13007,13007],"mapped",[108,116,100]],[[13008,13008],"mapped",[12450]],[[13009,13009],"mapped",[12452]],[[13010,13010],"mapped",[12454]],[[13011,13011],"mapped",[12456]],[[13012,13012],"mapped",[12458]],[[13013,13013],"mapped",[12459]],[[13014,13014],"mapped",[12461]],[[13015,13015],"mapped",[12463]],[[13016,13016],"mapped",[12465]],[[13017,13017],"mapped",[12467]],[[13018,13018],"mapped",[12469]],[[13019,13019],"mapped",[12471]],[[13020,13020],"mapped",[12473]],[[13021,13021],"mapped",[12475]],[[13022,13022],"mapped",[12477]],[[13023,13023],"mapped",[12479]],[[13024,13024],"mapped",[12481]],[[13025,13025],"mapped",[12484]],[[13026,13026],"mapped",[12486]],[[13027,13027],"mapped",[12488]],[[13028,13028],"mapped",[12490]],[[13029,13029],"mapped",[12491]],[[13030,13030],"mapped",[12492]],[[13031,13031],"mapped",[12493]],[[13032,13032],"mapped",[12494]],[[13033,13033],"mapped",[12495]],[[13034,13034],"mapped",[12498]],[[13035,13035],"mapped",[12501]],[[13036,13036],"mapped",[12504]],[[13037,13037],"mapped",[12507]],[[13038,13038],"mapped",[12510]],[[13039,13039],"mapped",[12511]],[[13040,13040],"mapped",[12512]],[[13041,13041],"mapped",[12513]],[[13042,13042],"mapped",[12514]],[[13043,13043],"mapped",[12516]],[[13044,13044],"mapped",[12518]],[[13045,13045],"mapped",[12520]],[[13046,13046],"mapped",[12521]],[[13047,13047],"mapped",[12522]],[[13048,13048],"mapped",[12523]],[[13049,13049],"mapped",[12524]],[[13050,13050],"mapped",[12525]],[[13051,13051],"mapped",[12527]],[[13052,13052],"mapped",[12528]],[[13053,13053],"mapped",[12529]],[[13054,13054],"mapped",[12530]],[[13055,13055],"disallowed"],[[13056,13056],"mapped",[12450,12497,12540,12488]],[[13057,13057],"mapped",[12450,12523,12501,12449]],[[13058,13058],"mapped",[12450,12531,12506,12450]],[[13059,13059],"mapped",[12450,12540,12523]],[[13060,13060],"mapped",[12452,12491,12531,12464]],[[13061,13061],"mapped",[12452,12531,12481]],[[13062,13062],"mapped",[12454,12457,12531]],[[13063,13063],"mapped",[12456,12473,12463,12540,12489]],[[13064,13064],"mapped",[12456,12540,12459,12540]],[[13065,13065],"mapped",[12458,12531,12473]],[[13066,13066],"mapped",[12458,12540,12512]],[[13067,13067],"mapped",[12459,12452,12522]],[[13068,13068],"mapped",[12459,12521,12483,12488]],[[13069,13069],"mapped",[12459,12525,12522,12540]],[[13070,13070],"mapped",[12460,12525,12531]],[[13071,13071],"mapped",[12460,12531,12510]],[[13072,13072],"mapped",[12462,12460]],[[13073,13073],"mapped",[12462,12491,12540]],[[13074,13074],"mapped",[12461,12517,12522,12540]],[[13075,13075],"mapped",[12462,12523,12480,12540]],[[13076,13076],"mapped",[12461,12525]],[[13077,13077],"mapped",[12461,12525,12464,12521,12512]],[[13078,13078],"mapped",[12461,12525,12513,12540,12488,12523]],[[13079,13079],"mapped",[12461,12525,12527,12483,12488]],[[13080,13080],"mapped",[12464,12521,12512]],[[13081,13081],"mapped",[12464,12521,12512,12488,12531]],[[13082,13082],"mapped",[12463,12523,12476,12452,12525]],[[13083,13083],"mapped",[12463,12525,12540,12493]],[[13084,13084],"mapped",[12465,12540,12473]],[[13085,13085],"mapped",[12467,12523,12490]],[[13086,13086],"mapped",[12467,12540,12509]],[[13087,13087],"mapped",[12469,12452,12463,12523]],[[13088,13088],"mapped",[12469,12531,12481,12540,12512]],[[13089,13089],"mapped",[12471,12522,12531,12464]],[[13090,13090],"mapped",[12475,12531,12481]],[[13091,13091],"mapped",[12475,12531,12488]],[[13092,13092],"mapped",[12480,12540,12473]],[[13093,13093],"mapped",[12487,12471]],[[13094,13094],"mapped",[12489,12523]],[[13095,13095],"mapped",[12488,12531]],[[13096,13096],"mapped",[12490,12494]],[[13097,13097],"mapped",[12494,12483,12488]],[[13098,13098],"mapped",[12495,12452,12484]],[[13099,13099],"mapped",[12497,12540,12475,12531,12488]],[[13100,13100],"mapped",[12497,12540,12484]],[[13101,13101],"mapped",[12496,12540,12524,12523]],[[13102,13102],"mapped",[12500,12450,12473,12488,12523]],[[13103,13103],"mapped",[12500,12463,12523]],[[13104,13104],"mapped",[12500,12467]],[[13105,13105],"mapped",[12499,12523]],[[13106,13106],"mapped",[12501,12449,12521,12483,12489]],[[13107,13107],"mapped",[12501,12451,12540,12488]],[[13108,13108],"mapped",[12502,12483,12471,12455,12523]],[[13109,13109],"mapped",[12501,12521,12531]],[[13110,13110],"mapped",[12504,12463,12479,12540,12523]],[[13111,13111],"mapped",[12506,12477]],[[13112,13112],"mapped",[12506,12491,12498]],[[13113,13113],"mapped",[12504,12523,12484]],[[13114,13114],"mapped",[12506,12531,12473]],[[13115,13115],"mapped",[12506,12540,12472]],[[13116,13116],"mapped",[12505,12540,12479]],[[13117,13117],"mapped",[12509,12452,12531,12488]],[[13118,13118],"mapped",[12508,12523,12488]],[[13119,13119],"mapped",[12507,12531]],[[13120,13120],"mapped",[12509,12531,12489]],[[13121,13121],"mapped",[12507,12540,12523]],[[13122,13122],"mapped",[12507,12540,12531]],[[13123,13123],"mapped",[12510,12452,12463,12525]],[[13124,13124],"mapped",[12510,12452,12523]],[[13125,13125],"mapped",[12510,12483,12495]],[[13126,13126],"mapped",[12510,12523,12463]],[[13127,13127],"mapped",[12510,12531,12471,12519,12531]],[[13128,13128],"mapped",[12511,12463,12525,12531]],[[13129,13129],"mapped",[12511,12522]],[[13130,13130],"mapped",[12511,12522,12496,12540,12523]],[[13131,13131],"mapped",[12513,12460]],[[13132,13132],"mapped",[12513,12460,12488,12531]],[[13133,13133],"mapped",[12513,12540,12488,12523]],[[13134,13134],"mapped",[12516,12540,12489]],[[13135,13135],"mapped",[12516,12540,12523]],[[13136,13136],"mapped",[12518,12450,12531]],[[13137,13137],"mapped",[12522,12483,12488,12523]],[[13138,13138],"mapped",[12522,12521]],[[13139,13139],"mapped",[12523,12500,12540]],[[13140,13140],"mapped",[12523,12540,12502,12523]],[[13141,13141],"mapped",[12524,12512]],[[13142,13142],"mapped",[12524,12531,12488,12466,12531]],[[13143,13143],"mapped",[12527,12483,12488]],[[13144,13144],"mapped",[48,28857]],[[13145,13145],"mapped",[49,28857]],[[13146,13146],"mapped",[50,28857]],[[13147,13147],"mapped",[51,28857]],[[13148,13148],"mapped",[52,28857]],[[13149,13149],"mapped",[53,28857]],[[13150,13150],"mapped",[54,28857]],[[13151,13151],"mapped",[55,28857]],[[13152,13152],"mapped",[56,28857]],[[13153,13153],"mapped",[57,28857]],[[13154,13154],"mapped",[49,48,28857]],[[13155,13155],"mapped",[49,49,28857]],[[13156,13156],"mapped",[49,50,28857]],[[13157,13157],"mapped",[49,51,28857]],[[13158,13158],"mapped",[49,52,28857]],[[13159,13159],"mapped",[49,53,28857]],[[13160,13160],"mapped",[49,54,28857]],[[13161,13161],"mapped",[49,55,28857]],[[13162,13162],"mapped",[49,56,28857]],[[13163,13163],"mapped",[49,57,28857]],[[13164,13164],"mapped",[50,48,28857]],[[13165,13165],"mapped",[50,49,28857]],[[13166,13166],"mapped",[50,50,28857]],[[13167,13167],"mapped",[50,51,28857]],[[13168,13168],"mapped",[50,52,28857]],[[13169,13169],"mapped",[104,112,97]],[[13170,13170],"mapped",[100,97]],[[13171,13171],"mapped",[97,117]],[[13172,13172],"mapped",[98,97,114]],[[13173,13173],"mapped",[111,118]],[[13174,13174],"mapped",[112,99]],[[13175,13175],"mapped",[100,109]],[[13176,13176],"mapped",[100,109,50]],[[13177,13177],"mapped",[100,109,51]],[[13178,13178],"mapped",[105,117]],[[13179,13179],"mapped",[24179,25104]],[[13180,13180],"mapped",[26157,21644]],[[13181,13181],"mapped",[22823,27491]],[[13182,13182],"mapped",[26126,27835]],[[13183,13183],"mapped",[26666,24335,20250,31038]],[[13184,13184],"mapped",[112,97]],[[13185,13185],"mapped",[110,97]],[[13186,13186],"mapped",[956,97]],[[13187,13187],"mapped",[109,97]],[[13188,13188],"mapped",[107,97]],[[13189,13189],"mapped",[107,98]],[[13190,13190],"mapped",[109,98]],[[13191,13191],"mapped",[103,98]],[[13192,13192],"mapped",[99,97,108]],[[13193,13193],"mapped",[107,99,97,108]],[[13194,13194],"mapped",[112,102]],[[13195,13195],"mapped",[110,102]],[[13196,13196],"mapped",[956,102]],[[13197,13197],"mapped",[956,103]],[[13198,13198],"mapped",[109,103]],[[13199,13199],"mapped",[107,103]],[[13200,13200],"mapped",[104,122]],[[13201,13201],"mapped",[107,104,122]],[[13202,13202],"mapped",[109,104,122]],[[13203,13203],"mapped",[103,104,122]],[[13204,13204],"mapped",[116,104,122]],[[13205,13205],"mapped",[956,108]],[[13206,13206],"mapped",[109,108]],[[13207,13207],"mapped",[100,108]],[[13208,13208],"mapped",[107,108]],[[13209,13209],"mapped",[102,109]],[[13210,13210],"mapped",[110,109]],[[13211,13211],"mapped",[956,109]],[[13212,13212],"mapped",[109,109]],[[13213,13213],"mapped",[99,109]],[[13214,13214],"mapped",[107,109]],[[13215,13215],"mapped",[109,109,50]],[[13216,13216],"mapped",[99,109,50]],[[13217,13217],"mapped",[109,50]],[[13218,13218],"mapped",[107,109,50]],[[13219,13219],"mapped",[109,109,51]],[[13220,13220],"mapped",[99,109,51]],[[13221,13221],"mapped",[109,51]],[[13222,13222],"mapped",[107,109,51]],[[13223,13223],"mapped",[109,8725,115]],[[13224,13224],"mapped",[109,8725,115,50]],[[13225,13225],"mapped",[112,97]],[[13226,13226],"mapped",[107,112,97]],[[13227,13227],"mapped",[109,112,97]],[[13228,13228],"mapped",[103,112,97]],[[13229,13229],"mapped",[114,97,100]],[[13230,13230],"mapped",[114,97,100,8725,115]],[[13231,13231],"mapped",[114,97,100,8725,115,50]],[[13232,13232],"mapped",[112,115]],[[13233,13233],"mapped",[110,115]],[[13234,13234],"mapped",[956,115]],[[13235,13235],"mapped",[109,115]],[[13236,13236],"mapped",[112,118]],[[13237,13237],"mapped",[110,118]],[[13238,13238],"mapped",[956,118]],[[13239,13239],"mapped",[109,118]],[[13240,13240],"mapped",[107,118]],[[13241,13241],"mapped",[109,118]],[[13242,13242],"mapped",[112,119]],[[13243,13243],"mapped",[110,119]],[[13244,13244],"mapped",[956,119]],[[13245,13245],"mapped",[109,119]],[[13246,13246],"mapped",[107,119]],[[13247,13247],"mapped",[109,119]],[[13248,13248],"mapped",[107,969]],[[13249,13249],"mapped",[109,969]],[[13250,13250],"disallowed"],[[13251,13251],"mapped",[98,113]],[[13252,13252],"mapped",[99,99]],[[13253,13253],"mapped",[99,100]],[[13254,13254],"mapped",[99,8725,107,103]],[[13255,13255],"disallowed"],[[13256,13256],"mapped",[100,98]],[[13257,13257],"mapped",[103,121]],[[13258,13258],"mapped",[104,97]],[[13259,13259],"mapped",[104,112]],[[13260,13260],"mapped",[105,110]],[[13261,13261],"mapped",[107,107]],[[13262,13262],"mapped",[107,109]],[[13263,13263],"mapped",[107,116]],[[13264,13264],"mapped",[108,109]],[[13265,13265],"mapped",[108,110]],[[13266,13266],"mapped",[108,111,103]],[[13267,13267],"mapped",[108,120]],[[13268,13268],"mapped",[109,98]],[[13269,13269],"mapped",[109,105,108]],[[13270,13270],"mapped",[109,111,108]],[[13271,13271],"mapped",[112,104]],[[13272,13272],"disallowed"],[[13273,13273],"mapped",[112,112,109]],[[13274,13274],"mapped",[112,114]],[[13275,13275],"mapped",[115,114]],[[13276,13276],"mapped",[115,118]],[[13277,13277],"mapped",[119,98]],[[13278,13278],"mapped",[118,8725,109]],[[13279,13279],"mapped",[97,8725,109]],[[13280,13280],"mapped",[49,26085]],[[13281,13281],"mapped",[50,26085]],[[13282,13282],"mapped",[51,26085]],[[13283,13283],"mapped",[52,26085]],[[13284,13284],"mapped",[53,26085]],[[13285,13285],"mapped",[54,26085]],[[13286,13286],"mapped",[55,26085]],[[13287,13287],"mapped",[56,26085]],[[13288,13288],"mapped",[57,26085]],[[13289,13289],"mapped",[49,48,26085]],[[13290,13290],"mapped",[49,49,26085]],[[13291,13291],"mapped",[49,50,26085]],[[13292,13292],"mapped",[49,51,26085]],[[13293,13293],"mapped",[49,52,26085]],[[13294,13294],"mapped",[49,53,26085]],[[13295,13295],"mapped",[49,54,26085]],[[13296,13296],"mapped",[49,55,26085]],[[13297,13297],"mapped",[49,56,26085]],[[13298,13298],"mapped",[49,57,26085]],[[13299,13299],"mapped",[50,48,26085]],[[13300,13300],"mapped",[50,49,26085]],[[13301,13301],"mapped",[50,50,26085]],[[13302,13302],"mapped",[50,51,26085]],[[13303,13303],"mapped",[50,52,26085]],[[13304,13304],"mapped",[50,53,26085]],[[13305,13305],"mapped",[50,54,26085]],[[13306,13306],"mapped",[50,55,26085]],[[13307,13307],"mapped",[50,56,26085]],[[13308,13308],"mapped",[50,57,26085]],[[13309,13309],"mapped",[51,48,26085]],[[13310,13310],"mapped",[51,49,26085]],[[13311,13311],"mapped",[103,97,108]],[[13312,19893],"valid"],[[19894,19903],"disallowed"],[[19904,19967],"valid",[],"NV8"],[[19968,40869],"valid"],[[40870,40891],"valid"],[[40892,40899],"valid"],[[40900,40907],"valid"],[[40908,40908],"valid"],[[40909,40917],"valid"],[[40918,40959],"disallowed"],[[40960,42124],"valid"],[[42125,42127],"disallowed"],[[42128,42145],"valid",[],"NV8"],[[42146,42147],"valid",[],"NV8"],[[42148,42163],"valid",[],"NV8"],[[42164,42164],"valid",[],"NV8"],[[42165,42176],"valid",[],"NV8"],[[42177,42177],"valid",[],"NV8"],[[42178,42180],"valid",[],"NV8"],[[42181,42181],"valid",[],"NV8"],[[42182,42182],"valid",[],"NV8"],[[42183,42191],"disallowed"],[[42192,42237],"valid"],[[42238,42239],"valid",[],"NV8"],[[42240,42508],"valid"],[[42509,42511],"valid",[],"NV8"],[[42512,42539],"valid"],[[42540,42559],"disallowed"],[[42560,42560],"mapped",[42561]],[[42561,42561],"valid"],[[42562,42562],"mapped",[42563]],[[42563,42563],"valid"],[[42564,42564],"mapped",[42565]],[[42565,42565],"valid"],[[42566,42566],"mapped",[42567]],[[42567,42567],"valid"],[[42568,42568],"mapped",[42569]],[[42569,42569],"valid"],[[42570,42570],"mapped",[42571]],[[42571,42571],"valid"],[[42572,42572],"mapped",[42573]],[[42573,42573],"valid"],[[42574,42574],"mapped",[42575]],[[42575,42575],"valid"],[[42576,42576],"mapped",[42577]],[[42577,42577],"valid"],[[42578,42578],"mapped",[42579]],[[42579,42579],"valid"],[[42580,42580],"mapped",[42581]],[[42581,42581],"valid"],[[42582,42582],"mapped",[42583]],[[42583,42583],"valid"],[[42584,42584],"mapped",[42585]],[[42585,42585],"valid"],[[42586,42586],"mapped",[42587]],[[42587,42587],"valid"],[[42588,42588],"mapped",[42589]],[[42589,42589],"valid"],[[42590,42590],"mapped",[42591]],[[42591,42591],"valid"],[[42592,42592],"mapped",[42593]],[[42593,42593],"valid"],[[42594,42594],"mapped",[42595]],[[42595,42595],"valid"],[[42596,42596],"mapped",[42597]],[[42597,42597],"valid"],[[42598,42598],"mapped",[42599]],[[42599,42599],"valid"],[[42600,42600],"mapped",[42601]],[[42601,42601],"valid"],[[42602,42602],"mapped",[42603]],[[42603,42603],"valid"],[[42604,42604],"mapped",[42605]],[[42605,42607],"valid"],[[42608,42611],"valid",[],"NV8"],[[42612,42619],"valid"],[[42620,42621],"valid"],[[42622,42622],"valid",[],"NV8"],[[42623,42623],"valid"],[[42624,42624],"mapped",[42625]],[[42625,42625],"valid"],[[42626,42626],"mapped",[42627]],[[42627,42627],"valid"],[[42628,42628],"mapped",[42629]],[[42629,42629],"valid"],[[42630,42630],"mapped",[42631]],[[42631,42631],"valid"],[[42632,42632],"mapped",[42633]],[[42633,42633],"valid"],[[42634,42634],"mapped",[42635]],[[42635,42635],"valid"],[[42636,42636],"mapped",[42637]],[[42637,42637],"valid"],[[42638,42638],"mapped",[42639]],[[42639,42639],"valid"],[[42640,42640],"mapped",[42641]],[[42641,42641],"valid"],[[42642,42642],"mapped",[42643]],[[42643,42643],"valid"],[[42644,42644],"mapped",[42645]],[[42645,42645],"valid"],[[42646,42646],"mapped",[42647]],[[42647,42647],"valid"],[[42648,42648],"mapped",[42649]],[[42649,42649],"valid"],[[42650,42650],"mapped",[42651]],[[42651,42651],"valid"],[[42652,42652],"mapped",[1098]],[[42653,42653],"mapped",[1100]],[[42654,42654],"valid"],[[42655,42655],"valid"],[[42656,42725],"valid"],[[42726,42735],"valid",[],"NV8"],[[42736,42737],"valid"],[[42738,42743],"valid",[],"NV8"],[[42744,42751],"disallowed"],[[42752,42774],"valid",[],"NV8"],[[42775,42778],"valid"],[[42779,42783],"valid"],[[42784,42785],"valid",[],"NV8"],[[42786,42786],"mapped",[42787]],[[42787,42787],"valid"],[[42788,42788],"mapped",[42789]],[[42789,42789],"valid"],[[42790,42790],"mapped",[42791]],[[42791,42791],"valid"],[[42792,42792],"mapped",[42793]],[[42793,42793],"valid"],[[42794,42794],"mapped",[42795]],[[42795,42795],"valid"],[[42796,42796],"mapped",[42797]],[[42797,42797],"valid"],[[42798,42798],"mapped",[42799]],[[42799,42801],"valid"],[[42802,42802],"mapped",[42803]],[[42803,42803],"valid"],[[42804,42804],"mapped",[42805]],[[42805,42805],"valid"],[[42806,42806],"mapped",[42807]],[[42807,42807],"valid"],[[42808,42808],"mapped",[42809]],[[42809,42809],"valid"],[[42810,42810],"mapped",[42811]],[[42811,42811],"valid"],[[42812,42812],"mapped",[42813]],[[42813,42813],"valid"],[[42814,42814],"mapped",[42815]],[[42815,42815],"valid"],[[42816,42816],"mapped",[42817]],[[42817,42817],"valid"],[[42818,42818],"mapped",[42819]],[[42819,42819],"valid"],[[42820,42820],"mapped",[42821]],[[42821,42821],"valid"],[[42822,42822],"mapped",[42823]],[[42823,42823],"valid"],[[42824,42824],"mapped",[42825]],[[42825,42825],"valid"],[[42826,42826],"mapped",[42827]],[[42827,42827],"valid"],[[42828,42828],"mapped",[42829]],[[42829,42829],"valid"],[[42830,42830],"mapped",[42831]],[[42831,42831],"valid"],[[42832,42832],"mapped",[42833]],[[42833,42833],"valid"],[[42834,42834],"mapped",[42835]],[[42835,42835],"valid"],[[42836,42836],"mapped",[42837]],[[42837,42837],"valid"],[[42838,42838],"mapped",[42839]],[[42839,42839],"valid"],[[42840,42840],"mapped",[42841]],[[42841,42841],"valid"],[[42842,42842],"mapped",[42843]],[[42843,42843],"valid"],[[42844,42844],"mapped",[42845]],[[42845,42845],"valid"],[[42846,42846],"mapped",[42847]],[[42847,42847],"valid"],[[42848,42848],"mapped",[42849]],[[42849,42849],"valid"],[[42850,42850],"mapped",[42851]],[[42851,42851],"valid"],[[42852,42852],"mapped",[42853]],[[42853,42853],"valid"],[[42854,42854],"mapped",[42855]],[[42855,42855],"valid"],[[42856,42856],"mapped",[42857]],[[42857,42857],"valid"],[[42858,42858],"mapped",[42859]],[[42859,42859],"valid"],[[42860,42860],"mapped",[42861]],[[42861,42861],"valid"],[[42862,42862],"mapped",[42863]],[[42863,42863],"valid"],[[42864,42864],"mapped",[42863]],[[42865,42872],"valid"],[[42873,42873],"mapped",[42874]],[[42874,42874],"valid"],[[42875,42875],"mapped",[42876]],[[42876,42876],"valid"],[[42877,42877],"mapped",[7545]],[[42878,42878],"mapped",[42879]],[[42879,42879],"valid"],[[42880,42880],"mapped",[42881]],[[42881,42881],"valid"],[[42882,42882],"mapped",[42883]],[[42883,42883],"valid"],[[42884,42884],"mapped",[42885]],[[42885,42885],"valid"],[[42886,42886],"mapped",[42887]],[[42887,42888],"valid"],[[42889,42890],"valid",[],"NV8"],[[42891,42891],"mapped",[42892]],[[42892,42892],"valid"],[[42893,42893],"mapped",[613]],[[42894,42894],"valid"],[[42895,42895],"valid"],[[42896,42896],"mapped",[42897]],[[42897,42897],"valid"],[[42898,42898],"mapped",[42899]],[[42899,42899],"valid"],[[42900,42901],"valid"],[[42902,42902],"mapped",[42903]],[[42903,42903],"valid"],[[42904,42904],"mapped",[42905]],[[42905,42905],"valid"],[[42906,42906],"mapped",[42907]],[[42907,42907],"valid"],[[42908,42908],"mapped",[42909]],[[42909,42909],"valid"],[[42910,42910],"mapped",[42911]],[[42911,42911],"valid"],[[42912,42912],"mapped",[42913]],[[42913,42913],"valid"],[[42914,42914],"mapped",[42915]],[[42915,42915],"valid"],[[42916,42916],"mapped",[42917]],[[42917,42917],"valid"],[[42918,42918],"mapped",[42919]],[[42919,42919],"valid"],[[42920,42920],"mapped",[42921]],[[42921,42921],"valid"],[[42922,42922],"mapped",[614]],[[42923,42923],"mapped",[604]],[[42924,42924],"mapped",[609]],[[42925,42925],"mapped",[620]],[[42926,42927],"disallowed"],[[42928,42928],"mapped",[670]],[[42929,42929],"mapped",[647]],[[42930,42930],"mapped",[669]],[[42931,42931],"mapped",[43859]],[[42932,42932],"mapped",[42933]],[[42933,42933],"valid"],[[42934,42934],"mapped",[42935]],[[42935,42935],"valid"],[[42936,42998],"disallowed"],[[42999,42999],"valid"],[[43000,43000],"mapped",[295]],[[43001,43001],"mapped",[339]],[[43002,43002],"valid"],[[43003,43007],"valid"],[[43008,43047],"valid"],[[43048,43051],"valid",[],"NV8"],[[43052,43055],"disallowed"],[[43056,43065],"valid",[],"NV8"],[[43066,43071],"disallowed"],[[43072,43123],"valid"],[[43124,43127],"valid",[],"NV8"],[[43128,43135],"disallowed"],[[43136,43204],"valid"],[[43205,43213],"disallowed"],[[43214,43215],"valid",[],"NV8"],[[43216,43225],"valid"],[[43226,43231],"disallowed"],[[43232,43255],"valid"],[[43256,43258],"valid",[],"NV8"],[[43259,43259],"valid"],[[43260,43260],"valid",[],"NV8"],[[43261,43261],"valid"],[[43262,43263],"disallowed"],[[43264,43309],"valid"],[[43310,43311],"valid",[],"NV8"],[[43312,43347],"valid"],[[43348,43358],"disallowed"],[[43359,43359],"valid",[],"NV8"],[[43360,43388],"valid",[],"NV8"],[[43389,43391],"disallowed"],[[43392,43456],"valid"],[[43457,43469],"valid",[],"NV8"],[[43470,43470],"disallowed"],[[43471,43481],"valid"],[[43482,43485],"disallowed"],[[43486,43487],"valid",[],"NV8"],[[43488,43518],"valid"],[[43519,43519],"disallowed"],[[43520,43574],"valid"],[[43575,43583],"disallowed"],[[43584,43597],"valid"],[[43598,43599],"disallowed"],[[43600,43609],"valid"],[[43610,43611],"disallowed"],[[43612,43615],"valid",[],"NV8"],[[43616,43638],"valid"],[[43639,43641],"valid",[],"NV8"],[[43642,43643],"valid"],[[43644,43647],"valid"],[[43648,43714],"valid"],[[43715,43738],"disallowed"],[[43739,43741],"valid"],[[43742,43743],"valid",[],"NV8"],[[43744,43759],"valid"],[[43760,43761],"valid",[],"NV8"],[[43762,43766],"valid"],[[43767,43776],"disallowed"],[[43777,43782],"valid"],[[43783,43784],"disallowed"],[[43785,43790],"valid"],[[43791,43792],"disallowed"],[[43793,43798],"valid"],[[43799,43807],"disallowed"],[[43808,43814],"valid"],[[43815,43815],"disallowed"],[[43816,43822],"valid"],[[43823,43823],"disallowed"],[[43824,43866],"valid"],[[43867,43867],"valid",[],"NV8"],[[43868,43868],"mapped",[42791]],[[43869,43869],"mapped",[43831]],[[43870,43870],"mapped",[619]],[[43871,43871],"mapped",[43858]],[[43872,43875],"valid"],[[43876,43877],"valid"],[[43878,43887],"disallowed"],[[43888,43888],"mapped",[5024]],[[43889,43889],"mapped",[5025]],[[43890,43890],"mapped",[5026]],[[43891,43891],"mapped",[5027]],[[43892,43892],"mapped",[5028]],[[43893,43893],"mapped",[5029]],[[43894,43894],"mapped",[5030]],[[43895,43895],"mapped",[5031]],[[43896,43896],"mapped",[5032]],[[43897,43897],"mapped",[5033]],[[43898,43898],"mapped",[5034]],[[43899,43899],"mapped",[5035]],[[43900,43900],"mapped",[5036]],[[43901,43901],"mapped",[5037]],[[43902,43902],"mapped",[5038]],[[43903,43903],"mapped",[5039]],[[43904,43904],"mapped",[5040]],[[43905,43905],"mapped",[5041]],[[43906,43906],"mapped",[5042]],[[43907,43907],"mapped",[5043]],[[43908,43908],"mapped",[5044]],[[43909,43909],"mapped",[5045]],[[43910,43910],"mapped",[5046]],[[43911,43911],"mapped",[5047]],[[43912,43912],"mapped",[5048]],[[43913,43913],"mapped",[5049]],[[43914,43914],"mapped",[5050]],[[43915,43915],"mapped",[5051]],[[43916,43916],"mapped",[5052]],[[43917,43917],"mapped",[5053]],[[43918,43918],"mapped",[5054]],[[43919,43919],"mapped",[5055]],[[43920,43920],"mapped",[5056]],[[43921,43921],"mapped",[5057]],[[43922,43922],"mapped",[5058]],[[43923,43923],"mapped",[5059]],[[43924,43924],"mapped",[5060]],[[43925,43925],"mapped",[5061]],[[43926,43926],"mapped",[5062]],[[43927,43927],"mapped",[5063]],[[43928,43928],"mapped",[5064]],[[43929,43929],"mapped",[5065]],[[43930,43930],"mapped",[5066]],[[43931,43931],"mapped",[5067]],[[43932,43932],"mapped",[5068]],[[43933,43933],"mapped",[5069]],[[43934,43934],"mapped",[5070]],[[43935,43935],"mapped",[5071]],[[43936,43936],"mapped",[5072]],[[43937,43937],"mapped",[5073]],[[43938,43938],"mapped",[5074]],[[43939,43939],"mapped",[5075]],[[43940,43940],"mapped",[5076]],[[43941,43941],"mapped",[5077]],[[43942,43942],"mapped",[5078]],[[43943,43943],"mapped",[5079]],[[43944,43944],"mapped",[5080]],[[43945,43945],"mapped",[5081]],[[43946,43946],"mapped",[5082]],[[43947,43947],"mapped",[5083]],[[43948,43948],"mapped",[5084]],[[43949,43949],"mapped",[5085]],[[43950,43950],"mapped",[5086]],[[43951,43951],"mapped",[5087]],[[43952,43952],"mapped",[5088]],[[43953,43953],"mapped",[5089]],[[43954,43954],"mapped",[5090]],[[43955,43955],"mapped",[5091]],[[43956,43956],"mapped",[5092]],[[43957,43957],"mapped",[5093]],[[43958,43958],"mapped",[5094]],[[43959,43959],"mapped",[5095]],[[43960,43960],"mapped",[5096]],[[43961,43961],"mapped",[5097]],[[43962,43962],"mapped",[5098]],[[43963,43963],"mapped",[5099]],[[43964,43964],"mapped",[5100]],[[43965,43965],"mapped",[5101]],[[43966,43966],"mapped",[5102]],[[43967,43967],"mapped",[5103]],[[43968,44010],"valid"],[[44011,44011],"valid",[],"NV8"],[[44012,44013],"valid"],[[44014,44015],"disallowed"],[[44016,44025],"valid"],[[44026,44031],"disallowed"],[[44032,55203],"valid"],[[55204,55215],"disallowed"],[[55216,55238],"valid",[],"NV8"],[[55239,55242],"disallowed"],[[55243,55291],"valid",[],"NV8"],[[55292,55295],"disallowed"],[[55296,57343],"disallowed"],[[57344,63743],"disallowed"],[[63744,63744],"mapped",[35912]],[[63745,63745],"mapped",[26356]],[[63746,63746],"mapped",[36554]],[[63747,63747],"mapped",[36040]],[[63748,63748],"mapped",[28369]],[[63749,63749],"mapped",[20018]],[[63750,63750],"mapped",[21477]],[[63751,63752],"mapped",[40860]],[[63753,63753],"mapped",[22865]],[[63754,63754],"mapped",[37329]],[[63755,63755],"mapped",[21895]],[[63756,63756],"mapped",[22856]],[[63757,63757],"mapped",[25078]],[[63758,63758],"mapped",[30313]],[[63759,63759],"mapped",[32645]],[[63760,63760],"mapped",[34367]],[[63761,63761],"mapped",[34746]],[[63762,63762],"mapped",[35064]],[[63763,63763],"mapped",[37007]],[[63764,63764],"mapped",[27138]],[[63765,63765],"mapped",[27931]],[[63766,63766],"mapped",[28889]],[[63767,63767],"mapped",[29662]],[[63768,63768],"mapped",[33853]],[[63769,63769],"mapped",[37226]],[[63770,63770],"mapped",[39409]],[[63771,63771],"mapped",[20098]],[[63772,63772],"mapped",[21365]],[[63773,63773],"mapped",[27396]],[[63774,63774],"mapped",[29211]],[[63775,63775],"mapped",[34349]],[[63776,63776],"mapped",[40478]],[[63777,63777],"mapped",[23888]],[[63778,63778],"mapped",[28651]],[[63779,63779],"mapped",[34253]],[[63780,63780],"mapped",[35172]],[[63781,63781],"mapped",[25289]],[[63782,63782],"mapped",[33240]],[[63783,63783],"mapped",[34847]],[[63784,63784],"mapped",[24266]],[[63785,63785],"mapped",[26391]],[[63786,63786],"mapped",[28010]],[[63787,63787],"mapped",[29436]],[[63788,63788],"mapped",[37070]],[[63789,63789],"mapped",[20358]],[[63790,63790],"mapped",[20919]],[[63791,63791],"mapped",[21214]],[[63792,63792],"mapped",[25796]],[[63793,63793],"mapped",[27347]],[[63794,63794],"mapped",[29200]],[[63795,63795],"mapped",[30439]],[[63796,63796],"mapped",[32769]],[[63797,63797],"mapped",[34310]],[[63798,63798],"mapped",[34396]],[[63799,63799],"mapped",[36335]],[[63800,63800],"mapped",[38706]],[[63801,63801],"mapped",[39791]],[[63802,63802],"mapped",[40442]],[[63803,63803],"mapped",[30860]],[[63804,63804],"mapped",[31103]],[[63805,63805],"mapped",[32160]],[[63806,63806],"mapped",[33737]],[[63807,63807],"mapped",[37636]],[[63808,63808],"mapped",[40575]],[[63809,63809],"mapped",[35542]],[[63810,63810],"mapped",[22751]],[[63811,63811],"mapped",[24324]],[[63812,63812],"mapped",[31840]],[[63813,63813],"mapped",[32894]],[[63814,63814],"mapped",[29282]],[[63815,63815],"mapped",[30922]],[[63816,63816],"mapped",[36034]],[[63817,63817],"mapped",[38647]],[[63818,63818],"mapped",[22744]],[[63819,63819],"mapped",[23650]],[[63820,63820],"mapped",[27155]],[[63821,63821],"mapped",[28122]],[[63822,63822],"mapped",[28431]],[[63823,63823],"mapped",[32047]],[[63824,63824],"mapped",[32311]],[[63825,63825],"mapped",[38475]],[[63826,63826],"mapped",[21202]],[[63827,63827],"mapped",[32907]],[[63828,63828],"mapped",[20956]],[[63829,63829],"mapped",[20940]],[[63830,63830],"mapped",[31260]],[[63831,63831],"mapped",[32190]],[[63832,63832],"mapped",[33777]],[[63833,63833],"mapped",[38517]],[[63834,63834],"mapped",[35712]],[[63835,63835],"mapped",[25295]],[[63836,63836],"mapped",[27138]],[[63837,63837],"mapped",[35582]],[[63838,63838],"mapped",[20025]],[[63839,63839],"mapped",[23527]],[[63840,63840],"mapped",[24594]],[[63841,63841],"mapped",[29575]],[[63842,63842],"mapped",[30064]],[[63843,63843],"mapped",[21271]],[[63844,63844],"mapped",[30971]],[[63845,63845],"mapped",[20415]],[[63846,63846],"mapped",[24489]],[[63847,63847],"mapped",[19981]],[[63848,63848],"mapped",[27852]],[[63849,63849],"mapped",[25976]],[[63850,63850],"mapped",[32034]],[[63851,63851],"mapped",[21443]],[[63852,63852],"mapped",[22622]],[[63853,63853],"mapped",[30465]],[[63854,63854],"mapped",[33865]],[[63855,63855],"mapped",[35498]],[[63856,63856],"mapped",[27578]],[[63857,63857],"mapped",[36784]],[[63858,63858],"mapped",[27784]],[[63859,63859],"mapped",[25342]],[[63860,63860],"mapped",[33509]],[[63861,63861],"mapped",[25504]],[[63862,63862],"mapped",[30053]],[[63863,63863],"mapped",[20142]],[[63864,63864],"mapped",[20841]],[[63865,63865],"mapped",[20937]],[[63866,63866],"mapped",[26753]],[[63867,63867],"mapped",[31975]],[[63868,63868],"mapped",[33391]],[[63869,63869],"mapped",[35538]],[[63870,63870],"mapped",[37327]],[[63871,63871],"mapped",[21237]],[[63872,63872],"mapped",[21570]],[[63873,63873],"mapped",[22899]],[[63874,63874],"mapped",[24300]],[[63875,63875],"mapped",[26053]],[[63876,63876],"mapped",[28670]],[[63877,63877],"mapped",[31018]],[[63878,63878],"mapped",[38317]],[[63879,63879],"mapped",[39530]],[[63880,63880],"mapped",[40599]],[[63881,63881],"mapped",[40654]],[[63882,63882],"mapped",[21147]],[[63883,63883],"mapped",[26310]],[[63884,63884],"mapped",[27511]],[[63885,63885],"mapped",[36706]],[[63886,63886],"mapped",[24180]],[[63887,63887],"mapped",[24976]],[[63888,63888],"mapped",[25088]],[[63889,63889],"mapped",[25754]],[[63890,63890],"mapped",[28451]],[[63891,63891],"mapped",[29001]],[[63892,63892],"mapped",[29833]],[[63893,63893],"mapped",[31178]],[[63894,63894],"mapped",[32244]],[[63895,63895],"mapped",[32879]],[[63896,63896],"mapped",[36646]],[[63897,63897],"mapped",[34030]],[[63898,63898],"mapped",[36899]],[[63899,63899],"mapped",[37706]],[[63900,63900],"mapped",[21015]],[[63901,63901],"mapped",[21155]],[[63902,63902],"mapped",[21693]],[[63903,63903],"mapped",[28872]],[[63904,63904],"mapped",[35010]],[[63905,63905],"mapped",[35498]],[[63906,63906],"mapped",[24265]],[[63907,63907],"mapped",[24565]],[[63908,63908],"mapped",[25467]],[[63909,63909],"mapped",[27566]],[[63910,63910],"mapped",[31806]],[[63911,63911],"mapped",[29557]],[[63912,63912],"mapped",[20196]],[[63913,63913],"mapped",[22265]],[[63914,63914],"mapped",[23527]],[[63915,63915],"mapped",[23994]],[[63916,63916],"mapped",[24604]],[[63917,63917],"mapped",[29618]],[[63918,63918],"mapped",[29801]],[[63919,63919],"mapped",[32666]],[[63920,63920],"mapped",[32838]],[[63921,63921],"mapped",[37428]],[[63922,63922],"mapped",[38646]],[[63923,63923],"mapped",[38728]],[[63924,63924],"mapped",[38936]],[[63925,63925],"mapped",[20363]],[[63926,63926],"mapped",[31150]],[[63927,63927],"mapped",[37300]],[[63928,63928],"mapped",[38584]],[[63929,63929],"mapped",[24801]],[[63930,63930],"mapped",[20102]],[[63931,63931],"mapped",[20698]],[[63932,63932],"mapped",[23534]],[[63933,63933],"mapped",[23615]],[[63934,63934],"mapped",[26009]],[[63935,63935],"mapped",[27138]],[[63936,63936],"mapped",[29134]],[[63937,63937],"mapped",[30274]],[[63938,63938],"mapped",[34044]],[[63939,63939],"mapped",[36988]],[[63940,63940],"mapped",[40845]],[[63941,63941],"mapped",[26248]],[[63942,63942],"mapped",[38446]],[[63943,63943],"mapped",[21129]],[[63944,63944],"mapped",[26491]],[[63945,63945],"mapped",[26611]],[[63946,63946],"mapped",[27969]],[[63947,63947],"mapped",[28316]],[[63948,63948],"mapped",[29705]],[[63949,63949],"mapped",[30041]],[[63950,63950],"mapped",[30827]],[[63951,63951],"mapped",[32016]],[[63952,63952],"mapped",[39006]],[[63953,63953],"mapped",[20845]],[[63954,63954],"mapped",[25134]],[[63955,63955],"mapped",[38520]],[[63956,63956],"mapped",[20523]],[[63957,63957],"mapped",[23833]],[[63958,63958],"mapped",[28138]],[[63959,63959],"mapped",[36650]],[[63960,63960],"mapped",[24459]],[[63961,63961],"mapped",[24900]],[[63962,63962],"mapped",[26647]],[[63963,63963],"mapped",[29575]],[[63964,63964],"mapped",[38534]],[[63965,63965],"mapped",[21033]],[[63966,63966],"mapped",[21519]],[[63967,63967],"mapped",[23653]],[[63968,63968],"mapped",[26131]],[[63969,63969],"mapped",[26446]],[[63970,63970],"mapped",[26792]],[[63971,63971],"mapped",[27877]],[[63972,63972],"mapped",[29702]],[[63973,63973],"mapped",[30178]],[[63974,63974],"mapped",[32633]],[[63975,63975],"mapped",[35023]],[[63976,63976],"mapped",[35041]],[[63977,63977],"mapped",[37324]],[[63978,63978],"mapped",[38626]],[[63979,63979],"mapped",[21311]],[[63980,63980],"mapped",[28346]],[[63981,63981],"mapped",[21533]],[[63982,63982],"mapped",[29136]],[[63983,63983],"mapped",[29848]],[[63984,63984],"mapped",[34298]],[[63985,63985],"mapped",[38563]],[[63986,63986],"mapped",[40023]],[[63987,63987],"mapped",[40607]],[[63988,63988],"mapped",[26519]],[[63989,63989],"mapped",[28107]],[[63990,63990],"mapped",[33256]],[[63991,63991],"mapped",[31435]],[[63992,63992],"mapped",[31520]],[[63993,63993],"mapped",[31890]],[[63994,63994],"mapped",[29376]],[[63995,63995],"mapped",[28825]],[[63996,63996],"mapped",[35672]],[[63997,63997],"mapped",[20160]],[[63998,63998],"mapped",[33590]],[[63999,63999],"mapped",[21050]],[[64000,64000],"mapped",[20999]],[[64001,64001],"mapped",[24230]],[[64002,64002],"mapped",[25299]],[[64003,64003],"mapped",[31958]],[[64004,64004],"mapped",[23429]],[[64005,64005],"mapped",[27934]],[[64006,64006],"mapped",[26292]],[[64007,64007],"mapped",[36667]],[[64008,64008],"mapped",[34892]],[[64009,64009],"mapped",[38477]],[[64010,64010],"mapped",[35211]],[[64011,64011],"mapped",[24275]],[[64012,64012],"mapped",[20800]],[[64013,64013],"mapped",[21952]],[[64014,64015],"valid"],[[64016,64016],"mapped",[22618]],[[64017,64017],"valid"],[[64018,64018],"mapped",[26228]],[[64019,64020],"valid"],[[64021,64021],"mapped",[20958]],[[64022,64022],"mapped",[29482]],[[64023,64023],"mapped",[30410]],[[64024,64024],"mapped",[31036]],[[64025,64025],"mapped",[31070]],[[64026,64026],"mapped",[31077]],[[64027,64027],"mapped",[31119]],[[64028,64028],"mapped",[38742]],[[64029,64029],"mapped",[31934]],[[64030,64030],"mapped",[32701]],[[64031,64031],"valid"],[[64032,64032],"mapped",[34322]],[[64033,64033],"valid"],[[64034,64034],"mapped",[35576]],[[64035,64036],"valid"],[[64037,64037],"mapped",[36920]],[[64038,64038],"mapped",[37117]],[[64039,64041],"valid"],[[64042,64042],"mapped",[39151]],[[64043,64043],"mapped",[39164]],[[64044,64044],"mapped",[39208]],[[64045,64045],"mapped",[40372]],[[64046,64046],"mapped",[37086]],[[64047,64047],"mapped",[38583]],[[64048,64048],"mapped",[20398]],[[64049,64049],"mapped",[20711]],[[64050,64050],"mapped",[20813]],[[64051,64051],"mapped",[21193]],[[64052,64052],"mapped",[21220]],[[64053,64053],"mapped",[21329]],[[64054,64054],"mapped",[21917]],[[64055,64055],"mapped",[22022]],[[64056,64056],"mapped",[22120]],[[64057,64057],"mapped",[22592]],[[64058,64058],"mapped",[22696]],[[64059,64059],"mapped",[23652]],[[64060,64060],"mapped",[23662]],[[64061,64061],"mapped",[24724]],[[64062,64062],"mapped",[24936]],[[64063,64063],"mapped",[24974]],[[64064,64064],"mapped",[25074]],[[64065,64065],"mapped",[25935]],[[64066,64066],"mapped",[26082]],[[64067,64067],"mapped",[26257]],[[64068,64068],"mapped",[26757]],[[64069,64069],"mapped",[28023]],[[64070,64070],"mapped",[28186]],[[64071,64071],"mapped",[28450]],[[64072,64072],"mapped",[29038]],[[64073,64073],"mapped",[29227]],[[64074,64074],"mapped",[29730]],[[64075,64075],"mapped",[30865]],[[64076,64076],"mapped",[31038]],[[64077,64077],"mapped",[31049]],[[64078,64078],"mapped",[31048]],[[64079,64079],"mapped",[31056]],[[64080,64080],"mapped",[31062]],[[64081,64081],"mapped",[31069]],[[64082,64082],"mapped",[31117]],[[64083,64083],"mapped",[31118]],[[64084,64084],"mapped",[31296]],[[64085,64085],"mapped",[31361]],[[64086,64086],"mapped",[31680]],[[64087,64087],"mapped",[32244]],[[64088,64088],"mapped",[32265]],[[64089,64089],"mapped",[32321]],[[64090,64090],"mapped",[32626]],[[64091,64091],"mapped",[32773]],[[64092,64092],"mapped",[33261]],[[64093,64094],"mapped",[33401]],[[64095,64095],"mapped",[33879]],[[64096,64096],"mapped",[35088]],[[64097,64097],"mapped",[35222]],[[64098,64098],"mapped",[35585]],[[64099,64099],"mapped",[35641]],[[64100,64100],"mapped",[36051]],[[64101,64101],"mapped",[36104]],[[64102,64102],"mapped",[36790]],[[64103,64103],"mapped",[36920]],[[64104,64104],"mapped",[38627]],[[64105,64105],"mapped",[38911]],[[64106,64106],"mapped",[38971]],[[64107,64107],"mapped",[24693]],[[64108,64108],"mapped",[148206]],[[64109,64109],"mapped",[33304]],[[64110,64111],"disallowed"],[[64112,64112],"mapped",[20006]],[[64113,64113],"mapped",[20917]],[[64114,64114],"mapped",[20840]],[[64115,64115],"mapped",[20352]],[[64116,64116],"mapped",[20805]],[[64117,64117],"mapped",[20864]],[[64118,64118],"mapped",[21191]],[[64119,64119],"mapped",[21242]],[[64120,64120],"mapped",[21917]],[[64121,64121],"mapped",[21845]],[[64122,64122],"mapped",[21913]],[[64123,64123],"mapped",[21986]],[[64124,64124],"mapped",[22618]],[[64125,64125],"mapped",[22707]],[[64126,64126],"mapped",[22852]],[[64127,64127],"mapped",[22868]],[[64128,64128],"mapped",[23138]],[[64129,64129],"mapped",[23336]],[[64130,64130],"mapped",[24274]],[[64131,64131],"mapped",[24281]],[[64132,64132],"mapped",[24425]],[[64133,64133],"mapped",[24493]],[[64134,64134],"mapped",[24792]],[[64135,64135],"mapped",[24910]],[[64136,64136],"mapped",[24840]],[[64137,64137],"mapped",[24974]],[[64138,64138],"mapped",[24928]],[[64139,64139],"mapped",[25074]],[[64140,64140],"mapped",[25140]],[[64141,64141],"mapped",[25540]],[[64142,64142],"mapped",[25628]],[[64143,64143],"mapped",[25682]],[[64144,64144],"mapped",[25942]],[[64145,64145],"mapped",[26228]],[[64146,64146],"mapped",[26391]],[[64147,64147],"mapped",[26395]],[[64148,64148],"mapped",[26454]],[[64149,64149],"mapped",[27513]],[[64150,64150],"mapped",[27578]],[[64151,64151],"mapped",[27969]],[[64152,64152],"mapped",[28379]],[[64153,64153],"mapped",[28363]],[[64154,64154],"mapped",[28450]],[[64155,64155],"mapped",[28702]],[[64156,64156],"mapped",[29038]],[[64157,64157],"mapped",[30631]],[[64158,64158],"mapped",[29237]],[[64159,64159],"mapped",[29359]],[[64160,64160],"mapped",[29482]],[[64161,64161],"mapped",[29809]],[[64162,64162],"mapped",[29958]],[[64163,64163],"mapped",[30011]],[[64164,64164],"mapped",[30237]],[[64165,64165],"mapped",[30239]],[[64166,64166],"mapped",[30410]],[[64167,64167],"mapped",[30427]],[[64168,64168],"mapped",[30452]],[[64169,64169],"mapped",[30538]],[[64170,64170],"mapped",[30528]],[[64171,64171],"mapped",[30924]],[[64172,64172],"mapped",[31409]],[[64173,64173],"mapped",[31680]],[[64174,64174],"mapped",[31867]],[[64175,64175],"mapped",[32091]],[[64176,64176],"mapped",[32244]],[[64177,64177],"mapped",[32574]],[[64178,64178],"mapped",[32773]],[[64179,64179],"mapped",[33618]],[[64180,64180],"mapped",[33775]],[[64181,64181],"mapped",[34681]],[[64182,64182],"mapped",[35137]],[[64183,64183],"mapped",[35206]],[[64184,64184],"mapped",[35222]],[[64185,64185],"mapped",[35519]],[[64186,64186],"mapped",[35576]],[[64187,64187],"mapped",[35531]],[[64188,64188],"mapped",[35585]],[[64189,64189],"mapped",[35582]],[[64190,64190],"mapped",[35565]],[[64191,64191],"mapped",[35641]],[[64192,64192],"mapped",[35722]],[[64193,64193],"mapped",[36104]],[[64194,64194],"mapped",[36664]],[[64195,64195],"mapped",[36978]],[[64196,64196],"mapped",[37273]],[[64197,64197],"mapped",[37494]],[[64198,64198],"mapped",[38524]],[[64199,64199],"mapped",[38627]],[[64200,64200],"mapped",[38742]],[[64201,64201],"mapped",[38875]],[[64202,64202],"mapped",[38911]],[[64203,64203],"mapped",[38923]],[[64204,64204],"mapped",[38971]],[[64205,64205],"mapped",[39698]],[[64206,64206],"mapped",[40860]],[[64207,64207],"mapped",[141386]],[[64208,64208],"mapped",[141380]],[[64209,64209],"mapped",[144341]],[[64210,64210],"mapped",[15261]],[[64211,64211],"mapped",[16408]],[[64212,64212],"mapped",[16441]],[[64213,64213],"mapped",[152137]],[[64214,64214],"mapped",[154832]],[[64215,64215],"mapped",[163539]],[[64216,64216],"mapped",[40771]],[[64217,64217],"mapped",[40846]],[[64218,64255],"disallowed"],[[64256,64256],"mapped",[102,102]],[[64257,64257],"mapped",[102,105]],[[64258,64258],"mapped",[102,108]],[[64259,64259],"mapped",[102,102,105]],[[64260,64260],"mapped",[102,102,108]],[[64261,64262],"mapped",[115,116]],[[64263,64274],"disallowed"],[[64275,64275],"mapped",[1396,1398]],[[64276,64276],"mapped",[1396,1381]],[[64277,64277],"mapped",[1396,1387]],[[64278,64278],"mapped",[1406,1398]],[[64279,64279],"mapped",[1396,1389]],[[64280,64284],"disallowed"],[[64285,64285],"mapped",[1497,1460]],[[64286,64286],"valid"],[[64287,64287],"mapped",[1522,1463]],[[64288,64288],"mapped",[1506]],[[64289,64289],"mapped",[1488]],[[64290,64290],"mapped",[1491]],[[64291,64291],"mapped",[1492]],[[64292,64292],"mapped",[1499]],[[64293,64293],"mapped",[1500]],[[64294,64294],"mapped",[1501]],[[64295,64295],"mapped",[1512]],[[64296,64296],"mapped",[1514]],[[64297,64297],"disallowed_STD3_mapped",[43]],[[64298,64298],"mapped",[1513,1473]],[[64299,64299],"mapped",[1513,1474]],[[64300,64300],"mapped",[1513,1468,1473]],[[64301,64301],"mapped",[1513,1468,1474]],[[64302,64302],"mapped",[1488,1463]],[[64303,64303],"mapped",[1488,1464]],[[64304,64304],"mapped",[1488,1468]],[[64305,64305],"mapped",[1489,1468]],[[64306,64306],"mapped",[1490,1468]],[[64307,64307],"mapped",[1491,1468]],[[64308,64308],"mapped",[1492,1468]],[[64309,64309],"mapped",[1493,1468]],[[64310,64310],"mapped",[1494,1468]],[[64311,64311],"disallowed"],[[64312,64312],"mapped",[1496,1468]],[[64313,64313],"mapped",[1497,1468]],[[64314,64314],"mapped",[1498,1468]],[[64315,64315],"mapped",[1499,1468]],[[64316,64316],"mapped",[1500,1468]],[[64317,64317],"disallowed"],[[64318,64318],"mapped",[1502,1468]],[[64319,64319],"disallowed"],[[64320,64320],"mapped",[1504,1468]],[[64321,64321],"mapped",[1505,1468]],[[64322,64322],"disallowed"],[[64323,64323],"mapped",[1507,1468]],[[64324,64324],"mapped",[1508,1468]],[[64325,64325],"disallowed"],[[64326,64326],"mapped",[1510,1468]],[[64327,64327],"mapped",[1511,1468]],[[64328,64328],"mapped",[1512,1468]],[[64329,64329],"mapped",[1513,1468]],[[64330,64330],"mapped",[1514,1468]],[[64331,64331],"mapped",[1493,1465]],[[64332,64332],"mapped",[1489,1471]],[[64333,64333],"mapped",[1499,1471]],[[64334,64334],"mapped",[1508,1471]],[[64335,64335],"mapped",[1488,1500]],[[64336,64337],"mapped",[1649]],[[64338,64341],"mapped",[1659]],[[64342,64345],"mapped",[1662]],[[64346,64349],"mapped",[1664]],[[64350,64353],"mapped",[1658]],[[64354,64357],"mapped",[1663]],[[64358,64361],"mapped",[1657]],[[64362,64365],"mapped",[1700]],[[64366,64369],"mapped",[1702]],[[64370,64373],"mapped",[1668]],[[64374,64377],"mapped",[1667]],[[64378,64381],"mapped",[1670]],[[64382,64385],"mapped",[1671]],[[64386,64387],"mapped",[1677]],[[64388,64389],"mapped",[1676]],[[64390,64391],"mapped",[1678]],[[64392,64393],"mapped",[1672]],[[64394,64395],"mapped",[1688]],[[64396,64397],"mapped",[1681]],[[64398,64401],"mapped",[1705]],[[64402,64405],"mapped",[1711]],[[64406,64409],"mapped",[1715]],[[64410,64413],"mapped",[1713]],[[64414,64415],"mapped",[1722]],[[64416,64419],"mapped",[1723]],[[64420,64421],"mapped",[1728]],[[64422,64425],"mapped",[1729]],[[64426,64429],"mapped",[1726]],[[64430,64431],"mapped",[1746]],[[64432,64433],"mapped",[1747]],[[64434,64449],"valid",[],"NV8"],[[64450,64466],"disallowed"],[[64467,64470],"mapped",[1709]],[[64471,64472],"mapped",[1735]],[[64473,64474],"mapped",[1734]],[[64475,64476],"mapped",[1736]],[[64477,64477],"mapped",[1735,1652]],[[64478,64479],"mapped",[1739]],[[64480,64481],"mapped",[1733]],[[64482,64483],"mapped",[1737]],[[64484,64487],"mapped",[1744]],[[64488,64489],"mapped",[1609]],[[64490,64491],"mapped",[1574,1575]],[[64492,64493],"mapped",[1574,1749]],[[64494,64495],"mapped",[1574,1608]],[[64496,64497],"mapped",[1574,1735]],[[64498,64499],"mapped",[1574,1734]],[[64500,64501],"mapped",[1574,1736]],[[64502,64504],"mapped",[1574,1744]],[[64505,64507],"mapped",[1574,1609]],[[64508,64511],"mapped",[1740]],[[64512,64512],"mapped",[1574,1580]],[[64513,64513],"mapped",[1574,1581]],[[64514,64514],"mapped",[1574,1605]],[[64515,64515],"mapped",[1574,1609]],[[64516,64516],"mapped",[1574,1610]],[[64517,64517],"mapped",[1576,1580]],[[64518,64518],"mapped",[1576,1581]],[[64519,64519],"mapped",[1576,1582]],[[64520,64520],"mapped",[1576,1605]],[[64521,64521],"mapped",[1576,1609]],[[64522,64522],"mapped",[1576,1610]],[[64523,64523],"mapped",[1578,1580]],[[64524,64524],"mapped",[1578,1581]],[[64525,64525],"mapped",[1578,1582]],[[64526,64526],"mapped",[1578,1605]],[[64527,64527],"mapped",[1578,1609]],[[64528,64528],"mapped",[1578,1610]],[[64529,64529],"mapped",[1579,1580]],[[64530,64530],"mapped",[1579,1605]],[[64531,64531],"mapped",[1579,1609]],[[64532,64532],"mapped",[1579,1610]],[[64533,64533],"mapped",[1580,1581]],[[64534,64534],"mapped",[1580,1605]],[[64535,64535],"mapped",[1581,1580]],[[64536,64536],"mapped",[1581,1605]],[[64537,64537],"mapped",[1582,1580]],[[64538,64538],"mapped",[1582,1581]],[[64539,64539],"mapped",[1582,1605]],[[64540,64540],"mapped",[1587,1580]],[[64541,64541],"mapped",[1587,1581]],[[64542,64542],"mapped",[1587,1582]],[[64543,64543],"mapped",[1587,1605]],[[64544,64544],"mapped",[1589,1581]],[[64545,64545],"mapped",[1589,1605]],[[64546,64546],"mapped",[1590,1580]],[[64547,64547],"mapped",[1590,1581]],[[64548,64548],"mapped",[1590,1582]],[[64549,64549],"mapped",[1590,1605]],[[64550,64550],"mapped",[1591,1581]],[[64551,64551],"mapped",[1591,1605]],[[64552,64552],"mapped",[1592,1605]],[[64553,64553],"mapped",[1593,1580]],[[64554,64554],"mapped",[1593,1605]],[[64555,64555],"mapped",[1594,1580]],[[64556,64556],"mapped",[1594,1605]],[[64557,64557],"mapped",[1601,1580]],[[64558,64558],"mapped",[1601,1581]],[[64559,64559],"mapped",[1601,1582]],[[64560,64560],"mapped",[1601,1605]],[[64561,64561],"mapped",[1601,1609]],[[64562,64562],"mapped",[1601,1610]],[[64563,64563],"mapped",[1602,1581]],[[64564,64564],"mapped",[1602,1605]],[[64565,64565],"mapped",[1602,1609]],[[64566,64566],"mapped",[1602,1610]],[[64567,64567],"mapped",[1603,1575]],[[64568,64568],"mapped",[1603,1580]],[[64569,64569],"mapped",[1603,1581]],[[64570,64570],"mapped",[1603,1582]],[[64571,64571],"mapped",[1603,1604]],[[64572,64572],"mapped",[1603,1605]],[[64573,64573],"mapped",[1603,1609]],[[64574,64574],"mapped",[1603,1610]],[[64575,64575],"mapped",[1604,1580]],[[64576,64576],"mapped",[1604,1581]],[[64577,64577],"mapped",[1604,1582]],[[64578,64578],"mapped",[1604,1605]],[[64579,64579],"mapped",[1604,1609]],[[64580,64580],"mapped",[1604,1610]],[[64581,64581],"mapped",[1605,1580]],[[64582,64582],"mapped",[1605,1581]],[[64583,64583],"mapped",[1605,1582]],[[64584,64584],"mapped",[1605,1605]],[[64585,64585],"mapped",[1605,1609]],[[64586,64586],"mapped",[1605,1610]],[[64587,64587],"mapped",[1606,1580]],[[64588,64588],"mapped",[1606,1581]],[[64589,64589],"mapped",[1606,1582]],[[64590,64590],"mapped",[1606,1605]],[[64591,64591],"mapped",[1606,1609]],[[64592,64592],"mapped",[1606,1610]],[[64593,64593],"mapped",[1607,1580]],[[64594,64594],"mapped",[1607,1605]],[[64595,64595],"mapped",[1607,1609]],[[64596,64596],"mapped",[1607,1610]],[[64597,64597],"mapped",[1610,1580]],[[64598,64598],"mapped",[1610,1581]],[[64599,64599],"mapped",[1610,1582]],[[64600,64600],"mapped",[1610,1605]],[[64601,64601],"mapped",[1610,1609]],[[64602,64602],"mapped",[1610,1610]],[[64603,64603],"mapped",[1584,1648]],[[64604,64604],"mapped",[1585,1648]],[[64605,64605],"mapped",[1609,1648]],[[64606,64606],"disallowed_STD3_mapped",[32,1612,1617]],[[64607,64607],"disallowed_STD3_mapped",[32,1613,1617]],[[64608,64608],"disallowed_STD3_mapped",[32,1614,1617]],[[64609,64609],"disallowed_STD3_mapped",[32,1615,1617]],[[64610,64610],"disallowed_STD3_mapped",[32,1616,1617]],[[64611,64611],"disallowed_STD3_mapped",[32,1617,1648]],[[64612,64612],"mapped",[1574,1585]],[[64613,64613],"mapped",[1574,1586]],[[64614,64614],"mapped",[1574,1605]],[[64615,64615],"mapped",[1574,1606]],[[64616,64616],"mapped",[1574,1609]],[[64617,64617],"mapped",[1574,1610]],[[64618,64618],"mapped",[1576,1585]],[[64619,64619],"mapped",[1576,1586]],[[64620,64620],"mapped",[1576,1605]],[[64621,64621],"mapped",[1576,1606]],[[64622,64622],"mapped",[1576,1609]],[[64623,64623],"mapped",[1576,1610]],[[64624,64624],"mapped",[1578,1585]],[[64625,64625],"mapped",[1578,1586]],[[64626,64626],"mapped",[1578,1605]],[[64627,64627],"mapped",[1578,1606]],[[64628,64628],"mapped",[1578,1609]],[[64629,64629],"mapped",[1578,1610]],[[64630,64630],"mapped",[1579,1585]],[[64631,64631],"mapped",[1579,1586]],[[64632,64632],"mapped",[1579,1605]],[[64633,64633],"mapped",[1579,1606]],[[64634,64634],"mapped",[1579,1609]],[[64635,64635],"mapped",[1579,1610]],[[64636,64636],"mapped",[1601,1609]],[[64637,64637],"mapped",[1601,1610]],[[64638,64638],"mapped",[1602,1609]],[[64639,64639],"mapped",[1602,1610]],[[64640,64640],"mapped",[1603,1575]],[[64641,64641],"mapped",[1603,1604]],[[64642,64642],"mapped",[1603,1605]],[[64643,64643],"mapped",[1603,1609]],[[64644,64644],"mapped",[1603,1610]],[[64645,64645],"mapped",[1604,1605]],[[64646,64646],"mapped",[1604,1609]],[[64647,64647],"mapped",[1604,1610]],[[64648,64648],"mapped",[1605,1575]],[[64649,64649],"mapped",[1605,1605]],[[64650,64650],"mapped",[1606,1585]],[[64651,64651],"mapped",[1606,1586]],[[64652,64652],"mapped",[1606,1605]],[[64653,64653],"mapped",[1606,1606]],[[64654,64654],"mapped",[1606,1609]],[[64655,64655],"mapped",[1606,1610]],[[64656,64656],"mapped",[1609,1648]],[[64657,64657],"mapped",[1610,1585]],[[64658,64658],"mapped",[1610,1586]],[[64659,64659],"mapped",[1610,1605]],[[64660,64660],"mapped",[1610,1606]],[[64661,64661],"mapped",[1610,1609]],[[64662,64662],"mapped",[1610,1610]],[[64663,64663],"mapped",[1574,1580]],[[64664,64664],"mapped",[1574,1581]],[[64665,64665],"mapped",[1574,1582]],[[64666,64666],"mapped",[1574,1605]],[[64667,64667],"mapped",[1574,1607]],[[64668,64668],"mapped",[1576,1580]],[[64669,64669],"mapped",[1576,1581]],[[64670,64670],"mapped",[1576,1582]],[[64671,64671],"mapped",[1576,1605]],[[64672,64672],"mapped",[1576,1607]],[[64673,64673],"mapped",[1578,1580]],[[64674,64674],"mapped",[1578,1581]],[[64675,64675],"mapped",[1578,1582]],[[64676,64676],"mapped",[1578,1605]],[[64677,64677],"mapped",[1578,1607]],[[64678,64678],"mapped",[1579,1605]],[[64679,64679],"mapped",[1580,1581]],[[64680,64680],"mapped",[1580,1605]],[[64681,64681],"mapped",[1581,1580]],[[64682,64682],"mapped",[1581,1605]],[[64683,64683],"mapped",[1582,1580]],[[64684,64684],"mapped",[1582,1605]],[[64685,64685],"mapped",[1587,1580]],[[64686,64686],"mapped",[1587,1581]],[[64687,64687],"mapped",[1587,1582]],[[64688,64688],"mapped",[1587,1605]],[[64689,64689],"mapped",[1589,1581]],[[64690,64690],"mapped",[1589,1582]],[[64691,64691],"mapped",[1589,1605]],[[64692,64692],"mapped",[1590,1580]],[[64693,64693],"mapped",[1590,1581]],[[64694,64694],"mapped",[1590,1582]],[[64695,64695],"mapped",[1590,1605]],[[64696,64696],"mapped",[1591,1581]],[[64697,64697],"mapped",[1592,1605]],[[64698,64698],"mapped",[1593,1580]],[[64699,64699],"mapped",[1593,1605]],[[64700,64700],"mapped",[1594,1580]],[[64701,64701],"mapped",[1594,1605]],[[64702,64702],"mapped",[1601,1580]],[[64703,64703],"mapped",[1601,1581]],[[64704,64704],"mapped",[1601,1582]],[[64705,64705],"mapped",[1601,1605]],[[64706,64706],"mapped",[1602,1581]],[[64707,64707],"mapped",[1602,1605]],[[64708,64708],"mapped",[1603,1580]],[[64709,64709],"mapped",[1603,1581]],[[64710,64710],"mapped",[1603,1582]],[[64711,64711],"mapped",[1603,1604]],[[64712,64712],"mapped",[1603,1605]],[[64713,64713],"mapped",[1604,1580]],[[64714,64714],"mapped",[1604,1581]],[[64715,64715],"mapped",[1604,1582]],[[64716,64716],"mapped",[1604,1605]],[[64717,64717],"mapped",[1604,1607]],[[64718,64718],"mapped",[1605,1580]],[[64719,64719],"mapped",[1605,1581]],[[64720,64720],"mapped",[1605,1582]],[[64721,64721],"mapped",[1605,1605]],[[64722,64722],"mapped",[1606,1580]],[[64723,64723],"mapped",[1606,1581]],[[64724,64724],"mapped",[1606,1582]],[[64725,64725],"mapped",[1606,1605]],[[64726,64726],"mapped",[1606,1607]],[[64727,64727],"mapped",[1607,1580]],[[64728,64728],"mapped",[1607,1605]],[[64729,64729],"mapped",[1607,1648]],[[64730,64730],"mapped",[1610,1580]],[[64731,64731],"mapped",[1610,1581]],[[64732,64732],"mapped",[1610,1582]],[[64733,64733],"mapped",[1610,1605]],[[64734,64734],"mapped",[1610,1607]],[[64735,64735],"mapped",[1574,1605]],[[64736,64736],"mapped",[1574,1607]],[[64737,64737],"mapped",[1576,1605]],[[64738,64738],"mapped",[1576,1607]],[[64739,64739],"mapped",[1578,1605]],[[64740,64740],"mapped",[1578,1607]],[[64741,64741],"mapped",[1579,1605]],[[64742,64742],"mapped",[1579,1607]],[[64743,64743],"mapped",[1587,1605]],[[64744,64744],"mapped",[1587,1607]],[[64745,64745],"mapped",[1588,1605]],[[64746,64746],"mapped",[1588,1607]],[[64747,64747],"mapped",[1603,1604]],[[64748,64748],"mapped",[1603,1605]],[[64749,64749],"mapped",[1604,1605]],[[64750,64750],"mapped",[1606,1605]],[[64751,64751],"mapped",[1606,1607]],[[64752,64752],"mapped",[1610,1605]],[[64753,64753],"mapped",[1610,1607]],[[64754,64754],"mapped",[1600,1614,1617]],[[64755,64755],"mapped",[1600,1615,1617]],[[64756,64756],"mapped",[1600,1616,1617]],[[64757,64757],"mapped",[1591,1609]],[[64758,64758],"mapped",[1591,1610]],[[64759,64759],"mapped",[1593,1609]],[[64760,64760],"mapped",[1593,1610]],[[64761,64761],"mapped",[1594,1609]],[[64762,64762],"mapped",[1594,1610]],[[64763,64763],"mapped",[1587,1609]],[[64764,64764],"mapped",[1587,1610]],[[64765,64765],"mapped",[1588,1609]],[[64766,64766],"mapped",[1588,1610]],[[64767,64767],"mapped",[1581,1609]],[[64768,64768],"mapped",[1581,1610]],[[64769,64769],"mapped",[1580,1609]],[[64770,64770],"mapped",[1580,1610]],[[64771,64771],"mapped",[1582,1609]],[[64772,64772],"mapped",[1582,1610]],[[64773,64773],"mapped",[1589,1609]],[[64774,64774],"mapped",[1589,1610]],[[64775,64775],"mapped",[1590,1609]],[[64776,64776],"mapped",[1590,1610]],[[64777,64777],"mapped",[1588,1580]],[[64778,64778],"mapped",[1588,1581]],[[64779,64779],"mapped",[1588,1582]],[[64780,64780],"mapped",[1588,1605]],[[64781,64781],"mapped",[1588,1585]],[[64782,64782],"mapped",[1587,1585]],[[64783,64783],"mapped",[1589,1585]],[[64784,64784],"mapped",[1590,1585]],[[64785,64785],"mapped",[1591,1609]],[[64786,64786],"mapped",[1591,1610]],[[64787,64787],"mapped",[1593,1609]],[[64788,64788],"mapped",[1593,1610]],[[64789,64789],"mapped",[1594,1609]],[[64790,64790],"mapped",[1594,1610]],[[64791,64791],"mapped",[1587,1609]],[[64792,64792],"mapped",[1587,1610]],[[64793,64793],"mapped",[1588,1609]],[[64794,64794],"mapped",[1588,1610]],[[64795,64795],"mapped",[1581,1609]],[[64796,64796],"mapped",[1581,1610]],[[64797,64797],"mapped",[1580,1609]],[[64798,64798],"mapped",[1580,1610]],[[64799,64799],"mapped",[1582,1609]],[[64800,64800],"mapped",[1582,1610]],[[64801,64801],"mapped",[1589,1609]],[[64802,64802],"mapped",[1589,1610]],[[64803,64803],"mapped",[1590,1609]],[[64804,64804],"mapped",[1590,1610]],[[64805,64805],"mapped",[1588,1580]],[[64806,64806],"mapped",[1588,1581]],[[64807,64807],"mapped",[1588,1582]],[[64808,64808],"mapped",[1588,1605]],[[64809,64809],"mapped",[1588,1585]],[[64810,64810],"mapped",[1587,1585]],[[64811,64811],"mapped",[1589,1585]],[[64812,64812],"mapped",[1590,1585]],[[64813,64813],"mapped",[1588,1580]],[[64814,64814],"mapped",[1588,1581]],[[64815,64815],"mapped",[1588,1582]],[[64816,64816],"mapped",[1588,1605]],[[64817,64817],"mapped",[1587,1607]],[[64818,64818],"mapped",[1588,1607]],[[64819,64819],"mapped",[1591,1605]],[[64820,64820],"mapped",[1587,1580]],[[64821,64821],"mapped",[1587,1581]],[[64822,64822],"mapped",[1587,1582]],[[64823,64823],"mapped",[1588,1580]],[[64824,64824],"mapped",[1588,1581]],[[64825,64825],"mapped",[1588,1582]],[[64826,64826],"mapped",[1591,1605]],[[64827,64827],"mapped",[1592,1605]],[[64828,64829],"mapped",[1575,1611]],[[64830,64831],"valid",[],"NV8"],[[64832,64847],"disallowed"],[[64848,64848],"mapped",[1578,1580,1605]],[[64849,64850],"mapped",[1578,1581,1580]],[[64851,64851],"mapped",[1578,1581,1605]],[[64852,64852],"mapped",[1578,1582,1605]],[[64853,64853],"mapped",[1578,1605,1580]],[[64854,64854],"mapped",[1578,1605,1581]],[[64855,64855],"mapped",[1578,1605,1582]],[[64856,64857],"mapped",[1580,1605,1581]],[[64858,64858],"mapped",[1581,1605,1610]],[[64859,64859],"mapped",[1581,1605,1609]],[[64860,64860],"mapped",[1587,1581,1580]],[[64861,64861],"mapped",[1587,1580,1581]],[[64862,64862],"mapped",[1587,1580,1609]],[[64863,64864],"mapped",[1587,1605,1581]],[[64865,64865],"mapped",[1587,1605,1580]],[[64866,64867],"mapped",[1587,1605,1605]],[[64868,64869],"mapped",[1589,1581,1581]],[[64870,64870],"mapped",[1589,1605,1605]],[[64871,64872],"mapped",[1588,1581,1605]],[[64873,64873],"mapped",[1588,1580,1610]],[[64874,64875],"mapped",[1588,1605,1582]],[[64876,64877],"mapped",[1588,1605,1605]],[[64878,64878],"mapped",[1590,1581,1609]],[[64879,64880],"mapped",[1590,1582,1605]],[[64881,64882],"mapped",[1591,1605,1581]],[[64883,64883],"mapped",[1591,1605,1605]],[[64884,64884],"mapped",[1591,1605,1610]],[[64885,64885],"mapped",[1593,1580,1605]],[[64886,64887],"mapped",[1593,1605,1605]],[[64888,64888],"mapped",[1593,1605,1609]],[[64889,64889],"mapped",[1594,1605,1605]],[[64890,64890],"mapped",[1594,1605,1610]],[[64891,64891],"mapped",[1594,1605,1609]],[[64892,64893],"mapped",[1601,1582,1605]],[[64894,64894],"mapped",[1602,1605,1581]],[[64895,64895],"mapped",[1602,1605,1605]],[[64896,64896],"mapped",[1604,1581,1605]],[[64897,64897],"mapped",[1604,1581,1610]],[[64898,64898],"mapped",[1604,1581,1609]],[[64899,64900],"mapped",[1604,1580,1580]],[[64901,64902],"mapped",[1604,1582,1605]],[[64903,64904],"mapped",[1604,1605,1581]],[[64905,64905],"mapped",[1605,1581,1580]],[[64906,64906],"mapped",[1605,1581,1605]],[[64907,64907],"mapped",[1605,1581,1610]],[[64908,64908],"mapped",[1605,1580,1581]],[[64909,64909],"mapped",[1605,1580,1605]],[[64910,64910],"mapped",[1605,1582,1580]],[[64911,64911],"mapped",[1605,1582,1605]],[[64912,64913],"disallowed"],[[64914,64914],"mapped",[1605,1580,1582]],[[64915,64915],"mapped",[1607,1605,1580]],[[64916,64916],"mapped",[1607,1605,1605]],[[64917,64917],"mapped",[1606,1581,1605]],[[64918,64918],"mapped",[1606,1581,1609]],[[64919,64920],"mapped",[1606,1580,1605]],[[64921,64921],"mapped",[1606,1580,1609]],[[64922,64922],"mapped",[1606,1605,1610]],[[64923,64923],"mapped",[1606,1605,1609]],[[64924,64925],"mapped",[1610,1605,1605]],[[64926,64926],"mapped",[1576,1582,1610]],[[64927,64927],"mapped",[1578,1580,1610]],[[64928,64928],"mapped",[1578,1580,1609]],[[64929,64929],"mapped",[1578,1582,1610]],[[64930,64930],"mapped",[1578,1582,1609]],[[64931,64931],"mapped",[1578,1605,1610]],[[64932,64932],"mapped",[1578,1605,1609]],[[64933,64933],"mapped",[1580,1605,1610]],[[64934,64934],"mapped",[1580,1581,1609]],[[64935,64935],"mapped",[1580,1605,1609]],[[64936,64936],"mapped",[1587,1582,1609]],[[64937,64937],"mapped",[1589,1581,1610]],[[64938,64938],"mapped",[1588,1581,1610]],[[64939,64939],"mapped",[1590,1581,1610]],[[64940,64940],"mapped",[1604,1580,1610]],[[64941,64941],"mapped",[1604,1605,1610]],[[64942,64942],"mapped",[1610,1581,1610]],[[64943,64943],"mapped",[1610,1580,1610]],[[64944,64944],"mapped",[1610,1605,1610]],[[64945,64945],"mapped",[1605,1605,1610]],[[64946,64946],"mapped",[1602,1605,1610]],[[64947,64947],"mapped",[1606,1581,1610]],[[64948,64948],"mapped",[1602,1605,1581]],[[64949,64949],"mapped",[1604,1581,1605]],[[64950,64950],"mapped",[1593,1605,1610]],[[64951,64951],"mapped",[1603,1605,1610]],[[64952,64952],"mapped",[1606,1580,1581]],[[64953,64953],"mapped",[1605,1582,1610]],[[64954,64954],"mapped",[1604,1580,1605]],[[64955,64955],"mapped",[1603,1605,1605]],[[64956,64956],"mapped",[1604,1580,1605]],[[64957,64957],"mapped",[1606,1580,1581]],[[64958,64958],"mapped",[1580,1581,1610]],[[64959,64959],"mapped",[1581,1580,1610]],[[64960,64960],"mapped",[1605,1580,1610]],[[64961,64961],"mapped",[1601,1605,1610]],[[64962,64962],"mapped",[1576,1581,1610]],[[64963,64963],"mapped",[1603,1605,1605]],[[64964,64964],"mapped",[1593,1580,1605]],[[64965,64965],"mapped",[1589,1605,1605]],[[64966,64966],"mapped",[1587,1582,1610]],[[64967,64967],"mapped",[1606,1580,1610]],[[64968,64975],"disallowed"],[[64976,65007],"disallowed"],[[65008,65008],"mapped",[1589,1604,1746]],[[65009,65009],"mapped",[1602,1604,1746]],[[65010,65010],"mapped",[1575,1604,1604,1607]],[[65011,65011],"mapped",[1575,1603,1576,1585]],[[65012,65012],"mapped",[1605,1581,1605,1583]],[[65013,65013],"mapped",[1589,1604,1593,1605]],[[65014,65014],"mapped",[1585,1587,1608,1604]],[[65015,65015],"mapped",[1593,1604,1610,1607]],[[65016,65016],"mapped",[1608,1587,1604,1605]],[[65017,65017],"mapped",[1589,1604,1609]],[[65018,65018],"disallowed_STD3_mapped",[1589,1604,1609,32,1575,1604,1604,1607,32,1593,1604,1610,1607,32,1608,1587,1604,1605]],[[65019,65019],"disallowed_STD3_mapped",[1580,1604,32,1580,1604,1575,1604,1607]],[[65020,65020],"mapped",[1585,1740,1575,1604]],[[65021,65021],"valid",[],"NV8"],[[65022,65023],"disallowed"],[[65024,65039],"ignored"],[[65040,65040],"disallowed_STD3_mapped",[44]],[[65041,65041],"mapped",[12289]],[[65042,65042],"disallowed"],[[65043,65043],"disallowed_STD3_mapped",[58]],[[65044,65044],"disallowed_STD3_mapped",[59]],[[65045,65045],"disallowed_STD3_mapped",[33]],[[65046,65046],"disallowed_STD3_mapped",[63]],[[65047,65047],"mapped",[12310]],[[65048,65048],"mapped",[12311]],[[65049,65049],"disallowed"],[[65050,65055],"disallowed"],[[65056,65059],"valid"],[[65060,65062],"valid"],[[65063,65069],"valid"],[[65070,65071],"valid"],[[65072,65072],"disallowed"],[[65073,65073],"mapped",[8212]],[[65074,65074],"mapped",[8211]],[[65075,65076],"disallowed_STD3_mapped",[95]],[[65077,65077],"disallowed_STD3_mapped",[40]],[[65078,65078],"disallowed_STD3_mapped",[41]],[[65079,65079],"disallowed_STD3_mapped",[123]],[[65080,65080],"disallowed_STD3_mapped",[125]],[[65081,65081],"mapped",[12308]],[[65082,65082],"mapped",[12309]],[[65083,65083],"mapped",[12304]],[[65084,65084],"mapped",[12305]],[[65085,65085],"mapped",[12298]],[[65086,65086],"mapped",[12299]],[[65087,65087],"mapped",[12296]],[[65088,65088],"mapped",[12297]],[[65089,65089],"mapped",[12300]],[[65090,65090],"mapped",[12301]],[[65091,65091],"mapped",[12302]],[[65092,65092],"mapped",[12303]],[[65093,65094],"valid",[],"NV8"],[[65095,65095],"disallowed_STD3_mapped",[91]],[[65096,65096],"disallowed_STD3_mapped",[93]],[[65097,65100],"disallowed_STD3_mapped",[32,773]],[[65101,65103],"disallowed_STD3_mapped",[95]],[[65104,65104],"disallowed_STD3_mapped",[44]],[[65105,65105],"mapped",[12289]],[[65106,65106],"disallowed"],[[65107,65107],"disallowed"],[[65108,65108],"disallowed_STD3_mapped",[59]],[[65109,65109],"disallowed_STD3_mapped",[58]],[[65110,65110],"disallowed_STD3_mapped",[63]],[[65111,65111],"disallowed_STD3_mapped",[33]],[[65112,65112],"mapped",[8212]],[[65113,65113],"disallowed_STD3_mapped",[40]],[[65114,65114],"disallowed_STD3_mapped",[41]],[[65115,65115],"disallowed_STD3_mapped",[123]],[[65116,65116],"disallowed_STD3_mapped",[125]],[[65117,65117],"mapped",[12308]],[[65118,65118],"mapped",[12309]],[[65119,65119],"disallowed_STD3_mapped",[35]],[[65120,65120],"disallowed_STD3_mapped",[38]],[[65121,65121],"disallowed_STD3_mapped",[42]],[[65122,65122],"disallowed_STD3_mapped",[43]],[[65123,65123],"mapped",[45]],[[65124,65124],"disallowed_STD3_mapped",[60]],[[65125,65125],"disallowed_STD3_mapped",[62]],[[65126,65126],"disallowed_STD3_mapped",[61]],[[65127,65127],"disallowed"],[[65128,65128],"disallowed_STD3_mapped",[92]],[[65129,65129],"disallowed_STD3_mapped",[36]],[[65130,65130],"disallowed_STD3_mapped",[37]],[[65131,65131],"disallowed_STD3_mapped",[64]],[[65132,65135],"disallowed"],[[65136,65136],"disallowed_STD3_mapped",[32,1611]],[[65137,65137],"mapped",[1600,1611]],[[65138,65138],"disallowed_STD3_mapped",[32,1612]],[[65139,65139],"valid"],[[65140,65140],"disallowed_STD3_mapped",[32,1613]],[[65141,65141],"disallowed"],[[65142,65142],"disallowed_STD3_mapped",[32,1614]],[[65143,65143],"mapped",[1600,1614]],[[65144,65144],"disallowed_STD3_mapped",[32,1615]],[[65145,65145],"mapped",[1600,1615]],[[65146,65146],"disallowed_STD3_mapped",[32,1616]],[[65147,65147],"mapped",[1600,1616]],[[65148,65148],"disallowed_STD3_mapped",[32,1617]],[[65149,65149],"mapped",[1600,1617]],[[65150,65150],"disallowed_STD3_mapped",[32,1618]],[[65151,65151],"mapped",[1600,1618]],[[65152,65152],"mapped",[1569]],[[65153,65154],"mapped",[1570]],[[65155,65156],"mapped",[1571]],[[65157,65158],"mapped",[1572]],[[65159,65160],"mapped",[1573]],[[65161,65164],"mapped",[1574]],[[65165,65166],"mapped",[1575]],[[65167,65170],"mapped",[1576]],[[65171,65172],"mapped",[1577]],[[65173,65176],"mapped",[1578]],[[65177,65180],"mapped",[1579]],[[65181,65184],"mapped",[1580]],[[65185,65188],"mapped",[1581]],[[65189,65192],"mapped",[1582]],[[65193,65194],"mapped",[1583]],[[65195,65196],"mapped",[1584]],[[65197,65198],"mapped",[1585]],[[65199,65200],"mapped",[1586]],[[65201,65204],"mapped",[1587]],[[65205,65208],"mapped",[1588]],[[65209,65212],"mapped",[1589]],[[65213,65216],"mapped",[1590]],[[65217,65220],"mapped",[1591]],[[65221,65224],"mapped",[1592]],[[65225,65228],"mapped",[1593]],[[65229,65232],"mapped",[1594]],[[65233,65236],"mapped",[1601]],[[65237,65240],"mapped",[1602]],[[65241,65244],"mapped",[1603]],[[65245,65248],"mapped",[1604]],[[65249,65252],"mapped",[1605]],[[65253,65256],"mapped",[1606]],[[65257,65260],"mapped",[1607]],[[65261,65262],"mapped",[1608]],[[65263,65264],"mapped",[1609]],[[65265,65268],"mapped",[1610]],[[65269,65270],"mapped",[1604,1570]],[[65271,65272],"mapped",[1604,1571]],[[65273,65274],"mapped",[1604,1573]],[[65275,65276],"mapped",[1604,1575]],[[65277,65278],"disallowed"],[[65279,65279],"ignored"],[[65280,65280],"disallowed"],[[65281,65281],"disallowed_STD3_mapped",[33]],[[65282,65282],"disallowed_STD3_mapped",[34]],[[65283,65283],"disallowed_STD3_mapped",[35]],[[65284,65284],"disallowed_STD3_mapped",[36]],[[65285,65285],"disallowed_STD3_mapped",[37]],[[65286,65286],"disallowed_STD3_mapped",[38]],[[65287,65287],"disallowed_STD3_mapped",[39]],[[65288,65288],"disallowed_STD3_mapped",[40]],[[65289,65289],"disallowed_STD3_mapped",[41]],[[65290,65290],"disallowed_STD3_mapped",[42]],[[65291,65291],"disallowed_STD3_mapped",[43]],[[65292,65292],"disallowed_STD3_mapped",[44]],[[65293,65293],"mapped",[45]],[[65294,65294],"mapped",[46]],[[65295,65295],"disallowed_STD3_mapped",[47]],[[65296,65296],"mapped",[48]],[[65297,65297],"mapped",[49]],[[65298,65298],"mapped",[50]],[[65299,65299],"mapped",[51]],[[65300,65300],"mapped",[52]],[[65301,65301],"mapped",[53]],[[65302,65302],"mapped",[54]],[[65303,65303],"mapped",[55]],[[65304,65304],"mapped",[56]],[[65305,65305],"mapped",[57]],[[65306,65306],"disallowed_STD3_mapped",[58]],[[65307,65307],"disallowed_STD3_mapped",[59]],[[65308,65308],"disallowed_STD3_mapped",[60]],[[65309,65309],"disallowed_STD3_mapped",[61]],[[65310,65310],"disallowed_STD3_mapped",[62]],[[65311,65311],"disallowed_STD3_mapped",[63]],[[65312,65312],"disallowed_STD3_mapped",[64]],[[65313,65313],"mapped",[97]],[[65314,65314],"mapped",[98]],[[65315,65315],"mapped",[99]],[[65316,65316],"mapped",[100]],[[65317,65317],"mapped",[101]],[[65318,65318],"mapped",[102]],[[65319,65319],"mapped",[103]],[[65320,65320],"mapped",[104]],[[65321,65321],"mapped",[105]],[[65322,65322],"mapped",[106]],[[65323,65323],"mapped",[107]],[[65324,65324],"mapped",[108]],[[65325,65325],"mapped",[109]],[[65326,65326],"mapped",[110]],[[65327,65327],"mapped",[111]],[[65328,65328],"mapped",[112]],[[65329,65329],"mapped",[113]],[[65330,65330],"mapped",[114]],[[65331,65331],"mapped",[115]],[[65332,65332],"mapped",[116]],[[65333,65333],"mapped",[117]],[[65334,65334],"mapped",[118]],[[65335,65335],"mapped",[119]],[[65336,65336],"mapped",[120]],[[65337,65337],"mapped",[121]],[[65338,65338],"mapped",[122]],[[65339,65339],"disallowed_STD3_mapped",[91]],[[65340,65340],"disallowed_STD3_mapped",[92]],[[65341,65341],"disallowed_STD3_mapped",[93]],[[65342,65342],"disallowed_STD3_mapped",[94]],[[65343,65343],"disallowed_STD3_mapped",[95]],[[65344,65344],"disallowed_STD3_mapped",[96]],[[65345,65345],"mapped",[97]],[[65346,65346],"mapped",[98]],[[65347,65347],"mapped",[99]],[[65348,65348],"mapped",[100]],[[65349,65349],"mapped",[101]],[[65350,65350],"mapped",[102]],[[65351,65351],"mapped",[103]],[[65352,65352],"mapped",[104]],[[65353,65353],"mapped",[105]],[[65354,65354],"mapped",[106]],[[65355,65355],"mapped",[107]],[[65356,65356],"mapped",[108]],[[65357,65357],"mapped",[109]],[[65358,65358],"mapped",[110]],[[65359,65359],"mapped",[111]],[[65360,65360],"mapped",[112]],[[65361,65361],"mapped",[113]],[[65362,65362],"mapped",[114]],[[65363,65363],"mapped",[115]],[[65364,65364],"mapped",[116]],[[65365,65365],"mapped",[117]],[[65366,65366],"mapped",[118]],[[65367,65367],"mapped",[119]],[[65368,65368],"mapped",[120]],[[65369,65369],"mapped",[121]],[[65370,65370],"mapped",[122]],[[65371,65371],"disallowed_STD3_mapped",[123]],[[65372,65372],"disallowed_STD3_mapped",[124]],[[65373,65373],"disallowed_STD3_mapped",[125]],[[65374,65374],"disallowed_STD3_mapped",[126]],[[65375,65375],"mapped",[10629]],[[65376,65376],"mapped",[10630]],[[65377,65377],"mapped",[46]],[[65378,65378],"mapped",[12300]],[[65379,65379],"mapped",[12301]],[[65380,65380],"mapped",[12289]],[[65381,65381],"mapped",[12539]],[[65382,65382],"mapped",[12530]],[[65383,65383],"mapped",[12449]],[[65384,65384],"mapped",[12451]],[[65385,65385],"mapped",[12453]],[[65386,65386],"mapped",[12455]],[[65387,65387],"mapped",[12457]],[[65388,65388],"mapped",[12515]],[[65389,65389],"mapped",[12517]],[[65390,65390],"mapped",[12519]],[[65391,65391],"mapped",[12483]],[[65392,65392],"mapped",[12540]],[[65393,65393],"mapped",[12450]],[[65394,65394],"mapped",[12452]],[[65395,65395],"mapped",[12454]],[[65396,65396],"mapped",[12456]],[[65397,65397],"mapped",[12458]],[[65398,65398],"mapped",[12459]],[[65399,65399],"mapped",[12461]],[[65400,65400],"mapped",[12463]],[[65401,65401],"mapped",[12465]],[[65402,65402],"mapped",[12467]],[[65403,65403],"mapped",[12469]],[[65404,65404],"mapped",[12471]],[[65405,65405],"mapped",[12473]],[[65406,65406],"mapped",[12475]],[[65407,65407],"mapped",[12477]],[[65408,65408],"mapped",[12479]],[[65409,65409],"mapped",[12481]],[[65410,65410],"mapped",[12484]],[[65411,65411],"mapped",[12486]],[[65412,65412],"mapped",[12488]],[[65413,65413],"mapped",[12490]],[[65414,65414],"mapped",[12491]],[[65415,65415],"mapped",[12492]],[[65416,65416],"mapped",[12493]],[[65417,65417],"mapped",[12494]],[[65418,65418],"mapped",[12495]],[[65419,65419],"mapped",[12498]],[[65420,65420],"mapped",[12501]],[[65421,65421],"mapped",[12504]],[[65422,65422],"mapped",[12507]],[[65423,65423],"mapped",[12510]],[[65424,65424],"mapped",[12511]],[[65425,65425],"mapped",[12512]],[[65426,65426],"mapped",[12513]],[[65427,65427],"mapped",[12514]],[[65428,65428],"mapped",[12516]],[[65429,65429],"mapped",[12518]],[[65430,65430],"mapped",[12520]],[[65431,65431],"mapped",[12521]],[[65432,65432],"mapped",[12522]],[[65433,65433],"mapped",[12523]],[[65434,65434],"mapped",[12524]],[[65435,65435],"mapped",[12525]],[[65436,65436],"mapped",[12527]],[[65437,65437],"mapped",[12531]],[[65438,65438],"mapped",[12441]],[[65439,65439],"mapped",[12442]],[[65440,65440],"disallowed"],[[65441,65441],"mapped",[4352]],[[65442,65442],"mapped",[4353]],[[65443,65443],"mapped",[4522]],[[65444,65444],"mapped",[4354]],[[65445,65445],"mapped",[4524]],[[65446,65446],"mapped",[4525]],[[65447,65447],"mapped",[4355]],[[65448,65448],"mapped",[4356]],[[65449,65449],"mapped",[4357]],[[65450,65450],"mapped",[4528]],[[65451,65451],"mapped",[4529]],[[65452,65452],"mapped",[4530]],[[65453,65453],"mapped",[4531]],[[65454,65454],"mapped",[4532]],[[65455,65455],"mapped",[4533]],[[65456,65456],"mapped",[4378]],[[65457,65457],"mapped",[4358]],[[65458,65458],"mapped",[4359]],[[65459,65459],"mapped",[4360]],[[65460,65460],"mapped",[4385]],[[65461,65461],"mapped",[4361]],[[65462,65462],"mapped",[4362]],[[65463,65463],"mapped",[4363]],[[65464,65464],"mapped",[4364]],[[65465,65465],"mapped",[4365]],[[65466,65466],"mapped",[4366]],[[65467,65467],"mapped",[4367]],[[65468,65468],"mapped",[4368]],[[65469,65469],"mapped",[4369]],[[65470,65470],"mapped",[4370]],[[65471,65473],"disallowed"],[[65474,65474],"mapped",[4449]],[[65475,65475],"mapped",[4450]],[[65476,65476],"mapped",[4451]],[[65477,65477],"mapped",[4452]],[[65478,65478],"mapped",[4453]],[[65479,65479],"mapped",[4454]],[[65480,65481],"disallowed"],[[65482,65482],"mapped",[4455]],[[65483,65483],"mapped",[4456]],[[65484,65484],"mapped",[4457]],[[65485,65485],"mapped",[4458]],[[65486,65486],"mapped",[4459]],[[65487,65487],"mapped",[4460]],[[65488,65489],"disallowed"],[[65490,65490],"mapped",[4461]],[[65491,65491],"mapped",[4462]],[[65492,65492],"mapped",[4463]],[[65493,65493],"mapped",[4464]],[[65494,65494],"mapped",[4465]],[[65495,65495],"mapped",[4466]],[[65496,65497],"disallowed"],[[65498,65498],"mapped",[4467]],[[65499,65499],"mapped",[4468]],[[65500,65500],"mapped",[4469]],[[65501,65503],"disallowed"],[[65504,65504],"mapped",[162]],[[65505,65505],"mapped",[163]],[[65506,65506],"mapped",[172]],[[65507,65507],"disallowed_STD3_mapped",[32,772]],[[65508,65508],"mapped",[166]],[[65509,65509],"mapped",[165]],[[65510,65510],"mapped",[8361]],[[65511,65511],"disallowed"],[[65512,65512],"mapped",[9474]],[[65513,65513],"mapped",[8592]],[[65514,65514],"mapped",[8593]],[[65515,65515],"mapped",[8594]],[[65516,65516],"mapped",[8595]],[[65517,65517],"mapped",[9632]],[[65518,65518],"mapped",[9675]],[[65519,65528],"disallowed"],[[65529,65531],"disallowed"],[[65532,65532],"disallowed"],[[65533,65533],"disallowed"],[[65534,65535],"disallowed"],[[65536,65547],"valid"],[[65548,65548],"disallowed"],[[65549,65574],"valid"],[[65575,65575],"disallowed"],[[65576,65594],"valid"],[[65595,65595],"disallowed"],[[65596,65597],"valid"],[[65598,65598],"disallowed"],[[65599,65613],"valid"],[[65614,65615],"disallowed"],[[65616,65629],"valid"],[[65630,65663],"disallowed"],[[65664,65786],"valid"],[[65787,65791],"disallowed"],[[65792,65794],"valid",[],"NV8"],[[65795,65798],"disallowed"],[[65799,65843],"valid",[],"NV8"],[[65844,65846],"disallowed"],[[65847,65855],"valid",[],"NV8"],[[65856,65930],"valid",[],"NV8"],[[65931,65932],"valid",[],"NV8"],[[65933,65935],"disallowed"],[[65936,65947],"valid",[],"NV8"],[[65948,65951],"disallowed"],[[65952,65952],"valid",[],"NV8"],[[65953,65999],"disallowed"],[[66000,66044],"valid",[],"NV8"],[[66045,66045],"valid"],[[66046,66175],"disallowed"],[[66176,66204],"valid"],[[66205,66207],"disallowed"],[[66208,66256],"valid"],[[66257,66271],"disallowed"],[[66272,66272],"valid"],[[66273,66299],"valid",[],"NV8"],[[66300,66303],"disallowed"],[[66304,66334],"valid"],[[66335,66335],"valid"],[[66336,66339],"valid",[],"NV8"],[[66340,66351],"disallowed"],[[66352,66368],"valid"],[[66369,66369],"valid",[],"NV8"],[[66370,66377],"valid"],[[66378,66378],"valid",[],"NV8"],[[66379,66383],"disallowed"],[[66384,66426],"valid"],[[66427,66431],"disallowed"],[[66432,66461],"valid"],[[66462,66462],"disallowed"],[[66463,66463],"valid",[],"NV8"],[[66464,66499],"valid"],[[66500,66503],"disallowed"],[[66504,66511],"valid"],[[66512,66517],"valid",[],"NV8"],[[66518,66559],"disallowed"],[[66560,66560],"mapped",[66600]],[[66561,66561],"mapped",[66601]],[[66562,66562],"mapped",[66602]],[[66563,66563],"mapped",[66603]],[[66564,66564],"mapped",[66604]],[[66565,66565],"mapped",[66605]],[[66566,66566],"mapped",[66606]],[[66567,66567],"mapped",[66607]],[[66568,66568],"mapped",[66608]],[[66569,66569],"mapped",[66609]],[[66570,66570],"mapped",[66610]],[[66571,66571],"mapped",[66611]],[[66572,66572],"mapped",[66612]],[[66573,66573],"mapped",[66613]],[[66574,66574],"mapped",[66614]],[[66575,66575],"mapped",[66615]],[[66576,66576],"mapped",[66616]],[[66577,66577],"mapped",[66617]],[[66578,66578],"mapped",[66618]],[[66579,66579],"mapped",[66619]],[[66580,66580],"mapped",[66620]],[[66581,66581],"mapped",[66621]],[[66582,66582],"mapped",[66622]],[[66583,66583],"mapped",[66623]],[[66584,66584],"mapped",[66624]],[[66585,66585],"mapped",[66625]],[[66586,66586],"mapped",[66626]],[[66587,66587],"mapped",[66627]],[[66588,66588],"mapped",[66628]],[[66589,66589],"mapped",[66629]],[[66590,66590],"mapped",[66630]],[[66591,66591],"mapped",[66631]],[[66592,66592],"mapped",[66632]],[[66593,66593],"mapped",[66633]],[[66594,66594],"mapped",[66634]],[[66595,66595],"mapped",[66635]],[[66596,66596],"mapped",[66636]],[[66597,66597],"mapped",[66637]],[[66598,66598],"mapped",[66638]],[[66599,66599],"mapped",[66639]],[[66600,66637],"valid"],[[66638,66717],"valid"],[[66718,66719],"disallowed"],[[66720,66729],"valid"],[[66730,66815],"disallowed"],[[66816,66855],"valid"],[[66856,66863],"disallowed"],[[66864,66915],"valid"],[[66916,66926],"disallowed"],[[66927,66927],"valid",[],"NV8"],[[66928,67071],"disallowed"],[[67072,67382],"valid"],[[67383,67391],"disallowed"],[[67392,67413],"valid"],[[67414,67423],"disallowed"],[[67424,67431],"valid"],[[67432,67583],"disallowed"],[[67584,67589],"valid"],[[67590,67591],"disallowed"],[[67592,67592],"valid"],[[67593,67593],"disallowed"],[[67594,67637],"valid"],[[67638,67638],"disallowed"],[[67639,67640],"valid"],[[67641,67643],"disallowed"],[[67644,67644],"valid"],[[67645,67646],"disallowed"],[[67647,67647],"valid"],[[67648,67669],"valid"],[[67670,67670],"disallowed"],[[67671,67679],"valid",[],"NV8"],[[67680,67702],"valid"],[[67703,67711],"valid",[],"NV8"],[[67712,67742],"valid"],[[67743,67750],"disallowed"],[[67751,67759],"valid",[],"NV8"],[[67760,67807],"disallowed"],[[67808,67826],"valid"],[[67827,67827],"disallowed"],[[67828,67829],"valid"],[[67830,67834],"disallowed"],[[67835,67839],"valid",[],"NV8"],[[67840,67861],"valid"],[[67862,67865],"valid",[],"NV8"],[[67866,67867],"valid",[],"NV8"],[[67868,67870],"disallowed"],[[67871,67871],"valid",[],"NV8"],[[67872,67897],"valid"],[[67898,67902],"disallowed"],[[67903,67903],"valid",[],"NV8"],[[67904,67967],"disallowed"],[[67968,68023],"valid"],[[68024,68027],"disallowed"],[[68028,68029],"valid",[],"NV8"],[[68030,68031],"valid"],[[68032,68047],"valid",[],"NV8"],[[68048,68049],"disallowed"],[[68050,68095],"valid",[],"NV8"],[[68096,68099],"valid"],[[68100,68100],"disallowed"],[[68101,68102],"valid"],[[68103,68107],"disallowed"],[[68108,68115],"valid"],[[68116,68116],"disallowed"],[[68117,68119],"valid"],[[68120,68120],"disallowed"],[[68121,68147],"valid"],[[68148,68151],"disallowed"],[[68152,68154],"valid"],[[68155,68158],"disallowed"],[[68159,68159],"valid"],[[68160,68167],"valid",[],"NV8"],[[68168,68175],"disallowed"],[[68176,68184],"valid",[],"NV8"],[[68185,68191],"disallowed"],[[68192,68220],"valid"],[[68221,68223],"valid",[],"NV8"],[[68224,68252],"valid"],[[68253,68255],"valid",[],"NV8"],[[68256,68287],"disallowed"],[[68288,68295],"valid"],[[68296,68296],"valid",[],"NV8"],[[68297,68326],"valid"],[[68327,68330],"disallowed"],[[68331,68342],"valid",[],"NV8"],[[68343,68351],"disallowed"],[[68352,68405],"valid"],[[68406,68408],"disallowed"],[[68409,68415],"valid",[],"NV8"],[[68416,68437],"valid"],[[68438,68439],"disallowed"],[[68440,68447],"valid",[],"NV8"],[[68448,68466],"valid"],[[68467,68471],"disallowed"],[[68472,68479],"valid",[],"NV8"],[[68480,68497],"valid"],[[68498,68504],"disallowed"],[[68505,68508],"valid",[],"NV8"],[[68509,68520],"disallowed"],[[68521,68527],"valid",[],"NV8"],[[68528,68607],"disallowed"],[[68608,68680],"valid"],[[68681,68735],"disallowed"],[[68736,68736],"mapped",[68800]],[[68737,68737],"mapped",[68801]],[[68738,68738],"mapped",[68802]],[[68739,68739],"mapped",[68803]],[[68740,68740],"mapped",[68804]],[[68741,68741],"mapped",[68805]],[[68742,68742],"mapped",[68806]],[[68743,68743],"mapped",[68807]],[[68744,68744],"mapped",[68808]],[[68745,68745],"mapped",[68809]],[[68746,68746],"mapped",[68810]],[[68747,68747],"mapped",[68811]],[[68748,68748],"mapped",[68812]],[[68749,68749],"mapped",[68813]],[[68750,68750],"mapped",[68814]],[[68751,68751],"mapped",[68815]],[[68752,68752],"mapped",[68816]],[[68753,68753],"mapped",[68817]],[[68754,68754],"mapped",[68818]],[[68755,68755],"mapped",[68819]],[[68756,68756],"mapped",[68820]],[[68757,68757],"mapped",[68821]],[[68758,68758],"mapped",[68822]],[[68759,68759],"mapped",[68823]],[[68760,68760],"mapped",[68824]],[[68761,68761],"mapped",[68825]],[[68762,68762],"mapped",[68826]],[[68763,68763],"mapped",[68827]],[[68764,68764],"mapped",[68828]],[[68765,68765],"mapped",[68829]],[[68766,68766],"mapped",[68830]],[[68767,68767],"mapped",[68831]],[[68768,68768],"mapped",[68832]],[[68769,68769],"mapped",[68833]],[[68770,68770],"mapped",[68834]],[[68771,68771],"mapped",[68835]],[[68772,68772],"mapped",[68836]],[[68773,68773],"mapped",[68837]],[[68774,68774],"mapped",[68838]],[[68775,68775],"mapped",[68839]],[[68776,68776],"mapped",[68840]],[[68777,68777],"mapped",[68841]],[[68778,68778],"mapped",[68842]],[[68779,68779],"mapped",[68843]],[[68780,68780],"mapped",[68844]],[[68781,68781],"mapped",[68845]],[[68782,68782],"mapped",[68846]],[[68783,68783],"mapped",[68847]],[[68784,68784],"mapped",[68848]],[[68785,68785],"mapped",[68849]],[[68786,68786],"mapped",[68850]],[[68787,68799],"disallowed"],[[68800,68850],"valid"],[[68851,68857],"disallowed"],[[68858,68863],"valid",[],"NV8"],[[68864,69215],"disallowed"],[[69216,69246],"valid",[],"NV8"],[[69247,69631],"disallowed"],[[69632,69702],"valid"],[[69703,69709],"valid",[],"NV8"],[[69710,69713],"disallowed"],[[69714,69733],"valid",[],"NV8"],[[69734,69743],"valid"],[[69744,69758],"disallowed"],[[69759,69759],"valid"],[[69760,69818],"valid"],[[69819,69820],"valid",[],"NV8"],[[69821,69821],"disallowed"],[[69822,69825],"valid",[],"NV8"],[[69826,69839],"disallowed"],[[69840,69864],"valid"],[[69865,69871],"disallowed"],[[69872,69881],"valid"],[[69882,69887],"disallowed"],[[69888,69940],"valid"],[[69941,69941],"disallowed"],[[69942,69951],"valid"],[[69952,69955],"valid",[],"NV8"],[[69956,69967],"disallowed"],[[69968,70003],"valid"],[[70004,70005],"valid",[],"NV8"],[[70006,70006],"valid"],[[70007,70015],"disallowed"],[[70016,70084],"valid"],[[70085,70088],"valid",[],"NV8"],[[70089,70089],"valid",[],"NV8"],[[70090,70092],"valid"],[[70093,70093],"valid",[],"NV8"],[[70094,70095],"disallowed"],[[70096,70105],"valid"],[[70106,70106],"valid"],[[70107,70107],"valid",[],"NV8"],[[70108,70108],"valid"],[[70109,70111],"valid",[],"NV8"],[[70112,70112],"disallowed"],[[70113,70132],"valid",[],"NV8"],[[70133,70143],"disallowed"],[[70144,70161],"valid"],[[70162,70162],"disallowed"],[[70163,70199],"valid"],[[70200,70205],"valid",[],"NV8"],[[70206,70271],"disallowed"],[[70272,70278],"valid"],[[70279,70279],"disallowed"],[[70280,70280],"valid"],[[70281,70281],"disallowed"],[[70282,70285],"valid"],[[70286,70286],"disallowed"],[[70287,70301],"valid"],[[70302,70302],"disallowed"],[[70303,70312],"valid"],[[70313,70313],"valid",[],"NV8"],[[70314,70319],"disallowed"],[[70320,70378],"valid"],[[70379,70383],"disallowed"],[[70384,70393],"valid"],[[70394,70399],"disallowed"],[[70400,70400],"valid"],[[70401,70403],"valid"],[[70404,70404],"disallowed"],[[70405,70412],"valid"],[[70413,70414],"disallowed"],[[70415,70416],"valid"],[[70417,70418],"disallowed"],[[70419,70440],"valid"],[[70441,70441],"disallowed"],[[70442,70448],"valid"],[[70449,70449],"disallowed"],[[70450,70451],"valid"],[[70452,70452],"disallowed"],[[70453,70457],"valid"],[[70458,70459],"disallowed"],[[70460,70468],"valid"],[[70469,70470],"disallowed"],[[70471,70472],"valid"],[[70473,70474],"disallowed"],[[70475,70477],"valid"],[[70478,70479],"disallowed"],[[70480,70480],"valid"],[[70481,70486],"disallowed"],[[70487,70487],"valid"],[[70488,70492],"disallowed"],[[70493,70499],"valid"],[[70500,70501],"disallowed"],[[70502,70508],"valid"],[[70509,70511],"disallowed"],[[70512,70516],"valid"],[[70517,70783],"disallowed"],[[70784,70853],"valid"],[[70854,70854],"valid",[],"NV8"],[[70855,70855],"valid"],[[70856,70863],"disallowed"],[[70864,70873],"valid"],[[70874,71039],"disallowed"],[[71040,71093],"valid"],[[71094,71095],"disallowed"],[[71096,71104],"valid"],[[71105,71113],"valid",[],"NV8"],[[71114,71127],"valid",[],"NV8"],[[71128,71133],"valid"],[[71134,71167],"disallowed"],[[71168,71232],"valid"],[[71233,71235],"valid",[],"NV8"],[[71236,71236],"valid"],[[71237,71247],"disallowed"],[[71248,71257],"valid"],[[71258,71295],"disallowed"],[[71296,71351],"valid"],[[71352,71359],"disallowed"],[[71360,71369],"valid"],[[71370,71423],"disallowed"],[[71424,71449],"valid"],[[71450,71452],"disallowed"],[[71453,71467],"valid"],[[71468,71471],"disallowed"],[[71472,71481],"valid"],[[71482,71487],"valid",[],"NV8"],[[71488,71839],"disallowed"],[[71840,71840],"mapped",[71872]],[[71841,71841],"mapped",[71873]],[[71842,71842],"mapped",[71874]],[[71843,71843],"mapped",[71875]],[[71844,71844],"mapped",[71876]],[[71845,71845],"mapped",[71877]],[[71846,71846],"mapped",[71878]],[[71847,71847],"mapped",[71879]],[[71848,71848],"mapped",[71880]],[[71849,71849],"mapped",[71881]],[[71850,71850],"mapped",[71882]],[[71851,71851],"mapped",[71883]],[[71852,71852],"mapped",[71884]],[[71853,71853],"mapped",[71885]],[[71854,71854],"mapped",[71886]],[[71855,71855],"mapped",[71887]],[[71856,71856],"mapped",[71888]],[[71857,71857],"mapped",[71889]],[[71858,71858],"mapped",[71890]],[[71859,71859],"mapped",[71891]],[[71860,71860],"mapped",[71892]],[[71861,71861],"mapped",[71893]],[[71862,71862],"mapped",[71894]],[[71863,71863],"mapped",[71895]],[[71864,71864],"mapped",[71896]],[[71865,71865],"mapped",[71897]],[[71866,71866],"mapped",[71898]],[[71867,71867],"mapped",[71899]],[[71868,71868],"mapped",[71900]],[[71869,71869],"mapped",[71901]],[[71870,71870],"mapped",[71902]],[[71871,71871],"mapped",[71903]],[[71872,71913],"valid"],[[71914,71922],"valid",[],"NV8"],[[71923,71934],"disallowed"],[[71935,71935],"valid"],[[71936,72383],"disallowed"],[[72384,72440],"valid"],[[72441,73727],"disallowed"],[[73728,74606],"valid"],[[74607,74648],"valid"],[[74649,74649],"valid"],[[74650,74751],"disallowed"],[[74752,74850],"valid",[],"NV8"],[[74851,74862],"valid",[],"NV8"],[[74863,74863],"disallowed"],[[74864,74867],"valid",[],"NV8"],[[74868,74868],"valid",[],"NV8"],[[74869,74879],"disallowed"],[[74880,75075],"valid"],[[75076,77823],"disallowed"],[[77824,78894],"valid"],[[78895,82943],"disallowed"],[[82944,83526],"valid"],[[83527,92159],"disallowed"],[[92160,92728],"valid"],[[92729,92735],"disallowed"],[[92736,92766],"valid"],[[92767,92767],"disallowed"],[[92768,92777],"valid"],[[92778,92781],"disallowed"],[[92782,92783],"valid",[],"NV8"],[[92784,92879],"disallowed"],[[92880,92909],"valid"],[[92910,92911],"disallowed"],[[92912,92916],"valid"],[[92917,92917],"valid",[],"NV8"],[[92918,92927],"disallowed"],[[92928,92982],"valid"],[[92983,92991],"valid",[],"NV8"],[[92992,92995],"valid"],[[92996,92997],"valid",[],"NV8"],[[92998,93007],"disallowed"],[[93008,93017],"valid"],[[93018,93018],"disallowed"],[[93019,93025],"valid",[],"NV8"],[[93026,93026],"disallowed"],[[93027,93047],"valid"],[[93048,93052],"disallowed"],[[93053,93071],"valid"],[[93072,93951],"disallowed"],[[93952,94020],"valid"],[[94021,94031],"disallowed"],[[94032,94078],"valid"],[[94079,94094],"disallowed"],[[94095,94111],"valid"],[[94112,110591],"disallowed"],[[110592,110593],"valid"],[[110594,113663],"disallowed"],[[113664,113770],"valid"],[[113771,113775],"disallowed"],[[113776,113788],"valid"],[[113789,113791],"disallowed"],[[113792,113800],"valid"],[[113801,113807],"disallowed"],[[113808,113817],"valid"],[[113818,113819],"disallowed"],[[113820,113820],"valid",[],"NV8"],[[113821,113822],"valid"],[[113823,113823],"valid",[],"NV8"],[[113824,113827],"ignored"],[[113828,118783],"disallowed"],[[118784,119029],"valid",[],"NV8"],[[119030,119039],"disallowed"],[[119040,119078],"valid",[],"NV8"],[[119079,119080],"disallowed"],[[119081,119081],"valid",[],"NV8"],[[119082,119133],"valid",[],"NV8"],[[119134,119134],"mapped",[119127,119141]],[[119135,119135],"mapped",[119128,119141]],[[119136,119136],"mapped",[119128,119141,119150]],[[119137,119137],"mapped",[119128,119141,119151]],[[119138,119138],"mapped",[119128,119141,119152]],[[119139,119139],"mapped",[119128,119141,119153]],[[119140,119140],"mapped",[119128,119141,119154]],[[119141,119154],"valid",[],"NV8"],[[119155,119162],"disallowed"],[[119163,119226],"valid",[],"NV8"],[[119227,119227],"mapped",[119225,119141]],[[119228,119228],"mapped",[119226,119141]],[[119229,119229],"mapped",[119225,119141,119150]],[[119230,119230],"mapped",[119226,119141,119150]],[[119231,119231],"mapped",[119225,119141,119151]],[[119232,119232],"mapped",[119226,119141,119151]],[[119233,119261],"valid",[],"NV8"],[[119262,119272],"valid",[],"NV8"],[[119273,119295],"disallowed"],[[119296,119365],"valid",[],"NV8"],[[119366,119551],"disallowed"],[[119552,119638],"valid",[],"NV8"],[[119639,119647],"disallowed"],[[119648,119665],"valid",[],"NV8"],[[119666,119807],"disallowed"],[[119808,119808],"mapped",[97]],[[119809,119809],"mapped",[98]],[[119810,119810],"mapped",[99]],[[119811,119811],"mapped",[100]],[[119812,119812],"mapped",[101]],[[119813,119813],"mapped",[102]],[[119814,119814],"mapped",[103]],[[119815,119815],"mapped",[104]],[[119816,119816],"mapped",[105]],[[119817,119817],"mapped",[106]],[[119818,119818],"mapped",[107]],[[119819,119819],"mapped",[108]],[[119820,119820],"mapped",[109]],[[119821,119821],"mapped",[110]],[[119822,119822],"mapped",[111]],[[119823,119823],"mapped",[112]],[[119824,119824],"mapped",[113]],[[119825,119825],"mapped",[114]],[[119826,119826],"mapped",[115]],[[119827,119827],"mapped",[116]],[[119828,119828],"mapped",[117]],[[119829,119829],"mapped",[118]],[[119830,119830],"mapped",[119]],[[119831,119831],"mapped",[120]],[[119832,119832],"mapped",[121]],[[119833,119833],"mapped",[122]],[[119834,119834],"mapped",[97]],[[119835,119835],"mapped",[98]],[[119836,119836],"mapped",[99]],[[119837,119837],"mapped",[100]],[[119838,119838],"mapped",[101]],[[119839,119839],"mapped",[102]],[[119840,119840],"mapped",[103]],[[119841,119841],"mapped",[104]],[[119842,119842],"mapped",[105]],[[119843,119843],"mapped",[106]],[[119844,119844],"mapped",[107]],[[119845,119845],"mapped",[108]],[[119846,119846],"mapped",[109]],[[119847,119847],"mapped",[110]],[[119848,119848],"mapped",[111]],[[119849,119849],"mapped",[112]],[[119850,119850],"mapped",[113]],[[119851,119851],"mapped",[114]],[[119852,119852],"mapped",[115]],[[119853,119853],"mapped",[116]],[[119854,119854],"mapped",[117]],[[119855,119855],"mapped",[118]],[[119856,119856],"mapped",[119]],[[119857,119857],"mapped",[120]],[[119858,119858],"mapped",[121]],[[119859,119859],"mapped",[122]],[[119860,119860],"mapped",[97]],[[119861,119861],"mapped",[98]],[[119862,119862],"mapped",[99]],[[119863,119863],"mapped",[100]],[[119864,119864],"mapped",[101]],[[119865,119865],"mapped",[102]],[[119866,119866],"mapped",[103]],[[119867,119867],"mapped",[104]],[[119868,119868],"mapped",[105]],[[119869,119869],"mapped",[106]],[[119870,119870],"mapped",[107]],[[119871,119871],"mapped",[108]],[[119872,119872],"mapped",[109]],[[119873,119873],"mapped",[110]],[[119874,119874],"mapped",[111]],[[119875,119875],"mapped",[112]],[[119876,119876],"mapped",[113]],[[119877,119877],"mapped",[114]],[[119878,119878],"mapped",[115]],[[119879,119879],"mapped",[116]],[[119880,119880],"mapped",[117]],[[119881,119881],"mapped",[118]],[[119882,119882],"mapped",[119]],[[119883,119883],"mapped",[120]],[[119884,119884],"mapped",[121]],[[119885,119885],"mapped",[122]],[[119886,119886],"mapped",[97]],[[119887,119887],"mapped",[98]],[[119888,119888],"mapped",[99]],[[119889,119889],"mapped",[100]],[[119890,119890],"mapped",[101]],[[119891,119891],"mapped",[102]],[[119892,119892],"mapped",[103]],[[119893,119893],"disallowed"],[[119894,119894],"mapped",[105]],[[119895,119895],"mapped",[106]],[[119896,119896],"mapped",[107]],[[119897,119897],"mapped",[108]],[[119898,119898],"mapped",[109]],[[119899,119899],"mapped",[110]],[[119900,119900],"mapped",[111]],[[119901,119901],"mapped",[112]],[[119902,119902],"mapped",[113]],[[119903,119903],"mapped",[114]],[[119904,119904],"mapped",[115]],[[119905,119905],"mapped",[116]],[[119906,119906],"mapped",[117]],[[119907,119907],"mapped",[118]],[[119908,119908],"mapped",[119]],[[119909,119909],"mapped",[120]],[[119910,119910],"mapped",[121]],[[119911,119911],"mapped",[122]],[[119912,119912],"mapped",[97]],[[119913,119913],"mapped",[98]],[[119914,119914],"mapped",[99]],[[119915,119915],"mapped",[100]],[[119916,119916],"mapped",[101]],[[119917,119917],"mapped",[102]],[[119918,119918],"mapped",[103]],[[119919,119919],"mapped",[104]],[[119920,119920],"mapped",[105]],[[119921,119921],"mapped",[106]],[[119922,119922],"mapped",[107]],[[119923,119923],"mapped",[108]],[[119924,119924],"mapped",[109]],[[119925,119925],"mapped",[110]],[[119926,119926],"mapped",[111]],[[119927,119927],"mapped",[112]],[[119928,119928],"mapped",[113]],[[119929,119929],"mapped",[114]],[[119930,119930],"mapped",[115]],[[119931,119931],"mapped",[116]],[[119932,119932],"mapped",[117]],[[119933,119933],"mapped",[118]],[[119934,119934],"mapped",[119]],[[119935,119935],"mapped",[120]],[[119936,119936],"mapped",[121]],[[119937,119937],"mapped",[122]],[[119938,119938],"mapped",[97]],[[119939,119939],"mapped",[98]],[[119940,119940],"mapped",[99]],[[119941,119941],"mapped",[100]],[[119942,119942],"mapped",[101]],[[119943,119943],"mapped",[102]],[[119944,119944],"mapped",[103]],[[119945,119945],"mapped",[104]],[[119946,119946],"mapped",[105]],[[119947,119947],"mapped",[106]],[[119948,119948],"mapped",[107]],[[119949,119949],"mapped",[108]],[[119950,119950],"mapped",[109]],[[119951,119951],"mapped",[110]],[[119952,119952],"mapped",[111]],[[119953,119953],"mapped",[112]],[[119954,119954],"mapped",[113]],[[119955,119955],"mapped",[114]],[[119956,119956],"mapped",[115]],[[119957,119957],"mapped",[116]],[[119958,119958],"mapped",[117]],[[119959,119959],"mapped",[118]],[[119960,119960],"mapped",[119]],[[119961,119961],"mapped",[120]],[[119962,119962],"mapped",[121]],[[119963,119963],"mapped",[122]],[[119964,119964],"mapped",[97]],[[119965,119965],"disallowed"],[[119966,119966],"mapped",[99]],[[119967,119967],"mapped",[100]],[[119968,119969],"disallowed"],[[119970,119970],"mapped",[103]],[[119971,119972],"disallowed"],[[119973,119973],"mapped",[106]],[[119974,119974],"mapped",[107]],[[119975,119976],"disallowed"],[[119977,119977],"mapped",[110]],[[119978,119978],"mapped",[111]],[[119979,119979],"mapped",[112]],[[119980,119980],"mapped",[113]],[[119981,119981],"disallowed"],[[119982,119982],"mapped",[115]],[[119983,119983],"mapped",[116]],[[119984,119984],"mapped",[117]],[[119985,119985],"mapped",[118]],[[119986,119986],"mapped",[119]],[[119987,119987],"mapped",[120]],[[119988,119988],"mapped",[121]],[[119989,119989],"mapped",[122]],[[119990,119990],"mapped",[97]],[[119991,119991],"mapped",[98]],[[119992,119992],"mapped",[99]],[[119993,119993],"mapped",[100]],[[119994,119994],"disallowed"],[[119995,119995],"mapped",[102]],[[119996,119996],"disallowed"],[[119997,119997],"mapped",[104]],[[119998,119998],"mapped",[105]],[[119999,119999],"mapped",[106]],[[120000,120000],"mapped",[107]],[[120001,120001],"mapped",[108]],[[120002,120002],"mapped",[109]],[[120003,120003],"mapped",[110]],[[120004,120004],"disallowed"],[[120005,120005],"mapped",[112]],[[120006,120006],"mapped",[113]],[[120007,120007],"mapped",[114]],[[120008,120008],"mapped",[115]],[[120009,120009],"mapped",[116]],[[120010,120010],"mapped",[117]],[[120011,120011],"mapped",[118]],[[120012,120012],"mapped",[119]],[[120013,120013],"mapped",[120]],[[120014,120014],"mapped",[121]],[[120015,120015],"mapped",[122]],[[120016,120016],"mapped",[97]],[[120017,120017],"mapped",[98]],[[120018,120018],"mapped",[99]],[[120019,120019],"mapped",[100]],[[120020,120020],"mapped",[101]],[[120021,120021],"mapped",[102]],[[120022,120022],"mapped",[103]],[[120023,120023],"mapped",[104]],[[120024,120024],"mapped",[105]],[[120025,120025],"mapped",[106]],[[120026,120026],"mapped",[107]],[[120027,120027],"mapped",[108]],[[120028,120028],"mapped",[109]],[[120029,120029],"mapped",[110]],[[120030,120030],"mapped",[111]],[[120031,120031],"mapped",[112]],[[120032,120032],"mapped",[113]],[[120033,120033],"mapped",[114]],[[120034,120034],"mapped",[115]],[[120035,120035],"mapped",[116]],[[120036,120036],"mapped",[117]],[[120037,120037],"mapped",[118]],[[120038,120038],"mapped",[119]],[[120039,120039],"mapped",[120]],[[120040,120040],"mapped",[121]],[[120041,120041],"mapped",[122]],[[120042,120042],"mapped",[97]],[[120043,120043],"mapped",[98]],[[120044,120044],"mapped",[99]],[[120045,120045],"mapped",[100]],[[120046,120046],"mapped",[101]],[[120047,120047],"mapped",[102]],[[120048,120048],"mapped",[103]],[[120049,120049],"mapped",[104]],[[120050,120050],"mapped",[105]],[[120051,120051],"mapped",[106]],[[120052,120052],"mapped",[107]],[[120053,120053],"mapped",[108]],[[120054,120054],"mapped",[109]],[[120055,120055],"mapped",[110]],[[120056,120056],"mapped",[111]],[[120057,120057],"mapped",[112]],[[120058,120058],"mapped",[113]],[[120059,120059],"mapped",[114]],[[120060,120060],"mapped",[115]],[[120061,120061],"mapped",[116]],[[120062,120062],"mapped",[117]],[[120063,120063],"mapped",[118]],[[120064,120064],"mapped",[119]],[[120065,120065],"mapped",[120]],[[120066,120066],"mapped",[121]],[[120067,120067],"mapped",[122]],[[120068,120068],"mapped",[97]],[[120069,120069],"mapped",[98]],[[120070,120070],"disallowed"],[[120071,120071],"mapped",[100]],[[120072,120072],"mapped",[101]],[[120073,120073],"mapped",[102]],[[120074,120074],"mapped",[103]],[[120075,120076],"disallowed"],[[120077,120077],"mapped",[106]],[[120078,120078],"mapped",[107]],[[120079,120079],"mapped",[108]],[[120080,120080],"mapped",[109]],[[120081,120081],"mapped",[110]],[[120082,120082],"mapped",[111]],[[120083,120083],"mapped",[112]],[[120084,120084],"mapped",[113]],[[120085,120085],"disallowed"],[[120086,120086],"mapped",[115]],[[120087,120087],"mapped",[116]],[[120088,120088],"mapped",[117]],[[120089,120089],"mapped",[118]],[[120090,120090],"mapped",[119]],[[120091,120091],"mapped",[120]],[[120092,120092],"mapped",[121]],[[120093,120093],"disallowed"],[[120094,120094],"mapped",[97]],[[120095,120095],"mapped",[98]],[[120096,120096],"mapped",[99]],[[120097,120097],"mapped",[100]],[[120098,120098],"mapped",[101]],[[120099,120099],"mapped",[102]],[[120100,120100],"mapped",[103]],[[120101,120101],"mapped",[104]],[[120102,120102],"mapped",[105]],[[120103,120103],"mapped",[106]],[[120104,120104],"mapped",[107]],[[120105,120105],"mapped",[108]],[[120106,120106],"mapped",[109]],[[120107,120107],"mapped",[110]],[[120108,120108],"mapped",[111]],[[120109,120109],"mapped",[112]],[[120110,120110],"mapped",[113]],[[120111,120111],"mapped",[114]],[[120112,120112],"mapped",[115]],[[120113,120113],"mapped",[116]],[[120114,120114],"mapped",[117]],[[120115,120115],"mapped",[118]],[[120116,120116],"mapped",[119]],[[120117,120117],"mapped",[120]],[[120118,120118],"mapped",[121]],[[120119,120119],"mapped",[122]],[[120120,120120],"mapped",[97]],[[120121,120121],"mapped",[98]],[[120122,120122],"disallowed"],[[120123,120123],"mapped",[100]],[[120124,120124],"mapped",[101]],[[120125,120125],"mapped",[102]],[[120126,120126],"mapped",[103]],[[120127,120127],"disallowed"],[[120128,120128],"mapped",[105]],[[120129,120129],"mapped",[106]],[[120130,120130],"mapped",[107]],[[120131,120131],"mapped",[108]],[[120132,120132],"mapped",[109]],[[120133,120133],"disallowed"],[[120134,120134],"mapped",[111]],[[120135,120137],"disallowed"],[[120138,120138],"mapped",[115]],[[120139,120139],"mapped",[116]],[[120140,120140],"mapped",[117]],[[120141,120141],"mapped",[118]],[[120142,120142],"mapped",[119]],[[120143,120143],"mapped",[120]],[[120144,120144],"mapped",[121]],[[120145,120145],"disallowed"],[[120146,120146],"mapped",[97]],[[120147,120147],"mapped",[98]],[[120148,120148],"mapped",[99]],[[120149,120149],"mapped",[100]],[[120150,120150],"mapped",[101]],[[120151,120151],"mapped",[102]],[[120152,120152],"mapped",[103]],[[120153,120153],"mapped",[104]],[[120154,120154],"mapped",[105]],[[120155,120155],"mapped",[106]],[[120156,120156],"mapped",[107]],[[120157,120157],"mapped",[108]],[[120158,120158],"mapped",[109]],[[120159,120159],"mapped",[110]],[[120160,120160],"mapped",[111]],[[120161,120161],"mapped",[112]],[[120162,120162],"mapped",[113]],[[120163,120163],"mapped",[114]],[[120164,120164],"mapped",[115]],[[120165,120165],"mapped",[116]],[[120166,120166],"mapped",[117]],[[120167,120167],"mapped",[118]],[[120168,120168],"mapped",[119]],[[120169,120169],"mapped",[120]],[[120170,120170],"mapped",[121]],[[120171,120171],"mapped",[122]],[[120172,120172],"mapped",[97]],[[120173,120173],"mapped",[98]],[[120174,120174],"mapped",[99]],[[120175,120175],"mapped",[100]],[[120176,120176],"mapped",[101]],[[120177,120177],"mapped",[102]],[[120178,120178],"mapped",[103]],[[120179,120179],"mapped",[104]],[[120180,120180],"mapped",[105]],[[120181,120181],"mapped",[106]],[[120182,120182],"mapped",[107]],[[120183,120183],"mapped",[108]],[[120184,120184],"mapped",[109]],[[120185,120185],"mapped",[110]],[[120186,120186],"mapped",[111]],[[120187,120187],"mapped",[112]],[[120188,120188],"mapped",[113]],[[120189,120189],"mapped",[114]],[[120190,120190],"mapped",[115]],[[120191,120191],"mapped",[116]],[[120192,120192],"mapped",[117]],[[120193,120193],"mapped",[118]],[[120194,120194],"mapped",[119]],[[120195,120195],"mapped",[120]],[[120196,120196],"mapped",[121]],[[120197,120197],"mapped",[122]],[[120198,120198],"mapped",[97]],[[120199,120199],"mapped",[98]],[[120200,120200],"mapped",[99]],[[120201,120201],"mapped",[100]],[[120202,120202],"mapped",[101]],[[120203,120203],"mapped",[102]],[[120204,120204],"mapped",[103]],[[120205,120205],"mapped",[104]],[[120206,120206],"mapped",[105]],[[120207,120207],"mapped",[106]],[[120208,120208],"mapped",[107]],[[120209,120209],"mapped",[108]],[[120210,120210],"mapped",[109]],[[120211,120211],"mapped",[110]],[[120212,120212],"mapped",[111]],[[120213,120213],"mapped",[112]],[[120214,120214],"mapped",[113]],[[120215,120215],"mapped",[114]],[[120216,120216],"mapped",[115]],[[120217,120217],"mapped",[116]],[[120218,120218],"mapped",[117]],[[120219,120219],"mapped",[118]],[[120220,120220],"mapped",[119]],[[120221,120221],"mapped",[120]],[[120222,120222],"mapped",[121]],[[120223,120223],"mapped",[122]],[[120224,120224],"mapped",[97]],[[120225,120225],"mapped",[98]],[[120226,120226],"mapped",[99]],[[120227,120227],"mapped",[100]],[[120228,120228],"mapped",[101]],[[120229,120229],"mapped",[102]],[[120230,120230],"mapped",[103]],[[120231,120231],"mapped",[104]],[[120232,120232],"mapped",[105]],[[120233,120233],"mapped",[106]],[[120234,120234],"mapped",[107]],[[120235,120235],"mapped",[108]],[[120236,120236],"mapped",[109]],[[120237,120237],"mapped",[110]],[[120238,120238],"mapped",[111]],[[120239,120239],"mapped",[112]],[[120240,120240],"mapped",[113]],[[120241,120241],"mapped",[114]],[[120242,120242],"mapped",[115]],[[120243,120243],"mapped",[116]],[[120244,120244],"mapped",[117]],[[120245,120245],"mapped",[118]],[[120246,120246],"mapped",[119]],[[120247,120247],"mapped",[120]],[[120248,120248],"mapped",[121]],[[120249,120249],"mapped",[122]],[[120250,120250],"mapped",[97]],[[120251,120251],"mapped",[98]],[[120252,120252],"mapped",[99]],[[120253,120253],"mapped",[100]],[[120254,120254],"mapped",[101]],[[120255,120255],"mapped",[102]],[[120256,120256],"mapped",[103]],[[120257,120257],"mapped",[104]],[[120258,120258],"mapped",[105]],[[120259,120259],"mapped",[106]],[[120260,120260],"mapped",[107]],[[120261,120261],"mapped",[108]],[[120262,120262],"mapped",[109]],[[120263,120263],"mapped",[110]],[[120264,120264],"mapped",[111]],[[120265,120265],"mapped",[112]],[[120266,120266],"mapped",[113]],[[120267,120267],"mapped",[114]],[[120268,120268],"mapped",[115]],[[120269,120269],"mapped",[116]],[[120270,120270],"mapped",[117]],[[120271,120271],"mapped",[118]],[[120272,120272],"mapped",[119]],[[120273,120273],"mapped",[120]],[[120274,120274],"mapped",[121]],[[120275,120275],"mapped",[122]],[[120276,120276],"mapped",[97]],[[120277,120277],"mapped",[98]],[[120278,120278],"mapped",[99]],[[120279,120279],"mapped",[100]],[[120280,120280],"mapped",[101]],[[120281,120281],"mapped",[102]],[[120282,120282],"mapped",[103]],[[120283,120283],"mapped",[104]],[[120284,120284],"mapped",[105]],[[120285,120285],"mapped",[106]],[[120286,120286],"mapped",[107]],[[120287,120287],"mapped",[108]],[[120288,120288],"mapped",[109]],[[120289,120289],"mapped",[110]],[[120290,120290],"mapped",[111]],[[120291,120291],"mapped",[112]],[[120292,120292],"mapped",[113]],[[120293,120293],"mapped",[114]],[[120294,120294],"mapped",[115]],[[120295,120295],"mapped",[116]],[[120296,120296],"mapped",[117]],[[120297,120297],"mapped",[118]],[[120298,120298],"mapped",[119]],[[120299,120299],"mapped",[120]],[[120300,120300],"mapped",[121]],[[120301,120301],"mapped",[122]],[[120302,120302],"mapped",[97]],[[120303,120303],"mapped",[98]],[[120304,120304],"mapped",[99]],[[120305,120305],"mapped",[100]],[[120306,120306],"mapped",[101]],[[120307,120307],"mapped",[102]],[[120308,120308],"mapped",[103]],[[120309,120309],"mapped",[104]],[[120310,120310],"mapped",[105]],[[120311,120311],"mapped",[106]],[[120312,120312],"mapped",[107]],[[120313,120313],"mapped",[108]],[[120314,120314],"mapped",[109]],[[120315,120315],"mapped",[110]],[[120316,120316],"mapped",[111]],[[120317,120317],"mapped",[112]],[[120318,120318],"mapped",[113]],[[120319,120319],"mapped",[114]],[[120320,120320],"mapped",[115]],[[120321,120321],"mapped",[116]],[[120322,120322],"mapped",[117]],[[120323,120323],"mapped",[118]],[[120324,120324],"mapped",[119]],[[120325,120325],"mapped",[120]],[[120326,120326],"mapped",[121]],[[120327,120327],"mapped",[122]],[[120328,120328],"mapped",[97]],[[120329,120329],"mapped",[98]],[[120330,120330],"mapped",[99]],[[120331,120331],"mapped",[100]],[[120332,120332],"mapped",[101]],[[120333,120333],"mapped",[102]],[[120334,120334],"mapped",[103]],[[120335,120335],"mapped",[104]],[[120336,120336],"mapped",[105]],[[120337,120337],"mapped",[106]],[[120338,120338],"mapped",[107]],[[120339,120339],"mapped",[108]],[[120340,120340],"mapped",[109]],[[120341,120341],"mapped",[110]],[[120342,120342],"mapped",[111]],[[120343,120343],"mapped",[112]],[[120344,120344],"mapped",[113]],[[120345,120345],"mapped",[114]],[[120346,120346],"mapped",[115]],[[120347,120347],"mapped",[116]],[[120348,120348],"mapped",[117]],[[120349,120349],"mapped",[118]],[[120350,120350],"mapped",[119]],[[120351,120351],"mapped",[120]],[[120352,120352],"mapped",[121]],[[120353,120353],"mapped",[122]],[[120354,120354],"mapped",[97]],[[120355,120355],"mapped",[98]],[[120356,120356],"mapped",[99]],[[120357,120357],"mapped",[100]],[[120358,120358],"mapped",[101]],[[120359,120359],"mapped",[102]],[[120360,120360],"mapped",[103]],[[120361,120361],"mapped",[104]],[[120362,120362],"mapped",[105]],[[120363,120363],"mapped",[106]],[[120364,120364],"mapped",[107]],[[120365,120365],"mapped",[108]],[[120366,120366],"mapped",[109]],[[120367,120367],"mapped",[110]],[[120368,120368],"mapped",[111]],[[120369,120369],"mapped",[112]],[[120370,120370],"mapped",[113]],[[120371,120371],"mapped",[114]],[[120372,120372],"mapped",[115]],[[120373,120373],"mapped",[116]],[[120374,120374],"mapped",[117]],[[120375,120375],"mapped",[118]],[[120376,120376],"mapped",[119]],[[120377,120377],"mapped",[120]],[[120378,120378],"mapped",[121]],[[120379,120379],"mapped",[122]],[[120380,120380],"mapped",[97]],[[120381,120381],"mapped",[98]],[[120382,120382],"mapped",[99]],[[120383,120383],"mapped",[100]],[[120384,120384],"mapped",[101]],[[120385,120385],"mapped",[102]],[[120386,120386],"mapped",[103]],[[120387,120387],"mapped",[104]],[[120388,120388],"mapped",[105]],[[120389,120389],"mapped",[106]],[[120390,120390],"mapped",[107]],[[120391,120391],"mapped",[108]],[[120392,120392],"mapped",[109]],[[120393,120393],"mapped",[110]],[[120394,120394],"mapped",[111]],[[120395,120395],"mapped",[112]],[[120396,120396],"mapped",[113]],[[120397,120397],"mapped",[114]],[[120398,120398],"mapped",[115]],[[120399,120399],"mapped",[116]],[[120400,120400],"mapped",[117]],[[120401,120401],"mapped",[118]],[[120402,120402],"mapped",[119]],[[120403,120403],"mapped",[120]],[[120404,120404],"mapped",[121]],[[120405,120405],"mapped",[122]],[[120406,120406],"mapped",[97]],[[120407,120407],"mapped",[98]],[[120408,120408],"mapped",[99]],[[120409,120409],"mapped",[100]],[[120410,120410],"mapped",[101]],[[120411,120411],"mapped",[102]],[[120412,120412],"mapped",[103]],[[120413,120413],"mapped",[104]],[[120414,120414],"mapped",[105]],[[120415,120415],"mapped",[106]],[[120416,120416],"mapped",[107]],[[120417,120417],"mapped",[108]],[[120418,120418],"mapped",[109]],[[120419,120419],"mapped",[110]],[[120420,120420],"mapped",[111]],[[120421,120421],"mapped",[112]],[[120422,120422],"mapped",[113]],[[120423,120423],"mapped",[114]],[[120424,120424],"mapped",[115]],[[120425,120425],"mapped",[116]],[[120426,120426],"mapped",[117]],[[120427,120427],"mapped",[118]],[[120428,120428],"mapped",[119]],[[120429,120429],"mapped",[120]],[[120430,120430],"mapped",[121]],[[120431,120431],"mapped",[122]],[[120432,120432],"mapped",[97]],[[120433,120433],"mapped",[98]],[[120434,120434],"mapped",[99]],[[120435,120435],"mapped",[100]],[[120436,120436],"mapped",[101]],[[120437,120437],"mapped",[102]],[[120438,120438],"mapped",[103]],[[120439,120439],"mapped",[104]],[[120440,120440],"mapped",[105]],[[120441,120441],"mapped",[106]],[[120442,120442],"mapped",[107]],[[120443,120443],"mapped",[108]],[[120444,120444],"mapped",[109]],[[120445,120445],"mapped",[110]],[[120446,120446],"mapped",[111]],[[120447,120447],"mapped",[112]],[[120448,120448],"mapped",[113]],[[120449,120449],"mapped",[114]],[[120450,120450],"mapped",[115]],[[120451,120451],"mapped",[116]],[[120452,120452],"mapped",[117]],[[120453,120453],"mapped",[118]],[[120454,120454],"mapped",[119]],[[120455,120455],"mapped",[120]],[[120456,120456],"mapped",[121]],[[120457,120457],"mapped",[122]],[[120458,120458],"mapped",[97]],[[120459,120459],"mapped",[98]],[[120460,120460],"mapped",[99]],[[120461,120461],"mapped",[100]],[[120462,120462],"mapped",[101]],[[120463,120463],"mapped",[102]],[[120464,120464],"mapped",[103]],[[120465,120465],"mapped",[104]],[[120466,120466],"mapped",[105]],[[120467,120467],"mapped",[106]],[[120468,120468],"mapped",[107]],[[120469,120469],"mapped",[108]],[[120470,120470],"mapped",[109]],[[120471,120471],"mapped",[110]],[[120472,120472],"mapped",[111]],[[120473,120473],"mapped",[112]],[[120474,120474],"mapped",[113]],[[120475,120475],"mapped",[114]],[[120476,120476],"mapped",[115]],[[120477,120477],"mapped",[116]],[[120478,120478],"mapped",[117]],[[120479,120479],"mapped",[118]],[[120480,120480],"mapped",[119]],[[120481,120481],"mapped",[120]],[[120482,120482],"mapped",[121]],[[120483,120483],"mapped",[122]],[[120484,120484],"mapped",[305]],[[120485,120485],"mapped",[567]],[[120486,120487],"disallowed"],[[120488,120488],"mapped",[945]],[[120489,120489],"mapped",[946]],[[120490,120490],"mapped",[947]],[[120491,120491],"mapped",[948]],[[120492,120492],"mapped",[949]],[[120493,120493],"mapped",[950]],[[120494,120494],"mapped",[951]],[[120495,120495],"mapped",[952]],[[120496,120496],"mapped",[953]],[[120497,120497],"mapped",[954]],[[120498,120498],"mapped",[955]],[[120499,120499],"mapped",[956]],[[120500,120500],"mapped",[957]],[[120501,120501],"mapped",[958]],[[120502,120502],"mapped",[959]],[[120503,120503],"mapped",[960]],[[120504,120504],"mapped",[961]],[[120505,120505],"mapped",[952]],[[120506,120506],"mapped",[963]],[[120507,120507],"mapped",[964]],[[120508,120508],"mapped",[965]],[[120509,120509],"mapped",[966]],[[120510,120510],"mapped",[967]],[[120511,120511],"mapped",[968]],[[120512,120512],"mapped",[969]],[[120513,120513],"mapped",[8711]],[[120514,120514],"mapped",[945]],[[120515,120515],"mapped",[946]],[[120516,120516],"mapped",[947]],[[120517,120517],"mapped",[948]],[[120518,120518],"mapped",[949]],[[120519,120519],"mapped",[950]],[[120520,120520],"mapped",[951]],[[120521,120521],"mapped",[952]],[[120522,120522],"mapped",[953]],[[120523,120523],"mapped",[954]],[[120524,120524],"mapped",[955]],[[120525,120525],"mapped",[956]],[[120526,120526],"mapped",[957]],[[120527,120527],"mapped",[958]],[[120528,120528],"mapped",[959]],[[120529,120529],"mapped",[960]],[[120530,120530],"mapped",[961]],[[120531,120532],"mapped",[963]],[[120533,120533],"mapped",[964]],[[120534,120534],"mapped",[965]],[[120535,120535],"mapped",[966]],[[120536,120536],"mapped",[967]],[[120537,120537],"mapped",[968]],[[120538,120538],"mapped",[969]],[[120539,120539],"mapped",[8706]],[[120540,120540],"mapped",[949]],[[120541,120541],"mapped",[952]],[[120542,120542],"mapped",[954]],[[120543,120543],"mapped",[966]],[[120544,120544],"mapped",[961]],[[120545,120545],"mapped",[960]],[[120546,120546],"mapped",[945]],[[120547,120547],"mapped",[946]],[[120548,120548],"mapped",[947]],[[120549,120549],"mapped",[948]],[[120550,120550],"mapped",[949]],[[120551,120551],"mapped",[950]],[[120552,120552],"mapped",[951]],[[120553,120553],"mapped",[952]],[[120554,120554],"mapped",[953]],[[120555,120555],"mapped",[954]],[[120556,120556],"mapped",[955]],[[120557,120557],"mapped",[956]],[[120558,120558],"mapped",[957]],[[120559,120559],"mapped",[958]],[[120560,120560],"mapped",[959]],[[120561,120561],"mapped",[960]],[[120562,120562],"mapped",[961]],[[120563,120563],"mapped",[952]],[[120564,120564],"mapped",[963]],[[120565,120565],"mapped",[964]],[[120566,120566],"mapped",[965]],[[120567,120567],"mapped",[966]],[[120568,120568],"mapped",[967]],[[120569,120569],"mapped",[968]],[[120570,120570],"mapped",[969]],[[120571,120571],"mapped",[8711]],[[120572,120572],"mapped",[945]],[[120573,120573],"mapped",[946]],[[120574,120574],"mapped",[947]],[[120575,120575],"mapped",[948]],[[120576,120576],"mapped",[949]],[[120577,120577],"mapped",[950]],[[120578,120578],"mapped",[951]],[[120579,120579],"mapped",[952]],[[120580,120580],"mapped",[953]],[[120581,120581],"mapped",[954]],[[120582,120582],"mapped",[955]],[[120583,120583],"mapped",[956]],[[120584,120584],"mapped",[957]],[[120585,120585],"mapped",[958]],[[120586,120586],"mapped",[959]],[[120587,120587],"mapped",[960]],[[120588,120588],"mapped",[961]],[[120589,120590],"mapped",[963]],[[120591,120591],"mapped",[964]],[[120592,120592],"mapped",[965]],[[120593,120593],"mapped",[966]],[[120594,120594],"mapped",[967]],[[120595,120595],"mapped",[968]],[[120596,120596],"mapped",[969]],[[120597,120597],"mapped",[8706]],[[120598,120598],"mapped",[949]],[[120599,120599],"mapped",[952]],[[120600,120600],"mapped",[954]],[[120601,120601],"mapped",[966]],[[120602,120602],"mapped",[961]],[[120603,120603],"mapped",[960]],[[120604,120604],"mapped",[945]],[[120605,120605],"mapped",[946]],[[120606,120606],"mapped",[947]],[[120607,120607],"mapped",[948]],[[120608,120608],"mapped",[949]],[[120609,120609],"mapped",[950]],[[120610,120610],"mapped",[951]],[[120611,120611],"mapped",[952]],[[120612,120612],"mapped",[953]],[[120613,120613],"mapped",[954]],[[120614,120614],"mapped",[955]],[[120615,120615],"mapped",[956]],[[120616,120616],"mapped",[957]],[[120617,120617],"mapped",[958]],[[120618,120618],"mapped",[959]],[[120619,120619],"mapped",[960]],[[120620,120620],"mapped",[961]],[[120621,120621],"mapped",[952]],[[120622,120622],"mapped",[963]],[[120623,120623],"mapped",[964]],[[120624,120624],"mapped",[965]],[[120625,120625],"mapped",[966]],[[120626,120626],"mapped",[967]],[[120627,120627],"mapped",[968]],[[120628,120628],"mapped",[969]],[[120629,120629],"mapped",[8711]],[[120630,120630],"mapped",[945]],[[120631,120631],"mapped",[946]],[[120632,120632],"mapped",[947]],[[120633,120633],"mapped",[948]],[[120634,120634],"mapped",[949]],[[120635,120635],"mapped",[950]],[[120636,120636],"mapped",[951]],[[120637,120637],"mapped",[952]],[[120638,120638],"mapped",[953]],[[120639,120639],"mapped",[954]],[[120640,120640],"mapped",[955]],[[120641,120641],"mapped",[956]],[[120642,120642],"mapped",[957]],[[120643,120643],"mapped",[958]],[[120644,120644],"mapped",[959]],[[120645,120645],"mapped",[960]],[[120646,120646],"mapped",[961]],[[120647,120648],"mapped",[963]],[[120649,120649],"mapped",[964]],[[120650,120650],"mapped",[965]],[[120651,120651],"mapped",[966]],[[120652,120652],"mapped",[967]],[[120653,120653],"mapped",[968]],[[120654,120654],"mapped",[969]],[[120655,120655],"mapped",[8706]],[[120656,120656],"mapped",[949]],[[120657,120657],"mapped",[952]],[[120658,120658],"mapped",[954]],[[120659,120659],"mapped",[966]],[[120660,120660],"mapped",[961]],[[120661,120661],"mapped",[960]],[[120662,120662],"mapped",[945]],[[120663,120663],"mapped",[946]],[[120664,120664],"mapped",[947]],[[120665,120665],"mapped",[948]],[[120666,120666],"mapped",[949]],[[120667,120667],"mapped",[950]],[[120668,120668],"mapped",[951]],[[120669,120669],"mapped",[952]],[[120670,120670],"mapped",[953]],[[120671,120671],"mapped",[954]],[[120672,120672],"mapped",[955]],[[120673,120673],"mapped",[956]],[[120674,120674],"mapped",[957]],[[120675,120675],"mapped",[958]],[[120676,120676],"mapped",[959]],[[120677,120677],"mapped",[960]],[[120678,120678],"mapped",[961]],[[120679,120679],"mapped",[952]],[[120680,120680],"mapped",[963]],[[120681,120681],"mapped",[964]],[[120682,120682],"mapped",[965]],[[120683,120683],"mapped",[966]],[[120684,120684],"mapped",[967]],[[120685,120685],"mapped",[968]],[[120686,120686],"mapped",[969]],[[120687,120687],"mapped",[8711]],[[120688,120688],"mapped",[945]],[[120689,120689],"mapped",[946]],[[120690,120690],"mapped",[947]],[[120691,120691],"mapped",[948]],[[120692,120692],"mapped",[949]],[[120693,120693],"mapped",[950]],[[120694,120694],"mapped",[951]],[[120695,120695],"mapped",[952]],[[120696,120696],"mapped",[953]],[[120697,120697],"mapped",[954]],[[120698,120698],"mapped",[955]],[[120699,120699],"mapped",[956]],[[120700,120700],"mapped",[957]],[[120701,120701],"mapped",[958]],[[120702,120702],"mapped",[959]],[[120703,120703],"mapped",[960]],[[120704,120704],"mapped",[961]],[[120705,120706],"mapped",[963]],[[120707,120707],"mapped",[964]],[[120708,120708],"mapped",[965]],[[120709,120709],"mapped",[966]],[[120710,120710],"mapped",[967]],[[120711,120711],"mapped",[968]],[[120712,120712],"mapped",[969]],[[120713,120713],"mapped",[8706]],[[120714,120714],"mapped",[949]],[[120715,120715],"mapped",[952]],[[120716,120716],"mapped",[954]],[[120717,120717],"mapped",[966]],[[120718,120718],"mapped",[961]],[[120719,120719],"mapped",[960]],[[120720,120720],"mapped",[945]],[[120721,120721],"mapped",[946]],[[120722,120722],"mapped",[947]],[[120723,120723],"mapped",[948]],[[120724,120724],"mapped",[949]],[[120725,120725],"mapped",[950]],[[120726,120726],"mapped",[951]],[[120727,120727],"mapped",[952]],[[120728,120728],"mapped",[953]],[[120729,120729],"mapped",[954]],[[120730,120730],"mapped",[955]],[[120731,120731],"mapped",[956]],[[120732,120732],"mapped",[957]],[[120733,120733],"mapped",[958]],[[120734,120734],"mapped",[959]],[[120735,120735],"mapped",[960]],[[120736,120736],"mapped",[961]],[[120737,120737],"mapped",[952]],[[120738,120738],"mapped",[963]],[[120739,120739],"mapped",[964]],[[120740,120740],"mapped",[965]],[[120741,120741],"mapped",[966]],[[120742,120742],"mapped",[967]],[[120743,120743],"mapped",[968]],[[120744,120744],"mapped",[969]],[[120745,120745],"mapped",[8711]],[[120746,120746],"mapped",[945]],[[120747,120747],"mapped",[946]],[[120748,120748],"mapped",[947]],[[120749,120749],"mapped",[948]],[[120750,120750],"mapped",[949]],[[120751,120751],"mapped",[950]],[[120752,120752],"mapped",[951]],[[120753,120753],"mapped",[952]],[[120754,120754],"mapped",[953]],[[120755,120755],"mapped",[954]],[[120756,120756],"mapped",[955]],[[120757,120757],"mapped",[956]],[[120758,120758],"mapped",[957]],[[120759,120759],"mapped",[958]],[[120760,120760],"mapped",[959]],[[120761,120761],"mapped",[960]],[[120762,120762],"mapped",[961]],[[120763,120764],"mapped",[963]],[[120765,120765],"mapped",[964]],[[120766,120766],"mapped",[965]],[[120767,120767],"mapped",[966]],[[120768,120768],"mapped",[967]],[[120769,120769],"mapped",[968]],[[120770,120770],"mapped",[969]],[[120771,120771],"mapped",[8706]],[[120772,120772],"mapped",[949]],[[120773,120773],"mapped",[952]],[[120774,120774],"mapped",[954]],[[120775,120775],"mapped",[966]],[[120776,120776],"mapped",[961]],[[120777,120777],"mapped",[960]],[[120778,120779],"mapped",[989]],[[120780,120781],"disallowed"],[[120782,120782],"mapped",[48]],[[120783,120783],"mapped",[49]],[[120784,120784],"mapped",[50]],[[120785,120785],"mapped",[51]],[[120786,120786],"mapped",[52]],[[120787,120787],"mapped",[53]],[[120788,120788],"mapped",[54]],[[120789,120789],"mapped",[55]],[[120790,120790],"mapped",[56]],[[120791,120791],"mapped",[57]],[[120792,120792],"mapped",[48]],[[120793,120793],"mapped",[49]],[[120794,120794],"mapped",[50]],[[120795,120795],"mapped",[51]],[[120796,120796],"mapped",[52]],[[120797,120797],"mapped",[53]],[[120798,120798],"mapped",[54]],[[120799,120799],"mapped",[55]],[[120800,120800],"mapped",[56]],[[120801,120801],"mapped",[57]],[[120802,120802],"mapped",[48]],[[120803,120803],"mapped",[49]],[[120804,120804],"mapped",[50]],[[120805,120805],"mapped",[51]],[[120806,120806],"mapped",[52]],[[120807,120807],"mapped",[53]],[[120808,120808],"mapped",[54]],[[120809,120809],"mapped",[55]],[[120810,120810],"mapped",[56]],[[120811,120811],"mapped",[57]],[[120812,120812],"mapped",[48]],[[120813,120813],"mapped",[49]],[[120814,120814],"mapped",[50]],[[120815,120815],"mapped",[51]],[[120816,120816],"mapped",[52]],[[120817,120817],"mapped",[53]],[[120818,120818],"mapped",[54]],[[120819,120819],"mapped",[55]],[[120820,120820],"mapped",[56]],[[120821,120821],"mapped",[57]],[[120822,120822],"mapped",[48]],[[120823,120823],"mapped",[49]],[[120824,120824],"mapped",[50]],[[120825,120825],"mapped",[51]],[[120826,120826],"mapped",[52]],[[120827,120827],"mapped",[53]],[[120828,120828],"mapped",[54]],[[120829,120829],"mapped",[55]],[[120830,120830],"mapped",[56]],[[120831,120831],"mapped",[57]],[[120832,121343],"valid",[],"NV8"],[[121344,121398],"valid"],[[121399,121402],"valid",[],"NV8"],[[121403,121452],"valid"],[[121453,121460],"valid",[],"NV8"],[[121461,121461],"valid"],[[121462,121475],"valid",[],"NV8"],[[121476,121476],"valid"],[[121477,121483],"valid",[],"NV8"],[[121484,121498],"disallowed"],[[121499,121503],"valid"],[[121504,121504],"disallowed"],[[121505,121519],"valid"],[[121520,124927],"disallowed"],[[124928,125124],"valid"],[[125125,125126],"disallowed"],[[125127,125135],"valid",[],"NV8"],[[125136,125142],"valid"],[[125143,126463],"disallowed"],[[126464,126464],"mapped",[1575]],[[126465,126465],"mapped",[1576]],[[126466,126466],"mapped",[1580]],[[126467,126467],"mapped",[1583]],[[126468,126468],"disallowed"],[[126469,126469],"mapped",[1608]],[[126470,126470],"mapped",[1586]],[[126471,126471],"mapped",[1581]],[[126472,126472],"mapped",[1591]],[[126473,126473],"mapped",[1610]],[[126474,126474],"mapped",[1603]],[[126475,126475],"mapped",[1604]],[[126476,126476],"mapped",[1605]],[[126477,126477],"mapped",[1606]],[[126478,126478],"mapped",[1587]],[[126479,126479],"mapped",[1593]],[[126480,126480],"mapped",[1601]],[[126481,126481],"mapped",[1589]],[[126482,126482],"mapped",[1602]],[[126483,126483],"mapped",[1585]],[[126484,126484],"mapped",[1588]],[[126485,126485],"mapped",[1578]],[[126486,126486],"mapped",[1579]],[[126487,126487],"mapped",[1582]],[[126488,126488],"mapped",[1584]],[[126489,126489],"mapped",[1590]],[[126490,126490],"mapped",[1592]],[[126491,126491],"mapped",[1594]],[[126492,126492],"mapped",[1646]],[[126493,126493],"mapped",[1722]],[[126494,126494],"mapped",[1697]],[[126495,126495],"mapped",[1647]],[[126496,126496],"disallowed"],[[126497,126497],"mapped",[1576]],[[126498,126498],"mapped",[1580]],[[126499,126499],"disallowed"],[[126500,126500],"mapped",[1607]],[[126501,126502],"disallowed"],[[126503,126503],"mapped",[1581]],[[126504,126504],"disallowed"],[[126505,126505],"mapped",[1610]],[[126506,126506],"mapped",[1603]],[[126507,126507],"mapped",[1604]],[[126508,126508],"mapped",[1605]],[[126509,126509],"mapped",[1606]],[[126510,126510],"mapped",[1587]],[[126511,126511],"mapped",[1593]],[[126512,126512],"mapped",[1601]],[[126513,126513],"mapped",[1589]],[[126514,126514],"mapped",[1602]],[[126515,126515],"disallowed"],[[126516,126516],"mapped",[1588]],[[126517,126517],"mapped",[1578]],[[126518,126518],"mapped",[1579]],[[126519,126519],"mapped",[1582]],[[126520,126520],"disallowed"],[[126521,126521],"mapped",[1590]],[[126522,126522],"disallowed"],[[126523,126523],"mapped",[1594]],[[126524,126529],"disallowed"],[[126530,126530],"mapped",[1580]],[[126531,126534],"disallowed"],[[126535,126535],"mapped",[1581]],[[126536,126536],"disallowed"],[[126537,126537],"mapped",[1610]],[[126538,126538],"disallowed"],[[126539,126539],"mapped",[1604]],[[126540,126540],"disallowed"],[[126541,126541],"mapped",[1606]],[[126542,126542],"mapped",[1587]],[[126543,126543],"mapped",[1593]],[[126544,126544],"disallowed"],[[126545,126545],"mapped",[1589]],[[126546,126546],"mapped",[1602]],[[126547,126547],"disallowed"],[[126548,126548],"mapped",[1588]],[[126549,126550],"disallowed"],[[126551,126551],"mapped",[1582]],[[126552,126552],"disallowed"],[[126553,126553],"mapped",[1590]],[[126554,126554],"disallowed"],[[126555,126555],"mapped",[1594]],[[126556,126556],"disallowed"],[[126557,126557],"mapped",[1722]],[[126558,126558],"disallowed"],[[126559,126559],"mapped",[1647]],[[126560,126560],"disallowed"],[[126561,126561],"mapped",[1576]],[[126562,126562],"mapped",[1580]],[[126563,126563],"disallowed"],[[126564,126564],"mapped",[1607]],[[126565,126566],"disallowed"],[[126567,126567],"mapped",[1581]],[[126568,126568],"mapped",[1591]],[[126569,126569],"mapped",[1610]],[[126570,126570],"mapped",[1603]],[[126571,126571],"disallowed"],[[126572,126572],"mapped",[1605]],[[126573,126573],"mapped",[1606]],[[126574,126574],"mapped",[1587]],[[126575,126575],"mapped",[1593]],[[126576,126576],"mapped",[1601]],[[126577,126577],"mapped",[1589]],[[126578,126578],"mapped",[1602]],[[126579,126579],"disallowed"],[[126580,126580],"mapped",[1588]],[[126581,126581],"mapped",[1578]],[[126582,126582],"mapped",[1579]],[[126583,126583],"mapped",[1582]],[[126584,126584],"disallowed"],[[126585,126585],"mapped",[1590]],[[126586,126586],"mapped",[1592]],[[126587,126587],"mapped",[1594]],[[126588,126588],"mapped",[1646]],[[126589,126589],"disallowed"],[[126590,126590],"mapped",[1697]],[[126591,126591],"disallowed"],[[126592,126592],"mapped",[1575]],[[126593,126593],"mapped",[1576]],[[126594,126594],"mapped",[1580]],[[126595,126595],"mapped",[1583]],[[126596,126596],"mapped",[1607]],[[126597,126597],"mapped",[1608]],[[126598,126598],"mapped",[1586]],[[126599,126599],"mapped",[1581]],[[126600,126600],"mapped",[1591]],[[126601,126601],"mapped",[1610]],[[126602,126602],"disallowed"],[[126603,126603],"mapped",[1604]],[[126604,126604],"mapped",[1605]],[[126605,126605],"mapped",[1606]],[[126606,126606],"mapped",[1587]],[[126607,126607],"mapped",[1593]],[[126608,126608],"mapped",[1601]],[[126609,126609],"mapped",[1589]],[[126610,126610],"mapped",[1602]],[[126611,126611],"mapped",[1585]],[[126612,126612],"mapped",[1588]],[[126613,126613],"mapped",[1578]],[[126614,126614],"mapped",[1579]],[[126615,126615],"mapped",[1582]],[[126616,126616],"mapped",[1584]],[[126617,126617],"mapped",[1590]],[[126618,126618],"mapped",[1592]],[[126619,126619],"mapped",[1594]],[[126620,126624],"disallowed"],[[126625,126625],"mapped",[1576]],[[126626,126626],"mapped",[1580]],[[126627,126627],"mapped",[1583]],[[126628,126628],"disallowed"],[[126629,126629],"mapped",[1608]],[[126630,126630],"mapped",[1586]],[[126631,126631],"mapped",[1581]],[[126632,126632],"mapped",[1591]],[[126633,126633],"mapped",[1610]],[[126634,126634],"disallowed"],[[126635,126635],"mapped",[1604]],[[126636,126636],"mapped",[1605]],[[126637,126637],"mapped",[1606]],[[126638,126638],"mapped",[1587]],[[126639,126639],"mapped",[1593]],[[126640,126640],"mapped",[1601]],[[126641,126641],"mapped",[1589]],[[126642,126642],"mapped",[1602]],[[126643,126643],"mapped",[1585]],[[126644,126644],"mapped",[1588]],[[126645,126645],"mapped",[1578]],[[126646,126646],"mapped",[1579]],[[126647,126647],"mapped",[1582]],[[126648,126648],"mapped",[1584]],[[126649,126649],"mapped",[1590]],[[126650,126650],"mapped",[1592]],[[126651,126651],"mapped",[1594]],[[126652,126703],"disallowed"],[[126704,126705],"valid",[],"NV8"],[[126706,126975],"disallowed"],[[126976,127019],"valid",[],"NV8"],[[127020,127023],"disallowed"],[[127024,127123],"valid",[],"NV8"],[[127124,127135],"disallowed"],[[127136,127150],"valid",[],"NV8"],[[127151,127152],"disallowed"],[[127153,127166],"valid",[],"NV8"],[[127167,127167],"valid",[],"NV8"],[[127168,127168],"disallowed"],[[127169,127183],"valid",[],"NV8"],[[127184,127184],"disallowed"],[[127185,127199],"valid",[],"NV8"],[[127200,127221],"valid",[],"NV8"],[[127222,127231],"disallowed"],[[127232,127232],"disallowed"],[[127233,127233],"disallowed_STD3_mapped",[48,44]],[[127234,127234],"disallowed_STD3_mapped",[49,44]],[[127235,127235],"disallowed_STD3_mapped",[50,44]],[[127236,127236],"disallowed_STD3_mapped",[51,44]],[[127237,127237],"disallowed_STD3_mapped",[52,44]],[[127238,127238],"disallowed_STD3_mapped",[53,44]],[[127239,127239],"disallowed_STD3_mapped",[54,44]],[[127240,127240],"disallowed_STD3_mapped",[55,44]],[[127241,127241],"disallowed_STD3_mapped",[56,44]],[[127242,127242],"disallowed_STD3_mapped",[57,44]],[[127243,127244],"valid",[],"NV8"],[[127245,127247],"disallowed"],[[127248,127248],"disallowed_STD3_mapped",[40,97,41]],[[127249,127249],"disallowed_STD3_mapped",[40,98,41]],[[127250,127250],"disallowed_STD3_mapped",[40,99,41]],[[127251,127251],"disallowed_STD3_mapped",[40,100,41]],[[127252,127252],"disallowed_STD3_mapped",[40,101,41]],[[127253,127253],"disallowed_STD3_mapped",[40,102,41]],[[127254,127254],"disallowed_STD3_mapped",[40,103,41]],[[127255,127255],"disallowed_STD3_mapped",[40,104,41]],[[127256,127256],"disallowed_STD3_mapped",[40,105,41]],[[127257,127257],"disallowed_STD3_mapped",[40,106,41]],[[127258,127258],"disallowed_STD3_mapped",[40,107,41]],[[127259,127259],"disallowed_STD3_mapped",[40,108,41]],[[127260,127260],"disallowed_STD3_mapped",[40,109,41]],[[127261,127261],"disallowed_STD3_mapped",[40,110,41]],[[127262,127262],"disallowed_STD3_mapped",[40,111,41]],[[127263,127263],"disallowed_STD3_mapped",[40,112,41]],[[127264,127264],"disallowed_STD3_mapped",[40,113,41]],[[127265,127265],"disallowed_STD3_mapped",[40,114,41]],[[127266,127266],"disallowed_STD3_mapped",[40,115,41]],[[127267,127267],"disallowed_STD3_mapped",[40,116,41]],[[127268,127268],"disallowed_STD3_mapped",[40,117,41]],[[127269,127269],"disallowed_STD3_mapped",[40,118,41]],[[127270,127270],"disallowed_STD3_mapped",[40,119,41]],[[127271,127271],"disallowed_STD3_mapped",[40,120,41]],[[127272,127272],"disallowed_STD3_mapped",[40,121,41]],[[127273,127273],"disallowed_STD3_mapped",[40,122,41]],[[127274,127274],"mapped",[12308,115,12309]],[[127275,127275],"mapped",[99]],[[127276,127276],"mapped",[114]],[[127277,127277],"mapped",[99,100]],[[127278,127278],"mapped",[119,122]],[[127279,127279],"disallowed"],[[127280,127280],"mapped",[97]],[[127281,127281],"mapped",[98]],[[127282,127282],"mapped",[99]],[[127283,127283],"mapped",[100]],[[127284,127284],"mapped",[101]],[[127285,127285],"mapped",[102]],[[127286,127286],"mapped",[103]],[[127287,127287],"mapped",[104]],[[127288,127288],"mapped",[105]],[[127289,127289],"mapped",[106]],[[127290,127290],"mapped",[107]],[[127291,127291],"mapped",[108]],[[127292,127292],"mapped",[109]],[[127293,127293],"mapped",[110]],[[127294,127294],"mapped",[111]],[[127295,127295],"mapped",[112]],[[127296,127296],"mapped",[113]],[[127297,127297],"mapped",[114]],[[127298,127298],"mapped",[115]],[[127299,127299],"mapped",[116]],[[127300,127300],"mapped",[117]],[[127301,127301],"mapped",[118]],[[127302,127302],"mapped",[119]],[[127303,127303],"mapped",[120]],[[127304,127304],"mapped",[121]],[[127305,127305],"mapped",[122]],[[127306,127306],"mapped",[104,118]],[[127307,127307],"mapped",[109,118]],[[127308,127308],"mapped",[115,100]],[[127309,127309],"mapped",[115,115]],[[127310,127310],"mapped",[112,112,118]],[[127311,127311],"mapped",[119,99]],[[127312,127318],"valid",[],"NV8"],[[127319,127319],"valid",[],"NV8"],[[127320,127326],"valid",[],"NV8"],[[127327,127327],"valid",[],"NV8"],[[127328,127337],"valid",[],"NV8"],[[127338,127338],"mapped",[109,99]],[[127339,127339],"mapped",[109,100]],[[127340,127343],"disallowed"],[[127344,127352],"valid",[],"NV8"],[[127353,127353],"valid",[],"NV8"],[[127354,127354],"valid",[],"NV8"],[[127355,127356],"valid",[],"NV8"],[[127357,127358],"valid",[],"NV8"],[[127359,127359],"valid",[],"NV8"],[[127360,127369],"valid",[],"NV8"],[[127370,127373],"valid",[],"NV8"],[[127374,127375],"valid",[],"NV8"],[[127376,127376],"mapped",[100,106]],[[127377,127386],"valid",[],"NV8"],[[127387,127461],"disallowed"],[[127462,127487],"valid",[],"NV8"],[[127488,127488],"mapped",[12411,12363]],[[127489,127489],"mapped",[12467,12467]],[[127490,127490],"mapped",[12469]],[[127491,127503],"disallowed"],[[127504,127504],"mapped",[25163]],[[127505,127505],"mapped",[23383]],[[127506,127506],"mapped",[21452]],[[127507,127507],"mapped",[12487]],[[127508,127508],"mapped",[20108]],[[127509,127509],"mapped",[22810]],[[127510,127510],"mapped",[35299]],[[127511,127511],"mapped",[22825]],[[127512,127512],"mapped",[20132]],[[127513,127513],"mapped",[26144]],[[127514,127514],"mapped",[28961]],[[127515,127515],"mapped",[26009]],[[127516,127516],"mapped",[21069]],[[127517,127517],"mapped",[24460]],[[127518,127518],"mapped",[20877]],[[127519,127519],"mapped",[26032]],[[127520,127520],"mapped",[21021]],[[127521,127521],"mapped",[32066]],[[127522,127522],"mapped",[29983]],[[127523,127523],"mapped",[36009]],[[127524,127524],"mapped",[22768]],[[127525,127525],"mapped",[21561]],[[127526,127526],"mapped",[28436]],[[127527,127527],"mapped",[25237]],[[127528,127528],"mapped",[25429]],[[127529,127529],"mapped",[19968]],[[127530,127530],"mapped",[19977]],[[127531,127531],"mapped",[36938]],[[127532,127532],"mapped",[24038]],[[127533,127533],"mapped",[20013]],[[127534,127534],"mapped",[21491]],[[127535,127535],"mapped",[25351]],[[127536,127536],"mapped",[36208]],[[127537,127537],"mapped",[25171]],[[127538,127538],"mapped",[31105]],[[127539,127539],"mapped",[31354]],[[127540,127540],"mapped",[21512]],[[127541,127541],"mapped",[28288]],[[127542,127542],"mapped",[26377]],[[127543,127543],"mapped",[26376]],[[127544,127544],"mapped",[30003]],[[127545,127545],"mapped",[21106]],[[127546,127546],"mapped",[21942]],[[127547,127551],"disallowed"],[[127552,127552],"mapped",[12308,26412,12309]],[[127553,127553],"mapped",[12308,19977,12309]],[[127554,127554],"mapped",[12308,20108,12309]],[[127555,127555],"mapped",[12308,23433,12309]],[[127556,127556],"mapped",[12308,28857,12309]],[[127557,127557],"mapped",[12308,25171,12309]],[[127558,127558],"mapped",[12308,30423,12309]],[[127559,127559],"mapped",[12308,21213,12309]],[[127560,127560],"mapped",[12308,25943,12309]],[[127561,127567],"disallowed"],[[127568,127568],"mapped",[24471]],[[127569,127569],"mapped",[21487]],[[127570,127743],"disallowed"],[[127744,127776],"valid",[],"NV8"],[[127777,127788],"valid",[],"NV8"],[[127789,127791],"valid",[],"NV8"],[[127792,127797],"valid",[],"NV8"],[[127798,127798],"valid",[],"NV8"],[[127799,127868],"valid",[],"NV8"],[[127869,127869],"valid",[],"NV8"],[[127870,127871],"valid",[],"NV8"],[[127872,127891],"valid",[],"NV8"],[[127892,127903],"valid",[],"NV8"],[[127904,127940],"valid",[],"NV8"],[[127941,127941],"valid",[],"NV8"],[[127942,127946],"valid",[],"NV8"],[[127947,127950],"valid",[],"NV8"],[[127951,127955],"valid",[],"NV8"],[[127956,127967],"valid",[],"NV8"],[[127968,127984],"valid",[],"NV8"],[[127985,127991],"valid",[],"NV8"],[[127992,127999],"valid",[],"NV8"],[[128000,128062],"valid",[],"NV8"],[[128063,128063],"valid",[],"NV8"],[[128064,128064],"valid",[],"NV8"],[[128065,128065],"valid",[],"NV8"],[[128066,128247],"valid",[],"NV8"],[[128248,128248],"valid",[],"NV8"],[[128249,128252],"valid",[],"NV8"],[[128253,128254],"valid",[],"NV8"],[[128255,128255],"valid",[],"NV8"],[[128256,128317],"valid",[],"NV8"],[[128318,128319],"valid",[],"NV8"],[[128320,128323],"valid",[],"NV8"],[[128324,128330],"valid",[],"NV8"],[[128331,128335],"valid",[],"NV8"],[[128336,128359],"valid",[],"NV8"],[[128360,128377],"valid",[],"NV8"],[[128378,128378],"disallowed"],[[128379,128419],"valid",[],"NV8"],[[128420,128420],"disallowed"],[[128421,128506],"valid",[],"NV8"],[[128507,128511],"valid",[],"NV8"],[[128512,128512],"valid",[],"NV8"],[[128513,128528],"valid",[],"NV8"],[[128529,128529],"valid",[],"NV8"],[[128530,128532],"valid",[],"NV8"],[[128533,128533],"valid",[],"NV8"],[[128534,128534],"valid",[],"NV8"],[[128535,128535],"valid",[],"NV8"],[[128536,128536],"valid",[],"NV8"],[[128537,128537],"valid",[],"NV8"],[[128538,128538],"valid",[],"NV8"],[[128539,128539],"valid",[],"NV8"],[[128540,128542],"valid",[],"NV8"],[[128543,128543],"valid",[],"NV8"],[[128544,128549],"valid",[],"NV8"],[[128550,128551],"valid",[],"NV8"],[[128552,128555],"valid",[],"NV8"],[[128556,128556],"valid",[],"NV8"],[[128557,128557],"valid",[],"NV8"],[[128558,128559],"valid",[],"NV8"],[[128560,128563],"valid",[],"NV8"],[[128564,128564],"valid",[],"NV8"],[[128565,128576],"valid",[],"NV8"],[[128577,128578],"valid",[],"NV8"],[[128579,128580],"valid",[],"NV8"],[[128581,128591],"valid",[],"NV8"],[[128592,128639],"valid",[],"NV8"],[[128640,128709],"valid",[],"NV8"],[[128710,128719],"valid",[],"NV8"],[[128720,128720],"valid",[],"NV8"],[[128721,128735],"disallowed"],[[128736,128748],"valid",[],"NV8"],[[128749,128751],"disallowed"],[[128752,128755],"valid",[],"NV8"],[[128756,128767],"disallowed"],[[128768,128883],"valid",[],"NV8"],[[128884,128895],"disallowed"],[[128896,128980],"valid",[],"NV8"],[[128981,129023],"disallowed"],[[129024,129035],"valid",[],"NV8"],[[129036,129039],"disallowed"],[[129040,129095],"valid",[],"NV8"],[[129096,129103],"disallowed"],[[129104,129113],"valid",[],"NV8"],[[129114,129119],"disallowed"],[[129120,129159],"valid",[],"NV8"],[[129160,129167],"disallowed"],[[129168,129197],"valid",[],"NV8"],[[129198,129295],"disallowed"],[[129296,129304],"valid",[],"NV8"],[[129305,129407],"disallowed"],[[129408,129412],"valid",[],"NV8"],[[129413,129471],"disallowed"],[[129472,129472],"valid",[],"NV8"],[[129473,131069],"disallowed"],[[131070,131071],"disallowed"],[[131072,173782],"valid"],[[173783,173823],"disallowed"],[[173824,177972],"valid"],[[177973,177983],"disallowed"],[[177984,178205],"valid"],[[178206,178207],"disallowed"],[[178208,183969],"valid"],[[183970,194559],"disallowed"],[[194560,194560],"mapped",[20029]],[[194561,194561],"mapped",[20024]],[[194562,194562],"mapped",[20033]],[[194563,194563],"mapped",[131362]],[[194564,194564],"mapped",[20320]],[[194565,194565],"mapped",[20398]],[[194566,194566],"mapped",[20411]],[[194567,194567],"mapped",[20482]],[[194568,194568],"mapped",[20602]],[[194569,194569],"mapped",[20633]],[[194570,194570],"mapped",[20711]],[[194571,194571],"mapped",[20687]],[[194572,194572],"mapped",[13470]],[[194573,194573],"mapped",[132666]],[[194574,194574],"mapped",[20813]],[[194575,194575],"mapped",[20820]],[[194576,194576],"mapped",[20836]],[[194577,194577],"mapped",[20855]],[[194578,194578],"mapped",[132380]],[[194579,194579],"mapped",[13497]],[[194580,194580],"mapped",[20839]],[[194581,194581],"mapped",[20877]],[[194582,194582],"mapped",[132427]],[[194583,194583],"mapped",[20887]],[[194584,194584],"mapped",[20900]],[[194585,194585],"mapped",[20172]],[[194586,194586],"mapped",[20908]],[[194587,194587],"mapped",[20917]],[[194588,194588],"mapped",[168415]],[[194589,194589],"mapped",[20981]],[[194590,194590],"mapped",[20995]],[[194591,194591],"mapped",[13535]],[[194592,194592],"mapped",[21051]],[[194593,194593],"mapped",[21062]],[[194594,194594],"mapped",[21106]],[[194595,194595],"mapped",[21111]],[[194596,194596],"mapped",[13589]],[[194597,194597],"mapped",[21191]],[[194598,194598],"mapped",[21193]],[[194599,194599],"mapped",[21220]],[[194600,194600],"mapped",[21242]],[[194601,194601],"mapped",[21253]],[[194602,194602],"mapped",[21254]],[[194603,194603],"mapped",[21271]],[[194604,194604],"mapped",[21321]],[[194605,194605],"mapped",[21329]],[[194606,194606],"mapped",[21338]],[[194607,194607],"mapped",[21363]],[[194608,194608],"mapped",[21373]],[[194609,194611],"mapped",[21375]],[[194612,194612],"mapped",[133676]],[[194613,194613],"mapped",[28784]],[[194614,194614],"mapped",[21450]],[[194615,194615],"mapped",[21471]],[[194616,194616],"mapped",[133987]],[[194617,194617],"mapped",[21483]],[[194618,194618],"mapped",[21489]],[[194619,194619],"mapped",[21510]],[[194620,194620],"mapped",[21662]],[[194621,194621],"mapped",[21560]],[[194622,194622],"mapped",[21576]],[[194623,194623],"mapped",[21608]],[[194624,194624],"mapped",[21666]],[[194625,194625],"mapped",[21750]],[[194626,194626],"mapped",[21776]],[[194627,194627],"mapped",[21843]],[[194628,194628],"mapped",[21859]],[[194629,194630],"mapped",[21892]],[[194631,194631],"mapped",[21913]],[[194632,194632],"mapped",[21931]],[[194633,194633],"mapped",[21939]],[[194634,194634],"mapped",[21954]],[[194635,194635],"mapped",[22294]],[[194636,194636],"mapped",[22022]],[[194637,194637],"mapped",[22295]],[[194638,194638],"mapped",[22097]],[[194639,194639],"mapped",[22132]],[[194640,194640],"mapped",[20999]],[[194641,194641],"mapped",[22766]],[[194642,194642],"mapped",[22478]],[[194643,194643],"mapped",[22516]],[[194644,194644],"mapped",[22541]],[[194645,194645],"mapped",[22411]],[[194646,194646],"mapped",[22578]],[[194647,194647],"mapped",[22577]],[[194648,194648],"mapped",[22700]],[[194649,194649],"mapped",[136420]],[[194650,194650],"mapped",[22770]],[[194651,194651],"mapped",[22775]],[[194652,194652],"mapped",[22790]],[[194653,194653],"mapped",[22810]],[[194654,194654],"mapped",[22818]],[[194655,194655],"mapped",[22882]],[[194656,194656],"mapped",[136872]],[[194657,194657],"mapped",[136938]],[[194658,194658],"mapped",[23020]],[[194659,194659],"mapped",[23067]],[[194660,194660],"mapped",[23079]],[[194661,194661],"mapped",[23000]],[[194662,194662],"mapped",[23142]],[[194663,194663],"mapped",[14062]],[[194664,194664],"disallowed"],[[194665,194665],"mapped",[23304]],[[194666,194667],"mapped",[23358]],[[194668,194668],"mapped",[137672]],[[194669,194669],"mapped",[23491]],[[194670,194670],"mapped",[23512]],[[194671,194671],"mapped",[23527]],[[194672,194672],"mapped",[23539]],[[194673,194673],"mapped",[138008]],[[194674,194674],"mapped",[23551]],[[194675,194675],"mapped",[23558]],[[194676,194676],"disallowed"],[[194677,194677],"mapped",[23586]],[[194678,194678],"mapped",[14209]],[[194679,194679],"mapped",[23648]],[[194680,194680],"mapped",[23662]],[[194681,194681],"mapped",[23744]],[[194682,194682],"mapped",[23693]],[[194683,194683],"mapped",[138724]],[[194684,194684],"mapped",[23875]],[[194685,194685],"mapped",[138726]],[[194686,194686],"mapped",[23918]],[[194687,194687],"mapped",[23915]],[[194688,194688],"mapped",[23932]],[[194689,194689],"mapped",[24033]],[[194690,194690],"mapped",[24034]],[[194691,194691],"mapped",[14383]],[[194692,194692],"mapped",[24061]],[[194693,194693],"mapped",[24104]],[[194694,194694],"mapped",[24125]],[[194695,194695],"mapped",[24169]],[[194696,194696],"mapped",[14434]],[[194697,194697],"mapped",[139651]],[[194698,194698],"mapped",[14460]],[[194699,194699],"mapped",[24240]],[[194700,194700],"mapped",[24243]],[[194701,194701],"mapped",[24246]],[[194702,194702],"mapped",[24266]],[[194703,194703],"mapped",[172946]],[[194704,194704],"mapped",[24318]],[[194705,194706],"mapped",[140081]],[[194707,194707],"mapped",[33281]],[[194708,194709],"mapped",[24354]],[[194710,194710],"mapped",[14535]],[[194711,194711],"mapped",[144056]],[[194712,194712],"mapped",[156122]],[[194713,194713],"mapped",[24418]],[[194714,194714],"mapped",[24427]],[[194715,194715],"mapped",[14563]],[[194716,194716],"mapped",[24474]],[[194717,194717],"mapped",[24525]],[[194718,194718],"mapped",[24535]],[[194719,194719],"mapped",[24569]],[[194720,194720],"mapped",[24705]],[[194721,194721],"mapped",[14650]],[[194722,194722],"mapped",[14620]],[[194723,194723],"mapped",[24724]],[[194724,194724],"mapped",[141012]],[[194725,194725],"mapped",[24775]],[[194726,194726],"mapped",[24904]],[[194727,194727],"mapped",[24908]],[[194728,194728],"mapped",[24910]],[[194729,194729],"mapped",[24908]],[[194730,194730],"mapped",[24954]],[[194731,194731],"mapped",[24974]],[[194732,194732],"mapped",[25010]],[[194733,194733],"mapped",[24996]],[[194734,194734],"mapped",[25007]],[[194735,194735],"mapped",[25054]],[[194736,194736],"mapped",[25074]],[[194737,194737],"mapped",[25078]],[[194738,194738],"mapped",[25104]],[[194739,194739],"mapped",[25115]],[[194740,194740],"mapped",[25181]],[[194741,194741],"mapped",[25265]],[[194742,194742],"mapped",[25300]],[[194743,194743],"mapped",[25424]],[[194744,194744],"mapped",[142092]],[[194745,194745],"mapped",[25405]],[[194746,194746],"mapped",[25340]],[[194747,194747],"mapped",[25448]],[[194748,194748],"mapped",[25475]],[[194749,194749],"mapped",[25572]],[[194750,194750],"mapped",[142321]],[[194751,194751],"mapped",[25634]],[[194752,194752],"mapped",[25541]],[[194753,194753],"mapped",[25513]],[[194754,194754],"mapped",[14894]],[[194755,194755],"mapped",[25705]],[[194756,194756],"mapped",[25726]],[[194757,194757],"mapped",[25757]],[[194758,194758],"mapped",[25719]],[[194759,194759],"mapped",[14956]],[[194760,194760],"mapped",[25935]],[[194761,194761],"mapped",[25964]],[[194762,194762],"mapped",[143370]],[[194763,194763],"mapped",[26083]],[[194764,194764],"mapped",[26360]],[[194765,194765],"mapped",[26185]],[[194766,194766],"mapped",[15129]],[[194767,194767],"mapped",[26257]],[[194768,194768],"mapped",[15112]],[[194769,194769],"mapped",[15076]],[[194770,194770],"mapped",[20882]],[[194771,194771],"mapped",[20885]],[[194772,194772],"mapped",[26368]],[[194773,194773],"mapped",[26268]],[[194774,194774],"mapped",[32941]],[[194775,194775],"mapped",[17369]],[[194776,194776],"mapped",[26391]],[[194777,194777],"mapped",[26395]],[[194778,194778],"mapped",[26401]],[[194779,194779],"mapped",[26462]],[[194780,194780],"mapped",[26451]],[[194781,194781],"mapped",[144323]],[[194782,194782],"mapped",[15177]],[[194783,194783],"mapped",[26618]],[[194784,194784],"mapped",[26501]],[[194785,194785],"mapped",[26706]],[[194786,194786],"mapped",[26757]],[[194787,194787],"mapped",[144493]],[[194788,194788],"mapped",[26766]],[[194789,194789],"mapped",[26655]],[[194790,194790],"mapped",[26900]],[[194791,194791],"mapped",[15261]],[[194792,194792],"mapped",[26946]],[[194793,194793],"mapped",[27043]],[[194794,194794],"mapped",[27114]],[[194795,194795],"mapped",[27304]],[[194796,194796],"mapped",[145059]],[[194797,194797],"mapped",[27355]],[[194798,194798],"mapped",[15384]],[[194799,194799],"mapped",[27425]],[[194800,194800],"mapped",[145575]],[[194801,194801],"mapped",[27476]],[[194802,194802],"mapped",[15438]],[[194803,194803],"mapped",[27506]],[[194804,194804],"mapped",[27551]],[[194805,194805],"mapped",[27578]],[[194806,194806],"mapped",[27579]],[[194807,194807],"mapped",[146061]],[[194808,194808],"mapped",[138507]],[[194809,194809],"mapped",[146170]],[[194810,194810],"mapped",[27726]],[[194811,194811],"mapped",[146620]],[[194812,194812],"mapped",[27839]],[[194813,194813],"mapped",[27853]],[[194814,194814],"mapped",[27751]],[[194815,194815],"mapped",[27926]],[[194816,194816],"mapped",[27966]],[[194817,194817],"mapped",[28023]],[[194818,194818],"mapped",[27969]],[[194819,194819],"mapped",[28009]],[[194820,194820],"mapped",[28024]],[[194821,194821],"mapped",[28037]],[[194822,194822],"mapped",[146718]],[[194823,194823],"mapped",[27956]],[[194824,194824],"mapped",[28207]],[[194825,194825],"mapped",[28270]],[[194826,194826],"mapped",[15667]],[[194827,194827],"mapped",[28363]],[[194828,194828],"mapped",[28359]],[[194829,194829],"mapped",[147153]],[[194830,194830],"mapped",[28153]],[[194831,194831],"mapped",[28526]],[[194832,194832],"mapped",[147294]],[[194833,194833],"mapped",[147342]],[[194834,194834],"mapped",[28614]],[[194835,194835],"mapped",[28729]],[[194836,194836],"mapped",[28702]],[[194837,194837],"mapped",[28699]],[[194838,194838],"mapped",[15766]],[[194839,194839],"mapped",[28746]],[[194840,194840],"mapped",[28797]],[[194841,194841],"mapped",[28791]],[[194842,194842],"mapped",[28845]],[[194843,194843],"mapped",[132389]],[[194844,194844],"mapped",[28997]],[[194845,194845],"mapped",[148067]],[[194846,194846],"mapped",[29084]],[[194847,194847],"disallowed"],[[194848,194848],"mapped",[29224]],[[194849,194849],"mapped",[29237]],[[194850,194850],"mapped",[29264]],[[194851,194851],"mapped",[149000]],[[194852,194852],"mapped",[29312]],[[194853,194853],"mapped",[29333]],[[194854,194854],"mapped",[149301]],[[194855,194855],"mapped",[149524]],[[194856,194856],"mapped",[29562]],[[194857,194857],"mapped",[29579]],[[194858,194858],"mapped",[16044]],[[194859,194859],"mapped",[29605]],[[194860,194861],"mapped",[16056]],[[194862,194862],"mapped",[29767]],[[194863,194863],"mapped",[29788]],[[194864,194864],"mapped",[29809]],[[194865,194865],"mapped",[29829]],[[194866,194866],"mapped",[29898]],[[194867,194867],"mapped",[16155]],[[194868,194868],"mapped",[29988]],[[194869,194869],"mapped",[150582]],[[194870,194870],"mapped",[30014]],[[194871,194871],"mapped",[150674]],[[194872,194872],"mapped",[30064]],[[194873,194873],"mapped",[139679]],[[194874,194874],"mapped",[30224]],[[194875,194875],"mapped",[151457]],[[194876,194876],"mapped",[151480]],[[194877,194877],"mapped",[151620]],[[194878,194878],"mapped",[16380]],[[194879,194879],"mapped",[16392]],[[194880,194880],"mapped",[30452]],[[194881,194881],"mapped",[151795]],[[194882,194882],"mapped",[151794]],[[194883,194883],"mapped",[151833]],[[194884,194884],"mapped",[151859]],[[194885,194885],"mapped",[30494]],[[194886,194887],"mapped",[30495]],[[194888,194888],"mapped",[30538]],[[194889,194889],"mapped",[16441]],[[194890,194890],"mapped",[30603]],[[194891,194891],"mapped",[16454]],[[194892,194892],"mapped",[16534]],[[194893,194893],"mapped",[152605]],[[194894,194894],"mapped",[30798]],[[194895,194895],"mapped",[30860]],[[194896,194896],"mapped",[30924]],[[194897,194897],"mapped",[16611]],[[194898,194898],"mapped",[153126]],[[194899,194899],"mapped",[31062]],[[194900,194900],"mapped",[153242]],[[194901,194901],"mapped",[153285]],[[194902,194902],"mapped",[31119]],[[194903,194903],"mapped",[31211]],[[194904,194904],"mapped",[16687]],[[194905,194905],"mapped",[31296]],[[194906,194906],"mapped",[31306]],[[194907,194907],"mapped",[31311]],[[194908,194908],"mapped",[153980]],[[194909,194910],"mapped",[154279]],[[194911,194911],"disallowed"],[[194912,194912],"mapped",[16898]],[[194913,194913],"mapped",[154539]],[[194914,194914],"mapped",[31686]],[[194915,194915],"mapped",[31689]],[[194916,194916],"mapped",[16935]],[[194917,194917],"mapped",[154752]],[[194918,194918],"mapped",[31954]],[[194919,194919],"mapped",[17056]],[[194920,194920],"mapped",[31976]],[[194921,194921],"mapped",[31971]],[[194922,194922],"mapped",[32000]],[[194923,194923],"mapped",[155526]],[[194924,194924],"mapped",[32099]],[[194925,194925],"mapped",[17153]],[[194926,194926],"mapped",[32199]],[[194927,194927],"mapped",[32258]],[[194928,194928],"mapped",[32325]],[[194929,194929],"mapped",[17204]],[[194930,194930],"mapped",[156200]],[[194931,194931],"mapped",[156231]],[[194932,194932],"mapped",[17241]],[[194933,194933],"mapped",[156377]],[[194934,194934],"mapped",[32634]],[[194935,194935],"mapped",[156478]],[[194936,194936],"mapped",[32661]],[[194937,194937],"mapped",[32762]],[[194938,194938],"mapped",[32773]],[[194939,194939],"mapped",[156890]],[[194940,194940],"mapped",[156963]],[[194941,194941],"mapped",[32864]],[[194942,194942],"mapped",[157096]],[[194943,194943],"mapped",[32880]],[[194944,194944],"mapped",[144223]],[[194945,194945],"mapped",[17365]],[[194946,194946],"mapped",[32946]],[[194947,194947],"mapped",[33027]],[[194948,194948],"mapped",[17419]],[[194949,194949],"mapped",[33086]],[[194950,194950],"mapped",[23221]],[[194951,194951],"mapped",[157607]],[[194952,194952],"mapped",[157621]],[[194953,194953],"mapped",[144275]],[[194954,194954],"mapped",[144284]],[[194955,194955],"mapped",[33281]],[[194956,194956],"mapped",[33284]],[[194957,194957],"mapped",[36766]],[[194958,194958],"mapped",[17515]],[[194959,194959],"mapped",[33425]],[[194960,194960],"mapped",[33419]],[[194961,194961],"mapped",[33437]],[[194962,194962],"mapped",[21171]],[[194963,194963],"mapped",[33457]],[[194964,194964],"mapped",[33459]],[[194965,194965],"mapped",[33469]],[[194966,194966],"mapped",[33510]],[[194967,194967],"mapped",[158524]],[[194968,194968],"mapped",[33509]],[[194969,194969],"mapped",[33565]],[[194970,194970],"mapped",[33635]],[[194971,194971],"mapped",[33709]],[[194972,194972],"mapped",[33571]],[[194973,194973],"mapped",[33725]],[[194974,194974],"mapped",[33767]],[[194975,194975],"mapped",[33879]],[[194976,194976],"mapped",[33619]],[[194977,194977],"mapped",[33738]],[[194978,194978],"mapped",[33740]],[[194979,194979],"mapped",[33756]],[[194980,194980],"mapped",[158774]],[[194981,194981],"mapped",[159083]],[[194982,194982],"mapped",[158933]],[[194983,194983],"mapped",[17707]],[[194984,194984],"mapped",[34033]],[[194985,194985],"mapped",[34035]],[[194986,194986],"mapped",[34070]],[[194987,194987],"mapped",[160714]],[[194988,194988],"mapped",[34148]],[[194989,194989],"mapped",[159532]],[[194990,194990],"mapped",[17757]],[[194991,194991],"mapped",[17761]],[[194992,194992],"mapped",[159665]],[[194993,194993],"mapped",[159954]],[[194994,194994],"mapped",[17771]],[[194995,194995],"mapped",[34384]],[[194996,194996],"mapped",[34396]],[[194997,194997],"mapped",[34407]],[[194998,194998],"mapped",[34409]],[[194999,194999],"mapped",[34473]],[[195000,195000],"mapped",[34440]],[[195001,195001],"mapped",[34574]],[[195002,195002],"mapped",[34530]],[[195003,195003],"mapped",[34681]],[[195004,195004],"mapped",[34600]],[[195005,195005],"mapped",[34667]],[[195006,195006],"mapped",[34694]],[[195007,195007],"disallowed"],[[195008,195008],"mapped",[34785]],[[195009,195009],"mapped",[34817]],[[195010,195010],"mapped",[17913]],[[195011,195011],"mapped",[34912]],[[195012,195012],"mapped",[34915]],[[195013,195013],"mapped",[161383]],[[195014,195014],"mapped",[35031]],[[195015,195015],"mapped",[35038]],[[195016,195016],"mapped",[17973]],[[195017,195017],"mapped",[35066]],[[195018,195018],"mapped",[13499]],[[195019,195019],"mapped",[161966]],[[195020,195020],"mapped",[162150]],[[195021,195021],"mapped",[18110]],[[195022,195022],"mapped",[18119]],[[195023,195023],"mapped",[35488]],[[195024,195024],"mapped",[35565]],[[195025,195025],"mapped",[35722]],[[195026,195026],"mapped",[35925]],[[195027,195027],"mapped",[162984]],[[195028,195028],"mapped",[36011]],[[195029,195029],"mapped",[36033]],[[195030,195030],"mapped",[36123]],[[195031,195031],"mapped",[36215]],[[195032,195032],"mapped",[163631]],[[195033,195033],"mapped",[133124]],[[195034,195034],"mapped",[36299]],[[195035,195035],"mapped",[36284]],[[195036,195036],"mapped",[36336]],[[195037,195037],"mapped",[133342]],[[195038,195038],"mapped",[36564]],[[195039,195039],"mapped",[36664]],[[195040,195040],"mapped",[165330]],[[195041,195041],"mapped",[165357]],[[195042,195042],"mapped",[37012]],[[195043,195043],"mapped",[37105]],[[195044,195044],"mapped",[37137]],[[195045,195045],"mapped",[165678]],[[195046,195046],"mapped",[37147]],[[195047,195047],"mapped",[37432]],[[195048,195048],"mapped",[37591]],[[195049,195049],"mapped",[37592]],[[195050,195050],"mapped",[37500]],[[195051,195051],"mapped",[37881]],[[195052,195052],"mapped",[37909]],[[195053,195053],"mapped",[166906]],[[195054,195054],"mapped",[38283]],[[195055,195055],"mapped",[18837]],[[195056,195056],"mapped",[38327]],[[195057,195057],"mapped",[167287]],[[195058,195058],"mapped",[18918]],[[195059,195059],"mapped",[38595]],[[195060,195060],"mapped",[23986]],[[195061,195061],"mapped",[38691]],[[195062,195062],"mapped",[168261]],[[195063,195063],"mapped",[168474]],[[195064,195064],"mapped",[19054]],[[195065,195065],"mapped",[19062]],[[195066,195066],"mapped",[38880]],[[195067,195067],"mapped",[168970]],[[195068,195068],"mapped",[19122]],[[195069,195069],"mapped",[169110]],[[195070,195071],"mapped",[38923]],[[195072,195072],"mapped",[38953]],[[195073,195073],"mapped",[169398]],[[195074,195074],"mapped",[39138]],[[195075,195075],"mapped",[19251]],[[195076,195076],"mapped",[39209]],[[195077,195077],"mapped",[39335]],[[195078,195078],"mapped",[39362]],[[195079,195079],"mapped",[39422]],[[195080,195080],"mapped",[19406]],[[195081,195081],"mapped",[170800]],[[195082,195082],"mapped",[39698]],[[195083,195083],"mapped",[40000]],[[195084,195084],"mapped",[40189]],[[195085,195085],"mapped",[19662]],[[195086,195086],"mapped",[19693]],[[195087,195087],"mapped",[40295]],[[195088,195088],"mapped",[172238]],[[195089,195089],"mapped",[19704]],[[195090,195090],"mapped",[172293]],[[195091,195091],"mapped",[172558]],[[195092,195092],"mapped",[172689]],[[195093,195093],"mapped",[40635]],[[195094,195094],"mapped",[19798]],[[195095,195095],"mapped",[40697]],[[195096,195096],"mapped",[40702]],[[195097,195097],"mapped",[40709]],[[195098,195098],"mapped",[40719]],[[195099,195099],"mapped",[40726]],[[195100,195100],"mapped",[40763]],[[195101,195101],"mapped",[173568]],[[195102,196605],"disallowed"],[[196606,196607],"disallowed"],[[196608,262141],"disallowed"],[[262142,262143],"disallowed"],[[262144,327677],"disallowed"],[[327678,327679],"disallowed"],[[327680,393213],"disallowed"],[[393214,393215],"disallowed"],[[393216,458749],"disallowed"],[[458750,458751],"disallowed"],[[458752,524285],"disallowed"],[[524286,524287],"disallowed"],[[524288,589821],"disallowed"],[[589822,589823],"disallowed"],[[589824,655357],"disallowed"],[[655358,655359],"disallowed"],[[655360,720893],"disallowed"],[[720894,720895],"disallowed"],[[720896,786429],"disallowed"],[[786430,786431],"disallowed"],[[786432,851965],"disallowed"],[[851966,851967],"disallowed"],[[851968,917501],"disallowed"],[[917502,917503],"disallowed"],[[917504,917504],"disallowed"],[[917505,917505],"disallowed"],[[917506,917535],"disallowed"],[[917536,917631],"disallowed"],[[917632,917759],"disallowed"],[[917760,917999],"ignored"],[[918000,983037],"disallowed"],[[983038,983039],"disallowed"],[[983040,1048573],"disallowed"],[[1048574,1048575],"disallowed"],[[1048576,1114109],"disallowed"],[[1114110,1114111],"disallowed"]]');
+
+/***/ })
+
+/******/ 	});
+/************************************************************************/
+/******/ 	// The module cache
+/******/ 	var __webpack_module_cache__ = {};
+/******/ 	
+/******/ 	// The require function
+/******/ 	function __nccwpck_require__(moduleId) {
+/******/ 		// Check if module is in cache
+/******/ 		var cachedModule = __webpack_module_cache__[moduleId];
+/******/ 		if (cachedModule !== undefined) {
+/******/ 			return cachedModule.exports;
+/******/ 		}
+/******/ 		// Create a new module (and put it into the cache)
+/******/ 		var module = __webpack_module_cache__[moduleId] = {
+/******/ 			// no module.id needed
+/******/ 			// no module.loaded needed
+/******/ 			exports: {}
+/******/ 		};
+/******/ 	
+/******/ 		// Execute the module function
+/******/ 		var threw = true;
+/******/ 		try {
+/******/ 			__webpack_modules__[moduleId].call(module.exports, module, module.exports, __nccwpck_require__);
+/******/ 			threw = false;
+/******/ 		} finally {
+/******/ 			if(threw) delete __webpack_module_cache__[moduleId];
+/******/ 		}
+/******/ 	
+/******/ 		// Return the exports of the module
+/******/ 		return module.exports;
+/******/ 	}
+/******/ 	
+/************************************************************************/
+/******/ 	/* webpack/runtime/compat */
+/******/ 	
+/******/ 	if (typeof __nccwpck_require__ !== 'undefined') __nccwpck_require__.ab = __dirname + "/";
+/******/ 	
+/************************************************************************/
+/******/ 	
+/******/ 	// startup
+/******/ 	// Load entry module and return exports
+/******/ 	// This entry module is referenced by other modules so it can't be inlined
+/******/ 	var __webpack_exports__ = __nccwpck_require__(2644);
+/******/ 	module.exports = __webpack_exports__;
+/******/ 	
+/******/ })()
+;
diff --git a/.github/actions/javascript/proposalPoliceComment/proposalPoliceComment.ts b/.github/actions/javascript/proposalPoliceComment/proposalPoliceComment.ts
new file mode 100644
index 000000000000..19d3037a80a5
--- /dev/null
+++ b/.github/actions/javascript/proposalPoliceComment/proposalPoliceComment.ts
@@ -0,0 +1,110 @@
+import {setFailed} from '@actions/core';
+import {context} from '@actions/github';
+import type {IssueCommentCreatedEvent, IssueCommentEditedEvent, IssueCommentEvent} from '@octokit/webhooks-types';
+import CONST from '@github/libs/CONST';
+import GithubUtils from '@github/libs/GithubUtils';
+import OpenAIUtils from '@github/libs/OpenAIUtils';
+
+function isCommentCreatedOrEditedEvent(payload: IssueCommentEvent): payload is IssueCommentCreatedEvent | IssueCommentEditedEvent {
+    return payload.action === CONST.ACTIONS.CREATED || payload.action === CONST.ACTIONS.EDIT;
+}
+
+function isCommentCreatedEvent(payload: IssueCommentEvent): payload is IssueCommentCreatedEvent {
+    return payload.action === CONST.ACTIONS.CREATED;
+}
+
+// Main function to process the workflow event
+async function run() {
+    // get date early, as soon as the workflow starts running
+    const date = new Date();
+    // Verify this is running for an expected webhook event
+    if (context.eventName !== CONST.EVENTS.ISSUE_COMMENT) {
+        throw new Error('ProposalPolice™ only supports the issue_comment webhook event');
+    }
+
+    const payload = context.payload as IssueCommentEvent;
+
+    // check if the issue is open and the has labels
+    if (payload.issue?.state !== 'open' && !payload.issue?.labels.some((issueLabel: {name: string}) => issueLabel.name === CONST.LABELS.HELP_WANTED)) {
+        return;
+    }
+
+    // Verify that the comment is not empty and contains the case sensitive `Proposal` keyword
+    if (!payload.comment?.body.trim() || !payload.comment?.body.includes(CONST.PROPOSAL_KEYWORD)) {
+        console.log('Comment body is either empty or doesn\'t contain the keyword "Proposal": ', payload.comment?.body);
+        return;
+    }
+
+    console.log('ProposalPolice™ Action triggered for comment:', payload.comment?.body);
+    console.log('-> GitHub Action Type: ', payload.action?.toUpperCase());
+
+    if (!isCommentCreatedOrEditedEvent(payload)) {
+        console.error('Unsupported action type:', payload?.action);
+        setFailed(new Error(`Unsupported action type ${payload?.action}`));
+        return;
+    }
+
+    const prompt = isCommentCreatedEvent(payload)
+        ? `I NEED HELP WITH CASE (1.), CHECK IF COMMENT IS PROPOSAL AND IF TEMPLATE IS FOLLOWED AS PER INSTRUCTIONS. IT IS MANDATORY THAT YOU RESPOND ONLY WITH "${CONST.NO_ACTION}" IN CASE THE COMMENT IS NOT A PROPOSAL. Comment content: ${payload.comment?.body}`
+        : `I NEED HELP WITH CASE (2.) WHEN A USER THAT POSTED AN INITIAL PROPOSAL OR COMMENT (UNEDITED) THEN EDITS THE COMMENT - WE NEED TO CLASSIFY THE COMMENT BASED IN THE GIVEN INSTRUCTIONS AND IF TEMPLATE IS FOLLOWED AS PER INSTRUCTIONS. IT IS MANDATORY THAT YOU RESPOND ONLY WITH "${CONST.NO_ACTION}" IN CASE THE COMMENT IS NOT A PROPOSAL. \n\nPrevious comment content: ${payload.changes.body?.from}.\n\nEdited comment content: ${payload.comment?.body}`;
+
+    const assistantResponse = await OpenAIUtils.prompt(prompt);
+
+    // check if assistant response is either NO_ACTION or "NO_ACTION" strings
+    // as sometimes the assistant response varies
+    const isNoAction = assistantResponse.trim().replaceAll(' ', '_').replaceAll('"', '').toUpperCase() === CONST.NO_ACTION;
+
+    // If assistant response is NO_ACTION, do nothing
+    if (isNoAction) {
+        console.log('Detected NO_ACTION for comment, returning early');
+        return;
+    }
+
+    // if the assistant responded with no action but there's some context in the response
+    if (assistantResponse.includes(`[${CONST.NO_ACTION}]`)) {
+        // extract the text after [NO_ACTION] from assistantResponse since this is a
+        // bot related action keyword
+        const noActionContext = assistantResponse.split(`[${CONST.NO_ACTION}] `)?.[1]?.replace('"', '');
+        console.log('[NO_ACTION] w/ context: ', noActionContext);
+        return;
+    }
+
+    if (isCommentCreatedEvent(payload)) {
+        const formattedResponse = assistantResponse
+            // replace {user} from response template with @username
+            .replaceAll('{user}', `@${payload.comment?.user.login}`)
+
+            // replace {proposalLink} from response template with the link to the comment
+            .replaceAll('{proposalLink}', payload.comment?.html_url)
+
+            // remove any double quotes from the final comment because sometimes the assistant's
+            // response contains double quotes / sometimes it doesn't
+            .replaceAll('"', '');
+
+        // Create a comment with the assistant's response
+        console.log('ProposalPolice™ commenting on issue...');
+        await GithubUtils.createComment(CONST.APP_REPO, context.issue.number, formattedResponse);
+        // edit comment if assistant detected substantial changes and if the comment was not edited already by the bot
+    } else if (assistantResponse.includes('[EDIT_COMMENT]') && !payload.comment?.body.includes('Edited by **proposal-police**')) {
+        // extract the text after [EDIT_COMMENT] from assistantResponse since this is a
+        // bot related action keyword
+        let extractedNotice = assistantResponse.split('[EDIT_COMMENT] ')?.[1]?.replace('"', '');
+        // format the date like: 2024-01-24 13:15:24 UTC not 2024-01-28 18:18:28.000 UTC
+        const formattedDate = `${date.toISOString()?.split('.')?.[0]?.replace('T', ' ')} UTC`;
+        extractedNotice = extractedNotice.replace('{updated_timestamp}', formattedDate);
+        console.log('ProposalPolice™ editing issue comment...', payload.comment.id);
+        await GithubUtils.octokit.issues.updateComment({
+            ...context.repo,
+            /* eslint-disable @typescript-eslint/naming-convention */
+            comment_id: payload.comment.id,
+            body: `${extractedNotice}\n\n${payload.comment?.body}`,
+        });
+    }
+}
+
+run().catch((error) => {
+    console.error(error);
+    // Zero status ensures that the action is marked as successful regardless the outcome
+    // which means that no failure notification is sent to issue's subscribers
+    process.exit(0);
+});
diff --git a/.github/actions/javascript/reopenIssueWithComment/index.js b/.github/actions/javascript/reopenIssueWithComment/index.js
index d4341ce37dc4..83131f363ef8 100644
--- a/.github/actions/javascript/reopenIssueWithComment/index.js
+++ b/.github/actions/javascript/reopenIssueWithComment/index.js
@@ -6679,7 +6679,7 @@ FetchError.prototype.name = 'FetchError';
 
 let convert;
 try {
-	convert = (__nccwpck_require__(2877).convert);
+	convert = (__nccwpck_require__(3975).convert);
 } catch (e) {}
 
 const INTERNALS = Symbol('Body internals');
@@ -11511,7 +11511,22 @@ const CONST = {
         STAGING_DEPLOY: 'StagingDeployCash',
         DEPLOY_BLOCKER: 'DeployBlockerCash',
         INTERNAL_QA: 'InternalQA',
+        HELP_WANTED: 'Help Wanted',
+        CP_STAGING: 'CP Staging',
     },
+    ACTIONS: {
+        CREATED: 'created',
+        EDIT: 'edited',
+    },
+    EVENTS: {
+        ISSUE_COMMENT: 'issue_comment',
+    },
+    OPENAI_ROLES: {
+        USER: 'user',
+        ASSISTANT: 'assistant',
+    },
+    PROPOSAL_KEYWORD: 'Proposal',
+    OPENAI_THREAD_COMPLETED: 'completed',
     DATE_FORMAT_STRING: 'yyyy-MM-dd',
     PULL_REQUEST_REGEX: new RegExp(`${GITHUB_BASE_URL_REGEX.source}/.*/.*/pull/([0-9]+).*`),
     ISSUE_REGEX: new RegExp(`${GITHUB_BASE_URL_REGEX.source}/.*/.*/issues/([0-9]+).*`),
@@ -11519,6 +11534,9 @@ const CONST = {
     POLL_RATE: 10000,
     APP_REPO_URL: `https://github.com/${GIT_CONST.GITHUB_OWNER}/${GIT_CONST.APP_REPO}`,
     APP_REPO_GIT_URL: `git@github.com:${GIT_CONST.GITHUB_OWNER}/${GIT_CONST.APP_REPO}.git`,
+    NO_ACTION: 'NO_ACTION',
+    OPENAI_POLL_RATE: 1500,
+    OPENAI_POLL_TIMEOUT: 90000,
 };
 exports["default"] = CONST;
 
@@ -11568,13 +11586,11 @@ const CONST_1 = __importDefault(__nccwpck_require__(9873));
 class GithubUtils {
     static internalOctokit;
     /**
-     * Initialize internal octokit
-     *
-     * @private
+     * Initialize internal octokit.
+     * NOTE: When using GithubUtils in CI, you don't need to call this manually.
      */
-    static initOctokit() {
+    static initOctokitWithToken(token) {
         const Octokit = utils_1.GitHub.plugin(plugin_throttling_1.throttling, plugin_paginate_rest_1.paginateRest);
-        const token = core.getInput('GITHUB_TOKEN', { required: true });
         // Save a copy of octokit used in this class
         this.internalOctokit = new Octokit((0, utils_1.getOctokitOptions)(token, {
             throttle: {
@@ -11594,6 +11610,15 @@ class GithubUtils {
             },
         }));
     }
+    /**
+     * Default initialize method assuming running in CI, getting the token from an input.
+     *
+     * @private
+     */
+    static initOctokit() {
+        const token = core.getInput('GITHUB_TOKEN', { required: true });
+        this.initOctokitWithToken(token);
+    }
     /**
      * Either give an existing instance of Octokit rest or create a new one
      *
@@ -11888,12 +11913,6 @@ class GithubUtils {
         })
             .then((response) => response.data.workflow_runs[0]?.id);
     }
-    /**
-     * Generate the well-formatted body of a production release.
-     */
-    static getReleaseBody(pullRequests) {
-        return pullRequests.map((number) => `- ${this.getPullRequestURLFromNumber(number)}`).join('\r\n');
-    }
     /**
      * Generate the URL of an New Expensify pull request given the PR number.
      */
@@ -11949,12 +11968,31 @@ class GithubUtils {
             .then((events) => events.filter((event) => event.event === 'closed'))
             .then((closedEvents) => closedEvents.at(-1)?.actor?.login ?? '');
     }
-    static getArtifactByName(artefactName) {
-        return this.paginate(this.octokit.actions.listArtifactsForRepo, {
+    /**
+     * Returns a single artifact by name. If none is found, it returns undefined.
+     */
+    static getArtifactByName(artifactName) {
+        return this.octokit.actions
+            .listArtifactsForRepo({
             owner: CONST_1.default.GITHUB_OWNER,
             repo: CONST_1.default.APP_REPO,
-            per_page: 100,
-        }).then((artifacts) => artifacts.find((artifact) => artifact.name === artefactName));
+            per_page: 1,
+            name: artifactName,
+        })
+            .then((response) => response.data.artifacts[0]);
+    }
+    /**
+     * Given an artifact ID, returns the download URL to a zip file containing the artifact.
+     */
+    static getArtifactDownloadURL(artifactId) {
+        return this.octokit.actions
+            .downloadArtifact({
+            owner: CONST_1.default.GITHUB_OWNER,
+            repo: CONST_1.default.APP_REPO,
+            artifact_id: artifactId,
+            archive_format: 'zip',
+        })
+            .then((response) => response.url);
     }
 }
 exports["default"] = GithubUtils;
@@ -11995,27 +12033,27 @@ exports["default"] = arrayDifference;
 
 /***/ }),
 
-/***/ 2877:
+/***/ 9491:
 /***/ ((module) => {
 
-module.exports = eval("require")("encoding");
-
+"use strict";
+module.exports = require("assert");
 
 /***/ }),
 
-/***/ 9491:
+/***/ 6113:
 /***/ ((module) => {
 
 "use strict";
-module.exports = require("assert");
+module.exports = require("crypto");
 
 /***/ }),
 
-/***/ 6113:
+/***/ 3975:
 /***/ ((module) => {
 
 "use strict";
-module.exports = require("crypto");
+module.exports = require("encoding");
 
 /***/ }),
 
diff --git a/.github/actions/javascript/reviewerChecklist/index.js b/.github/actions/javascript/reviewerChecklist/index.js
index cc1c0b5a581b..2a0977db8016 100644
--- a/.github/actions/javascript/reviewerChecklist/index.js
+++ b/.github/actions/javascript/reviewerChecklist/index.js
@@ -6723,7 +6723,7 @@ FetchError.prototype.name = 'FetchError';
 
 let convert;
 try {
-	convert = (__nccwpck_require__(2877).convert);
+	convert = (__nccwpck_require__(3975).convert);
 } catch (e) {}
 
 const INTERNALS = Symbol('Body internals');
@@ -11603,7 +11603,22 @@ const CONST = {
         STAGING_DEPLOY: 'StagingDeployCash',
         DEPLOY_BLOCKER: 'DeployBlockerCash',
         INTERNAL_QA: 'InternalQA',
+        HELP_WANTED: 'Help Wanted',
+        CP_STAGING: 'CP Staging',
     },
+    ACTIONS: {
+        CREATED: 'created',
+        EDIT: 'edited',
+    },
+    EVENTS: {
+        ISSUE_COMMENT: 'issue_comment',
+    },
+    OPENAI_ROLES: {
+        USER: 'user',
+        ASSISTANT: 'assistant',
+    },
+    PROPOSAL_KEYWORD: 'Proposal',
+    OPENAI_THREAD_COMPLETED: 'completed',
     DATE_FORMAT_STRING: 'yyyy-MM-dd',
     PULL_REQUEST_REGEX: new RegExp(`${GITHUB_BASE_URL_REGEX.source}/.*/.*/pull/([0-9]+).*`),
     ISSUE_REGEX: new RegExp(`${GITHUB_BASE_URL_REGEX.source}/.*/.*/issues/([0-9]+).*`),
@@ -11611,6 +11626,9 @@ const CONST = {
     POLL_RATE: 10000,
     APP_REPO_URL: `https://github.com/${GIT_CONST.GITHUB_OWNER}/${GIT_CONST.APP_REPO}`,
     APP_REPO_GIT_URL: `git@github.com:${GIT_CONST.GITHUB_OWNER}/${GIT_CONST.APP_REPO}.git`,
+    NO_ACTION: 'NO_ACTION',
+    OPENAI_POLL_RATE: 1500,
+    OPENAI_POLL_TIMEOUT: 90000,
 };
 exports["default"] = CONST;
 
@@ -11660,13 +11678,11 @@ const CONST_1 = __importDefault(__nccwpck_require__(9873));
 class GithubUtils {
     static internalOctokit;
     /**
-     * Initialize internal octokit
-     *
-     * @private
+     * Initialize internal octokit.
+     * NOTE: When using GithubUtils in CI, you don't need to call this manually.
      */
-    static initOctokit() {
+    static initOctokitWithToken(token) {
         const Octokit = utils_1.GitHub.plugin(plugin_throttling_1.throttling, plugin_paginate_rest_1.paginateRest);
-        const token = core.getInput('GITHUB_TOKEN', { required: true });
         // Save a copy of octokit used in this class
         this.internalOctokit = new Octokit((0, utils_1.getOctokitOptions)(token, {
             throttle: {
@@ -11686,6 +11702,15 @@ class GithubUtils {
             },
         }));
     }
+    /**
+     * Default initialize method assuming running in CI, getting the token from an input.
+     *
+     * @private
+     */
+    static initOctokit() {
+        const token = core.getInput('GITHUB_TOKEN', { required: true });
+        this.initOctokitWithToken(token);
+    }
     /**
      * Either give an existing instance of Octokit rest or create a new one
      *
@@ -11980,12 +12005,6 @@ class GithubUtils {
         })
             .then((response) => response.data.workflow_runs[0]?.id);
     }
-    /**
-     * Generate the well-formatted body of a production release.
-     */
-    static getReleaseBody(pullRequests) {
-        return pullRequests.map((number) => `- ${this.getPullRequestURLFromNumber(number)}`).join('\r\n');
-    }
     /**
      * Generate the URL of an New Expensify pull request given the PR number.
      */
@@ -12041,12 +12060,31 @@ class GithubUtils {
             .then((events) => events.filter((event) => event.event === 'closed'))
             .then((closedEvents) => closedEvents.at(-1)?.actor?.login ?? '');
     }
-    static getArtifactByName(artefactName) {
-        return this.paginate(this.octokit.actions.listArtifactsForRepo, {
+    /**
+     * Returns a single artifact by name. If none is found, it returns undefined.
+     */
+    static getArtifactByName(artifactName) {
+        return this.octokit.actions
+            .listArtifactsForRepo({
             owner: CONST_1.default.GITHUB_OWNER,
             repo: CONST_1.default.APP_REPO,
-            per_page: 100,
-        }).then((artifacts) => artifacts.find((artifact) => artifact.name === artefactName));
+            per_page: 1,
+            name: artifactName,
+        })
+            .then((response) => response.data.artifacts[0]);
+    }
+    /**
+     * Given an artifact ID, returns the download URL to a zip file containing the artifact.
+     */
+    static getArtifactDownloadURL(artifactId) {
+        return this.octokit.actions
+            .downloadArtifact({
+            owner: CONST_1.default.GITHUB_OWNER,
+            repo: CONST_1.default.APP_REPO,
+            artifact_id: artifactId,
+            archive_format: 'zip',
+        })
+            .then((response) => response.url);
     }
 }
 exports["default"] = GithubUtils;
@@ -12087,27 +12125,27 @@ exports["default"] = arrayDifference;
 
 /***/ }),
 
-/***/ 2877:
+/***/ 9491:
 /***/ ((module) => {
 
-module.exports = eval("require")("encoding");
-
+"use strict";
+module.exports = require("assert");
 
 /***/ }),
 
-/***/ 9491:
+/***/ 6113:
 /***/ ((module) => {
 
 "use strict";
-module.exports = require("assert");
+module.exports = require("crypto");
 
 /***/ }),
 
-/***/ 6113:
+/***/ 3975:
 /***/ ((module) => {
 
 "use strict";
-module.exports = require("crypto");
+module.exports = require("encoding");
 
 /***/ }),
 
diff --git a/.github/actions/javascript/reviewerChecklist/reviewerChecklist.ts b/.github/actions/javascript/reviewerChecklist/reviewerChecklist.ts
index aabc6b33086a..f57ef6c36a04 100644
--- a/.github/actions/javascript/reviewerChecklist/reviewerChecklist.ts
+++ b/.github/actions/javascript/reviewerChecklist/reviewerChecklist.ts
@@ -90,7 +90,7 @@ function checkIssueForCompletedChecklist(numberOfChecklistItems: number) {
 
 getNumberOfItemsFromReviewerChecklist()
     .then(checkIssueForCompletedChecklist)
-    .catch((err) => {
+    .catch((err: string | Error) => {
         console.error(err);
         core.setFailed(err);
     });
diff --git a/.github/actions/javascript/validateReassureOutput/validateReassureOutput.ts b/.github/actions/javascript/validateReassureOutput/validateReassureOutput.ts
index ad0f393a96a2..7e5cfd0bd9f9 100644
--- a/.github/actions/javascript/validateReassureOutput/validateReassureOutput.ts
+++ b/.github/actions/javascript/validateReassureOutput/validateReassureOutput.ts
@@ -1,9 +1,9 @@
 import * as core from '@actions/core';
-import type {CompareResult, PerformanceEntry} from '@callstack/reassure-compare/src/types';
+import type {CompareResult, MeasureEntry} from '@callstack/reassure-compare';
 import fs from 'fs';
 
 const run = (): boolean => {
-    const regressionOutput: CompareResult = JSON.parse(fs.readFileSync('.reassure/output.json', 'utf8'));
+    const regressionOutput = JSON.parse(fs.readFileSync('.reassure/output.json', 'utf8')) as CompareResult;
     const countDeviation = Number(core.getInput('COUNT_DEVIATION', {required: true}));
     const durationDeviation = Number(core.getInput('DURATION_DEVIATION_PERCENTAGE', {required: true}));
 
@@ -16,8 +16,8 @@ const run = (): boolean => {
 
     for (let i = 0; i < regressionOutput.countChanged.length; i++) {
         const measurement = regressionOutput.countChanged[i];
-        const baseline: PerformanceEntry = measurement.baseline;
-        const current: PerformanceEntry = measurement.current;
+        const baseline: MeasureEntry = measurement.baseline;
+        const current: MeasureEntry = measurement.current;
 
         console.log(`Processing measurement ${i + 1}: ${measurement.name}`);
 
diff --git a/.github/actions/javascript/verifySignedCommits/index.js b/.github/actions/javascript/verifySignedCommits/index.js
index aea35331b1d0..49a4341b84af 100644
--- a/.github/actions/javascript/verifySignedCommits/index.js
+++ b/.github/actions/javascript/verifySignedCommits/index.js
@@ -6723,7 +6723,7 @@ FetchError.prototype.name = 'FetchError';
 
 let convert;
 try {
-	convert = (__nccwpck_require__(2877).convert);
+	convert = (__nccwpck_require__(3975).convert);
 } catch (e) {}
 
 const INTERNALS = Symbol('Body internals');
@@ -11543,7 +11543,22 @@ const CONST = {
         STAGING_DEPLOY: 'StagingDeployCash',
         DEPLOY_BLOCKER: 'DeployBlockerCash',
         INTERNAL_QA: 'InternalQA',
+        HELP_WANTED: 'Help Wanted',
+        CP_STAGING: 'CP Staging',
     },
+    ACTIONS: {
+        CREATED: 'created',
+        EDIT: 'edited',
+    },
+    EVENTS: {
+        ISSUE_COMMENT: 'issue_comment',
+    },
+    OPENAI_ROLES: {
+        USER: 'user',
+        ASSISTANT: 'assistant',
+    },
+    PROPOSAL_KEYWORD: 'Proposal',
+    OPENAI_THREAD_COMPLETED: 'completed',
     DATE_FORMAT_STRING: 'yyyy-MM-dd',
     PULL_REQUEST_REGEX: new RegExp(`${GITHUB_BASE_URL_REGEX.source}/.*/.*/pull/([0-9]+).*`),
     ISSUE_REGEX: new RegExp(`${GITHUB_BASE_URL_REGEX.source}/.*/.*/issues/([0-9]+).*`),
@@ -11551,6 +11566,9 @@ const CONST = {
     POLL_RATE: 10000,
     APP_REPO_URL: `https://github.com/${GIT_CONST.GITHUB_OWNER}/${GIT_CONST.APP_REPO}`,
     APP_REPO_GIT_URL: `git@github.com:${GIT_CONST.GITHUB_OWNER}/${GIT_CONST.APP_REPO}.git`,
+    NO_ACTION: 'NO_ACTION',
+    OPENAI_POLL_RATE: 1500,
+    OPENAI_POLL_TIMEOUT: 90000,
 };
 exports["default"] = CONST;
 
@@ -11600,13 +11618,11 @@ const CONST_1 = __importDefault(__nccwpck_require__(9873));
 class GithubUtils {
     static internalOctokit;
     /**
-     * Initialize internal octokit
-     *
-     * @private
+     * Initialize internal octokit.
+     * NOTE: When using GithubUtils in CI, you don't need to call this manually.
      */
-    static initOctokit() {
+    static initOctokitWithToken(token) {
         const Octokit = utils_1.GitHub.plugin(plugin_throttling_1.throttling, plugin_paginate_rest_1.paginateRest);
-        const token = core.getInput('GITHUB_TOKEN', { required: true });
         // Save a copy of octokit used in this class
         this.internalOctokit = new Octokit((0, utils_1.getOctokitOptions)(token, {
             throttle: {
@@ -11626,6 +11642,15 @@ class GithubUtils {
             },
         }));
     }
+    /**
+     * Default initialize method assuming running in CI, getting the token from an input.
+     *
+     * @private
+     */
+    static initOctokit() {
+        const token = core.getInput('GITHUB_TOKEN', { required: true });
+        this.initOctokitWithToken(token);
+    }
     /**
      * Either give an existing instance of Octokit rest or create a new one
      *
@@ -11920,12 +11945,6 @@ class GithubUtils {
         })
             .then((response) => response.data.workflow_runs[0]?.id);
     }
-    /**
-     * Generate the well-formatted body of a production release.
-     */
-    static getReleaseBody(pullRequests) {
-        return pullRequests.map((number) => `- ${this.getPullRequestURLFromNumber(number)}`).join('\r\n');
-    }
     /**
      * Generate the URL of an New Expensify pull request given the PR number.
      */
@@ -11981,12 +12000,31 @@ class GithubUtils {
             .then((events) => events.filter((event) => event.event === 'closed'))
             .then((closedEvents) => closedEvents.at(-1)?.actor?.login ?? '');
     }
-    static getArtifactByName(artefactName) {
-        return this.paginate(this.octokit.actions.listArtifactsForRepo, {
+    /**
+     * Returns a single artifact by name. If none is found, it returns undefined.
+     */
+    static getArtifactByName(artifactName) {
+        return this.octokit.actions
+            .listArtifactsForRepo({
             owner: CONST_1.default.GITHUB_OWNER,
             repo: CONST_1.default.APP_REPO,
-            per_page: 100,
-        }).then((artifacts) => artifacts.find((artifact) => artifact.name === artefactName));
+            per_page: 1,
+            name: artifactName,
+        })
+            .then((response) => response.data.artifacts[0]);
+    }
+    /**
+     * Given an artifact ID, returns the download URL to a zip file containing the artifact.
+     */
+    static getArtifactDownloadURL(artifactId) {
+        return this.octokit.actions
+            .downloadArtifact({
+            owner: CONST_1.default.GITHUB_OWNER,
+            repo: CONST_1.default.APP_REPO,
+            artifact_id: artifactId,
+            archive_format: 'zip',
+        })
+            .then((response) => response.url);
     }
 }
 exports["default"] = GithubUtils;
@@ -12027,27 +12065,27 @@ exports["default"] = arrayDifference;
 
 /***/ }),
 
-/***/ 2877:
+/***/ 9491:
 /***/ ((module) => {
 
-module.exports = eval("require")("encoding");
-
+"use strict";
+module.exports = require("assert");
 
 /***/ }),
 
-/***/ 9491:
+/***/ 6113:
 /***/ ((module) => {
 
 "use strict";
-module.exports = require("assert");
+module.exports = require("crypto");
 
 /***/ }),
 
-/***/ 6113:
+/***/ 3975:
 /***/ ((module) => {
 
 "use strict";
-module.exports = require("crypto");
+module.exports = require("encoding");
 
 /***/ }),
 
diff --git a/.github/libs/CONST.ts b/.github/libs/CONST.ts
index 8d9aae9bff83..499ff15e5aeb 100644
--- a/.github/libs/CONST.ts
+++ b/.github/libs/CONST.ts
@@ -13,7 +13,22 @@ const CONST = {
         STAGING_DEPLOY: 'StagingDeployCash',
         DEPLOY_BLOCKER: 'DeployBlockerCash',
         INTERNAL_QA: 'InternalQA',
+        HELP_WANTED: 'Help Wanted',
+        CP_STAGING: 'CP Staging',
     },
+    ACTIONS: {
+        CREATED: 'created',
+        EDIT: 'edited',
+    },
+    EVENTS: {
+        ISSUE_COMMENT: 'issue_comment',
+    },
+    OPENAI_ROLES: {
+        USER: 'user',
+        ASSISTANT: 'assistant',
+    },
+    PROPOSAL_KEYWORD: 'Proposal',
+    OPENAI_THREAD_COMPLETED: 'completed',
     DATE_FORMAT_STRING: 'yyyy-MM-dd',
     PULL_REQUEST_REGEX: new RegExp(`${GITHUB_BASE_URL_REGEX.source}/.*/.*/pull/([0-9]+).*`),
     ISSUE_REGEX: new RegExp(`${GITHUB_BASE_URL_REGEX.source}/.*/.*/issues/([0-9]+).*`),
@@ -21,6 +36,9 @@ const CONST = {
     POLL_RATE: 10000,
     APP_REPO_URL: `https://github.com/${GIT_CONST.GITHUB_OWNER}/${GIT_CONST.APP_REPO}`,
     APP_REPO_GIT_URL: `git@github.com:${GIT_CONST.GITHUB_OWNER}/${GIT_CONST.APP_REPO}.git`,
+    NO_ACTION: 'NO_ACTION',
+    OPENAI_POLL_RATE: 1500,
+    OPENAI_POLL_TIMEOUT: 90000,
 } as const;
 
 export default CONST;
diff --git a/.github/libs/GitUtils.ts b/.github/libs/GitUtils.ts
index 684e7c76aa86..89950613bc2e 100644
--- a/.github/libs/GitUtils.ts
+++ b/.github/libs/GitUtils.ts
@@ -1,7 +1,8 @@
 import {execSync, spawn} from 'child_process';
 import CONST from './CONST';
 import sanitizeStringForJSONParse from './sanitizeStringForJSONParse';
-import * as VERSION_UPDATER from './versionUpdater';
+import * as VersionUpdater from './versionUpdater';
+import type {SemverLevel} from './versionUpdater';
 
 type CommitType = {
     commit: string;
@@ -9,6 +10,64 @@ type CommitType = {
     authorName: string;
 };
 
+/**
+ * Check if a tag exists locally or in the remote.
+ */
+function tagExists(tag: string) {
+    try {
+        // Check if the tag exists locally
+        execSync(`git show-ref --tags ${tag}`, {stdio: 'ignore'});
+        return true; // Tag exists locally
+    } catch (error) {
+        // Tag does not exist locally, check in remote
+        let shouldRetry = true;
+        let needsRepack = false;
+        let doesTagExist = false;
+        while (shouldRetry) {
+            try {
+                if (needsRepack) {
+                    // We have seen some scenarios where this fixes the git fetch.
+                    // Why? Who knows... https://github.com/Expensify/App/pull/31459
+                    execSync('git repack -d', {stdio: 'inherit'});
+                }
+                execSync(`git ls-remote --exit-code --tags origin ${tag}`, {stdio: 'ignore'});
+                doesTagExist = true;
+                shouldRetry = false;
+            } catch (e) {
+                if (!needsRepack) {
+                    console.log('Attempting to repack and retry...');
+                    needsRepack = true;
+                } else {
+                    console.error("Repack didn't help, giving up...");
+                    shouldRetry = false;
+                }
+            }
+        }
+        return doesTagExist;
+    }
+}
+
+/**
+ * This essentially just calls getPreviousVersion in a loop, until it finds a version for which a tag exists.
+ * It's useful if we manually perform a version bump, because in that case a tag may not exist for the previous version.
+ *
+ * @param tag the current tag
+ * @param level the Semver level to step backward by
+ */
+function getPreviousExistingTag(tag: string, level: SemverLevel) {
+    let previousVersion = VersionUpdater.getPreviousVersion(tag, level);
+    let tagExistsForPreviousVersion = false;
+    while (!tagExistsForPreviousVersion) {
+        if (tagExists(previousVersion)) {
+            tagExistsForPreviousVersion = true;
+            break;
+        }
+        console.log(`Tag for previous version ${previousVersion} does not exist. Checking for an older version...`);
+        previousVersion = VersionUpdater.getPreviousVersion(previousVersion, level);
+    }
+    return previousVersion;
+}
+
 /**
  * @param [shallowExcludeTag] When fetching the given tag, exclude all history reachable by the shallowExcludeTag (used to make fetch much faster)
  */
@@ -53,8 +112,8 @@ function fetchTag(tag: string, shallowExcludeTag = '') {
  * Get merge logs between two tags (inclusive) as a JavaScript object.
  */
 function getCommitHistoryAsJSON(fromTag: string, toTag: string): Promise<CommitType[]> {
-    // Fetch tags, exclude commits reachable from the previous patch version (i.e: previous checklist), so that we don't have to fetch the full history
-    const previousPatchVersion = VERSION_UPDATER.getPreviousVersion(fromTag, VERSION_UPDATER.SEMANTIC_VERSION_LEVELS.PATCH);
+    // Fetch tags, excluding commits reachable from the previous patch version (i.e: previous checklist), so that we don't have to fetch the full history
+    const previousPatchVersion = getPreviousExistingTag(fromTag, VersionUpdater.SEMANTIC_VERSION_LEVELS.PATCH);
     fetchTag(fromTag, previousPatchVersion);
     fetchTag(toTag, previousPatchVersion);
 
@@ -66,16 +125,17 @@ function getCommitHistoryAsJSON(fromTag: string, toTag: string): Promise<CommitT
         console.log(`Running command: git ${args.join(' ')}`);
         const spawnedProcess = spawn('git', args);
         spawnedProcess.on('message', console.log);
-        spawnedProcess.stdout.on('data', (chunk) => {
+        spawnedProcess.stdout.on('data', (chunk: Buffer) => {
             console.log(chunk.toString());
             stdout += chunk.toString();
         });
-        spawnedProcess.stderr.on('data', (chunk) => {
+        spawnedProcess.stderr.on('data', (chunk: Buffer) => {
             console.error(chunk.toString());
             stderr += chunk.toString();
         });
         spawnedProcess.on('close', (code) => {
             if (code !== 0) {
+                console.log('code: ', code);
                 return reject(new Error(`${stderr}`));
             }
 
@@ -138,6 +198,7 @@ async function getPullRequestsMergedBetween(fromTag: string, toTag: string) {
 }
 
 export default {
+    getPreviousExistingTag,
     getValidMergedPRs,
     getPullRequestsMergedBetween,
 };
diff --git a/.github/libs/GithubUtils.ts b/.github/libs/GithubUtils.ts
index f445fc368559..36363684a351 100644
--- a/.github/libs/GithubUtils.ts
+++ b/.github/libs/GithubUtils.ts
@@ -65,13 +65,11 @@ class GithubUtils {
     static internalOctokit: InternalOctokit | undefined;
 
     /**
-     * Initialize internal octokit
-     *
-     * @private
+     * Initialize internal octokit.
+     * NOTE: When using GithubUtils in CI, you don't need to call this manually.
      */
-    static initOctokit() {
+    static initOctokitWithToken(token: string) {
         const Octokit = GitHub.plugin(throttling, paginateRest);
-        const token = core.getInput('GITHUB_TOKEN', {required: true});
 
         // Save a copy of octokit used in this class
         this.internalOctokit = new Octokit(
@@ -96,6 +94,16 @@ class GithubUtils {
         );
     }
 
+    /**
+     * Default initialize method assuming running in CI, getting the token from an input.
+     *
+     * @private
+     */
+    static initOctokit() {
+        const token = core.getInput('GITHUB_TOKEN', {required: true});
+        this.initOctokitWithToken(token);
+    }
+
     /**
      * Either give an existing instance of Octokit rest or create a new one
      *
@@ -454,13 +462,6 @@ class GithubUtils {
             .then((response) => response.data.workflow_runs[0]?.id);
     }
 
-    /**
-     * Generate the well-formatted body of a production release.
-     */
-    static getReleaseBody(pullRequests: number[]): string {
-        return pullRequests.map((number) => `- ${this.getPullRequestURLFromNumber(number)}`).join('\r\n');
-    }
-
     /**
      * Generate the URL of an New Expensify pull request given the PR number.
      */
@@ -521,17 +522,34 @@ class GithubUtils {
             .then((closedEvents) => closedEvents.at(-1)?.actor?.login ?? '');
     }
 
-    static getArtifactByName(artefactName: string): Promise<OctokitArtifact | undefined> {
-        return this.paginate(this.octokit.actions.listArtifactsForRepo, {
-            owner: CONST.GITHUB_OWNER,
-            repo: CONST.APP_REPO,
-            per_page: 100,
-        }).then((artifacts: OctokitArtifact[]) => artifacts.find((artifact) => artifact.name === artefactName));
+    /**
+     * Returns a single artifact by name. If none is found, it returns undefined.
+     */
+    static getArtifactByName(artifactName: string): Promise<OctokitArtifact | undefined> {
+        return this.octokit.actions
+            .listArtifactsForRepo({
+                owner: CONST.GITHUB_OWNER,
+                repo: CONST.APP_REPO,
+                per_page: 1,
+                name: artifactName,
+            })
+            .then((response) => response.data.artifacts[0]);
+    }
+
+    /**
+     * Given an artifact ID, returns the download URL to a zip file containing the artifact.
+     */
+    static getArtifactDownloadURL(artifactId: number): Promise<string> {
+        return this.octokit.actions
+            .downloadArtifact({
+                owner: CONST.GITHUB_OWNER,
+                repo: CONST.APP_REPO,
+                artifact_id: artifactId,
+                archive_format: 'zip',
+            })
+            .then((response) => response.url);
     }
 }
 
 export default GithubUtils;
-// This is a temporary solution to allow the use of the GithubUtils class in both TypeScript and JavaScript.
-// Once all the files that import GithubUtils are migrated to TypeScript, this can be removed.
-
 export type {ListForRepoMethod, InternalOctokit, CreateCommentResponse, StagingDeployCashData};
diff --git a/.github/libs/OpenAIUtils.ts b/.github/libs/OpenAIUtils.ts
new file mode 100644
index 000000000000..623c5bc33d3b
--- /dev/null
+++ b/.github/libs/OpenAIUtils.ts
@@ -0,0 +1,74 @@
+import {getInput} from '@actions/core';
+import OpenAI from 'openai';
+import type {MessageContent, TextContentBlock} from 'openai/resources/beta/threads';
+import CONST from './CONST';
+
+const MAX_POLL_COUNT = Math.floor(CONST.OPENAI_POLL_TIMEOUT / CONST.OPENAI_POLL_RATE);
+
+class OpenAIUtils {
+    private static ai: OpenAI;
+
+    private static assistantID: string;
+
+    static init(apiKey?: string, assistantID?: string) {
+        const key = apiKey ?? getInput('PROPOSAL_POLICE_API_KEY', {required: true});
+        if (!key) {
+            throw new Error('Could not initialize OpenAI: No key provided.');
+        }
+        this.ai = new OpenAI({apiKey: key});
+        this.assistantID = assistantID ?? getInput('PROPOSAL_POLICE_ASSISTANT_ID', {required: true});
+    }
+
+    static get openAI() {
+        if (!this.ai) {
+            this.init();
+        }
+        return this.ai;
+    }
+
+    static async prompt(userMessage: string) {
+        // start a thread run
+        let threadRun = await this.openAI.beta.threads.createAndRun({
+            /* eslint-disable @typescript-eslint/naming-convention */
+            assistant_id: this.assistantID,
+            thread: {messages: [{role: CONST.OPENAI_ROLES.USER, content: userMessage}]},
+        });
+
+        // poll for run completion
+        let response = '';
+        let count = 0;
+        while (!response && count < MAX_POLL_COUNT) {
+            // await thread run completion
+            threadRun = await this.openAI.beta.threads.runs.retrieve(threadRun.thread_id, threadRun.id);
+            if (threadRun.status !== CONST.OPENAI_THREAD_COMPLETED) {
+                count++;
+                await new Promise((resolve) => {
+                    setTimeout(resolve, CONST.OPENAI_POLL_RATE);
+                });
+                continue;
+            }
+
+            for await (const message of this.openAI.beta.threads.messages.list(threadRun.thread_id)) {
+                if (message.role !== CONST.OPENAI_ROLES.ASSISTANT) {
+                    continue;
+                }
+                response += message.content
+                    .map((contentBlock) => this.isTextContentBlock(contentBlock) && contentBlock.text.value)
+                    .join('\n')
+                    .trim();
+                console.log('Parsed assistant response:', response);
+            }
+
+            if (!response) {
+                throw new Error('Assistant response is empty or had no text content. This is unexpected.');
+            }
+        }
+        return response;
+    }
+
+    static isTextContentBlock(contentBlock: MessageContent): contentBlock is TextContentBlock {
+        return contentBlock?.type === 'text';
+    }
+}
+
+export default OpenAIUtils;
diff --git a/.github/libs/promiseWhile.ts b/.github/libs/promiseWhile.ts
index 401b6ee2e18a..8bedceb894fd 100644
--- a/.github/libs/promiseWhile.ts
+++ b/.github/libs/promiseWhile.ts
@@ -4,15 +4,12 @@ import type {DebouncedFunc} from 'lodash';
  * Simulates a while loop where the condition is determined by the result of a Promise.
  */
 function promiseWhile(condition: () => boolean, action: (() => Promise<void>) | DebouncedFunc<() => Promise<void>> | undefined): Promise<void> {
-    console.info('[promiseWhile] promiseWhile()');
-
     return new Promise((resolve, reject) => {
         const loop = function () {
             if (!condition()) {
                 resolve();
             } else {
                 const actionResult = action?.();
-                console.info('[promiseWhile] promiseWhile() actionResult', actionResult);
 
                 if (!actionResult) {
                     resolve();
@@ -35,12 +32,9 @@ function promiseWhile(condition: () => boolean, action: (() => Promise<void>) |
  * Simulates a do-while loop where the condition is determined by the result of a Promise.
  */
 function promiseDoWhile(condition: () => boolean, action: (() => Promise<void>) | DebouncedFunc<() => Promise<void>> | undefined): Promise<void> {
-    console.info('[promiseWhile] promiseDoWhile()');
-
     return new Promise((resolve, reject) => {
-        console.info('[promiseWhile] promiseDoWhile() condition', condition);
         const actionResult = action?.();
-        console.info('[promiseWhile] promiseDoWhile() actionResult', actionResult);
+
         if (!actionResult) {
             resolve();
             return;
diff --git a/.github/libs/sanitizeStringForJSONParse.ts b/.github/libs/sanitizeStringForJSONParse.ts
index 3fbdaa8661f8..ddb7549b0186 100644
--- a/.github/libs/sanitizeStringForJSONParse.ts
+++ b/.github/libs/sanitizeStringForJSONParse.ts
@@ -16,7 +16,7 @@ const replacer = (str: string): string =>
  * Solution partly taken from SO user Gabriel Rodríguez Flores 🙇
  * https://stackoverflow.com/questions/52789718/how-to-remove-special-characters-before-json-parse-while-file-reading
  */
-const sanitizeStringForJSONParse = (inputString: string): string => {
+const sanitizeStringForJSONParse = (inputString: string | number | boolean | null | undefined): string => {
     if (typeof inputString !== 'string') {
         throw new TypeError('Input must me of type String');
     }
diff --git a/.github/libs/versionUpdater.ts b/.github/libs/versionUpdater.ts
index 9b60fb82bd43..d9b24f532d8e 100644
--- a/.github/libs/versionUpdater.ts
+++ b/.github/libs/versionUpdater.ts
@@ -1,11 +1,18 @@
+import type {ValueOf} from 'type-fest';
+
 const SEMANTIC_VERSION_LEVELS = {
     MAJOR: 'MAJOR',
     MINOR: 'MINOR',
     PATCH: 'PATCH',
     BUILD: 'BUILD',
 } as const;
+type SemverLevel = ValueOf<typeof SEMANTIC_VERSION_LEVELS>;
+
+const MAX_INCREMENTS = 99;
 
-const MAX_INCREMENTS = 99 as const;
+function isValidSemverLevel(str: string): str is SemverLevel {
+    return Object.keys(SEMANTIC_VERSION_LEVELS).includes(str);
+}
 
 /**
  * Transforms a versions string into a number
@@ -46,7 +53,7 @@ const incrementPatch = (major: number, minor: number, patch: number): string =>
 /**
  * Increments a build version
  */
-const incrementVersion = (version: string, level: string): string => {
+const incrementVersion = (version: string, level: SemverLevel): string => {
     const [major, minor, patch, build] = getVersionNumberFromString(version);
 
     // Majors will always be incremented
@@ -99,7 +106,9 @@ function getPreviousVersion(currentVersion: string, level: string): string {
     return getVersionStringFromNumber(major, minor, patch, build - 1);
 }
 
+export type {SemverLevel};
 export {
+    isValidSemverLevel,
     getVersionNumberFromString,
     getVersionStringFromNumber,
     incrementVersion,
diff --git a/.github/scripts/buildActions.sh b/.github/scripts/buildActions.sh
index 30c284a776be..ea675aef5634 100755
--- a/.github/scripts/buildActions.sh
+++ b/.github/scripts/buildActions.sh
@@ -12,11 +12,11 @@ declare -r GITHUB_ACTIONS=(
     "$ACTIONS_DIR/awaitStagingDeploys/awaitStagingDeploys.ts"
     "$ACTIONS_DIR/bumpVersion/bumpVersion.ts"
     "$ACTIONS_DIR/checkDeployBlockers/checkDeployBlockers.ts"
+    "$ACTIONS_DIR/checkReactCompiler/checkReactCompiler.ts"
     "$ACTIONS_DIR/createOrUpdateStagingDeploy/createOrUpdateStagingDeploy.ts"
     "$ACTIONS_DIR/getDeployPullRequestList/getDeployPullRequestList.ts"
     "$ACTIONS_DIR/getPreviousVersion/getPreviousVersion.ts"
     "$ACTIONS_DIR/getPullRequestDetails/getPullRequestDetails.ts"
-    "$ACTIONS_DIR/getReleaseBody/getReleaseBody.ts"
     "$ACTIONS_DIR/isStagingDeployLocked/isStagingDeployLocked.ts"
     "$ACTIONS_DIR/markPullRequestsAsDeployed/markPullRequestsAsDeployed.ts"
     "$ACTIONS_DIR/postTestBuildComment/postTestBuildComment.ts"
@@ -27,6 +27,7 @@ declare -r GITHUB_ACTIONS=(
     "$ACTIONS_DIR/validateReassureOutput/validateReassureOutput.ts"
     "$ACTIONS_DIR/getGraphiteString/getGraphiteString.ts"
     "$ACTIONS_DIR/getArtifactInfo/getArtifactInfo.ts"
+    "$ACTIONS_DIR/proposalPoliceComment/proposalPoliceComment.ts"
 )
 
 # This will be inserted at the top of all compiled files as a warning to devs.
@@ -43,7 +44,7 @@ for ((i=0; i < ${#GITHUB_ACTIONS[@]}; i++)); do
   ACTION_DIR=$(dirname "$ACTION")
 
   # Build the action in the background
-  ncc build -t "$ACTION" -o "$ACTION_DIR" &
+  npx ncc build --transpile-only --external encoding "$ACTION" -o "$ACTION_DIR" &
   ASYNC_BUILDS[i]=$!
 done
 
diff --git a/.github/scripts/createDocsRoutes.ts b/.github/scripts/createDocsRoutes.ts
index fc3f376a1774..a8ac3d511ff9 100644
--- a/.github/scripts/createDocsRoutes.ts
+++ b/.github/scripts/createDocsRoutes.ts
@@ -5,6 +5,7 @@ import type {ValueOf} from 'type-fest';
 type Article = {
     href: string;
     title: string;
+    order?: number;
 };
 
 type Section = {
@@ -60,11 +61,12 @@ function toTitleCase(str: string): string {
 /**
  * @param filename - The name of the file
  */
-function getArticleObj(filename: string): Article {
+function getArticleObj(filename: string, order?: number): Article {
     const href = filename.replace('.md', '');
     return {
         href,
         title: toTitleCase(href.replaceAll('-', ' ')),
+        order,
     };
 }
 
@@ -90,6 +92,12 @@ function pushOrCreateEntry<TKey extends HubEntriesKey>(hubs: Hub[], hub: string,
     }
 }
 
+function getOrderFromArticleFrontMatter(path: string): number | undefined {
+    const frontmatter = fs.readFileSync(path, 'utf8').split('---')[1];
+    const frontmatterObject = yaml.load(frontmatter) as Record<string, unknown>;
+    return frontmatterObject.order as number | undefined;
+}
+
 /**
  * Add articles and sections to hubs
  * @param hubs - The hubs inside docs/articles/ for a platform
@@ -113,7 +121,8 @@ function createHubsWithArticles(hubs: string[], platformName: ValueOf<typeof pla
 
             // Each subfolder will be a section containing articles
             fs.readdirSync(`${docsDir}/articles/${platformName}/${hub}/${section}`).forEach((subArticle) => {
-                articles.push(getArticleObj(subArticle));
+                const order = getOrderFromArticleFrontMatter(`${docsDir}/articles/${platformName}/${hub}/${section}/${subArticle}`);
+                articles.push(getArticleObj(subArticle, order));
             });
 
             pushOrCreateEntry(routeHubs, hub, 'sections', {
diff --git a/.github/scripts/createHelpRedirects.sh b/.github/scripts/createHelpRedirects.sh
index 14ed9de953fc..1425939ff3ec 100755
--- a/.github/scripts/createHelpRedirects.sh
+++ b/.github/scripts/createHelpRedirects.sh
@@ -27,32 +27,6 @@ function checkCloudflareResult {
 declare -a ITEMS_TO_ADD
 
 while read -r line; do
-    # Split each line of the file into a source and destination so we can sanity check
-    # and compare against the current list.
-    read -r -a LINE_PARTS < <(echo "$line" | tr ',' ' ')
-    SOURCE_URL=${LINE_PARTS[0]}
-    DEST_URL=${LINE_PARTS[1]}
-
-    # Make sure the format of the line is as execpted.
-    if [[ "${#LINE_PARTS[@]}" -gt 2 ]]; then
-        error "Found a line with more than one comma: $line"
-        exit 1
-    fi
-
-    # Basic sanity checking to make sure that the source and destination are in expected
-    # subdomains.
-    if ! [[ $SOURCE_URL =~ ^https://(community|help)\.expensify\.com ]]; then
-        error "Found source URL that is not a communityDot or helpDot URL: $SOURCE_URL"
-        exit 1
-    fi
-
-    if ! [[ $DEST_URL =~ ^https://(help|use)\.expensify\.com ]]; then
-        error "Found destination URL that is not a helpDot or useDot URL: $DEST_URL"
-        exit 1
-    fi
-
-    info "Source: $SOURCE_URL and destination: $DEST_URL appear to be formatted correctly."
-
     ITEMS_TO_ADD+=("$line")
 
 # This line skips the first line in the csv because the first line is a header row.
@@ -83,6 +57,9 @@ done | jq -n '. |= [inputs]')
 
 info "Adding redirects for $PUT_JSON"
 
+# Dump $PUT_JSON into a file otherwise the curl request below will fail with too many arguments
+echo "$PUT_JSON" > redirects.json
+
 # We use PUT here instead of POST so that we replace the entire list in place. This has many benefits:
 # 1. We don't have to check if items are already in the list, allowing this script to run faster
 # 2. We can support deleting redirects this way by simply removing them from the list
@@ -93,7 +70,7 @@ info "Adding redirects for $PUT_JSON"
 PUT_RESULT=$(curl -s --request PUT --url "https://api.cloudflare.com/client/v4/accounts/$ZONE_ID/rules/lists/$LIST_ID/items" \
     --header 'Content-Type: application/json' \
     --header "Authorization: Bearer $CLOUDFLARE_LIST_TOKEN" \
-    --data "$PUT_JSON")
+    --data-binary @redirects.json)
 
 checkCloudflareResult "$PUT_RESULT"
 OPERATION_ID=$(echo "$PUT_RESULT" | jq -r .result.operation_id)
diff --git a/.github/scripts/detectRedirectCycle.ts b/.github/scripts/detectRedirectCycle.ts
index 5aa0d1daf342..6da0ecba158c 100644
--- a/.github/scripts/detectRedirectCycle.ts
+++ b/.github/scripts/detectRedirectCycle.ts
@@ -52,7 +52,7 @@ function detectCycle(): boolean {
 
 fs.createReadStream(`${process.cwd()}/docs/redirects.csv`)
     .pipe(parser)
-    .on('data', (row) => {
+    .on('data', (row: [string, string]) => {
         // Create a directed graph of sourceURL -> targetURL
         addEdge(row[0], row[1]);
     })
diff --git a/.github/scripts/enforceRedirect.sh b/.github/scripts/enforceRedirect.sh
new file mode 100755
index 000000000000..4d7d169b01c5
--- /dev/null
+++ b/.github/scripts/enforceRedirect.sh
@@ -0,0 +1,35 @@
+#!/bin/bash
+
+# HelpDot - Whenever an article is moved/renamed/deleted we should verify that
+# we have added a redirect link for it in redirects.csv. This ensures that we don't have broken links.
+
+declare -r RED='\033[0;31m'
+declare -r GREEN='\033[0;32m'
+declare -r NC='\033[0m'
+
+declare -r ARTICLES_DIRECTORY="docs/articles"
+declare -r REDIRECTS_FILE="docs/redirects.csv"
+
+hasRenamedOrDeletedArticle=false
+hasModifiedRedirect=false
+
+if git log origin/main..HEAD --name-status --pretty=format: $ARTICLES_DIRECTORY | grep -q -E "^(R|D)"
+then
+    echo "Articles have been renamed/moved/deleted"
+    hasRenamedOrDeletedArticle=true
+fi
+
+if git log origin/main..HEAD --name-status --pretty=format: $REDIRECTS_FILE | grep -q -E "^(M)"
+then
+    echo "Redirects.csv has been modified"
+    hasModifiedRedirect=true
+fi
+
+if [[ $hasRenamedOrDeletedArticle == true  && $hasModifiedRedirect == false ]]
+then
+    echo -e "${RED}Articles have been renamed or deleted. Please add a redirect link for the old article links in redirects.csv${NC}"
+    exit 1
+fi
+
+echo -e "${GREEN}Articles aren't moved or deleted, or a redirect has been added. Please verify that a redirect has been added for all the files moved or deleted${NC}"
+exit 0
diff --git a/.github/scripts/printPodspec.rb b/.github/scripts/printPodspec.rb
new file mode 100755
index 000000000000..80012edbc0aa
--- /dev/null
+++ b/.github/scripts/printPodspec.rb
@@ -0,0 +1,35 @@
+#!/usr/bin/env ruby
+
+# This file is a lightweight port of the `pod ipc spec` command.
+# It was built from scratch to imports some 3rd party functions before reading podspecs
+
+require 'cocoapods'
+require 'json'
+
+# Require 3rd party functions needed to parse podspecs. This code is copied from ios/Podfile
+def node_require(script)
+  # Resolve script with node to allow for hoisting
+  require Pod::Executable.execute_command('node', ['-p',
+    "require.resolve(
+      '#{script}',
+      {paths: [process.argv[1]]},
+    )", __dir__]).strip
+end
+node_require('react-native/scripts/react_native_pods.rb')
+node_require('react-native-permissions/scripts/setup.rb')
+
+# Configure pod in silent mode
+Pod::Config.instance.silent = true
+
+# Process command-line arguments
+podspec_files = ARGV
+
+# Validate each podspec file
+podspec_files.each do |podspec_file|
+  begin
+    spec = Pod::Specification.from_file(podspec_file)
+    puts(spec.to_pretty_json)
+  rescue => e
+    STDERR.puts "Failed to validate #{podspec_file}: #{e.message}"
+  end
+end
diff --git a/.github/scripts/removeInvalidJson.rb b/.github/scripts/removeInvalidJson.rb
new file mode 100755
index 000000000000..4cf2a40d4cc3
--- /dev/null
+++ b/.github/scripts/removeInvalidJson.rb
@@ -0,0 +1,15 @@
+#!/usr/bin/env ruby
+require 'json'
+
+# List of JSON strings
+json_strings = ARGV 
+
+# Parse each JSON string and remove any that couldn't be parsed
+valid_jsons = json_strings.select do |json_string|
+  begin
+    JSON.parse(json_string)
+    true
+  rescue JSON::ParserError
+    false
+  end
+end
diff --git a/.github/scripts/verifyActions.sh b/.github/scripts/verifyActions.sh
index ddc8fa0a3226..17316e1aac70 100755
--- a/.github/scripts/verifyActions.sh
+++ b/.github/scripts/verifyActions.sh
@@ -22,7 +22,7 @@ if [[ EXIT_CODE -eq 0 ]]; then
     echo -e "${GREEN}Github Actions are up to date!${NC}"
     exit 0
 else
-    echo -e "${RED}Error: Diff found when Github Actions were rebuilt. Did you forget to run \`npm run gh-actions-build\` after a clean install (\`rm -rf node_modules && npm i\`)? Do you need to merge main? Did you try running \`git config --global core.autocrlf false\` then \`npm run gh-actions-build\` again?${NC}"
+    echo -e "${RED}Error: Diff found when Github Actions were rebuilt. Did you forget to run \`npm run gh-actions-build\` after a clean install (\`rm -rf node_modules && npm i\`)? Do you need to merge main? Did you try running \`git config --global core.autocrlf false\` then \`npm run gh-actions-build\` again? Did you try running \`npx ncc cache clean\`?${NC}"
     echo "$DIFF_OUTPUT" | "$LIB_PATH/diff-so-fancy" | less --tabs=4 -RFX
     exit 1
 fi
diff --git a/.github/scripts/verifyPodfile.sh b/.github/scripts/verifyPodfile.sh
index cd94a49bb091..8f8534a4d54f 100755
--- a/.github/scripts/verifyPodfile.sh
+++ b/.github/scripts/verifyPodfile.sh
@@ -1,5 +1,7 @@
 #!/bin/bash
 
+set -e
+
 START_DIR=$(pwd)
 ROOT_DIR=$(dirname "$(dirname "$(dirname "${BASH_SOURCE[0]}")")")
 cd "$ROOT_DIR" || exit 1
@@ -8,7 +10,12 @@ source scripts/shellUtils.sh
 
 title "Verifying that Podfile.lock is synced with the project"
 
-declare EXIT_CODE=0
+# Cleanup and exit
+# param - status code
+function cleanupAndExit {
+  cd "$START_DIR" || exit 1
+  exit "$1"
+}
 
 # Check Provisioning Style. If automatic signing is enabled, iOS builds will fail, so ensure we always have the proper profile specified
 info "Verifying that automatic signing is not enabled"
@@ -16,7 +23,7 @@ if grep -q 'PROVISIONING_PROFILE_SPECIFIER = "(NewApp) AppStore"' ios/NewExpensi
   success "Automatic signing not enabled"
 else
   error "Error: Automatic provisioning style is not allowed!"
-  EXIT_CODE=1
+  cleanupAndExit 1
 fi
 
 PODFILE_SHA=$(openssl sha1 ios/Podfile | awk '{print $2}')
@@ -29,13 +36,13 @@ if [[ "$PODFILE_SHA" == "$PODFILE_LOCK_SHA" ]]; then
   success "Podfile checksum verified!"
 else
   error "Podfile.lock checksum mismatch. Did you forget to run \`npx pod-install\`?"
-  EXIT_CODE=1
+  cleanupAndExit 1
 fi
 
 info "Ensuring correct version of cocoapods is used..."
 
-POD_VERSION_REGEX='([[:digit:]]+\.[[:digit:]]+)(\.[[:digit:]]+)?';
-POD_VERSION_FROM_GEMFILE="$(sed -nr "s/gem \"cocoapods\", \"~> $POD_VERSION_REGEX\"/\1/p" Gemfile)"
+POD_VERSION_REGEX='([[:digit:]]+\.[[:digit:]]+\.[[:digit:]]+)?';
+POD_VERSION_FROM_GEMFILE="$(sed -nr "s/gem \"cocoapods\", \"= $POD_VERSION_REGEX\"/\1/p" Gemfile)"
 info "Pod version from Gemfile: $POD_VERSION_FROM_GEMFILE"
 
 POD_VERSION_FROM_PODFILE_LOCK="$(sed -nr "s/COCOAPODS: $POD_VERSION_REGEX/\1/p" ios/Podfile.lock)"
@@ -45,29 +52,39 @@ if [[ "$POD_VERSION_FROM_GEMFILE" == "$POD_VERSION_FROM_PODFILE_LOCK" ]]; then
   success "Cocoapods version from Podfile.lock matches cocoapods version from Gemfile"
 else
   error "Cocoapods version from Podfile.lock does not match cocoapods version from Gemfile. Please use \`npm run pod-install\` or \`bundle exec pod install\` instead of \`pod install\` to install pods."
-  EXIT_CODE=1
+  cleanupAndExit 1
 fi
 
 info "Comparing Podfile.lock with node packages..."
 
 # Retrieve a list of podspec directories as listed in the Podfile.lock
-SPEC_DIRS=$(yq '.["EXTERNAL SOURCES"].[].":path" | select( . == "*node_modules*")' < ios/Podfile.lock)
+if ! SPEC_DIRS=$(yq '.["EXTERNAL SOURCES"].[].":path" | select( . == "*node_modules*")' < ios/Podfile.lock); then
+  error "Error: Could not parse podspec directories from Podfile.lock"
+  cleanupAndExit 1
+fi
+
+# Retrieve a list of podspec paths from react-native config
+if ! read_lines_into_array PODSPEC_PATHS < <(npx react-native config | jq --raw-output '.dependencies[].platforms.ios.podspecPath | select ( . != null)'); then
+  error "Error: could not parse podspec paths from react-native config command"
+  cleanupAndExit 1
+fi
+
+PODSPECS=$(./.github/scripts/printPodspec.rb "${PODSPEC_PATHS[@]}")
 
 # Format a list of Pods based on the output of the config command
-FORMATTED_PODS=$( \
-  jq --raw-output --slurp 'map((.name + " (" + .version + ")")) | .[]' <<< "$( \
-    npx react-native config | \
-    jq '.dependencies[].platforms.ios.podspecPath | select( . != null )' | \
-    xargs -L 1 pod ipc spec --silent
-  )"
-)
+if ! FORMATTED_PODS=$( \
+  jq --raw-output --slurp 'map((.name + " (" + .version + ")")) | .[]' <<< "$(./.github/scripts/removeInvalidJson.rb "${PODSPECS}")" \
+); then
+  error "Error: could not parse podspecs at paths parsed from react-native config"
+  cleanupAndExit 1
+fi
 
 # Check for uncommitted package removals
 # If they are listed in Podfile.lock but the directories don't exist they have been removed
 while read -r DIR; do
   if [[ ! -d "${DIR#../}" ]]; then
     error "Directory \`${DIR#../node_modules/}\` not found in node_modules. Did you forget to run \`npx pod-install\` after removing the package?"
-    EXIT_CODE=1
+    cleanupAndExit 1
   fi
 done <<< "$SPEC_DIRS"
 
@@ -75,15 +92,9 @@ done <<< "$SPEC_DIRS"
 while read -r POD; do
   if ! grep -q "$POD" ./ios/Podfile.lock; then
     error "$POD not found in Podfile.lock. Did you forget to run \`npx pod-install\`?"
-    EXIT_CODE=1
+    cleanupAndExit 1
   fi
 done <<< "$FORMATTED_PODS"
 
-if [[ "$EXIT_CODE" == 0 ]]; then
-  success "Podfile.lock is up to date."
-fi
-
-# Cleanup
-cd "$START_DIR" || exit 1
-
-exit $EXIT_CODE
+success "Podfile.lock is up to date."
+cleanupAndExit 0
diff --git a/.github/scripts/verifyRedirect.sh b/.github/scripts/verifyRedirect.sh
index b8942cd5b23d..3d96ba17a799 100755
--- a/.github/scripts/verifyRedirect.sh
+++ b/.github/scripts/verifyRedirect.sh
@@ -3,7 +3,10 @@
 # HelpDot - Verifies that redirects.csv does not have any duplicates
 # Duplicate sourceURLs break redirection on cloudflare pages
 
+source scripts/shellUtils.sh
+
 declare -r REDIRECTS_FILE="docs/redirects.csv"
+declare -a ITEMS_TO_ADD
 
 declare -r RED='\033[0;31m'
 declare -r GREEN='\033[0;32m'
@@ -22,5 +25,44 @@ if [[ DETECT_CYCLE_EXIT_CODE -eq 1 ]]; then
     exit 1
 fi
 
+while read -r line; do
+    # Split each line of the file into a source and destination so we can sanity check
+    # and compare against the current list.
+    read -r -a LINE_PARTS < <(echo "$line" | tr ',' ' ')
+    SOURCE_URL=${LINE_PARTS[0]}
+    DEST_URL=${LINE_PARTS[1]}
+
+    # Make sure the format of the line is as expected.
+    if [[ "${#LINE_PARTS[@]}" -gt 2 ]]; then
+        error "Found a line with more than one comma: $line"
+        exit 1
+    fi
+
+    # Basic sanity checking to make sure that the source and destination are in expected
+    # subdomains.
+    if ! [[ $SOURCE_URL =~ ^https://(community|help)\.expensify\.com ]] || [[ $SOURCE_URL =~ \# ]]; then
+    error "Found source URL that is not a communityDot or helpDot URL, or contains a '#': $SOURCE_URL"
+    exit 1
+fi
+
+    if ! [[ $DEST_URL =~ ^https://(help|use|integrations)\.expensify\.com|^https://www\.expensify\.org ]]; then
+        error "Found destination URL that is not a supported URL: $DEST_URL"
+        exit 1
+    fi
+
+    info "Source: $SOURCE_URL and destination: $DEST_URL appear to be formatted correctly."
+
+    ITEMS_TO_ADD+=("$line")
+
+# This line skips the first line in the csv because the first line is a header row.
+done <<< "$(tail +2 $REDIRECTS_FILE)"
+
+# Sanity check that we should actually be running this and we aren't about to delete
+# every single redirect.
+if [[ "${#ITEMS_TO_ADD[@]}" -lt 1 ]]; then
+    error "No items found to add, why are we running?"
+    exit 1
+fi
+
 echo -e "${GREEN}The redirects.csv is valid!${NC}"
 exit 0
diff --git a/.github/workflows/cherryPick.yml b/.github/workflows/cherryPick.yml
index dd2c92e95568..1772d5d309cc 100644
--- a/.github/workflows/cherryPick.yml
+++ b/.github/workflows/cherryPick.yml
@@ -82,7 +82,6 @@ jobs:
         id: cherryPick
         run: |
           echo "Attempting to cherry-pick ${{ steps.getCPMergeCommit.outputs.MERGE_COMMIT_SHA }}"
-          git config user.name ${{ github.actor }}
           if git cherry-pick -S -x --mainline 1 ${{ steps.getCPMergeCommit.outputs.MERGE_COMMIT_SHA }}; then
             echo "🎉 No conflicts! CP was a success, PR can be automerged 🎉"
             echo "HAS_CONFLICTS=false" >> "$GITHUB_OUTPUT"
@@ -93,7 +92,7 @@ jobs:
             GIT_MERGE_AUTOEDIT=no git cherry-pick --continue
             echo "HAS_CONFLICTS=true" >> "$GITHUB_OUTPUT"
           fi
-          git config user.name OSBotify
+          git commit --amend -m "$(git log -1 --pretty=%B)" -m "(CP triggered by ${{ github.actor }})"
 
       - name: Push changes
         run: |
@@ -122,6 +121,11 @@ jobs:
         env:
           GITHUB_TOKEN: ${{ steps.setupGitForOSBotify.outputs.OS_BOTIFY_API_TOKEN }}
 
+      - name: Label PR with CP Staging
+        run: gh pr edit ${{ inputs.PULL_REQUEST_NUMBER }} --add-label 'CP Staging'
+        env:
+          GITHUB_TOKEN: ${{ github.token }}
+
       - name: "Announces a CP failure in the #announce Slack room"
         uses: 8398a7/action-slack@v3
         if: ${{ failure() }}
diff --git a/.github/workflows/createNewVersion.yml b/.github/workflows/createNewVersion.yml
index 653495b5a01a..ca9a128e848d 100644
--- a/.github/workflows/createNewVersion.yml
+++ b/.github/workflows/createNewVersion.yml
@@ -55,7 +55,7 @@ jobs:
 
     steps:
       - name: Run turnstyle
-        uses: softprops/turnstyle@ca99add00ff0c9cbc697d22631d2992f377e5bd5
+        uses: softprops/turnstyle@49108bdfa571e62371bd2c3094893c547ab3fc03
         with:
           poll-interval-seconds: 10
         env:
diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
index 63148f9e4eb5..e61307beef50 100644
--- a/.github/workflows/deploy.yml
+++ b/.github/workflows/deploy.yml
@@ -14,7 +14,7 @@ jobs:
         with:
           ref: staging
           token: ${{ secrets.OS_BOTIFY_TOKEN }}
-          
+
       - name: Setup git for OSBotify
         uses: ./.github/actions/composite/setupGitForOSBotifyApp
         id: setupGitForOSBotify
@@ -23,11 +23,31 @@ jobs:
           OS_BOTIFY_APP_ID: ${{ secrets.OS_BOTIFY_APP_ID }}
           OS_BOTIFY_PRIVATE_KEY: ${{ secrets.OS_BOTIFY_PRIVATE_KEY }}
 
-      - name: Tag version
-        run: git tag "$(npm run print-version --silent)"
+      - name: Get current app version
+        run: echo "STAGING_VERSION=$(npm run print-version --silent)" >> "$GITHUB_ENV"
+
+      - name: 🚀 Create prerelease to trigger staging deploy 🚀
+        run: gh release create ${{ env.STAGING_VERSION }} --title ${{ env.STAGING_VERSION }} --generate-notes --prerelease --target staging
+        env:
+          GITHUB_TOKEN: ${{ steps.setupGitForOSBotify.outputs.OS_BOTIFY_API_TOKEN }}
 
-      - name: 🚀 Push tags to trigger staging deploy 🚀
-        run: git push --tags
+      - name: Warn deployers if staging deploy failed
+        if: ${{ failure() }}
+        uses: 8398a7/action-slack@v3
+        with:
+          status: custom
+          custom_payload: |
+            {
+              channel: '#deployer',
+              attachments: [{
+                color: "#DB4545",
+                pretext: `<!subteam^S4TJJ3PSL>`,
+                text: `💥 NewDot staging deploy failed. 💥`,
+              }]
+            }
+        env:
+          GITHUB_TOKEN: ${{ github.token }}
+          SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK }}
 
   deployProduction:
     runs-on: ubuntu-latest
@@ -50,24 +70,25 @@ jobs:
       - name: Get current app version
         run: echo "PRODUCTION_VERSION=$(npm run print-version --silent)" >> "$GITHUB_ENV"
 
-      - name: Get Release Pull Request List
-        id: getReleasePRList
-        uses: ./.github/actions/javascript/getDeployPullRequestList
-        with:
-          TAG: ${{ env.PRODUCTION_VERSION }}
+      - name: 🚀 Edit the release to be no longer a prerelease to deploy production 🚀
+        run: gh release edit ${{ env.PRODUCTION_VERSION }} --prerelease=false --latest
+        env:
           GITHUB_TOKEN: ${{ steps.setupGitForOSBotify.outputs.OS_BOTIFY_API_TOKEN }}
-          IS_PRODUCTION_DEPLOY: true
 
-      - name: Generate Release Body
-        id: getReleaseBody
-        uses: ./.github/actions/javascript/getReleaseBody
+      - name: Warn deployers if production deploy failed
+        if: ${{ failure() }}
+        uses: 8398a7/action-slack@v3
         with:
-          PR_LIST: ${{ steps.getReleasePRList.outputs.PR_LIST }}
-
-      - name: 🚀 Create release to trigger production deploy 🚀
-        uses: softprops/action-gh-release@affa18ef97bc9db20076945705aba8c516139abd
-        with:
-          tag_name: ${{ env.PRODUCTION_VERSION }}
-          body: ${{ steps.getReleaseBody.outputs.RELEASE_BODY }}
+          status: custom
+          custom_payload: |
+            {
+              channel: '#deployer',
+              attachments: [{
+                color: "#DB4545",
+                pretext: `<!subteam^S4TJJ3PSL>`,
+                text: `💥 NewDot production deploy failed. 💥`,
+              }]
+            }
         env:
-          GITHUB_TOKEN: ${{ steps.setupGitForOSBotify.outputs.OS_BOTIFY_API_TOKEN }}
+          GITHUB_TOKEN: ${{ github.token }}
+          SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK }}
diff --git a/.github/workflows/deployBlocker.yml b/.github/workflows/deployBlocker.yml
index cb5dc6d28b32..47df9b4285b9 100644
--- a/.github/workflows/deployBlocker.yml
+++ b/.github/workflows/deployBlocker.yml
@@ -39,7 +39,7 @@ jobs:
               channel: '#expensify-open-source',
               attachments: [{
                 color: "#DB4545",
-                text: '💥 We have found a New Expensify Deploy Blocker, if you have any idea which PR could be causing this, please comment in the issue: <${{ github.event.issue.html_url }}|${{ env.GH_ISSUE_TITLE }}>'
+                text: '💥 New Deploy Blocker: <${{ github.event.issue.html_url }}|${{ env.GH_ISSUE_TITLE }}>. If you have any idea which PR could be causing this, please comment in the issue.'
               }]
             }
         env:
diff --git a/.github/workflows/deployExpensifyHelp.yml b/.github/workflows/deployExpensifyHelp.yml
index cda33d39102e..8a6237832340 100644
--- a/.github/workflows/deployExpensifyHelp.yml
+++ b/.github/workflows/deployExpensifyHelp.yml
@@ -29,9 +29,12 @@ jobs:
     env:
       IS_PR_FROM_FORK: ${{ github.event_name == 'pull_request' && github.event.pull_request.head.repo.fork }}
     runs-on: ubuntu-latest
+    continue-on-error: true
     steps:
       - name: Checkout
         uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
 
       - name: Setup NodeJS
         uses: ./.github/actions/composite/setupNode
@@ -42,6 +45,9 @@ jobs:
       - name: Check for duplicates and cycles in redirects.csv
         run: ./.github/scripts/verifyRedirect.sh
 
+      - name: Enforce that a redirect link has been created
+        run: ./.github/scripts/enforceRedirect.sh
+
       - name: Build with Jekyll
         uses: actions/jekyll-build-pages@0143c158f4fa0c5dcd99499a5d00859d79f70b0e
         with:
diff --git a/.github/workflows/e2ePerformanceTests.yml b/.github/workflows/e2ePerformanceTests.yml
index 10723d5efa04..e57556143978 100644
--- a/.github/workflows/e2ePerformanceTests.yml
+++ b/.github/workflows/e2ePerformanceTests.yml
@@ -15,6 +15,10 @@ on:
         type: string
         required: true
 
+concurrency:
+  group: ${{ github.ref == 'refs/heads/main' && format('{0}-{1}', github.ref, github.sha) || github.ref }}-e2e
+  cancel-in-progress: true
+
 jobs:
   buildBaseline:
     runs-on: ubuntu-latest-xl
@@ -64,6 +68,7 @@ jobs:
           EXPENSIFY_PARTNER_USER_ID: ${{ secrets.EXPENSIFY_PARTNER_USER_ID }}
           EXPENSIFY_PARTNER_USER_SECRET: ${{ secrets.EXPENSIFY_PARTNER_USER_SECRET }}
           EXPENSIFY_PARTNER_PASSWORD_EMAIL: ${{ secrets.EXPENSIFY_PARTNER_PASSWORD_EMAIL }}
+          SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK }}
           PATH_ENV_FILE: tests/e2e/.env.e2e
 
   buildDelta:
@@ -133,6 +138,7 @@ jobs:
           EXPENSIFY_PARTNER_USER_ID: ${{ secrets.EXPENSIFY_PARTNER_USER_ID }}
           EXPENSIFY_PARTNER_USER_SECRET: ${{ secrets.EXPENSIFY_PARTNER_USER_SECRET }}
           EXPENSIFY_PARTNER_PASSWORD_EMAIL: ${{ secrets.EXPENSIFY_PARTNER_PASSWORD_EMAIL }}
+          SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK }}
           PATH_ENV_FILE: tests/e2e/.env.e2edelta
 
   runTestsInAWS:
@@ -152,7 +158,7 @@ jobs:
         run: mkdir zip
 
       - name: Download baseline APK
-        uses: actions/download-artifact@348754975ef0295bfa2c111cba996120cfdf8a5d
+        uses: actions/download-artifact@v4
         id: downloadBaselineAPK
         with:
           name: baseline-apk-${{ needs.buildBaseline.outputs.VERSION }}
@@ -166,7 +172,7 @@ jobs:
         run: mv "${{steps.downloadBaselineAPK.outputs.download-path}}/app-e2e-release.apk" "${{steps.downloadBaselineAPK.outputs.download-path}}/app-e2eRelease.apk"
 
       - name: Download delta APK
-        uses: actions/download-artifact@348754975ef0295bfa2c111cba996120cfdf8a5d
+        uses: actions/download-artifact@v4
         id: downloadDeltaAPK
         with:
           name: delta-apk-${{ needs.buildDelta.outputs.DELTA_REF }}
@@ -181,6 +187,9 @@ jobs:
       - name: Copy e2e code into zip folder
         run: cp tests/e2e/dist/index.js zip/testRunner.ts
 
+      - name: Copy profiler binaries into zip folder
+        run: cp -r node_modules/@perf-profiler/android/cpp-profiler/bin zip/bin
+
       - name: Zip everything in the zip directory up
         run: zip -qr App.zip ./zip
 
@@ -232,7 +241,7 @@ jobs:
               channel: '#e2e-announce',
               attachments: [{
                 color: 'danger',
-                text: `💥 ${process.env.AS_REPO} E2E Test run failed failed on <https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }}|${{ github.workflow }}> workflow 💥`,
+                text: `💥 ${process.env.AS_REPO} E2E Test run failed on <https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }}|${{ github.workflow }}> workflow 💥`,
               }]
             }
         env:
@@ -250,12 +259,12 @@ jobs:
       - name: Check if test failed, if so post the results and add the DeployBlocker label
         id: checkIfRegressionDetected
         run: |
-          if grep -q '🔴' ./output.md; then
+          if grep -q '🔴' "./Host_Machine_Files/\$WORKING_DIRECTORY/output.md"; then
             # Create an output to the GH action that the test failed:
             echo "performanceRegressionDetected=true" >> "$GITHUB_OUTPUT"
 
             gh pr edit ${{ inputs.PR_NUMBER }} --add-label DeployBlockerCash
-            gh pr comment ${{ inputs.PR_NUMBER }} -F ./output.md
+            gh pr comment ${{ inputs.PR_NUMBER }} -F "./Host_Machine_Files/\$WORKING_DIRECTORY/output.md"
             gh pr comment ${{ inputs.PR_NUMBER }} -b "@Expensify/mobile-deployers 📣 Please look into this performance regression as it's a deploy blocker."
           else
             echo "performanceRegressionDetected=false" >> "$GITHUB_OUTPUT"
@@ -271,7 +280,7 @@ jobs:
           status: custom
           custom_payload: |
             {
-              channel: '#newdot-performance',
+              channel: '#newdot-quality',
               attachments: [{
                 color: 'danger',
                 text: `🔴 Performance regression detected in PR ${{ inputs.PR_NUMBER }}\nDetected in <https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }}|${{ github.workflow }}> workflow.`,
diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
index 50e886942c98..da7757fcbfa8 100644
--- a/.github/workflows/lint.yml
+++ b/.github/workflows/lint.yml
@@ -8,7 +8,7 @@ on:
     paths: ['**.js', '**.ts', '**.tsx', '**.json', '**.mjs', '**.cjs', 'config/.editorconfig', '.watchmanconfig', '.imgbotconfig']
 
 concurrency:
-  group: "${{ github.ref }}-lint"
+  group: ${{ github.ref == 'refs/heads/main' && format('{0}-{1}', github.ref, github.sha) || github.ref }}-lint
   cancel-in-progress: true
 
 jobs:
diff --git a/.github/workflows/platformDeploy.yml b/.github/workflows/platformDeploy.yml
index 353a898a941f..90d81ada23c6 100644
--- a/.github/workflows/platformDeploy.yml
+++ b/.github/workflows/platformDeploy.yml
@@ -1,18 +1,15 @@
 name: Build and deploy android, desktop, iOS, and web clients
 
-# This workflow is run when any tag is published
+# This workflow is run when a release or prerelease is created
 on:
-  push:
-    tags:
-      - '*'
   release:
-    types: [created]
+    types: [prereleased, released]
 
 env:
-  SHOULD_DEPLOY_PRODUCTION: ${{ github.event_name == 'release' }}
+  SHOULD_DEPLOY_PRODUCTION: ${{ github.event.action == 'released' }}
 
 concurrency:
-  group: ${{ github.workflow }}-${{ github.event_name }}
+  group: ${{ github.workflow }}-${{ github.event.action }}
   cancel-in-progress: true
 
 jobs:
@@ -36,11 +33,12 @@ jobs:
   deployChecklist:
     name: Create or update deploy checklist
     uses: ./.github/workflows/createDeployChecklist.yml
-    if: ${{ github.event_name != 'release' }}
+    if: ${{ github.event.action != 'released' }}
     needs: validateActor
     secrets: inherit
 
   android:
+    # WARNING: getDeployPullRequestList depends on this job name. do not change job name without adjusting that action accordingly
     name: Build and deploy Android
     needs: validateActor
     if: ${{ fromJSON(needs.validateActor.outputs.IS_DEPLOYER) }}
@@ -62,7 +60,7 @@ jobs:
           java-version: '17'
 
       - name: Setup Ruby
-        uses: ruby/setup-ruby@a05e47355e80e57b9a67566a813648fa67d92011
+        uses: ruby/setup-ruby@v1.187.0
         with:
           ruby-version: '2.7'
           bundler-cache: true
@@ -80,37 +78,31 @@ jobs:
       - name: Set version in ENV
         run: echo "VERSION_CODE=$(grep -o 'versionCode\s\+[0-9]\+' android/app/build.gradle | awk '{ print $2 }')" >> "$GITHUB_ENV"
 
-      - name: Run Fastlane beta
-        if: ${{ !fromJSON(env.SHOULD_DEPLOY_PRODUCTION) }}
-        run: bundle exec fastlane android beta
+      - name: Run Fastlane
+        run: bundle exec fastlane android ${{ fromJSON(env.SHOULD_DEPLOY_PRODUCTION) && 'production' || 'beta' }}
         env:
+          RUBYOPT: '-rostruct'
           MYAPP_UPLOAD_STORE_PASSWORD: ${{ secrets.MYAPP_UPLOAD_STORE_PASSWORD }}
           MYAPP_UPLOAD_KEY_PASSWORD: ${{ secrets.MYAPP_UPLOAD_KEY_PASSWORD }}
-
-      - name: Run Fastlane production
-        if: ${{ fromJSON(env.SHOULD_DEPLOY_PRODUCTION) }}
-        run: bundle exec fastlane android production
-        env:
           VERSION: ${{ env.VERSION_CODE }}
 
-      - name: Archive Android sourcemaps
-        uses: actions/upload-artifact@v3
-        with:
-          name: android-sourcemap
-          path: android/app/build/generated/sourcemaps/react/release/*.map
+      - name: Upload Android build to Browser Stack
+        if: ${{ !fromJSON(env.SHOULD_DEPLOY_PRODUCTION) }}
+        run: curl -u "$BROWSERSTACK" -X POST "https://api-cloud.browserstack.com/app-live/upload" -F "file=@./android/app/build/outputs/bundle/productionRelease/app-production-release.aab"
+        env:
+          BROWSERSTACK: ${{ secrets.BROWSERSTACK }}
 
-      - name: Upload Android version to GitHub artifacts
+      - name: Upload Android sourcemaps to GitHub Release
         if: ${{ !fromJSON(env.SHOULD_DEPLOY_PRODUCTION) }}
-        uses: actions/upload-artifact@v3
-        with:
-          name: app-production-release.aab
-          path: android/app/build/outputs/bundle/productionRelease/app-production-release.aab
+        run: gh release upload ${{ github.event.release.tag_name }} android/app/build/generated/sourcemaps/react/productionRelease/index.android.bundle.map#android-sourcemap-${{ github.event.release.tag_name }}
+        env:
+          GITHUB_TOKEN: ${{ github.token }}
 
-      - name: Upload Android version to Browser Stack
+      - name: Upload Android build to GitHub Release
         if: ${{ !fromJSON(env.SHOULD_DEPLOY_PRODUCTION) }}
-        run: curl -u "$BROWSERSTACK" -X POST "https://api-cloud.browserstack.com/app-live/upload" -F "file=@./android/app/build/outputs/bundle/productionRelease/app-production-release.aab"
+        run: gh release upload ${{ github.event.release.tag_name }} android/app/build/outputs/bundle/productionRelease/app-production-release.aab
         env:
-          BROWSERSTACK: ${{ secrets.BROWSERSTACK }}
+          GITHUB_TOKEN: ${{ github.token }}
 
       - name: Warn deployers if Android production deploy failed
         if: ${{ failure() && fromJSON(env.SHOULD_DEPLOY_PRODUCTION) }}
@@ -131,10 +123,11 @@ jobs:
           SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK }}
 
   desktop:
+    # WARNING: getDeployPullRequestList depends on this job name. do not change job name without adjusting that action accordingly
     name: Build and deploy Desktop
     needs: validateActor
     if: ${{ fromJSON(needs.validateActor.outputs.IS_DEPLOYER) }}
-    runs-on: macos-13-large
+    runs-on: macos-14-large
     steps:
       - name: Checkout
         uses: actions/checkout@v4
@@ -147,9 +140,13 @@ jobs:
         env:
           DEVELOPER_ID_SECRET_PASSPHRASE: ${{ secrets.DEVELOPER_ID_SECRET_PASSPHRASE }}
 
-      - name: Build production desktop app
-        if: ${{ fromJSON(env.SHOULD_DEPLOY_PRODUCTION) }}
-        run: npm run desktop-build
+      - name: Build desktop app
+        run: |
+          if [[ ${{ env.SHOULD_DEPLOY_PRODUCTION }} == 'true' ]]; then
+            npm run desktop-build
+          else
+            npm run desktop-build-staging
+          fi
         env:
           CSC_LINK: ${{ secrets.CSC_LINK }}
           CSC_KEY_PASSWORD: ${{ secrets.CSC_KEY_PASSWORD }}
@@ -159,25 +156,23 @@ jobs:
           AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
           GCP_GEOLOCATION_API_KEY: $${{ secrets.GCP_GEOLOCATION_API_KEY_PRODUCTION }}
 
+      - name: Upload desktop sourcemaps to GitHub Release
+        run: gh release upload ${{ github.event.release.tag_name }} desktop/dist/www/merged-source-map.js.map#desktop-sourcemap-${{ github.event.release.tag_name }} --clobber
+        env:
+          GITHUB_TOKEN: ${{ github.token }}
 
-      - name: Build staging desktop app
-        if: ${{ !fromJSON(env.SHOULD_DEPLOY_PRODUCTION) }}
-        run: npm run desktop-build-staging
+      - name: Upload desktop build to GitHub Release
+        run: gh release upload ${{ github.event.release.tag_name }} desktop-build/NewExpensify.dmg --clobber
         env:
-          CSC_LINK: ${{ secrets.CSC_LINK }}
-          CSC_KEY_PASSWORD: ${{ secrets.CSC_KEY_PASSWORD }}
-          APPLE_ID: ${{ secrets.APPLE_ID }}
-          APPLE_APP_SPECIFIC_PASSWORD: ${{ secrets.APPLE_ID_PASSWORD }}
-          AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
-          AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
-          GCP_GEOLOCATION_API_KEY: $${{ secrets.GCP_GEOLOCATION_API_KEY_STAGING }}
+          GITHUB_TOKEN: ${{ github.token }}
 
   iOS:
+    # WARNING: getDeployPullRequestList depends on this job name. do not change job name without adjusting that action accordingly
     name: Build and deploy iOS
     needs: validateActor
     if: ${{ fromJSON(needs.validateActor.outputs.IS_DEPLOYER) }}
     env:
-      DEVELOPER_DIR: /Applications/Xcode_15.0.1.app/Contents/Developer
+      DEVELOPER_DIR: /Applications/Xcode_15.2.0.app/Contents/Developer
     runs-on: macos-13-xlarge
     steps:
       - name: Checkout
@@ -191,7 +186,7 @@ jobs:
         uses: ./.github/actions/composite/setupNode
 
       - name: Setup Ruby
-        uses: ruby/setup-ruby@a05e47355e80e57b9a67566a813648fa67d92011
+        uses: ruby/setup-ruby@v1.187.0
         with:
           ruby-version: '2.7'
           bundler-cache: true
@@ -202,19 +197,18 @@ jobs:
         with:
           path: ios/Pods
           key: ${{ runner.os }}-pods-cache-${{ hashFiles('ios/Podfile.lock', 'firebase.json') }}
-          restore-keys: ${{ runner.os }}-pods-cache-
 
       - name: Compare Podfile.lock and Manifest.lock
         id: compare-podfile-and-manifest
         run: echo "IS_PODFILE_SAME_AS_MANIFEST=${{ hashFiles('ios/Podfile.lock') == hashFiles('ios/Pods/Manifest.lock') }}" >> "$GITHUB_OUTPUT"
 
       - name: Install cocoapods
-        uses: nick-invision/retry@0711ba3d7808574133d713a0d92d2941be03a350
+        uses: nick-fields/retry@3f757583fb1b1f940bc8ef4bf4734c8dc02a5847
         if: steps.pods-cache.outputs.cache-hit != 'true' || steps.compare-podfile-and-manifest.outputs.IS_PODFILE_SAME_AS_MANIFEST != 'true' || steps.setup-node.outputs.cache-hit != 'true'
         with:
           timeout_minutes: 10
           max_attempts: 5
-          command: cd ios && bundle exec pod install
+          command: scripts/pod-install.sh
 
       - name: Decrypt AppStore profile
         run: cd ios && gpg --quiet --batch --yes --decrypt --passphrase="$LARGE_SECRET_PASSPHRASE" --output NewApp_AppStore.mobileprovision NewApp_AppStore.mobileprovision.gpg
@@ -236,43 +230,35 @@ jobs:
         env:
           LARGE_SECRET_PASSPHRASE: ${{ secrets.LARGE_SECRET_PASSPHRASE }}
 
+      - name: Set iOS version in ENV
+        run: echo "IOS_VERSION=$(echo '${{ github.event.release.tag_name }}' | tr '-' '.')" >> "$GITHUB_ENV"
+
       - name: Run Fastlane
-        if: ${{ !fromJSON(env.SHOULD_DEPLOY_PRODUCTION) }}
-        run: bundle exec fastlane ios beta
+        run: bundle exec fastlane ios ${{ fromJSON(env.SHOULD_DEPLOY_PRODUCTION) && 'production' || 'beta' }}
         env:
           APPLE_CONTACT_EMAIL: ${{ secrets.APPLE_CONTACT_EMAIL }}
           APPLE_CONTACT_PHONE: ${{ secrets.APPLE_CONTACT_PHONE }}
           APPLE_DEMO_EMAIL: ${{ secrets.APPLE_DEMO_EMAIL }}
           APPLE_DEMO_PASSWORD: ${{ secrets.APPLE_DEMO_PASSWORD }}
+          VERSION: ${{ env.IOS_VERSION }}
 
-      - name: Archive iOS sourcemaps
-        uses: actions/upload-artifact@v3
-        with:
-          name: ios-sourcemap
-          path: main.jsbundle.map
-
-      - name: Upload iOS version to GitHub artifacts
-        if: ${{ !fromJSON(env.SHOULD_DEPLOY_PRODUCTION) }}
-        uses: actions/upload-artifact@v3
-        with:
-          name: New Expensify.ipa
-          path: /Users/runner/work/App/App/New Expensify.ipa
-
-      - name: Upload iOS version to Browser Stack
+      - name: Upload iOS build to Browser Stack
         if: ${{ !fromJSON(env.SHOULD_DEPLOY_PRODUCTION) }}
         run: curl -u "$BROWSERSTACK" -X POST "https://api-cloud.browserstack.com/app-live/upload" -F "file=@/Users/runner/work/App/App/New Expensify.ipa"
         env:
           BROWSERSTACK: ${{ secrets.BROWSERSTACK }}
 
-      - name: Set iOS version in ENV
-        if: ${{ fromJSON(env.SHOULD_DEPLOY_PRODUCTION) }}
-        run: echo "IOS_VERSION=$(echo '${{ github.event.release.tag_name }}' | tr '-' '.')" >> "$GITHUB_ENV"
+      - name: Upload iOS sourcemaps to GitHub Release
+        if: ${{ !fromJSON(env.SHOULD_DEPLOY_PRODUCTION) }}
+        run: gh release upload ${{ github.event.release.tag_name }} main.jsbundle.map#ios-sourcemap-${{ github.event.release.tag_name }}
+        env:
+          GITHUB_TOKEN: ${{ github.token }}
 
-      - name: Run Fastlane for App Store release
-        if: ${{ fromJSON(env.SHOULD_DEPLOY_PRODUCTION) }}
-        run: bundle exec fastlane ios production
+      - name: Upload iOS build to GitHub Release
+        if:  ${{ !fromJSON(env.SHOULD_DEPLOY_PRODUCTION) }}
+        run: gh release upload ${{ github.event.release.tag_name }} /Users/runner/work/App/App/New\ Expensify.ipa
         env:
-          VERSION: ${{ env.IOS_VERSION }}
+          GITHUB_TOKEN: ${{ github.token }}
 
       - name: Warn deployers if iOS production deploy failed
         if: ${{ failure() && fromJSON(env.SHOULD_DEPLOY_PRODUCTION) }}
@@ -293,6 +279,7 @@ jobs:
           SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK }}
 
   web:
+    # WARNING: getDeployPullRequestList depends on this job name. do not change job name without adjusting that action accordingly
     name: Build and deploy Web
     needs: validateActor
     if: ${{ fromJSON(needs.validateActor.outputs.IS_DEPLOYER) }}
@@ -314,43 +301,68 @@ jobs:
           aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
           aws-region: us-east-1
 
-      - name: Build web for production
-        if: ${{ fromJSON(env.SHOULD_DEPLOY_PRODUCTION) }}
-        run: npm run build
-
-      - name: Build web for staging
-        if: ${{ !fromJSON(env.SHOULD_DEPLOY_PRODUCTION) }}
-        run: npm run build-staging
+      - name: Build web
+        run: |
+          if [[ ${{ env.SHOULD_DEPLOY_PRODUCTION }} == 'true' ]]; then
+            npm run build
+          else
+            npm run build-staging
+          fi
 
-      - name: Build storybook docs for production
-        if: ${{ fromJSON(env.SHOULD_DEPLOY_PRODUCTION) }}
-        run: npm run storybook-build
+      - name: Build storybook docs
         continue-on-error: true
+        run: |
+          if [[ ${{ env.SHOULD_DEPLOY_PRODUCTION }} == 'true' ]]; then
+            npm run storybook-build
+          else
+            npm run storybook-build-staging
+          fi
 
-      - name: Build storybook docs for staging
-        if: ${{ !fromJSON(env.SHOULD_DEPLOY_PRODUCTION) }}
-        run: npm run storybook-build-staging
-        continue-on-error: true
+      - name: Deploy to S3
+        run: |
+          aws s3 cp --recursive --acl public-read "$GITHUB_WORKSPACE"/dist ${{ env.S3_URL }}/
+          aws s3 cp --acl public-read --content-type 'application/json' --metadata-directive REPLACE ${{ env.S3_URL }}/.well-known/apple-app-site-association ${{ env.S3_URL }}/.well-known/apple-app-site-association
+          aws s3 cp --acl public-read --content-type 'application/json' --metadata-directive REPLACE ${{ env.S3_URL }}/.well-known/apple-app-site-association ${{env.S3_URL }}/apple-app-site-association
+        env:
+          S3_URL: s3://${{ env.SHOULD_DEPLOY_PRODUCTION != 'true' && 'staging-' || '' }}expensify-cash
 
-      - name: Deploy production to S3
-        if: ${{ fromJSON(env.SHOULD_DEPLOY_PRODUCTION) }}
-        run: aws s3 cp --recursive --acl public-read "$GITHUB_WORKSPACE"/dist s3://expensify-cash/ && aws s3 cp --acl public-read --content-type 'application/json' --metadata-directive REPLACE s3://expensify-cash/.well-known/apple-app-site-association s3://expensify-cash/.well-known/apple-app-site-association && aws s3 cp --acl public-read --content-type 'application/json' --metadata-directive REPLACE s3://expensify-cash/.well-known/apple-app-site-association s3://expensify-cash/apple-app-site-association
+      - name: Purge Cloudflare cache
+        run: /home/runner/.local/bin/cli4 --verbose --delete hosts=["${{ env.SHOULD_DEPLOY_PRODUCTION != 'true' && 'staging.' || '' }}new.expensify.com"] /zones/:9ee042e6cfc7fd45e74aa7d2f78d617b/purge_cache
+        env:
+          CF_API_KEY: ${{ secrets.CLOUDFLARE_TOKEN }}
 
-      - name: Deploy staging to S3
+      - name: Verify staging deploy
         if: ${{ !fromJSON(env.SHOULD_DEPLOY_PRODUCTION) }}
-        run: aws s3 cp --recursive --acl public-read "$GITHUB_WORKSPACE"/dist s3://staging-expensify-cash/ && aws s3 cp --acl public-read --content-type 'application/json' --metadata-directive REPLACE s3://staging-expensify-cash/.well-known/apple-app-site-association s3://staging-expensify-cash/.well-known/apple-app-site-association && aws s3 cp --acl public-read --content-type 'application/json' --metadata-directive REPLACE s3://staging-expensify-cash/.well-known/apple-app-site-association s3://staging-expensify-cash/apple-app-site-association
+        run: |
+          sleep 5
+          DOWNLOADED_VERSION="$(wget -q -O /dev/stdout https://staging.new.expensify.com/version.json | jq -r '.version')"
+          if [[ '${{ github.event.release.tag_name }}' != "$DOWNLOADED_VERSION" ]]; then
+            echo "Error: deployed version $DOWNLOADED_VERSION does not match local version ${{ github.event.release.tag_name }}. Something went wrong..."
+            exit 1
+          fi
 
-      - name: Purge production Cloudflare cache
+      - name: Verify production deploy
         if: ${{ fromJSON(env.SHOULD_DEPLOY_PRODUCTION) }}
-        run: /home/runner/.local/bin/cli4 --verbose --delete hosts=["new.expensify.com"] /zones/:9ee042e6cfc7fd45e74aa7d2f78d617b/purge_cache
+        run: |
+          sleep 5
+          DOWNLOADED_VERSION="$(wget -q -O /dev/stdout https://new.expensify.com/version.json | jq -r '.version')"
+          if [[ '${{ github.event.release.tag_name }}' != "$DOWNLOADED_VERSION" ]]; then
+            echo "Error: deployed version $DOWNLOADED_VERSION does not match local version ${{ github.event.release.tag_name }}. Something went wrong..."
+            exit 1
+          fi
+
+      - name: Upload web sourcemaps to GitHub Release
+        run: gh release upload ${{ github.event.release.tag_name }} dist/merged-source-map.js.map#web-sourcemap-${{ github.event.release.tag_name }} --clobber
         env:
-          CF_API_KEY: ${{ secrets.CLOUDFLARE_TOKEN }}
+          GITHUB_TOKEN: ${{ github.token }}
 
-      - name: Purge staging Cloudflare cache
-        if: ${{ !fromJSON(env.SHOULD_DEPLOY_PRODUCTION) }}
-        run: /home/runner/.local/bin/cli4 --verbose --delete hosts=["staging.new.expensify.com"] /zones/:9ee042e6cfc7fd45e74aa7d2f78d617b/purge_cache
+      - name: Upload web build to GitHub Release
+        run: |
+          tar -czvf webBuild.tar.gz dist
+          zip -r webBuild.zip dist
+          gh release upload ${{ github.event.release.tag_name }} webBuild.tar.gz webBuild.zip --clobber
         env:
-          CF_API_KEY: ${{ secrets.CLOUDFLARE_TOKEN }}
+          GITHUB_TOKEN: ${{ github.token }}
 
   postSlackMessageOnFailure:
     name: Post a Slack message when any platform fails to build or deploy
@@ -366,6 +378,20 @@ jobs:
         with:
           SLACK_WEBHOOK: ${{ secrets.SLACK_WEBHOOK }}
 
+  # Build a version of iOS and Android HybridApp if we are deploying to staging
+  hybridApp:
+    runs-on: ubuntu-latest
+    needs: validateActor
+    if: ${{ fromJSON(needs.validateActor.outputs.IS_DEPLOYER) && github.event.action != 'released' }}
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+
+      - name: 'Deploy HybridApp'
+        run: gh workflow run --repo Expensify/Mobile-Deploy deploy.yml -f force_build=true -f build_version="$(npm run print-version --silent)"
+        env:
+            GITHUB_TOKEN: ${{ secrets.OS_BOTIFY_TOKEN }}
+
   postSlackMessageOnSuccess:
     name: Post a Slack message when all platforms deploy successfully
     runs-on: ubuntu-latest
diff --git a/.github/workflows/preDeploy.yml b/.github/workflows/preDeploy.yml
index f09865de0194..e5ccdfa53076 100644
--- a/.github/workflows/preDeploy.yml
+++ b/.github/workflows/preDeploy.yml
@@ -4,7 +4,7 @@ name: Process new code merged to main
 on:
   push:
     branches: [main]
-    paths-ignore: [docs/**, contributingGuides/**, jest/**, tests/**, workflow_tests/**]
+    paths-ignore: [docs/**, contributingGuides/**, jest/**, tests/**]
 
 jobs:
   typecheck:
@@ -32,7 +32,9 @@ jobs:
 
       - name: Exit failed workflow
         if: ${{ needs.typecheck.result == 'failure' || needs.lint.result == 'failure' || needs.test.result == 'failure' }}
-        run: exit 1
+        run: |
+          echo "Checks failed, exiting ~ typecheck: ${{ needs.typecheck.result }}, lint: ${{ needs.lint.result }}, test: ${{ needs.test.result }}"
+          exit 1
 
   chooseDeployActions:
     runs-on: ubuntu-latest
@@ -84,7 +86,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Run turnstyle
-        uses: softprops/turnstyle@ca99add00ff0c9cbc697d22631d2992f377e5bd5
+        uses: softprops/turnstyle@49108bdfa571e62371bd2c3094893c547ab3fc03
         with:
           poll-interval-seconds: 10
         env:
diff --git a/.github/workflows/proposalPolice.yml b/.github/workflows/proposalPolice.yml
new file mode 100644
index 000000000000..aabf2fb4f6f1
--- /dev/null
+++ b/.github/workflows/proposalPolice.yml
@@ -0,0 +1,21 @@
+name: ProposalPolice™ - Issue Comment Workflow
+on:
+  issue_comment:
+    types: [created, edited]
+
+jobs:
+  proposal-police-workflow:
+    runs-on: ubuntu-latest
+    if: "!contains(fromJSON('[\"OSBotify\", \"imgbot[bot]\", \"melvin-bot[bot]\"]'), github.actor)"
+    steps:
+      - uses: actions/checkout@v4
+
+      # Checks if the comment is created and follows the template OR
+      # if the comment is edited and if proposal template is followed.
+      # Action type logic can be found in the script files.
+      - name: Run ProposalPolice™ Comment Check Script
+        uses: ./.github/actions/javascript/proposalPoliceComment
+        with:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          PROPOSAL_POLICE_API_KEY: ${{ secrets.PROPOSAL_POLICE_API_KEY }}
+          PROPOSAL_POLICE_ASSISTANT_ID: ${{ secrets.PROPOSAL_POLICE_ASSISTANT_ID }}
diff --git a/.github/workflows/reactCompiler.yml b/.github/workflows/reactCompiler.yml
new file mode 100644
index 000000000000..dc2e1b17d804
--- /dev/null
+++ b/.github/workflows/reactCompiler.yml
@@ -0,0 +1,45 @@
+name: 🔮 React Compiler
+
+on:
+  pull_request:
+    paths:
+      - ".github/workflows/reactCompiler.yml"
+      - "src/**"
+      - "package.json"
+
+jobs:
+  check:
+    name: 🧬 Conformity
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout to target branch
+        uses: actions/checkout@v4
+        with:
+          ref: ${{ github.event.pull_request.base.ref }}
+      - name: Setup Node
+        uses: ./.github/actions/composite/setupNode
+      - name: Get list of compiled files (main)
+        id: old-list
+        run: |
+          RAW_OUTPUT=$(npx react-compiler-healthcheck --json 2>/dev/null)
+          echo "Raw output: $RAW_OUTPUT"
+          OLD_LIST=$(echo "$RAW_OUTPUT" | jq -c .)
+          echo "OLD_LIST=$OLD_LIST" >> "$GITHUB_OUTPUT"
+      - name: Checkout to current branch
+        uses: actions/checkout@v4
+      - name: Setup Node
+        uses: ./.github/actions/composite/setupNode
+      - name: Get list of compiled files (PR)
+        id: new-list
+        run: |
+          RAW_OUTPUT=$(npx react-compiler-healthcheck --json 2>/dev/null)
+          echo "Raw output: $RAW_OUTPUT"
+          NEW_LIST=$(echo "$RAW_OUTPUT" | jq -c .)
+          echo "NEW_LIST=$NEW_LIST" >> "$GITHUB_OUTPUT"
+      - name: Check for react compiler changes
+        id: checkReactCompiler
+        uses: ./.github/actions/javascript/checkReactCompiler
+        with:
+          NEW_LIST: ${{ steps.new-list.outputs.NEW_LIST }}
+          OLD_LIST: ${{ steps.old-list.outputs.OLD_LIST }}
diff --git a/.github/workflows/reassurePerformanceTests.yml b/.github/workflows/reassurePerformanceTests.yml
index a695c0acf942..d4a25a63952b 100644
--- a/.github/workflows/reassurePerformanceTests.yml
+++ b/.github/workflows/reassurePerformanceTests.yml
@@ -4,7 +4,7 @@ on:
   pull_request:
     types: [opened, synchronize]
     branches-ignore: [staging, production]
-    paths-ignore: [docs/**, .github/**, contributingGuides/**, tests/**, workflow_tests/**, '**.md', '**.sh']
+    paths-ignore: [docs/**, .github/**, contributingGuides/**, tests/**, '**.md', '**.sh']
 
 jobs:
   perf-tests:
@@ -47,13 +47,13 @@ jobs:
           BASELINE_BRANCH=${BASELINE_BRANCH:="main"}
           git fetch origin "$BASELINE_BRANCH" --no-tags --depth=1
           git switch "$BASELINE_BRANCH"
-          npm install --force
-          npx reassure --baseline
+          npm install --force || (rm -rf node_modules && npm install --force) 
+          NODE_OPTIONS=--experimental-vm-modules npx reassure --baseline
           git switch --force --detach -
           git merge --no-commit --allow-unrelated-histories "$BASELINE_BRANCH" -X ours
           git checkout --ours .
-          npm install --force
-          npx reassure --branch
+          npm install --force || (rm -rf node_modules && npm install --force)
+          NODE_OPTIONS=--experimental-vm-modules npx reassure --branch
 
       - name: Validate output.json
         id: validateReassureOutput
diff --git a/.github/workflows/sendReassurePerfData.yml b/.github/workflows/sendReassurePerfData.yml
index 53b3d3374a9e..42d946cece95 100644
--- a/.github/workflows/sendReassurePerfData.yml
+++ b/.github/workflows/sendReassurePerfData.yml
@@ -3,7 +3,7 @@ name: Send Reassure Performance Tests to Graphite
 on:
   push:
     branches: [main]
-    paths-ignore: [docs/**, contributingGuides/**, jest/**, workflow_tests/**]
+    paths-ignore: [docs/**, contributingGuides/**, jest/**]
 
 jobs:
   perf-tests:
@@ -25,7 +25,7 @@ jobs:
         shell: bash
         run: |
           set -e
-          npx reassure --baseline
+          NODE_OPTIONS=--experimental-vm-modules npx reassure --baseline
 
       - name: Get merged pull request
         id: getMergedPullRequest
@@ -36,7 +36,7 @@ jobs:
       - name: Get and save graphite string
         id: saveGraphiteString
         uses: ./.github/actions/javascript/getGraphiteString
-        with: 
+        with:
           PR_NUMBER: ${{ steps.getMergedPullRequest.outputs.number }}
 
       - name: Send graphite data
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 71b4bc3d8fc3..36d4248fcc3c 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -5,10 +5,10 @@ on:
   pull_request:
     types: [opened, synchronize]
     branches-ignore: [staging, production]
-    paths: ['**.js', '**.ts', '**.tsx', '**.sh', 'package.json', 'package-lock.json']
+    paths: ['**.js', '**.ts', '**.tsx', 'package.json', 'package-lock.json']
 
 concurrency:
-  group: "${{ github.ref }}-jest"
+  group: ${{ github.ref == 'refs/heads/main' && format('{0}-{1}', github.ref, github.sha) || github.ref }}-jest
   cancel-in-progress: true
 
 jobs:
@@ -41,7 +41,7 @@ jobs:
           key: ${{ runner.os }}-jest
 
       - name: Jest tests
-        run: npx jest --silent --shard=${{ fromJSON(matrix.chunk) }}/${{ strategy.job-total }} --max-workers ${{ steps.cpu-cores.outputs.count }}
+        run: NODE_OPTIONS="$NODE_OPTIONS --experimental-vm-modules" npx jest --silent --shard=${{ fromJSON(matrix.chunk) }}/${{ strategy.job-total }} --max-workers ${{ steps.cpu-cores.outputs.count }}
 
   storybookTests:
     if: ${{ github.actor != 'OSBotify' && github.actor != 'imgbot[bot]' || github.event_name == 'workflow_call' }}
@@ -54,20 +54,3 @@ jobs:
 
       - name: Storybook run
         run: npm run storybook -- --smoke-test --ci
-
-  shellTests:
-    if: ${{ github.actor != 'OSBotify' && github.actor != 'imgbot[bot]' || github.event_name == 'workflow_call' }}
-    runs-on: ubuntu-latest
-    name: Shell tests
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v4
-
-      - name: Setup Node
-        uses: ./.github/actions/composite/setupNode
-
-      - name: Install ts-node
-        run: npm i -g ts-node
-
-      - name: Test CI git logic
-        run: tests/unit/CIGitLogicTest.sh
diff --git a/.github/workflows/testBuild.yml b/.github/workflows/testBuild.yml
index fe6ea5bfc016..95177e0bcefd 100644
--- a/.github/workflows/testBuild.yml
+++ b/.github/workflows/testBuild.yml
@@ -54,8 +54,7 @@ jobs:
         id: getHeadRef
         run: |
           set -e
-          gh pr checkout ${{ github.event.inputs.PULL_REQUEST_NUMBER }}
-          echo "REF=$(git rev-parse HEAD)" >> "$GITHUB_OUTPUT"
+          echo "REF=$(gh pr view ${{ github.event.inputs.PULL_REQUEST_NUMBER }} --json headRefOid --jq '.headRefOid')" >> "$GITHUB_OUTPUT"
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
@@ -88,7 +87,7 @@ jobs:
           java-version: '17'
 
       - name: Setup Ruby
-        uses: ruby/setup-ruby@a05e47355e80e57b9a67566a813648fa67d92011
+        uses: ruby/setup-ruby@v1.187.0
         with:
           ruby-version: '2.7'
           bundler-cache: true
@@ -117,6 +116,7 @@ jobs:
         id: runFastlaneBetaTest
         run: bundle exec fastlane android build_internal
         env:
+          RUBYOPT: '-rostruct'
           S3_ACCESS_KEY: ${{ secrets.AWS_ACCESS_KEY_ID }}
           S3_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
           S3_BUCKET: ad-hoc-expensify-cash
@@ -125,7 +125,7 @@ jobs:
           MYAPP_UPLOAD_KEY_PASSWORD: ${{ secrets.MYAPP_UPLOAD_KEY_PASSWORD }}
 
       - name: Upload Artifact
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: android
           path: ./android_paths.json
@@ -136,7 +136,7 @@ jobs:
     if: ${{ fromJSON(needs.validateActor.outputs.READY_TO_BUILD) }}
     env:
       PULL_REQUEST_NUMBER: ${{ github.event.number || github.event.inputs.PULL_REQUEST_NUMBER }}
-      DEVELOPER_DIR: /Applications/Xcode_15.0.1.app/Contents/Developer
+      DEVELOPER_DIR: /Applications/Xcode_15.2.0.app/Contents/Developer
     runs-on: macos-13-xlarge
     steps:
       - name: Checkout
@@ -158,10 +158,10 @@ jobs:
         uses: ./.github/actions/composite/setupNode
 
       - name: Setup XCode
-        run: sudo xcode-select -switch /Applications/Xcode_15.0.1.app
+        run: sudo xcode-select -switch /Applications/Xcode_15.2.0.app
 
       - name: Setup Ruby
-        uses: ruby/setup-ruby@a05e47355e80e57b9a67566a813648fa67d92011
+        uses: ruby/setup-ruby@v1.187.0
         with:
           ruby-version: '2.7'
           bundler-cache: true
@@ -172,19 +172,18 @@ jobs:
         with:
           path: ios/Pods
           key: ${{ runner.os }}-pods-cache-${{ hashFiles('ios/Podfile.lock', 'firebase.json') }}
-          restore-keys: ${{ runner.os }}-pods-cache-
 
       - name: Compare Podfile.lock and Manifest.lock
         id: compare-podfile-and-manifest
         run: echo "IS_PODFILE_SAME_AS_MANIFEST=${{ hashFiles('ios/Podfile.lock') == hashFiles('ios/Pods/Manifest.lock') }}" >> "$GITHUB_OUTPUT"
 
       - name: Install cocoapods
-        uses: nick-invision/retry@0711ba3d7808574133d713a0d92d2941be03a350
+        uses: nick-fields/retry@3f757583fb1b1f940bc8ef4bf4734c8dc02a5847
         if: steps.pods-cache.outputs.cache-hit != 'true' || steps.compare-podfile-and-manifest.outputs.IS_PODFILE_SAME_AS_MANIFEST != 'true' || steps.setup-node.outputs.cache-hit != 'true'
         with:
           timeout_minutes: 10
           max_attempts: 5
-          command: cd ios && bundle exec pod install
+          command: scripts/pod-install.sh
 
       - name: Decrypt AdHoc profile
         run: cd ios && gpg --quiet --batch --yes --decrypt --passphrase="$LARGE_SECRET_PASSPHRASE" --output NewApp_AdHoc.mobileprovision NewApp_AdHoc.mobileprovision.gpg
@@ -217,7 +216,7 @@ jobs:
           S3_REGION: us-east-1
 
       - name: Upload Artifact
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: ios
           path: ./ios_paths.json
@@ -228,7 +227,7 @@ jobs:
     if: ${{ fromJSON(needs.validateActor.outputs.READY_TO_BUILD) }}
     env:
       PULL_REQUEST_NUMBER: ${{ github.event.number || github.event.inputs.PULL_REQUEST_NUMBER }}
-    runs-on: macos-13-large
+    runs-on: macos-14-large
     steps:
       - name: Checkout
         uses: actions/checkout@v4
@@ -299,10 +298,6 @@ jobs:
       - name: Build web for testing
         run: npm run build-adhoc
 
-      - name: Build docs
-        run: npm run storybook-build
-        continue-on-error: true
-
       - name: Deploy to S3 for internal testing
         run: aws s3 cp --recursive --acl public-read "$GITHUB_WORKSPACE"/dist s3://ad-hoc-expensify-cash/web/"$PULL_REQUEST_NUMBER"
 
@@ -321,7 +316,7 @@ jobs:
           ref: ${{ github.event.pull_request.head.sha || needs.getBranchRef.outputs.REF }}
 
       - name: Download Artifact
-        uses: actions/download-artifact@v3
+        uses: actions/download-artifact@v4
         if: ${{ fromJSON(needs.validateActor.outputs.READY_TO_BUILD) }}
 
       - name: Read JSONs with android paths
diff --git a/.github/workflows/testGithubActionsWorkflows.yml b/.github/workflows/testGithubActionsWorkflows.yml
deleted file mode 100644
index d052b343cf0c..000000000000
--- a/.github/workflows/testGithubActionsWorkflows.yml
+++ /dev/null
@@ -1,35 +0,0 @@
-name: Test GitHub Actions workflows
-
-on:
-  workflow_dispatch:
-  workflow_call:
-  pull_request:
-    types: [opened, reopened, synchronize]
-    branches-ignore: [staging, production]
-    paths: ['.github/**']
-
-jobs:
-  testGHWorkflows:
-    if: ${{ github.actor != 'OSBotify' && github.actor != 'imgbot[bot]' || github.event_name == 'workflow_call' }}
-    runs-on: ubuntu-latest
-    env:
-      CI: true
-    name: test GitHub Workflows
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v3
-
-      - name: Setup Node
-        uses: Expensify/App/.github/actions/composite/setupNode@main
-
-      - name: Setup Homebrew
-        uses: Homebrew/actions/setup-homebrew@master
-
-      - name: Install Act
-        run: brew install act
-
-      - name: Set ACT_BINARY
-        run: echo "ACT_BINARY=$(which act)" >> "$GITHUB_ENV"
-
-      - name: Run tests
-        run: npm run workflow-test
diff --git a/.github/workflows/typecheck.yml b/.github/workflows/typecheck.yml
index 88d4d24a5723..32c9e35315b3 100644
--- a/.github/workflows/typecheck.yml
+++ b/.github/workflows/typecheck.yml
@@ -7,6 +7,10 @@ on:
     branches-ignore: [staging, production]
     paths: ['**.js', '**.ts', '**.tsx', 'package.json', 'package-lock.json', 'tsconfig.json']
 
+concurrency:
+  group: ${{ github.ref == 'refs/heads/main' && format('{0}-{1}', github.ref, github.sha) || github.ref }}-typecheck
+  cancel-in-progress: true
+
 jobs:
   typecheck:
     if: ${{ github.actor != 'OSBotify' || github.event_name == 'workflow_call' }}
@@ -30,7 +34,7 @@ jobs:
           #    - git diff is used to see the files that were added on this branch
           #    - gh pr view is used to list files touched by this PR. Git diff may give false positives if the branch isn't up-to-date with main
           #  - wc counts the words in the result of the intersection
-          count_new_js=$(comm -1 -2 <(git diff --name-only --diff-filter=A origin/main HEAD -- 'src/*.js' '__mocks__/*.js' '.storybook/*.js' 'assets/*.js' 'config/*.js' 'desktop/*.js' 'jest/*.js' 'scripts/*.js' 'tests/*.js' 'workflow_tests/*.js' '.github/libs/*.js' '.github/scripts/*.js') <(gh pr view ${{ github.event.pull_request.number }} --json files | jq -r '.files | map(.path) | .[]') | wc -l)
+          count_new_js=$(comm -1 -2 <(git diff --name-only --diff-filter=A origin/main HEAD -- 'src/*.js' '__mocks__/*.js' '.storybook/*.js' 'assets/*.js' 'config/*.js' 'desktop/*.js' 'jest/*.js' 'scripts/*.js' 'tests/*.js' '.github/libs/*.js' '.github/scripts/*.js' ':!src/libs/SearchParser/*.js') <(gh pr view ${{ github.event.pull_request.number }} --json files | jq -r '.files | map(.path) | .[]') | wc -l)
           if [ "$count_new_js" -gt "0" ]; then
             echo "ERROR: Found new JavaScript files in the project; use TypeScript instead."
             exit 1
diff --git a/.gitignore b/.gitignore
index aeee5f730bfc..3e899e3175ba 100644
--- a/.gitignore
+++ b/.gitignore
@@ -24,7 +24,7 @@ DerivedData
 *.p12
 *.mobileprovision
 ios-fastlane-json-key.json
-ios/.xcode.env.local
+**/.xcode.env.local
 
 # Android/IntelliJ
 #
@@ -37,6 +37,11 @@ local.properties
 android/app/src/main/java/com/expensify/chat/generated/
 .cxx/
 
+# VIM
+*.swp
+*.swo
+*~
+
 # Vscode
 .vscode
 
@@ -73,7 +78,7 @@ android/app/android-fastlane-json-key.json
 *.jsbundle
 
 # Ruby / CocoaPods
-/ios/Pods/
+**/Pods/
 /vendor/bundle/
 
 # Local DEV config
@@ -105,10 +110,6 @@ tsconfig.tsbuildinfo
 # Mock-github
 /repo/
 
-# Workflow test logs
-/workflow_tests/logs/
-/workflow_tests/repo/
-
 # Yalc
 .yalc
 yalc.lock
@@ -125,3 +126,20 @@ config/webpack/*.pem
 .expo
 dist/
 web-build/
+
+# Yarn
+.yarn/*
+!.yarn/patches
+!.yarn/plugins
+!.yarn/releases
+!.yarn/sdks
+!.yarn/versions
+
+# Storage location for downloaded app source maps (see scripts/symbolicate-profile.ts)
+.sourcemaps/
+
+# Jeykll
+docs/.bundle
+
+# Output of react compiler healthcheck dev script
+react-compiler-output.txt
diff --git a/.nvmrc b/.nvmrc
index d5a159609d09..b8e593f5210c 100644
--- a/.nvmrc
+++ b/.nvmrc
@@ -1 +1 @@
-20.10.0
+20.15.1
diff --git a/.prettierignore b/.prettierignore
index 2df776736b69..a9f7e1464529 100644
--- a/.prettierignore
+++ b/.prettierignore
@@ -17,3 +17,8 @@ package-lock.json
 *.md
 # We need to modify the import here specifically, hence we disable prettier to get rid of the sorted imports
 src/libs/E2E/reactNativeLaunchingTest.ts
+# Temporary while we keep react-compiler in our repo
+lib/**
+
+# Automatically generated files
+src/libs/SearchParser/searchParser.js
diff --git a/.prettierrc.js b/.prettierrc.js
index 3118dc378694..d981112fffae 100644
--- a/.prettierrc.js
+++ b/.prettierrc.js
@@ -6,6 +6,7 @@ module.exports = {
     arrowParens: 'always',
     printWidth: 190,
     singleAttributePerLine: true,
+    plugins: [require.resolve('@trivago/prettier-plugin-sort-imports')],
     /** `importOrder` should be defined in an alphabetical order. */
     importOrder: [
         '@assets/(.*)$',
diff --git a/.storybook/fonts.css b/.storybook/fonts.css
index 906490c3a9d9..05002d893e61 100644
--- a/.storybook/fonts.css
+++ b/.storybook/fonts.css
@@ -1,52 +1,59 @@
 @font-face {
-    font-family: ExpensifyNeue-Regular;
+    font-family: Expensify Neue;
     font-weight: 400;
     font-style: normal;
     src: url('../assets/fonts/web/ExpensifyNeue-Regular.woff2') format('woff2'), url('../assets/fonts/web/ExpensifyNeue-Regular.woff') format('woff');
 }
 
 @font-face {
-    font-family: ExpensifyNeue-Regular;
+    font-family: Expensify Neue;
     font-weight: 700;
     font-style: normal;
     src: url('../assets/fonts/web/ExpensifyNeue-Bold.woff2') format('woff2'), url('../assets/fonts/web/ExpensifyNeue-Bold.woff') format('woff');
 }
 
 @font-face {
-    font-family: ExpensifyNeue-Regular;
+    font-family: Expensify Neue;
     font-weight: 400;
     font-style: italic;
     src: url('../assets/fonts/web/ExpensifyNeue-Italic.woff2') format('woff2'), url('../assets/fonts/web/ExpensifyNeue-Italic.woff') format('woff');
 }
 
 @font-face {
-    font-family: ExpensifyNeue-Regular;
+    font-family: Expensify Neue;
     font-weight: 700;
     font-style: italic;
     src: url('../assets/fonts/web/ExpensifyNeue-BoldItalic.woff2') format('woff2'), url('../assets/fonts/web/ExpensifyNeue-BoldItalic.woff') format('woff');
 }
 
 @font-face {
-    font-family: ExpensifyMono-Regular;
+    font-family: Expensify Mono;
     font-weight: 400;
     font-style: normal;
     src: url('../assets/fonts/web/ExpensifyMono-Regular.woff2') format('woff2'), url('../assets/fonts/web/ExpensifyMono-Regular.woff') format('woff');
 }
 
 @font-face {
-    font-family: ExpensifyMono-Bold;
+    font-family: Expensify Mono;
     font-weight: 700;
     font-style: normal;
     src: url('../assets/fonts/web/ExpensifyMono-Bold.woff2') format('woff2'),  url('../assets/fonts/web/ExpensifyMono-Bold.woff') format('woff');
 }
 
 @font-face {
-    font-family: ExpensifyNewKansas-Medium;
-    font-weight: 400;
+    font-family: Expensify New Kansas;
+    font-weight: 500;
     font-style: normal;
     src: url('../assets/fonts/web/ExpensifyNewKansas-Medium.woff2') format('woff2'),  url('../assets/fonts/web/ExpensifyNewKansas-Medium.woff') format('woff');
 }
 
+@font-face {
+    font-family: Expensify New Kansas;
+    font-weight: 500;
+    font-style: italic;
+    src: url('../assets/fonts/web/ExpensifyNewKansas-MediumItalic.woff2') format('woff2'),  url('../assets/fonts/web/ExpensifyNewKansas-MediumItalic.woff') format('woff');
+}
+
 * {
     -webkit-font-smoothing: antialiased;
     -moz-osx-font-smoothing: grayscale;
diff --git a/.storybook/public/favicon.svg b/.storybook/public/favicon.svg
index 6bc34f89282e..726791b58cfb 100644
--- a/.storybook/public/favicon.svg
+++ b/.storybook/public/favicon.svg
@@ -1,11 +1 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" version="1.1" width="128px" height="128px" style="shape-rendering:geometricPrecision; text-rendering:geometricPrecision; image-rendering:optimizeQuality; fill-rule:evenodd; clip-rule:evenodd" xmlns:xlink="http://www.w3.org/1999/xlink">
-<g><path style="opacity:0.987" fill="#02d27b" d="M 52.5,-0.5 C 59.8333,-0.5 67.1667,-0.5 74.5,-0.5C 103.176,6.17555 120.842,23.8422 127.5,52.5C 127.5,59.8333 127.5,67.1667 127.5,74.5C 120.824,103.176 103.158,120.842 74.5,127.5C 67.1667,127.5 59.8333,127.5 52.5,127.5C 23.8245,120.824 6.15779,103.158 -0.5,74.5C -0.5,67.1667 -0.5,59.8333 -0.5,52.5C 6.17555,23.8245 23.8422,6.15779 52.5,-0.5 Z"/></g>
-<g><path style="opacity:1" fill="#003224" d="M 54.5,13.5 C 67.7762,12.4538 80.1096,15.2872 91.5,22C 95.7658,25.5265 95.2658,28.0265 90,29.5C 81.1375,24.6574 71.6375,21.9907 61.5,21.5C 39.5918,23.9082 26.4251,35.9082 22,57.5C 21.3677,63.2142 21.701,68.8809 23,74.5C 24.7777,79.8816 26.9444,85.0483 29.5,90C 29.2547,93.2545 27.588,94.5879 24.5,94C 16.9667,84.5683 13.3001,73.7349 13.5,61.5C 16.408,36.262 30.0747,20.262 54.5,13.5 Z"/></g>
-<g><path style="opacity:1" fill="#003224" d="M 99.5,33.5 C 101.722,33.178 103.556,33.8446 105,35.5C 116.206,54.1149 116.206,72.7816 105,91.5C 101.507,94.5018 99.0067,93.8351 97.5,89.5C 107.994,72.2856 107.994,55.1189 97.5,38C 98.0439,36.415 98.7106,34.915 99.5,33.5 Z"/></g>
-<g><path style="opacity:1" fill="#003023" d="M 80.5,48.5 C 73.1667,48.5 65.8333,48.5 58.5,48.5C 58.5,51.8333 58.5,55.1667 58.5,58.5C 64.5,58.5 70.5,58.5 76.5,58.5C 76.5,61.8333 76.5,65.1667 76.5,68.5C 70.8333,68.5 65.1667,68.5 59.5,68.5C 58.5206,71.6248 58.1872,74.9581 58.5,78.5C 65.8333,78.5 73.1667,78.5 80.5,78.5C 80.5,81.8333 80.5,85.1667 80.5,88.5C 68.8333,88.5 57.1667,88.5 45.5,88.5C 45.5,71.8333 45.5,55.1667 45.5,38.5C 57.5,38.5 69.5,38.5 81.5,38.5C 81.8128,42.0419 81.4794,45.3752 80.5,48.5 Z"/></g>
-<g><path style="opacity:1" fill="#019459" d="M 80.5,48.5 C 73.6866,49.4912 66.6866,49.8245 59.5,49.5C 59.5,52.1667 59.5,54.8333 59.5,57.5C 65.358,57.1778 71.0247,57.5111 76.5,58.5C 70.5,58.5 64.5,58.5 58.5,58.5C 58.5,55.1667 58.5,51.8333 58.5,48.5C 65.8333,48.5 73.1667,48.5 80.5,48.5 Z"/></g>
-<g><path style="opacity:1" fill="#01995c" d="M 59.5,68.5 C 59.5,71.5 59.5,74.5 59.5,77.5C 66.8333,77.5 74.1667,77.5 81.5,77.5C 81.815,81.3714 81.4816,85.0381 80.5,88.5C 80.5,85.1667 80.5,81.8333 80.5,78.5C 73.1667,78.5 65.8333,78.5 58.5,78.5C 58.1872,74.9581 58.5206,71.6248 59.5,68.5 Z"/></g>
-<g><path style="opacity:1" fill="#003224" d="M 35.5,97.5 C 41.0895,99.6183 46.7562,101.785 52.5,104C 59.8265,105.941 67.1598,105.941 74.5,104C 79.505,101.83 84.505,99.6638 89.5,97.5C 93.8351,99.0067 94.5018,101.507 91.5,105C 74.173,115.31 56.5063,115.976 38.5,107C 33.342,105.03 32.342,101.863 35.5,97.5 Z"/></g>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="128" height="128" version="1.1" style="shape-rendering:geometricPrecision;text-rendering:geometricPrecision;image-rendering:optimizeQuality;fill-rule:evenodd;clip-rule:evenodd"><g><path style="opacity:.987" fill="#02d27b" d="M 52.5,-0.5 C 59.8333,-0.5 67.1667,-0.5 74.5,-0.5C 103.176,6.17555 120.842,23.8422 127.5,52.5C 127.5,59.8333 127.5,67.1667 127.5,74.5C 120.824,103.176 103.158,120.842 74.5,127.5C 67.1667,127.5 59.8333,127.5 52.5,127.5C 23.8245,120.824 6.15779,103.158 -0.5,74.5C -0.5,67.1667 -0.5,59.8333 -0.5,52.5C 6.17555,23.8245 23.8422,6.15779 52.5,-0.5 Z"/></g><g><path style="opacity:1" fill="#003224" d="M 54.5,13.5 C 67.7762,12.4538 80.1096,15.2872 91.5,22C 95.7658,25.5265 95.2658,28.0265 90,29.5C 81.1375,24.6574 71.6375,21.9907 61.5,21.5C 39.5918,23.9082 26.4251,35.9082 22,57.5C 21.3677,63.2142 21.701,68.8809 23,74.5C 24.7777,79.8816 26.9444,85.0483 29.5,90C 29.2547,93.2545 27.588,94.5879 24.5,94C 16.9667,84.5683 13.3001,73.7349 13.5,61.5C 16.408,36.262 30.0747,20.262 54.5,13.5 Z"/></g><g><path style="opacity:1" fill="#003224" d="M 99.5,33.5 C 101.722,33.178 103.556,33.8446 105,35.5C 116.206,54.1149 116.206,72.7816 105,91.5C 101.507,94.5018 99.0067,93.8351 97.5,89.5C 107.994,72.2856 107.994,55.1189 97.5,38C 98.0439,36.415 98.7106,34.915 99.5,33.5 Z"/></g><g><path style="opacity:1" fill="#003023" d="M 80.5,48.5 C 73.1667,48.5 65.8333,48.5 58.5,48.5C 58.5,51.8333 58.5,55.1667 58.5,58.5C 64.5,58.5 70.5,58.5 76.5,58.5C 76.5,61.8333 76.5,65.1667 76.5,68.5C 70.8333,68.5 65.1667,68.5 59.5,68.5C 58.5206,71.6248 58.1872,74.9581 58.5,78.5C 65.8333,78.5 73.1667,78.5 80.5,78.5C 80.5,81.8333 80.5,85.1667 80.5,88.5C 68.8333,88.5 57.1667,88.5 45.5,88.5C 45.5,71.8333 45.5,55.1667 45.5,38.5C 57.5,38.5 69.5,38.5 81.5,38.5C 81.8128,42.0419 81.4794,45.3752 80.5,48.5 Z"/></g><g><path style="opacity:1" fill="#019459" d="M 80.5,48.5 C 73.6866,49.4912 66.6866,49.8245 59.5,49.5C 59.5,52.1667 59.5,54.8333 59.5,57.5C 65.358,57.1778 71.0247,57.5111 76.5,58.5C 70.5,58.5 64.5,58.5 58.5,58.5C 58.5,55.1667 58.5,51.8333 58.5,48.5C 65.8333,48.5 73.1667,48.5 80.5,48.5 Z"/></g><g><path style="opacity:1" fill="#01995c" d="M 59.5,68.5 C 59.5,71.5 59.5,74.5 59.5,77.5C 66.8333,77.5 74.1667,77.5 81.5,77.5C 81.815,81.3714 81.4816,85.0381 80.5,88.5C 80.5,85.1667 80.5,81.8333 80.5,78.5C 73.1667,78.5 65.8333,78.5 58.5,78.5C 58.1872,74.9581 58.5206,71.6248 59.5,68.5 Z"/></g><g><path style="opacity:1" fill="#003224" d="M 35.5,97.5 C 41.0895,99.6183 46.7562,101.785 52.5,104C 59.8265,105.941 67.1598,105.941 74.5,104C 79.505,101.83 84.505,99.6638 89.5,97.5C 93.8351,99.0067 94.5018,101.507 91.5,105C 74.173,115.31 56.5063,115.976 38.5,107C 33.342,105.03 32.342,101.863 35.5,97.5 Z"/></g></svg>
\ No newline at end of file
diff --git a/.storybook/theme.ts b/.storybook/theme.ts
index 7fc55a549a4a..ace6208bdb3b 100644
--- a/.storybook/theme.ts
+++ b/.storybook/theme.ts
@@ -6,7 +6,7 @@ import colors from '../src/styles/theme/colors';
 const theme: ThemeVars = create({
     brandTitle: 'New Expensify UI Docs',
     brandImage: 'logomark.svg',
-    fontBase: 'ExpensifyNeue-Regular',
+    fontBase: 'Expensify Neue',
     fontCode: 'monospace',
     base: 'dark',
     appBg: colors.productDark200,
diff --git a/.storybook/webpack.config.ts b/.storybook/webpack.config.ts
index 4d638020cd42..0aa38f2e3b82 100644
--- a/.storybook/webpack.config.ts
+++ b/.storybook/webpack.config.ts
@@ -3,6 +3,7 @@
 /* eslint-disable no-param-reassign */
 
 /* eslint-disable @typescript-eslint/naming-convention */
+import type Environment from 'config/webpack/types';
 import dotenv from 'dotenv';
 import path from 'path';
 import {DefinePlugin} from 'webpack';
@@ -18,6 +19,12 @@ type CustomWebpackConfig = {
     };
 };
 
+type CustomWebpackFunction = ({file, platform}: Environment) => CustomWebpackConfig;
+
+type WebpackModule = {
+    default: CustomWebpackFunction;
+};
+
 let envFile: string;
 switch (process.env.ENV) {
     case 'production':
@@ -31,9 +38,9 @@ switch (process.env.ENV) {
 }
 
 const env = dotenv.config({path: path.resolve(__dirname, `../${envFile}`)});
-const custom: CustomWebpackConfig = require('../config/webpack/webpack.common').default({
-    envFile,
-});
+const customFunction = require<WebpackModule>('../config/webpack/webpack.common').default;
+
+const custom: CustomWebpackConfig = customFunction({file: envFile});
 
 const webpackConfig = ({config}: {config: Configuration}) => {
     if (!config.resolve) {
@@ -93,6 +100,11 @@ const webpackConfig = ({config}: {config: Configuration}) => {
         }),
     );
 
+    config.module.rules?.push({
+        test: /\.lottie$/,
+        type: 'asset/resource',
+    });
+
     return config;
 };
 
diff --git a/.well-known/apple-app-site-association b/.well-known/apple-app-site-association
index 394e45f8d9ae..dce724440adf 100644
--- a/.well-known/apple-app-site-association
+++ b/.well-known/apple-app-site-association
@@ -91,6 +91,14 @@
                     {
                         "/": "/money2020/*",
                         "comment": "Money 2020"
+                    },
+                    {
+                        "/": "/track-expense/*",
+                        "comment": "Track Expense"
+                    },
+                    {
+                        "/": "/submit-expense/*",
+                        "comment": "Submit Expense"
                     }
                 ]
             }
diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md
index d4b708ccea4d..0b93611527c5 100644
--- a/CODE_OF_CONDUCT.md
+++ b/CODE_OF_CONDUCT.md
@@ -57,3 +57,5 @@ compliance with this Code is required to maintain your status as an Expensify co
 
 By signing up to participate as an contributor, you are acknowledging your understanding of and consent to (i) what is expected of you under this Code and (ii) notwithstanding anything to the contrary in any agreement you have with Expensify, Expensify’s right, but not obligation, to terminate your participation in the Expensify Contributor Community upon any breach of the Code, as determined in Expensify’s sole
 Discretion.
+
+Violations of our two rules may lead to removal from the contributor program. Severe violations can lead to an immediate ban, while lesser ones may result in a formal warning. Multiple warnings will also lead to removal. 
diff --git a/Gemfile b/Gemfile
index 751e05d2d32b..2739d835b4e0 100644
--- a/Gemfile
+++ b/Gemfile
@@ -3,9 +3,9 @@ source "https://rubygems.org"
 # You may use http://rbenv.org/ or https://rvm.io/ to install and use this version
 ruby ">= 2.6.10"
 
-gem "cocoapods", "~> 1.13"
-gem "activesupport", ">= 6.1.7.3", "< 7.1.0"
-gem "fastlane", "~> 2"
+gem "cocoapods", "= 1.15.2"
+gem 'activesupport', '>= 6.1.7.5', '!= 7.1.0'
+gem "fastlane", "~> 2", ">= 2.222.0"
 gem "xcpretty", "~> 0"
 
 
diff --git a/Gemfile.lock b/Gemfile.lock
index e1b4fc2ec7e4..b386f59b5c11 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,47 +1,49 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    CFPropertyList (3.0.6)
+    CFPropertyList (3.0.7)
+      base64
+      nkf
       rexml
-    activesupport (6.1.7.7)
+    activesupport (7.0.8.4)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 1.6, < 2)
       minitest (>= 5.1)
       tzinfo (~> 2.0)
-      zeitwerk (~> 2.3)
-    addressable (2.8.6)
-      public_suffix (>= 2.0.2, < 6.0)
+    addressable (2.8.7)
+      public_suffix (>= 2.0.2, < 7.0)
     algoliasearch (1.27.5)
       httpclient (~> 2.8, >= 2.8.3)
       json (>= 1.5.1)
     apktools (0.7.4)
       rubyzip (~> 2.0)
-    artifactory (3.0.15)
+    artifactory (3.0.17)
     atomos (0.1.3)
     aws-eventstream (1.3.0)
-    aws-partitions (1.883.0)
-    aws-sdk-core (3.190.3)
+    aws-partitions (1.948.0)
+    aws-sdk-core (3.199.0)
       aws-eventstream (~> 1, >= 1.3.0)
       aws-partitions (~> 1, >= 1.651.0)
       aws-sigv4 (~> 1.8)
       jmespath (~> 1, >= 1.6.1)
-    aws-sdk-kms (1.76.0)
-      aws-sdk-core (~> 3, >= 3.188.0)
+    aws-sdk-kms (1.87.0)
+      aws-sdk-core (~> 3, >= 3.199.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-s3 (1.142.0)
-      aws-sdk-core (~> 3, >= 3.189.0)
+    aws-sdk-s3 (1.154.0)
+      aws-sdk-core (~> 3, >= 3.199.0)
       aws-sdk-kms (~> 1)
       aws-sigv4 (~> 1.8)
     aws-sigv4 (1.8.0)
       aws-eventstream (~> 1, >= 1.0.2)
     babosa (1.0.4)
+    base64 (0.2.0)
     claide (1.1.0)
-    cocoapods (1.13.0)
+    cocoapods (1.15.2)
       addressable (~> 2.8)
       claide (>= 1.0.2, < 2.0)
-      cocoapods-core (= 1.13.0)
+      cocoapods-core (= 1.15.2)
       cocoapods-deintegrate (>= 1.0.3, < 2.0)
-      cocoapods-downloader (>= 1.6.0, < 2.0)
+      cocoapods-downloader (>= 2.1, < 3.0)
       cocoapods-plugins (>= 1.0.0, < 2.0)
       cocoapods-search (>= 1.0.0, < 2.0)
       cocoapods-trunk (>= 1.6.0, < 2.0)
@@ -54,7 +56,7 @@ GEM
       nap (~> 1.0)
       ruby-macho (>= 2.3.0, < 3.0)
       xcodeproj (>= 1.23.0, < 2.0)
-    cocoapods-core (1.13.0)
+    cocoapods-core (1.15.2)
       activesupport (>= 5.0, < 8)
       addressable (~> 2.8)
       algoliasearch (~> 1.0)
@@ -65,7 +67,7 @@ GEM
       public_suffix (~> 4.0)
       typhoeus (~> 1.0)
     cocoapods-deintegrate (1.0.5)
-    cocoapods-downloader (1.6.3)
+    cocoapods-downloader (2.1)
     cocoapods-plugins (1.0.0)
       nap
     cocoapods-search (1.0.1)
@@ -77,18 +79,17 @@ GEM
     colored2 (3.1.2)
     commander (4.6.0)
       highline (~> 2.0.0)
-    concurrent-ruby (1.2.2)
+    concurrent-ruby (1.3.3)
     declarative (0.0.20)
     digest-crc (0.6.5)
       rake (>= 12.0.0, < 14.0.0)
-    domain_name (0.5.20190701)
-      unf (>= 0.0.5, < 1.0.0)
+    domain_name (0.6.20240107)
     dotenv (2.8.1)
     emoji_regex (3.2.3)
     escape (0.0.4)
     ethon (0.16.0)
       ffi (>= 1.15.0)
-    excon (0.109.0)
+    excon (0.111.0)
     faraday (1.10.3)
       faraday-em_http (~> 1.0)
       faraday-em_synchrony (~> 1.0)
@@ -110,22 +111,22 @@ GEM
     faraday-httpclient (1.0.1)
     faraday-multipart (1.0.4)
       multipart-post (~> 2)
-    faraday-net_http (1.0.1)
+    faraday-net_http (1.0.2)
     faraday-net_http_persistent (1.2.0)
     faraday-patron (1.0.0)
     faraday-rack (1.0.0)
     faraday-retry (1.0.3)
     faraday_middleware (1.2.0)
       faraday (~> 1.0)
-    fastimage (2.3.0)
-    fastlane (2.219.0)
+    fastimage (2.3.1)
+    fastlane (2.222.0)
       CFPropertyList (>= 2.3, < 4.0.0)
       addressable (>= 2.8, < 3.0.0)
       artifactory (~> 3.0)
       aws-sdk-s3 (~> 1.0)
       babosa (>= 1.0.3, < 2.0.0)
       bundler (>= 1.12.0, < 3.0.0)
-      colored
+      colored (~> 1.2)
       commander (~> 4.6)
       dotenv (>= 2.1.1, < 3.0.0)
       emoji_regex (>= 0.1, < 4.0)
@@ -146,10 +147,10 @@ GEM
       mini_magick (>= 4.9.4, < 5.0.0)
       multipart-post (>= 2.0.0, < 3.0.0)
       naturally (~> 2.2)
-      optparse (>= 0.1.1)
+      optparse (>= 0.1.1, < 1.0.0)
       plist (>= 3.1.0, < 4.0.0)
       rubyzip (>= 2.0.0, < 3.0.0)
-      security (= 0.1.3)
+      security (= 0.1.5)
       simctl (~> 1.6.3)
       terminal-notifier (>= 2.0.0, < 3.0.0)
       terminal-table (~> 3)
@@ -158,12 +159,15 @@ GEM
       word_wrap (~> 1.0.0)
       xcodeproj (>= 1.13.0, < 2.0.0)
       xcpretty (~> 0.3.0)
-      xcpretty-travis-formatter (>= 0.0.3)
+      xcpretty-travis-formatter (>= 0.0.3, < 2.0.0)
     fastlane-plugin-aws_s3 (2.1.0)
       apktools (~> 0.7)
       aws-sdk-s3 (~> 1)
       mime-types (~> 3.3)
-    ffi (1.16.3)
+    ffi (1.17.0)
+    ffi (1.17.0-arm64-darwin)
+    ffi (1.17.0-x86_64-darwin)
+    ffi (1.17.0-x86_64-linux)
     fourflusher (2.3.1)
     fuzzy_match (2.0.4)
     gh_inspector (1.1.3)
@@ -183,17 +187,17 @@ GEM
       google-apis-core (>= 0.11.0, < 2.a)
     google-apis-storage_v1 (0.31.0)
       google-apis-core (>= 0.11.0, < 2.a)
-    google-cloud-core (1.6.1)
+    google-cloud-core (1.7.0)
       google-cloud-env (>= 1.0, < 3.a)
       google-cloud-errors (~> 1.0)
     google-cloud-env (1.6.0)
       faraday (>= 0.17.3, < 3.0)
-    google-cloud-errors (1.3.1)
-    google-cloud-storage (1.37.0)
+    google-cloud-errors (1.4.0)
+    google-cloud-storage (1.47.0)
       addressable (~> 2.8)
       digest-crc (~> 0.4)
       google-apis-iamcredentials_v1 (~> 0.1)
-      google-apis-storage_v1 (~> 0.1)
+      google-apis-storage_v1 (~> 0.31.0)
       google-cloud-core (~> 1.6)
       googleauth (>= 0.16.2, < 2.a)
       mini_mime (~> 1.0)
@@ -204,44 +208,47 @@ GEM
       os (>= 0.9, < 2.0)
       signet (>= 0.16, < 2.a)
     highline (2.0.3)
-    http-cookie (1.0.5)
+    http-cookie (1.0.6)
       domain_name (~> 0.5)
     httpclient (2.8.3)
-    i18n (1.14.1)
+    i18n (1.14.5)
       concurrent-ruby (~> 1.0)
     jmespath (1.6.2)
-    json (2.7.1)
-    jwt (2.7.1)
+    json (2.7.2)
+    jwt (2.8.2)
+      base64
     mime-types (3.5.1)
       mime-types-data (~> 3.2015)
     mime-types-data (3.2023.1003)
-    mini_magick (4.12.0)
+    mini_magick (4.13.2)
     mini_mime (1.1.5)
-    minitest (5.20.0)
+    minitest (5.24.0)
     molinillo (0.8.0)
     multi_json (1.15.0)
-    multipart-post (2.3.0)
+    multipart-post (2.4.1)
     nanaimo (0.3.0)
     nap (1.1.0)
     naturally (2.2.1)
     netrc (0.11.0)
-    optparse (0.4.0)
+    nkf (0.2.0)
+    optparse (0.5.0)
     os (1.1.4)
     plist (3.7.1)
     public_suffix (4.0.7)
-    rake (13.1.0)
+    rake (13.2.1)
     representable (3.2.0)
       declarative (< 0.1.0)
       trailblazer-option (>= 0.1.1, < 0.2.0)
       uber (< 0.2.0)
     retriable (3.1.2)
-    rexml (3.2.6)
+    rexml (3.2.9)
+      strscan
     rouge (2.0.7)
     ruby-macho (2.5.1)
     ruby2_keywords (0.0.5)
     rubyzip (2.3.2)
-    security (0.1.3)
-    signet (0.18.0)
+    security (0.1.5)
+    signet (0.19.0)
       addressable (~> 2.8)
       faraday (>= 0.17.5, < 3.a)
       jwt (>= 1.5, < 3.0)
@@ -249,6 +256,7 @@ GEM
     simctl (1.6.10)
       CFPropertyList
       naturally
+    strscan (3.1.0)
     terminal-notifier (2.0.0)
     terminal-table (3.0.2)
       unicode-display_width (>= 1.1.1, < 3)
@@ -262,12 +270,9 @@ GEM
     tzinfo (2.0.6)
       concurrent-ruby (~> 1.0)
     uber (0.1.0)
-    unf (0.1.4)
-      unf_ext
-    unf_ext (0.0.9.1)
     unicode-display_width (2.5.0)
     word_wrap (1.0.0)
-    xcodeproj (1.23.0)
+    xcodeproj (1.24.0)
       CFPropertyList (>= 2.3.3, < 4.0)
       atomos (~> 0.1.3)
       claide (>= 1.0.2, < 2.0)
@@ -278,7 +283,6 @@ GEM
       rouge (~> 2.0.7)
     xcpretty-travis-formatter (1.0.1)
       xcpretty (~> 0.2, >= 0.0.7)
-    zeitwerk (2.6.13)
 
 PLATFORMS
   arm64-darwin-21
@@ -288,9 +292,9 @@ PLATFORMS
   x86_64-linux
 
 DEPENDENCIES
-  activesupport (>= 6.1.7.3, < 7.1.0)
-  cocoapods (~> 1.13)
-  fastlane (~> 2)
+  activesupport (>= 6.1.7.5, != 7.1.0)
+  cocoapods (= 1.15.2)
+  fastlane (~> 2, >= 2.222.0)
   fastlane-plugin-aws_s3
   xcpretty (~> 0)
 
@@ -298,4 +302,4 @@ RUBY VERSION
    ruby 2.6.10p210
 
 BUNDLED WITH
-   2.3.22
+   2.4.19
diff --git a/README.md b/README.md
index 29a9e9b8ffdc..c10c954a1864 100644
--- a/README.md
+++ b/README.md
@@ -230,19 +230,20 @@ Within Xcode head to the build phase - `Bundle React Native code and images`.
     ```jsx
     npm i && npm run pod-install
     ```
-7. Depending on the platform you are targeting, run your Android/iOS app in production mode.
-8. Upon completion, the generated source map can be found at:
+4. Depending on the platform you are targeting, run your Android/iOS app in production mode.
+5. Upon completion, the generated source map can be found at:
   Android: `android/app/build/generated/sourcemaps/react/productionRelease/index.android.bundle.map`
   IOS: `main.jsbundle.map`
+  web: `dist/merged-source-map.js.map`
 
 ### Recording a Trace:
 1. Ensure you have generated the source map as outlined above.
 2. Launch the app in production mode.
-2. Navigate to the feature you wish to profile.
-3. Initiate the profiling session by tapping with four fingers to open the menu and selecting **`Use Profiling`**.
-4. Close the menu and interact with the app.
-5. After completing your interactions, tap with four fingers again and select to stop profiling.
-6. You will be presented with a **`Share`** option to export the trace, which includes a trace file (`Profile<app version>.cpuprofile`) and build info (`AppInfo<app version>.json`).
+3. Navigate to the feature you wish to profile.
+4. Initiate the profiling session by tapping with four fingers (on mobile) or `cmd+d` (on web) to open the menu and selecting **`Use Profiling`**.
+5. Close the menu and interact with the app.
+6. After completing your interactions, tap with four fingers or `cmd+d` again and select to stop profiling.
+7. You will be presented with a **`Share`** option to export the trace, which includes a trace file (`Profile<app version>.cpuprofile`) and build info (`AppInfo<app version>.json`).
 
 Build info:
 ```jsx
@@ -265,6 +266,7 @@ Build info:
 4. Use the following commands to symbolicate the trace for Android and iOS, respectively:
 Android: `npm run symbolicate-release:android`
 IOS: `npm run symbolicate-release:ios`
+web: `npm run symbolicate-release:web`
 5. A new file named `Profile_trace_for_<app version>-converted.json` will appear in your project's root folder.
 6. Open this file in your tool of choice:
     - SpeedScope ([https://www.speedscope.app](https://www.speedscope.app/))
@@ -663,7 +665,38 @@ Sometimes it might be beneficial to generate a local production version instead
 In order to generate a production web build, run `npm run build`, this will generate a production javascript build in the `dist/` folder.
 
 #### Local production build of the MacOS desktop app
-In order to compile a production desktop build, run `npm run desktop-build`, this will generate a production app in the `dist/Mac` folder named `Chat.app`.
+The commands used to compile a production or staging desktop build are `npm run desktop-build` and `npm run desktop-build-staging`, respectively. These will product an app in the `dist/Mac` folder named NewExpensify.dmg that you can install like a normal app.
+
+HOWEVER, by default those commands will try to notarize the build (signing it as Expensify) and publish it to the S3 bucket where it's hosted for users. In most cases you won't actually need or want to do that for your local testing. To get around that and disable those behaviors for your local build, apply the following diff:
+
+```diff
+diff --git a/config/electronBuilder.config.js b/config/electronBuilder.config.js
+index e4ed685f65..4c7c1b3667 100644
+--- a/config/electronBuilder.config.js
++++ b/config/electronBuilder.config.js
+@@ -42,9 +42,6 @@ module.exports = {
+         entitlements: 'desktop/entitlements.mac.plist',
+         entitlementsInherit: 'desktop/entitlements.mac.plist',
+         type: 'distribution',
+-        notarize: {
+-            teamId: '368M544MTT',
+-        },
+     },
+     dmg: {
+         title: 'New Expensify',
+diff --git a/scripts/build-desktop.sh b/scripts/build-desktop.sh
+index 791f59d733..526306eec1 100755
+--- a/scripts/build-desktop.sh
++++ b/scripts/build-desktop.sh
+@@ -35,4 +35,4 @@ npx webpack --config config/webpack/webpack.desktop.ts --env file=$ENV_FILE
+ title "Building Desktop App Archive Using Electron"
+ info ""
+ shift 1
+-npx electron-builder --config config/electronBuilder.config.js --publish always "$@"
++npx electron-builder --config config/electronBuilder.config.js --publish never "$@"
+```
+
+There may be some cases where you need to test a signed and published build, such as when testing the update flows. Instructions on setting that up can be found in [Testing Electron Auto-Update](https://github.com/Expensify/App/blob/main/desktop/README.md#testing-electron-auto-update). Good luck 🙃
 
 #### Local production build the iOS app
 In order to compile a production iOS build, run `npm run ios-build`, this will generate a `Chat.ipa` in the root directory of this project.
diff --git a/__mocks__/@react-native-firebase/crashlytics.ts b/__mocks__/@react-native-firebase/crashlytics.ts
index 2df845ba0c69..9a7179041320 100644
--- a/__mocks__/@react-native-firebase/crashlytics.ts
+++ b/__mocks__/@react-native-firebase/crashlytics.ts
@@ -1,6 +1,6 @@
 import type {FirebaseCrashlyticsTypes} from '@react-native-firebase/crashlytics';
 
-type CrashlyticsModule = Pick<FirebaseCrashlyticsTypes.Module, 'log' | 'recordError' | 'setCrashlyticsCollectionEnabled'>;
+type CrashlyticsModule = Pick<FirebaseCrashlyticsTypes.Module, 'log' | 'recordError' | 'setCrashlyticsCollectionEnabled' | 'setUserId'>;
 
 type CrashlyticsMock = () => CrashlyticsModule;
 
@@ -10,6 +10,7 @@ const crashlyticsMock: CrashlyticsMock = () => ({
     log: jest.fn(),
     recordError: jest.fn(),
     setCrashlyticsCollectionEnabled: jest.fn(),
+    setUserId: jest.fn(),
 });
 
 export default crashlyticsMock;
diff --git a/__mocks__/@react-navigation/native/index.ts b/__mocks__/@react-navigation/native/index.ts
index 9a6680ba0b6e..5bcafdc1856c 100644
--- a/__mocks__/@react-navigation/native/index.ts
+++ b/__mocks__/@react-navigation/native/index.ts
@@ -1,11 +1,65 @@
-import {useIsFocused as realUseIsFocused, useTheme as realUseTheme} from '@react-navigation/native';
+/* eslint-disable import/prefer-default-export, import/no-import-module-exports */
+import type * as ReactNavigation from '@react-navigation/native';
+import createAddListenerMock from '../../../tests/utils/createAddListenerMock';
 
-// We only want these mocked for storybook, not jest
-const useIsFocused: typeof realUseIsFocused = process.env.NODE_ENV === 'test' ? realUseIsFocused : () => true;
+const isJestEnv = process.env.NODE_ENV === 'test';
 
-// @ts-expect-error as we're mocking this function
-const useTheme: typeof realUseTheme = process.env.NODE_ENV === 'test' ? realUseTheme : () => ({});
+const realReactNavigation = isJestEnv ? jest.requireActual<typeof ReactNavigation>('@react-navigation/native') : (require('@react-navigation/native') as typeof ReactNavigation);
+
+const useIsFocused = isJestEnv ? realReactNavigation.useIsFocused : () => true;
+const useTheme = isJestEnv ? realReactNavigation.useTheme : () => ({});
+
+const {triggerTransitionEnd, addListener} = isJestEnv
+    ? createAddListenerMock()
+    : {
+          triggerTransitionEnd: () => {},
+          addListener: () => {},
+      };
+
+const useNavigation = () => ({
+    ...realReactNavigation.useNavigation,
+    navigate: jest.fn(),
+    getState: () => ({
+        routes: [],
+    }),
+    addListener,
+});
+
+type NativeNavigationMock = typeof ReactNavigation & {
+    triggerTransitionEnd: () => void;
+};
 
 export * from '@react-navigation/core';
-export * from '@react-navigation/native';
-export {useIsFocused, useTheme};
+const Link = realReactNavigation.Link;
+const LinkingContext = realReactNavigation.LinkingContext;
+const NavigationContainer = realReactNavigation.NavigationContainer;
+const ServerContainer = realReactNavigation.ServerContainer;
+const DarkTheme = realReactNavigation.DarkTheme;
+const DefaultTheme = realReactNavigation.DefaultTheme;
+const ThemeProvider = realReactNavigation.ThemeProvider;
+const useLinkBuilder = realReactNavigation.useLinkBuilder;
+const useLinkProps = realReactNavigation.useLinkProps;
+const useLinkTo = realReactNavigation.useLinkTo;
+const useScrollToTop = realReactNavigation.useScrollToTop;
+export {
+    // Overriden modules
+    useIsFocused,
+    useTheme,
+    useNavigation,
+    triggerTransitionEnd,
+
+    // Theme modules are left alone
+    Link,
+    LinkingContext,
+    NavigationContainer,
+    ServerContainer,
+    DarkTheme,
+    DefaultTheme,
+    ThemeProvider,
+    useLinkBuilder,
+    useLinkProps,
+    useLinkTo,
+    useScrollToTop,
+};
+
+export type {NativeNavigationMock};
diff --git a/__mocks__/@ua/react-native-airship.ts b/__mocks__/@ua/react-native-airship.ts
index ae7661ab672f..14909b58b31c 100644
--- a/__mocks__/@ua/react-native-airship.ts
+++ b/__mocks__/@ua/react-native-airship.ts
@@ -15,31 +15,31 @@ const iOS: Partial<typeof AirshipIOS> = {
     },
 };
 
-const pushIOS: AirshipPushIOS = jest.fn().mockImplementation(() => ({
+const pushIOS = jest.fn().mockImplementation(() => ({
     setBadgeNumber: jest.fn(),
     setForegroundPresentationOptions: jest.fn(),
     setForegroundPresentationOptionsCallback: jest.fn(),
-}))();
+}))() as AirshipPushIOS;
 
-const pushAndroid: AirshipPushAndroid = jest.fn().mockImplementation(() => ({
+const pushAndroid = jest.fn().mockImplementation(() => ({
     setForegroundDisplayPredicate: jest.fn(),
-}))();
+}))() as AirshipPushAndroid;
 
-const push: AirshipPush = jest.fn().mockImplementation(() => ({
+const push = jest.fn().mockImplementation(() => ({
     iOS: pushIOS,
     android: pushAndroid,
     enableUserNotifications: () => Promise.resolve(false),
     clearNotifications: jest.fn(),
     getNotificationStatus: () => Promise.resolve({airshipOptIn: false, systemEnabled: false, airshipEnabled: false}),
     getActiveNotifications: () => Promise.resolve([]),
-}))();
+}))() as AirshipPush;
 
-const contact: AirshipContact = jest.fn().mockImplementation(() => ({
+const contact = jest.fn().mockImplementation(() => ({
     identify: jest.fn(),
     getNamedUserId: () => Promise.resolve(undefined),
     reset: jest.fn(),
     module: jest.fn(),
-}))();
+}))() as AirshipContact;
 
 const Airship: Partial<AirshipRoot> = {
     addListener: jest.fn(),
diff --git a/__mocks__/fs.ts b/__mocks__/fs.ts
index cca0aa9520ec..3f8579557c82 100644
--- a/__mocks__/fs.ts
+++ b/__mocks__/fs.ts
@@ -1,3 +1,4 @@
+/* eslint-disable @typescript-eslint/no-unsafe-assignment */
 const {fs} = require('memfs');
 
 module.exports = fs;
diff --git a/__mocks__/react-native-permissions.ts b/__mocks__/react-native-permissions.ts
index 67b7db830d94..d98b7f32a611 100644
--- a/__mocks__/react-native-permissions.ts
+++ b/__mocks__/react-native-permissions.ts
@@ -35,30 +35,30 @@ const requestNotifications: jest.Mock<Notification> = jest.fn((options: Record<s
     status: RESULTS.GRANTED,
     settings: Object.keys(options)
         .filter((option: string) => notificationOptions.includes(option))
-        .reduce((acc: NotificationSettings, option: string) => ({...acc, [option]: true}), {
-            lockScreen: true,
-            notificationCenter: true,
-        }),
+        .reduce(
+            (acc: NotificationSettings, option: string) => {
+                acc[option] = true;
+                return acc;
+            },
+            {
+                lockScreen: true,
+                notificationCenter: true,
+            },
+        ),
 }));
 
 const checkMultiple: jest.Mock<ResultsCollection> = jest.fn((permissions: string[]) =>
-    permissions.reduce(
-        (acc: ResultsCollection, permission: string) => ({
-            ...acc,
-            [permission]: RESULTS.GRANTED,
-        }),
-        {},
-    ),
+    permissions.reduce((acc: ResultsCollection, permission: string) => {
+        acc[permission] = RESULTS.GRANTED;
+        return acc;
+    }, {}),
 );
 
 const requestMultiple: jest.Mock<ResultsCollection> = jest.fn((permissions: string[]) =>
-    permissions.reduce(
-        (acc: ResultsCollection, permission: string) => ({
-            ...acc,
-            [permission]: RESULTS.GRANTED,
-        }),
-        {},
-    ),
+    permissions.reduce((acc: ResultsCollection, permission: string) => {
+        acc[permission] = RESULTS.GRANTED;
+        return acc;
+    }, {}),
 );
 
 export {
diff --git a/__mocks__/react-native-webview.ts b/__mocks__/react-native-webview.ts
index 8266c7b1eda0..6acf58101b55 100644
--- a/__mocks__/react-native-webview.ts
+++ b/__mocks__/react-native-webview.ts
@@ -1,8 +1,8 @@
-import type {View as RNView} from 'react-native';
+import type ReactNative from 'react-native';
 
 jest.mock('react-native-webview', () => {
-    const {View} = require('react-native');
+    const {View} = require<typeof ReactNative>('react-native');
     return {
-        WebView: () => View as RNView,
+        WebView: () => View,
     };
 });
diff --git a/__mocks__/react-native.ts b/__mocks__/react-native.ts
index 27b78b308446..3deeabf6df2a 100644
--- a/__mocks__/react-native.ts
+++ b/__mocks__/react-native.ts
@@ -41,7 +41,7 @@ jest.doMock('react-native', () => {
         };
     };
 
-    const reactNativeMock: ReactNativeMock = Object.setPrototypeOf(
+    const reactNativeMock = Object.setPrototypeOf(
         {
             NativeModules: {
                 ...ReactNative.NativeModules,
@@ -86,7 +86,7 @@ jest.doMock('react-native', () => {
             },
             Dimensions: {
                 ...ReactNative.Dimensions,
-                addEventListener: jest.fn(),
+                addEventListener: jest.fn(() => ({remove: jest.fn()})),
                 get: () => dimensions,
                 set: (newDimensions: Record<string, number>) => {
                     dimensions = newDimensions;
@@ -98,11 +98,14 @@ jest.doMock('react-native', () => {
             // so it seems easier to just run the callback immediately in tests.
             InteractionManager: {
                 ...ReactNative.InteractionManager,
-                runAfterInteractions: (callback: () => void) => callback(),
+                runAfterInteractions: (callback: () => void) => {
+                    callback();
+                    return {cancel: () => {}};
+                },
             },
         },
         ReactNative,
-    );
+    ) as ReactNativeMock;
 
     return reactNativeMock;
 });
diff --git a/android/app/build.gradle b/android/app/build.gradle
index 7b8271cfcbf2..1b310ee679cd 100644
--- a/android/app/build.gradle
+++ b/android/app/build.gradle
@@ -2,22 +2,32 @@ apply plugin: "com.android.application"
 apply plugin: "org.jetbrains.kotlin.android"
 apply plugin: "com.facebook.react"
 apply plugin: "com.google.firebase.firebase-perf"
+apply plugin: "fullstory"
 apply from: project(':react-native-config').projectDir.getPath() + "/dotenv.gradle"
 
 /**
  * This is the configuration block to customize your React Native Android app.
  * By default you don't need to apply any configuration, just uncomment the lines you need.
  */
+
+/* Fullstory settings */
+fullstory {
+    org 'o-1WN56P-na1'
+    enabledVariants 'all'
+    logcatLevel 'debug'
+    recordOnStart false
+}
+
 react {
     /* Folders */
     //   The root of your project, i.e. where "package.json" lives. Default is '..'
-    // root = file("../")
-    //   The folder where the react-native NPM package is. Default is ../node_modules/react-native
-    // reactNativeDir = file("../node_modules/react-native")
-    //   The folder where the react-native Codegen package is. Default is ../node_modules/@react-native/codegen
-    // codegenDir = file("../node_modules/@react-native/codegen")
-    //   The cli.js file which is the React Native CLI entrypoint. Default is ../node_modules/react-native/cli.js
-    // cliFile = file("../node_modules/react-native/cli.js")
+    // root = file("../../")
+    //   The folder where the react-native NPM package is. Default is ../../node_modules/react-native
+    // reactNativeDir = file("../../node_modules/react-native")
+    //   The folder where the react-native Codegen package is. Default is ../../node_modules/@react-native/codegen
+    // codegenDir = file("../../node_modules/@react-native/codegen")
+    //   The cli.js file which is the React Native CLI entrypoint. Default is ../../node_modules/react-native/cli.js
+    // cliFile = file("../../node_modules/react-native/cli.js")
 
     /* Variants */
     //   The list of variants to that are debuggable. For those we're going to
@@ -52,6 +62,8 @@ react {
     //   The list of flags to pass to the Hermes compiler. By default is "-O", "-output-source-map"
     // hermesFlags = ["-O", "-output-source-map"]
     //
+    /* Autolinking */
+    autolinkLibrariesWithApp()
     // Added by install-expo-modules
     entryFile = file(["node", "-e", "require('expo/scripts/resolveAppEntry')", rootDir.getAbsoluteFile().getParentFile().getAbsolutePath(), "android", "absolute"].execute(null, rootDir).text.trim())
     cliFile = new File(["node", "--print", "require.resolve('@expo/cli')"].execute(null, rootDir).text.trim())
@@ -98,8 +110,8 @@ android {
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
         multiDexEnabled rootProject.ext.multiDexEnabled
-        versionCode 1001047002
-        versionName "1.4.70-2"
+        versionCode 1009002601
+        versionName "9.0.26-1"
         // Supported language variants must be declared here to avoid from being removed during the compilation.
         // This also helps us to not include unnecessary language variants in the APK.
         resConfigs "en", "es"
@@ -162,7 +174,7 @@ android {
             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. 
+            // 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
@@ -181,6 +193,23 @@ android {
     }
 }
 
+afterEvaluate {
+    // As the App is building from source, we need to make sure hermesc is built before the JS bundle is created.
+    // Otherwise the release version of the app will fail to build due to missing hermesc.
+    def hermesCTask = gradle.includedBuild("react-native").task(":packages:react-native:ReactAndroid:hermes-engine:buildHermesC")
+
+    android.applicationVariants.configureEach { variant ->
+        if (variant.buildType.name == "release") {
+            def variantName = variant.name.capitalize()
+            def bundleTask = tasks.named("createBundle${variantName}JsAndAssets").getOrNull()
+
+            if (bundleTask != null) {
+                bundleTask.dependsOn(hermesCTask)
+            }
+        }
+    }
+}
+
 dependencies {
     // The version of react-native is set by the React Native Gradle Plugin
     implementation("com.facebook.react:react-android")
@@ -219,6 +248,5 @@ dependencies {
     implementation("androidx.lifecycle:lifecycle-viewmodel-ktx:2.4.0")
 }
 
-apply from: file("../../node_modules/@react-native-community/cli-platform-android/native_modules.gradle"); applyNativeModulesAppBuildGradle(project)
 apply plugin: 'com.google.gms.google-services'  // Google Play services Gradle plugin
 apply plugin: 'com.google.firebase.crashlytics'
diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml
index 520602a28a02..142d919a7a18 100644
--- a/android/app/src/main/AndroidManifest.xml
+++ b/android/app/src/main/AndroidManifest.xml
@@ -73,6 +73,8 @@
                 <data android:scheme="https" android:host="new.expensify.com" android:pathPrefix="/send"/>
                 <data android:scheme="https" android:host="new.expensify.com" android:pathPrefix="/pay"/>
                 <data android:scheme="https" android:host="new.expensify.com" android:pathPrefix="/money2020"/>
+                <data android:scheme="https" android:host="new.expensify.com" android:pathPrefix="/track-expense"/>
+                <data android:scheme="https" android:host="new.expensify.com" android:pathPrefix="/submit-expense"/>
 
                 <!-- Staging URLs -->
                 <data android:scheme="https" android:host="staging.new.expensify.com" android:pathPrefix="/r"/>
@@ -94,6 +96,8 @@
                 <data android:scheme="https" android:host="staging.new.expensify.com" android:pathPrefix="/send"/>
                 <data android:scheme="https" android:host="staging.new.expensify.com" android:pathPrefix="/pay"/>
                 <data android:scheme="https" android:host="staging.new.expensify.com" android:pathPrefix="/money2020"/>
+                <data android:scheme="https" android:host="staging.new.expensify.com" android:pathPrefix="/track-expense"/>
+                <data android:scheme="https" android:host="staging.new.expensify.com" android:pathPrefix="/submit-expense"/>
             </intent-filter>
         </activity>
 
diff --git a/android/app/src/main/java/com/expensify/chat/MainApplication.kt b/android/app/src/main/java/com/expensify/chat/MainApplication.kt
index e660a871359d..26a28d9955a0 100644
--- a/android/app/src/main/java/com/expensify/chat/MainApplication.kt
+++ b/android/app/src/main/java/com/expensify/chat/MainApplication.kt
@@ -1,5 +1,7 @@
 package com.expensify.chat
 
+import com.facebook.react.common.assets.ReactFontManager
+
 import android.app.ActivityManager
 import android.content.res.Configuration
 import android.database.CursorWindow
@@ -42,6 +44,9 @@ class MainApplication : MultiDexApplication(), ReactApplication {
 
     override fun onCreate() {
         super.onCreate()
+        ReactFontManager.getInstance().addCustomFont(this, "Expensify New Kansas", R.font.expensify_new_kansas)
+        ReactFontManager.getInstance().addCustomFont(this, "Expensify Neue", R.font.expensify_neue)
+        ReactFontManager.getInstance().addCustomFont(this, "Expensify Mono", R.font.expensify_mono)
 
         RNPerformance.getInstance().mark("appCreationStart", false);
 
@@ -52,14 +57,14 @@ class MainApplication : MultiDexApplication(), ReactApplication {
         SoLoader.init(this,  /* native exopackage */false)
         if (BuildConfig.IS_NEW_ARCHITECTURE_ENABLED) {
             // If you opted-in for the New Architecture, we load the native entry point for this app.
-            load()
+            load(bridgelessEnabled = false)
         }
         if (BuildConfig.DEBUG) {
             FirebaseCrashlytics.getInstance().setCrashlyticsCollectionEnabled(false)
         }
 
         // Force the app to LTR mode.
-        val sharedI18nUtilInstance = I18nUtil.getInstance()
+        val sharedI18nUtilInstance = I18nUtil.instance
         sharedI18nUtilInstance.allowRTL(applicationContext, false)
 
         // Start the "js_load" custom performance tracing metric. This timer is stopped by a native
diff --git a/android/app/src/main/res/drawable/rn_edit_text_material.xml b/android/app/src/main/res/drawable/rn_edit_text_material.xml
index 73b37e4d9963..fd2f6544048e 100644
--- a/android/app/src/main/res/drawable/rn_edit_text_material.xml
+++ b/android/app/src/main/res/drawable/rn_edit_text_material.xml
@@ -17,8 +17,8 @@
        android:insetLeft="@dimen/abc_edit_text_inset_horizontal_material"
        android:insetRight="@dimen/abc_edit_text_inset_horizontal_material"
        android:insetTop="@dimen/abc_edit_text_inset_top_material"
-       android:insetBottom="@dimen/abc_edit_text_inset_bottom_material">
-
+       android:insetBottom="@dimen/abc_edit_text_inset_bottom_material"
+       >
     <selector>
         <!--
           This file is a copy of abc_edit_text_material (https://bit.ly/3k8fX7I).
diff --git a/android/app/src/main/res/font/expensify_mono.xml b/android/app/src/main/res/font/expensify_mono.xml
new file mode 100644
index 000000000000..346a34ba22b6
--- /dev/null
+++ b/android/app/src/main/res/font/expensify_mono.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<font-family xmlns:app="http://schemas.android.com/apk/res-auto">
+  <font app:fontStyle="normal" app:fontWeight="400" app:font="@font/expensifymono_regular"/>
+  <font app:fontStyle="normal" app:fontWeight="700" app:font="@font/expensifymono_bold"/>
+</font-family>
diff --git a/android/app/src/main/res/font/expensify_neue.xml b/android/app/src/main/res/font/expensify_neue.xml
new file mode 100644
index 000000000000..74cd402c5535
--- /dev/null
+++ b/android/app/src/main/res/font/expensify_neue.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<font-family xmlns:app="http://schemas.android.com/apk/res-auto">
+  <font app:fontStyle="italic" app:fontWeight="400" app:font="@font/expensifyneue_italic"/>
+  <font app:fontStyle="normal" app:fontWeight="400" app:font="@font/expensifyneue_regular"/>
+  <font app:fontStyle="italic" app:fontWeight="700" app:font="@font/expensifyneue_bolditalic"/>
+  <font app:fontStyle="normal" app:fontWeight="700" app:font="@font/expensifyneue_bold"/>
+</font-family>
diff --git a/android/app/src/main/res/font/expensify_new_kansas.xml b/android/app/src/main/res/font/expensify_new_kansas.xml
new file mode 100644
index 000000000000..18c2426cdad2
--- /dev/null
+++ b/android/app/src/main/res/font/expensify_new_kansas.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<font-family xmlns:app="http://schemas.android.com/apk/res-auto">
+  <font app:fontStyle="italic" app:fontWeight="500" app:font="@font/expensifynewkansas_mediumitalic"/>
+  <font app:fontStyle="normal" app:fontWeight="500" app:font="@font/expensifynewkansas_medium"/>
+</font-family>
diff --git a/android/app/src/main/assets/fonts/ExpensifyMono-Bold.otf b/android/app/src/main/res/font/expensifymono_bold.otf
similarity index 100%
rename from android/app/src/main/assets/fonts/ExpensifyMono-Bold.otf
rename to android/app/src/main/res/font/expensifymono_bold.otf
diff --git a/android/app/src/main/assets/fonts/ExpensifyMono-Regular.otf b/android/app/src/main/res/font/expensifymono_regular.otf
similarity index 100%
rename from android/app/src/main/assets/fonts/ExpensifyMono-Regular.otf
rename to android/app/src/main/res/font/expensifymono_regular.otf
diff --git a/android/app/src/main/assets/fonts/ExpensifyNeue-Bold.otf b/android/app/src/main/res/font/expensifyneue_bold.otf
similarity index 100%
rename from android/app/src/main/assets/fonts/ExpensifyNeue-Bold.otf
rename to android/app/src/main/res/font/expensifyneue_bold.otf
diff --git a/android/app/src/main/assets/fonts/ExpensifyNeue-BoldItalic.otf b/android/app/src/main/res/font/expensifyneue_bolditalic.otf
similarity index 100%
rename from android/app/src/main/assets/fonts/ExpensifyNeue-BoldItalic.otf
rename to android/app/src/main/res/font/expensifyneue_bolditalic.otf
diff --git a/android/app/src/main/assets/fonts/ExpensifyNeue-Italic.otf b/android/app/src/main/res/font/expensifyneue_italic.otf
similarity index 100%
rename from android/app/src/main/assets/fonts/ExpensifyNeue-Italic.otf
rename to android/app/src/main/res/font/expensifyneue_italic.otf
diff --git a/android/app/src/main/assets/fonts/ExpensifyNeue-Regular.otf b/android/app/src/main/res/font/expensifyneue_regular.otf
similarity index 100%
rename from android/app/src/main/assets/fonts/ExpensifyNeue-Regular.otf
rename to android/app/src/main/res/font/expensifyneue_regular.otf
diff --git a/android/app/src/main/assets/fonts/ExpensifyNewKansas-Medium.otf b/android/app/src/main/res/font/expensifynewkansas_medium.otf
similarity index 100%
rename from android/app/src/main/assets/fonts/ExpensifyNewKansas-Medium.otf
rename to android/app/src/main/res/font/expensifynewkansas_medium.otf
diff --git a/android/app/src/main/assets/fonts/ExpensifyNewKansas-MediumItalic.otf b/android/app/src/main/res/font/expensifynewkansas_mediumitalic.otf
similarity index 100%
rename from android/app/src/main/assets/fonts/ExpensifyNewKansas-MediumItalic.otf
rename to android/app/src/main/res/font/expensifynewkansas_mediumitalic.otf
diff --git a/android/app/src/main/res/font/expneuebold.otf b/android/app/src/main/res/font/expneuebold.otf
deleted file mode 100755
index 7534aecda322..000000000000
Binary files a/android/app/src/main/res/font/expneuebold.otf and /dev/null differ
diff --git a/android/app/src/main/res/font/expneueregular.otf b/android/app/src/main/res/font/expneueregular.otf
deleted file mode 100755
index d4d8cbe63b44..000000000000
Binary files a/android/app/src/main/res/font/expneueregular.otf and /dev/null differ
diff --git a/android/app/src/main/res/values/styles.xml b/android/app/src/main/res/values/styles.xml
index a040598e982d..75126afbd407 100644
--- a/android/app/src/main/res/values/styles.xml
+++ b/android/app/src/main/res/values/styles.xml
@@ -24,7 +24,7 @@
     <style name="TextViewSpinnerDropDownItem" parent="Widget.AppCompat.DropDownItem.Spinner">
         <item name="android:textColor">@color/white</item>
         <item name="android:textSize">@dimen/spinner_font_size</item>
-        <item name="android:fontFamily">@font/expneuebold</item>
+        <item name="android:fontFamily">@font/expensifyneue_bold</item>
     </style>
 
     <!-- Theme used by the Alert dialog -->
@@ -37,15 +37,15 @@
     </style>
 
     <style name="AlertTextAppearanceSmall" parent="TextAppearance.AppCompat.Small">
-        <item name="android:fontFamily">@font/expneueregular</item>
+        <item name="android:fontFamily">@font/expensifyneue_regular</item>
     </style>
 
     <style name="AlertTextAppearanceMedium" parent="TextAppearance.AppCompat.Medium">
-        <item name="android:fontFamily">@font/expneueregular</item>
+        <item name="android:fontFamily">@font/expensifyneue_regular</item>
     </style>
 
     <style name="AlertTextAppearanceLarge" parent="TextAppearance.AppCompat.Large">
-        <item name="android:fontFamily">@font/expneuebold</item>
+        <item name="android:fontFamily">@font/expensifyneue_bold</item>
     </style>
 
     <style name="Theme.SplashScreen.Common" parent="Theme.AppCompat.NoActionBar">
diff --git a/android/build.gradle b/android/build.gradle
index 10600480d8bb..85e547439cc1 100644
--- a/android/build.gradle
+++ b/android/build.gradle
@@ -3,15 +3,15 @@
 buildscript {
     ext {
         buildToolsVersion = "34.0.0"
-        minSdkVersion = 21
+        minSdkVersion = 23
         compileSdkVersion = 34
         targetSdkVersion = 34
-        ndkVersion = "25.1.8937393"
+        ndkVersion = "26.1.10909125"
 
         androidXCore = "1.0.2"
         multiDexEnabled = true
         googlePlayServicesVersion = "17.0.0"
-        kotlinVersion = '1.8.10'
+        kotlinVersion = "1.9.24"
 
         // This property configures the type of Mapbox SDK used by the @rnmapbox/maps library.
         // "mapbox" indicates the usage of the Mapbox SDK.
@@ -20,6 +20,7 @@ buildscript {
     repositories {
         google()
         mavenCentral()
+        maven {url "https://maven.fullstory.com"}
     }
     dependencies {
         classpath("com.android.tools.build:gradle")
@@ -27,6 +28,9 @@ buildscript {
         classpath("com.google.gms:google-services:4.3.4")
         classpath("com.google.firebase:firebase-crashlytics-gradle:2.7.1")
         classpath("com.google.firebase:perf-plugin:1.4.1")
+        // Fullstory integration
+        classpath ("com.fullstory:gradle-plugin-local:1.49.0")
+
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
         classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion")
@@ -70,7 +74,7 @@ allprojects {
                 // 'mapbox' is the fixed username for Mapbox's Maven repository.
                 username = 'mapbox'
 
-                // The value for password is read from the 'MAPBOX_DOWNLOADS_TOKEN' gradle property. 
+                // The value for password is read from the 'MAPBOX_DOWNLOADS_TOKEN' gradle property.
                 // Run "npm run setup-mapbox-sdk" to set this property in «USER_HOME»/.gradle/gradle.properties
 
                 // Example gradle.properties entry:
diff --git a/android/gradle.properties b/android/gradle.properties
index 139ba429360b..87333d20f743 100644
--- a/android/gradle.properties
+++ b/android/gradle.properties
@@ -10,7 +10,7 @@
 # Specifies the JVM arguments used for the daemon process.
 # The setting is particularly useful for tweaking memory settings.
 # Default value: -Xmx512m -XX:MaxMetaspaceSize=256m
-org.gradle.jvmargs=-Xmx4096m -XX:MaxMetaspaceSize=512m
+org.gradle.jvmargs=-Xmx6g -XX:MaxMetaspaceSize=512m
 
 # When configured, Gradle will run in incubating parallel mode.
 # This option should only be used with decoupled projects. More details, visit
diff --git a/android/gradle/wrapper/gradle-wrapper.properties b/android/gradle/wrapper/gradle-wrapper.properties
index d11cdd907dd9..6f7a6eb33e80 100644
--- a/android/gradle/wrapper/gradle-wrapper.properties
+++ b/android/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.3-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-all.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
diff --git a/android/gradlew b/android/gradlew
index 0adc8e1a5321..b740cf13397a 100755
--- a/android/gradlew
+++ b/android/gradlew
@@ -55,7 +55,7 @@
 #       Darwin, MinGW, and NonStop.
 #
 #   (3) This script is generated from the Groovy template
-#       https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+#       https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
 #       within the Gradle project.
 #
 #       You can find Gradle at https://github.com/gradle/gradle/.
@@ -145,7 +145,7 @@ if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
     case $MAX_FD in #(
       max*)
         # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
-        # shellcheck disable=SC3045
+        # shellcheck disable=SC2039,SC3045
         MAX_FD=$( ulimit -H -n ) ||
             warn "Could not query maximum file descriptor limit"
     esac
@@ -153,7 +153,7 @@ if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
       '' | soft) :;; #(
       *)
         # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
-        # shellcheck disable=SC3045
+        # shellcheck disable=SC2039,SC3045
         ulimit -n "$MAX_FD" ||
             warn "Could not set maximum file descriptor limit to $MAX_FD"
     esac
@@ -202,11 +202,11 @@ fi
 # Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
 DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
 
-# Collect all arguments for the java command;
-#   * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
-#     shell script including quotes and variable substitutions, so put them in
-#     double quotes to make sure that they get re-expanded; and
-#   * put everything else in single quotes, so that it's not re-expanded.
+# Collect all arguments for the java command:
+#   * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
+#     and any embedded shellness will be escaped.
+#   * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be
+#     treated as '${Hostname}' itself on the command line.
 
 set -- \
         "-Dorg.gradle.appname=$APP_BASE_NAME" \
diff --git a/android/gradlew.bat b/android/gradlew.bat
index 2578005b568f..0faad1aea57c 100644
--- a/android/gradlew.bat
+++ b/android/gradlew.bat
@@ -43,11 +43,11 @@ set JAVA_EXE=java.exe
 %JAVA_EXE% -version >NUL 2>&1
 if %ERRORLEVEL% equ 0 goto execute
 
-echo.
-echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
+echo. 1>&2
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2
+echo. 1>&2
+echo Please set the JAVA_HOME variable in your environment to match the 1>&2
+echo location of your Java installation. 1>&2
 
 goto fail
 
@@ -57,11 +57,11 @@ set JAVA_EXE=%JAVA_HOME%/bin/java.exe
 
 if exist "%JAVA_EXE%" goto execute
 
-echo.
-echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
+echo. 1>&2
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2
+echo. 1>&2
+echo Please set the JAVA_HOME variable in your environment to match the 1>&2
+echo location of your Java installation. 1>&2
 
 goto fail
 
diff --git a/android/link-assets-manifest.json b/android/link-assets-manifest.json
index a3ac1c2332f9..1c59d667fca1 100644
--- a/android/link-assets-manifest.json
+++ b/android/link-assets-manifest.json
@@ -1,5 +1,5 @@
 {
-  "migIndex": 1,
+  "migIndex": 2,
   "data": [
     {
       "path": "assets/fonts/native/ExpensifyMono-Bold.otf",
diff --git a/android/settings.gradle b/android/settings.gradle
index 990f07d5e87b..1347572bcc91 100644
--- a/android/settings.gradle
+++ b/android/settings.gradle
@@ -1,17 +1,15 @@
+pluginManagement { includeBuild("../node_modules/@react-native/gradle-plugin") }
+plugins { id("com.facebook.react.settings") }
+extensions.configure(com.facebook.react.ReactSettingsExtension){ ex -> ex.autolinkLibrariesFromCommand() }
 rootProject.name = 'NewExpensify'
 include ':react-native-webview'
 project(':react-native-webview').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-webview/android')
-include ':react-native-webview'
-project(':react-native-webview').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-webview/android')
-include ':react-native-webview'
-project(':react-native-webview').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-webview/android')
 include ':react-native-image-size'
 project(':react-native-image-size').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-image-size/android')
 include ':react-native-config'
 project(':react-native-config').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-config/android')
 include ':react-native-plaid-link-sdk'
 project(':react-native-plaid-link-sdk').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-plaid-link-sdk/android')
-apply from: file("../node_modules/@react-native-community/cli-platform-android/native_modules.gradle"); applyNativeModulesSettingsGradle(settings)
 include ':app'
 includeBuild('../node_modules/@react-native/gradle-plugin')
 includeBuild('../node_modules/react-native') {
diff --git a/assets/README.md b/assets/README.md
new file mode 100644
index 000000000000..cf9fdd9e859f
--- /dev/null
+++ b/assets/README.md
@@ -0,0 +1,152 @@
+# Assets management
+
+## Fonts
+
+All fonts used by web, desktop and native apps are located inside `assets/fonts/` folder. The native app will use fonts with `.otf` or `.ttf` formats, where the web app will use fonts with `.otf`, `.ttf`, `.woff` or `.woff2` formats.
+
+### Adding / Removing fonts
+
+#### Native
+
+The font files used by the native apps are stored inside `assets/fonts/native/` folder. We use the [@react-native-community/cli-link-assets](https://github.com/react-native-community/cli/tree/main/packages/cli-link-assets) tool to link the fonts to each platform (Android and iOS).
+
+To add or remove a font used in the native app:
+
+1. Add or remove the desired font files inside `assets/fonts/native/` folder.
+2. Run `npx @react-native-community/cli-link-assets` to link the assets with the native files.
+   * On Android, native files like `MainApplication.kt` and font files will be synced with the updated fonts.
+   * On iOS, native files like `project.pbxproj` and `Info.plist` will be synced with the updated fonts.
+3. If you are adding a new font family into the project:
+   1. Add all the new font family variants to the [FontFamilyKey type](https://github.com/Expensify/App/blob/main/src/styles/utils/FontUtils/fontFamily/types.ts).
+      ```ts
+      type FontFamilyKey =
+          | 'SYSTEM'
+          | 'MONOSPACE'
+          | 'MONOSPACE_BOLD'
+          | 'EXP_NEUE'
+          | 'EXP_NEUE_BOLD'
+          | 'EXP_NEUE_ITALIC'
+          | 'EXP_NEUE_BOLD_ITALIC'
+          | 'EXP_NEW_KANSAS_MEDIUM'
+          | 'EXP_NEW_KANSAS_MEDIUM_ITALIC'
+          | 'NEW_FONT_FAMILY' // Add it here.
+          | 'NEW_FONT_FAMILY_BOLD' // Add it here (it it exists).
+          | 'NEW_FONT_FAMILY_ITALIC' // Add it here (it it exists).
+          | 'NEW_FONT_FAMILY_BOLD_ITALIC'; // Add it here (it it exists).
+      ```
+   2. Add all the font variants to the [singleFontFamily file](https://github.com/Expensify/App/blob/main/src/styles/utils/FontUtils/fontFamily/singleFontFamily/index.ts), replacing `<new_font_family>` with the font family name (you can find the name inside `MainApplication.kt` file).
+      ```ts
+      const fontFamily: FontFamilyStyles = {
+          ...
+          NEW_FONT_FAMILY: {
+              fontFamily: '<new_font_family>',
+              fontStyle: 'normal',
+              fontWeight: fontWeight.normal,
+          },
+          // Add the other variants too.
+      };
+      ```
+4. If you are removing a font family from the project:
+   1. Remove all the font family variants from the [FontFamilyKey type](https://github.com/Expensify/App/blob/main/src/styles/utils/FontUtils/fontFamily/types.ts).
+   2. Remove all the font family variants from the [singleFontFamily file](https://github.com/Expensify/App/blob/main/src/styles/utils/FontUtils/fontFamily/singleFontFamily/index.ts).
+
+#### Web / Desktop
+
+The font files used by the web / desktop apps are stored inside `assets/fonts/web/` folder.
+
+To add or remove a font used in the web / desktop app:
+
+1. Add or remove the desired font files inside `assets/fonts/web/` folder.
+2. If you are adding a new font family into the project:
+   1. Add all the new font family variants to the [FontFamilyKey type](https://github.com/Expensify/App/blob/main/src/styles/utils/FontUtils/fontFamily/types.ts).
+   2. Add all the font variants to the [multiFontFamily file](https://github.com/Expensify/App/blob/main/src/styles/utils/FontUtils/fontFamily/multiFontFamily/index.ts), replacing `<new_font_family>` with the font family name.
+      ```ts
+      const fontFamily: FontFamilyStyles = {
+          ...
+          NEW_FONT_FAMILY: {
+              fontFamily: '<new_font_family>, Segoe UI Emoji, Noto Color Emoji',
+              fontStyle: 'normal',
+              fontWeight: fontWeight.normal,
+          },
+          // Add the other variants too.
+      };
+      ```
+   3. Add all the new font family variants to the [fonts.css file](https://github.com/Expensify/App/blob/main/assets/css/fonts.css), replacing `<new_font_family>` with the font family name and `<font-family-file>` with the file name.
+      ```css
+      @font-face {
+          font-family: <new_font_family>;
+          font-weight: 500;
+          font-style: normal;
+          src: url('/fonts/<font-family-file>.woff2') format('woff2'),  url('/fonts/<font-family-file>.woff') format('woff');
+      }
+      /* Add the other variants too. */
+      ```
+3. If you are removing a font family from the project:
+   1. Remove all the font family variants from the [FontFamilyKey type](https://github.com/Expensify/App/blob/main/src/styles/utils/FontUtils/fontFamily/types.ts).
+   2. Remove all the font family variants from the [multiFontFamily file](https://github.com/Expensify/App/blob/main/src/styles/utils/FontUtils/fontFamily/multiFontFamily/index.ts).
+   3. Remove all the font family variants from the [fonts.css file](https://github.com/Expensify/App/blob/main/assets/css/fonts.css).
+
+#### Storybook (Web)
+
+The font files used by the Storybook web app are stored inside `assets/fonts/web/` folder.
+
+To add or remove a font used in the storybook web app:
+
+1. Add or remove the desired font files inside `assets/fonts/web/` folder.
+2. If you are adding a new font family into the project:
+   1. Add all the new font family variants to the [fonts.css storybook file](https://github.com/Expensify/App/blob/main/.storybook/fonts.css), replacing `<new_font_family>` with the font family name and `<font-family-file>` with the file name.
+      ```css
+      @font-face {
+          font-family: <new_font_family>;
+          font-weight: 500;
+          font-style: normal;
+          src: url('../assets/fonts/web/<font-family-file>.woff2') format('woff2'),  url('../assets/fonts/web/<font-family-file>.woff') format('woff');
+      }
+      /* Add the other variants too. */
+      ```
+3. If you are removing a font family from the project:
+   1. Remove all the font family variants from the [fonts.css storybook file](https://github.com/Expensify/App/blob/main/.storybook/fonts.css).
+
+#### Expensify Help (Web)
+
+The fonts files used by the Expensify Help web app are located inside `docs/assets/fonts/` folder.
+
+To add or remove a font used in the Expensify Help web app:
+
+1. Add or remove the desired font files inside `docs/assets/fonts/` folder.
+2. If you are adding a new font family into the project:
+   1. Add all the new font family variants to the [_fonts.scss file](https://github.com/Expensify/App/blob/main/docs/_sass/_fonts.scss), replacing `<new_font_family>` with the font family name and `<font-family-file>` with the file name.
+      ```scss
+      @font-face {
+        font-family: <new_font_family>;
+        font-weight: 500;
+        font-style: normal;
+        src: url('/assets/fonts/<font-family-file>.woff2') format('woff2'), url('/assets/fonts/<font-family-file>.woff') format('woff');
+      }
+      /* Add the other variants too. */
+      ```
+3. If you are removing a font family from the project:
+   1. Remove all the font family variants from the [_fonts.scss file](https://github.com/Expensify/App/blob/main/docs/_sass/_fonts.scss).
+
+### Using the fonts
+
+#### Native / Web / Desktop
+
+To use your fonts in the app, just import the desired font from [FontUtils](https://github.com/Expensify/App/blob/main/src/styles/utils/FontUtils/index.ts) and use in your style objects.
+
+You should use `FontUtils.fontFamily.platform.<font-family-key>` for most use cases in the app because it will use the correspondent set of font families (with fallback fonts or not) according to the platform. `FontUtils.fontFamily.single.` and `FontUtils.fontFamily.multi.` should only be used when we want a specific set of font families independently of the platform.
+
+```ts
+import FontUtils from '@styles/utils/FontUtils';
+
+const style = {
+    h4: {
+        ...FontUtils.fontFamily.platform.NEW_FONT_FAMILY,
+        fontSize: variables.fontSizeLabel,
+    },
+};
+```
+
+#### Storybook / Expensify Help
+
+To use your fonts in Storybook and Expensify Help, simply apply and use them as you would with regular web files.
\ No newline at end of file
diff --git a/assets/animations/Abracadabra.lottie b/assets/animations/Abracadabra.lottie
new file mode 100644
index 000000000000..8805aed1944e
Binary files /dev/null and b/assets/animations/Abracadabra.lottie differ
diff --git a/assets/css/fonts.css b/assets/css/fonts.css
index 078cec114c31..7705be0b1140 100644
--- a/assets/css/fonts.css
+++ b/assets/css/fonts.css
@@ -1,54 +1,54 @@
 @font-face {
-    font-family: ExpensifyNeue-Regular;
+    font-family: Expensify Neue;
     font-weight: 400;
     font-style: normal;
     src: url('/fonts/ExpensifyNeue-Regular.woff2') format('woff2'), url('/fonts/ExpensifyNeue-Regular.woff') format('woff');
 }
 
 @font-face {
-    font-family: ExpensifyNeue-Regular;
+    font-family: Expensify Neue;
     font-weight: 700;
     font-style: normal;
     src: url('/fonts/ExpensifyNeue-Bold.woff2') format('woff2'), url('/fonts/ExpensifyNeue-Bold.woff') format('woff');
 }
 
 @font-face {
-    font-family: ExpensifyNeue-Regular;
+    font-family: Expensify Neue;
     font-weight: 400;
     font-style: italic;
     src: url('/fonts/ExpensifyNeue-Italic.woff2') format('woff2'), url('/fonts/ExpensifyNeue-Italic.woff') format('woff');
 }
 
 @font-face {
-    font-family: ExpensifyNeue-Regular;
+    font-family: Expensify Neue;
     font-weight: 700;
     font-style: italic;
     src: url('/fonts/ExpensifyNeue-BoldItalic.woff2') format('woff2'), url('/fonts/ExpensifyNeue-BoldItalic.woff') format('woff');
 }
 
 @font-face {
-    font-family: ExpensifyMono-Regular;
+    font-family: Expensify Mono;
     font-weight: 400;
     font-style: normal;
     src: url('/fonts/ExpensifyMono-Regular.woff2') format('woff2'), url('/fonts/ExpensifyMono-Regular.woff') format('woff');
 }
 
 @font-face {
-    font-family: ExpensifyMono-Bold;
+    font-family: Expensify Mono;
     font-weight: 700;
     font-style: normal;
     src: url('/fonts/ExpensifyMono-Bold.woff2') format('woff2'),  url('/fonts/ExpensifyMono-Bold.woff') format('woff');
 }
 
 @font-face {
-    font-family: ExpensifyNewKansas-Medium;
+    font-family: Expensify New Kansas;
     font-weight: 500;
     font-style: normal;
     src: url('/fonts/ExpensifyNewKansas-Medium.woff2') format('woff2'),  url('/fonts/ExpensifyNewKansas-Medium.woff') format('woff');
 }
 
 @font-face {
-    font-family: ExpensifyNewKansas-MediumItalic;
+    font-family: Expensify New Kansas;
     font-weight: 500;
     font-style: italic;
     src: url('/fonts/ExpensifyNewKansas-MediumItalic.woff2') format('woff2'),  url('/fonts/ExpensifyNewKansas-MediumItalic.woff') format('woff');
diff --git a/assets/emojis/common.ts b/assets/emojis/common.ts
index c19d958812d1..5162a71367b2 100644
--- a/assets/emojis/common.ts
+++ b/assets/emojis/common.ts
@@ -162,10 +162,26 @@ const emojis: PickerEmojis = [
         name: 'hand_over_mouth',
         code: '🤭',
     },
+    {
+        name: 'face_with_open_eyes_and_hand_over_mouth',
+        code: '🫢',
+    },
+    {
+        name: 'saluting_face',
+        code: '🫡',
+    },
     {
         name: 'shushing_face',
         code: '🤫',
     },
+    {
+        name: 'face_with_peeking_eye',
+        code: '🫣',
+    },
+    {
+        name: 'melting_face',
+        code: '🫠',
+    },
     {
         name: 'thinking',
         code: '🤔',
@@ -174,6 +190,10 @@ const emojis: PickerEmojis = [
         name: 'zipper_mouth_face',
         code: '🤐',
     },
+    {
+        name: 'dotted_line_face',
+        code: '🫥',
+    },
     {
         name: 'raised_eyebrow',
         code: '🤨',
@@ -182,10 +202,18 @@ const emojis: PickerEmojis = [
         name: 'neutral_face',
         code: '😐',
     },
+    {
+        name: 'face_with_diagonal_mouth',
+        code: '🫤',
+    },
     {
         name: 'expressionless',
         code: '😑',
     },
+    {
+        name: 'shaking_face',
+        code: '🫨',
+    },
     {
         name: 'no_mouth',
         code: '😶',
@@ -362,6 +390,10 @@ const emojis: PickerEmojis = [
         name: 'cold_sweat',
         code: '😰',
     },
+    {
+        name: 'face_holding_back_tears',
+        code: '🥹',
+    },
     {
         name: 'disappointed_relieved',
         code: '😥',
@@ -578,6 +610,18 @@ const emojis: PickerEmojis = [
         name: 'heart',
         code: '❤️',
     },
+    {
+        name: 'pink_heart',
+        code: '🩷',
+    },
+    {
+        name: 'light_blue_heart',
+        code: '🩵',
+    },
+    {
+        name: 'grey_heart',
+        code: '🩶',
+    },
     {
         name: 'orange_heart',
         code: '🧡',
@@ -630,6 +674,10 @@ const emojis: PickerEmojis = [
         name: 'sweat_drops',
         code: '💦',
     },
+    {
+        name: 'bubbles',
+        code: '🫧',
+    },
     {
         name: 'dash',
         code: '💨',
@@ -706,6 +754,16 @@ const emojis: PickerEmojis = [
         code: '🤏',
         types: ['🤏🏿', '🤏🏾', '🤏🏽', '🤏🏼', '🤏🏻'],
     },
+    {
+        name: 'palm_down_hand',
+        code: '🫳',
+        types: ['🫳🏿', '🫳🏾', '🫳🏽', '🫳🏼', '🫳🏻'],
+    },
+    {
+        name: 'palm_up_hand',
+        code: '🫴',
+        types: ['🫴🏿', '🫴🏾', '🫴🏽', '🫴🏼', '🫴🏻'],
+    },
     {
         name: 'v',
         code: '✌️',
@@ -716,6 +774,11 @@ const emojis: PickerEmojis = [
         code: '🤞',
         types: ['🤞🏿', '🤞🏾', '🤞🏽', '🤞🏼', '🤞🏻'],
     },
+    {
+        name: 'hand_with_index_finger_and_thumb_crossed',
+        code: '🫰',
+        types: ['🫰🏿', '🫰🏾', '🫰🏽', '🫰🏼', '🫰🏻'],
+    },
     {
         name: 'love_you_gesture',
         code: '🤟',
@@ -731,6 +794,16 @@ const emojis: PickerEmojis = [
         code: '🤙',
         types: ['🤙🏿', '🤙🏾', '🤙🏽', '🤙🏼', '🤙🏻'],
     },
+    {
+        name: 'rightwards_hand',
+        code: '🫱',
+        types: ['🫱🏿', '🫱🏾', '🫱🏽', '🫱🏼', '🫱🏻'],
+    },
+    {
+        name: 'leftwards_hand',
+        code: '🫲',
+        types: ['🫲🏿', '🫲🏾', '🫲🏽', '🫲🏼', '🫲🏻'],
+    },
     {
         name: 'point_left',
         code: '👈',
@@ -791,6 +864,16 @@ const emojis: PickerEmojis = [
         code: '🤜',
         types: ['🤜🏿', '🤜🏾', '🤜🏽', '🤜🏼', '🤜🏻'],
     },
+    {
+        name: 'leftwards_pushing_hand',
+        code: '🫷',
+        types: ['🫷🏿', '🫷🏾', '🫷🏽', '🫷🏼', '🫷🏻'],
+    },
+    {
+        name: 'rightwards_pushing_hand',
+        code: '🫸',
+        types: ['🫸🏿', '🫸🏾', '🫸🏽', '🫸🏼', '🫸🏻'],
+    },
     {
         name: 'clap',
         code: '👏',
@@ -801,6 +884,11 @@ const emojis: PickerEmojis = [
         code: '🙌',
         types: ['🙌🏿', '🙌🏾', '🙌🏽', '🙌🏼', '🙌🏻'],
     },
+    {
+        name: 'heart_hands',
+        code: '🫶',
+        types: ['🫶🏿', '🫶🏾', '🫶🏽', '🫶🏼', '🫶🏻'],
+    },
     {
         name: 'open_hands',
         code: '👐',
@@ -821,6 +909,11 @@ const emojis: PickerEmojis = [
         code: '🙏',
         types: ['🙏🏿', '🙏🏾', '🙏🏽', '🙏🏼', '🙏🏻'],
     },
+    {
+        name: 'index_pointing_at_the_viewer',
+        code: '🫵',
+        types: ['🫵🏿', '🫵🏾', '🫵🏽', '🫵🏼', '🫵🏻'],
+    },
     {
         name: 'writing_hand',
         code: '✍️',
@@ -910,6 +1003,10 @@ const emojis: PickerEmojis = [
         name: 'lips',
         code: '👄',
     },
+    {
+        name: 'biting_lip',
+        code: '🫦',
+    },
     {
         name: 'baby',
         code: '👶',
@@ -1510,6 +1607,11 @@ const emojis: PickerEmojis = [
         code: '🤴',
         types: ['🤴🏿', '🤴🏾', '🤴🏽', '🤴🏼', '🤴🏻'],
     },
+    {
+        name: 'person_with_crown',
+        code: '🫅',
+        types: ['🫅🏿', '🫅🏾', '🫅🏽', '🫅🏼', '🫅🏻'],
+    },
     {
         name: 'princess',
         code: '👸',
@@ -1575,6 +1677,16 @@ const emojis: PickerEmojis = [
         code: '🤰',
         types: ['🤰🏿', '🤰🏾', '🤰🏽', '🤰🏼', '🤰🏻'],
     },
+    {
+        name: 'pregnant_person',
+        code: '🫄',
+        types: ['🫄🏿', '🫄🏾', '🫄🏽', '🫄🏼', '🫄🏻'],
+    },
+    {
+        name: 'pregnant_man',
+        code: '🫃',
+        types: ['🫃🏿', '🫃🏾', '🫃🏽', '🫃🏼', '🫃🏻'],
+    },
     {
         name: 'breast_feeding',
         code: '🤱',
@@ -1720,6 +1832,10 @@ const emojis: PickerEmojis = [
         code: '🧝‍♀️',
         types: ['🧝🏿‍♀️', '🧝🏾‍♀️', '🧝🏽‍♀️', '🧝🏼‍♀️', '🧝🏻‍♀️'],
     },
+    {
+        name: 'troll',
+        code: '🧌',
+    },
     {
         name: 'genie',
         code: '🧞',
@@ -2448,6 +2564,30 @@ const emojis: PickerEmojis = [
         name: 'unicorn',
         code: '🦄',
     },
+    {
+        name: 'moose',
+        code: '🫎',
+    },
+    {
+        name: 'donkey',
+        code: '🫏',
+    },
+    {
+        name: 'wing',
+        code: '🪽',
+    },
+    {
+        name: 'black_bird',
+        code: '🐦‍⬛',
+    },
+    {
+        name: 'goose',
+        code: '🪿',
+    },
+    {
+        name: 'jellyfish',
+        code: '🪼',
+    },
     {
         name: 'zebra',
         code: '🦓',
@@ -2764,6 +2904,10 @@ const emojis: PickerEmojis = [
         name: 'shell',
         code: '🐚',
     },
+    {
+        name: 'coral',
+        code: '🪸',
+    },
     {
         name: 'snail',
         code: '🐌',
@@ -2852,6 +2996,14 @@ const emojis: PickerEmojis = [
         name: 'wilted_flower',
         code: '🥀',
     },
+    {
+        name: 'hyacinth',
+        code: '🪻',
+    },
+    {
+        name: 'lotus',
+        code: '🪷',
+    },
     {
         name: 'hibiscus',
         code: '🌺',
@@ -2920,6 +3072,14 @@ const emojis: PickerEmojis = [
         name: 'leaves',
         code: '🍃',
     },
+    {
+        name: 'nest_with_eggs',
+        code: '🪺',
+    },
+    {
+        name: 'empty_nest',
+        code: '🪹',
+    },
     {
         header: true,
         icon: FoodAndDrink,
@@ -3057,6 +3217,10 @@ const emojis: PickerEmojis = [
         name: 'peanuts',
         code: '🥜',
     },
+    {
+        name: 'beans',
+        code: '🫘',
+    },
     {
         name: 'chestnut',
         code: '🌰',
@@ -3197,6 +3361,10 @@ const emojis: PickerEmojis = [
         name: 'canned_food',
         code: '🥫',
     },
+    {
+        name: 'jar',
+        code: '🫙',
+    },
     {
         name: 'bento',
         code: '🍱',
@@ -3229,6 +3397,14 @@ const emojis: PickerEmojis = [
         name: 'sweet_potato',
         code: '🍠',
     },
+    {
+        name: 'ginger',
+        code: '🫚',
+    },
+    {
+        name: 'pea_pod',
+        code: '🫛',
+    },
     {
         name: 'oden',
         code: '🍢',
@@ -3349,6 +3525,10 @@ const emojis: PickerEmojis = [
         name: 'milk_glass',
         code: '🥛',
     },
+    {
+        name: 'pouring_liquid',
+        code: '🫗',
+    },
     {
         name: 'coffee',
         code: '☕',
@@ -3842,6 +4022,10 @@ const emojis: PickerEmojis = [
         name: 'motorized_wheelchair',
         code: '🦼',
     },
+    {
+        name: 'crutch',
+        code: '🩼',
+    },
     {
         name: 'auto_rickshaw',
         code: '🛺',
@@ -3862,6 +4046,10 @@ const emojis: PickerEmojis = [
         name: 'roller_skate',
         code: '🛼',
     },
+    {
+        name: 'wheel',
+        code: '🛞',
+    },
     {
         name: 'busstop',
         code: '🚏',
@@ -3934,6 +4122,10 @@ const emojis: PickerEmojis = [
         name: 'ship',
         code: '🚢',
     },
+    {
+        name: 'ring_buoy',
+        code: '🛟',
+    },
     {
         name: 'airplane',
         code: '✈️',
@@ -4359,6 +4551,10 @@ const emojis: PickerEmojis = [
         name: 'dolls',
         code: '🎎',
     },
+    {
+        name: 'folding_hand_fan',
+        code: '🪭',
+    },
     {
         name: 'flags',
         code: '🎏',
@@ -4367,6 +4563,10 @@ const emojis: PickerEmojis = [
         name: 'wind_chime',
         code: '🎐',
     },
+    {
+        name: 'mirror_ball',
+        code: '🪩',
+    },
     {
         name: 'rice_scene',
         code: '🎑',
@@ -4539,6 +4739,10 @@ const emojis: PickerEmojis = [
         name: 'kite',
         code: '🪁',
     },
+    {
+        name: 'playground_slide',
+        code: '🛝',
+    },
     {
         name: '8ball',
         code: '🎱',
@@ -4555,6 +4759,10 @@ const emojis: PickerEmojis = [
         name: 'nazar_amulet',
         code: '🧿',
     },
+    {
+        name: 'hamsa',
+        code: '🪬',
+    },
     {
         name: 'video_game',
         code: '🎮',
@@ -4920,6 +5128,10 @@ const emojis: PickerEmojis = [
         name: 'musical_keyboard',
         code: '🎹',
     },
+    {
+        name: 'maracas',
+        code: '🪇',
+    },
     {
         name: 'trumpet',
         code: '🎺',
@@ -4928,6 +5140,10 @@ const emojis: PickerEmojis = [
         name: 'violin',
         code: '🎻',
     },
+    {
+        name: 'flute',
+        code: '🪈',
+    },
     {
         name: 'banjo',
         code: '🪕',
@@ -4968,6 +5184,10 @@ const emojis: PickerEmojis = [
         name: 'battery',
         code: '🔋',
     },
+    {
+        name: 'low_battery',
+        code: '🪫',
+    },
     {
         name: 'electric_plug',
         code: '🔌',
@@ -5180,6 +5400,10 @@ const emojis: PickerEmojis = [
         name: 'credit_card',
         code: '💳',
     },
+    {
+        name: 'identification_card',
+        code: '🪪',
+    },
     {
         name: 'receipt',
         code: '🧾',
@@ -5508,6 +5732,10 @@ const emojis: PickerEmojis = [
         name: 'telescope',
         code: '🔭',
     },
+    {
+        name: 'x_ray',
+        code: '🩻',
+    },
     {
         name: 'satellite',
         code: '📡',
@@ -5584,6 +5812,10 @@ const emojis: PickerEmojis = [
         name: 'razor',
         code: '🪒',
     },
+    {
+        name: 'hair_pick',
+        code: '🪮',
+    },
     {
         name: 'lotion_bottle',
         code: '🧴',
@@ -5709,6 +5941,10 @@ const emojis: PickerEmojis = [
         name: 'left_luggage',
         code: '🛅',
     },
+    {
+        name: 'wireless',
+        code: '🛜',
+    },
     {
         name: 'warning',
         code: '⚠️',
@@ -5865,6 +6101,10 @@ const emojis: PickerEmojis = [
         name: 'wheel_of_dharma',
         code: '☸️',
     },
+    {
+        name: 'khanda',
+        code: '🪯',
+    },
     {
         name: 'yin_yang',
         code: '☯️',
@@ -6069,6 +6309,10 @@ const emojis: PickerEmojis = [
         name: 'heavy_division_sign',
         code: '➗',
     },
+    {
+        name: 'heavy_equals_sign',
+        code: '🟰',
+    },
     {
         name: 'infinity',
         code: '♾️',
diff --git a/assets/emojis/en.ts b/assets/emojis/en.ts
index 28051e5ecd99..a246d51c41bc 100644
--- a/assets/emojis/en.ts
+++ b/assets/emojis/en.ts
@@ -92,9 +92,21 @@ const enEmojis: EmojisList = {
     '🤭': {
         keywords: ['quiet', 'whoops'],
     },
+    '🫡': {
+        keywords: ['face', 'salute', 'respect', 'military', 'honor'],
+    },
+    '🫣': {
+        keywords: ['face', 'peek', 'eye', 'curious', 'shy'],
+    },
+    '🫢': {
+        keywords: ['face', 'open eyes', 'hand over mouth', 'surprised', 'shock'],
+    },
     '🤫': {
         keywords: ['silence', 'quiet'],
     },
+    '🫠': {
+        keywords: ['face', 'disappear', 'dissolve', 'liquid', 'melt', 'melting face'],
+    },
     '🤔': {
         keywords: ['face'],
     },
@@ -104,12 +116,21 @@ const enEmojis: EmojisList = {
     '🤨': {
         keywords: ['suspicious'],
     },
+    '🫥': {
+        keywords: ['face', 'invisible', 'hidden', 'dotted line', 'disappear'],
+    },
     '😐': {
         keywords: ['meh', 'deadpan', 'face', 'neutral'],
     },
+    '🫤': {
+        keywords: ['face', 'diagonal mouth', 'meh', 'neutral', 'uncertain'],
+    },
     '😑': {
         keywords: ['face', 'inexpressive', 'unexpressive'],
     },
+    '🫨': {
+        keywords: ['shaking', 'face', 'shock', 'vibration', 'tremble', 'emotion'],
+    },
     '😶': {
         keywords: ['mute', 'silence', 'face', 'mouth', 'quiet', 'silent'],
     },
@@ -123,7 +144,7 @@ const enEmojis: EmojisList = {
         keywords: ['meh', 'face', 'unhappy'],
     },
     '🙄': {
-        keywords: ['eyes', 'face', 'rolling'],
+        keywords: ['eyes', 'face', 'rolling', 'eyeroll'],
     },
     '😬': {
         keywords: ['face', 'grimace'],
@@ -242,6 +263,9 @@ const enEmojis: EmojisList = {
     '😰': {
         keywords: ['nervous', 'blue', 'cold', 'face', 'mouth', 'open', 'rushed', 'sweat'],
     },
+    '🥹': {
+        keywords: ['face', 'tears', 'emotional', 'holding back', 'crying'],
+    },
     '😥': {
         keywords: ['phew', 'sweat', 'nervous', 'disappointed', 'face', 'relieved', 'whew'],
     },
@@ -404,6 +428,15 @@ const enEmojis: EmojisList = {
     '❤️': {
         keywords: ['love'],
     },
+    '🩷': {
+        keywords: ['pink', 'heart', 'love', 'affection', 'romance', 'valentine'],
+    },
+    '🩵': {
+        keywords: ['light blue', 'heart', 'love', 'affection', 'calm', 'tranquility'],
+    },
+    '🩶': {
+        keywords: ['grey', 'heart', 'love', 'affection', 'neutral', 'balance'],
+    },
     '🧡': {
         keywords: [],
     },
@@ -443,6 +476,9 @@ const enEmojis: EmojisList = {
     '💦': {
         keywords: ['water', 'workout', 'comic', 'splashing', 'sweat'],
     },
+    '🫧': {
+        keywords: ['bubbles', 'soap', 'water', 'float'],
+    },
     '💨': {
         keywords: ['wind', 'blow', 'fast', 'comic', 'running'],
     },
@@ -494,12 +530,21 @@ const enEmojis: EmojisList = {
     '🤏': {
         keywords: [],
     },
+    '🫳': {
+        keywords: ['hand', 'palm down', 'gesture'],
+    },
+    '🫴': {
+        keywords: ['hand', 'palm up', 'gesture'],
+    },
     '✌️': {
         keywords: ['victory', 'peace'],
     },
     '🤞': {
         keywords: ['luck', 'hopeful', 'cross', 'finger', 'hand'],
     },
+    '🫰': {
+        keywords: ['hand', 'finger', 'thumb', 'crossed', 'gesture'],
+    },
     '🤟': {
         keywords: [],
     },
@@ -509,6 +554,12 @@ const enEmojis: EmojisList = {
     '🤙': {
         keywords: ['call', 'hand', 'shaka'],
     },
+    '🫱': {
+        keywords: ['hand', 'right', 'pointing', 'gesture'],
+    },
+    '🫲': {
+        keywords: ['hand', 'left', 'pointing', 'gesture'],
+    },
     '👈': {
         keywords: ['backhand', 'body', 'finger', 'hand', 'index', 'point'],
     },
@@ -545,12 +596,21 @@ const enEmojis: EmojisList = {
     '🤜': {
         keywords: ['fist', 'rightwards'],
     },
+    '🫷': {
+        keywords: ['leftwards', 'pushing', 'hand', 'gesture', 'stop', 'block'],
+    },
+    '🫸': {
+        keywords: ['rightwards', 'pushing', 'hand', 'gesture', 'stop', 'block'],
+    },
     '👏': {
         keywords: ['praise', 'applause', 'body', 'hand'],
     },
     '🙌': {
         keywords: ['hooray', 'body', 'celebration', 'gesture', 'hand', 'raised'],
     },
+    '🫶': {
+        keywords: ['hand', 'heart', 'gesture', 'love'],
+    },
     '👐': {
         keywords: ['body', 'hand', 'open'],
     },
@@ -563,6 +623,9 @@ const enEmojis: EmojisList = {
     '🙏': {
         keywords: ['please', 'hope', 'wish', 'ask', 'body', 'bow', 'folded', 'gesture', 'hand', 'thanks'],
     },
+    '🫵': {
+        keywords: ['hand', 'pointing', 'viewer', 'gesture'],
+    },
     '✍️': {
         keywords: [],
     },
@@ -623,6 +686,9 @@ const enEmojis: EmojisList = {
     '👄': {
         keywords: ['kiss', 'body', 'mouth'],
     },
+    '🫦': {
+        keywords: ['biting', 'lip', 'nervous', 'flirt'],
+    },
     '👶': {
         keywords: ['child', 'newborn'],
     },
@@ -983,6 +1049,9 @@ const enEmojis: EmojisList = {
     '🤴': {
         keywords: ['crown', 'royal'],
     },
+    '🫅': {
+        keywords: ['person', 'crown', 'royalty', 'king', 'queen'],
+    },
     '👸': {
         keywords: ['crown', 'royal', 'fairy tale', 'fantasy'],
     },
@@ -1022,6 +1091,12 @@ const enEmojis: EmojisList = {
     '🤰': {
         keywords: ['pregnant', 'woman'],
     },
+    '🫄': {
+        keywords: ['pregnant', 'person', 'expecting', 'parent'],
+    },
+    '🫃': {
+        keywords: ['pregnant', 'man', 'expecting', 'parent'],
+    },
     '🤱': {
         keywords: ['nursing'],
     },
@@ -1109,6 +1184,9 @@ const enEmojis: EmojisList = {
     '🧝‍♀️': {
         keywords: [],
     },
+    '🧌': {
+        keywords: ['troll', 'mythical', 'creature', 'fantasy'],
+    },
     '🧞': {
         keywords: [],
     },
@@ -1583,6 +1661,25 @@ const enEmojis: EmojisList = {
     '🦄': {
         keywords: ['face'],
     },
+    '🫎': {
+        keywords: ['moose', 'animal', 'wildlife', 'antlers', 'forest', 'nature'],
+    },
+    '🫏': {
+        keywords: ['donkey', 'animal', 'mule', 'farm', 'stubborn', 'nature'],
+    },
+    '🪽': {
+        keywords: ['wing', 'bird', 'fly', 'angel', 'freedom', 'flight'],
+    },
+    '🐦‍⬛': {
+        keywords: ['black', 'bird', 'animal', 'crow', 'raven', 'flight'],
+    },
+    '🪿': {
+        keywords: ['goose', 'animal', 'bird', 'waterfowl', 'nature', 'pond'],
+    },
+    '🪼': {
+        keywords: ['jellyfish', 'animal', 'sea', 'ocean', 'tentacles', 'marine'],
+    },
+
     '🦓': {
         keywords: [],
     },
@@ -1820,6 +1917,9 @@ const enEmojis: EmojisList = {
     '🐚': {
         keywords: ['sea', 'beach', 'spiral'],
     },
+    '🪸': {
+        keywords: ['coral', 'reef', 'sea', 'ocean', 'marine'],
+    },
     '🐌': {
         keywords: ['slow'],
     },
@@ -1886,6 +1986,12 @@ const enEmojis: EmojisList = {
     '🥀': {
         keywords: ['flower', 'wilted'],
     },
+    '🪻': {
+        keywords: ['hyacinth', 'flower', 'plant', 'blossom', 'garden', 'nature'],
+    },
+    '🪷': {
+        keywords: ['lotus', 'flower', 'bloom', 'plant'],
+    },
     '🌺': {
         keywords: ['flower', 'plant'],
     },
@@ -1937,6 +2043,12 @@ const enEmojis: EmojisList = {
     '🍃': {
         keywords: ['leaf', 'blow', 'flutter', 'plant', 'wind'],
     },
+    '🪺': {
+        keywords: ['nest', 'eggs', 'bird', 'home'],
+    },
+    '🪹': {
+        keywords: ['nest', 'empty', 'bird', 'home'],
+    },
     '🍇': {
         keywords: ['fruit', 'grape', 'plant'],
     },
@@ -2036,6 +2148,9 @@ const enEmojis: EmojisList = {
     '🥜': {
         keywords: ['nut', 'peanut', 'vegetable'],
     },
+    '🫘': {
+        keywords: ['beans', 'food', 'legume'],
+    },
     '🌰': {
         keywords: ['plant'],
     },
@@ -2141,6 +2256,9 @@ const enEmojis: EmojisList = {
     '🥫': {
         keywords: [],
     },
+    '🫙': {
+        keywords: ['jar', 'container', 'storage'],
+    },
     '🍱': {
         keywords: ['box'],
     },
@@ -2165,6 +2283,12 @@ const enEmojis: EmojisList = {
     '🍠': {
         keywords: ['potato', 'roasted', 'sweet'],
     },
+    '🫚': {
+        keywords: ['ginger', 'root', 'spice', 'food', 'cooking', 'health'],
+    },
+    '🫛': {
+        keywords: ['pea', 'pod', 'vegetable', 'food', 'plant', 'garden'],
+    },
     '🍢': {
         keywords: ['kebab', 'seafood', 'skewer', 'stick'],
     },
@@ -2255,6 +2379,9 @@ const enEmojis: EmojisList = {
     '🥛': {
         keywords: ['drink', 'glass', 'milk'],
     },
+    '🫗': {
+        keywords: ['pouring', 'liquid', 'drink', 'water'],
+    },
     '☕': {
         keywords: ['cafe', 'espresso', 'beverage', 'drink', 'hot', 'steaming', 'tea'],
     },
@@ -2621,6 +2748,9 @@ const enEmojis: EmojisList = {
     '🦼': {
         keywords: [],
     },
+    '🩼': {
+        keywords: ['crutch', 'support', 'injury', 'aid'],
+    },
     '🛺': {
         keywords: [],
     },
@@ -2636,6 +2766,9 @@ const enEmojis: EmojisList = {
     '🛼': {
         keywords: [],
     },
+    '🛞': {
+        keywords: ['wheel', 'vehicle', 'transportation'],
+    },
     '🚏': {
         keywords: ['bus', 'stop'],
     },
@@ -2690,6 +2823,9 @@ const enEmojis: EmojisList = {
     '🚢': {
         keywords: ['vehicle'],
     },
+    '🛟': {
+        keywords: ['ring', 'buoy', 'lifesaver', 'safety'],
+    },
     '✈️': {
         keywords: ['flight', 'vehicle'],
     },
@@ -3005,12 +3141,18 @@ const enEmojis: EmojisList = {
     '🎎': {
         keywords: ['activity', 'celebration', 'doll', 'entertainment', 'festival', 'japanese'],
     },
+    '🪭': {
+        keywords: ['folding', 'hand', 'fan', 'cool', 'breeze', 'accessory'],
+    },
     '🎏': {
         keywords: ['activity', 'carp', 'celebration', 'entertainment', 'flag', 'streamer'],
     },
     '🎐': {
         keywords: ['activity', 'bell', 'celebration', 'chime', 'entertainment', 'wind'],
     },
+    '🪩': {
+        keywords: ['mirror', 'ball', 'disco', 'party'],
+    },
     '🎑': {
         keywords: ['activity', 'celebration', 'ceremony', 'entertainment', 'moon'],
     },
@@ -3140,6 +3282,9 @@ const enEmojis: EmojisList = {
     '🪁': {
         keywords: [],
     },
+    '🛝': {
+        keywords: ['playground', 'slide', 'play', 'park'],
+    },
     '🎱': {
         keywords: ['pool', 'billiards', '8', '8 ball', 'ball', 'billiard', 'eight', 'game'],
     },
@@ -3152,6 +3297,9 @@ const enEmojis: EmojisList = {
     '🧿': {
         keywords: [],
     },
+    '🪬': {
+        keywords: ['hamsa', 'hand', 'protection', 'luck'],
+    },
     '🎮': {
         keywords: ['play', 'controller', 'console', 'entertainment', 'game', 'video game'],
     },
@@ -3422,12 +3570,18 @@ const enEmojis: EmojisList = {
     '🎹': {
         keywords: ['piano', 'activity', 'entertainment', 'instrument', 'keyboard', 'music'],
     },
+    '🪇': {
+        keywords: ['maracas', 'instrument', 'music', 'percussion', 'rhythm', 'shake'],
+    },
     '🎺': {
         keywords: ['activity', 'entertainment', 'instrument', 'music'],
     },
     '🎻': {
         keywords: ['activity', 'entertainment', 'instrument', 'music'],
     },
+    '🪈': {
+        keywords: ['flute', 'instrument', 'music', 'wind', 'melody', 'play'],
+    },
     '🪕': {
         keywords: [],
     },
@@ -3458,6 +3612,9 @@ const enEmojis: EmojisList = {
     '🔋': {
         keywords: ['power'],
     },
+    '🪫': {
+        keywords: ['low', 'battery', 'power', 'charge'],
+    },
     '🔌': {
         keywords: ['electric', 'electricity', 'plug'],
     },
@@ -3617,6 +3774,9 @@ const enEmojis: EmojisList = {
     '💳': {
         keywords: ['subscription', 'bank', 'card', 'credit', 'money'],
     },
+    '🪪': {
+        keywords: ['identification', 'card', 'ID', 'document'],
+    },
     '🧾': {
         keywords: [],
     },
@@ -3863,6 +4023,9 @@ const enEmojis: EmojisList = {
     '🔭': {
         keywords: ['tool'],
     },
+    '🩻': {
+        keywords: ['x-ray', 'medical', 'scan', 'radiology'],
+    },
     '📡': {
         keywords: ['signal', 'antenna', 'communication', 'dish'],
     },
@@ -3920,6 +4083,9 @@ const enEmojis: EmojisList = {
     '🪒': {
         keywords: [],
     },
+    '🪮': {
+        keywords: ['hair', 'pick', 'comb', 'grooming', 'accessory', 'style'],
+    },
     '🧴': {
         keywords: [],
     },
@@ -4010,6 +4176,9 @@ const enEmojis: EmojisList = {
     '🛅': {
         keywords: ['baggage', 'left luggage', 'locker', 'luggage'],
     },
+    '🛜': {
+        keywords: ['wireless', 'network', 'signal', 'connection', 'internet', 'wifi'],
+    },
     '⚠️': {
         keywords: ['wip'],
     },
@@ -4127,6 +4296,9 @@ const enEmojis: EmojisList = {
     '☸️': {
         keywords: ['buddhist', 'dharma', 'religion', 'wheel'],
     },
+    '🪯': {
+        keywords: ['khanda', 'sikh', 'symbol', 'religion', 'faith', 'sikhism'],
+    },
     '☯️': {
         keywords: [],
     },
@@ -4280,6 +4452,9 @@ const enEmojis: EmojisList = {
     '➗': {
         keywords: ['division', 'math'],
     },
+    '🟰': {
+        keywords: ['equals', 'sign', 'math', 'symbol'],
+    },
     '♾️': {
         keywords: [],
     },
diff --git a/assets/emojis/es.ts b/assets/emojis/es.ts
index 0d23f887f556..67e97caf2121 100644
--- a/assets/emojis/es.ts
+++ b/assets/emojis/es.ts
@@ -122,10 +122,26 @@ const esEmojis: EmojisList = {
         name: 'cara_con_mano_sobre_boca',
         keywords: ['ostras', 'uy', 'vaya', 'cara con mano sobre la boca'],
     },
+    '🫣': {
+        name: 'cara_espiando',
+        keywords: ['cara', 'espiar', 'ojo', 'curioso', 'tímido'],
+    },
+    '🫢': {
+        name: 'cara_con_ojos_abiertos_y_mano_sobre_boca',
+        keywords: ['cara', 'ojos abiertos', 'mano sobre boca', 'sorprendido', 'choque'],
+    },
+    '🫡': {
+        name: 'cara_saludando',
+        keywords: ['cara', 'saludo', 'respeto', 'militar', 'honor'],
+    },
     '🤫': {
         name: 'calla',
         keywords: ['callado', 'silencio', 'cara pidiendo silencio'],
     },
+    '🫠': {
+        name: 'cara_derritiéndose',
+        keywords: ['calor', 'cara', 'derritiéndose', 'derretido', 'derretirse', 'desaparecer', 'fundirse', 'líquido'],
+    },
     '🤔': {
         name: 'cara_pensativa',
         keywords: ['cara', 'duda', 'pensando', 'cara pensativa'],
@@ -138,14 +154,26 @@ const esEmojis: EmojisList = {
         name: 'cara_con_ceja_levantada',
         keywords: ['desconfiado', 'escéptico', 'cara con ceja alzada'],
     },
+    '🫥': {
+        name: 'cara_invisible',
+        keywords: ['cara', 'invisible', 'oculto', 'línea discontinua', 'desaparecer'],
+    },
     '😐': {
         name: 'cara_neutra',
         keywords: ['cara', 'inexpresivo', 'neutral'],
     },
+    '🫤': {
+        name: 'cara_con_boca_diagonal',
+        keywords: ['cara', 'boca diagonal', 'meh', 'neutral', 'incierto'],
+    },
     '😑': {
         name: 'inexpresivo',
         keywords: ['cara', 'inexpresión', 'inexpresiva', 'inexpresivo', 'cara sin expresión'],
     },
+    '🫨': {
+        name: 'cara_temblorosa',
+        keywords: ['cara', 'temblorosa', 'sacudida', 'temblor'],
+    },
     '😶': {
         name: 'prohibido_hablar',
         keywords: ['boca', 'callado', 'cara', 'silencio', 'cara sin boca'],
@@ -322,6 +350,10 @@ const esEmojis: EmojisList = {
         name: 'sudor_frío',
         keywords: ['ansiedad', 'cara', 'frío', 'sudor', 'cara con ansiedad y sudor'],
     },
+    '🥹': {
+        name: 'cara_con_lágrimas',
+        keywords: ['cara', 'lágrimas', 'emocional', 'contener', 'llorando'],
+    },
     '😥': {
         name: 'decepcionado_aliviado',
         keywords: ['aliviado', 'cara', 'decepcionado', 'menos mal', 'cara triste pero aliviada'],
@@ -538,6 +570,18 @@ const esEmojis: EmojisList = {
         name: 'corazón',
         keywords: ['corazón', 'emoción', 'rojo'],
     },
+    '🩷': {
+        name: 'corazón_rosa',
+        keywords: ['corazón', 'rosa', 'amor', 'afecto'],
+    },
+    '🩵': {
+        name: 'corazón_azul_claro',
+        keywords: ['corazón', 'azul', 'claro', 'amor', 'afecto'],
+    },
+    '🩶': {
+        name: 'corazón_gris',
+        keywords: ['corazón', 'gris', 'amor', 'afecto'],
+    },
     '🧡': {
         name: 'corazón_naranja',
         keywords: ['corazón', 'emoción', 'naranja'],
@@ -590,6 +634,10 @@ const esEmojis: EmojisList = {
         name: 'gotas_de_sudor',
         keywords: ['cómic', 'emoción', 'sudor', 'gotas de sudor'],
     },
+    '🫧': {
+        name: 'burbujas',
+        keywords: ['burbujas', 'jabón', 'agua', 'flotar'],
+    },
     '💨': {
         name: 'guión',
         keywords: ['carrera', 'cómic', 'correr', 'humo', 'salir corriendo'],
@@ -658,6 +706,14 @@ const esEmojis: EmojisList = {
         name: 'mano_pellizcando',
         keywords: ['pellizco', 'poco', 'poquito', 'mano pellizcando'],
     },
+    '🫳': {
+        name: 'mano_con_palma_hacia_abajo',
+        keywords: ['mano', 'palma abajo', 'gesto'],
+    },
+    '🫴': {
+        name: 'mano_con_palma_hacia_arriba',
+        keywords: ['mano', 'palma arriba', 'gesto'],
+    },
     '✌️': {
         name: 'v',
         keywords: ['mano', 'señal de victoria', 'victoria', 'mano con señal de victoria'],
@@ -666,6 +722,10 @@ const esEmojis: EmojisList = {
         name: 'dedos_cruzados',
         keywords: ['cruzar', 'dedos', 'mano', 'suerte', 'dedos cruzados'],
     },
+    '🫰': {
+        name: 'mano_con_dedos_cruzados',
+        keywords: ['mano', 'dedo', 'pulgar', 'cruzado', 'gesto'],
+    },
     '🤟': {
         name: 'te_amo_en_lenguaje_de_señas',
         keywords: ['mano', 'quiero', 'gesto de te quiero'],
@@ -678,6 +738,14 @@ const esEmojis: EmojisList = {
         name: 'mano_llámame',
         keywords: ['llamar', 'mano', 'meñique', 'pulgar', 'mano haciendo el gesto de llamar'],
     },
+    '🫱': {
+        name: 'mano_derecha',
+        keywords: ['mano', 'derecha', 'apuntar', 'gesto'],
+    },
+    '🫲': {
+        name: 'mano_izquierda',
+        keywords: ['mano', 'izquierda', 'apuntar', 'gesto'],
+    },
     '👈': {
         name: 'apuntando_hacia_la_izquierda',
         keywords: ['dedo', 'índice', 'izquierda', 'mano', 'dorso de mano con índice a la izquierda'],
@@ -726,6 +794,14 @@ const esEmojis: EmojisList = {
         name: 'puño_hacia_la_derecha',
         keywords: ['derecha', 'puño', 'puño hacia la derecha'],
     },
+    '🫷': {
+        name: 'mano_empujando_hacia_la_izquierda',
+        keywords: ['mano', 'empujando', 'izquierda', 'gesto'],
+    },
+    '🫸': {
+        name: 'mano_empujando_hacia_la_derecha',
+        keywords: ['mano', 'empujando', 'derecha', 'gesto'],
+    },
     '👏': {
         name: 'aplauso',
         keywords: ['aplaudir', 'manos', 'palmas', 'señal', 'manos aplaudiendo'],
@@ -734,6 +810,10 @@ const esEmojis: EmojisList = {
         name: 'manos_levantadas',
         keywords: ['celebración', 'gesto', 'hurra', 'mano', 'manos levantadas celebrando'],
     },
+    '🫶': {
+        name: 'manos_haciendo_corazón',
+        keywords: ['mano', 'corazón', 'gesto', 'amor'],
+    },
     '👐': {
         name: 'manos_abiertas',
         keywords: ['abiertas', 'manos'],
@@ -750,6 +830,10 @@ const esEmojis: EmojisList = {
         name: 'rezo',
         keywords: ['gracias', 'mano', 'oración', 'orar', 'por favor', 'rezar', 'manos en oración'],
     },
+    '🫵': {
+        name: 'mano_apuntando',
+        keywords: ['mano', 'apuntar', 'espectador', 'gesto'],
+    },
     '✍️': {
         name: 'mano_escribiendo',
         keywords: ['escribir', 'lápiz', 'mano', 'mano escribiendo'],
@@ -830,6 +914,10 @@ const esEmojis: EmojisList = {
         name: 'labios',
         keywords: ['labios', 'boca'],
     },
+    '🫦': {
+        name: 'labios_mordiendo',
+        keywords: ['mordiendo', 'labio', 'nervioso', 'coqueteo'],
+    },
     '👶': {
         name: 'bebé',
         keywords: ['joven', 'niño', 'bebé'],
@@ -1290,6 +1378,7 @@ const esEmojis: EmojisList = {
         name: 'guardia_mujer',
         keywords: ['guardia', 'mujer', 'vigilante'],
     },
+
     '🥷': {
         name: 'ninja',
         keywords: ['furtivo', 'guerrero', 'luchador', 'oculto', 'sigilo', 'ninja'],
@@ -1310,6 +1399,10 @@ const esEmojis: EmojisList = {
         name: 'príncipe',
         keywords: ['corona', 'príncipe'],
     },
+    '🫅': {
+        name: 'persona_con_corona',
+        keywords: ['persona', 'corona', 'realeza', 'rey', 'reina'],
+    },
     '👸': {
         name: 'princesa',
         keywords: ['cuento', 'fantasía', 'hadas', 'princesa'],
@@ -1362,6 +1455,14 @@ const esEmojis: EmojisList = {
         name: 'embarazada',
         keywords: ['embarazada', 'mujer'],
     },
+    '🫄': {
+        name: 'persona_embarazada',
+        keywords: ['embarazado', 'persona', 'esperando', 'padre'],
+    },
+    '🫃': {
+        name: 'hombre_embarazado',
+        keywords: ['embarazado', 'hombre', 'esperando', 'padre'],
+    },
     '🤱': {
         name: 'amamantar',
         keywords: ['amamantar', 'bebé', 'dar pecho', 'pecho', 'lactancia materna'],
@@ -1478,6 +1579,10 @@ const esEmojis: EmojisList = {
         name: 'elfa',
         keywords: ['mágico', 'mujer', 'elfa'],
     },
+    '🧌': {
+        name: 'trol',
+        keywords: ['trol', 'mítico', 'criatura', 'fantasía'],
+    },
     '🧞': {
         name: 'genio',
         keywords: ['lámpara', 'genio'],
@@ -2110,6 +2215,30 @@ const esEmojis: EmojisList = {
         name: 'cara_de_unicornio',
         keywords: ['cara', 'unicornio'],
     },
+    '🫎': {
+        name: 'alce',
+        keywords: ['alce', 'animal', 'cuernos', 'naturaleza'],
+    },
+    '🫏': {
+        name: 'burro',
+        keywords: ['burro', 'animal', 'granja', 'naturaleza'],
+    },
+    '🪽': {
+        name: 'ala',
+        keywords: ['ala', 'volar', 'pájaro', 'ángel'],
+    },
+    '🐦‍⬛': {
+        name: 'pájaro_negro',
+        keywords: ['pájaro', 'negro', 'animal', 'naturaleza'],
+    },
+    '🪿': {
+        name: 'ganso',
+        keywords: ['ganso', 'animal', 'ave', 'naturaleza'],
+    },
+    '🪼': {
+        name: 'medusa',
+        keywords: ['medusa', 'animal', 'mar', 'naturaleza'],
+    },
     '🦓': {
         name: 'cara_zebra',
         keywords: ['raya', 'cebra'],
@@ -2426,6 +2555,10 @@ const esEmojis: EmojisList = {
         name: 'caracola',
         keywords: ['concha', 'mar', 'concha de mar'],
     },
+    '🪸': {
+        name: 'coral',
+        keywords: ['coral', 'arrecife', 'mar', 'océano', 'marino'],
+    },
     '🐌': {
         name: 'caracol',
         keywords: ['caracola', 'molusco', 'caracol'],
@@ -2514,6 +2647,14 @@ const esEmojis: EmojisList = {
         name: 'flor_marchita',
         keywords: ['flor', 'marchita', 'marchitada', 'marchitarse'],
     },
+    '🪻': {
+        name: 'jacinto',
+        keywords: ['jacinto', 'flor', 'planta', 'naturaleza'],
+    },
+    '🪷': {
+        name: 'flor_de_loto',
+        keywords: ['loto', 'flor', 'florecer', 'planta'],
+    },
     '🌺': {
         name: 'hibisco',
         keywords: ['flor', 'hibisco', 'flor de hibisco'],
@@ -2582,6 +2723,14 @@ const esEmojis: EmojisList = {
         name: 'hojas',
         keywords: ['hoja', 'revolotear', 'soplar', 'viento', 'hojas revoloteando al viento'],
     },
+    '🪺': {
+        name: 'nido_con_huevos',
+        keywords: ['nido', 'huevos', 'pájaro', 'hogar'],
+    },
+    '🪹': {
+        name: 'nido_vacío',
+        keywords: ['nido', 'vacío', 'pájaro', 'hogar'],
+    },
     '🍇': {
         name: 'uvas',
         keywords: ['agracejo', 'fruta', 'racimo', 'uva', 'uvas'],
@@ -2714,6 +2863,10 @@ const esEmojis: EmojisList = {
         name: 'cacahuetes',
         keywords: ['cacahuete', 'comida', 'fruto seco', 'verdura', 'cacahuetes'],
     },
+    '🫘': {
+        name: 'frijoles',
+        keywords: ['frijoles', 'comida', 'legumbre'],
+    },
     '🌰': {
         name: 'castaña',
         keywords: ['castaño', 'fruto seco', 'castaña'],
@@ -2854,6 +3007,10 @@ const esEmojis: EmojisList = {
         name: 'comida_enlatada',
         keywords: ['conserva', 'lata', 'comida enlatada'],
     },
+    '🫙': {
+        name: 'jarra',
+        keywords: ['jarra', 'contenedor', 'almacenamiento'],
+    },
     '🍱': {
         name: 'bento',
         keywords: ['bento', 'caja', 'comida', 'restaurante', 'caja de bento'],
@@ -2886,6 +3043,14 @@ const esEmojis: EmojisList = {
         name: 'batata',
         keywords: ['asada', 'papa asada', 'patata', 'restaurante'],
     },
+    '🫚': {
+        name: 'jengibre',
+        keywords: ['jengibre', 'especia', 'planta', 'cocina'],
+    },
+    '🫛': {
+        name: 'vaina_de_guisante',
+        keywords: ['vaina', 'guisante', 'vegetal', 'planta'],
+    },
     '🍢': {
         name: 'oden',
         keywords: ['japonés', 'marisco', 'oden', 'pincho', 'brocheta'],
@@ -3006,6 +3171,10 @@ const esEmojis: EmojisList = {
         name: 'vaso_de_leche',
         keywords: ['bebida', 'leche', 'vaso', 'vaso de leche'],
     },
+    '🫗': {
+        name: 'vertiendo_líquido',
+        keywords: ['vertiendo', 'líquido', 'bebida', 'agua'],
+    },
     '☕': {
         name: 'café',
         keywords: ['bebida', 'café', 'caliente', 'té'],
@@ -3494,6 +3663,10 @@ const esEmojis: EmojisList = {
         name: 'silla_de_ruedas_eléctrica',
         keywords: ['accesibilidad', 'silla de ruedas eléctrica'],
     },
+    '🩼': {
+        name: 'muleta',
+        keywords: ['muleta', 'soporte', 'lesión', 'ayuda'],
+    },
     '🛺': {
         name: 'mototaxi',
         keywords: ['rickshaw', 'tuk tuk', 'mototaxi'],
@@ -3514,6 +3687,10 @@ const esEmojis: EmojisList = {
         name: 'patines',
         keywords: ['patín', 'patín de 4 ruedas', 'patín de cuatro ruedas', 'patines'],
     },
+    '🛞': {
+        name: 'rueda',
+        keywords: ['rueda', 'vehículo', 'transporte'],
+    },
     '🚏': {
         name: 'parada_de_autobús',
         keywords: ['autobús', 'parada', 'parada de autobús'],
@@ -3586,6 +3763,10 @@ const esEmojis: EmojisList = {
         name: 'barco',
         keywords: ['vehículo', 'barco'],
     },
+    '🛟': {
+        name: 'aro_salvavidas',
+        keywords: ['aro', 'salvavidas', 'seguridad'],
+    },
     '✈️': {
         name: 'avión',
         keywords: ['aeroplano', 'avión'],
@@ -4006,6 +4187,10 @@ const esEmojis: EmojisList = {
         name: 'muñecas',
         keywords: ['celebración', 'festival', 'hinamatsuri', 'muñecas', 'muñecas japonesas'],
     },
+    '🪭': {
+        name: 'abanico_plegable',
+        keywords: ['abanico', 'plegable', 'viento', 'accesorio'],
+    },
     '🎏': {
         name: 'banderas',
         keywords: ['banderín', 'carpa', 'celebración', 'koinobori', 'banderín de carpas'],
@@ -4014,6 +4199,10 @@ const esEmojis: EmojisList = {
         name: 'campanilla_de_viento',
         keywords: ['campanilla', 'furin', 'viento', 'campanilla de viento'],
     },
+    '🪩': {
+        name: 'bola_de_disco',
+        keywords: ['bola', 'espejo', 'disco', 'fiesta'],
+    },
     '🎑': {
         name: 'espiga_de_arroz',
         keywords: ['celebración', 'contemplación', 'luna', 'tsukimi', 'ceremonia de contemplación de la luna'],
@@ -4186,6 +4375,10 @@ const esEmojis: EmojisList = {
         name: 'cometa',
         keywords: ['juguete', 'planear', 'viento', 'volar', 'cometa'],
     },
+    '🛝': {
+        name: 'resbaladilla',
+        keywords: ['parque', 'resbaladilla', 'jugar', 'parque'],
+    },
     '🎱': {
         name: 'bola_ocho',
         keywords: ['8', 'billar', 'bola ocho', 'juego', 'bola negra de billar'],
@@ -4202,6 +4395,10 @@ const esEmojis: EmojisList = {
         name: 'ojo_turco',
         keywords: ['amuleto', 'mal de ojo', 'nazar', 'talismán', 'ojo turco'],
     },
+    '🪬': {
+        name: 'hamsa',
+        keywords: ['hamsa', 'mano', 'protección', 'suerte'],
+    },
     '🎮': {
         name: 'videojuego',
         keywords: ['juego', 'mando', 'videojuego', 'mando de videoconsola'],
@@ -4562,6 +4759,10 @@ const esEmojis: EmojisList = {
         name: 'teclado_musical',
         keywords: ['instrumento', 'instrumento musical', 'música', 'teclado', 'piano', 'teclado musical'],
     },
+    '🪇': {
+        name: 'maracas',
+        keywords: ['maracas', 'música', 'instrumento', 'ritmo'],
+    },
     '🎺': {
         name: 'trompeta',
         keywords: ['instrumento', 'instrumento musical', 'música', 'trompeta'],
@@ -4570,6 +4771,10 @@ const esEmojis: EmojisList = {
         name: 'violín',
         keywords: ['instrumento', 'instrumento musical', 'música', 'violín'],
     },
+    '🪈': {
+        name: 'flauta',
+        keywords: ['flauta', 'música', 'instrumento', 'viento'],
+    },
     '🪕': {
         name: 'banjo',
         keywords: ['banyo', 'cuerda', 'instrumento', 'música', 'banjo'],
@@ -4610,6 +4815,10 @@ const esEmojis: EmojisList = {
         name: 'batería',
         keywords: ['batería', 'pila'],
     },
+    '🪫': {
+        name: 'batería_baja',
+        keywords: ['bajo', 'batería', 'poder', 'carga'],
+    },
     '🔌': {
         name: 'enchufe_eléctrico',
         keywords: ['corriente', 'electricidad', 'eléctrico', 'enchufe'],
@@ -4822,6 +5031,10 @@ const esEmojis: EmojisList = {
         name: 'tarjeta_de_crédito',
         keywords: ['crédito', 'tarjeta', 'tarjeta de crédito'],
     },
+    '🪪': {
+        name: 'tarjeta_de_identificación',
+        keywords: ['identificación', 'tarjeta', 'ID', 'documento'],
+    },
     '🧾': {
         name: 'recibo',
         keywords: ['contabilidad', 'prueba', 'teneduría de libros', 'testimonio', 'recibo'],
@@ -5150,6 +5363,10 @@ const esEmojis: EmojisList = {
         name: 'telescopio',
         keywords: ['astronomía', 'instrumento', 'telescopio'],
     },
+    '🩻': {
+        name: 'rayos_x',
+        keywords: ['rayos x', 'médico', 'escáner', 'radiología'],
+    },
     '📡': {
         name: 'antena_de_satélite',
         keywords: ['antena', 'comunicación', 'satélite', 'antena de satélite'],
@@ -5226,6 +5443,10 @@ const esEmojis: EmojisList = {
         name: 'cuchilla_de_afeitar',
         keywords: ['afeitado', 'afeitar', 'afilado', 'barbero', 'navaja', 'cuchilla de afeitar'],
     },
+    '🪮': {
+        name: 'peine_para_cabello',
+        keywords: ['peine', 'cabello', 'herramienta', 'accesorio'],
+    },
     '🧴': {
         name: 'bote_de_crema',
         keywords: ['champú', 'crema', 'hidratante', 'protector solar', 'bote de crema'],
@@ -5346,6 +5567,10 @@ const esEmojis: EmojisList = {
         name: 'consigna',
         keywords: ['depósito', 'equipaje', 'servicio de equipaje en depósito', 'consigna'],
     },
+    '🛜': {
+        name: 'inalámbrico',
+        keywords: ['inalámbrico', 'conexión', 'wifi', 'red'],
+    },
     '⚠️': {
         name: 'advertencia',
         keywords: ['cuidado', 'señal', 'advertencia'],
@@ -5502,6 +5727,10 @@ const esEmojis: EmojisList = {
         name: 'rueda_del_dharma',
         keywords: ['budismo', 'dharma', 'religión', 'rueda', 'rueda del dharma'],
     },
+    '🪯': {
+        name: 'khanda',
+        keywords: ['khanda', 'símbolo', 'sijismo', 'religión'],
+    },
     '☯️': {
         name: 'yin_yang',
         keywords: ['religión', 'taoísmo', 'yang', 'yin'],
@@ -5706,6 +5935,10 @@ const esEmojis: EmojisList = {
         name: 'signo_de_división_grueso',
         keywords: ['÷', 'signo', 'signo de división', 'división'],
     },
+    '🟰': {
+        name: 'signo_igual',
+        keywords: ['igual', 'signo', 'matemáticas', 'símbolo'],
+    },
     '♾️': {
         name: 'infinito',
         keywords: ['ilimitado', 'siempre', 'universal', 'infinito'],
diff --git a/assets/emojis/index.ts b/assets/emojis/index.ts
index 02328001674e..d230e8eec2be 100644
--- a/assets/emojis/index.ts
+++ b/assets/emojis/index.ts
@@ -1,7 +1,5 @@
 import type {Locale} from '@src/types/onyx';
 import emojis from './common';
-import enEmojis from './en';
-import esEmojis from './es';
 import type {Emoji, EmojisList} from './types';
 
 type EmojiTable = Record<string, Emoji>;
@@ -30,10 +28,22 @@ const emojiCodeTableWithSkinTones = emojis.reduce<EmojiTable>((prev, cur) => {
 }, {});
 
 const localeEmojis: LocaleEmojis = {
-    en: enEmojis,
-    es: esEmojis,
+    en: undefined,
+    es: undefined,
+};
+
+const importEmojiLocale = (locale: Locale) => {
+    const normalizedLocale = locale.toLowerCase().split('-')[0] as Locale;
+    if (!localeEmojis[normalizedLocale]) {
+        const emojiImportPromise = normalizedLocale === 'en' ? import('./en') : import('./es');
+        return emojiImportPromise.then((esEmojiModule) => {
+            // it is needed because in jest test the modules are imported in double nested default object
+            localeEmojis[normalizedLocale] = esEmojiModule.default.default ? (esEmojiModule.default.default as unknown as EmojisList) : esEmojiModule.default;
+        });
+    }
+    return Promise.resolve();
 };
 
 export default emojis;
-export {emojiNameTable, emojiCodeTableWithSkinTones, localeEmojis};
+export {emojiNameTable, emojiCodeTableWithSkinTones, localeEmojis, importEmojiLocale};
 export {skinTones, categoryFrequentlyUsed} from './common';
diff --git a/assets/images/LaptopwithSecondScreenandHourglass.svg b/assets/images/LaptopwithSecondScreenandHourglass.svg
new file mode 100644
index 000000000000..98010400f518
--- /dev/null
+++ b/assets/images/LaptopwithSecondScreenandHourglass.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" id="Layer_1" data-name="Layer 1" version="1.1" viewBox="0 0 233 163"><defs><style>.cls-1,.cls-10,.cls-11,.cls-12,.cls-13,.cls-2,.cls-3,.cls-4,.cls-5,.cls-6,.cls-7,.cls-8,.cls-9{stroke-width:0}.cls-1,.cls-13,.cls-14{fill:#0164bf}.cls-2{fill:#b0d9ff}.cls-3{fill:#28736d}.cls-4{fill:#8dc8ff}.cls-14,.cls-15,.cls-16,.cls-17{stroke:#002140;stroke-linecap:round;stroke-linejoin:round}.cls-15,.cls-16,.cls-17{fill:none}.cls-5{fill:#99f6ff}.cls-6{fill:#4ba6a6}.cls-7{fill:#fed607}.cls-8{fill:#5be3aa}.cls-9{fill:#50eef6}.cls-10{fill:#4ed7de}.cls-16,.cls-17{stroke-width:1px}.cls-11{fill:#fffaf0}.cls-12{fill:#5ab0ff}.cls-13{fill-rule:evenodd}</style></defs><path d="M189.422,27.377c0-1.451-1.176-2.637-2.618-2.637h-45.795c-1.439,0-2.618,1.186-2.618,2.637v31.455c0,1.451,1.179,2.637,2.618,2.637h45.795c1.442,0,2.618-1.186,2.618-2.637v-31.455Z" class="cls-1"/><path d="M188.997,117.766c-3.915-3.525-7.804-4.395-8.375-4.51,1.684-.273,3.629-.428,5.873-.428,4.355,0,8.158,2.083,11.307,4.938h-8.805Z" class="cls-10"/><path d="M17.326,107.643c-.131-.083-.26-.172-.383-.264-.206-.155-.406-.319-.594-.497l1.022.775s-.031-.008-.043-.011h-.003v-.003Z" class="cls-9"/><path d="M17.829,110.183c.374-.506.939-.822,1.773-1.017-.488.313-1.288.724-1.773,1.017Z" class="cls-9"/><path d="M191.198,120.063c-.719-.87-1.462-1.631-2.201-2.297h8.806c.979.887,1.895,1.849,2.746,2.849-3.657-.264-6.781-.287-9.337-.198l-.014-.354Z" class="cls-10"/><path d="M183.731,122.427c-.305-.334-.634-.647-.982-.937l.151-.178s2.873-.703,8.312-.896c2.556-.089,5.68-.066,9.337.198h.003c4.049,4.76,6.582,10.318,7.241,12.386,1.245,3.895-1.105,5.563-4.285,5.563h-10.234c-1.536,0-2.804-.109-3.892-.321l.017-.095c.417-6.678-2.487-12.242-5.668-15.72Z" class="cls-10"/><path d="M189.422,27.376c0-1.451-1.176-2.637-2.618-2.637h-45.795c-1.439,0-2.618,1.186-2.618,2.637v31.455c0,1.451,1.179,2.637,2.618,2.637h45.795c1.442,0,2.618-1.186,2.618-2.637v-31.455ZM190.478,67.52h-53.606c-1.294,0-2.484-.465-3.412-1.238-1.197-.994-1.962-2.496-1.962-4.168V23.955c0-2.973,2.419-5.406,5.374-5.406h53.606c1.203,0,2.316.402,3.213,1.077,1.31.988,2.164,2.562,2.164,4.329v38.159c0,2.973-2.418,5.406-5.377,5.406Z" class="cls-10"/><path d="M81.526,137.265h-30.427c-3.872,0-5.165-.741-8.852-4.079-3.689-3.34-24.342-22.447-24.342-22.447l-.326-.143c.071-.152.154-.29.246-.414h.003c.485-.293,1.285-.704,1.773-1.017.951-.218,2.256-.278,4.02-.278h89.622c3.72,0,6.721.482,9.291,1.841.614.324,1.202.698,1.77,1.126.554.416,1.562,1.284,2.85,2.436,5.582,4.989,16.447,15.3,18.543,17.411.888.894,1.556,1.655,2.053,2.382l-.209.215s.737,2.967-2.952,2.967h-35.772v-.37s-2.03-2.04-4.797-4.452c-1.873-1.635-3.872-2.781-7.744-2.781h-18.626c-3.318,0-3.504,2.039-1.105,3.895,2.396,1.856,4.98,3.708,4.98,3.708ZM86.321,112.411h-50.343c-5.297,0-5.765,2.149-3.823,4.455.154.184.323.368.505.551,1.845,1.856,3.181,3.1,4.726,4.527.54.497,1.105,1.017,1.728,1.594,2.398,2.226,4.98,2.97,9.406,2.97h76.895c5.163,0,7.019-.382,4.058-3.711-.334-.376-.654-.729-.96-1.065-1.933-2.111-3.409-3.519-5.205-4.998-.602-.494-1.245-1-1.95-1.543-3.327-2.559-7.847-2.763-12.701-2.777-.434-.003-.874-.003-1.313-.003h-21.021Z" class="cls-9"/><path d="M19.602,109.166c-.834.195-1.399.511-1.773,1.017h-.003c-.174.106-.308.198-.371.261-.043.043-.077.029-.111-.029.006-.106.008-.215.008-.324,0-.463-.066-1.089-.166-1.66-.003-.468.006-.83.006-.83,0,0,.049.014.134.043h.003c.054.04.108.074.166.109l.02.011c.728.44,1.536.756,2.401.911.071.049.114.092.114.123,0,.075-.171.21-.428.368Z" class="cls-3"/><path d="M84.377,42.292H21.19c-3.935,0-7.156,3.24-7.156,7.198v52.104c0,2.082.891,3.967,2.307,5.282l-3.218-2.439-3.898-2.949c-2.538-1.793-4.203-4.754-4.203-8.092v-46.744c0-5.434,4.417-9.878,9.82-9.878h61.434s6.442,4.265,8.101,5.518c.725.546-.348-.313,0,0Z" class="cls-6"/><path d="M170.868,120.201c0-.726.234-1.577.802-2.435h17.327c.739.666,1.481,1.427,2.201,2.297l.014.354c-5.439.192-8.312.896-8.312.896l-.151.178c-3.269-2.72-8.229-3.401-11.604-1.011h-.274c-.003-.089-.003-.181-.003-.279Z" class="cls-10"/><path d="M158.773,98.391c-1.223.353-2.527.523-3.855.523h-4.38c1.522-2.643,1.659-5.426-.137-8.068v-.325h2.304c1.33,0,2.356-.175,3.129-.549l.74.327c2.393,2.114,2.941,4.846,2.116,7.784l.083.307Z" class="cls-3"/><path d="M17.495,107.753c-.057-.035-.111-.069-.166-.107.011.003.029.009.043.012,0,0,.002,0,.006.003l.117.092Z" class="cls-9"/><path d="M108.655,112.414c4.854.014,9.374.218,12.701,2.778.705.542,1.348,1.048,1.95,1.542l-.106.129h-10.128l-4.417-4.268v-.181Z" class="cls-5"/><path d="M173.486,115.898c.857-.629,1.953-1.215,3.335-1.703,1.082-.382,2.339-.704,3.795-.939,0,0,0,.003.006,0,.571.115,4.46.985,8.375,4.509h-17.327c.414-.632,1.008-1.269,1.816-1.867Z" class="cls-10"/><path d="M150.401,90.846c1.796,2.643,1.659,5.426.137,8.068h-7.838c1.522-2.643,1.662-5.426-.137-8.068v-.325h7.838v.325Z" class="cls-3"/><path d="M171.67,117.766c-.568.858-.802,1.709-.802,2.435,0,.098,0,.19.003.282.014,2.527.282,2.927,2.624,5.282,2.767,2.783,8.437,7.93,8.437,7.93,2.499,2.307,4.135,3.901,7.45,4.547,1.088.213,2.356.322,3.892.322h10.234c3.18,0,5.53-1.669,4.285-5.564-.659-2.068-3.192-7.626-7.241-12.385h-.003c-.851-1-1.767-1.962-2.747-2.849h3.493c5.393,0,6.361.071,9.956,2.852,3.598,2.783,16.25,15.094,19.502,18.365.911.917,1.454,2.077,1.325,3.051-.14,1.097-1.13,1.956-3.4,1.956h-45.641c-5.667,0-7.743.836-12.583-3.2-4.843-4.033-14.8-13.353-18.394-16.832-1.06-1.022-1.565-1.982-1.659-2.82-.229-2.02,1.927-3.372,4.562-3.372h16.707Z" class="cls-4"/><path d="M19.916,108.674c-.865-.155-1.673-.471-2.401-.91l-.02-.012-.117-.092c.543.184,2.104.718,2.538,1.014Z" class="cls-9"/><path d="M17.226,111.457c-.44,2.361-1.99,4.105-3.838,4.105-1.119,0-2.13-.641-2.85-1.669-.691-.985-1.116-2.324-1.116-3.803,0-2.823,1.55-5.147,3.541-5.44l.16-.212,3.218,2.438.009.006c.188.178.388.342.594.497.089.278.174.652.243,1.051.003.741.031,1.746.157,1.985-.014.359-.054.706-.117,1.042Z" class="cls-6"/><path d="M113.923,108.792H21.19c-.434,0-.862-.04-1.273-.118-.434-.295-1.996-.83-2.538-1.014,0,0-.002,0-.006-.002l-1.022-.776-.009-.006c-1.416-1.315-2.307-3.199-2.307-5.282v-52.104c0-3.958,3.221-7.198,7.156-7.198h57.964c.451.399.134,5.624.134,6.957H25.861c-2.55,0-4.634,2.097-4.634,4.662v42.148c0,2.565,2.084,4.665,4.634,4.665h82.837c2.55,0,4.637-2.1,4.637-4.665v-42.148c0-2.565-2.087-4.662-4.637-4.662h-29.41c.017-.256.026-.534.026-.836,0-2.783-.16-4.311-.16-6.121,0-.144.014.135,0,0h34.769c1.354,0,2.622.382,3.704,1.045,2.067,1.267,3.452,3.556,3.452,6.153v52.104c0,3.961-3.218,7.198-7.156,7.198Z" class="cls-9"/><path d="M53.181,68.189c-1.156,0-1.85-.91-1.85-2.479s.694-2.482,1.85-2.482,1.847.893,1.847,2.482-.694,2.479-1.847,2.479Z" class="cls-8"/><path d="M165.994,74.627c-2.63-1.531-5.394-1.669-8.024.141h-.103v-7.247h8.666v7.106h-.539Z" class="cls-3"/><path d="M133.343,66.428l-5.885-4.472c-1.602-1.364-2.621-3.398-2.621-5.661V20.845c0-4.082,3.317-7.419,7.375-7.419h51.225c1.925,0,3.295.764,4.997,1.973l5.348,4.107-.091.121c-.897-.675-2.01-1.077-3.213-1.077h-53.606c-2.955,0-5.374,2.433-5.374,5.406v38.159c0,1.672.765,3.174,1.962,4.168l-.117.146Z" class="cls-6"/><path d="M17.187,108.431c.1.571.166,1.197.166,1.66,0,.109-.003.218-.009.324-.126-.238-.154-1.243-.157-1.984Z" class="cls-6"/><path d="M82.263,121.87h-10.328v-.184l-4.84-4.823h10.639l4.529,4.449v.558Z" class="cls-5"/><path d="M104.706,36.774c1.825,0,3.538.508,5.006,1.387l8.04,4.978-.122.198c-1.083-.664-2.35-1.046-3.704-1.046h-34.77c-.126-1.585-1.014-2.726-2.607-3.757-.914-.592-1.83-1.183-2.715-1.761h30.875-.003Z" class="cls-6"/><path d="M95.172,121.87h-12.909v-.558l-4.529-4.449h12.829l4.608,4.636v.371Z" class="cls-5"/><path d="M122.669,126.509h-11.755v-.371l-4.417-4.268h11.755l4.417,4.268v.371Z" class="cls-5"/><path d="M81.301,67.267l.177-.822c.277.08.577.155.899.23l.771.175c.811.175,1.099.554,1.099.925,0,.529-.465.764-1.273.764-1.059,0-1.539-.391-1.673-1.272Z" class="cls-8"/><path d="M96.277,129.662c3.872,0,5.871,1.146,7.744,2.781,2.767,2.412,4.797,4.452,4.797,4.452v.37h-27.292s-2.584-1.853-4.98-3.708c-2.398-1.856-2.213-3.895,1.105-3.895h18.626Z" class="cls-5"/><path d="M128.363,121.87h-10.111l-5.18-5.006h10.128l.106-.13c1.796,1.48,3.272,2.887,5.205,4.998l-.148.138Z" class="cls-5"/><path d="M82.871,62.588c.905,0,1.388.296,1.388,1.175h3.375v3.797h-.343c0-1.68-1.125-2.441-3.706-3.03l-.771-.172c-.811-.178-1.099-.531-1.099-.902,0-.528.443-.867,1.157-.867Z" class="cls-8"/><path d="M49.877,112.411v.184l4.417,4.268h-10.579l-4.417-4.268v-.184h10.579Z" class="cls-5"/><path d="M63.543,68.307c-.942,0-1.656-.546-1.827-1.939h6.567v-.405h.5v1.278h-3.604c-.134.523-.54,1.066-1.636,1.066Z" class="cls-8"/><path d="M134.865,98.914c1.519-2.643,1.658-5.426-.14-8.068v-.325h7.838v.325c1.798,2.643,1.659,5.426.137,8.068h-7.835Z" class="cls-3"/><path d="M17.58,110.596l.326.143s20.653,19.107,24.342,22.447c3.686,3.338,4.98,4.079,8.852,4.079h93.49c3.689,0,2.952-2.967,2.952-2.967l.209-.215c.948,1.39,1.265,2.656,1.265,4.48v5.196c0,2.968-1.105,4.082-5.899,4.082H51.1c-6.456,0-8.115-1.301-11.619-4.268-.374-.316-.848-.724-1.399-1.201l-.017-.307c2.413-.15,2.707-.919,2.707-2.574,0-1.852,0-2.41-1.382-3.708,0,0-.831-.744-2.858-2.413-2.03-1.669-2.767-1.482-5.534-1.482-1.673,0-3.484-.273-4.651.293l-.088-.169c-2.387-2.106-4.412-3.892-5.402-4.763-2.95-2.596-3.686-3.894-3.686-7.235v-6.678c0-.733.04-1.347.137-1.861.066-.334.154-.627.274-.879Z" class="cls-6"/><path d="M32.154,116.866c-1.942-2.306-1.473-4.455,3.823-4.455h3.321v.184l4.417,4.268h-11.561v.003Z" class="cls-5"/><path d="M9.794,118.903c-3.504,0-4.057,3.154-1.476,5.934,2.581,2.784,5.716,5.753,8.298,7.977,2.581,2.226,3.781,2.134,5.625,2.134h4.885c2.213,0,2.767,4.36.186,4.36s.554,0-4.794,0-6.824-1.115-10.142-3.895c-3.321-2.783-3.504-3.524-7.561-7.235-4.057-3.711-3.504-5.193-3.504-7.977s2.581-6.307,6.453-6.307h2.775c.72,1.028,1.73,1.669,2.85,1.669,1.847,0,3.398-1.744,3.838-4.105l.08.017c-.097.514-.137,1.129-.137,1.861v5.567h-7.375Z" class="cls-3"/><path d="M47.913,60.925h.431v9.573h-.22l-3.372-4.943,3.161-4.63Z" class="cls-8"/><path d="M158.447,87.095l-.68-.077c.069-.454.1-.954.1-1.505v-2.864h.103c2.63-1.807,5.394-1.669,8.024-.138h.539v4.673c0,1.841-.282,3.45-.788,4.834l-.294-.109c-1.362-2.898-3.666-4.716-7.004-4.814Z" class="cls-3"/><path d="M106.497,121.87h-11.325v-.371l-4.609-4.636h10.753l5.18,5.007Z" class="cls-5"/><path d="M73.389,112.411v.184l4.346,4.268h-10.639l-4.286-4.268v-.184h10.579Z" class="cls-5"/><path d="M127.027,98.914c1.521-2.643,1.659-5.426-.14-8.068v-.325h7.838v.325c1.799,2.643,1.659,5.426.14,8.068h-7.838Z" class="cls-3"/><path d="M127.155,114.29c-1.288-1.152-2.296-2.019-2.85-2.436-.568-.428-1.156-.801-1.77-1.126l.066-.126c1.522-1.39,3.318-1.39,8.574-1.39h34.022c6.362,0,7.053,1.111,11.479,4.452l.145.531c-1.382.489-2.478,1.075-3.335,1.704l-.128-.288c-2.904-2.366-3.044-2.504-6.916-2.504h-32.086c-4.011,0-6.638-.279-6.775.973l-.426.21Z" class="cls-3"/><path d="M121.079,90.521h5.808v.325c1.799,2.643,1.661,5.426.14,8.068h-5.948v-8.393Z" class="cls-3"/><path d="M108.655,112.595l4.417,4.268h-11.755l-4.417-4.268v-.184h10.442c.439,0,.879,0,1.313.003v.181Z" class="cls-5"/><path d="M59.474,121.87h-10.579l-5.18-5.007h10.579l5.18,5.007Z" class="cls-5"/><path d="M157.97,74.766c2.63-1.81,5.394-1.672,8.024-.141h.539v7.884h-.539c-2.63-1.531-5.394-1.669-8.024.138h-.103v-7.882h.103Z" class="cls-3"/><path d="M63.892,126.509h-10.579v-.371l-4.417-4.268h10.579l4.417,4.268v.371Z" class="cls-5"/><path d="M86.321,112.411v.184l4.243,4.268h-12.829l-4.346-4.268v-.184h12.932Z" class="cls-5"/><path d="M25.861,49.249c-2.55,0-4.634,2.097-4.634,4.662v42.148c0,2.565,2.084,4.665,4.634,4.665h82.837c2.55,0,4.637-2.1,4.637-4.665v-42.148c0-2.565-2.087-4.662-4.637-4.662H25.861Z" class="cls-13"/><path d="M101.54,73.419c.875,0,1.591.72,1.591,1.6,0,.44-.178.841-.467,1.131-.288.29-.686.469-1.124.469h-6.435c-.875,0-1.591-.72-1.591-1.6,0-.44.178-.841.466-1.131.288-.29.687-.469,1.124-.469h6.435Z" class="cls-10"/><path d="M101.54,80.579c.875,0,1.591.72,1.591,1.6,0,.44-.178.841-.467,1.131-.288.29-.686.469-1.124.469h-6.435c-.875,0-1.591-.72-1.591-1.6,0-.44.178-.841.466-1.131.288-.29.687-.469,1.124-.469h6.435Z" class="cls-10"/><path d="M101.54,87.738c.875,0,1.591.72,1.591,1.6,0,.44-.178.841-.467,1.131-.288.29-.686.469-1.124.469h-6.435c-.875,0-1.591-.719-1.591-1.6,0-.44.178-.841.466-1.131.288-.29.687-.469,1.124-.469h6.435Z" class="cls-10"/><path d="M89.796,73.419c.875,0,1.591.72,1.591,1.6,0,.44-.178.841-.466,1.131-.288.29-.687.469-1.125.469h-6.434c-.876,0-1.591-.72-1.591-1.6,0-.44.178-.841.466-1.131.288-.29.687-.469,1.125-.469h6.434Z" class="cls-10"/><path d="M89.796,80.579c.875,0,1.591.72,1.591,1.6,0,.44-.178.841-.466,1.131-.288.29-.687.469-1.125.469h-6.434c-.876,0-1.591-.72-1.591-1.6,0-.44.178-.841.466-1.131.288-.29.687-.469,1.125-.469h6.434Z" class="cls-10"/><path d="M89.796,87.738c.875,0,1.591.72,1.591,1.6,0,.44-.178.841-.466,1.131-.288.29-.687.469-1.125.469h-6.434c-.876,0-1.591-.719-1.591-1.6,0-.44.178-.841.466-1.131.288-.29.687-.469,1.125-.469h6.434Z" class="cls-10"/><path d="M54.251,58.76c.875,0,1.591.723,1.591,1.604,0,.437-.178.838-.466,1.128-.288.29-.687.473-1.125.473h-19.929c-.875,0-1.591-.723-1.591-1.6,0-.44.178-.841.466-1.131.288-.293.687-.472,1.125-.472h19.929Z" class="cls-10"/><path d="M54.251,80.955c.875,0,1.591.723,1.591,1.604,0,.437-.178.838-.466,1.128-.288.29-.687.473-1.125.473h-19.929c-.875,0-1.591-.723-1.591-1.6,0-.44.178-.841.466-1.131.288-.293.687-.472,1.125-.472h19.929Z" class="cls-10"/><path d="M46.884,73.419c.875,0,1.591.72,1.591,1.6,0,.44-.178.841-.466,1.131-.288.29-.687.469-1.125.469h-12.562c-.875,0-1.591-.72-1.591-1.6,0-.44.178-.841.466-1.131.288-.29.687-.469,1.125-.469h12.562Z" class="cls-10"/><path d="M46.884,87.738c.875,0,1.591.72,1.591,1.6,0,.44-.178.841-.466,1.131-.288.29-.687.469-1.125.469h-12.562c-.875,0-1.591-.719-1.591-1.6,0-.44.178-.841.466-1.131.288-.29.687-.469,1.125-.469h12.562Z" class="cls-10"/><path d="M54.251,61.964h-19.929c-.875,0-1.591-.723-1.591-1.6,0-.44.178-.841.466-1.131.288-.293.687-.472,1.125-.472h19.929c.875,0,1.591.723,1.591,1.604,0,.437-.178.838-.466,1.128-.288.29-.687.473-1.125.473Z" class="cls-16"/><path d="M46.884,76.619h-12.562c-.875,0-1.591-.72-1.591-1.6,0-.44.178-.841.466-1.131.288-.29.687-.469,1.125-.469h12.562c.875,0,1.591.72,1.591,1.6,0,.44-.178.841-.466,1.131-.288.29-.687.469-1.125.469Z" class="cls-16"/><path d="M54.251,84.159h-19.929c-.875,0-1.591-.723-1.591-1.6,0-.44.178-.841.466-1.131.288-.293.687-.472,1.125-.472h19.929c.875,0,1.591.723,1.591,1.604,0,.437-.178.838-.466,1.128-.288.29-.687.473-1.125.473Z" class="cls-16"/><path d="M46.884,90.939h-12.562c-.875,0-1.591-.719-1.591-1.6,0-.44.178-.841.466-1.131.288-.29.687-.469,1.125-.469h12.562c.875,0,1.591.72,1.591,1.6,0,.44-.178.841-.466,1.131-.288.29-.687.469-1.125.469Z" class="cls-16"/><path d="M101.54,76.619h-6.435c-.875,0-1.591-.72-1.591-1.6,0-.44.178-.841.466-1.131.288-.29.687-.469,1.124-.469h6.435c.875,0,1.591.72,1.591,1.6,0,.44-.178.841-.467,1.131-.288.29-.686.469-1.124.469Z" class="cls-16"/><path d="M101.54,90.939h-6.435c-.875,0-1.591-.719-1.591-1.6,0-.44.178-.841.466-1.131.288-.29.687-.469,1.124-.469h6.435c.875,0,1.591.72,1.591,1.6,0,.44-.178.841-.467,1.131-.288.29-.686.469-1.124.469Z" class="cls-16"/><path d="M101.54,83.78h-6.435c-.875,0-1.591-.72-1.591-1.6,0-.44.178-.841.466-1.131.288-.29.687-.469,1.124-.469h6.435c.875,0,1.591.72,1.591,1.6,0,.44-.178.841-.467,1.131-.288.29-.686.469-1.124.469Z" class="cls-16"/><path d="M89.796,76.619h-6.434c-.876,0-1.591-.72-1.591-1.6,0-.44.178-.841.466-1.131.288-.29.687-.469,1.125-.469h6.434c.875,0,1.591.72,1.591,1.6,0,.44-.178.841-.466,1.131-.288.29-.687.469-1.125.469Z" class="cls-16"/><path d="M89.796,90.939h-6.434c-.876,0-1.591-.719-1.591-1.6,0-.44.178-.841.466-1.131.288-.29.687-.469,1.125-.469h6.434c.875,0,1.591.72,1.591,1.6,0,.44-.178.841-.466,1.131-.288.29-.687.469-1.125.469Z" class="cls-16"/><path d="M89.796,83.78h-6.434c-.876,0-1.591-.72-1.591-1.6,0-.44.178-.841.466-1.131.288-.29.687-.469,1.125-.469h6.434c.875,0,1.591.72,1.591,1.6,0,.44-.178.841-.466,1.131-.288.29-.687.469-1.125.469Z" class="cls-16"/><path d="M77.7,75.943h-2.512" class="cls-16"/><path d="M70.582,75.943h-2.512" class="cls-16"/><path d="M63.465,75.943h-2.513" class="cls-16"/><path d="M56.347,75.943h-2.513" class="cls-16"/><path d="M77.7,83.461h-2.512" class="cls-16"/><path d="M70.582,83.461h-2.512" class="cls-16"/><path d="M63.465,83.461h-2.513" class="cls-16"/><path d="M77.7,90.979h-2.512" class="cls-16"/><path d="M70.582,90.979h-2.512" class="cls-16"/><path d="M63.465,90.979h-2.513" class="cls-16"/><path d="M56.347,90.979h-2.513" class="cls-16"/><path d="M84.515,58.466h18.363" class="cls-16"/><path d="M84.515,62.046h18.363" class="cls-16"/><path d="M33.073,67.885h69.57" class="cls-16"/><path d="M27.312,139.307c2.581,0,2.027-4.36-.186-4.36h-2.027v-.279c0-1.39.488-2.116,1.248-2.487,1.168-.566,2.978-.293,4.651-.293,2.767,0,3.503-.187,5.534,1.482,2.027,1.669,2.858,2.413,2.858,2.413,1.382,1.298,1.382,1.855,1.382,3.708,0,1.654-.294,2.424-2.707,2.574-.294.017-.62.025-.979.025h-5.716c-1.845,0-4.058-2.783-4.058-2.783Z" class="cls-6"/><path d="M110.914,126.509h-47.022v-.371l-4.417-4.268h47.022l4.418,4.268v.371Z" class="cls-5"/><path d="M118.252,121.87h-11.755l-5.18-5.007h11.755l5.18,5.007Z" class="cls-5"/><path d="M71.935,121.87h-12.461l-5.18-5.007h12.801l4.84,4.823v.184Z" class="cls-5"/><path d="M37.454,121.87h11.442l4.417,4.268v.371h-4.794c-4.426,0-7.007-.744-9.406-2.97-.623-.577-1.188-1.097-1.728-1.594l.069-.075Z" class="cls-5"/><path d="M32.474,116.863h11.242l5.18,5.007h-11.441l-.069.074c-1.545-1.427-2.881-2.671-4.726-4.526-.183-.184-.351-.368-.505-.552h.32v-.003Z" class="cls-5"/><path d="M170.871,120.482h.274c3.375-2.392,8.335-1.711,11.604,1.009.348.29.677.603.982.936,3.181,3.478,6.085,9.042,5.668,15.72l-.017.095c-3.315-.646-4.951-2.24-7.45-4.547,0,0-5.67-5.147-8.437-7.93-2.342-2.356-2.61-2.755-2.624-5.283Z" class="cls-10"/><path d="M62.809,112.411v.184l4.286,4.268h-12.8l-4.417-4.268v-.184h12.932Z" class="cls-5"/><path d="M155.834,89.973c1.125-.543,1.716-1.505,1.933-2.956l.68.077c3.338.098,5.642,1.916,7.004,4.814l.294.109c-1.245,3.415-3.854,5.48-6.972,6.374l-.083-.307c.825-2.938.277-5.67-2.116-7.784l-.74-.327Z" class="cls-3"/><path d="M96.9,112.411v.184l4.417,4.268h-10.753l-4.243-4.268v-.184h10.579Z" class="cls-5"/><path d="M129.471,122.798c2.961,3.329,1.105,3.711-4.058,3.711h-2.744v-.37l-4.417-4.269h10.111l.148-.138c.306.336.626.69.96,1.066Z" class="cls-5"/><path d="M232.135,142.042l-.068,5.604c-.183,1.052-1.182,1.864-3.389,1.864h-45.641c-5.668,0-7.743.833-12.583-3.199-4.843-4.036-14.8-13.357-18.394-16.835-.783-.755-1.263-1.473-1.5-2.137l-.159-.6v-5.601c.094.838.599,1.798,1.659,2.82,3.594,3.479,13.551,12.799,18.394,16.832,4.84,4.036,6.915,3.2,12.583,3.2h45.641c2.27,0,3.26-.859,3.4-1.956l.057.008Z" class="cls-12"/><path d="M197.802,117.766h3.493c5.393,0,6.361.071,9.956,2.852,3.598,2.783,16.25,15.094,19.502,18.365.911.917,1.454,2.077,1.325,3.051-.14,1.097-1.13,1.956-3.4,1.956h-45.641c-5.667,0-7.743.836-12.583-3.2-4.843-4.033-14.8-13.353-18.394-16.832-1.06-1.022-1.565-1.982-1.659-2.82-.229-2.02,1.927-3.372,4.562-3.372h16.707" class="cls-17"/><path d="M150.56,127.339c.237.663.717,1.381,1.5,2.137,3.594,3.478,13.551,12.799,18.394,16.834,4.84,4.033,6.916,3.2,12.583,3.2h45.641c2.207,0,3.206-.813,3.389-1.864l.068-5.604" class="cls-17"/><path d="M150.401,120.617v6.121" class="cls-17"/><path d="M79.288,49.249h29.41c2.55,0,4.637,2.097,4.637,4.662v42.148c0,2.565-2.087,4.665-4.637,4.665H25.861c-2.55,0-4.634-2.1-4.634-4.665v-42.148c0-2.565,2.084-4.662,4.634-4.662h53.427Z" class="cls-17"/><path d="M79.154,42.293h34.769c1.354,0,2.622.382,3.704,1.046,2.067,1.267,3.452,3.556,3.452,6.153v52.104c0,3.961-3.218,7.198-7.156,7.198H21.19c-.434,0-.862-.04-1.273-.118-.865-.155-1.673-.471-2.401-.911" class="cls-17"/><path d="M16.341,106.877c-1.416-1.316-2.307-3.2-2.307-5.282v-52.104c0-3.958,3.221-7.198,7.156-7.198h58.048" class="cls-17"/><path d="M17.495,107.752c-.057-.034-.111-.069-.166-.106h-.003c-.131-.086-.26-.175-.383-.267-.206-.155-.406-.319-.594-.497" class="cls-17"/><path d="M104.706,36.774c1.825,0,3.538.508,5.006,1.387.003,0,.003.003.005.003" class="cls-17"/><path d="M118.329,43.499l-.579-.359-8.041-4.975" class="cls-17"/><path d="M49.977,36.774H14.842c-5.402,0-9.82,4.444-9.82,9.878v46.744c0,3.338,1.665,6.299,4.203,8.092l3.898,2.949,3.218,2.439.009.006,1.022.775s.003.003.006.003l.117.092.02.012.363.275" class="cls-17"/><path d="M104.706,36.774h-55.022" class="cls-17"/><path d="M38.082,142.372c.551.477,1.025.885,1.399,1.201,3.504,2.967,5.163,4.268,11.619,4.268h92.017c4.794,0,5.899-1.114,5.899-4.082v-5.196c0-1.823-.317-3.09-1.265-4.48-.497-.727-1.165-1.488-2.053-2.382-2.096-2.111-12.961-12.422-18.543-17.411-1.288-1.152-2.296-2.02-2.85-2.436-.568-.428-1.156-.802-1.77-1.126-2.57-1.359-5.571-1.841-9.291-1.841H23.622c-1.765,0-3.069.06-4.02.278-.834.196-1.399.512-1.773,1.017h-.003c-.091.124-.174.262-.246.414-.12.253-.208.545-.274.879-.097.514-.137,1.128-.137,1.861v6.678c0,3.341.737,4.639,3.686,7.235.991.871,3.015,2.657,5.402,4.763" class="cls-17"/><path d="M17.906,110.739s20.653,19.107,24.342,22.447c3.686,3.338,4.98,4.079,8.852,4.079h93.49c3.689,0,2.952-2.967,2.952-2.967" class="cls-17"/><path d="M81.526,137.265s-2.584-1.853-4.98-3.708c-2.398-1.856-2.213-3.895,1.105-3.895h18.626c3.872,0,5.871,1.146,7.744,2.781,2.767,2.412,4.797,4.452,4.797,4.452" class="cls-17"/><path d="M122.669,126.508h2.744c5.163,0,7.019-.382,4.058-3.711-.334-.376-.654-.729-.96-1.065-1.933-2.111-3.409-3.519-5.205-4.998-.602-.494-1.245-1-1.95-1.542-3.327-2.56-7.847-2.764-12.701-2.778-.434-.003-.874-.003-1.313-.003H35.978c-5.297,0-5.765,2.149-3.823,4.455.154.184.323.368.505.552,1.845,1.855,3.181,3.099,4.726,4.526.54.497,1.105,1.017,1.728,1.594,2.398,2.227,4.98,2.97,9.406,2.97h74.151Z" class="cls-17"/><path d="M32.474,116.863h90.726" class="cls-17"/><path d="M37.454,121.87h90.909" class="cls-17"/><path d="M39.298,112.596l4.417,4.268,5.18,5.006,4.417,4.269" class="cls-17"/><path d="M49.877,112.596l4.417,4.268,5.18,5.006,4.417,4.269" class="cls-17"/><path d="M62.809,112.596l4.286,4.268,4.84,4.823" class="cls-17"/><path d="M73.389,112.596l4.346,4.268,4.529,4.449" class="cls-17"/><path d="M86.321,112.596l4.243,4.268,4.608,4.636" class="cls-17"/><path d="M96.9,112.596l4.417,4.268,5.18,5.006,4.417,4.269" class="cls-17"/><path d="M108.655,112.596l4.417,4.268,5.18,5.006,4.417,4.269" class="cls-17"/><path d="M16.944,107.379c.089.279.174.652.243,1.051.1.572.166,1.198.166,1.661,0,.109-.003.218-.009.324-.014.359-.054.707-.117,1.043-.44,2.361-1.99,4.104-3.838,4.104-1.119,0-2.13-.64-2.85-1.669-.691-.985-1.116-2.323-1.116-3.802,0-2.824,1.55-5.148,3.541-5.441" class="cls-17"/><path d="M13.389,115.562h3.227" class="cls-17"/><path d="M10.345,113.894h-2.581c-3.872,0-6.453,3.524-6.453,6.307s-.554,4.266,3.504,7.977c4.057,3.711,4.24,4.452,7.561,7.235,3.318,2.78,4.794,3.895,10.142,3.895s2.213,0,4.794,0,2.027-4.36-.186-4.36h-4.885c-1.845,0-3.044.092-5.625-2.135-2.581-2.223-5.716-5.193-8.298-7.976-2.581-2.78-2.027-5.934,1.476-5.934h7.19" class="cls-17"/><path d="M10.551,113.894h-.011" class="cls-17"/><path d="M10.539,113.894h-.194" class="cls-17"/><path d="M25.099,134.668c0-1.39.488-2.116,1.248-2.487,1.168-.566,2.978-.293,4.651-.293,2.767,0,3.503-.187,5.534,1.482,2.027,1.669,2.858,2.413,2.858,2.413,1.382,1.298,1.382,1.855,1.382,3.708,0,1.654-.294,2.424-2.707,2.574-.294.017-.62.025-.979.025h-5.716c-1.845,0-4.058-2.783-4.058-2.783" class="cls-17"/><path d="M121.17,90.522h31.535c1.33,0,2.356-.175,3.129-.549,1.125-.543,1.716-1.505,1.933-2.956.069-.454.1-.954.1-1.505v-17.805" class="cls-17"/><path d="M121.079,98.914h33.839c1.328,0,2.632-.169,3.855-.523,3.118-.893,5.727-2.959,6.972-6.374.506-1.384.788-2.993.788-4.834v-19.293" class="cls-17"/><path d="M193.691,19.627c1.31.988,2.164,2.562,2.164,4.329v38.159c0,2.973-2.418,5.406-5.377,5.406h-53.606c-1.294,0-2.484-.465-3.412-1.238-1.197-.994-1.962-2.496-1.962-4.168V23.955c0-2.973,2.419-5.406,5.374-5.406h53.606c1.203,0,2.316.402,3.213,1.077Z" class="cls-17"/><path d="M133.343,66.428l-5.885-4.472c-1.602-1.364-2.621-3.398-2.621-5.661V20.845c0-4.082,3.317-7.419,7.375-7.419h51.225c1.925,0,3.295.764,4.997,1.973l5.348,4.107.928.712" class="cls-17"/><path d="M189.422,58.832c0,1.451-1.176,2.637-2.618,2.637h-45.795c-1.439,0-2.618-1.186-2.618-2.637v-31.455c0-1.451,1.179-2.637,2.618-2.637h45.795c1.442,0,2.618,1.186,2.618,2.637v31.455Z" class="cls-17"/><path d="M126.887,90.846c1.799,2.642,1.661,5.426.14,8.068" class="cls-17"/><path d="M134.725,90.846c1.798,2.642,1.659,5.426.14,8.068" class="cls-17"/><path d="M142.563,90.846c1.799,2.642,1.659,5.426.137,8.068" class="cls-17"/><path d="M150.401,90.846c1.796,2.642,1.659,5.426.137,8.068" class="cls-17"/><path d="M156.574,90.301c2.393,2.114,2.941,4.846,2.116,7.784" class="cls-17"/><path d="M158.447,87.095c3.338.098,5.642,1.916,7.004,4.814" class="cls-17"/><path d="M157.97,82.649c2.63-1.807,5.394-1.669,8.024-.138" class="cls-17"/><path d="M157.97,74.766c2.63-1.81,5.394-1.672,8.024-.141" class="cls-17"/><path d="M180.616,113.256c-1.456.235-2.713.557-3.795.939-1.382.488-2.478,1.074-3.335,1.703-.808.598-1.402,1.235-1.816,1.867-.568.859-.802,1.709-.802,2.436,0,.098,0,.19.003.282.014,2.527.282,2.926,2.624,5.282,2.767,2.783,8.437,7.93,8.437,7.93,2.499,2.307,4.135,3.901,7.45,4.547,1.088.213,2.356.322,3.892.322h10.233c3.181,0,5.531-1.669,4.286-5.564-.659-2.068-3.192-7.626-7.241-12.385" class="cls-17"/><path d="M200.549,120.615c-.851-1-1.767-1.962-2.747-2.849-3.149-2.855-6.952-4.938-11.307-4.938-2.244,0-4.189.155-5.873.428" class="cls-17"/><path d="M171.145,120.48c3.375-2.39,8.335-1.709,11.604,1.011.348.29.677.603.982.937,3.181,3.478,6.085,9.042,5.668,15.72" class="cls-17"/><path d="M182.9,121.312s2.873-.703,8.312-.896c2.556-.089,5.68-.066,9.337.198h.003c.017,0,.034.003.052.003" class="cls-17"/><path d="M180.55,113.244s.023,0,.066.012c0,0,0,.002.006,0,.571.115,4.46.985,8.375,4.509.739.667,1.482,1.428,2.201,2.298" class="cls-17"/><path d="M122.601,110.602c1.522-1.39,3.318-1.39,8.574-1.39h34.022c6.362,0,7.053,1.111,11.479,4.452" class="cls-17"/><path d="M173.358,115.611c-2.904-2.367-3.044-2.505-6.916-2.505h-32.086c-4.011,0-6.638-.278-6.775.974" class="cls-17"/><path d="M169.013,56.97c.283,0,1.094-.208,1.094-1.032s-.781-1.032-1.094-1.032h-9.897c-.283,0-1.095.208-1.095,1.032s.781,1.032,1.095,1.032h9.897Z" class="cls-14"/><path d="M169.013,30.798c.283,0,1.094-.208,1.094-1.032s-.781-1.032-1.094-1.032h-9.897c-.283,0-1.095.208-1.095,1.032s.781,1.032,1.095,1.032h9.897Z" class="cls-14"/><path d="M170.549,31.838c1.331.997,1.763,2.431,1.331,4.07-.796,3.021-6.227,4.766-6.265,6.946v.023c.038,2.18,5.467,3.925,6.265,6.946.432,1.64,0,3.074-1.331,4.07-1.33.997-3.583,1.396-6.403,1.396h-.108c-2.82,0-5.072-.399-6.403-1.396-1.331-.997-1.763-2.431-1.329-4.07.796-3.021,6.228-4.766,6.263-6.946v-.023c-.038-2.18-5.467-3.925-6.263-6.946-.431-1.64-.002-3.074,1.329-4.07,1.331-.997,3.583-1.396,6.403-1.396h.108c2.82,0,5.073.399,6.403,1.396ZM168.9,53.124c.663-.331.743-.761.248-1.1,0,0-3.319-2.255-4.999-2.255h-.056c-1.68,0-4.999,2.255-4.999,2.255-.495.339-.417.768.246,1.1.703.352,1.614.665,4.728.665h.106c3.113,0,4.025-.314,4.728-.665h-.002ZM164.44,42.648c0-.249-.201-.452-.452-.452s-.452.203-.452.452.201.452.452.452.452-.203.452-.452ZM164.44,46.322c0-.249-.201-.452-.452-.452s-.452.203-.452.452.201.452.452.452.452-.203.452-.452Z" class="cls-2"/><path d="M169.743,48.403c1.329,1.366,1.763,2.865.919,3.104-.954.266-.916-1.007-2.644-2.343-1.544-1.193-1.783-1.728-1.348-2.21.381-.427,1.434-.236,3.073,1.449Z" class="cls-11"/><path d="M169.146,52.027c.494.339.417.768-.249,1.1-.703.352-1.615.666-4.728.666h-.106c-3.114,0-4.025-.314-4.728-.666-.663-.331-.741-.761-.246-1.1,0,0,3.319-2.255,4.999-2.255h.056c1.68,0,4.999,2.255,4.999,2.255h.003Z" class="cls-7"/><path d="M168.209,36.832c.394,0,.558.467.236.681,0,0-2.915,2.433-4.409,2.433s-4.51-2.433-4.51-2.433c-.319-.213-.158-.681.236-.681h8.447Z" class="cls-7"/><path d="M163.988,42.198c.251,0,.452.203.452.452s-.201.452-.452.452-.452-.203-.452-.452.201-.452.452-.452Z" class="cls-7"/><path d="M163.988,45.872c.251,0,.452.203.452.452s-.201.452-.452.452-.452-.203-.452-.452.201-.452.452-.452Z" class="cls-7"/><path d="M170.246,32.826c1.172,1.401.899,3.887-.131,3.877-.899-.008-.07-.864-.708-2.257-.638-1.394-2.084-1.534-1.617-2.348.346-.608,1.617-.274,2.456.731v-.003Z" class="cls-11"/><path d="M162.567,42.876c-.038,2.18-5.467,3.925-6.263,6.946-.432,1.64-.003,3.074,1.328,4.07,1.331.997,3.584,1.396,6.404,1.396" class="cls-15"/><path d="M165.615,42.876c.038,2.18,5.467,3.925,6.265,6.946.432,1.64,0,3.074-1.331,4.07-1.331.997-3.583,1.396-6.403,1.396" class="cls-15"/><path d="M165.615,42.876v-.023c.038-2.18,5.467-3.925,6.265-6.946.432-1.64,0-3.074-1.331-4.07-1.331-.997-3.583-1.396-6.403-1.396" class="cls-15"/><path d="M162.567,42.876v-.023c-.038-2.18-5.467-3.925-6.263-6.946-.432-1.64-.003-3.074,1.328-4.07,1.331-.997,3.584-1.396,6.404-1.396" class="cls-15"/><path d="M159.764,36.832h8.445c.394,0,.558.467.236.681,0,0-2.915,2.433-4.409,2.433s-4.51-2.433-4.51-2.433c-.319-.213-.158-.681.236-.681h.002Z" class="cls-15"/><path d="M164.063,53.789c-3.114,0-4.025-.314-4.728-.665-.663-.332-.741-.761-.246-1.1,0,0,3.319-2.255,4.999-2.255" class="cls-15"/><path d="M164.169,53.789c3.113,0,4.025-.314,4.728-.665.663-.332.743-.761.249-1.1,0,0-3.32-2.255-5-2.255" class="cls-15"/><path d="M164.44,42.65c0,.249-.201.452-.452.452s-.452-.203-.452-.452.201-.452.452-.452.452.203.452.452Z" class="cls-15"/><path d="M164.44,46.324c0,.249-.201.452-.452.452s-.452-.203-.452-.452.201-.452.452-.452.452.203.452.452Z" class="cls-15"/></svg>
\ No newline at end of file
diff --git a/assets/images/all.svg b/assets/images/all.svg
index d1a833d280ce..f6d9f46fc92e 100644
--- a/assets/images/all.svg
+++ b/assets/images/all.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" id="Layer_1" x="0" y="0" version="1.1" 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 d="M6 3C6 2.44772 6.44772 2 7 2H13C13.5523 2 14 2.44772 14 3C14 3.55228 13.5523 4 13 4H7C6.44772 4 6 3.55228 6 3ZM4 7C4 6.44772 4.44772 6 5 6H15C15.5523 6 16 6.44772 16 7C16 7.55228 15.5523 8 15 8H5C4.44772 8 4 7.55228 4 7ZM16 10H4C2.34315 10 1 11.3431 1 13V15C1 16.6569 2.34315 18 4 18H16C17.6569 18 19 16.6569 19 15V13C19 11.3431 17.6569 10 16 10ZM3 13C3 12.4477 3.44772 12 4 12H16C16.5523 12 17 12.4477 17 13V15C17 15.5523 16.5523 16 16 16H4C3.44772 16 3 15.5523 3 15V13Z" class="st0" /></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" id="Layer_1" x="0" y="0" version="1.1" 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 d="M6 3C6 2.44772 6.44772 2 7 2H13C13.5523 2 14 2.44772 14 3C14 3.55228 13.5523 4 13 4H7C6.44772 4 6 3.55228 6 3ZM4 7C4 6.44772 4.44772 6 5 6H15C15.5523 6 16 6.44772 16 7C16 7.55228 15.5523 8 15 8H5C4.44772 8 4 7.55228 4 7ZM16 10H4C2.34315 10 1 11.3431 1 13V15C1 16.6569 2.34315 18 4 18H16C17.6569 18 19 16.6569 19 15V13C19 11.3431 17.6569 10 16 10ZM3 13C3 12.4477 3.44772 12 4 12H16C16.5523 12 17 12.4477 17 13V15C17 15.5523 16.5523 16 16 16H4C3.44772 16 3 15.5523 3 15V13Z" class="st0"/></svg>
\ No newline at end of file
diff --git a/assets/images/arrow-down-long.svg b/assets/images/arrow-down-long.svg
new file mode 100644
index 000000000000..cbf6e7e5ad2f
--- /dev/null
+++ b/assets/images/arrow-down-long.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" id="Layer_1" x="0" y="0" version="1.1" viewBox="0 0 8 8" xml:space="preserve"><style type="text/css">.st0{fill-rule:evenodd;clip-rule:evenodd}</style><path d="M6.79395 4.06398C7.08993 4.39201 7.06395 4.89788 6.73592 5.19386L3.99999 7.66247L1.26407 5.19386C0.936035 4.89788 0.910053 4.39201 1.20604 4.06398C1.50202 3.73594 2.00788 3.70996 2.33592 4.00595L3.19999 4.7856L3.19999 1.1999C3.19999 0.758075 3.55817 0.399902 3.99999 0.399902C4.44182 0.399902 4.79999 0.758075 4.79999 1.1999V4.7856L5.66407 4.00595C5.9921 3.70996 6.49797 3.73594 6.79395 4.06398Z" class="st0"/></svg>
\ No newline at end of file
diff --git a/assets/images/arrow-right.svg b/assets/images/arrow-right.svg
index 8d2ded92e791..649582544847 100644
--- a/assets/images/arrow-right.svg
+++ b/assets/images/arrow-right.svg
@@ -1,10 +1 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 28.3.0, 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="M5.6,18.4c0.8,0.8,2,0.8,2.8,0l8.4-8.4L8.4,1.6c-0.8-0.8-2-0.8-2.8,0s-0.8,2,0,2.8l5.6,5.6l-5.6,5.6
-	C4.8,16.4,4.8,17.6,5.6,18.4z"/>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" id="Layer_1" x="0" y="0" version="1.1" 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 d="M5.6,18.4c0.8,0.8,2,0.8,2.8,0l8.4-8.4L8.4,1.6c-0.8-0.8-2-0.8-2.8,0s-0.8,2,0,2.8l5.6,5.6l-5.6,5.6	C4.8,16.4,4.8,17.6,5.6,18.4z" class="st0"/></svg>
\ No newline at end of file
diff --git a/assets/images/arrow-up-long.svg b/assets/images/arrow-up-long.svg
new file mode 100644
index 000000000000..13d7a0c2d67e
--- /dev/null
+++ b/assets/images/arrow-up-long.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0" y="0" version="1.1" viewBox="0 0 8 8" transform="matrix(-1, 0, 0, -1, 0, 0)" xml:space="preserve"><style type="text/css">.st0{fill-rule:evenodd;clip-rule:evenodd}</style><path d="M6.79395 4.06398C7.08993 4.39201 7.06395 4.89788 6.73592 5.19386L3.99999 7.66247L1.26407 5.19386C0.936035 4.89788 0.910053 4.39201 1.20604 4.06398C1.50202 3.73594 2.00788 3.70996 2.33592 4.00595L3.19999 4.7856L3.19999 1.1999C3.19999 0.758075 3.55817 0.399902 3.99999 0.399902C4.44182 0.399902 4.79999 0.758075 4.79999 1.1999V4.7856L5.66407 4.00595C5.9921 3.70996 6.49797 3.73594 6.79395 4.06398Z" class="st0"/></svg>
\ No newline at end of file
diff --git a/assets/images/avatars/fallback-avatar.svg b/assets/images/avatars/fallback-avatar.svg
index 69293d72aed9..4a7fecf967db 100644
--- a/assets/images/avatars/fallback-avatar.svg
+++ b/assets/images/avatars/fallback-avatar.svg
@@ -1,10 +1 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 27.9.0, 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 40 40" style="enable-background:new 0 0 40 40;" xml:space="preserve">
-<style type="text/css">
-	.st1{fill: {FILL_COLOR};}
-</style>
-<path class="st1" d="M29,27c0,1.5-1,2-2.5,2s-4.2,0-6.5,0s-4.9,0-6.5,0S11,28.5,11,27c0-4,4.5-7,9-7C24.5,20,29,23,29,27z"/>
-<path class="st1" d="M24,15c0,2.2-1.8,4-4,4s-4-1.8-4-4s1.8-4,4-4S24,12.8,24,15z"/>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" id="Layer_1" x="0" y="0" version="1.1" viewBox="0 0 40 40" style="enable-background:new 0 0 40 40" xml:space="preserve"><style type="text/css">.st1{fill:{FILL_COLOR}}</style><path d="M29,27c0,1.5-1,2-2.5,2s-4.2,0-6.5,0s-4.9,0-6.5,0S11,28.5,11,27c0-4,4.5-7,9-7C24.5,20,29,23,29,27z" class="st1"/><path d="M24,15c0,2.2-1.8,4-4,4s-4-1.8-4-4s1.8-4,4-4S24,12.8,24,15z" class="st1"/></svg>
\ No newline at end of file
diff --git a/assets/images/avatars/group/default-avatar_1.svg b/assets/images/avatars/group/default-avatar_1.svg
index 5d97c5bf855b..1edcaa33a8aa 100644
--- a/assets/images/avatars/group/default-avatar_1.svg
+++ b/assets/images/avatars/group/default-avatar_1.svg
@@ -1,7 +1 @@
-<svg viewBox="0 0 40 40" fill="none" xmlns="http://www.w3.org/2000/svg">
-<rect width="40" height="40" rx="20" fill="#8DC8FF"/>
-<path d="M26.2502 14.5C26.2502 15.8807 25.1309 17 23.7502 17C22.3695 17 21.2502 15.8807 21.2502 14.5C21.2502 13.1193 22.3695 12 23.7502 12C25.1309 12 26.2502 13.1193 26.2502 14.5Z" fill="#003C73"/>
-<path d="M23.25 25C23.25 26 22.7115 26.9892 21.2501 26.9892C20.0821 26.9892 18.4959 26.9892 16.7488 26.9892C15.0017 26.9892 13.4156 26.9892 12.2476 26.9892C10.7557 26.9892 10.2495 25.9879 10.25 25C10.25 21.9879 13.25 19.9892 16.7488 19.9892C20.2476 19.9892 23.25 22 23.25 25Z" fill="#003C73"/>
-<path d="M28.25 25C29.6969 25 30.25 23.9772 30.25 23C30.25 19.9892 27.2117 18 23.5411 18C22.5254 18 21.3811 18.2853 20.7942 18.6938C20.2072 19.1023 20.2986 19.5536 20.7942 19.7976C23.3267 21.0451 24.258 22.903 24.258 24.016C24.258 24.6503 24.6882 25 25.2424 25H28.25Z" fill="#003C73"/>
-<path d="M19.2502 16.5C19.2502 17.8807 18.1309 19 16.7502 19C15.3695 19 14.2502 17.8807 14.2502 16.5C14.2502 15.1193 15.3695 14 16.7502 14C18.1309 14 19.2502 15.1193 19.2502 16.5Z" fill="#003C73"/>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 40 40"><rect width="40" height="40" fill="#8DC8FF" rx="20"/><path fill="#003C73" d="M26.2502 14.5C26.2502 15.8807 25.1309 17 23.7502 17C22.3695 17 21.2502 15.8807 21.2502 14.5C21.2502 13.1193 22.3695 12 23.7502 12C25.1309 12 26.2502 13.1193 26.2502 14.5Z"/><path fill="#003C73" d="M23.25 25C23.25 26 22.7115 26.9892 21.2501 26.9892C20.0821 26.9892 18.4959 26.9892 16.7488 26.9892C15.0017 26.9892 13.4156 26.9892 12.2476 26.9892C10.7557 26.9892 10.2495 25.9879 10.25 25C10.25 21.9879 13.25 19.9892 16.7488 19.9892C20.2476 19.9892 23.25 22 23.25 25Z"/><path fill="#003C73" d="M28.25 25C29.6969 25 30.25 23.9772 30.25 23C30.25 19.9892 27.2117 18 23.5411 18C22.5254 18 21.3811 18.2853 20.7942 18.6938C20.2072 19.1023 20.2986 19.5536 20.7942 19.7976C23.3267 21.0451 24.258 22.903 24.258 24.016C24.258 24.6503 24.6882 25 25.2424 25H28.25Z"/><path fill="#003C73" d="M19.2502 16.5C19.2502 17.8807 18.1309 19 16.7502 19C15.3695 19 14.2502 17.8807 14.2502 16.5C14.2502 15.1193 15.3695 14 16.7502 14C18.1309 14 19.2502 15.1193 19.2502 16.5Z"/></svg>
\ No newline at end of file
diff --git a/assets/images/avatars/group/default-avatar_10.svg b/assets/images/avatars/group/default-avatar_10.svg
index 12c9dd76ae31..62e818cb3e45 100644
--- a/assets/images/avatars/group/default-avatar_10.svg
+++ b/assets/images/avatars/group/default-avatar_10.svg
@@ -1,7 +1 @@
-<svg viewBox="0 0 40 40" fill="none" xmlns="http://www.w3.org/2000/svg">
-<rect width="40" height="40" rx="20" fill="#FF7101"/>
-<path d="M26.2502 14.5C26.2502 15.8807 25.1309 17 23.7502 17C22.3695 17 21.2502 15.8807 21.2502 14.5C21.2502 13.1193 22.3695 12 23.7502 12C25.1309 12 26.2502 13.1193 26.2502 14.5Z" fill="#400000"/>
-<path d="M23.25 25C23.25 26 22.7115 26.9892 21.2501 26.9892C20.0821 26.9892 18.4959 26.9892 16.7488 26.9892C15.0017 26.9892 13.4156 26.9892 12.2476 26.9892C10.7557 26.9892 10.2495 25.9879 10.25 25C10.25 21.9879 13.25 19.9892 16.7488 19.9892C20.2476 19.9892 23.25 22 23.25 25Z" fill="#400000"/>
-<path d="M28.25 25C29.6969 25 30.25 23.9772 30.25 23C30.25 19.9892 27.2117 18 23.5411 18C22.5254 18 21.3811 18.2853 20.7942 18.6938C20.2072 19.1023 20.2986 19.5536 20.7942 19.7976C23.3267 21.0451 24.258 22.903 24.258 24.016C24.258 24.6503 24.6882 25 25.2424 25H28.25Z" fill="#400000"/>
-<path d="M19.2502 16.5C19.2502 17.8807 18.1309 19 16.7502 19C15.3695 19 14.2502 17.8807 14.2502 16.5C14.2502 15.1193 15.3695 14 16.7502 14C18.1309 14 19.2502 15.1193 19.2502 16.5Z" fill="#400000"/>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 40 40"><rect width="40" height="40" fill="#FF7101" rx="20"/><path fill="#400000" d="M26.2502 14.5C26.2502 15.8807 25.1309 17 23.7502 17C22.3695 17 21.2502 15.8807 21.2502 14.5C21.2502 13.1193 22.3695 12 23.7502 12C25.1309 12 26.2502 13.1193 26.2502 14.5Z"/><path fill="#400000" d="M23.25 25C23.25 26 22.7115 26.9892 21.2501 26.9892C20.0821 26.9892 18.4959 26.9892 16.7488 26.9892C15.0017 26.9892 13.4156 26.9892 12.2476 26.9892C10.7557 26.9892 10.2495 25.9879 10.25 25C10.25 21.9879 13.25 19.9892 16.7488 19.9892C20.2476 19.9892 23.25 22 23.25 25Z"/><path fill="#400000" d="M28.25 25C29.6969 25 30.25 23.9772 30.25 23C30.25 19.9892 27.2117 18 23.5411 18C22.5254 18 21.3811 18.2853 20.7942 18.6938C20.2072 19.1023 20.2986 19.5536 20.7942 19.7976C23.3267 21.0451 24.258 22.903 24.258 24.016C24.258 24.6503 24.6882 25 25.2424 25H28.25Z"/><path fill="#400000" d="M19.2502 16.5C19.2502 17.8807 18.1309 19 16.7502 19C15.3695 19 14.2502 17.8807 14.2502 16.5C14.2502 15.1193 15.3695 14 16.7502 14C18.1309 14 19.2502 15.1193 19.2502 16.5Z"/></svg>
\ No newline at end of file
diff --git a/assets/images/avatars/group/default-avatar_11.svg b/assets/images/avatars/group/default-avatar_11.svg
index 97f17f30f3a7..2f976b05519d 100644
--- a/assets/images/avatars/group/default-avatar_11.svg
+++ b/assets/images/avatars/group/default-avatar_11.svg
@@ -1,7 +1 @@
-<svg viewBox="0 0 40 40" fill="none" xmlns="http://www.w3.org/2000/svg">
-<rect width="40" height="40" rx="20" fill="#F68DFE"/>
-<path d="M26.2502 14.5C26.2502 15.8807 25.1309 17 23.7502 17C22.3695 17 21.2502 15.8807 21.2502 14.5C21.2502 13.1193 22.3695 12 23.7502 12C25.1309 12 26.2502 13.1193 26.2502 14.5Z" fill="#49225B"/>
-<path d="M23.25 25C23.25 26 22.7115 26.9892 21.2501 26.9892C20.0821 26.9892 18.4959 26.9892 16.7488 26.9892C15.0017 26.9892 13.4156 26.9892 12.2476 26.9892C10.7557 26.9892 10.2495 25.9879 10.25 25C10.25 21.9879 13.25 19.9892 16.7488 19.9892C20.2476 19.9892 23.25 22 23.25 25Z" fill="#49225B"/>
-<path d="M28.25 25C29.6969 25 30.25 23.9772 30.25 23C30.25 19.9892 27.2117 18 23.5411 18C22.5254 18 21.3811 18.2853 20.7942 18.6938C20.2072 19.1023 20.2986 19.5536 20.7942 19.7976C23.3267 21.0451 24.258 22.903 24.258 24.016C24.258 24.6503 24.6882 25 25.2424 25H28.25Z" fill="#49225B"/>
-<path d="M19.2502 16.5C19.2502 17.8807 18.1309 19 16.7502 19C15.3695 19 14.2502 17.8807 14.2502 16.5C14.2502 15.1193 15.3695 14 16.7502 14C18.1309 14 19.2502 15.1193 19.2502 16.5Z" fill="#49225B"/>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 40 40"><rect width="40" height="40" fill="#F68DFE" rx="20"/><path fill="#49225B" d="M26.2502 14.5C26.2502 15.8807 25.1309 17 23.7502 17C22.3695 17 21.2502 15.8807 21.2502 14.5C21.2502 13.1193 22.3695 12 23.7502 12C25.1309 12 26.2502 13.1193 26.2502 14.5Z"/><path fill="#49225B" d="M23.25 25C23.25 26 22.7115 26.9892 21.2501 26.9892C20.0821 26.9892 18.4959 26.9892 16.7488 26.9892C15.0017 26.9892 13.4156 26.9892 12.2476 26.9892C10.7557 26.9892 10.2495 25.9879 10.25 25C10.25 21.9879 13.25 19.9892 16.7488 19.9892C20.2476 19.9892 23.25 22 23.25 25Z"/><path fill="#49225B" d="M28.25 25C29.6969 25 30.25 23.9772 30.25 23C30.25 19.9892 27.2117 18 23.5411 18C22.5254 18 21.3811 18.2853 20.7942 18.6938C20.2072 19.1023 20.2986 19.5536 20.7942 19.7976C23.3267 21.0451 24.258 22.903 24.258 24.016C24.258 24.6503 24.6882 25 25.2424 25H28.25Z"/><path fill="#49225B" d="M19.2502 16.5C19.2502 17.8807 18.1309 19 16.7502 19C15.3695 19 14.2502 17.8807 14.2502 16.5C14.2502 15.1193 15.3695 14 16.7502 14C18.1309 14 19.2502 15.1193 19.2502 16.5Z"/></svg>
\ No newline at end of file
diff --git a/assets/images/avatars/group/default-avatar_12.svg b/assets/images/avatars/group/default-avatar_12.svg
index f917fb136582..c29992aa1793 100644
--- a/assets/images/avatars/group/default-avatar_12.svg
+++ b/assets/images/avatars/group/default-avatar_12.svg
@@ -1,7 +1 @@
-<svg viewBox="0 0 40 40" fill="none" xmlns="http://www.w3.org/2000/svg">
-<rect width="40" height="40" rx="20" fill="#50EEF6"/>
-<path d="M26.2502 14.5C26.2502 15.8807 25.1309 17 23.7502 17C22.3695 17 21.2502 15.8807 21.2502 14.5C21.2502 13.1193 22.3695 12 23.7502 12C25.1309 12 26.2502 13.1193 26.2502 14.5Z" fill="#134038"/>
-<path d="M23.25 25C23.25 26 22.7115 26.9892 21.2501 26.9892C20.0821 26.9892 18.4959 26.9892 16.7488 26.9892C15.0017 26.9892 13.4156 26.9892 12.2476 26.9892C10.7557 26.9892 10.2495 25.9879 10.25 25C10.25 21.9879 13.25 19.9892 16.7488 19.9892C20.2476 19.9892 23.25 22 23.25 25Z" fill="#134038"/>
-<path d="M28.25 25C29.6969 25 30.25 23.9772 30.25 23C30.25 19.9892 27.2117 18 23.5411 18C22.5254 18 21.3811 18.2853 20.7942 18.6938C20.2072 19.1023 20.2986 19.5536 20.7942 19.7976C23.3267 21.0451 24.258 22.903 24.258 24.016C24.258 24.6503 24.6882 25 25.2424 25H28.25Z" fill="#134038"/>
-<path d="M19.2502 16.5C19.2502 17.8807 18.1309 19 16.7502 19C15.3695 19 14.2502 17.8807 14.2502 16.5C14.2502 15.1193 15.3695 14 16.7502 14C18.1309 14 19.2502 15.1193 19.2502 16.5Z" fill="#134038"/>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 40 40"><rect width="40" height="40" fill="#50EEF6" rx="20"/><path fill="#134038" d="M26.2502 14.5C26.2502 15.8807 25.1309 17 23.7502 17C22.3695 17 21.2502 15.8807 21.2502 14.5C21.2502 13.1193 22.3695 12 23.7502 12C25.1309 12 26.2502 13.1193 26.2502 14.5Z"/><path fill="#134038" d="M23.25 25C23.25 26 22.7115 26.9892 21.2501 26.9892C20.0821 26.9892 18.4959 26.9892 16.7488 26.9892C15.0017 26.9892 13.4156 26.9892 12.2476 26.9892C10.7557 26.9892 10.2495 25.9879 10.25 25C10.25 21.9879 13.25 19.9892 16.7488 19.9892C20.2476 19.9892 23.25 22 23.25 25Z"/><path fill="#134038" d="M28.25 25C29.6969 25 30.25 23.9772 30.25 23C30.25 19.9892 27.2117 18 23.5411 18C22.5254 18 21.3811 18.2853 20.7942 18.6938C20.2072 19.1023 20.2986 19.5536 20.7942 19.7976C23.3267 21.0451 24.258 22.903 24.258 24.016C24.258 24.6503 24.6882 25 25.2424 25H28.25Z"/><path fill="#134038" d="M19.2502 16.5C19.2502 17.8807 18.1309 19 16.7502 19C15.3695 19 14.2502 17.8807 14.2502 16.5C14.2502 15.1193 15.3695 14 16.7502 14C18.1309 14 19.2502 15.1193 19.2502 16.5Z"/></svg>
\ No newline at end of file
diff --git a/assets/images/avatars/group/default-avatar_13.svg b/assets/images/avatars/group/default-avatar_13.svg
index 9e59fb9123a5..5f6b69f01fe3 100644
--- a/assets/images/avatars/group/default-avatar_13.svg
+++ b/assets/images/avatars/group/default-avatar_13.svg
@@ -1,7 +1 @@
-<svg viewBox="0 0 40 40" fill="none" xmlns="http://www.w3.org/2000/svg">
-<rect width="40" height="40" rx="20" fill="#003C73"/>
-<path d="M26.2502 14.5C26.2502 15.8807 25.1309 17 23.7502 17C22.3695 17 21.2502 15.8807 21.2502 14.5C21.2502 13.1193 22.3695 12 23.7502 12C25.1309 12 26.2502 13.1193 26.2502 14.5Z" fill="#8DC8FF"/>
-<path d="M23.25 25C23.25 26 22.7115 26.9892 21.2501 26.9892C20.0821 26.9892 18.4959 26.9892 16.7488 26.9892C15.0017 26.9892 13.4156 26.9892 12.2476 26.9892C10.7557 26.9892 10.2495 25.9879 10.25 25C10.25 21.9879 13.25 19.9892 16.7488 19.9892C20.2476 19.9892 23.25 22 23.25 25Z" fill="#8DC8FF"/>
-<path d="M28.25 25C29.6969 25 30.25 23.9772 30.25 23C30.25 19.9892 27.2117 18 23.5411 18C22.5254 18 21.3811 18.2853 20.7942 18.6938C20.2072 19.1023 20.2986 19.5536 20.7942 19.7976C23.3267 21.0451 24.258 22.903 24.258 24.016C24.258 24.6503 24.6882 25 25.2424 25H28.25Z" fill="#8DC8FF"/>
-<path d="M19.2502 16.5C19.2502 17.8807 18.1309 19 16.7502 19C15.3695 19 14.2502 17.8807 14.2502 16.5C14.2502 15.1193 15.3695 14 16.7502 14C18.1309 14 19.2502 15.1193 19.2502 16.5Z" fill="#8DC8FF"/>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 40 40"><rect width="40" height="40" fill="#003C73" rx="20"/><path fill="#8DC8FF" d="M26.2502 14.5C26.2502 15.8807 25.1309 17 23.7502 17C22.3695 17 21.2502 15.8807 21.2502 14.5C21.2502 13.1193 22.3695 12 23.7502 12C25.1309 12 26.2502 13.1193 26.2502 14.5Z"/><path fill="#8DC8FF" d="M23.25 25C23.25 26 22.7115 26.9892 21.2501 26.9892C20.0821 26.9892 18.4959 26.9892 16.7488 26.9892C15.0017 26.9892 13.4156 26.9892 12.2476 26.9892C10.7557 26.9892 10.2495 25.9879 10.25 25C10.25 21.9879 13.25 19.9892 16.7488 19.9892C20.2476 19.9892 23.25 22 23.25 25Z"/><path fill="#8DC8FF" d="M28.25 25C29.6969 25 30.25 23.9772 30.25 23C30.25 19.9892 27.2117 18 23.5411 18C22.5254 18 21.3811 18.2853 20.7942 18.6938C20.2072 19.1023 20.2986 19.5536 20.7942 19.7976C23.3267 21.0451 24.258 22.903 24.258 24.016C24.258 24.6503 24.6882 25 25.2424 25H28.25Z"/><path fill="#8DC8FF" d="M19.2502 16.5C19.2502 17.8807 18.1309 19 16.7502 19C15.3695 19 14.2502 17.8807 14.2502 16.5C14.2502 15.1193 15.3695 14 16.7502 14C18.1309 14 19.2502 15.1193 19.2502 16.5Z"/></svg>
\ No newline at end of file
diff --git a/assets/images/avatars/group/default-avatar_14.svg b/assets/images/avatars/group/default-avatar_14.svg
index ca071e488416..27096ffd77d7 100644
--- a/assets/images/avatars/group/default-avatar_14.svg
+++ b/assets/images/avatars/group/default-avatar_14.svg
@@ -1,7 +1 @@
-<svg viewBox="0 0 40 40" fill="none" xmlns="http://www.w3.org/2000/svg">
-<rect width="40" height="40" rx="20" fill="#085239"/>
-<path d="M26.2502 14.5C26.2502 15.8807 25.1309 17 23.7502 17C22.3695 17 21.2502 15.8807 21.2502 14.5C21.2502 13.1193 22.3695 12 23.7502 12C25.1309 12 26.2502 13.1193 26.2502 14.5Z" fill="#8EECC4"/>
-<path d="M23.25 25C23.25 26 22.7115 26.9892 21.2501 26.9892C20.0821 26.9892 18.4959 26.9892 16.7488 26.9892C15.0017 26.9892 13.4156 26.9892 12.2476 26.9892C10.7557 26.9892 10.2495 25.9879 10.25 25C10.25 21.9879 13.25 19.9892 16.7488 19.9892C20.2476 19.9892 23.25 22 23.25 25Z" fill="#8EECC4"/>
-<path d="M28.25 25C29.6969 25 30.25 23.9772 30.25 23C30.25 19.9892 27.2117 18 23.5411 18C22.5254 18 21.3811 18.2853 20.7942 18.6938C20.2072 19.1023 20.2986 19.5536 20.7942 19.7976C23.3267 21.0451 24.258 22.903 24.258 24.016C24.258 24.6503 24.6882 25 25.2424 25H28.25Z" fill="#8EECC4"/>
-<path d="M19.2502 16.5C19.2502 17.8807 18.1309 19 16.7502 19C15.3695 19 14.2502 17.8807 14.2502 16.5C14.2502 15.1193 15.3695 14 16.7502 14C18.1309 14 19.2502 15.1193 19.2502 16.5Z" fill="#8EECC4"/>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 40 40"><rect width="40" height="40" fill="#085239" rx="20"/><path fill="#8EECC4" d="M26.2502 14.5C26.2502 15.8807 25.1309 17 23.7502 17C22.3695 17 21.2502 15.8807 21.2502 14.5C21.2502 13.1193 22.3695 12 23.7502 12C25.1309 12 26.2502 13.1193 26.2502 14.5Z"/><path fill="#8EECC4" d="M23.25 25C23.25 26 22.7115 26.9892 21.2501 26.9892C20.0821 26.9892 18.4959 26.9892 16.7488 26.9892C15.0017 26.9892 13.4156 26.9892 12.2476 26.9892C10.7557 26.9892 10.2495 25.9879 10.25 25C10.25 21.9879 13.25 19.9892 16.7488 19.9892C20.2476 19.9892 23.25 22 23.25 25Z"/><path fill="#8EECC4" d="M28.25 25C29.6969 25 30.25 23.9772 30.25 23C30.25 19.9892 27.2117 18 23.5411 18C22.5254 18 21.3811 18.2853 20.7942 18.6938C20.2072 19.1023 20.2986 19.5536 20.7942 19.7976C23.3267 21.0451 24.258 22.903 24.258 24.016C24.258 24.6503 24.6882 25 25.2424 25H28.25Z"/><path fill="#8EECC4" d="M19.2502 16.5C19.2502 17.8807 18.1309 19 16.7502 19C15.3695 19 14.2502 17.8807 14.2502 16.5C14.2502 15.1193 15.3695 14 16.7502 14C18.1309 14 19.2502 15.1193 19.2502 16.5Z"/></svg>
\ No newline at end of file
diff --git a/assets/images/avatars/group/default-avatar_15.svg b/assets/images/avatars/group/default-avatar_15.svg
index f227cc0717be..7cae7b1e6562 100644
--- a/assets/images/avatars/group/default-avatar_15.svg
+++ b/assets/images/avatars/group/default-avatar_15.svg
@@ -1,7 +1 @@
-<svg viewBox="0 0 40 40" fill="none" xmlns="http://www.w3.org/2000/svg">
-<rect width="40" height="40" rx="20" fill="#722B03"/>
-<path d="M26.2502 14.5C26.2502 15.8807 25.1309 17 23.7502 17C22.3695 17 21.2502 15.8807 21.2502 14.5C21.2502 13.1193 22.3695 12 23.7502 12C25.1309 12 26.2502 13.1193 26.2502 14.5Z" fill="#FFED8F"/>
-<path d="M23.25 25C23.25 26 22.7115 26.9892 21.2501 26.9892C20.0821 26.9892 18.4959 26.9892 16.7488 26.9892C15.0017 26.9892 13.4156 26.9892 12.2476 26.9892C10.7557 26.9892 10.2495 25.9879 10.25 25C10.25 21.9879 13.25 19.9892 16.7488 19.9892C20.2476 19.9892 23.25 22 23.25 25Z" fill="#FFED8F"/>
-<path d="M28.25 25C29.6969 25 30.25 23.9772 30.25 23C30.25 19.9892 27.2117 18 23.5411 18C22.5254 18 21.3811 18.2853 20.7942 18.6938C20.2072 19.1023 20.2986 19.5536 20.7942 19.7976C23.3267 21.0451 24.258 22.903 24.258 24.016C24.258 24.6503 24.6882 25 25.2424 25H28.25Z" fill="#FFED8F"/>
-<path d="M19.2502 16.5C19.2502 17.8807 18.1309 19 16.7502 19C15.3695 19 14.2502 17.8807 14.2502 16.5C14.2502 15.1193 15.3695 14 16.7502 14C18.1309 14 19.2502 15.1193 19.2502 16.5Z" fill="#FFED8F"/>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 40 40"><rect width="40" height="40" fill="#722B03" rx="20"/><path fill="#FFED8F" d="M26.2502 14.5C26.2502 15.8807 25.1309 17 23.7502 17C22.3695 17 21.2502 15.8807 21.2502 14.5C21.2502 13.1193 22.3695 12 23.7502 12C25.1309 12 26.2502 13.1193 26.2502 14.5Z"/><path fill="#FFED8F" d="M23.25 25C23.25 26 22.7115 26.9892 21.2501 26.9892C20.0821 26.9892 18.4959 26.9892 16.7488 26.9892C15.0017 26.9892 13.4156 26.9892 12.2476 26.9892C10.7557 26.9892 10.2495 25.9879 10.25 25C10.25 21.9879 13.25 19.9892 16.7488 19.9892C20.2476 19.9892 23.25 22 23.25 25Z"/><path fill="#FFED8F" d="M28.25 25C29.6969 25 30.25 23.9772 30.25 23C30.25 19.9892 27.2117 18 23.5411 18C22.5254 18 21.3811 18.2853 20.7942 18.6938C20.2072 19.1023 20.2986 19.5536 20.7942 19.7976C23.3267 21.0451 24.258 22.903 24.258 24.016C24.258 24.6503 24.6882 25 25.2424 25H28.25Z"/><path fill="#FFED8F" d="M19.2502 16.5C19.2502 17.8807 18.1309 19 16.7502 19C15.3695 19 14.2502 17.8807 14.2502 16.5C14.2502 15.1193 15.3695 14 16.7502 14C18.1309 14 19.2502 15.1193 19.2502 16.5Z"/></svg>
\ No newline at end of file
diff --git a/assets/images/avatars/group/default-avatar_16.svg b/assets/images/avatars/group/default-avatar_16.svg
index efbb85f0b13d..1c02725ba669 100644
--- a/assets/images/avatars/group/default-avatar_16.svg
+++ b/assets/images/avatars/group/default-avatar_16.svg
@@ -1,7 +1 @@
-<svg viewBox="0 0 40 40" fill="none" xmlns="http://www.w3.org/2000/svg">
-<rect width="40" height="40" rx="20" fill="#780505"/>
-<path d="M26.2502 14.5C26.2502 15.8807 25.1309 17 23.7502 17C22.3695 17 21.2502 15.8807 21.2502 14.5C21.2502 13.1193 22.3695 12 23.7502 12C25.1309 12 26.2502 13.1193 26.2502 14.5Z" fill="#FFC68C"/>
-<path d="M23.25 25C23.25 26 22.7115 26.9892 21.2501 26.9892C20.0821 26.9892 18.4959 26.9892 16.7488 26.9892C15.0017 26.9892 13.4156 26.9892 12.2476 26.9892C10.7557 26.9892 10.2495 25.9879 10.25 25C10.25 21.9879 13.25 19.9892 16.7488 19.9892C20.2476 19.9892 23.25 22 23.25 25Z" fill="#FFC68C"/>
-<path d="M28.25 25C29.6969 25 30.25 23.9772 30.25 23C30.25 19.9892 27.2117 18 23.5411 18C22.5254 18 21.3811 18.2853 20.7942 18.6938C20.2072 19.1023 20.2986 19.5536 20.7942 19.7976C23.3267 21.0451 24.258 22.903 24.258 24.016C24.258 24.6503 24.6882 25 25.2424 25H28.25Z" fill="#FFC68C"/>
-<path d="M19.2502 16.5C19.2502 17.8807 18.1309 19 16.7502 19C15.3695 19 14.2502 17.8807 14.2502 16.5C14.2502 15.1193 15.3695 14 16.7502 14C18.1309 14 19.2502 15.1193 19.2502 16.5Z" fill="#FFC68C"/>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 40 40"><rect width="40" height="40" fill="#780505" rx="20"/><path fill="#FFC68C" d="M26.2502 14.5C26.2502 15.8807 25.1309 17 23.7502 17C22.3695 17 21.2502 15.8807 21.2502 14.5C21.2502 13.1193 22.3695 12 23.7502 12C25.1309 12 26.2502 13.1193 26.2502 14.5Z"/><path fill="#FFC68C" d="M23.25 25C23.25 26 22.7115 26.9892 21.2501 26.9892C20.0821 26.9892 18.4959 26.9892 16.7488 26.9892C15.0017 26.9892 13.4156 26.9892 12.2476 26.9892C10.7557 26.9892 10.2495 25.9879 10.25 25C10.25 21.9879 13.25 19.9892 16.7488 19.9892C20.2476 19.9892 23.25 22 23.25 25Z"/><path fill="#FFC68C" d="M28.25 25C29.6969 25 30.25 23.9772 30.25 23C30.25 19.9892 27.2117 18 23.5411 18C22.5254 18 21.3811 18.2853 20.7942 18.6938C20.2072 19.1023 20.2986 19.5536 20.7942 19.7976C23.3267 21.0451 24.258 22.903 24.258 24.016C24.258 24.6503 24.6882 25 25.2424 25H28.25Z"/><path fill="#FFC68C" d="M19.2502 16.5C19.2502 17.8807 18.1309 19 16.7502 19C15.3695 19 14.2502 17.8807 14.2502 16.5C14.2502 15.1193 15.3695 14 16.7502 14C18.1309 14 19.2502 15.1193 19.2502 16.5Z"/></svg>
\ No newline at end of file
diff --git a/assets/images/avatars/group/default-avatar_17.svg b/assets/images/avatars/group/default-avatar_17.svg
index 25c015c595ca..58a5014fae68 100644
--- a/assets/images/avatars/group/default-avatar_17.svg
+++ b/assets/images/avatars/group/default-avatar_17.svg
@@ -1,7 +1 @@
-<svg viewBox="0 0 40 40" fill="none" xmlns="http://www.w3.org/2000/svg">
-<rect width="40" height="40" rx="20" fill="#712A76"/>
-<path d="M26.2502 14.5C26.2502 15.8807 25.1309 17 23.7502 17C22.3695 17 21.2502 15.8807 21.2502 14.5C21.2502 13.1193 22.3695 12 23.7502 12C25.1309 12 26.2502 13.1193 26.2502 14.5Z" fill="#FBCCFF"/>
-<path d="M23.25 25C23.25 26 22.7115 26.9892 21.2501 26.9892C20.0821 26.9892 18.4959 26.9892 16.7488 26.9892C15.0017 26.9892 13.4156 26.9892 12.2476 26.9892C10.7557 26.9892 10.2495 25.9879 10.25 25C10.25 21.9879 13.25 19.9892 16.7488 19.9892C20.2476 19.9892 23.25 22 23.25 25Z" fill="#FBCCFF"/>
-<path d="M28.25 25C29.6969 25 30.25 23.9772 30.25 23C30.25 19.9892 27.2117 18 23.5411 18C22.5254 18 21.3811 18.2853 20.7942 18.6938C20.2072 19.1023 20.2986 19.5536 20.7942 19.7976C23.3267 21.0451 24.258 22.903 24.258 24.016C24.258 24.6503 24.6882 25 25.2424 25H28.25Z" fill="#FBCCFF"/>
-<path d="M19.2502 16.5C19.2502 17.8807 18.1309 19 16.7502 19C15.3695 19 14.2502 17.8807 14.2502 16.5C14.2502 15.1193 15.3695 14 16.7502 14C18.1309 14 19.2502 15.1193 19.2502 16.5Z" fill="#FBCCFF"/>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 40 40"><rect width="40" height="40" fill="#712A76" rx="20"/><path fill="#FBCCFF" d="M26.2502 14.5C26.2502 15.8807 25.1309 17 23.7502 17C22.3695 17 21.2502 15.8807 21.2502 14.5C21.2502 13.1193 22.3695 12 23.7502 12C25.1309 12 26.2502 13.1193 26.2502 14.5Z"/><path fill="#FBCCFF" d="M23.25 25C23.25 26 22.7115 26.9892 21.2501 26.9892C20.0821 26.9892 18.4959 26.9892 16.7488 26.9892C15.0017 26.9892 13.4156 26.9892 12.2476 26.9892C10.7557 26.9892 10.2495 25.9879 10.25 25C10.25 21.9879 13.25 19.9892 16.7488 19.9892C20.2476 19.9892 23.25 22 23.25 25Z"/><path fill="#FBCCFF" d="M28.25 25C29.6969 25 30.25 23.9772 30.25 23C30.25 19.9892 27.2117 18 23.5411 18C22.5254 18 21.3811 18.2853 20.7942 18.6938C20.2072 19.1023 20.2986 19.5536 20.7942 19.7976C23.3267 21.0451 24.258 22.903 24.258 24.016C24.258 24.6503 24.6882 25 25.2424 25H28.25Z"/><path fill="#FBCCFF" d="M19.2502 16.5C19.2502 17.8807 18.1309 19 16.7502 19C15.3695 19 14.2502 17.8807 14.2502 16.5C14.2502 15.1193 15.3695 14 16.7502 14C18.1309 14 19.2502 15.1193 19.2502 16.5Z"/></svg>
\ No newline at end of file
diff --git a/assets/images/avatars/group/default-avatar_18.svg b/assets/images/avatars/group/default-avatar_18.svg
index a58ee6e66eff..43eeffb3db8d 100644
--- a/assets/images/avatars/group/default-avatar_18.svg
+++ b/assets/images/avatars/group/default-avatar_18.svg
@@ -1,7 +1 @@
-<svg viewBox="0 0 40 40" fill="none" xmlns="http://www.w3.org/2000/svg">
-<rect width="40" height="40" rx="20" fill="#28736D"/>
-<path d="M26.2502 14.5C26.2502 15.8807 25.1309 17 23.7502 17C22.3695 17 21.2502 15.8807 21.2502 14.5C21.2502 13.1193 22.3695 12 23.7502 12C25.1309 12 26.2502 13.1193 26.2502 14.5Z" fill="#CCF6FF"/>
-<path d="M23.25 25C23.25 26 22.7115 26.9892 21.2501 26.9892C20.0821 26.9892 18.4959 26.9892 16.7488 26.9892C15.0017 26.9892 13.4156 26.9892 12.2476 26.9892C10.7557 26.9892 10.2495 25.9879 10.25 25C10.25 21.9879 13.25 19.9892 16.7488 19.9892C20.2476 19.9892 23.25 22 23.25 25Z" fill="#CCF6FF"/>
-<path d="M28.25 25C29.6969 25 30.25 23.9772 30.25 23C30.25 19.9892 27.2117 18 23.5411 18C22.5254 18 21.3811 18.2853 20.7942 18.6938C20.2072 19.1023 20.2986 19.5536 20.7942 19.7976C23.3267 21.0451 24.258 22.903 24.258 24.016C24.258 24.6503 24.6882 25 25.2424 25H28.25Z" fill="#CCF6FF"/>
-<path d="M19.2502 16.5C19.2502 17.8807 18.1309 19 16.7502 19C15.3695 19 14.2502 17.8807 14.2502 16.5C14.2502 15.1193 15.3695 14 16.7502 14C18.1309 14 19.2502 15.1193 19.2502 16.5Z" fill="#CCF6FF"/>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 40 40"><rect width="40" height="40" fill="#28736D" rx="20"/><path fill="#CCF6FF" d="M26.2502 14.5C26.2502 15.8807 25.1309 17 23.7502 17C22.3695 17 21.2502 15.8807 21.2502 14.5C21.2502 13.1193 22.3695 12 23.7502 12C25.1309 12 26.2502 13.1193 26.2502 14.5Z"/><path fill="#CCF6FF" d="M23.25 25C23.25 26 22.7115 26.9892 21.2501 26.9892C20.0821 26.9892 18.4959 26.9892 16.7488 26.9892C15.0017 26.9892 13.4156 26.9892 12.2476 26.9892C10.7557 26.9892 10.2495 25.9879 10.25 25C10.25 21.9879 13.25 19.9892 16.7488 19.9892C20.2476 19.9892 23.25 22 23.25 25Z"/><path fill="#CCF6FF" d="M28.25 25C29.6969 25 30.25 23.9772 30.25 23C30.25 19.9892 27.2117 18 23.5411 18C22.5254 18 21.3811 18.2853 20.7942 18.6938C20.2072 19.1023 20.2986 19.5536 20.7942 19.7976C23.3267 21.0451 24.258 22.903 24.258 24.016C24.258 24.6503 24.6882 25 25.2424 25H28.25Z"/><path fill="#CCF6FF" d="M19.2502 16.5C19.2502 17.8807 18.1309 19 16.7502 19C15.3695 19 14.2502 17.8807 14.2502 16.5C14.2502 15.1193 15.3695 14 16.7502 14C18.1309 14 19.2502 15.1193 19.2502 16.5Z"/></svg>
\ No newline at end of file
diff --git a/assets/images/avatars/group/default-avatar_2.svg b/assets/images/avatars/group/default-avatar_2.svg
index ff1cc3e6dd2d..f67a49d28cd2 100644
--- a/assets/images/avatars/group/default-avatar_2.svg
+++ b/assets/images/avatars/group/default-avatar_2.svg
@@ -1,7 +1 @@
-<svg viewBox="0 0 40 40" fill="none" xmlns="http://www.w3.org/2000/svg">
-<rect width="40" height="40" rx="20" fill="#8EECC4"/>
-<path d="M26.2502 14.5C26.2502 15.8807 25.1309 17 23.7502 17C22.3695 17 21.2502 15.8807 21.2502 14.5C21.2502 13.1193 22.3695 12 23.7502 12C25.1309 12 26.2502 13.1193 26.2502 14.5Z" fill="#085239"/>
-<path d="M23.25 25C23.25 26 22.7115 26.9892 21.2501 26.9892C20.0821 26.9892 18.4959 26.9892 16.7488 26.9892C15.0017 26.9892 13.4156 26.9892 12.2476 26.9892C10.7557 26.9892 10.2495 25.9879 10.25 25C10.25 21.9879 13.25 19.9892 16.7488 19.9892C20.2476 19.9892 23.25 22 23.25 25Z" fill="#085239"/>
-<path d="M28.25 25C29.6969 25 30.25 23.9772 30.25 23C30.25 19.9892 27.2117 18 23.5411 18C22.5254 18 21.3811 18.2853 20.7942 18.6938C20.2072 19.1023 20.2986 19.5536 20.7942 19.7976C23.3267 21.0451 24.258 22.903 24.258 24.016C24.258 24.6503 24.6882 25 25.2424 25H28.25Z" fill="#085239"/>
-<path d="M19.2502 16.5C19.2502 17.8807 18.1309 19 16.7502 19C15.3695 19 14.2502 17.8807 14.2502 16.5C14.2502 15.1193 15.3695 14 16.7502 14C18.1309 14 19.2502 15.1193 19.2502 16.5Z" fill="#085239"/>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 40 40"><rect width="40" height="40" fill="#8EECC4" rx="20"/><path fill="#085239" d="M26.2502 14.5C26.2502 15.8807 25.1309 17 23.7502 17C22.3695 17 21.2502 15.8807 21.2502 14.5C21.2502 13.1193 22.3695 12 23.7502 12C25.1309 12 26.2502 13.1193 26.2502 14.5Z"/><path fill="#085239" d="M23.25 25C23.25 26 22.7115 26.9892 21.2501 26.9892C20.0821 26.9892 18.4959 26.9892 16.7488 26.9892C15.0017 26.9892 13.4156 26.9892 12.2476 26.9892C10.7557 26.9892 10.2495 25.9879 10.25 25C10.25 21.9879 13.25 19.9892 16.7488 19.9892C20.2476 19.9892 23.25 22 23.25 25Z"/><path fill="#085239" d="M28.25 25C29.6969 25 30.25 23.9772 30.25 23C30.25 19.9892 27.2117 18 23.5411 18C22.5254 18 21.3811 18.2853 20.7942 18.6938C20.2072 19.1023 20.2986 19.5536 20.7942 19.7976C23.3267 21.0451 24.258 22.903 24.258 24.016C24.258 24.6503 24.6882 25 25.2424 25H28.25Z"/><path fill="#085239" d="M19.2502 16.5C19.2502 17.8807 18.1309 19 16.7502 19C15.3695 19 14.2502 17.8807 14.2502 16.5C14.2502 15.1193 15.3695 14 16.7502 14C18.1309 14 19.2502 15.1193 19.2502 16.5Z"/></svg>
\ No newline at end of file
diff --git a/assets/images/avatars/group/default-avatar_3.svg b/assets/images/avatars/group/default-avatar_3.svg
index dde31b5d02a0..471d3a348b4a 100644
--- a/assets/images/avatars/group/default-avatar_3.svg
+++ b/assets/images/avatars/group/default-avatar_3.svg
@@ -1,7 +1 @@
-<svg viewBox="0 0 40 40" fill="none" xmlns="http://www.w3.org/2000/svg">
-<rect width="40" height="40" rx="20" fill="#FFED8F"/>
-<path d="M26.2502 14.5C26.2502 15.8807 25.1309 17 23.7502 17C22.3695 17 21.2502 15.8807 21.2502 14.5C21.2502 13.1193 22.3695 12 23.7502 12C25.1309 12 26.2502 13.1193 26.2502 14.5Z" fill="#722B03"/>
-<path d="M23.25 25C23.25 26 22.7115 26.9892 21.2501 26.9892C20.0821 26.9892 18.4959 26.9892 16.7488 26.9892C15.0017 26.9892 13.4156 26.9892 12.2476 26.9892C10.7557 26.9892 10.2495 25.9879 10.25 25C10.25 21.9879 13.25 19.9892 16.7488 19.9892C20.2476 19.9892 23.25 22 23.25 25Z" fill="#722B03"/>
-<path d="M28.25 25C29.6969 25 30.25 23.9772 30.25 23C30.25 19.9892 27.2117 18 23.5411 18C22.5254 18 21.3811 18.2853 20.7942 18.6938C20.2072 19.1023 20.2986 19.5536 20.7942 19.7976C23.3267 21.0451 24.258 22.903 24.258 24.016C24.258 24.6503 24.6882 25 25.2424 25H28.25Z" fill="#722B03"/>
-<path d="M19.2502 16.5C19.2502 17.8807 18.1309 19 16.7502 19C15.3695 19 14.2502 17.8807 14.2502 16.5C14.2502 15.1193 15.3695 14 16.7502 14C18.1309 14 19.2502 15.1193 19.2502 16.5Z" fill="#722B03"/>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 40 40"><rect width="40" height="40" fill="#FFED8F" rx="20"/><path fill="#722B03" d="M26.2502 14.5C26.2502 15.8807 25.1309 17 23.7502 17C22.3695 17 21.2502 15.8807 21.2502 14.5C21.2502 13.1193 22.3695 12 23.7502 12C25.1309 12 26.2502 13.1193 26.2502 14.5Z"/><path fill="#722B03" d="M23.25 25C23.25 26 22.7115 26.9892 21.2501 26.9892C20.0821 26.9892 18.4959 26.9892 16.7488 26.9892C15.0017 26.9892 13.4156 26.9892 12.2476 26.9892C10.7557 26.9892 10.2495 25.9879 10.25 25C10.25 21.9879 13.25 19.9892 16.7488 19.9892C20.2476 19.9892 23.25 22 23.25 25Z"/><path fill="#722B03" d="M28.25 25C29.6969 25 30.25 23.9772 30.25 23C30.25 19.9892 27.2117 18 23.5411 18C22.5254 18 21.3811 18.2853 20.7942 18.6938C20.2072 19.1023 20.2986 19.5536 20.7942 19.7976C23.3267 21.0451 24.258 22.903 24.258 24.016C24.258 24.6503 24.6882 25 25.2424 25H28.25Z"/><path fill="#722B03" d="M19.2502 16.5C19.2502 17.8807 18.1309 19 16.7502 19C15.3695 19 14.2502 17.8807 14.2502 16.5C14.2502 15.1193 15.3695 14 16.7502 14C18.1309 14 19.2502 15.1193 19.2502 16.5Z"/></svg>
\ No newline at end of file
diff --git a/assets/images/avatars/group/default-avatar_4.svg b/assets/images/avatars/group/default-avatar_4.svg
index f6d02801bc6b..46e22d28b6df 100644
--- a/assets/images/avatars/group/default-avatar_4.svg
+++ b/assets/images/avatars/group/default-avatar_4.svg
@@ -1,7 +1 @@
-<svg viewBox="0 0 40 40" fill="none" xmlns="http://www.w3.org/2000/svg">
-<rect width="40" height="40" rx="20" fill="#FFC68C"/>
-<path d="M26.2502 14.5C26.2502 15.8807 25.1309 17 23.7502 17C22.3695 17 21.2502 15.8807 21.2502 14.5C21.2502 13.1193 22.3695 12 23.7502 12C25.1309 12 26.2502 13.1193 26.2502 14.5Z" fill="#780505"/>
-<path d="M23.25 25C23.25 26 22.7115 26.9892 21.2501 26.9892C20.0821 26.9892 18.4959 26.9892 16.7488 26.9892C15.0017 26.9892 13.4156 26.9892 12.2476 26.9892C10.7557 26.9892 10.2495 25.9879 10.25 25C10.25 21.9879 13.25 19.9892 16.7488 19.9892C20.2476 19.9892 23.25 22 23.25 25Z" fill="#780505"/>
-<path d="M28.25 25C29.6969 25 30.25 23.9772 30.25 23C30.25 19.9892 27.2117 18 23.5411 18C22.5254 18 21.3811 18.2853 20.7942 18.6938C20.2072 19.1023 20.2986 19.5536 20.7942 19.7976C23.3267 21.0451 24.258 22.903 24.258 24.016C24.258 24.6503 24.6882 25 25.2424 25H28.25Z" fill="#780505"/>
-<path d="M19.2502 16.5C19.2502 17.8807 18.1309 19 16.7502 19C15.3695 19 14.2502 17.8807 14.2502 16.5C14.2502 15.1193 15.3695 14 16.7502 14C18.1309 14 19.2502 15.1193 19.2502 16.5Z" fill="#780505"/>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 40 40"><rect width="40" height="40" fill="#FFC68C" rx="20"/><path fill="#780505" d="M26.2502 14.5C26.2502 15.8807 25.1309 17 23.7502 17C22.3695 17 21.2502 15.8807 21.2502 14.5C21.2502 13.1193 22.3695 12 23.7502 12C25.1309 12 26.2502 13.1193 26.2502 14.5Z"/><path fill="#780505" d="M23.25 25C23.25 26 22.7115 26.9892 21.2501 26.9892C20.0821 26.9892 18.4959 26.9892 16.7488 26.9892C15.0017 26.9892 13.4156 26.9892 12.2476 26.9892C10.7557 26.9892 10.2495 25.9879 10.25 25C10.25 21.9879 13.25 19.9892 16.7488 19.9892C20.2476 19.9892 23.25 22 23.25 25Z"/><path fill="#780505" d="M28.25 25C29.6969 25 30.25 23.9772 30.25 23C30.25 19.9892 27.2117 18 23.5411 18C22.5254 18 21.3811 18.2853 20.7942 18.6938C20.2072 19.1023 20.2986 19.5536 20.7942 19.7976C23.3267 21.0451 24.258 22.903 24.258 24.016C24.258 24.6503 24.6882 25 25.2424 25H28.25Z"/><path fill="#780505" d="M19.2502 16.5C19.2502 17.8807 18.1309 19 16.7502 19C15.3695 19 14.2502 17.8807 14.2502 16.5C14.2502 15.1193 15.3695 14 16.7502 14C18.1309 14 19.2502 15.1193 19.2502 16.5Z"/></svg>
\ No newline at end of file
diff --git a/assets/images/avatars/group/default-avatar_5.svg b/assets/images/avatars/group/default-avatar_5.svg
index fdabd36e2058..a81471170e23 100644
--- a/assets/images/avatars/group/default-avatar_5.svg
+++ b/assets/images/avatars/group/default-avatar_5.svg
@@ -1,7 +1 @@
-<svg  viewBox="0 0 40 40" fill="none" xmlns="http://www.w3.org/2000/svg">
-<rect width="40" height="40" rx="20" fill="#FBCCFF"/>
-<path d="M26.2502 14.5C26.2502 15.8807 25.1309 17 23.7502 17C22.3695 17 21.2502 15.8807 21.2502 14.5C21.2502 13.1193 22.3695 12 23.7502 12C25.1309 12 26.2502 13.1193 26.2502 14.5Z" fill="#712A76"/>
-<path d="M23.25 25C23.25 26 22.7115 26.9892 21.2501 26.9892C20.0821 26.9892 18.4959 26.9892 16.7488 26.9892C15.0017 26.9892 13.4156 26.9892 12.2476 26.9892C10.7557 26.9892 10.2495 25.9879 10.25 25C10.25 21.9879 13.25 19.9892 16.7488 19.9892C20.2476 19.9892 23.25 22 23.25 25Z" fill="#712A76"/>
-<path d="M28.25 25C29.6969 25 30.25 23.9772 30.25 23C30.25 19.9892 27.2117 18 23.5411 18C22.5254 18 21.3811 18.2853 20.7942 18.6938C20.2072 19.1023 20.2986 19.5536 20.7942 19.7976C23.3267 21.0451 24.258 22.903 24.258 24.016C24.258 24.6503 24.6882 25 25.2424 25H28.25Z" fill="#712A76"/>
-<path d="M19.2502 16.5C19.2502 17.8807 18.1309 19 16.7502 19C15.3695 19 14.2502 17.8807 14.2502 16.5C14.2502 15.1193 15.3695 14 16.7502 14C18.1309 14 19.2502 15.1193 19.2502 16.5Z" fill="#712A76"/>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 40 40"><rect width="40" height="40" fill="#FBCCFF" rx="20"/><path fill="#712A76" d="M26.2502 14.5C26.2502 15.8807 25.1309 17 23.7502 17C22.3695 17 21.2502 15.8807 21.2502 14.5C21.2502 13.1193 22.3695 12 23.7502 12C25.1309 12 26.2502 13.1193 26.2502 14.5Z"/><path fill="#712A76" d="M23.25 25C23.25 26 22.7115 26.9892 21.2501 26.9892C20.0821 26.9892 18.4959 26.9892 16.7488 26.9892C15.0017 26.9892 13.4156 26.9892 12.2476 26.9892C10.7557 26.9892 10.2495 25.9879 10.25 25C10.25 21.9879 13.25 19.9892 16.7488 19.9892C20.2476 19.9892 23.25 22 23.25 25Z"/><path fill="#712A76" d="M28.25 25C29.6969 25 30.25 23.9772 30.25 23C30.25 19.9892 27.2117 18 23.5411 18C22.5254 18 21.3811 18.2853 20.7942 18.6938C20.2072 19.1023 20.2986 19.5536 20.7942 19.7976C23.3267 21.0451 24.258 22.903 24.258 24.016C24.258 24.6503 24.6882 25 25.2424 25H28.25Z"/><path fill="#712A76" d="M19.2502 16.5C19.2502 17.8807 18.1309 19 16.7502 19C15.3695 19 14.2502 17.8807 14.2502 16.5C14.2502 15.1193 15.3695 14 16.7502 14C18.1309 14 19.2502 15.1193 19.2502 16.5Z"/></svg>
\ No newline at end of file
diff --git a/assets/images/avatars/group/default-avatar_6.svg b/assets/images/avatars/group/default-avatar_6.svg
index 6f1c6b80eda6..71da5e5631f3 100644
--- a/assets/images/avatars/group/default-avatar_6.svg
+++ b/assets/images/avatars/group/default-avatar_6.svg
@@ -1,7 +1 @@
-<svg  viewBox="0 0 40 40" fill="none" xmlns="http://www.w3.org/2000/svg">
-<rect width="40" height="40" rx="20" fill="#CCF6FF"/>
-<path d="M26.2502 14.5C26.2502 15.8807 25.1309 17 23.7502 17C22.3695 17 21.2502 15.8807 21.2502 14.5C21.2502 13.1193 22.3695 12 23.7502 12C25.1309 12 26.2502 13.1193 26.2502 14.5Z" fill="#28736D"/>
-<path d="M23.25 25C23.25 26 22.7115 26.9892 21.2501 26.9892C20.0821 26.9892 18.4959 26.9892 16.7488 26.9892C15.0017 26.9892 13.4156 26.9892 12.2476 26.9892C10.7557 26.9892 10.2495 25.9879 10.25 25C10.25 21.9879 13.25 19.9892 16.7488 19.9892C20.2476 19.9892 23.25 22 23.25 25Z" fill="#28736D"/>
-<path d="M28.25 25C29.6969 25 30.25 23.9772 30.25 23C30.25 19.9892 27.2117 18 23.5411 18C22.5254 18 21.3811 18.2853 20.7942 18.6938C20.2072 19.1023 20.2986 19.5536 20.7942 19.7976C23.3267 21.0451 24.258 22.903 24.258 24.016C24.258 24.6503 24.6882 25 25.2424 25H28.25Z" fill="#28736D"/>
-<path d="M19.2502 16.5C19.2502 17.8807 18.1309 19 16.7502 19C15.3695 19 14.2502 17.8807 14.2502 16.5C14.2502 15.1193 15.3695 14 16.7502 14C18.1309 14 19.2502 15.1193 19.2502 16.5Z" fill="#28736D"/>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 40 40"><rect width="40" height="40" fill="#CCF6FF" rx="20"/><path fill="#28736D" d="M26.2502 14.5C26.2502 15.8807 25.1309 17 23.7502 17C22.3695 17 21.2502 15.8807 21.2502 14.5C21.2502 13.1193 22.3695 12 23.7502 12C25.1309 12 26.2502 13.1193 26.2502 14.5Z"/><path fill="#28736D" d="M23.25 25C23.25 26 22.7115 26.9892 21.2501 26.9892C20.0821 26.9892 18.4959 26.9892 16.7488 26.9892C15.0017 26.9892 13.4156 26.9892 12.2476 26.9892C10.7557 26.9892 10.2495 25.9879 10.25 25C10.25 21.9879 13.25 19.9892 16.7488 19.9892C20.2476 19.9892 23.25 22 23.25 25Z"/><path fill="#28736D" d="M28.25 25C29.6969 25 30.25 23.9772 30.25 23C30.25 19.9892 27.2117 18 23.5411 18C22.5254 18 21.3811 18.2853 20.7942 18.6938C20.2072 19.1023 20.2986 19.5536 20.7942 19.7976C23.3267 21.0451 24.258 22.903 24.258 24.016C24.258 24.6503 24.6882 25 25.2424 25H28.25Z"/><path fill="#28736D" d="M19.2502 16.5C19.2502 17.8807 18.1309 19 16.7502 19C15.3695 19 14.2502 17.8807 14.2502 16.5C14.2502 15.1193 15.3695 14 16.7502 14C18.1309 14 19.2502 15.1193 19.2502 16.5Z"/></svg>
\ No newline at end of file
diff --git a/assets/images/avatars/group/default-avatar_7.svg b/assets/images/avatars/group/default-avatar_7.svg
index 62d9a8b76bb8..080426ca0454 100644
--- a/assets/images/avatars/group/default-avatar_7.svg
+++ b/assets/images/avatars/group/default-avatar_7.svg
@@ -1,7 +1 @@
-<svg viewBox="0 0 40 40" fill="none" xmlns="http://www.w3.org/2000/svg">
-<rect width="40" height="40" rx="20" fill="#0185FF"/>
-<path d="M26.2502 14.5C26.2502 15.8807 25.1309 17 23.7502 17C22.3695 17 21.2502 15.8807 21.2502 14.5C21.2502 13.1193 22.3695 12 23.7502 12C25.1309 12 26.2502 13.1193 26.2502 14.5Z" fill="#002140"/>
-<path d="M23.25 25C23.25 26 22.7115 26.9892 21.2501 26.9892C20.0821 26.9892 18.4959 26.9892 16.7488 26.9892C15.0017 26.9892 13.4156 26.9892 12.2476 26.9892C10.7557 26.9892 10.2495 25.9879 10.25 25C10.25 21.9879 13.25 19.9892 16.7488 19.9892C20.2476 19.9892 23.25 22 23.25 25Z" fill="#002140"/>
-<path d="M28.25 25C29.6969 25 30.25 23.9772 30.25 23C30.25 19.9892 27.2117 18 23.5411 18C22.5254 18 21.3811 18.2853 20.7942 18.6938C20.2072 19.1023 20.2986 19.5536 20.7942 19.7976C23.3267 21.0451 24.258 22.903 24.258 24.016C24.258 24.6503 24.6882 25 25.2424 25H28.25Z" fill="#002140"/>
-<path d="M19.2502 16.5C19.2502 17.8807 18.1309 19 16.7502 19C15.3695 19 14.2502 17.8807 14.2502 16.5C14.2502 15.1193 15.3695 14 16.7502 14C18.1309 14 19.2502 15.1193 19.2502 16.5Z" fill="#002140"/>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 40 40"><rect width="40" height="40" fill="#0185FF" rx="20"/><path fill="#002140" d="M26.2502 14.5C26.2502 15.8807 25.1309 17 23.7502 17C22.3695 17 21.2502 15.8807 21.2502 14.5C21.2502 13.1193 22.3695 12 23.7502 12C25.1309 12 26.2502 13.1193 26.2502 14.5Z"/><path fill="#002140" d="M23.25 25C23.25 26 22.7115 26.9892 21.2501 26.9892C20.0821 26.9892 18.4959 26.9892 16.7488 26.9892C15.0017 26.9892 13.4156 26.9892 12.2476 26.9892C10.7557 26.9892 10.2495 25.9879 10.25 25C10.25 21.9879 13.25 19.9892 16.7488 19.9892C20.2476 19.9892 23.25 22 23.25 25Z"/><path fill="#002140" d="M28.25 25C29.6969 25 30.25 23.9772 30.25 23C30.25 19.9892 27.2117 18 23.5411 18C22.5254 18 21.3811 18.2853 20.7942 18.6938C20.2072 19.1023 20.2986 19.5536 20.7942 19.7976C23.3267 21.0451 24.258 22.903 24.258 24.016C24.258 24.6503 24.6882 25 25.2424 25H28.25Z"/><path fill="#002140" d="M19.2502 16.5C19.2502 17.8807 18.1309 19 16.7502 19C15.3695 19 14.2502 17.8807 14.2502 16.5C14.2502 15.1193 15.3695 14 16.7502 14C18.1309 14 19.2502 15.1193 19.2502 16.5Z"/></svg>
\ No newline at end of file
diff --git a/assets/images/avatars/group/default-avatar_8.svg b/assets/images/avatars/group/default-avatar_8.svg
index 206b10c2322b..b6b2d98579eb 100644
--- a/assets/images/avatars/group/default-avatar_8.svg
+++ b/assets/images/avatars/group/default-avatar_8.svg
@@ -1,7 +1 @@
-<svg  viewBox="0 0 40 40" fill="none" xmlns="http://www.w3.org/2000/svg">
-<rect width="40" height="40" rx="20" fill="#03D47C"/>
-<path d="M26.2502 14.5C26.2502 15.8807 25.1309 17 23.7502 17C22.3695 17 21.2502 15.8807 21.2502 14.5C21.2502 13.1193 22.3695 12 23.7502 12C25.1309 12 26.2502 13.1193 26.2502 14.5Z" fill="#002E22"/>
-<path d="M23.25 25C23.25 26 22.7115 26.9892 21.2501 26.9892C20.0821 26.9892 18.4959 26.9892 16.7488 26.9892C15.0017 26.9892 13.4156 26.9892 12.2476 26.9892C10.7557 26.9892 10.2495 25.9879 10.25 25C10.25 21.9879 13.25 19.9892 16.7488 19.9892C20.2476 19.9892 23.25 22 23.25 25Z" fill="#002E22"/>
-<path d="M28.25 25C29.6969 25 30.25 23.9772 30.25 23C30.25 19.9892 27.2117 18 23.5411 18C22.5254 18 21.3811 18.2853 20.7942 18.6938C20.2072 19.1023 20.2986 19.5536 20.7942 19.7976C23.3267 21.0451 24.258 22.903 24.258 24.016C24.258 24.6503 24.6882 25 25.2424 25H28.25Z" fill="#002E22"/>
-<path d="M19.2502 16.5C19.2502 17.8807 18.1309 19 16.7502 19C15.3695 19 14.2502 17.8807 14.2502 16.5C14.2502 15.1193 15.3695 14 16.7502 14C18.1309 14 19.2502 15.1193 19.2502 16.5Z" fill="#002E22"/>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 40 40"><rect width="40" height="40" fill="#03D47C" rx="20"/><path fill="#002E22" d="M26.2502 14.5C26.2502 15.8807 25.1309 17 23.7502 17C22.3695 17 21.2502 15.8807 21.2502 14.5C21.2502 13.1193 22.3695 12 23.7502 12C25.1309 12 26.2502 13.1193 26.2502 14.5Z"/><path fill="#002E22" d="M23.25 25C23.25 26 22.7115 26.9892 21.2501 26.9892C20.0821 26.9892 18.4959 26.9892 16.7488 26.9892C15.0017 26.9892 13.4156 26.9892 12.2476 26.9892C10.7557 26.9892 10.2495 25.9879 10.25 25C10.25 21.9879 13.25 19.9892 16.7488 19.9892C20.2476 19.9892 23.25 22 23.25 25Z"/><path fill="#002E22" d="M28.25 25C29.6969 25 30.25 23.9772 30.25 23C30.25 19.9892 27.2117 18 23.5411 18C22.5254 18 21.3811 18.2853 20.7942 18.6938C20.2072 19.1023 20.2986 19.5536 20.7942 19.7976C23.3267 21.0451 24.258 22.903 24.258 24.016C24.258 24.6503 24.6882 25 25.2424 25H28.25Z"/><path fill="#002E22" d="M19.2502 16.5C19.2502 17.8807 18.1309 19 16.7502 19C15.3695 19 14.2502 17.8807 14.2502 16.5C14.2502 15.1193 15.3695 14 16.7502 14C18.1309 14 19.2502 15.1193 19.2502 16.5Z"/></svg>
\ No newline at end of file
diff --git a/assets/images/avatars/group/default-avatar_9.svg b/assets/images/avatars/group/default-avatar_9.svg
index ffbe02ce57e8..14885d4c401c 100644
--- a/assets/images/avatars/group/default-avatar_9.svg
+++ b/assets/images/avatars/group/default-avatar_9.svg
@@ -1,7 +1 @@
-<svg viewBox="0 0 40 40" fill="none" xmlns="http://www.w3.org/2000/svg">
-<rect width="40" height="40" rx="20" fill="#FED607"/>
-<path d="M26.2502 14.5C26.2502 15.8807 25.1309 17 23.7502 17C22.3695 17 21.2502 15.8807 21.2502 14.5C21.2502 13.1193 22.3695 12 23.7502 12C25.1309 12 26.2502 13.1193 26.2502 14.5Z" fill="#401102"/>
-<path d="M23.25 25C23.25 26 22.7115 26.9892 21.2501 26.9892C20.0821 26.9892 18.4959 26.9892 16.7488 26.9892C15.0017 26.9892 13.4156 26.9892 12.2476 26.9892C10.7557 26.9892 10.2495 25.9879 10.25 25C10.25 21.9879 13.25 19.9892 16.7488 19.9892C20.2476 19.9892 23.25 22 23.25 25Z" fill="#401102"/>
-<path d="M28.25 25C29.6969 25 30.25 23.9772 30.25 23C30.25 19.9892 27.2117 18 23.5411 18C22.5254 18 21.3811 18.2853 20.7942 18.6938C20.2072 19.1023 20.2986 19.5536 20.7942 19.7976C23.3267 21.0451 24.258 22.903 24.258 24.016C24.258 24.6503 24.6882 25 25.2424 25H28.25Z" fill="#401102"/>
-<path d="M19.2502 16.5C19.2502 17.8807 18.1309 19 16.7502 19C15.3695 19 14.2502 17.8807 14.2502 16.5C14.2502 15.1193 15.3695 14 16.7502 14C18.1309 14 19.2502 15.1193 19.2502 16.5Z" fill="#401102"/>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 40 40"><rect width="40" height="40" fill="#FED607" rx="20"/><path fill="#401102" d="M26.2502 14.5C26.2502 15.8807 25.1309 17 23.7502 17C22.3695 17 21.2502 15.8807 21.2502 14.5C21.2502 13.1193 22.3695 12 23.7502 12C25.1309 12 26.2502 13.1193 26.2502 14.5Z"/><path fill="#401102" d="M23.25 25C23.25 26 22.7115 26.9892 21.2501 26.9892C20.0821 26.9892 18.4959 26.9892 16.7488 26.9892C15.0017 26.9892 13.4156 26.9892 12.2476 26.9892C10.7557 26.9892 10.2495 25.9879 10.25 25C10.25 21.9879 13.25 19.9892 16.7488 19.9892C20.2476 19.9892 23.25 22 23.25 25Z"/><path fill="#401102" d="M28.25 25C29.6969 25 30.25 23.9772 30.25 23C30.25 19.9892 27.2117 18 23.5411 18C22.5254 18 21.3811 18.2853 20.7942 18.6938C20.2072 19.1023 20.2986 19.5536 20.7942 19.7976C23.3267 21.0451 24.258 22.903 24.258 24.016C24.258 24.6503 24.6882 25 25.2424 25H28.25Z"/><path fill="#401102" d="M19.2502 16.5C19.2502 17.8807 18.1309 19 16.7502 19C15.3695 19 14.2502 17.8807 14.2502 16.5C14.2502 15.1193 15.3695 14 16.7502 14C18.1309 14 19.2502 15.1193 19.2502 16.5Z"/></svg>
\ No newline at end of file
diff --git a/assets/images/back-left.svg b/assets/images/back-left.svg
index 2ddd554e9720..2c709401916f 100644
--- a/assets/images/back-left.svg
+++ b/assets/images/back-left.svg
@@ -1,10 +1 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 28.3.0, 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="M14.2,18.4c-0.8,0.8-2,0.8-2.8,0L3,10l8.4-8.4c0.8-0.8,2-0.8,2.8,0s0.8,2,0,2.8L8.7,10l5.6,5.6
-	C15,16.4,15,17.6,14.2,18.4z"/>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" id="Layer_1" x="0" y="0" version="1.1" 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 d="M14.2,18.4c-0.8,0.8-2,0.8-2.8,0L3,10l8.4-8.4c0.8-0.8,2-0.8,2.8,0s0.8,2,0,2.8L8.7,10l5.6,5.6	C15,16.4,15,17.6,14.2,18.4z" class="st0"/></svg>
\ No newline at end of file
diff --git a/assets/images/bed.svg b/assets/images/bed.svg
new file mode 100644
index 000000000000..8ee733733ab2
--- /dev/null
+++ b/assets/images/bed.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 20 20"><path fill-rule="evenodd" d="M2 4C2 2.89543 2.89543 2 4 2H16C17.1046 2 18 2.89543 18 4V9H16V7.5C16 6.67157 15.3284 6 14.5 6H12.5C11.6716 6 11 6.67157 11 7.5V9H9V7.5C9 6.67157 8.32843 6 7.5 6H5.5C4.67157 6 4 6.67157 4 7.5V9H2V4ZM20 13.5V12C20 10.8954 19.1046 10 18 10H2C0.895431 10 0 10.8954 0 12V13.5V14V14.5C0 14.7761 0.223858 15 0.5 15H1.5C1.77614 15 2 15.2239 2 15.5V17.5C2 17.7761 2.22386 18 2.5 18H3.5C3.77614 18 4 17.7761 4 17.5V15.5C4 15.2239 4.22386 15 4.5 15H15.5C15.7761 15 16 15.2239 16 15.5V17.5C16 17.7761 16.2239 18 16.5 18H17.5C17.7761 18 18 17.7761 18 17.5V15.5C18 15.2239 18.2239 15 18.5 15H19.5C19.7761 15 20 14.7761 20 14.5V14V13.5Z" clip-rule="evenodd"/></svg>
\ No newline at end of file
diff --git a/assets/images/box.svg b/assets/images/box.svg
new file mode 100644
index 000000000000..05f808e801ee
--- /dev/null
+++ b/assets/images/box.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 20 20"><path fill="#8B9C8F" fill-rule="evenodd" d="M2 2.5C1.72386 2.5 1.5 2.72386 1.5 3V5C1.5 5.27614 1.72386 5.5 2 5.5H18C18.2761 5.5 18.5 5.27614 18.5 5V3C18.5 2.72386 18.2761 2.5 18 2.5H2ZM2 7H18V15.5C18 16.6046 17.1046 17.5 16 17.5H4C2.89543 17.5 2 16.6046 2 15.5V7ZM7 10.5C7 9.94772 7.44772 9.5 8 9.5H12C12.5523 9.5 13 9.94772 13 10.5C13 11.0523 12.5523 11.5 12 11.5H8C7.44772 11.5 7 11.0523 7 10.5Z" clip-rule="evenodd"/></svg>
\ No newline at end of file
diff --git a/assets/images/calendar-solid.svg b/assets/images/calendar-solid.svg
new file mode 100644
index 000000000000..4ecd1f6ee97f
--- /dev/null
+++ b/assets/images/calendar-solid.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" id="Layer_1" data-name="Layer 1" version="1.1" viewBox="0 0 20 20"><path d="M3,3c-1.105,0-2,.895-2,2v3h18v-3c0-1.105-.895-2-2-2H3Z" class="cls-1"/><path d="M19,10H1v7c0,1.105.895,2,2,2h14c1.105,0,2-.895,2-2v-7Z" class="cls-1"/><path d="M6,1c-.552,0-1,.448-1,1v2c0,.552.448,1,1,1s1-.448,1-1v-2c0-.552-.448-1-1-1Z" class="cls-1"/><path d="M14,1c-.552,0-1,.448-1,1v2c0,.552.448,1,1,1s1-.448,1-1v-2c0-.552-.448-1-1-1Z" class="cls-1"/></svg>
\ No newline at end of file
diff --git a/assets/images/car-with-key.svg b/assets/images/car-with-key.svg
new file mode 100644
index 000000000000..e4770fdad970
--- /dev/null
+++ b/assets/images/car-with-key.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 20 20"><path fill-rule="evenodd" d="M1 8.77033L1 16C1 16.5523 1.44772 17 2 17H4C4.55229 17 5 16.5523 5 16V14H8.24446L8.25 14H12.9013C13.4201 13.1033 14.3896 12.5 15.5 12.5H17.4338C17.9959 12.5 18.5361 12.6573 19 12.9413V8.77033C19 8.51115 18.9748 8.25318 18.9251 8H19.5C19.7761 8 20 7.77614 20 7.5V7C20 6.44772 19.5523 6 19 6H18.2L17.3445 3.86125C17.126 3.31503 16.6793 2.89313 16.1088 2.74946C14.9327 2.45325 12.693 2 10 2C7.30705 2 5.06735 2.45325 3.89118 2.74946C3.3207 2.89313 2.87399 3.31503 2.6555 3.86125L1.8 6H1C0.447715 6 0 6.44772 0 7V7.5C0 7.77614 0.223858 8 0.5 8H1.07488C1.02519 8.25318 1 8.51115 1 8.77033ZM3.67483 6.78041L4.37024 5.11142C4.45442 4.9094 4.60277 4.74213 4.80741 4.66452C5.40912 4.43634 6.95746 4 9.99962 4C13.0417 4 14.5905 4.43634 15.1924 4.66452C15.3972 4.74212 15.5456 4.90945 15.6298 5.11155L16.3251 6.78021C16.4243 7.01821 16.3222 7.2834 16.0765 7.36152C15.3414 7.59523 13.555 8 9.99913 8C6.44339 8 4.65788 7.59527 3.92325 7.36156C3.67765 7.28342 3.5757 7.01832 3.67483 6.78041ZM13 10.2808C13 10.1158 13.1123 9.97192 13.2724 9.9319L16.3787 9.15531C16.6943 9.07642 17 9.3151 17 9.64038V9.99999C17 10.5523 16.5523 11 16 11H13.7192C13.322 11 13 10.678 13 10.2808ZM3 9.64038C3 9.3151 3.30569 9.07642 3.62127 9.15531L6.72761 9.9319C6.88769 9.97192 7 10.1158 7 10.2808C7 10.678 6.67799 11 6.28078 11H4C3.44772 11 3 10.5523 3 9.99999V9.64038ZM15.5 14.5C14.9477 14.5 14.5 14.9477 14.5 15.5V16H8.25C8.11193 16 8 16.1119 8 16.25V16.8662C8 16.9498 8.04178 17.0279 8.11133 17.0742L9.24808 17.8321C9.41234 17.9416 9.60535 18 9.80278 18H14.5V18.5C14.5 19.0523 14.9477 19.5 15.5 19.5H17.4338C17.7851 19.5 18.1106 19.3157 18.2913 19.0145L18.8826 18.029C19.2626 17.3956 19.2626 16.6044 18.8826 15.971L18.2913 14.9855C18.1106 14.6843 17.7851 14.5 17.4338 14.5H15.5ZM18 17C18 17.2761 17.7761 17.5 17.5 17.5C17.2239 17.5 17 17.2761 17 17C17 16.7239 17.2239 16.5 17.5 16.5C17.7761 16.5 18 16.7239 18 17Z" clip-rule="evenodd"/></svg>
\ No newline at end of file
diff --git a/assets/images/cards-and-domains.svg b/assets/images/cards-and-domains.svg
deleted file mode 100644
index a6a3918f6423..000000000000
--- a/assets/images/cards-and-domains.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="20" height="20" viewBox="0 0 20 20"><path d="M5.62104 0.359664C6.37256 0.12592 7.17157 0 8 0C11.1411 0 13.8594 1.81029 15.1684 4.44444C15.7007 5.51552 16 6.7228 16 8C16 8.6906 15.9125 9.36076 15.748 10H13.8938C14.1067 9.37232 14.2222 8.69964 14.2222 8C14.2222 6.678 13.8099 5.4523 13.1069 4.44444H12.4444C11.0222 4.44444 10.6667 5.62963 10.6667 6.22222C10.0741 6.37037 8.88889 6.93333 8.88889 8C8.88889 9.33333 9.33333 9.77778 10.6667 9.77778C10.8632 9.77778 11.0597 9.86466 11.2178 10H9C8.28557 10 7.62946 10.2497 7.11422 10.6667L7.11111 10.6667C5.33333 10.6667 5.33333 9.77778 5.33333 8.88889C5.33333 8.17778 3.55442 8 2.66496 8C2.51681 7.11111 2.66496 5.33333 4.44274 5.33333C5.77778 5.33333 6.22222 4.88889 6.22222 4C6.22222 3.11111 6.66667 2.66667 7.55556 2.66667C8.33925 2.66667 8.96939 2.35958 9.35575 1.92591C8.91932 1.82892 8.46563 1.77778 8 1.77778C4.56356 1.77778 1.77778 4.56356 1.77778 8C1.77778 10.7368 3.54469 13.0609 6 13.8938V15.748C3.82051 15.187 2.00048 13.7307 0.955377 11.7945C0.345926 10.6654 0 9.37308 0 8C0 4.41015 2.3645 1.37256 5.62104 0.359664Z"/><path d="M8 13C8 12.4477 8.44772 12 9 12H19C19.5523 12 20 12.4477 20 13V14H8V13Z"/><path d="M8 15H20V19C20 19.5523 19.5523 20 19 20H9C8.44771 20 8 19.5523 8 19V15Z"/></svg>
\ No newline at end of file
diff --git a/assets/images/caret-up-down.svg b/assets/images/caret-up-down.svg
new file mode 100644
index 000000000000..d08aa2a1ebbd
--- /dev/null
+++ b/assets/images/caret-up-down.svg
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" version="1.1" viewBox="0 0 20 20">
+  <defs>
+    <style>
+      .cls-1 {
+        fill-rule: evenodd;
+      }
+    </style>
+  </defs>
+  <!-- Generator: Adobe Illustrator 28.6.0, SVG Export Plug-In . SVG Version: 1.2.0 Build 709)  -->
+  <g>
+    <g id="Layer_1">
+      <path class="cls-1" d="M10,.879l5.061,5.061c.586.586.586,1.536,0,2.121-.586.586-1.536.586-2.121,0l-2.939-2.939-2.939,2.939c-.586.586-1.536.586-2.121,0-.586-.586-.586-1.536,0-2.121L10,.879Z"/>
+      <path class="cls-1" d="M4.939,11.939c.586-.586,1.536-.586,2.121,0l2.939,2.939,2.939-2.939c.586-.586,1.536-.586,2.121,0,.586.586.586,1.536,0,2.121l-5.061,5.061-5.061-5.061c-.586-.586-.586-1.536,0-2.121Z"/>
+    </g>
+  </g>
+</svg>
\ No newline at end of file
diff --git a/assets/images/check-circle.svg b/assets/images/check-circle.svg
new file mode 100644
index 000000000000..3f6f1da4f827
--- /dev/null
+++ b/assets/images/check-circle.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" id="Layer_1" data-name="Layer 1" version="1.1" viewBox="0 0 20 20"><defs><style>.cls-1{fill-rule:evenodd;stroke-width:0}</style></defs><path d="M10,19c4.971,0,9-4.029,9-9S14.971,1,10,1,1,5.029,1,10s4.029,9,9,9ZM15.189,7.915c.505-.657.382-1.598-.274-2.103-.657-.505-1.598-.382-2.104.274l-4.049,5.264-1.802-1.501c-.636-.53-1.582-.444-2.113.192-.53.636-.444,1.582.192,2.113l4.198,3.498,5.951-7.736Z" class="cls-1"/></svg>
\ No newline at end of file
diff --git a/assets/images/checkmark-circle.svg b/assets/images/checkmark-circle.svg
new file mode 100644
index 000000000000..102598b55d8a
--- /dev/null
+++ b/assets/images/checkmark-circle.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="20" height="20" fill="none" viewBox="0 0 20 20"><path fill="#03D47C" fill-rule="evenodd" d="M10 19C14.9706 19 19 14.9706 19 10C19 5.02944 14.9706 1 10 1C5.02944 1 1 5.02944 1 10C1 14.9706 5.02944 19 10 19ZM15.189 7.91464C15.6941 7.25801 15.5712 6.31624 14.9146 5.81114C14.258 5.30604 13.3162 5.42888 12.8111 6.08551L8.76209 11.3492L6.96031 9.84774C6.3239 9.3174 5.37805 9.40338 4.84771 10.0398C4.31736 10.6762 4.40335 11.6221 5.03976 12.1524L9.23798 15.6509L15.189 7.91464Z" clip-rule="evenodd"/></svg>
\ No newline at end of file
diff --git a/assets/images/circular-arrow-backwards.svg b/assets/images/circular-arrow-backwards.svg
new file mode 100644
index 000000000000..7dab140cf78b
--- /dev/null
+++ b/assets/images/circular-arrow-backwards.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" id="Layer_1" x="0" y="0" version="1.1" viewBox="0 0 20 20" style="enable-background:new 0 0 20 20" xml:space="preserve"><path d="M4,2.5C4,1.672,3.328,1,2.5,1S1,1.672,1,2.5V10h6.5C8.328,10,9,9.328,9,8.5S8.328,7,7.5,7H5.346	c0.928-1.782,2.817-3,4.994-3c3.095,0,5.604,2.462,5.604,5.5c0,3.038-2.509,5.5-5.604,5.5c-1.66,0-3.149-0.706-4.178-1.834	c-0.563-0.617-1.529-0.67-2.158-0.117c-0.629,0.552-0.683,1.501-0.12,2.118C5.468,16.904,7.774,18,10.339,18	C15.122,18,19,14.194,19,9.5C19,4.806,15.122,1,10.339,1C7.835,1,5.581,2.043,4,3.709V2.5z"/></svg>
\ No newline at end of file
diff --git a/assets/images/coins.svg b/assets/images/coins.svg
index aa3c68e72ea8..164fa84388f5 100644
--- a/assets/images/coins.svg
+++ b/assets/images/coins.svg
@@ -1,8 +1 @@
-<svg width="20" height="20" viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg">
-<path d="M19 3.5C19 4.60457 16.7614 5.5 14 5.5C11.2386 5.5 9 4.60457 9 3.5C9 2.39543 11.2386 1.5 14 1.5C16.7614 1.5 19 2.39543 19 3.5Z"/>
-<path d="M14 7.49997C15.57 7.49997 17.0835 7.24907 18.2783 6.77114C18.5184 6.6751 18.762 6.5634 19 6.43311V7.49994C19 8.60451 16.7614 9.49994 14 9.49994C13.6477 9.49994 13.304 9.48537 12.9723 9.45765C12.9699 8.78394 12.9685 8.27559 12.9685 8.07543C12.9685 7.84265 12.9331 7.63823 12.8732 7.45618C13.243 7.48526 13.6198 7.49997 14 7.49997Z"/>
-<path d="M12.9797 11.4641L12.9875 13.4589C13.3145 13.4858 13.6531 13.4999 14 13.4999C16.7614 13.4999 19 12.6045 19 11.4999V10.4331C18.762 10.5634 18.5184 10.6751 18.2783 10.7711C17.0835 11.2491 15.57 11.5 14 11.5C13.6563 11.5 13.3152 11.4879 12.9797 11.4641Z"/>
-<path d="M11 8.5C11 9.60457 8.76142 10.5 6 10.5C3.23858 10.5 1 9.60457 1 8.5C1 7.39543 3.23858 6.5 6 6.5C8.76142 6.5 11 7.39543 11 8.5Z"/>
-<path d="M5.99999 12.5C7.57 12.5 9.08348 12.2491 10.2783 11.7711C10.5184 11.6751 10.762 11.5634 11 11.4331V12.4999C11 13.6045 8.76143 14.4999 6.00001 14.4999C3.23858 14.4999 1.00001 13.6045 1.00001 12.4999L1 11.4331C1.23799 11.5634 1.48158 11.6751 1.72167 11.7711C2.91649 12.2491 4.42997 12.5 5.99999 12.5Z"/>
-<path d="M5.99999 16.5C7.57 16.5 9.08348 16.2491 10.2783 15.7711C10.5184 15.6751 10.762 15.5634 11 15.4331V16.4999C11 17.6045 8.76143 18.4999 6.00001 18.4999C3.23858 18.4999 1.00001 17.6045 1.00001 16.4999L1 15.4331C1.23799 15.5634 1.48158 15.6751 1.72167 15.7711C2.91649 16.2491 4.42997 16.5 5.99999 16.5Z"/>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="20" height="20" viewBox="0 0 20 20"><path d="M19 3.5C19 4.60457 16.7614 5.5 14 5.5C11.2386 5.5 9 4.60457 9 3.5C9 2.39543 11.2386 1.5 14 1.5C16.7614 1.5 19 2.39543 19 3.5Z"/><path d="M14 7.49997C15.57 7.49997 17.0835 7.24907 18.2783 6.77114C18.5184 6.6751 18.762 6.5634 19 6.43311V7.49994C19 8.60451 16.7614 9.49994 14 9.49994C13.6477 9.49994 13.304 9.48537 12.9723 9.45765C12.9699 8.78394 12.9685 8.27559 12.9685 8.07543C12.9685 7.84265 12.9331 7.63823 12.8732 7.45618C13.243 7.48526 13.6198 7.49997 14 7.49997Z"/><path d="M12.9797 11.4641L12.9875 13.4589C13.3145 13.4858 13.6531 13.4999 14 13.4999C16.7614 13.4999 19 12.6045 19 11.4999V10.4331C18.762 10.5634 18.5184 10.6751 18.2783 10.7711C17.0835 11.2491 15.57 11.5 14 11.5C13.6563 11.5 13.3152 11.4879 12.9797 11.4641Z"/><path d="M11 8.5C11 9.60457 8.76142 10.5 6 10.5C3.23858 10.5 1 9.60457 1 8.5C1 7.39543 3.23858 6.5 6 6.5C8.76142 6.5 11 7.39543 11 8.5Z"/><path d="M5.99999 12.5C7.57 12.5 9.08348 12.2491 10.2783 11.7711C10.5184 11.6751 10.762 11.5634 11 11.4331V12.4999C11 13.6045 8.76143 14.4999 6.00001 14.4999C3.23858 14.4999 1.00001 13.6045 1.00001 12.4999L1 11.4331C1.23799 11.5634 1.48158 11.6751 1.72167 11.7711C2.91649 12.2491 4.42997 12.5 5.99999 12.5Z"/><path d="M5.99999 16.5C7.57 16.5 9.08348 16.2491 10.2783 15.7711C10.5184 15.6751 10.762 15.5634 11 15.4331V16.4999C11 17.6045 8.76143 18.4999 6.00001 18.4999C3.23858 18.4999 1.00001 17.6045 1.00001 16.4999L1 15.4331C1.23799 15.5634 1.48158 15.6751 1.72167 15.7711C2.91649 16.2491 4.42997 16.5 5.99999 16.5Z"/></svg>
\ No newline at end of file
diff --git a/assets/images/comment-bubbles.svg b/assets/images/comment-bubbles.svg
new file mode 100644
index 000000000000..1277b8958c94
--- /dev/null
+++ b/assets/images/comment-bubbles.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" id="Layer_1" x="0" y="0" version="1.1" 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 d="M1.097,9.615c0.142,0.178,0.206,0.408,0.156,0.63L0.515,13.57c-0.065,0.291,0.24,0.524,0.504,0.386l3.609-1.892	c0.153-0.08,0.33-0.1,0.499-0.062C5.723,12.135,6.351,12.205,7,12.205c3.866,0,7-2.508,7-5.603S10.866,1,7,1	C3.134,1,0,3.508,0,6.603C0,7.712,0.402,8.745,1.097,9.615z M13,17.208c-3.183,0-5.87-1.701-6.72-4.029	c0.237,0.017,0.477,0.026,0.72,0.026c4.199,0,8-2.76,8-6.603c0-0.125-0.004-0.248-0.012-0.371C17.886,6.917,20,9.064,20,11.605	c0,1.109-0.403,2.142-1.097,3.012c-0.142,0.178-0.206,0.408-0.156,0.63l0.739,3.325c0.065,0.291-0.24,0.524-0.504,0.386	l-3.609-1.892c-0.153-0.08-0.33-0.1-0.499-0.062C14.277,17.137,13.649,17.208,13,17.208z" class="st0"/></svg>
\ No newline at end of file
diff --git a/assets/images/companyCards/amex.svg b/assets/images/companyCards/amex.svg
new file mode 100644
index 000000000000..73e8164cdc63
--- /dev/null
+++ b/assets/images/companyCards/amex.svg
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 28.1.0, 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 40 40" style="enable-background:new 0 0 40 40;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill:#134038;}
+	.st1{fill-rule:evenodd;clip-rule:evenodd;fill:#28736D;}
+	.st2{clip-path:url(#SVGID_00000032619667140435552130000007081129503250523058_);}
+	.st3{fill:#FFFFFF;}
+	.st4{fill:#006FCF;}
+</style>
+<path class="st0" d="M4,7h32c2.209,0,4,1.791,4,4v18c0,2.209-1.791,4-4,4H4c-2.209,0-4-1.791-4-4V11C0,8.791,1.791,7,4,7z"/>
+<path class="st1" d="M2.941,17.621c0-0.053,0.014-0.106,0.042-0.151l0.461-0.768c0.053-0.089,0.149-0.143,0.252-0.143h2.088
+	c0.162,0,0.294,0.132,0.294,0.294v4.118c0,0.162-0.132,0.294-0.294,0.294H3.696c-0.103,0-0.199-0.054-0.252-0.143l-0.461-0.768
+	c-0.027-0.046-0.042-0.098-0.042-0.151V17.621z M6.471,16.853c0-0.162,0.132-0.294,0.294-0.294h0.98
+	c0.162,0,0.294,0.132,0.294,0.294v1.569c0,0.162-0.132,0.294-0.294,0.294h-0.98c-0.162,0-0.294-0.132-0.294-0.294V16.853z
+	 M8.726,16.559c-0.162,0-0.294,0.132-0.294,0.294v2.157c0,0.162,0.132,0.294,0.294,0.294h0.98c0.162,0,0.294-0.132,0.294-0.294
+	v-2.157c0-0.162-0.132-0.294-0.294-0.294H8.726z M6.471,19.402c0-0.162,0.132-0.294,0.294-0.294h0.98
+	c0.162,0,0.294,0.132,0.294,0.294v1.569c0,0.163-0.132,0.294-0.294,0.294h-0.98c-0.162,0-0.294-0.132-0.294-0.294V19.402z
+	 M8.726,19.696c-0.162,0-0.294,0.132-0.294,0.294v0.98c0,0.162,0.132,0.294,0.294,0.294h0.98c0.162,0,0.294-0.132,0.294-0.294v-0.98
+	c0-0.162-0.132-0.294-0.294-0.294H8.726z"/>
+<g>
+	<defs>
+		<rect id="SVGID_1_" x="27" y="19" width="10" height="10"/>
+	</defs>
+	<clipPath id="SVGID_00000175322321965036069540000015547865109414184885_">
+		<use xlink:href="#SVGID_1_"  style="overflow:visible;"/>
+	</clipPath>
+	<g style="clip-path:url(#SVGID_00000175322321965036069540000015547865109414184885_);">
+		<path class="st3" d="M37,19H27v10h10V19z"/>
+		<path class="st4" d="M27,19v10h10v-1.58h-1.38l-0.51-0.597l-0.53,0.597h-3.92v-3.177h-1.293l1.617-3.66h1.573l0.38,0.83v-0.83
+			h1.953l0.327,0.87l0.32-0.87H37V19H27z M35.87,21.1l-0.513,1.353L35.22,22.82l-0.14-0.367L34.563,21.1h-1.13v2.667h0.68V22.03
+			l-0.003-0.35l0.133,0.35l0.65,1.737h0.647l0.653-1.737l0.127-0.347v2.083H37V21.1H35.87z M31.35,21.1l-1.18,2.667h0.773
+			l0.207-0.513h1.293l0.207,0.513h0.783L32.26,21.1H31.35z M31.663,22.003l0.133-0.333l0.133,0.333l0.277,0.673h-0.82L31.663,22.003
+			z M35.923,24.247L35.12,25.11l-0.8-0.863h-0.887h-2.227v2.657h2.227v-0.577h-1.547v-0.463h1.517V25.29h-1.517v-0.467h1.547v-0.577
+			l1.243,1.333l-1.243,1.323h0.86l0.81-0.867l0.807,0.867h0.883l-1.247-1.333l1.247-1.323H35.923z M36.247,25.567L37,26.333V24.81
+			L36.247,25.567z"/>
+	</g>
+</g>
+</svg>
diff --git a/assets/images/companyCards/mastercard.svg b/assets/images/companyCards/mastercard.svg
new file mode 100644
index 000000000000..dcfac5eb33dd
--- /dev/null
+++ b/assets/images/companyCards/mastercard.svg
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 28.1.0, 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 40 40" style="enable-background:new 0 0 40 40;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill:#780505;}
+	.st1{clip-path:url(#SVGID_00000160911741019230954000000001214750336932741796_);}
+	.st2{fill:#FF5F00;}
+	.st3{fill:#EB001B;}
+	.st4{fill:#F79E1B;}
+	.st5{fill-rule:evenodd;clip-rule:evenodd;fill:#400000;}
+</style>
+<path class="st0" d="M4,7h32c2.209,0,4,1.791,4,4v18c0,2.209-1.791,4-4,4H4c-2.209,0-4-1.791-4-4V11C0,8.791,1.791,7,4,7z"/>
+<g>
+	<defs>
+		<rect id="SVGID_1_" x="27" y="23.353" width="10" height="6.182"/>
+	</defs>
+	<clipPath id="SVGID_00000060030376660257376330000002827159136955656835_">
+		<use xlink:href="#SVGID_1_"  style="overflow:visible;"/>
+	</clipPath>
+	<g style="clip-path:url(#SVGID_00000060030376660257376330000002827159136955656835_);">
+		<path class="st2" d="M30.513,24.014h2.975v4.859h-2.975V24.014z"/>
+		<path class="st3" d="M30.82,26.444c-0.001-0.948,0.435-1.844,1.18-2.429c-1.342-1.055-3.285-0.822-4.339,0.52
+			c-1.055,1.342-0.822,3.285,0.52,4.339c1.121,0.881,2.698,0.881,3.819,0C31.254,28.289,30.819,27.392,30.82,26.444L30.82,26.444z"
+			/>
+		<path class="st4" d="M37,26.444c0,1.707-1.384,3.09-3.09,3.09c-0.693,0-1.365-0.233-1.91-0.661
+			c1.342-1.055,1.575-2.997,0.52-4.339c-0.152-0.193-0.327-0.368-0.52-0.52c1.342-1.055,3.285-0.822,4.339,0.519
+			C36.768,25.078,37,25.75,37,26.444L37,26.444z"/>
+	</g>
+</g>
+<path class="st5" d="M2.941,17.621c0-0.053,0.014-0.106,0.042-0.151l0.461-0.768c0.053-0.089,0.149-0.143,0.252-0.143h2.088
+	c0.162,0,0.294,0.132,0.294,0.294v4.118c0,0.162-0.132,0.294-0.294,0.294H3.696c-0.103,0-0.199-0.054-0.252-0.143l-0.461-0.768
+	c-0.027-0.046-0.042-0.098-0.042-0.151V17.621z M6.471,16.853c0-0.162,0.132-0.294,0.294-0.294h0.98
+	c0.162,0,0.294,0.132,0.294,0.294v1.569c0,0.162-0.132,0.294-0.294,0.294h-0.98c-0.162,0-0.294-0.132-0.294-0.294V16.853z
+	 M8.726,16.559c-0.162,0-0.294,0.132-0.294,0.294v2.157c0,0.162,0.132,0.294,0.294,0.294h0.98c0.162,0,0.294-0.132,0.294-0.294
+	v-2.157c0-0.162-0.132-0.294-0.294-0.294H8.726z M6.471,19.402c0-0.162,0.132-0.294,0.294-0.294h0.98
+	c0.162,0,0.294,0.132,0.294,0.294v1.569c0,0.163-0.132,0.294-0.294,0.294h-0.98c-0.162,0-0.294-0.132-0.294-0.294V19.402z
+	 M8.726,19.696c-0.162,0-0.294,0.132-0.294,0.294v0.98c0,0.162,0.132,0.294,0.294,0.294h0.98c0.162,0,0.294-0.132,0.294-0.294v-0.98
+	c0-0.162-0.132-0.294-0.294-0.294H8.726z"/>
+</svg>
diff --git a/assets/images/companyCards/visa.svg b/assets/images/companyCards/visa.svg
new file mode 100644
index 000000000000..4a7a73b66639
--- /dev/null
+++ b/assets/images/companyCards/visa.svg
@@ -0,0 +1,74 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 28.1.0, 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 40 40" style="enable-background:new 0 0 40 40;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill:#003C73;}
+	.st1{clip-path:url(#SVGID_00000017493833590175773850000002994533296325622173_);}
+	.st2{fill:#FFFFFF;}
+	.st3{fill-rule:evenodd;clip-rule:evenodd;fill:#0676DE;}
+</style>
+<path class="st0" d="M4,7h32c2.209,0,4,1.791,4,4v18c0,2.209-1.791,4-4,4H4c-2.209,0-4-1.791-4-4V11C0,8.791,1.791,7,4,7z"/>
+<g>
+	<defs>
+		<rect id="SVGID_1_" x="26.273" y="25" width="10.962" height="5.677"/>
+	</defs>
+	<clipPath id="SVGID_00000039815032363773054580000002194153300828940964_">
+		<use xlink:href="#SVGID_1_"  style="overflow:visible;"/>
+	</clipPath>
+	<g style="clip-path:url(#SVGID_00000039815032363773054580000002194153300828940964_);">
+		<path class="st2" d="M31.702,25.099l-0.728,3.405h-0.881l0.728-3.405H31.702z M35.409,27.298l0.464-1.279l0.267,1.279H35.409z
+			 M36.391,28.505h0.815l-0.711-3.405h-0.752c-0.169,0-0.312,0.098-0.375,0.25l-1.321,3.156h0.925l0.184-0.508h1.13L36.391,28.505z
+			 M34.092,27.393c0.004-0.899-1.243-0.948-1.234-1.35c0.002-0.122,0.119-0.252,0.373-0.285c0.127-0.017,0.474-0.029,0.869,0.152
+			l0.154-0.722c-0.212-0.077-0.485-0.151-0.824-0.151c-0.87,0-1.483,0.463-1.489,1.126c-0.006,0.49,0.437,0.763,0.771,0.927
+			c0.343,0.167,0.458,0.274,0.457,0.423c-0.002,0.229-0.274,0.329-0.527,0.333c-0.443,0.007-0.7-0.119-0.905-0.215l-0.16,0.746
+			c0.206,0.094,0.586,0.177,0.98,0.181C33.484,28.558,34.089,28.101,34.092,27.393z M30.443,25.099l-1.427,3.405h-0.931
+			l-0.702-2.718c-0.043-0.167-0.08-0.229-0.209-0.299c-0.212-0.115-0.561-0.223-0.869-0.29l0.021-0.099h1.499
+			c0.191,0,0.363,0.127,0.406,0.347l0.371,1.971l0.917-2.318L30.443,25.099L30.443,25.099z"/>
+		<path class="st2" d="M29.2,30.489c-0.054,0.028-0.166,0.056-0.308,0.056c-0.329,0-0.575-0.208-0.575-0.593
+			c0-0.367,0.248-0.613,0.61-0.613c0.144,0,0.237,0.031,0.277,0.052l-0.038,0.123c-0.055-0.028-0.137-0.048-0.234-0.048
+			c-0.274,0-0.456,0.175-0.456,0.481c0,0.288,0.165,0.469,0.447,0.469c0.094,0,0.187-0.019,0.248-0.049L29.2,30.489z"/>
+		<path class="st2" d="M29.505,30.108c0,0.184,0.104,0.322,0.253,0.322c0.146,0,0.255-0.137,0.255-0.326
+			c0-0.142-0.071-0.32-0.251-0.32C29.583,29.784,29.505,29.95,29.505,30.108z M30.168,30.099c0,0.31-0.216,0.445-0.417,0.445
+			c-0.225,0-0.402-0.166-0.402-0.431c0-0.279,0.185-0.443,0.416-0.443C30.005,29.67,30.168,29.845,30.168,30.099z"/>
+		<path class="st2" d="M30.403,29.914c0-0.088-0.003-0.158-0.007-0.227h0.133l0.007,0.137h0.005c0.047-0.08,0.125-0.154,0.265-0.154
+			c0.113,0,0.199,0.069,0.236,0.168h0.003c0.026-0.049,0.061-0.083,0.095-0.109c0.05-0.038,0.104-0.059,0.184-0.059
+			c0.113,0,0.277,0.073,0.277,0.364v0.492h-0.149v-0.473c0-0.163-0.061-0.258-0.182-0.258c-0.088,0-0.154,0.064-0.182,0.137
+			c-0.007,0.022-0.012,0.049-0.012,0.076v0.518h-0.149v-0.502c0-0.133-0.059-0.229-0.175-0.229c-0.094,0-0.165,0.076-0.189,0.152
+			c-0.009,0.021-0.012,0.049-0.012,0.075v0.504h-0.149V29.914L30.403,29.914z"/>
+		<path class="st2" d="M31.892,29.914c0-0.088-0.003-0.158-0.007-0.227h0.133l0.007,0.137h0.005c0.047-0.08,0.125-0.154,0.265-0.154
+			c0.113,0,0.199,0.069,0.236,0.168h0.003c0.026-0.049,0.061-0.083,0.095-0.109c0.05-0.038,0.104-0.059,0.184-0.059
+			c0.112,0,0.277,0.073,0.277,0.364v0.492h-0.149v-0.473c0-0.163-0.061-0.258-0.182-0.258c-0.088,0-0.154,0.064-0.182,0.137
+			c-0.007,0.022-0.012,0.049-0.012,0.076v0.518h-0.149v-0.502c0-0.133-0.059-0.229-0.175-0.229c-0.093,0-0.165,0.076-0.189,0.152
+			c-0.009,0.021-0.012,0.049-0.012,0.075v0.504h-0.149V29.914z"/>
+		<path class="st2" d="M33.911,30.025c0.001-0.095-0.04-0.246-0.211-0.246c-0.156,0-0.222,0.14-0.234,0.246H33.911z M33.464,30.134
+			c0.003,0.206,0.133,0.291,0.287,0.291c0.109,0,0.177-0.019,0.232-0.043l0.028,0.109c-0.054,0.024-0.147,0.054-0.281,0.054
+			c-0.258,0-0.412-0.172-0.412-0.424c0-0.253,0.149-0.45,0.393-0.45c0.275,0,0.347,0.239,0.347,0.393
+			c0,0.031-0.002,0.054-0.005,0.071H33.464z"/>
+		<path class="st2" d="M34.291,29.948c0-0.099-0.002-0.184-0.007-0.261h0.133l0.007,0.166h0.005
+			c0.038-0.113,0.132-0.184,0.234-0.184c0.015,0,0.028,0.002,0.041,0.003v0.144c-0.015-0.003-0.031-0.003-0.052-0.003
+			c-0.107,0-0.184,0.08-0.205,0.194c-0.003,0.021-0.005,0.047-0.005,0.071v0.447h-0.153L34.291,29.948z"/>
+		<path class="st2" d="M35.481,30.496c-0.04,0.019-0.128,0.049-0.241,0.049c-0.253,0-0.417-0.171-0.417-0.428
+			c0-0.258,0.177-0.447,0.45-0.447c0.09,0,0.17,0.023,0.211,0.045l-0.035,0.116c-0.036-0.019-0.094-0.04-0.177-0.04
+			c-0.192,0-0.296,0.144-0.296,0.317c0,0.194,0.125,0.314,0.291,0.314c0.087,0,0.144-0.021,0.187-0.04L35.481,30.496z"/>
+		<path class="st2" d="M35.703,30.525v-0.838h0.152v0.838L35.703,30.525L35.703,30.525z M35.872,29.451
+			c0,0.052-0.036,0.094-0.097,0.094c-0.056,0-0.092-0.042-0.092-0.094c0-0.052,0.038-0.095,0.095-0.095
+			C35.834,29.356,35.872,29.398,35.872,29.451z"/>
+		<path class="st2" d="M36.593,30.097c-0.166-0.003-0.355,0.026-0.355,0.189c0,0.101,0.066,0.146,0.142,0.146
+			c0.111,0,0.182-0.069,0.206-0.14c0.005-0.017,0.007-0.035,0.007-0.049V30.097z M36.74,30.324c0,0.073,0.003,0.144,0.012,0.201
+			h-0.137l-0.012-0.106h-0.005c-0.047,0.066-0.137,0.125-0.256,0.125c-0.17,0-0.256-0.12-0.256-0.241
+			c0-0.203,0.18-0.313,0.504-0.312v-0.017c0-0.067-0.019-0.194-0.191-0.192c-0.08,0-0.161,0.023-0.22,0.062l-0.035-0.102
+			c0.069-0.043,0.171-0.073,0.277-0.073c0.256,0,0.319,0.175,0.319,0.341V30.324L36.74,30.324z"/>
+		<path class="st2" d="M37.029,29.295h0.152v1.23h-0.152V29.295z"/>
+	</g>
+</g>
+<path class="st3" d="M2.941,17.621c0-0.053,0.014-0.106,0.042-0.151l0.461-0.768c0.053-0.089,0.149-0.143,0.252-0.143h2.088
+	c0.162,0,0.294,0.132,0.294,0.294v4.118c0,0.162-0.132,0.294-0.294,0.294H3.696c-0.103,0-0.199-0.054-0.252-0.143l-0.461-0.768
+	c-0.027-0.046-0.042-0.098-0.042-0.151V17.621z M6.471,16.853c0-0.162,0.132-0.294,0.294-0.294h0.98
+	c0.162,0,0.294,0.132,0.294,0.294v1.569c0,0.162-0.132,0.294-0.294,0.294h-0.98c-0.162,0-0.294-0.132-0.294-0.294V16.853z
+	 M8.726,16.559c-0.162,0-0.294,0.132-0.294,0.294v2.157c0,0.162,0.132,0.294,0.294,0.294h0.98c0.162,0,0.294-0.132,0.294-0.294
+	v-2.157c0-0.162-0.132-0.294-0.294-0.294H8.726z M6.471,19.402c0-0.162,0.132-0.294,0.294-0.294h0.98
+	c0.162,0,0.294,0.132,0.294,0.294v1.569c0,0.163-0.132,0.294-0.294,0.294h-0.98c-0.162,0-0.294-0.132-0.294-0.294V19.402z
+	 M8.726,19.696c-0.162,0-0.294,0.132-0.294,0.294v0.98c0,0.162,0.132,0.294,0.294,0.294h0.98c0.162,0,0.294-0.132,0.294-0.294v-0.98
+	c0-0.162-0.132-0.294-0.294-0.294H8.726z"/>
+</svg>
diff --git a/assets/images/computer.svg b/assets/images/computer.svg
new file mode 100644
index 000000000000..be9eca391e0b
--- /dev/null
+++ b/assets/images/computer.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" id="Layer_1" data-name="Layer 1" version="1.1" viewBox="0 0 273 188"><defs><style>.cls-1,.cls-10,.cls-2,.cls-3,.cls-4,.cls-5,.cls-6,.cls-7,.cls-8,.cls-9{stroke-width:0}.cls-1,.cls-10{fill:#0164bf}.cls-2{fill:#28736d}.cls-3{fill:#8dc8ff}.cls-4{fill:#99f6ff}.cls-5{fill:#4ba6a6}.cls-6{fill:#5be3aa}.cls-11,.cls-7{fill:#50eef6}.cls-8{fill:#4ed7de}.cls-12{stroke-width:1px}.cls-12,.cls-13{fill:none;stroke-linejoin:round}.cls-11,.cls-12,.cls-13{stroke:#002140;stroke-linecap:round}.cls-13{stroke-width:1px}.cls-9{fill:#5ab0ff}.cls-10{fill-rule:evenodd}</style></defs><path d="M221.627,31.19c0-1.683-1.373-3.06-3.056-3.06h-53.46c-1.68,0-3.056,1.377-3.056,3.06v36.503c0,1.683,1.376,3.06,3.056,3.06h53.46c1.683,0,3.056-1.377,3.056-3.06V31.19Z" class="cls-1"/><path d="M221.131,136.085c-4.57-4.09-9.11-5.1-9.777-5.233,1.967-.317,4.237-.497,6.857-.497,5.083,0,9.523,2.417,13.2,5.73h-10.28Z" class="cls-8"/><path d="M20.726,124.339c-.153-.097-.303-.2-.447-.307-.24-.18-.473-.37-.693-.576l1.193.9s-.037-.01-.05-.014h-.003v-.003Z" class="cls-7"/><path d="M21.313,127.286c.437-.587,1.097-.954,2.07-1.18-.57.363-1.503.84-2.07,1.18Z" class="cls-7"/><path d="M223.701,138.752c-.84-1.01-1.707-1.893-2.57-2.667h10.28c1.143,1.03,2.213,2.147,3.206,3.307-4.27-.307-7.916-.333-10.9-.23l-.016-.41Z" class="cls-8"/><path d="M214.984,141.495c-.356-.386-.74-.75-1.146-1.086l.176-.207s3.354-.817,9.704-1.04c2.983-.103,6.629-.077,10.899.23h.004c4.726,5.523,7.683,11.973,8.453,14.373,1.453,4.52-1.29,6.457-5.003,6.457h-11.947c-1.793,0-3.273-.127-4.543-.373l.02-.11c.487-7.75-2.903-14.207-6.617-18.244Z" class="cls-8"/><path d="M221.628,31.19c0-1.683-1.374-3.06-3.057-3.06h-53.459c-1.68,0-3.057,1.377-3.057,3.06v36.503c0,1.683,1.377,3.06,3.057,3.06h53.459c1.683,0,3.057-1.377,3.057-3.06V31.19ZM222.861,77.776h-62.579c-1.51,0-2.9-.54-3.984-1.437-1.396-1.153-2.29-2.897-2.29-4.837V27.22c0-3.45,2.824-6.273,6.274-6.273h62.579c1.403,0,2.703.467,3.75,1.25,1.53,1.147,2.527,2.973,2.527,5.023v44.283c0,3.45-2.824,6.273-6.277,6.273Z" class="cls-8"/><path d="M95.672,158.715h-35.52c-4.52,0-6.03-.86-10.333-4.733-4.307-3.877-28.416-26.05-28.416-26.05l-.38-.166c.083-.177.18-.337.287-.48h.003c.567-.34,1.5-.817,2.07-1.18,1.11-.254,2.633-.324,4.693-.324h104.623c4.343,0,7.846.56,10.846,2.137.717.377,1.403.81,2.067,1.307.646.483,1.823,1.49,3.326,2.826,6.517,5.79,19.2,17.757,21.647,20.207,1.036,1.036,1.816,1.92,2.396,2.763l-.243.25s.86,3.443-3.447,3.443h-41.759v-.43s-2.37-2.366-5.6-5.166c-2.187-1.897-4.52-3.227-9.04-3.227h-21.743c-3.873,0-4.09,2.367-1.29,4.52,2.797,2.153,5.813,4.303,5.813,4.303ZM101.269,129.872h-58.77c-6.183,0-6.73,2.493-4.463,5.17.18.213.377.427.59.64,2.153,2.153,3.713,3.597,5.517,5.253.63.577,1.29,1.18,2.017,1.85,2.8,2.584,5.813,3.447,10.98,3.447h89.766c6.027,0,8.193-.443,4.737-4.307-.39-.436-.764-.846-1.12-1.236-2.257-2.45-3.98-4.084-6.077-5.8-.703-.574-1.453-1.16-2.277-1.79-3.883-2.97-9.16-3.207-14.826-3.223-.507-.004-1.02-.004-1.533-.004h-24.54Z" class="cls-7"/><path d="M23.383,126.106c-.973.226-1.633.593-2.07,1.18h-.003c-.203.123-.36.23-.433.303-.05.05-.09.033-.13-.033.007-.124.01-.25.01-.377,0-.537-.077-1.263-.193-1.927-.003-.543.007-.963.007-.963,0,0,.057.017.157.05h.003c.063.047.127.087.193.127l.023.013c.85.51,1.793.877,2.803,1.057.083.056.133.106.133.143,0,.087-.2.243-.5.427Z" class="cls-2"/><path d="M99,48.5H25.236c-4.593,0-8.353,3.76-8.353,8.353v60.466c0,2.417,1.04,4.603,2.693,6.13l-3.757-2.83-4.55-3.423c-2.963-2.08-4.907-5.517-4.907-9.39v-54.246c0-6.307,5.157-11.463,11.463-11.463h71.717s7.52,4.95,9.457,6.403c-.407-.363.847.633,0,0Z" class="cls-5"/><path d="M199.968,138.912c0-.843.273-1.83.936-2.827h20.227c.863.774,1.73,1.657,2.57,2.667l.017.41c-6.35.223-9.704,1.04-9.704,1.04l-.176.207c-3.817-3.157-9.607-3.947-13.547-1.174h-.32c-.003-.103-.003-.21-.003-.323Z" class="cls-8"/><path d="M185.848,113.602c-1.427.41-2.95.607-4.5.607h-5.113c1.776-3.067,1.936-6.297-.16-9.363v-.377h2.69c1.553,0,2.75-.203,3.653-.637l.863.38c2.794,2.454,3.434,5.624,2.47,9.034l.097.356Z" class="cls-2"/><path d="M20.923,124.466c-.067-.04-.13-.08-.193-.124.013.004.033.01.05.014,0,0,.002,0,.007.003l.137.107Z" class="cls-7"/><path d="M127.342,129.875c5.666.017,10.943.254,14.826,3.224.824.63,1.574,1.216,2.277,1.79l-.123.15h-11.824l-5.156-4.954v-.21Z" class="cls-4"/><path d="M203.024,133.919c1-.73,2.28-1.41,3.894-1.977,1.263-.443,2.73-.816,4.43-1.09,0,0,0,.004.006,0,.667.134,5.207,1.143,9.777,5.233h-20.227c.484-.733,1.177-1.473,2.12-2.166Z" class="cls-8"/><path d="M176.075,104.846c2.096,3.066,1.936,6.296.16,9.363h-9.15c1.776-3.067,1.94-6.297-.16-9.363v-.377h9.15v.377Z" class="cls-2"/><path d="M200.904,136.085c-.663.997-.936,1.984-.936,2.827,0,.113,0,.22.003.327.017,2.933.33,3.396,3.063,6.13,3.23,3.23,9.85,9.203,9.85,9.203,2.917,2.677,4.827,4.527,8.697,5.277,1.27.246,2.75.373,4.543.373h11.947c3.713,0,6.456-1.937,5.003-6.457-.77-2.4-3.727-8.85-8.453-14.373h-.004c-.993-1.16-2.063-2.277-3.206-3.307h4.076c6.297,0,7.427.084,11.624,3.31,4.2,3.23,18.969,17.517,22.766,21.314,1.063,1.063,1.697,2.41,1.547,3.539-.164,1.274-1.32,2.27-3.97,2.27h-53.28c-6.616,0-9.04.97-14.69-3.713-5.653-4.68-17.276-15.496-21.473-19.533-1.236-1.187-1.826-2.3-1.936-3.273-.267-2.344,2.25-3.914,5.326-3.914h19.503Z" class="cls-3"/><path d="M23.749,125.536c-1.01-.18-1.953-.547-2.803-1.057l-.023-.013-.137-.107c.633.213,2.457.833,2.963,1.177Z" class="cls-7"/><path d="M20.61,128.766c-.513,2.74-2.323,4.763-4.48,4.763-1.307,0-2.487-.744-3.327-1.937-.807-1.143-1.303-2.696-1.303-4.413,0-3.277,1.81-5.973,4.133-6.313l.187-.247,3.757,2.83.01.007c.22.206.453.396.693.576.103.324.203.757.283,1.22.003.86.037,2.027.183,2.304-.017.416-.063.82-.137,1.21Z" class="cls-5"/><path d="M133.492,125.672H25.236c-.507,0-1.007-.046-1.487-.136-.507-.344-2.33-.964-2.963-1.177,0,0-.002,0-.007-.003l-1.193-.9-.01-.007c-1.653-1.527-2.693-3.713-2.693-6.13v-60.466c0-4.593,3.76-8.353,8.353-8.353h67.666c.527.463.157,6.527.157,8.073H30.69c-2.977,0-5.41,2.433-5.41,5.41v48.913c0,2.976,2.433,5.413,5.41,5.413h96.702c2.977,0,5.413-2.437,5.413-5.413v-48.913c0-2.977-2.436-5.41-5.413-5.41h-34.333c.02-.297.03-.62.03-.97,0-3.23-.187-5.003-.187-7.103.017.157,0-.167,0,0h40.59c1.58,0,3.06.443,4.323,1.213,2.413,1.47,4.03,4.127,4.03,7.14v60.466c0,4.597-3.756,8.353-8.353,8.353Z" class="cls-7"/><path d="M62.583,78.553c-1.35,0-2.16-1.057-2.16-2.877s.81-2.88,2.16-2.88,2.157,1.037,2.157,2.88-.81,2.877-2.157,2.877Z" class="cls-6"/><path d="M194.278,86.023c-3.07-1.777-6.297-1.937-9.367.163h-.12v-8.41h10.117v8.246h-.63Z" class="cls-2"/><path d="M156.162,76.509l-6.87-5.19c-1.87-1.583-3.06-3.943-3.06-6.57V23.61c0-4.737,3.873-8.61,8.61-8.61h59.799c2.247,0,3.847.887,5.833,2.29l6.244,4.767-.107.14c-1.047-.783-2.347-1.25-3.75-1.25h-62.579c-3.45,0-6.274,2.823-6.274,6.273v44.283c0,1.94.894,3.683,2.29,4.837l-.136.17Z" class="cls-5"/><path d="M20.563,125.252c.117.664.193,1.39.193,1.927,0,.127-.003.253-.01.377-.147-.277-.18-1.444-.183-2.304Z" class="cls-5"/><path d="M96.532,140.849h-12.057v-.214l-5.65-5.596h12.42l5.287,5.163v.647Z" class="cls-4"/><path d="M122.732,42.096c2.13,0,4.13.59,5.843,1.61l9.387,5.777-.144.23c-1.263-.77-2.743-1.213-4.323-1.213h-40.59c-.147-1.84-1.183-3.163-3.043-4.36-1.067-.687-2.137-1.373-3.17-2.043h36.043-.003Z" class="cls-5"/><path d="M111.602,140.849h-15.07v-.647l-5.287-5.163h14.976l5.38,5.38v.43Z" class="cls-4"/><path d="M143.702,146.232h-13.724v-.43l-5.156-4.953h13.723l5.157,4.953v.43Z" class="cls-4"/><path d="M95.409,77.483l.207-.953c.323.093.673.18,1.05.267l.9.203c.947.203,1.283.643,1.283,1.073,0,.613-.543.887-1.487.887-1.237,0-1.797-.453-1.953-1.477Z" class="cls-6"/><path d="M112.892,149.892c4.52,0,6.853,1.33,9.04,3.227,3.23,2.8,5.6,5.166,5.6,5.166v.43h-31.86s-3.017-2.15-5.813-4.303c-2.8-2.153-2.583-4.52,1.29-4.52h21.743Z" class="cls-4"/><path d="M150.348,140.849h-11.803l-6.046-5.81h11.823l.123-.15c2.097,1.716,3.82,3.35,6.077,5.8l-.174.16Z" class="cls-4"/><path d="M97.242,72.053c1.057,0,1.62.343,1.62,1.363h3.94v4.407h-.4c0-1.95-1.313-2.833-4.327-3.517l-.9-.2c-.947-.207-1.283-.617-1.283-1.047,0-.613.517-1.007,1.35-1.007Z" class="cls-6"/><path d="M58.726,129.872v.213l5.157,4.954h-12.35l-5.157-4.954v-.213h12.35Z" class="cls-4"/><path d="M74.679,78.689c-1.1,0-1.933-.633-2.133-2.25h7.666v-.47h.583v1.483h-4.207c-.157.607-.63,1.237-1.91,1.237Z" class="cls-6"/><path d="M157.938,114.209c1.774-3.067,1.937-6.297-.163-9.363v-.377h9.15v.377c2.1,3.066,1.936,6.296.16,9.363h-9.147Z" class="cls-2"/><path d="M21.023,127.766l.38.166s24.11,22.173,28.416,26.05c4.303,3.873,5.813,4.733,10.333,4.733h109.138c4.307,0,3.447-3.443,3.447-3.443l.243-.25c1.107,1.613,1.477,3.083,1.477,5.2v6.03c0,3.443-1.29,4.736-6.887,4.736H60.153c-7.537,0-9.473-1.51-13.563-4.953-.437-.367-.99-.84-1.633-1.393l-.02-.357c2.817-.173,3.16-1.066,3.16-2.986,0-2.15,0-2.797-1.613-4.304,0,0-.97-.863-3.337-2.8-2.37-1.936-3.23-1.72-6.46-1.72-1.953,0-4.067-.316-5.43.34l-.103-.196c-2.787-2.444-5.15-4.517-6.307-5.527-3.443-3.013-4.303-4.52-4.303-8.397v-7.75c0-.849.047-1.563.16-2.159.077-.387.18-.727.32-1.02Z" class="cls-5"/><path d="M38.036,135.042c-2.267-2.677-1.72-5.17,4.463-5.17h3.877v.213l5.157,4.954h-13.497v.003Z" class="cls-4"/><path d="M11.933,137.405c-4.09,0-4.737,3.66-1.723,6.887,3.013,3.23,6.673,6.677,9.687,9.257,3.013,2.583,4.413,2.476,6.567,2.476h5.703c2.583,0,3.23,5.06.217,5.06s.647,0-5.597,0-7.967-1.293-11.84-4.52c-3.877-3.23-4.09-4.09-8.827-8.396-4.737-4.307-4.09-6.027-4.09-9.257s3.013-7.32,7.533-7.32h3.24c.84,1.193,2.02,1.937,3.327,1.937,2.157,0,3.967-2.024,4.48-4.763l.093.02c-.113.596-.16,1.309-.16,2.159v6.46h-8.61Z" class="cls-2"/><path d="M56.433,70.123h.503v11.11h-.257l-3.937-5.737,3.69-5.373Z" class="cls-6"/><path d="M185.468,100.492l-.793-.09c.08-.526.116-1.106.116-1.746v-3.323h.12c3.07-2.097,6.297-1.937,9.367-.16h.63v5.424c0,2.136-.33,4.003-.92,5.61l-.344-.127c-1.59-3.363-4.28-5.473-8.176-5.587Z" class="cls-2"/><path d="M124.822,140.849h-13.22v-.43l-5.38-5.38h12.553l6.047,5.81Z" class="cls-4"/><path d="M86.172,129.872v.213l5.073,4.954h-12.42l-5.003-4.954v-.213h12.35Z" class="cls-4"/><path d="M148.788,114.209c1.777-3.067,1.937-6.297-.163-9.363v-.377h9.15v.377c2.1,3.066,1.937,6.296.163,9.363h-9.15Z" class="cls-2"/><path d="M148.938,132.052c-1.503-1.337-2.68-2.343-3.326-2.826-.664-.497-1.35-.93-2.067-1.307l.077-.147c1.776-1.613,3.873-1.613,10.009-1.613h39.717c7.426,0,8.233,1.29,13.4,5.166l.17.617c-1.614.567-2.894,1.247-3.894,1.977l-.15-.334c-3.39-2.746-3.553-2.906-8.073-2.906h-37.456c-4.684,0-7.75-.324-7.91,1.13l-.497.243Z" class="cls-2"/><path d="M141.845,104.469h6.78v.377c2.1,3.066,1.94,6.296.163,9.363h-6.943v-9.74Z" class="cls-2"/><path d="M127.342,130.085l5.156,4.954h-13.723l-5.156-4.954v-.213h12.19c.513,0,1.026,0,1.533.003v.21Z" class="cls-4"/><path d="M69.929,140.849h-12.35l-6.047-5.81h12.35l6.047,5.81Z" class="cls-4"/><path d="M184.911,86.186c3.07-2.1,6.297-1.94,9.367-.163h.63v9.15h-.63c-3.07-1.777-6.297-1.937-9.367.16h-.12v-9.146h.12Z" class="cls-2"/><path d="M75.086,146.232h-12.35v-.43l-5.157-4.953h12.35l5.157,4.953v.43Z" class="cls-4"/><path d="M101.269,129.872v.213l4.953,4.954h-14.976l-5.073-4.954v-.213h15.097Z" class="cls-4"/><path d="M30.69,56.573c-2.977,0-5.41,2.433-5.41,5.41v48.913c0,2.976,2.433,5.413,5.41,5.413h96.702c2.976,0,5.413-2.437,5.413-5.413v-48.913c0-2.977-2.437-5.41-5.413-5.41H30.69Z" class="cls-10"/><path d="M119.036,84.622c1.022,0,1.857.835,1.857,1.857,0,.511-.208.976-.545,1.313-.336.336-.801.544-1.312.544h-7.512c-1.022,0-1.857-.835-1.857-1.857,0-.511.208-.976.544-1.313.337-.337.802-.544,1.313-.544h7.512Z" class="cls-8"/><path d="M119.036,92.931c1.022,0,1.857.835,1.857,1.857,0,.511-.208.976-.545,1.313-.336.337-.801.544-1.312.544h-7.512c-1.022,0-1.857-.835-1.857-1.857,0-.511.208-.976.544-1.313.337-.337.802-.544,1.313-.544h7.512Z" class="cls-8"/><path d="M119.036,101.24c1.022,0,1.857.835,1.857,1.857,0,.511-.208.976-.545,1.312-.336.337-.801.545-1.312.545h-7.512c-1.022,0-1.857-.835-1.857-1.857,0-.511.208-.977.544-1.313.337-.337.802-.544,1.313-.544h7.512Z" class="cls-8"/><path d="M105.326,84.622c1.022,0,1.857.835,1.857,1.857,0,.511-.208.976-.544,1.313-.337.336-.802.544-1.313.544h-7.511c-1.022,0-1.857-.835-1.857-1.857,0-.511.208-.976.544-1.313.337-.337.802-.544,1.313-.544h7.511Z" class="cls-8"/><path d="M105.326,92.931c1.022,0,1.857.835,1.857,1.857,0,.511-.208.976-.544,1.313-.337.337-.802.544-1.313.544h-7.511c-1.022,0-1.857-.835-1.857-1.857,0-.511.208-.976.544-1.313.337-.337.802-.544,1.313-.544h7.511Z" class="cls-8"/><path d="M105.326,101.24c1.022,0,1.857.835,1.857,1.857,0,.511-.208.976-.544,1.312-.337.337-.802.545-1.313.545h-7.511c-1.022,0-1.857-.835-1.857-1.857,0-.511.208-.977.544-1.313.337-.337.802-.544,1.313-.544h7.511Z" class="cls-8"/><path d="M63.831,67.609c1.022,0,1.857.839,1.857,1.861,0,.507-.208.972-.544,1.309-.336.337-.802.548-1.313.548h-23.265c-1.022,0-1.857-.839-1.857-1.857,0-.511.208-.976.544-1.313.336-.341.802-.548,1.313-.548h23.265Z" class="cls-8"/><path d="M63.831,93.367c1.022,0,1.857.839,1.857,1.861,0,.507-.208.972-.544,1.309-.336.337-.802.548-1.313.548h-23.265c-1.022,0-1.857-.839-1.857-1.857,0-.511.208-.976.544-1.313.336-.341.802-.548,1.313-.548h23.265Z" class="cls-8"/><path d="M55.231,84.622c1.022,0,1.857.835,1.857,1.857,0,.511-.208.976-.544,1.313-.336.336-.802.544-1.313.544h-14.665c-1.022,0-1.857-.835-1.857-1.857,0-.511.208-.976.544-1.313.336-.337.802-.544,1.313-.544h14.665Z" class="cls-8"/><path d="M55.231,101.24c1.022,0,1.857.835,1.857,1.857,0,.511-.208.976-.544,1.312-.336.337-.802.545-1.313.545h-14.665c-1.022,0-1.857-.835-1.857-1.857,0-.511.208-.977.544-1.313.336-.337.802-.544,1.313-.544h14.665Z" class="cls-8"/><path d="M63.831,71.328h-23.265c-1.022,0-1.857-.839-1.857-1.857,0-.511.208-.976.544-1.313.336-.341.802-.548,1.313-.548h23.265c1.022,0,1.857.839,1.857,1.861,0,.507-.208.972-.544,1.309-.336.337-.802.548-1.313.548Z" class="cls-12"/><path d="M55.231,88.336h-14.665c-1.022,0-1.857-.835-1.857-1.857,0-.511.208-.976.544-1.313.336-.337.802-.544,1.313-.544h14.665c1.022,0,1.857.835,1.857,1.857,0,.511-.208.976-.544,1.313-.336.336-.802.544-1.313.544Z" class="cls-12"/><path d="M63.831,97.085h-23.265c-1.022,0-1.857-.839-1.857-1.857,0-.511.208-.976.544-1.313.336-.341.802-.548,1.313-.548h23.265c1.022,0,1.857.839,1.857,1.861,0,.507-.208.972-.544,1.309-.336.337-.802.548-1.313.548Z" class="cls-12"/><path d="M55.231,104.954h-14.665c-1.022,0-1.857-.835-1.857-1.857,0-.511.208-.977.544-1.313.336-.337.802-.544,1.313-.544h14.665c1.022,0,1.857.835,1.857,1.857,0,.511-.208.976-.544,1.312-.336.337-.802.545-1.313.545Z" class="cls-12"/><path d="M119.036,88.336h-7.512c-1.022,0-1.857-.835-1.857-1.857,0-.511.208-.976.544-1.313.337-.337.802-.544,1.313-.544h7.512c1.022,0,1.857.835,1.857,1.857,0,.511-.208.976-.545,1.313-.336.336-.801.544-1.312.544Z" class="cls-12"/><path d="M119.036,104.954h-7.512c-1.022,0-1.857-.835-1.857-1.857,0-.511.208-.977.544-1.313.337-.337.802-.544,1.313-.544h7.512c1.022,0,1.857.835,1.857,1.857,0,.511-.208.976-.545,1.312-.336.337-.801.545-1.312.545Z" class="cls-12"/><path d="M119.036,96.645h-7.512c-1.022,0-1.857-.835-1.857-1.857,0-.511.208-.976.544-1.313.337-.337.802-.544,1.313-.544h7.512c1.022,0,1.857.835,1.857,1.857,0,.511-.208.976-.545,1.313-.336.337-.801.544-1.312.544Z" class="cls-12"/><path d="M105.326,88.336h-7.511c-1.022,0-1.857-.835-1.857-1.857,0-.511.208-.976.544-1.313.337-.337.802-.544,1.313-.544h7.511c1.022,0,1.857.835,1.857,1.857,0,.511-.208.976-.544,1.313-.337.336-.802.544-1.313.544Z" class="cls-12"/><path d="M105.326,104.954h-7.511c-1.022,0-1.857-.835-1.857-1.857,0-.511.208-.977.544-1.313.337-.337.802-.544,1.313-.544h7.511c1.022,0,1.857.835,1.857,1.857,0,.511-.208.976-.544,1.312-.337.337-.802.545-1.313.545Z" class="cls-12"/><path d="M105.326,96.645h-7.511c-1.022,0-1.857-.835-1.857-1.857,0-.511.208-.976.544-1.313.337-.337.802-.544,1.313-.544h7.511c1.022,0,1.857.835,1.857,1.857,0,.511-.208.976-.544,1.313-.337.337-.802.544-1.313.544Z" class="cls-12"/><path d="M91.205,87.551h-2.933" class="cls-12"/><path d="M82.896,87.551h-2.933" class="cls-12"/><path d="M74.587,87.551h-2.933" class="cls-12"/><path d="M66.278,87.551h-2.933" class="cls-12"/><path d="M91.205,96.275h-2.933" class="cls-12"/><path d="M82.896,96.275h-2.933" class="cls-12"/><path d="M74.587,96.275h-2.933" class="cls-12"/><path d="M91.205,104.999h-2.933" class="cls-12"/><path d="M82.896,104.999h-2.933" class="cls-12"/><path d="M74.587,104.999h-2.933" class="cls-12"/><path d="M66.278,104.999h-2.933" class="cls-12"/><path d="M99.161,67.269h21.437" class="cls-12"/><path d="M99.161,71.423h21.437" class="cls-12"/><path d="M39.108,78.199h81.215" class="cls-12"/><path d="M32.383,161.085c3.013,0,2.367-5.06-.217-5.06h-2.367v-.323c0-1.613.57-2.457,1.457-2.887,1.363-.656,3.477-.34,5.43-.34,3.23,0,4.09-.216,6.46,1.72,2.367,1.937,3.337,2.8,3.337,2.8,1.613,1.507,1.613,2.154,1.613,4.304,0,1.919-.343,2.813-3.16,2.986-.343.02-.723.03-1.143.03h-6.673c-2.153,0-4.737-3.23-4.737-3.23Z" class="cls-5"/><path d="M129.978,146.232h-54.892v-.43l-5.157-4.953h54.893l5.156,4.953v.43Z" class="cls-4"/><path d="M138.545,140.849h-13.723l-6.047-5.81h13.723l6.047,5.81Z" class="cls-4"/><path d="M84.476,140.849h-14.547l-6.047-5.81h14.943l5.65,5.596v.214Z" class="cls-4"/><path d="M44.223,140.849h13.357l5.157,4.953v.43h-5.597c-5.167,0-8.18-.863-10.98-3.447-.727-.67-1.387-1.273-2.017-1.85l.08-.086Z" class="cls-4"/><path d="M38.41,135.039h13.123l6.047,5.81h-13.357l-.08.086c-1.803-1.656-3.363-3.1-5.517-5.253-.213-.213-.41-.427-.59-.64h.373v-.003Z" class="cls-4"/><path d="M199.971,139.239h.32c3.94-2.777,9.73-1.987,13.547,1.17.406.336.79.7,1.146,1.086,3.714,4.037,7.104,10.494,6.617,18.244l-.02.11c-3.87-.75-5.78-2.6-8.697-5.277,0,0-6.62-5.973-9.85-9.203-2.733-2.734-3.046-3.197-3.063-6.13Z" class="cls-8"/><path d="M73.822,129.872v.213l5.003,4.954h-14.943l-5.157-4.954v-.213h15.097Z" class="cls-4"/><path d="M182.418,103.832c1.313-.63,2.003-1.746,2.257-3.43l.793.09c3.897.114,6.587,2.224,8.177,5.587l.343.127c-1.453,3.963-4.5,6.36-8.14,7.396l-.097-.356c.964-3.41.324-6.58-2.47-9.034l-.863-.38Z" class="cls-2"/><path d="M113.619,129.872v.213l5.156,4.954h-12.553l-4.953-4.954v-.213h12.35Z" class="cls-4"/><path d="M151.641,141.925c3.457,3.864,1.29,4.307-4.736,4.307h-3.203v-.43l-5.157-4.953h11.803l.173-.16c.357.39.73.8,1.12,1.236Z" class="cls-4"/><path d="M271.49,164.258l-.08,6.504c-.213,1.22-1.38,2.163-3.956,2.163h-53.28c-6.616,0-9.04.967-14.69-3.713-5.653-4.684-17.276-15.5-21.473-19.537-.913-.876-1.473-1.71-1.75-2.48l-.186-.696v-6.5c.11.973.7,2.086,1.936,3.273,4.197,4.037,15.82,14.853,21.473,19.533,5.65,4.683,8.074,3.713,14.69,3.713h53.28c2.65,0,3.806-.996,3.97-2.27l.066.01Z" class="cls-9"/><path d="M231.411,136.085h4.076c6.297,0,7.427.084,11.624,3.31,4.2,3.23,18.969,17.517,22.766,21.314,1.063,1.063,1.697,2.41,1.547,3.539-.164,1.274-1.32,2.27-3.97,2.27h-53.28c-6.616,0-9.04.97-14.69-3.713-5.653-4.68-17.276-15.496-21.473-19.533-1.236-1.187-1.826-2.3-1.936-3.273-.267-2.344,2.25-3.914,5.326-3.914h19.503" class="cls-13"/><path d="M176.261,147.195c.277.77.837,1.604,1.75,2.48,4.197,4.037,15.82,14.853,21.473,19.537,5.65,4.68,8.074,3.713,14.69,3.713h53.28c2.576,0,3.743-.943,3.956-2.163l.08-6.504" class="cls-13"/><path d="M176.075,139.395v7.104" class="cls-13"/><path d="M93.059,56.573h34.333c2.976,0,5.413,2.433,5.413,5.41v48.913c0,2.976-2.437,5.413-5.413,5.413H30.69c-2.977,0-5.41-2.437-5.41-5.413v-48.913c0-2.977,2.433-5.41,5.41-5.41h62.369Z" class="cls-13"/><path d="M92.902,48.5h40.59c1.58,0,3.06.443,4.323,1.213,2.413,1.47,4.03,4.127,4.03,7.14v60.466c0,4.597-3.757,8.353-8.353,8.353H25.236c-.507,0-1.007-.046-1.487-.136-1.01-.18-1.953-.547-2.803-1.057" class="cls-13"/><path d="M19.576,123.449c-1.653-1.527-2.693-3.713-2.693-6.13v-60.466c0-4.593,3.76-8.353,8.353-8.353h67.764" class="cls-13"/><path d="M20.923,124.466c-.067-.04-.13-.08-.193-.124h-.003c-.153-.1-.303-.203-.447-.31-.24-.18-.473-.37-.693-.576" class="cls-13"/><path d="M122.732,42.096c2.13,0,4.13.59,5.843,1.61.004,0,.004.003.007.003" class="cls-13"/><path d="M138.635,49.9l-.677-.417-9.386-5.773" class="cls-13"/><path d="M58.842,42.096H17.826c-6.307,0-11.463,5.157-11.463,11.463v54.246c0,3.873,1.943,7.31,4.907,9.39l4.55,3.423,3.757,2.83.01.007,1.193.9s.003.003.007.003l.137.107.023.013.423.32" class="cls-13"/><path d="M122.732,42.096H58.5" class="cls-13"/><path d="M44.956,164.642c.643.553,1.197,1.026,1.633,1.393,4.09,3.443,6.027,4.953,13.563,4.953h107.418c5.597,0,6.887-1.293,6.887-4.736v-6.03c0-2.117-.37-3.587-1.477-5.2-.58-.843-1.36-1.727-2.396-2.763-2.447-2.45-15.13-14.417-21.647-20.207-1.503-1.336-2.68-2.343-3.326-2.826-.664-.497-1.35-.93-2.067-1.307-3-1.577-6.503-2.137-10.846-2.137H28.076c-2.06,0-3.583.07-4.693.324-.973.226-1.633.593-2.07,1.18h-.003c-.107.143-.203.303-.287.48-.14.293-.243.633-.32,1.02-.113.596-.16,1.31-.16,2.16v7.749c0,3.877.86,5.384,4.303,8.397,1.157,1.01,3.52,3.083,6.307,5.527" class="cls-13"/><path d="M21.403,127.932s24.11,22.173,28.416,26.05c4.303,3.873,5.813,4.733,10.333,4.733h109.139c4.307,0,3.447-3.443,3.447-3.443" class="cls-13"/><path d="M95.672,158.715s-3.017-2.15-5.813-4.303c-2.8-2.153-2.583-4.52,1.29-4.52h21.743c4.52,0,6.853,1.33,9.04,3.227,3.23,2.8,5.6,5.166,5.6,5.166" class="cls-13"/><path d="M143.702,146.232h3.203c6.027,0,8.193-.443,4.737-4.307-.39-.436-.764-.846-1.12-1.236-2.257-2.45-3.98-4.084-6.077-5.8-.703-.574-1.453-1.16-2.277-1.79-3.883-2.97-9.16-3.207-14.826-3.224-.507-.003-1.02-.003-1.533-.003H42.499c-6.183,0-6.73,2.493-4.463,5.17.18.213.377.427.59.64,2.153,2.153,3.713,3.597,5.517,5.253.63.577,1.29,1.18,2.017,1.85,2.8,2.584,5.813,3.447,10.98,3.447h86.563Z" class="cls-13"/><path d="M38.409,135.039h105.913" class="cls-13"/><path d="M44.223,140.849h106.125" class="cls-13"/><path d="M46.376,130.086l5.157,4.953,6.047,5.81,5.157,4.953" class="cls-13"/><path d="M58.726,130.086l5.157,4.953,6.047,5.81,5.157,4.953" class="cls-13"/><path d="M73.822,130.086l5.003,4.953,5.65,5.596" class="cls-13"/><path d="M86.172,130.086l5.073,4.953,5.287,5.163" class="cls-13"/><path d="M101.269,130.086l4.953,4.953,5.38,5.38" class="cls-13"/><path d="M113.619,130.086l5.156,4.953,6.047,5.81,5.156,4.953" class="cls-13"/><path d="M127.342,130.086l5.156,4.953,6.047,5.81,5.157,4.953" class="cls-13"/><path d="M20.28,124.032c.103.324.203.757.283,1.22.117.664.193,1.39.193,1.927,0,.127-.003.253-.01.377-.017.416-.063.82-.137,1.21-.513,2.739-2.323,4.763-4.48,4.763-1.307,0-2.487-.744-3.327-1.937-.807-1.143-1.303-2.696-1.303-4.413,0-3.277,1.81-5.973,4.133-6.313" class="cls-13"/><path d="M16.13,133.529h3.767" class="cls-13"/><path d="M12.576,131.592h-3.013c-4.52,0-7.533,4.09-7.533,7.32s-.647,4.95,4.09,9.257c4.737,4.306,4.95,5.166,8.827,8.396,3.873,3.227,5.597,4.52,11.84,4.52s2.583,0,5.597,0,2.367-5.06-.217-5.06h-5.703c-2.153,0-3.553.107-6.567-2.476-3.013-2.58-6.673-6.027-9.687-9.257-3.013-3.227-2.367-6.887,1.723-6.887h8.393" class="cls-13"/><path d="M12.816,131.592h-.013" class="cls-13"/><path d="M12.803,131.592h-.227" class="cls-13"/><path d="M29.8,155.702c0-1.613.57-2.457,1.457-2.887,1.363-.656,3.477-.34,5.43-.34,3.23,0,4.09-.216,6.46,1.72,2.367,1.937,3.337,2.8,3.337,2.8,1.613,1.507,1.613,2.154,1.613,4.304,0,1.919-.343,2.813-3.16,2.986-.343.02-.723.03-1.143.03h-6.673c-2.153,0-4.737-3.23-4.737-3.23" class="cls-13"/><path d="M141.952,104.469h36.813c1.553,0,2.75-.203,3.653-.637,1.313-.63,2.003-1.746,2.257-3.43.08-.526.116-1.106.116-1.746v-20.663" class="cls-13"/><path d="M141.845,114.209h39.503c1.55,0,3.073-.197,4.5-.607,3.64-1.036,6.686-3.433,8.14-7.396.59-1.607.92-3.474.92-5.61v-22.39" class="cls-13"/><path d="M226.611,22.197c1.53,1.147,2.527,2.973,2.527,5.023v44.283c0,3.45-2.824,6.273-6.277,6.273h-62.579c-1.51,0-2.9-.54-3.984-1.437-1.396-1.153-2.29-2.897-2.29-4.837V27.22c0-3.45,2.824-6.273,6.274-6.273h62.579c1.403,0,2.703.467,3.75,1.25Z" class="cls-13"/><path d="M156.162,76.509l-6.87-5.19c-1.87-1.583-3.06-3.943-3.06-6.57V23.61c0-4.737,3.873-8.61,8.61-8.61h59.799c2.247,0,3.847.887,5.833,2.29l6.244,4.767,1.083.827" class="cls-13"/><path d="M221.627,67.693c0,1.683-1.373,3.06-3.056,3.06h-53.46c-1.68,0-3.056-1.377-3.056-3.06V31.19c0-1.683,1.376-3.06,3.056-3.06h53.46c1.683,0,3.056,1.377,3.056,3.06v36.503Z" class="cls-13"/><path d="M148.625,104.846c2.1,3.066,1.94,6.296.163,9.363" class="cls-13"/><path d="M157.775,104.846c2.1,3.066,1.937,6.296.163,9.363" class="cls-13"/><path d="M166.925,104.846c2.1,3.066,1.936,6.296.16,9.363" class="cls-13"/><path d="M176.075,104.846c2.096,3.066,1.936,6.296.16,9.363" class="cls-13"/><path d="M183.281,104.212c2.794,2.454,3.434,5.624,2.47,9.034" class="cls-13"/><path d="M185.468,100.492c3.897.114,6.587,2.224,8.177,5.587" class="cls-13"/><path d="M184.911,95.332c3.07-2.097,6.297-1.937,9.367-.16" class="cls-13"/><path d="M184.911,86.186c3.07-2.1,6.297-1.94,9.367-.163" class="cls-13"/><path d="M211.348,130.852c-1.7.274-3.167.647-4.43,1.09-1.614.567-2.894,1.247-3.894,1.977-.943.693-1.636,1.433-2.12,2.166-.663.997-.936,1.984-.936,2.827,0,.113,0,.22.003.327.017,2.933.33,3.396,3.063,6.13,3.23,3.23,9.85,9.203,9.85,9.203,2.917,2.677,4.827,4.527,8.697,5.277,1.27.246,2.75.373,4.543.373h11.947c3.713,0,6.456-1.937,5.003-6.457-.77-2.4-3.727-8.85-8.453-14.373" class="cls-13"/><path d="M234.617,139.392c-.993-1.16-2.063-2.277-3.206-3.307-3.677-3.313-8.117-5.73-13.2-5.73-2.62,0-4.89.18-6.857.497" class="cls-13"/><path d="M200.291,139.235c3.94-2.773,9.73-1.983,13.547,1.174.406.336.79.7,1.146,1.086,3.714,4.037,7.103,10.494,6.617,18.244" class="cls-13"/><path d="M214.014,140.202s3.354-.817,9.704-1.04c2.983-.103,6.63-.077,10.9.23h.003c.02,0,.04.003.06.003" class="cls-13"/><path d="M211.271,130.839s.027,0,.077.013c0,0,0,.003.006,0,.667.133,5.207,1.143,9.777,5.233.863.774,1.73,1.657,2.57,2.667" class="cls-13"/><path d="M143.622,127.772c1.776-1.613,3.873-1.613,10.009-1.613h39.717c7.426,0,8.233,1.29,13.4,5.166" class="cls-13"/><path d="M202.875,133.585c-3.39-2.746-3.554-2.906-8.074-2.906h-37.456c-4.683,0-7.75-.323-7.91,1.13" class="cls-13"/><path d="M191.418,52.631l.332.295.332-.295,5.497-4.886c.825-.734.9-1.998.166-2.824-.734-.826-1.998-.9-2.824-.166l-1.171,1.041v-5.046c0-1.105-.895-2-2-2s-2,.895-2,2v5.046l-1.171-1.041c-.826-.734-2.09-.66-2.824.166-.734.826-.659,2.09.166,2.824l5.497,4.886ZM187.25,53.757c0-1.105-.895-2-2-2s-2,.895-2,2v4c0,1.104.895,2,2,2h13c1.105,0,2-.896,2-2v-4c0-1.105-.895-2-2-2s-2,.895-2,2v2h-9v-2Z" class="cls-11"/></svg>
\ No newline at end of file
diff --git a/assets/images/connection-complete.svg b/assets/images/connection-complete.svg
index fbfb2b041358..d864d9a33626 100644
--- a/assets/images/connection-complete.svg
+++ b/assets/images/connection-complete.svg
@@ -1,330 +1 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 28.1.0, 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 273 188" style="enable-background:new 0 0 273 188;" xml:space="preserve">
-<style type="text/css">
-	.st0{fill:#03D47C;}
-	.st1{fill:#4ED7DE;}
-	.st2{fill:#50EEF6;}
-	.st3{fill:#28736D;}
-	.st4{fill:#4BA6A6;}
-	.st5{fill:#99F6FF;}
-	.st6{fill:#8DC8FF;}
-	.st7{fill:#5BE3AA;}
-	.st8{fill-rule:evenodd;clip-rule:evenodd;fill:#0164BF;}
-	.st9{fill:none;stroke:#002140;stroke-width:0.9999;stroke-linecap:round;stroke-linejoin:round;}
-	.st10{fill:#5AB0FF;}
-	.st11{fill:none;stroke:#002140;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;}
-	.st12{fill:#002140;}
-</style>
-<path class="st0" d="M221.628,31.19c0-1.683-1.374-3.06-3.057-3.06h-53.46c-1.68,0-3.056,1.377-3.056,3.06v36.503
-	c0,1.683,1.376,3.06,3.056,3.06h53.46c1.683,0,3.057-1.377,3.057-3.06V31.19z"/>
-<path class="st1" d="M221.131,136.085c-4.57-4.09-9.11-5.1-9.777-5.233c1.967-0.317,4.237-0.497,6.857-0.497
-	c5.083,0,9.523,2.417,13.2,5.73H221.131z"/>
-<path class="st2" d="M20.726,124.339c-0.153-0.097-0.303-0.2-0.447-0.307c-0.24-0.18-0.473-0.37-0.693-0.576l1.193,0.9
-	c0,0-0.037-0.01-0.05-0.014h-0.003V124.339z"/>
-<path class="st2" d="M21.313,127.286c0.437-0.587,1.097-0.954,2.07-1.18C22.813,126.469,21.88,126.946,21.313,127.286z"/>
-<path class="st1" d="M223.701,138.752c-0.84-1.01-1.707-1.893-2.57-2.667h10.28c1.143,1.03,2.213,2.147,3.206,3.307
-	c-4.27-0.307-7.916-0.333-10.899-0.23L223.701,138.752z"/>
-<path class="st1" d="M214.984,141.495c-0.356-0.386-0.74-0.75-1.146-1.086l0.176-0.207c0,0,3.354-0.817,9.704-1.04
-	c2.983-0.103,6.629-0.077,10.899,0.23h0.004c4.726,5.523,7.683,11.973,8.453,14.373c1.453,4.52-1.29,6.457-5.003,6.457h-11.947
-	c-1.793,0-3.273-0.127-4.543-0.373l0.02-0.11C222.088,151.989,218.698,145.532,214.984,141.495z"/>
-<path class="st1" d="M221.628,31.19c0-1.683-1.374-3.06-3.057-3.06h-53.46c-1.68,0-3.056,1.377-3.056,3.06v36.503
-	c0,1.683,1.376,3.06,3.056,3.06h53.46c1.683,0,3.057-1.377,3.057-3.06V31.19z M222.861,77.776h-62.58
-	c-1.509,0-2.899-0.54-3.983-1.437c-1.396-1.153-2.29-2.897-2.29-4.837V27.22c0-3.45,2.824-6.273,6.273-6.273h62.58
-	c1.403,0,2.703,0.467,3.75,1.25c1.53,1.147,2.526,2.973,2.526,5.023v44.283C229.137,74.953,226.314,77.776,222.861,77.776z"/>
-<path class="st2" d="M95.672,158.715h-35.52c-4.52,0-6.03-0.86-10.333-4.733c-4.307-3.877-28.416-26.05-28.416-26.05l-0.38-0.166
-	c0.083-0.177,0.18-0.337,0.287-0.48h0.003c0.567-0.34,1.5-0.817,2.07-1.18c1.11-0.254,2.633-0.324,4.693-0.324h104.622
-	c4.344,0,7.847,0.56,10.847,2.137c0.717,0.377,1.403,0.81,2.067,1.307c0.646,0.483,1.823,1.489,3.326,2.826
-	c6.517,5.79,19.2,17.757,21.647,20.207c1.036,1.036,1.816,1.92,2.396,2.763l-0.243,0.25c0,0,0.86,3.443-3.447,3.443h-41.759v-0.43
-	c0,0-2.37-2.366-5.6-5.166c-2.187-1.897-4.52-3.227-9.04-3.227H91.149c-3.873,0-4.09,2.367-1.29,4.52
-	C92.656,156.565,95.672,158.715,95.672,158.715z M101.269,129.872h-58.77c-6.183,0-6.73,2.493-4.463,5.17
-	c0.18,0.213,0.377,0.427,0.59,0.64c2.153,2.153,3.713,3.597,5.517,5.253c0.63,0.577,1.29,1.18,2.017,1.85
-	c2.8,2.584,5.813,3.447,10.98,3.447h89.766c6.027,0,8.193-0.443,4.737-4.307c-0.39-0.436-0.764-0.846-1.12-1.236
-	c-2.257-2.45-3.98-4.084-6.077-5.8c-0.703-0.574-1.453-1.16-2.277-1.79c-3.883-2.97-9.16-3.207-14.826-3.223
-	c-0.507-0.004-1.02-0.004-1.533-0.004H101.269z"/>
-<path class="st3" d="M23.383,126.106c-0.973,0.226-1.633,0.593-2.07,1.18H21.31c-0.203,0.123-0.36,0.23-0.433,0.303
-	c-0.05,0.05-0.09,0.033-0.13-0.033c0.007-0.124,0.01-0.25,0.01-0.377c0-0.537-0.077-1.263-0.193-1.927
-	c-0.003-0.543,0.007-0.963,0.007-0.963s0.057,0.017,0.157,0.05h0.003c0.063,0.047,0.127,0.087,0.193,0.127l0.023,0.013
-	c0.85,0.51,1.793,0.877,2.803,1.057c0.083,0.056,0.133,0.106,0.133,0.143C23.883,125.766,23.683,125.922,23.383,126.106z"/>
-<path class="st4" d="M99,48.5H25.236c-4.593,0-8.353,3.76-8.353,8.353v60.466c0,2.417,1.04,4.603,2.693,6.13l-3.757-2.83
-	l-4.55-3.423c-2.963-2.08-4.907-5.517-4.907-9.39V53.56c0-6.307,5.157-11.463,11.463-11.463h71.717
-	C89.543,42.096,97.063,47.046,99,48.5C98.593,48.136,99.847,49.133,99,48.5z"/>
-<path class="st1" d="M199.968,138.912c0-0.843,0.273-1.83,0.936-2.827h20.227c0.863,0.774,1.73,1.657,2.57,2.667l0.017,0.41
-	c-6.35,0.223-9.704,1.04-9.704,1.04l-0.176,0.207c-3.817-3.157-9.607-3.947-13.547-1.174h-0.32
-	C199.968,139.132,199.968,139.025,199.968,138.912z"/>
-<path class="st3" d="M185.848,113.602c-1.427,0.41-2.95,0.607-4.5,0.607h-5.113c1.776-3.067,1.936-6.297-0.16-9.363v-0.377h2.69
-	c1.553,0,2.75-0.203,3.653-0.637l0.863,0.38c2.794,2.454,3.434,5.624,2.47,9.034L185.848,113.602z"/>
-<path class="st2" d="M20.923,124.466c-0.067-0.04-0.13-0.08-0.193-0.124c0.013,0.004,0.033,0.01,0.05,0.014
-	c0,0,0.002,0.001,0.007,0.003L20.923,124.466z"/>
-<path class="st5" d="M127.342,129.876c5.666,0.016,10.943,0.253,14.826,3.223c0.824,0.63,1.574,1.216,2.277,1.79l-0.123,0.15
-	h-11.824l-5.156-4.953V129.876z"/>
-<path class="st1" d="M203.024,133.919c1-0.73,2.28-1.41,3.894-1.977c1.263-0.443,2.73-0.817,4.43-1.09c0,0,0,0.003,0.006,0
-	c0.667,0.133,5.207,1.143,9.777,5.233h-20.227C201.388,135.352,202.081,134.612,203.024,133.919z"/>
-<path class="st3" d="M176.075,104.846c2.096,3.066,1.936,6.296,0.16,9.363h-9.15c1.776-3.067,1.94-6.297-0.16-9.363v-0.377h9.15
-	V104.846z"/>
-<path class="st6" d="M200.904,136.085c-0.663,0.997-0.936,1.984-0.936,2.827c0,0.113,0,0.22,0.003,0.327
-	c0.017,2.933,0.33,3.396,3.063,6.13c3.23,3.23,9.85,9.203,9.85,9.203c2.917,2.677,4.827,4.527,8.697,5.277
-	c1.27,0.246,2.75,0.373,4.543,0.373h11.947c3.713,0,6.456-1.937,5.003-6.457c-0.77-2.4-3.727-8.85-8.453-14.373h-0.004
-	c-0.993-1.16-2.063-2.277-3.206-3.307h4.076c6.297,0,7.427,0.084,11.624,3.31c4.2,3.23,18.969,17.517,22.766,21.314
-	c1.063,1.063,1.697,2.41,1.547,3.539c-0.164,1.274-1.32,2.27-3.97,2.27h-53.28c-6.616,0-9.04,0.97-14.69-3.713
-	c-5.653-4.68-17.276-15.496-21.473-19.533c-1.236-1.187-1.826-2.3-1.936-3.273c-0.267-2.344,2.25-3.914,5.326-3.914H200.904z"/>
-<path class="st2" d="M23.75,125.536c-1.01-0.18-1.953-0.547-2.803-1.057l-0.023-0.013l-0.137-0.107
-	C21.42,124.572,23.243,125.192,23.75,125.536z"/>
-<path class="st4" d="M20.61,128.766c-0.513,2.739-2.323,4.763-4.48,4.763c-1.307,0-2.487-0.744-3.327-1.937
-	c-0.807-1.143-1.303-2.696-1.303-4.413c0-3.277,1.81-5.973,4.133-6.313l0.187-0.247l3.757,2.83l0.01,0.007
-	c0.22,0.206,0.453,0.396,0.693,0.576c0.103,0.324,0.203,0.757,0.283,1.22c0.003,0.86,0.037,2.027,0.183,2.304
-	C20.73,127.972,20.683,128.376,20.61,128.766z"/>
-<path class="st2" d="M133.492,125.672H25.236c-0.507,0-1.007-0.046-1.487-0.136c-0.507-0.344-2.33-0.964-2.963-1.177
-	c0,0-0.002-0.001-0.007-0.003l-1.193-0.9l-0.01-0.007c-1.653-1.527-2.693-3.713-2.693-6.13V56.853c0-4.593,3.76-8.353,8.353-8.353
-	h67.666c0.527,0.463,0.157,6.527,0.157,8.073H69.062H30.69c-2.977,0-5.41,2.433-5.41,5.41v48.913c0,2.976,2.433,5.413,5.41,5.413
-	h96.702c2.976,0,5.413-2.437,5.413-5.413V61.983c0-2.977-2.437-5.41-5.413-5.41H93.059c0.02-0.297,0.03-0.62,0.03-0.97
-	c0-3.23-0.187-5.003-0.187-7.103c0.017,0.157,0-0.167,0,0h40.59c1.58,0,3.06,0.443,4.323,1.213c2.413,1.47,4.03,4.127,4.03,7.14
-	v60.466C141.845,121.916,138.088,125.672,133.492,125.672z"/>
-<path class="st7" d="M62.583,78.553c-1.35,0-2.16-1.057-2.16-2.877c0-1.82,0.81-2.88,2.16-2.88c1.35,0,2.157,1.037,2.157,2.88
-	C64.739,77.519,63.929,78.553,62.583,78.553z"/>
-<path class="st3" d="M194.278,86.023c-3.07-1.777-6.297-1.937-9.367,0.163h-0.12v-8.41h10.117v8.247H194.278z"/>
-<path class="st4" d="M156.162,76.509l-6.87-5.19c-1.87-1.583-3.06-3.943-3.06-6.57V23.61c0-4.737,3.873-8.61,8.61-8.61h59.799
-	c2.247,0,3.847,0.887,5.833,2.29l6.243,4.767l-0.106,0.14c-1.047-0.783-2.347-1.25-3.75-1.25h-62.58
-	c-3.449,0-6.273,2.823-6.273,6.273v44.283c0,1.94,0.894,3.683,2.29,4.837L156.162,76.509z"/>
-<path class="st4" d="M20.563,125.252c0.117,0.664,0.193,1.39,0.193,1.927c0,0.127-0.003,0.253-0.01,0.377
-	C20.6,127.279,20.566,126.112,20.563,125.252z"/>
-<path class="st5" d="M96.532,140.849H84.476v-0.214l-5.65-5.596h12.42l5.287,5.163V140.849z"/>
-<path class="st4" d="M122.732,42.096c2.13,0,4.13,0.59,5.843,1.61l9.387,5.777l-0.144,0.23c-1.263-0.77-2.743-1.213-4.323-1.213
-	H92.906c-0.147-1.84-1.183-3.163-3.043-4.36c-1.067-0.687-2.137-1.373-3.17-2.043h36.043H122.732z"/>
-<path class="st5" d="M111.602,140.849h-15.07v-0.647l-5.287-5.163h14.977l5.38,5.38V140.849z"/>
-<path class="st5" d="M143.702,146.232h-13.724v-0.43l-5.156-4.953h13.723l5.157,4.953V146.232z"/>
-<path class="st7" d="M95.409,77.483l0.207-0.953c0.323,0.093,0.673,0.18,1.05,0.267l0.9,0.203c0.947,0.203,1.283,0.643,1.283,1.073
-	c0,0.613-0.543,0.887-1.487,0.887C96.126,78.959,95.565,78.506,95.409,77.483z"/>
-<path class="st5" d="M112.892,149.892c4.52,0,6.853,1.33,9.04,3.227c3.23,2.8,5.6,5.166,5.6,5.166v0.43h-31.86
-	c0,0-3.017-2.15-5.813-4.303c-2.8-2.153-2.583-4.52,1.29-4.52H112.892z"/>
-<path class="st5" d="M150.348,140.849h-11.803l-6.047-5.81h11.824l0.123-0.15c2.097,1.716,3.82,3.35,6.077,5.8L150.348,140.849z"/>
-<path class="st7" d="M97.242,72.053c1.057,0,1.62,0.343,1.62,1.363h3.94v4.407h-0.4c0-1.95-1.313-2.833-4.326-3.517l-0.9-0.2
-	c-0.947-0.207-1.283-0.617-1.283-1.047C95.892,72.446,96.409,72.053,97.242,72.053z"/>
-<path class="st5" d="M58.726,129.872v0.213l5.157,4.954h-12.35l-5.157-4.954v-0.213H58.726z"/>
-<path class="st7" d="M74.679,78.689c-1.1,0-1.933-0.633-2.133-2.25h7.667v-0.47h0.583v1.483h-4.207
-	C76.432,78.059,75.959,78.689,74.679,78.689z"/>
-<path class="st3" d="M157.938,114.209c1.773-3.067,1.937-6.297-0.163-9.363v-0.377h9.15v0.377c2.1,3.066,1.936,6.296,0.16,9.363
-	H157.938z"/>
-<path class="st4" d="M21.023,127.766l0.38,0.166c0,0,24.11,22.173,28.416,26.05c4.303,3.873,5.813,4.733,10.333,4.733h109.139
-	c4.307,0,3.447-3.443,3.447-3.443l0.243-0.25c1.107,1.613,1.477,3.083,1.477,5.2v6.03c0,3.443-1.29,4.736-6.887,4.736H60.153
-	c-7.537,0-9.473-1.51-13.563-4.953c-0.437-0.367-0.99-0.84-1.633-1.393l-0.02-0.357c2.817-0.173,3.16-1.066,3.16-2.986
-	c0-2.15,0-2.797-1.613-4.304c0,0-0.97-0.863-3.337-2.8c-2.37-1.936-3.23-1.72-6.46-1.72c-1.953,0-4.067-0.316-5.43,0.34
-	l-0.103-0.196c-2.787-2.444-5.15-4.517-6.307-5.527c-3.443-3.013-4.303-4.52-4.303-8.397v-7.75c0-0.849,0.047-1.563,0.16-2.159
-	C20.78,128.399,20.883,128.059,21.023,127.766z"/>
-<path class="st5" d="M38.036,135.042c-2.267-2.677-1.72-5.17,4.463-5.17h3.877v0.213l5.157,4.954H38.036V135.042z"/>
-<path class="st3" d="M11.933,137.405c-4.09,0-4.737,3.66-1.723,6.887c3.013,3.23,6.673,6.677,9.687,9.257
-	c3.013,2.583,4.413,2.476,6.567,2.476h5.703c2.583,0,3.23,5.06,0.217,5.06c-3.013,0,0.647,0-5.597,0
-	c-6.243,0-7.967-1.293-11.84-4.52c-3.877-3.23-4.09-4.09-8.827-8.396c-4.737-4.307-4.09-6.027-4.09-9.257s3.013-7.32,7.533-7.32
-	h3.24c0.84,1.193,2.02,1.937,3.327,1.937c2.157,0,3.967-2.024,4.48-4.763l0.093,0.02c-0.113,0.596-0.16,1.309-0.16,2.159v6.46
-	H11.933z"/>
-<path class="st7" d="M56.432,70.123h0.503v11.11h-0.257l-3.937-5.737L56.432,70.123z"/>
-<path class="st3" d="M185.468,100.492l-0.793-0.09c0.08-0.526,0.116-1.106,0.116-1.746v-3.323h0.12
-	c3.07-2.097,6.297-1.937,9.367-0.16h0.63v5.424c0,2.136-0.33,4.003-0.92,5.61l-0.343-0.127
-	C192.055,102.716,189.365,100.606,185.468,100.492z"/>
-<path class="st5" d="M124.822,140.849h-13.22v-0.43l-5.38-5.38h12.553L124.822,140.849z"/>
-<path class="st5" d="M86.172,129.872v0.213l5.073,4.954h-12.42l-5.003-4.954v-0.213H86.172z"/>
-<path class="st3" d="M148.788,114.209c1.777-3.067,1.937-6.297-0.163-9.363v-0.377h9.15v0.377c2.1,3.066,1.936,6.296,0.163,9.363
-	H148.788z"/>
-<path class="st3" d="M148.938,132.052c-1.503-1.337-2.68-2.343-3.326-2.826c-0.664-0.497-1.35-0.93-2.067-1.307l0.077-0.147
-	c1.776-1.613,3.873-1.613,10.01-1.613h39.716c7.426,0,8.233,1.29,13.4,5.166l0.17,0.617c-1.614,0.567-2.894,1.247-3.894,1.977
-	l-0.15-0.334c-3.39-2.746-3.553-2.906-8.073-2.906h-37.456c-4.683,0-7.75-0.324-7.91,1.13L148.938,132.052z"/>
-<path class="st3" d="M141.845,104.469h6.78v0.377c2.1,3.066,1.94,6.296,0.163,9.363h-6.943V104.469z"/>
-<path class="st5" d="M127.342,130.085l5.156,4.954h-13.723l-5.156-4.954v-0.213h12.19c0.513,0,1.026,0,1.533,0.003V130.085z"/>
-<path class="st5" d="M69.929,140.849h-12.35l-6.047-5.81h12.35L69.929,140.849z"/>
-<path class="st3" d="M184.911,86.186c3.07-2.1,6.297-1.94,9.367-0.163h0.63v9.15h-0.63c-3.07-1.777-6.297-1.937-9.367,0.16h-0.12
-	v-9.146H184.911z"/>
-<path class="st5" d="M75.086,146.232h-12.35v-0.43l-5.157-4.953h12.35l5.157,4.953V146.232z"/>
-<path class="st5" d="M101.269,129.872v0.213l4.953,4.954H91.245l-5.073-4.954v-0.213H101.269z"/>
-<path class="st8" d="M30.689,56.573c-2.977,0-5.41,2.433-5.41,5.41v48.913c0,2.976,2.433,5.413,5.41,5.413h96.703
-	c2.976,0,5.413-2.437,5.413-5.413V61.983c0-2.977-2.437-5.41-5.413-5.41H30.689z"/>
-<path class="st1" d="M119.035,84.622c1.022,0,1.858,0.835,1.858,1.857c0,0.511-0.208,0.976-0.545,1.313
-	c-0.336,0.336-0.802,0.544-1.313,0.544h-7.511c-1.022,0-1.857-0.835-1.857-1.857c0-0.511,0.208-0.976,0.544-1.313
-	c0.337-0.337,0.802-0.544,1.313-0.544H119.035z"/>
-<path class="st1" d="M119.035,92.931c1.022,0,1.858,0.835,1.858,1.857c0,0.511-0.208,0.976-0.545,1.313
-	c-0.336,0.337-0.802,0.544-1.313,0.544h-7.511c-1.022,0-1.857-0.835-1.857-1.857c0-0.511,0.208-0.976,0.544-1.313
-	c0.337-0.337,0.802-0.544,1.313-0.544H119.035z"/>
-<path class="st1" d="M119.035,101.24c1.022,0,1.858,0.835,1.858,1.857c0,0.511-0.208,0.976-0.545,1.313
-	c-0.336,0.336-0.802,0.544-1.313,0.544h-7.511c-1.022,0-1.857-0.835-1.857-1.857c0-0.511,0.208-0.977,0.544-1.313
-	c0.337-0.337,0.802-0.544,1.313-0.544H119.035z"/>
-<path class="st1" d="M105.326,84.622c1.022,0,1.857,0.835,1.857,1.857c0,0.511-0.208,0.976-0.544,1.313
-	c-0.337,0.336-0.802,0.544-1.313,0.544h-7.511c-1.022,0-1.857-0.835-1.857-1.857c0-0.511,0.208-0.976,0.544-1.313
-	s0.802-0.544,1.313-0.544H105.326z"/>
-<path class="st1" d="M105.326,92.931c1.022,0,1.857,0.835,1.857,1.857c0,0.511-0.208,0.976-0.544,1.313
-	c-0.337,0.337-0.802,0.544-1.313,0.544h-7.511c-1.022,0-1.857-0.835-1.857-1.857c0-0.511,0.208-0.976,0.544-1.313
-	s0.802-0.544,1.313-0.544H105.326z"/>
-<path class="st1" d="M105.326,101.24c1.022,0,1.857,0.835,1.857,1.857c0,0.511-0.208,0.976-0.544,1.313
-	c-0.337,0.336-0.802,0.544-1.313,0.544h-7.511c-1.022,0-1.857-0.835-1.857-1.857c0-0.511,0.208-0.977,0.544-1.313
-	c0.337-0.337,0.802-0.544,1.313-0.544H105.326z"/>
-<path class="st1" d="M63.831,67.609c1.022,0,1.857,0.839,1.857,1.861c0,0.507-0.208,0.972-0.544,1.309
-	c-0.336,0.337-0.802,0.548-1.313,0.548H40.566c-1.022,0-1.857-0.839-1.857-1.857c0-0.511,0.208-0.976,0.544-1.313
-	c0.337-0.341,0.802-0.548,1.313-0.548H63.831z"/>
-<path class="st1" d="M63.831,93.367c1.022,0,1.857,0.839,1.857,1.861c0,0.507-0.208,0.972-0.544,1.309
-	c-0.336,0.337-0.802,0.548-1.313,0.548H40.566c-1.022,0-1.857-0.839-1.857-1.857c0-0.511,0.208-0.976,0.544-1.313
-	c0.337-0.341,0.802-0.548,1.313-0.548H63.831z"/>
-<path class="st1" d="M55.231,84.622c1.022,0,1.857,0.835,1.857,1.857c0,0.511-0.208,0.976-0.544,1.313
-	c-0.337,0.336-0.802,0.544-1.313,0.544H40.566c-1.022,0-1.857-0.835-1.857-1.857c0-0.511,0.208-0.976,0.544-1.313
-	c0.337-0.337,0.802-0.544,1.313-0.544H55.231z"/>
-<path class="st1" d="M55.231,101.24c1.022,0,1.857,0.835,1.857,1.857c0,0.511-0.208,0.976-0.544,1.313
-	c-0.337,0.336-0.802,0.544-1.313,0.544H40.566c-1.022,0-1.857-0.835-1.857-1.857c0-0.511,0.208-0.977,0.544-1.313
-	c0.337-0.337,0.802-0.544,1.313-0.544H55.231z"/>
-<path class="st9" d="M63.831,71.328H40.566c-1.022,0-1.857-0.839-1.857-1.857c0-0.511,0.208-0.976,0.544-1.313
-	c0.337-0.341,0.802-0.548,1.313-0.548h23.265c1.022,0,1.857,0.839,1.857,1.861c0,0.507-0.208,0.972-0.544,1.309
-	C64.807,71.116,64.342,71.328,63.831,71.328z"/>
-<path class="st9" d="M55.231,88.336H40.566c-1.022,0-1.857-0.835-1.857-1.857c0-0.511,0.208-0.976,0.544-1.313
-	c0.337-0.337,0.802-0.544,1.313-0.544h14.665c1.022,0,1.857,0.835,1.857,1.857c0,0.511-0.208,0.976-0.544,1.313
-	C56.208,88.128,55.742,88.336,55.231,88.336z"/>
-<path class="st9" d="M63.831,97.085H40.566c-1.022,0-1.857-0.839-1.857-1.857c0-0.511,0.208-0.976,0.544-1.313
-	c0.337-0.341,0.802-0.548,1.313-0.548h23.265c1.022,0,1.857,0.839,1.857,1.861c0,0.507-0.208,0.972-0.544,1.309
-	C64.807,96.873,64.342,97.085,63.831,97.085z"/>
-<path class="st9" d="M55.231,104.954H40.566c-1.022,0-1.857-0.835-1.857-1.857c0-0.511,0.208-0.977,0.544-1.313
-	c0.337-0.337,0.802-0.544,1.313-0.544h14.665c1.022,0,1.857,0.835,1.857,1.857c0,0.511-0.208,0.976-0.544,1.313
-	C56.208,104.746,55.742,104.954,55.231,104.954z"/>
-<path class="st9" d="M119.035,88.336h-7.511c-1.022,0-1.857-0.835-1.857-1.857c0-0.511,0.208-0.976,0.544-1.313
-	c0.337-0.337,0.802-0.544,1.313-0.544h7.511c1.022,0,1.858,0.835,1.858,1.857c0,0.511-0.208,0.976-0.545,1.313
-	C120.012,88.128,119.546,88.336,119.035,88.336z"/>
-<path class="st9" d="M119.035,104.954h-7.511c-1.022,0-1.857-0.835-1.857-1.857c0-0.511,0.208-0.977,0.544-1.313
-	c0.337-0.337,0.802-0.544,1.313-0.544h7.511c1.022,0,1.858,0.835,1.858,1.857c0,0.511-0.208,0.976-0.545,1.313
-	C120.012,104.746,119.546,104.954,119.035,104.954z"/>
-<path class="st9" d="M119.035,96.645h-7.511c-1.022,0-1.857-0.835-1.857-1.857c0-0.511,0.208-0.976,0.544-1.313
-	c0.337-0.337,0.802-0.544,1.313-0.544h7.511c1.022,0,1.858,0.835,1.858,1.857c0,0.511-0.208,0.976-0.545,1.313
-	C120.012,96.437,119.546,96.645,119.035,96.645z"/>
-<path class="st9" d="M105.326,88.336h-7.511c-1.022,0-1.857-0.835-1.857-1.857c0-0.511,0.208-0.976,0.544-1.313
-	s0.802-0.544,1.313-0.544h7.511c1.022,0,1.857,0.835,1.857,1.857c0,0.511-0.208,0.976-0.544,1.313
-	C106.302,88.128,105.837,88.336,105.326,88.336z"/>
-<path class="st9" d="M105.326,104.954h-7.511c-1.022,0-1.857-0.835-1.857-1.857c0-0.511,0.208-0.977,0.544-1.313
-	c0.337-0.337,0.802-0.544,1.313-0.544h7.511c1.022,0,1.857,0.835,1.857,1.857c0,0.511-0.208,0.976-0.544,1.313
-	C106.302,104.746,105.837,104.954,105.326,104.954z"/>
-<path class="st9" d="M105.326,96.645h-7.511c-1.022,0-1.857-0.835-1.857-1.857c0-0.511,0.208-0.976,0.544-1.313
-	s0.802-0.544,1.313-0.544h7.511c1.022,0,1.857,0.835,1.857,1.857c0,0.511-0.208,0.976-0.544,1.313
-	C106.302,96.437,105.837,96.645,105.326,96.645z"/>
-<path class="st9" d="M91.205,87.551h-2.933"/>
-<path class="st9" d="M82.896,87.551h-2.933"/>
-<path class="st9" d="M74.587,87.551h-2.933"/>
-<path class="st9" d="M66.278,87.551h-2.933"/>
-<path class="st9" d="M91.205,96.275h-2.933"/>
-<path class="st9" d="M82.896,96.275h-2.933"/>
-<path class="st9" d="M74.587,96.275h-2.933"/>
-<path class="st9" d="M91.205,104.999h-2.933"/>
-<path class="st9" d="M82.896,104.999h-2.933"/>
-<path class="st9" d="M74.587,104.999h-2.933"/>
-<path class="st9" d="M66.278,104.999h-2.933"/>
-<path class="st9" d="M99.161,67.269h21.437"/>
-<path class="st9" d="M99.161,71.423h21.437"/>
-<path class="st9" d="M39.108,78.199h81.215"/>
-<path class="st4" d="M32.383,161.085c3.013,0,2.367-5.06-0.217-5.06h-2.367v-0.323c0-1.613,0.57-2.457,1.457-2.887
-	c1.363-0.656,3.477-0.34,5.43-0.34c3.23,0,4.09-0.216,6.46,1.72c2.367,1.937,3.337,2.8,3.337,2.8
-	c1.613,1.507,1.613,2.154,1.613,4.304c0,1.92-0.343,2.813-3.16,2.986c-0.343,0.02-0.723,0.03-1.143,0.03h-6.673
-	C34.966,164.315,32.383,161.085,32.383,161.085z"/>
-<path class="st5" d="M129.978,146.232H75.086v-0.43l-5.157-4.953h54.893l5.156,4.953V146.232z"/>
-<path class="st5" d="M138.545,140.849h-13.723l-6.047-5.81h13.723L138.545,140.849z"/>
-<path class="st5" d="M84.476,140.849H69.929l-6.047-5.81h14.943l5.65,5.596V140.849z"/>
-<path class="st5" d="M44.223,140.849h13.357l5.157,4.953v0.43h-5.597c-5.167,0-8.18-0.863-10.98-3.447
-	c-0.727-0.67-1.387-1.273-2.017-1.85L44.223,140.849z"/>
-<path class="st5" d="M38.409,135.039h13.123l6.047,5.81H44.223l-0.08,0.086c-1.803-1.656-3.363-3.1-5.517-5.253
-	c-0.213-0.213-0.41-0.427-0.59-0.64h0.373V135.039z"/>
-<path class="st1" d="M199.971,139.239h0.32c3.94-2.777,9.73-1.987,13.547,1.17c0.406,0.336,0.79,0.7,1.146,1.086
-	c3.714,4.037,7.104,10.494,6.617,18.244l-0.02,0.11c-3.87-0.75-5.78-2.6-8.697-5.277c0,0-6.62-5.973-9.85-9.203
-	C200.301,142.635,199.988,142.172,199.971,139.239z"/>
-<path class="st5" d="M73.822,129.872v0.213l5.003,4.954H63.882l-5.157-4.954v-0.213H73.822z"/>
-<path class="st3" d="M182.418,103.832c1.313-0.63,2.003-1.746,2.257-3.43l0.793,0.09c3.897,0.114,6.587,2.224,8.177,5.587
-	l0.343,0.127c-1.453,3.963-4.5,6.36-8.14,7.396l-0.097-0.356c0.964-3.41,0.324-6.58-2.47-9.034L182.418,103.832z"/>
-<path class="st5" d="M113.619,129.872v0.213l5.156,4.954h-12.553l-4.953-4.954v-0.213H113.619z"/>
-<path class="st5" d="M151.642,141.925c3.456,3.864,1.29,4.307-4.737,4.307h-3.203v-0.43l-5.157-4.953h11.803l0.174-0.16
-	C150.878,141.079,151.252,141.489,151.642,141.925z"/>
-<path class="st10" d="M271.49,164.258l-0.08,6.504c-0.213,1.22-1.38,2.163-3.956,2.163h-53.28c-6.616,0-9.04,0.967-14.69-3.713
-	c-5.653-4.684-17.276-15.5-21.473-19.537c-0.913-0.876-1.473-1.71-1.75-2.48l-0.186-0.696v-6.5c0.11,0.973,0.7,2.086,1.936,3.273
-	c4.197,4.037,15.82,14.853,21.473,19.533c5.65,4.683,8.074,3.713,14.69,3.713h53.28c2.65,0,3.806-0.996,3.97-2.27L271.49,164.258z"
-	/>
-<path class="st11" d="M231.411,136.085h4.076c6.297,0,7.427,0.084,11.624,3.31c4.2,3.23,18.969,17.517,22.766,21.314
-	c1.063,1.063,1.697,2.41,1.547,3.539c-0.164,1.274-1.32,2.27-3.97,2.27h-53.28c-6.616,0-9.04,0.97-14.69-3.713
-	c-5.653-4.68-17.276-15.496-21.473-19.533c-1.236-1.187-1.826-2.3-1.936-3.273c-0.267-2.344,2.25-3.914,5.326-3.914h19.503"/>
-<path class="st11" d="M176.261,147.195c0.277,0.77,0.837,1.604,1.75,2.48c4.197,4.037,15.82,14.853,21.473,19.537
-	c5.65,4.68,8.074,3.713,14.69,3.713h53.28c2.576,0,3.743-0.943,3.956-2.163l0.08-6.504"/>
-<path class="st11" d="M176.075,139.395v0.604v6.5"/>
-<path class="st11" d="M93.059,56.573h34.333c2.976,0,5.413,2.433,5.413,5.41v48.913c0,2.976-2.437,5.413-5.413,5.413H30.69
-	c-2.977,0-5.41-2.437-5.41-5.413V61.983c0-2.977,2.433-5.41,5.41-5.41H93.059z"/>
-<path class="st11" d="M92.902,48.5h40.59c1.58,0,3.06,0.443,4.323,1.213c2.413,1.47,4.03,4.127,4.03,7.14v60.466
-	c0,4.597-3.757,8.353-8.353,8.353H25.236c-0.507,0-1.007-0.046-1.487-0.136c-1.01-0.18-1.953-0.547-2.803-1.057"/>
-<path class="st11" d="M19.576,123.449c-1.653-1.527-2.693-3.713-2.693-6.13V56.853c0-4.593,3.76-8.353,8.353-8.353H93"/>
-<path class="st11" d="M20.923,124.466c-0.067-0.04-0.13-0.08-0.193-0.124h-0.003c-0.153-0.1-0.303-0.203-0.447-0.31
-	c-0.24-0.18-0.473-0.37-0.693-0.576"/>
-<path class="st11" d="M122.732,42.096c2.13,0,4.13,0.59,5.843,1.61c0.003,0,0.003,0.003,0.007,0.003"/>
-<path class="st11" d="M138.635,49.9l-0.677-0.417l-9.386-5.773"/>
-<path class="st11" d="M58.842,42.096H17.826c-6.307,0-11.463,5.157-11.463,11.463v54.246c0,3.873,1.943,7.31,4.907,9.39l4.55,3.423
-	l3.757,2.83l0.01,0.007l1.193,0.9c0,0,0.003,0.003,0.007,0.003l0.137,0.107l0.023,0.013l0.423,0.32"/>
-<path class="st11" d="M122.732,42.096H58.5"/>
-<path class="st11" d="M44.956,164.642c0.643,0.553,1.197,1.026,1.633,1.393c4.09,3.443,6.027,4.953,13.563,4.953h107.419
-	c5.597,0,6.887-1.293,6.887-4.736v-6.03c0-2.117-0.37-3.587-1.477-5.2c-0.58-0.843-1.36-1.727-2.396-2.763
-	c-2.447-2.45-15.13-14.417-21.647-20.207c-1.503-1.337-2.68-2.343-3.326-2.826c-0.664-0.497-1.35-0.93-2.067-1.307
-	c-3-1.577-6.503-2.137-10.847-2.137H28.076c-2.06,0-3.583,0.07-4.693,0.324c-0.973,0.226-1.633,0.593-2.07,1.18H21.31
-	c-0.107,0.143-0.203,0.303-0.287,0.48c-0.14,0.293-0.243,0.633-0.32,1.02c-0.113,0.596-0.16,1.309-0.16,2.159v7.75
-	c0,3.877,0.86,5.384,4.303,8.397c1.157,1.01,3.52,3.083,6.307,5.527"/>
-<path class="st11" d="M21.403,127.932c0,0,24.11,22.173,28.416,26.05c4.303,3.873,5.813,4.733,10.333,4.733h109.139
-	c4.307,0,3.447-3.443,3.447-3.443"/>
-<path class="st11" d="M95.672,158.715c0,0-3.017-2.15-5.813-4.303c-2.8-2.153-2.583-4.52,1.29-4.52h21.743
-	c4.52,0,6.853,1.33,9.04,3.227c3.23,2.8,5.6,5.166,5.6,5.166"/>
-<path class="st11" d="M143.702,146.232h3.203c6.027,0,8.193-0.443,4.737-4.307c-0.39-0.436-0.764-0.846-1.12-1.236
-	c-2.257-2.45-3.98-4.084-6.077-5.8c-0.703-0.574-1.453-1.16-2.277-1.79c-3.883-2.97-9.16-3.207-14.826-3.224
-	c-0.507-0.003-1.02-0.003-1.533-0.003h-83.31c-6.183,0-6.73,2.493-4.463,5.17c0.18,0.213,0.377,0.427,0.59,0.64
-	c2.153,2.153,3.713,3.597,5.517,5.253c0.63,0.577,1.29,1.18,2.017,1.85c2.8,2.584,5.813,3.447,10.98,3.447H143.702z"/>
-<path class="st11" d="M38.409,135.039h13.123h12.35h14.943h12.42h14.977h12.553h13.723h11.824"/>
-<path class="st11" d="M44.223,140.849h13.357h12.35h14.547h12.056h15.07h13.22h13.723h11.803"/>
-<path class="st11" d="M46.376,130.086l5.157,4.953l6.047,5.81l5.157,4.953"/>
-<path class="st11" d="M58.726,130.086l5.157,4.953l6.047,5.81l5.157,4.953"/>
-<path class="st11" d="M73.822,130.086l5.003,4.953l5.65,5.596"/>
-<path class="st11" d="M86.172,130.086l5.073,4.953l5.287,5.163"/>
-<path class="st11" d="M101.269,130.086l4.953,4.953l5.38,5.38"/>
-<path class="st11" d="M113.619,130.086l5.156,4.953l6.047,5.81l5.156,4.953"/>
-<path class="st11" d="M127.342,130.086l5.156,4.953l6.047,5.81l5.157,4.953"/>
-<path class="st11" d="M20.28,124.032c0.103,0.324,0.203,0.757,0.283,1.22c0.117,0.664,0.193,1.39,0.193,1.927
-	c0,0.127-0.003,0.253-0.01,0.377c-0.017,0.416-0.063,0.82-0.137,1.21c-0.513,2.739-2.323,4.763-4.48,4.763
-	c-1.307,0-2.487-0.744-3.327-1.937c-0.807-1.143-1.303-2.696-1.303-4.413c0-3.277,1.81-5.973,4.133-6.313"/>
-<path class="st11" d="M16.13,133.529h3.767"/>
-<path class="st11" d="M12.576,131.592H9.563c-4.52,0-7.533,4.09-7.533,7.32s-0.647,4.95,4.09,9.257
-	c4.737,4.306,4.95,5.166,8.827,8.396c3.873,3.227,5.597,4.52,11.84,4.52c6.243,0,2.583,0,5.597,0c3.013,0,2.367-5.06-0.217-5.06
-	h-5.703c-2.153,0-3.553,0.107-6.567-2.476c-3.013-2.58-6.673-6.027-9.687-9.257c-3.013-3.227-2.367-6.887,1.723-6.887h8.393"/>
-<path class="st11" d="M12.816,131.592h-0.013"/>
-<path class="st11" d="M12.803,131.592h-0.227"/>
-<path class="st11" d="M29.799,155.702c0-1.613,0.57-2.457,1.457-2.887c1.363-0.656,3.477-0.34,5.43-0.34
-	c3.23,0,4.09-0.216,6.46,1.72c2.367,1.937,3.337,2.8,3.337,2.8c1.613,1.507,1.613,2.154,1.613,4.304c0,1.92-0.343,2.813-3.16,2.986
-	c-0.343,0.02-0.723,0.03-1.143,0.03h-6.673c-2.153,0-4.737-3.23-4.737-3.23"/>
-<path class="st11" d="M141.952,104.469h36.813c1.553,0,2.75-0.203,3.653-0.637c1.313-0.63,2.003-1.746,2.257-3.43
-	c0.08-0.526,0.116-1.106,0.116-1.746V77.993"/>
-<path class="st11" d="M141.845,114.209h39.503c1.55,0,3.073-0.197,4.5-0.607c3.64-1.036,6.686-3.433,8.14-7.396
-	c0.59-1.607,0.92-3.474,0.92-5.61v-22.39"/>
-<path class="st11" d="M226.611,22.197c1.53,1.147,2.526,2.973,2.526,5.023v44.283c0,3.45-2.823,6.273-6.276,6.273h-62.58
-	c-1.509,0-2.899-0.54-3.983-1.437c-1.396-1.153-2.29-2.897-2.29-4.837V27.22c0-3.45,2.824-6.273,6.273-6.273h62.58
-	C224.264,20.947,225.564,21.413,226.611,22.197z"/>
-<path class="st11" d="M156.162,76.509l-6.87-5.19c-1.87-1.583-3.06-3.943-3.06-6.57V23.61c0-4.737,3.873-8.61,8.61-8.61h59.799
-	c2.247,0,3.847,0.887,5.833,2.29l6.243,4.767l1.084,0.827"/>
-<path class="st11" d="M221.628,67.693c0,1.683-1.374,3.06-3.057,3.06h-53.46c-1.68,0-3.056-1.377-3.056-3.06V31.19
-	c0-1.683,1.376-3.06,3.056-3.06h53.46c1.683,0,3.057,1.377,3.057,3.06V67.693z"/>
-<path class="st11" d="M148.625,104.846c2.1,3.066,1.94,6.296,0.163,9.363"/>
-<path class="st11" d="M157.775,104.846c2.1,3.066,1.936,6.296,0.163,9.363"/>
-<path class="st11" d="M166.925,104.846c2.1,3.066,1.936,6.296,0.16,9.363"/>
-<path class="st11" d="M176.075,104.846c2.096,3.066,1.936,6.296,0.16,9.363"/>
-<path class="st11" d="M183.281,104.212c2.794,2.454,3.434,5.624,2.47,9.034"/>
-<path class="st11" d="M185.468,100.492c3.897,0.114,6.587,2.224,8.177,5.587"/>
-<path class="st11" d="M184.911,95.332c3.07-2.097,6.297-1.937,9.367-0.16"/>
-<path class="st11" d="M184.911,86.186c3.07-2.1,6.297-1.94,9.367-0.163"/>
-<path class="st11" d="M211.348,130.852c-1.7,0.273-3.167,0.647-4.43,1.09c-1.614,0.567-2.894,1.247-3.894,1.977
-	c-0.943,0.693-1.636,1.433-2.12,2.166c-0.663,0.997-0.936,1.984-0.936,2.827c0,0.113,0,0.22,0.003,0.327
-	c0.017,2.933,0.33,3.396,3.063,6.13c3.23,3.23,9.85,9.203,9.85,9.203c2.917,2.677,4.827,4.527,8.697,5.277
-	c1.27,0.246,2.75,0.373,4.543,0.373h11.947c3.713,0,6.456-1.937,5.003-6.457c-0.77-2.4-3.727-8.85-8.453-14.373"/>
-<path class="st11" d="M234.617,139.392c-0.993-1.16-2.063-2.277-3.206-3.307c-3.677-3.313-8.117-5.73-13.2-5.73
-	c-2.62,0-4.89,0.18-6.857,0.497"/>
-<path class="st11" d="M200.291,139.235c3.94-2.773,9.73-1.983,13.547,1.174c0.406,0.336,0.79,0.7,1.146,1.086
-	c3.714,4.037,7.104,10.494,6.617,18.244"/>
-<path class="st11" d="M214.014,140.202c0,0,3.354-0.817,9.704-1.04c2.983-0.103,6.629-0.077,10.899,0.23h0.004
-	c0.02,0,0.04,0.003,0.06,0.003"/>
-<path class="st11" d="M211.271,130.839c0,0,0.027,0,0.077,0.013c0,0,0,0.003,0.006,0c0.667,0.133,5.207,1.143,9.777,5.233
-	c0.863,0.774,1.73,1.657,2.57,2.667"/>
-<path class="st11" d="M143.622,127.772c1.776-1.613,3.873-1.613,10.01-1.613h39.716c7.426,0,8.233,1.29,13.4,5.166"/>
-<path class="st11" d="M202.874,133.585c-3.39-2.746-3.553-2.906-8.073-2.906h-37.456c-4.683,0-7.75-0.323-7.91,1.13"/>
-<path class="st12" d="M181.422,49.685l-2.602,3.904c0,0,4.62-0.065,13.206,8.523c0,0,3.057-16.135,12.1-25.894l-0.39-0.52
-	l-3.514-1.561c0,0-6.896,7.351-10.278,20.233c0,0-4.359-4.033-8.524-4.684L181.422,49.685z"/>
-<path class="st11" d="M200.297,34.079c-3.087,2.726-9.332,13.937-10.416,20.312c-0.441-0.425-2.645-2.906-8.631-4.924
-	c-0.226,0.373-2.169,3.622-2.408,3.969c5.486,0.694,13.033,8.327,13.272,8.717c1.714-9.91,7.59-22.162,12.086-26.08
-	c-0.515-0.269-3.464-1.706-3.903-1.996V34.079z"/>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" id="Layer_1" x="0" y="0" version="1.1" viewBox="0 0 273 188" style="enable-background:new 0 0 273 188" xml:space="preserve"><style type="text/css">.st0{fill:#03d47c}.st1{fill:#4ed7de}.st2{fill:#50eef6}.st3{fill:#28736d}.st4{fill:#4ba6a6}.st5{fill:#99f6ff}.st6{fill:#8dc8ff}.st7{fill:#5be3aa}.st8{fill-rule:evenodd;clip-rule:evenodd;fill:#0164bf}.st9{fill:none;stroke:#002140;stroke-width:.9999;stroke-linecap:round;stroke-linejoin:round}.st10{fill:#5ab0ff}.st11{fill:none;stroke:#002140;stroke-width:1;stroke-linecap:round;stroke-linejoin:round}.st12{fill:#002140}</style><path d="M221.628,31.19c0-1.683-1.374-3.06-3.057-3.06h-53.46c-1.68,0-3.056,1.377-3.056,3.06v36.503	c0,1.683,1.376,3.06,3.056,3.06h53.46c1.683,0,3.057-1.377,3.057-3.06V31.19z" class="st0"/><path d="M221.131,136.085c-4.57-4.09-9.11-5.1-9.777-5.233c1.967-0.317,4.237-0.497,6.857-0.497	c5.083,0,9.523,2.417,13.2,5.73H221.131z" class="st1"/><path d="M20.726,124.339c-0.153-0.097-0.303-0.2-0.447-0.307c-0.24-0.18-0.473-0.37-0.693-0.576l1.193,0.9	c0,0-0.037-0.01-0.05-0.014h-0.003V124.339z" class="st2"/><path d="M21.313,127.286c0.437-0.587,1.097-0.954,2.07-1.18C22.813,126.469,21.88,126.946,21.313,127.286z" class="st2"/><path d="M223.701,138.752c-0.84-1.01-1.707-1.893-2.57-2.667h10.28c1.143,1.03,2.213,2.147,3.206,3.307	c-4.27-0.307-7.916-0.333-10.899-0.23L223.701,138.752z" class="st1"/><path d="M214.984,141.495c-0.356-0.386-0.74-0.75-1.146-1.086l0.176-0.207c0,0,3.354-0.817,9.704-1.04	c2.983-0.103,6.629-0.077,10.899,0.23h0.004c4.726,5.523,7.683,11.973,8.453,14.373c1.453,4.52-1.29,6.457-5.003,6.457h-11.947	c-1.793,0-3.273-0.127-4.543-0.373l0.02-0.11C222.088,151.989,218.698,145.532,214.984,141.495z" class="st1"/><path d="M221.628,31.19c0-1.683-1.374-3.06-3.057-3.06h-53.46c-1.68,0-3.056,1.377-3.056,3.06v36.503	c0,1.683,1.376,3.06,3.056,3.06h53.46c1.683,0,3.057-1.377,3.057-3.06V31.19z M222.861,77.776h-62.58	c-1.509,0-2.899-0.54-3.983-1.437c-1.396-1.153-2.29-2.897-2.29-4.837V27.22c0-3.45,2.824-6.273,6.273-6.273h62.58	c1.403,0,2.703,0.467,3.75,1.25c1.53,1.147,2.526,2.973,2.526,5.023v44.283C229.137,74.953,226.314,77.776,222.861,77.776z" class="st1"/><path d="M95.672,158.715h-35.52c-4.52,0-6.03-0.86-10.333-4.733c-4.307-3.877-28.416-26.05-28.416-26.05l-0.38-0.166	c0.083-0.177,0.18-0.337,0.287-0.48h0.003c0.567-0.34,1.5-0.817,2.07-1.18c1.11-0.254,2.633-0.324,4.693-0.324h104.622	c4.344,0,7.847,0.56,10.847,2.137c0.717,0.377,1.403,0.81,2.067,1.307c0.646,0.483,1.823,1.489,3.326,2.826	c6.517,5.79,19.2,17.757,21.647,20.207c1.036,1.036,1.816,1.92,2.396,2.763l-0.243,0.25c0,0,0.86,3.443-3.447,3.443h-41.759v-0.43	c0,0-2.37-2.366-5.6-5.166c-2.187-1.897-4.52-3.227-9.04-3.227H91.149c-3.873,0-4.09,2.367-1.29,4.52	C92.656,156.565,95.672,158.715,95.672,158.715z M101.269,129.872h-58.77c-6.183,0-6.73,2.493-4.463,5.17	c0.18,0.213,0.377,0.427,0.59,0.64c2.153,2.153,3.713,3.597,5.517,5.253c0.63,0.577,1.29,1.18,2.017,1.85	c2.8,2.584,5.813,3.447,10.98,3.447h89.766c6.027,0,8.193-0.443,4.737-4.307c-0.39-0.436-0.764-0.846-1.12-1.236	c-2.257-2.45-3.98-4.084-6.077-5.8c-0.703-0.574-1.453-1.16-2.277-1.79c-3.883-2.97-9.16-3.207-14.826-3.223	c-0.507-0.004-1.02-0.004-1.533-0.004H101.269z" class="st2"/><path d="M23.383,126.106c-0.973,0.226-1.633,0.593-2.07,1.18H21.31c-0.203,0.123-0.36,0.23-0.433,0.303	c-0.05,0.05-0.09,0.033-0.13-0.033c0.007-0.124,0.01-0.25,0.01-0.377c0-0.537-0.077-1.263-0.193-1.927	c-0.003-0.543,0.007-0.963,0.007-0.963s0.057,0.017,0.157,0.05h0.003c0.063,0.047,0.127,0.087,0.193,0.127l0.023,0.013	c0.85,0.51,1.793,0.877,2.803,1.057c0.083,0.056,0.133,0.106,0.133,0.143C23.883,125.766,23.683,125.922,23.383,126.106z" class="st3"/><path d="M99,48.5H25.236c-4.593,0-8.353,3.76-8.353,8.353v60.466c0,2.417,1.04,4.603,2.693,6.13l-3.757-2.83	l-4.55-3.423c-2.963-2.08-4.907-5.517-4.907-9.39V53.56c0-6.307,5.157-11.463,11.463-11.463h71.717	C89.543,42.096,97.063,47.046,99,48.5C98.593,48.136,99.847,49.133,99,48.5z" class="st4"/><path d="M199.968,138.912c0-0.843,0.273-1.83,0.936-2.827h20.227c0.863,0.774,1.73,1.657,2.57,2.667l0.017,0.41	c-6.35,0.223-9.704,1.04-9.704,1.04l-0.176,0.207c-3.817-3.157-9.607-3.947-13.547-1.174h-0.32	C199.968,139.132,199.968,139.025,199.968,138.912z" class="st1"/><path d="M185.848,113.602c-1.427,0.41-2.95,0.607-4.5,0.607h-5.113c1.776-3.067,1.936-6.297-0.16-9.363v-0.377h2.69	c1.553,0,2.75-0.203,3.653-0.637l0.863,0.38c2.794,2.454,3.434,5.624,2.47,9.034L185.848,113.602z" class="st3"/><path d="M20.923,124.466c-0.067-0.04-0.13-0.08-0.193-0.124c0.013,0.004,0.033,0.01,0.05,0.014	c0,0,0.002,0.001,0.007,0.003L20.923,124.466z" class="st2"/><path d="M127.342,129.876c5.666,0.016,10.943,0.253,14.826,3.223c0.824,0.63,1.574,1.216,2.277,1.79l-0.123,0.15	h-11.824l-5.156-4.953V129.876z" class="st5"/><path d="M203.024,133.919c1-0.73,2.28-1.41,3.894-1.977c1.263-0.443,2.73-0.817,4.43-1.09c0,0,0,0.003,0.006,0	c0.667,0.133,5.207,1.143,9.777,5.233h-20.227C201.388,135.352,202.081,134.612,203.024,133.919z" class="st1"/><path d="M176.075,104.846c2.096,3.066,1.936,6.296,0.16,9.363h-9.15c1.776-3.067,1.94-6.297-0.16-9.363v-0.377h9.15	V104.846z" class="st3"/><path d="M200.904,136.085c-0.663,0.997-0.936,1.984-0.936,2.827c0,0.113,0,0.22,0.003,0.327	c0.017,2.933,0.33,3.396,3.063,6.13c3.23,3.23,9.85,9.203,9.85,9.203c2.917,2.677,4.827,4.527,8.697,5.277	c1.27,0.246,2.75,0.373,4.543,0.373h11.947c3.713,0,6.456-1.937,5.003-6.457c-0.77-2.4-3.727-8.85-8.453-14.373h-0.004	c-0.993-1.16-2.063-2.277-3.206-3.307h4.076c6.297,0,7.427,0.084,11.624,3.31c4.2,3.23,18.969,17.517,22.766,21.314	c1.063,1.063,1.697,2.41,1.547,3.539c-0.164,1.274-1.32,2.27-3.97,2.27h-53.28c-6.616,0-9.04,0.97-14.69-3.713	c-5.653-4.68-17.276-15.496-21.473-19.533c-1.236-1.187-1.826-2.3-1.936-3.273c-0.267-2.344,2.25-3.914,5.326-3.914H200.904z" class="st6"/><path d="M23.75,125.536c-1.01-0.18-1.953-0.547-2.803-1.057l-0.023-0.013l-0.137-0.107	C21.42,124.572,23.243,125.192,23.75,125.536z" class="st2"/><path d="M20.61,128.766c-0.513,2.739-2.323,4.763-4.48,4.763c-1.307,0-2.487-0.744-3.327-1.937	c-0.807-1.143-1.303-2.696-1.303-4.413c0-3.277,1.81-5.973,4.133-6.313l0.187-0.247l3.757,2.83l0.01,0.007	c0.22,0.206,0.453,0.396,0.693,0.576c0.103,0.324,0.203,0.757,0.283,1.22c0.003,0.86,0.037,2.027,0.183,2.304	C20.73,127.972,20.683,128.376,20.61,128.766z" class="st4"/><path d="M133.492,125.672H25.236c-0.507,0-1.007-0.046-1.487-0.136c-0.507-0.344-2.33-0.964-2.963-1.177	c0,0-0.002-0.001-0.007-0.003l-1.193-0.9l-0.01-0.007c-1.653-1.527-2.693-3.713-2.693-6.13V56.853c0-4.593,3.76-8.353,8.353-8.353	h67.666c0.527,0.463,0.157,6.527,0.157,8.073H69.062H30.69c-2.977,0-5.41,2.433-5.41,5.41v48.913c0,2.976,2.433,5.413,5.41,5.413	h96.702c2.976,0,5.413-2.437,5.413-5.413V61.983c0-2.977-2.437-5.41-5.413-5.41H93.059c0.02-0.297,0.03-0.62,0.03-0.97	c0-3.23-0.187-5.003-0.187-7.103c0.017,0.157,0-0.167,0,0h40.59c1.58,0,3.06,0.443,4.323,1.213c2.413,1.47,4.03,4.127,4.03,7.14	v60.466C141.845,121.916,138.088,125.672,133.492,125.672z" class="st2"/><path d="M62.583,78.553c-1.35,0-2.16-1.057-2.16-2.877c0-1.82,0.81-2.88,2.16-2.88c1.35,0,2.157,1.037,2.157,2.88	C64.739,77.519,63.929,78.553,62.583,78.553z" class="st7"/><path d="M194.278,86.023c-3.07-1.777-6.297-1.937-9.367,0.163h-0.12v-8.41h10.117v8.247H194.278z" class="st3"/><path d="M156.162,76.509l-6.87-5.19c-1.87-1.583-3.06-3.943-3.06-6.57V23.61c0-4.737,3.873-8.61,8.61-8.61h59.799	c2.247,0,3.847,0.887,5.833,2.29l6.243,4.767l-0.106,0.14c-1.047-0.783-2.347-1.25-3.75-1.25h-62.58	c-3.449,0-6.273,2.823-6.273,6.273v44.283c0,1.94,0.894,3.683,2.29,4.837L156.162,76.509z" class="st4"/><path d="M20.563,125.252c0.117,0.664,0.193,1.39,0.193,1.927c0,0.127-0.003,0.253-0.01,0.377	C20.6,127.279,20.566,126.112,20.563,125.252z" class="st4"/><path d="M96.532,140.849H84.476v-0.214l-5.65-5.596h12.42l5.287,5.163V140.849z" class="st5"/><path d="M122.732,42.096c2.13,0,4.13,0.59,5.843,1.61l9.387,5.777l-0.144,0.23c-1.263-0.77-2.743-1.213-4.323-1.213	H92.906c-0.147-1.84-1.183-3.163-3.043-4.36c-1.067-0.687-2.137-1.373-3.17-2.043h36.043H122.732z" class="st4"/><path d="M111.602,140.849h-15.07v-0.647l-5.287-5.163h14.977l5.38,5.38V140.849z" class="st5"/><path d="M143.702,146.232h-13.724v-0.43l-5.156-4.953h13.723l5.157,4.953V146.232z" class="st5"/><path d="M95.409,77.483l0.207-0.953c0.323,0.093,0.673,0.18,1.05,0.267l0.9,0.203c0.947,0.203,1.283,0.643,1.283,1.073	c0,0.613-0.543,0.887-1.487,0.887C96.126,78.959,95.565,78.506,95.409,77.483z" class="st7"/><path d="M112.892,149.892c4.52,0,6.853,1.33,9.04,3.227c3.23,2.8,5.6,5.166,5.6,5.166v0.43h-31.86	c0,0-3.017-2.15-5.813-4.303c-2.8-2.153-2.583-4.52,1.29-4.52H112.892z" class="st5"/><path d="M150.348,140.849h-11.803l-6.047-5.81h11.824l0.123-0.15c2.097,1.716,3.82,3.35,6.077,5.8L150.348,140.849z" class="st5"/><path d="M97.242,72.053c1.057,0,1.62,0.343,1.62,1.363h3.94v4.407h-0.4c0-1.95-1.313-2.833-4.326-3.517l-0.9-0.2	c-0.947-0.207-1.283-0.617-1.283-1.047C95.892,72.446,96.409,72.053,97.242,72.053z" class="st7"/><path d="M58.726,129.872v0.213l5.157,4.954h-12.35l-5.157-4.954v-0.213H58.726z" class="st5"/><path d="M74.679,78.689c-1.1,0-1.933-0.633-2.133-2.25h7.667v-0.47h0.583v1.483h-4.207	C76.432,78.059,75.959,78.689,74.679,78.689z" class="st7"/><path d="M157.938,114.209c1.773-3.067,1.937-6.297-0.163-9.363v-0.377h9.15v0.377c2.1,3.066,1.936,6.296,0.16,9.363	H157.938z" class="st3"/><path d="M21.023,127.766l0.38,0.166c0,0,24.11,22.173,28.416,26.05c4.303,3.873,5.813,4.733,10.333,4.733h109.139	c4.307,0,3.447-3.443,3.447-3.443l0.243-0.25c1.107,1.613,1.477,3.083,1.477,5.2v6.03c0,3.443-1.29,4.736-6.887,4.736H60.153	c-7.537,0-9.473-1.51-13.563-4.953c-0.437-0.367-0.99-0.84-1.633-1.393l-0.02-0.357c2.817-0.173,3.16-1.066,3.16-2.986	c0-2.15,0-2.797-1.613-4.304c0,0-0.97-0.863-3.337-2.8c-2.37-1.936-3.23-1.72-6.46-1.72c-1.953,0-4.067-0.316-5.43,0.34	l-0.103-0.196c-2.787-2.444-5.15-4.517-6.307-5.527c-3.443-3.013-4.303-4.52-4.303-8.397v-7.75c0-0.849,0.047-1.563,0.16-2.159	C20.78,128.399,20.883,128.059,21.023,127.766z" class="st4"/><path d="M38.036,135.042c-2.267-2.677-1.72-5.17,4.463-5.17h3.877v0.213l5.157,4.954H38.036V135.042z" class="st5"/><path d="M11.933,137.405c-4.09,0-4.737,3.66-1.723,6.887c3.013,3.23,6.673,6.677,9.687,9.257	c3.013,2.583,4.413,2.476,6.567,2.476h5.703c2.583,0,3.23,5.06,0.217,5.06c-3.013,0,0.647,0-5.597,0	c-6.243,0-7.967-1.293-11.84-4.52c-3.877-3.23-4.09-4.09-8.827-8.396c-4.737-4.307-4.09-6.027-4.09-9.257s3.013-7.32,7.533-7.32	h3.24c0.84,1.193,2.02,1.937,3.327,1.937c2.157,0,3.967-2.024,4.48-4.763l0.093,0.02c-0.113,0.596-0.16,1.309-0.16,2.159v6.46	H11.933z" class="st3"/><path d="M56.432,70.123h0.503v11.11h-0.257l-3.937-5.737L56.432,70.123z" class="st7"/><path d="M185.468,100.492l-0.793-0.09c0.08-0.526,0.116-1.106,0.116-1.746v-3.323h0.12	c3.07-2.097,6.297-1.937,9.367-0.16h0.63v5.424c0,2.136-0.33,4.003-0.92,5.61l-0.343-0.127	C192.055,102.716,189.365,100.606,185.468,100.492z" class="st3"/><path d="M124.822,140.849h-13.22v-0.43l-5.38-5.38h12.553L124.822,140.849z" class="st5"/><path d="M86.172,129.872v0.213l5.073,4.954h-12.42l-5.003-4.954v-0.213H86.172z" class="st5"/><path d="M148.788,114.209c1.777-3.067,1.937-6.297-0.163-9.363v-0.377h9.15v0.377c2.1,3.066,1.936,6.296,0.163,9.363	H148.788z" class="st3"/><path d="M148.938,132.052c-1.503-1.337-2.68-2.343-3.326-2.826c-0.664-0.497-1.35-0.93-2.067-1.307l0.077-0.147	c1.776-1.613,3.873-1.613,10.01-1.613h39.716c7.426,0,8.233,1.29,13.4,5.166l0.17,0.617c-1.614,0.567-2.894,1.247-3.894,1.977	l-0.15-0.334c-3.39-2.746-3.553-2.906-8.073-2.906h-37.456c-4.683,0-7.75-0.324-7.91,1.13L148.938,132.052z" class="st3"/><path d="M141.845,104.469h6.78v0.377c2.1,3.066,1.94,6.296,0.163,9.363h-6.943V104.469z" class="st3"/><path d="M127.342,130.085l5.156,4.954h-13.723l-5.156-4.954v-0.213h12.19c0.513,0,1.026,0,1.533,0.003V130.085z" class="st5"/><path d="M69.929,140.849h-12.35l-6.047-5.81h12.35L69.929,140.849z" class="st5"/><path d="M184.911,86.186c3.07-2.1,6.297-1.94,9.367-0.163h0.63v9.15h-0.63c-3.07-1.777-6.297-1.937-9.367,0.16h-0.12	v-9.146H184.911z" class="st3"/><path d="M75.086,146.232h-12.35v-0.43l-5.157-4.953h12.35l5.157,4.953V146.232z" class="st5"/><path d="M101.269,129.872v0.213l4.953,4.954H91.245l-5.073-4.954v-0.213H101.269z" class="st5"/><path d="M30.689,56.573c-2.977,0-5.41,2.433-5.41,5.41v48.913c0,2.976,2.433,5.413,5.41,5.413h96.703	c2.976,0,5.413-2.437,5.413-5.413V61.983c0-2.977-2.437-5.41-5.413-5.41H30.689z" class="st8"/><path d="M119.035,84.622c1.022,0,1.858,0.835,1.858,1.857c0,0.511-0.208,0.976-0.545,1.313	c-0.336,0.336-0.802,0.544-1.313,0.544h-7.511c-1.022,0-1.857-0.835-1.857-1.857c0-0.511,0.208-0.976,0.544-1.313	c0.337-0.337,0.802-0.544,1.313-0.544H119.035z" class="st1"/><path d="M119.035,92.931c1.022,0,1.858,0.835,1.858,1.857c0,0.511-0.208,0.976-0.545,1.313	c-0.336,0.337-0.802,0.544-1.313,0.544h-7.511c-1.022,0-1.857-0.835-1.857-1.857c0-0.511,0.208-0.976,0.544-1.313	c0.337-0.337,0.802-0.544,1.313-0.544H119.035z" class="st1"/><path d="M119.035,101.24c1.022,0,1.858,0.835,1.858,1.857c0,0.511-0.208,0.976-0.545,1.313	c-0.336,0.336-0.802,0.544-1.313,0.544h-7.511c-1.022,0-1.857-0.835-1.857-1.857c0-0.511,0.208-0.977,0.544-1.313	c0.337-0.337,0.802-0.544,1.313-0.544H119.035z" class="st1"/><path d="M105.326,84.622c1.022,0,1.857,0.835,1.857,1.857c0,0.511-0.208,0.976-0.544,1.313	c-0.337,0.336-0.802,0.544-1.313,0.544h-7.511c-1.022,0-1.857-0.835-1.857-1.857c0-0.511,0.208-0.976,0.544-1.313	s0.802-0.544,1.313-0.544H105.326z" class="st1"/><path d="M105.326,92.931c1.022,0,1.857,0.835,1.857,1.857c0,0.511-0.208,0.976-0.544,1.313	c-0.337,0.337-0.802,0.544-1.313,0.544h-7.511c-1.022,0-1.857-0.835-1.857-1.857c0-0.511,0.208-0.976,0.544-1.313	s0.802-0.544,1.313-0.544H105.326z" class="st1"/><path d="M105.326,101.24c1.022,0,1.857,0.835,1.857,1.857c0,0.511-0.208,0.976-0.544,1.313	c-0.337,0.336-0.802,0.544-1.313,0.544h-7.511c-1.022,0-1.857-0.835-1.857-1.857c0-0.511,0.208-0.977,0.544-1.313	c0.337-0.337,0.802-0.544,1.313-0.544H105.326z" class="st1"/><path d="M63.831,67.609c1.022,0,1.857,0.839,1.857,1.861c0,0.507-0.208,0.972-0.544,1.309	c-0.336,0.337-0.802,0.548-1.313,0.548H40.566c-1.022,0-1.857-0.839-1.857-1.857c0-0.511,0.208-0.976,0.544-1.313	c0.337-0.341,0.802-0.548,1.313-0.548H63.831z" class="st1"/><path d="M63.831,93.367c1.022,0,1.857,0.839,1.857,1.861c0,0.507-0.208,0.972-0.544,1.309	c-0.336,0.337-0.802,0.548-1.313,0.548H40.566c-1.022,0-1.857-0.839-1.857-1.857c0-0.511,0.208-0.976,0.544-1.313	c0.337-0.341,0.802-0.548,1.313-0.548H63.831z" class="st1"/><path d="M55.231,84.622c1.022,0,1.857,0.835,1.857,1.857c0,0.511-0.208,0.976-0.544,1.313	c-0.337,0.336-0.802,0.544-1.313,0.544H40.566c-1.022,0-1.857-0.835-1.857-1.857c0-0.511,0.208-0.976,0.544-1.313	c0.337-0.337,0.802-0.544,1.313-0.544H55.231z" class="st1"/><path d="M55.231,101.24c1.022,0,1.857,0.835,1.857,1.857c0,0.511-0.208,0.976-0.544,1.313	c-0.337,0.336-0.802,0.544-1.313,0.544H40.566c-1.022,0-1.857-0.835-1.857-1.857c0-0.511,0.208-0.977,0.544-1.313	c0.337-0.337,0.802-0.544,1.313-0.544H55.231z" class="st1"/><path d="M63.831,71.328H40.566c-1.022,0-1.857-0.839-1.857-1.857c0-0.511,0.208-0.976,0.544-1.313	c0.337-0.341,0.802-0.548,1.313-0.548h23.265c1.022,0,1.857,0.839,1.857,1.861c0,0.507-0.208,0.972-0.544,1.309	C64.807,71.116,64.342,71.328,63.831,71.328z" class="st9"/><path d="M55.231,88.336H40.566c-1.022,0-1.857-0.835-1.857-1.857c0-0.511,0.208-0.976,0.544-1.313	c0.337-0.337,0.802-0.544,1.313-0.544h14.665c1.022,0,1.857,0.835,1.857,1.857c0,0.511-0.208,0.976-0.544,1.313	C56.208,88.128,55.742,88.336,55.231,88.336z" class="st9"/><path d="M63.831,97.085H40.566c-1.022,0-1.857-0.839-1.857-1.857c0-0.511,0.208-0.976,0.544-1.313	c0.337-0.341,0.802-0.548,1.313-0.548h23.265c1.022,0,1.857,0.839,1.857,1.861c0,0.507-0.208,0.972-0.544,1.309	C64.807,96.873,64.342,97.085,63.831,97.085z" class="st9"/><path d="M55.231,104.954H40.566c-1.022,0-1.857-0.835-1.857-1.857c0-0.511,0.208-0.977,0.544-1.313	c0.337-0.337,0.802-0.544,1.313-0.544h14.665c1.022,0,1.857,0.835,1.857,1.857c0,0.511-0.208,0.976-0.544,1.313	C56.208,104.746,55.742,104.954,55.231,104.954z" class="st9"/><path d="M119.035,88.336h-7.511c-1.022,0-1.857-0.835-1.857-1.857c0-0.511,0.208-0.976,0.544-1.313	c0.337-0.337,0.802-0.544,1.313-0.544h7.511c1.022,0,1.858,0.835,1.858,1.857c0,0.511-0.208,0.976-0.545,1.313	C120.012,88.128,119.546,88.336,119.035,88.336z" class="st9"/><path d="M119.035,104.954h-7.511c-1.022,0-1.857-0.835-1.857-1.857c0-0.511,0.208-0.977,0.544-1.313	c0.337-0.337,0.802-0.544,1.313-0.544h7.511c1.022,0,1.858,0.835,1.858,1.857c0,0.511-0.208,0.976-0.545,1.313	C120.012,104.746,119.546,104.954,119.035,104.954z" class="st9"/><path d="M119.035,96.645h-7.511c-1.022,0-1.857-0.835-1.857-1.857c0-0.511,0.208-0.976,0.544-1.313	c0.337-0.337,0.802-0.544,1.313-0.544h7.511c1.022,0,1.858,0.835,1.858,1.857c0,0.511-0.208,0.976-0.545,1.313	C120.012,96.437,119.546,96.645,119.035,96.645z" class="st9"/><path d="M105.326,88.336h-7.511c-1.022,0-1.857-0.835-1.857-1.857c0-0.511,0.208-0.976,0.544-1.313	s0.802-0.544,1.313-0.544h7.511c1.022,0,1.857,0.835,1.857,1.857c0,0.511-0.208,0.976-0.544,1.313	C106.302,88.128,105.837,88.336,105.326,88.336z" class="st9"/><path d="M105.326,104.954h-7.511c-1.022,0-1.857-0.835-1.857-1.857c0-0.511,0.208-0.977,0.544-1.313	c0.337-0.337,0.802-0.544,1.313-0.544h7.511c1.022,0,1.857,0.835,1.857,1.857c0,0.511-0.208,0.976-0.544,1.313	C106.302,104.746,105.837,104.954,105.326,104.954z" class="st9"/><path d="M105.326,96.645h-7.511c-1.022,0-1.857-0.835-1.857-1.857c0-0.511,0.208-0.976,0.544-1.313	s0.802-0.544,1.313-0.544h7.511c1.022,0,1.857,0.835,1.857,1.857c0,0.511-0.208,0.976-0.544,1.313	C106.302,96.437,105.837,96.645,105.326,96.645z" class="st9"/><path d="M91.205,87.551h-2.933" class="st9"/><path d="M82.896,87.551h-2.933" class="st9"/><path d="M74.587,87.551h-2.933" class="st9"/><path d="M66.278,87.551h-2.933" class="st9"/><path d="M91.205,96.275h-2.933" class="st9"/><path d="M82.896,96.275h-2.933" class="st9"/><path d="M74.587,96.275h-2.933" class="st9"/><path d="M91.205,104.999h-2.933" class="st9"/><path d="M82.896,104.999h-2.933" class="st9"/><path d="M74.587,104.999h-2.933" class="st9"/><path d="M66.278,104.999h-2.933" class="st9"/><path d="M99.161,67.269h21.437" class="st9"/><path d="M99.161,71.423h21.437" class="st9"/><path d="M39.108,78.199h81.215" class="st9"/><path d="M32.383,161.085c3.013,0,2.367-5.06-0.217-5.06h-2.367v-0.323c0-1.613,0.57-2.457,1.457-2.887	c1.363-0.656,3.477-0.34,5.43-0.34c3.23,0,4.09-0.216,6.46,1.72c2.367,1.937,3.337,2.8,3.337,2.8	c1.613,1.507,1.613,2.154,1.613,4.304c0,1.92-0.343,2.813-3.16,2.986c-0.343,0.02-0.723,0.03-1.143,0.03h-6.673	C34.966,164.315,32.383,161.085,32.383,161.085z" class="st4"/><path d="M129.978,146.232H75.086v-0.43l-5.157-4.953h54.893l5.156,4.953V146.232z" class="st5"/><path d="M138.545,140.849h-13.723l-6.047-5.81h13.723L138.545,140.849z" class="st5"/><path d="M84.476,140.849H69.929l-6.047-5.81h14.943l5.65,5.596V140.849z" class="st5"/><path d="M44.223,140.849h13.357l5.157,4.953v0.43h-5.597c-5.167,0-8.18-0.863-10.98-3.447	c-0.727-0.67-1.387-1.273-2.017-1.85L44.223,140.849z" class="st5"/><path d="M38.409,135.039h13.123l6.047,5.81H44.223l-0.08,0.086c-1.803-1.656-3.363-3.1-5.517-5.253	c-0.213-0.213-0.41-0.427-0.59-0.64h0.373V135.039z" class="st5"/><path d="M199.971,139.239h0.32c3.94-2.777,9.73-1.987,13.547,1.17c0.406,0.336,0.79,0.7,1.146,1.086	c3.714,4.037,7.104,10.494,6.617,18.244l-0.02,0.11c-3.87-0.75-5.78-2.6-8.697-5.277c0,0-6.62-5.973-9.85-9.203	C200.301,142.635,199.988,142.172,199.971,139.239z" class="st1"/><path d="M73.822,129.872v0.213l5.003,4.954H63.882l-5.157-4.954v-0.213H73.822z" class="st5"/><path d="M182.418,103.832c1.313-0.63,2.003-1.746,2.257-3.43l0.793,0.09c3.897,0.114,6.587,2.224,8.177,5.587	l0.343,0.127c-1.453,3.963-4.5,6.36-8.14,7.396l-0.097-0.356c0.964-3.41,0.324-6.58-2.47-9.034L182.418,103.832z" class="st3"/><path d="M113.619,129.872v0.213l5.156,4.954h-12.553l-4.953-4.954v-0.213H113.619z" class="st5"/><path d="M151.642,141.925c3.456,3.864,1.29,4.307-4.737,4.307h-3.203v-0.43l-5.157-4.953h11.803l0.174-0.16	C150.878,141.079,151.252,141.489,151.642,141.925z" class="st5"/><path d="M271.49,164.258l-0.08,6.504c-0.213,1.22-1.38,2.163-3.956,2.163h-53.28c-6.616,0-9.04,0.967-14.69-3.713	c-5.653-4.684-17.276-15.5-21.473-19.537c-0.913-0.876-1.473-1.71-1.75-2.48l-0.186-0.696v-6.5c0.11,0.973,0.7,2.086,1.936,3.273	c4.197,4.037,15.82,14.853,21.473,19.533c5.65,4.683,8.074,3.713,14.69,3.713h53.28c2.65,0,3.806-0.996,3.97-2.27L271.49,164.258z" class="st10"/><path d="M231.411,136.085h4.076c6.297,0,7.427,0.084,11.624,3.31c4.2,3.23,18.969,17.517,22.766,21.314	c1.063,1.063,1.697,2.41,1.547,3.539c-0.164,1.274-1.32,2.27-3.97,2.27h-53.28c-6.616,0-9.04,0.97-14.69-3.713	c-5.653-4.68-17.276-15.496-21.473-19.533c-1.236-1.187-1.826-2.3-1.936-3.273c-0.267-2.344,2.25-3.914,5.326-3.914h19.503" class="st11"/><path d="M176.261,147.195c0.277,0.77,0.837,1.604,1.75,2.48c4.197,4.037,15.82,14.853,21.473,19.537	c5.65,4.68,8.074,3.713,14.69,3.713h53.28c2.576,0,3.743-0.943,3.956-2.163l0.08-6.504" class="st11"/><path d="M176.075,139.395v0.604v6.5" class="st11"/><path d="M93.059,56.573h34.333c2.976,0,5.413,2.433,5.413,5.41v48.913c0,2.976-2.437,5.413-5.413,5.413H30.69	c-2.977,0-5.41-2.437-5.41-5.413V61.983c0-2.977,2.433-5.41,5.41-5.41H93.059z" class="st11"/><path d="M92.902,48.5h40.59c1.58,0,3.06,0.443,4.323,1.213c2.413,1.47,4.03,4.127,4.03,7.14v60.466	c0,4.597-3.757,8.353-8.353,8.353H25.236c-0.507,0-1.007-0.046-1.487-0.136c-1.01-0.18-1.953-0.547-2.803-1.057" class="st11"/><path d="M19.576,123.449c-1.653-1.527-2.693-3.713-2.693-6.13V56.853c0-4.593,3.76-8.353,8.353-8.353H93" class="st11"/><path d="M20.923,124.466c-0.067-0.04-0.13-0.08-0.193-0.124h-0.003c-0.153-0.1-0.303-0.203-0.447-0.31	c-0.24-0.18-0.473-0.37-0.693-0.576" class="st11"/><path d="M122.732,42.096c2.13,0,4.13,0.59,5.843,1.61c0.003,0,0.003,0.003,0.007,0.003" class="st11"/><path d="M138.635,49.9l-0.677-0.417l-9.386-5.773" class="st11"/><path d="M58.842,42.096H17.826c-6.307,0-11.463,5.157-11.463,11.463v54.246c0,3.873,1.943,7.31,4.907,9.39l4.55,3.423	l3.757,2.83l0.01,0.007l1.193,0.9c0,0,0.003,0.003,0.007,0.003l0.137,0.107l0.023,0.013l0.423,0.32" class="st11"/><path d="M122.732,42.096H58.5" class="st11"/><path d="M44.956,164.642c0.643,0.553,1.197,1.026,1.633,1.393c4.09,3.443,6.027,4.953,13.563,4.953h107.419	c5.597,0,6.887-1.293,6.887-4.736v-6.03c0-2.117-0.37-3.587-1.477-5.2c-0.58-0.843-1.36-1.727-2.396-2.763	c-2.447-2.45-15.13-14.417-21.647-20.207c-1.503-1.337-2.68-2.343-3.326-2.826c-0.664-0.497-1.35-0.93-2.067-1.307	c-3-1.577-6.503-2.137-10.847-2.137H28.076c-2.06,0-3.583,0.07-4.693,0.324c-0.973,0.226-1.633,0.593-2.07,1.18H21.31	c-0.107,0.143-0.203,0.303-0.287,0.48c-0.14,0.293-0.243,0.633-0.32,1.02c-0.113,0.596-0.16,1.309-0.16,2.159v7.75	c0,3.877,0.86,5.384,4.303,8.397c1.157,1.01,3.52,3.083,6.307,5.527" class="st11"/><path d="M21.403,127.932c0,0,24.11,22.173,28.416,26.05c4.303,3.873,5.813,4.733,10.333,4.733h109.139	c4.307,0,3.447-3.443,3.447-3.443" class="st11"/><path d="M95.672,158.715c0,0-3.017-2.15-5.813-4.303c-2.8-2.153-2.583-4.52,1.29-4.52h21.743	c4.52,0,6.853,1.33,9.04,3.227c3.23,2.8,5.6,5.166,5.6,5.166" class="st11"/><path d="M143.702,146.232h3.203c6.027,0,8.193-0.443,4.737-4.307c-0.39-0.436-0.764-0.846-1.12-1.236	c-2.257-2.45-3.98-4.084-6.077-5.8c-0.703-0.574-1.453-1.16-2.277-1.79c-3.883-2.97-9.16-3.207-14.826-3.224	c-0.507-0.003-1.02-0.003-1.533-0.003h-83.31c-6.183,0-6.73,2.493-4.463,5.17c0.18,0.213,0.377,0.427,0.59,0.64	c2.153,2.153,3.713,3.597,5.517,5.253c0.63,0.577,1.29,1.18,2.017,1.85c2.8,2.584,5.813,3.447,10.98,3.447H143.702z" class="st11"/><path d="M38.409,135.039h13.123h12.35h14.943h12.42h14.977h12.553h13.723h11.824" class="st11"/><path d="M44.223,140.849h13.357h12.35h14.547h12.056h15.07h13.22h13.723h11.803" class="st11"/><path d="M46.376,130.086l5.157,4.953l6.047,5.81l5.157,4.953" class="st11"/><path d="M58.726,130.086l5.157,4.953l6.047,5.81l5.157,4.953" class="st11"/><path d="M73.822,130.086l5.003,4.953l5.65,5.596" class="st11"/><path d="M86.172,130.086l5.073,4.953l5.287,5.163" class="st11"/><path d="M101.269,130.086l4.953,4.953l5.38,5.38" class="st11"/><path d="M113.619,130.086l5.156,4.953l6.047,5.81l5.156,4.953" class="st11"/><path d="M127.342,130.086l5.156,4.953l6.047,5.81l5.157,4.953" class="st11"/><path d="M20.28,124.032c0.103,0.324,0.203,0.757,0.283,1.22c0.117,0.664,0.193,1.39,0.193,1.927	c0,0.127-0.003,0.253-0.01,0.377c-0.017,0.416-0.063,0.82-0.137,1.21c-0.513,2.739-2.323,4.763-4.48,4.763	c-1.307,0-2.487-0.744-3.327-1.937c-0.807-1.143-1.303-2.696-1.303-4.413c0-3.277,1.81-5.973,4.133-6.313" class="st11"/><path d="M16.13,133.529h3.767" class="st11"/><path d="M12.576,131.592H9.563c-4.52,0-7.533,4.09-7.533,7.32s-0.647,4.95,4.09,9.257	c4.737,4.306,4.95,5.166,8.827,8.396c3.873,3.227,5.597,4.52,11.84,4.52c6.243,0,2.583,0,5.597,0c3.013,0,2.367-5.06-0.217-5.06	h-5.703c-2.153,0-3.553,0.107-6.567-2.476c-3.013-2.58-6.673-6.027-9.687-9.257c-3.013-3.227-2.367-6.887,1.723-6.887h8.393" class="st11"/><path d="M12.816,131.592h-0.013" class="st11"/><path d="M12.803,131.592h-0.227" class="st11"/><path d="M29.799,155.702c0-1.613,0.57-2.457,1.457-2.887c1.363-0.656,3.477-0.34,5.43-0.34	c3.23,0,4.09-0.216,6.46,1.72c2.367,1.937,3.337,2.8,3.337,2.8c1.613,1.507,1.613,2.154,1.613,4.304c0,1.92-0.343,2.813-3.16,2.986	c-0.343,0.02-0.723,0.03-1.143,0.03h-6.673c-2.153,0-4.737-3.23-4.737-3.23" class="st11"/><path d="M141.952,104.469h36.813c1.553,0,2.75-0.203,3.653-0.637c1.313-0.63,2.003-1.746,2.257-3.43	c0.08-0.526,0.116-1.106,0.116-1.746V77.993" class="st11"/><path d="M141.845,114.209h39.503c1.55,0,3.073-0.197,4.5-0.607c3.64-1.036,6.686-3.433,8.14-7.396	c0.59-1.607,0.92-3.474,0.92-5.61v-22.39" class="st11"/><path d="M226.611,22.197c1.53,1.147,2.526,2.973,2.526,5.023v44.283c0,3.45-2.823,6.273-6.276,6.273h-62.58	c-1.509,0-2.899-0.54-3.983-1.437c-1.396-1.153-2.29-2.897-2.29-4.837V27.22c0-3.45,2.824-6.273,6.273-6.273h62.58	C224.264,20.947,225.564,21.413,226.611,22.197z" class="st11"/><path d="M156.162,76.509l-6.87-5.19c-1.87-1.583-3.06-3.943-3.06-6.57V23.61c0-4.737,3.873-8.61,8.61-8.61h59.799	c2.247,0,3.847,0.887,5.833,2.29l6.243,4.767l1.084,0.827" class="st11"/><path d="M221.628,67.693c0,1.683-1.374,3.06-3.057,3.06h-53.46c-1.68,0-3.056-1.377-3.056-3.06V31.19	c0-1.683,1.376-3.06,3.056-3.06h53.46c1.683,0,3.057,1.377,3.057,3.06V67.693z" class="st11"/><path d="M148.625,104.846c2.1,3.066,1.94,6.296,0.163,9.363" class="st11"/><path d="M157.775,104.846c2.1,3.066,1.936,6.296,0.163,9.363" class="st11"/><path d="M166.925,104.846c2.1,3.066,1.936,6.296,0.16,9.363" class="st11"/><path d="M176.075,104.846c2.096,3.066,1.936,6.296,0.16,9.363" class="st11"/><path d="M183.281,104.212c2.794,2.454,3.434,5.624,2.47,9.034" class="st11"/><path d="M185.468,100.492c3.897,0.114,6.587,2.224,8.177,5.587" class="st11"/><path d="M184.911,95.332c3.07-2.097,6.297-1.937,9.367-0.16" class="st11"/><path d="M184.911,86.186c3.07-2.1,6.297-1.94,9.367-0.163" class="st11"/><path d="M211.348,130.852c-1.7,0.273-3.167,0.647-4.43,1.09c-1.614,0.567-2.894,1.247-3.894,1.977	c-0.943,0.693-1.636,1.433-2.12,2.166c-0.663,0.997-0.936,1.984-0.936,2.827c0,0.113,0,0.22,0.003,0.327	c0.017,2.933,0.33,3.396,3.063,6.13c3.23,3.23,9.85,9.203,9.85,9.203c2.917,2.677,4.827,4.527,8.697,5.277	c1.27,0.246,2.75,0.373,4.543,0.373h11.947c3.713,0,6.456-1.937,5.003-6.457c-0.77-2.4-3.727-8.85-8.453-14.373" class="st11"/><path d="M234.617,139.392c-0.993-1.16-2.063-2.277-3.206-3.307c-3.677-3.313-8.117-5.73-13.2-5.73	c-2.62,0-4.89,0.18-6.857,0.497" class="st11"/><path d="M200.291,139.235c3.94-2.773,9.73-1.983,13.547,1.174c0.406,0.336,0.79,0.7,1.146,1.086	c3.714,4.037,7.104,10.494,6.617,18.244" class="st11"/><path d="M214.014,140.202c0,0,3.354-0.817,9.704-1.04c2.983-0.103,6.629-0.077,10.899,0.23h0.004	c0.02,0,0.04,0.003,0.06,0.003" class="st11"/><path d="M211.271,130.839c0,0,0.027,0,0.077,0.013c0,0,0,0.003,0.006,0c0.667,0.133,5.207,1.143,9.777,5.233	c0.863,0.774,1.73,1.657,2.57,2.667" class="st11"/><path d="M143.622,127.772c1.776-1.613,3.873-1.613,10.01-1.613h39.716c7.426,0,8.233,1.29,13.4,5.166" class="st11"/><path d="M202.874,133.585c-3.39-2.746-3.553-2.906-8.073-2.906h-37.456c-4.683,0-7.75-0.323-7.91,1.13" class="st11"/><path d="M181.422,49.685l-2.602,3.904c0,0,4.62-0.065,13.206,8.523c0,0,3.057-16.135,12.1-25.894l-0.39-0.52	l-3.514-1.561c0,0-6.896,7.351-10.278,20.233c0,0-4.359-4.033-8.524-4.684L181.422,49.685z" class="st12"/><path d="M200.297,34.079c-3.087,2.726-9.332,13.937-10.416,20.312c-0.441-0.425-2.645-2.906-8.631-4.924	c-0.226,0.373-2.169,3.622-2.408,3.969c5.486,0.694,13.033,8.327,13.272,8.717c1.714-9.91,7.59-22.162,12.086-26.08	c-0.515-0.269-3.464-1.706-3.903-1.996V34.079z" class="st11"/></svg>
\ No newline at end of file
diff --git a/assets/images/credit-card-exclamation.svg b/assets/images/credit-card-exclamation.svg
new file mode 100644
index 000000000000..9cf946a56a5c
--- /dev/null
+++ b/assets/images/credit-card-exclamation.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" id="Layer_1" x="0" y="0" version="1.1" 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 d="M1.5,3C0.672,3,0,3.672,0,4.5v1C0,5.776,0.224,6,0.5,6h19C19.776,6,20,5.776,20,5.5v-1C20,3.672,19.328,3,18.5,3H1.5z"/><path d="M0.5,8C0.224,8,0,8.224,0,8.5v7C0,16.328,0.672,17,1.5,17h8.189C9.566,16.521,9.5,16.018,9.5,15.5c0-3.314,2.686-6,6-6	c1.792,0,3.401,0.786,4.5,2.031V8.5C20,8.224,19.776,8,19.5,8H0.5z"/><path d="M19.5,15.5c0,2.209-1.791,4-4,4s-4-1.791-4-4s1.791-4,4-4S19.5,13.291,19.5,15.5z M14.907,15.944l-0.296-3.556	h1.778l-0.296,3.556H14.907z M15.5,16.833c-0.491,0-0.889,0.398-0.889,0.889s0.398,0.889,0.889,0.889s0.889-0.398,0.889-0.889	S15.991,16.833,15.5,16.833z" class="st0"/></svg>
\ No newline at end of file
diff --git a/assets/images/credit-card-hourglass.svg b/assets/images/credit-card-hourglass.svg
new file mode 100644
index 000000000000..28ffe766b597
--- /dev/null
+++ b/assets/images/credit-card-hourglass.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" id="Layer_1" x="0" y="0" version="1.1" 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 d="M1.5,3C0.672,3,0,3.672,0,4.5v1C0,5.776,0.224,6,0.5,6h19C19.776,6,20,5.776,20,5.5v-1C20,3.672,19.328,3,18.5,3H1.5z"/><path d="M0.5,8C0.224,8,0,8.224,0,8.5v7C0,16.328,0.672,17,1.5,17h11.817c0.088-0.175,0.193-0.342,0.314-0.499L14.022,16	l-0.39-0.501C13.222,14.972,13,14.324,13,13.657V12.25c0-1.243,1.007-2.25,2.25-2.25h4.389c0.123,0,0.243,0.01,0.361,0.029V8.5	C20,8.224,19.776,8,19.5,8H0.5z"/><path d="M15,13.657V13c0-0.036,0.002-0.073,0.006-0.108l-0.001-0.002l-0.002-0.001L15,12.886V12.25	c0-0.138,0.112-0.25,0.25-0.25h4.389c0.138,0,0.25,0.112,0.25,0.25v0.636l-0.003,0.003l-0.003,0.003	c0.004,0.035,0.006,0.071,0.006,0.108v0.657c0,0.222-0.074,0.438-0.211,0.614l-0.867,1.115c-0.281,0.361-0.281,0.867,0,1.228	l0.867,1.115c0.137,0.175,0.211,0.392,0.211,0.614v1.407c0,0.138-0.112,0.25-0.25,0.25H15.25C15.112,20,15,19.888,15,19.75v-1.407	c0-0.222,0.074-0.438,0.211-0.614l0.867-1.115c0.281-0.361,0.281-0.867,0-1.228l-0.867-1.115C15.074,14.095,15,13.879,15,13.657z M18.494,12.889H16.39c-0.428,0-0.658,0.502-0.379,0.826l1.052,1.223c0.199,0.232,0.559,0.232,0.758,0l1.052-1.223	C19.153,13.391,18.922,12.889,18.494,12.889z" class="st0"/></svg>
\ No newline at end of file
diff --git a/assets/images/crosshair.svg b/assets/images/crosshair.svg
new file mode 100644
index 000000000000..66ee21774d02
--- /dev/null
+++ b/assets/images/crosshair.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" id="Layer_1" x="0" y="0" version="1.1" viewBox="0 0 20 20" style="enable-background:new 0 0 20 20" xml:space="preserve"><style type="text/css">.st1{fill-rule:evenodd;clip-rule:evenodd}</style><g><defs><rect id="SVGID_1_" width="20" height="20" y="0"/></defs><clipPath id="SVGID_00000117639697519618360510000003921484006578735798_"><use xlink:href="#SVGID_1_" style="overflow:visible"/></clipPath><g style="clip-path:url(#SVGID_00000117639697519618360510000003921484006578735798_)"><path d="M9,1c0-0.6,0.4-1,1-1c0.6,0,1,0.4,1,1v1.6C14.3,3,17,5.7,17.4,9H19c0.6,0,1,0.4,1,1c0,0.6-0.4,1-1,1h-1.6 c-0.4,3.3-3.1,6-6.4,6.4V19c0,0.6-0.4,1-1,1c-0.6,0-1-0.4-1-1v-1.6C5.7,17,3,14.3,2.6,11H1c-0.6,0-1-0.4-1-1c0-0.6,0.4-1,1-1h1.6 C3,5.7,5.7,3,9,2.6V1z M15.5,10c0,3-2.5,5.5-5.5,5.5c-3,0-5.5-2.5-5.5-5.5C4.5,7,7,4.5,10,4.5C13,4.5,15.5,7,15.5,10z M10,12 c1.1,0,2-0.9,2-2c0-1.1-0.9-2-2-2c-1.1,0-2,0.9-2,2C8,11.1,8.9,12,10,12z" class="st1"/></g></g></svg>
\ No newline at end of file
diff --git a/assets/images/document-plus.svg b/assets/images/document-plus.svg
index cce2e3027cea..729bc98d4f8a 100644
--- a/assets/images/document-plus.svg
+++ b/assets/images/document-plus.svg
@@ -1,5 +1 @@
-<svg width="20" height="20" viewBox="0 0 20 20" style="enable-background:new 0 0 20 20" xmlns="http://www.w3.org/2000/svg">
-<path d="M4 0C2.89543 0 2 0.895431 2 2V18C2 19.1046 2.89543 20 4 20H12.6707C12.5602 19.6872 12.5 19.3506 12.5 19V18.5H12C10.3431 18.5 9 17.1569 9 15.5C9 13.8431 10.3431 12.5 12 12.5H12.5V12C12.5 10.3431 13.8431 9 15.5 9C16.5435 9 17.4625 9.53275 18 10.3411V7.5C18 7.22386 17.7761 7 17.5 7H11.5C11.2239 7 11 6.77614 11 6.5V0.5C11 0.223858 10.7761 0 10.5 0H4Z"/>
-<path d="M13 0L18 5H13.5C13.2239 5 13 4.77614 13 4.5V0Z"/>
-<path d="M15.5 11C16.0523 11 16.5 11.4477 16.5 12V14.5H19C19.5523 14.5 20 14.9477 20 15.5C20 16.0523 19.5523 16.5 19 16.5H16.5V19C16.5 19.5523 16.0523 20 15.5 20C14.9477 20 14.5 19.5523 14.5 19V16.5H12C11.4477 16.5 11 16.0523 11 15.5C11 14.9477 11.4477 14.5 12 14.5H14.5V12C14.5 11.4477 14.9477 11 15.5 11Z"/>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="20" height="20" viewBox="0 0 20 20" style="enable-background:new 0 0 20 20"><path d="M4 0C2.89543 0 2 0.895431 2 2V18C2 19.1046 2.89543 20 4 20H12.6707C12.5602 19.6872 12.5 19.3506 12.5 19V18.5H12C10.3431 18.5 9 17.1569 9 15.5C9 13.8431 10.3431 12.5 12 12.5H12.5V12C12.5 10.3431 13.8431 9 15.5 9C16.5435 9 17.4625 9.53275 18 10.3411V7.5C18 7.22386 17.7761 7 17.5 7H11.5C11.2239 7 11 6.77614 11 6.5V0.5C11 0.223858 10.7761 0 10.5 0H4Z"/><path d="M13 0L18 5H13.5C13.2239 5 13 4.77614 13 4.5V0Z"/><path d="M15.5 11C16.0523 11 16.5 11.4477 16.5 12V14.5H19C19.5523 14.5 20 14.9477 20 15.5C20 16.0523 19.5523 16.5 19 16.5H16.5V19C16.5 19.5523 16.0523 20 15.5 20C14.9477 20 14.5 19.5523 14.5 19V16.5H12C11.4477 16.5 11 16.0523 11 15.5C11 14.9477 11.4477 14.5 12 14.5H14.5V12C14.5 11.4477 14.9477 11 15.5 11Z"/></svg>
\ No newline at end of file
diff --git a/assets/images/document-slash.svg b/assets/images/document-slash.svg
index ebb183142e40..e8a0ff20702e 100644
--- a/assets/images/document-slash.svg
+++ b/assets/images/document-slash.svg
@@ -1 +1 @@
-<svg width="20" height="20" viewBox="0 0 20 20" style="enable-background:new 0 0 20 20" xmlns="http://www.w3.org/2000/svg"><path d="M18 13.9861V7.5C18 7.22386 17.7761 7 17.5 7H11.5C11.2239 7 11 6.77614 11 6.5V0.5C11 0.223858 10.7761 0 10.5 0H4C3.52923 0 3.09644 0.162656 2.75478 0.434835L18 13.9861Z"/><path d="M2 7.79165V18C2 19.1046 2.89543 20 4 20H15.7344L2 7.79165Z"/><path d="M13 0L18 5H13.5C13.2239 5 13 4.77614 13 4.5V0Z"/><path d="M1.66437 2.2526C1.25159 1.88568 0.619519 1.92286 0.252601 2.33565C-0.114317 2.74843 -0.0771359 3.3805 0.335647 3.74742L18.3356 19.7474C18.7484 20.1143 19.3805 20.0772 19.7474 19.6644C20.1143 19.2516 20.0772 18.6195 19.6644 18.2526L1.66437 2.2526Z"/></svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="20" height="20" viewBox="0 0 20 20" style="enable-background:new 0 0 20 20"><path d="M18 13.9861V7.5C18 7.22386 17.7761 7 17.5 7H11.5C11.2239 7 11 6.77614 11 6.5V0.5C11 0.223858 10.7761 0 10.5 0H4C3.52923 0 3.09644 0.162656 2.75478 0.434835L18 13.9861Z"/><path d="M2 7.79165V18C2 19.1046 2.89543 20 4 20H15.7344L2 7.79165Z"/><path d="M13 0L18 5H13.5C13.2239 5 13 4.77614 13 4.5V0Z"/><path d="M1.66437 2.2526C1.25159 1.88568 0.619519 1.92286 0.252601 2.33565C-0.114317 2.74843 -0.0771359 3.3805 0.335647 3.74742L18.3356 19.7474C18.7484 20.1143 19.3805 20.0772 19.7474 19.6644C20.1143 19.2516 20.0772 18.6195 19.6644 18.2526L1.66437 2.2526Z"/></svg>
\ No newline at end of file
diff --git a/assets/images/emptystate__expensifycard.svg b/assets/images/emptystate__expensifycard.svg
new file mode 100644
index 000000000000..6021fea119af
--- /dev/null
+++ b/assets/images/emptystate__expensifycard.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" id="Layer_1" x="0" y="0" version="1.1" viewBox="0 0 400 328" style="enable-background:new 0 0 400 328" xml:space="preserve"><style type="text/css">.st0{fill:none}.st1{fill:#085239}.st2{fill:#03d47c}.st3{fill:#fffaf0}.st4{fill:#061b09}.st5{fill-rule:evenodd;clip-rule:evenodd;fill:#8b9c8f}.st6{fill:#e7ece9}.st7{fill:#1a3d32}.st9{fill:#afbbb0}.st10{fill-rule:evenodd;clip-rule:evenodd;fill:#e7ece9}.st11{fill:#072419}.st12{fill:#008c59}.st13{fill:#e3a171}.st14{fill:#002140}.st15{fill:#cf4cd9}.st16{fill:#49225b}.st17{fill:#fed607}.st18{fill:#fff2b2}.st19{fill-rule:evenodd;clip-rule:evenodd;fill:#fed607}</style><g><rect width="400" height="328" class="st0"/></g><g><rect width="400" height="328" class="st1"/></g><g><path d="M82.264,50.063c-1.87,0-2.992-0.22-2.992-0.814c0-0.44,0.528-0.638,1.518-0.704 c0.352-0.11,0.506-1.144,0.66-2.31l0.99-8.184c0.154-1.232,0.242-2.2-0.022-2.31c-0.99-0.066-1.408-0.242-1.408-0.616 c0-0.682,1.166-0.924,3.234-0.924c1.892,0,2.97,0.198,2.97,0.792c0,0.462-0.506,0.66-1.584,0.726 c-0.286,0.11-0.462,1.034-0.638,2.332l-0.99,8.184c-0.154,1.276-0.198,2.178,0.066,2.288c0.968,0.066,1.408,0.242,1.408,0.616 C85.476,49.821,84.332,50.063,82.264,50.063z M90.933,50.283c-2.596,0-4.444-1.254-4.444-2.552c0-0.638,0.396-1.056,0.946-1.056 c0.66,0,0.946,0.616,1.188,0.99c0.682,1.034,1.474,1.386,2.42,1.386c1.188,0,2.046-0.66,2.046-1.65c0-1.21-1.056-1.452-2.75-2.244 c-1.606-0.748-2.772-1.628-2.772-3.234c0-1.848,1.672-3.212,4.224-3.212c2.222,0,4.07,1.1,4.07,2.354c0,0.572-0.33,0.99-0.902,0.99 c-0.682,0-0.836-0.594-1.364-1.21c-0.506-0.616-1.122-0.902-1.87-0.902c-1.034,0-1.848,0.616-1.848,1.518 c0,0.858,0.528,1.232,2.42,2.09c1.562,0.726,3.168,1.474,3.168,3.432C95.465,49.007,93.617,50.283,90.933,50.283z M100.924,50.283 c-2.596,0-4.444-1.254-4.444-2.552c0-0.638,0.396-1.056,0.946-1.056c0.66,0,0.946,0.616,1.188,0.99 c0.682,1.034,1.474,1.386,2.42,1.386c1.188,0,2.046-0.66,2.046-1.65c0-1.21-1.056-1.452-2.75-2.244 c-1.606-0.748-2.772-1.628-2.772-3.234c0-1.848,1.672-3.212,4.224-3.212c2.222,0,4.07,1.1,4.07,2.354c0,0.572-0.33,0.99-0.902,0.99 c-0.682,0-0.836-0.594-1.364-1.21c-0.506-0.616-1.122-0.902-1.87-0.902c-1.034,0-1.848,0.616-1.848,1.518 c0,0.858,0.528,1.232,2.42,2.09c1.562,0.726,3.168,1.474,3.168,3.432C105.456,49.007,103.608,50.283,100.924,50.283z M110.914,50.283c-1.826,0-2.926-1.122-2.926-3.234c0-0.396,0.022-0.77,0.066-1.012l0.33-2.75c0.132-0.99,0.264-2.288-0.022-2.486 c-0.902-0.066-1.298-0.242-1.298-0.594c0-0.264,0.22-0.44,0.506-0.594c0.726-0.396,2.31-0.704,2.838-0.704 c0.484,0,0.792,0.286,0.792,0.792c0,0.286-0.11,0.99-0.374,3.102l-0.308,2.42c-0.044,0.396-0.088,0.88-0.088,1.232 c0,1.21,0.396,2.09,1.628,2.09c1.298,0,2.904-1.232,3.256-4.07l0.154-1.188c0.11-0.968,0.264-2.288-0.022-2.486 c-0.88-0.066-1.276-0.242-1.276-0.594c0-0.264,0.22-0.44,0.506-0.594c0.66-0.352,2.222-0.704,2.794-0.704 c0.484,0,0.792,0.308,0.792,0.792c0,0.286-0.132,1.078-0.374,3.124l-0.374,3.014c-0.132,0.99-0.264,2.244,0.044,2.442 c0.924,0.066,1.276,0.22,1.276,0.55c0,0.286-0.242,0.484-0.506,0.594c-0.66,0.374-2.222,0.704-2.772,0.704 c-0.506,0-0.792-0.374-0.792-0.792c0-0.198,0.066-0.572,0.198-1.606C114.06,49.359,112.52,50.283,110.914,50.283z M124.653,50.283 c-2.75,0-4.488-1.914-4.488-4.752c0-3.542,2.706-6.798,6.182-6.798c2.112,0,3.322,1.166,3.322,2.552 c0,1.826-2.002,3.366-6.182,3.894l-1.034,0.154c0.242,1.782,1.386,2.882,3.146,2.882c1.496,0,2.464-0.88,3.102-1.452 c0.264-0.242,0.44-0.374,0.66-0.374s0.374,0.176,0.374,0.462c0,0.396-0.33,0.99-0.88,1.562 C128.041,49.315,126.567,50.283,124.653,50.283z M122.409,44.321l0.638-0.11c3.146-0.484,4.576-1.65,4.576-2.926 c0-0.77-0.616-1.32-1.606-1.32C124.213,39.965,122.541,41.901,122.409,44.321z M139.982,50.283c-1.826,0-2.926-1.122-2.926-3.234 c0-0.396,0.022-0.77,0.066-1.012l0.33-2.75c0.132-0.99,0.264-2.288-0.022-2.486c-0.902-0.066-1.298-0.242-1.298-0.594 c0-0.264,0.22-0.44,0.506-0.594c0.726-0.396,2.31-0.704,2.838-0.704c0.484,0,0.792,0.286,0.792,0.792 c0,0.286-0.11,0.99-0.374,3.102l-0.308,2.42c-0.044,0.396-0.088,0.88-0.088,1.232c0,1.21,0.396,2.09,1.628,2.09 c1.298,0,2.904-1.232,3.256-4.07l0.154-1.188c0.11-0.968,0.264-2.288-0.022-2.486c-0.88-0.066-1.276-0.242-1.276-0.594 c0-0.264,0.22-0.44,0.506-0.594c0.66-0.352,2.222-0.704,2.794-0.704c0.484,0,0.792,0.308,0.792,0.792 c0,0.286-0.132,1.078-0.374,3.124l-0.374,3.014c-0.132,0.99-0.264,2.244,0.044,2.442c0.924,0.066,1.276,0.22,1.276,0.55 c0,0.286-0.242,0.484-0.506,0.594c-0.66,0.374-2.222,0.704-2.772,0.704c-0.506,0-0.792-0.374-0.792-0.792 c0-0.198,0.066-0.572,0.198-1.606C143.128,49.359,141.588,50.283,139.982,50.283z M157.968,50.129 c-0.484,0-0.792-0.308-0.792-0.792c0-0.264,0.132-1.034,0.374-3.08l0.308-2.42c0.044-0.418,0.088-0.902,0.088-1.276 c0-1.166-0.418-2.068-1.606-2.068c-1.32,0-2.97,1.254-3.3,4.07l-0.55,4.598c-0.088,0.638-0.55,0.902-1.408,0.902 c-0.682,0-0.99-0.264-0.99-0.814c0-0.198,0.088-0.66,0.176-1.452l0.572-4.554c0.11-0.968,0.198-2.398-0.088-2.508 c-0.858-0.022-1.276-0.176-1.276-0.528c0-0.264,0.242-0.44,0.528-0.594c0.77-0.418,2.288-0.704,2.816-0.704 c0.462,0,0.748,0.352,0.748,0.77c0,0.176-0.044,0.55-0.198,1.76c0.902-1.694,2.464-2.662,4.158-2.662c1.782,0,2.882,1.1,2.882,3.19 c0,0.418-0.044,0.792-0.066,1.034l-0.352,2.75c-0.11,1.034-0.242,2.354,0.066,2.53c0.88,0.044,1.254,0.176,1.254,0.528 c0,0.308-0.264,0.484-0.528,0.616C160.058,49.799,158.584,50.129,157.968,50.129z M163.807,50.129 c-0.484,0-0.748-0.308-0.748-0.792c0-0.242,0.066-0.704,0.396-3.454l0.968-7.744c0.11-0.968,0.176-2.354-0.066-2.442 c-0.924-0.044-1.386-0.264-1.386-0.616c0-0.286,0.264-0.44,0.528-0.572c0.814-0.396,2.354-0.726,2.882-0.726 s0.836,0.308,0.836,0.814c0,0.242-0.066,0.66-0.396,3.388l-0.968,7.788c-0.11,0.946-0.242,2.31,0.022,2.486 c0.902,0.044,1.276,0.198,1.276,0.55c0,0.308-0.242,0.484-0.506,0.616C165.919,49.821,164.401,50.129,163.807,50.129z M170.242,50.129c-0.484,0-0.748-0.308-0.748-0.792c0-0.242,0.044-0.704,0.396-3.454l0.33-2.64c0.176-1.386,0.198-2.31-0.022-2.464 c-0.858-0.044-1.276-0.22-1.276-0.572c0-0.264,0.242-0.462,0.506-0.594c0.77-0.418,2.332-0.704,2.816-0.704 s0.792,0.308,0.792,0.814c0,0.242-0.066,0.66-0.418,3.454l-0.352,2.596c-0.154,1.232-0.242,2.266,0.044,2.464 c0.858,0.066,1.254,0.22,1.254,0.572c0,0.308-0.242,0.484-0.528,0.616C172.288,49.843,170.792,50.129,170.242,50.129z M170.506,35.873c0-0.924,0.858-1.606,1.958-1.606c0.88,0,1.298,0.418,1.298,1.1c0,1.078-1.056,1.65-1.936,1.65 C171.034,37.017,170.506,36.599,170.506,35.873z M190.371,50.129c-0.484,0-0.792-0.308-0.792-0.792c0-0.264,0.132-1.034,0.374-3.08 l0.308-2.42c0.044-0.418,0.088-0.946,0.088-1.276c0-1.166-0.418-2.068-1.54-2.068c-1.254,0-2.816,1.21-3.124,4.048v-0.022 l-0.572,4.642c-0.088,0.638-0.506,0.902-1.386,0.902c-0.704,0-0.99-0.264-0.99-0.814c0-0.198,0.066-0.66,0.154-1.452l0.506-3.96 c0.066-0.418,0.088-0.946,0.088-1.276c0-1.166-0.418-2.068-1.518-2.068c-1.254,0-2.838,1.254-3.146,4.07l-0.55,4.598 c-0.088,0.638-0.55,0.902-1.408,0.902c-0.682,0-0.99-0.264-0.99-0.814c0-0.198,0.088-0.66,0.176-1.452l0.572-4.554 c0.11-0.946,0.198-2.376-0.088-2.508c-0.858-0.022-1.276-0.176-1.276-0.528c0-0.264,0.242-0.44,0.528-0.594 c0.77-0.418,2.288-0.704,2.816-0.704c0.462,0,0.748,0.352,0.748,0.77c0,0.176-0.044,0.528-0.176,1.694 c0.858-1.672,2.376-2.596,3.982-2.596c1.562,0,2.574,0.924,2.75,2.662c0.88-1.716,2.442-2.662,4.114-2.662 c1.716,0,2.772,1.1,2.772,3.19c0,0.418-0.022,0.792-0.044,1.034l-0.352,2.75c-0.11,1.012-0.242,2.354,0.066,2.53 c0.88,0.044,1.254,0.176,1.254,0.528c0,0.308-0.264,0.484-0.528,0.616C192.461,49.799,190.987,50.129,190.371,50.129z M196.646,50.129c-0.484,0-0.748-0.308-0.748-0.792c0-0.242,0.044-0.704,0.396-3.454l0.33-2.64c0.176-1.386,0.198-2.31-0.022-2.464 c-0.858-0.044-1.276-0.22-1.276-0.572c0-0.264,0.242-0.462,0.506-0.594c0.77-0.418,2.332-0.704,2.816-0.704 s0.792,0.308,0.792,0.814c0,0.242-0.066,0.66-0.418,3.454l-0.352,2.596c-0.154,1.232-0.242,2.266,0.044,2.464 c0.858,0.066,1.254,0.22,1.254,0.572c0,0.308-0.242,0.484-0.528,0.616C198.692,49.843,197.196,50.129,196.646,50.129z M196.91,35.873c0-0.924,0.858-1.606,1.958-1.606c0.88,0,1.298,0.418,1.298,1.1c0,1.078-1.056,1.65-1.936,1.65 C197.438,37.017,196.91,36.599,196.91,35.873z M205.115,50.129c-1.562,0-2.574-0.814-2.574-2.266c0-0.264,0.044-0.66,0.088-1.012 l0.748-6.292h-0.682c-0.55,0-1.012-0.066-1.012-0.506c0-0.748,0.594-0.836,1.166-0.836h0.704l0.132-1.144 c0.088-0.616,0.528-0.88,1.408-0.88c0.682,0,0.99,0.242,0.99,0.792c0,0.176-0.066,0.704-0.132,1.078l-0.022,0.154h2.86 c0.528,0,1.012,0.022,1.012,0.506c0,0.726-0.594,0.836-1.188,0.836h-2.838l-0.682,5.412c-0.044,0.352-0.088,0.792-0.088,1.056 c0,0.792,0.286,1.298,1.188,1.298c1.188,0,1.98-0.946,2.42-0.946c0.286,0,0.44,0.176,0.44,0.418 C209.053,48.567,207.271,50.129,205.115,50.129z M214.308,50.283c-2.75,0-4.488-1.914-4.488-4.752c0-3.542,2.706-6.798,6.182-6.798 c2.112,0,3.322,1.166,3.322,2.552c0,1.826-2.002,3.366-6.182,3.894l-1.034,0.154c0.242,1.782,1.386,2.882,3.146,2.882 c1.496,0,2.464-0.88,3.102-1.452c0.264-0.242,0.44-0.374,0.66-0.374s0.374,0.176,0.374,0.462c0,0.396-0.33,0.99-0.88,1.562 C217.696,49.315,216.222,50.283,214.308,50.283z M212.064,44.321l0.638-0.11c3.146-0.484,4.576-1.65,4.576-2.926 c0-0.77-0.616-1.32-1.606-1.32C213.868,39.965,212.196,41.901,212.064,44.321z M224.303,50.261c-2.178,0-3.806-1.826-3.806-4.664 c0-3.454,2.354-6.864,5.764-6.864c1.342,0,2.354,0.594,2.948,1.452l0.242-1.914c0.088-0.88,0.22-2.354-0.088-2.552 c-1.056-0.066-1.518-0.242-1.518-0.638c0-0.242,0.22-0.44,0.528-0.594c0.77-0.374,2.486-0.704,3.08-0.704 c0.55,0,0.792,0.33,0.792,0.77c0,0.374-0.176,1.496-0.484,4.004l-0.858,7.084c-0.11,0.968-0.22,2.398,0.088,2.596 c0.924,0.066,1.32,0.198,1.32,0.572c0,0.286-0.22,0.462-0.528,0.616c-0.66,0.33-2.09,0.704-2.706,0.704 c-0.572,0-0.836-0.33-0.836-0.814c0-0.242,0.044-0.616,0.154-1.518C227.515,49.249,225.975,50.261,224.303,50.261z M223.005,45.575 c0,1.914,0.858,3.102,2.266,3.102c2.134,0,3.564-3.014,3.564-5.742c0-2.222-1.1-2.97-2.178-2.97 C224.347,39.965,223.005,43.089,223.005,45.575z M243.14,50.283c-2.64,0-4.466-1.98-4.466-4.928c0-3.608,2.662-6.644,5.918-6.644 c2.244,0,3.872,1.452,3.872,3.014c0,0.814-0.44,1.364-1.122,1.364c-0.77,0-1.056-0.704-1.298-1.584 c-0.33-0.968-0.924-1.562-1.804-1.562c-1.738,0-3.19,1.826-3.19,4.466c0,2.354,1.188,3.784,3.08,3.784 c1.386,0,2.288-0.88,3.014-1.54c0.264-0.286,0.44-0.462,0.682-0.462s0.396,0.198,0.396,0.462c0,0.484-0.44,1.188-0.99,1.782 C246.418,49.337,244.966,50.283,243.14,50.283z M253.134,50.261c-2.156,0-3.762-1.76-3.762-4.532c0-3.63,2.574-6.996,5.962-6.996 c1.342,0,2.398,0.55,3.124,1.364c0.506-0.66,1.034-1.21,1.54-1.21c0.374,0,0.572,0.242,0.572,0.572 c0,0.396-0.264,1.364-0.528,3.388l-0.374,2.728c-0.154,1.122-0.22,2.442,0.088,2.64c0.88,0.066,1.298,0.22,1.298,0.594 c0,0.264-0.198,0.462-0.528,0.616c-0.66,0.352-2.156,0.704-2.662,0.704c-0.616,0-0.88-0.44-0.88-0.902 c0-0.242,0.066-0.704,0.198-1.65C256.368,49.139,254.938,50.261,253.134,50.261z M251.88,45.641c0,1.892,0.792,3.058,2.178,3.058 c2.09,0,3.586-3.102,3.586-6.204c0-1.518-0.748-2.574-2.112-2.574C253.552,39.921,251.88,42.759,251.88,45.641z M264.132,50.063 c-0.682,0-0.99-0.264-0.99-0.814c0-0.198,0.088-0.66,0.176-1.452l0.572-4.554c0.11-0.946,0.198-2.398-0.088-2.508 c-0.858-0.022-1.276-0.176-1.276-0.528c0-0.264,0.242-0.44,0.528-0.594c0.77-0.396,2.222-0.704,2.75-0.704 c0.418,0,0.682,0.352,0.682,0.77c0,0.176-0.022,0.55-0.154,1.782c0.814-1.76,2.156-2.684,3.212-2.684 c1.034,0,1.628,0.748,1.628,1.606c0,0.902-0.55,1.452-1.188,1.452c-0.484,0-0.792-0.264-1.012-0.55 c-0.154-0.176-0.352-0.33-0.594-0.33c-0.66,0-2.002,1.232-2.288,3.696v-0.022l-0.55,4.532 C265.452,49.799,264.99,50.063,264.132,50.063z M274.835,50.261c-2.178,0-3.806-1.826-3.806-4.664c0-3.454,2.354-6.864,5.764-6.864 c1.342,0,2.354,0.594,2.948,1.452l0.242-1.914c0.088-0.88,0.22-2.354-0.088-2.552c-1.056-0.066-1.518-0.242-1.518-0.638 c0-0.242,0.22-0.44,0.528-0.594c0.77-0.374,2.486-0.704,3.08-0.704c0.55,0,0.792,0.33,0.792,0.77c0,0.374-0.176,1.496-0.484,4.004 l-0.858,7.084c-0.11,0.968-0.22,2.398,0.088,2.596c0.924,0.066,1.32,0.198,1.32,0.572c0,0.286-0.22,0.462-0.528,0.616 c-0.66,0.33-2.09,0.704-2.706,0.704c-0.572,0-0.836-0.33-0.836-0.814c0-0.242,0.044-0.616,0.154-1.518 C278.047,49.249,276.507,50.261,274.835,50.261z M273.537,45.575c0,1.914,0.858,3.102,2.266,3.102c2.134,0,3.564-3.014,3.564-5.742 c0-2.222-1.1-2.97-2.178-2.97C274.879,39.965,273.537,43.089,273.537,45.575z M288.074,50.283c-2.596,0-4.444-1.254-4.444-2.552 c0-0.638,0.396-1.056,0.946-1.056c0.66,0,0.946,0.616,1.188,0.99c0.682,1.034,1.474,1.386,2.42,1.386 c1.188,0,2.046-0.66,2.046-1.65c0-1.21-1.056-1.452-2.75-2.244c-1.606-0.748-2.772-1.628-2.772-3.234 c0-1.848,1.672-3.212,4.224-3.212c2.222,0,4.07,1.1,4.07,2.354c0,0.572-0.33,0.99-0.902,0.99c-0.682,0-0.836-0.594-1.364-1.21 c-0.506-0.616-1.122-0.902-1.87-0.902c-1.034,0-1.848,0.616-1.848,1.518c0,0.858,0.528,1.232,2.42,2.09 c1.562,0.726,3.168,1.474,3.168,3.432C292.606,49.007,290.758,50.283,288.074,50.283z" class="st2"/></g><g><path d="M303.332,50.129c-1.738,0-2.816-0.924-2.816-2.882l-0.022-6.71h-0.616c-0.418,0-0.814-0.176-0.814-0.616 c0-0.572,0.726-1.21,1.452-1.848c0.66-0.55,1.276-1.034,1.804-1.034c0.374,0,0.594,0.242,0.594,0.726v1.386h3.08 c0.704,0,1.056,0.132,1.056,0.66s-0.198,0.682-1.056,0.682h-3.08v5.874c0,1.342,0.352,1.914,1.43,1.914 c1.276,0,2.024-0.946,2.508-0.946c0.242,0,0.418,0.198,0.418,0.506C307.27,48.611,305.576,50.129,303.332,50.129z M313.424,50.283 c-3.388,0-5.698-2.398-5.698-5.742c0-3.432,2.552-5.83,6.072-5.83c3.366,0,5.698,2.398,5.698,5.742 C319.496,47.951,316.878,50.283,313.424,50.283z M310.168,43.551c0,2.64,1.584,5.5,3.96,5.5c1.672,0,2.948-1.386,2.948-3.608 c0-2.662-1.65-5.5-3.982-5.5C311.444,39.943,310.168,41.285,310.168,43.551z M64.498,72.093c0-2.09,1.892-3.52,4.686-3.52 c0.858,0,1.694,0.154,2.464,0.352v-1.254c0-1.012-0.044-2.728-1.694-2.728c-0.858,0-1.562,0.594-2.288,1.474 c-0.374,0.462-0.77,0.902-1.452,0.902c-0.55,0-0.946-0.352-0.946-0.858c0-1.166,2.882-2.728,5.258-2.728 c2.244,0,3.542,1.21,3.542,3.454v4.136c0,1.254,0.066,2.068,1.386,2.354c0.132,0.022,0.176,0.088,0.176,0.22 c0,0.506-0.638,1.188-1.782,1.188c-0.99,0-1.782-0.528-2.134-1.826c-0.814,1.32-2.134,2.002-3.652,2.002 C65.928,75.261,64.498,73.941,64.498,72.093z M66.962,71.763c0,1.122,0.77,1.958,2.024,1.958c1.43,0,2.706-1.21,2.706-2.838v-0.66 c-0.506-0.242-1.298-0.462-2.09-0.462C67.886,69.761,66.962,70.575,66.962,71.763z M86.982,75.063c-1.87,0-2.882-0.22-2.882-0.814 c0-0.44,0.44-0.572,1.386-0.616c0.264-0.11,0.308-1.122,0.308-2.31v-2.486c0-2.332-0.682-3.344-2.288-3.344 c-1.43,0-2.97,1.122-2.97,4.026v1.804c0,1.474,0.022,2.2,0.264,2.31c0.99,0.066,1.408,0.176,1.408,0.616 c0,0.616-1.1,0.814-2.904,0.814c-1.76,0-2.772-0.22-2.772-0.814c0-0.44,0.462-0.572,1.298-0.616c0.242-0.11,0.286-0.77,0.286-2.31 v-3.08c0-0.99-0.044-2.244-0.33-2.398c-1.122-0.066-1.408-0.308-1.408-0.616c0-0.22,0.11-0.396,0.44-0.572 c0.814-0.418,2.376-0.748,2.97-0.748c0.638,0,0.77,0.396,0.77,1.21v1.298c0.726-1.694,2.244-2.662,4.048-2.662 c1.98,0,3.608,1.166,3.608,4.158v3.41c0,1.672,0,2.2,0.242,2.31c0.88,0.066,1.32,0.176,1.32,0.616 C89.776,74.865,88.676,75.063,86.982,75.063z M92.817,79.199c-1.342,0-2.266-0.88-2.266-1.892c0-0.858,0.572-1.474,1.342-1.474 c0.748,0,1.166,0.484,1.232,1.188c0,0.198,0,0.374,0.022,0.528c0,0.154,0.11,0.286,0.33,0.286c0.594,0,1.012-0.616,1.364-1.628 c0.176-0.55,0.044-1.078-0.572-2.376c-0.77-1.672-2.222-4.994-3.036-7.018c-0.396-0.99-0.55-1.298-0.77-1.386 c-0.704-0.066-1.122-0.264-1.122-0.66c0-0.572,0.99-0.836,2.904-0.836c1.936,0,2.816,0.286,2.816,0.836 c0,0.44-0.44,0.594-1.342,0.638c-0.176,0.198,0.044,1.144,0.352,2.068c0.572,1.628,1.584,3.806,2.288,5.258 c0.704-1.694,1.496-4.092,1.87-5.478c0.198-0.682,0.418-1.65,0.198-1.892c-0.946-0.066-1.342-0.198-1.342-0.616 c0-0.528,1.012-0.814,2.464-0.814c1.386,0,2.266,0.308,2.266,0.792c0,0.44-0.418,0.572-1.144,0.66 c-0.396,0.198-0.616,0.682-0.968,1.672c-1.012,2.816-1.562,4.488-2.508,6.974C96.007,77.219,95.127,79.199,92.817,79.199z M107.496,75.283c-3.388,0-5.698-2.398-5.698-5.742c0-3.432,2.552-5.83,6.072-5.83c3.366,0,5.698,2.398,5.698,5.742 C113.568,72.951,110.95,75.283,107.496,75.283z M104.24,68.551c0,2.64,1.584,5.5,3.96,5.5c1.672,0,2.948-1.386,2.948-3.608 c0-2.662-1.65-5.5-3.982-5.5C105.516,64.943,104.24,66.285,104.24,68.551z M125.246,75.063c-1.87,0-2.882-0.22-2.882-0.814 c0-0.44,0.44-0.572,1.386-0.616c0.264-0.11,0.308-1.122,0.308-2.31v-2.486c0-2.332-0.682-3.344-2.288-3.344 c-1.43,0-2.97,1.122-2.97,4.026v1.804c0,1.474,0.022,2.2,0.264,2.31c0.99,0.066,1.408,0.176,1.408,0.616 c0,0.616-1.1,0.814-2.904,0.814c-1.76,0-2.772-0.22-2.772-0.814c0-0.44,0.462-0.572,1.298-0.616c0.242-0.11,0.286-0.77,0.286-2.31 v-3.08c0-0.99-0.044-2.244-0.33-2.398c-1.122-0.066-1.408-0.308-1.408-0.616c0-0.22,0.11-0.396,0.44-0.572 c0.814-0.418,2.376-0.748,2.97-0.748c0.638,0,0.77,0.396,0.77,1.21v1.298c0.726-1.694,2.244-2.662,4.048-2.662 c1.98,0,3.608,1.166,3.608,4.158v3.41c0,1.672,0,2.2,0.242,2.31c0.88,0.066,1.32,0.176,1.32,0.616 C128.04,74.865,126.94,75.063,125.246,75.063z M134.104,75.283c-3.102,0-5.192-2.266-5.192-5.544c0-3.564,2.508-6.006,5.566-6.006 c2.772,0,4.51,1.936,4.51,3.85c0,0.968-0.484,1.65-1.342,1.65h-6.512c0.132,2.354,1.496,3.894,3.696,3.894 c1.54,0,2.508-0.77,3.146-1.408c0.22-0.198,0.396-0.374,0.616-0.374c0.286,0,0.462,0.198,0.462,0.572 c0,0.396-0.242,0.968-0.726,1.496C137.536,74.359,136.106,75.283,134.104,75.283z M131.2,68.023l4.554-0.044 c0.704,0,1.078-0.242,1.078-0.858c0-1.166-0.946-2.222-2.486-2.222C132.652,64.899,131.464,66.131,131.2,68.023z M148.249,75.063 c-1.76,0-2.772-0.22-2.772-0.814c0-0.44,0.44-0.572,1.276-0.616c0.264-0.11,0.286-0.836,0.286-2.31v-3.08 c0-1.012-0.044-2.266-0.308-2.398c-1.122-0.066-1.408-0.308-1.408-0.616c0-0.242,0.11-0.418,0.44-0.572 c0.77-0.418,2.354-0.77,2.97-0.77c0.66,0,0.77,0.418,0.77,1.21c0,0.748-0.044,1.98-0.044,3.564v2.662c0,1.474,0.022,2.2,0.264,2.31 c0.858,0.066,1.298,0.176,1.298,0.616C151.021,74.865,149.943,75.063,148.249,75.063z M146.489,60.653 c0-0.968,0.88-1.386,1.694-1.386c0.968,0,1.518,0.528,1.518,1.32c0,0.99-0.88,1.408-1.716,1.408 C147.061,61.995,146.489,61.467,146.489,60.653z M162.479,75.063c-1.87,0-2.882-0.22-2.882-0.814c0-0.44,0.44-0.572,1.386-0.616 c0.264-0.11,0.308-1.122,0.308-2.31v-2.486c0-2.332-0.682-3.344-2.288-3.344c-1.43,0-2.97,1.122-2.97,4.026v1.804 c0,1.474,0.022,2.2,0.264,2.31c0.99,0.066,1.408,0.176,1.408,0.616c0,0.616-1.1,0.814-2.904,0.814c-1.76,0-2.772-0.22-2.772-0.814 c0-0.44,0.462-0.572,1.298-0.616c0.242-0.11,0.286-0.77,0.286-2.31v-3.08c0-0.99-0.044-2.244-0.33-2.398 c-1.122-0.066-1.408-0.308-1.408-0.616c0-0.22,0.11-0.396,0.44-0.572c0.814-0.418,2.376-0.748,2.97-0.748 c0.638,0,0.77,0.396,0.77,1.21v1.298c0.726-1.694,2.244-2.662,4.048-2.662c1.98,0,3.608,1.166,3.608,4.158v3.41 c0,1.672,0,2.2,0.242,2.31c0.88,0.066,1.32,0.176,1.32,0.616C165.273,74.865,164.173,75.063,162.479,75.063z M173.383,79.199 c-1.342,0-2.266-0.88-2.266-1.892c0-0.858,0.572-1.474,1.342-1.474c0.748,0,1.166,0.484,1.232,1.188c0,0.198,0,0.374,0.022,0.528 c0,0.154,0.11,0.286,0.33,0.286c0.594,0,1.012-0.616,1.364-1.628c0.176-0.55,0.044-1.078-0.572-2.376 c-0.77-1.672-2.222-4.994-3.036-7.018c-0.396-0.99-0.55-1.298-0.77-1.386c-0.704-0.066-1.122-0.264-1.122-0.66 c0-0.572,0.99-0.836,2.904-0.836c1.936,0,2.816,0.286,2.816,0.836c0,0.44-0.44,0.594-1.342,0.638 c-0.176,0.198,0.044,1.144,0.352,2.068c0.572,1.628,1.584,3.806,2.288,5.258c0.704-1.694,1.496-4.092,1.87-5.478 c0.198-0.682,0.418-1.65,0.198-1.892c-0.946-0.066-1.342-0.198-1.342-0.616c0-0.528,1.012-0.814,2.464-0.814 c1.386,0,2.266,0.308,2.266,0.792c0,0.44-0.418,0.572-1.144,0.66c-0.396,0.198-0.616,0.682-0.968,1.672 c-1.012,2.816-1.562,4.488-2.508,6.974C176.573,77.219,175.693,79.199,173.383,79.199z M188.063,75.283 c-3.388,0-5.698-2.398-5.698-5.742c0-3.432,2.552-5.83,6.072-5.83c3.366,0,5.698,2.398,5.698,5.742 C194.135,72.951,191.517,75.283,188.063,75.283z M184.807,68.551c0,2.64,1.584,5.5,3.96,5.5c1.672,0,2.948-1.386,2.948-3.608 c0-2.662-1.65-5.5-3.982-5.5C186.083,64.943,184.807,66.285,184.807,68.551z M200.181,75.283c-1.98,0-3.586-1.166-3.586-4.158 v-2.97c0-0.99-0.044-2.332-0.33-2.486c-1.056-0.066-1.364-0.352-1.364-0.682c0-0.22,0.154-0.396,0.462-0.528 c0.814-0.308,2.2-0.55,2.882-0.55s0.792,0.374,0.792,1.21c0,0.748-0.022,1.936-0.022,3.476v1.606c0,2.09,0.528,3.344,2.2,3.344 c1.43,0,2.97-1.078,2.97-4.026v-1.364c0-1.012-0.066-2.332-0.33-2.486c-1.144-0.066-1.474-0.33-1.474-0.682 c0-0.22,0.176-0.396,0.506-0.528c0.814-0.33,2.244-0.55,2.948-0.55c0.66,0,0.792,0.374,0.792,1.21c0,0.748-0.022,1.98-0.022,3.542 v2.112c0,1.1,0.044,2.288,0.308,2.42c1.122,0.066,1.408,0.308,1.408,0.616c0,0.22-0.132,0.396-0.44,0.572 c-0.814,0.396-2.376,0.748-2.97,0.748c-0.638,0-0.77-0.418-0.77-1.21c0-0.352,0-0.77,0.022-1.276 C203.437,74.315,201.941,75.283,200.181,75.283z M212.036,75.063c-1.76,0-2.772-0.22-2.772-0.814c0-0.44,0.44-0.572,1.276-0.616 c0.242-0.11,0.286-0.77,0.286-2.31v-3.058c0-0.99-0.044-2.266-0.33-2.42c-1.122-0.066-1.408-0.308-1.408-0.616 c0-0.22,0.132-0.396,0.44-0.572c0.77-0.396,2.376-0.748,2.97-0.748c0.638,0,0.77,0.418,0.77,1.21v1.452 c0.726-1.826,2.178-2.794,3.344-2.794c0.858,0,1.672,0.55,1.672,1.628c0,0.99-0.55,1.584-1.298,1.584 c-0.506,0-0.814-0.242-1.078-0.528c-0.198-0.198-0.374-0.462-0.748-0.462c-0.726,0-1.914,1.144-1.914,3.168v2.156 c0,1.452,0.066,2.178,0.308,2.288c1.232,0.066,1.694,0.198,1.694,0.638C215.248,74.865,214.104,75.063,212.036,75.063z M234.938,75.173c-0.594,0-0.99-0.396-1.43-1.342c-0.418-0.88-1.056-2.662-1.672-4.312c-0.616,1.452-1.254,2.816-1.958,4.246 c-0.506,1.012-0.88,1.408-1.474,1.408s-0.946-0.418-1.408-1.342c-0.726-1.386-2.2-5.236-2.926-6.996 c-0.396-1.012-0.506-1.254-0.77-1.408c-0.704-0.066-1.122-0.264-1.122-0.66c0-0.572,0.99-0.836,2.904-0.836 c1.738,0,2.706,0.286,2.706,0.836c0,0.44-0.418,0.594-1.254,0.638c-0.154,0.22,0.044,1.1,0.352,2.046 c0.55,1.672,1.518,3.916,2.2,5.302c0.792-1.518,1.606-3.366,2.134-4.906c-0.132-0.396-0.286-0.748-0.396-1.056 c-0.396-1.012-0.396-1.122-0.682-1.386c-0.66-0.044-1.034-0.242-1.034-0.638c0-0.55,1.012-0.836,2.772-0.836 c1.738,0,2.684,0.286,2.684,0.836c0,0.44-0.484,0.594-1.364,0.638c-0.154,0.264,0.022,1.1,0.352,2.046 c0.572,1.76,1.364,3.872,1.98,5.258c0.77-1.628,1.584-3.784,2.046-5.434c0.22-0.77,0.396-1.672,0.198-1.914 c-0.99-0.066-1.474-0.22-1.474-0.616c0-0.55,1.034-0.814,2.552-0.814c1.32,0,2.222,0.308,2.222,0.792 c0,0.44-0.352,0.572-1.034,0.66c-0.396,0.154-0.616,0.726-0.99,1.672c-1.012,2.772-2.09,5.412-2.706,6.754 C235.906,74.777,235.554,75.173,234.938,75.173z M246.844,75.283c-3.388,0-5.698-2.398-5.698-5.742c0-3.432,2.552-5.83,6.072-5.83 c3.366,0,5.698,2.398,5.698,5.742C252.916,72.951,250.298,75.283,246.844,75.283z M243.588,68.551c0,2.64,1.584,5.5,3.96,5.5 c1.672,0,2.948-1.386,2.948-3.608c0-2.662-1.65-5.5-3.982-5.5C244.864,64.943,243.588,66.285,243.588,68.551z M256.938,75.063 c-1.76,0-2.772-0.22-2.772-0.814c0-0.44,0.44-0.572,1.276-0.616c0.242-0.11,0.286-0.77,0.286-2.31v-3.058 c0-0.99-0.044-2.266-0.33-2.42c-1.122-0.066-1.408-0.308-1.408-0.616c0-0.22,0.132-0.396,0.44-0.572 c0.77-0.396,2.376-0.748,2.97-0.748c0.638,0,0.77,0.418,0.77,1.21v1.452c0.726-1.826,2.178-2.794,3.344-2.794 c0.858,0,1.672,0.55,1.672,1.628c0,0.99-0.55,1.584-1.298,1.584c-0.506,0-0.814-0.242-1.078-0.528 c-0.198-0.198-0.374-0.462-0.748-0.462c-0.726,0-1.914,1.144-1.914,3.168v2.156c0,1.452,0.066,2.178,0.308,2.288 c1.232,0.066,1.694,0.198,1.694,0.638C260.15,74.865,259.006,75.063,256.938,75.063z M266.277,75.063 c-1.782,0-2.794-0.22-2.794-0.814c0-0.44,0.44-0.572,1.276-0.616c0.264-0.11,0.308-0.77,0.308-2.332v-8.228 c0-1.012-0.066-2.222-0.374-2.354c-1.166-0.044-1.496-0.308-1.496-0.616c0-0.242,0.132-0.418,0.44-0.572 c0.88-0.418,2.486-0.77,3.102-0.77c0.638,0,0.77,0.418,0.77,1.21c0,0.77-0.022,1.936-0.022,3.498v5.61l1.364-1.122 c0.836-0.726,1.54-1.364,1.914-1.804c0.286-0.352,0.396-0.66,0.242-0.77c-0.682-0.044-1.21-0.176-1.21-0.616 c0-0.55,0.924-0.836,3.014-0.836c2.002,0,3.014,0.264,3.014,0.836c0,0.418-0.55,0.616-1.562,0.726 c-0.836,0.154-1.298,0.506-3.498,2.354c1.1,1.826,2.2,3.696,3.19,4.972c0.462,0.594,0.682,0.748,0.902,0.814 c1.188,0.044,1.606,0.176,1.606,0.572c0,0.55-0.924,0.858-2.332,0.858c-0.924,0-1.474-0.132-1.804-0.528 c-0.66-0.704-2.024-3.058-3.322-5.236c-0.572,0.506-1.078,0.946-1.518,1.364v0.66c0,1.474,0.022,2.2,0.264,2.31 c1.012,0.066,1.452,0.154,1.452,0.616C269.203,74.865,268.081,75.063,266.277,75.063z M281.939,75.261 c-0.836,0-1.474-0.132-2.002-0.33c-0.33-0.11-0.616-0.264-0.814-0.264c-0.374,0-0.286,0.396-0.792,0.396 c-0.814,0-1.562-1.826-1.562-3.102c0-0.726,0.198-1.056,0.55-1.056c0.418,0,0.572,0.55,0.902,1.122 c0.66,1.122,2.002,2.046,3.476,2.046c1.21,0,2.354-0.528,2.354-1.694c0-1.364-1.43-1.54-3.014-1.87 c-1.936-0.418-4.114-1.034-4.114-3.3c0-2.156,2.002-3.454,4.18-3.454c0.748,0,1.43,0.132,1.958,0.308 c0.286,0.088,0.506,0.176,0.704,0.176c0.33,0,0.286-0.33,0.704-0.33c0.704,0,1.496,1.716,1.496,2.882 c0,0.66-0.286,0.946-0.594,0.946c-0.374,0-0.594-0.374-0.902-0.968c-0.572-1.1-1.848-1.826-3.146-1.826 c-1.254,0.022-2.112,0.704-2.112,1.65c0,1.166,1.232,1.342,2.816,1.65c1.958,0.418,4.312,1.034,4.312,3.542 C286.339,73.919,284.403,75.261,281.939,75.261z M290.256,79.155c-1.804,0-2.816-0.22-2.816-0.792c0-0.44,0.462-0.572,1.32-0.638 c0.242-0.088,0.286-0.77,0.286-2.31v-7.172c0-0.946-0.044-2.222-0.33-2.398c-1.122-0.066-1.408-0.308-1.408-0.616 c0-0.22,0.11-0.396,0.44-0.572c0.77-0.396,2.376-0.748,2.97-0.748c0.616,0,0.77,0.396,0.77,1.21c0,0.286,0,0.726-0.022,1.298 c0.682-1.584,2.31-2.684,4.136-2.684c2.53,0,4.488,2.178,4.488,5.566c0,3.41-2.156,5.962-5.258,5.962 c-1.408,0-2.596-0.55-3.366-1.276v1.43c0,1.386,0.066,2.178,0.352,2.31c1.276,0.088,1.716,0.198,1.716,0.638 C293.534,78.979,292.412,79.155,290.256,79.155z M291.4,70.003c0,2.904,1.364,4.048,2.992,4.048c1.936,0,3.124-1.672,3.124-4.312 c0-2.684-1.21-4.334-2.948-4.334C293.05,65.405,291.4,66.725,291.4,70.003z M301.17,72.093c0-2.09,1.892-3.52,4.686-3.52 c0.858,0,1.694,0.154,2.464,0.352v-1.254c0-1.012-0.044-2.728-1.694-2.728c-0.858,0-1.562,0.594-2.288,1.474 c-0.374,0.462-0.77,0.902-1.452,0.902c-0.55,0-0.946-0.352-0.946-0.858c0-1.166,2.882-2.728,5.258-2.728 c2.244,0,3.542,1.21,3.542,3.454v4.136c0,1.254,0.066,2.068,1.386,2.354c0.132,0.022,0.176,0.088,0.176,0.22 c0,0.506-0.638,1.188-1.782,1.188c-0.99,0-1.782-0.528-2.134-1.826c-0.814,1.32-2.134,2.002-3.652,2.002 C302.6,75.261,301.17,73.941,301.17,72.093z M303.634,71.763c0,1.122,0.77,1.958,2.024,1.958c1.43,0,2.706-1.21,2.706-2.838v-0.66 c-0.506-0.242-1.298-0.462-2.09-0.462C304.558,69.761,303.634,70.575,303.634,71.763z M318.374,75.283 c-3.036,0-5.148-2.354-5.148-5.632c0-3.3,2.31-5.94,5.5-5.94c2.662,0,4.378,1.892,4.378,3.278c0,0.704-0.418,1.188-1.078,1.188 c-0.836,0-1.078-0.814-1.518-1.76c-0.33-0.704-0.836-1.518-2.09-1.518c-1.76,0-2.86,1.672-2.86,3.806c0,2.618,1.43,4.4,3.608,4.4 c1.562,0,2.486-0.924,3.08-1.518c0.264-0.264,0.418-0.418,0.66-0.418c0.264,0,0.44,0.198,0.44,0.572c0,0.418-0.264,1.078-0.77,1.65 C321.828,74.293,320.376,75.283,318.374,75.283z M329.633,75.283c-3.102,0-5.192-2.266-5.192-5.544 c0-3.564,2.508-6.006,5.566-6.006c2.772,0,4.51,1.936,4.51,3.85c0,0.968-0.484,1.65-1.342,1.65h-6.512 c0.132,2.354,1.496,3.894,3.696,3.894c1.54,0,2.508-0.77,3.146-1.408c0.22-0.198,0.396-0.374,0.616-0.374 c0.286,0,0.462,0.198,0.462,0.572c0,0.396-0.242,0.968-0.726,1.496C333.065,74.359,331.635,75.283,329.633,75.283z M326.729,68.023 l4.554-0.044c0.704,0,1.078-0.242,1.078-0.858c0-1.166-0.946-2.222-2.486-2.222C328.181,64.899,326.993,66.131,326.729,68.023z" class="st3"/></g><g><path d="M103,118.416c0-6.857,5.559-12.416,12.416-12.416h169.168c6.857,0,12.416,5.559,12.416,12.416V329H103V118.416 z" class="st0"/></g><g><g><path d="M103,118.416c0-6.857,5.559-12.416,12.416-12.416h169.168c6.857,0,12.416,5.559,12.416,12.416V328H103 V118.416z" class="st4"/></g><g><path d="M120.715,128.977c-0.404,0.404-1.059,0.404-1.464,0l-4.352-4.353l4.352-4.353c0.405-0.404,1.06-0.404,1.464,0 s0.404,1.059,0,1.463l-2.89,2.89l2.89,2.89C121.119,127.918,121.119,128.573,120.715,128.977z" class="st5"/></g><g><path d="M129.705,127.124h-1.231v-6.156h1.231V127.124z M132.565,127.23c-1.196,0-1.891-0.511-1.988-1.496h1.17 c0.07,0.44,0.343,0.625,0.853,0.625c0.466,0,0.73-0.132,0.73-0.431c0-0.229-0.167-0.369-0.625-0.466l-0.36-0.088 c-1.135-0.255-1.627-0.607-1.627-1.328c0-0.897,0.668-1.354,1.776-1.354c1.223,0,1.891,0.492,1.944,1.451h-1.161 c-0.026-0.423-0.281-0.59-0.739-0.59c-0.413,0-0.651,0.124-0.651,0.414c0,0.22,0.159,0.36,0.607,0.457l0.37,0.079 c1.125,0.255,1.635,0.616,1.635,1.346C134.499,126.755,133.77,127.23,132.565,127.23z M136.971,127.23 c-1.196,0-1.891-0.511-1.988-1.496h1.17c0.07,0.44,0.343,0.625,0.853,0.625c0.466,0,0.73-0.132,0.73-0.431 c0-0.229-0.167-0.369-0.625-0.466l-0.36-0.088c-1.135-0.255-1.627-0.607-1.627-1.328c0-0.897,0.668-1.354,1.776-1.354 c1.223,0,1.891,0.492,1.944,1.451h-1.161c-0.026-0.423-0.281-0.59-0.739-0.59c-0.413,0-0.651,0.124-0.651,0.414 c0,0.22,0.159,0.36,0.607,0.457l0.37,0.079c1.125,0.255,1.635,0.616,1.635,1.346C138.905,126.755,138.175,127.23,136.971,127.23z M141.218,127.212c-1.046,0-1.574-0.554-1.574-1.864v-2.56h1.178v2.472c0,0.712,0.247,0.949,0.73,0.949 c0.51,0,0.81-0.369,0.81-1.073v-2.348h1.187v4.336h-1.117v-0.545C142.142,127.01,141.737,127.212,141.218,127.212z M148.611,124.978v0.22h-3.043c0.07,0.748,0.457,1.073,0.985,1.073c0.519,0,0.747-0.229,0.853-0.537h1.205 c-0.326,1.161-1.24,1.496-2.058,1.496c-1.328,0-2.199-0.889-2.199-2.278c0-1.627,1.082-2.26,2.155-2.26 C147.863,122.692,148.611,123.668,148.611,124.978z M145.594,124.468h1.768c-0.053-0.598-0.361-0.871-0.853-0.871 C146.069,123.597,145.709,123.835,145.594,124.468z M153.482,127.23c-1.293,0-2.137-0.889-2.137-2.278 c0-1.372,0.871-2.26,2.172-2.26c1.065,0,1.883,0.536,2.023,1.635h-1.205c-0.149-0.439-0.431-0.65-0.853-0.65 c-0.589,0-0.958,0.457-0.958,1.275s0.36,1.284,0.958,1.284c0.431,0,0.748-0.238,0.871-0.721h1.196 C155.373,126.588,154.582,127.23,153.482,127.23z M158.025,122.692c1.293,0,1.856,0.536,1.856,1.82v2.612h-1.117v-0.563 c-0.255,0.378-0.677,0.669-1.293,0.669c-0.932,0-1.513-0.475-1.513-1.258c0-0.888,0.757-1.363,1.918-1.363 c0.334,0,0.58,0.026,0.826,0.079v-0.343c0-0.537-0.237-0.765-0.721-0.765c-0.466,0-0.712,0.246-0.739,0.589h-1.178 C156.152,123.166,156.97,122.692,158.025,122.692z M157.796,126.333c0.475,0,0.906-0.335,0.906-0.862v-0.053 c-0.22-0.062-0.413-0.088-0.721-0.088c-0.528,0-0.844,0.167-0.844,0.528C157.137,126.157,157.339,126.333,157.796,126.333z M162.089,127.124h-1.187v-4.336h1.117v0.633c0.255-0.501,0.642-0.686,1.046-0.686c0.106,0,0.255,0.009,0.352,0.036v1.099 c-0.185-0.026-0.29-0.035-0.44-0.035c-0.562,0-0.888,0.369-0.888,1.161L162.089,127.124L162.089,127.124z M165.699,127.23 c-1.178,0-1.935-0.889-1.935-2.278c0-1.372,0.792-2.26,1.935-2.26c0.501,0,0.88,0.167,1.187,0.501v-2.225h1.179v6.156h-1.108 v-0.501C166.605,127.027,166.209,127.23,165.699,127.23z M165.928,126.236c0.624,0,0.994-0.458,0.994-1.284 c0-0.818-0.37-1.275-0.994-1.275c-0.616,0-0.985,0.457-0.985,1.275C164.943,125.778,165.312,126.236,165.928,126.236z" class="st6"/></g><g><rect width="173" height="1.035" x="113.347" y="159.285" class="st7"/></g><g><g><g><defs><path id="SVGID_1_" d="M123.694,149.456L123.694,149.456c5.714,0,10.347,4.632,10.347,10.347l0,0 c0,5.714-4.632,10.347-10.347,10.347l0,0c-5.714,0-10.347-4.632-10.347-10.347l0,0 C113.347,154.088,117.979,149.456,123.694,149.456z"/></defs><clipPath id="SVGID_00000175293280714573863990000007979028640395835572_"><use xlink:href="#SVGID_1_" style="overflow:visible"/></clipPath><g style="clip-path:url(#SVGID_00000175293280714573863990000007979028640395835572_)"><g><path d="M123.694,149.456L123.694,149.456c5.714,0,10.347,4.632,10.347,10.347l0,0 c0,5.714-4.632,10.347-10.347,10.347l0,0c-5.714,0-10.347-4.632-10.347-10.347l0,0 C113.347,154.088,117.979,149.456,123.694,149.456z" class="st2"/></g><g><path d="M124.362,162.56h-0.942v-3.262h-0.84v-0.679c0.692-0.007,0.981-0.195,1.049-0.767h0.733 C124.362,157.852,124.362,162.56,124.362,162.56z" class="st9"/></g><g><path d="M123.694,149.456L123.694,149.456c5.714,0,10.347,4.632,10.347,10.347l0,0 c0,5.714-4.632,10.347-10.347,10.347l0,0c-5.714,0-10.347-4.632-10.347-10.347l0,0 C113.347,154.088,117.979,149.456,123.694,149.456z" class="st2"/></g><g><path d="M125.925,157.751c0.275,0.204,0.334,0.593,0.13,0.868l-2.701,3.659l-1.942-1.773 c-0.253-0.231-0.271-0.624-0.039-0.877c0.231-0.253,0.623-0.271,0.877-0.04l0.923,0.844l1.883-2.55 C125.26,157.606,125.649,157.548,125.925,157.751z" class="st10"/></g></g></g></g></g><g><path d="M123.693,170.149c-5.705,0-10.347-4.642-10.347-10.347s4.642-10.346,10.347-10.346 c5.705,0,10.347,4.641,10.347,10.346C134.04,165.508,129.398,170.149,123.693,170.149z M123.693,150.491 c-5.135,0-9.312,4.177-9.312,9.312s4.177,9.312,9.312,9.312s9.312-4.177,9.312-9.312S128.828,150.491,123.693,150.491z" class="st2"/></g><g><path d="M154.216,149.973L154.216,149.973c5.429,0,9.829,4.401,9.829,9.829l0,0c0,5.429-4.401,9.829-9.829,9.829l0,0 c-5.429,0-9.829-4.401-9.829-9.829l0,0C144.387,154.374,148.788,149.973,154.216,149.973z" class="st4"/></g><g><path d="M154.216,170.149c-5.705,0-10.346-4.642-10.346-10.347s4.641-10.346,10.346-10.346 s10.347,4.641,10.347,10.346C164.563,165.508,159.921,170.149,154.216,170.149z M154.216,150.491 c-5.135,0-9.312,4.177-9.312,9.312s4.177,9.312,9.312,9.312s9.312-4.177,9.312-9.312S159.351,150.491,154.216,150.491z" class="st2"/></g><g><path d="M155.847,162.56h-3.303v-0.794c1.574-1.103,2.294-1.755,2.294-2.468c0-0.417-0.249-0.672-0.646-0.672 c-0.424,0-0.659,0.275-0.686,0.726h-0.948c0.027-0.942,0.693-1.58,1.641-1.58c1.029,0,1.587,0.605,1.587,1.425 c0,0.996-0.76,1.648-1.883,2.495h1.944L155.847,162.56L155.847,162.56z" class="st6"/></g><g><path d="M184.738,149.973L184.738,149.973c5.429,0,9.829,4.401,9.829,9.829l0,0c0,5.429-4.401,9.829-9.829,9.829l0,0 c-5.429,0-9.829-4.401-9.829-9.829l0,0C174.909,154.374,179.31,149.973,184.738,149.973z" class="st4"/></g><g><path d="M184.738,170.149c-5.705,0-10.347-4.642-10.347-10.347s4.642-10.346,10.347-10.346 s10.347,4.641,10.347,10.346C195.085,165.508,190.443,170.149,184.738,170.149z M184.738,150.491 c-5.135,0-9.312,4.177-9.312,9.312s4.177,9.312,9.312,9.312s9.312-4.177,9.312-9.312S189.873,150.491,184.738,150.491z" class="st7"/></g><g><path d="M185.596,160.119c0.47,0.114,0.84,0.491,0.84,1.042c0,0.895-0.699,1.48-1.708,1.48 c-0.968,0-1.648-0.464-1.728-1.446h0.934c0.095,0.464,0.397,0.618,0.821,0.618c0.41,0,0.733-0.221,0.733-0.652 c0-0.41-0.262-0.592-0.74-0.592h-0.484v-0.78h0.451c0.511,0,0.719-0.229,0.719-0.625c0-0.377-0.296-0.565-0.693-0.565 c-0.383,0-0.672,0.168-0.753,0.619h-0.935c0.074-0.922,0.727-1.446,1.709-1.446c0.941,0,1.6,0.531,1.6,1.324 C186.362,159.668,186.033,159.991,185.596,160.119z" class="st9"/></g><g><path d="M215.261,149.973L215.261,149.973c5.429,0,9.829,4.401,9.829,9.829l0,0c0,5.429-4.401,9.829-9.829,9.829l0,0 c-5.429,0-9.829-4.401-9.829-9.829l0,0C205.432,154.374,209.833,149.973,215.261,149.973z" class="st4"/></g><g><path d="M215.262,170.149c-5.706,0-10.348-4.642-10.348-10.347s4.642-10.346,10.348-10.346 c5.705,0,10.347,4.641,10.347,10.346C225.608,165.508,220.967,170.149,215.262,170.149z M215.262,150.491 c-5.135,0-9.312,4.177-9.312,9.312s4.178,9.312,9.312,9.312s9.312-4.177,9.312-9.312S220.396,150.491,215.262,150.491z" class="st7"/></g><g><path d="M216.451,162.56h-0.921v-0.982h-2.065v-0.8l1.998-2.926h0.988v2.885h0.612v0.841h-0.612V162.56z M215.53,159.076l-1.11,1.661h1.11V159.076z" class="st9"/></g><g><path d="M245.784,149.973L245.784,149.973c5.429,0,9.829,4.401,9.829,9.829l0,0c0,5.429-4.401,9.829-9.829,9.829l0,0 c-5.429,0-9.829-4.401-9.829-9.829l0,0C235.955,154.374,240.356,149.973,245.784,149.973z" class="st4"/></g><g><path d="M245.784,170.149c-5.705,0-10.347-4.642-10.347-10.347s4.642-10.346,10.347-10.346 s10.347,4.641,10.347,10.346C256.131,165.508,251.489,170.149,245.784,170.149z M245.784,150.491 c-5.135,0-9.312,4.177-9.312,9.312s4.177,9.312,9.312,9.312s9.312-4.177,9.312-9.312S250.919,150.491,245.784,150.491z" class="st7"/></g><g><path d="M245.972,159.372c0.948,0,1.506,0.713,1.506,1.614c0,0.955-0.679,1.655-1.661,1.655 c-0.955,0-1.513-0.532-1.641-1.298h0.948c0.088,0.302,0.316,0.464,0.666,0.464c0.464,0,0.746-0.31,0.746-0.821 c0-0.491-0.282-0.8-0.739-0.8c-0.377,0-0.592,0.208-0.666,0.457h-0.895l0.296-2.791h2.704v0.868h-1.984l-0.121,0.988 C245.319,159.48,245.629,159.372,245.972,159.372z" class="st9"/></g><g><path d="M276.306,149.973L276.306,149.973c5.429,0,9.829,4.401,9.829,9.829l0,0c0,5.429-4.401,9.829-9.829,9.829l0,0 c-5.429,0-9.829-4.401-9.829-9.829l0,0C266.477,154.374,270.878,149.973,276.306,149.973z" class="st4"/></g><g><path d="M276.307,170.149c-5.706,0-10.348-4.642-10.348-10.347s4.642-10.346,10.348-10.346 c5.705,0,10.347,4.641,10.347,10.346C286.653,165.508,282.012,170.149,276.307,170.149z M276.307,150.491 c-5.135,0-9.312,4.177-9.312,9.312s4.178,9.312,9.312,9.312s9.312-4.177,9.312-9.312S281.441,150.491,276.307,150.491z" class="st7"/></g><g><path d="M276.395,162.641c-0.921,0-1.809-0.659-1.809-2.314c0-1.614,0.72-2.555,1.843-2.555 c0.928,0,1.466,0.47,1.607,1.25h-0.941c-0.101-0.302-0.316-0.464-0.652-0.464c-0.646,0-0.888,0.538-0.908,1.46 c0.255-0.397,0.638-0.525,1.049-0.525c0.766,0,1.499,0.538,1.499,1.554C278.083,161.813,277.532,162.641,276.395,162.641z M276.375,161.854c0.464,0,0.774-0.31,0.774-0.787c0-0.484-0.31-0.787-0.774-0.787c-0.457,0-0.766,0.296-0.766,0.767 C275.609,161.538,275.918,161.854,276.375,161.854z" class="st9"/></g><g><path d="M117.717,193.747c-2.14,0-3.972-1.786-3.972-4.188c0-2.447,1.798-4.245,4.04-4.245 c0.752,0,1.389,0.227,1.867,0.432c0.193,0.091,0.284,0.126,0.387,0.126c0.193,0,0.239-0.126,0.455-0.126 c0.455,0,0.729,1.082,0.729,1.89c0,0.739-0.205,1.024-0.433,1.024c-0.284,0-0.376-0.341-0.569-0.99 c-0.296-0.956-1.445-1.559-2.424-1.571c-1.594,0-2.618,1.263-2.618,3.005c0,1.878,1.252,3.653,3.073,3.653 c0.888,0,1.707-0.375,2.14-1.092c0.227-0.399,0.341-0.888,0.592-0.888c0.193,0,0.307,0.182,0.307,0.535 c0,0.808-0.558,2.083-1.013,2.083c-0.239,0-0.239-0.137-0.455-0.137c-0.091,0-0.228,0.057-0.376,0.137 C119.106,193.543,118.559,193.747,117.717,193.747z M123.354,193.634c-0.91,0-1.434-0.114-1.434-0.422 c0-0.227,0.228-0.295,0.66-0.318c0.137-0.057,0.16-0.399,0.16-1.195v-4.268c0-0.524-0.046-1.15-0.194-1.218 c-0.603-0.034-0.774-0.159-0.774-0.319c0-0.125,0.069-0.216,0.228-0.296c0.455-0.227,1.297-0.398,1.605-0.398 c0.33,0,0.398,0.216,0.398,0.626c0,0.398-0.011,1.002-0.011,1.81v1.536c0.375-0.888,1.172-1.4,2.105-1.4 c1.025,0,1.855,0.603,1.855,2.151v1.776c0,0.785,0,1.115,0.137,1.195c0.444,0.034,0.671,0.091,0.671,0.318 c0,0.319-0.557,0.422-1.422,0.422c-0.968,0-1.503-0.114-1.503-0.422c0-0.227,0.228-0.295,0.717-0.318 c0.137-0.057,0.148-0.569,0.148-1.195v-1.298c0-1.206-0.341-1.718-1.172-1.718c-0.74,0-1.536,0.557-1.536,2.082v0.934 c0,0.762,0.011,1.138,0.136,1.195c0.512,0.034,0.717,0.091,0.717,0.318C124.845,193.531,124.288,193.634,123.354,193.634z M132.162,193.747c-1.752,0-2.947-1.24-2.947-2.97c0-1.776,1.32-3.016,3.141-3.016c1.741,0,2.948,1.24,2.948,2.97 C135.304,192.541,133.949,193.747,132.162,193.747z M130.478,190.265c0,1.365,0.819,2.845,2.049,2.845 c0.865,0,1.525-0.717,1.525-1.866c0-1.378-0.854-2.846-2.06-2.846C131.138,188.398,130.478,189.092,130.478,190.265z M138.887,193.747c-1.753,0-2.948-1.24-2.948-2.97c0-1.776,1.32-3.016,3.141-3.016c1.742,0,2.948,1.24,2.948,2.97 C142.028,192.541,140.674,193.747,138.887,193.747z M137.202,190.265c0,1.365,0.82,2.845,2.049,2.845 c0.865,0,1.525-0.717,1.525-1.866c0-1.378-0.854-2.846-2.06-2.846C137.862,188.398,137.202,189.092,137.202,190.265z M145.395,193.736c-0.433,0-0.763-0.068-1.036-0.171c-0.171-0.057-0.319-0.136-0.421-0.136c-0.193,0-0.148,0.205-0.41,0.205 c-0.421,0-0.808-0.945-0.808-1.605c0-0.376,0.103-0.546,0.285-0.546c0.216,0,0.296,0.284,0.466,0.58 c0.342,0.58,1.036,1.058,1.799,1.058c0.626,0,1.217-0.273,1.217-0.876c0-0.706-0.739-0.797-1.559-0.967 c-1.001-0.217-2.128-0.535-2.128-1.708c0-1.115,1.036-1.786,2.162-1.786c0.387,0,0.74,0.068,1.013,0.159 c0.148,0.045,0.262,0.091,0.364,0.091c0.171,0,0.148-0.171,0.365-0.171c0.364,0,0.774,0.888,0.774,1.491 c0,0.342-0.148,0.49-0.308,0.49c-0.193,0-0.307-0.194-0.466-0.501c-0.296-0.569-0.956-0.945-1.628-0.945 c-0.649,0.012-1.092,0.364-1.092,0.854c0,0.603,0.637,0.694,1.456,0.853c1.013,0.217,2.231,0.535,2.231,1.833 C147.671,193.042,146.67,193.736,145.395,193.736z M151.04,193.747c-1.605,0-2.686-1.172-2.686-2.868 c0-1.843,1.298-3.107,2.88-3.107c1.434,0,2.333,1.002,2.333,1.992c0,0.501-0.251,0.854-0.694,0.854h-3.369 c0.068,1.217,0.774,2.014,1.912,2.014c0.797,0,1.297-0.398,1.627-0.728c0.114-0.103,0.205-0.194,0.319-0.194 c0.148,0,0.239,0.103,0.239,0.296c0,0.205-0.125,0.501-0.376,0.774C152.816,193.269,152.076,193.747,151.04,193.747z M149.538,189.992l2.356-0.023c0.364,0,0.558-0.125,0.558-0.444c0-0.603-0.49-1.15-1.287-1.15 C150.289,188.375,149.674,189.013,149.538,189.992z M156.822,192.097c0-1.081,0.978-1.821,2.424-1.821 c0.444,0,0.876,0.08,1.275,0.182v-0.649c0-0.523-0.023-1.411-0.877-1.411c-0.444,0-0.808,0.307-1.183,0.763 c-0.194,0.239-0.399,0.466-0.752,0.466c-0.284,0-0.489-0.182-0.489-0.444c0-0.603,1.491-1.411,2.72-1.411 c1.161,0,1.833,0.626,1.833,1.787v2.14c0,0.649,0.034,1.07,0.717,1.218c0.068,0.011,0.091,0.045,0.091,0.113 c0,0.262-0.33,0.615-0.922,0.615c-0.512,0-0.922-0.273-1.104-0.945c-0.421,0.683-1.104,1.036-1.89,1.036 C157.561,193.736,156.822,193.053,156.822,192.097z M158.096,191.926c0,0.581,0.399,1.013,1.047,1.013c0.74,0,1.4-0.626,1.4-1.468 v-0.341c-0.261-0.125-0.671-0.239-1.081-0.239C158.574,190.891,158.096,191.312,158.096,191.926z M168.367,193.747 c-1.57,0-2.663-1.217-2.663-2.913c0-1.707,1.195-3.073,2.845-3.073c1.378,0,2.265,0.979,2.265,1.696 c0,0.364-0.216,0.614-0.557,0.614c-0.433,0-0.558-0.421-0.786-0.91c-0.17-0.364-0.432-0.786-1.081-0.786 c-0.91,0-1.479,0.865-1.479,1.969c0,1.355,0.739,2.277,1.866,2.277c0.808,0,1.286-0.478,1.593-0.786 c0.137-0.136,0.217-0.216,0.342-0.216c0.136,0,0.228,0.103,0.228,0.296c0,0.216-0.137,0.558-0.399,0.854 C170.154,193.235,169.403,193.747,168.367,193.747z M171.426,192.097c0-1.081,0.979-1.821,2.424-1.821 c0.444,0,0.877,0.08,1.275,0.182v-0.649c0-0.523-0.023-1.411-0.876-1.411c-0.444,0-0.808,0.307-1.184,0.763 c-0.193,0.239-0.398,0.466-0.751,0.466c-0.285,0-0.489-0.182-0.489-0.444c0-0.603,1.491-1.411,2.72-1.411 c1.161,0,1.832,0.626,1.832,1.787v2.14c0,0.649,0.034,1.07,0.717,1.218c0.068,0.011,0.091,0.045,0.091,0.113 c0,0.262-0.33,0.615-0.922,0.615c-0.512,0-0.922-0.273-1.104-0.945c-0.421,0.683-1.104,1.036-1.889,1.036 C172.166,193.736,171.426,193.053,171.426,192.097z M172.701,191.926c0,0.581,0.398,1.013,1.047,1.013c0.74,0,1.4-0.626,1.4-1.468 v-0.341c-0.262-0.125-0.672-0.239-1.081-0.239C173.179,190.891,172.701,191.312,172.701,191.926z M179.097,193.634 c-0.91,0-1.434-0.114-1.434-0.422c0-0.227,0.228-0.295,0.661-0.318c0.125-0.057,0.147-0.399,0.147-1.195v-1.582 c0-0.512-0.022-1.173-0.17-1.252c-0.581-0.034-0.729-0.16-0.729-0.319c0-0.114,0.069-0.205,0.228-0.296 c0.398-0.205,1.229-0.387,1.536-0.387c0.331,0,0.399,0.217,0.399,0.626v0.751c0.375-0.944,1.127-1.445,1.73-1.445 c0.444,0,0.865,0.285,0.865,0.842c0,0.512-0.285,0.82-0.672,0.82c-0.262,0-0.421-0.126-0.557-0.274 c-0.103-0.102-0.194-0.239-0.387-0.239c-0.376,0-0.991,0.592-0.991,1.639v1.116c0,0.751,0.035,1.127,0.16,1.183 c0.637,0.035,0.876,0.103,0.876,0.33C180.759,193.531,180.167,193.634,179.097,193.634z M184.976,193.736 c-1.354,0-2.356-1.184-2.356-2.891c0-1.844,1.104-3.073,2.709-3.073c0.751,0,1.343,0.285,1.73,0.717v-1.013 c0-0.512-0.068-1.172-0.25-1.252c-0.615-0.022-0.808-0.159-0.808-0.318c0-0.137,0.079-0.228,0.262-0.308 c0.443-0.216,1.343-0.398,1.661-0.398c0.33,0,0.399,0.216,0.399,0.626c0,0.398-0.012,1.013-0.012,1.832v3.756 c0,0.558,0.023,1.184,0.16,1.252c0.58,0.034,0.739,0.16,0.739,0.319c0,0.114-0.068,0.205-0.239,0.296 c-0.421,0.205-1.206,0.387-1.502,0.387c-0.33,0-0.398-0.217-0.398-0.626c0-0.16,0.011-0.41,0.011-0.706 C186.752,193.156,185.955,193.736,184.976,193.736z M183.952,190.674c0,1.434,0.637,2.22,1.502,2.22 c0.831,0,1.639-0.694,1.617-2.368c-0.012-1.525-0.683-2.139-1.526-2.139C184.51,188.387,183.952,189.297,183.952,190.674z M194.396,193.668c-0.899,0-1.457-0.478-1.457-1.491l-0.011-3.472h-0.319c-0.216,0-0.421-0.091-0.421-0.318 c0-0.296,0.375-0.626,0.751-0.956c0.341-0.285,0.66-0.535,0.933-0.535c0.194,0,0.307,0.125,0.307,0.375v0.717h1.309 c0.421,0,0.911-0.113,1.821-0.113c1.013,0,1.457,0.148,1.457,0.432c0,0.228-0.227,0.307-0.694,0.33 c-0.091,0.103,0.023,0.592,0.193,1.07c0.296,0.842,0.808,1.98,1.184,2.72c0.353-0.876,0.774-2.117,0.967-2.834 c0.092-0.353,0.205-0.853,0.103-0.979c-0.49-0.034-0.706-0.102-0.706-0.318c0-0.273,0.524-0.421,1.286-0.421 c0.706,0,1.161,0.159,1.161,0.409c0,0.228-0.205,0.296-0.58,0.342c-0.216,0.102-0.33,0.353-0.501,0.865 c-0.524,1.457-0.819,2.322-1.297,3.608c-0.626,1.65-1.082,2.674-2.277,2.674c-0.694,0-1.172-0.455-1.172-0.979 c0-0.443,0.307-0.762,0.694-0.762s0.615,0.25,0.638,0.615c0.011,0.102,0.011,0.193,0.011,0.273 c0.011,0.079,0.068,0.148,0.171,0.148c0.307,0,0.523-0.319,0.705-0.843c0.091-0.284,0.023-0.557-0.296-1.229 c-0.398-0.865-1.149-2.583-1.57-3.63c-0.205-0.513-0.399-0.683-0.82-0.683h-1.787v3.039c0,0.694,0.183,0.99,0.74,0.99 c0.421,0,0.751-0.342,1.002-0.342c0.125,0,0.216,0.103,0.216,0.251C196.137,193.03,195.283,193.668,194.396,193.668z M203.881,195.751c-0.933,0-1.457-0.114-1.457-0.41c0-0.228,0.239-0.296,0.683-0.33c0.125-0.046,0.148-0.399,0.148-1.195v-3.711 c0-0.489-0.023-1.149-0.171-1.24c-0.58-0.034-0.728-0.16-0.728-0.319c0-0.114,0.057-0.205,0.227-0.296 c0.399-0.205,1.23-0.387,1.537-0.387c0.319,0,0.398,0.205,0.398,0.626c0,0.148,0,0.376-0.011,0.672 c0.353-0.82,1.195-1.389,2.139-1.389c1.309,0,2.322,1.127,2.322,2.88c0,1.764-1.115,3.084-2.72,3.084 c-0.728,0-1.343-0.285-1.741-0.66v0.74c0,0.717,0.034,1.126,0.182,1.195c0.66,0.045,0.888,0.102,0.888,0.33 C205.577,195.659,204.996,195.751,203.881,195.751z M204.473,191.016c0,1.502,0.705,2.094,1.548,2.094 c1.001,0,1.616-0.865,1.616-2.231c0-1.388-0.626-2.242-1.525-2.242C205.326,188.637,204.473,189.32,204.473,191.016z M212.315,193.747c-1.605,0-2.686-1.172-2.686-2.868c0-1.843,1.297-3.107,2.879-3.107c1.434,0,2.334,1.002,2.334,1.992 c0,0.501-0.251,0.854-0.695,0.854h-3.369c0.069,1.217,0.774,2.014,1.913,2.014c0.796,0,1.297-0.398,1.627-0.728 c0.114-0.103,0.205-0.194,0.319-0.194c0.148,0,0.239,0.103,0.239,0.296c0,0.205-0.125,0.501-0.376,0.774 C214.09,193.269,213.351,193.747,212.315,193.747z M210.813,189.992l2.356-0.023c0.364,0,0.557-0.125,0.557-0.444 c0-0.603-0.489-1.15-1.286-1.15C211.564,188.375,210.949,189.013,210.813,189.992z" class="st6"/></g><g><path d="M113.347,212.051c0-2.286,1.853-4.139,4.138-4.139h165.03c2.285,0,4.138,1.853,4.138,4.139v28.97 c0,2.286-1.853,4.139-4.138,4.139h-165.03c-2.285,0-4.138-1.853-4.138-4.139L113.347,212.051L113.347,212.051z" class="st11"/></g><g><path d="M142.106,229.081l-8.692-5.911c-0.417-0.284-0.986-0.176-1.27,0.242l-3.061,4.501 c-0.284,0.417-0.176,0.986,0.242,1.27l8.692,5.911c0.417,0.284,0.986,0.176,1.27-0.242l3.061-4.5 C142.632,229.934,142.524,229.365,142.106,229.081z" class="st12"/></g><g><path d="M131.58,224.206c0,0,0.34,0.045,0.704,0.023c0.363-0.022,0.885-0.181,0.885-0.181s0.181,2.067,0.432,2.316 c0.25,0.25,1.112,0.886,1.908,0.455c0.795-0.432,1.149-0.497,0.999-1.044c-0.149-0.548-1.272-2.681-1.272-2.681 s-0.023-1.18-0.023-1.408c0-0.227,0.249-1.908-1.159-2.203c-1.408-0.296-2.476-0.25-3.407-0.568 c-0.932-0.317-1.726-1.136-1.726-1.136s-3.52,1.408-3.588,4.429c0,0,1.34,1.295,1.863,2.225c0.523,0.931,1.181,3.18,2.021,3.225 l2.361-3.452H131.58z" class="st13"/></g><g><path d="M135.531,233.473l-5.769-3.861c0,0-1.681,1.432-0.932,2.204c0.749,0.772,1.999-0.091,1.999-0.091 s-0.523,1.067,0,1.499c0.523,0.432,1.863-0.159,1.863-0.159s-0.544,1.09,0.273,1.499 C133.782,234.973,135.1,233.973,135.531,233.473L135.531,233.473z" class="st13"/></g><g><path d="M138.498,235.492c-0.22,0-0.442-0.063-0.637-0.196l-8.735-5.942c-0.518-0.353-0.652-1.061-0.301-1.578 l2.582-3.796c0.066-0.098,0.198-0.123,0.295-0.056c0.097,0.066,0.123,0.198,0.056,0.296l-2.581,3.795 c-0.22,0.323-0.136,0.767,0.188,0.987l8.735,5.942c0.157,0.106,0.345,0.145,0.533,0.11c0.187-0.036,0.348-0.143,0.455-0.3 l3.048-4.482c0.107-0.156,0.146-0.346,0.111-0.532c-0.036-0.186-0.142-0.347-0.299-0.454l-5.711-3.885 c-0.097-0.066-0.123-0.198-0.056-0.296c0.066-0.098,0.198-0.124,0.295-0.056l5.711,3.885c0.251,0.171,0.421,0.429,0.478,0.727 s-0.006,0.601-0.177,0.852l-3.048,4.482C139.22,235.318,138.862,235.492,138.498,235.492z" class="st14"/></g><g><path d="M133.175,227.11l-0.119-0.081c-0.097-0.066-0.228-0.041-0.294,0.056l-0.215,0.317 c-0.066,0.096-0.041,0.228,0.056,0.294l0.118,0.08c0.097,0.066,0.229,0.041,0.294-0.056l0.216-0.316 C133.296,227.307,133.271,227.176,133.175,227.11z" class="st1"/></g><g><path d="M133.637,226.445l-0.119-0.081c-0.097-0.066-0.228-0.041-0.294,0.056l-0.139,0.204 c-0.065,0.097-0.04,0.228,0.056,0.294l0.119,0.081c0.097,0.065,0.228,0.04,0.294-0.056l0.139-0.204 C133.758,226.642,133.733,226.51,133.637,226.445z" class="st1"/></g><g><path d="M133.703,227.625l-0.119-0.08c-0.096-0.066-0.228-0.041-0.294,0.056l-0.139,0.204 c-0.065,0.096-0.04,0.228,0.056,0.294l0.119,0.08c0.097,0.066,0.228,0.041,0.294-0.056l0.139-0.204 C133.825,227.823,133.8,227.691,133.703,227.625z" class="st1"/></g><g><path d="M134.215,226.84l-0.118-0.081c-0.097-0.066-0.228-0.041-0.294,0.056l-0.235,0.346 c-0.066,0.096-0.041,0.228,0.056,0.294l0.118,0.08c0.097,0.066,0.228,0.041,0.294-0.056l0.235-0.345 C134.337,227.037,134.312,226.905,134.215,226.84z" class="st1"/></g><g><path d="M140.868,229.369l-3.014-2.049c-0.377-0.257-0.89-0.159-1.147,0.218c-0.256,0.377-0.158,0.891,0.219,1.147 l3.013,2.05c0.377,0.256,0.891,0.159,1.147-0.219C141.343,230.139,141.245,229.626,140.868,229.369z" class="st2"/></g><g><path d="M129.127,227.889c-0.049,0-0.097-0.017-0.137-0.051c-0.6-0.506-1.003-1.314-1.431-2.171 c-0.56-1.12-1.194-2.391-2.415-3.357c-0.055-0.044-0.084-0.111-0.08-0.181c0.2-3.116,3.587-4.497,3.731-4.555 c0.109-0.04,0.233,0.01,0.276,0.119s-0.01,0.233-0.119,0.276c-0.032,0.014-3.198,1.308-3.455,4.077 c1.237,1.015,1.877,2.297,2.443,3.431c0.425,0.851,0.792,1.586,1.325,2.036c0.09,0.075,0.101,0.21,0.025,0.3 C129.248,227.863,129.188,227.889,129.127,227.889z" class="st14"/></g><g><path d="M129.617,232.327c-0.196,0-0.393-0.039-0.585-0.133c-0.335-0.164-0.53-0.44-0.562-0.798 c-0.056-0.629,0.438-1.457,1.199-2.016c0.096-0.067,0.228-0.049,0.298,0.046c0.069,0.095,0.049,0.229-0.046,0.298 c-0.638,0.467-1.07,1.154-1.027,1.635c0.018,0.206,0.125,0.354,0.325,0.452c0.624,0.31,1.427-0.267,1.743-0.528 c0.09-0.075,0.226-0.062,0.3,0.028c0.075,0.091,0.062,0.225-0.028,0.3C130.874,231.909,130.254,232.327,129.617,232.327z" class="st14"/></g><g><path d="M131.475,233.662c-0.196,0-0.393-0.04-0.584-0.134c-0.419-0.205-0.54-0.52-0.566-0.747 c-0.069-0.587,0.393-1.352,1.236-2.047c0.089-0.076,0.224-0.062,0.299,0.028c0.075,0.091,0.062,0.226-0.029,0.3 c-0.709,0.585-1.134,1.239-1.083,1.669c0.021,0.181,0.129,0.316,0.331,0.414c0.536,0.262,1.201-0.123,1.55-0.377 c0.094-0.067,0.227-0.048,0.297,0.048c0.069,0.096,0.047,0.229-0.048,0.298C132.499,233.388,131.991,233.662,131.475,233.662z" class="st14"/></g><g><path d="M133.455,234.957c-0.225,0-0.441-0.051-0.65-0.152c-0.433-0.212-0.562-0.526-0.595-0.753 c-0.081-0.569,0.341-1.308,1.189-2.078c0.086-0.079,0.221-0.073,0.3,0.014c0.079,0.087,0.073,0.222-0.014,0.301 c-0.719,0.653-1.112,1.291-1.054,1.704c0.026,0.184,0.144,0.324,0.36,0.43c0.642,0.312,1.439-0.064,2.363-1.12 c0.076-0.089,0.211-0.097,0.3-0.02c0.088,0.077,0.097,0.212,0.02,0.301C134.875,234.497,134.13,234.957,133.455,234.957z" class="st14"/></g><g><path d="M132.075,229.794c-0.042,0-0.083-0.012-0.12-0.037l-1.804-1.228c-0.097-0.066-0.123-0.198-0.056-0.296 c0.066-0.098,0.198-0.123,0.295-0.056l1.804,1.228c0.097,0.066,0.123,0.198,0.056,0.296 C132.21,229.762,132.143,229.794,132.075,229.794z" class="st14"/></g><g><path d="M134.703,231.581c-0.042,0-0.083-0.012-0.12-0.037l-1.803-1.226c-0.097-0.065-0.123-0.198-0.056-0.295 c0.065-0.1,0.198-0.125,0.295-0.057l1.803,1.226c0.097,0.065,0.123,0.198,0.056,0.295 C134.838,231.549,134.771,231.581,134.703,231.581z" class="st14"/></g><g><path d="M132.273,227.326l0.999-1.47c0.053-0.077,0.032-0.18-0.043-0.232l-0.503-0.342 c-0.042-0.029-0.096-0.036-0.146-0.021l-0.321,0.104c-0.035,0.011-0.065,0.034-0.087,0.065l-0.726,1.068 c-0.02,0.028-0.029,0.062-0.029,0.096l0.002,0.271c0,0.055,0.028,0.106,0.074,0.138l0.547,0.368 C132.117,227.422,132.22,227.403,132.273,227.326z" class="st1"/></g><g><path d="M134.866,227.176c-0.406,0-0.715-0.144-0.933-0.3c-0.646-0.466-1-1.42-0.962-2.548 c-1.036,0.467-2.226-0.425-2.283-0.468c-0.093-0.07-0.111-0.204-0.041-0.298c0.071-0.092,0.205-0.11,0.298-0.041 c0.013,0.011,1.29,0.96,2.131,0.24c0.067-0.057,0.162-0.066,0.238-0.025c0.078,0.041,0.122,0.125,0.111,0.212 c-0.134,1.142,0.162,2.155,0.755,2.582c0.388,0.28,0.893,0.288,1.458,0.024c0.284-0.134,0.455-0.303,0.524-0.517 c0.165-0.51-0.252-1.259-0.621-1.919c-0.265-0.476-0.514-0.925-0.565-1.299c-0.05-0.372-0.02-0.715,0.01-1.045 c0.058-0.657,0.104-1.176-0.469-1.733c-0.343-0.333-1.079-0.439-1.93-0.563c-1.266-0.184-2.842-0.413-3.828-1.568 c-0.077-0.089-0.066-0.224,0.023-0.3c0.089-0.076,0.224-0.065,0.3,0.024c0.882,1.032,2.308,1.24,3.565,1.423 c0.924,0.134,1.723,0.25,2.166,0.68c0.719,0.698,0.656,1.398,0.596,2.075c-0.027,0.308-0.056,0.626-0.012,0.951 c0.04,0.294,0.271,0.709,0.515,1.148c0.41,0.736,0.875,1.571,0.654,2.257c-0.106,0.328-0.357,0.587-0.749,0.771 C135.458,227.11,135.141,227.176,134.866,227.176z" class="st14"/></g><g><path d="M154.317,223.501h-1.087v-5.432h2.173c1.203,0,1.995,0.683,1.995,1.847s-0.792,1.855-1.995,1.855h-1.086 V223.501z M154.317,219.063v1.715h1.102c0.566,0,0.892-0.326,0.892-0.862c0-0.527-0.326-0.853-0.892-0.853H154.317z M159.149,223.501h-1.048v-5.432h1.048v2.049c0.248-0.365,0.605-0.528,1.055-0.528c0.916,0,1.381,0.481,1.381,1.638v2.273h-1.04 v-2.188c0-0.621-0.217-0.83-0.651-0.83c-0.482,0-0.745,0.326-0.745,0.939V223.501z M162.692,225.24 c-0.248,0-0.45-0.024-0.621-0.07l0.062-0.869c0.163,0.054,0.288,0.054,0.412,0.054c0.271,0,0.411-0.085,0.527-0.411l0.194-0.528 l-1.373-3.74h1.102l0.83,2.553l0.815-2.553h1.063l-1.645,4.4C163.724,224.952,163.383,225.24,162.692,225.24z M167.563,223.594 c-1.055,0-1.668-0.45-1.754-1.319h1.032c0.062,0.388,0.303,0.551,0.753,0.551c0.411,0,0.644-0.116,0.644-0.38 c0-0.202-0.147-0.326-0.551-0.411l-0.318-0.078c-1.001-0.225-1.436-0.535-1.436-1.172c0-0.791,0.59-1.195,1.568-1.195 c1.079,0,1.668,0.435,1.715,1.281h-1.024c-0.024-0.373-0.249-0.52-0.652-0.52c-0.365,0-0.575,0.108-0.575,0.364 c0,0.194,0.14,0.319,0.536,0.404l0.326,0.07c0.993,0.225,1.443,0.543,1.443,1.187C169.27,223.175,168.626,223.594,167.563,223.594 z M170.496,219.094c-0.326,0-0.566-0.249-0.566-0.559s0.24-0.551,0.566-0.551s0.567,0.241,0.567,0.551 S170.822,219.094,170.496,219.094z M171.016,223.501h-1.048v-3.825h1.048V223.501z M173.614,223.594 c-1.14,0-1.885-0.783-1.885-2.009c0-1.211,0.768-1.995,1.916-1.995c0.939,0,1.661,0.474,1.785,1.444h-1.063 c-0.132-0.388-0.38-0.575-0.753-0.575c-0.52,0-0.846,0.404-0.846,1.126c0,0.721,0.319,1.133,0.846,1.133 c0.381,0,0.66-0.21,0.769-0.637h1.055C175.283,223.028,174.584,223.594,173.614,223.594z M177.623,219.59 c1.14,0,1.637,0.474,1.637,1.607v2.304h-0.986v-0.496c-0.225,0.333-0.597,0.589-1.14,0.589c-0.823,0-1.335-0.419-1.335-1.109 c0-0.784,0.667-1.203,1.692-1.203c0.295,0,0.512,0.023,0.729,0.07v-0.303c0-0.473-0.209-0.675-0.636-0.675 c-0.411,0-0.629,0.217-0.652,0.52h-1.04C175.97,220.009,176.691,219.59,177.623,219.59z M177.421,222.803 c0.419,0,0.799-0.295,0.799-0.761v-0.046c-0.194-0.054-0.365-0.078-0.636-0.078c-0.466,0-0.745,0.148-0.745,0.466 C176.839,222.648,177.017,222.803,177.421,222.803z M181.255,223.548c-0.76,0-1.094-0.342-1.094-1.032v-4.447h1.048v4.206 c0,0.272,0.069,0.396,0.318,0.396c0.039,0,0.085,0,0.132-0.008v0.838C181.558,223.525,181.434,223.548,181.255,223.548z M185.883,223.594c-1.14,0-1.885-0.783-1.885-2.009c0-1.211,0.768-1.995,1.916-1.995c0.939,0,1.661,0.474,1.785,1.444h-1.063 c-0.132-0.388-0.38-0.575-0.753-0.575c-0.52,0-0.846,0.404-0.846,1.126c0,0.721,0.319,1.133,0.846,1.133 c0.381,0,0.66-0.21,0.769-0.637h1.055C187.552,223.028,186.853,223.594,185.883,223.594z M189.892,219.59 c1.14,0,1.637,0.474,1.637,1.607v2.304h-0.986v-0.496c-0.225,0.333-0.597,0.589-1.14,0.589c-0.823,0-1.335-0.419-1.335-1.109 c0-0.784,0.667-1.203,1.692-1.203c0.295,0,0.512,0.023,0.729,0.07v-0.303c0-0.473-0.209-0.675-0.636-0.675 c-0.412,0-0.629,0.217-0.652,0.52h-1.04C188.239,220.009,188.96,219.59,189.892,219.59z M189.69,222.803 c0.419,0,0.799-0.295,0.799-0.761v-0.046c-0.194-0.054-0.365-0.078-0.636-0.078c-0.466,0-0.745,0.148-0.745,0.466 C189.108,222.648,189.286,222.803,189.69,222.803z M193.478,223.501h-1.048v-3.825h0.985v0.558 c0.225-0.442,0.567-0.605,0.924-0.605c0.093,0,0.225,0.008,0.31,0.031v0.97c-0.163-0.023-0.256-0.031-0.388-0.031 c-0.496,0-0.783,0.326-0.783,1.024L193.478,223.501L193.478,223.501z M196.663,223.594c-1.04,0-1.707-0.783-1.707-2.009 c0-1.211,0.698-1.995,1.707-1.995c0.442,0,0.776,0.148,1.047,0.443v-1.964h1.04v5.432h-0.978v-0.442 C197.462,223.416,197.113,223.594,196.663,223.594z M196.865,222.718c0.55,0,0.876-0.404,0.876-1.133 c0-0.722-0.326-1.126-0.876-1.126c-0.544,0-0.87,0.404-0.87,1.126C195.995,222.314,196.321,222.718,196.865,222.718z" class="st6"/></g><g><path d="M153,233.21c0-1.426,0.895-2.421,2.24-2.421c1.036,0,1.782,0.578,2.051,1.533h-0.679 c-0.229-0.632-0.7-0.928-1.372-0.928c-0.975,0-1.587,0.7-1.587,1.823s0.618,1.822,1.594,1.822c0.793,0,1.345-0.43,1.479-1.345 h-1.298v-0.592h1.984v0.148c0,1.46-0.908,2.395-2.186,2.395C153.895,235.645,153,234.663,153,233.21z M158.831,235.571h-0.625 v-3.302h0.598v0.558c0.182-0.404,0.498-0.592,0.875-0.592c0.067,0,0.154,0.007,0.222,0.027v0.592 c-0.101-0.014-0.155-0.021-0.242-0.021c-0.559,0-0.828,0.391-0.828,1.164V235.571z M163.262,233.815v0.222h-2.374 c0.034,0.713,0.411,1.056,0.935,1.056c0.41,0,0.639-0.148,0.78-0.484h0.646c-0.242,0.74-0.807,1.036-1.426,1.036 c-0.928,0-1.574-0.68-1.574-1.729c0-1.143,0.693-1.721,1.554-1.721C162.697,232.195,163.262,232.874,163.262,233.815z M160.909,233.566h1.701c-0.04-0.564-0.33-0.833-0.807-0.833C161.325,232.733,160.996,232.995,160.909,233.566z M165.296,232.195 c0.854,0,1.311,0.376,1.311,1.331v2.045h-0.598v-0.458c-0.202,0.29-0.511,0.532-1.029,0.532c-0.666,0-1.137-0.343-1.137-0.928 c0-0.68,0.572-1.029,1.419-1.029c0.249,0,0.471,0.02,0.72,0.074v-0.337c0-0.497-0.256-0.692-0.7-0.692 c-0.45,0-0.679,0.195-0.726,0.538h-0.632C163.978,232.578,164.543,232.195,165.296,232.195z M165.101,235.12 c0.471,0,0.881-0.343,0.881-0.82v-0.054c-0.235-0.061-0.437-0.088-0.7-0.088c-0.504,0-0.807,0.162-0.807,0.505 C164.475,234.952,164.67,235.12,165.101,235.12z M168.593,235.624c-0.665,0-0.894-0.336-0.894-0.874v-1.917h-0.498v-0.564h0.195 c0.209,0,0.303-0.095,0.303-0.303v-0.612h0.625v0.915h0.754v0.564h-0.754v1.783c0,0.282,0.068,0.437,0.424,0.437 c0.128,0,0.215-0.014,0.33-0.047v0.551C168.916,235.598,168.755,235.624,168.593,235.624z M172.304,235.571h-0.618v-2.738h-0.498 v-0.564h0.491v-0.579c0-0.572,0.356-0.901,0.982-0.901c0.141,0,0.276,0.02,0.403,0.054v0.565 c-0.101-0.034-0.195-0.047-0.296-0.047c-0.302,0-0.464,0.1-0.464,0.43v0.478h0.693v0.564h-0.693L172.304,235.571L172.304,235.571z M174.86,235.645c-0.942,0-1.567-0.68-1.567-1.729c0-1.042,0.625-1.721,1.567-1.721c0.941,0,1.56,0.679,1.56,1.721 C176.42,234.965,175.801,235.645,174.86,235.645z M174.86,235.08c0.585,0,0.928-0.404,0.928-1.164s-0.343-1.157-0.928-1.157 c-0.592,0-0.935,0.397-0.935,1.157S174.268,235.08,174.86,235.08z M177.819,235.571h-0.626v-3.302h0.599v0.558 c0.181-0.404,0.497-0.592,0.874-0.592c0.067,0,0.155,0.007,0.222,0.027v0.592c-0.101-0.014-0.155-0.021-0.242-0.021 c-0.558,0-0.827,0.391-0.827,1.164L177.819,235.571L177.819,235.571z M182.359,235.624c-0.665,0-0.894-0.336-0.894-0.874v-1.917 h-0.498v-0.564h0.195c0.209,0,0.303-0.095,0.303-0.303v-0.612h0.625v0.915h0.754v0.564h-0.754v1.783 c0,0.282,0.068,0.437,0.424,0.437c0.128,0,0.215-0.014,0.33-0.047v0.551C182.682,235.598,182.521,235.624,182.359,235.624z M184.11,235.571h-0.625v-4.708h0.625v1.829c0.243-0.363,0.538-0.497,0.989-0.497c0.76,0,1.143,0.43,1.143,1.358v2.018h-0.625 v-1.964c0-0.592-0.195-0.841-0.666-0.841c-0.598,0-0.841,0.404-0.841,1.076V235.571z M189.986,233.815v0.222h-2.374 c0.034,0.713,0.411,1.056,0.935,1.056c0.41,0,0.639-0.148,0.78-0.484h0.646c-0.242,0.74-0.807,1.036-1.426,1.036 c-0.928,0-1.574-0.68-1.574-1.729c0-1.143,0.693-1.721,1.554-1.721C189.421,232.195,189.986,232.874,189.986,233.815z M187.633,233.566h1.701c-0.04-0.564-0.33-0.833-0.807-0.833C188.05,232.733,187.72,232.995,187.633,233.566z M193.334,235.571 h-0.619v-2.738h-0.497v-0.564h0.491v-0.579c0-0.572,0.356-0.901,0.982-0.901c0.141,0,0.275,0.02,0.403,0.054v0.565 c-0.101-0.034-0.195-0.047-0.296-0.047c-0.302,0-0.464,0.1-0.464,0.43v0.478h0.693v0.564h-0.693L193.334,235.571L193.334,235.571z M195.269,235.571h-0.626v-3.302h0.599v0.558c0.182-0.404,0.498-0.592,0.874-0.592c0.068,0,0.155,0.007,0.222,0.027v0.592 c-0.101-0.014-0.154-0.021-0.242-0.021c-0.558,0-0.827,0.391-0.827,1.164L195.269,235.571L195.269,235.571z M199.7,233.815v0.222 h-2.374c0.034,0.713,0.41,1.056,0.935,1.056c0.41,0,0.639-0.148,0.78-0.484h0.646c-0.243,0.74-0.807,1.036-1.426,1.036 c-0.928,0-1.574-0.68-1.574-1.729c0-1.143,0.693-1.721,1.554-1.721C199.135,232.195,199.7,232.874,199.7,233.815z M197.346,233.566h1.702c-0.041-0.564-0.33-0.833-0.807-0.833C197.763,232.733,197.434,232.995,197.346,233.566z M203.327,237.03 h-0.625v-1.883c-0.235,0.316-0.578,0.498-1.009,0.498c-0.888,0-1.466-0.68-1.466-1.729c0-1.042,0.578-1.721,1.473-1.721 c0.464,0,0.76,0.174,1.029,0.497v-0.423h0.598L203.327,237.03L203.327,237.03z M201.781,235.08c0.591,0,0.934-0.404,0.934-1.164 c0-0.753-0.343-1.157-0.934-1.157c-0.585,0-0.935,0.404-0.935,1.157C200.846,234.676,201.196,235.08,201.781,235.08z M205.44,235.638c-0.76,0-1.143-0.431-1.143-1.359v-2.01h0.626v1.957c0,0.591,0.195,0.84,0.665,0.84 c0.565,0,0.807-0.403,0.807-1.076v-1.721h0.626v3.302h-0.599v-0.444C206.187,235.49,205.891,235.638,205.44,235.638z M210.806,233.815v0.222h-2.374c0.034,0.713,0.41,1.056,0.935,1.056c0.41,0,0.639-0.148,0.78-0.484h0.646 c-0.243,0.74-0.807,1.036-1.426,1.036c-0.928,0-1.574-0.68-1.574-1.729c0-1.143,0.693-1.721,1.554-1.721 C210.241,232.195,210.806,232.874,210.806,233.815z M208.452,233.566h1.702c-0.041-0.564-0.33-0.833-0.807-0.833 C208.869,232.733,208.54,232.995,208.452,233.566z M212.194,235.571h-0.626v-3.302h0.599v0.43 c0.256-0.357,0.551-0.504,1.009-0.504c0.767,0,1.15,0.43,1.15,1.358v2.018H213.7v-1.964c0-0.592-0.195-0.841-0.665-0.841 c-0.599,0-0.841,0.404-0.841,1.076V235.571z M216.308,235.624c-0.666,0-0.895-0.336-0.895-0.874v-1.917h-0.497v-0.564h0.195 c0.208,0,0.302-0.095,0.302-0.303v-0.612h0.626v0.915h0.753v0.564h-0.753v1.783c0,0.282,0.067,0.437,0.424,0.437 c0.127,0,0.215-0.014,0.329-0.047v0.551C216.631,235.598,216.469,235.624,216.308,235.624z M220.416,235.645 c-0.814,0-1.305-0.37-1.399-1.063h0.639c0.074,0.383,0.336,0.538,0.773,0.538c0.471,0,0.726-0.121,0.726-0.437 c0-0.249-0.168-0.377-0.625-0.484l-0.289-0.068c-0.801-0.188-1.117-0.477-1.117-0.981c0-0.612,0.471-0.955,1.251-0.955 c0.8,0,1.285,0.356,1.352,1.015h-0.639c-0.054-0.356-0.296-0.491-0.699-0.491c-0.411,0-0.639,0.108-0.639,0.397 c0,0.235,0.154,0.363,0.592,0.464l0.295,0.067c0.801,0.182,1.144,0.471,1.144,0.996 C221.781,235.281,221.27,235.645,220.416,235.645z M223.155,237.03h-0.625v-4.761h0.599v0.43c0.282-0.357,0.598-0.504,1.035-0.504 c0.888,0,1.466,0.679,1.466,1.721c0,1.049-0.591,1.729-1.466,1.729c-0.437,0-0.753-0.148-1.009-0.485V237.03z M224.077,235.08 c0.585,0,0.935-0.404,0.935-1.164s-0.35-1.157-0.935-1.157c-0.592,0-0.935,0.397-0.935,1.157S223.485,235.08,224.077,235.08z M229.182,233.815v0.222h-2.374c0.034,0.713,0.411,1.056,0.935,1.056c0.41,0,0.639-0.148,0.78-0.484h0.646 c-0.242,0.74-0.807,1.036-1.426,1.036c-0.928,0-1.573-0.68-1.573-1.729c0-1.143,0.692-1.721,1.553-1.721 C228.618,232.195,229.182,232.874,229.182,233.815z M226.829,233.566h1.701c-0.04-0.564-0.329-0.833-0.807-0.833 C227.246,232.733,226.916,232.995,226.829,233.566z M230.57,235.571h-0.625v-3.302h0.598v0.43 c0.256-0.357,0.552-0.504,1.009-0.504c0.767,0,1.15,0.43,1.15,1.358v2.018h-0.625v-1.964c0-0.592-0.195-0.841-0.666-0.841 c-0.599,0-0.841,0.404-0.841,1.076V235.571z M234.9,235.645c-0.888,0-1.467-0.68-1.467-1.729c0-1.042,0.592-1.721,1.467-1.721 c0.437,0,0.719,0.134,1.008,0.477v-1.809h0.626v4.708h-0.599v-0.444C235.626,235.49,235.337,235.645,234.9,235.645z M234.987,235.08c0.592,0,0.935-0.404,0.935-1.164s-0.343-1.157-0.935-1.157c-0.585,0-0.935,0.397-0.935,1.157 S234.402,235.08,234.987,235.08z M240.321,233.815v0.222h-2.374c0.034,0.713,0.411,1.056,0.935,1.056 c0.41,0,0.639-0.148,0.78-0.484h0.646c-0.242,0.74-0.807,1.036-1.426,1.036c-0.928,0-1.574-0.68-1.574-1.729 c0-1.143,0.693-1.721,1.554-1.721C239.756,232.195,240.321,232.874,240.321,233.815z M237.967,233.566h1.702 c-0.04-0.564-0.33-0.833-0.807-0.833C238.384,232.733,238.055,232.995,237.967,233.566z M241.709,235.571h-0.625v-3.302h0.598 v0.558c0.182-0.404,0.498-0.592,0.875-0.592c0.067,0,0.154,0.007,0.222,0.027v0.592c-0.101-0.014-0.155-0.021-0.243-0.021 c-0.558,0-0.827,0.391-0.827,1.164L241.709,235.571L241.709,235.571z" class="st9"/></g><g><path d="M270.919,230.889c0.404,0.404,1.059,0.404,1.463,0l4.353-4.353l-4.353-4.353 c-0.404-0.404-1.059-0.404-1.463,0c-0.404,0.404-0.404,1.059,0,1.463l2.89,2.89l-2.89,2.89 C270.515,229.83,270.515,230.485,270.919,230.889z" class="st5"/></g><g><path d="M113.347,253.437c0-2.285,1.853-4.138,4.138-4.138h165.03c2.285,0,4.138,1.853,4.138,4.138v28.971 c0,2.286-1.853,4.139-4.138,4.139h-165.03c-2.285,0-4.138-1.853-4.138-4.139L113.347,253.437L113.347,253.437z" class="st11"/></g><g><path d="M135.099,258.43l-9.117,0.017l-1.802,1.592l0.07,15.102c0,0,0.252,1.685,1.668,1.998s7.886,0.188,8.98,0.188 s1.87-1.742,1.87-1.742s-0.084-13.884-0.012-15.086c0.073-1.202-1.656-2.071-1.656-2.071L135.099,258.43z" class="st15"/></g><g><path d="M124.207,275.297c-0.028,1.192,1.443,1.822,1.443,1.822l0.95,0.093l-0.95-1.119v-16.512l0.998-1.151 l-0.998,0.148l-1.339,1.171C124.311,259.749,124.236,274.105,124.207,275.297L124.207,275.297z" class="st16"/></g><g><path d="M135.637,259.946h-8.932v15.933h9.028L135.637,259.946z" class="st17"/></g><g><path d="M130.828,259.995c-0.102,0.367,0.113,0.767,0.43,0.978c0.318,0.211,0.712,0.268,1.093,0.278 c0.382,0.01,0.766-0.019,1.141,0.044c0.102,0.017,0.207,0.042,0.288,0.105c0.085,0.062,0.139,0.158,0.179,0.256 c0.27,0.631,0.095,1.359,0.192,2.039c0.027,0.179,0.073,0.359,0.172,0.51c0.272,0.415,0.87,0.498,1.34,0.337v-4.596 L130.828,259.995L130.828,259.995z" class="st18"/></g><g><path d="M135.562,265.73c-0.376-0.033-0.719,0.256-0.87,0.601c-0.153,0.345-0.156,0.734-0.156,1.111 c0,0.548-0.003,1.097-0.003,1.646c0,0.42,0,0.855,0.163,1.244c0.163,0.388,0.528,0.723,0.95,0.716l-0.081-5.316L135.562,265.73z" class="st18"/></g><g><path d="M134.685,277.425h-8.364c-1.259,0-2.284-1.024-2.284-2.284V260.5c0-1.26,1.024-2.284,2.284-2.284h8.364 c1.259,0,2.284,1.024,2.284,2.284v14.641C136.969,276.4,135.944,277.425,134.685,277.425z M126.321,258.642 c-1.024,0-1.858,0.834-1.858,1.858v14.641c0,1.024,0.833,1.858,1.858,1.858h8.364c1.024,0,1.858-0.834,1.858-1.858V260.5 c0-1.024-0.833-1.858-1.858-1.858H126.321z" class="st14"/></g><g><path d="M127.552,277.425c-1.259,0-2.284-1.024-2.284-2.284V260.5c0-1.26,1.024-2.284,2.284-2.284 c0.118,0,0.213,0.096,0.213,0.213s-0.095,0.213-0.213,0.213c-1.024,0-1.858,0.834-1.858,1.858v14.641 c0,1.024,0.833,1.858,1.858,1.858c0.118,0,0.213,0.096,0.213,0.213S127.669,277.425,127.552,277.425z" class="st14"/></g><g><path d="M135.274,276.098h-8.125c-0.352,0-0.639-0.286-0.639-0.639v-15.123c0-0.353,0.287-0.639,0.639-0.639h8.125 c0.353,0,0.639,0.286,0.639,0.639v15.123C135.913,275.812,135.626,276.098,135.274,276.098z M127.149,260.123 c-0.117,0-0.213,0.096-0.213,0.213v15.123c0,0.117,0.096,0.213,0.213,0.213h8.125c0.118,0,0.213-0.096,0.213-0.213v-15.123 c0-0.117-0.096-0.213-0.213-0.213H127.149z" class="st14"/></g><g><path d="M143.653,261.03h-14.314c-0.592,0-1.072,0.48-1.072,1.072v7.554c0,0.592,0.48,1.071,1.072,1.071h14.314 c0.592,0,1.072-0.479,1.072-1.071v-7.554C144.725,261.51,144.245,261.03,143.653,261.03z" class="st12"/></g><g><path d="M143.468,270.891h-13.99c-0.824,0-1.494-0.67-1.494-1.494v-7.132c0-0.823,0.67-1.493,1.494-1.493h13.99 c0.824,0,1.494,0.67,1.494,1.493v7.132C144.962,270.221,144.292,270.891,143.468,270.891z M129.478,261.197 c-0.589,0-1.068,0.479-1.068,1.067v7.132c0,0.589,0.479,1.068,1.068,1.068h13.99c0.589,0,1.068-0.479,1.068-1.068v-7.132 c0-0.589-0.479-1.067-1.068-1.067H129.478z" class="st14"/></g><g><path d="M131.995,269.307L131.995,269.307l-2.24-0.003c-0.118,0-0.213-0.096-0.212-0.213 c0-0.118,0.095-0.213,0.213-0.213l0,0l2.239,0.003c0.118,0,0.213,0.096,0.212,0.213 C132.208,269.212,132.113,269.307,131.995,269.307z" class="st14"/></g><g><path d="M135.258,269.31L135.258,269.31l-2.237-0.003c-0.118,0-0.213-0.096-0.212-0.213 c0-0.118,0.095-0.213,0.213-0.213l0,0l2.237,0.003c0.118,0,0.213,0.096,0.212,0.213 C135.471,269.215,135.375,269.31,135.258,269.31z" class="st14"/></g><g><path d="M133.131,266.344v-1.824c0.001-0.096-0.178-0.173-0.399-0.173h-1.458c-0.124,0-0.241,0.023-0.316,0.065 l-0.498,0.273c-0.054,0.03-0.084,0.067-0.084,0.106v1.325c0,0.036,0.024,0.07,0.07,0.098l0.372,0.23 c0.075,0.047,0.199,0.074,0.33,0.074h1.582c0.221-0.002,0.399-0.079,0.401-0.173L133.131,266.344L133.131,266.344z" class="st1"/></g><g><path d="M143.069,262.445h-5.881c-0.327,0-0.592,0.265-0.592,0.591v1.021c0,0.326,0.265,0.591,0.592,0.591h5.881 c0.326,0,0.591-0.265,0.591-0.591v-1.021C143.66,262.71,143.395,262.445,143.069,262.445z" class="st2"/></g><g><ellipse cx="131.484" cy="273.035" class="st14" rx="1.461" ry="1.461"/></g><g><path d="M132.271,272.311c0.098,0.072,0.118,0.209,0.046,0.307l-0.953,1.291l-0.685-0.626 c-0.09-0.082-0.096-0.22-0.014-0.31c0.081-0.089,0.22-0.095,0.309-0.014l0.326,0.298l0.665-0.9 C132.037,272.26,132.174,272.239,132.271,272.311z" class="st19"/></g><g><path d="M155.652,264.888h-1.172l-1.855-5.432h1.149l1.327,4.051l1.28-4.051h1.125L155.652,264.888z M158.47,260.48 c-0.326,0-0.567-0.248-0.567-0.558c0-0.311,0.241-0.551,0.567-0.551c0.325,0,0.566,0.24,0.566,0.551 C159.036,260.232,158.795,260.48,158.47,260.48z M158.989,264.888h-1.047v-3.826h1.047V264.888z M160.983,264.888h-1.048v-3.826 h0.985v0.559c0.225-0.442,0.567-0.605,0.924-0.605c0.093,0,0.225,0.007,0.31,0.031v0.97c-0.163-0.024-0.256-0.031-0.388-0.031 c-0.496,0-0.783,0.326-0.783,1.024L160.983,264.888L160.983,264.888z M164.232,264.966c-0.838,0-1.172-0.451-1.172-1.071v-1.964 h-0.535v-0.869h0.217c0.233,0,0.349-0.116,0.349-0.349v-0.691h1.017v1.04h0.792v0.869h-0.792v1.715 c0,0.287,0.085,0.427,0.396,0.427c0.163,0,0.264-0.031,0.396-0.07v0.862C164.698,264.927,164.434,264.966,164.232,264.966z M166.908,264.966c-0.923,0-1.389-0.489-1.389-1.646v-2.258h1.04v2.181c0,0.628,0.217,0.838,0.644,0.838 c0.45,0,0.714-0.326,0.714-0.947v-2.072h1.047v3.826h-0.985v-0.481C167.723,264.787,167.366,264.966,166.908,264.966z M171.537,260.977c1.141,0,1.638,0.473,1.638,1.606v2.305h-0.986v-0.497c-0.225,0.334-0.597,0.59-1.141,0.59 c-0.822,0-1.334-0.419-1.334-1.11c0-0.783,0.667-1.202,1.691-1.202c0.295,0,0.513,0.023,0.73,0.069v-0.302 c0-0.474-0.21-0.675-0.636-0.675c-0.412,0-0.629,0.217-0.652,0.52h-1.04C169.884,261.396,170.606,260.977,171.537,260.977z M171.336,264.19c0.419,0,0.799-0.295,0.799-0.761v-0.046c-0.194-0.055-0.365-0.078-0.636-0.078c-0.466,0-0.745,0.147-0.745,0.466 C170.754,264.034,170.932,264.19,171.336,264.19z M175.17,264.935c-0.761,0-1.094-0.342-1.094-1.033v-4.446h1.047v4.206 c0,0.271,0.07,0.396,0.318,0.396c0.039,0,0.086,0,0.132-0.008v0.838C175.473,264.911,175.348,264.935,175.17,264.935z M179.798,264.981c-1.141,0-1.886-0.784-1.886-2.01c0-1.21,0.769-1.994,1.917-1.994c0.939,0,1.661,0.473,1.785,1.443h-1.063 c-0.132-0.388-0.38-0.574-0.753-0.574c-0.52,0-0.846,0.404-0.846,1.125c0,0.722,0.318,1.133,0.846,1.133 c0.38,0,0.66-0.209,0.768-0.636h1.056C181.466,264.415,180.768,264.981,179.798,264.981z M183.806,260.977 c1.141,0,1.638,0.473,1.638,1.606v2.305h-0.986v-0.497c-0.225,0.334-0.597,0.59-1.141,0.59c-0.822,0-1.334-0.419-1.334-1.11 c0-0.783,0.667-1.202,1.691-1.202c0.295,0,0.513,0.023,0.73,0.069v-0.302c0-0.474-0.21-0.675-0.636-0.675 c-0.412,0-0.629,0.217-0.652,0.52h-1.04C182.153,261.396,182.875,260.977,183.806,260.977z M183.605,264.19 c0.419,0,0.799-0.295,0.799-0.761v-0.046c-0.194-0.055-0.365-0.078-0.636-0.078c-0.466,0-0.745,0.147-0.745,0.466 C183.023,264.034,183.201,264.19,183.605,264.19z M187.392,264.888h-1.047v-3.826h0.985v0.559 c0.225-0.442,0.567-0.605,0.924-0.605c0.093,0,0.225,0.007,0.31,0.031v0.97c-0.163-0.024-0.256-0.031-0.388-0.031 c-0.497,0-0.784,0.326-0.784,1.024V264.888z M190.578,264.981c-1.04,0-1.708-0.784-1.708-2.01c0-1.21,0.699-1.994,1.708-1.994 c0.442,0,0.776,0.147,1.047,0.442v-1.963h1.04v5.432h-0.978v-0.442C191.377,264.803,191.028,264.981,190.578,264.981z M190.779,264.104c0.551,0,0.877-0.403,0.877-1.133c0-0.721-0.326-1.125-0.877-1.125c-0.543,0-0.869,0.404-0.869,1.125 C189.91,263.701,190.236,264.104,190.779,264.104z" class="st6"/></g><g><path d="M153.868,276.957h-0.653v-4.707h0.653V276.957z M155.547,276.957h-0.625v-3.302h0.599v0.431 c0.255-0.357,0.551-0.505,1.008-0.505c0.767,0,1.15,0.431,1.15,1.359v2.017h-0.625v-1.963c0-0.592-0.195-0.841-0.666-0.841 c-0.598,0-0.841,0.403-0.841,1.076L155.547,276.957L155.547,276.957z M159.782,277.031c-0.813,0-1.304-0.37-1.398-1.062h0.638 c0.074,0.383,0.337,0.538,0.774,0.538c0.471,0,0.726-0.121,0.726-0.437c0-0.249-0.168-0.377-0.625-0.485l-0.289-0.067 c-0.801-0.188-1.117-0.477-1.117-0.982c0-0.612,0.471-0.955,1.251-0.955c0.8,0,1.285,0.357,1.352,1.016h-0.639 c-0.054-0.357-0.296-0.491-0.699-0.491c-0.411,0-0.639,0.107-0.639,0.397c0,0.235,0.154,0.363,0.591,0.464l0.296,0.067 c0.801,0.181,1.144,0.471,1.144,0.995C161.148,276.668,160.637,277.031,159.782,277.031z M162.912,277.011 c-0.665,0-0.894-0.336-0.894-0.874v-1.917h-0.498v-0.565h0.195c0.209,0,0.303-0.094,0.303-0.302v-0.612h0.625v0.914h0.754v0.565 h-0.754v1.782c0,0.283,0.068,0.437,0.424,0.437c0.128,0,0.215-0.013,0.33-0.047v0.552 C163.235,276.984,163.074,277.011,162.912,277.011z M165.283,273.581c0.854,0,1.311,0.377,1.311,1.332v2.044h-0.598V276.5 c-0.202,0.289-0.511,0.531-1.029,0.531c-0.666,0-1.137-0.343-1.137-0.928c0-0.679,0.572-1.029,1.419-1.029 c0.249,0,0.471,0.02,0.72,0.074v-0.336c0-0.498-0.256-0.693-0.7-0.693c-0.45,0-0.679,0.195-0.726,0.538h-0.632 C163.965,273.965,164.53,273.581,165.283,273.581z M165.088,276.507c0.471,0,0.881-0.343,0.881-0.821v-0.054 c-0.236-0.06-0.437-0.087-0.7-0.087c-0.504,0-0.807,0.161-0.807,0.504C164.462,276.339,164.657,276.507,165.088,276.507z M168.19,276.957h-0.625v-3.302h0.598v0.431c0.256-0.357,0.552-0.505,1.009-0.505c0.767,0,1.15,0.431,1.15,1.359v2.017h-0.625 v-1.963c0-0.592-0.195-0.841-0.666-0.841c-0.599,0-0.841,0.403-0.841,1.076V276.957z M172.304,277.011 c-0.666,0-0.894-0.336-0.894-0.874v-1.917h-0.498v-0.565h0.195c0.209,0,0.303-0.094,0.303-0.302v-0.612h0.625v0.914h0.753v0.565 h-0.753v1.782c0,0.283,0.067,0.437,0.424,0.437c0.128,0,0.215-0.013,0.329-0.047v0.552 C172.627,276.984,172.466,277.011,172.304,277.011z M176.546,273.581c0.855,0,1.312,0.377,1.312,1.332v2.044h-0.599V276.5 c-0.201,0.289-0.511,0.531-1.029,0.531c-0.666,0-1.136-0.343-1.136-0.928c0-0.679,0.571-1.029,1.419-1.029 c0.249,0,0.471,0.02,0.719,0.074v-0.336c0-0.498-0.255-0.693-0.699-0.693c-0.451,0-0.679,0.195-0.726,0.538h-0.633 C175.228,273.965,175.793,273.581,176.546,273.581z M176.351,276.507c0.471,0,0.881-0.343,0.881-0.821v-0.054 c-0.235-0.06-0.437-0.087-0.699-0.087c-0.504,0-0.807,0.161-0.807,0.504C175.726,276.339,175.921,276.507,176.351,276.507z M179.454,276.957h-0.626v-3.302h0.599v0.431c0.256-0.357,0.551-0.505,1.009-0.505c0.766,0,1.15,0.431,1.15,1.359v2.017h-0.626 v-1.963c0-0.592-0.195-0.841-0.665-0.841c-0.599,0-0.841,0.403-0.841,1.076L179.454,276.957L179.454,276.957z M183.783,277.031 c-0.888,0-1.466-0.679-1.466-1.728c0-1.043,0.592-1.722,1.466-1.722c0.437,0,0.72,0.135,1.009,0.478v-1.809h0.625v4.707h-0.598 v-0.444C184.509,276.877,184.22,277.031,183.783,277.031z M183.87,276.466c0.592,0,0.935-0.403,0.935-1.163 c0-0.76-0.343-1.157-0.935-1.157c-0.585,0-0.934,0.397-0.934,1.157C182.936,276.063,183.285,276.466,183.87,276.466z M189.013,276.957h-0.619v-2.737h-0.498v-0.565h0.491v-0.578c0-0.572,0.357-0.901,0.982-0.901c0.141,0,0.276,0.02,0.404,0.053 v0.565c-0.101-0.033-0.195-0.047-0.296-0.047c-0.303,0-0.464,0.101-0.464,0.431v0.477h0.692v0.565h-0.692L189.013,276.957 L189.013,276.957z M191.11,276.998c-0.592,0-0.821-0.269-0.821-0.801v-3.947h0.626v3.82c0,0.262,0.08,0.376,0.316,0.376 c0.047,0,0.094,0,0.148-0.007v0.525C191.305,276.984,191.204,276.998,191.11,276.998z M194.774,275.202v0.222H192.4 c0.034,0.713,0.41,1.056,0.935,1.056c0.41,0,0.639-0.148,0.78-0.484h0.646c-0.242,0.739-0.807,1.035-1.426,1.035 c-0.928,0-1.574-0.679-1.574-1.728c0-1.143,0.693-1.722,1.554-1.722C194.209,273.581,194.774,274.26,194.774,275.202z M192.42,274.953h1.702c-0.04-0.565-0.33-0.834-0.807-0.834C192.837,274.119,192.508,274.382,192.42,274.953z M195.747,276.957 h-0.706l1.123-1.694l-1.063-1.608h0.72l0.713,1.117l0.706-1.117h0.706l-1.069,1.594l1.13,1.708h-0.72l-0.78-1.217L195.747,276.957 z M198.913,273.003c-0.208,0-0.363-0.162-0.363-0.37c0-0.202,0.155-0.363,0.363-0.363c0.209,0,0.363,0.161,0.363,0.363 C199.276,272.841,199.122,273.003,198.913,273.003z M199.223,276.957h-0.626v-3.302h0.626V276.957z M201.86,277.031 c-0.444,0-0.733-0.148-1.029-0.504v0.43h-0.598v-4.707h0.625v1.829c0.289-0.35,0.578-0.498,1.009-0.498 c0.888,0,1.466,0.679,1.466,1.722C203.333,276.352,202.755,277.031,201.86,277.031z M201.779,276.466 c0.586,0,0.935-0.403,0.935-1.163c0-0.76-0.349-1.157-0.935-1.157c-0.591,0-0.934,0.397-0.934,1.157 C200.845,276.063,201.188,276.466,201.779,276.466z M204.928,276.998c-0.592,0-0.82-0.269-0.82-0.801v-3.947h0.625v3.82 c0,0.262,0.081,0.376,0.316,0.376c0.047,0,0.094,0,0.148-0.007v0.525C205.123,276.984,205.022,276.998,204.928,276.998z M208.593,275.202v0.222h-2.374c0.033,0.713,0.41,1.056,0.934,1.056c0.411,0,0.639-0.148,0.781-0.484h0.645 c-0.242,0.739-0.807,1.035-1.426,1.035c-0.928,0-1.573-0.679-1.573-1.728c0-1.143,0.692-1.722,1.553-1.722 C208.028,273.581,208.593,274.26,208.593,275.202z M206.239,274.953h1.701c-0.04-0.565-0.329-0.834-0.807-0.834 C206.656,274.119,206.326,274.382,206.239,274.953z" class="st9"/></g><g><path d="M270.919,272.276c0.404,0.404,1.059,0.404,1.463,0l4.353-4.353l-4.353-4.353 c-0.404-0.404-1.059-0.404-1.463,0c-0.404,0.404-0.404,1.059,0,1.463l2.89,2.89l-2.89,2.889 C270.515,271.216,270.515,271.872,270.919,272.276z" class="st5"/></g></g></svg>
\ No newline at end of file
diff --git a/assets/images/emptystate__routepending.svg b/assets/images/emptystate__routepending.svg
index 90f3296d37d6..685696f04abf 100644
--- a/assets/images/emptystate__routepending.svg
+++ b/assets/images/emptystate__routepending.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" id="Layer_1" x="0" y="0" version="1.1" viewBox="0 0 101 101" style="enable-background:new 0 0 101 101" xml:space="preserve"><style type="text/css">.st0{fill:#ffc68c}.st1{fill:#fff2b2}.st2,.st3{fill:none;stroke-linecap:round;stroke-linejoin:round}.st2{stroke:#780505;stroke-width:1.5}.st3{stroke:#0c1b33}.st4{fill:#780505}</style><path d="M24.8,8.9c17.9-2.2,21.6,8.6,33.1,10.5c15.8,2.6,20.1-2,20.1-2.2c7.8,4.2,5.7,13.2,5.7,13.2s-3.3,1.7-10.1,2.5	c-2.4,0.3-5.2,0.4-8.4,0.4c-11.4-0.2-19.8-6.1-19.8-6.1s-0.1-8.7-4.9-11.7c0.7,5.2-0.4,8.8-0.5,8.7c-2.9-0.1-4.7-1.8-4.7-1.8	s0.8-13.5-9.3-13.5C25.7,8.9,25.2,8.9,24.8,8.9L24.8,8.9L24.8,8.9z" class="st0"/><path d="M73.7,33.1c0,0-0.3,2,2.1,7.2c2.4,5.2,6,8.8,6.4,16.8c0.3,7.9-6.4,13.4-5.7,21.6c0.7,8.3,8.8,10.6,9,10.6	c-2.6,3.8-11.2,2.4-11.2,2.4s-4.2-2.1-6.8-9c-1.4,3.2-1.2,7.8-1.2,7.8S62,86,60.9,77c-2.1,7-0.3,12-0.2,13.4	c-8.7-0.7-17.8-8.1-26-8.8C26.5,80.9,20,83.4,20,83.4s-4.4-3.9-3-14c0.9-6.5,6-10.4,6.9-21c0.5-5.6-2.7-11.4-5.6-16	s-2.8-12.2-2.8-12.2S15.9,9.9,24.8,9c0.4,0,0.9-0.1,1.3-0.1c10.1,0,9.3,13.5,9.3,13.5s1.8,1.7,4.7,1.8c0.1,0.1,1.2-3.5,0.5-8.7	c4.8,3,4.9,11.7,4.9,11.7s8.3,5.9,19.8,6.1c3.2,0.1,6-0.1,8.4-0.4L73.7,33.1L73.7,33.1z" class="st1"/><path d="M45.9,64.8c1.1,0.5,2.3,1,3.5,1.3" class="st2"/><path d="M54,66.9c1.4,0.3,2.9,0.4,4.4,0.2" class="st2"/><path d="M62.5,66.7c1.4-0.1,2.8-0.5,4.1-1.1" class="st2"/><path d="M69.8,63.6c1-0.8,1.8-1.8,2.4-2.9" class="st2"/><path d="M72.9,53c0.3,1.3,0.2,2.6,0,3.9" class="st2"/><path d="M68.5,46.4c1.1,0.9,2,2,2.7,3.3" class="st2"/><path d="M65,44.9c-1.4-0.4-2.8-0.6-4.2-0.6" class="st2"/><path d="M57.1,44.2c-1.4,0.2-2.8,0.6-4.1,1.1" class="st2"/><path d="M49.2,45.9c-1.4,0.3-2.9,0.3-4.2-0.1" class="st2"/><path d="M41.8,44.5c-0.9-0.5-1.7-1.3-2-2.3" class="st2"/><path d="M38.5,38.1c-0.2-1.2,0-2.6,0.6-3.7" class="st2"/><path d="M41.5,31.7c0.8-0.5,1.8-0.9,2.8-1.1" class="st2"/><path d="M48.5,30.4c1,0,2.1,0.2,3.1,0.5" class="st2"/><path d="M24.8,8.9c17.9-2.2,21.6,8.6,33.1,10.5c15.8,2.6,20.1-2,20.1-2.2c7.8,4.2,5.7,13.2,5.7,13.2s-3.3,1.7-10.1,2.5	c-2.4,0.3-5.2,0.4-8.4,0.4c-11.4-0.2-19.8-6.1-19.8-6.1s-0.1-8.7-4.9-11.7c0.7,5.2-0.4,8.8-0.5,8.7c-2.9-0.1-4.7-1.8-4.7-1.8	s0.8-13.5-9.3-13.5C25.7,8.9,25.2,8.9,24.8,8.9c-8.8,1-9.1,8.4-9.3,11.4c0,12.1,8.5,18.5,8.5,28.2c-0.9,10.6-6,14.4-6.9,21	c-1.4,10.1,3,14,3,14s6.5-2.5,14.7-1.9c8.2,0.7,17.4,8.1,26,8.8C60.7,89,58.9,84.1,61,77c1.1,9,5.4,13.5,5.4,13.5s-0.2-4.6,1.2-7.8	c2.6,6.8,6.8,9,6.8,9s8.6,1.5,11.2-2.4c-0.2,0-8.3-2.3-9-10.6c-0.7-8.3,6.1-13.7,5.7-21.6c-0.3-7.9-4-11.6-6.4-16.8	c-2.4-5.2-2.1-7.2-2.1-7.2" class="st3"/><path d="M35.8,66.3c0.5,0,0.8-0.5,1-1.8c0.3-1.2,0.7-1.9,2.3-3.4c1.3-1.1,2.8-2.6,2.8-5.1c0-3-2.3-4.9-5.5-4.9	c-3.6,0-6,2.6-6,4.4c0,1,0.5,1.6,1.3,1.6c1.1,0,1.4-1,2-2.1c0.6-1.2,1.6-2.2,3-2.2c1.4,0,2.4,1,2.4,2.4c0,1.4-0.8,2.2-2.2,3.6	c-1.6,1.5-2.3,2.8-2.3,5C34.7,65.5,35.1,66.3,35.8,66.3z M33.8,70.6c0,1.3,0.9,2.3,2.2,2.3c1.3,0,2.2-1.1,2.2-2.3	c0-1.3-0.9-2.4-2.2-2.4C34.8,68.3,33.8,69.3,33.8,70.6z" class="st4"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" id="Layer_1" x="0" y="0" version="1.1" 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 d="M14,6c0,3-4,6-4,6S6,9,6,6c0-2.209,1.791-4,4-4C12.209,2,14,3.791,14,6z M11.5,5.5C11.5,6.328,10.828,7,10,7	C9.172,7,8.5,6.328,8.5,5.5S9.172,4,10,4C10.828,4,11.5,4.672,11.5,5.5z" class="st0"/><path d="M10.602,12.798l0.004-0.003l0.012-0.009l0.04-0.031c0.034-0.026,0.081-0.063,0.141-0.111	c0.119-0.095,0.286-0.233,0.485-0.408c0.397-0.347,0.929-0.846,1.464-1.448c0.083-0.094,0.168-0.191,0.253-0.292V18l-6-2v-5.503	c0.085,0.101,0.169,0.198,0.253,0.292c0.535,0.602,1.067,1.1,1.464,1.448c0.199,0.174,0.366,0.312,0.485,0.408	c0.06,0.048,0.107,0.085,0.141,0.111l0.04,0.031l0.012,0.009l0.004,0.003L10,13.25L10.602,12.798z"/><path d="M14,18V9.123c0.45-0.736,0.817-1.565,0.948-2.439l3.736-1.245C19.331,5.223,20,5.705,20,6.387v8.892	c0,0.43-0.275,0.813-0.684,0.949L14,18z"/><path d="M5,6c0-0.231,0.016-0.459,0.046-0.682L0.684,6.772C0.275,6.908,0,7.29,0,7.721v8.892c0,0.683,0.669,1.165,1.316,0.949L6,16	V9.123C5.434,8.197,5,7.125,5,6z"/></svg>
\ No newline at end of file
diff --git a/assets/images/expensifyCard/cardIllustration.svg b/assets/images/expensifyCard/cardIllustration.svg
new file mode 100644
index 000000000000..c81bb21568a7
--- /dev/null
+++ b/assets/images/expensifyCard/cardIllustration.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" id="Layer_1" x="0" y="0" version="1.1" viewBox="0 0 680 220" style="enable-background:new 0 0 680 220" xml:space="preserve"><style type="text/css">.st0{fill:#085239}.st3{fill:#002e22}.st5{fill:#fff}.st6{fill:none;stroke:#002140}.st7{fill:#e4bc07}.st8{fill:#d18000}.st9{fill:#002140}.st10{fill:none;stroke:#002140;stroke-linecap:round;stroke-linejoin:round}.st12{fill:#03d47c}.st13{fill-rule:evenodd;clip-rule:evenodd;fill:#085239}.st14{fill:#e4bc07;stroke:#002140}.st15{fill:#d18000}.st15,.st16{stroke:#002140}.st16,.st17{fill:#0b1b34}</style><rect width="680" height="220" class="st0"/><g><defs><rect id="SVGID_1_" width="680" height="220"/></defs><clipPath id="SVGID_00000069391172932470780140000006074874021756211103_"><use xlink:href="#SVGID_1_" style="overflow:visible"/></clipPath><g style="clip-path:url(#SVGID_00000069391172932470780140000006074874021756211103_)"><g><g><g><defs><path id="SVGID_00000147221856199844963740000000177576277472780707_" d="M90.507-114.162l159.135,73.034 c5.859,2.689,8.429,9.619,5.74,15.478L212.63,67.503c-2.689,5.859-9.619,8.429-15.478,5.74L38.018,0.208 c-5.859-2.689-8.429-9.619-5.74-15.478l42.752-93.152C77.719-114.281,84.648-116.851,90.507-114.162z"/></defs><clipPath id="SVGID_00000037655424286805565230000016215313491467240350_"><use xlink:href="#SVGID_00000147221856199844963740000000177576277472780707_" style="overflow:visible"/></clipPath><g style="clip-path:url(#SVGID_00000037655424286805565230000016215313491467240350_)"><path d="M90.507-114.162l159.135,73.034c5.859,2.689,8.429,9.619,5.74,15.478L212.63,67.503 c-2.689,5.859-9.619,8.429-15.478,5.74L38.018,0.208c-5.859-2.689-8.429-9.619-5.74-15.478l42.752-93.152 C77.719-114.281,84.648-116.851,90.507-114.162z" class="st3"/><g><g><defs><rect id="SVGID_00000081614314595513863490000007015153513627328699_" width="21.158" height="40.856" x="177.953" y="28.555" transform="matrix(0.4171 -0.9089 0.9089 0.4171 65.3791 199.9032)"/></defs><clipPath id="SVGID_00000121996237950152184740000009290762487159958439_"><use xlink:href="#SVGID_00000081614314595513863490000007015153513627328699_" style="overflow:visible"/></clipPath><g style="clip-path:url(#SVGID_00000121996237950152184740000009290762487159958439_)"><path d="M192.614,39.634l-7.761,10.402l-2.984-1.369l7.762-10.402L192.614,39.634z M201.752,52.844 l3.559-3.611l-1.085,4.747L201.752,52.844z M203.205,58.458l2.76,1.267l2.886-12.64l-2.549-1.17 c-0.571-0.262-1.208-0.152-1.658,0.263l-9.382,8.634l3.132,1.438l1.413-1.436l3.828,1.757L203.205,58.458z M197.145,51.118 c1.41-3.039-2.736-5.145-2.082-6.491c0.198-0.411,0.795-0.669,1.708-0.386c0.455,0.141,1.651,0.638,2.706,1.867 l1.646-2.206c-0.597-0.591-1.407-1.265-2.556-1.793c-2.949-1.353-5.745-0.738-6.793,1.499 c-0.781,1.651,0.295,3.266,1.172,4.338c0.903,1.098,1.127,1.64,0.89,2.144c-0.363,0.77-1.439,0.689-2.303,0.309 c-1.512-0.664-2.186-1.493-2.732-2.135l-1.7,2.279c0.55,0.64,1.708,1.509,3.038,2.136 C193.273,54.119,196.034,53.511,197.145,51.118z M188.351,37.677l-10.129,9.316l-3.155-1.448l1.847-10.297 c0.115-0.633,0.085-0.899-0.245-1.339c-0.538-0.719-1.555-1.627-2.493-2.332l0.224-0.303l5.078,2.33 c0.647,0.297,1.032,0.994,0.836,1.807l-1.807,7.252l6.709-6.426L188.351,37.677L188.351,37.677z" class="st5"/><path d="M175.759,53.999c-0.225,0.01-0.649-0.07-1.13-0.291c-1.115-0.512-1.625-1.598-1.027-2.901 c0.57-1.244,1.792-1.692,3.018-1.129c0.487,0.223,0.755,0.475,0.858,0.607l-0.32,0.357 c-0.145-0.18-0.388-0.377-0.717-0.527c-0.927-0.425-1.815-0.116-2.292,0.923c-0.447,0.974-0.172,1.846,0.784,2.285 c0.317,0.145,0.664,0.226,0.915,0.221L175.759,53.999z" class="st5"/><path d="M177.384,53.183c-0.285,0.622-0.149,1.252,0.356,1.484c0.493,0.226,1.075-0.067,1.369-0.707 c0.221-0.481,0.257-1.196-0.353-1.476C178.152,52.206,177.629,52.649,177.384,53.183z M179.645,54.184 c-0.482,1.05-1.426,1.172-2.106,0.859c-0.763-0.35-1.103-1.188-0.691-2.086c0.434-0.945,1.317-1.214,2.097-0.856 C179.761,52.476,180.041,53.322,179.645,54.184z" class="st5"/><path d="M180.731,53.923c0.138-0.299,0.233-0.539,0.329-0.779l0.452,0.207l-0.189,0.474l0.018,0.008 c0.282-0.197,0.662-0.328,1.137-0.11c0.381,0.175,0.567,0.544,0.537,0.935l0.011,0.005 c0.164-0.124,0.335-0.187,0.493-0.221c0.229-0.052,0.443-0.038,0.713,0.086c0.382,0.175,0.826,0.677,0.374,1.662 l-0.765,1.667l-0.505-0.232l0.736-1.602c0.253-0.551,0.196-0.968-0.215-1.157c-0.3-0.137-0.622-0.023-0.829,0.181 c-0.059,0.065-0.117,0.146-0.16,0.239l-0.805,1.754l-0.504-0.232l0.781-1.701c0.207-0.452,0.156-0.866-0.237-1.047 c-0.317-0.145-0.676,0.002-0.877,0.223c-0.062,0.057-0.116,0.146-0.157,0.234l-0.783,1.708l-0.505-0.232L180.731,53.923 L180.731,53.923z" class="st5"/><path d="M185.772,56.236c0.137-0.299,0.233-0.539,0.329-0.779l0.452,0.207l-0.189,0.474l0.017,0.008 c0.283-0.197,0.662-0.328,1.137-0.11c0.382,0.175,0.568,0.544,0.537,0.935l0.012,0.005 c0.163-0.124,0.335-0.188,0.492-0.221c0.23-0.052,0.444-0.038,0.714,0.086c0.381,0.175,0.826,0.677,0.373,1.662 l-0.764,1.666l-0.505-0.231l0.735-1.602c0.254-0.551,0.196-0.969-0.214-1.157c-0.3-0.137-0.623-0.023-0.83,0.181 c-0.058,0.065-0.116,0.146-0.159,0.239l-0.805,1.754l-0.505-0.232l0.781-1.701c0.207-0.452,0.156-0.866-0.237-1.046 c-0.317-0.145-0.676,0.002-0.877,0.223c-0.062,0.057-0.116,0.146-0.156,0.233l-0.784,1.708l-0.505-0.232L185.772,56.236z" class="st5"/><path d="M192.441,59.752c0.154-0.32,0.248-0.895-0.333-1.162c-0.529-0.243-0.969,0.131-1.175,0.47 L192.441,59.752z M190.758,59.426c-0.309,0.704-0.001,1.193,0.521,1.433c0.37,0.17,0.628,0.21,0.853,0.215l-0.075,0.412 c-0.22-0.001-0.583-0.047-1.034-0.254c-0.874-0.401-1.13-1.222-0.737-2.079c0.393-0.856,1.205-1.293,2.032-0.913 c0.933,0.428,0.803,1.348,0.563,1.87c-0.048,0.106-0.089,0.179-0.128,0.233L190.758,59.426z" class="st5"/><path d="M193.845,60.083c0.153-0.334,0.28-0.625,0.383-0.896l0.452,0.207l-0.236,0.573l0.018,0.008 c0.305-0.322,0.731-0.417,1.078-0.258c0.053,0.024,0.091,0.048,0.135,0.076l-0.223,0.487c-0.048-0.036-0.1-0.06-0.17-0.092 c-0.364-0.167-0.746-0.016-0.995,0.339c-0.044,0.065-0.09,0.15-0.128,0.233l-0.695,1.513l-0.516-0.237L193.845,60.083z" class="st5"/><path d="M197.025,63.788c-0.165,0.002-0.509-0.035-0.891-0.21c-0.857-0.393-1.148-1.23-0.749-2.099 c0.401-0.874,1.293-1.239,2.22-0.813c0.306,0.14,0.54,0.34,0.646,0.481l-0.297,0.339c-0.094-0.121-0.255-0.28-0.537-0.41 c-0.652-0.299-1.227,0.026-1.496,0.614c-0.302,0.657-0.065,1.256,0.498,1.514c0.293,0.135,0.52,0.153,0.696,0.156 L197.025,63.788z" class="st5"/><path d="M197.73,64.232l1.304-2.839l0.516,0.237l-1.303,2.84L197.73,64.232L197.73,64.232z M199.974,60.858 c-0.08,0.176-0.268,0.261-0.473,0.167c-0.188-0.086-0.246-0.284-0.166-0.46c0.081-0.176,0.278-0.264,0.471-0.175 C199.995,60.476,200.058,60.676,199.974,60.858z" class="st5"/><path d="M201.412,64.167c-0.558-0.27-1.243-0.464-1.497,0.088c-0.156,0.34-0.003,0.595,0.255,0.713 c0.376,0.172,0.724,0.048,0.917-0.155c0.044-0.051,0.077-0.106,0.099-0.154L201.412,64.167z M201.558,65.164 c-0.113,0.247-0.212,0.493-0.272,0.699l-0.463-0.213l0.123-0.377l-0.018-0.008c-0.261,0.151-0.658,0.21-1.062,0.024 c-0.575-0.264-0.682-0.804-0.494-1.214c0.315-0.686,1.097-0.782,2.192-0.273l0.027-0.059 c0.105-0.229,0.236-0.686-0.346-0.947c-0.271-0.124-0.581-0.173-0.843-0.13l0.042-0.4c0.302-0.039,0.693,0.02,1.051,0.185 c0.869,0.399,0.809,1.088,0.55,1.651L201.558,65.164L201.558,65.164z" class="st5"/><path d="M204.138,62.13l0.515,0.237l-1.911,4.165l-0.516-0.237L204.138,62.13z" class="st5"/></g></g></g></g></g></g><path d="M90.716-114.617l159.135,73.034c6.11,2.804,8.79,10.031,5.986,16.141L213.085,67.71 c-2.804,6.11-10.031,8.79-16.141,5.986L37.809,0.662c-6.11-2.804-8.79-10.031-5.986-16.141l42.752-93.152 C77.379-114.741,84.606-117.421,90.716-114.617z" class="st6"/><path d="M178.835,14.614c0,0-9.718,3.614-10.066,17.499c-0.348,13.885,7.867,31.47,20.478,42.114 s28.81,19.207,41.999,9.718s2.663-39.107-3.122-44.544C224.42,34.195,203.827,5.907,178.835,14.614L178.835,14.614z" class="st7"/><path d="M170.705,22.017l-7.984,9.833c0,0-4.512,15.041,9.603,36.214c14.115,21.173,32.744,25.685,41.885,25.222 l9.14-5.9c0,0-13.103,2.286-29.346-9.114c-1.721-1.559-10.53-9.242-15.313-16.57c-8.617-12.88-10.296-23.603-9.834-31.703 c0.435-1.773,1.227-4.935,1.852-7.985L170.705,22.017z" class="st8"/><path d="M192.139,60.807l-3.355-0.463l3.361,4.19C192.145,64.534,191.329,63.467,192.139,60.807z" class="st8"/><path d="M216.814,46.661c0,0-2.892,0.23-3.933-1.274c0,0,0.811,3.586,0,4.744c0,0,3.123,0,4.281,1.389 C217.162,51.521,216.006,47.935,216.814,46.661L216.814,46.661z" class="st8"/><path d="M190.057,51.09c0,0,4.396,6.711,9.718,4.049c5.323-2.662-0.81-11.222-0.81-11.222 S188.668,38.016,190.057,51.09z" class="st7"/><path d="M202.669,67.98c0,0,2.314,2.777,3.122,3.355l6.479-4.049l-1.852-4.629l-7.752,5.322L202.669,67.98 L202.669,67.98z" class="st7"/><path d="M186.821,28.236c0,0-2.692-0.173-3.123,2.778c-0.434,2.95,1.302,7.896,0.954,9.371 c-0.347,1.475-1.647,4.252-1.216,5.466c0.432,1.214,2.344,5.207,4.86,6.941c2.515,1.737,4.945,4.687,5.552,5.641 c0.607,0.955,5.38,7.55,5.641,7.984c0,0,3.646,4.6,5.728,2.602l1.475,3.818l1.216-1.041l1.647,2.602c0,0,0.435-1.648,0.435-2.516 c0,0,2.515,2.95,3.645,2.864c1.128-0.086,4.86-1.909,4.86-3.036c0-1.127-0.607-2.602-0.607-2.602s1.216-2.082-1.216-5.641 c-2.43-3.557-4.078-5.641-4.078-5.641s2.864-1.561,1.041-3.384c-1.823-1.823-4.252-1.475-4.252-1.475l-4.339-5.38 c0,0-3.036-11.369-7.985-12.234C197.059,35.353,192.893,28.236,186.821,28.236L186.821,28.236z" class="st8"/><path d="M200.722,50.23c1.429-0.619,2-2.476,1.276-4.147s-2.47-2.524-3.898-1.905c-1.429,0.619-2,2.476-1.276,4.147 S199.294,50.849,200.722,50.23z" class="st7"/><path d="M205.388,48.021c0,0-3.818,3.732-5.986,4.511c0,0-0.348,2.864,1.302,4.339 c1.648,1.475,2.89,2.184,4.253,0.693s0.173-4.511,0.173-4.511l3.732,0.086c0,0,0.086-2.343-0.693-3.212 c-0.782-0.868-2.778-1.909-2.778-1.909L205.388,48.021z" class="st7"/><path d="M208.018,92.96l7.831-5.558l-8.568-2.105l-6.782,5.968L208.018,92.96z" class="st7"/><path d="M195.153,88.608l6.256-5.877l-6.829-4.211l-5.714,6.235L195.153,88.608z" class="st7"/><path d="M180.573,21.93c0,0,8.563-1.967,20.478,6.363s22.677,22.444,24.992,34.94c0,0,3.586,11.222-3.24,16.66 c0,0,10.759-0.926,8.907-17.24c-1.851-16.314-18.048-33.899-31.24-40.725c-13.191-6.826-19.9,0-19.9,0L180.573,21.93z" class="st9"/><path d="M161.807,38.886l6.769-7.203c0,0-0.503,6.272,0.941,9.36c-0.675,0.717-6.559,6.98-6.559,6.98" class="st7"/><path d="M167.954,61.008l6.269-6.672l-2.862-6.936l-6.53,6.57" class="st7"/><path d="M175.248,72.032l6.227-6.63l-4.401-5.427l-6.089,6.227L175.248,72.032z" class="st7"/><path d="M184.285,81.659l6.005-6.651l-5.04-4.519l-6.06,6.447L184.285,81.659z" class="st7"/><path d="M201.322,62.439c2.213,2.411,6.128,4.697,7.904,8.225s-0.003,3.912-0.003,3.912 c0.392-0.69-1.661-3.617-1.661-3.617c0.529,2.137-1.098,1.818-1.098,1.818c0.873-0.667-1.37-3.839-1.37-3.839 c-2.807,3.319-8.545-6.954-11.73-11.361c-3.186-4.407-5.649-3.892-8.578-8.685c-2.932-4.796-0.38-6.162,0.036-8.628 c0.416-2.466-3.855-10.343,0.963-11.879c6.263-2.053,11.151,7.111,11.151,7.111s1.447-0.521,4.219,3.225 c2.772,3.745,2.393,6.381,4.001,9.449c-1.103-0.719-5.691-9.428-8.926-10.767c0.432,4.36-7.106,1.914-5.17,8.06 c1.26,4.901,5.963,8.34,8.51,11.672s1.216,6.107,1.216,6.107" class="st10"/><path d="M212.431,58.048c0,0,3.206,4.195,3.727,4.872c0.52,0.677,3.538,4.626,1.443,6.227 c-0.842,0.646-2.027,0.965-3.29-0.024" class="st10"/><path d="M209.602,71.159c0,0,0.785,0.965,1.397,1.765c0.612,0.803,2.037,3.329,5.73,0.505 c2.181-1.668,2.098-2.681,0.871-4.284" class="st10"/><path d="M214.101,60.29c-0.52,0.105-1.535-0.683-1.971-0.348c-0.437,0.335-0.296,1.3,0.007,2.241 c0,0-1.498-1.297-2.419-0.693c-0.92,0.604-0.468,2.704-0.528,3.044c0,0,3.251,2.987,5.615,1.376 c1.221-0.934,0.434-3.167,0.115-4.488" class="st10"/><path d="M209.457,64.523c0,0,4.289-0.055,5.009-3.635" class="st10"/><path d="M198.341,53.479c0,0,0.045-0.424,0.497-0.675c0.455-0.248,5.615-3.023,6.316-4.634 c0,0,1.271-1.169,3.442,1.668c2.171,2.838,1.138,3.235,1.138,3.235" class="st10"/><path d="M199.229,52.896c0,0-0.546,1.394,0.963,3.368c1.509,1.975,3.4,2.579,4.739,1.556 c1.336-1.023,1.412-3.034-0.298-5.15c2.788,0.994,7.621-0.16,9.271,2.001c1.085,1.417-0.22,2.124-0.22,2.124 s-1.966,1.407-3.188,2.341c-1.977,1.512-3.308-0.11-3.732-0.664c-0.424-0.555-1.117-1.883-0.447-2.393 c0.669-0.51,1.522,0.303,1.522,0.303" class="st10"/><path d="M204.635,52.671c0,0-1.368-1.789-2.134-1.886" class="st10"/><path d="M201.213,49.716c1.113-0.851,1.097-2.742-0.036-4.223c-1.132-1.481-2.953-1.992-4.066-1.141 c-1.113,0.851-1.097,2.742,0.036,4.223S200.101,50.567,201.213,49.716z" class="st10"/><path d="M196.236,46.389c0,0-1.206-1.033-1.656-1.08" class="st10"/><path d="M196.313,44.864c0,0-0.878-1.088-1.451-1.234" class="st10"/><path d="M197.248,43.857c0,0-0.819-1.132-1.161-1.457" class="st10"/><path d="M198.786,43.756c0,0-0.508-0.785-0.636-1.373" class="st10"/><path d="M205.591,48.251c-0.547,0.418-0.39,1.567,0.311,2.738l1.582,0.186l0.28,1.776 c0.633,0.387,1.227,0.492,1.588,0.217c0.641-0.489,0.316-1.988-0.722-3.345C207.592,48.466,206.232,47.762,205.591,48.251 L205.591,48.251z" class="st9"/><path d="M198.552,44.056c-0.453,0.345-0.322,1.297,0.256,2.265l1.308,0.154l0.233,1.47 c0.523,0.322,1.014,0.408,1.312,0.178c0.531-0.405,0.262-1.645-0.596-2.767C200.205,44.231,199.08,43.651,198.552,44.056 L198.552,44.056z" class="st9"/><path d="M201.577,51.226c-0.568,0.434-0.406,1.627,0.321,2.843l1.643,0.194l0.29,1.844 c0.657,0.403,1.271,0.513,1.648,0.225c0.664-0.507,0.329-2.063-0.748-3.471c-1.078-1.41-2.49-2.139-3.154-1.632L201.577,51.226 L201.577,51.226z" class="st9"/><path d="M194.175,36.042c0,0-4.773-4.854-8.283-2.757" class="st10"/><path d="M192.77,37.701c0,0-4.305-3.159-7.114-1.109" class="st10"/><path d="M189.529,39.79c0,0-2.56-1.658-3.399,0.254" class="st10"/><path d="M188.916,44.168c0,0-4.018-0.251-3.625,3.455" class="st10"/><path d="M191.158,48.609c1.444,1.828,0.526,5.267,0.871,6.078" class="st10"/><path d="M194.311,52.849c0,0,1.172,1.352,0.659,5.262" class="st10"/><path d="M197.761,56.756c0,0,1.344,3.565-0.16,4.912" class="st10"/><path d="M231.166,83.631c11.296-9.438,7.941-32.064-7.494-50.537c-15.434-18.473-37.104-25.797-48.4-16.359 c-11.296,9.438-7.94,32.064,7.494,50.537C198.201,85.745,219.871,93.069,231.166,83.631z" class="st10"/><path d="M227.772,77.431c8.148-6.808,4.25-24.898-8.708-40.406c-12.957-15.508-30.066-22.56-38.214-15.753 c-8.148,6.808-4.249,24.898,8.708,40.406S219.624,84.239,227.772,77.431z" class="st10"/><path d="M180.203,21.814c8.971-2.105,22.782,4.953,33.662,17.975c12.564,15.035,16.612,32.498,9.42,39.752" class="st10"/><path d="M172.154,20.255c0,0-9.546,11.107-9.635,11.944c-2.686,9.488,2.069,27.024,13.43,40.618 c11.476,13.733,26.396,21.304,37.94,20.405" class="st10"/><path d="M224.493,87.033c0,0-9.64,6.101-10.513,6.167" class="st10"/><path d="M211.921,44.417c0,0,2.254,2.801,0.865,5.887c0,0,2.809-1.125,4.988,2.273c0,0-2.456-4.127-0.688-6.156 C217.086,46.42,214.664,48.01,211.921,44.417L211.921,44.417z" class="st10"/><path d="M192.147,64.534c-0.393-1.287-0.565-2.824,0.319-3.839c0,0-2.422,1.59-5.166-2.003" class="st10"/><g><g><defs><path id="SVGID_00000083793439122012909460000000706218237968540560_" d="M458.948,133.174l163.024,63.883 c6.002,2.352,8.962,9.125,6.609,15.127l-37.395,95.429c-2.352,6.002-9.125,8.961-15.127,6.609l-163.024-63.883 c-6.002-2.352-8.961-9.125-6.609-15.127l37.395-95.429C446.173,133.781,452.946,130.822,458.948,133.174z"/></defs><clipPath id="SVGID_00000147219757778071369470000001397367311429700488_"><use xlink:href="#SVGID_00000083793439122012909460000000706218237968540560_" style="overflow:visible"/></clipPath><g style="clip-path:url(#SVGID_00000147219757778071369470000001397367311429700488_)"><path d="M458.948,133.174l163.024,63.883c6.002,2.352,8.962,9.125,6.609,15.127l-37.395,95.429 c-2.352,6.002-9.125,8.961-15.127,6.609l-163.024-63.883c-6.002-2.352-8.961-9.125-6.609-15.127l37.395-95.429 C446.173,133.781,452.946,130.822,458.948,133.174z" class="st3"/><path d="M535.149,193.46l8.742,3.426l1.011-2.58l-5.528-2.166l0.937-2.392l4.449,1.744l1.035-2.641l-4.449-1.744 l0.888-2.266l5.528,2.167l1.011-2.58l-8.742-3.425L535.149,193.46z" class="st12"/><path d="M558.586,191.442l-3.848-1.508l-2.2,1.837l-0.43-2.867l-3.955-1.55l1.387,5.962l-5.405,3.665 l3.848,1.508l2.563-2.012l0.494,3.21l3.955,1.55l-1.478-6.363L558.586,191.442z" class="st12"/><path d="M564.741,193.581c-1.062-0.416-2.155-0.345-3.166,0.211l0.4-1.022l-2.949-1.156l-5.423,13.838 l3.146,1.233l1.902-4.855c0.34,0.813,1.059,1.525,2.081,1.926c2.575,1.009,5.143-0.274,6.36-3.381 c1.218-3.106,0.304-5.753-2.35-6.793L564.741,193.581z M561.072,200.919c-1.18-0.462-1.525-1.663-0.901-3.256 c0.624-1.592,1.693-2.239,2.873-1.777c1.18,0.463,1.533,1.644,0.901,3.256C563.314,200.754,562.252,201.381,561.072,200.919z" class="st12"/><path d="M571.605,205.182c-0.963-0.377-1.475-1.213-1.097-2.697l6.704,2.627l0.162-0.413 c1.186-3.027,0.404-6.009-2.88-7.296c-2.319-0.909-5.487-0.699-6.989,3.134c-1.217,3.106,0.011,5.877,3.117,7.094 c1.848,0.724,4.411,0.957,6.262-1.628l-3.186-1.248c-0.346,0.476-0.975,0.865-2.095,0.426L571.605,205.182z M573.586,199.722 c0.904,0.355,1.313,1.105,0.973,2.263l-3.284-1.287C571.997,199.552,572.838,199.429,573.586,199.722z" class="st12"/><path d="M585.602,201.756c-1.081-0.424-2.229-0.329-3.212,0.328l0.447-1.141l-2.95-1.155l-3.805,9.712 l3.145,1.232l2.119-5.406c0.508-1.296,1.408-1.624,2.272-1.285c0.925,0.362,1.32,0.971,0.743,2.445l-2.126,5.425l3.146,1.233 l2.218-5.662C588.801,204.416,588.039,202.711,585.602,201.756z" class="st12"/><path d="M602.397,203.518c-0.961-0.377-1.925,0.06-2.278,0.962c-0.354,0.902,0.048,1.898,1.01,2.275 c0.962,0.377,1.952-0.072,2.306-0.975C603.789,204.876,603.379,203.902,602.397,203.518z" class="st12"/><path d="M602.259,208.577l-3.14-1.23l-3.797,9.69l3.139,1.231L602.259,208.577z" class="st12"/><path d="M593.559,209.368l-0.716-0.486c-0.756-0.502-0.91-0.976-0.763-1.352c0.21-0.536,0.797-0.704,1.525-0.418 c0.924,0.362,1.298,0.855,0.949,1.746l2.71,1.062c0.736-2.065,0.017-3.737-2.992-4.916c-2.596-1.017-4.527-0.662-5.374,1.5 c-0.668,1.705,0.177,2.928,2.578,4.557l0.717,0.486c0.756,0.501,0.9,1.001,0.752,1.377c-0.209,0.535-0.775,0.589-1.6,0.266 c-1.082-0.424-1.418-1.014-1.205-1.96l-3.067-1.202c-0.74,2.41,0.433,4.219,3.284,5.337c2.852,1.117,4.934,0.72,5.781-1.441 C596.806,212.217,595.961,210.995,593.559,209.368L593.559,209.368z" class="st12"/><path d="M614.544,213.392l-4.087,5.232l0.594-6.601l-4.072-1.596l0.119-0.305 c0.311-0.793,1.212-1.356,2.131-0.996l0.449,0.176l1.005-2.565l-0.645-0.253c-2.712-0.993-5.226,0.205-6.16,2.587 l-0.048,0.123l-1.177-0.462l-1.121,2.861l1.178,0.461l-2.677,6.83l3.14,1.23l2.676-6.83l1.769,0.693l-0.225,7.498 l-0.792,0.866c-0.586,0.629-1.004,0.715-1.652,0.461c-0.333-0.13-0.667-0.261-1.085-0.584l-1.203,2.493 c0.418,0.321,0.983,0.611,1.728,0.903c1.884,0.738,3.18,0.319,5.099-1.804l8.255-9.166l-3.199-1.254L614.544,213.392 L614.544,213.392z" class="st12"/><path d="M454.994,187.258c0.294-0.751,1.14-1.121,1.89-0.827l2.718,1.065c0.75,0.294,1.12,1.141,0.826,1.891 l-1.864,4.755c-0.294,0.75-1.14,1.12-1.89,0.826l-2.718-1.065c-0.75-0.294-1.12-1.14-0.826-1.89L454.994,187.258z M441.821,184.881c0.096-0.247,0.258-0.462,0.467-0.623l2.395-1.847c0.406-0.313,0.946-0.39,1.423-0.203l6.703,2.627 c0.75,0.294,1.12,1.14,0.826,1.89l-5.324,13.586c-0.294,0.75-1.14,1.12-1.89,0.826l-6.703-2.627 c-0.477-0.187-0.822-0.61-0.907-1.116l-0.502-2.981c-0.044-0.261-0.016-0.529,0.08-0.775L441.821,184.881z M463.677,189.093 c-0.75-0.294-1.597,0.076-1.891,0.827l-2.662,6.792c-0.294,0.751,0.076,1.597,0.827,1.891l2.717,1.065 c0.75,0.294,1.597-0.076,1.891-0.826l2.661-6.793c0.294-0.75-0.076-1.597-0.826-1.891L463.677,189.093z M451.533,196.088 c0.294-0.75,1.141-1.12,1.891-0.826l2.717,1.065c0.75,0.294,1.12,1.14,0.826,1.891l-1.863,4.755 c-0.294,0.75-1.14,1.12-1.891,0.826l-2.717-1.065c-0.75-0.294-1.12-1.141-0.826-1.891L451.533,196.088z M459.418,199.962 c-0.75-0.294-1.597,0.075-1.891,0.826l-1.064,2.717c-0.294,0.75,0.076,1.597,0.826,1.891l2.717,1.064 c0.75,0.294,1.597-0.075,1.891-0.826l1.065-2.717c0.294-0.75-0.076-1.597-0.827-1.891L459.418,199.962z" class="st13"/></g></g></g><path d="M459.131,132.708l163.024,63.883c6.259,2.453,9.345,9.516,6.893,15.775l-37.395,95.429 c-2.453,6.259-9.516,9.345-15.775,6.893l-163.024-63.883c-6.259-2.453-9.345-9.516-6.893-15.775l37.395-95.429 C445.809,133.341,452.871,130.255,459.131,132.708z" class="st6"/><path d="M492.46,69.911l-0.002-0.001c-17.886-6.228-34.229,0.762-46.833,10.335 c-12.602,9.572-21.373,21.661-24.051,25.425l-0.029,0.04l-0.036,0.034c-2.019,1.898-4.513,5.981-6.819,11.317 c-2.298,5.317-4.383,11.818-5.612,18.499c-1.23,6.685-1.6,13.523-0.487,19.527c1.111,6,3.694,11.13,8.34,14.471 c9.4,6.763,19.879,7.11,30.319,3.83c10.457-3.284,20.841-10.199,29.961-17.897c18.183-15.347,30.013-40.705,29.513-60.666 c-0.249-9.938-3.846-16.165-7.351-19.906c-1.757-1.875-3.497-3.131-4.794-3.918c-0.648-0.393-1.185-0.668-1.557-0.844 c-0.186-0.088-0.331-0.151-0.428-0.192c-0.048-0.02-0.085-0.035-0.108-0.044L492.46,69.911z" class="st14"/><path d="M431.538,176.093c-0.486-0.012-0.924-0.032-1.311-0.055l11.398,7.357 c13.132,0.612,39.858-5.91,60.153-36.354c10.186-15.28,13.64-28.329,14.555-37.538c0.457-4.606,0.28-8.255-0.009-10.746 c-0.145-1.246-0.318-2.202-0.454-2.844c-0.068-0.321-0.127-0.563-0.168-0.724c-0.015-0.058-0.027-0.105-0.037-0.142 L505.461,82.48c0.709,3.259,1.488,6.427,2.03,8.63c0.079,0.321,0.153,0.621,0.221,0.899l0.01,0.044l0.003,0.046 c0.677,11.85-1.786,27.504-14.343,46.271c-6.515,9.979-18.127,20.391-21.657,23.557c-0.252,0.225-0.462,0.414-0.627,0.563 l-0.023,0.021l-0.025,0.018c-11.843,8.311-22.553,11.641-30.314,12.89C436.856,176.042,433.714,176.146,431.538,176.093z" class="st15"/><path d="M468.5,145.748c0.011-0.011,0.022-0.022,0.031-0.032l16.217-52.705l-58.233,51.564l23.546,15.427 c4.306-2.005,8.892-5.537,12.442-8.616c1.805-1.565,3.334-3.005,4.411-4.054c0.539-0.524,0.964-0.95,1.254-1.245 C468.314,145.94,468.425,145.826,468.5,145.748z" class="st15"/><path d="M482.952,128.634c0.073-0.101,0.141-0.197,0.207-0.288l-3.163,0.436c0.285,1.453,0.05,3.064-0.322,4.463 c0.413-0.587,0.848-1.2,1.273-1.798C481.694,130.394,482.417,129.383,482.952,128.634z" class="st15"/><path d="M445.904,114.298c-0.813,0.497-1.769,0.743-2.582,0.868c-0.613,0.093-1.18,0.123-1.607,0.128 c0.113,0.426,0.157,0.894,0.162,1.358c0.008,0.79-0.097,1.647-0.236,2.428c-0.091,0.508-0.197,0.99-0.298,1.409 c0.87-0.481,1.886-0.757,2.755-0.92c0.695-0.13,1.334-0.195,1.798-0.227c0,0,0,0,0.001,0c-0.126-0.398-0.194-0.839-0.227-1.279 c-0.058-0.763-0.019-1.602,0.056-2.372C445.775,115.191,445.839,114.714,445.904,114.298z" class="st15"/><path d="M463.844,112.27c-0.022,0.012-0.042,0.023-0.059,0.032c-0.009,0.013-0.019,0.027-0.03,0.042 c-0.061,0.089-0.151,0.222-0.263,0.392c-0.224,0.34-0.536,0.833-0.887,1.436c-0.704,1.208-1.558,2.85-2.173,4.602 c-0.618,1.76-0.977,3.584-0.743,5.174c0.23,1.557,1.029,2.91,2.801,3.796c3.61,1.806,6.922,0.461,9.412-1.437 c1.241-0.947,2.253-2.014,2.956-2.848c0.351-0.416,0.623-0.772,0.807-1.022c0.091-0.126,0.161-0.224,0.207-0.291l0.001-0.001 c0.475-4.622-0.088-7.476-1.114-9.189c-1.014-1.693-2.523-2.337-4.138-2.445c-1.638-0.108-3.364,0.342-4.705,0.838 c-0.665,0.246-1.225,0.499-1.618,0.69C464.102,112.135,463.948,112.215,463.844,112.27z" class="st14"/><path d="M457.151,147.133c0.068-0.079,0.13-0.153,0.187-0.22l-10.267-7.049l-2.298,5.744l8.738,5.46 c0.236-0.204,0.537-0.497,0.878-0.849c0.472-0.488,0.996-1.064,1.487-1.617C456.366,148.049,456.819,147.522,457.151,147.133z" class="st14"/><path d="M426.652,163.04c0.176,0.061,0.345,0.116,0.505,0.165c-3.936-4.033-4.892-9.546-4.835-14.153 c0.032-2.566,0.378-4.879,0.715-6.549c0.168-0.835,0.335-1.512,0.46-1.981c0.063-0.234,0.115-0.417,0.152-0.542 c0.018-0.062,0.033-0.11,0.043-0.143l0.006-0.021c3.399-18.277,19.094-38.829,36.436-50.949 c8.702-6.083,16.197-8.418,21.535-9.226c2.668-0.404,4.794-0.426,6.26-0.346c0.163,0.009,0.318,0.019,0.465,0.03 c-0.116-0.079-0.24-0.161-0.371-0.244c-1.173-0.749-2.939-1.653-5.291-2.257c-4.694-1.204-11.782-1.226-21.244,3.671 c-9.49,4.912-20.09,13.711-28.651,24.234c-8.565,10.528-15.045,22.726-16.373,34.422c-1.329,11.709,1.873,17.786,5.294,20.945 C423.479,161.686,425.281,162.562,426.652,163.04z" class="st16"/><path d="M444.531,146.745c-0.004,0.021-0.007,0.044-0.011,0.066c-0.075,0.469-0.142,1.111-0.112,1.807 c0.06,1.395,0.497,2.907,1.901,3.79c2.111,0.868,3.751,0.595,4.859,0.126c0.548-0.232,0.973-0.515,1.263-0.743L444.531,146.745z" class="st16"/><path d="M517.318,104.634l-9.814-10.443c0,0,0.728,9.093-1.365,13.571c0.979,1.039,9.51,10.121,9.51,10.121" class="st17"/><path d="M507.504,94.191l-0.996,0.08l-0.228-2.843l1.953,2.078L507.504,94.191z M506.139,107.762l-0.728,0.686 l-0.465-0.494l0.287-0.615L506.139,107.762z M516.589,105.319l-9.813-10.443l1.457-1.37l9.814,10.443L516.589,105.319z M507.504,94.191c0.997-0.08,0.997-0.08,0.997-0.079c0,0,0,0,0,0.001c0,0,0,0.001,0,0.002s0.001,0.003,0.001,0.006 c0,0.005,0.001,0.012,0.002,0.022c0.001,0.019,0.003,0.046,0.005,0.081c0.006,0.071,0.013,0.174,0.021,0.306 c0.016,0.264,0.037,0.645,0.055,1.114c0.036,0.938,0.062,2.238,0.021,3.682c-0.079,2.837-0.419,6.416-1.561,8.86l-1.812-0.847 c0.951-2.035,1.295-5.241,1.374-8.07c0.039-1.389,0.014-2.643-0.021-3.549c-0.017-0.453-0.037-0.818-0.053-1.068 c-0.007-0.125-0.014-0.222-0.018-0.287c-0.003-0.032-0.005-0.057-0.006-0.073c0-0.008-0.001-0.014-0.001-0.017 c0-0.002,0-0.003,0-0.004V94.27l0,0C506.508,94.271,506.508,94.271,507.504,94.191z M506.867,107.077 c0.49,0.52,2.868,3.051,5.123,5.451c1.128,1.2,2.225,2.368,3.04,3.235c0.407,0.434,0.745,0.793,0.98,1.043 c0.117,0.125,0.209,0.223,0.272,0.29c0.032,0.034,0.056,0.059,0.072,0.076c0.008,0.009,0.014,0.016,0.018,0.02 c0.002,0.002,0.004,0.004,0.005,0.005l0.001,0.001l0,0c0,0,0,0-0.729,0.685c-0.728,0.685-0.728,0.685-0.729,0.685 c0,0,0,0,0-0.001c0,0,0,0-0.001-0.001s-0.003-0.003-0.005-0.005c-0.004-0.004-0.01-0.011-0.018-0.019 c-0.016-0.017-0.04-0.043-0.071-0.076c-0.063-0.067-0.155-0.165-0.273-0.29c-0.235-0.251-0.572-0.61-0.98-1.043 c-0.815-0.868-1.912-2.036-3.04-3.236c-2.255-2.4-4.632-4.93-5.121-5.449L506.867,107.077z" class="st9"/><path d="M508.406,136.709l-9.089-9.673l4.149-10.057l9.468,9.526" class="st17"/><path d="M499.317,127.036l-0.729,0.684l-0.441-0.47l0.246-0.596L499.317,127.036z M503.466,116.979l-0.925-0.381 l0.574-1.39l1.06,1.067L503.466,116.979z M507.678,137.394l-9.09-9.674l1.458-1.369l9.089,9.673L507.678,137.394z M498.393,126.654l4.148-10.056l1.849,0.763l-4.148,10.056L498.393,126.654z M504.175,116.275l9.468,9.525l-1.418,1.41 l-9.469-9.526L504.175,116.275z" class="st9"/><path d="M495.216,135.959l-5.754,7.097l8.317,8.855l5.576-7.624L495.216,135.959z" class="st16"/><path d="M491.403,159.777l-8.106-8.624l-6.57,5.891l8.03,8.895L491.403,159.777z" class="st16"/><path d="M468.727,163.63l-8.996,5.542l8.319,7.815l8.27-5.072L468.727,163.63z" class="st16"/><path d="M459.48,181.019l-8.9-7.833l-11.108,2.729l10.28,7.297L459.48,181.019z" class="st16"/><path d="M449.553,160.015l-23.977-15.35l60.364-53.538l-17.189,55.445" class="st10"/><path d="M462.855,112.221c0,0,15.441-8.191,13.772,8.949" class="st10"/><path d="M476.198,122.296c0,0-6.757,10.556-14.004,5.915c-7.246-4.637,1.324-16.62,1.324-16.62" class="st10"/><path d="M467.229,119.629l-0.029,0.585l-0.573-0.121l-2.288-0.483c-0.554,1.245-0.84,2.425-0.858,3.386 c-0.02,1.069,0.287,1.746,0.765,2.052c0.568,0.362,1.508,0.284,2.695-0.438c1.156-0.702,2.401-1.94,3.437-3.558v-0.001 c1.035-1.616,1.637-3.266,1.791-4.61c0.158-1.381-0.165-2.266-0.729-2.628h-0.001c-0.396-0.254-0.97-0.295-1.714-0.033 c-0.696,0.246-1.483,0.742-2.271,1.46L467.229,119.629z" class="st16"/><path d="M468.673,146.105l-25.778-16.502" class="st10"/><path d="M479.983,109.654l-8.657-5.54" class="st10"/><path d="M460.909,140.927l4.611-10.864" class="st10"/><path d="M450.656,134.487l8.99-9.464" class="st10"/><path d="M446.547,139.265l11.694,7.486c0,0-6.492,9.62-12.043,6.067 C440.647,149.265,446.547,139.265,446.547,139.265z" class="st10"/><path d="M444.058,156.1l1.858-2.904" class="st10"/><path d="M452.423,143.03l2.962-4.626" class="st10"/><path d="M453.228,151.733l-8.979-5.748" class="st10"/><path d="M450.941,149.898l3.383-5.283" class="st10"/><path d="M446.357,146.963l3.379-5.283" class="st10"/><path d="M416.747,169.875c-16.378-13.684-11.513-46.49,10.866-73.273c22.378-26.784,53.797-37.403,70.175-23.719 c16.378,13.684,11.513,46.49-10.866,73.274C464.543,172.94,433.125,183.559,416.747,169.875z" class="st10"/><path d="M421.665,160.889c-11.814-9.87-6.161-36.1,12.626-58.584c18.787-22.485,43.593-32.711,55.407-22.84 s6.161,36.1-12.626,58.585C458.285,160.535,433.478,170.76,421.665,160.889z" class="st10"/><path d="M490.647,80.259c-13.006-3.052-33.031,7.182-48.806,26.062c-18.216,21.8-24.086,47.119-13.658,57.638" class="st10"/><path d="M502.318,77.995c0,0,13.841,16.104,13.969,17.321c3.895,13.758-2.999,39.182-19.471,58.893 c-16.639,19.911-38.272,30.889-55.01,29.585" class="st10"/><path d="M426.429,174.822c0,0,13.977,8.846,15.243,8.941" class="st10"/><path d="M448.03,111.451c0,0-3.269,4.061-1.255,8.536c0,0-4.073-1.631-7.232,3.295c0,0,3.561-5.984,0.998-8.926 C440.541,114.356,444.052,116.661,448.03,111.451z" class="st10"/><path d="M477.649,137.349c0,0,3.621-6.419,1.058-9.362c0,0,3.511,2.306,7.489-2.904" class="st10"/><g><g><defs><path id="SVGID_00000085943627110377297630000009045071352476883647_" d="M221.651,66.983L389.094,15.79 c6.165-1.885,12.691,1.585,14.576,7.75l29.966,98.016c1.885,6.165-1.585,12.691-7.75,14.576l-167.443,51.193 c-6.165,1.885-12.691-1.585-14.576-7.75l-29.966-98.016C212.016,75.394,215.486,68.868,221.651,66.983z"/></defs><clipPath id="SVGID_00000054236472349859972180000005606467681029437853_"><use xlink:href="#SVGID_00000085943627110377297630000009045071352476883647_" style="overflow:visible"/></clipPath><g style="clip-path:url(#SVGID_00000054236472349859972180000005606467681029437853_)"><path d="M221.651,66.983L389.094,15.79c6.165-1.885,12.691,1.585,14.576,7.75l29.966,98.016 c1.885,6.165-1.585,12.691-7.75,14.576l-167.443,51.193c-6.165,1.885-12.691-1.585-14.576-7.75l-29.966-98.016 C212.016,75.394,215.486,68.868,221.651,66.983z" class="st3"/><g><g><defs><rect id="SVGID_00000016056923431648427470000015862036179942411675_" width="40.855" height="21.157" x="382.902" y="113.151" transform="matrix(0.9563 -0.2924 0.2924 0.9563 -18.5515 123.3407)"/></defs><clipPath id="SVGID_00000168816627058435337200000010598786624046150027_"><use xlink:href="#SVGID_00000016056923431648427470000015862036179942411675_" style="overflow:visible"/></clipPath><g style="clip-path:url(#SVGID_00000168816627058435337200000010598786624046150027_)"><path d="M400.159,114.036l1.115,12.931l-3.14,0.96l-1.114-12.931L400.159,114.036z M415.766,117.834 l0.259-5.063l2.344,4.267L415.766,117.834z M420.584,121.063l2.904-0.887l-6.245-11.363l-2.681,0.82 c-0.602,0.184-1.004,0.69-1.064,1.299l-1.272,12.687l3.296-1.008l0.101-2.012l4.028-1.231L420.584,121.063z M411.178,119.606c-0.967-3.207-5.464-2.025-5.871-3.465c-0.124-0.439,0.15-1.029,1.02-1.425 c0.433-0.196,1.658-0.62,3.263-0.403l-0.236-2.742c-0.839-0.044-1.893-0.01-3.101,0.36 c-3.103,0.948-4.783,3.266-4.079,5.635c0.514,1.752,2.391,2.244,3.759,2.462c1.404,0.22,1.931,0.477,2.089,1.01 c0.241,0.817-0.617,1.472-1.515,1.762c-1.571,0.508-2.626,0.337-3.46,0.22l0.244,2.833c0.836,0.113,2.279-0.008,3.69-0.423 C410.278,124.422,411.937,122.132,411.178,119.606z M395.673,115.408l-1.377,13.692l-3.319,1.015l-5.464-8.921 c-0.335-0.55-0.534-0.728-1.073-0.838c-0.88-0.179-2.243-0.182-3.413-0.085l-0.033-0.375l5.343-1.634 c0.681-0.208,1.431,0.057,1.826,0.795l3.469,6.619l0.742-9.26L395.673,115.408L395.673,115.408z" class="st5"/><path d="M397.113,135.972c-0.162,0.157-0.533,0.379-1.039,0.534c-1.173,0.359-2.276-0.115-2.695-1.485 c-0.4-1.309,0.215-2.456,1.505-2.85c0.512-0.157,0.879-0.147,1.044-0.117l-0.002,0.48c-0.227-0.038-0.54-0.024-0.886,0.082 c-0.975,0.298-1.433,1.12-1.099,2.213c0.314,1.025,1.098,1.494,2.104,1.186c0.334-0.102,0.646-0.272,0.83-0.443 L397.113,135.972z" class="st5"/><path d="M397.784,134.282c0.2,0.654,0.721,1.035,1.252,0.872c0.519-0.158,0.759-0.764,0.553-1.438 c-0.155-0.506-0.602-1.064-1.244-0.868C397.709,133.043,397.612,133.72,397.784,134.282z M400.139,133.528 c0.338,1.105-0.286,1.823-1.003,2.042c-0.802,0.245-1.613-0.155-1.902-1.099c-0.304-0.995,0.178-1.783,0.999-2.034 C399.091,132.175,399.862,132.621,400.139,133.528z" class="st5"/><path d="M400.777,132.611c-0.096-0.315-0.184-0.558-0.272-0.801l0.475-0.145l0.174,0.479l0.019-0.005 c0.08-0.335,0.276-0.685,0.777-0.838c0.401-0.123,0.785,0.03,1.023,0.342l0.012-0.004c0.039-0.201,0.125-0.362,0.22-0.492 c0.138-0.191,0.307-0.324,0.591-0.41c0.401-0.123,1.067-0.044,1.384,0.993l0.536,1.754l-0.531,0.162l-0.516-1.685 c-0.177-0.58-0.497-0.854-0.929-0.722c-0.315,0.096-0.48,0.396-0.499,0.686c0,0.088,0.01,0.186,0.04,0.285l0.564,1.846 l-0.531,0.162l-0.547-1.79c-0.145-0.476-0.459-0.751-0.873-0.625c-0.333,0.102-0.503,0.451-0.507,0.75 c-0.008,0.084,0.01,0.186,0.038,0.278l0.55,1.797l-0.531,0.162L400.777,132.611L400.777,132.611z" class="st5"/><path d="M406.081,130.989c-0.096-0.314-0.184-0.558-0.272-0.801l0.475-0.145l0.174,0.48l0.019-0.006 c0.08-0.334,0.276-0.685,0.776-0.838c0.402-0.122,0.786,0.03,1.023,0.342l0.012-0.003c0.039-0.202,0.126-0.363,0.221-0.493 c0.137-0.191,0.306-0.323,0.591-0.41c0.4-0.123,1.066-0.043,1.383,0.994l0.536,1.753l-0.53,0.163l-0.516-1.686 c-0.177-0.58-0.497-0.854-0.929-0.722c-0.315,0.097-0.48,0.397-0.499,0.687c-0.001,0.087,0.009,0.186,0.039,0.285 l0.565,1.845l-0.531,0.163l-0.548-1.791c-0.145-0.475-0.459-0.75-0.872-0.624c-0.334,0.102-0.504,0.451-0.507,0.749 c-0.008,0.084,0.01,0.186,0.038,0.279l0.549,1.796l-0.531,0.163L406.081,130.989z" class="st5"/><path d="M413.401,129.184c-0.099-0.342-0.41-0.834-1.022-0.647c-0.556,0.17-0.637,0.742-0.565,1.132 L413.401,129.184z M411.926,130.059c0.238,0.731,0.793,0.892,1.342,0.724c0.39-0.119,0.609-0.26,0.78-0.407l0.218,0.359 c-0.165,0.145-0.466,0.352-0.942,0.497c-0.919,0.281-1.656-0.162-1.931-1.064c-0.276-0.901,0.04-1.767,0.911-2.033 c0.981-0.3,1.495,0.475,1.663,1.024c0.034,0.111,0.052,0.193,0.059,0.258L411.926,130.059z" class="st5"/><path d="M414.67,128.499c-0.108-0.352-0.206-0.653-0.309-0.925l0.475-0.145l0.205,0.585l0.018-0.006 c0.014-0.443,0.27-0.798,0.635-0.909c0.055-0.017,0.1-0.025,0.151-0.033l0.156,0.512c-0.059,0.005-0.114,0.022-0.188,0.044 c-0.383,0.117-0.568,0.484-0.517,0.915c0.01,0.077,0.032,0.172,0.058,0.259l0.487,1.592l-0.543,0.166L414.67,128.499z" class="st5"/><path d="M419.508,129.152c-0.122,0.112-0.404,0.313-0.805,0.436c-0.902,0.276-1.676-0.157-1.955-1.07 c-0.281-0.92,0.143-1.785,1.118-2.084c0.322-0.098,0.63-0.104,0.803-0.07l0.003,0.452c-0.151-0.029-0.377-0.04-0.674,0.05 c-0.685,0.21-0.898,0.835-0.709,1.453c0.211,0.691,0.786,0.981,1.378,0.8c0.309-0.094,0.49-0.231,0.624-0.346 L419.508,129.152z" class="st5"/><path d="M420.33,129.016l-0.913-2.988l0.543-0.166l0.914,2.988L420.33,129.016L420.33,129.016z M419.764,125.003c0.057,0.185-0.027,0.373-0.242,0.439c-0.198,0.061-0.373-0.048-0.43-0.233 c-0.057-0.185,0.032-0.382,0.236-0.444C419.526,124.705,419.706,124.812,419.764,125.003z" class="st5"/><path d="M423.038,126.52c-0.597,0.17-1.237,0.48-1.06,1.06c0.109,0.359,0.393,0.447,0.664,0.364 c0.395-0.12,0.573-0.445,0.582-0.724c0-0.068-0.013-0.131-0.028-0.181L423.038,126.52z M423.81,127.169 c0.079,0.259,0.169,0.509,0.261,0.703l-0.487,0.149l-0.159-0.363l-0.018,0.005c-0.095,0.286-0.352,0.594-0.778,0.724 c-0.605,0.185-1.044-0.147-1.176-0.579c-0.22-0.722,0.3-1.313,1.457-1.66l-0.019-0.062c-0.074-0.241-0.28-0.67-0.889-0.478 c-0.284,0.087-0.549,0.256-0.715,0.463l-0.235-0.327c0.199-0.23,0.531-0.446,0.908-0.561 c0.914-0.279,1.327,0.276,1.508,0.868L423.81,127.169L423.81,127.169z" class="st5"/><path d="M423.72,123.187l0.543-0.166l1.34,4.383l-0.543,0.166L423.72,123.187z" class="st5"/></g></g></g><path d="M318.816,66.9l8.979-2.745l-0.81-2.649l-5.678,1.736l-0.751-2.457l4.569-1.397l-0.829-2.713l-4.57,1.397 l-0.711-2.327l5.678-1.736l-0.81-2.649l-8.979,2.745L318.816,66.9z" class="st12"/><path d="M335.93,50.762l-3.952,1.208l-0.583,2.806l-2.118-1.98l-4.062,1.242l4.79,3.811l-1.96,6.23l3.953-1.208 l0.759-3.168l2.381,2.208l4.062-1.242l-5.11-4.068L335.93,50.762z" class="st12"/><path d="M342.083,48.615c-1.091,0.334-1.903,1.068-2.351,2.132l-0.321-1.05l-3.029,0.926l4.345,14.213 l3.231-0.988l-1.524-4.986c0.771,0.427,1.776,0.538,2.826,0.217c2.645-0.809,3.861-3.409,2.886-6.6 c-0.976-3.19-3.336-4.698-6.062-3.865L342.083,48.615z M343.765,56.645c-1.212,0.371-2.228-0.356-2.728-1.992 s-0.064-2.807,1.148-3.177c1.212-0.371,2.222,0.336,2.728,1.992C345.419,55.123,344.977,56.274,343.765,56.645z" class="st12"/><path d="M354.668,53.443c-0.989,0.302-1.91-0.035-2.536-1.432l6.887-2.105l-0.13-0.424 c-0.951-3.11-3.416-4.96-6.788-3.929c-2.383,0.728-4.735,2.861-3.531,6.797c0.975,3.19,3.659,4.599,6.849,3.624 c1.898-0.58,4.051-1.989,3.896-5.165l-3.272,1c0.025,0.588-0.227,1.284-1.377,1.636L354.668,53.443z M352.829,47.934 c0.929-0.284,1.715,0.049,2.168,1.169l-3.373,1.031C351.478,48.788,352.061,48.169,352.829,47.934z" class="st12"/><path d="M363.51,42.064c-1.111,0.34-1.952,1.127-2.314,2.252l-0.358-1.172l-3.03,0.926l3.05,9.975l3.231-0.988 l-1.698-5.552c-0.407-1.332,0.095-2.148,0.983-2.419c0.949-0.29,1.638-0.059,2.1,1.455l1.704,5.572l3.231-0.988l-1.778-5.815 C367.668,42.163,366.013,41.299,363.51,42.064z" class="st12"/><path d="M377.766,33.013c-0.987,0.302-1.471,1.243-1.188,2.169c0.283,0.927,1.217,1.457,2.205,1.155 c0.988-0.302,1.485-1.269,1.202-2.197C379.701,33.213,378.774,32.705,377.766,33.013z" class="st12"/><path d="M380.8,37.065l-3.224,0.986l3.042,9.953l3.225-0.986L380.8,37.065z" class="st12"/><path d="M374.474,43.088l-0.864,0.064c-0.904,0.077-1.319-0.199-1.437-0.586 c-0.168-0.55,0.187-1.046,0.935-1.275c0.949-0.29,1.549-0.136,1.829,0.779l2.783-0.851c-0.706-2.076-2.308-2.939-5.399-1.994 c-2.666,0.815-3.958,2.293-3.279,4.513c0.535,1.751,1.957,2.185,4.85,1.97l0.864-0.064c0.904-0.077,1.327,0.225,1.445,0.612 c0.168,0.55-0.242,0.943-1.089,1.202c-1.111,0.34-1.741,0.086-2.162-0.787l-3.15,0.963c0.917,2.349,2.96,3.038,5.889,2.142 c2.928-0.895,4.314-2.5,3.635-4.72c-0.536-1.753-1.958-2.185-4.851-1.97L374.474,43.088z" class="st12"/><path d="M393.419,33.207l0.046,6.639l-3.634-5.542l-4.183,1.279l-0.095-0.313 c-0.25-0.815,0.107-1.816,1.051-2.104l0.46-0.141l-0.805-2.634l-0.662,0.202c-2.743,0.907-3.969,3.407-3.221,5.854 l0.039,0.126l-1.209,0.37l0.898,2.938l1.209-0.37l2.145,7.015l3.225-0.986l-2.145-7.015l1.816-0.555l4.481,6.015l-0.083,1.171 c-0.068,0.857-0.342,1.185-1.008,1.388c-0.342,0.105-0.685,0.21-1.213,0.216l0.606,2.701c0.527-0.007,1.15-0.131,1.915-0.365 c1.935-0.591,2.69-1.725,2.875-4.581l0.776-12.31l-3.285,1.004L393.419,33.207z" class="st12"/><path d="M240.344,118.145c-0.077-0.253-0.084-0.522-0.02-0.779l0.729-2.934c0.124-0.498,0.5-0.894,0.99-1.043 l6.884-2.105c0.771-0.236,1.587,0.198,1.822,0.969l4.266,13.953c0.236,0.771-0.198,1.587-0.968,1.822l-6.885,2.105 c-0.49,0.15-1.023,0.031-1.404-0.312l-2.245-2.024c-0.197-0.178-0.341-0.405-0.419-0.658L240.344,118.145z M252.145,111.826 c-0.236-0.771,0.198-1.586,0.968-1.822l2.791-0.853c0.771-0.236,1.586,0.198,1.822,0.969l1.493,4.883 c0.236,0.771-0.198,1.587-0.969,1.822l-2.79,0.853c-0.771,0.236-1.587-0.198-1.822-0.968L252.145,111.826z M260.09,107.871 c-0.77,0.236-1.204,1.051-0.969,1.822l2.133,6.977c0.236,0.77,1.052,1.204,1.822,0.969l2.791-0.854 c0.771-0.235,1.205-1.051,0.969-1.822l-2.133-6.976c-0.236-0.771-1.051-1.205-1.822-0.969L260.09,107.871z M254.918,120.896 c-0.236-0.771,0.198-1.587,0.968-1.822l2.791-0.853c0.771-0.236,1.586,0.198,1.822,0.968l1.493,4.884 c0.236,0.771-0.198,1.586-0.969,1.822l-2.79,0.853c-0.771,0.236-1.587-0.198-1.822-0.969L254.918,120.896z M263.503,119.034 c-0.771,0.235-1.204,1.051-0.969,1.822l0.854,2.791c0.235,0.77,1.051,1.204,1.821,0.968l2.791-0.853 c0.771-0.236,1.205-1.051,0.969-1.822l-0.853-2.791c-0.236-0.77-1.052-1.204-1.822-0.968L263.503,119.034z" class="st13"/></g></g></g><path d="M221.505,66.505l167.443-51.193c6.429-1.966,13.234,1.653,15.2,8.082l29.966,98.016 c1.966,6.429-1.653,13.234-8.082,15.2l-167.443,51.193c-6.429,1.966-13.234-1.653-15.2-8.082l-29.966-98.016 C211.457,75.276,215.076,68.471,221.505,66.505z" class="st6"/></g></g></g></svg>
\ No newline at end of file
diff --git a/assets/images/feed.svg b/assets/images/feed.svg
new file mode 100644
index 000000000000..41a739b03692
--- /dev/null
+++ b/assets/images/feed.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 20 20"><path fill-rule="evenodd" d="M6 3C6 2.44772 6.44772 2 7 2H13C13.5523 2 14 2.44772 14 3C14 3.55228 13.5523 4 13 4H7C6.44772 4 6 3.55228 6 3ZM4 7C4 6.44772 4.44772 6 5 6H15C15.5523 6 16 6.44772 16 7C16 7.55228 15.5523 8 15 8H5C4.44772 8 4 7.55228 4 7ZM16 10H4C2.34315 10 1 11.3431 1 13V15C1 16.6569 2.34315 18 4 18H16C17.6569 18 19 16.6569 19 15V13C19 11.3431 17.6569 10 16 10ZM3 13C3 12.4477 3.44772 12 4 12H16C16.5523 12 17 12.4477 17 13V15C17 15.5523 16.5523 16 16 16H4C3.44772 16 3 15.5523 3 15V13Z" clip-rule="evenodd"/></svg>
\ No newline at end of file
diff --git a/assets/images/filter.svg b/assets/images/filter.svg
new file mode 100644
index 000000000000..527b0996ab01
--- /dev/null
+++ b/assets/images/filter.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" id="Layer_1" x="0" y="0" version="1.1" viewBox="0 0 20 20" style="enable-background:new 0 0 20 20" xml:space="preserve"><path d="M2,5c0-1.105,0.895-2,2-2s2,0.895,2,2S5.105,7,4,7S2,6.105,2,5z M8,6h9c0.552,0,1-0.448,1-1s-0.448-1-1-1H8	C7.958,4,7.917,4.003,7.876,4.008C7.957,4.325,8,4.658,8,5c0,0.343-0.043,0.675-0.124,0.992C7.917,5.997,7.958,6,8,6z M4,13	c-1.105,0-2,0.895-2,2s0.895,2,2,2s2-0.895,2-2S5.105,13,4,13z M17,14H8c-0.042,0-0.083,0.003-0.124,0.008	C7.957,14.325,8,14.658,8,15c0,0.343-0.043,0.675-0.124,0.992C7.917,15.997,7.958,16,8,16h9c0.552,0,1-0.448,1-1S17.552,14,17,14z M16,8c-1.105,0-2,0.895-2,2s0.895,2,2,2s2-0.895,2-2S17.105,8,16,8z M3,11h9c0.042,0,0.083-0.003,0.124-0.008	C12.043,10.675,12,10.342,12,10s0.043-0.675,0.124-0.992C12.083,9.003,12.042,9,12,9H3c-0.552,0-1,0.448-1,1S2.448,11,3,11z"/></svg>
\ No newline at end of file
diff --git a/assets/images/filters.svg b/assets/images/filters.svg
new file mode 100644
index 000000000000..239eb8b08638
--- /dev/null
+++ b/assets/images/filters.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 20 20"><path d="M4 7C5.10457 7 6 6.10457 6 5C6 3.89543 5.10457 3 4 3C2.89543 3 2 3.89543 2 5C2 6.10457 2.89543 7 4 7Z"/><path d="M8.00004 5C8.00004 5.34256 7.95698 5.67506 7.87598 5.99238C7.91663 5.99741 7.95803 6 8.00004 6H17C17.5523 6 18 5.55228 18 5C18 4.44772 17.5523 4 17 4H8.00004C7.95803 4 7.91663 4.00259 7.87598 4.00762C7.95698 4.32494 8.00004 4.65744 8.00004 5Z"/><path d="M6 15C6 16.1046 5.10457 17 4 17C2.89543 17 2 16.1046 2 15C2 13.8954 2.89543 13 4 13C5.10457 13 6 13.8954 6 15Z"/><path d="M8.00004 15C8.00004 15.3426 7.95698 15.6751 7.87598 15.9924C7.91663 15.9974 7.95803 16 8.00004 16H17C17.5523 16 18 15.5523 18 15C18 14.4477 17.5523 14 17 14H8.00004C7.95803 14 7.91663 14.0026 7.87598 14.0076C7.95698 14.3249 8.00004 14.6574 8.00004 15Z"/><path d="M18 10C18 11.1046 17.1046 12 16 12C14.8954 12 14 11.1046 14 10C14 8.89543 14.8954 8 16 8C17.1046 8 18 8.89543 18 10Z"/><path d="M12 9C12.042 9 12.0834 9.00259 12.1241 9.00762C12.0431 9.32494 12 9.65744 12 10C12 10.3426 12.0431 10.6751 12.1241 10.9924C12.0834 10.9974 12.042 11 12 11H3C2.44771 11 2 10.5523 2 10C2 9.44772 2.44772 9 3 9H12Z"/></svg>
\ No newline at end of file
diff --git a/assets/images/inbox.svg b/assets/images/inbox.svg
new file mode 100644
index 000000000000..29ab7f916616
--- /dev/null
+++ b/assets/images/inbox.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" id="Layer_1" data-name="Layer 1" version="1.1" viewBox="0 0 20 20"><defs><style>.cls-1{fill-rule:evenodd;stroke-width:0}</style></defs><path d="M4.5,1.5c-1.657,0-3,1.343-3,3v11c0,1.657,1.343,3,3,3h11c1.657,0,3-1.343,3-3V4.5c0-1.657-1.343-3-3-3H4.5ZM3.5,4.5c0-.552.448-1,1-1h11c.552,0,1,.448,1,1v7.5h-3.5c-.276,0-.495.226-.549.497-.23,1.143-1.24,2.003-2.451,2.003s-2.22-.861-2.451-2.003c-.055-.271-.273-.497-.549-.497h-3.5v-7.5Z" class="cls-1"/></svg>
\ No newline at end of file
diff --git a/assets/images/integrationicons/netsuite-icon-square.svg b/assets/images/integrationicons/netsuite-icon-square.svg
new file mode 100644
index 000000000000..1b4557c5a044
--- /dev/null
+++ b/assets/images/integrationicons/netsuite-icon-square.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" id="Layer_1" x="0" y="0" version="1.1" viewBox="0 0 40 40" style="enable-background:new 0 0 40 40" xml:space="preserve"><style type="text/css">.st0{fill:#28495c}.st1{fill:#fff}</style><rect width="40" height="40" class="st0"/><path d="M23.658,17.08c-0.37,0-0.68-0.249-0.778-0.588h2.051l0.283-0.44h-2.335c0.097-0.342,0.407-0.588,0.778-0.588	h1.408l0.281-0.44h-1.722c-0.689,0-1.247,0.559-1.247,1.25c0,0.692,0.558,1.247,1.247,1.247h1.483l0.281-0.439h-1.73V17.08z M17.784,17.52h1.483l0.281-0.439h-1.729c-0.449,0-0.811-0.363-0.811-0.808c0-0.445,0.361-0.808,0.811-0.808h1.407l0.286-0.442	h-1.725c-0.69,0-1.25,0.559-1.25,1.25c0,0.692,0.56,1.247,1.25,1.247 M8.67,17.08H7.282c-0.447,0-0.808-0.363-0.808-0.808	c0-0.445,0.361-0.808,0.808-0.808h1.386c0.447,0,0.811,0.361,0.811,0.808c0,0.447-0.361,0.808-0.811,0.808 M7.251,17.52h1.452	c0.69,0,1.246-0.558,1.246-1.247c0-0.689-0.557-1.249-1.249-1.249H7.25c-0.692,0-1.25,0.557-1.25,1.25	c0,0.693,0.559,1.247,1.25,1.247L7.251,17.52z M12.305,16.712c0.469,0,0.844-0.378,0.844-0.844c0-0.466-0.377-0.844-0.845-0.844	h-2.101v2.497h0.48v-2.055h1.589c0.224,0,0.405,0.181,0.405,0.403s-0.181,0.406-0.405,0.406h-1.352l1.435,1.247h0.696l-0.962-0.808	h0.218 M20.245,15.024h-0.48v2.259c0,0.062,0.027,0.122,0.071,0.165c0.045,0.048,0.109,0.073,0.174,0.073h2.188l0.286-0.439h-2.238	V15.024z M14.368,16.641h1.279l-0.676-1.09l-1.242,1.971h-0.567l1.513-2.367C14.741,15.057,14.853,15,14.973,15	c0.12,0,0.227,0.056,0.293,0.15l1.516,2.371h-0.566l-0.266-0.439h-1.298l-0.283-0.44L14.368,16.641z" class="st1"/><path d="M9.544,23.759l-2.812-4.172L6.72,19.569H6v5.506h0.769v-4.19l2.812,4.172l0.013,0.018h0.718v-5.506H9.544	V23.759z" class="st1"/><path d="M16.787,24.434c-0.053,0.006-0.111,0.007-0.168,0.007c-0.344,0-0.511-0.196-0.511-0.601v-2.108h0.843v-0.634	h-0.843v-1.074h-0.476l-0.27,1.068l-0.678,0.225v0.413h0.672v2.115c0,0.427,0.094,0.748,0.278,0.953	c0.192,0.207,0.489,0.311,0.881,0.311c0.08,0,0.157-0.003,0.227-0.007c0.076-0.006,0.15-0.015,0.223-0.031l0.032-0.007v-0.661	l-0.045,0.004c-0.05,0.006-0.106,0.013-0.164,0.022L16.787,24.434z" class="st1"/><path d="M24.635,23.668c-0.102,0.258-0.255,0.468-0.455,0.624c-0.196,0.153-0.407,0.231-0.631,0.231	c-0.264,0-0.467-0.085-0.602-0.253c-0.137-0.171-0.207-0.421-0.207-0.743v-2.429h-0.753v2.451c0,0.515,0.122,0.915,0.361,1.191	c0.246,0.276,0.595,0.417,1.037,0.417c0.288,0,0.559-0.067,0.802-0.199c0.22-0.116,0.409-0.28,0.563-0.484l0.108,0.602h0.531v-3.976	h-0.753v2.57V23.668z" class="st1"/><path d="M26.116,21.438l0.388,0.246v3.391h0.753v-3.976h-1.141V21.438z" class="st1"/><path d="M27.25,19.809h-0.903v0.686h0.903V19.809z" class="st1"/><path d="M29.933,24.434c-0.053,0.006-0.111,0.007-0.168,0.007c-0.344,0-0.511-0.196-0.511-0.601v-2.108h0.843v-0.634	h-0.843v-1.074h-0.476l-0.27,1.068l-0.679,0.225v0.413h0.672v2.115c0,0.427,0.094,0.748,0.28,0.953	c0.192,0.207,0.489,0.311,0.881,0.311c0.08,0,0.157-0.003,0.227-0.007c0.076-0.006,0.15-0.015,0.223-0.031l0.032-0.007v-0.661	l-0.045,0.004c-0.05,0.006-0.106,0.013-0.164,0.022L29.933,24.434z" class="st1"/><path d="M34,22.856c0-1.221-0.561-1.839-1.667-1.839c-0.571,0-1.018,0.175-1.329,0.521	c-0.312,0.354-0.458,0.834-0.458,1.512c0,0.677,0.161,1.212,0.48,1.572c0.325,0.356,0.806,0.536,1.432,0.536	c0.274,0,0.53-0.025,0.763-0.076c0.238-0.05,0.43-0.12,0.573-0.207l0.02-0.013v-0.654l-0.057,0.027	c-0.204,0.092-0.407,0.162-0.603,0.206s-0.406,0.066-0.626,0.066c-0.391,0-0.687-0.097-0.882-0.287	c-0.189-0.189-0.302-0.49-0.336-0.893H34v-0.473V22.856z M31.309,22.717c0.024-0.34,0.12-0.603,0.284-0.782	c0.175-0.189,0.424-0.286,0.739-0.286c0.334,0,0.574,0.085,0.715,0.255c0.141,0.165,0.216,0.438,0.221,0.813H31.309z" class="st1"/><path d="M12.747,21.017c-0.571,0-1.018,0.175-1.328,0.521c-0.312,0.354-0.458,0.834-0.458,1.512	c0,0.677,0.161,1.212,0.482,1.572c0.325,0.356,0.806,0.536,1.432,0.536c0.274,0,0.531-0.025,0.763-0.076	c0.238-0.05,0.43-0.12,0.573-0.207l0.02-0.013v-0.654l-0.057,0.027c-0.204,0.092-0.407,0.162-0.603,0.206	c-0.196,0.043-0.406,0.066-0.626,0.066c-0.391,0-0.687-0.097-0.882-0.287c-0.189-0.189-0.302-0.49-0.336-0.893h2.691v-0.473	c0-1.221-0.561-1.839-1.667-1.839L12.747,21.017z M11.724,22.717c0.024-0.34,0.12-0.603,0.284-0.782	c0.175-0.189,0.424-0.286,0.739-0.286c0.335,0,0.574,0.085,0.715,0.255c0.141,0.165,0.215,0.438,0.221,0.813H11.724z" class="st1"/><path d="M21.083,22.687c-0.211-0.248-0.574-0.472-1.075-0.668l-0.574-0.224c-0.357-0.143-0.609-0.277-0.749-0.403	c-0.137-0.122-0.203-0.266-0.203-0.44c0-0.529,0.385-0.787,1.176-0.787c0.42,0,0.886,0.109,1.386,0.325l0.057,0.025v-0.698	l-0.021-0.011c-0.186-0.101-0.413-0.181-0.675-0.235c-0.26-0.06-0.517-0.091-0.763-0.091c-0.594,0-1.068,0.133-1.412,0.396	c-0.347,0.266-0.524,0.633-0.524,1.092c0,0.322,0.109,0.608,0.325,0.848c0.217,0.232,0.574,0.447,1.06,0.637l0.575,0.224	c0.371,0.143,0.63,0.283,0.77,0.417c0.136,0.13,0.204,0.298,0.204,0.5c0,0.277-0.112,0.489-0.34,0.645	c-0.225,0.158-0.547,0.239-0.953,0.239c-0.49,0-1.012-0.112-1.551-0.333l-0.056-0.022v0.698l0.022,0.011	c0.127,0.062,0.283,0.118,0.462,0.167c0.181,0.05,0.375,0.091,0.58,0.12c0.209,0.029,0.412,0.045,0.602,0.045	c0.628,0,1.124-0.139,1.473-0.412c0.357-0.28,0.538-0.676,0.538-1.174c0-0.347-0.112-0.647-0.33-0.892H21.083z" class="st1"/></svg>
\ No newline at end of file
diff --git a/assets/images/integrationicons/qbo-icon-circle.svg b/assets/images/integrationicons/qbo-icon-circle.svg
new file mode 100644
index 000000000000..973f07ed8b8f
--- /dev/null
+++ b/assets/images/integrationicons/qbo-icon-circle.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" id="Layer_1" x="0" y="0" version="1.1" viewBox="0 0 40 40" style="enable-background:new 0 0 40 40" xml:space="preserve"><style type="text/css">.st0{fill:#2ca01c}.st1{fill:#fff}</style><circle cx="20" cy="20" r="20" class="st0"/><path d="M13.331,12.22c-4.296,0-7.78,3.484-7.78,7.78s3.477,7.774,7.78,7.774h1.112v-2.886h-1.112	c-2.697,0-4.888-2.191-4.888-4.888s2.19-4.888,4.888-4.888h2.671v15.112c0,1.592,1.294,2.886,2.886,2.886V12.22H13.331z M26.669,27.774c4.296,0,7.78-3.484,7.78-7.774s-3.477-7.774-7.78-7.774h-1.111v2.886h1.111c2.697,0,4.888,2.191,4.888,4.888	s-2.191,4.888-4.888,4.888h-2.671V9.776c0-1.592-1.293-2.886-2.886-2.886v20.884H26.669z" class="st1"/></svg>
\ No newline at end of file
diff --git a/assets/images/integrationicons/qbo-icon-square.svg b/assets/images/integrationicons/qbo-icon-square.svg
index a8ce3468ffbf..e297b597f980 100644
--- a/assets/images/integrationicons/qbo-icon-square.svg
+++ b/assets/images/integrationicons/qbo-icon-square.svg
@@ -1,14 +1 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 28.3.0, 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 40 40" style="enable-background:new 0 0 40 40;" xml:space="preserve">
-<style type="text/css">
-	.st0{fill:#2CA01C;}
-	.st1{fill:#FFFFFF;}
-</style>
-<rect class="st0" width="40" height="40"/>
-<path class="st1" d="M13.331,12.22c-4.296,0-7.78,3.484-7.78,7.78s3.477,7.774,7.78,7.774h1.112v-2.886h-1.112
-	c-2.697,0-4.888-2.191-4.888-4.888s2.19-4.888,4.888-4.888h2.671v15.112c0,1.592,1.294,2.886,2.886,2.886V12.22H13.331z
-	 M26.669,27.774c4.296,0,7.78-3.484,7.78-7.774s-3.477-7.774-7.78-7.774h-1.111v2.886h1.111c2.697,0,4.888,2.191,4.888,4.888
-	s-2.191,4.888-4.888,4.888h-2.671V9.776c0-1.592-1.293-2.886-2.886-2.886v20.884H26.669z"/>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" id="Layer_1" x="0" y="0" version="1.1" viewBox="0 0 40 40" style="enable-background:new 0 0 40 40" xml:space="preserve"><style type="text/css">.st0{fill:#2ca01c}.st1{fill:#fff}</style><rect width="40" height="40" class="st0"/><path d="M13.331,12.22c-4.296,0-7.78,3.484-7.78,7.78s3.477,7.774,7.78,7.774h1.112v-2.886h-1.112	c-2.697,0-4.888-2.191-4.888-4.888s2.19-4.888,4.888-4.888h2.671v15.112c0,1.592,1.294,2.886,2.886,2.886V12.22H13.331z M26.669,27.774c4.296,0,7.78-3.484,7.78-7.774s-3.477-7.774-7.78-7.774h-1.111v2.886h1.111c2.697,0,4.888,2.191,4.888,4.888	s-2.191,4.888-4.888,4.888h-2.671V9.776c0-1.592-1.293-2.886-2.886-2.886v20.884H26.669z" class="st1"/></svg>
\ No newline at end of file
diff --git a/assets/images/integrationicons/sage-intacct-icon-square.svg b/assets/images/integrationicons/sage-intacct-icon-square.svg
new file mode 100644
index 000000000000..fe10342d711e
--- /dev/null
+++ b/assets/images/integrationicons/sage-intacct-icon-square.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" id="Layer_1" data-name="Layer 1" version="1.1" viewBox="0 0 40 40"><defs><style>.cls-1,.cls-2{fill:#000;stroke-width:0}.cls-2{fill:#00d639}</style></defs><rect width="40" height="40" class="cls-1"/><path d="M9.094,12.5c1.752,0,3.176,1.212,3.209,2.898.016.475-.327.737-.704.737-.36,0-.671-.262-.688-.704-.016-.95-.819-1.654-1.834-1.654-.95,0-1.67.671-1.67,1.588,0,.999.671,1.441,2.063,1.948,1.49.54,2.849,1.179,2.849,3.078,0,1.654-1.294,2.98-3.094,2.98-1.768,0-3.225-1.244-3.225-2.931,0-1.048.508-1.785.999-1.785.426,0,.688.278.688.655,0,.327-.278.475-.278,1.064,0,1.048.851,1.719,1.817,1.719,1.015,0,1.686-.704,1.686-1.555,0-1.048-.671-1.49-2.063-1.981-1.555-.556-2.849-1.228-2.849-3.077,0-1.67,1.342-2.98,3.094-2.98Z" class="cls-2"/><path d="M16.239,23.371c-1.768,0-3.241-1.424-3.241-3.225,0-1.866,1.49-3.258,3.291-3.258,1.932,0,3.291,1.441,3.291,3.406v2.39c0,.409-.327.688-.704.688-.393,0-.72-.278-.72-.688v-2.341c0-1.294-.737-2.178-1.899-2.178-1.031,0-1.85.868-1.85,1.981,0,1.031.802,1.915,1.818,1.915.377,0,.54-.098.77-.098.311,0,.638.262.638.638,0,.507-.606.77-1.392.77Z" class="cls-2"/><path d="M23.613,28.25c-1.834,0-3.356-1.31-3.356-3.013,0-.573.327-.835.704-.835s.688.246.704.72c.016,1.064.868,1.85,1.932,1.85,1.13,0,1.866-.72,1.866-1.654,0-1.064-.818-1.506-2.21-1.948-1.621-.524-2.996-1.244-2.996-3.242,0-1.834,1.408-3.242,3.242-3.242,1.85,0,3.373,1.342,3.373,3.111,0,1.081-.442,1.916-1.048,1.916-.409,0-.688-.295-.688-.655,0-.377.327-.54.327-1.212,0-1.13-.884-1.883-1.948-1.883-1.031,0-1.85.786-1.85,1.817,0,1.162.835,1.654,2.21,2.112,1.588.524,2.996,1.179,2.996,3.094,0,1.719-1.359,3.061-3.258,3.061Z" class="cls-2"/><path d="M30.889,23.371c-1.834,0-3.34-1.441-3.34-3.241s1.457-3.242,3.258-3.242c1.818,0,3.193,1.261,3.193,2.865,0,.622-.442.999-1.162.999h-1.883c-.377,0-.655-.262-.655-.606,0-.327.278-.59.655-.59h1.408c.131,0,.229-.066.229-.196,0-.475-.606-1.212-1.736-1.212-1.048,0-1.899.9-1.899,1.981,0,1.097.868,1.965,1.948,1.965,1.244,0,1.654-.737,2.161-.737.426,0,.655.278.655.59,0,.295-.196.557-.688.868-.492.311-1.228.556-2.145.556Z" class="cls-2"/></svg>
\ No newline at end of file
diff --git a/assets/images/integrationicons/xero-icon-circle.svg b/assets/images/integrationicons/xero-icon-circle.svg
new file mode 100644
index 000000000000..6c19f0f9e10a
--- /dev/null
+++ b/assets/images/integrationicons/xero-icon-circle.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" id="Layer_1" x="0" y="0" version="1.1" viewBox="0 0 40 40" style="enable-background:new 0 0 40 40" xml:space="preserve"><style type="text/css">.st0{fill:#1ab4d7}.st1{fill:#fff}</style><circle cx="20" cy="20" r="20" class="st0"/><path d="M9.574,19.942l3.413-3.422c0.113-0.115,0.176-0.268,0.176-0.43c0-0.337-0.274-0.612-0.612-0.612	c-0.164,0-0.319,0.064-0.435,0.182c0,0.001-3.41,3.408-3.41,3.408l-3.425-3.414c-0.116-0.114-0.269-0.177-0.432-0.177	c-0.337,0-0.611,0.274-0.611,0.611c0,0.164,0.066,0.319,0.184,0.435l3.413,3.412l-3.411,3.417c-0.12,0.118-0.185,0.273-0.185,0.438	c0,0.337,0.274,0.611,0.611,0.611c0.163,0,0.316-0.063,0.432-0.179l3.42-3.415l3.407,3.403c0.121,0.125,0.277,0.191,0.443,0.191	c0.337,0,0.611-0.274,0.611-0.612c0-0.163-0.063-0.316-0.178-0.431L9.574,19.942z" class="st1"/><path d="M29.864,19.941c0,0.613,0.498,1.111,1.112,1.111c0.612,0,1.111-0.498,1.111-1.111	c0-0.613-0.498-1.111-1.111-1.111C30.363,18.83,29.864,19.328,29.864,19.941z" class="st1"/><path d="M27.757,19.942c0-1.775,1.444-3.218,3.218-3.218c1.774,0,3.218,1.444,3.218,3.218	c0,1.774-1.444,3.217-3.218,3.217C29.2,23.159,27.757,21.716,27.757,19.942z M26.491,19.942c0,2.472,2.012,4.484,4.484,4.484	c2.473,0,4.485-2.011,4.485-4.484c0-2.473-2.013-4.485-4.485-4.485C28.502,15.457,26.491,17.469,26.491,19.942z" class="st1"/><path d="M26.172,15.534l-0.188,0c-0.565,0-1.11,0.178-1.565,0.529c-0.06-0.274-0.305-0.481-0.597-0.481	c-0.336,0-0.606,0.269-0.606,0.606c0,0.001,0.002,7.553,0.002,7.553c0.001,0.336,0.275,0.61,0.612,0.61	c0.336,0,0.611-0.273,0.611-0.61c0-0.002,0-4.644,0-4.644c0-1.548,0.142-2.173,1.467-2.339c0.122-0.015,0.256-0.013,0.256-0.013	c0.363-0.012,0.621-0.262,0.621-0.599C26.786,15.808,26.51,15.534,26.172,15.534z" class="st1"/><path d="M14.43,19.203c0-0.017,0.001-0.034,0.002-0.051c0.355-1.404,1.626-2.442,3.14-2.442	c1.532,0,2.815,1.064,3.152,2.493H14.43z M21.976,19.088c-0.264-1.248-0.947-2.273-1.987-2.931	c-1.521-0.965-3.528-0.912-4.997,0.132c-1.198,0.852-1.89,2.246-1.89,3.682c0,0.36,0.043,0.724,0.134,1.081	c0.452,1.779,1.982,3.126,3.806,3.35c0.541,0.066,1.068,0.034,1.613-0.107c0.469-0.114,0.922-0.304,1.34-0.572	c0.434-0.279,0.796-0.646,1.147-1.087c0.007-0.008,0.014-0.015,0.021-0.024c0.244-0.302,0.198-0.732-0.069-0.937	c-0.226-0.173-0.605-0.243-0.903,0.139c-0.064,0.091-0.136,0.185-0.214,0.279c-0.237,0.262-0.531,0.516-0.884,0.713	c-0.449,0.24-0.96,0.377-1.503,0.38c-1.779-0.02-2.731-1.261-3.069-2.148c-0.059-0.166-0.105-0.337-0.137-0.514	c-0.004-0.033-0.007-0.065-0.009-0.094c0.368,0,6.383-0.001,6.383-0.001C21.635,20.412,22.106,19.794,21.976,19.088z" class="st1"/></svg>
\ No newline at end of file
diff --git a/assets/images/integrationicons/xero-icon-square.svg b/assets/images/integrationicons/xero-icon-square.svg
index 94b79bb3533d..43774919c92c 100644
--- a/assets/images/integrationicons/xero-icon-square.svg
+++ b/assets/images/integrationicons/xero-icon-square.svg
@@ -1,32 +1 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 28.3.0, 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 40 40" style="enable-background:new 0 0 40 40;" xml:space="preserve">
-<style type="text/css">
-	.st0{fill:#1AB4D7;}
-	.st1{fill:#FFFFFF;}
-</style>
-<rect class="st0" width="40" height="40"/>
-<path class="st1" d="M9.574,19.942l3.413-3.422c0.113-0.115,0.176-0.268,0.176-0.43c0-0.337-0.274-0.612-0.612-0.612
-	c-0.164,0-0.319,0.064-0.435,0.182c0,0.001-3.41,3.408-3.41,3.408l-3.425-3.414c-0.116-0.114-0.269-0.177-0.432-0.177
-	c-0.337,0-0.611,0.274-0.611,0.611c0,0.164,0.066,0.319,0.184,0.435l3.413,3.412l-3.411,3.417c-0.12,0.118-0.185,0.273-0.185,0.438
-	c0,0.337,0.274,0.611,0.611,0.611c0.163,0,0.316-0.063,0.432-0.179l3.42-3.415l3.407,3.403c0.121,0.125,0.277,0.191,0.443,0.191
-	c0.337,0,0.611-0.274,0.611-0.612c0-0.163-0.063-0.316-0.178-0.431L9.574,19.942z"/>
-<path class="st1" d="M29.864,19.941c0,0.613,0.498,1.111,1.112,1.111c0.612,0,1.111-0.498,1.111-1.111
-	c0-0.613-0.498-1.111-1.111-1.111C30.363,18.83,29.864,19.328,29.864,19.941z"/>
-<path class="st1" d="M27.757,19.942c0-1.775,1.444-3.218,3.218-3.218c1.774,0,3.218,1.444,3.218,3.218
-	c0,1.774-1.444,3.217-3.218,3.217C29.2,23.159,27.757,21.716,27.757,19.942z M26.491,19.942c0,2.472,2.012,4.484,4.484,4.484
-	c2.473,0,4.485-2.011,4.485-4.484c0-2.473-2.013-4.485-4.485-4.485C28.502,15.457,26.491,17.469,26.491,19.942z"/>
-<path class="st1" d="M26.172,15.534l-0.188,0c-0.565,0-1.11,0.178-1.565,0.529c-0.06-0.274-0.305-0.481-0.597-0.481
-	c-0.336,0-0.606,0.269-0.606,0.606c0,0.001,0.002,7.553,0.002,7.553c0.001,0.336,0.275,0.61,0.612,0.61
-	c0.336,0,0.611-0.273,0.611-0.61c0-0.002,0-4.644,0-4.644c0-1.548,0.142-2.173,1.467-2.339c0.122-0.015,0.256-0.013,0.256-0.013
-	c0.363-0.012,0.621-0.262,0.621-0.599C26.786,15.808,26.51,15.534,26.172,15.534z"/>
-<path class="st1" d="M14.43,19.203c0-0.017,0.001-0.034,0.002-0.051c0.355-1.404,1.626-2.442,3.14-2.442
-	c1.532,0,2.815,1.064,3.152,2.493H14.43z M21.976,19.088c-0.264-1.248-0.947-2.273-1.987-2.931
-	c-1.521-0.965-3.528-0.912-4.997,0.132c-1.198,0.852-1.89,2.246-1.89,3.682c0,0.36,0.043,0.724,0.134,1.081
-	c0.452,1.779,1.982,3.126,3.806,3.35c0.541,0.066,1.068,0.034,1.613-0.107c0.469-0.114,0.922-0.304,1.34-0.572
-	c0.434-0.279,0.796-0.646,1.147-1.087c0.007-0.008,0.014-0.015,0.021-0.024c0.244-0.302,0.198-0.732-0.069-0.937
-	c-0.226-0.173-0.605-0.243-0.903,0.139c-0.064,0.091-0.136,0.185-0.214,0.279c-0.237,0.262-0.531,0.516-0.884,0.713
-	c-0.449,0.24-0.96,0.377-1.503,0.38c-1.779-0.02-2.731-1.261-3.069-2.148c-0.059-0.166-0.105-0.337-0.137-0.514
-	c-0.004-0.033-0.007-0.065-0.009-0.094c0.368,0,6.383-0.001,6.383-0.001C21.635,20.412,22.106,19.794,21.976,19.088z"/>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" id="Layer_1" x="0" y="0" version="1.1" viewBox="0 0 40 40" style="enable-background:new 0 0 40 40" xml:space="preserve"><style type="text/css">.st0{fill:#1ab4d7}.st1{fill:#fff}</style><rect width="40" height="40" class="st0"/><path d="M9.574,19.942l3.413-3.422c0.113-0.115,0.176-0.268,0.176-0.43c0-0.337-0.274-0.612-0.612-0.612	c-0.164,0-0.319,0.064-0.435,0.182c0,0.001-3.41,3.408-3.41,3.408l-3.425-3.414c-0.116-0.114-0.269-0.177-0.432-0.177	c-0.337,0-0.611,0.274-0.611,0.611c0,0.164,0.066,0.319,0.184,0.435l3.413,3.412l-3.411,3.417c-0.12,0.118-0.185,0.273-0.185,0.438	c0,0.337,0.274,0.611,0.611,0.611c0.163,0,0.316-0.063,0.432-0.179l3.42-3.415l3.407,3.403c0.121,0.125,0.277,0.191,0.443,0.191	c0.337,0,0.611-0.274,0.611-0.612c0-0.163-0.063-0.316-0.178-0.431L9.574,19.942z" class="st1"/><path d="M29.864,19.941c0,0.613,0.498,1.111,1.112,1.111c0.612,0,1.111-0.498,1.111-1.111	c0-0.613-0.498-1.111-1.111-1.111C30.363,18.83,29.864,19.328,29.864,19.941z" class="st1"/><path d="M27.757,19.942c0-1.775,1.444-3.218,3.218-3.218c1.774,0,3.218,1.444,3.218,3.218	c0,1.774-1.444,3.217-3.218,3.217C29.2,23.159,27.757,21.716,27.757,19.942z M26.491,19.942c0,2.472,2.012,4.484,4.484,4.484	c2.473,0,4.485-2.011,4.485-4.484c0-2.473-2.013-4.485-4.485-4.485C28.502,15.457,26.491,17.469,26.491,19.942z" class="st1"/><path d="M26.172,15.534l-0.188,0c-0.565,0-1.11,0.178-1.565,0.529c-0.06-0.274-0.305-0.481-0.597-0.481	c-0.336,0-0.606,0.269-0.606,0.606c0,0.001,0.002,7.553,0.002,7.553c0.001,0.336,0.275,0.61,0.612,0.61	c0.336,0,0.611-0.273,0.611-0.61c0-0.002,0-4.644,0-4.644c0-1.548,0.142-2.173,1.467-2.339c0.122-0.015,0.256-0.013,0.256-0.013	c0.363-0.012,0.621-0.262,0.621-0.599C26.786,15.808,26.51,15.534,26.172,15.534z" class="st1"/><path d="M14.43,19.203c0-0.017,0.001-0.034,0.002-0.051c0.355-1.404,1.626-2.442,3.14-2.442	c1.532,0,2.815,1.064,3.152,2.493H14.43z M21.976,19.088c-0.264-1.248-0.947-2.273-1.987-2.931	c-1.521-0.965-3.528-0.912-4.997,0.132c-1.198,0.852-1.89,2.246-1.89,3.682c0,0.36,0.043,0.724,0.134,1.081	c0.452,1.779,1.982,3.126,3.806,3.35c0.541,0.066,1.068,0.034,1.613-0.107c0.469-0.114,0.922-0.304,1.34-0.572	c0.434-0.279,0.796-0.646,1.147-1.087c0.007-0.008,0.014-0.015,0.021-0.024c0.244-0.302,0.198-0.732-0.069-0.937	c-0.226-0.173-0.605-0.243-0.903,0.139c-0.064,0.091-0.136,0.185-0.214,0.279c-0.237,0.262-0.531,0.516-0.884,0.713	c-0.449,0.24-0.96,0.377-1.503,0.38c-1.779-0.02-2.731-1.261-3.069-2.148c-0.059-0.166-0.105-0.337-0.137-0.514	c-0.004-0.033-0.007-0.065-0.009-0.094c0.368,0,6.383-0.001,6.383-0.001C21.635,20.412,22.106,19.794,21.976,19.088z" class="st1"/></svg>
\ No newline at end of file
diff --git a/assets/images/invoice-generic.svg b/assets/images/invoice-generic.svg
index d0e2662c4084..251918c4cff4 100644
--- a/assets/images/invoice-generic.svg
+++ b/assets/images/invoice-generic.svg
@@ -1,15 +1 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 28.1.0, 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 d="M6.75,7C6.336,7,6,7.336,6,7.75C6,8.164,6.336,8.5,6.75,8.5h6.5C13.664,8.5,14,8.164,14,7.75C14,7.336,13.664,7,13.25,7
-	H6.75z"/>
-<path class="st0" d="M3.825,1.707L4.75,2.5l1.425-1.221c0.187-0.161,0.464-0.161,0.651,0L8.25,2.5l1.425-1.221
-	c0.187-0.161,0.464-0.161,0.651,0L11.75,2.5l1.425-1.221c0.187-0.161,0.464-0.161,0.651,0L15.25,2.5l0.925-0.793
-	C16.499,1.429,17,1.66,17,2.087v5.1L17.631,7.7C17.864,7.89,18,8.175,18,8.476V18c0,1.105-0.895,2-2,2H4c-1.105,0-2-0.895-2-2V8.476
-	C2,8.175,2.136,7.89,2.369,7.7L3,7.188v-5.1C3,1.66,3.501,1.429,3.825,1.707z M5,4.92v4.608L10,12l5-2.472V4.92l-1.5-1.286
-	l-1.75,1.5L10,3.634l-1.75,1.5l-1.75-1.5L5,4.92z"/>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" id="Layer_1" x="0" y="0" version="1.1" 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 d="M6.75,7C6.336,7,6,7.336,6,7.75C6,8.164,6.336,8.5,6.75,8.5h6.5C13.664,8.5,14,8.164,14,7.75C14,7.336,13.664,7,13.25,7	H6.75z"/><path d="M3.825,1.707L4.75,2.5l1.425-1.221c0.187-0.161,0.464-0.161,0.651,0L8.25,2.5l1.425-1.221	c0.187-0.161,0.464-0.161,0.651,0L11.75,2.5l1.425-1.221c0.187-0.161,0.464-0.161,0.651,0L15.25,2.5l0.925-0.793	C16.499,1.429,17,1.66,17,2.087v5.1L17.631,7.7C17.864,7.89,18,8.175,18,8.476V18c0,1.105-0.895,2-2,2H4c-1.105,0-2-0.895-2-2V8.476	C2,8.175,2.136,7.89,2.369,7.7L3,7.188v-5.1C3,1.66,3.501,1.429,3.825,1.707z M5,4.92v4.608L10,12l5-2.472V4.92l-1.5-1.286	l-1.75,1.5L10,3.634l-1.75,1.5l-1.75-1.5L5,4.92z" class="st0"/></svg>
\ No newline at end of file
diff --git a/assets/images/money-search.svg b/assets/images/money-search.svg
new file mode 100644
index 000000000000..72a77352f861
--- /dev/null
+++ b/assets/images/money-search.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" id="Layer_1" data-name="Layer 1" version="1.1" viewBox="0 0 20 20"><defs><style>.cls-1,.cls-2{stroke-width:0}.cls-2{fill-rule:evenodd}</style></defs><path d="M18,4c0-1.105-.895-2-2-2H2c-1.105,0-2,.895-2,2v8c0,1.105.895,2,2,2h5.019c-.013-.165-.019-.332-.019-.5,0-1.012.231-1.97.644-2.823-.975-.495-1.644-1.508-1.644-2.677,0-1.657,1.343-3,3-3,1.38,0,2.542.932,2.892,2.2.514-.131,1.053-.2,1.608-.2,1.747,0,3.332.689,4.5,1.81v-4.81Z" class="cls-1"/><path d="M9,13.5c0-2.485,2.015-4.5,4.5-4.5s4.5,2.015,4.5,4.5c0,.88-.253,1.702-.69,2.396l2.397,2.397c.391.391.391,1.024,0,1.414-.39.391-1.024.391-1.414,0l-2.397-2.397c-.694.437-1.515.69-2.396.69-2.485,0-4.5-2.015-4.5-4.5ZM13.5,11c-1.381,0-2.5,1.119-2.5,2.5s1.119,2.5,2.5,2.5,2.5-1.119,2.5-2.5-1.119-2.5-2.5-2.5Z" class="cls-2"/></svg>
\ No newline at end of file
diff --git a/assets/images/money-waving.svg b/assets/images/money-waving.svg
index 5242e31092a0..e68744d595be 100644
--- a/assets/images/money-waving.svg
+++ b/assets/images/money-waving.svg
@@ -1,81 +1 @@
-<svg width="187" height="173" viewBox="0 0 187 173" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M131.748 14.666H35.3479V172.119H131.748V14.666Z" fill="#03D47C"/>
-<path d="M131.885 66.8831C131.885 66.8831 140.975 70.0398 157.088 64.3131C169.508 57.9831 179.815 50.4131 179.548 21.7631C179.548 21.7631 185.871 21.7865 183.831 12.2565C183.831 12.2565 184.501 8.63979 184.768 7.16979C185.035 5.69979 186.375 2.34979 184.098 1.41312C181.821 0.476453 181.688 1.94979 181.688 1.94979C181.688 1.94979 180.568 1.04312 178.741 1.01312C178.741 1.01312 176.198 0.879786 175.395 1.94979C175.395 1.94979 171.645 1.01312 170.975 4.35979C171.108 7.03645 171.911 11.9931 171.911 11.9931C171.911 11.9931 170.305 8.24312 168.161 8.37645C166.018 8.50979 165.465 9.40645 166.151 10.5198C166.838 11.6331 168.828 14.5365 168.828 14.5365C168.828 14.5365 169.231 20.4265 173.381 21.4998C173.381 21.4998 175.255 50.6865 152.361 58.1865C152.361 58.1865 138.838 61.9365 131.341 58.7231" fill="#03D47C"/>
-<path d="M35.0077 87.2799L35.2544 81.4699C35.2544 81.4699 2.21105 81.1432 1.40771 108.057C1.40771 129.543 24.681 134.133 29.1844 134.897C29.3077 135.737 25.8077 140.993 28.1177 145.31C28.1177 145.31 25.5077 147.017 25.5077 147.92C25.5077 148.823 25.8077 150.13 26.9144 150.13C26.9144 150.13 28.521 151.337 30.531 151.033C30.531 151.033 31.3077 151.487 32.2377 151.537C33.1677 151.587 35.251 149.83 35.251 149.83V131.203C35.251 131.203 31.3744 128.77 28.2044 128.367C26.1544 127.843 11.391 125.267 8.17771 110.127C7.92771 100.343 16.591 88.7732 34.9877 87.8132" fill="#03D47C"/>
-<path d="M57.4411 91.4865L83.4478 54.4332C83.4478 54.4332 69.5911 51.6198 59.7478 68.5932C57.6378 73.8165 57.6378 77.7298 57.1378 83.2532C56.6378 88.7765 57.4378 91.4865 57.4378 91.4865H57.4411Z" fill="#002140"/>
-<path d="M83.448 54.433L108.855 91.1197C108.855 91.1197 109.258 80.243 109.258 78.133C109.258 76.023 105.145 53.673 83.4513 54.433H83.448Z" fill="#002140"/>
-<path d="M87.3647 91.6533L84.6213 92.0567L86.5613 94.0633L88.0347 92.1233L87.3647 91.6533Z" fill="#002140"/>
-<path d="M75.9077 86.8398H89.9077L90.4077 88.8398H75.4077L75.9077 86.8398Z" fill="#002140"/>
-<path d="M81.8077 91.8525C81.8077 91.8525 78.9943 91.8525 78.7943 92.1192C78.5943 92.3859 78.9277 92.9559 79.8643 93.7925C80.6677 93.9259 81.8043 91.8525 81.8043 91.8525H81.8077Z" fill="#002140"/>
-<path d="M57.1042 92.1899V107.99C57.1042 107.99 62.2576 107.387 64.0009 107.387C65.7442 107.387 73.4409 107.253 74.5776 102.097C75.5142 99.0166 75.1142 97.9466 75.1142 97.9466C75.1142 97.9466 73.8409 97.1433 74.1776 95.1333C74.5109 93.1233 75.1142 91.9199 75.1142 91.9199L57.1076 92.1866L57.1042 92.1899Z" fill="#002140"/>
-<path d="M90.7112 98.2126C90.7112 98.2126 91.2478 106.179 97.2712 107.183C103.295 108.186 106.978 106.779 109.121 108.389L109.188 91.5859L90.9112 91.8526C90.9112 91.8526 92.7845 93.1259 92.5845 95.1326C92.3845 97.1393 90.7112 98.2126 90.7112 98.2126Z" fill="#002140"/>
-<path d="M72.8044 69.9959C72.8044 69.9959 73.3077 76.6226 83.1477 76.6226C92.9877 76.6226 93.891 70.1959 93.891 70.1959L90.9777 66.3793C90.9777 66.3793 88.1644 64.3693 83.5477 64.4726C78.9277 64.5726 75.011 66.9826 75.011 66.9826L72.801 69.9959H72.8044Z" fill="#FFFAF0"/>
-<path d="M103.108 15.0693C103.108 15.0693 100.498 29.5293 116.365 29.3293C116.365 29.3293 115.761 42.786 131.228 41.9827" stroke="#002140" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M126.404 22.0997C127.625 22.0997 128.614 21.1102 128.614 19.8897C128.614 18.6691 127.625 17.6797 126.404 17.6797C125.184 17.6797 124.194 18.6691 124.194 19.8897C124.194 21.1102 125.184 22.0997 126.404 22.0997Z" fill="#002140"/>
-<path d="M119.711 27.3862C119.711 28.3229 118.071 38.9662 131.727 38.9662L131.767 34.1795C131.767 34.1795 122.991 35.8529 123.694 22.9995C123.694 22.9995 110.977 25.1529 111.611 14.8662C110.607 14.8662 107.327 14.8662 107.327 14.8662C107.327 14.8662 104.584 27.3862 119.711 27.3862Z" fill="#002140"/>
-<path d="M63.8578 15.0693C63.8578 15.0693 66.4678 29.5293 50.6011 29.3293C50.6011 29.3293 51.2045 42.786 35.7378 41.9827" stroke="#002140" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M40.5611 22.0997C41.7816 22.0997 42.7711 21.1102 42.7711 19.8897C42.7711 18.6691 41.7816 17.6797 40.5611 17.6797C39.3405 17.6797 38.3511 18.6691 38.3511 19.8897C38.3511 21.1102 39.3405 22.0997 40.5611 22.0997Z" fill="#002140"/>
-<path d="M47.2547 27.3862C47.2547 28.3229 48.8947 38.9662 35.238 38.9662L35.198 34.1795C35.198 34.1795 43.9747 35.8529 43.2713 22.9995C43.2713 22.9995 55.988 25.1529 55.3547 14.8662C56.358 14.8662 59.638 14.8662 59.638 14.8662C59.638 14.8662 62.3813 27.3862 47.2547 27.3862Z" fill="#002140"/>
-<path d="M71.5776 18.4592C71.5776 18.4592 71.7143 20.4358 74.6576 20.4358C77.601 20.4358 78.081 18.3125 78.081 18.3125" stroke="#002140" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M78.0979 18.5129C78.0979 18.5129 78.2346 20.4895 81.1779 20.4895C84.1212 20.4895 84.6012 18.3662 84.6012 18.3662" stroke="#002140" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M84.6682 18.4426C84.6682 18.4426 84.7915 20.4192 87.4149 20.4192C90.0382 20.4192 90.4682 18.2959 90.4682 18.2959" stroke="#002140" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M90.571 18.4426C90.571 18.4426 90.6944 20.4192 93.3177 20.4192C95.9411 20.4192 96.3711 18.2959 96.3711 18.2959" stroke="#002140" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M96.3713 18.4426C96.3713 18.4426 96.508 20.4192 99.4347 20.4192C102.361 20.4192 102.838 18.2959 102.838 18.2959" stroke="#002140" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M64.0776 17.7266C64.0776 17.7266 64.5276 20.3999 67.881 20.3999C71.2343 20.3999 71.5776 18.4599 71.5776 18.4599" stroke="#002140" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M63.8578 171.957C63.8578 171.957 66.4678 157.497 50.6011 157.697C50.6011 157.697 51.2045 144.24 35.7378 145.043" stroke="#002140" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M40.5611 169.347C41.7816 169.347 42.7711 168.357 42.7711 167.137C42.7711 165.916 41.7816 164.927 40.5611 164.927C39.3405 164.927 38.3511 165.916 38.3511 167.137C38.3511 168.357 39.3405 169.347 40.5611 169.347Z" fill="#002140"/>
-<path d="M47.2547 159.637C47.2547 158.7 48.8947 148.057 35.238 148.057L35.198 152.843C35.198 152.843 43.9747 151.17 43.2713 164.023C43.2713 164.023 55.988 161.87 55.3547 172.157H59.638C59.638 172.157 62.3813 159.637 47.2547 159.637Z" fill="#002140"/>
-<path d="M103.108 171.957C103.108 171.957 100.498 157.497 116.365 157.697C116.365 157.697 115.761 144.24 131.228 145.043" stroke="#002140" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M126.404 169.347C127.625 169.347 128.614 168.357 128.614 167.137C128.614 165.916 127.625 164.927 126.404 164.927C125.184 164.927 124.194 165.916 124.194 167.137C124.194 168.357 125.184 169.347 126.404 169.347Z" fill="#002140"/>
-<path d="M119.711 159.637C119.711 158.7 118.071 148.057 131.727 148.057L131.767 152.843C131.767 152.843 122.991 151.17 123.694 164.023C123.694 164.023 110.977 161.87 111.611 172.157C110.607 172.157 107.327 172.157 107.327 172.157C107.327 172.157 104.584 159.637 119.711 159.637Z" fill="#002140"/>
-<path d="M95.3876 168.563C95.3876 168.563 95.251 166.586 92.3076 166.586C89.3643 166.586 88.8843 168.709 88.8843 168.709" stroke="#002140" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M88.8681 168.51C88.8681 168.51 88.7314 166.533 85.7881 166.533C82.8447 166.533 82.3647 168.657 82.3647 168.657" stroke="#002140" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M82.2976 168.583C82.2976 168.583 82.1742 166.606 79.5509 166.606C76.9276 166.606 76.4976 168.73 76.4976 168.73" stroke="#002140" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M76.394 168.583C76.394 168.583 76.2707 166.606 73.6473 166.606C71.024 166.606 70.594 168.73 70.594 168.73" stroke="#002140" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M70.5944 168.583C70.5944 168.583 70.4577 166.606 67.531 166.606C64.6043 166.606 64.1277 168.73 64.1277 168.73" stroke="#002140" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M102.888 169.296C102.888 169.296 102.438 166.623 99.0848 166.623C95.7315 166.623 95.3882 168.563 95.3882 168.563" stroke="#002140" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M57.0874 91.9861L109.281 91.5394L83.2941 54.8994L57.0874 91.9861Z" stroke="#002140" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M131.644 14.8691H35.2444V172.159H131.644V14.8691Z" stroke="#002140" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M43.3948 145.813V41.2764" stroke="#002140" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M123.224 145.813V41.2764" stroke="#002140" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M83.921 46.8125H81.9744C64.7099 46.8125 50.7144 60.8081 50.7144 78.0725V108.436C50.7144 125.7 64.7099 139.696 81.9744 139.696H83.921C101.185 139.696 115.181 125.7 115.181 108.436V78.0725C115.181 60.8081 101.185 46.8125 83.921 46.8125Z" stroke="#002140" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M83.9607 54.1367H82.3874C68.4146 54.1367 57.0874 65.4639 57.0874 79.4367V107.59C57.0874 121.563 68.4146 132.89 82.3874 132.89H83.9607C97.9335 132.89 109.261 121.563 109.261 107.59V79.4367C109.261 65.4639 97.9335 54.1367 83.9607 54.1367Z" stroke="#002140" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M57.1174 108.06C63.3774 106.046 75.1774 110.563 75.1774 98.2129" stroke="#002140" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M108.914 108.06C102.654 106.046 90.8542 110.563 90.8542 98.2129" stroke="#002140" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M83.1478 103.043C82.5211 102.353 80.8778 100.587 79.2944 99.32C77.2844 97.7134 74.5244 98.6867 74.1744 96.3067C73.8244 93.9267 73.8744 92.09 76.8844 92.09C79.8944 92.09 79.6978 94.2 79.6978 94.2C79.6978 94.2 81.2044 92.04 83.1611 92.04C85.1178 92.04 86.6778 94.2 86.6778 94.2C86.6778 94.2 86.4778 92.09 89.4911 92.09C92.5044 92.09 92.5511 93.9267 92.2011 96.3067C91.8511 98.6867 89.0878 97.7134 87.0811 99.32C85.5644 100.533 83.9911 102.207 83.3111 102.95" stroke="#002140" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M83.2241 95.5361V102.799V108.156" stroke="#002140" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M84.6642 112.976C85.9952 112.976 87.0742 111.897 87.0742 110.566C87.0742 109.235 85.9952 108.156 84.6642 108.156C83.3331 108.156 82.2542 109.235 82.2542 110.566C82.2542 111.897 83.3331 112.976 84.6642 112.976Z" stroke="#002140" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M84.5645 124.723C85.8955 124.723 86.9745 123.644 86.9745 122.313C86.9745 120.982 85.8955 119.903 84.5645 119.903C83.2335 119.903 82.1545 120.982 82.1545 122.313C82.1545 123.644 83.2335 124.723 84.5645 124.723Z" stroke="#002140" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M83.1577 112.373V120.206" stroke="#002140" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M82.9577 124.123C82.9577 125.19 82.5843 126.956 83.471 127.73C84.6877 128.793 86.0543 128.616 86.7143 130.386C86.9743 131.08 87.071 131.82 87.1677 132.556" stroke="#002140" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M74.9246 66.8825C74.9246 66.8825 83.1579 61.8625 91.7946 66.8825" stroke="#002140" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M72.7605 69.9199C73.1638 72.1033 74.9738 76.4733 82.9572 76.4733C90.9405 76.4733 93.2372 72.3299 93.8872 70.2599" stroke="#002140" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M83.3875 64.416C80.7008 64.416 78.4975 66.4794 78.2742 69.106L83.9508 69.6227L79.3908 72.7794C80.3342 73.946 81.7708 74.6894 83.3875 74.6894C86.2242 74.6894 88.5242 72.3893 88.5242 69.5527C88.5242 66.716 86.2242 64.416 83.3875 64.416Z" fill="#002140"/>
-<path d="M78.741 61.6631H87.7776" stroke="#002140" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M65.0847 81.1426H101.235" stroke="#002140" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M77.8347 81.1434L79.0414 76.5234" stroke="#002140" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M89.1847 81.1434L87.978 76.5234" stroke="#002140" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M83.1577 88.9766V92.0399" stroke="#002140" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M75.5307 88.9814L90.1907 88.9814C90.1907 88.9814 90.1907 83.3581 82.5573 83.3581C82.5573 83.3581 75.5273 82.9548 75.5273 88.9814L75.5307 88.9814Z" stroke="#002140" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M76.335 86.7666H88.7816" stroke="#002140" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M80.5476 83.7529V86.3629" stroke="#002140" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M85.3711 83.7529V86.3629" stroke="#002140" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M131.961 59.3531C131.961 59.3531 173.535 68.3898 173.535 21.3965" stroke="#002140" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M131.961 66.883C131.961 66.883 180.965 75.9196 179.558 21.6963" stroke="#002140" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M173.045 21.3627C170.488 20.2593 168.798 17.416 169.055 14.646C168.385 13.8027 167.522 12.4727 166.848 11.6293C166.358 11.0127 165.838 10.2627 166.042 9.50267C166.242 8.76267 167.078 8.35934 167.845 8.34267C168.948 8.316 170.012 8.90267 170.722 9.74934C171.432 10.596 171.822 11.6727 172.002 12.7593C174.362 12.1827 177.002 14.146 177.125 16.576" stroke="#002140" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M172.214 12.4426C171.884 9.99262 171.551 7.54262 171.221 5.09262C171.164 4.68262 171.111 4.26929 171.151 3.85929C171.294 2.42929 172.788 1.28929 174.204 1.52262C174.541 1.57929 174.874 1.70595 175.128 1.93595C175.681 2.43929 175.721 3.28262 175.721 4.02929C175.721 6.10262 175.721 8.17595 175.721 10.2526" stroke="#002140" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M175.138 1.90313C175.605 1.40313 176.235 1.02313 176.918 0.979799C177.602 0.933133 178.328 1.27647 178.622 1.89313C178.768 2.1998 178.802 2.54647 178.815 2.88647C178.905 5.12313 178.222 7.35647 178.482 9.57647" stroke="#002140" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M179.561 21.7028C180.805 21.6428 183.041 20.8895 184.011 18.3795C184.981 15.8695 183.701 12.3828 183.701 12.3828" stroke="#002140" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M178.361 1.16305C179.181 0.699721 180.424 0.739721 181.104 1.24972C181.554 1.58639 181.768 2.16639 181.794 2.72639C181.844 3.87972 181.351 5.08305 181.194 6.22305C181.018 7.49972 180.974 8.79305 181.064 10.0764" stroke="#002140" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M181.865 1.99345C183.075 0.506779 184.711 1.33011 185.221 2.07345C185.468 2.43345 185.568 2.87678 185.588 3.31345C185.638 4.41678 185.205 5.47678 184.851 6.52345C184.215 8.41678 183.828 10.3901 183.701 12.3834" stroke="#002140" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M29.5377 134.943C29.5377 134.943 25.6211 140.69 28.3311 145.21" stroke="#002140" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M28.3546 145.309C28.2179 145.689 27.8112 145.883 27.4512 146.063C26.7979 146.393 26.1646 146.829 25.7979 147.463C25.4312 148.099 25.3979 148.966 25.8746 149.523C26.2779 149.993 26.9579 150.153 27.5712 150.066C28.1846 149.979 28.7446 149.679 29.2746 149.356C30.1012 148.853 30.8979 148.273 31.5012 147.519C32.1046 146.763 32.5046 145.809 32.4479 144.846C32.4046 144.103 32.1046 143.403 31.8046 142.723" stroke="#002140" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M27.2878 150.276C28.0845 151.04 29.3245 151.206 30.3812 150.903C31.4378 150.6 32.3378 149.886 33.0878 149.08C33.8245 148.286 34.4645 147.346 34.6178 146.273C34.7612 145.296 34.4812 144.293 34.0145 143.423" stroke="#002140" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M30.6382 151.036C31.3382 151.59 32.3015 151.796 33.1682 151.583C34.0348 151.37 34.7882 150.74 35.1548 149.923" stroke="#002140" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M138.688 67.7862C138.688 67.7862 139.738 60.2362 138.191 60.0195C136.645 59.8029 131.695 59.1162 131.695 59.1162L131.561 66.8162L138.691 67.7862H138.688Z" fill="#002140"/>
-<path d="M26.121 82.6625C26.121 82.6625 25.4243 85.2392 27.341 88.9825C31.151 88.2492 35.5743 87.8425 35.5743 87.8425L35.2577 80.8525C35.2577 80.8525 28.3277 81.7559 26.121 82.6592V82.6625Z" fill="#002140"/>
-<path d="M91.2444 34.1459C91.2444 34.1459 89.971 29.7959 84.0144 29.7959C78.0577 29.7959 76.3144 34.1459 76.3144 34.1459C76.3144 34.1459 75.3777 32.4726 73.6377 32.4726H65.3377L68.4177 35.2159L64.801 39.0992H73.7544C77.421 39.0992 78.3244 40.7726 78.3244 40.7726C78.3244 40.7726 80.131 36.8226 84.4177 36.8226C88.7044 36.8226 91.111 40.9726 91.111 40.9726C91.111 40.9726 92.7844 38.6959 94.7277 38.6959H103.564L100.551 35.4826L103.798 32.5026H94.5577C94.5577 32.5026 91.511 32.4026 91.2444 34.1426V34.1459Z" stroke="#002140" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M75.7411 153.049C75.7411 153.049 77.0144 157.399 82.9711 157.399C88.9277 157.399 90.6711 153.049 90.6711 153.049C90.6711 153.049 91.6077 154.723 93.3477 154.723H101.648L98.5677 151.979L102.184 148.096H93.2311C89.5644 148.096 88.6611 146.423 88.6611 146.423C88.6611 146.423 86.8544 150.373 82.5677 150.373C78.2811 150.373 75.8744 146.223 75.8744 146.223C75.8744 146.223 74.2011 148.499 72.2577 148.499H63.4211L66.4344 151.713L63.1877 154.693H72.4277C72.4277 154.693 75.4744 154.793 75.7411 153.053V153.049Z" stroke="#002140" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M29.5377 134.943C13.5844 132.86 1.40771 121.717 1.40771 108.28C1.40771 93.3599 16.4244 81.2666 34.951 81.2666" stroke="#002140" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M34.9841 87.8125C20.2307 87.9725 8.3374 97.1525 8.3374 108.456C8.3374 111.312 9.12407 114.116 10.5241 116.599C12.0007 119.222 14.1041 121.456 16.5141 123.246C19.1774 125.226 22.2141 126.679 25.3841 127.646C26.3141 127.929 27.2541 128.169 28.2041 128.369C29.6207 128.666 31.0307 128.852 32.3874 129.376C33.3574 129.749 34.6541 130.306 35.0774 131.343" stroke="#002140" stroke-linecap="round" stroke-linejoin="round"/>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="187" height="173" fill="none" viewBox="0 0 187 173"><path fill="#03D47C" d="M131.748 14.666H35.3479V172.119H131.748V14.666Z"/><path fill="#03D47C" d="M131.885 66.8831C131.885 66.8831 140.975 70.0398 157.088 64.3131C169.508 57.9831 179.815 50.4131 179.548 21.7631C179.548 21.7631 185.871 21.7865 183.831 12.2565C183.831 12.2565 184.501 8.63979 184.768 7.16979C185.035 5.69979 186.375 2.34979 184.098 1.41312C181.821 0.476453 181.688 1.94979 181.688 1.94979C181.688 1.94979 180.568 1.04312 178.741 1.01312C178.741 1.01312 176.198 0.879786 175.395 1.94979C175.395 1.94979 171.645 1.01312 170.975 4.35979C171.108 7.03645 171.911 11.9931 171.911 11.9931C171.911 11.9931 170.305 8.24312 168.161 8.37645C166.018 8.50979 165.465 9.40645 166.151 10.5198C166.838 11.6331 168.828 14.5365 168.828 14.5365C168.828 14.5365 169.231 20.4265 173.381 21.4998C173.381 21.4998 175.255 50.6865 152.361 58.1865C152.361 58.1865 138.838 61.9365 131.341 58.7231"/><path fill="#03D47C" d="M35.0077 87.2799L35.2544 81.4699C35.2544 81.4699 2.21105 81.1432 1.40771 108.057C1.40771 129.543 24.681 134.133 29.1844 134.897C29.3077 135.737 25.8077 140.993 28.1177 145.31C28.1177 145.31 25.5077 147.017 25.5077 147.92C25.5077 148.823 25.8077 150.13 26.9144 150.13C26.9144 150.13 28.521 151.337 30.531 151.033C30.531 151.033 31.3077 151.487 32.2377 151.537C33.1677 151.587 35.251 149.83 35.251 149.83V131.203C35.251 131.203 31.3744 128.77 28.2044 128.367C26.1544 127.843 11.391 125.267 8.17771 110.127C7.92771 100.343 16.591 88.7732 34.9877 87.8132"/><path fill="#002140" d="M57.4411 91.4865L83.4478 54.4332C83.4478 54.4332 69.5911 51.6198 59.7478 68.5932C57.6378 73.8165 57.6378 77.7298 57.1378 83.2532C56.6378 88.7765 57.4378 91.4865 57.4378 91.4865H57.4411Z"/><path fill="#002140" d="M83.448 54.433L108.855 91.1197C108.855 91.1197 109.258 80.243 109.258 78.133C109.258 76.023 105.145 53.673 83.4513 54.433H83.448Z"/><path fill="#002140" d="M87.3647 91.6533L84.6213 92.0567L86.5613 94.0633L88.0347 92.1233L87.3647 91.6533Z"/><path fill="#002140" d="M75.9077 86.8398H89.9077L90.4077 88.8398H75.4077L75.9077 86.8398Z"/><path fill="#002140" d="M81.8077 91.8525C81.8077 91.8525 78.9943 91.8525 78.7943 92.1192C78.5943 92.3859 78.9277 92.9559 79.8643 93.7925C80.6677 93.9259 81.8043 91.8525 81.8043 91.8525H81.8077Z"/><path fill="#002140" d="M57.1042 92.1899V107.99C57.1042 107.99 62.2576 107.387 64.0009 107.387C65.7442 107.387 73.4409 107.253 74.5776 102.097C75.5142 99.0166 75.1142 97.9466 75.1142 97.9466C75.1142 97.9466 73.8409 97.1433 74.1776 95.1333C74.5109 93.1233 75.1142 91.9199 75.1142 91.9199L57.1076 92.1866L57.1042 92.1899Z"/><path fill="#002140" d="M90.7112 98.2126C90.7112 98.2126 91.2478 106.179 97.2712 107.183C103.295 108.186 106.978 106.779 109.121 108.389L109.188 91.5859L90.9112 91.8526C90.9112 91.8526 92.7845 93.1259 92.5845 95.1326C92.3845 97.1393 90.7112 98.2126 90.7112 98.2126Z"/><path fill="#FFFAF0" d="M72.8044 69.9959C72.8044 69.9959 73.3077 76.6226 83.1477 76.6226C92.9877 76.6226 93.891 70.1959 93.891 70.1959L90.9777 66.3793C90.9777 66.3793 88.1644 64.3693 83.5477 64.4726C78.9277 64.5726 75.011 66.9826 75.011 66.9826L72.801 69.9959H72.8044Z"/><path stroke="#002140" stroke-linecap="round" stroke-linejoin="round" d="M103.108 15.0693C103.108 15.0693 100.498 29.5293 116.365 29.3293C116.365 29.3293 115.761 42.786 131.228 41.9827"/><path fill="#002140" d="M126.404 22.0997C127.625 22.0997 128.614 21.1102 128.614 19.8897C128.614 18.6691 127.625 17.6797 126.404 17.6797C125.184 17.6797 124.194 18.6691 124.194 19.8897C124.194 21.1102 125.184 22.0997 126.404 22.0997Z"/><path fill="#002140" d="M119.711 27.3862C119.711 28.3229 118.071 38.9662 131.727 38.9662L131.767 34.1795C131.767 34.1795 122.991 35.8529 123.694 22.9995C123.694 22.9995 110.977 25.1529 111.611 14.8662C110.607 14.8662 107.327 14.8662 107.327 14.8662C107.327 14.8662 104.584 27.3862 119.711 27.3862Z"/><path stroke="#002140" stroke-linecap="round" stroke-linejoin="round" d="M63.8578 15.0693C63.8578 15.0693 66.4678 29.5293 50.6011 29.3293C50.6011 29.3293 51.2045 42.786 35.7378 41.9827"/><path fill="#002140" d="M40.5611 22.0997C41.7816 22.0997 42.7711 21.1102 42.7711 19.8897C42.7711 18.6691 41.7816 17.6797 40.5611 17.6797C39.3405 17.6797 38.3511 18.6691 38.3511 19.8897C38.3511 21.1102 39.3405 22.0997 40.5611 22.0997Z"/><path fill="#002140" d="M47.2547 27.3862C47.2547 28.3229 48.8947 38.9662 35.238 38.9662L35.198 34.1795C35.198 34.1795 43.9747 35.8529 43.2713 22.9995C43.2713 22.9995 55.988 25.1529 55.3547 14.8662C56.358 14.8662 59.638 14.8662 59.638 14.8662C59.638 14.8662 62.3813 27.3862 47.2547 27.3862Z"/><path stroke="#002140" stroke-linecap="round" stroke-linejoin="round" d="M71.5776 18.4592C71.5776 18.4592 71.7143 20.4358 74.6576 20.4358C77.601 20.4358 78.081 18.3125 78.081 18.3125"/><path stroke="#002140" stroke-linecap="round" stroke-linejoin="round" d="M78.0979 18.5129C78.0979 18.5129 78.2346 20.4895 81.1779 20.4895C84.1212 20.4895 84.6012 18.3662 84.6012 18.3662"/><path stroke="#002140" stroke-linecap="round" stroke-linejoin="round" d="M84.6682 18.4426C84.6682 18.4426 84.7915 20.4192 87.4149 20.4192C90.0382 20.4192 90.4682 18.2959 90.4682 18.2959"/><path stroke="#002140" stroke-linecap="round" stroke-linejoin="round" d="M90.571 18.4426C90.571 18.4426 90.6944 20.4192 93.3177 20.4192C95.9411 20.4192 96.3711 18.2959 96.3711 18.2959"/><path stroke="#002140" stroke-linecap="round" stroke-linejoin="round" d="M96.3713 18.4426C96.3713 18.4426 96.508 20.4192 99.4347 20.4192C102.361 20.4192 102.838 18.2959 102.838 18.2959"/><path stroke="#002140" stroke-linecap="round" stroke-linejoin="round" d="M64.0776 17.7266C64.0776 17.7266 64.5276 20.3999 67.881 20.3999C71.2343 20.3999 71.5776 18.4599 71.5776 18.4599"/><path stroke="#002140" stroke-linecap="round" stroke-linejoin="round" d="M63.8578 171.957C63.8578 171.957 66.4678 157.497 50.6011 157.697C50.6011 157.697 51.2045 144.24 35.7378 145.043"/><path fill="#002140" d="M40.5611 169.347C41.7816 169.347 42.7711 168.357 42.7711 167.137C42.7711 165.916 41.7816 164.927 40.5611 164.927C39.3405 164.927 38.3511 165.916 38.3511 167.137C38.3511 168.357 39.3405 169.347 40.5611 169.347Z"/><path fill="#002140" d="M47.2547 159.637C47.2547 158.7 48.8947 148.057 35.238 148.057L35.198 152.843C35.198 152.843 43.9747 151.17 43.2713 164.023C43.2713 164.023 55.988 161.87 55.3547 172.157H59.638C59.638 172.157 62.3813 159.637 47.2547 159.637Z"/><path stroke="#002140" stroke-linecap="round" stroke-linejoin="round" d="M103.108 171.957C103.108 171.957 100.498 157.497 116.365 157.697C116.365 157.697 115.761 144.24 131.228 145.043"/><path fill="#002140" d="M126.404 169.347C127.625 169.347 128.614 168.357 128.614 167.137C128.614 165.916 127.625 164.927 126.404 164.927C125.184 164.927 124.194 165.916 124.194 167.137C124.194 168.357 125.184 169.347 126.404 169.347Z"/><path fill="#002140" d="M119.711 159.637C119.711 158.7 118.071 148.057 131.727 148.057L131.767 152.843C131.767 152.843 122.991 151.17 123.694 164.023C123.694 164.023 110.977 161.87 111.611 172.157C110.607 172.157 107.327 172.157 107.327 172.157C107.327 172.157 104.584 159.637 119.711 159.637Z"/><path stroke="#002140" stroke-linecap="round" stroke-linejoin="round" d="M95.3876 168.563C95.3876 168.563 95.251 166.586 92.3076 166.586C89.3643 166.586 88.8843 168.709 88.8843 168.709"/><path stroke="#002140" stroke-linecap="round" stroke-linejoin="round" d="M88.8681 168.51C88.8681 168.51 88.7314 166.533 85.7881 166.533C82.8447 166.533 82.3647 168.657 82.3647 168.657"/><path stroke="#002140" stroke-linecap="round" stroke-linejoin="round" d="M82.2976 168.583C82.2976 168.583 82.1742 166.606 79.5509 166.606C76.9276 166.606 76.4976 168.73 76.4976 168.73"/><path stroke="#002140" stroke-linecap="round" stroke-linejoin="round" d="M76.394 168.583C76.394 168.583 76.2707 166.606 73.6473 166.606C71.024 166.606 70.594 168.73 70.594 168.73"/><path stroke="#002140" stroke-linecap="round" stroke-linejoin="round" d="M70.5944 168.583C70.5944 168.583 70.4577 166.606 67.531 166.606C64.6043 166.606 64.1277 168.73 64.1277 168.73"/><path stroke="#002140" stroke-linecap="round" stroke-linejoin="round" d="M102.888 169.296C102.888 169.296 102.438 166.623 99.0848 166.623C95.7315 166.623 95.3882 168.563 95.3882 168.563"/><path stroke="#002140" stroke-linecap="round" stroke-linejoin="round" d="M57.0874 91.9861L109.281 91.5394L83.2941 54.8994L57.0874 91.9861Z"/><path stroke="#002140" stroke-linecap="round" stroke-linejoin="round" d="M131.644 14.8691H35.2444V172.159H131.644V14.8691Z"/><path stroke="#002140" stroke-linecap="round" stroke-linejoin="round" d="M43.3948 145.813V41.2764"/><path stroke="#002140" stroke-linecap="round" stroke-linejoin="round" d="M123.224 145.813V41.2764"/><path stroke="#002140" stroke-linecap="round" stroke-linejoin="round" d="M83.921 46.8125H81.9744C64.7099 46.8125 50.7144 60.8081 50.7144 78.0725V108.436C50.7144 125.7 64.7099 139.696 81.9744 139.696H83.921C101.185 139.696 115.181 125.7 115.181 108.436V78.0725C115.181 60.8081 101.185 46.8125 83.921 46.8125Z"/><path stroke="#002140" stroke-linecap="round" stroke-linejoin="round" d="M83.9607 54.1367H82.3874C68.4146 54.1367 57.0874 65.4639 57.0874 79.4367V107.59C57.0874 121.563 68.4146 132.89 82.3874 132.89H83.9607C97.9335 132.89 109.261 121.563 109.261 107.59V79.4367C109.261 65.4639 97.9335 54.1367 83.9607 54.1367Z"/><path stroke="#002140" stroke-linecap="round" stroke-linejoin="round" d="M57.1174 108.06C63.3774 106.046 75.1774 110.563 75.1774 98.2129"/><path stroke="#002140" stroke-linecap="round" stroke-linejoin="round" d="M108.914 108.06C102.654 106.046 90.8542 110.563 90.8542 98.2129"/><path stroke="#002140" stroke-linecap="round" stroke-linejoin="round" d="M83.1478 103.043C82.5211 102.353 80.8778 100.587 79.2944 99.32C77.2844 97.7134 74.5244 98.6867 74.1744 96.3067C73.8244 93.9267 73.8744 92.09 76.8844 92.09C79.8944 92.09 79.6978 94.2 79.6978 94.2C79.6978 94.2 81.2044 92.04 83.1611 92.04C85.1178 92.04 86.6778 94.2 86.6778 94.2C86.6778 94.2 86.4778 92.09 89.4911 92.09C92.5044 92.09 92.5511 93.9267 92.2011 96.3067C91.8511 98.6867 89.0878 97.7134 87.0811 99.32C85.5644 100.533 83.9911 102.207 83.3111 102.95"/><path stroke="#002140" stroke-linecap="round" stroke-linejoin="round" d="M83.2241 95.5361V102.799V108.156"/><path stroke="#002140" stroke-linecap="round" stroke-linejoin="round" d="M84.6642 112.976C85.9952 112.976 87.0742 111.897 87.0742 110.566C87.0742 109.235 85.9952 108.156 84.6642 108.156C83.3331 108.156 82.2542 109.235 82.2542 110.566C82.2542 111.897 83.3331 112.976 84.6642 112.976Z"/><path stroke="#002140" stroke-linecap="round" stroke-linejoin="round" d="M84.5645 124.723C85.8955 124.723 86.9745 123.644 86.9745 122.313C86.9745 120.982 85.8955 119.903 84.5645 119.903C83.2335 119.903 82.1545 120.982 82.1545 122.313C82.1545 123.644 83.2335 124.723 84.5645 124.723Z"/><path stroke="#002140" stroke-linecap="round" stroke-linejoin="round" d="M83.1577 112.373V120.206"/><path stroke="#002140" stroke-linecap="round" stroke-linejoin="round" d="M82.9577 124.123C82.9577 125.19 82.5843 126.956 83.471 127.73C84.6877 128.793 86.0543 128.616 86.7143 130.386C86.9743 131.08 87.071 131.82 87.1677 132.556"/><path stroke="#002140" stroke-linecap="round" stroke-linejoin="round" d="M74.9246 66.8825C74.9246 66.8825 83.1579 61.8625 91.7946 66.8825"/><path stroke="#002140" stroke-linecap="round" stroke-linejoin="round" d="M72.7605 69.9199C73.1638 72.1033 74.9738 76.4733 82.9572 76.4733C90.9405 76.4733 93.2372 72.3299 93.8872 70.2599"/><path fill="#002140" d="M83.3875 64.416C80.7008 64.416 78.4975 66.4794 78.2742 69.106L83.9508 69.6227L79.3908 72.7794C80.3342 73.946 81.7708 74.6894 83.3875 74.6894C86.2242 74.6894 88.5242 72.3893 88.5242 69.5527C88.5242 66.716 86.2242 64.416 83.3875 64.416Z"/><path stroke="#002140" stroke-linecap="round" stroke-linejoin="round" d="M78.741 61.6631H87.7776"/><path stroke="#002140" stroke-linecap="round" stroke-linejoin="round" d="M65.0847 81.1426H101.235"/><path stroke="#002140" stroke-linecap="round" stroke-linejoin="round" d="M77.8347 81.1434L79.0414 76.5234"/><path stroke="#002140" stroke-linecap="round" stroke-linejoin="round" d="M89.1847 81.1434L87.978 76.5234"/><path stroke="#002140" stroke-linecap="round" stroke-linejoin="round" d="M83.1577 88.9766V92.0399"/><path stroke="#002140" stroke-linecap="round" stroke-linejoin="round" d="M75.5307 88.9814L90.1907 88.9814C90.1907 88.9814 90.1907 83.3581 82.5573 83.3581C82.5573 83.3581 75.5273 82.9548 75.5273 88.9814L75.5307 88.9814Z"/><path stroke="#002140" stroke-linecap="round" stroke-linejoin="round" d="M76.335 86.7666H88.7816"/><path stroke="#002140" stroke-linecap="round" stroke-linejoin="round" d="M80.5476 83.7529V86.3629"/><path stroke="#002140" stroke-linecap="round" stroke-linejoin="round" d="M85.3711 83.7529V86.3629"/><path stroke="#002140" stroke-linecap="round" stroke-linejoin="round" d="M131.961 59.3531C131.961 59.3531 173.535 68.3898 173.535 21.3965"/><path stroke="#002140" stroke-linecap="round" stroke-linejoin="round" d="M131.961 66.883C131.961 66.883 180.965 75.9196 179.558 21.6963"/><path stroke="#002140" stroke-linecap="round" stroke-linejoin="round" d="M173.045 21.3627C170.488 20.2593 168.798 17.416 169.055 14.646C168.385 13.8027 167.522 12.4727 166.848 11.6293C166.358 11.0127 165.838 10.2627 166.042 9.50267C166.242 8.76267 167.078 8.35934 167.845 8.34267C168.948 8.316 170.012 8.90267 170.722 9.74934C171.432 10.596 171.822 11.6727 172.002 12.7593C174.362 12.1827 177.002 14.146 177.125 16.576"/><path stroke="#002140" stroke-linecap="round" stroke-linejoin="round" d="M172.214 12.4426C171.884 9.99262 171.551 7.54262 171.221 5.09262C171.164 4.68262 171.111 4.26929 171.151 3.85929C171.294 2.42929 172.788 1.28929 174.204 1.52262C174.541 1.57929 174.874 1.70595 175.128 1.93595C175.681 2.43929 175.721 3.28262 175.721 4.02929C175.721 6.10262 175.721 8.17595 175.721 10.2526"/><path stroke="#002140" stroke-linecap="round" stroke-linejoin="round" d="M175.138 1.90313C175.605 1.40313 176.235 1.02313 176.918 0.979799C177.602 0.933133 178.328 1.27647 178.622 1.89313C178.768 2.1998 178.802 2.54647 178.815 2.88647C178.905 5.12313 178.222 7.35647 178.482 9.57647"/><path stroke="#002140" stroke-linecap="round" stroke-linejoin="round" d="M179.561 21.7028C180.805 21.6428 183.041 20.8895 184.011 18.3795C184.981 15.8695 183.701 12.3828 183.701 12.3828"/><path stroke="#002140" stroke-linecap="round" stroke-linejoin="round" d="M178.361 1.16305C179.181 0.699721 180.424 0.739721 181.104 1.24972C181.554 1.58639 181.768 2.16639 181.794 2.72639C181.844 3.87972 181.351 5.08305 181.194 6.22305C181.018 7.49972 180.974 8.79305 181.064 10.0764"/><path stroke="#002140" stroke-linecap="round" stroke-linejoin="round" d="M181.865 1.99345C183.075 0.506779 184.711 1.33011 185.221 2.07345C185.468 2.43345 185.568 2.87678 185.588 3.31345C185.638 4.41678 185.205 5.47678 184.851 6.52345C184.215 8.41678 183.828 10.3901 183.701 12.3834"/><path stroke="#002140" stroke-linecap="round" stroke-linejoin="round" d="M29.5377 134.943C29.5377 134.943 25.6211 140.69 28.3311 145.21"/><path stroke="#002140" stroke-linecap="round" stroke-linejoin="round" d="M28.3546 145.309C28.2179 145.689 27.8112 145.883 27.4512 146.063C26.7979 146.393 26.1646 146.829 25.7979 147.463C25.4312 148.099 25.3979 148.966 25.8746 149.523C26.2779 149.993 26.9579 150.153 27.5712 150.066C28.1846 149.979 28.7446 149.679 29.2746 149.356C30.1012 148.853 30.8979 148.273 31.5012 147.519C32.1046 146.763 32.5046 145.809 32.4479 144.846C32.4046 144.103 32.1046 143.403 31.8046 142.723"/><path stroke="#002140" stroke-linecap="round" stroke-linejoin="round" d="M27.2878 150.276C28.0845 151.04 29.3245 151.206 30.3812 150.903C31.4378 150.6 32.3378 149.886 33.0878 149.08C33.8245 148.286 34.4645 147.346 34.6178 146.273C34.7612 145.296 34.4812 144.293 34.0145 143.423"/><path stroke="#002140" stroke-linecap="round" stroke-linejoin="round" d="M30.6382 151.036C31.3382 151.59 32.3015 151.796 33.1682 151.583C34.0348 151.37 34.7882 150.74 35.1548 149.923"/><path fill="#002140" d="M138.688 67.7862C138.688 67.7862 139.738 60.2362 138.191 60.0195C136.645 59.8029 131.695 59.1162 131.695 59.1162L131.561 66.8162L138.691 67.7862H138.688Z"/><path fill="#002140" d="M26.121 82.6625C26.121 82.6625 25.4243 85.2392 27.341 88.9825C31.151 88.2492 35.5743 87.8425 35.5743 87.8425L35.2577 80.8525C35.2577 80.8525 28.3277 81.7559 26.121 82.6592V82.6625Z"/><path stroke="#002140" stroke-linecap="round" stroke-linejoin="round" d="M91.2444 34.1459C91.2444 34.1459 89.971 29.7959 84.0144 29.7959C78.0577 29.7959 76.3144 34.1459 76.3144 34.1459C76.3144 34.1459 75.3777 32.4726 73.6377 32.4726H65.3377L68.4177 35.2159L64.801 39.0992H73.7544C77.421 39.0992 78.3244 40.7726 78.3244 40.7726C78.3244 40.7726 80.131 36.8226 84.4177 36.8226C88.7044 36.8226 91.111 40.9726 91.111 40.9726C91.111 40.9726 92.7844 38.6959 94.7277 38.6959H103.564L100.551 35.4826L103.798 32.5026H94.5577C94.5577 32.5026 91.511 32.4026 91.2444 34.1426V34.1459Z"/><path stroke="#002140" stroke-linecap="round" stroke-linejoin="round" d="M75.7411 153.049C75.7411 153.049 77.0144 157.399 82.9711 157.399C88.9277 157.399 90.6711 153.049 90.6711 153.049C90.6711 153.049 91.6077 154.723 93.3477 154.723H101.648L98.5677 151.979L102.184 148.096H93.2311C89.5644 148.096 88.6611 146.423 88.6611 146.423C88.6611 146.423 86.8544 150.373 82.5677 150.373C78.2811 150.373 75.8744 146.223 75.8744 146.223C75.8744 146.223 74.2011 148.499 72.2577 148.499H63.4211L66.4344 151.713L63.1877 154.693H72.4277C72.4277 154.693 75.4744 154.793 75.7411 153.053V153.049Z"/><path stroke="#002140" stroke-linecap="round" stroke-linejoin="round" d="M29.5377 134.943C13.5844 132.86 1.40771 121.717 1.40771 108.28C1.40771 93.3599 16.4244 81.2666 34.951 81.2666"/><path stroke="#002140" stroke-linecap="round" stroke-linejoin="round" d="M34.9841 87.8125C20.2307 87.9725 8.3374 97.1525 8.3374 108.456C8.3374 111.312 9.12407 114.116 10.5241 116.599C12.0007 119.222 14.1041 121.456 16.5141 123.246C19.1774 125.226 22.2141 126.679 25.3841 127.646C26.3141 127.929 27.2541 128.169 28.2041 128.369C29.6207 128.666 31.0307 128.852 32.3874 129.376C33.3574 129.749 34.6541 130.306 35.0774 131.343"/></svg>
\ No newline at end of file
diff --git a/assets/images/new-expensify-adhoc.svg b/assets/images/new-expensify-adhoc.svg
index b3dd92fbbaae..8da6331c8c94 100644
--- a/assets/images/new-expensify-adhoc.svg
+++ b/assets/images/new-expensify-adhoc.svg
@@ -1,31 +1 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 28.1.0, 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 80 80" style="enable-background:new 0 0 80 80;" xml:space="preserve">
-<style type="text/css">
-	.st0{fill:#002E22;}
-	.st1{fill:#CF4CD9;}
-	.st2{fill:#FFFFFF;}
-</style>
-<g>
-	<g>
-		<g>
-			<path class="st0" d="M54.1,28.2v-8.3H25.9v40.3h28.2v-8.3H36.3v-7.7h14.4v-8.5H36.3v-7.3h17.8V28.2z"/>
-			<path class="st0" d="M40,6.5c7.1,0,13.7,2.2,19.2,6c1.4,1,3.3,0.9,4.5-0.3c1.3-1.3,1.3-3.5-0.3-4.7C56.8,2.8,48.7,0,40,0
-				C17.9,0,0,17.9,0,40c0,8.7,2.8,16.8,7.5,23.3c1.1,1.5,3.3,1.6,4.7,0.3c1.2-1.2,1.3-3.1,0.3-4.5c-3.8-5.4-6-12-6-19.2
-				C6.5,21.5,21.5,6.5,40,6.5z M73,17.4c-1.1-1.6-3.4-1.7-4.7-0.3c-1.2,1.2-1.3,3-0.4,4.4c3.5,5.3,5.6,11.7,5.6,18.5
-				s-2.1,13.4-5.8,18.8c-0.9,1.4-0.9,3.3,0.3,4.5c1.4,1.4,3.6,1.3,4.7-0.3c4.6-6.5,7.3-14.4,7.3-23C80,31.5,77.4,23.8,73,17.4z
-				 M40,73.5c-6.8,0-13.2-2.1-18.5-5.6c-1.4-0.9-3.3-0.8-4.4,0.4c-1.4,1.4-1.3,3.6,0.3,4.7c6.4,4.4,14.2,7,22.6,7s16.4-2.7,23-7.3
-				c1.6-1.1,1.7-3.3,0.3-4.7c-1.2-1.2-3.1-1.3-4.5-0.3C53.5,71.3,47,73.5,40,73.5z"/>
-		</g>
-	</g>
-	<path class="st1" d="M58,60h12c5.5,0,10,4.5,10,10s-4.5,10-10,10H58c-5.5,0-10-4.5-10-10S52.5,60,58,60z"/>
-	<path class="st2" d="M56.3,72.5l-1.7-4.6h-0.9L52,72.5h0.9l0.4-1H55l0.4,1C55.4,72.5,56.3,72.5,56.3,72.5z M54.1,69l0.6,1.6h-1.1
-		L54.1,69z M58.3,72.5c1.4,0,2.4-0.9,2.4-2.3s-0.9-2.3-2.4-2.3h-1.5v4.6C56.8,72.5,58.3,72.5,58.3,72.5z M57.6,68.8h0.7
-		c0.9,0,1.5,0.5,1.5,1.4s-0.6,1.4-1.5,1.4h-0.7V68.8z M62.3,72.5v-1.9h1.9v1.9h0.9v-4.6h-0.9v1.8h-1.9v-1.8h-0.9v4.6
-		C61.4,72.5,62.3,72.5,62.3,72.5z M68.2,72.6c1.3,0,2.2-1,2.2-2.4s-0.9-2.3-2.2-2.3c-1.3,0-2.2,1-2.2,2.3
-		C66,71.6,66.8,72.6,68.2,72.6z M68.2,71.8c-0.8,0-1.3-0.6-1.3-1.5s0.5-1.5,1.3-1.5s1.3,0.6,1.3,1.5S69,71.8,68.2,71.8z M73.1,72.6
-		c1.1,0,1.9-0.7,2.1-1.7h-0.9c-0.2,0.6-0.6,0.9-1.1,0.9c-0.8,0-1.3-0.6-1.3-1.5s0.5-1.5,1.3-1.5c0.6,0,1,0.3,1.1,0.9h0.9
-		c-0.2-1-1-1.7-2.1-1.7c-1.3,0-2.2,1-2.2,2.3S71.8,72.6,73.1,72.6L73.1,72.6z"/>
-</g>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" id="Layer_1" x="0" y="0" version="1.1" viewBox="0 0 80 80" style="enable-background:new 0 0 80 80" xml:space="preserve"><style type="text/css">.st0{fill:#002e22}.st1{fill:#cf4cd9}.st2{fill:#fff}</style><g><g><g><path d="M54.1,28.2v-8.3H25.9v40.3h28.2v-8.3H36.3v-7.7h14.4v-8.5H36.3v-7.3h17.8V28.2z" class="st0"/><path d="M40,6.5c7.1,0,13.7,2.2,19.2,6c1.4,1,3.3,0.9,4.5-0.3c1.3-1.3,1.3-3.5-0.3-4.7C56.8,2.8,48.7,0,40,0 C17.9,0,0,17.9,0,40c0,8.7,2.8,16.8,7.5,23.3c1.1,1.5,3.3,1.6,4.7,0.3c1.2-1.2,1.3-3.1,0.3-4.5c-3.8-5.4-6-12-6-19.2 C6.5,21.5,21.5,6.5,40,6.5z M73,17.4c-1.1-1.6-3.4-1.7-4.7-0.3c-1.2,1.2-1.3,3-0.4,4.4c3.5,5.3,5.6,11.7,5.6,18.5 s-2.1,13.4-5.8,18.8c-0.9,1.4-0.9,3.3,0.3,4.5c1.4,1.4,3.6,1.3,4.7-0.3c4.6-6.5,7.3-14.4,7.3-23C80,31.5,77.4,23.8,73,17.4z M40,73.5c-6.8,0-13.2-2.1-18.5-5.6c-1.4-0.9-3.3-0.8-4.4,0.4c-1.4,1.4-1.3,3.6,0.3,4.7c6.4,4.4,14.2,7,22.6,7s16.4-2.7,23-7.3 c1.6-1.1,1.7-3.3,0.3-4.7c-1.2-1.2-3.1-1.3-4.5-0.3C53.5,71.3,47,73.5,40,73.5z" class="st0"/></g></g><path d="M58,60h12c5.5,0,10,4.5,10,10s-4.5,10-10,10H58c-5.5,0-10-4.5-10-10S52.5,60,58,60z" class="st1"/><path d="M56.3,72.5l-1.7-4.6h-0.9L52,72.5h0.9l0.4-1H55l0.4,1C55.4,72.5,56.3,72.5,56.3,72.5z M54.1,69l0.6,1.6h-1.1 L54.1,69z M58.3,72.5c1.4,0,2.4-0.9,2.4-2.3s-0.9-2.3-2.4-2.3h-1.5v4.6C56.8,72.5,58.3,72.5,58.3,72.5z M57.6,68.8h0.7 c0.9,0,1.5,0.5,1.5,1.4s-0.6,1.4-1.5,1.4h-0.7V68.8z M62.3,72.5v-1.9h1.9v1.9h0.9v-4.6h-0.9v1.8h-1.9v-1.8h-0.9v4.6 C61.4,72.5,62.3,72.5,62.3,72.5z M68.2,72.6c1.3,0,2.2-1,2.2-2.4s-0.9-2.3-2.2-2.3c-1.3,0-2.2,1-2.2,2.3 C66,71.6,66.8,72.6,68.2,72.6z M68.2,71.8c-0.8,0-1.3-0.6-1.3-1.5s0.5-1.5,1.3-1.5s1.3,0.6,1.3,1.5S69,71.8,68.2,71.8z M73.1,72.6 c1.1,0,1.9-0.7,2.1-1.7h-0.9c-0.2,0.6-0.6,0.9-1.1,0.9c-0.8,0-1.3-0.6-1.3-1.5s0.5-1.5,1.3-1.5c0.6,0,1,0.3,1.1,0.9h0.9 c-0.2-1-1-1.7-2.1-1.7c-1.3,0-2.2,1-2.2,2.3S71.8,72.6,73.1,72.6L73.1,72.6z" class="st2"/></g></svg>
\ No newline at end of file
diff --git a/assets/images/new-expensify-dev.svg b/assets/images/new-expensify-dev.svg
index 316da6b5aa4d..fcb371f586b6 100644
--- a/assets/images/new-expensify-dev.svg
+++ b/assets/images/new-expensify-dev.svg
@@ -1,27 +1 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 28.1.0, 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 80 80" style="enable-background:new 0 0 80 80;" xml:space="preserve">
-<style type="text/css">
-	.st0{fill:#002E22;}
-	.st1{fill:#F25730;}
-	.st2{fill:#FFFFFF;}
-</style>
-<g>
-	<g>
-		<g>
-			<path class="st0" d="M54.1,28.2v-8.3H25.9v40.3h28.2v-8.3H36.3v-7.7h14.4v-8.5H36.3v-7.3h17.8V28.2z"/>
-			<path class="st0" d="M40,6.5c7.1,0,13.7,2.2,19.2,6c1.4,1,3.3,0.9,4.5-0.3c1.3-1.3,1.3-3.5-0.3-4.7C56.8,2.8,48.7,0,40,0
-				C17.9,0,0,17.9,0,40c0,8.7,2.8,16.8,7.5,23.3c1.1,1.5,3.3,1.6,4.7,0.3c1.2-1.2,1.3-3.1,0.3-4.5c-3.8-5.4-6-12-6-19.2
-				C6.5,21.5,21.5,6.5,40,6.5z M73,17.4c-1.1-1.6-3.4-1.7-4.7-0.3c-1.2,1.2-1.3,3-0.4,4.4c3.5,5.3,5.6,11.7,5.6,18.5
-				s-2.1,13.4-5.8,18.8c-0.9,1.4-0.9,3.3,0.3,4.5c1.4,1.4,3.6,1.3,4.7-0.3c4.6-6.5,7.3-14.4,7.3-23C80,31.5,77.4,23.8,73,17.4z
-				 M40,73.5c-6.8,0-13.2-2.1-18.5-5.6c-1.4-0.9-3.3-0.8-4.4,0.4c-1.4,1.4-1.3,3.6,0.3,4.7c6.4,4.4,14.2,7,22.6,7s16.4-2.7,23-7.3
-				c1.6-1.1,1.7-3.3,0.3-4.7c-1.2-1.2-3.1-1.3-4.5-0.3C53.5,71.3,47,73.5,40,73.5z"/>
-		</g>
-	</g>
-	<path class="st1" d="M58,60h12c5.5,0,10,4.5,10,10s-4.5,10-10,10H58c-5.5,0-10-4.5-10-10S52.5,60,58,60z"/>
-	<path class="st2" d="M57.9,73c2,0,3.3-1.2,3.3-3.2s-1.3-3.1-3.3-3.1h-2.1V73H57.9z M56.9,67.9h0.9c1.3,0,2,0.7,2,2s-0.8,2-2,2h-0.9
-		V67.9z M66.8,73v-1.2h-3.4v-1.5h2.9v-1.2h-2.9v-1.3h3.3v-1.2h-4.6V73H66.8z M70.6,73l2.2-6.3h-1.3L70,71.4l-1.5-4.7h-1.3l2.2,6.3
-		L70.6,73L70.6,73z"/>
-</g>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" id="Layer_1" x="0" y="0" version="1.1" viewBox="0 0 80 80" style="enable-background:new 0 0 80 80" xml:space="preserve"><style type="text/css">.st0{fill:#002e22}.st1{fill:#f25730}.st2{fill:#fff}</style><g><g><g><path d="M54.1,28.2v-8.3H25.9v40.3h28.2v-8.3H36.3v-7.7h14.4v-8.5H36.3v-7.3h17.8V28.2z" class="st0"/><path d="M40,6.5c7.1,0,13.7,2.2,19.2,6c1.4,1,3.3,0.9,4.5-0.3c1.3-1.3,1.3-3.5-0.3-4.7C56.8,2.8,48.7,0,40,0 C17.9,0,0,17.9,0,40c0,8.7,2.8,16.8,7.5,23.3c1.1,1.5,3.3,1.6,4.7,0.3c1.2-1.2,1.3-3.1,0.3-4.5c-3.8-5.4-6-12-6-19.2 C6.5,21.5,21.5,6.5,40,6.5z M73,17.4c-1.1-1.6-3.4-1.7-4.7-0.3c-1.2,1.2-1.3,3-0.4,4.4c3.5,5.3,5.6,11.7,5.6,18.5 s-2.1,13.4-5.8,18.8c-0.9,1.4-0.9,3.3,0.3,4.5c1.4,1.4,3.6,1.3,4.7-0.3c4.6-6.5,7.3-14.4,7.3-23C80,31.5,77.4,23.8,73,17.4z M40,73.5c-6.8,0-13.2-2.1-18.5-5.6c-1.4-0.9-3.3-0.8-4.4,0.4c-1.4,1.4-1.3,3.6,0.3,4.7c6.4,4.4,14.2,7,22.6,7s16.4-2.7,23-7.3 c1.6-1.1,1.7-3.3,0.3-4.7c-1.2-1.2-3.1-1.3-4.5-0.3C53.5,71.3,47,73.5,40,73.5z" class="st0"/></g></g><path d="M58,60h12c5.5,0,10,4.5,10,10s-4.5,10-10,10H58c-5.5,0-10-4.5-10-10S52.5,60,58,60z" class="st1"/><path d="M57.9,73c2,0,3.3-1.2,3.3-3.2s-1.3-3.1-3.3-3.1h-2.1V73H57.9z M56.9,67.9h0.9c1.3,0,2,0.7,2,2s-0.8,2-2,2h-0.9 V67.9z M66.8,73v-1.2h-3.4v-1.5h2.9v-1.2h-2.9v-1.3h3.3v-1.2h-4.6V73H66.8z M70.6,73l2.2-6.3h-1.3L70,71.4l-1.5-4.7h-1.3l2.2,6.3 L70.6,73L70.6,73z" class="st2"/></g></svg>
\ No newline at end of file
diff --git a/assets/images/new-expensify-stg.svg b/assets/images/new-expensify-stg.svg
index 1a1994c7a9fd..d536257fc880 100644
--- a/assets/images/new-expensify-stg.svg
+++ b/assets/images/new-expensify-stg.svg
@@ -1,35 +1 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 28.1.0, 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 80 80" style="enable-background:new 0 0 80 80;" xml:space="preserve">
-<style type="text/css">
-	.st0{fill:#002E22;}
-	.st1{fill:#008C59;}
-	.st2{fill:#FFFFFF;}
-</style>
-<g>
-	<g>
-		<g>
-			<g>
-				<g>
-					<path class="st0" d="M54.1,28.2v-8.3H25.9v40.3h28.2v-8.3H36.3v-7.7h14.4v-8.5H36.3v-7.3h17.8V28.2z"/>
-					<path class="st0" d="M40,6.5L40,6.5c7.1,0,13.7,2.2,19.2,6c1.4,1,3.3,0.9,4.5-0.3l0,0c1.3-1.3,1.3-3.5-0.3-4.7
-						C56.8,2.8,48.7,0,40,0C17.9,0,0,17.9,0,40c0,8.7,2.8,16.8,7.5,23.3c1.1,1.5,3.3,1.6,4.7,0.3l0,0c1.2-1.2,1.3-3.1,0.3-4.5
-						c-3.8-5.4-6-12-6-19.2C6.5,21.5,21.5,6.5,40,6.5L40,6.5L40,6.5z"/>
-					<path class="st0" d="M73,17.4c-1.1-1.6-3.4-1.7-4.7-0.3l0,0c-1.2,1.2-1.3,3-0.4,4.4c3.5,5.3,5.6,11.7,5.6,18.5
-						s-2.1,13.4-5.8,18.8c-0.9,1.4-0.9,3.3,0.3,4.5l0,0c1.4,1.4,3.6,1.3,4.7-0.3c4.6-6.5,7.3-14.4,7.3-23C80,31.5,77.4,23.8,73,17.4
-						z"/>
-					<path class="st0" d="M40,73.5c-6.8,0-13.2-2.1-18.5-5.6c-1.4-0.9-3.3-0.8-4.4,0.4l0,0c-1.4,1.4-1.3,3.6,0.3,4.7
-						c6.4,4.4,14.2,7,22.6,7s16.4-2.7,23-7.3c1.6-1.1,1.7-3.3,0.3-4.7l0,0c-1.2-1.2-3.1-1.3-4.5-0.3C53.5,71.3,47,73.5,40,73.5z"/>
-				</g>
-			</g>
-		</g>
-		<path class="st1" d="M58,60h12c5.5,0,10,4.5,10,10l0,0c0,5.5-4.5,10-10,10H58c-5.5,0-10-4.5-10-10l0,0C48,64.5,52.5,60,58,60z"/>
-		<path class="st2" d="M57.9,73.1c1.5,0,2.5-0.7,2.5-2c0-1-0.5-1.5-2-1.8l-0.8-0.2c-0.8-0.2-1-0.4-1-0.7c0-0.5,0.4-0.7,1.1-0.7
-			c0.8,0,1.2,0.3,1.3,1h1.3c-0.1-1.3-0.9-2.1-2.5-2.1s-2.4,0.8-2.4,1.9c0,1,0.5,1.5,1.9,1.8l0.8,0.2c0.8,0.2,1,0.4,1,0.8
-			c0,0.5-0.5,0.8-1.3,0.8c-0.9,0-1.4-0.4-1.4-1.1h-1.3C55.3,72.3,56.3,73.1,57.9,73.1z M63.9,73v-5.1h1.8v-1.2h-4.9v1.2h1.8V73H63.9
-			z M66,69.8c0,2,1.3,3.3,3.1,3.3c1.7,0,3-1.2,3-3.2v-0.3h-2.9v1.1h1.6C70.5,71.6,70,72,69.2,72c-1.1,0-1.9-0.8-1.9-2.1
-			c0-1.3,0.7-2.1,1.8-2.1c0.8,0,1.4,0.4,1.6,1.1H72c-0.3-1.4-1.4-2.2-2.9-2.2C67.3,66.6,66,67.9,66,69.8z"/>
-	</g>
-</g>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" id="Layer_1" x="0" y="0" version="1.1" viewBox="0 0 80 80" style="enable-background:new 0 0 80 80" xml:space="preserve"><style type="text/css">.st0{fill:#002e22}.st1{fill:#008c59}.st2{fill:#fff}</style><g><g><g><g><g><path d="M54.1,28.2v-8.3H25.9v40.3h28.2v-8.3H36.3v-7.7h14.4v-8.5H36.3v-7.3h17.8V28.2z" class="st0"/><path d="M40,6.5L40,6.5c7.1,0,13.7,2.2,19.2,6c1.4,1,3.3,0.9,4.5-0.3l0,0c1.3-1.3,1.3-3.5-0.3-4.7 C56.8,2.8,48.7,0,40,0C17.9,0,0,17.9,0,40c0,8.7,2.8,16.8,7.5,23.3c1.1,1.5,3.3,1.6,4.7,0.3l0,0c1.2-1.2,1.3-3.1,0.3-4.5 c-3.8-5.4-6-12-6-19.2C6.5,21.5,21.5,6.5,40,6.5L40,6.5L40,6.5z" class="st0"/><path d="M73,17.4c-1.1-1.6-3.4-1.7-4.7-0.3l0,0c-1.2,1.2-1.3,3-0.4,4.4c3.5,5.3,5.6,11.7,5.6,18.5 s-2.1,13.4-5.8,18.8c-0.9,1.4-0.9,3.3,0.3,4.5l0,0c1.4,1.4,3.6,1.3,4.7-0.3c4.6-6.5,7.3-14.4,7.3-23C80,31.5,77.4,23.8,73,17.4 z" class="st0"/><path d="M40,73.5c-6.8,0-13.2-2.1-18.5-5.6c-1.4-0.9-3.3-0.8-4.4,0.4l0,0c-1.4,1.4-1.3,3.6,0.3,4.7 c6.4,4.4,14.2,7,22.6,7s16.4-2.7,23-7.3c1.6-1.1,1.7-3.3,0.3-4.7l0,0c-1.2-1.2-3.1-1.3-4.5-0.3C53.5,71.3,47,73.5,40,73.5z" class="st0"/></g></g></g><path d="M58,60h12c5.5,0,10,4.5,10,10l0,0c0,5.5-4.5,10-10,10H58c-5.5,0-10-4.5-10-10l0,0C48,64.5,52.5,60,58,60z" class="st1"/><path d="M57.9,73.1c1.5,0,2.5-0.7,2.5-2c0-1-0.5-1.5-2-1.8l-0.8-0.2c-0.8-0.2-1-0.4-1-0.7c0-0.5,0.4-0.7,1.1-0.7 c0.8,0,1.2,0.3,1.3,1h1.3c-0.1-1.3-0.9-2.1-2.5-2.1s-2.4,0.8-2.4,1.9c0,1,0.5,1.5,1.9,1.8l0.8,0.2c0.8,0.2,1,0.4,1,0.8 c0,0.5-0.5,0.8-1.3,0.8c-0.9,0-1.4-0.4-1.4-1.1h-1.3C55.3,72.3,56.3,73.1,57.9,73.1z M63.9,73v-5.1h1.8v-1.2h-4.9v1.2h1.8V73H63.9 z M66,69.8c0,2,1.3,3.3,3.1,3.3c1.7,0,3-1.2,3-3.2v-0.3h-2.9v1.1h1.6C70.5,71.6,70,72,69.2,72c-1.1,0-1.9-0.8-1.9-2.1 c0-1.3,0.7-2.1,1.8-2.1c0.8,0,1.4,0.4,1.6,1.1H72c-0.3-1.4-1.4-2.2-2.9-2.2C67.3,66.6,66,67.9,66,69.8z" class="st2"/></g></g></svg>
\ No newline at end of file
diff --git a/assets/images/plane.svg b/assets/images/plane.svg
new file mode 100644
index 000000000000..635bdc4b1ed7
--- /dev/null
+++ b/assets/images/plane.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 20 20"><path d="M6.17609 2.13382C6.08759 1.81522 6.32719 1.5 6.65785 1.5H8.69101C8.8804 1.5 9.05353 1.607 9.13823 1.77639L12.5 8.5H17.5C18.3285 8.5 19 9.17157 19 10C19 10.8284 18.3285 11.5 17.5 11.5H12.5L9.13823 18.2236C9.05353 18.393 8.8804 18.5 8.69101 18.5H6.65785C6.32719 18.5 6.08759 18.1848 6.17609 17.8662L7.94447 11.5H4.83336L4.11399 13.6581C4.04594 13.8623 3.85487 14 3.63965 14H1.69374C1.35246 14 1.11148 13.6657 1.2194 13.3419L2.33336 10L1.2194 6.65811C1.11148 6.33435 1.35246 6 1.69374 6H3.63965C3.85487 6 4.04594 6.13771 4.11399 6.34189L4.83336 8.5H7.94447L6.17609 2.13382Z"/></svg>
\ No newline at end of file
diff --git a/assets/images/play.svg b/assets/images/play.svg
index 5f7e14969529..98a8c00520fc 100644
--- a/assets/images/play.svg
+++ b/assets/images/play.svg
@@ -1,6 +1 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 28.3.0, 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="M7.2,17.9c-1.7,1-3.7-0.3-3.7-2.2V4.3c0-1.9,2.1-3.1,3.7-2.2l10,5.7c1.7,1,1.7,3.4,0,4.3L7.2,17.9z"/>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" id="Layer_1" x="0" y="0" version="1.1" viewBox="0 0 20 20" style="enable-background:new 0 0 20 20" xml:space="preserve"><path d="M7.2,17.9c-1.7,1-3.7-0.3-3.7-2.2V4.3c0-1.9,2.1-3.1,3.7-2.2l10,5.7c1.7,1,1.7,3.4,0,4.3L7.2,17.9z"/></svg>
\ No newline at end of file
diff --git a/assets/images/product-illustrations/emptystate__travel.svg b/assets/images/product-illustrations/emptystate__travel.svg
new file mode 100644
index 000000000000..287f99996860
--- /dev/null
+++ b/assets/images/product-illustrations/emptystate__travel.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" id="Layer_1" x="0" y="0" version="1.1" viewBox="0 0 191 172" style="enable-background:new 0 0 191 172" xml:space="preserve"><style type="text/css">.st0{fill:#0164bf}.st1{fill:#4ed7de}.st2{fill:#b0d9ff}.st3{fill:#fff2b2}.st4{fill:#fee45e}.st5{fill:#ff7101}.st6{fill:#f25730}.st7{fill:#ffc68c}.st8{fill:#ffa75a}.st9{fill:#03d47c}.st10{fill:#002140}.st11{fill:#008c59}.st12,.st13{fill:none;stroke:#002140;stroke-linecap:round;stroke-linejoin:round}.st13{stroke:#fff2b2}.st14{fill:#99f6ff}.st15{fill:#4ba6a6}.st16{fill:#0185ff}.st17{fill:#0676de}.st18{fill:#5ab0ff}.st19{fill:#fed607}.st20{fill:#5be3aa}.st21{fill:#e3a171}.st22{fill:#fffaf0}.st23{fill:#e4bc07}</style><path d="M39.5,9.5h-1.3c-12.4,0-22.5,10.2-22.5,22.7v66c0,12.5,10.1,22.7,22.5,22.7h26.3c12.4,0,22.4-10.2,22.4-22.7	v-66c0-0.5,0-0.9,0-1.4C86.2,18.9,76.4,9.5,64.5,9.5H39.5z M96.6,31.8v66.9c0,17.1-13.7,30.9-30.6,30.9H36.6	C19.7,129.6,6,115.7,6,98.7V31.8C6,14.7,19.7,0.8,36.6,0.8h29.5C83,0.8,96.6,14.7,96.6,31.8z" class="st0"/><path d="M43.6,94.1c0.1,0,0.2,0,0.4,0c1.2,0,1.4,0.8,3.1,0.8c1.6,0,1.4-0.9,3.3-0.9c0.8,0,1.3,0.2,1.8,0.4l0.8-0.1	l1.3-2.1h-2v-2.4l-1.8-2.4h-2.7v1.8h-2.4c0,0,0,0.7,0,0.9v0.2h-4.2c0,0,2.2,3.4,2.4,3.6L43.6,94.1z M66.3,74.8h-1.9v-0.3	c0-0.9-0.3-1.6-0.7-2h23.2v25.7c0,12.5-10,22.7-22.4,22.7H41.3v-0.1c-12.4,0-22.5-10.2-22.5-22.7v-9.5h18.8c3,0,2.4-3.6,0.1-3.6	h23.3c3,0,2.7-3.4,0.3-3.4h8.4c2.7,0,2.9-3.4-0.1-3.4h-1.1v-0.2C68.6,78.1,69,74.8,66.3,74.8z" class="st1"/><path d="M86.9,33.9v38.6H63.7c-0.5-0.5-1.2-0.8-2-0.8h-0.1v-3.9c1,0,1.7-0.3,1.7-2v-2.7c0-1.1-0.7-1.5-1.8-1.5h-1v-0.2	c0,0-0.1-0.8-0.1-1.6c0-1.5-1-2-2.2-2h-0.3v-5.2L56,49.4l0.2-0.1c1.6,0,1.5-1.9,0.3-1.9s-1.4-0.1-3.3,0c-1.4,0.1-1.4,1.9,0.1,1.9	l0.2,0.2l-2.1,3.2V56h-1.9v-6c0-0.7-0.4-1.3-1-1.6l0.1,0v-4.6c0-0.9-0.4-1.5-0.9-1.8l0-0.1v-2.6c0-1.3-2.9-1.1-2.9,0v2.5l0.1,0.1	c-0.6,0.3-1,0.9-1,1.6V48l0.1,0.3c-0.6,0.3-1,0.8-1,1.5v2.7h0c0-1.2-0.7-1.9-1.7-1.8c-1,0.1-1.6,0.9-1.6,2v3H38v-4.2h-0.1l1.3-2.8	h-1.6v-0.1l-2-3.8h-1.8c0,0-2,3.4-2.2,3.6v0.3h-1.9l1.3,2.8v7c-0.9,0-3.7,0-3.7,0s-3-8.7-3.5-9.8c-0.5-1.1-1.1-1.3-2-1.4	c-0.9,0-3,0-3,0h0V32.1c0-1,0.1-2,0.2-3l0.1,0h3.7c2.2,0,2.2,2.5,4.2,2.5h9.3c2.5,0,2.1-2.8,0.3-2.8c0,0-7.2,0-8.5,0	c-1.3,0-1.9-2.5-3.7-2.5h-4.7l-0.1,0C22,17.1,29.9,10.2,39.5,9.5h25c11.9,0,21.7,9.4,22.4,21.3l-0.2,0c-2.7,0-6.9,0-6.9,0	c-2.2,0-2.4,3.1,0.1,3.1H86.9z M79.2,26.4c2.5,0,2.1-3,0.3-3c0,0-3.3,0-4.6,0c-1.3,0-1.8-2.7-4.3-2.7c-0.8,0-5.1-0.1-6.9-0.1	c-2.2,0-2.9,3.4-4.5,3.4c-2.5,0-5-0.1-5-0.1c-2,0-2.2,3,0.1,3c1.8,0,4.3,0,5.5,0c2.6,0,2.5-3.4,5.1-3.4c1.6,0,3.4,0,4.7,0	c2.2,0,2.3,2.6,4.2,2.6H79.2z M73.2,45.5c1.6,0,1.7-2.2-0.1-2.2c-2,0-5.1,0-5.1,0c-1.3,0-1.9,2.2,0,2.2H73.2z M62.6,37.6	c2.1,0,2.3-3.1-0.1-3.1c-2.7,0-6.9,0-6.9,0c-2.2,0-2.4,3.1,0.1,3.1H62.6z M58.5,16.4c2,0,2-3.1-0.1-3.1h-8c-2.2,0-3.9,3-5.4,3	c-1.6,0-8.9,0-8.9,0c-2.2,0-2.4,3.1,0.1,3.1h9.8c2.4,0,2.9-3,5.5-3H58.5z M56.4,47.2v-1.5h-3.1v1.5H56.4z M55.7,45.6v-1.4H54v1.4	H55.7z M35.7,41.3l1.5-2.2h-4.7c0,0,1.2,1.9,1.3,2.2l0,0.1c-0.1,0.1-0.2,0.1-0.3,0.2c-0.7,0.7-0.7,1.8,0,2.5c0.7,0.7,1.8,0.7,2.5,0	c0.7-0.7,0.7-1.8,0-2.5C35.9,41.6,35.8,41.5,35.7,41.3L35.7,41.3z M28.5,43.2c1.6,0,1.7-1.9-0.1-1.9c-2,0-5,0-5,0	c-1.3,0-1.8,1.9,0,1.9H28.5z" class="st2"/><path d="M86.9,32.2v1.7h-7c-2.5,0-2.3-3.1-0.1-3.1c0,0,4.2,0,6.9,0l0.2,0C86.9,31.3,86.9,31.7,86.9,32.2z" class="st3"/><path d="M79.6,23.4c1.8,0,2.2,3-0.3,3h-5.4c-2,0-2-2.6-4.2-2.6c-1.3,0-3.1,0-4.7,0c-2.6,0-2.6,3.4-5.1,3.4	c-1.2,0-3.7,0-5.5,0c-2.3,0-2.2-3-0.1-3c0,0,2.5,0.1,5,0.1c1.6,0,2.4-3.4,4.5-3.4c1.8,0,6.1,0.1,6.9,0.1c2.5,0,3,2.7,4.3,2.7	C76.3,23.5,79.6,23.4,79.6,23.4z" class="st3"/><path d="M73.1,43.3c1.8,0,1.7,2.2,0.1,2.2H68c-1.9,0-1.3-2.2,0-2.2C68,43.3,71.1,43.3,73.1,43.3z" class="st3"/><path d="M48.8,78.3h20.9c3,0,2.9,3.4,0.1,3.4h-8.4c2.4,0,2.7,3.4-0.3,3.4H37.8c2.2,0,2.9,3.6-0.1,3.6H18.8v-7.2h18.5	c0,0,0.4-0.8,0-1.7c-0.5-0.9-1.6-0.5-1.7-0.5c0,0,0.1-0.6,0-1.1l0.5,0H48.8z" class="st4"/><path d="M66.3,74.8c2.7,0,2.3,3.2,2.3,3.2v0.2h-4.3v-0.2c0,0-0.1-0.6,0-1.2C64.4,76,64.9,74.9,66.3,74.8L66.3,74.8z" class="st5"/><path d="M64.4,74.8h1.9c-1.4,0.1-1.9,1.2-2,2.1l-0.1,0h-3.3l-0.2,0c0-0.2-0.2-0.5-0.4-0.7c-0.6-0.7-1-0.2-1.1-0.1	c0-0.1,0.6-1.3-0.5-2.1c-0.3-0.2-0.5-0.2-0.8-0.2l0-0.3v-3.7h2.2v5.1H64.4z" class="st6"/><path d="M63.7,72.5c0.4,0.5,0.7,1.1,0.7,2v0.3h-2.8v-3.1h0.1C62.5,71.7,63.2,72,63.7,72.5z" class="st7"/><path d="M64.2,76.9l0.1,0c-0.1,0.7,0,1.2,0,1.2v0.2h-4.1v-0.2c0,0,0.6-0.5,0.5-1.2l0.2,0H64.2z" class="st5"/><path d="M63.3,63.2v2.7c0,1.6-0.7,2-1.7,2h-1.7v-3.2c0-0.5-0.6-0.5-1.8-0.5h-0.2v-2.4h3.6	C62.6,61.7,63.3,62.2,63.3,63.2z" class="st8"/><path d="M62.5,34.5c2.4,0,2.2,3.1,0.1,3.1h-6.8c-2.5,0-2.3-3.1-0.1-3.1C55.6,34.5,59.8,34.5,62.5,34.5z" class="st3"/><path d="M61.6,71.7v3.1h-1.5v-5.1h-2.2v-1.9h3.7V71.7z" class="st5"/><path d="M30.9,71.3c0,0.1,0,0.2,0,0.2S30.9,71.3,30.9,71.3z M33.9,70C33.9,70,33.9,70,33.9,70C33.9,70,33.9,70,33.9,70z M42.6,69.4c0,0.2,0,0.3,0,0.3C42.5,69.7,42.6,69.6,42.6,69.4z M42.6,69.4c0.1-0.6,0.5-1.8,1.8-1.8c0.7,0,1.1,0.2,1.3,0.5	c0.3,0.4,0.3,1,0.3,1s0.5-1.2,1.8-1.2c0.1,0,0.2,0,0.3,0c1.5,0.1,0.7,1.8,0.7,1.8s0.5-0.6,1.2-0.8c0.3-0.1,0.6,0,1,0.2	c0.4,0.3,0.6,0.7,0.7,1.1c0.1,0.6,0,1.2,0,1.2s0.7-0.5,1.5-0.5c0.2,0,0.5,0.1,0.7,0.2c1.1,0.6,0.5,2,0.5,2s0.7-0.8,1.5-0.8	c0.2,0,0.5,0.1,0.7,0.2c1.1,0.6,0.3,2.1,0.1,2.3c0.1-0.2,0.7-0.9,1.4-1c0.2,0,0.5,0,0.8,0.2c1.1,0.8,0.5,2,0.5,2.1	c0-0.1,0.5-0.6,1.1,0.1c0.2,0.3,0.3,0.5,0.4,0.7c0.1,0.7-0.5,1.2-0.5,1.2v0.2H36.1l-0.5,0c-0.1-0.3-0.3-0.7-0.7-0.9	c-1-0.5-2,0.4-2,0.4s0.6-1.7-0.5-2.3c-1-0.6-1.9,0.4-1.9,0.4s0.2-1.6-1.2-1.9c-1.3-0.3-1.7,0.7-1.7,0.8c0-0.1,0-1.5-1.3-1.6	c-0.1,0-0.3,0-0.4,0l0-0.2c0,0-0.3-1.1,0.7-1.5c1-0.4,1.8,0.9,1.8,0.9s-0.4-1.8,0.9-2.1c1.1-0.2,1.5,0.5,1.6,0.9	c-0.1-0.4-0.2-1.6,1-2c0.1,0,0.2-0.1,0.4-0.1c1.1-0.2,1.6,0.6,1.7,0.8c-0.1-0.3-0.6-1.7,0.9-2.1c1.5-0.4,1.8,0.8,1.9,1	c0-0.3-0.2-1.6,1.2-1.6c1.5,0,1.7,1.6,1.7,1.6s0.4-1.8,1.9-1.4C42.6,67.7,42.6,68.8,42.6,69.4z" class="st9"/><path d="M60.5,61.5v0.2h-2.6v-3.8h0.3c1.2,0,2.2,0.5,2.2,2C60.5,60.7,60.5,61.5,60.5,61.5z" class="st7"/><path d="M59.9,67.7v0.2h-2v-3.7h0.2c1.2,0,1.8,0,1.8,0.5V67.7z" class="st5"/><path d="M58.4,13.3c2.2,0,2.1,3.1,0.1,3.1h-6.9c-2.6,0-3.1,3-5.5,3h-9.8c-2.5,0-2.3-3.1-0.1-3.1c0,0,7.3,0,8.9,0	c1.6,0,3.2-3,5.4-3H58.4z" class="st3"/><path d="M57.9,73.4l0,0.3c-0.7,0.1-1.2,0.8-1.4,1c0.2-0.3,0.9-1.7-0.1-2.3c-0.2-0.1-0.5-0.2-0.7-0.2l0.3-0.6V49.4l0,0.1	l1.9,3.4V73.4z" class="st5"/><path d="M56.6,47.4c1.1,0,1.3,1.9-0.3,1.9L56,49.4l0-0.1h-2.3l-0.1,0.1l-0.2-0.2c-1.5,0-1.5-1.9-0.1-1.9	C55.1,47.4,55.4,47.4,56.6,47.4z" class="st7"/><path d="M56.4,45.7h-3.1v1.5h3.1V45.7z" class="st7"/><path d="M56,49.4v22.3l-0.3,0.6c-0.9,0-1.5,0.8-1.5,0.8s0.6-1.4-0.5-2c-0.2-0.1-0.5-0.2-0.7-0.2l0.7,0V49.4H56z" class="st6"/><path d="M55.7,44.2H54v1.4h1.7V44.2z" class="st7"/><path d="M54.3,92.1l-1.3,2.1l-0.8,0.1c-0.5-0.2-1-0.4-1.8-0.4c-1.8,0-1.7,0.9-3.3,0.9c-1.7,0-1.9-0.8-3.1-0.8	c-0.1,0-0.3,0-0.4,0l0-0.1c-0.1-0.2-2.4-3.6-2.4-3.6h4.5l1.2,1.8h0.9l2.7,0h1.8L54.3,92.1z" class="st8"/><path d="M53.7,49.4v21.4l-0.7,0c-0.8,0-1.5,0.5-1.5,0.5s0.2-0.6,0-1.2l0.1,0V52.7l2.1-3.2L53.7,49.4z" class="st5"/><path d="M52.3,92v0.1l-1.8,0V92v-4.6l1.8,2.4V92z" class="st5"/><path d="M51.6,56v14.1l-0.1,0c-0.1-0.4-0.3-0.8-0.7-1.1c-0.3-0.2-0.7-0.2-1-0.2l-0.1-0.4V56H51.6z" class="st8"/><path d="M50.5,92L50.5,92l-2.7,0.1V92v-2.8v-1.8h2.7V92z" class="st6"/><path d="M49.7,68.5l0.1,0.4c-0.7,0.2-1.2,0.8-1.2,0.8s0.8-1.7-0.7-1.8c-0.1,0-0.2,0-0.3,0v-9.6c0-2-2.4-1.9-2.4,0v6.9	l-0.7,0.1c-1-0.1-1.4,0.7-1.4,0.7s0.2-1-0.2-1.6l0.2,0V55h0.3c1.1-1.3,5.2-1.3,6.1-0.2h0.1V68.5z" class="st5"/><path d="M49.7,51.6v3.2h-0.1c-1-1.1-5-1.1-6.1,0.2h-0.3v-3.4h0.1C44.9,50.3,48.5,50.4,49.7,51.6L49.7,51.6z" class="st5"/><path d="M49.7,49.9v1.7h-0.1c-1.1-1.2-4.7-1.3-6.3,0h-0.1v-1.8c0-0.6,0.4-1.1,1-1.5c1.2-0.7,3.3-0.7,4.5,0	C49.3,48.7,49.7,49.2,49.7,49.9z" class="st5"/><path d="M48.8,43.7v4.6l-0.1,0c-1.2-0.7-3.3-0.7-4.5,0L44.1,48v-4.5c0-0.7,0.4-1.3,1-1.6c0.8-0.4,1.9-0.5,2.7,0	C48.4,42.3,48.8,42.9,48.8,43.7z" class="st8"/><path d="M47.9,39.3v2.6l0,0.1c-0.8-0.5-1.9-0.4-2.7,0L45,41.8v-2.5C45,38.2,47.9,38,47.9,39.3z" class="st7"/><path d="M47.8,92v0.2h-0.8l-1.2-1.8h-0.3v-0.2c0-0.2,0-0.9,0-0.9h2.4V92z" class="st5"/><path d="M47.6,58.3v9.6c-1.3,0.1-1.8,1.2-1.8,1.2s0-0.6-0.3-1c0.1-0.3,0.6-2.3-0.6-2.7c-0.2-0.1-0.3-0.1-0.4-0.1	l0.7-0.1v-6.9C45.3,56.4,47.6,56.3,47.6,58.3z" class="st6"/><path d="M31.6,67.5c0-0.1-0.5-1.2,0.6-1.9c1.2-0.7,2,0.6,2,0.6c0-0.2-0.2-1.8,1-2.1c1.2-0.4,1.9,1.1,1.9,1.1	s-0.2-1.6,1.5-1.8c1.7-0.1,1.9,1.8,1.9,1.8s0.2-0.8,0.7-1.2c0.2-0.1,0.3-0.2,0.5-0.3c0.1,0,0.3,0,0.5,0c0.4,0.1,0.6,0.3,0.7,0.6	c0.4,0.7,0.2,1.6,0.2,1.6s0.4-0.8,1.4-0.7c0.1,0,0.3,0,0.4,0.1c1.2,0.4,0.7,2.4,0.6,2.7c-0.2-0.3-0.6-0.5-1.3-0.5	c-1.2,0.1-1.7,1.2-1.8,1.8c0.1-0.6,0-1.7-1.2-2c-1.6-0.4-1.9,1.4-1.9,1.4s-0.2-1.6-1.7-1.6c-1.3,0-1.2,1.3-1.2,1.6	c-0.1-0.3-0.4-1.5-1.9-1c-1.5,0.5-1,1.9-0.9,2.1c-0.1-0.2-0.6-1-1.7-0.8l0-0.2C32,68.6,31.8,68.1,31.6,67.5L31.6,67.5z" class="st9"/><path d="M43.2,55v9.3l-0.2,0c-0.1-0.3-0.4-0.5-0.7-0.6c-0.2,0-0.3,0-0.5,0l-0.2-0.1V52.9h1.6V55z" class="st8"/><path d="M43.1,52.4L43.1,52.4l0,0.5h-3.4v-0.3c0-1.1,0.6-2,1.6-2C42.4,50.5,43.1,51.2,43.1,52.4z" class="st7"/><path d="M41.6,63.7l0.2,0.1c-0.2,0-0.4,0.1-0.5,0.3L41.1,64c-0.3-0.7-0.8-1.6-2.4-1.6H38v-6.6h1.8v-2.8h1.8V63.7z" class="st8"/><path d="M41.3,120.9L41.3,120.9l-3.1,0.1c-12.4,0-22.5-10.2-22.5-22.7v-66c0-12.5,10.1-22.7,22.5-22.7h1.3	c-9.6,0.8-17.6,7.7-19.9,16.8c-0.2,0.9-0.4,1.8-0.5,2.8c-0.1,1-0.2,2-0.2,3v66C18.8,110.7,28.9,120.9,41.3,120.9z" class="st10"/><path d="M33.7,60.6c0.4,0.8,0.9,1.7,0.9,1.7h4.1c1.6,0,2.1,0.9,2.4,1.6l0.1,0.1c-0.5,0.4-0.7,1.2-0.7,1.2	s-0.1-1.9-1.9-1.8c-1.7,0.1-1.5,1.8-1.5,1.8s-0.6-1.5-1.9-1.1c-1.2,0.4-1.1,2-1,2.1c0,0-0.8-1.3-2-0.6c-1.1,0.7-0.7,1.8-0.6,1.9l0,0	c-0.7-1.6-1.6-3.4-1.9-4.1c-0.6-1.2-1.1-1.2-2.2-1.2s-4-0.1-5.5-0.1c-1.6,0-1.7,0.5-2.2,1.5c-0.5,1-0.8,1.8-0.8,1.8h-0.1V47.2h0	c0,0,2.1,0,3,0c0.9,0.1,1.5,0.3,2,1.4c0.5,1.1,3.5,9.8,3.5,9.8s2.8,0,3.7,0c1.1,0,1.8,0.2,2.3,1.3C33.4,59.9,33.5,60.3,33.7,60.6z" class="st11"/><path d="M39.2,48.7l-1.3,2.8h-3.4v-0.3c0,0-0.1-2.5,1.6-2.5H39.2z" class="st8"/><path d="M38,62.1v0.2h-2.4V51.5H38V62.1z" class="st5"/><path d="M37.6,48.6v0.1h-1.5c-1.6,0-1.6,2.5-1.6,2.5h-0.2c0,0,0.1-2.5-1.6-2.5h-1.2v-0.3c0.2-0.2,2.2-3.6,2.2-3.6h1.8	L37.6,48.6z" class="st5"/><path d="M27.7,74.8c0-0.1,0.4-1.1,1.7-0.8c1.4,0.3,1.2,1.9,1.2,1.9s0.9-1,1.9-0.4c1.1,0.6,0.5,2.3,0.5,2.3s1-0.9,2-0.4	c0.4,0.2,0.6,0.5,0.7,0.9c0.1,0.5,0,1,0,1.1c0.1,0,1.2-0.4,1.7,0.5c0.5,0.9,0,1.7,0,1.7H18.8V73h0.4c1.6-0.3,2.1,1.4,2.1,1.4	S21.9,73,23,73c1.2,0,1.5,1.4,1.5,1.4s0.3-1.1,1.4-1.2c0.1,0,0.2,0,0.4,0C27.6,73.3,27.7,74.7,27.7,74.8z" class="st9"/><path d="M37.2,39.2l-1.5,2.2l-0.1,0.1c-0.6-0.3-1.3-0.3-1.8,0.1l0-0.1c-0.1-0.3-1.3-2.2-1.3-2.2H37.2z" class="st5"/><path d="M36.6,28.8c1.8,0,2.2,2.8-0.3,2.8H27c-1.9,0-2-2.5-4.2-2.5h-3.7l-0.1,0c0.1-1,0.3-1.9,0.5-2.8l0.1,0h4.7	c1.8,0,2.4,2.5,3.7,2.5S36.6,28.8,36.6,28.8z" class="st3"/><path d="M36,41.7c0.7,0.7,0.7,1.8,0,2.5c-0.7,0.7-1.8,0.7-2.5,0c-0.7-0.7-0.7-1.8,0-2.5c0.1-0.1,0.2-0.2,0.3-0.2	c0.5-0.4,1.2-0.4,1.8-0.1C35.8,41.5,35.9,41.6,36,41.7z" class="st7"/><path d="M35.6,62.3L35.6,62.3l-1,0c0,0-0.5-0.9-0.8-1.7v-9.2h1.9V62.3z" class="st6"/><path d="M34.6,51.2v0.3H31l-1.3-2.8h3.1c1.6,0,1.6,2.5,1.6,2.5H34.6z" class="st8"/><path d="M33.7,51.5v9.1c-0.2-0.4-0.3-0.7-0.4-0.9c-0.5-1.1-1.1-1.3-2.3-1.3v-7L33.7,51.5L33.7,51.5z" class="st5"/><path d="M32.2,69l0,0.2c-0.1,0-0.2,0-0.4,0.1c-1.2,0.4-1.1,1.5-1,2c-0.1-0.4-0.5-1.1-1.6-0.9c-1.4,0.3-0.9,2.1-0.9,2.1	s-0.8-1.3-1.8-0.9c-1,0.4-0.7,1.5-0.7,1.5l0,0.2c-1.1,0.1-1.4,1.2-1.4,1.2S24.2,73,23,73c-1.2,0-1.7,1.4-1.7,1.4s-0.5-1.7-2.1-1.4	h-0.4v-7.5h0.1c0,0,0.3-0.8,0.8-1.8c0.5-1,0.6-1.5,2.2-1.5c1.6,0,4.4,0.1,5.5,0.1s1.6,0,2.2,1.2c0.4,0.7,1.2,2.5,1.9,4.1	C31.8,68.1,32,68.6,32.2,69z" class="st11"/><path d="M28.4,41.2c1.8,0,1.6,1.9,0.1,1.9h-5.1c-1.8,0-1.3-1.9,0-1.9C23.4,41.2,26.5,41.2,28.4,41.2z" class="st3"/><path d="M66.1,129.6H36.6C19.7,129.6,6,115.7,6,98.7V31.8C6,14.7,19.7,0.8,36.6,0.8h29.5c16.9,0,30.6,13.8,30.6,30.9	v66.9C96.6,115.7,83,129.6,66.1,129.6z" class="st12"/><path d="M19.1,88.7h18.6c3,0,2.4-3.6,0.1-3.6h23.3c3,0,2.7-3.4,0.3-3.4h8.4c2.7,0,2.9-3.4-0.1-3.4H36.1" class="st12"/><path d="M35.6,79.4L35.6,79.4c0.1,0,1.2-0.4,1.7,0.5c0.5,0.9,0,1.7,0,1.7H19.2" class="st12"/><path d="M27.7,74.8L27.7,74.8c0-0.1,0.4-1.1,1.7-0.8c1.4,0.3,1.2,1.9,1.2,1.9s0.9-1,1.9-0.4c1.1,0.6,0.5,2.3,0.5,2.3	s1-0.9,2-0.4c0.4,0.2,0.6,0.5,0.7,0.9c0.1,0.5,0,1,0,1.1" class="st12"/><path d="M19.3,73c1.6-0.3,2.1,1.4,2.1,1.4S21.9,73,23,73c1.2,0,1.5,1.4,1.5,1.4s0.3-1.1,1.4-1.2c0.1,0,0.2,0,0.4,0	c1.3,0.1,1.3,1.5,1.3,1.6" class="st12"/><path d="M20.9,79.2v2.1" class="st12"/><path d="M22.9,78.3v3.2" class="st12"/><path d="M28.4,78.6V81" class="st12"/><path d="M25,79.2v2.1" class="st12"/><path d="M30.4,79.4v1.8" class="st12"/><path d="M59.2,76.1L59.2,76.1L59.2,76.1c0-0.1,0.5-0.6,1.1,0.1c0.2,0.3,0.3,0.5,0.4,0.7c0.1,0.7-0.5,1.2-0.5,1.2" class="st12"/><path d="M56.5,74.8C56.5,74.8,56.5,74.8,56.5,74.8c0.2-0.2,0.7-1,1.4-1c0.2,0,0.5,0,0.8,0.2c1.1,0.8,0.5,2,0.5,2.1" class="st12"/><path d="M45.6,68.1c0.3,0.4,0.3,1,0.3,1s0.5-1.2,1.8-1.2c0.1,0,0.2,0,0.3,0c1.5,0.1,0.7,1.8,0.7,1.8s0.5-0.6,1.2-0.8	c0.3-0.1,0.6,0,1,0.2c0.4,0.3,0.6,0.7,0.7,1.1c0.1,0.6,0,1.2,0,1.2s0.7-0.5,1.5-0.5c0.2,0,0.5,0.1,0.7,0.2c1.1,0.6,0.5,2,0.5,2	s0.7-0.8,1.5-0.8c0.2,0,0.5,0.1,0.7,0.2c1.1,0.6,0.3,2.1,0.1,2.3" class="st12"/><path d="M42.6,69.4c0.1-0.6,0.5-1.8,1.8-1.8c0.7,0,1.1,0.2,1.3,0.5" class="st12"/><path d="M42.5,69.7c0,0,0-0.1,0-0.3" class="st12"/><path d="M42.6,69.4c0,0.2,0,0.3,0,0.3c0,0,0,0,0,0" class="st12"/><path d="M42.6,69.4L42.6,69.4" class="st12"/><path d="M36.6,68.9C36.6,68.9,36.6,68.9,36.6,68.9C36.6,68.9,36.6,68.9,36.6,68.9c0-0.3-0.2-1.7,1.2-1.7	c1.5,0,1.7,1.6,1.7,1.6s0.4-1.8,1.9-1.4c1.2,0.3,1.2,1.4,1.2,2" class="st12"/><path d="M33.9,70c-0.1-0.3-0.6-1.7,0.9-2.1c1.5-0.4,1.8,0.8,1.9,1" class="st12"/><path d="M33.9,70C33.9,70,33.9,70,33.9,70" class="st12"/><path d="M33.9,70C33.9,70,33.9,70,33.9,70C33.9,70,33.9,70,33.9,70" class="st12"/><path d="M33.9,70C33.9,70,33.9,70,33.9,70" class="st12"/><path d="M30.9,71.2c-0.1-0.4-0.2-1.6,1-2c0.1,0,0.2-0.1,0.4-0.1c1.1-0.2,1.6,0.6,1.7,0.8" class="st12"/><path d="M30.9,71.3c0,0.1,0,0.2,0,0.2S30.9,71.3,30.9,71.3z" class="st12"/><path d="M30.9,71.3C30.9,71.3,30.9,71.2,30.9,71.3" class="st12"/><path d="M25.9,73c0,0-0.3-1.1,0.7-1.5c1-0.4,1.8,0.9,1.8,0.9s-0.4-1.8,0.9-2.1c1.1-0.2,1.5,0.5,1.6,0.9" class="st12"/><path d="M18.9,65.5c0,0,0.3-0.8,0.8-1.8c0.5-1,0.6-1.5,2.2-1.5c1.6,0,4.4,0.1,5.5,0.1c1.1,0,1.6,0,2.2,1.2	c0.4,0.7,1.2,2.5,1.9,4.1c0.2,0.5,0.5,1,0.7,1.5" class="st12"/><path d="M34.9,74.9v2.3" class="st12"/><path d="M37.6,75.8v2.3" class="st12"/><path d="M40.7,75v3.3v0" class="st12"/><path d="M42.9,75.8v2.3" class="st12"/><path d="M48.8,75v3.3v0" class="st12"/><path d="M51,75.8v2.3" class="st12"/><path d="M54.7,76.3v1.9" class="st12"/><path d="M45.6,68.1L45.6,68.1c0.1-0.3,0.6-2.3-0.6-2.7c-0.2-0.1-0.3-0.1-0.4-0.1c-1-0.1-1.4,0.7-1.4,0.7s0.2-1-0.2-1.6	c-0.1-0.3-0.4-0.5-0.7-0.6c-0.2,0-0.3,0-0.5,0c-0.2,0-0.4,0.1-0.5,0.3c-0.5,0.4-0.7,1.2-0.7,1.2s-0.1-1.9-1.9-1.8	c-1.7,0.1-1.5,1.8-1.5,1.8s-0.6-1.5-1.9-1.1c-1.2,0.4-1.1,2-1,2.1c0,0-0.8-1.3-2-0.6c-1.1,0.7-0.7,1.8-0.6,1.9" class="st12"/><path d="M41.1,64c-0.3-0.7-0.8-1.6-2.4-1.6h-4.1c0,0-0.5-0.9-0.8-1.7c-0.2-0.4-0.3-0.7-0.4-0.9	c-0.5-1.1-1.1-1.3-2.3-1.3c-0.9,0-3.7,0-3.7,0s-3-8.7-3.5-9.8c-0.5-1.1-1.1-1.3-2-1.4c-0.9,0-3,0-3,0" class="st12"/><path d="M30.5,70.3l-2.5-5.6" class="st12"/><path d="M22.1,49.8l4.4,12.4" class="st12"/><path d="M27.3,67.1l1.4,3" class="st12"/><path d="M22.3,56.6l2,5.5" class="st12"/><path d="M31,58.4v-7h7v10.6" class="st12"/><path d="M33.7,51.5v9.1v0" class="st12"/><path d="M35.6,51.5v10.8" class="st12"/><path d="M43.2,64.4V49.8c0-0.6,0.4-1.1,1-1.5c1.2-0.7,3.3-0.7,4.5,0c0.6,0.4,1,0.9,1,1.6v18.5" class="st12"/><path d="M44.1,48v-4.5c0-0.7,0.4-1.3,1-1.6c0.8-0.4,1.9-0.5,2.7,0c0.6,0.3,0.9,0.9,0.9,1.8v4.6" class="st12"/><path d="M45,41.8v-2.5c0-1.1,2.9-1.3,2.9,0v2.6" class="st12"/><path d="M46.5,38.1v-4" class="st12"/><path d="M45.3,65.2v-6.9c0-1.9,2.4-2,2.4,0v9.6" class="st12"/><path d="M43.5,55c1.1-1.3,5.2-1.3,6.1-0.2" class="st12"/><path d="M43.3,51.6c1.6-1.3,5.2-1.2,6.3,0" class="st12"/><path d="M51.6,70.1V56v-3.2l2.1-3.2l0.1-0.1H56l0,0.1l1.9,3.4v5.2v3.8v2.4v3.7v1.9v3.7" class="st12"/><path d="M53.7,49.4v21.4" class="st12"/><path d="M56,49.4v22.3" class="st12"/><path d="M53.4,49.3c-1.5,0-1.5-1.9-0.1-1.9c1.8-0.1,2.1,0,3.3,0c1.1,0,1.3,1.9-0.3,1.9" class="st12"/><path d="M34.4,51.2c0,0,0.1-2.5-1.6-2.5h-3.1l1.3,2.8" class="st12"/><path d="M34.6,51.2c0,0-0.1-2.5,1.6-2.5h3.1l-1.3,2.8" class="st12"/><path d="M31.6,48.4c0.2-0.2,2.2-3.6,2.2-3.6h1.8l2,3.8" class="st12"/><path d="M35.6,41.4c0.1,0.1,0.3,0.2,0.4,0.3c0.7,0.7,0.7,1.8,0,2.5c-0.7,0.7-1.8,0.7-2.5,0c-0.7-0.7-0.7-1.8,0-2.5	c0.1-0.1,0.2-0.2,0.3-0.2C34.3,41.1,35,41.1,35.6,41.4z" class="st12"/><path d="M33.8,41.4c-0.1-0.3-1.3-2.2-1.3-2.2h4.7l-1.5,2.2" class="st12"/><path d="M56.4,45.7h-3.1v1.5h3.1V45.7z" class="st12"/><path d="M55.7,44.2H54v1.4h1.7V44.2z" class="st12"/><path d="M54.8,41v3" class="st12"/><path d="M38.3,55.7h1.5v-3c0-1.1,0.6-2,1.6-2c1-0.1,1.7,0.6,1.7,1.8c0,0.1,0,0.1,0,0.2" class="st12"/><path d="M41.6,53.3v10.4" class="st12"/><path d="M40,52.9h1.6h1.4" class="st12"/><path d="M49.8,56h1.6" class="st12"/><path d="M66.3,74.8c2.7,0,2.3,3.2,2.3,3.2" class="st12"/><path d="M58,67.9h3.6v6.9h4.7" class="st12"/><path d="M58.2,69.7h1.9v5.1h1.5" class="st12"/><path d="M66.4,74.8c0,0-0.1,0-0.1,0h0c-1.4,0.1-1.9,1.2-2,2.1c-0.1,0.7,0,1.2,0,1.2" class="st12"/><path d="M58.1,64.2c1.2,0,1.8,0,1.8,0.5v3" class="st12"/><path d="M61.6,67.9c1,0,1.7-0.3,1.7-2v-2.7c0-1.1-0.7-1.5-1.8-1.5H58" class="st12"/><path d="M58.2,57.9c1.2,0,2.2,0.5,2.2,2c0,0.7,0.1,1.6,0.1,1.6" class="st12"/><path d="M61.7,71.7c0.8,0,1.5,0.2,2,0.8c0.4,0.5,0.7,1.1,0.7,2" class="st12"/><path d="M60.9,76.9h3.3" class="st12"/><path d="M63.7,72.5L63.7,72.5h23.1" class="st12"/><path d="M52.8,99.6c1.8,0.1,2.4-1.5,4-1.5c1.6-0.1,1.9,1.3,3.9,1.3c2,0,1.8-1.4,3.6-1.5c1.9-0.1,2.1,1.3,3.5,1.3	c1.3-0.1,1.8-1.3,3.5-1.4c1.7-0.1,2,1.2,3.3,1.2" class="st12"/><path d="M64.8,94.3c1.3,0.1,1.8-1.3,2.9-1.3c1.2-0.1,1.4,1.1,2.9,1.1c1.5,0,1.4-1.2,2.7-1.3c1.4-0.1,1.6,1.2,2.5,1.1	c1-0.1,1.3-1.2,2.6-1.2c1.3-0.1,1.5,1.1,2.4,1.1" class="st12"/><path d="M81.5,108c-1.6-0.1-2.2,1.3-3.6,1.3c-1.4,0.1-1.8-1.1-3.5-1.1c-1.8,0-1.7,1.2-3.3,1.3	c-1.7,0.1-1.9-1.2-3.1-1.1c-1.2,0.1-1.6,1.2-3.1,1.2c-1.5,0.1-1.8-1.1-2.9-1.1" class="st12"/><path d="M57.5,93.8c-1.8-0.3-2.2,0.9-3.6,0.9c-0.8,0-1.2-0.2-1.8-0.4c-0.5-0.2-1-0.4-1.8-0.4c-1.8,0-1.7,0.9-3.3,0.9	c-1.7,0-1.9-0.8-3.1-0.8c-0.1,0-0.3,0-0.4,0c-0.9,0.2-1.4,0.8-2.8,0.8c-1.5,0-1.8-0.7-2.9-0.7" class="st12"/><path d="M43.6,94c-0.1-0.2-2.4-3.6-2.4-3.6h4.5l1.2,1.8h0.9l2.7,0h1.8l2,0l-1.3,2.1" class="st12"/><path d="M45.4,90.1c0-0.2,0-0.9,0-0.9h2.4V92" class="st12"/><path d="M47.8,89.2v-1.8h2.7V92" class="st12"/><path d="M50.5,87.4l1.8,2.4V92" class="st12"/><path d="M23.4,41.2c-1.3,0-1.8,1.9,0,1.9h5.1c1.6,0,1.7-1.9-0.1-1.9C26.5,41.2,23.4,41.2,23.4,41.2z" class="st13"/><path d="M68,43.3c-1.3,0-1.9,2.2,0,2.2h5.2c1.6,0,1.7-2.2-0.1-2.2C71.1,43.3,68,43.3,68,43.3z" class="st13"/><path d="M55.6,34.5c-2.2,0-2.4,3.1,0.1,3.1h6.8c2.1,0,2.3-3.1-0.1-3.1C59.8,34.5,55.6,34.5,55.6,34.5z" class="st13"/><path d="M69.7,23.7c2.2,0,2.3,2.6,4.2,2.6h5.4c2.6,0,2.1-3,0.3-3c0,0-3.3,0-4.6,0c-1.3,0-1.8-2.7-4.3-2.7	c-0.8,0-5.1-0.1-6.9-0.1c-2.2,0-2.9,3.4-4.5,3.4c-2.5,0-5-0.1-5-0.1c-2,0-2.2,3,0.1,3c1.8,0,4.3,0,5.5,0c2.6,0,2.5-3.4,5.1-3.4	C66.6,23.7,68.3,23.7,69.7,23.7z" class="st13"/><path d="M86.7,30.8c-2.7,0-6.9,0-6.9,0c-2.2,0-2.4,3.1,0.1,3.1h6.8" class="st13"/><path d="M36.1,16.3c-2.2,0-2.4,3.1,0.1,3.1h9.8c2.4,0,2.9-3,5.5-3h6.9c2,0,2-3.1-0.1-3.1h-8c-2.2,0-3.9,3-5.4,3	C43.4,16.4,36.1,16.3,36.1,16.3z" class="st13"/><path d="M19.7,26.3h4.7c1.8,0,2.4,2.5,3.7,2.5c1.3,0,8.5,0,8.5,0c1.8,0,2.2,2.8-0.3,2.8H27c-1.9,0-2-2.5-4.2-2.5h-3.7" class="st13"/><path d="M86.9,72.5v25.7c0,12.5-10,22.7-22.4,22.7H38.2c-12.4,0-22.5-10.2-22.5-22.7v-66c0-12.5,10.1-22.7,22.5-22.7	h26.3c11.9,0,21.7,9.4,22.4,21.3c0,0.5,0,0.9,0,1.4V72.5z" class="st12"/><path d="M41.3,120.9c-12.4,0-22.5-10.2-22.5-22.7v-66c0-1,0.1-2,0.2-3c0.1-1,0.3-1.9,0.5-2.8	C22,17.1,29.9,10.2,39.5,9.5c0.6,0,1.2-0.1,1.8-0.1" class="st12"/><path d="M57.1,148.7L57.1,148.7l-3.7,0h-0.1v-1.8h0.5L57.1,148.7z" class="st14"/><path d="M69.3,151.3l-0.1,0.2h-7l-5.2-2.8l-3.4-1.8h-0.5v-2.2h0.1c0,2.5,4,2.2,3.6-0.1	C57.2,144.6,63.6,148.1,69.3,151.3z" class="st14"/><path d="M62.2,151.5H55l-1.7-0.9h-0.1v-1.9h0.1l3.7,0.1l0,0L62.2,151.5z" class="st14"/><path d="M55,151.5l5.8,3.3H54l-0.7-0.4h0v-3.8h0.1L55,151.5z" class="st14"/><path d="M68.2,154.8h-7.4l-5.8-3.3h7.2L68.2,154.8z" class="st14"/><path d="M75.4,154.7L75.4,154.7l-7.2,0.1l-6-3.3h7l0.1-0.2C71.6,152.6,73.8,153.8,75.4,154.7z" class="st14"/><path d="M77.6,156c1.3,0.8,1.6,2-0.9,2c-0.9,0-1.4,0-2.8,0v-0.1l-5.7-3.1h7.1l0-0.1C76.6,155.3,77.4,155.8,77.6,156z" class="st14"/><path d="M74,157.9L74,157.9c-1.4,0.1-3.5,0.1-7.5,0.1v-0.1l-5.6-3.2h7.4L74,157.9z" class="st14"/><path d="M66.5,157.9L66.5,157.9c-2,0.1-4.4,0.1-7.3,0.1v-0.1l-5.2-3.1h6.9L66.5,157.9z" class="st14"/><path d="M54,154.8l5.2,3.1v0.1c-1.7,0-3.6,0-5.7,0h-0.2v-3.7h0L54,154.8z" class="st14"/><path d="M53.3,161.8c0.3,0.3,0.6,0.6,0.8,1c0.3,0.6,0.5,1.3,0.5,2c0,0.8-0.2,1.6-0.7,2.3c-0.7,1.1-2,1.9-3.5,1.9	c-0.7,0-1.4-0.2-2-0.5c-1.3-0.7-2.2-2.1-2.2-3.7c0-1.3,0.6-2.5,1.5-3.2c0.7-0.6,1.6-0.9,2.6-0.9C51.5,160.6,52.5,161.1,53.3,161.8z" class="st15"/><path d="M24.4,115.5l7.5,19.4L15,127.1L24.4,115.5z" class="st1"/><path d="M187.4,55c2.1,2.4,2.2,5.3,0.4,11.6c-0.7,2.4-5,15.5-10,30.8l0,0c-0.9-3.4-7.6-5.2-10.2-2.9l-0.1,0	c2.3-6.7,4.2-12.3,5.2-15c1.2-0.8,2.1-1.9,2.7-3.4l7.9-22.4c0.2-0.5,0.3-0.9,0.3-1.4C184.1,52.7,186,53.4,187.4,55z" class="st16"/><path d="M179.3,45.4c2.9,1.1,4.7,4,4.3,7.1c-0.1,0-0.2-0.1-0.2-0.1l-0.1,0c0-0.2,0-0.4,0-0.6c0-2.2-1.4-4.3-3.6-5.1	c-2.8-1-5.9,0.5-6.9,3.3l-7.6,21.4c-0.2,0.6-0.3,1.2-0.3,1.8c0,2.2,1.4,4.3,3.6,5.1c1.6,0.6,3.3,0.4,4.6-0.5l0,0.1	c0,0-0.2,0.6-0.6,1.7c-1.6,1-3.7,1.3-5.7,0.6l-0.6-0.2c-0.9-0.3-1.7-0.9-2.4-1.5c-1.8-1.8-2.5-4.4-1.6-6.9l7.9-22.4	c0.6-1.6,1.7-2.9,3.2-3.6c1.5-0.8,3.4-1,5.2-0.3L179.3,45.4z" class="st17"/><path d="M183.3,51.8c0,0.2,0,0.4,0,0.6c0,0.4-0.1,0.9-0.3,1.3l-1.6,4.5c0-0.1,0-0.1,0-0.2c0-1.2-0.7-2.3-1.9-2.7	c-1.5-0.5-3.1,0.2-3.6,1.7l-4.7,13.1c-0.1,0.3-0.2,0.7-0.2,1c0,1.2,0.7,2.3,1.9,2.7c1.3,0.5,2.7-0.1,3.4-1.2l-0.9,2.5	c-0.4,1.2-1.3,2.2-2.3,2.8c-1.3,0.8-3,1-4.6,0.5c-2.2-0.8-3.6-2.9-3.6-5.1c0-0.6,0.1-1.2,0.3-1.8l7.6-21.4c1-2.8,4.1-4.3,6.9-3.3	C182,47.5,183.3,49.6,183.3,51.8z" class="st16"/><path d="M181.4,58c0,0.1,0,0.1,0,0.2l-5.1,14.4c-0.7,1.2-2.1,1.7-3.4,1.2c-1.1-0.4-1.9-1.5-1.9-2.7	c0-0.3,0.1-0.7,0.2-1l4.7-13.1c0.5-1.5,2.2-2.2,3.6-1.7C180.7,55.7,181.4,56.8,181.4,58z" class="st16"/><path d="M177.7,97.5L177.7,97.5c-0.4,1.4-0.9,2.7-1.3,4.1l-0.1,0c-0.9-3.4-7.6-5.2-10.2-2.9l-0.1,0	c0.5-1.4,1-2.8,1.4-4.1l0.1,0C170.2,92.3,176.8,94.1,177.7,97.5z" class="st17"/><path d="M176.3,101.6l0.1,0c-0.4,1.4-0.9,2.7-1.3,4.1l-0.1,0c-0.9-3.4-7.6-5.2-10.2-2.9l-0.2-0.1	c0.5-1.4,0.9-2.7,1.4-4.1l0.1,0C168.7,96.4,175.4,98.2,176.3,101.6z" class="st17"/><path d="M175,105.7L175,105.7c-2.6,8.2-5.4,16.5-7.9,23.9l-0.3-0.1c-0.9-3.4-7.6-5.2-10.2-2.9l-0.3-0.1	c2.3-6.7,5.3-15.5,8.2-23.8l0.2,0.1C167.4,100.5,174.1,102.3,175,105.7z" class="st16"/><path d="M173.4,45.4l0.1,0.1c-1.4,0.7-2.6,2-3.2,3.6l-7.9,22.4c-0.9,2.5-0.2,5.2,1.6,6.9l-0.1,0.1l-4.4-0.8	c0.4-1.6,0.5-3.4,0.5-5.2c-0.1-6.4-2-10-4.4-12.8l0.1-0.1c0,0,3.9-13.8,6.9-15l0-0.2L173.4,45.4z" class="st18"/><path d="M170.7,164.3c0.1,0.5,0.1,1,0.1,1.5c0,3-3,2.9-5.9,2.9s-46.7,0.3-46.7,0.3c-0.9,0-1.8-0.1-2.4-0.6	c-0.7-0.5-1-1.4-1-2.9c0-2.9,1.3-5.8,6.8-5.8h43.5C168.5,159.7,170.2,161.8,170.7,164.3z" class="st16"/><path d="M170.7,164.3L170.7,164.3c-0.5-2.5-2.1-4.6-5.5-4.6h-43.5c-5.5,0-6.8,2.9-6.8,5.8c0,1.5,0.4,2.4,1,2.9	l-11.4-5.3l-0.1,0c0.8-2.3,1.4-4.5,1.6-5.4l0.2,0c0,0,1,3.4,3.2,3.4c0.3,0,0.6-0.1,0.9-0.4l0,0l11.5-5.6c0,0,17.1-0.2,22.1-0.3	c3.6,0,6.5-1.5,8.3-4l0,0c0,0,3.3,1.3,6.8,2.9c3.6,1.6,7.6,3.5,8.7,4.5C170,160.3,170.5,162.2,170.7,164.3z" class="st18"/><path d="M166.9,80.2c2,0.7,4.1,0.4,5.7-0.6c-0.9,2.7-2.9,8.3-5.2,15c-0.5,1.3-0.9,2.7-1.4,4.1	c-0.5,1.3-0.9,2.7-1.4,4.1c-2.9,8.3-5.9,17.1-8.2,23.8c-0.5,1.5-1,2.9-1.4,4.1c-0.5,1.6-1,3-1.4,4.1c-0.5,1.6-0.9,2.6-0.9,2.6l0,0	c-1.4-3.7-3.7-9.4-6-15l0,0c4.6-12.8,9.6-26.5,10.2-28.7c1.6-5.3-1.4-7.4-1.4-7.4l0,0c2-2.5,3.3-5.3,4-8.4l4.4,0.8l0.1-0.1	c0.7,0.7,1.5,1.2,2.4,1.5L166.9,80.2z" class="st18"/><path d="M166.9,129.5l0.3,0.1c-0.5,1.4-0.9,2.8-1.4,4.1l-0.3-0.1c-0.9-3.4-7.6-5.2-10.2-2.9l-0.2-0.1	c0.4-1.2,0.9-2.6,1.4-4.1l0.3,0.1C159.3,124.3,166,126.1,166.9,129.5z" class="st17"/><path d="M165.4,133.6l0.3,0.1c-0.5,1.4-0.9,2.8-1.4,4.1l-0.3-0.1c-0.9-3.4-7.6-5.2-10.2-2.9l-0.3-0.1	c0.4-1.1,0.8-2.5,1.4-4.1l0.2,0.1C157.9,128.4,164.5,130.2,165.4,133.6z" class="st17"/><path d="M164.1,137.7l0.3,0.1c-3.1,9.4-5.2,15.8-5.2,15.8l-0.1,0.3c-3.6-1.6-6.8-2.9-6.8-2.9l0,0	c2.2-3,2.7-7.3,1.1-11.9c-0.2-0.5-0.4-1.1-0.6-1.7l0,0c0,0,0.3-1,0.9-2.6l0.3,0.1C156.6,132.5,163.2,134.3,164.1,137.7z" class="st16"/><path d="M162.5,44.4l0,0.2c-3,1.3-6.9,15-6.9,15l-0.1,0.1c-0.7-0.8-1.5-1.6-2.2-2.4l0.1-0.1c0,0,3.4-12,6-13.1l0-0.1	L162.5,44.4z" class="st18"/><path d="M159.5,77.8c-0.7,3.1-2,5.9-4,8.4c-3.9,5-10.4,8.8-19,10.7l0,0l-5.7-11.6l-0.1-0.1c2.3-2.1,3.9-4.8,4.1-8.1	c0.5-8.2,0.5-13.6,0.5-14c2.6,0.9,6.2-0.9,6.1-5c-0.1-3.4-3-5.2-5.7-4.5l0-0.1c-3.6-1.1-4.6-5.4-4.1-9.9v-0.1c7.2,0,12.9,0,14.2,0	v0.1c-0.1,3.6,1,6.9,5.2,11.4c0.7,0.8,1.5,1.5,2.3,2.3c0.8,0.8,1.5,1.5,2.2,2.4c2.4,2.8,4.4,6.4,4.4,12.8	C160,74.4,159.8,76.1,159.5,77.8z" class="st17"/><path d="M159.4,44.1L159.4,44.1c-2.6,1.1-6,13.2-6,13.2l-0.1,0.1c-0.8-0.8-1.5-1.5-2.3-2.3c-4.3-4.4-5.4-7.8-5.2-11.4	v-0.1h0.3c0.8,0,1.4-0.2,1.8-0.6l0.3,0.1L159.4,44.1z" class="st18"/><path d="M155.5,86.3c0,0,3,2.1,1.4,7.4c-0.7,2.2-5.6,15.9-10.2,28.7l0,0c-3.8-9-7.6-17.8-7.6-17.8v0l1.1,0.1l-3.7-7.6	l0,0C145.1,95,151.6,91.3,155.5,86.3L155.5,86.3z" class="st18"/><path d="M136.1,121.1l-5.9,24.7v0c3.1-0.1,6.2-0.2,8.3-0.3c0.2,0,0.3,0,0.4,0c5.2-0.3,5.5-3.9,4.3-7.2	c-0.2-0.6-0.6-1.7-1.2-3.1C140.5,131.4,137.9,125.2,136.1,121.1z M103.7,123.7l-0.2,0c-1.8,7-6.5,12.6-12.9,16.7	c-3.7,2.3-7.9,4.2-12.5,5.6c-0.1,0-0.2,0.1-0.3,0.1l-0.1-0.2c0,0,0.9-1.8,0-5.5c-0.7-3.1-2.9-4.2-2.9-4.2l0-0.2	c14-2.2,24.5-10.6,27.6-27.2l0,0c0.5,0.6,1.3,1,2.2,1c0.3,0,0.6-0.1,0.9-0.1l0,0.1c-1.1,0.4-1.8,1.4-1.8,2.6c0,1.6,1.2,2.8,2.8,2.8	c0.5,0,1-0.1,1.4-0.4l0.2,0.1c-0.8,0.5-1.3,1.4-1.3,2.4c0,1.3,0.9,2.4,2,2.7l0,0.2l7.4,16.8l9.5-18.7l0-0.1c1.2-0.3,2.1-1.4,2.1-2.7	c0-0.8-0.3-1.5-0.8-2c0.4,0.3,0.9,0.4,1.5,0.4c1.5,0,2.8-1.3,2.8-2.8c0-1-0.6-2-1.4-2.5l0.1-0.1c0.4,0.3,0.9,0.4,1.4,0.4	c1.5,0,2.8-1.3,2.8-2.8c0-0.6-0.2-1.2-0.5-1.7v0l5.3,0.3v0c0,0,3.8,8.8,7.6,17.8c2.3,5.6,4.6,11.2,6,15c0.2,0.6,0.4,1.2,0.6,1.7	c1.6,4.7,1.1,9-1.1,11.9c-1.8,2.4-4.7,3.9-8.3,4c-5,0-22.1,0.3-22.1,0.3c0.9-1.7,1-6.4-2.9-9v-0.1c-2,0-9.8,0.2-11.5,0.2V146l-1-5.7	L103.7,123.7z" class="st19"/><path d="M145.9,38.6c2.3,0,3.2,2,2.7,3.4l-0.1,0H89.7l0,0c-0.3-1,0.3-2.3,1.2-2.8c0.8-0.4,3.9-2,7.6-3.9	c4.4-2.3,9.7-5,12.5-6.3c5.2-2.4,8.8-2.3,11-0.3c1.7,1.6,8.6,8.6,8.6,8.6s0.8,1.2,2.1,1.2H145.9z" class="st20"/><path d="M148.5,42.1l0.1,0c-0.1,0.4-0.4,0.7-0.7,1c-0.4,0.4-1,0.6-1.8,0.6h-0.3c-1.4,0-7,0-14.2,0	c-8.8,0-19.8,0-27.9,0c-1.8,0-3.4,0-4.9,0c-3.3,0-5.7,0-6.3,0c-1.6,0-2.4-0.7-2.7-1.6l0,0H148.5z" class="st20"/><path d="M135,16.1c12.6,1.1,10.9,22.3,10.9,22.3v0.2h-13.1c-1.3,0-2.1-1.2-2.1-1.2s-6.9-7-8.6-8.6	c-2.2-2-5.8-2.1-11,0.3c-2.9,1.3-8.1,4-12.5,6.3L98.4,35c0-2-0.4-12.3,9.4-15.7c7.8-2.7,12.5,2,12.5,2.9	C120.3,22.2,123.7,15.1,135,16.1z" class="st17"/><path d="M143.2,138.3c1.2,3.4,0.9,7-4.3,7.2c-0.1,0-0.3,0-0.4,0l0-0.2c0,0,1.3-4,3.6-10.1	C142.6,136.6,143,137.7,143.2,138.3z" class="st18"/><path d="M124,77.5c0-0.2,0-0.4,0-0.5c0-1.1-0.2-2.2-0.5-3.1c-0.6-1.6-1.8-2.8-3.6-2.8c-2.8,0-3.9,2.6-3.9,2.6	s-1.2-2.7-4-2.4c-1.1,0.1-1.9,0.9-2.5,2.1c-0.4,0.9-0.6,1.9-0.6,3.1c0,1.3,0.4,2.6,1.1,3.7c1.6,2.6,4.6,3.8,7.6,3.4	C121.9,83.1,123.8,80.4,124,77.5z M135.7,53.8c2.7-0.7,5.7,1.1,5.7,4.5c0.1,4-3.6,5.9-6.1,5c0,0.4,0,5.7-0.5,14	c-0.2,3.3-1.8,6-4.1,8.1c-2.2,1.9-5.1,3.3-8.2,3.8c-2.5,0.5-5.2,0.4-7.7-0.2c-1.6-0.4-3.1-1-4.5-1.9c-4.1-2.6-7.1-7.3-7.1-14.8	c0-3,0.1-11.8,0.2-18.9c0.6,0.2,1.2,0.2,1.9,0.2h0c0,0.1,0,0.2,0,0.2c0,1.5,0.6,2.8,1.5,3.8c1,1,2.4,1.7,3.9,1.7	c2.6,0,4.7-1.8,5.3-4.3h0l0,0c0.3,1.3,1,2.3,1.9,3.1c0.9,0.7,2.1,1.2,3.3,1.2c3,0,5.4-2.5,5.4-5.5c0-0.3,0-0.7-0.1-1	c-0.5-2.6-2.7-4.5-5.3-4.5c-2.7,0-4.7,1.8-5.3,4.1H116c-0.6-2.4-2.7-4.1-5.3-4.1c-2.2,0-4.1,1.3-4.9,3.2l-0.2-0.1	c-0.9,0-1.6-0.3-2.1-0.7c0.1-4,0.1-6.9,0.1-6.9v-0.1c8.2,0,19.2,0,27.9,0v0.1c-0.5,4.5,0.5,8.8,4.1,9.9L135.7,53.8z" class="st21"/><path d="M136.5,97l3.7,7.6l-1.1-0.1l-5.3-0.3l-4.2-0.2l-5.4-0.3l-1.6-14.6v0c3.1-0.6,6-1.9,8.2-3.8l0.1,0.1L136.5,97z" class="st19"/><path d="M142,135.2c-2.3,6.2-3.6,10.1-3.6,10.1l0,0.2c-2.1,0.1-5.2,0.2-8.3,0.3v0l5.9-24.7	C137.9,125.2,140.5,131.4,142,135.2z" class="st18"/><path d="M130.1,108.4L130.1,108.4c-0.5-0.1-0.9-0.3-1.4-0.3c-1.5,0-2.8,1.3-2.8,2.8c0,0.8,0.3,1.5,0.8,2	c-0.4-0.3-0.9-0.4-1.5-0.4c-1.5,0-2.8,1.3-2.8,2.8c0,0.6,0.2,1.1,0.5,1.6l-0.1,0c-0.5-0.7-1.3-1.2-2.3-1.2c-1.5,0-2.8,1.3-2.8,2.8	c0,0.1,0,0.2,0,0.3l-0.1,0c-0.2-1.4-1.3-2.5-2.8-2.5c-1.2,0-2.2,0.8-2.6,1.8h0l0,0c0.1-0.3,0.2-0.6,0.2-1c0-1.6-1.2-2.8-2.8-2.8	c-0.5,0-1,0.1-1.4,0.4l-0.2-0.1c0.8-0.5,1.3-1.4,1.3-2.4c0-1.6-1.2-2.8-2.8-2.8c-0.3,0-0.7,0.1-1,0.2l0-0.1c1.1-0.4,1.9-1.4,1.9-2.7	c0-1.6-1.2-2.8-2.8-2.8v-0.4l6.6-0.1l5.3,7.4l7.6-7.3l5.4,0.3l0,0.1c-0.5,0.5-0.8,1.1-0.8,1.8C128.8,107,129.3,107.9,130.1,108.4z" class="st19"/><path d="M126.7,52.8c0.1,0.3,0.1,0.7,0.1,1c0,3-2.4,5.5-5.4,5.5c-1.3,0-2.4-0.4-3.3-1.2l0,0c2,0.1,3.4-0.6,4.2-1.7	l-2.9-2.7l4-0.3c0-0.9-0.2-1.7-0.7-2.4v0C124.5,51.3,126,52,126.7,52.8L126.7,52.8z" class="st22"/><path d="M126.7,52.8L126.7,52.8c-0.7-0.8-2.2-1.5-4-1.8c-2-0.3-4.4,0-6.5,1.5l-0.1,0c0,0,0,0,0,0	c0.6-2.4,2.7-4.1,5.3-4.1C124,48.3,126.3,50.2,126.7,52.8z" class="st19"/><path d="M125.9,118L125.9,118l-9.5,18.8l-7.4-16.8l0-0.2c0.2,0.1,0.5,0.1,0.7,0.1c1.2,0,2.2-0.8,2.6-1.8l0,0	c-0.1,0.3-0.2,0.7-0.2,1c0,1.6,1.2,2.8,2.8,2.8s2.8-1.3,2.8-2.8c0-0.1,0-0.2,0-0.3l0.1,0c0.1,1.4,1.3,2.5,2.8,2.5	c1.5,0,2.8-1.3,2.8-2.8c0-0.6-0.2-1.2-0.5-1.6l0.1,0c0.5,0.8,1.3,1.2,2.3,1.2C125.4,118.1,125.6,118.1,125.9,118z" class="st19"/><path d="M122.5,89.1l1.6,14.6l-7.6,7.3l-5.3-7.4l0.1-0.4l3.5-14.1l0.1-0.2C117.3,89.5,120,89.6,122.5,89.1L122.5,89.1	L122.5,89.1z" class="st21"/><path d="M124,77c0,0.2,0,0.4,0,0.5c-0.7,0.9-2,1.7-3.7,2.3l0,0l-0.1-4.2l0-0.1c1.3-0.4,2.5-0.9,3.3-1.7l0,0	C123.8,74.8,124,75.9,124,77z" class="st22"/><path d="M123.5,73.9L123.5,73.9c-0.9,0.8-2,1.3-3.3,1.7c-1.3,0.4-2.8,0.5-4.3,0.5c-1.6-0.1-3.2-0.4-4.4-1	c-0.8-0.4-1.5-0.9-2-1.6l-0.1,0c0.5-1.1,1.4-2,2.5-2.1c2.8-0.3,4,2.4,4,2.4s1.1-2.6,3.9-2.6C121.6,71.1,122.8,72.2,123.5,73.9z" class="st6"/><path d="M123.4,53.4l-4,0.3l2.9,2.7c-0.8,1-2.3,1.7-4.2,1.7l0,0c-1-0.8-1.7-1.8-1.9-3.1h0c-0.1-0.4-0.1-0.8-0.1-1.2	c0-0.5,0.1-0.9,0.2-1.4l0.1,0c2.1-1.5,4.5-1.8,6.5-1.5v0C123.1,51.7,123.4,52.5,123.4,53.4z" class="st10"/><path d="M111.3,79c1.4,0.9,2.9,1.3,4.5,1.4c1.5,0.1,3.1-0.2,4.4-0.6c1.7-0.5,3.1-1.4,3.7-2.3c-0.2,2.9-2.1,5.6-6.5,6.2	c-3,0.4-5.9-0.8-7.6-3.4c-0.7-1.2-1.1-2.5-1.1-3.7h0C109.5,77.6,110.4,78.4,111.3,79z" class="st6"/><path d="M118.9,146.2c3.9,2.6,3.8,7.2,2.9,9l-11.5,5.6l0,0c0.9-0.8,1.4-2.7,1.5-4.8c0-0.7,0-1.4,0-2.1	c-0.2-2.1-1-4.4-2.1-5.9c-0.7-1-1.6-1.7-2.4-1.7v0h0.2c1.7,0,9.4-0.2,11.5-0.2L118.9,146.2L118.9,146.2z" class="st19"/><path d="M120.2,79.8L120.2,79.8c-1.3,0.4-2.8,0.7-4.4,0.6v-0.1l0-4.2v0c1.5,0.1,2.9-0.1,4.3-0.5l0,0.1L120.2,79.8z" class="st22"/><path d="M116.1,52.4C116.1,52.4,116.1,52.4,116.1,52.4c-0.1,0.5-0.2,0.9-0.2,1.4c0,0.4,0,0.8,0.1,1.2h0	c-0.6,2.4-2.7,4.3-5.3,4.3c-1.5,0-2.9-0.6-3.9-1.7l0,0c0.4,0.1,0.8,0.2,1.2,0.2c1.4,0,2.7-0.6,3.5-1.7l-2.9-2.7l4-0.3	c0-0.9-0.2-1.7-0.7-2.4v0c1.7,0.3,3.2,1,3.9,1.8L116.1,52.4L116.1,52.4z" class="st22"/><path d="M116,52.4l-0.1,0c-0.7-0.8-2.1-1.5-3.9-1.8c-2-0.3-4.3,0-6.4,1.5l0,0c0.1-0.2,0.1-0.4,0.2-0.6	c0.9-1.9,2.7-3.2,4.9-3.2C113.3,48.3,115.4,50,116,52.4z" class="st19"/><path d="M115.8,76L115.8,76l0,4.3v0.1c-1.6-0.1-3.1-0.5-4.5-1.4l0.1-3.9l0.1-0.1C112.7,75.7,114.2,76,115.8,76z" class="st22"/><path d="M114.8,88.9l-0.1,0.2l-3.5,14.1l-0.1,0.4l-6.6,0.1l-9.1,0.1l7.1-8l7.6-8.6l0.1-0.1	C111.7,87.9,113.3,88.5,114.8,88.9z" class="st19"/><path d="M112.7,53.1l-4,0.3l2.9,2.7c-0.8,1-2.1,1.7-3.5,1.7c-0.4,0-0.8-0.1-1.2-0.2l0,0c-0.9-1-1.5-2.3-1.5-3.8	c0-0.1,0-0.2,0-0.2c0-0.5,0.1-1,0.2-1.4l0,0c2.1-1.5,4.5-1.8,6.4-1.5v0C112.5,51.4,112.7,52.2,112.7,53.1z" class="st10"/><path d="M87.9,168.8c-1.3,0.7-2.5,0.9-3.5,0.8c-2.8-0.4-2.5-2.3-2.5-2.3s0.2,0,0.5-0.1c1.1-0.4,4.2-1.6,6.2-4.5	c0.6-0.9,1.2-2.2,1.7-3.4c0.9-2.1,1.4-4.2,1.4-4.2s-1,1.9-3.4,3c-1,0.5-2.4,0.8-4,0.7c-3.4-0.1-3.2-3-1.8-3.5	c0.2-0.1,0.4-0.1,0.6-0.1c2.2,0.2,3.9-0.6,5.2-1.7c0.3-0.2,0.5-0.5,0.8-0.7c1.5-1.5,3.7-4.9,7.6-4.9c2.2,0,5.9,0,8.8,0	c2.4,0,4.3,0,4.3,0l0.1,0c1.1,1.5,1.9,3.7,2.1,5.9c0.1,0.7,0.1,1.4,0,2.1l-0.1,0c0,0-2.2,0.1-3.9,0.1c-1,0-1.7,0.6-1.7,1.3	c0,0,0,0.1-0.1,0.4c-0.2,0.9-0.7,3.1-1.6,5.4c-0.7,1.9-1.6,4-2.7,5.4c-2,2.6-4,3.5-5.5,1.9l-0.1-0.2c-1.4,0.9-2.7,0.7-3.8-0.4l0,0	C90.6,170.8,88.9,170.5,87.9,168.8L87.9,168.8z" class="st21"/><path d="M111.7,155.9l0.1,0c-0.1,2.1-0.7,4-1.5,4.8c-0.3,0.2-0.6,0.4-0.9,0.4c-2.1,0-3.2-3.4-3.2-3.4l-0.2,0	c0.1-0.3,0.1-0.4,0.1-0.4c0-0.7,0.7-1.3,1.7-1.3C109.5,156,111.7,155.9,111.7,155.9z" class="st23"/><path d="M111.5,75l-0.1,0.1l-0.1,3.9c-0.9-0.6-1.8-1.4-2.5-2.5h0c0-1.1,0.2-2.2,0.6-3.1l0.1,0	C110,74.1,110.6,74.7,111.5,75z" class="st22"/><path d="M87.2,86.8c-2-2.9-3.4-6.6-3.1-11.1c0.5-7.8,6.7-11.5,11-16.8c4-4.9,3.6-10.3,3.6-15.3v0c1.5,0,3.1,0,4.9,0	v0.1c0,0,0,2.9-0.1,6.9c0,0.8,0,1.7,0,2.6c-0.1,7.1-0.2,16-0.2,18.9c0,7.5,3,12.2,7.1,14.8l-0.1,0.1l-7.6,8.6l-0.1-0.1	c0,0-2.3-0.3-7.8-2.6C92.2,91.9,89.4,89.8,87.2,86.8z" class="st17"/><path d="M107.3,146.3c0.8,0,1.7,0.7,2.4,1.7l-0.1,0c0,0-1.9,0-4.3,0V148c0,0,0.2-0.6,0.7-1.1c0.3-0.3,0.6-0.5,1.1-0.5	L107.3,146.3L107.3,146.3z" class="st23"/><path d="M107.4,146v0.3h-0.3c-0.4,0-0.8,0.2-1.1,0.5l0,0c0,0-11.3-0.1-17.7-0.1c-5.3,0-6.1,4.6-4.8,6.2l-0.1,0.1	l-10.4-5.2l0-0.1c1.5-0.5,2.9-1,4.9-1.6c0.1,0,0.2-0.1,0.3-0.1c4.6-1.4,8.8-3.3,12.5-5.6l0,0h15.9L107.4,146z" class="st18"/><path d="M106,146.8L106,146.8c-0.4,0.5-0.6,1.1-0.6,1.1v0.1c-2.9,0-6.6,0-8.8,0c-3.9,0-6.1,3.4-7.6,4.9	c-0.2,0.2-0.5,0.5-0.8,0.7l-0.1-0.2h-3.5c-0.4,0-0.8-0.2-1-0.5c-1.3-1.6-0.5-6.2,4.8-6.2C94.7,146.7,106,146.8,106,146.8z" class="st16"/><path d="M105.6,51.4l0.2,0.1c-0.1,0.2-0.2,0.4-0.2,0.6c-0.1,0.5-0.2,0.9-0.2,1.4h0c-0.6,0-1.3,0-1.8-0.2	c0-0.9,0-1.8,0-2.6C104.1,51.2,104.8,51.4,105.6,51.4z" class="st21"/><path d="M88.2,158.1l2,1.2c-0.5,1.2-1.1,2.4-1.7,3.4H54.2l-0.2,0.1c-0.2-0.4-0.5-0.7-0.8-1V158h0.2c2.1,0,4,0,5.7,0	c3,0,5.4,0,7.3,0c4,0,6.2,0,7.5,0c1.4,0,1.9,0,2.8,0c2.4,0,2.1-1.2,0.9-2c-0.2-0.1-1-0.6-2.2-1.3c-1.6-0.9-3.8-2.1-6.1-3.4	c-5.7-3.1-12.1-6.7-12.3-6.7c-0.2-1.5-0.1-2.5,0-3.2l0.1,0l13.2,7.2l12,6.6l0,0.1c-1.4,0.5-1.6,3.4,1.8,3.5	C85.9,158.9,87.2,158.6,88.2,158.1L88.2,158.1L88.2,158.1z" class="st1"/><path d="M54.2,162.7h34.3c-2,2.9-5,4.1-6.2,4.5v-0.1H53.9l-0.1-0.1c0.4-0.7,0.7-1.4,0.7-2.3c0-0.7-0.2-1.4-0.5-2	L54.2,162.7z" class="st15"/><path d="M77.8,140.3c0.9,3.7,0,5.5,0,5.5l0.1,0.2c-2,0.6-3.4,1.1-4.9,1.6c-0.8,0.3-1.6,0.5-2.5,0.9l-0.1,0.1l-2.2-1.2	c0,0,0.4-3-0.7-6.2c-0.4-1-0.8-1.8-1.3-2.4c-1.5-1.8-3.2-2.3-3.2-2.3c4.2,0.3,8.2,0.1,12-0.5l0,0.2	C74.9,136.2,77.1,137.2,77.8,140.3z" class="st19"/><path d="M57,141.4c-0.2,0.7-0.3,1.7,0,3.2c0.4,2.3-3.6,2.6-3.6,0.1h-0.1v-5.3h0.1c0.6-2.2,1.9-2.8,3.5-2.8	c2.2,0.1,2.8,1,3.5,1.7c0.4,0.4,0.8,0.8,1.7,0.9c2.1,0.3,3.9-0.3,3.9-0.3l0.1-0.1c0.5,0.6,1,1.4,1.3,2.4c1.1,3.2,0.7,6.2,0.7,6.2	l2.2,1.2l0.1,0l0,0l-13.2-7.2L57,141.4z" class="st21"/><path d="M66.1,138.8l-0.1,0.1c0,0-1.8,0.6-3.9,0.3c-0.8-0.1-1.2-0.5-1.7-0.9c0-0.2,0.4-1.8,2.5-1.8	C62.9,136.5,64.6,136.9,66.1,138.8z" class="st23"/><path d="M53.3,158v3.8c-0.7-0.7-1.8-1.2-2.9-1.2c-1,0-1.9,0.4-2.6,0.9l-0.1-0.1v-0.1c0-2.6,0.1-40.8,0.1-43.4	c0-2.7,0.7-8-4.7-10c0,0-31.7-13.3-33.6-13.8c-1.6-0.4-4.8-1.6-6,2.1l0,0c0.4-3.5,2.1-4,3.5-4.2c1.5-0.2,4.8-0.4,6.6,0	c2.2,0.5,34.3,13.8,34.3,13.8c4.8,2.2,5.4,5.1,5.4,9.1V158z" class="st15"/><path d="M48.4,168.4L48.4,168.4L3.5,144.8c0,0-3-3.2,0-6.4l44.1,22.9h0.1v0.1l0.1,0.1c-0.9,0.8-1.5,1.9-1.5,3.2	C46.3,166.4,47.2,167.7,48.4,168.4z" class="st15"/><path d="M43,107.8c5.5,2,4.7,7.2,4.7,10s-0.1,40.8-0.1,43.4h-0.1L3.5,138.4c0,0-0.7-32.3-0.5-39.4	c0-1.2,0.2-2.1,0.4-2.9c1.1-3.7,4.3-2.5,6-2.1C11.4,94.6,43,107.8,43,107.8z M31.8,134.8l-7.5-19.4L15,127.1L31.8,134.8z" class="st15"/><path d="M145.8,43.7h0.3c0.8,0,1.4-0.2,1.8-0.6c0.3-0.3,0.6-0.6,0.7-1c0.5-1.5-0.5-3.4-2.7-3.4h-13.1	c-1.3,0-2.1-1.2-2.1-1.2s-6.9-7-8.6-8.6c-2.2-2-5.8-2.1-11,0.3c-2.9,1.3-8.1,4-12.5,6.3c-3.7,1.9-6.8,3.5-7.6,3.9	c-0.9,0.4-1.5,1.7-1.2,2.8c0.2,0.9,1,1.6,2.7,1.6c0.7,0,3,0,6.3,0c1.5,0,3.1,0,4.9,0c8.2,0,19.2,0,27.9,0	C138.7,43.7,144.4,43.7,145.8,43.7z" class="st12"/><path d="M98.4,35c0-2-0.4-12.3,9.4-15.7c7.8-2.7,12.5,2,12.5,2.9c0,0,3.4-7.1,14.7-6.1c12.6,1.1,10.9,22.3,10.9,22.3" class="st12"/><path d="M98.7,43.6c0,5,0.4,10.3-3.6,15.3c-4.3,5.3-10.5,9.1-11,16.8c-0.3,4.4,1.1,8.2,3.1,11.1c2.1,3,5,5.2,7.6,6.3	c5.5,2.3,7.8,2.6,7.8,2.6" class="st12"/><path d="M103.6,43.8c0,0,0,2.9-0.1,6.9c0,0.8,0,1.7,0,2.6c-0.1,7.1-0.2,16-0.2,18.9c0,7.5,3,12.2,7.1,14.8	c1.4,0.9,2.9,1.5,4.5,1.9c2.5,0.6,5.1,0.6,7.7,0.2c3.1-0.6,6-1.9,8.2-3.8c2.3-2.1,3.9-4.8,4.1-8.1c0.5-8.2,0.5-13.6,0.5-14v0" class="st12"/><path d="M132.6,56.2c0.8-1.3,1.9-2.1,3.1-2.4c2.7-0.7,5.7,1.1,5.7,4.5c0.1,4-3.6,5.9-6.1,5c-0.5-0.2-1-0.5-1.4-1" class="st12"/><path d="M136.7,56.7c-0.6,1.7-2,2.2-2.9,2.4" class="st12"/><path d="M136.8,60.7c-0.5-1.4-1.9-1.8-3-1.7" class="st12"/><path d="M131.6,43.8c-0.5,4.5,0.5,8.8,4.1,9.9" class="st12"/><path d="M136.5,97c8.6-2,15.1-5.7,19-10.7c2-2.5,3.3-5.3,4-8.4c0.4-1.6,0.5-3.4,0.5-5.2c-0.1-6.4-2-10-4.4-12.8	c-0.7-0.8-1.5-1.6-2.2-2.4c-0.8-0.8-1.5-1.5-2.3-2.3c-4.3-4.4-5.4-7.8-5.2-11.4" class="st12"/><path d="M110.3,87.2l-7.6,8.6l-7.1,8l9.1-0.1l6.6-0.1l5.3,7.4l7.6-7.3" class="st12"/><path d="M122.5,89.1l1.6,14.6l5.4,0.3l4.2,0.2l5.3,0.3l1.1,0.1l-3.7-7.6l-5.7-11.6" class="st12"/><path d="M114.8,89.1l-3.5,14.1" class="st12"/><path d="M147,67.7c1.7,7.9,8.1,11.1,12,11.6" class="st12"/><path d="M142.8,76.6c1.3,6.5,7.5,9.9,11.9,10.3" class="st12"/><path d="M138.8,85.7c0.9,5.2,5.7,7.1,8.7,7" class="st12"/><path d="M84.5,79.6c4.1,0.3,10.2-3.8,11.1-8.7" class="st12"/><path d="M87.1,86.8C87.2,86.8,87.2,86.8,87.1,86.8c4.1,0.1,10.5-4.7,11.1-9.1" class="st12"/><path d="M100.7,84.9c-0.5,3.3-4.3,6.5-7.7,6.7" class="st12"/><path d="M126.7,52.8c0.1,0.3,0.1,0.7,0.1,1c0,3-2.4,5.5-5.4,5.5c-1.3,0-2.4-0.4-3.3-1.2c-1-0.8-1.7-1.8-1.9-3.1h0	c-0.1-0.4-0.1-0.8-0.1-1.2c0-0.5,0.1-0.9,0.2-1.4c0,0,0,0,0,0c0.6-2.4,2.7-4.1,5.3-4.1C124,48.3,126.3,50.2,126.7,52.8z" class="st12"/><path d="M116.1,55c-0.6,2.4-2.7,4.3-5.3,4.3c-1.5,0-2.9-0.6-3.9-1.7c-0.9-1-1.5-2.3-1.5-3.8c0-0.1,0-0.2,0-0.2	c0-0.5,0.1-1,0.2-1.4c0.1-0.2,0.1-0.4,0.2-0.6c0.9-1.9,2.7-3.2,4.9-3.2c2.5,0,4.7,1.8,5.3,4.1" class="st12"/><path d="M105.6,52.1c2.1-1.5,4.5-1.8,6.4-1.5c1.7,0.3,3.2,1,3.9,1.8" class="st12"/><path d="M116.2,52.5c2.1-1.5,4.5-1.8,6.5-1.5c1.8,0.3,3.3,1,4,1.8" class="st12"/><path d="M129.3,48.8c-0.5,1.5-2.2,2.2-3.1,2.2" class="st12"/><path d="M130.2,51.3c-0.7,1-1.6,1.6-3.3,1.7" class="st12"/><path d="M102.5,48.6c0.1,1,0.5,1.6,1,2.1c0.5,0.5,1.3,0.7,2.1,0.7" class="st12"/><path d="M101.8,51.2c0.1,1.2,0.8,1.9,1.7,2.2c0.6,0.2,1.2,0.2,1.8,0.2" class="st12"/><path d="M115.2,57c0.1,2.8,0.3,4.7-0.9,6.3c-1.2,1.7-2.3,2.2-2.2,3.8c0.1,1.9,1.8,2.6,3.6,2.6c2.6-0.1,3.3-1.9,3.3-1.9" class="st12"/><path d="M123.5,73.9c-0.6-1.6-1.8-2.8-3.6-2.8c-2.8,0-3.9,2.6-3.9,2.6s-1.2-2.7-4-2.4c-1.1,0.1-1.9,0.9-2.5,2.1	c-0.4,0.9-0.6,1.9-0.6,3.1c0,1.3,0.4,2.6,1.1,3.7c1.6,2.6,4.6,3.8,7.6,3.4c4.4-0.6,6.3-3.2,6.5-6.2c0-0.2,0-0.4,0-0.5	C124,75.9,123.8,74.8,123.5,73.9z" class="st12"/><path d="M109.5,73.5c0.5,0.6,1.1,1.2,2,1.6c1.2,0.6,2.8,0.9,4.4,1c1.4,0.1,2.9-0.1,4.3-0.5c1.3-0.4,2.5-0.9,3.3-1.7" class="st12"/><path d="M108.8,76.5c0.7,1.1,1.6,1.9,2.5,2.5c1.4,0.9,2.9,1.3,4.5,1.4c1.5,0.1,3.1-0.2,4.4-0.6	c1.7-0.5,3.1-1.4,3.7-2.3c0,0,0,0,0-0.1" class="st12"/><path d="M115.8,76.1v4.2" class="st12"/><path d="M111.4,75.2l-0.1,3.9v0" class="st12"/><path d="M120.1,75.6l0.1,4.2" class="st12"/><path d="M106.9,57.6c0.4,0.1,0.8,0.2,1.2,0.2c1.4,0,2.7-0.6,3.5-1.7l-2.9-2.7l4-0.3c0-0.9-0.2-1.7-0.7-2.4" class="st12"/><path d="M118.1,58.1c2,0.1,3.4-0.6,4.2-1.7l-2.9-2.7l4-0.3c0-0.9-0.2-1.7-0.7-2.4" class="st12"/><path d="M89.7,42.1h58.8" class="st12"/><path d="M104.7,104.1c1.5,0,2.8,1.3,2.8,2.8c0,1.2-0.8,2.3-1.9,2.7c-0.3,0.1-0.6,0.1-0.9,0.1c-0.9,0-1.6-0.4-2.2-1	c-0.4-0.5-0.6-1.1-0.6-1.8C101.9,105.3,103.2,104.1,104.7,104.1z" class="st12"/><path d="M105.6,109.6c0.3-0.1,0.6-0.2,1-0.2c1.5,0,2.8,1.3,2.8,2.8c0,1-0.5,1.9-1.3,2.4c-0.4,0.3-0.9,0.4-1.4,0.4	c-1.5,0-2.8-1.3-2.8-2.8C103.8,111.1,104.6,110,105.6,109.6z" class="st12"/><path d="M108.3,114.8c0.4-0.3,0.9-0.4,1.4-0.4c1.5,0,2.8,1.3,2.8,2.8c0,0.3-0.1,0.7-0.2,1c-0.4,1.1-1.4,1.8-2.6,1.8	c-0.3,0-0.5,0-0.7-0.1c-1.2-0.3-2-1.4-2-2.7C106.9,116.2,107.4,115.3,108.3,114.8z" class="st12"/><path d="M117.7,118.8c0,0.1,0,0.2,0,0.3c0,1.6-1.2,2.8-2.8,2.8s-2.8-1.3-2.8-2.8c0-0.4,0.1-0.7,0.2-1h0	c0.4-1.1,1.4-1.8,2.6-1.8C116.4,116.3,117.6,117.4,117.7,118.8z" class="st12"/><path d="M122.8,116.9c0.3,0.5,0.5,1,0.5,1.6c0,1.6-1.2,2.8-2.8,2.8c-1.4,0-2.6-1.1-2.8-2.5c0-0.1,0-0.2,0-0.3	c0-1.6,1.2-2.8,2.8-2.8C121.5,115.7,122.3,116.2,122.8,116.9z" class="st12"/><path d="M127.2,113.3c0.5,0.5,0.8,1.2,0.8,2c0,1.3-0.9,2.4-2.1,2.7c-0.2,0.1-0.4,0.1-0.6,0.1c-1,0-1.8-0.5-2.3-1.2	c-0.3-0.4-0.5-1-0.5-1.6c0-1.6,1.2-2.8,2.8-2.8c0.5,0,1.1,0.2,1.5,0.4C126.9,113,127,113.2,127.2,113.3z" class="st12"/><path d="M130.1,108.5c0.8,0.5,1.4,1.4,1.4,2.5c0,1.6-1.2,2.8-2.8,2.8c-0.5,0-1.1-0.2-1.5-0.4c-0.2-0.1-0.4-0.3-0.5-0.4	c-0.5-0.5-0.8-1.2-0.8-2c0-1.6,1.2-2.8,2.8-2.8C129.2,108.1,129.6,108.2,130.1,108.5z" class="st12"/><path d="M133.8,104.3c0.3,0.5,0.5,1,0.5,1.7c0,1.6-1.2,2.8-2.8,2.8c-0.5,0-1-0.1-1.4-0.4c-0.8-0.5-1.3-1.4-1.3-2.4	c0-0.8,0.3-1.3,0.8-1.8" class="st12"/><path d="M108.9,120l7.4,16.8l9.5-18.7" class="st12"/><path d="M102.7,118l1,5.7l2.8,16.7l1,5.7" class="st12"/><path d="M134.3,116.8c0,0,0.8,1.8,1.8,4.3c1.7,4.1,4.3,10.3,5.9,14.1c0.6,1.4,1,2.5,1.2,3.1c1.2,3.4,0.9,7-4.3,7.2	c-0.1,0-0.3,0-0.4,0c-2.1,0.1-5.2,0.2-8.3,0.3c-5.4,0.2-10.8,0.3-10.8,0.3s-0.2,0-0.5,0c-2,0-9.8,0.2-11.5,0.2h-0.3	c-0.4,0-0.8,0.2-1.1,0.5c-0.4,0.5-0.7,1.1-0.7,1.1" class="st12"/><path d="M106.5,146.5c0.2-0.1,0.5-0.2,0.7-0.2c0.9,0,1.7,0.7,2.4,1.7c1.1,1.5,1.9,3.7,2.1,5.9c0.1,0.7,0.1,1.4,0,2.1	c-0.1,2.1-0.7,4-1.5,4.8c-0.3,0.2-0.6,0.4-0.9,0.4c-2.1,0-3.2-3.4-3.2-3.4" class="st12"/><path d="M110.3,160.8l11.5-5.6c0,0,17.1-0.2,22.1-0.3c3.6,0,6.5-1.5,8.3-4c2.2-3,2.7-7.3,1.1-11.9	c-0.2-0.5-0.4-1.1-0.6-1.7c-1.4-3.7-3.7-9.4-6-15c-3.8-9-7.6-17.8-7.6-17.8" class="st12"/><path d="M118.9,146.2c3.9,2.6,3.8,7.2,2.9,9" class="st12"/><path d="M136.2,121l0,0.1l-5.9,24.7" class="st12"/><path d="M102.5,108.7c-3.2,16.7-13.7,25-27.6,27.2c-3.8,0.6-7.8,0.8-12,0.5c0,0,1.8,0.5,3.2,2.3c0.5,0.6,1,1.4,1.3,2.4	c1.1,3.2,0.7,6.2,0.7,6.2l2.2,1.2l0.1,0" class="st12"/><path d="M70.4,148.5c0.9-0.3,1.7-0.6,2.5-0.9c1.5-0.5,2.9-1,4.9-1.6c0.1,0,0.2-0.1,0.3-0.1c4.6-1.4,8.8-3.3,12.5-5.6	c6.4-4.1,11.2-9.6,12.9-16.7" class="st12"/><path d="M109.6,148.1c0,0-1.9,0-4.3,0c-2.9,0-6.6,0-8.8,0c-3.9,0-6.1,3.4-7.6,4.9c-0.2,0.2-0.5,0.5-0.8,0.7	c-1.3,1.1-3,1.9-5.2,1.7c-0.2,0-0.4,0-0.6,0.1c-1.4,0.5-1.6,3.4,1.8,3.5c1.6,0.1,2.9-0.3,4-0.7c2.4-1.1,3.4-3,3.4-3s-0.5,2-1.4,4.2	c-0.5,1.2-1.1,2.4-1.7,3.4c-2,2.9-5,4.1-6.2,4.5c-0.3,0.1-0.5,0.1-0.5,0.1s-0.3,1.9,2.5,2.3c1,0.1,2.2,0,3.5-0.8	c1.1-0.6,2.2-1.6,3.4-3.1c2.9-3.7,3.3-6.2,3.3-6.2" class="st12"/><path d="M87.9,168.9c1,1.6,2.7,1.9,4.4,0.8c0.5-0.3,1.1-0.8,1.6-1.4c2.9-3.4,4.5-8.3,4.5-8.3" class="st12"/><path d="M92.3,169.7c1.1,1.2,2.4,1.3,3.8,0.4c0.6-0.4,1.2-1,1.8-1.7c2.7-3.6,3.9-8.3,3.9-8.3" class="st12"/><path d="M96.2,170.3c1.6,1.6,3.5,0.8,5.5-1.9c1.1-1.4,2-3.4,2.7-5.4c0.8-2.3,1.4-4.5,1.6-5.4c0.1-0.3,0.1-0.4,0.1-0.4	c0-0.7,0.7-1.3,1.7-1.3c1.7,0,3.9-0.1,3.9-0.1" class="st12"/><path d="M74.9,136.2c0,0,2.2,1.1,2.9,4.2c0.9,3.7,0,5.5,0,5.5" class="st12"/><path d="M170.7,164.3c0.1,0.5,0.1,1,0.1,1.5c0,3-3,2.9-5.9,2.9s-46.7,0.3-46.7,0.3c-0.9,0-1.8-0.1-2.4-0.6	c-0.7-0.5-1-1.4-1-2.9c0-2.9,1.3-5.8,6.8-5.8h43.5C168.5,159.7,170.2,161.8,170.7,164.3z" class="st12"/><path d="M104.5,163.1l11.4,5.3" class="st12"/><path d="M152.2,150.9c0,0,3.3,1.3,6.8,2.9c3.6,1.6,7.6,3.5,8.7,4.5c2.2,2,2.7,3.8,2.9,5.9" class="st12"/><path d="M146.7,122.3c4.6-12.8,9.6-26.5,10.2-28.7c1.6-5.3-1.4-7.4-1.4-7.4" class="st12"/><path d="M138.5,145.4c0,0,1.3-4,3.6-10.1c0,0,0,0,0,0" class="st12"/><path d="M152.8,137.3c0,0,0.3-1,0.9-2.6c0.4-1.1,0.8-2.5,1.4-4.1c0.4-1.2,0.9-2.6,1.4-4.1c2.3-6.7,5.3-15.5,8.2-23.8	c0.5-1.4,0.9-2.7,1.4-4.1c0.5-1.4,1-2.8,1.4-4.1c2.3-6.7,4.2-12.3,5.2-15c0.4-1.1,0.6-1.7,0.6-1.7" class="st12"/><path d="M159.2,153.6c0,0,2.1-6.4,5.2-15.8c0.4-1.3,0.9-2.7,1.4-4.1c0.4-1.3,0.9-2.7,1.4-4.1	c2.4-7.4,5.2-15.7,7.9-23.9c0.5-1.4,0.9-2.7,1.3-4.1c0.5-1.4,0.9-2.8,1.4-4.1c5.1-15.3,9.3-28.4,10-30.8c1.8-6.3,1.7-9.3-0.4-11.6	c-1.4-1.6-3.3-2.4-3.9-2.6c-0.1,0-0.2-0.1-0.2-0.1" class="st12"/><path d="M183.3,52.4c0,0.4-0.1,0.9-0.3,1.3l-1.6,4.5l-5.1,14.4l-0.9,2.5c-0.4,1.2-1.3,2.2-2.3,2.8	c-1.3,0.8-3,1-4.6,0.5c-2.2-0.8-3.6-2.9-3.6-5.1c0-0.6,0.1-1.2,0.3-1.8l7.6-21.4c1-2.8,4.1-4.3,6.9-3.3c2.2,0.8,3.6,2.9,3.6,5.1	C183.3,52,183.3,52.2,183.3,52.4z" class="st12"/><path d="M181.4,58.2c0,0.3-0.1,0.5-0.2,0.8l-4.7,13.1c-0.1,0.2-0.1,0.3-0.2,0.5c-0.7,1.2-2.1,1.7-3.4,1.2	c-1.1-0.4-1.9-1.5-1.9-2.7c0-0.3,0.1-0.7,0.2-1l4.7-13.1c0.5-1.5,2.2-2.2,3.6-1.7c1.1,0.4,1.9,1.5,1.9,2.7	C181.4,58.1,181.4,58.1,181.4,58.2z" class="st12"/><path d="M183.5,52.5c-0.1,0.5-0.2,0.9-0.3,1.4l-7.9,22.4c-0.5,1.4-1.5,2.6-2.7,3.4c-1.6,1-3.7,1.3-5.7,0.6l-0.6-0.2	c-0.9-0.3-1.7-0.9-2.4-1.5c-1.8-1.8-2.5-4.4-1.6-6.9l7.9-22.4c0.6-1.6,1.7-2.9,3.2-3.6c1.5-0.8,3.4-1,5.2-0.3l0.6,0.2	C182.2,46.5,183.9,49.4,183.5,52.5z" class="st12"/><path d="M159.4,77.8L159.4,77.8l4.4,0.8" class="st12"/><path d="M148.2,43.1l11.2,1l3.1,0.3l10.9,1" class="st12"/><path d="M159.4,44.2c-2.6,1.1-6,13.1-6,13.1" class="st12"/><path d="M162.5,44.7c-3,1.3-6.9,15-6.9,15" class="st12"/><path d="M167.5,94.6c2.6-2.3,9.3-0.5,10.2,2.9" class="st12"/><path d="M166.1,98.7c2.6-2.3,9.3-0.5,10.2,2.9" class="st12"/><path d="M164.8,102.8c2.6-2.3,9.3-0.5,10.2,2.9" class="st12"/><path d="M156.7,126.6c2.6-2.3,9.3-0.5,10.2,2.9" class="st12"/><path d="M155.3,130.7c2.6-2.3,9.3-0.5,10.2,2.9" class="st12"/><path d="M154,134.8c2.6-2.3,9.3-0.5,10.2,2.9" class="st12"/><path d="M66,138.9c0,0-1.8,0.6-3.9,0.3c-0.8-0.1-1.2-0.5-1.7-0.9c-0.7-0.7-1.3-1.5-3.5-1.7c-1.6,0-2.9,0.6-3.5,2.8" class="st12"/><path d="M62.9,136.5c-2,0-2.4,1.6-2.5,1.8c0,0,0,0,0,0" class="st12"/><path d="M57.2,141.5l13.2,7.2l12,6.6" class="st12"/><path d="M88.2,158.1l2,1.2l0,0" class="st12"/><path d="M88.5,162.7H54.2" class="st12"/><path d="M53.9,167.1h28.4" class="st12"/><path d="M54,162.8c0.3,0.6,0.5,1.3,0.5,2c0,0.8-0.2,1.6-0.7,2.3c-0.7,1.1-2,1.9-3.5,1.9c-0.7,0-1.4-0.2-2-0.5	c-1.3-0.7-2.2-2.1-2.2-3.7c0-1.3,0.6-2.5,1.5-3.2c0.7-0.6,1.6-0.9,2.6-0.9c1.1,0,2.1,0.4,2.9,1.2C53.6,162.1,53.8,162.4,54,162.8z" class="st12"/><path d="M47.7,161.5v-0.1c0-2.6,0.1-40.8,0.1-43.4c0-2.7,0.7-8-4.7-10c0,0-31.7-13.3-33.6-13.8c-1.6-0.4-4.8-1.6-6,2.1	C3.2,96.9,3.1,97.8,3,99c-0.2,7,0.5,39.4,0.5,39.4l44.1,22.9" class="st12"/><path d="M53.3,161.8v-47.1c0-4.1-0.6-6.9-5.4-9.1c0,0-32.1-13.3-34.3-13.8c-1.9-0.4-5.2-0.2-6.6,0	c-1.5,0.2-3.1,0.8-3.5,4.2" class="st12"/><path d="M48.4,168.5L48.4,168.5L3.5,144.8c0,0-3-3.2,0-6.4" class="st12"/><path d="M53.4,144.7c0,2.5,4,2.2,3.6-0.1c-0.2-1.5-0.1-2.5,0.1-3.2c0.2-0.8,0.5-1.1,0.5-1.1" class="st12"/><path d="M57,144.6c0.2,0,6.7,3.5,12.3,6.7c2.3,1.3,4.5,2.5,6.1,3.4c1.2,0.7,2,1.1,2.2,1.3c1.3,0.8,1.6,2-0.9,2	c-0.9,0-1.4,0-2.8,0c-1.4,0-3.5,0-7.5,0c-2,0-4.4,0-7.3,0c-1.7,0-3.6,0-5.7,0" class="st12"/><path d="M53.7,146.8l3.4,1.8l5.2,2.8l6,3.3l5.7,3.1" class="st12"/><path d="M53.3,150.5l1.7,0.9l5.8,3.3l5.6,3.2" class="st12"/><path d="M53.5,154.8H54h6.9h7.4h7.1" class="st12"/><path d="M53.7,151.5H55h7.2h7" class="st12"/><path d="M53.4,148.7l3.7,0.1" class="st12"/><path d="M53.3,154.4l0.7,0.4l5.2,3.1" class="st12"/><path d="M15,127.1l9.4-11.7l7.5,19.4L15,127.1z" class="st12"/><path d="M90.6,140.3h15.9h0" class="st12"/><path d="M88.1,153.4h-3.5c-0.4,0-0.8-0.2-1-0.5c-1.3-1.6-0.5-6.2,4.8-6.2c6.4,0,17.7,0.1,17.7,0.1" class="st12"/><path d="M72.9,147.8l10.4,5.2" class="st12"/><path d="M106.4,33.2c2.1-1.1,5.2-2.6,6.3-3.2c2.2-1.2,4,1,1.2,2.5c-1.7,0.9-2.8,1.3-6.5,3.3	C105.7,36.7,104.2,34.4,106.4,33.2L106.4,33.2z" class="st3"/><path d="M99.5,36.7c2.1-1.1,0.7-0.3,1.8-0.9c2.2-1.2,4,1.1,1.2,2.5c-1.7,0.9,1.7-0.9-2,1C98.7,40.2,97.3,37.9,99.5,36.7	z" class="st3"/></svg>
\ No newline at end of file
diff --git a/assets/images/product-illustrations/folder-with-papers.svg b/assets/images/product-illustrations/folder-with-papers.svg
new file mode 100644
index 000000000000..c0c35bc9b4ba
--- /dev/null
+++ b/assets/images/product-illustrations/folder-with-papers.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="161" height="101" fill="none" viewBox="0 0 161 101"><path fill="#FFD7B0" d="M45.6447 15.7813C45.6447 15.7813 40.2699 16.0432 38.4358 19.5997C36.6017 23.1533 18.6432 72.7932 18.6432 72.7932L11.6951 91.7515C11.6951 91.7515 8.8121 97.2813 7.23877 97.939H120.622L132.942 93.5819L137.102 82.2634L151.479 40.5938C151.479 40.5938 152.738 39.0849 151.82 38.0313C150.901 36.9777 145.396 25.3914 145.396 25.3914L119.968 25.1295L121.802 19.9956C121.802 19.9956 121.932 15.9152 117.606 15.6503C113.28 15.3884 45.6417 15.7813 45.6417 15.7813H45.6447Z"/><path fill="#FFC68C" d="M13.0702 88.9863L11.2361 93.7274L7.55615 98.1024L124.753 98.3345C124.753 98.3345 134.19 96.3583 134.321 89.3822L13.0702 88.9863Z"/><path fill="#FFA75A" d="M65.1088 12.7572L23.0317 12.5875C23.0317 12.5875 18.7413 12.4982 18.9013 17.031L19.0613 21.5637L37.5799 20.9804C37.5799 20.9804 41.7102 16.6352 42.4954 16.3405C43.2806 16.0429 65.1058 15.7155 65.1058 15.7155V12.7572H65.1088Z"/><path fill="#FFED8F" d="M16.5928 34.5252C16.5928 34.5252 15.2358 29.6086 12.0239 24.6354C12.0239 24.6354 14.9721 21.3764 23.8224 20.7842C32.6699 20.1919 38.0773 21.0818 38.0773 21.0818L31.3928 38.7574L22.4269 62.1413L19.2358 41.0639L16.5958 34.5282L16.5928 34.5252Z"/><path fill="#FFFAF0" d="M122.229 18.5787L121.737 20.9477L109.055 61.8287L113.186 59.2602L114.922 63.7691L118.593 60.5429L120.231 64.9537L123.509 61.8257C123.509 61.8257 125.002 65.9894 124.803 66.0906C124.605 66.1918 129.014 62.8138 129.014 62.8138L130.329 68.0608L134.32 63.9983L135.731 69.3644C135.731 69.3644 139.746 65.5132 139.594 65.6263C139.443 65.7394 140.851 70.9418 140.851 70.9418L156.537 25.6858C156.537 25.6858 159.485 18.8733 151.621 18.7721C143.757 18.6739 122.226 18.5757 122.226 18.5757L122.229 18.5787Z"/><path fill="#FFF2B2" d="M65.1084 15.7157H104.137C104.137 15.7157 105.316 7.32288 107.085 3.37348C107.085 3.37348 102.465 4.26336 99.6121 6.53419L96.7617 2.48657L91.061 6.93002L86.2432 2.98062L81.4254 6.53419L77.4936 3.07883L72.8743 7.02824L68.5484 3.47467C68.5484 3.47467 65.9914 6.23955 65.1084 15.7187V15.7157Z"/><path fill="#002140" d="M11.5291 92.3435C11.5291 92.3435 6.51576 92.9358 6.41798 86.5161C6.41798 86.5161 1.69799 92.6381 4.05947 97.0816C7.59725 100.537 11.5321 94.2185 11.5321 92.3405L11.5291 92.3435Z"/><path fill="#FFA75A" d="M8.28731 82.4688C8.28731 82.4688 5.14065 88.195 7.50213 90.4688C9.86065 92.7396 11.5318 92.3438 11.5318 92.3438L22.4444 63.0164C22.4444 63.0164 20.7732 49.3885 20.1836 48.1057C20.1836 48.1057 17.1347 69.8319 8.28731 82.4718V82.4688Z"/><path stroke="#002140" stroke-linecap="round" stroke-linejoin="round" d="M11.5704 92.1501C11.5704 92.1501 9.76887 98.0756 6.56591 98.0756C3.07554 97.9715 2.4711 94.6024 3.85481 91.1024C5.92592 85.037 19.1792 66.2989 20.2222 47.031"/><path stroke="#002140" stroke-linecap="round" stroke-linejoin="round" d="M7.5972 83.6561C7.5972 83.6561 3.51719 91.8614 11.6031 92.1531C11.6031 92.1531 34.9039 29.0519 37.5557 21.6472C39.7187 15.4597 45.5202 15.7216 45.5202 15.7216H117.485C123.088 15.7216 121.908 20.165 121.908 20.165L120.139 25.2007"/><path stroke="#002140" stroke-linecap="round" stroke-linejoin="round" d="M6.59863 98.0757H123.973C123.973 98.0757 131.345 97.7781 134 90.9656C136.655 84.1531 154.779 30.6352 156.347 26.6799C157.914 22.7245 157.325 18.6769 151.031 18.6769C145.526 18.4805 122.128 18.6769 122.128 18.6769"/><path stroke="#002140" stroke-linecap="round" stroke-linejoin="round" d="M19.0643 21.5638C19.011 20.9685 18.9487 20.4001 18.8776 19.8673C18.8776 19.8673 17.4999 12.5608 23.2036 12.5608C28.3147 12.5608 44.8332 12.7572 44.8332 12.7572H65.1088"/><path stroke="#002140" stroke-linecap="round" stroke-linejoin="round" d="M12.7852 89.189H134.492"/><path stroke="#002140" stroke-linecap="round" stroke-linejoin="round" d="M37.5588 20.9537C37.5588 20.9537 22.3203 18.287 11.8018 24.6084C11.8018 24.6084 20.5247 37.0965 22.4684 62.7126"/><path stroke="#002140" stroke-linecap="round" stroke-linejoin="round" d="M21.7812 25.9389C21.7812 25.9389 29.645 23.5698 36.1338 25.049"/><path stroke="#002140" stroke-linecap="round" stroke-linejoin="round" d="M22.4688 30.1979C22.4688 30.1979 28.851 28.2753 34.8599 28.9747"/><path stroke="#002140" stroke-linecap="round" stroke-linejoin="round" d="M23.499 34.4539C23.499 34.4539 28.0946 33.07 33.1583 33.0789"/><path stroke="#002140" stroke-linecap="round" stroke-linejoin="round" d="M24.4185 38.6681C24.4185 38.6681 27.6007 37.7098 31.5859 37.3914"/><path stroke="#002140" stroke-linecap="round" stroke-linejoin="round" d="M25.4668 42.7812C25.4668 42.7812 27.3186 42.2217 29.9675 41.8169"/><path stroke="#002140" stroke-linecap="round" stroke-linejoin="round" d="M26.3853 46.793C26.3853 46.793 27.1823 46.552 28.4771 46.2722"/><path stroke="#002140" stroke-linecap="round" stroke-linejoin="round" d="M120.139 25.2009L108.93 61.5968"/><path stroke="#002140" stroke-linecap="round" stroke-linejoin="round" d="M140.937 71.2546L139.44 65.7427L135.837 69.7754L134.403 64.326L130.125 68.2516L129.011 62.82L124.664 66.5105L123.769 61.6683L120.228 64.9599L118.59 60.4153L114.785 64.1653L113.15 59.1653L108.889 61.8022"/><path stroke="#002140" stroke-linecap="round" stroke-linejoin="round" d="M65.1084 15.7157C65.1084 15.7157 65.3691 8.07875 68.5158 3.20673L72.9721 7.02518L77.4936 2.81089L81.4906 6.7603L86.2106 2.67994L90.741 6.92994C90.741 6.92994 96.5395 2.03113 96.741 2.29601C96.9425 2.56089 99.4491 6.37042 99.4491 6.37042C99.4491 6.37042 103.511 3.2097 107.446 3.2097"/><path stroke="#002140" stroke-linecap="round" stroke-linejoin="round" d="M104.042 15.7157C104.042 15.7157 104.302 8.07881 107.449 3.20679"/><path stroke="#002140" stroke-linecap="round" stroke-linejoin="round" d="M71.4668 9.75732H90.5394"/><path stroke="#002140" stroke-linecap="round" stroke-linejoin="round" d="M70.8125 13.052H97.3547"/><path stroke="#002140" stroke-linecap="round" stroke-linejoin="round" d="M117.215 53.2395L139.432 58.5728"/><path stroke="#002140" stroke-linecap="round" stroke-linejoin="round" d="M119.967 44.5491L142.184 49.8824"/><path stroke="#002140" stroke-linecap="round" stroke-linejoin="round" d="M122.522 38.2305L143.363 43.168"/><path stroke="#002140" stroke-linecap="round" stroke-linejoin="round" d="M123.9 33.293L144.741 38.2305"/><path stroke="#002140" stroke-linecap="round" stroke-linejoin="round" d="M125.375 28.3555L146.216 33.293"/></svg>
\ No newline at end of file
diff --git a/assets/images/product-illustrations/todd-with-phones.svg b/assets/images/product-illustrations/todd-with-phones.svg
new file mode 100644
index 000000000000..21ee5a015820
--- /dev/null
+++ b/assets/images/product-illustrations/todd-with-phones.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" id="Layer_1" x="0" y="0" version="1.1" viewBox="0 0 176 178" style="enable-background:new 0 0 176 178" xml:space="preserve"><style type="text/css">.st1{fill:#ff7101}.st2{fill:#003c73}.st3{fill:#002140}.st4{fill:#03d47c}.st5{fill:#0164bf}.st6{fill:#f68dfe}.st7{fill:#d18000}.st8{fill:#fffaf0}.st9{fill:#50eef6}.st10{stroke-width:.9999}.st10,.st11,.st12{fill:none;stroke:#002140;stroke-linecap:round;stroke-miterlimit:10}.st11{stroke-width:.9432}.st12{stroke-width:1.8998}.st13{fill:#fff2b2}.st14{fill:none;stroke:#002140;stroke-width:.9999;stroke-linecap:round;stroke-linejoin:round}</style><g><defs><rect id="SVGID_1_" width="176" height="178"/></defs><clipPath id="SVGID_00000018218354771073572940000008642713263941723026_"><use xlink:href="#SVGID_1_" style="overflow:visible"/></clipPath><g style="clip-path:url(#SVGID_00000018218354771073572940000008642713263941723026_)"><path d="M164.519,110.724c3.129,2.721,4.543,7.634,3.696,12.401l-0.079-0.013c0-0.494-0.471-0.882-0.957-0.999 c-0.483-0.119-0.992-0.046-1.491-0.043c-0.499,0.003-1.041-0.091-1.379-0.456c-0.46-0.502-0.422-1.39-1.016-1.732 c-0.45-0.256-1.038-0.035-1.425,0.312c-0.383,0.347-0.654,0.806-1.046,1.146c-0.391,0.34-0.995,0.54-1.43,0.258l-0.256-0.05 c0.489-2.371-0.565-4.536-2.471-5.096c-0.049-0.016-0.095-0.028-0.141-0.041l0.031-0.101c-0.97-0.687-1.241-2.173-0.573-3.152 c0.54-0.793,1.619-1.379,1.54-2.335c-0.018-0.215-0.1-0.423-0.138-0.636c-0.166-0.898,0.55-1.856,1.463-1.963l0.044-0.215 C160.848,108.389,162.882,109.299,164.519,110.724z" class="st1"/><path d="M168.136,123.112l0.08,0.013c-0.351,1.972-1.088,3.919-2.252,5.676c-2.448,3.692-6.086,6.344-10.701,7.781 l-0.076-0.238c0.271-0.327,0.25-0.804,0.138-1.212c-0.115-0.406-0.31-0.793-0.351-1.214c-0.061-0.624,0.22-1.222,0.392-1.823 c0.174-0.604,0.207-1.334-0.243-1.772c-0.348-0.34-0.88-0.404-1.29-0.665c-0.601-0.383-0.854-1.224-0.562-1.868l-0.09-0.272 c0.67-0.213,1.323-0.496,1.949-0.867c2.403-1.419,3.643-3.318,4.007-5.103l0.255,0.05c0.435,0.282,1.039,0.082,1.43-0.258 c0.392-0.34,0.663-0.799,1.047-1.146c0.386-0.348,0.974-0.568,1.425-0.312c0.593,0.342,0.555,1.23,1.015,1.732 c0.338,0.365,0.88,0.459,1.379,0.456c0.499-0.003,1.008-0.076,1.492,0.043C167.666,122.23,168.134,122.618,168.136,123.112z" class="st1"/><path d="M162.554,56.409c1.474,0,2.167,1.192,1.54,2.652l-6.541,15.276l-0.135,0.008 c-0.932-1.668-5.227-9.363-5.882-10.55c-0.734-1.336-1.722-1.823-3.228-1.009c-1.505,0.816-0.706,2.829-0.706,2.829l6.198,11.346 l-0.008,0.005l-0.874-1.468c0,0-1.446-2.363-5.055-2.363h-9.758v-0.193l5.946-13.881c0.624-1.46,2.341-2.652,3.812-2.652H162.554z M162.516,59.868c0.366-0.857-0.036-1.549-0.9-1.549c-0.865,0-1.863,0.692-2.231,1.549c-0.366,0.857,0.036,1.552,0.9,1.552 C161.15,61.419,162.148,60.724,162.516,59.868z M160.669,64.178c0.368-0.857-0.036-1.549-0.9-1.549 c-0.865,0-1.863,0.692-2.229,1.549c-0.368,0.857,0.036,1.552,0.901,1.552C159.305,65.729,160.303,65.035,160.669,64.178z M157.911,59.868c0.366-0.857-0.036-1.549-0.9-1.549c-0.865,0-1.863,0.692-2.231,1.549c-0.366,0.857,0.036,1.552,0.9,1.552 C156.545,61.419,157.543,60.724,157.911,59.868z" class="st2"/><path d="M161.615,58.318c0.865,0,1.266,0.692,0.901,1.549c-0.369,0.857-1.367,1.552-2.231,1.552 c-0.865,0-1.267-0.695-0.901-1.552C159.753,59.011,160.75,58.318,161.615,58.318z" class="st3"/><path d="M159.769,62.629c0.865,0,1.269,0.692,0.9,1.549c-0.366,0.857-1.363,1.552-2.228,1.552 c-0.865,0-1.269-0.695-0.9-1.552C157.906,63.321,158.904,62.629,159.769,62.629z" class="st3"/><path d="M158.891,108.009l-0.044,0.215c-0.913,0.107-1.629,1.065-1.463,1.963c0.039,0.213,0.12,0.421,0.138,0.636 c0.08,0.956-1,1.542-1.54,2.335c-0.667,0.979-0.396,2.465,0.573,3.152l-0.03,0.101c-3.444-1.019-5.536-1.803-4.646-5.687 C152.447,108.245,155.56,107.362,158.891,108.009z" class="st1"/><path d="M132.91,143.23c-1.034,2.536-1.937,4.756-2.663,6.546c-1.231,3.03-1.962,4.825-1.962,4.825 s-0.059,0.193-0.187,0.507c-0.555,1.359-2.402,4.982-6.316,4.982c-3.272,0-4.812-1.597-5.531-2.943l-0.016-0.01 c0.323-0.556,0.63-1.091,0.919-1.608c1.831-3.265,3.126-5.915,4.786-9.261l-0.038-0.018c0,0,0.289-0.708,0.803-1.965 c0.762-1.866,2.021-4.944,3.564-8.717c0.655-1.61,1.366-3.344,2.11-5.167c0.596-1.46,1.213-2.974,1.847-4.523 c0.417-1.024,0.844-2.066,1.272-3.116c5.032-12.317,10.56-25.868,12.594-30.891h0.002c0.318-0.791,0.553-1.369,0.683-1.699 c1.807-4.533-2.65-4.145-2.65-4.145h-8.713c0,0-0.358-0.046-0.783-0.213c-0.619-0.241-1.384-0.748-1.384-1.757 c0-1.699,0.903-2.325,2.438-2.325h1.458c-0.361-0.061-2.1-0.434-2.1-1.957c0-1.701,0.903-2.327,2.438-2.327h4.423V77.43h-2.901 c0,0-2.167-0.269-2.167-1.967c0-0.479,0.072-0.872,0.207-1.192c0.351-0.811,1.129-1.136,2.231-1.136h10.589 c3.609,0,5.055,2.363,5.055,2.363l0.875,1.468l0.007-0.005l-6.198-11.346c0,0-0.798-2.013,0.706-2.829 c1.507-0.814,2.494-0.327,3.228,1.009c0.655,1.187,4.95,8.881,5.882,10.55l0.179,0.319c0,0,1.686,3.042,0.422,6.501 c-0.709,1.94-9.959,24.76-17.954,44.455c-1.194,2.938-2.358,5.806-3.464,8.523C135.263,137.439,134.012,140.515,132.91,143.23z" class="st4"/><path d="M157.011,58.318c0.864,0,1.266,0.692,0.9,1.549c-0.368,0.857-1.366,1.552-2.231,1.552 c-0.864,0-1.266-0.695-0.9-1.552C155.148,59.011,156.146,58.318,157.011,58.318z" class="st3"/><path d="M155.123,130.323c0.45,0.438,0.417,1.168,0.243,1.772c-0.172,0.601-0.453,1.199-0.392,1.823 c0.041,0.421,0.236,0.809,0.351,1.214c0.112,0.408,0.133,0.885-0.138,1.212l0.076,0.238c-1.427,0.449-2.949,0.779-4.558,0.987 c-2.584,0.334-5.59,0.01-8.297-0.586l0.069-0.304c0.711-0.292,0.873-1.22,0.783-1.978c-0.087-0.755-0.315-1.554,0-2.249 c0.312-0.694,1.09-1.087,1.438-1.764c0.529-1.032-0.1-2.252-0.716-3.235l0.056-0.284c2.53,0.758,6.001,1.351,9.143,0.35 l0.089,0.271c-0.291,0.644-0.038,1.486,0.563,1.868C154.243,129.92,154.775,129.983,155.123,130.323z" class="st1"/><path d="M144.281,56.409h3.581c-1.471,0-3.187,1.192-3.811,2.652l-5.946,13.881v0.193h-0.831 c-1.103,0-1.88,0.325-2.231,1.136l-0.921-0.388l6.347-14.822C141.093,57.601,142.81,56.409,144.281,56.409z" class="st5"/><path d="M142.127,86.027c0,0,4.456-0.388,2.65,4.145c-0.13,0.33-0.366,0.908-0.683,1.699h-0.003l-0.066-0.028h-11.338 c-0.138,0-0.269-0.01-0.394-0.03c-1.197-0.195-1.714-1.301-1.146-2.622l1.363-3.184l0.121-0.193 c0.424,0.167,0.782,0.213,0.782,0.213H142.127z" class="st2"/><path d="M143.982,127.453c0.617,0.983,1.246,2.203,0.716,3.235c-0.348,0.677-1.125,1.07-1.437,1.764 c-0.315,0.695-0.087,1.494,0,2.249c0.089,0.758-0.072,1.686-0.783,1.978l-0.069,0.304c-1.643-0.36-3.172-0.821-4.434-1.293 l-0.074,0.043c-0.552-0.941-1.01-1.476-1.01-1.476l-0.289-0.114c1.105-2.718,2.269-5.585,3.463-8.523l0.348,0.139 c0,0,1.471,0.766,3.625,1.41L143.982,127.453z" class="st1"/><path d="M139.903,77.43v0.018h-4.423c-1.535,0-2.438,0.626-2.438,2.327c0,1.524,1.74,1.896,2.1,1.957h-1.458 c-1.535,0-2.438,0.626-2.438,2.325c0,1.009,0.765,1.516,1.384,1.757l-0.12,0.193l-1.364,3.184 c-0.567,1.321-0.051,2.426,1.147,2.622v0.03h-3.188c-1.473,0-2.167-1.194-1.54-2.652l6.557-15.308l0.921,0.388 c-0.136,0.32-0.208,0.712-0.208,1.192c0,1.699,2.167,1.967,2.167,1.967H139.903z" class="st5"/><path d="M137.9,135.733c0.96,1.63,2.208,4.483,1.868,7.9l-0.136-0.005c-0.309,0.794-1.169,1.286-2.023,1.362 c-0.857,0.073-1.707-0.206-2.479-0.581c-0.752-0.368-1.461-0.829-2.221-1.179c1.103-2.715,2.354-5.791,3.692-9.087l0.289,0.115 C136.89,134.258,137.348,134.792,137.9,135.733z" class="st1"/><path d="M139.632,143.628l0.136,0.005c-0.115,1.172-0.42,2.411-0.983,3.689c-1.629,3.692-4.387,5.646-6.677,6.676 l-0.15-0.34c0.232-1.417-0.374-2.936-1.523-3.813l-0.189-0.069c0.727-1.79,1.63-4.011,2.663-6.546 c0.76,0.35,1.469,0.811,2.221,1.179c0.772,0.375,1.622,0.654,2.479,0.581C138.463,144.914,139.323,144.422,139.632,143.628z" class="st1"/><path d="M131.958,153.658l0.151,0.34c-2.149,0.963-3.886,1.11-3.886,1.11h-0.125c0.128-0.314,0.186-0.507,0.186-0.507 s0.732-1.795,1.963-4.825l0.189,0.069C131.585,150.722,132.191,152.241,131.958,153.658z" class="st1"/><path d="M131.382,122.717l0.115,0.045c-0.427,1.05-0.854,2.092-1.271,3.116c0.043-1.491-0.652-3.035-1.653-4.15 C130.315,122.199,131.382,122.717,131.382,122.717z" class="st1"/><path d="M128.574,121.728c1,1.115,1.696,2.659,1.652,4.15c-0.634,1.549-1.251,3.063-1.847,4.523 c-0.278-0.089-2.791-0.854-5.932,0.168c-1.916,0.623-4.068,1.914-6.089,4.431l-0.112-0.086c0.013-0.783-0.801-1.965-1.525-2.279 c-0.724-0.315-1.545-0.53-2.047-1.136c-0.411-0.499-0.537-1.192-0.967-1.681c-0.66-0.748-1.803-0.791-2.803-0.745l-0.146-0.084 c1.517-2.599,3.673-4.515,5.945-5.816c2.042-1.171,4.178-1.843,6.027-2.069C123.823,120.726,126.622,121.2,128.574,121.728z" class="st1"/><path d="M128.379,130.401c-0.745,1.823-1.456,3.557-2.111,5.167l-0.14-0.056c0.301-1.447-0.197-3.034-1.277-4.056 c-0.629-0.593-1.532-1.007-2.361-0.758l-0.044-0.129C125.588,129.547,128.1,130.312,128.379,130.401z" class="st1"/><path d="M126.128,135.512l0.141,0.056c-1.543,3.773-2.801,6.851-3.564,8.717l-0.13-0.036 c0.092-0.793,0.025-1.607-0.202-2.373c-0.302-1.034-0.906-1.998-1.786-2.626c-0.88-0.629-2.049-0.89-3.088-0.581 c-0.667,0.2-1.246,0.614-1.885,0.887c-0.64,0.274-1.425,0.391-2.003,0.005l-0.118-0.065c0.43-0.756,0.855-1.489,1.277-2.196 c0.516-0.862,1.049-1.625,1.588-2.3c2.021-2.517,4.173-3.808,6.089-4.431l0.043,0.129c0.829-0.249,1.732,0.165,2.362,0.758 C125.931,132.478,126.43,134.065,126.128,135.512z" class="st1"/><path d="M122.574,144.249l0.13,0.036c-0.514,1.257-0.803,1.965-0.803,1.965l0.038,0.017 c-1.66,3.347-2.954,5.997-4.786,9.262l-0.228-0.124c-0.892-2.241-3.315-3.788-5.745-3.664c-0.653,0.033-1.303,0.175-1.957,0.14 c-0.655-0.033-1.349-0.289-1.681-0.85l-0.23-0.124c0.744-1.361,1.491-2.756,2.235-4.15c0.704-1.321,1.407-2.642,2.106-3.933 c0.619-1.138,1.233-2.254,1.839-3.328l0.118,0.065c0.578,0.386,1.363,0.269,2.003-0.005c0.64-0.273,1.218-0.687,1.885-0.887 c1.039-0.309,2.208-0.048,3.088,0.581c0.88,0.628,1.484,1.592,1.786,2.626C122.599,142.642,122.666,143.456,122.574,144.249z" class="st1"/><path d="M116.926,155.405l0.227,0.124c-0.289,0.517-0.596,1.052-0.918,1.608c-0.809,1.399-1.73,2.933-2.819,4.682 c-1.533,2.465-3.175,4.709-5.035,6.661l-0.315-0.289c-0.04-1.453-1.141-2.812-2.563-3.164c-0.734-0.186-1.617-0.17-2.087-0.759 c-0.466-0.583-0.259-1.44-0.469-2.155c-0.197-0.677-0.808-1.217-1.506-1.333l-0.133-0.107c1.606-1.949,2.773-4.094,3.891-6.011 c0.488-0.839,0.979-1.704,1.471-2.589c0.215-0.385,0.427-0.775,0.642-1.166l0.23,0.124c0.333,0.561,1.026,0.817,1.681,0.85 c0.655,0.035,1.304-0.107,1.957-0.14C113.61,151.617,116.033,153.164,116.926,155.405z" class="st1"/><path d="M116.245,134.914l0.112,0.086c-0.539,0.675-1.071,1.438-1.588,2.3c-0.422,0.707-0.847,1.44-1.277,2.196 c-0.606,1.075-1.22,2.19-1.839,3.328l-0.2-0.106c-1.312-0.467-2.788-0.474-4.108-0.02l-0.092,0.033 c-0.179-0.583-0.328-1.205-0.443-1.864c-0.33-1.876-0.376-4.046,0.013-6.43c0.338-2.073,1.021-3.884,1.934-5.448l0.146,0.084 c1-0.046,2.144,0,2.804,0.745c0.429,0.489,0.555,1.182,0.967,1.681c0.501,0.606,1.322,0.821,2.046,1.136 C115.444,132.949,116.258,134.131,116.245,134.914z" class="st1"/><path d="M95.838,55.58L95.7,55.167c2.571-0.806,4.247-2.371,4.29-5.205h0.123c0.806,0.231,1.599,0.461,2.387,0.692 c2.515,0.738,4.958,1.483,7.434,2.193c1.99,0.57,4.004,1.118,6.094,1.623c3.586,0.865,4.587,3.641-0.023,4.683 c-3.387,0.766-5.805,1.268-8.138,1.681c-2.394,0.429-4.702,0.766-7.877,1.212c-1.195,0.167-2.435,0.319-3.582-0.048 c-1.146-0.37-2.625-1.544-2.796-2.725c-0.118-0.801-0.241-2.624,1.926-3.58C95.626,55.654,95.728,55.616,95.838,55.58z" class="st4"/><path d="M114.68,122.983l0.023,0.19c-2.272,1.301-4.429,3.217-5.946,5.816c-0.913,1.564-1.596,3.375-1.934,5.449 c-0.388,2.383-0.342,4.553-0.012,6.429l-0.077,0.013l-0.241,11.097l0.177,0.096c-0.491,0.885-0.982,1.75-1.471,2.589 c-1.118,1.917-2.285,4.062-3.891,6.011c-2.17,2.637-5.142,4.916-9.885,5.789c-1.507,0.276-3.195,0.41-5.093,0.37 c-1.655-0.036-3.205-0.244-4.651-0.591c-3.779-0.913-6.859-2.804-9.345-5.2c-1.21-1.169-2.279-2.457-3.218-3.811l0.179-0.124 l1.566-10.975v-0.239h13.032c0,0,2.034-0.251,2.162-1.815l0.276,0.023h2.622c1.596,0,2.346-1.293,1.671-2.873l-12.73-29.722 l0.31-0.129c2.53-1.443,4.566-3.707,5.147-5.484c-0.542,2.239-2.256,11.275,4.334,11.186c5.51-0.074,5.656-7.094,5.557-9.391 c0.212,2.307,1.328,9.289,6.994,8.316c4.605-0.984,3.342-5.547,2.71-9.931c1.102,4.371,4.543,8.268,8.401,7.107l0.084,0.261 L114.68,122.983z" class="st4"/><path d="M93.239,107.687c0.1,2.297-0.046,9.317-5.556,9.391c-6.59,0.089-4.876-8.947-4.334-11.186 c-0.581,1.777-2.617,4.041-5.147,5.484l-0.31,0.129l-1.251-2.921c-0.678-1.579-2.538-2.872-4.131-2.872h-3.837v-0.14 c0.867-2.304,2.397-4.244,2.397-4.244c0.102-0.197-5.631,3.144-10.376,3.144c-2.118,0-4.037-0.664-5.155-2.606 c-0.159-0.304-0.289-0.594-0.397-0.865c-2.351-5.968,6.923-4.449,9.427-7.188h0.09c0.01,0.226,0.041,0.464,0.09,0.715 c0.903,4.652,6.772,3.4,6.772,3.4s5.042-0.877,8.997-4.452c-0.962,0.9-7.112,6.955-0.599,9.105c5.416,1.79,8.667-5.19,9.749-7.964 c-0.45,2.505-0.361,11.097,5.329,10.38c5.597-0.715,4.694-5.279,3.612-10.737c1.988,7.408,7.194,9.609,10.197,6.792l0.005,0.008 c1.985,4.654,9.57,7.248,4.244,11.274c-0.576,0.398-1.149,0.677-1.711,0.845c-3.858,1.161-7.299-2.736-8.402-7.107 c0.632,4.384,1.896,8.947-2.709,9.931C94.567,116.977,93.451,109.994,93.239,107.687z M93.239,107.682 c-0.021-0.449-0.049-0.715-0.049-0.715S93.198,107.236,93.239,107.682z" class="st6"/><path d="M70.758,61.206l0.345,0.061c0.755,3.228,3.791,5.365,5.549,8.184c1.435,2.3,1.924,4.911,1.913,7.538h-0.092 c-1.716,2.774-6.347,5.841-10.215,4.422c2.487-0.522,4.572-2.239,4.733-4.751c-2.297,1.967-5.551,2.411-8.332,1.207 c1.512-0.038,2.993-0.743,3.97-1.889c0.969-1.141,1.425-2.7,1.213-4.178h-0.028c-4.106,1.737-9.47-0.872-10.599-5.154 c-0.711-2.698,0.087-5.53,0.271-8.313c0.243-3.707-0.645-7.477-2.52-10.694c-1.566-2.685-3.794-4.987-5.019-7.842 c-2.141-4.987-0.586-11.288,3.64-14.733c2.638-2.15,6.004-3.156,9.189-4.381c3.185-1.227,6.439-2.862,8.227-5.748 c1.476-2.386,1.765-5.342,3.2-7.751c2.494-4.183,7.836-5.773,12.732-6.006C94.15,0.931,99.691,1.95,103.608,5.37 c3.909,3.413,5.398,10.035,2.507,14.33l0.054,0.035c3.535,0.55,6.513,3.628,6.917,7.152c0.389,3.397-1.369,6.643-3.157,9.566 c-1.786,2.926-3.645,5.727-3.916,8.144l-0.18-0.005c0.057-1.869,0.1-3.583,0.141-5.279c0.379-0.679,0.578-1.481,0.578-2.414 c0-0.865-0.176-1.658-0.511-2.368c-0.057-0.122-0.118-0.241-0.182-0.355l0.248-0.076c0.013-0.464,0.026-0.936,0.041-1.417 c0.056-1.856,0.11-3.74-0.327-5.545c-0.435-1.808-1.43-3.56-3.04-4.513l-0.025-0.056c-4.917,2.262-10.443,3.055-15.866,3.552 c-2.975,0.271-6.055,0.492-8.695,1.879c-3.149,1.653-5.347,4.967-5.625,8.486c-0.282,3.529,1.22,6.919,2.356,10.273 c1.138,3.357,1.89,7.185,0.23,10.319C74.193,58.896,72.582,60.182,70.758,61.206z" class="st7"/><path d="M111.454,142.718l0.199,0.107c-0.698,1.29-1.402,2.611-2.105,3.932l-0.287-0.15 c-0.795-0.938-1.512-2.256-2.008-3.876l0.092-0.033C108.665,142.244,110.141,142.252,111.454,142.718z" class="st1"/><path d="M110.586,48.37c0.1,0.449,0.151,0.938,0.151,1.476c0,1.181-0.279,2.147-0.782,2.931l-0.021,0.071 c-2.476-0.71-4.919-1.455-7.434-2.193l0.02-0.063h3.52l-4.303-3.162l-0.025-0.048c0.972-1.189,2.456-1.95,4.119-1.95 c1.082,0,2.087,0.322,2.924,0.872C109.535,46.818,110.169,47.53,110.586,48.37z" class="st3"/><path d="M80.576,93.423c-0.018,0.018-0.038,0.036-0.059,0.053c-3.955,3.575-8.997,4.452-8.997,4.452 s-5.868,1.253-6.772-3.4c-0.049-0.251-0.079-0.489-0.09-0.717c-0.197-3.998,5.175-4.576,8.667-5.456 c3.804-0.961,4.344-3.633,4.415-4.533h0.038c-0.02,0.677,0.077,1.344,0.417,1.919c0.514,0.88,1.517,1.344,2.476,1.706 c6.007,2.264,12.758,2.543,18.933,0.776c0.8-0.228,1.703-0.606,1.91-1.405c0.095-0.37,0.016-0.761-0.066-1.133 c-0.082-0.385-0.189-0.801-0.304-1.247l0.079-0.02c1.988,7.246,11.105,9.931,8.667,15.212c-0.312,0.565-0.68,1.042-1.087,1.422 c-3.003,2.817-8.209,0.616-10.197-6.792c1.082,5.459,1.985,10.022-3.612,10.737c-5.689,0.717-5.779-7.875-5.329-10.38 c-1.082,2.774-4.334,9.754-9.749,7.964c-6.513-2.15-0.363-8.205,0.599-9.105C80.54,93.456,80.561,93.438,80.576,93.423z" class="st6"/><path d="M99.844,48.372c-0.348-1.605-1.292-2.667-2.653-3.364c0.824,0.251,1.763,0.38,3.403,0.185 c2.361-0.279,4.021-0.431,5.362-0.231c1.087,0.162,1.959,0.558,2.824,1.306l-0.025,0.035c-0.837-0.55-1.842-0.872-2.924-0.872 c-1.663,0-3.147,0.761-4.119,1.95l0.025,0.048l4.303,3.161h-3.52l-0.02,0.063c-0.788-0.231-1.581-0.461-2.387-0.69H99.99 c0-0.041,0-0.081,0-0.119c0-0.535-0.051-1.024-0.148-1.473H99.844z" class="st8"/><path d="M95.181,44.29c-1.706-0.413-3.758-0.53-5.963-0.53c-5.951,0-10.775,0.743-10.775,6.085 c0,4.711,4.825,6.085,10.775,6.085c1.458,0,2.847-0.071,4.116-0.249c0.849-0.119,1.642-0.286,2.366-0.515l0.138,0.413 c-0.11,0.035-0.212,0.074-0.299,0.112c-2.167,0.956-2.044,2.779-1.926,3.58c0.171,1.181,1.65,2.355,2.796,2.725 c1.146,0.368,2.387,0.215,3.581,0.048c3.174-0.446,5.482-0.783,7.876-1.212l0.105,0.573c0.169,2.442,0.341,4.886,0.509,7.33 c0.233,3.354,0.318,7.142-2.031,9.571c-1.532,1.587-3.783,2.198-6.04,2.241v0.109c0.133,1.402,0.458,2.68,0.737,3.78 c0.115,0.446,0.223,0.862,0.304,1.247c0.082,0.373,0.162,0.763,0.067,1.133c-0.207,0.799-1.11,1.176-1.911,1.405 c-6.176,1.767-12.927,1.488-18.933-0.776c-0.959-0.362-1.962-0.826-2.476-1.706c-0.34-0.576-0.437-1.242-0.417-1.919 c0.015-0.434,0.077-0.867,0.161-1.283c0.353-1.785,0.617-3.671,0.624-5.55c0.01-2.627-0.478-5.238-1.913-7.538 c-1.757-2.819-4.794-4.957-5.549-8.184l-0.345-0.061c1.824-1.024,3.436-2.31,4.398-4.128c1.66-3.134,0.908-6.962-0.23-10.319 c-1.136-3.354-2.638-6.744-2.356-10.273c0.279-3.519,2.476-6.833,5.626-8.486c2.64-1.387,5.72-1.608,8.695-1.879 c5.423-0.497,10.949-1.291,15.866-3.552l0.026,0.056c1.609,0.953,2.604,2.705,3.039,4.513c0.437,1.805,0.384,3.689,0.327,5.545 c-0.015,0.482-0.028,0.953-0.041,1.417l-0.248,0.076c-1.361-2.401-4.638-3.785-9.102-3.785c-5.95,0-10.159,2.459-10.159,6.151 c0,4.095,4.208,6.019,10.159,6.019c1.497,0,2.863-0.099,4.065-0.314c2.489-0.441,4.29-1.374,5.152-2.933 c-0.041,1.696-0.084,3.41-0.14,5.279l0.179,0.005l-0.057,0.365c-1.34-0.2-3-0.048-5.362,0.231 c-1.639,0.195-2.578,0.066-3.402-0.185c-0.003,0-0.005-0.003-0.005-0.003c-0.591-0.302-1.264-0.535-2-0.712 C95.186,44.293,95.185,44.292,95.181,44.29z M105.381,71.53c0,0-4.787-6.354-7.856-6.262c-2.274,0.066-2.852,0.928-2.886,0.981 c0.018-0.114,0.509-3.004-3.344-3.577c-4.426-0.657-8.399,0.089-8.399,0.089c0.005,0.02,0.015,0.089,0.036,0.203 c0.233,1.326,1.717,8.602,8.452,10.626C98.632,75.767,105.327,71.51,105.381,71.53z" class="st4"/><path d="M108.067,168.191l0.314,0.289c-3.415,3.582-7.572,6.186-13.172,7.37l-0.015-0.251 c0.095-1.296-0.532-2.621-1.599-3.377c-0.558-0.396-1.233-0.654-1.668-1.179c-0.504-0.611-0.586-1.481-0.402-2.249 c0.087-0.37,0.23-0.73,0.269-1.11c0.038-0.378-0.046-0.799-0.34-1.045l-0.031-0.177c4.743-0.873,7.716-3.152,9.885-5.789 l0.133,0.107c0.698,0.117,1.31,0.657,1.507,1.333c0.209,0.715,0.002,1.572,0.468,2.156c0.471,0.588,1.353,0.573,2.087,0.758 C106.926,165.379,108.026,166.738,108.067,168.191z" class="st1"/><path d="M105.974,39.313c-0.862,1.559-2.663,2.492-5.152,2.933c-2.039-0.73-3.492-2.665-3.492-4.936v-0.089h5.508 l-4.306-3.162l-0.026-0.051c0.972-1.189,2.456-1.947,4.119-1.947c1.662,0,2.775,1.24,3.415,2.469 c0.335,0.71,0.511,1.503,0.511,2.368C106.552,37.833,106.353,38.634,105.974,39.313z" class="st3"/><path d="M105.859,34.177c0.063,0.114,0.125,0.233,0.181,0.355c-0.639-1.23-1.711-2.47-3.415-2.47 s-3.147,0.758-4.119,1.947l0.026,0.051l4.305,3.162h-5.508v0.089c0,2.272,1.453,4.206,3.492,4.936 c-1.202,0.215-2.568,0.314-4.065,0.314c-5.951,0-10.159-1.924-10.159-6.019c0-3.691,4.208-6.151,10.159-6.151 C101.22,30.391,104.498,31.776,105.859,34.177z" class="st8"/><path d="M99.993,49.845c0,0.038,0,0.079,0,0.117c-0.044,2.834-1.719,4.399-4.29,5.205 c-0.724,0.228-1.517,0.396-2.366,0.515l-0.005-0.046c-2.062-0.72-3.538-2.665-3.538-4.954v-0.091h5.505l-4.303-3.162l-0.025-0.048 c0.972-1.189,2.456-1.95,4.119-1.95c2.09,0,3.896,1.199,4.758,2.941c0.097,0.449,0.148,0.938,0.148,1.473H99.993z" class="st3"/><path d="M99.844,48.372c-0.862-1.742-2.668-2.941-4.758-2.941c-1.663,0-3.147,0.761-4.119,1.95l0.026,0.048 l4.303,3.162h-5.505v0.091c0,2.289,1.476,4.234,3.538,4.954l0.005,0.046c-1.269,0.177-2.658,0.248-4.116,0.248 c-5.95,0-10.775-1.374-10.775-6.085c0-5.342,4.825-6.085,10.775-6.085c2.205,0,4.257,0.117,5.963,0.53 c0,0,0.002,0.001,0.005,0.003c0.785,0.248,1.358,0.517,2.001,0.712c0,0,0,0.003,0.005,0.003 C98.553,45.705,99.497,46.767,99.844,48.372z" class="st8"/><path d="M94.639,66.249c0.033-0.053,0.611-0.915,2.886-0.981c3.07-0.091,7.857,6.262,7.857,6.262 c-14.539,0-22.303-8.59-22.303-8.59l-0.146,0.023c-0.021-0.114-0.031-0.182-0.036-0.203c0,0,3.973-0.745,8.399-0.089 C95.148,63.245,94.657,66.135,94.639,66.249z" class="st6"/><path d="M105.381,71.53c-0.054-0.02-6.749,4.237-13.996,2.059c-6.736-2.023-8.22-9.3-8.452-10.626l0.146-0.023 C83.078,62.94,90.843,71.53,105.381,71.53z" class="st6"/><path d="M95.194,175.599l0.015,0.251c-3.221,0.682-6.92,0.895-11.228,0.555c-1.97-0.154-3.799-0.459-5.498-0.882 l0.061-0.256c0.041,0,0.082-0.038,0.11-0.074c0.404-0.504,0.632-1.148,0.632-1.795c0.003-0.994-0.504-2.025-0.128-2.948 c0.376-0.916,1.461-1.321,2.07-2.102c0.445-0.571,0.611-1.346,0.435-2.049l0.015-0.058c1.445,0.347,2.996,0.555,4.651,0.591 c1.898,0.04,3.587-0.094,5.093-0.37l0.031,0.177c0.294,0.246,0.379,0.667,0.34,1.045c-0.038,0.38-0.182,0.74-0.269,1.11 c-0.184,0.768-0.102,1.638,0.402,2.249c0.435,0.525,1.11,0.783,1.668,1.179C94.662,172.977,95.288,174.303,95.194,175.599z" class="st1"/><path d="M90.622,141.227c0.675,1.58-0.074,2.873-1.671,2.873H86.33l-0.276-0.023c0-0.051,0.005-0.102,0.005-0.155 v-0.048h0.043c0.852-0.439,1.146-1.463,0.64-2.647l-13.981-32.643c-0.673-1.564-2.502-2.849-4.088-2.872h3.837 c1.594,0,3.454,1.293,4.132,2.872l1.251,2.921L90.622,141.227z" class="st5"/><path d="M86.742,141.227c0.507,1.184,0.212,2.208-0.64,2.647h-0.043c-0.018-1.663-0.918-2.277-2.438-2.277h-1.52 v-0.015c0,0,2.167-0.269,2.167-1.97s-0.903-2.325-2.438-2.325H68.721v-0.076l9.176-9.152c0,0,1.34-1.707,0.128-2.911 c-1.213-1.202-2.297-1.012-3.382,0.063c-1.085,1.075-10.284,9.898-10.86,10.451l-0.028-0.058 c-0.084-0.155-2.638-6.045-3.431-7.878c-0.317-0.94-0.993-1.648-1.896-1.719l0.008-0.164l-4.771-11.138l1.369-0.576 c0.396,0.928,1.479,1.681,2.415,1.681c0.936,0,1.374-0.753,0.975-1.681c-0.397-0.928-1.479-1.681-2.415-1.681 c-0.131,0-0.253,0.016-0.363,0.043l-0.473-1.351c0.936,0,1.371-0.753,0.975-1.681c-0.396-0.928-1.479-1.681-2.415-1.681 c-0.936,0-1.374,0.753-0.975,1.681l-1.133,0.477l-0.578-1.352c-0.678-1.579,0.072-2.872,1.668-2.872h15.958 c1.586,0.023,3.415,1.308,4.088,2.872L86.742,141.227z M59.504,120.706c0.936,0,1.374-0.753,0.977-1.681 c-0.397-0.928-1.479-1.681-2.415-1.681c-0.936,0-1.374,0.753-0.977,1.681C57.488,119.953,58.568,120.706,59.504,120.706z" class="st2"/><path d="M68.722,137.287H81.83c1.535,0,2.438,0.626,2.438,2.325s-2.167,1.97-2.167,1.97v0.015h1.52 c1.52,0,2.42,0.614,2.438,2.277v0.048c0,0.054-0.003,0.104-0.005,0.155c-0.128,1.564-2.162,1.815-2.162,1.815H45.79l-0.217-0.023 c0.105-1.049,0.189-2.122,0.258-3.209c0.015-0.264,0.033-0.53,0.049-0.796c0.125-2.092,0.473-3.667,0.885-4.835l0.018,0.005h9.66 c3.702,0,1.896-2.777,1.896-2.777s-1.264-2.682-2.075-4.383c-0.151-0.315-0.266-0.631-0.333-0.943 c-0.23-1.052,0.059-2.039,1.236-2.637c0.455-0.231,0.88-0.314,1.264-0.287c0.903,0.071,1.578,0.779,1.896,1.719 c0.793,1.833,3.346,7.723,3.431,7.875l0.028,0.061c0.576-0.553,9.806-9.406,10.86-10.451c1.054-1.044,2.169-1.265,3.382-0.063 c1.213,1.204-0.128,2.911-0.128,2.911l-9.176,9.152V137.287z" class="st4"/><path d="M78.545,175.267l-0.061,0.256c-5.27-1.313-9.291-3.783-12.405-6.567c0.895-0.243,1.658-0.938,1.967-1.807 c0.366-1.027,0.118-2.186,0.425-3.233c0.468-1.6,2.154-2.591,3.819-2.829l0.044-0.046c2.487,2.396,5.567,4.287,9.345,5.2 l-0.015,0.058c0.176,0.703,0.01,1.478-0.435,2.049c-0.609,0.781-1.693,1.186-2.07,2.102c-0.376,0.923,0.131,1.954,0.128,2.948 c0,0.647-0.228,1.291-0.632,1.795C78.627,175.229,78.586,175.267,78.545,175.267z" class="st1"/><path d="M72.334,161.041l-0.044,0.046c-1.665,0.238-3.351,1.229-3.819,2.829c-0.307,1.047-0.059,2.206-0.425,3.233 c-0.31,0.869-1.072,1.564-1.967,1.807c-3.981-3.557-6.472-7.628-8.191-10.448c-0.164-0.269-0.325-0.537-0.481-0.811l0.271-0.152 c0.228-0.36,0.563-0.654,0.954-0.829c1.026-0.459,2.21-0.084,3.313,0.144c1.103,0.231,2.466,0.206,3.09-0.725 c0.325-0.484,0.356-1.095,0.466-1.668c0.11-0.571,0.366-1.189,0.908-1.407l0.225-0.066c0.202,0.385,0.417,0.791,0.645,1.219 c0.548,1.027,1.159,2.039,1.837,3.017C70.054,158.584,71.123,159.872,72.334,161.041z" class="st1"/><path d="M60.693,104.472c4.746,0,10.478-3.341,10.376-3.144c0,0-1.53,1.94-2.397,4.244v0.14h-7.979V104.472z" class="st4"/><path d="M66.634,152.994l-0.225,0.066c-0.542,0.218-0.798,0.836-0.908,1.407c-0.11,0.573-0.141,1.184-0.466,1.668 c-0.624,0.931-1.988,0.956-3.09,0.725c-1.103-0.228-2.287-0.603-3.313-0.144c-0.391,0.175-0.727,0.469-0.954,0.829l-0.271,0.152 c-1.484-2.553-2.735-5.284-3.65-7.462l0.138-0.058c0.959,0.165,2.021,0.314,2.847-0.198c0.719-0.443,1.077-1.288,1.706-1.851 c0.443-0.398,1.003-0.641,1.499-0.973c0.496-0.33,0.732-0.555,0.801-1.144v-0.119h2.558v0.178 C63.961,147.449,64.69,149.269,66.634,152.994z" class="st1"/><path d="M60.748,145.892v0.119c-0.069,0.589-0.304,0.814-0.801,1.144c-0.496,0.332-1.056,0.575-1.499,0.973 c-0.629,0.563-0.987,1.408-1.706,1.851c-0.826,0.512-1.888,0.363-2.847,0.198l-0.138,0.058c-1.044-2.482-1.648-4.254-1.648-4.254 v-0.089H60.748z" class="st1"/><path d="M26.953,131.24c-1.896,1.286-3.482,2.368-4.551,3.109c-0.461,0.312-0.803,0.593-1.054,0.847 c-1.325,1.331-0.008,1.838,1.054,1.838h13.725l0.069,0.012c-0.061,0.371-0.115,0.753-0.159,1.149 c-0.153,1.285-0.279,2.497-0.394,3.628c-0.153,1.498-0.289,2.86-0.445,4.069H8.316c0,0-2.978-0.091-4.694-3.76 c-1.714-3.668,2.799-7.157,2.799-7.157l11.898-8.308l2.84-1.98l6.155-4.3l27.685-19.327l0.143-0.059 c0.107,0.272,0.238,0.561,0.397,0.865c1.118,1.942,3.037,2.606,5.155,2.606v1.24h-7.979c-1.596,0-2.346,1.293-1.668,2.872 l0.578,1.352l1.584,3.696l-0.108,0.046C53.1,113.678,36.27,124.922,26.953,131.24z" class="st4"/><path d="M60.481,119.025c0.397,0.928-0.041,1.681-0.977,1.681c-0.936,0-2.016-0.753-2.415-1.681 c-0.396-0.928,0.041-1.681,0.977-1.681C59.002,117.344,60.084,118.097,60.481,119.025z" class="st3"/><path d="M58.424,114.129c0.399,0.928-0.038,1.681-0.975,1.681c-0.936,0-2.018-0.753-2.415-1.681 c-0.343-0.798-0.069-1.465,0.611-1.638c0.11-0.027,0.233-0.043,0.363-0.043C56.945,112.448,58.028,113.201,58.424,114.129z" class="st3"/><path d="M58.337,134.258c0,0,1.806,2.776-1.896,2.776h-6.549v-0.165c0.678-0.071,0.993-0.842,1.346-1.42 c0.483-0.788,1.246-1.359,1.993-1.901c0.75-0.543,1.522-1.096,2.039-1.859c0.517-0.763,0.732-1.8,0.289-2.609l0.161-0.101 l0.21-0.048c0.066,0.312,0.182,0.628,0.333,0.943C57.074,131.575,58.337,134.258,58.337,134.258z" class="st1"/><path d="M56.148,109.459c0.397,0.928-0.038,1.681-0.975,1.681c-0.936,0-2.019-0.753-2.415-1.681 c-0.399-0.928,0.038-1.681,0.975-1.681C54.669,107.778,55.751,108.531,56.148,109.459z" class="st3"/><path d="M56.051,67.623c2.228,4.951,0.542,10.441-5.536,15.511c-6.081,5.071-11.438,7.277-16.736,9.008l-0.09,0.058 c-0.486,0.677-0.939,1.379-1.358,2.107l-1.427-0.479c0.706-1.285,1.282-2.551,1.673-3.537l0.041-0.327 c3.272,0.413,5.817-2.535,7.844-6.234c2.287-4.176,2.891-6.742,2.891-6.742l-0.013-0.096c2.901-0.32,5.157-2.758,5.157-5.72 c0-2.315-1.379-4.31-3.364-5.223l0.084-0.175C45.217,65.775,53.825,62.672,56.051,67.623z" class="st1"/><path d="M47.465,135.467l-0.438-0.36c0,0-0.01,0-0.015,0c-0.1-0.026-0.12-0.155-0.133-0.256 c-0.097-0.715-0.778-1.192-1.425-1.521c-0.647-0.328-1.371-0.634-1.724-1.263c-0.184-0.33-0.246-0.713-0.412-1.052 c-0.327-0.67-1.051-1.093-1.793-1.212c-0.732-0.117-1.484,0.025-2.19,0.256c3.262-3.61,7.861-3.851,9.253-3.851 c5.237,0,7.132,2.773,7.132,2.773l-0.161,0.102c0.443,0.809,0.228,1.846-0.289,2.609c-0.517,0.763-1.289,1.316-2.039,1.858 c-0.747,0.543-1.509,1.113-1.993,1.902c-0.353,0.578-0.668,1.348-1.346,1.419v0.165h-3.111l-0.018-0.005 c0.223-0.631,0.466-1.146,0.701-1.562V135.467z" class="st1"/><path d="M55.173,111.14l0.473,1.351c-0.681,0.173-0.954,0.84-0.611,1.638l-1.369,0.576l-0.458-1.073l-1.583-3.696 l1.133-0.477C53.155,110.387,54.237,111.14,55.173,111.14z" class="st2"/><path d="M45.132,65.95c1.985,0.913,3.364,2.908,3.364,5.223c0,2.961-2.256,5.4-5.157,5.72 c-0.212,0.025-0.43,0.038-0.65,0.038c-2.489,0-4.61-1.552-5.439-3.729l-0.092-0.129c1.489-1.039,2.461-2.758,2.461-4.703 c0-0.449-0.051-0.887-0.151-1.306l0.228-0.051c0.402,0.089,0.819,0.134,1.246,0.134c1.404,0,2.691-0.492,3.697-1.313l0.24,0.005 C44.963,65.874,45.05,65.909,45.132,65.95z" class="st8"/><path d="M47.028,135.107l0.438,0.36c-0.235,0.416-0.478,0.93-0.701,1.562c-0.412,1.168-0.76,2.743-0.885,4.834 c-0.015,0.267-0.033,0.533-0.049,0.797l-0.361-0.023c-0.478-0.31-1.11-0.261-1.655-0.086c-0.542,0.175-1.046,0.464-1.596,0.611 c-0.729,0.195-1.525,0.129-2.21-0.18c-0.714-0.322-1.289-0.89-1.985-1.248c-0.696-0.36-1.648-0.454-2.19,0.109l-0.189-0.02 c0.115-1.131,0.24-2.343,0.394-3.628c0.044-0.396,0.097-0.779,0.159-1.149c0.53-3.161,1.704-5.4,3.139-6.99 c0.706-0.23,1.458-0.372,2.19-0.256c0.742,0.119,1.466,0.543,1.793,1.212c0.166,0.34,0.228,0.723,0.412,1.052 c0.353,0.629,1.077,0.936,1.724,1.263c0.647,0.33,1.328,0.806,1.425,1.521c0.013,0.102,0.033,0.231,0.133,0.256 c0.005,0,0.01,0,0.015,0V135.107z" class="st1"/><path d="M44.638,150.907c0,0.051-0.325,0.205-0.264,0.114c-1.075,0.193-1.302,0.794-2.244,1.339 c-1.251,0.725-2.924,0.816-4.121,0.005c-0.616-0.418-1.067-1.029-1.614-1.529c-0.548-0.502-1.282-0.91-2.011-0.763l-0.059-0.023 c0.399-1.077,0.657-2.474,0.872-4.158c0.156-1.209,0.292-2.571,0.445-4.069l0.189,0.02c0.542-0.563,1.494-0.469,2.19-0.109 c0.696,0.358,1.271,0.926,1.985,1.248c0.686,0.309,1.481,0.375,2.21,0.18c0.55-0.147,1.054-0.436,1.596-0.611 c0.545-0.175,1.177-0.224,1.655,0.086l0.361,0.023c-0.069,1.087-0.154,2.16-0.258,3.209c-0.177,1.77-0.417,3.476-0.778,5.074 L44.638,150.907z" class="st1"/><path d="M35.236,62.449c-0.069-0.342-0.102-0.697-0.102-1.06c0-3.179,2.599-5.755,5.807-5.755s5.81,2.576,5.81,5.755 c0,1.787-0.824,3.387-2.113,4.444c-1.005,0.822-2.292,1.313-3.697,1.313c-0.427,0-0.844-0.046-1.246-0.134l-0.228,0.051 c-0.514-2.193-2.292-3.907-4.533-4.341l0.041-0.233l0.008,0.005L35.236,62.449z" class="st8"/><path d="M44.638,150.907l0.156,0.036c-1.448,6.46-4.799,11.145-13.454,11.145c-0.146,0-0.292-0.002-0.435-0.005 l0.005-0.314c0.719-1.258,0.785-2.863,0.171-4.176c-0.335-0.71-0.854-1.346-1.018-2.112c-0.246-1.133,0.458-2.393,1.558-2.794 l-0.008-0.053c1.348-0.221,2.164-1.106,2.712-2.584l0.059,0.023c0.729-0.147,1.463,0.261,2.011,0.763 c0.547,0.5,0.998,1.111,1.614,1.529c1.197,0.811,2.87,0.72,4.121-0.005c0.941-0.545,1.169-1.146,2.244-1.339 C44.313,151.113,44.638,150.958,44.638,150.907z" class="st1"/><path d="M43.338,76.892l0.013,0.096c0,0-0.604,2.566-2.891,6.742c-2.026,3.699-4.572,6.648-7.844,6.234 c-0.422-0.051-0.857-0.16-1.305-0.33c-0.512-0.195-0.939-0.439-1.292-0.72c-2.336-1.871-1.371-5.449-0.274-7.989 c1.264-2.923,2.469-6.98,2.469-6.98l0.01-0.038c0.504,0.142,1.034,0.218,1.584,0.218c1.246,0,2.402-0.39,3.349-1.055l0.092,0.129 c0.829,2.178,2.95,3.729,5.439,3.729C42.908,76.93,43.126,76.918,43.338,76.892z" class="st1"/><path d="M39.468,67.063c0.1,0.418,0.151,0.857,0.151,1.306c0,1.945-0.972,3.664-2.461,4.703 c-0.946,0.664-2.103,1.055-3.349,1.055c-0.55,0-1.08-0.076-1.583-0.218c-2.438-0.682-4.224-2.906-4.224-5.54 c0-3.179,2.599-5.755,5.807-5.755c0.384,0,0.762,0.038,1.126,0.109C37.176,63.156,38.954,64.87,39.468,67.063z" class="st8"/><path d="M23.563,92.242l-0.077-0.041c0,0-4.454-2.923-9.391-8.59c-3.794-4.356-8.051-12.803-6.122-20.027 c0.578-2.173,1.717-4.237,3.594-6.042c8.03-7.723,23.05,4.65,23.408,4.946l-0.041,0.233c-0.363-0.071-0.742-0.109-1.126-0.109 c-3.208,0-5.807,2.576-5.807,5.755c0,2.634,1.786,4.858,4.224,5.54l-0.01,0.038c0,0-1.205,4.057-2.469,6.98 c-1.098,2.54-2.062,6.118,0.274,7.989l-0.123,0.155c-1.005,2.251-2.052,4.556-3.599,6.303l-0.082-0.071 c-0.494-0.52-1.008-1.052-1.67-1.339c-0.617-0.266-1.402-0.264-1.911,0.155C22.921,93.484,23.231,92.86,23.563,92.242z" class="st1"/><path d="M10.286,110.44c0.223-0.129,0.438-0.273,0.622-0.441C10.736,110.121,10.534,110.283,10.286,110.44z M29.212,96.519c-0.246,0.337-0.499,0.662-0.76,0.963c-1.822,2.125-3.835,3.2-6.59,3.758c-0.553,0.111-1.123,0.197-1.712,0.238 c-1.33,0.101-2.747-0.013-4.249-0.507c-1.361-0.449-2.336-0.875-3.709-1.293c-1.371-0.418-2.904-0.573-4.211,0.013 c-1.1,0.495-1.919,1.458-2.512,2.5c-0.665,1.167-1.097,2.505-0.98,3.841c0.118,1.339,0.857,2.66,2.062,3.271 c1.187,0.603,1.985,0.327,2.873-0.368l-0.023-0.03c0.45-0.385,0.657-0.55,0.934-0.654c0.54-0.211,0.883,0.19,1.023,0.446 c0.064,0.119,0.151,0.299,0.028,0.626c-0.095,0.264-0.264,0.482-0.471,0.672c0.113-0.078,0.21-0.139,0.297-0.17 c0.279-0.091,0.668-0.043,0.808,0.216c0.064,0.119,0.133,0.37,0.12,0.507c-0.059,0.54-0.44,0.973-0.9,1.29 c-0.079,0.054-0.161,0.104-0.243,0.15c-1.425,0.824-3.74,1.181-5.784,0.286c-2.192-0.96-3.663-3.209-3.986-5.565 c-0.322-2.355,0.404-4.774,1.686-6.782c0.458-0.715,0.99-1.392,1.637-1.942c2.305-1.957,5.73-2.036,8.652-1.219 c2.203,0.616,4.326,1.681,6.613,1.721c0.435,0.008,0.849-0.015,1.243-0.063c1.862-0.238,3.326-1.116,4.776-2.553 c0.161-0.16,0.317-0.325,0.463-0.497c1.548-1.747,2.594-4.052,3.6-6.303l0.123-0.155c0.353,0.281,0.78,0.525,1.292,0.72 c0.448,0.17,0.883,0.279,1.305,0.33l-0.041,0.327c-0.391,0.986-0.967,2.251-1.673,3.537 C30.399,94.746,29.829,95.677,29.212,96.519z" class="st9"/><path d="M30.903,93.829l1.427,0.479c-0.471,0.821-0.9,1.676-1.294,2.573l-0.02-0.01 c-0.645,0.16-1.256,0.018-1.804-0.352C29.828,95.677,30.399,94.746,30.903,93.829z" class="st1"/><path d="M31.614,152.634l0.008,0.053c-1.1,0.401-1.804,1.661-1.558,2.794c0.164,0.766,0.683,1.402,1.018,2.112 c0.614,1.313,0.547,2.918-0.171,4.176l-0.005,0.314c-8.752-0.193-11.504-6.237-12.361-11.148l0.187-0.033 c0.34-0.654,0.655-0.616,1.392-0.707c0.737-0.092,1.491,0.127,2.126,0.509c0.535,0.325,0.998,0.766,1.563,1.035 c1.358,0.644,3.016,0.012,3.707-1.314l0.059-0.022c0.609,1.475,1.668,2.289,3.313,2.289 C31.148,152.692,31.389,152.674,31.614,152.634z" class="st1"/><path d="M31.015,96.871l0.02,0.01c-1.189,2.72-2.036,5.831-2.64,9.505l-0.212-0.035 c-1.149,0.88-2.916,0.849-4.034-0.071c-1.044-0.862-1.612-2.404-2.939-2.69c-0.468-0.099-0.975-0.01-1.379,0.248l-0.11-0.02 c0.136-0.761,0.281-1.493,0.44-2.208l-0.01-0.132c0.588-0.041,1.159-0.127,1.711-0.239c2.755-0.557,4.769-1.632,6.59-3.757 c0.261-0.302,0.514-0.626,0.76-0.963C29.759,96.889,30.371,97.031,31.015,96.871z" class="st1"/><path d="M28.184,106.351l0.212,0.035c-0.461,2.807-0.778,5.943-0.998,9.488c-0.709,0.824-1.816,1.272-2.911,1.3 c-1.167,0.033-2.315-0.37-3.303-0.984c-0.399-0.245-0.778-0.529-1.213-0.704s-0.947-0.231-1.364-0.018H18.55 c0.225-4.526,0.586-8.321,1.172-11.65l0.11,0.02c0.404-0.258,0.911-0.347,1.379-0.248c1.328,0.286,1.896,1.828,2.939,2.69 C25.268,107.2,27.035,107.23,28.184,106.351z" class="st1"/><path d="M27.577,150.403l-0.059,0.022c-0.691,1.326-2.348,1.958-3.707,1.314c-0.565-0.269-1.028-0.71-1.563-1.035 c-0.634-0.383-1.389-0.601-2.126-0.509c-0.737,0.091-1.051,0.053-1.392,0.707l-0.187,0.033c-0.34-1.945-0.384-3.712-0.384-4.865 v-0.178h8.757v0.089C26.917,147.791,27.119,149.287,27.577,150.403z" class="st1"/><path d="M27.314,120.386l-6.155,4.3l-0.138-0.192c-1.039,0.018-2.07-0.535-2.62-1.41h-0.105 c0.059-2.758,0.138-5.286,0.253-7.619h0.059c0.417-0.21,0.929-0.154,1.364,0.021s0.813,0.459,1.213,0.704 c0.988,0.614,2.136,1.017,3.303,0.984c1.095-0.028,2.203-0.476,2.911-1.3c-0.084,1.381-0.153,2.824-0.212,4.332L27.314,120.386z" class="st1"/><path d="M26.953,131.24c-0.008,1.037-0.015,2.102-0.02,3.19h-0.141c-1.517,1.128-3.615,1.443-5.4,0.809l-0.043-0.043 c0.251-0.254,0.594-0.535,1.054-0.847C23.471,133.608,25.057,132.526,26.953,131.24z" class="st1"/><path d="M26.792,134.43h0.141c-0.005,0.852-0.008,1.719-0.01,2.601c-2.392,0.003-4.065,0.003-4.52,0.003 c-1.062,0-2.379-0.507-1.054-1.838l0.043,0.043C23.177,135.872,25.275,135.558,26.792,134.43z" class="st1"/><path d="M26.217,95.302l0.082,0.071c-0.146,0.172-0.302,0.337-0.463,0.497c-1.451,1.438-2.914,2.315-4.776,2.553 l-0.015-0.147c0.455-1.453,0.98-2.827,1.591-4.158c0.509-0.418,1.294-0.421,1.911-0.155 C25.209,94.249,25.723,94.782,26.217,95.302z" class="st1"/><path d="M21.021,124.494l0.138,0.193l-2.84,1.98l-0.079-0.112c0.015-1.197,0.036-2.353,0.056-3.473h0.105 C18.951,123.959,19.982,124.512,21.021,124.494z" class="st1"/><path d="M10.908,109.999c-0.184,0.167-0.399,0.312-0.622,0.441C10.534,110.283,10.736,110.121,10.908,109.999z" class="st9"/><path d="M106.102,19.72c0,0,0.01-0.013,0.013-0.02c2.891-4.295,1.402-10.917-2.507-14.33 c-3.917-3.42-9.458-4.439-14.672-4.193C84.04,1.41,78.698,2.999,76.204,7.183c-1.435,2.409-1.724,5.365-3.2,7.751 c-1.788,2.885-5.042,4.521-8.227,5.748c-3.185,1.225-6.552,2.231-9.189,4.381c-4.226,3.446-5.782,9.746-3.64,14.733 c1.225,2.855,3.454,5.157,5.019,7.842c1.875,3.217,2.763,6.987,2.52,10.694c-0.184,2.784-0.982,5.616-0.271,8.313 c1.128,4.282,6.493,6.891,10.599,5.157" class="st10"/><path d="M106.169,19.735c3.535,0.55,6.513,3.628,6.917,7.152c0.389,3.397-1.368,6.643-3.157,9.566 c-1.785,2.926-3.645,5.727-3.916,8.144" class="st10"/><path d="M104.413,21.738c-0.545,0.299-1.097,0.576-1.658,0.832c-4.916,2.261-10.442,3.055-15.866,3.552 c-2.975,0.271-6.055,0.492-8.695,1.879c-3.149,1.653-5.347,4.967-5.626,8.486c-0.281,3.529,1.22,6.919,2.356,10.273 c1.138,3.357,1.891,7.185,0.23,10.319c-0.962,1.818-2.574,3.103-4.398,4.128c-1.246,0.702-2.594,1.28-3.899,1.823" class="st10"/><path d="M69.84,71.781c0,0,0.003,0.013,0.003,0.018c0.212,1.478-0.243,3.037-1.213,4.178 c-0.977,1.146-2.458,1.851-3.97,1.889c2.781,1.204,6.035,0.761,8.332-1.207c-0.161,2.513-2.246,4.229-4.733,4.751 c3.868,1.42,8.498-1.648,10.215-4.422" class="st10"/><path d="M71.103,61.267c0.755,3.228,3.791,5.365,5.549,8.184c1.435,2.299,1.924,4.911,1.914,7.538 c-0.008,1.879-0.271,3.765-0.624,5.55c-0.084,0.416-0.146,0.849-0.161,1.283c-0.021,0.677,0.077,1.344,0.417,1.919 c0.514,0.88,1.517,1.344,2.476,1.706c6.007,2.264,12.758,2.543,18.933,0.776c0.801-0.228,1.704-0.606,1.911-1.405 c0.095-0.37,0.016-0.761-0.066-1.133c-0.082-0.385-0.19-0.801-0.305-1.247c-0.279-1.1-0.603-2.378-0.734-3.78" class="st10"/><path d="M94.078,78.614c1.075,1.207,2.771,1.653,4.385,1.838c0.637,0.073,1.292,0.109,1.947,0.096 c2.256-0.043,4.507-0.654,6.04-2.241c2.348-2.429,2.264-6.217,2.031-9.571c-0.169-2.444-0.34-4.888-0.509-7.33" class="st10"/><path d="M62.855,57.147c3.446-0.2,7.455-1.97,9.568-4.675" class="st10"/><path d="M61.602,49.516c3.425-0.497,6.654-2.231,8.946-4.802" class="st10"/><path d="M56.892,41.471c4.861,0.066,10.115-2.601,12.643-6.539" class="st10"/><path d="M57.564,26.059c5.326-2.622,11.909-2.581,17.204,0.112" class="st10"/><path d="M77.854,14.797c5.526,0.449,8.534,5.7,9.384,7.728" class="st10"/><path d="M81.085,7.203c4.942,0.408,13.49,6.252,15.111,13.78" class="st10"/><path d="M91.238,4.594c5.797,2.114,10.177,7.624,10.896,13.704" class="st10"/><path d="M105.976,39.225c0,0.03-0.002,0.058-0.002,0.089c-0.041,1.696-0.085,3.41-0.141,5.279 c0,0.03,0,0.063,0,0.094" class="st10"/><path d="M102.781,22.626c1.609,0.953,2.605,2.705,3.039,4.513c0.438,1.805,0.384,3.689,0.328,5.545 c-0.015,0.482-0.028,0.953-0.041,1.417" class="st10"/><path d="M100.113,49.964c0.806,0.228,1.599,0.459,2.387,0.69c2.515,0.738,4.958,1.483,7.434,2.193 c1.99,0.57,4.004,1.118,6.094,1.623c3.586,0.865,4.587,3.641-0.023,4.683c-3.387,0.766-5.805,1.268-8.138,1.681 c-2.394,0.429-4.702,0.766-7.877,1.212c-1.195,0.167-2.435,0.319-3.582-0.048c-1.146-0.37-2.625-1.544-2.796-2.725 c-0.118-0.801-0.241-2.624,1.926-3.58c0.087-0.038,0.189-0.076,0.299-0.111c1.031-0.325,2.993-0.411,4.214,1.364" class="st10"/><path d="M97.192,45.008c1.361,0.697,2.305,1.76,2.653,3.364c0.097,0.449,0.148,0.938,0.148,1.473 c0,0.038,0,0.079,0,0.117c-0.044,2.835-1.719,4.399-4.29,5.205c-0.724,0.228-1.517,0.396-2.366,0.515 c-1.269,0.177-2.658,0.248-4.116,0.248c-5.95,0-10.775-1.374-10.775-6.085c0-5.342,4.825-6.085,10.775-6.085 c2.205,0,4.257,0.117,5.963,0.53" class="st10"/><path d="M95.187,44.293c0.737,0.177,1.41,0.411,2.001,0.712" class="st10"/><path d="M93.329,55.636c-2.062-0.72-3.538-2.665-3.538-4.954" class="st10"/><path d="M90.968,47.381c0.972-1.189,2.456-1.95,4.119-1.95c2.09,0,3.896,1.199,4.758,2.941 c0.026,0.051,0.051,0.104,0.074,0.155" class="st10"/><path d="M90.993,47.429l4.303,3.162h-5.505" class="st10"/><path d="M110.518,48.081c0.025,0.094,0.048,0.19,0.069,0.289c0.1,0.449,0.151,0.938,0.151,1.476 c0,1.181-0.279,2.148-0.783,2.931" class="st10"/><path d="M101.712,47.381c0.972-1.189,2.456-1.95,4.119-1.95c1.082,0,2.087,0.322,2.924,0.872 c0.78,0.515,1.414,1.227,1.831,2.066c0.029,0.053,0.054,0.104,0.077,0.157" class="st10"/><path d="M101.737,47.429l4.303,3.162h-3.52" class="st10"/><path d="M78.384,45.669c0.768-0.312,2.671-2.393,12.64-2.013c1.993,0.076,3.223,0.34,4.157,0.634 c0,0,0.002,0.001,0.005,0.003c0.785,0.248,1.358,0.517,2,0.712c0,0,0,0.003,0.005,0.003c0.824,0.251,1.763,0.38,3.402,0.185 c2.362-0.279,4.022-0.431,5.362-0.231c1.088,0.162,1.96,0.558,2.825,1.306" class="st10"/><path d="M106.04,34.532c0.335,0.71,0.512,1.503,0.512,2.368c0,0.933-0.2,1.734-0.578,2.414 c-0.862,1.559-2.663,2.492-5.153,2.933c-1.202,0.215-2.568,0.314-4.065,0.314c-5.951,0-10.159-1.924-10.159-6.019 c0-3.691,4.208-6.151,10.159-6.151c4.464,0,7.742,1.384,9.103,3.785C105.922,34.291,105.984,34.41,106.04,34.532z" class="st10"/><path d="M100.868,42.265c-0.015-0.005-0.031-0.01-0.046-0.018c-2.039-0.73-3.492-2.665-3.492-4.936" class="st10"/><path d="M98.507,34.009c0.972-1.189,2.456-1.947,4.119-1.947c1.662,0,2.775,1.24,3.415,2.469 c0.171,0.322,0.309,0.641,0.422,0.938" class="st10"/><path d="M98.532,34.06l4.306,3.162H97.33" class="st10"/><path d="M94.636,66.252h0.003c0.033-0.056,0.611-0.918,2.886-0.984c3.07-0.091,7.857,6.262,7.857,6.262 c-0.054-0.02-6.749,4.237-13.996,2.059c-6.736-2.023-8.22-9.3-8.452-10.626c-0.021-0.114-0.031-0.182-0.036-0.203 c0,0,3.973-0.745,8.399-0.089c3.853,0.573,3.362,3.463,3.344,3.577" class="st10"/><path d="M83.078,62.94c0,0,7.764,8.59,22.303,8.59" class="st10"/><path d="M80.576,93.423c-0.015,0.015-0.036,0.033-0.059,0.053c-0.962,0.9-7.112,6.955-0.599,9.105 c5.416,1.79,8.667-5.19,9.749-7.964c-0.45,2.505-0.361,11.097,5.329,10.38c5.597-0.715,4.694-5.279,3.612-10.737 c1.988,7.408,7.194,9.609,10.197,6.792c0.407-0.38,0.775-0.857,1.087-1.422c2.438-5.281-6.679-7.966-8.667-15.212" class="st10"/><path d="M77.752,83.522c0,0,0.005,0.112-0.01,0.299c-0.072,0.9-0.611,3.572-4.416,4.533 c-3.492,0.88-8.864,1.458-8.667,5.456c0.01,0.228,0.041,0.466,0.09,0.717c0.903,4.652,6.772,3.4,6.772,3.4 s5.042-0.877,8.997-4.452c0.021-0.018,0.041-0.035,0.059-0.053c0.015-0.015,0.028-0.025,0.038-0.035h0.003 c0.015-0.013,0.023-0.02,0.023-0.02" class="st10"/><path d="M93.239,107.687c0.212,2.307,1.328,9.289,6.994,8.316c4.605-0.984,3.341-5.547,2.71-9.931 c1.102,4.371,4.543,8.268,8.401,7.107c0.563-0.168,1.136-0.447,1.711-0.845c5.326-4.026-2.259-6.62-4.244-11.274" class="st10"/><path d="M93.239,107.682c-0.02-0.449-0.049-0.715-0.049-0.715S93.198,107.236,93.239,107.682z" class="st10"/><path d="M93.239,107.682v0.005" class="st10"/><path d="M78.202,111.376c2.53-1.443,4.566-3.707,5.147-5.484c-0.542,2.239-2.256,11.275,4.334,11.186 c5.51-0.074,5.656-7.094,5.557-9.391" class="st10"/><path d="M64.569,93.813c-2.504,2.738-11.778,1.219-9.427,7.188c0.108,0.271,0.238,0.56,0.397,0.865 c1.118,1.942,3.037,2.606,5.155,2.606c4.746,0,10.478-3.342,10.376-3.144c0,0-1.53,1.94-2.397,4.244" class="st10"/><path d="M45.789,145.892h38.102c0,0,2.034-0.251,2.162-1.815c0-0.051,0.005-0.102,0.005-0.155v-0.048 c-0.018-1.663-0.918-2.277-2.438-2.277H70.709" class="st10"/><path d="M54.999,101.06l-27.685,19.327l-6.155,4.3l-2.84,1.98l-11.898,8.308c0,0-4.513,3.489-2.799,7.157 c1.717,3.669,4.694,3.76,4.694,3.76h26.907" class="st10"/><path d="M71.249,141.582h10.852c0,0,2.167-0.269,2.167-1.97s-0.903-2.325-2.438-2.325H68.632" class="st10"/><path d="M68.721,137.211l9.176-9.153c0,0,1.34-1.706,0.128-2.91c-1.213-1.202-2.297-1.012-3.382,0.063 c-1.085,1.075-10.284,9.898-10.86,10.451l-0.028,0.028" class="st10"/><path d="M36.127,137.034H22.402c-1.062,0-2.379-0.507-1.054-1.838c0.251-0.254,0.594-0.535,1.054-0.847 c1.069-0.741,2.655-1.823,4.551-3.109c9.317-6.318,26.148-17.562,26.148-17.562" class="st10"/><path d="M63.756,135.601c-0.084-0.152-2.638-6.042-3.431-7.875c-0.317-0.94-0.993-1.648-1.896-1.719 c-0.384-0.027-0.808,0.056-1.264,0.287c-1.177,0.598-1.466,1.585-1.236,2.637c0.067,0.312,0.182,0.628,0.333,0.943 c0.811,1.701,2.075,4.383,2.075,4.383s1.806,2.777-1.896,2.777h-9.66" class="st10"/><path d="M63.756,135.601v0.003" class="st10"/><path d="M147.863,56.409c-1.471,0-3.188,1.192-3.812,2.652l-5.946,13.881" class="st10"/><path d="M157.553,74.337l6.541-15.276c0.627-1.46-0.067-2.652-1.54-2.652h-14.6" class="st10"/><path d="M132.51,86.007l-1.363,3.184c-0.568,1.321-0.051,2.426,1.146,2.622c0.125,0.02,0.256,0.03,0.394,0.03h11.338" class="st10"/><path d="M147.954,56.409h-3.674c-1.471,0-3.187,1.192-3.811,2.652l-6.347,14.822l-6.557,15.308 c-0.627,1.458,0.067,2.652,1.54,2.652h3.193" class="st10"/><path d="M157.911,59.868c-0.368,0.857-1.366,1.552-2.231,1.552c-0.864,0-1.266-0.695-0.9-1.552 c0.368-0.857,1.366-1.549,2.231-1.549C157.875,58.318,158.277,59.011,157.911,59.868z" class="st10"/><path d="M162.516,59.868c-0.369,0.857-1.367,1.552-2.231,1.552c-0.865,0-1.267-0.695-0.901-1.552 c0.369-0.857,1.366-1.549,2.231-1.549C162.48,58.318,162.881,59.011,162.516,59.868z" class="st10"/><path d="M160.669,64.178c-0.366,0.857-1.363,1.552-2.228,1.552c-0.865,0-1.269-0.695-0.9-1.552 c0.365-0.857,1.363-1.549,2.228-1.549C160.634,62.629,161.038,63.321,160.669,64.178z" class="st10"/><path d="M68.673,105.712c1.586,0.023,3.415,1.308,4.088,2.872l13.981,32.643c0.507,1.184,0.212,2.208-0.64,2.647" class="st10"/><path d="M58.437,125.843l-4.771-11.138l-0.458-1.073l-1.583-3.696l-0.578-1.352 c-0.678-1.579,0.072-2.872,1.668-2.872H68.53" class="st10"/><path d="M68.529,105.712h3.981c1.594,0,3.454,1.293,4.132,2.872l1.251,2.921l12.73,29.722 c0.675,1.58-0.074,2.873-1.671,2.873h-2.622" class="st10"/><path d="M57.089,119.025c0.399,0.928,1.479,1.681,2.415,1.681c0.936,0,1.374-0.753,0.977-1.681 c-0.396-0.928-1.479-1.681-2.415-1.681C57.13,117.344,56.692,118.097,57.089,119.025z" class="st10"/><path d="M52.758,109.459c0.396,0.928,1.479,1.681,2.415,1.681c0.936,0,1.371-0.753,0.975-1.681 c-0.396-0.928-1.479-1.681-2.415-1.681C52.797,107.778,52.359,108.531,52.758,109.459z" class="st10"/><path d="M55.035,114.129c0.397,0.928,1.479,1.681,2.415,1.681c0.936,0,1.374-0.753,0.975-1.681 c-0.396-0.928-1.479-1.681-2.415-1.681c-0.131,0-0.253,0.016-0.363,0.043C54.965,112.664,54.692,113.331,55.035,114.129z" class="st10"/><path d="M147.855,77.43h-10.852c0,0-2.167-0.269-2.167-1.967c0-0.479,0.072-0.872,0.207-1.192 c0.351-0.811,1.128-1.136,2.231-1.136h10.588c3.61,0,5.055,2.363,5.055,2.363l0.875,1.468l0.691,1.156" class="st10"/><path d="M153.8,76.961l-6.199-11.346c0,0-0.798-2.013,0.706-2.829c1.507-0.814,2.494-0.327,3.229,1.009 c0.654,1.187,4.95,8.881,5.881,10.55l0.179,0.319c0,0,1.686,3.042,0.422,6.501c-0.709,1.94-9.959,24.76-17.954,44.455 c-1.194,2.938-2.358,5.806-3.463,8.523c-1.338,3.296-2.589,6.372-3.692,9.087c-1.033,2.536-1.936,4.756-2.663,6.546 c-1.23,3.03-1.962,4.825-1.962,4.825s-0.059,0.193-0.187,0.507c-0.555,1.359-2.402,4.982-6.316,4.982 c-3.272,0-4.812-1.597-5.531-2.943" class="st10"/><path d="M146.059,81.743H135.21c0,0-0.023,0-0.067-0.01c-0.36-0.061-2.1-0.434-2.1-1.957 c0-1.701,0.903-2.327,2.438-2.327h10.586" class="st10"/><path d="M144.273,81.732h-10.588c-1.535,0-2.438,0.626-2.438,2.325c0,1.009,0.764,1.516,1.384,1.757 c0.424,0.167,0.782,0.213,0.782,0.213h8.714c0,0,4.456-0.388,2.65,4.145c-0.13,0.33-0.366,0.908-0.683,1.699h-0.003 c-2.033,5.022-7.562,18.574-12.594,30.891c-0.427,1.05-0.854,2.092-1.271,3.116c-0.635,1.549-1.251,3.063-1.847,4.523 c-0.745,1.823-1.456,3.557-2.111,5.167c-1.542,3.773-2.801,6.851-3.563,8.717c-0.515,1.257-0.804,1.965-0.804,1.965" class="st10"/><path d="M128.223,155.108c0,0,1.737-0.147,3.886-1.11c2.289-1.03,5.047-2.984,6.677-6.676 c0.562-1.278,0.867-2.517,0.982-3.689c0.34-3.417-0.908-6.27-1.868-7.9c-0.552-0.941-1.01-1.476-1.01-1.476" class="st10"/><path d="M140.413,125.759c0,0,1.471,0.766,3.625,1.41c2.53,0.758,6.001,1.351,9.143,0.349 c0.67-0.213,1.322-0.496,1.949-0.867c2.402-1.419,3.643-3.318,4.006-5.103c0.489-2.371-0.565-4.536-2.471-5.096 c-0.049-0.016-0.095-0.028-0.141-0.041c-3.443-1.019-5.536-1.803-4.645-5.687c0.567-2.479,3.681-3.362,7.012-2.715 c1.957,0.38,3.99,1.29,5.628,2.715c3.128,2.721,4.543,7.634,3.696,12.401c-0.35,1.972-1.087,3.919-2.251,5.676 c-2.448,3.692-6.086,6.344-10.701,7.781c-1.427,0.449-2.95,0.779-4.559,0.987c-2.583,0.334-5.589,0.01-8.296-0.586 c-1.642-0.36-3.172-0.822-4.433-1.293" class="st10"/><path d="M128.405,130.411c0,0-0.008-0.002-0.026-0.01c-0.279-0.089-2.791-0.854-5.932,0.168 c-1.916,0.623-4.068,1.914-6.089,4.431c-0.54,0.675-1.072,1.438-1.589,2.3c-0.422,0.707-0.846,1.44-1.276,2.196 c-0.606,1.075-1.22,2.19-1.839,3.328c-0.699,1.291-1.402,2.612-2.106,3.933c-0.744,1.394-1.491,2.789-2.236,4.15 c-0.215,0.391-0.427,0.781-0.642,1.166c-0.491,0.885-0.982,1.75-1.471,2.589c-1.118,1.917-2.284,4.062-3.891,6.011 c-2.169,2.637-5.142,4.916-9.885,5.789c-1.507,0.276-3.195,0.41-5.093,0.37c-1.655-0.036-3.205-0.244-4.651-0.591 c-3.779-0.913-6.859-2.804-9.345-5.2c-1.21-1.169-2.279-2.457-3.218-3.811c-0.678-0.978-1.289-1.99-1.837-3.017 c-0.228-0.428-0.443-0.834-0.645-1.219c-1.944-3.725-2.673-5.545-3.328-6.924" class="st10"/><path d="M121.994,146.161l-0.054,0.106c-1.66,3.347-2.955,5.997-4.786,9.262c-0.289,0.517-0.596,1.052-0.919,1.608 c-0.808,1.399-1.729,2.933-2.819,4.682c-1.532,2.465-3.175,4.709-5.034,6.661c-3.416,3.582-7.573,6.186-13.173,7.37 c-3.221,0.682-6.92,0.895-11.228,0.555c-1.97-0.154-3.799-0.459-5.498-0.882c-5.27-1.313-9.292-3.783-12.405-6.567 c-3.981-3.557-6.472-7.628-8.192-10.448c-0.164-0.269-0.325-0.537-0.481-0.811c-1.484-2.553-2.735-5.284-3.651-7.462 c-1.044-2.482-1.648-4.254-1.648-4.254" class="st10"/><path d="M131.382,122.717c0,0-1.067-0.518-2.809-0.989c-1.952-0.528-4.751-1.002-7.844-0.624 c-1.849,0.226-3.985,0.898-6.027,2.069c-2.271,1.301-4.428,3.217-5.945,5.816c-0.913,1.564-1.596,3.375-1.934,5.448 c-0.389,2.384-0.343,4.554-0.013,6.43c0.115,0.659,0.264,1.281,0.443,1.864c0.496,1.62,1.212,2.938,2.008,3.876" class="st10"/><path d="M55.72,128.979c0,0-1.896-2.774-7.132-2.774c-1.392,0-5.991,0.241-9.253,3.851 c-1.435,1.59-2.609,3.829-3.139,6.99c-0.061,0.371-0.115,0.753-0.159,1.149c-0.154,1.285-0.279,2.497-0.394,3.628 c-0.153,1.498-0.289,2.86-0.445,4.069c-0.215,1.684-0.473,3.081-0.872,4.158c-0.548,1.478-1.363,2.363-2.712,2.584 c-0.225,0.04-0.466,0.058-0.724,0.058c-1.645,0-2.704-0.814-3.313-2.289c-0.458-1.116-0.66-2.612-0.66-4.422" class="st10"/><path d="M48.767,133.9c0,0-0.627,0.38-1.302,1.567c-0.235,0.416-0.478,0.93-0.701,1.562 c-0.412,1.168-0.76,2.743-0.885,4.835c-0.015,0.266-0.033,0.532-0.049,0.796c-0.069,1.087-0.153,2.16-0.258,3.209 c-0.176,1.77-0.417,3.476-0.778,5.074c-1.448,6.46-4.799,11.145-13.454,11.145c-0.146,0-0.292-0.002-0.435-0.005 c-8.752-0.193-11.504-6.237-12.361-11.148c-0.34-1.945-0.384-3.712-0.384-4.865" class="st10"/><path d="M20.162,101.61c-0.159,0.715-0.305,1.447-0.44,2.208c-0.586,3.329-0.946,7.124-1.172,11.647 c-0.115,2.333-0.194,4.861-0.253,7.617c-0.021,1.12-0.041,2.276-0.056,3.473" class="st10"/><path d="M23.584,92.201c-0.008,0.013-0.015,0.028-0.02,0.041c-0.333,0.619-0.642,1.242-0.929,1.876 c-0.611,1.331-1.136,2.705-1.591,4.158" class="st10"/><path d="M26.953,131.215v0.025c-0.008,1.037-0.015,2.102-0.021,3.19c-0.005,0.852-0.008,1.719-0.01,2.601" class="st10"/><path d="M33.689,92.201c-0.486,0.677-0.939,1.379-1.358,2.107c-0.471,0.821-0.901,1.676-1.294,2.573 c-1.19,2.72-2.036,5.832-2.64,9.505c-0.46,2.807-0.778,5.943-0.998,9.488c-0.084,1.381-0.153,2.824-0.212,4.333" class="st10"/><path d="M111.428,113.44l3.251,9.543" class="st10"/><path d="M102.641,118.092l4.453,13.96" class="st10"/><path d="M70.86,146.131l-1.566,10.975" class="st10"/><path d="M106.734,140.88l-0.241,11.097" class="st10"/><path d="M9.462,108.904l-0.038,0.03c-0.888,0.695-1.686,0.971-2.873,0.368c-1.205-0.611-1.944-1.932-2.062-3.271 c-0.118-1.336,0.315-2.674,0.98-3.841c0.594-1.042,1.412-2.005,2.512-2.5c1.307-0.586,2.84-0.431,4.211-0.013 c1.374,0.418,2.349,0.844,3.71,1.293c1.502,0.494,2.919,0.608,4.249,0.507c0.588-0.041,1.159-0.127,1.711-0.238 c2.755-0.558,4.768-1.633,6.59-3.758c0.261-0.302,0.514-0.626,0.76-0.963c0.616-0.842,1.187-1.772,1.691-2.69 c0.706-1.285,1.282-2.551,1.673-3.537" class="st10"/><path d="M11.24,111.837c0.018-0.012,0.038-0.025,0.056-0.038" class="st10"/><path d="M29.898,89.07c-1.005,2.251-2.052,4.556-3.6,6.303c-0.146,0.172-0.302,0.337-0.463,0.497 c-1.451,1.438-2.914,2.315-4.776,2.553c-0.394,0.048-0.808,0.071-1.243,0.063c-2.287-0.041-4.41-1.105-6.613-1.721 c-2.921-0.816-6.347-0.738-8.652,1.219c-0.647,0.55-1.179,1.227-1.637,1.942c-1.282,2.008-2.008,4.427-1.686,6.782 c0.322,2.356,1.793,4.604,3.986,5.565c2.044,0.895,4.359,0.538,5.784-0.286" class="st10"/><path d="M10.908,109.999c-0.184,0.167-0.399,0.312-0.622,0.441c-0.125,0.076-0.253,0.145-0.379,0.211" class="st10"/><path d="M9.401,108.904c0.45-0.386,0.657-0.55,0.934-0.654c0.54-0.211,0.883,0.19,1.023,0.446 c0.064,0.119,0.151,0.299,0.028,0.626c-0.095,0.264-0.263,0.482-0.471,0.672" class="st10"/><path d="M9.943,110.636c0.123-0.061,0.238-0.127,0.343-0.196c0.248-0.157,0.45-0.319,0.622-0.441 c0.003-0.002,0.005-0.005,0.008-0.005c0.113-0.078,0.21-0.139,0.297-0.17c0.279-0.091,0.668-0.043,0.808,0.216 c0.064,0.119,0.133,0.37,0.12,0.507c-0.059,0.54-0.44,0.973-0.9,1.29c-0.079,0.054-0.161,0.104-0.243,0.15 c-0.031,0.018-0.061,0.035-0.092,0.051" class="st10"/><path d="M39.468,67.063c0.1,0.418,0.151,0.857,0.151,1.306c0,1.945-0.972,3.664-2.461,4.703 c-0.946,0.664-2.103,1.055-3.349,1.055c-0.55,0-1.08-0.076-1.583-0.218c-2.438-0.682-4.224-2.906-4.224-5.54 c0-3.179,2.599-5.755,5.807-5.755c0.384,0,0.762,0.038,1.126,0.109C37.176,63.156,38.954,64.87,39.468,67.063z" class="st11"/><path d="M35.733,69.979c0.89,0.297,1.374,1.245,1.077,2.115c-0.294,0.872-1.256,1.339-2.146,1.042 c-0.89-0.297-1.374-1.242-1.077-2.115c0.023-0.074,0.054-0.145,0.09-0.213" class="st12"/><path d="M44.879,65.838c0.084,0.035,0.171,0.071,0.253,0.111c1.985,0.913,3.364,2.908,3.364,5.223 c0,2.961-2.256,5.4-5.157,5.72c-0.212,0.025-0.43,0.038-0.65,0.038c-2.489,0-4.61-1.552-5.439-3.73" class="st11"/><path d="M44.612,72.783c0.89,0.297,1.371,1.245,1.077,2.114c-0.297,0.872-1.259,1.339-2.149,1.042 c-0.89-0.297-1.371-1.245-1.077-2.115c0.026-0.074,0.056-0.147,0.089-0.213" class="st12"/><path d="M35.268,62.616c-0.013-0.056-0.023-0.112-0.031-0.167c-0.069-0.342-0.102-0.697-0.102-1.06 c0-3.179,2.599-5.755,5.807-5.755s5.81,2.576,5.81,5.755c0,1.787-0.824,3.387-2.113,4.444c-1.005,0.822-2.292,1.313-3.697,1.313 c-0.427,0-0.844-0.046-1.246-0.134" class="st11"/><path d="M42.866,62.999c0.89,0.297,1.374,1.245,1.077,2.114c-0.294,0.872-1.256,1.339-2.146,1.042 c-0.89-0.297-1.374-1.242-1.077-2.114c0.026-0.074,0.054-0.145,0.09-0.213" class="st12"/><path d="M32.215,73.946c0,0-1.205,4.056-2.469,6.98c-1.097,2.54-2.062,6.118,0.274,7.989 c0.353,0.281,0.78,0.525,1.292,0.72c0.448,0.17,0.883,0.279,1.305,0.33c3.272,0.413,5.817-2.535,7.844-6.234 c2.287-4.176,2.891-6.742,2.891-6.742" class="st10"/><path d="M32.922,82.711c-0.527,1.019-0.747,1.64-1.238,2.398" class="st10"/><path d="M35.945,83.969c-0.361,1.014-0.609,1.613-1.082,2.447" class="st10"/><path d="M34.983,62.494c0,0-0.003-0.002-0.008-0.005c-0.358-0.297-15.377-12.669-23.408-4.946 c-1.878,1.805-3.016,3.869-3.594,6.042c-1.929,7.223,2.328,15.671,6.122,20.027c4.937,5.667,9.391,8.59,9.391,8.59" class="st10"/><path d="M45.216,65.775c0,0,8.609-3.103,10.834,1.848c2.228,4.951,0.542,10.441-5.536,15.511 c-6.081,5.071-11.438,7.277-16.736,9.008" class="st10"/><path d="M11.568,57.543l9.931,10.917" class="st10"/><path d="M7.956,63.567l0.018,0.018l10.036,10.6" class="st10"/><path d="M48.948,75.199l7.884-4.533" class="st10"/><path d="M47.805,81.94l7.403-4.176" class="st10"/><path d="M22.53,94.214c0.033-0.035,0.069-0.066,0.105-0.096c0.509-0.418,1.294-0.421,1.911-0.155 c0.663,0.286,1.177,0.819,1.67,1.339" class="st10"/><path d="M29.174,96.496c0.013,0.008,0.026,0.018,0.038,0.023c0.548,0.37,1.159,0.512,1.803,0.352" class="st10"/><path d="M19.831,103.838c0.404-0.258,0.911-0.347,1.379-0.248c1.328,0.286,1.896,1.828,2.939,2.69 c1.118,0.92,2.886,0.95,4.034,0.071" class="st10"/><path d="M18.608,115.468c0.417-0.213,0.929-0.157,1.364,0.018c0.435,0.175,0.813,0.459,1.213,0.705 c0.988,0.613,2.136,1.016,3.303,0.983c1.095-0.028,2.203-0.476,2.911-1.3c0.046-0.051,0.09-0.104,0.13-0.16" class="st10"/><path d="M18.401,123.084c0.55,0.875,1.581,1.428,2.62,1.41" class="st10"/><path d="M21.392,135.239c1.786,0.633,3.883,0.319,5.4-0.809" class="st10"/><path d="M18.73,150.902c0.34-0.654,0.655-0.616,1.392-0.707c0.737-0.092,1.491,0.127,2.126,0.509 c0.535,0.325,0.998,0.766,1.563,1.035c1.358,0.644,3.016,0.012,3.707-1.314" class="st10"/><path d="M31.622,152.687c-1.1,0.401-1.803,1.661-1.558,2.794c0.164,0.766,0.683,1.402,1.018,2.112 c0.614,1.313,0.547,2.918-0.171,4.176" class="st10"/><path d="M34.385,150.073c0.729-0.147,1.463,0.261,2.011,0.763c0.548,0.5,0.998,1.111,1.614,1.529 c1.197,0.811,2.87,0.72,4.121-0.005c0.941-0.545,1.169-1.146,2.243-1.339c-0.061,0.092,0.264-0.063,0.264-0.114 c0-0.005-0.008-0.01-0.023-0.013" class="st10"/><path d="M35.833,141.843c0.542-0.563,1.494-0.469,2.19-0.109c0.696,0.358,1.271,0.926,1.985,1.248 c0.686,0.309,1.481,0.375,2.21,0.18c0.55-0.147,1.054-0.436,1.596-0.611c0.545-0.175,1.177-0.224,1.655,0.086" class="st10"/><path d="M39.307,130.066c0,0,0.018-0.005,0.028-0.01c0.706-0.23,1.458-0.372,2.19-0.256 c0.742,0.119,1.466,0.543,1.793,1.212c0.166,0.34,0.228,0.723,0.412,1.052c0.353,0.629,1.077,0.936,1.724,1.263 c0.647,0.33,1.328,0.806,1.425,1.521c0.013,0.102,0.033,0.231,0.133,0.256c0.005,0,0.01,0,0.015,0 c0.084,0,0.084-0.198,0.008-0.139" class="st10"/><path d="M49.893,136.869c0.678-0.071,0.993-0.842,1.346-1.42c0.483-0.788,1.246-1.359,1.993-1.901 c0.75-0.543,1.522-1.096,2.039-1.859c0.517-0.763,0.732-1.8,0.289-2.609" class="st10"/><path d="M53.894,150.177c0.959,0.165,2.021,0.314,2.847-0.198c0.719-0.444,1.077-1.288,1.706-1.851 c0.443-0.398,1.003-0.641,1.499-0.973c0.496-0.33,0.732-0.555,0.801-1.144" class="st10"/><path d="M57.678,157.545c0.228-0.36,0.563-0.654,0.954-0.829c1.026-0.459,2.21-0.084,3.313,0.144 c1.103,0.231,2.466,0.206,3.09-0.725c0.325-0.484,0.356-1.095,0.466-1.668c0.11-0.571,0.366-1.189,0.908-1.407" class="st10"/><path d="M65.931,168.992c0.049-0.01,0.1-0.023,0.148-0.036c0.895-0.243,1.658-0.938,1.967-1.807 c0.366-1.027,0.118-2.186,0.425-3.233c0.468-1.6,2.154-2.591,3.819-2.829" class="st10"/><path d="M81.663,166.299c0.176,0.703,0.01,1.478-0.435,2.049c-0.609,0.781-1.693,1.186-2.07,2.102 c-0.376,0.923,0.131,1.954,0.128,2.948c0,0.647-0.228,1.291-0.632,1.795c-0.028,0.036-0.069,0.074-0.11,0.074 c-0.01,0-0.018-0.003-0.025-0.005c-0.051-0.02,0.005-0.122,0.033-0.076" class="st10"/><path d="M91.454,166.639c0.294,0.246,0.379,0.667,0.34,1.045c-0.038,0.38-0.182,0.74-0.269,1.11 c-0.184,0.768-0.102,1.638,0.402,2.249c0.435,0.525,1.11,0.783,1.668,1.179c1.067,0.755,1.694,2.081,1.599,3.377" class="st10"/><path d="M101.441,160.78c0.699,0.117,1.31,0.657,1.507,1.333c0.21,0.715,0.003,1.572,0.468,2.156 c0.471,0.588,1.354,0.573,2.088,0.758c1.422,0.352,2.522,1.711,2.563,3.164" class="st10"/><path d="M107.542,151.031c0.333,0.561,1.026,0.817,1.681,0.85c0.655,0.035,1.304-0.107,1.957-0.14 c2.43-0.124,4.853,1.423,5.746,3.664" class="st10"/><path d="M113.61,139.561c0.579,0.386,1.364,0.269,2.003-0.005c0.64-0.273,1.218-0.687,1.886-0.887 c1.038-0.309,2.208-0.048,3.088,0.581c0.88,0.628,1.483,1.592,1.785,2.626c0.228,0.766,0.294,1.58,0.202,2.373" class="st10"/><path d="M122.49,130.698c0.829-0.249,1.732,0.165,2.361,0.758c1.08,1.022,1.579,2.609,1.277,4.057" class="st10"/><path d="M132.858,143.205c0.018,0.007,0.034,0.015,0.052,0.025c0.759,0.35,1.468,0.811,2.22,1.179 c0.773,0.375,1.622,0.654,2.479,0.581c0.854-0.076,1.714-0.568,2.024-1.362" class="st10"/><path d="M130.436,149.845c1.148,0.877,1.754,2.396,1.522,3.813" class="st10"/><path d="M107.346,142.698c1.32-0.454,2.796-0.446,4.108,0.02" class="st10"/><path d="M108.903,129.073c1.001-0.046,2.144,0,2.804,0.745c0.43,0.489,0.555,1.182,0.967,1.681 c0.502,0.606,1.323,0.821,2.047,1.136c0.724,0.314,1.537,1.496,1.524,2.279" class="st10"/><path d="M128.524,121.672c0.016,0.018,0.034,0.035,0.049,0.056c1,1.115,1.696,2.659,1.653,4.15 c-0.003,0.109-0.011,0.218-0.021,0.327" class="st10"/><path d="M143.982,127.453c0.616,0.983,1.246,2.203,0.716,3.235c-0.348,0.677-1.126,1.07-1.438,1.764 c-0.314,0.695-0.087,1.494,0,2.249c0.09,0.758-0.071,1.686-0.782,1.978" class="st10"/><path d="M153.271,127.79c-0.292,0.644-0.039,1.486,0.562,1.868c0.41,0.261,0.942,0.325,1.29,0.665 c0.45,0.438,0.417,1.168,0.243,1.772c-0.172,0.601-0.453,1.199-0.392,1.823c0.041,0.421,0.236,0.809,0.351,1.214 c0.112,0.408,0.133,0.885-0.138,1.212" class="st10"/><path d="M159.393,121.598c0.434,0.282,1.038,0.082,1.43-0.258c0.391-0.34,0.662-0.799,1.046-1.146 c0.386-0.348,0.975-0.568,1.425-0.312c0.593,0.342,0.555,1.23,1.015,1.732c0.338,0.365,0.881,0.459,1.379,0.456 c0.499-0.003,1.008-0.076,1.492,0.043c0.486,0.117,0.954,0.505,0.957,0.999" class="st10"/><path d="M158.847,108.224c-0.913,0.107-1.629,1.065-1.463,1.963c0.038,0.213,0.12,0.421,0.138,0.636 c0.079,0.956-1,1.542-1.54,2.335c-0.668,0.979-0.397,2.465,0.573,3.152" class="st10"/><path d="M88.542,29.806c0.141,0.644,0.389,1.263,0.732,1.828c0.033,0.053,0.082,0.114,0.143,0.099 c0.061-0.013,0.026-0.137-0.021-0.094" class="st10"/><path d="M93.979,28.371c0.082,0.819,0.179,1.26,0.476,2.028" class="st10"/><path d="M99.267,28.249c-0.125,0.788-0.169,1.354-0.118,2.15" class="st10"/><path d="M103.49,29.326c-0.286,0.555-0.458,1.166-0.504,1.788" class="st10"/><path d="M112.988,87.533c2.159,0,3.27-0.076,4.626-1.498c1.358-1.42,1.419-4.206,1.419-9.079 c0,4.873,0.062,7.659,1.418,9.079c1.355,1.422,2.466,1.498,4.625,1.498v0.015c-2.159,0-3.27,0.076-4.625,1.496 c-1.356,1.422-1.418,4.209-1.418,9.082c0-4.873-0.061-7.659-1.419-9.082c-1.356-1.42-2.467-1.496-4.626-1.496V87.533z" class="st13"/><path d="M152.984,41.017c1.625,0,2.461-0.066,3.482-1.265c1.021-1.199,1.067-3.552,1.067-7.664 c0,4.112,0.046,6.465,1.067,7.664c1.02,1.199,1.857,1.265,3.481,1.265v0.01c-1.624,0-2.461,0.066-3.481,1.265 c-1.021,1.199-1.067,3.552-1.067,7.664c0-4.112-0.046-6.465-1.067-7.664s-1.857-1.265-3.482-1.265V41.017z" class="st13"/><path d="M165.956,54.858c-1.57-1.767-2.855-1.863-5.352-1.863v-0.018c2.497,0,3.782-0.094,5.352-1.861 c1.568-1.767,1.64-5.233,1.64-11.292c0,6.059,0.072,9.525,1.642,11.292c1.571,1.767,2.855,1.861,5.352,1.861v0.018 c-2.497,0-3.781,0.096-5.352,1.863c-1.57,1.767-1.642,5.233-1.642,11.292C167.596,60.091,167.524,56.625,165.956,54.858z" class="st13"/><path d="M167.596,39.823c0,6.059-0.072,9.525-1.64,11.292c-1.57,1.767-2.855,1.861-5.352,1.861" class="st14"/><path d="M167.597,66.15c0-6.06,0.071-9.525,1.642-11.292c1.571-1.767,2.855-1.863,5.352-1.863" class="st14"/><path d="M167.597,39.823c0,6.059,0.071,9.525,1.642,11.292c1.571,1.767,2.855,1.861,5.352,1.861" class="st14"/><path d="M167.596,66.15c0-6.06-0.072-9.525-1.64-11.292c-1.57-1.767-2.855-1.863-5.352-1.863" class="st14"/><path d="M157.533,32.088c0,4.112-0.046,6.465-1.067,7.664c-1.021,1.199-1.857,1.265-3.482,1.265" class="st14"/><path d="M157.532,49.957c0-4.112,0.046-6.465,1.067-7.664s1.857-1.265,3.482-1.265" class="st14"/><path d="M157.532,32.088c0,4.112,0.046,6.465,1.067,7.664c1.021,1.199,1.857,1.265,3.482,1.265" class="st14"/><path d="M157.533,49.957c0-4.112-0.046-6.465-1.067-7.664s-1.857-1.265-3.482-1.265" class="st14"/><path d="M119.033,76.956c0,4.873-0.061,7.659-1.419,9.079c-1.356,1.422-2.467,1.498-4.626,1.498" class="st14"/><path d="M119.034,98.126c0-4.873,0.062-7.659,1.417-9.082c1.356-1.42,2.467-1.496,4.626-1.496" class="st14"/><path d="M119.034,76.956c0,4.873,0.062,7.659,1.417,9.079c1.356,1.422,2.467,1.498,4.626,1.498" class="st14"/><path d="M119.033,98.126c0-4.873-0.061-7.659-1.419-9.082c-1.356-1.42-2.467-1.496-4.626-1.496" class="st14"/></g></g></svg>
\ No newline at end of file
diff --git a/assets/images/qrcode.svg b/assets/images/qrcode.svg
index 42c49c958246..47d61d7dd47c 100644
--- a/assets/images/qrcode.svg
+++ b/assets/images/qrcode.svg
@@ -1,14 +1 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 28.1.0, 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">
-<g>
-	<path d="M11.143,2v6.857H18V2H11.143z M15.714,6.571h-2.286V4.286h2.286V6.571z"/>
-	<path d="M2,18h6.857v-6.857H2V18z M4.286,13.429h2.286v2.286H4.286V13.429z"/>
-	<polygon points="16.857,12.286 14.571,12.286 14.571,11.143 11.143,11.143 11.143,18 13.429,18 13.429,14.571 14.571,14.571 
-		14.571,15.714 18,15.714 18,11.143 16.857,11.143 	"/>
-	<rect x="16.857" y="16.857" width="1.143" height="1.143"/>
-	<rect x="14.571" y="16.857" width="1.143" height="1.143"/>
-	<path d="M2,8.857h6.857V2H2V8.857z M4.286,4.286h2.286v2.286H4.286V4.286z"/>
-</g>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" id="Layer_1" x="0" y="0" version="1.1" viewBox="0 0 20 20" style="enable-background:new 0 0 20 20" xml:space="preserve"><g><path d="M11.143,2v6.857H18V2H11.143z M15.714,6.571h-2.286V4.286h2.286V6.571z"/><path d="M2,18h6.857v-6.857H2V18z M4.286,13.429h2.286v2.286H4.286V13.429z"/><polygon points="16.857 12.286 14.571 12.286 14.571 11.143 11.143 11.143 11.143 18 13.429 18 13.429 14.571 14.571 14.571 14.571 15.714 18 15.714 18 11.143 16.857 11.143"/><rect width="1.143" height="1.143" x="16.857" y="16.857"/><rect width="1.143" height="1.143" x="14.571" y="16.857"/><path d="M2,8.857h6.857V2H2V8.857z M4.286,4.286h2.286v2.286H4.286V4.286z"/></g></svg>
\ No newline at end of file
diff --git a/assets/images/receipt-plus.svg b/assets/images/receipt-plus.svg
new file mode 100644
index 000000000000..ca4d96b3dfa5
--- /dev/null
+++ b/assets/images/receipt-plus.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" id="Layer_1" x="0" y="0" version="1.1" viewBox="0 0 20 20" style="enable-background:new 0 0 20 20" xml:space="preserve"><path d="M3,1.4v17.3c0,0.4,0.5,0.5,0.7,0.3L4.4,18c0.2-0.2,0.4-0.2,0.6,0l1.1,1.3c0.2,0.2,0.4,0.2,0.6,0L7.9,18	c0.2-0.2,0.4-0.2,0.6,0l1.1,1.3c0.2,0.2,0.4,0.2,0.6,0l1.1-1.3c0.2-0.2,0.4-0.2,0.6,0l0.3,0.3C12.1,17.9,12,17.5,12,17v-0.5h-0.5	c-1.7,0-3-1.3-3-3c0-1.7,1.3-3,3-3H12V10c0-1.7,1.3-3,3-3c0.8,0,1.5,0.3,2,0.8V1.4c0-0.4-0.5-0.5-0.7-0.3L15.6,2	c-0.2,0.2-0.4,0.2-0.6,0l-1.1-1.3c-0.2-0.2-0.4-0.2-0.6,0L12.1,2c-0.2,0.2-0.4,0.2-0.6,0l-1.1-1.3c-0.2-0.2-0.4-0.2-0.6,0L8.6,2	C8.4,2.1,8.1,2.1,7.9,2L6.8,0.6c-0.2-0.2-0.4-0.2-0.6,0L5.1,2C4.9,2.1,4.6,2.1,4.4,2L3.7,1.1C3.5,0.8,3,1,3,1.4z"/><path d="M15,9c0.6,0,1,0.4,1,1v2.5h2.5c0.6,0,1,0.4,1,1s-0.4,1-1,1H16V17c0,0.6-0.4,1-1,1s-1-0.4-1-1v-2.5h-2.5c-0.6,0-1-0.4-1-1	s0.4-1,1-1H14V10C14,9.4,14.4,9,15,9z"/></svg>
\ No newline at end of file
diff --git a/assets/images/receipt-scan.svg b/assets/images/receipt-scan.svg
index ecdf3cf2e115..f7c164c948c8 100644
--- a/assets/images/receipt-scan.svg
+++ b/assets/images/receipt-scan.svg
@@ -1,14 +1 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 28.1.0, 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="M3,1.364V7h14V1.364c0-0.372-0.458-0.545-0.701-0.265l-0.748,0.861c-0.159,0.184-0.443,0.184-0.602,0l-1.148-1.322
-	c-0.159-0.184-0.443-0.184-0.602,0l-1.148,1.322c-0.159,0.184-0.443,0.184-0.602,0l-1.148-1.322c-0.159-0.184-0.443-0.184-0.602,0
-	L8.551,1.959c-0.159,0.184-0.443,0.184-0.602,0L6.801,0.638c-0.159-0.184-0.443-0.184-0.602,0L5.051,1.959
-	c-0.159,0.184-0.443,0.184-0.602,0L3.701,1.098C3.458,0.818,3,0.991,3,1.364z"/>
-<path d="M3,18.636V13h14v5.636c0,0.372-0.458,0.545-0.701,0.265l-0.748-0.861c-0.159-0.184-0.443-0.184-0.602,0l-1.148,1.322
-	c-0.159,0.184-0.443,0.184-0.602,0l-1.148-1.322c-0.159-0.184-0.443-0.184-0.602,0l-1.148,1.322c-0.159,0.184-0.443,0.184-0.602,0
-	L8.551,18.04c-0.159-0.184-0.443-0.184-0.602,0l-1.148,1.322c-0.159,0.184-0.443,0.184-0.602,0L5.051,18.04
-	c-0.159-0.184-0.443-0.184-0.602,0l-0.748,0.861C3.458,19.182,3,19.008,3,18.636z"/>
-<path d="M2,9c-0.552,0-1,0.448-1,1c0,0.552,0.448,1,1,1h16c0.552,0,1-0.448,1-1c0-0.552-0.448-1-1-1H2z"/>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" id="Layer_1" x="0" y="0" version="1.1" viewBox="0 0 20 20" style="enable-background:new 0 0 20 20" xml:space="preserve"><path d="M3,1.364V7h14V1.364c0-0.372-0.458-0.545-0.701-0.265l-0.748,0.861c-0.159,0.184-0.443,0.184-0.602,0l-1.148-1.322	c-0.159-0.184-0.443-0.184-0.602,0l-1.148,1.322c-0.159,0.184-0.443,0.184-0.602,0l-1.148-1.322c-0.159-0.184-0.443-0.184-0.602,0	L8.551,1.959c-0.159,0.184-0.443,0.184-0.602,0L6.801,0.638c-0.159-0.184-0.443-0.184-0.602,0L5.051,1.959	c-0.159,0.184-0.443,0.184-0.602,0L3.701,1.098C3.458,0.818,3,0.991,3,1.364z"/><path d="M3,18.636V13h14v5.636c0,0.372-0.458,0.545-0.701,0.265l-0.748-0.861c-0.159-0.184-0.443-0.184-0.602,0l-1.148,1.322	c-0.159,0.184-0.443,0.184-0.602,0l-1.148-1.322c-0.159-0.184-0.443-0.184-0.602,0l-1.148,1.322c-0.159,0.184-0.443,0.184-0.602,0	L8.551,18.04c-0.159-0.184-0.443-0.184-0.602,0l-1.148,1.322c-0.159,0.184-0.443,0.184-0.602,0L5.051,18.04	c-0.159-0.184-0.443-0.184-0.602,0l-0.748,0.861C3.458,19.182,3,19.008,3,18.636z"/><path d="M2,9c-0.552,0-1,0.448-1,1c0,0.552,0.448,1,1,1h16c0.552,0,1-0.448,1-1c0-0.552-0.448-1-1-1H2z"/></svg>
\ No newline at end of file
diff --git a/assets/images/receipt-slash.svg b/assets/images/receipt-slash.svg
new file mode 100644
index 000000000000..f7e7457e3e64
--- /dev/null
+++ b/assets/images/receipt-slash.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" id="Layer_1" data-name="Layer 1" version="1.1" viewBox="0 0 20 20"><defs><style>.cls-1{stroke-width:0}</style></defs><path d="M17,1.364v10.775L5.187,1.803l1.012-1.165c.159-.184.443-.184.602,0l1.148,1.322c.159.184.443.184.602,0l1.148-1.322c.159-.184.443-.184.602,0l1.148,1.322c.159.184.443.184.602,0l1.148-1.322c.159-.184.443-.184.602,0l1.148,1.322c.159.184.443.184.602,0l.748-.861c.243-.28.701-.107.701.265Z" class="cls-1"/><path d="M3,18.636V7.861l11.813,10.336-1.012,1.165c-.159.184-.443.184-.602,0l-1.148-1.322c-.159-.184-.443-.184-.602,0l-1.148,1.322c-.159.184-.443.184-.602,0l-1.148-1.322c-.159-.184-.443-.184-.602,0l-1.148,1.322c-.159.184-.443.184-.602,0l-1.148-1.322c-.159-.184-.443-.184-.602,0l-.748.861c-.243.28-.701.107-.701-.265Z" class="cls-1"/><path d="M2.659,2.247c-.416-.364-1.047-.322-1.411.094-.364.416-.322,1.047.094,1.411l16,14c.416.364,1.047.322,1.411-.094.364-.416.322-1.047-.094-1.411L2.659,2.247Z" class="cls-1"/></svg>
\ No newline at end of file
diff --git a/assets/images/simple-illustrations/advanced-approvals-icon-square.svg b/assets/images/simple-illustrations/advanced-approvals-icon-square.svg
new file mode 100644
index 000000000000..bd71512a9846
--- /dev/null
+++ b/assets/images/simple-illustrations/advanced-approvals-icon-square.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="42.66" height="23.722" fill="none" viewBox="-0.647 -9.26 43.953 45"><g id="Illustration"><g id="Shape"><path fill="#4ED7DE" d="M41.3682 21.4853C41.3682 22.6985 40.58 23.103 39.3949 23.103C38.2097 23.103 36.0795 23.103 34.2578 23.103C32.4362 23.103 30.3814 23.103 29.1233 23.103C27.8651 23.103 27.1479 22.6985 27.1479 21.4853C27.1479 18.25 30.7035 15.8235 34.2578 15.8235C37.8122 15.8235 41.3682 18.25 41.3682 21.4853Z"/><path fill="#4ED7DE" d="M37.4195 11.7794C37.4195 13.5662 36.0045 15.0147 34.2591 15.0147C32.5136 15.0147 31.0986 13.5662 31.0986 11.7794C31.0986 9.99262 32.5136 8.54413 34.2591 8.54413C36.0045 8.54413 37.4195 9.99262 37.4195 11.7794Z"/><path stroke="#002140" d="M41.3682 21.4853C41.3682 22.6985 40.58 23.103 39.3949 23.103C38.2097 23.103 36.0795 23.103 34.2578 23.103C32.4362 23.103 30.3814 23.103 29.1233 23.103C27.8651 23.103 27.1479 22.6985 27.1479 21.4853C27.1479 18.25 30.7035 15.8235 34.2578 15.8235C37.8122 15.8235 41.3682 18.25 41.3682 21.4853Z"/><path stroke="#002140" d="M37.4195 11.7794C37.4195 13.5662 36.0045 15.0147 34.2591 15.0147C32.5136 15.0147 31.0986 13.5662 31.0986 11.7794C31.0986 9.99262 32.5136 8.54413 34.2591 8.54413C36.0045 8.54413 37.4195 9.99262 37.4195 11.7794Z"/></g><g id="Shape_2"><path fill="#4BA6A6" d="M20.0376 8.91177C20.0376 9.62868 19.5719 9.86765 18.8716 9.86765C18.1712 9.86765 16.9125 9.86765 15.8361 9.86765C14.7596 9.86765 13.5455 9.86765 12.802 9.86765C12.0585 9.86765 11.6348 9.62868 11.6348 8.91177C11.6348 7 13.7358 5.56618 15.8361 5.56618C17.9364 5.56618 20.0376 7 20.0376 8.91177Z"/><path fill="#4BA6A6" d="M17.7043 3.17647C17.7043 4.23231 16.8682 5.08824 15.8368 5.08824C14.8054 5.08824 13.9692 4.23231 13.9692 3.17647C13.9692 2.12064 14.8054 1.26471 15.8368 1.26471C16.8682 1.26471 17.7043 2.12064 17.7043 3.17647Z"/><path stroke="#002140" d="M20.0376 8.91177C20.0376 9.62868 19.5719 9.86765 18.8716 9.86765C18.1712 9.86765 16.9125 9.86765 15.8361 9.86765C14.7596 9.86765 13.5455 9.86765 12.802 9.86765C12.0585 9.86765 11.6348 9.62868 11.6348 8.91177C11.6348 7 13.7358 5.56618 15.8361 5.56618C17.9364 5.56618 20.0376 7 20.0376 8.91177Z"/><path stroke="#002140" d="M17.7043 3.17647C17.7043 4.23231 16.8682 5.08824 15.8368 5.08824C14.8054 5.08824 13.9692 4.23231 13.9692 3.17647C13.9692 2.12064 14.8054 1.26471 15.8368 1.26471C16.8682 1.26471 17.7043 2.12064 17.7043 3.17647Z"/></g><g id="Shape_3"><path fill="#4BA6A6" d="M20.0376 22.1471C20.0376 22.864 19.5719 23.1029 18.8716 23.1029C18.1712 23.1029 16.9125 23.1029 15.8361 23.1029C14.7596 23.1029 13.5455 23.1029 12.802 23.1029C12.0585 23.1029 11.6348 22.864 11.6348 22.1471C11.6348 20.2353 13.7358 18.8015 15.8361 18.8015C17.9364 18.8015 20.0376 20.2353 20.0376 22.1471Z"/><path fill="#4BA6A6" d="M17.7043 16.4118C17.7043 17.4676 16.8682 18.3235 15.8368 18.3235C14.8054 18.3235 13.9692 17.4676 13.9692 16.4118C13.9692 15.3559 14.8054 14.5 15.8368 14.5C16.8682 14.5 17.7043 15.3559 17.7043 16.4118Z"/><path stroke="#002140" d="M20.0376 22.1471C20.0376 22.864 19.5719 23.1029 18.8716 23.1029C18.1712 23.1029 16.9125 23.1029 15.8361 23.1029C14.7596 23.1029 13.5455 23.1029 12.802 23.1029C12.0585 23.1029 11.6348 22.864 11.6348 22.1471C11.6348 20.2353 13.7358 18.8015 15.8361 18.8015C17.9364 18.8015 20.0376 20.2353 20.0376 22.1471Z"/><path stroke="#002140" d="M17.7043 16.4118C17.7043 17.4676 16.8682 18.3235 15.8368 18.3235C14.8054 18.3235 13.9692 17.4676 13.9692 16.4118C13.9692 15.3559 14.8054 14.5 15.8368 14.5C16.8682 14.5 17.7043 15.3559 17.7043 16.4118Z"/></g><g id="Shape_4"><path fill="#28736D" d="M6.46386 7.22057C6.46386 7.71689 6.14143 7.88233 5.65658 7.88233C5.17173 7.88233 4.30029 7.88233 3.55508 7.88233C2.80986 7.88233 1.96927 7.88233 1.45456 7.88233C0.939856 7.88233 0.646484 7.71689 0.646484 7.22057C0.646484 5.89704 2.10103 4.90439 3.55508 4.90439C5.00913 4.90439 6.46386 5.89704 6.46386 7.22057Z"/><path fill="#28736D" d="M4.8485 3.24998C4.8485 3.98095 4.26964 4.57351 3.55557 4.57351C2.84151 4.57351 2.26264 3.98095 2.26264 3.24998C2.26264 2.51902 2.84151 1.92645 3.55557 1.92645C4.26964 1.92645 4.8485 2.51902 4.8485 3.24998Z"/><path stroke="#002140" d="M6.46386 7.22057C6.46386 7.71689 6.14143 7.88233 5.65658 7.88233C5.17173 7.88233 4.30029 7.88233 3.55508 7.88233C2.80986 7.88233 1.96927 7.88233 1.45456 7.88233C0.939856 7.88233 0.646484 7.71689 0.646484 7.22057C0.646484 5.89704 2.10103 4.90439 3.55508 4.90439C5.00913 4.90439 6.46386 5.89704 6.46386 7.22057Z"/><path stroke="#002140" d="M4.8485 3.24998C4.8485 3.98095 4.26964 4.57351 3.55557 4.57351C2.84151 4.57351 2.26264 3.98095 2.26264 3.24998C2.26264 2.51902 2.84151 1.92645 3.55557 1.92645C4.26964 1.92645 4.8485 2.51902 4.8485 3.24998Z"/></g><g id="Shape_5"><path fill="#28736D" d="M6.46386 20.4559C6.46386 20.9522 6.14143 21.1176 5.65658 21.1176C5.17173 21.1176 4.30029 21.1176 3.55508 21.1176C2.80986 21.1176 1.96927 21.1176 1.45456 21.1176C0.939856 21.1176 0.646484 20.9522 0.646484 20.4559C0.646484 19.1323 2.10103 18.1397 3.55508 18.1397C5.00913 18.1397 6.46386 19.1323 6.46386 20.4559Z"/><path fill="#28736D" d="M4.8485 16.4853C4.8485 17.2162 4.26964 17.8088 3.55557 17.8088C2.84151 17.8088 2.26264 17.2162 2.26264 16.4853C2.26264 15.7543 2.84151 15.1617 3.55557 15.1617C4.26964 15.1617 4.8485 15.7543 4.8485 16.4853Z"/><path stroke="#002140" d="M6.46386 20.4559C6.46386 20.9522 6.14143 21.1176 5.65658 21.1176C5.17173 21.1176 4.30029 21.1176 3.55508 21.1176C2.80986 21.1176 1.96927 21.1176 1.45456 21.1176C0.939856 21.1176 0.646484 20.9522 0.646484 20.4559C0.646484 19.1323 2.10103 18.1397 3.55508 18.1397C5.00913 18.1397 6.46386 19.1323 6.46386 20.4559Z"/><path stroke="#002140" d="M4.8485 16.4853C4.8485 17.2162 4.26964 17.8088 3.55557 17.8088C2.84151 17.8088 2.26264 17.2162 2.26264 16.4853C2.26264 15.7543 2.84151 15.1617 3.55557 15.1617C4.26964 15.1617 4.8485 15.7543 4.8485 16.4853Z"/></g><g id="Group 77"><path id="Vector" fill="#03D47C" d="M34.7705 20.2027L33.7954 21.7006C33.7954 21.7006 35.5267 21.6758 38.7446 24.971C38.7446 24.971 39.8902 18.78 43.2793 15.0357L43.133 14.8363L41.8162 14.2374C41.8162 14.2374 39.2318 17.0579 37.9642 22.0008C37.9642 22.0008 36.3306 20.4532 34.7698 20.2035L34.7705 20.2027Z"/><path id="Vector_2" stroke="#002140" stroke-linecap="round" stroke-linejoin="round" d="M41.8439 14.2149C40.6872 15.2607 38.3467 19.5625 37.9404 22.0084C37.775 21.8451 36.9491 20.8934 34.7056 20.1193C34.6211 20.2622 33.8929 21.5088 33.8032 21.642C35.8593 21.9083 38.6877 24.8372 38.7774 24.9869C39.4196 21.1846 41.6219 16.4832 43.3069 14.9801C43.1137 14.877 42.0085 14.3255 41.8439 14.2142V14.2149Z"/></g><g id="Group 2272"><path id="Vector_3" fill="#03D47C" d="M17.0575 8.86864L16.6814 9.44639C16.6814 9.44639 17.3492 9.43682 18.5903 10.7078C18.5903 10.7078 19.0322 8.31991 20.3394 6.87569L20.283 6.79879L19.775 6.56781C19.775 6.56781 18.7782 7.65569 18.2893 9.56217C18.2893 9.56217 17.6592 8.96527 17.0572 8.86893L17.0575 8.86864Z"/><path id="Vector_4" stroke="#002140" stroke-linecap="round" stroke-linejoin="round" d="M18.4803 7.63025C18.3024 7.97488 18.1291 8.35617 17.997 8.72278C17.7882 8.60221 17.525 8.47742 17.1957 8.36381C16.9712 8.28632 16.7231 8.37752 16.6022 8.582C16.5959 8.59267 16.5795 8.62056 16.5574 8.6584C16.5231 8.7168 16.475 8.79889 16.4285 8.87784C16.3893 8.94436 16.3505 9.01005 16.3195 9.06199C16.2932 9.10614 16.278 9.13101 16.2724 9.14033C16.2704 9.14359 16.2695 9.14495 16.2698 9.14455C16.173 9.2883 16.1576 9.47192 16.229 9.62981C16.3004 9.78771 16.4485 9.89738 16.6203 9.91964C16.727 9.93345 16.8789 9.98888 17.0678 10.0958C17.251 10.1994 17.4398 10.3346 17.615 10.4754C17.789 10.6153 17.9419 10.7546 18.0526 10.8618C18.1079 10.9153 18.1513 10.9594 18.1803 10.99C18.1922 11.0026 18.2006 11.0117 18.2059 11.0176C18.3195 11.1663 18.5085 11.2405 18.6956 11.2053C18.9014 11.1665 19.0613 11.0037 19.0961 10.7972C19.2112 10.1161 19.4698 9.33839 19.7805 8.65962C20.0988 7.96407 20.4387 7.4453 20.683 7.22735C20.805 7.11856 20.8661 6.95703 20.8466 6.79476C20.8272 6.63249 20.7297 6.48997 20.5855 6.41306C20.5601 6.39952 20.4996 6.36872 20.4301 6.33332C20.3855 6.31061 20.3372 6.286 20.2921 6.26285C20.2307 6.23139 20.1718 6.20086 20.125 6.176C20.0962 6.16072 20.0788 6.15109 20.0699 6.14613C20.0606 6.14102 20.0604 6.1409 20.066 6.14469C19.9128 6.04104 19.7148 6.03046 19.5514 6.11721C19.5088 6.13984 19.4703 6.16814 19.4368 6.20088C19.2808 6.34581 19.1178 6.56269 18.9671 6.79091C18.806 7.0351 18.6376 7.32553 18.4803 7.63025ZM18.215 11.0281C18.2148 11.028 18.2128 11.0258 18.2096 11.0218C18.2135 11.0263 18.2151 11.0283 18.215 11.0281Z"/></g><g id="Group 2273"><path id="Vector_5" fill="#03D47C" d="M17.0575 22.1039L16.6814 22.6817C16.6814 22.6817 17.3492 22.6721 18.5903 23.9431C18.5903 23.9431 19.0322 21.5552 20.3394 20.111L20.283 20.0341L19.775 19.8031C19.775 19.8031 18.7782 20.891 18.2893 22.7975C18.2893 22.7975 17.6592 22.2006 17.0572 22.1042L17.0575 22.1039Z"/><path id="Vector_6" stroke="#002140" stroke-linecap="round" stroke-linejoin="round" d="M18.4803 20.8655C18.3024 21.2102 18.1291 21.5915 17.997 21.9581C17.7882 21.8375 17.525 21.7127 17.1957 21.5991C16.9712 21.5216 16.7231 21.6128 16.6022 21.8173C16.5959 21.828 16.5796 21.8559 16.5574 21.8937C16.5231 21.9521 16.475 22.0342 16.4285 22.1131C16.3893 22.1797 16.3505 22.2453 16.3195 22.2973C16.2932 22.3414 16.278 22.3663 16.2724 22.3756C16.2704 22.3789 16.2695 22.3802 16.2698 22.3798C16.173 22.5236 16.1576 22.7072 16.229 22.8651C16.3004 23.023 16.4485 23.1327 16.6203 23.1549C16.727 23.1687 16.8789 23.2242 17.0678 23.3311C17.251 23.4347 17.4398 23.5699 17.615 23.7107C17.789 23.8506 17.9419 23.9899 18.0526 24.0971C18.1079 24.1506 18.1513 24.1947 18.1803 24.2253C18.1922 24.2378 18.2006 24.247 18.2059 24.2528C18.3195 24.4016 18.5085 24.4758 18.6956 24.4406C18.9014 24.4018 19.0613 24.239 19.0961 24.0325C19.2112 23.3514 19.4698 22.5737 19.7805 21.8949C20.0988 21.1994 20.4387 20.6806 20.683 20.4626C20.805 20.3538 20.8661 20.1923 20.8466 20.0301C20.8272 19.8678 20.7297 19.7253 20.5855 19.6484C20.5601 19.6348 20.4996 19.604 20.4301 19.5686C20.3855 19.5459 20.3372 19.5213 20.2921 19.4981C20.2307 19.4667 20.1718 19.4361 20.125 19.4113C20.0962 19.396 20.0788 19.3864 20.0699 19.3814C20.0606 19.3763 20.0604 19.3762 20.066 19.38C19.9128 19.2763 19.7148 19.2658 19.5514 19.3525C19.5088 19.3751 19.4703 19.4034 19.4368 19.4362C19.2808 19.5811 19.1178 19.798 18.9671 20.0262C18.806 20.2704 18.6376 20.5608 18.4803 20.8655ZM18.215 24.2634C18.2148 24.2633 18.2128 24.261 18.2096 24.2571C18.2135 24.2616 18.2151 24.2636 18.215 24.2634Z"/></g><g id="Group 2269"><g id="Vector_7"><path fill="#0164BF" d="M9.96058 4.22149L9.99594 4.94304L11.4077 3.84857L9.89474 2.87691L9.93324 3.6615"/><path stroke="#0164BF" stroke-linecap="round" stroke-linejoin="round" d="M9.96058 4.22149L9.99594 4.94304L11.4077 3.84857L9.89474 2.87691L9.93324 3.6615"/></g><g id="Vector_8"><path fill="#0164BF" d="M9.96161 4.18544L8.09736 4.2186L8.03022 4.21875L8.00085 3.68853L9.93957 3.67334"/><path stroke="#0164BF" stroke-linecap="round" stroke-linejoin="round" d="M9.96161 4.18544L8.09736 4.2186L8.03022 4.21875L8.00085 3.68853L9.93957 3.67334"/></g></g><g id="Group 2270"><g id="Vector_9"><path fill="#0164BF" d="M9.96058 17.4568L9.99594 18.1783L11.4077 17.0839L9.89474 16.1122L9.93324 16.8968"/><path stroke="#0164BF" stroke-linecap="round" stroke-linejoin="round" d="M9.96058 17.4568L9.99594 18.1783L11.4077 17.0839L9.89474 16.1122L9.93324 16.8968"/></g><g id="Vector_10"><path fill="#0164BF" d="M9.96161 17.4207L8.09736 17.4539L8.03022 17.454L8.00085 16.9238L9.93957 16.9086"/><path stroke="#0164BF" stroke-linecap="round" stroke-linejoin="round" d="M9.96161 17.4207L8.09736 17.4539L8.03022 17.454L8.00085 16.9238L9.93957 16.9086"/></g></g><g id="Group 2268"><g id="Vector_11"><path fill="#0164BF" d="M24.5959 15.4391L25.3306 16.6031L26.6506 13.3986L23.2269 13.2701L24.0259 14.5357"/><path stroke="#0164BF" stroke-linecap="round" stroke-linejoin="round" d="M24.5959 15.4391L25.3306 16.6031L26.6506 13.3986L23.2269 13.2701L24.0259 14.5357"/></g><g id="Vector_12"><path fill="#0164BF" d="M24.5638 15.3781L21.4979 17.2639L21.3865 17.3301L20.841 16.4781L24.0475 14.5491"/><path stroke="#0164BF" stroke-linecap="round" stroke-linejoin="round" d="M24.5638 15.3781L21.4979 17.2639L21.3865 17.3301L20.841 16.4781L24.0475 14.5491"/></g></g><g id="Group 2271"><g id="Vector_13"><path fill="#0164BF" d="M24.5959 5.70077L25.3306 4.53681L26.6506 7.74133L23.2269 7.86983L24.0259 6.60423"/><path stroke="#0164BF" stroke-linecap="round" stroke-linejoin="round" d="M24.5959 5.70077L25.3306 4.53681L26.6506 7.74133L23.2269 7.86983L24.0259 6.60423"/></g><g id="Vector_14"><path fill="#0164BF" d="M24.5638 5.76176L21.4979 3.87603L21.3865 3.80984L20.841 4.66183L24.0475 6.59084"/><path stroke="#0164BF" stroke-linecap="round" stroke-linejoin="round" d="M24.5638 5.76176L21.4979 3.87603L21.3865 3.80984L20.841 4.66183L24.0475 6.59084"/></g></g></g></svg>
\ No newline at end of file
diff --git a/assets/images/simple-illustrations/emptystate__big-vault.svg b/assets/images/simple-illustrations/emptystate__big-vault.svg
new file mode 100644
index 000000000000..a1d18da1b117
--- /dev/null
+++ b/assets/images/simple-illustrations/emptystate__big-vault.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" id="Layer_1" x="0" y="0" version="1.1" viewBox="0 0 262 152" style="enable-background:new 0 0 262 152" xml:space="preserve"><style type="text/css">.st0{fill:#d18000}.st1{fill:#722b03}.st2{fill:#003c73}.st3{fill:#fed607}.st4{fill:#fff2b2}.st5{fill:#e4bc07}.st6{fill:#002140}.st7{fill:none;stroke:#002140;stroke-linecap:round;stroke-linejoin:round}.st8{fill:#50eef6}</style><path d="M152.957,142.282h-6.556l-5.242-1.416L1.607,142.282V5.848h151.35V142.282z" class="st0"/><path d="M152.801,142.106l-11.139-1.298l-0.474,1.298H14.495V18.058h138.305V142.106z" class="st1"/><path d="M81.263,132.666c26.026,0,47.125-21.021,47.125-46.952c0-25.931-21.099-46.952-47.125-46.952	c-26.027,0-47.125,21.021-47.125,46.952C34.138,111.645,55.236,132.666,81.263,132.666z" class="st2"/><path d="M123.737,106.802l-3.021-4.778h-6.845l-4.356-7.52h-6.577L98.85,87.16h-6.756l-4.801-7.608h-13.51l-4.177,7.256	h-6.488l-4.356,7.608h-6.756l-4.356,7.432h-6.845l-1.779,3.45c0,0,5.867,13.715,18.932,21.147s27.467,6.016,30.577,5.84	c3.11-0.176,24.534-4.955,35.199-25.483H123.737z" class="st3"/><path d="M123.737,106.802l-3.022-4.776l4.887-0.266L123.737,106.802z" class="st4"/><path d="M113.871,102.026h6.044l-4.533-7.434h-5.867L113.871,102.026z" class="st4"/><path d="M102.938,94.504h5.599l-4.088-7.253l-5.601-0.091L102.938,94.504z" class="st4"/><path d="M92.094,87.16h6.132l-4.444-7.784h-6.132L92.094,87.16z" class="st4"/><path d="M82.005,79.552c0,0-0.177,1.637-2.21,2.189c-0.964,0.269-1.982,0.216-2.984,0.187	c-0.086-0.003-0.177-0.005-0.257,0.027c-0.129,0.051-0.212,0.173-0.292,0.288c-1.203,1.757-3.319,2.853-5.454,2.829	c0,0,2.398-5.651,3.954-5.651c1.557,0,7.244,0.133,7.244,0.133V79.552z" class="st4"/><path d="M71.203,87.205c0,0-0.177,1.637-2.21,2.189c-0.964,0.269-1.982,0.216-2.984,0.187	c-0.086-0.003-0.177-0.005-0.257,0.027c-0.129,0.051-0.212,0.173-0.292,0.288c-1.203,1.757-3.319,2.853-5.454,2.829	c0,0,2.398-5.651,3.954-5.651c1.556,0,7.244,0.133,7.244,0.133V87.205z" class="st4"/><path d="M59.708,94.754c0,0-0.177,1.637-2.21,2.189c-0.964,0.269-1.982,0.216-2.984,0.187	c-0.086-0.003-0.177-0.005-0.257,0.027c-0.129,0.051-0.212,0.173-0.292,0.288c-1.203,1.757-3.319,2.853-5.454,2.829	c0,0,2.398-5.65,3.954-5.65c1.557,0,7.244,0.133,7.244,0.133V94.754z" class="st4"/><path d="M81.871,94.754c0,0-0.177,1.637-2.21,2.189c-0.964,0.269-1.982,0.216-2.984,0.187	c-0.086-0.003-0.177-0.005-0.257,0.027c-0.129,0.051-0.212,0.173-0.292,0.288c-1.203,1.757-3.319,2.853-5.454,2.829	c0,0,2.398-5.65,3.954-5.65c1.556,0,7.244,0.133,7.244,0.133V94.754z" class="st4"/><path d="M93.19,87.029c0,0-0.177,1.637-2.21,2.189c-0.964,0.269-1.982,0.216-2.984,0.187	c-0.086-0.003-0.177-0.005-0.257,0.027c-0.129,0.051-0.212,0.173-0.292,0.288c-1.203,1.757-3.319,2.853-5.454,2.829l2.604-5.003	c0,0,1.09-0.648,1.348-0.648c1.557,0,7.244,0.133,7.244,0.133L93.19,87.029z" class="st4"/><path d="M103.56,94.578c0,0-0.177,1.637-2.211,2.189c-0.964,0.269-1.982,0.216-2.984,0.187	c-0.086-0.003-0.177-0.005-0.257,0.027c-0.129,0.051-0.212,0.173-0.292,0.288c-1.203,1.757-3.319,2.853-5.454,2.829l2.604-5.003	c0,0,1.09-0.648,1.348-0.648c1.556,0,7.244,0.133,7.244,0.133L103.56,94.578z" class="st4"/><path d="M71.086,102.01c0,0-0.177,1.638-2.21,2.19c-0.964,0.269-1.982,0.216-2.984,0.186	c-0.086-0.002-0.177-0.005-0.257,0.027c-0.129,0.051-0.212,0.173-0.292,0.288c-1.203,1.757-3.319,2.853-5.454,2.829l2.604-5.002	c0,0,1.09-0.648,1.348-0.648c1.556,0,7.244,0.133,7.244,0.133L71.086,102.01z" class="st4"/><path d="M93.013,102.01c0,0-0.177,1.638-2.21,2.19c-0.964,0.269-1.982,0.216-2.984,0.186	c-0.086-0.002-0.177-0.005-0.257,0.027c-0.129,0.051-0.212,0.173-0.292,0.288c-1.203,1.757-3.319,2.853-5.454,2.829l2.604-5.002	c0,0,1.09-0.648,1.348-0.648c1.556,0,7.244,0.133,7.244,0.133L93.013,102.01z" class="st4"/><path d="M114.758,102.01c0,0-0.177,1.638-2.21,2.19c-0.965,0.269-1.983,0.216-2.985,0.186	c-0.085-0.002-0.177-0.005-0.257,0.027c-0.129,0.051-0.212,0.173-0.292,0.288c-1.203,1.757-3.319,2.853-5.454,2.829l2.604-5.002	c0,0,1.09-0.648,1.347-0.648c1.557,0,7.244,0.133,7.244,0.133L114.758,102.01z" class="st4"/><path d="M104.093,109.56c0,0-0.177,1.637-2.21,2.189c-0.964,0.269-1.982,0.216-2.984,0.187	c-0.086-0.003-0.177-0.006-0.257,0.026c-0.129,0.051-0.212,0.174-0.292,0.288c-1.203,1.758-3.319,2.854-5.454,2.83l2.604-5.003	c0,0,1.09-0.648,1.348-0.648c1.556,0,7.244,0.133,7.244,0.133L104.093,109.56z" class="st4"/><path d="M120.587,111.936c-0.086-0.003-0.177-0.006-0.257,0.026c-0.129,0.051-0.212,0.174-0.292,0.288	c-1.203,1.758-3.319,2.854-5.454,2.83l2.604-5.003c0,0,1.09-0.648,1.347-0.648c0.656,0,2.052,0.024,3.445,0.051" class="st4"/><path d="M115.293,116.874c0,0-0.176,1.638-2.21,2.19c-0.964,0.269-1.982,0.216-2.984,0.186	c-0.086-0.002-0.177-0.005-0.257,0.027c-0.129,0.051-0.212,0.173-0.292,0.288c-1.203,1.757-3.319,2.853-5.454,2.829l2.603-5.002	c0,0,1.091-0.648,1.348-0.648c1.556,0,7.244,0.133,7.244,0.133L115.293,116.874z" class="st4"/><path d="M103.796,124.544c0,0-0.177,1.637-2.211,2.189c-0.964,0.269-1.982,0.216-2.984,0.187	c-0.086-0.003-0.177-0.006-0.257,0.026c-0.129,0.051-0.212,0.174-0.292,0.288c-1.203,1.758-3.319,2.854-5.454,2.83l2.604-5.003	c0,0,1.09-0.648,1.348-0.648c1.556,0,7.244,0.133,7.244,0.133L103.796,124.544z" class="st4"/><path d="M81.989,124.544c0,0-0.177,1.637-2.21,2.189c-0.964,0.269-1.982,0.216-2.984,0.187	c-0.086-0.003-0.177-0.006-0.257,0.026c-0.129,0.051-0.212,0.174-0.292,0.288c-1.203,1.758-3.319,2.854-5.454,2.83l2.604-5.003	c0,0,1.09-0.648,1.348-0.648c1.556,0,7.244,0.133,7.244,0.133L81.989,124.544z" class="st4"/><path d="M54.798,124.544c0.171-0.08,0.316-0.134,0.391-0.134c1.556,0,7.244,0.134,7.244,0.134s-0.177,1.637-2.21,2.189	c-0.477,0.133-0.967,0.187-1.463,0.205" class="st4"/><path d="M82.048,109.56c0,0-0.177,1.637-2.21,2.189c-0.965,0.269-1.982,0.216-2.984,0.187	c-0.086-0.003-0.177-0.006-0.257,0.026c-0.129,0.051-0.212,0.174-0.292,0.288c-1.203,1.758-3.319,2.854-5.454,2.83l2.604-5.003	c0,0,1.09-0.648,1.347-0.648c1.556,0,7.244,0.133,7.244,0.133L82.048,109.56z" class="st4"/><path d="M71.383,116.816c0,0-0.177,1.637-2.21,2.189c-0.964,0.269-1.982,0.216-2.984,0.187	c-0.086-0.003-0.177-0.006-0.257,0.026c-0.129,0.051-0.212,0.174-0.292,0.288c-1.203,1.758-3.319,2.854-5.454,2.83l2.604-5.003	c0,0,1.09-0.648,1.347-0.648c1.557,0,7.244,0.133,7.244,0.133L71.383,116.816z" class="st4"/><path d="M93.307,116.816c0,0-0.177,1.637-2.21,2.189c-0.964,0.269-1.982,0.216-2.984,0.187	c-0.086-0.003-0.177-0.006-0.257,0.026c-0.129,0.051-0.212,0.174-0.292,0.288c-1.203,1.758-3.319,2.854-5.454,2.83l2.604-5.003	c0,0,1.09-0.648,1.347-0.648c1.556,0,7.244,0.133,7.244,0.133L93.307,116.816z" class="st4"/><path d="M60.241,109.56c0,0-0.177,1.637-2.21,2.189c-0.964,0.269-1.982,0.216-2.984,0.187	c-0.086-0.003-0.177-0.006-0.257,0.026c-0.129,0.051-0.212,0.174-0.292,0.288c-1.203,1.758-3.319,2.854-5.454,2.83l2.604-5.003	c0,0,1.09-0.648,1.347-0.648c1.556,0,7.244,0.133,7.244,0.133L60.241,109.56z" class="st4"/><path d="M46.006,116.696c2.242,0.032,6.001,0.12,6.001,0.12s-0.177,1.637-2.21,2.189	c-0.418,0.117-0.847,0.173-1.28,0.197" class="st4"/><path d="M38.652,105.184c0.825-1.539,1.937-3.248,2.792-3.248c1.556,0,7.244,0.133,7.244,0.133s-0.177,1.637-2.21,2.189	c-0.964,0.27-1.982,0.216-2.984,0.187c-0.086-0.003-0.177-0.005-0.257,0.027c-0.129,0.05-0.212,0.173-0.292,0.288	c-0.793,1.157-1.985,2.029-3.316,2.482" class="st4"/><path d="M80.939,93.797l3.689-6.637h-7.6L80.939,93.797z" class="st5"/><path d="M91.692,101.405l3.689-6.635h-7.6L91.692,101.405z" class="st5"/><path d="M69.738,101.229l3.689-6.637h-7.6L69.738,101.229z" class="st5"/><path d="M58.894,108.749l3.689-6.635h-7.6L58.894,108.749z" class="st5"/><path d="M47.961,115.829l3.689-6.637h-7.6L47.961,115.829z" class="st5"/><path d="M69.738,115.829l3.689-6.637h-7.6L69.738,115.829z" class="st5"/><path d="M80.759,108.749l3.689-6.635h-7.6L80.759,108.749z" class="st5"/><path d="M103.07,108.749l3.688-6.635h-7.6L103.07,108.749z" class="st5"/><path d="M113.914,116.359l3.689-6.637h-7.6L113.914,116.359z" class="st5"/><path d="M91.784,116.269l3.686-6.635h-7.597L91.784,116.269z" class="st5"/><path d="M81.027,123.261l3.689-6.637h-7.6L81.027,123.261z" class="st5"/><path d="M58.982,123.437l3.689-6.635h-7.6L58.982,123.437z" class="st5"/><path d="M102.804,123.437l3.689-6.635h-7.6L102.804,123.437z" class="st5"/><path d="M92.048,131.045l3.689-6.635h-7.6L92.048,131.045z" class="st5"/><path d="M69.915,130.781l3.689-6.637h-7.6L69.915,130.781z" class="st5"/><path d="M188.356,27.082c0,0-26.074-0.589-43.851,21.235c-10.429,12.032-13.157,27.371-13.036,38.104	c0.118,10.736,3.793,31.381,20.148,44.123c16.355,12.741,32,14.274,38.636,13.802c0,0,26.548,0.944,43.08-21.882	c16.532-22.827,12.977-43.531,10.488-53.088c-2.489-9.555-11.734-27.251-30.754-36.629c-10.668-4.6-20.62-5.523-24.711-5.661V27.082	z" class="st5"/><path d="M188.683,134.85c26.427,0,47.851-21.807,47.851-48.707c0-26.9-21.424-48.707-47.851-48.707	c-26.428,0-47.852,21.807-47.852,48.707C140.831,113.043,162.255,134.85,188.683,134.85z" class="st0"/><path d="M188.356,124.586c20.913,0,37.867-17.231,37.867-38.488c0-21.256-16.954-38.488-37.867-38.488	s-37.867,17.232-37.867,38.488C150.489,107.355,167.443,124.586,188.356,124.586z" class="st5"/><path d="M188.268,114.146c15.365,0,27.82-12.662,27.82-28.283c0-15.62-12.455-28.283-27.82-28.283	s-27.821,12.663-27.821,28.283C160.447,101.484,172.903,114.146,188.268,114.146z" class="st0"/><path d="M188.445,97.157c6.038,0,10.932-5.149,10.932-11.501c0-6.352-4.894-11.501-10.932-11.501	c-6.038,0-10.933,5.149-10.933,11.501C177.512,92.007,182.407,97.157,188.445,97.157z" class="st5"/><path d="M193.157,144.408c0,0,25.954-1.771,40.176-21.944c7.999-10.795,12.444-19.819,12.8-38.224	c0.356-18.403-11.201-36.984-22.932-45.301c-11.733-8.317-27.732-15.219-49.598-9.909c0,0,8.356-6.016,21.51-6.547	c13.156-0.531,41.065,1.061,58.666,33.8c5.687,11.501,8.178,26.899,5.154,40.877c-3.022,13.979-10.668,34.507-36.444,45.126	c-8.356,2.301-17.065,5.84-28.978,4.248l-0.357-2.123L193.157,144.408z" class="st0"/><path d="M184.209,27.319h9.245v-5.781c0,0-0.592-1.061-4.385-1.179c-3.794-0.117-4.978,1.061-4.978,1.061	L184.209,27.319z" class="st5"/><path d="M229.719,45.016l4.503-3.776c0,0,2.489-1.299,4.742,1.651c2.253,2.949,1.658,5.192,0.356,6.253	c-1.304,1.061-3.555,2.715-3.555,2.715l-6.044-6.843H229.719z" class="st5"/><path d="M245.956,90.079c0,0,5.106,0.376,5.687,0.117c0.581-0.259,2.371-1.771,2.489-3.776	c0.118-2.005-0.236-4.837-1.779-5.427c-1.54-0.589-6.162,0-6.162,0l-0.235,9.083V90.079z" class="st5"/><path d="M230.075,126.533l4.503,3.304c0,0,2.253,1.061,4.268-2.005c2.015-3.067,1.658-5.192,0.948-5.899	c-0.71-0.707-4.147-2.36-4.147-2.36l-5.569,6.96H230.075z" class="st5"/><path d="M184.327,144.111c0,0-0.357,5.662,0.356,6.488c0.71,0.827,7.94,0.235,7.94,0.235s0.772-0.413,0.831-2.36	c0.059-1.947-0.298-4.069-0.298-4.069l-8.829-0.296V144.111z" class="st5"/><path d="M183.497,37.936v9.437c0,0,8.058-0.472,10.429,0.235l0.118-9.909c0,0-6.757-0.707-10.547,0.235V37.936z" class="st0"/><path d="M186.224,57.52l0.176,17.165c0,0,3.199-0.885,4.622,0l0.533-17.165h-5.334H186.224z" class="st1"/><path d="M186.341,96.922v17.107c0,0,4.621,0.354,5.096,0L191.08,96.57c0,0-3.08,0.707-4.741,0.355L186.341,96.922z" class="st1"/><path d="M183.379,124.41l0.117,10.147c0,0,8.415,0.706,10.547-0.118v-10.026c0,0-8.178,0.234-10.667,0L183.379,124.41z" class="st1"/><path d="M194.995,76.514l12.918-10.736c0,0,2.962,2.595,3.198,3.539L198.55,80.17L194.995,76.514z" class="st1"/><path d="M179.114,80.17l3.319-3.776l-13.036-10.853c0,0-3.08,2.36-3.198,3.776l12.918,10.853H179.114z" class="st1"/><path d="M177.691,84.063h-16.949l0.12,4.483h16.829V84.063z" class="st1"/><path d="M199.616,83.946l-0.118,4.365h16.829l-0.118-4.365H199.616z" class="st1"/><path d="M198.075,91.733l-2.845,3.184l12.682,10.97l3.199-3.538L198.075,91.733z" class="st1"/><path d="M182.43,94.917l-3.437-3.184l-12.917,10.616l3.319,3.658L182.43,94.917z" class="st1"/><path d="M141.306,90.906h9.598l-0.235-10.381h-9.599C141.07,80.525,140.596,89.49,141.306,90.906z" class="st1"/><path d="M148.417,112.495l6.638,8.022l7.584-6.254l-6.518-7.784L148.417,112.495z" class="st1"/><path d="M214.074,114.856l7.941,5.898c0,0,6.282-7.432,6.4-8.493l-7.705-5.544c0,0-5.687,8.141-6.636,8.141V114.856z" class="st1"/><path d="M226.638,90.789h9.481c0,0,0.356-8.493-0.236-10.147l-9.719,0.117c0,0,0.474,8.965,0.474,10.027V90.789z" class="st1"/><path d="M183.497,47.375l10.429,0.235v-9.909c0,0-7.705-0.472-10.429,0.235v9.437V47.375z" class="st1"/><path d="M214.312,57.52c0,0,5.688,6.371,6.636,8.259l7.466-6.371c0,0-5.569-7.432-6.756-7.904l-7.348,6.016H214.312z" class="st1"/><path d="M156.003,65.661l6.874-8.376l-7.823-5.781c0,0-5.808,6.133-6.517,8.493l7.466,5.661V65.661z" class="st1"/><path d="M141.544,8.445l-2.845-1.179l-0.117-1.416l1.778,0.235c0,0-0.71-4.483-3.911-4.483	c-3.201,0-4.029,4.011-4.029,4.011l1.54-0.117v1.771l-2.845,1.299v3.539h-7.822v11.915h7.822v11.208h-7.466v12.152h7.348v33.387	l1.067-4.837c0,0,3.911-21.944,18.013-33.504c7.11-6.371,17.303-11.325,17.303-11.325l-2.489-0.944l-23.703-5.309l0.356-16.397	V8.445z" class="st0"/><path d="M131.204,92.911v25.395l-0.445,0.886v11.237h-7.466v12.123h7.466v1.946c0,0,7.201,3.539,10.4-0.088v-3.538	l13.866,3.626l4.356-1.24l8.267-3.008c0,0-12.888-4.954-21.689-15.218c-8.8-10.264-12.532-22.475-13.598-29.286l-1.155-2.832	L131.204,92.911z" class="st0"/><path d="M53.962,135.648l-8.889-5.928l-4.091,4.776l8.712,6.637L53.962,135.648z" class="st0"/><path d="M132.417,5.613c0,0,6.518,0,7.94,0.472c0,0-1.184-4.6-3.911-4.483C133.719,1.72,132.653,4.434,132.417,5.613z" class="st1"/><path d="M136.685,27.792l21.568,4.955l2.845,1.533l6.282-3.184l-5.095-1.771l-20.623-4.011l-1.304,1.179L136.685,27.792	z" class="st1"/><path d="M130.995,47.376V57.64c0,0,4.977,1.061,6.992,0.827l2.845-5.192l-0.357-4.011l-8.532-2.36	C131.943,46.904,130.995,46.549,130.995,47.376z" class="st1"/><path d="M158.253,143.522l9.392-3.274l-6.429-3.096C161.216,137.152,162.282,141.28,158.253,143.522z" class="st1"/><path d="M131.586,117.805c0,0,1.541,1.061,3.437,0.944c1.897-0.117,5.334,0.589,5.926-0.827	c0,0-4.621-7.314-5.687-11.09c0,0-3.818-0.598-3.911-1.062c-0.094-0.464,0.093,0.467,0.093,0.467L131.586,117.805z" class="st1"/><path d="M141.159,140.866l-10.282-2.89l-0.118,6.517c0,0,1.321,1.317,4.86,1.269c3.539-0.048,5.54-1.357,5.54-1.357	V140.866z" class="st1"/><path d="M146.313,46.194l-5.066-3.715l-1.066,0.352l-4.445,6.549l0.445,1.061l4.176,2.832L146.313,46.194z" class="st5"/><path d="M131.204,81.144c0,0-4.177-0.973-6.223,0.176c-1.155,2.744,0,8.581,0,8.581l2.665,0.355l3.644-0.176	l-0.089-8.936H131.204z" class="st5"/><path d="M141.159,118.749c0,0-4.89,3.627-4.89,3.893c0,0.267,1.868,3.008,1.868,3.008l2.933,3.982	c0,0,1.423-0.088,1.956-0.443c0.533-0.355,3.999-3.275,3.999-3.275l-5.866-7.168V118.749z" class="st5"/><path d="M128.27,80.525l2.816,0.384V57.018c0,0-12.712-22.384-38.488-27.517c0,0-38.665-8.493-60.887,27.251	c0,0-10.667,19.112-6.665,38.931c4.002,19.819,18.487,34.949,31.376,40.877c12.888,5.928,27.467,5.574,31.909,5.222	c4.444-0.355,25.6-5.131,34.754-17.52c7.201-8.848,7.999-11.059,7.999-11.059V90.021l-2.933,0.267c0,0-1.868,17.254-11.466,26.189	c-9.599,8.936-17.954,15.749-38.132,15.749c-20.178,0-36.088-16.016-40.977-29.728c-4.889-13.715-4-28.667,3.734-41.408	c7.734-12.741,23.111-23.269,41.775-22.384c18.666,0.885,31.199,13.005,32.798,15.043c1.599,2.035,12.591,16.133,12.385,26.779	L128.27,80.525z" class="st0"/><path d="M128.091,80.88c0,0-6.577-28.077-36.798-36.099c-30.221-8.021-48.65,14.392-48.65,14.392S55.62,39,82.109,39	c26.49,0,43.613,22.296,45.984,41.88" class="st6"/><path d="M193.422,21.445c0.132,1.152,0.29,3.371-0.11,5.496" class="st7"/><path d="M184.268,26.941c0,0-0.482-2.728-0.12-5.533" class="st7"/><path d="M140.668,53.362c0,0-2.499-1.213-4.567-3.155c-0.343-0.32-0.426-0.832-0.206-1.245	c0.594-1.133,1.993-3.499,4.406-6.011c0.335-0.347,0.863-0.427,1.284-0.189c1.012,0.571,2.909,1.749,4.401,3.32" class="st7"/><path d="M240.172,48.272c-0.804,0.837-2.419,2.376-4.316,3.429" class="st7"/><path d="M230.073,44.778c0,0,1.797-2.112,4.197-3.629c0.188-0.117,0.4-0.171,0.609-0.16" class="st7"/><path d="M131.258,90.128c0,0-2.741,0.48-5.559,0.12c-0.466-0.059-0.836-0.424-0.903-0.885	c-0.187-1.264-0.455-3.997,0.016-7.443c0.064-0.477,0.445-0.851,0.924-0.904c1.158-0.131,3.387-0.288,5.522,0.109" class="st7"/><path d="M146.648,126.141c0,0-1.913,2.011-4.396,3.389c-0.41,0.23-0.925,0.155-1.257-0.176	c-0.908-0.904-2.757-2.941-4.439-5.989c-0.233-0.421-0.15-0.947,0.204-1.275c0.852-0.792,2.547-2.237,4.503-3.184" class="st7"/><path d="M235.214,130.034c-0.14-0.016-0.279-0.058-0.408-0.133c-1.01-0.576-2.898-1.768-4.38-3.349" class="st7"/><path d="M235.789,119.306c0,0,2.296,1.134,4.3,2.955" class="st7"/><path d="M193.221,144.399c0,0,0.482,2.728,0.121,5.534c-0.059,0.464-0.426,0.832-0.89,0.898	c-1.27,0.187-4.016,0.454-7.477-0.016c-0.479-0.064-0.854-0.442-0.908-0.92c-0.131-1.152-0.289-3.37,0.11-5.496" class="st7"/><path d="M252.227,89.941c-0.115,0.064-0.246,0.104-0.383,0.12c-1.157,0.131-3.386,0.288-5.521-0.109" class="st7"/><path d="M246.32,80.949c0,0,2.631-0.461,5.39-0.141" class="st7"/><path d="M141.48,17.962h11.407v6.885v1.563v1.107" class="st7"/><path d="M125.836,142.362H14.507v-124.4h108.84" class="st7"/><path d="M131.277,113.282c-9.768,17.352-28.416,29.08-49.818,29.08c-31.515,0-57.064-25.432-57.064-56.802	c0-31.371,25.549-56.803,57.064-56.803c21.383,0,40.018,11.707,49.791,29.032" class="st7"/><path d="M131.249,99.653c-5.974,21.792-26.004,37.813-49.793,37.813c-28.504,0-51.61-23-51.61-51.373	c0-28.373,23.106-51.373,51.61-51.373c23.826,0,43.881,16.072,49.82,37.917" class="st7"/><path d="M131.954,75.429c0.038,0.176,0.086,0.411,0.086,0.411" class="st7"/><path d="M128.209,90.607c-2.405,23.59-22.42,41.995-46.75,41.995c-25.954,0-46.994-20.944-46.994-46.779	c0-25.835,21.04-46.779,46.994-46.779c24.22,0,44.162,18.24,46.718,41.675" class="st7"/><path d="M58.725,44.858v42.117v7.256" class="st7"/><path d="M107.08,46.629v40.347v4.245" class="st7"/><path d="M183.957,144.653c-0.873-0.24-1.741-0.499-2.601-0.776" class="st7"/><path d="M193.677,22.517c2.02-0.208,4.072-0.315,6.145-0.315c33.49,0,60.641,27.888,60.641,62.288	c0,34.4-27.149,62.288-60.641,62.288c-2.129,0-4.235-0.112-6.309-0.333" class="st7"/><path d="M169.743,30.389c4.386-2.579,9.111-4.608,14.094-6.003" class="st7"/><path d="M234.37,129.53c-10.727,9.467-24.89,15.222-40.415,15.222c-0.198,0-0.396,0-0.594-0.003" class="st7"/><path d="M240.904,47.074c8.556,10.312,13.692,23.496,13.692,37.861c0,14.365-5.259,27.866-14,38.232" class="st7"/><path d="M193.626,25.119c0.11,0,0.22,0,0.329,0c15.699,0,30.005,5.885,40.774,15.539" class="st7"/><path d="M163.876,32.984c6.076-3.429,12.811-5.853,19.969-7.037" class="st7"/><path d="M188.694,144.328c31.687,0,57.375-26.225,57.375-58.574c0-32.349-25.688-58.573-57.375-58.573	s-57.375,26.224-57.375,58.573C131.319,118.103,157.007,144.328,188.694,144.328z" class="st7"/><path d="M188.56,134.642c26.321,0,47.658-21.783,47.658-48.653c0-26.87-21.337-48.653-47.658-48.653	s-47.658,21.783-47.658,48.653C140.902,112.859,162.239,134.642,188.56,134.642z" class="st7"/><path d="M188.56,124.765c20.977,0,37.982-17.361,37.982-38.776c0-21.415-17.005-38.776-37.982-38.776	s-37.982,17.361-37.982,38.776C150.578,107.404,167.583,124.765,188.56,124.765z" class="st7"/><path d="M188.52,114.168c15.362,0,27.815-12.713,27.815-28.395c0-15.682-12.453-28.395-27.815-28.395	s-27.816,12.713-27.816,28.395C160.704,101.455,173.158,114.168,188.52,114.168z" class="st7"/><path d="M188.669,96.992c6.093,0,11.032-5.042,11.032-11.261c0-6.219-4.939-11.261-11.032-11.261	c-6.092,0-11.031,5.042-11.031,11.261C177.638,91.95,182.577,96.992,188.669,96.992z" class="st7"/><path d="M136.087,48.245l-5.006-1.44V26.749" class="st7"/><path d="M141.465,25.181l21.919,4.579c1.446,0.301,2.759,0.8,3.889,1.448" class="st7"/><path d="M161.138,34.21c-1.299-1.016-2.979-1.787-4.91-2.192l-25.15-5.269l0.613-0.155" class="st7"/><path d="M130.842,138.024l22.495,6.061c3.981,1.072,7.922-1.827,7.922-5.832v-0.728" class="st7"/><path d="M130.842,118.061v20.056" class="st7"/><path d="M131.338,117.89l-0.496,0.171l8.305,2.099" class="st7"/><path d="M167.748,140.301l-10.028,3.419" class="st7"/><path d="M130.59,12.093h-7.037v11.944h7.037" class="st7"/><path d="M127.346,17.546c0.981,0,1.776-0.792,1.776-1.768c0-0.977-0.795-1.768-1.776-1.768	c-0.981,0-1.776,0.792-1.776,1.768C125.57,16.755,126.365,17.546,127.346,17.546z" class="st6"/><path d="M82.817,24.951c0.981,0,1.776-0.792,1.776-1.768c0-0.976-0.795-1.768-1.776-1.768	c-0.981,0-1.776,0.792-1.776,1.768C81.041,24.16,81.836,24.951,82.817,24.951z" class="st6"/><path d="M112.915,32.061c0.981,0,1.776-0.792,1.776-1.768s-0.795-1.768-1.776-1.768s-1.776,0.792-1.776,1.768	S111.934,32.061,112.915,32.061z" class="st6"/><path d="M54.672,30.149c0.981,0,1.776-0.792,1.776-1.768c0-0.976-0.795-1.768-1.776-1.768	c-0.981,0-1.776,0.792-1.776,1.768C52.896,29.357,53.691,30.149,54.672,30.149z" class="st6"/><path d="M20.149,73.701c0.981,0,1.776-0.791,1.776-1.768c0-0.976-0.795-1.768-1.776-1.768s-1.776,0.792-1.776,1.768	C18.373,72.909,19.168,73.701,20.149,73.701z" class="st6"/><path d="M20.564,100.896c0.981,0,1.776-0.792,1.776-1.769c0-0.976-0.795-1.768-1.776-1.768	c-0.981,0-1.776,0.792-1.776,1.768C18.788,100.104,19.583,100.896,20.564,100.896z" class="st6"/><path d="M30.993,126.434c0.981,0,1.776-0.791,1.776-1.768c0-0.976-0.795-1.768-1.776-1.768s-1.776,0.792-1.776,1.768	C29.217,125.643,30.012,126.434,30.993,126.434z" class="st6"/><path d="M34.312,46.274c0.981,0,1.776-0.792,1.776-1.768c0-0.976-0.795-1.768-1.776-1.768	c-0.981,0-1.776,0.792-1.776,1.768C32.536,45.483,33.331,46.274,34.312,46.274z" class="st6"/><path d="M127.346,22.146c0.981,0,1.776-0.792,1.776-1.768c0-0.977-0.795-1.768-1.776-1.768	c-0.981,0-1.776,0.791-1.776,1.768C125.57,21.355,126.365,22.146,127.346,22.146z" class="st6"/><path d="M131.08,35.333h-7.289v11.944h7.319" class="st7"/><path d="M127.745,40.743c0.981,0,1.776-0.792,1.776-1.768c0-0.976-0.795-1.768-1.776-1.768	c-0.981,0-1.776,0.792-1.776,1.768C125.969,39.952,126.764,40.743,127.745,40.743z" class="st6"/><path d="M127.745,45.343c0.981,0,1.776-0.792,1.776-1.768c0-0.976-0.795-1.768-1.776-1.768	c-0.981,0-1.776,0.792-1.776,1.768C125.969,44.552,126.764,45.343,127.745,45.343z" class="st6"/><path d="M130.591,130.405h-7.29v11.944h7.319" class="st7"/><path d="M127.258,135.816c0.981,0,1.776-0.792,1.776-1.768c0-0.977-0.795-1.768-1.776-1.768	c-0.981,0-1.776,0.791-1.776,1.768C125.482,135.024,126.277,135.816,127.258,135.816z" class="st6"/><path d="M45.571,135.578c0.981,0,1.776-0.791,1.776-1.768c0-0.976-0.795-1.768-1.776-1.768	c-0.981,0-1.776,0.792-1.776,1.768C43.795,134.787,44.591,135.578,45.571,135.578z" class="st6"/><path d="M49.303,138.469c0.981,0,1.776-0.792,1.776-1.768c0-0.977-0.795-1.768-1.776-1.768	c-0.981,0-1.776,0.791-1.776,1.768C47.527,137.677,48.322,138.469,49.303,138.469z" class="st6"/><path d="M127.258,140.416c0.981,0,1.776-0.792,1.776-1.768c0-0.977-0.795-1.768-1.776-1.768	c-0.981,0-1.776,0.791-1.776,1.768C125.482,139.624,126.277,140.416,127.258,140.416z" class="st6"/><path d="M141.331,25.733c0,0.896-2.31,1.621-5.155,1.621s-5.154-0.725-5.154-1.621" class="st7"/><path d="M131.019,8.778c0-0.896,2.309-1.621,5.154-1.621s5.154,0.725,5.154,1.621" class="st7"/><path d="M140.168,6.103c-0.946-0.363-2.382-0.595-3.992-0.595c-1.423,0-2.714,0.181-3.646,0.475	c0,0,0.415-4.347,3.882-4.347C139.878,1.637,140.168,6.103,140.168,6.103z" class="st7"/><path d="M131.019,8.778v16.955" class="st7"/><path d="M141.301,8.49v17.427" class="st7"/><path d="M141.124,144.296c0,0.896-2.309,1.621-5.154,1.621s-5.154-0.725-5.154-1.621" class="st7"/><path d="M130.813,138.117v6.179" class="st7"/><path d="M141.111,140.952v3.442" class="st7"/><path d="M140.792,118.224c-0.911,0.458-2.532,0.765-4.378,0.765c-2.847,0-5.154-0.725-5.154-1.621" class="st7"/><path d="M137.749,58.533c-0.426,0.035-0.874,0.056-1.337,0.056c-2.848,0-5.155-0.725-5.155-1.621" class="st7"/><path d="M133.034,70.813c-1.088-0.299-1.777-0.736-1.777-1.227" class="st7"/><path d="M135.086,106.872c-2.205-0.184-3.829-0.816-3.829-1.568" class="st7"/><path d="M131.257,111.189v6.179" class="st7"/><path d="M133.969,7.287V6.111" class="st7"/><path d="M138.59,7.333V6.154" class="st7"/><path d="M131.257,47.218v10.499v60.168" class="st7"/><path d="M45.191,129.562l-4.243,5.198l8.61,6.365l4.369-5.328" class="st7"/><path d="M183.524,47.424v-9.555" class="st7"/><path d="M193.923,47.424v-9.555" class="st7"/><path d="M156.231,65.578l-7.705-5.699" class="st7"/><path d="M162.73,57.269l-7.707-5.699" class="st7"/><path d="M220.921,65.6l7.378-6.112" class="st7"/><path d="M214.505,57.482l7.381-6.112" class="st7"/><path d="M155.146,120.458l7.377-6.114" class="st7"/><path d="M148.73,112.338l7.38-6.112" class="st7"/><path d="M222.006,120.701l-7.704-5.699" class="st7"/><path d="M228.506,112.392l-7.708-5.702" class="st7"/><path d="M183.524,134.016v-9.555" class="st7"/><path d="M193.923,134.016v-9.555" class="st7"/><path d="M186.277,57.599v16.899" class="st7"/><path d="M191.255,57.599v16.899" class="st7"/><path d="M186.277,97.002v16.899" class="st7"/><path d="M191.255,97.002v16.899" class="st7"/><path d="M194.365,82.669h-11.911v6.195h11.911V82.669z" class="st6"/><path d="M177.745,84.055h-16.8" class="st7"/><path d="M177.745,88.301h-16.8" class="st7"/><path d="M215.995,84.055h-16.384" class="st7"/><path d="M215.995,88.301h-16.384" class="st7"/><path d="M150.811,90.632h-9.48" class="st7"/><path d="M150.811,80.605h-9.48" class="st7"/><path d="M235.905,90.632h-9.481" class="st7"/><path d="M235.905,80.605h-9.481" class="st7"/><path d="M178.937,79.791l-12.808-10.659" class="st7"/><path d="M182.27,76.432L169.465,65.77" class="st7"/><path d="M198.44,80.146l12.806-10.661" class="st7"/><path d="M195.284,76.608l12.805-10.661" class="st7"/><path d="M169.465,105.893l12.805-10.659" class="st7"/><path d="M166.309,102.354l12.805-10.661" class="st7"/><path d="M207.706,105.776l-12.805-10.662" class="st7"/><path d="M211.039,102.413l-12.806-10.661" class="st7"/><path d="M240.205,48.248c0.887-0.656,0.412-2.786-1.059-4.756c-1.472-1.97-3.384-3.035-4.271-2.378	c-0.887,0.657-0.413,2.786,1.059,4.756C237.406,47.84,239.318,48.904,240.205,48.248z" class="st7"/><path d="M188.814,22.322c2.545,0,4.608-0.445,4.608-0.995c0-0.549-2.063-0.995-4.608-0.995	c-2.544,0-4.607,0.445-4.607,0.995C184.207,21.877,186.27,22.322,188.814,22.322z" class="st7"/><path d="M252.215,89.931c1.104-0.046,1.915-2.119,1.81-4.631c-0.105-2.512-1.085-4.511-2.19-4.465	c-1.104,0.046-1.914,2.119-1.809,4.631C250.131,87.978,251.111,89.977,252.215,89.931z" class="st7"/><path d="M239.264,127.151c1.355-2.121,1.698-4.319,0.765-4.91c-0.932-0.59-2.787,0.651-4.142,2.772	c-1.356,2.121-1.699,4.32-0.766,4.91C236.053,130.514,237.908,129.273,239.264,127.151z" class="st7"/><path d="M190.633,76.887h-3.911v3.893h3.911V76.887z" class="st7"/><path d="M190.633,90.338h-3.911v3.893h3.911V90.338z" class="st7"/><path d="M96.014,94.496h13.349c0.147,0,0.281,0.077,0.356,0.203l3.887,6.611c0.161,0.275-0.037,0.619-0.356,0.619	H92.129c-0.319,0-0.517-0.344-0.356-0.619l3.887-6.611c0.075-0.125,0.209-0.203,0.356-0.203H96.014z" class="st7"/><path d="M74.091,94.496H87.44c0.147,0,0.281,0.077,0.356,0.203l3.887,6.611c0.161,0.275-0.037,0.619-0.356,0.619H70.207	c-0.319,0-0.517-0.344-0.356-0.619l3.887-6.611c0.075-0.125,0.209-0.203,0.356-0.203H74.091z" class="st7"/><path d="M52.167,94.496h13.349c0.147,0,0.281,0.077,0.356,0.203l3.887,6.611c0.161,0.275-0.037,0.619-0.356,0.619	H48.283c-0.319,0-0.517-0.344-0.356-0.619l3.887-6.611c0.075-0.125,0.209-0.203,0.356-0.203H52.167z" class="st7"/><path d="M96.014,109.36h13.349c0.147,0,0.281,0.077,0.356,0.202l3.887,6.611c0.161,0.275-0.037,0.619-0.356,0.619	H92.129c-0.319,0-0.517-0.344-0.356-0.619l3.887-6.611c0.075-0.125,0.209-0.202,0.356-0.202H96.014z" class="st7"/><path d="M114.903,116.792h-0.82c-0.319,0-0.517-0.344-0.356-0.619l3.887-6.611c0.075-0.125,0.209-0.202,0.356-0.202	h2.505" class="st7"/><path d="M74.091,109.36H87.44c0.147,0,0.281,0.077,0.356,0.202l3.887,6.611c0.161,0.275-0.037,0.619-0.356,0.619H70.207	c-0.319,0-0.517-0.344-0.356-0.619l3.887-6.611c0.075-0.125,0.209-0.202,0.356-0.202H74.091z" class="st7"/><path d="M52.167,109.36h13.349c0.147,0,0.281,0.077,0.356,0.202l3.887,6.611c0.161,0.275-0.037,0.619-0.356,0.619	H48.283c-0.319,0-0.517-0.344-0.356-0.619l3.887-6.611c0.075-0.125,0.209-0.202,0.356-0.202H52.167z" class="st7"/><path d="M91.772,131.039l3.887-6.61c0.075-0.125,0.209-0.203,0.356-0.203h10.311" class="st7"/><path d="M69.848,131.039l3.887-6.61c0.075-0.125,0.209-0.203,0.356-0.203h13.349c0.147,0,0.281,0.078,0.356,0.203	l3.78,6.429" class="st7"/><path d="M54.726,124.224h10.791c0.147,0,0.281,0.077,0.356,0.202l3.772,6.416" class="st7"/><path d="M40.993,109.36h2.566c0.147,0,0.281,0.077,0.356,0.202l3.887,6.611c0.161,0.275-0.037,0.619-0.356,0.619h-1.254" class="st7"/><path d="M85.169,87.063h13.349c0.147,0,0.281,0.077,0.356,0.203l3.887,6.611c0.161,0.275-0.038,0.619-0.357,0.619	h-21.12c-0.319,0-0.517-0.344-0.356-0.619l3.887-6.611c0.075-0.125,0.209-0.203,0.356-0.203H85.169z" class="st7"/><path d="M74.06,79.455h13.349c0.147,0,0.281,0.077,0.356,0.203l3.887,6.611c0.161,0.275-0.037,0.619-0.356,0.619H70.175	c-0.319,0-0.517-0.344-0.356-0.619l3.887-6.611c0.075-0.125,0.209-0.203,0.356-0.203H74.06z" class="st7"/><path d="M63.248,87.063h13.349c0.147,0,0.281,0.077,0.356,0.203l3.887,6.611c0.161,0.275-0.037,0.619-0.356,0.619	H59.363c-0.319,0-0.517-0.344-0.356-0.619l3.887-6.611c0.075-0.125,0.209-0.203,0.356-0.203H63.248z" class="st7"/><path d="M85.169,101.928h13.349c0.147,0,0.281,0.077,0.356,0.202l3.887,6.611c0.161,0.275-0.038,0.619-0.357,0.619	h-21.12c-0.319,0-0.517-0.344-0.356-0.619l3.887-6.611c0.075-0.125,0.209-0.202,0.356-0.202H85.169z" class="st7"/><path d="M122.071,109.36h-18.833c-0.318,0-0.517-0.344-0.356-0.619l3.887-6.611c0.075-0.125,0.209-0.202,0.357-0.202	h13.349c0.147,0,0.281,0.077,0.356,0.202l1.798,3.059l0.809,1.427" class="st7"/><path d="M63.248,101.928h13.349c0.147,0,0.281,0.077,0.356,0.202l3.887,6.611c0.161,0.275-0.037,0.619-0.356,0.619	H59.363c-0.319,0-0.517-0.344-0.356-0.619l3.887-6.611c0.075-0.125,0.209-0.202,0.356-0.202H63.248z" class="st7"/><path d="M38.858,105.362l1.899-3.232c0.075-0.125,0.209-0.202,0.356-0.202h13.349c0.147,0,0.281,0.077,0.356,0.202	l3.887,6.611c0.161,0.275-0.038,0.619-0.356,0.619H40.996" class="st7"/><path d="M85.169,116.792h13.349c0.147,0,0.281,0.077,0.356,0.202l3.887,6.611c0.161,0.275-0.038,0.619-0.357,0.619	h-21.12c-0.319,0-0.517-0.344-0.356-0.619l3.887-6.611c0.075-0.125,0.209-0.202,0.356-0.202H85.169z" class="st7"/><path d="M106.325,124.224h0.281" class="st7"/><path d="M108.385,124.224h-5.147c-0.318,0-0.517-0.344-0.356-0.619l3.887-6.611c0.075-0.125,0.209-0.202,0.357-0.202	h9.555" class="st7"/><path d="M63.248,116.792h13.349c0.147,0,0.281,0.077,0.356,0.202l3.887,6.611c0.161,0.275-0.037,0.619-0.356,0.619	H59.363c-0.319,0-0.517-0.344-0.356-0.619l3.887-6.611c0.075-0.125,0.209-0.202,0.356-0.202H63.248z" class="st7"/><path d="M46.461,116.792h8.002c0.147,0,0.281,0.077,0.356,0.202l3.887,6.611c0.161,0.275-0.037,0.619-0.356,0.619	h-3.622" class="st7"/><path d="M87.406,79.455h5.717c0.311,0,0.6,0.165,0.756,0.435l4.134,7.173" class="st7"/><path d="M98.191,87.005h5.717c0.311,0,0.6,0.165,0.756,0.435l3.954,6.864" class="st7"/><path d="M109.271,94.496h5.717c0.311,0,0.6,0.165,0.756,0.435l3.956,6.867" class="st7"/><path d="M120.413,101.928h5.095" class="st7"/><path d="M132.442,5.904L1.661,5.928v136.434h12.845" class="st7"/><path d="M152.887,17.962l-0.088-12.064l-12.535,0.003" class="st7"/><path d="M74.159,84.056c0,0,0.356-4.483,1.897-5.544c1.54-1.061,4.147-1.651,4.147-1.651s-4.029-0.235-4.86-2.36	c-0.83-2.123-1.658-4.011-1.658-4.011s-0.236,3.421-1.897,4.483c-1.661,1.061-4.742,1.888-4.742,1.888s4.621,0.472,5.452,2.477	c0.83,2.005,1.658,4.72,1.658,4.72L74.159,84.056z" class="st8"/><path d="M81.837,76.69c-6.135,0.907-6.874,1.645-7.785,7.749c-0.911-6.107-1.653-6.843-7.785-7.749	c6.135-0.907,6.874-1.645,7.785-7.749C74.962,75.048,75.704,75.784,81.837,76.69z" class="st7"/></svg>
\ No newline at end of file
diff --git a/assets/images/simple-illustrations/simple-illustration__abacus.svg b/assets/images/simple-illustrations/simple-illustration__abacus.svg
index df94ab653982..6dac0e9009b1 100644
--- a/assets/images/simple-illustrations/simple-illustration__abacus.svg
+++ b/assets/images/simple-illustrations/simple-illustration__abacus.svg
@@ -1,43 +1 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 27.9.0, 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 68 68" style="enable-background:new 0 0 68 68;" xml:space="preserve">
-<style type="text/css">
-	.st0{fill:#FFED8F;}
-	.st1{fill:#D18000;}
-	.st2{fill:#F25730;}
-	.st3{fill:#00B268;}
-	.st4{fill:#0164BF;}
-	.st5{fill:none;stroke:#002140;stroke-linecap:round;stroke-linejoin:round;}
-</style>
-<path class="st0" d="M16.9,15.3l-0.2-4.1c0,0-0.5-1.4-1.9-1.4s-3,0.4-3,1.6v38.4H7.4v8.3h53.4V50H17L16.9,15.3z"/>
-<path class="st0" d="M51.2,53.1V11.6c0,0,0.8-1.8,2.7-1.8c1.9,0,2.6,1.6,2.6,1.6l0.1,41.8L51.2,53.1z"/>
-<path class="st1" d="M11.2,49.6H7.1v3.9h4.1V49.6z"/>
-<path class="st1" d="M51,49.8H16.7v3.3h34.2v-3.3H51z"/>
-<path class="st1" d="M60.6,49.7h-4.1v3.8h4.1V49.7z"/>
-<path class="st1" d="M50.7,14.6H16.9v4h33.9v-4H50.7z"/>
-<path class="st2" d="M20.4,29c2,0,3.6-1.6,3.6-3.7c0-2-1.5-3.7-3.6-3.7c-2,0-3.6,1.6-3.6,3.7C16.9,27.4,18.4,29,20.4,29z"/>
-<path class="st2" d="M28.1,29c2,0,3.6-1.6,3.6-3.7c0-2-1.5-3.7-3.6-3.7s-3.6,1.6-3.6,3.7C24.6,27.3,26.2,29,28.1,29z"/>
-<path class="st2" d="M35.8,28.9c2,0,3.6-1.6,3.6-3.7c0-2-1.5-3.7-3.6-3.7c-2,0-3.6,1.6-3.6,3.7C32.2,27.2,33.8,28.9,35.8,28.9z"/>
-<path class="st3" d="M46.9,37.3c2,0,3.6-1.6,3.6-3.7c0-2-1.5-3.7-3.6-3.7c-2,0-3.6,1.6-3.6,3.7C43.4,35.7,44.9,37.3,46.9,37.3z"/>
-<path class="st4" d="M20.9,44.7c2.1,0,3.8-1.7,3.8-3.9c0-2.1-1.6-3.9-3.8-3.9c-2.1,0-3.8,1.7-3.8,3.9C17.1,43,18.9,44.7,20.9,44.7z"
-	/>
-<path class="st4" d="M28.5,44.5c2.1,0,3.8-1.7,3.8-3.9c0-2.1-1.6-3.9-3.8-3.9c-2.1,0-3.8,1.7-3.8,3.9C24.8,42.8,26.5,44.5,28.5,44.5
-	z"/>
-<path class="st5" d="M56.7,49.9h4.1v8.3H7.3v-8.3h3.9"/>
-<path class="st5" d="M16.9,49.9h33.8"/>
-<path class="st5" d="M7.6,53.6h53.2"/>
-<path class="st5" d="M16.8,53.4V11.7c0-1-0.8-1.9-1.9-1.9h-1.4c-1,0-1.9,0.8-1.9,1.9v41.6"/>
-<path class="st5" d="M56.4,53.4V11.7c0-1-0.8-1.9-1.9-1.9h-1.4c-1,0-1.9,0.8-1.9,1.9v41.6"/>
-<path class="st5" d="M16.9,15h33.9"/>
-<path class="st5" d="M16.9,18.6h33.9"/>
-<path class="st5" d="M39.4,25.3h11.3"/>
-<path class="st5" d="M16.9,33.1h26"/>
-<path class="st5" d="M32.2,40.7h18.4"/>
-<path class="st5" d="M20.4,29.1c2.1,0,3.7-1.7,3.7-3.8s-1.6-3.8-3.7-3.8s-3.7,1.7-3.7,3.8S18.3,29.1,20.4,29.1z"/>
-<path class="st5" d="M28.1,29.1c2.1,0,3.7-1.7,3.7-3.8s-1.6-3.8-3.7-3.8s-3.7,1.7-3.7,3.8S26.1,29.1,28.1,29.1z"/>
-<path class="st5" d="M35.6,29.1c2.1,0,3.7-1.7,3.7-3.8s-1.6-3.8-3.7-3.8s-3.7,1.7-3.7,3.8S33.6,29.1,35.6,29.1z"/>
-<path class="st5" d="M20.8,44.5c2.1,0,3.7-1.7,3.7-3.8c0-2.1-1.6-3.8-3.7-3.8s-3.7,1.7-3.7,3.8C17.1,42.8,18.8,44.5,20.8,44.5z"/>
-<path class="st5" d="M28.5,44.5c2.1,0,3.7-1.7,3.7-3.8c0-2.1-1.6-3.8-3.7-3.8s-3.7,1.7-3.7,3.8C24.8,42.8,26.5,44.5,28.5,44.5z"/>
-<path class="st5" d="M46.7,37.2c2.1,0,3.7-1.7,3.7-3.8s-1.6-3.8-3.7-3.8S43,31.4,43,33.5S44.6,37.2,46.7,37.2z"/>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" id="Layer_1" x="0" y="0" version="1.1" viewBox="0 0 68 68" style="enable-background:new 0 0 68 68" xml:space="preserve"><style type="text/css">.st0{fill:#ffed8f}.st1{fill:#d18000}.st2{fill:#f25730}.st3{fill:#00b268}.st4{fill:#0164bf}.st5{fill:none;stroke:#002140;stroke-linecap:round;stroke-linejoin:round}</style><path d="M16.9,15.3l-0.2-4.1c0,0-0.5-1.4-1.9-1.4s-3,0.4-3,1.6v38.4H7.4v8.3h53.4V50H17L16.9,15.3z" class="st0"/><path d="M51.2,53.1V11.6c0,0,0.8-1.8,2.7-1.8c1.9,0,2.6,1.6,2.6,1.6l0.1,41.8L51.2,53.1z" class="st0"/><path d="M11.2,49.6H7.1v3.9h4.1V49.6z" class="st1"/><path d="M51,49.8H16.7v3.3h34.2v-3.3H51z" class="st1"/><path d="M60.6,49.7h-4.1v3.8h4.1V49.7z" class="st1"/><path d="M50.7,14.6H16.9v4h33.9v-4H50.7z" class="st1"/><path d="M20.4,29c2,0,3.6-1.6,3.6-3.7c0-2-1.5-3.7-3.6-3.7c-2,0-3.6,1.6-3.6,3.7C16.9,27.4,18.4,29,20.4,29z" class="st2"/><path d="M28.1,29c2,0,3.6-1.6,3.6-3.7c0-2-1.5-3.7-3.6-3.7s-3.6,1.6-3.6,3.7C24.6,27.3,26.2,29,28.1,29z" class="st2"/><path d="M35.8,28.9c2,0,3.6-1.6,3.6-3.7c0-2-1.5-3.7-3.6-3.7c-2,0-3.6,1.6-3.6,3.7C32.2,27.2,33.8,28.9,35.8,28.9z" class="st2"/><path d="M46.9,37.3c2,0,3.6-1.6,3.6-3.7c0-2-1.5-3.7-3.6-3.7c-2,0-3.6,1.6-3.6,3.7C43.4,35.7,44.9,37.3,46.9,37.3z" class="st3"/><path d="M20.9,44.7c2.1,0,3.8-1.7,3.8-3.9c0-2.1-1.6-3.9-3.8-3.9c-2.1,0-3.8,1.7-3.8,3.9C17.1,43,18.9,44.7,20.9,44.7z" class="st4"/><path d="M28.5,44.5c2.1,0,3.8-1.7,3.8-3.9c0-2.1-1.6-3.9-3.8-3.9c-2.1,0-3.8,1.7-3.8,3.9C24.8,42.8,26.5,44.5,28.5,44.5	z" class="st4"/><path d="M56.7,49.9h4.1v8.3H7.3v-8.3h3.9" class="st5"/><path d="M16.9,49.9h33.8" class="st5"/><path d="M7.6,53.6h53.2" class="st5"/><path d="M16.8,53.4V11.7c0-1-0.8-1.9-1.9-1.9h-1.4c-1,0-1.9,0.8-1.9,1.9v41.6" class="st5"/><path d="M56.4,53.4V11.7c0-1-0.8-1.9-1.9-1.9h-1.4c-1,0-1.9,0.8-1.9,1.9v41.6" class="st5"/><path d="M16.9,15h33.9" class="st5"/><path d="M16.9,18.6h33.9" class="st5"/><path d="M39.4,25.3h11.3" class="st5"/><path d="M16.9,33.1h26" class="st5"/><path d="M32.2,40.7h18.4" class="st5"/><path d="M20.4,29.1c2.1,0,3.7-1.7,3.7-3.8s-1.6-3.8-3.7-3.8s-3.7,1.7-3.7,3.8S18.3,29.1,20.4,29.1z" class="st5"/><path d="M28.1,29.1c2.1,0,3.7-1.7,3.7-3.8s-1.6-3.8-3.7-3.8s-3.7,1.7-3.7,3.8S26.1,29.1,28.1,29.1z" class="st5"/><path d="M35.6,29.1c2.1,0,3.7-1.7,3.7-3.8s-1.6-3.8-3.7-3.8s-3.7,1.7-3.7,3.8S33.6,29.1,35.6,29.1z" class="st5"/><path d="M20.8,44.5c2.1,0,3.7-1.7,3.7-3.8c0-2.1-1.6-3.8-3.7-3.8s-3.7,1.7-3.7,3.8C17.1,42.8,18.8,44.5,20.8,44.5z" class="st5"/><path d="M28.5,44.5c2.1,0,3.7-1.7,3.7-3.8c0-2.1-1.6-3.8-3.7-3.8s-3.7,1.7-3.7,3.8C24.8,42.8,26.5,44.5,28.5,44.5z" class="st5"/><path d="M46.7,37.2c2.1,0,3.7-1.7,3.7-3.8s-1.6-3.8-3.7-3.8S43,31.4,43,33.5S44.6,37.2,46.7,37.2z" class="st5"/></svg>
\ No newline at end of file
diff --git a/assets/images/simple-illustrations/simple-illustration__accounting.svg b/assets/images/simple-illustrations/simple-illustration__accounting.svg
index f7634141e966..3213b4f93856 100644
--- a/assets/images/simple-illustrations/simple-illustration__accounting.svg
+++ b/assets/images/simple-illustrations/simple-illustration__accounting.svg
@@ -1,32 +1 @@
-<?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 68 68" style="enable-background:new 0 0 68 68;" xml:space="preserve"><style type="text/css">
-	.st0{fill:#4ED7DE;}
-	.st1{fill:#D18000;}
-	.st2{fill:#FFFAF0;}
-	.st3{fill:#002140;}
-	.st4{fill:none;stroke:#002140;stroke-width:0.8571;stroke-linecap:round;stroke-linejoin:round;}
-</style><path class="st0" d="M39.716,9.121V9h9.284c3.815-0.188,6.111,2.239,6.111,6.109v32.697c0,1.959-0.589,3.548-1.665,4.615
-	L53.41,52.46c-1.047,1.017-2.548,1.549-4.409,1.457H29.697c-3.813,0.188-6.109-2.239-6.109-6.109V15.109
-	c0-1.816,0.505-3.313,1.44-4.372c0.51-0.584,1.146-1.032,1.9-1.329c0.587-0.232,1.24-0.369,1.96-0.406
-	C29.148,8.987,29.42,8.987,29.697,9h0.651"/><path class="st1" d="M33.616,9h-0.651c-0.277-0.013-0.549-0.013-0.809,0.002c-0.72,0.037-0.527-0.255-1.113-0.022l-0.905,0.2V8.085
-	c0-2.207,1.393-3.263,3.593-3.263h5.659c2.202,0,3.593,1.056,3.593,3.263v9.882c0,0.784-0.696,1.264-1.393,0.696l-2.244-2.039
-	c-0.802-0.74-1.314-0.74-2.095,0l-2.247,2.039c-0.697,0.567-1.393,0.087-1.393-0.696V9H33.616z"/><path class="st2" d="M23.588,47.806c0,3.872,2.298,6.299,6.109,6.109h19.304c1.861,0.092,3.362-0.44,4.409-1.457l-5.127,5.127
-	c-1.046,0.98-2.526,1.492-4.352,1.401H24.627c-3.615,0.178-5.869-1.994-6.092-5.523c-0.012-0.191-0.018-0.386-0.018-0.587v-6.827
-	h5.072v1.755V47.806z"/><path class="st2" d="M47.005,23.096c1.349,0,1.839,0.634,1.839,1.838v8.655c0,1.203-0.492,1.841-1.839,1.841H34.185
-	c-1.349,0-1.839-0.638-1.839-1.841v-8.655c0-1.203,0.492-1.838,1.839-1.838H47.005z"/><path class="st3" d="M25.684,17.441c0.352-0.587,0.995-0.982,1.73-0.982c1.114,0,2.017,0.903,2.017,2.017
-	c0,1.114-0.903,2.014-2.017,2.014c-0.735,0-1.378-0.391-1.73-0.982h0.698c0.572,0,1.032-0.465,1.032-1.032
-	c0-0.567-0.462-1.034-1.032-1.034h-0.698V17.441z"/><path class="st3" d="M25.684,30.656c0.352-0.589,0.995-0.982,1.73-0.982c1.114,0,2.017,0.903,2.017,2.017
-	c0,1.114-0.903,2.014-2.017,2.014c-0.725,0-1.358-0.379-1.712-0.953h0.68c0.572,0,1.032-0.465,1.032-1.034
-	c0-0.569-0.462-1.032-1.032-1.032h-0.698V30.656z"/><path class="st3" d="M25.684,43.984c0.352-0.589,0.995-0.982,1.73-0.982c1.114,0,2.017,0.903,2.017,2.016
-	c0,1.113-0.903,2.016-2.017,2.016c-0.735,0-1.378-0.393-1.73-0.982h0.698c0.572,0,1.032-0.465,1.032-1.034
-	c0-0.569-0.462-1.032-1.032-1.032h-0.698V43.984z"/><path class="st3" d="M27.226,17.441c0.572,0,1.032,0.463,1.032,1.034c0,0.571-0.462,1.032-1.032,1.032h-8.71
-	c-2.586,0-3.765,1.386-3.765,2.675c0,1.289,1.177,2.675,3.765,2.675v2.066c-3.828,0-5.831-2.386-5.831-4.743
-	c0-2.356,2.002-4.743,5.831-4.743h8.71V17.441z"/><path class="st3" d="M27.226,30.685c0.572,0,1.032,0.463,1.032,1.032c0,0.569-0.462,1.034-1.032,1.034h-8.71
-	c-2.586,0-3.765,1.386-3.765,2.674c0,1.287,1.177,2.677,3.765,2.677v2.064c-3.828,0-5.831-2.385-5.831-4.743
-	c0-2.358,2.002-4.741,5.831-4.741h8.71V30.685z"/><path class="st2" d="M25.028,10.736c-0.935,1.059-1.44,2.556-1.44,4.372v2.333h-4.55v-0.138c0.193-0.473,0.44-0.898,0.733-1.279
-	l0.109-0.131l5.144-5.159h0.003V10.736z"/><path class="st2" d="M23.588,32.752v11.233h-5.072v-3.817v-2.064v-5.352H23.588z"/><path class="st2" d="M23.588,19.51v11.176h-5.072V20.181c0-0.174,0.007-0.347,0.015-0.515v-0.158h5.057V19.51z"/><path class="st3" d="M27.226,43.984c0.572,0,1.032,0.463,1.032,1.032c0,0.569-0.462,1.034-1.032,1.034h-8.71
-	c-2.586,0-3.765,1.386-3.765,2.674c0,1.287,1.177,2.677,3.765,2.677v1.477c0,0.2,0.007,0.394,0.018,0.587l-0.018,0.003
-	c-3.828,0-5.831-2.387-5.831-4.744c0-2.358,2.002-4.741,5.831-4.741h8.71V43.984z"/><path class="st4" d="M55.113,15.109v32.697"/><path class="st4" d="M55.113,15.108c0-3.872-2.298-6.299-6.111-6.109"/><path class="st4" d="M23.588,46.051v1.756"/><path class="st4" d="M23.588,32.752v11.233"/><path class="st4" d="M23.588,19.51v11.176"/><path class="st4" d="M23.588,15.109v2.333"/><path class="st4" d="M23.588,15.109c0-1.816,0.505-3.313,1.44-4.372c0.51-0.584,1.146-1.032,1.9-1.329
-	c0.587-0.232,1.24-0.369,1.96-0.406C29.148,8.987,29.42,8.987,29.697,9"/><path class="st4" d="M29.698,9h3.847"/><path class="st4" d="M43.25,9h5.752"/><path class="st4" d="M53.411,52.461c-1.047,1.017-2.548,1.549-4.409,1.457"/><path class="st4" d="M55.113,47.807c0,1.959-0.589,3.548-1.665,4.615"/><path class="st4" d="M23.588,47.807c0,3.872,2.298,6.299,6.109,6.109"/><path class="st4" d="M29.698,53.916h19.304"/><path class="st4" d="M18.516,20.18v4.679v2.066v3.759"/><path class="st4" d="M18.516,32.752v5.352v2.064v3.817"/><path class="st4" d="M18.516,46.051v5.352v1.477"/><path class="st4" d="M19.038,17.304c0.193-0.473,0.44-0.898,0.733-1.279"/><path class="st4" d="M18.516,20.181c0-0.175,0.007-0.347,0.015-0.515"/><path class="st4" d="M48.285,57.584c-1.046,0.982-2.526,1.494-4.352,1.403"/><path class="st4" d="M18.516,52.879c0,0.2,0.007,0.394,0.018,0.587c0.223,3.528,2.477,5.701,6.092,5.523"/><path class="st4" d="M24.627,58.988h19.304"/><path class="st4" d="M19.881,15.894l5.144-5.159"/><path class="st4" d="M48.284,57.588l5.127-5.127l0.037-0.039"/><path class="st4" d="M32.345,24.934c0-1.203,0.492-1.838,1.839-1.838"/><path class="st4" d="M48.845,24.934c0-1.203-0.492-1.838-1.839-1.838"/><path class="st4" d="M32.345,24.934v8.655"/><path class="st4" d="M34.185,23.096h12.821"/><path class="st4" d="M32.345,33.586c0,1.203,0.492,1.841,1.839,1.841"/><path class="st4" d="M48.845,33.586c0,1.203-0.492,1.841-1.839,1.841"/><path class="st4" d="M34.185,35.43h12.821"/><path class="st4" d="M48.845,24.934v8.655"/><path class="st4" d="M18.516,17.441h7.323c0.572,0,1.032,0.463,1.032,1.034c0,0.571-0.462,1.032-1.032,1.032h-7.323"/><path class="st4" d="M18.516,19.51c-2.586,0-3.764,1.386-3.764,2.675s1.176,2.675,3.764,2.675"/><path class="st4" d="M18.516,26.925c-3.828,0-5.831-2.387-5.831-4.743c0-2.356,2.002-4.743,5.831-4.743"/><path class="st4" d="M18.516,30.685h7.323c0.572,0,1.032,0.463,1.032,1.032c0,0.569-0.462,1.034-1.032,1.034h-7.323"/><path class="st4" d="M18.516,32.752c-2.586,0-3.764,1.386-3.764,2.674s1.176,2.677,3.764,2.677"/><path class="st4" d="M18.516,40.168c-3.828,0-5.831-2.385-5.831-4.743c0-2.358,2.002-4.741,5.831-4.741"/><path class="st4" d="M18.516,43.984h7.323c0.572,0,1.032,0.463,1.032,1.032c0,0.569-0.462,1.034-1.032,1.034h-7.323"/><path class="st4" d="M18.516,46.051c-2.586,0-3.764,1.386-3.764,2.674c0,1.287,1.176,2.677,3.764,2.677"/><path class="st4" d="M18.516,53.468c-3.828,0-5.831-2.387-5.831-4.744c0-2.358,2.002-4.741,5.831-4.741"/><path class="st4" d="M25.684,17.441c0.352-0.587,0.995-0.982,1.73-0.982c1.114,0,2.017,0.903,2.017,2.017
-	c0,1.114-0.903,2.014-2.017,2.014c-0.735,0-1.378-0.391-1.73-0.982"/><path class="st4" d="M25.684,30.656c0.352-0.589,0.995-0.982,1.73-0.982c1.114,0,2.017,0.903,2.017,2.017
-	c0,1.114-0.903,2.014-2.017,2.014c-0.725,0-1.358-0.379-1.712-0.953c-0.008-0.01-0.013-0.02-0.018-0.029"/><path class="st4" d="M25.684,43.984c0.352-0.589,0.995-0.982,1.73-0.982c1.114,0,2.017,0.903,2.017,2.016
-	c0,1.113-0.903,2.016-2.017,2.016c-0.735,0-1.378-0.393-1.73-0.982"/><path class="st4" d="M33.616,8.084V9v0.121v8.845"/><path class="st4" d="M35.009,18.662l2.246-2.041"/><path class="st4" d="M35.009,18.661c-0.697,0.567-1.393,0.087-1.393-0.697"/><path class="st4" d="M42.984,8.084V9v0.121v8.845"/><path class="st4" d="M41.591,18.662l-2.242-2.041"/><path class="st4" d="M41.592,18.661c0.697,0.567,1.393,0.087,1.393-0.697"/><path class="st4" d="M37.254,16.62c0.78-0.74,1.292-0.74,2.095,0"/><path class="st4" d="M42.984,8.083c0-2.207-1.393-3.263-3.593-3.263"/><path class="st4" d="M30.063,8.897c0-3.348,1.467-4.077,3.669-4.077"/><path class="st4" d="M39.391,4.82h-5.659"/></svg>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" id="Layer_1" x="0" y="0" version="1.1" viewBox="0 0 68 68" style="enable-background:new 0 0 68 68" xml:space="preserve"><style type="text/css">.st0{fill:#4ed7de}.st1{fill:#d18000}.st2{fill:#fffaf0}.st3{fill:#002140}.st4{fill:none;stroke:#002140;stroke-width:.8571;stroke-linecap:round;stroke-linejoin:round}</style><path d="M39.716,9.121V9h9.284c3.815-0.188,6.111,2.239,6.111,6.109v32.697c0,1.959-0.589,3.548-1.665,4.615	L53.41,52.46c-1.047,1.017-2.548,1.549-4.409,1.457H29.697c-3.813,0.188-6.109-2.239-6.109-6.109V15.109	c0-1.816,0.505-3.313,1.44-4.372c0.51-0.584,1.146-1.032,1.9-1.329c0.587-0.232,1.24-0.369,1.96-0.406	C29.148,8.987,29.42,8.987,29.697,9h0.651" class="st0"/><path d="M33.616,9h-0.651c-0.277-0.013-0.549-0.013-0.809,0.002c-0.72,0.037-0.527-0.255-1.113-0.022l-0.905,0.2V8.085	c0-2.207,1.393-3.263,3.593-3.263h5.659c2.202,0,3.593,1.056,3.593,3.263v9.882c0,0.784-0.696,1.264-1.393,0.696l-2.244-2.039	c-0.802-0.74-1.314-0.74-2.095,0l-2.247,2.039c-0.697,0.567-1.393,0.087-1.393-0.696V9H33.616z" class="st1"/><path d="M23.588,47.806c0,3.872,2.298,6.299,6.109,6.109h19.304c1.861,0.092,3.362-0.44,4.409-1.457l-5.127,5.127	c-1.046,0.98-2.526,1.492-4.352,1.401H24.627c-3.615,0.178-5.869-1.994-6.092-5.523c-0.012-0.191-0.018-0.386-0.018-0.587v-6.827	h5.072v1.755V47.806z" class="st2"/><path d="M47.005,23.096c1.349,0,1.839,0.634,1.839,1.838v8.655c0,1.203-0.492,1.841-1.839,1.841H34.185	c-1.349,0-1.839-0.638-1.839-1.841v-8.655c0-1.203,0.492-1.838,1.839-1.838H47.005z" class="st2"/><path d="M25.684,17.441c0.352-0.587,0.995-0.982,1.73-0.982c1.114,0,2.017,0.903,2.017,2.017	c0,1.114-0.903,2.014-2.017,2.014c-0.735,0-1.378-0.391-1.73-0.982h0.698c0.572,0,1.032-0.465,1.032-1.032	c0-0.567-0.462-1.034-1.032-1.034h-0.698V17.441z" class="st3"/><path d="M25.684,30.656c0.352-0.589,0.995-0.982,1.73-0.982c1.114,0,2.017,0.903,2.017,2.017	c0,1.114-0.903,2.014-2.017,2.014c-0.725,0-1.358-0.379-1.712-0.953h0.68c0.572,0,1.032-0.465,1.032-1.034	c0-0.569-0.462-1.032-1.032-1.032h-0.698V30.656z" class="st3"/><path d="M25.684,43.984c0.352-0.589,0.995-0.982,1.73-0.982c1.114,0,2.017,0.903,2.017,2.016	c0,1.113-0.903,2.016-2.017,2.016c-0.735,0-1.378-0.393-1.73-0.982h0.698c0.572,0,1.032-0.465,1.032-1.034	c0-0.569-0.462-1.032-1.032-1.032h-0.698V43.984z" class="st3"/><path d="M27.226,17.441c0.572,0,1.032,0.463,1.032,1.034c0,0.571-0.462,1.032-1.032,1.032h-8.71	c-2.586,0-3.765,1.386-3.765,2.675c0,1.289,1.177,2.675,3.765,2.675v2.066c-3.828,0-5.831-2.386-5.831-4.743	c0-2.356,2.002-4.743,5.831-4.743h8.71V17.441z" class="st3"/><path d="M27.226,30.685c0.572,0,1.032,0.463,1.032,1.032c0,0.569-0.462,1.034-1.032,1.034h-8.71	c-2.586,0-3.765,1.386-3.765,2.674c0,1.287,1.177,2.677,3.765,2.677v2.064c-3.828,0-5.831-2.385-5.831-4.743	c0-2.358,2.002-4.741,5.831-4.741h8.71V30.685z" class="st3"/><path d="M25.028,10.736c-0.935,1.059-1.44,2.556-1.44,4.372v2.333h-4.55v-0.138c0.193-0.473,0.44-0.898,0.733-1.279	l0.109-0.131l5.144-5.159h0.003V10.736z" class="st2"/><path d="M23.588,32.752v11.233h-5.072v-3.817v-2.064v-5.352H23.588z" class="st2"/><path d="M23.588,19.51v11.176h-5.072V20.181c0-0.174,0.007-0.347,0.015-0.515v-0.158h5.057V19.51z" class="st2"/><path d="M27.226,43.984c0.572,0,1.032,0.463,1.032,1.032c0,0.569-0.462,1.034-1.032,1.034h-8.71	c-2.586,0-3.765,1.386-3.765,2.674c0,1.287,1.177,2.677,3.765,2.677v1.477c0,0.2,0.007,0.394,0.018,0.587l-0.018,0.003	c-3.828,0-5.831-2.387-5.831-4.744c0-2.358,2.002-4.741,5.831-4.741h8.71V43.984z" class="st3"/><path d="M55.113,15.109v32.697" class="st4"/><path d="M55.113,15.108c0-3.872-2.298-6.299-6.111-6.109" class="st4"/><path d="M23.588,46.051v1.756" class="st4"/><path d="M23.588,32.752v11.233" class="st4"/><path d="M23.588,19.51v11.176" class="st4"/><path d="M23.588,15.109v2.333" class="st4"/><path d="M23.588,15.109c0-1.816,0.505-3.313,1.44-4.372c0.51-0.584,1.146-1.032,1.9-1.329	c0.587-0.232,1.24-0.369,1.96-0.406C29.148,8.987,29.42,8.987,29.697,9" class="st4"/><path d="M29.698,9h3.847" class="st4"/><path d="M43.25,9h5.752" class="st4"/><path d="M53.411,52.461c-1.047,1.017-2.548,1.549-4.409,1.457" class="st4"/><path d="M55.113,47.807c0,1.959-0.589,3.548-1.665,4.615" class="st4"/><path d="M23.588,47.807c0,3.872,2.298,6.299,6.109,6.109" class="st4"/><path d="M29.698,53.916h19.304" class="st4"/><path d="M18.516,20.18v4.679v2.066v3.759" class="st4"/><path d="M18.516,32.752v5.352v2.064v3.817" class="st4"/><path d="M18.516,46.051v5.352v1.477" class="st4"/><path d="M19.038,17.304c0.193-0.473,0.44-0.898,0.733-1.279" class="st4"/><path d="M18.516,20.181c0-0.175,0.007-0.347,0.015-0.515" class="st4"/><path d="M48.285,57.584c-1.046,0.982-2.526,1.494-4.352,1.403" class="st4"/><path d="M18.516,52.879c0,0.2,0.007,0.394,0.018,0.587c0.223,3.528,2.477,5.701,6.092,5.523" class="st4"/><path d="M24.627,58.988h19.304" class="st4"/><path d="M19.881,15.894l5.144-5.159" class="st4"/><path d="M48.284,57.588l5.127-5.127l0.037-0.039" class="st4"/><path d="M32.345,24.934c0-1.203,0.492-1.838,1.839-1.838" class="st4"/><path d="M48.845,24.934c0-1.203-0.492-1.838-1.839-1.838" class="st4"/><path d="M32.345,24.934v8.655" class="st4"/><path d="M34.185,23.096h12.821" class="st4"/><path d="M32.345,33.586c0,1.203,0.492,1.841,1.839,1.841" class="st4"/><path d="M48.845,33.586c0,1.203-0.492,1.841-1.839,1.841" class="st4"/><path d="M34.185,35.43h12.821" class="st4"/><path d="M48.845,24.934v8.655" class="st4"/><path d="M18.516,17.441h7.323c0.572,0,1.032,0.463,1.032,1.034c0,0.571-0.462,1.032-1.032,1.032h-7.323" class="st4"/><path d="M18.516,19.51c-2.586,0-3.764,1.386-3.764,2.675s1.176,2.675,3.764,2.675" class="st4"/><path d="M18.516,26.925c-3.828,0-5.831-2.387-5.831-4.743c0-2.356,2.002-4.743,5.831-4.743" class="st4"/><path d="M18.516,30.685h7.323c0.572,0,1.032,0.463,1.032,1.032c0,0.569-0.462,1.034-1.032,1.034h-7.323" class="st4"/><path d="M18.516,32.752c-2.586,0-3.764,1.386-3.764,2.674s1.176,2.677,3.764,2.677" class="st4"/><path d="M18.516,40.168c-3.828,0-5.831-2.385-5.831-4.743c0-2.358,2.002-4.741,5.831-4.741" class="st4"/><path d="M18.516,43.984h7.323c0.572,0,1.032,0.463,1.032,1.032c0,0.569-0.462,1.034-1.032,1.034h-7.323" class="st4"/><path d="M18.516,46.051c-2.586,0-3.764,1.386-3.764,2.674c0,1.287,1.176,2.677,3.764,2.677" class="st4"/><path d="M18.516,53.468c-3.828,0-5.831-2.387-5.831-4.744c0-2.358,2.002-4.741,5.831-4.741" class="st4"/><path d="M25.684,17.441c0.352-0.587,0.995-0.982,1.73-0.982c1.114,0,2.017,0.903,2.017,2.017	c0,1.114-0.903,2.014-2.017,2.014c-0.735,0-1.378-0.391-1.73-0.982" class="st4"/><path d="M25.684,30.656c0.352-0.589,0.995-0.982,1.73-0.982c1.114,0,2.017,0.903,2.017,2.017	c0,1.114-0.903,2.014-2.017,2.014c-0.725,0-1.358-0.379-1.712-0.953c-0.008-0.01-0.013-0.02-0.018-0.029" class="st4"/><path d="M25.684,43.984c0.352-0.589,0.995-0.982,1.73-0.982c1.114,0,2.017,0.903,2.017,2.016	c0,1.113-0.903,2.016-2.017,2.016c-0.735,0-1.378-0.393-1.73-0.982" class="st4"/><path d="M33.616,8.084V9v0.121v8.845" class="st4"/><path d="M35.009,18.662l2.246-2.041" class="st4"/><path d="M35.009,18.661c-0.697,0.567-1.393,0.087-1.393-0.697" class="st4"/><path d="M42.984,8.084V9v0.121v8.845" class="st4"/><path d="M41.591,18.662l-2.242-2.041" class="st4"/><path d="M41.592,18.661c0.697,0.567,1.393,0.087,1.393-0.697" class="st4"/><path d="M37.254,16.62c0.78-0.74,1.292-0.74,2.095,0" class="st4"/><path d="M42.984,8.083c0-2.207-1.393-3.263-3.593-3.263" class="st4"/><path d="M30.063,8.897c0-3.348,1.467-4.077,3.669-4.077" class="st4"/><path d="M39.391,4.82h-5.659" class="st4"/></svg>
\ No newline at end of file
diff --git a/assets/images/simple-illustrations/simple-illustration__alert.svg b/assets/images/simple-illustrations/simple-illustration__alert.svg
index 2e7bca02f5e3..cbf70b7655a7 100644
--- a/assets/images/simple-illustrations/simple-illustration__alert.svg
+++ b/assets/images/simple-illustrations/simple-illustration__alert.svg
@@ -1,15 +1 @@
-<svg width="48" height="48" viewBox="0 0 48 48" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M16.0671 34.248C16.1083 34.248 16.1495 34.248 16.1907 34.248H31.0873C31.6041 34.248 32.0542 34.29 32.4442 34.3642C34.9866 34.8512 35.0564 36.7382 35.0564 37.6317V42.1926H12.2217V37.6317C12.2217 36.7963 12.2851 35.0931 14.3711 34.4771C14.8307 34.3416 15.3887 34.2577 16.0671 34.2513V34.248Z" fill="#400000"/>
-<path d="M14.4027 34.4417C14.3076 34.1482 16.3301 17.2753 16.3301 17.2753C16.3301 17.2753 16.9768 13.3175 23.6278 13.1594C30.2757 13.3207 30.9256 17.2753 30.9256 17.2753C30.9256 17.2753 32.8213 33.087 32.8562 34.3643C32.4567 34.2901 31.9971 34.2482 31.4708 34.2482H31.2743C31.1665 32.4225 29.6955 18.6203 29.6955 18.6203C29.6955 18.6203 29.1629 14.9754 23.7103 14.827C18.2544 14.9754 17.725 18.6203 17.725 18.6203C17.725 18.6203 16.2509 32.4258 16.1463 34.2514C15.4552 34.2611 14.8845 34.3418 14.4153 34.4772L14.4058 34.445L14.4027 34.4417Z" fill="#BF3013"/>
-<path d="M31.2713 34.2449H16.2733C16.2289 34.2449 16.1877 34.2449 16.1465 34.2449C16.2511 32.4193 17.7252 18.6138 17.7252 18.6138C17.7252 18.6138 18.2546 14.9689 23.7105 14.8206C29.1632 14.9689 29.6958 18.6138 29.6958 18.6138C29.6958 18.6138 31.1699 32.416 31.2745 34.2417L31.2713 34.2449Z" fill="#F25730"/>
-<path d="M24.6298 42.1895H35.0596V37.6285C35.0596 36.735 34.9898 34.8481 32.4981 34.361C32.1145 34.2868 31.6739 34.2449 31.1666 34.2449H23.8848" stroke="#002140" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M24.6614 42.1894H12.2217V37.6284C12.2217 36.793 12.2851 35.0899 14.4154 34.4738C14.8846 34.3384 15.4552 34.2545 16.1463 34.248C16.1876 34.248 16.2288 34.248 16.2731 34.248H23.8879" stroke="#002140" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M14.4027 34.4416C14.3076 34.148 16.3301 17.2751 16.3301 17.2751C16.3301 17.2751 16.9768 13.3173 23.6278 13.1592C23.7642 13.1592 23.9036 13.156 24.0463 13.156" stroke="#002140" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M32.8538 34.4416C32.8538 34.4416 32.857 34.4061 32.8538 34.361C32.8221 33.0836 30.9232 17.2719 30.9232 17.2719C30.9232 17.2719 30.2733 13.3141 23.6255 13.1561C23.4892 13.1561 23.3497 13.1528 23.207 13.1528" stroke="#002140" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M22.5024 27.6711L18.4509 30.2226L20.67 26.1035L16.5234 24.8262L20.8634 23.6489L18.2607 19.5298L22.5024 21.7845L23.6595 17.5654L24.8166 21.7845L28.7698 19.5298L26.5507 23.5521L30.6972 24.7294L26.5507 25.8068L28.9632 30.0258L24.7183 27.5744L23.6595 32.087L22.5024 27.6711Z" fill="#FFFAF0"/>
-<path d="M33.4941 16.6848H38.9912" stroke="#BF3013" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M8.67773 17.0752H14.1748" stroke="#BF3013" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M23.9961 11.2401V5.64697" stroke="#BF3013" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M30.3457 12.8723L34.2323 8.91772" stroke="#BF3013" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M17.0692 13.2658L13.1826 9.31128" stroke="#BF3013" stroke-linecap="round" stroke-linejoin="round"/>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="48" height="48" fill="none" viewBox="0 0 48 48"><path fill="#400000" d="M16.0671 34.248C16.1083 34.248 16.1495 34.248 16.1907 34.248H31.0873C31.6041 34.248 32.0542 34.29 32.4442 34.3642C34.9866 34.8512 35.0564 36.7382 35.0564 37.6317V42.1926H12.2217V37.6317C12.2217 36.7963 12.2851 35.0931 14.3711 34.4771C14.8307 34.3416 15.3887 34.2577 16.0671 34.2513V34.248Z"/><path fill="#BF3013" d="M14.4027 34.4417C14.3076 34.1482 16.3301 17.2753 16.3301 17.2753C16.3301 17.2753 16.9768 13.3175 23.6278 13.1594C30.2757 13.3207 30.9256 17.2753 30.9256 17.2753C30.9256 17.2753 32.8213 33.087 32.8562 34.3643C32.4567 34.2901 31.9971 34.2482 31.4708 34.2482H31.2743C31.1665 32.4225 29.6955 18.6203 29.6955 18.6203C29.6955 18.6203 29.1629 14.9754 23.7103 14.827C18.2544 14.9754 17.725 18.6203 17.725 18.6203C17.725 18.6203 16.2509 32.4258 16.1463 34.2514C15.4552 34.2611 14.8845 34.3418 14.4153 34.4772L14.4058 34.445L14.4027 34.4417Z"/><path fill="#F25730" d="M31.2713 34.2449H16.2733C16.2289 34.2449 16.1877 34.2449 16.1465 34.2449C16.2511 32.4193 17.7252 18.6138 17.7252 18.6138C17.7252 18.6138 18.2546 14.9689 23.7105 14.8206C29.1632 14.9689 29.6958 18.6138 29.6958 18.6138C29.6958 18.6138 31.1699 32.416 31.2745 34.2417L31.2713 34.2449Z"/><path stroke="#002140" stroke-linecap="round" stroke-linejoin="round" d="M24.6298 42.1895H35.0596V37.6285C35.0596 36.735 34.9898 34.8481 32.4981 34.361C32.1145 34.2868 31.6739 34.2449 31.1666 34.2449H23.8848"/><path stroke="#002140" stroke-linecap="round" stroke-linejoin="round" d="M24.6614 42.1894H12.2217V37.6284C12.2217 36.793 12.2851 35.0899 14.4154 34.4738C14.8846 34.3384 15.4552 34.2545 16.1463 34.248C16.1876 34.248 16.2288 34.248 16.2731 34.248H23.8879"/><path stroke="#002140" stroke-linecap="round" stroke-linejoin="round" d="M14.4027 34.4416C14.3076 34.148 16.3301 17.2751 16.3301 17.2751C16.3301 17.2751 16.9768 13.3173 23.6278 13.1592C23.7642 13.1592 23.9036 13.156 24.0463 13.156"/><path stroke="#002140" stroke-linecap="round" stroke-linejoin="round" d="M32.8538 34.4416C32.8538 34.4416 32.857 34.4061 32.8538 34.361C32.8221 33.0836 30.9232 17.2719 30.9232 17.2719C30.9232 17.2719 30.2733 13.3141 23.6255 13.1561C23.4892 13.1561 23.3497 13.1528 23.207 13.1528"/><path fill="#FFFAF0" d="M22.5024 27.6711L18.4509 30.2226L20.67 26.1035L16.5234 24.8262L20.8634 23.6489L18.2607 19.5298L22.5024 21.7845L23.6595 17.5654L24.8166 21.7845L28.7698 19.5298L26.5507 23.5521L30.6972 24.7294L26.5507 25.8068L28.9632 30.0258L24.7183 27.5744L23.6595 32.087L22.5024 27.6711Z"/><path stroke="#BF3013" stroke-linecap="round" stroke-linejoin="round" d="M33.4941 16.6848H38.9912"/><path stroke="#BF3013" stroke-linecap="round" stroke-linejoin="round" d="M8.67773 17.0752H14.1748"/><path stroke="#BF3013" stroke-linecap="round" stroke-linejoin="round" d="M23.9961 11.2401V5.64697"/><path stroke="#BF3013" stroke-linecap="round" stroke-linejoin="round" d="M30.3457 12.8723L34.2323 8.91772"/><path stroke="#BF3013" stroke-linecap="round" stroke-linejoin="round" d="M17.0692 13.2658L13.1826 9.31128"/></svg>
\ No newline at end of file
diff --git a/assets/images/simple-illustrations/simple-illustration__binoculars.svg b/assets/images/simple-illustrations/simple-illustration__binoculars.svg
index 381be8988873..5abacd359464 100644
--- a/assets/images/simple-illustrations/simple-illustration__binoculars.svg
+++ b/assets/images/simple-illustrations/simple-illustration__binoculars.svg
@@ -1,50 +1 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 27.9.0, 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 68 68" style="enable-background:new 0 0 68 68;" xml:space="preserve">
-<style type="text/css">
-	.st0{fill:#085239;}
-	.st1{fill:#008C59;}
-	.st2{fill:#FFA75A;}
-	.st3{fill:#FFF2B2;}
-	.st4{fill:none;stroke:#002140;stroke-linecap:round;stroke-linejoin:round;}
-</style>
-<path class="st0" d="M57.9,31.4l-8.1-13.7c0,0-3.4-2.5-6.8-2.5c-3.4,0-6.7,3.4-7.3,4.6c-0.6,1.2-0.6,6-0.6,6l-1.4-0.5l-1.4,0.4
-	l0.1-3.2c0,0-2-7.3-7.8-7.3S16.4,19,16.4,19L9,32.4c0,0-2.9,4.4-2.9,7.7c0,3.3,3.3,12.4,11.4,12.4c8.1,0,11.9-6.8,12.3-10.1
-	c0,0,5.5-0.6,7.3,0.2c0,0,2.8,10.1,12.5,9.9c9.7-0.2,11.8-11.3,11.8-11.3S60.8,34.2,57.9,31.4L57.9,31.4z"/>
-<path class="st1" d="M17.9,52.3c6.6,0,11.9-5.3,11.9-11.9c0-6.6-5.3-11.9-11.9-11.9C11.3,28.5,6,33.8,6,40.4
-	C6,47,11.3,52.3,17.9,52.3z"/>
-<path class="st1" d="M49,52.2c6.6,0,11.9-5.3,11.9-11.9c0-6.6-5.3-11.9-11.9-11.9c-6.6,0-11.9,5.3-11.9,11.9
-	C37,46.9,42.4,52.2,49,52.2z"/>
-<path class="st1" d="M39.2,33.5v-5.7L36.6,27c0,0-2-1.8-3-1.6c-1,0.2-3.1,1.5-3.1,1.5l-2,1v5.7l1.7-0.3c0,0,2.5-1.7,3.7-1.7
-	s2.2,1,2.2,1S37.6,34.3,39.2,33.5L39.2,33.5z"/>
-<path class="st1" d="M32.4,25.3c0,0,0.4-9.4-6.9-10.2c-7.3-0.8-10,5.2-10,5.2l-0.6,1.4c0,0,3.8-2.4,8.7-2c5,0.5,7.8,5.1,7.8,5.1
-	l0.3,0.9L32.4,25.3L32.4,25.3z"/>
-<path class="st1" d="M35.4,25.5c0,0,1.7-5.4,8.3-6.1c6.6-0.8,8.7,3.1,8.7,3.1s-1.7-6.8-7.8-7.2s-9.4,5.1-9.4,5.1S34.3,25,35.4,25.5
-	L35.4,25.5z"/>
-<path class="st2" d="M18,49.9c5,0,9-4,9-9c0-5-4-9-9-9c-5,0-9,4-9,9C8.9,45.8,13,49.9,18,49.9z"/>
-<path class="st2" d="M49.3,49.4c5,0,9-4,9-9c0-5-4-9-9-9s-9,4-9,9C40.2,45.3,44.3,49.4,49.3,49.4z"/>
-<path class="st3" d="M16.8,31.5c-0.6,0.4-0.7,1.2-0.5,1.8c0.2,0.6,0.8,1.1,1.4,1.4c0.6,0.3,1.3,0.5,1.9,0.7c1.3,0.5,2.5,1.4,2.9,2.7
-	c0.2,0.6,0.2,1.3,0.4,1.9c0.5,1.5,2.4,2.4,3.8,1.8c0,0,0.9-5.8-2.6-8.2S16.8,31.5,16.8,31.5L16.8,31.5z"/>
-<path class="st3" d="M9.2,41c0.7-0.5,1.8-0.4,2.5,0.2c0.7,0.5,1.1,1.3,1.6,2.1c0.4,0.8,0.9,1.6,1.6,2.1c0.8,0.6,1.9,0.8,2.7,1.4
-	c0.9,0.6,1.4,1.6,1.4,2.7c0,0-4.8-0.1-7.4-2.7C8.9,44,9.2,41,9.2,41L9.2,41z"/>
-<path class="st3" d="M47.7,31.4c-0.6,0.4-0.7,1.2-0.5,1.8c0.2,0.6,0.8,1.1,1.4,1.4c0.6,0.3,1.3,0.5,1.9,0.7c1.3,0.5,2.5,1.4,2.9,2.7
-	c0.2,0.6,0.2,1.3,0.4,1.9c0.5,1.5,2.4,2.4,3.8,1.8c0,0,0.9-5.8-2.6-8.2C51.6,31.3,47.7,31.4,47.7,31.4L47.7,31.4z"/>
-<path class="st3" d="M40.1,40.8c0.7-0.5,1.8-0.4,2.5,0.2c0.7,0.5,1.1,1.3,1.6,2.1c0.4,0.8,0.9,1.6,1.6,2.1c0.8,0.6,1.9,0.8,2.7,1.4
-	c0.9,0.6,1.4,1.6,1.4,2.7c0,0-4.8-0.1-7.4-2.7C39.9,43.9,40.1,40.8,40.1,40.8L40.1,40.8z"/>
-<path class="st4" d="M18,52.3c6.6,0,12-5.4,12-12c0-6.6-5.4-12-12-12s-12,5.4-12,12C6,47,11.4,52.3,18,52.3z"/>
-<path class="st4" d="M16.1,19.7c1.5-2.7,4.3-4.6,7.7-4.6c4.8,0,8.7,3.9,8.7,8.7c0,0.7-0.1,1.4-0.2,2"/>
-<path class="st4" d="M13.6,24.1c1.6-2.7,4.9-4.6,8.7-4.6c4.6,0,8.4,2.8,9.5,6.5"/>
-<path class="st4" d="M53.4,23.9c-1.6-2.7-4.9-4.6-8.7-4.6c-4.6,0-8.4,2.8-9.5,6.5"/>
-<path class="st4" d="M18,49.4c5,0,9-4,9-9c0-5-4-9-9-9s-9,4-9,9C9,45.3,13,49.4,18,49.4z"/>
-<path class="st4" d="M49.1,52.3c6.6,0,12-5.4,12-12c0-6.6-5.4-12-12-12s-12,5.4-12,12C37.1,47,42.5,52.3,49.1,52.3z"/>
-<path class="st4" d="M49.1,49.4c5,0,9-4,9-9c0-5-4-9-9-9s-9,4-9,9C40,45.3,44.1,49.4,49.1,49.4z"/>
-<path class="st4" d="M29.9,42.3c0,0,3.7-1,7.1,0"/>
-<path class="st4" d="M28.6,27.6c2,0,2.9-2.1,5-2.1c2.1,0,3.2,2.2,5.4,2.2"/>
-<path class="st4" d="M28.5,33.8c2,0,2.9-2.1,5-2.1c2.1,0,3.2,2.2,5.4,2.2"/>
-<path class="st4" d="M8.1,33.7L16.5,19"/>
-<path class="st4" d="M51.1,19.8c-1.5-2.7-4.3-4.6-7.7-4.6c-4.8,0-8.7,3.9-8.7,8.7c0,0.7,0.1,1.4,0.2,2"/>
-<path class="st4" d="M59.1,33.8l-8.4-14.7"/>
-<path class="st4" d="M28.2,33.8l0.4-6.1"/>
-<path class="st4" d="M39.1,33.9l-0.2-6.1"/>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" id="Layer_1" x="0" y="0" version="1.1" viewBox="0 0 68 68" style="enable-background:new 0 0 68 68" xml:space="preserve"><style type="text/css">.st0{fill:#085239}.st1{fill:#008c59}.st2{fill:#ffa75a}.st3{fill:#fff2b2}.st4{fill:none;stroke:#002140;stroke-linecap:round;stroke-linejoin:round}</style><path d="M57.9,31.4l-8.1-13.7c0,0-3.4-2.5-6.8-2.5c-3.4,0-6.7,3.4-7.3,4.6c-0.6,1.2-0.6,6-0.6,6l-1.4-0.5l-1.4,0.4	l0.1-3.2c0,0-2-7.3-7.8-7.3S16.4,19,16.4,19L9,32.4c0,0-2.9,4.4-2.9,7.7c0,3.3,3.3,12.4,11.4,12.4c8.1,0,11.9-6.8,12.3-10.1	c0,0,5.5-0.6,7.3,0.2c0,0,2.8,10.1,12.5,9.9c9.7-0.2,11.8-11.3,11.8-11.3S60.8,34.2,57.9,31.4L57.9,31.4z" class="st0"/><path d="M17.9,52.3c6.6,0,11.9-5.3,11.9-11.9c0-6.6-5.3-11.9-11.9-11.9C11.3,28.5,6,33.8,6,40.4	C6,47,11.3,52.3,17.9,52.3z" class="st1"/><path d="M49,52.2c6.6,0,11.9-5.3,11.9-11.9c0-6.6-5.3-11.9-11.9-11.9c-6.6,0-11.9,5.3-11.9,11.9	C37,46.9,42.4,52.2,49,52.2z" class="st1"/><path d="M39.2,33.5v-5.7L36.6,27c0,0-2-1.8-3-1.6c-1,0.2-3.1,1.5-3.1,1.5l-2,1v5.7l1.7-0.3c0,0,2.5-1.7,3.7-1.7	s2.2,1,2.2,1S37.6,34.3,39.2,33.5L39.2,33.5z" class="st1"/><path d="M32.4,25.3c0,0,0.4-9.4-6.9-10.2c-7.3-0.8-10,5.2-10,5.2l-0.6,1.4c0,0,3.8-2.4,8.7-2c5,0.5,7.8,5.1,7.8,5.1	l0.3,0.9L32.4,25.3L32.4,25.3z" class="st1"/><path d="M35.4,25.5c0,0,1.7-5.4,8.3-6.1c6.6-0.8,8.7,3.1,8.7,3.1s-1.7-6.8-7.8-7.2s-9.4,5.1-9.4,5.1S34.3,25,35.4,25.5	L35.4,25.5z" class="st1"/><path d="M18,49.9c5,0,9-4,9-9c0-5-4-9-9-9c-5,0-9,4-9,9C8.9,45.8,13,49.9,18,49.9z" class="st2"/><path d="M49.3,49.4c5,0,9-4,9-9c0-5-4-9-9-9s-9,4-9,9C40.2,45.3,44.3,49.4,49.3,49.4z" class="st2"/><path d="M16.8,31.5c-0.6,0.4-0.7,1.2-0.5,1.8c0.2,0.6,0.8,1.1,1.4,1.4c0.6,0.3,1.3,0.5,1.9,0.7c1.3,0.5,2.5,1.4,2.9,2.7	c0.2,0.6,0.2,1.3,0.4,1.9c0.5,1.5,2.4,2.4,3.8,1.8c0,0,0.9-5.8-2.6-8.2S16.8,31.5,16.8,31.5L16.8,31.5z" class="st3"/><path d="M9.2,41c0.7-0.5,1.8-0.4,2.5,0.2c0.7,0.5,1.1,1.3,1.6,2.1c0.4,0.8,0.9,1.6,1.6,2.1c0.8,0.6,1.9,0.8,2.7,1.4	c0.9,0.6,1.4,1.6,1.4,2.7c0,0-4.8-0.1-7.4-2.7C8.9,44,9.2,41,9.2,41L9.2,41z" class="st3"/><path d="M47.7,31.4c-0.6,0.4-0.7,1.2-0.5,1.8c0.2,0.6,0.8,1.1,1.4,1.4c0.6,0.3,1.3,0.5,1.9,0.7c1.3,0.5,2.5,1.4,2.9,2.7	c0.2,0.6,0.2,1.3,0.4,1.9c0.5,1.5,2.4,2.4,3.8,1.8c0,0,0.9-5.8-2.6-8.2C51.6,31.3,47.7,31.4,47.7,31.4L47.7,31.4z" class="st3"/><path d="M40.1,40.8c0.7-0.5,1.8-0.4,2.5,0.2c0.7,0.5,1.1,1.3,1.6,2.1c0.4,0.8,0.9,1.6,1.6,2.1c0.8,0.6,1.9,0.8,2.7,1.4	c0.9,0.6,1.4,1.6,1.4,2.7c0,0-4.8-0.1-7.4-2.7C39.9,43.9,40.1,40.8,40.1,40.8L40.1,40.8z" class="st3"/><path d="M18,52.3c6.6,0,12-5.4,12-12c0-6.6-5.4-12-12-12s-12,5.4-12,12C6,47,11.4,52.3,18,52.3z" class="st4"/><path d="M16.1,19.7c1.5-2.7,4.3-4.6,7.7-4.6c4.8,0,8.7,3.9,8.7,8.7c0,0.7-0.1,1.4-0.2,2" class="st4"/><path d="M13.6,24.1c1.6-2.7,4.9-4.6,8.7-4.6c4.6,0,8.4,2.8,9.5,6.5" class="st4"/><path d="M53.4,23.9c-1.6-2.7-4.9-4.6-8.7-4.6c-4.6,0-8.4,2.8-9.5,6.5" class="st4"/><path d="M18,49.4c5,0,9-4,9-9c0-5-4-9-9-9s-9,4-9,9C9,45.3,13,49.4,18,49.4z" class="st4"/><path d="M49.1,52.3c6.6,0,12-5.4,12-12c0-6.6-5.4-12-12-12s-12,5.4-12,12C37.1,47,42.5,52.3,49.1,52.3z" class="st4"/><path d="M49.1,49.4c5,0,9-4,9-9c0-5-4-9-9-9s-9,4-9,9C40,45.3,44.1,49.4,49.1,49.4z" class="st4"/><path d="M29.9,42.3c0,0,3.7-1,7.1,0" class="st4"/><path d="M28.6,27.6c2,0,2.9-2.1,5-2.1c2.1,0,3.2,2.2,5.4,2.2" class="st4"/><path d="M28.5,33.8c2,0,2.9-2.1,5-2.1c2.1,0,3.2,2.2,5.4,2.2" class="st4"/><path d="M8.1,33.7L16.5,19" class="st4"/><path d="M51.1,19.8c-1.5-2.7-4.3-4.6-7.7-4.6c-4.8,0-8.7,3.9-8.7,8.7c0,0.7,0.1,1.4,0.2,2" class="st4"/><path d="M59.1,33.8l-8.4-14.7" class="st4"/><path d="M28.2,33.8l0.4-6.1" class="st4"/><path d="M39.1,33.9l-0.2-6.1" class="st4"/></svg>
\ No newline at end of file
diff --git a/assets/images/simple-illustrations/simple-illustration__car-ice.svg b/assets/images/simple-illustrations/simple-illustration__car-ice.svg
index ba2b79bca6aa..9da1b844c101 100644
--- a/assets/images/simple-illustrations/simple-illustration__car-ice.svg
+++ b/assets/images/simple-illustrations/simple-illustration__car-ice.svg
@@ -1,53 +1 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 28.1.0, 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 68 68" style="enable-background:new 0 0 68 68;" xml:space="preserve">
-<style type="text/css">
-	.st0{fill:#4ED7DE;}
-	.st1{fill:#4BA6A6;}
-	.st2{fill:#28736D;}
-	.st3{fill:#FFED8F;}
-	.st4{fill:none;stroke:#002140;stroke-width:0.8571;stroke-linecap:round;stroke-linejoin:round;}
-</style>
-	<path class="st0" d="M49.708,27.953c0,0-3.324-9.358-5.152-9.753c-1.828-0.395-11.801-2.123-20.018-0.156
-	c0,0-3.065,2.99-4.107,5.504c-1.042,2.517-1.564,4.484-1.564,4.484s-3.52,2.123-4.565,5.504c-1.042,3.381-0.391,11.247-0.391,11.247
-	s0.846,0.786,2.414,1.259c1.568,0.473,6.066,1.102,8.15,1.102s23.151-0.157,23.151-0.157l6.389-1.572c0,0,0.914-1.337,0.978-2.279
-	c0.064-0.942-0.26-8.494-0.26-8.494s-0.846-2.752-1.5-3.46c-0.654-0.708-3.52-3.225-3.52-3.225L49.708,27.953z"/>
-	<path class="st1" d="M18.931,27.563l-1.109-2.752l-2.478,0.708l-0.391,1.415l1.305,0.786L18.931,27.563z"/>
-	<path class="st1" d="M50.035,27.717l4.107-0.473v-1.021l-0.782-1.102l-2.542-0.235L50.035,27.717z"/>
-	<path class="st2" d="M23.496,46.751l21.974,0.078l-2.087-1.888H24.865L23.496,46.751z"/>
-	<path class="st2" d="M15.475,46.045l0.914,3.616l1.301,0.868l4.37-0.316l0.914-1.259l0.523-2.201L15.475,46.045z"/>
-	<path class="st2" d="M45.601,47.304l0.519,2.436l1.177,0.868l4.889-0.078l1.042-1.415l0.327-3.147l-8.086,0.864"/>
-	<path class="st3" d="M20.754,34.404l-2.997-2.044l-1.045,0.942l-0.26,2.283l0.978,1.02l3.129,1.259l1.305-1.099L20.754,34.404z"/>
-	<path class="st3" d="M51.6,32.514l-0.914-0.469l-2.87,2.279l-0.846,2.044l0.523,0.864l1.693-0.156l3.001-1.65L51.6,32.514z"/>
-	<path class="st3" d="M22.319,27.324l0.914,0.629h22.76l0.391-1.024l-3.001-6.294c0,0-5.479-1.181-9.977-1.024
-	c-4.498,0.156-8.477,1.102-8.477,1.102l-2.61,6.606V27.324z"/>
-	<path class="st4" d="M44.265,18.161c-4.27-1.376-13.728-1.849-20.05,0"/>
-	<path class="st4" d="M24.21,18.16c0,0-2.837,1.653-5.085,9.675c0,0-5.38,2.83-5.38,8.612c0,0-0.391,3.893,19.759,3.893
-	s21.423-3.776,21.423-3.776c0-5.782-5.38-8.612-5.38-8.612c-2.251-8.021-5.085-9.675-5.085-9.675"/>
-	<path class="st4" d="M13.747,36.447v6.923c0,1.241,0.757,2.29,1.774,2.468l6.23,1.074c0.572,0.1,1.152-0.096,1.6-0.537l0.878-0.868
-	c0.37-0.363,0.832-0.562,1.309-0.562h9.241"/>
-	<path class="st4" d="M54.906,36.434v6.923c0,1.241-0.757,2.29-1.774,2.468l-6.229,1.074c-0.573,0.099-1.152-0.096-1.6-0.537
-	l-0.878-0.868c-0.37-0.363-0.832-0.562-1.308-0.562h-9.241"/>
-	<path class="st4" d="M22.433,46.891l23.787-0.014"/>
-	<path class="st4" d="M15.521,45.838l0.412,2.667c0.178,1.148,1.01,1.984,1.981,1.984h3.264c0.946,0,1.764-0.793,1.966-1.906
-	l0.288-1.575"/>
-	<path class="st4" d="M53.505,46.016l-0.412,2.667c-0.178,1.148-1.01,1.984-1.981,1.984h-3.264c-0.946,0-1.764-0.793-1.966-1.906
-	l-0.288-1.575"/>
-	<path class="st4" d="M18.88,27.836l-0.544-2.35c-0.103-0.441-0.462-0.722-0.839-0.651l-1.888,0.356
-	c-0.245,0.046-0.455,0.235-0.562,0.508l-0.242,0.622c-0.228,0.579,0.107,1.252,0.636,1.287l3.438,0.231"/>
-	<path class="st4" d="M49.946,27.719l0.544-2.35c0.103-0.441,0.462-0.722,0.839-0.651l1.888,0.356
-	c0.245,0.046,0.455,0.235,0.562,0.508l0.242,0.622c0.228,0.58-0.107,1.252-0.636,1.287l-3.438,0.231"/>
-	<path class="st4" d="M16.833,33.047l-0.501,1.728c-0.185,0.633,0.092,1.323,0.615,1.547l2.869,1.223
-	c0.128,0.053,0.263,0.085,0.398,0.085l0.533,0.011c0.853,0.018,1.337-1.173,0.8-1.973l-0.764-1.145
-	c-0.06-0.092-0.135-0.174-0.217-0.242l-2.219-1.835c-0.548-0.452-1.298-0.156-1.518,0.597L16.833,33.047z"/>
-	<path class="st4" d="M51.678,32.811l0.501,1.728c0.185,0.633-0.092,1.323-0.615,1.547l-2.869,1.223
-	c-0.128,0.053-0.263,0.085-0.398,0.085l-0.533,0.011c-0.853,0.018-1.337-1.173-0.8-1.973l0.764-1.145
-	c0.06-0.093,0.135-0.174,0.217-0.242l2.219-1.835c0.548-0.452,1.298-0.157,1.518,0.597L51.678,32.811z"/>
-	<path class="st4" d="M45.53,28.111H23.197c-0.576,0-0.956-0.672-0.715-1.259l2.4-5.856c0.103-0.249,0.295-0.43,0.533-0.491
-	c1.589-0.42,8.118-1.852,17.668,0.028c0.245,0.05,0.459,0.228,0.569,0.48l2.581,5.817c0.263,0.59-0.117,1.284-0.704,1.284V28.111z"
-	/>
-	<path class="st4" d="M25.843,35.819c-0.686,0-3.065-0.395-3.324-3.069c-0.26-2.674-0.103-5.643-0.103-5.643"/>
-	<path class="st4" d="M42.71,35.778c0.722,0,3.221-0.395,3.499-3.069c0.277-2.674,0.107-5.643,0.107-5.643"/>
-	<path class="st4" d="M42.711,35.779c0,0-16.185,0.039-16.868,0.039"/>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" id="Layer_1" x="0" y="0" version="1.1" viewBox="0 0 68 68" style="enable-background:new 0 0 68 68" xml:space="preserve"><style type="text/css">.st0{fill:#4ed7de}.st1{fill:#4ba6a6}.st2{fill:#28736d}.st3{fill:#ffed8f}.st4{fill:none;stroke:#002140;stroke-width:.8571;stroke-linecap:round;stroke-linejoin:round}</style><path d="M49.708,27.953c0,0-3.324-9.358-5.152-9.753c-1.828-0.395-11.801-2.123-20.018-0.156	c0,0-3.065,2.99-4.107,5.504c-1.042,2.517-1.564,4.484-1.564,4.484s-3.52,2.123-4.565,5.504c-1.042,3.381-0.391,11.247-0.391,11.247	s0.846,0.786,2.414,1.259c1.568,0.473,6.066,1.102,8.15,1.102s23.151-0.157,23.151-0.157l6.389-1.572c0,0,0.914-1.337,0.978-2.279	c0.064-0.942-0.26-8.494-0.26-8.494s-0.846-2.752-1.5-3.46c-0.654-0.708-3.52-3.225-3.52-3.225L49.708,27.953z" class="st0"/><path d="M18.931,27.563l-1.109-2.752l-2.478,0.708l-0.391,1.415l1.305,0.786L18.931,27.563z" class="st1"/><path d="M50.035,27.717l4.107-0.473v-1.021l-0.782-1.102l-2.542-0.235L50.035,27.717z" class="st1"/><path d="M23.496,46.751l21.974,0.078l-2.087-1.888H24.865L23.496,46.751z" class="st2"/><path d="M15.475,46.045l0.914,3.616l1.301,0.868l4.37-0.316l0.914-1.259l0.523-2.201L15.475,46.045z" class="st2"/><path d="M45.601,47.304l0.519,2.436l1.177,0.868l4.889-0.078l1.042-1.415l0.327-3.147l-8.086,0.864" class="st2"/><path d="M20.754,34.404l-2.997-2.044l-1.045,0.942l-0.26,2.283l0.978,1.02l3.129,1.259l1.305-1.099L20.754,34.404z" class="st3"/><path d="M51.6,32.514l-0.914-0.469l-2.87,2.279l-0.846,2.044l0.523,0.864l1.693-0.156l3.001-1.65L51.6,32.514z" class="st3"/><path d="M22.319,27.324l0.914,0.629h22.76l0.391-1.024l-3.001-6.294c0,0-5.479-1.181-9.977-1.024	c-4.498,0.156-8.477,1.102-8.477,1.102l-2.61,6.606V27.324z" class="st3"/><path d="M44.265,18.161c-4.27-1.376-13.728-1.849-20.05,0" class="st4"/><path d="M24.21,18.16c0,0-2.837,1.653-5.085,9.675c0,0-5.38,2.83-5.38,8.612c0,0-0.391,3.893,19.759,3.893	s21.423-3.776,21.423-3.776c0-5.782-5.38-8.612-5.38-8.612c-2.251-8.021-5.085-9.675-5.085-9.675" class="st4"/><path d="M13.747,36.447v6.923c0,1.241,0.757,2.29,1.774,2.468l6.23,1.074c0.572,0.1,1.152-0.096,1.6-0.537l0.878-0.868	c0.37-0.363,0.832-0.562,1.309-0.562h9.241" class="st4"/><path d="M54.906,36.434v6.923c0,1.241-0.757,2.29-1.774,2.468l-6.229,1.074c-0.573,0.099-1.152-0.096-1.6-0.537	l-0.878-0.868c-0.37-0.363-0.832-0.562-1.308-0.562h-9.241" class="st4"/><path d="M22.433,46.891l23.787-0.014" class="st4"/><path d="M15.521,45.838l0.412,2.667c0.178,1.148,1.01,1.984,1.981,1.984h3.264c0.946,0,1.764-0.793,1.966-1.906	l0.288-1.575" class="st4"/><path d="M53.505,46.016l-0.412,2.667c-0.178,1.148-1.01,1.984-1.981,1.984h-3.264c-0.946,0-1.764-0.793-1.966-1.906	l-0.288-1.575" class="st4"/><path d="M18.88,27.836l-0.544-2.35c-0.103-0.441-0.462-0.722-0.839-0.651l-1.888,0.356	c-0.245,0.046-0.455,0.235-0.562,0.508l-0.242,0.622c-0.228,0.579,0.107,1.252,0.636,1.287l3.438,0.231" class="st4"/><path d="M49.946,27.719l0.544-2.35c0.103-0.441,0.462-0.722,0.839-0.651l1.888,0.356	c0.245,0.046,0.455,0.235,0.562,0.508l0.242,0.622c0.228,0.58-0.107,1.252-0.636,1.287l-3.438,0.231" class="st4"/><path d="M16.833,33.047l-0.501,1.728c-0.185,0.633,0.092,1.323,0.615,1.547l2.869,1.223	c0.128,0.053,0.263,0.085,0.398,0.085l0.533,0.011c0.853,0.018,1.337-1.173,0.8-1.973l-0.764-1.145	c-0.06-0.092-0.135-0.174-0.217-0.242l-2.219-1.835c-0.548-0.452-1.298-0.156-1.518,0.597L16.833,33.047z" class="st4"/><path d="M51.678,32.811l0.501,1.728c0.185,0.633-0.092,1.323-0.615,1.547l-2.869,1.223	c-0.128,0.053-0.263,0.085-0.398,0.085l-0.533,0.011c-0.853,0.018-1.337-1.173-0.8-1.973l0.764-1.145	c0.06-0.093,0.135-0.174,0.217-0.242l2.219-1.835c0.548-0.452,1.298-0.157,1.518,0.597L51.678,32.811z" class="st4"/><path d="M45.53,28.111H23.197c-0.576,0-0.956-0.672-0.715-1.259l2.4-5.856c0.103-0.249,0.295-0.43,0.533-0.491	c1.589-0.42,8.118-1.852,17.668,0.028c0.245,0.05,0.459,0.228,0.569,0.48l2.581,5.817c0.263,0.59-0.117,1.284-0.704,1.284V28.111z" class="st4"/><path d="M25.843,35.819c-0.686,0-3.065-0.395-3.324-3.069c-0.26-2.674-0.103-5.643-0.103-5.643" class="st4"/><path d="M42.71,35.778c0.722,0,3.221-0.395,3.499-3.069c0.277-2.674,0.107-5.643,0.107-5.643" class="st4"/><path d="M42.711,35.779c0,0-16.185,0.039-16.868,0.039" class="st4"/></svg>
\ No newline at end of file
diff --git a/assets/images/simple-illustrations/simple-illustration__car.svg b/assets/images/simple-illustrations/simple-illustration__car.svg
index 2d420be6c3a9..9da1b844c101 100644
--- a/assets/images/simple-illustrations/simple-illustration__car.svg
+++ b/assets/images/simple-illustrations/simple-illustration__car.svg
@@ -1,25 +1 @@
-<?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 68 68" style="enable-background:new 0 0 68 68;" xml:space="preserve"><style type="text/css">
-	.st0{fill:#4ED7DE;}
-	.st1{fill:#4BA6A6;}
-	.st2{fill:#28736D;}
-	.st3{fill:#FFED8F;}
-	.st4{fill:none;stroke:#002140;stroke-width:0.8571;stroke-linecap:round;stroke-linejoin:round;}
-</style><path class="st0" d="M49.708,27.953c0,0-3.324-9.358-5.152-9.753c-1.828-0.395-11.801-2.123-20.018-0.156
-	c0,0-3.065,2.99-4.107,5.504c-1.042,2.517-1.564,4.484-1.564,4.484s-3.52,2.123-4.565,5.504c-1.042,3.381-0.391,11.247-0.391,11.247
-	s0.846,0.786,2.414,1.259c1.568,0.473,6.066,1.102,8.15,1.102s23.151-0.157,23.151-0.157l6.389-1.572c0,0,0.914-1.337,0.978-2.279
-	c0.064-0.942-0.26-8.494-0.26-8.494s-0.846-2.752-1.5-3.46c-0.654-0.708-3.52-3.225-3.52-3.225L49.708,27.953z"/><path class="st1" d="M18.931,27.563l-1.109-2.752l-2.478,0.708l-0.391,1.415l1.305,0.786L18.931,27.563z"/><path class="st1" d="M50.035,27.717l4.107-0.473v-1.021l-0.782-1.102l-2.542-0.235L50.035,27.717z"/><path class="st2" d="M23.496,46.751l21.974,0.078l-2.087-1.888H24.865L23.496,46.751z"/><path class="st2" d="M15.475,46.045l0.914,3.616l1.301,0.868l4.37-0.316l0.914-1.259l0.523-2.201L15.475,46.045z"/><path class="st2" d="M45.601,47.304l0.519,2.436l1.177,0.868l4.889-0.078l1.042-1.415l0.327-3.147l-8.086,0.864"/><path class="st3" d="M20.754,34.404l-2.997-2.044l-1.045,0.942l-0.26,2.283l0.978,1.02l3.129,1.259l1.305-1.099L20.754,34.404z"/><path class="st3" d="M51.6,32.514l-0.914-0.469l-2.87,2.279l-0.846,2.044l0.523,0.864l1.693-0.156l3.001-1.65L51.6,32.514z"/><path class="st3" d="M22.319,27.324l0.914,0.629h22.76l0.391-1.024l-3.001-6.294c0,0-5.479-1.181-9.977-1.024
-	c-4.498,0.156-8.477,1.102-8.477,1.102l-2.61,6.606V27.324z"/><path class="st4" d="M44.265,18.161c-4.27-1.376-13.728-1.849-20.05,0"/><path class="st4" d="M24.21,18.16c0,0-2.837,1.653-5.085,9.675c0,0-5.38,2.83-5.38,8.612c0,0-0.391,3.893,19.759,3.893
-	s21.423-3.776,21.423-3.776c0-5.782-5.38-8.612-5.38-8.612c-2.251-8.021-5.085-9.675-5.085-9.675"/><path class="st4" d="M13.747,36.447v6.923c0,1.241,0.757,2.29,1.774,2.468l6.23,1.074c0.572,0.1,1.152-0.096,1.6-0.537l0.878-0.868
-	c0.37-0.363,0.832-0.562,1.309-0.562h9.241"/><path class="st4" d="M54.906,36.434v6.923c0,1.241-0.757,2.29-1.774,2.468l-6.229,1.074c-0.573,0.099-1.152-0.096-1.6-0.537
-	l-0.878-0.868c-0.37-0.363-0.832-0.562-1.308-0.562h-9.241"/><path class="st4" d="M22.433,46.891l23.787-0.014"/><path class="st4" d="M15.521,45.838l0.412,2.667c0.178,1.148,1.01,1.984,1.981,1.984h3.264c0.946,0,1.764-0.793,1.966-1.906
-	l0.288-1.575"/><path class="st4" d="M53.505,46.016l-0.412,2.667c-0.178,1.148-1.01,1.984-1.981,1.984h-3.264c-0.946,0-1.764-0.793-1.966-1.906
-	l-0.288-1.575"/><path class="st4" d="M18.88,27.836l-0.544-2.35c-0.103-0.441-0.462-0.722-0.839-0.651l-1.888,0.356
-	c-0.245,0.046-0.455,0.235-0.562,0.508l-0.242,0.622c-0.228,0.579,0.107,1.252,0.636,1.287l3.438,0.231"/><path class="st4" d="M49.946,27.719l0.544-2.35c0.103-0.441,0.462-0.722,0.839-0.651l1.888,0.356
-	c0.245,0.046,0.455,0.235,0.562,0.508l0.242,0.622c0.228,0.58-0.107,1.252-0.636,1.287l-3.438,0.231"/><path class="st4" d="M16.833,33.047l-0.501,1.728c-0.185,0.633,0.092,1.323,0.615,1.547l2.869,1.223
-	c0.128,0.053,0.263,0.085,0.398,0.085l0.533,0.011c0.853,0.018,1.337-1.173,0.8-1.973l-0.764-1.145
-	c-0.06-0.092-0.135-0.174-0.217-0.242l-2.219-1.835c-0.548-0.452-1.298-0.156-1.518,0.597L16.833,33.047z"/><path class="st4" d="M51.678,32.811l0.501,1.728c0.185,0.633-0.092,1.323-0.615,1.547l-2.869,1.223
-	c-0.128,0.053-0.263,0.085-0.398,0.085l-0.533,0.011c-0.853,0.018-1.337-1.173-0.8-1.973l0.764-1.145
-	c0.06-0.093,0.135-0.174,0.217-0.242l2.219-1.835c0.548-0.452,1.298-0.157,1.518,0.597L51.678,32.811z"/><path class="st4" d="M45.53,28.111H23.197c-0.576,0-0.956-0.672-0.715-1.259l2.4-5.856c0.103-0.249,0.295-0.43,0.533-0.491
-	c1.589-0.42,8.118-1.852,17.668,0.028c0.245,0.05,0.459,0.228,0.569,0.48l2.581,5.817c0.263,0.59-0.117,1.284-0.704,1.284V28.111z"
-	/><path class="st4" d="M25.843,35.819c-0.686,0-3.065-0.395-3.324-3.069c-0.26-2.674-0.103-5.643-0.103-5.643"/><path class="st4" d="M42.71,35.778c0.722,0,3.221-0.395,3.499-3.069c0.277-2.674,0.107-5.643,0.107-5.643"/><path class="st4" d="M42.711,35.779c0,0-16.185,0.039-16.868,0.039"/></svg>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" id="Layer_1" x="0" y="0" version="1.1" viewBox="0 0 68 68" style="enable-background:new 0 0 68 68" xml:space="preserve"><style type="text/css">.st0{fill:#4ed7de}.st1{fill:#4ba6a6}.st2{fill:#28736d}.st3{fill:#ffed8f}.st4{fill:none;stroke:#002140;stroke-width:.8571;stroke-linecap:round;stroke-linejoin:round}</style><path d="M49.708,27.953c0,0-3.324-9.358-5.152-9.753c-1.828-0.395-11.801-2.123-20.018-0.156	c0,0-3.065,2.99-4.107,5.504c-1.042,2.517-1.564,4.484-1.564,4.484s-3.52,2.123-4.565,5.504c-1.042,3.381-0.391,11.247-0.391,11.247	s0.846,0.786,2.414,1.259c1.568,0.473,6.066,1.102,8.15,1.102s23.151-0.157,23.151-0.157l6.389-1.572c0,0,0.914-1.337,0.978-2.279	c0.064-0.942-0.26-8.494-0.26-8.494s-0.846-2.752-1.5-3.46c-0.654-0.708-3.52-3.225-3.52-3.225L49.708,27.953z" class="st0"/><path d="M18.931,27.563l-1.109-2.752l-2.478,0.708l-0.391,1.415l1.305,0.786L18.931,27.563z" class="st1"/><path d="M50.035,27.717l4.107-0.473v-1.021l-0.782-1.102l-2.542-0.235L50.035,27.717z" class="st1"/><path d="M23.496,46.751l21.974,0.078l-2.087-1.888H24.865L23.496,46.751z" class="st2"/><path d="M15.475,46.045l0.914,3.616l1.301,0.868l4.37-0.316l0.914-1.259l0.523-2.201L15.475,46.045z" class="st2"/><path d="M45.601,47.304l0.519,2.436l1.177,0.868l4.889-0.078l1.042-1.415l0.327-3.147l-8.086,0.864" class="st2"/><path d="M20.754,34.404l-2.997-2.044l-1.045,0.942l-0.26,2.283l0.978,1.02l3.129,1.259l1.305-1.099L20.754,34.404z" class="st3"/><path d="M51.6,32.514l-0.914-0.469l-2.87,2.279l-0.846,2.044l0.523,0.864l1.693-0.156l3.001-1.65L51.6,32.514z" class="st3"/><path d="M22.319,27.324l0.914,0.629h22.76l0.391-1.024l-3.001-6.294c0,0-5.479-1.181-9.977-1.024	c-4.498,0.156-8.477,1.102-8.477,1.102l-2.61,6.606V27.324z" class="st3"/><path d="M44.265,18.161c-4.27-1.376-13.728-1.849-20.05,0" class="st4"/><path d="M24.21,18.16c0,0-2.837,1.653-5.085,9.675c0,0-5.38,2.83-5.38,8.612c0,0-0.391,3.893,19.759,3.893	s21.423-3.776,21.423-3.776c0-5.782-5.38-8.612-5.38-8.612c-2.251-8.021-5.085-9.675-5.085-9.675" class="st4"/><path d="M13.747,36.447v6.923c0,1.241,0.757,2.29,1.774,2.468l6.23,1.074c0.572,0.1,1.152-0.096,1.6-0.537l0.878-0.868	c0.37-0.363,0.832-0.562,1.309-0.562h9.241" class="st4"/><path d="M54.906,36.434v6.923c0,1.241-0.757,2.29-1.774,2.468l-6.229,1.074c-0.573,0.099-1.152-0.096-1.6-0.537	l-0.878-0.868c-0.37-0.363-0.832-0.562-1.308-0.562h-9.241" class="st4"/><path d="M22.433,46.891l23.787-0.014" class="st4"/><path d="M15.521,45.838l0.412,2.667c0.178,1.148,1.01,1.984,1.981,1.984h3.264c0.946,0,1.764-0.793,1.966-1.906	l0.288-1.575" class="st4"/><path d="M53.505,46.016l-0.412,2.667c-0.178,1.148-1.01,1.984-1.981,1.984h-3.264c-0.946,0-1.764-0.793-1.966-1.906	l-0.288-1.575" class="st4"/><path d="M18.88,27.836l-0.544-2.35c-0.103-0.441-0.462-0.722-0.839-0.651l-1.888,0.356	c-0.245,0.046-0.455,0.235-0.562,0.508l-0.242,0.622c-0.228,0.579,0.107,1.252,0.636,1.287l3.438,0.231" class="st4"/><path d="M49.946,27.719l0.544-2.35c0.103-0.441,0.462-0.722,0.839-0.651l1.888,0.356	c0.245,0.046,0.455,0.235,0.562,0.508l0.242,0.622c0.228,0.58-0.107,1.252-0.636,1.287l-3.438,0.231" class="st4"/><path d="M16.833,33.047l-0.501,1.728c-0.185,0.633,0.092,1.323,0.615,1.547l2.869,1.223	c0.128,0.053,0.263,0.085,0.398,0.085l0.533,0.011c0.853,0.018,1.337-1.173,0.8-1.973l-0.764-1.145	c-0.06-0.092-0.135-0.174-0.217-0.242l-2.219-1.835c-0.548-0.452-1.298-0.156-1.518,0.597L16.833,33.047z" class="st4"/><path d="M51.678,32.811l0.501,1.728c0.185,0.633-0.092,1.323-0.615,1.547l-2.869,1.223	c-0.128,0.053-0.263,0.085-0.398,0.085l-0.533,0.011c-0.853,0.018-1.337-1.173-0.8-1.973l0.764-1.145	c0.06-0.093,0.135-0.174,0.217-0.242l2.219-1.835c0.548-0.452,1.298-0.157,1.518,0.597L51.678,32.811z" class="st4"/><path d="M45.53,28.111H23.197c-0.576,0-0.956-0.672-0.715-1.259l2.4-5.856c0.103-0.249,0.295-0.43,0.533-0.491	c1.589-0.42,8.118-1.852,17.668,0.028c0.245,0.05,0.459,0.228,0.569,0.48l2.581,5.817c0.263,0.59-0.117,1.284-0.704,1.284V28.111z" class="st4"/><path d="M25.843,35.819c-0.686,0-3.065-0.395-3.324-3.069c-0.26-2.674-0.103-5.643-0.103-5.643" class="st4"/><path d="M42.71,35.778c0.722,0,3.221-0.395,3.499-3.069c0.277-2.674,0.107-5.643,0.107-5.643" class="st4"/><path d="M42.711,35.779c0,0-16.185,0.039-16.868,0.039" class="st4"/></svg>
\ No newline at end of file
diff --git a/assets/images/simple-illustrations/simple-illustration__checkmarkcircle.svg b/assets/images/simple-illustrations/simple-illustration__checkmarkcircle.svg
new file mode 100644
index 000000000000..66d2b1e5b0e2
--- /dev/null
+++ b/assets/images/simple-illustrations/simple-illustration__checkmarkcircle.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" id="Layer_1" x="0" y="0" version="1.1" viewBox="0 0 68 68" style="enable-background:new 0 0 68 68" xml:space="preserve"><style type="text/css">.st0{fill:#00b268}.st1{fill:none;stroke:#008c59;stroke-width:1;stroke-linecap:round;stroke-linejoin:round}</style><path d="M25.559,34.541l-1.957,2.933c0,0,3.473-0.05,9.927,6.407c0,0,2.3-12.13,9.097-19.463l-0.293-0.39l-2.64-1.173	c0,0-5.183,5.527-7.727,15.21c0,0-3.277-3.033-6.407-3.52V34.541z" class="st0"/><path d="M34.458,13.651v4.093c0,0-13.603-1.217-16.146,14.93c0,0-0.883,16.257,15.927,17.143v3.76	c0,0-19.466-0.883-19.906-19.686c0-12.497,10.063-19.576,20.13-20.24H34.458z" class="st0"/><path d="M33.685,13.651v4.093c0,0,13.603-1.217,16.146,14.93c0,0,0.883,16.257-15.926,17.143v3.76	c0,0,19.466-0.883,19.906-19.686c0-12.497-10.063-19.576-20.13-20.24H33.685z" class="st0"/><path d="M39.745,22.808c-2.32,2.05-7.013,10.477-7.83,15.27c-0.33-0.32-1.99-2.183-6.487-3.7	c-0.17,0.28-1.63,2.723-1.81,2.983c4.123,0.52,9.796,6.26,9.976,6.553c1.287-7.45,5.707-16.66,9.087-19.607	c-0.387-0.2-2.603-1.283-2.933-1.5H39.745z" class="st1"/><path d="M34.178,53.568c10.946,0,19.82-8.874,19.82-19.82s-8.874-19.82-19.82-19.82s-19.82,8.874-19.82,19.82	S23.232,53.568,34.178,53.568z" class="st1"/><path d="M34.178,49.711c8.816,0,15.963-7.147,15.963-15.963c0-8.816-7.147-15.963-15.963-15.963	s-15.963,7.147-15.963,15.963C18.215,42.564,25.362,49.711,34.178,49.711z" class="st1"/></svg>
\ No newline at end of file
diff --git a/assets/images/simple-illustrations/simple-illustration__coins.svg b/assets/images/simple-illustrations/simple-illustration__coins.svg
index 5350886402c6..5caa1c0635d5 100644
--- a/assets/images/simple-illustrations/simple-illustration__coins.svg
+++ b/assets/images/simple-illustrations/simple-illustration__coins.svg
@@ -1,26 +1 @@
-<?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 68 68" style="enable-background:new 0 0 68 68;" xml:space="preserve"><style type="text/css">
-	.st0{fill:#FED607;}
-	.st1{fill:#D18000;}
-	.st2{fill:none;stroke:#002140;stroke-width:0.9999;stroke-linecap:round;stroke-linejoin:round;}
-	.st3{fill:none;stroke:#D18000;stroke-width:0.9999;stroke-miterlimit:10;}
-	.st4{fill:#FFED8F;}
-</style><path class="st0" d="M10.957,45.597c0,0,2.703,5.551,21.067,4.98c18.364-0.57,20.496-4.127,20.496-5.268
-	c0-1.141-8.399-4.98-19.501-4.839c-11.102,0.142-21.633,1.424-22.062,5.122V45.597z"/><path class="st1" d="M11.24,46.592v6.121c0,0,7.687,4.127,21.491,4.127c13.804,0,19.926-4.414,19.926-4.414v-6.121
-	c0,0-6.405,4.839-20.638,4.268S12.951,47.729,11.24,46.592z"/><path class="st2" d="M31.882,50.336c11.476,0,20.779-2.166,20.779-4.839c0-2.672-9.303-4.839-20.779-4.839
-	s-20.779,2.166-20.779,4.839C11.103,48.169,20.406,50.336,31.882,50.336z"/><path class="st2" d="M11.099,45.498v6.357c0,2.673,9.304,4.839,20.779,4.839c11.475,0,20.779-2.166,20.779-4.839v-6.357"/><path class="st3" d="M31.976,46.922c4.402,0,7.97-0.718,7.97-1.604c0-0.886-3.568-1.604-7.97-1.604c-4.402,0-7.97,0.718-7.97,1.604
-	C24.006,46.203,27.574,46.922,31.976,46.922z"/><path class="st0" d="M16.367,35.819c0,0,2.702,5.551,21.066,4.98c18.364-0.571,20.496-4.127,20.496-5.268
-	c0-1.141-8.399-4.98-19.501-4.839c-11.102,0.142-21.633,1.424-22.062,5.122V35.819z"/><path class="st1" d="M16.649,36.819v6.121c0,0,7.687,4.127,21.491,4.127c13.804,0,19.926-4.414,19.926-4.414v-6.121
-	c0,0-6.404,4.839-20.638,4.268c-14.233-0.57-19.072-2.848-20.779-3.985V36.819z"/><path class="st2" d="M37.286,40.564c11.476,0,20.779-2.166,20.779-4.839c0-2.672-9.303-4.839-20.779-4.839
-	s-20.779,2.166-20.779,4.839C16.507,38.398,25.81,40.564,37.286,40.564z"/><path class="st2" d="M16.507,35.725v6.357c0,2.672,9.304,4.839,20.779,4.839c11.475,0,20.779-2.166,20.779-4.839v-6.357"/><path class="st3" d="M37.381,37.15c4.402,0,7.97-0.718,7.97-1.604c0-0.886-3.568-1.604-7.97-1.604s-7.97,0.718-7.97,1.604
-	C29.41,36.432,32.979,37.15,37.381,37.15z"/><path class="st0" d="M10.721,26.941c0,0,2.702,5.551,21.067,4.98c18.364-0.57,20.496-4.127,20.496-5.268
-	c0-1.141-8.399-4.98-19.501-4.839c-11.102,0.142-21.633,1.424-22.062,5.122V26.941z"/><path class="st1" d="M11.003,27.936v6.121c0,0,7.687,4.127,21.491,4.127c13.804,0,19.926-4.414,19.926-4.414v-6.121
-	c0,0-6.404,4.839-20.638,4.268C17.549,31.346,12.711,29.077,11.003,27.936z"/><path class="st2" d="M31.642,31.685c11.476,0,20.779-2.166,20.779-4.839c0-2.672-9.303-4.839-20.779-4.839
-	s-20.779,2.166-20.779,4.839C10.863,29.519,20.166,31.685,31.642,31.685z"/><path class="st2" d="M10.863,26.846v6.357c0,2.673,9.304,4.839,20.779,4.839c11.475,0,20.779-2.166,20.779-4.839v-6.357"/><path class="st3" d="M31.736,28.265c4.402,0,7.97-0.718,7.97-1.604c0-0.886-3.568-1.604-7.97-1.604s-7.97,0.718-7.97,1.604
-	C23.766,27.547,27.334,28.265,31.736,28.265z"/><path class="st0" d="M16.178,17.13c0,0,2.703,5.551,21.066,4.98c18.364-0.57,20.496-4.127,20.496-5.268
-	c0-1.141-8.399-4.98-19.501-4.839c-11.102,0.142-21.633,1.424-22.062,5.122V17.13z"/><path class="st4" d="M17.718,15.426c1.78,1.253,4.131,1.377,6.284,1.055c2.153-0.322,4.234-1.038,6.396-1.304
-	c2.497-0.309,5.027-0.009,7.545-0.009c1.017,0,2.068-0.06,2.973-0.523c0.905-0.463,1.617-1.437,1.484-2.441
-	c0,0-7.618-0.27-13.431,0.172c-5.812,0.442-11.248,3.054-11.248,3.054L17.718,15.426z"/><path class="st1" d="M16.461,18.125v6.121c0,0,7.687,4.127,21.491,4.127c13.804,0,19.925-4.414,19.925-4.414v-6.121
-	c0,0-6.404,4.839-20.638,4.268s-19.072-2.848-20.779-3.985V18.125z"/><path class="st2" d="M37.098,21.875c11.476,0,20.779-2.166,20.779-4.839s-9.303-4.839-20.779-4.839s-20.779,2.166-20.779,4.839
-	S25.622,21.875,37.098,21.875z"/><path class="st2" d="M16.319,17.035v6.357c0,2.672,9.304,4.839,20.779,4.839c11.475,0,20.779-2.166,20.779-4.839v-6.357"/><path class="st3" d="M37.193,18.455c4.402,0,7.97-0.718,7.97-1.604c0-0.886-3.568-1.604-7.97-1.604s-7.97,0.718-7.97,1.604
-	C29.223,17.736,32.791,18.455,37.193,18.455z"/></svg>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" id="Layer_1" x="0" y="0" version="1.1" viewBox="0 0 68 68" style="enable-background:new 0 0 68 68" xml:space="preserve"><style type="text/css">.st0{fill:#fed607}.st1{fill:#d18000}.st2,.st3{fill:none;stroke-width:.9999}.st2{stroke:#002140;stroke-linecap:round;stroke-linejoin:round}.st3{stroke:#d18000;stroke-miterlimit:10}.st4{fill:#ffed8f}</style><path d="M10.957,45.597c0,0,2.703,5.551,21.067,4.98c18.364-0.57,20.496-4.127,20.496-5.268	c0-1.141-8.399-4.98-19.501-4.839c-11.102,0.142-21.633,1.424-22.062,5.122V45.597z" class="st0"/><path d="M11.24,46.592v6.121c0,0,7.687,4.127,21.491,4.127c13.804,0,19.926-4.414,19.926-4.414v-6.121	c0,0-6.405,4.839-20.638,4.268S12.951,47.729,11.24,46.592z" class="st1"/><path d="M31.882,50.336c11.476,0,20.779-2.166,20.779-4.839c0-2.672-9.303-4.839-20.779-4.839	s-20.779,2.166-20.779,4.839C11.103,48.169,20.406,50.336,31.882,50.336z" class="st2"/><path d="M11.099,45.498v6.357c0,2.673,9.304,4.839,20.779,4.839c11.475,0,20.779-2.166,20.779-4.839v-6.357" class="st2"/><path d="M31.976,46.922c4.402,0,7.97-0.718,7.97-1.604c0-0.886-3.568-1.604-7.97-1.604c-4.402,0-7.97,0.718-7.97,1.604	C24.006,46.203,27.574,46.922,31.976,46.922z" class="st3"/><path d="M16.367,35.819c0,0,2.702,5.551,21.066,4.98c18.364-0.571,20.496-4.127,20.496-5.268	c0-1.141-8.399-4.98-19.501-4.839c-11.102,0.142-21.633,1.424-22.062,5.122V35.819z" class="st0"/><path d="M16.649,36.819v6.121c0,0,7.687,4.127,21.491,4.127c13.804,0,19.926-4.414,19.926-4.414v-6.121	c0,0-6.404,4.839-20.638,4.268c-14.233-0.57-19.072-2.848-20.779-3.985V36.819z" class="st1"/><path d="M37.286,40.564c11.476,0,20.779-2.166,20.779-4.839c0-2.672-9.303-4.839-20.779-4.839	s-20.779,2.166-20.779,4.839C16.507,38.398,25.81,40.564,37.286,40.564z" class="st2"/><path d="M16.507,35.725v6.357c0,2.672,9.304,4.839,20.779,4.839c11.475,0,20.779-2.166,20.779-4.839v-6.357" class="st2"/><path d="M37.381,37.15c4.402,0,7.97-0.718,7.97-1.604c0-0.886-3.568-1.604-7.97-1.604s-7.97,0.718-7.97,1.604	C29.41,36.432,32.979,37.15,37.381,37.15z" class="st3"/><path d="M10.721,26.941c0,0,2.702,5.551,21.067,4.98c18.364-0.57,20.496-4.127,20.496-5.268	c0-1.141-8.399-4.98-19.501-4.839c-11.102,0.142-21.633,1.424-22.062,5.122V26.941z" class="st0"/><path d="M11.003,27.936v6.121c0,0,7.687,4.127,21.491,4.127c13.804,0,19.926-4.414,19.926-4.414v-6.121	c0,0-6.404,4.839-20.638,4.268C17.549,31.346,12.711,29.077,11.003,27.936z" class="st1"/><path d="M31.642,31.685c11.476,0,20.779-2.166,20.779-4.839c0-2.672-9.303-4.839-20.779-4.839	s-20.779,2.166-20.779,4.839C10.863,29.519,20.166,31.685,31.642,31.685z" class="st2"/><path d="M10.863,26.846v6.357c0,2.673,9.304,4.839,20.779,4.839c11.475,0,20.779-2.166,20.779-4.839v-6.357" class="st2"/><path d="M31.736,28.265c4.402,0,7.97-0.718,7.97-1.604c0-0.886-3.568-1.604-7.97-1.604s-7.97,0.718-7.97,1.604	C23.766,27.547,27.334,28.265,31.736,28.265z" class="st3"/><path d="M16.178,17.13c0,0,2.703,5.551,21.066,4.98c18.364-0.57,20.496-4.127,20.496-5.268	c0-1.141-8.399-4.98-19.501-4.839c-11.102,0.142-21.633,1.424-22.062,5.122V17.13z" class="st0"/><path d="M17.718,15.426c1.78,1.253,4.131,1.377,6.284,1.055c2.153-0.322,4.234-1.038,6.396-1.304	c2.497-0.309,5.027-0.009,7.545-0.009c1.017,0,2.068-0.06,2.973-0.523c0.905-0.463,1.617-1.437,1.484-2.441	c0,0-7.618-0.27-13.431,0.172c-5.812,0.442-11.248,3.054-11.248,3.054L17.718,15.426z" class="st4"/><path d="M16.461,18.125v6.121c0,0,7.687,4.127,21.491,4.127c13.804,0,19.925-4.414,19.925-4.414v-6.121	c0,0-6.404,4.839-20.638,4.268s-19.072-2.848-20.779-3.985V18.125z" class="st1"/><path d="M37.098,21.875c11.476,0,20.779-2.166,20.779-4.839s-9.303-4.839-20.779-4.839s-20.779,2.166-20.779,4.839	S25.622,21.875,37.098,21.875z" class="st2"/><path d="M16.319,17.035v6.357c0,2.672,9.304,4.839,20.779,4.839c11.475,0,20.779-2.166,20.779-4.839v-6.357" class="st2"/><path d="M37.193,18.455c4.402,0,7.97-0.718,7.97-1.604c0-0.886-3.568-1.604-7.97-1.604s-7.97,0.718-7.97,1.604	C29.223,17.736,32.791,18.455,37.193,18.455z" class="st3"/></svg>
\ No newline at end of file
diff --git a/assets/images/simple-illustrations/simple-illustration__company-card.svg b/assets/images/simple-illustrations/simple-illustration__company-card.svg
index 4121bbeeb205..1f4e43dbc047 100644
--- a/assets/images/simple-illustrations/simple-illustration__company-card.svg
+++ b/assets/images/simple-illustrations/simple-illustration__company-card.svg
@@ -1,38 +1 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 27.9.0, 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 68 68" style="enable-background:new 0 0 68 68;" xml:space="preserve">
-<style type="text/css">
-	.st0{fill:#722B03;}
-	.st1{fill:#FED607;}
-	.st2{fill:#780505;}
-	.st3{fill:none;stroke:#002140;stroke-linecap:round;stroke-linejoin:round;}
-	.st4{fill:#FF7101;}
-	.st5{fill:#FBCCFF;}
-	.st6{fill:#002140;}
-</style>
-<path class="st0" d="M16.3,49.1V20.5h0.4c0,1.3,1.2,2.3,2.7,2.3c1.5,0,2.7-1,2.7-2.3v-0.4h19.2v0.4c0,1.3,1.2,2.3,2.7,2.3
-	c1.5,0,2.7-1,2.7-2.3v-0.4h1.8c1.3,0,2.3,1,2.3,2.3v24.3c0,1.3-1,2.3-2.3,2.3L16.3,49.1L16.3,49.1z"/>
-<path class="st1" d="M41.3,20.2h5.3v0.4c0,1.3-1.2,2.3-2.7,2.3c-1.5,0-2.7-1-2.7-2.3L41.3,20.2L41.3,20.2z"/>
-<path class="st1" d="M22,20.2v0.4c0,1.3-1.2,2.3-2.7,2.3c-1.5,0-2.7-1-2.7-2.3v-0.4H22z"/>
-<path class="st2" d="M26,20.2H22v-8c0-1.2,1-2.2,2.2-2.2H39c1.2,0,2.2,1,2.2,2.2v8h-3.8v-4.8c0-1.2-1-2.2-2.2-2.2h-7
-	c-1.2,0-2.2,1-2.2,2.2L26,20.2L26,20.2z"/>
-<path class="st2" d="M16.3,20.5v28.5H13c-1.3,0-2.3-1-2.3-2.3V22.4c0-1.3,1-2.3,2.3-2.3h3.6v0.4L16.3,20.5L16.3,20.5z"/>
-<path class="st3" d="M46.6,20.2h1.8c1.3,0,2.3,1,2.3,2.3v24.3c0,1.3-1,2.3-2.3,2.3H13c-1.3,0-2.3-1-2.3-2.3V22.4
-	c0-1.3,1-2.3,2.3-2.3L46.6,20.2L46.6,20.2z"/>
-<path class="st3" d="M16.3,49.1V20.5"/>
-<path class="st3" d="M22,20.5c0,1.3-1.2,2.3-2.7,2.3c-1.5,0-2.7-1-2.7-2.3"/>
-<path class="st3" d="M46.6,20.5c0,1.3-1.2,2.3-2.7,2.3c-1.5,0-2.7-1-2.7-2.3"/>
-<path class="st3" d="M22,20v-7.9c0-1.2,1-2.2,2.2-2.2H39c1.2,0,2.2,1,2.2,2.2V20"/>
-<path class="st3" d="M26,20.2v-4.8c0-1.2,1-2.2,2.2-2.2h7c1.2,0,2.2,1,2.2,2.2v4.5"/>
-<path class="st4" d="M60,38.5l-25.1,0.1c-0.7,0-1.3,0.6-1.3,1.3l0.1,13.7c0,0.7,0.6,1.3,1.3,1.3l25.1-0.1c0.7,0,1.3-0.6,1.3-1.3
-	l-0.1-13.7C61.3,39.1,60.7,38.5,60,38.5z"/>
-<path class="st3" d="M59.8,38.5l-24.7,0.1c-0.9,0-1.6,0.7-1.6,1.6l0.1,13.2c0,0.9,0.7,1.6,1.6,1.6l24.7-0.1c0.9,0,1.6-0.7,1.6-1.6
-	L61.4,40C61.4,39.2,60.7,38.5,59.8,38.5z"/>
-<path class="st3" d="M36.2,52.2l3.8,0"/>
-<path class="st3" d="M41.7,52.2l3.8,0"/>
-<path class="st5" d="M41.9,47.6l0-3.1c0-0.2-0.3-0.3-0.7-0.3l-2.5,0c-0.2,0-0.4,0-0.5,0.1l-0.8,0.5c-0.1,0.1-0.1,0.1-0.1,0.2l0,2.2
-	c0,0.1,0,0.1,0.1,0.2l0.6,0.4c0.1,0.1,0.3,0.1,0.6,0.1l2.7,0C41.6,47.9,41.9,47.7,41.9,47.6L41.9,47.6z"/>
-<path class="st6" d="M57.9,43.9l-10.4,0c-0.4,0-0.7,0.3-0.7,0.7l0,2.3c0,0.4,0.3,0.7,0.7,0.7l10.4,0c0.4,0,0.7-0.3,0.7-0.7l0-2.3
-	C58.6,44.2,58.3,43.9,57.9,43.9z"/>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" id="Layer_1" x="0" y="0" version="1.1" viewBox="0 0 68 68" style="enable-background:new 0 0 68 68" xml:space="preserve"><style type="text/css">.st0{fill:#722b03}.st1{fill:#fed607}.st2{fill:#780505}.st3{fill:none;stroke:#002140;stroke-linecap:round;stroke-linejoin:round}.st4{fill:#ff7101}.st5{fill:#fbccff}.st6{fill:#002140}</style><path d="M16.3,49.1V20.5h0.4c0,1.3,1.2,2.3,2.7,2.3c1.5,0,2.7-1,2.7-2.3v-0.4h19.2v0.4c0,1.3,1.2,2.3,2.7,2.3	c1.5,0,2.7-1,2.7-2.3v-0.4h1.8c1.3,0,2.3,1,2.3,2.3v24.3c0,1.3-1,2.3-2.3,2.3L16.3,49.1L16.3,49.1z" class="st0"/><path d="M41.3,20.2h5.3v0.4c0,1.3-1.2,2.3-2.7,2.3c-1.5,0-2.7-1-2.7-2.3L41.3,20.2L41.3,20.2z" class="st1"/><path d="M22,20.2v0.4c0,1.3-1.2,2.3-2.7,2.3c-1.5,0-2.7-1-2.7-2.3v-0.4H22z" class="st1"/><path d="M26,20.2H22v-8c0-1.2,1-2.2,2.2-2.2H39c1.2,0,2.2,1,2.2,2.2v8h-3.8v-4.8c0-1.2-1-2.2-2.2-2.2h-7	c-1.2,0-2.2,1-2.2,2.2L26,20.2L26,20.2z" class="st2"/><path d="M16.3,20.5v28.5H13c-1.3,0-2.3-1-2.3-2.3V22.4c0-1.3,1-2.3,2.3-2.3h3.6v0.4L16.3,20.5L16.3,20.5z" class="st2"/><path d="M46.6,20.2h1.8c1.3,0,2.3,1,2.3,2.3v24.3c0,1.3-1,2.3-2.3,2.3H13c-1.3,0-2.3-1-2.3-2.3V22.4	c0-1.3,1-2.3,2.3-2.3L46.6,20.2L46.6,20.2z" class="st3"/><path d="M16.3,49.1V20.5" class="st3"/><path d="M22,20.5c0,1.3-1.2,2.3-2.7,2.3c-1.5,0-2.7-1-2.7-2.3" class="st3"/><path d="M46.6,20.5c0,1.3-1.2,2.3-2.7,2.3c-1.5,0-2.7-1-2.7-2.3" class="st3"/><path d="M22,20v-7.9c0-1.2,1-2.2,2.2-2.2H39c1.2,0,2.2,1,2.2,2.2V20" class="st3"/><path d="M26,20.2v-4.8c0-1.2,1-2.2,2.2-2.2h7c1.2,0,2.2,1,2.2,2.2v4.5" class="st3"/><path d="M60,38.5l-25.1,0.1c-0.7,0-1.3,0.6-1.3,1.3l0.1,13.7c0,0.7,0.6,1.3,1.3,1.3l25.1-0.1c0.7,0,1.3-0.6,1.3-1.3	l-0.1-13.7C61.3,39.1,60.7,38.5,60,38.5z" class="st4"/><path d="M59.8,38.5l-24.7,0.1c-0.9,0-1.6,0.7-1.6,1.6l0.1,13.2c0,0.9,0.7,1.6,1.6,1.6l24.7-0.1c0.9,0,1.6-0.7,1.6-1.6	L61.4,40C61.4,39.2,60.7,38.5,59.8,38.5z" class="st3"/><path d="M36.2,52.2l3.8,0" class="st3"/><path d="M41.7,52.2l3.8,0" class="st3"/><path d="M41.9,47.6l0-3.1c0-0.2-0.3-0.3-0.7-0.3l-2.5,0c-0.2,0-0.4,0-0.5,0.1l-0.8,0.5c-0.1,0.1-0.1,0.1-0.1,0.2l0,2.2	c0,0.1,0,0.1,0.1,0.2l0.6,0.4c0.1,0.1,0.3,0.1,0.6,0.1l2.7,0C41.6,47.9,41.9,47.7,41.9,47.6L41.9,47.6z" class="st5"/><path d="M57.9,43.9l-10.4,0c-0.4,0-0.7,0.3-0.7,0.7l0,2.3c0,0.4,0.3,0.7,0.7,0.7l10.4,0c0.4,0,0.7-0.3,0.7-0.7l0-2.3	C58.6,44.2,58.3,43.9,57.9,43.9z" class="st6"/></svg>
\ No newline at end of file
diff --git a/assets/images/simple-illustrations/simple-illustration__creditcardeyes.svg b/assets/images/simple-illustrations/simple-illustration__creditcardeyes.svg
new file mode 100644
index 000000000000..26b1ea7f2c31
--- /dev/null
+++ b/assets/images/simple-illustrations/simple-illustration__creditcardeyes.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" id="Layer_1" data-name="Layer 1" version="1.1" viewBox="0 0 68 68"><defs><style>.cls-1{fill:#fbccff}.cls-1,.cls-2,.cls-3,.cls-4,.cls-5{stroke-width:0}.cls-2{fill:#ff7101}.cls-3{fill:#002140}.cls-6{fill:none;stroke:#002140;stroke-linecap:round;stroke-linejoin:round;stroke-width:1px}.cls-4{fill:#fffaf0}.cls-5{fill:#d18000}</style></defs><path d="M57.424,22.411H10.381c-1.384,0-2.507,1.122-2.507,2.507v25.66c0,1.384,1.122,2.507,2.507,2.507h47.043c1.384,0,2.507-1.122,2.507-2.507v-25.66c0-1.384-1.122-2.507-2.507-2.507Z" class="cls-2"/><path d="M57.01,22.276H10.653c-1.655,0-2.997,1.342-2.997,2.997v24.663c0,1.655,1.342,2.997,2.997,2.997h46.356c1.655,0,2.997-1.342,2.997-2.997v-24.663c0-1.655-1.342-2.997-2.997-2.997Z" class="cls-6"/><path d="M12.594,47.941l7.078-.002" class="cls-6"/><path d="M22.917,47.939h7.078" class="cls-6"/><path d="M20.659,36.409h-1.23c-.32,0-.58.26-.58.58v2.243c0,.32.26.58.58.58h1.23c.32,0,.58-.26.58-.58v-2.243c0-.32-.26-.58-.58-.58Z" class="cls-1"/><path d="M20.691,32.993h-1.23c-.32,0-.58.26-.58.58v1.663c0,.32.26.58.58.58h1.23c.32,0,.58-.26.58-.58v-1.663c0-.32-.26-.58-.58-.58Z" class="cls-1"/><path d="M23.721,36.954h-1.23c-.32,0-.58.26-.58.58v1.663c0,.32.26.58.58.58h1.23c.32,0,.58-.26.58-.58v-1.663c0-.32-.26-.58-.58-.58Z" class="cls-1"/><path d="M23.646,32.994h-1.23c-.32,0-.58.26-.58.58v2.39c0,.32.26.58.58.58h1.23c.32,0,.58-.26.58-.58v-2.39c0-.32-.26-.58-.58-.58Z" class="cls-1"/><path d="M18.274,39.24v-5.773c0-.302-.242-.542-.544-.542h-1.973c-.168-.002-.328.077-.43.208l-.672.865c-.073.096-.114.212-.116.333l-.002,4.19c-.001.11.035.218.097.309l.504.723c.103.147.271.234.449.233l2.143-.009c.298-.002.541-.245.542-.543l.002.007Z" class="cls-1"/><path d="M52.342,32.458h-17.427c-1.357,0-2.457,1.1-2.457,2.457v2.053c0,1.357,1.1,2.457,2.457,2.457h17.427c1.357,0,2.457-1.1,2.457-2.457v-2.053c0-1.357-1.1-2.457-2.457-2.457Z" class="cls-3"/><path d="M37.468,29.794c4.214,0,7.63-3.416,7.63-7.63s-3.416-7.63-7.63-7.63-7.63,3.416-7.63,7.63,3.416,7.63,7.63,7.63Z" class="cls-4"/><path d="M47.754,29.904c4.214,0,7.63-3.416,7.63-7.63s-3.416-7.63-7.63-7.63-7.63,3.416-7.63,7.63,3.416,7.63,7.63,7.63Z" class="cls-4"/><path d="M54.794,19.914s-2.36-5.31-6.047-5.53c-3.687-.22-6.193,1.473-6.193,1.473,0,0-2.287-1.55-5.603-1.327-3.317.223-6.303,3.28-6.71,5.457,0,0,1.917,1.55,5.16,1.55s4.203-.22,4.203-.22l.517-1.55s4.35,2.137,8.333,1.99c3.983-.147,6.34-1.843,6.34-1.843Z" class="cls-5"/><path d="M42.811,15.884c1.29-.99,2.907-1.577,4.657-1.577,4.237,0,7.667,3.433,7.667,7.667s-3.433,7.667-7.667,7.667-7.667-3.433-7.667-7.667c0-2.483,1.18-4.69,3.01-6.093" class="cls-6"/><path d="M42.465,27.958c-1.313,1.057-2.983,1.687-4.8,1.687-4.237,0-7.667-3.433-7.667-7.667s3.433-7.667,7.667-7.667c1.743,0,3.35.58,4.637,1.56" class="cls-6"/><path d="M40.245,20.061s5.383,3.317,14.527,0" class="cls-6"/><path d="M30.291,20.061s3.39,2.09,9.36,1.293" class="cls-6"/><path d="M48.281,25.444l-3.31.673c.383,1.97,2.117,3.453,4.197,3.453,2.363,0,4.277-1.913,4.277-4.277s-1.913-4.277-4.277-4.277c-1.597,0-2.99.877-3.723,2.177l2.84,2.247-.003.003Z" class="cls-3"/><path d="M42.161,28.244c-.773.773-1.843,1.253-3.023,1.253-2.08,0-3.813-1.487-4.197-3.453l3.31-.673-2.84-2.247c.733-1.3,2.127-2.177,3.723-2.177.297,0,.583.03.863.087,0,0-.787,4.78,2.16,6.4" class="cls-3"/></svg>
\ No newline at end of file
diff --git a/assets/images/simple-illustrations/simple-illustration__empty-state.svg b/assets/images/simple-illustrations/simple-illustration__empty-state.svg
new file mode 100644
index 000000000000..2aeb9e8f4fb5
--- /dev/null
+++ b/assets/images/simple-illustrations/simple-illustration__empty-state.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" id="Layer_1" x="0" y="0" version="1.1" viewBox="0 0 184 113" style="enable-background:new 0 0 184 113" xml:space="preserve"><style type="text/css">.st0{fill:#fffaf0}.st1{fill:#fee45e}.st2{fill:#fff2b2}.st3{fill:#e4bc07}.st4{fill:#ccf6ff}.st5{fill:#fed607}.st6{fill:none;stroke:#002140;stroke-linecap:round;stroke-linejoin:round}.st7{fill:#002140}</style><path d="M55.6,17.615c0,0-6.047,0.293-8.11,4.277c-2.063,3.98-22.267,59.577-22.267,59.577l-7.817,21.234	c0,0-3.243,6.193-5.013,6.93H139.95l13.86-4.88l4.68-12.677l16.174-46.67c0,0,1.416-1.69,0.383-2.87	c-1.033-1.18-7.227-14.157-7.227-14.157l-28.606-0.293l2.063-5.75c0,0,0.147-4.57-4.72-4.867c-4.867-0.293-80.96,0.147-80.96,0.147	H55.6z" class="st0"/><path d="M18.953,99.605l-2.063,5.31l-4.14,4.9l131.847,0.26c0,0,10.616-2.213,10.763-10.027L18.953,99.605	L18.953,99.605z" class="st1"/><path d="M77.497,14.228l-47.337-0.19c0,0-4.827-0.1-4.647,4.977l0.18,5.077l20.833-0.653c0,0,4.647-4.867,5.53-5.197	c0.883-0.333,25.437-0.7,25.437-0.7v-3.313H77.497z" class="st1"/><path d="M20.87,93.782l-5.64-2.1c0,0-0.997-3.317-3.097,1.107s0.333,8.847,0.333,8.847l4.757,1.88l3.65-9.733H20.87z" class="st1"/><path d="M39.564,43.348c0,0-13.05-4.647-24,2.433C4.614,52.858,0.74,66.132,4.28,76.305	c3.54,10.177,11.393,17.253,16.59,17.473l18.69-50.433L39.564,43.348z" class="st2"/><path d="M37.13,49.875l1.88-6.637c0,0-13.493-4.757-24,2.653C4.504,53.301,1.074,65.245,4.614,77.411	S20.32,93.558,20.87,93.782l1.88-5.75c0,0-14.157-3.87-13.383-21.347c0-8.627,10.177-15.817,11.943-16.48	c1.77-0.663,8.073-1.66,8.073-1.66s6.857-0.22,7.743,1.327L37.13,49.875z" class="st3"/><path d="M32.927,61.375l-5.31,14.6c0,0-4.093-3.43-3.76-6.747c0.333-3.317,2.877-5.64,3.317-6.083	c0.44-0.443,4.533-1.88,5.75-1.77H32.927z" class="st3"/><path d="M3.25,51.458c0,0-0.147,0.883,0.293,1.327c0.44,0.443,3.317,2.063,3.317,2.063s4.57-6.12,6.12-7.077	l-3.76-2.063c0,0-0.96-0.517-1.77,0.073s-3.467,3.613-4.203,5.677H3.25z" class="st4"/><path d="M20.65,43.201l9.217-1.623l-1.77-4.57c0,0-5.087-0.883-8.773,1.917L20.65,43.201L20.65,43.201z" class="st5"/><path d="M10.4,87.442l-0.883,3.317l-1.77,1.253l-0.883,2.063l0.22,1.697l-0.293,1.55l1.18,2.95l0.81,0.293	c0,0-1.253,2.433,0.517,3.317c1.77,0.883,2.95,1.473,2.95,1.473s0.737,2.287,1.917,2.433c1.18,0.147,2.433-1.916,2.433-1.916	l0.37-2.95l-2.213-1.107l-1.697-3.243l-0.443-3.317l0.737-2.58l1.473-1.253L10.4,87.442L10.4,87.442z" class="st4"/><path d="M24.963,36.382c0,0-2.1-6.413-7.19-8.847c0,0,3.317-3.65,13.273-4.313c9.953-0.663,16.037,0.333,16.037,0.333	l-7.52,19.797c0,0-6.23-2.1-9.697-1.77l-1.77-4.57l-3.133-0.627V36.382z" class="st4"/><path d="M141.757,20.748l-0.554,2.653l-14.266,45.787l4.646-2.877l2.1,4.647l3.98-3.207l1.88,3.98l3.65-2.543	l1.364,4.857l4.83-3.75l1.263,5.54l4.71-4.213l1.683,5.867l4.15-4.147l1.557,5.747l17.603-50.377c0,0,3.317-7.63-5.53-7.743	c-8.846-0.11-33.07-0.22-33.07-0.22H141.757z" class="st1"/><path d="M77.497,17.542h43.906c0,0,1.327-9.4,3.317-13.823c0,0-5.197,0.997-8.407,3.54l-3.206-4.533l-6.414,4.977	l-5.42-4.423l-5.42,3.98l-4.423-3.87l-5.197,4.423l-4.867-3.98c0,0-2.877,3.097-3.87,13.713V17.542z" class="st2"/><path d="M8.264,103.245c0,0-1.83,4.71,1.327,5.64c3.157,0.93,3.98,0.443,3.98,0.443l0.59-1.54l-2.69-2.11L8.264,103.245	L8.264,103.245z" class="st3"/><path d="M17.267,103.148c0,0-2.027,6.637-5.63,6.637c-1.103,0-1.93-0.373-2.527-1.057c0,0-1.867-1.256-0.523-6.753" class="st6"/><path d="M139.407,28.165l1.99-5.64c0,0,1.326-4.977-4.977-4.977H55.46c0,0-6.527-0.293-8.96,6.637	c-2.987,8.293-29.197,78.967-29.197,78.967" class="st6"/><path d="M11.673,109.785H143.72c0,0,8.293-0.333,11.28-7.963c2.986-7.63,23.376-67.57,25.14-72	c1.763-4.43,1.1-8.963-5.98-8.963c-6.194-0.22-32.517,0-32.517,0" class="st6"/><path d="M25.697,24.091c-0.06-0.667-0.13-1.303-0.21-1.9c0,0-1.55-8.183,4.867-8.183c5.75,0,24.333,0.22,24.333,0.22	h22.81" class="st6"/><path d="M20.587,93.975C10.317,90.155,3,80.262,3,68.658c0-14.913,12.09-27.003,27.003-27.003	c3.217,0,6.303,0.563,9.163,1.593" class="st6"/><path d="M22.81,88.345C14.963,85.422,9.373,77.858,9.373,68.992c0-11.403,9.243-20.647,20.647-20.647	c2.413,0,4.73,0.413,6.883,1.177" class="st6"/><path d="M15.1,91.195c-0.98,1.503-2.807,2.087-4.173,1.3c-1.42-0.82-1.803-2.813-0.86-4.45	c0.107-0.187,0.227-0.36,0.36-0.52" class="st6"/><path d="M13.106,92.738c0.157,0.807,0.017,1.713-0.457,2.533c-0.947,1.64-2.863,2.303-4.283,1.483	s-1.803-2.813-0.86-4.45c0.473-0.82,1.19-1.393,1.963-1.663" class="st6"/><path d="M12.49,95.962c0.14,0.29,0.25,0.603,0.317,0.937c0.377,1.853-0.62,3.623-2.227,3.95	c-1.607,0.327-3.217-0.91-3.593-2.767c-0.17-0.84-0.06-1.66,0.26-2.337" class="st6"/><path d="M12.997,98.862c0.713,0.493,1.267,1.306,1.467,2.296c0.377,1.854-0.62,3.624-2.227,3.95	c-1.607,0.327-3.217-0.91-3.593-2.766c-0.113-0.554-0.103-1.097,0.01-1.6" class="st6"/><path d="M14.627,108.032c-0.57-0.13-1.13-0.407-1.623-0.827c-0.61-0.52-1.013-1.183-1.197-1.867" class="st6"/><path d="M14.767,101.792c0.727,0.063,1.47,0.363,2.097,0.903c0.13,0.11,0.25,0.227,0.36,0.35" class="st6"/><path d="M27.37,75.788c-2.06-1.39-3.413-3.747-3.413-6.42c0-4.277,3.467-7.743,7.743-7.743	c0.293,0,0.587,0.017,0.87,0.05" class="st6"/><path d="M30.206,52.128v5.677" class="st6"/><path d="M12.587,69.602H19" class="st6"/><path d="M18.63,57.435l3.983,4.203" class="st6"/><path d="M22.243,76.902l-4.57,3.76" class="st6"/><path d="M25.193,65.105l-10.543-4.35l-1.033,2.873l10.177,4.13" class="st7"/><path d="M12.436,47.482l-3.2-2.05c-0.33-0.21-0.743-0.243-1.097-0.077c-1.077,0.51-3.353,2.033-4.913,6.193	c-0.19,0.503,0.007,1.07,0.46,1.36l2.923,1.87" class="st6"/><path d="M4.033,50.285l3.833,2.357" class="st6"/><path d="M5.507,48.365l3.833,2.36" class="st6"/><path d="M7.057,46.745l3.833,2.36" class="st6"/><path d="M29.654,41.372l-1.023-3.66c-0.107-0.377-0.393-0.677-0.767-0.787c-1.143-0.337-3.853-0.717-7.79,1.35	c-0.477,0.25-0.707,0.803-0.563,1.32l0.933,3.343" class="st6"/><path d="M21.52,37.865l1.287,4.313" class="st6"/><path d="M23.896,37.415l1.287,4.313" class="st6"/><path d="M26.13,37.238l1.29,4.313" class="st6"/><path d="M18.63,99.832h136.923" class="st6"/><path d="M46.503,23.408c0,0-17.143-2.987-28.977,4.093c0,0,6.527,2.653,7.19,9.07" class="st6"/><path d="M28.75,28.992c0,0,8.847-2.653,16.147-0.997" class="st6"/><path d="M29.527,33.418c0,0,7.18-2.153,13.94-1.37" class="st6"/><path d="M30.687,37.895c0,0,5.39-1.617,11.227-1.537" class="st6"/><path d="M139.407,28.165l-12.61,40.763" class="st6"/><path d="M77.497,17.542c0,0,0.293-8.553,3.833-14.01l5.013,4.277l5.087-4.72l4.497,4.423l5.31-4.57l5.096,4.76	c0,0,6.524-5.487,6.75-5.19c0.227,0.297,3.047,4.563,3.047,4.563s4.57-3.54,8.997-3.54" class="st6"/><path d="M121.294,17.542c0,0,0.293-8.553,3.833-14.01" class="st6"/><path d="M84.65,10.868h21.456" class="st6"/><path d="M83.913,14.558h29.86" class="st6"/><path d="M136.113,59.568l24.997,5.973" class="st6"/><path d="M138.77,51.902l24.994,5.97" class="st6"/><path d="M141.313,44.188l23.927,5.64" class="st6"/><path d="M143.413,37.882l23.927,5.64" class="st6"/><path d="M145.073,32.132L169,37.771" class="st6"/><path d="M162.873,79.542l-1.68-6.2l-4.053,4.513l-1.613-6.1l-4.814,4.397l-1.253-6.083l-4.89,4.133l-1.01-5.427	l-3.98,3.687l-1.843-5.087l-4.28,4.197l-1.84-5.597l-4.794,2.953" class="st6"/></svg>
\ No newline at end of file
diff --git a/assets/images/simple-illustrations/simple-illustration__envelopereceipt.svg b/assets/images/simple-illustrations/simple-illustration__envelopereceipt.svg
new file mode 100644
index 000000000000..eb2bad31620d
--- /dev/null
+++ b/assets/images/simple-illustrations/simple-illustration__envelopereceipt.svg
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" version="1.1" viewBox="0 0 68 68">
+  <defs>
+    <style>
+      .cls-1 {
+        fill: #ffd7b0;
+      }
+
+      .cls-2 {
+        fill: #fffaf0;
+      }
+
+      .cls-3 {
+        fill: #002140;
+      }
+
+      .cls-4 {
+        fill: none;
+        stroke: #002140;
+        stroke-linecap: round;
+        stroke-linejoin: round;
+      }
+
+      .cls-5 {
+        fill: #fbccff;
+      }
+    </style>
+  </defs>
+  <!-- Generator: Adobe Illustrator 28.6.0, SVG Export Plug-In . SVG Version: 1.2.0 Build 709)  -->
+  <g>
+    <g id="Layer_1">
+      <path class="cls-2" d="M55.567,29.859l-.071-3.226s-1.203-2.713-1.793-2.797c-.59-.084-19.216-6.597-19.216-6.597,0,0-1.721.431-2.366.574-.645.143-17.139,5.809-17.139,5.809,0,0-1.579.716-2.007,2.509-.428,1.793-.574,4.159-.574,4.159,0,0-.431.431-.502,1.433-.071,1.005.071,21.223.071,21.223,0,0-.143,1.219,1.361,1.29,1.507.071,42.592,0,42.592,0,0,0,.788-.645.788-1.433s.285-22.014.285-22.014c0,0-.645-1.076-1.433-.934l.003.003Z"/>
+      <path class="cls-1" d="M22.181,39.211s2.331-9.19,1.096-9.171c-1.235.019-10.59.178-10.59.178,0,0-.788.214-.788.859v.645l10.286,7.485-.003.003Z"/>
+      <path class="cls-1" d="M43.391,40.527c.396.853,13.608-9.735,13.608-9.735,0,0-.36-1.147-1.433-.934-1.073.214-6.791-.447-8.461.214-1.669.661-4.11,9.595-3.715,10.451v.003Z"/>
+      <path class="cls-5" d="M17.786,33.117l.444,3.135,6.143,4.506,19.508-.211s5.277-4.402,5.783-4.477c.47-9.32,5.355-18.442,5.355-18.442l-.681-.541-3.452.58-1.997-1.89-3.151,2.101-2.944-2.311-3.679,2.101-2.208-2.418-3.679,2.208-1.472-2.837-3.572,2.626-3.047-2.522s-7.355,3.362-7.355,18.39l.003.003Z"/>
+      <path class="cls-3" d="M17.597,30.535c.276,0,.5-.224.5-.5s-.224-.5-.5-.5v1ZM12.858,30.035l-.003.5h.003v-.5ZM17.597,29.535h-4.739v1h4.739v-1ZM12.861,29.535c-.898-.005-1.624.724-1.624,1.618h1c0-.344.278-.62.619-.618l.005-1ZM11.237,31.153v22.056h1v-22.056h-1ZM11.237,53.209c0,.895.726,1.622,1.622,1.622v-1c-.343,0-.622-.279-.622-.622h-1ZM12.858,54.831h42.893v-1H12.858v1ZM55.751,54.831c.895,0,1.622-.726,1.622-1.622h-1c0,.343-.279.622-.622.622v1ZM57.373,53.209v-22.056h-1v22.056h1ZM57.373,31.153c0-.895-.726-1.622-1.622-1.622v1c.343,0,.622.279.622.622h1ZM55.751,29.531h-5.024v1h5.024v-1Z"/>
+      <path class="cls-3" d="M17.116,54.049c-.125.246-.026.547.22.672.246.125.547.026.672-.22l-.892-.452ZM18.008,54.501l6.739-13.3-.892-.452-6.739,13.3.892.452Z"/>
+      <path class="cls-3" d="M43.969,40.602c-.118-.25-.416-.356-.666-.238-.25.118-.356.417-.238.666l.904-.428ZM43.065,41.03l6.367,13.43.904-.428-6.367-13.43-.904.428Z"/>
+      <path class="cls-3" d="M52.886,23.147c-.261-.091-.546.046-.637.307-.091.261.046.546.307.637l.33-.944ZM53.11,23.755l.167-.471h-.002s-.165.471-.165.471ZM55.495,27.049l-.5.004h0s.5-.004.5-.004ZM52.555,24.091l.389.136.33-.944-.389-.136-.33.944ZM52.943,24.227c1.227.434,2.042,1.565,2.053,2.827l1-.009c-.015-1.694-1.107-3.19-2.719-3.76l-.334.943ZM54.995,27.053l.026,2.739,1-.01-.026-2.739-1,.009Z"/>
+      <path class="cls-3" d="M12.186,29.717c0,.276.224.5.5.5s.5-.224.5-.5h-1ZM15.092,23.538l.163.472h0s-.164-.472-.164-.472ZM13.186,29.717v-2.846h-1v2.846h1ZM13.186,26.871c0-1.279.823-2.429,2.069-2.86l-.327-.945c-1.639.567-2.742,2.089-2.742,3.805h1ZM15.256,24.01l4.516-1.569-.328-.945-4.516,1.569.328.945Z"/>
+      <path class="cls-3" d="M12.187,31.532c-.226-.159-.537-.106-.697.12-.159.225-.106.538.12.697l.577-.816ZM24.372,40.761l-.289.408c.085.06.185.092.289.092v-.5ZM43.592,40.761v.5c.105,0,.208-.033.293-.095l-.293-.405ZM11.61,32.349l12.474,8.82.577-.817-12.474-8.82-.577.816ZM24.372,41.261h19.22v-1h-19.22v1ZM43.885,41.166l13.281-9.608-.586-.81-13.281,9.608.586.81Z"/>
+      <path class="cls-3" d="M17.459,36.334c.067.268.338.431.606.364.268-.067.431-.338.364-.606l-.97.243ZM25.196,14.309l.395-.307c-.089-.115-.224-.185-.369-.193-.145-.007-.287.049-.387.154l.361.345ZM27.64,17.46l-.395.306c.081.105.201.173.332.19.132.017.264-.02.369-.101l-.306-.395ZM31.501,14.465l.433-.251c-.072-.125-.195-.212-.337-.24-.142-.028-.288.007-.402.096l.306.395ZM33.235,17.46l-.433.251c.07.121.188.207.324.237.136.03.279.002.394-.078l-.286-.41ZM36.859,14.938l.366-.34c-.169-.182-.447-.212-.652-.07l.286.41ZM39.358,17.628l-.366.34c.171.184.452.213.657.067l-.29-.407ZM42.85,15.139l.356-.351c-.172-.175-.446-.199-.646-.056l.29.407ZM45.547,17.875l-.356.351c.164.167.423.197.621.073l-.265-.424ZM49.236,15.564l.36-.347c-.164-.17-.425-.202-.625-.076l.265.424ZM51.599,18.008l-.36.348c.14.145.353.191.54.119l-.181-.466ZM55.46,16.825l.436.245c.094-.168.084-.375-.027-.532-.111-.157-.302-.238-.492-.206l.082.493ZM17.944,36.213q.485-.121.485-.121s0,0,0,0c0,0,0,0,0,0,0,0,0-.002,0-.004,0-.004-.003-.011-.005-.02-.004-.019-.011-.049-.02-.089-.017-.08-.041-.201-.069-.36-.056-.318-.125-.788-.178-1.387-.106-1.198-.144-2.909.126-4.945.54-4.067,2.314-9.44,7.275-14.631l-.723-.691c-5.128,5.367-6.979,10.946-7.543,15.191-.282,2.12-.242,3.906-.131,5.165.056.63.129,1.128.189,1.472.03.172.057.305.076.397.01.046.018.081.024.106.003.012.005.022.007.029,0,.003.002.006.002.008,0,0,0,.002,0,.003,0,0,0,0,0,0t.485-.121ZM24.801,14.616l2.444,3.151.79-.613-2.444-3.151-.79.613ZM27.946,17.855l3.861-2.995-.613-.79-3.861,2.995.613.79ZM31.068,14.715l1.734,2.995.865-.501-1.734-2.995-.865.501ZM33.521,17.87l3.624-2.522-.571-.821-3.624,2.522.571.821ZM36.493,15.278l2.499,2.69.733-.681-2.499-2.691-.733.681ZM39.649,18.036l3.491-2.49-.581-.814-3.491,2.49.581.814ZM42.494,15.49l2.697,2.736.712-.702-2.697-2.736-.712.702ZM45.812,18.299l3.689-2.311-.531-.847-3.689,2.311.531.847ZM48.876,15.911l2.363,2.444.719-.695-2.363-2.444-.719.695ZM51.599,18.008q.181.466.181.466s0,0,0,0h0s0,0,.001,0c.001,0,.003,0,.005-.002.004-.002.011-.004.02-.008.018-.007.044-.017.078-.03.068-.026.168-.063.292-.109.248-.091.594-.215.983-.347.787-.266,1.719-.55,2.384-.661l-.165-.986c-.751.126-1.75.433-2.539.7-.399.135-.753.262-1.008.356-.127.047-.23.085-.301.112-.035.014-.063.024-.082.031-.009.004-.017.006-.022.008-.003,0-.004.002-.006.002,0,0-.001,0-.001,0,0,0,0,0,0,0h0s0,0,.181.466ZM55.024,16.58c-2.711,4.824-4.173,9.687-4.959,13.339-.393,1.827-.617,3.355-.743,4.427-.063.536-.102.959-.124,1.249-.011.145-.019.257-.024.333-.002.038-.004.067-.005.087,0,.01,0,.018-.001.023,0,.003,0,.005,0,.006,0,0,0,.001,0,.002h0s0,0,.5.023q.5.022.5.022h0s0-.003,0-.005c0-.004,0-.01,0-.019,0-.017.002-.044.005-.079.004-.071.011-.177.022-.316.022-.278.059-.688.121-1.211.123-1.046.342-2.542.728-4.334.771-3.586,2.205-8.347,4.853-13.059l-.872-.49Z"/>
+      <path class="cls-4" d="M25.669,23.843h18.124"/>
+      <path class="cls-4" d="M24.723,32h18.127"/>
+      <path class="cls-4" d="M24.723,36h18.127"/>
+      <path class="cls-4" d="M24.801,28h18.127"/>
+    </g>
+  </g>
+</svg>
\ No newline at end of file
diff --git a/assets/images/simple-illustrations/simple-illustration__filters.svg b/assets/images/simple-illustrations/simple-illustration__filters.svg
new file mode 100644
index 000000000000..b7b61e0b95a3
--- /dev/null
+++ b/assets/images/simple-illustrations/simple-illustration__filters.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="48" height="48" fill="none" viewBox="0 0 48 48"><path fill="#003C73" stroke="#002140" stroke-miterlimit="10" stroke-width=".857" d="M36.3255 39.8415H12.0675C10.4489 39.8415 8.94214 38.5084 8.94214 36.2453V11.743C8.94214 9.48293 10.4489 8.47058 12.0675 8.47058H36.3255C37.9441 8.47058 39.4508 9.48293 39.4508 11.743V36.2453C39.4508 38.5084 37.9411 39.8415 36.3255 39.8415Z"/><path fill="#5AB0FF" stroke="#002140" stroke-miterlimit="10" stroke-width=".857" d="M35.3335 38.5555H12.8647C10.8783 38.5555 10.3015 37.4784 10.3015 36.157V12.1756C10.3015 10.8543 10.8754 9.77719 12.8647 9.77719H35.3335C37.32 9.77719 38.0351 10.8543 38.0351 12.1756V36.157C38.0351 37.4784 37.1905 38.5555 35.3335 38.5555Z"/><path fill="#0676DE" d="M13.7273 26.7605V12.0786H15.8344V26.7605"/><path stroke="#002140" stroke-miterlimit="10" stroke-width=".857" d="M13.7273 26.7605V12.0786H15.8344V26.7605"/><path fill="#0676DE" d="M15.8344 28.1849V36.678H13.7273V28.1849"/><path stroke="#002140" stroke-miterlimit="10" stroke-width=".857" d="M15.8344 28.1849V36.678H13.7273V28.1849"/><path fill="#002140" stroke="#002140" stroke-miterlimit="10" stroke-width=".857" d="M13.7272 28.6057H12.4412V26.9871H13.7272H15.8343H17.1203V28.6057H15.8343H13.7272Z"/><path fill="#0676DE" d="M19.4216 16.0632V12.0786H21.5258V16.0632"/><path stroke="#002140" stroke-miterlimit="10" stroke-width=".857" d="M19.4216 16.0632V12.0786H21.5258V16.0632"/><path fill="#0676DE" d="M21.5258 16.9726V36.678H19.4216V16.9726"/><path stroke="#002140" stroke-miterlimit="10" stroke-width=".857" d="M21.5258 16.9726V36.678H19.4216V16.9726"/><path fill="#002140" stroke="#002140" stroke-miterlimit="10" stroke-width=".857" d="M19.4215 17.5052H18.1326V15.9984H19.4215H21.5257H22.8147V17.5052H21.5257H19.4215Z"/><path fill="#0164BF" stroke="#002140" stroke-miterlimit="10" stroke-width=".857" d="M28.4324 14.0091C28.4324 14.2858 28.3765 14.5506 28.2735 14.7919C28.1852 15.0009 28.0646 15.1863 27.9145 15.3511C27.732 15.5512 27.5113 15.716 27.2612 15.8278C27.011 15.9426 26.7315 16.0073 26.4342 16.0073C26.1547 16.0073 25.8898 15.9514 25.6514 15.8455C25.4278 15.7513 25.2247 15.613 25.0511 15.4452C24.8627 15.2657 24.7097 15.048 24.6038 14.8037C24.4978 14.5624 24.439 14.2946 24.439 14.0121C24.439 13.7501 24.489 13.4971 24.5832 13.2675C24.6862 13.0115 24.8421 12.779 25.0364 12.5877C25.2159 12.4141 25.4278 12.2699 25.6632 12.1757C25.9016 12.0757 26.1576 12.0197 26.4313 12.0197C26.705 12.0197 26.9463 12.0698 27.1758 12.1639C27.4142 12.2581 27.632 12.3994 27.8144 12.573C28.0028 12.7525 28.1529 12.9673 28.2588 13.2087C28.3677 13.4559 28.4295 13.7295 28.4295 14.015L28.4324 14.0091Z"/><path fill="#0164BF" stroke="#002140" stroke-miterlimit="10" stroke-width=".857" d="M28.4327 19.1413C28.4327 19.418 28.3768 19.6799 28.2738 19.9212C28.1884 20.1301 28.0648 20.3185 27.9147 20.4803C27.7323 20.6805 27.5115 20.8453 27.2614 20.9571C27.0113 21.0719 26.7317 21.1366 26.4374 21.1366C26.1431 21.1366 25.893 21.0807 25.6546 20.9747C25.4309 20.8806 25.2249 20.7423 25.0513 20.5745C24.863 20.3921 24.7129 20.1772 24.604 19.933C24.4981 19.6917 24.4421 19.4239 24.4421 19.1443C24.4421 18.8824 24.4922 18.6293 24.5863 18.3997C24.6893 18.1408 24.8453 17.9083 25.0425 17.7199C25.222 17.5434 25.4339 17.4021 25.6664 17.305C25.9047 17.2049 26.1608 17.149 26.4345 17.149C26.7081 17.149 26.9495 17.199 27.179 17.2932C27.4174 17.3874 27.6322 17.5286 27.8147 17.7023C28.003 17.8818 28.1531 18.0966 28.262 18.3379C28.3709 18.5851 28.4327 18.8588 28.4327 19.1443V19.1413Z"/><path fill="#0164BF" stroke="#002140" stroke-miterlimit="10" stroke-width=".857" d="M28.4324 24.2709C28.4324 24.5475 28.3765 24.8123 28.2735 25.0537C28.1852 25.2626 28.0646 25.448 27.9145 25.6128C27.732 25.81 27.5113 25.9748 27.2612 26.0866C27.011 26.2014 26.7315 26.2661 26.4342 26.2661C26.1547 26.2661 25.8898 26.2102 25.6514 26.1043C25.4278 26.0101 25.2218 25.8718 25.0481 25.704C24.8598 25.5216 24.7097 25.3038 24.6008 25.0595C24.4949 24.8182 24.439 24.5504 24.439 24.2709C24.439 24.006 24.489 23.7559 24.5832 23.5263C24.6862 23.2703 24.8421 23.0378 25.0364 22.8465C25.2159 22.6729 25.4278 22.5287 25.6603 22.4316C25.8986 22.3315 26.1576 22.2785 26.4313 22.2785C26.705 22.2785 26.9463 22.3286 27.1758 22.4227C27.4054 22.5169 27.632 22.6582 27.8144 22.8318C28.0028 23.0113 28.1529 23.2261 28.2588 23.4675C28.3677 23.7147 28.4295 23.9883 28.4295 24.2738L28.4324 24.2709Z"/><path fill="#0164BF" stroke="#002140" stroke-miterlimit="10" stroke-width=".857" d="M28.4324 29.4032C28.4324 29.6798 28.3765 29.9417 28.2735 30.183C28.1882 30.392 28.0646 30.5803 27.9145 30.7422C27.732 30.9423 27.5113 31.1042 27.2612 31.2189C27.011 31.3337 26.7315 31.3984 26.4342 31.3984C26.1547 31.3984 25.8898 31.3425 25.6514 31.2395C25.4278 31.1454 25.2218 31.007 25.0481 30.8364C24.8598 30.6539 24.7097 30.4391 24.6008 30.1948C24.4949 29.9535 24.439 29.6857 24.439 29.4061C24.439 29.1413 24.489 28.8911 24.5832 28.6586C24.6862 28.4026 24.8421 28.1701 25.0364 27.9788C25.2159 27.8052 25.4278 27.661 25.6632 27.5668C25.9016 27.4668 26.1576 27.4109 26.4313 27.4109C26.705 27.4109 26.9463 27.4609 27.1758 27.5551C27.4142 27.6492 27.632 27.7905 27.8144 27.9641C28.0028 28.1436 28.1529 28.3585 28.2588 28.5968C28.3677 28.844 28.4295 29.1177 28.4295 29.4061L28.4324 29.4032Z"/><path fill="#0164BF" stroke="#002140" stroke-miterlimit="10" stroke-width=".857" d="M28.4327 34.5326C28.4327 34.8092 28.3768 35.0711 28.2738 35.3125C28.1884 35.5214 28.0648 35.7098 27.9147 35.8716C27.7323 36.0717 27.5115 36.2365 27.2614 36.3484C27.0113 36.4631 26.7317 36.5279 26.4374 36.5279C26.1431 36.5279 25.893 36.472 25.6546 36.366C25.4309 36.2718 25.2249 36.1335 25.0513 35.9658C24.863 35.7833 24.7129 35.5685 24.604 35.3242C24.4981 35.0829 24.4421 34.8151 24.4421 34.5355C24.4421 34.2736 24.4922 34.0205 24.5863 33.791C24.6893 33.535 24.8453 33.3025 25.0395 33.1112C25.2191 32.9376 25.4309 32.7934 25.6634 32.6963C25.9018 32.5962 26.1608 32.5403 26.4345 32.5403C26.7081 32.5403 26.9495 32.5903 27.179 32.6845C27.4174 32.7787 27.6351 32.9199 27.8176 33.0935C28.0059 33.2731 28.156 33.4879 28.262 33.7292C28.3709 33.9764 28.4327 34.2501 28.4327 34.5355V34.5326Z"/><path fill="#0164BF" stroke="#002140" stroke-miterlimit="10" stroke-width=".857" d="M34.951 14.0091C34.951 14.2858 34.8951 14.5506 34.7921 14.7919C34.7038 15.0009 34.5831 15.1863 34.433 15.3511C34.2506 15.5512 34.0299 15.716 33.7797 15.8278C33.5296 15.9426 33.25 16.0073 32.9528 16.0073C32.6732 16.0073 32.4084 15.9514 32.17 15.8455C31.9463 15.7513 31.7433 15.613 31.5696 15.4452C31.3813 15.2657 31.2283 15.048 31.1223 14.8037C31.0164 14.5624 30.9575 14.2946 30.9575 14.0121C30.9575 13.7501 31.0075 13.4971 31.1017 13.2675C31.2047 13.0115 31.3607 12.779 31.5549 12.5877C31.7344 12.4141 31.9463 12.2699 32.1818 12.1757C32.4201 12.0757 32.6762 12.0197 32.9498 12.0197C33.2235 12.0197 33.4648 12.0698 33.6944 12.1639C33.9328 12.2581 34.1505 12.3994 34.333 12.573C34.5213 12.7525 34.6714 12.9673 34.7774 13.2087C34.8862 13.4559 34.948 13.7295 34.948 14.015L34.951 14.0091Z"/><path fill="#0164BF" stroke="#002140" stroke-miterlimit="10" stroke-width=".857" d="M34.951 19.1413C34.951 19.418 34.8951 19.6799 34.7921 19.9212C34.7067 20.1301 34.5831 20.3185 34.433 20.4803C34.2506 20.6805 34.0299 20.8453 33.7797 20.9571C33.5296 21.0719 33.25 21.1366 32.9557 21.1366C32.6614 21.1366 32.4113 21.0807 32.1729 20.9747C31.9493 20.8806 31.7433 20.7423 31.5696 20.5745C31.3813 20.3921 31.2312 20.1772 31.1223 19.933C31.0164 19.6917 30.9604 19.4239 30.9604 19.1443C30.9604 18.8824 31.0105 18.6293 31.1046 18.3997C31.2076 18.1408 31.3636 17.9083 31.5608 17.7199C31.7403 17.5434 31.9522 17.4021 32.1847 17.305C32.4231 17.2049 32.6791 17.149 32.9528 17.149C33.2265 17.149 33.4678 17.199 33.6973 17.2932C33.9357 17.3874 34.1505 17.5286 34.333 17.7023C34.5213 17.8818 34.6714 18.0966 34.7803 18.3379C34.8892 18.5851 34.951 18.8588 34.951 19.1443V19.1413Z"/><path fill="#0164BF" stroke="#002140" stroke-miterlimit="10" stroke-width=".857" d="M34.951 24.2709C34.951 24.5475 34.8951 24.8123 34.7921 25.0537C34.7038 25.2626 34.5831 25.448 34.433 25.6128C34.2506 25.81 34.0299 25.9748 33.7797 26.0866C33.5296 26.2014 33.25 26.2661 32.9528 26.2661C32.6732 26.2661 32.4084 26.2102 32.17 26.1043C31.9463 26.0101 31.7403 25.8718 31.5667 25.704C31.3783 25.5216 31.2283 25.3038 31.1194 25.0595C31.0134 24.8182 30.9575 24.5504 30.9575 24.2709C30.9575 24.006 31.0075 23.7559 31.1017 23.5263C31.2047 23.2703 31.3607 23.0378 31.5549 22.8465C31.7344 22.6729 31.9463 22.5287 32.1788 22.4316C32.4172 22.3315 32.6762 22.2785 32.9498 22.2785C33.2235 22.2785 33.4648 22.3286 33.6944 22.4227C33.9239 22.5169 34.1505 22.6582 34.333 22.8318C34.5213 23.0113 34.6714 23.2261 34.7774 23.4675C34.8862 23.7147 34.948 23.9883 34.948 24.2738L34.951 24.2709Z"/><path fill="#0164BF" stroke="#002140" stroke-miterlimit="10" stroke-width=".857" d="M34.951 29.4032C34.951 29.6798 34.8951 29.9417 34.7921 30.183C34.7067 30.392 34.5831 30.5803 34.433 30.7422C34.2506 30.9423 34.0299 31.1042 33.7797 31.2189C33.5296 31.3337 33.25 31.3984 32.9528 31.3984C32.6732 31.3984 32.4084 31.3425 32.17 31.2395C31.9463 31.1454 31.7403 31.007 31.5667 30.8364C31.3783 30.6539 31.2283 30.4391 31.1194 30.1948C31.0134 29.9535 30.9575 29.6857 30.9575 29.4061C30.9575 29.1413 31.0075 28.8911 31.1017 28.6586C31.2047 28.4026 31.3607 28.1701 31.5549 27.9788C31.7344 27.8052 31.9463 27.661 32.1818 27.5668C32.4201 27.4668 32.6762 27.4109 32.9498 27.4109C33.2235 27.4109 33.4648 27.4609 33.6944 27.5551C33.9328 27.6492 34.1505 27.7905 34.333 27.9641C34.5213 28.1436 34.6714 28.3585 34.7774 28.5968C34.8862 28.844 34.948 29.1177 34.948 29.4061L34.951 29.4032Z"/><path fill="#0164BF" stroke="#002140" stroke-miterlimit="10" stroke-width=".857" d="M34.951 34.5326C34.951 34.8092 34.8951 35.0711 34.7921 35.3125C34.7067 35.5214 34.5831 35.7098 34.433 35.8716C34.2506 36.0717 34.0299 36.2365 33.7797 36.3484C33.5296 36.4631 33.25 36.5279 32.9557 36.5279C32.6614 36.5279 32.4113 36.472 32.1729 36.366C31.9493 36.2718 31.7433 36.1335 31.5696 35.9658C31.3813 35.7833 31.2312 35.5685 31.1223 35.3242C31.0164 35.0829 30.9604 34.8151 30.9604 34.5355C30.9604 34.2736 31.0105 34.0205 31.1046 33.791C31.2076 33.535 31.3636 33.3025 31.5579 33.1112C31.7374 32.9376 31.9493 32.7934 32.1817 32.6963C32.4201 32.5962 32.6791 32.5403 32.9528 32.5403C33.2265 32.5403 33.4678 32.5903 33.6973 32.6845C33.9357 32.7787 34.1535 32.9199 34.3359 33.0935C34.5243 33.2731 34.6743 33.4879 34.7803 33.7292C34.8892 33.9764 34.951 34.2501 34.951 34.5355V34.5326Z"/></svg>
\ No newline at end of file
diff --git a/assets/images/simple-illustrations/simple-illustration__lightbulb.svg b/assets/images/simple-illustrations/simple-illustration__lightbulb.svg
index 1dc359764147..62a9cb0c3b76 100644
--- a/assets/images/simple-illustrations/simple-illustration__lightbulb.svg
+++ b/assets/images/simple-illustrations/simple-illustration__lightbulb.svg
@@ -1,33 +1 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 28.1.0, 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 68 68" style="enable-background:new 0 0 68 68;" xml:space="preserve">
-<style type="text/css">
-	.st0{fill:#FFED8F;}
-	.st1{fill:#CCF6FF;}
-	.st2{fill:none;stroke:#002140;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;}
-	.st3{fill:none;stroke:#FED607;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;}
-</style>
-<path class="st0" d="M29.419,48.482c0,0,0.995,1.566,5.269,1.424c4.269-0.142,5.981-1.424,5.981-1.424s2.137-4.556,3.132-6.689
-	c0.995-2.137,3.703-7.401,3.132-11.246c-0.571-3.844-5.41-9.68-13.241-9.68c-7.83,0-10.675,8.826-10.675,11.675
-	c0,2.849,2.137,8.543,2.137,8.543l4.269,7.401L29.419,48.482z"/>
-<path class="st1" d="M40.665,48.482c0,0-2.231,1.236-4.981,1.137c-2.75-0.094-6.453-0.571-6.453-0.571l1.995,4.557
-	c0,0-0.094,1.613-0.094,1.896c0,0.283,1.137,2.467,3.415,2.467c2.278,0,4.368-1.896,4.368-2.184c0-0.288-0.377-2.184-0.377-2.184
-	s1.995-3.703,2.137-5.123L40.665,48.482z"/>
-<path class="st2" d="M22.718,32.796c0,7.011,5.621,11.117,6.406,16.416"/>
-<path class="st2" d="M46.963,32.916c0,6.565-5.659,10.452-6.234,15.236"/>
-<path class="st2" d="M46.955,32.796c0-6.693-5.428-12.121-12.121-12.121s-12.121,5.11-12.121,12.121"/>
-<path class="st2" d="M40.746,48.006c-0.472,3.801-2.943,6.706-5.925,6.706c-2.982,0-5.325-2.75-5.882-6.402"/>
-<path class="st2" d="M28.938,48.306c0,0,5.565,2.961,11.791-0.154"/>
-<path class="st2" d="M38.45,53.373c0.322,0.45,0.506,0.965,0.506,1.515c0,1.733-1.836,3.141-4.097,3.141s-4.097-1.407-4.097-3.141
-	c0-0.433,0.116-0.845,0.322-1.223"/>
-<path class="st2" d="M35.473,49.152c0.511-1.39,0.425-2.986-0.227-4.316c-0.365-0.747-1.03-1.472-1.862-1.45
-	c-0.395,0.009-0.785,0.202-1.008,0.532c-0.223,0.33-0.245,0.785-0.039,1.116c0.245,0.395,0.764,0.558,1.223,0.489
-	c0.459-0.069,0.867-0.335,1.218-0.639c0.455-0.39,0.854-0.867,1.098-1.416c0.232-0.519,0.33-1.09,0.352-1.656
-	c0.026-0.648-0.047-1.313-0.317-1.905c-0.27-0.592-0.755-1.103-1.369-1.313"/>
-<path class="st3" d="M12.467,26.798h6.264"/>
-<path class="st3" d="M49.765,26.798h6.264"/>
-<path class="st3" d="M34.246,16.976V10"/>
-<path class="st3" d="M24.283,19.68l-5.342-5.338"/>
-<path class="st3" d="M43.856,18.684l5.338-5.337"/>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" id="Layer_1" x="0" y="0" version="1.1" viewBox="0 0 68 68" style="enable-background:new 0 0 68 68" xml:space="preserve"><style type="text/css">.st0{fill:#ffed8f}.st1{fill:#ccf6ff}.st2,.st3{fill:none;stroke:#002140;stroke-width:1;stroke-linecap:round;stroke-linejoin:round}.st3{stroke:#fed607}</style><path d="M29.419,48.482c0,0,0.995,1.566,5.269,1.424c4.269-0.142,5.981-1.424,5.981-1.424s2.137-4.556,3.132-6.689	c0.995-2.137,3.703-7.401,3.132-11.246c-0.571-3.844-5.41-9.68-13.241-9.68c-7.83,0-10.675,8.826-10.675,11.675	c0,2.849,2.137,8.543,2.137,8.543l4.269,7.401L29.419,48.482z" class="st0"/><path d="M40.665,48.482c0,0-2.231,1.236-4.981,1.137c-2.75-0.094-6.453-0.571-6.453-0.571l1.995,4.557	c0,0-0.094,1.613-0.094,1.896c0,0.283,1.137,2.467,3.415,2.467c2.278,0,4.368-1.896,4.368-2.184c0-0.288-0.377-2.184-0.377-2.184	s1.995-3.703,2.137-5.123L40.665,48.482z" class="st1"/><path d="M22.718,32.796c0,7.011,5.621,11.117,6.406,16.416" class="st2"/><path d="M46.963,32.916c0,6.565-5.659,10.452-6.234,15.236" class="st2"/><path d="M46.955,32.796c0-6.693-5.428-12.121-12.121-12.121s-12.121,5.11-12.121,12.121" class="st2"/><path d="M40.746,48.006c-0.472,3.801-2.943,6.706-5.925,6.706c-2.982,0-5.325-2.75-5.882-6.402" class="st2"/><path d="M28.938,48.306c0,0,5.565,2.961,11.791-0.154" class="st2"/><path d="M38.45,53.373c0.322,0.45,0.506,0.965,0.506,1.515c0,1.733-1.836,3.141-4.097,3.141s-4.097-1.407-4.097-3.141	c0-0.433,0.116-0.845,0.322-1.223" class="st2"/><path d="M35.473,49.152c0.511-1.39,0.425-2.986-0.227-4.316c-0.365-0.747-1.03-1.472-1.862-1.45	c-0.395,0.009-0.785,0.202-1.008,0.532c-0.223,0.33-0.245,0.785-0.039,1.116c0.245,0.395,0.764,0.558,1.223,0.489	c0.459-0.069,0.867-0.335,1.218-0.639c0.455-0.39,0.854-0.867,1.098-1.416c0.232-0.519,0.33-1.09,0.352-1.656	c0.026-0.648-0.047-1.313-0.317-1.905c-0.27-0.592-0.755-1.103-1.369-1.313" class="st2"/><path d="M12.467,26.798h6.264" class="st3"/><path d="M49.765,26.798h6.264" class="st3"/><path d="M34.246,16.976V10" class="st3"/><path d="M24.283,19.68l-5.342-5.338" class="st3"/><path d="M43.856,18.684l5.338-5.337" class="st3"/></svg>
\ No newline at end of file
diff --git a/assets/images/simple-illustrations/simple-illustration__lockclosed_orange.svg b/assets/images/simple-illustrations/simple-illustration__lockclosed_orange.svg
new file mode 100644
index 000000000000..605aa66df086
--- /dev/null
+++ b/assets/images/simple-illustrations/simple-illustration__lockclosed_orange.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" id="Layer_1" data-name="Layer 1" version="1.1" viewBox="0 0 68 68"><defs><style>.cls-1{fill:#ff7101}.cls-1,.cls-2,.cls-3,.cls-4,.cls-5{stroke-width:0}.cls-6{fill:none;stroke:#002140;stroke-linecap:round;stroke-linejoin:round}.cls-2{fill:#002140}.cls-3{fill:#e4bc07}.cls-4{fill:#d18000}.cls-5{fill:#bf3013}</style></defs><path d="M53.904,31.437H14v13.684s.385,16.626,21.232,16.498c13.684,0,18.931-12.277,19.058-17.393.127-5.115-.385-12.79-.385-12.79h0Z" class="cls-1"/><path d="M17.966,31.31h-3.966v14.197s1.534,15.477,17.905,15.858c0,0-13.303-3.327-14.197-18.033-.513-8.184.254-12.023.254-12.023h.004Z" class="cls-5"/><path d="M35.104,34.637s3.454,2.174,3.454,4.475-1.534,5.115-2.429,5.374l1.92,11.769,2.941-.513-1.792-12.023s3.068-2.047,2.559-4.475c-.509-2.428-2.301-5.501-6.649-4.603l-.004-.004Z" class="cls-4"/><path d="M36.126,44.486s2.517-2.259,2.517-4.734-2.386-4.776-4.263-4.776-3.099,3.161-3.068,3.835c.027.678,1.11,4.009,2.471,4.946l-2.301,12.193s5.285,1.11,6.565.297l-1.92-11.769v.008Z" class="cls-2"/><path d="M25.255,31.183l-.285-2.429s.428-.64-1.565-.64-5.408.127-5.408.127c0,0-1.137.127-1.137,1.021v1.92h8.396Z" class="cls-4"/><path d="M51.772,31.183l-.285-2.429s.428-.64-1.565-.64-5.408.127-5.408.127c0,0-1.137.127-1.137,1.021v1.92h8.399-.004Z" class="cls-4"/><path d="M50.92,27.644l-.316-7.216s-3.011-13.842-16.356-13.418c-13.341.428-16.309,13.222-16.309,13.222l-.782,7.586,7.212-.17.035-6.225s2.228-7.49,9.895-7.582c7.667-.093,9.205,7.667,9.205,7.667l.852,6.48,6.565-.339v-.004Z" class="cls-3"/><path d="M54.22,31.341v11.923c0,10.123-8.207,18.329-18.329,18.329s-18.329-8.207-18.329-18.329v-11.923h36.659Z" class="cls-6"/><path d="M36.789,61.593c-16.383,0-22.755-8.207-22.755-18.333v-11.923h4.645" class="cls-6"/><path d="M41.684,39.49c0-2.856-2.317-5.173-5.173-5.173s-5.173,2.317-5.173,5.173c0,1.885,1.01,3.527,2.513,4.433l-2.575,11.819s4.387,2.586,9.672,0l-2.139-11.626c1.7-.848,2.872-2.598,2.872-4.629l.004.004Z" class="cls-6"/><path d="M37.915,56.192l-2.139-11.626c1.7-.848,2.872-2.598,2.872-4.63,0-2.502-1.773-4.587-4.132-5.069" class="cls-6"/><path d="M16.69,31.09v-1.893c0-.632.59-1.141,1.318-1.141h5.929c.729,0,1.318.513,1.318,1.141v1.893" class="cls-6"/><path d="M43.207,31.09v-1.893c0-.632.59-1.141,1.318-1.141h5.929c.728,0,1.318.513,1.318,1.141v1.893" class="cls-6"/><path d="M24.365,28.056v-4.684c0-5.458,4.425-9.88,9.88-9.88s9.88,4.425,9.88,9.88v4.641" class="cls-6"/><path d="M50.92,28.01v-4.329c0-9.209-7.463-16.672-16.672-16.672s-16.668,7.463-16.668,16.672v4.375" class="cls-6"/></svg>
\ No newline at end of file
diff --git a/assets/images/simple-illustrations/simple-illustration__pencil.svg b/assets/images/simple-illustrations/simple-illustration__pencil.svg
index 8d9f06991612..d3eaf8771021 100644
--- a/assets/images/simple-illustrations/simple-illustration__pencil.svg
+++ b/assets/images/simple-illustrations/simple-illustration__pencil.svg
@@ -1,20 +1 @@
-<?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 68 68" style="enable-background:new 0 0 68 68;" xml:space="preserve"><style type="text/css">
-	.st0{fill:#8DC8FF;}
-	.st1{fill:#002140;}
-	.st2{fill:#FFC68C;}
-	.st3{fill:#FED607;}
-	.st4{fill:#F9B5FE;}
-	.st5{fill:none;stroke:#002140;stroke-linecap:round;stroke-linejoin:round;}
-	.st6{fill:none;stroke:#003C73;stroke-linecap:round;stroke-linejoin:round;}
-</style><path class="st0" d="M52.266,26.492c0.472,0.849,0.244,1.659-0.657,2.611l0.02,0.02l-2.422,2.41c-0.778,0.617-1.423,0.523-1.982,0
-	c1.046-1.14,0.672-2.115-0.531-3.255l-0.393-0.393l-3.071-3.071l-3.071-3.071l-1.046-1.05c-1.03-1.089-1.978-0.955-2.811-0.09
-	c-0.405-0.704-0.491-1.368,0-1.946l2.811-2.878c0.743-0.684,1.561-0.684,2.265-0.252c0.118,0.071,0.232,0.157,0.342,0.252
-	l9.892,9.892c0.287,0.283,0.503,0.554,0.657,0.818L52.266,26.492z"/><path class="st1" d="M24.398,47.271l-2.347,0.157c-0.495,0.028-0.849,0-1.097-0.126l-0.212-0.169h-0.004
-	c-0.212-0.252-0.275-0.68-0.244-1.368l0.142-2.316c1.258,1.007,2.508,2.28,3.763,3.818V47.271z"/><path class="st2" d="M28.389,42.961l3.424-0.59l0.059,4.227c-0.393,0.157-0.841,0.236-1.317,0.259l-6.157,0.413
-	c-1.254-1.537-2.504-2.811-3.763-3.818l0.377-6.137c0.055-0.818,0.153-1.238,0.397-1.655l4.262,0.57l-0.605,3.255l3.676-0.185
-	l-0.358,3.653v0.008H28.389z"/><path class="st3" d="M21.811,35.093L36.3,20.605c0.833-0.869,1.781-0.999,2.811,0.09l1.046,1.05L25.672,36.229l-4.262-0.57
-	C21.517,35.479,21.646,35.306,21.811,35.093z"/><path class="st3" d="M43.227,24.816l3.071,3.071L31.814,42.371l-3.424,0.59l-0.004-0.008l0.358-3.653L43.227,24.816z"/><path class="st3" d="M40.156,21.746l3.071,3.071L28.743,39.301l-3.672,0.185l0.601-3.255L40.156,21.746z"/><path class="st3" d="M46.691,28.28c1.203,1.14,1.581,2.115,0.531,3.255L32.734,46.023c-0.248,0.263-0.539,0.452-0.865,0.578
-	l-0.059-4.227l14.484-14.484l0.393,0.393L46.691,28.28z"/><path class="st4" d="M41.375,15.534l4.545-4.549c0.605-0.547,2.048-0.889,3.063-0.012l7.875,7.875
-	c0.719,0.786,0.841,2.151-0.012,3.059l-4.584,4.584c-0.149-0.267-0.369-0.539-0.657-0.818l-9.892-9.892
-	c-0.11-0.094-0.224-0.181-0.342-0.252L41.375,15.534z"/><path class="st5" d="M21.811,35.094l14.488-14.484"/><path class="st5" d="M36.3,18.659l2.811-2.878"/><path class="st5" d="M32.737,46.019l14.488-14.488"/><path class="st5" d="M49.207,31.531l2.422-2.41"/><path class="st5" d="M39.111,20.697l1.046,1.05l3.071,3.071l3.071,3.071l0.393,0.393"/><path class="st5" d="M51.61,25.673l-9.892-9.892"/><path class="st5" d="M36.3,20.609c0.833-0.869,1.781-0.999,2.811,0.09"/><path class="st5" d="M47.226,31.533c1.046-1.14,0.672-2.115-0.531-3.256"/><path class="st5" d="M47.226,31.531c0.562,0.523,1.207,0.617,1.982,0"/><path class="st5" d="M36.3,20.61c-0.405-0.704-0.491-1.368,0-1.946"/><path class="st5" d="M41.717,15.781c-0.11-0.094-0.224-0.181-0.342-0.252c-0.704-0.436-1.521-0.436-2.265,0.252"/><path class="st5" d="M51.609,25.674c0.287,0.283,0.503,0.554,0.657,0.818c0.472,0.849,0.244,1.659-0.657,2.611"/><path class="st5" d="M52.262,26.496l0.004-0.004l4.584-4.584"/><path class="st5" d="M41.375,15.533l4.549-4.553"/><path class="st5" d="M48.987,10.973l7.875,7.875"/><path class="st5" d="M45.924,10.981c0.605-0.547,2.048-0.889,3.063-0.012"/><path class="st5" d="M56.862,18.848c0.72,0.786,0.841,2.151-0.012,3.059"/><path class="st5" d="M20.494,45.77l0.146-2.316l0.373-6.137"/><path class="st5" d="M22.051,47.431l2.347-0.161l6.157-0.409"/><path class="st5" d="M21.812,35.094c-0.165,0.208-0.295,0.385-0.401,0.566c-0.244,0.417-0.342,0.837-0.397,1.655"/><path class="st5" d="M30.555,46.861c0.476-0.028,0.924-0.102,1.317-0.26c0.326-0.13,0.617-0.315,0.865-0.574"/><path class="st5" d="M20.742,47.137c0.059,0.071,0.13,0.122,0.212,0.169c0.244,0.13,0.598,0.153,1.097,0.126"/><path class="st5" d="M20.494,45.768c-0.031,0.684,0.031,1.113,0.244,1.36"/><path class="st5" d="M20.636,43.453c1.258,1.007,2.508,2.28,3.763,3.818"/><path class="st5" d="M43.227,24.816L28.743,39.301"/><path class="st5" d="M40.157,21.746L25.672,36.23"/><path class="st5" d="M46.298,27.887L31.814,42.371"/><path class="st5" d="M31.814,42.371l0.059,4.226"/><path class="st5" d="M25.672,36.23l-4.262-0.57"/><path class="st5" d="M25.071,39.486l3.672-0.185"/><path class="st5" d="M28.385,42.953l0.358-3.653"/><path class="st5" d="M31.813,42.371l-3.424,0.59h-0.016"/><path class="st5" d="M25.672,36.23l-0.601,3.255"/><path class="st6" d="M20.738,47.133l0.004,0.004l0.212,0.169l5.559,4.396"/><path class="st6" d="M16.02,50.443l5.776,4.569"/><path class="st6" d="M12.226,53.848l2.984,2.363"/><path class="st6" d="M16.02,50.444c-4.686-3.841-7.25,0.995-3.794,3.409"/><path class="st6" d="M21.796,55.012c5.61,4.502,10.049,0.468,4.718-3.31"/></svg>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" id="Layer_1" x="0" y="0" version="1.1" viewBox="0 0 68 68" style="enable-background:new 0 0 68 68" xml:space="preserve"><style type="text/css">.st0{fill:#8dc8ff}.st1{fill:#002140}.st2{fill:#ffc68c}.st3{fill:#fed607}.st4{fill:#f9b5fe}.st5,.st6{fill:none;stroke:#002140;stroke-linecap:round;stroke-linejoin:round}.st6{stroke:#003c73}</style><path d="M52.266,26.492c0.472,0.849,0.244,1.659-0.657,2.611l0.02,0.02l-2.422,2.41c-0.778,0.617-1.423,0.523-1.982,0	c1.046-1.14,0.672-2.115-0.531-3.255l-0.393-0.393l-3.071-3.071l-3.071-3.071l-1.046-1.05c-1.03-1.089-1.978-0.955-2.811-0.09	c-0.405-0.704-0.491-1.368,0-1.946l2.811-2.878c0.743-0.684,1.561-0.684,2.265-0.252c0.118,0.071,0.232,0.157,0.342,0.252	l9.892,9.892c0.287,0.283,0.503,0.554,0.657,0.818L52.266,26.492z" class="st0"/><path d="M24.398,47.271l-2.347,0.157c-0.495,0.028-0.849,0-1.097-0.126l-0.212-0.169h-0.004	c-0.212-0.252-0.275-0.68-0.244-1.368l0.142-2.316c1.258,1.007,2.508,2.28,3.763,3.818V47.271z" class="st1"/><path d="M28.389,42.961l3.424-0.59l0.059,4.227c-0.393,0.157-0.841,0.236-1.317,0.259l-6.157,0.413	c-1.254-1.537-2.504-2.811-3.763-3.818l0.377-6.137c0.055-0.818,0.153-1.238,0.397-1.655l4.262,0.57l-0.605,3.255l3.676-0.185	l-0.358,3.653v0.008H28.389z" class="st2"/><path d="M21.811,35.093L36.3,20.605c0.833-0.869,1.781-0.999,2.811,0.09l1.046,1.05L25.672,36.229l-4.262-0.57	C21.517,35.479,21.646,35.306,21.811,35.093z" class="st3"/><path d="M43.227,24.816l3.071,3.071L31.814,42.371l-3.424,0.59l-0.004-0.008l0.358-3.653L43.227,24.816z" class="st3"/><path d="M40.156,21.746l3.071,3.071L28.743,39.301l-3.672,0.185l0.601-3.255L40.156,21.746z" class="st3"/><path d="M46.691,28.28c1.203,1.14,1.581,2.115,0.531,3.255L32.734,46.023c-0.248,0.263-0.539,0.452-0.865,0.578	l-0.059-4.227l14.484-14.484l0.393,0.393L46.691,28.28z" class="st3"/><path d="M41.375,15.534l4.545-4.549c0.605-0.547,2.048-0.889,3.063-0.012l7.875,7.875	c0.719,0.786,0.841,2.151-0.012,3.059l-4.584,4.584c-0.149-0.267-0.369-0.539-0.657-0.818l-9.892-9.892	c-0.11-0.094-0.224-0.181-0.342-0.252L41.375,15.534z" class="st4"/><path d="M21.811,35.094l14.488-14.484" class="st5"/><path d="M36.3,18.659l2.811-2.878" class="st5"/><path d="M32.737,46.019l14.488-14.488" class="st5"/><path d="M49.207,31.531l2.422-2.41" class="st5"/><path d="M39.111,20.697l1.046,1.05l3.071,3.071l3.071,3.071l0.393,0.393" class="st5"/><path d="M51.61,25.673l-9.892-9.892" class="st5"/><path d="M36.3,20.609c0.833-0.869,1.781-0.999,2.811,0.09" class="st5"/><path d="M47.226,31.533c1.046-1.14,0.672-2.115-0.531-3.256" class="st5"/><path d="M47.226,31.531c0.562,0.523,1.207,0.617,1.982,0" class="st5"/><path d="M36.3,20.61c-0.405-0.704-0.491-1.368,0-1.946" class="st5"/><path d="M41.717,15.781c-0.11-0.094-0.224-0.181-0.342-0.252c-0.704-0.436-1.521-0.436-2.265,0.252" class="st5"/><path d="M51.609,25.674c0.287,0.283,0.503,0.554,0.657,0.818c0.472,0.849,0.244,1.659-0.657,2.611" class="st5"/><path d="M52.262,26.496l0.004-0.004l4.584-4.584" class="st5"/><path d="M41.375,15.533l4.549-4.553" class="st5"/><path d="M48.987,10.973l7.875,7.875" class="st5"/><path d="M45.924,10.981c0.605-0.547,2.048-0.889,3.063-0.012" class="st5"/><path d="M56.862,18.848c0.72,0.786,0.841,2.151-0.012,3.059" class="st5"/><path d="M20.494,45.77l0.146-2.316l0.373-6.137" class="st5"/><path d="M22.051,47.431l2.347-0.161l6.157-0.409" class="st5"/><path d="M21.812,35.094c-0.165,0.208-0.295,0.385-0.401,0.566c-0.244,0.417-0.342,0.837-0.397,1.655" class="st5"/><path d="M30.555,46.861c0.476-0.028,0.924-0.102,1.317-0.26c0.326-0.13,0.617-0.315,0.865-0.574" class="st5"/><path d="M20.742,47.137c0.059,0.071,0.13,0.122,0.212,0.169c0.244,0.13,0.598,0.153,1.097,0.126" class="st5"/><path d="M20.494,45.768c-0.031,0.684,0.031,1.113,0.244,1.36" class="st5"/><path d="M20.636,43.453c1.258,1.007,2.508,2.28,3.763,3.818" class="st5"/><path d="M43.227,24.816L28.743,39.301" class="st5"/><path d="M40.157,21.746L25.672,36.23" class="st5"/><path d="M46.298,27.887L31.814,42.371" class="st5"/><path d="M31.814,42.371l0.059,4.226" class="st5"/><path d="M25.672,36.23l-4.262-0.57" class="st5"/><path d="M25.071,39.486l3.672-0.185" class="st5"/><path d="M28.385,42.953l0.358-3.653" class="st5"/><path d="M31.813,42.371l-3.424,0.59h-0.016" class="st5"/><path d="M25.672,36.23l-0.601,3.255" class="st5"/><path d="M20.738,47.133l0.004,0.004l0.212,0.169l5.559,4.396" class="st6"/><path d="M16.02,50.443l5.776,4.569" class="st6"/><path d="M12.226,53.848l2.984,2.363" class="st6"/><path d="M16.02,50.444c-4.686-3.841-7.25,0.995-3.794,3.409" class="st6"/><path d="M21.796,55.012c5.61,4.502,10.049,0.468,4.718-3.31" class="st6"/></svg>
\ No newline at end of file
diff --git a/assets/images/simple-illustrations/simple-illustration__piggybank.svg b/assets/images/simple-illustrations/simple-illustration__piggybank.svg
index be87ff34752a..ab1f73113f18 100644
--- a/assets/images/simple-illustrations/simple-illustration__piggybank.svg
+++ b/assets/images/simple-illustrations/simple-illustration__piggybank.svg
@@ -1,50 +1 @@
-<svg width="48" height="48" viewBox="0 0 48 48" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M26.1883 15.6619C26.1883 16.0854 26.1038 16.4901 25.9569 16.8633V16.9135C23.9843 16.8288 22.0149 16.8508 20.0454 16.9763V16.9637C19.8703 16.5653 19.7734 16.1262 19.7734 15.6619C19.7734 15.6306 19.7734 15.5992 19.7734 15.5678C19.8235 13.8332 21.2396 12.4436 22.9808 12.4436C24.7221 12.4436 26.1883 13.8834 26.1883 15.6619Z" fill="#FED607"/>
-<path d="M22.9808 3.68896C24.7502 3.68896 26.1883 5.12875 26.1883 6.90731C26.1883 8.68586 24.7534 10.1256 22.9808 10.1256C21.2083 10.1256 19.7734 8.68586 19.7734 6.90731C19.7734 5.12875 21.2083 3.68896 22.9808 3.68896Z" fill="#FED607"/>
-<path d="M24.1997 3.68896C25.969 3.68896 27.4071 5.12875 27.4071 6.90731C27.4071 8.68586 25.9722 10.1256 24.1997 10.1256H22.9805C24.7499 10.1256 26.1879 8.68586 26.1879 6.90731C26.1879 5.12875 24.753 3.68896 22.9805 3.68896H24.1997Z" fill="#002140"/>
-<path d="M24.1997 12.4467C25.8721 12.4467 27.2445 13.7328 27.3914 15.3734C27.4008 15.4706 27.4071 15.5678 27.4071 15.6651C27.4071 16.1293 27.3102 16.5685 27.1351 16.9668V16.9763C26.7412 16.9512 26.3473 16.9323 25.9565 16.9135V16.8633C26.1066 16.4932 26.1879 16.0885 26.1879 15.6619C26.1879 13.8865 24.753 12.4436 22.9805 12.4436H24.1997V12.4467Z" fill="#002140"/>
-<path d="M38.6369 22.8986C38.7244 23.3722 38.5837 23.7957 38.3211 23.8459C38.0617 23.8961 37.7772 23.551 37.6896 23.0774C37.599 22.6006 37.7397 22.1802 38.0023 22.1269C38.2648 22.0767 38.5462 22.4218 38.6369 22.8986Z" fill="#002140"/>
-<path d="M35.6476 23.2059C35.7351 23.6796 35.5945 24.1031 35.3319 24.1533C35.0724 24.2034 34.7879 23.8584 34.7004 23.3847C34.6097 22.9079 34.7504 22.4876 35.013 22.4343C35.2756 22.3841 35.5569 22.7292 35.6476 23.2059Z" fill="#002140"/>
-<path d="M41.2582 28.2812C41.6177 28.2812 41.9053 28.8616 41.9053 29.5767C41.9053 30.2919 41.6177 30.8722 41.2582 30.8722C40.8987 30.8722 40.6143 30.2919 40.6143 29.5767C40.6143 28.8616 40.9019 28.2812 41.2582 28.2812Z" fill="#002140"/>
-<path d="M38.6362 28.2812C38.9957 28.2812 39.2833 28.8616 39.2833 29.5767C39.2833 30.2919 38.9957 30.8722 38.6362 30.8722C38.2767 30.8722 37.9922 30.2919 37.9922 29.5767C37.9922 28.8616 38.2798 28.2812 38.6362 28.2812Z" fill="#002140"/>
-<path d="M32.2089 38.1497V39.5581C32.2089 41.1923 27.082 41.1923 27.082 39.5581V38.1497C27.082 39.7839 32.2089 39.7839 32.2089 38.1497Z" fill="#002140"/>
-<path d="M20.9179 38.1497V39.5581C20.9179 41.1923 15.791 41.1923 15.791 39.5581V38.1497C15.791 39.7839 20.9179 39.7839 20.9179 38.1497Z" fill="#002140"/>
-<path d="M9.20382 26.6721C9.20382 26.76 9.20382 26.8478 9.20695 26.9356H9.20382C9.20382 26.9356 7.95962 27.4124 6.76544 26.8698C6.3059 26.6596 5.99329 26.3585 5.79009 26.0228C5.4681 25.4896 5.42121 24.8748 5.50561 24.4231C5.55876 24.1282 5.69631 23.871 5.89325 23.6671C6.18398 23.366 6.60288 23.1903 7.06868 23.2091C7.85021 23.2342 8.42229 23.871 8.43479 24.398C8.4473 24.925 8.27849 25.3422 7.82207 25.5272C8.19721 25.5994 8.663 25.5837 9.2007 25.4708L9.26322 25.477C9.22258 25.866 9.2007 26.2644 9.2007 26.6721H9.20382Z" fill="#F68DFE"/>
-<path d="M4.78343 22.1585C5.28049 21.7225 5.81818 22.1585 5.6525 22.72C5.49932 23.2376 5.84319 23.614 5.89321 23.6705C5.69626 23.8712 5.55871 24.1316 5.50557 24.4264C5.42116 24.875 5.46806 25.4929 5.79005 26.0262C4.81157 25.5902 4.47082 24.6711 4.36766 24.0061C4.2645 23.3411 4.45832 22.4471 4.78343 22.1617V22.1585Z" fill="#F68DFE"/>
-<path d="M31.0809 27.5474C32.0844 27.5474 32.9003 28.3629 32.9003 29.373C32.9003 30.383 32.0875 31.1954 31.0809 31.1954C30.0743 31.1954 29.2646 30.3799 29.2646 29.373C29.2646 28.3661 30.0774 27.5474 31.0809 27.5474Z" fill="#FBCCFF"/>
-<path d="M39.3677 16.3458C41.1277 16.672 41.0527 17.8515 40.8338 18.6984C40.615 19.5485 39.8522 20.8596 39.3645 21.6752C38.1829 19.3195 36.1509 17.5378 33.6875 16.5089C35.7195 16.2329 37.7734 16.0917 39.3708 16.3458H39.3677Z" fill="#F68DFE"/>
-<path d="M40.4052 25.2167L40.3583 25.5147C44.1159 26.1358 43.9471 33.6766 39.8488 33.6766H38.2607C36.8445 35.4552 34.7907 36.7068 32.2054 37.3686V38.1465C32.2054 39.7808 27.0785 39.7808 27.0785 38.1465V37.9113C24.9246 37.9772 22.7707 38.0054 20.9138 37.9113V38.1465C20.9138 39.7808 15.7869 39.7808 15.7869 38.1465V36.9452C11.9574 35.3423 9.30023 31.5248 9.20332 26.9325C9.20019 26.8447 9.2002 26.7569 9.2002 26.6691C9.2002 26.2613 9.22208 25.866 9.26272 25.4739C9.81917 19.972 14.2114 16.095 19.7634 15.5648H19.7728C19.7728 15.5962 19.7728 15.6276 19.7728 15.6589C19.7728 16.1232 19.8697 16.5623 20.0447 16.9607V16.9733C22.0142 16.8478 23.9837 16.8258 25.9531 16.9105C26.347 16.9262 26.7378 16.9482 27.1317 16.9733V16.9638C27.3067 16.5655 27.4036 16.1263 27.4036 15.6621C27.4036 15.5648 27.4005 15.4676 27.388 15.3704H27.4036C28.4915 15.4143 29.5106 15.4927 30.361 15.6182C31.5239 15.7719 32.643 16.073 33.684 16.509C36.1505 17.5379 38.1794 19.3196 39.3611 21.6753C39.8956 22.7418 40.2551 23.9275 40.4052 25.2167ZM41.9057 29.5737C41.9057 28.8585 41.6181 28.2782 41.2586 28.2782C40.8991 28.2782 40.6147 28.8585 40.6147 29.5737C40.6147 30.2889 40.9023 30.8692 41.2586 30.8692C41.615 30.8692 41.9057 30.2889 41.9057 29.5737ZM39.2829 29.5737C39.2829 28.8585 38.9953 28.2782 38.6358 28.2782C38.2763 28.2782 37.9918 28.8585 37.9918 29.5737C37.9918 30.2889 38.2794 30.8692 38.6358 30.8692C38.9922 30.8692 39.2829 30.2889 39.2829 29.5737ZM38.3232 23.846C38.5858 23.7958 38.7265 23.3723 38.6389 22.8986C38.5483 22.4219 38.2669 22.0768 38.0043 22.127C37.7417 22.1772 37.6011 22.6006 37.6917 23.0774C37.7793 23.5511 38.0637 23.8961 38.3232 23.846ZM35.3315 24.1534C35.5941 24.1032 35.7348 23.6797 35.6472 23.206C35.5566 22.7293 35.2752 22.3842 35.0126 22.4344C34.75 22.4846 34.6094 22.9081 34.7 23.3848C34.7875 23.8585 35.072 24.2035 35.3315 24.1534ZM32.8994 29.3698C32.8994 28.3629 32.0866 27.5442 31.08 27.5442C30.0733 27.5442 29.2637 28.3598 29.2637 29.3698C29.2637 30.3799 30.0765 31.1923 31.08 31.1923C32.0835 31.1923 32.8994 30.3767 32.8994 29.3698Z" fill="#F68DFE"/>
-<path d="M36.5918 25.4709H39.8523" stroke="#002140" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M36.5918 33.6768H38.2611H39.8523" stroke="#002140" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M39.8525 25.4709C40.0307 25.4709 40.1995 25.4866 40.3621 25.5149C44.1197 26.1359 43.9509 33.6768 39.8525 33.6768" stroke="#002140" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M22.9808 3.68896C24.7502 3.68896 26.1883 5.12875 26.1883 6.90731C26.1883 8.68586 24.7534 10.1256 22.9808 10.1256C21.2083 10.1256 19.7734 8.68586 19.7734 6.90731C19.7734 5.12875 21.2083 3.68896 22.9808 3.68896Z" stroke="#002140" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M24.1992 3.68896C25.9686 3.68896 27.4066 5.12875 27.4066 6.90731C27.4066 8.68586 25.9717 10.1256 24.1992 10.1256" stroke="#002140" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M22.9805 10.1255H24.1997" stroke="#002140" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M22.9805 3.68896H24.1997" stroke="#002140" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M20.0454 16.9637C19.8703 16.5653 19.7734 16.1262 19.7734 15.6619C19.7734 15.6306 19.7734 15.5992 19.7734 15.5678C19.8235 13.8332 21.2396 12.4436 22.9808 12.4436C24.7221 12.4436 26.1883 13.8834 26.1883 15.6619C26.1883 16.0854 26.1038 16.4901 25.9569 16.8633" stroke="#002140" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M24.1992 12.4468C25.8717 12.4468 27.2441 13.7329 27.391 15.3734C27.4004 15.4706 27.4066 15.5679 27.4066 15.6651C27.4066 16.1294 27.3097 16.5685 27.1347 16.9669" stroke="#002140" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M22.9805 12.4468H24.1997" stroke="#002140" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M15.7909 36.9482C11.9613 35.3453 9.30414 31.5278 9.20723 26.9356C9.2041 26.8477 9.2041 26.7599 9.2041 26.6721C9.2041 26.2643 9.22598 25.8691 9.26662 25.477C9.82308 19.9751 14.2153 16.098 19.7673 15.5679" stroke="#002140" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M38.2614 33.6768C36.8452 35.4553 34.7914 36.7069 32.2061 37.3688" stroke="#002140" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M30.3643 15.6179C31.5272 15.7716 32.6463 16.0728 33.6873 16.5088C36.1538 17.5376 38.1827 19.3193 39.3644 21.6751C39.8989 22.7416 40.2585 23.9273 40.4085 25.2165C40.4179 25.3012 40.4273 25.3859 40.4335 25.4706" stroke="#002140" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M27.4072 15.3704C28.4951 15.4143 29.5142 15.4927 30.3645 15.6182" stroke="#002140" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M20.917 37.9146C22.7739 38.0087 24.9278 37.9804 27.0817 37.9146" stroke="#002140" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M15.791 39.558V38.1496V36.9482" stroke="#002140" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M20.917 39.5582V38.1498V37.9146" stroke="#002140" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M15.791 39.5581C15.791 41.1924 20.9179 41.1924 20.9179 39.5581" stroke="#002140" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M15.791 38.1497C15.791 39.7839 20.9179 39.7839 20.9179 38.1497" stroke="#002140" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M27.082 39.5582V38.1498V37.9146" stroke="#002140" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M32.209 39.558V38.1496V37.3999" stroke="#002140" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M27.082 39.5581C27.082 41.1924 32.2089 41.1924 32.2089 39.5581" stroke="#002140" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M27.082 38.1497C27.082 39.7839 32.2089 39.7839 32.2089 38.1497" stroke="#002140" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M18.8574 17.064C19.2544 17.0326 19.6483 17.0013 20.0454 16.9762C22.0148 16.8507 23.9843 16.8287 25.9537 16.9134C26.3476 16.9291 26.7384 16.9511 27.1323 16.9762C27.5418 17.0013 27.9576 17.0326 28.3702 17.0671" stroke="#002140" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M39.2833 29.5736C39.2833 30.2888 38.9957 30.8691 38.6362 30.8691C38.2767 30.8691 37.9922 30.2888 37.9922 29.5736C37.9922 28.8584 38.2798 28.2781 38.6362 28.2781C38.9925 28.2781 39.2833 28.8584 39.2833 29.5736Z" stroke="#002140" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M41.9053 29.5736C41.9053 30.2888 41.6177 30.8691 41.2582 30.8691C40.8987 30.8691 40.6143 30.2888 40.6143 29.5736C40.6143 28.8584 40.9019 28.2781 41.2582 28.2781C41.6146 28.2781 41.9053 28.8584 41.9053 29.5736Z" stroke="#002140" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M26.3379 20.3263C27.3758 19.2128 29.0733 17.9486 30.0799 17.5753C31.0834 17.2052 31.7086 17.2617 32.6902 18.1525C33.6718 19.0402 34.6909 20.5898 34.6909 20.5898" stroke="#002140" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M33.6846 16.5059C35.7166 16.233 37.7704 16.0887 39.3679 16.3459C41.1279 16.6721 41.0529 17.8515 40.834 18.6985C40.6152 19.5485 39.8524 20.8597 39.3647 21.6753" stroke="#002140" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M35.6476 23.2059C35.7351 23.6796 35.5945 24.1031 35.3319 24.1533C35.0724 24.2034 34.7879 23.8584 34.7004 23.3847C34.6097 22.9079 34.7504 22.4876 35.013 22.4343C35.2756 22.3841 35.5569 22.7292 35.6476 23.2059Z" stroke="#002140" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M38.6369 22.8986C38.7244 23.3722 38.5837 23.7957 38.3211 23.8459C38.0617 23.8961 37.7772 23.551 37.6896 23.0774C37.599 22.6006 37.7397 22.1802 38.0023 22.1269C38.2648 22.0767 38.5462 22.4218 38.6369 22.8986Z" stroke="#002140" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M6.83008 24.6677C6.94262 25.1382 7.28962 25.4268 7.82419 25.5272C8.19932 25.5994 8.66512 25.5837 9.20281 25.4707" stroke="#002140" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M9.20382 26.9356C9.20382 26.9356 7.95962 27.4124 6.76544 26.8698C6.3059 26.6596 5.99329 26.3585 5.79009 26.0228C5.4681 25.4896 5.42121 24.8748 5.50561 24.4231C5.55876 24.1282 5.69631 23.871 5.89325 23.6671C6.18398 23.366 6.60288 23.1903 7.06868 23.2091C7.85021 23.2342 8.42229 23.871 8.4348 24.398C8.4473 24.925 8.27849 25.3422 7.82207 25.5272" stroke="#002140" stroke-linecap="round" stroke-linejoin="round"/>
-<path d="M5.90315 23.6767L5.89377 23.6673C5.84063 23.6108 5.49988 23.2344 5.65306 22.7169C5.81874 22.1554 5.28105 21.7194 4.784 22.1554C4.462 22.4408 4.26818 23.3317 4.36822 23.9998C4.47138 24.6648 4.81213 25.587 5.79061 26.0199" stroke="#002140" stroke-linecap="round" stroke-linejoin="round"/>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="48" height="48" fill="none" viewBox="0 0 48 48"><path fill="#FED607" d="M26.1883 15.6619C26.1883 16.0854 26.1038 16.4901 25.9569 16.8633V16.9135C23.9843 16.8288 22.0149 16.8508 20.0454 16.9763V16.9637C19.8703 16.5653 19.7734 16.1262 19.7734 15.6619C19.7734 15.6306 19.7734 15.5992 19.7734 15.5678C19.8235 13.8332 21.2396 12.4436 22.9808 12.4436C24.7221 12.4436 26.1883 13.8834 26.1883 15.6619Z"/><path fill="#FED607" d="M22.9808 3.68896C24.7502 3.68896 26.1883 5.12875 26.1883 6.90731C26.1883 8.68586 24.7534 10.1256 22.9808 10.1256C21.2083 10.1256 19.7734 8.68586 19.7734 6.90731C19.7734 5.12875 21.2083 3.68896 22.9808 3.68896Z"/><path fill="#002140" d="M24.1997 3.68896C25.969 3.68896 27.4071 5.12875 27.4071 6.90731C27.4071 8.68586 25.9722 10.1256 24.1997 10.1256H22.9805C24.7499 10.1256 26.1879 8.68586 26.1879 6.90731C26.1879 5.12875 24.753 3.68896 22.9805 3.68896H24.1997Z"/><path fill="#002140" d="M24.1997 12.4467C25.8721 12.4467 27.2445 13.7328 27.3914 15.3734C27.4008 15.4706 27.4071 15.5678 27.4071 15.6651C27.4071 16.1293 27.3102 16.5685 27.1351 16.9668V16.9763C26.7412 16.9512 26.3473 16.9323 25.9565 16.9135V16.8633C26.1066 16.4932 26.1879 16.0885 26.1879 15.6619C26.1879 13.8865 24.753 12.4436 22.9805 12.4436H24.1997V12.4467Z"/><path fill="#002140" d="M38.6369 22.8986C38.7244 23.3722 38.5837 23.7957 38.3211 23.8459C38.0617 23.8961 37.7772 23.551 37.6896 23.0774C37.599 22.6006 37.7397 22.1802 38.0023 22.1269C38.2648 22.0767 38.5462 22.4218 38.6369 22.8986Z"/><path fill="#002140" d="M35.6476 23.2059C35.7351 23.6796 35.5945 24.1031 35.3319 24.1533C35.0724 24.2034 34.7879 23.8584 34.7004 23.3847C34.6097 22.9079 34.7504 22.4876 35.013 22.4343C35.2756 22.3841 35.5569 22.7292 35.6476 23.2059Z"/><path fill="#002140" d="M41.2582 28.2812C41.6177 28.2812 41.9053 28.8616 41.9053 29.5767C41.9053 30.2919 41.6177 30.8722 41.2582 30.8722C40.8987 30.8722 40.6143 30.2919 40.6143 29.5767C40.6143 28.8616 40.9019 28.2812 41.2582 28.2812Z"/><path fill="#002140" d="M38.6362 28.2812C38.9957 28.2812 39.2833 28.8616 39.2833 29.5767C39.2833 30.2919 38.9957 30.8722 38.6362 30.8722C38.2767 30.8722 37.9922 30.2919 37.9922 29.5767C37.9922 28.8616 38.2798 28.2812 38.6362 28.2812Z"/><path fill="#002140" d="M32.2089 38.1497V39.5581C32.2089 41.1923 27.082 41.1923 27.082 39.5581V38.1497C27.082 39.7839 32.2089 39.7839 32.2089 38.1497Z"/><path fill="#002140" d="M20.9179 38.1497V39.5581C20.9179 41.1923 15.791 41.1923 15.791 39.5581V38.1497C15.791 39.7839 20.9179 39.7839 20.9179 38.1497Z"/><path fill="#F68DFE" d="M9.20382 26.6721C9.20382 26.76 9.20382 26.8478 9.20695 26.9356H9.20382C9.20382 26.9356 7.95962 27.4124 6.76544 26.8698C6.3059 26.6596 5.99329 26.3585 5.79009 26.0228C5.4681 25.4896 5.42121 24.8748 5.50561 24.4231C5.55876 24.1282 5.69631 23.871 5.89325 23.6671C6.18398 23.366 6.60288 23.1903 7.06868 23.2091C7.85021 23.2342 8.42229 23.871 8.43479 24.398C8.4473 24.925 8.27849 25.3422 7.82207 25.5272C8.19721 25.5994 8.663 25.5837 9.2007 25.4708L9.26322 25.477C9.22258 25.866 9.2007 26.2644 9.2007 26.6721H9.20382Z"/><path fill="#F68DFE" d="M4.78343 22.1585C5.28049 21.7225 5.81818 22.1585 5.6525 22.72C5.49932 23.2376 5.84319 23.614 5.89321 23.6705C5.69626 23.8712 5.55871 24.1316 5.50557 24.4264C5.42116 24.875 5.46806 25.4929 5.79005 26.0262C4.81157 25.5902 4.47082 24.6711 4.36766 24.0061C4.2645 23.3411 4.45832 22.4471 4.78343 22.1617V22.1585Z"/><path fill="#FBCCFF" d="M31.0809 27.5474C32.0844 27.5474 32.9003 28.3629 32.9003 29.373C32.9003 30.383 32.0875 31.1954 31.0809 31.1954C30.0743 31.1954 29.2646 30.3799 29.2646 29.373C29.2646 28.3661 30.0774 27.5474 31.0809 27.5474Z"/><path fill="#F68DFE" d="M39.3677 16.3458C41.1277 16.672 41.0527 17.8515 40.8338 18.6984C40.615 19.5485 39.8522 20.8596 39.3645 21.6752C38.1829 19.3195 36.1509 17.5378 33.6875 16.5089C35.7195 16.2329 37.7734 16.0917 39.3708 16.3458H39.3677Z"/><path fill="#F68DFE" d="M40.4052 25.2167L40.3583 25.5147C44.1159 26.1358 43.9471 33.6766 39.8488 33.6766H38.2607C36.8445 35.4552 34.7907 36.7068 32.2054 37.3686V38.1465C32.2054 39.7808 27.0785 39.7808 27.0785 38.1465V37.9113C24.9246 37.9772 22.7707 38.0054 20.9138 37.9113V38.1465C20.9138 39.7808 15.7869 39.7808 15.7869 38.1465V36.9452C11.9574 35.3423 9.30023 31.5248 9.20332 26.9325C9.20019 26.8447 9.2002 26.7569 9.2002 26.6691C9.2002 26.2613 9.22208 25.866 9.26272 25.4739C9.81917 19.972 14.2114 16.095 19.7634 15.5648H19.7728C19.7728 15.5962 19.7728 15.6276 19.7728 15.6589C19.7728 16.1232 19.8697 16.5623 20.0447 16.9607V16.9733C22.0142 16.8478 23.9837 16.8258 25.9531 16.9105C26.347 16.9262 26.7378 16.9482 27.1317 16.9733V16.9638C27.3067 16.5655 27.4036 16.1263 27.4036 15.6621C27.4036 15.5648 27.4005 15.4676 27.388 15.3704H27.4036C28.4915 15.4143 29.5106 15.4927 30.361 15.6182C31.5239 15.7719 32.643 16.073 33.684 16.509C36.1505 17.5379 38.1794 19.3196 39.3611 21.6753C39.8956 22.7418 40.2551 23.9275 40.4052 25.2167ZM41.9057 29.5737C41.9057 28.8585 41.6181 28.2782 41.2586 28.2782C40.8991 28.2782 40.6147 28.8585 40.6147 29.5737C40.6147 30.2889 40.9023 30.8692 41.2586 30.8692C41.615 30.8692 41.9057 30.2889 41.9057 29.5737ZM39.2829 29.5737C39.2829 28.8585 38.9953 28.2782 38.6358 28.2782C38.2763 28.2782 37.9918 28.8585 37.9918 29.5737C37.9918 30.2889 38.2794 30.8692 38.6358 30.8692C38.9922 30.8692 39.2829 30.2889 39.2829 29.5737ZM38.3232 23.846C38.5858 23.7958 38.7265 23.3723 38.6389 22.8986C38.5483 22.4219 38.2669 22.0768 38.0043 22.127C37.7417 22.1772 37.6011 22.6006 37.6917 23.0774C37.7793 23.5511 38.0637 23.8961 38.3232 23.846ZM35.3315 24.1534C35.5941 24.1032 35.7348 23.6797 35.6472 23.206C35.5566 22.7293 35.2752 22.3842 35.0126 22.4344C34.75 22.4846 34.6094 22.9081 34.7 23.3848C34.7875 23.8585 35.072 24.2035 35.3315 24.1534ZM32.8994 29.3698C32.8994 28.3629 32.0866 27.5442 31.08 27.5442C30.0733 27.5442 29.2637 28.3598 29.2637 29.3698C29.2637 30.3799 30.0765 31.1923 31.08 31.1923C32.0835 31.1923 32.8994 30.3767 32.8994 29.3698Z"/><path stroke="#002140" stroke-linecap="round" stroke-linejoin="round" d="M36.5918 25.4709H39.8523"/><path stroke="#002140" stroke-linecap="round" stroke-linejoin="round" d="M36.5918 33.6768H38.2611H39.8523"/><path stroke="#002140" stroke-linecap="round" stroke-linejoin="round" d="M39.8525 25.4709C40.0307 25.4709 40.1995 25.4866 40.3621 25.5149C44.1197 26.1359 43.9509 33.6768 39.8525 33.6768"/><path stroke="#002140" stroke-linecap="round" stroke-linejoin="round" d="M22.9808 3.68896C24.7502 3.68896 26.1883 5.12875 26.1883 6.90731C26.1883 8.68586 24.7534 10.1256 22.9808 10.1256C21.2083 10.1256 19.7734 8.68586 19.7734 6.90731C19.7734 5.12875 21.2083 3.68896 22.9808 3.68896Z"/><path stroke="#002140" stroke-linecap="round" stroke-linejoin="round" d="M24.1992 3.68896C25.9686 3.68896 27.4066 5.12875 27.4066 6.90731C27.4066 8.68586 25.9717 10.1256 24.1992 10.1256"/><path stroke="#002140" stroke-linecap="round" stroke-linejoin="round" d="M22.9805 10.1255H24.1997"/><path stroke="#002140" stroke-linecap="round" stroke-linejoin="round" d="M22.9805 3.68896H24.1997"/><path stroke="#002140" stroke-linecap="round" stroke-linejoin="round" d="M20.0454 16.9637C19.8703 16.5653 19.7734 16.1262 19.7734 15.6619C19.7734 15.6306 19.7734 15.5992 19.7734 15.5678C19.8235 13.8332 21.2396 12.4436 22.9808 12.4436C24.7221 12.4436 26.1883 13.8834 26.1883 15.6619C26.1883 16.0854 26.1038 16.4901 25.9569 16.8633"/><path stroke="#002140" stroke-linecap="round" stroke-linejoin="round" d="M24.1992 12.4468C25.8717 12.4468 27.2441 13.7329 27.391 15.3734C27.4004 15.4706 27.4066 15.5679 27.4066 15.6651C27.4066 16.1294 27.3097 16.5685 27.1347 16.9669"/><path stroke="#002140" stroke-linecap="round" stroke-linejoin="round" d="M22.9805 12.4468H24.1997"/><path stroke="#002140" stroke-linecap="round" stroke-linejoin="round" d="M15.7909 36.9482C11.9613 35.3453 9.30414 31.5278 9.20723 26.9356C9.2041 26.8477 9.2041 26.7599 9.2041 26.6721C9.2041 26.2643 9.22598 25.8691 9.26662 25.477C9.82308 19.9751 14.2153 16.098 19.7673 15.5679"/><path stroke="#002140" stroke-linecap="round" stroke-linejoin="round" d="M38.2614 33.6768C36.8452 35.4553 34.7914 36.7069 32.2061 37.3688"/><path stroke="#002140" stroke-linecap="round" stroke-linejoin="round" d="M30.3643 15.6179C31.5272 15.7716 32.6463 16.0728 33.6873 16.5088C36.1538 17.5376 38.1827 19.3193 39.3644 21.6751C39.8989 22.7416 40.2585 23.9273 40.4085 25.2165C40.4179 25.3012 40.4273 25.3859 40.4335 25.4706"/><path stroke="#002140" stroke-linecap="round" stroke-linejoin="round" d="M27.4072 15.3704C28.4951 15.4143 29.5142 15.4927 30.3645 15.6182"/><path stroke="#002140" stroke-linecap="round" stroke-linejoin="round" d="M20.917 37.9146C22.7739 38.0087 24.9278 37.9804 27.0817 37.9146"/><path stroke="#002140" stroke-linecap="round" stroke-linejoin="round" d="M15.791 39.558V38.1496V36.9482"/><path stroke="#002140" stroke-linecap="round" stroke-linejoin="round" d="M20.917 39.5582V38.1498V37.9146"/><path stroke="#002140" stroke-linecap="round" stroke-linejoin="round" d="M15.791 39.5581C15.791 41.1924 20.9179 41.1924 20.9179 39.5581"/><path stroke="#002140" stroke-linecap="round" stroke-linejoin="round" d="M15.791 38.1497C15.791 39.7839 20.9179 39.7839 20.9179 38.1497"/><path stroke="#002140" stroke-linecap="round" stroke-linejoin="round" d="M27.082 39.5582V38.1498V37.9146"/><path stroke="#002140" stroke-linecap="round" stroke-linejoin="round" d="M32.209 39.558V38.1496V37.3999"/><path stroke="#002140" stroke-linecap="round" stroke-linejoin="round" d="M27.082 39.5581C27.082 41.1924 32.2089 41.1924 32.2089 39.5581"/><path stroke="#002140" stroke-linecap="round" stroke-linejoin="round" d="M27.082 38.1497C27.082 39.7839 32.2089 39.7839 32.2089 38.1497"/><path stroke="#002140" stroke-linecap="round" stroke-linejoin="round" d="M18.8574 17.064C19.2544 17.0326 19.6483 17.0013 20.0454 16.9762C22.0148 16.8507 23.9843 16.8287 25.9537 16.9134C26.3476 16.9291 26.7384 16.9511 27.1323 16.9762C27.5418 17.0013 27.9576 17.0326 28.3702 17.0671"/><path stroke="#002140" stroke-linecap="round" stroke-linejoin="round" d="M39.2833 29.5736C39.2833 30.2888 38.9957 30.8691 38.6362 30.8691C38.2767 30.8691 37.9922 30.2888 37.9922 29.5736C37.9922 28.8584 38.2798 28.2781 38.6362 28.2781C38.9925 28.2781 39.2833 28.8584 39.2833 29.5736Z"/><path stroke="#002140" stroke-linecap="round" stroke-linejoin="round" d="M41.9053 29.5736C41.9053 30.2888 41.6177 30.8691 41.2582 30.8691C40.8987 30.8691 40.6143 30.2888 40.6143 29.5736C40.6143 28.8584 40.9019 28.2781 41.2582 28.2781C41.6146 28.2781 41.9053 28.8584 41.9053 29.5736Z"/><path stroke="#002140" stroke-linecap="round" stroke-linejoin="round" d="M26.3379 20.3263C27.3758 19.2128 29.0733 17.9486 30.0799 17.5753C31.0834 17.2052 31.7086 17.2617 32.6902 18.1525C33.6718 19.0402 34.6909 20.5898 34.6909 20.5898"/><path stroke="#002140" stroke-linecap="round" stroke-linejoin="round" d="M33.6846 16.5059C35.7166 16.233 37.7704 16.0887 39.3679 16.3459C41.1279 16.6721 41.0529 17.8515 40.834 18.6985C40.6152 19.5485 39.8524 20.8597 39.3647 21.6753"/><path stroke="#002140" stroke-linecap="round" stroke-linejoin="round" d="M35.6476 23.2059C35.7351 23.6796 35.5945 24.1031 35.3319 24.1533C35.0724 24.2034 34.7879 23.8584 34.7004 23.3847C34.6097 22.9079 34.7504 22.4876 35.013 22.4343C35.2756 22.3841 35.5569 22.7292 35.6476 23.2059Z"/><path stroke="#002140" stroke-linecap="round" stroke-linejoin="round" d="M38.6369 22.8986C38.7244 23.3722 38.5837 23.7957 38.3211 23.8459C38.0617 23.8961 37.7772 23.551 37.6896 23.0774C37.599 22.6006 37.7397 22.1802 38.0023 22.1269C38.2648 22.0767 38.5462 22.4218 38.6369 22.8986Z"/><path stroke="#002140" stroke-linecap="round" stroke-linejoin="round" d="M6.83008 24.6677C6.94262 25.1382 7.28962 25.4268 7.82419 25.5272C8.19932 25.5994 8.66512 25.5837 9.20281 25.4707"/><path stroke="#002140" stroke-linecap="round" stroke-linejoin="round" d="M9.20382 26.9356C9.20382 26.9356 7.95962 27.4124 6.76544 26.8698C6.3059 26.6596 5.99329 26.3585 5.79009 26.0228C5.4681 25.4896 5.42121 24.8748 5.50561 24.4231C5.55876 24.1282 5.69631 23.871 5.89325 23.6671C6.18398 23.366 6.60288 23.1903 7.06868 23.2091C7.85021 23.2342 8.42229 23.871 8.4348 24.398C8.4473 24.925 8.27849 25.3422 7.82207 25.5272"/><path stroke="#002140" stroke-linecap="round" stroke-linejoin="round" d="M5.90315 23.6767L5.89377 23.6673C5.84063 23.6108 5.49988 23.2344 5.65306 22.7169C5.81874 22.1554 5.28105 21.7194 4.784 22.1554C4.462 22.4408 4.26818 23.3317 4.36822 23.9998C4.47138 24.6648 4.81213 25.587 5.79061 26.0199"/></svg>
\ No newline at end of file
diff --git a/assets/images/simple-illustrations/simple-illustration__receipt-location-marker.svg b/assets/images/simple-illustrations/simple-illustration__receipt-location-marker.svg
new file mode 100644
index 000000000000..1c2bb43a04ab
--- /dev/null
+++ b/assets/images/simple-illustrations/simple-illustration__receipt-location-marker.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" id="Layer_1" data-name="Layer 1" version="1.1" viewBox="0 0 160 140"><defs><style>.cls-1{fill:#ff7101}.cls-1,.cls-2,.cls-3,.cls-4,.cls-5{stroke-width:0}.cls-2{fill:#00b268}.cls-3{fill:#002140}.cls-4{fill:#fffaf0}.cls-5{fill:#5ab0ff}</style></defs><path d="M117.297,42.243l-.283.167c-4.24-.467-8.596-.493-12.692.703-4.093,1.197-7.923,3.73-10.003,7.453-1.213,2.166-1.84,4.713-3.553,6.516-3.08,3.246-8.819,3.183-11.309,6.903-.997,1.483-1.28,3.336-2.157,4.893-1.817,3.233-5.799,4.623-8.083,7.546-3.23,4.133-2.696,10.812-6.983,13.835-1.816,1.28-4.856,1.26-6.853,2.24-2.563,1.26-4.333,2.94-6.903,3.58-2.57.643-5.326-.67-8.436.257-1.696.503-4.033,1.413-5.769,1.77-1.976.403-3.913-.66-5.843-1.253s-3.586-.083-5.349,1.403l-.123.073c-.373-.607-.73-1.223-1.077-1.85-.023-.043-.047-.087-.073-.133-.817-1.483-1.556-2.986-2.22-4.51l.12-.053c.75-1.716,2.107-3.156,3.766-4.016,1.553-.8,3.333-1.097,4.846-1.963,4.03-2.31,4.989-7.779,8.379-10.955,3.42-3.206,8.662-3.526,12.575-6.109,2.093-1.38,3.756-3.41,4.7-5.733.703-1.73,1.023-3.633,2.02-5.216,2.22-3.523,7.106-4.496,9.606-7.829.35-.47.653-.993.76-1.573.33-1.83-1.533-3.476-3.39-3.583-1.856-.107-3.593.87-5.126,1.92-1.537,1.05-3.056,2.236-4.87,2.646-3.06.69-6.183-.977-9.316-.833-1.603.073-3.183.637-4.473,1.597-1.663,1.236-2.796,3.066-4.38,4.403-2.056,1.736-4.856,2.553-7.519,2.2-1.903-.253-3.7-1.07-5.606-1.306-1.906-.24-4.136.297-5.03,1.996l-.2-.047c.363-1.553.797-3.09,1.293-4.603,1.563-4.769,3.776-9.329,6.603-13.535,4.693-6.989,11.076-12.999,18.945-17.358,4.96-2.746,10.156-4.646,15.429-5.739v.013c-2.163.65-4.536,1.45-5.673,3.406-1.153,1.986-.657,4.533-1.447,6.686-.78,2.116-2.71,3.596-4.716,4.626-2.003,1.03-4.18,1.73-6.086,2.936-.996.633-1.936,1.43-2.466,2.486-.527,1.056-.567,2.416.137,3.366,1.023,1.38,3.123,1.393,4.726.777,1.603-.613,3.013-1.703,4.67-2.146,4.17-1.11,8.626,2.11,12.755.877,2.566-.767,4.413-3.106,6.959-3.936,4.716-1.536,10.072,2.553,14.625.587,2.553-1.103,4.083-3.856,6.606-5.026,2.533-1.18,5.483-.533,8.272-.347,2.786.183,6.103-.46,7.276-2.996l.136-.167c2.297,1.86,4.457,3.923,6.453,6.179,1.85,2.09,3.56,4.343,5.106,6.756.427.663.84,1.336,1.24,2.023Z" class="cls-5"/><path d="M117.89,43.29c7.226,13.042,8.58,27.754,4.93,41.083l-.307-.083c-3.883-.653-8.075,1.35-10.005,4.783-1.457,2.586-1.737,5.853-3.797,7.986-2.276,2.363-6.152,2.693-8.269,5.199-1.463,1.734-1.803,4.197-3.223,5.963-1.157,1.44-2.906,2.26-4.273,3.503-2.41,2.183-3.486,5.74-2.686,8.896l.08.197c-3.676,1.483-7.443,2.536-11.235,3.183-5.869.999-11.802,1.019-17.575.126-.137-.02-.277-.043-.413-.066l.033-.207c2.41-.257,4.323-2.143,5.689-4.143,1.367-2.003,2.423-4.253,4.166-5.936,1.496-1.443,3.46-2.393,5.519-2.67,1.697-.226,3.52-.03,5.026-.843,2.19-1.183,2.87-4.01,4.656-5.743,2.903-2.816,8.339-2.446,10.296-5.986,1.367-2.47.047-5.826-2.366-7.289-2.416-1.46-5.539-1.307-8.173-.283-2.63,1.02-4.883,2.806-7.099,4.553-2.22,1.743-4.496,3.506-7.149,4.466-2.823,1.02-6.479.313-9.299,1.343-2.79,1.016-4.616,3.699-7.386,4.776-3.113,1.21-6.733.213-9.999.913-3.27.7-6.476,3.36-7.863,6.4l-.263.353c-2.523-1.897-4.9-4.02-7.093-6.369-1.903-2.037-3.67-4.24-5.276-6.603-.547-.803-1.073-1.623-1.577-2.463l.123-.073c1.763-1.487,3.42-1.996,5.349-1.403,1.93.593,3.866,1.656,5.843,1.253,1.736-.357,4.073-1.267,5.769-1.77,3.11-.927,5.866.387,8.436-.257,2.57-.64,4.34-2.32,6.903-3.58,1.997-.98,5.036-.96,6.853-2.24,4.286-3.023,3.753-9.702,6.983-13.835,2.283-2.923,6.266-4.313,8.083-7.546.877-1.557,1.16-3.41,2.157-4.893,2.49-3.72,8.229-3.656,11.309-6.903,1.713-1.803,2.34-4.35,3.553-6.516,2.08-3.723,5.909-6.256,10.002-7.453,4.096-1.196,8.452-1.17,12.692-.703l.283-.167c.2.347.4.693.593,1.047Z" class="cls-2"/><path d="M104.498,27.282l-.136.17c-1.173,2.536-4.49,3.18-7.276,2.996-2.79-.187-5.739-.833-8.272.347-2.523,1.17-4.053,3.923-6.606,5.026-4.553,1.966-9.909-2.123-14.625-.587-2.546.83-4.393,3.17-6.959,3.936-4.13,1.233-8.586-1.986-12.755-.876-1.657.443-3.066,1.533-4.67,2.146-1.603.617-3.703.603-4.726-.777-.703-.95-.663-2.31-.137-3.366.53-1.057,1.47-1.853,2.466-2.486,1.907-1.207,4.083-1.907,6.086-2.936,2.006-1.03,3.936-2.51,4.716-4.626.79-2.153.293-4.699,1.447-6.686,1.136-1.957,3.51-2.756,5.676-3.406v-.013c4.883-1.017,9.829-1.347,14.708-1.023,2.723.177,5.426.557,8.086,1.137,2.27.49,4.506,1.127,6.696,1.903,3.25,1.15,6.396,2.603,9.389,4.353,2.403,1.403,4.709,2.996,6.892,4.77Z" class="cls-2"/><path d="M62.973,44.803c1.856.107,3.72,1.753,3.39,3.583-.107.58-.41,1.103-.76,1.573-2.5,3.333-7.386,4.306-9.606,7.829-.997,1.583-1.317,3.486-2.02,5.216-.943,2.323-2.606,4.353-4.699,5.733-3.913,2.583-9.156,2.903-12.575,6.109-3.39,3.176-4.35,8.646-8.379,10.956-1.513.867-3.293,1.163-4.846,1.963-1.66.86-3.016,2.3-3.766,4.016l-.12.053c-.46-1.047-.883-2.1-1.27-3.163-2.973-8.129-3.903-16.642-2.976-24.887.243-2.16.617-4.3,1.11-6.406l.2.047c.893-1.7,3.123-2.236,5.029-1.996,1.906.237,3.703,1.053,5.606,1.306,2.663.353,5.463-.463,7.519-2.2,1.583-1.336,2.716-3.166,4.38-4.403,1.29-.96,2.87-1.523,4.473-1.597,3.133-.143,6.256,1.523,9.316.833,1.813-.41,3.333-1.597,4.87-2.646,1.533-1.05,3.27-2.027,5.126-1.92Z" class="cls-2"/><path d="M122.513,84.289l.307.083c-3.77,13.765-12.869,26.054-26.338,33.516-2.01,1.114-4.063,2.087-6.143,2.927l-.08-.197c-.8-3.156.277-6.713,2.686-8.896,1.367-1.243,3.116-2.063,4.273-3.503,1.42-1.766,1.76-4.229,3.223-5.962,2.117-2.507,5.993-2.837,8.269-5.2,2.06-2.133,2.34-5.399,3.797-7.986,1.929-3.433,6.122-5.436,10.005-4.783Z" class="cls-5"/><path d="M94.136,91.242c2.413,1.463,3.733,4.82,2.366,7.289-1.957,3.54-7.393,3.17-10.296,5.986-1.786,1.733-2.466,4.56-4.656,5.743-1.507.813-3.33.617-5.026.843-2.06.277-4.023,1.227-5.519,2.67-1.743,1.683-2.8,3.933-4.166,5.936-1.367,2-3.28,3.886-5.689,4.143l-.033.207c-8.722-1.417-17.058-4.927-24.211-10.296l.263-.353c1.387-3.04,4.593-5.7,7.863-6.4,3.266-.7,6.886.297,9.999-.913,2.77-1.076,4.596-3.76,7.386-4.776,2.82-1.03,6.476-.323,9.299-1.343,2.653-.96,4.93-2.723,7.149-4.466,2.216-1.746,4.47-3.533,7.099-4.553,2.633-1.023,5.756-1.177,8.173.283Z" class="cls-5"/><path d="M69.942,125.774c-2.857,0-5.718-.221-8.566-.661-.134-.02-.283-.044-.429-.069-8.913-1.447-17.437-5.072-24.643-10.481-2.599-1.954-5.029-4.136-7.223-6.486-1.951-2.087-3.758-4.35-5.372-6.723-.57-.838-1.11-1.683-1.607-2.512-.375-.609-.74-1.239-1.094-1.88-.003-.005-.071-.13-.074-.135-.828-1.503-1.588-3.049-2.261-4.593-.466-1.061-.902-2.146-1.293-3.221-2.941-8.042-3.989-16.806-3.03-25.341.245-2.172.625-4.367,1.13-6.522.364-1.558.808-3.135,1.316-4.687,1.603-4.89,3.865-9.527,6.723-13.781,4.888-7.28,11.559-13.392,19.291-17.675,4.954-2.744,10.24-4.71,15.71-5.844,4.92-1.024,9.962-1.375,14.981-1.042,2.759.179,5.529.568,8.232,1.157,2.296.496,4.59,1.148,6.817,1.938,3.325,1.176,6.541,2.667,9.56,4.432,2.455,1.434,4.816,3.068,7.019,4.857.017.014.034.028.05.043,2.332,1.894,4.526,3.997,6.521,6.252,1.902,2.149,3.651,4.463,5.198,6.879.435.674.855,1.36,1.263,2.06.215.373.415.718.606,1.071,7.106,12.825,8.89,27.681,5.018,41.825-4.013,14.649-13.537,26.769-26.818,34.127-2.007,1.111-4.11,2.114-6.252,2.979-3.677,1.482-7.526,2.573-11.442,3.241-3.089.526-6.208.79-9.331.79ZM69.827,16c-3.661,0-7.313.375-10.9,1.121-5.273,1.093-10.37,2.989-15.148,5.636-7.562,4.189-13.82,9.922-18.599,17.041-2.756,4.102-4.937,8.573-6.482,13.29-.491,1.497-.918,3.017-1.27,4.519-.487,2.08-.854,4.196-1.09,6.291-.925,8.229.085,16.678,2.921,24.432.377,1.036.796,2.08,1.247,3.104.649,1.491,1.382,2.98,2.18,4.43l.061.11c.351.634.699,1.238,1.064,1.831.483.807,1.003,1.618,1.552,2.425,1.556,2.289,3.299,4.47,5.18,6.482,2.115,2.266,4.458,4.369,6.963,6.252,6.947,5.216,15.167,8.711,23.77,10.108.136.023.267.046.395.063,5.757.893,11.563.851,17.266-.121,3.774-.645,7.485-1.696,11.029-3.125,2.066-.835,4.096-1.803,6.032-2.875,12.806-7.095,21.988-18.78,25.857-32.905,3.734-13.637,2.015-27.961-4.841-40.333-.188-.345-.379-.676-.57-1.007-.403-.694-.809-1.355-1.229-2.005-1.493-2.332-3.18-4.563-5.014-6.635-1.937-2.189-4.067-4.23-6.334-6.065-.018-.014-.034-.029-.051-.044-2.108-1.708-4.367-3.27-6.716-4.641-2.91-1.702-6.012-3.14-9.219-4.274-2.147-.762-4.359-1.391-6.573-1.869-2.608-.568-5.278-.943-7.939-1.116-1.181-.078-2.363-.117-3.544-.117Z" class="cls-3"/><g><path d="M141.704,49.157l4.619-22.033-7.993,3.716-4.258-7.08-6.738,4.751-5.041-6.856-7.555,4.448-4.006-6.897-6.408,4.561-5.196-6.119-19.267,91.91,7.993-3.716,4.258,7.081,6.738-4.752,5.041,6.856,7.555-4.448,4.007,6.897,6.408-4.561,5.195,6.119,14.648-69.877Z" class="cls-4"/><path d="M127.615,121.238l-5.922-6.977-6.554,4.664-4.053-6.975-7.467,4.396-4.994-6.794-6.816,4.807-4.349-7.232-8.987,4.178L98.568,15.444l5.924,6.976,6.554-4.664,4.052,6.976,7.466-4.396,4.995,6.793,6.816-4.806,4.349,7.232,8.988-4.178-20.097,95.862ZM122.029,111.568l4.467,5.262,18.438-87.958-6.998,3.253-4.167-6.929-6.66,4.697-5.087-6.918-7.644,4.5-3.96-6.818-6.263,4.457-4.469-5.262-18.438,87.958,6.998-3.254,4.167,6.93,6.66-4.697,5.086,6.919,7.645-4.5,3.961,6.818,6.263-4.457Z" class="cls-3"/></g><path d="M127.77,72.437c-.068,0-.138-.007-.207-.021l-29.354-6.191c-.541-.114-.887-.645-.772-1.185.114-.54.646-.885,1.185-.772l29.354,6.191c.541.114.887.645.772,1.185-.1.471-.515.794-.978.794Z" class="cls-3"/><path d="M125.913,81.243c-.068,0-.138-.007-.207-.021l-29.354-6.191c-.541-.114-.887-.645-.772-1.185s.645-.888,1.185-.772l29.354,6.191c.541.114.887.645.772,1.185-.1.471-.515.794-.978.794Z" class="cls-3"/><path d="M124.056,90.049c-.068,0-.138-.007-.207-.021l-29.354-6.19c-.541-.114-.887-.645-.772-1.185s.646-.887,1.185-.772l29.354,6.19c.541.114.887.645.772,1.185-.1.471-.515.794-.978.794Z" class="cls-3"/><path d="M122.199,98.855c-.068,0-.138-.007-.207-.021l-14.679-3.096c-.541-.114-.887-.645-.772-1.185s.646-.885,1.185-.772l14.679,3.096c.541.114.887.645.772,1.185-.1.471-.515.794-.978.794Z" class="cls-3"/><path d="M102.629,94.728c-.068,0-.138-.007-.207-.021l-9.785-2.063c-.541-.114-.887-.645-.772-1.185s.645-.885,1.185-.772l9.785,2.063c.541.114.887.645.772,1.185-.1.471-.515.794-.978.794Z" class="cls-3"/><path d="M114.872,59.509c-.53-.113-.605-.561-.452-1.177l.342-1.514c-.535-.209-.963-.468-1.303-.684-.359-.244-.671-.479-.925-.532-.462-.098-.522.418-1.075.301-.901-.191-1.28-2.866-.875-4.799.213-1.012.655-1.399,1.071-1.311.484.103.472.965.624,2.079.278,1.549,1.331,2.853,2.814,3.48l1.275-5.738c-2.799-1.362-4.472-3.158-3.908-5.85.531-2.531,3.046-4.065,6.015-3.508l.293-1.284c.144-.69.383-1.024.914-.912.485.103.592.51.447,1.2l-.317,1.399c.401.157.746.35,1.045.534.294.207.565.408.773.452.346.073.507-.349.969-.251.9.191,1.194,2.584.817,4.379-.173.828-.598,1.243-.944,1.17-.438-.093-.535-.666-.632-1.239-.096-1.727-.922-2.959-2.36-3.576l-1.212,5.438c3.076,1.541,4.646,3.363,4.067,6.124-.631,3.014-3.346,4.121-6.236,3.533l-.317,1.399c-.153.616-.333,1.011-.91.889ZM115.04,43.876c-.304,1.45.595,2.337,1.939,3.054l1.149-5.139c-1.561-.139-2.784.636-3.088,2.085ZM116.441,55.708c1.69.214,2.997-.615,3.301-2.064.342-1.634-.694-2.67-2.08-3.42l-1.221,5.485Z" class="cls-3"/><path d="M77.5,38.4c-10.33,0-18.8,8.15-18.8,18.32,0,7.05,4.68,13.66,8.93,18.27,2.17,2.36,4.34,4.31,5.96,5.67.81.68,1.49,1.22,1.97,1.59.24.18.43.32.56.42.07.05.12.09.16.11.01.02.03.03.04.03,0,.01.01.01.01.01l.01.01,1.16.83,1.16-.83.01-.01s.01,0,.01-.01c.01,0,.03-.01.04-.03.04-.02.09-.06.16-.11.13-.1.32-.24.56-.42.48-.37,1.16-.91,1.97-1.59,1.62-1.36,3.79-3.31,5.96-5.67,4.25-4.61,8.93-11.22,8.93-18.27,0-10.17-8.47-18.32-18.8-18.32ZM77.54,81.16c-.01.02-.02.02-.03.03-.01,0-.01.01-.01.01,0,0,0-.01-.01-.01-.01-.01-.02-.02-.03-.03-.98-.71-16.76-12.35-16.76-24.44,0-9.01,7.52-16.32,16.8-16.32s16.8,7.31,16.8,16.32c0,12.09-15.78,23.73-16.76,24.44Z" class="cls-3"/><path d="M94.3,56.72c0,12.09-15.78,23.73-16.76,24.44-.01.02-.02.02-.03.03-.01,0-.01.01-.01.01,0,0,0-.01-.01-.01-.01-.01-.02-.02-.03-.03-.98-.71-16.76-12.35-16.76-24.44,0-9.01,7.52-16.32,16.8-16.32s16.8,7.31,16.8,16.32Z" class="cls-1"/><circle cx="77.5" cy="52.4" r="4.8" class="cls-3" transform="translate(-14.153 33.647) rotate(-22.5)"/></svg>
\ No newline at end of file
diff --git a/assets/images/simple-illustrations/simple-illustration__receiptupload.svg b/assets/images/simple-illustrations/simple-illustration__receiptupload.svg
index b8fe5101715f..efff624f481f 100644
--- a/assets/images/simple-illustrations/simple-illustration__receiptupload.svg
+++ b/assets/images/simple-illustrations/simple-illustration__receiptupload.svg
@@ -1,22 +1 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 27.9.0, 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 68 68" style="enable-background:new 0 0 68 68;" xml:space="preserve">
-<style type="text/css">
-	.st0{fill:#FFFAF0;stroke:#002140;stroke-miterlimit:10;}
-	.st1{fill:#03D47C;}
-	.st2{fill:none;stroke:#002140;stroke-linecap:round;}
-</style>
-<path class="st0" d="M61.3,34.4l5-8.7l-3.8,0.5l-0.8-3.6l-3.5,1.1l-1.1-3.6l-3.8,0.9l-0.7-3.4l-3.3,1.1l-1.3-3.3l-21,36.4l3.8-0.5
-	l0.8,3.6l3.5-1.1l1.1,3.6l3.8-0.9l0.7,3.4l3.3-1.1l1.3,3.3L61.3,34.4z"/>
-<path class="st0" d="M44.4,17l0.8-10l-3.2,2.1l-2.2-2.9l-2.6,2.5L34.6,6l-3,2.4l-2.1-2.8L26.9,8l-2.6-2.4L21,47.4l3.2-2.1l2.2,2.9
-	l2.6-2.5l2.5,2.7l3-2.4l2.1,2.8l2.5-2.4l2.6,2.4L44.4,17z"/>
-<path class="st1" d="M10.1,41.4c0,1.1-0.9,2-2.1,2S6,42.5,6,41.4V36c0-1.1,0.9-2,2.1-2h17.9c1.1,0,2.1,0.9,2.1,2v5.4
-	c0,1.1-0.9,2-2.1,2s-2.1-0.9-2.1-2V38H10.1V41.4z"/>
-<path class="st1" d="M9.4,50c-0.9,0.7-0.9,2-0.2,2.9c0.8,0.8,2.1,0.9,2.9,0.2l2.8-2.4V59c0,1.1,0.9,2,2.1,2s2.1-0.9,2.1-2v-8.3
-	l2.8,2.4c0.9,0.7,2.2,0.7,2.9-0.2c0.8-0.8,0.7-2.1-0.2-2.9L17,43.4L9.4,50z"/>
-<path class="st2" d="M10.1,41.4c0,1.1-0.9,2-2.1,2S6,42.5,6,41.4V36c0-1.1,0.9-2,2.1-2h17.9c1.1,0,2.1,0.9,2.1,2v5.4
-	c0,1.1-0.9,2-2.1,2s-2.1-0.9-2.1-2V38H10.1V41.4z"/>
-<path class="st2" d="M9.4,50c-0.9,0.7-0.9,2-0.2,2.9c0.8,0.8,2.1,0.9,2.9,0.2l2.8-2.4V59c0,1.1,0.9,2,2.1,2s2.1-0.9,2.1-2v-8.3
-	l2.8,2.4c0.9,0.7,2.2,0.7,2.9-0.2c0.8-0.8,0.7-2.1-0.2-2.9L17,43.4L9.4,50z"/>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" id="Layer_1" x="0" y="0" version="1.1" viewBox="0 0 68 68" style="enable-background:new 0 0 68 68" xml:space="preserve"><style type="text/css">.st0{fill:#fffaf0;stroke:#002140;stroke-miterlimit:10}.st1{fill:#03d47c}.st2{fill:none;stroke:#002140;stroke-linecap:round}</style><path d="M61.3,34.4l5-8.7l-3.8,0.5l-0.8-3.6l-3.5,1.1l-1.1-3.6l-3.8,0.9l-0.7-3.4l-3.3,1.1l-1.3-3.3l-21,36.4l3.8-0.5	l0.8,3.6l3.5-1.1l1.1,3.6l3.8-0.9l0.7,3.4l3.3-1.1l1.3,3.3L61.3,34.4z" class="st0"/><path d="M44.4,17l0.8-10l-3.2,2.1l-2.2-2.9l-2.6,2.5L34.6,6l-3,2.4l-2.1-2.8L26.9,8l-2.6-2.4L21,47.4l3.2-2.1l2.2,2.9	l2.6-2.5l2.5,2.7l3-2.4l2.1,2.8l2.5-2.4l2.6,2.4L44.4,17z" class="st0"/><path d="M10.1,41.4c0,1.1-0.9,2-2.1,2S6,42.5,6,41.4V36c0-1.1,0.9-2,2.1-2h17.9c1.1,0,2.1,0.9,2.1,2v5.4	c0,1.1-0.9,2-2.1,2s-2.1-0.9-2.1-2V38H10.1V41.4z" class="st1"/><path d="M9.4,50c-0.9,0.7-0.9,2-0.2,2.9c0.8,0.8,2.1,0.9,2.9,0.2l2.8-2.4V59c0,1.1,0.9,2,2.1,2s2.1-0.9,2.1-2v-8.3	l2.8,2.4c0.9,0.7,2.2,0.7,2.9-0.2c0.8-0.8,0.7-2.1-0.2-2.9L17,43.4L9.4,50z" class="st1"/><path d="M10.1,41.4c0,1.1-0.9,2-2.1,2S6,42.5,6,41.4V36c0-1.1,0.9-2,2.1-2h17.9c1.1,0,2.1,0.9,2.1,2v5.4	c0,1.1-0.9,2-2.1,2s-2.1-0.9-2.1-2V38H10.1V41.4z" class="st2"/><path d="M9.4,50c-0.9,0.7-0.9,2-0.2,2.9c0.8,0.8,2.1,0.9,2.9,0.2l2.8-2.4V59c0,1.1,0.9,2,2.1,2s2.1-0.9,2.1-2v-8.3	l2.8,2.4c0.9,0.7,2.2,0.7,2.9-0.2c0.8-0.8,0.7-2.1-0.2-2.9L17,43.4L9.4,50z" class="st2"/></svg>
\ No newline at end of file
diff --git a/assets/images/simple-illustrations/simple-illustration__rules.svg b/assets/images/simple-illustrations/simple-illustration__rules.svg
new file mode 100644
index 000000000000..6432f26d9ac6
--- /dev/null
+++ b/assets/images/simple-illustrations/simple-illustration__rules.svg
@@ -0,0 +1,10 @@
+<svg width="48" height="48" viewBox="0 0 48 48" fill="none" xmlns="http://www.w3.org/2000/svg">
+<rect x="6.07812" y="11.6934" width="31.9702" height="10.7751" rx="2.5" fill="#FFFAF0" stroke="#002140"/>
+<rect x="18.1389" y="14.3333" width="10.9901" height="1.49396" fill="#002140"/>
+<rect x="18.1389" y="18.2583" width="16.4851" height="1.49396" fill="#002140"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M15.143 13.7811C15.5413 14.0752 15.6257 14.6364 15.3316 15.0346L11.431 20.3168L8.62785 17.7569C8.2623 17.423 8.23658 16.8561 8.57042 16.4905C8.90425 16.1249 9.47122 16.0992 9.83678 16.4331L11.1708 17.6513L13.8895 13.9697C14.1836 13.5714 14.7448 13.487 15.143 13.7811Z" fill="#03D47C"/>
+<rect x="10.6572" y="25.4309" width="31.9702" height="10.7751" rx="2.5" fill="#FFFAF0" stroke="#002140"/>
+<rect x="22.7178" y="28.0708" width="10.9901" height="1.49396" fill="#002140"/>
+<rect x="22.7178" y="31.9958" width="16.4851" height="1.49396" fill="#002140"/>
+<path d="M18.3683 33.5836C18.6715 33.8868 19.1631 33.8868 19.4664 33.5836C19.7696 33.2803 19.7696 32.7887 19.4664 32.4855L17.6865 30.7056L19.4664 28.9257C19.7696 28.6224 19.7696 28.1308 19.4664 27.8276C19.1631 27.5243 18.6715 27.5243 18.3683 27.8276L16.5884 29.6075L14.808 27.827C14.5047 27.5238 14.0131 27.5238 13.7099 27.827C13.4066 28.1303 13.4066 28.6219 13.7099 28.9251L15.4903 30.7056L13.7098 32.486C13.4066 32.7892 13.4066 33.2809 13.7098 33.5841C14.0131 33.8873 14.5047 33.8873 14.8079 33.5841L16.5884 31.8037L18.3683 33.5836Z" fill="#F25730"/>
+</svg>
diff --git a/assets/images/simple-illustrations/simple-illustration__sendmoney.svg b/assets/images/simple-illustrations/simple-illustration__sendmoney.svg
new file mode 100644
index 000000000000..1975c15d5d24
--- /dev/null
+++ b/assets/images/simple-illustrations/simple-illustration__sendmoney.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="48" height="48" fill="none" viewBox="0 0 48 48"><path fill="#00B268" d="M36.7207 3.61035L5.26038 13.1036L11.7786 18.4128L13.1472 30.2401L18.1345 25.0093L25.7778 31.6087L36.7207 3.61035Z"/><path fill="#085239" d="M9.04419 16.2407L5.42265 13.7471C5.42265 13.7471 5.58218 17.7436 5.26312 18.0123L9.04419 16.2435V16.2407Z"/><path fill="#085239" d="M11.7783 18.4127L13.1469 30.2401L36.1551 4.41357L34.9489 4.73543L11.7783 18.4127Z"/><path fill="#085239" d="M25.3357 23.845C25.3357 23.845 24.2889 22.9998 23.2842 23.5623C22.2795 24.1248 23.2842 25.9356 23.2842 25.9356C23.2842 25.9356 24.3309 26.6185 25.1761 26.1763C26.0213 25.7341 26.0213 24.3263 25.3357 23.8422V23.845Z"/><path fill="#085239" d="M12.6769 13.3865C12.6769 13.3865 11.6302 12.5413 10.6254 13.1038C9.62071 13.6663 10.6254 15.4771 10.6254 15.4771C10.6254 15.4771 11.6722 16.16 12.5174 15.7178C13.3626 15.2756 13.3626 13.8678 12.6769 13.3837V13.3865Z"/><path fill="#03D47C" d="M30.2303 11.3323C30.2303 11.3323 26.9054 9.88541 23.6337 13.479C20.362 17.0725 19.1278 19.916 20.3088 22.7035L30.2303 11.3323V11.3323Z"/><path fill="#085239" d="M33.0181 5.86348C33.0181 5.86348 32.4807 5.11343 31.5711 5.59481C30.6588 6.07619 31.1429 6.82904 31.1429 6.82904L33.0209 5.86348H33.0181Z"/><path fill="#085239" d="M34.3053 6.77295L32.8583 8.43539C32.8583 8.43539 34.0394 9.07909 34.4144 8.16671C34.7895 7.25433 34.3081 6.77295 34.3081 6.77295H34.3053Z"/><path stroke="#002E22" stroke-linecap="round" stroke-linejoin="round" stroke-width=".857" d="M16.2422 27.1422L15.1171 16.8037"/><path stroke="#008C59" stroke-linecap="round" stroke-linejoin="round" stroke-width=".857" d="M14.997 16.6438C14.997 16.6438 16.1109 14.1753 14.7143 12.3534L30.6978 6.93506"/><path stroke="#008C59" stroke-linecap="round" stroke-linejoin="round" stroke-width=".857" d="M20.5467 22.3955C20.5467 22.3955 22.7605 20.747 25.576 21.6314L32.6147 8.79932"/><path stroke="#002140" stroke-linecap="round" stroke-linejoin="round" stroke-width=".857" d="M4.99414 13.238L37.0422 3.5293L25.6151 31.6872L18.2349 25.029L13.144 30.4361L11.8594 18.5752L4.99414 13.238Z"/><path stroke="#002140" stroke-linecap="round" stroke-linejoin="round" stroke-width=".857" d="M18.235 25.029L37.0424 3.5293"/><path stroke="#002140" stroke-linecap="round" stroke-linejoin="round" stroke-width=".857" d="M11.8598 18.5752L37.0426 3.5293"/><path stroke="#002140" stroke-linecap="round" stroke-linejoin="round" stroke-width=".857" d="M4.99434 13.2378C6.06625 16.0001 4.94116 18.2783 4.94116 18.2783L9.03008 16.3724"/><path stroke="#002140" stroke-linecap="round" stroke-linejoin="round" stroke-width=".857" d="M20.3539 22.5743C18.8482 21.2225 19.8642 17.6317 22.6237 14.5588C25.2433 11.6397 28.4926 10.2347 30.1047 11.2535"/><path stroke="#002140" stroke-linecap="round" stroke-linejoin="round" stroke-width=".857" d="M25.5118 26.0679C26.1217 25.458 26.0677 24.4152 25.3911 23.7386C24.7146 23.0621 23.6717 23.008 23.0619 23.6179C22.452 24.2278 22.506 25.2706 23.1826 25.9472C23.8591 26.6237 24.902 26.6778 25.5118 26.0679Z"/><path stroke="#002140" stroke-linecap="round" stroke-linejoin="round" stroke-width=".857" d="M34.3137 6.89893C34.6496 7.36911 34.6356 7.99042 34.2549 8.37385C33.8939 8.73488 33.3146 8.76567 32.8556 8.483"/><path stroke="#002140" stroke-linecap="round" stroke-linejoin="round" stroke-width=".857" d="M13.1085 15.0246C13.4689 14.2411 13.0564 13.2817 12.1872 12.8819C11.3179 12.4821 10.3211 12.7932 9.96068 13.5768C9.60027 14.3604 10.0128 15.3197 10.882 15.7195C11.7513 16.1193 12.7481 15.8082 13.1085 15.0246Z"/><path stroke="#002140" stroke-linecap="round" stroke-linejoin="round" stroke-width=".857" d="M31.1149 6.89884C30.9946 6.62736 30.9834 6.3223 31.1121 6.04803C31.3612 5.50508 32.0525 5.28958 32.6542 5.56665C32.7913 5.63102 32.9145 5.71498 33.018 5.81294"/><path stroke="#008C59" stroke-linecap="round" stroke-linejoin="round" stroke-width=".857" d="M12.2236 32.2471C12.2236 32.2471 12.0529 32.6417 11.8346 33.2966"/><path stroke="#008C59" stroke-linecap="round" stroke-linejoin="round" stroke-width=".857" d="M11.2353 35.5156C10.6616 38.3171 10.5748 42.1822 13.7233 44.0461C21.6969 48.3393 32.9813 33.5425 42.3794 44.3876"/><path stroke="#008C59" stroke-linecap="round" stroke-linejoin="round" stroke-width=".857" d="M43.107 45.2832C43.3253 45.5715 43.5436 45.8737 43.7619 46.1928"/></svg>
\ No newline at end of file
diff --git a/assets/images/simple-illustrations/simple-illustration__splitbill.svg b/assets/images/simple-illustrations/simple-illustration__splitbill.svg
index dfed7535ee90..1390a7cf9205 100644
--- a/assets/images/simple-illustrations/simple-illustration__splitbill.svg
+++ b/assets/images/simple-illustrations/simple-illustration__splitbill.svg
@@ -1,55 +1 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 27.9.0, 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 68 68" style="enable-background:new 0 0 68 68;" xml:space="preserve">
-<style type="text/css">
-	.st0{fill:#FBCCFF;}
-	.st1{fill:#FFD7B0;}
-	.st2{fill:#D18000;}
-	.st3{fill:none;stroke:#002140;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;}
-</style>
-<path class="st0" d="M22.9,14.9L21,16c0,0-10.2,8.7-9.5,13.4c3,0.6,11.3,6.9,11.3,6.9l2.8,3.2l-0.3-3.5l3.2-1.5l-2.2-5.2H32
-	l-0.4-3.7c0,0,4.1-0.3,4.7-1.2C34,16.6,22.9,14.9,22.9,14.9z"/>
-<path class="st0" d="M55.5,38.3c-8.7-1.8-14.3-10.2-14.3-10.2l-3.6,1.2l0.7,3.3l-4.6,1l0.7,4.9l-4.3,0.8l0.5,4.8c0,0,4.5,7.2,13.3,9
-	C45,52.9,55.3,42.1,55.5,38.3L55.5,38.3z"/>
-<path class="st1" d="M43.1,30.9C46,34.4,54.4,38,54.4,38s1.8-2.6,1.5-3.3c-0.4-0.7-0.3-0.9-1.3-1.1c-1-0.2-2,0-2,0s0.4-2.5-1.2-2.5
-	c-1.5-0.1-2.8,0.2-2.8,0.2s0-1.8-0.7-2.2c-0.7-0.3-2.7-0.3-2.7-0.3S43,30.5,43.1,30.9z"/>
-<path class="st1" d="M54.9,40.4c-0.9,2-6.5,7.7-6.5,7.7l-0.6-0.5c0,0-0.2-6.4-3.7-5.3c-3.5,1.2-1.7,4.1-1.7,4.1s2,1.8,1.9,4.6
-	c-0.1,2.9,0.6,4.4,1.9,5c1.3,0.6,5.4,0.4,6.5,1c1.1,0.7,3.6,2.3,3.6,2.3s1.6-0.2,2.8-1.5c1.2-1.3,3.9-4.4,4-5.1
-	c0.1-0.7-0.3-1.8-0.3-1.8s-2.8-2.6-3.5-3.9C58.6,45.9,55.8,40.7,54.9,40.4L54.9,40.4z"/>
-<path class="st2" d="M22.7,12.7L20,11.3c0,0-5.9-1.1-6.3-1.3c-0.4-0.3-2.9-1.9-2.9-1.9s-6,2.1-6.4,8l0.2,0.7c0,0,3.2,3.6,3.5,4.6
-	c0.4,0.9,1.5,3.8,1.5,3.8s0.6,0.4,2,2.2c1.6-5.1,6.2-6.9,6.2-6.9l0.9-0.1c0,0,0.8,4.4,1.7,4.7c0.9,0.3,3.5-0.6,3.8-0.6
-	c0.3,0,1.1-1.7,0.9-2.2c-0.2-0.6-1.9-4.3-1.9-4.6C23.2,17.5,22.7,12.7,22.7,12.7L22.7,12.7z"/>
-<path class="st2" d="M23.3,37.6c0,0-2.1-3.5-4.3-4.6c-2.2-1.1-6.8-3.1-6.8-3.1s-2.2,1.6-1.2,3c1,1.4,3.3,1.5,3.3,1.5
-	s-0.7,1.1,0.7,1.8c1.4,0.7,2.8,0.4,2.8,0.4s-0.4,1.8,1.2,2.3C20.6,39.4,23.3,37.6,23.3,37.6L23.3,37.6z"/>
-<path class="st3" d="M10.9,8c0,0-6.5,2.6-6.9,8.3c4.2,3.3,4.8,8.4,7.3,10.5"/>
-<path class="st3" d="M14.5,19.3c0,0,2.7,2,4.6,0.4c-0.4,3.8,1.5,6.9,4.8,5.4c3.3-1.6-0.8-5.5-1-7.5c-0.3-2,0.8-3.8-1-5.5
-	c-1.8-1.8-7.9-0.5-10.9-4"/>
-<path class="st3" d="M12.2,30.2c-1.3,1.1-1.9,2.9-0.2,3.8c1.3,0.6,2.8-0.3,3.8-1.1"/>
-<path class="st3" d="M16.8,31.9c-2.1,1.7-3,3.8-1.4,4.6c1.1,0.5,2.4-0.1,3.4-0.8"/>
-<path class="st3" d="M20.4,34.2c-2.2,2-2.9,3.9-1.2,4.7c1.3,0.6,3.5-0.7,4.2-1.4"/>
-<path class="st3" d="M17.5,20.3c-6.8,4.7-6.2,9.3-6.2,9.3s8.5,1.8,14.4,10.3"/>
-<path class="st3" d="M36.7,24.5C31.6,16,23,14.8,23,14.8"/>
-<path class="st3" d="M56.3,59.7c0,0,6.4-2.7,6.7-8.4c-4.6-3.5-5-9.1-8.1-10.8"/>
-<path class="st3" d="M52.5,48.4c0,0-2.7-2-4.6-0.4c0.4-3.8-1.6-6.9-4.9-5.3c-3.3,1.6,0.8,5.5,1.2,7.5c0.3,2-0.8,3.8,1.1,5.5
-	c1.9,1.7,7.9,0.4,11,3.9"/>
-<path class="st3" d="M54.7,37.6c0.9-1.1,1.9-3.1,0.1-3.9c-1.3-0.6-2.7,0-4.7,2.2"/>
-<path class="st3" d="M51.1,34.8c1.4-1.4,1.8-2.8,0.1-3.6c-1.3-0.6-2.8,0-3.8,1.3"/>
-<path class="st3" d="M46.5,33.4c2.1-1.9,2.8-3.8,1-4.6c-1.3-0.6-2.8,0.4-4.4,1.6"/>
-<path class="st3" d="M49.2,47.3c4.9-3.3,6.4-9.2,6.4-9.2S46.2,36.7,41,28"/>
-<path class="st3" d="M30.3,43.6c4.8,8,13.9,9.5,13.9,9.5"/>
-<path class="st3" d="M25.7,39.9c0,0,0-2.9-0.8-4.2l3.7-0.8L26,29.3l6,0.2l-0.7-3.8c0,0,3.3,0.1,5.2-1.2"/>
-<path class="st3" d="M30.3,43.6c0,0,0.4-3.1-0.6-4.7l5-0.4l-1.6-5l5.6-0.8l-1.4-3.6c0,0,2.8-0.1,3.8-1.2"/>
-<path class="st3" d="M29.7,21.4l-0.8,1.1"/>
-<path class="st3" d="M27.1,25l-2.7,3.8"/>
-<path class="st3" d="M23.5,30.1l-0.8,1.1"/>
-<path class="st3" d="M22,25.8l-0.8,1.1"/>
-<path class="st3" d="M20.1,28.6l-0.8,1.1"/>
-<path class="st3" d="M19,22.2l-0.8,1.1"/>
-<path class="st3" d="M17.4,24.5l-1.2,1.8"/>
-<path class="st3" d="M15.8,26.9L15,28"/>
-<path class="st3" d="M48.9,38.7l-0.8,1.1"/>
-<path class="st3" d="M46.9,41.6l-0.8,1.1"/>
-<path class="st3" d="M41.3,34.1l-6.5,9.1"/>
-<path class="st3" d="M43.8,37.1l-4.5,6.4"/>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" id="Layer_1" x="0" y="0" version="1.1" viewBox="0 0 68 68" style="enable-background:new 0 0 68 68" xml:space="preserve"><style type="text/css">.st0{fill:#fbccff}.st1{fill:#ffd7b0}.st2{fill:#d18000}.st3{fill:none;stroke:#002140;stroke-width:1;stroke-linecap:round;stroke-linejoin:round}</style><path d="M22.9,14.9L21,16c0,0-10.2,8.7-9.5,13.4c3,0.6,11.3,6.9,11.3,6.9l2.8,3.2l-0.3-3.5l3.2-1.5l-2.2-5.2H32	l-0.4-3.7c0,0,4.1-0.3,4.7-1.2C34,16.6,22.9,14.9,22.9,14.9z" class="st0"/><path d="M55.5,38.3c-8.7-1.8-14.3-10.2-14.3-10.2l-3.6,1.2l0.7,3.3l-4.6,1l0.7,4.9l-4.3,0.8l0.5,4.8c0,0,4.5,7.2,13.3,9	C45,52.9,55.3,42.1,55.5,38.3L55.5,38.3z" class="st0"/><path d="M43.1,30.9C46,34.4,54.4,38,54.4,38s1.8-2.6,1.5-3.3c-0.4-0.7-0.3-0.9-1.3-1.1c-1-0.2-2,0-2,0s0.4-2.5-1.2-2.5	c-1.5-0.1-2.8,0.2-2.8,0.2s0-1.8-0.7-2.2c-0.7-0.3-2.7-0.3-2.7-0.3S43,30.5,43.1,30.9z" class="st1"/><path d="M54.9,40.4c-0.9,2-6.5,7.7-6.5,7.7l-0.6-0.5c0,0-0.2-6.4-3.7-5.3c-3.5,1.2-1.7,4.1-1.7,4.1s2,1.8,1.9,4.6	c-0.1,2.9,0.6,4.4,1.9,5c1.3,0.6,5.4,0.4,6.5,1c1.1,0.7,3.6,2.3,3.6,2.3s1.6-0.2,2.8-1.5c1.2-1.3,3.9-4.4,4-5.1	c0.1-0.7-0.3-1.8-0.3-1.8s-2.8-2.6-3.5-3.9C58.6,45.9,55.8,40.7,54.9,40.4L54.9,40.4z" class="st1"/><path d="M22.7,12.7L20,11.3c0,0-5.9-1.1-6.3-1.3c-0.4-0.3-2.9-1.9-2.9-1.9s-6,2.1-6.4,8l0.2,0.7c0,0,3.2,3.6,3.5,4.6	c0.4,0.9,1.5,3.8,1.5,3.8s0.6,0.4,2,2.2c1.6-5.1,6.2-6.9,6.2-6.9l0.9-0.1c0,0,0.8,4.4,1.7,4.7c0.9,0.3,3.5-0.6,3.8-0.6	c0.3,0,1.1-1.7,0.9-2.2c-0.2-0.6-1.9-4.3-1.9-4.6C23.2,17.5,22.7,12.7,22.7,12.7L22.7,12.7z" class="st2"/><path d="M23.3,37.6c0,0-2.1-3.5-4.3-4.6c-2.2-1.1-6.8-3.1-6.8-3.1s-2.2,1.6-1.2,3c1,1.4,3.3,1.5,3.3,1.5	s-0.7,1.1,0.7,1.8c1.4,0.7,2.8,0.4,2.8,0.4s-0.4,1.8,1.2,2.3C20.6,39.4,23.3,37.6,23.3,37.6L23.3,37.6z" class="st2"/><path d="M10.9,8c0,0-6.5,2.6-6.9,8.3c4.2,3.3,4.8,8.4,7.3,10.5" class="st3"/><path d="M14.5,19.3c0,0,2.7,2,4.6,0.4c-0.4,3.8,1.5,6.9,4.8,5.4c3.3-1.6-0.8-5.5-1-7.5c-0.3-2,0.8-3.8-1-5.5	c-1.8-1.8-7.9-0.5-10.9-4" class="st3"/><path d="M12.2,30.2c-1.3,1.1-1.9,2.9-0.2,3.8c1.3,0.6,2.8-0.3,3.8-1.1" class="st3"/><path d="M16.8,31.9c-2.1,1.7-3,3.8-1.4,4.6c1.1,0.5,2.4-0.1,3.4-0.8" class="st3"/><path d="M20.4,34.2c-2.2,2-2.9,3.9-1.2,4.7c1.3,0.6,3.5-0.7,4.2-1.4" class="st3"/><path d="M17.5,20.3c-6.8,4.7-6.2,9.3-6.2,9.3s8.5,1.8,14.4,10.3" class="st3"/><path d="M36.7,24.5C31.6,16,23,14.8,23,14.8" class="st3"/><path d="M56.3,59.7c0,0,6.4-2.7,6.7-8.4c-4.6-3.5-5-9.1-8.1-10.8" class="st3"/><path d="M52.5,48.4c0,0-2.7-2-4.6-0.4c0.4-3.8-1.6-6.9-4.9-5.3c-3.3,1.6,0.8,5.5,1.2,7.5c0.3,2-0.8,3.8,1.1,5.5	c1.9,1.7,7.9,0.4,11,3.9" class="st3"/><path d="M54.7,37.6c0.9-1.1,1.9-3.1,0.1-3.9c-1.3-0.6-2.7,0-4.7,2.2" class="st3"/><path d="M51.1,34.8c1.4-1.4,1.8-2.8,0.1-3.6c-1.3-0.6-2.8,0-3.8,1.3" class="st3"/><path d="M46.5,33.4c2.1-1.9,2.8-3.8,1-4.6c-1.3-0.6-2.8,0.4-4.4,1.6" class="st3"/><path d="M49.2,47.3c4.9-3.3,6.4-9.2,6.4-9.2S46.2,36.7,41,28" class="st3"/><path d="M30.3,43.6c4.8,8,13.9,9.5,13.9,9.5" class="st3"/><path d="M25.7,39.9c0,0,0-2.9-0.8-4.2l3.7-0.8L26,29.3l6,0.2l-0.7-3.8c0,0,3.3,0.1,5.2-1.2" class="st3"/><path d="M30.3,43.6c0,0,0.4-3.1-0.6-4.7l5-0.4l-1.6-5l5.6-0.8l-1.4-3.6c0,0,2.8-0.1,3.8-1.2" class="st3"/><path d="M29.7,21.4l-0.8,1.1" class="st3"/><path d="M27.1,25l-2.7,3.8" class="st3"/><path d="M23.5,30.1l-0.8,1.1" class="st3"/><path d="M22,25.8l-0.8,1.1" class="st3"/><path d="M20.1,28.6l-0.8,1.1" class="st3"/><path d="M19,22.2l-0.8,1.1" class="st3"/><path d="M17.4,24.5l-1.2,1.8" class="st3"/><path d="M15.8,26.9L15,28" class="st3"/><path d="M48.9,38.7l-0.8,1.1" class="st3"/><path d="M46.9,41.6l-0.8,1.1" class="st3"/><path d="M41.3,34.1l-6.5,9.1" class="st3"/><path d="M43.8,37.1l-4.5,6.4" class="st3"/></svg>
\ No newline at end of file
diff --git a/assets/images/simple-illustrations/simple-illustration__subscription-annual.svg b/assets/images/simple-illustrations/simple-illustration__subscription-annual.svg
new file mode 100644
index 000000000000..6dcb4a422f0a
--- /dev/null
+++ b/assets/images/simple-illustrations/simple-illustration__subscription-annual.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" id="Layer_1" x="0" y="0" version="1.1" viewBox="0 0 68 68" style="enable-background:new 0 0 68 68" xml:space="preserve"><style type="text/css">.st0{fill:#e4bc07}.st1{fill:#002140}.st2{fill:#fffaf0}.st3{fill:#fed607}.st4,.st5{stroke:#002140}.st4{fill:none;stroke-miterlimit:10}.st5{fill:#50eef6}</style><path d="M23.578,17.636c0.906,0,1.733,0.342,2.357,0.903l0.089,0.111c-0.678,0.546-1.533,0.882-2.463,0.914	c-0.054,0.004-0.102,0.004-0.156,0.004v0.011c-1.019,0.096-1.366,0.832-1.366,1.581c0,0.864,0.539,1.589,1.514,1.626	c1.257-0.026,2.437-0.37,3.464-0.947l0.011,0.02c-0.328,1.604-1.749,2.808-3.452,2.808c-1.946,0-3.523-1.574-3.523-3.516	c0-1.942,1.577-3.516,3.523-3.516L23.578,17.636z" class="st0"/><path d="M47.567,21.84l0.011,0.02c-0.328,1.604-1.749,2.808-3.452,2.808c-1.946,0-3.523-1.574-3.523-3.516	s1.577-3.516,3.523-3.516c0.906,0,1.733,0.342,2.357,0.903l0.089,0.111c-0.678,0.546-1.533,0.882-2.463,0.914	c-0.054,0.004-0.102,0.004-0.156,0.004v0.011c-1.019,0.096-1.366,0.832-1.366,1.581c0,0.864,0.539,1.589,1.514,1.626	c1.257-0.026,2.437-0.37,3.464-0.947L47.567,21.84z" class="st0"/><path d="M48.151,15.38c0-0.1-0.004-0.2-0.011-0.3c-0.152-2.173-1.966-3.892-4.186-3.892s-3.875,1.57-4.157,3.61v0.287	H36.55v-0.27C36.846,11.004,40.039,8,43.937,8s7.251,3.152,7.403,7.099c0.004,0.096,0.006,0.194,0.006,0.292	c0,2.765-1.523,5.181-3.778,6.446c-1.027,0.577-2.207,0.919-3.464,0.947c-0.975-0.039-1.514-0.762-1.514-1.626	c0-0.751,0.347-1.485,1.366-1.581v-0.011c0.054,0,0.102,0,0.156-0.004c0.93-0.031,1.785-0.37,2.463-0.914	c0.964-0.764,1.579-1.946,1.579-3.27L48.151,15.38z" class="st1"/><path d="M19.277,14.608v0.477h-3.291c0.004-0.091,0.009-0.179,0.015-0.27c0.296-3.81,3.491-6.814,7.387-6.814	c3.895,0,7.242,3.146,7.403,7.087c0.004,0.1,0.006,0.202,0.006,0.305c0,2.765-1.523,5.181-3.779,6.446	c-1.027,0.577-2.207,0.919-3.464,0.947c-0.975-0.039-1.514-0.762-1.514-1.626c0-0.751,0.347-1.485,1.366-1.581v-0.011	c0.054,0,0.102,0,0.156-0.004c0.93-0.031,1.785-0.37,2.463-0.914c0.964-0.764,1.579-1.946,1.579-3.27c0-0.1-0.004-0.196-0.011-0.292	c-0.15-2.177-1.966-3.897-4.186-3.897c-2.051,0-3.766,1.474-4.127,3.42L19.277,14.608z" class="st1"/><path d="M54.125,26.251h0.413v26.68c0,1.935-1.584,3.516-3.523,3.516H16.617c-1.938,0-3.523-1.581-3.523-3.516v-26.68	H54.125z" class="st2"/><path d="M51.366,15.101c1.775,0.179,3.173,1.685,3.173,3.501v7.65H44.126v-1.585c1.703,0,3.123-1.204,3.452-2.808	l-0.011-0.02c2.255-1.265,3.779-3.681,3.779-6.446c0-0.1-0.004-0.196-0.006-0.292H51.366z" class="st3"/><path d="M48.151,15.38c0,1.324-0.617,2.504-1.579,3.27l-0.089-0.111c-0.625-0.56-1.451-0.903-2.357-0.903	c-1.946,0-3.523,1.574-3.523,3.516c0,1.942,1.577,3.516,3.523,3.516v1.585H23.578v-1.585c1.703,0,3.122-1.204,3.452-2.808	l-0.011-0.02c2.255-1.265,3.779-3.681,3.779-6.446c0-0.102-0.004-0.205-0.006-0.305l0.126-0.004h17.129l0.094-0.005	c0.009,0.1,0.011,0.2,0.011,0.3H48.151z" class="st3"/><path d="M23.578,26.251H13.094v-7.65c0-1.72,1.253-3.159,2.891-3.457c0.206-0.039,0.417-0.059,0.632-0.059H27.59	c0.009,0.096,0.011,0.194,0.011,0.292c0,1.324-0.617,2.504-1.579,3.27l-0.089-0.111c-0.625-0.56-1.451-0.903-2.357-0.903	c-1.946,0-3.523,1.574-3.523,3.516c0,1.942,1.577,3.516,3.523,3.516v1.585H23.578z" class="st3"/><path d="M30.916,15.086h5.634h3.247h8.248" class="st4"/><path d="M16.087,15.086h1.846h0.033h9.622h0.015" class="st4"/><path d="M16.617,56.447c-1.938,0-3.523-1.581-3.523-3.516V18.602c0-1.72,1.253-3.159,2.891-3.457	c0.206-0.039,0.417-0.059,0.632-0.059" class="st4"/><path d="M51.296,15.1c1.816,0.179,3.243,1.683,3.243,3.499v34.316c0,1.933-1.62,3.514-3.601,3.514H15.995" class="st4"/><path d="M13,26.251h2.226h9.939h19.482h9.479" class="st4"/><path d="M15.98,15.394c0-0.081,0-0.167,0.005-0.25c-0.004-0.02,0-0.039,0-0.059c0.004-0.091,0.009-0.179,0.015-0.27" class="st4"/><path d="M16,14.817c0.296-3.812,3.491-6.816,7.387-6.816c3.895,0,7.242,3.146,7.403,7.087	c0.004,0.1,0.006,0.202,0.006,0.305c0,2.765-1.523,5.181-3.779,6.446c-1.027,0.577-2.207,0.919-3.464,0.947	c-0.056,0.004-0.111,0.004-0.167,0.004" class="st4"/><path d="M19.247,14.799c0.009-0.065,0.019-0.126,0.03-0.19c0.361-1.946,2.076-3.42,4.127-3.42	c2.22,0,4.036,1.72,4.186,3.897c0.009,0.096,0.011,0.194,0.011,0.292c0,1.324-0.617,2.504-1.579,3.27	c-0.678,0.546-1.533,0.882-2.463,0.914c-0.054,0.004-0.102,0.004-0.156,0.004" class="st4"/><path d="M23.839,22.78c-0.056,0.006-0.111,0.009-0.167,0.009c-0.041,0-0.08,0-0.117-0.004	c-0.975-0.039-1.514-0.762-1.514-1.626c0-0.751,0.347-1.485,1.366-1.581c0.05-0.006,0.102-0.009,0.156-0.011" class="st4"/><path d="M36.55,14.817c0.297-3.812,3.489-6.816,7.387-6.816s7.251,3.152,7.403,7.099	c0.004,0.096,0.006,0.194,0.006,0.292c0,2.765-1.523,5.181-3.778,6.446c-1.027,0.577-2.207,0.919-3.464,0.947	c-0.056,0.004-0.111,0.004-0.167,0.004" class="st4"/><path d="M39.797,14.799c0.282-2.04,2.037-3.61,4.157-3.61s4.034,1.716,4.186,3.891c0.009,0.1,0.011,0.2,0.011,0.3	c0,1.324-0.617,2.504-1.579,3.27c-0.678,0.546-1.533,0.882-2.463,0.914c-0.054,0.004-0.102,0.004-0.156,0.004" class="st4"/><path d="M44.389,22.78c-0.056,0.006-0.111,0.009-0.167,0.009c-0.041,0-0.08,0-0.117-0.004	c-0.975-0.039-1.514-0.762-1.514-1.626c0-0.751,0.346-1.485,1.366-1.581c0.05-0.006,0.102-0.009,0.156-0.011" class="st4"/><path d="M34.69,37.605L34.69,37.605l-0.006-0.002c-0.717-0.213-1.254-0.421-1.612-0.702	c-0.322-0.254-0.51-0.574-0.51-1.1c0-0.563,0.211-0.957,0.527-1.219c0.328-0.272,0.811-0.434,1.389-0.434	c0.544,0,0.991,0.169,1.345,0.484c0.36,0.32,0.657,0.819,0.837,1.527l0.01,0.04l0.017,0.038c0.011,0.025,0.023,0.053,0.036,0.083	c0.082,0.189,0.198,0.459,0.351,0.682c0.182,0.264,0.496,0.579,0.987,0.579c0.572,0,0.939-0.423,1.138-0.882	c0.202-0.466,0.299-1.098,0.299-1.835c0-0.759-0.12-1.55-0.369-2.171c-0.23-0.575-0.67-1.228-1.422-1.228	c-0.439,0-0.798,0.209-1.037,0.54c-0.215-0.102-0.45-0.197-0.698-0.277l0.105-0.738l0.001-0.011l0.001-0.011	c0.007-0.075,0.017-0.152,0.028-0.233c0.003-0.023,0.006-0.047,0.009-0.071c0.012-0.094,0.028-0.218,0.028-0.32	c0-0.253-0.053-0.555-0.274-0.793c-0.228-0.245-0.542-0.325-0.851-0.325c-0.368,0-0.699,0.131-0.941,0.423	c-0.22,0.264-0.328,0.615-0.386,0.98h0l-0.001,0.009l-0.109,0.784c-2.717,0.224-5.062,2.156-5.062,5.148	c0,1.447,0.558,2.531,1.42,3.333c0.845,0.786,1.964,1.283,3.08,1.623l0,0l0.005,0.002c0.711,0.208,1.258,0.445,1.624,0.757	c0.341,0.29,0.538,0.654,0.538,1.194c0,0.562-0.215,0.986-0.556,1.278c-0.349,0.298-0.862,0.483-1.485,0.483	c-1.2,0-2.249-0.864-2.696-2.12c-0.031-0.088-0.065-0.191-0.101-0.3c-0.088-0.266-0.189-0.573-0.301-0.815	c-0.082-0.179-0.191-0.375-0.342-0.531c-0.159-0.164-0.388-0.307-0.685-0.307c-0.557,0-0.941,0.437-1.161,0.92	c-0.23,0.506-0.36,1.213-0.36,2.096c0,0.935,0.159,1.79,0.437,2.43c0.139,0.32,0.318,0.608,0.543,0.824	c0.228,0.218,0.524,0.38,0.874,0.38c0.46,0,0.821-0.224,1.066-0.552c0.375,0.176,0.808,0.339,1.271,0.46l-0.102,0.729	c-0.044,0.248-0.069,0.488-0.069,0.654c0,0.253,0.053,0.555,0.274,0.793c0.227,0.245,0.542,0.325,0.851,0.325	c0.365,0,0.7-0.129,0.946-0.419c0.227-0.268,0.336-0.623,0.383-0.998c0,0,0-0.001,0-0.001l0.113-0.865	c2.885-0.24,5.12-2.238,5.12-5.189c0-1.438-0.53-2.556-1.379-3.401C36.993,38.519,35.868,37.97,34.69,37.605z" class="st5"/></svg>
\ No newline at end of file
diff --git a/assets/images/simple-illustrations/simple-illustration__subscription-ppu.svg b/assets/images/simple-illustrations/simple-illustration__subscription-ppu.svg
new file mode 100644
index 000000000000..39b2e4a12542
--- /dev/null
+++ b/assets/images/simple-illustrations/simple-illustration__subscription-ppu.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" id="Layer_1" x="0" y="0" version="1.1" viewBox="0 0 68 68" style="enable-background:new 0 0 68 68" xml:space="preserve"><style type="text/css">.st0{fill:#4ed7de}.st1{fill:none;stroke:#002140;stroke-linecap:round;stroke-linejoin:round}.st2{fill:#fffaf0}.st3{fill:#f25730}.st4{fill:none;stroke:#002140;stroke-width:5;stroke-linecap:round;stroke-linejoin:round}</style><path d="M37.428,53.06V60h-6.437v-7.12h-10.37l-5.587-18.897h-0.04C14.349,32.035,14,29.952,14,27.787	C14,16.898,22.827,8.07,33.716,8.07c10.889,0,19.717,8.828,19.717,19.717c0,2.055-0.315,4.038-0.897,5.902l-0.091,0.162	l-5.363,19.03h-9.476" class="st0"/><path d="M37.428,53.06V60h-6.437v-7.12h-10.37l-5.587-18.897h-0.04C14.349,32.035,14,29.952,14,27.787	C14,16.898,22.827,8.07,33.716,8.07c10.889,0,19.717,8.828,19.717,19.717c0,2.055-0.315,4.038-0.897,5.902l-0.091,0.162	l-5.363,19.03h-9.476" class="st1"/><path d="M20.218,33.895c-1.029-2.055-1.359-4.142-1.359-6.108c0-8.206,6.653-14.859,14.859-14.859	s14.859,6.653,14.859,14.859c0,2.235-0.386,4.117-1.27,6.018" class="st2"/><path d="M20.218,33.895c-1.029-2.055-1.359-4.142-1.359-6.108c0-8.206,6.653-14.859,14.859-14.859	s14.859,6.653,14.859,14.859c0,2.235-0.386,4.117-1.27,6.018" class="st1"/><path d="M33.716,30.506c1.502,0,2.719-1.218,2.719-2.719c0-1.502-1.217-2.719-2.719-2.719	c-1.502,0-2.719,1.218-2.719,2.719C30.997,29.289,32.215,30.506,33.716,30.506z" class="st3"/><path d="M29.886,18.975l-2.158,1.246l4.393,7.608l2.158-1.246L29.886,18.975z" class="st3"/><path d="M20.262,33.895h26.999" class="st1"/><path d="M26,43h16" class="st4"/></svg>
\ No newline at end of file
diff --git a/assets/images/simple-illustrations/simple-illustration__tag.svg b/assets/images/simple-illustrations/simple-illustration__tag.svg
index 0cac51679a5e..0a93014d11b3 100644
--- a/assets/images/simple-illustrations/simple-illustration__tag.svg
+++ b/assets/images/simple-illustrations/simple-illustration__tag.svg
@@ -1,33 +1 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 28.1.0, 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 68 68" style="enable-background:new 0 0 68 68;" xml:space="preserve">
-<style type="text/css">
-	.st0{fill:#FFD7B0;}
-	.st1{fill:#E4BC07;}
-	.st2{fill:#FFED8F;}
-	.st3{fill:none;stroke:#002140;stroke-width:0.8563;stroke-linecap:round;stroke-linejoin:round;}
-</style>
-<path class="st0" d="M30.437,20.394L19.721,17.41l-8.508,9.724l4.529,10.716l26.074,22.87l15.138-16.683L30.437,20.394z
-	 M21.486,30.381c-1.648,0-2.984-1.335-2.984-2.984c0-1.648,1.335-2.984,2.984-2.984c1.648,0,2.984,1.335,2.984,2.984
-	C24.47,29.045,23.134,30.381,21.486,30.381z"/>
-<path class="st1" d="M51.319,44.595l-3.317-2.874l-9.72,10.939l3.203,2.651L51.319,44.595z"/>
-<path class="st2" d="M15.225,20.984c0,0-1.988,0.443-2.211,1.399c-0.223,0.956,1.585,3.53,3.61,4.642
-	c2.025,1.109,4.272,1.842,5.155,0.809c0.882-1.032-0.296-3.42-0.296-3.42s-1.692,2.314-3.976,0.546s-2.284-2.651-1.768-3.167
-	c0.516-0.516-0.516-0.809-0.516-0.809H15.225z"/>
-<path class="st2" d="M15.961,21.499l2.431-2.597c0,0-0.882-8.342,6.354-8.452c4.915-0.11,11.382,4.585,16.85,4.529
-	c5.468-0.057,6.187-0.996,6.187-0.996s0.606-2.098-0.606-2.098s-2.321,0.883-5.028,0.496c-2.707-0.386-13.48-4.199-16.297-4.252
-	C23.034,8.075,15.299,8.462,15.961,21.499z"/>
-<path class="st3" d="M15.495,22.195l4.489-5.022l10.383,3.307l26.357,23.57L41.796,60.74l-26.354-23.57L11,27.22l2.454-2.74"/>
-<path class="st3" d="M19.282,25.464c1.059-1.182,2.874-1.285,4.059-0.226c1.182,1.059,1.285,2.874,0.226,4.059
-	c-1.059,1.182-2.874,1.285-4.059,0.226c-0.43-0.383-0.716-0.869-0.859-1.389"/>
-<path class="st3" d="M48.035,41.33l-9.877,11.043l3.294,2.946l9.877-11.043L48.035,41.33z"/>
-<path class="st3" d="M26.997,42.811l5.671-6.34"/>
-<path class="st3" d="M29.635,45.168l5.671-6.34"/>
-<path class="st3" d="M21.463,24.6c0.749,1.039,0.996,2.071,0.553,2.774c-0.769,1.222-3.333,0.992-5.721-0.513
-	c-2.391-1.505-3.706-3.716-2.934-4.938c0.47-0.749,1.612-0.952,2.977-0.653"/>
-<path class="st3" d="M20.917,25.122c-0.49,0.776-2.081,0.649-3.556-0.28c-1.475-0.929-2.274-2.311-1.788-3.087"/>
-<path class="st3" d="M15.852,21.279c0,0-1.988-10.716,6.52-12.927c8.508-2.211,16.683,6.85,24.859,3.313"/>
-<path class="st3" d="M18.373,18.976c-0.423-2.394,0.333-7.739,5.997-8.465c5.661-0.726,14.905,6.953,23.47,3.583"/>
-<path class="st3" d="M47.84,14.097c0,0,1.049-1.602-0.606-2.431"/>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" id="Layer_1" x="0" y="0" version="1.1" viewBox="0 0 68 68" style="enable-background:new 0 0 68 68" xml:space="preserve"><style type="text/css">.st0{fill:#ffd7b0}.st1{fill:#e4bc07}.st2{fill:#ffed8f}.st3{fill:none;stroke:#002140;stroke-width:.8563;stroke-linecap:round;stroke-linejoin:round}</style><path d="M30.437,20.394L19.721,17.41l-8.508,9.724l4.529,10.716l26.074,22.87l15.138-16.683L30.437,20.394z M21.486,30.381c-1.648,0-2.984-1.335-2.984-2.984c0-1.648,1.335-2.984,2.984-2.984c1.648,0,2.984,1.335,2.984,2.984	C24.47,29.045,23.134,30.381,21.486,30.381z" class="st0"/><path d="M51.319,44.595l-3.317-2.874l-9.72,10.939l3.203,2.651L51.319,44.595z" class="st1"/><path d="M15.225,20.984c0,0-1.988,0.443-2.211,1.399c-0.223,0.956,1.585,3.53,3.61,4.642	c2.025,1.109,4.272,1.842,5.155,0.809c0.882-1.032-0.296-3.42-0.296-3.42s-1.692,2.314-3.976,0.546s-2.284-2.651-1.768-3.167	c0.516-0.516-0.516-0.809-0.516-0.809H15.225z" class="st2"/><path d="M15.961,21.499l2.431-2.597c0,0-0.882-8.342,6.354-8.452c4.915-0.11,11.382,4.585,16.85,4.529	c5.468-0.057,6.187-0.996,6.187-0.996s0.606-2.098-0.606-2.098s-2.321,0.883-5.028,0.496c-2.707-0.386-13.48-4.199-16.297-4.252	C23.034,8.075,15.299,8.462,15.961,21.499z" class="st2"/><path d="M15.495,22.195l4.489-5.022l10.383,3.307l26.357,23.57L41.796,60.74l-26.354-23.57L11,27.22l2.454-2.74" class="st3"/><path d="M19.282,25.464c1.059-1.182,2.874-1.285,4.059-0.226c1.182,1.059,1.285,2.874,0.226,4.059	c-1.059,1.182-2.874,1.285-4.059,0.226c-0.43-0.383-0.716-0.869-0.859-1.389" class="st3"/><path d="M48.035,41.33l-9.877,11.043l3.294,2.946l9.877-11.043L48.035,41.33z" class="st3"/><path d="M26.997,42.811l5.671-6.34" class="st3"/><path d="M29.635,45.168l5.671-6.34" class="st3"/><path d="M21.463,24.6c0.749,1.039,0.996,2.071,0.553,2.774c-0.769,1.222-3.333,0.992-5.721-0.513	c-2.391-1.505-3.706-3.716-2.934-4.938c0.47-0.749,1.612-0.952,2.977-0.653" class="st3"/><path d="M20.917,25.122c-0.49,0.776-2.081,0.649-3.556-0.28c-1.475-0.929-2.274-2.311-1.788-3.087" class="st3"/><path d="M15.852,21.279c0,0-1.988-10.716,6.52-12.927c8.508-2.211,16.683,6.85,24.859,3.313" class="st3"/><path d="M18.373,18.976c-0.423-2.394,0.333-7.739,5.997-8.465c5.661-0.726,14.905,6.953,23.47,3.583" class="st3"/><path d="M47.84,14.097c0,0,1.049-1.602-0.606-2.431" class="st3"/></svg>
\ No newline at end of file
diff --git a/assets/images/simple-illustrations/simple-illustration__teachers-unite.svg b/assets/images/simple-illustrations/simple-illustration__teachers-unite.svg
index b4edd9513722..27ce709889dd 100644
--- a/assets/images/simple-illustrations/simple-illustration__teachers-unite.svg
+++ b/assets/images/simple-illustrations/simple-illustration__teachers-unite.svg
@@ -1,49 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" id="Layer_1" x="0px" y="0px" viewBox="0 0 68 68" style="enable-background:new 0 0 68 68;" xml:space="preserve">
-<style type="text/css">
-	.st0{fill:#F68DFE;}
-	.st1{fill:#FFA75A;}
-	.st2{fill:#FFFAF0;}
-	.st3{fill:#03D47C;}
-	.st4{fill:none;stroke:#002140;stroke-linecap:round;stroke-linejoin:round;}
-</style>
-<path class="st0" d="M25.6,12.8c1.5-2.7,2.9-3.9,6-3.9c2.9,0,5.7,2.4,5.7,5.6c0.1,3.1-1.6,5.2-4.3,6.6c-2.9,1.9-4.4,4.2-6.2,6.9  c-0.8,1.5-1.5,1.5-2.4,0c-1.8-2.7-3.3-5-6.2-6.9c-2.7-1.5-4.4-3.5-4.3-6.6c0-3.2,2.8-5.6,5.7-5.6C22.7,8.9,24.1,10.1,25.6,12.8  L25.6,12.8z"/>
-<path class="st1" d="M51.1,51.2L51.1,51.2l3.6-0.1c-0.1,3.1-0.6,6-1.4,6.6c-0.1,0.1-0.2,0.1-0.3,0.1h-0.1  C51.1,57.6,51.1,53.6,51.1,51.2z"/>
-<path class="st2" d="M61.8,42c3.1,0,3.1,15.9,0,15.9h-8.5v-0.1c0.9-0.6,1.3-3.4,1.4-6.6c0.1-4.3-0.4-9.2-1.8-9.2H61.8z"/>
-<path class="st3" d="M10.5,40.5l-0.1-0.4c-0.4-0.5-0.6-1.1-0.6-1.7c-0.1-1.2,0.7-2.4,2.4-2.2c3.1,0.3,4.4,2,11.8,2.4v0l9.1-0.4  c4.3-0.2,3.2-3.1,1-4.1c-2.7-1.1-3.1-4.8-1.3-6.6c1.1-1.3,3.5-0.6,3.7,1.2c0.7,2.1,2.6,3,5,3.5c4.2,1.1,6.2,4.9,6.8,9.8h4.7  c1.3,0,1.9,4.9,1.8,9.2h-6.5c-4.6,4.1-11.6,6-20.9,3.4c-4.9,0.9-9.5,1-13.9,0c-1.8-0.6-3.7-1.3-4.1-3.4c-0.2-0.8,0.1-1.7,0.9-2.1  c-0.8-0.6-1.1-1.6-1.2-2.2C9,45.9,9.4,45,10.3,44.6c-0.6-0.6-0.9-1.4-0.9-2C9.3,41.7,9.6,40.9,10.5,40.5L10.5,40.5z"/>
-<path class="st4" d="M48.2,42h4.7h8.6"/>
-<path class="st4" d="M41.4,32.2c4.2,1.1,6.2,4.9,6.8,9.8"/>
-<path class="st4" d="M36.4,28.7c0.7,2.1,2.6,3,5,3.5"/>
-<path class="st4" d="M48.2,51.2h2.9h3.6"/>
-<path class="st4" d="M61.8,42c3.1,0,3.1,15.9,0,15.9"/>
-<path class="st4" d="M53.2,57.8L53.2,57.8h8.3"/>
-<path class="st4" d="M52.9,42c1.3,0,1.9,4.9,1.8,9.2c-0.1,3.1-0.6,6-1.4,6.6c-0.1,0.1-0.2,0.1-0.3,0.1"/>
-<path class="st4" d="M51.1,51.2c0,2.3,0,6.3,1.8,6.6"/>
-<path class="st4" d="M27.4,54.5c9.3,2.6,16.3,0.7,20.9-3.4"/>
-<path class="st4" d="M33,38.1c4.3-0.2,3.2-3.1,1-4.1"/>
-<path class="st4" d="M33.4,47.5c2.8-2.2,7.9-2.7,10.7-0.3"/>
-<path class="st4" d="M34,34c-2.7-1.1-3.1-4.8-1.3-6.6"/>
-<path class="st4" d="M36.4,28.7c-0.3-1.8-2.7-2.5-3.7-1.2"/>
-<path class="st4" d="M27.4,54.5c-4.9,0.9-9.5,1-13.9,0"/>
-<path class="st4" d="M24,50c-7.9,0.9-9.2-1.3-12.3-1.3"/>
-<path class="st4" d="M13.5,54.5c-1.8-0.6-3.7-1.3-4.1-3.4"/>
-<path class="st4" d="M9.4,51.1c-0.2-0.8,0.1-1.7,0.9-2.1c0.3-0.2,0.8-0.3,1.4-0.3"/>
-<path class="st4" d="M23.7,46.5c-7.9,0.4-9.1-1.8-12.2-2"/>
-<path class="st4" d="M10.3,49c-0.8-0.6-1.1-1.6-1.2-2.2"/>
-<path class="st4" d="M9.1,46.8C9,45.9,9.4,45,10.3,44.6c0.3-0.1,0.7-0.2,1.1-0.1"/>
-<path class="st4" d="M24,42.4c-7.9,0.3-9.1-1.9-12.2-2.1"/>
-<path class="st4" d="M10.3,44.6c-0.6-0.6-0.9-1.4-0.9-2"/>
-<path class="st4" d="M9.4,42.6c-0.1-0.9,0.3-1.7,1.1-2.1c0.4-0.2,0.8-0.2,1.3-0.2"/>
-<path class="st4" d="M24,38.6c-7.4-0.4-8.7-2.1-11.8-2.4"/>
-<path class="st4" d="M10.3,40.1c-0.4-0.5-0.6-1.1-0.6-1.7"/>
-<path class="st4" d="M9.7,38.5c-0.1-1.2,0.7-2.4,2.4-2.2"/>
-<path class="st4" d="M33,38.1L24,38.6"/>
-<path class="st4" d="M26.8,28c1.8-2.7,3.3-5,6.2-6.9"/>
-<path class="st4" d="M25.6,12.8c1.5-2.7,2.9-3.9,6-3.9"/>
-<path class="st4" d="M33,21.1c2.7-1.5,4.4-3.5,4.3-6.6"/>
-<path class="st4" d="M31.6,8.9c2.9,0,5.7,2.4,5.7,5.6"/>
-<path class="st4" d="M24.4,28c-1.8-2.7-3.3-5-6.2-6.9"/>
-<path class="st4" d="M25.6,12.8c-1.5-2.7-2.9-3.9-6-3.9"/>
-<path class="st4" d="M18.2,21.1c-2.7-1.5-4.4-3.5-4.3-6.6"/>
-<path class="st4" d="M19.6,8.9c-2.9,0-5.8,2.4-5.7,5.6"/>
-<path class="st4" d="M26.8,28c-0.8,1.5-1.5,1.5-2.4,0"/>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" id="Layer_1" x="0" y="0" version="1.1" viewBox="0 0 68 68" style="enable-background:new 0 0 68 68" xml:space="preserve"><style type="text/css">.st0{fill:#f68dfe}.st1{fill:#ffa75a}.st2{fill:#fffaf0}.st3{fill:#03d47c}.st4{fill:none;stroke:#002140;stroke-linecap:round;stroke-linejoin:round}</style><path d="M25.6,12.8c1.5-2.7,2.9-3.9,6-3.9c2.9,0,5.7,2.4,5.7,5.6c0.1,3.1-1.6,5.2-4.3,6.6c-2.9,1.9-4.4,4.2-6.2,6.9 c-0.8,1.5-1.5,1.5-2.4,0c-1.8-2.7-3.3-5-6.2-6.9c-2.7-1.5-4.4-3.5-4.3-6.6c0-3.2,2.8-5.6,5.7-5.6C22.7,8.9,24.1,10.1,25.6,12.8 L25.6,12.8z" class="st0"/><path d="M51.1,51.2L51.1,51.2l3.6-0.1c-0.1,3.1-0.6,6-1.4,6.6c-0.1,0.1-0.2,0.1-0.3,0.1h-0.1 C51.1,57.6,51.1,53.6,51.1,51.2z" class="st1"/><path d="M61.8,42c3.1,0,3.1,15.9,0,15.9h-8.5v-0.1c0.9-0.6,1.3-3.4,1.4-6.6c0.1-4.3-0.4-9.2-1.8-9.2H61.8z" class="st2"/><path d="M10.5,40.5l-0.1-0.4c-0.4-0.5-0.6-1.1-0.6-1.7c-0.1-1.2,0.7-2.4,2.4-2.2c3.1,0.3,4.4,2,11.8,2.4v0l9.1-0.4 c4.3-0.2,3.2-3.1,1-4.1c-2.7-1.1-3.1-4.8-1.3-6.6c1.1-1.3,3.5-0.6,3.7,1.2c0.7,2.1,2.6,3,5,3.5c4.2,1.1,6.2,4.9,6.8,9.8h4.7 c1.3,0,1.9,4.9,1.8,9.2h-6.5c-4.6,4.1-11.6,6-20.9,3.4c-4.9,0.9-9.5,1-13.9,0c-1.8-0.6-3.7-1.3-4.1-3.4c-0.2-0.8,0.1-1.7,0.9-2.1 c-0.8-0.6-1.1-1.6-1.2-2.2C9,45.9,9.4,45,10.3,44.6c-0.6-0.6-0.9-1.4-0.9-2C9.3,41.7,9.6,40.9,10.5,40.5L10.5,40.5z" class="st3"/><path d="M48.2,42h4.7h8.6" class="st4"/><path d="M41.4,32.2c4.2,1.1,6.2,4.9,6.8,9.8" class="st4"/><path d="M36.4,28.7c0.7,2.1,2.6,3,5,3.5" class="st4"/><path d="M48.2,51.2h2.9h3.6" class="st4"/><path d="M61.8,42c3.1,0,3.1,15.9,0,15.9" class="st4"/><path d="M53.2,57.8L53.2,57.8h8.3" class="st4"/><path d="M52.9,42c1.3,0,1.9,4.9,1.8,9.2c-0.1,3.1-0.6,6-1.4,6.6c-0.1,0.1-0.2,0.1-0.3,0.1" class="st4"/><path d="M51.1,51.2c0,2.3,0,6.3,1.8,6.6" class="st4"/><path d="M27.4,54.5c9.3,2.6,16.3,0.7,20.9-3.4" class="st4"/><path d="M33,38.1c4.3-0.2,3.2-3.1,1-4.1" class="st4"/><path d="M33.4,47.5c2.8-2.2,7.9-2.7,10.7-0.3" class="st4"/><path d="M34,34c-2.7-1.1-3.1-4.8-1.3-6.6" class="st4"/><path d="M36.4,28.7c-0.3-1.8-2.7-2.5-3.7-1.2" class="st4"/><path d="M27.4,54.5c-4.9,0.9-9.5,1-13.9,0" class="st4"/><path d="M24,50c-7.9,0.9-9.2-1.3-12.3-1.3" class="st4"/><path d="M13.5,54.5c-1.8-0.6-3.7-1.3-4.1-3.4" class="st4"/><path d="M9.4,51.1c-0.2-0.8,0.1-1.7,0.9-2.1c0.3-0.2,0.8-0.3,1.4-0.3" class="st4"/><path d="M23.7,46.5c-7.9,0.4-9.1-1.8-12.2-2" class="st4"/><path d="M10.3,49c-0.8-0.6-1.1-1.6-1.2-2.2" class="st4"/><path d="M9.1,46.8C9,45.9,9.4,45,10.3,44.6c0.3-0.1,0.7-0.2,1.1-0.1" class="st4"/><path d="M24,42.4c-7.9,0.3-9.1-1.9-12.2-2.1" class="st4"/><path d="M10.3,44.6c-0.6-0.6-0.9-1.4-0.9-2" class="st4"/><path d="M9.4,42.6c-0.1-0.9,0.3-1.7,1.1-2.1c0.4-0.2,0.8-0.2,1.3-0.2" class="st4"/><path d="M24,38.6c-7.4-0.4-8.7-2.1-11.8-2.4" class="st4"/><path d="M10.3,40.1c-0.4-0.5-0.6-1.1-0.6-1.7" class="st4"/><path d="M9.7,38.5c-0.1-1.2,0.7-2.4,2.4-2.2" class="st4"/><path d="M33,38.1L24,38.6" class="st4"/><path d="M26.8,28c1.8-2.7,3.3-5,6.2-6.9" class="st4"/><path d="M25.6,12.8c1.5-2.7,2.9-3.9,6-3.9" class="st4"/><path d="M33,21.1c2.7-1.5,4.4-3.5,4.3-6.6" class="st4"/><path d="M31.6,8.9c2.9,0,5.7,2.4,5.7,5.6" class="st4"/><path d="M24.4,28c-1.8-2.7-3.3-5-6.2-6.9" class="st4"/><path d="M25.6,12.8c-1.5-2.7-2.9-3.9-6-3.9" class="st4"/><path d="M18.2,21.1c-2.7-1.5-4.4-3.5-4.3-6.6" class="st4"/><path d="M19.6,8.9c-2.9,0-5.8,2.4-5.7,5.6" class="st4"/><path d="M26.8,28c-0.8,1.5-1.5,1.5-2.4,0" class="st4"/></svg>
\ No newline at end of file
diff --git a/assets/images/simple-illustrations/simple-illustration__tire.svg b/assets/images/simple-illustrations/simple-illustration__tire.svg
new file mode 100644
index 000000000000..db84f054568a
--- /dev/null
+++ b/assets/images/simple-illustrations/simple-illustration__tire.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" id="Layer_1" x="0" y="0" version="1.1" viewBox="0 0 68 68" style="enable-background:new 0 0 68 68" xml:space="preserve"><style type="text/css">.st0{fill:#28736d}.st1{fill:#4ba6a6}.st2{fill:#134038}.st3{fill:#d18000}.st4{fill:none;stroke:#002140;stroke-width:1;stroke-linecap:round;stroke-linejoin:round}</style><path d="M30.656,53.596c12.315,0,22.298-9.983,22.298-22.298S42.97,9,30.656,9C18.341,9,8.358,18.983,8.358,31.298	S18.341,53.596,30.656,53.596z" class="st0"/><path d="M36.722,10.039c0,0,16.655,4.553,15.616,23.161c-0.91,10.929-9.627,16.784-11.321,17.564	c-1.69,0.78-12.361,6.376-23.161-1.173l-4.423-4.165c0,0-1.91,0.235-2.082,1.69l-0.172,1.455c0,0-2.82,2.188-2.431,3.749	c0.392,1.561,6.635,5.726,21.337,5.855c14.702,0.129,24.592-3.122,25.894-4.816c1.302-1.69,0.055-3.474-0.651-3.643	c0,0-1.431-2.863-2.341-3.251c0,0,5.855-7.416,5.855-16.914c0-9.498-10.278-19.776-20.69-20.298c0,0-2.341-0.522-1.431,0.78	L36.722,10.039z" class="st1"/><path d="M29.565,41.659c6.253,0,11.321-5.069,11.321-11.321c0-6.253-5.069-11.321-11.321-11.321	c-6.253,0-11.321,5.069-11.321,11.321C18.243,36.59,23.312,41.659,29.565,41.659z" class="st2"/><path d="M30.149,33.851c1.904,0,3.447-1.543,3.447-3.447c0-1.904-1.543-3.447-3.447-3.447	c-1.904,0-3.447,1.543-3.447,3.447C26.702,32.308,28.246,33.851,30.149,33.851z" class="st3"/><path d="M17.954,49.682c-5.882-3.976-9.753-10.706-9.753-18.341c0-12.216,9.902-22.121,22.121-22.121	c12.219,0,22.121,9.902,22.121,22.121c0,12.219-9.902,22.121-22.121,22.121" class="st4"/><path d="M31.365,9.247c0,0,4.51-0.024,5.2-0.024c12.215,0,22.121,9.902,22.121,22.121	c0,8.486-4.78,15.855-11.792,19.564" class="st4"/><path d="M12.938,45.376c-0.518,0.4-1.043,0.808-1.416,1.345c-0.372,0.537-0.565,1.239-0.349,1.859	c0.169,0.486,0.573,0.863,1.027,1.11c0.455,0.247,0.961,0.372,1.459,0.502" class="st4"/><path d="M52.859,46.353c0.518,0.4,1.043,0.808,1.416,1.345c0.373,0.537,0.565,1.239,0.349,1.859	c-0.169,0.486-0.572,0.863-1.027,1.11c-0.455,0.243-0.961,0.373-1.459,0.502" class="st4"/><path d="M54.761,49.38c1.22,0.757,1.898,1.584,1.898,2.455c0,3.486-10.808,6.31-24.137,6.31	c-13.329,0-24.137-2.823-24.137-6.31c0-1.051,0.984-2.043,2.722-2.914" class="st4"/><path d="M29.844,41.752c6.253,0,11.321-5.069,11.321-11.321S36.096,19.11,29.844,19.11	c-6.253,0-11.322,5.069-11.322,11.322S23.591,41.752,29.844,41.752z" class="st4"/><path d="M30.063,33.851c1.941,0,3.514-1.573,3.514-3.514c0-1.941-1.573-3.514-3.514-3.514	c-1.941,0-3.514,1.573-3.514,3.514C26.549,32.278,28.122,33.851,30.063,33.851z" class="st4"/></svg>
\ No newline at end of file
diff --git a/assets/images/simple-illustrations/simple-illustration__treasurechest.svg b/assets/images/simple-illustrations/simple-illustration__treasurechest.svg
index 2bdee0c7e90f..622c611a9dc5 100644
--- a/assets/images/simple-illustrations/simple-illustration__treasurechest.svg
+++ b/assets/images/simple-illustrations/simple-illustration__treasurechest.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" id="Layer_1" x="0" y="0" version="1.1" viewBox="0 0 68 68" style="enable-background:new 0 0 68 68" xml:space="preserve"><style type="text/css">.st0{fill:#fee45e}.st1{fill:#002140}.st2{fill:#5cdca4}.st3{fill:#02ac68}.st4{fill:#ddb506}.st5{fill:#722b03}</style><g><path d="M46.1,16.2l-3-10.8l-9.6,7L24.3,5l-3,11.5l-12-0.1l4,10.9l-9.7,6.6l9.7,6.4L9.6,51.4l11.5-0.2l3.4,11.1l9.3-7 l9,6.9l3.4-11.1l12.1,0.3l-4.2-11.1l9.7-6.4l-9.9-6.6l4-10.8L46.1,16.2z" class="st0"/></g><g><path d="M43.1,63.2c-0.1,0-0.2,0-0.3-0.1l-9-7.3l-9,7.3c-0.1,0.1-0.3,0.1-0.5,0.1c-0.2-0.1-0.3-0.2-0.3-0.3l-3-11.2 L9.2,52.2c-0.2,0-0.3-0.1-0.4-0.2c-0.1-0.1-0.1-0.3-0.1-0.5l4.1-10.9l-9.7-6.4C3,34.2,2.9,34,2.9,33.9s0.1-0.3,0.2-0.4l9.7-6.4 L8.7,16.2c-0.1-0.2,0-0.3,0.1-0.5c0.1-0.1,0.3-0.2,0.4-0.2l11.6,0.6l3-11.2c0-0.2,0.2-0.3,0.3-0.3c0.2-0.1,0.3,0,0.5,0.1l9,7.3 l9-7.3c0.1-0.1,0.3-0.1,0.5-0.1c0.2,0.1,0.3,0.2,0.3,0.3l3,11.2l11.6-0.6c0.2,0,0.3,0.1,0.4,0.2s0.1,0.3,0.1,0.5l-4.1,10.9l9.7,6.4 c0.1,0.1,0.2,0.2,0.2,0.4s-0.1,0.3-0.2,0.4l-9.7,6.4l4.1,10.9c0.1,0.2,0,0.3-0.1,0.5c-0.1,0.1-0.2,0.2-0.4,0.2l-11.6-0.6l-3,11.2 c0,0.2-0.2,0.3-0.3,0.3C43.2,63.2,43.1,63.2,43.1,63.2z M21.2,50.6c0.2,0,0.4,0.2,0.5,0.4l2.9,10.9l8.8-7.1c0.2-0.1,0.4-0.1,0.6,0 l8.8,7.1l2.9-10.9c0.1-0.2,0.2-0.4,0.5-0.4l11.2,0.6l-4-10.5c-0.1-0.2,0-0.5,0.2-0.6l9.4-6.2l-9.4-6.2c-0.2-0.1-0.3-0.4-0.2-0.6 l4-10.5l-11.2,0.6c-0.3,0-0.4-0.1-0.5-0.4L42.8,5.9L34,13c-0.2,0.1-0.4,0.1-0.6,0l-8.8-7.1l-2.9,10.9c-0.1,0.2-0.3,0.4-0.5,0.4 L10,16.6l4,10.5c0.1,0.2,0,0.5-0.2,0.6l-9.4,6.2l9.4,6.2c0.2,0.1,0.3,0.4,0.2,0.6l-4,10.5L21.2,50.6C21.2,50.6,21.2,50.6,21.2,50.6 z" class="st1"/></g><g><path d="M32.5,39.2v10.3l-13.8-2.9l-0.2-7l0.7-3L32.5,39.2z" class="st2"/></g><g><path d="M32.8,39.1l9.7-2.4l0.7,5.4l-1,4.7l-9.7,2.7V39.2" class="st3"/></g><g><path d="M41.2,36.5L32,39.1l-11.7-2.5l-0.1-2.3c0,0,0.6-2.2,2.1-2.3c1.5-0.1,2.9,1.2,2.9,1.2l0.6,1.3l1.1-1.8l2.3-0.5 l1.9,1.3l0.3,1.5l1.3,0.1c0,0,0.1-2.7,2.1-2.6c2.1,0.1,3.2,2.6,3.2,2.6S41.2,35.2,41.2,36.5L41.2,36.5z" class="st4"/></g><g><path d="M28.3,38.5c0,0-0.8,3.2-3,2.9c-2.2-0.3-2.6-2.6-2.6-2.6l0.5-1.5L28.3,38.5L28.3,38.5z" class="st5"/></g><g><path d="M41.3,35.5l-3.2-0.4c0,0-0.1-1.8-1.1-2.3c-1-0.4-2-0.6-2-0.6l-2.1,1.3l-0.3,1.7L32,35.2l-1.4-2.7L28.2,32 l-3.2-6.4l11.6,1.8L41.3,35.5L41.3,35.5z" class="st1"/></g><g><path d="M42,36.2l-5.4-8.7c0,0,5-5.6,7.7-5.5c2.7,0.1,5.2,1.7,5.4,3.8c0.2,2.1-0.6,5.3-1.4,5.9 C47.5,32.2,42,36.2,42,36.2L42,36.2z" class="st3"/></g><g><path d="M36.6,27.5l-11.7-2.1c0,0,2.1-5.2,7.3-5.5c5.2-0.2,11.4,1.6,11.4,1.6S37.4,25.9,36.6,27.5L36.6,27.5z" class="st2"/></g><g><path d="M33.6,26.7l-4.8-0.7c0,0,1.7-2,3-1.7C33.1,24.5,33.8,25.6,33.6,26.7L33.6,26.7z" class="st5"/></g><g><path d="M32.6,39.5C32.6,39.5,32.6,39.5,32.6,39.5L18.8,37c-0.2,0-0.4-0.2-0.4-0.5c0-0.2,0.1-0.4,0.3-0.5l1.2-0.4 c0.3-0.1,0.5,0.1,0.6,0.3c0,0.1,0,0.3,0,0.4l12,2.3l9.5-2.7c0.3-0.1,0.5,0.1,0.6,0.3c0.1,0.3-0.1,0.5-0.3,0.6l-9.6,2.7 C32.7,39.5,32.7,39.5,32.6,39.5z" class="st1"/></g><g><path d="M32.6,50.1c-0.3,0-0.5-0.2-0.5-0.5V39.3c0-0.3,0.2-0.5,0.5-0.5s0.5,0.2,0.5,0.5v10.2 C33.1,49.9,32.9,50.1,32.6,50.1z" class="st1"/></g><g><path d="M25.1,48.4c-0.3,0-0.5-0.2-0.5-0.5v-6.2c0-0.3,0.2-0.5,0.5-0.5s0.5,0.2,0.5,0.5v6.2 C25.6,48.1,25.4,48.4,25.1,48.4z" class="st1"/></g><g><path d="M37.9,48.4c-0.3,0-0.5-0.2-0.5-0.5V37.7c0-0.3,0.2-0.5,0.5-0.5s0.5,0.2,0.5,0.5v10.2 C38.4,48.2,38.2,48.4,37.9,48.4z" class="st1"/></g><g><path d="M32.5,50.4c0,0-0.1,0-0.1,0l-13.6-3c-0.2,0-0.3-0.2-0.4-0.4c-1.1-4.4-0.1-10.2,0-10.4c0.1-0.3,0.3-0.5,0.6-0.4 c0.3,0,0.5,0.3,0.4,0.6c0,0.1-1,5.5-0.1,9.7l13.2,2.9l9.4-3.2c1.4-4.9-0.1-9.6-0.1-9.7c-0.1-0.3,0.1-0.5,0.3-0.6 c0.3-0.1,0.5,0.1,0.6,0.3c0.1,0.2,1.6,5.2,0,10.5c0,0.2-0.2,0.3-0.3,0.3l-9.8,3.3C32.6,50.4,32.6,50.4,32.5,50.4z M42.3,46.6 L42.3,46.6L42.3,46.6z" class="st1"/></g><g><path d="M25.5,41.9c-0.4,0-0.8-0.1-1.1-0.2c-0.8-0.3-1.5-0.9-1.8-1.7c-0.4-0.7-0.4-1.6-0.1-2.3 c0.1-0.2,0.1-0.4,0.3-0.6c0.1-0.2,0.4-0.3,0.7-0.2c0.2,0.1,0.3,0.5,0.2,0.7c-0.1,0.1-0.1,0.3-0.2,0.4c-0.2,0.5-0.2,1.1,0.1,1.6 c0.3,0.5,0.7,0.9,1.3,1.2c0.6,0.2,1.2,0.2,1.7-0.1c0.5-0.2,0.9-0.7,1.1-1.2c0.1-0.3,0.1-0.5,0.1-0.8c0-0.3,0.2-0.5,0.5-0.5 c0.3,0,0.5,0.2,0.5,0.5c0,0.4,0,0.8-0.2,1.2c-0.3,0.8-0.9,1.4-1.6,1.8C26.4,41.8,25.9,41.9,25.5,41.9z" class="st1"/></g><g><path d="M25.3,39.8c0.4,0,0.7-0.3,0.7-0.7c0-0.4-0.3-0.7-0.7-0.7c-0.4,0-0.7,0.3-0.7,0.7 C24.5,39.4,24.8,39.8,25.3,39.8z" class="st1"/></g><g><path d="M25.5,39.3l0,1.1c0,0.2-0.1,0.3-0.3,0.2l-0.6-0.1c-0.1,0-0.2-0.2-0.2-0.3l0.4-0.9" class="st1"/></g><g><path d="M34.8,38.6c-0.3,0-0.5-0.2-0.5-0.5c0-1.2-1-2.2-2.2-2.2c-1.2,0-2.2,1-2.2,2.2c0,0.3-0.2,0.5-0.5,0.5 s-0.5-0.2-0.5-0.5c0-1.8,1.4-3.2,3.2-3.2c1.8,0,3.2,1.4,3.2,3.2C35.3,38.4,35.1,38.6,34.8,38.6z" class="st1"/></g><g><path d="M31.6,35.4c-0.3,0-0.5-0.2-0.5-0.5c0-1.2-1-2.2-2.2-2.2c-1.2,0-2.2,1-2.2,2.2c0,0.3-0.2,0.5-0.5,0.5 s-0.5-0.2-0.5-0.5c0-1.8,1.4-3.2,3.2-3.2c1.8,0,3.2,1.4,3.2,3.2C32.1,35.1,31.9,35.4,31.6,35.4z" class="st1"/></g><g><path d="M28.6,38.3c-0.3,0-0.5-0.2-0.5-0.5c0-1.2-1-2.2-2.2-2.2c-1,0-1.9,0.7-2.2,1.7c-0.1,0.3-0.3,0.4-0.6,0.4 c-0.3-0.1-0.4-0.3-0.4-0.6c0.4-1.4,1.6-2.4,3.1-2.4c1.8,0,3.2,1.4,3.2,3.2C29.1,38,28.9,38.3,28.6,38.3z" class="st1"/></g><g><path d="M20.7,37.1c-0.2,0-0.3-0.1-0.4-0.2c-0.7-1-0.6-2.5-0.2-3.6c0.5-1.2,1.6-1.9,2.9-1.9c1.8,0,3.2,1.4,3.2,3.2 c0,0.3-0.2,0.5-0.5,0.5s-0.5-0.2-0.5-0.5c0-1.2-1-2.2-2.2-2.2c-0.9,0-1.6,0.5-2,1.3c-0.3,0.8-0.4,2,0.1,2.6 c0.2,0.2,0.1,0.5-0.1,0.7C20.9,37.1,20.8,37.1,20.7,37.1z" class="st1"/></g><g><path d="M38,35.6c-0.3,0-0.5-0.2-0.5-0.5c0-1.2-1-2.2-2.2-2.2c-1.2,0-2.2,1-2.2,2.2c0,0.3-0.2,0.5-0.5,0.5 s-0.5-0.2-0.5-0.5c0-1.8,1.4-3.2,3.2-3.2s3.2,1.4,3.2,3.2C38.5,35.4,38.3,35.6,38,35.6z" class="st1"/></g><g><path d="M36.3,38.2c-0.3,0-0.5-0.2-0.5-0.5c0-1.8,1.4-3.2,3.2-3.2c1.2,0,2.3,0.7,2.9,1.8c0.1,0.2,0,0.5-0.2,0.7 c-0.2,0.1-0.5,0-0.7-0.2c-0.4-0.8-1.1-1.2-2-1.2c-1.2,0-2.2,1-2.2,2.2C36.8,38,36.6,38.2,36.3,38.2z" class="st1"/></g><g><path d="M36.6,27.9c-0.1,0-0.2,0-0.3-0.1c-0.2-0.2-0.2-0.5-0.1-0.7c0.2-0.2,3.4-3.9,6.6-5.2c-3.2-0.6-8.2-1.6-10-1.6 c-3.8-0.2-6.2,2.9-7.4,5.6c-0.1,0.2-0.4,0.4-0.7,0.2c-0.2-0.1-0.4-0.4-0.2-0.7c2-4.2,4.9-6.3,8.4-6.1c0.1,0,9.6,1.3,12.5,2.1 c0.1,0,0.2,0,0.3,0l0.1,0l0,0.1c0.2,0.1,0.3,0.1,0.4,0.2c0.1,0.2,0.1,0.4-0.1,0.5c-0.2,0.2-0.3,0.2-0.5,0.2v0c0,0,0,0,0,0 c0,0-0.1,0-0.1,0c-2.7-0.6-7.1,3.7-8.5,5.4C36.9,27.9,36.7,27.9,36.6,27.9z" class="st1"/></g><g><path d="M42.2,36.9C42.2,36.9,42.1,36.9,42.2,36.9c-0.2,0-0.3-0.1-0.4-0.2l-5.4-8.7l-10.4-1.6l3.2,5.4 c0.1,0.2,0.1,0.5-0.2,0.7c-0.2,0.1-0.5,0.1-0.7-0.2l-3.8-6.3c-0.1-0.2-0.1-0.4,0-0.5c0.1-0.2,0.3-0.2,0.5-0.2l11.7,1.8 c0.1,0,0.3,0.1,0.3,0.2l5.2,8.4c1.6-1.4,5.3-4.2,5.4-4.3c0,0,2.9-2.5,1.6-5.7c-1.2-3-4.4-3.4-4.5-3.4c-0.3,0-0.5-0.3-0.4-0.6 c0-0.3,0.3-0.5,0.6-0.4c0.2,0,3.9,0.5,5.3,4c1.3,3.4-1.2,6.3-2,6.8c-0.6,0.4-4.8,3.6-5.7,4.6C42.4,36.8,42.3,36.9,42.2,36.9z" class="st1"/></g><g><path d="M33.7,27.2c0,0-0.1,0-0.1,0c-0.3-0.1-0.4-0.4-0.3-0.6c0-0.1,0.1-0.3,0.1-0.4c0-0.9-0.8-1.6-1.9-1.6 s-1.9,0.7-1.9,1.6c0,0.3-0.2,0.5-0.5,0.5s-0.5-0.2-0.5-0.5c0-1.4,1.3-2.6,2.9-2.6s2.9,1.1,2.9,2.6c0,0.2,0,0.5-0.1,0.7 C34.1,27.1,33.9,27.2,33.7,27.2z" class="st1"/></g><g><path d="M32.3,24.7c-0.1,0-0.1,0-0.2,0c-0.3-0.1-0.4-0.4-0.3-0.7c0.1-0.2,1.7-3.9,7-3.9c0,0,0.1,0,0.1,0 c0.3,0,0.5,0.2,0.5,0.5c0,0.3-0.2,0.5-0.5,0.5c0,0-0.1,0-0.1,0c-4.6,0-6,3.1-6,3.3C32.7,24.6,32.5,24.7,32.3,24.7z" class="st1"/></g></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" id="Layer_1" x="0" y="0" version="1.1" viewBox="0 0 68 68" style="enable-background:new 0 0 68 68" xml:space="preserve"><style type="text/css">.st0{fill:#fee45e}.st1{fill:none;stroke:#002140;stroke-linecap:round;stroke-linejoin:round}.st2{fill:#5be3aa}.st3{fill:#00b268}.st4{fill:#e4bc07}.st5{fill:#722b03}.st6{fill:#002140}</style><path d="M46.133,16.244L43.138,5.47l-9.574,7.035l-9.281-7.482l-2.99,11.522L9.32,16.397l4.041,10.923l-9.723,6.584	l9.723,6.431L9.622,51.41l11.522-0.153l3.441,11.076l9.277-7.035l8.979,6.886l3.441-11.076l12.118,0.302L54.21,40.335l9.727-6.431	l-9.876-6.584l4.041-10.774L46.133,16.244z" class="st0"/><path d="M64,33.863l-10.057,6.575l4.271,11.234l-12.005-0.6l-3.134,11.604l-9.362-7.545l-9.362,7.545l-3.134-11.604	l-12.005,0.6l4.271-11.234L3.425,33.863l10.057-6.571L9.211,16.059l12.005,0.6l3.134-11.604l9.362,7.545l9.362-7.545l3.134,11.604	l12.005-0.6l-4.271,11.234L64,33.863z" class="st1"/><path d="M32.468,39.207v10.336l-13.773-2.85l-0.198-6.954l0.726-3.049L32.468,39.207z" class="st2"/><path d="M32.802,39.076l9.737-2.386l0.663,5.434l-0.997,4.699l-9.736,2.719V39.207" class="st3"/><path d="M41.213,36.492l-9.204,2.647l-11.658-2.517l-0.131-2.318c0,0,0.595-2.187,2.12-2.25	c1.524-0.068,2.85,1.19,2.85,1.19l0.595,1.258l1.128-1.79l2.318-0.465l1.921,1.326l0.329,1.524l1.326,0.068	c0,0,0.068-2.715,2.119-2.584c2.052,0.131,3.179,2.584,3.179,2.584s3.112,0.068,3.112,1.326H41.213z" class="st4"/><path d="M28.296,38.549c0,0-0.794,3.179-2.981,2.913c-2.187-0.266-2.647-2.584-2.647-2.584l0.464-1.524l5.168,1.19	L28.296,38.549z" class="st5"/><path d="M41.312,35.55l-3.211-0.379c0,0-0.068-1.804-1.06-2.25c-0.992-0.446-2.038-0.645-2.038-0.645l-2.088,1.339	l-0.347,1.691l-0.546-0.099l-1.389-2.683l-2.386-0.496l-3.179-6.408l11.572,1.84l4.667,8.095L41.312,35.55z" class="st6"/><path d="M42.006,36.195L36.64,27.45c0,0,5.015-5.615,7.698-5.466s5.218,1.691,5.416,3.775	c0.198,2.083-0.595,5.317-1.439,5.863c-0.843,0.546-6.309,4.568-6.309,4.568V36.195z" class="st3"/><path d="M36.644,27.455l-11.721-2.088c0,0,2.088-5.218,7.301-5.466c5.213-0.248,11.373,1.637,11.373,1.637	s-6.16,4.37-6.954,5.912V27.455z" class="st2"/><path d="M33.614,26.657l-4.767-0.744c0,0,1.691-2.038,2.981-1.741c1.29,0.298,1.989,1.439,1.79,2.485H33.614z" class="st5"/><path d="M42.273,36.361l-9.637,2.683l-13.709-2.584l1.209-0.401" class="st1"/><path d="M32.635,39.342v10.233" class="st1"/><path d="M25.085,41.625v6.228" class="st1"/><path d="M37.934,37.719V47.92" class="st1"/><path d="M42.272,36.362c0,0,1.556,5.001,0,10.233l-9.768,3.31l-13.642-2.981c-1.091-4.37,0-10.233,0-10.233" class="st1"/><path d="M23.12,37.399c-0.09,0.149-0.171,0.307-0.23,0.478c-0.492,1.357,0.252,2.868,1.655,3.373	c1.403,0.505,2.94-0.185,3.427-1.542c0.122-0.338,0.167-0.69,0.144-1.028" class="st1"/><path d="M25.253,39.753c0.411,0,0.744-0.333,0.744-0.744c0-0.411-0.333-0.744-0.744-0.744	c-0.411,0-0.744,0.333-0.744,0.744C24.508,39.42,24.842,39.753,25.253,39.753z" class="st6"/><path d="M25.55,39.342l0.05,1.055c0.009,0.153-0.131,0.275-0.28,0.243l-0.636-0.122	c-0.149-0.027-0.234-0.189-0.171-0.329l0.406-0.92" class="st6"/><path d="M34.822,38.116c0-1.502-1.218-2.715-2.715-2.715c-1.502,0-2.715,1.218-2.715,2.715" class="st1"/><path d="M31.642,34.869c0-1.502-1.218-2.715-2.715-2.715c-1.502,0-2.715,1.218-2.715,2.715" class="st1"/><path d="M28.581,37.759c0-1.502-1.218-2.715-2.715-2.715c-1.276,0-2.345,0.879-2.638,2.061" class="st1"/><path d="M25.681,34.67c0-1.502-1.218-2.715-2.715-2.715c-1.078,0-1.993,0.613-2.426,1.596	c-0.388,0.879-0.483,2.273,0.122,3.085" class="st1"/><path d="M38.002,35.135c0-1.502-1.218-2.715-2.715-2.715s-2.715,1.218-2.715,2.715" class="st1"/><path d="M41.496,36.515c-0.442-0.897-1.366-1.511-2.435-1.511c-1.502,0-2.715,1.218-2.715,2.715" class="st1"/><path d="M24.887,25.633c1.042-2.187,3.427-6.111,7.896-5.863c3.031,0.05,14.368,2.458,12.817,2.138	c-3.621-0.726-8.992,5.515-8.992,5.515" class="st1"/><path d="M44.856,21.759c0,0,3.576,0.397,4.866,3.675c1.29,3.278-1.389,5.962-1.79,6.26	c-0.401,0.298-4.767,3.599-5.763,4.667l-5.565-8.943l-11.721-1.79l3.793,6.332" class="st1"/><path d="M33.713,26.72c0.05-0.167,0.077-0.347,0.077-0.528c0-1.136-1.055-2.061-2.359-2.061s-2.359,0.924-2.359,2.061" class="st1"/><path d="M32.337,24.19c0,0,1.538-3.626,6.607-3.576" class="st1"/></svg>
\ No newline at end of file
diff --git a/assets/images/simple-illustrations/simple-illustration__twocards-horizontal.svg b/assets/images/simple-illustrations/simple-illustration__twocards-horizontal.svg
new file mode 100644
index 000000000000..f9210b2cb8a8
--- /dev/null
+++ b/assets/images/simple-illustrations/simple-illustration__twocards-horizontal.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" id="Layer_1" x="0" y="0" version="1.1" viewBox="0 0 68 68" style="enable-background:new 0 0 68 68" xml:space="preserve"><style type="text/css">.st0{fill:#e4bc07}.st1,.st2{fill:none;stroke:#002140;stroke-width:1;stroke-linecap:round;stroke-linejoin:round}.st2{fill:#002140}.st3{fill:#ff7101}.st4{fill:#fbccff}.st5{fill:#002140}</style><path d="M46.224,18.69H10.038c-1.869,0-3.384,1.515-3.384,3.384v18.543c0,1.869,1.515,3.384,3.384,3.384h36.187	c1.869,0,3.384-1.515,3.384-3.384V22.074C49.608,20.205,48.093,18.69,46.224,18.69z" class="st0"/><path d="M45.621,18.577H10.514c-2.234,0-4.045,1.811-4.045,4.045V39.83c0,2.234,1.811,4.045,4.045,4.045h35.107	c2.234,0,4.045-1.811,4.045-4.045V22.623C49.667,20.389,47.856,18.577,45.621,18.577z" class="st1"/><path d="M49.356,23.338H6.537v3.784h42.819V23.338z" class="st2"/><path d="M58.439,24.651l-36.187,0.17c-1.869,0.009-3.377,1.531-3.368,3.4l0.087,18.543	c0.009,1.869,1.531,3.377,3.4,3.368l36.187-0.17c1.869-0.009,3.377-1.531,3.368-3.4l-0.087-18.543	C61.83,26.15,60.308,24.642,58.439,24.651z" class="st3"/><path d="M57.835,24.537l-35.107,0.165c-2.234,0.01-4.037,1.83-4.026,4.064l0.081,17.207	c0.011,2.234,1.83,4.037,4.064,4.026l35.107-0.165c2.234-0.011,4.037-1.83,4.026-4.064L61.9,28.563	C61.889,26.329,60.069,24.526,57.835,24.537z" class="st1"/><path d="M22.862,45.873l5.841-0.027" class="st1"/><path d="M31.38,45.832l5.841-0.027" class="st1"/><path d="M31.627,38.655l-0.022-4.761c0-0.248-0.472-0.445-1.048-0.445l-3.802,0.018c-0.324,0-0.63,0.068-0.828,0.176	l-1.292,0.72c-0.144,0.081-0.22,0.175-0.22,0.275l0.018,3.46c0,0.09,0.067,0.18,0.189,0.257l0.972,0.594	c0.198,0.122,0.522,0.189,0.864,0.189l4.131-0.027C31.164,39.11,31.632,38.903,31.627,38.655z" class="st4"/><path d="M54.748,32.957l-12.685,0.06c-1.588,0.007-2.869,1.301-2.862,2.889c0.007,1.588,1.301,2.869,2.889,2.862	l12.685-0.06c1.588-0.007,2.869-1.301,2.862-2.889S56.336,32.949,54.748,32.957z" class="st5"/></svg>
\ No newline at end of file
diff --git a/assets/images/simple-illustrations/simple-illustration__virtualcard.svg b/assets/images/simple-illustrations/simple-illustration__virtualcard.svg
new file mode 100644
index 000000000000..6a96a874b97e
--- /dev/null
+++ b/assets/images/simple-illustrations/simple-illustration__virtualcard.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" id="Layer_1" x="0" y="0" version="1.1" viewBox="0 0 68 68" style="enable-background:new 0 0 68 68" xml:space="preserve"><style type="text/css">.st0{fill:#cf4cd9}.st1{fill:#49225b}.st2{fill:#fed607}.st3{fill:#fff2b2}.st4{fill:none;stroke:#002140;stroke-linecap:round;stroke-linejoin:round}.st5{fill:#03d47c}.st6{fill:#8eecc4}.st7{fill:#002140}.st8{fill-rule:evenodd;clip-rule:evenodd;fill:#fed607}</style><path d="M36.899,8.004L11.933,8.052L7,12.411l0.191,41.356c0,0,0.689,4.615,4.567,5.471	c3.877,0.857,21.595,0.514,24.591,0.514s5.121-4.77,5.121-4.77s-0.231-38.021-0.032-41.312C41.638,10.379,36.903,8,36.903,8	L36.899,8.004z" class="st0"/><path d="M7.072,54.194c-0.076,3.264,3.953,4.989,3.953,4.989l2.602,0.255l-2.602-3.064V11.156l2.734-3.152L11.025,8.41	l-3.666,3.208c0,0-0.207,39.312-0.283,42.575H7.072z" class="st1"/><path d="M38.374,12.156h-24.46v43.632h24.723L38.374,12.156z" class="st2"/><path d="M25.203,12.292c-0.279,1.004,0.311,2.1,1.18,2.678c0.869,0.578,1.949,0.733,2.993,0.761	c1.044,0.028,2.096-0.052,3.124,0.12c0.279,0.048,0.566,0.116,0.789,0.287c0.231,0.171,0.379,0.434,0.49,0.701	c0.737,1.729,0.259,3.722,0.526,5.583c0.072,0.49,0.199,0.984,0.47,1.399c0.745,1.136,2.383,1.363,3.67,0.92V12.156L25.203,12.292	L25.203,12.292z" class="st3"/><path d="M38.167,27.996c-1.028-0.092-1.968,0.701-2.383,1.646c-0.418,0.944-0.426,2.008-0.426,3.041	c0,1.502-0.008,3.005-0.008,4.507c0,1.152,0,2.343,0.446,3.407c0.446,1.064,1.446,1.981,2.602,1.961L38.175,28L38.167,27.996z" class="st3"/><path d="M35.767,8.004H12.862c-3.132,0-5.671,2.539-5.671,5.671v40.093c0,3.132,2.539,5.671,5.671,5.671h22.906	c3.132,0,5.671-2.539,5.671-5.671V13.674C41.438,10.543,38.899,8.004,35.767,8.004z" class="st4"/><path d="M16.233,59.438c-3.132,0-5.671-2.538-5.671-5.671V13.674c0-3.132,2.538-5.671,5.671-5.671" class="st4"/><path d="M37.378,12.057H15.13c-0.645,0-1.168,0.523-1.168,1.168v41.412c0,0.645,0.523,1.168,1.168,1.168h22.248	c0.645,0,1.168-0.523,1.168-1.168V13.224C38.546,12.58,38.023,12.057,37.378,12.057z" class="st4"/><path d="M60.325,15.125H21.126c-1.621,0-2.934,1.314-2.934,2.935v20.686c0,1.621,1.314,2.935,2.934,2.935h39.199	c1.621,0,2.934-1.314,2.934-2.935V18.059C63.259,16.439,61.946,15.125,60.325,15.125z" class="st5"/><path d="M59.818,15H21.508C19.571,15,18,16.571,18,18.508v19.527c0,1.938,1.571,3.508,3.508,3.508h38.309	c1.938,0,3.508-1.571,3.508-3.508V18.508C63.326,16.571,61.755,15,59.818,15z" class="st4"/><path d="M22.269,37.2l6.131,0.008" class="st4"/><path d="M31.209,37.208l6.127,0.008" class="st4"/><path d="M31.51,29.677v-4.995c0.004-0.262-0.488-0.472-1.093-0.472h-3.992c-0.339,0-0.66,0.062-0.866,0.176	l-1.362,0.749c-0.148,0.082-0.23,0.183-0.23,0.289v3.629c0,0.098,0.066,0.191,0.191,0.269l1.018,0.628	c0.207,0.129,0.546,0.203,0.905,0.203h4.332c0.605-0.004,1.093-0.215,1.097-0.472V29.677z" class="st6"/><path d="M58.724,19H42.619C41.725,19,41,19.725,41,20.619v2.794c0,0.894,0.725,1.619,1.619,1.619h16.105	c0.894,0,1.62-0.725,1.62-1.619v-2.794C60.344,19.725,59.619,19,58.724,19z" class="st7"/><circle cx="27" cy="48" r="4" class="st7"/><path d="M29.156,46.017c0.267,0.197,0.323,0.573,0.126,0.839l-2.611,3.536l-1.876-1.713	c-0.245-0.223-0.262-0.603-0.038-0.848c0.223-0.245,0.603-0.262,0.848-0.038l0.893,0.815l1.82-2.464	C28.514,45.877,28.89,45.82,29.156,46.017z" class="st8"/></svg>
\ No newline at end of file
diff --git a/assets/images/simple-illustrations/simple-illustration__workflows.svg b/assets/images/simple-illustrations/simple-illustration__workflows.svg
index b684c58126f7..c11d2663997f 100644
--- a/assets/images/simple-illustrations/simple-illustration__workflows.svg
+++ b/assets/images/simple-illustrations/simple-illustration__workflows.svg
@@ -1,153 +1 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 28.1.0, 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 68 68" style="enable-background:new 0 0 68 68;" xml:space="preserve">
-<style type="text/css">
-	.st0{fill:#5AB0FF;}
-	.st1{fill:#B0D9FF;}
-	.st2{fill:#003C73;}
-	.st3{fill:none;stroke:#003C73;stroke-linecap:round;stroke-linejoin:round;}
-</style>
-<path class="st0" d="M42.092,53.935v4.182c0,1.066-0.564,1.569-1.602,1.569h-9.171c-0.568,0-0.991-0.155-1.264-0.465l-0.042-0.056
-	c-0.197-0.254-0.291-0.601-0.291-1.048v-4.182c0-1.071,0.564-1.574,1.597-1.574h9.171c0.55,0,0.968,0.141,1.236,0.432v0.009
-	C41.97,53.061,42.092,53.437,42.092,53.935z"/>
-<path class="st0" d="M42.092,33.019v4.182c0,1.066-0.564,1.569-1.602,1.569h-9.171c-0.568,0-0.991-0.155-1.264-0.465l-0.042-0.056
-	c-0.197-0.254-0.291-0.601-0.291-1.048v-4.182c0-1.071,0.564-1.574,1.597-1.574h9.171c0.55,0,0.968,0.141,1.236,0.432v0.009
-	C41.97,32.145,42.092,32.521,42.092,33.019z"/>
-<path class="st0" d="M42.092,12.105v4.182c0,1.067-0.564,1.569-1.602,1.569h-9.171c-0.568,0-0.991-0.155-1.264-0.465l-0.042-0.056
-	c-0.197-0.254-0.291-0.601-0.291-1.048v-4.182c0-1.071,0.564-1.574,1.597-1.574h9.171c0.55,0,0.968,0.141,1.236,0.432v0.009
-	C41.97,11.231,42.092,11.607,42.092,12.105z"/>
-<path class="st1" d="M12.958,49.139H9.308c-0.569,0-0.991-0.155-1.264-0.465l-0.042-0.056C7.804,48.364,7.71,48.016,7.71,47.57
-	v-4.182c0-1.071,0.564-1.574,1.597-1.574h9.171c0.55,0,0.968,0.141,1.236,0.432v0.009c0.244,0.258,0.366,0.634,0.366,1.132v4.182
-	c0,1.067-0.564,1.569-1.602,1.569H12.958z"/>
-<path class="st1" d="M62,22.471v4.181c0,1.067-0.564,1.569-1.602,1.569h-9.171c-0.568,0-0.991-0.155-1.264-0.465L49.92,27.7
-	c-0.197-0.254-0.291-0.601-0.291-1.048v-4.181c0-1.071,0.564-1.574,1.597-1.574h9.171c0.55,0,0.968,0.141,1.236,0.432v0.009
-	C61.878,21.597,62,21.972,62,22.471z"/>
-<path class="st1" d="M17.567,11.626c0.536,0.714,0.85,1.607,0.85,2.57c0,2.377-1.926,4.304-4.304,4.304
-	c-1.184,0-2.265-0.484-3.045-1.259c-0.78-0.78-1.264-1.856-1.264-3.045c0-2.377,1.931-4.304,4.304-4.304
-	c1.414,0,2.664,0.677,3.449,1.729c0,0,0.005,0,0.005,0.005H17.567z"/>
-<path class="st2" d="M56.531,55.687l-5.826,4.506v-9.012L56.531,55.687z"/>
-<path class="st2" d="M29.722,53.936v4.181c0,0.446,0.099,0.794,0.291,1.048l-1.071-1.372l-0.038-0.07
-	c-0.127-0.235-0.188-0.531-0.188-0.893v-4.182c0-1.071,0.564-1.574,1.597-1.574h9.171c0.489,0,0.874,0.113,1.142,0.348l0.066,0.066
-	l1.034,1.311c-0.268-0.291-0.686-0.432-1.236-0.432h-9.171c-1.038,0-1.597,0.503-1.597,1.574V53.936z"/>
-<path class="st2" d="M18.478,41.809H9.307c-1.038,0-1.597,0.503-1.597,1.574v4.182c0,0.446,0.099,0.794,0.291,1.048L6.929,47.24
-	l-0.038-0.07c-0.127-0.235-0.188-0.531-0.188-0.893v-4.181c0-1.071,0.564-1.574,1.597-1.574h9.171c0.489,0,0.874,0.113,1.142,0.348
-	l0.066,0.066l1.034,1.311c-0.268-0.291-0.686-0.432-1.236-0.432V41.809z"/>
-<path class="st2" d="M60.6,20.022l1.034,1.311c-0.268-0.291-0.686-0.432-1.236-0.432h-9.171c-1.038,0-1.597,0.503-1.597,1.574v4.182
-	c0,0.446,0.099,0.794,0.291,1.048l-1.071-1.372l-0.038-0.071c-0.127-0.235-0.188-0.531-0.188-0.893v-4.181
-	c0-1.071,0.564-1.574,1.597-1.574h9.171c0.489,0,0.874,0.113,1.142,0.348l0.066,0.066V20.022z"/>
-<path class="st2" d="M29.722,12.107v4.182c0,0.446,0.099,0.794,0.291,1.048l-1.071-1.372l-0.038-0.07
-	c-0.127-0.235-0.188-0.531-0.188-0.893v-4.177c0-1.071,0.564-1.574,1.597-1.574h9.171c0.489,0,0.874,0.113,1.142,0.348l0.066,0.066
-	l1.034,1.311c-0.268-0.291-0.686-0.432-1.236-0.432h-9.171c-1.038,0-1.597,0.503-1.597,1.574V12.107z"/>
-<path class="st2" d="M16.045,9.766l0.127,0.127c0.677,0.677,1.071,1.222,1.391,1.729c-0.785-1.052-2.034-1.729-3.449-1.729
-	c-2.377,0-4.304,1.931-4.304,4.304c0,1.189,0.484,2.265,1.264,3.045l-0.019,0.019c-0.667-0.625-1.146-1.297-1.55-1.992
-	C9.063,14.591,8.8,13.783,8.8,12.909c0-2.373,1.931-4.304,4.304-4.304c1.132,0,2.166,0.442,2.937,1.161H16.045z"/>
-<path class="st2" d="M29.722,33.018v4.182c0,0.446,0.099,0.794,0.291,1.048l-1.071-1.372l-0.038-0.07
-	c-0.127-0.235-0.188-0.531-0.188-0.893V31.73c0-1.071,0.564-1.574,1.597-1.574h9.171c0.489,0,0.874,0.113,1.142,0.348l0.066,0.066
-	l1.034,1.311c-0.268-0.291-0.686-0.432-1.236-0.432h-9.171c-1.038,0-1.597,0.503-1.597,1.574V33.018z"/>
-<path class="st3" d="M17.567,11.626c0.536,0.714,0.85,1.607,0.85,2.57c0,2.377-1.926,4.304-4.304,4.304
-	c-1.184,0-2.265-0.484-3.045-1.259c-0.78-0.78-1.264-1.856-1.264-3.045c0-2.377,1.931-4.304,4.304-4.304
-	c1.414,0,2.664,0.677,3.449,1.729"/>
-<path class="st3" d="M31.323,10.531h9.167"/>
-<path class="st3" d="M31.323,17.857h9.167"/>
-<path class="st3" d="M42.092,12.106v1.757v2.424"/>
-<path class="st3" d="M29.721,12.106v4.182"/>
-<path class="st3" d="M29.721,12.105c0-1.071,0.564-1.574,1.597-1.574"/>
-<path class="st3" d="M41.726,10.964c-0.268-0.291-0.686-0.432-1.236-0.432"/>
-<path class="st3" d="M42.092,12.105c0-0.493-0.122-0.869-0.362-1.132"/>
-<path class="st3" d="M30.06,17.391c0.268,0.31,0.695,0.465,1.264,0.465"/>
-<path class="st3" d="M29.721,16.287c0,0.446,0.099,0.794,0.291,1.048"/>
-<path class="st3" d="M42.092,16.287c0,1.067-0.564,1.569-1.602,1.569"/>
-<path class="st3" d="M9.505,15.268C9.063,14.591,8.8,13.783,8.8,12.909c0-2.373,1.931-4.304,4.304-4.304
-	c1.132,0,2.166,0.442,2.937,1.161"/>
-<path class="st3" d="M30.314,9.25h9.171"/>
-<path class="st3" d="M28.716,10.822v4.177"/>
-<path class="st3" d="M28.716,10.824c0-1.071,0.564-1.574,1.597-1.574"/>
-<path class="st3" d="M40.627,9.592c-0.268-0.23-0.653-0.348-1.142-0.348"/>
-<path class="st3" d="M28.716,15c0,0.362,0.066,0.658,0.188,0.893"/>
-<path class="st3" d="M17.567,11.626c0,0,0,0-0.005-0.005c-0.319-0.507-0.714-1.057-1.391-1.729"/>
-<path class="st3" d="M11.092,17.293c0,0-0.023-0.024-0.038-0.033c-0.667-0.625-1.146-1.297-1.551-1.992"/>
-<path class="st3" d="M30.059,17.391l-0.042-0.056l-1.076-1.372"/>
-<path class="st3" d="M41.731,10.974l-0.005-0.009l-1.034-1.306"/>
-<path class="st3" d="M51.227,20.896h9.171"/>
-<path class="st3" d="M51.227,28.221h4.492h4.68"/>
-<path class="st3" d="M61.995,22.471v4.182"/>
-<path class="st3" d="M49.629,22.471v4.182"/>
-<path class="st3" d="M49.629,22.471c0-1.071,0.564-1.574,1.597-1.574"/>
-<path class="st3" d="M61.633,21.329c-0.268-0.291-0.686-0.432-1.236-0.432"/>
-<path class="st3" d="M62,22.47c0-0.493-0.122-0.869-0.362-1.132"/>
-<path class="st3" d="M49.963,27.756c0.268,0.31,0.695,0.465,1.264,0.465"/>
-<path class="st3" d="M49.629,26.652c0,0.446,0.099,0.794,0.291,1.048"/>
-<path class="st3" d="M62,26.652c0,1.067-0.564,1.569-1.602,1.569"/>
-<path class="st3" d="M50.216,19.613h5.272h3.9"/>
-<path class="st3" d="M48.619,21.188v4.182"/>
-<path class="st3" d="M48.619,21.187c0-1.071,0.564-1.574,1.597-1.574"/>
-<path class="st3" d="M60.529,19.957c-0.268-0.23-0.653-0.348-1.142-0.348"/>
-<path class="st3" d="M48.619,25.369c0,0.362,0.066,0.658,0.188,0.893"/>
-<path class="st3" d="M49.962,27.756L49.92,27.7l-1.071-1.372"/>
-<path class="st3" d="M61.638,21.339l-0.005-0.009l-1.034-1.306"/>
-<path class="st3" d="M9.307,41.809h9.171"/>
-<path class="st3" d="M9.307,49.139h3.651h5.521"/>
-<path class="st3" d="M20.076,43.383v4.182"/>
-<path class="st3" d="M7.71,43.383v4.182"/>
-<path class="st3" d="M7.71,43.383c0-1.071,0.564-1.574,1.597-1.574"/>
-<path class="st3" d="M19.715,42.247c-0.268-0.291-0.686-0.432-1.236-0.432"/>
-<path class="st3" d="M20.081,43.382c0-0.493-0.122-0.869-0.362-1.132"/>
-<path class="st3" d="M8.043,48.674c0.268,0.31,0.695,0.465,1.264,0.465"/>
-<path class="st3" d="M7.71,47.564c0,0.446,0.099,0.794,0.291,1.048"/>
-<path class="st3" d="M20.081,47.564c0,1.067-0.564,1.569-1.602,1.569"/>
-<path class="st3" d="M8.297,40.527h4.891h4.28"/>
-<path class="st3" d="M6.699,42.1v4.182"/>
-<path class="st3" d="M6.699,42.101c0-1.071,0.564-1.574,1.597-1.574"/>
-<path class="st3" d="M18.61,40.875c-0.268-0.23-0.653-0.348-1.142-0.348"/>
-<path class="st3" d="M6.699,46.281c0,0.362,0.066,0.658,0.188,0.893"/>
-<path class="st3" d="M8.043,48.674l-0.042-0.061L6.93,47.246"/>
-<path class="st3" d="M19.719,42.256l-0.005-0.009l-1.034-1.311"/>
-<path class="st3" d="M31.323,31.445h9.167"/>
-<path class="st3" d="M31.323,38.77h9.167"/>
-<path class="st3" d="M42.092,33.018v4.182"/>
-<path class="st3" d="M29.721,33.018v4.182"/>
-<path class="st3" d="M29.721,33.019c0-1.071,0.564-1.574,1.597-1.574"/>
-<path class="st3" d="M41.726,31.882c-0.268-0.291-0.686-0.432-1.236-0.432"/>
-<path class="st3" d="M42.092,33.019c0-0.493-0.122-0.869-0.362-1.132"/>
-<path class="st3" d="M30.06,38.309c0.268,0.31,0.695,0.465,1.264,0.465"/>
-<path class="st3" d="M29.721,37.199c0,0.446,0.099,0.794,0.291,1.048"/>
-<path class="st3" d="M42.092,37.199c0,1.067-0.564,1.569-1.602,1.569"/>
-<path class="st3" d="M30.314,30.162h9.171"/>
-<path class="st3" d="M28.716,31.736v4.182"/>
-<path class="st3" d="M28.716,31.736c0-1.071,0.564-1.574,1.597-1.574"/>
-<path class="st3" d="M40.627,30.504c-0.268-0.23-0.653-0.348-1.142-0.348"/>
-<path class="st3" d="M28.716,35.918c0,0.362,0.066,0.658,0.188,0.893"/>
-<path class="st3" d="M30.059,38.309l-0.042-0.061l-1.076-1.367"/>
-<path class="st3" d="M41.731,31.891l-0.005-0.009l-1.034-1.311"/>
-<path class="st3" d="M31.323,52.357h9.167"/>
-<path class="st3" d="M31.323,59.688h9.167"/>
-<path class="st3" d="M42.092,53.936v4.177"/>
-<path class="st3" d="M29.721,53.936v4.177"/>
-<path class="st3" d="M29.721,53.935c0-1.071,0.564-1.574,1.597-1.574"/>
-<path class="st3" d="M41.726,52.794c-0.268-0.291-0.686-0.432-1.236-0.432"/>
-<path class="st3" d="M42.092,53.935c0-0.493-0.122-0.869-0.362-1.132"/>
-<path class="st3" d="M30.06,59.221c0.268,0.31,0.695,0.465,1.264,0.465"/>
-<path class="st3" d="M29.721,58.113c0,0.446,0.099,0.794,0.291,1.048"/>
-<path class="st3" d="M42.092,58.113c0,1.066-0.564,1.569-1.602,1.569"/>
-<path class="st3" d="M30.314,51.074h9.171"/>
-<path class="st3" d="M28.716,52.648v4.182"/>
-<path class="st3" d="M28.716,52.648c0-1.071,0.564-1.574,1.597-1.574"/>
-<path class="st3" d="M40.627,51.422c-0.268-0.23-0.653-0.348-1.142-0.348"/>
-<path class="st3" d="M28.716,56.83c0,0.362,0.066,0.658,0.188,0.893"/>
-<path class="st3" d="M30.059,59.221l-0.042-0.061l-1.076-1.367"/>
-<path class="st3" d="M41.731,52.803l-0.005-0.009l-1.034-1.311"/>
-<path class="st3" d="M20.081,34.775h8.466"/>
-<path class="st3" d="M42.092,34.775h6.714"/>
-<path class="st3" d="M18.418,13.863h10.191"/>
-<path class="st3" d="M42.092,13.863h6.714"/>
-<path class="st3" d="M20.081,55.688h8.466"/>
-<path class="st3" d="M42.356,55.688h8.213"/>
-<path class="st3" d="M55.488,19.614c-1.052-3.261-3.28-5.751-6.676-5.751"/>
-<path class="st3" d="M48.807,34.775c3.674,0,5.976-2.904,6.911-6.554"/>
-<path class="st3" d="M13.188,40.526c1.057-3.261,3.28-5.751,6.676-5.751"/>
-<path class="st3" d="M19.865,55.688c-3.674,0-5.976-2.904-6.907-6.554c0-0.005,0-0.014-0.005-0.019"/>
-<path class="st3" d="M50.705,51.182v9.012"/>
-<path class="st3" d="M50.705,51.182l5.826,4.506"/>
-<path class="st3" d="M50.705,60.193l5.826-4.506"/>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" id="Layer_1" x="0" y="0" version="1.1" viewBox="0 0 68 68" style="enable-background:new 0 0 68 68" xml:space="preserve"><style type="text/css">.st0{fill:#5ab0ff}.st1{fill:#b0d9ff}.st2{fill:#003c73}.st3{fill:none;stroke:#003c73;stroke-linecap:round;stroke-linejoin:round}</style><path d="M42.092,53.935v4.182c0,1.066-0.564,1.569-1.602,1.569h-9.171c-0.568,0-0.991-0.155-1.264-0.465l-0.042-0.056	c-0.197-0.254-0.291-0.601-0.291-1.048v-4.182c0-1.071,0.564-1.574,1.597-1.574h9.171c0.55,0,0.968,0.141,1.236,0.432v0.009	C41.97,53.061,42.092,53.437,42.092,53.935z" class="st0"/><path d="M42.092,33.019v4.182c0,1.066-0.564,1.569-1.602,1.569h-9.171c-0.568,0-0.991-0.155-1.264-0.465l-0.042-0.056	c-0.197-0.254-0.291-0.601-0.291-1.048v-4.182c0-1.071,0.564-1.574,1.597-1.574h9.171c0.55,0,0.968,0.141,1.236,0.432v0.009	C41.97,32.145,42.092,32.521,42.092,33.019z" class="st0"/><path d="M42.092,12.105v4.182c0,1.067-0.564,1.569-1.602,1.569h-9.171c-0.568,0-0.991-0.155-1.264-0.465l-0.042-0.056	c-0.197-0.254-0.291-0.601-0.291-1.048v-4.182c0-1.071,0.564-1.574,1.597-1.574h9.171c0.55,0,0.968,0.141,1.236,0.432v0.009	C41.97,11.231,42.092,11.607,42.092,12.105z" class="st0"/><path d="M12.958,49.139H9.308c-0.569,0-0.991-0.155-1.264-0.465l-0.042-0.056C7.804,48.364,7.71,48.016,7.71,47.57	v-4.182c0-1.071,0.564-1.574,1.597-1.574h9.171c0.55,0,0.968,0.141,1.236,0.432v0.009c0.244,0.258,0.366,0.634,0.366,1.132v4.182	c0,1.067-0.564,1.569-1.602,1.569H12.958z" class="st1"/><path d="M62,22.471v4.181c0,1.067-0.564,1.569-1.602,1.569h-9.171c-0.568,0-0.991-0.155-1.264-0.465L49.92,27.7	c-0.197-0.254-0.291-0.601-0.291-1.048v-4.181c0-1.071,0.564-1.574,1.597-1.574h9.171c0.55,0,0.968,0.141,1.236,0.432v0.009	C61.878,21.597,62,21.972,62,22.471z" class="st1"/><path d="M17.567,11.626c0.536,0.714,0.85,1.607,0.85,2.57c0,2.377-1.926,4.304-4.304,4.304	c-1.184,0-2.265-0.484-3.045-1.259c-0.78-0.78-1.264-1.856-1.264-3.045c0-2.377,1.931-4.304,4.304-4.304	c1.414,0,2.664,0.677,3.449,1.729c0,0,0.005,0,0.005,0.005H17.567z" class="st1"/><path d="M56.531,55.687l-5.826,4.506v-9.012L56.531,55.687z" class="st2"/><path d="M29.722,53.936v4.181c0,0.446,0.099,0.794,0.291,1.048l-1.071-1.372l-0.038-0.07	c-0.127-0.235-0.188-0.531-0.188-0.893v-4.182c0-1.071,0.564-1.574,1.597-1.574h9.171c0.489,0,0.874,0.113,1.142,0.348l0.066,0.066	l1.034,1.311c-0.268-0.291-0.686-0.432-1.236-0.432h-9.171c-1.038,0-1.597,0.503-1.597,1.574V53.936z" class="st2"/><path d="M18.478,41.809H9.307c-1.038,0-1.597,0.503-1.597,1.574v4.182c0,0.446,0.099,0.794,0.291,1.048L6.929,47.24	l-0.038-0.07c-0.127-0.235-0.188-0.531-0.188-0.893v-4.181c0-1.071,0.564-1.574,1.597-1.574h9.171c0.489,0,0.874,0.113,1.142,0.348	l0.066,0.066l1.034,1.311c-0.268-0.291-0.686-0.432-1.236-0.432V41.809z" class="st2"/><path d="M60.6,20.022l1.034,1.311c-0.268-0.291-0.686-0.432-1.236-0.432h-9.171c-1.038,0-1.597,0.503-1.597,1.574v4.182	c0,0.446,0.099,0.794,0.291,1.048l-1.071-1.372l-0.038-0.071c-0.127-0.235-0.188-0.531-0.188-0.893v-4.181	c0-1.071,0.564-1.574,1.597-1.574h9.171c0.489,0,0.874,0.113,1.142,0.348l0.066,0.066V20.022z" class="st2"/><path d="M29.722,12.107v4.182c0,0.446,0.099,0.794,0.291,1.048l-1.071-1.372l-0.038-0.07	c-0.127-0.235-0.188-0.531-0.188-0.893v-4.177c0-1.071,0.564-1.574,1.597-1.574h9.171c0.489,0,0.874,0.113,1.142,0.348l0.066,0.066	l1.034,1.311c-0.268-0.291-0.686-0.432-1.236-0.432h-9.171c-1.038,0-1.597,0.503-1.597,1.574V12.107z" class="st2"/><path d="M16.045,9.766l0.127,0.127c0.677,0.677,1.071,1.222,1.391,1.729c-0.785-1.052-2.034-1.729-3.449-1.729	c-2.377,0-4.304,1.931-4.304,4.304c0,1.189,0.484,2.265,1.264,3.045l-0.019,0.019c-0.667-0.625-1.146-1.297-1.55-1.992	C9.063,14.591,8.8,13.783,8.8,12.909c0-2.373,1.931-4.304,4.304-4.304c1.132,0,2.166,0.442,2.937,1.161H16.045z" class="st2"/><path d="M29.722,33.018v4.182c0,0.446,0.099,0.794,0.291,1.048l-1.071-1.372l-0.038-0.07	c-0.127-0.235-0.188-0.531-0.188-0.893V31.73c0-1.071,0.564-1.574,1.597-1.574h9.171c0.489,0,0.874,0.113,1.142,0.348l0.066,0.066	l1.034,1.311c-0.268-0.291-0.686-0.432-1.236-0.432h-9.171c-1.038,0-1.597,0.503-1.597,1.574V33.018z" class="st2"/><path d="M17.567,11.626c0.536,0.714,0.85,1.607,0.85,2.57c0,2.377-1.926,4.304-4.304,4.304	c-1.184,0-2.265-0.484-3.045-1.259c-0.78-0.78-1.264-1.856-1.264-3.045c0-2.377,1.931-4.304,4.304-4.304	c1.414,0,2.664,0.677,3.449,1.729" class="st3"/><path d="M31.323,10.531h9.167" class="st3"/><path d="M31.323,17.857h9.167" class="st3"/><path d="M42.092,12.106v1.757v2.424" class="st3"/><path d="M29.721,12.106v4.182" class="st3"/><path d="M29.721,12.105c0-1.071,0.564-1.574,1.597-1.574" class="st3"/><path d="M41.726,10.964c-0.268-0.291-0.686-0.432-1.236-0.432" class="st3"/><path d="M42.092,12.105c0-0.493-0.122-0.869-0.362-1.132" class="st3"/><path d="M30.06,17.391c0.268,0.31,0.695,0.465,1.264,0.465" class="st3"/><path d="M29.721,16.287c0,0.446,0.099,0.794,0.291,1.048" class="st3"/><path d="M42.092,16.287c0,1.067-0.564,1.569-1.602,1.569" class="st3"/><path d="M9.505,15.268C9.063,14.591,8.8,13.783,8.8,12.909c0-2.373,1.931-4.304,4.304-4.304	c1.132,0,2.166,0.442,2.937,1.161" class="st3"/><path d="M30.314,9.25h9.171" class="st3"/><path d="M28.716,10.822v4.177" class="st3"/><path d="M28.716,10.824c0-1.071,0.564-1.574,1.597-1.574" class="st3"/><path d="M40.627,9.592c-0.268-0.23-0.653-0.348-1.142-0.348" class="st3"/><path d="M28.716,15c0,0.362,0.066,0.658,0.188,0.893" class="st3"/><path d="M17.567,11.626c0,0,0,0-0.005-0.005c-0.319-0.507-0.714-1.057-1.391-1.729" class="st3"/><path d="M11.092,17.293c0,0-0.023-0.024-0.038-0.033c-0.667-0.625-1.146-1.297-1.551-1.992" class="st3"/><path d="M30.059,17.391l-0.042-0.056l-1.076-1.372" class="st3"/><path d="M41.731,10.974l-0.005-0.009l-1.034-1.306" class="st3"/><path d="M51.227,20.896h9.171" class="st3"/><path d="M51.227,28.221h4.492h4.68" class="st3"/><path d="M61.995,22.471v4.182" class="st3"/><path d="M49.629,22.471v4.182" class="st3"/><path d="M49.629,22.471c0-1.071,0.564-1.574,1.597-1.574" class="st3"/><path d="M61.633,21.329c-0.268-0.291-0.686-0.432-1.236-0.432" class="st3"/><path d="M62,22.47c0-0.493-0.122-0.869-0.362-1.132" class="st3"/><path d="M49.963,27.756c0.268,0.31,0.695,0.465,1.264,0.465" class="st3"/><path d="M49.629,26.652c0,0.446,0.099,0.794,0.291,1.048" class="st3"/><path d="M62,26.652c0,1.067-0.564,1.569-1.602,1.569" class="st3"/><path d="M50.216,19.613h5.272h3.9" class="st3"/><path d="M48.619,21.188v4.182" class="st3"/><path d="M48.619,21.187c0-1.071,0.564-1.574,1.597-1.574" class="st3"/><path d="M60.529,19.957c-0.268-0.23-0.653-0.348-1.142-0.348" class="st3"/><path d="M48.619,25.369c0,0.362,0.066,0.658,0.188,0.893" class="st3"/><path d="M49.962,27.756L49.92,27.7l-1.071-1.372" class="st3"/><path d="M61.638,21.339l-0.005-0.009l-1.034-1.306" class="st3"/><path d="M9.307,41.809h9.171" class="st3"/><path d="M9.307,49.139h3.651h5.521" class="st3"/><path d="M20.076,43.383v4.182" class="st3"/><path d="M7.71,43.383v4.182" class="st3"/><path d="M7.71,43.383c0-1.071,0.564-1.574,1.597-1.574" class="st3"/><path d="M19.715,42.247c-0.268-0.291-0.686-0.432-1.236-0.432" class="st3"/><path d="M20.081,43.382c0-0.493-0.122-0.869-0.362-1.132" class="st3"/><path d="M8.043,48.674c0.268,0.31,0.695,0.465,1.264,0.465" class="st3"/><path d="M7.71,47.564c0,0.446,0.099,0.794,0.291,1.048" class="st3"/><path d="M20.081,47.564c0,1.067-0.564,1.569-1.602,1.569" class="st3"/><path d="M8.297,40.527h4.891h4.28" class="st3"/><path d="M6.699,42.1v4.182" class="st3"/><path d="M6.699,42.101c0-1.071,0.564-1.574,1.597-1.574" class="st3"/><path d="M18.61,40.875c-0.268-0.23-0.653-0.348-1.142-0.348" class="st3"/><path d="M6.699,46.281c0,0.362,0.066,0.658,0.188,0.893" class="st3"/><path d="M8.043,48.674l-0.042-0.061L6.93,47.246" class="st3"/><path d="M19.719,42.256l-0.005-0.009l-1.034-1.311" class="st3"/><path d="M31.323,31.445h9.167" class="st3"/><path d="M31.323,38.77h9.167" class="st3"/><path d="M42.092,33.018v4.182" class="st3"/><path d="M29.721,33.018v4.182" class="st3"/><path d="M29.721,33.019c0-1.071,0.564-1.574,1.597-1.574" class="st3"/><path d="M41.726,31.882c-0.268-0.291-0.686-0.432-1.236-0.432" class="st3"/><path d="M42.092,33.019c0-0.493-0.122-0.869-0.362-1.132" class="st3"/><path d="M30.06,38.309c0.268,0.31,0.695,0.465,1.264,0.465" class="st3"/><path d="M29.721,37.199c0,0.446,0.099,0.794,0.291,1.048" class="st3"/><path d="M42.092,37.199c0,1.067-0.564,1.569-1.602,1.569" class="st3"/><path d="M30.314,30.162h9.171" class="st3"/><path d="M28.716,31.736v4.182" class="st3"/><path d="M28.716,31.736c0-1.071,0.564-1.574,1.597-1.574" class="st3"/><path d="M40.627,30.504c-0.268-0.23-0.653-0.348-1.142-0.348" class="st3"/><path d="M28.716,35.918c0,0.362,0.066,0.658,0.188,0.893" class="st3"/><path d="M30.059,38.309l-0.042-0.061l-1.076-1.367" class="st3"/><path d="M41.731,31.891l-0.005-0.009l-1.034-1.311" class="st3"/><path d="M31.323,52.357h9.167" class="st3"/><path d="M31.323,59.688h9.167" class="st3"/><path d="M42.092,53.936v4.177" class="st3"/><path d="M29.721,53.936v4.177" class="st3"/><path d="M29.721,53.935c0-1.071,0.564-1.574,1.597-1.574" class="st3"/><path d="M41.726,52.794c-0.268-0.291-0.686-0.432-1.236-0.432" class="st3"/><path d="M42.092,53.935c0-0.493-0.122-0.869-0.362-1.132" class="st3"/><path d="M30.06,59.221c0.268,0.31,0.695,0.465,1.264,0.465" class="st3"/><path d="M29.721,58.113c0,0.446,0.099,0.794,0.291,1.048" class="st3"/><path d="M42.092,58.113c0,1.066-0.564,1.569-1.602,1.569" class="st3"/><path d="M30.314,51.074h9.171" class="st3"/><path d="M28.716,52.648v4.182" class="st3"/><path d="M28.716,52.648c0-1.071,0.564-1.574,1.597-1.574" class="st3"/><path d="M40.627,51.422c-0.268-0.23-0.653-0.348-1.142-0.348" class="st3"/><path d="M28.716,56.83c0,0.362,0.066,0.658,0.188,0.893" class="st3"/><path d="M30.059,59.221l-0.042-0.061l-1.076-1.367" class="st3"/><path d="M41.731,52.803l-0.005-0.009l-1.034-1.311" class="st3"/><path d="M20.081,34.775h8.466" class="st3"/><path d="M42.092,34.775h6.714" class="st3"/><path d="M18.418,13.863h10.191" class="st3"/><path d="M42.092,13.863h6.714" class="st3"/><path d="M20.081,55.688h8.466" class="st3"/><path d="M42.356,55.688h8.213" class="st3"/><path d="M55.488,19.614c-1.052-3.261-3.28-5.751-6.676-5.751" class="st3"/><path d="M48.807,34.775c3.674,0,5.976-2.904,6.911-6.554" class="st3"/><path d="M13.188,40.526c1.057-3.261,3.28-5.751,6.676-5.751" class="st3"/><path d="M19.865,55.688c-3.674,0-5.976-2.904-6.907-6.554c0-0.005,0-0.014-0.005-0.019" class="st3"/><path d="M50.705,51.182v9.012" class="st3"/><path d="M50.705,51.182l5.826,4.506" class="st3"/><path d="M50.705,60.193l5.826-4.506" class="st3"/></svg>
\ No newline at end of file
diff --git a/assets/images/stopwatch.svg b/assets/images/stopwatch.svg
index 0f26af219e04..b8ca46fd1fa1 100644
--- a/assets/images/stopwatch.svg
+++ b/assets/images/stopwatch.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="20" height="20" fill="none" viewBox="0 0 20 20"><path fill="#03D47C" fill-rule="evenodd" d="M8 1C7.44772 1 7 1.44772 7 2C7 2.55228 7.44772 3 8 3H9V4.07089C5.60771 4.55612 3 7.47353 3 11C3 14.866 6.13401 18 10 18C13.866 18 17 14.866 17 11C17 9.4277 16.4816 7.97648 15.6064 6.80792L16.3641 6.05023C16.7547 5.6597 16.7547 5.02654 16.3641 4.63601C15.9736 4.24549 15.3404 4.24549 14.9499 4.63601L14.1923 5.39368C13.276 4.70742 12.1859 4.24052 11 4.07089V3H12C12.5523 3 13 2.55228 13 2C13 1.44772 12.5523 1 12 1H8ZM10.0005 6.5C10.5527 6.5 11.0005 6.94772 11.0005 7.5V11.0861L12.7074 12.7929C13.0979 13.1834 13.098 13.8165 12.7075 14.2071C12.317 14.5976 11.6838 14.5977 11.2932 14.2071L9.29294 12.2071C9.08996 12.0041 8.99247 11.7357 9.00045 11.4697V7.5C9.00045 6.94772 9.44817 6.5 10.0005 6.5Z" clip-rule="evenodd"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" id="Layer_1" x="0" y="0" version="1.1" 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 d="M8,1C7.448,1,7,1.448,7,2s0.448,1,1,1h1v1.071C5.608,4.556,3,7.474,3,11c0,3.866,3.134,7,7,7	c3.866,0,7-3.134,7-7c0-1.572-0.518-3.024-1.394-4.192l0.758-0.758c0.391-0.391,0.391-1.024,0-1.414	c-0.39-0.391-1.024-0.391-1.414,0l-0.758,0.758C13.276,4.707,12.186,4.241,11,4.071V3h1c0.552,0,1-0.448,1-1s-0.448-1-1-1H8z M10,6.5c0.552,0,1,0.448,1,1v3.586l1.707,1.707c0.391,0.391,0.391,1.024,0,1.414c-0.391,0.391-1.024,0.391-1.414,0l-2-2	C9.09,12.004,8.992,11.736,9,11.47V7.5C9,6.948,9.448,6.5,10,6.5z" class="st0"/></svg>
\ No newline at end of file
diff --git a/assets/images/subscription-details__approvedlogo--light.svg b/assets/images/subscription-details__approvedlogo--light.svg
new file mode 100644
index 000000000000..6582fdf13fcd
--- /dev/null
+++ b/assets/images/subscription-details__approvedlogo--light.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" id="Layer_1" x="0" y="0" version="1.1" viewBox="0 0 200 48" style="enable-background:new 0 0 200 48" xml:space="preserve"><style type="text/css">.st0{fill:#03d47c}.st1{fill:#002e22}</style><path d="M197.299,25.629c-0.382,0-0.573-0.335-0.645-0.765c-0.191-1.004,0.024-5.856,0.287-8.604	c0.095-1.625,0.836-2.581,1.816-2.581c0.765,0,1.243,0.621,1.243,1.697c0,1.434-1.506,8.461-1.816,9.345	C197.921,25.342,197.682,25.629,197.299,25.629z M194.981,29.501c0-1.123,0.86-2.008,1.888-2.008c1.052,0,1.697,0.765,1.697,1.673	c0,1.123-0.813,2.032-1.888,2.032C195.674,31.198,194.981,30.409,194.981,29.501z" class="st0"/><path d="M185.228,31.365c-2.366,0-4.135-1.984-4.135-5.067c0-3.753,2.558-7.457,6.262-7.457	c1.458,0,2.558,0.645,3.203,1.577l0.263-2.079c0.096-0.956,0.239-2.557-0.096-2.773c-1.147-0.072-1.649-0.263-1.649-0.693	c0-0.263,0.239-0.478,0.574-0.645c0.836-0.406,2.701-0.765,3.346-0.765c0.598,0,0.86,0.358,0.86,0.837	c0,0.406-0.191,1.625-0.525,4.35l-0.932,7.696c-0.12,1.052-0.24,2.605,0.095,2.82c1.004,0.072,1.434,0.215,1.434,0.621	c0,0.311-0.239,0.502-0.573,0.669c-0.717,0.359-2.271,0.765-2.94,0.765c-0.622,0-0.909-0.358-0.909-0.884	c0-0.263,0.048-0.669,0.168-1.649C188.718,30.266,187.045,31.365,185.228,31.365z M183.818,26.274c0,2.079,0.932,3.37,2.462,3.37	c2.318,0,3.872-3.274,3.872-6.238c0-2.414-1.195-3.227-2.366-3.227C185.276,20.18,183.818,23.574,183.818,26.274z" class="st0"/><path d="M174.648,31.389c-2.988,0-4.876-2.079-4.876-5.163c0-3.848,2.94-7.385,6.716-7.385	c2.295,0,3.609,1.267,3.609,2.773c0,1.984-2.175,3.657-6.716,4.23l-1.123,0.167c0.262,1.936,1.505,3.131,3.417,3.131	c1.626,0,2.677-0.956,3.37-1.577c0.287-0.263,0.478-0.406,0.717-0.406c0.239,0,0.407,0.191,0.407,0.502	c0,0.43-0.359,1.075-0.956,1.697C178.328,30.338,176.727,31.389,174.648,31.389z M172.21,24.912l0.693-0.119	c3.418-0.526,4.971-1.793,4.971-3.179c0-0.837-0.669-1.434-1.744-1.434C174.17,20.18,172.353,22.283,172.21,24.912z" class="st0"/><path d="M162.32,31.294c-1.912,0-3.202-0.956-3.202-3.203c0-0.454,0.047-1.052,0.095-1.315l0.359-2.988	c0.143-1.076,0.239-2.51-0.048-2.725c-0.956-0.072-1.386-0.239-1.386-0.622c0-0.287,0.263-0.478,0.549-0.645	c0.765-0.43,2.486-0.765,3.084-0.765c0.525,0,0.86,0.335,0.86,0.884c0,0.311-0.119,1.052-0.406,3.346l-0.335,2.629	c-0.072,0.478-0.119,1.243-0.119,1.745c0,1.243,0.43,1.912,1.434,1.912c2.127,0,4.278-3.37,4.278-5.88	c0-1.96-1.577-1.96-1.577-3.346c0-0.813,0.573-1.291,1.314-1.291c1.171,0,1.984,1.123,1.984,3.346	C169.204,26.657,166.168,31.294,162.32,31.294z" class="st0"/><path d="M150.612,31.389c-3.251,0-5.498-2.223-5.498-5.569c0-3.992,3.06-7.003,6.884-7.003	c3.274,0,6.139,2.247,6.139,5.569C158.137,28.33,154.508,31.389,150.612,31.389z M147.839,26.251c0,2.366,1.1,3.848,2.916,3.848	c2.366,0,4.039-3.083,4.039-6.119c0-2.414-1.147-3.872-2.963-3.872C149.464,20.108,147.839,23.263,147.839,26.251z" class="st0"/><path d="M138.047,31.15c-0.741,0-1.076-0.287-1.076-0.884c0-0.215,0.096-0.717,0.191-1.578l0.622-4.948	c0.119-1.028,0.215-2.605-0.096-2.725c-0.932-0.024-1.386-0.191-1.386-0.574c0-0.287,0.263-0.478,0.574-0.645	c0.836-0.43,2.414-0.765,2.987-0.765c0.454,0,0.741,0.382,0.741,0.837c0,0.191-0.024,0.597-0.167,1.936	c0.884-1.912,2.342-2.916,3.489-2.916c1.124,0,1.769,0.813,1.769,1.745c0,0.98-0.597,1.577-1.291,1.577	c-0.525,0-0.86-0.287-1.099-0.597c-0.167-0.191-0.382-0.358-0.645-0.358c-0.717,0-2.175,1.338-2.486,4.015v-0.024l-0.598,4.924	C139.481,30.864,138.979,31.15,138.047,31.15z" class="st0"/><path d="M124.368,35.596c-1.673,0-3.39-0.239-3.39-0.861c0-0.454,1.191-0.693,2.028-0.741	c0.286-0.167,0.43-1.243,0.573-2.51l0.956-7.744c0.12-1.028,0.215-2.533-0.071-2.725c-0.909-0.024-1.339-0.191-1.339-0.574	c0-0.287,0.263-0.478,0.55-0.645c0.86-0.454,2.462-0.765,3.059-0.765c0.478,0,0.813,0.382,0.813,0.837	c0,0.287-0.096,0.693-0.239,1.745c0.86-1.625,2.462-2.773,4.374-2.773c2.27,0,4.063,1.984,4.063,5.019	c0,4.422-2.677,7.505-6.095,7.505c-1.458,0-2.629-0.645-3.298-1.482l-0.191,1.625c-0.12,0.908-0.311,2.366-0.024,2.486	c1.314,0.072,1.72,0.239,1.72,0.621C127.857,35.285,126.686,35.596,124.368,35.596z M126.758,26.729	c0,2.175,1.123,3.274,2.534,3.274c2.127,0,3.728-2.772,3.728-5.76c0-2.056-0.836-3.609-2.414-3.609	C128.431,20.634,126.758,23.574,126.758,26.729z" class="st0"/><path d="M110.974,35.596c-1.673,0-2.773-0.239-2.773-0.861c0-0.454,0.574-0.693,1.411-0.741	c0.286-0.167,0.43-1.243,0.573-2.51l0.956-7.744c0.12-1.028,0.215-2.533-0.071-2.725c-0.909-0.024-1.339-0.191-1.339-0.574	c0-0.287,0.263-0.478,0.55-0.645c0.86-0.454,2.462-0.765,3.059-0.765c0.478,0,0.813,0.382,0.813,0.837	c0,0.287-0.096,0.693-0.239,1.745c0.86-1.625,2.462-2.773,4.374-2.773c2.27,0,4.063,1.984,4.063,5.019	c0,4.422-2.677,7.505-6.095,7.505c-1.458,0-2.629-0.645-3.298-1.482l-0.191,1.625c-0.12,0.908-0.311,2.366-0.024,2.486	c1.314,0.072,1.721,0.239,1.721,0.621C114.464,35.285,113.292,35.596,110.974,35.596z M113.364,26.729	c0,2.175,1.123,3.274,2.534,3.274c2.127,0,3.728-2.772,3.728-5.76c0-2.056-0.836-3.609-2.414-3.609	C115.037,20.634,113.364,23.574,113.364,26.729z" class="st0"/><path d="M94.835,31.15c-1.984,0-2.925-0.239-2.925-0.884c0-0.526,0.511-0.741,1.296-0.813	c0.55-0.239,0.956-1.004,2.008-2.988c1.96-3.848,4.23-8.222,4.948-9.799c0.406-0.837,0.454-1.267,0.597-1.673	c0.215-0.813,0.717-1.171,1.482-1.171c0.885,0,1.387,0.478,1.769,1.578c0.813,2.462,2.199,7.864,3.203,11.568	c0.526,1.96,0.669,2.295,1.004,2.438c0.531,0.072,1.057,0.263,1.057,0.717c0,0.741-1.147,1.028-3.4,1.028	c-1.721-0.072-2.964-0.311-2.964-0.956c0-0.526,0.622-0.741,1.482-0.741c0.287-0.359-0.024-1.96-0.382-3.657	c-0.024-0.167-0.072-0.311-0.096-0.478c-1.099-0.072-2.127-0.096-3.226-0.096c-1.172,0-2.056,0.024-3.084,0.096	c-0.119,0.239-0.191,0.454-0.263,0.597c-0.526,1.171-1.434,3.155-1.314,3.537c1.076,0.096,1.577,0.287,1.577,0.693	C97.604,30.84,96.747,31.15,94.835,31.15z M98.369,23.741c0.837,0,1.53-0.024,2.462-0.024c0.908,0,1.745,0.024,2.701,0.024	c-0.574-2.342-1.219-4.517-1.864-6.477C100.664,19.176,99.325,21.829,98.369,23.741z" class="st0"/><path d="M0,31.343h10.429v-3.077H3.834v-2.853h5.308v-3.151H3.834v-2.703h6.595v-3.077H0V31.343z" class="st1"/><path d="M23.42,19.758h-4.591l-1.53,2.791l-1.607-2.791h-4.718l3.851,5.604l-4.105,5.981h4.591l1.835-3.119l1.812,3.119	h4.718l-4.107-5.981L23.42,19.758z" class="st1"/><path d="M30.652,19.476c-1.267,0-2.368,0.516-3.189,1.501v-1.219h-3.519v16.508h3.753v-5.792	c0.681,0.704,1.712,1.149,2.932,1.149c3.072,0,5.208-2.368,5.208-6.073c0-3.705-2.017-6.073-5.183-6.073H30.652z M29.831,28.552	c-1.407,0-2.251-1.102-2.251-3.002c0-1.9,0.844-3.002,2.251-3.002c1.407,0,2.251,1.079,2.251,3.002	C32.083,27.473,31.239,28.552,29.831,28.552z" class="st1"/><path d="M42.452,28.692c-1.149,0-2.017-0.657-2.228-2.345h7.998v-0.493c0-3.612-2.017-6.378-5.935-6.378	c-2.767,0-5.958,1.501-5.958,6.073c0,3.706,2.393,6.073,6.098,6.073c2.205,0,4.949-0.798,5.816-4.221h-3.8	c-0.165,0.633-0.658,1.29-1.994,1.29H42.452z M42.287,22.243c1.08,0,1.806,0.61,1.923,1.946h-3.917	C40.575,22.711,41.396,22.243,42.287,22.243z" class="st1"/><path d="M55.539,19.476c-1.29,0-2.439,0.563-3.189,1.641v-1.361h-3.519v11.586h3.753v-6.449	c0-1.547,0.798-2.251,1.829-2.251c1.103,0,1.759,0.469,1.759,2.228v6.472h3.753v-6.754C59.924,20.931,58.446,19.476,55.539,19.476z" class="st1"/><path d="M73.622,14.492c-1.147,0-1.967,0.842-1.967,1.918s0.819,1.943,1.967,1.943s1.99-0.865,1.99-1.943	S74.792,14.492,73.622,14.492z" class="st1"/><path d="M75.529,19.781h-3.746v11.56h3.746V19.781z" class="st1"/><path d="M66.852,24.124l-0.938-0.212c-0.985-0.212-1.337-0.64-1.337-1.089c0-0.639,0.539-1.05,1.407-1.05	c1.103,0,1.689,0.358,1.689,1.421h3.233c-0.075-2.434-1.497-3.872-5.087-3.872c-3.097,0-4.949,1.15-4.949,3.729	c0,2.034,1.37,2.957,4.513,3.668l0.938,0.212c0.986,0.212,1.337,0.67,1.337,1.12c0,0.639-0.564,0.923-1.548,0.923	c-1.29,0-1.877-0.474-2.04-1.539h-3.659c0.211,2.792,2.158,4.188,5.559,4.188c3.402,0,5.394-1.254,5.394-3.833	c0-2.035-1.37-2.957-4.513-3.668V24.124z" class="st1"/><path d="M90.185,19.781l-2.107,7.067l-2.061-7.067h-4.858v-0.364c0-0.946,0.704-1.894,1.8-1.894h0.535v-3.06h-0.769	c-3.208,0.072-5.322,2.33-5.322,5.172v0.146h-1.405v3.412h1.405v8.148h3.745v-8.148h2.11l2.806,7.844l-0.468,1.216	c-0.351,0.889-0.748,1.147-1.522,1.147c-0.397,0-0.796,0-1.358-0.165l-0.234,3.065c0.562,0.163,1.264,0.234,2.153,0.234	c2.247,0,3.418-0.959,4.542-3.932L94,19.78h-3.816L90.185,19.781z" class="st1"/></svg>
\ No newline at end of file
diff --git a/assets/images/subscription-details__approvedlogo.svg b/assets/images/subscription-details__approvedlogo.svg
new file mode 100644
index 000000000000..73615be28528
--- /dev/null
+++ b/assets/images/subscription-details__approvedlogo.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" id="Layer_1" x="0" y="0" version="1.1" viewBox="0 0 200 48" style="enable-background:new 0 0 200 48" xml:space="preserve"><style type="text/css">.st0{fill:#03d47c}.st1{fill:#e7ece9}</style><path d="M197.299,25.629c-0.382,0-0.573-0.335-0.645-0.765c-0.191-1.004,0.024-5.856,0.287-8.604	c0.095-1.625,0.836-2.581,1.816-2.581c0.765,0,1.243,0.621,1.243,1.697c0,1.434-1.506,8.461-1.816,9.345	C197.921,25.342,197.682,25.629,197.299,25.629z M194.981,29.501c0-1.123,0.86-2.008,1.888-2.008c1.052,0,1.697,0.765,1.697,1.673	c0,1.123-0.813,2.032-1.888,2.032C195.674,31.198,194.981,30.409,194.981,29.501z" class="st0"/><path d="M185.228,31.365c-2.366,0-4.135-1.984-4.135-5.067c0-3.753,2.558-7.457,6.262-7.457	c1.458,0,2.558,0.645,3.203,1.577l0.263-2.079c0.096-0.956,0.239-2.557-0.096-2.772c-1.147-0.072-1.649-0.263-1.649-0.693	c0-0.263,0.239-0.478,0.574-0.645c0.836-0.406,2.701-0.765,3.346-0.765c0.598,0,0.86,0.359,0.86,0.837	c0,0.406-0.191,1.625-0.525,4.35l-0.932,7.696c-0.12,1.052-0.24,2.605,0.095,2.82c1.004,0.072,1.434,0.215,1.434,0.622	c0,0.311-0.239,0.502-0.573,0.669c-0.717,0.358-2.271,0.765-2.94,0.765c-0.622,0-0.909-0.359-0.909-0.884	c0-0.263,0.048-0.669,0.168-1.649C188.718,30.266,187.045,31.365,185.228,31.365z M183.818,26.274c0,2.079,0.932,3.37,2.462,3.37	c2.318,0,3.872-3.274,3.872-6.238c0-2.414-1.195-3.227-2.366-3.227C185.276,20.18,183.818,23.574,183.818,26.274z" class="st0"/><path d="M174.648,31.389c-2.988,0-4.876-2.079-4.876-5.163c0-3.848,2.94-7.385,6.716-7.385	c2.295,0,3.609,1.267,3.609,2.773c0,1.984-2.175,3.657-6.716,4.23l-1.123,0.167c0.262,1.936,1.505,3.131,3.417,3.131	c1.626,0,2.677-0.956,3.37-1.577c0.287-0.263,0.478-0.406,0.717-0.406c0.239,0,0.407,0.191,0.407,0.502	c0,0.43-0.359,1.076-0.956,1.697C178.328,30.338,176.727,31.389,174.648,31.389z M172.21,24.912l0.693-0.12	c3.418-0.526,4.971-1.793,4.971-3.179c0-0.837-0.669-1.434-1.744-1.434C174.17,20.18,172.353,22.283,172.21,24.912z" class="st0"/><path d="M162.32,31.294c-1.912,0-3.202-0.956-3.202-3.203c0-0.454,0.047-1.052,0.095-1.315l0.359-2.988	c0.143-1.076,0.239-2.51-0.048-2.725c-0.956-0.072-1.386-0.239-1.386-0.621c0-0.287,0.263-0.478,0.549-0.645	c0.765-0.43,2.486-0.765,3.084-0.765c0.525,0,0.86,0.335,0.86,0.884c0,0.311-0.119,1.052-0.406,3.346l-0.335,2.629	c-0.072,0.478-0.119,1.243-0.119,1.745c0,1.243,0.43,1.912,1.434,1.912c2.127,0,4.278-3.37,4.278-5.88	c0-1.96-1.577-1.96-1.577-3.346c0-0.813,0.573-1.291,1.314-1.291c1.171,0,1.984,1.123,1.984,3.346	C169.204,26.657,166.168,31.294,162.32,31.294z" class="st0"/><path d="M150.612,31.389c-3.251,0-5.498-2.223-5.498-5.569c0-3.991,3.06-7.003,6.884-7.003	c3.274,0,6.139,2.247,6.139,5.569C158.137,28.33,154.508,31.389,150.612,31.389z M147.839,26.25c0,2.366,1.1,3.848,2.916,3.848	c2.366,0,4.039-3.083,4.039-6.119c0-2.414-1.147-3.872-2.963-3.872C149.464,20.108,147.839,23.263,147.839,26.25z" class="st0"/><path d="M138.047,31.15c-0.741,0-1.076-0.287-1.076-0.884c0-0.215,0.096-0.717,0.191-1.577l0.622-4.948	c0.119-1.028,0.215-2.605-0.096-2.725c-0.932-0.024-1.386-0.191-1.386-0.574c0-0.287,0.263-0.478,0.574-0.645	c0.836-0.43,2.414-0.765,2.987-0.765c0.454,0,0.741,0.382,0.741,0.837c0,0.191-0.024,0.597-0.167,1.936	c0.884-1.912,2.342-2.916,3.489-2.916c1.124,0,1.769,0.813,1.769,1.745c0,0.98-0.597,1.578-1.291,1.578	c-0.525,0-0.86-0.287-1.099-0.597c-0.167-0.191-0.382-0.359-0.645-0.359c-0.717,0-2.175,1.338-2.486,4.015v-0.024l-0.598,4.924	C139.481,30.863,138.979,31.15,138.047,31.15z" class="st0"/><path d="M124.368,35.596c-1.673,0-3.39-0.239-3.39-0.86c0-0.454,1.191-0.693,2.028-0.741	c0.286-0.167,0.43-1.243,0.573-2.51l0.956-7.744c0.12-1.028,0.215-2.534-0.071-2.725c-0.909-0.024-1.339-0.191-1.339-0.574	c0-0.287,0.263-0.478,0.55-0.645c0.86-0.454,2.462-0.765,3.059-0.765c0.478,0,0.813,0.382,0.813,0.837	c0,0.287-0.096,0.693-0.239,1.745c0.86-1.625,2.462-2.773,4.374-2.773c2.27,0,4.063,1.984,4.063,5.019	c0,4.422-2.677,7.505-6.095,7.505c-1.458,0-2.629-0.645-3.298-1.482l-0.191,1.625c-0.12,0.908-0.311,2.366-0.024,2.486	c1.314,0.072,1.72,0.239,1.72,0.621C127.857,35.285,126.686,35.596,124.368,35.596z M126.758,26.729	c0,2.175,1.123,3.274,2.534,3.274c2.127,0,3.728-2.773,3.728-5.76c0-2.056-0.836-3.609-2.414-3.609	C128.431,20.634,126.758,23.574,126.758,26.729z" class="st0"/><path d="M110.974,35.596c-1.673,0-2.773-0.239-2.773-0.86c0-0.454,0.574-0.693,1.411-0.741	c0.286-0.167,0.43-1.243,0.573-2.51l0.956-7.744c0.12-1.028,0.215-2.534-0.071-2.725c-0.909-0.024-1.339-0.191-1.339-0.574	c0-0.287,0.263-0.478,0.55-0.645c0.86-0.454,2.462-0.765,3.059-0.765c0.478,0,0.813,0.382,0.813,0.837	c0,0.287-0.096,0.693-0.239,1.745c0.86-1.625,2.462-2.773,4.374-2.773c2.27,0,4.063,1.984,4.063,5.019	c0,4.422-2.677,7.505-6.095,7.505c-1.458,0-2.629-0.645-3.298-1.482l-0.191,1.625c-0.12,0.908-0.311,2.366-0.024,2.486	c1.314,0.072,1.721,0.239,1.721,0.621C114.464,35.285,113.292,35.596,110.974,35.596z M113.364,26.729	c0,2.175,1.123,3.274,2.534,3.274c2.127,0,3.728-2.773,3.728-5.76c0-2.056-0.836-3.609-2.414-3.609	C115.037,20.634,113.364,23.574,113.364,26.729z" class="st0"/><path d="M94.835,31.15c-1.984,0-2.925-0.239-2.925-0.884c0-0.526,0.511-0.741,1.296-0.813	c0.55-0.239,0.956-1.004,2.008-2.988c1.96-3.848,4.23-8.222,4.948-9.799c0.406-0.836,0.454-1.267,0.597-1.673	c0.215-0.813,0.717-1.171,1.482-1.171c0.885,0,1.387,0.478,1.769,1.577c0.813,2.462,2.199,7.863,3.203,11.568	c0.526,1.96,0.669,2.294,1.004,2.438c0.531,0.072,1.057,0.263,1.057,0.717c0,0.741-1.147,1.028-3.4,1.028	c-1.721-0.072-2.964-0.311-2.964-0.956c0-0.526,0.622-0.741,1.482-0.741c0.287-0.358-0.024-1.96-0.382-3.657	c-0.024-0.167-0.072-0.311-0.096-0.478c-1.099-0.072-2.127-0.096-3.226-0.096c-1.172,0-2.056,0.024-3.084,0.096	c-0.119,0.239-0.191,0.454-0.263,0.598c-0.526,1.171-1.434,3.155-1.314,3.537c1.076,0.096,1.577,0.287,1.577,0.693	C97.604,30.84,96.747,31.15,94.835,31.15z M98.369,23.741c0.837,0,1.53-0.024,2.462-0.024c0.908,0,1.745,0.024,2.701,0.024	c-0.574-2.342-1.219-4.517-1.864-6.477C100.664,19.176,99.325,21.829,98.369,23.741z" class="st0"/><g><polygon points="0 31.343 10.429 31.343 10.429 28.266 3.834 28.266 3.834 25.413 9.141 25.413 9.141 22.262 3.834 22.262 3.834 19.559 10.429 19.559 10.429 16.482 0 16.482" class="st1"/><polygon points="23.42 19.758 18.829 19.758 17.299 22.549 15.692 19.758 10.974 19.758 14.825 25.362 10.719 31.343 15.31 31.343 17.145 28.224 18.957 31.343 23.675 31.343 19.569 25.362" class="st1"/><path d="M30.654,19.476h-0.002c-1.267,0-2.368,0.516-3.189,1.501v-1.219h-3.519v16.508h3.753v-5.792 c0.681,0.704,1.712,1.148,2.932,1.148c3.072,0,5.208-2.368,5.208-6.073S33.82,19.476,30.654,19.476z M29.831,28.552 c-1.408,0-2.251-1.102-2.251-3.002c0-1.9,0.844-3.002,2.251-3.002c1.407,0,2.251,1.079,2.251,3.002 C32.083,27.472,31.239,28.552,29.831,28.552z" class="st1"/><path d="M42.451,28.692c-1.148,0-2.016-0.658-2.227-2.344h7.998v-0.493c0-3.612-2.017-6.378-5.935-6.378 c-2.767,0-5.958,1.501-5.958,6.073c0,3.706,2.393,6.073,6.098,6.073c2.205,0,4.949-0.797,5.816-4.221h-3.8 C44.279,28.034,43.786,28.691,42.451,28.692z M42.287,22.243c1.079,0,1.806,0.61,1.923,1.946h-3.918 C40.575,22.711,41.396,22.243,42.287,22.243z" class="st1"/><path d="M55.539,19.476c-1.29,0-2.439,0.563-3.189,1.641v-1.361h-3.519v11.586h3.753v-6.449 c0-1.547,0.798-2.251,1.829-2.251c1.103,0,1.759,0.469,1.759,2.228v6.472h3.753v-6.754C59.924,20.931,58.446,19.476,55.539,19.476z" class="st1"/><path d="M73.622,14.492c-1.147,0-1.967,0.842-1.967,1.918c0,1.076,0.819,1.943,1.967,1.943s1.99-0.865,1.99-1.943 S74.792,14.492,73.622,14.492z" class="st1"/><rect width="3.746" height="11.56" x="71.783" y="19.781" class="st1"/><path d="M66.852,24.122v0.002l-0.938-0.212c-0.986-0.212-1.337-0.64-1.337-1.089c0-0.639,0.539-1.05,1.407-1.05 c1.103,0,1.689,0.358,1.689,1.422h3.233c-0.075-2.434-1.497-3.872-5.087-3.872c-3.097,0-4.949,1.15-4.949,3.729 c0,2.034,1.37,2.957,4.513,3.668l0.938,0.212c0.986,0.212,1.337,0.67,1.337,1.12c0,0.639-0.564,0.923-1.548,0.923 c-1.29,0-1.877-0.474-2.04-1.539h-3.659c0.211,2.792,2.157,4.188,5.559,4.188s5.394-1.254,5.394-3.833 C71.365,25.755,69.995,24.833,66.852,24.122z" class="st1"/><path d="M90.184,19.78l0.001,0.001l-2.107,7.067l-2.061-7.067h-4.858v-0.364c0-0.946,0.704-1.894,1.8-1.894h0.535 v-3.06h-0.769c-3.208,0.072-5.322,2.33-5.322,5.172v0.146h-1.405v3.412h1.405v8.148h3.745v-8.148h2.11l2.806,7.844l-0.468,1.216 c-0.351,0.889-0.748,1.147-1.522,1.147c-0.397,0-0.796,0-1.358-0.165l-0.234,3.065c0.562,0.163,1.264,0.234,2.153,0.234 c2.247,0,3.417-0.959,4.542-3.932L94,19.78H90.184z" class="st1"/></g></svg>
\ No newline at end of file
diff --git a/assets/images/suitcase.svg b/assets/images/suitcase.svg
index 97036db6b5ac..452c44f73e22 100644
--- a/assets/images/suitcase.svg
+++ b/assets/images/suitcase.svg
@@ -1,3 +1 @@
-<svg x="0" y="0" viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg">
-<path fill-rule="evenodd" clip-rule="evenodd" d="M6 2C6 0.89543 6.89543 0 8 0H12C13.1046 0 14 0.89543 14 2V5H15C16.1046 5 17 5.89543 17 7V16C17 17.1046 16.1046 18 15 18H14.9146C14.9699 18.1564 15 18.3247 15 18.5C15 19.3284 14.3284 20 13.5 20C12.6716 20 12 19.3284 12 18.5C12 18.3247 12.0301 18.1564 12.0854 18H7.91465C7.96992 18.1564 8 18.3247 8 18.5C8 19.3284 7.32843 20 6.5 20C5.67157 20 5 19.3284 5 18.5C5 18.3247 5.03008 18.1564 5.08535 18H5C3.89543 18 3 17.1046 3 16V7C3 5.89543 3.89543 5 5 5H6V2ZM8 5H12V2H8V5ZM7.5 8C6.94772 8 6.5 8.44772 6.5 9V14C6.5 14.5523 6.94772 15 7.5 15C8.05228 15 8.5 14.5523 8.5 14V9C8.5 8.44772 8.05228 8 7.5 8ZM12.5 8C11.9477 8 11.5 8.44772 11.5 9V14C11.5 14.5523 11.9477 15 12.5 15C13.0523 15 13.5 14.5523 13.5 14V9C13.5 8.44772 13.0523 8 12.5 8Z" />
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" x="0" y="0" viewBox="0 0 20 20"><path fill-rule="evenodd" d="M6 2C6 0.89543 6.89543 0 8 0H12C13.1046 0 14 0.89543 14 2V5H15C16.1046 5 17 5.89543 17 7V16C17 17.1046 16.1046 18 15 18H14.9146C14.9699 18.1564 15 18.3247 15 18.5C15 19.3284 14.3284 20 13.5 20C12.6716 20 12 19.3284 12 18.5C12 18.3247 12.0301 18.1564 12.0854 18H7.91465C7.96992 18.1564 8 18.3247 8 18.5C8 19.3284 7.32843 20 6.5 20C5.67157 20 5 19.3284 5 18.5C5 18.3247 5.03008 18.1564 5.08535 18H5C3.89543 18 3 17.1046 3 16V7C3 5.89543 3.89543 5 5 5H6V2ZM8 5H12V2H8V5ZM7.5 8C6.94772 8 6.5 8.44772 6.5 9V14C6.5 14.5523 6.94772 15 7.5 15C8.05228 15 8.5 14.5523 8.5 14V9C8.5 8.44772 8.05228 8 7.5 8ZM12.5 8C11.9477 8 11.5 8.44772 11.5 9V14C11.5 14.5523 11.9477 15 12.5 15C13.0523 15 13.5 14.5523 13.5 14V9C13.5 8.44772 13.0523 8 12.5 8Z" clip-rule="evenodd"/></svg>
\ No newline at end of file
diff --git a/assets/images/tag.svg b/assets/images/tag.svg
index f5e13b8135cb..f25bcbe47f71 100644
--- a/assets/images/tag.svg
+++ b/assets/images/tag.svg
@@ -1,12 +1 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 28.1.0, 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="M10.692,1.691l7.894,7.894c0.781,0.781,0.781,2.047,0,2.828l-6.172,6.172c-0.781,0.781-2.047,0.781-2.828,0
-	l-7.894-7.894c-0.436-0.436-0.647-1.05-0.57-1.662l0.686-5.486C1.921,2.635,2.636,1.92,3.544,1.807l5.486-0.686
-	C9.642,1.044,10.255,1.255,10.692,1.691z M6.5,8C7.329,8,8,7.328,8,6.5C8,5.671,7.329,5,6.5,5C5.672,5,5,5.671,5,6.5
-	C5,7.328,5.672,8,6.5,8z"/>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" id="Layer_1" x="0" y="0" version="1.1" 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 d="M10.692,1.691l7.894,7.894c0.781,0.781,0.781,2.047,0,2.828l-6.172,6.172c-0.781,0.781-2.047,0.781-2.828,0	l-7.894-7.894c-0.436-0.436-0.647-1.05-0.57-1.662l0.686-5.486C1.921,2.635,2.636,1.92,3.544,1.807l5.486-0.686	C9.642,1.044,10.255,1.255,10.692,1.691z M6.5,8C7.329,8,8,7.328,8,6.5C8,5.671,7.329,5,6.5,5C5.672,5,5,5.671,5,6.5	C5,7.328,5.672,8,6.5,8z" class="st0"/></svg>
\ No newline at end of file
diff --git a/assets/images/thread.svg b/assets/images/thread.svg
index 3b8f334fafdd..9f01ce7b2c06 100644
--- a/assets/images/thread.svg
+++ b/assets/images/thread.svg
@@ -1,3 +1 @@
-<svg width="12" height="12" viewBox="0 0 12 12" xmlns="http://www.w3.org/2000/svg">
-<path fill-rule="evenodd" clip-rule="evenodd" d="M0.846132 7.0551C0.955572 7.19409 1.00486 7.37422 0.966818 7.54786L0.397045 10.1484C0.347209 10.3759 0.582394 10.5585 0.785897 10.4504L3.57028 8.97111C3.68847 8.90832 3.82519 8.89308 3.95545 8.92235C4.10681 8.95637 4.26085 8.98517 4.41724 9.0085L7.42991 5.99583C7.95828 5.46746 8.74046 5.34759 9.38399 5.63621C9.67954 5.13862 10.197 4.78826 10.7999 4.72154L10.8 4.69927C10.8 2.27937 8.38234 0.31765 5.4 0.31765C2.41766 0.31765 0 2.27937 0 4.69927C0 5.56645 0.310468 6.37479 0.846132 7.0551ZM10.9335 6.06665C11.2648 6.06665 11.5335 6.33528 11.5335 6.66665V7.33332C11.5335 8.76926 10.3694 9.93332 8.93346 9.93332H8.04864L9.02435 10.909C9.25867 11.1434 9.25867 11.5233 9.02435 11.7576C8.79004 11.9919 8.41014 11.9919 8.17583 11.7576L5.75156 9.3333L8.17583 6.90904C8.41014 6.67472 8.79004 6.67472 9.02435 6.90904C9.25867 7.14335 9.25867 7.52325 9.02435 7.75757L8.0486 8.73332H8.93346C9.70666 8.73332 10.3335 8.10652 10.3335 7.33332V6.66665C10.3335 6.33528 10.6021 6.06665 10.9335 6.06665Z"/>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="12" height="12" viewBox="0 0 12 12"><path fill-rule="evenodd" d="M0.846132 7.0551C0.955572 7.19409 1.00486 7.37422 0.966818 7.54786L0.397045 10.1484C0.347209 10.3759 0.582394 10.5585 0.785897 10.4504L3.57028 8.97111C3.68847 8.90832 3.82519 8.89308 3.95545 8.92235C4.10681 8.95637 4.26085 8.98517 4.41724 9.0085L7.42991 5.99583C7.95828 5.46746 8.74046 5.34759 9.38399 5.63621C9.67954 5.13862 10.197 4.78826 10.7999 4.72154L10.8 4.69927C10.8 2.27937 8.38234 0.31765 5.4 0.31765C2.41766 0.31765 0 2.27937 0 4.69927C0 5.56645 0.310468 6.37479 0.846132 7.0551ZM10.9335 6.06665C11.2648 6.06665 11.5335 6.33528 11.5335 6.66665V7.33332C11.5335 8.76926 10.3694 9.93332 8.93346 9.93332H8.04864L9.02435 10.909C9.25867 11.1434 9.25867 11.5233 9.02435 11.7576C8.79004 11.9919 8.41014 11.9919 8.17583 11.7576L5.75156 9.3333L8.17583 6.90904C8.41014 6.67472 8.79004 6.67472 9.02435 6.90904C9.25867 7.14335 9.25867 7.52325 9.02435 7.75757L8.0486 8.73332H8.93346C9.70666 8.73332 10.3335 8.10652 10.3335 7.33332V6.66665C10.3335 6.33528 10.6021 6.06665 10.9335 6.06665Z" clip-rule="evenodd"/></svg>
\ No newline at end of file
diff --git a/assets/images/user-check.svg b/assets/images/user-check.svg
new file mode 100644
index 000000000000..931f4e5f6a51
--- /dev/null
+++ b/assets/images/user-check.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" id="Layer_1" x="0" y="0" version="1.1" viewBox="0 0 20 20" style="enable-background:new 0 0 20 20" xml:space="preserve"><path d="M9.77,14.136c-0.993,1.103-1.016,2.74-0.126,3.865H3.722c-1.416,0-2.223-0.444-2.223-1.778c0-3.556,4.001-6.223,8-6.223	c2.258,0,4.516,0.85,6.055,2.23l-1.39,1.824l-0.157-0.141C12.775,12.804,10.878,12.904,9.77,14.136z M9.5,9.111	c1.964,0,3.556-1.592,3.556-3.556S11.464,1.999,9.5,1.999S5.944,3.591,5.944,5.555S7.536,9.111,9.5,9.111z M19.028,12.619	c-0.439-0.334-1.067-0.249-1.403,0.189l-3.187,4.184l-1.77-1.593c-0.41-0.37-1.042-0.337-1.412,0.074	c-0.37,0.41-0.337,1.043,0.074,1.412l3.384,3.045l4.503-5.91C19.552,13.581,19.467,12.954,19.028,12.619z"/></svg>
\ No newline at end of file
diff --git a/assets/images/x-circle.svg b/assets/images/x-circle.svg
index c186e41c4244..5fa5f3741567 100644
--- a/assets/images/x-circle.svg
+++ b/assets/images/x-circle.svg
@@ -1,12 +1 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg id="Layer_1" data-name="Layer 1" xmlns="http://www.w3.org/2000/svg" version="1.1" viewBox="0 0 20 20">
-  <defs>
-    <style>
-      .cls-1 {
-        fill-rule: evenodd;
-        stroke-width: 0px;
-      }
-    </style>
-  </defs>
-  <path class="cls-1" d="M16.364,16.364c3.515-3.515,3.515-9.213,0-12.728C12.849.121,7.151.121,3.636,3.636.121,7.151.121,12.849,3.636,16.364c3.515,3.515,9.213,3.515,12.728,0ZM6.111,6.111c.586-.586,1.536-.586,2.121,0l1.768,1.768,1.768-1.768c.586-.586,1.535-.586,2.121,0,.586.586.586,1.536,0,2.121l-1.768,1.768,1.768,1.768c.586.586.586,1.535,0,2.121s-1.536.586-2.121,0l-1.768-1.768-1.768,1.768c-.586.586-1.536.586-2.121,0-.586-.586-.586-1.536,0-2.121l1.768-1.768-1.768-1.768c-.586-.586-.586-1.536,0-2.121Z"/>
-</svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" id="Layer_1" data-name="Layer 1" version="1.1" viewBox="0 0 20 20"><defs><style>.cls-1{fill-rule:evenodd;stroke-width:0}</style></defs><path d="M16.364,16.364c3.515-3.515,3.515-9.213,0-12.728C12.849.121,7.151.121,3.636,3.636.121,7.151.121,12.849,3.636,16.364c3.515,3.515,9.213,3.515,12.728,0ZM6.111,6.111c.586-.586,1.536-.586,2.121,0l1.768,1.768,1.768-1.768c.586-.586,1.535-.586,2.121,0,.586.586.586,1.536,0,2.121l-1.768,1.768,1.768,1.768c.586.586.586,1.535,0,2.121s-1.536.586-2.121,0l-1.768-1.768-1.768,1.768c-.586.586-1.536.586-2.121,0-.586-.586-.586-1.536,0-2.121l1.768-1.768-1.768-1.768c-.586-.586-.586-1.536,0-2.121Z" class="cls-1"/></svg>
\ No newline at end of file
diff --git a/babel.config.js b/babel.config.js
index 9f8b7a711d78..dcf12ba4d91e 100644
--- a/babel.config.js
+++ b/babel.config.js
@@ -2,8 +2,15 @@ require('dotenv').config();
 
 const IS_E2E_TESTING = process.env.E2E_TESTING === 'true';
 
+const ReactCompilerConfig = {
+    runtimeModule: 'react-compiler-runtime',
+    environment: {
+        enableTreatRefLikeIdentifiersAsRefs: true,
+    },
+};
 const defaultPresets = ['@babel/preset-react', '@babel/preset-env', '@babel/preset-flow', '@babel/preset-typescript'];
 const defaultPlugins = [
+    ['babel-plugin-react-compiler', ReactCompilerConfig], // must run first!
     // Adding the commonjs: true option to react-native-web plugin can cause styling conflicts
     ['react-native-web'],
 
@@ -18,6 +25,19 @@ const defaultPlugins = [
     'react-native-reanimated/plugin',
 ];
 
+// The Fullstory annotate plugin generated a few errors when executed in Electron. Let's
+// ignore it for desktop builds.
+if (!process.env.ELECTRON_ENV && process.env.npm_lifecycle_event !== 'desktop') {
+    console.debug('This is not a desktop build, adding babel-plugin-annotate-react');
+    defaultPlugins.push([
+        '@fullstory/babel-plugin-annotate-react',
+        {
+            'react-native-web': true,
+            native: true,
+        },
+    ]);
+}
+
 const webpack = {
     presets: defaultPresets,
     plugins: defaultPlugins,
@@ -35,6 +55,16 @@ const metro = {
         ['@babel/plugin-proposal-private-property-in-object', {loose: true}],
         // The reanimated babel plugin needs to be last, as stated here: https://docs.swmansion.com/react-native-reanimated/docs/fundamentals/installation
         'react-native-reanimated/plugin',
+
+        /* Fullstory */
+        '@fullstory/react-native',
+        [
+            '@fullstory/babel-plugin-annotate-react',
+            {
+                native: true,
+            },
+        ],
+
         // Import alias for native devices
         [
             'module-resolver',
@@ -118,5 +148,11 @@ module.exports = (api) => {
     const runningIn = api.caller((args = {}) => args.name);
     console.debug('  - running in: ', runningIn);
 
+    // don't include react-compiler in jest, because otherwise tests will fail
+    if (runningIn !== 'babel-jest') {
+        // must run first!
+        metro.plugins.unshift(['babel-plugin-react-compiler', ReactCompilerConfig]);
+    }
+
     return ['metro', 'babel-jest'].includes(runningIn) ? metro : webpack;
 };
diff --git a/config/electronBuilder.config.js b/config/electronBuilder.config.js
index e4ed685f65fe..ad3a23407b89 100644
--- a/config/electronBuilder.config.js
+++ b/config/electronBuilder.config.js
@@ -45,6 +45,12 @@ module.exports = {
         notarize: {
             teamId: '368M544MTT',
         },
+        target: [
+            {
+                target: 'default',
+                arch: ['universal'],
+            },
+        ],
     },
     dmg: {
         title: 'New Expensify',
diff --git a/config/webpack/webpack.common.ts b/config/webpack/webpack.common.ts
index 7cafafca9973..33fd9131eca0 100644
--- a/config/webpack/webpack.common.ts
+++ b/config/webpack/webpack.common.ts
@@ -4,14 +4,24 @@ import dotenv from 'dotenv';
 import fs from 'fs';
 import HtmlWebpackPlugin from 'html-webpack-plugin';
 import path from 'path';
-import type {Configuration} from 'webpack';
+import type {Class} from 'type-fest';
+import type {Configuration, WebpackPluginInstance} from 'webpack';
 import {DefinePlugin, EnvironmentPlugin, IgnorePlugin, ProvidePlugin} from 'webpack';
 import {BundleAnalyzerPlugin} from 'webpack-bundle-analyzer';
 import CustomVersionFilePlugin from './CustomVersionFilePlugin';
 import type Environment from './types';
 
-// require is necessary, there are no types for this package and the declaration file can't be seen by the build process which causes an error.
-const PreloadWebpackPlugin = require('@vue/preload-webpack-plugin');
+type Options = {
+    rel: string;
+    as: string;
+    fileWhitelist: RegExp[];
+    include: string;
+};
+
+type PreloadWebpackPluginClass = Class<WebpackPluginInstance, [Options]>;
+
+// require is necessary, importing anything from @vue/preload-webpack-plugin causes an error
+const PreloadWebpackPlugin = require('@vue/preload-webpack-plugin') as PreloadWebpackPluginClass;
 
 const includeModules = [
     'react-native-animatable',
@@ -98,7 +108,7 @@ const getCommonConfiguration = ({file = '.env', platform = 'web'}: Environment):
                 {from: 'web/apple-touch-icon.png'},
                 {from: 'assets/images/expensify-app-icon.svg'},
                 {from: 'web/manifest.json'},
-                {from: 'web/gtm.js'},
+                {from: 'web/thirdPartyScripts.js'},
                 {from: 'assets/css', to: 'css'},
                 {from: 'assets/fonts/web', to: 'fonts'},
                 {from: 'assets/sounds', to: 'sounds'},
diff --git a/config/webpack/webpack.dev.ts b/config/webpack/webpack.dev.ts
index 7a196da6b691..80813adc1e3a 100644
--- a/config/webpack/webpack.dev.ts
+++ b/config/webpack/webpack.dev.ts
@@ -53,6 +53,10 @@ const getConfiguration = (environment: Environment): Promise<Configuration> =>
                         cert: path.join(__dirname, 'certificate.pem'),
                     },
                 },
+                headers: {
+                    // eslint-disable-next-line @typescript-eslint/naming-convention
+                    'Document-Policy': 'js-profiling',
+                },
             },
             plugins: [
                 new DefinePlugin({
@@ -72,8 +76,8 @@ const getConfiguration = (environment: Environment): Promise<Configuration> =>
             snapshot: {
                 // A list of paths webpack trusts would not be modified while webpack is running
                 managedPaths: [
-                    // Onyx can be modified on the fly, changes to other node_modules would not be reflected live
-                    /([\\/]node_modules[\\/](?!react-native-onyx))/,
+                    // Onyx and react-native-live-markdown can be modified on the fly, changes to other node_modules would not be reflected live
+                    /([\\/]node_modules[\\/](?!react-native-onyx|@expensify\/react-native-live-markdown))/,
                 ],
             },
         });
diff --git a/contributingGuides/APPLE_GOOGLE_SIGNIN.md b/contributingGuides/APPLE_GOOGLE_SIGNIN.md
index 08a444a6b8e4..cc3e256be399 100644
--- a/contributingGuides/APPLE_GOOGLE_SIGNIN.md
+++ b/contributingGuides/APPLE_GOOGLE_SIGNIN.md
@@ -96,6 +96,79 @@ These steps are covered in more detail in the "testing" section below.
 
 Due to some technical constraints, Apple and Google sign-in may require additional configuration to be able to work in the development environment as expected. This document describes any additional steps for each platform. 
 
+## Show Apple / Google SSO buttons development environment
+
+The Apple/Google Sign In button renders differently in development mode. To prevent confusion
+for developers about a possible regression, we decided to not render third party buttons in
+development mode.
+
+To re-enable the SSO buttons in development mode, remove this [condition](https://github.com/Expensify/App/blob/c2a718c9100e704c89ad9564301348bc53a49777/src/pages/signin/LoginForm/BaseLoginForm.tsx#L300) so that we always render the SSO button components:
+
+```diff
+diff --git a/src/pages/signin/LoginForm/BaseLoginForm.tsx b/src/pages/signin/LoginForm/BaseLoginForm.tsx
+index 4286a26033..850f8944ca 100644
+--- a/src/pages/signin/LoginForm/BaseLoginForm.tsx
++++ b/src/pages/signin/LoginForm/BaseLoginForm.tsx
+@@ -288,7 +288,7 @@ function BaseLoginForm({account, credentials, closeAccount, blurOnSubmit = false
+                            // for developers about possible regressions, we won't render buttons in development mode.
+                            // For more information about these differences and how to test in development mode,
+                            // see`Expensify/App/contributingGuides/APPLE_GOOGLE_SIGNIN.md`
+-                            CONFIG.ENVIRONMENT !== CONST.ENVIRONMENT.DEV && (
++                            (
+                                <View style={[getSignInWithStyles()]}>
+                                    <Text
+                                        accessibilityElementsHidden
+```
+
+## Desktop-specific setup
+
+1. Update `NEW_EXPENSIFY_URL` in `.env.staging`, setting it to the URL where the development web app can be found. This URL will vary based on whether you're testing for Apple or Google
+    - For Google, use http://localhost:8082 (make sure the port matches whatever you see in the browser when you run `npm run web`)
+    - For Apple, see [Configure the SSH tunneling](#configure-the-ssh-tunneling)
+2. Download and install the latest version of [SwiftDefaultApps](https://github.com/Lord-Kamina/SwiftDefaultApps?tab=readme-ov-file#installing--uninstalling).
+3. Open `System Settings` => `Swift Default Apps` => `URI Schemes` => `new-expensify` and select `New Expensify.app`
+4. Note that a dev build of the desktop app will not work. You'll create and install a local staging build:
+   1. Update `build-desktop.sh` replacing `--publish always` with `--publish never`. 
+   2. Run `npm run desktop-build-staging` and install the locally-generated desktop app to test.
+5. (Google only) apply the following diff:
+
+    ```diff
+    diff --git a/src/components/DeeplinkWrapper/index.website.tsx b/src/components/DeeplinkWrapper/index.website.tsx
+    index 765fbab038..4318528b4c 100644
+    --- a/src/components/DeeplinkWrapper/index.website.tsx
+    +++ b/src/components/DeeplinkWrapper/index.website.tsx
+    @@ -63,14 +63,7 @@ function DeeplinkWrapper({children, isAuthenticated, autoAuthState}: DeeplinkWra
+             const isUnsupportedDeeplinkRoute = routeRegex.test(window.location.pathname);
+     
+             // Making a few checks to exit early before checking authentication status
+    -        if (
+    -            !isMacOSWeb() ||
+    -            isUnsupportedDeeplinkRoute ||
+    -            hasShownPrompt ||
+    -            CONFIG.ENVIRONMENT === CONST.ENVIRONMENT.DEV ||
+    -            autoAuthState === CONST.AUTO_AUTH_STATE.NOT_STARTED ||
+    -            Session.isAnonymousUser()
+    -        ) {
+    +        if (!isMacOSWeb() || isUnsupportedDeeplinkRoute || hasShownPrompt || autoAuthState === CONST.AUTO_AUTH_STATE.NOT_STARTED || Session.isAnonymousUser()) {
+                 return;
+             }
+             // We want to show the prompt immediately if the user is already authenticated.
+    diff --git a/src/libs/Navigation/linkingConfig/prefixes.ts b/src/libs/Navigation/linkingConfig/prefixes.ts
+    index ca2da6f56b..2c191598f0 100644
+    --- a/src/libs/Navigation/linkingConfig/prefixes.ts
+    +++ b/src/libs/Navigation/linkingConfig/prefixes.ts
+    @@ -8,6 +8,7 @@ const prefixes: LinkingOptions<RootStackParamList>['prefixes'] = [
+         'https://www.expensify.cash',
+         'https://staging.expensify.cash',
+         'https://dev.new.expensify.com',
+    +    'http://localhost',
+         CONST.NEW_EXPENSIFY_URL,
+         CONST.STAGING_NEW_EXPENSIFY_URL,
+     ];
+    ```
+
+6. Run `npm run web`
+
 ## Apple
 
 #### Port requirements
@@ -193,57 +266,11 @@ This is required because the desktop app needs to know the address of the web ap
 
 Note that changing this value to a domain that isn't configured for use with Expensify will cause Android to break, as it is still using the real client ID, but now has an incorrect value for `redirectURI`.
 
-#### Set Environment to something other than "Development"
-
-The `DeepLinkWrapper` component will not handle deep links in the development environment. To be able to test deep linking, you must set the environment to something other than "Development".
-
-Within the `.env` file, set `envName` to something other than "Development", for example:
-
-```
-envName=Staging
-```
-
-Alternatively, within the `DeepLinkWrapper/index.website.js` file, you can set the `CONFIG.ENVIRONMENT` to something other than "Development".
+## Google
 
-#### Handle deep links in dev on MacOS
+Unlike with Apple, to test Google Sign-In we don't need to set up any http/ssh tunnels. We can just use `localhost`. But we need to set up the web and desktop environments to use `localhost` instead of `dev.new.expensify.com`
 
-If developing on MacOS, the development desktop app can't handle deeplinks correctly. To be able to test deeplinking back to the app, follow these steps:
-
-1. Create a "real" build of the desktop app, which can handle deep links, open the build folder, and install the dmg there:
-
-```shell
-npm run desktop-build
-open desktop-build
-# Then double-click "NewExpensify.dmg" in Finder window
-```
-
-2. Even with this build, the deep link may not be handled by the correct app, as the development Electron config seems to intercept it sometimes. To manage this, install [SwiftDefaultApps](https://github.com/Lord-Kamina/SwiftDefaultApps), which adds a preference pane that can be used to configure which app should handle deep links.
-
-### Test the Apple / Google SSO buttons in development environment
-
-The Apple/Google Sign In button renders differently in development mode. To prevent confusion
-for developers about a possible regression, we decided to not render third party buttons in
-development mode.
-
-Here's how you can re-enable the SSO buttons in development mode:
-
-- Remove this [condition](https://github.com/Expensify/App/blob/c2a718c9100e704c89ad9564301348bc53a49777/src/pages/signin/LoginForm/BaseLoginForm.tsx#L300) so that we always render the SSO button components
-    ```diff
-    diff --git a/src/pages/signin/LoginForm/BaseLoginForm.tsx b/src/pages/signin/LoginForm/BaseLoginForm.tsx
-    index 4286a26033..850f8944ca 100644
-    --- a/src/pages/signin/LoginForm/BaseLoginForm.tsx
-    +++ b/src/pages/signin/LoginForm/BaseLoginForm.tsx
-    @@ -288,7 +288,7 @@ function BaseLoginForm({account, credentials, closeAccount, blurOnSubmit = false
-                                // for developers about possible regressions, we won't render buttons in development mode.
-                                // For more information about these differences and how to test in development mode,
-                                // see`Expensify/App/contributingGuides/APPLE_GOOGLE_SIGNIN.md`
-    -                            CONFIG.ENVIRONMENT !== CONST.ENVIRONMENT.DEV && (
-    +                            (
-                                    <View style={[getSignInWithStyles()]}>
-                                        <Text
-                                            accessibilityElementsHidden
-    ```
-- Update the webpack.dev.ts [config](https://github.com/Expensify/App/blob/1d6bb1d14cff3dd029868a0a7c8ee14ae78c527b/config/webpack/webpack.dev.js#L47-L49) to change `host` from `dev.new.expensify.com` to `localhost` and server type from `https` to `http`. The reason for this is that Google Sign In allows localhost, but `dev.new.expensify.com` is not a registered Google Sign In domain.
+- (web/desktop) Update the webpack.dev.ts [config](https://github.com/Expensify/App/blob/1d6bb1d14cff3dd029868a0a7c8ee14ae78c527b/config/webpack/webpack.dev.js#L47-L49) to change `host` from `dev.new.expensify.com` to `localhost` and server type from `https` to `http`. The reason for this is that Google Sign In allows localhost, but `dev.new.expensify.com` is not a registered Google Sign In domain.
     ```diff
     diff --git a/config/webpack/webpack.dev.ts b/config/webpack/webpack.dev.ts
     index e28383eff5..b14f6f34aa 100644
@@ -262,7 +289,49 @@ Here's how you can re-enable the SSO buttons in development mode:
                             key: path.join(__dirname, 'key.pem'),
                             cert: path.join(__dirname, 'certificate.pem'),
     ```
+  
+- (desktop) Update the start script to use localhost:
 
-#### Set Environment to something other than "Development"
+    ```diff
+    diff --git a/desktop/start.ts b/desktop/start.ts
+    index 030bee95ce..7f7e115cf3 100644
+    --- a/desktop/start.ts
+    +++ b/desktop/start.ts
+    @@ -34,7 +34,7 @@ portfinder
+    env,
+    },
+    {
+    -                command: `wait-port dev.new.expensify.com:${port} && npx electronmon ./desktop/dev.js`,
+    +                command: `wait-port localhost:${port} && npx electronmon ./desktop/dev.js`,
+                     name: 'Electron',
+                     prefixColor: 'cyan.dim',
+                     env,
+    ```
+  
+- (desktop) Update the main process to use localhost w/ http:
+
+    ```diff
+    diff --git a/desktop/main.ts b/desktop/main.ts
+    index 0f4774d3b7..4cb7fe3683 100644
+    --- a/desktop/main.ts
+    +++ b/desktop/main.ts
+    @@ -98,7 +98,7 @@ Object.assign(console, log.functions);
+     // until it detects that it has been upgraded to the correct version.
+     
+     const EXPECTED_UPDATE_VERSION_FLAG = '--expected-update-version';
+    -const APP_DOMAIN = __DEV__ ? `https://dev.new.expensify.com:${port}` : 'app://-';
+    +const APP_DOMAIN = __DEV__ ? `http://localhost:${port}` : 'app://-';
+     
+     let expectedUpdateVersion: string;
+     process.argv.forEach((arg) => {
+    @@ -246,7 +246,7 @@ const mainWindow = (): Promise<void> => {
+         let deeplinkUrl: string;
+         let browserWindow: BrowserWindow;
+     
+    -    const loadURL = __DEV__ ? (win: BrowserWindow): Promise<void> => win.loadURL(`https://dev.new.expensify.com:${port}`) : serve({directory: `${__dirname}/www`});
+    +    const loadURL = __DEV__ ? (win: BrowserWindow): Promise<void> => win.loadURL(`http://localhost:${port}`) : serve({directory: `${__dirname}/www`});
+     
+         // Prod and staging set the icon in the electron-builder config, so only update it here for dev
+         if (__DEV__) {
+    ```
 
-The DeepLinkWrapper component will not handle deep links in the development environment. To be able to test deep linking, you must set the environment to something other than "Development".
diff --git a/contributingGuides/CONTRIBUTING.md b/contributingGuides/CONTRIBUTING.md
index 13f7592b65e1..eab59a65d003 100644
--- a/contributingGuides/CONTRIBUTING.md
+++ b/contributingGuides/CONTRIBUTING.md
@@ -31,24 +31,17 @@ This project and everyone participating in it is governed by the Expensify [Code
 ## Restrictions
 At this time, we are not hiring contractors in Crimea, North Korea, Russia, Iran, Cuba, or Syria.
 
-## Slack channels
-All contributors should be a member of a shared Slack channel called [#expensify-open-source](https://expensify.slack.com/archives/C01GTK53T8Q) -- this channel is used to ask **general questions**, facilitate **discussions**, and make **feature requests**.
-
-Before requesting an invite to Slack, please ensure your Upwork account is active, since we only pay via Upwork (see [below](https://github.com/Expensify/App/blob/main/contributingGuides/CONTRIBUTING.md#payment-for-contributions)). To request an invite to Slack, email contributors@expensify.com with the subject `Slack Channel Invites`. We'll send you an invite! 
-
-Note: Do not send direct messages to the Expensify team in Slack or Expensify Chat, they will not be able to respond. 
-
-Note: if you are hired for an Upwork job and have any job-specific questions, please ask in the GitHub issue or pull request. This will ensure that the person addressing your question has as much context as possible.
-
 ## Reporting Vulnerabilities
 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](https://www.upwork.com). If you'd like to be paid for contributing, 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. 
 
+Please add your Upwork profile link in your GitHub Bio to help ensure prompt payment.  If you're using Slack or Expensify for discussions, please add your Upwork profile link **and** your GitHub username in your Slack Title and Expensify Status. 
+
 Payment for your contributions 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).
 
-New contributors are limited to working on one job at a time, however experienced contributors may work on numerous jobs simultaneously.
+New contributors are limited to working on one job at a time, **do not submit proposals for new jobs until your first PR has been merged**. Experienced contributors may work on numerous jobs simultaneously.
 
 Please be aware that compensation for any support in solving an issue is provided **entirely at Expensify’s discretion**. Personal time or resources applied towards investigating a proposal **will not guarantee compensation**. Compensation is only guaranteed to those who **[propose a solution and get hired for that job](https://github.com/Expensify/App/blob/main/contributingGuides/CONTRIBUTING.md#propose-a-solution-for-the-job)**. We understand there may be cases where a selected proposal may take inspiration from a previous proposal. Unfortunately, it’s not possible for us to evaluate every individual case and we have no process that can efficiently do so. Issues with higher rewards come with higher risk factors so try to keep things civil and make the best proposal you can. Once again, **any information provided may not necessarily lead to you getting hired for that issue or compensated in any way.**
 
@@ -66,7 +59,7 @@ The 168 hours (aka 7 days) will be measured by calculating the time between when
 A job could be fixing a bug or working on a new feature. There are two ways you can find a job that you can contribute to:
 
 #### Finding a job that Expensify posted
-This is the most common scenario for contributors. The Expensify team posts new jobs to the Upwork job list [here](https://www.upwork.com/ab/jobs/search/?q=Expensify%20React%20Native&sort=recency&user_location_match=2) (you must be signed in to Upwork to view jobs). Each job in Upwork has a corresponding GitHub issue, which will include instructions to follow. You can also view all open jobs in the Expensify/App GH repository by searching for GH issues with the [`Help Wanted` label](https://github.com/Expensify/App/issues?q=is%3Aopen+is%3Aissue+label%3A%22Help+Wanted%22). Lastly, you can follow the [@ExpensifyOSS](https://twitter.com/ExpensifyOSS) Twitter account to see a live feed of jobs that are posted.
+This is the most common scenario for contributors. The Expensify team posts new jobs to the Upwork job list [here](https://www.upwork.com/nx/search/jobs/?nbs=1&q=expensify%20react%20native&sort=recency&user_location_match=2) (you must be signed in to Upwork to view jobs). Each job in Upwork has a corresponding GitHub issue, which will include instructions to follow. You can also view all open jobs in the Expensify/App GH repository by searching for GH issues with the [`Help Wanted` label](https://github.com/Expensify/App/issues?q=is%3Aopen+is%3Aissue+label%3A%22Help+Wanted%22). Lastly, you can follow the [@ExpensifyOSS](https://twitter.com/ExpensifyOSS) Twitter account to see a live feed of jobs that are posted.
 
 >**Note:** Our problem solving approach at Expensify is to focus on high value problems and avoid small optimizations with results that are difficult to measure. We also prefer to identify and solve problems at their root. Given that, please ensure all proposed jobs fix a specific problem in a measurable way with evidence so they are easy to evaluate. Here's an example of a good problem/solution:
 >
@@ -95,9 +88,10 @@ Additionally, if you want to discuss an idea with the open source community with
 
 #### Propose a solution for the job
 4. You can propose solutions on any issue at any time, but if you propose solutions to jobs before the `Help Wanted` label is applied, you do so at your own risk. Proposals will not be reviewed until the label is added and there is always a chance that we might not add the label or hire an external contributor for the job.
-5. After you reproduce the issue, complete the [proposal template here](./PROPOSAL_TEMPLATE.md) and post it as a comment in the corresponding GitHub issue (linked in the Upwork job).
+5. Contributors should **not** submit proposals on issues when they have assigned issues or PRs that are awaiting an action from them. If so, they will be in violation of Rule #1 (Get Shit Done) in our [Code of Conduct](https://github.com/Expensify/App/blob/main/CODE_OF_CONDUCT.md) and will receive a warning. Multiple warnings can lead to removal from the program. 
+6. After you reproduce the issue, complete the [proposal template here](./PROPOSAL_TEMPLATE.md) and post it as a comment in the corresponding GitHub issue (linked in the Upwork job).
     - Note: Before submitting a proposal on an issue, be sure to read any other existing proposals. ALL NEW PROPOSALS MUST BE DIFFERENT FROM EXISTING PROPOSALS. The *difference* should be important, meaningful or considerable.
-6. Refrain from leaving additional comments until someone from the Contributor-Plus team and / or someone from Expensify provides feedback on your proposal (do not create a pull request yet).
+7. Refrain from leaving additional comments until someone from the Contributor-Plus team and / or someone from Expensify provides feedback on your proposal (do not create a pull request yet).
     - Do not leave more than one proposal.
     - Do not make extensive changes to your current proposal until after it has been reviewed.
     - If you want to make an entirely new proposal or update an existing proposal, please go back and edit your original proposal, then post a new comment to the issue in this format to alert everyone that it has been updated:
@@ -105,8 +99,8 @@ Additionally, if you want to discuss an idea with the open source community with
     ## Proposal
     [Updated](link to proposal)
     ```
-7. If your proposal is accepted by the Expensify engineer assigned to the issue, Expensify will hire you on Upwork and assign the GitHub issue to you.
-8. Once hired, post a comment in the Github issue stating when you expect to have your PR ready for review.
+8. If your proposal is accepted by the Expensify engineer assigned to the issue, Expensify will hire you on Upwork and assign the GitHub issue to you.
+9. Once hired, post a comment in the Github issue stating when you expect to have your PR ready for review.
 
 #### Begin coding your solution in a pull request
 9. When you are ready to start, fork the repository and create a new branch.
diff --git a/contributingGuides/OFFLINE_UX.md b/contributingGuides/OFFLINE_UX.md
index 9fefbaeea111..47b2cf117a06 100644
--- a/contributingGuides/OFFLINE_UX.md
+++ b/contributingGuides/OFFLINE_UX.md
@@ -86,8 +86,12 @@ When the user is offline:
 
 **Handling errors:**
 - The [OfflineWithFeedback component](https://github.com/Expensify/App/blob/main/src/components/OfflineWithFeedback.js) already handles showing errors too, as long as you pass the error field in the [errors prop](https://github.com/Expensify/App/blob/128ea378f2e1418140325c02f0b894ee60a8e53f/src/components/OfflineWithFeedback.js#L29-L31)
+- The behavior for when something fails is:
+    - If you were adding new data, the failed to add data is displayed greyed out and with the button to dismiss the error
+    - If you were deleting data, the failed data is displayed regularly with the button to dismiss the error
+    - If you are updating data, the original data is displayed regulary with the button to dismiss the error
 - When dismissing the error, the `onClose` prop will be called, there we need to call an action that either:
-  - If the pendingAction was `delete`, it removes the data altogether
+  - If the pendingAction was `add`, it removes the data altogether
   - Otherwise, it would clear the errors and `pendingAction` properties from the data
 - We also need to show a Red Brick Road (RBR) guiding the user to the error. We need to manually do this for each piece of data using pattern B Optimistic WITH Feedback. Some common components like `MenuItem` already have a prop for it (`brickRoadIndicator`)
   - A Brick Road is the pattern of guiding members towards places that require their attention by following a series of UI elements that have the same color
diff --git a/contributingGuides/PROPTYPES_CONVERSION_TABLE.md b/contributingGuides/PROPTYPES_CONVERSION_TABLE.md
deleted file mode 100644
index 7e1c1dda4262..000000000000
--- a/contributingGuides/PROPTYPES_CONVERSION_TABLE.md
+++ /dev/null
@@ -1,144 +0,0 @@
-# Expensify PropTypes Conversion Table
-
-This is a reference to help you convert PropTypes to TypeScript types. 
-
-## Table of Contents
-
-- [Important Considerations](#important-considerations)
-  - [Don't Rely on `isRequired`](#dont-rely-on-isrequired)
-- [PropTypes Conversion Table](#proptypes-conversion-table)
-- [Conversion Example](#conversion-example)
-
-## Important Considerations
-
-### Don't Rely on `isRequired`
-
-Regardless of `isRequired` is present or not on props in `PropTypes`, read through the component implementation to check if props without `isRequired` can actually be optional. The use of `isRequired` is not consistent in the current codebase. Just because `isRequired` is not present, it does not necessarily mean that the prop is optional.
-
-One trick is to mark the prop in question with optional modifier `?`. See if the "possibly `undefined`" error is raised by TypeScript. If any error is raised, the implementation assumes the prop not to be optional.
-
-```ts
-// Before
-const propTypes = {
-  isVisible: PropTypes.bool.isRequired,
-  // `confirmText` prop is not marked as required here, theoretically it is optional.
-  confirmText: PropTypes.string,
-};
-
-// After
-type ComponentProps = {
-  isVisible: boolean;
-  // Consider it as required unless you have proof that it is indeed an optional prop.
-  confirmText: string; // vs. confirmText?: string;
-};
-```
-
-## PropTypes Conversion Table
-
-| PropTypes                                                            | TypeScript                                    | Instructions                                                                                                                                                                                                                                  |
-| -------------------------------------------------------------------- | --------------------------------------------- | --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
-| `PropTypes.any`                                                      | `T`, `Record<string, unknown>` or `unknown`   | Figure out what would be the correct data type and use it.<br><br>If you know that it's a object but isn't possible to determine the internal structure, use `Record<string, unknown>`.                                                       |
-| `PropTypes.array` or `PropTypes.arrayOf(T)`                          | `T[]` or `Array<T>`                           | Convert to `T[]`, where `T` is the data type of the array.<br><br>If `T` isn't a primitive type, create a separate `type` for the object structure of your prop and use it.                                                                   |
-| `PropTypes.bool`                                                     | `boolean`                                     | Convert to `boolean`.                                                                                                                                                                                                                         |
-| `PropTypes.func`                                                     | `(arg1: Type1, arg2: Type2...) => ReturnType` | Convert to the function signature.                                                                                                                                                                                                            |
-| `PropTypes.number`                                                   | `number`                                      | Convert to `number`.                                                                                                                                                                                                                          |
-| `PropTypes.object`, `PropTypes.shape(T)` or `PropTypes.exact(T)`     | `T`                                           | If `T` isn't a primitive type, create a separate `type` for the `T` object structure of your prop and use it.<br><br>If you want an object but it isn't possible to determine the internal structure, use `Record<string, unknown>`.          |
-| `PropTypes.objectOf(T)`                                              | `Record<string, T>`                           | Convert to a `Record<string, T>` where `T` is the data type of values stored in the object.<br><br>If `T` isn't a primitive type, create a separate `type` for the object structure and use it.                                               |
-| `PropTypes.string`                                                   | `string`                                      | Convert to `string`.                                                                                                                                                                                                                          |
-| `PropTypes.node`                                                     | `React.ReactNode`                             | Convert to `React.ReactNode`. `ReactNode` includes `ReactElement` as well as other types such as `strings`, `numbers`, `arrays` of the same, `null`, and `undefined` In other words, anything that can be rendered in React is a `ReactNode`. |
-| `PropTypes.element`                                                  | `React.ReactElement`                          | Convert to `React.ReactElement`.                                                                                                                                                                                                              |
-| `PropTypes.symbol`                                                   | `symbol`                                      | Convert to `symbol`.                                                                                                                                                                                                                          |
-| `PropTypes.elementType`                                              | `React.ElementType`                           | Convert to `React.ElementType`.                                                                                                                                                                                                               |
-| `PropTypes.instanceOf(T)`                                            | `T`                                           | Convert to `T`.                                                                                                                                                                                                                               |
-| `PropTypes.oneOf([T, U, ...])` or `PropTypes.oneOfType([T, U, ...])` | `T \| U \| ...`                               | Convert to a union type e.g. `T \| U \| ...`.                                                                                                                                                                                                 |
-
-## Conversion Example
-
-```ts
-// Before
-const propTypes = {
-  unknownData: PropTypes.any,
-  anotherUnknownData: PropTypes.any,
-  indexes: PropTypes.arrayOf(PropTypes.number),
-  items: PropTypes.arrayOf(
-    PropTypes.shape({
-      value: PropTypes.string,
-      label: PropTypes.string,
-    })
-  ),
-  shouldShowIcon: PropTypes.bool,
-  onChangeText: PropTypes.func,
-  count: PropTypes.number,
-  session: PropTypes.shape({
-    authToken: PropTypes.string,
-    accountID: PropTypes.number,
-  }),
-  errors: PropTypes.objectOf(PropTypes.string),
-  inputs: PropTypes.objectOf(
-    PropTypes.shape({
-      id: PropTypes.string,
-      label: PropTypes.string,
-    })
-  ),
-  label: PropTypes.string,
-  anchor: PropTypes.node,
-  footer: PropTypes.element,
-  uniqSymbol: PropTypes.symbol,
-  icon: PropTypes.elementType,
-  date: PropTypes.instanceOf(Date),
-  size: PropTypes.oneOf(["small", "medium", "large"]),
-
-  optionalString: PropTypes.string,
-  /**
-   * Note that all props listed above are technically optional because they lack the `isRequired` attribute.
-   * However, in most cases, props are actually required but the `isRequired` attribute is left out by mistake.
-   *
-   * For each prop that appears to be optional, determine whether the component implementation assumes that
-   * the prop has a value (making it non-optional) or not. Only those props that are truly optional should be
-   * labeled with a `?` in their type definition.
-   */
-};
-
-// After
-type Item = {
-  value: string;
-  label: string;
-};
-
-type Session = {
-  authToken: string;
-  accountID: number;
-};
-
-type Input = {
-  id: string;
-  label: string;
-};
-
-type Size = "small" | "medium" | "large";
-
-type ComponentProps = {
-  unknownData: string[];
-
-  // It's not possible to infer the data as it can be anything because of reasons X, Y and Z.
-  // eslint-disable-next-line @typescript-eslint/no-explicit-any
-  anotherUnknownData: unknown;
-
-  indexes: number[];
-  items: Item[];
-  shouldShowIcon: boolean;
-  onChangeText: (value: string) => void;
-  count: number;
-  session: Session;
-  errors: Record<string, string>;
-  inputs: Record<string, Input>;
-  label: string;
-  anchor: React.ReactNode;
-  footer: React.ReactElement;
-  uniqSymbol: symbol;
-  icon: React.ElementType;
-  date: Date;
-  size: Size;
-  optionalString?: string;
-};
-```
diff --git a/contributingGuides/REACT_COMPILER.md b/contributingGuides/REACT_COMPILER.md
new file mode 100644
index 000000000000..520cbd7b164a
--- /dev/null
+++ b/contributingGuides/REACT_COMPILER.md
@@ -0,0 +1,172 @@
+# React Compiler
+
+## What is the React Compiler?
+
+[React Compiler](https://react.dev/learn/react-compiler) is a tool designed to enhance the performance of React applications by automatically memoizing components that lack optimizations.
+
+At Expensify, we are early adopters of this tool and aim to fully leverage its capabilities.
+
+## React Compiler CI check
+
+We have implemented a CI check that runs the React Compiler on all pull requests (PRs). This check compares compilable files from the PR branch with those in the target branch. If it detects that a file was previously compiled successfully but now fails to compile, the check will fail.
+
+## What if CI check fails in my PR?
+
+If the CI check fails for your PR, you need to fix the problem. If you're unsure how to resolve it, you can ask for help in the `#expensify-open-source` Slack channel (and tag `@Kiryl Ziusko`).
+
+## How can I check what exactly prevents file from successful optimization or whether my fix for passing `react-compiler` actually works?
+
+You can run a dedicated script: `react-compiler-healthcheck-test` and examine the output. This command will list the files that failed to compile with details on what caused the failures. It will then save this output to `./react-compiler-output.txt` file. Read and examine the output to find what specific error the react-compiler throws.
+
+```bash
+npm run react-compiler-healthcheck-test
+```
+
+## How to fix a particular problem?
+
+Below are the most common failures and approaches to fix them:
+
+### New `ref` produces `Mutating a value returned from a function whose return value should not be mutated`
+
+If you encounter this error, you need to add the `Ref` postfix to the variable name. For example:
+
+```diff
+-const rerender = useRef();
++const rerenderRef = useRef()
+```
+
+### New `SharedValue` produces `Mutating a value returned from a function whose return value should not be mutated`
+
+If you added a modification to `SharedValue`, you'll likely encounter this error. You can ignore this error for now because the current `react-native-reanimated` API is not compatible with `react-compiler` rules. Once [this PR](https://github.com/software-mansion/react-native-reanimated/pull/6312) is merged, we'll rewrite the code to be compatible with `react-compiler`. Until then, you can ignore this error.
+
+### Existing manual memoization could not be preserved. [...]
+These types of errors usually occur when the calls to `useMemo` that were made manually are too complex for react-compiler to understand. React compiler is still experimental so unfortunately this can happen.
+
+Some specific cases of this error are described below.
+
+#### The inferred dependencies did not match the manually specified dependencies
+
+This usually happens when a dependency used inside a hook is omitted. Try including the missing dependencies.
+
+Please be aware that `react-compiler` struggles with memoization of nested fields, i. e.:
+
+```ts
+// ❌ such code triggers the error
+const selectedQboAccountName = useMemo(() => qboAccountOptions?.find(({id}) => id === qboConfig?.reimbursementAccountID)?.name, [qboAccountOptions, qboConfig?.reimbursementAccountID]);
+
+// ✅ this code can be compiled successfully
+const reimbursementAccountID = qboConfig?.reimbursementAccountID;
+const selectedQboAccountName = useMemo(() => qboAccountOptions?.find(({id}) => id === reimbursementAccountID)?.name, [qboAccountOptions, reimbursementAccountID]);
+// 👍 also new version of the code creates a variable for a repeated code
+// which is great because it reduces the amount of the duplicated code
+```
+
+#### This value may be mutated later, which could cause the value to change unexpectedly
+
+This usually happens when the value returned from `useMemo` is later passed to some other function, and `react-compiler` doesn't know if the value will stay stable or be mutated.
+
+```ts
+// ❌ such code triggers the error
+const myResult = useMemo(() => SearchUtils.buildSearchQueryJSON(foobar), [foobar]);
+// [...] some other code
+const betterQuery = Utils.improveQuery(myResult);
+
+// ✅ this code can be compiled successfully
+const {myResult, betterQuery} = useMemo(() => {
+    const result = SearchUtils.buildSearchQueryJSON(foobar);
+
+    return {
+        myResult: result,
+        betterQuery: Utils.improveQuery(result)
+    }
+},[foobar]);
+```
+
+### `Invalid nesting in program blocks or scopes`
+
+Such error may happen if we have a nested memoization, i. e.:
+
+```tsx
+const qboToggleSettingItems = [
+    {
+        onToggle: () => console.log('Hello world!'),
+        subscribedSetting: CONST.QUICKBOOKS_CONFIG.ENABLED,
+    },
+];
+
+return (
+  <Container>
+    {qboToggleSettingItems.map((item) => (
+        <ToggleSettingOptionRow
+            onToggle={item.onToggle}
+            // ❌ such code triggers the error - `qboConfig?.pendingFields` is an external variable from the closure
+            // so this code is pretty complicated for `react-compiler` optimizations 
+            pendingAction={settingsPendingAction([item.subscribedSetting], qboConfig?.pendingFields)}
+            // ❌ such code triggers the error - `qboConfig` is an external variable from the closure
+            errors={ErrorUtils.getLatestErrorField(qboConfig, item.subscribedSetting)}
+        />
+    ))}
+  </Container>
+)
+```
+
+And below is a corrected version of the code:
+
+```tsx
+const qboToggleSettingItems = [
+    {
+        onToggle: () => console.log('Hello world!'),
+        subscribedSetting: CONST.QUICKBOOKS_CONFIG.ENABLED,
+        // 👇 calculate variables and memoize `qboToggleSettingItems` object (done by `react-compiler`)
+        errors: ErrorUtils.getLatestErrorField(qboConfig, CONST.QUICKBOOKS_CONFIG.ENABLED),
+        pendingAction: settingsPendingAction([CONST.QUICKBOOKS_CONFIG.ENABLED], qboConfig?.pendingFields),
+    },
+];
+
+return (
+  <Container>
+    {qboToggleSettingItems.map((item) => (
+        <ToggleSettingOptionRow
+            onToggle={item.onToggle}
+            // ✅ we depend only on `qboToggleSettingItems`, no more complex closures, so everything is fine
+            pendingAction={item.pendingAction}
+            // ✅ we depend only on `qboToggleSettingItems`, no more complex closures, so everything is fine
+            errors={item.errors}
+        />
+    ))}
+  </Container>
+)
+```
+
+### `Unexpected terminal kind optional for ternary test block`
+
+The problem happens when you have a ternary operator and you are using optional chaining `?.` operator:
+
+```tsx
+<OfflineWithFeedback
+  description={menuItem.description}
+  // ❌ such code triggers the error
+  brickRoadIndicator={PolicyUtils.areSettingsInErrorFields(menuItem?.subscribedSettings, qboConfig?.errorFields) ? CONST.ERROR : undefined}
+>
+</OfflineWithFeedback>
+```
+
+In this case, `qboConfig?.errorFields` is causing the error, and the solution is to put it outside the ternary test block:
+
+```tsx
+// 👇 move optional field outside of a ternary block
+const errorFields = qboConfig?.errorFields;
+
+...
+
+<OfflineWithFeedback
+    description={menuItem.description}
+    // ✅ this code can be compiled successfully now
+    brickRoadIndicator={PolicyUtils.areSettingsInErrorFields(menuItem?.subscribedSettings, errorFields) ? CONST.ERROR : undefined}
+>
+</OfflineWithFeedback>
+```
+
+## What if my type of error is not listed here?
+
+This list is actively maintained. If you discover a new error that is not listed and find a way to fix it, please update this documentation and create a PR.
diff --git a/contributingGuides/STYLE.md b/contributingGuides/STYLE.md
index 36815cd0557c..6af3a82c2ff6 100644
--- a/contributingGuides/STYLE.md
+++ b/contributingGuides/STYLE.md
@@ -1,5 +1,63 @@
-# JavaScript Coding Standards
-
+# Coding Standards
+
+## Table of Contents
+
+- [Introduction](#introduction)
+- [TypeScript guidelines](#typescript-guidelines)
+    - [General rules](#general-rules)
+    - [`d.ts` extension](#dts-extension)
+    - [Type Alias vs Interface](#type-alias-vs-interface)
+    - [Enum vs. Union Type](#enum-vs-union-type)
+    - [`unknown` vs. `any`](#unknown-vs-any)
+    - [`T[]` vs. `Array<T>`](#t-vs-arrayt)
+    - [`@ts-ignore`](#ts-ignore)
+    - [Type Inference](#type-inference)
+    - [Utility Types](#utility-types)
+    - [`object` type](#object-type)
+    - [Prop Types](#prop-types)
+    - [File organization](#file-organization)
+    - [Reusable Types](#reusable-types)
+    - [`tsx` extension](#tsx-extension)
+    - [No inline prop types](#no-inline-prop-types)
+    - [Satisfies Operator](#satisfies-operator)
+    - [Type imports/exports](#type-importsexports)
+    - [Refs](#refs)
+    - [Other Expensify Resources on TypeScript](#other-expensify-resources-on-typescript)
+    - [Default value for inexistent IDs](#default-value-for-inexistent-IDs)
+- [Naming Conventions](#naming-conventions)
+    - [Type names](#type-names)
+    - [Prop callbacks](#prop-callbacks)
+    - [Event Handlers](#event-handlers)
+    - [Boolean variables and props](#boolean-variables-and-props)
+    - [Functions](#functions)
+    - [`var`, `const` and `let`](#var-const-and-let)
+- [Object / Array Methods](#object--array-methods)
+- [Accessing Object Properties and Default Values](#accessing-object-properties-and-default-values)
+- [JSDocs](#jsdocs)
+- [Component props](#component-props)
+- [Destructuring](#destructuring)
+- [Named vs Default Exports in ES6 - When to use what?](#named-vs-default-exports-in-es6---when-to-use-what)
+- [Classes and constructors](#classes-and-constructors)
+    - [Class syntax](#class-syntax)
+    - [Constructor](#constructor)
+- [ESNext: Are we allowed to use [insert new language feature]? Why or why not?](#esnext-are-we-allowed-to-use-insert-new-language-feature-why-or-why-not)
+- [React Coding Standards](#react-coding-standards)
+    - [Code Documentation](#code-documentation)
+    - [Inline Ternaries](#inline-ternaries)
+    - [Function component style](#function-component-style)
+    - [Forwarding refs](#forwarding-refs)
+    - [Hooks and HOCs](#hooks-and-hocs)
+    - [Stateless components vs Pure Components vs Class based components vs Render Props](#stateless-components-vs-pure-components-vs-class-based-components-vs-render-props---when-to-use-what)
+    - [Use Refs Appropriately](#use-refs-appropriately)
+    - [Are we allowed to use [insert brand new React feature]?](#are-we-allowed-to-use-insert-brand-new-react-feature-why-or-why-not)
+- [React Hooks: Frequently Asked Questions](#react-hooks-frequently-asked-questions)
+- [Onyx Best Practices](#onyx-best-practices)
+    - [Collection Keys](#collection-keys)
+- [Learning Resources](#learning-resources)
+
+## Introduction
+
+<!-- Consider removing this as we moved to TS -->
 For almost all of our code style rules, refer to the [Airbnb JavaScript Style Guide](https://github.com/airbnb/javascript).
 
 When writing ES6 or React code, please also refer to the [Airbnb React/JSX Style Guide](https://github.com/airbnb/javascript/tree/master/react).
@@ -10,13 +68,526 @@ We use Prettier to automatically style our code.
 
 There are a few things that we have customized for our tastes which will take precedence over Airbnb's guide.
 
+## TypeScript guidelines
+
+### General rules
+
+Strive to type as strictly as possible.
+
+```ts
+type Foo = {
+    fetchingStatus: "loading" | "success" | "error"; // vs. fetchingStatus: string;
+    person: { name: string; age: number }; // vs. person: Record<string, unknown>;
+};
+```
+
+### `d.ts` Extension
+
+Do not use `d.ts` file extension even when a file contains only type declarations. Only exceptions are `src/types/global.d.ts` and `src/types/modules/*.d.ts` files in which third party packages and JavaScript's built-in modules (e.g. `window` object) can be modified using [module augmentation](https://www.typescriptlang.org/docs/handbook/declaration-merging.html#module-augmentation).
+
+> Why? Type errors in `d.ts` files are not checked by TypeScript.
+
+### Type Alias vs. Interface
+
+Do not use `interface`. Use `type`. eslint: [`@typescript-eslint/consistent-type-definitions`](https://typescript-eslint.io/rules/consistent-type-definitions/)
+
+> Why? In TypeScript, `type` and `interface` can be used interchangeably to declare types. Use `type` for consistency.
+
+```ts
+// BAD
+interface Person {
+    name: string;
+}
+
+// GOOD
+type Person = {
+    name: string;
+};
+```
+
+### Enum vs. Union Type
+
+Do not use `enum`. Use union types. eslint: [`no-restricted-syntax`](https://eslint.org/docs/latest/rules/no-restricted-syntax)
+
+> Why? Enums come with several [pitfalls](https://blog.logrocket.com/why-typescript-enums-suck/). Most enum use cases can be replaced with union types.
+
+```ts
+// Most simple form of union type.
+type Color = "red" | "green" | "blue";
+function printColors(color: Color) {
+    console.log(color);
+}
+
+// When the values need to be iterated upon.
+import { TupleToUnion } from "type-fest";
+
+const COLORS = ["red", "green", "blue"] as const;
+type Color = TupleToUnion<typeof COLORS>; // type: 'red' | 'green' | 'blue'
+
+for (const color of COLORS) {
+    printColor(color);
+}
+
+// When the values should be accessed through object keys. (i.e. `COLORS.Red` vs. `"red"`)
+import { ValueOf } from "type-fest";
+
+const COLORS = {
+    Red: "red",
+    Green: "green",
+    Blue: "blue",
+} as const;
+type Color = ValueOf<typeof COLORS>; // type: 'red' | 'green' | 'blue'
+
+printColor(COLORS.Red);
+```
+
+### `unknown` vs. `any`
+
+Don't use `any`. Use `unknown` if type is not known beforehand. eslint: [`@typescript-eslint/no-explicit-any`](https://typescript-eslint.io/rules/no-explicit-any/)
+
+> Why? `any` type bypasses type checking. `unknown` is type safe as `unknown` type needs to be type narrowed before being used.
+
+```ts
+const value: unknown = JSON.parse(someJson);
+if (typeof value === 'string') {...}
+else if (isPerson(value)) {...}
+...
+```
+
+### `T[]` vs. `Array<T>`
+
+Use `T[]` or `readonly T[]` for simple types (i.e. types which are just primitive names or type references). Use `Array<T>` or `ReadonlyArray<T>` for all other types (union types, intersection types, object types, function types, etc). eslint: [`@typescript-eslint/array-type`](https://typescript-eslint.io/rules/array-type/)
+
+```ts
+// Array<T>
+const a: Array<string | number> = ["a", "b"];
+const b: Array<{ prop: string }> = [{ prop: "a" }];
+const c: Array<() => void> = [() => {}];
+
+// T[]
+const d: MyType[] = ["a", "b"];
+const e: string[] = ["a", "b"];
+const f: readonly string[] = ["a", "b"];
+```
+
+### `@ts-ignore`
+
+Do not use `@ts-ignore` or its variant `@ts-nocheck` to suppress warnings and errors.
+
+### Type Inference
+
+When possible, allow the compiler to infer type of variables.
+
+```ts
+// BAD
+const foo: string = "foo";
+const [counter, setCounter] = useState<number>(0);
+
+// GOOD
+const foo = "foo";
+const [counter, setCounter] = useState(0);
+const [username, setUsername] = useState<string | undefined>(undefined); // Username is a union type of string and undefined, and its type cannot be inferred from the default value of undefined
+```
+
+For function return types, default to always typing them unless a function is simple enough to reason about its return type.
+
+> Why? Explicit return type helps catch errors when implementation of the function changes. It also makes it easy to read code even when TypeScript intellisense is not provided.
+
+```ts
+function simpleFunction(name: string) {
+    return `hello, ${name}`;
+}
+
+function complicatedFunction(name: string): boolean {
+// ... some complex logic here ...
+    return foo;
+}
+```
+
+### Utility Types
+
+Use types from [TypeScript utility types](https://www.typescriptlang.org/docs/handbook/utility-types.html) and [`type-fest`](https://github.com/sindresorhus/type-fest) when possible.
+
+```ts
+type Foo = {
+    bar: string;
+};
+
+// BAD
+type ReadOnlyFoo = {
+    readonly [Property in keyof Foo]: Foo[Property];
+};
+
+// GOOD
+type ReadOnlyFoo = Readonly<Foo>;
+
+// BAD
+type FooValue = Foo[keyof Foo];
+
+// GOOD
+type FooValue = ValueOf<Foo>;
+
+```
+
+### `object` type
+
+Don't use `object` type. eslint: [`@typescript-eslint/ban-types`](https://typescript-eslint.io/rules/ban-types/)
+
+> Why? `object` refers to "any non-primitive type," not "any object". Typing "any non-primitive value" is not commonly needed.
+
+```ts
+// BAD
+const foo: object = [1, 2, 3]; // TypeScript does not error
+```
+
+If you know that the type of data is an object but don't know what properties or values it has beforehand, use `Record<string, unknown>`.
+
+> Even though `string` is specified as a key, `Record<string, unknown>` type can still accept objects whose keys are numbers. This is because numbers are converted to strings when used as an object index. Note that you cannot use [symbols](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Symbol) for `Record<string, unknown>`.
+
+```ts
+function logObject(object: Record<string, unknown>) {
+    for (const [key, value] of Object.entries(object)) {
+        console.log(`${key}: ${value}`);
+    }
+}
+```
+
+### Prop Types
+
+Don't use `ComponentProps` to grab a component's prop types. Go to the source file for the component and export prop types from there. Import and use the exported prop types. 
+
+> Why? Importing prop type from the component file is more common and readable. Using `ComponentProps` might cause problems in some cases (see [related GitHub issue](https://github.com/piotrwitek/react-redux-typescript-guide/issues/170)). Each component with props has it's prop  type defined in the file anyway, so it's easy to export it when required.
+
+Don't export prop types from component files by default. Only export it when there is a code that needs to access the prop type directly.
+
+```tsx
+// MyComponent.tsx
+export type MyComponentProps = {
+    foo: string;
+};
+
+export default function MyComponent({ foo }: MyComponentProps) {
+    return <Text>{foo}</Text>;
+}
+
+// BAD
+import { ComponentProps } from "React";
+import MyComponent from "./MyComponent";
+type MyComponentProps = ComponentProps<typeof MyComponent>;
+
+// GOOD
+import MyComponent, { MyComponentProps } from "./MyComponent";
+```
+
+### File organization
+
+In modules with platform-specific implementations, create `types.ts` to define shared types. Import and use shared types in each platform specific files. Do not use [`satisfies` operator](#satisfies-operator) for platform-specific implementations, always define shared types that complies with all variants.
+
+> Why? To encourage consistent API across platform-specific implementations. If you're migrating module that doesn't have a default implementation (i.e. `index.ts`, e.g. `getPlatform`), refer to [Migration Guidelines](#migration-guidelines) for further information.
+
+Utility module example
+
+```ts
+// types.ts
+type GreetingModule = {
+    getHello: () => string;
+    getGoodbye: () => string;
+};
+
+// index.native.ts
+import { GreetingModule } from "./types";
+function getHello() {
+    return "hello from mobile code";
+}
+function getGoodbye() {
+    return "goodbye from mobile code";
+}
+const Greeting: GreetingModule = {
+    getHello,
+    getGoodbye,
+};
+export default Greeting;
+
+// index.ts
+import { GreetingModule } from "./types";
+function getHello() {
+    return "hello from other platform code";
+}
+function getGoodbye() {
+    return "goodbye from other platform code";
+}
+const Greeting: GreetingModule = {
+    getHello,
+    getGoodbye,
+};
+export default Greeting;
+```
+
+Component module example
+
+```ts
+// types.ts
+export type MyComponentProps = {
+    foo: string;
+}
+
+// index.ios.ts
+import { MyComponentProps } from "./types";
+
+export MyComponentProps;
+export default function MyComponent({ foo }: MyComponentProps) { /* ios specific implementation */ }
+
+// index.ts
+import { MyComponentProps } from "./types";
+
+export MyComponentProps;
+export default function MyComponent({ foo }: MyComponentProps) { /* Default implementation */ }
+```
+
+### Reusable Types
+
+Reusable type definitions, such as models (e.g., Report), must have their own file and be placed under `src/types/`. The type should be exported as a default export.
+
+```ts
+// src/types/Report.ts
+
+type Report = {...};
+
+export default Report;
+```
+
+### `tsx` extension
+
+Use `.tsx` extension for files that contain React syntax.
+
+> Why? It is a widely adopted convention to mark any files that contain React specific syntax with `.jsx` or `.tsx`.
+
+### No inline prop types
+
+Do not define prop types inline for components that are exported.
+
+> Why? Prop types might [need to be exported from component files](#export-prop-types). If the component is only used inside a file or module and not exported, then inline prop types can be used.
+
+```ts
+// BAD
+export default function MyComponent({ foo, bar }: { foo: string, bar: number }){
+   // component implementation
+};
+
+// GOOD
+type MyComponentProps = { foo: string, bar: number };
+export default MyComponent({ foo, bar }: MyComponentProps){
+   // component implementation
+}
+```
+
+### Satisfies Operator
+
+Use the `satisfies` operator when you need to validate that the structure of an expression matches a specific type, without affecting the resulting type of the expression.
+
+> Why? TypeScript developers often want to ensure that an expression aligns with a certain type, but they also want to retain the most specific type possible for inference purposes. The `satisfies` operator assists in doing both.
+
+```ts
+// BAD
+const sizingStyles = {
+    w50: {
+        width: '50%',
+    },
+    mw100: {
+        maxWidth: '100%',
+    },
+} as const;
+
+// GOOD
+const sizingStyles = {
+    w50: {
+        width: '50%',
+    },
+    mw100: {
+        maxWidth: '100%',
+    },
+} as const satisfies Record<string, ViewStyle>;
+```
+
+The example above results in the most narrow type possible, also the values are `readonly`. There are some cases in which that is not desired (e.g. the variable can be modified), if so `as const` should be omitted.
+
+### Type imports/exports
+
+Always use the `type` keyword when importing/exporting types
+
+> Why? In order to improve code clarity and consistency and reduce bundle size after typescript transpilation, we enforce the all type imports/exports to contain the `type` keyword. This way, TypeScript can automatically remove those imports from the transpiled JavaScript bundle 
+
+Imports:
+```ts
+// BAD
+import {SomeType} from './a'
+import someVariable from './a'
+
+import {someVariable, SomeOtherType} from './b'
+
+// GOOD
+import type {SomeType} from './a'
+import someVariable from './a'
+```
+
+ Exports:
+```ts
+// BAD
+export {SomeType}
+export someVariable
+// or 
+export {someVariable, SomeOtherType}
+
+// GOOD
+export type {SomeType}
+export someVariable
+```
+
+### Refs
+
+Avoid using HTML elements while declaring refs. Please use React Native components where possible. React Native Web handles the references on its own. It also extends React Native components with [Interaction API](https://necolas.github.io/react-native-web/docs/interactions/) which should be used to handle Pointer and Mouse events. Exception of this rule is when we explicitly need to use functions available only in DOM and not in React Native, e.g. `getBoundingClientRect`. Then please declare ref type as `union` of React Native component and HTML element. When passing it to React Native component assert it as soon as possible using utility methods declared in `src/types/utils`.
+
+Normal usage: 
+```tsx
+const ref = useRef<View>();
+
+<View ref={ref} onPointerDown={e => {#DO SOMETHING}}>
+```
+
+Exceptional usage where DOM methods are necessary:
+```tsx
+import viewRef from '@src/types/utils/viewRef';
+
+const ref = useRef<View | HTMLDivElement>();
+
+if (ref.current && 'getBoundingClientRect' in ref.current) {
+  ref.current.getBoundingClientRect();
+}
+
+<View ref={viewRef(ref)} onPointerDown={e => {#DO SOMETHING}}>
+```
+
+### Other Expensify Resources on TypeScript
+
+- [Expensify TypeScript React Native CheatSheet](./TS_CHEATSHEET.md)
+
+### Default value for inexistent IDs
+
+ Use `'-1'` or `-1` when there is a possibility that the ID property of an Onyx value could be `null` or `undefined`.
+
+``` ts
+// BAD
+const foo = report?.reportID ?? '';
+const bar = report?.reportID ?? '0';
+
+report ? report.reportID : '0';
+report ? report.reportID : '';
+
+// GOOD
+const foo = report?.reportID ?? '-1';
+
+report ? report.reportID : '-1';
+```
+
 ## Naming Conventions
 
+### Type names
+
+  - Use PascalCase for type names. eslint: [`@typescript-eslint/naming-convention`](https://typescript-eslint.io/rules/naming-convention/)
+
+    ```ts
+    // BAD
+    type foo = ...;
+    type BAR = ...;
+
+    // GOOD
+    type Foo = ...;
+    type Bar = ...;
+    ```
+
+  - Do not postfix type aliases with `Type`.
+
+    ```ts
+    // BAD
+    type PersonType = ...;
+
+    // GOOD
+    type Person = ...;
+    ```
+
+  - Use singular name for union types.
+
+    ```ts
+    // BAD
+    type Colors = "red" | "blue" | "green";
+
+    // GOOD
+    type Color = "red" | "blue" | "green";
+    ```
+
+  - Use `{ComponentName}Props` pattern for prop types.
+
+    ```ts
+    // BAD
+    type Props = {
+        // component's props
+    };
+
+    function MyComponent({}: Props) {
+        // component's code
+    }
+
+    // GOOD
+    type MyComponentProps = {
+        // component's props
+    };
+
+    function MyComponent({}: MyComponentProps) {
+        // component's code
+    }
+    ```
+
+  - For generic type parameters, use `T` if you have only one type parameter. Don't use the `T`, `U`, `V`... sequence. Make type parameter names descriptive, each prefixed with `T`.
+
+    > Prefix each type parameter name to distinguish them from other types.
+
+    ```ts
+    // BAD
+    type KeyValuePair<T, U> = { key: K; value: U };
+
+    type Keys<Key> = Array<Key>;
+
+    // GOOD
+    type KeyValuePair<TKey, TValue> = { key: TKey; value: TValue };
+
+    type Keys<T> = Array<T>;
+    type Keys<TKey> = Array<TKey>;
+    ```
+
+### Prop callbacks
+  - Prop callbacks should be named for what has happened, not for what is going to happen. Components should never assume anything about how they will be used (that's the job of whatever is implementing it).
+
+    ```ts
+    // Bad
+    type ComponentProps = {
+        /** A callback to call when we want to save the form */
+        onSaveForm: () => void;
+    };
+
+    // Good
+    type ComponentProps = {
+        /** A callback to call when the form has been submitted */
+        onFormSubmitted: () => void;
+    };
+    ```
+
+  * Do not use underscores when naming private methods.
+
 ### Event Handlers
   - When you have an event handler, do not prefix it with "on" or "handle". The method should be named for what it does, not what it handles. This promotes code reuse by minimizing assumptions that a method must be called in a certain fashion (eg. only as an event handler).
   - One exception for allowing the prefix of "on" is when it is used for callback `props` of a React component. Using it in this way helps to distinguish callbacks from public component methods.
 
-    ```javascript
+    ```ts
     // Bad
     const onSubmitClick = () => {
         // Validate form items and submit form
@@ -32,7 +603,7 @@ There are a few things that we have customized for our tastes which will take pr
 
 - Boolean props or variables must be prefixed with `should` or `is` to make it clear that they are `Boolean`. Use `should` when we are enabling or disabling some features and `is` in most other cases.
 
-```javascript
+```tsx
 // Bad
 <SomeComponent showIcon />
 
@@ -46,11 +617,11 @@ const valid = props.something && props.somethingElse;
 const isValid = props.something && props.somethingElse;
 ```
 
-## Functions
+### Functions
 
 Any function declared in a library module should use the `function myFunction` keyword rather than `const myFunction`.
 
-```javascript
+```tsx
 // Bad
 const myFunction = () => {...};
 
@@ -68,23 +639,9 @@ export {
 }
 ```
 
-Using named functions is the preferred way to write a callback method.
-
-```javascript
-// Bad
-people.map(function (item) {/* Long and complex logic */});
-people.map((item) => {/* Long and complex logic with many inner loops*/});
-useEffect/useMemo/useCallback(() => {/* Long and complex logic */}, []);
-
-// Good
-function mappingPeople(person) {/* Long and complex logic */};
-people.map(mappingPeople);
-useEffect/useMemo/useCallback(function handlingConnection() {/* Long and complex logic */}, []);
-```
-
 You can still use arrow function for declarations or simple logics to keep them readable.
 
-```javascript
+```tsx
 // Bad
 randomList.push({
      onSelected: Utils.checkIfAllowed(function checkTask() { return Utils.canTeamUp(people); }),
@@ -112,17 +669,6 @@ useEffect(() => {
 
 ```
 
-Empty functions (noop) should be declare as arrow functions with no whitespace inside. Avoid _.noop()
-
-```javascript
-// Bad
-const callback = _.noop;
-const callback = () => { };
-
-// Good
-const callback = () => {};
-```
-
 ## `var`, `const` and `let`
 
 - Never use `var`
@@ -130,7 +676,7 @@ const callback = () => {};
 - Try to write your code in a way where the variable reassignment isn't necessary
 - Use `let` only if there are no other options
 
-```javascript
+```tsx
 // Bad
 let array = [];
 
@@ -148,82 +694,97 @@ if (someCondition) {
 
 ## Object / Array Methods
 
-We have standardized on using [underscore.js](https://underscorejs.org/) methods for objects and collections instead of the native [Array instance methods](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array#instance_methods). This is mostly to maintain consistency, but there are some type safety features and conveniences that underscore methods provide us e.g. the ability to iterate over an object and the lack of a `TypeError` thrown if a variable is `undefined`.
+We have standardized on using the native [Array instance methods](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array#instance_methods) instead of [lodash](https://lodash.com/) methods for objects and collections. As the vast majority of code is written in TypeScript, we can safely use the native methods.
 
-```javascript
+```ts
 // Bad
-myArray.forEach(item => doSomething(item));
-// Good
 _.each(myArray, item => doSomething(item));
+// Good
+myArray.forEach(item => doSomething(item));
 
 // Bad
-const myArray = Object.keys(someObject).map((key) => doSomething(someObject[key]));
-// Good
 const myArray = _.map(someObject, (value, key) => doSomething(value));
+// Good
+const myArray = Object.keys(someObject).map((key) => doSomething(someObject[key]));
 
 // Bad
-myCollection.includes('item');
-// Good
 _.contains(myCollection, 'item');
+// Good
+myCollection.includes('item');
 
 // Bad
-const modifiedArray = someArray.filter(filterFunc).map(mapFunc);
-// Good
 const modifiedArray = _.chain(someArray)
     .filter(filterFunc)
     .map(mapFunc)
     .value();
+// Good
+const modifiedArray = someArray.filter(filterFunc).map(mapFunc);
 ```
 
 ## Accessing Object Properties and Default Values
 
-Use `lodashGet()` to safely access object properties and `||` to short circuit null or undefined values that are not guaranteed to exist in a consistent way throughout the codebase. In the rare case that you want to consider a falsy value as usable and the `||` operator prevents this, then be explicit about this in your code and check for the type.
+Use optional chaining (`?.`) to safely access object properties and nullish coalescing (`??`) to short circuit null or undefined values that are not guaranteed to exist in a consistent way throughout the codebase. Don't use the `lodashGet()` function. eslint: [`no-restricted-imports`](https://eslint.org/docs/latest/rules/no-restricted-imports)
 
-```javascript
-// Bad
-const value = somePossiblyNullThing ?? 'default';
-// Good
-const value = somePossiblyNullThing || 'default';
-// Bad
-const value = someObject.possiblyUndefinedProperty?.nestedProperty || 'default';
-// Bad
-const value = (someObject && someObject.possiblyUndefinedProperty && someObject.possiblyUndefinedProperty.nestedProperty) || 'default';
-// Good
-const value = lodashGet(someObject, 'possiblyUndefinedProperty.nestedProperty', 'default');
+```ts
+// BAD
+import lodashGet from "lodash/get";
+const name = lodashGet(user, "name", "default name");
+
+// BAD
+const name = user?.name || "default name";
+
+// GOOD
+const name = user?.name ?? "default name";
 ```
 
 ## JSDocs
 
-- Always document parameters and return values.
-- Optional parameters should be enclosed by `[]` e.g. `@param {String} [optionalText]`.
-- Document object parameters with separate lines e.g. `@param {Object} parameters` followed by `@param {String} parameters.field`.
-- If a parameter accepts more than one type, use `*` to denote there is no single type.
-- Use uppercase when referring to JS primitive values (e.g. `Boolean` not `bool`, `Number` not `int`, etc).
-- When specifying a return value use `@returns` instead of `@return`. If there is no return value, do not include one in the doc.
-
-- Avoid descriptions that don't add any additional information. Method descriptions should only be added when its behavior is unclear.
+- Omit comments that are redundant with TypeScript. Do not declare types in `@param` or `@return` blocks. Do not write `@implements`, `@enum`, `@private`, `@override`. eslint: [`jsdoc/no-types`](https://github.com/gajus/eslint-plugin-jsdoc/blob/main/.README/rules/no-types.md)
+- Only document params/return values if their names are not enough to fully understand their purpose. Not all parameters or return values need to be listed in the JSDoc comment. If there is no comment accompanying the parameter or return value, omit it.
+- When specifying a return value use `@returns` instead of `@return`. 
+- Avoid descriptions that don't add any additional information. Method descriptions should only be added when it's behavior is unclear.
 - Do not use block tags other than `@param` and `@returns` (e.g. `@memberof`, `@constructor`, etc).
 - Do not document default parameters. They are already documented by adding them to a declared function's arguments.
 - Do not use record types e.g. `{Object.<string, number>}`.
-- Do not create `@typedef` to use in JSDocs.
-- Do not use type unions e.g. `{(number|boolean)}`.
 
-```javascript
-// Bad
+```ts
+// BAD
 /**
- * Populates the shortcut modal
- * @param {bool} shouldShowAdvancedShortcuts whether to show advanced shortcuts
- * @return {*}
+ * @param {number} age
+ * @returns {boolean} Whether the person is a legal drinking age or nots
  */
-function populateShortcutModal(shouldShowAdvancedShortcuts) {
+function canDrink(age: number): boolean {
+    return age >= 21;
 }
 
-// Good
+// GOOD
 /**
- * @param {Boolean} shouldShowAdvancedShortcuts
- * @returns {Boolean}
+ * @returns Whether the person is a legal drinking age or nots
  */
-function populateShortcutModal(shouldShowAdvancedShortcuts) {
+function canDrink(age: number): boolean {
+    return age >= 21;
+}
+```
+
+In the above example, because the parameter `age` doesn't have any accompanying comment, it is completely omitted from the JSDoc.
+
+## Component props
+
+Do not use **`propTypes` and `defaultProps`**: . Use object destructing and assign a default value to each optional prop unless the default values is `undefined`.
+
+```tsx
+type MyComponentProps = {
+    requiredProp: string;
+    optionalPropWithDefaultValue?: number;
+    optionalProp?: boolean;
+};
+
+function MyComponent({
+    requiredProp,
+    optionalPropWithDefaultValue = 42,
+    optionalProp,
+}: MyComponentProps) {
+    // component's code
 }
 ```
 
@@ -234,7 +795,7 @@ We should avoid using object destructuring in situations where it reduces code c
 
 - Avoid object destructuring for a single variable that you only use *once*. It's clearer to use dot notation for accessing a single variable.
 
-```javascript
+```ts
 // Bad
 const {data} = event.data;
 
@@ -242,36 +803,6 @@ const {data} = event.data;
 const {name, accountID, email} = data;
 ```
 
-**React Components**
-
-Always use destructuring to get prop values. Destructuring is necessary to assign default values to props. 
-
-```javascript
-// Bad
-function UserInfo(props) {
-    return (
-        <View>
-            <Text>Name: {props.name}</Text>
-            <Text>Email: {props.email}</Text>
-        </View>
-    );
-}
-
-UserInfo.defaultProps = {
-    name: 'anonymous';
-}
-
-// Good
-function UserInfo({ name = 'anonymous', email }) {
-    return (
-        <View>
-            <Text>Name: {name}</Text>
-            <Text>Email: {email}</Text>
-        </View>
-    );
-}
-```
-
 ## Named vs Default Exports in ES6 - When to use what?
 
 ES6 provides two ways to export a module from a file: `named export` and `default export`. Which variation to use depends on how the module will be used.
@@ -283,7 +814,7 @@ ES6 provides two ways to export a module from a file: `named export` and `defaul
 - All exports (both default and named) should happen at the bottom of the file
 - Do **not** export individual features inline.
 
-```javascript
+```ts
 // Bad
 export const something = 'nope';
 export const somethingElse = 'stop';
@@ -300,10 +831,10 @@ export {
 
 ## Classes and constructors
 
-#### Class syntax
+### Class syntax
 Using the `class` syntax is preferred wherever appropriate. Airbnb has clear [guidelines](https://github.com/airbnb/javascript#classes--constructors) in their JS style guide which promotes using the _class_ syntax. Don't manipulate the `prototype` directly. The `class` syntax is generally considered more concise and easier to understand.
 
-#### Constructor
+### Constructor
 Classes have a default constructor if one is not specified. No need to write a constructor function that is empty or just delegates to a parent class.
 
 ```js
@@ -341,105 +872,50 @@ So, if a new language feature isn't something we have agreed to support it's off
 Here are a couple of things we would ask that you *avoid* to help maintain consistency in our codebase:
 
 - **Async/Await** - Use the native `Promise` instead
-- **Optional Chaining** - Use `lodashGet()` to fetch a nested value instead
-- **Null Coalescing Operator** - Use `lodashGet()` or `||` to set a default value for a possibly `undefined` or `null` variable
 
-# React Coding Standards
+## React Coding Standards
 
-# React specific styles
+### Code Documentation
 
-## Method Naming and Code Documentation
-* Prop callbacks should be named for what has happened, not for what is going to happen. Components should never assume anything about how they will be used (that's the job of whatever is implementing it).
+* Add descriptions to all component props using a block comment above the definition. No need to document the types, but add some context for each property so that other developers understand the intended use.
 
-```javascript
+```tsx
 // Bad
-const propTypes = {
-    /** A callback to call when we want to save the form */
-    onSaveForm: PropTypes.func.isRequired,
+type ComponentProps = {
+    currency: string;
+    amount: number;
+    isIgnored: boolean;
 };
 
-// Good
-const propTypes = {
-    /** A callback to call when the form has been submitted */
-    onFormSubmitted: PropTypes.func.isRequired,
-};
-```
-
-* Do not use underscores when naming private methods.
-* Add descriptions to all `propTypes` using a block comment above the definition. No need to document the types (that's what `propTypes` is doing already), but add some context for each property so that other developers understand the intended use.
-
-```javascript
 // Bad
-const propTypes = {
-    currency: PropTypes.string.isRequired,
-    amount: PropTypes.number.isRequired,
-    isIgnored: PropTypes.bool.isRequired
-};
-
-// Bad
-const propTypes = {
+type ComponentProps = {
     // The currency that the reward is in
-    currency: React.PropTypes.string.isRequired,
+    currency: string;
 
     // The amount of reward
-    amount: React.PropTypes.number.isRequired,
+    amount: number;
 
     // If the reward has been ignored or not
-    isIgnored: React.PropTypes.bool.isRequired
+    isIgnored: boolean;
 }
 
 // Good
-const propTypes = {
+type ComponentProps = {
     /** The currency that the reward is in */
-    currency: React.PropTypes.string.isRequired,
+    currency: string;
 
     /** The amount of the reward */
-    amount: React.PropTypes.number.isRequired,
+    amount: number;
 
     /** If the reward has not been ignored yet */
-    isIgnored: React.PropTypes.bool.isRequired
+    isIgnored: boolean;
 }
 ```
 
-All `propTypes` and `defaultProps` *must* be defined at the **top** of the file in variables called `propTypes` and `defaultProps`.
-These variables should then be assigned to the component at the bottom of the file.
-
-```js
-MyComponent.propTypes = propTypes;
-MyComponent.defaultProps = defaultProps;
-export default MyComponent;
-```
-
-Any nested `propTypes` e.g. that may appear in a `PropTypes.shape({})` should also be documented.
-
-```javascript
-// Bad
-const propTypes = {
-    /** Session data */
-    session: PropTypes.shape({
-        authToken: PropTypes.string,
-        login: PropTypes.string,
-    }),
-}
-
-// Good
-const propTypes = {
-    /** Session data */
-    session: PropTypes.shape({
-
-        /** Token used to authenticate the user */
-        authToken: PropTypes.string,
-
-        /** User email or phone number */
-        login: PropTypes.string,
-    }),
-}
-```
-
-## Inline Ternaries
+### Inline Ternaries
 * Use inline ternary statements when rendering optional pieces of templates. Notice the white space and formatting of the ternary.
 
-```javascript
+```tsx
 // Bad
 {
     const optionalTitle = props.title ? <div className="title">{props.title}</div> : null;
@@ -452,7 +928,7 @@ const propTypes = {
 }
 ```
 
-```javascript
+```tsx
 // Good
 {
     return (
@@ -466,7 +942,7 @@ const propTypes = {
 }
 ```
 
-```javascript
+```tsx
 // Good
 {
     return (
@@ -481,11 +957,11 @@ const propTypes = {
 }
 ```
 
-### Important Note:
+#### Important Note:
 
 In React Native, one **must not** attempt to falsey-check a string for an inline ternary. Even if it's in curly braces, React Native will try to render it as a `<Text>` node and most likely throw an error about trying to render text outside of a `<Text>` component. Use `!!` instead.
 
-```javascript
+```tsx
 // Bad! This will cause a breaking an error on native platforms
 {
     return (
@@ -511,68 +987,113 @@ In React Native, one **must not** attempt to falsey-check a string for an inline
 }
 ```
 
-## Function component style
+### Function component style
 
 When writing a function component, you must ALWAYS add a `displayName` property and give it the same value as the name of the component (this is so it appears properly in the React dev tools)
 
-```javascript
-    function Avatar(props) {...};
+```tsx
+function Avatar(props: AvatarProps) {...};
 
-    Avatar.propTypes = propTypes;
-    Avatar.defaultProps = defaultProps;
-    Avatar.displayName = 'Avatar';
+Avatar.displayName = 'Avatar';
 
-    export default Avatar;
+export default Avatar;
 ```
 
-## Forwarding refs
+### 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 the form of anonymous component.
 
-```javascript
-    function FancyInput(props, ref) {
-        ...
-        return <input {...props} ref={ref} />
-    }
+```tsx
+import type {ForwarderRef} from 'react';
+
+type FancyInputProps = {
+    ...
+};
 
-    export default React.forwardRef(FancyInput)
+function FancyInput(props: FancyInputProps, ref: ForwardedRef<TextInput>) {
+    ...
+    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?
+If the ref handle is not available (e.g. `useImperativeHandle` is used) you can define a custom handle type above the component.
 
-Class components are DEPRECATED. Use function components and React hooks.
+```tsx 
+import type {ForwarderRef} from 'react';
+import {useImperativeHandle} from 'react';
 
-[https://react.dev/reference/react/Component#migrating-a-component-with-lifecycle-methods-from-a-class-to-a-function](https://react.dev/reference/react/Component#migrating-a-component-with-lifecycle-methods-from-a-class-to-a-function)
+type FancyInputProps = {
+    ...
+    onButtonPressed: () => void;
+};
 
-## Composition vs Inheritance
+type FancyInputHandle = {
+  onButtonPressed: () => void;
+}
 
-From React's documentation -
->Props and composition give you all the flexibility you need to customize a component’s look and behavior in an explicit and safe way. Remember that components may accept arbitrary props, including primitive values, React elements, or functions.
->If you want to reuse non-UI functionality between components, we suggest extracting it into a separate JavaScript module. The components may import it and use that function, object, or a class, without extending it.
+function FancyInput(props: FancyInputProps, ref: ForwardedRef<FancyInputHandle>) {
+    useImperativeHandle(ref, () => ({onButtonPressed}));
 
-Use an HOC a.k.a. *[Higher order component](https://reactjs.org/docs/higher-order-components.html)* if you find a use case where you need inheritance.
+    ...
+    return <input {...props} ref={ref} />;
+};
 
-If several HOC need to be combined, there is a `compose()` utility. But we should not use this utility when there is only one HOC.
+export default React.forwardRef(FancyInput)
+```
 
-```javascript
-// Bad
-export default compose(
-    withLocalize,
-)(MyComponent);
+### Hooks and HOCs
 
-// Good
-export default compose(
-    withLocalize,
-    withWindowDimensions,
-)(MyComponent);
+Use hooks whenever possible, avoid using HOCs.
 
-// Good
-export default withLocalize(MyComponent)
+> Why? Hooks are easier to use (can be used inside the function component), and don't need nesting or `compose` when exporting the component. It also allows us to remove `compose` completely in some components since it has been bringing up some issues with TypeScript. Read the [`compose` usage](#compose-usage) section for further information about the TypeScript issues with `compose`.
+
+Onyx now provides a `useOnyx` hook that should be used over `withOnyx` HOC.
+
+```tsx
+// BAD
+type ComponentOnyxProps = {
+    session: OnyxEntry<Session>;
+};
+
+type ComponentProps = ComponentOnyxProps & {
+    someProp: string;
+};
+
+function Component({session, someProp}: ComponentProps) {
+    const {windowWidth, windowHeight} = useWindowDimensions();
+    const {translate} = useLocalize();
+    // component's code
+}
+
+export default withOnyx<ComponentProps, ComponentOnyxProps>({
+    session: {
+        key: ONYXKEYS.SESSION,
+    },
+})(Component);
+
+// GOOD
+type ComponentProps = {
+    someProp: string;
+};
+
+function Component({someProp}: ComponentProps) {
+    const [session] = useOnyx(ONYXKEYS.SESSION)
+
+    const {windowWidth, windowHeight} = useWindowDimensions();
+    const {translate} = useLocalize();
+    // component's code
+}
 ```
 
-**Note:** If you find that none of these approaches work for you, please ask an Expensify engineer for guidance via Slack or GitHub.
+### 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.
+
+[https://react.dev/reference/react/Component#migrating-a-component-with-lifecycle-methods-from-a-class-to-a-function](https://react.dev/reference/react/Component#migrating-a-component-with-lifecycle-methods-from-a-class-to-a-function)
 
-## Use Refs Appropriately
+### Use Refs Appropriately
 
 React's documentation explains refs in [detail](https://reactjs.org/docs/refs-and-the-dom.html). It's important to understand when to use them and how to use them to avoid bugs and hard to maintain code.
 
@@ -580,43 +1101,43 @@ A common mistake with refs is using them to pass data back to a parent component
 
 There are several ways to use and declare refs and we prefer the [callback method](https://reactjs.org/docs/refs-and-the-dom.html#callback-refs).
 
-## Are we allowed to use [insert brand new React feature]? Why or why not?
+### Are we allowed to use [insert brand new React feature]? Why or why not?
 
 We love React and learning about all the new features that are regularly being added to the API. However, we try to keep our organization's usage of React limited to the most stable set of features that React offers. We do this mainly for **consistency** and so our engineers don't have to spend extra time trying to figure out how everything is working. That said, if you aren't sure if we have adopted something, please ask us first.
 
-# React Hooks: Frequently Asked Questions
+## React Hooks: Frequently Asked Questions
 
-## Are Hooks a Replacement for HOCs or Render Props?
+### Are Hooks a Replacement for HOCs or Render Props?
 
 In most cases, a custom hook is a better pattern to use than an HOC or Render Prop. They are easier to create, understand, use and document. However, there might still be a case for a HOC e.g. if you have a component that abstracts some conditional rendering logic.
 
-## Should I wrap all my inline functions with `useCallback()` or move them out of the component if they have no dependencies?
+### Should I wrap all my inline functions with `useCallback()` or move them out of the component if they have no dependencies?
 
 The answer depends on whether you need a stable reference for the function. If there are no dependencies, you could move the function out of the component. If there are dependencies, you could use `useCallback()` to ensure the reference updates only when the dependencies change. However, it's important to note that using `useCallback()` may have a performance penalty, although the trade-off is still debated. You might choose to do nothing at all if there is no obvious performance downside to declaring a function inline. It's recommended to follow the guidance in the [React documentation](https://react.dev/reference/react/useCallback#should-you-add-usecallback-everywhere) and add the optimization only if necessary. If it's not obvious why such an optimization (i.e. `useCallback()` or `useMemo()`) would be used, leave a code comment explaining the reasoning to aid reviewers and future contributors.
 
-## Why does `useState()` sometimes get initialized with a function?
+### Why does `useState()` sometimes get initialized with a function?
 
 React saves the initial state once and ignores it on the next renders. However, if you pass the result of a function to `useState()` or call a function directly e.g. `useState(doExpensiveThings())` it will *still run on every render*. This can hurt performance depending on what work the function is doing. As an optimization, we can pass an initializer function instead of a value e.g. `useState(doExpensiveThings)` or `useState(() => doExpensiveThings())`.
 
-## Is there an equivalent to `componentDidUpdate()` when using hooks?
+### Is there an equivalent to `componentDidUpdate()` when using hooks?
 
 The short answer is no. A longer answer is that sometimes we need to check not only that a dependency has changed, but how it has changed in order to run a side effect. For example, a prop had a value of an empty string on a previous render, but now is non-empty. The generally accepted practice is to store the "previous" value in a `ref` so the comparison can be made in a `useEffect()` call.
 
-## Are `useCallback()` and `useMemo()` basically the same thing?
+### Are `useCallback()` and `useMemo()` basically the same thing?
 
 No! It is easy to confuse `useCallback()` with a memoization helper like `_.memoize()` or `useMemo()` but they are really not the same at all. [`useCallback()` will return a cached function _definition_](https://react.dev/reference/react/useCallback) and will not save us any computational cost of running that function. So, if you are wrapping something in a `useCallback()` and then calling it in the render, then it is better to use `useMemo()` to cache the actual **result** of calling that function and use it directly in the render.
 
-## What is the `exhaustive-deps` lint rule? Can I ignore it?
+### What is the `exhaustive-deps` lint rule? Can I ignore it?
 
 A `useEffect()` that does not include referenced props or state in its dependency array is [usually a mistake](https://legacy.reactjs.org/docs/hooks-faq.html#is-it-safe-to-omit-functions-from-the-list-of-dependencies) as often we want effects to re-run when those dependencies change. However, there are some cases where we might actually only want to re-run the effect when only some of those dependencies change. We determined the best practice here should be to allow disabling the “next line” with a comment `//eslint-disable-next-line react-hooks/exhaustive-deps` and an additional comment explanation so the next developer can understand why the rule was not used.
 
-## Should I declare my components with arrow functions (`const`) or the `function` keyword?
+### Should I declare my components with arrow functions (`const`) or the `function` keyword?
 
 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()`?
+### How do I auto-focus a TextInput using `useFocusEffect()`?
 
-```javascript
+```tsx
 const focusTimeoutRef = useRef(null);
 
 useFocusEffect(useCallback(() => {
@@ -636,11 +1157,11 @@ This works better than using `onTransitionEnd` because -
 
 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 Best Practices
 
 [Onyx Documentation](https://github.com/expensify/react-native-onyx)
 
-## Collection Keys
+### Collection Keys
 
 Our potentially larger collections of data (reports, policies, etc) are typically stored under collection keys. Collection keys let us group together individual keys vs. storing arrays with multiple objects. In general, **do not add a new collection key if it can be avoided**. There is most likely a more logical place to put the state. And failing to associate a state property with its logical owner is something we consider to be an anti-pattern (unnecessary data structure adds complexity for no value).
 
@@ -648,4 +1169,20 @@ For example, if you are storing a boolean value that could be associated with a
 
 **Exception:** There are some [gotchas](https://github.com/expensify/react-native-onyx#merging-data) when working with complex nested array values in Onyx. So, this could be another valid reason to break a property off of its parent object (e.g. `reportActions` are easier to work with as a separate collection).
 
-If you're not sure whether something should have a collection key, reach out in [`#expensify-open-source`](https://expensify.slack.com/archives/C01GTK53T8Q) for additional feedback.
+If you're not sure whether something should have a collection key reach out in [`#expensify-open-source`](https://expensify.slack.com/archives/C01GTK53T8Q) for additional feedback.
+
+## Learning Resources
+
+### Quickest way to learn TypeScript
+
+- Get up to speed quickly
+  - [TypeScript playground](https://www.typescriptlang.org/play?q=231#example)
+    - Go though all examples on the playground. Click on "Example" tab on the top
+- Handy Reference
+  - [TypeScript CheatSheet](https://www.typescriptlang.org/cheatsheets)
+    - [Type](https://www.typescriptlang.org/static/TypeScript%20Types-ae199d69aeecf7d4a2704a528d0fd3f9.png)
+    - [Control Flow Analysis](https://www.typescriptlang.org/static/TypeScript%20Control%20Flow%20Analysis-8a549253ad8470850b77c4c5c351d457.png)
+- TypeScript with React
+  - [React TypeScript CheatSheet](https://react-typescript-cheatsheet.netlify.app/)
+    - [List of built-in utility types](https://react-typescript-cheatsheet.netlify.app/docs/basic/troubleshooting/utilities)
+    - [HOC CheatSheet](https://react-typescript-cheatsheet.netlify.app/docs/hoc/)
diff --git a/contributingGuides/TS_CHEATSHEET.md b/contributingGuides/TS_CHEATSHEET.md
index 1e330dafb7cf..77d316bb861d 100644
--- a/contributingGuides/TS_CHEATSHEET.md
+++ b/contributingGuides/TS_CHEATSHEET.md
@@ -21,8 +21,10 @@
 - [1.1](#children-prop) **`props.children`**
 
   ```tsx
-  type WrapperComponentProps = {
-    children?: React.ReactNode;
+  import type ChildrenProps from '@src/types/utils/ChildrenProps';
+
+  type WrapperComponentProps = ChildrenProps & {
+    ...
   };
 
   function WrapperComponent({ children }: WrapperComponentProps) {
diff --git a/contributingGuides/TS_STYLE.md b/contributingGuides/TS_STYLE.md
deleted file mode 100644
index 72d2bdeefba2..000000000000
--- a/contributingGuides/TS_STYLE.md
+++ /dev/null
@@ -1,746 +0,0 @@
-# Expensify TypeScript Style Guide
-
-## Table of Contents
-
-- [Other Expensify Resources on TypeScript](#other-expensify-resources-on-typescript)
-- [General Rules](#general-rules)
-- [Guidelines](#guidelines)
-  - [1.1 Naming Conventions](#naming-conventions)
-  - [1.2 `d.ts` Extension](#d-ts-extension)
-  - [1.3 Type Alias vs. Interface](#type-alias-vs-interface)
-  - [1.4 Enum vs. Union Type](#enum-vs-union-type)
-  - [1.5 `unknown` vs. `any`](#unknown-vs-any)
-  - [1.6 `T[]` vs. `Array<T>`](#array)
-  - [1.7 @ts-ignore](#ts-ignore)
-  - [1.8 Optional chaining and nullish coalescing](#ts-nullish-coalescing)
-  - [1.9 Type Inference](#type-inference)
-  - [1.10 JSDoc](#jsdoc)
-  - [1.11 `propTypes` and `defaultProps`](#proptypes-and-defaultprops)
-  - [1.12 Utility Types](#utility-types)
-  - [1.13 `object` Type](#object-type)
-  - [1.14 Export Prop Types](#export-prop-types)
-  - [1.15 File Organization](#file-organization)
-  - [1.16 Reusable Types](#reusable-types)
-  - [1.17 `.tsx`](#tsx)
-  - [1.18 No inline prop types](#no-inline-prop-types)
-  - [1.19 Satisfies operator](#satisfies-operator)
-  - [1.20 Hooks instead of HOCs](#hooks-instead-of-hocs)
-  - [1.21 `compose` usage](#compose-usage)
-  - [1.22 Type imports](#type-imports)
-- [Exception to Rules](#exception-to-rules)
-- [Communication Items](#communication-items)
-- [Migration Guidelines](#migration-guidelines)
-- [Learning Resources](#learning-resources)
-
-## Other Expensify Resources on TypeScript
-
-- [Expensify TypeScript React Native CheatSheet](./TS_CHEATSHEET.md)
-- [Expensify TypeScript PropTypes Conversion Table](./PROPTYPES_CONVERSION_TABLE.md)
-
-## General Rules
-
-Strive to type as strictly as possible.
-
-```ts
-type Foo = {
-  fetchingStatus: "loading" | "success" | "error"; // vs. fetchingStatus: string;
-  person: { name: string; age: number }; // vs. person: Record<string, unknown>;
-};
-```
-
-## Guidelines
-
-<a name="naming-conventions"></a><a name="1.1"></a>
-
-- [1.1](#naming-conventions) **Naming Conventions**: Follow naming conventions specified below
-
-  - Use PascalCase for type names. eslint: [`@typescript-eslint/naming-convention`](https://typescript-eslint.io/rules/naming-convention/)
-
-    ```ts
-    // BAD
-    type foo = ...;
-    type BAR = ...;
-
-    // GOOD
-    type Foo = ...;
-    type Bar = ...;
-    ```
-
-  - Do not postfix type aliases with `Type`.
-
-    ```ts
-    // BAD
-    type PersonType = ...;
-
-    // GOOD
-    type Person = ...;
-    ```
-
-  - Use singular name for union types.
-
-    ```ts
-    // BAD
-    type Colors = "red" | "blue" | "green";
-
-    // GOOD
-    type Color = "red" | "blue" | "green";
-    ```
-
-  - Use `{ComponentName}Props` pattern for prop types.
-
-    ```ts
-    // BAD
-    type Props = {
-      // component's props
-    };
-
-    function MyComponent({}: Props) {
-      // component's code
-    }
-
-    // GOOD
-    type MyComponentProps = {
-      // component's props
-    };
-
-    function MyComponent({}: MyComponentProps) {
-      // component's code
-    }
-    ```
-
-  - For generic type parameters, use `T` if you have only one type parameter. Don't use the `T`, `U`, `V`... sequence. Make type parameter names descriptive, each prefixed with `T`.
-
-    > Prefix each type parameter name to distinguish them from other types.
-
-    ```ts
-    // BAD
-    type KeyValuePair<T, U> = { key: K; value: U };
-
-    type Keys<Key> = Array<Key>;
-
-    // GOOD
-    type KeyValuePair<TKey, TValue> = { key: TKey; value: TValue };
-
-    type Keys<T> = Array<T>;
-    type Keys<TKey> = Array<TKey>;
-    ```
-
-<a name="d-ts-extension"></a><a name="1.2"></a>
-
-- [1.2](#d-ts-extension) **`d.ts` Extension**: Do not use `d.ts` file extension even when a file contains only type declarations. Only exceptions are `src/types/global.d.ts` and `src/types/modules/*.d.ts` files in which third party packages and JavaScript's built-in modules (e.g. `window` object) can be modified using module augmentation. Refer to the [Communication Items](#communication-items) section to learn more about module augmentation.
-
-  > Why? Type errors in `d.ts` files are not checked by TypeScript [^1].
-
-[^1]: This is because `skipLibCheck` TypeScript configuration is set to `true` in this project.
-
-<a name="type-alias-vs-interface"></a><a name="1.3"></a>
-
-- [1.3](#type-alias-vs-interface) **Type Alias vs. Interface**: Do not use `interface`. Use `type`. eslint: [`@typescript-eslint/consistent-type-definitions`](https://typescript-eslint.io/rules/consistent-type-definitions/)
-
-  > Why? In TypeScript, `type` and `interface` can be used interchangeably to declare types. Use `type` for consistency.
-
-  ```ts
-  // BAD
-  interface Person {
-    name: string;
-  }
-
-  // GOOD
-  type Person = {
-    name: string;
-  };
-  ```
-
-<a name="enum-vs-union-type"></a><a name="1.4"></a>
-
-- [1.4](#enum-vs-union-type) **Enum vs. Union Type**: Do not use `enum`. Use union types. eslint: [`no-restricted-syntax`](https://eslint.org/docs/latest/rules/no-restricted-syntax)
-
-  > Why? Enums come with several [pitfalls](https://blog.logrocket.com/why-typescript-enums-suck/). Most enum use cases can be replaced with union types.
-
-  ```ts
-  // Most simple form of union type.
-  type Color = "red" | "green" | "blue";
-  function printColors(color: Color) {
-    console.log(color);
-  }
-
-  // When the values need to be iterated upon.
-  import { TupleToUnion } from "type-fest";
-
-  const COLORS = ["red", "green", "blue"] as const;
-  type Color = TupleToUnion<typeof COLORS>; // type: 'red' | 'green' | 'blue'
-
-  for (const color of COLORS) {
-    printColor(color);
-  }
-
-  // When the values should be accessed through object keys. (i.e. `COLORS.Red` vs. `"red"`)
-  import { ValueOf } from "type-fest";
-
-  const COLORS = {
-    Red: "red",
-    Green: "green",
-    Blue: "blue",
-  } as const;
-  type Color = ValueOf<typeof COLORS>; // type: 'red' | 'green' | 'blue'
-
-  printColor(COLORS.Red);
-  ```
-
-<a name="unknown-vs-any"></a><a name="1.5"></a>
-
-- [1.5](#unknown-vs-any) **`unknown` vs. `any`**: Don't use `any`. Use `unknown` if type is not known beforehand. eslint: [`@typescript-eslint/no-explicit-any`](https://typescript-eslint.io/rules/no-explicit-any/)
-
-  > Why? `any` type bypasses type checking. `unknown` is type safe as `unknown` type needs to be type narrowed before being used.
-
-  ```ts
-  const value: unknown = JSON.parse(someJson);
-  if (typeof value === 'string') {...}
-  else if (isPerson(value)) {...}
-  ...
-  ```
-
-<a name="array"></a><a name="1.6"></a>
-
-- [1.6](#array) **`T[]` vs. `Array<T>`**: Use `T[]` or `readonly T[]` for simple types (i.e. types which are just primitive names or type references). Use `Array<T>` or `ReadonlyArray<T>` for all other types (union types, intersection types, object types, function types, etc). eslint: [`@typescript-eslint/array-type`](https://typescript-eslint.io/rules/array-type/)
-
-  ```ts
-  // Array<T>
-  const a: Array<string | number> = ["a", "b"];
-  const b: Array<{ prop: string }> = [{ prop: "a" }];
-  const c: Array<() => void> = [() => {}];
-
-  // T[]
-  const d: MyType[] = ["a", "b"];
-  const e: string[] = ["a", "b"];
-  const f: readonly string[] = ["a", "b"];
-  ```
-
-<a name="ts-ignore"></a><a name="1.7"></a>
-
-- [1.7](#ts-ignore) **@ts-ignore**: Do not use `@ts-ignore` or its variant `@ts-nocheck` to suppress warnings and errors.
-
-  > Use `@ts-expect-error` during the migration for type errors that should be handled later. Refer to the [Migration Guidelines](#migration-guidelines) for specific instructions on how to deal with type errors during the migration. eslint: [`@typescript-eslint/ban-ts-comment`](https://typescript-eslint.io/rules/ban-ts-comment/)
-
-<a name="ts-nullish-coalescing"></a><a name="1.8"></a>
-
-- [1.8](#ts-nullish-coalescing) **Optional chaining and nullish coalescing**: Use optional chaining and nullish coalescing instead of the `get` lodash function. eslint: [`no-restricted-imports`](https://eslint.org/docs/latest/rules/no-restricted-imports)
-
-  ```ts
-  // BAD
-  import lodashGet from "lodash/get";
-  const name = lodashGet(user, "name", "default name");
-
-  // GOOD
-  const name = user?.name ?? "default name";
-  ```
-
-<a name="type-inference"></a><a name="1.9"></a>
-
-- [1.9](#type-inference) **Type Inference**: When possible, allow the compiler to infer type of variables.
-
-  ```ts
-  // BAD
-  const foo: string = "foo";
-  const [counter, setCounter] = useState<number>(0);
-
-  // GOOD
-  const foo = "foo";
-  const [counter, setCounter] = useState(0);
-  const [username, setUsername] = useState<string | undefined>(undefined); // Username is a union type of string and undefined, and its type cannot be inferred from the default value of undefined
-  ```
-
-  For function return types, default to always typing them unless a function is simple enough to reason about its return type.
-
-  > Why? Explicit return type helps catch errors when implementation of the function changes. It also makes it easy to read code even when TypeScript intellisense is not provided.
-
-  ```ts
-  function simpleFunction(name: string) {
-    return `hello, ${name}`;
-  }
-
-  function complicatedFunction(name: string): boolean {
-    // ... some complex logic here ...
-    return foo;
-  }
-  ```
-
-<a name="jsdoc"></a><a name="1.10"></a>
-
-- [1.10](#jsdoc) **JSDoc**: Omit comments that are redundant with TypeScript. Do not declare types in `@param` or `@return` blocks. Do not write `@implements`, `@enum`, `@private`, `@override`. eslint: [`jsdoc/no-types`](https://github.com/gajus/eslint-plugin-jsdoc/blob/main/.README/rules/no-types.md)
-
-  > Not all parameters or return values need to be listed in the JSDoc comment. If there is no comment accompanying the parameter or return value, omit it.
-
-  ```ts
-  // BAD
-  /**
-   * @param {number} age
-   * @returns {boolean} Whether the person is a legal drinking age or nots
-   */
-  function canDrink(age: number): boolean {
-    return age >= 21;
-  }
-
-  // GOOD
-  /**
-   * @returns Whether the person is a legal drinking age or nots
-   */
-  function canDrink(age: number): boolean {
-    return age >= 21;
-  }
-  ```
-
-  In the above example, because the parameter `age` doesn't have any accompanying comment, it is completely omitted from the JSDoc.
-
-<a name="proptypes-and-defaultprops"></a><a name="1.11"></a>
-
-- [1.11](#proptypes-and-defaultprops) **`propTypes` and `defaultProps`**: Do not use them. Use object destructing to assign default values if necessary.
-
-  > Refer to [the propTypes Migration Table](./PROPTYPES_CONVERSION_TABLE.md) on how to type props based on existing `propTypes`.
-
-  > Assign a default value to each optional prop unless the default values is `undefined`.
-
-  ```tsx
-  type MyComponentProps = {
-    requiredProp: string;
-    optionalPropWithDefaultValue?: number;
-    optionalProp?: boolean;
-  };
-
-  function MyComponent({
-    requiredProp,
-    optionalPropWithDefaultValue = 42,
-    optionalProp,
-  }: MyComponentProps) {
-    // component's code
-  }
-  ```
-
-<a name="utility-types"></a><a name="1.12"></a>
-
-- [1.12](#utility-types) **Utility Types**: Use types from [TypeScript utility types](https://www.typescriptlang.org/docs/handbook/utility-types.html) and [`type-fest`](https://github.com/sindresorhus/type-fest) when possible.
-
-  ```ts
-  type Foo = {
-    bar: string;
-  };
-
-  // BAD
-  type ReadOnlyFoo = {
-    readonly [Property in keyof Foo]: Foo[Property];
-  };
-
-  // GOOD
-  type ReadOnlyFoo = Readonly<Foo>;
-  ```
-
-<a name="object-type"></a><a name="1.13"></a>
-
-- [1.13](#object-type) **`object`**: Don't use `object` type. eslint: [`@typescript-eslint/ban-types`](https://typescript-eslint.io/rules/ban-types/)
-
-  > Why? `object` refers to "any non-primitive type," not "any object". Typing "any non-primitive value" is not commonly needed.
-
-  ```ts
-  // BAD
-  const foo: object = [1, 2, 3]; // TypeScript does not error
-  ```
-
-  If you know that the type of data is an object but don't know what properties or values it has beforehand, use `Record<string, unknown>`.
-
-  > Even though `string` is specified as a key, `Record<string, unknown>` type can still accepts objects whose keys are numbers. This is because numbers are converted to strings when used as an object index. Note that you cannot use [symbols](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Symbol) for `Record<string, unknown>`.
-
-  ```ts
-  function logObject(object: Record<string, unknown>) {
-    for (const [key, value] of Object.entries(object)) {
-      console.log(`${key}: ${value}`);
-    }
-  }
-  ```
-
-<a name="export-prop-types"></a><a name="1.14"></a>
-
-- [1.14](#export-prop-types) **Prop Types**: Don't use `ComponentProps` to grab a component's prop types. Go to the source file for the component and export prop types from there. Import and use the exported prop types.
-
-  > Don't export prop types from component files by default. Only export it when there is a code that needs to access the prop type directly.
-
-  ```tsx
-  // MyComponent.tsx
-  export type MyComponentProps = {
-    foo: string;
-  };
-
-  export default function MyComponent({ foo }: MyComponentProps) {
-    return <Text>{foo}</Text>;
-  }
-
-  // BAD
-  import { ComponentProps } from "React";
-  import MyComponent from "./MyComponent";
-  type MyComponentProps = ComponentProps<typeof MyComponent>;
-
-  // GOOD
-  import MyComponent, { MyComponentProps } from "./MyComponent";
-  ```
-
-<a name="file-organization"></a><a name="1.15"></a>
-
-- [1.15](#file-organization) **File organization**: In modules with platform-specific implementations, create `types.ts` to define shared types. Import and use shared types in each platform specific files. Do not use [`satisfies` operator](#satisfies-operator) for platform-specific implementations, always define shared types that complies with all variants.
-
-  > Why? To encourage consistent API across platform-specific implementations. If you're migrating module that doesn't have a default implement (i.e. `index.ts`, e.g. `getPlatform`), refer to [Migration Guidelines](#migration-guidelines) for further information.
-
-  Utility module example
-
-  ```ts
-  // types.ts
-  type GreetingModule = {
-    getHello: () => string;
-    getGoodbye: () => string;
-  };
-
-  // index.native.ts
-  import { GreetingModule } from "./types";
-  function getHello() {
-    return "hello from mobile code";
-  }
-  function getGoodbye() {
-    return "goodbye from mobile code";
-  }
-  const Greeting: GreetingModule = {
-    getHello,
-    getGoodbye,
-  };
-  export default Greeting;
-
-  // index.ts
-  import { GreetingModule } from "./types";
-  function getHello() {
-    return "hello from other platform code";
-  }
-  function getGoodbye() {
-    return "goodbye from other platform code";
-  }
-  const Greeting: GreetingModule = {
-    getHello,
-    getGoodbye,
-  };
-  export default Greeting;
-  ```
-
-  Component module example
-
-  ```ts
-    // types.ts
-    export type MyComponentProps = {
-      foo: string;
-    }
-
-    // index.ios.ts
-    import { MyComponentProps } from "./types";
-
-    export MyComponentProps;
-    export default function MyComponent({ foo }: MyComponentProps) { /* ios specific implementation */ }
-
-    // index.ts
-    import { MyComponentProps } from "./types";
-
-    export MyComponentProps;
-    export default function MyComponent({ foo }: MyComponentProps) { /* Default implementation */ }
-  ```
-
-<a name="reusable-types"></a><a name="1.16"></a>
-
-- [1.16](#reusable-types) **Reusable Types**: Reusable type definitions, such as models (e.g., Report), must have their own file and be placed under `src/types/`. The type should be exported as a default export.
-
-  ```ts
-  // src/types/Report.ts
-
-  type Report = {...};
-
-  export default Report;
-  ```
-
-  <a name="tsx"></a><a name="1.17"></a>
-
-- [1.17](#tsx) **tsx**: Use `.tsx` extension for files that contain React syntax.
-
-  > Why? It is a widely adopted convention to mark any files that contain React specific syntax with `.jsx` or `.tsx`.
-
-  <a name="no-inline-prop-types"></a><a name="1.18"></a>
-
-- [1.18](#no-inline-prop-types) **No inline prop types**: Do not define prop types inline for components that are exported.
-
-  > Why? Prop types might [need to be exported from component files](#export-prop-types). If the component is only used inside a file or module and not exported, then inline prop types can be used.
-
-  ```ts
-  // BAD
-  export default function MyComponent({ foo, bar }: { foo: string, bar: number }){
-    // component implementation
-  };
-
-  // GOOD
-  type MyComponentProps = { foo: string, bar: number };
-  export default MyComponent({ foo, bar }: MyComponentProps){
-    // component implementation
-  }
-  ```
-
-  <a name="satisfies-operator"></a><a name="1.19"></a>
-
-- [1.19](#satisfies-operator) **Satisfies Operator**: Use the `satisfies` operator when you need to validate that the structure of an expression matches a specific type, without affecting the resulting type of the expression.
-
-  > Why? TypeScript developers often want to ensure that an expression aligns with a certain type, but they also want to retain the most specific type possible for inference purposes. The `satisfies` operator assists in doing both.
-
-  ```ts
-  // BAD
-  const sizingStyles = {
-    w50: {
-        width: '50%',
-    },
-    mw100: {
-        maxWidth: '100%',
-    },
-  } as const;
-
-  // GOOD
-  const sizingStyles = {
-    w50: {
-        width: '50%',
-    },
-    mw100: {
-        maxWidth: '100%',
-    },
-  } satisfies Record<string, ViewStyle>;
-  ```
-
-  <a name="hooks-instead-of-hocs"></a><a name="1.20"></a>
-
-- [1.20](#hooks-instead-of-hocs) **Hooks instead of HOCs**: Replace HOCs usage with Hooks whenever possible.
-
-  > Why? Hooks are easier to use (can be used inside the function component), and don't need nesting or `compose` when exporting the component. It also allows us to remove `compose` completely in some components since it has been bringing up some issues with TypeScript. Read the [`compose` usage](#compose-usage) section for further information about the TypeScript issues with `compose`.
-
-  > Note: Because Onyx doesn't provide a hook yet, in a component that accesses Onyx data with `withOnyx` HOC, please make sure that you don't use other HOCs (if applicable) to avoid HOC nesting.
-
-  ```tsx
-  // BAD
-  type ComponentOnyxProps = {
-      session: OnyxEntry<Session>;
-  };
-
-  type ComponentProps = WindowDimensionsProps &
-      WithLocalizeProps &
-      ComponentOnyxProps & {
-          someProp: string;
-      };
-
-  function Component({windowWidth, windowHeight, translate, session, someProp}: ComponentProps) {
-      // component's code
-  }
-
-  export default compose(
-      withWindowDimensions,
-      withLocalize,
-      withOnyx<ComponentProps, ComponentOnyxProps>({
-          session: {
-              key: ONYXKEYS.SESSION,
-          },
-      }),
-  )(Component);
-
-  // GOOD
-  type ComponentOnyxProps = {
-      session: OnyxEntry<Session>;
-  };
-
-  type ComponentProps = ComponentOnyxProps & {
-      someProp: string;
-  };
-
-  function Component({session, someProp}: ComponentProps) {
-      const {windowWidth, windowHeight} = useWindowDimensions();
-      const {translate} = useLocalize();
-      // component's code
-  }
-
-  // There is no hook alternative for withOnyx yet.
-  export default withOnyx<ComponentProps, ComponentOnyxProps>({
-      session: {
-          key: ONYXKEYS.SESSION,
-      },
-  })(Component);
-  ```
-
-  <a name="compose-usage"></a><a name="1.21"></a>
-
-- [1.21](#compose-usage) **`compose` usage**: Avoid the usage of `compose` function to compose HOCs in TypeScript files. Use nesting instead.
-
-  > Why? `compose` function doesn't work well with TypeScript when dealing with several HOCs being used in a component, many times resulting in wrong types and errors. Instead, nesting can be used to allow a seamless use of multiple HOCs and result in a correct return type of the compoment. Also, you can use [hooks instead of HOCs](#hooks-instead-of-hocs) whenever possible to minimize or even remove the need of HOCs in the component.
-
-  ```ts
-  // BAD
-  export default compose(
-      withCurrentUserPersonalDetails,
-      withReportOrNotFound(),
-      withOnyx<ComponentProps, ComponentOnyxProps>({
-          session: {
-              key: ONYXKEYS.SESSION,
-          },
-      }),
-  )(Component);
-
-  // GOOD
-  export default withCurrentUserPersonalDetails(
-      withReportOrNotFound()(
-          withOnyx<ComponentProps, ComponentOnyxProps>({
-              session: {
-                  key: ONYXKEYS.SESSION,
-              },
-          })(Component),
-      ),
-  );
-
-  // GOOD - alternative to HOC nesting
-  const ComponentWithOnyx = withOnyx<ComponentProps, ComponentOnyxProps>({
-      session: {
-          key: ONYXKEYS.SESSION,
-      },
-  })(Component);
-  const ComponentWithReportOrNotFound = withReportOrNotFound()(ComponentWithOnyx);
-  export default withCurrentUserPersonalDetails(ComponentWithReportOrNotFound);
-  ```
-
-   <a name="type-imports"></a><a name="1.22"></a>
-
-- [1.22](#type-imports) **Type imports/exports**: Always use the `type` keyword when importing/exporting types
-
-  > Why? In order to improve code clarity and consistency and reduce bundle size after typescript transpilation, we enforce the all type imports/exports to contain the `type` keyword. This way, TypeScript can automatically remove those imports from the transpiled JavaScript bundle 
-
-  Imports:
-  ```ts
-  // BAD
-  import {SomeType} from './a'
-  import someVariable from './a'
-
-  import {someVariable, SomeOtherType} from './b'
-
-  // GOOD
-  import type {SomeType} from './a'
-  import someVariable from './a'
-  ```
-
-    Exports:
-  ```ts
-  // BAD
-  export {SomeType}
-  export someVariable
-  // or 
-  export {someVariable, SomeOtherType}
-
-  // GOOD
-  export type {SomeType}
-  export someVariable
-  ```
-
-## Exception to Rules
-
-Most of the rules are enforced in ESLint or checked by TypeScript. If you think your particular situation warrants an exception, post the context in the `#expensify-open-source` Slack channel with your message prefixed with `TS EXCEPTION:`. The internal engineer assigned to the PR should be the one that approves each exception, however all discussion regarding granting exceptions should happen in the public channel instead of the GitHub PR page so that the TS migration team can access them easily.
-
-When an exception is granted, link the relevant Slack conversation in your PR. Suppress ESLint or TypeScript warnings/errors with comments if necessary.
-
-This rule will apply until the migration is done. After the migration, discussion on granting exception can happen inside the PR page and doesn't need take place in the Slack channel.
-
-## Communication Items
-
-> Comment in the `#expensify-open-source` Slack channel if any of the following situations are encountered. Each comment should be prefixed with `TS ATTENTION:`. Internal engineers will access each situation and prescribe solutions to each case. Internal engineers should refer to general solutions to each situation that follows each list item.
-
-- I think types definitions in a third party library or JavaScript's built-in module are incomplete or incorrect
-
-When the library indeed contains incorrect or missing type definitions and it cannot be updated, use module augmentation to correct them. All module augmentation code should be contained in `/src/types/modules/*.d.ts`, each library as a separate file.
-
-```ts
-// external-library-name.d.ts
-
-declare module "external-library-name" {
-  interface LibraryComponentProps {
-    // Add or modify typings
-    additionalProp: string;
-  }
-}
-```
-
-## Migration Guidelines
-
-> This section contains instructions that are applicable during the migration.
-
-- 🚨 Any new files under `src/` directory MUST be created in TypeScript now! New files in other directories (e.g. `tests/`, `desktop/`) can be created in TypeScript, if desired.
-
-- If you're migrating a module that doesn't have a default implementation (i.e. `index.ts`, e.g. `getPlatform`), convert `index.website.js` to `index.ts`. Without `index.ts`, TypeScript cannot get type information where the module is imported.
-
-- Deprecate the usage of `underscore`. Use vanilla methods from JS instead. Only use `lodash` when there is no easy vanilla alternative (eg. `lodashMerge`). eslint: [`no-restricted-imports`](https://eslint.org/docs/latest/rules/no-restricted-imports)
-
-```ts
-// BAD
-var arr = [];
-_.each(arr, () => {});
-
-// GOOD
-var arr = [];
-arr.forEach(function loopArr() {});
-
-// BAD
-lodashGet(object, ['foo'], 'bar');
-
-// GOOD
-object?.foo ?? 'bar';
-```
-
-- Found type bugs. Now what?
-
-  If TypeScript migration uncovers a bug that has been “invisible,” there are two options an author of a migration PR can take:
-
-  - Fix issues if they are minor. Document each fix in the PR comment.
-  - Suppress a TypeScript error stemming from the bug with `@ts-expect-error`. Create a separate GH issue. Prefix the issue title with `[TS ERROR #<issue-number-of-migration-PR>]`. Cross-link the migration PR and the created GH issue. On the same line as `@ts-expect-error`, put down the GH issue number prefixed with `TODO:`.
-
-  > The `@ts-expect-error` annotation tells the TS compiler to ignore any errors in the line that follows it. However, if there's no error in the line, TypeScript will also raise an error.
-
-  ```ts
-  // @ts-expect-error TODO: #21647
-  const x: number = "123"; // No TS error raised
-
-  // @ts-expect-error
-  const y: number = 123; // TS error: Unused '@ts-expect-error' directive.
-  ```
-
-- The TS issue I'm working on is blocked by another TS issue because of type errors. What should I do?
-
-  In order to proceed with the migration faster, we are now allowing the use of `@ts-expect-error` annotation to temporally suppress those errors and help you unblock your issues. The only requirements is that you MUST add the annotation with a comment explaining that it must be removed when the blocking issue is migrated, e.g.:
-
-  ```tsx
-  return (
-      <MenuItem
-          // @ts-expect-error TODO: Remove this once MenuItem (https://github.com/Expensify/App/issues/25144) is migrated to TypeScript.
-          wrapperStyle={styles.mr3}
-          key={text}
-          icon={icon}
-          title={text}
-          onPress={onPress}
-      />
-  );
-  ```
-
-  **You will also need to reference the blocking issue in your PR.** You can find all the TS issues [here](https://github.com/orgs/Expensify/projects/46).
-
-## Learning Resources
-
-### Quickest way to learn TypeScript
-
-- Get up to speed quickly
-  - [TypeScript playground](https://www.typescriptlang.org/play?q=231#example)
-    - Go though all examples on the playground. Click on "Example" tab on the top
-- Handy Reference
-  - [TypeScript CheatSheet](https://www.typescriptlang.org/cheatsheets)
-    - [Type](https://www.typescriptlang.org/static/TypeScript%20Types-ae199d69aeecf7d4a2704a528d0fd3f9.png)
-    - [Control Flow Analysis](https://www.typescriptlang.org/static/TypeScript%20Control%20Flow%20Analysis-8a549253ad8470850b77c4c5c351d457.png)
-- TypeScript with React
-  - [React TypeScript CheatSheet](https://react-typescript-cheatsheet.netlify.app/)
-    - [List of built-in utility types](https://react-typescript-cheatsheet.netlify.app/docs/basic/troubleshooting/utilities)
-    - [HOC CheatSheet](https://react-typescript-cheatsheet.netlify.app/docs/hoc/)
diff --git a/desktop/ELECTRON_EVENTS.ts b/desktop/ELECTRON_EVENTS.ts
index 607ad7b21580..b06794567c7d 100644
--- a/desktop/ELECTRON_EVENTS.ts
+++ b/desktop/ELECTRON_EVENTS.ts
@@ -9,6 +9,10 @@ const ELECTRON_EVENTS = {
     KEYBOARD_SHORTCUTS_PAGE: 'keyboard-shortcuts-page',
     START_UPDATE: 'start-update',
     UPDATE_DOWNLOADED: 'update-downloaded',
+    DOWNLOAD: 'download',
+    DOWNLOAD_COMPLETED: 'download-completed',
+    DOWNLOAD_FAILED: 'download-started',
+    DOWNLOAD_CANCELED: 'download-canceled',
     SILENT_UPDATE: 'silent-update',
 } as const;
 
diff --git a/desktop/contextBridge.ts b/desktop/contextBridge.ts
index 487e528a7485..74b91c4634a1 100644
--- a/desktop/contextBridge.ts
+++ b/desktop/contextBridge.ts
@@ -16,10 +16,19 @@ const WHITELIST_CHANNELS_RENDERER_TO_MAIN = [
     ELECTRON_EVENTS.REQUEST_VISIBILITY,
     ELECTRON_EVENTS.START_UPDATE,
     ELECTRON_EVENTS.LOCALE_UPDATED,
+    ELECTRON_EVENTS.DOWNLOAD,
     ELECTRON_EVENTS.SILENT_UPDATE,
 ] as const;
 
-const WHITELIST_CHANNELS_MAIN_TO_RENDERER = [ELECTRON_EVENTS.KEYBOARD_SHORTCUTS_PAGE, ELECTRON_EVENTS.UPDATE_DOWNLOADED, ELECTRON_EVENTS.FOCUS, ELECTRON_EVENTS.BLUR] as const;
+const WHITELIST_CHANNELS_MAIN_TO_RENDERER = [
+    ELECTRON_EVENTS.KEYBOARD_SHORTCUTS_PAGE,
+    ELECTRON_EVENTS.UPDATE_DOWNLOADED,
+    ELECTRON_EVENTS.FOCUS,
+    ELECTRON_EVENTS.BLUR,
+    ELECTRON_EVENTS.DOWNLOAD_COMPLETED,
+    ELECTRON_EVENTS.DOWNLOAD_FAILED,
+    ELECTRON_EVENTS.DOWNLOAD_CANCELED,
+] as const;
 
 const getErrorMessage = (channel: string): string => `Electron context bridge cannot be used with channel '${channel}'`;
 
@@ -67,7 +76,7 @@ contextBridge.exposeInMainWorld('electron', {
         }
 
         // Deliberately strip event as it includes `sender`
-        ipcRenderer.on(channel, (event, ...args) => func(...args));
+        ipcRenderer.on(channel, (event, ...args: unknown[]) => func(...args));
     },
 
     /** Remove listeners for a single channel from the main process and sent to the renderer process. */
diff --git a/desktop/createDownloadQueue.ts b/desktop/createDownloadQueue.ts
new file mode 100644
index 000000000000..8cc9fef4bbe2
--- /dev/null
+++ b/desktop/createDownloadQueue.ts
@@ -0,0 +1,126 @@
+import type {BrowserWindow} from 'electron';
+import {app} from 'electron';
+import * as path from 'path';
+import createQueue from '@libs/Queue/Queue';
+import CONST from '@src/CONST';
+import ELECTRON_EVENTS from './ELECTRON_EVENTS';
+import type Options from './electronDownloadManagerType';
+
+type DownloadItem = {
+    // The window where the download will be initiated
+    win: BrowserWindow;
+
+    // The URL of the file to be downloaded
+    url: string;
+
+    // The options for the download, such as save path, file name, etc.
+    options: Options;
+};
+
+type CreateDownloadQueue = () => {
+    enqueueDownloadItem: (item: DownloadItem) => void;
+    dequeueDownloadItem: () => DownloadItem | undefined;
+};
+
+type CreateDownloadQueueModule = {
+    default: CreateDownloadQueue;
+};
+
+/**
+ * Returns the filename with extension based on the given name and MIME type.
+ * @param name - The name of the file.
+ * @param mime - The MIME type of the file.
+ * @returns The filename with extension.
+ */
+const getFilenameFromMime = (name: string, mime: string): string => {
+    const extensions = mime.split('/').pop();
+    return `${name}.${extensions}`;
+};
+
+const createDownloadQueue: CreateDownloadQueue = () => {
+    const downloadItemProcessor = (item: DownloadItem): Promise<void> =>
+        new Promise((resolve, reject) => {
+            let downloadTimeout: NodeJS.Timeout;
+            let downloadListener: (event: Electron.Event, electronDownloadItem: Electron.DownloadItem) => void;
+
+            const timeoutFunction = () => {
+                item.win.webContents.session.removeListener('will-download', downloadListener);
+                resolve();
+            };
+
+            const listenerFunction = (event: Electron.Event, electronDownloadItem: Electron.DownloadItem) => {
+                clearTimeout(downloadTimeout);
+
+                const options = item.options;
+                const cleanup = () => item.win.webContents.session.removeListener('will-download', listenerFunction);
+                const errorMessage = `The download of ${electronDownloadItem.getFilename()} was interrupted`;
+
+                if (options.directory && !path.isAbsolute(options.directory)) {
+                    throw new Error('The `directory` option must be an absolute path');
+                }
+
+                const directory = options.directory ?? app.getPath('downloads');
+
+                let filePath: string;
+                if (options.filename) {
+                    filePath = path.join(directory, options.filename);
+                } else {
+                    const filename = electronDownloadItem.getFilename();
+                    const name = path.extname(filename) ? filename : getFilenameFromMime(filename, electronDownloadItem.getMimeType());
+
+                    filePath = options.overwrite ? path.join(directory, name) : path.join(directory, name);
+                }
+
+                if (options.saveAs) {
+                    electronDownloadItem.setSaveDialogOptions({defaultPath: filePath, ...options.dialogOptions});
+                } else {
+                    electronDownloadItem.setSavePath(filePath);
+                }
+
+                electronDownloadItem.on('updated', (_, state) => {
+                    if (state !== 'interrupted') {
+                        return;
+                    }
+
+                    item.win.webContents.send(ELECTRON_EVENTS.DOWNLOAD_CANCELED, {url: item.url});
+                    cleanup();
+                    reject(new Error(errorMessage));
+                    electronDownloadItem.cancel();
+                });
+
+                electronDownloadItem.on('done', (_, state) => {
+                    cleanup();
+                    if (state === 'cancelled') {
+                        item.win.webContents.send(ELECTRON_EVENTS.DOWNLOAD_CANCELED, {url: item.url});
+                        resolve();
+                    } else if (state === 'interrupted') {
+                        item.win.webContents.send(ELECTRON_EVENTS.DOWNLOAD_FAILED, {url: item.url});
+                        reject(new Error(errorMessage));
+                    } else if (state === 'completed') {
+                        if (process.platform === 'darwin') {
+                            const savePath = electronDownloadItem.getSavePath();
+                            app.dock.downloadFinished(savePath);
+                        }
+                        item.win.webContents.send(ELECTRON_EVENTS.DOWNLOAD_COMPLETED, {url: item.url});
+                        resolve();
+                    }
+                });
+            };
+
+            downloadTimeout = setTimeout(timeoutFunction, CONST.DOWNLOADS_TIMEOUT);
+            downloadListener = listenerFunction;
+
+            item.win.webContents.downloadURL(item.url);
+            item.win.webContents.session.on('will-download', downloadListener);
+        });
+
+    const queue = createQueue<DownloadItem>(downloadItemProcessor);
+
+    const enqueueDownloadItem = (item: DownloadItem): void => {
+        queue.enqueue(item);
+    };
+    return {enqueueDownloadItem, dequeueDownloadItem: queue.dequeue};
+};
+
+export default createDownloadQueue;
+export type {DownloadItem, CreateDownloadQueueModule};
diff --git a/desktop/electron-serve.ts b/desktop/electron-serve.ts
new file mode 100644
index 000000000000..ea7a567f9eff
--- /dev/null
+++ b/desktop/electron-serve.ts
@@ -0,0 +1,108 @@
+/* eslint-disable @typescript-eslint/no-misused-promises */
+
+/* eslint-disable rulesdir/no-negated-variables */
+
+/* eslint-disable @lwc/lwc/no-async-await */
+
+/**
+ * This file is a modified version of the electron-serve package.
+ * We keep the same interface, but instead of file protocol we use buffer protocol (with support of JS self profiling).
+ */
+import type {BrowserWindow, Protocol} from 'electron';
+import {app, protocol, session} from 'electron';
+import fs from 'fs';
+import mime from 'mime-types';
+import path from 'path';
+
+type RegisterBufferProtocol = Protocol['registerBufferProtocol'];
+type HandlerType = Parameters<RegisterBufferProtocol>[1];
+type Optional<T> = T | null | undefined;
+
+const FILE_NOT_FOUND = -6;
+
+const getPath = async (filePath: string): Promise<Optional<string>> => {
+    try {
+        const result = await fs.promises.stat(filePath);
+
+        if (result.isFile()) {
+            return filePath;
+        }
+
+        if (result.isDirectory()) {
+            // eslint-disable-next-line @typescript-eslint/return-await
+            return getPath(path.join(filePath, 'index.html'));
+        }
+    } catch {
+        return null;
+    }
+};
+
+type ServeOptions = {
+    directory: string;
+    isCorsEnabled?: boolean;
+    scheme?: string;
+    hostname?: string;
+    file?: string;
+    partition?: string;
+};
+
+export default function electronServe(options: ServeOptions) {
+    const mandatoryOptions = {
+        isCorsEnabled: true,
+        scheme: 'app',
+        hostname: '-',
+        file: 'index',
+        ...options,
+    };
+
+    if (!mandatoryOptions.directory) {
+        throw new Error('The `directory` option is required');
+    }
+
+    mandatoryOptions.directory = path.resolve(app.getAppPath(), mandatoryOptions.directory);
+
+    const handler: HandlerType = async (request, callback) => {
+        const filePath = path.join(mandatoryOptions.directory, decodeURIComponent(new URL(request.url).pathname));
+        const resolvedPath = (await getPath(filePath)) ?? path.join(mandatoryOptions.directory, `${mandatoryOptions.file}.html`);
+        const mimeType = mime.lookup(resolvedPath) || 'application/octet-stream';
+
+        try {
+            const data = await fs.promises.readFile(resolvedPath);
+            callback({
+                mimeType,
+                data: Buffer.from(data),
+                headers: {
+                    // eslint-disable-next-line @typescript-eslint/naming-convention
+                    'Document-Policy': 'js-profiling',
+                },
+            });
+        } catch (error) {
+            callback({error: FILE_NOT_FOUND});
+        }
+    };
+
+    protocol.registerSchemesAsPrivileged([
+        {
+            scheme: mandatoryOptions.scheme,
+            privileges: {
+                standard: true,
+                secure: true,
+                allowServiceWorkers: true,
+                supportFetchAPI: true,
+                corsEnabled: mandatoryOptions.isCorsEnabled,
+            },
+        },
+    ]);
+
+    app.on('ready', () => {
+        const partitionSession = mandatoryOptions.partition ? session.fromPartition(mandatoryOptions.partition) : session.defaultSession;
+
+        partitionSession.protocol.registerBufferProtocol(mandatoryOptions.scheme, handler);
+    });
+
+    // eslint-disable-next-line @typescript-eslint/naming-convention
+    return async (window_: BrowserWindow, searchParameters?: URLSearchParams) => {
+        const queryString = searchParameters ? `?${new URLSearchParams(searchParameters).toString()}` : '';
+        await window_.loadURL(`${mandatoryOptions.scheme}://${mandatoryOptions.hostname}${queryString}`);
+    };
+}
diff --git a/desktop/electronDownloadManagerType.ts b/desktop/electronDownloadManagerType.ts
new file mode 100644
index 000000000000..755efe173887
--- /dev/null
+++ b/desktop/electronDownloadManagerType.ts
@@ -0,0 +1,49 @@
+import type {SaveDialogOptions} from 'electron';
+
+type Options = {
+    /**
+    Show a `Save As…` dialog instead of downloading immediately.
+
+    Note: Only use this option when strictly necessary. Downloading directly without a prompt is a much better user experience.
+
+    @default false
+    */
+    readonly saveAs?: boolean;
+
+    /**
+    The directory to save the file in.
+
+    Must be an absolute path.
+
+    Default: [User's downloads directory](https://electronjs.org/docs/api/app/#appgetpathname)
+    */
+    readonly directory?: string;
+
+    /**
+    Name of the saved file.
+    This option only makes sense for `electronDownloadManager.download()`.
+
+    Default: [`downloadItem.getFilename()`](https://electronjs.org/docs/api/download-item/#downloaditemgetfilename)
+    */
+    readonly filename?: string;
+
+    /**
+    Allow downloaded files to overwrite files with the same name in the directory they are saved to.
+
+    The default behavior is to append a number to the filename.
+
+    @default false
+    */
+    readonly overwrite?: boolean;
+
+    /**
+    Customize the save dialog.
+
+    If `defaultPath` is not explicity defined, a default value is assigned based on the file path.
+
+    @default {}
+    */
+    readonly dialogOptions?: SaveDialogOptions;
+};
+
+export default Options;
diff --git a/desktop/main.ts b/desktop/main.ts
index b40557464ec1..1221b05a8388 100644
--- a/desktop/main.ts
+++ b/desktop/main.ts
@@ -3,7 +3,6 @@ import type {BrowserView, MenuItem, MenuItemConstructorOptions, WebContents, Web
 import contextMenu from 'electron-context-menu';
 import log from 'electron-log';
 import type {ElectronLog} from 'electron-log';
-import serve from 'electron-serve';
 import {autoUpdater} from 'electron-updater';
 import {machineId} from 'node-machine-id';
 import checkForUpdates from '@libs/checkForUpdates';
@@ -13,8 +12,12 @@ import CONST from '@src/CONST';
 import type {TranslationPaths} from '@src/languages/types';
 import type PlatformSpecificUpdater from '@src/setup/platformSetup/types';
 import type {Locale} from '@src/types/onyx';
+import type {CreateDownloadQueueModule, DownloadItem} from './createDownloadQueue';
+import serve from './electron-serve';
 import ELECTRON_EVENTS from './ELECTRON_EVENTS';
 
+const createDownloadQueue = require<CreateDownloadQueueModule>('./createDownloadQueue').default;
+
 const port = process.env.PORT ?? 8082;
 const {DESKTOP_SHORTCUT_ACCELERATOR, LOCALES} = CONST;
 
@@ -138,7 +141,7 @@ const manuallyCheckForUpdates = (menuItem?: MenuItem, browserWindow?: BrowserWin
 
     autoUpdater
         .checkForUpdates()
-        .catch((error) => {
+        .catch((error: unknown) => {
             isSilentUpdating = false;
             return {error};
         })
@@ -581,7 +584,7 @@ const mainWindow = (): Promise<void> => {
                     app.hide();
                 }
 
-                ipcMain.on(ELECTRON_EVENTS.LOCALE_UPDATED, (event, updatedLocale) => {
+                ipcMain.on(ELECTRON_EVENTS.LOCALE_UPDATED, (event, updatedLocale: Locale) => {
                     Menu.setApplicationMenu(Menu.buildFromTemplate(localizeMenuItems(initialMenuTemplate, updatedLocale)));
                     disposeContextMenu();
                     disposeContextMenu = createContextMenu(updatedLocale);
@@ -601,7 +604,7 @@ const mainWindow = (): Promise<void> => {
 
                 // Listen to badge updater event emitted by the render process
                 // and update the app badge count (MacOS only)
-                ipcMain.on(ELECTRON_EVENTS.REQUEST_UPDATE_BADGE_COUNT, (event, totalCount) => {
+                ipcMain.on(ELECTRON_EVENTS.REQUEST_UPDATE_BADGE_COUNT, (event, totalCount?: number) => {
                     if (totalCount === -1) {
                         // The electron docs say you should be able to update this and pass no parameters to set the badge
                         // to a single red dot, but in practice it resulted in an error "TypeError: Insufficient number of
@@ -613,6 +616,15 @@ const mainWindow = (): Promise<void> => {
                     }
                 });
 
+                const downloadQueue = createDownloadQueue();
+                ipcMain.on(ELECTRON_EVENTS.DOWNLOAD, (event, downloadData: DownloadItem) => {
+                    const downloadItem: DownloadItem = {
+                        ...downloadData,
+                        win: browserWindow,
+                    };
+                    downloadQueue.enqueueDownloadItem(downloadItem);
+                });
+
                 // Automatically check for and install the latest version in the background
                 ipcMain.on(ELECTRON_EVENTS.SILENT_UPDATE, () => {
                     if (isSilentUpdating) {
diff --git a/desktop/package-lock.json b/desktop/package-lock.json
index efa8a25a0614..aeac3b7aca08 100644
--- a/desktop/package-lock.json
+++ b/desktop/package-lock.json
@@ -9,11 +9,20 @@
       "dependencies": {
         "electron-context-menu": "^2.3.0",
         "electron-log": "^4.4.8",
-        "electron-serve": "^1.3.0",
-        "electron-updater": "^6.2.1",
+        "electron-updater": "^6.3.2",
+        "mime-types": "^2.1.35",
         "node-machine-id": "^1.1.12"
+      },
+      "devDependencies": {
+        "@types/mime-types": "^2.1.4"
       }
     },
+    "node_modules/@types/mime-types": {
+      "version": "2.1.4",
+      "resolved": "https://registry.npmjs.org/@types/mime-types/-/mime-types-2.1.4.tgz",
+      "integrity": "sha512-lfU4b34HOri+kAY5UheuFMWPDOI+OPceBSHZKp69gEyTL/mmJ4cnU6Y/rlme3UL3GyOn6Y42hyIEw0/q8sWx5w==",
+      "dev": true
+    },
     "node_modules/ansi-regex": {
       "version": "5.0.1",
       "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
@@ -50,9 +59,9 @@
       }
     },
     "node_modules/builder-util-runtime": {
-      "version": "9.2.4",
-      "resolved": "https://registry.npmjs.org/builder-util-runtime/-/builder-util-runtime-9.2.4.tgz",
-      "integrity": "sha512-upp+biKpN/XZMLim7aguUyW8s0FUpDvOtK6sbanMFDAMBzpHDqdhgVYm6zc9HJ6nWo7u2Lxk60i2M6Jd3aiNrA==",
+      "version": "9.2.5",
+      "resolved": "https://registry.npmjs.org/builder-util-runtime/-/builder-util-runtime-9.2.5.tgz",
+      "integrity": "sha512-HjIDfhvqx/8B3TDN4GbABQcgpewTU4LMRTQPkVpKYV3lsuxEJoIfvg09GyWTNmfVNSUAYf+fbTN//JX4TH20pg==",
       "dependencies": {
         "debug": "^4.3.4",
         "sax": "^1.2.4"
@@ -93,9 +102,9 @@
       "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA=="
     },
     "node_modules/debug": {
-      "version": "4.3.4",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz",
-      "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==",
+      "version": "4.3.6",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.6.tgz",
+      "integrity": "sha512-O/09Bd4Z1fBrU4VzkhFqVgpPzaGbw6Sm9FEkBT1A/YBXQFGuuSxa1dN2nxgxS34JmKXqYx8CZAwEVoJFImUXIg==",
       "dependencies": {
         "ms": "2.1.2"
       },
@@ -144,23 +153,12 @@
       "resolved": "https://registry.npmjs.org/electron-log/-/electron-log-4.4.8.tgz",
       "integrity": "sha512-QQ4GvrXO+HkgqqEOYbi+DHL7hj5JM+nHi/j+qrN9zeeXVKy8ZABgbu4CnG+BBqDZ2+tbeq9tUC4DZfIWFU5AZA=="
     },
-    "node_modules/electron-serve": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/electron-serve/-/electron-serve-1.3.0.tgz",
-      "integrity": "sha512-OEC/48ZBJxR6XNSZtCl4cKPyQ1lvsu8yp8GdCplMWwGS1eEyMcEmzML5BRs/io/RLDnpgyf+7rSL+X6ICifRIg==",
-      "engines": {
-        "node": ">=12"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
     "node_modules/electron-updater": {
-      "version": "6.2.1",
-      "resolved": "https://registry.npmjs.org/electron-updater/-/electron-updater-6.2.1.tgz",
-      "integrity": "sha512-83eKIPW14qwZqUUM6wdsIRwVKZyjmHxQ4/8G+1C6iS5PdDt7b1umYQyj1/qPpH510GmHEQe4q0kCPe3qmb3a0Q==",
+      "version": "6.3.2",
+      "resolved": "https://registry.npmjs.org/electron-updater/-/electron-updater-6.3.2.tgz",
+      "integrity": "sha512-bEpuZ1IRnMtvZZaWeYi9ocX90Cnk+/impZ/08r6GQkfOMqECtKC2IjvxHcDk2VpWO8QZzK0+MUNaBiO81CGvQQ==",
       "dependencies": {
-        "builder-util-runtime": "9.2.4",
+        "builder-util-runtime": "9.2.5",
         "fs-extra": "^10.1.0",
         "js-yaml": "^4.1.0",
         "lazy-val": "^1.0.5",
@@ -289,9 +287,20 @@
       }
     },
     "node_modules/mime-db": {
-      "version": "1.51.0",
-      "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.51.0.tgz",
-      "integrity": "sha512-5y8A56jg7XVQx2mbv1lu49NR4dokRnhZYTtL+KGfaa27uq4pSTXkwQkFJl4pkRMyNFz/EtYDSkiiEHx3F7UN6g==",
+      "version": "1.52.0",
+      "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.52.0.tgz",
+      "integrity": "sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==",
+      "engines": {
+        "node": ">= 0.6"
+      }
+    },
+    "node_modules/mime-types": {
+      "version": "2.1.35",
+      "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.35.tgz",
+      "integrity": "sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==",
+      "dependencies": {
+        "mime-db": "1.52.0"
+      },
       "engines": {
         "node": ">= 0.6"
       }
@@ -334,9 +343,9 @@
       }
     },
     "node_modules/sax": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/sax/-/sax-1.3.0.tgz",
-      "integrity": "sha512-0s+oAmw9zLl1V1cS9BtZN7JAd0cW5e0QH4W3LWEK6a4LaLEA2OTpGYWDY+6XasBLtz6wkm3u1xRw95mRuJ59WA=="
+      "version": "1.4.1",
+      "resolved": "https://registry.npmjs.org/sax/-/sax-1.4.1.tgz",
+      "integrity": "sha512-+aWOz7yVScEGoKNd4PA10LZ8sk0A/z5+nXQG5giUO5rprX9jgYsTdov9qCchZiPIZezbZH+jRut8nPodFAX4Jg=="
     },
     "node_modules/semver": {
       "version": "7.5.4",
@@ -443,6 +452,12 @@
     }
   },
   "dependencies": {
+    "@types/mime-types": {
+      "version": "2.1.4",
+      "resolved": "https://registry.npmjs.org/@types/mime-types/-/mime-types-2.1.4.tgz",
+      "integrity": "sha512-lfU4b34HOri+kAY5UheuFMWPDOI+OPceBSHZKp69gEyTL/mmJ4cnU6Y/rlme3UL3GyOn6Y42hyIEw0/q8sWx5w==",
+      "dev": true
+    },
     "ansi-regex": {
       "version": "5.0.1",
       "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
@@ -467,9 +482,9 @@
       "integrity": "sha512-Z7tMw1ytTXt5jqMcOP+OQteU1VuNK9Y02uuJtKQ1Sv69jXQKKg5cibLwGJow8yzZP+eAc18EmLGPal0bp36rvQ=="
     },
     "builder-util-runtime": {
-      "version": "9.2.4",
-      "resolved": "https://registry.npmjs.org/builder-util-runtime/-/builder-util-runtime-9.2.4.tgz",
-      "integrity": "sha512-upp+biKpN/XZMLim7aguUyW8s0FUpDvOtK6sbanMFDAMBzpHDqdhgVYm6zc9HJ6nWo7u2Lxk60i2M6Jd3aiNrA==",
+      "version": "9.2.5",
+      "resolved": "https://registry.npmjs.org/builder-util-runtime/-/builder-util-runtime-9.2.5.tgz",
+      "integrity": "sha512-HjIDfhvqx/8B3TDN4GbABQcgpewTU4LMRTQPkVpKYV3lsuxEJoIfvg09GyWTNmfVNSUAYf+fbTN//JX4TH20pg==",
       "requires": {
         "debug": "^4.3.4",
         "sax": "^1.2.4"
@@ -498,9 +513,9 @@
       "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA=="
     },
     "debug": {
-      "version": "4.3.4",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz",
-      "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==",
+      "version": "4.3.6",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.6.tgz",
+      "integrity": "sha512-O/09Bd4Z1fBrU4VzkhFqVgpPzaGbw6Sm9FEkBT1A/YBXQFGuuSxa1dN2nxgxS34JmKXqYx8CZAwEVoJFImUXIg==",
       "requires": {
         "ms": "2.1.2"
       }
@@ -535,17 +550,12 @@
       "resolved": "https://registry.npmjs.org/electron-log/-/electron-log-4.4.8.tgz",
       "integrity": "sha512-QQ4GvrXO+HkgqqEOYbi+DHL7hj5JM+nHi/j+qrN9zeeXVKy8ZABgbu4CnG+BBqDZ2+tbeq9tUC4DZfIWFU5AZA=="
     },
-    "electron-serve": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/electron-serve/-/electron-serve-1.3.0.tgz",
-      "integrity": "sha512-OEC/48ZBJxR6XNSZtCl4cKPyQ1lvsu8yp8GdCplMWwGS1eEyMcEmzML5BRs/io/RLDnpgyf+7rSL+X6ICifRIg=="
-    },
     "electron-updater": {
-      "version": "6.2.1",
-      "resolved": "https://registry.npmjs.org/electron-updater/-/electron-updater-6.2.1.tgz",
-      "integrity": "sha512-83eKIPW14qwZqUUM6wdsIRwVKZyjmHxQ4/8G+1C6iS5PdDt7b1umYQyj1/qPpH510GmHEQe4q0kCPe3qmb3a0Q==",
+      "version": "6.3.2",
+      "resolved": "https://registry.npmjs.org/electron-updater/-/electron-updater-6.3.2.tgz",
+      "integrity": "sha512-bEpuZ1IRnMtvZZaWeYi9ocX90Cnk+/impZ/08r6GQkfOMqECtKC2IjvxHcDk2VpWO8QZzK0+MUNaBiO81CGvQQ==",
       "requires": {
-        "builder-util-runtime": "9.2.4",
+        "builder-util-runtime": "9.2.5",
         "fs-extra": "^10.1.0",
         "js-yaml": "^4.1.0",
         "lazy-val": "^1.0.5",
@@ -648,9 +658,17 @@
       }
     },
     "mime-db": {
-      "version": "1.51.0",
-      "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.51.0.tgz",
-      "integrity": "sha512-5y8A56jg7XVQx2mbv1lu49NR4dokRnhZYTtL+KGfaa27uq4pSTXkwQkFJl4pkRMyNFz/EtYDSkiiEHx3F7UN6g=="
+      "version": "1.52.0",
+      "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.52.0.tgz",
+      "integrity": "sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg=="
+    },
+    "mime-types": {
+      "version": "2.1.35",
+      "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.35.tgz",
+      "integrity": "sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==",
+      "requires": {
+        "mime-db": "1.52.0"
+      }
     },
     "modify-filename": {
       "version": "1.1.0",
@@ -681,9 +699,9 @@
       }
     },
     "sax": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/sax/-/sax-1.3.0.tgz",
-      "integrity": "sha512-0s+oAmw9zLl1V1cS9BtZN7JAd0cW5e0QH4W3LWEK6a4LaLEA2OTpGYWDY+6XasBLtz6wkm3u1xRw95mRuJ59WA=="
+      "version": "1.4.1",
+      "resolved": "https://registry.npmjs.org/sax/-/sax-1.4.1.tgz",
+      "integrity": "sha512-+aWOz7yVScEGoKNd4PA10LZ8sk0A/z5+nXQG5giUO5rprX9jgYsTdov9qCchZiPIZezbZH+jRut8nPodFAX4Jg=="
     },
     "semver": {
       "version": "7.5.4",
diff --git a/desktop/package.json b/desktop/package.json
index 4249f3fcfba9..7537ed7a75cf 100644
--- a/desktop/package.json
+++ b/desktop/package.json
@@ -6,11 +6,14 @@
   "dependencies": {
     "electron-context-menu": "^2.3.0",
     "electron-log": "^4.4.8",
-    "electron-serve": "^1.3.0",
-    "electron-updater": "^6.2.1",
+    "electron-updater": "^6.3.2",
+    "mime-types": "^2.1.35",
     "node-machine-id": "^1.1.12"
   },
   "author": "Expensify, Inc.",
   "license": "MIT",
-  "private": true
+  "private": true,
+  "devDependencies": {
+    "@types/mime-types": "^2.1.4"
+  }
 }
diff --git a/docs/Gemfile b/docs/Gemfile
index 91971b594b4f..73ced17fea02 100644
--- a/docs/Gemfile
+++ b/docs/Gemfile
@@ -8,7 +8,8 @@ source "https://rubygems.org"
 # This will help ensure the proper Jekyll version is running.
 # Happy Jekylling!
 
-gem "github-pages", group: :jekyll_plugins
+gem 'jekyll', group: :jekyll_plugins
+gem 'kramdown-parser-gfm'
 
 # If you have any plugins, put them here!
 group :jekyll_plugins do
diff --git a/docs/Gemfile.lock b/docs/Gemfile.lock
index de99bbcb48ef..4c492ae1e251 100644
--- a/docs/Gemfile.lock
+++ b/docs/Gemfile.lock
@@ -1,91 +1,16 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (6.0.5)
-      concurrent-ruby (~> 1.0, >= 1.0.2)
-      i18n (>= 0.7, < 2)
-      minitest (~> 5.1)
-      tzinfo (~> 1.1)
-      zeitwerk (~> 2.2, >= 2.2.2)
     addressable (2.8.0)
       public_suffix (>= 2.0.2, < 5.0)
-    coffee-script (2.4.1)
-      coffee-script-source
-      execjs
-    coffee-script-source (1.11.1)
     colorator (1.1.0)
-    commonmarker (0.23.10)
     concurrent-ruby (1.1.10)
-    dnsruby (1.61.9)
-      simpleidn (~> 0.1)
     em-websocket (0.5.3)
       eventmachine (>= 0.12.9)
       http_parser.rb (~> 0)
-    ethon (0.15.0)
-      ffi (>= 1.15.0)
     eventmachine (1.2.7)
-    execjs (2.8.1)
-    faraday (2.3.0)
-      faraday-net_http (~> 2.0)
-      ruby2_keywords (>= 0.0.4)
-    faraday-net_http (2.0.3)
     ffi (1.15.5)
     forwardable-extended (2.6.0)
-    gemoji (3.0.1)
-    github-pages (228)
-      github-pages-health-check (= 1.17.9)
-      jekyll (= 3.9.3)
-      jekyll-avatar (= 0.7.0)
-      jekyll-coffeescript (= 1.1.1)
-      jekyll-commonmark-ghpages (= 0.4.0)
-      jekyll-default-layout (= 0.1.4)
-      jekyll-feed (= 0.15.1)
-      jekyll-gist (= 1.5.0)
-      jekyll-github-metadata (= 2.13.0)
-      jekyll-include-cache (= 0.2.1)
-      jekyll-mentions (= 1.6.0)
-      jekyll-optional-front-matter (= 0.3.2)
-      jekyll-paginate (= 1.1.0)
-      jekyll-readme-index (= 0.3.0)
-      jekyll-redirect-from (= 0.16.0)
-      jekyll-relative-links (= 0.6.1)
-      jekyll-remote-theme (= 0.4.3)
-      jekyll-sass-converter (= 1.5.2)
-      jekyll-seo-tag (= 2.8.0)
-      jekyll-sitemap (= 1.4.0)
-      jekyll-swiss (= 1.0.0)
-      jekyll-theme-architect (= 0.2.0)
-      jekyll-theme-cayman (= 0.2.0)
-      jekyll-theme-dinky (= 0.2.0)
-      jekyll-theme-hacker (= 0.2.0)
-      jekyll-theme-leap-day (= 0.2.0)
-      jekyll-theme-merlot (= 0.2.0)
-      jekyll-theme-midnight (= 0.2.0)
-      jekyll-theme-minimal (= 0.2.0)
-      jekyll-theme-modernist (= 0.2.0)
-      jekyll-theme-primer (= 0.6.0)
-      jekyll-theme-slate (= 0.2.0)
-      jekyll-theme-tactile (= 0.2.0)
-      jekyll-theme-time-machine (= 0.2.0)
-      jekyll-titles-from-headings (= 0.5.3)
-      jemoji (= 0.12.0)
-      kramdown (= 2.3.2)
-      kramdown-parser-gfm (= 1.1.0)
-      liquid (= 4.0.4)
-      mercenary (~> 0.3)
-      minima (= 2.5.1)
-      nokogiri (>= 1.13.6, < 2.0)
-      rouge (= 3.26.0)
-      terminal-table (~> 1.4)
-    github-pages-health-check (1.17.9)
-      addressable (~> 2.3)
-      dnsruby (~> 1.60)
-      octokit (~> 4.0)
-      public_suffix (>= 3.0, < 5.0)
-      typhoeus (~> 1.3)
-    html-pipeline (2.14.2)
-      activesupport (>= 2)
-      nokogiri (>= 1.4)
     http_parser.rb (0.8.0)
     i18n (0.9.5)
       concurrent-ruby (~> 1.0)
@@ -102,101 +27,16 @@ GEM
       pathutil (~> 0.9)
       rouge (>= 1.7, < 4)
       safe_yaml (~> 1.0)
-    jekyll-avatar (0.7.0)
-      jekyll (>= 3.0, < 5.0)
-    jekyll-coffeescript (1.1.1)
-      coffee-script (~> 2.2)
-      coffee-script-source (~> 1.11.1)
-    jekyll-commonmark (1.4.0)
-      commonmarker (~> 0.22)
-    jekyll-commonmark-ghpages (0.4.0)
-      commonmarker (~> 0.23.7)
-      jekyll (~> 3.9.0)
-      jekyll-commonmark (~> 1.4.0)
-      rouge (>= 2.0, < 5.0)
-    jekyll-default-layout (0.1.4)
-      jekyll (~> 3.0)
     jekyll-feed (0.15.1)
       jekyll (>= 3.7, < 5.0)
-    jekyll-gist (1.5.0)
-      octokit (~> 4.2)
-    jekyll-github-metadata (2.13.0)
-      jekyll (>= 3.4, < 5.0)
-      octokit (~> 4.0, != 4.4.0)
-    jekyll-include-cache (0.2.1)
-      jekyll (>= 3.7, < 5.0)
-    jekyll-mentions (1.6.0)
-      html-pipeline (~> 2.3)
-      jekyll (>= 3.7, < 5.0)
-    jekyll-optional-front-matter (0.3.2)
-      jekyll (>= 3.0, < 5.0)
-    jekyll-paginate (1.1.0)
-    jekyll-readme-index (0.3.0)
-      jekyll (>= 3.0, < 5.0)
     jekyll-redirect-from (0.16.0)
       jekyll (>= 3.3, < 5.0)
-    jekyll-relative-links (0.6.1)
-      jekyll (>= 3.3, < 5.0)
-    jekyll-remote-theme (0.4.3)
-      addressable (~> 2.0)
-      jekyll (>= 3.5, < 5.0)
-      jekyll-sass-converter (>= 1.0, <= 3.0.0, != 2.0.0)
-      rubyzip (>= 1.3.0, < 3.0)
     jekyll-sass-converter (1.5.2)
       sass (~> 3.4)
     jekyll-seo-tag (2.8.0)
       jekyll (>= 3.8, < 5.0)
-    jekyll-sitemap (1.4.0)
-      jekyll (>= 3.7, < 5.0)
-    jekyll-swiss (1.0.0)
-    jekyll-theme-architect (0.2.0)
-      jekyll (> 3.5, < 5.0)
-      jekyll-seo-tag (~> 2.0)
-    jekyll-theme-cayman (0.2.0)
-      jekyll (> 3.5, < 5.0)
-      jekyll-seo-tag (~> 2.0)
-    jekyll-theme-dinky (0.2.0)
-      jekyll (> 3.5, < 5.0)
-      jekyll-seo-tag (~> 2.0)
-    jekyll-theme-hacker (0.2.0)
-      jekyll (> 3.5, < 5.0)
-      jekyll-seo-tag (~> 2.0)
-    jekyll-theme-leap-day (0.2.0)
-      jekyll (> 3.5, < 5.0)
-      jekyll-seo-tag (~> 2.0)
-    jekyll-theme-merlot (0.2.0)
-      jekyll (> 3.5, < 5.0)
-      jekyll-seo-tag (~> 2.0)
-    jekyll-theme-midnight (0.2.0)
-      jekyll (> 3.5, < 5.0)
-      jekyll-seo-tag (~> 2.0)
-    jekyll-theme-minimal (0.2.0)
-      jekyll (> 3.5, < 5.0)
-      jekyll-seo-tag (~> 2.0)
-    jekyll-theme-modernist (0.2.0)
-      jekyll (> 3.5, < 5.0)
-      jekyll-seo-tag (~> 2.0)
-    jekyll-theme-primer (0.6.0)
-      jekyll (> 3.5, < 5.0)
-      jekyll-github-metadata (~> 2.9)
-      jekyll-seo-tag (~> 2.0)
-    jekyll-theme-slate (0.2.0)
-      jekyll (> 3.5, < 5.0)
-      jekyll-seo-tag (~> 2.0)
-    jekyll-theme-tactile (0.2.0)
-      jekyll (> 3.5, < 5.0)
-      jekyll-seo-tag (~> 2.0)
-    jekyll-theme-time-machine (0.2.0)
-      jekyll (> 3.5, < 5.0)
-      jekyll-seo-tag (~> 2.0)
-    jekyll-titles-from-headings (0.5.3)
-      jekyll (>= 3.3, < 5.0)
     jekyll-watch (2.2.1)
       listen (~> 3.0)
-    jemoji (0.12.0)
-      gemoji (~> 3.0)
-      html-pipeline (~> 2.2)
-      jekyll (>= 3.0, < 5.0)
     kramdown (2.3.2)
       rexml
     kramdown-parser-gfm (1.1.0)
@@ -206,53 +46,21 @@ GEM
       rb-fsevent (~> 0.10, >= 0.10.3)
       rb-inotify (~> 0.9, >= 0.9.10)
     mercenary (0.3.6)
-    minima (2.5.1)
-      jekyll (>= 3.5, < 5.0)
-      jekyll-feed (~> 0.9)
-      jekyll-seo-tag (~> 2.1)
-    minitest (5.16.2)
-    nokogiri (1.15.4-arm64-darwin)
-      racc (~> 1.4)
-    nokogiri (1.15.4-x86_64-darwin)
-      racc (~> 1.4)
-    octokit (4.25.1)
-      faraday (>= 1, < 3)
-      sawyer (~> 0.9)
     pathutil (0.16.2)
       forwardable-extended (~> 2.6)
     public_suffix (4.0.7)
-    racc (1.6.0)
     rb-fsevent (0.11.1)
     rb-inotify (0.10.1)
       ffi (~> 1.0)
     rexml (3.2.5)
     rouge (3.26.0)
-    ruby2_keywords (0.0.5)
-    rubyzip (2.3.2)
     safe_yaml (1.0.5)
     sass (3.7.4)
       sass-listen (~> 4.0.0)
     sass-listen (4.0.0)
       rb-fsevent (~> 0.9, >= 0.9.4)
       rb-inotify (~> 0.9, >= 0.9.7)
-    sawyer (0.9.2)
-      addressable (>= 2.3.5)
-      faraday (>= 0.17.3, < 3)
-    simpleidn (0.2.1)
-      unf (~> 0.1.4)
-    terminal-table (1.8.0)
-      unicode-display_width (~> 1.1, >= 1.1.1)
-    thread_safe (0.3.6)
-    typhoeus (1.4.0)
-      ethon (>= 0.9.0)
-    tzinfo (1.2.9)
-      thread_safe (~> 0.1)
-    unf (0.1.4)
-      unf_ext
-    unf_ext (0.0.8.2)
-    unicode-display_width (1.8.0)
     webrick (1.7.0)
-    zeitwerk (2.6.0)
 
 PLATFORMS
   arm64-darwin-22
@@ -261,11 +69,12 @@ PLATFORMS
   x86_64-darwin-21
 
 DEPENDENCIES
-  github-pages
   http_parser.rb (~> 0.6.0)
+  jekyll
   jekyll-feed (~> 0.12)
   jekyll-redirect-from
   jekyll-seo-tag
+  kramdown-parser-gfm
   liquid (~> 4.0.4)
   tzinfo (~> 1.2)
   tzinfo-data
diff --git a/docs/Hidden/Instructions b/docs/Hidden/Instructions
new file mode 100644
index 000000000000..940c7ab60d10
--- /dev/null
+++ b/docs/Hidden/Instructions
@@ -0,0 +1 @@
+This folder is used to house articles that should not be live articles on the helpsite.
diff --git a/docs/articles/new-expensify/expenses/Manually-submit-reports-for-approval.md b/docs/Hidden/Manually-submit-reports-for-approval.md
similarity index 100%
rename from docs/articles/new-expensify/expenses/Manually-submit-reports-for-approval.md
rename to docs/Hidden/Manually-submit-reports-for-approval.md
diff --git a/docs/README.md b/docs/README.md
index 224abe0554a5..235334c95732 100644
--- a/docs/README.md
+++ b/docs/README.md
@@ -186,9 +186,18 @@ Just update the content for each variable accordingly or remove it if the inform
 Assume that we want to rename the article `The Free Plan` to `Freemium Features` for the hub `billing and plan types` in New Expensify platform.
 1. Go to `docs/articles/new-expensify/billing-and-plan-types`
 2. Rename `The-Free-Plan.md` to `Freemium-Features.md`. Use dashes for spaces in the file name.
+3. Add an entry in redirects.csv for the old article pointing to the new article.
 
 Note: It is important that the file has `.md` extension.
 
+# How to hide an article temporarily
+Video demo available [here 🧵](https://expensify.slack.com/archives/C02NK2DQWUX/p1717772272605829?thread_ts=1717523271.137469&cid=C02NK2DQWUX).
+1. Open github's in built code editor by pressing `.` on your keyboard. ([instructions here](https://docs.github.com/en/codespaces/the-githubdev-web-based-editor#opening-the-githubdev-editor))
+2. Go to the article that you want to hide `docs/articles/...`.
+3. Drag and drop the article inside the hidden folder `docs/Hidden/`.
+4. Add a redirect for it in `docs/redirects.csv` to ensure that we don't have broken links. You can choose to point it to the home page or the article's hub.
+5. Commit the changes and raise a PR.
+
 # How the site is deployed
 This site is hosted on Cloudflare pages. Whenever code is merged to main, the github action `deployExpensifyHelp` will run.
 
diff --git a/docs/_config.yml b/docs/_config.yml
index 888f0b24a91e..36eea67ad2de 100644
--- a/docs/_config.yml
+++ b/docs/_config.yml
@@ -6,6 +6,7 @@ author: Expensify
 logo: /assets/images/expensify-help.svg
 repository: Expensify/App
 open_url: true
+main_style: /assets/css/styles.css
 
 defaults:
   - scope:
@@ -22,3 +23,4 @@ plugins:
 
 whitelist:
   - jekyll-redirect-from
+  - jekyll-seo-tag
diff --git a/docs/_data/_routes.yml b/docs/_data/_routes.yml
index a44d7d11af87..85ffbb30c360 100644
--- a/docs/_data/_routes.yml
+++ b/docs/_data/_routes.yml
@@ -54,6 +54,11 @@ platforms:
         icon: /assets/images/hand-card.svg
         description: Explore the perks and benefits of the Expensify Card.
 
+      - href: travel
+        title: Travel
+        icon: /assets/images/plane.svg
+        description: Manage all your corporate travel needs with Expensify Travel.
+
       - href: copilots-and-delegates
         title: Copilots & Delegates
         icon: /assets/images/envelope-receipt.svg
@@ -64,9 +69,9 @@ platforms:
         icon: /assets/images/handshake.svg
         description: Discover the benefits of becoming an Expensify Partner.
 
-      - href: integrations
-        title: Integrations
-        icon: /assets/images/workflow.svg
+      - href: connections
+        title: Connections
+        icon: /assets/images/simple-illustration__monitor-remotesync.svg
         description: Integrate with accounting or HR software to streamline expense approvals.
 
       - href: spending-insights
@@ -109,24 +114,24 @@ platforms:
         icon: /assets/images/shield.svg
         description: Configure rules, settings, and limits for your company’s spending.
       
-      - href: expenses
-        title: Expenses
+      - href: expenses-&-payments
+        title: Expenses & Payments
         icon: /assets/images/money-into-wallet.svg
         description: Learn more about expense tracking and submission.
 
-      - href: bank-accounts-and-payments
-        title: Bank Accounts & Payments
-        icon: /assets/images/bank-card.svg
-        description: Send direct reimbursements, pay invoices, and receive payment.
-      
       - href: expensify-card
         title: Expensify Card
         icon: /assets/images/hand-card.svg
         description: Explore the perks and benefits of the Expensify Card.
       
+      - href: travel
+        title: Travel
+        icon: /assets/images/plane.svg
+        description: Manage all your corporate travel needs with Expensify Travel.
+
       - href: connections
         title: Connections
-        icon: /assets/images/workflow.svg
+        icon: /assets/images/simple-illustration__monitor-remotesync.svg
         description: Connect to accounting software to streamline expense approvals.
 
       - href: settings
diff --git a/docs/_includes/hub.html b/docs/_includes/hub.html
index 7f1e25243c09..32d81d88e981 100644
--- a/docs/_includes/hub.html
+++ b/docs/_includes/hub.html
@@ -4,21 +4,24 @@
 {% assign activeHub = page.url | remove: activePlatform | remove: "/hubs/" | remove: "/" | remove: ".html" %}
 {% assign hub = platform.hubs | where: "href", activeHub | first %}
 
-<h1 class="title">
-    {{ hub.title }}
-</h1>
+<h1 class="title">{{ hub.title }}</h1>
 
-<p>
-    {{ hub.description }}
-</p>
+<p>{{ hub.description }}</p>
+
+{% if hub.articles %}
+    {% assign sortedSectionsAndArticles = hub.sections | concat: hub.articles | sort: 'title' %}
+{% else %}
+    {% assign sortedSectionsAndArticles = hub.sections | sort: 'title' %}
+{% 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 %}
+        {% for item in sortedSectionsAndArticles %}
+            {% if item.articles %}
+                {% include section-card.html platform=activePlatform hub=hub.href section=item.href title=item.title %}
+            {% else %}
+                {% include article-card.html hub=hub.href href=item.href title=item.title platform=activePlatform %}
+            {% endif %}
         {% endfor %}
     </div>
 </section>
diff --git a/docs/_includes/lhn-template.html b/docs/_includes/lhn-template.html
index 80302f33f52e..294094214c8e 100644
--- a/docs/_includes/lhn-template.html
+++ b/docs/_includes/lhn-template.html
@@ -21,43 +21,47 @@
     {% for platform in site.data.routes.platforms %}
         {% if platform.href == activePlatform %}
             <li>
-                <a href="/" class="icon-with-link selected">
-                    <img src="/assets/images/down.svg" class="base-icon"></img>
+                <div class="icon-with-link selected">
+                    <a href="/"><img src="/assets/images/down.svg" class="base-icon"></img></a>
                     <span>{{ platform.title }}</span>
-                </a>
+                </div>
                 {% 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>
+                        <div  class="icon-with-link selected">
+                            <a href="/{{ activePlatform }}/hubs"><img src="/assets/images/down.svg" class="base-icon"></img></a> 
                             <span>{{ hub.title }}</span>
-                        </a>
+                        </div>
                         <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 %}
+                            {% if hub.articles %} 
+                                {% assign sortedSectionsAndArticles = hub.sections | concat: hub.articles | sort: 'title' %} 
+                            {% else %} 
+                                {% assign sortedSectionsAndArticles = hub.sections | sort: 'title' %} 
+                            {% endif%}
+                            {% for item in sortedSectionsAndArticles %}
+                                {% if item.articles %}
+                                    <li>
+                                        {% if item.href == activeSection %}
+                                            <div class="icon-with-link selected">
+                                                <a href="/{{ activePlatform }}/hubs/{{ hub.href }}"><img src="/assets/images/down.svg" class="base-icon"></img></a>
+                                                <span>{{ item.title }}</span>
+                                            </div>
+                                            <ul>
+                                                {% for article in item.articles %}
+                                                    {% assign article_href = item.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="{{ item.href }}" class="icon-with-link link">
+                                                <img src="/assets/images/arrow-right.svg" class="base-icon"></img>
+                                                {{ item.title }}
+                                            </a>
+                                        {% endif %}
+                                    </li>
+                                {% else %}
+                                    {% include lhn-article-link.html platform=activePlatform hub=hub.href href=item.href title=item.title %}
+                                {% endif %}
                             {% endfor %}
                         </ul>
                     {% else %}
diff --git a/docs/_includes/section.html b/docs/_includes/section.html
index 786e7d997462..b6def157e954 100644
--- a/docs/_includes/section.html
+++ b/docs/_includes/section.html
@@ -15,7 +15,8 @@ <h1 class="title">
 
 <section>
     <div class="cards-group">
-        {% for article in section.articles %}
+        {% assign sortedArticles = section.articles | sort: 'order', 'last' | default: 999 %}
+        {% for article in sortedArticles %}
             {% 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 %}
diff --git a/docs/_layouts/default.html b/docs/_layouts/default.html
index 4232c565e715..472887177e74 100644
--- a/docs/_layouts/default.html
+++ b/docs/_layouts/default.html
@@ -5,16 +5,16 @@
     <meta http-equiv="Content-Security-Policy" content="script-src https://kit.fontawesome.com https://cdnjs.cloudflare.com https://www.google.com https://www.gstatic.com/ https://cse.google.com http://cse.google.com https://partner.googleadservices.com/ https://cdnjs.cloudflare.com/ajax/libs/tocbot/ https://www.googletagmanager.com 'self' 'unsafe-eval' 'unsafe-inline'; style-src cdnjs.cloudflare.com cse.google.com www.google.com ka-f.fontawesome.com fonts.googleapis.com 'self' 'unsafe-inline'" >
     <title>Expensify Help</title>
     <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0, user-scalable=no, minimal-ui">
-    <link rel="icon" type="image/png" href="/assets/images/expensify-logo-round.png">
-    <link rel="stylesheet" href="/assets/css/styles.css">
+    <link rel="icon" type="image/png" href="{{ '/assets/images/expensify-logo-round.png' | cache_bust }}">
+    <link rel="stylesheet" href="{{ site.main_style | cache_bust}}">
     <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/tocbot/4.12.0/tocbot.css">
 
     <script src="https://kit.fontawesome.com/263e5e8608.js" crossorigin="anonymous"></script>
     <script defer src="https://cdnjs.cloudflare.com/ajax/libs/tocbot/4.12.0/tocbot.js"></script>
-    <script defer src="/assets/js/main.js"></script>
-    <script defer src="/assets/js/platform-tabs.js"></script>
-    <script defer src="/assets/js/selector.js"></script>
-    <script async src="https://cse.google.com/cse.js?cx=41f40d6e5c14246ff"></script>
+    <script defer src="{{ '/assets/js/main.js' | cache_bust }}"></script>
+    <script defer src="{{ '/assets/js/platform-tabs.js' | cache_bust }}"></script>
+    <script defer src="{{ '/assets/js/selector.js' | cache_bust }}"></script>
+    <script async src="https://cse.google.com/cse.js?cx=4149bc31c5c314a1a"></script>
     <!-- Google Tag Manager -->
     <script>(function (w, d, s, l, i) { w[l] = w[l] || []; w[l].push({ 'gtm.start': new Date().getTime(), event: 'gtm.js' }); var f = d.getElementsByTagName(s)[0], j = d.createElement(s), dl = l != 'dataLayer' ? '&l=' + l : ''; j.async = true; j.src = 'https://www.googletagmanager.com/gtm.js?id=' + i + dl; f.parentNode.insertBefore(j, f); })(window, document, 'script', 'dataLayer', 'GTM-TQBQW7CR');</script>
     <!-- End Google Tag Manager -->
diff --git a/docs/_plugins/cache_bust_filter.rb b/docs/_plugins/cache_bust_filter.rb
new file mode 100644
index 000000000000..abb1545fdd28
--- /dev/null
+++ b/docs/_plugins/cache_bust_filter.rb
@@ -0,0 +1,64 @@
+require 'digest'
+
+module Jekyll
+  module CacheBustFilter
+    def cache_bust(input)
+      puts "Processing asset: #{input}"
+
+      # Get the file extension
+      ext = File.extname(input)
+      puts "File extension: #{ext}"
+
+      # Define a list of supported asset types
+      supported_assets = %w[.css .js .png .jpg .jpeg .gif .svg .woff .woff2 .ttf .eot]
+
+      # Check if the asset type is supported
+      if supported_assets.include?(ext)
+        puts "Asset type supported: #{ext}"
+
+        # Compute the file hash
+        site_source = @context.registers[:site].source
+        puts "Site destination directory: #{site_source}"
+
+        file_path = File.join(site_source, input)
+        puts "Constructed file path: #{file_path}"
+
+        if File.exist?(file_path)
+          puts "File exists: #{file_path}"
+
+          file_content = File.read(file_path)
+          file_hash = Digest::MD5.hexdigest(file_content)
+          puts "File hash: #{file_hash}"
+          "#{input}?v=#{file_hash}"
+        else
+			if input == @context.registers[:site].config['main_style']
+              puts "Digesting contents of _sass folder"
+              sass_folder_path = File.join(site_source, '_sass')
+              directory_hash = digest_directory_contents(sass_folder_path)
+              puts "Directory hash: #{directory_hash}"
+              "#{input}?v=#{directory_hash}"
+            else
+              puts "File does not exist: #{file_path}"
+              # Return the input unchanged if the file does not exist
+              input
+            end
+        end
+      else
+        puts "Asset type not supported: #{ext}"
+        # Return the input unchanged if the asset type is not supported
+        input
+      end
+    end
+
+    private
+
+    def digest_directory_contents(directory)
+      target_path = File.join(directory, '**', '*')
+      content = Dir[target_path].map { |f| File.read(f) unless File.directory?(f) }.join
+      Digest::MD5.hexdigest(content)
+    end
+ 
+  end
+end
+
+Liquid::Template.register_filter(Jekyll::CacheBustFilter)
\ No newline at end of file
diff --git a/docs/_sass/_fonts.scss b/docs/_sass/_fonts.scss
index cf905805ddd2..c62d15720197 100644
--- a/docs/_sass/_fonts.scss
+++ b/docs/_sass/_fonts.scss
@@ -1,26 +1,26 @@
 @font-face {
-  font-family: ExpensifyNeue;
+  font-family: Expensify Neue;
   font-weight: 400;
   font-style: normal;
   src: url('/assets/fonts/ExpensifyNeue-Regular.woff2') format('woff2'), url('/assets/fonts/ExpensifyNeue-Regular.woff') format('woff');
 }
 
 @font-face {
-  font-family: ExpensifyNeue;
+  font-family: Expensify Neue;
   font-weight: 700;
   font-style: bold;
   src: url('/assets/fonts/ExpensifyNeue-Bold.woff2') format('woff2'), url('/assets/fonts/ExpensifyNeue-Bold.woff') format('woff');
 }
 
 @font-face {
-  font-family: ExpensifyNewKansas;
+  font-family: Expensify New Kansas;
   font-weight: 500;
   font-style: normal;
   src: url('/assets/fonts/ExpensifyNewKansas-Medium.woff2') format('woff2'), url('/assets/fonts/ExpensifyNewKansas-Medium.woff') format('woff');
 }
 
 @font-face {
-  font-family: ExpensifyNewKansas;
+  font-family: Expensify New Kansas;
   font-weight: 500;
   font-style: italic;
   src: url('/assets/fonts/ExpensifyNewKansas-MediumItalic.woff2') format('woff2'), url('/assets/fonts/ExpensifyNewKansas-MediumItalic.woff') format('woff');
diff --git a/docs/_sass/_main.scss b/docs/_sass/_main.scss
index ae19775d75df..82446fe08b3a 100644
--- a/docs/_sass/_main.scss
+++ b/docs/_sass/_main.scss
@@ -131,7 +131,7 @@ details[open] > summary {
 
 h1,
 summary {
-    font-family: 'ExpensifyNewKansas', 'Helvetica Neue', 'Helvetica', Arial, sans-serif;
+    font-family: 'Expensify New Kansas', 'Helvetica Neue', 'Helvetica', Arial, sans-serif;
     font-weight: 500;
     font-size: larger;
 }
@@ -151,7 +151,7 @@ select,
 textarea {
     line-height: 1.4;
     font-weight: 400;
-    font-family: 'ExpensifyNeue', 'Helvetica Neue', 'Helvetica', Arial, sans-serif;
+    font-family: 'Expensify Neue', 'Helvetica Neue', 'Helvetica', Arial, sans-serif;
     font-size: 16px;
     color: var(--color-text-supporting);
 }
@@ -159,7 +159,7 @@ textarea {
 button {
     border-radius: 12px;
     padding: 12px;
-    font-family: 'ExpensifyNeue', 'Helvetica Neue', 'Helvetica', Arial, sans-serif;
+    font-family: 'Expensify Neue', 'Helvetica Neue', 'Helvetica', Arial, sans-serif;
     font-size: 15px;
     font-weight: bold;
 
@@ -426,12 +426,12 @@ button {
         h2 {
             font-size: 1.125em;
             font-weight: 500;
-            font-family: 'ExpensifyNewKansas', 'Helvetica Neue', 'Helvetica', Arial, sans-serif;
+            font-family: 'Expensify New Kansas', 'Helvetica Neue', 'Helvetica', Arial, sans-serif;
         }
 
         h3 {
             font-size: 1em;
-            font-family: 'ExpensifyNeue', 'Helvetica Neue', 'Helvetica', Arial, sans-serif;
+            font-family: 'Expensify Neue', 'Helvetica Neue', 'Helvetica', Arial, sans-serif;
         }
 
         h2,
@@ -457,7 +457,7 @@ button {
 
             p:first-child {
                 font-size: large;
-                font-family: 'ExpensifyNewKansas', 'Helvetica Neue', 'Helvetica', Arial, sans-serif;
+                font-family: 'Expensify New Kansas', 'Helvetica Neue', 'Helvetica', Arial, sans-serif;
                 opacity: 0.8;
             }
         }
@@ -524,6 +524,10 @@ button {
                 padding: 0;
                 margin: 0;
             }
+
+            li {
+                margin-left: 12px;
+            }
         }
     }
 }
@@ -617,7 +621,7 @@ button {
     }
 
     h3.title {
-        font-family: 'ExpensifyNewKansas', 'Helvetica Neue', 'Helvetica', Arial, sans-serif;
+        font-family: 'Expensify New Kansas', 'Helvetica Neue', 'Helvetica', Arial, sans-serif;
     }
 
     h3.title,
@@ -745,6 +749,7 @@ button {
     width: 20px;
     height: 20px;
     cursor: pointer;
+    display: inline-block;
 }
 
 .homepage {
@@ -815,7 +820,7 @@ button {
 
     h3 {
         color: var(--color-success);
-        font-family: 'ExpensifyNewKansas', 'Helvetica Neue', 'Helvetica', Arial, sans-serif;
+        font-family: 'Expensify New Kansas', 'Helvetica Neue', 'Helvetica', Arial, sans-serif;
         font-size: 17px;
         font-weight: 500;
         padding: 0;
@@ -941,8 +946,8 @@ button {
 }
 
 #platform-tabs > .active {
-    color: var(--color-button-text);
-    background-color: var(--color-button-success-background);
+    color: var(--color-text);
+    background-color: var(--color-button-background);
 }
 
 .hidden {
diff --git a/docs/_sass/_search-bar.scss b/docs/_sass/_search-bar.scss
index e26763d98c09..2a546d3a5be4 100644
--- a/docs/_sass/_search-bar.scss
+++ b/docs/_sass/_search-bar.scss
@@ -87,7 +87,7 @@ input#gsc-i-id1.gsc-input {
     padding: 15px 0px 0px !important;
     pointer-events: auto;
     color: var(--color-text) !important;
-    font-family: 'ExpensifyNeue', 'Segoe UI Emoji', 'Noto Color Emoji' !important;
+    font-family: 'Expensify Neue', 'Segoe UI Emoji', 'Noto Color Emoji' !important;
 }
 
 /* These below #gsc-iw-id1, .gsc-input-box & .gsib_a are inner wrapper of search bar input */
@@ -144,7 +144,7 @@ label.search-label {
     position: absolute;
     margin-top: -20px;
     font-size: 15px;
-    font-family: 'ExpensifyNeue', 'Segoe UI Emoji', 'Noto Color Emoji';
+    font-family: 'Expensify Neue', 'Segoe UI Emoji', 'Noto Color Emoji';
     transform: translateY(-50%);
     left: 20px;
     pointer-events: none;
@@ -166,7 +166,7 @@ label.search-label {
 .gsc-control-cse {
     background-color: var(--color-appBG) !important;
     border: var(--color-appBG) !important;
-    font-family: 'ExpensifyNeue', 'Helvetica Neue', 'Helvetica', Arial, sans-serif !important;
+    font-family: 'Expensify Neue', 'Helvetica Neue', 'Helvetica', Arial, sans-serif !important;
 }
 
 .gsc-webResult.gsc-result {
@@ -179,8 +179,9 @@ label.search-label {
     display: none;
 }
 
-.gs-title {
+.gs-title * {
     font-weight: bold;
+    color: var(--color-link) !important;
 }
 
 /* Change the Google Search Button icon into Expensify icon button */
@@ -218,7 +219,7 @@ label.search-label {
 
 /* Change Font the Google Search result */
 .gsc-control-cse .gsc-table-result {
-    font-family: 'ExpensifyNeue', 'Helvetica Neue', 'Helvetica', Arial, sans-serif !important;
+    font-family: 'Expensify Neue', 'Helvetica Neue', 'Helvetica', Arial, sans-serif !important;
 }
 
 /* Change Font result Paragraph color */
diff --git a/docs/articles/expensify-classic/bank-accounts-and-payments/Business-Bank-Accounts-AUD.md b/docs/articles/expensify-classic/bank-accounts-and-payments/Business-Bank-Accounts-AUD.md
deleted file mode 100644
index 8c5ead911da4..000000000000
--- a/docs/articles/expensify-classic/bank-accounts-and-payments/Business-Bank-Accounts-AUD.md
+++ /dev/null
@@ -1,51 +0,0 @@
----
-title: Add a Business Bank Account
-description: This article provides insight on setting up and using an Australian Business Bank account in Expensify. 
----
-
-# How to add an Australian business bank account (for admins)
-A withdrawal account is the business bank account that you want to use to pay your employee reimbursements. 
-
-_Your policy currency must be set to AUD and reimbursement setting set to Indirect to continue. If your main policy is used for something other than AUD, then you will need to create a new one and set that policy to AUD._ 
-
-To set this up, you’ll run through the following steps:
-
-1. Go to **Settings > Your Account > Payments** and click **Add Verified Bank Account**
-![Click the Verified Bank Account button in the bottom right-hand corner of the screen](https://help.expensify.com/assets/images/add-vba-australian-account.png){:width="100%"}
-
-2. Enter the required information to connect to your business bank account. If you don't know your Bank User ID/Direct Entry ID/APCA Number, please contact your bank and they will be able to provide this.
-![Enter your information in each of the required fields](https://help.expensify.com/assets/images/add-vba-australian-account-modal.png){:width="100%"}
-
-3. Link the withdrawal account to your policy by heading to **Settings > Policies > Group > [Policy name] > Reimbursement**
-4. Click **Direct reimbursement**
-5. Set the default withdrawal account for processing reimbursements 
-6. Tell your employees to add their deposit accounts and start reimbursing. 
-
-# How to delete a bank account
-If you’re no longer using a bank account you previously connected to Expensify, you can delete it by doing the following:
-
-1. Navigate to Settings > Accounts > Payments 
-2. Click **Delete** 
-![Click the Delete button](https://help.expensify.com/assets/images/delete-australian-bank-account.png){:width="100%"}
-
-You can complete this process either via the web app (on a computer), or via the mobile app.
-
-# Deep Dive
-## Bank-specific batch payment support
-
-If you are new to using Batch Payments in Australia, to reimburse your staff or process payroll, you may want to check out these bank-specific instructions for how to upload your .aba file:
-
-- ANZ Bank - [Import a file for payroll payments](https://www.anz.com.au/support/internet-banking/pay-transfer-business/payroll/import-file/)
-- CommBank - [Importing and using Direct Entry (EFT) files](https://www.commbank.com.au/business/pds/003-279-importing-a-de-file.pdf)
-- Westpac - [Importing Payment Files](https://www.westpac.com.au/business-banking/online-banking/support-faqs/import-files/)
-- NAB - [Quick Reference Guide - Upload a payment file](https://www.nab.com.au/business/online-banking/nab-connect/help)
-- Bendigo Bank - [Bulk payments user guide](https://www.bendigobank.com.au/globalassets/documents/business/bulk-payments-user-guide.pdf)
-- Bank of Queensland - [Payments file upload facility FAQ](https://www.boq.com.au/help-and-support/online-banking/ob-faqs-and-support/faq-pfuf)
-
-**Note:** Some financial institutions require an ABA file to include a *self-balancing transaction*. If you are unsure, please check with your bank to ensure whether to tick this option or not, as selecting an incorrect option will result in the ABA file not working with your bank's internet banking platform.
-
-## Enable Global Reimbursement
-
-If you have employees in other countries outside of Australia, you can now reimburse them directly using Global Reimbursement. 
-
-To do this, you’ll first need to delete any existing Australian business bank accounts. Then, you’ll want to follow the instructions to enable Global Reimbursements
diff --git a/docs/articles/expensify-classic/bank-accounts-and-payments/Business-Bank-Accounts-USD.md b/docs/articles/expensify-classic/bank-accounts-and-payments/Business-Bank-Accounts-USD.md
deleted file mode 100644
index 4ae2c669561f..000000000000
--- a/docs/articles/expensify-classic/bank-accounts-and-payments/Business-Bank-Accounts-USD.md
+++ /dev/null
@@ -1,161 +0,0 @@
----
-title: Business Bank Accounts - USD
-description: How to add/remove Business Bank Accounts (US) 
----
-# Overview
-Adding a verified business bank account unlocks a myriad of features and automation in Expensify. 
-Once you connect your business bank account, you can:
-- Pay employee expense reports via direct deposit (US)
-- Settle company bills via direct transfer
-- Accept invoice payments through direct transfer
-- Access the Expensify Card
-
-# How to add a verified business bank account
-To connect a business bank account to Expensify, follow the below steps:
-1. Go to **Settings > Account > Payments**
-2. Click **Add Verified Bank Account**
-3. Click **Log into your bank**
-4. Click **Continue** 
-5. When you hit the **Plaid** screen, you'll be shown a list of compatible banks that offer direct online login access
-6. Login to the business bank account
-- If the bank is not listed, click the X to go back to the connection type
-- Here you’ll see the option to **Connect Manually**
-- Enter your account and routing numbers
-7. Enter your bank login credentials.
-- If your bank requires additional security measures, you will be directed to obtain and enter a security code
-- If you have more than one account available to choose from, you will be directed to choose the desired account
-Next, to verify the bank account, you’ll enter some details about the business as well as some personal information. 
-
-## Enter company information
-This is where you’ll add the legal business name as well as several other company details. 
-
-### Company address
-The company address must: 
-- Be located in the US
-- Be a physical location
-If you input a maildrop address (PO box, UPS Store, etc.), the address will likely be flagged for review and adding the bank account to Expensify will be delayed. 
-
-### Tax Identification Number
-This is the identification number that was assigned to the business by the IRS.
-### Company website
-A company website is required to use most of Expensify’s payment features. When adding the website of the business, format it as, https://www.domain.com. 
-### Industry Classification Code
-You can locate a list of Industry Classification Codes here.
-## Enter personal information 
-Whoever is connecting the bank account to Expensify, must enter their details under the Requestor Information section:
-- The address must be a physical address
-- The address must be located in the US
-- The SSN must be US-issued 
-This does not need to be a signor on the bank account. If someone other than the Expensify account holder enters their personal information in this section, the details will be flagged for review and adding the bank account to Expensify will be delayed. 
-
-## Upload ID
-After entering your personal details, you’ll be prompted to click a link or scan a QR code so that you can do the following:
-1. Upload the front and back of your ID 
-2. Use your device to take a selfie and record a short video of yourself 
-It’s required that your ID is:
-- Issued in the US
-- Unexpired
-
-## Additional Information
-Check the appropriate box under **Additional Information**, accept the agreement terms, and verify that all of the information is true and accurate:
-- A Beneficial Owner refers to an **individual** who owns 25% or more of the business. 
-- If you or another **individual** owns 25% or more of the business, please check the appropriate box
-- If someone else owns 25% or more of the business, you will be prompted to provide their personal information
-If no individual owns more than 25% of the company you do not need to list any beneficial owners. In that case, be sure to leave both boxes unchecked under the Beneficial Owner Additional Information section.
-
-# How to validate the bank account
-The account you set up can be found under **Settings > Account > Payment > Bank Accounts** section in either **Verifying** or **Pending** status.
-If it is **Verifying**, then this means we sent you a message and need more information from you. Please check your Concierge chat which should include a message with specific details about what we require to move forward. 
-If it is **Pending**, then in 1-2 business days Expensify will administer 3 test transactions to your bank account. Please check your Concierge chat for further instructions. If you do not see these test transactions
-After these transactions (2 withdrawals and 1 deposit) have been processed in your account, visit your Expensify Inbox, where you'll see a prompt to input the transaction amounts.
-Once you've finished these steps, your business bank account is ready to use in Expensify!
-
-# How to share a verified bank account 
-Only admins with access to the verified bank account can reimburse employees or pay vendor bills. To grant another admin access to the bank account in Expensify, go to **Settings > Account > Payments > Bank Accounts** and click **"Share"**. Enter their email address, and they will receive instructions from us. Please note, they must be a policy admin on a policy you also have access to in order to share the bank account with them.
-When a bank account is shared, it must be revalidated with three new microtransactions to ensure the shared admin has access. This process takes 1-2 business days. Once received, the shared admin can enter the transactions via their Expensify account's Inbox tab.
-
-Note: A report is shared with all individuals with access to the same business bank account in Expensify for audit purposes.
-
-
-# How to remove access to a verified bank account
-This step is important when accountants and staff leave your business.
-To remove an admin's access to a shared bank account, go to **Settings > Account > Payments > Shared Business Bank Accounts**. 
-You'll find a list of individuals who have access to the bank account. Next to each user, you'll see the option to Unshare the bank account.
-
-# How to delete a verified bank account
-If you need to delete a bank account from Expensify, run through the following steps:
-1. Head to  **Settings > Account > Payments**
-2. Click the red **Delete** button under the corresponding bank account
-
-Be cautious, as if it hasn't been shared with someone else, the next user will need to set it up from the beginning. 
-
-If the bank account is set as the settlement account for your Expensify Cards, you’ll need to designate another bank account as your settlement account under **Settings > Domains > Company Cards > Settings** before this account can be deleted. 
-
-# Deep Dive
-
-## Verified bank account requirements
-
-To add a business bank account to issue reimbursements via ACH (US), to pay invoices (US) or utilize the Expensify Card:
-- You must enter a physical address for yourself, any Beneficial Owner (if one exists), and the business associated with the bank account. We **cannot** accept a PO Box or MailDrop location.
-- If you are adding the bank account to Expensify, you must add it from **your** Expensify account settings.
-- If you are adding a bank account to Expensify, we are required by law to verify your identity. Part of this process requires you to verify a US issued photo ID. For utilizing features related to US ACH, your idea must be issued by the United States. You and any Beneficial Owner (if one exists), must also have a US address 
-- You must have a valid website for your business to utilize the Expensify Card, or to pay invoices with Expensify. 
-
-## Locked bank account
-When you reimburse a report, you authorize Expensify to withdraw the funds from your account. If your bank rejects Expensify’s withdrawal request, your verified bank account is locked until the issue is resolved.
-
-Withdrawal requests can be rejected due to insufficient funds, or if the bank account has not been enabled for direct debit.
-If you need to enable direct debits from your verified bank account, your bank will require the following details:
-- The ACH CompanyIDs (1270239450 and 4270239450) 
-- The ACH Originator Name (Expensify)
-To request to unlock the bank account, click **Fix** on your bank account under **Settings > Account > Payments > Bank Accounts**. 
-This sends a request to our support team to review exactly why the bank account was locked. 
-Please note, unlocking a bank account can take 4-5 business days to process.
-
-## Error adding ID to Onfido
-Expensify is required by both our sponsor bank and federal law to verify the identity of the individual that is initiating the movement of money. We use Onfido to confirm that the person adding a payment method is genuine and not impersonating someone else.
-
-If you get a generic error message that indicates, "Something's gone wrong", please go through the following steps:
-
-1. Ensure you are using either Safari (on iPhone) or Chrome (on Android) as your web browser.
-2. Check your browser's permissions to make sure that the camera and microphone settings are set to "Allow"
-3. Clear your web cache for Safari (on iPhone) or Chrome (on Android).
-4. If using a corporate Wi-Fi network, confirm that your corporate firewall isn't blocking the website.
-5. Make sure no other apps are overlapping your screen, such as the Facebook Messenger bubble, while recording the video. 
-6. On iPhone, if using iOS version 15 or later, disable the Hide IP address feature in Safari.
-7. If possible, try these steps on another device
-8. If you have another phone available, try to follow these steps on that device
-If the issue persists, please contact your Account Manager or Concierge for further troubleshooting assistance.
-
-{% include faq-begin.md %}
-## What is a Beneficial Owner?
-
-A Beneficial Owner refers to an **individual** who owns 25% or more of the business. If no individual owns 25% or more of the business, the company does not have a Beneficial Owner.
-
-
-## What do I do if the Beneficial Owner section only asks for personal details, but our business is owned by another company?
-
-
-Please only indicate you have a Beneficial Owner, if it is an individual that owns 25% or more of the business. 
-
-## Why can’t I input my address or upload my ID? 
-
-
-Are you entering a US address? When adding a verified business bank account in Expensify, the individual adding the account, and any beneficial owner (if one exists) are required to have a US address, US photo ID, and a US SSN. If you do not meet these requirements, you’ll need to have another admin add the bank account, and then share access with you once verified. 
-
-
-## Why am I being asked for documentation when adding my bank account? 
-When a bank account is added to Expensify, we complete a series of checks to verify the information provided to us. We conduct these checks to comply with both our sponsor bank's requirements and federal government regulations, specifically the Bank Secrecy Act / Anti-Money Laundering (BSA / AML) laws. Expensify also has anti-fraud measures in place.
-If automatic verification fails, we may request manual verification, which could involve documents such as address verification for your business, a letter from your bank confirming bank account ownership, etc. 
-
-If you have any questions regarding the documentation request you received, please contact Concierge and they will be happy to assist. 
-
-
-## I don’t see all three microtransactions I need to validate my bank account. What should I do? 
-
-It's a good idea to wait till the end of that second business day. If you still don’t see them, please reach out to your bank and ask them to whitelist our ACH ID's **1270239450** and **4270239450**. Expensify’s ACH Originator Name is "Expensify".
-
-Make sure to reach out to your Account Manager or to Concierge once you have done so and our team will be able to re-trigger those 3 transactions!
-
-
-{% include faq-end.md %}
diff --git a/docs/articles/expensify-classic/bank-accounts-and-payments/Deposit-Accounts-AUD.md b/docs/articles/expensify-classic/bank-accounts-and-payments/Deposit-Accounts-AUD.md
deleted file mode 100644
index e274cb3d5b60..000000000000
--- a/docs/articles/expensify-classic/bank-accounts-and-payments/Deposit-Accounts-AUD.md
+++ /dev/null
@@ -1,21 +0,0 @@
----
-title: Deposit Accounts (AUD)
-description: Expensify allows you to add a personal bank account to receive reimbursements for your expenses. We never take money out of this account — it is only a place for us to deposit funds from your employer. This article covers deposit accounts for Australian banks.
----
-
-## How-to add your Australian personal deposit account information
-1. Confirm with your Policy Admin that they’ve set up Global Reimbursment
-2. Set your default policy (by selecting the correct policy after clicking on your profile picture) before adding your deposit account.
-3. Go to **Settings > Account > Payments** and click **Add Deposit-Only Bank Account**
-![Click the Add Deposit-Only Bank Account button](https://help.expensify.com/assets/images/add-australian-deposit-only-account.png){:width="100%"}
-
-4. Enter your BSB, account number and name. If your screen looks different than the image below, that means your company hasn't enabled reimbursements through Expensify. Please contact your administrator and ask them to enable reimbursements. 
-
-![Fill in the required fields](https://help.expensify.com/assets/images/add-australian-deposit-only-account-modal.png){:width="100%"}
-
-# How-to delete a bank account
-Bank accounts are easy to delete! Simply click the red **Delete** button in the bank account under **Settings > Account > Payments**.
-
-![Click the Delete button](https://help.expensify.com/assets/images/delete-australian-bank-account.png){:width="100%"}
-
-You can complete this process on a computer or on the mobile app.
diff --git a/docs/articles/expensify-classic/bank-accounts-and-payments/Deposit-Accounts-USD.md b/docs/articles/expensify-classic/bank-accounts-and-payments/Deposit-Accounts-USD.md
deleted file mode 100644
index 0e195d5e3f1c..000000000000
--- a/docs/articles/expensify-classic/bank-accounts-and-payments/Deposit-Accounts-USD.md
+++ /dev/null
@@ -1,77 +0,0 @@
----
-title: Deposit Accounts - USD
-description: How to add a deposit account to receive payments for yourself or your business (US)
----
-# Overview  
-
-There are two types of deposit-only accounts:  
-
-1. If you're an employee seeking reimbursement for expenses you’ve incurred, you’ll add a **Personal deposit-only bank account**.
-2. If you're a vendor seeking payment for goods or services, you’ll add a **Business deposit-only account**.  
-
-# How to connect a personal deposit-only bank account
-
-**Connect a personal deposit-only bank account if you are:**  
-
-- An employee based in the US who gets reimbursed by their employer 
-- An employee based in Australia who gets reimbursed by their company via batch payments
-- An international (non-US) employee whose US-based employers send international reimbursements
-
-**To establish the connection to a personal bank account, follow these steps:**  
-
-1. Navigate to your **Settings > Account > Payments** and click the **Add Deposit-Only Bank Account** button.
-2. Click **Log into your bank** button and click **Continue** on the Plaid connection pop-up window.
-3. Search for your bank account in the list of banks and follow the prompts to sign-in to your bank account.
-4. Enter your bank login credentials when prompted.
-    - If your bank doesn't appear, click the 'x' in the upper right corner of the Plaid pop-up window and click **Connect Manually**.
-    - Enter your account information, then click **Save & Continue**.
-
-You should be all set! You’ll receive reimbursement for your expense reports directly to this bank account. 
-
-# How to connect a business deposit-only bank account  
-
-**Connect a business deposit-only bank account if you are:**  
-
-- A US-based vendor who wants to be paid directly for bills sent to customers/clients
-- A US-based vendor who wants to pay invoices directly via Expensify
-
-**To establish the connection to a business bank account, follow these steps:**    
-
-1. Navigate to your **Settings > Account > Payments and click the Add Deposit-Only Bank Account** button.
-2. Click **Log into your bank** button and click **Continue** on the Plaid connection pop-up window.
-3. Search for your bank account in the list of banks and follow the prompts to sign-in to your bank account.
-4. Enter your bank login credentials when prompted.
-    - If your bank doesn't appear, click the 'x' in the upper right corner of the Plaid pop-up window and click **Connect Manually**.
-    - Enter your account information, then click **Save & Continue**.
-5. If you see the option to “Switch to Business” after entering the account owner information, click that link.
-6. Enter your Company Name and FEIN or TIN information.
-7. Enter your company’s website formatted as https://www.domain.com.
-  
-You should be all set! The bank account will display as a deposit-only business account, and you’ll be paid directly for any invoices you submit for payment.   
-
-# How to delete a deposit-only bank account  
-
-**To delete a deposit-only bank account, do the following:**  
-
-1. Navigate to **Settings > Account > Payments > Bank Accounts** 
-2. Click the **Delete** next to the bank account you want to remove
-
-{% include faq-begin.md %}  
-
-## **What happens if my bank requires an additional security check before adding it to a third-party?**  
-
-If your bank account has 2FA enabled or another security step, you should be prompted to complete this when adding the account. If not, and you encounter an error, you can always select the option to “Connect Manually”. Either way, please double check that you are entering the correct bank account details to ensure successful payments.  
-
-## **What if I also want to pay employees with my business bank account?**  
-
-If you’ve added a business deposit-only account and also wish to also pay employees, vendors, or utilize the Expensify Card with this bank account, select “Verify” on the listed bank account. This will take you through the additional verification steps to use this account to issue payments.  
-
-## **I connected my deposit-only bank account – Why haven’t I received my reimbursement?**  
-
-There are a few reasons a reimbursement may be unsuccessful. The first step is to review the estimated deposit date on the report. If it’s after that date and you still haven’t seen the funds, it could have been unsuccessful because:
-    - The incorrect account was added. If you believe you may have entered the wrong account, please reach out to Concierge and provide the Report ID for the missing reimbursement.
-    - Your account wasn’t set up for Direct Deposit/ACH. You may want to contact your bank to confirm. 
-
-If you aren’t sure, please reach out to Concierge and we can assist!
-
-{% include faq-end.md %}
diff --git a/docs/articles/expensify-classic/bank-accounts-and-payments/Global-Reimbursements.md b/docs/articles/expensify-classic/bank-accounts-and-payments/Global-Reimbursements.md
deleted file mode 100644
index 2ff74760b376..000000000000
--- a/docs/articles/expensify-classic/bank-accounts-and-payments/Global-Reimbursements.md
+++ /dev/null
@@ -1,106 +0,0 @@
----
-title: International Reimbursements
-description: International Reimbursements
----
-# Overview
-
-If your company’s business bank account is in the US, Canada, the UK, Europe, or Australia, you now have the option to send direct reimbursements to nearly any country across the globe! 
-The process to enable global reimbursements is dependent on the currency of your reimbursement bank account, so be sure to review the corresponding instructions below. 
-
-# How to request international reimbursements
-
-## The reimbursement account is in USD
-
-If your reimbursement bank account is in USD, the first step is connecting the bank account to Expensify. 
-The individual who plans on sending reimbursements internationally should head to **Settings > Account > Payments > Add Verified Bank Account**. From there, you will provide company details, input personal information, and upload a copy of your ID. 
-
-Once the USD bank account is verified (or if you already had a USD business bank account connected), click the support icon in your Expensify account to inform your Setup Specialist, Account Manager, or Concierge that you’d like to enable international reimbursements. From there, Expensify will ask you to confirm the currencies of the reimbursement and employee bank accounts.
-
-Our team will assess your account, and if you meet the criteria, international reimbursements will be enabled.
-
-## The reimbursement account is in AUD, CAD, GBP, EUR
-
-To request international reimbursements, contact Expensify Support to make that request.  
-
-You can do this by clicking on the support icon and informing your Setup Specialist, Account Manager, or Concierge that you’d like to set up global reimbursements on your account. 
-From there, Expensify will ask you to confirm both the currencies of the reimbursement and employee bank accounts.
-
-Our team will assess your account, and if you meet the criteria, international reimbursements will be enabled.
-
-# How to verify the bank account for sending international payments 
-
-Once international payments are enabled on your Expensify account, the next step is verifying the bank account to send the reimbursements. 
-
-## The reimbursement account is in USD
-
-First, confirm the workspace settings are set up correctly by doing the following:
-1. Head to **Settings > Workspaces > Group > _[Workspace Name]_ > Reports** and check that the workspace currency is USD
-2. Under **Settings > Workspaces > Group > _[Workspace Name]_ > Reimbursements**, set the reimbursement method to direct
-3. Under **Settings > Workspaces > Group > _[Workspace Name]_ > Reimbursements**, set the USD bank account to the default account
-
-Once that’s all set, head to **Settings > Account > Payments**, and click **Enable Global Reimbursement** on the bank account (this button may not show for up to 60 minutes after the Expensify team confirms international reimbursements are available on your account).
-
-From there, you’ll fill out a form via DocuSign. Once the form is complete, it is automatically sent to our Compliance Team for review.  Our Support Team will contact you with more details if additional information is required. 
-
-## The reimbursement account is in AUD, CAD, GBP, EUR
-
-First, confirm the workspace currency corresponds with the currency of the reimbursement bank account. You can do this under **Settings > Workspaces > Group > _[Workspace Name]_ > Reports**. It should be AUD, CAD, GBP, or EUR. 
-
-Next, add the bank account to Expensify: 
-1. Head to **Settings > Workspaces > Group > _[Workspace Name]_ > Reimbursements** and set the reimbursement method to direct (this button may not show for up to 60 minutes after the Expensify team confirms international reimbursements are available on your account)
-2. Click **Add Business Bank Account**
-3. If the incorrect country shows as the default, click **Switch Country** to select the correct country
-4. Enter the bank account details 
-5. Click **Save & Continue**
-
-From there, you’ll fill out a form via DocuSign. Once the form is complete, it is automatically sent to our Compliance Team for review. Our Support Team will contact you with more details if additional information is required. 
-
-# How to start reimbursing internationally
-
-After the bank account is verified for international payments, set the correct bank account as the reimbursement account. 
-
-You can do this under **Settings > Workspaces > Group > _[Workspace Name]_ > Reimbursements** by selecting the reimbursement account as the default account.
-
-Finally, have your employees add their deposit-only bank accounts. They can do this by logging into their Expensify accounts, heading to **Settings > Account > Payments**, and clicking **Add Deposit-Only Bank Account**. 
-
-# Deep Dive
-
-## Documents requested
-
-Our Compliance Team may ask for additional information depending on who initiates the verification or what information you provide on the DocuSign form. 
-
-Examples of additional requested information:
-- The reimburser’s proof of address and ID
-- Company directors’ proofs of address and IDs
-- An authorization letter 
-- An independently certified documentation such as shareholder agreement from a lawyer, notary, or public accountant if an individual owns more than 25% of the company
-
-{% include faq-begin.md %}
-
-## How many people can send reimbursements internationally? 
-
-Once your company is authorized to send global payments, the individual who verified the bank account can share it with additional admins on the workspace. That way, multiple workspace members can send international reimbursements. 
-
-## How long does it take to verify an account for international payments?
-
-It varies! The verification process can take a few business days to several weeks. It depends on whether or not the information in the DocuSign form is correct if our Compliance Team requires any additional information, and how responsive the employee verifying the company’s details is to our requests. 
-
-## If I already have a USD bank account connected to Expensify, do I need to go through the verification process again to enable international payments? 
-
-If you’ve already connected a US business bank account, you can request to enable global reimbursements by contacting Expensify Support immediately. However, additional steps are required to verify the bank account for international payments. 
-
-## My employee says they don’t have the option to add their non-USD bank account as a deposit account – what should they do? 
-
-Have the employee double-check that their default workspace is set as the workspace that's connected to the bank you're using to send international payments.
-
-An employee can confirm their default workspace is under **Settings > Workspaces > Group**. The default workspace has a green checkmark next to it. They can change their default workspace by clicking **Default Workspace** on the correct workspace.
-
-## Who is the “Authorized User” on the International Reimbursement DocuSign form? 
-
-This is the person who will process international reimbursements. The authorized user should be the same person who manages the bank account connection in Expensify. 
-
-## Who should I enter as the “User” on the International Reimbursement form?
-
-You can leave this form section blank since the “User” is Expensify. 
-
-{% include faq-end.md %}
diff --git a/docs/articles/expensify-classic/bank-accounts-and-payments/Pay-Bills.md b/docs/articles/expensify-classic/bank-accounts-and-payments/Pay-Bills.md
deleted file mode 100644
index 81dcf3488462..000000000000
--- a/docs/articles/expensify-classic/bank-accounts-and-payments/Pay-Bills.md
+++ /dev/null
@@ -1,113 +0,0 @@
----
-title: Pay Bills
-description: How to receive and pay company bills in Expensify 
----
-<!-- The lines above are required by Jekyll to process the .md file -->
-
-# Overview
-Simplify your back office by receiving bills from vendors and suppliers in Expensify. Anyone with or without an Expensify account can send you a bill, and Expensify will file it as a Bill and help you issue the payment.
-
-# How to Receive Vendor or Supplier Bills in Expensify 
-
-There are three ways to get a vendor or supplier bill into Expensify: 
-
-**Option 1:** Have vendors send bills to Expensify directly: Ask your vendors to email all bills to your Expensify billing intake email. 
-
-**Option 2:** Forward bills to Expensify: If your bills are emailed to you, you can forward those bills to your Expensify billing intake email yourself. 
-
-**Option 3:** Manually upload bills to Expensify: If you receive physical bills, you can manually create a Bill in Expensify on the web from the Reports page: 
-1. Click **New Report** and choose **Bill**
-2. Add the expense details and vendor's email address to the pop-up window
-3. Upload a pdf/image of the bill
-4. Click **Submit**
-
-# How to Pay Bills 
-
-There are multiple ways to pay Bills in Expensify. Let’s go over each method below: 
-
-## ACH bank-to-bank transfer
-
-To use this payment method, you must have a business bank account connected to your Expensify account. 
-
-To pay with an ACH bank-to-bank transfer: 
-
-1. Sign in to your Expensify account on the web at www.expensify.com.
-2. Go to the Inbox or Reports page and locate the Bill that needs to be paid. 
-3. Click the **Pay** button to be redirected to the Bill. 
-4. Choose the ACH option from the drop-down list.
-5. Follow the prompts to connect your business bank account to Expensify.
-
-**Fees:** None
-
-## Pay using a credit or debit card
-
-This option is available to all US and International customers receiving an bill from a US vendor with a US business bank account. 
-
-To pay with a credit or debit card: 
-1. Sign-in to your Expensify account on the web app at www.expensify.com.
-2, Click on the Bill you’d like to pay to see the details.
-3, Click the **Pay** button.
-4. You’ll be prompted to enter your credit card or debit card details. 
-
-**Fees:** Includes 2.9% credit card payment fee
-
-## Venmo
-
-If both you and the vendor have Venmo setup in their Expensify account, you can opt to pay the bill through Venmo.
-
-**Fees:** Venmo charges a 3% sender’s fee
-
-## Pay Outside of Expensify 
-
-If you are not able to pay using one of the above methods, then you can mark the Bill  as paid manually in Expensify to update its status and indicate that you have made payment outside Expensify. 
-
-To mark a Bill as paid outside of Expensify: 
-
-1. Sign-in to your Expensify account on the web app at www.expensify.com.
-2. Click on the Bill you’d like to pay to see the details.
-3. Click on the **Reimburse** button. 
-4. Choose **I’ll do it manually**
-
-**Fees:** None
-
-# Deep Dive: How company bills and vendor invoices are processed in Expensify 
-
-Here is how a vendor or supplier bill goes from received to paid in Expensify: 
-
-1. When a vendor or supplier bill is received in Expensify via, the document is SmartScanned automatically and a Bill is created. The Bill is owned by the primary domain contact, who will see the Bill on the Reports page on their default group policy. 
-2. When the Bill is ready for processing, it is submitted and follows the primary domain contact’s approval workflow. Each time the Bill is approved, it is visible in the next approver's Inbox. 
-3. The final approver pays the Bill from their Expensify account on the web via one of the methods.
-4. The Bill is coded with the relevant imported GL codes from a connected accounting software. After it has finished going through the approval workflow the Bill can be exported back to the accounting package connected to the policy.
-
-
-{% include faq-begin.md %}
-
-## What is my company's billing intake email? 
-Your billing intake email is [yourdomain.com]@expensify.cash. Example, if your domain is `company.io` your billing email is `company.io@expensify.cash`. 
-
-## When a vendor or supplier bill is sent to Expensify, who receives it? 
-
-Bills are received by the Primary Contact for the domain. This is the email address listed at **Settings > Domains > Domain Admins**.
-
-## Who can view a Bill in Expensify? 
-
-Only the primary contact of the domain can view a Bill. 
-
-## Who can pay a Bill?
-
-Only the primary domain contact (owner of the bill) will be able to pay the Mill.
-
-## How can you share access to Bills?
-
-To give others the ability to view a Bill, the primary contact can manually “share” the Bill under the Details section of the report via the Sharing Options button. 
-To give someone else the ability to pay Bills,  the primary domain contact will need to grant those individuals Copilot access to the primary domain contact's account. 
-
-## Is Bill Pay supported internationally? 
-
-Payments are currently only supported for users paying in United States Dollars (USD). 
-
-## What’s the difference between a Bill and an Invoice in Expensify? 
-
-A Bill is a payable which represents an amount owed to a payee (usually a vendor or supplier), and is usually created from a vendor invoice. An Invoice is a receivable, and indicates an amount owed to you by someone else. 
-
-{% include faq-end.md %}
diff --git a/docs/articles/expensify-classic/bank-accounts-and-payments/Reimbursements.md b/docs/articles/expensify-classic/bank-accounts-and-payments/Reimbursements.md
deleted file mode 100644
index a31c0a582fd7..000000000000
--- a/docs/articles/expensify-classic/bank-accounts-and-payments/Reimbursements.md
+++ /dev/null
@@ -1,42 +0,0 @@
-# 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/bank-accounts-and-payments/Reimbursing-Reports.md b/docs/articles/expensify-classic/bank-accounts-and-payments/Reimbursing-Reports.md
deleted file mode 100644
index 69b39bae2874..000000000000
--- a/docs/articles/expensify-classic/bank-accounts-and-payments/Reimbursing-Reports.md
+++ /dev/null
@@ -1,81 +0,0 @@
----
-title: Reimbursing Reports
-description: How to reimburse employee expense reports
----
-# Overview
-
-One essential aspect of the Expensify workflow is the ability to reimburse reports. This process allows for the reimbursement of expenses that have been submitted for review to the person who made the request. Detailed explanations of the various methods for reimbursing reports within Expensify are provided below.
-
-# How to reimburse reports 
-
-Reports can be reimbursed directly within Expensify by clicking the **Reimburse** button at the top of the report to reveal the available reimbursement options. 
-
-## Direct Deposit
-
-To reimburse directly in Expensify, the following needs to be already configured:
-- The employee that's receiving reimbursement needs to add a deposit bank account to their Expensify account (under **Settings > Account > Payments > Add a Deposit-only Bank Account**)
-- The reimburser needs to add a business bank account to Expensify (under **Settings > Account > Payments > Add a Verified Business Bank Account**)
-- The reimburser needs to ensure Expensify is whitelisted to withdraw funds from the bank account
-
-If all of those settings are in place, to reimburse a report, you will click **Reimburse** on the report and then select **Via Direct Deposit (ACH)**.
-
-![Reimbursing Reports Dropdown]({{site.url}}/assets/images/Reimbursing Reports Dropdown.png){:width="100%"}
-
-## Indirect or Manual Reimbursement 
-
-If you don't have the option to utilize direct reimbursement, you can choose to mark a report as reimbursed by clicking the **Reimburse** button at the top of the report and then selecting **I’ll do it manually – just mark as reimbursed**. 
-
-This will effectively mark the report as reimbursed within Expensify, but you'll handle the payment elsewhere, outside of the platform. 
-
-# Best Practices 
-- Plan ahead! Consider sharing a business bank account with multiple workspace admins so they can reimburse employee reports if you're unavailable. We recommend having at least two workspace admins with reimbursement permissions. 
-
-- Understand there is a verification process when sharing a business bank account. The new reimburser will need access to the business bank account’s transaction history (or access to someone who has access to it) to verify the set of test transactions sent from Expensify. 
-
-- Get into the routine of having every new employee connect a deposit-only bank account to their Expensify account. This will ensure reimbursements happen in a timely manner.
-
-- Employees can see the expected date of their reimbursement at the top of and in the comments section of their report.
-  
-# How to cancel a reimbursement
-
-Reimbursed a report by mistake? No worries! Any workspace admin with access to the same Verified Bank Account can cancel the reimbursement from within the report until it is withdrawn from the payment account.
-
-**Steps to Cancel an ACH Reimbursement:**
-1. On your web account, navigate to the Reports page
-2. Open the report
-3. Click **Cancel Reimbursement**
-4. After the prompt, "Are you sure you want to cancel the reimbursement?" click **Cancel Reimbursement**. 
-
-It's important to note that there is a small window of time (roughly less than 24 hours) when a reimbursement can be canceled. If you don't see the **Cancel Reimbursement** button on a report, this means your bank has already begun withdrawing the funds from the reimbursement account and the withdrawal cannot be canceled. 
-
-In that case, you’ll want to contact your bank directly to see if they can cancel the reimbursement on their end - or manage the return of funds directly with your employee, outside of Expensify.
-
-If you cancel a reimbursement after the withdrawal has started, it will be automatically returned to your Verified Bank Account within 3-5 business days.
-
-# Deep Dive
-
-## Rapid Reimbursement
-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 only bank account per day for the individuals being reimbursed or businesses receiving payments for bills
-- $10,000 per verified bank account for the company paying bills and reimbursing
-
-If neither limit is met, you can expect to see funds deposited into your bank account on the next business day.
-
-If either limit has been reached, you can expect funds deposited within your bank account within the typical ACH time frame of four to five business days.
-
-Rapid Reimbursement is not available for non-US-based reimbursement. If you are receiving a reimbursement to a non-US-based deposit account, you should expect to see the funds deposited in your bank account within four business days.
-
-{% include faq-begin.md %}
-
-## Who can reimburse reports? 
-Only a workspace admin who has added a verified business bank account to their Expensify account can reimburse employees.
-
-## Why can’t I trigger direct ACH reimbursements in bulk? 
-
-Instead of a bulk reimbursement option, you can set up automatic reimbursement. With this configured, reports below a certain threshold (defined by you) will be automatically reimbursed via ACH as soon as they're "final approved."
-
-To set your manual reimbursement threshold, head to **Settings > Workspace > Group > _[Workspace Name]_ > Reimbursement > Manual Reimbursement**.
-
-![Manual Reimbursement]({{site.url}}/assets/images/Reimbursing Manual.png){:width="100%"}
-
-{% include faq-end.md %}
diff --git a/docs/articles/expensify-classic/bank-accounts-and-payments/bank-accounts/Add-Personal-Australian-Bank-Account.md b/docs/articles/expensify-classic/bank-accounts-and-payments/bank-accounts/Add-Personal-Australian-Bank-Account.md
new file mode 100644
index 000000000000..84d8cb6b10a1
--- /dev/null
+++ b/docs/articles/expensify-classic/bank-accounts-and-payments/bank-accounts/Add-Personal-Australian-Bank-Account.md
@@ -0,0 +1,33 @@
+---
+title: Add personal Australian bank account
+description: Receive AUD reimbursements from an Australian employer by adding your banking information
+---
+<div id="expensify-classic" markdown="1">
+
+{% include info.html %}
+The workspace must be set to AUD to use ABA batch reimbursements. For businesses that will also be reimbursing employees in other countries outside of Australia, you’ll need to set up Global Reimbursement instead. 
+{% include end-info.html %}
+
+Australian employees can connect a personal deposit-only bank account to receive reimbursements for their expense reports. 
+
+1. Click your profile picture and select the workspace you want to set as your default workspace. 
+2. Hover over **Settings**, then click **Account**.
+3. Click the **Payments** tab on the left.
+4. Click **Add Deposit-Only Bank Account**.
+5. Enter the company information. 
+   - Enter the account holder’s name, address, city, and country.
+   - Enter the swift code.
+   - Enter the bank’s name, address, and city.
+   - Enter the account number. 
+   - Enter the BSB number.  
+
+{% include info.html %}
+If you don’t know your Bank User ID/Direct Entry ID/APCA Number, contact your bank for this information. 
+
+If your screen does not contain the listed fields, your company hasn’t enabled reimbursements through Expensify. Contact your administrator for next steps. 
+{% include end-info.html %}
+
+{:start="6"}
+6. Click **Save & Continue**.
+
+</div>
diff --git a/docs/articles/expensify-classic/bank-accounts-and-payments/bank-accounts/Connect-Personal-US-Bank-Account.md b/docs/articles/expensify-classic/bank-accounts-and-payments/bank-accounts/Connect-Personal-US-Bank-Account.md
new file mode 100644
index 000000000000..402337140419
--- /dev/null
+++ b/docs/articles/expensify-classic/bank-accounts-and-payments/bank-accounts/Connect-Personal-US-Bank-Account.md
@@ -0,0 +1,37 @@
+---
+title: Connect personal U.S. bank account
+description: Receive reimbursements for expense reports submitted to your employer
+---
+<div id="expensify-classic" markdown="1">
+
+Employees can connect a personal deposit-only bank account to receive reimbursements for their expense reports. 
+
+To connect a deposit-only account,
+
+1. Hover over **Settings**, then click **Account**.
+2. Click the **Payments** tab on the left.
+3. Click **Add Deposit-Only Bank Account**, then click **Connect to your bank**. 
+4. Click **Continue**.
+5. Search for your bank account in the list of banks and follow the prompts to sign in to your bank account.
+   - If your bank doesn’t appear, click the X in the right corner of the Plaid pop-up window, then click **Connect Manually**. You’ll then manually enter your account information and click **Save & Continue**. 
+6. Click **Save & Continue**.
+7. Enter the name, address, and phone number associated with the account. Then click **Save & Continue**.
+
+You’ll now receive reimbursements for your expense reports and invoices directly to this bank account.
+
+{% include faq-begin.md %}
+
+**I connected my deposit-only bank account. Why haven’t I received my reimbursement?**
+
+There are a few reasons why you might not have received a reimbursement: 
+- The estimated deposit date on the report has not arrived yet.
+- The bank account information is incorrect. If you believe you may have entered the wrong account, contact the Concierge and provide the Report ID for the missing reimbursement.
+- Your account wasn’t set up for Direct Deposit/ACH. You can contact your bank to confirm.
+
+**What happens if my bank requires an additional security check before adding it to a third party?**
+
+If your bank account has two-factor authentication (2FA) or another security step enabled, you should be prompted to complete this authentication step when connecting the account to Expensify. However, if you encounter an error during this process, you can close the pop-up window and select Connect Manually to add the account manually.
+
+{% include faq-end.md %}
+
+</div>
diff --git a/docs/articles/expensify-classic/bank-accounts-and-payments/bank-accounts/Connect-US-Business-Bank-Account.md b/docs/articles/expensify-classic/bank-accounts-and-payments/bank-accounts/Connect-US-Business-Bank-Account.md
new file mode 100644
index 000000000000..1ad70117ed5c
--- /dev/null
+++ b/docs/articles/expensify-classic/bank-accounts-and-payments/bank-accounts/Connect-US-Business-Bank-Account.md
@@ -0,0 +1,170 @@
+---
+title: Connect U.S. business bank account
+description: Receive business payments for invoices by connecting a deposit-only business bank account
+---
+<div id="expensify-classic" markdown="1">
+
+You can choose to connect either a business deposit-only account that only receives payments or a verified business account that can send and receive payments:
+
+| Business deposit-only account                     | Verified business account                            | 
+|---------------------------------------------------|------------------------------------------------------|
+| &#10004; Receive reimbursements for invoices      | &#10004; Reimburse expenses via direct bank transfer |
+|                                                   | &#10004; Pay bills                                   | 
+|                                                   | &#10004; Issue Expensify Cards                       |
+
+# Connect a business deposit-only account
+
+1. Hover over **Settings**, then click **Account**.
+2. Click the **Payments** tab on the left.
+3. Click **Add Deposit-Only Bank Account**, then click **Connect to your bank**. 
+4. Click **Continue**.
+5. Select your bank from the list of compatible banks and log in to your account. 
+   - If your bank is not listed, click the X to go back to the connection type. Select **Connect Manually**, enter your account details, select the checkbox at the bottom, then click **Save & Continue**. 
+6. Click **Allow**.
+7. Ensure the correct account is selected and click **Save & Continue**.
+8. Add your bank account information, select the checkbox at the bottom, then click **Save & Continue**.
+
+{% include info.html %}
+If the default account type is incorrect, you'll need to change from personal to business or vice versa by clicking "Switch to Business" or "Switch to Personal." The account type cannot be changed once the account is added.
+{% include end-info.html %}
+
+{:start="9"}
+9. Enter the name, address, and phone number associated with the account. Then click **Save & Continue**.
+
+You’ll now receive reimbursements for invoices directly to this bank account.
+
+# Connect a verified business account
+
+{% include info.html %}
+The person who completes this process does not need to be a signer on the account, however, they will be required to enter their own personal information as well. If someone other than the Expensify account holder enters their personal information in this section, the details will be flagged for review, and adding the bank account to Expensify will be delayed.
+{% include end-info.html %}
+
+## Step 1: Connect a bank account
+
+1. Click your profile picture and select the workspace you want to set as your default workspace.
+2. Hover over **Settings**, then click **Account**.
+3. Click the **Payments** tab on the left. 
+4. Click **Add Verified Bank Account**.
+5. Click **Connect to your bank**.
+6. Click **Continue**.
+7. Enter your phone number and click **Continue**. 
+8. Select your bank from the list of compatible banks and log in to your account. 
+   - If your bank is not listed, click the X to go back to the connection type. Select **Connect Manually**, enter your account details, select the checkbox at the bottom, then click **Save & Continue**. 
+9. Click **Allow**.
+10. Ensure the correct account is selected and click **Save & Continue**. 
+11. Enter the company information.
+   - Enter the legal business name.
+   - Enter the physical company address. It must be in the U.S. and cannot be a maildrop address or P.O. boxes.
+   - Enter a company phone number. 
+   - Enter the company website, formatted like https://www.expensify.com. Your business must have a valid website in order to use the 
+   - Expensify Card or pay invoices with Expensify.
+   - Enter the Tax Identification Number (TIN).
+   - Enter the company incorporation type, date, and state. 
+   - Enter the Industry Classification Code. You can locate a list of Industry Classification Codes [here](https://www.sec.gov/corpfin/division-of-corporation-finance-standard-industrial-classification-sic-code-list).
+
+{% include info.html %}
+If the default account type is incorrect, you'll need to change from personal to business or vice versa by clicking "Switch to Business" or "Switch to Personal." The account type cannot be changed once the account is added.
+{% include end-info.html %}
+
+{:start="12"}
+
+12. Enter your personal information into the Requestor Information section, including your physical U.S. address and SSN issued from the U.S. Then click **Save & Continue**.
+13. Verify your identity by uploading a photo of your ID, passport, or identity card. It must be issued by the U.S. and be current (i.e., the expiration date must be in the future).
+14. Upload a short video of yourself.
+15. If applicable, check the appropriate checkboxes under Additional Information.
+   - A Beneficial Owner is an individual who owns 25% or more of the business. If you or someone else is a Beneficial Owner, check the appropriate box. If someone else is a Beneficial Owner, their personal information will need to be provided as well. 
+   - If you are a non-profit organization and no individuals own more than 25% of the company, you do not need to list any beneficial owners. In that case, leave both boxes unchecked.
+16. Select the checkboxes under Agreement. 
+17. Click **Save & Continue**. 
+
+## Step 2: Verify the bank account
+
+Within 1-2 business days, Expensify will send three test transactions to your bank account that you’ll enter into Expensify to validate your bank account. You can confirm these amounts by doing either of the following:
+   - Click the validate task from Concierge on your Home page.
+   - Hover over **Settings** and click **Account**. Then click the **Payments** tab and click Enter test transactions. Then enter the three amounts and click **Validate**. 
+
+{% include info.html %}
+If you do not see these test transactions after two business days, click the green chat bubble in the right corner to get support from the Concierge.
+{% include end-info.html %}
+
+## Step 3: Add the bank account to your Workspace
+
+1. Hover over **Settings**, then click **Workspaces**.
+2. Click the desired workspace name.
+3. Click the **Reimbursement** tab.
+4. Click the **Direct** box, then click **Add Business Bank Account** and select the account.
+
+{% include faq-begin.md %}
+
+### I received a “something’s gone wrong” error while trying to add my ID to Onfido.
+
+If you receive an error message during this process, check all of the following:
+- Ensure you are using either the Safari (on iPhone) or Chrome (on Android) browser.
+- Check the browser’s permissions to ensure the camera and microphone settings are set to Allow.
+- Clear your web cache.
+- If using a corporate Wi-Fi network, confirm that your corporate firewall isn’t blocking the website.
+- While recording your video, ensure no other apps are overlapping your screen (such as the Facebook Messenger bubble).
+- If using iOS version 15 or later on iPhone, disable the Hide IP address feature in Safari.
+
+If the issue persists, follow these steps on a different device, if possible. Contact your Account Manager or Concierge for further troubleshooting assistance.
+
+### Should I add a Beneficial Owner if our business is owned by another company?
+
+No, you should only indicate that you have a Beneficial Owner if an individual owns 25% or more of the business.
+
+### Why can’t I input my address or upload my ID?
+
+Ensure that the address you’re entering is in the United States. When adding a verified business bank account in Expensify, the individual adding the account and any beneficial owners are required to have a U.S. address, photo ID, and SSN. 
+
+If you do not meet these requirements, you’ll need to have another admin add the bank account and share access with you once the account is verified.
+
+### Why am I being asked for documentation when adding my bank account?
+
+When a bank account is added to Expensify, we conduct a series of checks to comply with both our sponsor bank’s requirements and federal government regulations for the Bank Secrecy Act (BSA), Anti-Money Laundering (AML) laws, and anti-fraud. 
+
+If automatic verification fails, we may request manual verification, which could require documents such as address verification for your business, a letter from your bank confirming bank account ownership, etc.
+
+If you have any questions regarding the documentation request you received, contact Concierge for additional assistance.
+
+### What should I do if I don’t see all three microtransactions needed to validate my bank account?
+
+If you do not see the three microtransactions by the end of the second business day, contact your bank and ask them to whitelist Expensify’s ACH IDs 1270239450 and 4270239450. Expensify’s ACH Originator Name is “Expensify.”
+
+Once you are whitelisted, contact your Account Manager or Concierge, and our team will re-trigger the three transactions.
+
+### What happens if my bank requires an additional security check before adding it to a third party?
+
+If your bank account has two-factor authentication (2FA) or another security step enabled, you should be prompted to complete this authentication step when connecting the account to Expensify. However, if you encounter an error during this process, you can close the pop-up window and select Connect Manually to add the account manually.
+
+### I added a business deposit account. Can I also pay employees from this account?
+
+To pay employees from a business deposit account, click **Verify** next to the bank account. This will take you through the additional verification steps required to make this account a verified business bank account that you can use to issue payments.
+
+### I connected my business deposit account. Why haven’t I received my reimbursement?
+
+There are a few reasons why you might not have received a reimbursement:  
+- The estimated deposit date on the report has not arrived yet.
+- The bank account information is incorrect. If you believe you may have entered the wrong account, contact the Concierge and provide the Report ID for the missing reimbursement.
+- Your account wasn’t set up for Direct Deposit/ACH. Please contact your bank to confirm.
+
+### Are there certain industries or businesses for which Expensify cannot process payments?
+
+There are! If your business is associated with one of the following industries, you won't be able to connect your business bank account to process payments:
+- Security Brokers & Dealers
+- Dating & Escort Services
+- Massage Parlors
+- Casinos & Gambling/Betting Services
+- Non-FI, Money Orders
+- Wires, Money Orders
+- Government Owned Lotteries
+- Government Licensed Online Casinos (Online Gambling)
+- Government Licensed Horse/Dog Racing
+- Crypto-currency businesses
+- Internet gambling
+- Marijuana-related businesses
+- Firearm-related businesses (manufacturing and selling)
+- NFT (non-fungible token) services
+
+{% include faq-end.md %}
+
+</div>
diff --git a/docs/articles/expensify-classic/bank-accounts-and-payments/bank-accounts/Disconnect-Bank-Account.md b/docs/articles/expensify-classic/bank-accounts-and-payments/bank-accounts/Disconnect-Bank-Account.md
new file mode 100644
index 000000000000..eeb9718a4bbe
--- /dev/null
+++ b/docs/articles/expensify-classic/bank-accounts-and-payments/bank-accounts/Disconnect-Bank-Account.md
@@ -0,0 +1,26 @@
+---
+title: Disconnect bank account
+description: Remove a bank account from Expensify
+---
+<div id="expensify-classic" markdown="1">
+
+{% include info.html %}
+If the bank account is set as the settlement account for your Expensify Cards, you must designate another bank account as your settlement account (under Settings > Domains > Company Cards > Settings) before this account can be deleted.
+{% include end-info.html %}
+
+To disconnect a bank account from Expensify,
+
+1. Hover over **Settings**, then click **Account**. 
+2. Click the **Payments** tab on the left.
+3. To the right of the bank account, click **Delete**. 
+
+{% include faq-begin.md %}
+
+**Why can't I delete a bank account?**
+
+You may be unable to delete your bank account if:
+- The bank account is set as your Expensify Card settlement account
+- Your account is locked due to a failed payment
+{% include faq-end.md %}
+
+</div>
diff --git a/docs/articles/expensify-classic/bank-accounts-and-payments/bank-accounts/Enable-Australian-Reimbursements.md b/docs/articles/expensify-classic/bank-accounts-and-payments/bank-accounts/Enable-Australian-Reimbursements.md
new file mode 100644
index 000000000000..0418d982f440
--- /dev/null
+++ b/docs/articles/expensify-classic/bank-accounts-and-payments/bank-accounts/Enable-Australian-Reimbursements.md
@@ -0,0 +1,25 @@
+---
+title: Enable Australian reimbursements
+description: Reimburse AUD expenses using ABA files
+---
+<div id="expensify-classic" markdown="1">
+
+{% include info.html %}
+AUD bank accounts do not rely on direct deposit or ACH.
+
+For businesses that will also be reimbursing employees in other countries outside of Australia, you’ll need to set up Global Reimbursement instead.
+{% include end-info.html %}
+
+You can reimburse AUD expenses using indirect reimbursements. This allows your Australian employees to submit their personal bank account information to Expensify where it will be provided to you for payment via an .aba file. A Workspace Admin can then upload the .aba file to the bank to have payments issued. 
+
+To enable ABA payments,
+
+1. Hover over **Settings**, then click **Workspaces**. 
+2. Select the desired workspace. 
+3. Click the **Reports** tab on the left. 
+4. Click the Report Currency dropdown and select **AUD A$**. 
+5. Click the **Reimbursement** tab on the left. 
+6. Select **Indirect** as the Reimbursement type.
+7. Enable the toggle.
+
+</div>
diff --git a/docs/articles/expensify-classic/bank-accounts-and-payments/bank-accounts/Enable-Global-Reimbursements.md b/docs/articles/expensify-classic/bank-accounts-and-payments/bank-accounts/Enable-Global-Reimbursements.md
new file mode 100644
index 000000000000..b0c767fce277
--- /dev/null
+++ b/docs/articles/expensify-classic/bank-accounts-and-payments/bank-accounts/Enable-Global-Reimbursements.md
@@ -0,0 +1,95 @@
+---
+title: Enable Global Reimbursements
+description: Send international payments
+---
+<div id="expensify-classic" markdown="1">
+
+Enabling global reimbursements allows you to send direct reimbursements to countries worldwide if your company’s bank account is in the US, UK, Canada, Europe, or Australia. 
+
+# For USD accounts
+
+{% include info.html %}
+Before you can complete this process, you must first connect a **verified** U.S. bank account, and your employees receiving payments from this account must also connect their **deposit-only** U.S. bank account.
+{% include end-info.html %}
+
+## Step 1: Request global reimbursements
+
+Once your verified U.S. bank account has been added and verified, you can request that global reimbursements be enabled on your account.
+
+Click the support icon in your Expensify account to inform your Setup Specialist, Account Manager, or Concierge that you’d like to enable global reimbursements. They will ask you to confirm the currencies of the bank accounts and determine if your account meets the criteria for global reimbursements.
+
+## Step 2: Re-verify the bank account
+
+1. Hover over **Settings**, then click **Workspaces**. 
+2. Select the workspace.
+3. Click the **Reports** tab on the left. 
+4. Ensure that the workspace currency is set to **USD**. 
+5. Click the **Reimbursements** tab on the left.
+6. Ensure that the reimbursement method is set to **Direct** and that the right bank account is selected. 
+7. Click the **Payments** tab on the left.
+8. Click **Enable Global Reimbursement** next to the bank account.  
+
+{% include info.html %}
+This button may not appear for up to 60 minutes after the Expensify team confirms global reimbursements for your account.
+{% include end-info.html %}  
+
+{:start="9"}
+9. Complete the International Reimbursement DocuSign form. 
+
+Once the form is complete, it is automatically sent to our Compliance Team for review. Our Support Team will contact you with more details if additional information is required, which may include: 
+- An authorization letter
+- Proof of address and ID for the reimburser and/or company directors
+- Independently certified documentation, such as a shareholder agreement from a lawyer, notary, or public accountant if an individual owns more than 25% of the company
+
+# For AUD, CAD, GBP, and EUR accounts
+
+## Step 1: Request global reimbursements
+
+Click the support icon in your Expensify account to inform your Setup Specialist, Account Manager, or Concierge that you’d like to enable global reimbursements. They will ask you to confirm the currencies of the bank accounts and determine if your account meets the criteria for global reimbursements.
+
+## Step 2: Add the bank account
+
+1. Hover over **Settings**, then click **Workspaces**. 
+2. Select the workspace.
+3. Click the **Reports** tab on the left. 
+4. Ensure that the selected workspace currency matches your reimbursement bank account currency.
+5. Click the **Reimbursements** tab on the left.
+6. Set the reimbursement method to **Direct**. 
+
+{% include info.html %}
+This button may not appear for up to 60 minutes after the Expensify team confirms global reimbursements for your account.
+{% include end-info.html %}  
+
+{:start="7"}
+7. Click **Add Business Bank Account**.
+8. If necessary, click **Switch Country** to select the correct country if not automatically selected.
+9. Enter the bank account details, then click **Save & Continue**.
+10. Complete the International Reimbursement DocuSign form. 
+
+Once the form is complete, it is automatically sent to our Compliance Team for review. Our Support Team will contact you with more details if additional information is required, which may include: 
+- An authorization letter
+- Proof of address and ID for the reimburser and/or company directors
+- Independently certified documentation, such as a shareholder agreement from a lawyer, notary, or public accountant if an individual owns more than 25% of the company
+
+{% include faq-begin.md %}
+
+**Can multiple people send reimbursements internationally?**
+
+Once your company is authorized to send global payments, the individual who verified the bank account can share it with additional admins on the workspace. This will enable them to be able to send global reimbursements.
+
+**How long does it take to verify an account for global payments?**
+
+The verification process can take anywhere from a few business days to several weeks  depending on the information provided in the DocuSign form, if additional information is required for compliance.
+
+**My employee doesn’t have the option to add their non-USD bank account as a deposit account. What should they do?**
+
+Have the employee double-check that their [default workspace](https://help.expensify.com/articles/expensify-classic/workspaces/Navigate-multiple-workspaces) is set as the workspace that’s connected to the bank you’re using to send global payments. 
+
+**Who is the “Authorized User” and the “User” on the International Reimbursement DocuSign form?**
+
+- **Authorized User**: The person who will process global reimbursements. The Authorized User should be the same person who manages the bank account connection in Expensify.
+- **User**: You can leave this section blank because the “User” is Expensify.
+
+{% include faq-end.md %}
+
+</div>
diff --git a/docs/articles/expensify-classic/bank-accounts-and-payments/bank-accounts/Revoke-Access-to-Verified-Business-Bank-Account.md b/docs/articles/expensify-classic/bank-accounts-and-payments/bank-accounts/Revoke-Access-to-Verified-Business-Bank-Account.md
new file mode 100644
index 000000000000..198579b981e8
--- /dev/null
+++ b/docs/articles/expensify-classic/bank-accounts-and-payments/bank-accounts/Revoke-Access-to-Verified-Business-Bank-Account.md
@@ -0,0 +1,13 @@
+---
+title: Revoke access to verified business bank account
+description: Revoke an admins bank account access
+---
+<div id="expensify-classic" markdown="1">
+
+You can revoke access if an admin or accountant leaves the company or otherwise needs to have their access removed from the workspace bank account.
+
+1. Hover over **Settings**, then click **Account**.
+2. Click the **Payments** tab on the left.  
+3. Under Shared Business Bank Accounts, click **Unshare** next to the admin. 
+
+</div>
diff --git a/docs/articles/expensify-classic/bank-accounts-and-payments/bank-accounts/Share-Verified-Business-Bank-Account.md b/docs/articles/expensify-classic/bank-accounts-and-payments/bank-accounts/Share-Verified-Business-Bank-Account.md
new file mode 100644
index 000000000000..b667dc8f3845
--- /dev/null
+++ b/docs/articles/expensify-classic/bank-accounts-and-payments/bank-accounts/Share-Verified-Business-Bank-Account.md
@@ -0,0 +1,22 @@
+---
+title: Share verified business bank account
+description: Allow admins to reimburse employees or pay vendor bills by sharing access to the business bank account
+---
+<div id="expensify-classic" markdown="1">
+
+To allow an admin to reimburse employees or pay vendor bills, they must be given access to the workspace’s verified bank account. 
+
+{% include info.html %}
+Bank accounts can only be shared with someone who is a Workspace Admin for a workspace you also have access to.
+{% include end-info.html %}
+
+To grant another admin access to the bank account in Expensify, 
+
+1. Hover over **Settings**, then click **Account**.
+2. Click the **Payments** tab on the left. 
+3. Next to the bank account, click **Share**. 
+4. Enter the email address of the person you will share bank account access with. 
+
+The added admin will receive an email with additional instructions to revalidate the bank account. When a bank account is shared, it must be revalidated to ensure the newly added admin has access. It can take 1-2 business days to receive the three microtransactions, then the admin can validate the transaction amounts. 
+
+</div>
diff --git a/docs/articles/expensify-classic/bank-accounts-and-payments/payments/Cancel-an-ACH-Reimbursement.md b/docs/articles/expensify-classic/bank-accounts-and-payments/payments/Cancel-an-ACH-Reimbursement.md
new file mode 100644
index 000000000000..ab75067b1a7f
--- /dev/null
+++ b/docs/articles/expensify-classic/bank-accounts-and-payments/payments/Cancel-an-ACH-Reimbursement.md
@@ -0,0 +1,17 @@
+---
+title: Cancel an ACH reimbursement
+description: Cancel an ACH payment after it has been sent
+---
+<div id="expensify-classic" markdown="1">
+
+If a report was reimbursed with an ACH payment by mistake or otherwise needs to be canceled, a Workspace Admin with access to the verified bank account can cancel the reimbursement up until it is withdrawn from the payment account.
+
+To cancel an ACH reimbursement,
+
+1. Click the **Reports** tab.
+2. Open the report.
+3. Click **Cancel Reimbursement**. 
+   - If you don’t see the Cancel Reimbursement button, this means your bank has already begun transferring the funds and it cannot be canceled. In this case, you’ll need to contact your bank for cancellation. 
+4. Click **Cancel Reimbursement** to confirm cancellation.
+
+</div>
diff --git a/docs/articles/expensify-classic/bank-accounts-and-payments/payments/Receive-Payments.md b/docs/articles/expensify-classic/bank-accounts-and-payments/payments/Receive-Payments.md
new file mode 100644
index 000000000000..00fb236e1763
--- /dev/null
+++ b/docs/articles/expensify-classic/bank-accounts-and-payments/payments/Receive-Payments.md
@@ -0,0 +1,36 @@
+---
+title: Receive payments
+description: Receive reimbursements from an employer
+---
+<div id="expensify-classic" markdown="1">
+
+To get paid after submitting a report for reimbursement, you must first connect a personal U.S. bank account or a personal Australian bank account. Then once your employer approves your report or invoice, the reimbursement will be paid directly to your bank account.
+Funds for U.S. and global payments are generally deposited within a maximum of four to five business days: 2 days for the funds to be debited from the business bank account, and 2-3 business days for the ACH or wire to deposit into the employee account.
+
+However, banks only process ACH transactions before the daily cutoff (generally 3 p.m. PST) and only on business weekdays that are not bank holidays. This may affect when the payment is disbursed. If the payment qualifies for Rapid Reimbursement, you may receive the payment sooner.
+
+{% include info.html %}
+Companies also have the option to submit payments outside of Expensify via check, cash, or a third-party payment processor. Check with your Workspace Admin to know how you will be reimbursed.
+{% include end-info.html %}
+ 
+# Rapid Reimbursement (U.S. only)
+
+With Expensify’s ACH reimbursement, payments may be eligible for reimbursement by the next business day with Rapid Reimbursement if they meet the following qualifications:
+- **Deposit-only accounts**: Payment must not exceed $100 
+- **Verified business bank accounts**: The account does not disburse more than $10,000 within a 24-hour time period.
+
+If the payment amount exceeds the limit, funds will be deposited within the typical ACH time frame of four to five business days. 
+
+{% include faq-begin.md %}
+
+**Is there a way I can track my payment?**
+
+For U.S. ACH payments and global reimbursements, the expected date of reimbursement is provided at the top of the report and in the comments section of the report. Funds will be deposited within the typical ACH time frame of four to five business days unless the payment is eligible for Rapid Reimbursement. 
+
+**For global payments, what currency is the payment provided in?**
+
+Global payments are reimbursed in the recipient's currency. 
+
+{% include faq-end.md %}
+
+</div>
diff --git a/docs/articles/expensify-classic/bank-accounts-and-payments/payments/Reimburse-Australian-Reports.md b/docs/articles/expensify-classic/bank-accounts-and-payments/payments/Reimburse-Australian-Reports.md
new file mode 100644
index 000000000000..90a89ff3c75e
--- /dev/null
+++ b/docs/articles/expensify-classic/bank-accounts-and-payments/payments/Reimburse-Australian-Reports.md
@@ -0,0 +1,63 @@
+---
+title: Reimburse Australian reports
+description: Send payment for Australian expense reports
+---
+<div id="expensify-classic" markdown="1">
+
+Workspace Admins can reimburse AUD expense reports by downloading an .aba file containing the accounts needing payment and uploading the file to the bank. This can be done for a single report or for a batch of payments at once.
+
+{% include info.html %}
+Your financial institution may require .aba files to include a self-balancing transaction. If you are unsure, check with your bank. Otherwise, the .aba file may not work with your bank’s internet banking platform.
+{% include end-info.html %}
+
+# Reimburse a single report
+
+1. Open the report, invoice, or bill from the email or Concierge notification, or from the **Reports** tab.
+2. Click the **Reimburse** dropdown and select **Via ABA File**.
+3. Click **Generate ABA and Mark as Reimbursed**. 
+4. Click **Download**.
+5. Upload the .aba file to your bank. For additional guidance, use any of the following bank guides:
+   - [ANZ Bank](https://www.anz.com.au/support/internet-banking/pay-transfer-business/payroll/import-file/)
+   - [CommBank](https://www.commbank.com.au/business/pds/003-279-importing-a-de-file.pdf)
+   - [Westpac](https://www.westpac.com.au/business-banking/online-banking/support-faqs/import-files/)
+   - [NAB](https://www.nab.com.au/business/online-banking/nab-connect/help)
+   - [Bendigo Bank](https://www.bendigobank.com.au/globalassets/documents/business/bulk-payments-user-guide.pdf)
+   - [Bank of Queensland](https://www.boq.com.au/help-and-support/online-banking/ob-faqs-and-support/faq-pfuf)
+
+# Send batch payments
+
+Once employees submit their expense reports, a Workspace Admin exports the reports (which contains the employees’ bank account information) and uploads the .aba file to the bank.
+
+## Step 1: Verify currency & reimbursement settings
+
+1. Hover over **Settings**, then click **Workspaces**. 
+2. Select the desired workspace. 
+3. Click the **Reports** tab on the left. 
+4. Click the Report Currency dropdown and select **AUD A$**. 
+5. Click the **Reimbursement** tab on the left. 
+6. Verify that **Indirect** is selected as the Reimbursement type or select it if not.
+
+## Step 2: Download and upload the ABA file
+
+1. Click the **Reports** tab.
+2. Use the checkbox on the left to select all the reports needing payment.
+3. Click **Bulk Actions** and select **Reimburse via ABA**.
+5. Click **Generate ABA and Mark as Reimbursed**.
+6. Click **Download Report**.
+7. Upload the .aba file to your bank. For additional guidance, use any of the following bank guides:
+   - [ANZ Bank](https://www.anz.com.au/support/internet-banking/pay-transfer-business/payroll/import-file/)
+   - [CommBank](https://www.commbank.com.au/business/pds/003-279-importing-a-de-file.pdf)
+   - [Westpac](https://www.westpac.com.au/business-banking/online-banking/support-faqs/import-files/)
+   - [NAB](https://www.nab.com.au/business/online-banking/nab-connect/help)
+   - [Bendigo Bank](https://www.bendigobank.com.au/globalassets/documents/business/bulk-payments-user-guide.pdf)
+   - [Bank of Queensland](https://www.boq.com.au/help-and-support/online-banking/ob-faqs-and-support/faq-pfuf)
+
+{% include faq-begin.md %}
+
+**Can I use direct deposit for an AUD bank account?** 
+
+No, AUD bank accounts do not rely on direct deposit or ACH. 
+
+{% include faq-end.md %}
+
+</div>
diff --git a/docs/articles/expensify-classic/bank-accounts-and-payments/payments/Reimburse-Reports-Invoices-and-Bills.md b/docs/articles/expensify-classic/bank-accounts-and-payments/payments/Reimburse-Reports-Invoices-and-Bills.md
new file mode 100644
index 000000000000..b2cfbf833e13
--- /dev/null
+++ b/docs/articles/expensify-classic/bank-accounts-and-payments/payments/Reimburse-Reports-Invoices-and-Bills.md
@@ -0,0 +1,108 @@
+---
+title: Reimburse reports, invoices, and bills
+description: Use direct deposit or indirect reimbursement to pay reports, invoices, and bills
+---
+<div id="expensify-classic" markdown="1">
+
+Once a report, invoice, or bill has been submitted and approved for reimbursement, you can reimburse the expenses using direct deposit or an indirect reimbursement option outside of Expensify (like cash, a check, or a third-party payment processor).
+ 
+# Pay with direct deposit
+
+{% include info.html %}
+Before a report can be reimbursed with direct deposit, the employee or vendor receiving the reimbursement must connect their personal U.S. bank account, and the reimburser must connect a verified business bank account. 
+
+Direct deposit is available for U.S. and global reimbursements. It is not available for Australian bank accounts. For Australian accounts, review the process for reimbursing Australian expenses. 
+{% include end-info.html %}
+
+1. Open the report, invoice, or bill from the email or Concierge notification, or from the **Reports** tab.
+2. Click the **Reimburse** (for reports) or **Pay** (for bills and invoices) dropdown and select **Via Direct Deposit (ACH)**.
+3. Confirm that the correct VBA is selected or use the dropdown menu to select a different one. 
+4. Click **Accept Terms & Pay**. 
+
+The reimbursement is now queued in the daily batch. 
+
+# Pay with indirect reimbursement
+
+When payments are submitted through Expensify, the report is automatically labeled as Reimbursed after it has been paid. However, if you are reimbursing reports via paper check, payroll, or any other method that takes place outside of Expensify, you’ll want to manually mark the bill as paid in Expensify to track the payment history.
+
+To label a report as Reimbursed after sending a payment outside of Expensify,
+
+1. Pay the report, invoice, or bill outside of Expensify.
+2. Open the report, invoice, or bill from the email or Concierge notification, or from the **Reports** tab.
+3. Click **Reimburse**.
+4. Select **I’ll do it manually - just mark it as reimbursed**. This changes the report status to Reimbursed.
+
+Once the recipient has received the payment, the submitter can return to the report and click **Confirm** at the top of the report. This will change the report status to Reimbursed: CONFIRMED.
+
+{% include faq-begin.md %}
+
+**Is there a maximum total report total?**
+
+Expensify cannot process a reimbursement for any single report over $20,000. If you have a report with expenses exceeding $20,000 we recommend splitting the expenses into multiple reports.
+
+**Why is my account locked?**
+
+When you reimburse a report, you authorize Expensify to withdraw the funds from your account and send them to the person requesting reimbursement. If your bank rejects Expensify’s withdrawal request, your verified bank account is locked until the issue is resolved.
+
+Withdrawal requests can be rejected if the bank account has not been enabled for direct debit or due to insufficient funds. If you need to enable direct debits from your verified bank account, your bank will require the following details:
+- The ACH CompanyIDs: 1270239450 and 4270239450
+- The ACH Originator Name: Expensify 
+
+Once resolved, you can request to unlock the bank account by completing the following steps: 
+
+1. Hover over **Settings**, then click **Account**. 
+2. Click the **Payments** tab. 
+3. Click **Bank Accounts**. 
+4. Next to the bank account, click **Fix**. 
+
+Our support team will review and process the request within 4-5 business days.
+
+**How are bills and invoices processed in Expensify?**
+
+Here is the process a vendor or supplier bill goes through from receipt to payment:
+
+1. A vendor or supplier bill is received in Expensify. 
+2. Automatically, the document is SmartScanned and a bill is created for the primary domain contact. The bill will appear under the Reports tab on their default group policy.
+3. When the bill is ready for processing, it is submitted and follows the primary domain contact’s approval workflow until the bill has been fully approved.
+4. The final approver pays the bill from their Expensify account using one of the methods outlined in the article above.
+5. If the workspace is connected to an accounting integration, the bill is automatically coded with the relevant imported GL codes and can be exported back to the accounting software.
+
+**When a vendor or supplier bill is sent to Expensify, who receives it?**
+
+Bills are sent to the primary contact for the domain. They’ll see a notification from Concierge on their Home page, and they’ll also receive an email.
+
+**How can I share access to bills?**
+
+By default, only the primary contact for the domain can view and pay the bill. However, you can allow someone else to view or pay bills. 
+
+- **To allow someone to view a bill**: The primary contact can manually share the bill with others to allow them to view it. 
+   1. Click the **Reports** tab.
+   2. Click the report.
+   3. Click **Details** in the top right.
+   4. Click the **Add Person** icon.
+   5. Enter the email address or phone number of the person you will share the report with.
+   6. Enter a message, if desired.
+   7. Click **Share Report**. 
+
+- **To allow someone to pay bills**: The primary domain contact can allow others to pay bills on their behalf by [assigning those individuals as Copilots](https://help.expensify.com/articles/expensify-classic/copilots-and-delegates/Assign-or-remove-a-Copilot).
+
+**Is Bill Pay supported internationally?**
+
+Payments are currently only supported for users paying in United States Dollars (USD).
+
+**What’s the difference between a bill and an invoice?**
+
+- A **bill** is a payable that represents an amount owed to a payee (usually a vendor or supplier), and it is usually created from a vendor invoice. 
+- An **invoice** is a receivable that indicates an amount owed to you by someone else.
+
+**Who can reimburse reports?**
+
+Only a Workspace Admin who has added a verified business bank account to their Expensify account can reimburse employee reports.
+
+**Why can’t I trigger direct ACH reimbursements in bulk?**
+
+Expensify does not offer bulk reimbursement, but you can set up automatic reimbursement to automatically reimburse approved reports via ACH that do not exceed the threshold that you define.
+
+{% include faq-end.md %}
+
+</div>
diff --git a/docs/articles/expensify-classic/connect-credit-cards/company-cards/Company-Card-Settings.md b/docs/articles/expensify-classic/connect-credit-cards/company-cards/Company-Card-Settings.md
index bc9801060223..0fde76c8fa92 100644
--- a/docs/articles/expensify-classic/connect-credit-cards/company-cards/Company-Card-Settings.md
+++ b/docs/articles/expensify-classic/connect-credit-cards/company-cards/Company-Card-Settings.md
@@ -80,7 +80,7 @@ When you link your credit cards to Expensify, the transactions will appear in ea
 After a card is connected via direct connection or via Approved! banks, Expensify will import 30-90 days' worth of historical transactions to your account (the timeframe is based on your bank's discretion). Any historical expenses beyond that date range can be imported using the CSV spreadsheet import method. 
 
 ## Using eReceipts 
-Expensify eReceipts serve as digital substitutes for paper receipts in your purchase transactions, eliminating the necessity to retain physical receipts or utilize SmartScanning receipts. In the case of Expensify Card transactions, eReceipts are automatically generated for all amounts. For other card programs, eReceipts are specifically generated for purchases amounting to $75 or less, provided the transactions are in USD.
+Expensify eReceipts serve as digital substitutes for paper receipts in your purchase transactions, eliminating the necessity to retain physical receipts or utilize SmartScanning receipts. In the case of Expensify Card transactions, eReceipts are automatically generated for all amounts in the following categories: Airlines, Commuter expenses, Gas, Groceries, Mail, Meals, Car rental, Taxis, and Utilities. For other card programs, eReceipts are specifically generated for purchases amounting to $75 or less, provided the transactions are in USD.
 To ensure seamless automatic importation, it's essential to maintain your transactions in US Dollars. Additionally, eReceipts can be directly imported from your bank account. Please be aware that CSV/OFX imported files of bank transactions do not support eReceipts.
 It's important to note that eReceipts are not generated for lodging expenses. Moreover, due to incomplete or inaccurate category information from certain banks, there may be instances of invalid eReceipts being generated for hotel purchases. If you choose to re-categorize expenses, a similar situation may arise. It's crucial to remember that our Expensify eReceipt Guarantee excludes coverage for hotel and motel expenses.
 
diff --git a/docs/articles/expensify-classic/connect-credit-cards/company-cards/Troubleshooting.md b/docs/articles/expensify-classic/connect-credit-cards/company-cards/Troubleshooting.md
index 814bf8fc559b..f94e692f5e56 100644
--- a/docs/articles/expensify-classic/connect-credit-cards/company-cards/Troubleshooting.md
+++ b/docs/articles/expensify-classic/connect-credit-cards/company-cards/Troubleshooting.md
@@ -8,6 +8,15 @@ Whether you're encountering issues related to company cards, require assistance
 ## How to add company cards to Expensify
 You can add company credit cards under the Domain settings in your Expensify account by navigating to *Settings* > *Domain* > _Domain Name_ > *Company Cards* and clicking *Import Card/Bank* and following the prompts.
 
+## To Locate Missing Card Transactions in Expensify
+1. **Wait for Posting**: Bank transactions may take up to 24 hours to import into Expensify after they have "posted" at your bank. Ensure sufficient time has passed for transactions to appear.
+2. **Update Company Cards**: Go to Settings > Domains > Company Cards. Click on the card in question and click "Update" to refresh the card feed.
+3. **Reconcile Cards**: Navigate to the Reconciliation section under Settings > Domains > Company Cards. Refer to the detailed guide on how to use the [Reconciliation Dashboard](https://help.expensify.com/articles/expensify-classic/connect-credit-cards/company-cards/Reconciliation#identifying-outstanding-unapproved-expenses-using-the-reconciliation-dashboard).
+4. **Review Transactions**: Use the Reconciliation Dashboard to view all transactions within a specific timeframe. Transactions will display on the Expenses page based on their "Posted Date". If needed, uncheck the "use posted date" checkbox near the filters to view transactions based on their "Transaction Date" instead.
+5. **Address Gaps**: If there is a significant gap in transactions or if transactions are still missing, contact Expensify's Concierge or your Account Manager. They can initiate a historical data update on your card feed to ensure all transactions are properly imported.
+
+Following these steps should help you identify and resolve any issues with missing card transactions in Expensify.
+
 ## Known issues importing transactions
 The first step should always be to "Update" your card, either from Settings > Your Account > Credit Card Import or Settings > Domain > [Domain Name] > Company Cards for centrally managed cards. If a "Fix" or "Fix card" option appears, follow the steps to fix the connection. If this fails to import your missing transactions, there is a known issue whereby some transactions will not import for certain API-based company card connections. So far this has been reported on American Express, Chase and Wells Fargo. This can be temporarily resolved by creating the expenses manually instead:
 
@@ -63,9 +72,28 @@ If you've answered "yes" to any of these questions, a Domain Admins need to upda
 Make sure you're importing your card in the correct spot in Expensify and selecting the right bank connection. For company cards, use the master administrative credentials to import your set of cards at *Settings* > *Domains* > _Domain Name_ > *Company Cards* > *Import Card*.
 Please note there are some things that cannot be bypassed within Expensify, including two-factor authentication being enabled within your bank account. This will prevent the connection from remaining stable and will need to be turned off on the bank side. 
 
+## Why Can’t I See the Transactions Before a Certain Date?
+When importing a card into Expensify, the platform typically retrieves 30-90 days of historical transactions, depending on the card or account type. For commercial feeds, transactions cannot be imported before the bank starts sending data. If needed, banks can send backdated files, and Expensify can run a historical update upon request.
+
+Additionally, Expensify does not import transactions dated before the "start date" you specify when assigning the card. Unless transitioning from an old card to a new one to avoid duplicates, it's advisable to set the start date to "earliest possible" or leave it blank.
+
+For historical expenses that cannot be imported automatically, consider using Expensify's [company card](https://help.expensify.com/articles/expensify-classic/connect-credit-cards/company-cards/CSV-Import) or [personal card](https://help.expensify.com/articles/expensify-classic/connect-credit-cards/Personal-Credit-Cards#importing-expenses-via-a-spreadsheet) spreadsheet import method. This allows you to manually input missing transactions into the system.
+
+## Why Am I / Why Is My Employee Seeing Duplicates?
+If an employee is seeing duplicate expenses, they may have accidentally imported the card as a personal credit card as well as having the Domain Admin assign them a company card.
+
+To troubleshoot:
+- Have the employee navigate to their Settings > Your Account > Credit Card Import and confirm that their card is only listed once. 
+- If the card is listed twice, delete the entry without the "padlock" icon.
+
+**Important:** Deleting a duplicate card will delete all unapproved expenses from that transaction feed. Transactions associated with the remaining card will not be affected. If receipts were attached to those transactions, they will still be on the Expenses page, and the employee can click to SmartScan them again.
+
+Duplicate expenses might also occur if you recently unassigned and reassigned a company card with an overlapping start date. If this is the case and expenses on the “new” copy have not been submitted, you can unassign the card again and reassign it with a more appropriate start date. This action will delete all unsubmitted expenses from the new card feed.
+
 ## What are the most reliable bank connections in Expensify?*
-The most reliable corporate card to use with Expensify is the Expensify Visa® Commercial Card. We offer daily settlement, unapproved expense limits, and real-time compliance for secure and efficient spending, as well as 2% cash back (_Applies to USD purchases only._) Click here to learn more or apply.
-Additionally, we've teamed up with major banks worldwide to ensure a smooth import of credit card transactions into your accounts. Corporate cards from the following banks also offer the most dependable connections in Expensify:
+All bank connections listed below are extremely reliable, but we recommend transacting with the Expensify Visa® Commercial Card. It also offers daily and monthly settlement, unapproved expense limits, realtime compliance for secure and efficient spending, and cash back on all US purchases. [Click here to learn more about the Expensify Card](https://use.expensify.com/company-credit-card).
+
+We've also teamed up with major banks worldwide to ensure a smooth import of credit card transactions into your accounts:
 - American Express
 - Bank of America
 - Brex
@@ -75,7 +103,7 @@ Additionally, we've teamed up with major banks worldwide to ensure a smooth impo
 - Stripe
 - Wells Fargo
 
-Commercial feeds for company cards are the dependable connections in Expensify. If you have a corporate or commercial card account, you might have access to a daily transaction feed where expenses from Visa, MasterCard, and American Express are automatically sent to Expensify. Reach out to your banking relationship manager to check if your card program qualifies for this feature.
+Commercial feeds for company cards are the dependable connections in Expensify. If you have a corporate or commercial card account, you might have access to a daily transaction feed where expenses from Visa, Mastercard, and American Express are automatically sent to Expensify. Reach out to your banking relationship manager to check if your card program qualifies for this feature.
 
 # Troubleshooting American Express Business
 
diff --git a/docs/articles/expensify-classic/integrations/HR-integrations/ADP.md b/docs/articles/expensify-classic/connections/ADP.md
similarity index 100%
rename from docs/articles/expensify-classic/integrations/HR-integrations/ADP.md
rename to docs/articles/expensify-classic/connections/ADP.md
diff --git a/docs/articles/expensify-classic/integrations/travel-integrations/Additional-Travel-Integrations.md b/docs/articles/expensify-classic/connections/Additional-Travel-Integrations.md
similarity index 100%
rename from docs/articles/expensify-classic/integrations/travel-integrations/Additional-Travel-Integrations.md
rename to docs/articles/expensify-classic/connections/Additional-Travel-Integrations.md
diff --git a/docs/articles/expensify-classic/integrations/travel-integrations/Egencia.md b/docs/articles/expensify-classic/connections/Egencia.md
similarity index 75%
rename from docs/articles/expensify-classic/integrations/travel-integrations/Egencia.md
rename to docs/articles/expensify-classic/connections/Egencia.md
index 178621a62d90..35d232d2df67 100644
--- a/docs/articles/expensify-classic/integrations/travel-integrations/Egencia.md
+++ b/docs/articles/expensify-classic/connections/Egencia.md
@@ -24,7 +24,7 @@ Egencia controls the feed, so to connect Expensify you will need to:
 # How to Connect to a Central Purchasing Account
 Once your Egencia account manager has established the feed, you can automatically forward all Egencia booking receipts to a single Expensify account. To do this: 
 1. Open a chat with Concierge. 
-2. Tell Concierge “Please enable Central Purchasing Account for our Egencia feed. The account email is: xxx@yourdomain.com”.
+2. Tell Concierge the address of your central purchasing account, “Please enable Central Purchasing Account for our Egencia feed. The account email is: xxx@yourdomain.com”.
 
-The receipt the traveler receives is a "reservation expense." Reservation expenses are non-reimbursable and won’t be included in any integrated accounting system exports. The reservation sent to the traveler's account is added to their mobile app Trips feature so that the traveler can easily keep tabs on upcoming travel and receive trip notifications.
+A receipt will be sent to both the traveler and the central account. The receipt sent to the traveler is a "reservation expense." Reservation expenses are non-reimbursable and won’t be included in any integrated accounting system exports.
 
diff --git a/docs/articles/expensify-classic/integrations/travel-integrations/Global-VaTax.md b/docs/articles/expensify-classic/connections/Global-VaTax.md
similarity index 100%
rename from docs/articles/expensify-classic/integrations/travel-integrations/Global-VaTax.md
rename to docs/articles/expensify-classic/connections/Global-VaTax.md
diff --git a/docs/articles/expensify-classic/integrations/other-integrations/Google-Apps-SSO.md b/docs/articles/expensify-classic/connections/Google-Apps-SSO.md
similarity index 100%
rename from docs/articles/expensify-classic/integrations/other-integrations/Google-Apps-SSO.md
rename to docs/articles/expensify-classic/connections/Google-Apps-SSO.md
diff --git a/docs/articles/expensify-classic/integrations/HR-integrations/Greenhouse.md b/docs/articles/expensify-classic/connections/Greenhouse.md
similarity index 100%
rename from docs/articles/expensify-classic/integrations/HR-integrations/Greenhouse.md
rename to docs/articles/expensify-classic/connections/Greenhouse.md
diff --git a/docs/articles/expensify-classic/integrations/HR-integrations/Gusto.md b/docs/articles/expensify-classic/connections/Gusto.md
similarity index 100%
rename from docs/articles/expensify-classic/integrations/HR-integrations/Gusto.md
rename to docs/articles/expensify-classic/connections/Gusto.md
diff --git a/docs/articles/expensify-classic/integrations/accounting-integrations/Indirect-Accounting-Integrations.md b/docs/articles/expensify-classic/connections/Indirect-Accounting-Integrations.md
similarity index 100%
rename from docs/articles/expensify-classic/integrations/accounting-integrations/Indirect-Accounting-Integrations.md
rename to docs/articles/expensify-classic/connections/Indirect-Accounting-Integrations.md
diff --git a/docs/articles/expensify-classic/integrations/travel-integrations/Lyft.md b/docs/articles/expensify-classic/connections/Lyft.md
similarity index 100%
rename from docs/articles/expensify-classic/integrations/travel-integrations/Lyft.md
rename to docs/articles/expensify-classic/connections/Lyft.md
diff --git a/docs/articles/expensify-classic/integrations/travel-integrations/Navan.md b/docs/articles/expensify-classic/connections/Navan.md
similarity index 100%
rename from docs/articles/expensify-classic/integrations/travel-integrations/Navan.md
rename to docs/articles/expensify-classic/connections/Navan.md
diff --git a/docs/articles/expensify-classic/integrations/HR-integrations/QuickBooks-Time.md b/docs/articles/expensify-classic/connections/QuickBooks-Time.md
similarity index 100%
rename from docs/articles/expensify-classic/integrations/HR-integrations/QuickBooks-Time.md
rename to docs/articles/expensify-classic/connections/QuickBooks-Time.md
diff --git a/docs/articles/expensify-classic/integrations/HR-integrations/Rippling.md b/docs/articles/expensify-classic/connections/Rippling.md
similarity index 100%
rename from docs/articles/expensify-classic/integrations/HR-integrations/Rippling.md
rename to docs/articles/expensify-classic/connections/Rippling.md
diff --git a/docs/articles/expensify-classic/integrations/travel-integrations/TravelPerk.md b/docs/articles/expensify-classic/connections/TravelPerk.md
similarity index 100%
rename from docs/articles/expensify-classic/integrations/travel-integrations/TravelPerk.md
rename to docs/articles/expensify-classic/connections/TravelPerk.md
diff --git a/docs/articles/expensify-classic/integrations/travel-integrations/Uber.md b/docs/articles/expensify-classic/connections/Uber.md
similarity index 90%
rename from docs/articles/expensify-classic/integrations/travel-integrations/Uber.md
rename to docs/articles/expensify-classic/connections/Uber.md
index 16da0c0caa5b..213a90b6d288 100644
--- a/docs/articles/expensify-classic/integrations/travel-integrations/Uber.md
+++ b/docs/articles/expensify-classic/connections/Uber.md
@@ -22,3 +22,5 @@ Now, every time you use Uber for Business – be it for rides or meals – the r
 
 ![Uber integration set up steps: Connecting your account](https://help.expensify.com/assets/images/Uber1.png){:width="100%"}
 ![Uber integration set up steps: Selecting Expensify](https://help.expensify.com/assets/images/Uber2.png){:width="100%"}
+
+To disconnect Uber and Expensify, simply follow the above path and select Disconnect on the Expensify option.
diff --git a/docs/articles/expensify-classic/integrations/HR-integrations/Workday.md b/docs/articles/expensify-classic/connections/Workday.md
similarity index 100%
rename from docs/articles/expensify-classic/integrations/HR-integrations/Workday.md
rename to docs/articles/expensify-classic/connections/Workday.md
diff --git a/docs/articles/expensify-classic/integrations/HR-integrations/Zenefits.md b/docs/articles/expensify-classic/connections/Zenefits.md
similarity index 100%
rename from docs/articles/expensify-classic/integrations/HR-integrations/Zenefits.md
rename to docs/articles/expensify-classic/connections/Zenefits.md
diff --git a/docs/articles/expensify-classic/connections/accelo/Accelo-Troubleshooting.md b/docs/articles/expensify-classic/connections/accelo/Accelo-Troubleshooting.md
new file mode 100644
index 000000000000..fd0a6ca59069
--- /dev/null
+++ b/docs/articles/expensify-classic/connections/accelo/Accelo-Troubleshooting.md
@@ -0,0 +1,7 @@
+---
+title: Accelo Troubleshooting
+description: Accelo Troubleshooting
+order: 3
+---
+
+# Coming soon
diff --git a/docs/articles/expensify-classic/connections/accelo/Configure-Accelo.md b/docs/articles/expensify-classic/connections/accelo/Configure-Accelo.md
new file mode 100644
index 000000000000..a71671ad8da0
--- /dev/null
+++ b/docs/articles/expensify-classic/connections/accelo/Configure-Accelo.md
@@ -0,0 +1,55 @@
+---
+title: Configure Accelo
+description: Configure Accelo's export and coding settings.
+order: 2
+---
+
+# Configure Accelo
+1. Log into Accelo
+2. Navigate to the Integrations page
+3. Select the **Expensify** tab
+4. Enter Expensify Integration Server Credentials
+5. Provide your Expensify Integration Server’s Partner User ID and Partner User Secret
+6. Click “Save” to complete the setup
+
+## Upload Accelo Project Codes as Tags in Expensify
+Once you have connected Accelo to Expensify, the next step is to upload your Accelo Project Codes as Tags in Expensify:
+1. Head to to **Settings** > **Workspaces** > **Group** > _[Workspace Name]_ > **Tags**
+2. Choose to upload a CSV
+3. If you also integrate with Xero or QuickBooks Online, you must upload your Project Codes by appending your tags
+   - Go to **Settings** > **Workspaces** > **Group** > _[Workspace Name]_ > **Tags**
+   - Click on **Append a custom tag list from a CSV** to upload your Project Codes via a CSV
+
+## Information sync between Expensify and Accelo
+The Accelo integration does a one-way sync, which means it brings expenses from Expensify into Accelo. When this happens, it transfers specific information from Expensify expenses to Accelo:
+
+| Expensify           | Accelo                |
+|---------------------|-----------------------|
+| Comment             | Title                 |
+| Date                | Date Incurred         |
+| Category            | Type                  |
+| Tags                | Against (relevant Project, Ticket or Retainer) |
+| Distance (mileage)  | Quantity              |
+| Hours (time expenses) | Quantity            |
+| Amount              | Purchase Price and Sale Price |
+| Reimbursable?       | Reimbursable?         |
+| Billable?           | Billable?             |
+| Receipt             | Attachment            |
+| Tax Rate            | Tax Code              |
+| Attendees           | Submitted By          |
+
+## Expense Status
+The status of your expense report in Expensify is also synced in Accelo.
+
+| Expensify Report Status | Accelo Expense Status |
+|-------------------------|-----------------------|
+| Open                    | Submitted             |
+| Submitted               | Submitted             |
+| Approved                | Approved              |
+| Reimbursed              | Approved              |
+| Rejected                | Declined              |
+| Archived                | Approved              |
+| Closed                  | Approved              |
+
+## Importing expenses from Expensify to Accelo
+Accelo checks Expensify for new expenses once every hour. It automatically adds expenses that have been created or changed since the connection's last sync.
diff --git a/docs/articles/expensify-classic/connections/accelo/Connect-To-Accelo.md b/docs/articles/expensify-classic/connections/accelo/Connect-To-Accelo.md
new file mode 100644
index 000000000000..bdb21ceab9c0
--- /dev/null
+++ b/docs/articles/expensify-classic/connections/accelo/Connect-To-Accelo.md
@@ -0,0 +1,26 @@
+---
+title: Accelo
+description: Help doc for Accelo integration
+order: 1
+---
+<!-- The lines above are required by Jekyll to process the .md file -->
+
+# Overview
+Accelo is a cloud-based business management platform tailored to professional service companies. It enables seamless integration with Expensify, allowing users to effortlessly import expense details from Expensify into Accelo, associating them with the corresponding project, ticket, or retainer within the system. 
+
+**A couple of notes before connecting Accelo to Expensify:**
+- You must have administrator access to Accelo
+- You need to be a workspace admin in Expensify
+
+# Connect to Accelo
+To connect Expensify to Accelo, follow these steps:
+1. Open the [Expensify Integration Server](https://www.expensify.com/tools/integrations/)
+2. Copy your **Partner User ID** and **Partner User Secret**
+   - If you haven’t previously set up the integration server, follow the prompt on the screen and select **click here**.
+   - If the integration server is already set up, select **Click here to regenerate your Partner User Secret to generate a new code**.
+3. Copy the Partner User ID and Partner User Secret and store them in a secure location.
+4. In Accelo, go to the Integrations page and select the **Expensify** tab.
+5. Enter the Expensify Partner User ID and Partner User Secret.
+   - (Optional) If you currently use the Integration Server for another integration, open that platform and update the secret to the newly generated Partner User Secret
+6. Click **Save**. 
+7. Connection Established: Expensify is now successfully connected to Accelo!
diff --git a/docs/articles/expensify-classic/connections/certinia/Certinia-Troubleshooting.md b/docs/articles/expensify-classic/connections/certinia/Certinia-Troubleshooting.md
new file mode 100644
index 000000000000..de7e4ad7f364
--- /dev/null
+++ b/docs/articles/expensify-classic/connections/certinia/Certinia-Troubleshooting.md
@@ -0,0 +1,78 @@
+---
+title: Certinia Troubleshooting
+description: Troubleshoot common Certinia sync and export errors. 
+---
+# Overview of Certinia Troubleshooting
+Occasionally, users may encounter errors that prevent reports from exporting or the connection from syncing successfully. These errors often arise from discrepancies in settings, missing data, or configuration issues within Certinia or Expensify. 
+
+This troubleshooting guide aims to help you identify and resolve common sync and export errors, ensuring a seamless connection between your financial management systems. 
+
+By following the step-by-step solutions provided for each specific error, you can quickly address issues and maintain accurate and efficient expense reporting and data management.
+
+# ExpensiError FF0047: You must have an Ops Edit permission to edit approved records.
+This error indicates that the permission control setup between the connected user and the report submitter or region is missing Ops Edit permission.
+
+In Certinia go to Permission Controls and click the one you need to edit. Make sure that Expense Ops Edit is selected under Permissions.
+
+# ExpensiError FF0061: Object validation has failed. The credit terms…
+To resolve the error "Object validation has failed. The credit terms for the selected account on this document are not correctly defined," follow these steps:
+
+1. Identify the account used for the report being exported. This could be the account on the project for PSA/SRP or the account linked to the resource for FFA.
+2. In Certinia, under this account:
+   - Ensure that Base Date 1 is configured to invoice.
+   - Set Days Offset to 1 or more.
+   - Verify that a currency is selected for the account.
+
+By following these guidelines, you can correct the issue and ensure proper validation of the credit terms for the selected account.
+
+# ExpensiError FF0074: You do not have permissions for this resource
+This error message indicates a requirement to establish permission controls for the report creator/submitter within Certinia.
+
+To set this up:
+1. Navigate to Permission Controls in Certinia.
+2. Select "New" to create a new permission control.
+3. Enter the User and Resource Fields.
+4. Ensure all necessary permission fields are checked or configured appropriately.
+
+By completing these steps, you can effectively manage and grant the required permissions to the report creator/submitter in Certinia.
+
+# ExpensiError FF0076: Could not find employee in Certinia
+Go to Contacts in Certinia and add the report creator/submitter's Expensify email address to their employee record, or create a record with that email listed.
+
+If a record already exists then search for their email address to confirm it is not associated with multiple records.
+
+# ExpensiError FF0089: Expense Reports for this Project require an Assignment
+This error indicates that the project needs to have the permissions adjusted in Certinia
+
+Go to Projects > [project name] > Project Attributes and check Allow Expense Without Assignment. 
+
+# ExpensiError FF0091: Bad Field Name — [field] is invalid for [object]
+This means the field in question is not accessible to the user profile in Certinia for the user whose credentials were used to make the connection within Expensify. 
+
+To correct this:
+* Go to Setup > Build > expand Create > Object within Certinia
+* Then go to Payable Invoice > Custom Fields and Relationships
+* Click View Field Accessibility 
+* Find the employee profile in the list and select Hidden
+* Make sure both checkboxes for Visible are selected
+
+Once this step has been completed, sync the connection within Expensify by going to **Settings** > **Workspaces** > **Groups** > _[Workspace Name]_ > **Connections** > **Sync Now** and then attempt to export the report again. 
+
+# ExpensiError FF0132: Insufficient access. Make sure you are connecting to Certinia with a user that has the 'Modify All Data' permission
+
+Log into Certinia, go to Setup > Manage Users > Users and find the user whose credentials made the connection. 
+
+* Click on their profile on the far right side of the page
+* Go to System > System Permissions
+* Enable Modify All Data and save
+
+Sync the connection within Expensify by going to **Settings** > **Workspaces** > **Groups** > _[Workspace Name]_ > **Connections** > **Sync Now** and then attempt to export the report again
+
+# Error: Certinia PSA: Duplicate Value on Record
+When exporting multiple projects from Expensify to Certinia, each project generates its own Expense Report in Certinia. If any project fails during the initial export, all subsequent projects will also fail. In such cases, if you attempt to export again, an error may indicate that some projects were already successfully exported, potentially causing duplicates.
+
+To resolve this issue, delete any existing expense reports associated with the Expensify report ID in Certinia.
+
+Then, sync the connection within Expensify by going to **Settings** > **Workspaces** > **Groups** > _[Workspace Name]_ > **Connections** > **Sync Now** and then attempt to export the report again
+
+Following these steps ensures that any duplicate entries are cleared and that the export process can proceed without errors.
diff --git a/docs/articles/expensify-classic/connections/certinia/Configure-Certinia.md b/docs/articles/expensify-classic/connections/certinia/Configure-Certinia.md
new file mode 100644
index 000000000000..3f9172baaf9e
--- /dev/null
+++ b/docs/articles/expensify-classic/connections/certinia/Configure-Certinia.md
@@ -0,0 +1,91 @@
+---
+title: Configure Certinia
+description: Configure Certinia's export, coding, and advanced settings. 
+order: 2
+---
+After Certinia and Expensify are connected, head to **Settings > Workspaces > [Workspace Name] > Connections > Certinia > Configure** to configure the export, coding, and advanced settings for the connection.
+
+# Step 1: Configure Export Settings 
+## Preferred Exporter
+The preferred exporter is the user who will be the main exporter of reports. This person will receive the notifications for errors.
+
+## Payable Invoice Status and Date
+Reports can be exported as Complete or In Progress, using the date of last expense, submitted date, or exported date.
+
+## Reimbursable and non-reimbursable exports
+Both reimbursable and non-reimbursable reports are exported as payable invoices (FFA) or expense reports (PSA/SRP). If you have both Reimbursable and Non-Reimbursable expenses on a single report, Expensify will create a separate payable invoice/expense report for each type. 
+
+## Default Vendor (FFA)
+Choose from the full list of vendors from your Certinia FFA account. The amount will be applied to the non-reimbursable payable invoices.
+
+# Step 2: Configure Coding Settings
+## Company
+Select which FinancialForce company to import from/export to.
+
+## Chart of Accounts (FFA)
+Prepaid Expense Type and Profit & Loss accounts are imported to be used as categories on each expense. 
+
+## Expense Type GLA Mappings (PSA/SRP)
+Your Expense Type GLA Mappings are enabled in Expensify to use as categories on each expense when using both PSA and SRP; however, PSA will not import or export categories, while SRP will.
+
+## Dimensions (FFA)
+We import four dimension levels and each has three options to select from:
+
+* Do not map: FinancialForce defaults will apply to the payable invoice, without importing it into Expensify
+* Tags: These are shown in the Tag section of your workspace, and employees can select them on each expense created
+* Report fields: These will show in the Reports section of your workspace. Employees can select one to be applied at the header level, i.e., the entire report. 
+
+## Projects, Assignments, or Projects & Assignments (PSA/SRP)
+These can be imported as tags with **Milestones** being optional. When selecting to import only projects, we will derive the account from the project. If an assignment is selected, we will derive both the account and project from the assignment. 
+
+**Note:** If you are using a project without an assignment, the box **Allow Expenses Without Assignment** must be checked on the project in FinancialForce.
+
+## Tax
+Import tax rates from Certinia to apply to expenses.
+
+# Step 3: Configure Advanced Settings
+## Auto Sync
+Auto Sync in Certinia performs daily updates to your coding. Additionally, it automatically exports reports after they receive final approval. For Non-Reimbursable expenses, syncing happens immediately upon final approval of the report. In the case of Reimbursable expenses, syncing occurs as soon as the report is reimbursed or marked as reimbursed.
+
+## Export tax as non-billable
+When exporting Billable expenses, this dictates whether you will also bill the tax component to your clients/customers.
+
+## Multi-Currency in Certinia PSA/SRP
+When exporting to Certinia PSA/SRP, if employees are submitting expenses in more than one original currency, you may see up to three different currencies on the expense report in Certinia.
+* Summary Total Reimbursement Amount: this currency is derived from the currency of the project selected on the expense.
+* Amount field on the Expense line: this currency is derived from the Expensify workspace default report currency.
+* Reimbursable Amount on the Expense line: this currency is derived from the currency of the resource with an email matching the report submitter.
+
+{% include faq-begin.md %}
+
+## What happens if the report can’t be exported to Certinia?
+
+The following happens if a report isn't exported:
+- The preferred exporter will receive an email outlining the issue and any specific error messages
+- Any error messages preventing the export from taking place will be recorded in the report’s history
+- The report will be listed in the exporter’s Expensify Inbox as awaiting export.
+
+## If I enable Auto Sync, what happens to existing approved and reimbursed reports?
+
+Enabling Auto-Sync afterward won't affect existing approved or reimbursed reports. For any approved reports that haven't been exported to Certinia, you'll need to either manually export them or mark them as manually entered.
+
+## How do I export tax?
+
+Tax rates are created in Expensify through the tax tracking feature under **Settings** > **Workspaces** > **Groups** > _[Workspace Name]_ > **Tax**. We export the tax amount calculated on the expenses. 
+
+## How do reports map to Payable Invoices in Certinia FFA?
+
+Reports map to FFA as follows:
+- Account Name - Account associated with Expensify submitter’s email address
+- Reference 1 - Report URL
+- Invoice Description - Report title
+
+## How do reports map to Expense Reports in Certinia PSA/SRP?
+
+Reports map to PSA/SRP as follows:
+- Expense report name - Report title
+- Resource - User associated with Expensify submitter’s email address
+- Description - Report URL
+- Approver - Expensify report approver
+
+{% include faq-end.md %}
diff --git a/docs/articles/expensify-classic/connections/certinia/Connect-To-Certinia.md b/docs/articles/expensify-classic/connections/certinia/Connect-To-Certinia.md
new file mode 100644
index 000000000000..3d9c13449934
--- /dev/null
+++ b/docs/articles/expensify-classic/connections/certinia/Connect-To-Certinia.md
@@ -0,0 +1,40 @@
+---
+title: Certinia
+description: Connect Expensify to Certinia
+order: 1
+---
+[Certinia](https://use.expensify.com/financialforce) (formerly known as FinancialForce) is a cloud-based software solution that provides a range of financial management and accounting applications built on the Salesforce platform. There are two versions: PSA/SRP and FFA -- Expensify supports connections to both. 
+
+**Before connecting to Certinia:**
+Install the Expensify bundle in Certinia using the relevant installer:
+- [PSA/SRP](https://login.salesforce.com/packaging/installPackage.apexp?p0=04t2M000002J0BHD%252Fpackaging%252FinstallPackage.apexp%253Fp0%253D04t2M000002J0BH)
+- [FFA](https://login.salesforce.com/packaging/installPackage.apexp?p0=04t4p000001UQVj)
+- **Check the contact details in Certinia:**
+  - Confirm there's a user and contact in Certinia that matches your main email in Expensify
+  - Then, create contacts for all employees who will be sending expense reports
+  - Be sure that each contact's email matches the email address associated with their Expensify account
+
+# Connect to Certinia
+1. Go to **Settings > Workspaces > Groups > [Workspace Name] > Connections** in Expensify
+2. Click **Create a New Certinia (FinancialForce) Connection**
+3. Log into your Certinia account
+4. Follow the prompts until the connection between Certinia and Expensify is established
+
+### If you use PSA/SRP
+- Each report approver needs both a User and a Contact
+- The user does not need a SalesForce license
+
+Then, run through the following steps before connecting to Expensify:
+1. Set permission controls in Certinia for your user for each contact/resource
+   - Go to Permission Controls
+     - Create a new permission control
+     - Set yourself (exporter) as the user
+     - Select the resource (report submitter)
+     - Grant all available permissions
+2. Set permissions on any project you are exporting to
+  - Go to **Projects** > _select a project_ > **Project Attributes** > **Allow Expenses Without Assignment**
+  - Select the project > **Edit**
+  - Under the Project Attributes section, check **Allow Expenses Without Assignment**
+3. Set up Expense Types (categories in Expensify - _SRP only_)
+  - Go to **Main Menu** > _+ symbol_ > **Expense Type GLA Mappings**
+  - Click **New** to add new mappings
diff --git a/docs/articles/expensify-classic/connections/netsuite/Configure-Netsuite.md b/docs/articles/expensify-classic/connections/netsuite/Configure-Netsuite.md
new file mode 100644
index 000000000000..f926792ffd1f
--- /dev/null
+++ b/docs/articles/expensify-classic/connections/netsuite/Configure-Netsuite.md
@@ -0,0 +1,469 @@
+---
+title: Configure Netsuite
+description: Configure NetSuite's export, coding, and advanced settings. 
+---
+By correctly configuring your NetSuite settings in Expensify, you can leverage the connection's settings to automate most of the tasks, making your workflow more efficient.
+
+# Step 1: Configure Export Settings
+
+There are numerous options for exporting Expensify reports to NetSuite. Let's explore how to configure these settings to align with your business needs.
+
+To access these settings, head to **Settings > Workspace > Group > Connections** and select the **Configure** button. 
+
+## Export Options
+
+### Subsidiary
+
+The subsidiary selection will only appear if you use NetSuite OneWorld and have multiple subsidiaries active. If you add a new subsidiary to NetSuite, sync the workspace connection, and the new subsidiary should appear in the dropdown list under **Settings > Workspaces > _[Workspace Name]_ > Connections**.
+
+### Preferred Exporter
+
+This option allows any admin to export, but the preferred exporter will receive notifications in Expensify regarding the status of exports.
+
+### Date
+
+The three options for the date your report will export with are:
+- Date of last expense: This will use the date of the previous expense on the report
+- Submitted date: The date the employee submitted the report
+- Exported date: The date you export the report to NetSuite
+
+## Reimbursable Expenses
+
+### Expense Reports
+
+Expensify transactions will export reimbursable expenses as expense reports by default, which will be posted to the payables account designated in NetSuite. 
+
+### Vendor Bills
+
+Expensify transactions export as vendor bills in NetSuite and will be mapped to the subsidiary associated with the corresponding policy. Each report will be posted as payable to the vendor associated with the employee who submitted the report. 
+You can also set an approval level in NetSuite for vendor bills.
+
+### Journal Entries
+
+Expensify transactions that are set to export as journal entries in NetSuite will be mapped to the subsidiary associated with this policy. All the transactions will be posted to the payable account specified in the policy. 
+
+You can also set an approval level in NetSuite for the journal entries.
+
+**Important Notes:**
+- Journal entry forms by default do not contain a customer column, so it is not possible to export customers or projects with this export option
+- The credit line and header level classifications are pulled from the employee record
+
+## Non-Reimbursable Expenses
+
+### Vendor Bills
+
+Non-reimbursable expenses will be posted as a vendor bill payable to the default vendor specified in your policy's connection settings. If you centrally manage your company cards through Domains, you can export expenses from each card to a specific vendor in NetSuite. You can also set an approval level in NetSuite for the bills. 
+
+### Journal Entries
+
+Non-reimbursable expenses will be posted to the Journal Entries posting account selected in your policy's connection settings. If you centrally manage your company cards through Domains, you can export expenses from each card to a specific account in NetSuite.
+
+**Important Notes:**
+- Expensify Card expenses will always export as Journal Entries, even if you have Expense Reports or Vendor Bills configured for non-reimbursable expenses on the Export tab
+- Journal entry forms do not contain a customer column, so it is not possible to export customers or projects with this export option
+- The credit line and header level classifications are pulled from the employee record
+
+### Expense Reports
+
+To use the expense report option for your corporate card expenses, you will need to set up your default corporate cards in NetSuite. 
+
+To use a default corporate card for non-reimbursable expenses, you must select the correct card on the employee records (for individual accounts) or the subsidiary record (If you use a non-one world account, the default is found in your accounting preferences).
+
+Add the corporate card option and corporate card main field to your expense report transaction form in NetSuite by: 
+1. Heading to _Customization > Forms > Transaction Forms > Preferred expense report form > Screen Fields_
+2. Under the Main tab, check “Show” for Account for Corporate Card Expenses
+3. On the Expenses tab, check “Show” for Corporate Card
+
+You can select the default account on your employee record to use individual corporate cards for each employee. Make sure you add this field to your employee entity form in NetSuite.
+If you have multiple cards assigned to a single employee, you cannot export to each account. You can only have a single default per employee record. 
+
+### Export Invoices
+
+Select the Accounts Receivable account you want your Invoice Reports to export. In NetSuite, the Invoices are linked to the customer, corresponding to the email address where the Invoice was sent.
+
+### Default Vendor Bills
+
+When selecting the option to export non-reimbursable expenses as vendor bills, the list of vendors will be available in the dropdown menu.
+
+# Step 2: Configure Coding Settings
+
+The Coding tab is where NetSuite information is configured in Expensify, which allows employees to code expenses and reports accurately. There are several coding options in NetSuite. Let’s go over each of those below. 
+
+## Expense Categories
+
+Expensify's integration with NetSuite automatically imports NetSuite Expense Categories as Categories in Expensify.
+
+Please note that each expense must have a Category selected to export to NetSuite. The category chosen must be imported from NetSuite and cannot be manually created in Expensify. 
+
+If you want to delete Categories, you must do this in NetSuite. Categories are added and modified on the integration’s side and then synced with Expensify.
+Once imported, you can turn specific Categories on or off under **Settings > Workspaces > _[Workspace Name]_ > Categories**. 
+
+## Tags
+
+The NetSuite integration allows you to configure Customers, Projects, Departments, Classes, and Locations as line-item expense classifications. These are called Tags in Expensify.
+
+Suppose a default Customer, Project, Department, Class, or Location ties to the employee record in NetSuite. In that case, Expensify will create a rule that automatically applies that tag to all expenses made by that employee (the Tag is still editable if necessary).
+
+If you want to delete Tags, you must do this in NetSuite. Tags are added and modified on the integration’s side and then synced with Expensify.
+
+Once imported, you can turn specific Tags on or off under **Settings > Workspaces > _[Workspace Name]_ > Tags**. 
+
+## Report Fields
+
+The NetSuite integration allows you to configure Customers, Projects, Departments, Classes, and Locations as report-level classifications. These are called Report Fields in Expensify.
+
+## NetSuite Employee Default
+
+The NetSuite integration allows you to set Departments, Classes, and Locations according to the NetSuite Employee Default for expenses exported as both Expense Reports and Journal Entries. 
+
+These fields must be set in NetSuite's employee(s) record(s) to be successfully applied to expenses upon export.
+
+You cannot use the employee default setting with a vendor bill export if you have both a vendor and an employee set up for the user under the same email address and subsidiary.
+
+## Tax
+
+The NetSuite integration allows users to apply a tax rate and amount to each expense. To do this, import Tax Groups from NetSuite: 
+1. In NetSuite, head to _Setup > Accounting > Tax Groups_
+2. Once imported, go to the NetSuite connection configuration page in Expensify (under **Settings > Workspaces > Group > _[Workspace Name]_ > Connection > NetSuite > Coding**), refresh the subsidiary list, and the Tax option will appear
+3. From there, enable Tax
+4. Click **Save**
+5. Sync the connection
+6. All Tax Groups for the connected NetSuite subsidiary will be imported to Expensify as taxes.
+7. After syncing, go to **Settings > Workspace > Group > _[Workspace Name]_ > Tax** to see the tax groups imported from NetSuite
+8. Use the turn on/off button to choose which taxes to make available to your employees
+9. Select a default tax to apply to the workspace (that tax rate will automatically apply to all new expenses)
+
+## Custom Segments
+
+To add a Custom Segment to your workspace, you’ll need to locate three fields in NetSuite:
+- Segment Name
+- Internal ID
+- Script/Field ID
+
+**To find the Segment Name:**
+1. Log in as an administrator in NetSuite
+2. Head to _Customization > Lists, Records, & Fields > Custom Segments_
+3. You’ll see the Segment Name on the Custom Segments page
+
+**To find the Internal ID:**
+1. Ensure you have internal IDs enabled in NetSuite under _Home > Set Preferences_
+2. Navigate back to the Custom Segment page
+3. Click the **Custom Record Type** hyperlink
+4. You’ll see the Internal ID on the Custom Record Type page
+
+**To find the Script/Field ID:**
+
+Note that as of 2019.1, any new custom segments that you create automatically use the unified ID, and the Use as Field ID box is not visible. If you are editing a custom segment definition that was created before 2019.1, the Use as Field ID box is available.
+To use a unified ID for the entire custom segment definition, check the Use as Field ID box. When the box is checked, no field ID fields or columns are shown on the Application & Sourcing subtabs because one ID is used for all fields.
+
+- If configuring Custom Segments as Report Fields, use the Field ID on the Transactions tab (under _Custom Segments > Transactions_), or if no Field ID is shown, use the unified ID (just called "ID" right below the "Label").
+- If configuring Custom Segments as Tags, use the Field ID on the Transaction Columns tab (under _Custom Segments > Transaction Columns_), or if no Field ID is shown, use the unified ID (just called "ID" right below the "Label").
+
+Lastly, head over to Expensify and do the following:
+1. Navigate to **Settings > Workspace > Group > _[Workspace Name]_ > Connections > Configure > Coding tab**
+2. Choose how to import Custom Segments (Report Fields or Tags) 
+3. Fill out the three fields (Segment Name, Internal ID, Script ID)
+4. Click **Submit**
+
+From there, you should see the values for the Custom Segment under the Tag or Report Field settings in Expensify. 
+
+Don’t use the "Filtered by" feature available for Custom Segments. Expensify can’t make these dependent on other fields. If you do have a filter selected, we suggest switching that filter in NetSuite to "Subsidiary" and enabling all subsidiaries to ensure you don't receive any errors upon exporting reports. 
+
+### Custom Records
+
+Custom Records are added through the Custom Segments feature.
+
+To add a Custom Record to your workspace, you’ll need to locate three fields in NetSuite:
+- The name of the record
+- Internal ID
+- Transaction Column ID
+
+**To find the Internal ID:**
+1. Make sure you have Internal IDs enabled in NetSuite under Home > Set Preferences
+2. Navigate back to the Custom Segment page
+3. Click the Custom Record Type hyperlink
+4. You’ll see the Internal ID on the Custom Record Type page
+
+**To find the Transaction Column ID:**
+If configuring Custom Segments as Report Fields, use the Field ID on the Transactions tab (under _Custom Segments > Transactions_).
+
+If configuring Custom Segments as Tags, use the Field ID on the Transaction Columns tab (under _Custom Segments > Transaction Columns_). 
+
+Lastly, head over to Expensify and do the following:
+1. Navigate to **Settings > Workspace > Group > [Workspace Name] > Connections > Configure > Coding tab**
+2. Choose how to import Custom Records (Report Fields or Tags) 
+3. Fill out the three fields (the name or label of the record, Internal ID, Transaction Column ID)
+4. Click **Submit**
+
+From there, you should see the values for the Custom Records under the Tag or Report Field settings in Expensify. 
+
+### Custom Lists
+
+To add Custom Lists to your workspace, you’ll need to locate two fields in NetSuite:
+- The name of the record
+- The ID of the Transaction Line Field that holds the record
+
+**To find the record:**
+1. Log into Expensify
+2. Head to **Settings > Workspace > Group > [Workspace Name] > Connections > Configure > Coding tab**
+3. The name of the record will be populated in a dropdown list
+
+The name of the record will populate in a dropdown list. If you don't see the one you are looking for, click **Refresh Custom List Options**.
+
+**To find the Transaction Line Field ID:**
+1. Log into NetSuite
+2. Search "Transaction Line Fields" in the global search
+3. Open the option that is holding the record to get the ID
+
+Lastly, head over to Expensify, and do the following:
+1. Navigate to **Settings > Workspaces > Group > [Workspace Name] > Connections > Configure > Coding tab**
+2. Choose how to import Custom Lists (Report Fields or Tags)
+3. Enter the ID in Expensify in the configuration screen
+4. Click **Submit**
+
+From there, you should see the values for the Custom Lists under the Tag or Report Field settings in Expensify. 
+
+# Step 3: Configure Advanced Settings
+
+The NetSuite integration’s advanced configuration settings are accessed under **Settings > Workspaces > Group > _[Workspace Name]_ > Connections > NetSuite > Configure > Advanced tab**.
+
+Let’s review the different advanced settings and how they interact with the integration.
+
+## Auto Sync
+
+Enabling Auto Sync ensures that the information in NetSuite and Expensify is always in sync through automating exports, tracking direct deposits, and communicating export errors.
+
+**Automatic Export:**
+- When you turn on the Auto Sync feature in Expensify, any final report you approve will automatically be sent to NetSuite.
+- This happens every day at approximately the same time.
+
+**Direct Deposit Alert:**
+- If you use Expensify's Direct Deposit ACH and have Auto Sync, getting reimbursed for an Expensify report will automatically create a Bill Payment in NetSuite.
+
+**Tracking Exports and Errors:**
+- In the comments section of an Expensify report, you can find extra details about the report.
+- The comments section will tell you when the report was sent to NetSuite, and if there were any problems during the export, it will show the error.
+
+## Newly Imported Categories
+
+With this enabled, all submitters can add any newly imported Categories to an Expense. 
+
+## Invite Employees & Set Approval Workflow
+
+### Invite Employees
+
+Use this option in Expensify to bring your employees from a specific NetSuite subsidiary into Expensify.
+Once imported, Expensify will send them an email letting them know they've been added to a workspace.
+
+### Set Approval Workflow
+
+Besides inviting employees, you can also establish an approval process in NetSuite.
+
+By doing this, the Approval Workflow in Expensify will automatically follow the same rules as NetSuite, typically starting with Manager Approval.
+
+- **Basic Approval:** This is a single level of approval, where all users submit directly to a Final Approver. The Final Approver defaults to the workspace owner but can be edited on the people page.
+- **Manager Approval (default):** Two levels of approval route reports first to an employee's NetSuite expense approver or supervisor, and second to a workspace-wide Final Approver. By NetSuite convention, Expensify will map to the supervisor if no expense approver exists. The Final Approver defaults to the workspace owner but can be edited on the people page. 
+- **Configure Manually:** Employees will be imported, but all levels of approval must be manually configured on the workspace's People settings page. If you enable this setting, it’s recommended you review the newly imported employees and managers on the **Settings > Workspaces > Group > _[Workspace Name]_ > People page**. You can set a user role for each new employee and enforce an approval workflow.
+
+## Automatically Create Employees/Vendors
+
+With this feature enabled, Expensify will automatically create a new employee or vendor (if one doesn’t already exist) from the report submitter's email in NetSuite. 
+
+## Export Foreign Currency Amount
+
+Using this feature allows you to send the original amount of the expense rather than the converted total when exporting to NetSuite. This option is available if you are exporting reimbursable expenses as Expense Reports.
+
+## Cross-Subsidiary Customers/Projects 
+
+This allows you to import Customers and Projects across all subsidiaries to a single group workspace. For this functionality, you must enable "Intercompany Time and Expense" in NetSuite. 
+
+That feature is found in NetSuite under _Setup > Company > Setup Tasks: Enable Features > Advanced Features_.
+
+## Sync Reimbursed Reports
+
+If you're using Expensify's Direct Deposit ACH feature and you want to export reimbursable expenses as either Expense Reports or Vendor Bills in NetSuite, here's what to do:
+1. In Expensify, go to the Advanced Settings tab
+2. Look for a toggle or switch related to this feature
+3. Turn it on by clicking the toggle
+4. Select the correct account for the Bill Payment in NetSuite
+5. Ensure the account you choose matches the default account for Bill Payments in NetSuite
+
+That's it! When Expensify reimburses an expense report, it will automatically create a corresponding Bill Payment in NetSuite.
+
+Alternatively, if reimbursing outside of Expensify, this feature will automatically update the expense report status in Expensify from Approved to Reimbursed when the respective report is paid in NetSuite and the corresponding workspace syncs via Auto-Sync or when the integration connection is manually synced.
+
+## Setting Approval Levels
+
+With this setting enabled, you can set approval levels based on your export type. 
+
+- **Expense Reports:** These options correspond to the default preferences in NetSuite – “Supervisor approval only,” “Accounting approval only,” or “Supervisor and Accounting approved.”
+- **Vendor Bills or Journal Entries:** These options correspond to the default preferences in NetSuite –  “Pending Approval” or “Approved for Posting.”
+
+If you have Approval Routing selected in your accounting preference, this will override the selections in Expensify. 
+
+If you do not wish to use Approval Routing in NetSuite, go to _Setup > Accounting > Accounting Preferences > Approval Routing_ and ensure Vendor Bills and Journal Entries are not selected. 
+
+### Collection Account
+
+When exporting invoices, once marked as Paid, the payment is marked against the account selected after enabling the Collection Account setting.
+
+# Additional Settings
+## Categories
+
+You can use the Auto-Categorization feature so that expenses are automatically categorized. 
+
+To set Category Rules (e.g., receipt requirements or comments), go to the categories page in the workspace under **Settings > Workspaces > [Workspace Name] > Categories**. 
+
+With this setting enabled, when an Expense Category updates in NetSuite, it will update in Expensify automatically. 
+
+## Company Cards
+
+NetSuite's company card feature simplifies exporting reimbursable and non-reimbursable transactions to your General Ledger (GL). This approach is recommended for several reasons:
+
+1. **Separate Employees from Vendors:** NetSuite allows you to maintain separate employee and vendor records. This feature proves especially valuable when integrating with Expensify. By utilizing employee defaults for classifications, your employees won't need to apply tags to all their expenses manually.
+2. **Default Accounts Payable (A/P) Account:** Expense reports enable you to set a default A/P account for export on your subsidiary record. Unlike vendor bills, where the A/P account defaults to the last selected account, the expense report export option allows you to establish a default A/P account.
+3. **Mix Reimbursable and Non-Reimbursable Expenses:** You can freely mix reimbursable and non-reimbursable expenses without categorizing them in NetSuite after export. NetSuite's corporate card feature automatically categorizes expenses into the correct GL accounts, ensuring a neat and organized GL impact.
+
+**Let’s go over an example!**
+
+Consider an expense report with one reimbursable and one non-reimbursable expense. Each needs to be exported to different accounts and expense categories.
+
+In NetSuite, you can quickly identify the non-reimbursable expense marked as a corporate card expense. Reviewing the GL impact, you'll notice that the reimbursable expense is posted to the default A/P account set on the subsidiary record. On the other hand, the company card expense is assigned to the Credit Card account, which can either be set as a default on the subsidiary record (for a single account) or the employee record (for individual credit card accounts in NetSuite).
+
+Furthermore, each expense is categorized according to your selected expense category.
+
+To use the expense report option for your corporate card expenses, you'll need to set up default corporate cards in NetSuite.
+
+For non-reimbursable expenses, choose the appropriate card on the subsidiary record. You can find the default in your accounting preferences if you're not using a OneWorld account.
+
+Add the corporate card option and the corporate card main field to configure your expense report transaction form in NetSuite:
+1. Go to _Customization > Forms > Transaction Forms > Preferred expense report form > Screen Fields_
+2. Under the Main tab, check "Show for Account for Corporate Card Expenses"
+3. On the Expenses tab, check "Show for Corporate Card"
+
+If you prefer individual corporate cards for each employee, you can select the default account on the employee record. Add this field to your employee entity form in NetSuite (under _Customize > Customize Form_ from any employee record). Note that each employee can have only one corporate card account default.
+
+### Exporting Company Cards to GL Accounts in NetSuite
+
+If you need to export company card transactions to individual GL accounts, you can set that up at the domain level. 
+
+Let’s go over how to do that: 
+1. Go to **Settings > Domain > _[Domain name]_ > Company Cards**
+2. Click the Export Settings cog on the right-hand side of the card and select the GL account where you want the expenses to export
+
+After setting the account, exported expenses will be mapped to that designated account.
+
+## Tax 
+
+You’ll want to set up Tax Groups in Expensify if you're keeping track of taxes.
+
+Expensify can import "NetSuite Tax Groups" (not Tax Codes) from NetSuite. Tax Groups can contain one or more Tax Codes. If you have subsidiaries in the UK or Ireland, ensure your Tax Groups have only one Tax Code.
+
+You can locate these in NetSuite by setting up> Accounting > Tax Groups.
+
+You’ll want to name Tax Groups something that makes sense to your employees since both the name and the tax rate will appear in Expensify.
+
+To bring NetSuite Tax Groups into Expensify, here's what you need to do:
+1. Create your Tax Groups in NetSuite by going to _Setup > Accounting > Tax Groups_
+2. Click **New**
+3. Pick the country for your Tax Group
+4. Enter the Tax Name (this will be visible to your employees in Expensify)
+5. Next, select the subsidiary for this Tax Group 
+6. Finally, from the table, choose the Tax Code you want to include in this Tax Group
+7. Click **Add**, then click **Save**
+
+Repeat those steps for each tax rate you want to use in Expensify. 
+
+Next, ensure that Tax Groups can be applied to expenses: 
+1. In NetSuite, head to _Setup > Accounting > Set Up Taxes_
+2. Set the preference for "Tax Code Lists Include" to either "Tax Groups And Tax Codes" or "Tax Groups Only." If you don't see this field, don't worry; it means you don't need to set it for that specific country
+
+NetSuite has a pre-made list of tax groups for specific locations, but you can also create your own. We'll import both your custom tax groups and the default ones. It's important not to deactivate the default NetSuite tax groups because we rely on them for exporting specific types of expenses.
+
+For example, there's a default Canadian tax group called CA-Zero, which we use when exporting mileage and per diem expenses that don't have any taxes applied in 
+
+Expensify. If you deactivate this group in NetSuite, it will lead to export errors.
+
+Additionally, some tax nexuses in NetSuite have specific settings that need to be configured in a certain way to work seamlessly with the Expensify integration:
+- ​​In the Tax Code Lists Include field, choose "Tax Groups" or "Tax Groups and Tax Codes." This setting determines how tax information is handled.
+- In the Tax Rounding Method field, select "Round Off." Although it won't cause connection errors, not using this setting can result in exported amounts differing from what NetSuite expects.
+
+If your tax groups are importing into Expensify but not exporting to NetSuite, check that each tax group has the right subsidiaries enabled. That is crucial for proper data exchange.
+
+## Multi-Currency
+
+When using multi-currency features with NetSuite, remember these points:
+
+**Matching Currencies:** The currency set for a vendor or employee record must match the currency chosen for the subsidiary in your Expensify configuration. This alignment is crucial for proper handling.
+
+**Foreign Currency Conversion:** If you create expenses in one currency and then convert them to another currency within Expensify before exporting, you can include both the original and converted amounts in the exported expense reports. This option, called "Export foreign currency amount," can be found in the Advanced tab of your configuration. Note that Expensify sends only the amounts; the actual currency conversion is performed in NetSuite.
+
+**Bank Account Currency:** When synchronizing bill payments, make sure your bank account's currency matches the subsidiary's currency. Failure to do so will result in an "Invalid Account" error. This alignment is necessary to prevent issues during payment processing.
+
+## Exporting Invoices
+
+When you mark an invoice as paid in Expensify, the paid status syncs with NetSuite and vice versa!
+
+Let's dive right in:
+1. Access Configuration Settings: Go to **Settings > Workspace > Group > _[Workspace Name]_ > Connections > Configuration**
+2. Choose Your Accounts Receivable Account: Scroll down to "Export Expenses to" and select the appropriate Accounts Receivable account from the dropdown list. If you don't see any options, try syncing your NetSuite connection by returning to the Connections page and clicking **Sync Now**
+
+### Exporting an Invoice to NetSuite
+
+Invoices will be automatically sent to NetSuite when they are in the "Processing" or "Paid" status. This ensures you always have an up-to-date record of unpaid and paid invoices.
+
+If you have Auto Sync disabled, you'll need to export your invoices, along with your expense reports, manually. Follow these three simple steps:
+1. Filter Invoices: From your Reports page, use filters to find the invoices you want to export.
+2. Select Invoices: Pick the invoices ready for export.
+3. Export to NetSuite: Click **Export to NetSuite** in the top right-hand corner.
+
+When exporting to NetSuite, we match the recipient's email address on the invoice to a customer record in NetSuite, meaning each customer in NetSuite must have an email address in their profile. If we can't find a match, we'll create a new customer in NetSuite.
+
+Once exported, the invoice will appear in the Accounts Receivable account you selected during your NetSuite Export configuration.
+
+### Updating the status of an invoice to "paid"
+
+When you mark an invoice as "Paid" in Expensify, this status will automatically update in NetSuite. Similarly, if the invoice is marked as "Paid" in NetSuite, it will sync with Expensify. The payment will be reflected in the Collection account specified in your Advanced Settings Configuration.
+
+## Download NetSuite Logs
+
+Sometimes, we might need more details from you to troubleshoot issues with your NetSuite connection. Providing the NetSuite web services usage logs is incredibly useful. 
+
+Here's how you can send them to us:
+1. **Generate the Logs:** Start by trying to export a report from your system. This action will create the most recent logs that we require.
+2. **Access Web Services Usage Logs:** You can locate these logs in your NetSuite account. Just use the global search bar at the top of the page and type in "Web Services Usage Log."
+3. **Identify the Logs:** Look for the most recent log entry. It should have "FAILED" under the STATUS column. Click on the two blue "view" links under the REQUEST and RESPONSE columns. These are the two .xml files we need to examine.
+
+Send these two files to your Account Manager or Concierge so we can continue troubleshooting! 
+
+{% include faq-begin.md %}
+
+## How does Auto Sync work with reimbursed reports? 
+
+If a report is reimbursed via ACH or marked as reimbursed in Expensify and then exported to NetSuite, the report is automatically marked as paid in NetSuite during the next sync.
+
+If a report is exported to NetSuite and then marked as paid in NetSuite, the report is automatically marked as reimbursed in Expensify during the next sync. 
+
+## If I enable Auto Sync, what happens to existing approved and reimbursed reports? 
+
+If you previously had Auto Sync disabled but want to allow that feature to be used going forward, you can safely turn it on without affecting existing reports. Auto Sync will only take effect for reports created after enabling that feature.
+
+## Why are some of my customers not importing from NetSuite?
+
+If only part of your customer list is importing from NetSuite to Expensify, ensure your page size is set to 1000 for importing customers and vendors:
+1. Navigate to **Setup > Integration > Web Services Preferences > Search Page Size**
+2. Adjust this setting to 1000
+3. Sync your connection again under **Settings > Workspaces > Group > Workspace Name > Connections**
+
+Additionally, ensure the "Company Name" field is completed for each customer profile; otherwise, they won't import into the Group Workspace.
+
+## Why aren't all my Categories pulling into Expensify from NetSuite?
+
+If you're having trouble importing your Categories, you'll want to start by checking that they are set up in NetSuite as actual Expense Categories, not General Ledger accounts:
+- Log into NetSuite as an administrator and go to **Setup > Accounting > Expense Categories**
+- A list of Expense Categories should be available 
+- If no Expense Categories are visible click on "New" to create new Expense Categories
+
+If you have confirmed that your categories are set as Expense Categories in NetSuite and they still aren't importing to Expensify, make sure that the subsidiary of the Expense Category matches the subsidiary selected in your connection settings.
+
+{% include faq-end.md %}
diff --git a/docs/articles/expensify-classic/connections/netsuite/Connect-To-NetSuite.md b/docs/articles/expensify-classic/connections/netsuite/Connect-To-NetSuite.md
new file mode 100644
index 000000000000..1f96d9b8a633
--- /dev/null
+++ b/docs/articles/expensify-classic/connections/netsuite/Connect-To-NetSuite.md
@@ -0,0 +1,164 @@
+---
+title: NetSuite
+description: Set up the direct connection from Expensify to NetSuite.
+order: 1
+---
+# Overview
+Expensify's integration with NetSuite allows you to automate report exports, tailor your coding preferences, and tap into NetSuite's array of advanced features. By correctly configuring your NetSuite settings in Expensify, you can leverage the connection's settings to automate most of the tasks, making your workflow more efficient.
+
+**Before connecting NetSuite to Expensify, a few things to note:**
+- Token-based authentication works by ensuring that each request to NetSuite is accompanied by a signed token which is verified for authenticity
+- You must be able to login to NetSuite as an administrator to initiate the connection
+- You must have a Control Plan in Expensify to integrate with NetSuite
+- Employees don’t need NetSuite access or a NetSuite license to submit expense reports since the connection is managed by the Workspace Admin
+- Each NetSuite subsidiary will need its own Expensify Group Workspace
+- Ensure that your workspace's report output currency setting matches the NetSuite Subsidiary default currency
+- Make sure your page size is set to 1000 for importing your customers and vendors. You can check this in NetSuite under **Setup > Integration > Web Services Preferences > 'Search Page Size'**
+
+# Connect to NetSuite 
+
+## Step 1: Install the Expensify Bundle in NetSuite
+
+1. While logged into NetSuite as an administrator, go to Customization > SuiteBundler > Search & Install Bundles, then search for "Expensify"
+2. Click on the Expensify Connect bundle (Bundle ID 283395)
+3. Click Install
+4. If you already have the Expensify Connect bundle installed, head to _Customization > SuiteBundler > Search & Install Bundles > List_ and update it to the latest version
+5. Select **Show on Existing Custom Forms** for all available fields
+
+## Step 2: Enable Token-Based Authentication
+
+1. Head to _Setup > Company > Enable Features > SuiteCloud > Manage Authentication_
+2. Make sure “Token Based Authentication” is enabled
+3. Click **Save**
+
+## Step 3: Add Expensify Integration Role to a User
+
+The user you select must have access to at least the permissions included in the Expensify Integration Role, but they're not required to be an Admin.
+1. In NetSuite, head to Lists > Employees, and find the user you want to add the Expensify Integration role to
+2. Click _Edit > Access_, then find the Expensify Integration role in the dropdown and add it to the user
+3. Click **Save**
+
+Remember that Tokens are linked to a User and a Role, not solely to a User. It's important to note that you cannot establish a connection with tokens using one role and then switch to another role afterward. Once you've initiated a connection with tokens, you must continue using the same token/user/role combination for all subsequent sync or export actions.
+
+## Step 4: Create Access Tokens
+
+1. Using Global Search in NetSuite, enter “page: tokens”
+2. Click **New Access Token**
+3. Select Expensify as the application (this must be the original Expensify integration from the bundle)
+4. Select the role Expensify Integration
+5. Press **Save**
+6. Copy and Paste the token and token ID to a saved location on your computer (this is the only time you will see these details)
+
+## Step 5: Confirm Expense Reports are Enabled in NetSuite.
+
+Enabling Expense Reports is required as part of Expensify's integration with NetSuite:
+1. Logged into NetSuite as an administrator, go to Setup > Company > Enable Features > Employees
+2. Confirm the checkbox next to Expense Reports is checked
+3. If not, click the checkbox and then Save to enable Expense Reports
+
+## Step 6: Confirm Expense Categories are set up in NetSuite.
+
+Once Expense Reports are enabled, Expense Categories can be set up in NetSuite. Expense Categories are an alias for General Ledger accounts used to code expenses.
+
+1. Logged into NetSuite as an administrator, go to Setup > Accounting > Expense Categories (a list of Expense Categories should show)
+2. If no Expense Categories are visible, click **New** to create new ones
+
+## Step 7: Confirm Journal Entry Transaction Forms are Configured Properly
+
+1. Logged into NetSuite as an administrator, go to _Customization > Forms > Transaction Forms_
+2. Click **Customize** or **Edit** next to the Standard Journal Entry form
+3. Then, click Screen Fields > Main. Please verify the "Created From" label has "Show" checked and the Display Type is set to Normal
+4. Click the sub-header Lines and verify that the "Show" column for "Receipt URL" is checked
+5. Go to _Customization > Forms > Transaction Forms_ and ensure all other transaction forms with the journal type have this same configuration
+
+## Step 8: Confirm Expense Report Transaction Forms are Configured Properly
+
+1. Logged into NetSuite as an administrator, go to _Customization > Forms > Transaction Forms_
+2. Click **Customize** or **Edit** next to the Standard Expense Report form, then click **Screen Fields > Main**
+3. Verify the "Created From" label has "Show" checked and the Display Type is set to Normal
+4. Click the second sub-header, Expenses, and verify that the 'Show' column for 'Receipt URL' is checked
+5. Go to _Customization > Forms > Transaction Forms_ and ensure all other transaction forms with the expense report type have this same configuration
+
+## Step 9: Confirm Vendor Bill Transactions Forms are Configured Properly
+
+1. Logged into NetSuite as an administrator, go to _Customization > Forms > Transaction Forms_ 
+2. Click **Customize** or **Edit** next to your preferred Vendor Bill form
+3. Then, click _Screen Fields > Main_ and verify that the "Created From" label has "Show" checked and that Departments, Classes, and Locations have the "Show" label unchecked
+4. Under the Expenses sub-header (make sure to click the "Expenses" sub-header at the very bottom and not "Expenses & Items"), ensure "Show" is checked for Receipt URL, Department, Location, and Class
+5. Go to _Customization > Forms > Transaction Forms_ and provide all other transaction forms with the vendor bill type have this same configuration
+
+## Step 10: Confirm Vendor Credit Transactions Forms are Configured Properly
+
+1. While logged in as an administrator, go to _Customization > Forms > Transaction Forms_
+2. Click **Customize** or **Edit** next to your preferred Vendor Credit form, then click _Screen Fields > Main_ and verify that the "Created From" label has "Show" checked and that Departments, Classes, and Locations have the "Show" label unchecked
+3. Under the Expenses sub-header (make sure to click the "Expenses" sub-header at the very bottom and not "Expenses & Items"), ensure "Show" is checked for Receipt URL, Department, Location, and Class
+4. Go to _Customization > Forms > Transaction Forms_ and ensure all other transaction forms with the vendor credit type have this same configuration
+
+## Step 11: Set up Tax Groups (only applicable if tracking taxes)
+
+Expensify imports NetSuite Tax Groups (not Tax Codes), which you can find in NetSuite under _Setup > Accounting > Tax Groups_.
+
+Tax Groups are an alias for Tax Codes in NetSuite and can contain one or more Tax Codes (Please note: for UK and Ireland subsidiaries, please ensure your Tax Groups do not have more than one Tax Code). We recommend naming Tax Groups so your employees can easily understand them, as the name and rate will be displayed in Expensify.
+
+Before importing NetSuite Tax Groups into Expensify:
+1. Create your Tax Groups in NetSuite by going to _Setup > Accounting > Tax Groups_
+2. Click **New**
+3. Select the country for your Tax Group
+4. Enter the Tax Name (this is what employees will see in Expensify)
+5. Select the subsidiary for this Tax Group
+6. Select the Tax Code from the table you wish to include in this Tax Group
+7. Click **Add**
+8. Click **Save**
+9. Create one NetSuite Tax Group for each tax rate you want to show in Expensify
+
+Ensure Tax Groups can be applied to expenses by going to _Setup > Accounting > Set Up Taxes_ and setting the Tax Code Lists Include preference to "Tax Groups And Tax Codes" or "Tax Groups Only." 
+
+If this field does not display, it’s not needed for that specific country.
+
+## Step 12: Connect Expensify and NetSuite
+
+1. Log into Expensify as a Policy Admin and go to **Settings > Workspaces > _[Workspace Name]_ > Connections > NetSuite**
+2. Click **Connect to NetSuite**
+3. Enter your Account ID (Account ID can be found in NetSuite by going to _Setup > Integration > Web Services Preferences_)
+4. Then, enter the token and token secret 
+5. Click **Connect to NetSuite**
+
+From there, the NetSuite connection will sync, and the configuration dialogue box will appear.
+
+Please note that you must create the connection using a NetSuite account with the Expensify Integration role
+
+Once connected, all reports exported from Expensify will be generated in NetSuite using SOAP Web Services (the term NetSuite employs when records are created through the integration).
+
+{% include faq-begin.md %}
+
+## Can negative expenses be exported to NetSuite? 
+You can export reports with a negative total to NetSuite by selecting “Vendor Bill” as your export option. When a report total is negative, we’ll create a Vendor Credit in NetSuite instead of a bill.
+
+**Important**: Only enable this if you pay your employees/vendors outside of Expensify. A Vendor Credit reduces the total amount payable in NetSuite, but not in Expensify.
+
+To use this feature, make sure you have configured your Vendor Credit transaction form in NetSuite and are using the latest version of the Expensify bundle (version 1.4). If you need to update, go to **Customization > SuiteBundler > Search & Install Bundles > List** and click **Update** next to **Expensify Connect**.
+
+## How do you switch the owner of the connection between NetSuite and Expensify? 
+
+Follow the steps below to transfer ownership of the NetSuite connection to someone else:
+1. Head to **Settings > Workspaces > Workspace Name > Connections > NetSuite**
+2. Click **Configure** to review and save the settings for future reference
+3. Select **Do not connect to NetSuite**
+4. Select **Connect to NetSuite**
+5. Enter the email address of the new admin who will take over as the NetSuite User ID
+6. Enter the NetSuite Account ID (found in NetSuite under **Setup > Integration > Web Services Preferences**)
+7. Click **Create a new NetSuite Connection**
+8. Confirm completion of prerequisites and proceed by clicking Continue
+9. You will be redirected to the NetSuite SSO page, where you will enter the email address of the new connection owner and the NetSuite password for that account
+10. Once redirected to the NetSuite page, click **View all roles** and ensure you are logged in under the Administrator role
+11. After confirmation, sign out
+12. Return to Expensify to reconfigure the sync and export settings on the updated connection
+13. Click **Save**
+
+**If you run into any issues updating the connection, follow these additional troubleshooting steps:**
+- In NetSuite, access the role of the current connection owner
+- Click Edit > Access > Choose any role other than Administrator > Save
+- Click Edit > Access > Select Administrator role > Save
+- Repeat the steps outlined above
+
+{% include faq-end.md %}
diff --git a/docs/articles/expensify-classic/connections/netsuite/Netsuite-Troubleshooting.md b/docs/articles/expensify-classic/connections/netsuite/Netsuite-Troubleshooting.md
new file mode 100644
index 000000000000..01aa21a28b80
--- /dev/null
+++ b/docs/articles/expensify-classic/connections/netsuite/Netsuite-Troubleshooting.md
@@ -0,0 +1,464 @@
+---
+title: Netsuite Troubleshooting
+description: Troubleshoot common NetSuite sync and export errors. 
+---
+
+# Overview of NetSuite Troubleshooting
+Synchronizing and exporting data between Expensify and NetSuite can streamline your financial processes, but occasionally, users may encounter errors that prevent a smooth integration. These errors often arise from discrepancies in settings, missing data, or configuration issues within NetSuite or Expensify. 
+
+This troubleshooting guide aims to help you identify and resolve common sync and export errors, ensuring a seamless connection between your financial management systems. By following the step-by-step solutions provided for each specific error, you can quickly address issues and maintain accurate and efficient expense reporting and data management.
+
+# ExpensiError NS0005: Please enter value(s) for Department, Location or Class
+
+This error occurs when the classification (like Location) is required at the header level of your transaction form in NetSuite.
+
+For expense reports and journal entries, NetSuite uses classifications from the employee record default. Expensify only exports this information at the line item level.
+
+For vendor bills, these classifications can't be mandatory because we use the vendor record instead of the employee record, and vendor records don’t have default classifications.
+
+**Vendor Bills:**
+When exporting as a Vendor Bill, we pull from the vendor record, not the employee. Therefore, employee defaults don’t apply at the header ("main") level. This error appears if your NetSuite transaction form requires those fields.
+
+## How to Fix ExpensiError NS0005
+1. Go to **Customization > Forms > Transaction Forms**.
+2. Click **"Edit"** on your preferred vendor bill form.
+3. Go to **Screen Fields > Main**.
+4. Uncheck both **"Show"** and **"Mandatory"** for the listed fields in your error message.
+5. Sync the workspace connection in Expensify (**Settings > Workspaces > Workspace Name > Connections > Sync**).
+6. Attempt the export again.
+
+**Journal Entries and Expense Reports:**
+If you see this error when exporting a Journal Entry or Expense Report, it might be because the report submitter doesn’t have default settings for Departments, Classes, or Locations.
+
+**To fix this:**
+1. Go to **Lists > Employees** in NetSuite.
+2. Click **"Edit"** next to the employee's name who submitted the report.
+3. Scroll down to the **Classification** section.
+4. Select a default **Department**, **Class**, and **Location** for the employee.
+5. Click **Save**.
+6. Sync your NetSuite connection in Expensify.
+
+
+# ExpensiError NS0012: Currency Does Not Exist In NetSuite
+
+**Scenario One:** When dealing with foreign transactions, Expensify sends the conversion rate and currency of the original expense to NetSuite. If the currency isn't listed in your NetSuite subsidiary, you'll see an error message saying the currency does not exist in NetSuite.
+
+**To fix this:**
+1. Ensure the currency in Expensify matches what's in your NetSuite subsidiary.
+2. If you see an error saying 'The currency X does not exist in NetSuite', re-sync your connection to NetSuite through the workspace admin section in Expensify.
+3. Try exporting again.
+
+**Scenario Two:** This error can happen if you’re using a non-OneWorld NetSuite instance and exporting a currency other than EUR, GBP, USD, or CAD.
+
+**To fix this:**
+1. Head to NetSuite.
+2. Go to **Setup > Enable Features**.
+3. Check the **Multiple Currencies** box.
+
+Once you've done this, you can add the offending currency by searching **New Currencies** in the NetSuite global search.
+
+
+# ExpensiError NS0021: Invalid tax code reference key
+
+This error usually indicates an issue with the Tax Group settings in NetSuite, which can arise from several sources.
+
+#### Tax Group to Tax Code Mapping
+If a Tax Code on Sales Transactions is mapped to a Tax Group, an error will occur. To fix this, the Tax Code must be mapped to a Tax Code on Purchase Transactions instead.
+
+To verify if a Tax Code is for Sales or Purchase transactions, view the relevant Tax Code(s).
+
+**For Australian Taxes:**
+Ensure your Tax Groups are mapped correctly:
+- **GST 10%** to **NCT-AU** (not the Sales Transaction Tax Code TS-AU)
+- **No GST 0%** to **NCF-AU** (not the Sales Transaction Tax Code TFS-AU)
+
+#### Tax Group Type
+Tax Groups can represent different types of taxes. For compatibility with Expensify, ensure the tax type is set to GST/VAT.
+
+#### Enable Tax Groups
+Some subsidiaries require you to enable Tax Groups. Go to **Set Up Taxes** for the subsidiary's country and ensure the Tax Code lists include both Tax Codes and Tax Groups.
+
+
+# ExpensiError NS0023: Employee Does Not Exist in NetSuite (Invalid Employee)
+
+This can happen if the employee’s subsidiary in NetSuite doesn’t match what’s listed in Expensify.
+
+## How to Fix ExpensiError NS0023
+1. **Check the Employee's Subsidiary**
+   - Go to the employee record in NetSuite.
+   - Confirm the employee's subsidiary matches what’s listed as the subsidiary at the workspace level.
+   - To find this in Expensify navigate to **Settings > Workspaces > Workspace Name > Connections > Configure**.
+   - If the subsidiaries don’t match, update the subsidiary in Expensify to match what’s listed in NetSuite.
+   - Sync the NetSuite connection in Expensify.
+2. **Verify Access Restrictions:**
+   - Go to **Lists > Employees > Employees > [Select Employee] > Edit > Access**.
+   - Uncheck **Restrict Access to Expensify**.
+3. **Additional Checks:**
+    - Ensure the email on the employee record in NetSuite matches the email address of the report submitter in Expensify.
+    - In NetSuite, make sure the employee's hire date is in the past and/or the termination date is in the future.
+4. **Currency Match for Journal Entries:**
+    - If exporting as Journal Entries, ensure the currency for the NetSuite employee record, NetSuite subsidiary, and Expensify policy all match.
+    - In NetSuite, go to the **Human Resources** tab > **Expense Report Currencies**, and add the subsidiary/policy currency if necessary.
+
+
+# ExpensiError NS0024: Invalid Customer or Project Tag
+
+Employees must be listed as a resource on the customer/project in NetSuite to be able to apply it to an expense. If that isn’t set up in NetSuite, you can run into this error.
+
+## How to Fix ExpensiError NS0024
+
+1. **Ensure Employee Access:**
+   - In NetSuite, go to **Lists > Relationships > Customer/Projects**.
+   - Click **Edit** next to the desired Customer/Project.
+   - Click **Resources**, select the Employee from the drop-down menu, click **Add**, then **Save** your changes.
+2. **Sync with Expensify:**
+   - In Expensify, go to **Settings > Workspaces > [Workspace Name] > NetSuite > Sync Now**.
+   - Attempt to export again.
+3. **Remove Restriction for a Specific Customer/Project (Optional):**
+   - In NetSuite, edit the customer/project.
+   - Go to **Preferences**, then uncheck **Limit time and expenses to resources**.
+4. **Remove Restrictions for All Projects:**
+   - In NetSuite, go to **Setup > Accounting > Accounting Preferences > Time & Expenses**.
+   - Uncheck **Show Projects Only For Time And Expense Entry**.
+5. **Enable Cross-Subsidiary Customers/Projects in Expensify (Optional):**
+   - Go to **Settings > Workspaces > Group > [Workspace Name] > Connections > NetSuite > Configure > Advanced**.
+   - Enable **Cross-Subsidiary Customers/Projects** to remove the requirement for the employee's subsidiary and the customer's subsidiary to match.
+
+
+# ExpensiError NS0034: This record already exists
+
+This error occurs when the report in question was already exported to NetSuite. 
+
+## How to fix ExpensiError NS0034
+1. **Check for the existing Report in NetSuite:**
+    - If the report already exists in NetSuite but has been edited in Expensify, you need to delete the report in NetSuite.
+2. **Find the Report ID in Expensify:**
+    - Locate the Report ID in Expensify under the Details section in the top right corner of the report.
+3. **Search for the Report ID in NetSuite:**
+    - Use the Global Search Box in NetSuite to find the report using the Report ID.
+4. **Delete the Report in NetSuite:**
+    - In NetSuite, click _**Edit > Actions > Delete**_ to remove the report.
+5. **Re-export the Report from Expensify to NetSuite:**
+    - After deleting the report in NetSuite, re-export it from Expensify to NetSuite.
+
+
+# ExpensiError NS0046: Billable Expenses Not Coded with a NetSuite Customer or Billable Project
+
+NetSuite requires billable expenses to be assigned to a Customer or a Project that is configured as billable to a Customer. If this is not set up correctly in NetSuite, this error can occur.
+
+## How to Fix ExpensiError NS0046
+1. **Access the Report in Expensify:**
+    - Go to the Expensify website and open the report.
+2. Click the **Details** icon in the upper-left corner of the report.
+3. Select the following options (this allows you to easily see which expenses are flagged as billable but don't have a valid customer tagged):
+    - **View:** Details
+    - **Group by:** Tag
+    - **Split report by:** Billable
+4. **Check Billable Expenses:**
+    - Click on each expense in the Billable section of the report.
+    - Ensure that the Customer or Project tag field is present.
+    - Verify that there are no violations and that a value has been applied to the field.
+5. Make any necessary adjustments to the billable expenses and try the export again. 
+
+
+# ExpensiError NS0059: A credit card account has not been selected for corporate card expenses.
+
+**To resolve this error:**
+1. Log into NetSuite as an admin.
+2. Type "Page: Subsidiaries" in the global search box and select the subsidiary you will export to.
+3. Under the Preferences tab of the subsidiary, locate the field: Default Account for Corporate Card Expenses.
+
+**If you want to assign different cards to different employees:**
+1. Go to each employee record in NetSuite.
+2. Under the Human Resources > Expense and Purchasing section, find the field: Default Account for Corporate Card Expenses.
+
+**For reports containing cash expenses that are not marked as Reimbursable:**
+1. Have the approver reject the report.
+2. Mark the expenses as Reimbursable.
+3. Re-submit the report, approve it, and try to export again.
+
+For accounts without subsidiaries (non-OneWorld accounts), the default field is in your accounting preferences.
+
+
+# ExpensiError NS0085: Expense Does Not Have Appropriate Permissions for Settings an Exchange Rate in NetSuite
+
+This error occurs when the exchange rate settings in NetSuite aren't updated correctly. 
+
+## How to Fix ExpensiError NS0085
+1. In NetSuite, go to Customization > Forms > Transaction Forms.
+2. Search for the form type that the report is being exported as (Expense Report, Journal Entry, or Vendor Bill) and click Edit next to the form that has the Preferred checkbox checked.
+    - **For Expense Reports:**
+        - Go to Screen Fields > Expenses (the Expenses tab farthest to the right).
+        - Ensure the Exchange Rate field under the Description column has the Show checkbox checked.
+    - **For Vendor Bills:**
+        - Go to Screen Fields > Main.
+        - Ensure the Exchange Rate field under the Description column has the Show checkbox checked.
+    - **For Journal Entries:**
+        - Go to Screen Fields > Lines.
+        - Ensure the Exchange Rate field under the Description column has the Show checkbox checked.
+        - Go to Screen Fields > Main and ensure the Show checkbox is checked in the Exchange Rate field under the Description column.
+3. Go to **Settings > Workspaces > Group > [Workspace Name] > Connections**.
+4. Click Sync Now to sync the NetSuite connection.
+5. Export the report(s) again.
+
+
+# ExpensiError NS0079: The Transaction Date is Not Within the Date Range of Your Accounting Period
+
+The transaction date you specified is not within the date range of your accounting period. When the posting period settings in NetSuite are not configured to allow a transaction date outside the posting period, you can't export a report to the next open period, which is why you’ll run into this error. 
+
+## How to Fix ExpensiError NS0079
+1. In NetSuite, navigate to Setup > Accounting > Accounting Preferences.
+2. Under the General Ledger section, ensure the field Allow Transaction Date Outside of the Posting Period is set to Warn.
+3. Then, choose whether to export your reports to the First Open Period or the Current Period.
+
+Additionally, ensure the Export to Next Open Period feature is enabled within Expensify:
+1. Navigate to **Settings > Workspaces > Group > [Workspace Name] > Connections > Configure**.
+2. Open the **Advanced tab**.
+3. Confirm that the setting for **Export to Next Open Period** is enabled.
+
+If any configuration settings are updated on the NetSuite connection, be sure to sync the connection before trying the export again. 
+
+
+# ExpensiError NS0055: The Vendor You are Trying to Export to Does Not Have Access to the Currency X
+
+This error occurs when a vendor tied to a report in Expensify does not have access to a currency on the report in NetSuite. The vendor used in NetSuite depends on the type of expenses on the report you're exporting.
+- For **reimbursable** (out-of-pocket) expenses, this is the report's submitter (the employee who submitted the report).
+- For **non-reimbursable** (e.g., company card) expenses, this is the default vendor set via Settings > Workspaces > Group > [Workspace Name] > Connections > NetSuite > Configure.
+
+## How to Fix ExpensiError NS0055
+To fix this, the vendor needs to be given access to the applicable currency:
+1. In NetSuite, navigate to Lists > Relationships > Vendors to access the list of Vendors.
+2. Click Edit next to the Vendor tied to the report:
+    - For reimbursable (out-of-pocket) expenses, this is the report's submitter.
+    - For non-reimbursable (e.g., company card) expenses, this is the default vendor set via **Settings > Workspaces > Group > [Workspace Name] > Connections > NetSuite > Configure**.
+3. Navigate to the Financial tab.
+4. Scroll down to the Currencies section and add all the currencies that are on the report you are trying to export.
+5. Click Save.
+
+
+# ExpensiError NS0068: You do not have permission to set a value for element - “Created From”
+
+**To resolve this error:**
+1. In NetSuite, go to Customization > Forms > Transaction Forms.
+2. Search for the form type that the report is being exported as in NetSuite (Expense Report, Journal Entry, Vendor Bill, or if the report total is negative, Vendor Credit).
+3. Click Edit next to the form that has the Preferred checkbox checked.
+4. Go to Screen Fields > Main and ensure the field Created From has the Show checkbox checked.
+5. Sync the NetSuite connection under **Settings > Workspaces > Group > [Workspace Name] > Connections > Sync Now**.
+6. Export the report(s) again.
+
+#### For reports with Expensify Card expenses
+Expensify Card expenses export as Journal Entries. If you encounter this error when exporting a report with Expensify Card non-reimbursable expenses, ensure the field Created From has the Show checkbox checked for Journal Entries in NetSuite.
+
+
+# ExpensiError NS0037: You do not have permission to set a value for element - “Receipt URL”
+
+**To resolve this error:**
+1. In NetSuite, go to Customization > Forms > Transaction Forms.
+2. Search for the form type that the report is being exported as in NetSuite (Expense Report, Journal Entry, or Vendor Bill).
+3. Click Edit next to the form that has the Preferred checkbox checked.
+    - If the report is being exported as an Expense Report:
+        - Go to Screen Fields > Expenses (the Expenses tab farthest to the right).
+        - Ensure the field ReceiptURL has the Show checkbox checked.
+    - If the report is being exported as a Journal Entry:
+        - Go to Screen Fields > Lines.
+        - Ensure the field ReceiptURL has the Show checkbox checked.
+    - If the report is being exported as a Vendor Bill:
+        - Go to Screen Fields > Main.
+        - Ensure the field ReceiptURL has the Show checkbox checked.
+4. Click Sync Now to sync the NetSuite connection at **Settings > Workspaces > Group > Workspace Name > Connections**.
+5. Export the report(s) again.
+
+
+# ExpensiError NS0042: Error creating vendor - this entity already exists
+
+This error occurs when a vendor record already exists in NetSuite, but Expensify is still attempting to create a new one. This typically means that Expensify cannot find the existing vendor during export.
+- The vendor record already exists in NetSuite, but there may be discrepancies preventing Expensify from recognizing it.
+- The email on the NetSuite vendor record does not match the email of the report submitter in Expensify.
+- The vendor record might not be associated with the correct subsidiary in NetSuite.
+
+## How to Fix ExpensiError NS0042
+
+Follow these steps to resolve the issue:
+1. **Check Email Matching:**
+    - Ensure the email on the NetSuite vendor record matches the email of the report submitter in Expensify.
+2. **Check Subsidiary Association:**
+    - Ensure the vendor record is associated with the same subsidiary selected in the connection configurations
+    - You can review this under **Settings > Workspaces > Group > Workspace Name > Connections > Configure**.
+3. **Automatic Vendor Creation:**
+    - If you want Expensify to automatically create vendors, ensure the "Automatically Create Vendor" option is enabled under **Settings > Workspaces > Group > Workspace Name > Connections > Advanced**.
+
+**Options to Resolve the Error:**
+- **Edit the Existing Vendor:** Update the existing vendor record in NetSuite to match the report submitter's email and name.
+- **Delete the Existing Vendor:** If appropriate, delete the existing vendor record in NetSuite to allow Expensify to create a new one.
+- **Add Email to Existing Vendor:** Add the email address of the report’s submitter to the existing vendor record in NetSuite.
+
+**Final Steps:**
+1. After making the necessary changes, head to **Settings > Workspaces > Group > Workspace Name > Connections** in Expensify.
+2. Sync the NetSuite workspace connection.
+3. Retry exporting the report.
+
+
+# ExpensiError NS0109: Failed to login to NetSuite, please verify your credentials
+
+This error indicates a problem with the tokens created for the connection between Expensify and NetSuite. The error message will say, "Login Error. Please check your credentials."
+
+## How to Fix ExpensiError NS0109
+1. Review the [Connect to NetSuite](https://help.expensify.com/articles/expensify-classic/integrations/accounting-integrations/NetSuite) guide and follow steps 1 and 2 exactly as outlined.
+2. If you're using an existing token and encounter a problem, you may need to create a new token.
+
+
+# ExpensiError NS0123 Login Error: Please make sure that the Expensify integration is enabled
+
+This error indicates that the Expensify integration is not enabled in NetSuite.
+
+## How to Fix ExpensiError NS0123
+1. **Enable the Expensify Integration:**
+   - In NetSuite, navigate to Setup > Integrations > Manage Integrations.
+   - Ensure that the Expensify Integration is listed and that the State is Enabled.
+2. **If you can't find the Expensify integration:**
+   - Click "Show Inactives" to see if Expensify is listed as inactive.
+   - If Expensify is listed, update its state to Enabled.
+
+Once the Expensify integration is enabled, try syncing the NetSuite connection again.
+
+
+# ExpensiError NS0045: Expenses Not Categorized with a NetSuite Account
+
+**To resolve this error:**
+1. Log into NetSuite
+2. Do a global search for the missing record.
+   - Ensure the expense category is active and correctly named.
+   - Ensure the category is associated with the correct subsidiary that the Expensify workspace is linked to.
+3. In Expensify, head to **Settings > Workspaces > Groups > Workspace Name > Connections** and click **Sync Now** on the NetSuite connection to resync the workspace.
+4. Go back to the report, click on the offending expense(s), and re-apply the category in question.
+5. Export the report again.
+
+
+# ExpensiError NS0061: Please Enter Value(s) for: Tax Code
+
+This error typically occurs when attempting to export expense reports to a Canadian subsidiary in NetSuite for the first time and/or if your subsidiary in NetSuite has Tax enabled. 
+
+## How to Fix ExpensiError NS0061
+To fix this, you need to enable Tax in the NetSuite configuration settings. 
+
+1. Go to **Settings > Workspaces > Group > Workspace Name > Connections > NetSuite**.
+   - Be sure to select posting accounts for GST/HST and PST if you plan on exporting any expenses with taxes on them to Journal Entries.
+2. Click **Save**
+3. Click **Sync Now** to sync the connection
+
+**Note:** Expenses created before Tax was enabled might need to have the newly imported taxes applied to them retroactively to be exported.
+
+
+# Error creating employee: Your current role does not have permission to access this record.
+
+This error indicates that the credentials or role used to connect NetSuite to Expensify do not have the necessary permissions within NetSuite. You can find setup instructions for configuring permissions in NetSuite [here](https://help.expensify.com/articles/expensify-classic/connections/netsuite/Connect-To-NetSuite#step-3-add-expensify-integration-role-to-a-user).
+
+**To resolve this error:**
+1. If permissions are configured correctly, confirm the report submitter exists in the subsidiary set on the workspace and that their Expensify email address matches the email on the NetSuite Employee Record.
+2. If the above is true, try toggling off "Automatically create vendors/employees" under the Advanced tab of the NetSuite configuration window.
+   - Head to **Settings > Workspaces > Group > Workspace Name > Connections > NetSuite > Configure**
+   - Click on the **Advanced** tab
+   - Disable **Automatically create vendors/employees**
+3. Sync the NetSuite connection in Expensify
+4. Export the report again.
+
+# Elimination Settings for X Do Not Match
+
+This error occurs when an Intercompany Payable account is set as the default in the Default Payable Account field in the NetSuite subsidiary preferences, and the Accounting Approval option is enabled for Expense Reports.
+
+**To resolve this error:**
+Set the Default Payable Account for Expense Reports on each subsidiary in NetSuite to ensure the correct payable account is active.
+1. Navigate to Subsidiaries:
+   - Go to Setup > Company > Subsidiaries.
+2. Edit Subsidiary Preferences:
+    - Click Edit for the desired subsidiary.
+    - Go to the Preferences tab.
+3. Set Default Payable Account:
+    - Choose the preferred account for Default Payable Account for Expense Reports.
+
+Repeat these steps for each subsidiary to ensure the settings are correct, and then sync Expensify to NetSuite to update the connection.
+
+# Why are reports exporting as `Accounting Approved` instead of `Paid in Full`?
+
+**This can occur for two reasons:**
+- Missing Locations, Classes, or Departments in the Bill Payment Form
+- Incorrect Settings in Expensify Workspace Configuration
+
+## Missing Locations, Classes, or Departments in Bill Payment Form
+
+If locations, classes, or departments are required in your accounting classifications but are not marked as 'Show' on the preferred bill payment form, this error can occur, and you will need to update the bill payment form in NetSuite:
+1. Go to Customization > Forms > Transaction Forms.
+2. Find your preferred (checkmarked) Bill Payment form.
+3. Click Edit or Customize.
+4. Under the Screen Fields > Main tab, check 'Show' near the department, class, and location options.
+
+## Incorrect Settings in Expensify Workspace Configuration
+
+To fix this, you'll want to confirm the NetSuite connection settings are set up correctly in Expensify:
+1. Head to **Settings > Workspaces > Group > Workspace Name > Connections > NetSuite > Configure > Advanced**
+2. **Ensure the following settings are correct:**
+   - Sync Reimbursed Reports: Enabled and payment account chosen.
+   - Journal Entry Approval Level: Approved for Posting.
+   - A/P Approval Account: This must match the current account being used for bill payment.
+3. **Verify A/P Approval Account:**
+   - To ensure the A/P Approval Account matches the account in NetSuite:
+        - Go to your bill/expense report causing the error.
+        - Click Make Payment.
+        - This account needs to match the account selected in your Expensify configuration.
+4. **Check Expense Report List:**
+   - Make sure this is also the account selected on the expense report by looking at the expense report list.
+
+Following these steps will help ensure that reports are exported as "Paid in Full" instead of "Accounting Approved."
+
+
+# Why are reports exporting as `Pending Approval`?
+
+If reports are exporting as "Pending Approval" instead of "Approved," you'll need to adjust the approval preferences in NetSuite.
+
+**Exporting as Journal Entries/Vendor Bills:**
+1. In NetSuite, go to Setup > Accounting > Accounting Preferences.
+2. On the **General** tab, uncheck **Require Approvals on Journal Entries**.
+3. On the **Approval Routing** tab, uncheck Journal Entries/Vendor Bills to remove the approval requirement for Journal Entries created in NetSuite.
+
+**Note:** This change affects all Journal Entries, not just those created by Expensify.
+
+**Exporting as Expense Reports:**
+1. In NetSuite, navigate to Setup > Company > Enable Features.
+2. On the "Employee" tab, uncheck "Approval Routing" to remove the approval requirement for Expense Reports created in NetSuite. Please note that this setting also applies to purchase orders.
+
+
+# How do I Change the Default Payable Account for Reimbursable Expenses in NetSuite?
+
+NetSuite is set up with a default payable account that is credited each time reimbursable expenses are exported as Expense Reports to NetSuite (once approved by the supervisor and accounting). If you need to change this to credit a different account, follow the below steps:
+
+**For OneWorld Accounts:**
+1. Navigate to Setup > Company > Subsidiaries in NetSuite.
+2. Next to the subsidiary you want to update, click Edit.
+3. Click the Preferences tab.
+4. In the Default Payable Account for Expense Reports field, select the desired payable account.
+5. Click Save.
+
+**For Non-OneWorld Accounts:**
+1. Navigate to Setup > Accounting > Accounting Preferences in NetSuite.
+2. Click the Time & Expenses tab.
+3. Under the Expenses section, locate the Default Payable Account for Expense Reports field and choose the preferred account.
+4. Click Save.
+
+
+# Why are my Company Card Expenses Exporting to the Wrong Account in NetSuite?
+
+If your company card transactions are exporting to the wrong account in your accounting system, there are a couple of factors to check:
+1. **Verify Card Mapping:**
+   - Ensure that the cards are mapped to the correct accounts at the domain level
+   - This can be viewed under **Settings > Domains > Domain Name > Company Cards**.
+2. **Check Default Account Settings:**
+   - Review the account where the expenses were exported
+   - It should be the default account under **Settings > Workspaces > Group > Workspace Name > Connections**.
+   - Click **Configure** to check the default export settings for your non-reimbursable expenses.
+  
+The most common reason expenses export to the default account is that they are not actually imported from the mapped company card. Only company card expenses (notated with the “Card+Lock” icon) can use the export mapping settings configured at the domain level. 
+
+Even if an expense was paid with the company card, it is considered a 'cash' expense unless it merges with a card expense marked with the Card+Lock icon. 
+
+Less commonly, the issue may occur if the company card has been added to the user's personal settings. Expenses imported from a card linked at the individual account level will have a plain card icon.
+
diff --git a/docs/articles/expensify-classic/connections/quickbooks-desktop/Configure-Quickbooks-Desktop.md b/docs/articles/expensify-classic/connections/quickbooks-desktop/Configure-Quickbooks-Desktop.md
new file mode 100644
index 000000000000..d3dcda91ffcc
--- /dev/null
+++ b/docs/articles/expensify-classic/connections/quickbooks-desktop/Configure-Quickbooks-Desktop.md
@@ -0,0 +1,102 @@
+---
+title: Configure Quickbooks Desktop
+description: Configure Quickbooks Desktop
+---
+Our new QuickBooks Desktop integration allows you to automate the import and export process with Expensify.
+
+# Step 1: Configure export settings
+The following steps will determine how data will be exported from Expensify to QuickBooks Desktop.
+
+1. In Expensify, hover over **Settings** and click **Workspaces**.
+2. Select the Workspace you want to connect to QuickBooks Desktop.
+3. Click the **Connections** tab. 
+4. Click **Export** under the QuickBooks Desktop connection.
+5. Review each of the following export settings:
+- **Preferred Exporter**: This person is used in QuickBooks Desktop as the export user. They will receive notifications for errors, as well as prompts to export reports via the Home page of their Expensify account.
+- **Date**: You can choose either the report’s submitted date, the report’s exported date, or the date of the last expense on the report when exporting reports to QuickBooks Desktop.
+- **Unique reference numbers**: Enable this to allow the use of a unique reference number for each transaction. Disable this to use the same Report ID for all expenses from a certain report.
+- **Reimbursable expenses**: Reimbursable options include:
+        - **Vendor Bill (recommended)**: A single itemized vendor bill for each Expensify report. An A/P account is required to export to a vendor bill.
+        - **Check**: A single itemized check for each Expensify report.
+        - **Journal Entry**: A single itemized journal entry for each Expensify report.
+- **Non-reimbursable expenses**: Non-reimbursable options include:
+        - **Vendor Bill**: Each Expensify report results in a single itemized vendor bill. The bill is associated with the “vendor,” which is the individual responsible for creating or submitting the report in Expensify.
+        - **Credit Card expenses**: Each expense appears as a separate credit card transaction with a post date that matches your credit card statement. If you centrally manage company cards through your domain, you can export expenses from each card to a specific QuickBooks account by clicking Edit Exports next to each user’s card. To display the merchant name in the payee field in QuickBooks Desktop, ensure that a matching Vendor exists in QuickBooks. Expensify searches for an exact match during export. If no match is found, the payee is mapped to a Credit Card Misc. Vendor created by Expensify.
+        - **Debit Card expenses**: Expenses are exported as individual itemized checks for each Expensify report. The check is written to the “vendor,” which is the person who created or submitted the report in Expensify.
+
+# Step 2: Configure coding/import settings
+
+The following steps help you determine how data will be imported from QuickBooks Online to Expensify:
+
+1. Click Import under the QuickBooks Online connection.
+2. Review each of the following import settings:
+- **Chart of Accounts**: The Chart of Accounts is automatically imported from QuickBooks Desktop as categories. This cannot be amended.
+- **Classes**: Choose whether to import classes, which will be shown in Expensify as tags for expense-level coding.
+- **Customers/Projects**: Choose whether to import customers/projects, which will be shown in Expensify as tags for expense-level coding.
+- **Locations**: Choose whether to import locations, which will be shown in Expensify as tags for expense-level coding.
+
+# Step 3: Configure advanced settings
+
+The following steps help you determine the advanced settings for your connection, like auto-sync and employee invitation settings.
+
+1. Click **Advanced** under the QuickBooks Desktop connection.
+2. **Enable or disable Auto-Sync**: If enabled, QuickBooks Desktop automatically communicates changes with Expensify to ensure that the data shared between the two systems is up to date. New report approvals/reimbursements will be synced during the next auto-sync period.
+
+# FAQ
+
+## **How do I manually sync my QuickBooks Desktop if I have Auto-Sync disabled?**
+
+To manually sync your connection: 
+
+1. In Expensify, hover over **Settings** and select **Workspaces**. 
+2. Click the Workspace name that is connected to QuickBooks Desktop.
+3. Click the **Connections** tab on the left. 
+4. Click **Sync Now** under QuickBooks Desktop.
+
+{% include info.html %}
+For manual syncing, we recommend completing this process at least once a week and/or after making changes in QuickBooks Desktop that could impact how reports export from Expensify. Changes may include adjustments to your chart of accounts, vendors, employees, customers/jobs, or items. Remember: Both the Web Connector and QuickBooks Desktop need to be running for syncing or exporting to work.
+{% include end-info.html %}
+
+## **Can I sync Expensify and QuickBooks Desktop (QBD) and use the platforms at the same time?**
+
+When syncing Expensify to QuickBooks Desktop, we recommend waiting until the sync finishes to access either Expensify and/or QuickBooks Desktop, as performance may vary during this process. You cannot open an instance of QuickBooks Desktop while a program is syncing - this may cause QuickBooks Desktop to behave unexpectedly.
+
+## **What are the different types of accounts that can be imported from Quickbooks Desktop?**
+
+Here is the list of accounts from QuickBooks Desktop and how they are pulled into Expensify:
+
+| QBD account type  | How it imports to Expensify |
+| ------------- | ------------- |
+| Accounts payable  | Vendor bill or journal entry export options  |
+| Accounts receivable  | Do not import  |
+| Accumulated adjustment  | Do not import  |
+| Bank  | Debit card or check export options  |
+| Credit card  | Credit card export options  |
+| Equity  | Do not import  |
+| Fixed assets  | Categories  |
+| Income  | Do not import  |
+| Long-term liabilities  | Do not import  |
+| Other assets  | Do not import  |
+| Other current assets  | Categories or journal entry export options  |
+| Other current liabilities  | Journal Entry export options if the report creator is set up as an Employee within QuickBooks  |
+| Other expense  | All detail types except Exchange Gain or Loss import as categories; Exchange Gain or Loss does not import  |
+| Other income  | Do not import  |
+
+## **Why are exports showing as “Credit Card Misc.”?**
+
+When exporting as credit or debit card expenses, Expensify checks for an exact vendor match. If none are found, the payee will be mapped to a vendor that Expensify will automatically create and label as Credit Card Misc. or Debit Card Misc. 
+
+If you centrally manage your company cards through domains, you can export expenses from each card to a specific account in QuickBooks:
+
+1. In Expensify, hover over Settings and click Domains.
+2. Select the desired domain.
+3. Click the **Company Cards** tab. 
+4. Click **Export**.
+
+## **How does multi-currency work with QuickBooks Desktop?**
+
+When using QuickBooks Desktop Multi-Currency, there are some limitations to consider based on your export options:
+
+- **Vendor Bills and Checks**: The currency of the vendor and the currency of the account must match, but they do not have to be in the home currency.
+- **Credit Card**: If an expense doesn’t match an existing vendor in QuickBooks, it exports to the Credit Card Misc. vendor created by Expensify. When exporting a report in a currency other than your home currency, the transaction will be created under the vendor’s currency with a 1:1 conversion. For example, a transaction in Expensify for $50 CAD will appear in QuickBooks as $50 USD.
+- **Journal Entries**: Multi-currency exports will fail because the account currency must match both the vendor currency and the home currency.
diff --git a/docs/articles/expensify-classic/connections/quickbooks-desktop/Connect-To-QuickBooks-Desktop.md b/docs/articles/expensify-classic/connections/quickbooks-desktop/Connect-To-QuickBooks-Desktop.md
new file mode 100644
index 000000000000..50e3e0971869
--- /dev/null
+++ b/docs/articles/expensify-classic/connections/quickbooks-desktop/Connect-To-QuickBooks-Desktop.md
@@ -0,0 +1,98 @@
+---
+title: QuickBooks Desktop
+description: Connect Expensify to QuickBooks Desktop
+order: 1
+---
+# Overview
+QuickBooks Desktop is an accounting package developed by Intuit. It is designed for small and medium-sized businesses to help them manage their financial and accounting tasks. You can connect Expensify to QuickBooks Desktop to make expense management seamless.
+
+# Connect to QuickBooks Desktop
+
+{% include info.html %}
+To connect QuickBooks Desktop to Expensify, you must log into QuickBooks Desktop as an Admin, and the company file that you want to connect to Expensify must be the only one that is open. 
+{% include end-info.html %}
+
+1. In Expensify, hover over **Settings** and click on **Workspaces**.
+2. Select the workspace you want to connect to QuickBooks Desktop.
+3. Click the **Connections** tab. 
+4. Click **Connect to QuickBooks Desktop**. 
+5. Click Copy to copy the link, then paste the link into the computer where QuickBooks Desktop is running.
+
+![QuickBooks Desktop Setup pop-up link, containing the URL to paste](https://help.expensify.com/assets/images/QBO_desktop_01.png){:width="100%"}
+
+6. Select the version of QuickBooks Desktop that you currently have.
+
+![The Web Connnector Pop-up to allow you to select the type of QuickBooks Desktop you have](https://help.expensify.com/assets/images/QBO_desktop_02.png){:width="100%"}
+
+7. Download the Web Connector and go through the guided installation process.
+8. Open the Web Connector. 
+9. Click on **Add an Application**. 
+
+![The Web Connnector Pop-up where you will need to click on Add an Application](https://help.expensify.com/assets/images/QBO_desktop_03.png){:width="100%"}
+
+{% include info.html %}
+For this step, it is key to ensure that the correct company file is open in QuickBooks Desktop and that it is the only one open.
+{% include end-info.html %}
+
+10. In QuickBooks Desktop, select **"Yes, always allow access, even when QuickBooks is not running"** and click **Continue**. 
+
+![The QuickBooks Desktop pop-up, where you will need to select "Yes, always allow access, even when QuickBooks is not running"](https://help.expensify.com/assets/images/QBO_desktop_04.png){:width="100%"}
+
+11. Click **OK**, then click **Yes**.
+
+![The QuickBooks Desktop pop-up, where you will need to click "Ok" then select "Yes"](https://help.expensify.com/assets/images/QBO_desktop_05.png){:width="100%"}
+
+12. Click **Copy** to copy the password.
+
+![The Web Connector pop-up, where you will need to click "Copy"](https://help.expensify.com/assets/images/QBO_desktop_06.png){:width="100%"}
+
+13. Paste the password into the Password field of the Web Connector and press **Enter**.
+
+![The Web Connector pop-up, where you will need to paste the password into the password field](https://help.expensify.com/assets/images/QBO_desktop_08.png){:width="100%"}
+
+14. Click **Yes** to save the password. The new connection now appears in the Web Connector.
+
+![The Web Connector pop-up, where you will need to click "Yes"](https://help.expensify.com/assets/images/QBO_desktop_07.png){:width="100%"}
+
+# FAQ
+
+## What are the hardware and software requirements for the QuickBooks Desktop connector?
+
+- Hardware requirements: You will need to ensure that the host machine meets [Intuit's recommended specifications](https://quickbooks.intuit.com/learn-support/en-us/help-article/install-products/system-requirements-quickbooks-desktop-2022/L9664spDA_US_en_US) for running QuickBooks Desktop.
+- Software requirements: Windows 10 or Windows 11 with the latest service pack(s) installed. Users have successfully run the connector on older versions of Windows; however, we do not officially support this due to Microsoft's withdrawal of support for these operating systems. The web connector will not run on Mac OS.
+
+## What versions of QuickBooks Desktop are supported?
+
+Expensify’s QuickBooks Desktop integration follows [Intuit’s service discontinuation policy](https://quickbooks.intuit.com/learn-support/en-us/help-article/feature-preferences/quickbooks-desktop-service-discontinuation-policy/L17cXxlie_US_en_US) for QuickBooks Desktop and fully supports the following versions, version tiers, and special editions:
+
+- The latest three versions of:
+
+    - QuickBooks Desktop (US)
+    - QuickBooks Desktop (Canada)
+
+- Version tiers:
+
+    - Accountant
+    - Pro
+    - Pro Plus
+    - Premier
+    - Premier Plus
+    - Enterprise
+
+- Special editions:
+
+    - Contractor edition
+    - Manufacturing and Wholesale edition
+    - Accountant edition
+    - Professional Services edition
+    - Nonprofit edition
+
+## Can multiple QuickBooks Desktop Connectors be installed on the same machine?
+
+Yes. You must have one connector per company file, but you can install multiple QuickBooks Desktop Connectors to sync multiple company files to Expensify from the same computer. 
+
+If syncing multiple companies, make sure you’re logged in to the correct QuickBooks company file when syncing between QuickBooks and Expensify.
+
+## Can I export negative expenses?
+
+Generally, yes. However, if you have Check selected as your export option, the report’s total cannot be negative. This also applies to non-reimbursable expenses exported as debit card transactions. Because QuickBooks Desktop does not have debit card functionality, the transactions export as a non-reimbursable check, which must have a positive total amount. 
diff --git a/docs/articles/expensify-classic/connections/quickbooks-desktop/Quickbooks-Desktop-Troubleshooting.md b/docs/articles/expensify-classic/connections/quickbooks-desktop/Quickbooks-Desktop-Troubleshooting.md
new file mode 100644
index 000000000000..09afd2e4e7f2
--- /dev/null
+++ b/docs/articles/expensify-classic/connections/quickbooks-desktop/Quickbooks-Desktop-Troubleshooting.md
@@ -0,0 +1,91 @@
+---
+title: Quickbooks Desktop Troubleshooting
+description: Quickbooks Desktop Troubleshooting
+---
+
+# The Web Connector cannot be reached
+
+Generally, these errors indicate that there is a connection issue, where there’s a breakdown between Expensify and QuickBooks.
+
+## How to resolve
+
+1. Make sure that the Web Connector and QuickBooks Desktop are both running.
+2. Make sure that the Web Connector is installed in the same location as your QuickBooks application. For example, if QuickBooks is installed on your local desktop, the Web Connector should be too. Or if QuickBooks is installed on a remote server, the Web Connector should be installed there as well.
+
+If the error persists:
+ 
+1. Close the Web Connector completely (you may want to use Task Manager to do this). 
+2. Right-click the Web Connector icon on your desktop and select **Run as administrator**. 
+3. Sync your Workspace again.  
+
+If this doesn’t work, the final troubleshooting steps should be:
+
+1. Quit QuickBooks Desktop, then reopen it. 
+2. In Expensify, hover over **Settings** and select **Workspaces**. 
+3. Click the workspace name that is connected to QuickBooks Desktop.
+4. Click the **Connections** tab on the left. 
+5. Click **QuickBooks Desktop**.
+6. Click **Sync Now**.
+7. If this still doesn’t resolve the issue, use the link to reinstall the Web Connector. 
+
+# Connection and/or authentication issue
+
+Generally, these errors indicate that there is a credentials issue.
+
+## How to resolve
+
+1. Make sure QuickBooks Desktop is open with the correct company file. This must be the same company file that you have connected to Expensify.
+2. Make sure the QuickBooks Web Connector is open and the connector is online.
+3. Make sure that there are no dialogue boxes open in QuickBooks that are interfering with attempts to sync or export. To resolve this, close any open windows in QuickBooks Desktop so that you only see a gray screen, then try exporting or syncing again.
+4. Check that you have the correct permissions. 
+5. Log in to QuickBooks Desktop as an Admin (in single-user mode). 
+6. Go to **Edit** > **Preferences** > **Integrated Applications** > **Company Preferences**.
+7. Select the Web Connector and click **Properties**. 
+8. Make sure that the "Allow this application to login automatically" checkbox is selected and click **OK**.
+9. Close all windows in QuickBooks.
+
+If these general troubleshooting steps don’t work, reach out to Concierge and have the following information ready to provide:
+
+1. What version of QuickBooks Desktop do you have (Enterprise 2016, Pro 2014, etc.)?
+2. Is your QuickBooks program installed on your computer or a remote network/drive?
+3. Is your QuickBooks company file installed on your computer or a remote network/drive?
+4. Is your Web Connector installed on your computer or a remote network/drive?
+5. If any of the above are on a remote option, is there a company that runs that remote environment? If so, who (ie: RightNetworks, SwissNet, Cloud9, etc.)?
+
+# Import issue or missing categories and/or tags
+
+Generally, if you are having issues importing data from QuickBooks to Expensify, this indicates that the integration needs to be updated or your version of QuickBooks may not support a specific configuration.
+
+## How to resolve
+
+1. Re-sync the connection between Expensify and QuickBooks Desktop. A fresh sync can often resolve any issues, especially if you have recently updated your chart of accounts or projects, customers, or jobs in QuickBooks Desktop.
+2. Check your configuration in QuickBooks Desktop. Expensify will import the chart of accounts to be utilized either as categories or export account options, while projects, customers, and tags will be imported as tags.
+
+If these general troubleshooting steps don’t work, reach out to Concierge with context on what is specifically missing in Expensify, as well as screenshots from your QuickBooks Desktop setup.
+
+# Export or "can't find category/class/location/account" issue
+
+Generally, when an export error occurs, we’ll share the reason in the Report Comments section at the bottom of the report. This will give you an indication of how to resolve the error.
+
+## How to resolve
+
+1. Re-sync the connection between Expensify and QuickBooks Desktop. A fresh sync can often resolve any issues, especially if you have recently updated your chart of accounts or projects, customers, or jobs in QuickBooks Desktop.
+2. Re-apply coding to expenses and re-export the report. If you’ve recently synced Expensify and QuickBooks or recently made changes to your Workspace category or tags settings, you may need to re-apply coding to expenses. 
+3. Make sure that your current version of QuickBooks Desktop supports the selected export option. Different versions of QuickBooks Desktop support different export options and the [version that you own](https://quickbooks.intuit.com/desktop/) may not be compatible with the export type. 
+
+If these general troubleshooting steps don’t work, reach out to Concierge with the Report ID, some context on what you’re trying to do, and a screenshot of the Expensify error message.
+
+# “Oops!” error when syncing or exporting
+
+Generally, an “Oops!” error can often be temporary or a false error. Although you will see a message pop up, there may actually not be an actual issue. 
+
+## How to resolve
+
+1. Check to see if the sync or export was successful.
+2. If it wasn't, please attempt to sync or export the connection again.
+
+If the problem persists, download the QuickBooks Desktop log file via the Web Connector (click View Logs to download them) and reach out to Concierge for further assistance.
+
+{% include info.html %}
+If you’re using a remote server (e.g. RightNetworks), you may need to contact that support team to request your logs.
+{% include end-info.html %}
diff --git a/docs/articles/expensify-classic/connections/quickbooks-online/Configure-Quickbooks-Online.md b/docs/articles/expensify-classic/connections/quickbooks-online/Configure-Quickbooks-Online.md
new file mode 100644
index 000000000000..3fd1df0c0a1c
--- /dev/null
+++ b/docs/articles/expensify-classic/connections/quickbooks-online/Configure-Quickbooks-Online.md
@@ -0,0 +1,140 @@
+---
+title: Configure Quickbooks Online
+description: Configure Quickbooks Online
+---
+
+# Best Practices Using QuickBooks Online
+
+A connection to QuickBooks Online lets you combine the power of Expensify's expense management features with QuickBooks’s accounting capabilities. By following the recommended best practices below, your finances will be automatically categorized correctly and accounted for in the right place. 
+
+- Configure your setup immediately after making the connection, and review each settings tab thoroughly.
+- Keep Auto Sync enabled.
+    - The daily sync will update Expensify with any changes to your chart of accounts, customers/projects, or bank accounts in QuickBooks Online.
+    - Finalized reports will be exported to QuickBooks Online automatically, saving your admin team time with every report.
+- Set your preferred exporter to a user who is both a workspace and domain admin. 
+- Configure your coding settings and enforce them by requiring categories and tags on expenses. 
+
+# Accessing the QuickBooks Configuration Settings
+
+QuickBooks Online is connected at the workspace level, and each workspace can have a unique configuration that dictates how the connection functions. To access the configuration:
+
+1. Click **Settings** near the bottom of the left-hand menu.
+2. Navigate to Workspaces > Groups > [workspace Name] > Connections.
+3. Scroll down to the QuickBooks Online connection and click the **Configure** button to open the settings menu.
+
+# Step 1: Configure Export Settings
+
+The following steps help you determine how data will be exported from Expensify to QuickBooks Online.
+
+1. Click the **Configure** button under the QuickBooks Online connection to open the settings menu.
+2. Under the Export tab, review each of the following export settings:
+    - _Preferred Exporter_: Choose a Workspace Admin to set as the Preferred Exporter. 
+        - Concierge exports reports automatically on behalf of the preferred exporter.
+        - Other Workspace Admins will still be able to export to QuickBooks Online manually.
+        - If you set different export bank accounts for individual company cards under Settings > Domain > Company Cards, your Preferred Exporter must be a Domain Admin in addition to a Workspace Admin.
+    - _Date_: When exporting reports to QuickBooks Online, you can choose the report’s submitted date, the report’s exported date, or the date of the last expense on the report.
+        - If you choose a Credit Card or Debit Card for non-reimbursable expenses, we’ll use the transaction date on each expense during export.
+    - _Reimbursable expenses_: Reimbursable expenses export to QuickBooks Online as:
+        - Vendor Bills (recommended): This is a single itemized vendor bill for each Expensify report.
+        - Checks - This is a single itemized check for each Expensify report. You can mark a check to be printed later in QuickBooks Online.
+        - Journal Entries - This is a single itemized journal entry for each Expensify report.
+    - _Non-reimbursable expenses_: Non-reimbursable expenses export to QuickBooks Online as:
+        - Credit Card expenses - Each expense will be exported as a bank transaction with its transaction date.
+        - Debit Card Expenses - Each expense will be exported as a bank transaction with its transaction date.
+        - Vendor Bills - A single detailed vendor bill is generated for each Expensify report. 
+            - If the accounting period is closed, the vendor bill will be posted on the first day of the next open period. If you choose to export non-reimbursable expenses as Vendor Bills, you can assign a default vendor to the bill.
+            - The export will use your default vendor if you have Default Vendor enabled. If the Default Vendor is disabled, the report’s submitter will be set as the Vendor in QuickBooks.
+    - _Billable Expenses_: In Expensify, you can designate expenses as billable. These will be exported to QuickBooks Online with the billable flag. 
+        - This feature applies only to expenses exported as Vendor Bills or Checks. To maximize this functionality, ensure that any billable expense is associated with a Customer/Job.
+    - _Export Invoices_: If you are creating Invoices in Expensify and exporting these to QuickBooks Online, this is the account the invoice will appear against.
+
+## Step 1B: Optional Configuration When Company Cards Are Connected
+1. Click **Settings** near the bottom of the left-hand menu.
+2. Navigate to Domains > [domain name] > Company Cards.
+3. If you have more than one company card connection, select the connection first. 
+4. Locate the cardholder you want to configure in the list,
+5. Click the **Edit Exports** button and assign the account the card expenses should export to in QuickBooks Online.
+
+# Step 2: Configure Coding Settings
+
+The following steps help you determine how data will be imported from QuickBooks Online to Expensify.
+
+1. Click the **Configure** button under the QuickBooks Online connection to open the settings menu.
+2. Under the Coding tab, review each of the following settings and configure the options to determine what information will be imported:
+    - _Categories_: QuickBooks Online Chart of Accounts are imported into Expensify as categories. This is enabled by default and cannot be disabled.
+        - Equity-type accounts will also be imported as categories.
+        - Other Current Liabilities can only be exported as Journal Entries if the submitter is set up as an Employee in QuickBooks.
+    - _Classes and Customers/Projects_: If you use Classes or Customers/Projects in QuickBooks Online, you can import those into Expensify as Tags or Report Fields:
+        - Tags let you apply a Class and/or Customer/Project to each expense.
+        - Report Fields enables you to apply a Class and/or Customer/Project to all expenses on a report.
+            - Note: Although Projects can be imported into Expensify and coded to expenses, due to the limitations of the QuickBooks API, expenses cannot be created within the Projects module in QuickBooks.
+    - _Locations_: When enabled will import into Expensify as a Report Field or, if you export reimbursable expenses as Journal Entries and non-reimbursable expenses as Credit/Debit Card, you can import Locations as Tags.
+    - _Items_: If you use Items in QuickBooks Online, you can import Items defined with Purchasing Information (with or without Sales Information) into Expensify as Categories.
+    - _Tax_: Once enabled, QuickBooks Online tax rates can be further configured on the Settings > Workspaces > Groups > [Workspace Name] > [Tax](https://expensify.com/policy?param=%7B%22policyID%22:%22B936DE4542E9E78B%22%7D#tax) page.
+        - Note: Tax cannot be exported to Journal Entries in QuickBooks Online.
+
+# Step 3: Configure Advanced Settings
+
+The following steps help you determine the advanced settings for your connection, like auto-sync.
+
+1. Click the **Configure** button under the QuickBooks Online connection to open the settings menu.
+2. Under the Advanced tab, review each of the following settings and configure the options you wish to use:
+    - _Auto Sync_: When enabled, the connection will sync daily to ensure that the data shared between the two systems is up-to-date. 
+        - New report approvals/reimbursements will be synced during the next auto-sync period. 
+        - Reimbursable expenses will export after reimbursement occurs or the report is marked as reimbursed outside Expensify when using Direct or Indirect reimbursement.
+        - Non-reimbursable expenses will export automatically after the report is final approved. 
+    - _Newly Imported Categories Should Be_: When a new account is created in the QuickBooks Online chart of accounts, this setting controls whether the new category in Expensify is enabled or disabled by default. Disabled categories are not visible to employees when coding expenses.
+    - _Invite Employees_: When enabled, Auto Sync imports QuickBooks Online employee records and invites them to the workspace.
+    - _Automatically Create Entities_: If you export reimbursable expenses as Vendor Bills or Journal Entries, Expensify will automatically create a vendor in QuickBooks (If one does not already exist). Expensify will also automatically create a customer when exporting Invoices.
+    - _Sync Reimbursed Reports_: Enabling will mark the Vendor Bill as paid in QuickBooks Online if you reimburse a report via ACH direct deposit in Expensify. If you reimburse outside of Expensify, then marking the Vendor Bill as paid in QuickBooks Online will automatically mark the report as reimbursed in Expensify.
+        - _QuickBooks Account_: Select the bank account your reimbursements are coming out of, and we'll create the payment in QuickBooks.
+        - _Collection Account_: When exporting invoices from Expensify to Quickbooks Online, the invoice will appear against the Collection Account once marked as Paid.
+
+{% include faq-begin.md %}
+
+## Why am I seeing duplicate credit card expenses in QuickBooks Online?
+
+When importing a banking feed directly into QuickBooks Online while also importing transactions from Expensify, it’s possible to encounter duplicate entries in QuickBooks. To prevent this, follow these steps:
+
+- Step 1: Complete the Approval Process in Expensify
+Before exporting any expenses to QuickBooks Online, ensure they are added to a report and the report receives approval. Depending on your Workspace setup, reports may require approval from one or more individuals. The approval process concludes when the last user who views the report selects “Final Approve.”
+- Step 2: Exporting Reports to QuickBooks Online
+To ensure expenses exported from Expensify match seamlessly in the QuickBooks Banking platform, make sure these expenses are marked as non-reimbursable within Expensify and that “Credit Card” is selected as the non-reimbursable export option for your expenses.
+- Step 3: Importing Your Credit Card Transactions into QuickBooks Online
+After completing Steps 1 and 2, you can import your credit card transactions into QuickBooks Online. These imported banking transactions will align with the ones brought in from Expensify. QuickBooks Online will guide you through the process of matching these transactions, similar to the example below:
+
+## What happens if the report can’t be exported to QuickBooks Online automatically?
+
+If a report encounters an issue during automatic export to QuickBooks Online, you’ll receive an email with details about the problem, including any specific error messages. These messages will also be recorded in the report’s history section.
+
+The report will be placed in your Home for your attention. You can address the issues there. If you need further assistance, refer to our QuickBooks Online Export Errors page or export the report manually.
+
+## What happens to existing approved and reimbursed reports if I enable Auto Sync?
+
+- If Auto Sync was disabled when your Workspace was linked to QuickBooks Online, enabling it won’t impact existing reports that haven’t been exported.
+- If a report has been exported and reimbursed via ACH, it will be automatically marked as paid in QuickBooks Online during the next sync.
+- If a report has been exported and marked as paid in QuickBooks Online, it will be automatically marked as reimbursed in Expensify during the next sync.
+- Reports that have yet to be exported to QuickBooks Online won’t be automatically exported.
+
+## Does splitting a non-reimbursable expense affect how it exports to QuickBooks Online?
+
+When exporting non-reimbursable expenses as Credit Card or Debit Card expenses, split expenses will be consolidated it into a single credit card transaction in QuickBooks with multiple line items posted to the corresponding General Ledger accounts.
+
+Pro-Tip: To ensure the payee field in QuickBooks Online reflects the merchant name for Credit Card expenses, ensure there’s a matching Vendor in QuickBooks Online. Expensify checks for an exact match during export. If none are found, the payee will be mapped to a vendor we create and labeled as Credit Card Misc. or Debit Card Misc.
+
+## I’m using multi-currency in QuickBooks Online, how do I control the currency conversion rate?
+
+When working with QuickBooks Online Multi-Currency, there are some things to remember when exporting Vendor Bills and Check! Make sure the vendor’s currency and the Accounts Payable (A/P) bank account match.
+
+In QuickBooks Online, the currency conversion rates are not applied when exporting. All transactions will be exported with a 1:1 conversion rate, so for example, if a vendor’s currency is CAD (Canadian Dollar) and the home currency is USD (US Dollar), the export will show these currencies without applying conversion rates.
+
+To correct this, you must manually update the conversion rate after the report has been exported to QuickBooks Online.
+
+**Specifically for Vendor Bills**:
+
+- If multi-currency is enabled and the Vendor’s currency is different from the Workspace currency, OR if QuickBooks Online home currency is foreign from the Workspace currency, then:
+- We create the Vendor Bill in the Vendor’s currency (this is a QuickBooks Online requirement - we don’t have a choice)
+- We set the exchange rate between the home currency and the Vendor’s currency
+- We convert line item amounts to the vendor’s currency
+
+{% include faq-end.md %}
diff --git a/docs/articles/expensify-classic/connections/quickbooks-online/Connect-To-QuickBooks-Online.md b/docs/articles/expensify-classic/connections/quickbooks-online/Connect-To-QuickBooks-Online.md
new file mode 100644
index 000000000000..970f17c59018
--- /dev/null
+++ b/docs/articles/expensify-classic/connections/quickbooks-online/Connect-To-QuickBooks-Online.md
@@ -0,0 +1,43 @@
+---
+title: Connect to QuickBooks Online
+description: Everything you need to know about using Expensify's direct integration with QuickBooks Online.
+order: 1
+---
+
+The Expensify integration with QuickBooks Online brings in your expense accounts and other data and even exports reports directly to QuickBooks for easy reconciliation. Plus, with advanced features in QuickBooks Online, you can fine-tune coding settings in Expensify for automated data export to optimize your accounting workflow.
+
+## Before connecting
+
+It’s crucial to understand the requirements based on your specific QuickBooks subscription:
+- While all the features are available in Expensify, their accessibility may vary depending on your QuickBooks Online subscription.
+- An error will occur if you try to export to QuickBooks Online with a feature enabled that isn’t part of your subscription.
+- Please be aware that Expensify does not support the Self-Employed subscription in QuickBooks Online.
+
+![QuickBooks Online - Subscription types]({{site.url}}/assets/images/QBO1.png){:width="100%"}
+
+# Step 1: Setup Employees in QuickBooks Online
+Employees must be set up as either Vendors or Employees in QuickBooks Online. Make sure to include the submitter’s email in their record.
+
+If you use vendor records, you can export as Vendor Bills, Checks, or Journal Entries. If you use employee records, you can export as Checks or Journal Entries (if exporting against a liability account).
+
+# Step 2: Connect Expensify and QuickBooks Online
+1. Click **Settings** near the bottom of the left-hand menu.
+2. Navigate to Workspaces > Groups > [workspace Name] > Connections.
+3. Click on **Connect to QuickBooks Online**.
+4. Click the **Create a New QuickBooks Online Connection** button.
+5. Enter your QuickBooks Online Administrator’s login information and choose the QuickBooks Online Company File you want to connect to Expensify (you can connect one Company File per Workspace). 
+6. Then click **Authorize**.
+7. You will be redirected back to Expensify and the connection will import some initial settings from QuickBooks Online to Expensify.
+8. Once the sync is complete, the configuration window for QuickBooks Online will open automatically so you can configure your export, import, and advanced settings. 
+9. Click the **Save** button when you’re done configuring to finalize the connection.
+
+## Step 2B: Exporting Historical Reports to QuickBooks Online
+
+After connecting QuickBooks Online to Expensify, you may receive a prompt to export all historical reports from Expensify. To export multiple reports at once, follow these steps:
+
+1. Open the Reports page in a web browser.
+2. Reset the filters and then adjust the filters to display the reports in question.
+3. Check the box to the left of the reports you want to export.
+4. Click **Export To** and select **QuickBooks Online**.
+    - If you don’t want to export specific reports, select “Mark as manually entered” instead.
+
diff --git a/docs/articles/expensify-classic/connections/quickbooks-online/Quickbooks-Online-Troubleshooting.md b/docs/articles/expensify-classic/connections/quickbooks-online/Quickbooks-Online-Troubleshooting.md
new file mode 100644
index 000000000000..158a55b93e0f
--- /dev/null
+++ b/docs/articles/expensify-classic/connections/quickbooks-online/Quickbooks-Online-Troubleshooting.md
@@ -0,0 +1,189 @@
+---
+title: Quickbooks Online Troubleshooting
+description: Quickbooks Online Troubleshooting
+---
+
+# ExpensiError QBO022: When exporting billable expenses, please make sure the account in QuickBooks Online has been marked as billable.
+
+**Why does this happen?**
+
+This error occurs when the account applied as a category to the expense in Expensify is not marked as as a billable type account.
+
+## How to fix it
+
+1. Log in to QuickBooks Online.
+2. Click the Gear in the upper right-hand corner. 
+3. Under Company Settings click Expenses.
+4. Enable the option “Make expenses and items billable”
+5. Click on the pencil icon on the right to check if you have "In multiple accounts" selected:
+6. If "In multiple accounts" is selected, go to Chart of Accounts and click Edit for the account in question.
+7. Check the billable option and select an income account within your chart of accounts
+8. Sync your QuickBooks Online connection in Settings > Workspaces > [click workspace] > Connections.
+9. Open the report and click the Export to button and then the QuickBooks Online option.
+
+# ExpensiError QBO046: Feature Not Included in Subscription
+
+**Why does this happen?**
+
+This error occurs when your version of QuickBooks Online doesn’t support the feature you are using in Expensify.
+
+## How to fix it
+
+Though you will see all of these features available in Expensify, you will receive an error trying to export to QuickBooks if you have a feature enabled that isn't available with your QuickBooks Online subscription.
+
+**Here is a list of the features supported by each version:**
+_Please note: Self Employed is not supported:_
+
+![QuickBooks Online - Subscription types]({{site.url}}/assets/images/QBO1.png){:width="100%"}
+
+# ExpensiError QBO056: Expenses are not categorized with a QuickBooks Online account
+
+**Why does this happen?**
+
+QuickBooks Online requires all expenses exported from Expensify to use a category matching an account in your chart of accounts. If a category from another source is used, QuickBooks Online will reject the expense. This errors occurs when an expense on the report has a category applied that is not valid in QuickBooks Online.
+
+## How to fix it
+
+1. Sync your QuickBooks Online connection in Expensify from Settings > Workspaces > [click workspace] > Connections, and click the **Sync Now** button.
+2. Review the expenses on the report. If any appear with a red _Category no longer valid_ violation, recategorize the expense until all expenses are violation-free.
+3. Click the **Export t**o button and then the **QuickBooks Online** option.
+    - If you receive the same error, continue.
+4. Note the categories used on the expenses and check the Settings > Workspaces > [workspace name] > Categories page to confirm the exact categories used on the report are enabled and connected to QuickBooks Online (you'll see a green QB icon next to all connected categories). 
+5. Confirm the categories used on the expenses in the report match exactly the accounts in your QuickBooks Online chart of accounts.
+6. If you make any changes in QuickBooks Online or in Expensify, always sync the connection and then try to export again. 
+
+# ExpensiError QBO088: Error Creating Vendor
+
+**Why does this happen?**
+
+This error occurs when you have an Employee Record set up with the employee's name, which prevents the Expensify integration from automatically creating the Vendor Record with the same name, since QuickBooks Online won't allow you to have an employee and vendor with the same name. 
+
+## How to fix it
+
+There are two different ways you can resolve this error.
+
+**Option 1**:
+
+1. Log into QuickBooks Online.
+2. Access the Employee Records for your submitters. 
+3. Edit the name to differentiate them from the name they have on their account in Expensify.
+4. Sync your QuickBooks Online connection in Settings > Workspaces > [click workspace] > Connections.
+5. Open the report and click the Export to button and then the QuickBooks Online option.
+
+**Option 2**:
+1. Log into QuickBooks Online.
+2. Manually create all of your Vendor Records, making sure that the email matches the email address associated with the user in Expensify.
+    - In this case, we recommend disabling _Automatically Create Entities_ under Settings > Workspaces > [workspace name] > Connections > Configure > Advanced, so that you will receive the correct error messages when a vendor record doesn't exist.
+
+# ExpensiError QBO097: When You Use Accounts Payable, You Must Choose a Vendor in the Name Field
+
+**Why does this happen?**
+
+This error occurs when you are exporting reimbursable expenses as Journal Entries against an A/P account and also use Employee Records in QuickBooks Online.
+
+## How to fix it
+
+There are three different ways you can resolve this error.
+- Select a different type of export for reimbursable expenses under Settings > Workspaces > [worksapce name] > Connections > Configure > Export tab. 
+- Enable _Automatically Create Entities_ under Settings > Workspaces > [worksapce name] > Connections > Configure > Advanced to create vendor records automatically.
+- Manually create vendor records in QuickBooks Online for each employee.
+
+# ExpensiError QBO099: Items marked as billable must have sales information checked
+
+**Why does this happen?**
+
+This error occurs when an Item category on an expense does not have sales information in QuickBooks Online.
+
+## How to fix it
+
+1. Log into QuickBooks Online.
+2. Navigate to to your items list.
+3. Click **Edit** to the right of the item used on the report with the error. Here you will see an option to check either "Sales" or "Purchasing".
+4. Check the option for **Sales**.
+5. Select an income account.
+6. Save your changes.
+7. Sync your QuickBooks Online connection in Settings > Workspaces > [workspace name] > Connections.
+8. Open the report and click the **Export to** button and then the **QuickBooks Online** option.
+
+
+# ExpensiError QBO193: Couldn't Connect to QuickBooks Online
+
+**Why does this happen?**
+
+This error occurs when the QuickBooks Online credentials used to make the connection have changed. 
+
+_Note: This error message can also show up as, "QuickBooks Reconnect error: OAuth Token rejected.”_
+
+## How to fix it
+
+1. Navigate to Settings > Workspaces > Groups > [workspace name] > Connections.
+2. Click the **Sync Now** button.
+3. In the pop-up window, click **Reconnect** and enter your current QuickBooks Online credentials.
+
+Note: If you are connecting with new credentials, you will need to reconfigure your settings and re-select the categories and tags you want enabled. We recommend taking a screenshot of your configuration settings beforehand so that you can reset the connection with those settings.
+
+# ExpensiError QBO077: Duplicate Document Number, This bill number has already been used.
+
+**Why does this happen?**
+
+This error occurs when settings in QuickBooks Online are enabled to warn of duplicate document numbers.
+
+## How to fix it
+
+1. Log into QuickBooks Online.
+2. Navigate to Settings > Advanced. 
+3. Under the Other Preferences section, make sure "Warn if duplicate bill number is used" is set to "Off"
+4. Sync your QuickBooks Online connection in Settings > Workspaces > [workspace name] > Connections.
+5. Open the report and click the **Export to** button and then the **QuickBooks Online** option.
+
+# Export error: QuickBooks Online: The transaction needs to be in the same currency as the A/R and A/P accounts
+
+**Why does this happen?**
+
+This error occurs because the currency on the Vendor record in QuickBooks Online doesn't match the currency on the A/P account. 
+
+## How to fix it
+
+1. Log into QuickBooks Online.
+2. Open the vendor record.
+3. Update the record to use with the correct A/P account, currency and an email matching their Expensify email. 
+You can find the correct Vendor record by exporting your QuickBooks Online [vendor list](https://community.expensify.com/home/leaving?allowTrusted=1&target=https%3A%2F%2Fqbo.intuit.com%2Fapp%2Fvendors) to a spreadsheet (click the export icon on the right-hand side of the page), and search for the email address of the person who submitted the report.
+
+If you have multiple Vendors with different currencies with the same email, Expensify is likely trying to export to the wrong one.
+
+1. Try removing the email address from the vendor in QuickBooks Online you aren't trying to export to. 
+2. Sync your QuickBooks Online connection in Settings > Workspaces > [workspace name] > Connections. 
+3. Open the report and click the **Export to** button and then the **QuickBooks Online** option.
+
+If this still fails, you'll need to confirm that the A/P account selected in Expensify is set to the correct currency for the export. 
+
+1. Navigate to Settings > Workspaces > [workspace name] > Connections.
+2. Under the Exports tab check that both A/P accounts are the correct currency.
+
+# Why are company card expenses exporting to the wrong account in QuickBooks Online?
+
+Multiple factors could be causing your company card transactions to export to the wrong place in your accounting system, but the best place to start is always the same.
+
+1. First, confirm that the company cards have been mapped to the correct accounts in Settings > Domains > Company Cards > click the **Edit Export button** for the card to view the account.
+2. Next, confirm the expenses in question have been imported from the company card? 
+    - Only expenses that have the Card+Lock icon next to them will export according to the mapping settings that you configure in the domain settings.
+
+It’s important to note that expenses imported from a card linked at the individual account level, expenses created from a SmartScanned receipt, and manually created cash expenses will export to the default bank account selected in your connection's configuration settings.
+
+**Is the report exporter a domain admin?**
+
+The user exporting the report must be a domain admin. You can check the history and comment section at the bottom of the report to see who exported the report.
+
+If your reports are being exported automatically by Concierge, the user listed as the Preferred Exporter under Settings > Workspaces > [workspaces name] > Connections > click **Configure** must be a domain admin as well. 
+
+If the report exporter is not a domain admin, all company card expenses will export to the bank account set in Settings > Workspaces > [workspace name] > Connections > click **Configure** for non-reimbursable expenses. 
+
+**Has the company card been mapped under the correct workspace?**
+
+If you have multiple workspaces connected to QuickBooks Online, each connected workspace will have a separate list of accounts to assign the card to. Unless you choose an account listed under the same workspace as the report you are exporting, expenses will export to the default bank account.
+
+# Can I export negative expenses to QuickBooks Online?
+
+In general, you can export negative expenses successfully to QBO regardless of which export method you choose.
+
+The one thing to keep in mind is that if you have Check selected as your export option, the total of the report can not be negative.
diff --git a/docs/articles/expensify-classic/connections/sage-intacct/Configure-Sage-Intacct.md b/docs/articles/expensify-classic/connections/sage-intacct/Configure-Sage-Intacct.md
new file mode 100644
index 000000000000..1f0be2f4571a
--- /dev/null
+++ b/docs/articles/expensify-classic/connections/sage-intacct/Configure-Sage-Intacct.md
@@ -0,0 +1,153 @@
+---
+title: Configure Sage Intacct
+description: Configure Sage Intacct's export, coding, and advanced settings.
+---
+
+By configuring your Sage Intacct settings in Expensify correctly, you can leverage the connection's settings to automate most tasks, making your workflow more efficient.
+
+# How to Configure Export Settings
+
+There are several options for exporting Expensify reports to Sage Intacct. Let's explore how to configure these settings to align with your business needs.
+
+To access these settings, go to **Settings > Workspace > Group > Connections** and select the **Configure** button.
+
+## Export Options
+
+### Preferred Exporter
+
+Any workspace admin can export to Sage Intacct, but only the preferred exporter will receive notifications in Expensify regarding the status of exports.
+
+### Date
+
+The three options for the date your report will export with are:
+- **Date of last expense:** Uses the date on the most recent expense added to the report.
+- **Exported date:** Is the date you export the report to Sage Intacct.
+- **Submitted date:** Is the date the report creator originally submitted the report.
+
+Note: All export options except credit cards use the date in the drop-down. Credit card transactions use the transaction date.
+
+### Reimbursable Expenses
+
+Depending on your initial setup, your **reimbursable expenses** will be exported as either **Expense Reports** or **Vendor Bills** to Sage Intacct.
+
+### Non-Reimbursable Expenses
+
+**1a. Non-reimbursable expenses** will export separately from reimbursable expenses either as **Vendor Bills** or as **credit card charges** to the account you select. It is not an option to export non-reimbursable expenses as **Journal** entries. 
+
+If you are centrally managing your company cards through your Domain Settings, you can export expenses from each individual card to a specific account in Intacct. See section 1b below on how to configure those export settings.
+
+Please note that credit Card Transactions cannot be exported to Sage Intacct at the top level if you have **Multi-Currency** enabled. Therefore, you will need to select an entity in the configuration of your Expensify Workspace by going to **Settings > Workspaces > Groups > [Workspace Name]  > Connections > Configure**.
+
+**1b. Optional configuration when company cards are connected**
+1. Click **Settings** near the bottom of the left-hand menu.
+2. Navigate to Domains > [_domain name_] > Company Cards.
+3. If you have more than one company card connection, select the connection first. 
+4. Locate the cardholder you want to configure in the list,
+5. Click the **Edit Exports** button and assign the account the card expenses should export to in Sage Intacct.
+
+### Exporting Negative Expenses
+
+You can export negative expenses successfully to Intacct regardless of which Export Option you choose. The one thing to keep in mind is that if you have Expense Reports selected as your export option, the **total** of the report can not be negative.
+
+## How to Configure Coding Settings
+
+The appearance of your expense data in Sage Intacct depends on how you've configured it in Expensify. It's important to understand each available option to achieve the desired results.
+
+The appearance of your expense data in Sage Intacct depends on how you've configured it in Expensify. It's important to understand each available option to achieve the desired results.
+
+### Expense Types
+
+Categories are always enabled and are the primary means of matching expenses to the correct accounts in Sage Intact. The Categories in Expensify depend on your **Reimbursable** export options:
+- If your Reimbursable export option is set to **Expense Reports** (the default), your Categories will be your **Expense Types**.
+- If your Reimbursable export option is set to **Vendor Bills**, your Categories will be your **Chart of Accounts** (also known as GL Codes or Account Codes).
+
+You can disable unnecessary categories from your **Settings > Workspaces > Group > [Workspace Name] > Categories** page if your list is too extensive. Note that every expense must be coded with a Category, or it will not export. Also, when you first set up the integration, your existing categories will be overwritten.
+
+### Billable Expenses
+
+Enabling Billable expenses allows you to map your expense types or accounts to items in Sage Intacct. To do this, you'll need to enable the correct permissions on your Sage Intacct user or role. This may vary based on the modules you use in Sage Intacct, so you should enable read-only permissions for relevant modules such as Projects, Purchasing, Inventory Control, and Order Entry.
+
+Once permissions are set, you can map your categories (expense types or accounts, depending on your export settings) to specific items, which will then export to Sage Intacct. When an expense is marked as Billable in Expensify, users must select the correct billable Category (Item), or there will be an error during export.
+
+### Dimensions - Departments, Classes, and Locations
+
+If you enable these dimensions, you can choose from three data options:
+- Not pulled into Expensify: Employee default (available when the reimbursable export option is set to Expense Reports)
+- Pulled into Expensify and selectable on reports/expenses: Tags (useful for cross-charging between Departments or Locations)
+- Report Fields (applies at the header level, useful when an employee's Location varies from one report to another)
+
+Please note that the term "tag" may appear instead of "Department" on your reports, so ensure that "Projects" is not disabled in your Tags configuration within your workspace settings. Make sure it's enabled within your coding settings of the Intacct configuration settings. When multiple options are available, the term will default to Tags.
+
+### Customers and Projects
+
+These settings are particularly relevant to billable expenses and can be configured as Tags or Report Fields.
+
+### Tax
+
+As of September 2023, our Sage Intacct integration supports native VAT and GST tax. To enable this feature, open the Sage Intacct configuration settings in your workspace, go to the Coding tab, and enable Tax. For existing Sage Intacct connectings, simply resync your workspace and the tax toggle will appear. For new Sage Intacct connections, the tax toggle will be available when you complete the integration steps. 
+Enabling this option will import your native tax rates from Sage Intacct into Expensify. From there, you can select default rates for each category.
+
+### User-Defined Dimensions
+
+You can add User-Defined Dimensions (UDD) to your workspace by locating the "Integration Name" in Sage Intacct. Please note that you must be logged in as an administrator in Sage Intacct to find the required fields.
+
+To find the Integration Name in Sage Intacct:
+1. Go to **Platform Services > Objects > List**
+2. Set "filter by application" to "user-defined dimensions."
+
+Now, in Expensify, navigate to **Settings > Workspaces > Group > [Workspace Name] > Connections**, and click **Configure** under Sage Intacct. On the Coding tab, enable the toggle next to User Defined Dimensions. Enter the "Integration name" and choose whether to import it into Expensify as an expense-level Tag or as a Report Field, then click **Save**.
+
+You'll now see the values for your custom segment available under Tags settings or Report Fields settings in Expensify.
+
+
+## How to Configure Advanced Settings
+
+In multi-entity environments, you'll find a dropdown at the top of the sync options menu, where you can choose to sync with the top-level or a specific entity in your Sage Intacct instance. If you sync at the top level, we pull in employees and dimensions shared at the top level and export transactions to the top level. Otherwise, we sync information with the selected entity.
+
+### Auto Sync
+
+When a non-reimbursable report is finally approved, it will be automatically exported to Sage Intacct. Typically, non-reimbursable expenses will sync to the next open period in Sage Intacct by default. If your company uses Expensify's ACH reimbursement, reimbursable expenses will be held back and exported to Sage when the report is reimbursed.
+
+### Inviting Employees
+
+Enabling **Invite Employees** allows the integration to automatically add your employees to your workspace and create an Expensify account for them if they don't have one. 
+If you have your domain verified on your account, ensure that the Expensify account connected to Sage Intacct is an admin on your domain.
+When you toggle on "Invite Employees" on the Advanced tab, all employees in Sage Intacct who haven't been invited to the Expensify group workspace you're connecting will receive an email invitation to join the group workspace. Approval workflow will default to Manager Approval and can be further configured on the People settings page.
+
+### Import Sage Intacct Approvals
+
+When the "Import Sage Intacct Approvals" setting is enabled, Expensify will automatically set each user's manager listed in Sage Intacct as their first approver in Expensify. If no manager exists in Sage Intacct, the approver can be set in the Expensify People table. You can also add a second level of approval to your Sage Intacct integration by setting a final approver in Expensify.
+Please note that if you need to add or edit an optional final approver, you will need to select the **Manager Approval** option in the workflow. Here is how each option works:
+- **Basic Approval:** All users submit to one user.
+- **Manager Approval:** Each user submits to the manager (imported from Sage Intacct). Each manager forwards to one final approver (optional).
+- **Configure Manually:** Import employees only, configure workflow in Expensify.
+
+### Sync Reimbursed Reports
+When using Expensify ACH, reimbursable reports exported to Intacct are exported:
+- As Vendor Bills to the default Accounts Payable account set in your Intacct Accounts Payable module configuration, OR
+- As Expense Reports to the Employee Liabilities account in your Time & Expenses module configuration.
+When ACH reimbursement is enabled, the "Sync Reimbursed Reports" feature will additionally export a Bill Payment to the selected Cash and Cash Equivalents account listed. If **Auto Sync** is enabled, the payment will be created when the report is reimbursed; otherwise, it will be created the next time you manually sync the workspace.
+Intacct requires that the target account for the Bill Payment be a Cash and Cash Equivalents account type. If you aren't seeing the account you want in that list, please first confirm that the category on the account is Cash and Cash Equivalents.
+
+{% include faq-begin.md %}
+## What if my report isn't automatically exported to Sage Intacct?
+
+There are a number of factors that can cause automatic export to fail. If this happens, the preferred exporter will receive an email and an Inbox task outlining the issue and any associated error messages.
+The same information will be populated in the comments section of the report.
+The fastest way to find a resolution for a specific error is to search the Community, and if you get stuck, give us a shout!
+Once you've resolved any errors, you can manually export the report to Sage Intacct.
+
+## How can I make sure that I final approve reports before they're exported to Sage Intacct?
+
+Make sure your approval workflow is configured correctly so that all reports are reviewed by the appropriate people within Expensify before exporting to Sage Intacct.
+Also, if you have verified your domain, consider strictly enforcing expense workspace workflows. You can set this up via Settings > Domains > [Domain Name] > Groups.
+
+
+## If I enable Auto Sync, what happens to existing approved and reimbursed reports?
+
+If your workspace has been connected to Intacct with Auto Sync disabled, you can safely turn on Auto Sync without affecting existing reports which have not been exported.
+If a report has been exported to Intacct and reimbursed via ACH in Expensify, we'll automatically mark it as paid in Intacct during the next sync.
+If a report has been exported to Intacct and marked as paid in Intacct, we'll automatically mark it as reimbursed in Expensify during the next sync.
+If a report has not been exported to Intacct, it will not be exported to Intacct automatically.
+
+{% include faq-end.md %}
diff --git a/docs/articles/expensify-classic/connections/sage-intacct/Connect-To-Sage-Intacct.md b/docs/articles/expensify-classic/connections/sage-intacct/Connect-To-Sage-Intacct.md
new file mode 100644
index 000000000000..76851a35ce4c
--- /dev/null
+++ b/docs/articles/expensify-classic/connections/sage-intacct/Connect-To-Sage-Intacct.md
@@ -0,0 +1,446 @@
+---
+title: Sage Intacct
+description: Connect your Expensify workspace with Sage Intacct
+order: 1
+---
+# Overview
+
+Expensify’s seamless integration with Sage Intacct allows you to connect using either Role-based permissions or User-based permissions. 
+
+Once connected to Intacct you’re able to automate report exports, customize your coding preferences, and utilize Sage Intacct’s advanced features. When you’ve configured these settings in Expensify correctly, you can use the integration's settings to automate many tasks, streamlining your workflow for increased efficiency.
+
+{% include info.html %}
+The Sage Intacct integration is only available on the Control plan.
+{% include end-info.html %}
+
+# How to connect to Sage Intacct
+We support setting up Sage Intacct with both User-based permissions and Role-based permissions for Expense Reports and Vendor Bills.
+- User-based Permissions - Expense Reports
+- User-based Permissions - Vendor Bills
+- Role-based Permissions - Expense Reports
+- Role-based Permissions - Vendor Bills
+
+
+## User-based Permissions - Expense Reports
+
+Please follow these steps if exporting as Expense Reports with **user-based permissions**.
+
+
+### Checklist of items to complete:
+1. Create a web services user and set up permissions.
+2. Enable the Time & Expenses module **(Required if exporting as Expense Reports)**.
+3. Set up Employees in Sage Intacct **(Required if exporting as Expense Reports)**.
+4. Set up Expense Types in Sage Intacct **(Required if exporting as Expense Reports)**.
+5. Enable Customization Services (only applicable if you don't already use Platform Services).
+6. Create a test workspace and download the [Expensify Package](https://www.expensify.com/tools/integrations/downloadPackage).
+7. Upload the Package in Sage Intacct.
+8. Add web services authorization.
+9. Enter credentials and connect Expensify and Sage Intacct.
+10. Configure integration sync options.
+11. Export a test report.
+12. Connect Sage Intacct to the production workspace.
+
+
+### Step 1: Create a web services user with user-based permissions
+
+_Note: If the steps in this section look different in your Sage Intacct instance, you likely use role-based permissions. If that's the case, see the steps below on creating a web services user for role-based permissions._
+To connect to Sage Intacct, you'll need to create a special web services user. This user is essential for tracking actions in Sage Intacct, such as exporting expense reports and credit card charges from Expensify. It also helps ensure smooth operations when new members join or leave your accounting team. The good news is that setting up this web services user won't cost you anything. Just follow these steps:
+Go to **Company > Web Services Users > New**
+Setup the user using these configurations:
+   - **User ID:** "xmlgateway_expensify"
+   - **Last Name and First Name:** "Expensify"
+   - **Email Address:** Your shared accounting team email
+   - **User Type:** "Business"
+   - **Admin Privileges:** "Full"
+   - **Status:** "Active"
+Once you've created the user, you'll need to set the correct permissions. To set those, go to the **subscription** link for this user in the user list, **click on the checkbox** next to the Application/Module and then click on the **Permissions** link to modify those. 
+
+These are the permissions required for a user to export reimbursable expenses as Expense Reports:
+- **Administration (All)**
+- **Company (Read-only)**
+- **Cash Management (All)**
+- **General Ledger (All)**
+- **Time & Expense (All)**
+- **Projects (Read-only)** (only needed if using Projects and Customers)
+- **Accounts Payable (All)** (only needed for exporting non-reimbursable expenses as vendor bills)
+
+**Note:** you can set permissions for each Application/Module by selecting the radio button next to the desired Permission and clicking **Save**.
+
+
+### Step 2: Enable the Time & Expenses Module (Only required if exporting reimbursable expenses as Expense Reports)
+The Time & Expenses (T&E) module is often included in your Sage Intacct instance, but if it wasn't part of your initial Sage Intacct setup, you may need to enable it. **Enabling the T&E module is a paid subscription through Sage Intacct. For information on the costs of enabling this module, please contact your Sage Intacct account manager**. It's necessary for our integration and only takes a few minutes to configure.
+1. In Sage Intacct, go to the **Company menu > Subscriptions > Time & Expenses** and toggle the switch to subscribe.
+2. After enabling T&E, configure it as follows:
+   - Ensure that **Expense types** is checked:
+   - Under **Auto-numbering sequences** set the following:
+       - **Expense Report:** EXP
+       - **Employee:** EMP
+       - **Duplicate Numbers:** Select “Do not allow creation”
+ 
+     - To create the EXP sequence, **click on the down arrow on the expense report line and select **Add**:
+       - **Sequence ID:** EXP
+       - **Print Title:** EXPENSE REPORT
+       - **Starting Number:** 1
+       - **Next Number:** 2
+3. Select **Advanced Settings** and configure the following:
+- **Fixed Number Length:** 4
+- **Fixed Prefix:** EXP
+4. Click **Save**
+5. Under Expense Report approval settings, ensure that **Enable expense report approval** is unchecked
+6. Click **Save** to confirm your configurations.
+
+
+### Step 3: Set up Employees in Sage Intacct (Only required if exporting reimbursable expenses as Expense Reports)
+To set up Employees in Sage Intacct, follow these steps:
+1. Navigate to **Time & Expenses** and click the plus button next to **Employees**.
+   - If you don't see the Time & Expense option in the top ribbon, you may need to adjust your settings. Go to **Company > Roles > Time & Expenses** and enable all permissions.
+2. To create an employee, you'll need to provide the following information:
+   - **Employee ID**
+   - **Primary contact name**
+   - **Email address**
+     - In the **Primary contact name** field, click the dropdown arrow.
+     - Select the employee if they've already been created. 
+     - Otherwise, click **+ Add** to create a new employee.
+     - Fill in their **Primary Email Address** along with any other required information.
+
+
+### Step 4: Set up Expense Types in Sage Intacct (Only required if exporting reimbursable expenses as Expense Reports)
+
+Expense Types provide a user-friendly way to display the names of your expense accounts to your employees. They are essential for our integration. To set up Expense Types, follow these steps:
+1. **Setup Your Chart of Accounts:** Before configuring Expense Types, ensure your Chart of Accounts is set up. You can set up accounts in bulk by going to **Company > Open Setup > Company Setup Checklist > click Import**.
+2. **Set up Expense Types:**
+   - Go to **Time & Expense**.
+   - Open Setup and click the plus button next to **Expense Types**.
+3. For each Expense Type, provide the following information:
+   - **Expense Type**
+   - **Description**
+   - **Account Number** (from your General Ledger)
+This step is necessary if you are exporting reimbursable expenses as Expense Reports.
+
+
+### Step 5: Enable Customization Services
+To enable Customization Services go to **Company > Subscriptions > Customization Services**.
+   - If you already have Platform Services enabled, you can skip this step.
+
+
+### Step 6: Create a Test Workspace in Expensify and Download the [Expensify Package](https://www.expensify.com/tools/integrations/downloadPackage)
+Creating a test workspace in Expensify allows you to have a sandbox environment for testing before implementing the integration live. If you are already using Expensify, creating a test workspace ensures that your existing group workspace rules and approval workflows remain intact. Here's how to set it up:
+1. Go to **expensify.com > Settings > Workspaces > New Workspace**.
+2. Name the workspace something like "Sage Intacct Test Workspace."
+3. Go to **Connections > Sage Intacct > Connect to Sage Intacct**.
+4. Select **Download Package** (You only need to download the file; we'll upload it from your Downloads folder later).
+
+
+### Step 7: Upload Package in Sage Intacct
+
+
+If you use **Customization Services**:
+1. Go to **Customization Services > Custom Packages > New Package**.
+2. Click on **Choose File** and select the Package file from your downloads folder.
+3. Click **Import**.
+
+
+If you use **Platform Services**:
+1. Go to **Platform Services > Custom Packages > New Package**.
+2. Click on **Choose File** and select the Package file from your downloads folder.
+3. Click **Import**.
+
+
+### Step 8: Add Web Services Authorization
+1. Go to **Company > Company Info > Security** in Intacct and click **Edit**.
+2. Scroll down to **Web Services Authorizations** and add "expensify" (all lower case) as a Sender ID.
+
+
+### Step 9: Enter Credentials and Connect Expensify and Sage Intacct
+
+
+1. Go back to **Settings > Workspaces > Group > [Workspace Name] > Connections > Configure**.
+2. Click **Connect to Sage Intacct** and enter the credentials you've set for your web services user.
+3. Click **Send** once you're done.
+
+Next, you’ll configure the Export, Coding, and Advanced tabs of the connection configuration in Expensify.
+
+
+## User-based Permissions - Vendor Bills
+In this setup guide, we'll take you through the steps to establish your connection for Vendor Bills with user-based permissions. Please follow this checklist of items to complete:
+1. Create a web services user and set up permissions.
+2. Enable Customization Services (only required if you don't already use Platform Services).
+3. Create a test workspace in Expensify and download the [Expensify Package](https://www.expensify.com/tools/integrations/downloadPackage)
+4. Upload the Package in Sage Intacct.
+5. Add web services authorization.
+6. Enter credentials and connect Expensify and Sage Intacct.
+7. Configure integration sync options.
+
+
+### Step 1: Create a web services user with user-based permissions
+**Note:** If the steps in this section look different in your Sage Intacct instance, you likely use role-based permissions. If that's the case, see the steps below on creating a web services user for role-based permissions.
+To connect to Sage Intacct, it's necessary to set up a web services user. This user simplifies tracking activity within Sage Intacct, such as exporting expense reports and credit card charges from Expensify. It also ensures a seamless transition when someone joins or leaves your accounting department. Setting up the web services user is free of charge. Please follow these steps:
+1. Go to **Company > Web Services Users > New**.
+2. Configure the user as shown in the screenshot below, making sure to follow these guidelines:
+   - **User ID:** "xmlgateway_expensify"
+   - **Last Name and First Name:** "Expensify"
+   - **Email Address:** Your shared accounting team email
+   - **User Type:** "Business"
+   - **Admin Privileges:** "Full"
+   - **Status:** "Active"
+
+
+Once you've created the user, you'll need to set the correct permissions. To do this, follow these steps:
+1. Go to the subscription link for this user in the user list.
+2. Click on the checkbox next to the Application/Module you want to modify permissions for.
+3. Click on the **Permissions** link to make modifications.
+
+These are the permissions the user needs to have if exporting reimbursable expenses as Vendor Bills:
+- **Administration (All)**
+- **Company (Read-only)**
+- **Cash Management (All)**
+- **General Ledger (All)**
+- **Accounts Payable (All)**
+- **Projects (Read-only)** (required if you're going to be using Projects and Customers)
+
+**Note:** that selecting the radio button next to the Permission you want and clicking **Save** will set the permission for that particular Application/Module.
+
+
+### Step 2: Enable Customization Services (only applicable if you don't already use Platform Services)
+To enable Customization Services go to **Company > Subscriptions > Customization Services**.
+   - If you already have Platform Services enabled, you can skip this step.
+
+### Step 3: Create a Test Workspace in Expensify and Download [Expensify Package](https://www.expensify.com/tools/integrations/downloadPackage)
+Creating a test workspace in Expensify allows you to establish a sandbox environment for testing before implementing the integration in a live environment. If you're already using Expensify, creating a test workspace ensures that your existing company workspace rules and approval workflows remain intact. Here's how to set it up:
+1. Go to **expensify.com > Settings > Workspaces > Groups > New Workspace**.
+2. Name the workspace something like "Sage Intacct Test Workspace."
+3. Go to **Connections > Sage Intacct > Connect to Sage Intacct**.
+4. Select "I've completed these" if you've downloaded the  [Expensify Package](https://www.expensify.com/tools/integrations/downloadPackage) and completed the previous steps in Sage Intacct.
+5. Select **Download Package** (You only need to download the file; we'll upload it from your Downloads folder later).
+
+### Step 4: Upload the Package in Sage Intacct
+If you use **Customization Services**:
+
+1. Go to **Customization Services > Custom Packages > New Package**.
+2. Click on **Choose File** and select the Package file from your downloads folder.
+3. Click **Import**.
+
+
+If you use **Platform Services**:
+
+1. Go to **Platform Services > Custom Packages > New Package**.
+2. Click on **Choose File** and select the Package file from your downloads folder.
+3. Click **Import**.
+
+### Step 5: Add Web Services Authorization
+1. Go to **Company > Company Info > Security** in Intacct and click **Edit**.
+2. Scroll down to **Web Services Authorizations** and add "expensify" (all lowercase) as a Sender ID.
+
+### Step 6: Enter Credentials and Connect Expensify with Sage Intacct
+1. Go back to **Settings > Workspaces > Groups > [Workspace Name] > Connections > Configure**.
+2. Click on **Connect to Sage Intacct**.
+3. Enter the credentials that you've previously set for your web services user.
+4. Click **Send** once you've finished entering the credentials.
+
+Next, you’ll configure the Export, Coding, and Advanced tabs of the connection configuration in Expensify.
+
+
+
+## Role-based Permissions - Expense Reports
+
+For this setup guide, we're going to walk you through how to get your connection up and running as Expense Reports with role-based permissions.
+
+### Checklist of items to complete:
+
+1. Create web services user and set up permissions
+2. Enable Time & Expenses module
+3. Set up Employees in Sage Intacct
+4. Set up Expense Types in Sage Intacct
+5. Enable Customization Services (only applicable if you don't already use Platform Services)
+6. Create a test workspace and download the [Expensify Package](https://www.expensify.com/tools/integrations/downloadPackage)
+7. Upload the Package in Sage Intacct
+8. Add web services authorization
+9. Enter credentials and connect Expensify and Sage Intacct
+10. Configure integration sync options
+
+
+### Step 1: Create a web services user with role-based permissions
+
+In Sage Intacct, click **Company**, then click on the **+** button next to **Roles**.
+
+Name the role, then click **Save**.
+
+Go to **Roles > Subscriptions** for the "Expensify" role you just created.
+
+Set the permissions for this role by clicking the checkbox and then clicking on the **Permissions** hyperlink.
+
+These are the permissions required for a user to export reimbursable expenses as Expense Reports:
+- **Administration (All)**
+- **Company (Read-only)**
+- **Cash Management (All)**
+- **General Ledger (All)**
+- **Time & Expense (All)**
+- **Projects (Read-only)** (only needed if using Projects and Customers)
+- **Accounts Payable (All)** (only needed for exporting non-reimbursable expenses as vendor bills)
+
+Now, you'll need to create a web services user and assign this role to that user.
+
+- **Company > Web Services Users > New**
+- Set up the user like the screenshot below, making sure to do the following:
+  - User ID: “xmlgateway_expensify"
+  - Last name and First name: "Expensify"
+  - Email address: your shared accounting team email
+  - User type: "Business"
+  - Admin privileges: "Full"
+  - Status: "Active"
+
+To assign the role, go to **Roles Information**:
+
+- Click the **+** button, then find the "Expensify" role and click **Save**.
+
+### Step 2: Enable the Time & Expenses module (Only required if exporting reimbursable expenses as Expense Reports)
+
+The T&E module often comes standard on your Sage Intacct instance, but you may need to enable it if it was not a part of your initial Sage Intacct implementation. Enabling the T&E module is a paid subscription through Sage Intacct. Please reach out to your Sage Intacct account manager with any questions on the costs of enabling this module. It's required for our integration and takes just a few minutes to configure.
+
+In Sage Intacct, click on the **Company** menu > **Subscriptions** > **Time & Expenses** and click the toggle to subscribe.
+
+Once you've enabled T&E, you'll need to configure it properly:
+- Ensure that **Expense types** is checked.
+- Under Auto-numbering sequences, please set the following:
+  - To create the EXP sequence, click on the down arrow on the expense report line > **Add**
+  - Sequence ID: EXP
+  - Print Title: EXPENSE REPORT
+  - Starting Number: 1
+  - Next Number: 2
+  - Once you've done this, select **Advanced Settings**
+  - Fixed Number Length: 4
+  - Fixed Prefix: EXP
+  - Once you've done this, hit **Save**
+- Under Expense Report approval settings, make sure the "Enable expense report approval" is unchecked.
+- Click **Save**!
+
+### Step 3: Set up Employees in Sage Intacct (Only required if exporting reimbursable expenses as Expense Reports)
+
+In order to set up Employees, go to **Time & Expenses** > click the plus button next to **Employees**. If you don't see Time & Expense in the top ribbon, you may need to adjust your settings by going to **Company > Roles > Time & Expenses > Enable all permissions**. To create an employee, you'll need to insert the following information:
+- Employee ID
+- Primary contact name
+- Email address (click the dropdown arrow in the Primary contact name field) > select the employee if they've already been created. Otherwise click **+ Add** > fill in their Primary Email Address along with any other information you require.
+
+### Step 4: Set up Expense Types in Sage Intacct (only required if exporting reimbursable expenses as Expense Reports)
+
+Expense Types are a user-friendly way of displaying the names of your expense accounts to your employees. They are required for our integration. In order to set up Expense Types, you'll first need to setup your Chart of Accounts (these can be set up in bulk by going to **Company > Open Setup > Company Setup Checklist > click Import**).
+
+Once you've setup your Chart of Accounts, to set Expense Types, go to **Time & Expense** > **Open Setup** > click the plus button next to **Expense Types**. For each Expense Type, you'll need to include the following information:
+- Expense Type
+- Description
+- Account Number (from your GL)
+
+### Step 5: Enable Customization Services
+
+To enable, go **Company > Subscriptions > Customization Services** (if you already have Platform Services enabled, you will skip this step).
+
+### Step 6: Create a test workspace in Expensify and download  [Expensify Package](https://www.expensify.com/tools/integrations/downloadPackage)
+
+The test workspace will be used as a sandbox environment where we can test before going live with the integration. If you're already using Expensify, creating a test workspace will ensure that your existing group workspace rules, approval workflow, etc remain intact. In order to set this up:
+
+- Go to **expensify.com > Settings > Workspaces > New Workspace**
+- Name the workspace something like "Sage Intacct Test Workspace"
+- Go to **Connections > Sage Intacct > Connect to Sage Intacct**
+- Select **Download Package** (All you need to do is download the file. We'll upload it from your Downloads folder later).
+
+### Step 7: Upload Package in Sage Intacct
+
+If you use Customization Services:
+
+- **Customization Services > Custom Packages > New Package > Choose File >** select the Package file from your downloads folder > Import
+
+If you use Platform Services:
+
+- **Platform Services > Custom Packages > New Package > Choose File >** select the Package file from your downloads folder > Import
+
+### Step 8: Add web services authorization
+
+- Go to **Company > Company Info > Security** in Intacct and click Edit. Next, scroll down to Web Services authorizations and add "expensify" (this must be all lower case) as a Sender ID.
+
+### Step 9: Enter credentials and connect Expensify and Sage Intacct
+
+- Now, go back to **Settings > Workspaces > Group > [Workspace Name] > Connections > Configure > Connect to Sage Intacct** and enter the credentials that you've set for your web services user. Click Send once you're done.
+
+Next, follow the links in the related articles section below to complete the configuration for the Export, Coding, and Advanced tabs of the connection settings.
+
+## Role-based Permissions - Vendor Bills
+
+Follow the steps below to set up Sage Intacct with role-based permissions and export Vendor Bills:
+
+### Checklist of items to complete:
+
+1. Create a web services user and configure permissions.
+2. Enable Customization Services (if not using Platform Services).
+3. Create a test workspace in Expensify and download the [Expensify Package](https://www.expensify.com/tools/integrations/downloadPackage).
+4. Upload the Package in Sage Intacct.
+5. Add web services authorization.
+6. Enter credentials and connect Expensify and Sage Intacct.
+7. Configure integration sync options.
+
+
+### Step 1: Create a web services user with role-based permissions
+
+In Sage Intacct:
+- Navigate to "Company" and click the **+** button next to "Roles."
+- Name the role and click **Save**.
+- Go to "Roles" > "Subscriptions" for the "Expensify" role you created.
+- Set the permissions for this role by clicking the checkbox and then clicking on the Permissions hyperlink
+
+
+These are the permissions required for a user to export reimbursable expenses as Vendor Bills:
+- **Administration (All)**
+- **Company (Read-only)**
+- **Cash Management (All)**
+- **General Ledger (All)**
+- **Time & Expense (All)**
+- **Projects (Read-only)** (only needed if using Projects and Customers)
+- **Accounts Payable (All)** (only needed for exporting non-reimbursable expenses as vendor bills)
+
+
+- Create a web services user:
+  - Go to **Company > Web Services Users > New**
+  - Configure the user as follows:
+    - User ID: "xmlgateway_expensify"
+    - Last Name and First Name: "Expensify"
+    - Email Address: Your shared accounting team email
+    - User Type: "Business"
+    - Admin Privileges: "Full"
+    - Status: "Active"
+  - To assign the role, go to "Roles Information", click the **+** button, find the "Expensify" role, and click **Save**
+
+### Step 2: Enable Customization Services
+
+Only required if you don't already use Platform Services:
+- To enable, go to **Company > Subscriptions > Customization Services**
+
+### Step 3: Create a test workspace in Expensify and download the  [Expensify Package](https://www.expensify.com/tools/integrations/downloadPackage)
+
+Create a test workspace in Expensify:
+- Go to **Settings > Workspaces** and click **New Workspace** on the Expensify website.
+- Name the workspace something like "Sage Intacct Test Workspace."
+- Once created, navigate to **Settings > Workspaces > [Group Workspace Name] > Connections > Accounting Integrations > Connect to Sage Intacct**
+- Select **Create a new Sage Intacct connection/Connect to Sage Intacct**
+- Select **Download Package** (We'll upload it from your Downloads folder later.)
+
+### Step 4: Upload Package in Sage Intacct
+
+If you use **Customization Services**:
+- Go to **Customization Services > Custom Packages > New Package > Choose File > select the Package file from your downloads folder > Import**.
+
+If you use **Platform Services**:
+- Go to **Platform Services > Custom Packages > New Package > Choose File > select the Package file from your downloads folder > Import**.
+
+### Step 5: Add web services authorization
+
+- Go to **Company > Company Info > Security** in Intacct and click **Edit**
+- Scroll down to **Web Services Authorizations** and add **expensify** (all lowercase) as a Sender ID.
+
+### Step 6: Enter credentials and connect Expensify and Sage Intacct
+
+Now, go back to **Settings > Workspaces > [Group Workspace Name] > Connections > Accounting Integrations > Configure > Connect to Sage Intacct** and enter the credentials you set for your web services user. Click **Send** when finished.
+
+### Step 7: Configure your connection
+
+Once the initial sync completes, you may receive the error "No Expense Types Found" if you're not using the Time and Expenses module. Close the error dialogue, and your configuration options will appear. Switch the reimbursable export option to **Vendor Bills** and click **Save** before completing your configuration.
+
+Next, refer to the [Configure Sage Intacct](https://help.expensify.com/articles/expensify-classic/connections/sage-intacct/Configure-Sage-Intacct) article to finish setting up the Export, Coding, and Advanced tabs of the connection configuration.
diff --git a/docs/articles/expensify-classic/connections/sage-intacct/Sage-Intacct-Troubleshooting.md b/docs/articles/expensify-classic/connections/sage-intacct/Sage-Intacct-Troubleshooting.md
new file mode 100644
index 000000000000..e12f8028c4c8
--- /dev/null
+++ b/docs/articles/expensify-classic/connections/sage-intacct/Sage-Intacct-Troubleshooting.md
@@ -0,0 +1,252 @@
+---
+title: Sage Intacct Troubleshooting
+description: Sage Intacct Troubleshooting
+---
+
+# Overview of Sage Intacct Troubleshooting
+Synchronizing and exporting data between Expensify and Sage Intacct can streamline your financial processes, but occasionally, users may encounter errors that prevent a smooth integration. These errors often arise from discrepancies in settings, missing data, or configuration issues within Sage Intacct or Expensify.
+
+This troubleshooting guide aims to help you identify and resolve common sync and export errors, ensuring a seamless connection between your financial management systems. By following the step-by-step solutions provided for each specific error, you can quickly address issues and maintain accurate and efficient expense reporting and data management.
+
+## Sage Intacct experienced the following error trying to synchronize your workspace: Authentication error
+
+**Why does this happen?**
+
+This error occurs because the connection could not be authorized using the credentials supplied to Expensify.
+
+**How to Fix It**
+
+To resolve this issue, follow these steps:
+
+1. **Check Credentials:** Ensure you are using the correct credentials for your xmlgateway\_expensify web services user when attempting to connect your workspace to Intacct.
+2. **Add Expensify to Web Services Authorizations:**
+3. In Sage Intacct, click the Applications menu and hover over **Company**.
+4. Click the **Setup** tab at the top of the menu list, then select **Company**.
+5. Click the **Security** tab at the top, then click **Edit** in the top right.
+6. Scroll down to Web Services Authorizations and add “expensify” (all lower case) as a Sender ID.
+7. Click **Save**.
+
+3. **Retry Connection:** After making these changes, try syncing or connecting your workspace again.
+
+**Additional Steps if Error Persists**
+
+Try removing and re-adding Expensify from the Web Services authorizations list entirely. This can help clear the error.
+
+## Company Card Expenses Exporting to the Wrong Account
+
+Behavior: Company card transactions are exporting to the wrong place in your accounting system.
+
+**Why Does This Happen?**
+
+Several factors can cause this issue, including incorrect account mapping, improper export settings, or user permissions.
+
+**How to Fix It**
+
+**Check how the Expense was imported**
+
+* **Imported from Company Card**: Only expenses shown with the locked card icon can use the export mapping settings configured through Domain Control.
+* **Other Imports**: Expenses imported from cards linked at the individual account level, SmartScanned receipts, and manually created cash expenses will export to the default account set in your connection’s configuration settings.
+
+**1. Confirm Card Mapping**
+
+Ensure that the company cards have been correctly mapped to the appropriate accounts through Domain Control.
+
+**2. Merge SmartScanned Receipts**
+
+If SmartScanned receipt expenses should have been merged with imported Company Card expenses, follow these troubleshooting steps:
+
+• Verify if the expenses did not merge automatically.
+
+• Manually merge them if necessary.
+
+**3. Verify Export Options in Sync Settings**
+
+Even with correct card-to-account mapping in Domain Control, you need to select the correct export option:
+
+• Go to Settings &gt; Workspaces &gt; Group &gt; [Workspace Name] &gt; Connections &gt; Configure.
+
+• Choose “Credit Card” as your non-reimbursable export option if you’ve mapped to specific Credit Card accounts.
+
+**4. Ensure Domain Admin Permissions**
+
+The user exporting the report must be a Domain Admin:
+
+• Check the Report Comments section at the bottom of an individual report to see who exported it.
+
+• For automatic exports by Concierge, ensure the Preferred Exporter under Settings &gt; Workspaces &gt; Group &gt; [Workspace Name] &gt; Connections &gt; Configure is a Domain Admin.
+
+If the exporter is not a Domain Admin, all company card expenses will export to the default account specified in the Non-Reimbursable section of your Export configuration settings.
+
+**5. Correct Workspace Mapping**
+
+For multiple workspaces connected to the same accounting system:
+
+• Ensure you choose an account listed under the same workspace as the report you are exporting.
+
+• Otherwise, expenses will export to the default account.
+
+## Credit Card Configuration is Missing
+
+**Sage Intacct: Credit Card Configuration is Missing**
+
+When attempting to export non-reimbursable (company card) expenses to Sage Intacct, you may encounter an error stating “Credit Card Configuration is Missing” or “Charge Card Configuration is Missing.” This occurs because Sage Intacct requires a credit card account to be set up in order to export these expenses as credit card transactions.
+
+**Why Does This Happen?**
+
+This error arises because non-reimbursable expenses need to be exported as credit card transactions in Sage Intacct. Without a properly configured credit card account, Sage Intacct cannot process these transactions.
+
+**How to Fix It**
+
+**Step-by-Step Guide to Setting Up Credit Card Accounts in Sage Intacct:**
+
+1. **Navigate to Charge Card Accounts Setup:** Go to **Cash Management** &gt; **Setup** &gt; **+ Charge Card Accounts**.
+2. **Fill in the Mandatory Fields:**
+* **ID:** This is the name that will appear in the dropdown in Expensify. Choose a name that is easily recognizable.
+* **Type**
+* **Payment Method:** Select “Credit.”
+* **Expiration:** This field must be filled out, but the specific date is not crucial if you have a single roll-up card account.
+* **Credit-card offset account:** This is the account credited when the expense posts.
+* **Default location:** Choose the location where you want transactions to be associated.
+* **Vendor ID:** Likely the bank or card vendor that you will be paying.
+3. **Link the Account in Expensify:**
+* Go to **Expensify** &gt; **Settings** &gt; **Workspaces** &gt; **Group** &gt; [Workspace Name] &gt; **Connections** &gt; **Configure** &gt; **Export**.
+* Select the credit card account you set up in Sage Intacct.
+* Click “Save.”
+
+**Note:** If you have multiple credit card accounts, follow the specific instructions provided by Expensify for configuring these accounts, as the process may differ slightly. By ensuring you have the correct credit card accounts set up in Sage Intacct and linked in Expensify, you can successfully export non-reimbursable expenses without encountering the configuration error.
+
+## Expensify Not Displaying Customers/Projects
+
+**Behavior:** Expensify is not displaying customers or projects from Sage Intacct.
+
+**Why Does This Happen?**
+
+This issue is most likely due to insufficient permissions. The web services user (the user that “owns” the Sage Intacct connection in Expensify) needs to have specific permissions to access the necessary data.
+
+**How to Fix It:**
+
+1. **Verify Permissions**:
+* Ensure the web services user has “Read-Only” permissions for the Accounts Receivable (AR) module in Sage Intacct.
+* Navigate to: Company &gt; Users &gt; Subscriptions (for the web services user) &gt; Permissions (for AR).
+* Select the “Read Only” radio button option.
+* Click “Save”.
+2. Sync the Connection:
+* Go to: Expensify &gt; Settings &gt; Workspaces &gt; Group &gt; [Workspace Name] &gt; Connections &gt; Sync Now.
+
+By following these steps, the web services user will have the necessary permissions, and you should be able to see customers and projects from Sage Intacct in Expensify.
+![image.png](https://lh7-rt.googleusercontent.com/docsz/AD_4nXdjlQYu9m1qhyn5mY6I8BXH9Fqg1LWJaJIHYEK57FaqE0R9gmAjAgrCKwcbqRZjG6SZ_qH_fEeW0mPU0WGFThj_z-KA3Lyk8ycpqWXxZKE-66scTlXM3mci5_XnIVH-8pgRfhjFw2ofqYa73Dup6b4Y5ms?key=x7ojFwv9R6uhOdjeG2XNKQ)[![image.png](https://lh7-rt.googleusercontent.com/docsz/AD_4nXemSU0jy3Ilc8NHWN2QdcJYU8DZPx4TN-9f7DP3bgex5v5YyVgOxNQBrk-B12rQ6BUTDzriHgXTO5HW4wSr463Vg5RClK5JnQv_tMuK8xTWuPJ5byYktMUsTk57g4rnQh5DyEQ7D3d-29Z-yX_w1BW6o1sd?key=x7ojFwv9R6uhOdjeG2XNKQ)](https://community.expensify.com/home/leaving?allowTrusted=1&amp;target=https%3A%2F%2Fus.v-cdn.net%2F6030147%2Fuploads%2F949%2FO4MBRASZ0QAR.png)
+## ExpensiError INT009: The Employee Manager Does Not Have a User Associated
+
+Error Message:
+
+If you encounter the error message “ExpensiError INT009” when attempting to export your report, follow the steps below to resolve it.
+
+**Why Does This Happen?**
+
+This error occurs if the manager set for a particular employee record in Sage Intacct does not have a user account in Sage Intacct. This situation typically arises when using Sage Intacct’s approval settings.
+
+**How to Fix It**
+
+If You Are Not Using Sage Intacct Approvals:
+1. Disable Expense Report Approval in Sage Intacct:
+1. Navigate to **Sage Intacct**
+2. Go to **Time & Expenses** &gt; **Configure Time & Expenses**.
+3. Uncheck **Enable expense report approval**.
+2. Sync Expensify:
+1. Open **Expensify**.
+2. Go to **Settings** &gt; **Workspaces** &gt; **[Workspace Name]** &gt; **Connections**.
+3. Click **Sync Now**.
+
+If You Are Using Sage Intacct Approvals:
+1. Set the First Approver in Sage Intacct:
+1. Navigate to **Sage Intacct**.
+2. Go to **Time & Expenses** &gt; **Configure Time & Expenses**.
+3. Under **Expense Report approval settings**, set the **First approver** to a user who is an admin in Sage Intacct.
+
+Following these steps should resolve the error and allow you to export your report successfully.
+
+## ExpensiError INT012: "Reason for expense" note is invalid
+
+**Why Does This Happen?**
+
+This error occurs because Sage Intacct has a setting enabled that requires a “Reason for expense” note. When this setting is enabled, it can interfere with the export of expense reports, leading to the “ExpensiError INT012.”
+
+**How to Fix It**
+
+To resolve this issue, follow these steps to disable the “Reason for expense” requirement in Sage Intacct:
+1. **Log in to Sage Intacct.**
+2. **Navigate to Time & Expenses:** Go to the main menu and select **Time & Expenses**.
+3. **Access Configuration Settings:** Under Time & Expenses, select **Configure Time & Expense**.
+4. **Adjust Expense Report Requirements:**
+1. Find the section labeled **Expense report requirements**.
+2. Uncheck the box next to **Reason for expense**.
+![image.png](https://lh7-rt.googleusercontent.com/docsz/AD_4nXc6kXptM7sekVPz7DD9a_BRVTscd0MDZIuwlKl_HOaJrWrvVkmy-QR-ZzVZCMdIQwtkl3of3_LJqcIgjscY45D3gYiOZ-N-oE8dnQmVQJ0ViZGlX-Qvga2N42B0oEMsgdtFNWO9PmUG6NCBl8zUwgDjOPSx?key=x7ojFwv9R6uhOdjeG2XNKQ)
+
+## ExpensiError INT028: Use of an empty location is invalid
+
+**Why Does This Happen?**
+
+This error occurs when Locations are mapped to the Sage Intacct employee default setting in the Expensify integration sync options menu, and your Sage Intacct configuration requires Locations to be specified. If a Location is not specified for an employee, the export will fail.
+
+**How to Fix It**
+
+1. **Specify a Location for the Employee in Sage Intacct:**
+1. Go to your Sage Intacct account.
+2. Find the employee who needs a Location specified.
+3. Update their profile to include a Location.
+2. **Sync the Sage Intacct Connection in Expensify:**
+1. Open Expensify and go to **Settings**.
+2. Select **Workspaces** and then **Groups**.
+3. Choose the relevant **Workspace Name**.
+4. Click on **Connections** and then **Sync Now**.
+3. **Re-export the Report:**
+1. Locate the report that triggered the error.
+2. Attempt to export it again. The error should be resolved if the Location is correctly specified and synced.
+![](https://lh7-rt.googleusercontent.com/docsz/AD_4nXdwWeKllyWIbCKk-hVd2BFJ23ckHXTPSsCYzOD-unnoeDOT8looVe_M8C3y8rK19hLaAKWbsztg2KJwsT5Im9a9hMZgDK_cZjNk6aZZMf-IRxlSM562AupahtvKc1N3MVa-lKa-iXpN3UKIsIN6iFNmFPef?key=x7ojFwv9R6uhOdjeG2XNKQ)
+
+## ExpensiError INT043: Not Authorized to Execute This Function
+
+**Why Does This Happen?**
+
+This error occurs when the xml\_gateway user lacks the necessary permissions to execute specific functions in Sage Intacct. Permissions can be set either based on individual users or roles within the system.
+
+**How to Fix It**
+
+To resolve this error, follow these steps to enable the required permissions for the xml\_gateway user.
+1. **Determine Permission Type:**
+* **User-Based Permissions:** Navigate to: Company &gt; Users &gt; Subscriptions
+* **Role-Based Permissions:** Navigate to: Company &gt; Roles &gt; Subscriptions
+2. **Set Permissions:**Ensure the following permissions are enabled for all relevant modules in your Sage Intacct account:
+* **Administration:** All
+* **Company:** Read-only
+* **Cash Management:** All
+* **Time and Expense:** All
+* **General Ledger:** All
+* **Projects:** Read-only
+* **Accounts Payable:** All
+3. **Sync Connection in Expensify:**
+* Go to: Settings &gt; Workspaces &gt; [Workspace Name] &gt; Connections
+* Click on Sync Now
+4. **Retry Export:** Attempt to export again in Expensify.
+
+## ExpensiError INT054: No Sage Intacct employee found for X
+
+**Why Does This Happen?**
+
+This error occurs when Expensify cannot find a corresponding employee record in Sage Intacct for the specified email address. This can happen due to:
+1. The employee not being set up in Sage Intacct.
+2. A mismatch in email addresses between Expensify and Sage Intacct.
+3. Duplicate employee records with the same email address in Sage Intacct.
+
+**How to Fix It**
+
+1. **Employee Not Set Up or Email Address Mismatch**:
+1. **Step 1**: Go to Sage Intacct.
+2. **Step 2**: Navigate to **Time & Expenses &gt; + Employee**.
+3. **Step 3**: Create the employee if they are not already set up.
+4. **Step 4**: Ensure the email address in Sage Intacct matches the one in Expensify.
+5. **Step 5**: Sync the Sage Intacct connection in Expensify. **Path**: Settings &gt; Workspaces &gt; Group &gt; [Workspace Name] &gt; Connections &gt; Sync Now.
+2. **Duplicate Employee Records**:
+1. **Step 1**: Go to Sage Intacct.
+2. **Step 2**: Identify and delete any duplicate employee records with the same email address.
+3. **Step 3**: Sync the Sage Intacct connection in Expensify. **Path**: Settings &gt; Workspaces &gt; Group &gt; [Workspace Name] &gt; Connections &gt; Sync Now.
diff --git a/docs/articles/expensify-classic/connections/xero/Configure-Xero.md b/docs/articles/expensify-classic/connections/xero/Configure-Xero.md
new file mode 100644
index 000000000000..170e8d0b6974
--- /dev/null
+++ b/docs/articles/expensify-classic/connections/xero/Configure-Xero.md
@@ -0,0 +1,104 @@
+---
+title: Configure Xero
+description: Configure Xero
+---
+
+**Best Practices Using Xero**
+
+A connection to Xero lets you combine the power of Expensify's expense management features with Xero's accounting capabilities. By following the recommended best practices below, your finances will be automatically categorized correctly and accounted for in the right place. 
+
+- Configure your setup immediately after making the connection, and review each settings tab thoroughly.
+- Keep Auto Sync enabled.
+    - The daily auto sync will update Expensify with any changes to your chart of accounts, customers/projects, or bank accounts in Xero.
+    - Finalized reports will be exported to Xero automatically, saving your admin team time with every report.
+- Set your preferred exporter to a user who is both a workspace and domain admin. 
+- Configure your coding settings and enforce them by requiring categories and tags on expenses. 
+
+# Accessing the Xero Configuration Settings
+Xero is connected at the workspace level, and each workspace can have a unique configuration that dictates how the connection functions. To access the configuration:
+
+1. Click **Settings** near the bottom of the left-hand menu.
+2. Navigate to Workspaces > Groups > [workspace Name] > Connections.
+3. Scroll down to the Xero connection and click the **Configure** button to open the settings menu.
+
+# Step 1: Configure Export Settings
+The following steps help you determine how data will be exported from Expensify to Xero.
+
+1. Click the **Configure** button under the Xero connection to open the settings menu.
+2. Under the Export tab, review each of the following export settings:
+    - **Preferred Exporter**: Choose a Workspace Admin to set as the Preferred Exporter. 
+        - Concierge exports reports automatically on behalf of the preferred exporter.
+        - Other Workspace Admins will still be able to export to Xero manually.
+        - If you set different export bank accounts for individual company cards under your Domain > Company Cards, then your Preferred Exporter must be a Domain Admin in addition to Workspace Admin.
+    - **Export reimbursable expenses and bills as**: Reimbursable expenses export as a Purchase Bill. This setting cannot be amended.
+    - **Purchase Bill Date**: Choose whether to use the date of the last expense on the report, export date, or submitted date.
+    - **Export invoices as**: All invoices exported to Xero will be as sales invoices. Sales invoices always display the date on which the invoice was sent. This setting cannot be amended.
+    - **Export non-reimbursable expenses as**: Each exported expense posts as a bank transaction to the Xero bank account you select below, and transaction dates will match the dates on your bank statement.
+    - **Xero Bank Account**: Select which bank account will be used to post bank transactions when non-reimbursable expenses are exported.
+
+## Step 1B: Optional configuration when company cards are connected
+1. Click **Settings** near the bottom of the left-hand menu.
+2. Navigate to Domains > [domain name] > Company Cards.
+3. If you have more than one company card connection, select the connection first. 
+4. Locate the cardholder you want to configure in the list,
+5. Click the **Edit Exports** button and assign the account the card expenses should export to in Xero.
+
+# Step 2: Configure Coding settings
+The following steps help you determine how data will be imported from Xero to Expensify.
+
+1. Click the **Configure** button under the Xero connection to open the settings menu.
+2. Under the Coding tab, review each of the following settings and configure the options to determine what information will be imported:
+    - **Chart of Accounts**: Your Xero Chart of Accounts is imported into Expensify as expense categories. _This is enabled by default and cannot be disabled._
+    - **Tax Rates**: When Enabled, your tax rates in Xero will be imported into your workspace. After being imported, you can find them on the [Tax](https://expensify.com/policy?param=%7B%22policyID%22:%22B936DE4542E9E78B%22%7D#tax) page of your workspace settings.
+    - **Tracking Categories**: When Enabled, you can configure how Xero Cost Centres and Xero Regions import.
+        - Xero contact default (applies the Xero contact default during export to Xero)
+        - Tag (line-item level)
+        - Report Field (header level)
+    - **Billable Expenses**: When enabled, your Xero customer contacts will be imported as tags. Xero requires all billable expenses to have a customer tag to be able to be exported to Xero.
+
+# Step 3: Configure advanced settings
+The following steps help you determine the advanced settings for your connection, like auto-sync.
+
+1. Click the **Configure** button under the Xero connection to open the settings menu.
+2. Under the Advanced tab, review each of the following settings and configure the options you wish to use:
+    - **Auto Sync**: When enabled, the connection will sync daily to ensure that the data shared between the two systems is up-to-date. 
+        - New report approvals/reimbursements will be synced during the next auto-sync period. 
+Reimbursable expenses will export after reimbursement occurs or the report is marked as reimbursed outside Expensify when using Direct or Indirect reimbursement.
+        - Non-reimbursable expenses will export automatically after the report is final approved.
+    - **Newly Imported Categories Should Be**: When a new account is created in the Xero chart of accounts, this setting controls whether the new category in Expensify is enabled or disabled by default. Disabled categories are not visible to employees when coding expenses.
+    - **Set purchase bill status** (optional): Reimbursable expenses are exported as purchase bills with the status selected. The options available are:
+        - Awaiting Payment (default)
+        - Draft
+        - Awaiting Approval
+    - **Sync Reimbursed Reports**: When enabled, you can configure the Bill Payment and Invoice Collections accounts to be used when reimbursing reports and paying invoices. 
+        - Anytime a report is reimbursed, or an invoice is paid through Expensify, the corresponding purchase bill or sales invoice in Xero will be marked as paid. 
+        - Similarly, if a purchase bill or sales invoice is marked as paid in Xero, the related Expensify report or invoice will be automatically marked as reimbursed/paid.
+    - **Xero Bill Payment Account**: Once the expense report is paid, your reimbursements will appear under this Xero Bill Payment account.
+    - **Xero Invoice Collections Account**: If you are exporting invoices from Expensify, select the invoice collection account under which you want invoices to appear once they are marked as paid.
+
+{% include faq-begin.md %}
+
+## I have multiple organizations in Xero. Can I connect them all to Expensify?
+
+Yes, you can connect each organization you have to Expensify. Here are some essential things to keep in mind:
+
+- Organization Selection in the Workspace > Connections > Xero Configuration > Export settings tab: This option is available only if multiple organizations are configured in Xero.
+- One Workspace, One Organization: Each Workspace can connect to just one organization at a time. It’s a one-to-one connection.
+- Adding New Organizations: If you create a new organization in Xero after your initial connection, you’ll need to disconnect and then reconnect it to Xero. Don’t forget to take a screenshot of your current settings by clicking Configure and checking the Export, Coding, and Advanced tabs. This way, you can easily set everything up again.
+
+## How can I view the purchase bills exported to Xero?
+
+**To view the bills in Xero:**
+1. Log into Xero.
+2. Navigate to Business > Purchase Overview > Awaiting Payments. 
+    - Bills will be payable to the individual who created and submitted the report in Expensify.
+
+## How can I view the bank transactions in Xero?
+
+**To view the transactions in Xero:**
+1. Log into Xero.
+2. Head over to your Dashboard.
+3. Select your company card.
+4. Locate the specific expense you’re interested in.
+
+{% include faq-end.md %}
diff --git a/docs/articles/expensify-classic/connections/xero/Connect-To-Xero.md b/docs/articles/expensify-classic/connections/xero/Connect-To-Xero.md
new file mode 100644
index 000000000000..2fb71a780e41
--- /dev/null
+++ b/docs/articles/expensify-classic/connections/xero/Connect-To-Xero.md
@@ -0,0 +1,28 @@
+---
+title: Connect to Xero
+description: Everything you need to know about Expensify's direct integration with Xero
+order: 1
+---
+
+**Prerequisites**
+
+You must be a Workspace Admin in Expensify using a Collect or Control Workspace to connect your Xero account to Expensify.
+
+## Step 1: Connect Expensify to Xero
+1. Click **Settings** near the bottom of the left-hand menu.
+2. Navigate to Workspaces > Groups > [workspace Name] > Connections.
+3. Click on **Connect to Xero**.
+4. Click the **Create a New Xero Connection** button.
+5. Enter your Xero login credentials.
+6. Review the access information and click Allow Access.
+7. You will be redirected back to Expensify and the connection will import some initial settings from Xero to Expensify.
+8. Once the sync is complete, the configuration window for Xero will open automatically so you can configure your export, import, and advanced settings. 
+9. Click the **Save** button when you’re done configuring to finalize the connection.
+
+{% include faq-begin.md %}
+
+## I use a Cashbook or Ledger Xero account, can I still connect in Expensify?
+
+Starting in September 2021, there’s a chance for Cashbook and Ledger-type organizations in Xero. Apps like Expensify won’t be able to create invoices and bills for these accounts using the Xero API. So, if you’re using a Cashbook or Ledger Xero account, please be aware that this might affect your Expensify integration.
+
+{% include faq-end.md %}
diff --git a/docs/articles/expensify-classic/connections/xero/Xero-Troubleshooting.md b/docs/articles/expensify-classic/connections/xero/Xero-Troubleshooting.md
new file mode 100644
index 000000000000..f23ec515cde4
--- /dev/null
+++ b/docs/articles/expensify-classic/connections/xero/Xero-Troubleshooting.md
@@ -0,0 +1,155 @@
+---
+title: Xero Troubleshooting
+description: Xero Troubleshooting
+---
+
+# Overview of Xero Troubleshooting
+
+Synchronizing and exporting data between Expensify and Xero can streamline your financial processes, but occasionally, users may encounter errors that prevent a smooth integration. These errors often arise from discrepancies in settings, missing data, or configuration issues within Xero or Expensify.
+
+This troubleshooting guide aims to help you identify and resolve common sync and export errors, ensuring a seamless connection between your financial management systems. By following the step-by-step solutions provided for each specific error, you can quickly address issues and maintain accurate and efficient expense reporting and data management.
+
+# ExpensiError XRO014 Billable Expenses Require A Customer
+
+**Why does this happen?**
+
+This happens because Xero requires all billable expenses exported from Expensify to have a customer associated with it. This error occurs when one or more expenses on a report have been marked "billable," and do not have a customer associated with them.
+
+## How to fix it
+
+1. Navigate to your Settings > Workspaces > [click workspace] > Connections > Configure button > Coding tab.
+2. Click the **toggle** to enable Billable Expenses.
+3. Click the **Save** button to save the change and sync the connection.
+4. Open the report in question and apply a _Customer_ tag to each billable expense.
+     - _Note: A Contact in Xero is not imported as a Customer until they have had some kind of bill raised against them. If you can't see your Customer imported as a tag, you may need to raise a dummy invoice at the Xero end and then delete/void it. Don’t forget to sync the connection again after taking this step._
+5. Try to export the report again by clicking the **Export to** button and select the **Xero** option.
+
+# ExpensiError XRO027: Expense on this report is categorized with a category no longer in Xero
+
+**Why does this happen?**
+
+When exporting expense data, Xero will not accept a category on an expense that no longer exists in the chart of accounts. This error occurs when one or more expenses on the report are categorized with a category that no longer exists in Xero.
+
+## How to fix it
+
+1. Log into Xero.
+2. Navigate to Settings > Chart of Accounts.
+3. Confirm that each category used on an expense in the report in Expensify is still an active account in Xero.
+4. If the account doesn’t exist, add it again and sync the connection in Expensify.
+5. If the account still exists, open the details, check “Show in Expense Claims,” and then sync the connection in Expensify.
+6. After syncing, open the report and re-categorize any expenses showing a red workspace violation for out-of-workspace categories. 
+7. After recategorizing, click the **Export to** button and select the **Xero** option.
+
+# ExpensiError XRO031: Payment has already been allocated to reimbursable expenses
+
+**Why does this happen?**
+
+Xero does not allow for paid expenses to be modified. When you attempt to export the reimbursable expenses again, Xero considers that a modification and rejects the export. This error occurs when the report contains reimbursable expenses that have already been exported to Xero where a payment was issued on the purchase bill.
+
+## How to fix it
+
+1. Log into Xero.
+2. Click on Business > Bills to Pay > and then the Paid tab.
+3. Locate the report from the error and click on it to open it.
+4. Click on the blue text that says Payment.
+5. Click the Options dropdown and then Remove and Redo to delete the payment.
+    - _Note: Do not void the bill in Xero._
+6. Head back to Expensify and open the report again.
+7. Click the **Export to** button and select the **Xero** option.
+
+The new export will override the current report in Xero and retain the same report ID.
+
+# ExpensiError XRO087 No Bank Account or Incorrect Bank Account
+
+**Why does this happen?**
+
+Xero requires all bank transactions created from non-reimbursable expenses in Expensify to be posted to an active bank account. This error occurs when the destination account in Xero doesn’t exist, isn’t set, or is not the right type.
+
+## How to fix it
+
+1. Navigate to Settings > Workspaces > [workspace name] > Connections > click the **Configure** button.
+2. Select a Xero Bank Account from the dropdown that will apply to all non-reimbursable expenses exported to Xero.
+3. Click the **Save** button to sync the connection. 
+4. Open the report again and click the **Export to** button and then the **Xero** option.
+
+# ExpensiError XRO052: Expenses Are Not Categorized With A Xero Account
+
+**Why does this happen?**
+
+Xero requires all expenses exported from Expensify to use a category matching an account in your chart of accounts. If a category from another source is used, Xero will reject the expense. This error occurs when an expense on the report has a category applied that is not valid.
+
+## How to fix it
+
+1. Sync your Xero connection in Expensify from Settings > Workspaces > [click workspace] > Connections, and click the **Sync Now** button.
+2. Review the expenses on the report. If any appear with a red _Category no longer valid_ violation, recategorize the expense until all expenses are violation-free.
+3. Click the **Export to** button and then the **Xero** option.
+4. If you receive the same error, continue.
+    - _Note the categories used on the expenses and check the Settings > Workspaces > [click workspace] > Categories page to confirm the exact categories used on the report are enabled and connected to Xero (you'll see a blue icon next to all connected categories)._
+5. Confirm that the categories used for expenses in the report match exactly the accounts in your Xero chart of accounts.
+6. If you make any changes in Xero or in Expensify, always sync the connection and then try to export again. 
+
+# ExpensiError XRO068: Organization is not subscribed to currency x
+
+**Why does this happen?**
+
+Xero requires the currencies you’re using in Expensify to be added to your account before you can export expenses in that currency. For example, if your workspace is set to Canadian currency, all expenses submitted on that workspace will be converted to CAD. You must also have the Canadian currency added to your Xero account to export successfully. This error occurs when your Xero account does not have the currency mentioned in the error added.
+
+## How to fix it
+_Note: Not all versions of Xero allow adding currencies. To add currencies, please upgrade your Xero account to the Established [plan](https://www.xero.com/us/pricing-plans/)._
+
+1. Log into Xero.
+2. Navigate to Settings > General Settings. 
+3. Under the heading Features, select Currencies.
+4. Click **Add Currency** to add the currency listed in the error message.
+5. Sync your Xero connection in Settings > Workspaces > [click workspace] > Connections.
+6. Open the report and click the **Export to** button and then the **Xero** option.
+
+# ExpensiError XRO076: This report has already been exported once to Xero, but has been voided
+
+**Why does this happen?**
+
+Xero does not allow Expensify to modify a purchase bill created from a previous export if the bill has been voided. This error occurs when the report has already been exported to Xero, and the purchase bill has been voided.
+
+## How to fix it
+_Note: Xero does not support “unvoiding” a bill, it is an irreversible action._
+
+1. From the Reports page in Expensify, locate the report associated with the voided bill.
+2. Check the box to the left of the report and click **Copy**.
+3. Open the new report and submit it through the approval workflow, then confirm it exports to Xero successfully.
+
+# ExpensiError XRO099: You have reached the limit of invoices you can approve with your Xero account.
+
+**Why does this happen?**
+
+The Early plan only allows you to enter 5 bills per month. This error occurs when you are on a trial account of Xero and have run out of your allowable exports.
+
+## How to fix it
+Please upgrade your Xero account to a Growing or Established [plan](https://www.xero.com/us/pricing-plans/) so you can continue to use the integration and export reports without error. 
+
+# Why are company card expenses exported to the wrong account?
+
+Multiple factors could be causing your company card transactions to export to the wrong place in your accounting system, but the best place to start is always the same.
+
+- First, confirm that the company cards have been mapped to the correct accounts in Settings > Domains > Company Cards > click the **Edit Export** button for the card to view the account.
+- Next, confirm the expenses in question have been imported from the company card? 
+    - Only expenses that have the Card+Lock icon next to them will export according to the mapping settings that you configure in the domain settings.
+
+It’s important to note that expenses imported from a card linked at the individual account level, expenses created from a SmartScanned receipt, and manually created cash expenses will export to the default bank account selected in your connection's configuration settings.
+
+**Is the report exporter a domain admin?**
+
+The user exporting the report must be a domain admin. You can check the history and comment section at the bottom of the report to see who exported the report.
+
+If your reports are being exported automatically by Concierge, the user listed as the Preferred Exporter under Settings > Workspaces > [workspaces name] > Connections > click **Configure** must be a domain admin as well. 
+
+If the report exporter is not a domain admin, all company card expenses will export to the bank account set in Settings > Workspaces > [workspace name] > Connections > click **Configure** for non-reimbursable expenses. 
+
+**Has the company card been mapped under the correct workspace?**
+
+If you have multiple workspaces connected to Xero, each connected workspace will have a separate list of accounts to assign the card to. Unless you choose an account listed under the same workspace as the report you are exporting, expenses will export to the default bank account.
+
+# Why do non-reimbursable expenses say 'Credit Card Misc,' instead of the merchant?
+
+Where the merchant in Expensify is an exact match to a contact you have set up in Xero then exported credit card expenses will show the vendor name.  If not we use the the default name Expensify Credit Card Misc. This is done to prevent multiple variations of the same contact (e.g. Starbucks and Starbucks #1234 as is often seen in credit card statements) being created in Xero.
+
+To change merchant names to match your vendor list in Xero, we recommend using our Expense Rules feature. More information on this can be found [here](https://community.expensify.com/discussion/5654/deep-dive-using-expense-rules-to-vendor-match-when-exporting-to-an-accounting-package/p1?new=1).
diff --git a/docs/articles/expensify-classic/domains/Domain-Migration.md b/docs/articles/expensify-classic/domains/Domain-Migration.md
new file mode 100644
index 000000000000..275146faf58d
--- /dev/null
+++ b/docs/articles/expensify-classic/domains/Domain-Migration.md
@@ -0,0 +1,45 @@
+---
+title: Domain Migration
+description: Change the email address and domain for all users in Expensify
+---
+
+If your business changes its email domain and needs to move everyone to new email addresses, you may be able to automatically migrate your Expensify accounts over to the new domain, or our team can help you manually complete the process. 
+
+{% include info.html %}
+If your company uses Expensify Cards, do not create your new domain or request Expensify cards on the new domain. The Expensify Team must complete the migration for you in this case. Message Concierge or your Account Manager to start the process.
+{% include end-info.html %}
+
+## Automatic Migration
+If certain conditions are met, Expensify can simply rename your domain. This means that your Domain settings will stay the same, but the name will change and all users will get a new email address as their primary login. Their old email address will remain on their account as a secondary login.
+
+If the answer to each of these questions is “yes,” we can automatically migrate your domain and users:
+
+- Is your current domain, or the new domain, verified?
+- Do the emails map 1:1 (i.e., name@olddomain.com becomes name@new.com and not firstname.lastename@new.com)?
+- Have your users refrained from creating Expensify accounts under their new email addresses?
+
+If all of these answers are “yes,” message Concierge to request a “Domain Migration.” This process will usually take a few business days. If you answered “no” for any of the questions, continue to the manual migration process below. 
+
+## Manual Migration
+If we can’t automatically migrate your domain, you can leverage your users to migrate everyone manually. 
+
+{% include info.html %}
+Follow the steps below in the exact order they are presented.
+{% include end-info.html %}
+
+1. Have all employees add their new email address as a [Secondary Login](https://help.expensify.com/articles/expensify-classic/settings/account-settings/Change-or-add-email-address) to their current account.
+2. [Claim and verify](https://help.expensify.com/articles/expensify-classic/domains/Claim-And-Verify-A-Domain) your new Domain.
+3. If you use [Domain Groups](https://help.expensify.com/articles/expensify-classic/domains/Create-A-Group) on your old domain, disable “Restrict Primary Login Selection” on all groups.
+4. Have each user switch their Primary and Secondary Login email addresses so the new email address is the primary login.
+5. Add any card feeds. If you need to move a commercial card feed, reach out to concierge@expensify.com, as we’ll need to do this for you. 
+
+{% include info.html %}
+Before completing this process, you must resolve any unprocessed transactions, as your cards will be unassigned from the previous domain and assigned to the new one. That means that any unprocessed transactions on the previous domain will be deleted when the cards are unassigned.
+{% include end-info.html %}
+
+6. Enter the transaction start date so that your transactions will not overlap with the previous import but will continue from the previous assignment.
+7. Reset your old domain to remove any domain restrictions:
+    - Remove all domain admins
+    - The last admin left will see a Reset button to click
+8. If your employees have already set up an additional account under the new email address, they will need to [merge their accounts](https://help.expensify.com/articles/expensify-classic/settings/account-settings/Merge-accounts).
+9. Set up your [domain groups](https://www.google.com/url?q=https://help.expensify.com/articles/expensify-classic/domains/Create-A-Group) on the new domain and add your users to the relevant group.
diff --git a/docs/articles/expensify-classic/expenses/Expense-Types.md b/docs/articles/expensify-classic/expenses/Expense-Types.md
index 9d19dbb4f9ba..faf670469362 100644
--- a/docs/articles/expensify-classic/expenses/Expense-Types.md
+++ b/docs/articles/expensify-classic/expenses/Expense-Types.md
@@ -3,42 +3,41 @@ title: Expense Types
 description: Details of the different Expense filters and Expense Types
 ---
 
-# Overview
-Expense types help categorize different expenses for better financial management. While reimbursable and non-reimbursable expenses are common, Expensify offers various other options to suit your needs. Let's explore the available expense types.
+## Organize a Report by Expense Type
+Organizing a report by expense type can make it easier to review expenses on a report.
 
-# How To
-## Filtering a Report by Expense Type
-Organizing a report by expense type can make it easier to review expenses on a report. 
-- Open the report you're interested in.
-- Click the **Details** icon in the upper right corner of the report,
-- Change the “View” to **Detailed** and “Split by” **Reimbursable** or **Billable**.
-- You’ll also see the option to **Group by Category** or **Tags**. 
+1. Open the desired report.
+2. Click Details in the upper right corner of the report.
+3. Click the View dropdown and select Detailed. 
+4. Click the Split by dropdown and select Reimbursable or Billable.
 
+To group the expenses by category or tag, you can also click the Group by dropdown and select Category or Tags.
 
-# Deep Dive
-Each report will show the total amount for all expenses in the upper right. Under that total, there will be a breakdown of amounts that are reimbursable, billable, and non-reimbursable (depending on which of those expense types exist on the report). 
+## Identify Expense Types
+The right side of every report provides the total for all the expenses. Under the total, there is a breakdown of reimbursable, billable, and non-reimbursable amounts (depending on the expense types that exist on the report).
 
-## Expense Types
-- **Reimbursable Expenses:** Employees pay for these expenses out of their pockets on behalf of the business and are usually reimbursed. They often come from cash, debit cards, or personal credit card purchases.
-- **Non-reimbursable Expenses:** The business directly covers these expenses, so there's no need to reimburse the employee. Typically, these expenses are company card expenses.
-- **Billable Expenses:** Business or employee expenses must be billed to a specific client or vendor. Choose this option if you need to track expenses for invoicing to customers, clients, or other departments.
-- **Per Diem Expenses:** These expenses involve a daily or partial daily rate you can configure in your expense Workspace.
-- **Time Expenses:** Employees or jobs are billed based on an hourly rate that you can set within Expensify.
-- **Distance Expenses:** These expenses are related to travel for work.
+- Reimbursable expenses: Expenses paid to the employee, including:
+    - Cash & personal card: Expenses paid for by the employee on behalf of the business.
+    - Per diem: Expenses for a daily or partial daily rate [configured in your Workspace](https://help.expensify.com/articles/expensify-classic/workspaces/Enable-per-diem-expenses).
+    - Time: An hourly rate for your employees or jobs as [set for your workspace](https://help.expensify.com/articles/expensify-classic/workspaces/Set-time-and-distance-rates). This expense type is usually used by contractors or small businesses billing the customer via [Expensify Invoicing](https://help.expensify.com/articles/expensify-classic/workspaces/Set-Up-Invoicing).
+    - Distance: Expenses related to business travel.
+- Non-reimbursable expenses: Expenses directly covered by the business, typically on company cards.
+- Billable expenses: Business or employee expenses that must be billed to a specific client or vendor. This option is for tracking expenses for invoicing to customers, clients, or other departments. Any kind of expense can be billable, in _addition_ to being either reimbursable or non-reimbursable.
+
+![Image of a report showing multiple expense totals]({{site.url}}/assets/images/amounts.png){:width="100%"}
 
 {% include faq-begin.md %}
 
-## What’s the difference between a receipt, an expense, and a report attachment?
+**What’s the difference between an expense, a receipt, and a report attachment?**
 
 - **Expense:** Created when you SmartScan or manually upload a receipt from a purchase.
-- **Receipt:** Automatically attached to the expense during the SmartScan process.
-- **Report Attachments:** Additional documents that need to be submitted to your approver (e.g., supplemental documents to the purchase) can be added to a report anytime by clicking the paperclip icon in the Reports Comments. 
+- **Receipt:** A picture file that is automatically attached to the expense during the SmartScan process.
+- **Report Attachments:** Additional documents that need to be submitted to your approver (e.g., supplemental documents to the purchase) can be added to a report any time by clicking the paperclip icon in the comments at the bottom of the report.
+
+**How are credits or refunds displayed in Expensify?**
 
-## How are credits or refunds displayed in Expensify?
-In Expensify, a credit is displayed as an expense with a minus (ex. -$1.00) in front of it. That’s because Expensify defaults all expenses as something that needs to be paid by the company. So a credit that is returned to the company is displayed as a negative expense. 
+In Expensify, a credit is displayed as an expense with a minus in front of it (e.g., -$1.00). Expensify defaults all expenses as something that needs to be paid by the company. So a credit that is returned to the company is displayed as a negative expense.
 
-If a report includes a credit or a refund expense, it will offset the total amount on the report. 
-For example, the report has two reimbursable expenses, $400 and $500. The total Reimbursable is $900. 
-Conversely, a -$400 and $500 will be a total Reimbursable amount of $500
+If a report includes a credit or a refund expense, it will offset the total amount on the report. For example, if the report has two reimbursable expenses, one for $400 and one for $500, then the total reimbursable amount is $900. Conversely, an expense for -$400 and one for $500 will be a total reimbursable amount of $500.
 
 {% include faq-end.md %}
diff --git a/docs/articles/expensify-classic/expenses/Merge-expenses.md b/docs/articles/expensify-classic/expenses/Merge-expenses.md
index 8b1f573a64b4..e78d035a3174 100644
--- a/docs/articles/expensify-classic/expenses/Merge-expenses.md
+++ b/docs/articles/expensify-classic/expenses/Merge-expenses.md
@@ -38,20 +38,46 @@ If the expenses exist on two different reports, you will be asked which report y
 
 # FAQs
 
-**Why can’t I merge expenses that are on my submitted report?**
-You cannot merge expenses that are on reports that have already been submitted. 
+**Helpful terminology**
 
-**Can I merge expenses that are under different accounts?**
-No, you cannot merge expenses across two separate accounts. 
+- SmartScanned: Any receipt where the data is automatically entered by Expensify. Expenses are SmartScanned by default unless a user stops the SmartScan and enters the details manually.
+- Credit card expense: Any transaction imported from a personal card, company card feed, or CSV.
+- “Cash” expense: Any expense that wasn't imported from a personal card, company card feed, or CSV. 
 
-**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.
+**How can the icons and receipt images help me diagnose my issue?**
+
+Look carefully at your expenses. Each expense has an icon that denotes where the expense came from:
+- Cash (banknotes) icon: Added manually or by SmartScanning an expense
+- Credit Card icon: Imported from a connected personal credit card
+- Spreadsheet icon: Imported from a personal CSV import
+- Locked Credit Card icon: Imported from a company card feed or CSV upload
+
+Ideally, your credit card expenses will all also have a SmartScanned receipt attached. If you are in the US and your admin has allowed eReceipts for low-value expenses, your expense may include the locked credit card icon and a QR code for the receipt image.
+
+![Image of different expenses]({{site.url}}/assets/images/Expenses.png){:width="100%"}
+
+If you see any other combination of icon and image, there is likely a duplicate expense and you will need to manually merge the expenses using the steps above.
 
 **Can Expensify automatically merge a cash expense with a credit card expense?**
-Yes, Expensify merges a cash expense with a credit card expense if the receipt is SmartScanned or forwarded to receipts@expensify.com. However, these expenses will not merge if:
-- The card expense added to your Expensify account is older than the receipt you’re trying to merge it with
-- The receipt is dated older than 7 days of the card expense date
-- Either expense date (the date the Expense was incurred, not the date it was added into Expensify) is older than 90 days
-- The transaction was imported with the Expensify API
 
-However, if a receipt does not automatically merge with the card entry, you can complete this process manually.
+Yes, when a card expense is imported that matches the date and amount for a SmartScanned expense, Expensify automatically merges the new expense into the existing SmartScanned expense, and the expense will now show a credit card icon. The same is true if a receipt is SmartScanned and the transaction has already been imported—it will merge as soon as the SmartScan is complete.
+
+When expenses merge automatically, Expensify uses the SmartScanned merchant name over the merchant data from the bank statement. If the SmartScan is stopped, Expensify can no longer guarantee that the data entry is accurate, so the expenses will not merge.
+
+{% include info.html %}
+Expenses created via the Expensify [Expense Importer API](https://integrations.expensify.com/Integration-Server/doc/#expense-creator) will not automatically merge with card feed transactions.
+{% include end-info.html %}
+
+**Why didn’t my expenses merge automatically?**
+
+Here are some possible reasons for receipt merge failures:
+- The cash receipt was not SmartScanned (manual override by the user)
+- The card expense has a different date than the cash expense
+- The expenses have different amounts (same currency)
+- The expense amounts are outside the FX 5% threshold (different currencies)
+- The expense date is older than 90 days (cash or card)
+- It’s a duplicate - the same receipt was added twice (and the other one merged)
+- The cash receipt was submitted as a reimbursable expense, and reimbursed/exported before the credit card transaction was imported
+- The credit card transaction and the receipt are not in the same Expensify user accounts
+
+Using the above instructions, you can manually merge any Unreported/Open cash receipt and card transaction in the same account. 
diff --git a/docs/articles/expensify-classic/expenses/Referral-Program.md b/docs/articles/expensify-classic/expenses/Referral-Program.md
deleted file mode 100644
index 24605dd17d3f..000000000000
--- a/docs/articles/expensify-classic/expenses/Referral-Program.md
+++ /dev/null
@@ -1,49 +0,0 @@
----
-title: Earn money with Expensify referrals
-description: Get paid with the Expensify referral program! Share your link, earn $250 per successful sign-up, and enjoy unlimited income potential. It’s that easy.
-redirect_from: articles/other/Referral-Program/
----
-<!-- The lines above are required by Jekyll to process the .md file -->
-
-# Earn money with Expensify referrals
-
-Picture this: You've found Expensify and it's transformed your approach to expense management and financial organization. You love it so much that you can't help but recommend it to friends, family, and colleagues. Wouldn’t it be nice if you could get rewarded just for spreading the word?
-
-With Expensify referrals, you can. Every time someone you invite to the platform signs up for a paid annual plan on Expensify, you’ll earn $250. Think of it as a thank-you gift from us to you!  
-
-## How to get paid for Expensify referrals
-
-Here are a few easy ways to get paid for Expensify friend referrals:
-
-- Submit an expense report to your boss (even just one receipt!)
-- Send an invoice to a client or customer
-- Share your referral link with a friend
-  - To find your referral link, open your Expensify mobile app and go to **Settings > Refer a friend, earn cash! > Share invite link**.
-
-**If the person you referred commits to an annual subscription with two or more active users and makes two monthly payments, you’ll get $250. Cha-ching!**
-
-## Who can you refer?
-
-You can refer anyone who might benefit from Expensify. Seriously. Anybody. 
-
-Know a small business owner? Refer them! An [accountant](https://use.expensify.com/accountants-program)? Refer them! A best friend from childhood who keeps losing paper receipts? Refer them! 
-
-Plus, you can [refer an unlimited amount of new users](https://use.expensify.com/blog/earn-50000-by-referring-your-friends-to-expensify/) with the Expensify referral program, so your earning potential is truly sky-high.
-
-## Common questions about Expensify benefits
-
-Still have questions about the Expensify referral program? We’ve got answers. Check out our FAQ below.
-
-### How will I know if I am the first person to refer someone to Expensify?
-
-You’ll know if you’re the first person to refer someone to Expensify if we reach out to let you know that they’ve successfully adopted Expensify and have paid for two months of an annual subscription. 
-
-Simply put, we check for the earliest recorded referrer of a member on the workspace, and if that’s you, then we’ll let you know.
-
-### My referral wasn’t counted! How can I appeal?
-
-If you think your Expensify friend referral wasn’t counted, please send a message to concierge@expensify.com with the email of the person you referred. Our team will review the referral and get back to you.
-
-## Share the Expensify love — and get paid in the process
-
-Who needs a side hustle when you have Expensify? With Expensify benefits, it’s not just about managing your expenses — it's about expanding your income too. Share your Expensify referral link now or send over an invoice to unlock unlimited earning potential.
diff --git a/docs/articles/expensify-classic/expensify-card/Admin-Card-Settings-and-Features.md b/docs/articles/expensify-classic/expensify-card/Admin-Card-Settings-and-Features.md
index 043cc4be1e26..b9938b058ef6 100644
--- a/docs/articles/expensify-classic/expensify-card/Admin-Card-Settings-and-Features.md
+++ b/docs/articles/expensify-classic/expensify-card/Admin-Card-Settings-and-Features.md
@@ -1,174 +1,134 @@
 ---
 title: Admin Card Settings and Features 
-description: An in-depth look into the Expensify Card program's admin controls and settings.
+description: A deep dive into the available controls and settings for the Expensify Card.
 ---
+# Expensify Visa® Commercial Card Overview
+The Expensify Visa® Commercial Card offers various settings to help admins manage expenses and card usage efficiently. Here’s how to use these features:
 
-# Overview
+## Smart Limits
+Smart Limits allow you to set custom spending limits for each Expensify cardholder or default limits for groups. Setting a Smart Limit activates an Expensify card for your user and issues a virtual card for immediate use.
 
-The Expensify Visa® Commercial Card offers a range of settings and functionality to customize how admins manage expenses and card usage in Expensify. To start, we'll lay out the best way to make these options work for you.
+#### Set Limits for Individual Cardholders
+As a Domain Admin, you can set or edit Custom Smart Limits for a card:
+1. Go to _**Settings > Domains > Domain Name > Company Cards**_.
+2. Click **Edit Limit** to set the limit.
 
-Set Smart Limits to control card spend. Smart Limits are spend limits that can be set for individual cards or specific groups. Once a given Smart Limit is reached, the card is temporarily disabled until expenses are approved.
+This limit restricts the amount of unapproved (unsubmitted and processing) expenses a cardholder can incur. Once the limit is reached, the cardholder cannot use their card until they submit outstanding expenses and have their card spend approved. If you set the Smart Limit to $0, the user’s card cannot be used.
 
-Monitor spend using your Domain Limit and the Reconciliation Dashboard.
-Your Domain Limit is the total Expensify Card limit across your entire organization. No member can spend more than what's available here, no matter what their individual Smart Limit is. A Domain Limit is dynamic and depends on a number of factors, which we'll explain below.
+#### Set Default Group Limits
+Domain Admins can set or edit custom Smart Limits for a domain group:
 
-Decide the settlement model that works best for your business
-Monthly settlement is when your Expensify Card balance is paid in full on a certain day each month. Though the Expensify Card is set to settle daily by default, any Domain Admin can change this setting to monthly. 
+1. Go to _**Settings > Domains > Domain Name > Groups**_.
+2. Click on the limit in-line for your chosen group and amend the value.
 
-Now, let's get into the mechanics of each piece mentioned above. 
+This limit applies to all members of the Domain Group who do not have an individual limit set via _**Settings > Domains > Domain Name > Company Cards**_.
 
-# How to set Smart Limits
-Smart Limits allow you to set a custom spend limit for each Expensify cardholder, or default limits for groups. Setting a Smart Limit is the step that activates an Expensify card for your user (and issues a virtual card for immediate use).
+#### Refreshing Smart Limits
+To let cardholders continue spending, you can approve their pending expenses via the Reconciliation tab. This frees up their limit, allowing them to use their card again.
 
-## Set limits for individual cardholders
-As a Domain Admin, you can set or edit Custom Smart Limits for a card by going to Settings > Domains > Domain Name > Company Cards. Simply click Edit Limit to set the limit. This limit will restrict the amount of unapproved (unsubmitted and Processing) expenses that a cardholder can incur. After the limit is reached, the cardholder won't be able to use their card until they submit outstanding expenses and have their card spend approved.  If you set the Smart Limit to $0, the user's card can't be used. 
-## Set default group limits
-Domain Admins can set or edit custom Smart Limits for a domain group by going to Settings > Domains > Domain Name > Groups. Just click on the limit in-line for your chosen group and amend the value.
+To check an unapproved card balance and approve expenses:
+1. Click on **Reconciliation** and enter a date range.
+2. Click on the Unapproved total to see what needs approval.
+3. You can add to a new report or approve an existing report from here.
 
-This limit will apply to all members of the Domain Group who do not have an individual limit set via Settings > Domains > Domain Name > Company Cards.
+You can also increase a Smart Limit at any time by clicking **Edit Limit**.
 
-## Refreshing Smart Limits
-To let cardholders keep spending, you can approve their pending expenses via the Reconciliation tab. This will free up their limit, allowing them to use their card again. 
+### Understanding Your Domain Limit
+To ensure you have the most accurate Domain Limit for your company, follow these steps:
 
-To check an unapproved card balance and approve expenses, click on Reconciliation and enter a date range, then click though the Unapproved total to see what needs approving. You can add to a new report or approve an existing report from here.
+1. **Connect Your Bank Account:** Go to _**Settings > Account > Payments > Add Verified Bank Account**_ and connect via Plaid.
 
-You can also increase a Smart Limit at any time by clicking Edit Limit.
+2. **Request a Custom Limit:** If your bank isn’t supported or you’re experiencing connection issues, you can request a custom limit at _**Settings > Domains > Domain Name > Company Cards > Request Limit Increase**_. Note that you’ll need to provide three months of unredacted bank statements for review by our risk management team.
 
-# Understanding your Domain Limit
+### Factors Affecting Your Domain Limit
+Your Domain Limit may fluctuate due to several factors:
 
-To get the most accurate Domain Limit for your company, connect your bank account via Plaid under Settings > Account > Payments > Add Verified Bank Account. 
+- **Available Funds in Your Verified Business Bank Account:** We regularly monitor balances via Plaid. A sudden decrease in balance within the last 24 hours may impact your limit. For accounts with 'sweep' functionality, maintain a sufficient balance even when sweeping daily.
 
-If your bank isn't supported or you're having connection issues, you can request a custom limit under Settings > Domains > Domain Name > Company Cards > Request Limit Increase. As a note, you'll need to provide three months of unredacted bank statements for review by our risk management team. 
+- **Pending Expenses:** Check the Reconciliation Dashboard for large pending expenses that could affect your available balance. Your Domain Limit automatically adjusts to include pending expenses.
 
-Your Domain Limit may fluctuate from time to time based on various factors, including:
+- **Processing Settlements:** Settlements typically take about three business days to process and clear. Multiple large settlements over consecutive days may affect your Domain Limit, which updates dynamically once settlements are cleared.
 
-- Available funds in your Verified Business Bank Account: We regularly check bank balances via Plaid. A sudden drop in balance within the last 24 hours may affect your limit. For 'sweep' accounts, be sure to maintain a substantial balance even if you're sweeping daily.
-- Pending expenses: Review the Reconciliation Dashboard to check for large pending expenses that may impact your available balance. Your Domain Limit will adjust automatically to include pending expenses.
-- Processing settlements: Settlements need about three business days to process and clear. Several large settlements over consecutive days may impact your Domain Limit, which will dynamically update when settlements have cleared.
+Please note: If your Domain Limit is reduced to $0, cardholders cannot make purchases, even if they have higher Smart Limits set on their individual cards.
 
-As a note, if your Domain Limit is reduced to $0, your cardholders can't make purchases even if they have a larger Smart Limit set on their individual cards.
+## Reconciling Expenses and Settlements
+Reconciling expenses ensures your financial records are accurate and up-to-date. Follow these steps to review and reconcile expenses associated with your Expensify Cards:
 
-# How to reconcile Expensify Cards
-## How to reconcile expenses
-Reconciling expenses is essential to ensuring your financial records are accurate and up-to-date. 
+#### How to Reconcile Expenses:
+1. Go to _**Settings > Domains > Domain Name > Company Cards > Reconciliation > Expenses**_.
+2. Enter your start and end dates, then click *Run*.
+3. The Imported Total will display all Expensify Card transactions for the period.
+4. You'll see a list of all Expensify Cards, the total spend on each card, and a snapshot of expenses that have been approved and have not been approved (Approved Total and Unapproved Total, respectively).
+5. Click on the amounts to view the associated expenses.
 
-Follow the steps below to quickly review and reconcile expenses associated with your Expensify Cards:
+#### How to Reconcile Settlements:
+A settlement is the payment to Expensify for purchases made using the Expensify Cards. The program can settle on either a daily or monthly basis. Note that not all transactions in a settlement will be approved when running reconciliation.
 
-1. Go to Settings > Domains > Domain Name > Company Cards > Reconciliation > Expenses
-2. Enter your start and end dates, then click Run
-3. The Imported Total will show all Expensify Card transactions for the period
-4. You'll also see a list of all Expensify Cards, the total spend on each card, and a snapshot of expenses that have and have not been approved (Approved Total and Unapproved Total, respectively)
-By clicking on the amounts, you can view the associated expenses 
+1. Log into the Expensify web app.
+2. Click _**Settings > Domains > Domain Name > Company Cards > Reconciliation > `Settlements**_.
+3. Use the Search function to generate a statement for the specific period you need.
 
+The search results will include the following info for each entry:
+- **Date:** When a purchase was made or funds were debited for payments.
+- **Posted Date:** When the purchase transaction is posted.
+- **Entry ID:** A unique number grouping card payments and transactions settled by those payments.
+- **Amount:** The amount debited from the Business Bank Account for payments.
+- **Merchant:** The business where a purchase was made.
+- **Card:** Refers to the Expensify Card number and cardholder’s email address.
+- **Business Account:** The business bank account connected to Expensify that the settlement is paid from.
+- **Transaction ID:** A special ID that helps Expensify support locate transactions if there’s an issue.
 
-## How to reconcile settlements
-A settlement is the payment to Expensify for the purchases made using the Expensify Cards. 
+Review the individual transactions (debits) and the payments (credits) that settled them. Each cardholder will have a virtual and a physical card listed, handled the same way for settlements, reconciliation, and exporting.
 
-The Expensify Card program can settle on either a daily or monthly basis. One thing to note is that not all transactions in a settlement will be approved when running reconciliation.
+4. Click **Download CSV** for reconciliation. This will list everything you see on the screen.
+5. To reconcile pre-authorizations, use the Transaction ID column in the CSV file to locate the original purchase.
+6. Review account payments: You’ll see payments made from the accounts listed under _**Settings > Account > Payments > Bank Accounts**_. Payment data won’t show for deleted accounts.
 
-You can view the Expensify Card settlements under Settings > Domains > Domain Name > Company Cards > Reconciliation > Settlements. 
+Use the Reconciliation Dashboard to confirm the status of expenses missing from your accounting system. It allows you to view both approved and unapproved expenses within your selected date range that haven’t been exported yet.
 
-By clicking each settlement amount, you can see the transactions contained in that specific payment amount. 
+### Set a Preferred Workspace
+Many customers find it helpful to separate their company card expenses from other types of expenses for easier coding. To do this, create a separate workspace specifically for card expenses.
 
-Follow the below steps to run reconciliation on the Expensify Card settlements:
+**Using a Preferred Workspace:** 
+Combine this feature with Scheduled Submit to automatically add new card expenses to reports connected to your card-specific workspace.
 
-1. Log into the Expensify web app
-2. Click Settings > Domains > Domain Name > Company Cards > Reconciliation tab > Settlements
-3. Use the Search function to generate a statement for the specific period you need
-4. The search results will include the following info for each entry:
-    - Date: when a purchase was made or funds were debited for payments
-    - Posted Date: when the purchase transaction posted
-    - Entry ID: a unique number grouping card payments and transactions settled by those payments
-    - Amount: the amount debited from the Business Bank Account for payments
-    - Merchant: the business where a purchase was made
-    - Card: refers to the Expensify Card number and cardholder's email address
-    - Business Account: the business bank account connected to Expensify that the settlement is paid from
-    - Transaction ID: a special ID that helps Expensify support locate transactions if there's an issue
+### Change the Settlement Account
+You can change your settlement account to any verified business bank account in Expensify. If your current bank account is closing, make sure to set up a replacement as soon as possible.
 
-5. Review the individual transactions (debits) and the payments (credits) that settled them
-6. Every cardholder will have a virtual and a physical card listed. They're handled the same way for settlements, reconciliation, and exporting.
-7. Click Download CSV for reconciliation
-8. This will list everything that you see on screen
-9. To reconcile pre-authorizations, you can use the Transaction ID column in the CSV file to locate the original purchase
-10. Review account payments
-11. You'll see payments made from the accounts listed under Settings > Account > Payments > Bank Accounts. Payment data won't show for deleted accounts. 
+#### Steps to Select a Different Settlement Account:
+1. Go to _**Settings > Domains > Domain Name > Company Cards > Settings**_ tab.
+2. Use the Expensify Card settlement account dropdown to select a new account.
+3. Click **Save**.
 
-You can use the Reconciliation Dashboard to confirm the status of expenses that are missing from your accounting system. It allows you to view both approved and unapproved expenses within your selected date range that haven't been exported yet.
+### Change the Settlement Frequency
+By default, Expensify Cards settle daily. However, you can switch to monthly settlements.
 
+#### Monthly Settlement Requirements:
+  - The settlement account must not have had a negative balance in the last 90 days.
+  - There will be an initial settlement for any outstanding spending before the switch.
+  - The settlement date going forward will be the date you switch (e.g., if you switch on September 15th, future settlements will be on the 15th of each month).
 
-# Deep dive
-## Set a preferred workspace
-Some customers choose to split their company card expenses from other expense types for coding purposes. Most commonly this is done by creating a separate workspace for card expenses. 
+#### Steps to Change the Settlement Frequency:
+1. Go to _**Settings > Domains > Domain Name > Company Cards > Settings**_ tab.
+2. Click the **Settlement Frequency** dropdown and select **Monthly**.
+3. Click **Save** to confirm the change.
 
-You can use the preferred workspace feature in conjunction with Scheduled Submit to make sure all newly imported card expenses are automatically added to reports connected to your card-specific workspace.
+### Declined Expensify Card Transactions
+If you have 'Receive real-time alerts' enabled, you'll get a notification explaining why a transaction was declined. To enable alerts:
+1. Open the mobile app.
+2. Click the three-bar icon in the upper-left corner.
+3. Go to Settings.
+4. Toggle 'Receive real-time alerts' on.
 
-## How to change your settlement account
-You can change your settlement account to any other verified business bank account in Expensify. If your bank account is closing, make sure you set up the replacement bank account in Expensify as early as possible. 
+If you or your employees notice any unfamiliar purchases or need a new card, go to _**Settings > Account > Credit Card Import**_ and click on **Request a New Card**.
 
-To select a different settlement account:
+#### Common Reasons for Declines:
+- **Insufficient Card Limit:** If a transaction exceeds your card's limit, it will be declined. Always check your balance under _**Settings > Account > Credit Card Import**_ on the web or mobile app. Approve pending expenses to free up your limit.
 
-1. Go to Settings > Domains > Domain Name > Company Cards > Settings tab
-2. Use the Expensify Card settlement account dropdown to select a new account
-3. Click Save
+- **Card Not Activated or Canceled:** Transactions won't process if the card hasn't been activated or has been canceled.
 
+- **Incorrect Card Information:** Entering incorrect card details, such as the CVC, ZIP, or expiration date, will lead to declines.
 
-## Change the settlement frequency
+- **Suspicious Activity:** Expensify may block transactions if unusual activity is detected. This could be due to irregular spending patterns, risky vendors, or multiple rapid transactions. Check your Expensify Home page to approve unusual merchants. If further review is needed, Expensify will perform a manual due diligence check and lock your cards temporarily.
 
-By default, the Expensify Cards settle on a daily cadence. However, you can choose to have the cards settle on a monthly basis.
-
-1. Monthly settlement is only available if the settlement account hasn't had a negative balance in the last 90 days
-2. There will be an initial settlement to settle any outstanding spend that happened before switching the settlement frequency 
-3. The date that the settlement is changed to monthly is the settlement date going forward (e.g. If you switch to monthly settlement on September 15th, Expensify Cards will settle on the 15th of each month going forward)
-
-To change the settlement frequency:
-1. Go to Settings > Domains > Domain Name > Company Cards > Settings tab
-2. Click the Settlement Frequency dropdown and select Monthly
-3. Click Save to confirm the change
-
-
-
-## Declined Expensify Card transactions 
-As long as you have 'Receive realtime alerts' enabled, you'll get a notification explaining the decline reason. You can enable alerts in the mobile app by clicking on three-bar icon in the upper-left corner > Settings > toggle Receive realtime alerts on. 
-
-If you ever notice any unfamiliar purchases or need a new card, go to Settings > Account > Credit Card Import and click on Request a New Card right away.
-
-Here are some reasons an Expensify Card transaction might be declined:
-
-1. You have an insufficient card limit
-    - If a transaction amount exceeds the available limit on your Expensify Card, the transaction will be declined. It's essential to be aware of the available balance before making a purchase to avoid this - you can see the balance under Settings > Account > Credit Card Import on the web app or mobile app. Submitting expenses and having them approved will free up your limit for more spend.
-
-2. Your card hasn't been activated yet, or has been canceled
-    - If the card has been canceled or not yet activated, it won't process any transactions. 
-
-3. Your card information was entered incorrectly. Entering incorrect card information, such as the CVC, ZIP or expiration date will also lead to declines.
-
-4. There was suspicious activity
-    - If Expensify detects unusual or suspicious activity, we may block transactions as a security measure. This could happen due to irregular spending patterns, attempted purchases from risky vendors, or multiple rapid transactions. Check your Expensify Home page to approve unsual merchants and try again.
-    If the spending looks suspicious, we may do a manual due diligence check, and our team will do this as quickly as possible - your cards will all be locked while this happens.  
-5. The merchant is located in a restricted country
-    - Some countries may be off-limits for transactions. If a merchant or their headquarters (billing address) are physically located in one of these countries, Expensify Card purchases will be declined. This list may change at any time, so be sure to check back frequently: Belarus, Burundi, Cambodia, Central African Republic, Democratic Republic of the Congo, Cuba, Iran, Iraq, North Korea, Lebanon, Libya, Russia, Somalia, South Sudan, Syrian Arab Republic, Tanzania, Ukraine, Venezuela, Yemen, and Zimbabwe.
-
-{% include faq-begin.md %} 
-## What happens when I reject an Expensify Card expense?
-Rejecting an Expensify Card expense from an Expensify report will simply allow it to be reported on a different report. 
-
-If an Expensify Card expense needs to be rejected, you can reject the report or the specific expense so it can be added to a different report. The rejected expense will become Unreported and return to the submitter's Expenses page.
-
-If you want to dispute a card charge, please message Concierge to start the dispute process.
-
-If your employee has accidentally made an unauthorised purchase, you will need to work that out with the employee to determine how they will pay back your company.
-
-
-## What happens when an Expensify Card transaction is refunded?
-
-
-The way a refund is displayed in Expensify depends on the status of the expense (pending or posted) and whether or not the employee also submitted an accompanying SmartScanned receipt. Remember, a SmartScanned receipt will auto-merge with the Expensify Card expense.
-
-- Full refunds:
-If a transaction is pending and doesn't have a receipt attached (except for eReceipts), getting a full refund will make the transaction disappear.
-If a transaction is pending and has a receipt attached (excluding eReceipts), a full refund will zero-out the transaction (amount becomes zero).
-- Partial refunds:
-If a transaction is pending, a partial refund will reduce the amount of the transaction.
-- If a transaction is posted, a partial refund will create a negative transaction for the refund amount.
-
-{% include faq-end.md %}
+- **Merchant in a Restricted Country:** Transactions will be declined if the merchant is in a restricted country. 
diff --git a/docs/articles/expensify-classic/expensify-card/Auto-Reconciliation.md b/docs/articles/expensify-classic/expensify-card/Auto-Reconciliation.md
deleted file mode 100644
index fb84e3484598..000000000000
--- a/docs/articles/expensify-classic/expensify-card/Auto-Reconciliation.md
+++ /dev/null
@@ -1,213 +0,0 @@
----
-title: Expensify Card Auto-Reconciliation
-description: Everything you need to know about Expensify Card Auto-Reconciliation
----
-<!-- The lines above are required by Jekyll to process the .md file -->
-
-# Overview
-If your company uses the Expensify Visa® Commercial Card, and connects to a direct accounting integration, you can auto-reconcile card spending each month.
-
-The integrations that auto-reconciliation are available on are:
-
-- QuickBooks Online
-- Xero
-- NetSuite
-- Sage Intacct
-
-# How-to Set Up Expensify Card Auto-Reconciliation
-
-## Auto-Reconciliation Prerequisites
-
-- Connection: 
-1. A Preferred Workspace is set. 
-2. A Reconciliation Account is set and matches the Expensify Card settlement account.
-- Automation: 
-1. Auto-Sync is enabled on the Preferred Workspace above.
-2. Scheduled Submit is enabled on the Preferred Workspace above.
-- User: 
-1. A Domain Admin is set as the Preferred Workspace’s Preferred Exporter.
-
-To set up your auto-reconciliation account with the Expensify Card, follow these steps:
-1. Navigate to your Settings.
-2. Choose "Domains," then select your specific domain name.
-3. Click on "Company Cards."
-4. From the dropdown menu, pick the Expensify Card.
-5. Head to the "Settings" tab.
-6. Select the account in your accounting solution that you want to use for reconciliation. Make sure this account matches the settlement business bank account.
-
-![Company Card Settings section](https://help.expensify.com/assets/images/Auto-Reconciliaton_Image1.png){:width="100%"}
-
-That's it! You've successfully set up your auto-reconciliation account.
-
-## How does Auto-Reconciliation work
-Once Auto-Reconciliation is enabled, there are a few things that happen. Let’s go over those! 
-
-### Handling Purchases and Card Balance Payments
-**What happens**: When an Expensify Card is used to make purchases, the amount spent is automatically deducted from your company’s 'Settlement Account' (your business checking account). This deduction happens on a daily or monthly basis, depending on your chosen settlement frequency. Don't worry; this settlement account is pre-defined when you apply for the Expensify Card, and you can't accidentally change it.
-**Accounting treatment**: After your card balance is settled each day, we update your accounting system with a journal entry. This entry credits your bank account (referred to as the GL account) and debits the Expensify Card Clearing Account. To ensure accuracy, please make sure that the 'bank account' in your Expensify Card settings matches your real-life settlement account. You can easily verify this by navigating to **Settings > Account > Payments**, where you'll see 'Settlement Account' next to your business bank account. To keep track of settlement figures by date, use the Company Card Reconciliation Dashboard's Settlements tab:
-
-![Company Card Reconciliation Dashboard](https://help.expensify.com/assets/images/Auto-Reconciliation_Image2.png){:width="100%"}
-
-### Submitting, Approving, and Exporting Expenses
-**What happens**: Users submit their expenses on a report, which might occur after some time has passed since the initial purchase. Once the report is approved, it's then exported to your accounting software.
-**Accounting treatment**: When the report is exported, we create a journal entry in your accounting system. This entry credits the Clearing Account and debits the Liability Account for the purchase amount. The Liability Account functions as a bank account in your ledger, specifically for Expensify Card expenses.
-
-# Deep Dive
-## QuickBooks Online
-
-### Initial Setup
-1. Start by accessing your group workspace linked to QuickBooks Online. On the Export tab, make sure that the user chosen as the Preferred Exporter holds the role of a Workspace Admin and has an email address associated with your Expensify Cards' domain. For instance, if your domain is company.com, the Preferred Exporter's email should be email@company.com.
-2. Head over to the Advanced tab and ensure that Auto-Sync is enabled.
-3. Now, navigate to **Settings > Domains > *Domain Name* > Company Cards > Settings**. Use the dropdown menu next to "Preferred Workspace" to select the group workspace connected to QuickBooks Online and with Scheduled Submit enabled.
-4. In the dropdown menu next to "Expensify Card reconciliation account," choose your existing QuickBooks Online bank account for reconciliation. This should be the same account you use for Expensify Card settlements.
-5. In the dropdown menu next to "Expensify Card settlement account," select your business bank account used for settlements (found in Expensify under **Settings > Account > Payments**).
-
-### How This Works
-1. On the day of your first card settlement, we'll create the Expensify Card Liability account in your QuickBooks Online general ledger. If you've opted for Daily Settlement, we'll also create an Expensify Clearing Account.
-2. During your QuickBooks Online auto-sync on that same day, if there are unsettled transactions, we'll generate a journal entry totaling all posted transactions since the last settlement. This entry will credit the selected bank account and debit the new Expensify Clearing Account (for Daily Settlement) or the Expensify Liability Account (for Monthly Settlement).
-3. Once the transactions are posted and the expense report is approved in Expensify, the report will be exported to QuickBooks Online with each line as individual card expenses. For Daily Settlement, an additional journal entry will credit the Expensify Clearing Account and debit the Expensify Card Liability Account. For Monthly Settlement, the journal entry will credit the Liability account directly and debit the appropriate expense categories.
-
-### Example
-- We have card transactions for the day totaling $100, so we create the following journal entry upon sync:
-![QBO Journal Entry](https://help.expensify.com/assets/images/Auto-Reconciliation QBO 1.png){:width="100%"}
-- The current balance of the Expensify Clearing Account is now $100:
-![QBO Clearing Account](https://help.expensify.com/assets/images/Auto-reconciliation QBO 2.png){:width="100%"}
-- After transactions are posted in Expensify and the report is approved and exported, a second journal entry is generated:
-![QBO Second Journal Entry](https://help.expensify.com/assets/images/Auto-reconciliation QBO 3.png){:width="100%"}
-- We reconcile the matching amounts automatically, clearing the balance of the Expensify Clearing Account:
-![QBO Clearing Account 2](https://help.expensify.com/assets/images/Auto-reconciliation QBO 4.png){:width="100%"}
-- Now, you'll have a debit on your credit card account (increasing the total spent) and a credit on the bank account (reducing the available amount). The Clearing Account balance is $0.
-- Each expense will also create a credit card expense, similar to how we do it today, exported upon final approval. This action debits the expense account (category) and includes any other line item data.
-- This process occurs daily during the QuickBooks Online Auto-Sync to ensure your card remains reconciled.
-
-**Note:** If Auto-Reconciliation is disabled for your company's Expensify Cards, a Domain Admin can set an export account for individual cards via **Settings > Domains > *Domain Name* > Company Cards > Edit Exports**. The Expensify Card transactions will always export as Credit Card charges in your accounting software, even if the non-reimbursable setting is configured differently, such as a Vendor Bill.
-
-## Xero 
-
-### Initial Setup
-1. Begin by accessing your group workspace linked to Xero. On the Export tab, ensure that the Preferred Exporter is a Workspace Admin with an email address from your Expensify Cards domain (e.g. company.com).
-2. Head to the Advanced tab and confirm that Auto-Sync is enabled.
-3. Now, go to **Settings > Domains > *Domain Name* > Company Cards > Settings**. From the dropdown menu next to "Preferred Workspace," select the group workspace connected to Xero with Scheduled Submit enabled.
-4. In the dropdown menu for "Expensify Card settlement account," pick your settlement business bank account (found in Expensify under **Settings > Account > Payments**).
-5. In the dropdown menu for "Expensify Card reconciliation account," select the corresponding GL account from Xero for your settlement business bank account from step 4.
-
-### How This Works
-1. During the first overnight Auto Sync after enabling Continuous Reconciliation, Expensify will create a Liability Account (Bank Account) on your Xero Dashboard. If you've opted for Daily Settlement, an additional Clearing Account will be created in your General Ledger. Two Contacts —Expensify and Expensify Card— will also be generated:
-![Xero Contacts](https://help.expensify.com/assets/images/Auto-reconciliation Xero 1.png){:width="100%"}
-2. The bank account for Expensify Card transactions is tied to the Liability Account Expensify created. Note that this doesn't apply to other cards or non-reimbursable expenses, which follow your workspace settings.
-
-### Daily Settlement Reconciliation
-- If you've selected Daily Settlement, Expensify uses entries in the Clearing Account to reconcile the daily settlement. This is because Expensify bills on posted transactions, which you can review via **Settings > Domains > *Domain Name* > Company Cards > Reconciliation > Settlements**.
-- At the end of each day (or month on your settlement date), the settlement charge posts to your Business Bank Account. Expensify assigns the Clearing Account (or Liability Account for monthly settlement) as a Category to the transaction, posting it in your GL. The charge is successfully reconciled.
-
-### Bank Transaction Reconciliation
-- Expensify will pay off the Liability Account with the Clearing Account balance and reconcile bank transaction entries to the Liability Account with your Expense Accounts.
-- When transactions are approved and exported from Expensify, bank transactions (Receive Money) are added to the Liability Account, and coded to the Clearing Account. Simultaneously, Spend Money transactions are created and coded to the Category field. If you see many Credit Card Misc. entries, add commonly used merchants as Contacts in Xero to export with the original merchant name.
-- The Clearing Account balance is reduced, paying off the entries to the Liability Account created in Step 1. Each payment to and from the Liability Account should have a corresponding bank transaction referencing an expense account. Liability Account Receive Money payments appear with "EXPCARD-APPROVAL" and the corresponding Report ID from Expensify.
-- You can run a Bank Reconciliation Summary displaying entries in the Liability Account referencing individual payments, as well as entries that reduce the Clearing Account balance to unapproved expenses.
-- **Important**: To bring your Liability Account balance to 0, enable marking transactions as reconciled in Xero. When a Spend Money bank transaction in the Liability Account has a matching Receive Transaction, you can mark both as Reconciled using the provided hyperlink.
-
-**Note**: If Auto-Reconciliation is disabled for your company's Expensify Cards, a Domain Admin can set an export account for individual cards via **Settings > Domains > *Domain Name* > Company Cards > Edit Exports**. The Expensify Card transactions will always export as a Credit Card charge in your accounting software, regardless of the non-reimbursable setting in their accounting configuration.
-
-## NetSuite
-
-### Initial Setup
-1. Start by accessing your group workspace connected to NetSuite and click on "Configure" under **Connections > NetSuite**.
-2. On the Export tab, ensure that the Preferred Exporter is a Workspace Admin with an email address from your Expensify Cards' domain. For example, if your domain is company.com, the Preferred Exporter's email should be email@company.com.
-3. Head over to the Advanced tab and make sure Auto-Sync is enabled.
-4. Now, go to **Settings > Domains > *Domain Name* > Company Cards > Settings**. From the dropdown menu next to "Preferred Workspace," select the group workspace connected to NetSuite with Scheduled Submit enabled.
-5. In the dropdown menu next to "Expensify Card reconciliation account," choose your existing NetSuite bank account used for reconciliation. This account must match the one set in Step 3.
-6. In the dropdown menu next to "Expensify Card settlement account," select your daily settlement business bank account (found in Expensify under **Settings > Account > Payments**).
-
-### How This Works with Daily Settlement
-1. After setting up the card and running the first auto-sync, we'll create the Expensify Card Liability account and the Expensify Clearing Account within your NetSuite subsidiary general ledger.
-2. During the same sync, if there are newly posted transactions, we'll create a journal entry totaling all posted transactions for the day. This entry will credit the selected bank account and debit the new Expensify Clearing account.
-3. Once transactions are approved in Expensify, the report will be exported to NetSuite, with each line recorded as individual credit card expenses. Additionally, another journal entry will be generated, crediting the Expensify Clearing Account and debiting the Expensify Card Liability account.
-
-### How This Works with Monthly Settlement
-1. After the first monthly settlement, during Auto-Sync, Expensify creates a Liability Account in NetSuite (without a clearing account).
-2. Each time the monthly settlement occurs, Expensify calculates the total purchase amount since the last settlement and creates a Journal Entry that credits the settlement bank account (GL Account) and debits the Expensify Liability Account in NetSuite.
-3. As expenses are approved and exported to NetSuite, Expensify credits the Liability Account and debits the correct expense categories.
-
-**Note**: By default, the Journal Entries created by Expensify are set to the approval level "Approved for posting," so they will automatically credit and debit the appropriate accounts. If you have "Require approval on Journal Entries" enabled in your accounting preferences in NetSuite (**Setup > Accounting > Accounting Preferences**), this will override that default. Additionally, if you have set up Custom Workflows (**Customization > Workflow**), these can also override the default. In these cases, the Journal Entries created by Expensify will post as "Pending approval." You will need to approve these Journal Entries manually to complete the reconciliation process.
-
-### Example
-- Let's say you have card transactions totaling $100 for the day.
-- We create a journal entry:
-![NetSuite Journal Entry](https://help.expensify.com/assets/images/Auto-reconciliation NS 1.png){:width="100%"}
-- After transactions are posted in Expensify, we create the second Journal Entry(ies):
-![NetSuite Second Journal Entry](https://help.expensify.com/assets/images/Auto-reconciliation NS 2.png){:width="100%"}
-- We then reconcile the matching amounts automatically, clearing the balance of the Expensify Clearing Account.
-- Now, you'll have a debit on your Credit Card account (increasing the total spent) and a credit on the bank account (reducing the amount available). The clearing account has a $0 balance.
-- Each expense will also create a Journal Entry, just as we do today, exported upon final approval. This entry will debit the expense account (category) and contain any other line item data.
-- This process happens daily during the NetSuite Auto-Sync to keep your card reconciled.
-
-**Note**: Currently, only Journal Entry export is supported for auto-reconciliation. You can set other export options for all other non-reimbursable spend in the **Configure > Export** tab. Be on the lookout for Expense Report export in the future!
-
-If Auto-Reconciliation is disabled for your company's Expensify Cards, a Domain Admin can set an export account for individual Expensify Cards via **Settings > Domains > Company Cards > Edit Exports**. The Expensify Card transactions will always export as a Credit Card charge in your accounting software, regardless of the non-reimbursable setting in their accounting configuration.
-
-## Sage Intacct 
-
-### Initial Setup
-1. Start by accessing your group workspace connected to Sage Intacct and click on "Configure" under **Connections > Sage Intacct**.
-2. On the Export tab, ensure that you've selected a specific entity. To enable Expensify to create the liability account, syncing at the entity level is crucial, especially for multi-entity environments.
-3. Still on the Export tab, confirm that the user chosen as the Preferred Exporter is a Workspace Admin, and their email address belongs to the domain used for Expensify Cards. For instance, if your domain is company.com, the Preferred Exporter's email should be email@company.com.
-4. Head over to the Advanced tab and make sure Auto-Sync is enabled.
-5. Now, go to **Settings > Domains > *Domain Name* > Company Cards > Settings**. From the dropdown menu next to "Preferred Workspace," select the group workspace connected to Sage Intacct with Scheduled Submit enabled.
-6. In the dropdown menu next to "Expensify Card reconciliation account" pick your existing Sage Intacct bank account used for daily settlement. This account must match the one set in the next step.
-7. In the dropdown menu next to "Expensify Card settlement account" select your daily settlement business bank account (found in Expensify under **Settings > Account > Payments**).
-8. Use the dropdown menus to select your cash-only and accrual-only journals. If your organization operates on a cash-only or accrual-only basis, choose "No Selection" for the journals as needed. If your organization uses both cash and accrual methods, please select both a cash-only and an accrual-only journal. Don't forget to save your settings!
-
-### How This Works with Daily Settlement
-1. After setting up the card and running the first auto-sync, we'll create the Expensify Card Expensify Clearing Account within your Sage Intacct general ledger. Once the first card transaction is exported, we'll create a Liability Account.
-2. In the same sync, if there are newly posted transactions from your Expensify Cards, we'll then create a journal entry totaling all posted transactions for the day. This entry will credit the business bank account (set in Step 4 above) and debit the new Expensify Clearing account.
-3. Once Expensify Card transactions are approved in Expensify, the report will be exported to Sage Intacct, with each line recorded as individual credit card expenses. Additionally, another journal entry will be generated, crediting the Expensify Clearing Account and debiting the Expensify Card Liability Account.
-
-### How This Works with Monthly Settlement
-1. After the initial export of a card transaction, Expensify establishes a Liability Account in Intacct (without a clearing account).
-2. Each time a monthly settlement occurs, Expensify calculates the total purchase amount since the last settlement and creates a Journal Entry. This entry credits the settlement bank account (GL Account) and debits the Expensify Liability Account in Intacct.
-3. As expenses are approved and exported to Intacct, Expensify credits the Liability Account and debits the appropriate expense categories.
-
-{% include faq-begin.md %}
-
-## What are the timeframes for auto-reconciliation in Expensify?
-We offer either daily or monthly auto-reconciliation: 
-- Daily Settlement: each day, as purchases are made on your Expensify Cards, the posted balance is withdrawn from your Expensify Card Settlement Account (your business bank account).
-- Monthly Settlement: each month, on the day of the month that you enabled Expensify Cards (or switched from Daily to Monthly Settlement), the posted balance of all purchases since the last settlement payment is withdrawn from your Expensify Card Settlement Account (your business bank account).
-
-## Why is my Expensify Card auto-reconciliation not working with Xero?
-When initially creating the Liability and Bank accounts to complete the auto-reconciliation process, we rely on the system to match and recognize those accounts created. You can't make any changes or we will not “find” those accounts.
-
-If you have changed the accounts. It's an easy fix, just rename them!
-- Internal Account Code: must be **ExpCardLbl**
-- Account Type: must be **Bank**
-
-## My accounting integration is not syncing. How will this affect the Expensify Card auto-reconciliation?
-When you receive a message that your accounting solution’s connection failed to sync, you will also receive an email or error message with the steps to correct the sync issue. If you do not, please contact Support for help. When your accounting solution’s sync reconnects and is successful, your auto-reconciliation will resume.
-
-If your company doesn't have auto-reconciliation enabled for its Expensify Cards, you can still set up individual export accounts. Here's how:
-
-1. Make sure you have Domain Admin privileges.
-2. Navigate to **Settings > Domains**
-3. Select 'Company Cards'
-4. Find the Expensify Card you want to configure and choose 'Edit Exports.'
-5. Pick the export account where you want the Expensify Card transactions to be recorded.
-6. Please note that these transactions will always be exported as Credit Card charges in your accounting software. This remains the case even if you've configured non-reimbursable settings as something else, such as a Vendor Bill.
-
-These simple steps will ensure your Expensify Card transactions are correctly exported to the designated account in your accounting software.
-
-## Why does my Expensify Card Liability Account have a balance?
-If you’re using the Expensify Card with auto-reconciliation, your Expensify Card Liability Account balance should always be $0 in your accounting system.
-
-If you see that your Expensify Card Liability Account balance isn’t $0, then you’ll need to take action to return that balance to $0. 
-
-If you were using Expensify Cards before auto-reconciliation was enabled for your accounting system, then any expenses that occurred prior will not be cleared from the Liability Account.
-You will need to prepare a manual journal entry for the approved amount to bring the balance to $0.
-
-To address this, please follow these steps:
-1. Identify the earliest date of a transaction entry in the Liability Account that doesn't have a corresponding entry. Remember that each expense will typically have both a positive and a negative entry in the Liability Account, balancing out to $0.
-2. Go to the General Ledger (GL) account where your daily Expensify Card settlement withdrawals are recorded, and locate entries for the dates identified in Step 1.
-3. Adjust each settlement entry so that it now posts to the Clearing Account.
-4. Create a Journal Entry or Receive Money Transaction to clear the balance in the Liability Account using the funds currently held in the Clearing Account, which was set up in Step 2. 
-
-{% include faq-end.md %}
diff --git a/docs/articles/expensify-classic/expensify-card/Cardholder-Settings-and-Features.md b/docs/articles/expensify-classic/expensify-card/Cardholder-Settings-and-Features.md
index f24ed57dc655..38686462a1c2 100644
--- a/docs/articles/expensify-classic/expensify-card/Cardholder-Settings-and-Features.md
+++ b/docs/articles/expensify-classic/expensify-card/Cardholder-Settings-and-Features.md
@@ -3,78 +3,55 @@ title:  Cardholder Settings and Features
 description: Expensify Card Settings for Employees
 ---
 
-# How to use your Expensify Visa® Commercial Card
-Once you receive your card, you can start using it right away. 
+# Using Your Expensify Visa® Commercial Card
 
-First, you'll want to take note of the Smart Limit tied to your card – this is listed in your card settings via **Settings > Account > Credit Card Import**. This limit represents the total amount of unapproved expenses you can have on the card.
+### Activate Your Card
+You can start using your card immediately upon receipt by logging into your Expensify account, heading to your Home tab, and following the prompts on the _**Activate your Expensify Card**_ task. 
 
-It's crucial to continuously submit your expenses promptly, as that'll ensure they can be approved and restore your full limit. You can always chat with your admin if you need your limit adjusted.
+### Review your Card's Smart Limit
+Check your card’s Smart Limit via  _**Settings > Account > Credit Card Import**_: 
+- This limit is the total amount of unapproved expenses you can have on the card.
+- If a purchase is more than your card's Smart Limit, it will be declined. 
 
-You can swipe your Expensify Card like you would with any other card. As you make purchases, you'll get instant alerts on your phone letting you know if you need to SmartScan receipts. Any SmartScanned receipts should merge with the card expense automatically.
+## Managing Expenses
+- **Submit Expenses Promptly**: Submit your expenses regularly to restore your full limit. Contact your admin if you need a limit adjustment.
+- **Using Your Card**: Swipe your Expensify Card like any other card. You’ll receive instant alerts on your phone for SmartScan receipts. SmartScanned receipts will merge automatically with card expenses.
+- **eReceipts**: If your organization doesn’t require itemized receipts, Expensify will generate IRS-compliant eReceipts for all non-lodging transactions.
+- **Reporting Expenses**: Report and submit Expensify Card expenses as usual. Approved expenses refresh your Smart Limit.
 
-If your organization doesn't require itemized receipts, you can rely on eReceipts instead. As long as the expense isn't lodging-related, Expensify will automatically generate an IRS-compliant eReceipt for every transaction.
+## Enabling Notifications
+Download the Expensify mobile app and enable push notifications to stay updated on spending activity and potential fraud.
 
-You can report and submit Expensify Card expenses just like any other expenses. As they're approved, your Smart Limit will be refreshed accordingly, allowing you to keep making purchases.
+#### For iPhone:
+1. Open the Expensify app and tap the three-bar icon in the upper-left corner.
+2. Tap _**Settings > enable Receive real-time alerts**_.
+3. Accept the confirmation to access your iPhone’s notification settings for Expensify.
+4. Turn on **Allow Notifications** and select your notification types.
 
-## Enable Notifications
-Download the Expensify mobile app and enable push notifications to stay current on your spending activity. Your card is connected to your Expensify account, so each transaction on your card will trigger a push notification. We'll also send you a push notification if we detect potentially fraudulent activity and allow you to confirm your purchase. 
-
-Follow the steps below to enable real-time alerts on your mobile device.
-
-**If you have an iPhone**:
-1. Open the Expensify app and tap the three-bar icon in the upper-left corner
-2. Tap **Settings** and enable **Receive realtime alerts**
-3. Accept the confirmation dialogue to go to your iPhone's notification settings for Expensify. Turn on Allow Notifications, and choose the notification types you’d like!
-
-**If you have an Android**:
-1. Go to Settings and open 'Apps and Notifications'.
+#### For Android:
+1. Go to _**Settings > Apps and Notifications**_.
 2. Find and open Expensify and enable notifications.
-3. Customize your alerts. Depending on your phone model, you may have extra options to customize the types of notifications you receive.
-
-## Your virtual card
-Once you're assigned a limit, you'll be able to use your virtual card immediately. You can view your virtual card details via **Settings > Account > Credit Card Import > Show Details**. Keep in mind that your virtual card and physical card share a limit.
-
-The virtual Expensify Card includes a card number, expiration date, and security code (CVC). You can use the virtual card for online purchases, in-app transactions, and in-person payments once it's linked to a mobile wallet (Apple Pay or Google Pay).
-
-## How to access your virtual card details
-Here's how to access your virtual card details via the Expensify mobile app:
-1. Tap the three-bar icon in the upper-left corner 
-2. Tap **Settings > Connected Cards**
-3. Under **Virtual Card**, tap **Show Details**
-
-From there, you can view your virtual card's number, CVV, expiration date, and billing address. 
-
-Here's how to access your virtual card details via the Expensify web app:
-1. Head to **Settings > Account > Credit Card Import**
-2. Under **Virtual Card**, click **Show Details**
-
-From there, you can view your virtual card's card number, CVV, expiration date, and billing address.
-
-## How to add your virtual card to a digital wallet (Apple Pay or Google Pay)
-
-To use the Expensify Card for contactless payment, add it to your digital wallet from the mobile app:
-1. Tap the three-bar icon in the upper-left corner 
-2. Tap **Settings > Connected Cards**
-3. Depending on your device, tap **Add to Apple Wallet** or **Add to Gpay** 
-4. Complete the remaining steps
-
-## Expensify Card declines
-As long as you've enabled 'Receive real-time alerts', you'll get a notification explaining the reason for each decline. You can enable alerts in the mobile app by clicking on the three-bar icon in the upper-left corner > **Settings** > toggle **Receive real-time alerts**. 
-
-Here are some reasons an Expensify Card transaction might be declined:
-
-- You have an insufficient card limit
-     - If a transaction exceeds your Expensify Card's available limit, the transaction will be declined. You can see the remaining limit in the mobile app under **Settings > Connected Cards** or in the web app under **Settings > Account > Credit Card Import**. 
-     - Submitting expenses and getting them approved will free up your limit for more spending.
-
-- Your card isn't active yet or it was disabled by your Domain Admin
-- Your card information was entered incorrectly with the merchant. Entering incorrect card information, such as the CVC, ZIP, or expiration date, will also lead to declines. 
-There was suspicious activity
-- If Expensify detects unusual or suspicious activity, we may block transactions as a security measure
-     - This could happen due to irregular spending patterns, attempted purchases from risky vendors, or multiple rapid transactions. 
-     - Check your Expensify Home page to approve unusual merchants and try again.
-     - If the spending looks suspicious, we may complete a manual due diligence check, and our team will do this as quickly as possible - your cards will all be locked while this happens.  
-- The merchant is located in a restricted country
+3. Customize your alerts based on your phone model.
+
+## Using Your Virtual Card
+- **Access Details**: You can view your virtual card details (card number, expiration date, CVC) via _**Settings > Account > Credit Card Import > Show Details**_. The virtual and physical cards share the same limit.
+- **Purchases**: Use the virtual card for online, in-app, and in-person payments when linked to a mobile wallet (Apple Pay or Google Pay).
+
+#### Adding to a Digital Wallet
+To add your Expensify Card to a digital wallet, follow the steps below:
+  1. Tap the three-bar icon in the upper-left corner.
+  2. Tap _**Settings > Connected Cards**_.
+  3. Tap **Add to Apple Wallet** or **Add to Gpay**, depending on your device.
+  4. Complete the steps as prompted.
+
+## Handling Declines
+- **Real-Time Alerts**: Enable real-time alerts in the mobile app (_**Settings > toggle Receive real-time alerts**_) to get notifications for declines.
+- **Common Decline Reasons**:
+  - **Insufficient Limit**: Transactions exceeding the available limit will be declined. You can check your limit in _**Settings > Connected Cards**_ or _**Settings > Account > Credit Card Import**_.
+  - **Inactive or Disabled Card**: Ensure your card is active and not disabled by your Domain Admin.
+  - **Incorrect Information**: Entering incorrect card details (CVC, ZIP, expiration date) will result in declines.
+  - **Suspicious Activity**: Transactions may be blocked for unusual or suspicious activity. Check the Expensify Home page to approve unusual merchants. Suspicious spending may prompt a manual due diligence check, during which your cards will be locked.
+  - **Restricted Country**: Transactions from restricted countries will be declined.
 
 {% include faq-begin.md %}
 ## Can I use Smart Limits with a free Expensify account? 
diff --git a/docs/articles/expensify-classic/expensify-card/Change-Expensify-Card-limit.md b/docs/articles/expensify-classic/expensify-card/Change-Expensify-Card-limit.md
new file mode 100644
index 000000000000..81ce761f84f4
--- /dev/null
+++ b/docs/articles/expensify-classic/expensify-card/Change-Expensify-Card-limit.md
@@ -0,0 +1,25 @@
+---
+title: Change Expensify Card limit
+description: Increase or decrease the limit for an Expensify Card or for a group
+---
+<div id="expensify-classic" markdown="1">
+
+You can set Expensify Card limits for each group in your organization, or you can set the limit per card.
+
+# Set a limit per card
+
+1. Hover over Settings, then click **Domains**.
+2. Click the name of the domain.
+3. Next to the card, click **Edit Limit**.
+4. Ensure the Custom Smart Limit toggle is enabled to be able to set a specific card limit. Otherwise, the card limit will be determined by the limit set for the group that the employee is in. 
+5. In the Limit Amount field, enter the desired limit. If set to $0, the card will be disabled for use until the limit is increased.
+6. Click **Save**. 
+
+# Set a limit per group
+
+1. Hover over Settings, then click **Domains**.
+2. Click the name of the domain.
+3. Click the **Groups** tab on the left.
+4. Click the Expensify Card Smart Limit field for the card and enter the desired limit. 
+
+</div>
diff --git a/docs/articles/expensify-classic/expensify-card/Deactivate-or-cancel-an-Expensify-Card.md b/docs/articles/expensify-classic/expensify-card/Deactivate-or-cancel-an-Expensify-Card.md
new file mode 100644
index 000000000000..d7fa33221834
--- /dev/null
+++ b/docs/articles/expensify-classic/expensify-card/Deactivate-or-cancel-an-Expensify-Card.md
@@ -0,0 +1,28 @@
+---
+title: Deactivate or cancel an Expensify Card
+description: Close an Expensify Card
+---
+<div id="expensify-classic" markdown="1">
+
+A cardholder or a Domain Admin can cancel an Expensify Card. You may want to cancel a card:
+- To cancel an old Expensify Card after upgrading to the new Expensify Visa® Commercial Card
+- After a fraudulent or suspicious charge
+- After an employee leaves the company
+
+# Domain Admins
+
+To cancel an employee's Expensify Card as a Domain Admin,
+
+1. Hover over Settings, then click **Domains**.
+2. Click the name of the domain.
+3. Next to the card, click **Terminate**.
+
+# Cardholders
+
+To cancel an Expensify Card assigned to you,
+
+1. Hover over Settings, then click **Account**.
+2. Click the **Credit Card Import** tab.
+3. Click **Cancel** next to the card.
+
+</div>
diff --git a/docs/articles/expensify-classic/expensify-card/Dispute-A-Transaction.md b/docs/articles/expensify-classic/expensify-card/Dispute-A-Transaction.md
index 19972b79d5e0..cb86c340dc81 100644
--- a/docs/articles/expensify-classic/expensify-card/Dispute-A-Transaction.md
+++ b/docs/articles/expensify-classic/expensify-card/Dispute-A-Transaction.md
@@ -1,50 +1,50 @@
 ---
 title: Expensify Card - Transaction Disputes & Fraud
-description: Learn how to dispute an Expensify Card transaction. 
+description: Understand how to dispute an Expensify Card transaction. 
 ---
-# Overview
-When using your Expensify Visa® Commercial Card, you may come across transaction errors, which can include things like:
-- Unrecognized, unauthorized, or fraudulent charges.
-- Transactions of an incorrect amount.
+# Disputing Expensify Card Transactions
+While using your Expensify Visa® Commercial Card, you might encounter transaction errors, such as:
+- Unauthorized transaction activity
+- Incorrect transaction amounts.
 - Duplicate charges for a single transaction.
-- Missing a promised merchant refund.
+- Missing merchant refunds.
 
-You’ll find all the relevant information on handling these below.
+When that happens, you may need to file a dispute for one or more transactions. 
 
-# How to Navigate the Dispute Process
 ## Disputing a Transaction
-
-If you spot an Expensify Card transaction error, please contact us immediately at [concierge@expensify.com](mailto:concierge@expensify.com). After that, we'll ask a few questions to better understand the situation. If the transaction has already settled in your account (no longer pending), we can file a dispute with our card processor on your behalf.
-
-If you suspect fraud on your Expensify Card, don't hesitate to cancel it by heading to Settings > Account > Credit Card Import > Request A New Card. Better safe than sorry!
-
-Lastly, if you haven’t enabled Two-Factor Authentication (2FA) yet, please do so ASAP to add an additional layer of security to your account.
+If you notice a transaction error on your Expensify Card, contact us immediately at concierge@expensify.com. We will ask a few questions to understand the situation better, and file a dispute with our card processor on your behalf.
 
 ## Types of Disputes
+The most common types of disputes are:
+- Unauthorized or fraudulent disputes
+- Service disputes
 
-There are two main dispute types:
+### Unauthorized or fraudulent disputes
+- Charges made after your card was lost or stolen.
+- Unauthorized charges while your card is in your possession (indicating compromised information).
+- Continued charges for a canceled recurring subscription.
 
-1. Unauthorized charges/fraud disputes, which include:
-   - Charges made with your card after it was lost or stolen.
-   - Unauthorized charges while your card is still in your possession (indicating compromised card information).
-   - Continued charges for a canceled recurring subscription.
+**If there are transactions made with your Expensify Card you don't recognize, you'll want to do the following right away:**
+1. Cancel your card by going to _**Settings > Account > Credit Card Import > Request A New Card**_.
+2. Enable Two-Factor Authentication (2FA) for added security under _**Settings > Account > Account Details > Two Factor Authentication**_.
 
-2. Service disputes, which include:
-   - Received damaged or defective merchandise.
-   - Charged for merchandise but never received it.
-   - Double-charged for a purchase made with another method (e.g., cash).
-   - Made a return but didn't receive a timely refund.
-   - Multiple charges for a single transaction.
-   - Charges settled for an incorrect amount.
+### Service Disputes
+- Received damaged or defective merchandise.
+- Charged for merchandise that was never received.
+- Double-charged for a purchase made with another method (e.g., cash).
+- Made a return but didn't receive a refund.
+- Multiple charges for a single transaction.
+- Charges settled for an incorrect amount.
 
-You don't need to categorize your dispute; we'll handle that. However, this may help you assess if a situation warrants a dispute. In most cases, the initial step for resolving a dispute should be contacting the merchant, as they can often address the issue promptly.
+For service disputes, contacting the merchant is often the quickest way to resolve the dispute.
 
 ## Simplifying the Dispute Process
-
-To ensure the dispute process goes smoothly, please:
-- Provide detailed information about the disputed charge, including why you're disputing it, what occurred, and any steps you've taken to address the issue.
-- If you recognize the merchant but not the charge, and you've transacted with them before, contact the merchant directly, as it may be a non-fraudulent error.
-- Include supporting documentation like receipts or cancellation confirmations when submitting your dispute to enhance the likelihood of a favorable resolution (not required but highly recommended).
+To ensure a smooth dispute process, please:
+- Provide detailed information about the disputed charge, including why you're disputing it and any steps you've taken to address the issue.
+- If you recognize the merchant but not the charge, contact the merchant directly.
+- Include supporting documentation (e.g., receipts, cancellation confirmations) when submitting your dispute to increase the chances of a favorable resolution (recommended but not required).
+- Make sure the transaction isn't pending (pending transactions cannot be disputed).
+   
 
 {% include faq-begin.md %}
 
diff --git a/docs/articles/expensify-classic/expensify-card/Expensify-Card-Perks.md b/docs/articles/expensify-classic/expensify-card/Expensify-Card-Perks.md
new file mode 100644
index 000000000000..922bf9d07056
--- /dev/null
+++ b/docs/articles/expensify-classic/expensify-card/Expensify-Card-Perks.md
@@ -0,0 +1,172 @@
+---
+title: Expensify Card Perks
+description: An overview of all the various perks the Expensify Card offers
+---
+## Expensify-specific Perks
+
+### Cashback
+Get 1% cash back with every swipe — no minimums necessary — and 2% back if you spend $250k+/month across cards.
+
+This applies to USD purchases only.
+
+### Discounts on Monthly Expensify Bill
+Get the Expensify Visa® Commercial Card and use it for at least half of your organization's monthly expenses to save 50% on your monthly Expensify bill.
+
+## Partner-specific Perks
+
+### Amazon AWS
+Whether you're a two-person startup or a venture-backed company, AWS Activate provides access to the resources you need to get started on AWS quickly, including free credits, technical support, and training. All Expensify Cardholders qualify when they add their Expensify Card for AWS billing!
+
+**How to redeem:** Apply [here](https://aws.amazon.com/activate/portfolio-signup) using OrgID: 0qyIA (Case Sensitive).
+
+For more details, refer to the [AWS Activate terms and conditions](https://aws.amazon.com/activate/terms/) and the [Activate FAQs](https://aws.amazon.com/activate/faq/).
+
+### Stripe
+Stripe’s integrated payments platform helps you build and scale your business globally, whether you're creating a subscription service, an on-demand marketplace, or an e-commerce store.
+
+Stripe will waive the processing fees for the first $5,000 in payments for Expensify Cardholders.
+
+**How to redeem:** Sign up for Stripe using your Expensify Card.
+
+### Lamar Advertising
+Lamar offers out-of-home advertising on billboards, digital displays, airport signage, transit, and highway logo signs. Expensify Cardholders receive a minimum 10% discount on their first campaign.
+
+**How to redeem:** Contact Expensify’s dedicated account manager, Lisa Kane (email: lkane@lamar.com), and mention that you’re an Expensify Cardholder.
+
+### Carta
+Simplify equity management with Carta. Expensify Cardholders receive a 20% discount on the first year and waived implementation fees.
+
+**How to redeem:** Sign up using your Expensify Card.
+
+### Pilot
+Pilot specializes in bookkeeping and tax preparation for startups and e-commerce providers. When you use Pilot, you're paired with a dedicated finance expert who handles the work for you and answers your questions.
+
+**Offer:** 20% off the first six months of Pilot Core.
+
+**How to redeem:** Sign up using your Expensify Card.
+
+### Spotlight Reporting
+Spotlight Reporting is a cloud-based reporting and forecasting tool designed by accountants, for accountants. Expensify Cardholders receive a 20% discount on their subscription for the first six months, plus one free seat for Spotlight Certification.
+
+**How to redeem:** Sign up using your Expensify Card.
+
+### Guideline
+Guideline's full-service 401(k) plans make it easier and more affordable to offer your employees the retirement benefits they deserve.
+
+**Offer:** Three months free.
+
+**How to redeem:** Sign up using your Expensify Card.
+
+### Gusto
+Gusto's platform helps businesses onboard, pay, insure, and support their teams. Expensify Cardholders receive three months of free service.
+
+**How to redeem:** Sign up using your Expensify Card.
+
+### QuickBooks Online
+QuickBooks accounting software keeps your books accurate and up to date with features like invoicing, cash flow management, expense tracking, and more.
+
+**Offer:** 30% off QuickBooks Online for the first 12 months.
+
+**How to redeem:** Sign up using your Expensify Card.
+
+### Highfive
+Highfive improves the ease and quality of in-room video conferencing. Expensify Cardholders receive 50% off the Highfive Select Starter Package and 10% off the Highfive Premium Package.
+
+**How to redeem:** Sign up using your Expensify Card.
+
+### Zendesk
+Expensify Cardholders receive $436 in credits for Zendesk Suite products per month for the first year.
+
+**How to redeem:**
+- Reach out to startups@zendesk.com with the message: "Expensify asked me to send an email regarding the Zendesk promotion.” You'll receive a promo code to use.
+- Start a Zendesk trial (Suite or another plan) in USD (if your trial is not in USD, contact Zendesk).
+- Click the "Buy Now" button inside your trial.
+- Select your plan with monthly billing.
+     - The $436 monthly credit applies to up to four licenses of the Suite but can also be applied to any other monthly plan.
+- Enter the promo code you receive.
+- Complete the checkout process.
+     - After 12 monthly billing periods, your free credit will expire, and you'll be charged for the next month.
+
+### Xero
+Xero offers accounting software with everything you need to run your business seamlessly.
+
+**Offer:** U.S. residents receive 50% off Xero for six months.
+
+**How to redeem:** Visit [this page](https://apps.xero.com/us/app/expensify?xtid=x30expensify&utm_source=expensify&utm_medium=web&utm_campaign=cardoffer) and sign up using your Expensify Card.
+
+### Freshworks
+Boost your startup journey with customer and employee engagement solutions from Freshworks, including CRM, live chat, support, marketing automation, ITSM, and HRMS.
+
+**Offer:** $4,000 in credits on Freshworks products.
+
+**How to redeem:** Click [here](https://www.freshworks.com/partners/startup-program/expensify-card/) and fill out the form; Freshworks will automatically recognize your company as an Expensify Card customer.
+
+### Slack
+Get 25% off your first year with Slack, enjoying premium features like unlimited messaging, apps, Slack Connect channels, group video calls, priority support, and more.
+
+**How to redeem:** Click [here](https://slack.com/promo/partner?remote_promo=ead919f5) to redeem the offer using your Expensify Card.
+
+### Deel.com
+Deel simplifies onboarding international team members in 150 different countries. Expensify Cardholders receive three months free, followed by 30% off for the rest of the year.
+
+**How to redeem:** Click [here](https://www.deel.com/partners/expensify) and sign up using your Expensify Card.
+
+### Snap
+Expensify Cardholders receive $1,000 in Snap credits when they spend $1,000 in Snapchat's Ads Manager.
+
+**How to redeem:**
+- Click "Create Ad" or "Request a Call" by clicking [here](https://forbusiness.snapchat.com/).
+- Enter your details to set up your account if you don't already have one.
+- Add the Expensify Card as your payment option for your Snap Business account.
+- Credits will automatically be placed in your account once you've reached $1,000 in spend.
+
+### Aircall
+Aircall is a cloud-based phone system for sales and support teams. Expensify Cardholders receive two months free, with discounts ranging from $270 to $9,000+ depending on the number of users.
+
+**How to redeem:**
+- Click [here](http://pages.aircall.io/Expensify-RewardsPartnerReferral.html) to sign up for a demo.
+- Let the Aircall team know you're an Expensify customer.
+
+### NetSuite
+NetSuite helps companies manage core business processes with a cloud-based ERP and accounting software. Expensify has a direct integration with NetSuite to synchronize data and customize expense coding.
+
+**Offer:** 10% off for the first year.
+
+**How to redeem:**
+- Fill out this [Google form](https://docs.google.com/forms/d/e/1FAIpQLSeiOzLrdO-MgqeEMwEqgdQoh4SJBi42MZME9ycHp4SQjlk3bQ/viewform?usp=sf_link).
+- An Expensify rep will introduce you to a NetSuite sales rep to start the process.
+- Once set up, pay for your first year with NetSuite, and Expensify will send you a payment equal to 10% of your first-year contract within three months of your first NetSuite invoice.
+
+**Note:** This offer is only for prospective NetSuite customers.
+
+### PagerDuty
+PagerDuty's platform integrates machine data and human intelligence to improve visibility and agility across organizations.
+
+**Offer:** 25% off.
+
+**How to redeem:** Sign up using your Expensify Card and enter the discount code EXPENSIFYPDTEAM for the Team plan or EXPENSIFYPDBUSINESS for the Business plan at checkout.
+
+### Typeform
+Typeform makes collecting and sharing information easy and conversational, allowing you to create anything from surveys to apps without writing a single line of code.
+
+**Offer:** 30% off annual Premium and Professional plans.
+
+**How to redeem:**
+- Click [here](https://try.typeform.com/expensify/?utm_source=expensify&utm_medium=referral&utm_campaign=expensify_integration&utm_content=directory) to get Typeform.
+- Enter your details and set up your free account.
+- Verify your email by clicking on the link Typeform sends you.
+- Complete the onboarding flow within Typeform.
+- Click the "Upgrade" button in your workspace.
+- Select your plan.
+- Enter the coupon code EXPENSIFY30 on the checkout page.
+- Fill out all payment details using your Expensify Card and click "Upgrade now."
+
+### Intercom
+Intercom offers a suite of messaging-first products to help businesses accelerate growth across the customer lifecycle.
+
+**Offer:** Three months of free service.
+
+**How to redeem:** Sign up using your Expensify Card.
+
+### Talkspace
+Talkspace provides prescription management and personalized treatment through a network of licensed prescribers trained in mental healthcare. Expensify Cardholders receive $125 off Talk
diff --git a/docs/articles/expensify-classic/expensify-card/Expensify-Card-Reconciliation.md b/docs/articles/expensify-classic/expensify-card/Expensify-Card-Reconciliation.md
new file mode 100644
index 000000000000..81eae56fa774
--- /dev/null
+++ b/docs/articles/expensify-classic/expensify-card/Expensify-Card-Reconciliation.md
@@ -0,0 +1,108 @@
+---
+title: Expensify Card reconciliation
+description: Reconcile expenses from Expensify Cards
+---
+
+<div id="expensify-classic" markdown="1">
+
+To handle unapproved Expensify Card expenses that are left after you close your books for the month, you can set up auto-reconciliation with an accounting integration, or you can manually reconcile the expenses.
+
+# Set up automatic reconciliation
+
+Auto-reconciliation automatically deducts Expensify Card purchases from your company’s settlement account on a daily or monthly basis.
+
+{% include info.html %}
+You must link a business bank account as your settlement account before you can complete this process.
+{% include end-info.html %}
+
+1. Hover over Settings, then click **Domains**.
+2. Click the desired domain name. 
+3. On the Company Cards tab, click the dropdown under the Imported Cards section to select the desired Expensify Card.
+4. To the right of the dropdown, click the **Settings** tab.
+5. Click the Expensify Card settlement account dropdown and select your settlement business bank account. 
+   - To verify which account is your settlement account: Hover over Settings, then click **Account**. Click the **Payments** tab on the left and verify the bank account listed as the Settlement Account. If these accounts do not match, repeat the steps above to select the correct bank account.
+6. Click **Save**.
+
+If your workspace is connected to a QuickBooks Online, Xero, NetSuite, or Sage Intacct integration, complete the following additional steps.
+
+1. Click the Expensify Card Reconciliation Account dropdown and select the GL account from your integration for your Settlement Account. Then click **Save**.
+2. (Optional) If using the Sage Intacct integration, select your cash-only and accrual-only journals. If your organization operates on a cash-only or accrual-only basis, choose **No Selection** for the journals that do not apply.
+3. Click the **Advanced** tab and ensure Auto-Sync is enabled. Then click **Save**
+4. Hover over **Settings**, then click **Workspaces**. 
+5. Open the workspace linked to the integration. 
+6. Click the **Connections** tab.
+7. Next to the desired integration, click **Configure**. 
+8. Under the Export tab, ensure that the Preferred Exporter is also a Workspace Admin and has an email address associated with your Expensify Cards' domain. For example, if your domain is company.com, the Preferred Exporter's email should be name@company.com.
+
+# Manually reconcile expenses 
+
+To manually reconcile Expensify Card expenses, 
+
+1. Hover over Settings, then click **Domains**.
+2. Click the desired domain name. 
+3. On the Company Cards tab, click the dropdown under the Imported Cards section to select the desired Expensify Card.
+4. To the right of the dropdown, click the **Reconciliation** tab.
+5. For the Reconcile toggle, ensure Expenses is selected. 
+6. Select the start and end dates, then click **Run**. 
+7. Use the Imported, Approved, and Unapproved totals to manually reconcile your clearing account in your accounting system. 
+   - The Unapproved total should match the final clearing account balance. Depending on your accounting policies, you can use this balance to book an accrual entry by debiting the appropriate expense and crediting the offsetting clearing account in your accounting system.
+
+## Troubleshooting
+
+Use the steps below to do additional research if:
+- The amounts vary to a degree that needs further investigation.
+- The Reconciliation tab was not run when the accounts payable (AP) was closed.
+- Multiple subsidiaries within the accounting system closed on different dates.
+- There are foreign currency implications in the accounting system.
+
+To do a more in-depth reconciliation, 
+
+1. In your accounting system, lock your AP.
+
+{% include info.html %}
+It’s best to do this step at the beginning or end of the day. Otherwise, expenses with the same export date may be posted in different accounting periods.
+{% include end-info.html %}
+
+2. In Expensify, click the **Reports** tab.
+3. Set the From date filter to the first day of the month or the date of the first applicable Expensify Card expense, and set the To date filter to today’s date. 
+4. Set the other filters to show **All**.
+5. Select all of the expense reports by clicking the checkbox to the top left of the list. If you have more than 50 expense reports, click **Select All**. 
+6. In the top right corner of the page, click **Export To** and select **All Data - Expense Level Export**. This will generate and send a CSV report to your email. 
+7. Click the link from the email to automatically download a copy of the report to your computer. 
+8. Open the report and apply the following filters (or create a pivot with these filters) depending on whether you want to view the daily or monthly settlements:
+   - Daily settlements: 
+      - Date = the month you are reconciling
+      - Bank = Expensify Card
+      - Posted Date = the month you are reconciling
+      - [Accounting system] Export Non Reimb = blank/after your AP lock date 
+   - Monthly settlements:
+      - Date = the month you are reconciling
+      - Bank = Expensify Card
+      - Posted Date = The first date after your last settlement until the end of the month
+      - [Accounting system] Export Non Reimb = the current month and new month until your AP lock date
+         - To determine your total Expensify Card liability at the end of the month, set this filter to blank/after your AP lock date.
+
+This filtered list should now only include Expensify Card expenses that have a settlement/card payment entry in your accounting system but don’t have a corresponding expense entry (because they have not yet been approved in Expensify). The sum is shown at the bottom of the sheet.
+
+The sum of the expenses should equal the balance in your Expensify Clearing or Liability Account in your accounting system. 
+
+# Tips
+
+- Enable [Scheduled Submit](https://help.expensify.com/articles/expensify-classic/workspaces/reports/Scheduled-Submit) to ensure that expenses are submitted regularly and on time.
+- Expenses that remain unapproved for several months can complicate the reconciliation process. If you're an admin in Expensify, you can communicate with all employees who have an active Expensify account by going to [new.expensify.com](http://new.expensify.com) and using the #announce room to send a message. This way, you can remind employees to ensure their expenses are submitted and approved before the end of each month.
+- Keep in mind that although Expensify Card settlements/card payments will post to your general ledger on the date it is recorded in Expensify, the payment may not be withdrawn from your bank account until the following business day.
+- Based on your internal policies, you may want to accrue for the Expensify Cards.
+
+{% include faq-begin.md %}
+
+**Why is the amount in my Expensify report so different from the amount in my accounting system?**
+
+If the Expensify report shows an amount that is significantly different to your accounting system, there are a few ways to identify the issues:
+- Double check that the expenses posted to the GL are within the correct month. Filter out these expenses to see if they now match those in the CSV report.
+- Use the process outlined above to export a report of all the transactions from your Clearing (for Daily Settlement) or Liability (for monthly settlement) account, then create a pivot table to group the transactions into expenses and settlements. 
+   - Run the settlements report in the “settlements” view of the Reconciliation Dashboard to confirm that the numbers match.
+   - Compare “Approved” activity to your posted activity within your accounting system to confirm the numbers match. 
+
+{% include faq-end.md %}
+
+</div>
diff --git a/docs/articles/expensify-classic/expensify-card/Request-the-Card.md b/docs/articles/expensify-classic/expensify-card/Request-the-Card.md
index 724745f458ef..1f412665fc2f 100644
--- a/docs/articles/expensify-classic/expensify-card/Request-the-Card.md
+++ b/docs/articles/expensify-classic/expensify-card/Request-the-Card.md
@@ -2,45 +2,36 @@
 title: Request the Card
 description: Details on requesting the Expensify Card as an employee
 ---
-# Overview
-
-Once your organization is approved for the Expensify Visa® Commercial Card, you can request a card! 
-
-This article covers how to request, activate, and replace your physical and virtual Expensify Cards.
-
-# How to get your first Expensify Card
-
-An admin in your organization must first enable the Expensify Cards before you can receive a card. After that, an admin may assign you a card by setting a limit. You can think of setting a card limit as “unlocking” access to the card.
-
-If you haven’t been assigned a limit yet, look for the task on your account's homepage that says, “Ask your admin for the card!” This task allows you to message your admin team to make that request.
-
-Once you’re assigned a card limit, we’ll notify you via email to let you know you can request a card. A link within the notification email will take you to your account’s homepage, where you can provide your shipping address for the physical card. Enter your address, and we’ll ship the card to arrive within 3-5 business days.
- 
-Once your physical card arrives in the mail, activate it in Expensify by entering the last four digits of the card in the activation task on your account’s homepage. 
-
-# Virtual Card
-
-Once assigned a limit, a virtual card is available immediately. You can view the virtual card details via **Settings > Account > Credit Card Import > Show Details**. Feel free to begin transacting with the virtual card while your physical card is in transit – your virtual card and physical card share a limit.
-
-Please note that you must enable two-factor authentication on your account if you want to have the option to dispute transactions made on your virtual card. 
-
-# Notifications
-
-To stay up-to-date on your card’s limit and spending activity, download the Expensify mobile app and enable push notifications. Your card is connected to your Expensify account, so each transaction on your card will trigger a push notification. We’ll also send you a push notification if we detect potentially fraudulent activity and allow you to confirm your purchase. 
-
-# How to request a replacement Expensify Card
-
-You can request a new card anytime if your Expensify Card is lost, stolen, or damaged. From your Expensify account on the web, head to **Settings > Account > Credit Card Import** and click **Request a New Card**. Confirm the shipping information, complete the prompts, and your new card will arrive in 2 - 3 business days.
-
-Selecting the “lost” or “stolen” options will deactivate your current card to prevent potentially fraudulent activity. However, choosing the “damaged” option will leave your current card active so you can use it while the new one is shipped to you.
-
-If you need to cancel your Expensify Card and cannot access the website or mobile app, call our interactive voice recognition phone service (available 24/7). Call 1-877-751-5848 (US) or +44 808 196 0632 (Internationally). 
-
-It's not possible to order a replacement card over the phone, so, if applicable, you would need to handle this step from your Expensify account.
-
-# Card Expiration Date
-
-If you notice that your card expiration date is soon, it's time for a new Expensify card. Expensify will automatically input a notification in your account's Home (Inbox) tab. This notice will ask you to input your address, but this is more if you have changed your address since your card was issued to you. You can ignore it and do nothing; the new Expensify card will ship to your address on file. The new Expensify card will have a new, unique card number and will not be associated with the old one.
+To start using the Expensify Card, do the following:
+1. **Enable Expensify Cards:** An admin must first enable the cards. Then, an admin can assign you a card by setting a limit, which allows access to the card.
+2. **Request the Card:**
+   - If you haven’t been assigned a limit, look for the task on your account’s homepage that says, “Ask your admin for the card!”
+   - Completing that task will send an in-product notification to your admin team that you requested the card. 
+   - Once you’re assigned a card limit, you’ll receive an email notification. Click the link in the email to provide your shipping address on your account’s homepage.
+   - Enter your address, and the physical card will be shipped within 3-5 business days.
+3. **Activate the Card:** When your physical card arrives, activate it in Expensify by entering the last four digits of the card in the activation task on your homepage.
+
+### Virtual Cards
+Once you've been assigned a limit, a virtual card is available immediately. You can view its details via _**Settings > Account > Credit Card Import > Show Details**_.
+
+To protect your account and card spend, enable two-factor authentication under _**Settings > Account > Account Details**_.
+
+### Notifications
+- Download the Expensify mobile app and enable push notifications to stay updated on your card’s limit and spending.
+- Each transaction triggers a push notification.
+- You’ll also get notifications for potentially fraudulent activity, allowing you to confirm or dispute charges.
+
+## Request a Replacement Expensify Card
+### If the card is lost, stolen, or damaged Card:
+  - Go to _**Settings > Account > Credit Card Import** and click **Request a New Card**_.
+  - Confirm your shipping information and complete the prompts. The new card will arrive in 2-3 business days.
+  - Selecting “lost” or “stolen” deactivates your current card to prevent fraud. Choosing “damaged” keeps the current card active until the new one arrives.
+  - If you can’t access the website or app, call 1-877-751-5848 (US) or +44 808 196 0632 (Internationally) to cancel your card.
+
+### If the card is expiring
+- If your card is about to expire, Expensify will notify you via your account’s Home (Inbox) tab. 
+- Enter your address if it has changed; otherwise, do nothing, and the new card will ship to your address on file.
+- The new card will have a unique number and will not be linked to the old one.
 
 {% include faq-begin.md %}
 
diff --git a/docs/articles/expensify-classic/expensify-card/Statements.md b/docs/articles/expensify-classic/expensify-card/Statements.md
index 894dfa3d8b9a..eb797f0cee4b 100644
--- a/docs/articles/expensify-classic/expensify-card/Statements.md
+++ b/docs/articles/expensify-classic/expensify-card/Statements.md
@@ -1,73 +1,62 @@
 ---
 title: — Expensify Card Statements and Settlements
-description: Learn how the Expensify Card statement and settlements work!
+description: Understand how to access your Expensify Card Statement
 ---
 
-# Overview
-Expensify offers several settlement types and a statement that provides a detailed view of transactions and settlements. We discuss specifics on both below.
+## Expensify Card Statements
+Expensify offers several settlement types and a detailed statement of transactions and settlements.
 
-# How to use Expensify Visa® Commercial Card Statement and Settlements
-## Using the statement
-If your domain uses the Expensify Card and you have a validated Business Bank Account, access the Expensify Card statement at Settings > Domains > Company Cards > Reconciliation Tab > Settlements.
+### Accessing the Statement
+- If your domain uses the Expensify Card and you have a validated Business Bank Account, access the statement at _**Settings > Domains > Company Cards > Reconciliation Tab > Settlements**_.
+- The statement shows individual transactions (debits) and their corresponding settlements (credits).
 
-The Expensify Card statement displays individual transactions (debits) and their corresponding settlements (credits). Each Expensify Cardholder has a Digital Card and a Physical Card, which are treated the same in settlement, reconciliation, and exporting to your accounting system.
-
-Here's a breakdown of crucial information in the statement:
-- **Date:** For card payments, it shows the debit date; for card transactions, it displays the purchase date.
-- **Entry ID:** This unique ID groups card payments and transactions together.
-- **Withdrawn Amount:** This applies to card payments, matching the debited amount from the Business Bank Account.
-- **Transaction Amount:** This applies to card transactions, matching the expense purchase amount.
-- **User email:** Applies to card transactions, indicating the cardholder's Expensify email address.
-- **Transaction ID:** A unique ID for locating transactions and assisting Expensify Support in case of issues. Transaction IDs are handy for reconciling pre-authorizations. To find the original purchase, locate the Transaction ID in the Settlements tab of the reconciliation dashboard, download the settlements as a CSV, and search for the Transaction ID within it.
+### Key Information in the Statement
+- **Date:** Debit date for card payments; purchase date for transactions.
+- **Entry ID:** Unique ID grouping card payments and transactions.
+- **Withdrawn Amount:** Amount debited from the Business Bank Account for card payments.
+- **Transaction Amount:** Expense purchase amount for card transactions.
+- **User Email:** Cardholder’s Expensify email address.
+- **Transaction ID:** Unique ID for locating transactions and assisting support.
 
 ![Expanded card settlement that shows the various items that make up each card settlement.](https://help.expensify.com/assets/images/ExpensifyHelp_SettlementExpanded.png){:width="100%"}
 
-The Expensify Card statement only shows payments from existing Business Bank Accounts under Settings > Account > Payments > Business Accounts. If a Business Account is deleted, the statement won't contain data for payments from that account.
-
-## Exporting your statement
-When using the Expensify Card, you can export your statement to a CSV with these steps:
+**Note:** The statement only includes payments from existing Business Bank Accounts under **Settings > Account > Payments > Business Accounts**. Deleted accounts' payments won't appear.
 
-  1. Login to your account on the web app and click on Settings > Domains > Company Cards.
-  2. Click the Reconciliation tab at the top right, then select Settlements.
-  3. Enter your desired statement dates using the Start and End fields.
-  4. Click Search to access the statement for that period.
-  5. You can view the table or select Download to export it as a CSV.
+## Exporting Statements
+1. Log in to the web app and go to **Settings > Domains > Company Cards**.
+2. Click the **Reconciliation** tab and select **Settlements**.
+3. Enter the start and end dates for your statement.
+4. Click **Search** to view the statement.
+5. Click **Download** to export it as a CSV.
 
 ![Click the Download CSV button in the middle of the page to export your card settlements.](https://help.expensify.com/assets/images/ExpensifyHelp_SettlementExport.png){:width="100%"}
 
 ## Expensify Card Settlement Frequency
-Paying your Expensify Card balance is simple with automatic settlement. There are two settlement frequency options:
-  - **Daily Settlement:** Your Expensify Card balance is paid in full every business day, meaning you’ll see an itemized debit each business day.
-  - **Monthly Settlement:** Expensify Cards are settled monthly, with your settlement date determined during the card activation process. With monthly, you’ll see only one itemized debit per month. (Available for Plaid-connected bank accounts with no recent negative balance.)
+- **Daily Settlement:** Balance paid in full every business day with an itemized debit each day.
+- **Monthly Settlement:** Balance settled monthly on a predetermined date with one itemized debit per month (available for Plaid-connected accounts with no recent negative balance).
 
-## How settlement works
-Each business day (Monday through Friday, excluding US bank holidays) or on your monthly settlement date, we calculate the total of posted Expensify Card transactions since the last settlement. The settlement amount represents what you must pay to bring your Expensify Card balance back to $0.
+## How Settlement Works
+- Each business day or on your monthly settlement date, the total of posted transactions is calculated.
+- The settlement amount is withdrawn from the Verified Business Bank Account linked to the primary domain admin, resetting your card balance to $0.
+- To change your settlement frequency or bank account, go to _**Settings > Domains > [Domain Name] > Company Cards**_, click the **Settings** tab, and select the new options from the dropdown menu. Click **Save** to confirm.
 
-We'll automatically withdraw this settlement amount from the Verified Business Bank Account linked to the primary domain admin. You can set up this bank account in the web app under Settings > Account > Payments > Bank Accounts.
+![Change your card settlement account or settlement frequency via the dropdown menus in the middle of the screen.](https://help.expensify.com/assets/images/ExpensifyHelp_CardSettings.png){:width="100%"}
 
-Once the payment is made, your Expensify Card balance will be $0, and the transactions are considered "settled."
 
-To change your settlement frequency or bank account, go to Settings > Domains > [Domain Name] > Company Cards. On the Company Cards page, click the Settings tab, choose a new settlement frequency or account from the dropdown menu, and click Save to confirm the change.
+# FAQ
 
-![Change your card settlement account or settlement frequency via the dropdown menus in the middle of the screen.](https://help.expensify.com/assets/images/ExpensifyHelp_CardSettings.png){:width="100%"}
+## Can you pay your balance early if you’ve reached your Domain Limit?
+- For Monthly Settlement, use the “Settle Now” button to manually initiate settlement.
+- For Daily Settlement, balances settle automatically with no additional action required.
 
-# Expensify Card Statement and Settlements FAQs
-## Can you pay your balance early if you've reached your Domain Limit?
-If you've chosen Monthly Settlement, you can manually initiate settlement using the "Settle Now" button. We'll settle the outstanding balance and then perform settlement again on your selected predetermined monthly settlement date.
-
-If you opt for Daily Settlement, the Expensify Card statement will automatically settle daily through an automatic withdrawal from your business bank account. No additional action is needed on your part.
-  
 ## Will our domain limit change if our Verified Bank Account has a higher balance?
-Your domain limit may fluctuate based on your cash balance, spending patterns, and history with Expensify. Suppose you've recently transferred funds to the business bank account linked to Expensify card settlements. In that case, you should expect a change in your domain limit within 24 hours of the transfer (assuming your business bank account is connected through Plaid).
-  
+Domain limits may change based on cash balance, spending patterns, and history with Expensify. If your bank account is connected through Plaid, expect changes within 24 hours of transferring funds.
+
 ## How is the “Amount Owed” figure on the card list calculated?
-The amount owed consists of all Expensify Card transactions, both pending and posted, since the last settlement date. The settlement amount withdrawn from your designated Verified Business Bank Account only includes posted transactions.
-
-Your amount owed decreases when the settlement clears. Any pending transactions that don't post timely will automatically expire, reducing your amount owed.
-  
-## **How do I view all unsettled expenses?**
-To view unsettled expenses since the last settlement, use the Reconciliation Dashboard's Expenses tab. Follow these steps:
-  1. Note the dates of expenses in your last settlement.
-  2. Switch to the Expenses tab on the Reconciliation Dashboard.
-  3. Set the start date just after the last settled expenses and the end date to today.
-  4. The Imported Total will show the outstanding amount, and you can click through to view individual expenses.
+It includes all pending and posted transactions since the last settlement date. The settlement amount withdrawn only includes posted transactions.
+
+## How do I view all unsettled expenses?
+1. Note the dates of expenses in your last settlement.
+2. Go to the **Expenses** tab on the Reconciliation Dashboard.
+3. Set the start date after the last settled expenses and the end date to today.
+4. The **Imported Total** shows the outstanding amount, and you can click to view individual expenses.
diff --git a/docs/articles/expensify-classic/expensify-card/Unlimited-Virtual-Cards.md b/docs/articles/expensify-classic/expensify-card/Unlimited-Virtual-Cards.md
index c5578249289a..fdbc178737e1 100644
--- a/docs/articles/expensify-classic/expensify-card/Unlimited-Virtual-Cards.md
+++ b/docs/articles/expensify-classic/expensify-card/Unlimited-Virtual-Cards.md
@@ -26,13 +26,13 @@ After adopting the new Expensify Card, domain admins can issue virtual cards to
 
 **To assign a virtual card:**
 
-1. Head to **Settings** > **Domains** > [**Company Cards**](https://www.expensify.com/domain_companycards).
-2. Click the **Issue Virtual Cards** button.
-3. Enter a card name (i.e., "Google Ads").
-4. Select a domain member to assign the card to.
-5. Enter a card limit.
-6. Select a **Limit Type** of _Fixed_ or _Monthly_.
-7. Click **Issue Card**.
+Head to **Settings** > **Domains** > [**Company Cards**](https://www.expensify.com/domain_companycards) and click the **Issue Virtual Cards** button. From there: 
+
+1. Enter a card name (i.e., "Google Ads").
+2. Select a domain member to assign the card to.
+3. Enter a card limit.
+4. Select a **Limit Type** of _Fixed_ or _Monthly_.
+5. Click **Issue Card**.
 
 ![The Issue Virtual Cards modal is open in the middle of the screen. There are four options to set; Card Name, Assignee, Card Limit, and Limit type. A cancel (left) and save (right) button are at the bottom right of the modal.]({{site.url}}/assets/images/AdminissuedVirtualCards.png){:width="100%"}
 
@@ -66,6 +66,8 @@ There are two different limit types that are best suited for their intended purp
 - _Fixed limit_ spend cards are ideal for one-time expenses or providing employees access to a card for a designated purchase. 
 - _Monthly_ limit spend cards are perfect for managing recurring expenses such as subscriptions and memberships.
 
+A virtual card with either of these limit types doesn't share its limit with any other cards, including the cardholder's smart limit cards. 
+
 **Where can employees see their virtual cards?**
 
 Employees can see their assigned virtual cards by navigating to **Settings** > **Account** > [**Credit Cards Import**](https://www.expensify.com/settings?param=%7B%22section%22:%22creditcards%22%7D) in their account.
diff --git a/docs/articles/expensify-classic/expensify-partner-program/Referral-Program.md b/docs/articles/expensify-classic/expensify-partner-program/Referral-Program.md
index a1b1043dff47..424c8dc9d107 100644
--- a/docs/articles/expensify-classic/expensify-partner-program/Referral-Program.md
+++ b/docs/articles/expensify-classic/expensify-partner-program/Referral-Program.md
@@ -16,9 +16,9 @@ The sky's the limit for this referral program! Your referral can be anyone - a f
 
 1. There are a bunch of different ways to refer someone to New Expensify:
    - Start a chat
-   - Request money
-   - Send money
-   - Split a bill
+   - Submit an expense to them
+   - Split an expense with them
+   - Pay someone (them)
    - Assign them a task
    - @ mention them
    - Invite them to a room
diff --git a/docs/articles/expensify-classic/getting-started/Join-your-company's-workspace.md b/docs/articles/expensify-classic/getting-started/Join-your-company's-workspace.md
index a31b972e683c..6067df6874d4 100644
--- a/docs/articles/expensify-classic/getting-started/Join-your-company's-workspace.md
+++ b/docs/articles/expensify-classic/getting-started/Join-your-company's-workspace.md
@@ -15,6 +15,8 @@ Upload your expenses and check your reports right from your phone by downloading
 [iOS](https://apps.apple.com/us/app/expensify-expense-tracker/id471713959) 
 | [Android](https://play.google.com/store/apps/details?id=org.me.mobiexpensifyg&hl=en_US&gl=US)
 
+For a full walkthrough on creating and submitting expenses via the mobile app, click [here](https://expensify.navattic.com/fl150n1n)!
+
 # 2. Add your name and photo
 
 {% include selector.html values="desktop, mobile" %}
@@ -66,11 +68,11 @@ Concierge will walk you through setting up your account and also provide:
 You can also get support at any time by clicking the green chat bubble in the right corner. This will open a chat with Concierge where you can ask questions and receive direct support. 
 
 # 4. Learn how to add an expense 
-As an employee, you may need to document reimbursable expenses (like business travel paid for with personal funds) or non-reimbursable expenses (like a lunch paid for with a company card). You can create an expense automatically by SmartScanning a receipt, or you can enter them manually. 
+As an employee, you may need to document reimbursable expenses (like business travel paid for with personal funds) or non-reimbursable expenses (like a lunch paid for with a company card). You can create an expense automatically by SmartScanning a receipt, or you can enter it manually. 
 
 ## SmartScan a receipt
 
-You can upload pictures of your receipts to Expensify and SmartScan will automatically capture the receipt details including the merchant, date, total, and currency.
+You can upload pictures of your receipts to Expensify, and SmartScan will automatically capture the receipt details, including the merchant, date, total, and currency.
 
 {% include selector.html values="desktop, mobile" %}
 {% include option.html value="desktop" %}
@@ -96,7 +98,7 @@ You can upload pictures of your receipts to Expensify and SmartScan will automat
 {% include end-option.html %}
 {% include end-selector.html %}
 
-You can open any receipt and select **Fill out details myself** to add or edit the merchant, date, total, description, category, or add attendees who took part in the expense. You can also check that the expense is correctly labeled as reimbursable or non-reimbursable, and split the expense if multiple expenses are included on one receipt.
+You can open any receipt and select **Fill out details myself** to add or edit the merchant, date, total, description, category, or add attendees who took part in the expense. You can also check that the expense is correctly labeled as reimbursable or non-reimbursable and split the expense if multiple expenses are included on one receipt.
 
 *Note: You can also email receipts to SmartScan by sending them to receipts@expensify.com from an email address tied to your Expensify account (either a primary or secondary email). SmartScan will automatically pull all of the details from the receipt, fill them in for you, and add the receipt to the Expenses tab on your account.*
 
diff --git a/docs/articles/expensify-classic/getting-started/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
index 42d06d45fa87..411cc64eda7f 100644
--- a/docs/articles/expensify-classic/getting-started/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
@@ -194,14 +194,11 @@ As mentioned above, we’ll be able to pull in transactions as they post (daily)
 ### If you don't have a corporate card, use the Expensify Card (US only)
 Expensify provides a corporate card with the following features:
 
-- Up to 2% cash back (_Applies to USD purchases only._)
-- [SmartLimits](https://help.expensify.com/articles/expensify-classic/expensify-card/Cardholder-Settings-and-Features) to control what each individual cardholder can spend
-- A stable, unbreakable real-time connection (third-party bank feeds can run into connectivity issues)
-- Receipt compliance - informing notifications (e.g. add a receipt!) for users *as soon as the card is swiped*
-- Unlimited Virtual Cards - single-purpose cards with a fixed or monthly limit for specific company purchases
-- A 50% discount on the price of all Expensify plans
-- Multiple discounts and savings on a host of partner tech suppliers 
-- Good Karma - 10% of all card interchange we earn goes directly to the Expensify.org Social Justice Community funds
+- Finish your expenses in a swipe, we'll take care of everything else
+- Get cash back on every US purchase and up to 50% off your monthly Expensify bill
+- Stay in control with realtime alerts, spend limits, and auto-reconciliation
+- Don't worry about credit checks, annual fees, or personal guarantees
+- Create unlimited virtual cards with fixed or monthly limits for specific purchases
 
 The Expensify Card is recommended as the most efficient way to manage your company's spending. 
 
diff --git a/docs/articles/expensify-classic/getting-started/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
index 30d3b3e7732c..0f6df238db5b 100644
--- a/docs/articles/expensify-classic/getting-started/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
@@ -155,11 +155,12 @@ The Expensify Card has many benefits for your company. Two in particular are wor
 ### If you don't have a corporate card, use the Expensify Card
 Expensify provides a corporate card with the following features:
 
-- Up to 2% cash back (Applies to USD purchases only)
-- [SmartLimits](https://community.expensify.com/discussion/4851/deep-dive-what-are-unapproved-expense-limits#latest)
-- Unlimited Virtual Cards - single-purpose cards with a fixed or monthly limit for specific company purchases
-- A stable, unbreakable connection (third-party bank feeds can run into connectivity issues)
-
+- Finish your expenses in a swipe, we'll take care of everything else
+- Get cash back on every US purchase and up to 50% off your monthly Expensify bill
+- Stay in control with realtime alerts, spend limits, and auto-reconciliation
+- Don't worry about credit checks, annual fees, or personal guarantees
+- Create unlimited virtual cards with fixed or monthly limits for specific purchases
+  
 The Expensify Card is recommended as the most efficient way to manage your company's spending.
 
 Here’s how to enable it:
diff --git a/docs/articles/expensify-classic/integrations/accounting-integrations/Accelo.md b/docs/articles/expensify-classic/integrations/accounting-integrations/Accelo.md
deleted file mode 100644
index fffe0abb43aa..000000000000
--- a/docs/articles/expensify-classic/integrations/accounting-integrations/Accelo.md
+++ /dev/null
@@ -1,74 +0,0 @@
----
-title: Accelo
-description: Help doc for Accelo integration
----
-<!-- The lines above are required by Jekyll to process the .md file -->
-
-# Overview
-Accelo is a cloud-based business management software platform tailored for professional service companies, offering streamlined operations. It enables seamless integration with Expensify, allowing users to effortlessly import expense details from Expensify into Accelo, associating them with the corresponding project, ticket, or retainer within the system. 
-
-# How to Connect Expensify to Accelo
-To connect Expensify to Accelo, follow these clear steps:
-
-## Prerequisites
-Ensure you have administrator access to Accelo.
-Have a Workspace Admin role in Expensify.
-
-## Connecting Expensify to Accelo
-1. Access the Expensify Integration Server:
-- Open the Expensify Integration Server.
-2. Retrieve Your Partner User ID and Partner User Secret:
-- Important: These credentials are distinct from your regular Expensify username and password.
-- If you haven't previously set up the integration server, click where it indicates "click here."
-3. Regenerating Partner User Secret (If Necessary):
-- Note: If you've previously configured the integration server, you must regenerate your Partner User Secret. Do this by clicking "click here" to regenerate your partnerUserSecret.
-- If you currently use the Integration Server/API for another integration, remember to update that integration to use the new Secret.
-4. Configure Accelo:
-- Return to your Accelo account.
-- Navigate to your Integrations page and select the Expensify tab.
-5. Enter Expensify Integration Server Credentials:
-- Provide your Expensify Integration Server's Partner User ID and Partner User Secret.
-- Click "Save" to complete the setup.
-6. Connection Established:
-- Congratulations! Your Expensify account is now successfully connected to Accelo.
-
-With this connection in place, all Expensify users can effortlessly synchronize their expenses with Accelo, streamlining their workflow and improving efficiency.
-
-## How to upload your Accelo Project Codes as Tags in Expensify
-Once you have connected Accelo to Expensify, the next step is to upload your Accelo Project Codes as Tags in Expensify. Simply go to Go to **Settings** > **Workspaces** > **Group** > _[Workspace Name]_ > **Tags** and upload your CSV.
-If you directly integrate with Xero or QuickBooks Online, you must upload your Project Codes by appending your tags. Go to **Settings** > **Workspaces** > **Group** > _[Workspace Name]_ > **Tags** and click on “Append a custom tag list from a CSV” to upload your Project Codes via a CSV.
-
-# Deep Dive
-## Information sync between Expensify and Accelo
-The Accelo integration does a one-way sync, which means it brings expenses from Expensify into Accelo. When this happens, it transfers specific information from Expensify expenses to Accelo:
-
-| Expensify           | Accelo                |
-|---------------------|-----------------------|
-| Comment             | Title                 |
-| Date                | Date Incurred         |
-| Category            | Type                  |
-| Tags                | Against (relevant Project, Ticket or Retainer) |
-| Distance (mileage)  | Quantity              |
-| Hours (time expenses) | Quantity            |
-| Amount              | Purchase Price and Sale Price |
-| Reimbursable?       | Reimbursable?         |
-| Billable?           | Billable?             |
-| Receipt             | Attachment            |
-| Tax Rate            | Tax Code              |
-| Attendees           | Submitted By          |
-
-## Expense Status
-The status of your expense report in Expensify is also synced in Accelo.
-
-| Expensify Report Status | Accelo Expense Status |
-|-------------------------|-----------------------|
-| Open                    | Submitted             |
-| Submitted               | Submitted             |
-| Approved                | Approved              |
-| Reimbursed              | Approved              |
-| Rejected                | Declined              |
-| Archived                | Approved              |
-| Closed                  | Approved              |
-
-## Importing expenses from Expensify to Accelo
-Accelo regularly checks Expensify for new expenses once every hour. It automatically brings in expenses that have been created or changed since the last sync.
diff --git a/docs/articles/expensify-classic/integrations/accounting-integrations/Certinia.md b/docs/articles/expensify-classic/integrations/accounting-integrations/Certinia.md
deleted file mode 100644
index 6c7014827ea6..000000000000
--- a/docs/articles/expensify-classic/integrations/accounting-integrations/Certinia.md
+++ /dev/null
@@ -1,152 +0,0 @@
----
-title: Certinia
-description: Guide to connecting Expensify and Certinia FFA and PSA/SRP (formerly known as FinancialForce)
----
-# Overview
-[Cetinia](https://use.expensify.com/financialforce) (formerly known as FinancialForce) is a cloud-based software solution that provides a range of financial management and accounting applications built on the Salesforce platform. There are two versions: PSA/SRP and FFA and we support both. 
-
-# Before connecting to Certinia
-Install the Expensify bundle in Certinia using the relevant installer:
-* [PSA/SRP](https://login.salesforce.com/packaging/installPackage.apexp?p0=04t2M000002J0BHD%252Fpackaging%252FinstallPackage.apexp%253Fp0%253D04t2M000002J0BH)
-* [FFA](https://login.salesforce.com/packaging/installPackage.apexp?p0=04t4p000001UQVj)
-
-## Check contact details in Certinia 
-First, make sure you have a user and contact in Certinia that match your main email in Expensify. Then, create contacts for all employees who will be sending expense reports. Ensure that each contact's email matches the one they use in their Expensify account.
-
-## If you use PSA/SRP
-Each report approver needs both a User and a Contact. The user does not need to have a SalesForce license. These can be free chatter users.
-Set permission controls in Certinia for your user for each contact/resource. 
-* Go to Permission Controls
-  - Create a new permission control
-  - Set yourself (exporter) as the user 
-  - Select the resource (report submitter)
-  - Grant all available permissions
-* Set permissions on any project you are exporting to
-  - Go to **Projects** > _select a project_ > **Project Attributes** > **Allow Expenses Without Assignment**
-  - Select the project > **Edit**
-  - Under the Project Attributes section, check **Allow Expenses Without Assignment**
-* Set up Expense Types (categories in Expensify - _SRP only_)
-  - Go to **Main Menu** > _+ symbol_ > **Expense Type GLA Mappings**
-  - Click **New** to add new mappings
-
-# How to connect to Certinia
-1. Go to **Settings** > **Workspaces** > **Groups** > _[Workspace Name]_ > **Connections** in Expensify
-2. Click **Create a New Certinia (FinancialForce) Connection**
-3. Log into your Certinia account
-4. Expensify and Certinia will begin to sync (in Expensify)
-
-# How to configure export settings for Certinia
-## Preferred Exporter
-The preferred exporter is the user who will be the main exporter of reports. This person will receive the notifications for errors.
-
-## Payable Invoice Status and Date
-Reports can be exported as Complete or In Progress, using date of last expense, submitted date or exported date.
-
-## Reimbursable and non-reimbursable exports
-Both reimbursable and non-reimbursable reports are exported as payable invoices (FFA) or expense reports (PSA/SRP). If you have both Reimbursable and Non-Reimbursable expenses on a single report, we will create a separate payable invoice/expense report for each type. 
-
-## Default Vendor (FFA)
-Choose from the full list of vendors from your Certinia FFA account, this will be applied to the non-reimbursable payable invoices.
-
-# How to Configure coding for Certinia
-## Company
-Select which FinancialForce company to import from/export to.
-
-## Chart of Accounts (FFA)
-Prepaid Expense Type and Profit & Loss accounts are imported to be used as categories on each expense. 
-
-## Expense Type GLA Mappings (PSA/SRP)
-Your Expense Type GLA Mappings are enabled in Expensify to use as categories on each expense when using both PSA and SRP; however, PSA will not import or export categories, while SRP will.
-
-## Dimensions (FFA)
-We import four dimension levels and each has three options to select from:
-
-* Do not map: FinancialForce defaults will apply to the payable invoice, without importing into Expensify
-* Tags: These are shown in the Tag section of your workspace, and employees can select them on each expense created
-* Report fields: These will show in the Reports section of your workspace. Employees can select one to be applied at the header level i.e. the entire report. 
-
-## Projects, Assignments, or Projects & Assignments (PSA/SRP)
-These can be imported as tags with **Milestones** being optional. When selecting to import only projects, we will derive the account from the project. If an assignment is selected, we will derive both the account and project from the assignment. 
-
-Note: If you are using a project that does not have an assignment, the box **Allow Expenses Without Assignment** must be checked on the project in FinancialForce.
-
-## Tax
-Import tax rates from Certinia to apply to expenses.
-
-# How to configure advanced settings for Certinia
-## Auto Sync
-Auto Sync in Certinia performs daily updates to your coding. Additionally, it automatically exports reports after they receive final approval. For Non-Reimbursable expenses, syncing happens immediately upon final approval of the report. In the case of Reimbursable expenses, syncing occurs as soon as the report is reimbursed or marked as reimbursed.
-
-## Export tax as non-billable
-When exporting Billable expenses, this dictates whether you will also bill the tax component to your clients/customers.
-
-# Deep Dive
-## Multi-Currency in Certinia PSA/SRP
-When exporting to Certinia PSA/SRP you may see up to three different currencies on the expense report in Certinia, if employees are submitting expenses in more than one original currency.
-* Summary Total Reimbursement Amount: this currency is derived from the currency of the project selected on the expense.
-* Amount field on the Expense line: this currency is derived from the Expensify workspace default report currency.
-* Reimbursable Amount on the Expense line: this currency is derived from the currency of the resource with an email matching the report submitter.
-
-{% include faq-begin.md %}
-## What happens if the report can’t be exported to Certinia?
-* The preferred exporter will receive an email outlining the issue and any specific error messages
-* Any error messages preventing the export from taking place will be recorded in the report’s history
-* The report will be listed in the exporter’s Expensify Inbox as awaiting export.
-
-## If I enable Auto Sync, what happens to existing approved and reimbursed reports?
-You can activate Auto Sync without worry because it relies on Final Approval to trigger auto-export. Existing Approved reports won't be affected. However, for Approved reports that haven't been exported to Certinia, you'll need to either manually export them or mark them as manually entered.
-
-## How do I export tax?
-Tax rates are created in Expensify through the tax tracking feature under **Settings** > **Workspaces** > **Groups** > _[Workspace Name]_ > **Tax**. We export the tax amount calculated on the expenses. 
-
-## How do reports map to Payable Invoices in Certinia FFA?
-* Account Name - Account associated with Expensify submitter’s email address
-* Reference 1 - Report URL
-* Invoice Description - Report title
-
-## How do reports map to Expense Reports in Certinia PSA/SRP?
-* Expense report name - Report title
-* Resource - User associated with Expensify submitter’s email address
-* Description - Report URL
-* Approver - Expensify report approver
-
-# Sync and Export Errors
-
-## ExpensiError FF0047: You must have an Ops Edit permission to edit approved records.
-This error indicates that the permission control setup between the connected user and the report submitter or region is missing Ops Edit permission.
-
-In Certinia go to Permission Controls and click the one you need to edit. Make sure that Expense Ops Edit is selected under Permissions.
-
-## ExpensiError FF0076: Could not find employee in Certinia
-Go to Contacts in Certinia and add the report creator/submitter's Expensify email address to their employee record, or create a record with that email listed.
-
-If a record already exists then search for their email address to confirm it is not associated with multiple records.
-
-## ExpensiError FF0089: Expense Reports for this Project require an Assignment
-This error indicates that the project needs to have the permissions adjusted in Certinia
-
-Go to Projects > [project name] > Project Attributes and check Allow Expense Without Assignment. 
-
-## ExpensiError FF0091: Bad Field Name — [field] is invalid for [object]
-This means the field in question is not accessible to the user profile in Certinia for the user whose credentials were used to make the connection within Expensify. 
-
-To correct this:
-* Go to Setup > Build > expand Create > Object within Certinia
-* Then go to Payable Invoice > Custom Fields and Relationships
-* Click View Field Accessibility 
-* Find the employee profile in the list and select Hidden
-* Make sure both checkboxes for Visible are selected
-
-Once this step has been completed, sync the connection within Expensify by going to **Settings** > **Workspaces** > **Groups** > _[Workspace Name]_ > **Connections** > **Sync Now** and then attempt to export the report again. 
-
-## ExpensiError FF0132: Insufficient access. Make sure you are connecting to Certinia with a user that has the 'Modify All Data' permission
-
-Log into Certinia and go to Setup > Manage Users > Users and find the user whose credentials made the connection. 
-
-* Click on their profile on the far right side of the page
-* Go to System > System Permissions
-* Enable Modify All Data and save
-
-Sync the connection within Expensify by going to **Settings** > **Workspaces** > **Groups** > _[Workspace Name]_ > **Connections** > **Sync Now** and then attempt to export the report again
-
-{% include faq-end.md %}
diff --git a/docs/articles/expensify-classic/integrations/accounting-integrations/NetSuite.md b/docs/articles/expensify-classic/integrations/accounting-integrations/NetSuite.md
deleted file mode 100644
index 3ce0d07cb65d..000000000000
--- a/docs/articles/expensify-classic/integrations/accounting-integrations/NetSuite.md
+++ /dev/null
@@ -1,577 +0,0 @@
----
-title: NetSuite
-description: Connect and configure NetSuite directly to Expensify.
----
-# Overview
-Expensify's seamless integration with NetSuite enables you to streamline your expense reporting process. This integration allows you to automate the export of reports, tailor your coding preferences, and tap into NetSuite's array of advanced features. By correctly configuring your NetSuite settings in Expensify, you can leverage the connection's settings to automate most of the tasks, making your workflow more efficient.
-
-Before getting started with connecting NetSuite to Expensify, there are a few things to note:
-- Token-based authentication works by ensuring that each request to NetSuite is accompanied by a signed token which is verified for authenticity
-- You must be able to login to NetSuite as an administrator to initiate the connection
-- You must have a Control Plan in Expensify to integrate with NetSuite
-- Employees don’t need NetSuite access or a NetSuite license to submit expense reports since the connection is managed by the Workspace Admin
-- Each NetSuite subsidiary will need its own Expensify Group Workspace
-- Ensure that your workspace's report output currency setting matches the NetSuite Subsidiary default currency
-- Make sure your page size is set to 1000 for importing your customers and vendors. Go to Setup > Integration > Web Services Preferences > 'Search Page Size'
-
-# How to Connect to NetSuite 
-
-## Step 1: Install the Expensify Bundle in NetSuite
-
-1. While logged into NetSuite as an administrator, go to Customization > SuiteBundler > Search & Install Bundles, then search for "Expensify"
-2. Click on the Expensify Connect bundle (Bundle ID 283395)
-3. Click Install
-4. If you already have the Expensify Connect bundle installed, head to _Customization > SuiteBundler > Search & Install Bundles > List_ and update it to the latest version
-5. Select **Show on Existing Custom Forms** for all available fields
-
-## Step 2: Enable Token-Based Authentication
-
-1. Head to _Setup > Company > Enable Features > SuiteCloud > Manage Authentication_
-2. Make sure “Token Based Authentication” is enabled
-3. Click **Save**
-
-## Step 3: Add Expensify Integration Role to a User
-
-The user you select must have access to at least the permissions included in the Expensify Integration Role, but they're not required to be an Admin.
-1. In NetSuite, head to Lists > Employees, and find the user you want to add the Expensify Integration role to
-2. Click _Edit > Access_, then find the Expensify Integration role in the dropdown and add it to the user
-3. Click **Save**
-
-Remember that Tokens are linked to a User and a Role, not solely to a User. It's important to note that you cannot establish a connection with tokens using one role and then switch to another role afterward. Once you've initiated a connection with tokens, you must continue using the same token/user/role combination for all subsequent sync or export actions.
-
-## Step 4: Create Access Tokens
-
-1. Using Global Search in NetSuite, enter “page: tokens”
-2. Click **New Access Token**
-3. Select Expensify as the application (this must be the original Expensify integration from the bundle)
-4. Select the role Expensify Integration
-5. Press **Save**
-6. Copy and Paste the token and token ID to a saved location on your computer (this is the only time you will see these details)
-
-## Step 5: Confirm Expense Reports are Enabled in NetSuite.
-
-Enabling Expense Reports is required as part of Expensify's integration with NetSuite:
-1. Logged into NetSuite as an administrator, go to Setup > Company > Enable Features > Employees
-2. Confirm the checkbox next to Expense Reports is checked
-3. If not, click the checkbox and then Save to enable Expense Reports
-
-## Step 6: Confirm Expense Categories are set up in NetSuite.
-
-Once Expense Reports are enabled, Expense Categories can be set up in NetSuite. Expense Categories are an alias for General Ledger accounts for coding expenses.
-
-1. Logged into NetSuite as an administrator, go to Setup > Accounting > Expense Categories (a list of Expense Categories should show)
-2. If no Expense Categories are visible, click **New** to create new ones
-
-## Step 7: Confirm Journal Entry Transaction Forms are Configured Properly
-
-1. Logged into NetSuite as an administrator, go to _Customization > Forms > Transaction Forms_
-2. Click **Customize** or **Edit** next to the Standard Journal Entry form
-3. Then, click Screen Fields > Main. Please verify the "Created From" label has "Show" checked and the Display Type is set to Normal
-4. Click the sub-header Lines and verify that the "Show" column for "Receipt URL" is checked
-5. Go to _Customization > Forms > Transaction Forms_ and ensure all other transaction forms with the journal type have this same configuration
-
-## Step 8: Confirm Expense Report Transaction Forms are Configured Properly
-
-1. Logged into NetSuite as an administrator, go to _Customization > Forms > Transaction Forms_
-2. Click **Customize** or **Edit** next to the Standard Expense Report form, then click **Screen Fields > Main**
-3. Verify the "Created From" label has "Show" checked and the Display Type is set to Normal
-4. Click the second sub-header, Expenses, and verify that the 'Show' column for 'Receipt URL' is checked
-5. Go to _Customization > Forms > Transaction Forms_ and ensure all other transaction forms with the expense report type have this same configuration
-
-## Step 9: Confirm Vendor Bill Transactions Forms are Configured Properly
-
-1. Logged into NetSuite as an administrator, go to _Customization > Forms > Transaction Forms_ 
-2. Click **Customize** or **Edit** next to your preferred Vendor Bill form
-3. Then, click _Screen Fields > Main_ and verify that the "Created From" label has "Show" checked and that Departments, Classes, and Locations have the "Show" label unchecked
-4. Under the Expenses sub-header (make sure to click the "Expenses" sub-header at the very bottom and not "Expenses & Items"), ensure "Show" is checked for Receipt URL, Department, Location, and Class
-5. Go to _Customization > Forms > Transaction Forms_ and provide all other transaction forms with the vendor bill type have this same configuration
-
-## Step 10: Confirm Vendor Credit Transactions Forms are Configured Properly
-
-1. While logged in as an administrator, go to _Customization > Forms > Transaction Forms_
-2. Click **Customize** or **Edit** next to your preferred Vendor Credit form, then click _Screen Fields > Main_ and verify that the "Created From" label has "Show" checked and that Departments, Classes, and Locations have the "Show" label unchecked
-3. Under the Expenses sub-header (make sure to click the "Expenses" sub-header at the very bottom and not "Expenses & Items"), ensure "Show" is checked for Receipt URL, Department, Location, and Class
-4. Go to _Customization > Forms > Transaction Forms_ and ensure all other transaction forms with the vendor credit type have this same configuration
-
-## Step 11: Set up Tax Groups (only applicable if tracking taxes)
-
-Expensify imports NetSuite Tax Groups (not Tax Codes), which you can find in NetSuite under _Setup > Accounting > Tax Groups_.
-
-Tax Groups are an alias for Tax Codes in NetSuite and can contain one or more Tax Codes (Please note: for UK and Ireland subsidiaries, please ensure your Tax Groups do not have more than one Tax Code). We recommend naming Tax Groups so your employees can easily understand them, as the name and rate will be displayed in Expensify.
-
-Before importing NetSuite Tax Groups into Expensify:
-1. Create your Tax Groups in NetSuite by going to _Setup > Accounting > Tax Groups_
-2. Click **New**
-3. Select the country for your Tax Group
-4. Enter the Tax Name (this is what employees will see in Expensify)
-5. Select the subsidiary for this Tax Group
-6. Select the Tax Code from the table you wish to include in this Tax Group
-7. Click **Add**
-8. Click **Save**
-9. Create one NetSuite Tax Group for each tax rate you want to show in Expensify
-
-Ensure Tax Groups can be applied to expenses by going to _Setup > Accounting > Set Up Taxes_ and setting the Tax Code Lists Include preference to "Tax Groups And Tax Codes" or "Tax Groups Only." 
-
-If this field does not display, it’s not needed for that specific country.
-
-## Step 12: Connect Expensify and NetSuite
-
-1. Log into Expensify as a Policy Admin and go to **Settings > Workspaces > _[Workspace Name]_ > Connections > NetSuite**
-2. Click **Connect to NetSuite**
-3. Enter your Account ID (Account ID can be found in NetSuite by going to _Setup > Integration > Web Services Preferences_)
-4. Then, enter the token and token secret 
-5. Click **Connect to NetSuite**
-
-From there, the NetSuite connection will sync, and the configuration dialogue box will appear.
-
-Please note that you must create the connection using a NetSuite account with the Expensify Integration role
-
-Once connected, all reports exported from Expensify will be generated in NetSuite using SOAP Web Services (the term NetSuite employs when records are created through the integration).
-
-# How to Configure Export Settings
-
-There are numerous options for exporting Expensify reports to NetSuite. Let's explore how to configure these settings to align with your business needs.
-To access these settings, head to **Settings > Workspace > Group > Connections** and select the **Configure** button. 
-
-## Export Options
-
-### Subsidiary
-
-The subsidiary selection will only appear if you use NetSuite OneWorld and have multiple subsidiaries active. If you add a new subsidiary to NetSuite, sync the workspace connection, and the new subsidiary should appear in the dropdown list under **Settings > Workspaces > _[Workspace Name]_ > Connections**.
-
-### Preferred Exporter
-
-This option allows any admin to export, but the preferred exporter will receive notifications in Expensify regarding the status of exports.
-
-### Date
-
-The three options for the date your report will export with are:
-- Date of last expense: This will use the date of the previous expense on the report
-- Submitted date: The date the employee submitted the report
-- Exported date: The date you export the report to NetSuite
-
-## Reimbursable Expenses
-
-### Expense Reports
-
-Expensify transactions will export reimbursable expenses as expense reports by default, which will be posted to the payables account designated in NetSuite. 
-
-### Vendor Bills
-
-Expensify transactions export as vendor bills in NetSuite and will be mapped to the subsidiary associated with the corresponding policy. Each report will be posted as payable to the vendor associated with the employee who submitted the report. 
-You can also set an approval level in NetSuite for vendor bills.
-
-### Journal Entries
-
-Expensify transactions that are set to export as journal entries in NetSuite will be mapped to the subsidiary associated with this policy. All the transactions will be posted to the payable account specified in the policy. 
-
-You can also set an approval level in NetSuite for the journal entries.
-
-**Important Notes:**
-- Journal entry forms by default do not contain a customer column, so it is not possible to export customers or projects with this export option
-- The credit line and header level classifications are pulled from the employee record
-
-## Non-Reimbursable Expenses
-
-### Vendor Bills
-
-Non-reimbursable expenses will be posted as a vendor bill payable to the default vendor specified in your policy's connection settings. If you centrally manage your company cards through Domains, you can export expenses from each card to a specific vendor in NetSuite. You can also set an approval level in NetSuite for the bills. 
-
-### Journal Entries
-
-Non-reimbursable expenses will be posted to the Journal Entries posting account selected in your policy's connection settings. If you centrally manage your company cards through Domains, you can export expenses from each card to a specific account in NetSuite.
-
-**Important Notes:**
-- Expensify Card expenses will always export as Journal Entries, even if you have Expense Reports or Vendor Bills configured for non-reimbursable expenses on the Export tab
-- Journal entry forms do not contain a customer column, so it is not possible to export customers or projects with this export option
-- The credit line and header level classifications are pulled from the employee record
-
-### Expense Reports
-
-To use the expense report option for your corporate card expenses, you will need to set up your default corporate cards in NetSuite. 
-
-To use a default corporate card for non-reimbursable expenses, you must select the correct card on the employee records (for individual accounts) or the subsidiary record (If you use a non-one world account, the default is found in your accounting preferences).
-
-Add the corporate card option and corporate card main field to your expense report transaction form in NetSuite by: 
-1. Heading to _Customization > Forms > Transaction Forms > Preferred expense report form > Screen Fields_
-2. Under the Main tab, check “Show” for Account for Corporate Card Expenses
-3. On the Expenses tab, check “Show” for Corporate Card
-
-You can select the default account on your employee record to use individual corporate cards for each employee. Make sure you add this field to your employee entity form in NetSuite.
-If you have multiple cards assigned to a single employee, you cannot export to each account. You can only have a single default per employee record. 
-
-### Export Invoices
-
-Select the Accounts Receivable account you want your Invoice Reports to export. In NetSuite, the Invoices are linked to the customer, corresponding to the email address where the Invoice was sent.
-
-### Default Vendor Bills
-
-The list of vendors will be available in the dropdown when selecting the option to export non-reimbursable expenses as vendor bills.
-
-# How to Configure Coding Settings 
-
-The Coding tab is where NetSuite information is configured in Expensify, which allows employees to code expenses and reports accurately. There are several coding options in NetSuite. Let’s go over each of those below. 
-
-## Expense Categories
-
-Expensify's integration with NetSuite automatically imports NetSuite Expense Categories as Categories in Expensify.
-
-Please note that each expense must have a Category selected to export to NetSuite. The category chosen must be imported from NetSuite and cannot be manually created in Expensify. 
-
-If you want to delete Categories, you must do this in NetSuite. Categories are added and modified on the integration’s side and then synced with Expensify.
-Once imported, you can turn specific Categories on or off under **Settings > Workspaces > _[Workspace Name]_ > Categories**. 
-
-## Tags
-
-The NetSuite integration allows you to configure Customers, Projects, Departments, Classes, and Locations as line-item expense classifications. These are called Tags in Expensify.
-
-Suppose a default Customer, Project, Department, Class, or Location ties to the employee record in NetSuite. In that case, Expensify will create a rule that automatically applies that tag to all expenses made by that employee (the Tag is still editable if necessary).
-
-If you want to delete Tags, you must do this in NetSuite. Tags are added and modified on the integration’s side and then synced with Expensify.
-
-Once imported, you can turn specific Tags on or off under **Settings > Workspaces > _[Workspace Name]_ > Tags**. 
-
-## Report Fields
-
-The NetSuite integration allows you to configure Customers, Projects, Departments, Classes, and Locations as report-level classifications. These are called Report Fields in Expensify.
-
-## NetSuite Employee Default
-
-The NetSuite integration allows you to set Departments, Classes, and Locations according to the NetSuite Employee Default for expenses exported as both Expense Reports and Journal Entries. 
-
-These fields must be set in NetSuite's employee(s) record(s) to be successfully applied to expenses upon export.
-
-You cannot use the employee default setting with a vendor bill export if you have both a vendor and an employee set up for the user under the same email address and subsidiary.
-
-## Tax
-
-The NetSuite integration allows users to apply a tax rate and amount to each expense. To do this, import Tax Groups from NetSuite: 
-1. In NetSuite, head to _Setup > Accounting > Tax Groups_
-2. Once imported, go to the NetSuite connection configuration page in Expensify (under **Settings > Workspaces > Group > _[Workspace Name]_ > Connection > NetSuite > Coding**), refresh the subsidiary list, and the Tax option will appear
-3. From there, enable Tax
-4. Click **Save**
-5. Sync the connection
-6. All Tax Groups for the connected NetSuite subsidiary will be imported to Expensify as taxes.
-7. After syncing, go to **Settings > Workspace > Group > _[Workspace Name]_ > Tax** to see the tax groups imported from NetSuite
-8. Use the turn on/off button to choose which taxes to make available to your employees
-9. Select a default tax to apply to the workspace (that tax rate will automatically apply to all new expenses)
-
-## Custom Segments
-
-To add a Custom Segment to your workspace, you’ll need to locate three fields in NetSuite:
-- Segment Name
-- Internal ID
-- Script/Field ID
-
-**To find the Segment Name:**
-1. Log in as an administrator in NetSuite
-2. Head to _Customization > Lists, Records, & Fields > Custom Segments_
-3. You’ll see the Segment Name on the Custom Segments page
-
-**To find the Internal ID:**
-1. Ensure you have internal IDs enabled in NetSuite under _Home > Set Preferences_
-2. Navigate back to the Custom Segment page
-3. Click the **Custom Record Type** hyperlink
-4. You’ll see the Internal ID on the Custom Record Type page
-
-**To find the Script/Field ID:**
-
-If configuring Custom Segments as Report Fields, use the Field ID on the Transactions tab (under _Custom Segments > Transactions_).
-
-If configuring Custom Segments as Tags, use the Field ID on the Transaction Columns tab (under _Custom Segments > Transaction Columns_). 
-
-Lastly, head over to Expensify and do the following:
-1. Navigate to **Settings > Workspace > Group > _[Workspace Name]_ > Connections > Configure > Coding tab**
-2. Choose how to import Custom Segments (Report Fields or Tags) 
-3. Fill out the three fields (Segment Name, Internal ID, Script ID)
-4. Click **Submit**
-
-From there, you should see the values for the Custom Segment under the Tag or Report Field settings in Expensify. 
-
-Don’t use the "Filtered by" feature available for Custom Segments. Expensify can’t make these dependent on other fields. If you do have a filter selected, we suggest switching that filter in NetSuite to "Subsidiary" and enabling all subsidiaries to ensure you don't receive any errors upon exporting reports. 
-
-### Custom Records
-
-Custom Records are added through the Custom Segments feature.
-
-To add a Custom Record to your workspace, you’ll need to locate three fields in NetSuite:
-- The name of the record
-- Internal ID
-- Transaction Column ID
-
-**To find the Internal ID:**
-1. Make sure you have Internal IDs enabled in NetSuite under Home > Set Preferences
-2. Navigate back to the Custom Segment page
-3. Click the Custom Record Type hyperlink
-4. You’ll see the Internal ID on the Custom Record Type page
-
-**To find the Transaction Column ID:**
-If configuring Custom Segments as Report Fields, use the Field ID on the Transactions tab (under _Custom Segments > Transactions_).
-
-If configuring Custom Segments as Tags, use the Field ID on the Transaction Columns tab (under _Custom Segments > Transaction Columns_). 
-
-Lastly, head over to Expensify and do the following:
-1. Navigate to **Settings > Workspace > Group > [Workspace Name]_ > Connections > Configure > Coding tab**
-2. Choose how to import Custom Records (Report Fields or Tags) 
-3. Fill out the three fields (the name or label of the record, Internal ID, Transaction Column ID)
-4. Click **Submit**
-
-From there, you should see the values for the Custom Records under the Tag or Report Field settings in Expensify. 
-
-### Custom Lists
-
-To add Custom Lists to your workspace, you’ll need to locate two fields in NetSuite:
-- The name of the record
-- The ID of the Transaction Line Field that holds the record
-
-**To find the record:**
-1. Log into Expensify
-2. Head to **Settings > Workspace > Group > _[Workspace Name]_ > Connections > Configure > Coding tab**
-3. The name of the record will be populated in a dropdown list
-
-The name of the record will populate in a dropdown list. If you don't see the one you are looking for, click **Refresh Custom List Options**.
-
-**To find the Transaction Line Field ID:**
-1. Log into NetSuite
-2. Search "Transaction Line Fields" in the global search
-3. Open the option that is holding the record to get the ID
-
-Lastly, head over to Expensify, and do the following:
-1. Navigate to **Settings > Workspaces > Group > _[Workspace Name]_ > Connections > Configure > Coding tab**
-2. Choose how to import Custom Lists (Report Fields or Tags)
-3. Enter the ID in Expensify in the configuration screen
-4. Click **Submit**
-
-From there, you should see the values for the Custom Lists under the Tag or Report Field settings in Expensify. 
-
-# How to Configure Advanced Settings
-
-The NetSuite integration’s advanced configuration settings are accessed under **Settings > Workspaces > Group > _[Workspace Name]_ > Connections > NetSuite > Configure > Advanced tab**.
-
-Let’s review the different advanced settings and how they interact with the integration.
-
-## Auto Sync
-
-Enabling Auto Sync ensures that the information in NetSuite and Expensify is always in sync through automating exports, tracking direct deposits, and communicating export errors.
-
-**Automatic Export:**
-- When you turn on the Auto Sync feature in Expensify, any final report you approve will automatically be sent to NetSuite.
-- This happens every day at approximately the same time.
-
-**Direct Deposit Alert:**
-- If you use Expensify's Direct Deposit ACH and have Auto Sync, getting reimbursed for an Expensify report will automatically create a Bill Payment in NetSuite.
-
-**Tracking Exports and Errors:**
-- In the comments section of an Expensify report, you can find extra details about the report.
-- The comments section will tell you when the report was sent to NetSuite, and if there were any problems during the export, it will show the error.
-
-## Newly Imported Categories
-
-With this enabled, all submitters can add any newly imported Categories to an Expense. 
-
-## Invite Employees & Set Approval Workflow
-
-### Invite Employees
-
-Use this option in Expensify to bring your employees from a specific NetSuite subsidiary into Expensify.
-Once imported, Expensify will send them an email letting them know they've been added to a workspace.
-
-### Set Approval Workflow
-
-Besides inviting employees, you can also establish an approval process in NetSuite.
-
-By doing this, the Approval Workflow in Expensify will automatically follow the same rules as NetSuite, typically starting with Manager Approval.
-
-- **Basic Approval:** A single level of approval, where all users submit directly to a Final Approver. The Final Approver defaults to the workspace owner but can be edited on the people page.
-- **Manager Approval (default):** Two levels of approval route reports first to an employee's NetSuite expense approver or supervisor, and second to a workspace-wide Final Approver. By NetSuite convention, Expensify will map to the supervisor if no expense approver exists. The Final Approver defaults to the workspace owner but can be edited on the people page. 
-- **Configure Manually:** Employees will be imported, but all levels of approval must be manually configured on the workspace's People settings page. If you enable this setting, it’s recommended you review the newly imported employees and managers on the **Settings > Workspaces > Group > _[Workspace Name]_ > People page**. You can set a user role for each new employee and enforce an approval workflow.
-
-## Automatically Create Employees/Vendors
-
-With this feature enabled, Expensify will automatically create a new employee or vendor (if one doesn’t already exist) from the email of the report submitter in NetSuite. 
-
-## Export Foreign Currency Amount
-
-Using this feature allows you to send the original amount of the expense rather than the converted total when exporting to NetSuite. This option is available if you are exporting reimbursable expenses as Expense Reports.
-
-## Cross-Subsidiary Customers/Projects 
-
-This allows you to import Customers and Projects across all subsidiaries to a single group workspace. For this functionality, you must enable "Intercompany Time and Expense" in NetSuite. 
-
-That feature is found in NetSuite under _Setup > Company > Setup Tasks: Enable Features > Advanced Features_.
-
-## Sync Reimbursed Reports
-
-If you're using Expensify's Direct Deposit ACH feature and you want to export reimbursable expenses as either Expense Reports or Vendor Bills in NetSuite, here's what to do:
-1. In Expensify, go to the Advanced Settings tab
-2. Look for a toggle or switch related to this feature
-3. Turn it on by clicking the toggle
-4. Select the correct account for the Bill Payment in NetSuite
-5. Ensure the account you choose matches the default account for Bill Payments in NetSuite
-
-That's it! When Expensify reimburses an expense report, it will automatically create a corresponding Bill Payment in NetSuite.
-
-Alternatively, if reimbursing outside of Expensify, this feature will automatically update the expense report status in Expensify from Approved to Reimbursed when the respective report is paid in NetSuite and the corresponding workspace syncs via Auto-Sync or when the integration connection is manually synced.
-
-## Setting Approval Levels
-
-With this setting enabled, you can set approval levels based on your export type. 
-
-- **Expense Reports:** These options correspond to the default preferences in NetSuite – “Supervisor approval only,” “Accounting approval only,” or “Supervisor and Accounting approved.”
-- **Vendor Bills or Journal Entries:** These options correspond to the default preferences in NetSuite –  “Pending Approval” or “Approved for Posting.”
-
-If you have Approval Routing selected in your accounting preference, this will override the selections in Expensify. 
-
-If you do not wish to use Approval Routing in NetSuite, go to _Setup > Accounting > Accounting Preferences > Approval Routing_ and ensure Vendor Bills and Journal Entries are not selected. 
-
-### Collection Account
-
-When exporting invoices, once marked as Paid, the payment is marked against the account selected after enabling the Collection Account setting.
-
-# Deep Dive
-
-## Categories
-
-You can use the Auto-Categorization feature so that expenses are automatically categorized. 
-
-To set Category Rules (e.g., receipt requirements or comments), go to the categories page in the workspace under **Settings > Workspaces > _[Workspace Name]_ > Categories**. 
-
-With this setting enabled, when an Expense Category updates in NetSuite, it will update in Expensify automatically. 
-
-## Company Cards
-
-NetSuite's company card feature simplifies exporting reimbursable and non-reimbursable transactions to your General Ledger (GL). This approach is recommended for several reasons:
-
-1. **Separate Employees from Vendors:** NetSuite allows you to maintain separate employee and vendor records. This feature proves especially valuable when integrating with Expensify. By utilizing employee defaults for classifications, your employees won't need to apply tags to all their expenses manually.
-2. **Default Accounts Payable (A/P) Account:** Expense reports enable you to set a default A/P account for export on your subsidiary record. Unlike vendor bills, where the A/P account defaults to the last selected account, the expense report export option allows you to establish a default A/P account.
-3. **Mix Reimbursable and Non-Reimbursable Expenses:** You can freely mix reimbursable and non-reimbursable expenses without categorizing them in NetSuite after export. NetSuite's corporate card feature automatically categorizes expenses into the correct GL accounts, ensuring a neat and organized GL impact.
-
-#### Let’s go over an example! 
-
-Consider an expense report with one reimbursable and one non-reimbursable expense. Each needs to be exported to different accounts and expense categories.
-
-In NetSuite, you can quickly identify the non-reimbursable expense marked as a corporate card expense. Reviewing the GL impact, you'll notice that the reimbursable expense is posted to the default A/P account set on the subsidiary record. On the other hand, the company card expense is assigned to the Credit Card account, which can either be set as a default on the subsidiary record (for a single account) or the employee record (for individual credit card accounts in NetSuite).
-
-Furthermore, each expense is categorized according to your selected expense category.
-
-You'll need to set up default corporate cards in NetSuite to use the expense report option for your corporate card expenses.
-
-For non-reimbursable expenses, choose the appropriate card on the subsidiary record. You can find the default in your accounting preferences if you're not using a OneWorld account.
-
-Add the corporate card option and the corporate card main field to configure your expense report transaction form in NetSuite:
-1. Go to _Customization > Forms > Transaction Forms > Preferred expense report form > Screen Fields_
-2. Under the Main tab, check "Show for Account for Corporate Card Expenses"
-3. On the Expenses tab, check "Show for Corporate Card"
-
-If you prefer individual corporate cards for each employee, you can select the default account on the employee record. Add this field to your employee entity form in NetSuite (under _Customize > Customize Form_ from any employee record). Note that each employee can have only one corporate card account default.
-
-### Exporting Company Cards to GL Accounts in NetSuite
-
-If you need to export company card transactions to individual GL accounts, you can set that up at the domain level. 
-
-Let’s go over how to do that: 
-1. Go to **Settings > Domain > _[Domain name]_ > Company Cards**
-2. Click the Export Settings cog on the right-hand side of the card and select the GL account where you want the expenses to export
-
-After setting the account, exported expenses will be mapped to that designated account.
-
-## Tax 
-
-You’ll want to set up Tax Groups in Expensify if you're keeping track of taxes.
-
-Expensify can import "NetSuite Tax Groups" (not Tax Codes) from NetSuite. Tax Groups can contain one or more Tax Codes. If you have subsidiaries in the UK or Ireland, ensure your Tax Groups have only one Tax Code.
-
-You can locate these in NetSuite by setting up> Accounting > Tax Groups.
-
-You’ll want to name Tax Groups something that makes sense to your employees since both the name and the tax rate will appear in Expensify.
-
-To bring NetSuite Tax Groups into Expensify, here's what you need to do:
-1. Create your Tax Groups in NetSuite by going to _Setup > Accounting > Tax Groups_
-2. Click **New**
-3. Pick the country for your Tax Group
-4. Enter the Tax Name (this will be visible to your employees in Expensify)
-5. Next, select the subsidiary for this Tax Group 
-6. Finally, from the table, choose the Tax Code you want to include in this Tax Group
-7. Click **Add**, then click **Save**
-
-Repeat those steps for each tax rate you want to use in Expensify. 
-
-Next, ensure that Tax Groups can be applied to expenses: 
-1. In NetSuite, head to _Setup > Accounting > Set Up Taxes_
-2. Set the preference for "Tax Code Lists Include" to either "Tax Groups And Tax Codes" or "Tax Groups Only." If you don't see this field, don't worry; it means you don't need to set it for that specific country
-
-NetSuite has a pre-made list of tax groups for specific locations, but you can also create your own. We'll import both your custom tax groups and the default ones. It's important not to deactivate the default NetSuite tax groups because we rely on them for exporting specific types of expenses.
-
-For example, there's a default Canadian tax group called CA-Zero, which we use when exporting mileage and per diem expenses that don't have any taxes applied in 
-
-Expensify. If you deactivate this group in NetSuite, it will lead to export errors.
-
-Additionally, some tax nexuses in NetSuite have specific settings that need to be configured in a certain way to work seamlessly with the Expensify integration:
-- ​​In the Tax Code Lists Include field, choose "Tax Groups" or "Tax Groups and Tax Codes." This setting determines how tax information is handled.
-- In the Tax Rounding Method field, select "Round Off." Although it won't cause connection errors, not using this setting can result in exported amounts differing from what NetSuite expects.
-
-If your tax groups are importing into Expensify but not exporting to NetSuite, check that each tax group has the right subsidiaries enabled. That is crucial for proper data exchange.
-
-## Multi-Currency
-
-When using multi-currency features with NetSuite, remember these points:
-
-**Matching Currencies:** The currency set for a vendor or employee record must match the currency chosen for the subsidiary in your Expensify configuration. This alignment is crucial for proper handling.
-
-**Foreign Currency Conversion:** If you create expenses in one currency and then convert them to another currency within Expensify before exporting, you can include both the original and converted amounts in the exported expense reports. This option, called "Export foreign currency amount," can be found in the Advanced tab of your configuration. Note that Expensify sends only the amounts; the actual currency conversion is performed in NetSuite.
-
-**Bank Account Currency:** When synchronizing bill payments, make sure your bank account's currency matches the subsidiary's currency. Failure to do so will result in an "Invalid Account" error. This alignment is necessary to prevent issues during payment processing.
-
-## Exporting Invoices
-
-When you mark an invoice as paid in Expensify, the paid status syncs with NetSuite and vice versa!
-
-Let's dive right in:
-1. Access Configuration Settings: Go to **Settings > Workspace > Group > _[Workspace Name]_ > Connections > Configuration**
-2. Choose Your Accounts Receivable Account: Scroll down to "Export Expenses to" and select the appropriate Accounts Receivable account from the dropdown list. If you don't see any options, try syncing your NetSuite connection by returning to the Connections page and clicking **Sync Now**
-
-### Exporting an Invoice to NetSuite
-
-Invoices will be automatically sent to NetSuite when they are in the "Processing" or "Paid" status. This ensures you always have an up-to-date record of unpaid and paid invoices.
-
-If you have Auto Sync disabled, you'll need to export your invoices, along with your expense reports, manually. Follow these three simple steps:
-1. Filter Invoices: From your Reports page, use filters to find the invoices you want to export.
-2. Select Invoices: Pick the invoices ready for export.
-3. Export to NetSuite: Click **Export to NetSuite** in the top right-hand corner.
-
-When exporting to NetSuite, we match the recipient's email address on the invoice to a customer record in NetSuite, meaning each customer in NetSuite must have an email address in their profile. If we can't find a match, we'll create a new customer in NetSuite.
-
-Once exported, the invoice will appear in the Accounts Receivable account you selected during your NetSuite Export configuration.
-
-### Updating an Invoice to paid
-
-When you mark an invoice as "Paid" in Expensify, this status will automatically update in NetSuite. Similarly, if the invoice is marked as "Paid" in NetSuite, it will sync with Expensify. The payment will be reflected in the Collection account specified in your Advanced Settings Configuration.
-
-## Download NetSuite Logs
-
-Sometimes, we might need more details from you to troubleshoot issues with your NetSuite connection. Providing the NetSuite web services usage logs is incredibly useful. 
-
-Here's how you can send them to us:
-1. **Generate the Logs:** Start by trying to export a report from your system. This action will create the most recent logs that we require.
-2. **Access Web Services Usage Logs:** You can locate these logs in your NetSuite account. Just use the global search bar at the top of the page and type in "Web Services Usage Log."
-3. **Identify the Logs:** Look for the most recent log entry. It should have "FAILED" under the STATUS column. Click on the two blue "view" links under the REQUEST and RESPONSE columns. These are the two .xml files we need to examine.
-
-Send these two files to your Account Manager or Concierge so we can continue troubleshooting! 
-
-{% include faq-begin.md %}
-
-## What type of Expensify plan is required for connecting to NetSuite?
-
-You need a group workspace on a Control Plan to integrate with NetSuite. 
-
-## How does Auto Sync work with reimbursed reports? 
-
-If a report is reimbursed via ACH or marked as reimbursed in Expensify and then exported to NetSuite, the report is automatically marked as paid in NetSuite during the next sync.
-
-If a report is exported to NetSuite and then marked as paid in NetSuite, the report is automatically marked as reimbursed in Expensify during the next sync. 
-
-## If I enable Auto Sync, what happens to existing approved and reimbursed reports? 
-
-If you previously had Auto Sync disabled but want to allow that feature to be used going forward, you can safely turn on Auto Sync without affecting existing reports. Auto Sync will only take effect for reports created after enabling that feature.
-
-{% include faq-end.md %}
diff --git a/docs/articles/expensify-classic/integrations/accounting-integrations/QuickBooks-Desktop.md b/docs/articles/expensify-classic/integrations/accounting-integrations/QuickBooks-Desktop.md
deleted file mode 100644
index 8fe31f3ec4f4..000000000000
--- a/docs/articles/expensify-classic/integrations/accounting-integrations/QuickBooks-Desktop.md
+++ /dev/null
@@ -1,147 +0,0 @@
----
-title: QuickBooks Desktop
-description: How to connect Expensify to QuickBooks Desktop and troubleshoot issues.
----
-# Overview
-QuickBooks Desktop is an accounting package developed by Intuit. It is designed for small and medium-sized businesses to help them manage their financial and accounting tasks. You can connect Expensify to QuickBooks Desktop to make expense management seamless.
-To connect Expensify with QuickBooks Desktop, using Right Networks as your hosting platform is best. Right Networks is a cloud-based service we recommend for this integration. If you need a Right Networks account, complete [this form](https://info.rightnetworks.com/partner-expensify) and contact a Sales Consultant to start the process.
-
-# How to connect to QuickBooks Desktop
-Before you link your Expensify policy with QuickBooks Desktop, ensure you log in as an Admin in QuickBooks. Also, check that the company file you want to connect to is the only one open.
-
-## Set up submitters in QuickBooks Desktop
-For a seamless integration, here are the steps to follow:
-* Make sure all report submitters are set up as Vendors in QuickBooks Desktop and their Expensify email is in the "Main Email" field of their Vendor record. You can do this in the vendor section of QuickBooks.
-* If you want to export reports to your users' employee records instead of vendor records, select Check or Journal Entry as your reimbursable export option.
-* To set up Expensify users as employees, activate QuickBooks Desktop Payroll. This module is necessary to access the Employee Profile tab, where you can enter the submitter's email addresses.
-  
-## Enable/install the Expensify Sync Manager
-Navigate to **Settings** > **Policies** > **Group** > _[Policy Name]_ > **Connections**, select the Connect to QuickBooks Desktop radio button and click Connect to QuickBooks.
-
-**Enable the Expensify Sync Manager in Right Networks (recommended)**
-*Please note: Single-user mode in QuickBooks Desktop is required.* 
-If you don't yet have an account with Right Networks, you must first contact Right Networks [here](https://info.rightnetworks.com/partner-expensify). You can enable the Expensify Sync Manager yourself from your Right Networks portal's **My Account** section or contact Right Networks for assistance. 
-
-**OR, install the Expensify Sync Manager on Your Third-Party Remote Desktop.**
-To download the Sync Manager to your desktop, you must contact your third-party remote desktop provider and request permission. They might have security restrictions, so it's best to communicate with them directly to avoid potential problems with the Sync Manager. Remember that the Sync Manager program file should be stored in the same location (i.e., the same drive) as your QuickBooks Desktop program.
-
-## Complete the connection
-1. Open QuickBooks and access your desired Company File using the QuickBooks Admin credentials. Admin credentials are necessary for creating the connection due to permission requirements, but you won't need to stay logged in as an admin for syncing or exporting.
-2. Navigate to your Expensify policy settings by going to **Settings** > **Policies** > **Group** > _[Policy Name]_ > **Connections**. Copy the Token by selecting the copy icon.
-3. While QuickBooks is still running, launch the Expensify Sync Manager. Paste your Token into the Sync Manager and click **Save**.
-4. Once the Sync Manager status displays **Connected**, return to Expensify and click the *Continue* button.
-
-## Allow access
-1. Return to QuickBooks, and you'll encounter an **Application Certificate** screen. On the first page of the Certificate screen, click **Yes, always; allow access even if QuickBooks is not running** and then click **Continue**.
-2. On the second page of the Certificate screen, choose the Admin user from the dropdown menu, and then click *Done* to complete this step. Note that selecting Admin here does not require you to be logged in as an admin to use this connection; it's simply selecting the appropriate permissions.
-3. Head back to Expensify and patiently wait for the sync process to finish, then move on to the configuration.
-
-# How to configure export settings for QuickBooks Desktop
-To Configure Settings, go to **Settings** > **Policies** > **Group** > _[Policy Name]_ > **Connections** and click **Configure**.
-
-## Preferred Exporter
-This person is used in QuickBooks Desktop as the export user. They will also receive notifications for errors.
-
-## Date
-Choose either the report's submitted date, the report's exported date, or the date of the last expense on the report when exporting reports to QuickBooks Desktop.
-
-## Use unique reference numbers
-Enable this to allow use of a unique reference number for each transaction. Disable this to use the same Report ID for all expenses from a certain report.
-
-## Reimbursable expenses
-* **Vendor Bill (recommended):** A single itemized vendor bill for each Expensify report. An A/P account is required to export to a vendor bill.  
-* **Check:** A single itemized check for each Expensify report.
-* **Journal Entry:** A single itemized journal entry for each Expensify report.
-
-## Non-reimbursable expenses
-**Credit Card Expenses:**
-* Each expense will appear as a separate credit card transaction.
-* The posting date will match your credit card statement.
-* To display the merchant name in the payee field in QuickBooks Desktop, ensure that a matching Vendor exists in QuickBooks. Expensify searches for an exact match during export. If no match is found, the payee is mapped to a **Credit Card Misc.** Vendor created by Expensify.
-* If you're centrally managing company cards through Domain Control, you can export expenses from each card to a specific QuickBooks account (detailed instructions available).
-  
-**Debit Card Expenses:**
-* Expenses export as individual itemized checks for each Expensify report.
-* The check is written to the "vendor," which is the person who created or submitted the report in Expensify.
-
-**Vendor Bill:**
-* Each Expensify report results in a single itemized vendor bill.
-* The bill is associated with the "vendor," which is the individual responsible for creating or submitting the report in Expensify.
-
-# How to configure coding for QuickBooks Desktop
-## Categories
-Expensify's integration with QuickBooks brings in your Chart of Accounts as Categories in Expensify automatically. Here's how to manage them:
-1. After connecting, go to **Settings** > **Policies** > **Group** > _[Policy Name]_ > **Categories** to view the accounts imported from QuickBooks Desktop.
-2. You can use the enable/disable button to choose which Categories your employees can access. Additionally, you can set specific rules for each Category via the blue settings cog.
-3. Expensify offers Auto-Categorization to automatically assign expenses to the appropriate expense categories.
-4. If needed, you can edit the names of the imported Categories to simplify expense coding for your employees. Keep in mind that if you make changes to these accounts in QuickBooks Desktop, the category names in Expensify will update to match them during the next sync.
-5. _**Important:**_ Each expense must have a category selected to export to QuickBooks Desktop. The selected category must be one imported from QuickBooks Desktop; you cannot manually create categories within Expensify policy settings.
-
-## Classes
-Classes can be imported from QuickBooks as either tags (line-item level) or report fields (header level).
-
-## Customers/Projects
-You can bring in Customers/Projects from QuickBooks into Expensify in two ways: as tags (at the line-item level) or as report fields (at the header level). If you're utilizing Billable Expenses in Expensify, here's what you need to know:
-* Customers/Projects must be enabled if you're using Billable Expenses.
-* Expenses marked as "Billable" need to be tagged with a Customer/Project to successfully export them to QuickBooks.
-
-## Items 
-Items can be imported from QuickBooks as categories alongside your expense accounts.
-
-{% include faq-begin.md %}
-## How do I sync my connection?
-1: Ensure that both the Expensify Sync Manager and QuickBooks Desktop are running.
-2: On the Expensify website, navigate to **Settings** > **Policies** > **Group** > _[Policy Name]_ > **Connections** > **QuickBooks Desktop**, and click **Sync now**.
-3: Wait for the syncing process to finish. Typically, this takes about 2-5 minutes, but it might take longer, depending on when you last synced and the size of your QuickBooks company file. The page will refresh automatically once syncing is complete.
-
-We recommend syncing at least once a week or whenever you make changes in QuickBooks Desktop that could impact how your reports export from Expensify. Changes could include adjustments to your Chart of Accounts, Vendors, Employees, Customers/Jobs, or Items. Remember, both the Sync Manager and QuickBooks Desktop need to be running for syncing or exporting to work.
-
-## Can I export negative expenses?
-Generally, you can export negative expenses to QuickBooks Desktop successfully, regardless of your option. However, please keep in mind that if you have *Check* selected as your export option, the report's total cannot be negative.
-
-## How does multi-currency work with QuickBooks Desktop?
-When using QuickBooks Desktop Multi-Currency, there are some limitations to consider based on your export options:
-1. **Vendor Bills and Checks:** The currency of the vendor and the currency of the account must match, but they do not have to be in the home currency.
-2. **Credit Card:** If an expense doesn't match an existing vendor in QuickBooks, it exports to the **Credit Card Misc.** vendor created by Expensify. When exporting a report in a currency other than your home currency, the transaction will be created under the vendor's currency with a 1:1 conversion. For example, a transaction in Expensify for $50 CAD will appear in QuickBooks as $50 USD.
-3. **Journal Entries:** Multi-currency exports will fail because the account currency must match both the vendor currency and the home currency.
-
-# Sync and export errors
-## Error: No Vendor Found For Email in QuickBooks
-To address this issue, ensure that each submitter's email is saved as the **Main Email** in their Vendor record within QuickBooks Desktop. Here's how to resolve it:
-1. Go to your Vendor section in QuickBooks.
-2. Verify that the email mentioned in the error matches the **Main Email** field in the respective vendor's record. It's important to note that this comparison is case-sensitive, so ensure that capitalization matches as well.
-3. If you prefer to export reports to your users' employee records instead of their vendor records, select either **Check** or **Journal Entry** as your reimbursable export option. If you are setting up Expensify users as employees, activate QuickBooks Desktop Payroll to access the Employee Profile tab where submitter email addresses need to be entered.
-4. Once you've added the correct email to the vendor record, save this change, and then sync your policy before attempting to export the report again.
-
-## Error: Do Not Have Permission to Access Company Data File
-To resolve this error, follow these steps:
-1. Log into QuickBooks Desktop as an Admin in single-user mode.
-2. Go to **Edit** > **Preferences** > **Integrated Applications** > **Company Preferences**.
-3. Select the Expensify Sync Manager and click on **Properties**.
-4. Ensure that **Allow this application to login automatically** is checked, and then click **OK**. Close all windows within QuickBooks.
-5. If you still encounter the error after following the above steps, go to **Edit** > **Preferences** > **Integrated Applications** > **Company Preferences**, and remove the Expensify Sync Manager from the list.
-6. Next, attempt to sync your policy again in Expensify. You'll be prompted to re-authorize the connection in QuickBooks.
-7. Click **Yes, always; allow access even if QuickBooks is not running.**
-8. From the dropdown, select the Admin user, and then click **Continue**. Note that selecting **Admin** here doesn't mean you always have to be logged in as an admin to use the connection; it's just required for setting up the connection.
-9. Click **Done** on the pop-up window and return to Expensify, where your policy should complete the syncing process.
-
-## Error: The Wrong QuickBooks Company is Open.
-This error suggests that the wrong company file is open in QuickBooks Desktop. To resolve this issue, follow these steps:
-1. First, go through the general troubleshooting steps as outlined.
-2. If you can confirm that the incorrect company file is open in QuickBooks, go to QuickBooks and select **File** > **Open or Restore Company** > _[Company Name]_ to open the correct company file. After doing this, try syncing your policy again.
-3. If the correct company file is open, but you're still encountering the error, completely close QuickBooks Desktop, reopen the desired company file and then attempt to sync again.
-4. If the error persists, log into QuickBooks as an admin in single-user mode. Then, go to **Edit** > **Preferences** > **Integrated Applications** > **Company Preferences** and remove the Expensify Sync Manager from the list.
-5. Next, try syncing your policy again in Expensify. You'll be prompted to re-authorize the connection in QuickBooks, allowing you to sync successfully.
-6. If the error continues even after trying the steps above, double-check that the token you see in the Sync Manager matches the token in your connection settings.
-
-## Error: The Expensify Sync Manager Could Not Be Reached.
-To resolve this error, follow these steps:
-*Note: You must be in single-user mode to sync.*
-
-1. Ensure that both the Sync Manager and QuickBooks Desktop are running.
-2. Confirm that the Sync Manager is installed in the correct location. It should be in the same location as your QuickBooks application. If QuickBooks is on your local desktop, the Sync Manager should be there, too. If QuickBooks is on a remote server, install the Sync Manager there.
-Verify that the Sync Manager's status is **Connected**.
-3. If the Sync Manager status is already **Connected**, click **Edit** and then *Save* to refresh the connection. Afterwards, try syncing your policy again.
-4. If the error persists, double-check that the token you see in the Sync Manager matches the token in your connection settings.
-
-{% include faq-end.md %}
diff --git a/docs/articles/expensify-classic/integrations/accounting-integrations/QuickBooks-Online.md b/docs/articles/expensify-classic/integrations/accounting-integrations/QuickBooks-Online.md
deleted file mode 100644
index 623e5f1dd997..000000000000
--- a/docs/articles/expensify-classic/integrations/accounting-integrations/QuickBooks-Online.md
+++ /dev/null
@@ -1,324 +0,0 @@
----
-title: QuickBooks Online
-description: Everything you need to know about using Expensify's direct integration with QuickBooks Online.
----
-# Overview
-
-The Expensify integration with QuickBooks Online brings in your expense accounts and other data and even exports reports directly to QuickBooks for easy reconciliation. Plus, with advanced features in QuickBooks Online, you can fine-tune coding settings in Expensify for automated data export to optimize your accounting workflow.
-
-## Before connecting
-
-It's crucial to understand the requirements based on your specific QuickBooks subscription:
-
-- While all the features are available in Expensify, their accessibility may vary depending on your QuickBooks Online subscription.
-- An error will occur if you try to export to QuickBooks with a feature enabled that isn't part of your subscription.
-- Please be aware that Expensify does not support the Self-Employed subscription in QuickBooks Online.
-
-![QuickBooks Online - Subscription types]({{site.url}}/assets/images/QBO1.png){:width="100%"}
-
-# How to connect to QuickBooks Online
-
-## Step 1: Setup employees in QuickBooks Online
-
-Employees must be set up as either Vendors or Employees in QuickBooks Online. Make sure to include the submitter's email in their record.
-
-If you use vendor records, you can export as Vendor Bills, Checks, or Journal Entries. If you use employee records, you can export as Checks or Journal Entries (if exporting against a liability account).
-
-Additional Options for Streamlined Setup:
-
-- Automatic Vendor Creation: Enable “Automatically Create Entities” in your connection settings to automatically generate Vendor or Employee records upon export for submitters that don't already exist in QBO.
-- Employee Setup Considerations: If setting up submitters as Employees, ensure you activate QuickBooks Online Payroll. This will grant access to the Employee Profile tab to input employee email addresses.
-
-## Step 2: Connect Expensify and QuickBooks Online
-
-- Navigate to Settings > Workspaces > Group > [Workspace Name] > Connections > QuickBooks Online. Click Connect to QuickBooks.
-- Enter your QuickBooks Online Administrator’s login information and choose the QuickBooks Online Company File you want to connect to Expensify (you can connect one Company File per Workspace). Then click Authorize.
-- Enter your QuickBooks Online Administrator’s login information and choose the QuickBooks Online Company File you want to connect to Expensify (you can connect one Company File per Workspace):
-
-## Exporting historical Reports to QuickBooks Online:
-
-After connecting QuickBooks Online to Expensify, you may receive a prompt to export all historical reports from Expensify. To export multiple reports at once, follow these steps:
-
-- Go to the Reports page on the web.
-- Tick the checkbox next to the reports you want to export.
-- Click 'Export To' and select 'QuickBooks Online' from the drop-down list.
-
-If you don't want to export specific reports, click “Mark as manually entered” on the report.
-
-# How to configure export settings for QuickBooks Online
-
-Our QuickBooks Online integration offers a range of features. This section will focus on Export Settings and how to set them up.
-
-## Preferred Exporter
-
-Any Workspace admin can export to your accounting integration, but the Preferred Exporter can be chosen to automate specific steps. You can set this role from Settings > Workspaces > Group > [Workspace Name] > Connections > Configure > Export > Preferred Exporter.
-
-The Preferred Exporter:
-
-- Is the user whose Concierge performs all automated exports on behalf of.
-- Is the only user who will see reports awaiting export in their **Home.**
-- Must be a **Domain Admin** if you have set individual GL accounts for Company Card export.
-- Must be a **Domain Admin** if this is the Preferred Workspace for any Expensify Card domain using Automatic Reconciliation.
-
-## Date
-
-When exporting reports to QuickBooks Online, you can choose the report's **submitted date**, the report's **exported date**, or the **date of the last expense on the report.**
-
-Most export options (Check, Journal Entry, and Vendor Bill) will create a single itemized entry with one date. 
-Please note that if you choose a Credit Card or Debit Card for non-reimbursable expenses, we'll use the transaction date on each expense during export. 
-
-# Reimbursable expenses 
-
-Reimbursable expenses export to QuickBooks Online as:
-
-- Vendor Bills
-- Checks
-- Journal Entries
-
-## Vendor bill (recommended)
-
-This is a single itemized vendor bill for each Expensify report. If the accounting period is closed, we will post the vendor bill on the first day of the next open period. If you export as Vendor Bills, you can also choose to Sync reimbursed reports (set on the Advanced tab). **An A/P account is required to export to a vendor bill.**
-
-The submitter will be listed as the vendor in the vendor bill.
-
-![Vendor Bill]({{site.url}}/assets/images/QBO2-Bill.png){:width="100%"}
-
-## Check
-
-This is a single itemized check for each Expensify report. You can mark a check to be printed later in QuickBooks Online.
-
-![Check to print]({{site.url}}/assets/images/QBO3-Checktoprint.png){:width="100%"}
-
-## Journal entry
-
-This is a single itemized journal entry for each Expensify report.
-
-![Journal Entry]({{site.url}}/assets/images/QBO4-JournalEntry.png){:width="100%"}
-
-# Non-reimbursable expenses
-
-Non-reimbursable expenses export to QuickBooks Online as:
-
-- Credit Card expenses
-- Debit Card Expenses
-- Vendor Bills
-
-## Credit/debit card
-
-Using Credit/Debit Card Transactions:
-
-- Each expense will be exported as a bank transaction with its transaction date.
-- If you split an expense in Expensify, we'll consolidate it into a single credit card transaction in QuickBooks with multiple line items posted to the corresponding General Ledger accounts.
-
-Pro-Tip: To ensure the payee field in QuickBooks Online reflects the merchant name for Credit Card expenses, ensure there's a matching Vendor in QuickBooks Online. Expensify checks for an exact match during export. If none are found, the payee will be mapped to a vendor we create and labeled as Credit Card Misc. or Debit Card Misc.
-
-![Expense]({{site.url}}/assets/images/QBO5-Expense.png){:width="100%"}
-
-If you centrally manage your company cards through Domains, you can export expenses from each card to a specific account in QuickBooks.
-
-## Vendor Bill
-
-- A single detailed vendor bill is generated for each Expensify report. If the accounting period is closed, the vendor bill will be posted on the first day of the next open period. If you choose to export non-reimbursable expenses as Vendor Bills, you can assign a default vendor to the bill.
-- The export will use your default vendor if you have Default Vendor enabled. If the Default Vendor is disabled, the report's submitter will be set as the Vendor in QuickBooks.
-
-## Billable Expenses
-
-- In Expensify, you can designate expenses as billable. These will be exported to QuickBooks Online with the billable flag. This feature applies only to expenses exported as Vendor Bills or Checks. To maximize this functionality, ensure that any billable expense is associated with a Customer/Job.
-
-## Export Invoices
-
-If you are creating Invoices in Expensify and exporting these to QuickBooks Online, this is the account the invoice will appear against.
-
-# Configure coding for QuickBooks Online
-
-The coding tab is where your information is configured for Expensify; this will allow employees to code expenses and reports accurately.
-
-- Categories
-- Classes and/or Customers/Projects
-- Locations
-- Items
-- Tax 
-
-## Categories
-
-QuickBooks Online expense accounts will be automatically imported into Expensify as Categories.
-
-## Account Import
-
-Equity type accounts will also be imported as categories.
-
-Important notes:
-
-- Other Current Liabilities can only be exported as Journal Entries if the submitter is set up as an Employee in QuickBooks.
-- Exchange Gain or Loss detail type does not import.
-  
-Recommended steps to take after importing the expense accounts from QuickBooks to Expensify:
-
-- Go to Settings > Workspaces > Groups > [Workspace Name] > Categories to see the accounts imported from QuickBooks Online.
-- Use the enable/disable button to choose which Categories to make available to your employees, and set Category specific rules via the blue settings cog.
-- If necessary, edit the names of imported Categories to make expense coding easier for your employees. (Please Note: If you make any changes to these accounts in QuickBooks Online, the category names on Expensify's side will revert to match the name of the account in QuickBooks Online the next time you sync). 
-- If you use Items in QuickBooks Online, you can import them into Expensify as Categories.
-
-Please note that each expense has to have a category selected to export to QuickBooks Online. The chosen category has to be imported from QuickBooks Online and cannot be manually created within the Workspace settings. 
-
-## Classes and Customers/Projects
-
-If you use Classes or Customers/Projects in QuickBooks Online, you can import those into Expensify as Tags or Report Fields:
-
-- Tags let you apply a Class and/or Customer/Project to each expense.
-- Report Fields enables you to apply a Class and/or Customer/Project to all expenses on a report.
-
-Note: Although Projects can be imported into Expensify and coded to expenses, due to the limitations of the QuickBooks API, expenses cannot be created within the Projects module in QuickBooks. 
-
-## Locations
-
-Locations can be imported into Expensify as a Report Field or, if you export reimbursable expenses as Journal Entries and non-reimbursable expenses as Credit/Debit Card, you can import Locations as Tags.
-
-## Items
-
-If you use Items in QuickBooks Online, you can import Items defined with Purchasing Information (with or without Sales Information) into Expensify as Categories.
-
-## Tax
-
-- Using our tax tracking feature, you can assign a tax rate and amount to each expense.
-- To activate tax tracking, go to connection configuration and enable it. This will automatically import purchasing taxes from QuickBooks Online into Expensify.
-- After the connection is set, navigate to Settings > Workspaces > Groups > [Workspace Name] > Tax. Here, you can view the taxes imported from QuickBooks Online.
-- Use the enable/disable button to choose which taxes are accessible to your employees.
-- Set a default tax for the Company Workspace, which will automatically apply to all new expenses.
-- Please note that, at present, tax cannot be exported to Journal Entries in QuickBooks Online.
-- Expensify performs a daily sync to ensure your information is up-to-date. This minimizes errors from outdated QuickBooks Online data and saves you time on syncing.
-
-# How to configure advanced settings for QuickBooks Online
-
-The advanced settings are where functionality for automating and customizing the QuickBooks Online integration can be enabled.
-Navigate to this section of your Workspace by following Settings > Workspaces > Group > [Workspace Name] > Connections > Configure button > Advanced tab.
-
-## Auto Sync
-With QuickBooks Online auto-sync, once a non-reimbursable report is final approved in Expensify, it's automatically queued for export to QuickBooks Online. For expenses eligible for reimbursement with a linked business bank account, they'll sync when marked as reimbursed.
-
-## Newly Imported Categories
-
-This setting determines the default status of newly imported categories from QuickBooks Online to Expensify, either enabled or disabled.
-
-## Invite Employees
-
-Enabling this automatically invites all Employees from QuickBooks Online to the connected Expensify Company Workspace. If not, you can manually invite or import them using a CSV file.
-
-## Automatically Create Entities
-
-When exporting reimbursable expenses as Vendor Bills or Journal Entries, Expensify will automatically create a vendor in QuickBooks if one doesn't exist. It will also generate a customer when exporting Invoices.
-
-## Sync Reimbursed Reports
-
-Enabling this marks the Vendor Bill as paid in QuickBooks Online when you reimburse a report via ACH direct deposit in Expensify. If reimbursing outside Expensify, marking the Vendor Bill as paid will automatically in QuickBooks Online update the report as reimbursed in Expensify. Note: After enabling this feature, select your QuickBooks Account in the drop-down, indicating the bank account for reimbursements.
-
-## Collection Account
-
-If you are exporting Invoices from Expensify to Quickbooks Online, this is the account the Invoice will appear against once marked as Paid.
-
-# Deep Dive
-
-## Preventing Duplicate Transactions in QuickBooks
-
-When importing a banking feed directly into QuickBooks Online while also importing transactions from Expensify, it's possible to encounter duplicate entries in QuickBooks. To prevent this, follow these steps:
-
-Step 1: Complete the Approval Process in Expensify
-
-- Before exporting any expenses to QuickBooks Online, ensure they are added to a report and the report receives approval. Depending on your Workspace setup, reports may require approval from one or more individuals. The approval process concludes when the last user who views the report selects "Final Approve."
-
-Step 2: Exporting Reports to QuickBooks Online
-
-- To ensure expenses exported from Expensify match seamlessly in the QuickBooks Banking platform, make sure these expenses are marked as non-reimbursable within Expensify and that “Credit Card” is selected as the non-reimbursable export option for your expenses.
-
-Step 3: Importing Your Credit Card Transactions into QuickBooks Online
-
-- After completing Steps 1 and 2, you can import your credit card transactions into QuickBooks Online. These imported banking transactions will align with the ones brought in from Expensify. QuickBooks Online will guide you through the process of matching these transactions, similar to the example below:
-
-![Transactions]({{site.url}}/assets/images/QBO7-Transactions.png){:width="100%"}
-
-## Tax in QuickBooks Online
-
-If your country applies taxes on sales (like GST, HST, or VAT), you can utilize Expensify's Tax Tracking along with your QuickBooks Online tax rates. Please note: Tax Tracking is not available for Workspaces linked to the US version of QuickBooks Online. If you need assistance applying taxes after reports are exported, contact QuickBooks.
-
-To get started:
-
-- Go to Settings > Workspaces > Group > [Workspace Name] > Connections, and click Configure.
-- Navigate to the Coding tab.
-- Turn on **Tax**.
-- Click Save. This imports the Tax Name and rate from QuickBooks Online.
-- Visit Settings > Workspaces > Group > [Workspace Name] > Tax to view the imported taxes.
-- Use the enable/disable button in the Tax tab to choose which taxes your employees can use.
-
-Remember, you can also set a default tax rate for the entire Workspace. This will be automatically applied to all new expenses. The user can still choose a different tax rate for each expense.
-
-Tax information can't be sent to Journal Entries in QuickBooks Online. Also, when dealing with multiple tax rates, where one receipt has different tax rates (like in the EU, UK, and Canada), users should split the expense into the respective parts and set the appropriate tax rate for each part.
-
-## Multi-currency
-
-When working with QuickBooks Online Multi-Currency, there are some things to remember when exporting Vendor Bills and Check! Make sure the vendor's currency and the Accounts Payable (A/P) bank account match.
-
-In QuickBooks Online, the currency conversion rates are not applied when exporting. All transactions will be exported with a 1:1 conversion rate, so for example, if a vendor's currency is CAD (Canadian Dollar) and the home currency is USD (US Dollar), the export will show these currencies without applying conversion rates.
-
-![Check]({{site.url}}/assets/images/QBO6-Check.png){:width="100%"}
-
-To correct this, you must manually update the conversion rate after the report has been exported to QuickBooks Online. 
-
-Specifically for Vendor Bills:
-
-If multi-currency is enabled and the Vendor's currency is different from the Workspace currency, OR if QuickBooks Online home currency is foreign from the Workspace currency, then:
-
-- We create the Vendor Bill in the Vendor's currency (this is a QuickBooks Online requirement - we don't have a choice)
-- We set the exchange rate between the home currency and the Vendor's currency
-- We convert line item amounts to the vendor's currency
-
-Let's consider this example:
-
-- QuickBooks Online home currency is USD
-- Vendor's currency is VND
-- Workspace (report) currency is JPY
-
-Upon export, we:
-
-1. Specified the bill is in VND
-2. Set the exchange rate between VND and USD (home currency), computed at the time of export.
-3. Converted line items from JPY (currency in Expensify) to VND
-4. QuickBooks Online automatically computed the USD amount (home currency) based on the exchange rate we specified
-5. Journal Entries, Credit Card, and Debit Card:
-
-Multi-currency exports will fail as the account currency must match both the vendor and home currencies. 
-
-## Report Fields
-
-Report fields are a handy way to collect specific information for a report tailored to your organization's needs. They can specify a project, business trip, client, location, and more!
-
-When integrating Expensify with Your Accounting Software, you can create your report fields in your accounting software so the next time you sync your Workspace, these fields will be imported into Expensify.
-
-To select how a specific field imports to Expensify, head to Settings > Workspaces > Group > 
-[Workspace Name] > Connections > Accounting Integrations > QuickBooks Online > Configure > Coding.
-
-Here are the QuickBooks Online fields that can be mapped as a report field within Expensify:
-
-- Classes
-- Customers/Projects
-- Locations
-
-{% include faq-begin.md %}
-
-## What happens if the report can't be exported to QuickBooks Online automatically?
-
-If a report encounters an issue during automatic export to QuickBooks Online, you'll receive an email with details about the problem, including any specific error messages. These messages will also be recorded in the report's history section. 
-
-The report will be placed in your Home for your attention. You can address the issues there. If you need further assistance, refer to our QuickBooks Online Export Errors page or export the report manually.
-
-## How can I ensure that I final approve reports before they're exported to QuickBooks Online?
-
-To ensure reports are reviewed before export, set up your Workspaces with the appropriate workflow in Expensify. Additionally, consider changing your Workspace settings to enforce expense Workspace workflows strictly. This guarantees that your Workspace's workflow is consistently followed.
-
-## What happens to existing approved and reimbursed reports if I enable Auto Sync?
-
-- If Auto Sync was disabled when your Workspace was linked to QuickBooks Online, enabling it won't impact existing reports that haven't been exported.
-- If a report has been exported and reimbursed via ACH, it will be automatically marked as paid in QuickBooks Online during the next sync.
-- If a report has been exported and marked as paid in QuickBooks Online, it will be automatically marked as reimbursed in Expensify during the next sync.
-- Reports that have yet to be exported to QuickBooks Online won't be automatically exported.
-
-{% include faq-end.md %}
diff --git a/docs/articles/expensify-classic/integrations/accounting-integrations/Sage-Intacct.md b/docs/articles/expensify-classic/integrations/accounting-integrations/Sage-Intacct.md
deleted file mode 100644
index 560a65d0d722..000000000000
--- a/docs/articles/expensify-classic/integrations/accounting-integrations/Sage-Intacct.md
+++ /dev/null
@@ -1,570 +0,0 @@
----
-title: Sage Intacct
-description: Connect your Expensify workspace with Sage Intacct
----
-# Overview
-Expensify’s seamless integration with Sage Intacct allows you to connect using either Role-based permissions or User-based permissions. 
-
-Once connected to Intacct you’re able to automate report exports, customize your coding preferences, and utilize Sage Intacct’s advanced features. When you’ve configured these settings in Expensify correctly, you can use the integration's settings to automate many tasks, streamlining your workflow for increased efficiency.
-
-# How to connect to Sage Intacct
-We support setting up Sage Intacct with both User-based permissions and Role-based permissions for Expense Reports and Vendor Bills.
-- User-based Permissions - Expense Reports
-- User-based Permissions - Vendor Bills
-- Role-based Permissions - Expense Reports
-- Role-based Permissions - Vendor Bills
-
-
-## User-based Permissions - Expense Reports
-
-Please follow these steps if exporting as Expense Reports with **user-based permissions**.
-
-
-### Checklist of items to complete:
-1. Create a web services user and set up permissions.
-2. Enable the Time & Expenses module **(Required if exporting as Expense Reports)**.
-3. Set up Employees in Sage Intacct **(Required if exporting as Expense Reports)**.
-4. Set up Expense Types in Sage Intacct **(Required if exporting as Expense Reports)**.
-5. Enable Customization Services (only applicable if you don't already use Platform Services).
-6. Create a test workspace and download the [Expensify Package](https://community.expensify.com/home/leaving?allowTrusted=1&target=https%3A%2F%2Fwww.expensify.com%2Ftools%2Fintegrations%2FdownloadPackage).
-7. Upload the Package in Sage Intacct.
-8. Add web services authorization.
-9. Enter credentials and connect Expensify and Sage Intacct.
-10. Configure integration sync options.
-11. Export a test report.
-12. Connect Sage Intacct to the production workspace.
-
-
-### Step 1: Create a web services user with user-based permissions
-
-_Note: If the steps in this section look different in your Sage Intacct instance, you likely use role-based permissions. If that's the case, see the steps below on creating a web services user for role-based permissions._
-To connect to Sage Intacct, you'll need to create a special web services user. This user is essential for tracking actions in Sage Intacct, such as exporting expense reports and credit card charges from Expensify. It also helps ensure smooth operations when new members join or leave your accounting team. The good news is that setting up this web services user won't cost you anything. Just follow these steps:
-Go to **Company > Web Services Users > New**
-Setup the user using these configurations:
-   - **User ID:** "xmlgateway_expensify"
-   - **Last Name and First Name:** "Expensify"
-   - **Email Address:** Your shared accounting team email
-   - **User Type:** "Business"
-   - **Admin Privileges:** "Full"
-   - **Status:** "Active"
-Once you've created the user, you'll need to set the correct permissions. To set those, go to the **subscription** link for this user in the user list, **click on the checkbox** next to the Application/Module and then click on the **Permissions** link to modify those. 
-
-These are the permissions required for a user to export reimbursable expenses as Expense Reports:
-- **Administration (All)**
-- **Company (Read-only)**
-- **Cash Management (All)**
-- **General Ledger (All)**
-- **Time & Expense (All)**
-- **Projects (Read-only)** (only needed if using Projects and Customers)
-- **Accounts Payable (All)** (only needed for exporting non-reimbursable expenses as vendor bills)
-
-**Note:** you can set permissions for each Application/Module by selecting the radio button next to the desired Permission and clicking **Save**.
-
-
-### Step 2: Enable the Time & Expenses Module (Only required if exporting reimbursable expenses as Expense Reports)
-The Time & Expenses (T&E) module is often included in your Sage Intacct instance, but if it wasn't part of your initial Sage Intacct setup, you may need to enable it. **Enabling the T&E module is a paid subscription through Sage Intacct. For information on the costs of enabling this module, please contact your Sage Intacct account manager**. It's necessary for our integration and only takes a few minutes to configure.
-1. In Sage Intacct, go to the **Company menu > Subscriptions > Time & Expenses** and toggle the switch to subscribe.
-2. After enabling T&E, configure it as follows:
-   - Ensure that **Expense types** is checked:
-   - Under **Auto-numbering sequences** set the following:
-       - **Expense Report:** EXP
-       - **Employee:** EMP
-       - **Duplicate Numbers:** Select “Do not allow creation”
- 
-     - To create the EXP sequence, **click on the down arrow on the expense report line and select **Add**:
-       - **Sequence ID:** EXP
-       - **Print Title:** EXPENSE REPORT
-       - **Starting Number:** 1
-       - **Next Number:** 2
-3. Select **Advanced Settings** and configure the following:
-- **Fixed Number Length:** 4
-- **Fixed Prefix:** EXP
-4. Click **Save**
-5. Under Expense Report approval settings, ensure that **Enable expense report approval** is unchecked
-6. Click **Save** to confirm your configurations.
-
-
-### Step 3: Set up Employees in Sage Intacct (Only required if exporting reimbursable expenses as Expense Reports)
-To set up Employees in Sage Intacct, follow these steps:
-1. Navigate to **Time & Expenses** and click the plus button next to **Employees**.
-   - If you don't see the Time & Expense option in the top ribbon, you may need to adjust your settings. Go to **Company > Roles > Time & Expenses** and enable all permissions.
-2. To create an employee, you'll need to provide the following information:
-   - **Employee ID**
-   - **Primary contact name**
-   - **Email address**
-     - In the **Primary contact name** field, click the dropdown arrow.
-     - Select the employee if they've already been created. 
-     - Otherwise, click **+ Add** to create a new employee.
-     - Fill in their **Primary Email Address** along with any other required information.
-
-
-### Step 4: Set up Expense Types in Sage Intacct (Only required if exporting reimbursable expenses as Expense Reports)
-
-Expense Types provide a user-friendly way to display the names of your expense accounts to your employees. They are essential for our integration. To set up Expense Types, follow these steps:
-1. **Setup Your Chart of Accounts:** Before configuring Expense Types, ensure your Chart of Accounts is set up. You can set up accounts in bulk by going to **Company > Open Setup > Company Setup Checklist > click Import**.
-2. **Set up Expense Types:**
-   - Go to **Time & Expense**.
-   - Open Setup and click the plus button next to **Expense Types**.
-3. For each Expense Type, provide the following information:
-   - **Expense Type**
-   - **Description**
-   - **Account Number** (from your General Ledger)
-This step is necessary if you are exporting reimbursable expenses as Expense Reports.
-
-
-### Step 5: Enable Customization Services
-To enable Customization Services go to **Company > Subscriptions > Customization Services**.
-   - If you already have Platform Services enabled, you can skip this step.
-
-
-### Step 6: Create a Test Workspace in Expensify and Download the [Expensify Package](https://community.expensify.com/home/leaving?allowTrusted=1&target=https%3A%2F%2Fwww.expensify.com%2Ftools%2Fintegrations%2FdownloadPackage)
-Creating a test workspace in Expensify allows you to have a sandbox environment for testing before implementing the integration live. If you are already using Expensify, creating a test workspace ensures that your existing group workspace rules and approval workflows remain intact. Here's how to set it up:
-1. Go to **expensify.com > Settings > Workspaces > New Workspace**.
-2. Name the workspace something like "Sage Intacct Test Workspace."
-3. Go to **Connections > Sage Intacct > Connect to Sage Intacct**.
-4. Select **Download Package** (You only need to download the file; we'll upload it from your Downloads folder later).
-
-
-### Step 7: Upload Package in Sage Intacct
-
-
-If you use **Customization Services**:
-1. Go to **Customization Services > Custom Packages > New Package**.
-2. Click on **Choose File** and select the Package file from your downloads folder.
-3. Click **Import**.
-
-
-If you use **Platform Services**:
-1. Go to **Platform Services > Custom Packages > New Package**.
-2. Click on **Choose File** and select the Package file from your downloads folder.
-3. Click **Import**.
-
-
-### Step 8: Add Web Services Authorization
-1. Go to **Company > Company Info > Security** in Intacct and click **Edit**.
-2. Scroll down to **Web Services Authorizations** and add "expensify" (all lower case) as a Sender ID.
-
-
-### Step 9: Enter Credentials and Connect Expensify and Sage Intacct
-
-
-1. Go back to **Settings > Workspaces > Group > [Workspace Name] > Connections > Configure**.
-2. Click **Connect to Sage Intacct** and enter the credentials you've set for your web services user.
-3. Click **Send** once you're done.
-
-Next, you’ll configure the Export, Coding, and Advanced tabs of the connection configuration in Expensify.
-
-
-## User-based Permissions - Vendor Bills
-In this setup guide, we'll take you through the steps to establish your connection for Vendor Bills with user-based permissions. Please follow this checklist of items to complete:
-1. Create a web services user and set up permissions.
-2. Enable Customization Services (only required if you don't already use Platform Services).
-3. Create a test workspace in Expensify and download the [Expensify Package](https://community.expensify.com/home/leaving?allowTrusted=1&target=https%3A%2F%2Fwww.expensify.com%2Ftools%2Fintegrations%2FdownloadPackage)
-4. Upload the Package in Sage Intacct.
-5. Add web services authorization.
-6. Enter credentials and connect Expensify and Sage Intacct.
-7. Configure integration sync options.
-
-
-### Step 1: Create a web services user with user-based permissions
-**Note:** If the steps in this section look different in your Sage Intacct instance, you likely use role-based permissions. If that's the case, see the steps below on creating a web services user for role-based permissions.
-To connect to Sage Intacct, it's necessary to set up a web services user. This user simplifies tracking activity within Sage Intacct, such as exporting expense reports and credit card charges from Expensify. It also ensures a seamless transition when someone joins or leaves your accounting department. Setting up the web services user is free of charge. Please follow these steps:
-1. Go to **Company > Web Services Users > New**.
-2. Configure the user as shown in the screenshot below, making sure to follow these guidelines:
-   - **User ID:** "xmlgateway_expensify"
-   - **Last Name and First Name:** "Expensify"
-   - **Email Address:** Your shared accounting team email
-   - **User Type:** "Business"
-   - **Admin Privileges:** "Full"
-   - **Status:** "Active"
-
-
-Once you've created the user, you'll need to set the correct permissions. To do this, follow these steps:
-1. Go to the subscription link for this user in the user list.
-2. Click on the checkbox next to the Application/Module you want to modify permissions for.
-3. Click on the **Permissions** link to make modifications.
-
-These are the permissions the user needs to have if exporting reimbursable expenses as Vendor Bills:
-- **Administration (All)**
-- **Company (Read-only)**
-- **Cash Management (All)**
-- **General Ledger (All)**
-- **Accounts Payable (All)**
-- **Projects (Read-only)** (required if you're going to be using Projects and Customers)
-
-**Note:** that selecting the radio button next to the Permission you want and clicking **Save** will set the permission for that particular Application/Module.
-
-
-### Step 2: Enable Customization Services (only applicable if you don't already use Platform Services)
-To enable Customization Services go to **Company > Subscriptions > Customization Services**.
-   - If you already have Platform Services enabled, you can skip this step.
-
-### Step 3: Create a Test Workspace in Expensify and Download [Expensify Package](https://community.expensify.com/home/leaving?allowTrusted=1&target=https%3A%2F%2Fwww.expensify.com%2Ftools%2Fintegrations%2FdownloadPackage)
-Creating a test workspace in Expensify allows you to establish a sandbox environment for testing before implementing the integration in a live environment. If you're already using Expensify, creating a test workspace ensures that your existing company workspace rules and approval workflows remain intact. Here's how to set it up:
-1. Go to **expensify.com > Settings > Workspaces > Groups > New Workspace**.
-2. Name the workspace something like "Sage Intacct Test Workspace."
-3. Go to **Connections > Sage Intacct > Connect to Sage Intacct**.
-4. Select "I've completed these" if you've downloaded the  [Expensify Package](https://community.expensify.com/home/leaving?allowTrusted=1&target=https%3A%2F%2Fwww.expensify.com%2Ftools%2Fintegrations%2FdownloadPackage) and completed the previous steps in Sage Intacct.
-5. Select **Download Package** (You only need to download the file; we'll upload it from your Downloads folder later).
-
-### Step 4: Upload the Package in Sage Intacct
-If you use **Customization Services**:
-
-1. Go to **Customization Services > Custom Packages > New Package**.
-2. Click on **Choose File** and select the Package file from your downloads folder.
-3. Click **Import**.
-
-
-If you use **Platform Services**:
-
-1. Go to **Platform Services > Custom Packages > New Package**.
-2. Click on **Choose File** and select the Package file from your downloads folder.
-3. Click **Import**.
-
-### Step 5: Add Web Services Authorization
-1. Go to **Company > Company Info > Security** in Intacct and click **Edit**.
-2. Scroll down to **Web Services Authorizations** and add "expensify" (all lowercase) as a Sender ID.
-
-### Step 6: Enter Credentials and Connect Expensify with Sage Intacct
-1. Go back to **Settings > Workspaces > Groups > [Workspace Name] > Connections > Configure**.
-2. Click on **Connect to Sage Intacct**.
-3. Enter the credentials that you've previously set for your web services user.
-4. Click **Send** once you've finished entering the credentials.
-
-Next, you’ll configure the Export, Coding, and Advanced tabs of the connection configuration in Expensify.
-
-
-
-## Role-based Permissions - Expense Reports
-
-For this setup guide, we're going to walk you through how to get your connection up and running as Expense Reports with role-based permissions.
-
-### Checklist of items to complete:
-
-1. Create web services user and set up permissions
-2. Enable Time & Expenses module
-3. Set up Employees in Sage Intacct
-4. Set up Expense Types in Sage Intacct
-5. Enable Customization Services (only applicable if you don't already use Platform Services)
-6. Create a test workspace and download the [Expensify Package](https://community.expensify.com/home/leaving?allowTrusted=1&target=https%3A%2F%2Fwww.expensify.com%2Ftools%2Fintegrations%2FdownloadPackage)
-7. Upload the Package in Sage Intacct
-8. Add web services authorization
-9. Enter credentials and connect Expensify and Sage Intacct
-10. Configure integration sync options
-
-
-### Step 1: Create a web services user with role-based permissions
-
-In Sage Intacct, click **Company**, then click on the **+** button next to **Roles**.
-
-Name the role, then click **Save**.
-
-Go to **Roles > Subscriptions** for the "Expensify" role you just created.
-
-Set the permissions for this role by clicking the checkbox and then clicking on the **Permissions** hyperlink.
-
-These are the permissions required for a user to export reimbursable expenses as Expense Reports:
-- **Administration (All)**
-- **Company (Read-only)**
-- **Cash Management (All)**
-- **General Ledger (All)**
-- **Time & Expense (All)**
-- **Projects (Read-only)** (only needed if using Projects and Customers)
-- **Accounts Payable (All)** (only needed for exporting non-reimbursable expenses as vendor bills)
-
-Now, you'll need to create a web services user and assign this role to that user.
-
-- **Company > Web Services Users > New**
-- Set up the user like the screenshot below, making sure to do the following:
-  - User ID: “xmlgateway_expensify"
-  - Last name and First name: "Expensify"
-  - Email address: your shared accounting team email
-  - User type: "Business"
-  - Admin privileges: "Full"
-  - Status: "Active"
-
-To assign the role, go to **Roles Information**:
-
-- Click the **+** button, then find the "Expensify" role and click **Save**.
-
-### Step 2: Enable the Time & Expenses module (Only required if exporting reimbursable expenses as Expense Reports)
-
-The T&E module often comes standard on your Sage Intacct instance, but you may need to enable it if it was not a part of your initial Sage Intacct implementation. Enabling the T&E module is a paid subscription through Sage Intacct. Please reach out to your Sage Intacct account manager with any questions on the costs of enabling this module. It's required for our integration and takes just a few minutes to configure.
-
-In Sage Intacct, click on the **Company** menu > **Subscriptions** > **Time & Expenses** and click the toggle to subscribe.
-
-Once you've enabled T&E, you'll need to configure it properly:
-- Ensure that **Expense types** is checked.
-- Under Auto-numbering sequences, please set the following:
-  - To create the EXP sequence, click on the down arrow on the expense report line > **Add**
-  - Sequence ID: EXP
-  - Print Title: EXPENSE REPORT
-  - Starting Number: 1
-  - Next Number: 2
-  - Once you've done this, select **Advanced Settings**
-  - Fixed Number Length: 4
-  - Fixed Prefix: EXP
-  - Once you've done this, hit **Save**
-- Under Expense Report approval settings, make sure the "Enable expense report approval" is unchecked.
-- Click **Save**!
-
-### Step 3: Set up Employees in Sage Intacct (Only required if exporting reimbursable expenses as Expense Reports)
-
-In order to set up Employees, go to **Time & Expenses** > click the plus button next to **Employees**. If you don't see Time & Expense in the top ribbon, you may need to adjust your settings by going to **Company > Roles > Time & Expenses > Enable all permissions**. To create an employee, you'll need to insert the following information:
-- Employee ID
-- Primary contact name
-- Email address (click the dropdown arrow in the Primary contact name field) > select the employee if they've already been created. Otherwise click **+ Add** > fill in their Primary Email Address along with any other information you require.
-
-### Step 4: Set up Expense Types in Sage Intacct (only required if exporting reimbursable expenses as Expense Reports)
-
-Expense Types are a user-friendly way of displaying the names of your expense accounts to your employees. They are required for our integration. In order to set up Expense Types, you'll first need to setup your Chart of Accounts (these can be set up in bulk by going to **Company > Open Setup > Company Setup Checklist > click Import**).
-
-Once you've setup your Chart of Accounts, to set Expense Types, go to **Time & Expense** > **Open Setup** > click the plus button next to **Expense Types**. For each Expense Type, you'll need to include the following information:
-- Expense Type
-- Description
-- Account Number (from your GL)
-
-### Step 5: Enable Customization Services
-
-To enable, go **Company > Subscriptions > Customization Services** (if you already have Platform Services enabled, you will skip this step).
-
-### Step 6: Create a test workspace in Expensify and download  [Expensify Package](https://community.expensify.com/home/leaving?allowTrusted=1&target=https%3A%2F%2Fwww.expensify.com%2Ftools%2Fintegrations%2FdownloadPackage)
-
-The test workspace will be used as a sandbox environment where we can test before going live with the integration. If you're already using Expensify, creating a test workspace will ensure that your existing group workspace rules, approval workflow, etc remain intact. In order to set this up:
-
-- Go to **expensify.com > Settings > Workspaces > New Workspace**
-- Name the workspace something like "Sage Intacct Test Workspace"
-- Go to **Connections > Sage Intacct > Connect to Sage Intacct**
-- Select **Download Package** (All you need to do is download the file. We'll upload it from your Downloads folder later).
-
-### Step 7: Upload Package in Sage Intacct
-
-If you use Customization Services:
-
-- **Customization Services > Custom Packages > New Package > Choose File >** select the Package file from your downloads folder > Import
-
-If you use Platform Services:
-
-- **Platform Services > Custom Packages > New Package > Choose File >** select the Package file from your downloads folder > Import
-
-### Step 8: Add web services authorization
-
-- Go to **Company > Company Info > Security** in Intacct and click Edit. Next, scroll down to Web Services authorizations and add "expensify" (this must be all lower case) as a Sender ID.
-
-### Step 9: Enter credentials and connect Expensify and Sage Intacct
-
-- Now, go back to **Settings > Workspaces > Group > [Workspace Name] > Connections > Configure > Connect to Sage Intacct** and enter the credentials that you've set for your web services user. Click Send once you're done.
-
-Next, follow the links in the related articles section below to complete the configuration for the Export, Coding, and Advanced tabs of the connection settings.
-
-## Role-based Permissions - Vendor Bills
-
-Follow the steps below to set up Sage Intacct with role-based permissions and export Vendor Bills:
-
-### Checklist of items to complete:
-
-1. Create a web services user and configure permissions.
-2. Enable Customization Services (if not using Platform Services).
-3. Create a test workspace in Expensify and download the [Expensify Package](https://community.expensify.com/home/leaving?allowTrusted=1&target=https%3A%2F%2Fwww.expensify.com%2Ftools%2Fintegrations%2FdownloadPackage).
-4. Upload the Package in Sage Intacct.
-5. Add web services authorization.
-6. Enter credentials and connect Expensify and Sage Intacct.
-7. Configure integration sync options.
-
-
-### Step 1: Create a web services user with role-based permissions
-
-In Sage Intacct:
-- Navigate to "Company" and click the **+** button next to "Roles."
-- Name the role and click **Save**.
-- Go to "Roles" > "Subscriptions" for the "Expensify" role you created.
-- Set the permissions for this role by clicking the checkbox and then clicking on the Permissions hyperlink
-
-
-These are the permissions required for a user to export reimbursable expenses as Vendor Bills:
-- **Administration (All)**
-- **Company (Read-only)**
-- **Cash Management (All)**
-- **General Ledger (All)**
-- **Time & Expense (All)**
-- **Projects (Read-only)** (only needed if using Projects and Customers)
-- **Accounts Payable (All)** (only needed for exporting non-reimbursable expenses as vendor bills)
-
-
-- Create a web services user:
-  - Go to **Company > Web Services Users > New**
-  - Configure the user as follows:
-    - User ID: "xmlgateway_expensify"
-    - Last Name and First Name: "Expensify"
-    - Email Address: Your shared accounting team email
-    - User Type: "Business"
-    - Admin Privileges: "Full"
-    - Status: "Active"
-  - To assign the role, go to "Roles Information", click the **+** button, find the "Expensify" role, and click **Save**
-
-### Step 2: Enable Customization Services
-
-Only required if you don't already use Platform Services:
-- To enable, go to **Company > Subscriptions > Customization Services**
-
-### Step 3: Create a test workspace in Expensify and download the  [Expensify Package](https://community.expensify.com/home/leaving?allowTrusted=1&target=https%3A%2F%2Fwww.expensify.com%2Ftools%2Fintegrations%2FdownloadPackage)
-
-Create a test workspace in Expensify:
-- Go to **Settings > Workspaces** and click **New Workspace** on the Expensify website.
-- Name the workspace something like "Sage Intacct Test Workspace."
-- Once created, navigate to **Settings > Workspaces > [Group Workspace Name] > Connections > Accounting Integrations > Connect to Sage Intacct**
-- Select **Create a new Sage Intacct connection/Connect to Sage Intacct**
-- Select **Download Package** (We'll upload it from your Downloads folder later.)
-
-### Step 4: Upload Package in Sage Intacct
-
-If you use **Customization Services**:
-- Go to **Customization Services > Custom Packages > New Package > Choose File > select the Package file from your downloads folder > Import**.
-
-If you use **Platform Services**:
-- Go to **Platform Services > Custom Packages > New Package > Choose File > select the Package file from your downloads folder > Import**.
-
-### Step 5: Add web services authorization
-
-- Go to **Company > Company Info > Security** in Intacct and click **Edit**
-- Scroll down to **Web Services Authorizations** and add **expensify** (all lowercase) as a Sender ID.
-
-### Step 6: Enter credentials and connect Expensify and Sage Intacct
-
-Now, go back to **Settings > Workspaces > [Group Workspace Name] > Connections > Accounting Integrations > Configure > Connect to Sage Intacct** and enter the credentials you set for your web services user. Click **Send** when finished.
-
-### Step 7: Configure your connection
-
-Once the initial sync completes, you may receive the error "No Expense Types Found" if you're not using the Time and Expenses module. Close the error dialogue, and your configuration options will appear. Switch the reimbursable export option to **Vendor Bills** and click **Save** before completing your configuration.
-
-Next, refer to the related articles section below to finish configuring the Export, Coding, and Advanced tabs of the connection configuration.
-
-# How to configure export settings
-
-When you connect Intacct with Expensify, you can configure how information appears once exported. To do this, Admins who are connected to Intacct can go to **Settings > Workspaces > Group > [Workspace Name] > Connections**, and then click on **Configure** under Intacct. This is where you can set things up the way you want.
-
-
-## Preferred Exporter
-
-Any workspace admin can export to Sage Intacct, but only the preferred exporter will see reports that are ready for export in their Inbox.
-
-
-
-## Date
-
-Choose which date you would like your Expense Reports or Vendor Bills to use when exported.
-
-- **Date of last expense:** Uses the date on the most recent expense added to the report.
-- **Exported date:** Is the date you export the report to Sage Intacct.
-- **Submitted date:** Is the date the report creator originally submitted the report.
-
-All export options except credit cards use the date in the drop-down. Credit card transactions use the transaction date.
-
-## Reimbursable Expenses
-
-Depending on your initial setup, your **reimbursable expenses** will be exported as either **Expense Reports** or **Vendor Bills** to Sage Intacct.
-
-## Non-Reimbursable Expenses
-
-**Non-reimbursable expenses** will export separately from reimbursable expenses, either as **Vendor Bills**, or as **credit card charges** to the account you select. It is not an option to export non-reimbursable expenses as **Journal** entries. 
-
-
-If you are centrally managing your company cards through Domain Control, you can export expenses from each individual card to a specific account in Intacct.
-Please note, Credit Card Transactions cannot be exported to Sage Intacct at the top-level if you have **Multi-Currency** enabled, so you will need to select an entity in the configuration of your Expensify Workspace by going to **Settings > Workspaces > Groups > [Workspace Name]  > Connections > Configure**.
-
-## Exporting Negative Expenses
-
-You can export negative expenses successfully to Intacct regardless of which Export Option you choose. The one thing to keep in mind is that if you have Expense Reports selected as your export option, the **total** of the report can not be negative.
-
-# How to configure coding settings
-
-The appearance of your expense data in Sage Intacct depends on how you've configured it in Expensify. It's important to understand each available option to achieve the desired results.
-
-## Expense Types
-
-Categories are always enabled and are the primary means of matching expenses to the correct accounts in Sage Intact. The Categories in Expensify depend on your **Reimbursable** export options:
-- If your Reimbursable export option is set to **Expense Reports** (the default), your Categories will be your **Expense Types**.
-- If your Reimbursable export option is set to **Vendor Bills**, your Categories will be your **Chart of Accounts** (also known as GL Codes or Account Codes).
-
-You can disable unnecessary categories from your **Settings > Workspaces > Group > [Workspace Name] > Categories** page if your list is too extensive. Note that every expense must be coded with a Category, or it will not export. Also, when you first set up the integration, your existing categories will be overwritten.
-
-## Billable Expenses
-
-Enabling Billable expenses allows you to map your expense types or accounts to items in Sage Intacct. To do this, you'll need to enable the correct permissions on your Sage Intacct user or role. This may vary based on the modules you use in Sage Intacct, so you should enable read-only permissions for relevant modules such as Projects, Purchasing, Inventory Control, and Order Entry.
-
-Once permissions are set, you can map your categories (expense types or accounts, depending on your export settings) to specific items, which will then export to Sage Intacct. When an expense is marked as Billable in Expensify, users must select the correct billable Category (Item), or there will be an error during export.
-
-## Dimensions - Departments, Classes, and Locations
-
-If you enable these dimensions, you can choose from three data options:
-- Not pulled into Expensify: Employee default (available when the reimbursable export option is set to Expense Reports)
-- Pulled into Expensify and selectable on reports/expenses: Tags (useful for cross-charging between Departments or Locations)
-- Report Fields (applies at the header level, useful when an employee's Location varies from one report to another)
-
-Please note that the term "tag" may appear instead of "Department" on your reports, so ensure that "Projects" is not disabled in your Tags configuration within your workspace settings. Make sure it's enabled within your coding settings of the Intacct configuration settings. When multiple options are available, the term will default to Tags.
-
-## Customers and Projects
-
-These settings are particularly relevant to billable expenses and can be configured as Tags or Report Fields.
-
-## Tax
-
-As of September 2023, our Sage Intacct integration supports native VAT and GST tax. To enable this feature, open the Sage Intacct configuration settings in your workspace, go to the Coding tab, and enable Tax. For existing Sage Intacct connectings, simply resync your workspace and the tax toggle will appear. For new Sage Intacct connections, the tax toggle will be available when you complete the integration steps. 
-Having this option enabled will then import your native tax rates from Sage Intacct into Expensify. From there, you can select default rates for each category.
-
-## User-Defined Dimensions
-
-You can add User-Defined Dimensions (UDD) to your workspace by locating the "Integration Name" in Sage Intacct. Please note that you must be logged in as an administrator in Sage Intacct to find the required fields.
-
-To find the Integration Name in Sage Intacct:
-1. Go to **Platform Services > Objects > List**
-2. Set "filter by application" to "user-defined dimensions."
-
-Now, in Expensify, navigate to **Settings > Workspaces > Group > [Workspace Name] > Connections**, and click **Configure** under Sage Intacct. On the Coding tab, enable the toggle next to User Defined Dimensions. Enter the "Integration name" and choose whether to import it into Expensify as an expense-level Tag or as a Report Field, then click **Save**.
-
-You'll now see the values for your custom segment available under Tags settings or Report Fields settings in Expensify.
-
-
-
-# How to configure advanced settings
-In multi-entity environments, you'll find a dropdown at the top of the sync options menu, where you can choose to sync with the top-level or a specific entity in your Sage Intacct instance. If you sync at the top level, we pull in employees and dimensions shared at the top level and export transactions to the top level. Otherwise, we sync information with the selected entity.
-## Auto Sync
-When a non-reimbursable report is finally approved, it will be automatically exported to Sage Intacct. Typically, non-reimbursable expenses will sync to the next open period in Sage Intacct by default. If your company uses Expensify's ACH reimbursement, reimbursable expenses will be held back and exported to Sage when the report is reimbursed.
-## Inviting Employees
-Enabling **Invite Employees** allows the integration to automatically add your employees to your workspace and create an Expensify account for them if they don't have one. 
-If you have your domain verified on your account, ensure that the Expensify account connected to Sage Intacct is an admin on your domain.
-When you toggle on "Invite Employees" on the Advanced tab, all employees in Sage Intacct who haven't been invited to the Expensify group workspace you're connecting will receive an email invitation to join the group workspace. Approval workflow will default to Manager Approval and can be further configured on the People settings page.
-## Import Sage Intacct Approvals
-When the "Import Sage Intacct Approvals" setting is enabled, Expensify will automatically set each user's manager listed in Sage Intacct as their first approver in Expensify. If no manager exists in Sage Intacct, the approver can be set in the Expensify People table. You can also add a second level of approval to your Sage Intacct integration by setting a final approver in Expensify.
-Please note that if you need to add or edit an optional final approver, you will need to select the **Manager Approval** option in the workflow. Here is how each option works:
-- **Basic Approval:** All users submit to one user.
-- **Manager Approval:** Each user submits to the manager (imported from Sage Intacct). Each manager forwards to one final approver (optional).
-- **Configure Manually:** Import employees only, configure workflow in Expensify.
-
-
-## Sync Reimbursed Reports
-When using Expensify ACH, reimbursable reports exported to Intacct are exported:
-- As Vendor Bills to the default Accounts Payable account set in your Intacct Accounts Payable module configuration, OR
-- As Expense Reports to the Employee Liabilities account in your Time & Expenses module configuration.
-When ACH reimbursement is enabled, the "Sync Reimbursed Reports" feature will additionally export a Bill Payment to the selected Cash and Cash Equivalents account listed. If **Auto Sync** is enabled, the payment will be created when the report is reimbursed; otherwise, it will be created the next time you manually sync the workspace.
-Intacct requires that the target account for the Bill Payment be a Cash and Cash Equivalents account type. If you aren't seeing the account you want in that list, please first confirm that the category on the account is Cash and Cash Equivalents.
-
-
-{% include faq-begin.md %}
-## What if my report isn't automatically exported to Sage Intacct?
-There are a number of factors that can cause automatic export to fail. If this happens, the preferred exporter will receive an email and an Inbox task outlining the issue and any associated error messages.
-The same information will be populated in the comments section of the report.
-The fastest way to find a resolution for a specific error is to search the Community, and if you get stuck, give us a shout!
-Once you've resolved any errors, you can manually export the report to Sage Intacct.
-## How can I make sure that I final approve reports before they're exported to Sage Intacct?
-Make sure your approval workflow is configured correctly so that all reports are reviewed by the appropriate people within Expensify before exporting to Sage Intacct.
-Also, if you have verified your domain, consider strictly enforcing expense workspace workflows. You can set this up via Settings > Domains > [Domain Name] > Groups.
-
-
-## If I enable Auto Sync, what happens to existing approved and reimbursed reports?
-If your workspace has been connected to Intacct with Auto Sync disabled, you can safely turn on Auto Sync without affecting existing reports which have not been exported.
-If a report has been exported to Intacct and reimbursed via ACH in Expensify, we'll automatically mark it as paid in Intacct during the next sync.
-If a report has been exported to Intacct and marked as paid in Intacct, we'll automatically mark it as reimbursed in Expensify during the next sync.
-If a report has not been exported to Intacct, it will not be exported to Intacct automatically.
-
-{% include faq-end.md %}
diff --git a/docs/articles/expensify-classic/integrations/accounting-integrations/Xero.md b/docs/articles/expensify-classic/integrations/accounting-integrations/Xero.md
deleted file mode 100644
index 9dd479e90cf1..000000000000
--- a/docs/articles/expensify-classic/integrations/accounting-integrations/Xero.md
+++ /dev/null
@@ -1,262 +0,0 @@
----
-title: The Xero Integration
-description: Everything you need to know about Expensify's direct integration with Xero
----
-
-# About
-
-The integration enables seamless import of expense accounts into Expensify and sends expense reports back to Xero as purchasing bills awaiting payment or "spend money" bank transactions.
-
-# How-to Connect to Xero
-
-## Prerequisites
-
-You must be a Workspace Admin in Expensify using a Collect or Control Workspace to connect your Xero account to Expensify.
-
-## Connect Expensify and Xero
-
-1. Let's get started by heading over to your Settings. You can find it by following this path: *Settings > Workspaces > Groups > [Workspace Name] > Connections > Xero.*
-2. To connect Expensify to Xero, click on the "Connect to Xero” button, then choose "Create a new Xero connection."
-3. Next, enter your Xero login details. After that, you'll need to select the Xero organization you want to link with Expensify. Remember, you can connect one organization for each Workspace.
-
-One important note: Starting in September 2021, there's a chance for Cashbook and Ledger-type organizations in Xero. Apps like Expensify won't be able to create invoices and bills for these accounts using the Xero API. So, if you're using a Cashbook or Ledger Xero account, please be aware that this might affect your Expensify integration.
-
-# How to Configure Export Settings for Xero
-
-When you integrate Expensify with Xero you gain control over several settings that determine how your reports will be displayed in Xero. To manage these settings simply follow this path: *Settings > Workspaces > Group > [Workspace Name] > Connections > Accounting Integrations > Xero > Configure > Export*. This is where you can fine-tune how your reports appear on the Xero side, making your expense management a breeze!
-
-## Xero Organization 
-
-When you have multiple organizations set up in Xero you can choose which one you'd like to connect. Here are some essential things to keep in mind:
-
-1. Organization Selection: You'll see this option only if you have multiple organizations configured in Xero.
-2. One Workspace, One Organization: Each Workspace can connect to just one organization at a time. It's a one-to-one connection.
-3. Adding New Organizations: If you create a new organization in Xero after your initial connection, you'll need to disconnect and then reconnect it to Xero. Don't forget to take a screenshot of your current settings by clicking on "Configure" and checking the Export, Coding, and Advanced tabs. This way, you can easily set everything up again.
-
-Now you can seamlessly manage your connections with Xero while staying in control of your configurations!
-
-## Preferred Exporter
-
-Any Workspace admin can export to Xero, but only the preferred exporter will see reports that are ready for export in their Home.
- 
-## Reimbursable Expenses
-
-Export to Xero as bills awaiting payment with the following additional settings:
-
-- Bill date — the bill is posted on the last day of the month in which expenses were incurred.
-
-To view the bills in Xero, navigate to *Business > Purchase Overview > Awaiting Payments*. Bills will be payable to the individual who created and reported the expense. 
-
-## Non-reimbursable Expenses
-
-When you export non-reimbursable expenses, like company card transactions, to Xero they'll show up as bank transactions. Each expense is neatly listed as a separate line item in the bank account of your choice. Plus the transaction date matches the date on your bank statement for seamless tracking.
-
-To check out these expenses in Xero please follow these steps:
-
-1. Head over to your Dashboard.
-2. Select your company card.
-3. Locate the specific expense you're interested in.
-
-If you're managing company cards centrally, you can export expenses from each card to a designated account in Xero using Domains. This way, you have complete control and clarity over your company's finances!
-
-# How to Configure Coding for Xero
-
-The Coding tab in Expensify is where you configure Xero information to ensure accurate expense coding by your employees. Here's how you can access these settings:
-
-1. Navigate to Settings.
-2. Go to Workspace within your specified group (Workspace Name).
-3. Click on Connections, and then hit the Configure button.
-4. Now, select the Coding tab.
-
-## Categories
-
-Xero expense accounts and those marked "Show In Expense Claims" will be automatically imported into Expensify as Categories.
-
-To manage these categories, follow these steps:
-
-1. After connecting, go to *Settings > Workspaces > Groups > [Workspace Name] > Categories*.
-2. You can enable/disable categories using the checkbox.
-3. For specific category rules (like default tax rate, maximum amount, receipts required, comments, and comment hints), click the settings cog.
-4. Note that each expense must have a category selected for it to export to Xero, and these categories need to be imported from Xero; manual creation isn't an option within Workspace settings.
-
-## Tracking Categories
-
-1. If you use Tracking categories in Xero, you can import them into Expensify as Tags, Report Fields, or the Xero contact default.
-- Tags apply a tracking category per expense.
-- Report Field applies a tracking category to the entire report.
-- Xero contact default applies the default tracking category set for the submitter in Xero.
-
-## Tax
-
-Looking to track tax in Expensify? Make sure that you have tax rates enabled in Xero and we will automatically grab those rates from Xero to allow your employees to categorize expenses with the appropriate tax rate. As an admin, you have the ability to set a default rate and also hide rates that are not applicable to the Workspace members.
-
-Tax tracking allows you to apply a tax rate and tax amount to each expense.
-1. To set this up, enable Tax tracking in your Xero configuration.
-2. After connecting, go to *Settings > Workspaces > Groups > [Workspace Name] > Tax to manage imported taxes from Xero.*
-3. You can enable/disable taxes and set default tax rates for both Workspace currency expenses and foreign currency expenses.
-
-## Billable Expenses
-
-If you bill expenses to your customers, you can track and invoice them using Expensify and Xero.
-
-1. When enabled, Xero customer contacts are imported into Expensify as Tags for expense tracking.
-- Note: In Xero, a Contact isn't a 'Customer' until they've had a bill raised against them. If you don't see your Customer imported as a tag, try raising a dummy invoice in Xero and then deleting/voiding it.
-2. After exporting to Xero, tagged billable expenses can be included on a sales invoice to your customer.
-
-Please ensure that you meet the following requirements for expenses to be placed on a sales invoice:
-1. Billable Expenses must be enabled in the Xero configuration settings.
-2. The expense must be marked as billable.
-3. The expense must be tagged with a customer.
-
-These steps should help you seamlessly manage your Xero integration within Expensify.
-
-# How to Configure Xero’s Advanced Settings
-
-If you've already set up your integration, but want to make adjustments, simply follow these steps:
-
-1. Go to Settings.
-2. Then, navigate to Workspaces within your designated group [Workspace Name].
-3. Click on Connections, and next, hit the Configure button.
-
-From there, you can dive into the "Advanced" tab to make any additional tweaks.
-
-## Auto Sync
-
-For non-reimbursable reports: Once a report has completed the approval workflow in Expensify, we'll automatically queue it for export to Xero.
-
-But, if you've added a business bank account for ACH reimbursement, any reimbursable expenses will be sent to Xero automatically when the report is marked as reimbursed or enabled for reimbursement.
-
-### Controlling Newly Imported Categories: 
-
-You can decide how newly imported categories behave in Expensify:
-
-1. Enabling or disabling this control determines the status of new categories imported from Xero to Expensify. Enabled categories are visible for employees when they categorize expenses, while disabled categories remain hidden.
-
-These settings give you the flexibility to manage your expenses and Workspace in the way that best suits your needs!
-
-## Sync Reimbursed Reports
-
-This nifty setting lets you synchronize the status of your reports between Expensify and Xero. Utilizing this setting will make sure that there is no confusion or possibility that a reimbursable report is paid out twice by mistake or that a non-reimbursable report is double entered throwing off month-end reconciliation. Here's how it works:
-
-1. When you reimburse a report via ACH direct deposit within Expensify, the purchase bill will automatically be marked as paid in Xero, and Expensify will note it as reimbursed.
-2. Don't forget to pick the Xero account where the corresponding bill payment should be recorded.
-3. It's a simple way to keep everything in sync, especially when you're awaiting payment.
-
-# Deep Dive
-
-## An Automatic Export Fails
-
-Sometimes, reports may encounter issues during automatic export to Xero. Not to worry, though! Here's what happens:
-
-1. The Technical Contact, your go-to person for technical matters, will receive an email explaining the problem.
-2. You'll also find specific error messages at the bottom of the report.
-3. To get things back on track, the report will be placed in the preferred exporter’s Home. They can review it and resolve any issues.
-
-## Consider Enforcing Expense Workspace Workflows: 
-
-For added control, you can adjust your Workspace settings to strictly enforce expense Workspace. This way, you guarantee that your Workspace’s workflow is always followed. By default this flow is in place, but employees can modify the person they submit their reports to if it's not strictly enforced.
-
-## Customize Purchase Bill Status (Optional): 
-
-You have the flexibility to set the status of your purchase bills just the way you want. Choose from the following options:
-
-1. Draft: Keep bills in a draft state until you're ready to finalize them.
-2. Awaiting Approval: If you need approval before processing bills, this option is here for you.
-
-## Multi-Currency
-
-### Handling Multi-Currency in Xero
-
-When dealing with multi-currency transactions in Xero and exporting reimbursable expenses from Expensify here's what you need to know:
-
-1. The bill created in Xero will adopt the output currency set in your Expensify Workspace, provided that it's enabled in Xero.
-2. Your general ledger reports will automatically convert to your home currency in Xero, leveraging the currency exchange rates defined in your Xero settings. It ensures everything aligns seamlessly.
-
-Now, for non-reimbursable expenses, things work slightly differently:
-
-1. Bank transactions will use the currency specified in your bank account in Xero, regardless of the currency used in Expensify.
-2. If these currencies don't match, no worries! We apply a 1:1 exchange rate to make things smooth. To ensure a hassle-free experience, just ensure that the output currency in Expensify matches the currency specified in your Xero bank account.
-
-## Tax
-
-### Enabling Tax Tracking for Seamless Integration:
-
-To simplify tax tracking, enable it in your Xero configuration. This action will automatically bring all your Xero tax settings into Expensify, turning them into usable Taxes.
-
-### After connecting your Xero account with Expensify:
-
-1. Head to Settings.
-2. Navigate to Workspaces within your specific group [Workspace Name].
-3. Click on Tax to view the taxes that have been imported from Xero.
-
-Now, here's where you can take control:
-
-1. Use the enable/disable button to choose which taxes your employees can apply to their expenses. Customize it to fit your needs.
-2. You can set a default tax rate for expenses in your Workspace currency. Additionally, if you deal with foreign currency expenses, you have the option to set another default tax (including exempt) that will automatically apply to all new expenses in foreign currencies.
-
-This setup streamlines your tax management, making it effortless for your team to handle taxes on their expenses.
-
-## Export Invoices to Xero
-
-You can effortlessly export your invoices from Expensify to Xero and even attribute them to the right Customer. Plus, when you mark an invoice as paid in Expensify, the same status will smoothly transfer to Xero and vice versa, keeping your invoice tracking hassle-free. Let's dive in:
-
-### Setting up Invoice Export to Xero:
-
-1. Navigate to Settings.
-2. Go to Workspaces within your designated group [Workspace Name].
-3. Click on Connections, then select Configuration.
-4. Now, click on the Advanced tab.
-
-### Selecting Your Xero Invoice Collection Account:
-
-1. Scroll down until you find "Xero invoice collection account." You'll see a dropdown list of your available Accounts Receivable accounts imported from Xero.
-2. Simply choose the account where you'd like your invoices to be exported.
-
-Pro Tip: If you don't see any accounts in the dropdown, try syncing your Xero connection. To do this, go back to the Connections page and hit "Sync Now."
-
-### Exporting an Invoice to Xero:
-
-Invoices will automatically make their way to Xero when they're in the Processing or Paid state. This ensures consistent tracking of unpaid and paid invoices. However, if you have Auto Sync disabled, you'll need to manually export your invoices along with your expense reports. Here's how:
-
-1. Head to your Reports page.
-2. Use the filters to locate the invoices you want to export.
-3. Select the invoices you wish to export.
-4. Click Export to > Xero on the top right-hand side.
-
-### Matching Customers and Emails:
-
-When exporting to Xero, we match the recipient's email address with a customer record in Xero. So, make sure each customer in Xero has their email listed in their profile.
-If we can't find a match, we'll create a new customer record in Xero.
-
-### Updating Invoice Status:
-
-1. When you mark an invoice as Paid in Expensify, this status will automatically reflect in Xero.
-2. Similarly, if you mark an invoice as Paid in Xero, it will update automatically in Expensify.
-3. The payment will be recorded in the Collection account you've chosen in your Advanced Settings Configuration.
-
-And that's it! You've successfully set up and managed your invoice exports to Xero, making your tracking smooth and efficient.
-
-{% include faq-begin.md %}
-
-## Will receipt images be exported to Xero?
-
-Yes! The receipt images will be exported to Xero. To see them in Xero click the 'paper' icon in the upper right corner of the expense details and view a PDF of the Expensify report including the receipt image.
-
-## How does Auto Sync work if your workspace was initially connected to Xero with Auto Sync disabled?
-
-You can safely switch it on without affecting existing reports that haven't been exported.
-
-## How does Auto Sync work if a report has already been exported to Xero and reimbursed through ACH or marked as reimbursed in Expensify?
-
-It will be automatically marked as paid in Xero during the next sync. You may either manually update by clicking Sync Now in the Connections tab or Expensify does this on your behalf overnight every day!
-
-## How does Auto Sync work if a report has been exported to Xero and marked as paid in Xero?
-
-It will be automatically marked as reimbursed in Expensify during the next sync. If you need it updated immediately please go to the Connections tab and click Sync Now or if you can wait just let Expensify do it for you overnight.
-
-## How does Auto Sync work if a report has been exported to Xero and marked as paid in Xero?
-
-Reports that haven't been exported to Xero won't be sent automatically.
-
-
-{% include faq-end.md %}
diff --git a/docs/articles/expensify-classic/reports/Add-custom-fields-to-reports-and-invoices.md b/docs/articles/expensify-classic/reports/Add-custom-fields-to-reports-and-invoices.md
new file mode 100644
index 000000000000..8203638ce7f9
--- /dev/null
+++ b/docs/articles/expensify-classic/reports/Add-custom-fields-to-reports-and-invoices.md
@@ -0,0 +1,27 @@
+---
+title: Add custom fields to reports and invoices
+description: Customize the fields that appear on a report or an invoice
+---
+<div id="expensify-classic" markdown="1">
+
+Workspace Admins can add additional required report fields which allow you to specify header-level details like specific project names, business trip information, locations, and more.
+
+{% include info.html %}
+Report fields are only available on the Control plan. You cannot create these report fields directly in Expensify if you are connected to an accounting integration (QuickBooks Online, QuickBooks Desktop, Intacct, Xero, or NetSuite). Please refer to the relevant article for instructions on creating fields within that system.
+{% include end-info.html %}
+
+To create a custom field for a report, 
+
+1. Hover over Settings and select **Workspaces**.
+2. Select the desired workspace. 
+3. Click the **Reports** tab on the left.  
+4. Scroll down to the Report and Invoice Fields section. 
+5. Under Add New Field, enter a Field Title.
+6. Click the dropdown for the Type field and select the desired selection method:
+   - **Text**: Provides a text box to type in the requested information.
+   - **Dropdown**: Provides a dropdown of options to choose from.
+   - **Date**: Opens a calendar to select a date.
+7. Select the report type: **Expense Report** or **Invoice**. 
+8. Click **Add**. 
+
+</div>
diff --git a/docs/articles/expensify-classic/reports/Assign-report-approvers-to-specific-employees.md b/docs/articles/expensify-classic/reports/Assign-report-approvers-to-specific-employees.md
index 5f79ea11378c..dbeca5a49f04 100644
--- a/docs/articles/expensify-classic/reports/Assign-report-approvers-to-specific-employees.md
+++ b/docs/articles/expensify-classic/reports/Assign-report-approvers-to-specific-employees.md
@@ -8,18 +8,51 @@ description: Create approval hierarchies for reports
 To assign different approvers for different employees, your workspace must use Advanced Approvals as the report approval workflow.
 {% include end-info.html %}
 
-Rather than having one approver for all members of the workspace, you can use the Advanced Approvals workflow to assign different report approvers to specific employees. 
+To assign different approvers for different employees (instead of everyone submitting to the same person), your workspace must use Advanced Approval as the report approval workflow.
 
 To assign a report approver to a specific member of your workspace, 
-1. Hover over Settings, then click **Workspaces**. 
-2. Click the desired workspace name. 
-3. Click the **Members** tab on the left. 
-4. Click **Settings** next to the desired member. 
-5. Click the “Approves to” dropdown and select the desired approver for the member’s reports.
-6. Click **Save**. 
-
-You can also set 
-- Over-limit approval rules that require a secondary approver when a specific member’s report expenses exceed a set limit.
-- Approvers for expenses under a specific tag or category.
+
+1. Hover over Settings, then click Workspaces.
+2. Click the desired workspace name.
+3. Click the Members tab on the left.
+4. Scroll down to the Approval Mode section and ensure that Advanced Approval is selected.
+5. Locate the employee in the Workspace Members table, which shows each member (in the User column) and who their reports are approved by (in the Submits To column). 
+6. Click a user’s Submits To field to set or update their approver.
+
+## Add levels of approval
+1. On the Workspace’s Members tab, locate the employee in the Workspace Members table and click Settings.
+2. Select the additional levels of approval you want to add for the employee:
+    - Role: Determines the employee’s level of access to reports and workspace settings. For instructions on setting roles, visit our [workspace roles guide](https://help.expensify.com/articles/expensify-classic/workspaces/Change-member-workspace-roles).
+    - Approves To: Determines who must approve a report after this user has approved it. This creates an approval chain. When added, a note is visible in the Details column of the Workspace Members table. If blank, the user is a “final approver.” 
+    - If Report Total is Over $X then Approves To: These two fields add an extra approver if the report total exceeds the set amount. When added, a note is visible in the Details column of the Workspace Members table.
+
+![Image of user approval settings]({{site.url}}/assets/images/Approves_To.png){:width="100%"}
+
+## Example
+
+Let's look at a basic workflow:
+
+| User | Submits To | Details |
+|----------|----------|-----------------|
+| Employee | Manager 1 |   |
+| Manager 1 | Finance Team | Approves to Manager 2<br>Approves to Finance Team over $1000.00 |
+| Manager 2 | Finance Team | Approves to Finance Team |
+| Finance Team | Finance Team |  |
+
+Here is what this setup means:
+
+- Employee doesn’t approve any reports. When they submit a report, it goes to Manager 1 for approval.
+- After Manager 1 approves a report from the Employee, the report goes to Manager 2 for approval unless the report is over $1,000. In that case, it goes directly to the Finance Team.
+- When Manager 1 submits their own report, it goes to the Finance Team for approval. 
+- When Manager 2 approves a report or submits their own report, it goes to the Finance Team for approval.
+- When the Finance Team submits a report, it is approved by the Finance Team. They are the final approver.
+
+Visit our How Complex Approval Workflows Work guide for more details.
+
+## FAQ
+
+What’s the difference between “Submits to” and “Approves to?”
+- Submits to: The person you submit your reports to for 1st level approval.
+- Approves to: The person you send reports that you've approved so they can complete an additional approval. This creates an approval chain. 
 
 </div>
diff --git a/docs/articles/expensify-classic/reports/Create-a-report-approval-workflow.md b/docs/articles/expensify-classic/reports/Create-a-report-approval-workflow.md
index 015bbe2e8532..18980377c4cb 100644
--- a/docs/articles/expensify-classic/reports/Create-a-report-approval-workflow.md
+++ b/docs/articles/expensify-classic/reports/Create-a-report-approval-workflow.md
@@ -18,8 +18,13 @@ Expensify allows Workspace Admins to create workflows and automations that deter
 5. Select an approval mode. 
    - **Submit and Close**: No approval is required. Once a report is submitted, it will be automatically approved and closed. This option may be useful if your expense approvals occur in another system or if the submitter and approver are the same person.
    - **Submit and Approve**: All reports go to one person that you assign as the approver. Once a report is submitted, it is sent to the approver. This is the default option. 
-   - **Advanced Approval**: Allows for more complex workflows, like assigning different approvers for different employees or requiring secondary approvals for expenses that exceed a set limit.
+   - **Advanced Approval**: Allows for more complex workflows, like assigning different [approvers](https://help.expensify.com/articles/expensify-classic/reports/Assign-report-approvers-to-specific-employees) for different employees or requiring secondary approvals for expenses that exceed a [set limit](https://help.expensify.com/articles/expensify-classic/reports/Require-review-for-over-limit-expenses).
 
 To add to your approval workflow, you can also set up approval rules for specific categories and tags. 
 
+### Enforce workflow
+If you want to ensure your employees cannot override the workflow you set for them, enable workflow enforcement on your workspace’s Members tab. Admins will still be able to “take control” of reports and override the set workflow.
+
+Visit our How Complex Approval Workflows Work guide for more details.
+
 </div>
diff --git a/docs/articles/expensify-classic/reports/How-Complex-Approval-Workflows-Work.md b/docs/articles/expensify-classic/reports/How-Complex-Approval-Workflows-Work.md
new file mode 100644
index 000000000000..0a093b5af0a4
--- /dev/null
+++ b/docs/articles/expensify-classic/reports/How-Complex-Approval-Workflows-Work.md
@@ -0,0 +1,64 @@
+---
+title: How Complex Approval Workflows Work
+description: Examples of how Advanced Approval Workflows apply in real life
+---
+Approval workflows can get complex. Let’s look at the lifecycle of an expense report from submission to final approval.
+
+## 1. Submission
+The approval workflow for all reports starts as soon as the report is submitted. Reports can be submitted manually or set to [submit automatically](https://help.expensify.com/articles/expensify-classic/reports/Automatically-submit-employee-reports) by Concierge. 
+
+If you change part of your workflow after a report has been submitted, the workflow for that report will not change unless it is retracted and resubmitted. 
+
+## 2. Category & tag approvers
+If you have [special approvers for categories or tags](https://help.expensify.com/articles/expensify-classic/reports/Assign-tag-and-category-approvers) that are added to a report, the report will go to these people for approval first. They will be notified about the report via email or an in-app notification.
+
+## 3. Approval mode
+The report will now travel through the approval workflow for the workspace:
+- Submit & Close: If you use a [Submit & Close](https://help.expensify.com/articles/expensify-classic/reports/Create-a-report-approval-workflow) workflow, the report will now close and notify the set person. 
+- Submit & Approve: If you use a [Submit & Approve](https://help.expensify.com/articles/expensify-classic/reports/Create-a-report-approval-workflow) workflow, the report will now go to the set person for their approval. 
+- Advanced Approval: If you use an [Advanced Approval](https://help.expensify.com/articles/expensify-classic/reports/Create-a-report-approval-workflow) workflow, the report will now go to the person in the submitter’s “Submits to” column of the Workspace Members table. Once that person approves the report, 
+    - The report then goes to the person in the approver’s Approves To column.
+    - If the approver has an [approval value limit](https://help.expensify.com/articles/expensify-classic/reports/Require-review-for-over-limit-expenses) (i.e. they have approval restrictions based on the total amount of the report), the report will go to the set person.
+    - The report continues through the approval workflow until it reaches someone who does not have anyone in their Approves To column. This person is the final approver.
+
+Once the report receives final approval, it may be exported to a [connected accounting software](https://help.expensify.com/expensify-classic/hubs/connections/) and/or reimbursed.
+
+## 4. Concierge approval 
+If you’ve chosen to [require manual approval for expenses that exceed a set limit](https://help.expensify.com/articles/expensify-classic/reports/Require-review-for-over-limit-expenses), any report that doesn’t contain a single expense over this amount will be approved by Concierge.
+
+## Workflow examples
+Here are some scenarios to demonstrate the different approval workflows.
+
+### Submit & Close
+Two business partners named Terry and Dana run a small business together. They don’t need approvals for their expenses, so they use the Submit & Close workflow and have Terry set as the person to submit to. Once submitted, their reports are closed.
+
+*Outcome: All submitted reports go to the main approver and are then closed automatically. No action is required for approval.*
+
+### Submit & Approve with category approvers
+Pat does the accounting for a small engineering firm. Everyone submits their reports to Pat for approval. However, all plant and equipment purchases must be seen by Dale. They created a category called “3005 Plant and Equipment” and assigned Dale as the category approver. This way, when a report is coded with this category, it will go to Dale once it is submitted. Then Pat will receive the report for final approval, reimbursement, and to export it to their accounting software connection. 
+
+*Outcome: All submitted reports go to the main approver unless they contain expenses coded with a category that requires review by another approver first.*
+
+### Submit & Approve with Scheduled Submit and Concierge approval
+Sandra’s company has a manual approval threshold of $100 and has Scheduled Submit set to weekly. That means that as long as each expense is under $100, reports will be automatically submitted once a week. 
+
+Her sales rep David regularly hosts client meetings, which results in a report filled with coffee, lunch, and parking expenses paid for on his company card. David has dutifully SmartScanned his receipts and coding them after each purchase. None of the individual expenses are over $100, so his report submits itself on Sunday evening. The report is instantly final approved within moments of submission, and the report history notes that Concierge both submitted and final approved the report.
+
+*Outcome: Report submission and approval are automated unless there are large expenses.*
+
+### Advanced Approval - Example 1
+Amal is a photojournalist for a major magazine, and they have been traveling for a week. The last report they submitted contains meals, accommodations, and emergency camera equipment. 
+1. Their report first goes to Tony, head of photography, who is the category approver for the “6050 Cameras and AV” category that was added to Amal’s report.
+2. The report then goes to Jamie, who is Amal’s manager and “submits to.” 
+3. Jamie approves and forwards the report to her “approves to” person, which is her manager Ali. 
+4. Ali approves and forwards the report to his “approves to” person, which is the finance team. 
+5. The finance team is the final approver for the report. They check the coding, approve the report, export it to the accounting system, and reimburse Amal.
+
+*Outcome: Reports go through category-specific approvers first, then through the multiple levels of approval.*
+
+### Advanced Approval - Example 2
+Amal had another travel week, but this time to Hong Kong. Their report total includes a $1,200 flight as well as $950 for accommodations and food. 
+
+The report goes to Jamie for approval, but Jamie has an “If Report Total is Over $2000 then Approves To” rule that requires large expenses to be approved by Lee. That means once Jamie approves the report, Lee must approve the expense next. Once Lee approves, the report goes to the finance team who completes the final approval. 
+
+*Outcome: Reports with multiple levels of approval go through each approver whose approval limit is not great enough until it reaches the approver with the required approval limit.*
diff --git a/docs/articles/expensify-classic/reports/Set-default-report-title.md b/docs/articles/expensify-classic/reports/Set-default-report-title.md
new file mode 100644
index 000000000000..a103ad8d5e5a
--- /dev/null
+++ b/docs/articles/expensify-classic/reports/Set-default-report-title.md
@@ -0,0 +1,17 @@
+---
+title: Set default report title
+description: Set an automatic title for all reports
+---
+<div id="expensify-classic" markdown="1">
+
+Workspace Admins can set a default report title for all reports created under a specific workspace. If desired, these titles can also be enforced to prevent employees from changing them.
+
+1. Hover over Settings and select **Workspaces**.
+2. Select the desired workspace.
+3. Click the **Reports** tab on the left.
+4. Scroll down to the Default Report Title section. 
+5. Configure the formula. You can use the example provided on the page as a guide or choose from more [report formula options](https://help.expensify.com/articles/expensify-classic/spending-insights/Custom-Templates).
+   - Some formulas will automatically update the report title as changes are made to the report. For example, any formula related to dates, total amounts, workspace name, would adjust the title before the report is submitted for approval. Changes will not retroactively update report titles for reports which have been Approved or Reimbursed.
+6. If desired, enable the Enforce Default Report Title toggle. This will prevent employees from editing the default title.  
+
+</div>
diff --git a/docs/articles/expensify-classic/travel/Approve-travel-expenses.md b/docs/articles/expensify-classic/travel/Approve-travel-expenses.md
new file mode 100644
index 000000000000..585e930a3dde
--- /dev/null
+++ b/docs/articles/expensify-classic/travel/Approve-travel-expenses.md
@@ -0,0 +1,105 @@
+---
+title: Approve travel expenses
+description: Determine how travel expenses are approved
+---
+<div id="expensify-classic" markdown="1">
+
+Travel expenses follow the same approval workflow as other expenses. Admins can configure travel expenses to be approved as soft approval, hard approval or passive approval. The approval method for in-policy and out-of-policy bookings can be managed under the **Policies** section in the **Program** menu for Expensify Travel. 
+ 
+- **Soft Approval**: Bookings are automatically approved as long as a manager does not decline them within 24 hours. However, this also means that if a manager does not decline the expenses, the arrangements will be booked even if they are out of policy. If a booking is declined, it is refunded based on the voiding/refund terms of the service provider.
+- **Hard Approval**: Bookings are automatically canceled/voided and refunded if a manager does not approve them within 24 hours. 
+- **Passive Approval**: Managers are informed of out-of-policy travel, but there is no action to be taken.
+
+# Set approval method
+
+1. Click the **Travel** tab.
+2. Click **Book or manage travel**.
+3. Click the **Program** tab at the top and select **Policies**.
+4. Under General, select approval methods for Flights, Hotels, Cars and Rail.
+
+![Screenshot of Expensify Travel policy approval settings](https://help.expensify.com/assets/images/Travel_Policy.png){:width="100%"}
+
+# Approve travel
+
+![Screenshot of Expensify Travel approval email](https://help.expensify.com/assets/images/Travel_Email.png){:width="100%"}
+
+## Soft approval
+
+Once an employee has booked a trip, their approver will receive an email notifying them of the booking with a prompt to decline it if needed. 
+
+- To approve the booking, no action is required. 
+- To decline the booking, click **Decline booking** within 24 hours. Then click **Deny Booking**.
+
+## Hard approval
+
+Once an employee has booked a trip, their approver will receive an email notifying them of the booking with a prompt to accept or decline the booking.
+
+To approve the booking, click **Approve booking**. Then click **Approve**.
+To decline the booking, click **Decline booking**. Then click **Deny**. 
+
+# FAQs
+
+## Are extended approval windows given for trips booked over the weekend or during company holidays?
+
+No, the approval window will always be 24 hours from when the trip is booked. 
+
+## How does Expensify Travel handle approvals when the assigned approver is out of office? 
+
+It is recommended to have multiple approvers for travel, as there is no delegated approval for out-of-office approvers.
+
+## Can travelers upload a document when submitting a trip for approval?
+
+Travelers are unable to add a document when submitting a trip for approval, but the company can add a ‘reason code’ in the Out of Policy rules that the traveler can complete at checkout. The traveler can then add the document to the expense report in Expensify when submitting the report. 
+
+</div>
+
+<div id="new-expensify" markdown="1">
+
+Travel expenses follow the same approval workflow as other expenses. Admins can configure travel expenses to be approved as soft approval, hard approval or passive approval. The approval method for in-policy and out-of-policy bookings can be managed under the **Policies** section in the **Program** menu for Expensify Travel. 
+ 
+- **Soft Approval**: Bookings are automatically approved as long as a manager does not decline them within 24 hours. However, this also means that if a manager does not decline the expenses, the arrangements will be booked even if they are out of policy. If a booking is declined, it is refunded based on the voiding/refund terms of the service provider.
+- **Hard Approval**: Bookings are automatically canceled/voided and refunded if a manager does not approve them within 24 hours. 
+- **Passive Approval**: Managers are informed of out-of-policy travel, but there is no action to be taken.
+
+# Set approval method
+
+1. Click the + icon in the bottom left menu and select **Book travel**. 
+2. Click **Book or manage travel**. 
+3. Click the **Program** tab at the top and select **Policies**.
+4. Under General, select approval methods for Flights, Hotels, Cars and Rail.
+
+![Screenshot of Expensify Travel policy approval settings](https://help.expensify.com/assets/images/Travel_Policy.png){:width="100%"}
+
+# Approve travel
+
+![Screenshot of Expensify Travel approval email](https://help.expensify.com/assets/images/Travel_Email.png){:width="100%"}
+
+## Soft approval
+
+Once an employee has booked a trip, their approver will receive an email notifying them of the booking with a prompt to decline it if needed. 
+
+- To approve the booking, no action is required. 
+- To decline the booking, click **Decline booking** within 24 hours. Then click **Deny Booking**.
+
+## Hard approval
+
+Once an employee has booked a trip, their approver will receive an email notifying them of the booking with a prompt to accept or decline the booking.
+
+To approve the booking, click **Approve booking**. Then click **Approve**.
+To decline the booking, click **Decline booking**. Then click **Deny**. 
+
+# FAQs
+
+## Are extended approval windows given for trips booked over the weekend or during company holidays?
+
+No, the approval window will always be 24 hours from when the trip is booked. 
+
+## How does Expensify Travel handle approvals when the assigned approver is out of office? 
+
+It is recommended to have multiple approvers for travel, as there is no delegated approval for out-of-office approvers.
+
+## Can travelers upload a document when submitting a trip for approval?
+
+Travelers are unable to add a document when submitting a trip for approval, but the company can add a ‘reason code’ in the Out of Policy rules that the traveler can complete at checkout. The traveler can then add the document to the expense report in Expensify when submitting the report. 
+
+</div>
diff --git a/docs/articles/expensify-classic/travel/Book-with-Expensify-Travel.md b/docs/articles/expensify-classic/travel/Book-with-Expensify-Travel.md
new file mode 100644
index 000000000000..5d25670ac5ab
--- /dev/null
+++ b/docs/articles/expensify-classic/travel/Book-with-Expensify-Travel.md
@@ -0,0 +1,89 @@
+---
+title: Book with Expensify Travel
+description: Book flights, hotels, cars, trains, and more with Expensify Travel
+---
+<div id="expensify-classic" markdown="1">
+
+Expensify Travel allows members to search and book flights, hotels, cars, and trains globally at the most competitive rates available. 
+
+With Expensify Travel, you can:
+- Search and book travel arrangements all in one place
+- Book travel for yourself or for someone else
+- Get real-time support by chat or phone
+- Manage all your T&E expenses in Expensify
+- Create specific rules for booking travel
+- Enable approvals for out-of-policy trips
+- Book with any credit card on the market
+- Book with the Expensify Card to get cash back and automatically reconcile transactions
+
+There is a flat fee of $15 per trip booked. A single trip can include multiple bookings, such as a flight, a hotel, and a car rental.
+
+# Book travel
+
+To book travel from the Expensify web app,
+
+1. Click the **Travel** tab.
+2. Click **Book or manage travel**.
+3. Use the icons at the top to select the type of travel arrangement you want to book: flights, hotels, cars, or trains.
+4. Enter the travel information relevant to the travel arrangement selected (for example, the destination, dates of travel, etc.). 
+5. Select all the details for the arrangement you want to book.
+6. Review the booking details and click **Book Flight / Book Hotel / Book Car / Book Rail** to complete the booking.
+
+The traveler is emailed an itinerary of the booking. Additionally,  
+- Their travel details are added to a Trip chat room under their primary workspace. 
+- An expense report for the trip is created.
+- If booked with an Expensify Card, the trip is automatically reconciled.
+
+{% include info.html %}
+The travel itinerary is also emailed to the traveler’s [copilots](https://help.expensify.com/articles/expensify-classic/copilots-and-delegates/Assign-or-remove-a-Copilot), if applicable.
+{% include end-info.html %}
+
+</div>
+
+<div id="new-expensify" markdown="1">
+Expensify Travel allows members to search and book flights, hotels, cars, and trains globally at the most competitive rates available. 
+
+With Expensify Travel, you can:
+- Search and book travel arrangements all in one place
+- Book travel for yourself or for someone else
+- Get real-time support by chat or phone
+- Manage all your T&E expenses in Expensify
+- Create specific rules for booking travel
+- Enable approvals for out-of-policy trips
+- Book with any credit card on the market
+- Book with the Expensify Card to get cash back and automatically reconcile transactions
+
+There is a flat fee of $15 per trip booked. A single trip can include multiple bookings, such as a flight, a hotel, and a car rental.
+
+# Book travel
+
+{% include selector.html values="desktop, mobile" %}
+
+{% include option.html value="desktop" %}
+1. Click the + icon in the bottom left menu and select **Book travel**. 
+2. Click **Book or manage travel**.
+3. Agree to the terms and conditions and click **Continue**.
+4. Use the icons at the top to select the type of travel arrangement you want to book: flights, hotels, cars, or trains.
+5. Enter the travel information relevant to the travel arrangement selected (for example, the destination, dates of travel, etc.). 
+6. Select all the details for the arrangement you want to book.
+7. Review the booking details and click **Book Flight / Book Hotel / Book Car / Book Rail** to complete the booking. 
+{% include end-option.html %}
+
+{% include option.html value="mobile" %}
+1. Tap the + icon in the bottom menu and select **Book travel**. 
+2. Tap **Book or manage travel**.
+3. Agree to the terms and conditions and tap **Continue**.
+4. Use the icons at the top to select the type of travel arrangement you want to book: flights, hotels, cars, or trains.
+5. Enter the travel information relevant to the travel arrangement selected (for example, the destination, dates of travel, etc.). 
+6. Select all the details for the arrangement you want to book.
+7. Review the booking details and click **Book Flight / Book Hotel / Book Car / Book Rail** to complete the booking. 
+{% include end-option.html %}
+
+{% include end-selector.html %}
+
+The traveler is emailed an itinerary of the booking. Additionally,  
+- Their travel details are added to a Trip chat room under their primary workspace. 
+- An expense report for the trip is created.
+- If booked with an Expensify Card, the trip is automatically reconciled.
+
+</div>
diff --git a/docs/articles/expensify-classic/travel/Configure-travel-policy-and-preferences.md b/docs/articles/expensify-classic/travel/Configure-travel-policy-and-preferences.md
new file mode 100644
index 000000000000..7e9a217b34ec
--- /dev/null
+++ b/docs/articles/expensify-classic/travel/Configure-travel-policy-and-preferences.md
@@ -0,0 +1,157 @@
+---
+title: Configure travel policy and preferences 
+description: Set and update travel policies and preferences for your Expensify Workspace
+---
+<div id="expensify-classic" markdown="1">
+
+As a Workspace Admin, you can set travel policies for all travel booked under a workspace, including approval methods, flight booking class, and hotel star preferences. You can also create multiple policies with specific conditions for particular groups of employees and/or non-employees. 
+
+# Create or update a travel policy
+
+Workspace admins can create different travel policies that provide travel rules for different groups of travelers. When using Expensify Travel for the first time, you will need to create a new Travel Policy.
+
+To create or update a travel policy,
+
+1. Click the **Travel** tab.
+2. Click **Book or manage travel**. 
+3. Click the **Program** tab at the top and select **Policies**. 
+4. Under Employee or Non-employee in the left menu, click **Add new** to create a new policy. 
+5. Use the **Edit members** section to select the group of employees that belong to this policy.
+    1. **To select an existing policy:** Select the policy in the left menu.
+    2. **To add a new policy:** Click **Add new** under Employee or Non-employee in the left menu. Then under the Edit members section, select the group of employees that belong to this policy.
+
+{% include info.html %}
+A Legal Entity in Expensify Travel is the equivalent of an Expensify Workspace.
+{% include end-info.html %}
+
+10. Select which travel preferences you want to modify: General, flight, hotel, car, or rail. 
+11. Click the paperclip icon next to each setting to de-couple it from your default policy.
+12. Update the desired settings.
+
+# General
+
+Determine the currency and [approval type](https://help.expensify.com/articles/expensify-classic/travel/Approve-travel-expenses#set-approval-method) for different types of travel bookings. You can also upload a PDF of your company travel policy for employees to access when booking travel. 
+
+![Screenshot of Expensify Travel policy approval settings](https://help.expensify.com/assets/images/Travel_Policy.png){:width="100%"}
+
+# Flight
+
+Flight preferences include multiple sections with different settings: 
+
+- **Flights not allowed to be booked:** Restrict specific flight classes from being booked by employees.
+- **Cabin class settings:** Set the highest cabin class allowed for booking and whether employees can accept cabin upgrades. 
+- **Budget:** Set a percentage or fare cap for the median or cheapest fares on flights, and a maximum capped price. Flight fares above this cap will be considered out of policy. You can also add customization to allow for different caps for different flight durations. 
+- **Lowest logical fare settings:** Set a preference for layovers, number of stops, flight time window, and airport connection changes. Expensify automatically takes these preferences into account when showing the lowest logical travel fare. 
+- **Add Ons and Preferences:** Select what types of add-ons your employees can book, including:
+  - Additional baggage
+  - Early check-in
+  - Seat preference
+  - No add-ons allowed
+- **Booking windows:** Add a time limit to prevent employees from booking less than a certain number of days in advance to prohibit bookings too close to the flight time.
+- **Refundable/changeable tickets:** Allow employees to book fully or partially refundable fares. To allow all options, you can leave this as the default option. 
+- **Maximum CO2 per kilometer:** If the CO2 per passenger km exceeds this threshold, the flight will be marked as out of policy. You can leave the entry blank if you do not wish to use this policy.
+- **Out of policy reason codes:** If enabled, travelers will be asked to enter a reason code for an out-of-policy flight booking. This gives them a way to provide context for why the booking is still being placed. You can also modify the reason codes by clicking Manage reason codes below the toggle.
+
+# Hotel
+
+- **Restrict booking by keyword:** Keywords entered here will be compared to the hotel rate description. If any of the keywords are found, the hotel rate will be restricted. You also have the option to provide a reason why each keyword is restricted. 
+- **Hotel rates not allowed to be booked:** Restrict specific hotel rates (such as non-refundable, prepaid, and requires deposit) from being booked by employees. This overrides all other hotel policy rules. You also have the option to add a reason why these options aren’t available. 
+- **Maximum price:** Set a maximum price per night for bookings. You can also select the Customizations by location option to set a maximum price for each location.
+- **Booking window:**  Add a time limit to prevent employees from booking less than a certain number of days in advance to prohibit bookings too close to the flight time.
+- **Cancellation policy:** Allow your employees to book fully or partially refundable rooms. To allow all options, you can leave this as the default option. 
+- **Experience:** Set hotel ratings that are in and out of policy.
+- **Nightly median rate:** Determine which hotels to consider when calculating the median price. You can set a radius around the search location and include/disclude hotels above or below a certain rating.
+- **Out of policy reason codes:** If enabled, travelers will be asked to enter a reason code for an out-of-policy hotel booking. This gives them a way to provide context for why the booking is still being placed. You can also modify the reason codes by clicking Manage reason codes below the toggle.
+
+# Car
+
+- **Car categories not allowed:** Restrict specific car types from being booked by employees. This overrides any other car policy.
+- **Car categories in policy:** Define the types of cars that are in policy. If you do not list a specific car category, it will still be booked as long as it isn’t included in the Car categories not allowed setting. However, the booking will be classed as out of policy. 
+- **Car engine types not allowed:** Restrict specific engine types from being booked by employees regardless of other policy settings. 
+- **Maximum price:** Set a daily price cap per car (not including taxes and fees).
+- **Out of policy reason codes:** If enabled, travelers will be asked to enter a reason code for an out-of-policy car booking. This gives them a way to provide context for why the booking is still being placed. You can also modify the reason codes by clicking Manage reason codes below the toggle.
+
+# FAQ
+
+How do travel policy rules interact with Expensify’s [approval flows](https://help.expensify.com/articles/expensify-classic/travel/Approve-travel-expenses)?
+
+Travel policy rules define what can and can’t be booked by your employees while they’re making the booking. Once a booking is placed and the travel itself is [approved](https://help.expensify.com/articles/expensify-classic/travel/Approve-travel-expenses), the expense will appear in Expensify. It will then be coded, submitted, pushed through the existing expense approval process as defined by your workspace, and exported to your preferred accounting platform (if applicable).
+
+</div>
+
+<div id="new-expensify" markdown="1">
+
+As a Workspace Admin, you can set travel policies for all travel booked under your workspace, including approval methods, flight booking class, and hotel star preferences. You can also create multiple policies with specific conditions for particular groups of employees and/or non-employees. 
+
+# Create a travel policy 
+
+Workspace admins can create different travel policies that provide travel rules for different groups of travelers. When using Expensify Travel for the first time, you will need to create a new Travel Policy.
+
+To create or update a travel policy,
+
+1. Click the + icon in the bottom left menu and select **Book travel**. 
+2. Click **Book or manage travel**. 
+3. Click the **Program** tab at the top and select **Policies**. 
+4. Under Employee or Non-employee in the left menu, click **Add new** to create a new policy. 
+5. Use the **Edit members** section to select the group of employees that belong to this policy.
+    1. **To select an existing policy:** Select the policy in the left menu.
+    2. **To add a new policy:** Click **Add new** under Employee or Non-employee in the left menu. Then under the Edit members section, select the group of employees that belong to this policy.
+
+{% include info.html %}
+A Legal Entity in Expensify Travel is the equivalent of an Expensify Workspace.
+{% include end-info.html %}
+
+10. Select which travel preferences you want to modify: General, flight, hotel, car, or rail. 
+11. Click the paperclip icon next to each setting to de-couple it from your default policy.
+12. Update the desired settings.
+
+# General
+
+Determine the currency and [approval type](https://help.expensify.com/articles/expensify-classic/travel/Approve-travel-expenses#set-approval-method) for different types of travel bookings. You can also upload a PDF of your company travel policy for employees to access when booking travel. 
+
+![Screenshot of Expensify Travel policy approval settings](https://help.expensify.com/assets/images/Travel_Policy.png){:width="100%"}
+
+# Flight
+
+Flight preferences include multiple sections with different settings: 
+
+- **Flights not allowed to be booked:** Restrict specific flight classes from being booked by employees.
+- **Cabin class settings:** Set the highest cabin class allowed for booking and whether employees can accept cabin upgrades. 
+- **Budget:** Set a percentage or fare cap for the median or cheapest fares on flights, and a maximum capped price. Flight fares above this cap will be considered out of policy. You can also add customization to allow for different caps for different flight durations. 
+- **Lowest logical fare settings:** Set a preference for layovers, number of stops, flight time window, and airport connection changes. Expensify automatically takes these preferences into account when showing the lowest logical travel fare. 
+- **Add Ons and Preferences:** Select what types of add-ons your employees can book, including:
+  - Additional baggage
+  - Early check-in
+  - Seat preference
+  - No add-ons allowed
+- **Booking windows:** Add a time limit to prevent employees from booking less than a certain number of days in advance to prohibit bookings too close to the flight time.
+- **Refundable/changeable tickets:** Allow employees to book fully or partially refundable fares. To allow all options, you can leave this as the default option. 
+- **Maximum CO2 per kilometer:** If the CO2 per passenger km exceeds this threshold, the flight will be marked as out of policy. You can leave the entry blank if you do not wish to use this policy.
+- **Out of policy reason codes:** If enabled, travelers will be asked to enter a reason code for an out-of-policy flight booking. This gives them a way to provide context for why the booking is still being placed. You can also modify the reason codes by clicking Manage reason codes below the toggle.
+
+# Hotel
+
+- **Restrict booking by keyword:** Keywords entered here will be compared to the hotel rate description. If any of the keywords are found, the hotel rate will be restricted. You also have the option to provide a reason why each keyword is restricted. 
+- **Hotel rates not allowed to be booked:** Restrict specific hotel rates (such as non-refundable, prepaid, and requires deposit) from being booked by employees. This overrides all other hotel policy rules. You also have the option to add a reason why these options aren’t available. 
+- **Maximum price:** Set a maximum price per night for bookings. You can also select the Customizations by location option to set a maximum price for each location.
+- **Booking window:**  Add a time limit to prevent employees from booking less than a certain number of days in advance to prohibit bookings too close to the flight time.
+- **Cancellation policy:** Allow your employees to book fully or partially refundable rooms. To allow all options, you can leave this as the default option. 
+- **Experience:** Set hotel ratings that are in and out of policy.
+- **Nightly median rate:** Determine which hotels to consider when calculating the median price. You can set a radius around the search location and include/disclude hotels above or below a certain rating.
+- **Out of policy reason codes:** If enabled, travelers will be asked to enter a reason code for an out-of-policy hotel booking. This gives them a way to provide context for why the booking is still being placed. You can also modify the reason codes by clicking Manage reason codes below the toggle.
+
+# Car
+
+- **Car categories not allowed:** Restrict specific car types from being booked by employees. This overrides any other car policy.
+- **Car categories in policy:** Define the types of cars that are in policy. If you do not list a specific car category, it will still be booked as long as it isn’t included in the Car categories not allowed setting. However, the booking will be classed as out of policy. 
+- **Car engine types not allowed:** Restrict specific engine types from being booked by employees regardless of other policy settings. 
+- **Maximum price:** Set a daily price cap per car (not including taxes and fees).
+- **Out of policy reason codes:** If enabled, travelers will be asked to enter a reason code for an out-of-policy car booking. This gives them a way to provide context for why the booking is still being placed. You can also modify the reason codes by clicking Manage reason codes below the toggle.
+
+# FAQ
+
+How do travel policy rules interact with Expensify’s [approval flows](https://help.expensify.com/articles/expensify-classic/travel/Approve-travel-expenses)?
+
+Travel policy rules define what can and can’t be booked by your employees while they’re making the booking. Once a booking is placed and the travel itself is [approved](https://help.expensify.com/articles/expensify-classic/travel/Approve-travel-expenses), the expense will appear in Expensify. It will then be coded, submitted, pushed through the existing expense approval process as defined by your workspace, and exported to your preferred accounting platform (if applicable).
+
+</div>
diff --git a/docs/articles/expensify-classic/travel/Edit-or-cancel-travel-arrangements.md b/docs/articles/expensify-classic/travel/Edit-or-cancel-travel-arrangements.md
new file mode 100644
index 000000000000..7dc71c3220ca
--- /dev/null
+++ b/docs/articles/expensify-classic/travel/Edit-or-cancel-travel-arrangements.md
@@ -0,0 +1,28 @@
+---
+title: Edit or cancel travel arrangements
+description: Modify travel arrangements booked with Expensify Travel
+---
+<div id="expensify-classic" markdown="1">
+
+Click **Get Support** on your emailed travel itinerary for real-time help with the booking. Any modifications, exchanges, or voidings made to a trip via support will incur a $25 booking change fee. 
+
+</div>
+
+<div id="new-expensify" markdown="1">
+  
+You can review your travel arrangements any time by opening the Trip chat in your inbox. For example, if you booked a flight to San Francisco, a “Trip to San Francisco” chat will be automatically added to your chat inbox.  
+
+To edit or cancel a travel arrangement,
+1. Click your profile image or icon in the bottom left menu. 
+2. Scroll down and click **Workspaces** in the left menu. 
+3. Select the workspace the travel is booked under.
+4. Tap into the booking to see more details. 
+5. Click **Trip Support**.
+
+If there is an unexpected change to the itinerary (for example, a flight cancellation), Expensify’s travel partner **Spotnana** will reach out to the traveler to provide updates on those changes. 
+
+{% include info.html %}
+You can click **Get Support** on your emailed travel itinerary for real-time help with the booking. Any modifications, exchanges, or voidings made to a trip via support will incur a $25 booking change fee.
+{% include end-info.html %}
+
+</div>
diff --git a/docs/articles/expensify-classic/travel/Track-Travel-Analytics.md b/docs/articles/expensify-classic/travel/Track-Travel-Analytics.md
new file mode 100644
index 000000000000..18506215635e
--- /dev/null
+++ b/docs/articles/expensify-classic/travel/Track-Travel-Analytics.md
@@ -0,0 +1,45 @@
+---
+title: Track Travel Analytics
+description: Get insight into company travel bookings to ensure real-time duty of care reporting and travel policy compliance. 
+---
+<div id="expensify-classic" markdown="1">
+
+Expensify Travel provides insights into company travel bookings to ensure real-time duty of care reporting and travel policy compliance. These analytics help Workspace Admins:
+
+- See global employee locations with a real-time employee location map
+- Analyze travel spend based on details such as trip, traveler, or carrier
+- Monitor booking trends and adherence to travel policy compliance
+- Generate environmental, social, and governance (ESG) reporting
+
+To view your analytics, 
+
+1. Click the + icon in the bottom left menu and select **Book travel**.
+2. Click **Book travel**. 
+3. Click the **Analytics** tab at the top of the screen. 
+
+From here, you can see a variety of reports, including the Duty of Care report, Spend, and ESG metrics. 
+
+## Duty of Care report 
+
+Duty of care is a legal obligation for employers to safeguard the health, safety, and well-being of their employees both in the office and during business trips. With Expensify’s Duty of Care analytics, you can view a global map showing real-time employee locations. 
+
+1. Click the **Analytics** tab at the top and select Travelers.
+2. Use the map to see employee locations. If desired, you can use the filters above the map to show past and future trips, or travel booked to specific locations.
+
+## Spend and compliance report 
+
+Workspace Admins can analyze travel data based on a variety of trip, traveler, and compliance attributes. 
+
+1. Click the **Analytics** tab at the top and select Company Reports.
+2. Review the overview data, or select a specific report from the left menu.
+3. Click the three dot menu on the right of the screen to download the report as a PDF.
+
+## ESG report 
+
+Expensify Travel provides various ESG metrics, including carbon footprint analysis, sustainability scores, and ethical travel spending. 
+
+1. Click the **Analytics** tab at the top and select Company Reports.
+2. Click **Air Manifest** in the left menu. 
+3. Review the CO2 Emissions column in the table.
+
+</div>
diff --git a/docs/articles/expensify-classic/workspaces/Admin-offboarding-checklist.md b/docs/articles/expensify-classic/workspaces/Admin-offboarding-checklist.md
new file mode 100644
index 000000000000..ddf8077be00c
--- /dev/null
+++ b/docs/articles/expensify-classic/workspaces/Admin-offboarding-checklist.md
@@ -0,0 +1,64 @@
+---
+title: Admin offboarding checklist
+description: What to alter when your main Expensify person leaves the business
+---
+Many Expensify customers have one person who handles all the main roles in Expensify Classic: the Billing Owner, Workspace Admin, Domain Admin, Technical Contact, and Bank Account Owner. That means that if this person leaves the company or needs to be offboarded from their current position, you’ll need to assign these roles to another employee.
+
+{% include info.html %}
+Your current admin and the person who will be your new admin should complete the following checklist _before_ your admin leaves the company.
+{% include end-info.html %}
+
+## Checklist for the current admin
+### 1. Assign a new admin 
+{% include info.html %} 
+The current admin must add the new admin to all company workspaces they own, even if they are not in use. When someone takes over ownership of all workspaces, they also take over ownership of the existing Annual Subscription. If the new admin does not take ownership of all company workspaces, the previous owner will continue to be charged for the other workspaces they still own, along with their existing annual subscription, which can result in multiple subscriptions.
+{% include end-info.html %}
+
+1. [Add the new admin](https://help.expensify.com/articles/expensify-classic/workspaces/Invite-members-and-assign-roles) to the workspace.
+2. [Assign the Admin role](https://help.expensify.com/articles/expensify-classic/workspaces/Change-member-workspace-roles) to the new admin.
+3. If your company uses company card feeds, Expensify Cards, domain groups, or SAML, invite the new admin to be a [Domain Admin](https://help.expensify.com/articles/expensify-classic/domains/Add-Domain-Members-and-Admins). 
+
+### 2. Share access to company bank account
+If you are the only admin with access to the company bank account in Expensify, [share the bank account](https://help.expensify.com/articles/expensify-classic/bank-accounts-and-payments/Business-Bank-Accounts-USD#how-to-share-a-verified-bank-account) with the new admin or another workspace admin. 
+
+## Checklist for the new admin
+### 1. Take over billing and add payment account
+The new admin must [take over ownership and billing](https://help.expensify.com/articles/expensify-classic/workspaces/Assign-billing-owner-and-payment-account) for the workspace. 
+
+### 2. Reverify the company bank account
+1-2 business days after sharing, Expensify will administer 3 test transactions to your bank account. After these transactions (2 withdrawals and 1 deposit) have been processed in your account, visit your Expensify Inbox or Payments page, where you’ll see a prompt to input the transaction amounts.
+
+### 3. Unshare company bank accounts
+Once the previous admin has left the company, the new admin (or any admin with access to the bank account) should [unshare the company bank account](https://help.expensify.com/articles/expensify-classic/bank-accounts-and-payments/Business-Bank-Accounts-USD#how-to-remove-access-to-a-verified-bank-account) with the previous admin.
+
+### 4. Update settlement account assignments
+1. Hover over Settings, then click Domains.
+2. Click the desired domain name.
+3. On the Company Cards tab, click the dropdown under the Imported Cards section to select the desired Expensify Card.
+4. To the right of the dropdown, click the Settings tab.
+5. If the bank account set as the Expensify Card settlement account matches the company bank account, use the green chat icon to send a message to Concierge or your Account Manager. We will link the settlement account to the bank account once it has been reverified by the new settlement owner. 
+
+{% include info.html %} 
+The settlement owner must also be a Domain Admin.
+{% include end-info.html %}
+
+### 5. Update default reimburser assignment
+1. Hover over Settings, then click Workspaces.
+2. Click the desired workspace name.
+3. Click the Reimbursement tab.
+4. Ensure that the reverified bank account is set as the reimbursement account. 
+5. Ensure that the previous admin is not set as the Default Reimburser. If they are, select a new reimburser. 
+
+### 6. Reconnect integrations & set technical contact
+1. If your workspace is connected to an [accounting integration](https://help.expensify.com/expensify-classic/hubs/connections/) that is tied to the previous admin’s account, reconnect it.
+2. [Assign a new Technical Contact] if the email listed is for the previous admin. 
+
+### 7. Remove the previous Admin
+1. Once all of the above steps have been completed, you can either downgrade the previous admin’s [role](https://help.expensify.com/articles/expensify-classic/workspaces/Change-member-workspace-roles) to Employee if they are still within the company, or if they have left the company:
+[Remove the previous admin](https://help.expensify.com/articles/expensify-classic/workspaces/Remove-Members) from the workspace. 
+2. Close the member’s company Expensify account.
+    a. Hover over Settings, then click Domains.
+    b. Click the desired domain name.
+    c. Click the Domain Members tab.
+    d. Select the checkbox to the left of the employee, then click Close Accounts. 
+    e. Click Close to confirm.
diff --git a/docs/articles/expensify-classic/workspaces/Assign-Technical-Contact.md b/docs/articles/expensify-classic/workspaces/Assign-Technical-Contact.md
new file mode 100644
index 000000000000..d7f71bdbb343
--- /dev/null
+++ b/docs/articles/expensify-classic/workspaces/Assign-Technical-Contact.md
@@ -0,0 +1,12 @@
+---
+title: Assign a Technical Contact
+description: Adding a technical contact to receive integrations emails
+---
+If your workspace is connected to an [integration](https://help.expensify.com/expensify-classic/hubs/connections/), the person assigned as your Technical Contact will receive notification emails for any integration errors that occur. 
+
+To assign a Technical Contact, 
+
+1. Hover over Settings and click Workspaces. 
+2. Click the desired workspace name. 
+3. Click the Connections tab on the left. 
+4. In the Technical Contact field, enter the email address for the person you want to assign.
diff --git a/docs/articles/expensify-classic/workspaces/Configure-Reimbursement-Settings.md b/docs/articles/expensify-classic/workspaces/Configure-Reimbursement-Settings.md
new file mode 100644
index 000000000000..aea84d338934
--- /dev/null
+++ b/docs/articles/expensify-classic/workspaces/Configure-Reimbursement-Settings.md
@@ -0,0 +1,55 @@
+---
+title: Configure Reimbursement Settings
+description: Set up direct or indirect reimbursements for your workspace.
+---
+<!-- The lines above are required by Jekyll to process the .md file -->
+
+Reimbursing employees in Expensify is quick, easy, and completely free. Let Expensify do the tedious work for you by taking advantage of the features available to automate employee reimbursement. 
+
+# Configure a Workspace's Reimbursement Settings
+There are a few ways to reimburse employees in Expensify. The option that's best suited for you and your business will depend on a few different factors:
+- **Direct Reimbursement**: For companies with a business bank account located in the US that reimburse employees within the US.
+- **Indirect Reimbursement**: This option is available to all members, and connecting a bank account to Expensify is not required. Indirect reimbursement indicates that all reports are reimbursed outside of Expensify. 
+- **Global Reimbursement**: If your company’s business bank account is in the US, Canada, the UK, Europe, or Australia, you can reimburse employees directly in nearly any country worldwide.
+
+## Set Up Direct Reimbursement 
+
+Once a [business bank account is connected to Expensify](https://help.expensify.com/articles/expensify-classic/bank-accounts-and-payments/Business-Bank-Accounts-USD#how-to-add-a-verified-business-bank-account), a workspace admin can enable indirect reimbursement via **Settings > Workspaces > Workspace Name > Reimbursement > Direct**.
+
+#### Additional features available with Direct Reimbursement:
+- **Select a default reimburser for the Workspace from the dropdown menu**:
+     - The default reimburser will receive notifications to reimburse reports in Expensify.
+     - Any workspace admin who also has access to the business bank account can be added as a default reimburser.
+- **Set a default withdrawal account for the Workspace**:
+     - The default bank account is used to reimburse all of the reports submitted on the corresponding workspace. 
+- **Set a manual reimbursement threshold to automate reimbursement**:
+     - If the total of a given report is less than the threshold set, reimbursement will occur automatically upon final approval.
+     - If the total of a given report is more than the threshold, it will need to be reimbursed manually. 
+
+## Set Up Indirect Reimbursement 
+
+A Workspace admin can enable indirect reimbursement via **Settings > Workspaces > Workspace Name > Reimbursement > Indirect**. 
+
+**Additional features under Reimbursement > Indirect:**
+If you reimburse through a separate system or through payroll, Expensify can collect and export employee bank account details for you. Reach out to your Account Manager or Concierge to have the Reimbursement Details Export format added to the account. 
+
+## Set Up Global Reimbursement
+
+Once [a business bank account is connected to Expensify](https://help.expensify.com/articles/expensify-classic/bank-accounts-and-payments/Business-Bank-Accounts-USD#how-to-add-a-verified-business-bank-account), a workspace admin can enable indirect reimbursement via **Settings > Workspaces > Workspace Name > Reimbursement > Direct > Enable Global Reimbursements**.
+
+More information on setting up global reimbursements can be found **[here](https://help.expensify.com/articles/expensify-classic/bank-accounts-and-payments/Global-Reimbursements)**. 
+
+{% include faq-begin.md %}
+
+## How do I export employee bank account details once the Reimbursement Details Export format is added to my account? 
+
+Employee bank account details can be exported from the Reports page by selecting the relevant Approved reports and then clicking **Export to > Reimbursement Details Export**.
+
+## Is it possible to change the name of a verified business bank account in Expensify? 
+
+Bank account names can be updated by going to _**Settings > Accounts > Payments**_ and clicking the pencil icon next to the bank account name. 
+
+## What is the benefit of setting a default reimburser?
+
+Setting a default reimburser on the Workspace ensures that all outstanding reports are reimbursed as this member will receive notifications alerting them to reports that require their action.
+{% include faq-end.md %}
diff --git a/docs/articles/expensify-classic/workspaces/Create-categories.md b/docs/articles/expensify-classic/workspaces/Create-categories.md
index 446cd55585c7..4d3f33a29ebc 100644
--- a/docs/articles/expensify-classic/workspaces/Create-categories.md
+++ b/docs/articles/expensify-classic/workspaces/Create-categories.md
@@ -11,6 +11,12 @@ You can choose to enable, disable, or edit the default Expensify categories, or
 
 # Enable, disable, or edit default categories 
 
+Once you have manually added your categories or automatically imported them from a connected accounting system, you can enable or disable the categories to determine whether they can be added to expenses.
+
+{% include info.html %}
+Importing GL & payroll codes from your accounting system is only available on the Control plan.
+{% include end-info.html %}
+
 1. Hover over Settings, then click **Workspaces**. 
 2. Click the **Group** tab on the left. 
 3. Click the desired workspace name. 
diff --git a/docs/articles/expensify-classic/workspaces/Currency.md b/docs/articles/expensify-classic/workspaces/Currency.md
deleted file mode 100644
index 77b5fbbb3ebc..000000000000
--- a/docs/articles/expensify-classic/workspaces/Currency.md
+++ /dev/null
@@ -1,63 +0,0 @@
----
-title: Report Currency
-description: Understanding expense and report currency
----
-
-# Overview
-As a workspace admin, you can choose a default currency for your employees' expense reports, and we’ll automatically convert any expenses into that currency. 
-
-Here are a few essential things to remember:
-
-- Currency settings for a workspace apply to all expenses under that workspace. If you need different default currencies for certain employees, creating separate workspaces and configuring the currency settings is best.
-- As an admin, the currency settings you establish in the workspace will take precedence over any currency settings individual users may have in their accounts.
-- Currency is a workspace-level setting, meaning the currency you set will determine the currency for all expenses submitted on that workspace. 
-
-# How to select the currency on a workspace
-
-## As an admin on a group workspace
-
-1. Sign into your Expensify web account
-2. Go to **Settings > Workspaces > Group > _[Workspace Name]_> Reports > Report Basics**
-3. Adjust the **Report Output Currency**
-
-## On an individual workspace
-
-1. Sign into your Expensify web account
-2. Go to **Settings > Workspaces > Individual >_[Workspace Name]_> Reports > Report Basics**
-3. Adjust the **Report Output Currency**
-
-Please note the currency setting on an individual workspace is overridden when you submit a report on a group workspace.
-
-# Deep Dive 
-
-## Conversion Rates
-
-Using data from Open Exchange Rates, Expensify takes the average rate on the day the expense occurred to convert an expense from one currency to another. The conversion rate can vary depending on when the expense happened since the rate is determined after the market closes on that specific date.
-
-If the markets aren’t open on the day the expense takes place (i.e., on a Saturday), Expensify will use the daily average rate from the last available market day before the purchase took place. 
-
-When an expense is logged for a future date, possibly to anticipate a purchase that has yet to occur, we'll use the most recent available data. This means the report's value may change up to the day of that expense.
-
-## Managing expenses for employees in several different countries 
-
-Suppose you have employees scattered across the globe who submit expense reports in various currencies. The best way to manage those expenses is to create separate group workspaces for each location or region where your employees are based. 
-
-Then, set the default currency for that workspace to match the currency in which the employees are reimbursed. 
-
-For example, if you have employees in the US, France, Japan, and India, you’d want to create four separate workspaces, add the employees to each, and then set the corresponding currency for each workspace. 
-
-{% include faq-begin.md %}
-
-## I have expenses in several different currencies. How will this show up on a report?
-
-If you're traveling to foreign countries during a reporting period and making purchases in various currencies, each expense is imported with the currency of the purchase.
-
-On your expense report, Expensify will automatically convert each expense to the default currency set for the group workspace. 
-
-## How does the currency of an expense impact the conversion rate?
-
-Expenses entered in a foreign currency are automatically converted to the default currency on your workspace. The conversion uses the day’s average trading rate pulled from [Open Exchange Rates](https://openexchangerates.org/). 
-
-If you want to bypass the exchange rate conversion, you can manually enter an expense in your default currency instead.
-
-{% include faq-end.md %}
diff --git a/docs/articles/expensify-classic/workspaces/Enable-per-diem-expenses.md b/docs/articles/expensify-classic/workspaces/Enable-per-diem-expenses.md
index 3ab757e75e9a..2d2f1b5afddc 100644
--- a/docs/articles/expensify-classic/workspaces/Enable-per-diem-expenses.md
+++ b/docs/articles/expensify-classic/workspaces/Enable-per-diem-expenses.md
@@ -14,9 +14,9 @@ To enable and set per diem rates,
 4. Click the **Per Diem** tab on the left. 
 5. Click the Per Diem toggle to enable it. 
 6. Create a .csv, .txt, .xls, or .xlsx spreadsheet containing four columns: Destination, Sub-rate, Amount, and Currency. You’ll want a different row for each location that an employee may travel to, which may include states and/or countries to help account for cost differences across various locations. Here are some example templates you can use:
-   - [Germany multi-subrates](https://community.expensify.com/home/leaving?allowTrusted=1&target=https%3A%2F%2Fs3-us-west-1.amazonaws.com%2Fconcierge-responses-expensify-com%2Fuploads%252F1596692482998-Germany%2B-%2BPer%2BDiem.csv)
-   - [Sweden multi-subrates](https://community.expensify.com/home/leaving?allowTrusted=1&target=https%3A%2F%2Fs3-us-west-1.amazonaws.com%2Fconcierge-responses-expensify-com%2Fuploads%252F1604410653223-Swedish%2BPer%2BDiem%2BRates.csv)
-   - [South Africa single rates](https://community.expensify.com/home/leaving?allowTrusted=1&target=https%3A%2F%2Fs3-us-west-1.amazonaws.com%2Fconcierge-responses-expensify-com%2Fuploads%252F1596692413995-SA%2BPer%2BDiem%2BRates.csv)
+   - [Germany rates]({{site.url}}/assets/Files/Germany-per-diem.csv)
+   - [Sweden rates]({{site.url}}/assets/Files/Sweden-per-diem.csv)
+   - [South Africa single rates]({{site.url}}/assets/Files/South-Africa-per-diem.csv)
 7. Click **Import from spreadsheet**. 
 8. Click **Upload** to select your spreadsheet.
 
diff --git a/docs/articles/expensify-classic/workspaces/Expense-Settings.md b/docs/articles/expensify-classic/workspaces/Expense-Settings.md
new file mode 100644
index 000000000000..c3a8ab31394d
--- /dev/null
+++ b/docs/articles/expensify-classic/workspaces/Expense-Settings.md
@@ -0,0 +1,121 @@
+---
+title: Expensify Workspace Expense Settings
+description: Expense Settings
+---
+Expensify offers multiple ways to customize how expenses are created and managed at the workspace level. Whether you’re using an individual workspace or managing expenses in a group workspace, there are various expense settings you can customize.
+
+# Set up the expense settings on a workspace
+
+You can manage the expense settings on a workspace under **Settings** > **Workspaces** > **Individual** or **Group** > [_Workspace Name_] > **Expenses**. From here you can customize the following expense-level settings:
+- **Violations**: When enabled, employee expenses that fall outside of workspace preferences are flagged as violations.
+- **Preferences**: Configure the reimbursable and billable settings for the expenses submitted to the corresponding workspace. 
+- **Distance**: This is where you can set the reimbursable mileage rates for yourself or your employees.
+- **Time**: Set an hourly billable rate so members of the workspace can create time expenses for reimbursement. 
+
+## Violations
+A workspace admin can customize the following parameters at the expense level:
+- **Max Expense Age (Days)**
+- **Max Expense Amount**
+- **Receipt Required Amount**
+
+If an expense is submitted that falls outside of those parameters, Expensify will automatically detect it as a violation and alert both the expense creator and reviewer that it needs to be corrected.
+
+More information on violations can be found [**here**](https://help.expensify.com/articles/expensify-classic/workspaces/Enable-and-set-up-expense-violations). 
+
+## Preferences
+
+A cash expense is any expense created manually or by uploading a receipt for SmartScan; it does not mean the expense was paid for with cash. The other type of expense you’ll most commonly see is credit card expenses, which are expenses imported from a credit card or bank connection.
+
+There are four options for cash expenses:
+
+- **Reimbursable by default** - All cash expenses are reimbursable but can be marked as non-reimbursable as needed.
+- **Non-reimbursable by default** - All cash expenses are non-reimbursable but can be marked as reimbursable as needed.
+- **Forced always reimbursable** - All cash expenses are forced to be reimbursable; they cannot be marked as non-reimbursable.
+- **Forced always non-reimbursable** - All cash expenses are forced to be non-reimbursable; they cannot be marked as reimbursable.
+
+### Billable expenses
+
+Billable expenses refer to expenses you or your employees incur that need to be re-billed to a specific client or vendor.
+
+If you need to track expenses for the purpose of billing them to customers, clients, or other departments, billable expenses are supported in both Individual and Group workspaces. Either way, head to **Settings** > **Workspaces** > **Individual** or **Group** > [_Workspace Name_] > **Expenses**.
+
+Under Expense Basics, you can choose the setting that is best for you.
+
+- **Disabled** means expenses are not allowed to be billable at all.
+- **Default to billable** means expenses will always be billable but can be marked as non-billable as needed.
+- **Default to non-billable** means expenses will always be non-billable but can be marked as billable as needed.
+
+If your Group workspace is connected to Xero, QuickBooks Online, NetSuite, or Sage Intacct, you can export billable expenses to be invoiced to customers. To set this up, go to the Coding tab in the connection configuration settings.
+
+### eReceipts
+
+eReceipts are full digital replacements of their paper equivalents for purchases of $75 or less. 
+
+Click the toggle to your preferred configuration. 
+
+- **Enabled** - All imported credit card expenses in US dollars of $75 or less will have eReceipts in the receipt image.
+- **Disabled** - No expenses will generate an eReceipt.
+
+Note: Expensify will not generate an eReceipt for lodging expenses.
+
+### Secure receipt images
+
+Whether you’re sharing your receipts with your accountant, having an auditor review exported expenses, or simply wanting to export to keep a hard copy for yourself, receipt visibility will be an essential consideration. 
+
+Under _Public Receipt Visibility_, you can determine who can view receipts on your workspace.
+
+- **Enabled** means receipts are viewable by anyone with the URL. They don't need to be an Expensify user or a workspace member to view receipts.
+- **Disabled** means receipts are viewable by Expensify users, who would have access to view the receipt in the application. You must be an Expensify user with access to the report a receipt is on and logged into your account to view a receipt image via URL.
+
+ 
+## Distance Expenses
+How to set up distance expenses:
+1. Select whether you want to capture _miles_ or _kilometers_,
+2. Set the default category to be used on distance expenses, 
+3. Click **Add A Mileage Rate** to add as many rates as you need, 
+4. Set the reimbursable amount per mile or kilometer. 
+
+**Note:** If a rate is toggled off it is immediately disabled. This means that users are no longer able to select it when creating a new distance expense. If only one rate is available then that rate will be toggled on by default.
+
+### Track tax on mileage expenses
+If you’re tracking tax in Expensify you can also track tax on distance expenses. The first step is to enable tax in the workspace. You can do this by going to  **Settings** > **Workspaces** > **Individual** or **Group** > [_Workspace Name_] > **Tax**.
+
+Once tax is enabled on a workspace level you will see a toggle to _Track Tax_ in the Distance section of the workspace settings. If tax is disabled on the workspace the Track Tax toggle will not display.
+
+When Track Tax is enabled, you will need to enter additional information about the rates you have set. This includes the _Tax Reclaimable on_ and _Tax Rate_ fields. With that information, Expensify will work out the correct tax reclaim for each expense.
+
+If you enable tax but don’t select a tax rate or enter a tax reclaimable amount, we will not calculate any tax amount for that rate. If, at any point, you switch the tax rate or enter a different reclaimable portion for an existing distance rate, the mileage rate will need to be re-selected on expenses for the tax amount to update according to the new values.
+
+**Note:** Expensify won’t automatically track cumulative mileage. If you need to track cumulative mileage per employee, we recommend building a mileage report using our custom export formulas.
+
+## Time Expenses
+
+Using Expensify you can track time-based expenses to bill your clients at an hourly rate or allow employees to claim an hourly stipend. 
+
+Click the toggle under the _Time_ section to enable the feature and set a default hourly rate. Then, you and your users can create time-based expenses from the [**Expenses**](https://expensify.com/expenses) page of the account.
+
+## Concierge Receipt Audit
+
+Concierge Receipt Audit is a real-time audit and compliance of receipts submitted by employees and workspace users. Concierge checks every receipt for accuracy and compliance, flagging any expenses that seem fishy before expense reports are even submitted for approval. All risky expenses are highlighted for manual review, leaving you with more control over and visibility into expenses. When a report is submitted and there are risky expenses on it, you will be immediately prompted to review the risky expenses and determine the next steps. 
+
+**Benefits of Concierge Receipt Audit**
+- To make sure you don't miss any risky expenses that need human oversight.
+- To avoid needing to manually review all your company receipts.
+- It's included at no extra cost with the [Control Plan](https://www.expensify.com/pricing).
+- Instead of paying someone to audit your company expenses or being concerned that your expenses might be audited by a government agency.
+- It's easy -- Concierge will alert you to the risky expense and present it to you in an easy-to-follow review tutorial.
+- In addition to the risky expense alerts, Expensify will include a Note with audit details on every report.  
+
+**Note:** If a report has audit alerts on it, you'll need to Review the report and Accept the alerts before it can be approved.
+
+{% include faq-begin.md %}
+
+## Why do I see eReceipts for expenses greater than $75?
+
+An eReceipt is generated for Expensify card purchases of any amount in the following categories: Airlines, Commuter expenses, Gas, Groceries, Mail, Meals, Car rental, Taxis, and Utilities.
+
+## Why didn’t my rate get updated with the newest rate guidance by the IRS?
+
+Expensify does not update mileage rates to match the rate provided by the IRS. An admin of the workspace will need to update the rate or create a new rate in the workspace. This is because Expensify has customers worldwide, not just in the United States, and most companies want to communicate the change with employees and control the timing.
+
+{% include faq-end.md %}
diff --git a/docs/articles/expensify-classic/workspaces/Expenses.md b/docs/articles/expensify-classic/workspaces/Expenses.md
deleted file mode 100644
index 4a2dc56c430f..000000000000
--- a/docs/articles/expensify-classic/workspaces/Expenses.md
+++ /dev/null
@@ -1,119 +0,0 @@
----
-title: Expensify Workspace Expense Settings
-description: Expense Settings
----
-# Overview
-
-Expensify offers multiple ways to customize how expenses are created in your workspace. In this doc, you’ll learn how to set up expense basics, distance expenses, and time expenses. 
-
-Whether you’re flying solo with your Individual workspace or submitting with a team on your Group workspace, we have settings to support how you use Expensify.
-
-# How to manage expense settings in your workspace
-
-Let’s cover the expense basics first! In the following sections, we’ll go through each part of managing expense settings in your workspace.
-
-## Controlling cash expenses
-
-A cash expense is any expense created manually or by uploading a receipt for SmartScan; a cash expense does not mean the expense was paid for with cash. The other type of expense you’ll most commonly see is credit card expenses, which means the expenses imported from a credit card or bank connection.
-
-There are four options for cash expenses:
-
-- **Reimbursable by default** - All cash expenses are reimbursable but can be marked as non-reimbursable as needed.
-- **Non-reimbursable by default** - All cash expenses are non-reimbursable but can be marked as reimbursable as needed.
-- **Forced always reimbursable** - All cash expenses are forced to be reimbursable; they cannot be marked as non-reimbursable.
-- **Forced always non-reimbursable** - All cash expenses are forced to be non-reimbursable; they cannot be marked as reimbursable.
-
-## Setting up billable expenses
-
-Billable expenses refer to expenses you or your employees incur that need to be re-billed to a specific client or vendor.
-
-If you need to track expenses for the purpose of billing them to customers, clients, or other departments, billable expenses are supported in both Individual and Group workspaces. Either way, head to **Settings** > **Workspaces** > **Individual** or **Group** > [_Workspace Name_] > **Expenses**.
-
-Under Expense Basics, you can choose the setting that is best for you.
-
-- **Disabled** means expenses are not allowed to be billable at all.
-- **Default to billable** means expenses will always be billable but can be marked as non-billable as needed.
-- **Default to non-billable** means expenses will always be non-billable but can be marked as billable as needed.
-
-If your Group workspace is connected to Xero, QuickBooks Online, NetSuite, or Sage Intacct, you can export billable expenses to be invoiced to customers. To set this up, go to the Coding tab in the connection configuration settings.
-
-## Using eReceipts
-
-eReceipts are full digital replacements of their paper equivalents for purchases of $75 or less. 
-
-Click the toggle to your preferred configuration. 
-
-- **Enabled** - All imported credit card expenses in US dollars of $75 or less will have eReceipts in the receipt image.
-- **Disabled** - No expenses will generate an eReceipt.
-
-Note: _We will not generate an eReceipt for lodging expenses._ 
-
-## Securing receipt images
-
-Whether you’re sharing your receipts with your accountant, having an auditor review exported expenses, or simply wanting to export to keep a hard copy for yourself, receipt visibility will be an essential consideration. 
-
-Under _Public Receipt Visibility_, you can determine who can view receipts on your workspace.
-
-- **Enabled** means receipts are viewable by anyone with the URL. They don't need to be an Expensify user or a workspace member to view receipts.
-- **Disabled** means receipts are viewable by users of Expensify, who would have access to view the receipt in the application. You must be an Expensify user with access to the report a receipt is on and logged into your account to view a receipt image via URL.
-
- 
-## Track mileage expenses
-
-Whether using the Individual or Group workspace, you can create distance rates to capture expenses in miles or kilometers.
-
-Preliminary setup steps include:
-
-1. Selecting whether you want to capture _miles_ or _kilometers_,
-2. Setting the default category to be used on distance expenses, 
-3. Click **Add A Mileage Rate** to add as many rates as you need, 
-4. Set the reimbursable amount per mile or kilometer. 
-
-Note: _If a rate is toggled off it is immediately disabled. This means that users are no longer able to select it when creating a new distance expense. If only one rate is available then that rate will be toggled on by default._
-
-## Set an hourly rate
-
-Using Expensify you can track time-based expenses to bill your clients at an hourly rate or allow employees to claim an hourly stipend. 
-
-Click the toggle under the _Time_ section to enable the feature and set a default hourly rate. After that, you and your users will be able to create time-based expenses from the [**Expenses**](https://expensify.com/expenses) page of the account.
-
-# Deep dives
-
-## What is Concierge Receipt Audit for the Control Plan?
-
-Concierge Receipt Audit is a real-time audit and compliance of receipts submitted by employees and workspace users. Concierge checks every receipt for accuracy and compliance, flagging any expenses that seem fishy before expense reports are even submitted for approval. All risky expenses are highlighted for manual review, leaving you with more control over and visibility into expenses. When a report is submitted and there are risky expenses on it, you will be immediately prompted to review the risky expenses and determine the next steps. 
-
-**Why you should use Concierge Receipt Audit**
-
-- To make sure you don't miss any risky expenses that need human oversight.
-- To avoid needing to manually review all your company receipts.
-- It's included at no extra cost with the [Control Plan](https://www.expensify.com/pricing).
-- Instead of paying someone to audit your company expenses or being concerned that your expenses might be audited by a government agency.
-- It's easy to use! Concierge will alert you to the risky expense and present it to you in an easy-to-follow review tutorial.
-- In addition to the risky expense alerts, Expensify will include a Note with audit details on every report.  
-
-Note: _If a report has audit alerts on it, you'll need to Review the report and Accept the alerts before it can be approved._
-
-## Tracking tax on mileage expenses
-
-If you’re tracking tax in Expensify you can also track tax on distance expenses. The first step is to enable tax in the workspace. You can do this by going to  **Settings** > **Workspaces** > **Individual** or **Group** > [_Workspace Name_] > **Tax**.
-
-Once tax is enabled on a workspace level you will see a toggle to _Track Tax_ in the Distance section of the workspace settings. If tax is disabled on the workspace the Track Tax toggle will not display.
-
-When Track Tax is enabled you will need to enter additional information to the rates you have set, this includes the _Tax Reclaimable on_ and _Tax Rate_ fields. With that information, Expensify will work out the correct tax reclaim for each expense.
-
-If you enable tax but don’t select a tax rate or enter a tax reclaimable amount, we will not calculate any tax amount for that rate. If, at any point, you switch the tax rate or enter a different reclaimable portion for an existing distance rate, the mileage rate will need to be re-selected on expenses for the tax amount to update according to the new values.
-
-Note: _Expensify won’t automatically track cumulative mileage. If you need to track cumulative mileage per employee, we recommend building a mileage report using our custom export formulas._ 
-
-{% include faq-begin.md %}
-
-## Why do I see eReceipts for expenses greater than $75?
-
-An eReceipt is generated for Expensify card purchases of any amount in the following categories: Airlines, Commuter expenses, Gas, Groceries, Mail, Meals, Car rental, Taxis, and Utilities.
-
-## Why didn’t my rate get updated with the newest rate guidance by the IRS?
-
-Expensify does not update mileage rates to match the rate provided by the IRS. An admin of the workspace will need to update the rate or create a new rate in the workspace. This is because Expensify has customers worldwide, not just in the United States, and most companies want to communicate the change with employees and control the timing.
-
-{% include faq-end.md %}
diff --git a/docs/articles/expensify-classic/workspaces/Invoicing.md b/docs/articles/expensify-classic/workspaces/Invoicing.md
deleted file mode 100644
index f692f8f8d62e..000000000000
--- a/docs/articles/expensify-classic/workspaces/Invoicing.md
+++ /dev/null
@@ -1,64 +0,0 @@
----
-title: Expensify Invoicing
-description: Expensify Invoicing supports your business with unlimited invoice sending and receiving, payments, and status tracking in one single location.
----
-# Overview
-Expensify Invoicing lets you create and send invoices, receive payments, and track the status of your invoices with Expensify, regardless of whether your customer has an Expensify account. Invoicing is included with all Expensify subscriptions, no matter the plan — just pay the processing fee (2.9%) per transaction.
-
-# How to Set Up Expensify Invoicing
-
-**If you have a Group Workspace:**
-
-1. Log into your Expensify account from the web (not the mobile app) 
-3. Head to **Settings** > **Workspaces** > **Group** > [_Workspace Name_] > [**Invoices**](https://expensify.com/policy?param={"policyID":"20AB6A03EB9CE54D"}#invoices).
-
-**If you have an Individual Workspace:**
-
-1. Log into your Expensify account from the web (not the mobile app) 
-2. Head to **Settings** > **Workspaces** > **Individual** > [_Workspace Name_]> [**Invoices**](https://expensify.com/policy?param={"policyID":"BD5FB746D3B220D6"}#invoices).
-
-Here, you’ll be able to create a markup or add a payment account. Don’t forget you need a verified bank account to send or accept invoice payments via ACH.
-
-# Deep Dive
-
-To help your invoice stand out and look more professional, you can: 
-
-- Add your logo
-- Set your workspace currency to add default report-level fields
-- Create additional report-level fields to display more details
-
-## Add a Logo
-
-From your Expensify account on the web (not the mobile app), go to **Settings** > **Account** > **Account Details**. Then click **Edit Photo** under _Your Details_ to upload your logo.
-
-## Set the Workspace Currency
-
-To set your currency, head to **Settings** > **Workspaces** > **Individual** or **Group** > **Reports**. This will add default report-level fields to your invoices.  You can see these at the bottom of your [**Reports**](https://expensify.com/reports) page. 
-
-Here are the default report-level fields based on common currencies:
-
-- GBP: VAT Number & Supplier Address (your company address)
-- EUR: VAT Number & Supplier Address (your company address)
-- AUD: ABN Number & Supplier Address (your company address)
-- NZD: GST Number & Supplier Address (your company address)
-- CAD: Business Number & Supplier Address (your company address)
-
-## Adding Additional Fields to Your Invoices
-
-In addition to the default report-level fields, you can create custom invoice fields.
-
-At the bottom of the same Reports page, under the _Add New Field_ section, you’ll have multiple options. 
-
-- **Field Title**: This is the name of the field as displayed on your invoice.
-- **Type**: You have the option to select a _text-based_ field, a _dropdown_ of selections, or a _date_ selector.
-- **Report Type**: Select _Invoice_ to add the field to your invoices.
-
-Don’t forget to click the **Add** button once you’ve set your field parameters!
-
-For example, you may want to add a PO number, business address, website, or any other custom fields.
-
-_Please check the regulations in your local jurisdiction to ensure tax and business compliance._
-
-## Removing Fields from Your Invoices
-
-If you want to delete a report field, click the red trashcan on the field in your **Workspace** > **Individual** or **Group** > **Report** settings to remove it from all future invoices. Unsent invoices will have a red **X** next to the report field, which you can click to remove before sending the invoice to your customer.
diff --git a/docs/articles/expensify-classic/workspaces/Reimbursement.md b/docs/articles/expensify-classic/workspaces/Reimbursement.md
deleted file mode 100644
index ed2384d12006..000000000000
--- a/docs/articles/expensify-classic/workspaces/Reimbursement.md
+++ /dev/null
@@ -1,48 +0,0 @@
----
-title: Reimbursement 
-description: Enable reimbursement and reimburse expense reports 
----
-<!-- The lines above are required by Jekyll to process the .md file -->
-
-# Overview 
-Reimbursement in Expensify is quick, easy, and completely free. Let Expensify do the tedious work for you by taking advantage of features to automate employee reimbursement. 
-
-# How to Enable Reimbursement
-There are several options for reimbursing employees in Expensify. The options available will depend on which country your business bank account is domiciled in. 
-
-## Direct Reimbursement 
-
-Direct reimbursement is available to companies who have a verified US bank account and are reimbursing employees within the US. To use direct reimbursement, you must have a US business bank account verified in Expensify.
-
-A Workspace admin can enable direct reimbursement via **Settings > Workspaces > Workspace Name > Reimbursement > Direct**. 
-
-**Additional features under Reimbursement > Direct:**
- - Select a **default reimburser** for the Workspace from the dropdown menu. The default reimburser is the person who will receive notifications to reimburse reports in Expensify. You’ll be able to choose among all Workspace Admins who have access to the business bank account. 
- - Set a **default withdrawal account** for the Workspace. This will set a default bank account that report reimbursements are withdrawn from.
- - Set a **manual reimbursement threshold** to automate reimbursement. Reports whose total falls under the manual reimbursement threshhold will be reimbursed automatocally upon final approval; reports whose total falls above the threshhold will need to be reimbursed manually by the default reimburser. 
-
-Expensify also offers direct global reimbursement to some companies with verified bank accounts in USD, GBP, EUR and AUD who are reimbursing employees internationally. For more information about Global Reimbursement, see LINK
-
-## Indirect Reimbursement 
-
-Indirect reimbursement is available to all companies in Expensify and no bank account is required. Indirect reimbursement indicates that the report will be reimbursed outside of Expensify. 
-
-A Workspace admin can enanble indirect reimbursement via **Settings > Workspaces > Workspace Name > Reimbursement > Indirect**. 
-
-**Additional features under Reimbursement > Indirect:**
-If you reimburse through a seperate system or through payroll, Expensify can collect and export employee bank account details for you.  Just reach out to your Account Manager or concierge@expensify.com for us to add the Reimbursement Details Export format to the account. 
-
-{% include faq-begin.md %}
-
-## How do I export employee bank account details once the Reimbursement Details Export format is added to my account? 
-
-Employee bank account details can be exported from the Reports page by selecting the relevant Approved reports and then clicking **Export to > Reimbursement Details Export**.
-
-## Is it possible to change the name of a verified business bank account in Expensify? 
-
-Bank account names can be updated via **Settings > Accounts > Payments** and clicking the pencil icon next to the bank account name. 
-
-## What is the benefit of setting a default reimburser?
-
-The main benefit of being defined as the "reimburser" in the Workspace settings is that this user will receive notifications on their Home page alerting them when reports need to be reimbursed. 
-{% include faq-end.md %}
diff --git a/docs/articles/expensify-classic/workspaces/Set-Currency.md b/docs/articles/expensify-classic/workspaces/Set-Currency.md
new file mode 100644
index 000000000000..4537f510b8b7
--- /dev/null
+++ b/docs/articles/expensify-classic/workspaces/Set-Currency.md
@@ -0,0 +1,60 @@
+---
+title: Setting Up Report Currency
+description: Define a currency in your workspace's settings
+---
+
+# Overview
+As a workspace admin, you can choose a default currency for your employees' expense reports, and we’ll automatically convert any expenses into that currency. 
+
+Here are a few things to remember:
+- Currency settings for a workspace apply to all expenses under that workspace. If you need different default currencies for certain employees, creating separate workspaces and configuring the currency settings is best.
+- As an admin, the currency settings you establish in the workspace will take precedence over any currency settings individual users may have in their accounts.
+- Currency is a workspace-level setting, meaning the currency you set will determine the currency for all expenses submitted on that workspace. 
+
+# Select the currency on a workspace
+
+## As an admin on a group workspace
+
+1. Sign into your Expensify web account
+2. Go to **Settings > Workspaces > Group > _[Workspace Name]_> Reports > Report Basics**
+3. Adjust the **Report Output Currency**
+
+## On an individual workspace
+
+1. Sign into your Expensify web account
+2. Go to **Settings > Workspaces > Individual >_[Workspace Name]_> Reports > Report Basics**
+3. Adjust the **Report Output Currency**
+
+Please note the currency setting on an individual workspace is overridden when you submit a report on a group workspace.
+
+## Conversion Rates
+
+Using data from Open Exchange Rates, Expensify converts expenses from one currency to another using the average rate on the day the expense occurred. The conversion rate can vary depending on when the expense occurred since it is determined after the market closes on that specific date.
+
+If the markets aren’t open on the day the expense takes place (i.e., on a Saturday), Expensify will use the daily average rate from the last available market day before the purchase took place. 
+
+When an expense is logged for a future date, possibly to anticipate a purchase that has yet to occur, we'll use the most recent available data. This means the report's value may change up to the day of that expense.
+
+## Managing expenses for employees in several different countries 
+
+If you have employees scattered across the globe who submit expense reports in various currencies, the best way to manage those expenses is to create separate group workspaces for each location or region where your employees are based. 
+
+Then, set the default currency for that workspace to match the currency in which the employees are reimbursed. 
+
+For example, if you have employees in the US, France, Japan, and India, you’d want to create four separate workspaces, add the employees to each, and then set the corresponding currency for each workspace. 
+
+{% include faq-begin.md %}
+
+## I have expenses in several different currencies. How will this show up on a report?
+
+If you're traveling to foreign countries during a reporting period and making purchases in various currencies, each expense is imported with the currency of the purchase.
+
+On your expense report, Expensify will automatically convert each expense to the default currency set for the group workspace. 
+
+## How does the currency of an expense impact the conversion rate?
+
+Expenses entered in a foreign currency are automatically converted to the default currency on your workspace. The conversion uses the day’s average trading rate pulled from [Open Exchange Rates](https://openexchangerates.org/). 
+
+If you want to bypass the exchange rate conversion, you can manually enter an expense in your default currency instead.
+
+{% include faq-end.md %}
diff --git a/docs/articles/expensify-classic/workspaces/Set-Up-Invoicing.md b/docs/articles/expensify-classic/workspaces/Set-Up-Invoicing.md
new file mode 100644
index 000000000000..8ec279da29a6
--- /dev/null
+++ b/docs/articles/expensify-classic/workspaces/Set-Up-Invoicing.md
@@ -0,0 +1,51 @@
+---
+title: Expensify Invoicing
+description: Expensify Invoicing offers the ability to send, receive, and track the status of payments in one location.
+---
+Invoicing lets you create and send invoices, receive payments, and track the status of your invoices, regardless of whether the customer has an Expensify account. This feature is included with all Expensify subscriptions, no matter the plan — you'll just pay the processing fee (2.9%) per transaction.
+
+# Set Up Expensify Invoicing
+Before using the invoice feature, you'll need to [connect a business bank account](https://help.expensify.com/articles/expensify-classic/bank-accounts-and-payments/Business-Bank-Accounts-USD) to Expensify. 
+
+Then, do the following:
+1. Log into your Expensify account from the web (not the mobile app)
+2. Head to _**Settings > Workspaces > Workspace Name > [Invoices](https://expensify.com/policy?param={"policyID":"20AB6A03EB9CE54D"}#invoices)**_.
+
+Here, you’ll be able to create a markup or add a payment account.
+
+## Add a Logo
+
+From your Expensify account on the web, go to _**Settings > Account > Account Details**_. Then click **Edit Photo** under _Your Details_ to upload your company logo.
+
+## Set the Workspace Currency
+
+To set the currency, head to _**Settings** > **Workspaces** > **Reports**_. This will add default report-level fields to your invoices.  You can see these at the bottom of the [**Reports**](https://expensify.com/reports) page. 
+
+Below are the default report-level fields based on common currencies:
+- GBP: VAT Number & Supplier Address (your company address)
+- EUR: VAT Number & Supplier Address (your company address)
+- AUD: ABN Number & Supplier Address (your company address)
+- NZD: GST Number & Supplier Address (your company address)
+- CAD: Business Number & Supplier Address (your company address)
+
+## Adding Additional Fields to Invoices
+
+In addition to the default report-level fields, you can create custom invoice fields.
+
+At the bottom of the same Reports page, under the _Add New Field_ section, you’ll have multiple options. 
+
+- **Field Title**: This is the name of the field as displayed on your invoice.
+- **Type**: You have the option to select a _text-based_ field, a _dropdown_ of selections, or a _date_ selector.
+- **Report Type**: Select _Invoice_ to add the field to your invoices.
+
+Don’t forget to click the **Add** button once you’ve set your field parameters!
+
+For example, you may want to add a PO number, business address, website, or any other custom fields.
+
+_Please check the regulations in your local jurisdiction to ensure tax and business compliance._
+
+## Removing Fields from Invoices
+
+If you want to delete a report field, click the red trashcan on the field under _**Settings** > **Workspaces** > **Reports**_. This will remove that field from all future invoices. 
+
+Unsent invoices will have a red **X** next to the report field, which you can click to remove before sending the invoice to your customer.
diff --git a/docs/articles/expensify-classic/workspaces/reports/Currency.md b/docs/articles/expensify-classic/workspaces/reports/Currency.md
deleted file mode 100644
index 19fd4e8f3723..000000000000
--- a/docs/articles/expensify-classic/workspaces/reports/Currency.md
+++ /dev/null
@@ -1,31 +0,0 @@
----
-title: Currency
-description: How currency works in Expensify and how to change the default currency in your Expensify workspace
----
-# Overview
-
-In this article, we’ll outline how to change the default currency in your account and how currency works in Expensify.
-Expensify supports expenses in almost every currency in the world. Group workspace admins and individual workspace users can specify the desired output currency for employee reports. Expensify handles the currency conversion process.
-
-# How to change your default currency
-
-The default currency for all expenses added to your account is set by the primary company workspace. Just head to **Settings > Workspaces > Group > *[Workspace Name]* > Reports > Report Basics** and select your desired Report Currency.
-
-If you are not using a group workspace, you can change your default currency under **Settings > Workspaces > Individual > *[Workspace Name]* > Reports** and then choose your desired Report Currency. Please note that the currency selected here will be overridden should you begin reporting on a group workspace.
-
-# How currency works in Expensify
-
-When totaling expenses across multiple currencies, we convert them to a single currency, which is the "report currency" of the report's expense workspace, or your personal output currency if no workspace is in use.
-
-**Important notes:**
-
-- Currency settings on a workspace are all-or-nothing. To reflect a different output currency in reports, create a new workspace for those employees and adjust the currency settings accordingly.
-- Currency settings in the workspace take precedence over a user's individual account settings.
-
-# How the conversion rate is determined
-When converting expenses between currencies, we rely on [Open Exchange Rates](https://openexchangerates.org/) to determine the average bid and ask rate on the expense date. This rate becomes available after the market closes for that day, resulting in varying conversion rates depending on when the expense occurred and how the currencies were trading.
-
-If the markets were closed on the expense date (e.g., weekends), we use the daily average rate from the last open market day prior to the purchase. For future-dated expenses, we use the most recent available data. Consequently, the report's value may fluctuate until the expense date, potentially leading to unexpected results. You cannot submit reports until the markets have closed for all the expense dates on the report.
-
-To bypass exchange rate calculations, manually enter expenses in your default currency. These entries will only be converted when included in a report with a different default currency.
-
diff --git a/docs/articles/expensify-classic/workspaces/reports/Report-Fields-And-Titles.md b/docs/articles/expensify-classic/workspaces/reports/Report-Fields-And-Titles.md
deleted file mode 100644
index e79e30ce42c9..000000000000
--- a/docs/articles/expensify-classic/workspaces/reports/Report-Fields-And-Titles.md
+++ /dev/null
@@ -1,43 +0,0 @@
----
-title: Report Fields & Titles
-description: This article is about managing Report Fields and Report Titles in Expensify
----
-# Overview
-
-In this article, we'll go over how to use Report Titles and Report Fields.
-
-## How to use Report Titles
-
-Default report titles enable group workspace admins or individual workspace users to establish a standardized title format for reports associated with a specific workspace. Additionally, admins have the choice to enforce these report titles, preventing employees from altering them. This ensures uniformity in report naming conventions during the review process, eliminating the need for employees to manually input titles for each report they generate.
-
-- Group workspace admins can set the Default Report Title from **Settings > Workspaces > Group > *[Workspace Name]* > Reports**.
-- Individual users can set the Default Report Title from **Settings > Workspaces > Individual > *[Workspace Name]* > Reports**.
-  
-You can configure the title by using the formulas that we provide to populate the Report Title. Take a look at the help article on Custom Formulas to find all eligible formulas for your Report Titles.
-
-## Deep Dive on Report Titles
-
-Some formulas will automatically update the report title as changes are made to the report. For example, any formula related to dates, total amounts, workspace name, would adjust the title before the report is submitted for approval. Changes will not retroactively update report titles for reports which have been Approved or Reimbursed.
-
-To prevent report title editing by employees, simply enable "Enforce Default Report Title."
-
-## How to use Report Fields
-
-Report fields let you specify header-level details, distinct from tags which pertain to expenses on individual line items. These details can encompass specific project names, business trip information, locations, and more. Customize them according to your workspace's requirements.
-
-To set up Report Fields, follow these steps:
-- Workspace Admins can create report fields for group workspaces from **Settings > Workspaces > Group > *[Workspace Name]* > Reports > Report and Invoice Fields**. For individual workspaces, follow **Settings > Workspaces > Individual > *[Workspace Name]* > Reports > Report and Invoice Fields**.
-- Under "Add New Field," enter the desired field name in the "Field Title" to describe the type of information to be selected.
-- Choose the appropriate input method under "Type":
-  - Text: Provides users with a free-text box to enter the requested information.
-  - Dropdown: Creates a selection of options for users to choose from.
-  - Date: Displays a clickable box that opens a calendar for users to select a date.
-    
-## Deep Dive on Report Fields
-
-You cannot create these report fields directly in Expensify if you are connected to an accounting integration (QuickBooks Online, QuickBooks Desktop, Intacct, Xero, or NetSuite). Please refer to the relevant article for instructions on creating fields within that system.
-
-When report fields are configured on a workspace, they become mandatory information for associated reports. Leaving a report field empty or unselected will trigger a report violation, potentially blocking report submission or export.
-
-Report fields are "sticky," which means that any changes made by an employee will persist and be reflected in subsequent reports they create.
-
diff --git a/docs/articles/expensify-classic/workspaces/reports/Scheduled-Submit.md b/docs/articles/expensify-classic/workspaces/reports/Scheduled-Submit.md
deleted file mode 100644
index 18ad693a1c56..000000000000
--- a/docs/articles/expensify-classic/workspaces/reports/Scheduled-Submit.md
+++ /dev/null
@@ -1,43 +0,0 @@
----
-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.
-
-**Instantly**: Expenses are automatically added to a report in the Processing state, and all expenses will continue to accumulate on one report until it is Approved or Reimbursed. This removes the need to submit expenses, and Processing reports can either be Reimbursed right away (if Submit and Close is enabled), or Approved and then Reimbursed (if Submit and Approve is enabled) by a workspace admin.
-
-# 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.
-
-## A note on Instantly 
-Setting Scheduled Submit frequency to Instantly will limit some employee actions on reports, such as the ability to retract or self-close reports, or create multiple reports. When Instantly is selected, expenses are automatically added to a Processing expense report, and new expenses will continue to accumulate on a single report until the report is Closed or Reimbursed by a workspace admin.
diff --git a/docs/articles/new-expensify/bank-accounts-and-payments/Connect-a-Bank-Account.md b/docs/articles/new-expensify/bank-accounts-and-payments/Connect-a-Bank-Account.md
deleted file mode 100644
index bc0676231544..000000000000
--- a/docs/articles/new-expensify/bank-accounts-and-payments/Connect-a-Bank-Account.md
+++ /dev/null
@@ -1,151 +0,0 @@
----
-title: Connect a Business Bank Account - US
-description: How to connect a business bank account to Expensify (US) 
----
-# Overview
-Adding a verified business bank account unlocks a myriad of features and automation in Expensify. 
-Once you connect your business bank account, you can:
-- Reimburse expenses via direct bank transfer
-- Pay bills
-- Collect invoice payments
-- Issue the Expensify Card
-
-# How to add a verified business bank account
-To connect a business bank account to Expensify, follow the below steps:
-1. Go to **Settings > Workspaces > _Workspace Name_ > Bank account > Connect bank account**
-2. Click **Connect online with Plaid**
-3. Click **Continue** 
-4. When you reach the **Plaid** screen, you'll be shown a list of compatible banks that offer direct online login access
-5. Login to the business bank account:
-- If the bank is not listed, click the X to go back to the connection type
-- Here you’ll see the option to **Connect Manually**
-- Enter your account and routing numbers
-6. Enter your bank login credentials:
-- If your bank requires additional security measures, you will be directed to obtain and enter a security code
-- If you have more than one account available to choose from, you will be directed to choose the desired account
-
-Next, to verify the bank account, you’ll enter some details about the business as well as some personal information. 
-
-## Enter company information
-This is where you’ll add the legal business name as well as several other company details. 
-
-- **Company address**: The company address must be located in the US and a physical location (If you input a maildrop address, PO box, or UPS Store, the address will be flagged for review, and adding the bank account to Expensify will be delayed)
-- **Tax Identification Number**: This is the identification number that was assigned to the business by the IRS
-- **Company website**: A company website is required to use most of Expensify’s payment features. When adding the website of the business, format it as, https://www.domain.com
-- **Industry Classification Code**: You can locate a list of Industry Classification Codes [here]([url](https://www.census.gov/naics/?input=software&year=2022))
-
-## Enter personal information 
-Whoever is connecting the bank account to Expensify, must enter their details under the Requestor Information section:
-- The address must be a physical address
-- The address must be located in the US
-- The SSN must be US-issued
-
-This does not need to be a signor on the bank account. If someone other than the Expensify account holder enters their personal information in this section, the details will be flagged for review, and adding the bank account to Expensify will be delayed. 
-
-## Upload ID
-After entering your personal details, you’ll be prompted to click a link or scan a QR code so that you can do the following:
-1. Upload a photo of the front and back of your ID (this cannot be a photo of an existing image)
-2. Use your device to take a selfie and record a short video of yourself 
-
-**Your ID must be:**
-- Issued in the US
-- Current (ie: the expiration date must be in the future)
-
-## Additional Information
-Check the appropriate box under **Additional Information**, accept the agreement terms, and verify that all of the information is true and accurate:
-- A Beneficial Owner refers to an **individual** who owns 25% or more of the business. 
-- If you or another **individual** owns 25% or more of the business, please check the appropriate box
-- If someone else owns 25% or more of the business, you will be prompted to provide their personal information
-
-If no individual owns more than 25% of the company you do not need to list any beneficial owners. In that case, be sure to leave both boxes unchecked under the Beneficial Owner Additional Information section.
-
-# How to validate the bank account
-
-The account you set up can be found under **Settings > Workspaces > _Workspace Name_ > Bank account** in either the **Verifying** or **Pending** state.
-
-If it is **Verifying**, then this means we sent you a message and need more information from you. Please review the automated message sent by Concierge. This should include a message with specific details about what's required to move forward. 
-
-If it is **Pending**, then in 1-2 business days Expensify will administer 3 test transactions to your bank account. If after two business days you do not see these test transactions, reach out to Concierge for assistance.
-
-After these transactions (2 withdrawals and 1 deposit) have been processed to your account, head to the **Bank accounts** section of your workspace settings. Here you'll see a prompt to input the transaction amounts.
-
-Once you've finished these steps, your business bank account is ready to use in Expensify!
-
-# How to delete a verified bank account
-If you need to delete a bank account from Expensify, run through the following steps:
-1. Go to **Settings > Workspaces > _Workspace Name_ > Bank account**
-2. Click the red **Delete** button under the corresponding bank account
-
-# Deep Dive
-
-## Verified bank account requirements
-
-To add a business bank account to issue reimbursements via ACH (US), to pay invoices (US), or to issue Expensify Cards:
-- You must enter a physical address for yourself, any Beneficial Owner (if one exists), and the business associated with the bank account. We **cannot** accept a PO Box or MailDrop location.
-- If you are adding the bank account to Expensify, you must add it from **your** Expensify account settings.
-- If you are adding a bank account to Expensify, we are required by law to verify your identity. Part of this process requires you to verify a US-issued photo ID. For using features related to US ACH, your ID must be issued by the United States. You and any Beneficial Owner (if one exists), must also have a US address 
-- You must have a valid website for your business to utilize the Expensify Card, or to pay invoices with Expensify. 
-
-## Locked bank account
-When you reimburse a report, you authorize Expensify to withdraw the funds from your account. If your bank rejects Expensify’s withdrawal request, your verified bank account is locked until the issue is resolved.
-
-Withdrawal requests can be rejected due to insufficient funds, or if the bank account has not been enabled for direct debit.
-If you need to enable direct debits from your verified bank account, your bank will require the following details:
-- The ACH CompanyIDs (1270239450, 4270239450 and 2270239450) 
-- The ACH Originator Name (Expensify)
-
-If using Expensify to process Bill payments, you'll also need to whitelist the ACH IDs from our partner [Stripe](https://support.stripe.com/questions/ach-direct-debit-company-ids-for-stripe?):
-- The ACH CompanyIDs (1800948598 and 4270465600)
-- The ACH Originator Name (expensify.com)
-
-If using Expensify to process international reimbursements from your USD bank account, you'll also need to whitelist the ACH IDs from our partner CorPay:
-- The ACH CompanyIDs (1522304924 and 2522304924)
-- The ACH Originator Name (Cambridge Global Payments)
-
-To request to unlock the bank account, go to **Settings > Workspaces > _Workspace Name_ > Bank account** and click **Fix.** This sends a request to our support team to review why the bank account was locked, who will send you a message to confirm that.
-
-Unlocking a bank account can take 4-5 business days to process, to allow for ACH processing time and clawback periods.
-
-## Error adding an ID to Onfido
-
-Expensify is required by both our sponsor bank and federal law to verify the identity of the individual who is initiating the movement of money. We use Onfido to confirm that the person adding a payment method is genuine and not impersonating someone else.
-
-If you get a generic error message that indicates, "Something's gone wrong", please go through the following steps:
-
-1. Ensure you are using either Safari (on iPhone) or Chrome (on Android) as your web browser.
-2. Check your browser's permissions to make sure that the camera and microphone settings are set to "Allow"
-3. Clear your web cache for Safari (on iPhone) or Chrome (on Android).
-4. If using a corporate Wi-Fi network, confirm that your corporate firewall isn't blocking the website.
-5. Make sure no other apps are overlapping your screen, such as the Facebook Messenger bubble, while recording the video. 
-6. On iPhone, if using iOS version 15 or later, disable the Hide IP address feature in Safari.
-7. If possible, try these steps on another device
-8. If you have another phone available, try to follow these steps on that device
-If the issue persists, please contact your Account Manager or Concierge for further troubleshooting assistance.
-
-{% include faq-begin.md %}
-## What is a Beneficial Owner?
-
-A Beneficial Owner refers to an **individual** who owns 25% or more of the business. If no individual owns 25% or more of the business, the company does not have a Beneficial Owner.
-
-## What do I do if the Beneficial Owner section only asks for personal details, but my organization is owned by another company?
-
-Please only indicate you have a Beneficial Owner, if it is an individual that owns 25% or more of the business. 
-
-## Why can’t I input my address or upload my ID? 
-
-Are you entering a US address? When adding a verified business bank account in Expensify, the individual adding the account, and any beneficial owner (if one exists) are required to have a US address, US photo ID, and a US SSN. If you do not meet these requirements, you’ll need to have another admin add the bank account, and then share access with you once verified. 
-
-## Why am I asked for documents when adding my bank account? 
-
-When a bank account is added to Expensify, we complete a series of checks to verify the information provided to us. We conduct these checks to comply with both our sponsor bank's requirements and federal government regulations, specifically the Bank Secrecy Act / Anti-Money Laundering (BSA / AML) laws. Expensify also has anti-fraud measures in place.
-If automatic verification fails, we may request manual verification, which could involve documents such as address verification for your business, a letter from your bank confirming bank account ownership, etc. 
-
-If you have any questions regarding the documentation request you received, please contact Concierge and they will be happy to assist. 
-
-## I don’t see all three microtransactions I need to validate my bank account. What should I do? 
-
-It's a good idea to wait till the end of that second business day. If you still don’t see them, please reach out to your bank and ask them to whitelist our ACH IDs **1270239450**, **4270239450**, and **2270239450**. Expensify’s ACH Originator Name is "Expensify".
-
-Make sure to reach out to your Account Manager or Concierge once that's all set, and our team will be able to re-trigger those three test transactions!
-
-{% include faq-end.md %}
diff --git a/docs/articles/new-expensify/chat/Expensify-Chat-For-Admins.md b/docs/articles/new-expensify/chat/Expensify-Chat-For-Admins.md
deleted file mode 100644
index 5128484adc9d..000000000000
--- a/docs/articles/new-expensify/chat/Expensify-Chat-For-Admins.md
+++ /dev/null
@@ -1,27 +0,0 @@
----
-title: Expensify Chat for Admins
-description: Best Practices for Admins settings up Expensify Chat
----
-
-# Overview
-Expensify Chat is an incredible way to build a community and foster long-term relationships between event producers and attendees, or attendees with each other. Admins are a huge factor in the success of the connections built in Expensify Chat during the events, as they are generally the drivers of the conference schedule, and help ensure safety and respect is upheld by all attendees both on and offline.
-
-# Getting Started
-We’ve rounded up some resources to get you set up on Expensify Chat and ready to start connecting with your session attendees:
-- [How to get set up and start using Expensify Chat](https://help.expensify.com/articles/other/Everything-About-Chat#how-to-use-chat-in-expensify)
-- [How to format text in Expensify Chat](https://help.expensify.com/articles/other/Everything-About-Chat#how-to-format-text)
-- [How to flag content and/or users for moderation](https://help.expensify.com/articles/other/Everything-About-Chat#flagging-content-as-offensive)
-
-# Admin Best Practices
-In order to get the most out of Expensify Chat, we created a list of best practices for admins to review in order to use the tool to its fullest capabilities.
-
-**During the conference:**
-- At a minimum, send 3 announcements throughout the day to create awareness of any sessions, activations, contests, or parties you want to promote.
-- Communicate with the Expensify Team in the #admins room if you see anything you have questions about or are unsure of to make sure we’re resolving issues together ASAP.
-- As an admin, It’s up to you to help keep your conference community safe and respectful. [Flag any content for moderation](https://help.expensify.com/articles/other/Everything-About-Chat#flagging-content-as-offensive) that does not fit your culture and values to keep chatrooms a positive experience for everyone involved.
-
-**After the conference:**
-- The rooms will all stay open after the conference ends, so encourage speakers to keep engaging as long as the conversation is going in their session room.
-- Continue sharing photos and videos from the event or anything fun in #social as part of a wrap up for everyone.
-- Use the #announce room to give attendees a sneak preview of your next event.
-- 
\ No newline at end of file
diff --git a/docs/articles/new-expensify/chat/Invite-members-to-a-chat-group-or-room.md b/docs/articles/new-expensify/chat/Invite-members-to-a-chat-group-or-room.md
index d6877f71be07..c26ecf979b32 100644
--- a/docs/articles/new-expensify/chat/Invite-members-to-a-chat-group-or-room.md
+++ b/docs/articles/new-expensify/chat/Invite-members-to-a-chat-group-or-room.md
@@ -68,7 +68,7 @@ If your group/room is Private, you can only share the chat link with other membe
 {% include option.html value="desktop" %}
 1. Open the chat group or room you want to invite someone to.
 2. Click the room or group header.
-3. Click **Share code**.
+3. Click **Share**.
 4. Copy the link or share the QR code. 
    - **Copy link**: Click **Copy URL** and paste the link into another chat, email, Slack, etc.
    - **Share QR Code**: Present your device to another user so they can scan the QR code with their device.
diff --git a/docs/articles/new-expensify/chat/Leave-a-chat-room.md b/docs/articles/new-expensify/chat/Leave-a-chat-room.md
index 252e7e94f1ac..ae6610b53be0 100644
--- a/docs/articles/new-expensify/chat/Leave-a-chat-room.md
+++ b/docs/articles/new-expensify/chat/Leave-a-chat-room.md
@@ -15,7 +15,7 @@ If you wish to no longer be part of a chat room, you can leave the room. This me
 
 {% include option.html value="mobile" %}
 1. Open the chat room.
-2. Tap the 3 dot menu icon in the top right and select **Leave**. 
+2. Tap the header and select **Leave**. 
 {% include end-option.html %}
 
 {% include end-selector.html %}
diff --git a/docs/articles/new-expensify/connections/Coming-Soon.md b/docs/articles/new-expensify/connections/Coming-Soon.md
deleted file mode 100644
index 4d32487a14b5..000000000000
--- a/docs/articles/new-expensify/connections/Coming-Soon.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-title: Coming soon
-description: Coming soon
----
-
-# Coming soon
\ No newline at end of file
diff --git a/docs/articles/new-expensify/connections/netsuite/Configure-Netsuite.md b/docs/articles/new-expensify/connections/netsuite/Configure-Netsuite.md
new file mode 100644
index 000000000000..ca0dbfe9ae54
--- /dev/null
+++ b/docs/articles/new-expensify/connections/netsuite/Configure-Netsuite.md
@@ -0,0 +1,252 @@
+---
+title: Configure Netsuite
+description: Configure the Import, Export, and Advanced settings for Expensify's integration with NetSuite
+order: 2
+---
+
+# Configure NetSuite integration
+## Step 1: Configure import settings
+
+The following section will help you determine how data will be imported from NetSuite into Expensify. To change your import settings, navigate to the Accounting settings for your workspace, then click **Import** under the NetSuite connection.
+
+### Expense Categories
+Your NetSuite Expense Categories are automatically imported into Expensify as categories. This cannot be amended, and any new categories you'd like to add must be added as Expense Categories in NetSuite.
+
+Once imported, you can turn specific Categories on or off under **Settings > Workspaces > [Workspace Name] > Categories**.
+
+### Departments, Classes, and Locations
+The NetSuite integration allows you to import departments, classes, and locations from NetSuite into Expensify as Tags, Report Fields, or using the NetSuite Employee Default.
+
+- **NetSuite Employee Default:** If default Department, Class, and Locations have been configured on NetSuite employee records, then you can choose to have the NetSuite employee default applied upon export from Expensify to NetSuite. With this selection, employees will not make a selection in Expensify.
+- **Tags:** Employees can select the department, class, or location on each individual expense. If the employee's NetSuite employee record has a default value, then each expense will be defaulted to that tag upon creation, with the option for the employee to select a different value on each expense.
+- **Report Fields:** Employees can select one department/class/location for each expense report.
+
+
+New departments, classes, and locations must be added in NetSuite. Once imported, you can turn specific tags on or off under **Settings > Workspaces > [Workspace Name] > Tags**. You can turn specific report fields on or off under **Settings > Workspaces > [Workspace Name] > Report Fields**.
+
+### Customers and Projects
+The NetSuite integration allows you to import customers and projects into Expensify as Tags or Report Fields.
+
+- **Tags:** Employees can select the customer or project on each individual expense.
+- **Report Fields:** Employees can select one department/class/location for each expense report.
+
+New customers and projects must be added in NetSuite. Once imported, you can turn specific tags on or off under **Settings > Workspaces > [Workspace Name] > Tags**. You can turn specific report fields on or off under **Settings > Workspaces > [Workspace Name] > Report Fields**.
+
+When importing customers or projects, you can also choose to enable **Cross-subsidiary customers/projects**. This setting allows you to import Customers and Projects across all NetSuite subsidiaries to a single Expensify workspace. This setting requires you to enable “Intercompany Time and Expense” in NetSuite. To enable that feature in NetSuite, go to **Setup > Company > Setup Tasks: Enable Features > Advanced Features**.
+
+### Tax
+The NetSuite integration allows users to apply a tax rate and amount to each expense for non-US NetSuite subsidiaries. To do this, import Tax Groups from NetSuite:
+
+1. In NetSuite, head to **Setup > Accounting > Tax Groups**
+2. Once imported, go to the NetSuite connection configuration page in Expensify (under **Settings > Workspaces > [Workspace Name] > Accounting > NetSuite > Import**)
+3. Enable Tax
+4. Go back to the Accounting screen, click the three dots next to NetSuite, and click **Sync now**
+5. All Tax Groups for the connected NetSuite subsidiary will be imported to Expensify as taxes.
+6. After syncing, go to **Settings > Workspace > [Workspace Name] > Tax** to see the tax groups imported from NetSuite
+
+### Custom Segments
+You can import one or more Custom Segments from NetSuite for selection in Expensify. To add a Custom Segment to your Expensify workspace:
+
+1. Go to **Settings > Workspaces > [Workspace Name] > Accounting**
+2. Click **Import** under NetSuite
+3. Click **Custom segments/records**
+4. Click **Add custom segment/record**
+
+From there, you'll walk through a simple setup wizard. You can find detailed instructions below for each setup step.
+
+1. In Step 1, you'll select whether you'd like to import a custom segment or a custom record. For a Custom Segment, continue. We have separate instructions for [Custom Records](link) and [Custom Lists](link).
+2. **Segment Name**
+    a. Log into NetSuite as an administrator
+    b. Go to **Customization > Lists, Records, & Fields > Custom Segments**
+    c. You’ll see the Segment Name on the Custom Segments page
+3. Internal ID
+    a. Ensure you have internal IDs enabled in NetSuite under **Home > Set Preferences**
+    b. Navigate back to the **Custom Segments** page
+    c. Click the **Custom Record Type** link
+    d. You’ll see the Internal ID on the Custom Record Type page
+4. **Script ID/Field ID**
+    a. If configuring Custom Segments as Report Fields, use the Field ID on the Transactions tab (under **Custom Segments > Transactions**). If no Field ID is shown, use the unified ID (just called “ID” right below the “Label”).
+    b. If configuring Custom Segments as Tags, use the Field ID on the Transaction Columns tab (under **Custom Segments > Transaction Columns**). If no Field ID is shown, use the unified ID (just called “ID” right below the “Label”).
+    c. Note that as of 2019.1, any new custom segments that you create automatically use the unified ID, and the "Use as Field ID" box is not visible. If you are editing a custom segment definition that was created before 2019.1, the "Use as Field ID" box is available. To use a unified ID for the entire custom segment definition, check the "Use as Field ID" box. When the box is checked, no field ID fields or columns are shown on the Application & Sourcing subtabs because one ID is used for all fields.
+5. Select whether you'd like to import the custom segment as Tags or Report Fields
+6. Finally, confirm that all the details look correct
+
+**Note:** Don’t use the “Filtered by” feature available for Custom Segments. Expensify can’t make these dependent on other fields. If you do have a filter selected, we suggest switching that filter in NetSuite to “Subsidiary” and enabling all subsidiaries to ensure you don’t receive any errors upon exporting reports.
+
+### Custom Records
+You can import one or more Custom Records from NetSuite for selection in Expensify. To add a Custom Record to your Expensify workspace:
+
+1. Go to **Settings > Workspaces > [Workspace Name] > Accounting**
+2. Click **Import** under NetSuite
+3. Click **Custom segments/records**
+4. Click **Add custom segment/record**
+
+From there, you'll walk through a simple setup wizard. You can find detailed instructions below for each setup step.
+
+1. In Step 1, you'll select whether you'd like to import a custom segment or a custom record. For a Custom Record, continue. We have separate instructions for [Custom Segments](link) and [Custom Lists](link).
+2. **Segment Name**
+    a. Log into NetSuite as an administrator
+    b. Go to **Customization > Lists, Records, & Fields > Custom Segments**
+    c. You’ll see the Custom Record Name on the Custom Segments page
+3. **Internal ID**
+    a. Make sure you have Internal IDs enabled in NetSuite under **Home > Set Preferences**
+    b. Navigate back to the **Custom Segment** page
+    c. Click the **Custom Record Type** hyperlink
+    d. You’ll see the Internal ID on the Custom Record Type page
+4. **Transaction Column ID**
+    a. If configuring Custom Records as Report Fields, use the Field ID on the Transactions tab (under **Custom Segments > Transactions**).
+    b. If configuring Custom Records as Tags, use the Field ID on the Transaction Columns tab (under **Custom Segments > Transaction Columns**).
+5. Select whether you'd like to import the custom record as Tags or Report Fields
+6. Finally, confirm that all the details look correct
+
+### Custom Lists
+You can import one or more Custom Lists from NetSuite for selection in Expensify. To add a Custom List to your Expensify workspace:
+
+1. Go to **Settings > Workspaces > [Workspace Name] > Accounting**
+2. Click **Import** under NetSuite
+3. Click **Custom list**
+4. Click **Add custom list**
+
+From there, you'll walk through a simple setup wizard. You can find detailed instructions below for each setup step.
+
+1. In Step 1, you'll select which Custom List you'd like to import from a pre-populated list
+2. **Transaction Line Field ID**
+    a. Log into NetSuite as an admin
+    b. Search **“Transaction Line Fields”** in the global search
+    c. Click into the desired Custom List
+    d. You'll find the transaction Line Field ID along the left-hand side of the page
+3. Select whether you'd like to import the custom list as Tags or Report Fields
+4. Finally, confirm that all the details look correct
+
+From there, you should see the values for the Custom Lists under the Tag or Report Field settings in Expensify.
+## Step 2: Configure export settings
+There are numerous options for exporting data from Expensify to NetSuite. To access these settings, head to **Settings > Workspaces > [Workspace name] > Accounting** and click **Export** under NetSuite.
+
+### Preferred Exporter
+Any workspace admin can export reports to NetSuite. For auto-export, Concierge will export on behalf of the preferred exporter. The preferred exporter will also be notified of any expense reports that fail to export to NetSuite due to an error.
+
+### Date
+You can choose which date to use for the records created in NetSuite. There are three date options:
+
+1. **Date of last expense:** This will use the date of the previous expense on the report
+2. **Submitted date:** The date the employee submitted the report
+3. **Exported date:** The date you export the report to NetSuite
+
+### Export out-of-pocket expenses as
+**Expense Reports**
+Out-of-pocket expenses will be exported to NetSuite as expense reports, which will be posted to the payables account designated in NetSuite.
+
+**Vendor Bills**
+Out-of-pocket expenses will be exported to NetSuite as vendor bills. Each report will be posted as payable to the vendor associated with the employee who submitted the report. You can also set an approval level in NetSuite for vendor bills.
+
+**Journal Entries**
+Out-of-pocket expenses will be exported to NetSuite as journal entries. All the transactions will be posted to the payable account specified in the workspace. You can also set an approval level in NetSuite for the journal entries.
+
+Note: By default, journal entry forms do not contain a customer column, so it is not possible to export customers or projects with this export option. Also, The credit line and header level classifications are pulled from the employee record.
+
+### Export company card expenses as
+**Expense Reports**
+To export company card expenses as expense reports, you will need to configure your default corporate cards in NetSuite. To do this, you must select the correct card on the NetSuite employee records (for individual accounts) or the subsidiary record (If you use a non-One World account, the default is found in your accounting preferences).
+
+To update your expense report transaction form in NetSuite:
+
+1. Go to **Customization > Forms > Transaction Forms**
+2. Click **Edit** next to the preferred expense report form
+3. Go to the **Screen Fields > Main** tab
+4. Check “Show” for "Account for Corporate Card Expenses"
+5. Go to the **Screen Fields > Expenses** tab
+6. Check “Show” for "Corporate Card"
+
+You can also select the default account on your employee record to use individual corporate cards for each employee. Make sure you add this field to your employee entity form in NetSuite. If you have multiple cards assigned to a single employee, you cannot export to each account. You can only have a single default per employee record.
+
+**Vendor Bills**
+Company card expenses will be posted as a vendor bill payable to the default vendor specified in your workspace Accounting settings. You can also set an approval level in NetSuite for the bills.
+
+
+**Journal Entries**
+Company Card expenses will be posted to the Journal Entries posting account selected in your workspace Accounting settings.
+
+Important Notes:
+
+- Expensify Card expenses will always export as Journal Entries, even if you have Expense Reports or Vendor Bills configured for non-reimbursable expenses on the Export tab
+- Journal entry forms do not contain a customer column, so it is not possible to export customers or projects with this export option
+- The credit line and header level classifications are pulled from the employee record
+
+### Export invoices to
+Select the Accounts Receivable account where you want your Invoice reports to export. In NetSuite, the invoices are linked to the customer, corresponding to the email address where the invoice was sent.
+
+### Export foreign currency amount
+Enabling this feature allows you to send the original amount of the expense rather than the converted total when exporting to NetSuite. This option is only available when exporting out-of-pocket expenses as Expense Reports.
+
+### Export to next open period
+When this feature is enabled and you try exporting an expense report to a closed NetSuite period, we will automatically export to the next open period instead of returning an error.
+
+
+## Step 3: Configure advanced settings
+To access the advanced settings of the NetSuite integration, head to **Settings > Workspaces > [Workspace name] > Accounting** and click **Advanced** under NetSuite.
+
+
+Let’s review the different advanced settings and how they interact with the integration.
+
+### Auto-sync
+We strongly recommend enabling auto-sync to ensure that the information in NetSuite and Expensify is always in sync. The following will occur when auto-sync is enabled:
+
+**Daily sync from NetSuite to Expensify:** Once a day, Expensify will sync any changes from NetSuite into Expensify. This includes any new, updated, or removed departments/classes/locations/projects/etc.
+
+**Auto-export:** When an expense report reaches its final state in Expensify, it will be automatically exported to NetSuite. The final state will either be reimbursement (if you reimburse members through Expensify) or final approval (if you reimburse members outside of Expensify).
+
+**Reimbursement-sync:** If Sync Reimbursed Reports (more details below) is enabled, then we will sync the reimbursement status of reports between Expensify and NetSuite.
+
+### Sync reimbursed reports
+When Sync reimbursed reports is enabled, the reimbursement status will be synced between Expensify and NetSuite.
+
+**If you reimburse members through Expensify:** Reimbursing an expense report will trigger auto-export to NetSuite. When the expense report is exported to NetSuite, a corresponding bill payment will also be created in NetSuite.
+
+**If you reimburse members outside of Expensify:** Expense reports will be exported to NetSuite at time of final approval. After you mark the report as paid in NetSuite, the reimbursed status will be synced back to Expensify the next time the integration syncs.
+
+To ensure this feature works properly for expense reports, make sure that the reimbursement account you choose within the settings matches the default account for Bill Payments in NetSuite. When exporting invoices, once marked as Paid, the payment is marked against the account selected after enabling the Collection Account setting.
+
+### Invite employees and set approvals
+Enabling this feature will invite all employees from the connected NetSuite subsidiary to your Expensify workspace. Once imported, Expensify will send them an email letting them know they’ve been added to a workspace.
+
+In addition to inviting employees, this feature enables a custom set of approval workflow options, which you can manage in Expensify Classic:
+
+- **Basic Approval:** A single level of approval, where all users submit directly to a Final Approver. The Final Approver defaults to the workspace owner but can be edited on the people page.
+- **Manager Approval (default):** Two levels of approval route reports first to an employee’s NetSuite expense approver or supervisor, and second to a workspace-wide Final Approver. By NetSuite convention, Expensify will map to the supervisor if no expense approver exists. The Final Approver defaults to the workspace owner but can be edited on the people page.
+- **Configure Manually:** Employees will be imported, but all levels of approval must be manually configured on the workspace’s People settings page. If you enable this setting, it’s recommended you review the newly imported employees and managers on the **Settings > Workspaces > Group > [Workspace Name] > People** page.
+
+### Auto-create employees/vendors
+With this feature enabled, Expensify will automatically create a new employee or vendor in NetSuite (if one doesn’t already exist) using the name and email of the report submitter.
+
+### Enable newly imported categories
+With this feature enabled, anytime a new Expense Category is created in NetSuite, it will be imported into Expensify as an enabled category. If the feature is disabled, then new Expense Categories will be imported into Expensify as disabled.
+
+### Setting approval levels
+You can set the NetSuite approval level for each different export type:
+
+- **Expense report approval level:** Choose from "NetSuite default preference," “Only supervisor approved,” “Only accounting approved,” or “Supervisor and accounting approved.”
+- **Vendor bill approval level and Journal entry approval level:** Choose from "NetSuite default preference," “Pending approval,” or “Approved for posting.”
+
+If you have Approval Routing selected in your accounting preference, this will override the selections in Expensify. If you do not wish to use Approval Routing in NetSuite, go to **Setup > Accounting > Accounting Preferences > Approval Routing** and ensure Vendor Bills and Journal Entries are not selected.
+
+### Custom form ID
+By default, Expensify will create entries using the preferred transaction form set in NetSuite. Alternatively, you have the option to designate a specific transaction form to be used.
+
+
+
+## FAQ
+
+### How does Auto-sync work with reimbursed reports?
+If a report is reimbursed via ACH or marked as reimbursed in Expensify and then exported to NetSuite, the report is automatically marked as paid in NetSuite.
+
+If a report is exported to NetSuite, then marked as paid in NetSuite, the report will automatically be marked as reimbursed in Expensify during the next sync.
+
+### Will enabling auto-sync affect existing approved and reimbursed reports?
+Auto-sync will only export newly approved reports to NetSuite. Any reports that were approved or reimbursed before enabling auto-sync will need to be manually exported in order to sync them to NetSuite.
+
+
+### When using multi-currency features in NetSuite, can expenses be exported with any currency?
+When using multi-currency features with NetSuite, remember these points:
+
+**Employee/Vendor currency:** The currency set for a NetSuite vendor or employee record must match the subsidiary currency for whichever subsidiary you export that user's reports to. A currency mismatch will cause export errors.
+**Bank Account Currency:** When synchronizing bill payments, your bank account’s currency must match the subsidiary’s currency. Failure to do so will result in an “Invalid Account” error.
diff --git a/docs/articles/new-expensify/connections/netsuite/Connect-to-NetSuite.md b/docs/articles/new-expensify/connections/netsuite/Connect-to-NetSuite.md
new file mode 100644
index 000000000000..19009c016862
--- /dev/null
+++ b/docs/articles/new-expensify/connections/netsuite/Connect-to-NetSuite.md
@@ -0,0 +1,127 @@
+---
+title: Connect to NetSuite
+description: Integrate NetSuite with Expensify
+order: 1
+---
+
+# Connect to NetSuite
+
+## Overview
+Expensify’s integration with NetSuite allows you to sync data between the two systems. Before you start connecting Expensify with NetSuite, there are a few things to note:
+
+- You must use NetSuite administrator credentials to initiate the connection
+- A Control Plan in Expensify is required to integrate with NetSuite
+- Employees don’t need NetSuite access or a NetSuite license to submit expense reports and sync them to NetSuite
+- Each NetSuite subsidiary must be connected to a separate Expensify workspace
+- The workspace currency in Expensify must match the NetSuite subsidiary's default currency
+
+## Step 1: Install the Expensify Bundle in NetSuite
+1. While logged into NetSuite as an administrator, go to **Customization > SuiteBundler > Search & Install Bundles**, then search for “Expensify”
+2. Click on the Expensify Connect bundle (Bundle ID 283395)
+3. Click **Install**
+4. If you already have the Expensify Connect bundle installed, head to **Customization > SuiteBundler > Search & Install Bundles > List**, and update it to the latest version
+5. Select "Show on Existing Custom Forms" for all available fields
+
+## Step 2: Enable Token-Based Authentication
+1. In NetSuite, go to **Setup > Company > Enable Features > SuiteCloud > Manage Authentication**
+2. Make sure “Token Based Authentication” is enabled
+3. Click **Save**
+
+
+## Step 3: Add Expensify Integration Role to a User
+1. In NetSuite, head to **Lists > Employees**, and find the user who you would like to add the Expensify Integration role to. The user you select must at least have access to the permissions included in the Expensify Integration Role, and Admin access works too, but Admin access is not required.
+2. Click **Edit > Access**, then find the Expensify Integration role in the dropdown and add it to the user
+3. Click **Save**
+
+Remember that Tokens are linked to a User and a Role, not solely to a User. It’s important to note that you cannot establish a connection with tokens using one role and then switch to another role afterward. Once you’ve initiated a connection with tokens, you must continue using the same token/user/role combination for all subsequent sync or export actions.
+
+## Step 4: Create Access Tokens
+1. In NetSuite, enter “page: tokens” in the Global Search
+2. Click **New Access Token**
+3. Select Expensify as the application (this must be the original Expensify integration from the bundle)
+4. Select the role Expensify Integration
+5. Click **Save**
+6. Copy and paste the token and token ID to a saved location on your computer (this is the only time you will see these details)
+
+## Step 5: Confirm Expense Reports are enabled in NetSuite
+Expense Reports must be enabled in order to use Expensify’s integration with NetSuite.
+
+1. In NetSuite, go to **Setup > Company > Enable Features > Employees**
+2. Confirm the checkbox next to "Expense Reports" is checked
+3. If not, click the checkbox and then click **Save** to enable Expense Reports
+
+## Step 6: Confirm Expense Categories are set up in NetSuite
+Once Expense Reports are enabled, Expense Categories can be set up in NetSuite. Expense Categories are synced to Expensify as Categories. Each Expense Category is an alias mapped to a General Ledger account so that employees can more easily categorize expenses.
+
+1. In NetSuite, go to **Setup > Accounting > Expense Categories** (a list of Expense Categories should show)
+2. If no Expense Categories are visible, click **New** to create new ones
+
+## Step 7: Confirm Journal Entry Transaction Forms are Configured Properly
+1. In NetSuite, go to **Customization > Forms > Transaction Forms**
+2. Click **Customize** or **Edit** next to the Standard Journal Entry form
+3. Click **Screen Fields > Main**. Please verify the “Created From” label has “Show” checked and the "Display Type" is set to "Normal"
+4. Click the sub-header **Lines** and verify that the “Show” column for “Receipt URL” is checked
+5. Go to **Customization > Forms > Transaction Forms** and ensure that all other transaction forms with the journal type have this same configuration
+
+## Step 8: Confirm Expense Report Transaction Forms are Configured Properly
+1. In NetSuite, go to **Customization > Forms > Transaction Forms**
+2. Click **Customize** or **Edit** next to the Standard Expense Report form, then click **Screen Fields > Main**
+3. Verify the “Created From” label has “Show” checked and the "Display Type" is set to "Normal"
+4. Click the second sub-header, **Expenses**, and verify that the "Show" column for "Receipt URL" is checked
+5. Go to **Customization > Forms > Transaction Forms** and ensure that all other transaction forms with the expense report type have this same configuration
+
+## Step 9: Confirm Vendor Bill Transactions Forms are Configured Properly
+1. In NetSuite, go to **Customization > Forms > Transaction Forms**
+2. Click **Customize** or **Edit** next to your preferred Vendor Bill form
+3. Click **Screen Fields > Main** and verify that the “Created From” label has “Show” checked and that Departments, Classes, and Locations have the “Show” label unchecked
+4. Under the **Expenses** sub-header (make sure to click the “Expenses” sub-header at the very bottom and not “Expenses & Items”), ensure “Show” is checked for Receipt URL, Department, Location, and Class
+5. Go to **Customization > Forms > Transaction Forms** and ensure that all other transaction forms with the vendor bill type have this same configuration
+
+## Step 10: Confirm Vendor Credit Transactions Forms are Configured Properly
+1. In NetSuite, go to **Customization > Forms > Transaction Forms**
+2. Click **Customize** or **Edit** next to your preferred Vendor Credit form, then click **Screen Fields > Main** and verify that the “Created From” label has “Show” checked and that Departments, Classes, and Locations have the “Show” label unchecked
+3. Under the **Expenses** sub-header (make sure to click the “Expenses” sub-header at the very bottom and not “Expenses & Items”), ensure “Show” is checked for Receipt URL, Department, Location, and Class
+4. Go to **Customization > Forms > Transaction Forms** and ensure that all other transaction forms with the vendor credit type have this same configuration
+
+## Step 11: Set up Tax Groups (only applicable if tracking taxes)
+Expensify imports NetSuite Tax Groups (not Tax Codes), which you can find in NetSuite under **Setup > Accounting > Tax Groups**.
+
+Tax Groups are an alias for Tax Codes in NetSuite and can contain one or more Tax Codes (Please note: for UK and Ireland subsidiaries, please ensure your Tax Groups do not have more than one Tax Code). We recommend naming Tax Groups so your employees can easily understand them, as the name and rate will be displayed in Expensify.
+
+To set up Tax Groups in NetSuite:
+
+1. Go to **Setup > Accounting > Tax Groups**
+2. Click **New**
+3. Select the country for your Tax Group
+4. Enter the Tax Name (this is what employees will see in Expensify)
+5. Select the subsidiary for this Tax Group
+6. Select the Tax Code from the table you wish to include in this Tax Group
+7. Click **Add**
+8. Click **Save**
+9. Create one NetSuite Tax Group for each tax rate you want to show in Expensify
+
+Ensure Tax Groups can be applied to expenses by going to **Setup > Accounting > Set Up Taxes** and setting the Tax Code Lists Include preference to “Tax Groups And Tax Codes” or “Tax Groups Only.” If this field does not display, it’s not needed for that specific country.
+
+## Step 12: Connect Expensify to NetSuite
+1. Log into Expensify as a workspace admin
+2. Click your profile image or icon in the bottom left menu
+3. Scroll down and click **Workspaces** in the left menu
+4. Select the workspace you want to connect to NetSuite
+5. Click **More features** in the left menu
+6. Scroll down to the Integrate section and enable Accounting
+7. Click **Accounting** in the left menu
+8. Click **Set up** next to NetSuite
+9. Click **Next** until you reach setup step 5 (If you followed the instructions above, then the first four setup steps will be complete)
+10. On setup step 5, enter your NetSuite Account ID, Token ID, and Token Secret (the NetSuite Account ID can be found in NetSuite by going to **Setup > Integration > Web Services Preferences**)
+11. Click **Confirm** to complete the setup
+
+After completing the setup, the NetSuite connection will sync. It can take 1-2 minutes to sync with NetSuite.
+
+Once connected, all reports exported from Expensify will be generated in NetSuite using SOAP Web Services (the term NetSuite employs when records are created through the integration).
+
+## FAQ
+### What type of Expensify plan is required to connect to NetSuite?
+You need a Control workspace to integrate with NetSuite. If you have a Collect workspace, you will need to upgrade to Control.
+
+### Page size
+Make sure your page size is set to 1000 in NetSuite for importing your customers and vendors. Go to **Setup > Integration > Web Services Preferences** and search **Page Size** to determine your page size.
diff --git a/docs/articles/new-expensify/connections/netsuite/Netsuite-Troubleshooting.md b/docs/articles/new-expensify/connections/netsuite/Netsuite-Troubleshooting.md
new file mode 100644
index 000000000000..2ac1aaadbef4
--- /dev/null
+++ b/docs/articles/new-expensify/connections/netsuite/Netsuite-Troubleshooting.md
@@ -0,0 +1,6 @@
+---
+title: Netsuite Troubleshooting
+description: Coming soon
+---
+
+# Coming soon
diff --git a/docs/articles/new-expensify/connections/quickbooks-online/Configure-Quickbooks-Online.md b/docs/articles/new-expensify/connections/quickbooks-online/Configure-Quickbooks-Online.md
new file mode 100644
index 000000000000..787602337bd2
--- /dev/null
+++ b/docs/articles/new-expensify/connections/quickbooks-online/Configure-Quickbooks-Online.md
@@ -0,0 +1,24 @@
+---
+title: Configure Quickbooks Online
+description: Coming Soon
+---
+
+# FAQ
+
+## How do I know if a report is successfully exported to QuickBooks Online?
+
+When a report exports successfully, a message is posted in the expense’s related chat room:
+
+![Confirmation message posted in the expense chat room](https://help.expensify.com/assets/images/QBO_help_01.png){:width="100%"}
+
+## What happens if I manually export a report that has already been exported?
+
+When an admin manually exports a report, Expensify will notify them if the report has already been exported. Exporting the data again will create a duplicate report in QuickBooks Online.
+
+## What happens to existing approved and reimbursed reports if I enable Auto Sync?
+
+- If Auto Sync was disabled when your Workspace was linked to QuickBooks Online, enabling it won’t impact existing reports that haven’t been exported.
+- If a report has been exported and reimbursed via ACH, it will be automatically marked as paid in QuickBooks Online during the next sync.
+- If a report has been exported and marked as paid in QuickBooks Online, it will be automatically marked as reimbursed in Expensify during the next sync.
+
+Reports that have yet to be exported to QuickBooks Online won’t be automatically exported.
diff --git a/docs/articles/new-expensify/connections/quickbooks-online/Connect-to-QuickBooks-Online.md b/docs/articles/new-expensify/connections/quickbooks-online/Connect-to-QuickBooks-Online.md
new file mode 100644
index 000000000000..60fdbe94b33b
--- /dev/null
+++ b/docs/articles/new-expensify/connections/quickbooks-online/Connect-to-QuickBooks-Online.md
@@ -0,0 +1,136 @@
+---
+title: Connect to QuickBooks Online
+description: Integrate QuickBooks Online with Expensify
+order: 1
+---
+
+{% include info.html %}
+To use the QuickBooks Online connection, you must have a QuickBooks Online account and an Expensify Collect plan. The QuickBooks Self-employed subscription is not supported.
+{% include end-info.html %}
+
+The features available for the Expensify connection with QuickBooks Online vary based on your QuickBooks subscription. The features may still be visible in Expensify even if you don’t have access, but you will receive an error if the feature isn't available with your subscription. 
+
+Here is a list of the features supported by each QuickBooks Online subscription: 
+
+| Feature                    | Simple Start | Essentials | Essentials Plus |
+|----------------------------|--------------|------------|-----------------|
+| Expense Reports            | &#10004;     | &#10004;   | &#10004;        |
+| GL Accounts as Categories  | &#10004;     | &#10004;   | &#10004;        |
+| Credit Card Transactions   | &#10004;     | &#10004;   | &#10004;        |
+| Debit Card Transaction     |              | &#10004;   | &#10004;        |
+| Classes                    |              | &#10004;   | &#10004;        |
+| Customers                  |              | &#10004;   | &#10004;        |
+| Projects                   |              | &#10004;   | &#10004;        |
+| Vendor Bills               |              | &#10004;   | &#10004;        |
+| Journal Entries            |              | &#10004;   | &#10004;        |
+| Tax                        |              | &#10004;   | &#10004;        |
+| Billable                   |              |            | &#10004;        |
+| Location                   |              |            | &#10004;        |
+
+To set up your QuickBooks Online connection, complete the 5 steps below.
+
+# Step 1: Set up employees in QuickBooks Online
+
+Log in to QuickBooks Online and ensure all of your employees are setup as either Vendors or Employees using the same email address that they are listed under in Expensify. This process may vary by country, but you can go to **Payroll** and select **Employees** in QuickBooks Online to add new employees or edit existing ones. 
+
+# Step 2: Connect Expensify to QuickBooks Online
+
+<ol type="a">
+   <li>Click your profile image or icon in the bottom left menu.</li>
+   <li>Scroll down and click <b>Workspaces</b> in the left menu.</li>
+   <li>Select the workspace you want to connect to QuickBooks Online.</li>
+   <li>Click <b>More features</b> in the left menu.</li>
+   <li>Scroll down to the Integrate section and enable the Accounting toggle.</li>
+   <li>Click <b>Accounting</b> in the left menu.</li>
+   <li>Click <b>Set up</b> to the right of QuickBooks Online.</li>
+   <li>Enter your Intuit login details to import your settings from QuickBooks Online to Expensify.</li>
+</ol>
+
+![The toggle location to enable accounting integrations like QuickBooks Online]({{site.url}}/assets/images/ExpensifyHelp-QBO-1.png){:width="100%"}
+
+![How to enable accounting integrations like QuickBooks Online]({{site.url}}/assets/images/ExpensifyHelp-QBO-2.png){:width="100%"}
+
+![The QuickBooks Online Connect button]({{site.url}}/assets/images/ExpensifyHelp-QBO-3.png){:width="100%"}
+
+![The QuickBooks Online Connect Accounting button]({{site.url}}/assets/images/ExpensifyHelp-QBO-4.png){:width="100%"}
+
+![The QuickBooks Online Connect Connect button]({{site.url}}/assets/images/ExpensifyHelp-QBO-5.png){:width="100%"}
+
+
+
+# Step 3: Configure import settings
+
+The following steps help you determine how data will be imported from QuickBooks Online to Expensify. 
+
+<ol type="a">
+   <li>Under the Accounting settings for your workspace, click Import under the QuickBooks Online connection.</li>
+   <li>Review each of the following import settings:</li>
+       <ul>
+           <li><b>Chart of accounts</b>: The chart of accounts are automatically imported from QuickBooks Online as categories. This cannot be amended.</li>
+           <li><b>Classes</b>: Choose whether to import classes, which will be shown in Expensify as tags for expense-level coding.</li>
+           <li><b>Customers/projects</b>: Choose whether to import customers/projects, which will be shown in Expensify as tags for expense-level coding.</li>
+           <li><b>Locations</b>: Choose whether to import locations, which will be shown in Expensify as tags for expense-level coding.</li>
+{% include info.html %}
+As Locations are only configurable as tags, you cannot export expense reports as vendor bills or checks to QuickBooks Online. To unlock these export options, either disable locations import or upgrade to the Control Plan to export locations encoded as a report field.
+{% include end-info.html %}
+           <li><b>Taxes</b>: Choose whether to import tax rates and defaults.</li>
+       </ul>
+</ol>
+
+# Step 4: Configure export settings
+
+The following steps help you determine how data will be exported from Expensify to QuickBooks Online.
+
+<ol type="a">
+   <li>Under the Accounting settings for your workspace, click Export under the QuickBooks Online connection.</li>
+   <li>Review each of the following export settings:</li>
+       <ul>
+           <li><b>Preferred Exporter</b>: Choose whether to assign a Workspace Admin as the Preferred Exporter. Once selected, the Preferred Exporter automatically receives reports for export in their account to help automate the exporting process.</li>  
+
+{% include info.html %}
+* Other Workspace Admins will still be able to export to QuickBooks Online. 
+* If you set different export accounts for individual company cards under your domain settings, then your Preferred Exporter must be a Domain Admin.
+{% include end-info.html %}
+
+           <li><b>Date</b>: Choose whether to use the date of last expense, export date, or submitted date.</li>  
+           <li><b>Export Out-of-Pocket Expenses as</b>: Select whether out-of-pocket expenses will be exported as a check, journal entry, or vendor bill.</li>  
+
+{% include info.html %}
+These settings may vary based on whether tax is enabled for your workspace. 
+* If tax is not enabled on the workspace, you’ll also select the Accounts Payable/AP. 
+* If tax is enabled on the workspace, journal entry will not be available as an option. If you select the journal entries option first and later enable tax on the workspace, you will see a red dot and an error message under the “Export Out-of-Pocket Expenses as” options. To resolve this error, you must change your export option to vendor bill or check to successfully code and export expense reports.
+{% include end-info.html %}
+ 
+           <li><b>Invoices</b>: Select the QuickBooks Online invoice account that invoices will be exported to.</li>  
+           <li><b>Export as</b>: Select whether company cards export to QuickBooks Online as a credit card (the default), debit card, or vendor bill. Then select the account they will export to.</li>  
+               <li>If you select vendor bill, you’ll also select the accounts payable account that vendor bills will be created from, as well as whether to set a default vendor for credit card transactions upon export. If this option is enabled, you will select the vendor that all credit card transactions will be applied to.</li>
+      </ul>
+</ol>   
+
+# Step 5: Configure advanced settings
+
+The following steps help you determine the advanced settings for your connection, like auto-sync and employee invitation settings.
+
+<ol type="a">
+   <li>Under the Accounting settings for your workspace, click Advanced under the QuickBooks Online connection.</li>
+   <li>Select an option for each of the following settings:</li>
+       <ul>
+           <li><b>Auto-sync</b>: Choose whether to enable QuickBooks Online to automatically communicate changes with Expensify to ensure that the data shared between the two systems is up-to-date. New report approvals/reimbursements will be synced during the next auto-sync period.</li>    
+           <li><b>Invite Employees</b>: Choose whether to enable Expensify to import employee records from QuickBooks Online and invite them to this workspace.</li>    
+           <li><b>Automatically Create Entities</b>: Choose whether to enable Expensify to automatically create vendors and customers in QuickBooks Online if a matching vendor or customer does not exist.</li>    
+           <li><b>Sync Reimbursed Reports</b>: Choose whether to enable report syncing for reimbursed expenses. If enabled, all reports that are marked as Paid in QuickBooks Online will also show in Expensify as Paid. If enabled, you must also select the QuickBooks Online account that reimbursements are coming out of, and Expensify will automatically create the payment in QuickBooks Online.</li>    
+           <li><b>Invoice Collection Account</b>: Select the invoice collection account that you want invoices to appear under once the invoice is marked as paid.</li>    
+      </ul>
+</ol>
+
+{% include faq-begin.md %}
+
+**Why do I see a red dot next to my connection?** 
+If there is an error with your connection, you’ll see a red dot next to Accounting in the left menu. When you click Accounting, you’ll also see a red dot displayed next to the QuickBooks Online connection card.
+
+This may occur if you incorrectly enter your QuickBooks Online login information when trying to establish the connection. To resubmit your login details,
+1. Click the three-dot menu to the right of the QuickBooks Online connection.
+2. Click **Enter credentials**.
+3. Enter your Intuit login details (the login information you use for QuickBooks Online) to establish the connection.
+
+{% include faq-end.md %}
diff --git a/docs/articles/new-expensify/connections/quickbooks-online/Quickbooks-Online-Troubleshooting.md b/docs/articles/new-expensify/connections/quickbooks-online/Quickbooks-Online-Troubleshooting.md
new file mode 100644
index 000000000000..ff1b9bfab9fb
--- /dev/null
+++ b/docs/articles/new-expensify/connections/quickbooks-online/Quickbooks-Online-Troubleshooting.md
@@ -0,0 +1,52 @@
+---
+title: Quickbooks Online Troubleshooting
+description: A list of common QuickBooks Online errors and how to resolve them
+---
+
+## Report won’t automatically export to QuickBooks Online
+
+If an error occurs during an automatic export to QuickBooks Online:
+ 
+- You’ll receive an email detailing the error. 
+- The error will appear in the related Workspace Chat, indicated by a red dot next to the report. 
+- For auto-sync errors, a message will be posted in the related #admins room. The message contains a link to the workspace’s accounting settings where an explanation for the error appears next to the connection.
+
+An error on a report will prevent it from automatically exporting. 
+
+### How to resolve
+
+Open the expense and make the required changes. Then an admin must manually export the report to QuickBooks Online by clicking Details > Export.
+
+![Click the Export button found in the Details tab](https://help.expensify.com/assets/images/QBO_help_02.png){:width="100%"}
+
+![Select QuickBooks Online in the Export tab](https://help.expensify.com/assets/images/QBO_help_03.png){:width="100%"}
+
+## Unable to manually export a report
+
+To export a report, it must be in the Approved, Closed, or Reimbursed state. If it is in the Open state, clicking “Export” will lead to an empty page, as the data is not yet available for export:
+
+![If the Report is in the Open status, the Not Ready to Export message shows](https://help.expensify.com/assets/images/QBO_help_04.png){:width="100%"}
+
+### How to resolve
+
+Open the report and make the required changes:
+
+1. If the report is in the Open status, ensure that it is submitted.
+2. If the Report is in the Processing status, an admin or approver will need to approve it.
+
+Once this is done, an admin must manually export the report to QuickBooks Online.
+
+{% include faq-begin.md %}
+
+**How do I disconnect the QuickBooks Online connection?**
+
+1. Click your profile image or icon in the bottom left menu.
+2. Scroll down and click **Workspaces** in the left menu. 
+3. Select the workspace you want to disconnect from QuickBooks Online.
+4. Click **Accounting** in the left menu.
+5. Click the three dot menu icon to the right of QuickBooks Online and select **Disconnect**.
+6. Click **Disconnect** to confirm. 
+
+You will no longer see the imported options from QuickBooks Online.
+
+{% include faq-end.md %}
diff --git a/docs/articles/new-expensify/connections/sage-intacct/Configure-Sage-Intacct.md b/docs/articles/new-expensify/connections/sage-intacct/Configure-Sage-Intacct.md
new file mode 100644
index 000000000000..28cdc71ed80f
--- /dev/null
+++ b/docs/articles/new-expensify/connections/sage-intacct/Configure-Sage-Intacct.md
@@ -0,0 +1,133 @@
+---
+title: Configure Sage Intacct
+description: Configure the Import, Export, and Advanced settings for Expensify's Sage Intacct integration
+order: 3
+---
+
+# Configure Sage Intacct integration
+
+## Step 1: Select entity (multi-entity setups only)
+If you have a multi-entity setup in Sage Intacct, you will be able to select in Expensify which Sage Intacct entity to connect each workspace to. Each Expensify workspace can either be connected to a single entity or connected at the Top Level.
+
+To select or change the Sage Intacct entity that your Expensify workspace is connected to, navigate to the Accounting settings for your workspace and click **Entity** under the Sage Intacct connection.
+
+## Step 2: Configure import settings
+The following section will help you determine how data will be imported from Sage Intacct into Expensify. To change your import settings, navigate to the Accounting settings for your workspace, then click **Import** under the Sage Intacct connection.
+
+### Expense Types / Chart of Accounts
+The categories in Expensify depend on how you choose to export out-of-pocket expenses:
+
+- If you choose to export out-of-pocket expenses as Expense Reports, your categories in Expensify will be imported from your Sage Intacct Expense Types
+- If you choose to export out-of-pocket expenses as Vendor Bills, your categories will be imported directly from your Chart of Accounts (also known as GL Codes or Account Codes).
+
+You can disable unnecessary categories in Expensify by going to **Settings > Workspaces > [Workspace Name] > Categories**. Note that every expense must be coded with a Category, or it will fail to export.
+
+### Billable Expenses
+Enabling billable expenses allows you to map your expense types or accounts to items in Sage Intacct. To do this, you’ll need to enable the correct permissions on your Sage Intacct user or role. This may vary based on the modules you use in Sage Intacct, so you should enable read-only permissions for relevant modules such as Projects, Purchasing, Inventory Control, and Order Entry.
+
+Once permissions are set, you can map categories to specific items, which will then export to Sage Intacct. When an expense is marked as Billable in Expensify, users must select the correct billable Category (Item), or there will be an error during export.
+
+
+### Standard dimensions: Departments, Classes, and Locations
+The Sage Intacct integration allows you to import standard dimensions into Expensify as tags, report fields, or using the Sage Intacct employee default.
+
+- **Sage Intacct Employee default:** This option is only available when exporting as expense reports. When this option is selected, nothing will be imported into Expensify - instead, the employee default will be applied to each expense upon export.
+- **Tags:** Employees can select the department, class, or location on each individual expense. If the employee's Sage Intacct employee record has a default value, then each expense will default to that tag, with the option for the employee to select a different value on each expense.
+- **Report Fields:** Employees can select one department/class/location for each expense report.
+
+New departments, classes, and locations must be added in Sage Intacct. Once imported, you can turn specific tags on or off under **Settings > Workspaces > [Workspace Name] > Tags**. You can turn specific report fields on or off under **Settings > Workspaces > [Workspace Name] > Report Fields**.
+
+Please note that when importing departments as tags, expense reports may show the tag name as "Tag" instead of "Department."
+
+### Customers and Projects
+The Sage Intacct integration allows you to import customers and projects into Expensify as Tags or Report Fields.
+
+- **Tags:** Employees can select the customer or project on each individual expense.
+- **Report Fields:** Employees can select one department/class/location for each expense report.
+
+New customers and projects must be added in Sage Intacct. Once imported, you can turn specific tags on or off under **Settings > Workspaces > [Workspace Name] > Tags**. You can turn specific report fields on or off under **Settings > Workspaces > [Workspace Name] > Report Fields**.
+
+
+### Tax
+The Sage Intacct integration supports native VAT and GST tax. To enable this feature, go to **Settings > Workspaces > [Workspace Name] > Accounting**, click **Import** under Sage Intacct, and enable Tax. Enabling this option will import your native tax rates from Sage Intacct into Expensify. From there, you can select default rates for each category under **Settings > Workspaces > [Workspace Name] > Categories**.
+
+For older Sage Intacct connections that don't show the Tax option, simply resync the connection by going to **Settings > Workspaces > [Workspace Name] > Accounting** and clicking the three dots next to Sage Intacct, and the tax toggle will appear.
+
+### User-Defined Dimensions
+You can add User-Defined Dimensions (UDDs) to your workspace by locating the “Integration Name” in Sage Intacct. Please note that you must be logged in as an administrator in Sage Intacct to find the required fields.
+
+To find the Integration Name in Sage Intacct:
+
+1. Go to **Platform Services > Objects > List**
+1. Set “filter by application” to “user-defined dimensions”
+1. In Expensify, go to **Settings > Workspaces > [Workspace Name] > Accounting** and click **Import** under Sage Intacct
+1. Enable User Defined Dimensions
+1. Enter the “Integration name” and choose whether to import it into Expensify as expense-level tags or as report fields
+1. Click **Save**
+
+Once imported, you can turn specific tags on or off under **Settings > Workspaces > [Workspace Name] > Tags**. You can turn specific report fields on or off under **Settings > Workspaces > [Workspace Name] > Report Fields**.
+
+
+## Step 5: Configure export settings
+To access export settings, head to **Settings > Workspaces > [Workspace name] > Accounting** and click **Export** under Sage Intacct.
+
+### Preferred exporter
+Any workspace admin can export reports to Sage Intacct. For auto-export, Concierge will export on behalf of the preferred exporter. The preferred exporter will also be notified of any expense reports that fail to export to Sage Intacct due to an error.
+
+### Export date
+You can choose which date to use for the records created in Sage Intacct. There are three date options:
+
+1. **Date of last expense:** This will use the date of the previous expense on the report
+1. **Export date:** The date you export the report to Sage Intacct
+1. **Submitted date:** The date the employee submitted the report
+
+### Export out-of-pocket expenses as
+Out-of-pocket expenses can be exported to Sage Intacct as **expense reports** or as **vendor bills**. If you choose to export as expense reports, you can optionally select a **default vendor**, which will apply to reimbursable expenses that don't have a matching vendor in Sage Intacct.
+
+### Export company card expenses as
+Company Card expenses are exported separately from out-of-pocket expenses, and can be exported to Sage Intacct as credit card charges** or as **vendor bills**.
+
+- **Credit card charges:** When exporting as credit card charges, you must select a credit card account. You can optionally select a default vendor, which will apply to company card expenses that don't have a matching vendor in Sage Intacct.
+    - Credit card charges cannot be exported to Sage Intacct at the top-level if you have multi-currency enabled, so you will need to select an individual entity if you have this setup.
+- **Vendor bills:** When exporting as vendor bills, you can select a default vendor, which will apply to company card expenses that don't have a matching vendor in Sage Intacct.
+
+If you centrally manage your company cards through Domains in Expensify Classic, you can export expenses from each individual card to a specific account in Sage Intacct in the Expensify Company Card settings.
+
+### 6. Configure advanced settings
+To access the advanced settings of the Sage Intacct integration, head to **Settings > Workspaces > [Workspace name] > Accounting** and click **Advanced** under Sage Intacct.
+
+
+Let’s review the different advanced settings and how they interact with the integration.
+
+### Auto-sync
+We strongly recommend enabling auto-sync to ensure that the information in Sage Intacct and Expensify is always in sync. The following will occur when auto-sync is enabled:
+
+**Daily sync from Sage Intacct to Expensify:** Once a day, Expensify will sync any changes from Sage Intacct into Expensify. This includes any changes or additions to your Sage Intacct dimensions.
+
+**Auto-export:** When an expense report reaches its final state in Expensify, it will be automatically exported to Sage Intacct. The final state will either be reimbursement (if you reimburse members through Expensify) or final approval (if you reimburse members outside of Expensify).
+
+**Reimbursement-sync:** If Sync Reimbursed Reports (more details below) is enabled, then we will sync the reimbursement status of reports between Expensify and Sage Intacct.
+
+### Invite employees
+Enabling this feature will invite all employees from the connected Sage Intacct entity to your Expensify workspace. Once imported, each employee who has not already been invited to that Expensify workspace will receive an email letting them know they’ve been added to the workspace.
+
+In addition to inviting employees, this feature enables a custom set of approval workflow options, which you can manage in Expensify Classic:
+
+- **Basic Approval:** A single level of approval, where all users submit directly to a Final Approver. The Final Approver defaults to the workspace owner but can be edited on the people page.
+- **Manager Approval (default):** Each user submits to their manager, who is imported from Sage Intacct. You can optionally select a final approver who each manager forwards to for second-level approval.
+- **Configure Manually:** Employees will be imported, but all levels of approval must be manually configured in Expensify. If you enable this setting, you can configure approvals by going to **Settings > Workspaces > [Workspace Name] > People**.
+
+
+### Sync reimbursed reports
+When Sync reimbursed reports is enabled, the reimbursement status will be synced between Expensify and Sage Intacct.
+
+**If you reimburse employees through Expensify:** Reimbursing an expense report will trigger auto-export to Sage Intacct. When the expense report is exported to Sage Intacct, a corresponding bill payment will also be created in Sage Intacct in the selected Cash and Cash Equivalents account.  If you don't see the account you'd like to select in the dropdown list, please confirm that the account type is Cash and Cash Equivalents.
+
+**If you reimburse employees outside of Expensify:** Expense reports will be exported to Sage Intacct at time of final approval. After you mark the report as paid in Sage Intacct, the reimbursed status will be synced back to Expensify the next time the integration syncs.
+
+To ensure this feature works properly for expense reports, make sure that the account you choose within the settings matches the default account for Bill Payments in NetSuite. When exporting invoices, once marked as Paid, the payment is marked against the account selected after enabling the Collection Account setting.
+
+## FAQ
+
+### Will enabling auto-sync affect existing approved and reimbursed reports?
+Auto-sync will only export newly approved reports to Sage Intacct. Any reports that were approved or reimbursed before enabling auto-sync will need to be manually exported in order to sync them to Sage Intacct.
diff --git a/docs/articles/new-expensify/connections/sage-intacct/Connect-to-Sage-Intacct.md b/docs/articles/new-expensify/connections/sage-intacct/Connect-to-Sage-Intacct.md
new file mode 100644
index 000000000000..8e69a03fb666
--- /dev/null
+++ b/docs/articles/new-expensify/connections/sage-intacct/Connect-to-Sage-Intacct.md
@@ -0,0 +1,196 @@
+---
+title: Connect to Sage Intacct
+description: Integrate Sage Intacct with Expensify
+order: 1
+---
+
+# Connect to Sage Intacct
+
+Enjoy automated syncing and reduce manual entries with the Expensify and Sage Intacct integration. Gain in-depth, real-time financial insights with user-defined dimensions, as well as expense coding by department, class, location, customer, and project (job).
+
+{% include info.html %}
+The Sage Intacct integration is only available on the Control plan.
+{% include end-info.html %}
+
+## Overview
+
+Expensify’s integration with Sage Intacct allows you to connect using either role-based permissions or user-based permissions and exporting either expense reports or vendor bills.
+
+Checklist of items to complete:
+
+1. Create a web services user and configure permissions
+1. Enable the T&E module (only required if exporting out-of-pocket expenses as Expense Reports)
+1. Set up Employees in Sage Intacct (only required if exporting expenses as Expense Reports)
+1. Set up Expense Types (only required if exporting expenses as Expense Reports)
+1. Enable Customization Services
+1. Download the Expensify Package
+1. Upload the Expensify Package in Sage Intacct
+1. Add web services authorization
+1. Enter credentials and connect Expensify and Sage Intacct
+1. Configure integration sync options
+
+## Step 1a: Create a web services user (Connecting with User-based permissions)
+Note: If the steps in this section look different in your Sage Intacct instance, you likely use role-based permissions. If that’s the case, follow the steps [here].
+
+To connect to Sage Intacct, you’ll need to create a special web services user (please note that Sage Intacct does not charge extra for web services users).
+
+1. Go to **Company > Web Services Users > New**.
+2. Configure the user as outlined below:
+    - **User ID**: “xmlgateway_expensify”
+    - **Last Name and First Name:** “Expensify”
+    - **Email Address:** Your shared accounting team email
+    - **User Type:** “Business”
+    - **Admin Privileges:** “Full”
+    - **Status:** “Active”
+
+Next, configure correct permissions for the new web services user.
+
+1. Go to the subscription link for this user in the user list
+1. Click on the checkbox next to the Application/Module
+1. Click **Permissions**
+
+These are the permissions required for this integration when exporting out-of-pocket expenses as vendor bills:
+
+- **Administration (All)**
+- **Company (Read-only)**
+- **Cash Management (All)**
+- **General Ledger (All)**
+- **Time & Expense (All)** - Only required if exporting out-of-pocket expenses as expense reports
+- **Projects (Read-only)** - Only required if using Projects or Customers
+- **Accounts Payable (All)** - Only required if exporting any expenses expenses as vendor bills
+
+## Step 1b: Create a web services user (Connecting with Role-based permissions)
+Note: If the steps in this section look different in your Sage Intacct instance, you likely use role-based permissions. If that’s the case, follow the steps [here].
+
+**First, you'll need to create the new role:**
+
+1. In Sage Intacct, click **Company**, then click on the **+ button** next to Roles
+1. Name the role "Expensify", then click **Save**
+1. Go to **Roles > Subscriptions** and find the “Expensify” role you just created
+1. Configure correct permissions for this role by clicking the checkbox and then clicking on the Permissions hyperlink. These are the permissions required for this integration when exporting out-of-pocket expenses as vendor bills:
+    - **Administration (All)**
+    - **Company (Read-only)**
+    - **Cash Management (All)**
+    - **General Ledger (All)**
+    - **Time & Expense (All)** - Only required if exporting out-of-pocket expenses as expense reports
+    - **Projects (Read-only)** - Only required if using Projects or Customers
+    - **Accounts Payable (All)** - Only required if exporting any expenses expenses as vendor bills
+
+**Next, you’ll create a web services user and assign the role to that user:**
+
+1. Go to **Company > Web Services Users > New**
+2. Set up the user as described below:
+    - **User ID:** “xmlgateway_expensify”
+    - **Last name and First name:** “Expensify”
+    - **Email address:** your shared accounting team email
+    - **User type:** “Business”
+    - **Admin privileges:** “Full”
+    - **Status:** “Active”
+3. Assign the role to that user: click the **+ button**, then select the “Expensify” role and click **Save**
+
+
+## Step 2: Enable and configure the Time & Expenses Module
+**Note: This step is only required if exporting out-of-pocket expenses from Expensify to Sage Intacct as Expense Reports.**
+
+Enabling the T&E module is a paid subscription through Sage Intacct and the T&E module is often included in your Sage Intacct instance. For information on the costs of enabling this module, please contact your Sage Intacct account manager.
+
+**To enable the Time & Expenses module:**
+
+In Sage Intacct, go to **Company menu > Subscriptions > Time & Expenses** and toggle the switch to subscribe.
+
+**After enabling T&E, configure it as follows:**
+
+1. Ensure that **Expense types** is checked
+2. Under **Auto-numbering sequences** set the following:
+    - **Expense Report:** EXP
+    - **Employee:** EMP
+    - **Duplicate Numbers:** Select “Do not allow creation”
+    - To create the EXP sequence, click on the down arrow on the expense report line and select **Add:
+        1. **Sequence ID:** EXP
+        1. **Print Title:** EXPENSE REPORT
+        1. **Starting Number:** 1
+        1. **Next Number:** 2
+3. Select **Advanced Settings** and configure the following:
+    a. **Fixed Number Length:** 4
+    b. **Fixed Prefix:** EXP
+4. Click **Save**
+5. Under Expense Report approval settings, ensure that **Enable expense report approval** is unchecked
+6. Click **Save** to confirm your configuration
+
+
+## Step 3: Set up Employees in Sage Intacct
+**Note: This step is only required if exporting out-of-pocket expenses from Expensify to Sage Intacct as Expense Reports.**
+
+To set up employees in Sage Intacct:
+
+1. Navigate to Time & Expenses and click the **plus button** next to Employees.
+    - If you don’t see the Time & Expense option in the top ribbon, you may need to adjust your settings. Go to **Company > Roles > Time & Expenses** and enable all permissions.
+2. To create an employee, you’ll need to provide the following information:
+    - Employee ID
+    - Primary contact name
+    - Email address
+        1. In the "Primary contact name" field, click the dropdown arrow.
+        1. Select the employee if they’ve already been created.
+        1. Otherwise, click **+ Add** to create a new employee.
+        1. Fill in their Primary Email Address along with any other required information
+
+
+## Step 4: Set up Expense Types in Sage Intacct
+**Note: This step is only required if exporting out-of-pocket expenses from Expensify to Sage Intacct as Expense Reports.**
+
+Expense Types provide a user-friendly way to display the names of your expense accounts to your employees. To set up expense types in Sage Intacct:
+
+1. **Setup Your Chart of Accounts**
+    - Before configuring Expense Types, ensure your Chart of Accounts is set up. You can set up accounts in bulk by going to **Company > Open Setup > Company Setup Checklist** and clicking **Import**.
+2. **Set up Expense Types**
+    - Go to Time & Expense
+    - Open Setup and click the **plus button** next to Expense Types
+3. For each Expense Type, provide the following information:
+    - **Expense Type**
+    - **Description**
+    - **Account Number** (from your General Ledger)
+
+## Step 5: Enable Customization Services
+**Note:** If you already have Platform Services enabled, you can skip this step.
+
+To enable Customization Services, go to **Company > Subscriptions > Customization Services**.
+
+
+## Step 6: Download the Expensify Package
+1. In Expensify, go to Settings > Workspaces
+1. Click into the workspace where you'd like to connect to Sage Intacct
+    - If you already use Expensify, you can optionally create a test workspace by clicking **New Workspace** at the top-right of the Workspaces page. A test workspace allows you to have a sandbox environment for testing before implementing the integration live.
+1. Go to **Connections > Sage Intacct > Connect to Sage Intacct**
+1. Select **Download Package** (You only need to download the file; we’ll upload it from your Downloads folder later)
+
+## Step 7: Upload Package in Sage Intacct
+If you use Customization Services:
+
+1. Go to **Customization Services > Custom Packages > New Package**
+1. Click on **Choose File** and select the Package file from your downloads folder
+1. Click **Import**
+
+If you use Platform Services:
+
+1. Go to **Platform Services > Custom Packages > New Package**
+1. Click on **Choose File** and select the Package file from your downloads folder
+1. Click **Import**
+
+
+## Step 8: Add Web Services Authorization
+1. Go to **Company > Company Info > Security** in Sage Intacct and click **Edit**
+2. Scroll down to **Web Services Authorizations** and add “expensify” (all lower case) as a Sender ID
+
+## Step 9: Enter Credentials and Connect Expensify and Sage Intacct
+1. In Expensify, go to **Settings > Workspaces > [Workspace Name] > Accounting**
+1. Click **Set up** next to Sage Intacct
+1. Enter the credentials you set for your web services user in Step 1
+1. Click **Confirm**
+
+## FAQ
+
+### Why wasn't my report automatically exported to Sage Intacct?
+There are a number of factors that can cause auto-export to fail. If this happens, you will find the specific export error in the report comments for the report that failed to export. Once you’ve resolved any errors, you can manually export the report to Sage Intacct.
+
+### Can I export negative expenses to Sage Intacct?
+Yes, you can export negative expenses to Sage Intacct. If you are exporting out-of-pocket expenses as expense reports, then the total of each exported report cannot be negative.
diff --git a/docs/articles/new-expensify/connections/sage-intacct/Sage-Intacct-Troubleshooting.md b/docs/articles/new-expensify/connections/sage-intacct/Sage-Intacct-Troubleshooting.md
new file mode 100644
index 000000000000..ae8a0f16d9b9
--- /dev/null
+++ b/docs/articles/new-expensify/connections/sage-intacct/Sage-Intacct-Troubleshooting.md
@@ -0,0 +1,6 @@
+---
+title: Sage Intacct Troubleshooting
+description: Coming soon
+---
+
+# Coming soon
diff --git a/docs/articles/new-expensify/connections/xero/Configure-Xero.md b/docs/articles/new-expensify/connections/xero/Configure-Xero.md
new file mode 100644
index 000000000000..218e81c98707
--- /dev/null
+++ b/docs/articles/new-expensify/connections/xero/Configure-Xero.md
@@ -0,0 +1,25 @@
+---
+title: Configure Xero
+description: Coming soon
+---
+
+# FAQ
+
+## How do I know if a report successfully exported to Xero?
+
+When a report exports successfully, a message is posted in the related Expensify Chat room.
+
+![Insert alt text for accessibility here]({{site.url}}/assets/images/Xero_help_01.png){:width="100%"}
+
+## What happens if I manually export a report that has already been exported?
+
+When an admin manually exports a report, Expensify will warn them if the report has already been exported. If the admin chooses to export it again, it will create a duplicate report in Xero. You will need to delete the duplicate entries from within Xero.
+
+![Insert alt text for accessibility here]({{site.url}}/assets/images/Xero_help_05.png){:width="100%"}
+
+## What happens to existing reports that have already been approved and reimbursed if I enable Auto Sync?
+
+- If Auto Sync was disabled when your Workspace was linked to Xero, enabling it won’t impact existing reports that haven’t been exported.
+- If a report has been exported and reimbursed via ACH, it will be automatically marked as paid in Xero during the next sync.
+- If a report has been exported and marked as paid in Xero, it will be automatically marked as reimbursed in Expensify during the next sync.
+- If a report has not yet been exported to Xero, it won’t be automatically exported.
diff --git a/docs/articles/new-expensify/connections/xero/Connect-to-Xero.md b/docs/articles/new-expensify/connections/xero/Connect-to-Xero.md
new file mode 100644
index 000000000000..eb35b1589db4
--- /dev/null
+++ b/docs/articles/new-expensify/connections/xero/Connect-to-Xero.md
@@ -0,0 +1,106 @@
+---
+title: Connect to Xero
+description: Integrate Xero with Expensify
+order: 1
+---
+
+{% include info.html %}
+To use the Xero connection, you must have a Xero account and an Expensify Collect plan.
+{% include end-info.html %}
+ 
+To set up your Xero connection, complete the 4 steps below.
+
+# Step 1: Connect Expensify to Xero
+
+<ol type="a">
+   <li>Click your profile image or icon in the bottom left menu.</li>
+   <li>Scroll down and click <b>Workspaces</b> in the left menu.</li>
+   <li>Select the workspace you want to connect to Xero.</li>
+   <li>Click <b>More features</b> in the left menu.</li>
+   <li>Scroll down to the Integrate section and enable the Accounting toggle.</li>
+   <li>Click <b>Accounting</b> in the left menu.</li>
+   <li>Click <b>Set up</b> to the right of Xero.</li>
+   <li>Enter your Xero login details to import your settings from Xero to Expensify.</li>
+</ol>
+
+![The toggle location to enable accounting integrations like QuickBooks Online]({{site.url}}/assets/images/ExpensifyHelp-Xero-1.png){:width="100%"}
+
+![How to enable accounting integrations like QuickBooks Online]({{site.url}}/assets/images/ExpensifyHelp-Xero-2.png){:width="100%"}
+
+![The QuickBooks Online Connect button]({{site.url}}/assets/images/ExpensifyHelp-Xero-3.png){:width="100%"}
+
+# Step 2: Configure import settings
+
+The following steps help you determine how data will be imported from Xero to Expensify. 
+
+<ol type="a">
+   <li>Under the Accounting settings for your workspace, click <b>Import</b> under the Xero connection.</li>
+   <li>Select an option for each of the following settings to determine what information will be imported from Xero into Expensify:</li>
+       <ul>
+           <li><b>Xero organization</b>: Select which Xero organization your Expensify workspace is connected to. Each organization can only be connected to one workspace at a time.</li>
+           <li><b>Chart of Accounts</b>: Your Xero chart of accounts and any accounts marked as “Show In Expense Claims” will be automatically imported into Expensify as Categories. This cannot be amended.</li>
+           <li><b>Tracking Categories</b>: Choose whether to import your Xero categories for cost centers and regions as tags in Expensify.</li>
+           <li><b>Re-bill Customers</b>: When enabled, Xero customer contacts are imported into Expensify as tags for expense tracking. After exporting to Xero, tagged billable expenses can be included on a sales invoice to your customer.</li>
+           <li><b>Taxes</b>: Choose whether to import tax rates and tax defaults from Xero.</li>
+       </ul>  
+</ol>
+
+# Step 3: Configure export settings
+The following steps help you determine how data will be exported from Expensify to Xero.
+
+<ol type="a">
+   <li>Under the Accounting settings for your workspace, click <b>Export</b> under the Xero connection.</li>
+   <li>Review each of the following export settings:</li>
+       <ul>
+           <li><b>Preferred Exporter</b>: Choose whether to assign a Workspace Admin as the Preferred Exporter. Once selected, the Preferred Exporter automatically receives reports for export in their account to help automate the exporting process.</li>
+       </ul>  
+</ol> 
+{% include info.html %}
+- Other Workspace Admins will still be able to export to Xero. 
+- If you set different export accounts for individual company cards under your domain settings, then your Preferred Exporter must be a Domain Admin.
+{% include end-info.html %}
+
+<ol type="a">
+      <ul>
+           <li><b>Export Out-of-Pocket Expenses as</b>: All out-of-pocket expenses will be exported as purchase bills. This cannot be amended.</li>
+           <li><b>Purchase Bill Date</b>: Choose whether to use the date of last expense, export date, or submitted date.</li>
+           <li><b>Export invoices as</b>: All invoices exported to Xero will be as a sales invoice. This cannot be amended.</li>
+           <li><b>Export company card expenses as</b>: All company card expenses export to Xero as bank transactions. This cannot be amended.</li>
+           <li><b>Xero Bank Account</b>: Select which bank account will be used to post bank transactions when non-reimbursable expenses are exported.</li>
+      </ul>
+</ol>
+ 
+# Step 4: Configure advanced settings
+
+The following steps help you determine the advanced settings for your connection, like auto-sync.
+
+<ol type="a">
+   <li>Under the Accounting settings for your workspace, click <b>Advanced</b> under the Xero connection.</li>
+   <li>Select an option for each of the following settings:</li>
+      <ul>
+           <li><b>Auto-sync</b>: Choose whether to enable Xero to automatically communicate changes with Expensify to ensure that the data shared between the two systems is up-to-date. New report approvals/reimbursements will be synced during the next auto-sync period. Once you’ve added a business bank account for ACH reimbursement, any reimbursable expenses will be sent to Xero automatically when the report is reimbursed. For non-reimbursable reports, Expensify automatically queues the report to export to Xero after it has completed the approval workflow in Expensify.</li>
+           <li><b>Set Purchase Bill Status</b>: Choose the status of your purchase bills:</li>
+              <ul>
+                 <li>Draft</li>
+                 <li>Awaiting Approval</li>
+                 <li>Awaiting Payment</li>                
+              </ul>
+           <li><b>Sync Reimbursed Reports</b>: Choose whether to enable report syncing for reimbursed expenses. If enabled, all reports that are marked as Paid in Xero will also show in Expensify as Paid. If enabled, you must also select the Xero account that reimbursements are coming out of, and Expensify will automatically create the payment in Xero.</li>
+           <li><b>Xero Bill Payment Account</b>: If you enable Sync Reimbursed Reports, you must select the Xero Bill Payment account your reimbursements will come from.</li>
+           <li><b>Xero Invoice Collections Account</b>: If you are exporting invoices from Expensify, select the invoice collection account that you want invoices to appear under once they are marked as paid.</li>
+      </ul>
+</ol>
+
+{% include faq-begin.md %}
+
+**How do I disconnect Xero from Expensify?**
+
+1. Click your profile image or icon in the bottom left menu.
+2. Scroll down and click **Workspaces** in the left menu. 
+3. Select the workspace you want to disconnect from Xero. 
+4. Click **Accounting** in the left menu.
+5. Click the three dot menu icon to the right of Xero and select **Disconnect**.
+6. Click **Disconnect** to confirm. 
+
+You will no longer see the imported options from Xero.
+{% include faq-end.md %}
diff --git a/docs/articles/new-expensify/connections/xero/Xero-Troubleshooting.md b/docs/articles/new-expensify/connections/xero/Xero-Troubleshooting.md
new file mode 100644
index 000000000000..f02541f5396f
--- /dev/null
+++ b/docs/articles/new-expensify/connections/xero/Xero-Troubleshooting.md
@@ -0,0 +1,37 @@
+---
+title: Xero Troubleshooting
+description: More to Come Soon
+---
+
+## Report won’t automatically export to Xero
+
+If an error occurs during an automatic export to Xero:
+
+- You'll receive an email detailing the error. 
+- The error will appear in the related Workspace Chat, indicated by a red dot next to the report. 
+- For auto-sync errors, a message will be posted in the related #admins room. The message contains a link to the workspace's accounting settings where an explanation for the error appears next to the connection.
+
+An error on a report will prevent it from automatically exporting. 
+
+## How to resolve
+
+Open the expense and make the required changes. Then an admin must manually export the report to Xero by clicking the heading at the top of the expense and selecting Export. Then they'll select Xero. 
+
+![App screenshot: Danny's Donuts owes $200, with export option highlighted]({{site.url}}/assets/images/Xero_help_02.png){:width="100%"}
+
+![App screenshot: Export options showing Xero integration and manual entry, with the Xero integration option highlighted]({{site.url}}/assets/images/Xero_help_03.png){:width="100%"}
+
+## Unable to manually export a report
+
+To export a report, it must be in the Approved, Closed, or Reimbursed state. If it is in the Open state, clicking Export will lead to a notification that the data is not yet available for export. 
+
+![App screenshot: Export blocked due to draft or unpaid expenses]({{site.url}}/assets/images/Xero_help_04.png){:width="100%"}
+
+## How to resolve
+
+Open the report and make the required changes:
+
+- If the report is in the Open status, ensure that it is submitted.
+- If the report is in the Processing status, an admin or approver will need to approve it.
+
+Once complete, an admin must manually export the report to Xero by clicking the heading at the top of the expense and selecting Export. Then they'll select Xero. 
diff --git a/docs/articles/new-expensify/expenses-&-payments/Approve-and-pay-expenses.md b/docs/articles/new-expensify/expenses-&-payments/Approve-and-pay-expenses.md
new file mode 100644
index 000000000000..397200ce83ef
--- /dev/null
+++ b/docs/articles/new-expensify/expenses-&-payments/Approve-and-pay-expenses.md
@@ -0,0 +1,108 @@
+---
+title: Approve and Pay Expenses
+description: Approve, hold, or pay expenses submitted to you
+---
+<div id="new-expensify" markdown="1">
+
+As a workspace admin, you can set an approval workflow for the expenses submitted to you. Expenses can be,
+
+- Instantly submitted without needing approval.
+
+- Submitted at a desired frequency (daily, weekly, monthly) and follow an approval workflow. 
+
+**Setting approval workflow and submission frequencies**
+
+# Manually approve expense
+
+When someone sends an expense or a group of expenses to you for approval, you’ll receive the expense in Expensify Chat for the related workspace. Chats with new updates appear with a green dot to the right of the chat message. Concierge also sends you an email notification for the new expense.
+
+{% include info.html %}
+If an expense is sent to you by a friend, you will not need to approve the expense. Instead, you can immediately pay the expense when you are ready. 
+{% include end-info.html %}
+
+# Approve expenses
+
+To approve an expense,
+
+1. Open the Expensify Chat thread for the expense. 
+2. Click the expense or group of expenses. 
+3. Review the expense details to ensure they are correct. Look at each receipt, the amount, the description, and any additional details. 
+4. Determine the next steps.
+   - **Approve**: When you’re satisfied with the expense, click **Approve**. 
+   - **Handle holds**: If any of the expenses are on hold, you can choose to either approve only the expenses that are not on hold or approve the full amount, including any held expenses.
+   - **Request changes**: You can add a comment to the expense’s chat thread in your Expensify Chat inbox to request changes to the expense details.
+
+{% include info.html %}
+If the transaction is pending (a common occurrence with recent company card expenses or SmartScan expenses), you’ll need to wait until the transaction posts before approving it.
+{% include end-info.html %}
+
+![The approve button in an expense]({{site.url}}/assets/images/ExpensifyHelp_ApproveExpense_1.png){:width="100%"}
+
+![The approve button when you click into the expense]({{site.url}}/assets/images/ExpensifyHelp_ApproveExpense_2.png){:width="100%"}
+
+You’re now ready to pay the expense. 
+
+# Hold an expense
+
+If you need to delay a payment or if you need more information on the expense before it can be approved, you can hold the expense. 
+
+To hold an expense,
+
+1. Open the Expensify Chat thread for the expense. 
+2. Click the expense or group of expenses. 
+3. Click the three dot menu at the top right of the expense and select **Hold**. 
+4. Enter a reason for the delay. 
+5. Review the Hold Overview page and click **Got It**. 
+
+When you’re ready, you can choose to: 
+- **Remove the hold**: Complete the steps above and select **Unhold**.
+- **Approve the expense**: Complete the steps above for “Approve expenses.” 
+Once the expense has been approved, you can now pay the expense.
+
+{% include info.html %}
+Held expenses will not be available for payment until they have been approved.
+{% include end-info.html %}
+
+# Unapprove an expense
+
+Some details of approved expenses and reports cannot be edited. If you need to edit an expense that has been approved, admins and the last approver have the option to unapprove reports. 
+
+1. Click the workspace logo in the top left corner.
+2. Select the workspace associated with the expense report.
+3. Find the approved report by searching for the submitter.
+4. Click the dropdown arrow at the top of the report to view the report actions.
+5. Click **Unapprove**.
+
+The unapproved report will return to an editable state, and the submitter will receive an email and chat notification that the expense has been unapproved.
+
+{% include info.html %}
+Reports that have been paid cannot be unapproved. If the approved expense has already been exported to an accounting package, you’ll see a warning that unapproving an expense can cause data discrepancies and Expensify Card reconciliation issues. Ideally, you’ll want to delete the data that has already been exported to the accounting package before approving the expense again.
+{% include end-info.html %}
+
+# Pay expenses
+
+Once you’ve approved an expense&mdash;or if the expense does not require approval&mdash;you’ll be able to pay it.
+
+{% include info.html %}
+To pay expenses within Expensify, you’ll need to [set up your Expensify Wallet](https://help.expensify.com/articles/new-expensify/expenses-&-payments/Set-up-your-wallet).  
+{% include end-info.html %}
+
+To pay an expense,
+
+1. Open the Expensify Chat thread for the expense. 
+2. Click the expense or group of expenses. 
+3. Select a payment option.
+   - Click **Pay** to pay the full expense within Expensify. If the expenses contain one that has been held, the pay amount will only include the expenses that have not been held. Then you’ll select your payment method.
+   - Click **Pay Elsewhere** to indicate that a payment has been sent using a method outside of Expensify, such as cash or a check. This will label the expense as Paid.
+
+# FAQ
+
+**Why was an expense automatically approved?**
+
+We refer to this as **Instant Submit**. If a workspace doesn’t have Delayed Submission enabled, an expense report will automatically be submitted.
+
+**Why is an employee expense showing as ‘pending?’**
+
+An Expensify Card expense will show as pending if the merchant hasn’t posted it. This is usually the case with hotel holds, or card rental holds. A hold will normally last no more than 7-10 business days unless it’s a hotel hold, which can last 31 days. 
+
+</div>
diff --git a/docs/articles/new-expensify/expenses-&-payments/Connect-a-Business-Bank-Account.md b/docs/articles/new-expensify/expenses-&-payments/Connect-a-Business-Bank-Account.md
new file mode 100644
index 000000000000..516497c9dce7
--- /dev/null
+++ b/docs/articles/new-expensify/expenses-&-payments/Connect-a-Business-Bank-Account.md
@@ -0,0 +1,86 @@
+---
+title: Connect a Business Bank Account
+description: How to connect a business bank account to New Expensify
+---
+<div id="new-expensify" markdown="1">
+
+To connect a bank account in New Expensify, you must first enable the Make or Track Payments Workflow.
+# Step 1: Enable Make or track payments
+1. Head to **Workspaces** > **More Features** > **Enable Workflows** 
+2. From there, a Workflows setting will appear in the left-hand menu
+3. Click on **Workflows** 
+4. Enable **Make or track payments**
+
+![Insert alt text for accessibility here]({{site.url}}/assets/images/ExpensifyHelp_ConnectBankAccount_1_Light.png){:width="100%"}
+
+![Insert alt text for accessibility here]({{site.url}}/assets/images/ExpensifyHelp_ConnectBankAccount_2_Light.png){:width="100%"}
+
+# Step 2: Connect bank account
+1. Click Connect bank account
+2. Select either Connect online with Plaid (preferred) or Connect manually
+3. Enter bank details
+
+# Step 3: Upload ID 
+After entering your personal details, you’ll be prompted to click a link or scan a QR code so that you can do the following:
+1. Upload a photo of the front and back of your ID (this cannot be a photo of an existing image)
+2. Use your device to take a selfie and record a short video of yourself
+
+**Your ID must be:**
+- Issued in the US
+- Current (ie: the expiration date must be in the future)
+
+# Step 4: Enter company information
+This is where you’ll add the legal business name as well as several other company details.
+- **Company address:** The company address must be located in the US and a physical location (If you input a maildrop address, PO box, or UPS Store, the address will be flagged for review, and adding the bank account to Expensify will be delayed)
+- **Tax Identification Number:** This is the identification number that was assigned to the business by the IRS
+- **Company website:** A company website is required to use most of Expensify’s payment features.
+- **Industry Classification Code:** You can locate a list of Industry Classification Codes [here](https://www.census.gov/naics/?input=software&year=2022).
+
+# Step 5: Additional Information
+Check the appropriate box under Additional Information, accept the agreement terms, and verify that all of the information is true and accurate:
+- A Beneficial Owner refers to an individual who owns 25% or more of the business.
+- If you or another individual owns 25% or more of the business, please check the appropriate box
+- If someone else owns 25% or more of the business, you will be prompted to provide their personal information
+
+If no individual owns more than 25% of the company you do not need to list any beneficial owners. In that case, be sure to leave both boxes unchecked under the Beneficial Owner Additional Information section.
+
+The details you submitted may require additional review. If that's the case, you'll receive a message from the Concierge outlining the next steps. Otherwise, your bank account will be connected automatically.
+
+{% include faq-begin.md %}
+
+## What are the general requirements for adding a business bank account?
+
+To add a business bank account to issue reimbursements via ACH (US) or to issue Expensify Cards:
+- You must enter a physical address for yourself, any Beneficial Owner (if one exists), and the business associated with the bank account. We cannot accept a PO Box or MailDrop location.
+- If you are adding the bank account to Expensify, we are required by law to verify your identity. Part of this process requires you to verify a US-issued photo ID. Your ID must be issued by the United States to use features related to US ACH. You and any Beneficial Owner (if one exists) must also have a US address.
+
+## What is a Beneficial Owner?
+
+A Beneficial Owner refers to an **individual** who owns 25% or more of the business. If no individual owns 25% or more of the business, the company does not have a Beneficial Owner.
+
+## What do I do if the Beneficial Owner section only asks for personal details, but my organization is owned by another company?
+
+Please indicate you have a Beneficial Owner only if it is an individual who owns 25% or more of the business.
+
+## Why can’t I input my address or upload my ID? 
+
+When adding a verified business bank account in Expensify, the individual adding the account and any beneficial owner (if one exists) are required to have a US address, US photo ID, and a US SSN. If you do not meet these requirements, you’ll need to have another admin add the bank account and then share access with you once it is verified.
+
+## Why am I asked for documents when adding my bank account? 
+
+When a bank account is added to Expensify, we complete a series of checks to verify the information provided to us. We conduct these checks to comply with both our sponsor bank's requirements and federal government regulations, specifically the Bank Secrecy Act / Anti-Money Laundering (BSA / AML) laws. Expensify also has anti-fraud measures in place. 
+
+If automatic verification fails, we may request manual verification, which could involve documents such as address verification for your business, a letter from your bank confirming bank account ownership, etc.
+
+If you have any questions regarding the documentation request you received, please contact Concierge and they will be happy to assist. 
+
+## I don’t see all three microtransactions I need to validate my bank account. What should I do? 
+
+Wait until the end of the second business day. If you still don’t see them, please contact your bank and ask them to whitelist our ACH IDs **1270239450**, **4270239450**, and **2270239450**. Expensify’s ACH Originator Name is "Expensify."
+
+Once that's all set, make sure to contact your account manager or concierge, and our team will be able to re-trigger those three test transactions!
+
+
+{% include faq-end.md %}
+
+</div>
diff --git a/docs/articles/new-expensify/expenses/Create-an-expense.md b/docs/articles/new-expensify/expenses-&-payments/Create-an-expense.md
similarity index 100%
rename from docs/articles/new-expensify/expenses/Create-an-expense.md
rename to docs/articles/new-expensify/expenses-&-payments/Create-an-expense.md
diff --git a/docs/articles/new-expensify/expenses/Distance-Requests.md b/docs/articles/new-expensify/expenses-&-payments/Distance-Requests.md
similarity index 100%
rename from docs/articles/new-expensify/expenses/Distance-Requests.md
rename to docs/articles/new-expensify/expenses-&-payments/Distance-Requests.md
diff --git a/docs/articles/new-expensify/expenses-&-payments/Duplicate-detection.md b/docs/articles/new-expensify/expenses-&-payments/Duplicate-detection.md
new file mode 100644
index 000000000000..9fab52bca76a
--- /dev/null
+++ b/docs/articles/new-expensify/expenses-&-payments/Duplicate-detection.md
@@ -0,0 +1,73 @@
+---
+title: Manage duplicate expenses
+description: Identify and manage duplicate expense requests
+---
+
+<div id="new-expensify" markdown="1">
+
+Duplicate Detection helps prevent duplicate expense requests by flagging expense requests that have the same date and amount as another request in the same member's account. 
+
+When an expense has been flagged as a potential duplicate, a red dot appears in the left menu or the expense’s chat room, and it is put on “hold.”
+
+{% include info.html %}
+This feature is available exclusively for Collect & Control plans.
+{% include end-info.html %}
+
+# Review & resolve duplicates
+
+{% include selector.html values="desktop, mobile" %}
+
+{% include option.html value="desktop" %}
+1. Click the red dot in the left menu or open the expense’s chat room to open the flagged request.
+2. Click the green **Review duplicates** button at the top of the request.
+3. Review the list of potential duplicates.
+4. To resolve a duplicate, click either **Keep all** or **Keep this one**. 
+   - **Keep all**: Keeps all expenses as their separate charges and removes the hold.
+   - **Keep this one**: Keeps this expense and discards its other related duplicates.
+5. If discrepancies exist between the duplicates (e.g., category, tags), choose which details to keep.
+6. Confirm your selection to merge the requests or keep all.
+
+The expenses are removed from the duplicates list and the hold is removed.
+
+{% include end-option.html %}
+
+{% include option.html value="mobile" %}
+1. Tap the red dot in the left menu or open the expense’s chat room to open the flagged request.
+2. Tap the green **Review duplicates** button at the top of the request.
+3. Review the list of potential duplicates.
+4. To resolve a duplicate, tap either **Keep all** or **Keep this one**. 
+   - **Keep all**: Keeps all expenses as their separate charges and removes the hold.
+   - **Keep this one**: Keeps this expense and discards its other related duplicates.
+5. If discrepancies exist between the duplicates (e.g., category, tags), choose which details to keep.
+6. Confirm your selection to merge the requests or keep all.
+
+The expenses are removed from the duplicates list and the hold is removed.
+{% include end-option.html %}
+
+{% include end-selector.html %}
+
+
+
+
+{% include faq-begin.md %}
+**Can I review a discarded duplicate later?**
+
+Yes, approvers can review discarded duplicates to ensure accuracy and prevent fraud.
+
+**Can I edit a duplicate request once resolved?**
+
+Yes, you can edit the details of a duplicate request once it has been resolved, but the hold must be removed first.
+
+**If two expenses are SmartScanned on the same day for the same amount, will they be flagged as duplicates?**
+
+Yes, the expenses will be flagged as duplicates unless one of the following is true:
+- The expenses were split from a single expense
+- The expenses were imported from a credit card
+- Matching email receipts sent to receipts@expensify.com were received with different timestamps
+
+**What happens if Concierge flags a receipt as a duplicate?**
+
+If Concierge lets you know it has flagged a receipt as a duplicate, scanning the receipt again will trigger the same duplicate flagging. You can still find these in the [deleted](https://www.expensify.com/expenses?reportStatusList=Deleted) filter on Expensify Classic.
+{% include faq-end.md %}
+
+</div>
diff --git a/docs/articles/new-expensify/expenses-&-payments/Export-expenses.md b/docs/articles/new-expensify/expenses-&-payments/Export-expenses.md
new file mode 100644
index 000000000000..f06c436449eb
--- /dev/null
+++ b/docs/articles/new-expensify/expenses-&-payments/Export-expenses.md
@@ -0,0 +1,47 @@
+---
+title: Export Expenses 
+description: Export expense data to a CSV file 
+---
+<div id="new-expensify" markdown="1">
+
+Expensify allows you to export expense data to a CSV file that you can import into your favorite spreadsheet tool for deeper analysis.
+
+To export your expense data to a CSV, 
+
+ 1. Click the **[Search](https://new.expensify.com/search/all?sortBy=date&sortOrder=desc)** tab in the bottom left menu.
+ 2. Select the checkbox to the left of the expenses or reports you wish to export.
+ 3. Click **# selected** at the top-right and select **Download**.
+
+![Select the expenses to download]({{site.url}}/assets/images/Export-Expenses.png){:width="100%"}
+
+The CSV download will save locally to your device with the file naming prefix _“Expensify.”_ This file provides the following data for each expense: 
+ - Date	
+ - Merchant
+ - Description
+ - From
+ - To
+ - Category
+ - Tag
+ - Tax
+ - Amount
+ - Currency
+ - Type (i.e. cash, card, distance)
+ - Receipt URL
+
+{% include faq-begin.md %}
+
+**Can I export in a different format, like PDF or XLS?**
+
+No, currently Expensify supports CSV export only.  
+
+**Can I add columns to the CSV download to capture additional data points?**
+
+No, the CSV template cannot be customized. 
+
+**Can I select expenses or reports in bulk?**
+
+Yes, you can select expenses or reports in bulk by selecting the **Select multiple** or **Select all** option. To display these options on the mobile app, simply long press an item. 
+
+{% include faq-end.md %}
+
+</div>
diff --git a/docs/articles/new-expensify/expenses-&-payments/Resolve-Errors-Adding-a-Bank-Account.md b/docs/articles/new-expensify/expenses-&-payments/Resolve-Errors-Adding-a-Bank-Account.md
new file mode 100644
index 000000000000..ace488f589a1
--- /dev/null
+++ b/docs/articles/new-expensify/expenses-&-payments/Resolve-Errors-Adding-a-Bank-Account.md
@@ -0,0 +1,21 @@
+---
+title: Resolve Errors Adding a Bank Account
+description: Troubleshooting issues adding a business bank account in Expensify.
+---
+<div id="new-expensify" markdown="1">
+
+Expensify is required to verify the identity of the individual who is connecting a business bank account.
+
+**If you get a generic error message while uploading your ID, please go through the following steps:**
+1. Ensure you are using either Safari (on iPhone) or Chrome (on Android) as your web browser.
+2. Check your browser's permissions to make sure that the camera and microphone settings are set to "Allow"
+3. Clear your web cache for Safari (on iPhone) or Chrome (on Android).
+4. If using a corporate Wi-Fi network, confirm that your corporate firewall isn't blocking the website.
+5. Make sure no other apps are overlapping your screen, such as the Facebook Messenger bubble, while recording the video. 
+6. On iPhone, if using iOS version 15 or later, disable the Hide IP address feature in Safari.
+7. If possible, try these steps on another device
+8. If you have another phone available, try to follow these steps on that device
+
+If the issue persists, please contact your Account Manager or Concierge for further troubleshooting assistance.
+
+</div>
diff --git a/docs/articles/new-expensify/expenses-&-payments/Send-an-invoice.md b/docs/articles/new-expensify/expenses-&-payments/Send-an-invoice.md
new file mode 100644
index 000000000000..17da76b7126c
--- /dev/null
+++ b/docs/articles/new-expensify/expenses-&-payments/Send-an-invoice.md
@@ -0,0 +1,94 @@
+---
+title: Send an invoice and receive payment 
+description: steps to send an invoice to someone and receipt payment
+---
+<div id="new-expensify" markdown="1">
+
+Workspace admins can enable invoicing on a workspace to send invoices and receive invoice payments through Expensify.
+
+# Enable invoicing
+
+{% include selector.html values="desktop, mobile" %}
+
+{% include option.html value="desktop" %}
+1. Click your profile image or icon in the bottom left menu.
+2. Scroll down and click **Workspaces** in the left menu.
+3. Select the workspace for which you want to enable invoicing.
+4. Click **More features** in the left menu. 
+5. Under the Earn section, enable the Invoice toggle
+
+{% include end-option.html %}
+
+{% include option.html value="mobile" %}
+1. Tap your profile image or icon in the bottom menu.
+2. Tap **Workspaces**.
+3. Select the workspace for which you want to enable invoicing.
+4. Tap **More features**. 
+5. Under the Earn section, enable the Invoice toggle.
+
+{% include end-option.html %}
+
+{% include end-selector.html %}
+
+# Send an invoice
+
+{% include info.html %}
+Only workspace admins can send invoices. Invoices can be sent directly from Expensify to any customer, even if they do not have an Expensify account.
+{% include end-info.html %}
+
+{% include selector.html values="desktop, mobile" %}
+
+{% include option.html value="desktop" %}
+1. Click the + icon in the bottom left menu and select **Send Invoice**.
+2. Enter the amount due and click **Next**.
+3. Enter the email or phone number of the person who should receive the invoice.
+4. (Optional) Add additional invoice details, including a description, date, category, tag, and/or tax. 
+5. Click **Send**.
+{% include end-option.html %}
+
+
+{% include option.html value="mobile" %}
+1. Tap the + icon in the bottom left menu and select **Send Invoice**.
+2. Enter the amount due and tap **Next**.
+3. Enter the email or phone number of the person who should receive the invoice.
+4. (Optional) Add additional invoice details, including a description, date, category, tag, and/or tax. 
+5. Tap **Send**.
+{% include end-option.html %}
+
+{% include end-selector.html %}
+
+# Receive invoice payment 
+
+If you have not [connected a business bank account](https://help.expensify.com/articles/new-expensify/expenses-&-payments/Connect-a-Business-Bank-Account) to receive invoice payments, you will see an **Invoice balance** in your [Wallet](https://help.expensify.com/articles/new-expensify/expenses-&-payments/Set-up-your-wallet). Expensify will automatically transfer these invoice payments once a business bank account is connected.
+
+ 
+# FAQs
+
+**Why do I need to create a workspace to send an invoice?**
+
+A workspace is a configuration of settings related to your business. Since invoicing is considered a business feature, you must have a workspace to configure and use invoicing.
+
+**How do I communicate with the sender/recipient about the invoice?**
+
+Expensify will automatically notify the invoice recipient about the new invoice via email, SMS, and a mobile app notification, along with instructions on how to pay it. Daily reminders will be sent until the invoice is paid. 
+
+Additionally, an invoice chat room will be automatically created in Expensify between the invoice sender, their workspace admins, and the payer. You can use this chat to discuss anything related to the invoice. 
+
+**Can you export invoices between an accounting integration?**
+
+Yes, you can export invoices between Expensify and your connected [accounting integration](https://help.expensify.com/new-expensify/hubs/connections/). 
+
+**Who can send and pay an invoice?**
+
+All workspace admins will be able to send and pay invoices. Invoices can also be paid by anyone, including recipients without an Expensify account.  
+
+**What happens if I disable invoicing in the future?**
+
+When invoicing is disabled, all previously created invoice rooms and historical invoices will remain unaffected and continue to exist. However, all workspace admins will no longer have the option to send an invoice. 
+
+**Why am I getting an error after I enter my website when connecting a business bank account?**
+
+We can only accept a private domain website to ensure the security of your business. If you receive an error when entering your website, it is likely because the domain is not recognized as private. Make sure you are using a business email with a private domain. If you continue to experience issues, contact our support team at concierge@expensify.com for further assistance.
+
+
+</div>
diff --git a/docs/articles/new-expensify/expenses-&-payments/Set-up-your-wallet.md b/docs/articles/new-expensify/expenses-&-payments/Set-up-your-wallet.md
new file mode 100644
index 000000000000..7f7b6196707d
--- /dev/null
+++ b/docs/articles/new-expensify/expenses-&-payments/Set-up-your-wallet.md
@@ -0,0 +1,54 @@
+---
+title: Set up your wallet
+description: Send and receive payments by adding your payment account
+---
+<div id="new-expensify" markdown="1">
+To send and receive money using Expensify, you’ll first need to set up your Expensify Wallet by adding your payment account. 
+
+![The Wallet Tab where you can add a personal bank account]({{site.url}}/assets/images/ExpensifyHelp_R5_Wallet_1.png){:width="100%"}
+
+{% include selector.html values="desktop, mobile" %}
+
+{% include option.html value="desktop" %}
+1. Click your profile image or icon in the bottom left menu.
+2. Click **Wallet** in the left menu. 
+3. Click **Enable wallet**.
+4. If you haven’t already added your bank account, click **Continue** and follow the prompts to add your bank account details with Plaid. If you have already connected your bank account, you’ll skip to the next step.
+
+{% include info.html %}
+Plaid is an encrypted third-party financial data platform that Expensify uses to securely verify your banking information.
+{% include end-info.html %}
+
+{:start="5"}
+5. Enter your personal details (including your name, address, date of birth, phone number, and the last 4 digits of your social security number). 
+6. Click **Save & continue**.
+7. Review the Onfido terms and click **Accept**.
+8. Use the prompts to continue the next steps on your mobile device where you will select which option you want to use to verify your device: a QR code, a link, or a text message.
+9. Follow the prompts on your mobile device to submit your ID with Onfido.
+
+When your ID is uploaded successfully, Onfido closes automatically. You can return to your Expensify Wallet to verify that it is now enabled. Once enabled, you are ready to send and receive payments. 
+{% include end-option.html %}
+
+{% include option.html value="mobile" %}
+1. Tap your profile image or icon in the bottom menu.
+2. Tap **Wallet**. 
+3. Tap **Enable wallet**.
+4. If you haven’t already added your bank account, tap **Continue** and follow the prompts to add your bank account details with Plaid. If you have already connected your bank account, you’ll skip to the next step.
+
+{% include info.html %}
+Plaid is an encrypted third-party financial data platform that Expensify uses to securely verify your banking information.
+{% include end-info.html %}
+
+{:start="5"}
+5. Enter your personal details (including your name, address, date of birth, phone number, and the last 4 digits of your social security number). 
+6. Tap **Save & continue**.
+7. Review the Onfido terms and tap **Accept**.
+8. Follow the prompts to submit your ID with Onfido. When your ID is uploaded successfully, Onfido closes automatically. 
+9. Tap **Enable wallet** again to enable payments for the wallet.
+
+Once enabled, you are ready to send and receive payments. 
+{% include end-option.html %}
+
+{% include end-selector.html %}
+
+</div>
diff --git a/docs/articles/new-expensify/expenses/Split-an-expense.md b/docs/articles/new-expensify/expenses-&-payments/Split-an-expense.md
similarity index 100%
rename from docs/articles/new-expensify/expenses/Split-an-expense.md
rename to docs/articles/new-expensify/expenses-&-payments/Split-an-expense.md
diff --git a/docs/articles/new-expensify/expenses-&-payments/Track-expenses.md b/docs/articles/new-expensify/expenses-&-payments/Track-expenses.md
new file mode 100644
index 000000000000..f4eeea09ecec
--- /dev/null
+++ b/docs/articles/new-expensify/expenses-&-payments/Track-expenses.md
@@ -0,0 +1,43 @@
+---
+title: Track Expenses
+description: Create, store, or share non-reimbursable expenses
+---
+<div id="new-expensify" markdown="1">
+
+Create, store, or share non-reimbursable expenses with the Track Expenses feature.
+
+{% include selector.html values="desktop, mobile" %}
+
+{% include option.html value="desktop" %}
+1. Click the + icon in the bottom left menu and select **Track Expense**.
+2. Create the expense manually, scan the receipt, or add a distance expense. 
+
+{% include info.html %}
+For an in-depth walkthrough on how to create an expense, check out the <a href="[url](https://help.expensify.com/articles/new-expensify/expenses/Create-an-expense)">create an expense</a> article.
+{% include end-info.html %}
+
+3. Choose the next steps for the expense:
+   - **Submit it to someone**: Select this option to request payment from other members of your Expensify workspace. 
+   - **Categorize it**: Select this option to choose a category and additional details to code the expense for a specific workspace. The expense will then be placed on a report and can be submitted to the workspace for approval. 
+   - **Share it with my accountant**: Select this option to share the expense with your accountant. The expense will then be placed on a report under the workspace for your accountant to review.
+   - **Nothing for now**: Select this option to store the expense. Expensify will keep the expense until you are ready to take action on it—it won’t expire. When you’re ready, you can then select one of the above options for the expense at a later time.
+{% include end-option.html %}
+
+{% include option.html value="mobile" %}
+1. Tap the + icon in the bottom menu and select **Track Expense**.
+2. Create the expense manually, scan the receipt, or add a distance expense. 
+
+{% include info.html %}
+For an in-depth walkthrough on how to create an expense, check out the <a href="[url](https://help.expensify.com/articles/new-expensify/expenses/Create-an-expense)">create an expense</a> article.
+{% include end-info.html %}
+
+3. Choose the next steps for the expense:
+   - **Submit it to someone**: Select this option to request payment from a contact in your phone’s contact list or from other members of your Expensify workspace.  
+   - **Categorize it**: Select this option to choose a category and additional details to code the expense for a specific workspace. The expense will then be placed on a report and can be submitted to the workspace for approval. 
+   - **Share it with my accountant**: Select this option to share the expense with your accountant. The expense will then be placed on a report under the workspace for your accountant to review.
+   - **Nothing for now**: Select this option to store the expense. Expensify will keep the expense until you are ready to take action on it—it won’t expire. When you’re ready, you can then select one of the above options for the expense at a later time.
+{% include end-option.html %}
+
+{% include end-selector.html %}
+
+</div>
diff --git a/docs/articles/new-expensify/expenses-&-payments/Unlock-a-Business-Bank-Account.md b/docs/articles/new-expensify/expenses-&-payments/Unlock-a-Business-Bank-Account.md
new file mode 100644
index 000000000000..41ba96a2e2d0
--- /dev/null
+++ b/docs/articles/new-expensify/expenses-&-payments/Unlock-a-Business-Bank-Account.md
@@ -0,0 +1,29 @@
+---
+title: Unlock a Business Bank Account
+description: How to fix a locked Bank Account
+---
+<div id="new-expensify" markdown="1">
+
+When you reimburse a report, you authorize Expensify to withdraw the funds from your account. If your bank rejects Expensify’s withdrawal request, your verified bank account is locked until the issue is resolved.
+
+Withdrawal requests can be rejected due to insufficient funds, or if the bank account has not been enabled for direct debit.
+
+## To request to unlock a bank account:
+1. Go to **Settings > Workspaces > _Workspace Name_ > Bank account** and click **Fix**
+2. This sends a request to our support team to review why the bank account was locked, who will send you a message outlining some next steps
+
+Unlocking a bank account can take several business days to process due to ACH processing times and clawback periods.
+
+**If you need to enable direct debits from your verified bank account, your bank will require the following details:**
+- The ACH CompanyIDs (1270239450, 4270239450 and 2270239450) 
+- The ACH Originator Name (Expensify)
+
+**If using Expensify to process Bill payments, you'll also need to whitelist the ACH IDs from our partner [Stripe](https://support.stripe.com/questions/ach-direct-debit-company-ids-for-stripe?):**
+- The ACH CompanyIDs (1800948598 and 4270465600)
+- The ACH Originator Name (expensify.com)
+
+**If using Expensify to process international reimbursements from your USD bank account, you'll need to whitelist the ACH IDs from our payment partner CorPay:**
+- The ACH CompanyIDs (1522304924 and 2522304924)
+- The ACH Originator Name (Cambridge Global Payments)
+
+</div>
diff --git a/docs/articles/new-expensify/expenses-&-payments/Validate-a-Business-Bank-Account.md b/docs/articles/new-expensify/expenses-&-payments/Validate-a-Business-Bank-Account.md
new file mode 100644
index 000000000000..0767a4c69c3e
--- /dev/null
+++ b/docs/articles/new-expensify/expenses-&-payments/Validate-a-Business-Bank-Account.md
@@ -0,0 +1,36 @@
+---
+title: Validate a Business Bank Account
+description: Finish connecting your bank account by entering test deposits
+---
+<div id="new-expensify" markdown="1">
+
+Once your business bank account connection is approved in Expensify, you'll receive a few test deposits to validate the connection. 
+
+## Validating the bank account:
+1. Head to **Settings > Workspaces > _Workspace Name_ > Bank account** to review the status of the bank account
+2. It will show as either **Verifying** or **Pending**
+     - If it is **Verifying**, this means we sent you a message asking for more information —- check your email for the next steps! 
+     - If it is **Pending**, the bank account is connected and you can move to the next step
+3. In 1-2 business days Expensify will send three test transactions to your bank account
+4. Head to the **Bank accounts** section of your workspace settings
+5. You'll see a prompt to input the transaction amounts
+
+Once you've finished these steps, your business bank account is ready to use in Expensify!
+
+{% include faq-begin.md %}
+
+## How many test deposits will I receive?
+
+You'll see two withdrawals and one deposit in the business bank account. 
+
+## What should I do if I don't see the test deposits after two business days? 
+
+If you do not see these test transactions after two business days, this could be due to direct debits not being enabled on the bank account. In that case, your bank will require the following details:
+- The ACH CompanyIDs (1270239450, 4270239450 and 2270239450) 
+- The ACH Originator Name (Expensify)
+
+Otherwise, feel free to contact Expensify Support so our team can provide you with more information. 
+
+{% include faq-end.md %}
+
+</div>
diff --git a/docs/articles/new-expensify/expenses-&-payments/pay-an-invoice.md b/docs/articles/new-expensify/expenses-&-payments/pay-an-invoice.md
new file mode 100644
index 000000000000..45b62c5d7892
--- /dev/null
+++ b/docs/articles/new-expensify/expenses-&-payments/pay-an-invoice.md
@@ -0,0 +1,58 @@
+---
+title: Pay an Invoice
+description: process to pay an invoice
+---
+<div id="new-expensify" markdown="1">
+
+{% include info.html %}
+Anyone who receives an Expensify invoice can pay it using Expensify—even if they don’t have an Expensify account.
+{% include end-info.html %}
+
+You'll receive an automated email or text notification when an invoice is sent to you for payment. 
+
+To pay an invoice, 
+
+{% include selector.html values="desktop, mobile" %}
+
+{% include option.html value="desktop" %}
+1. Click the link in the email or text notification you receive from Expensify.
+2. Click **Pay**.
+3. Choose **Pay as an individual** or **Pay as a business**.
+4. Click **Add Bank Account** or **Add debit or credit card** to issue payment. 
+{% include end-option.html %}
+
+You can also view all unpaid invoices by searching for the sender’s email or phone number on the left-hand side of the app. The invoices waiting for your payment will have a green dot. 
+
+{% include option.html value="mobile" %}
+1. Tap the link in the email or text notification they receive from Expensify.
+2. Tap **Pay**.
+3. Choose **Pay as an individual** or **Pay as a business**.
+4. Tap **Add Bank Account** or **Add debit or credit card** to issue payment.
+{% include end-option.html %}
+
+{% include end-selector.html %}
+
+# FAQ
+
+**Can someone else pay an invoice besides the person who received it?**
+
+No, only the person who received the invoice will see the option to pay it. 
+
+**Who can send an invoice?**
+
+Anyone can pay an invoice they’ve received, but only Expensify customers can send an invoice. This feature ensures that businesses using Expensify can seamlessly manage their invoice billing processes while providing flexibility for their customers to make payments.
+
+Expensify invoicing is designed to cater to both business-to-customer (B2C) and business-to-business (B2B) needs, making it a versatile tool for businesses of all sizes.
+
+**Can I pay an invoice outside of Expensify**
+
+You will need to work with the vendor to discuss alternative payment options. You can chat with your vendor directly at expensify.com in the designated invoice room. 
+
+**Can I add additional payment methods?**
+
+You can add additional payment methods to your [Wallet](https://help.expensify.com/articles/new-expensify/expenses-&-payments/Set-up-your-wallet). Click **Account Settings** > **Wallet** > click **Add Bank Account**.
+
+You will be prompted to choose a payment method when paying future invoices. 
+
+
+</div>
diff --git a/docs/articles/new-expensify/expenses/Send-an-invoice.md b/docs/articles/new-expensify/expenses/Send-an-invoice.md
deleted file mode 100644
index 588f0da20154..000000000000
--- a/docs/articles/new-expensify/expenses/Send-an-invoice.md
+++ /dev/null
@@ -1,52 +0,0 @@
----
-title: Send an invoice
-description: Notify a customer that a payment is due
----
-<div id="new-expensify" markdown="1">
-
-You can send invoices directly from Expensify to notify customers that a payment is due. 
-
-To create and send an invoice, 
-
-{% include selector.html values="desktop, mobile" %}
-
-{% include option.html value="desktop" %}
-1. Click the + icon in the bottom left menu and select **Send Invoice**.
-2. Enter the amount due and click **Next**.
-3. Enter the email or phone number of the person who should receive the invoice.
-4. (Optional) Add additional invoice details, including a description, date, category, tag, and/or tax. 
-5. Click **Send**.
-{% include end-option.html %}
-
-{% include option.html value="mobile" %}
-1. Tap the + icon in the bottom left menu and select **Send Invoice**.
-2. Enter the amount due and tap **Next**.
-3. Enter the email or phone number of the person who should receive the invoice.
-4. (Optional) Add additional invoice details, including a description, date, category, tag, and/or tax. 
-5. Tap **Send**.
-{% include end-option.html %}
-
-{% include end-selector.html %}
-
-# How the customer pays an invoice
-
-Once an invoice is sent, the customer receives an automated email or text message to notify them of the invoice. They can use this notification to pay the invoice whenever they are ready. They will: 
-
-1. Click the link in the email or text notification they receive from Expensify. 
-2. Click **Pay**.
-3. Choose **Paying as an individual** or **Paying as a business**.
-4. Click **Pay Elsewhere**, which will mark the invoice as Paid. 
-
-Currently, invoices must be paid outside of Expensify. However, the ability to make payments through Expensify is coming soon. 
- 
-# FAQs
-
-**How do I communicate with the sender/recipient about the invoice?**
-
-You can communicate with the recipient in New Expensify. After sending an invoice, Expensify automatically creates an invoice room between the invoice sender and the payer to discuss anything related to the invoice. You can invite users to join the conversation, remove them from the room, and leave the room at any time. 
-
-**Can you import and export invoices between an accounting integration?**
-
-Yes, you can export and import invoices between Expensify and your QuickBooks Online or Xero integration. 
-
-</div>
diff --git a/docs/articles/new-expensify/expensify-card/Add-Expensify-Card-to-Apple-or-Google-Pay.md b/docs/articles/new-expensify/expensify-card/Add-Expensify-Card-to-Apple-or-Google-Pay.md
new file mode 100644
index 000000000000..844a688e0011
--- /dev/null
+++ b/docs/articles/new-expensify/expensify-card/Add-Expensify-Card-to-Apple-or-Google-Pay.md
@@ -0,0 +1,32 @@
+---
+title: Add Expensify Card to Apple or Google Pay
+description: Pay with your Expensify Card from your Apple or Google Pay wallet
+---
+<div id="new-expensify" markdown="1">
+
+You can use your Expensify Card for contactless in-person payments by adding it to your digital wallet for Apple Pay (for iOS) or Google Pay (for Android).
+
+{% include selector.html values="mobile" %}
+
+{% include option.html value="mobile" %}
+**Apple Pay**
+
+1. Open the Apple Pay app.
+2. Tap the + button.
+3. Tap **Debit or Credit Card**.
+4. Tap **Continue**.
+5. Follow the steps provided to add your virtual card.
+
+**Google Pay**
+
+1. Open the Google Pay app.
+2. Tap **Add to Wallet**.
+3. Tap **Payment Card**.
+4. Tap **Add new debit or credit card**.
+5. Add your virtual card details.
+
+{% include end-option.html %}
+
+{% include end-selector.html %}
+
+</div>
diff --git a/docs/articles/new-expensify/expensify-card/Check-Expensify-Card-limit.md b/docs/articles/new-expensify/expensify-card/Check-Expensify-Card-limit.md
new file mode 100644
index 000000000000..803211c873ec
--- /dev/null
+++ b/docs/articles/new-expensify/expensify-card/Check-Expensify-Card-limit.md
@@ -0,0 +1,27 @@
+---
+title: Check Expensify Card limit
+description: View the available limit for your Expensify Card
+---
+<div id="new-expensify" markdown="1">
+
+Your Expensify Visa® Commercial Card has a Smart Limit that is automatically updated after you make a purchase with your physical or virtual card. Your base limit is assigned by your admin.
+
+To check your Smart Limit,
+
+{% include selector.html values="desktop, mobile" %}
+
+{% include option.html value="desktop" %}
+1. Click your profile image or icon in the bottom left menu.
+2. Click **Wallet** in the left menu.
+3. Click your Expensify Card to see the available Smart Limit.
+{% include end-option.html %}
+
+{% include option.html value="mobile" %}
+1. Tap your profile image or icon in the bottom menu.
+2. Tap **Wallet**.
+3. Tap your Expensify Card to see the available Smart Limit. 
+{% include end-option.html %}
+
+{% include end-selector.html %}
+
+</div>
diff --git a/docs/articles/new-expensify/expensify-card/Coming-Soon.md b/docs/articles/new-expensify/expensify-card/Coming-Soon.md
deleted file mode 100644
index 6b85bb0364b5..000000000000
--- a/docs/articles/new-expensify/expensify-card/Coming-Soon.md
+++ /dev/null
@@ -1,4 +0,0 @@
----
-title: Coming Soon
-description: Coming Soon
----
diff --git a/docs/articles/new-expensify/expensify-card/Dispute-Expensify-Card-transaction.md b/docs/articles/new-expensify/expensify-card/Dispute-Expensify-Card-transaction.md
new file mode 100644
index 000000000000..5bd23cd53730
--- /dev/null
+++ b/docs/articles/new-expensify/expensify-card/Dispute-Expensify-Card-transaction.md
@@ -0,0 +1,73 @@
+---
+title: Dispute Expensify Card transaction
+description: Dispute an unrecognized, unauthorized, or fraudulent charge
+---
+<div id="new-expensify" markdown="1">
+
+When using your Expensify Visa® Commercial Card, you may come across transactions that you want to dispute, including:
+
+- Unrecognized, unauthorized, or fraudulent charges
+   - Charges made with your card after it was lost or stolen
+   - Unauthorized charges while your card is still in your possession
+   - Continued charges for a canceled recurring subscription
+- Service disputes
+   - Damaged or defective merchandise
+   - Charges for merchandise that was never received
+   - Duplicate charges for a single transaction
+   - Transactions of an incorrect amount
+   - Refund not received after a return
+
+# Dispute a transaction
+
+If you spot a transaction error on your Expensify Card, 
+
+1. Contact the merchant. They can often address the issue promptly.
+2. If you are unable to resolve the issue with the merchant, contact us immediately by opening your chat with Expensify Concierge in your Expensify Chat inbox, or by emailing concierge@expensify.com to start the dispute process. Provide the following information:
+   - Details about the disputed charge, including why you’re disputing it, what occurred, and any steps you’ve taken to address the issue
+   - Supporting documentation like receipts or cancellation confirmations
+3. If you suspect fraud on your Expensify Card, immediately deactivate your card:
+
+{% include selector.html values="desktop, mobile" %}
+
+{% include option.html value="desktop" %}
+<ol type="a">
+   <li>Click your profile image or icon in the bottom left menu.</li>
+   <li>Click <b>Wallet</b> in the left menu.</li>
+   <li>Click your Expensify Card.</li>
+   <li>Click <b>Report card fraud</b>.</li>
+   <li>Follow the prompts to deactivate your card and request a new one.</li>
+</ol>
+{% include end-option.html %}
+
+{% include option.html value="mobile" %}
+<ol type="a">
+   <li>Tap your profile image or icon in the bottom menu.</li>
+   <li>Tap <b>Wallet</b>.</li>
+   <li>Tap your Expensify Card.</li>
+   <li>Tap <b>Report card fraud</b>.</li>
+   <li>Follow the prompts to deactivate your card and request a new one.</li>
+</ol>
+{% include end-option.html %}
+
+{% include end-selector.html %}
+
+{:start="4"}
+4. [Enable Two-Factor Authentication (2FA)](https://help.expensify.com/articles/new-expensify/settings/Enable-Two-Factor-Authentication) to add an additional layer of security to your account.
+
+{% include faq-begin.md %}
+
+**How am I protected from fraud using the Expensify Card?**
+
+Expensify leverages sophisticated algorithms to detect and/or block unusual card activity. You can also enable real-time notifications to receive alerts each time your card is charged.
+
+**How long does the dispute process take?**
+
+The dispute process can take up to 90 days.
+
+**Can I cancel a dispute?**
+
+You can cancel a filed dispute by using your Expensify Chat thread with Concierge or by emailing concierge@expensify.com. 
+
+{% include faq-end.md %}
+
+</div>
diff --git a/docs/articles/new-expensify/expensify-card/Enable-Expensify-Card-notifications.md b/docs/articles/new-expensify/expensify-card/Enable-Expensify-Card-notifications.md
new file mode 100644
index 000000000000..4bb56b1cc54c
--- /dev/null
+++ b/docs/articles/new-expensify/expensify-card/Enable-Expensify-Card-notifications.md
@@ -0,0 +1,57 @@
+---
+title: Enable Expensify Card notifications
+description: Allow notifications from Expensify
+---
+<div id="new-expensify" markdown="1">
+
+The Expensify mobile app sends you real-time notifications for spending activity on your Expensify Visa® Commercial Card, including
+- Purchase notifications, including declined payments
+- Fraudulent activity alerts
+- Requests for purchases that require a SmartScanned receipt 
+
+There are two steps to enable Expensify Card notifications. You’ll first enable alerts on your workspace, then you’ll enable notifications on your device.
+
+# Step 1: Enable alerts on your workspace
+
+{% include selector.html values="desktop, mobile" %}
+
+{% include option.html value="desktop" %}
+1. From your Expensify Chat inbox, click the dropdown on the logo or avatar that is in the top left corner. 
+2. Select the workspace you want to update the notification settings for.
+3. Click the workspace chat in your inbox (it will be the chat that has your workspace’s name as the chat title).
+4. Click the header at the top of the chat.
+5. Click **Settings**.
+6. Click **Notify me about new messages** and select **Immediately**.
+{% include end-option.html %}
+
+{% include option.html value="mobile" %}
+1. From your Expensify Chat inbox, tap the dropdown on the logo or avatar that is in the top left corner. 
+2. Select the workspace you want to update the notification settings for.
+3. Tap the workspace chat in your inbox (it will be the chat that has your workspace’s name as the chat title).
+4. Tap the header at the top of the chat.
+5. Tap **Settings**.
+6. Tap **Notify me about new messages** and select **Immediately**.
+{% include end-option.html %}
+
+{% include end-selector.html %}
+
+# Step 2: Enable notifications on your device
+
+**iPhone**
+
+1. Go to your device settings.
+2. Find and tap **New Expensify**.
+3. Tap **Notifications** and enable notifications.
+4. Customize your alerts. Depending on your phone model, you may have extra options to customize the types of notifications you receive.
+
+**Android**
+
+1. Go to your device settings.
+2. Tap **Notifications** and select **Apps notifications**.
+3. Find and tap **New Expensify**. 
+4. Enable notifications.
+5. Customize your alerts. Depending on your phone model, you may have extra options to customize the types of notifications you receive.
+
+You will now receive real-time spend notifications to your mobile device.
+
+</div>
diff --git a/docs/articles/new-expensify/expensify-card/Manage-Expensify-Cards.md b/docs/articles/new-expensify/expensify-card/Manage-Expensify-Cards.md
new file mode 100644
index 000000000000..d7a1b75e128d
--- /dev/null
+++ b/docs/articles/new-expensify/expensify-card/Manage-Expensify-Cards.md
@@ -0,0 +1,22 @@
+---
+title: Manage Expensify Cards
+description: How to manage the Expensify Card
+---
+<div id="new-expensify" markdown="1">
+
+Once your Expensify Cards have been issued, you can monitor them and check your card’s current balance, remaining limit, and earned cash back.
+
+1. Click your profile image or icon in the bottom left menu.
+2. Scroll down and click **Workspaces** in the left menu.
+3. Select the workspace that contains the desired Expensify Cards.
+4. Click **Expensify Card** in the left menu. Here, you’ll see a list of all of the issued cards.
+5. To view a card’s details or adjust the card limit, limit type, name, or deactivate it, click the card row.
+6. To adjust the settlement account that resolves the card’s expenses or to change the settlement frequency, click **Settings** in the top right.
+
+![Click Expensify Card in the left menu to see a list of cards]({{site.url}}/assets/images/ExpensifyHelp-WorkspaceFeeds_05.png){:width="100%"}
+
+![Click the card row to view the card details and make settings adjustments]({{site.url}}/assets/images/ExpensifyHelp-WorkspaceFeeds_06.png){:width="100%"}
+
+![Click Settings to adjust the settlement account or frequency]({{site.url}}/assets/images/ExpensifyHelp-WorkspaceFeeds_07.png){:width="100%"}
+
+</div>
diff --git a/docs/articles/new-expensify/expensify-card/Set-up-the-Expensify-Card.md b/docs/articles/new-expensify/expensify-card/Set-up-the-Expensify-Card.md
new file mode 100644
index 000000000000..ad4982cee4b3
--- /dev/null
+++ b/docs/articles/new-expensify/expensify-card/Set-up-the-Expensify-Card.md
@@ -0,0 +1,74 @@
+---
+title: Set up the Expensify Card
+description: How to set up the Expensify Card on your workspace
+---
+<div id="new-expensify" markdown="1">
+
+{% include info.html %}
+You must be a Workspace Admin to complete this process.
+{% include end-info.html %}
+
+The Expensify Visa® Commercial Card is available on all USD workspaces. It provides tools to manage employee spending, including:
+
+- Unlimited virtual cards
+- Controlled spending amounts on virtual cards to manage subscriptions
+- Tighter controls for managing spend across employees and merchants
+- Fixed or monthly spend limits for each card
+- Unique naming for each virtual card for simplified expense categorization
+
+To enable and issue Expensify Cards for your workspace, complete the steps below.
+
+# Step 1: Enable Expensify Cards
+
+1. Click your profile image or icon in the bottom left menu.
+2. Scroll down and click **Workspaces** in the left menu.
+3. Select the workspace you want to enable Expensify Cards for.
+4. Click **More features** in the left menu.
+5. Under the **Spend** section, enable the Expensify Card toggle.
+
+![Click the toggle next to Expensify Card]({{site.url}}/assets/images/ExpensifyHelp-WorkspaceFeeds_01.png){:width="100%"}
+
+# Step 2: Select a bank account
+
+Before you can issue your Expensify Cards, you must connect your cards with the bank account that will be used to pay balances on the cards.
+
+1. Click **Expensify Card** in the left menu.
+2. Click **Issue new card**.
+3. Select an existing bank account from the list, or follow the steps to add a new one.
+
+![Click the issue card button]({{site.url}}/assets/images/ExpensifyHelp-WorkspaceFeeds_02.png){:width="100%"}
+
+# Step 3: Issue cards
+
+You can issue an unlimited amount of physical and/or virtual cards to employees.
+
+1. Click **Issue card** in the top right.
+2. Select the employee that you want to issue the card to.
+3. Select whether you want to issue a physical or virtual card.
+4. Pick a smart, monthly, or fixed limit:
+    - Smart limits allow spending up to a certain amount before requiring approval.
+    - Monthly limits allow spending up to a certain amount per month.
+    - Fixed limits allow spending up to a certain amount before the card is terminated.
+5. Enter the limit amount.
+6. Add a card name.
+7. Click **Issue card** to confirm and issue the card.
+
+![Click the issue card button in the top right]({{site.url}}/assets/images/ExpensifyHelp-WorkspaceFeeds_03.png){:width="100%"}
+
+![Click issue card to confirm and issue the card]({{site.url}}/assets/images/ExpensifyHelp-WorkspaceFeeds_04.png){:width="100%"}
+
+{% include faq-begin.md %}
+**Do you need a specific type of bank account to use the Expensify Card?**
+
+At this time, the Expensify Card requires a US business bank account opened in the name of a business incorporated in the US.
+
+**Can I use the Expensify Card across multiple workspaces?**
+
+You can use the Expensify Card on every workspace you create. However, a settlement account can only be used with the Expensify Card on one workspace. For example, if you’re using the Expensify Card on three workspaces, you need three settlement accounts.
+
+**Can I issue multiple cards to the same employee?**
+
+You can issue an unlimited number of both physical and virtual cards to employees. This supports a wide variety of different use cases, ranging from each employee only having one card, to employees having numerous cards for things like individual trips, specific purchases, etc.
+{% include faq-end.md %}
+
+</div>
diff --git a/docs/articles/new-expensify/expensify-card/Update-your-Expensify-Card-mailing-address.md b/docs/articles/new-expensify/expensify-card/Update-your-Expensify-Card-mailing-address.md
new file mode 100644
index 000000000000..6ce53b6a359a
--- /dev/null
+++ b/docs/articles/new-expensify/expensify-card/Update-your-Expensify-Card-mailing-address.md
@@ -0,0 +1,29 @@
+---
+title: Update your Expensify Card mailing address
+description: Change your mailing address for your Expensify Card
+---
+<div id="new-expensify" markdown="1">
+
+1. Hover over Settings, then click **Account**.
+2. Click the **Credit Card Import** tab.
+3. Click **Request a New Card** on your physical card pending activation.
+4. Select **I lost my card**. 
+
+{% include info.html %}
+If you’re updating your address to receive your new Expensify Visa® Commercial Card, you’ll still select **I lost my card** even though you have not lost a card. 
+{% include end-info.html %}
+
+{:start="5"}
+5. Confirm your details and click **Continue**.
+6. Update your address and click **Continue**.
+
+{% include info.html %}
+If you’re updating your address to receive your new Expensify Visa® Commercial Card, you can click the X in the right corner to end the process here if the new card has not been shipped out to you yet. However, if the new card has already been shipped out to an incorrect address, proceed to the next step to resend the card to the newly updated address. 
+{% include end-info.html %}
+
+{:start="7"}
+7. Proceed with the card replacement. 
+
+Your new card will arrive in 2-3 business days.
+
+</div>
diff --git a/docs/articles/new-expensify/expensify-card/Upgrade-to-the-new-Expensify-Card-from-Visa.md b/docs/articles/new-expensify/expensify-card/Upgrade-to-the-new-Expensify-Card-from-Visa.md
new file mode 100644
index 000000000000..56e456eb1256
--- /dev/null
+++ b/docs/articles/new-expensify/expensify-card/Upgrade-to-the-new-Expensify-Card-from-Visa.md
@@ -0,0 +1,54 @@
+---
+title: Upgrade to the new Expensify Card from Visa
+description: Get the new Expensify Visa® Commercial Card 
+---
+<div id="new-expensify" markdown="1">
+
+If your company is already using Expensify Cards, you can upgrade your cards for free to the new Expensify Visa® Commercial Card to get even more tools to manage employee spending, including: 
+- Unlimited <a href="[url](https://use.expensify.com/unlimited-virtual-cards)">virtual cards</a>  
+- Controlled spending amounts on virtual cards to manage subscriptions
+- Tighter controls for managing spend across employees and merchants
+- Fixed or monthly spend limits for each card 
+- Unique naming for each virtual card for simplified expense categorization 
+ 
+# Upgrade your company’s Expensify Cards
+
+{% include info.html %}
+This process must be completed by a Domain Admin. Although the process is available for all Domain Admins, only one admin needs to complete these steps. 
+
+Before completing this process, you’ll want to:
+
+- Have your employees update their address if needed so that they receive their new Expensify Card in the mail before completing the steps below. 
+- Ensure that existing cardholders have a limit greater than $0 if you want them to receive a new Expensify Card. If their limit is $0, increase the limit.
+{% include end-info.html %}
+
+1. On your Home page, click the task titled “Upgrade to the new and improved Expensify Card.”
+2. Review and agree to the Terms of Service.
+3. Click **Get the new card**. All existing cardholders with a limit greater than $0 will be automatically mailed a new physical card to the address they have on file. Virtual cards will be automatically issued and available for immediate use. 
+4. If you have Positive Pay enabled for your settlement account, contact your bank as soon as possible to whitelist the new ACH ID: 2270239450. 
+5. Remind your employees to update their payment information for recurring charges to their virtual card information.
+
+New cards will have the same limit as the existing cards. Each cardholder’s current physical and virtual cards will remain active until a Domain Admin or the cardholder deactivates it.
+
+{% include info.html %}
+Cards won’t be issued to any employees who don’t currently have them. In this case, you’ll need to [issue a new card](https://help.expensify.com/articles/expensify-classic/expensify-card/Set-Up-the-Expensify-Visa%C2%AE-Commercial-Card-for-your-Company)
+{% include end-info.html %}
+
+{% include faq-begin.md %}
+
+**Why don’t I see the task to agree to new terms on my Home page?**
+
+There are a few reasons why you might not see the task on your Home page:
+- You may not be a Domain Admin
+- Another domain admin has already accepted the terms
+- The task may be hidden. To find hidden tasks, scroll to the bottom of the Home page and click **Show Hidden Tasks** to see all of your available tasks. 
+
+**Will this affect the continuous reconciliation process?**
+
+No. During the transition period, you may have some employees with old cards and some with new cards, so you’ll have two different debits (settlements) made to your settlement account for each settlement period. Once all spending has transitioned to the new cards, you’ll only see one debit/settlement. 
+
+**Do I have to upgrade to the new Expensify Visa® Commercial Card?**
+
+Yes. We’ll provide a deadline soon. But don’t worry—you’ll have plenty of time to upgrade.  
+{% include faq-end.md %}
+</div>
diff --git a/docs/articles/new-expensify/expensify-card/Use-your-Expensify-Card.md b/docs/articles/new-expensify/expensify-card/Use-your-Expensify-Card.md
new file mode 100644
index 000000000000..6c7457641ce6
--- /dev/null
+++ b/docs/articles/new-expensify/expensify-card/Use-your-Expensify-Card.md
@@ -0,0 +1,56 @@
+---
+title: Use your Expensify Card
+description: Use your physical or virtual Expensify Card
+---
+<div id="new-expensify" markdown="1">
+
+As soon as you receive your physical Expensify Visa® Commercial Card, you can start using it right away by swiping it like you would with any other card, or you can link your card to your Apple or Google Pay mobile wallet to make in-person, contactless payments. You can also use your virtual Expensify Card for online and in-app purchases.
+
+A virtual card is a digital card that can be used for online transactions. Virtual cards have the same details as physical cards, but they offer several additional benefits:
+- **Flexibility**: Virtual cards can be created or deleted instantly. You can use them for individual transactions with predetermined amounts or recurring payments and subscriptions.
+- **Customizable limits**: You can set spending limits for each virtual card.
+- **Security**: Admins have the option to issue virtual cards for a single-use (e.g. for one of expenses) or fixed-use (e.g. for recurring expenses). Since you have placed a limit on their usage, it makes them less susceptible to unauthorized transactions. 
+- **Insights**: You can easily track recurring spend for specific vendors when assigning a virtual card to a team, department, or vendor.
+
+# View your virtual card details
+
+{% include selector.html values="desktop, mobile" %}
+
+{% include option.html value="desktop" %}
+1. Click your profile image or icon in the bottom left menu.
+2. Click **Wallet** in the left menu.
+3. Click your Expensify Card. 
+4. Click **Reveal Details** to view your virtual Expensify Card number, expiration date, CVV, and address.
+{% include end-option.html %}
+
+{% include option.html value="mobile" %}
+1. Tap your profile image or icon in the bottom menu.
+2. Tap **Wallet**.
+3. Tap your Expensify Card.
+4. Tap **Reveal Details** to view your virtual Expensify Card number, expiration date, CVV, and address.
+{% include end-option.html %}
+
+{% include end-selector.html %}
+
+{% include faq-begin.md %}
+
+**Why did my transaction get declined?**
+
+Here are some reasons why an Expensify Card transaction might be declined:
+
+- **Insufficient card limit**: If a transaction exceeds your Expensify Card’s available limit, the transaction will be declined. Submitting expenses and getting them approved will free up your limit for more spending.
+- **Inactive card**: Your card isn’t active yet or it was disabled by your Domain Admin
+- **Incorrect card details**: Your card information was entered incorrectly with the merchant. Entering incorrect card information, such as the CVC, ZIP, or expiration date, will also lead to declines. There was suspicious activity
+- **Fraudulent or risky activity**: If Expensify detects unusual or suspicious activity, we may block transactions as a security measure. This could happen due to irregular spending patterns, attempted purchases from risky vendors, or multiple rapid transactions. Check your Expensify Home page to approve unusual merchants and try again. If the spending looks suspicious, we may complete a manual due diligence check, and our team will do this as quickly as possible - your cards will all be locked while this happens. The merchant is located in a restricted country
+
+**How do I report my Expensify Card expenses?**
+
+You can report and submit Expensify Card expenses just like any other expenses, and you’ll want to submit them regularly to ensure you have a sufficient spending amount available on the card. As your expenses are approved, your Smart Limit updates accordingly. 
+
+{% include info.html %}
+SmartScanned receipts should automatically attach to the related Expensify Card expense. Expensify also automatically generates an IRS-compliant eReceipt for every transaction as long as the expense isn’t lodging-related. If your organization doesn’t require itemized receipts, you can rely on eReceipts instead.
+{% include end-info.html %}
+
+{% include faq-end.md %}
+
+</div>
diff --git a/docs/articles/new-expensify/getting-started/Create-a-company-workspace.md b/docs/articles/new-expensify/getting-started/Create-a-company-workspace.md
index cbe21c9db20a..f514360e9519 100644
--- a/docs/articles/new-expensify/getting-started/Create-a-company-workspace.md
+++ b/docs/articles/new-expensify/getting-started/Create-a-company-workspace.md
@@ -4,7 +4,7 @@ description: Get started with Expensify by creating a workspace for your company
 ---
 <div id="new-expensify" markdown="1">
 
-To create an Expensify account for your company, follow the 6 steps below.
+To create an Expensify account for your company, follow the 6 steps below and enjoy a free 7-day trial, which won’t begin until workspace activity has begun.
 
 {% include info.html %}
 After you create your new company workspace, you can schedule a free private onboarding session with one of our Setup Specialists. After you complete the steps below, check your email and notifications in Expensify for your unique signup link.
@@ -12,7 +12,7 @@ After you create your new company workspace, you can schedule a free private onb
 
 # 1. Meet Concierge
 
-Concierge is your personal assistant that walks you through setting up your account and also provides:
+Concierge is your personal assistant who walks you through setting up your account and also provides:
 - Reminders to do things like submit your expenses
 - Alerts when more information is needed on an expense report
 - Updates on new and improved account features
@@ -22,7 +22,7 @@ You can get support any time by locating your chat with Concierge in your chat i
 # 2. Create a new workspace
 
 <ol type="a">
-   <li>Click your profile image or icon in the bottom left menu.</li>
+   <li>Click your profile photo or icon in the bottom left menu.</li>
    <li>Scroll down and click <b>Workspaces</b> in the left menu.</li>
    <li>Click <b>New workspace</b>.</li>
    <li>Click the Edit pencil icon next to your workspace image or icon and select <b>Upload Image</b> to choose an image from your saved files.</li>
@@ -30,6 +30,12 @@ You can get support any time by locating your chat with Concierge in your chat i
    <li>Click <b>Default Currency</b> to set the currency for all expenses submitted under the workspace. Expensify automatically converts all other currencies to your default currency.</li>
 </ol>
 
+![Click your profile photo or icon]({{site.url}}/assets/images/ExpensifyHelp_CreateWorkspace_1.png){:width="100%"}
+
+![Click Workspaces in the left menu and New Worksapce]({{site.url}}/assets/images/ExpensifyHelp_CreateWorkspace_2.png){:width="100%"}
+
+![Options to make changes like a custom workspace name]({{site.url}}/assets/images/ExpensifyHelp_CreateWorkspace_3.png){:width="100%"}
+
 # 3. Invite members
 
 <ol type="a">
@@ -46,9 +52,15 @@ Once the invite is accepted, the new members will appear in your members list.
 You can also invite members on the workspace’s Profile page by clicking **Share** to share the workspace’s URL or QR code.
 {% include end-info.html %}
 
+![Click Members on the left and click Invite member]({{site.url}}/assets/images/ExpensifyHelp_InviteMembers_1.png){:width="100%"}
+
+![Use the search field to find the individual by name, email, or phone number]({{site.url}}/assets/images/ExpensifyHelp_InviteMembers_2.png){:width="100%"}
+
+![Enter a custom message into the Message field]({{site.url}}/assets/images/ExpensifyHelp_InviteMembers_3.png){:width="100%"}
+
 # 4. Set admins
 
-Admins are members of your workspace that have permissions to manage the workspace. The table below shows the difference between member and admin permissions:
+Admins are members of your workspace who have permission to manage the workspace. The table below shows the difference between member and admin permissions:
 
 | Employee                                  | Workspace Admin                            |
 | ----------------------------------------- | ------------------------------------------ |
@@ -100,5 +112,9 @@ To add more features,
    <li>Enable any desired feature.</li> 
    <li>Click the related menu item that appears in the left menu to update its settings.</li>
 </ol>
+
+Easily monitor when your Free Trial starts and how many days are left on your Subscription page. We’ll also notify you when your trial starts and ends, at which point you’ll add a billing card to continue using all your favorite features!
+
+![Hightlight the free trial start and end date]({{site.url}}/assets/images/ExpensifyHelp-FreeTrial-1.png){:width="100%"}
  
 </div>
diff --git a/docs/articles/new-expensify/getting-started/Join-your-company's-workspace.md b/docs/articles/new-expensify/getting-started/Join-your-company's-workspace.md
index 9c5aea0c61ae..a4747c2d95e5 100644
--- a/docs/articles/new-expensify/getting-started/Join-your-company's-workspace.md
+++ b/docs/articles/new-expensify/getting-started/Join-your-company's-workspace.md
@@ -51,6 +51,8 @@ Upload your expenses and check your reports right from your phone by downloading
 {% include end-option.html %}
 
 {% include end-selector.html %}
+
+![The profile page to change options like display name]({{site.url}}/assets/images/ExpensifyHelp_R2_Profile_1.png){:width="100%"}
  
 # 3. Meet Concierge
 
diff --git a/docs/articles/new-expensify/settings/Add-profile-photo.md b/docs/articles/new-expensify/settings/Add-profile-photo.md
new file mode 100644
index 000000000000..60e56deaafbc
--- /dev/null
+++ b/docs/articles/new-expensify/settings/Add-profile-photo.md
@@ -0,0 +1,21 @@
+---
+title: Add profile photo
+description: Add an image to your profile
+---
+<div id="new-expensify" markdown="1">
+
+{% include selector.html values="desktop, mobile" %}
+
+{% include option.html value="desktop" %}
+1. Click your profile image or icon in the bottom left menu. 
+2. Click the Edit pencil icon next to your profile image or icon and select **Upload Image** to choose a new image from your saved files.
+{% include end-option.html %}
+
+{% include option.html value="mobile" %}
+1. Tap your profile image or icon at the bottom of the screen. 
+2. Tap the Edit pencil icon next to your profile image or icon and select **Upload Image** to choose a new image from your saved files.
+{% include end-option.html %}
+
+{% include end-selector.html %}
+
+</div>
diff --git a/docs/articles/new-expensify/settings/Close-account.md b/docs/articles/new-expensify/settings/Close-account.md
new file mode 100644
index 000000000000..e0d8fba2f452
--- /dev/null
+++ b/docs/articles/new-expensify/settings/Close-account.md
@@ -0,0 +1,44 @@
+---
+title: Close account
+description: Close an Expensify account
+---
+<div id="new-expensify" markdown="1">
+
+Closing your account will delete the data associated with the account. However, transactions shared with other accounts, including approved and reimbursed company expenses, will still be visible under those accounts. We may also be required to retain certain transaction records in compliance with laws in various jurisdictions.
+
+{% include selector.html values="desktop, mobile" %}
+
+{% include option.html value="desktop" %}
+1. Click your profile image or icon in the bottom left menu. 
+2. Click **Security** in the left menu.
+3. Click **Close account**.
+4. Provide answers to the question prompts, then click **Close Account**.
+{% include end-option.html %}
+
+{% include option.html value="mobile" %}
+1. Tap your profile image or icon in the bottom menu.
+2. Tap **Security**.
+3. Tap **Close account**.
+4. Provide answers to the question prompts, then tap **Close Account**. 
+{% include end-option.html %}
+
+{% include end-selector.html %}
+
+{% include faq-begin.md %}
+
+**I’m unable to close my account.**
+
+If your account has an outstanding balance or if you have been assigned a role under a company’s Expensify workspace, you may encounter an error message during the account closure process, or the Close Account button may not be available. Here are the steps to follow for each scenario:
+
+- **Account Under a Validated Domain**: A Domain Admin must remove your account from the domain. Then you will be able to successfully close your account.
+- **Sole Domain Admin**: If you are the only Domain Admin for a company’s domain, you must assign a new Domain Admin before you can close your account.
+- **Workspace Billing Owner with an annual subscription**: You must downgrade from the annual subscription before closing the account. Alternatively, you can have another user take over billing for your workspaces.
+- **Company Workspace Owner**: You must assign a new workspace owner before you can close your account.
+- **Account has an outstanding balance**: You must make a payment to resolve the outstanding balance before you can close your account.
+- **Preferred Exporter for a workspace integration**: You must assign a new Preferred Exporter before closing your account.
+- **Verified Business Account that is locked**: You must unlock the account.
+- **Verified Business Account that has an outstanding balance**: You must make a payment to settle any outstanding balances before the account can be closed.
+- **Unverified account**: You must first verify your account before it can be closed.
+{% include faq-end.md %}
+
+</div>
diff --git a/docs/articles/new-expensify/settings/Enable-Two-Factor-Authentication.md b/docs/articles/new-expensify/settings/Enable-Two-Factor-Authentication.md
new file mode 100644
index 000000000000..5f0a33cc8754
--- /dev/null
+++ b/docs/articles/new-expensify/settings/Enable-Two-Factor-Authentication.md
@@ -0,0 +1,51 @@
+---
+title: Enable Two-Factor Authentication (2FA)
+description: Add an extra layer of security for your Expensify login
+---
+<div id="new-expensify" markdown="1">
+
+Add an extra layer of security to help keep your financial data safe and secure by enabling two-factor authentication (2FA). This will require you to enter a code generated by your preferred authenticator app (like Google Authenticator or Microsoft Authenticator) when you log in.
+
+To enable 2FA,
+
+{% include selector.html values="desktop, mobile" %}
+
+{% include option.html value="desktop" %}
+1. Click your profile image or icon in the bottom left menu.
+2. Click **Security** in the left menu.
+3. Under Security Options, click **Two Factor Authentication**. 
+4. Save a copy of your backup codes. This step is critical! You will lose access to your account if you cannot use your authenticator app and do not have your recovery codes.
+   - Click **Download** to save a copy of your backup codes to your computer.
+   - Click **Copy** to paste the codes into a document or other secure location.
+5. Click **Next**.
+6. Download or open your authenticator app and connect it to Expensify by either:
+   - Scanning the QR code
+   - Entering the code into your authenticator app
+7. Enter the 6-digit code from your authenticator app into Expensify and click **Verify**.
+{% include end-option.html %}
+
+{% include option.html value="mobile" %}
+1. Tap your profile image or icon at the bottom of the screen. 
+2. Tap **Security**. 
+3. Under Security Options, tap **Two Factor Authentication**. 
+4. Save a copy of your backup codes. This step is critical! You will lose access to your account if you cannot use your authenticator app and do not have your recovery codes.
+   - Tap **Download** to save a copy of your backup codes to your device.
+   - Tap **Copy** to paste the codes into a document or other secure location.
+5. Tap **Next**.
+6. Download or open your authenticator app and connect it to Expensify by either:
+   - Scanning the QR code
+   - Entering the code into your authenticator app
+7. Enter the 6-digit code from your authenticator app into Expensify and tap **Verify**.
+{% include end-option.html %}
+
+{% include end-selector.html %}
+
+When you log in to Expensify in the future, you’ll be emailed a magic code that you’ll use to log in with. Then you’ll be prompted to open your authenticator app to get the 6-digit code and enter it into Expensify. A new code regenerates every few seconds, so the code is always different. If the code time runs out, you can generate a new code as needed.
+
+{% include faq-begin.md %}
+**How do I use my recovery codes if I lose access to my authenticator app?**
+
+Your recovery codes work the same way as your authenticator codes. Just enter a recovery code as you would the authenticator code.
+{% include faq-end.md %}
+
+</div>
diff --git a/docs/articles/new-expensify/settings/Encryption-and-Data-Security.md b/docs/articles/new-expensify/settings/Encryption-and-Data-Security.md
new file mode 100644
index 000000000000..fff3e6365ff9
--- /dev/null
+++ b/docs/articles/new-expensify/settings/Encryption-and-Data-Security.md
@@ -0,0 +1,53 @@
+---
+title: Encryption and Data Security
+description: Expensify prioritizes data security and maintains strict compliance standards to safeguard users' sensitive information.
+---
+<!-- The lines above are required by Jekyll to process the .md file -->
+
+# Overview
+
+We take security seriously. Our measures align with what banks use to protect sensitive financial data. We regularly test and update our security to stay ahead of any threats. Plus, we're checked daily by McAfee for extra reassurance against hackers. You can verify our security strength below or on the <a href="https://www.trustedsite.com/verify?host=all.expensify.com&utm_campaign=mfes_redirect&utm_medium=referral&utm_source=mcafeesecure.com">McAfee SECURE site</a>.
+
+Discover how Expensify safeguards your information below!
+
+## The Gold Standard of Security
+
+Expensify follows the highest standard of security, known as the Payment Card Industry Data Security Standard. This standard is used by major companies like PayPal, Visa, and banks to protect online credit card information. It covers many aspects of how systems work together securely. You can learn more about it on the <a href="https://listings.pcisecuritystandards.org/pci_security/"> PCI-DSS website</a>. And, Expensify is also compliant with SSAE 16!
+
+
+## Data and Password Encryption
+
+When you press 'enter,' your data transforms into a secret code, making it super secure. This happens whether it's moving between your browser and our servers or within our server network. In tech talk, we use HTTPS+TLS for all web connections, ensuring your information is encrypted at every stage of the journey. This means your data is always protected!
+
+## Account Safety
+
+Protecting your data on our servers is our top priority. We've taken strong measures to ensure your data is safe when it travels between you and us and when it's stored on our servers.
+In our first year, we focused on creating a super-reliable, geographically redundant, and PCI compliant data center. This means your data stays safe, and our systems stay up and running.
+We use a dual-control key, which only our servers know about. This key is split into two parts and stored in separate secure places, managed by different Expensify employees. 
+With this setup, sensitive data stays secure and can't be accessed outside our secure servers.
+
+## Our Commitment to GDPR
+
+The General Data Protection Regulation (GDPR), introduced by the European Commission, is a set of rules to strengthen and unify data protection for individuals in the European Union (EU). It also addresses the transfer of personal data outside the EU. This regulation applies not only to EU-based organizations but also to those outside the EU that handle the data of EU citizens. The compliance deadline for GDPR was May 25, 2018.
+
+Our commitment to protecting the privacy of our customer’s data includes:
+
+- Being active participants in the EU-US Privacy Shield and Swiss-US Privacy Shield Frameworks.
+- Undergoing annual SSAE-18 SOC 1 Type 2 audit by qualified, independent third-party auditors.
+- Maintaining PCI-DSS compliance.
+- Leveraging third-party experts to conduct yearly penetration tests.
+- All employees and contractors are subject to background checks (refreshed. annually), sign non-disclosure agreements, and are subject to ongoing security and privacy training.
+
+
+We have worked diligently to ensure we comply with GDPR. Here are some key changes we made:
+
+
+- **Enhanced Security and Data Privacy**: We've strengthened our security measures and carefully reviewed our privacy policies to align with GDPR requirements.
+- **Dedicated Data Protection Officer**: We've appointed a dedicated Data Protection Officer who can be reached at [privacy@expensify.com](mailto:privacy@expensify.com) for any privacy-related inquiries.
+- **Vendor Agreements**: We've signed Data Processing Addendums (DPAs) with all our vendors to ensure your data is handled safely during onward transfers.
+- **Transparency**: You can find details about the sub-processors we use on our website.
+- **Privacy Shield Certification**: We maintain certifications for the E.U.-U.S. Privacy Shield and the Swiss-U.S. Privacy Shield, which help secure international data transfers.
+- **GDPR Compliance**: We have a Data Processing Addendum that outlines the terms to meet GDPR requirements. You can request a copy by contacting [concierge@expensify.com](mailto:concierge@expensify.com).
+- **User Control**: Our product tools allow users to export data, manage preferences, and close accounts anytime.
+
+**Disclaimer**: Please note that the information on this page is for informational purposes only and is not intended as legal advice. It's essential to consult with legal and professional counsel to understand how GDPR may apply to your specific situation.
diff --git a/docs/articles/new-expensify/settings/Profile.md b/docs/articles/new-expensify/settings/Profile.md
deleted file mode 100644
index 908cf39c7ac6..000000000000
--- a/docs/articles/new-expensify/settings/Profile.md
+++ /dev/null
@@ -1,92 +0,0 @@
----
-title: Profile
-description: How to manage your Expensify Profile
----
-# Overview
-Your Profile in Expensify allows you to:
-- Set your public profile photo
-- Set a display name
-- Manage your contact methods
-- Communicate your current status
-- Set your pronouns
-- Configure your timezone
-- Store your personal details (for travel and payment purposes)
-
-# How to set your public profile photo
-
-To set or update your profile photo: 
-1. Go to **Settings > Profile**
-2. Tap on the default or your existing profile photo,
-3. You can either either upload (to set a new profile photo), remove or view your profile photo
-
-Your profile photo is visible to all Expensify users. 
-
-# How to set a display name
-
-To set or update your display name: 
-1. Go to **Settings > Profile**
-2. Tap on **Display name**
-3. Set a first name and a last name, then **Save**
-
-Your display name is public to all Expensify users.
-
-# How to add or remove contact methods (email address and phone number)
-
-Your contact methods allow people to contact you (using your email address or phone number), and allow you to forward receipts to receipts@expensify.com from multiple email addresses.
-
-To manage your contact methods:
-1. Go to **Settings > Profile**
-2. Tap on **Contact method**
-3. Tap **New contact method** to add a new email or phone number 
-
-Your default contact method (email address or phone number) will be visible to "known" users, with whom you have interacted or are part of your team.
-
-To change the email address or phone number that's displayed on your Expensify account, add a new contact method, then tap on that email address and tap **Set as default**.
-
-# How to communicate your current status
-
-You can use your status emoji to communicate your mood, focus or current activity. You can optionally add a status message too! 
-
-To set your status emoji and status message:
-1. Go to **Settings > Profile**
-2. Tap on **Status** then **Status**
-3. Choose a status emoji, and optionally set a status message
-4. Tap on **Save**
-
-Your status emoji will be visible next to your name in Expensify, and your status emoji and status message will appear in your profile (which is public to all Expensify users). On a computer, your status message will also be visible by hovering your mouse over your name.
-
-You can also remove your current status:
-1. Go to **Settings > Profile**
-2. Tap on **Status**
-3. Tap on **Clear status**
-
-# How to set your pronouns
-
-To set your pronouns:
-1. Go to **Settings > Profile**
-2. Tap on **Pronouns**
-3. Search for your preferred pronouns, then tap on your choice
-
-Your pronouns will be visible to "known" users, with whom you have interacted or are part of your team.
-
-# How to configure your timezone
-
-Your timezone is automatically set using an estimation based on your IP address.
-
-To set your timezone manually:
-1. Go to **Settings > Profile**
-2. Tap on **Timezone**
-3. Disable **Automatically determine your location**
-4. Tap on **Timezone**
-5. Search for your preferred timezone, then tap on your choice
-
-Your timezone will be visible to "known" users, with whom you have interacted or are part of your team.
-
-# How to store your personal details (for travel and payment purposes)
-
-Your personal details can be used in Expensify for travel and payment purposes. These will not be shared with any other Expensify user. 
-
-To set your timezone manually:
-1. Go to **Settings > Profile**
-2. Tap on **Personal details**
-3. Tap on **Legal name**, **Date of birth**, and **Address** to set your personal details
diff --git a/docs/articles/new-expensify/settings/Security.md b/docs/articles/new-expensify/settings/Security.md
deleted file mode 100644
index 5c8eee7ae60e..000000000000
--- a/docs/articles/new-expensify/settings/Security.md
+++ /dev/null
@@ -1,53 +0,0 @@
----
-title: Security
-description: Expensify prioritizes data security and maintains strict compliance standards to safeguard users' sensitive information.
----
-<!-- The lines above are required by Jekyll to process the .md file -->
-
-# Overview
-
-We take security seriously. Our measures align with what banks use to protect sensitive financial data. We regularly test and update our security to stay ahead of any threats. Plus, we're checked daily by McAfee for extra reassurance against hackers. You can verify our security strength below or on the <a href="https://www.trustedsite.com/verify?host=all.expensify.com&utm_campaign=mfes_redirect&utm_medium=referral&utm_source=mcafeesecure.com">McAfee SECURE site</a>.
-
-Discover how Expensify safeguards your information below!
-
-## The Gold Standard of Security
-
-Expensify follows the highest standard of security, known as the Payment Card Industry Data Security Standard. This standard is used by major companies like PayPal, Visa, and banks to protect online credit card information. It covers many aspects of how systems work together securely. You can learn more about it on the <a href="https://listings.pcisecuritystandards.org/pci_security/"> PCI-DSS website</a>. And, Expensify is also compliant with SSAE 16!
-
-
-## Data and Password Encryption
-
-When you press 'enter,' your data transforms into a secret code, making it super secure. This happens whether it's moving between your browser and our servers or within our server network. In tech talk, we use HTTPS+TLS for all web connections, ensuring your information is encrypted at every stage of the journey. This means your data is always protected!
-
-## Account Safety
-
-Protecting your data on our servers is our top priority. We've taken strong measures to ensure your data is safe when it travels between you and us and when it's stored on our servers.
-In our first year, we focused on creating a super-reliable, geographically redundant, and PCI compliant data center. This means your data stays safe, and our systems stay up and running.
-We use a dual-control key, which only our servers know about. This key is split into two parts and stored in separate secure places, managed by different Expensify employees. 
-With this setup, sensitive data stays secure and can't be accessed outside our secure servers.
-
-## Our Commitment to GDPR
-
-The General Data Protection Regulation (GDPR), introduced by the European Commission, is a set of rules to strengthen and unify data protection for individuals in the European Union (EU). It also addresses the transfer of personal data outside the EU. This regulation applies not only to EU-based organizations but also to those outside the EU that handle the data of EU citizens. The compliance deadline for GDPR was May 25, 2018.
-
-Our commitment to protecting the privacy of our customer’s data includes:
-
-- Being active participants in the EU-US Privacy Shield and Swiss-US Privacy Shield Frameworks.
-- Undergoing annual SSAE-18 SOC 1 Type 2 audit by qualified, independent third-party auditors.
-- Maintaining PCI-DSS compliance.
-- Leveraging third-party experts to conduct yearly penetration tests.
-- All employees and contractors are subject to background checks (refreshed. annually), sign non-disclosure agreements, and are subject to ongoing security and privacy training.
-
-
-We have worked diligently to ensure we comply with GDPR. Here are some key changes we made:
-
-
-- **Enhanced Security and Data Privacy**: We've strengthened our security measures and carefully reviewed our privacy policies to align with GDPR requirements.
-- **Dedicated Data Protection Officer**: We've appointed a dedicated Data Protection Officer who can be reached at [privacy@expensify.com](mailto:privacy@expensify.com) for any privacy-related inquiries.
-- **Vendor Agreements**: We've signed Data Processing Addendums (DPAs) with all our vendors to ensure your data is handled safely during onward transfers.
-- **Transparency**: You can find details about the sub-processors we use on our website.
-- **Privacy Shield Certification**: We maintain certifications for the E.U.-U.S. Privacy Shield and the Swiss-U.S. Privacy Shield, which help secure international data transfers.
-- **GDPR Compliance**: We have a Data Processing Addendum that outlines the terms to meet GDPR requirements. You can request a copy by contacting [concierge@expensify.com](mailto:concierge@expensify.com).
-- **User Control**: Our product tools allow users to export data, manage preferences, and close accounts anytime.
-
-**Disclaimer**: Please note that the information on this page is for informational purposes only and is not intended as legal advice. It's essential to consult with legal and professional counsel to understand how GDPR may apply to your specific situation.
diff --git a/docs/articles/new-expensify/settings/Switch-account-language-to-Spanish.md b/docs/articles/new-expensify/settings/Switch-account-language-to-Spanish.md
new file mode 100644
index 000000000000..a431d34fbc0f
--- /dev/null
+++ b/docs/articles/new-expensify/settings/Switch-account-language-to-Spanish.md
@@ -0,0 +1,23 @@
+---
+title: Switch account language to Spanish
+description: Change your account language
+---
+<div id="new-expensify" markdown="1">
+
+{% include selector.html values="desktop, mobile" %}
+
+{% include option.html value="desktop" %}
+1. Click your profile image or icon in the bottom left menu.
+2. Click **Preferences** in the left menu. 
+3. Click the Language option and select **Spanish**. 
+{% include end-option.html %}
+
+{% include option.html value="mobile" %}
+1. Tap your profile image or icon in the bottom menu.
+2. Tap **Preferences**. 
+3. Tap the Language option and select **Spanish**.
+{% include end-option.html %}
+
+{% include end-selector.html %}
+
+</div>
diff --git a/docs/articles/new-expensify/settings/Switch-to-light-or-dark-mode.md b/docs/articles/new-expensify/settings/Switch-to-light-or-dark-mode.md
new file mode 100644
index 000000000000..34f96f9f5f7d
--- /dev/null
+++ b/docs/articles/new-expensify/settings/Switch-to-light-or-dark-mode.md
@@ -0,0 +1,30 @@
+---
+title: Switch to light or dark mode
+description: Change the appearance of Expensify
+---
+<div id="new-expensify" markdown="1">
+
+Expensify has three theme options that determine how the app looks:
+- **Dark mode**: The app appears with a dark background
+- **Light mode**: The app appears with a light background
+- **Use Device settings**: Expensify will automatically use your device’s default theme 
+
+To change your Expensify theme,
+
+{% include selector.html values="desktop, mobile" %}
+
+{% include option.html value="desktop" %}
+1. Click your profile image or icon in the bottom left menu.
+2. Click **Preferences** in the left menu. 
+3. Click the **Theme** option and select the desired theme.
+{% include end-option.html %}
+
+{% include option.html value="mobile" %}
+1. Tap your profile image or icon in the bottom menu.
+2. Tap **Preferences**. 
+3. Tap the **Theme** option and select the desired theme.
+{% include end-option.html %}
+
+{% include end-selector.html %}  
+
+</div>
diff --git a/docs/articles/new-expensify/settings/Update-Notification-Preferences.md b/docs/articles/new-expensify/settings/Update-Notification-Preferences.md
new file mode 100644
index 000000000000..e4111b3d02d3
--- /dev/null
+++ b/docs/articles/new-expensify/settings/Update-Notification-Preferences.md
@@ -0,0 +1,29 @@
+---
+title: Update notification preferences
+description: Determine how you want to receive Expensify notifications
+---
+<div id="new-expensify" markdown="1">
+
+To customize the email and in-app notifications you receive from Expensify,
+
+{% include selector.html values="desktop, mobile" %}
+
+{% include option.html value="desktop" %}
+1. Click your profile image or icon in the bottom left menu.
+2. Click **Preferences** in the left menu. 
+3. Enable or disable the toggles under Notifications:
+   - **Receive relevant feature updates and Expensify news**: If enabled, you will receive emails and in-app notifications from Expensify about new product and company updates. 
+   - **Mute all sounds from Expensify**: If enabled, all in-app notification sounds will be silenced.
+{% include end-option.html %}
+
+{% include option.html value="mobile" %}
+1. Tap your profile image or icon in the bottom menu.
+2. Tap **Preferences**. 
+3. Enable or disable the toggles under Notifications:
+   - **Receive relevant feature updates and Expensify news**: If enabled, you will receive emails and in-app notifications from Expensify about new product and company updates. 
+   - **Mute all sounds from Expensify**: If enabled, all in-app notification sounds will be silenced.
+{% include end-option.html %}
+
+{% include end-selector.html %}
+
+</div>
diff --git a/docs/articles/new-expensify/travel/Approve-travel-expenses.md b/docs/articles/new-expensify/travel/Approve-travel-expenses.md
new file mode 100644
index 000000000000..585e930a3dde
--- /dev/null
+++ b/docs/articles/new-expensify/travel/Approve-travel-expenses.md
@@ -0,0 +1,105 @@
+---
+title: Approve travel expenses
+description: Determine how travel expenses are approved
+---
+<div id="expensify-classic" markdown="1">
+
+Travel expenses follow the same approval workflow as other expenses. Admins can configure travel expenses to be approved as soft approval, hard approval or passive approval. The approval method for in-policy and out-of-policy bookings can be managed under the **Policies** section in the **Program** menu for Expensify Travel. 
+ 
+- **Soft Approval**: Bookings are automatically approved as long as a manager does not decline them within 24 hours. However, this also means that if a manager does not decline the expenses, the arrangements will be booked even if they are out of policy. If a booking is declined, it is refunded based on the voiding/refund terms of the service provider.
+- **Hard Approval**: Bookings are automatically canceled/voided and refunded if a manager does not approve them within 24 hours. 
+- **Passive Approval**: Managers are informed of out-of-policy travel, but there is no action to be taken.
+
+# Set approval method
+
+1. Click the **Travel** tab.
+2. Click **Book or manage travel**.
+3. Click the **Program** tab at the top and select **Policies**.
+4. Under General, select approval methods for Flights, Hotels, Cars and Rail.
+
+![Screenshot of Expensify Travel policy approval settings](https://help.expensify.com/assets/images/Travel_Policy.png){:width="100%"}
+
+# Approve travel
+
+![Screenshot of Expensify Travel approval email](https://help.expensify.com/assets/images/Travel_Email.png){:width="100%"}
+
+## Soft approval
+
+Once an employee has booked a trip, their approver will receive an email notifying them of the booking with a prompt to decline it if needed. 
+
+- To approve the booking, no action is required. 
+- To decline the booking, click **Decline booking** within 24 hours. Then click **Deny Booking**.
+
+## Hard approval
+
+Once an employee has booked a trip, their approver will receive an email notifying them of the booking with a prompt to accept or decline the booking.
+
+To approve the booking, click **Approve booking**. Then click **Approve**.
+To decline the booking, click **Decline booking**. Then click **Deny**. 
+
+# FAQs
+
+## Are extended approval windows given for trips booked over the weekend or during company holidays?
+
+No, the approval window will always be 24 hours from when the trip is booked. 
+
+## How does Expensify Travel handle approvals when the assigned approver is out of office? 
+
+It is recommended to have multiple approvers for travel, as there is no delegated approval for out-of-office approvers.
+
+## Can travelers upload a document when submitting a trip for approval?
+
+Travelers are unable to add a document when submitting a trip for approval, but the company can add a ‘reason code’ in the Out of Policy rules that the traveler can complete at checkout. The traveler can then add the document to the expense report in Expensify when submitting the report. 
+
+</div>
+
+<div id="new-expensify" markdown="1">
+
+Travel expenses follow the same approval workflow as other expenses. Admins can configure travel expenses to be approved as soft approval, hard approval or passive approval. The approval method for in-policy and out-of-policy bookings can be managed under the **Policies** section in the **Program** menu for Expensify Travel. 
+ 
+- **Soft Approval**: Bookings are automatically approved as long as a manager does not decline them within 24 hours. However, this also means that if a manager does not decline the expenses, the arrangements will be booked even if they are out of policy. If a booking is declined, it is refunded based on the voiding/refund terms of the service provider.
+- **Hard Approval**: Bookings are automatically canceled/voided and refunded if a manager does not approve them within 24 hours. 
+- **Passive Approval**: Managers are informed of out-of-policy travel, but there is no action to be taken.
+
+# Set approval method
+
+1. Click the + icon in the bottom left menu and select **Book travel**. 
+2. Click **Book or manage travel**. 
+3. Click the **Program** tab at the top and select **Policies**.
+4. Under General, select approval methods for Flights, Hotels, Cars and Rail.
+
+![Screenshot of Expensify Travel policy approval settings](https://help.expensify.com/assets/images/Travel_Policy.png){:width="100%"}
+
+# Approve travel
+
+![Screenshot of Expensify Travel approval email](https://help.expensify.com/assets/images/Travel_Email.png){:width="100%"}
+
+## Soft approval
+
+Once an employee has booked a trip, their approver will receive an email notifying them of the booking with a prompt to decline it if needed. 
+
+- To approve the booking, no action is required. 
+- To decline the booking, click **Decline booking** within 24 hours. Then click **Deny Booking**.
+
+## Hard approval
+
+Once an employee has booked a trip, their approver will receive an email notifying them of the booking with a prompt to accept or decline the booking.
+
+To approve the booking, click **Approve booking**. Then click **Approve**.
+To decline the booking, click **Decline booking**. Then click **Deny**. 
+
+# FAQs
+
+## Are extended approval windows given for trips booked over the weekend or during company holidays?
+
+No, the approval window will always be 24 hours from when the trip is booked. 
+
+## How does Expensify Travel handle approvals when the assigned approver is out of office? 
+
+It is recommended to have multiple approvers for travel, as there is no delegated approval for out-of-office approvers.
+
+## Can travelers upload a document when submitting a trip for approval?
+
+Travelers are unable to add a document when submitting a trip for approval, but the company can add a ‘reason code’ in the Out of Policy rules that the traveler can complete at checkout. The traveler can then add the document to the expense report in Expensify when submitting the report. 
+
+</div>
diff --git a/docs/articles/new-expensify/travel/Book-with-Expensify-Travel.md b/docs/articles/new-expensify/travel/Book-with-Expensify-Travel.md
new file mode 100644
index 000000000000..5d25670ac5ab
--- /dev/null
+++ b/docs/articles/new-expensify/travel/Book-with-Expensify-Travel.md
@@ -0,0 +1,89 @@
+---
+title: Book with Expensify Travel
+description: Book flights, hotels, cars, trains, and more with Expensify Travel
+---
+<div id="expensify-classic" markdown="1">
+
+Expensify Travel allows members to search and book flights, hotels, cars, and trains globally at the most competitive rates available. 
+
+With Expensify Travel, you can:
+- Search and book travel arrangements all in one place
+- Book travel for yourself or for someone else
+- Get real-time support by chat or phone
+- Manage all your T&E expenses in Expensify
+- Create specific rules for booking travel
+- Enable approvals for out-of-policy trips
+- Book with any credit card on the market
+- Book with the Expensify Card to get cash back and automatically reconcile transactions
+
+There is a flat fee of $15 per trip booked. A single trip can include multiple bookings, such as a flight, a hotel, and a car rental.
+
+# Book travel
+
+To book travel from the Expensify web app,
+
+1. Click the **Travel** tab.
+2. Click **Book or manage travel**.
+3. Use the icons at the top to select the type of travel arrangement you want to book: flights, hotels, cars, or trains.
+4. Enter the travel information relevant to the travel arrangement selected (for example, the destination, dates of travel, etc.). 
+5. Select all the details for the arrangement you want to book.
+6. Review the booking details and click **Book Flight / Book Hotel / Book Car / Book Rail** to complete the booking.
+
+The traveler is emailed an itinerary of the booking. Additionally,  
+- Their travel details are added to a Trip chat room under their primary workspace. 
+- An expense report for the trip is created.
+- If booked with an Expensify Card, the trip is automatically reconciled.
+
+{% include info.html %}
+The travel itinerary is also emailed to the traveler’s [copilots](https://help.expensify.com/articles/expensify-classic/copilots-and-delegates/Assign-or-remove-a-Copilot), if applicable.
+{% include end-info.html %}
+
+</div>
+
+<div id="new-expensify" markdown="1">
+Expensify Travel allows members to search and book flights, hotels, cars, and trains globally at the most competitive rates available. 
+
+With Expensify Travel, you can:
+- Search and book travel arrangements all in one place
+- Book travel for yourself or for someone else
+- Get real-time support by chat or phone
+- Manage all your T&E expenses in Expensify
+- Create specific rules for booking travel
+- Enable approvals for out-of-policy trips
+- Book with any credit card on the market
+- Book with the Expensify Card to get cash back and automatically reconcile transactions
+
+There is a flat fee of $15 per trip booked. A single trip can include multiple bookings, such as a flight, a hotel, and a car rental.
+
+# Book travel
+
+{% include selector.html values="desktop, mobile" %}
+
+{% include option.html value="desktop" %}
+1. Click the + icon in the bottom left menu and select **Book travel**. 
+2. Click **Book or manage travel**.
+3. Agree to the terms and conditions and click **Continue**.
+4. Use the icons at the top to select the type of travel arrangement you want to book: flights, hotels, cars, or trains.
+5. Enter the travel information relevant to the travel arrangement selected (for example, the destination, dates of travel, etc.). 
+6. Select all the details for the arrangement you want to book.
+7. Review the booking details and click **Book Flight / Book Hotel / Book Car / Book Rail** to complete the booking. 
+{% include end-option.html %}
+
+{% include option.html value="mobile" %}
+1. Tap the + icon in the bottom menu and select **Book travel**. 
+2. Tap **Book or manage travel**.
+3. Agree to the terms and conditions and tap **Continue**.
+4. Use the icons at the top to select the type of travel arrangement you want to book: flights, hotels, cars, or trains.
+5. Enter the travel information relevant to the travel arrangement selected (for example, the destination, dates of travel, etc.). 
+6. Select all the details for the arrangement you want to book.
+7. Review the booking details and click **Book Flight / Book Hotel / Book Car / Book Rail** to complete the booking. 
+{% include end-option.html %}
+
+{% include end-selector.html %}
+
+The traveler is emailed an itinerary of the booking. Additionally,  
+- Their travel details are added to a Trip chat room under their primary workspace. 
+- An expense report for the trip is created.
+- If booked with an Expensify Card, the trip is automatically reconciled.
+
+</div>
diff --git a/docs/articles/new-expensify/travel/Configure-travel-policy-and-preferences.md b/docs/articles/new-expensify/travel/Configure-travel-policy-and-preferences.md
new file mode 100644
index 000000000000..7e9a217b34ec
--- /dev/null
+++ b/docs/articles/new-expensify/travel/Configure-travel-policy-and-preferences.md
@@ -0,0 +1,157 @@
+---
+title: Configure travel policy and preferences 
+description: Set and update travel policies and preferences for your Expensify Workspace
+---
+<div id="expensify-classic" markdown="1">
+
+As a Workspace Admin, you can set travel policies for all travel booked under a workspace, including approval methods, flight booking class, and hotel star preferences. You can also create multiple policies with specific conditions for particular groups of employees and/or non-employees. 
+
+# Create or update a travel policy
+
+Workspace admins can create different travel policies that provide travel rules for different groups of travelers. When using Expensify Travel for the first time, you will need to create a new Travel Policy.
+
+To create or update a travel policy,
+
+1. Click the **Travel** tab.
+2. Click **Book or manage travel**. 
+3. Click the **Program** tab at the top and select **Policies**. 
+4. Under Employee or Non-employee in the left menu, click **Add new** to create a new policy. 
+5. Use the **Edit members** section to select the group of employees that belong to this policy.
+    1. **To select an existing policy:** Select the policy in the left menu.
+    2. **To add a new policy:** Click **Add new** under Employee or Non-employee in the left menu. Then under the Edit members section, select the group of employees that belong to this policy.
+
+{% include info.html %}
+A Legal Entity in Expensify Travel is the equivalent of an Expensify Workspace.
+{% include end-info.html %}
+
+10. Select which travel preferences you want to modify: General, flight, hotel, car, or rail. 
+11. Click the paperclip icon next to each setting to de-couple it from your default policy.
+12. Update the desired settings.
+
+# General
+
+Determine the currency and [approval type](https://help.expensify.com/articles/expensify-classic/travel/Approve-travel-expenses#set-approval-method) for different types of travel bookings. You can also upload a PDF of your company travel policy for employees to access when booking travel. 
+
+![Screenshot of Expensify Travel policy approval settings](https://help.expensify.com/assets/images/Travel_Policy.png){:width="100%"}
+
+# Flight
+
+Flight preferences include multiple sections with different settings: 
+
+- **Flights not allowed to be booked:** Restrict specific flight classes from being booked by employees.
+- **Cabin class settings:** Set the highest cabin class allowed for booking and whether employees can accept cabin upgrades. 
+- **Budget:** Set a percentage or fare cap for the median or cheapest fares on flights, and a maximum capped price. Flight fares above this cap will be considered out of policy. You can also add customization to allow for different caps for different flight durations. 
+- **Lowest logical fare settings:** Set a preference for layovers, number of stops, flight time window, and airport connection changes. Expensify automatically takes these preferences into account when showing the lowest logical travel fare. 
+- **Add Ons and Preferences:** Select what types of add-ons your employees can book, including:
+  - Additional baggage
+  - Early check-in
+  - Seat preference
+  - No add-ons allowed
+- **Booking windows:** Add a time limit to prevent employees from booking less than a certain number of days in advance to prohibit bookings too close to the flight time.
+- **Refundable/changeable tickets:** Allow employees to book fully or partially refundable fares. To allow all options, you can leave this as the default option. 
+- **Maximum CO2 per kilometer:** If the CO2 per passenger km exceeds this threshold, the flight will be marked as out of policy. You can leave the entry blank if you do not wish to use this policy.
+- **Out of policy reason codes:** If enabled, travelers will be asked to enter a reason code for an out-of-policy flight booking. This gives them a way to provide context for why the booking is still being placed. You can also modify the reason codes by clicking Manage reason codes below the toggle.
+
+# Hotel
+
+- **Restrict booking by keyword:** Keywords entered here will be compared to the hotel rate description. If any of the keywords are found, the hotel rate will be restricted. You also have the option to provide a reason why each keyword is restricted. 
+- **Hotel rates not allowed to be booked:** Restrict specific hotel rates (such as non-refundable, prepaid, and requires deposit) from being booked by employees. This overrides all other hotel policy rules. You also have the option to add a reason why these options aren’t available. 
+- **Maximum price:** Set a maximum price per night for bookings. You can also select the Customizations by location option to set a maximum price for each location.
+- **Booking window:**  Add a time limit to prevent employees from booking less than a certain number of days in advance to prohibit bookings too close to the flight time.
+- **Cancellation policy:** Allow your employees to book fully or partially refundable rooms. To allow all options, you can leave this as the default option. 
+- **Experience:** Set hotel ratings that are in and out of policy.
+- **Nightly median rate:** Determine which hotels to consider when calculating the median price. You can set a radius around the search location and include/disclude hotels above or below a certain rating.
+- **Out of policy reason codes:** If enabled, travelers will be asked to enter a reason code for an out-of-policy hotel booking. This gives them a way to provide context for why the booking is still being placed. You can also modify the reason codes by clicking Manage reason codes below the toggle.
+
+# Car
+
+- **Car categories not allowed:** Restrict specific car types from being booked by employees. This overrides any other car policy.
+- **Car categories in policy:** Define the types of cars that are in policy. If you do not list a specific car category, it will still be booked as long as it isn’t included in the Car categories not allowed setting. However, the booking will be classed as out of policy. 
+- **Car engine types not allowed:** Restrict specific engine types from being booked by employees regardless of other policy settings. 
+- **Maximum price:** Set a daily price cap per car (not including taxes and fees).
+- **Out of policy reason codes:** If enabled, travelers will be asked to enter a reason code for an out-of-policy car booking. This gives them a way to provide context for why the booking is still being placed. You can also modify the reason codes by clicking Manage reason codes below the toggle.
+
+# FAQ
+
+How do travel policy rules interact with Expensify’s [approval flows](https://help.expensify.com/articles/expensify-classic/travel/Approve-travel-expenses)?
+
+Travel policy rules define what can and can’t be booked by your employees while they’re making the booking. Once a booking is placed and the travel itself is [approved](https://help.expensify.com/articles/expensify-classic/travel/Approve-travel-expenses), the expense will appear in Expensify. It will then be coded, submitted, pushed through the existing expense approval process as defined by your workspace, and exported to your preferred accounting platform (if applicable).
+
+</div>
+
+<div id="new-expensify" markdown="1">
+
+As a Workspace Admin, you can set travel policies for all travel booked under your workspace, including approval methods, flight booking class, and hotel star preferences. You can also create multiple policies with specific conditions for particular groups of employees and/or non-employees. 
+
+# Create a travel policy 
+
+Workspace admins can create different travel policies that provide travel rules for different groups of travelers. When using Expensify Travel for the first time, you will need to create a new Travel Policy.
+
+To create or update a travel policy,
+
+1. Click the + icon in the bottom left menu and select **Book travel**. 
+2. Click **Book or manage travel**. 
+3. Click the **Program** tab at the top and select **Policies**. 
+4. Under Employee or Non-employee in the left menu, click **Add new** to create a new policy. 
+5. Use the **Edit members** section to select the group of employees that belong to this policy.
+    1. **To select an existing policy:** Select the policy in the left menu.
+    2. **To add a new policy:** Click **Add new** under Employee or Non-employee in the left menu. Then under the Edit members section, select the group of employees that belong to this policy.
+
+{% include info.html %}
+A Legal Entity in Expensify Travel is the equivalent of an Expensify Workspace.
+{% include end-info.html %}
+
+10. Select which travel preferences you want to modify: General, flight, hotel, car, or rail. 
+11. Click the paperclip icon next to each setting to de-couple it from your default policy.
+12. Update the desired settings.
+
+# General
+
+Determine the currency and [approval type](https://help.expensify.com/articles/expensify-classic/travel/Approve-travel-expenses#set-approval-method) for different types of travel bookings. You can also upload a PDF of your company travel policy for employees to access when booking travel. 
+
+![Screenshot of Expensify Travel policy approval settings](https://help.expensify.com/assets/images/Travel_Policy.png){:width="100%"}
+
+# Flight
+
+Flight preferences include multiple sections with different settings: 
+
+- **Flights not allowed to be booked:** Restrict specific flight classes from being booked by employees.
+- **Cabin class settings:** Set the highest cabin class allowed for booking and whether employees can accept cabin upgrades. 
+- **Budget:** Set a percentage or fare cap for the median or cheapest fares on flights, and a maximum capped price. Flight fares above this cap will be considered out of policy. You can also add customization to allow for different caps for different flight durations. 
+- **Lowest logical fare settings:** Set a preference for layovers, number of stops, flight time window, and airport connection changes. Expensify automatically takes these preferences into account when showing the lowest logical travel fare. 
+- **Add Ons and Preferences:** Select what types of add-ons your employees can book, including:
+  - Additional baggage
+  - Early check-in
+  - Seat preference
+  - No add-ons allowed
+- **Booking windows:** Add a time limit to prevent employees from booking less than a certain number of days in advance to prohibit bookings too close to the flight time.
+- **Refundable/changeable tickets:** Allow employees to book fully or partially refundable fares. To allow all options, you can leave this as the default option. 
+- **Maximum CO2 per kilometer:** If the CO2 per passenger km exceeds this threshold, the flight will be marked as out of policy. You can leave the entry blank if you do not wish to use this policy.
+- **Out of policy reason codes:** If enabled, travelers will be asked to enter a reason code for an out-of-policy flight booking. This gives them a way to provide context for why the booking is still being placed. You can also modify the reason codes by clicking Manage reason codes below the toggle.
+
+# Hotel
+
+- **Restrict booking by keyword:** Keywords entered here will be compared to the hotel rate description. If any of the keywords are found, the hotel rate will be restricted. You also have the option to provide a reason why each keyword is restricted. 
+- **Hotel rates not allowed to be booked:** Restrict specific hotel rates (such as non-refundable, prepaid, and requires deposit) from being booked by employees. This overrides all other hotel policy rules. You also have the option to add a reason why these options aren’t available. 
+- **Maximum price:** Set a maximum price per night for bookings. You can also select the Customizations by location option to set a maximum price for each location.
+- **Booking window:**  Add a time limit to prevent employees from booking less than a certain number of days in advance to prohibit bookings too close to the flight time.
+- **Cancellation policy:** Allow your employees to book fully or partially refundable rooms. To allow all options, you can leave this as the default option. 
+- **Experience:** Set hotel ratings that are in and out of policy.
+- **Nightly median rate:** Determine which hotels to consider when calculating the median price. You can set a radius around the search location and include/disclude hotels above or below a certain rating.
+- **Out of policy reason codes:** If enabled, travelers will be asked to enter a reason code for an out-of-policy hotel booking. This gives them a way to provide context for why the booking is still being placed. You can also modify the reason codes by clicking Manage reason codes below the toggle.
+
+# Car
+
+- **Car categories not allowed:** Restrict specific car types from being booked by employees. This overrides any other car policy.
+- **Car categories in policy:** Define the types of cars that are in policy. If you do not list a specific car category, it will still be booked as long as it isn’t included in the Car categories not allowed setting. However, the booking will be classed as out of policy. 
+- **Car engine types not allowed:** Restrict specific engine types from being booked by employees regardless of other policy settings. 
+- **Maximum price:** Set a daily price cap per car (not including taxes and fees).
+- **Out of policy reason codes:** If enabled, travelers will be asked to enter a reason code for an out-of-policy car booking. This gives them a way to provide context for why the booking is still being placed. You can also modify the reason codes by clicking Manage reason codes below the toggle.
+
+# FAQ
+
+How do travel policy rules interact with Expensify’s [approval flows](https://help.expensify.com/articles/expensify-classic/travel/Approve-travel-expenses)?
+
+Travel policy rules define what can and can’t be booked by your employees while they’re making the booking. Once a booking is placed and the travel itself is [approved](https://help.expensify.com/articles/expensify-classic/travel/Approve-travel-expenses), the expense will appear in Expensify. It will then be coded, submitted, pushed through the existing expense approval process as defined by your workspace, and exported to your preferred accounting platform (if applicable).
+
+</div>
diff --git a/docs/articles/new-expensify/travel/Edit-or-cancel-travel-arrangements.md b/docs/articles/new-expensify/travel/Edit-or-cancel-travel-arrangements.md
new file mode 100644
index 000000000000..7dc71c3220ca
--- /dev/null
+++ b/docs/articles/new-expensify/travel/Edit-or-cancel-travel-arrangements.md
@@ -0,0 +1,28 @@
+---
+title: Edit or cancel travel arrangements
+description: Modify travel arrangements booked with Expensify Travel
+---
+<div id="expensify-classic" markdown="1">
+
+Click **Get Support** on your emailed travel itinerary for real-time help with the booking. Any modifications, exchanges, or voidings made to a trip via support will incur a $25 booking change fee. 
+
+</div>
+
+<div id="new-expensify" markdown="1">
+  
+You can review your travel arrangements any time by opening the Trip chat in your inbox. For example, if you booked a flight to San Francisco, a “Trip to San Francisco” chat will be automatically added to your chat inbox.  
+
+To edit or cancel a travel arrangement,
+1. Click your profile image or icon in the bottom left menu. 
+2. Scroll down and click **Workspaces** in the left menu. 
+3. Select the workspace the travel is booked under.
+4. Tap into the booking to see more details. 
+5. Click **Trip Support**.
+
+If there is an unexpected change to the itinerary (for example, a flight cancellation), Expensify’s travel partner **Spotnana** will reach out to the traveler to provide updates on those changes. 
+
+{% include info.html %}
+You can click **Get Support** on your emailed travel itinerary for real-time help with the booking. Any modifications, exchanges, or voidings made to a trip via support will incur a $25 booking change fee.
+{% include end-info.html %}
+
+</div>
diff --git a/docs/articles/new-expensify/travel/Expensify-Travel-demo-video.md b/docs/articles/new-expensify/travel/Expensify-Travel-demo-video.md
new file mode 100644
index 000000000000..ceb40254c607
--- /dev/null
+++ b/docs/articles/new-expensify/travel/Expensify-Travel-demo-video.md
@@ -0,0 +1,8 @@
+---
+title: Expensify Travel demo video
+description: Check out a demo of Expensify Travel
+---
+
+Check out a video of how Expensify Travel works below:
+ 
+<iframe src="https://drive.google.com/file/d/125j1iFdce9VP6VkDZ609TrfaaSMzdc8M/preview" allowfullscreen width="560" height="315" allow="autoplay"></iframe>
diff --git a/docs/articles/new-expensify/travel/manage-travel-member-roles.md b/docs/articles/new-expensify/travel/manage-travel-member-roles.md
new file mode 100644
index 000000000000..954e24550f05
--- /dev/null
+++ b/docs/articles/new-expensify/travel/manage-travel-member-roles.md
@@ -0,0 +1,31 @@
+---
+title: Manage Travel Member Roles
+description: Modify member roles within Expensify Travel
+---
+<div id="expensify-classic" markdown="1">
+
+Admins can assign roles to different travel members to determine who they can book travel for (whether for themselves and/or for others) and whether they can adjust administrative settings.
+
+</div>
+
+<div id="new-expensify" markdown="1">
+  
+To assign a role to a travel member, 
+
+1. Click the + icon in the bottom left menu and select **Book travel**.
+2. Click **Book or manage travel**.
+3. Click the **Program** tab at the top and select Users.
+4. Click the name of the member whose role you wish to update.
+5. Click the **Roles** tab and select a role. 
+  - **Traveler**: Can only book travel for themselves.
+  - **Travel Arranger**: Can book travel for themselves and for other workspace members. Arrangers can be set to arrange travel for everyone in the workspace or for specific individuals only.
+  - **Company Admin**: Can book travel for themselves as well as any other workspace members. They can also access administrative features to:
+    - Define travel policies
+    - Add users 
+    - Remove users 
+    - Add and configure corporate cards as payment methods
+    - View analytics and metrics 
+    - Use the Safety feature
+6. Click **Save**. 
+
+</div>
diff --git a/docs/articles/new-expensify/workspaces/Create-expense-categories.md b/docs/articles/new-expensify/workspaces/Create-expense-categories.md
new file mode 100644
index 000000000000..80588aa95d63
--- /dev/null
+++ b/docs/articles/new-expensify/workspaces/Create-expense-categories.md
@@ -0,0 +1,134 @@
+---
+title: Create expense categories
+description: Add categories to use for coding expenses
+---
+<div id="new-expensify" markdown="1">
+
+In Expensify, categories refer to the **chart of accounts, GL accounts, expense accounts**, and other line-item details that help code expenses for accounting and financial reporting.
+
+An admin can manually create categories for a workspace, or they will be automatically imported if your workspace is connected to another platform such as QuickBooks Online, QuickBooks Desktop, Intacct, Xero, or NetSuite. These imported categories can be enabled or disabled to use as categories for expenses added to Expensify. Additionally, Expensify will learn how you apply categories to specific merchants over time and apply them automatically.
+
+![The Categories tab]({{site.url}}/assets/images/ExpensifyHelp_R3_Categories_1.png){:width="100%"}
+
+# Manually add or delete categories
+
+{% include selector.html values="desktop, mobile" %}
+
+{% include option.html value="desktop" %}
+To manually add a category,
+
+1. Click your profile image or icon in the bottom left menu.
+2. Scroll down and click **Workspaces** in the left menu. 
+3. Select the workspace you want to add categories to. 
+4. Click **Categories** in the left menu.
+5. Click **Add Category** in the top right. 
+6. Enter a name for the category and click **Save**.
+
+To delete a category, 
+
+1. Click the category on the Categories page. 
+2. Click the 3-dot menu in the top right. 
+3. Click **Delete category** to permanently delete the category. 
+{% include end-option.html %}
+
+{% include option.html value="mobile" %}
+To manually add a category,
+
+1. Tap your profile image or icon in the bottom menu.
+2. Tap **Workspaces**. 
+3. Select the workspace you want to add categories to.
+4. Tap **Categories**.
+5. Tap **Add Category**. 
+6. Enter a name for the category and tap **Save**. 
+
+To delete a category, 
+1. Tap the category on the Categories page. 
+2. Tap the 3-dot menu in the top right. 
+3. Tap **Delete category** to permanently delete the category.
+{% include end-option.html %}
+
+{% include end-selector.html %}
+
+# Enable or disable categories
+
+Once you have manually added your categories or automatically imported them from a connected accounting system, you can enable or disable the categories to determine whether they can be added to expenses. 
+
+{% include info.html %}
+Importing GL & payroll codes from your accounting system is only available on the Control plan. After connecting an accounting system, Expensify automatically imports charts of accounts, GL accounts, expense accounts, and additional details into your workspace as **disabled** categories. Workspace admins can enable these categories to make them available for workspace members to add to their expenses.
+{% include end-info.html %}
+
+To enable or disable a category, 
+
+{% include selector.html values="desktop, mobile" %}
+
+{% include option.html value="desktop" %}
+1. Click your profile image or icon in the bottom left menu.
+2. Scroll down and click **Workspaces** in the left menu. 
+3. Select a workspace. 
+4. Click **Categories** in the left menu.
+5. Click a category and use the toggle to enable or disable it.
+
+{% include info.html %}
+You can enable, disable, or delete categories in bulk by selecting the checkbox to the left of the categories. Then click the “selected” dropdown menu at the top right of the page and select the desired option. 
+{% include end-info.html %}
+
+{% include end-option.html %}
+
+{% include option.html value="mobile" %}
+1. Tap your profile image or icon in the bottom menu.
+2. Tap **Workspaces**. 
+3. Select a workspace. 
+4. Tap **Categories**.
+5. Tap a category and use the toggle to enable or disable it. 
+
+{% include info.html %}
+You can enable, disable, or delete categories in bulk by selecting the checkbox to the left of the categories. Then tap the “selected” dropdown menu at the top of the page and select the desired option.
+{% include end-info.html %}
+
+{% include end-option.html %}
+
+{% include end-selector.html %} 
+
+# Add or edit a GL code or payroll code
+
+If your workspace is on the Control plan, you can optionally add a GL code and payroll code to each category. Collect plan users will need to upgrade to Control for access to GL codes and payroll codes.
+
+GL codes and payroll codes can be exported to a CSV export. They are not displayed to users.
+
+**To edit GL codes or payroll codes for a category:**
+
+1. Click your profile image or icon in the bottom left menu
+2. Click **Workspaces** in the left menu
+3. Select a workspace
+4. Click **Categories**
+5. Click a category to open the category-settings
+6. To add or edit a GL code, click the GL code field, make the desired change, then click **Save**
+7. To add or edit a payroll code, click the payroll code field, make the desired change, then click **Save**
+
+
+
+# Automatic Expensify categories
+
+Over time, Expensify learns how you categorize specific merchants and automatically applies that category to the merchant in the future. 
+- If you change a category, Expensify learns that correction over time as well. However, changing a category on one expense does not change it for other expenses that have already been assigned the category.
+- Any expense rules for your workspace take priority over Expensify’s automatic categories. 
+- Expensify won’t automatically add a category to an expense if it is already manually assigned a category. 
+
+{% include faq-begin.md %}
+**Can I edit my categories on a submitted expense report?**
+
+Yes, you can edit categories on an expense you have submitted until the expense is approved or reimbursed. 
+
+Approvers can also edit categories on the submitter’s behalf, even after approval. If you are an approver reviewing a report that wasn’t submitted to you, you’ll see the option to take control of the report and then you can change the category. 
+
+**Can I see an audit trail of category changes on an expense?** 
+
+Yes. When a category is manually edited, Expensify will log the change in the related workspace chat. 
+
+**If I change categories in my accounting system, what happens to categories in the workspace?**
+
+If a category is disabled in the accounting system, it will be removed from the workspace’s categories list in the workspace. However, the disabled category will remain on approved and drafted expense reports that it has been previously added to. An admin can change the category on an approved or reimbursed expense, and anyone can change the category on an unapproved expense.
+
+{% include faq-end.md %}
+
+</div>
diff --git a/docs/articles/new-expensify/workspaces/Create-expense-tags.md b/docs/articles/new-expensify/workspaces/Create-expense-tags.md
new file mode 100644
index 000000000000..cc76b4016856
--- /dev/null
+++ b/docs/articles/new-expensify/workspaces/Create-expense-tags.md
@@ -0,0 +1,141 @@
+---
+title: Create expense tags
+description: Add tags to use for coding expenses
+---
+<div id="new-expensify" markdown="1">
+
+In Expensify, tags refer to **classes, projects, cost centers, locations, customers, jobs**, and other line-item details that help code expenses for accounting and financial reporting.
+
+An admin can manually create tags for a workspace, or they will be automatically imported if your workspace is connected to an accounting system, like QuickBooks Online or Xero. These imported tags can be enabled or disabled to use as tags for expenses added to Expensify. Additionally, Expensify will learn how you apply tags to specific merchants over time and apply them automatically.
+
+![The Tags tab]({{site.url}}/assets/images/ExpensifyHelp_R4_Tags_2.png){:width="100%"}
+
+# Manually add or delete tags
+
+{% include selector.html values="desktop, mobile" %}
+
+{% include option.html value="desktop" %}
+To manually add a tag,
+
+1. Click your profile image or icon in the bottom left menu.
+2. Scroll down and click **Workspaces** in the left menu. 
+3. Select the workspace you want to add tags to. 
+4. Click **More features** in the left menu.
+5. Scroll down to the Organize section and enable the Tags toggle.
+6. Click **Tags** in the left menu.
+7. Click **Add Tag** in the top right. 
+8. Enter a name for the tag and click **Save**.
+
+![The toggle to enable Tags]({{site.url}}/assets/images/ExpensifyHelp_R4_Tags_1.png){:width="100%"}
+
+To delete a tag, 
+
+1. Click the tag on the Tags page. 
+2. Click the 3-dot menu in the top right. 
+3. Click **Delete tag** to permanently delete the tag. 
+{% include end-option.html %}
+
+{% include option.html value="mobile" %}
+To manually add a tag,
+
+1. Tap your profile image or icon in the bottom menu.
+2. Tap **Workspaces**. 
+3. Select the workspace you want to add tags to.
+4. Tap **More features**.
+5. In the Organize section, enable the Tags toggle. 
+6. Tap **Tags**.
+7. Tap **Add Tag**. 
+8. Enter a name for the tag and tap **Save**. 
+
+To delete a tag, 
+1. Tap the tag on the Tags page. 
+2. Tap the 3-dot menu in the top right. 
+3. Tap **Delete tag** to permanently delete the tag.
+{% include end-option.html %}
+
+{% include end-selector.html %}
+ 
+# Enable or disable tags
+
+Once you have manually added your tags or automatically imported them from a connected accounting system, you can enable or disable the tags to determine whether they can be added to expenses. 
+
+{% include info.html %}
+After connecting an accounting system, Expensify automatically imports classes, projects, customers, and additional details into your workspace as disabled tags. Workspace admins can enable these tags to make them available for workspace members to add to their expenses.
+{% include end-info.html %}
+
+To enable or disable a tag, 
+
+{% include selector.html values="desktop, mobile" %}
+
+{% include option.html value="desktop" %}
+1. Click your profile image or icon in the bottom left menu.
+2. Scroll down and click **Workspaces** in the left menu. 
+3. Select a workspace. 
+4. Click **Tags** in the left menu.
+5. Click a tag and use the toggle to enable or disable it.
+
+{% include info.html %}
+You can enable, disable, or delete tags in bulk by selecting the checkbox to the left of the tags. Then click the “selected” dropdown menu at the top right of the page and select the desired option.
+{% include end-info.html %}
+
+{% include end-option.html %}
+
+{% include option.html value="mobile" %}
+1. Tap your profile image or icon in the bottom menu.
+2. Tap **Workspaces**. 
+3. Select a workspace. 
+4. Tap **Tags**.
+5. Tap a tag and use the toggle to enable or disable it. 
+
+{% include info.html %}
+You can enable, disable, or delete tags in bulk by selecting the checkbox to the left of the tag. Then tap the “selected” dropdown menu at the top of the page and select the desired option.
+{% include end-info.html %}
+
+{% include end-option.html %}
+
+{% include end-selector.html %} 
+
+# Add or edit a GL code or payroll code
+
+If your workspace is on the Control plan, you can optionally add a GL code and payroll code to each category. Collect plan users will need to upgrade to Control for access to GL codes and payroll codes.
+
+GL codes and payroll codes can be exported to a CSV export. They are not displayed to users.
+
+**To edit GL codes or payroll codes for a category:**
+
+1. Click your profile image or icon in the bottom left menu
+2. Click **Workspaces** in the left menu
+3. Select a workspace
+4. Click **Categories**
+5. Click a category to open the category-settings
+6. To add or edit a GL code, click the GL code field, make the desired change, then click **Save**
+7. To add or edit a payroll code, click the payroll code field, make the desired change, then click **Save**
+
+# Automatic Expensify tags
+
+Over time, Expensify learns how you tag specific merchants and automatically applies that tag to the merchant in the future. 
+- If you change a tag, Expensify learns that correction over time as well. However, changing a tag on one expense does not change it for other expenses that have already been assigned the tag.
+- Any expense rules for your workspace take priority over Expensify’s automatic tags. 
+- Expensify won’t automatically tag an expense if it is already manually assigned a tag. 
+
+{% include faq-begin.md %}
+**Can I edit my tags on a submitted expense report?**
+
+Yes, you can edit tags on an expense you have submitted until the expense is approved or reimbursed. 
+
+Approvers can also edit tags on the submitter’s behalf, even after approval. If you are an approver reviewing a report that wasn’t submitted to you, you’ll see the option to take control of the report and then you can change the tag. 
+
+**Can I see an audit trail of tag changes on an expense?** 
+
+Yes. When a tag is manually edited, Expensify will log the change in the related workspace chat. 
+
+**If I change tags in my accounting system, what happens to tags in the workspace?**
+
+If a tag is disabled in the accounting system, it will be removed from the workspace’s tags list in the workspace. However, the disabled tag will remain on approved and drafted expense reports that it has been previously added to. An admin can change the tag on an approved or reimbursed expense, and anyone can change the tag on an unapproved expense.
+
+**Can I set up multi-level tags in New Expensify?**
+
+At this time, only single-level tags are available in New Expensify. If you’ve used multi-level tags in Expensify Classic, you will see the first-level tag in New Expensify. Multi-level tags are under development.
+{% include faq-end.md %}
+
+</div>
diff --git a/docs/articles/new-expensify/workspaces/Require-tags-and-categories-for-expenses.md b/docs/articles/new-expensify/workspaces/Require-tags-and-categories-for-expenses.md
new file mode 100644
index 000000000000..8f2cf0897ad0
--- /dev/null
+++ b/docs/articles/new-expensify/workspaces/Require-tags-and-categories-for-expenses.md
@@ -0,0 +1,39 @@
+---
+title: Require tags and categories for expenses
+description: Make tags and/or categories required for all expenses
+---
+<div id="new-expensify" markdown="1">
+
+To require workspace members to add tags and/or categories to their expenses, 
+
+{% include selector.html values="desktop, mobile" %}
+
+{% include option.html value="desktop" %}
+1. Click your profile image or icon in the bottom left menu.
+2. Scroll down and click **Workspaces** in the left menu. 
+3. Select a workspace. 
+4. Click **Tags** or **Categories** in the left menu.
+5. Click **Settings** at the top right of the page. 
+6. Enable the “Members must tag/categorize all expenses" toggle. 
+7. If desired, repeat steps 4-6 for tags or categories (whichever you haven’t done yet).
+{% include end-option.html %}
+
+{% include option.html value="mobile" %}
+1. Tap your profile image or icon in the bottom menu.
+2. Tap **Workspaces**. 
+3. Select a workspace. 
+4. Tap **Tags** or **Categories**.
+5. Tap **Settings** at the top right of the page. 
+6. Enable the “Members must tag/categorize all expenses" toggle. 
+7. If desired, repeat steps 4-6 for tags or categories (whichever you haven’t done yet).
+{% include end-option.html %}
+
+{% include end-selector.html %}
+   
+This will highlight the tag and/or category field as required on all expenses. 
+
+{% include info.html %}
+Expenses will still be able to be submitted without a tag and/or category even if they are set as required. The submitter and approver will see an orange dot on the expense details alerting them that the tag/category is missing.
+{% include end-info.html %}
+
+</div>
diff --git a/docs/articles/new-expensify/workspaces/The-Free-Plan.md b/docs/articles/new-expensify/workspaces/The-Free-Plan.md
deleted file mode 100644
index b036c5b087d2..000000000000
--- a/docs/articles/new-expensify/workspaces/The-Free-Plan.md
+++ /dev/null
@@ -1,149 +0,0 @@
----
-title: The Free Plan
-description: Everything you need to know about Expensify's Free Plan!
-redirect_from: articles/split-bills/workspaces/The-Free-Plan/
----
-
-<!-- The lines above are required by Jekyll to process the .md file -->
-
-# What is the Free Plan?
-The free plan is ideal for start-ups and small businesses to manage expenses. With the Free Plan, a workspace admin can set their team up with Expensify Cards, reimburse cash expenses, send invoices, and manage bills, all for free! You will have total visibility and control over all spending associated with your workspace in real time.
-
-# Features Included with the Free Plan
-- Expensify Cards for all employees
-- Invoicing
-- Bill Pay
-- Unlimited receipt scanning for everyone in the company
-- Free next-day ACH reimbursements for cash expenses
-- Up to 4% [cash back](https://community.expensify.com/discussion/8454/4-cash-back-on-the-expensify-card-is-here-to-stay)
-- Free corporate travel booking
-
-# Setting Up the Free Plan
-- Navigate to new.expensify.com, enter your company email address, and set a password
-- Click the **green “+”** button and select **_New workspace_**
-
-Once you’ve created your Workspace, you will receive a message from Concierge encouraging you to chat with your Setup Specialist. Click the link in the message, and your designated Setup Specialist will guide you through how to configure your company setup.
-
-Once you’ve completed your company setup, you should have completed the following tasks:
-
-- Connected a business bank account (Settings menu > Click **_Bank account_** and follow the prompts).
-- Invited members to the workspace
-- Assigned Expensify Cards
-
-# Inviting Members to the Free Plan
-- Navigate to the Settings Menu and click **_Members_** to invite your team. You can invite employees one at a time, or you can invite multiple users by listing out their email addresses separated by a comma
-- To use the Expensify Card, you must invite them to your workspace via your company email address (i.e., admin@companyemail.com and NOT admin@gmail.com).
-
-# Managing the Free Plan
-## Workspace Settings
-
-To access your workspace settings, click your profile icon and then on your workspace name. This settings menu allows you to manage your workspace members, issue additional Expensify Cards, and utilize this plan’s various bill pay and payment options.
-
-## Paying an Expense Report
-- Once a user creates an expense it will automatically be shared with you in a Processing report.
-- Pay expenses directly through Expensify by choosing ‘Reimburse > via Direct Deposit (ACH)` in a report on www.expensify.com or by choosing ‘Pay with Expensify’ in a payment request on new.expensify.com.
-- Notify your user that you’ll pay them manually outside of Expensify by choosing ‘Reimburse > I’ll do it manually’ in a report on www.expensify.com or choosing ‘Pay Elsewhere’ in a payment request on new.expensify.com.
-- Reports with only non-reimbursable expenses on them have the option to ‘Mark as Closed’ in the report on www.expensify.com or ‘Mark as Done’ in the payment request on new.expensify.com.
-
-## Changing Submitted Expenses
-
-Request an edit an expense or remove an expense before you pay, you can let your user know by making a comment in the Report History section of their Processing report or chatting with them on new.expensify.com.
-
-# Managing Expenses
-
-## Creating an Expense
-- You can create an expense either by swiping the Expensify card or just smartscan a receipt!
-- Once you create an expense it will be automatically added to a report and shared with your admin.
-- You can edit or delete any expense that hasn’t been paid or closed by your admin.
-
-## Getting paid for Expenses
-- Automatic submission is already set up, so your admin can pay you back immediately once you create an expense.
-- Your admin will get a notification when you send them a new expense, but you can also remind them to pay you by making a comment in the Report History section of your Processing report or chatting with them on new.expensify.com.
-
-{% include faq-begin.md %}
-
-## Do I need a business bank account to use the Free Plan?
-
-You will need a US business checking account if you want to enable the Expensify Card and set up direct ACH reimbursement.
-You will need to take a few steps to verify your business bank account and connect it to Expensify. You will also need to set aside some time and have your ID ready.
-If you're not in the US, you can still use the Free Plan, but the Expensify Card and direct reimbursement will not be available.
-
-## Can my workspace have more than one Admin?
-
-The Expensify Workplace only allows for one admin (the workspace creator).
-
-## I am on a paid plan, can I switch to a Free Plan?
-
-You can set up a Free Plan, but you must honor any active subscription you have also. If you're on a paid plan, it is likely you want more functionality than what the Free Plan offers such as a direct connection with an accounting integration and approval workflows.
-
-## Can I get cashback on Expensify Card purchases if I have a free plan?
-
-You can get 1% credited back to your settlement account once you spend over $25,000 per month across all cards and 2% when you spend over $250,000!
-
-## Can I switch the workspace currency on the Free Plan? It looks set to USD
-
-Yes, you can change the currency of the Free Plan by going to Avatar > [Workspace Name] > General settings > Default currency.
-
-We do require a US business bank account for reimbursements and Expensify Card settlements though, so if you have a business bank account linked to your account, then the currency of the Free Plan will be USD.
-
-## Is a free plan available to people outside the USA?
-
-Yes! You can use the free plan anywhere in the world to track expenses, send invoices etc. Just remember, anything that requires a verified business bank account (such as ACH reimbursement and the Expensify Card) is only available to those with a US checking account!
-
-## Can I integrate the free plan with my accounting package?
-
-No. In order to use our accounting sync, you will need to update to a paid plan
-
-## With the Free Plan, can I add my own categories?
-
-Categories are standardized on the Free Plan and can’t be edited. Custom categories and tags or accounting system integration are available on a paid plan.
-
-## 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.
-
-## Can I change the mileage rate or unit used for distance tracking?
-
-Yes. The workspace admin can access the rate and unit settings by going to Avatar > [Workspace name] > Reimburse expenses > Track distance.
-
-## Can I add non-Expensify cardholders to my Workspace?
-
-Yes. You can invite any user to your Workspace. Just click invite and enter their email and they will be invited to download the app and join!
-
-## Expenses are automatically shared with the admin on a Processing report on the Free Plan, can I change this?
-
-No. Expense reports submitted on the Free Plan are set to submit automatically and do not allow for approvals. Different Scheduled Submit settings are available on our paid plans.
-
-## How do I give a user I invited to my Workspace an Expensify Card?
-
-You can give a user an Expensify Card by going to the Company Cards Page on expensify.com and setting a card limit >$0. Please note that in order to give a user a card, they must be using a private company email address (i.e. name@companyname.com NOT name@gmail.com)
-
-## Can I use a different bank account to the one I have added for some of the features in the workspace?
-
-No. The bank account you have added will be used to issue corporate cards, reimburse expenses, collect invoices, and pay bills!
-
-## Can I upgrade my Free Workspace to a Paid Workspace or do I need to create a new one?
-
-There is no way to upgrade a workspace, so you would need to create a new Workspace. Paid workspaces have more functionalities than what the Free Plan offers, such as a direct connection with an accounting integration and approval workflows.
-
-## Can I create more than one Processing report at a time?
-
-No. To keep things simple, we only allow one Processing report per user at a time. If you need to have more than one report at a time, our paid plans support unlimited reports.
-
-## A user has added an expense I need to change before I pay it, how do I let them know?
-
-Users can edit and delete expenses on Processing reports. If you need something changed, let them know by commenting in the Report History section of the report on expensify.com or by chatting with them in new.expensify.com.
-
-## Can I ‘Reopen’ a report once it’s Reimbursed or Closed?
-
-No. Once an admin reimburses or closes a report, it cannot be ‘reopened’, but you can always comment on a report to add context.
-
-## I accidentally reimbursed a report too soon. Can I cancel the reimbursement?
-
-Depending on how quickly you report it to us, we may be able to help cancel a reimbursement. Chat Concierge to see if we can help cancel a reimbursement.
-
-## As an admin, can I edit users’ expenses and delete them from reports?
-
-No. Only users can edit and delete expenses on the Free plan. Admin control of submitted expenses on a workspace is a feature of our paid plans. If you need something changed, let the user know by commenting in the Report History section of the report on www.expensify.com or by chatting with them in new.expensify.com.
-
-{% include faq-end.md %}
diff --git a/docs/articles/new-expensify/workspaces/Track-taxes.md b/docs/articles/new-expensify/workspaces/Track-taxes.md
new file mode 100644
index 000000000000..fb4077679350
--- /dev/null
+++ b/docs/articles/new-expensify/workspaces/Track-taxes.md
@@ -0,0 +1,66 @@
+---
+title: Track taxes
+description: Set up tax rates in your Expensify workspace
+---
+<div id="new-expensify" markdown="1">
+
+# Track taxes
+
+Each Expensify workspace can be configured with one or more tax rates. Once tax rates are enabled on your workspace, all expenses will have a default tax rate applied based on the currency, and employees will be able to select the correct tax rate for each expense.
+
+Tax rates are only available on the Control plan. Collect plan users will need to upgrade to Control for access to tag tax codes.
+
+## Enable taxes on a workspace
+
+Tax codes are only available on the Control plan. Taxes can be enabled on any workspace where the default currency is not USD. Please note that if you have a direct accounting integration, tax rates will be managed through the integration and cannot be manually enabled or disabled using the instructions below.
+
+**To enable taxes on your workspace:**
+
+1. Click your profile image or icon in the bottom left menu
+2. Click **Workspaces** in the left menu
+3. Select the workspace where you want to enable tax codes
+4. Click **More features** in the left menu
+5. Click the toggle next to **Taxes**
+
+After toggling on taxes, you will see a new **Taxes** option in the left menu.
+
+## Manually add, delete, or edit tax rates
+
+**To manually add a tax rate:**
+
+1. Click your profile image or icon in the bottom left menu
+2. Scroll down and click **Workspaces** in the left menu
+3. Select the workspace where you want to add tax codes
+4. Click **Taxes** in the left menu
+5. Click **Add rate** in the top right
+6. Enter a name, value, and tax code, then click **Save**
+
+**To enable, disable, edit or delete a single tax rate:**
+
+1. Click the tax rate on the **Taxes** settings page
+2. To enable or disable the tax rate, click the toggle next to **Enable rate**, then click **Save**
+3. To edit the name, value, or tax code, click into the **Name**, **Value**, or **Tax Code** field, then click **Save**
+4. To permanently delete the tax rate, click **Delete**
+
+Please note: The workspace currency default rate cannot be deleted or disabled.
+
+**To enable, disable, or delete tax rates in bulk:**
+
+1. On the **Taxes** settings page, click the checkboxes next to the tax rates you'd like to delete
+2. Click "x selected" in the top right
+3. To enable or disable all the selected tax rates, click **Enable rates** or **Disable rates**
+4. To permanently delete the tax rates, click **Delete rates**
+
+Please note: The workspace currency default rate cannot be deleted or disabled.
+
+## Change the default tax rates
+
+After enabling taxes in your workspace, you can set two default rates:
+
+- **Workspace currency default:** Any expenses created in the workspace default currency will default to this tax rate. Employees can select a different tax rate if applicable.
+- **Foreign currency default:** Expenses created in any currency besides the workspace default currency will default to this tax rate. Employees can select a different tax rate if applicable.
+
+**To change the default tax rates:**
+
+1. On the **Taxes** settings page, click **Settings** in the top right
+2. Click **Workspace currency default** or **Foreign currency default** and select the desired tax rate
diff --git a/docs/assets/Files/Dependent+with+GL+codes+format.csv b/docs/assets/Files/Dependent+with+GL+codes+format.csv
new file mode 100644
index 000000000000..830cc1a77f83
--- /dev/null
+++ b/docs/assets/Files/Dependent+with+GL+codes+format.csv
@@ -0,0 +1 @@
+State,State GL,Region,Region GL,City,City GL
California,100,North,20,San Francisco,1
California,100,North,20,Oakland,2
California,100,South,30,Los Angeles,3
California,100,South,30,San Diego,4
\ No newline at end of file
diff --git a/docs/assets/Files/Dependent+without+GL+codes+format.csv b/docs/assets/Files/Dependent+without+GL+codes+format.csv
new file mode 100644
index 000000000000..394dbfd82dce
--- /dev/null
+++ b/docs/assets/Files/Dependent+without+GL+codes+format.csv
@@ -0,0 +1 @@
+State,Region,City
California,North,San Francisco
California,North,Oakland
California,South,Los Angeles
California,South,San Diego
\ No newline at end of file
diff --git a/docs/assets/Files/Germany-per-diem.csv b/docs/assets/Files/Germany-per-diem.csv
new file mode 100644
index 000000000000..217cc0a2fed1
--- /dev/null
+++ b/docs/assets/Files/Germany-per-diem.csv
@@ -0,0 +1,1417 @@
+Destination,Currency,Subrate,Amount
+Afghanistan,EUR,Full Day,30
+Afghanistan,EUR,Part Day,20
+Afghanistan,EUR,Overnight,95
+Afghanistan,EUR,Breakfast,-6
+Afghanistan,EUR,Lunch,-12
+Afghanistan,EUR,Dinner,-12
+Albania,EUR,Full Day,29
+Albania,EUR,Part Day,20
+Albania,EUR,Overnight,113
+Albania,EUR,Breakfast,-5.8
+Albania,EUR,Lunch,-11.6
+Albania,EUR,Dinner,-11.6
+Algeria,EUR,Full Day,51
+Algeria,EUR,Part Day,34
+Algeria,EUR,Overnight,173
+Algeria,EUR,Breakfast,-10.2
+Algeria,EUR,Lunch,-20.4
+Algeria,EUR,Dinner,-20.4
+Andorra,EUR,Full Day,34
+Andorra,EUR,Part Day,23
+Andorra,EUR,Overnight,45
+Andorra,EUR,Breakfast,-6.8
+Andorra,EUR,Lunch,-13.6
+Andorra,EUR,Dinner,-13.6
+Angola,EUR,Full Day,77
+Angola,EUR,Part Day,52
+Angola,EUR,Overnight,265
+Angola,EUR,Breakfast,-15.4
+Angola,EUR,Lunch,-30.8
+Angola,EUR,Dinner,-30.8
+Antigua and Barbuda,EUR,Full Day,45
+Antigua and Barbuda,EUR,Part Day,30
+Antigua and Barbuda,EUR,Overnight,177
+Antigua and Barbuda,EUR,Breakfast,-9
+Antigua and Barbuda,EUR,Lunch,-18
+Antigua and Barbuda,EUR,Dinner,-18
+Argentina,EUR,Full Day,34
+Argentina,EUR,Part Day,23
+Argentina,EUR,Overnight,144
+Argentina,EUR,Breakfast,-6.8
+Argentina,EUR,Lunch,-13.6
+Argentina,EUR,Dinner,-13.6
+Armenia,EUR,Full Day,23
+Armenia,EUR,Part Day,16
+Armenia,EUR,Overnight,63
+Armenia,EUR,Breakfast,-4.6
+Armenia,EUR,Lunch,-9.2
+Armenia,EUR,Dinner,-9.2
+Australia - Canberra,EUR,Full Day,51
+Australia - Canberra,EUR,Part Day,34
+Australia - Canberra,EUR,Overnight,158
+Australia - Canberra,EUR,Breakfast,-10.2
+Australia - Canberra,EUR,Lunch,-20.4
+Australia - Canberra,EUR,Dinner,-20.4
+Australia - Sydney,EUR,Full Day,68
+Australia - Sydney,EUR,Part Day,45
+Australia - Sydney,EUR,Overnight,184
+Australia - Sydney,EUR,Breakfast,-13.6
+Australia - Sydney,EUR,Lunch,-27.2
+Australia - Sydney,EUR,Dinner,-27.2
+Australia - for the rest,EUR,Full Day,51
+Australia - for the rest,EUR,Part Day,34
+Australia - for the rest,EUR,Overnight,158
+Australia - for the rest,EUR,Breakfast,-10.2
+Australia - for the rest,EUR,Lunch,-20.4
+Australia - for the rest,EUR,Dinner,-20.4
+Austria,EUR,Full Day,40
+Austria,EUR,Part Day,27
+Austria,EUR,Overnight,108
+Austria,EUR,Breakfast,-8
+Austria,EUR,Lunch,-16
+Austria,EUR,Dinner,-16
+Azerbaijan,EUR,Full Day,30
+Azerbaijan,EUR,Part Day,20
+Azerbaijan,EUR,Overnight,72
+Azerbaijan,EUR,Breakfast,-6
+Azerbaijan,EUR,Lunch,-12
+Azerbaijan,EUR,Dinner,-12
+Bahrain,EUR,Full Day,45
+Bahrain,EUR,Part Day,30
+Bahrain,EUR,Overnight,180
+Bahrain,EUR,Breakfast,-9
+Bahrain,EUR,Lunch,-18
+Bahrain,EUR,Dinner,-18
+Bangladesh,EUR,Full Day,30
+Bangladesh,EUR,Part Day,20
+Bangladesh,EUR,Overnight,111
+Bangladesh,EUR,Breakfast,-6
+Bangladesh,EUR,Lunch,-12
+Bangladesh,EUR,Dinner,-12
+Barbados,EUR,Full Day,52
+Barbados,EUR,Part Day,35
+Barbados,EUR,Overnight,165
+Barbados,EUR,Breakfast,-10.4
+Barbados,EUR,Lunch,-20.8
+Barbados,EUR,Dinner,-20.8
+Belarus,EUR,Full Day,20
+Belarus,EUR,Part Day,13
+Belarus,EUR,Overnight,98
+Belarus,EUR,Breakfast,-4
+Belarus,EUR,Lunch,-8
+Belarus,EUR,Dinner,-8
+Belgium,EUR,Full Day,42
+Belgium,EUR,Part Day,28
+Belgium,EUR,Overnight,135
+Belgium,EUR,Breakfast,-8.4
+Belgium,EUR,Lunch,-16.8
+Belgium,EUR,Dinner,-16.8
+Benin,EUR,Full Day,40
+Benin,EUR,Part Day,27
+Benin,EUR,Overnight,101
+Benin,EUR,Breakfast,-8
+Benin,EUR,Lunch,-16
+Benin,EUR,Dinner,-16
+Bolivia,EUR,Full Day,30
+Bolivia,EUR,Part Day,20
+Bolivia,EUR,Overnight,93
+Bolivia,EUR,Breakfast,-6
+Bolivia,EUR,Lunch,-12
+Bolivia,EUR,Dinner,-12
+Bosnia and Herzegovina,EUR,Full Day,18
+Bosnia and Herzegovina,EUR,Part Day,12
+Bosnia and Herzegovina,EUR,Overnight,73
+Bosnia and Herzegovina,EUR,Breakfast,-3.6
+Bosnia and Herzegovina,EUR,Lunch,-7.2
+Bosnia and Herzegovina,EUR,Dinner,-7.2
+Botswana,EUR,Full Day,40
+Botswana,EUR,Part Day,27
+Botswana,EUR,Overnight,102
+Botswana,EUR,Breakfast,-8
+Botswana,EUR,Lunch,-16
+Botswana,EUR,Dinner,-16
+Brazil - Brasilia,EUR,Full Day,57
+Brazil - Brasilia,EUR,Part Day,38
+Brazil - Brasilia,EUR,Overnight,127
+Brazil - Brasilia,EUR,Breakfast,-11.4
+Brazil - Brasilia,EUR,Lunch,-22.8
+Brazil - Brasilia,EUR,Dinner,-22.8
+Brazil - Rio de Janeiro,EUR,Full Day,57
+Brazil - Rio de Janeiro,EUR,Part Day,38
+Brazil - Rio de Janeiro,EUR,Overnight,145
+Brazil - Rio de Janeiro,EUR,Breakfast,-11.4
+Brazil - Rio de Janeiro,EUR,Lunch,-22.8
+Brazil - Rio de Janeiro,EUR,Dinner,-22.8
+Brazil - São Paulo,EUR,Full Day,53
+Brazil - São Paulo,EUR,Part Day,36
+Brazil - São Paulo,EUR,Overnight,132
+Brazil - São Paulo,EUR,Breakfast,-10.6
+Brazil - São Paulo,EUR,Lunch,-21.2
+Brazil - São Paulo,EUR,Dinner,-21.2
+Brazil - for the rest,EUR,Full Day,51
+Brazil - for the rest,EUR,Part Day,34
+Brazil - for the rest,EUR,Overnight,84
+Brazil - for the rest,EUR,Breakfast,-10.2
+Brazil - for the rest,EUR,Lunch,-20.4
+Brazil - for the rest,EUR,Dinner,-20.4
+Brunei,EUR,Full Day,48
+Brunei,EUR,Part Day,32
+Brunei,EUR,Overnight,106
+Brunei,EUR,Breakfast,-9.6
+Brunei,EUR,Lunch,-19.2
+Brunei,EUR,Dinner,-19.2
+Bulgaria,EUR,Full Day,22
+Bulgaria,EUR,Part Day,15
+Bulgaria,EUR,Overnight,90
+Bulgaria,EUR,Breakfast,-4.4
+Bulgaria,EUR,Lunch,-8.8
+Bulgaria,EUR,Dinner,-8.8
+Burkina Faso,EUR,Full Day,44
+Burkina Faso,EUR,Part Day,29
+Burkina Faso,EUR,Overnight,84
+Burkina Faso,EUR,Breakfast,-8.8
+Burkina Faso,EUR,Lunch,-17.6
+Burkina Faso,EUR,Dinner,-17.6
+Burundi,EUR,Full Day,47
+Burundi,EUR,Part Day,32
+Burundi,EUR,Overnight,98
+Burundi,EUR,Breakfast,-9.4
+Burundi,EUR,Lunch,-18.8
+Burundi,EUR,Dinner,-18.8
+Cambodia,EUR,Full Day,38
+Cambodia,EUR,Part Day,25
+Cambodia,EUR,Overnight,94
+Cambodia,EUR,Breakfast,-7.6
+Cambodia,EUR,Lunch,-15.2
+Cambodia,EUR,Dinner,-15.2
+Cameroon,EUR,Full Day,50
+Cameroon,EUR,Part Day,33
+Cameroon,EUR,Overnight,180
+Cameroon,EUR,Breakfast,-10
+Cameroon,EUR,Lunch,-20
+Cameroon,EUR,Dinner,-20
+Canada - Ottawa,EUR,Full Day,47
+Canada - Ottawa,EUR,Part Day,32
+Canada - Ottawa,EUR,Overnight,142
+Canada - Ottawa,EUR,Breakfast,-9.4
+Canada - Ottawa,EUR,Lunch,-18.8
+Canada - Ottawa,EUR,Dinner,-18.8
+Canada - Toronto,EUR,Full Day,51
+Canada - Toronto,EUR,Part Day,34
+Canada - Toronto,EUR,Overnight,161
+Canada - Toronto,EUR,Breakfast,-10.2
+Canada - Toronto,EUR,Lunch,-20.4
+Canada - Toronto,EUR,Dinner,-20.4
+Canada - Vancouver,EUR,Full Day,50
+Canada - Vancouver,EUR,Part Day,33
+Canada - Vancouver,EUR,Overnight,140
+Canada - Vancouver,EUR,Breakfast,-10
+Canada - Vancouver,EUR,Lunch,-20
+Canada - Vancouver,EUR,Dinner,-20
+Canada - for the rest,EUR,Full Day,47
+Canada - for the rest,EUR,Part Day,32
+Canada - for the rest,EUR,Overnight,134
+Canada - for the rest,EUR,Breakfast,-9.4
+Canada - for the rest,EUR,Lunch,-18.8
+Canada - for the rest,EUR,Dinner,-18.8
+Cape Verde,EUR,Full Day,30
+Cape Verde,EUR,Part Day,20
+Cape Verde,EUR,Overnight,105
+Cape Verde,EUR,Breakfast,-6
+Cape Verde,EUR,Lunch,-12
+Cape Verde,EUR,Dinner,-12
+Central African Republic,EUR,Full Day,46
+Central African Republic,EUR,Part Day,31
+Central African Republic,EUR,Overnight,74
+Central African Republic,EUR,Breakfast,-9.2
+Central African Republic,EUR,Lunch,-18.4
+Central African Republic,EUR,Dinner,-18.4
+Chad,EUR,Full Day,64
+Chad,EUR,Part Day,43
+Chad,EUR,Overnight,163
+Chad,EUR,Breakfast,-12.8
+Chad,EUR,Lunch,-25.6
+Chad,EUR,Dinner,-25.6
+Chile,EUR,Full Day,44
+Chile,EUR,Part Day,29
+Chile,EUR,Overnight,187
+Chile,EUR,Breakfast,-8.8
+Chile,EUR,Lunch,-17.6
+Chile,EUR,Dinner,-17.6
+China - Beijing,EUR,Full Day,46
+China - Beijing,EUR,Part Day,31
+China - Beijing,EUR,Overnight,142
+China - Beijing,EUR,Breakfast,-9.2
+China - Beijing,EUR,Lunch,-18.4
+China - Beijing,EUR,Dinner,-18.4
+China - Canton,EUR,Full Day,40
+China - Canton,EUR,Part Day,27
+China - Canton,EUR,Overnight,113
+China - Canton,EUR,Breakfast,-8
+China - Canton,EUR,Lunch,-16
+China - Canton,EUR,Dinner,-16
+China - Chengdu,EUR,Full Day,35
+China - Chengdu,EUR,Part Day,24
+China - Chengdu,EUR,Overnight,105
+China - Chengdu,EUR,Breakfast,-7
+China - Chengdu,EUR,Lunch,-14
+China - Chengdu,EUR,Dinner,-14
+China - Hong Kong,EUR,Full Day,74
+China - Hong Kong,EUR,Part Day,49
+China - Hong Kong,EUR,Overnight,145
+China - Hong Kong,EUR,Breakfast,-14.8
+China - Hong Kong,EUR,Lunch,-29.6
+China - Hong Kong,EUR,Dinner,-29.6
+China - Shanghai,EUR,Full Day,50
+China - Shanghai,EUR,Part Day,33
+China - Shanghai,EUR,Overnight,128
+China - Shanghai,EUR,Breakfast,-10
+China - Shanghai,EUR,Lunch,-20
+China - Shanghai,EUR,Dinner,-20
+China - for the rest,EUR,Full Day,50
+China - for the rest,EUR,Part Day,33
+China - for the rest,EUR,Overnight,78
+China - for the rest,EUR,Breakfast,-10
+China - for the rest,EUR,Lunch,-20
+China - for the rest,EUR,Dinner,-20
+Colombia,EUR,Full Day,41
+Colombia,EUR,Part Day,28
+Colombia,EUR,Overnight,126
+Colombia,EUR,Breakfast,-8.2
+Colombia,EUR,Lunch,-16.4
+Colombia,EUR,Dinner,-16.4
+"Congo, Democratic Republic",EUR,Full Day,68
+"Congo, Democratic Republic",EUR,Part Day,45
+"Congo, Democratic Republic",EUR,Overnight,171
+"Congo, Democratic Republic",EUR,Breakfast,-13.6
+"Congo, Democratic Republic",EUR,Lunch,-27.2
+"Congo, Democratic Republic",EUR,Dinner,-27.2
+"Congo, Republic",EUR,Full Day,50
+"Congo, Republic",EUR,Part Day,33
+"Congo, Republic",EUR,Overnight,200
+"Congo, Republic",EUR,Breakfast,-10
+"Congo, Republic",EUR,Lunch,-20
+"Congo, Republic",EUR,Dinner,-20
+Costa Rica,EUR,Full Day,47
+Costa Rica,EUR,Part Day,32
+Costa Rica,EUR,Overnight,93
+Costa Rica,EUR,Breakfast,-9.4
+Costa Rica,EUR,Lunch,-18.8
+Costa Rica,EUR,Dinner,-18.8
+Côte d’Ivoire,EUR,Full Day,51
+Côte d’Ivoire,EUR,Part Day,34
+Côte d’Ivoire,EUR,Overnight,146
+Côte d’Ivoire,EUR,Breakfast,-10.2
+Côte d’Ivoire,EUR,Lunch,-20.4
+Côte d’Ivoire,EUR,Dinner,-20.4
+Croatia,EUR,Full Day,28
+Croatia,EUR,Part Day,19
+Croatia,EUR,Overnight,75
+Croatia,EUR,Breakfast,-5.6
+Croatia,EUR,Lunch,-11.2
+Croatia,EUR,Dinner,-11.2
+Cuba,EUR,Full Day,46
+Cuba,EUR,Part Day,31
+Cuba,EUR,Overnight,228
+Cuba,EUR,Breakfast,-9.2
+Cuba,EUR,Lunch,-18.4
+Cuba,EUR,Dinner,-18.4
+Cyprus,EUR,Full Day,45
+Cyprus,EUR,Part Day,30
+Cyprus,EUR,Overnight,116
+Cyprus,EUR,Breakfast,-9
+Cyprus,EUR,Lunch,-18
+Cyprus,EUR,Dinner,-18
+Czech Republic,EUR,Full Day,35
+Czech Republic,EUR,Part Day,24
+Czech Republic,EUR,Overnight,94
+Czech Republic,EUR,Breakfast,-7
+Czech Republic,EUR,Lunch,-14
+Czech Republic,EUR,Dinner,-14
+Denmark,EUR,Full Day,58
+Denmark,EUR,Part Day,39
+Denmark,EUR,Overnight,143
+Denmark,EUR,Breakfast,-11.6
+Denmark,EUR,Lunch,-23.2
+Denmark,EUR,Dinner,-23.2
+Djibouti,EUR,Full Day,65
+Djibouti,EUR,Part Day,44
+Djibouti,EUR,Overnight,305
+Djibouti,EUR,Breakfast,-13
+Djibouti,EUR,Lunch,-26
+Djibouti,EUR,Dinner,-26
+Dominica,EUR,Full Day,45
+Dominica,EUR,Part Day,30
+Dominica,EUR,Overnight,177
+Dominica,EUR,Breakfast,-9
+Dominica,EUR,Lunch,-18
+Dominica,EUR,Dinner,-18
+Dominican Republic,EUR,Full Day,45
+Dominican Republic,EUR,Part Day,30
+Dominican Republic,EUR,Overnight,147
+Dominican Republic,EUR,Breakfast,-9
+Dominican Republic,EUR,Lunch,-18
+Dominican Republic,EUR,Dinner,-18
+Ecuador,EUR,Full Day,44
+Ecuador,EUR,Part Day,29
+Ecuador,EUR,Overnight,97
+Ecuador,EUR,Breakfast,-8.8
+Ecuador,EUR,Lunch,-17.6
+Ecuador,EUR,Dinner,-17.6
+Egypt,EUR,Full Day,41
+Egypt,EUR,Part Day,28
+Egypt,EUR,Overnight,125
+Egypt,EUR,Breakfast,-8.2
+Egypt,EUR,Lunch,-16.4
+Egypt,EUR,Dinner,-16.4
+El Salvador,EUR,Full Day,44
+El Salvador,EUR,Part Day,29
+El Salvador,EUR,Overnight,119
+El Salvador,EUR,Breakfast,-8.8
+El Salvador,EUR,Lunch,-17.6
+El Salvador,EUR,Dinner,-17.6
+Equatorial Guinea,EUR,Full Day,36
+Equatorial Guinea,EUR,Part Day,24
+Equatorial Guinea,EUR,Overnight,166
+Equatorial Guinea,EUR,Breakfast,-7.2
+Equatorial Guinea,EUR,Lunch,-14.4
+Equatorial Guinea,EUR,Dinner,-14.4
+Eritrea,EUR,Full Day,50
+Eritrea,EUR,Part Day,33
+Eritrea,EUR,Overnight,91
+Eritrea,EUR,Breakfast,-10
+Eritrea,EUR,Lunch,-20
+Eritrea,EUR,Dinner,-20
+Estonia,EUR,Full Day,27
+Estonia,EUR,Part Day,18
+Estonia,EUR,Overnight,71
+Estonia,EUR,Breakfast,-5.4
+Estonia,EUR,Lunch,-10.8
+Estonia,EUR,Dinner,-10.8
+Ethiopia,EUR,Full Day,27
+Ethiopia,EUR,Part Day,18
+Ethiopia,EUR,Overnight,86
+Ethiopia,EUR,Breakfast,-5.4
+Ethiopia,EUR,Lunch,-10.8
+Ethiopia,EUR,Dinner,-10.8
+Fiji,EUR,Full Day,34
+Fiji,EUR,Part Day,23
+Fiji,EUR,Overnight,69
+Fiji,EUR,Breakfast,-6.8
+Fiji,EUR,Lunch,-13.6
+Fiji,EUR,Dinner,-13.6
+Finland,EUR,Full Day,50
+Finland,EUR,Part Day,33
+Finland,EUR,Overnight,136
+Finland,EUR,Breakfast,-10
+Finland,EUR,Lunch,-20
+Finland,EUR,Dinner,-20
+France - Lyon,EUR,Full Day,53
+France - Lyon,EUR,Part Day,36
+France - Lyon,EUR,Overnight,115
+France - Lyon,EUR,Breakfast,-10.6
+France - Lyon,EUR,Lunch,-21.2
+France - Lyon,EUR,Dinner,-21.2
+France - Marseille,EUR,Full Day,46
+France - Marseille,EUR,Part Day,31
+France - Marseille,EUR,Overnight,101
+France - Marseille,EUR,Breakfast,-9.2
+France - Marseille,EUR,Lunch,-18.4
+France - Marseille,EUR,Dinner,-18.4
+"France - Paris and Departments 92, 93 and 94",EUR,Full Day,58
+"France - Paris and Departments 92, 93 and 94",EUR,Part Day,39
+"France - Paris and Departments 92, 93 and 94",EUR,Overnight,152
+"France - Paris and Departments 92, 93 and 94",EUR,Breakfast,-11.6
+"France - Paris and Departments 92, 93 and 94",EUR,Lunch,-23.2
+"France - Paris and Departments 92, 93 and 94",EUR,Dinner,-23.2
+France - Strasbourg,EUR,Full Day,51
+France - Strasbourg,EUR,Part Day,34
+France - Strasbourg,EUR,Overnight,96
+France - Strasbourg,EUR,Breakfast,-10.2
+France - Strasbourg,EUR,Lunch,-20.4
+France - Strasbourg,EUR,Dinner,-20.4
+France - for the rest,EUR,Full Day,44
+France - for the rest,EUR,Part Day,29
+France - for the rest,EUR,Overnight,115
+France - for the rest,EUR,Breakfast,-8.8
+France - for the rest,EUR,Lunch,-17.6
+France - for the rest,EUR,Dinner,-17.6
+Gabon,EUR,Full Day,62
+Gabon,EUR,Part Day,41
+Gabon,EUR,Overnight,278
+Gabon,EUR,Breakfast,-12.4
+Gabon,EUR,Lunch,-24.8
+Gabon,EUR,Dinner,-24.8
+Gambia,EUR,Full Day,30
+Gambia,EUR,Part Day,20
+Gambia,EUR,Overnight,125
+Gambia,EUR,Breakfast,-6
+Gambia,EUR,Lunch,-12
+Gambia,EUR,Dinner,-12
+Georgia,EUR,Full Day,35
+Georgia,EUR,Part Day,24
+Georgia,EUR,Overnight,88
+Georgia,EUR,Breakfast,-7
+Georgia,EUR,Lunch,-14
+Georgia,EUR,Dinner,-14
+Ghana,EUR,Full Day,46
+Ghana,EUR,Part Day,31
+Ghana,EUR,Overnight,148
+Ghana,EUR,Breakfast,-9.2
+Ghana,EUR,Lunch,-18.4
+Ghana,EUR,Dinner,-18.4
+Greece - Athens,EUR,Full Day,46
+Greece - Athens,EUR,Part Day,31
+Greece - Athens,EUR,Overnight,132
+Greece - Athens,EUR,Breakfast,-9.2
+Greece - Athens,EUR,Lunch,-18.4
+Greece - Athens,EUR,Dinner,-18.4
+Greece - for the rest,EUR,Full Day,36
+Greece - for the rest,EUR,Part Day,24
+Greece - for the rest,EUR,Overnight,135
+Greece - for the rest,EUR,Breakfast,-7.2
+Greece - for the rest,EUR,Lunch,-14.4
+Greece - for the rest,EUR,Dinner,-14.4
+Grenada,EUR,Full Day,45
+Grenada,EUR,Part Day,30
+Grenada,EUR,Overnight,177
+Grenada,EUR,Breakfast,-9
+Grenada,EUR,Lunch,-18
+Grenada,EUR,Dinner,-18
+Guatemala,EUR,Full Day,34
+Guatemala,EUR,Part Day,23
+Guatemala,EUR,Overnight,90
+Guatemala,EUR,Breakfast,-6.8
+Guatemala,EUR,Lunch,-13.6
+Guatemala,EUR,Dinner,-13.6
+Guinea,EUR,Full Day,46
+Guinea,EUR,Part Day,31
+Guinea,EUR,Overnight,118
+Guinea,EUR,Breakfast,-9.2
+Guinea,EUR,Lunch,-18.4
+Guinea,EUR,Dinner,-18.4
+Guinea-Bissau,EUR,Full Day,24
+Guinea-Bissau,EUR,Part Day,16
+Guinea-Bissau,EUR,Overnight,86
+Guinea-Bissau,EUR,Breakfast,-4.8
+Guinea-Bissau,EUR,Lunch,-9.6
+Guinea-Bissau,EUR,Dinner,-9.6
+Guyana,EUR,Full Day,45
+Guyana,EUR,Part Day,30
+Guyana,EUR,Overnight,177
+Guyana,EUR,Breakfast,-9
+Guyana,EUR,Lunch,-18
+Guyana,EUR,Dinner,-18
+Haiti,EUR,Full Day,58
+Haiti,EUR,Part Day,39
+Haiti,EUR,Overnight,130
+Haiti,EUR,Breakfast,-11.6
+Haiti,EUR,Lunch,-23.2
+Haiti,EUR,Dinner,-23.2
+Honduras,EUR,Full Day,48
+Honduras,EUR,Part Day,32
+Honduras,EUR,Overnight,101
+Honduras,EUR,Breakfast,-9.6
+Honduras,EUR,Lunch,-19.2
+Honduras,EUR,Dinner,-19.2
+Hungary,EUR,Full Day,22
+Hungary,EUR,Part Day,15
+Hungary,EUR,Overnight,63
+Hungary,EUR,Breakfast,-4.4
+Hungary,EUR,Lunch,-8.8
+Hungary,EUR,Dinner,-8.8
+Iceland,EUR,Full Day,47
+Iceland,EUR,Part Day,32
+Iceland,EUR,Overnight,108
+Iceland,EUR,Breakfast,-9.4
+Iceland,EUR,Lunch,-18.8
+Iceland,EUR,Dinner,-18.8
+India - Chennai,EUR,Full Day,32
+India - Chennai,EUR,Part Day,21
+India - Chennai,EUR,Overnight,85
+India - Chennai,EUR,Breakfast,-6.4
+India - Chennai,EUR,Lunch,-12.8
+India - Chennai,EUR,Dinner,-12.8
+India - Kolkata,EUR,Full Day,35
+India - Kolkata,EUR,Part Day,24
+India - Kolkata,EUR,Overnight,145
+India - Kolkata,EUR,Breakfast,-7
+India - Kolkata,EUR,Lunch,-14
+India - Kolkata,EUR,Dinner,-14
+India - Mumbai,EUR,Full Day,50
+India - Mumbai,EUR,Part Day,33
+India - Mumbai,EUR,Overnight,146
+India - Mumbai,EUR,Breakfast,-10
+India - Mumbai,EUR,Lunch,-20
+India - Mumbai,EUR,Dinner,-20
+India - New Delhi,EUR,Full Day,38
+India - New Delhi,EUR,Part Day,25
+India - New Delhi,EUR,Overnight,185
+India - New Delhi,EUR,Breakfast,-7.6
+India - New Delhi,EUR,Lunch,-15.2
+India - New Delhi,EUR,Dinner,-15.2
+India - for the rest,EUR,Full Day,32
+India - for the rest,EUR,Part Day,21
+India - for the rest,EUR,Overnight,85
+India - for the rest,EUR,Breakfast,-6.4
+India - for the rest,EUR,Lunch,-12.8
+India - for the rest,EUR,Dinner,-12.8
+Indonesia,EUR,Full Day,38
+Indonesia,EUR,Part Day,25
+Indonesia,EUR,Overnight,130
+Indonesia,EUR,Breakfast,-7.6
+Indonesia,EUR,Lunch,-15.2
+Indonesia,EUR,Dinner,-15.2
+Iran,EUR,Full Day,33
+Iran,EUR,Part Day,22
+Iran,EUR,Overnight,196
+Iran,EUR,Breakfast,-6.6
+Iran,EUR,Lunch,-13.2
+Iran,EUR,Dinner,-13.2
+Ireland,EUR,Full Day,44
+Ireland,EUR,Part Day,29
+Ireland,EUR,Overnight,92
+Ireland,EUR,Breakfast,-8.8
+Ireland,EUR,Lunch,-17.6
+Ireland,EUR,Dinner,-17.6
+Israel,EUR,Full Day,56
+Israel,EUR,Part Day,37
+Israel,EUR,Overnight,191
+Israel,EUR,Breakfast,-11.2
+Israel,EUR,Lunch,-22.4
+Israel,EUR,Dinner,-22.4
+Italy - Milan,EUR,Full Day,45
+Italy - Milan,EUR,Part Day,30
+Italy - Milan,EUR,Overnight,158
+Italy - Milan,EUR,Breakfast,-9
+Italy - Milan,EUR,Lunch,-18
+Italy - Milan,EUR,Dinner,-18
+Italy - Rome,EUR,Full Day,40
+Italy - Rome,EUR,Part Day,27
+Italy - Rome,EUR,Overnight,135
+Italy - Rome,EUR,Breakfast,-8
+Italy - Rome,EUR,Lunch,-16
+Italy - Rome,EUR,Dinner,-16
+Italy - for the rest,EUR,Full Day,40
+Italy - for the rest,EUR,Part Day,27
+Italy - for the rest,EUR,Overnight,135
+Italy - for the rest,EUR,Breakfast,-8
+Italy - for the rest,EUR,Lunch,-16
+Italy - for the rest,EUR,Dinner,-16
+Jamaica,EUR,Full Day,57
+Jamaica,EUR,Part Day,38
+Jamaica,EUR,Overnight,138
+Jamaica,EUR,Breakfast,-11.4
+Jamaica,EUR,Lunch,-22.8
+Jamaica,EUR,Dinner,-22.8
+Japan - Tokyo,EUR,Full Day,66
+Japan - Tokyo,EUR,Part Day,44
+Japan - Tokyo,EUR,Overnight,233
+Japan - Tokyo,EUR,Breakfast,-13.2
+Japan - Tokyo,EUR,Lunch,-26.4
+Japan - Tokyo,EUR,Dinner,-26.4
+Japan - for the rest,EUR,Full Day,51
+Japan - for the rest,EUR,Part Day,34
+Japan - for the rest,EUR,Overnight,156
+Japan - for the rest,EUR,Breakfast,-10.2
+Japan - for the rest,EUR,Lunch,-20.4
+Japan - for the rest,EUR,Dinner,-20.4
+Jordan,EUR,Full Day,46
+Jordan,EUR,Part Day,31
+Jordan,EUR,Overnight,126
+Jordan,EUR,Breakfast,-9.2
+Jordan,EUR,Lunch,-18.4
+Jordan,EUR,Dinner,-18.4
+Kazakhstan,EUR,Full Day,45
+Kazakhstan,EUR,Part Day,30
+Kazakhstan,EUR,Overnight,111
+Kazakhstan,EUR,Breakfast,-9
+Kazakhstan,EUR,Lunch,-18
+Kazakhstan,EUR,Dinner,-18
+Kenya,EUR,Full Day,42
+Kenya,EUR,Part Day,28
+Kenya,EUR,Overnight,223
+Kenya,EUR,Breakfast,-8.4
+Kenya,EUR,Lunch,-16.8
+Kenya,EUR,Dinner,-16.8
+"Korea, Democratic People's Republic",EUR,Full Day,39
+"Korea, Democratic People's Republic",EUR,Part Day,26
+"Korea, Democratic People's Republic",EUR,Overnight,132
+"Korea, Democratic People's Republic",EUR,Breakfast,-7.8
+"Korea, Democratic People's Republic",EUR,Lunch,-15.6
+"Korea, Democratic People's Republic",EUR,Dinner,-15.6
+"Korea, People's Republic",EUR,Full Day,58
+"Korea, People's Republic",EUR,Part Day,39
+"Korea, People's Republic",EUR,Overnight,112
+"Korea, People's Republic",EUR,Breakfast,-11.6
+"Korea, People's Republic",EUR,Lunch,-23.2
+"Korea, People's Republic",EUR,Dinner,-23.2
+Kosovo,EUR,Full Day,23
+Kosovo,EUR,Part Day,16
+Kosovo,EUR,Overnight,57
+Kosovo,EUR,Breakfast,-4.6
+Kosovo,EUR,Lunch,-9.2
+Kosovo,EUR,Dinner,-9.2
+Kuwait,EUR,Full Day,42
+Kuwait,EUR,Part Day,28
+Kuwait,EUR,Overnight,185
+Kuwait,EUR,Breakfast,-8.4
+Kuwait,EUR,Lunch,-16.8
+Kuwait,EUR,Dinner,-16.8
+Kyrgyzstan,EUR,Full Day,29
+Kyrgyzstan,EUR,Part Day,20
+Kyrgyzstan,EUR,Overnight,91
+Kyrgyzstan,EUR,Breakfast,-5.8
+Kyrgyzstan,EUR,Lunch,-11.6
+Kyrgyzstan,EUR,Dinner,-11.6
+Laos,EUR,Full Day,33
+Laos,EUR,Part Day,22
+Laos,EUR,Overnight,96
+Laos,EUR,Breakfast,-6.6
+Laos,EUR,Lunch,-13.2
+Laos,EUR,Dinner,-13.2
+Latvia,EUR,Full Day,30
+Latvia,EUR,Part Day,20
+Latvia,EUR,Overnight,80
+Latvia,EUR,Breakfast,-6
+Latvia,EUR,Lunch,-12
+Latvia,EUR,Dinner,-12
+Lebanon,EUR,Full Day,59
+Lebanon,EUR,Part Day,40
+Lebanon,EUR,Overnight,123
+Lebanon,EUR,Breakfast,-11.8
+Lebanon,EUR,Lunch,-23.6
+Lebanon,EUR,Dinner,-23.6
+Lesotho,EUR,Full Day,24
+Lesotho,EUR,Part Day,16
+Lesotho,EUR,Overnight,103
+Lesotho,EUR,Breakfast,-4.8
+Lesotho,EUR,Lunch,-9.6
+Lesotho,EUR,Dinner,-9.6
+Libya,EUR,Full Day,63
+Libya,EUR,Part Day,42
+Libya,EUR,Overnight,135
+Libya,EUR,Breakfast,-12.6
+Libya,EUR,Lunch,-25.2
+Libya,EUR,Dinner,-25.2
+Liechtenstein,EUR,Full Day,53
+Liechtenstein,EUR,Part Day,36
+Liechtenstein,EUR,Overnight,180
+Liechtenstein,EUR,Breakfast,-10.6
+Liechtenstein,EUR,Lunch,-21.2
+Liechtenstein,EUR,Dinner,-21.2
+Lithuania,EUR,Full Day,24
+Lithuania,EUR,Part Day,16
+Lithuania,EUR,Overnight,68
+Lithuania,EUR,Breakfast,-4.8
+Lithuania,EUR,Lunch,-9.6
+Lithuania,EUR,Dinner,-9.6
+Luxembourg,EUR,Full Day,47
+Luxembourg,EUR,Part Day,32
+Luxembourg,EUR,Overnight,130
+Luxembourg,EUR,Breakfast,-9.4
+Luxembourg,EUR,Lunch,-18.8
+Luxembourg,EUR,Dinner,-18.8
+Macedonia,EUR,Full Day,29
+Macedonia,EUR,Part Day,20
+Macedonia,EUR,Overnight,95
+Macedonia,EUR,Breakfast,-5.8
+Macedonia,EUR,Lunch,-11.6
+Macedonia,EUR,Dinner,-11.6
+Madagascar,EUR,Full Day,34
+Madagascar,EUR,Part Day,23
+Madagascar,EUR,Overnight,87
+Madagascar,EUR,Breakfast,-6.8
+Madagascar,EUR,Lunch,-13.6
+Madagascar,EUR,Dinner,-13.6
+Malawi,EUR,Full Day,47
+Malawi,EUR,Part Day,32
+Malawi,EUR,Overnight,123
+Malawi,EUR,Breakfast,-9.4
+Malawi,EUR,Lunch,-18.8
+Malawi,EUR,Dinner,-18.8
+Malaysia,EUR,Full Day,34
+Malaysia,EUR,Part Day,23
+Malaysia,EUR,Overnight,88
+Malaysia,EUR,Breakfast,-6.8
+Malaysia,EUR,Lunch,-13.6
+Malaysia,EUR,Dinner,-13.6
+Maldives,EUR,Full Day,52
+Maldives,EUR,Part Day,35
+Maldives,EUR,Overnight,170
+Maldives,EUR,Breakfast,-10.4
+Maldives,EUR,Lunch,-20.8
+Maldives,EUR,Dinner,-20.8
+Mali,EUR,Full Day,41
+Mali,EUR,Part Day,28
+Mali,EUR,Overnight,122
+Mali,EUR,Breakfast,-8.2
+Mali,EUR,Lunch,-16.4
+Mali,EUR,Dinner,-16.4
+Malta,EUR,Full Day,45
+Malta,EUR,Part Day,30
+Malta,EUR,Overnight,112
+Malta,EUR,Breakfast,-9
+Malta,EUR,Lunch,-18
+Malta,EUR,Dinner,-18
+Marshall Islands,EUR,Full Day,63
+Marshall Islands,EUR,Part Day,42
+Marshall Islands,EUR,Overnight,102
+Marshall Islands,EUR,Breakfast,-12.6
+Marshall Islands,EUR,Lunch,-25.2
+Marshall Islands,EUR,Dinner,-25.2
+Mauritania,EUR,Full Day,39
+Mauritania,EUR,Part Day,26
+Mauritania,EUR,Overnight,105
+Mauritania,EUR,Breakfast,-7.8
+Mauritania,EUR,Lunch,-15.6
+Mauritania,EUR,Dinner,-15.6
+Mauritius,EUR,Full Day,54
+Mauritius,EUR,Part Day,36
+Mauritius,EUR,Overnight,220
+Mauritius,EUR,Breakfast,-10.8
+Mauritius,EUR,Lunch,-21.6
+Mauritius,EUR,Dinner,-21.6
+Mexico,EUR,Full Day,41
+Mexico,EUR,Part Day,28
+Mexico,EUR,Overnight,141
+Mexico,EUR,Breakfast,-8.2
+Mexico,EUR,Lunch,-16.4
+Mexico,EUR,Dinner,-16.4
+Micronesia,EUR,Full Day,33
+Micronesia,EUR,Part Day,22
+Micronesia,EUR,Overnight,116
+Micronesia,EUR,Breakfast,-6.6
+Micronesia,EUR,Lunch,-13.2
+Micronesia,EUR,Dinner,-13.2
+"Moldova, Republic",EUR,Full Day,24
+"Moldova, Republic",EUR,Part Day,16
+"Moldova, Republic",EUR,Overnight,88
+"Moldova, Republic",EUR,Breakfast,-4.8
+"Moldova, Republic",EUR,Lunch,-9.6
+"Moldova, Republic",EUR,Dinner,-9.6
+Monaco,EUR,Full Day,42
+Monaco,EUR,Part Day,28
+Monaco,EUR,Overnight,180
+Monaco,EUR,Breakfast,-8.4
+Monaco,EUR,Lunch,-16.8
+Monaco,EUR,Dinner,-16.8
+Mongolia,EUR,Full Day,27
+Mongolia,EUR,Part Day,18
+Mongolia,EUR,Overnight,92
+Mongolia,EUR,Breakfast,-5.4
+Mongolia,EUR,Lunch,-10.8
+Mongolia,EUR,Dinner,-10.8
+Montenegro,EUR,Full Day,29
+Montenegro,EUR,Part Day,20
+Montenegro,EUR,Overnight,94
+Montenegro,EUR,Breakfast,-5.8
+Montenegro,EUR,Lunch,-11.6
+Montenegro,EUR,Dinner,-11.6
+Morocco,EUR,Full Day,42
+Morocco,EUR,Part Day,28
+Morocco,EUR,Overnight,129
+Morocco,EUR,Breakfast,-8.4
+Morocco,EUR,Lunch,-16.8
+Morocco,EUR,Dinner,-16.8
+Mozambique,EUR,Full Day,38
+Mozambique,EUR,Part Day,25
+Mozambique,EUR,Overnight,146
+Mozambique,EUR,Breakfast,-7.6
+Mozambique,EUR,Lunch,-15.2
+Mozambique,EUR,Dinner,-15.2
+Myanmar,EUR,Full Day,35
+Myanmar,EUR,Part Day,24
+Myanmar,EUR,Overnight,155
+Myanmar,EUR,Breakfast,-7
+Myanmar,EUR,Lunch,-14
+Myanmar,EUR,Dinner,-14
+Namibia,EUR,Full Day,23
+Namibia,EUR,Part Day,16
+Namibia,EUR,Overnight,77
+Namibia,EUR,Breakfast,-4.6
+Namibia,EUR,Lunch,-9.2
+Namibia,EUR,Dinner,-9.2
+Nepal,EUR,Full Day,28
+Nepal,EUR,Part Day,19
+Nepal,EUR,Overnight,86
+Nepal,EUR,Breakfast,-5.6
+Nepal,EUR,Lunch,-11.2
+Nepal,EUR,Dinner,-11.2
+Netherlands,EUR,Full Day,46
+Netherlands,EUR,Part Day,31
+Netherlands,EUR,Overnight,119
+Netherlands,EUR,Breakfast,-9.2
+Netherlands,EUR,Lunch,-18.4
+Netherlands,EUR,Dinner,-18.4
+New Zealand,EUR,Full Day,56
+New Zealand,EUR,Part Day,37
+New Zealand,EUR,Overnight,153
+New Zealand,EUR,Breakfast,-11.2
+New Zealand,EUR,Lunch,-22.4
+New Zealand,EUR,Dinner,-22.4
+Nicaragua,EUR,Full Day,36
+Nicaragua,EUR,Part Day,24
+Nicaragua,EUR,Overnight,81
+Nicaragua,EUR,Breakfast,-7.2
+Nicaragua,EUR,Lunch,-14.4
+Nicaragua,EUR,Dinner,-14.4
+Niger,EUR,Full Day,41
+Niger,EUR,Part Day,28
+Niger,EUR,Overnight,89
+Niger,EUR,Breakfast,-8.2
+Niger,EUR,Lunch,-16.4
+Niger,EUR,Dinner,-16.4
+Nigeria,EUR,Full Day,63
+Nigeria,EUR,Part Day,42
+Nigeria,EUR,Overnight,255
+Nigeria,EUR,Breakfast,-12.6
+Nigeria,EUR,Lunch,-25.2
+Nigeria,EUR,Dinner,-25.2
+Norway,EUR,Full Day,80
+Norway,EUR,Part Day,53
+Norway,EUR,Overnight,182
+Norway,EUR,Breakfast,-16
+Norway,EUR,Lunch,-32
+Norway,EUR,Dinner,-32
+Oman,EUR,Full Day,60
+Oman,EUR,Part Day,40
+Oman,EUR,Overnight,200
+Oman,EUR,Breakfast,-12
+Oman,EUR,Lunch,-24
+Oman,EUR,Dinner,-24
+Pakistan - Islamabad,EUR,Full Day,30
+Pakistan - Islamabad,EUR,Part Day,20
+Pakistan - Islamabad,EUR,Overnight,165
+Pakistan - Islamabad,EUR,Breakfast,-6
+Pakistan - Islamabad,EUR,Lunch,-12
+Pakistan - Islamabad,EUR,Dinner,-12
+Pakistan - for the rest,EUR,Full Day,27
+Pakistan - for the rest,EUR,Part Day,18
+Pakistan - for the rest,EUR,Overnight,68
+Pakistan - for the rest,EUR,Breakfast,-5.4
+Pakistan - for the rest,EUR,Lunch,-10.8
+Pakistan - for the rest,EUR,Dinner,-10.8
+Palau,EUR,Full Day,51
+Palau,EUR,Part Day,34
+Palau,EUR,Overnight,179
+Palau,EUR,Breakfast,-10.2
+Palau,EUR,Lunch,-20.4
+Palau,EUR,Dinner,-20.4
+Panama,EUR,Full Day,39
+Panama,EUR,Part Day,26
+Panama,EUR,Overnight,111
+Panama,EUR,Breakfast,-7.8
+Panama,EUR,Lunch,-15.6
+Panama,EUR,Dinner,-15.6
+Papua New Guinea,EUR,Full Day,60
+Papua New Guinea,EUR,Part Day,40
+Papua New Guinea,EUR,Overnight,234
+Papua New Guinea,EUR,Breakfast,-12
+Papua New Guinea,EUR,Lunch,-24
+Papua New Guinea,EUR,Dinner,-24
+Paraguay,EUR,Full Day,38
+Paraguay,EUR,Part Day,25
+Paraguay,EUR,Overnight,108
+Paraguay,EUR,Breakfast,-7.6
+Paraguay,EUR,Lunch,-15.2
+Paraguay,EUR,Dinner,-15.2
+Peru,EUR,Full Day,30
+Peru,EUR,Part Day,20
+Peru,EUR,Overnight,93
+Peru,EUR,Breakfast,-6
+Peru,EUR,Lunch,-12
+Peru,EUR,Dinner,-12
+Philippines,EUR,Full Day,33
+Philippines,EUR,Part Day,22
+Philippines,EUR,Overnight,116
+Philippines,EUR,Breakfast,-6.6
+Philippines,EUR,Lunch,-13.2
+Philippines,EUR,Dinner,-13.2
+Poland - Danzig,EUR,Full Day,30
+Poland - Danzig,EUR,Part Day,20
+Poland - Danzig,EUR,Overnight,84
+Poland - Danzig,EUR,Breakfast,-6
+Poland - Danzig,EUR,Lunch,-12
+Poland - Danzig,EUR,Dinner,-12
+Poland - Kraków,EUR,Full Day,27
+Poland - Kraków,EUR,Part Day,18
+Poland - Kraków,EUR,Overnight,86
+Poland - Kraków,EUR,Breakfast,-5.4
+Poland - Kraków,EUR,Lunch,-10.8
+Poland - Kraków,EUR,Dinner,-10.8
+Poland - Warsaw,EUR,Full Day,29
+Poland - Warsaw,EUR,Part Day,20
+Poland - Warsaw,EUR,Overnight,109
+Poland - Warsaw,EUR,Breakfast,-5.8
+Poland - Warsaw,EUR,Lunch,-11.6
+Poland - Warsaw,EUR,Dinner,-11.6
+Poland - Wrocław,EUR,Full Day,33
+Poland - Wrocław,EUR,Part Day,22
+Poland - Wrocław,EUR,Overnight,117
+Poland - Wrocław,EUR,Breakfast,-6.6
+Poland - Wrocław,EUR,Lunch,-13.2
+Poland - Wrocław,EUR,Dinner,-13.2
+Poland - for the rest,EUR,Full Day,29
+Poland - for the rest,EUR,Part Day,20
+Poland - for the rest,EUR,Overnight,60
+Poland - for the rest,EUR,Breakfast,-5.8
+Poland - for the rest,EUR,Lunch,-11.6
+Poland - for the rest,EUR,Dinner,-11.6
+Portugal,EUR,Full Day,36
+Portugal,EUR,Part Day,24
+Portugal,EUR,Overnight,102
+Portugal,EUR,Breakfast,-7.2
+Portugal,EUR,Lunch,-14.4
+Portugal,EUR,Dinner,-14.4
+Qatar,EUR,Full Day,56
+Qatar,EUR,Part Day,37
+Qatar,EUR,Overnight,170
+Qatar,EUR,Breakfast,-11.2
+Qatar,EUR,Lunch,-22.4
+Qatar,EUR,Dinner,-22.4
+Romania - Bucharest,EUR,Full Day,32
+Romania - Bucharest,EUR,Part Day,21
+Romania - Bucharest,EUR,Overnight,100
+Romania - Bucharest,EUR,Breakfast,-6.4
+Romania - Bucharest,EUR,Lunch,-12.8
+Romania - Bucharest,EUR,Dinner,-12.8
+Romania - for the rest,EUR,Full Day,26
+Romania - for the rest,EUR,Part Day,17
+Romania - for the rest,EUR,Overnight,62
+Romania - for the rest,EUR,Breakfast,-5.2
+Romania - for the rest,EUR,Lunch,-10.4
+Romania - for the rest,EUR,Dinner,-10.4
+Russia - Moscow,EUR,Full Day,30
+Russia - Moscow,EUR,Part Day,20
+Russia - Moscow,EUR,Overnight,110
+Russia - Moscow,EUR,Breakfast,-6
+Russia - Moscow,EUR,Lunch,-12
+Russia - Moscow,EUR,Dinner,-12
+Russia - St. Petersburg,EUR,Full Day,26
+Russia - St. Petersburg,EUR,Part Day,17
+Russia - St. Petersburg,EUR,Overnight,114
+Russia - St. Petersburg,EUR,Breakfast,-5.2
+Russia - St. Petersburg,EUR,Lunch,-10.4
+Russia - St. Petersburg,EUR,Dinner,-10.4
+Russia - Yekaterinburg,EUR,Full Day,28
+Russia - Yekaterinburg,EUR,Part Day,19
+Russia - Yekaterinburg,EUR,Overnight,84
+Russia - Yekaterinburg,EUR,Breakfast,-5.6
+Russia - Yekaterinburg,EUR,Lunch,-11.2
+Russia - Yekaterinburg,EUR,Dinner,-11.2
+Russia - for the rest,EUR,Full Day,24
+Russia - for the rest,EUR,Part Day,16
+Russia - for the rest,EUR,Overnight,58
+Russia - for the rest,EUR,Breakfast,-4.8
+Russia - for the rest,EUR,Lunch,-9.6
+Russia - for the rest,EUR,Dinner,-9.6
+Rwanda,EUR,Full Day,46
+Rwanda,EUR,Part Day,31
+Rwanda,EUR,Overnight,141
+Rwanda,EUR,Breakfast,-9.2
+Rwanda,EUR,Lunch,-18.4
+Rwanda,EUR,Dinner,-18.4
+Samoa,EUR,Full Day,29
+Samoa,EUR,Part Day,20
+Samoa,EUR,Overnight,85
+Samoa,EUR,Breakfast,-5.8
+Samoa,EUR,Lunch,-11.6
+Samoa,EUR,Dinner,-11.6
+San Marino,EUR,Full Day,34
+San Marino,EUR,Part Day,23
+San Marino,EUR,Overnight,75
+San Marino,EUR,Breakfast,-6.8
+San Marino,EUR,Lunch,-13.6
+San Marino,EUR,Dinner,-13.6
+São Tomé and Príncipe,EUR,Full Day,47
+São Tomé and Príncipe,EUR,Part Day,32
+São Tomé and Príncipe,EUR,Overnight,80
+São Tomé and Príncipe,EUR,Breakfast,-9.4
+São Tomé and Príncipe,EUR,Lunch,-18.8
+São Tomé and Príncipe,EUR,Dinner,-18.8
+Saudi Arabia - Jeddah,EUR,Full Day,38
+Saudi Arabia - Jeddah,EUR,Part Day,25
+Saudi Arabia - Jeddah,EUR,Overnight,234
+Saudi Arabia - Jeddah,EUR,Breakfast,-7.6
+Saudi Arabia - Jeddah,EUR,Lunch,-15.2
+Saudi Arabia - Jeddah,EUR,Dinner,-15.2
+Saudi Arabia - Riyadh,EUR,Full Day,48
+Saudi Arabia - Riyadh,EUR,Part Day,32
+Saudi Arabia - Riyadh,EUR,Overnight,179
+Saudi Arabia - Riyadh,EUR,Breakfast,-9.6
+Saudi Arabia - Riyadh,EUR,Lunch,-19.2
+Saudi Arabia - Riyadh,EUR,Dinner,-19.2
+Saudi Arabia - for the rest,EUR,Full Day,48
+Saudi Arabia - for the rest,EUR,Part Day,32
+Saudi Arabia - for the rest,EUR,Overnight,80
+Saudi Arabia - for the rest,EUR,Breakfast,-9.6
+Saudi Arabia - for the rest,EUR,Lunch,-19.2
+Saudi Arabia - for the rest,EUR,Dinner,-19.2
+Senegal,EUR,Full Day,45
+Senegal,EUR,Part Day,30
+Senegal,EUR,Overnight,128
+Senegal,EUR,Breakfast,-9
+Senegal,EUR,Lunch,-18
+Senegal,EUR,Dinner,-18
+Serbia,EUR,Full Day,20
+Serbia,EUR,Part Day,13
+Serbia,EUR,Overnight,74
+Serbia,EUR,Breakfast,-4
+Serbia,EUR,Lunch,-8
+Serbia,EUR,Dinner,-8
+Sierra Leone,EUR,Full Day,48
+Sierra Leone,EUR,Part Day,32
+Sierra Leone,EUR,Overnight,161
+Sierra Leone,EUR,Breakfast,-9.6
+Sierra Leone,EUR,Lunch,-19.2
+Sierra Leone,EUR,Dinner,-19.2
+Singapore,EUR,Full Day,54
+Singapore,EUR,Part Day,36
+Singapore,EUR,Overnight,197
+Singapore,EUR,Breakfast,-10.8
+Singapore,EUR,Lunch,-21.6
+Singapore,EUR,Dinner,-21.6
+Slovakia,EUR,Full Day,24
+Slovakia,EUR,Part Day,16
+Slovakia,EUR,Overnight,85
+Slovakia,EUR,Breakfast,-4.8
+Slovakia,EUR,Lunch,-9.6
+Slovakia,EUR,Dinner,-9.6
+Slovenia,EUR,Full Day,33
+Slovenia,EUR,Part Day,22
+Slovenia,EUR,Overnight,95
+Slovenia,EUR,Breakfast,-6.6
+Slovenia,EUR,Lunch,-13.2
+Slovenia,EUR,Dinner,-13.2
+South Africa - Cape Town,EUR,Full Day,27
+South Africa - Cape Town,EUR,Part Day,18
+South Africa - Cape Town,EUR,Overnight,112
+South Africa - Cape Town,EUR,Breakfast,-5.4
+South Africa - Cape Town,EUR,Lunch,-10.8
+South Africa - Cape Town,EUR,Dinner,-10.8
+South Africa - Johannesburg,EUR,Full Day,29
+South Africa - Johannesburg,EUR,Part Day,20
+South Africa - Johannesburg,EUR,Overnight,124
+South Africa - Johannesburg,EUR,Breakfast,-5.8
+South Africa - Johannesburg,EUR,Lunch,-11.6
+South Africa - Johannesburg,EUR,Dinner,-11.6
+Souh Africa - for the rest,EUR,Full Day,22
+Souh Africa - for the rest,EUR,Part Day,15
+Souh Africa - for the rest,EUR,Overnight,94
+Souh Africa - for the rest,EUR,Breakfast,-4.4
+Souh Africa - for the rest,EUR,Lunch,-8.8
+Souh Africa - for the rest,EUR,Dinner,-8.8
+South Sudan,EUR,Full Day,34
+South Sudan,EUR,Part Day,23
+South Sudan,EUR,Overnight,150
+South Sudan,EUR,Breakfast,-6.8
+South Sudan,EUR,Lunch,-13.6
+South Sudan,EUR,Dinner,-13.6
+Spain - Barcelona,EUR,Full Day,34
+Spain - Barcelona,EUR,Part Day,23
+Spain - Barcelona,EUR,Overnight,118
+Spain - Barcelona,EUR,Breakfast,-6.8
+Spain - Barcelona,EUR,Lunch,-13.6
+Spain - Barcelona,EUR,Dinner,-13.6
+Spain - Canary Islands,EUR,Full Day,40
+Spain - Canary Islands,EUR,Part Day,27
+Spain - Canary Islands,EUR,Overnight,115
+Spain - Canary Islands,EUR,Breakfast,-8
+Spain - Canary Islands,EUR,Lunch,-16
+Spain - Canary Islands,EUR,Dinner,-16
+Spain - Madrid,EUR,Full Day,40
+Spain - Madrid,EUR,Part Day,27
+Spain - Madrid,EUR,Overnight,118
+Spain - Madrid,EUR,Breakfast,-8
+Spain - Madrid,EUR,Lunch,-16
+Spain - Madrid,EUR,Dinner,-16
+Spain - Palma de Mallorca,EUR,Full Day,35
+Spain - Palma de Mallorca,EUR,Part Day,24
+Spain - Palma de Mallorca,EUR,Overnight,121
+Spain - Palma de Mallorca,EUR,Breakfast,-7
+Spain - Palma de Mallorca,EUR,Lunch,-14
+Spain - Palma de Mallorca,EUR,Dinner,-14
+Spain - for the rest,EUR,Full Day,34
+Spain - for the rest,EUR,Part Day,23
+Spain - for the rest,EUR,Overnight,115
+Spain - for the rest,EUR,Breakfast,-6.8
+Spain - for the rest,EUR,Lunch,-13.6
+Spain - for the rest,EUR,Dinner,-13.6
+Sri Lanka,EUR,Full Day,42
+Sri Lanka,EUR,Part Day,28
+Sri Lanka,EUR,Overnight,100
+Sri Lanka,EUR,Breakfast,-8.4
+Sri Lanka,EUR,Lunch,-16.8
+Sri Lanka,EUR,Dinner,-16.8
+St. Kitts and Nevis,EUR,Full Day,45
+St. Kitts and Nevis,EUR,Part Day,30
+St. Kitts and Nevis,EUR,Overnight,177
+St. Kitts and Nevis,EUR,Breakfast,-9
+St. Kitts and Nevis,EUR,Lunch,-18
+St. Kitts and Nevis,EUR,Dinner,-18
+St. Lucia,EUR,Full Day,45
+St. Lucia,EUR,Part Day,30
+St. Lucia,EUR,Overnight,177
+St. Lucia,EUR,Breakfast,-9
+St. Lucia,EUR,Lunch,-18
+St. Lucia,EUR,Dinner,-18
+St. Vincent and the Grenadines,EUR,Full Day,45
+St. Vincent and the Grenadines,EUR,Part Day,30
+St. Vincent and the Grenadines,EUR,Overnight,177
+St. Vincent and the Grenadines,EUR,Breakfast,-9
+St. Vincent and the Grenadines,EUR,Lunch,-18
+St. Vincent and the Grenadines,EUR,Dinner,-18
+Sudan,EUR,Full Day,35
+Sudan,EUR,Part Day,24
+Sudan,EUR,Overnight,115
+Sudan,EUR,Breakfast,-7
+Sudan,EUR,Lunch,-14
+Sudan,EUR,Dinner,-14
+Suriname,EUR,Full Day,45
+Suriname,EUR,Part Day,30
+Suriname,EUR,Overnight,177
+Suriname,EUR,Breakfast,-9
+Suriname,EUR,Lunch,-18
+Suriname,EUR,Dinner,-18
+Sweden,EUR,Full Day,50
+Sweden,EUR,Part Day,33
+Sweden,EUR,Overnight,168
+Sweden,EUR,Breakfast,-10
+Sweden,EUR,Lunch,-20
+Sweden,EUR,Dinner,-20
+Switzerland - Geneva,EUR,Full Day,64
+Switzerland - Geneva,EUR,Part Day,43
+Switzerland - Geneva,EUR,Overnight,195
+Switzerland - Geneva,EUR,Breakfast,-12.8
+Switzerland - Geneva,EUR,Lunch,-25.6
+Switzerland - Geneva,EUR,Dinner,-25.6
+Switzerland - for the rest,EUR,Full Day,62
+Switzerland - for the rest,EUR,Part Day,41
+Switzerland - for the rest,EUR,Overnight,169
+Switzerland - for the rest,EUR,Breakfast,-12.4
+Switzerland - for the rest,EUR,Lunch,-24.8
+Switzerland - for the rest,EUR,Dinner,-24.8
+Syria,EUR,Full Day,38
+Syria,EUR,Part Day,25
+Syria,EUR,Overnight,140
+Syria,EUR,Breakfast,-7.6
+Syria,EUR,Lunch,-15.2
+Syria,EUR,Dinner,-15.2
+Taiwan,EUR,Full Day,51
+Taiwan,EUR,Part Day,34
+Taiwan,EUR,Overnight,126
+Taiwan,EUR,Breakfast,-10.2
+Taiwan,EUR,Lunch,-20.4
+Taiwan,EUR,Dinner,-20.4
+Tajikistan,EUR,Full Day,27
+Tajikistan,EUR,Part Day,18
+Tajikistan,EUR,Overnight,118
+Tajikistan,EUR,Breakfast,-5.4
+Tajikistan,EUR,Lunch,-10.8
+Tajikistan,EUR,Dinner,-10.8
+Tanzania,EUR,Full Day,47
+Tanzania,EUR,Part Day,32
+Tanzania,EUR,Overnight,201
+Tanzania,EUR,Breakfast,-9.4
+Tanzania,EUR,Lunch,-18.8
+Tanzania,EUR,Dinner,-18.8
+Thailand,EUR,Full Day,38
+Thailand,EUR,Part Day,25
+Thailand,EUR,Overnight,110
+Thailand,EUR,Breakfast,-7.6
+Thailand,EUR,Lunch,-15.2
+Thailand,EUR,Dinner,-15.2
+Togo,EUR,Full Day,35
+Togo,EUR,Part Day,24
+Togo,EUR,Overnight,108
+Togo,EUR,Breakfast,-7
+Togo,EUR,Lunch,-14
+Togo,EUR,Dinner,-14
+Tonga,EUR,Full Day,39
+Tonga,EUR,Part Day,26
+Tonga,EUR,Overnight,94
+Tonga,EUR,Breakfast,-7.8
+Tonga,EUR,Lunch,-15.6
+Tonga,EUR,Dinner,-15.6
+Trinidad and Tobago,EUR,Full Day,45
+Trinidad and Tobago,EUR,Part Day,30
+Trinidad and Tobago,EUR,Overnight,177
+Trinidad and Tobago,EUR,Breakfast,-9
+Trinidad and Tobago,EUR,Lunch,-18
+Trinidad and Tobago,EUR,Dinner,-18
+Tunisia,EUR,Full Day,40
+Tunisia,EUR,Part Day,27
+Tunisia,EUR,Overnight,115
+Tunisia,EUR,Breakfast,-8
+Tunisia,EUR,Lunch,-16
+Tunisia,EUR,Dinner,-16
+Turkey - Istanbul,EUR,Full Day,35
+Turkey - Istanbul,EUR,Part Day,24
+Turkey - Istanbul,EUR,Overnight,104
+Turkey - Istanbul,EUR,Breakfast,-7
+Turkey - Istanbul,EUR,Lunch,-14
+Turkey - Istanbul,EUR,Dinner,-14
+Turkey - Izmir,EUR,Full Day,42
+Turkey - Izmir,EUR,Part Day,28
+Turkey - Izmir,EUR,Overnight,80
+Turkey - Izmir,EUR,Breakfast,-8.4
+Turkey - Izmir,EUR,Lunch,-16.8
+Turkey - Izmir,EUR,Dinner,-16.8
+Turkey - for the rest,EUR,Full Day,40
+Turkey - for the rest,EUR,Part Day,27
+Turkey - for the rest,EUR,Overnight,78
+Turkey - for the rest,EUR,Breakfast,-8
+Turkey - for the rest,EUR,Lunch,-16
+Turkey - for the rest,EUR,Dinner,-16
+Turkmenistan,EUR,Full Day,33
+Turkmenistan,EUR,Part Day,22
+Turkmenistan,EUR,Overnight,108
+Turkmenistan,EUR,Breakfast,-6.6
+Turkmenistan,EUR,Lunch,-13.2
+Turkmenistan,EUR,Dinner,-13.2
+Uganda,EUR,Full Day,35
+Uganda,EUR,Part Day,24
+Uganda,EUR,Overnight,129
+Uganda,EUR,Breakfast,-7
+Uganda,EUR,Lunch,-14
+Uganda,EUR,Dinner,-14
+Ukraine,EUR,Full Day,32
+Ukraine,EUR,Part Day,21
+Ukraine,EUR,Overnight,98
+Ukraine,EUR,Breakfast,-6.4
+Ukraine,EUR,Lunch,-12.8
+Ukraine,EUR,Dinner,-12.8
+United Arab Emirates,EUR,Full Day,45
+United Arab Emirates,EUR,Part Day,30
+United Arab Emirates,EUR,Overnight,155
+United Arab Emirates,EUR,Breakfast,-9
+United Arab Emirates,EUR,Lunch,-18
+United Arab Emirates,EUR,Dinner,-18
+United Kingdom of Great Britain and Ireland,EUR,Full Day,
+United Kingdom of Great Britain and Ireland,EUR,Part Day,
+United Kingdom of Great Britain and Ireland,EUR,Overnight,
+United Kingdom of Great Britain and Ireland,EUR,Breakfast,0
+United Kingdom of Great Britain and Ireland,EUR,Lunch,0
+United Kingdom of Great Britain and Ireland,EUR,Dinner,0
+United Kingdom - London,EUR,Full Day,62
+United Kingdom - London,EUR,Part Day,41
+United Kingdom - London,EUR,Overnight,224
+United Kingdom - London,EUR,Breakfast,-12.4
+United Kingdom - London,EUR,Lunch,-24.8
+United Kingdom - London,EUR,Dinner,-24.8
+United Kingdom - for the rest,EUR,Full Day,45
+United Kingdom - for the rest,EUR,Part Day,30
+United Kingdom - for the rest,EUR,Overnight,115
+United Kingdom - for the rest,EUR,Breakfast,-9
+United Kingdom - for the rest,EUR,Lunch,-18
+United Kingdom - for the rest,EUR,Dinner,-18
+United States of America - Atlanta,EUR,Full Day,62
+United States of America - Atlanta,EUR,Part Day,41
+United States of America - Atlanta,EUR,Overnight,175
+United States of America - Atlanta,EUR,Breakfast,-12.4
+United States of America - Atlanta,EUR,Lunch,-24.8
+United States of America - Atlanta,EUR,Dinner,-24.8
+United States of America - Boston,EUR,Full Day,58
+United States of America - Boston,EUR,Part Day,39
+United States of America - Boston,EUR,Overnight,265
+United States of America - Boston,EUR,Breakfast,-11.6
+United States of America - Boston,EUR,Lunch,-23.2
+United States of America - Boston,EUR,Dinner,-23.2
+United States of America - Chicago,EUR,Full Day,54
+United States of America - Chicago,EUR,Part Day,36
+United States of America - Chicago,EUR,Overnight,209
+United States of America - Chicago,EUR,Breakfast,-10.8
+United States of America - Chicago,EUR,Lunch,-21.6
+United States of America - Chicago,EUR,Dinner,-21.6
+United States of America - Houston,EUR,Full Day,63
+United States of America - Houston,EUR,Part Day,42
+United States of America - Houston,EUR,Overnight,138
+United States of America - Houston,EUR,Breakfast,-12.6
+United States of America - Houston,EUR,Lunch,-25.2
+United States of America - Houston,EUR,Dinner,-25.2
+United States of America - Los Angeles,EUR,Full Day,56
+United States of America - Los Angeles,EUR,Part Day,37
+United States of America - Los Angeles,EUR,Overnight,274
+United States of America - Los Angeles,EUR,Breakfast,-11.2
+United States of America - Los Angeles,EUR,Lunch,-22.4
+United States of America - Los Angeles,EUR,Dinner,-22.4
+United States of America - Miami,EUR,Full Day,64
+United States of America - Miami,EUR,Part Day,43
+United States of America - Miami,EUR,Overnight,151
+United States of America - Miami,EUR,Breakfast,-12.8
+United States of America - Miami,EUR,Lunch,-25.6
+United States of America - Miami,EUR,Dinner,-25.6
+United States of America - New York,EUR,Full Day,58
+United States of America - New York,EUR,Part Day,39
+United States of America - New York,EUR,Overnight,282
+United States of America - New York,EUR,Breakfast,-11.6
+United States of America - New York,EUR,Lunch,-23.2
+United States of America - New York,EUR,Dinner,-23.2
+United States of America - San Francisco,EUR,Full Day,51
+United States of America - San Francisco,EUR,Part Day,34
+United States of America - San Francisco,EUR,Overnight,314
+United States of America - San Francisco,EUR,Breakfast,-10.2
+United States of America - San Francisco,EUR,Lunch,-20.4
+United States of America - San Francisco,EUR,Dinner,-20.4
+United States of America - Washington D.C.,EUR,Full Day,62
+United States of America - Washington D.C.,EUR,Part Day,41
+United States of America - Washington D.C.,EUR,Overnight,276
+United States of America - Washington D.C.,EUR,Breakfast,-12.4
+United States of America - Washington D.C.,EUR,Lunch,-24.8
+United States of America - Washington D.C.,EUR,Dinner,-24.8
+United States of America - for the rest,EUR,Full Day,51
+United States of America - for the rest,EUR,Part Day,34
+United States of America - for the rest,EUR,Overnight,138
+United States of America - for the rest,EUR,Breakfast,-10.2
+United States of America - for the rest,EUR,Lunch,-20.4
+United States of America - for the rest,EUR,Dinner,-20.4
+Uruguay,EUR,Full Day,44
+Uruguay,EUR,Part Day,29
+Uruguay,EUR,Overnight,109
+Uruguay,EUR,Breakfast,-8.8
+Uruguay,EUR,Lunch,-17.6
+Uruguay,EUR,Dinner,-17.6
+Uzbekistan,EUR,Full Day,34
+Uzbekistan,EUR,Part Day,23
+Uzbekistan,EUR,Overnight,123
+Uzbekistan,EUR,Breakfast,-6.8
+Uzbekistan,EUR,Lunch,-13.6
+Uzbekistan,EUR,Dinner,-13.6
+Vatican City,EUR,Full Day,52
+Vatican City,EUR,Part Day,35
+Vatican City,EUR,Overnight,160
+Vatican City,EUR,Breakfast,-10.4
+Vatican City,EUR,Lunch,-20.8
+Vatican City,EUR,Dinner,-20.8
+Venezuela,EUR,Full Day,69
+Venezuela,EUR,Part Day,46
+Venezuela,EUR,Overnight,127
+Venezuela,EUR,Breakfast,-13.8
+Venezuela,EUR,Lunch,-27.6
+Venezuela,EUR,Dinner,-27.6
+Vietnam,EUR,Full Day,41
+Vietnam,EUR,Part Day,28
+Vietnam,EUR,Overnight,86
+Vietnam,EUR,Breakfast,-8.2
+Vietnam,EUR,Lunch,-16.4
+Vietnam,EUR,Dinner,-16.4
+Yemen,EUR,Full Day,24
+Yemen,EUR,Part Day,16
+Yemen,EUR,Overnight,95
+Yemen,EUR,Breakfast,-4.8
+Yemen,EUR,Lunch,-9.6
+Yemen,EUR,Dinner,-9.6
+Zambia,EUR,Full Day,36
+Zambia,EUR,Part Day,24
+Zambia,EUR,Overnight,130
+Zambia,EUR,Breakfast,-7.2
+Zambia,EUR,Lunch,-14.4
+Zambia,EUR,Dinner,-14.4
+Zimbabwe,EUR,Full Day,45
+Zimbabwe,EUR,Part Day,30
+Zimbabwe,EUR,Overnight,140
+Zimbabwe,EUR,Breakfast,-9
+Zimbabwe,EUR,Lunch,-18
+Zimbabwe,EUR,Dinner,-18
\ No newline at end of file
diff --git a/docs/assets/Files/Independent+with+GL+codes+format.csv b/docs/assets/Files/Independent+with+GL+codes+format.csv
new file mode 100644
index 000000000000..1bcda47c1fb3
--- /dev/null
+++ b/docs/assets/Files/Independent+with+GL+codes+format.csv
@@ -0,0 +1 @@
+Department,Department GL,Region,Region GL,Project,Project GL
Accounting,1000,North America,100,Project 1,10
Marketing,2000,South America,200,Project 2,20
Sales,3000,Africa,300,Project 3,30
HR,4000,Europe,400,Project 4,40
Engineering,5000,Asia,500,Project 5,50
Ops,6000,Australia,600,Project 6,60
\ No newline at end of file
diff --git a/docs/assets/Files/Independent+without+GL+codes+format.csv b/docs/assets/Files/Independent+without+GL+codes+format.csv
new file mode 100644
index 000000000000..a8a4b58515b6
--- /dev/null
+++ b/docs/assets/Files/Independent+without+GL+codes+format.csv
@@ -0,0 +1 @@
+Department,Region,Project
Accounting,North America,Project 1
Marketing,South America,Project 2
Sales,Africa,Project 3
HR,Europe,Project 4
Engineering,Asia,Project 5
Ops,Australia,Project 6
\ No newline at end of file
diff --git a/docs/assets/Files/South-Africa-per-diem.csv b/docs/assets/Files/South-Africa-per-diem.csv
new file mode 100644
index 000000000000..d8ed328edec6
--- /dev/null
+++ b/docs/assets/Files/South-Africa-per-diem.csv
@@ -0,0 +1,186 @@
+rateID,Destination,Subrate,Amount,Currency
+5e6618c88c782,Albania,International,100,EUR
+5e6618c88c788,Algeria,International,110,EUR
+5e6618c88c78a,Angola,International,303,USD
+5e6618c88c78b,Antigua and Barbuda,International,220,USD
+5e6618c88c78d,Argentina,International,133,USD
+5e6618c88c78e,Armenia,International,220,USD
+5e6618c88c78f,Australia,International,230,AUD
+5e6618c88c790,Austria,International,131,EUR
+5e6618c88c792,Bahamas,International,191,USD
+5e6618c88c793,Bahrain,International,36,BHD
+5e6618c88c794,Bangladesh,International,79,USD
+5e6618c88c795,Barbados,International,202,USD
+5e6618c88c796,Belarus,International,62,EUR
+5e6618c88c798,Belgium,International,146,EUR
+5e6618c88c799,Belize,International,152,USD
+5e6618c88c79a,Benin,International,111,EUR
+5e6618c88c79b,Bolivia,International,78,USD
+5e6618c88c79c,Bosnia-Herzegovina,International,75,EUR
+5e6618c88c79d,Botswana,International,826,BWP
+5e6618c88c79e,Brazil,International,409,BRL
+5e6618c88c79f,Brunei,International,88,USD
+5e6618c88c7a0,Bulgaria,International,91,EUR
+5e6618c88c7a1,Burkina Faso,International,"58,790.00",XAF
+5e6618c88c7a3,Burundi,International,73,EUR
+5e6618c88c7a4,Cambodia,International,99,USD
+5e6618c88c7a5,Cameroon,International,120,EUR
+5e6618c88c7a6,Cape Verde Islands,International,65,EUR
+5e6618c88c7a7,Central African Republic,International,94,EUR
+5e6618c88c7a9,Chad,International,121,EUR
+5e6618c88c7aa,Chile,International,106,USD
+5e6618c88c7af,China (People's Republic),International,127,USD
+5e6618c88c7b0,Colombia,International,94,USD
+5e6618c88c7b1,Comoro Island,International,122,EUR
+5e6618c88c7b2,Cook Islands,International,211,NZD
+5e6618c88c7b3,Costa Rica,International,116,USD
+5e6618c88c7b4,Cote D'Ivoire,International,119,EUR
+5e6618c88c7b6,Croatia,International,99,EUR
+5e6618c88c7b7,Cuba,International,114,USD
+5e6618c88c7b8,Cyprus,International,117,EUR
+5e6618c88c7b9,Czech Republic,International,90,EUR
+5e6618c88c7ba,Democratic Republic of Congo,International,164,USD
+5e6618c88c7bb,Denmark,International,"2,328.00",DKK
+5e6618c88c7bc,Djibouti,International,99,USD
+5e6618c88c7bd,Dominican Republic,International,99,USD
+5e6618c88c7be,Ecuador,International,163,USD
+5e6618c88c7bf,Egypt,International,873,USD
+5e6618c88c7c0,El Salvador,International,98,USD
+5e6618c88c7c1,Equatorial Guinea,International,166,EUR
+5e6618c88c7c2,Eritrea,International,109,USD
+5e6618c88c7c3,Estonia,International,92,EUR
+5e6618c88c7c4,Ethiopia,International,95,USD
+5e6618c88c7c5,Fiji,International,102,USD
+5e6618c88c7c6,Finland,International,171,EUR
+5e6618c88c7c7,France,International,129,EUR
+5e6618c88c7c8,Gabon,International,160,EUR
+5e6618c88c7c9,Gambia,International,74,EUR
+5e6618c88c7ca,Georgia,International,95,USD
+5e6618c88c7cb,Germany,International,125,EUR
+5e6618c88c7cc,Ghana,International,130,USD
+5e6618c88c7cd,Greece,International,138,EUR
+5e6618c88c7ce,Grenada,International,151,USD
+5e6618c88c7cf,Guatemala,International,114,USD
+5e6618c88c7d0,Guinea,International,78,EUR
+5e6618c88c7d1,Guinea Bissau,International,59,EUR
+5e6618c88c7d2,Guyana,International,118,USD
+5e6618c88c7d3,Haiti,International,109,USD
+5e6618c88c7d4,Honduras,International,186,USD
+5e6618c88c7d5,Hong Kong,International,"1,000.00",HKD
+5e6618c88c7d6,Hungary,International,92,EUR
+5e6618c88c7d7,Iceland,International,"25,466.00",ISK
+5e6618c88c7d8,India,International,"5,852.00",INR
+5e6618c88c7d9,Indonesia,International,86,USD
+5e6618c88c7da,Iran,International,120,USD
+5e6618c88c7db,Iraq,International,125,USD
+5e6618c88c7dc,Ireland,International,139,EUR
+5e6618c88c7dd,Israel,International,209,USD
+5e6618c88c7e1,Italy,International,125,EUR
+5e6618c88c7e3,Jamaica,International,151,USD
+5e6618c88c7e4,Japan,International,"16,275.00",JPY
+5e6618c88c7e5,Jordan,International,201,USD
+5e6618c88c7e6,Kazakhstan,International,100,USD
+5e6618c88c7e7,Kenya,International,138,USD
+5e6618c88c7e8,Kiribati,International,233,AUD
+5e6618c88c7e9,Kuwait (State of),International,51,KWD
+5e6618c88c7ea,Kyrgyzstan,International,172,USD
+5e6618c88c7eb,Laos,International,92,USD
+5e6618c88c7ec,Latvia,International,150,USD
+5e6618c88c7ed,Lebanon,International,158,USD
+5e6618c88c7ee,Lesotho,International,750,ZAR
+5e6618c88c7ef,Liberia,International,112,USD
+5e6618c88c7f0,Libya,International,120,USD
+5e6618c88c7f1,Lithuania,International,154,EUR
+5e6618c88c7f2,Macedonia (Former Yugoslav),International,100,EUR
+5e6618c88c7f3,Madagascar,International,58,EUR
+5e6618c88c7f4,Malawi,International,"31,254.00",MWK
+5e6618c88c7f5,Malaysia,International,382,MYR
+5e6618c88c7f6,Maldives,International,202,USD
+5e6618c88c7f7,Mali,International,178,EUR
+5e6618c88c7f8,Malta,International,132,EUR
+5e6618c88c7f9,Marshall Islands,International,255,USD
+5e6618c88c7fa,Mauritania,International,97,EUR
+5e6618c88c7fb,Mauritius,International,114,USD
+5e6618c88c7fc,Mexico,International,"1,313.00",MXN
+5e6618c88c7fd,Moldova,International,117,USD
+5e6618c88c7fe,Mongolia,International,69,USD
+5e6618c88c7ff,Montenegro,International,94,EUR
+5e6618c88c800,Morocco,International,"1,081.00",AED
+5e6618c88c801,Mozambique,International,101,USD
+5e6618c88c802,Myanmar,International,123,USD
+5e6618c88c803,Namibia,International,950,ZAR
+5e6618c88c804,Nauru,International,278,AUD
+5e6618c88c805,Nepal,International,64,USD
+5e6618c88c806,Netherlands,International,122,EUR
+5e6618c88c807,New Zealand,International,206,NZD
+5e6618c88c808,Nicaragua,International,90,USD
+5e6618c88c809,Niger,International,75,EUR
+5e6618c88c80a,Nigeria,International,242,USD
+5e6618c88c80b,Niue,International,252,NZD
+5e6618c88c80c,Norway,International,"1,760.00",NOK
+5e6618c88c80d,Oman,International,77,OMR
+5e6618c88c80e,Pakistan,International,"6,235.00",PKR
+5e6618c88c80f,Palau,International,252,USD
+5e6618c88c810,Palestine,International,147,USD
+5e6618c88c811,Panama,International,105,USD
+5e6618c88c812,Papa New Guinea,International,285,PGK
+5e6618c88c813,Paraguay,International,76,USD
+5e6618c88c815,Peru,International,139,USD
+5e6618c88c816,Philippines,International,122,USD
+5e6618c88c817,Poland,International,88,EUR
+5e6618c88c818,Portugal,International,87,EUR
+5e6618c88c819,Puerto Rico,International,215,USD
+5e6618c88c81a,Qatar,International,715,QAR
+5e6618c88c81b,Republic of Congo,International,149,EUR
+5e6618c88c81c,Reunion,International,164,EUR
+5e6618c88c81d,Romania,International,83,EUR
+5e6618c88c81e,Russia,International,330,EUR
+5e6618c88c81f,Rwanda,International,102,USD
+5e6618c88c823,Samoa,International,193,WST
+5e6618c88c825,Sao Tome & Principe,International,160,EUR
+5e6618c88c826,Saudi Arabia,International,512,SAR
+5e6618c88c827,Senegal,International,113,EUR
+5e6618c88c829,Serbia,International,83,EUR
+5e6618c88c82a,Seychelles,International,132,EUR
+5e6618c88c82c,Sierra Leone,International,90,USD
+5e6618c88c83b,Slovakia,International,102,EUR
+5e6618c88c83c,Slovenia,International,106,EUR
+5e6618c88c83d,Solomon Islands,International,"1,107.00",SBD
+5e6618c88c83e,South Korea Republic,International,"187,735.00",KRW
+5e6618c88c840,South Sudan,International,146,USD
+5e6618c88c841,Spain,International,112,EUR
+5e6618c88c842,Sri Lanka,International,100,USD
+5e6618c88c843,St. Kitts & Nevis,International,227,USD
+5e6618c88c844,St. Lucia,International,215,USD
+5e6618c88c845,St. Vincent & The Grenadines,International,187,USD
+5e6618c88c846,Sudan,International,200,USD
+5e6618c88c847,Suriname,International,107,USD
+5e6618c88c848,Swaziland,International,"1,367.00",ZAR
+5e6618c88c849,Sweden,International,"1,317.00",SEK
+5e6618c88c84a,Switzerland,International,201,CHF
+5e6618c88c84b,Syria,International,185,USD
+5e6618c88c84c,Taiwan,International,"3,505.00",TWD
+5e6618c88c84d,Tajikistan,International,97,USD
+5e6618c88c84e,Tanzania,International,129,USD
+5e6618c88c84f,Togo,International,"64,214.00",XAF
+5e6618c88c850,Tonga,International,251,TOP
+5e6618c88c851,Trinidad & Tobago,International,213,USD
+5e6618c88c852,Tunisia,International,198,TND
+5e6618c88c853,Turkey,International,101,EUR
+5e6618c88c854,Turkmenistan,International,125,USD
+5e6618c88c855,Tuvalu,International,339,AUD
+5e6618c88c856,USA,International,215,USD
+5e6618c88c857,Uganda,International,111,USD
+5e6618c88c858,Ukraine,International,131,EUR
+5e6618c88c859,Unit Kingdom - Fiber Lean,International,40,GBP
+5e6618c88c85a,United Arab Emirates,International,699,AED
+5e6618c88c85e,United Kingdom,International,102,GBP
+5e6618c88c860,Uruguay,International,133,USD
+5e6618c88c861,Uzbekistan,International,80,EUR
+5e6618c88c863,Vanuatu,International,166,USD
+5e6618c88c864,Venezuela,International,294,USD
+5e6618c88c865,Vietnam,International,91,USD
+5e6618c88c866,Yemen,International,94,USD
+5e6618c88c867,Zambia,International,119,USD
+5e6618c88c868,Zimbabwe,International,123,USD
+5e6618c88c8a4,South Africa,Local,452,ZAR
\ No newline at end of file
diff --git a/docs/assets/Files/Sweden-per-diem.csv b/docs/assets/Files/Sweden-per-diem.csv
new file mode 100644
index 000000000000..d20c0ac8e991
--- /dev/null
+++ b/docs/assets/Files/Sweden-per-diem.csv
@@ -0,0 +1,2037 @@
+Destination,Currency,Subrate,Amount
+Albanien (2018),SEK,Normalbelopp,230
+Albanien (2018),SEK,Breakfast,-34.5
+Albanien (2018),SEK,Lunch,-80.5
+Albanien (2018),SEK,Dinner,-80.5
+Albanien (2019),SEK,Normalbelopp,242
+Albanien (2019),SEK,Breakfast,-36.3
+Albanien (2019),SEK,Lunch,-84.7
+Albanien (2019),SEK,Dinner,-84.7
+Albanien (2020),SEK,Normalbelopp,254
+Albanien (2020),SEK,Breakfast,-38.1
+Albanien (2020),SEK,Lunch,-88.9
+Albanien (2020),SEK,Dinner,-88.9
+Algeriet (2018),SEK,Normalbelopp,335
+Algeriet (2018),SEK,Breakfast,-50.25
+Algeriet (2018),SEK,Lunch,-117.25
+Algeriet (2018),SEK,Dinner,-117.25
+Algeriet (2019),SEK,Normalbelopp,362
+Algeriet (2019),SEK,Breakfast,-54.3
+Algeriet (2019),SEK,Lunch,-126.7
+Algeriet (2019),SEK,Dinner,-126.7
+Algeriet (2020),SEK,Normalbelopp,378
+Algeriet (2020),SEK,Breakfast,-56.7
+Algeriet (2020),SEK,Lunch,-132.3
+Algeriet (2020),SEK,Dinner,-132.3
+Angola (2018),SEK,Normalbelopp,937
+Angola (2018),SEK,Breakfast,-140.55
+Angola (2018),SEK,Lunch,-327.95
+Angola (2018),SEK,Dinner,-327.95
+Angola (2019),SEK,Normalbelopp,567
+Angola (2019),SEK,Breakfast,-85.05
+Angola (2019),SEK,Lunch,-198.45
+Angola (2019),SEK,Dinner,-198.45
+Angola (2020),SEK,Normalbelopp,346
+Angola (2020),SEK,Breakfast,-51.9
+Angola (2020),SEK,Lunch,-121.1
+Angola (2020),SEK,Dinner,-121.1
+Antigua och Barbuda (2018),SEK,Normalbelopp,613
+Antigua och Barbuda (2018),SEK,Breakfast,-91.95
+Antigua och Barbuda (2018),SEK,Lunch,-214.55
+Antigua och Barbuda (2018),SEK,Dinner,-214.55
+Antigua och Barbuda (2019),SEK,Normalbelopp,670
+Antigua och Barbuda (2019),SEK,Breakfast,-100.5
+Antigua och Barbuda (2019),SEK,Lunch,-234.5
+Antigua och Barbuda (2019),SEK,Dinner,-234.5
+Antigua och Barbuda (2020),SEK,Normalbelopp,697
+Antigua och Barbuda (2020),SEK,Breakfast,-104.55
+Antigua och Barbuda (2020),SEK,Lunch,-243.95
+Antigua och Barbuda (2020),SEK,Dinner,-243.95
+Argentina (2018),SEK,Normalbelopp,454
+Argentina (2018),SEK,Breakfast,-68.1
+Argentina (2018),SEK,Lunch,-158.9
+Argentina (2018),SEK,Dinner,-158.9
+Argentina (2019),SEK,Normalbelopp,276
+Argentina (2019),SEK,Breakfast,-41.4
+Argentina (2019),SEK,Lunch,-96.6
+Argentina (2019),SEK,Dinner,-96.6
+Argentina (2020),SEK,Normalbelopp,240
+Argentina (2020),SEK,Breakfast,-36
+Argentina (2020),SEK,Lunch,-84
+Argentina (2020),SEK,Dinner,-84
+Armenien (2018),SEK,Normalbelopp,313
+Armenien (2018),SEK,Breakfast,-46.95
+Armenien (2018),SEK,Lunch,-109.55
+Armenien (2018),SEK,Dinner,-109.55
+Armenien (2019),SEK,Normalbelopp,329
+Armenien (2019),SEK,Breakfast,-49.35
+Armenien (2019),SEK,Lunch,-115.15
+Armenien (2019),SEK,Dinner,-115.15
+Armenien (2020),SEK,Normalbelopp,358
+Armenien (2020),SEK,Breakfast,-53.7
+Armenien (2020),SEK,Lunch,-125.3
+Armenien (2020),SEK,Dinner,-125.3
+Australien (2018),SEK,Normalbelopp,683
+Australien (2018),SEK,Breakfast,-102.45
+Australien (2018),SEK,Lunch,-239.05
+Australien (2018),SEK,Dinner,-239.05
+Australien (2019),SEK,Normalbelopp,685
+Australien (2019),SEK,Breakfast,-102.75
+Australien (2019),SEK,Lunch,-239.75
+Australien (2019),SEK,Dinner,-239.75
+Australien (2020),SEK,Normalbelopp,697
+Australien (2020),SEK,Breakfast,-104.55
+Australien (2020),SEK,Lunch,-243.95
+Australien (2020),SEK,Dinner,-243.95
+Azerbajdzjan (2018),SEK,Normalbelopp,322
+Azerbajdzjan (2018),SEK,Breakfast,-48.3
+Azerbajdzjan (2018),SEK,Lunch,-112.7
+Azerbajdzjan (2018),SEK,Dinner,-112.7
+Azerbajdzjan (2019),SEK,Normalbelopp,345
+Azerbajdzjan (2019),SEK,Breakfast,-51.75
+Azerbajdzjan (2019),SEK,Lunch,-120.75
+Azerbajdzjan (2019),SEK,Dinner,-120.75
+Azerbajdzjan (2020),SEK,Normalbelopp,359
+Azerbajdzjan (2020),SEK,Breakfast,-53.85
+Azerbajdzjan (2020),SEK,Lunch,-125.65
+Azerbajdzjan (2020),SEK,Dinner,-125.65
+Bahamas (2018),SEK,Normalbelopp,797
+Bahamas (2018),SEK,Breakfast,-119.55
+Bahamas (2018),SEK,Lunch,-278.95
+Bahamas (2018),SEK,Dinner,-278.95
+Bahamas (2019),SEK,Normalbelopp,878
+Bahamas (2019),SEK,Breakfast,-131.7
+Bahamas (2019),SEK,Lunch,-307.3
+Bahamas (2019),SEK,Dinner,-307.3
+Bahamas (2020),SEK,Normalbelopp,953
+Bahamas (2020),SEK,Breakfast,-142.95
+Bahamas (2020),SEK,Lunch,-333.55
+Bahamas (2020),SEK,Dinner,-333.55
+Bahrain (2018),SEK,Normalbelopp,581
+Bahrain (2018),SEK,Breakfast,-87.15
+Bahrain (2018),SEK,Lunch,-203.35
+Bahrain (2018),SEK,Dinner,-203.35
+Bahrain (2019),SEK,Normalbelopp,661
+Bahrain (2019),SEK,Breakfast,-99.15
+Bahrain (2019),SEK,Lunch,-231.35
+Bahrain (2019),SEK,Dinner,-231.35
+Bahrain (2020),SEK,Normalbelopp,696
+Bahrain (2020),SEK,Breakfast,-104.4
+Bahrain (2020),SEK,Lunch,-243.6
+Bahrain (2020),SEK,Dinner,-243.6
+Bangladesh (2018),SEK,Normalbelopp,389
+Bangladesh (2018),SEK,Breakfast,-58.35
+Bangladesh (2018),SEK,Lunch,-136.15
+Bangladesh (2018),SEK,Dinner,-136.15
+Bangladesh (2019),SEK,Normalbelopp,429
+Bangladesh (2019),SEK,Breakfast,-64.35
+Bangladesh (2019),SEK,Lunch,-150.15
+Bangladesh (2019),SEK,Dinner,-150.15
+Bangladesh (2020),SEK,Normalbelopp,457
+Bangladesh (2020),SEK,Breakfast,-68.55
+Bangladesh (2020),SEK,Lunch,-159.95
+Bangladesh (2020),SEK,Dinner,-159.95
+Barbados (2018),SEK,Normalbelopp,738
+Barbados (2018),SEK,Breakfast,-110.7
+Barbados (2018),SEK,Lunch,-258.3
+Barbados (2018),SEK,Dinner,-258.3
+Barbados (2019),SEK,Normalbelopp,818
+Barbados (2019),SEK,Breakfast,-122.7
+Barbados (2019),SEK,Lunch,-286.3
+Barbados (2019),SEK,Dinner,-286.3
+Barbados (2020),SEK,Normalbelopp,893
+Barbados (2020),SEK,Breakfast,-133.95
+Barbados (2020),SEK,Lunch,-312.55
+Barbados (2020),SEK,Dinner,-312.55
+Belgien (2018),SEK,Normalbelopp,678
+Belgien (2018),SEK,Breakfast,-101.7
+Belgien (2018),SEK,Lunch,-237.3
+Belgien (2018),SEK,Dinner,-237.3
+Belgien (2019),SEK,Normalbelopp,723
+Belgien (2019),SEK,Breakfast,-108.45
+Belgien (2019),SEK,Lunch,-253.05
+Belgien (2019),SEK,Dinner,-253.05
+Belgien (2020),SEK,Normalbelopp,756
+Belgien (2020),SEK,Breakfast,-113.4
+Belgien (2020),SEK,Lunch,-264.6
+Belgien (2020),SEK,Dinner,-264.6
+Belize (2018),SEK,Normalbelopp,453
+Belize (2018),SEK,Breakfast,-67.95
+Belize (2018),SEK,Lunch,-158.55
+Belize (2018),SEK,Dinner,-158.55
+Belize (2019),SEK,Normalbelopp,485
+Belize (2019),SEK,Breakfast,-72.75
+Belize (2019),SEK,Lunch,-169.75
+Belize (2019),SEK,Dinner,-169.75
+Belize (2020),SEK,Normalbelopp,524
+Belize (2020),SEK,Breakfast,-78.6
+Belize (2020),SEK,Lunch,-183.4
+Belize (2020),SEK,Dinner,-183.4
+Benin (2018),SEK,Normalbelopp,471
+Benin (2018),SEK,Breakfast,-70.65
+Benin (2018),SEK,Lunch,-164.85
+Benin (2018),SEK,Dinner,-164.85
+Benin (2019),SEK,Normalbelopp,507
+Benin (2019),SEK,Breakfast,-76.05
+Benin (2019),SEK,Lunch,-177.45
+Benin (2019),SEK,Dinner,-177.45
+Benin (2020),SEK,Normalbelopp,523
+Benin (2020),SEK,Breakfast,-78.45
+Benin (2020),SEK,Lunch,-183.05
+Benin (2020),SEK,Dinner,-183.05
+Bolivia (2018),SEK,Normalbelopp,280
+Bolivia (2018),SEK,Breakfast,-42
+Bolivia (2018),SEK,Lunch,-98
+Bolivia (2018),SEK,Dinner,-98
+Bolivia (2019),SEK,Normalbelopp,322
+Bolivia (2019),SEK,Breakfast,-48.3
+Bolivia (2019),SEK,Lunch,-112.7
+Bolivia (2019),SEK,Dinner,-112.7
+Bolivia (2020),SEK,Normalbelopp,363
+Bolivia (2020),SEK,Breakfast,-54.45
+Bolivia (2020),SEK,Lunch,-127.05
+Bolivia (2020),SEK,Dinner,-127.05
+Bosnien-Hercegovina (2018),SEK,Normalbelopp,323
+Bosnien-Hercegovina (2018),SEK,Breakfast,-48.45
+Bosnien-Hercegovina (2018),SEK,Lunch,-113.05
+Bosnien-Hercegovina (2018),SEK,Dinner,-113.05
+Bosnien-Hercegovina (2019),SEK,Normalbelopp,352
+Bosnien-Hercegovina (2019),SEK,Breakfast,-52.8
+Bosnien-Hercegovina (2019),SEK,Lunch,-123.2
+Bosnien-Hercegovina (2019),SEK,Dinner,-123.2
+Bosnien-Hercegovina (2020),SEK,Normalbelopp,357
+Bosnien-Hercegovina (2020),SEK,Breakfast,-53.55
+Bosnien-Hercegovina (2020),SEK,Lunch,-124.95
+Bosnien-Hercegovina (2020),SEK,Dinner,-124.95
+Botswana (2018),SEK,Normalbelopp,259
+Botswana (2018),SEK,Breakfast,-38.85
+Botswana (2018),SEK,Lunch,-90.65
+Botswana (2018),SEK,Dinner,-90.65
+Botswana (2019),SEK,Normalbelopp,301
+Botswana (2019),SEK,Breakfast,-45.15
+Botswana (2019),SEK,Lunch,-105.35
+Botswana (2019),SEK,Dinner,-105.35
+Botswana (2020),SEK,Normalbelopp,357
+Botswana (2020),SEK,Breakfast,-53.55
+Botswana (2020),SEK,Lunch,-124.95
+Botswana (2020),SEK,Dinner,-124.95
+Brasilien (2018),SEK,Normalbelopp,419
+Brasilien (2018),SEK,Breakfast,-62.85
+Brasilien (2018),SEK,Lunch,-146.65
+Brasilien (2018),SEK,Dinner,-146.65
+Brasilien (2019),SEK,Normalbelopp,411
+Brasilien (2019),SEK,Breakfast,-61.65
+Brasilien (2019),SEK,Lunch,-143.85
+Brasilien (2019),SEK,Dinner,-143.85
+Brasilien (2020),SEK,Normalbelopp,424
+Brasilien (2020),SEK,Breakfast,-63.6
+Brasilien (2020),SEK,Lunch,-148.4
+Brasilien (2020),SEK,Dinner,-148.4
+Brunei Darussalam (2018),SEK,Normalbelopp,366
+Brunei Darussalam (2018),SEK,Breakfast,-54.9
+Brunei Darussalam (2018),SEK,Lunch,-128.1
+Brunei Darussalam (2018),SEK,Dinner,-128.1
+Brunei Darussalam (2019),SEK,Normalbelopp,426
+Brunei Darussalam (2019),SEK,Breakfast,-63.9
+Brunei Darussalam (2019),SEK,Lunch,-149.1
+Brunei Darussalam (2019),SEK,Dinner,-149.1
+Brunei Darussalam (2020),SEK,Normalbelopp,470
+Brunei Darussalam (2020),SEK,Breakfast,-70.5
+Brunei Darussalam (2020),SEK,Lunch,-164.5
+Brunei Darussalam (2020),SEK,Dinner,-164.5
+Bulgarien (2018),SEK,Normalbelopp,347
+Bulgarien (2018),SEK,Breakfast,-52.05
+Bulgarien (2018),SEK,Lunch,-121.45
+Bulgarien (2018),SEK,Dinner,-121.45
+Bulgarien (2019),SEK,Normalbelopp,365
+Bulgarien (2019),SEK,Breakfast,-54.75
+Bulgarien (2019),SEK,Lunch,-127.75
+Bulgarien (2019),SEK,Dinner,-127.75
+Bulgarien (2020),SEK,Normalbelopp,375
+Bulgarien (2020),SEK,Breakfast,-56.25
+Bulgarien (2020),SEK,Lunch,-131.25
+Bulgarien (2020),SEK,Dinner,-131.25
+Burkina Faso (2018),SEK,Normalbelopp,400
+Burkina Faso (2018),SEK,Breakfast,-60
+Burkina Faso (2018),SEK,Lunch,-140
+Burkina Faso (2018),SEK,Dinner,-140
+Burkina Faso (2019),SEK,Normalbelopp,411
+Burkina Faso (2019),SEK,Breakfast,-61.65
+Burkina Faso (2019),SEK,Lunch,-143.85
+Burkina Faso (2019),SEK,Dinner,-143.85
+Burkina Faso (2020),SEK,Normalbelopp,419
+Burkina Faso (2020),SEK,Breakfast,-62.85
+Burkina Faso (2020),SEK,Lunch,-146.65
+Burkina Faso (2020),SEK,Dinner,-146.65
+Burma (2018),SEK,Normalbelopp,315
+Burma (2018),SEK,Breakfast,-47.25
+Burma (2018),SEK,Lunch,-110.25
+Burma (2018),SEK,Dinner,-110.25
+Burma (2019),SEK,Normalbelopp,286
+Burma (2019),SEK,Breakfast,-42.9
+Burma (2019),SEK,Lunch,-100.1
+Burma (2019),SEK,Dinner,-100.1
+Burma (2020),SEK,Normalbelopp,318
+Burma (2020),SEK,Breakfast,-47.7
+Burma (2020),SEK,Lunch,-111.3
+Burma (2020),SEK,Dinner,-111.3
+Centralafrikanska republiken (2018),SEK,Normalbelopp,393
+Centralafrikanska republiken (2018),SEK,Breakfast,-58.95
+Centralafrikanska republiken (2018),SEK,Lunch,-137.55
+Centralafrikanska republiken (2018),SEK,Dinner,-137.55
+Centralafrikanska republiken (2019),SEK,Normalbelopp,436
+Centralafrikanska republiken (2019),SEK,Breakfast,-65.4
+Centralafrikanska republiken (2019),SEK,Lunch,-152.6
+Centralafrikanska republiken (2019),SEK,Dinner,-152.6
+Centralafrikanska republiken (2020),SEK,Normalbelopp,463
+Centralafrikanska republiken (2020),SEK,Breakfast,-69.45
+Centralafrikanska republiken (2020),SEK,Lunch,-162.05
+Centralafrikanska republiken (2020),SEK,Dinner,-162.05
+Chile (2018),SEK,Normalbelopp,424
+Chile (2018),SEK,Breakfast,-63.6
+Chile (2018),SEK,Lunch,-148.4
+Chile (2018),SEK,Dinner,-148.4
+Chile (2019),SEK,Normalbelopp,422
+Chile (2019),SEK,Breakfast,-63.3
+Chile (2019),SEK,Lunch,-147.7
+Chile (2019),SEK,Dinner,-147.7
+Chile (2020),SEK,Normalbelopp,436
+Chile (2020),SEK,Breakfast,-65.4
+Chile (2020),SEK,Lunch,-152.6
+Chile (2020),SEK,Dinner,-152.6
+Colombia (2018),SEK,Normalbelopp,329
+Colombia (2018),SEK,Breakfast,-49.35
+Colombia (2018),SEK,Lunch,-115.15
+Colombia (2018),SEK,Dinner,-115.15
+Colombia (2019),SEK,Normalbelopp,345
+Colombia (2019),SEK,Breakfast,-51.75
+Colombia (2019),SEK,Lunch,-120.75
+Colombia (2019),SEK,Dinner,-120.75
+Colombia (2020),SEK,Normalbelopp,345
+Colombia (2020),SEK,Breakfast,-51.75
+Colombia (2020),SEK,Lunch,-120.75
+Colombia (2020),SEK,Dinner,-120.75
+Costa Rica (2018),SEK,Normalbelopp,445
+Costa Rica (2018),SEK,Breakfast,-66.75
+Costa Rica (2018),SEK,Lunch,-155.75
+Costa Rica (2018),SEK,Dinner,-155.75
+Costa Rica (2019),SEK,Normalbelopp,464
+Costa Rica (2019),SEK,Breakfast,-69.6
+Costa Rica (2019),SEK,Lunch,-162.4
+Costa Rica (2019),SEK,Dinner,-162.4
+Costa Rica (2020),SEK,Normalbelopp,534
+Costa Rica (2020),SEK,Breakfast,-80.1
+Costa Rica (2020),SEK,Lunch,-186.9
+Costa Rica (2020),SEK,Dinner,-186.9
+Cypern (2018),SEK,Normalbelopp,543
+Cypern (2018),SEK,Breakfast,-81.45
+Cypern (2018),SEK,Lunch,-190.05
+Cypern (2018),SEK,Dinner,-190.05
+Cypern (2019),SEK,Normalbelopp,505
+Cypern (2019),SEK,Breakfast,-75.75
+Cypern (2019),SEK,Lunch,-176.75
+Cypern (2019),SEK,Dinner,-176.75
+Cypern (2020),SEK,Normalbelopp,605
+Cypern (2020),SEK,Breakfast,-90.75
+Cypern (2020),SEK,Lunch,-211.75
+Cypern (2020),SEK,Dinner,-211.75
+Danmark (2018),SEK,Normalbelopp,915
+Danmark (2018),SEK,Breakfast,-137.25
+Danmark (2018),SEK,Lunch,-320.25
+Danmark (2018),SEK,Dinner,-320.25
+Danmark (2019),SEK,Normalbelopp,993
+Danmark (2019),SEK,Breakfast,-148.95
+Danmark (2019),SEK,Lunch,-347.55
+Danmark (2019),SEK,Dinner,-347.55
+Danmark (2020),SEK,Normalbelopp,1016
+Danmark (2020),SEK,Breakfast,-152.4
+Danmark (2020),SEK,Lunch,-355.6
+Danmark (2020),SEK,Dinner,-355.6
+Djibouti (2018),SEK,Normalbelopp,480
+Djibouti (2018),SEK,Breakfast,-72
+Djibouti (2018),SEK,Lunch,-168
+Djibouti (2018),SEK,Dinner,-168
+Djibouti (2019),SEK,Normalbelopp,529
+Djibouti (2019),SEK,Breakfast,-79.35
+Djibouti (2019),SEK,Lunch,-185.15
+Djibouti (2019),SEK,Dinner,-185.15
+Djibouti (2020),SEK,Normalbelopp,561
+Djibouti (2020),SEK,Breakfast,-84.15
+Djibouti (2020),SEK,Lunch,-196.35
+Djibouti (2020),SEK,Dinner,-196.35
+Ecuador (2018),SEK,Normalbelopp,512
+Ecuador (2018),SEK,Breakfast,-76.8
+Ecuador (2018),SEK,Lunch,-179.2
+Ecuador (2018),SEK,Dinner,-179.2
+Ecuador (2019),SEK,Normalbelopp,562
+Ecuador (2019),SEK,Breakfast,-84.3
+Ecuador (2019),SEK,Lunch,-196.7
+Ecuador (2019),SEK,Dinner,-196.7
+Ecuador (2020),SEK,Normalbelopp,592
+Ecuador (2020),SEK,Breakfast,-88.8
+Ecuador (2020),SEK,Lunch,-207.2
+Ecuador (2020),SEK,Dinner,-207.2
+Egypten (2018),SEK,Normalbelopp,230
+Egypten (2018),SEK,Breakfast,-34.5
+Egypten (2018),SEK,Lunch,-80.5
+Egypten (2018),SEK,Dinner,-80.5
+Egypten (2019),SEK,Normalbelopp,233
+Egypten (2019),SEK,Breakfast,-34.95
+Egypten (2019),SEK,Lunch,-81.55
+Egypten (2019),SEK,Dinner,-81.55
+Egypten (2020),SEK,Normalbelopp,302
+Egypten (2020),SEK,Breakfast,-45.3
+Egypten (2020),SEK,Lunch,-105.7
+Egypten (2020),SEK,Dinner,-105.7
+El Salvador (2018),SEK,Normalbelopp,405
+El Salvador (2018),SEK,Breakfast,-60.75
+El Salvador (2018),SEK,Lunch,-141.75
+El Salvador (2018),SEK,Dinner,-141.75
+El Salvador (2019),SEK,Normalbelopp,449
+El Salvador (2019),SEK,Breakfast,-67.35
+El Salvador (2019),SEK,Lunch,-157.15
+El Salvador (2019),SEK,Dinner,-157.15
+El Salvador (2020),SEK,Normalbelopp,484
+El Salvador (2020),SEK,Breakfast,-72.6
+El Salvador (2020),SEK,Lunch,-169.4
+El Salvador (2020),SEK,Dinner,-169.4
+Elfenbenskusten (2018),SEK,Normalbelopp,512
+Elfenbenskusten (2018),SEK,Breakfast,-76.8
+Elfenbenskusten (2018),SEK,Lunch,-179.2
+Elfenbenskusten (2018),SEK,Dinner,-179.2
+Elfenbenskusten (2019),SEK,Normalbelopp,562
+Elfenbenskusten (2019),SEK,Breakfast,-84.3
+Elfenbenskusten (2019),SEK,Lunch,-196.7
+Elfenbenskusten (2019),SEK,Dinner,-196.7
+Elfenbenskusten (2020),SEK,Normalbelopp,608
+Elfenbenskusten (2020),SEK,Breakfast,-91.2
+Elfenbenskusten (2020),SEK,Lunch,-212.8
+Elfenbenskusten (2020),SEK,Dinner,-212.8
+Eritrea (2018),SEK,Normalbelopp,471
+Eritrea (2018),SEK,Breakfast,-70.65
+Eritrea (2018),SEK,Lunch,-164.85
+Eritrea (2018),SEK,Dinner,-164.85
+Eritrea (2019),SEK,Normalbelopp,515
+Eritrea (2019),SEK,Breakfast,-77.25
+Eritrea (2019),SEK,Lunch,-180.25
+Eritrea (2019),SEK,Dinner,-180.25
+Eritrea (2020),SEK,Normalbelopp,468
+Eritrea (2020),SEK,Breakfast,-70.2
+Eritrea (2020),SEK,Lunch,-163.8
+Eritrea (2020),SEK,Dinner,-163.8
+Estland (2018),SEK,Normalbelopp,459
+Estland (2018),SEK,Breakfast,-68.85
+Estland (2018),SEK,Lunch,-160.65
+Estland (2018),SEK,Dinner,-160.65
+Estland (2019),SEK,Normalbelopp,491
+Estland (2019),SEK,Breakfast,-73.65
+Estland (2019),SEK,Lunch,-171.85
+Estland (2019),SEK,Dinner,-171.85
+Estland (2020),SEK,Normalbelopp,506
+Estland (2020),SEK,Breakfast,-75.9
+Estland (2020),SEK,Lunch,-177.1
+Estland (2020),SEK,Dinner,-177.1
+Etiopien (2018),SEK,Normalbelopp,230
+Etiopien (2018),SEK,Breakfast,-34.5
+Etiopien (2018),SEK,Lunch,-80.5
+Etiopien (2018),SEK,Dinner,-80.5
+Etiopien (2019),SEK,Normalbelopp,265
+Etiopien (2019),SEK,Breakfast,-39.75
+Etiopien (2019),SEK,Lunch,-92.75
+Etiopien (2019),SEK,Dinner,-92.75
+Etiopien (2020),SEK,Normalbelopp,266
+Etiopien (2020),SEK,Breakfast,-39.9
+Etiopien (2020),SEK,Lunch,-93.1
+Etiopien (2020),SEK,Dinner,-93.1
+Filippinerna (2018),SEK,Normalbelopp,357
+Filippinerna (2018),SEK,Breakfast,-53.55
+Filippinerna (2018),SEK,Lunch,-124.95
+Filippinerna (2018),SEK,Dinner,-124.95
+Filippinerna (2019),SEK,Normalbelopp,384
+Filippinerna (2019),SEK,Breakfast,-57.6
+Filippinerna (2019),SEK,Lunch,-134.4
+Filippinerna (2019),SEK,Dinner,-134.4
+Filippinerna (2020),SEK,Normalbelopp,441
+Filippinerna (2020),SEK,Breakfast,-66.15
+Filippinerna (2020),SEK,Lunch,-154.35
+Filippinerna (2020),SEK,Dinner,-154.35
+Finland (2018),SEK,Normalbelopp,680
+Finland (2018),SEK,Breakfast,-102
+Finland (2018),SEK,Lunch,-238
+Finland (2018),SEK,Dinner,-238
+Finland (2019),SEK,Normalbelopp,729
+Finland (2019),SEK,Breakfast,-109.35
+Finland (2019),SEK,Lunch,-255.15
+Finland (2019),SEK,Dinner,-255.15
+Finland (2020),SEK,Normalbelopp,759
+Finland (2020),SEK,Breakfast,-113.85
+Finland (2020),SEK,Lunch,-265.65
+Finland (2020),SEK,Dinner,-265.65
+Förenade Arabemiraten (2018),SEK,Normalbelopp,703
+Förenade Arabemiraten (2018),SEK,Breakfast,-105.45
+Förenade Arabemiraten (2018),SEK,Lunch,-246.05
+Förenade Arabemiraten (2018),SEK,Dinner,-246.05
+Förenade Arabemiraten (2019),SEK,Normalbelopp,849
+Förenade Arabemiraten (2019),SEK,Breakfast,-127.35
+Förenade Arabemiraten (2019),SEK,Lunch,-297.15
+Förenade Arabemiraten (2019),SEK,Dinner,-297.15
+Förenade Arabemiraten (2020),SEK,Normalbelopp,899
+Förenade Arabemiraten (2020),SEK,Breakfast,-134.85
+Förenade Arabemiraten (2020),SEK,Lunch,-314.65
+Förenade Arabemiraten (2020),SEK,Dinner,-314.65
+Frankrike (2018),SEK,Normalbelopp,714
+Frankrike (2018),SEK,Breakfast,-107.1
+Frankrike (2018),SEK,Lunch,-249.9
+Frankrike (2018),SEK,Dinner,-249.9
+Frankrike (2019),SEK,Normalbelopp,760
+Frankrike (2019),SEK,Breakfast,-114
+Frankrike (2019),SEK,Lunch,-266
+Frankrike (2019),SEK,Dinner,-266
+Frankrike (2020),SEK,Normalbelopp,794
+Frankrike (2020),SEK,Breakfast,-119.1
+Frankrike (2020),SEK,Lunch,-277.9
+Frankrike (2020),SEK,Dinner,-277.9
+Gabon (2018),SEK,Normalbelopp,708
+Gabon (2018),SEK,Breakfast,-106.2
+Gabon (2018),SEK,Lunch,-247.8
+Gabon (2018),SEK,Dinner,-247.8
+Gabon (2019),SEK,Normalbelopp,742
+Gabon (2019),SEK,Breakfast,-111.3
+Gabon (2019),SEK,Lunch,-259.7
+Gabon (2019),SEK,Dinner,-259.7
+Gabon (2020),SEK,Normalbelopp,751
+Gabon (2020),SEK,Breakfast,-112.65
+Gabon (2020),SEK,Lunch,-262.85
+Gabon (2020),SEK,Dinner,-262.85
+Gambia (2018),SEK,Normalbelopp,237
+Gambia (2018),SEK,Breakfast,-35.55
+Gambia (2018),SEK,Lunch,-82.95
+Gambia (2018),SEK,Dinner,-82.95
+Gambia (2019),SEK,Normalbelopp,244
+Gambia (2019),SEK,Breakfast,-36.6
+Gambia (2019),SEK,Lunch,-85.4
+Gambia (2019),SEK,Dinner,-85.4
+Gambia (2020),SEK,Normalbelopp,260
+Gambia (2020),SEK,Breakfast,-39
+Gambia (2020),SEK,Lunch,-91
+Gambia (2020),SEK,Dinner,-91
+Georgien (2018),SEK,Normalbelopp,230
+Georgien (2018),SEK,Breakfast,-34.5
+Georgien (2018),SEK,Lunch,-80.5
+Georgien (2018),SEK,Dinner,-80.5
+Georgien (2019),SEK,Normalbelopp,235
+Georgien (2019),SEK,Breakfast,-35.25
+Georgien (2019),SEK,Lunch,-82.25
+Georgien (2019),SEK,Dinner,-82.25
+Georgien (2020),SEK,Normalbelopp,240
+Georgien (2020),SEK,Breakfast,-36
+Georgien (2020),SEK,Lunch,-84
+Georgien (2020),SEK,Dinner,-84
+Ghana (2018),SEK,Normalbelopp,404
+Ghana (2018),SEK,Breakfast,-60.6
+Ghana (2018),SEK,Lunch,-141.4
+Ghana (2018),SEK,Dinner,-141.4
+Ghana (2019),SEK,Normalbelopp,407
+Ghana (2019),SEK,Breakfast,-61.05
+Ghana (2019),SEK,Lunch,-142.45
+Ghana (2019),SEK,Dinner,-142.45
+Ghana (2020),SEK,Normalbelopp,372
+Ghana (2020),SEK,Breakfast,-55.8
+Ghana (2020),SEK,Lunch,-130.2
+Ghana (2020),SEK,Dinner,-130.2
+Grekland (2018),SEK,Normalbelopp,589
+Grekland (2018),SEK,Breakfast,-88.35
+Grekland (2018),SEK,Lunch,-206.15
+Grekland (2018),SEK,Dinner,-206.15
+Grekland (2019),SEK,Normalbelopp,625
+Grekland (2019),SEK,Breakfast,-93.75
+Grekland (2019),SEK,Lunch,-218.75
+Grekland (2019),SEK,Dinner,-218.75
+Grekland (2020),SEK,Normalbelopp,650
+Grekland (2020),SEK,Breakfast,-97.5
+Grekland (2020),SEK,Lunch,-227.5
+Grekland (2020),SEK,Dinner,-227.5
+Grenada (2018),SEK,Normalbelopp,477
+Grenada (2018),SEK,Breakfast,-71.55
+Grenada (2018),SEK,Lunch,-166.95
+Grenada (2018),SEK,Dinner,-166.95
+Grenada (2019),SEK,Normalbelopp,550
+Grenada (2019),SEK,Breakfast,-82.5
+Grenada (2019),SEK,Lunch,-192.5
+Grenada (2019),SEK,Dinner,-192.5
+Grenada (2020),SEK,Normalbelopp,581
+Grenada (2020),SEK,Breakfast,-87.15
+Grenada (2020),SEK,Lunch,-203.35
+Grenada (2020),SEK,Dinner,-203.35
+Grönland (2018),SEK,Normalbelopp,915
+Grönland (2018),SEK,Breakfast,-137.25
+Grönland (2018),SEK,Lunch,-320.25
+Grönland (2018),SEK,Dinner,-320.25
+Grönland (2019),SEK,Normalbelopp,993
+Grönland (2019),SEK,Breakfast,-148.95
+Grönland (2019),SEK,Lunch,-347.55
+Grönland (2019),SEK,Dinner,-347.55
+Grönland (2020),SEK,Normalbelopp,1016
+Grönland (2020),SEK,Breakfast,-152.4
+Grönland (2020),SEK,Lunch,-355.6
+Grönland (2020),SEK,Dinner,-355.6
+Guinea (2018),SEK,Normalbelopp,400
+Guinea (2018),SEK,Breakfast,-60
+Guinea (2018),SEK,Lunch,-140
+Guinea (2018),SEK,Dinner,-140
+Guinea (2019),SEK,Normalbelopp,444
+Guinea (2019),SEK,Breakfast,-66.6
+Guinea (2019),SEK,Lunch,-155.4
+Guinea (2019),SEK,Dinner,-155.4
+Guinea (2020),SEK,Normalbelopp,475
+Guinea (2020),SEK,Breakfast,-71.25
+Guinea (2020),SEK,Lunch,-166.25
+Guinea (2020),SEK,Dinner,-166.25
+Guyana (2018),SEK,Normalbelopp,494
+Guyana (2018),SEK,Breakfast,-74.1
+Guyana (2018),SEK,Lunch,-172.9
+Guyana (2018),SEK,Dinner,-172.9
+Guyana (2019),SEK,Normalbelopp,518
+Guyana (2019),SEK,Breakfast,-77.7
+Guyana (2019),SEK,Lunch,-181.3
+Guyana (2019),SEK,Dinner,-181.3
+Guyana (2020),SEK,Normalbelopp,548
+Guyana (2020),SEK,Breakfast,-82.2
+Guyana (2020),SEK,Lunch,-191.8
+Guyana (2020),SEK,Dinner,-191.8
+Haiti (2018),SEK,Normalbelopp,525
+Haiti (2018),SEK,Breakfast,-78.75
+Haiti (2018),SEK,Lunch,-183.75
+Haiti (2018),SEK,Dinner,-183.75
+Haiti (2019),SEK,Normalbelopp,548
+Haiti (2019),SEK,Breakfast,-82.2
+Haiti (2019),SEK,Lunch,-191.8
+Haiti (2019),SEK,Dinner,-191.8
+Haiti (2020),SEK,Normalbelopp,451
+Haiti (2020),SEK,Breakfast,-67.65
+Haiti (2020),SEK,Lunch,-157.85
+Haiti (2020),SEK,Dinner,-157.85
+Honduras (2018),SEK,Normalbelopp,312
+Honduras (2018),SEK,Breakfast,-46.8
+Honduras (2018),SEK,Lunch,-109.2
+Honduras (2018),SEK,Dinner,-109.2
+Honduras (2019),SEK,Normalbelopp,328
+Honduras (2019),SEK,Breakfast,-49.2
+Honduras (2019),SEK,Lunch,-114.8
+Honduras (2019),SEK,Dinner,-114.8
+Honduras (2020),SEK,Normalbelopp,351
+Honduras (2020),SEK,Breakfast,-52.65
+Honduras (2020),SEK,Lunch,-122.85
+Honduras (2020),SEK,Dinner,-122.85
+Hong Kong (2018),SEK,Normalbelopp,538
+Hong Kong (2018),SEK,Breakfast,-80.7
+Hong Kong (2018),SEK,Lunch,-188.3
+Hong Kong (2018),SEK,Dinner,-188.3
+Hong Kong (2019),SEK,Normalbelopp,578
+Hong Kong (2019),SEK,Breakfast,-86.7
+Hong Kong (2019),SEK,Lunch,-202.3
+Hong Kong (2019),SEK,Dinner,-202.3
+Hong Kong (2020),SEK,Normalbelopp,590
+Hong Kong (2020),SEK,Breakfast,-88.5
+Hong Kong (2020),SEK,Lunch,-206.5
+Hong Kong (2020),SEK,Dinner,-206.5
+Indien (2018),SEK,Normalbelopp,319
+Indien (2018),SEK,Breakfast,-47.85
+Indien (2018),SEK,Lunch,-111.65
+Indien (2018),SEK,Dinner,-111.65
+Indien (2019),SEK,Normalbelopp,320
+Indien (2019),SEK,Breakfast,-48
+Indien (2019),SEK,Lunch,-112
+Indien (2019),SEK,Dinner,-112
+Indien (2020),SEK,Normalbelopp,356
+Indien (2020),SEK,Breakfast,-53.4
+Indien (2020),SEK,Lunch,-124.6
+Indien (2020),SEK,Dinner,-124.6
+Indonesien (2018),SEK,Normalbelopp,358
+Indonesien (2018),SEK,Breakfast,-53.7
+Indonesien (2018),SEK,Lunch,-125.3
+Indonesien (2018),SEK,Dinner,-125.3
+Indonesien (2019),SEK,Normalbelopp,348
+Indonesien (2019),SEK,Breakfast,-52.2
+Indonesien (2019),SEK,Lunch,-121.8
+Indonesien (2019),SEK,Dinner,-121.8
+Indonesien (2020),SEK,Normalbelopp,404
+Indonesien (2020),SEK,Breakfast,-60.6
+Indonesien (2020),SEK,Lunch,-141.4
+Indonesien (2020),SEK,Dinner,-141.4
+Irak (2018),SEK,Normalbelopp,626
+Irak (2018),SEK,Breakfast,-93.9
+Irak (2018),SEK,Lunch,-219.1
+Irak (2018),SEK,Dinner,-219.1
+Irak (2019),SEK,Normalbelopp,671
+Irak (2019),SEK,Breakfast,-100.65
+Irak (2019),SEK,Lunch,-234.85
+Irak (2019),SEK,Dinner,-234.85
+Irak (2020),SEK,Normalbelopp,703
+Irak (2020),SEK,Breakfast,-105.45
+Irak (2020),SEK,Lunch,-246.05
+Irak (2020),SEK,Dinner,-246.05
+Iran (2018),SEK,Normalbelopp,410
+Iran (2018),SEK,Breakfast,-61.5
+Iran (2018),SEK,Lunch,-143.5
+Iran (2018),SEK,Dinner,-143.5
+Iran (2019),SEK,Normalbelopp,362
+Iran (2019),SEK,Breakfast,-54.3
+Iran (2019),SEK,Lunch,-126.7
+Iran (2019),SEK,Dinner,-126.7
+Iran (2020),SEK,Normalbelopp,452
+Iran (2020),SEK,Breakfast,-67.8
+Iran (2020),SEK,Lunch,-158.2
+Iran (2020),SEK,Dinner,-158.2
+Irland (2018),SEK,Normalbelopp,654
+Irland (2018),SEK,Breakfast,-98.1
+Irland (2018),SEK,Lunch,-228.9
+Irland (2018),SEK,Dinner,-228.9
+Irland (2019),SEK,Normalbelopp,703
+Irland (2019),SEK,Breakfast,-105.45
+Irland (2019),SEK,Lunch,-246.05
+Irland (2019),SEK,Dinner,-246.05
+Irland (2020),SEK,Normalbelopp,727
+Irland (2020),SEK,Breakfast,-109.05
+Irland (2020),SEK,Lunch,-254.45
+Irland (2020),SEK,Dinner,-254.45
+Island (2018),SEK,Normalbelopp,837
+Island (2018),SEK,Breakfast,-125.55
+Island (2018),SEK,Lunch,-292.95
+Island (2018),SEK,Dinner,-292.95
+Island (2019),SEK,Normalbelopp,798
+Island (2019),SEK,Breakfast,-119.7
+Island (2019),SEK,Lunch,-279.3
+Island (2019),SEK,Dinner,-279.3
+Island (2020),SEK,Normalbelopp,838
+Island (2020),SEK,Breakfast,-125.7
+Island (2020),SEK,Lunch,-293.3
+Island (2020),SEK,Dinner,-293.3
+Israel (2018),SEK,Normalbelopp,828
+Israel (2018),SEK,Breakfast,-124.2
+Israel (2018),SEK,Lunch,-289.8
+Israel (2018),SEK,Dinner,-289.8
+Israel (2019),SEK,Normalbelopp,822
+Israel (2019),SEK,Breakfast,-123.3
+Israel (2019),SEK,Lunch,-287.7
+Israel (2019),SEK,Dinner,-287.7
+Israel (2020),SEK,Normalbelopp,921
+Israel (2020),SEK,Breakfast,-138.15
+Israel (2020),SEK,Lunch,-322.35
+Israel (2020),SEK,Dinner,-322.35
+Italien (2018),SEK,Normalbelopp,540
+Italien (2018),SEK,Breakfast,-81
+Italien (2018),SEK,Lunch,-189
+Italien (2018),SEK,Dinner,-189
+Italien (2019),SEK,Normalbelopp,590
+Italien (2019),SEK,Breakfast,-88.5
+Italien (2019),SEK,Lunch,-206.5
+Italien (2019),SEK,Dinner,-206.5
+Italien (2020),SEK,Normalbelopp,627
+Italien (2020),SEK,Breakfast,-94.05
+Italien (2020),SEK,Lunch,-219.45
+Italien (2020),SEK,Dinner,-219.45
+Jamaica (2018),SEK,Normalbelopp,475
+Jamaica (2018),SEK,Breakfast,-71.25
+Jamaica (2018),SEK,Lunch,-166.25
+Jamaica (2018),SEK,Dinner,-166.25
+Jamaica (2019),SEK,Normalbelopp,539
+Jamaica (2019),SEK,Breakfast,-80.85
+Jamaica (2019),SEK,Lunch,-188.65
+Jamaica (2019),SEK,Dinner,-188.65
+Jamaica (2020),SEK,Normalbelopp,519
+Jamaica (2020),SEK,Breakfast,-77.85
+Jamaica (2020),SEK,Lunch,-181.65
+Jamaica (2020),SEK,Dinner,-181.65
+Japan (2018),SEK,Normalbelopp,503
+Japan (2018),SEK,Breakfast,-75.45
+Japan (2018),SEK,Lunch,-176.05
+Japan (2018),SEK,Dinner,-176.05
+Japan (2019),SEK,Normalbelopp,537
+Japan (2019),SEK,Breakfast,-80.55
+Japan (2019),SEK,Lunch,-187.95
+Japan (2019),SEK,Dinner,-187.95
+Japan (2020),SEK,Normalbelopp,587
+Japan (2020),SEK,Breakfast,-88.05
+Japan (2020),SEK,Lunch,-205.45
+Japan (2020),SEK,Dinner,-205.45
+Jordanien (2018),SEK,Normalbelopp,651
+Jordanien (2018),SEK,Breakfast,-97.65
+Jordanien (2018),SEK,Lunch,-227.85
+Jordanien (2018),SEK,Dinner,-227.85
+Jordanien (2019),SEK,Normalbelopp,709
+Jordanien (2019),SEK,Breakfast,-106.35
+Jordanien (2019),SEK,Lunch,-248.15
+Jordanien (2019),SEK,Dinner,-248.15
+Jordanien (2020),SEK,Normalbelopp,748
+Jordanien (2020),SEK,Breakfast,-112.2
+Jordanien (2020),SEK,Lunch,-261.8
+Jordanien (2020),SEK,Dinner,-261.8
+Kambodja (2018),SEK,Normalbelopp,380
+Kambodja (2018),SEK,Breakfast,-57
+Kambodja (2018),SEK,Lunch,-133
+Kambodja (2018),SEK,Dinner,-133
+Kambodja (2019),SEK,Normalbelopp,434
+Kambodja (2019),SEK,Breakfast,-65.1
+Kambodja (2019),SEK,Lunch,-151.9
+Kambodja (2019),SEK,Dinner,-151.9
+Kambodja (2020),SEK,Normalbelopp,485
+Kambodja (2020),SEK,Breakfast,-72.75
+Kambodja (2020),SEK,Lunch,-169.75
+Kambodja (2020),SEK,Dinner,-169.75
+Kamerun (2018),SEK,Normalbelopp,491
+Kamerun (2018),SEK,Breakfast,-73.65
+Kamerun (2018),SEK,Lunch,-171.85
+Kamerun (2018),SEK,Dinner,-171.85
+Kamerun (2019),SEK,Normalbelopp,504
+Kamerun (2019),SEK,Breakfast,-75.6
+Kamerun (2019),SEK,Lunch,-176.4
+Kamerun (2019),SEK,Dinner,-176.4
+Kamerun (2020),SEK,Normalbelopp,520
+Kamerun (2020),SEK,Breakfast,-78
+Kamerun (2020),SEK,Lunch,-182
+Kamerun (2020),SEK,Dinner,-182
+Kanada (2018),SEK,Normalbelopp,556
+Kanada (2018),SEK,Breakfast,-83.4
+Kanada (2018),SEK,Lunch,-194.6
+Kanada (2018),SEK,Dinner,-194.6
+Kanada (2019),SEK,Normalbelopp,616
+Kanada (2019),SEK,Breakfast,-92.4
+Kanada (2019),SEK,Lunch,-215.6
+Kanada (2019),SEK,Dinner,-215.6
+Kanada (2020),SEK,Normalbelopp,662
+Kanada (2020),SEK,Breakfast,-99.3
+Kanada (2020),SEK,Lunch,-231.7
+Kanada (2020),SEK,Dinner,-231.7
+Kazakstan (2018),SEK,Normalbelopp,262
+Kazakstan (2018),SEK,Breakfast,-39.3
+Kazakstan (2018),SEK,Lunch,-91.7
+Kazakstan (2018),SEK,Dinner,-91.7
+Kazakstan (2019),SEK,Normalbelopp,261
+Kazakstan (2019),SEK,Breakfast,-39.15
+Kazakstan (2019),SEK,Lunch,-91.35
+Kazakstan (2019),SEK,Dinner,-91.35
+Kazakstan (2020),SEK,Normalbelopp,257
+Kazakstan (2020),SEK,Breakfast,-38.55
+Kazakstan (2020),SEK,Lunch,-89.95
+Kazakstan (2020),SEK,Dinner,-89.95
+Kenya (2018),SEK,Normalbelopp,438
+Kenya (2018),SEK,Breakfast,-65.7
+Kenya (2018),SEK,Lunch,-153.3
+Kenya (2018),SEK,Dinner,-153.3
+Kenya (2019),SEK,Normalbelopp,488
+Kenya (2019),SEK,Breakfast,-73.2
+Kenya (2019),SEK,Lunch,-170.8
+Kenya (2019),SEK,Dinner,-170.8
+Kenya (2020),SEK,Normalbelopp,505
+Kenya (2020),SEK,Breakfast,-75.75
+Kenya (2020),SEK,Lunch,-176.75
+Kenya (2020),SEK,Dinner,-176.75
+Kina (2018),SEK,Normalbelopp,538
+Kina (2018),SEK,Breakfast,-80.7
+Kina (2018),SEK,Lunch,-188.3
+Kina (2018),SEK,Dinner,-188.3
+Kina (2019),SEK,Normalbelopp,578
+Kina (2019),SEK,Breakfast,-86.7
+Kina (2019),SEK,Lunch,-202.3
+Kina (2019),SEK,Dinner,-202.3
+Kina (2020),SEK,Normalbelopp,590
+Kina (2020),SEK,Breakfast,-88.5
+Kina (2020),SEK,Lunch,-206.5
+Kina (2020),SEK,Dinner,-206.5
+Kirgizistan (2018),SEK,Normalbelopp,230
+Kirgizistan (2018),SEK,Breakfast,-34.5
+Kirgizistan (2018),SEK,Lunch,-80.5
+Kirgizistan (2018),SEK,Dinner,-80.5
+Kirgizistan (2019),SEK,Normalbelopp,259
+Kirgizistan (2019),SEK,Breakfast,-38.85
+Kirgizistan (2019),SEK,Lunch,-90.65
+Kirgizistan (2019),SEK,Dinner,-90.65
+Kirgizistan (2020),SEK,Normalbelopp,271
+Kirgizistan (2020),SEK,Breakfast,-40.65
+Kirgizistan (2020),SEK,Lunch,-94.85
+Kirgizistan (2020),SEK,Dinner,-94.85
+Kongo (Brazzaville) (2018),SEK,Normalbelopp,500
+Kongo (Brazzaville) (2018),SEK,Breakfast,-75
+Kongo (Brazzaville) (2018),SEK,Lunch,-175
+Kongo (Brazzaville) (2018),SEK,Dinner,-175
+Kongo (Brazzaville) (2019),SEK,Normalbelopp,542
+Kongo (Brazzaville) (2019),SEK,Breakfast,-81.3
+Kongo (Brazzaville) (2019),SEK,Lunch,-189.7
+Kongo (Brazzaville) (2019),SEK,Dinner,-189.7
+Kongo (Brazzaville) (2020),SEK,Normalbelopp,560
+Kongo (Brazzaville) (2020),SEK,Breakfast,-84
+Kongo (Brazzaville) (2020),SEK,Lunch,-196
+Kongo (Brazzaville) (2020),SEK,Dinner,-196
+Kongo (Demokratiska Republiken) (2018),SEK,Normalbelopp,464
+Kongo (Demokratiska Republiken) (2018),SEK,Breakfast,-69.6
+Kongo (Demokratiska Republiken) (2018),SEK,Lunch,-162.4
+Kongo (Demokratiska Republiken) (2018),SEK,Dinner,-162.4
+Kongo (Demokratiska Republiken) (2019),SEK,Normalbelopp,638
+Kongo (Demokratiska Republiken) (2019),SEK,Breakfast,-95.7
+Kongo (Demokratiska Republiken) (2019),SEK,Lunch,-223.3
+Kongo (Demokratiska Republiken) (2019),SEK,Dinner,-223.3
+Kongo (Demokratiska Republiken) (2020),SEK,Normalbelopp,634
+Kongo (Demokratiska Republiken) (2020),SEK,Breakfast,-95.1
+Kongo (Demokratiska Republiken) (2020),SEK,Lunch,-221.9
+Kongo (Demokratiska Republiken) (2020),SEK,Dinner,-221.9
+Kosovo (2018),SEK,Normalbelopp,240
+Kosovo (2018),SEK,Breakfast,-36
+Kosovo (2018),SEK,Lunch,-84
+Kosovo (2018),SEK,Dinner,-84
+Kosovo (2019),SEK,Normalbelopp,246
+Kosovo (2019),SEK,Breakfast,-36.9
+Kosovo (2019),SEK,Lunch,-86.1
+Kosovo (2019),SEK,Dinner,-86.1
+Kosovo (2020),SEK,Normalbelopp,240
+Kosovo (2020),SEK,Breakfast,-36
+Kosovo (2020),SEK,Lunch,-84
+Kosovo (2020),SEK,Dinner,-84
+Kroatien (2018),SEK,Normalbelopp,410
+Kroatien (2018),SEK,Breakfast,-61.5
+Kroatien (2018),SEK,Lunch,-143.5
+Kroatien (2018),SEK,Dinner,-143.5
+Kroatien (2019),SEK,Normalbelopp,439
+Kroatien (2019),SEK,Breakfast,-65.85
+Kroatien (2019),SEK,Lunch,-153.65
+Kroatien (2019),SEK,Dinner,-153.65
+Kroatien (2020),SEK,Normalbelopp,448
+Kroatien (2020),SEK,Breakfast,-67.2
+Kroatien (2020),SEK,Lunch,-156.8
+Kroatien (2020),SEK,Dinner,-156.8
+Kuba (2018),SEK,Normalbelopp,379
+Kuba (2018),SEK,Breakfast,-56.85
+Kuba (2018),SEK,Lunch,-132.65
+Kuba (2018),SEK,Dinner,-132.65
+Kuba (2019),SEK,Normalbelopp,413
+Kuba (2019),SEK,Breakfast,-61.95
+Kuba (2019),SEK,Lunch,-144.55
+Kuba (2019),SEK,Dinner,-144.55
+Kuba (2020),SEK,Normalbelopp,449
+Kuba (2020),SEK,Breakfast,-67.35
+Kuba (2020),SEK,Lunch,-157.15
+Kuba (2020),SEK,Dinner,-157.15
+Kuwait (2018),SEK,Normalbelopp,677
+Kuwait (2018),SEK,Breakfast,-101.55
+Kuwait (2018),SEK,Lunch,-236.95
+Kuwait (2018),SEK,Dinner,-236.95
+Kuwait (2019),SEK,Normalbelopp,741
+Kuwait (2019),SEK,Breakfast,-111.15
+Kuwait (2019),SEK,Lunch,-259.35
+Kuwait (2019),SEK,Dinner,-259.35
+Kuwait (2020),SEK,Normalbelopp,791
+Kuwait (2020),SEK,Breakfast,-118.65
+Kuwait (2020),SEK,Lunch,-276.85
+Kuwait (2020),SEK,Dinner,-276.85
+Laos (2018),SEK,Normalbelopp,278
+Laos (2018),SEK,Breakfast,-41.7
+Laos (2018),SEK,Lunch,-97.3
+Laos (2018),SEK,Dinner,-97.3
+Laos (2019),SEK,Normalbelopp,302
+Laos (2019),SEK,Breakfast,-45.3
+Laos (2019),SEK,Lunch,-105.7
+Laos (2019),SEK,Dinner,-105.7
+Laos (2020),SEK,Normalbelopp,308
+Laos (2020),SEK,Breakfast,-46.2
+Laos (2020),SEK,Lunch,-107.8
+Laos (2020),SEK,Dinner,-107.8
+Lettland (2018),SEK,Normalbelopp,460
+Lettland (2018),SEK,Breakfast,-69
+Lettland (2018),SEK,Lunch,-161
+Lettland (2018),SEK,Dinner,-161
+Lettland (2019),SEK,Normalbelopp,505
+Lettland (2019),SEK,Breakfast,-75.75
+Lettland (2019),SEK,Lunch,-176.75
+Lettland (2019),SEK,Dinner,-176.75
+Lettland (2020),SEK,Normalbelopp,529
+Lettland (2020),SEK,Breakfast,-79.35
+Lettland (2020),SEK,Lunch,-185.15
+Lettland (2020),SEK,Dinner,-185.15
+Libanon (2018),SEK,Normalbelopp,674
+Libanon (2018),SEK,Breakfast,-101.1
+Libanon (2018),SEK,Lunch,-235.9
+Libanon (2018),SEK,Dinner,-235.9
+Libanon (2019),SEK,Normalbelopp,738
+Libanon (2019),SEK,Breakfast,-110.7
+Libanon (2019),SEK,Lunch,-258.3
+Libanon (2019),SEK,Dinner,-258.3
+Libanon (2020),SEK,Normalbelopp,766
+Libanon (2020),SEK,Breakfast,-114.9
+Libanon (2020),SEK,Lunch,-268.1
+Libanon (2020),SEK,Dinner,-268.1
+Liberia (2018),SEK,Normalbelopp,549
+Liberia (2018),SEK,Breakfast,-82.35
+Liberia (2018),SEK,Lunch,-192.15
+Liberia (2018),SEK,Dinner,-192.15
+Liberia (2019),SEK,Normalbelopp,569
+Liberia (2019),SEK,Breakfast,-85.35
+Liberia (2019),SEK,Lunch,-199.15
+Liberia (2019),SEK,Dinner,-199.15
+Liberia (2020),SEK,Normalbelopp,604
+Liberia (2020),SEK,Breakfast,-90.6
+Liberia (2020),SEK,Lunch,-211.4
+Liberia (2020),SEK,Dinner,-211.4
+Libyen (2018),SEK,Normalbelopp,584
+Libyen (2018),SEK,Breakfast,-87.6
+Libyen (2018),SEK,Lunch,-204.4
+Libyen (2018),SEK,Dinner,-204.4
+Libyen (2019),SEK,Normalbelopp,707
+Libyen (2019),SEK,Breakfast,-106.05
+Libyen (2019),SEK,Lunch,-247.45
+Libyen (2019),SEK,Dinner,-247.45
+Libyen (2020),SEK,Normalbelopp,775
+Libyen (2020),SEK,Breakfast,-116.25
+Libyen (2020),SEK,Lunch,-271.25
+Libyen (2020),SEK,Dinner,-271.25
+Liechtenstein (2018),SEK,Normalbelopp,705
+Liechtenstein (2018),SEK,Breakfast,-105.75
+Liechtenstein (2018),SEK,Lunch,-246.75
+Liechtenstein (2018),SEK,Dinner,-246.75
+Liechtenstein (2019),SEK,Normalbelopp,794
+Liechtenstein (2019),SEK,Breakfast,-119.1
+Liechtenstein (2019),SEK,Lunch,-277.9
+Liechtenstein (2019),SEK,Dinner,-277.9
+Liechtenstein (2020),SEK,Normalbelopp,914
+Liechtenstein (2020),SEK,Breakfast,-137.1
+Liechtenstein (2020),SEK,Lunch,-319.9
+Liechtenstein (2020),SEK,Dinner,-319.9
+Litauen (2018),SEK,Normalbelopp,345
+Litauen (2018),SEK,Breakfast,-51.75
+Litauen (2018),SEK,Lunch,-120.75
+Litauen (2018),SEK,Dinner,-120.75
+Litauen (2019),SEK,Normalbelopp,377
+Litauen (2019),SEK,Breakfast,-56.55
+Litauen (2019),SEK,Lunch,-131.95
+Litauen (2019),SEK,Dinner,-131.95
+Litauen (2020),SEK,Normalbelopp,398
+Litauen (2020),SEK,Breakfast,-59.7
+Litauen (2020),SEK,Lunch,-139.3
+Litauen (2020),SEK,Dinner,-139.3
+Luxemburg (2018),SEK,Normalbelopp,669
+Luxemburg (2018),SEK,Breakfast,-100.35
+Luxemburg (2018),SEK,Lunch,-234.15
+Luxemburg (2018),SEK,Dinner,-234.15
+Luxemburg (2019),SEK,Normalbelopp,735
+Luxemburg (2019),SEK,Breakfast,-110.25
+Luxemburg (2019),SEK,Lunch,-257.25
+Luxemburg (2019),SEK,Dinner,-257.25
+Luxemburg (2020),SEK,Normalbelopp,776
+Luxemburg (2020),SEK,Breakfast,-116.4
+Luxemburg (2020),SEK,Lunch,-271.6
+Luxemburg (2020),SEK,Dinner,-271.6
+Macao (2018),SEK,Normalbelopp,538
+Macao (2018),SEK,Breakfast,-80.7
+Macao (2018),SEK,Lunch,-188.3
+Macao (2018),SEK,Dinner,-188.3
+Macao (2019),SEK,Normalbelopp,578
+Macao (2019),SEK,Breakfast,-86.7
+Macao (2019),SEK,Lunch,-202.3
+Macao (2019),SEK,Dinner,-202.3
+Macao (2020),SEK,Normalbelopp,590
+Macao (2020),SEK,Breakfast,-88.5
+Macao (2020),SEK,Lunch,-206.5
+Macao (2020),SEK,Dinner,-206.5
+Madagaskar (2018),SEK,Normalbelopp,230
+Madagaskar (2018),SEK,Breakfast,-34.5
+Madagaskar (2018),SEK,Lunch,-80.5
+Madagaskar (2018),SEK,Dinner,-80.5
+Madagaskar (2019),SEK,Normalbelopp,230
+Madagaskar (2019),SEK,Breakfast,-34.5
+Madagaskar (2019),SEK,Lunch,-80.5
+Madagaskar (2019),SEK,Dinner,-80.5
+Madagaskar (2020),SEK,Normalbelopp,240
+Madagaskar (2020),SEK,Breakfast,-36
+Madagaskar (2020),SEK,Lunch,-84
+Madagaskar (2020),SEK,Dinner,-84
+Makedonien (2018),SEK,Normalbelopp,297
+Makedonien (2018),SEK,Breakfast,-44.55
+Makedonien (2018),SEK,Lunch,-103.95
+Makedonien (2018),SEK,Dinner,-103.95
+Makedonien (2019),SEK,Normalbelopp,321
+Makedonien (2019),SEK,Breakfast,-48.15
+Makedonien (2019),SEK,Lunch,-112.35
+Makedonien (2019),SEK,Dinner,-112.35
+Makedonien (2020),SEK,Normalbelopp,327
+Makedonien (2020),SEK,Breakfast,-49.05
+Makedonien (2020),SEK,Lunch,-114.45
+Makedonien (2020),SEK,Dinner,-114.45
+Malawi (2018),SEK,Normalbelopp,230
+Malawi (2018),SEK,Breakfast,-34.5
+Malawi (2018),SEK,Lunch,-80.5
+Malawi (2018),SEK,Dinner,-80.5
+Malawi (2019),SEK,Normalbelopp,281
+Malawi (2019),SEK,Breakfast,-42.15
+Malawi (2019),SEK,Lunch,-98.35
+Malawi (2019),SEK,Dinner,-98.35
+Malawi (2020),SEK,Normalbelopp,385
+Malawi (2020),SEK,Breakfast,-57.75
+Malawi (2020),SEK,Lunch,-134.75
+Malawi (2020),SEK,Dinner,-134.75
+Malaysia (2018),SEK,Normalbelopp,274
+Malaysia (2018),SEK,Breakfast,-41.1
+Malaysia (2018),SEK,Lunch,-95.9
+Malaysia (2018),SEK,Dinner,-95.9
+Malaysia (2019),SEK,Normalbelopp,307
+Malaysia (2019),SEK,Breakfast,-46.05
+Malaysia (2019),SEK,Lunch,-107.45
+Malaysia (2019),SEK,Dinner,-107.45
+Malaysia (2020),SEK,Normalbelopp,330
+Malaysia (2020),SEK,Breakfast,-49.5
+Malaysia (2020),SEK,Lunch,-115.5
+Malaysia (2020),SEK,Dinner,-115.5
+Maldiverna (2018),SEK,Normalbelopp,339
+Maldiverna (2018),SEK,Breakfast,-50.85
+Maldiverna (2018),SEK,Lunch,-118.65
+Maldiverna (2018),SEK,Dinner,-118.65
+Maldiverna (2019),SEK,Normalbelopp,393
+Maldiverna (2019),SEK,Breakfast,-58.95
+Maldiverna (2019),SEK,Lunch,-137.55
+Maldiverna (2019),SEK,Dinner,-137.55
+Maldiverna (2020),SEK,Normalbelopp,433
+Maldiverna (2020),SEK,Breakfast,-64.95
+Maldiverna (2020),SEK,Lunch,-151.55
+Maldiverna (2020),SEK,Dinner,-151.55
+Mali (2018),SEK,Normalbelopp,440
+Mali (2018),SEK,Breakfast,-66
+Mali (2018),SEK,Lunch,-154
+Mali (2018),SEK,Dinner,-154
+Mali (2019),SEK,Normalbelopp,450
+Mali (2019),SEK,Breakfast,-67.5
+Mali (2019),SEK,Lunch,-157.5
+Mali (2019),SEK,Dinner,-157.5
+Mali (2020),SEK,Normalbelopp,454
+Mali (2020),SEK,Breakfast,-68.1
+Mali (2020),SEK,Lunch,-158.9
+Mali (2020),SEK,Dinner,-158.9
+Malta (2018),SEK,Normalbelopp,480
+Malta (2018),SEK,Breakfast,-72
+Malta (2018),SEK,Lunch,-168
+Malta (2018),SEK,Dinner,-168
+Malta (2019),SEK,Normalbelopp,510
+Malta (2019),SEK,Breakfast,-76.5
+Malta (2019),SEK,Lunch,-178.5
+Malta (2019),SEK,Dinner,-178.5
+Malta (2020),SEK,Normalbelopp,538
+Malta (2020),SEK,Breakfast,-80.7
+Malta (2020),SEK,Lunch,-188.3
+Malta (2020),SEK,Dinner,-188.3
+Marocko (2018),SEK,Normalbelopp,376
+Marocko (2018),SEK,Breakfast,-56.4
+Marocko (2018),SEK,Lunch,-131.6
+Marocko (2018),SEK,Dinner,-131.6
+Marocko (2019),SEK,Normalbelopp,414
+Marocko (2019),SEK,Breakfast,-62.1
+Marocko (2019),SEK,Lunch,-144.9
+Marocko (2019),SEK,Dinner,-144.9
+Marocko (2020),SEK,Normalbelopp,446
+Marocko (2020),SEK,Breakfast,-66.9
+Marocko (2020),SEK,Lunch,-156.1
+Marocko (2020),SEK,Dinner,-156.1
+Mauretanien (2018),SEK,Normalbelopp,319
+Mauretanien (2018),SEK,Breakfast,-47.85
+Mauretanien (2018),SEK,Lunch,-111.65
+Mauretanien (2018),SEK,Dinner,-111.65
+Mauretanien (2019),SEK,Normalbelopp,340
+Mauretanien (2019),SEK,Breakfast,-51
+Mauretanien (2019),SEK,Lunch,-119
+Mauretanien (2019),SEK,Dinner,-119
+Mauretanien (2020),SEK,Normalbelopp,353
+Mauretanien (2020),SEK,Breakfast,-52.95
+Mauretanien (2020),SEK,Lunch,-123.55
+Mauretanien (2020),SEK,Dinner,-123.55
+Mauritius (2018),SEK,Normalbelopp,399
+Mauritius (2018),SEK,Breakfast,-59.85
+Mauritius (2018),SEK,Lunch,-139.65
+Mauritius (2018),SEK,Dinner,-139.65
+Mauritius (2019),SEK,Normalbelopp,456
+Mauritius (2019),SEK,Breakfast,-68.4
+Mauritius (2019),SEK,Lunch,-159.6
+Mauritius (2019),SEK,Dinner,-159.6
+Mauritius (2020),SEK,Normalbelopp,465
+Mauritius (2020),SEK,Breakfast,-69.75
+Mauritius (2020),SEK,Lunch,-162.75
+Mauritius (2020),SEK,Dinner,-162.75
+Mexiko (2018),SEK,Normalbelopp,293
+Mexiko (2018),SEK,Breakfast,-43.95
+Mexiko (2018),SEK,Lunch,-102.55
+Mexiko (2018),SEK,Dinner,-102.55
+Mexiko (2019),SEK,Normalbelopp,301
+Mexiko (2019),SEK,Breakfast,-45.15
+Mexiko (2019),SEK,Lunch,-105.35
+Mexiko (2019),SEK,Dinner,-105.35
+Mexiko (2020),SEK,Normalbelopp,367
+Mexiko (2020),SEK,Breakfast,-55.05
+Mexiko (2020),SEK,Lunch,-128.45
+Mexiko (2020),SEK,Dinner,-128.45
+Mikronesien (2018),SEK,Normalbelopp,396
+Mikronesien (2018),SEK,Breakfast,-59.4
+Mikronesien (2018),SEK,Lunch,-138.6
+Mikronesien (2018),SEK,Dinner,-138.6
+Mikronesien (2019),SEK,Normalbelopp,443
+Mikronesien (2019),SEK,Breakfast,-66.45
+Mikronesien (2019),SEK,Lunch,-155.05
+Mikronesien (2019),SEK,Dinner,-155.05
+Mikronesien (2020),SEK,Normalbelopp,464
+Mikronesien (2020),SEK,Breakfast,-69.6
+Mikronesien (2020),SEK,Lunch,-162.4
+Mikronesien (2020),SEK,Dinner,-162.4
+Mocambique (2018),SEK,Normalbelopp,255
+Mocambique (2018),SEK,Breakfast,-38.25
+Mocambique (2018),SEK,Lunch,-89.25
+Mocambique (2018),SEK,Dinner,-89.25
+Mocambique (2019),SEK,Normalbelopp,288
+Mocambique (2019),SEK,Breakfast,-43.2
+Mocambique (2019),SEK,Lunch,-100.8
+Mocambique (2019),SEK,Dinner,-100.8
+Mocambique (2020),SEK,Normalbelopp,297
+Mocambique (2020),SEK,Breakfast,-44.55
+Mocambique (2020),SEK,Lunch,-103.95
+Mocambique (2020),SEK,Dinner,-103.95
+Moldavien (2018),SEK,Normalbelopp,230
+Moldavien (2018),SEK,Breakfast,-34.5
+Moldavien (2018),SEK,Lunch,-80.5
+Moldavien (2018),SEK,Dinner,-80.5
+Moldavien (2019),SEK,Normalbelopp,248
+Moldavien (2019),SEK,Breakfast,-37.2
+Moldavien (2019),SEK,Lunch,-86.8
+Moldavien (2019),SEK,Dinner,-86.8
+Moldavien (2020),SEK,Normalbelopp,285
+Moldavien (2020),SEK,Breakfast,-42.75
+Moldavien (2020),SEK,Lunch,-99.75
+Moldavien (2020),SEK,Dinner,-99.75
+Monaco (2018),SEK,Normalbelopp,818
+Monaco (2018),SEK,Breakfast,-122.7
+Monaco (2018),SEK,Lunch,-286.3
+Monaco (2018),SEK,Dinner,-286.3
+Monaco (2019),SEK,Normalbelopp,858
+Monaco (2019),SEK,Breakfast,-128.7
+Monaco (2019),SEK,Lunch,-300.3
+Monaco (2019),SEK,Dinner,-300.3
+Monaco (2020),SEK,Normalbelopp,906
+Monaco (2020),SEK,Breakfast,-135.9
+Monaco (2020),SEK,Lunch,-317.1
+Monaco (2020),SEK,Dinner,-317.1
+Mongoliet (2018),SEK,Normalbelopp,230
+Mongoliet (2018),SEK,Breakfast,-34.5
+Mongoliet (2018),SEK,Lunch,-80.5
+Mongoliet (2018),SEK,Dinner,-80.5
+Mongoliet (2019),SEK,Normalbelopp,280
+Mongoliet (2019),SEK,Breakfast,-42
+Mongoliet (2019),SEK,Lunch,-98
+Mongoliet (2019),SEK,Dinner,-98
+Mongoliet (2020),SEK,Normalbelopp,283
+Mongoliet (2020),SEK,Breakfast,-42.45
+Mongoliet (2020),SEK,Lunch,-99.05
+Mongoliet (2020),SEK,Dinner,-99.05
+Montenegro (2018),SEK,Normalbelopp,393
+Montenegro (2018),SEK,Breakfast,-58.95
+Montenegro (2018),SEK,Lunch,-137.55
+Montenegro (2018),SEK,Dinner,-137.55
+Montenegro (2019),SEK,Normalbelopp,423
+Montenegro (2019),SEK,Breakfast,-63.45
+Montenegro (2019),SEK,Lunch,-148.05
+Montenegro (2019),SEK,Dinner,-148.05
+Montenegro (2020),SEK,Normalbelopp,391
+Montenegro (2020),SEK,Breakfast,-58.65
+Montenegro (2020),SEK,Lunch,-136.85
+Montenegro (2020),SEK,Dinner,-136.85
+Myanmar (2018),SEK,Normalbelopp,315
+Myanmar (2018),SEK,Breakfast,-47.25
+Myanmar (2018),SEK,Lunch,-110.25
+Myanmar (2018),SEK,Dinner,-110.25
+Myanmar (2019),SEK,Normalbelopp,286
+Myanmar (2019),SEK,Breakfast,-42.9
+Myanmar (2019),SEK,Lunch,-100.1
+Myanmar (2019),SEK,Dinner,-100.1
+Myanmar (2020),SEK,Normalbelopp,318
+Myanmar (2020),SEK,Breakfast,-47.7
+Myanmar (2020),SEK,Lunch,-111.3
+Myanmar (2020),SEK,Dinner,-111.3
+Nederländerna (2018),SEK,Normalbelopp,554
+Nederländerna (2018),SEK,Breakfast,-83.1
+Nederländerna (2018),SEK,Lunch,-193.9
+Nederländerna (2018),SEK,Dinner,-193.9
+Nederländerna (2019),SEK,Normalbelopp,610
+Nederländerna (2019),SEK,Breakfast,-91.5
+Nederländerna (2019),SEK,Lunch,-213.5
+Nederländerna (2019),SEK,Dinner,-213.5
+Nederländerna (2020),SEK,Normalbelopp,648
+Nederländerna (2020),SEK,Breakfast,-97.2
+Nederländerna (2020),SEK,Lunch,-226.8
+Nederländerna (2020),SEK,Dinner,-226.8
+Nederländska Antillerna (2018),SEK,Normalbelopp,490
+Nederländska Antillerna (2018),SEK,Breakfast,-73.5
+Nederländska Antillerna (2018),SEK,Lunch,-171.5
+Nederländska Antillerna (2018),SEK,Dinner,-171.5
+Nederländska Antillerna (2019),SEK,Normalbelopp,544
+Nederländska Antillerna (2019),SEK,Breakfast,-81.6
+Nederländska Antillerna (2019),SEK,Lunch,-190.4
+Nederländska Antillerna (2019),SEK,Dinner,-190.4
+Nederländska Antillerna (2020),SEK,Normalbelopp,601
+Nederländska Antillerna (2020),SEK,Breakfast,-90.15
+Nederländska Antillerna (2020),SEK,Lunch,-210.35
+Nederländska Antillerna (2020),SEK,Dinner,-210.35
+Nepal (2018),SEK,Normalbelopp,268
+Nepal (2018),SEK,Breakfast,-40.2
+Nepal (2018),SEK,Lunch,-93.8
+Nepal (2018),SEK,Dinner,-93.8
+Nepal (2019),SEK,Normalbelopp,258
+Nepal (2019),SEK,Breakfast,-38.7
+Nepal (2019),SEK,Lunch,-90.3
+Nepal (2019),SEK,Dinner,-90.3
+Nepal (2020),SEK,Normalbelopp,287
+Nepal (2020),SEK,Breakfast,-43.05
+Nepal (2020),SEK,Lunch,-100.45
+Nepal (2020),SEK,Dinner,-100.45
+Nicaragua (2018),SEK,Normalbelopp,328
+Nicaragua (2018),SEK,Breakfast,-49.2
+Nicaragua (2018),SEK,Lunch,-114.8
+Nicaragua (2018),SEK,Dinner,-114.8
+Nicaragua (2019),SEK,Normalbelopp,334
+Nicaragua (2019),SEK,Breakfast,-50.1
+Nicaragua (2019),SEK,Lunch,-116.9
+Nicaragua (2019),SEK,Dinner,-116.9
+Nicaragua (2020),SEK,Normalbelopp,367
+Nicaragua (2020),SEK,Breakfast,-55.05
+Nicaragua (2020),SEK,Lunch,-128.45
+Nicaragua (2020),SEK,Dinner,-128.45
+Niger (2018),SEK,Normalbelopp,306
+Niger (2018),SEK,Breakfast,-45.9
+Niger (2018),SEK,Lunch,-107.1
+Niger (2018),SEK,Dinner,-107.1
+Niger (2019),SEK,Normalbelopp,339
+Niger (2019),SEK,Breakfast,-50.85
+Niger (2019),SEK,Lunch,-118.65
+Niger (2019),SEK,Dinner,-118.65
+Niger (2020),SEK,Normalbelopp,354
+Niger (2020),SEK,Breakfast,-53.1
+Niger (2020),SEK,Lunch,-123.9
+Niger (2020),SEK,Dinner,-123.9
+Nigeria (2018),SEK,Normalbelopp,418
+Nigeria (2018),SEK,Breakfast,-62.7
+Nigeria (2018),SEK,Lunch,-146.3
+Nigeria (2018),SEK,Dinner,-146.3
+Nigeria (2019),SEK,Normalbelopp,501
+Nigeria (2019),SEK,Breakfast,-75.15
+Nigeria (2019),SEK,Lunch,-175.35
+Nigeria (2019),SEK,Dinner,-175.35
+Nigeria (2020),SEK,Normalbelopp,549
+Nigeria (2020),SEK,Breakfast,-82.35
+Nigeria (2020),SEK,Lunch,-192.15
+Nigeria (2020),SEK,Dinner,-192.15
+Nordmakedonien - f.d. Makedonien (2020),SEK,Normalbelopp,327
+Nordmakedonien - f.d. Makedonien (2020),SEK,Breakfast,-49.05
+Nordmakedonien - f.d. Makedonien (2020),SEK,Lunch,-114.45
+Nordmakedonien - f.d. Makedonien (2020),SEK,Dinner,-114.45
+Norge (2018),SEK,Normalbelopp,823
+Norge (2018),SEK,Breakfast,-123.45
+Norge (2018),SEK,Lunch,-288.05
+Norge (2018),SEK,Dinner,-288.05
+Norge (2019),SEK,Normalbelopp,876
+Norge (2019),SEK,Breakfast,-131.4
+Norge (2019),SEK,Lunch,-306.6
+Norge (2019),SEK,Dinner,-306.6
+Norge (2020),SEK,Normalbelopp,893
+Norge (2020),SEK,Breakfast,-133.95
+Norge (2020),SEK,Lunch,-312.55
+Norge (2020),SEK,Dinner,-312.55
+Nya Zeeland (2018),SEK,Normalbelopp,538
+Nya Zeeland (2018),SEK,Breakfast,-80.7
+Nya Zeeland (2018),SEK,Lunch,-188.3
+Nya Zeeland (2018),SEK,Dinner,-188.3
+Nya Zeeland (2019),SEK,Normalbelopp,565
+Nya Zeeland (2019),SEK,Breakfast,-84.75
+Nya Zeeland (2019),SEK,Lunch,-197.75
+Nya Zeeland (2019),SEK,Dinner,-197.75
+Nya Zeeland (2020),SEK,Normalbelopp,585
+Nya Zeeland (2020),SEK,Breakfast,-87.75
+Nya Zeeland (2020),SEK,Lunch,-204.75
+Nya Zeeland (2020),SEK,Dinner,-204.75
+Oman (2018),SEK,Normalbelopp,685
+Oman (2018),SEK,Breakfast,-102.75
+Oman (2018),SEK,Lunch,-239.75
+Oman (2018),SEK,Dinner,-239.75
+Oman (2019),SEK,Normalbelopp,748
+Oman (2019),SEK,Breakfast,-112.2
+Oman (2019),SEK,Lunch,-261.8
+Oman (2019),SEK,Dinner,-261.8
+Oman (2020),SEK,Normalbelopp,777
+Oman (2020),SEK,Breakfast,-116.55
+Oman (2020),SEK,Lunch,-271.95
+Oman (2020),SEK,Dinner,-271.95
+Österrike (2018),SEK,Normalbelopp,583
+Österrike (2018),SEK,Breakfast,-87.45
+Österrike (2018),SEK,Lunch,-204.05
+Österrike (2018),SEK,Dinner,-204.05
+Österrike (2019),SEK,Normalbelopp,616
+Österrike (2019),SEK,Breakfast,-92.4
+Österrike (2019),SEK,Lunch,-215.6
+Österrike (2019),SEK,Dinner,-215.6
+Österrike (2020),SEK,Normalbelopp,641
+Österrike (2020),SEK,Breakfast,-96.15
+Österrike (2020),SEK,Lunch,-224.35
+Österrike (2020),SEK,Dinner,-224.35
+Övriga länder och områden (2018),SEK,Normalbelopp,357
+Övriga länder och områden (2018),SEK,Breakfast,-53.55
+Övriga länder och områden (2018),SEK,Lunch,-124.95
+Övriga länder och områden (2018),SEK,Dinner,-124.95
+Övriga länder och områden (2019),SEK,Normalbelopp,369
+Övriga länder och områden (2019),SEK,Breakfast,-55.35
+Övriga länder och områden (2019),SEK,Lunch,-129.15
+Övriga länder och områden (2019),SEK,Dinner,-129.15
+Övriga länder och områden (2020),SEK,Normalbelopp,392
+Övriga länder och områden (2020),SEK,Breakfast,-58.8
+Övriga länder och områden (2020),SEK,Lunch,-137.2
+Övriga länder och områden (2020),SEK,Dinner,-137.2
+Pakistan (2018),SEK,Normalbelopp,296
+Pakistan (2018),SEK,Breakfast,-44.4
+Pakistan (2018),SEK,Lunch,-103.6
+Pakistan (2018),SEK,Dinner,-103.6
+Pakistan (2019),SEK,Normalbelopp,230
+Pakistan (2019),SEK,Breakfast,-34.5
+Pakistan (2019),SEK,Lunch,-80.5
+Pakistan (2019),SEK,Dinner,-80.5
+Pakistan (2020),SEK,Normalbelopp,240
+Pakistan (2020),SEK,Breakfast,-36
+Pakistan (2020),SEK,Lunch,-84
+Pakistan (2020),SEK,Dinner,-84
+Panama (2018),SEK,Normalbelopp,444
+Panama (2018),SEK,Breakfast,-66.6
+Panama (2018),SEK,Lunch,-155.4
+Panama (2018),SEK,Dinner,-155.4
+Panama (2019),SEK,Normalbelopp,505
+Panama (2019),SEK,Breakfast,-75.75
+Panama (2019),SEK,Lunch,-176.75
+Panama (2019),SEK,Dinner,-176.75
+Panama (2020),SEK,Normalbelopp,564
+Panama (2020),SEK,Breakfast,-84.6
+Panama (2020),SEK,Lunch,-197.4
+Panama (2020),SEK,Dinner,-197.4
+Papua Nya Guinea (2018),SEK,Normalbelopp,452
+Papua Nya Guinea (2018),SEK,Breakfast,-67.8
+Papua Nya Guinea (2018),SEK,Lunch,-158.2
+Papua Nya Guinea (2018),SEK,Dinner,-158.2
+Papua Nya Guinea (2019),SEK,Normalbelopp,487
+Papua Nya Guinea (2019),SEK,Breakfast,-73.05
+Papua Nya Guinea (2019),SEK,Lunch,-170.45
+Papua Nya Guinea (2019),SEK,Dinner,-170.45
+Papua Nya Guinea (2020),SEK,Normalbelopp,515
+Papua Nya Guinea (2020),SEK,Breakfast,-77.25
+Papua Nya Guinea (2020),SEK,Lunch,-180.25
+Papua Nya Guinea (2020),SEK,Dinner,-180.25
+Paraguay (2018),SEK,Normalbelopp,298
+Paraguay (2018),SEK,Breakfast,-44.7
+Paraguay (2018),SEK,Lunch,-104.3
+Paraguay (2018),SEK,Dinner,-104.3
+Paraguay (2019),SEK,Normalbelopp,316
+Paraguay (2019),SEK,Breakfast,-47.4
+Paraguay (2019),SEK,Lunch,-110.6
+Paraguay (2019),SEK,Dinner,-110.6
+Paraguay (2020),SEK,Normalbelopp,314
+Paraguay (2020),SEK,Breakfast,-47.1
+Paraguay (2020),SEK,Lunch,-109.9
+Paraguay (2020),SEK,Dinner,-109.9
+Peru (2018),SEK,Normalbelopp,457
+Peru (2018),SEK,Breakfast,-68.55
+Peru (2018),SEK,Lunch,-159.95
+Peru (2018),SEK,Dinner,-159.95
+Peru (2019),SEK,Normalbelopp,481
+Peru (2019),SEK,Breakfast,-72.15
+Peru (2019),SEK,Lunch,-168.35
+Peru (2019),SEK,Dinner,-168.35
+Peru (2020),SEK,Normalbelopp,511
+Peru (2020),SEK,Breakfast,-76.65
+Peru (2020),SEK,Lunch,-178.85
+Peru (2020),SEK,Dinner,-178.85
+Polen (2018),SEK,Normalbelopp,411
+Polen (2018),SEK,Breakfast,-61.65
+Polen (2018),SEK,Lunch,-143.85
+Polen (2018),SEK,Dinner,-143.85
+Polen (2019),SEK,Normalbelopp,436
+Polen (2019),SEK,Breakfast,-65.4
+Polen (2019),SEK,Lunch,-152.6
+Polen (2019),SEK,Dinner,-152.6
+Polen (2020),SEK,Normalbelopp,461
+Polen (2020),SEK,Breakfast,-69.15
+Polen (2020),SEK,Lunch,-161.35
+Polen (2020),SEK,Dinner,-161.35
+Portugal (2018),SEK,Normalbelopp,432
+Portugal (2018),SEK,Breakfast,-64.8
+Portugal (2018),SEK,Lunch,-151.2
+Portugal (2018),SEK,Dinner,-151.2
+Portugal (2019),SEK,Normalbelopp,461
+Portugal (2019),SEK,Breakfast,-69.15
+Portugal (2019),SEK,Lunch,-161.35
+Portugal (2019),SEK,Dinner,-161.35
+Portugal (2020),SEK,Normalbelopp,486
+Portugal (2020),SEK,Breakfast,-72.9
+Portugal (2020),SEK,Lunch,-170.1
+Portugal (2020),SEK,Dinner,-170.1
+Puerto Rico (2018),SEK,Normalbelopp,689
+Puerto Rico (2018),SEK,Breakfast,-103.35
+Puerto Rico (2018),SEK,Lunch,-241.15
+Puerto Rico (2018),SEK,Dinner,-241.15
+Puerto Rico (2019),SEK,Normalbelopp,762
+Puerto Rico (2019),SEK,Breakfast,-114.3
+Puerto Rico (2019),SEK,Lunch,-266.7
+Puerto Rico (2019),SEK,Dinner,-266.7
+Puerto Rico (2020),SEK,Normalbelopp,851
+Puerto Rico (2020),SEK,Breakfast,-127.65
+Puerto Rico (2020),SEK,Lunch,-297.85
+Puerto Rico (2020),SEK,Dinner,-297.85
+Qatar (2018),SEK,Normalbelopp,645
+Qatar (2018),SEK,Breakfast,-96.75
+Qatar (2018),SEK,Lunch,-225.75
+Qatar (2018),SEK,Dinner,-225.75
+Qatar (2019),SEK,Normalbelopp,716
+Qatar (2019),SEK,Breakfast,-107.4
+Qatar (2019),SEK,Lunch,-250.6
+Qatar (2019),SEK,Dinner,-250.6
+Qatar (2020),SEK,Normalbelopp,766
+Qatar (2020),SEK,Breakfast,-114.9
+Qatar (2020),SEK,Lunch,-268.1
+Qatar (2020),SEK,Dinner,-268.1
+Rumänien (2018),SEK,Normalbelopp,312
+Rumänien (2018),SEK,Breakfast,-46.8
+Rumänien (2018),SEK,Lunch,-109.2
+Rumänien (2018),SEK,Dinner,-109.2
+Rumänien (2019),SEK,Normalbelopp,332
+Rumänien (2019),SEK,Breakfast,-49.8
+Rumänien (2019),SEK,Lunch,-116.2
+Rumänien (2019),SEK,Dinner,-116.2
+Rumänien (2020),SEK,Normalbelopp,337
+Rumänien (2020),SEK,Breakfast,-50.55
+Rumänien (2020),SEK,Lunch,-117.95
+Rumänien (2020),SEK,Dinner,-117.95
+Rwanda (2018),SEK,Normalbelopp,296
+Rwanda (2018),SEK,Breakfast,-44.4
+Rwanda (2018),SEK,Lunch,-103.6
+Rwanda (2018),SEK,Dinner,-103.6
+Rwanda (2019),SEK,Normalbelopp,333
+Rwanda (2019),SEK,Breakfast,-49.95
+Rwanda (2019),SEK,Lunch,-116.55
+Rwanda (2019),SEK,Dinner,-116.55
+Rwanda (2020),SEK,Normalbelopp,332
+Rwanda (2020),SEK,Breakfast,-49.8
+Rwanda (2020),SEK,Lunch,-116.2
+Rwanda (2020),SEK,Dinner,-116.2
+Ryssland (2018),SEK,Normalbelopp,470
+Ryssland (2018),SEK,Breakfast,-70.5
+Ryssland (2018),SEK,Lunch,-164.5
+Ryssland (2018),SEK,Dinner,-164.5
+Ryssland (2019),SEK,Normalbelopp,455
+Ryssland (2019),SEK,Breakfast,-68.25
+Ryssland (2019),SEK,Lunch,-159.25
+Ryssland (2019),SEK,Dinner,-159.25
+Ryssland (2020),SEK,Normalbelopp,520
+Ryssland (2020),SEK,Breakfast,-78
+Ryssland (2020),SEK,Lunch,-182
+Ryssland (2020),SEK,Dinner,-182
+Saint Lucia (2018),SEK,Normalbelopp,524
+Saint Lucia (2018),SEK,Breakfast,-78.6
+Saint Lucia (2018),SEK,Lunch,-183.4
+Saint Lucia (2018),SEK,Dinner,-183.4
+Saint Lucia (2019),SEK,Normalbelopp,555
+Saint Lucia (2019),SEK,Breakfast,-83.25
+Saint Lucia (2019),SEK,Lunch,-194.25
+Saint Lucia (2019),SEK,Dinner,-194.25
+Saint Lucia (2020),SEK,Normalbelopp,573
+Saint Lucia (2020),SEK,Breakfast,-85.95
+Saint Lucia (2020),SEK,Lunch,-200.55
+Saint Lucia (2020),SEK,Dinner,-200.55
+Saint Vincent och Grenadinerna (2018),SEK,Normalbelopp,460
+Saint Vincent och Grenadinerna (2018),SEK,Breakfast,-69
+Saint Vincent och Grenadinerna (2018),SEK,Lunch,-161
+Saint Vincent och Grenadinerna (2018),SEK,Dinner,-161
+Saint Vincent och Grenadinerna (2019),SEK,Normalbelopp,502
+Saint Vincent och Grenadinerna (2019),SEK,Breakfast,-75.3
+Saint Vincent och Grenadinerna (2019),SEK,Lunch,-175.7
+Saint Vincent och Grenadinerna (2019),SEK,Dinner,-175.7
+Saint Vincent och Grenadinerna (2020),SEK,Normalbelopp,516
+Saint Vincent och Grenadinerna (2020),SEK,Breakfast,-77.4
+Saint Vincent och Grenadinerna (2020),SEK,Lunch,-180.6
+Saint Vincent och Grenadinerna (2020),SEK,Dinner,-180.6
+Samoa - Självständiga staten (2018),SEK,Normalbelopp,479
+Samoa - Självständiga staten (2018),SEK,Breakfast,-71.85
+Samoa - Självständiga staten (2018),SEK,Lunch,-167.65
+Samoa - Självständiga staten (2018),SEK,Dinner,-167.65
+Samoa - Självständiga staten (2019),SEK,Normalbelopp,513
+Samoa - Självständiga staten (2019),SEK,Breakfast,-76.95
+Samoa - Självständiga staten (2019),SEK,Lunch,-179.55
+Samoa - Självständiga staten (2019),SEK,Dinner,-179.55
+Samoa - Självständiga staten (2020),SEK,Normalbelopp,572
+Samoa - Självständiga staten (2020),SEK,Breakfast,-85.8
+Samoa - Självständiga staten (2020),SEK,Lunch,-200.2
+Samoa - Självständiga staten (2020),SEK,Dinner,-200.2
+San Marino (2018),SEK,Normalbelopp,540
+San Marino (2018),SEK,Breakfast,-81
+San Marino (2018),SEK,Lunch,-189
+San Marino (2018),SEK,Dinner,-189
+San Marino (2019),SEK,Normalbelopp,590
+San Marino (2019),SEK,Breakfast,-88.5
+San Marino (2019),SEK,Lunch,-206.5
+San Marino (2019),SEK,Dinner,-206.5
+San Marino (2020),SEK,Normalbelopp,627
+San Marino (2020),SEK,Breakfast,-94.05
+San Marino (2020),SEK,Lunch,-219.45
+San Marino (2020),SEK,Dinner,-219.45
+Saudiarabien (2018),SEK,Normalbelopp,568
+Saudiarabien (2018),SEK,Breakfast,-85.2
+Saudiarabien (2018),SEK,Lunch,-198.8
+Saudiarabien (2018),SEK,Dinner,-198.8
+Saudiarabien (2019),SEK,Normalbelopp,652
+Saudiarabien (2019),SEK,Breakfast,-97.8
+Saudiarabien (2019),SEK,Lunch,-228.2
+Saudiarabien (2019),SEK,Dinner,-228.2
+Saudiarabien (2020),SEK,Normalbelopp,742
+Saudiarabien (2020),SEK,Breakfast,-111.3
+Saudiarabien (2020),SEK,Lunch,-259.7
+Saudiarabien (2020),SEK,Dinner,-259.7
+Schweiz (2018),SEK,Normalbelopp,819
+Schweiz (2018),SEK,Breakfast,-122.85
+Schweiz (2018),SEK,Lunch,-286.65
+Schweiz (2018),SEK,Dinner,-286.65
+Schweiz (2019),SEK,Normalbelopp,888
+Schweiz (2019),SEK,Breakfast,-133.2
+Schweiz (2019),SEK,Lunch,-310.8
+Schweiz (2019),SEK,Dinner,-310.8
+Schweiz (2020),SEK,Normalbelopp,979
+Schweiz (2020),SEK,Breakfast,-146.85
+Schweiz (2020),SEK,Lunch,-342.65
+Schweiz (2020),SEK,Dinner,-342.65
+Senegal (2018),SEK,Normalbelopp,511
+Senegal (2018),SEK,Breakfast,-76.65
+Senegal (2018),SEK,Lunch,-178.85
+Senegal (2018),SEK,Dinner,-178.85
+Senegal (2019),SEK,Normalbelopp,539
+Senegal (2019),SEK,Breakfast,-80.85
+Senegal (2019),SEK,Lunch,-188.65
+Senegal (2019),SEK,Dinner,-188.65
+Senegal (2020),SEK,Normalbelopp,563
+Senegal (2020),SEK,Breakfast,-84.45
+Senegal (2020),SEK,Lunch,-197.05
+Senegal (2020),SEK,Dinner,-197.05
+Serbien (2018),SEK,Normalbelopp,362
+Serbien (2018),SEK,Breakfast,-54.3
+Serbien (2018),SEK,Lunch,-126.7
+Serbien (2018),SEK,Dinner,-126.7
+Serbien (2019),SEK,Normalbelopp,388
+Serbien (2019),SEK,Breakfast,-58.2
+Serbien (2019),SEK,Lunch,-135.8
+Serbien (2019),SEK,Dinner,-135.8
+Serbien (2020),SEK,Normalbelopp,395
+Serbien (2020),SEK,Breakfast,-59.25
+Serbien (2020),SEK,Lunch,-138.25
+Serbien (2020),SEK,Dinner,-138.25
+Seychellerna (2018),SEK,Normalbelopp,542
+Seychellerna (2018),SEK,Breakfast,-81.3
+Seychellerna (2018),SEK,Lunch,-189.7
+Seychellerna (2018),SEK,Dinner,-189.7
+Seychellerna (2019),SEK,Normalbelopp,620
+Seychellerna (2019),SEK,Breakfast,-93
+Seychellerna (2019),SEK,Lunch,-217
+Seychellerna (2019),SEK,Dinner,-217
+Seychellerna (2020),SEK,Normalbelopp,696
+Seychellerna (2020),SEK,Breakfast,-104.4
+Seychellerna (2020),SEK,Lunch,-243.6
+Seychellerna (2020),SEK,Dinner,-243.6
+Sierra Leone (2018),SEK,Normalbelopp,287
+Sierra Leone (2018),SEK,Breakfast,-43.05
+Sierra Leone (2018),SEK,Lunch,-100.45
+Sierra Leone (2018),SEK,Dinner,-100.45
+Sierra Leone (2019),SEK,Normalbelopp,328
+Sierra Leone (2019),SEK,Breakfast,-49.2
+Sierra Leone (2019),SEK,Lunch,-114.8
+Sierra Leone (2019),SEK,Dinner,-114.8
+Sierra Leone (2020),SEK,Normalbelopp,351
+Sierra Leone (2020),SEK,Breakfast,-52.65
+Sierra Leone (2020),SEK,Lunch,-122.85
+Sierra Leone (2020),SEK,Dinner,-122.85
+Singapore (2018),SEK,Normalbelopp,576
+Singapore (2018),SEK,Breakfast,-86.4
+Singapore (2018),SEK,Lunch,-201.6
+Singapore (2018),SEK,Dinner,-201.6
+Singapore (2019),SEK,Normalbelopp,632
+Singapore (2019),SEK,Breakfast,-94.8
+Singapore (2019),SEK,Lunch,-221.2
+Singapore (2019),SEK,Dinner,-221.2
+Singapore (2020),SEK,Normalbelopp,690
+Singapore (2020),SEK,Breakfast,-103.5
+Singapore (2020),SEK,Lunch,-241.5
+Singapore (2020),SEK,Dinner,-241.5
+Slovakien (2018),SEK,Normalbelopp,451
+Slovakien (2018),SEK,Breakfast,-67.65
+Slovakien (2018),SEK,Lunch,-157.85
+Slovakien (2018),SEK,Dinner,-157.85
+Slovakien (2019),SEK,Normalbelopp,479
+Slovakien (2019),SEK,Breakfast,-71.85
+Slovakien (2019),SEK,Lunch,-167.65
+Slovakien (2019),SEK,Dinner,-167.65
+Slovakien (2020),SEK,Normalbelopp,519
+Slovakien (2020),SEK,Breakfast,-77.85
+Slovakien (2020),SEK,Lunch,-181.65
+Slovakien (2020),SEK,Dinner,-181.65
+Slovenien (2018),SEK,Normalbelopp,463
+Slovenien (2018),SEK,Breakfast,-69.45
+Slovenien (2018),SEK,Lunch,-162.05
+Slovenien (2018),SEK,Dinner,-162.05
+Slovenien (2019),SEK,Normalbelopp,503
+Slovenien (2019),SEK,Breakfast,-75.45
+Slovenien (2019),SEK,Lunch,-176.05
+Slovenien (2019),SEK,Dinner,-176.05
+Slovenien (2020),SEK,Normalbelopp,529
+Slovenien (2020),SEK,Breakfast,-79.35
+Slovenien (2020),SEK,Lunch,-185.15
+Slovenien (2020),SEK,Dinner,-185.15
+Spanien (2018),SEK,Normalbelopp,513
+Spanien (2018),SEK,Breakfast,-76.95
+Spanien (2018),SEK,Lunch,-179.55
+Spanien (2018),SEK,Dinner,-179.55
+Spanien (2019),SEK,Normalbelopp,558
+Spanien (2019),SEK,Breakfast,-83.7
+Spanien (2019),SEK,Lunch,-195.3
+Spanien (2019),SEK,Dinner,-195.3
+Spanien (2020),SEK,Normalbelopp,615
+Spanien (2020),SEK,Breakfast,-92.25
+Spanien (2020),SEK,Lunch,-215.25
+Spanien (2020),SEK,Dinner,-215.25
+Sri Lanka (2018),SEK,Normalbelopp,283
+Sri Lanka (2018),SEK,Breakfast,-42.45
+Sri Lanka (2018),SEK,Lunch,-99.05
+Sri Lanka (2018),SEK,Dinner,-99.05
+Sri Lanka (2019),SEK,Normalbelopp,263
+Sri Lanka (2019),SEK,Breakfast,-39.45
+Sri Lanka (2019),SEK,Lunch,-92.05
+Sri Lanka (2019),SEK,Dinner,-92.05
+Sri Lanka (2020),SEK,Normalbelopp,272
+Sri Lanka (2020),SEK,Breakfast,-40.8
+Sri Lanka (2020),SEK,Lunch,-95.2
+Sri Lanka (2020),SEK,Dinner,-95.2
+Storbritannien och Nordirland (2018),SEK,Normalbelopp,655
+Storbritannien och Nordirland (2018),SEK,Breakfast,-98.25
+Storbritannien och Nordirland (2018),SEK,Lunch,-229.25
+Storbritannien och Nordirland (2018),SEK,Dinner,-229.25
+Storbritannien och Nordirland (2019),SEK,Normalbelopp,689
+Storbritannien och Nordirland (2019),SEK,Breakfast,-103.35
+Storbritannien och Nordirland (2019),SEK,Lunch,-241.15
+Storbritannien och Nordirland (2019),SEK,Dinner,-241.15
+Storbritannien och Nordirland (2020),SEK,Normalbelopp,746
+Storbritannien och Nordirland (2020),SEK,Breakfast,-111.9
+Storbritannien och Nordirland (2020),SEK,Lunch,-261.1
+Storbritannien och Nordirland (2020),SEK,Dinner,-261.1
+Sudan (2018),SEK,Normalbelopp,507
+Sudan (2018),SEK,Breakfast,-76.05
+Sudan (2018),SEK,Lunch,-177.45
+Sudan (2018),SEK,Dinner,-177.45
+Sudan (2019),SEK,Normalbelopp,230
+Sudan (2019),SEK,Breakfast,-34.5
+Sudan (2019),SEK,Lunch,-80.5
+Sudan (2019),SEK,Dinner,-80.5
+Sudan (2020),SEK,Normalbelopp,240
+Sudan (2020),SEK,Breakfast,-36
+Sudan (2020),SEK,Lunch,-84
+Sudan (2020),SEK,Dinner,-84
+Swaziland (2018),SEK,Normalbelopp,230
+Swaziland (2018),SEK,Breakfast,-34.5
+Swaziland (2018),SEK,Lunch,-80.5
+Swaziland (2018),SEK,Dinner,-80.5
+Swaziland (2019),SEK,Normalbelopp,230
+Swaziland (2019),SEK,Breakfast,-34.5
+Swaziland (2019),SEK,Lunch,-80.5
+Swaziland (2019),SEK,Dinner,-80.5
+Swaziland (2020),SEK,Normalbelopp,240
+Swaziland (2020),SEK,Breakfast,-36
+Swaziland (2020),SEK,Lunch,-84
+Swaziland (2020),SEK,Dinner,-84
+Sydafrika (2018),SEK,Normalbelopp,249
+Sydafrika (2018),SEK,Breakfast,-37.35
+Sydafrika (2018),SEK,Lunch,-87.15
+Sydafrika (2018),SEK,Dinner,-87.15
+Sydafrika (2019),SEK,Normalbelopp,262
+Sydafrika (2019),SEK,Breakfast,-39.3
+Sydafrika (2019),SEK,Lunch,-91.7
+Sydafrika (2019),SEK,Dinner,-91.7
+Sydafrika (2020),SEK,Normalbelopp,286
+Sydafrika (2020),SEK,Breakfast,-42.9
+Sydafrika (2020),SEK,Lunch,-100.1
+Sydafrika (2020),SEK,Dinner,-100.1
+Sydkorea (2018),SEK,Normalbelopp,624
+Sydkorea (2018),SEK,Breakfast,-93.6
+Sydkorea (2018),SEK,Lunch,-218.4
+Sydkorea (2018),SEK,Dinner,-218.4
+Sydkorea (2019),SEK,Normalbelopp,675
+Sydkorea (2019),SEK,Breakfast,-101.25
+Sydkorea (2019),SEK,Lunch,-236.25
+Sydkorea (2019),SEK,Dinner,-236.25
+Sydkorea (2020),SEK,Normalbelopp,696
+Sydkorea (2020),SEK,Breakfast,-104.4
+Sydkorea (2020),SEK,Lunch,-243.6
+Sydkorea (2020),SEK,Dinner,-243.6
+Taiwan (2018),SEK,Normalbelopp,465
+Taiwan (2018),SEK,Breakfast,-69.75
+Taiwan (2018),SEK,Lunch,-162.75
+Taiwan (2018),SEK,Dinner,-162.75
+Taiwan (2019),SEK,Normalbelopp,505
+Taiwan (2019),SEK,Breakfast,-75.75
+Taiwan (2019),SEK,Lunch,-176.75
+Taiwan (2019),SEK,Dinner,-176.75
+Taiwan (2020),SEK,Normalbelopp,546
+Taiwan (2020),SEK,Breakfast,-81.9
+Taiwan (2020),SEK,Lunch,-191.1
+Taiwan (2020),SEK,Dinner,-191.1
+Tanzania (2018),SEK,Normalbelopp,328
+Tanzania (2018),SEK,Breakfast,-49.2
+Tanzania (2018),SEK,Lunch,-114.8
+Tanzania (2018),SEK,Dinner,-114.8
+Tanzania (2019),SEK,Normalbelopp,349
+Tanzania (2019),SEK,Breakfast,-52.35
+Tanzania (2019),SEK,Lunch,-122.15
+Tanzania (2019),SEK,Dinner,-122.15
+Tanzania (2020),SEK,Normalbelopp,360
+Tanzania (2020),SEK,Breakfast,-54
+Tanzania (2020),SEK,Lunch,-126
+Tanzania (2020),SEK,Dinner,-126
+Thailand (2018),SEK,Normalbelopp,475
+Thailand (2018),SEK,Breakfast,-71.25
+Thailand (2018),SEK,Lunch,-166.25
+Thailand (2018),SEK,Dinner,-166.25
+Thailand (2019),SEK,Normalbelopp,525
+Thailand (2019),SEK,Breakfast,-78.75
+Thailand (2019),SEK,Lunch,-183.75
+Thailand (2019),SEK,Dinner,-183.75
+Thailand (2020),SEK,Normalbelopp,617
+Thailand (2020),SEK,Breakfast,-92.55
+Thailand (2020),SEK,Lunch,-215.95
+Thailand (2020),SEK,Dinner,-215.95
+Tjeckien (2018),SEK,Normalbelopp,388
+Tjeckien (2018),SEK,Breakfast,-58.2
+Tjeckien (2018),SEK,Lunch,-135.8
+Tjeckien (2018),SEK,Dinner,-135.8
+Tjeckien (2019),SEK,Normalbelopp,417
+Tjeckien (2019),SEK,Breakfast,-62.55
+Tjeckien (2019),SEK,Lunch,-145.95
+Tjeckien (2019),SEK,Dinner,-145.95
+Tjeckien (2020),SEK,Normalbelopp,436
+Tjeckien (2020),SEK,Breakfast,-65.4
+Tjeckien (2020),SEK,Lunch,-152.6
+Tjeckien (2020),SEK,Dinner,-152.6
+Togo (2018),SEK,Normalbelopp,438
+Togo (2018),SEK,Breakfast,-65.7
+Togo (2018),SEK,Lunch,-153.3
+Togo (2018),SEK,Dinner,-153.3
+Togo (2019),SEK,Normalbelopp,457
+Togo (2019),SEK,Breakfast,-68.55
+Togo (2019),SEK,Lunch,-159.95
+Togo (2019),SEK,Dinner,-159.95
+Togo (2020),SEK,Normalbelopp,482
+Togo (2020),SEK,Breakfast,-72.3
+Togo (2020),SEK,Lunch,-168.7
+Togo (2020),SEK,Dinner,-168.7
+Tonga (2018),SEK,Normalbelopp,380
+Tonga (2018),SEK,Breakfast,-57
+Tonga (2018),SEK,Lunch,-133
+Tonga (2018),SEK,Dinner,-133
+Tonga (2019),SEK,Normalbelopp,435
+Tonga (2019),SEK,Breakfast,-65.25
+Tonga (2019),SEK,Lunch,-152.25
+Tonga (2019),SEK,Dinner,-152.25
+Tonga (2020),SEK,Normalbelopp,455
+Tonga (2020),SEK,Breakfast,-68.25
+Tonga (2020),SEK,Lunch,-159.25
+Tonga (2020),SEK,Dinner,-159.25
+Trinidad och Tobago (2018),SEK,Normalbelopp,674
+Trinidad och Tobago (2018),SEK,Breakfast,-101.1
+Trinidad och Tobago (2018),SEK,Lunch,-235.9
+Trinidad och Tobago (2018),SEK,Dinner,-235.9
+Trinidad och Tobago (2019),SEK,Normalbelopp,728
+Trinidad och Tobago (2019),SEK,Breakfast,-109.2
+Trinidad och Tobago (2019),SEK,Lunch,-254.8
+Trinidad och Tobago (2019),SEK,Dinner,-254.8
+Trinidad och Tobago (2020),SEK,Normalbelopp,757
+Trinidad och Tobago (2020),SEK,Breakfast,-113.55
+Trinidad och Tobago (2020),SEK,Lunch,-264.95
+Trinidad och Tobago (2020),SEK,Dinner,-264.95
+Tunisien (2018),SEK,Normalbelopp,282
+Tunisien (2018),SEK,Breakfast,-42.3
+Tunisien (2018),SEK,Lunch,-98.7
+Tunisien (2018),SEK,Dinner,-98.7
+Tunisien (2019),SEK,Normalbelopp,240
+Tunisien (2019),SEK,Breakfast,-36
+Tunisien (2019),SEK,Lunch,-84
+Tunisien (2019),SEK,Dinner,-84
+Tunisien (2020),SEK,Normalbelopp,251
+Tunisien (2020),SEK,Breakfast,-37.65
+Tunisien (2020),SEK,Lunch,-87.85
+Tunisien (2020),SEK,Dinner,-87.85
+Turkiet (2018),SEK,Normalbelopp,274
+Turkiet (2018),SEK,Breakfast,-41.1
+Turkiet (2018),SEK,Lunch,-95.9
+Turkiet (2018),SEK,Dinner,-95.9
+Turkiet (2019),SEK,Normalbelopp,230
+Turkiet (2019),SEK,Breakfast,-34.5
+Turkiet (2019),SEK,Lunch,-80.5
+Turkiet (2019),SEK,Dinner,-80.5
+Turkiet (2020),SEK,Normalbelopp,251
+Turkiet (2020),SEK,Breakfast,-37.65
+Turkiet (2020),SEK,Lunch,-87.85
+Turkiet (2020),SEK,Dinner,-87.85
+Turkmenistan (2018),SEK,Normalbelopp,395
+Turkmenistan (2018),SEK,Breakfast,-59.25
+Turkmenistan (2018),SEK,Lunch,-138.25
+Turkmenistan (2018),SEK,Dinner,-138.25
+Turkmenistan (2019),SEK,Normalbelopp,473
+Turkmenistan (2019),SEK,Breakfast,-70.95
+Turkmenistan (2019),SEK,Lunch,-165.55
+Turkmenistan (2019),SEK,Dinner,-165.55
+Turkmenistan (2020),SEK,Normalbelopp,560
+Turkmenistan (2020),SEK,Breakfast,-84
+Turkmenistan (2020),SEK,Lunch,-196
+Turkmenistan (2020),SEK,Dinner,-196
+Tyskland (2018),SEK,Normalbelopp,620
+Tyskland (2018),SEK,Breakfast,-93
+Tyskland (2018),SEK,Lunch,-217
+Tyskland (2018),SEK,Dinner,-217
+Tyskland (2019),SEK,Normalbelopp,646
+Tyskland (2019),SEK,Breakfast,-96.9
+Tyskland (2019),SEK,Lunch,-226.1
+Tyskland (2019),SEK,Dinner,-226.1
+Tyskland (2020),SEK,Normalbelopp,668
+Tyskland (2020),SEK,Breakfast,-100.2
+Tyskland (2020),SEK,Lunch,-233.8
+Tyskland (2020),SEK,Dinner,-233.8
+Uganda (2018),SEK,Normalbelopp,243
+Uganda (2018),SEK,Breakfast,-36.45
+Uganda (2018),SEK,Lunch,-85.05
+Uganda (2018),SEK,Dinner,-85.05
+Uganda (2019),SEK,Normalbelopp,267
+Uganda (2019),SEK,Breakfast,-40.05
+Uganda (2019),SEK,Lunch,-93.45
+Uganda (2019),SEK,Dinner,-93.45
+Uganda (2020),SEK,Normalbelopp,321
+Uganda (2020),SEK,Breakfast,-48.15
+Uganda (2020),SEK,Lunch,-112.35
+Uganda (2020),SEK,Dinner,-112.35
+Ukraina (2018),SEK,Normalbelopp,257
+Ukraina (2018),SEK,Breakfast,-38.55
+Ukraina (2018),SEK,Lunch,-89.95
+Ukraina (2018),SEK,Dinner,-89.95
+Ukraina (2019),SEK,Normalbelopp,278
+Ukraina (2019),SEK,Breakfast,-41.7
+Ukraina (2019),SEK,Lunch,-97.3
+Ukraina (2019),SEK,Dinner,-97.3
+Ukraina (2020),SEK,Normalbelopp,356
+Ukraina (2020),SEK,Breakfast,-53.4
+Ukraina (2020),SEK,Lunch,-124.6
+Ukraina (2020),SEK,Dinner,-124.6
+Ungern (2018),SEK,Normalbelopp,393
+Ungern (2018),SEK,Breakfast,-58.95
+Ungern (2018),SEK,Lunch,-137.55
+Ungern (2018),SEK,Dinner,-137.55
+Ungern (2019),SEK,Normalbelopp,417
+Ungern (2019),SEK,Breakfast,-62.55
+Ungern (2019),SEK,Lunch,-145.95
+Ungern (2019),SEK,Dinner,-145.95
+Ungern (2020),SEK,Normalbelopp,436
+Ungern (2020),SEK,Breakfast,-65.4
+Ungern (2020),SEK,Lunch,-152.6
+Ungern (2020),SEK,Dinner,-152.6
+Uruguay (2018),SEK,Normalbelopp,503
+Uruguay (2018),SEK,Breakfast,-75.45
+Uruguay (2018),SEK,Lunch,-176.05
+Uruguay (2018),SEK,Dinner,-176.05
+Uruguay (2019),SEK,Normalbelopp,495
+Uruguay (2019),SEK,Breakfast,-74.25
+Uruguay (2019),SEK,Lunch,-173.25
+Uruguay (2019),SEK,Dinner,-173.25
+Uruguay (2020),SEK,Normalbelopp,479
+Uruguay (2020),SEK,Breakfast,-71.85
+Uruguay (2020),SEK,Lunch,-167.65
+Uruguay (2020),SEK,Dinner,-167.65
+USA (2018),SEK,Normalbelopp,689
+USA (2018),SEK,Breakfast,-103.35
+USA (2018),SEK,Lunch,-241.15
+USA (2018),SEK,Dinner,-241.15
+USA (2019),SEK,Normalbelopp,762
+USA (2019),SEK,Breakfast,-114.3
+USA (2019),SEK,Lunch,-266.7
+USA (2019),SEK,Dinner,-266.7
+USA (2020),SEK,Normalbelopp,851
+USA (2020),SEK,Breakfast,-127.65
+USA (2020),SEK,Lunch,-297.85
+USA (2020),SEK,Dinner,-297.85
+Uzbekistan (2018),SEK,Normalbelopp,230
+Uzbekistan (2018),SEK,Breakfast,-34.5
+Uzbekistan (2018),SEK,Lunch,-80.5
+Uzbekistan (2018),SEK,Dinner,-80.5
+Uzbekistan (2019),SEK,Normalbelopp,230
+Uzbekistan (2019),SEK,Breakfast,-34.5
+Uzbekistan (2019),SEK,Lunch,-80.5
+Uzbekistan (2019),SEK,Dinner,-80.5
+Uzbekistan (2020),SEK,Normalbelopp,240
+Uzbekistan (2020),SEK,Breakfast,-36
+Uzbekistan (2020),SEK,Lunch,-84
+Uzbekistan (2020),SEK,Dinner,-84
+Vanuatu (2018),SEK,Normalbelopp,587
+Vanuatu (2018),SEK,Breakfast,-88.05
+Vanuatu (2018),SEK,Lunch,-205.45
+Vanuatu (2018),SEK,Dinner,-205.45
+Vanuatu (2019),SEK,Normalbelopp,626
+Vanuatu (2019),SEK,Breakfast,-93.9
+Vanuatu (2019),SEK,Lunch,-219.1
+Vanuatu (2019),SEK,Dinner,-219.1
+Vanuatu (2020),SEK,Normalbelopp,650
+Vanuatu (2020),SEK,Breakfast,-97.5
+Vanuatu (2020),SEK,Lunch,-227.5
+Vanuatu (2020),SEK,Dinner,-227.5
+Venezuela (2020),SEK,Normalbelopp,240
+Venezuela (2020),SEK,Breakfast,-36
+Venezuela (2020),SEK,Lunch,-84
+Venezuela (2020),SEK,Dinner,-84
+Vietnam (2018),SEK,Normalbelopp,308
+Vietnam (2018),SEK,Breakfast,-46.2
+Vietnam (2018),SEK,Lunch,-107.8
+Vietnam (2018),SEK,Dinner,-107.8
+Vietnam (2019),SEK,Normalbelopp,333
+Vietnam (2019),SEK,Breakfast,-49.95
+Vietnam (2019),SEK,Lunch,-116.55
+Vietnam (2019),SEK,Dinner,-116.55
+Vietnam (2020),SEK,Normalbelopp,374
+Vietnam (2020),SEK,Breakfast,-56.1
+Vietnam (2020),SEK,Lunch,-130.9
+Vietnam (2020),SEK,Dinner,-130.9
+Vitryssland (2018),SEK,Normalbelopp,230
+Vitryssland (2018),SEK,Breakfast,-34.5
+Vitryssland (2018),SEK,Lunch,-80.5
+Vitryssland (2018),SEK,Dinner,-80.5
+Vitryssland (2019),SEK,Normalbelopp,233
+Vitryssland (2019),SEK,Breakfast,-34.95
+Vitryssland (2019),SEK,Lunch,-81.55
+Vitryssland (2019),SEK,Dinner,-81.55
+Vitryssland (2020),SEK,Normalbelopp,271
+Vitryssland (2020),SEK,Breakfast,-40.65
+Vitryssland (2020),SEK,Lunch,-94.85
+Vitryssland (2020),SEK,Dinner,-94.85
+Zambia (2018),SEK,Normalbelopp,355
+Zambia (2018),SEK,Breakfast,-53.25
+Zambia (2018),SEK,Lunch,-124.25
+Zambia (2018),SEK,Dinner,-124.25
+Zambia (2019),SEK,Normalbelopp,295
+Zambia (2019),SEK,Breakfast,-44.25
+Zambia (2019),SEK,Lunch,-103.25
+Zambia (2019),SEK,Dinner,-103.25
+Zambia (2020),SEK,Normalbelopp,260
+Zambia (2020),SEK,Breakfast,-39
+Zambia (2020),SEK,Lunch,-91
+Zambia (2020),SEK,Dinner,-91
+Zimbabwe (2018),SEK,Normalbelopp,511
+Zimbabwe (2018),SEK,Breakfast,-76.65
+Zimbabwe (2018),SEK,Lunch,-178.85
+Zimbabwe (2018),SEK,Dinner,-178.85
+Zimbabwe (2019),SEK,Normalbelopp,561
+Zimbabwe (2019),SEK,Breakfast,-84.15
+Zimbabwe (2019),SEK,Lunch,-196.35
+Zimbabwe (2019),SEK,Dinner,-196.35
+Zimbabwe (2020),SEK,Normalbelopp,487
+Zimbabwe (2020),SEK,Breakfast,-73.05
+Zimbabwe (2020),SEK,Lunch,-170.45
+Zimbabwe (2020),SEK,Dinner,-170.45
\ No newline at end of file
diff --git a/docs/assets/images/AdminissuedVirtualCards.png b/docs/assets/images/AdminissuedVirtualCards.png
index 88df9b2f3fec..9c44763f5840 100644
Binary files a/docs/assets/images/AdminissuedVirtualCards.png and b/docs/assets/images/AdminissuedVirtualCards.png differ
diff --git a/docs/assets/images/Approves_To.png b/docs/assets/images/Approves_To.png
new file mode 100644
index 000000000000..004f75377234
Binary files /dev/null and b/docs/assets/images/Approves_To.png differ
diff --git a/docs/assets/images/Duty-of-care.png b/docs/assets/images/Duty-of-care.png
new file mode 100644
index 000000000000..8774c0983f3f
Binary files /dev/null and b/docs/assets/images/Duty-of-care.png differ
diff --git a/docs/assets/images/Expenses.png b/docs/assets/images/Expenses.png
new file mode 100644
index 000000000000..f018737be803
Binary files /dev/null and b/docs/assets/images/Expenses.png differ
diff --git a/docs/assets/images/ExpensifyHelp-FreeTrial-1.png b/docs/assets/images/ExpensifyHelp-FreeTrial-1.png
new file mode 100644
index 000000000000..28bfcaf15847
Binary files /dev/null and b/docs/assets/images/ExpensifyHelp-FreeTrial-1.png differ
diff --git a/docs/assets/images/ExpensifyHelp-Invoice-1.png b/docs/assets/images/ExpensifyHelp-Invoice-1.png
new file mode 100644
index 000000000000..a6dda9fdca92
Binary files /dev/null and b/docs/assets/images/ExpensifyHelp-Invoice-1.png differ
diff --git a/docs/assets/images/ExpensifyHelp-QBO-1.png b/docs/assets/images/ExpensifyHelp-QBO-1.png
new file mode 100644
index 000000000000..e20a5e4222d0
Binary files /dev/null and b/docs/assets/images/ExpensifyHelp-QBO-1.png differ
diff --git a/docs/assets/images/ExpensifyHelp-QBO-2.png b/docs/assets/images/ExpensifyHelp-QBO-2.png
new file mode 100644
index 000000000000..66b71b8d8ec8
Binary files /dev/null and b/docs/assets/images/ExpensifyHelp-QBO-2.png differ
diff --git a/docs/assets/images/ExpensifyHelp-QBO-3.png b/docs/assets/images/ExpensifyHelp-QBO-3.png
new file mode 100644
index 000000000000..f96550868bbd
Binary files /dev/null and b/docs/assets/images/ExpensifyHelp-QBO-3.png differ
diff --git a/docs/assets/images/ExpensifyHelp-QBO-4.png b/docs/assets/images/ExpensifyHelp-QBO-4.png
new file mode 100644
index 000000000000..c7b85a93b04b
Binary files /dev/null and b/docs/assets/images/ExpensifyHelp-QBO-4.png differ
diff --git a/docs/assets/images/ExpensifyHelp-QBO-5.png b/docs/assets/images/ExpensifyHelp-QBO-5.png
new file mode 100644
index 000000000000..99b83b8be2d1
Binary files /dev/null and b/docs/assets/images/ExpensifyHelp-QBO-5.png differ
diff --git a/docs/assets/images/ExpensifyHelp-WorkspaceFeeds_01.png b/docs/assets/images/ExpensifyHelp-WorkspaceFeeds_01.png
new file mode 100644
index 000000000000..e7332f65e832
Binary files /dev/null and b/docs/assets/images/ExpensifyHelp-WorkspaceFeeds_01.png differ
diff --git a/docs/assets/images/ExpensifyHelp-WorkspaceFeeds_02.png b/docs/assets/images/ExpensifyHelp-WorkspaceFeeds_02.png
new file mode 100644
index 000000000000..b5c176e829c9
Binary files /dev/null and b/docs/assets/images/ExpensifyHelp-WorkspaceFeeds_02.png differ
diff --git a/docs/assets/images/ExpensifyHelp-WorkspaceFeeds_03.png b/docs/assets/images/ExpensifyHelp-WorkspaceFeeds_03.png
new file mode 100644
index 000000000000..ffed1ff6ade2
Binary files /dev/null and b/docs/assets/images/ExpensifyHelp-WorkspaceFeeds_03.png differ
diff --git a/docs/assets/images/ExpensifyHelp-WorkspaceFeeds_04.png b/docs/assets/images/ExpensifyHelp-WorkspaceFeeds_04.png
new file mode 100644
index 000000000000..88cb7d2704a8
Binary files /dev/null and b/docs/assets/images/ExpensifyHelp-WorkspaceFeeds_04.png differ
diff --git a/docs/assets/images/ExpensifyHelp-WorkspaceFeeds_05.png b/docs/assets/images/ExpensifyHelp-WorkspaceFeeds_05.png
new file mode 100644
index 000000000000..2175697461dc
Binary files /dev/null and b/docs/assets/images/ExpensifyHelp-WorkspaceFeeds_05.png differ
diff --git a/docs/assets/images/ExpensifyHelp-WorkspaceFeeds_06.png b/docs/assets/images/ExpensifyHelp-WorkspaceFeeds_06.png
new file mode 100644
index 000000000000..cce21e52e185
Binary files /dev/null and b/docs/assets/images/ExpensifyHelp-WorkspaceFeeds_06.png differ
diff --git a/docs/assets/images/ExpensifyHelp-WorkspaceFeeds_07.png b/docs/assets/images/ExpensifyHelp-WorkspaceFeeds_07.png
new file mode 100644
index 000000000000..5e9297f0c100
Binary files /dev/null and b/docs/assets/images/ExpensifyHelp-WorkspaceFeeds_07.png differ
diff --git a/docs/assets/images/ExpensifyHelp-Xero-1.png b/docs/assets/images/ExpensifyHelp-Xero-1.png
new file mode 100644
index 000000000000..7a8af4c9859e
Binary files /dev/null and b/docs/assets/images/ExpensifyHelp-Xero-1.png differ
diff --git a/docs/assets/images/ExpensifyHelp-Xero-2.png b/docs/assets/images/ExpensifyHelp-Xero-2.png
new file mode 100644
index 000000000000..f7679d00582d
Binary files /dev/null and b/docs/assets/images/ExpensifyHelp-Xero-2.png differ
diff --git a/docs/assets/images/ExpensifyHelp-Xero-3.png b/docs/assets/images/ExpensifyHelp-Xero-3.png
new file mode 100644
index 000000000000..f7f5c40b9cec
Binary files /dev/null and b/docs/assets/images/ExpensifyHelp-Xero-3.png differ
diff --git a/docs/assets/images/ExpensifyHelp_ApproveExpense_1.png b/docs/assets/images/ExpensifyHelp_ApproveExpense_1.png
new file mode 100644
index 000000000000..d896fe8f214b
Binary files /dev/null and b/docs/assets/images/ExpensifyHelp_ApproveExpense_1.png differ
diff --git a/docs/assets/images/ExpensifyHelp_ApproveExpense_2.png b/docs/assets/images/ExpensifyHelp_ApproveExpense_2.png
new file mode 100644
index 000000000000..97bbfde7afb3
Binary files /dev/null and b/docs/assets/images/ExpensifyHelp_ApproveExpense_2.png differ
diff --git a/docs/assets/images/ExpensifyHelp_ConnectBankAccount_1_Light.png b/docs/assets/images/ExpensifyHelp_ConnectBankAccount_1_Light.png
new file mode 100644
index 000000000000..3ff21c1f34cb
Binary files /dev/null and b/docs/assets/images/ExpensifyHelp_ConnectBankAccount_1_Light.png differ
diff --git a/docs/assets/images/ExpensifyHelp_ConnectBankAccount_2_Light.png b/docs/assets/images/ExpensifyHelp_ConnectBankAccount_2_Light.png
new file mode 100644
index 000000000000..dea262434e59
Binary files /dev/null and b/docs/assets/images/ExpensifyHelp_ConnectBankAccount_2_Light.png differ
diff --git a/docs/assets/images/ExpensifyHelp_CreateWorkspace_1.png b/docs/assets/images/ExpensifyHelp_CreateWorkspace_1.png
new file mode 100644
index 000000000000..e221b508a799
Binary files /dev/null and b/docs/assets/images/ExpensifyHelp_CreateWorkspace_1.png differ
diff --git a/docs/assets/images/ExpensifyHelp_CreateWorkspace_2.png b/docs/assets/images/ExpensifyHelp_CreateWorkspace_2.png
new file mode 100644
index 000000000000..9953bfcbd281
Binary files /dev/null and b/docs/assets/images/ExpensifyHelp_CreateWorkspace_2.png differ
diff --git a/docs/assets/images/ExpensifyHelp_CreateWorkspace_3.png b/docs/assets/images/ExpensifyHelp_CreateWorkspace_3.png
new file mode 100644
index 000000000000..f30ec7f9c1e3
Binary files /dev/null and b/docs/assets/images/ExpensifyHelp_CreateWorkspace_3.png differ
diff --git a/docs/assets/images/ExpensifyHelp_InviteMembers_1.png b/docs/assets/images/ExpensifyHelp_InviteMembers_1.png
new file mode 100644
index 000000000000..12b000fbd07c
Binary files /dev/null and b/docs/assets/images/ExpensifyHelp_InviteMembers_1.png differ
diff --git a/docs/assets/images/ExpensifyHelp_InviteMembers_2.png b/docs/assets/images/ExpensifyHelp_InviteMembers_2.png
new file mode 100644
index 000000000000..169013014ab5
Binary files /dev/null and b/docs/assets/images/ExpensifyHelp_InviteMembers_2.png differ
diff --git a/docs/assets/images/ExpensifyHelp_InviteMembers_3.png b/docs/assets/images/ExpensifyHelp_InviteMembers_3.png
new file mode 100644
index 000000000000..c8603b7a6b3c
Binary files /dev/null and b/docs/assets/images/ExpensifyHelp_InviteMembers_3.png differ
diff --git a/docs/assets/images/ExpensifyHelp_R1_CreateWorkspace_1.png b/docs/assets/images/ExpensifyHelp_R1_CreateWorkspace_1.png
new file mode 100644
index 000000000000..4487e10d9719
Binary files /dev/null and b/docs/assets/images/ExpensifyHelp_R1_CreateWorkspace_1.png differ
diff --git a/docs/assets/images/ExpensifyHelp_R1_CreateWorkspace_2.png b/docs/assets/images/ExpensifyHelp_R1_CreateWorkspace_2.png
new file mode 100644
index 000000000000..600e5a7788ed
Binary files /dev/null and b/docs/assets/images/ExpensifyHelp_R1_CreateWorkspace_2.png differ
diff --git a/docs/assets/images/ExpensifyHelp_R1_CreateWorkspace_3.png b/docs/assets/images/ExpensifyHelp_R1_CreateWorkspace_3.png
new file mode 100644
index 000000000000..dd0996a7eecd
Binary files /dev/null and b/docs/assets/images/ExpensifyHelp_R1_CreateWorkspace_3.png differ
diff --git a/docs/assets/images/ExpensifyHelp_R1_InviteMembers_1.png b/docs/assets/images/ExpensifyHelp_R1_InviteMembers_1.png
new file mode 100644
index 000000000000..874fb307f067
Binary files /dev/null and b/docs/assets/images/ExpensifyHelp_R1_InviteMembers_1.png differ
diff --git a/docs/assets/images/ExpensifyHelp_R1_InviteMembers_2.png b/docs/assets/images/ExpensifyHelp_R1_InviteMembers_2.png
new file mode 100644
index 000000000000..f5dae55fdcd4
Binary files /dev/null and b/docs/assets/images/ExpensifyHelp_R1_InviteMembers_2.png differ
diff --git a/docs/assets/images/ExpensifyHelp_R1_InviteMembers_3.png b/docs/assets/images/ExpensifyHelp_R1_InviteMembers_3.png
new file mode 100644
index 000000000000..1d646d3d5001
Binary files /dev/null and b/docs/assets/images/ExpensifyHelp_R1_InviteMembers_3.png differ
diff --git a/docs/assets/images/ExpensifyHelp_R2_Profile_1.png b/docs/assets/images/ExpensifyHelp_R2_Profile_1.png
new file mode 100644
index 000000000000..7e3e6ac181be
Binary files /dev/null and b/docs/assets/images/ExpensifyHelp_R2_Profile_1.png differ
diff --git a/docs/assets/images/ExpensifyHelp_R3_Categories_1.png b/docs/assets/images/ExpensifyHelp_R3_Categories_1.png
new file mode 100644
index 000000000000..47997df920de
Binary files /dev/null and b/docs/assets/images/ExpensifyHelp_R3_Categories_1.png differ
diff --git a/docs/assets/images/ExpensifyHelp_R4_Tags_1.png b/docs/assets/images/ExpensifyHelp_R4_Tags_1.png
new file mode 100644
index 000000000000..c8540d93423f
Binary files /dev/null and b/docs/assets/images/ExpensifyHelp_R4_Tags_1.png differ
diff --git a/docs/assets/images/ExpensifyHelp_R4_Tags_2.png b/docs/assets/images/ExpensifyHelp_R4_Tags_2.png
new file mode 100644
index 000000000000..a83d748ea12b
Binary files /dev/null and b/docs/assets/images/ExpensifyHelp_R4_Tags_2.png differ
diff --git a/docs/assets/images/ExpensifyHelp_R5_Wallet_1.png b/docs/assets/images/ExpensifyHelp_R5_Wallet_1.png
new file mode 100644
index 000000000000..695dceb52581
Binary files /dev/null and b/docs/assets/images/ExpensifyHelp_R5_Wallet_1.png differ
diff --git a/docs/assets/images/ExpensifyHelp_TrackExpense_1.png b/docs/assets/images/ExpensifyHelp_TrackExpense_1.png
new file mode 100644
index 000000000000..4512095c18b1
Binary files /dev/null and b/docs/assets/images/ExpensifyHelp_TrackExpense_1.png differ
diff --git a/docs/assets/images/ExpensifyHelp_TrackExpense_2.png b/docs/assets/images/ExpensifyHelp_TrackExpense_2.png
new file mode 100644
index 000000000000..5cef6d83e242
Binary files /dev/null and b/docs/assets/images/ExpensifyHelp_TrackExpense_2.png differ
diff --git a/docs/assets/images/ExpensifyHelp_TrackExpense_3.png b/docs/assets/images/ExpensifyHelp_TrackExpense_3.png
new file mode 100644
index 000000000000..a15810d97cf0
Binary files /dev/null and b/docs/assets/images/ExpensifyHelp_TrackExpense_3.png differ
diff --git a/docs/assets/images/Export-Expenses.png b/docs/assets/images/Export-Expenses.png
new file mode 100644
index 000000000000..8e73577bdf62
Binary files /dev/null and b/docs/assets/images/Export-Expenses.png differ
diff --git a/docs/assets/images/Itinerary.png b/docs/assets/images/Itinerary.png
new file mode 100644
index 000000000000..52ddb33d8489
Binary files /dev/null and b/docs/assets/images/Itinerary.png differ
diff --git a/docs/assets/images/QBO_classic_duplicate_journal.png b/docs/assets/images/QBO_classic_duplicate_journal.png
new file mode 100644
index 000000000000..8a78014b5900
Binary files /dev/null and b/docs/assets/images/QBO_classic_duplicate_journal.png differ
diff --git a/docs/assets/images/QBO_classic_edit_exports.png b/docs/assets/images/QBO_classic_edit_exports.png
new file mode 100644
index 000000000000..adff19e3e60a
Binary files /dev/null and b/docs/assets/images/QBO_classic_edit_exports.png differ
diff --git a/docs/assets/images/QBO_classic_icon.png b/docs/assets/images/QBO_classic_icon.png
new file mode 100644
index 000000000000..a557b2affdf5
Binary files /dev/null and b/docs/assets/images/QBO_classic_icon.png differ
diff --git a/docs/assets/images/QBO_classic_report_history.png b/docs/assets/images/QBO_classic_report_history.png
new file mode 100644
index 000000000000..9a732b058c72
Binary files /dev/null and b/docs/assets/images/QBO_classic_report_history.png differ
diff --git a/docs/assets/images/QBO_classic_troubleshooting_billable.png b/docs/assets/images/QBO_classic_troubleshooting_billable.png
new file mode 100644
index 000000000000..876fe33dbe66
Binary files /dev/null and b/docs/assets/images/QBO_classic_troubleshooting_billable.png differ
diff --git a/docs/assets/images/QBO_classic_troubleshooting_billable_2.png b/docs/assets/images/QBO_classic_troubleshooting_billable_2.png
new file mode 100644
index 000000000000..5a88c48a3e5c
Binary files /dev/null and b/docs/assets/images/QBO_classic_troubleshooting_billable_2.png differ
diff --git a/docs/assets/images/QBO_desktop_01.png b/docs/assets/images/QBO_desktop_01.png
new file mode 100644
index 000000000000..57d8b197a230
Binary files /dev/null and b/docs/assets/images/QBO_desktop_01.png differ
diff --git a/docs/assets/images/QBO_desktop_02.png b/docs/assets/images/QBO_desktop_02.png
new file mode 100644
index 000000000000..db159237134e
Binary files /dev/null and b/docs/assets/images/QBO_desktop_02.png differ
diff --git a/docs/assets/images/QBO_desktop_03.png b/docs/assets/images/QBO_desktop_03.png
new file mode 100644
index 000000000000..8b1e2db475fb
Binary files /dev/null and b/docs/assets/images/QBO_desktop_03.png differ
diff --git a/docs/assets/images/QBO_desktop_04.png b/docs/assets/images/QBO_desktop_04.png
new file mode 100644
index 000000000000..5a189934bfc0
Binary files /dev/null and b/docs/assets/images/QBO_desktop_04.png differ
diff --git a/docs/assets/images/QBO_desktop_05.png b/docs/assets/images/QBO_desktop_05.png
new file mode 100644
index 000000000000..7cb9d83a631f
Binary files /dev/null and b/docs/assets/images/QBO_desktop_05.png differ
diff --git a/docs/assets/images/QBO_desktop_06.png b/docs/assets/images/QBO_desktop_06.png
new file mode 100644
index 000000000000..70df2262158c
Binary files /dev/null and b/docs/assets/images/QBO_desktop_06.png differ
diff --git a/docs/assets/images/QBO_desktop_07.png b/docs/assets/images/QBO_desktop_07.png
new file mode 100644
index 000000000000..c5f3010c3a26
Binary files /dev/null and b/docs/assets/images/QBO_desktop_07.png differ
diff --git a/docs/assets/images/QBO_desktop_08.png b/docs/assets/images/QBO_desktop_08.png
new file mode 100644
index 000000000000..e09b3636614e
Binary files /dev/null and b/docs/assets/images/QBO_desktop_08.png differ
diff --git a/docs/assets/images/QBO_help_01.png b/docs/assets/images/QBO_help_01.png
new file mode 100644
index 000000000000..1f34093100a4
Binary files /dev/null and b/docs/assets/images/QBO_help_01.png differ
diff --git a/docs/assets/images/QBO_help_02.png b/docs/assets/images/QBO_help_02.png
new file mode 100644
index 000000000000..31b096eba2f1
Binary files /dev/null and b/docs/assets/images/QBO_help_02.png differ
diff --git a/docs/assets/images/QBO_help_03.png b/docs/assets/images/QBO_help_03.png
new file mode 100644
index 000000000000..0497c282c231
Binary files /dev/null and b/docs/assets/images/QBO_help_03.png differ
diff --git a/docs/assets/images/QBO_help_04.png b/docs/assets/images/QBO_help_04.png
new file mode 100644
index 000000000000..ae881efa17b9
Binary files /dev/null and b/docs/assets/images/QBO_help_04.png differ
diff --git a/docs/assets/images/Travel-Analytics.png b/docs/assets/images/Travel-Analytics.png
new file mode 100644
index 000000000000..c4f969b6d51c
Binary files /dev/null and b/docs/assets/images/Travel-Analytics.png differ
diff --git a/docs/assets/images/Travel_Email.png b/docs/assets/images/Travel_Email.png
new file mode 100644
index 000000000000..499b5a0968ef
Binary files /dev/null and b/docs/assets/images/Travel_Email.png differ
diff --git a/docs/assets/images/Travel_Policy.png b/docs/assets/images/Travel_Policy.png
new file mode 100644
index 000000000000..3ea8829f62c2
Binary files /dev/null and b/docs/assets/images/Travel_Policy.png differ
diff --git a/docs/assets/images/Xero_classic_Bill.png b/docs/assets/images/Xero_classic_Bill.png
new file mode 100644
index 000000000000..52df4c808a59
Binary files /dev/null and b/docs/assets/images/Xero_classic_Bill.png differ
diff --git a/docs/assets/images/Xero_classic_Edit_exports.png b/docs/assets/images/Xero_classic_Edit_exports.png
new file mode 100644
index 000000000000..25bda4a9454a
Binary files /dev/null and b/docs/assets/images/Xero_classic_Edit_exports.png differ
diff --git a/docs/assets/images/Xero_classic_bank_transaction.png b/docs/assets/images/Xero_classic_bank_transaction.png
new file mode 100644
index 000000000000..b730e65569a6
Binary files /dev/null and b/docs/assets/images/Xero_classic_bank_transaction.png differ
diff --git a/docs/assets/images/Xero_classic_category_icon.png b/docs/assets/images/Xero_classic_category_icon.png
new file mode 100644
index 000000000000..50360ecdae54
Binary files /dev/null and b/docs/assets/images/Xero_classic_category_icon.png differ
diff --git a/docs/assets/images/Xero_classic_copy.png b/docs/assets/images/Xero_classic_copy.png
new file mode 100644
index 000000000000..ff67fecad252
Binary files /dev/null and b/docs/assets/images/Xero_classic_copy.png differ
diff --git a/docs/assets/images/Xero_classic_new_connection.png b/docs/assets/images/Xero_classic_new_connection.png
new file mode 100644
index 000000000000..bb7183262e19
Binary files /dev/null and b/docs/assets/images/Xero_classic_new_connection.png differ
diff --git a/docs/assets/images/Xero_classic_troubleshoot_category.png b/docs/assets/images/Xero_classic_troubleshoot_category.png
new file mode 100644
index 000000000000..af6b8c2ffa0a
Binary files /dev/null and b/docs/assets/images/Xero_classic_troubleshoot_category.png differ
diff --git a/docs/assets/images/Xero_classic_troubleshoot_payment.png b/docs/assets/images/Xero_classic_troubleshoot_payment.png
new file mode 100644
index 000000000000..441324ebf1b1
Binary files /dev/null and b/docs/assets/images/Xero_classic_troubleshoot_payment.png differ
diff --git a/docs/assets/images/Xero_classic_troubleshoot_remove_redo.png b/docs/assets/images/Xero_classic_troubleshoot_remove_redo.png
new file mode 100644
index 000000000000..2028457c9555
Binary files /dev/null and b/docs/assets/images/Xero_classic_troubleshoot_remove_redo.png differ
diff --git a/docs/assets/images/Xero_help_01.png b/docs/assets/images/Xero_help_01.png
new file mode 100644
index 000000000000..ce60204866f7
Binary files /dev/null and b/docs/assets/images/Xero_help_01.png differ
diff --git a/docs/assets/images/Xero_help_02.png b/docs/assets/images/Xero_help_02.png
new file mode 100644
index 000000000000..8ed2f256cf0f
Binary files /dev/null and b/docs/assets/images/Xero_help_02.png differ
diff --git a/docs/assets/images/Xero_help_03.png b/docs/assets/images/Xero_help_03.png
new file mode 100644
index 000000000000..318bb274b115
Binary files /dev/null and b/docs/assets/images/Xero_help_03.png differ
diff --git a/docs/assets/images/Xero_help_04.png b/docs/assets/images/Xero_help_04.png
new file mode 100644
index 000000000000..b0d29bc9fde6
Binary files /dev/null and b/docs/assets/images/Xero_help_04.png differ
diff --git a/docs/assets/images/Xero_help_05.png b/docs/assets/images/Xero_help_05.png
new file mode 100644
index 000000000000..e8265e82b652
Binary files /dev/null and b/docs/assets/images/Xero_help_05.png differ
diff --git a/docs/assets/images/amounts.png b/docs/assets/images/amounts.png
new file mode 100644
index 000000000000..6d5751811495
Binary files /dev/null and b/docs/assets/images/amounts.png differ
diff --git a/docs/assets/images/domains.svg b/docs/assets/images/domains.svg
index 3a3c95604b79..12c0a0a0792b 100644
--- a/docs/assets/images/domains.svg
+++ b/docs/assets/images/domains.svg
@@ -1,44 +1 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 28.3.0, 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"
-	 width="68" height="68" viewBox="0 0 68 68" style="enable-background:new 0 0 68 68;" xml:space="preserve">
-<style type="text/css">
-	.st0{fill:#0164BF;}
-	.st1{fill:#0676DE;}
-	.st2{fill:none;stroke:#002140;stroke-width:0.999;stroke-linecap:round;stroke-linejoin:round;}
-	.st3{fill:#50EEF6;stroke:#002140;stroke-width:0.999;stroke-linecap:round;stroke-linejoin:round;}
-	.st4{fill:#0185FF;}
-	.st5{fill:#03D47C;}
-	.st6{fill:none;stroke:#002140;stroke-width:0.9999;stroke-linecap:round;stroke-linejoin:round;}
-</style>
-<path class="st0" d="M56.721,11c2.426,0,3.929,1.627,3.929,4.623v34.024H7.353V15.623c0-2.995,1.5-4.623,3.926-4.623H56.721z"/>
-<path class="st1" d="M63.999,49.647v3.36c0,2.466-1.601,3.993-4.548,3.993H8.548C5.604,57,4,55.472,4,53.007v-3.36H63.999z"/>
-<path class="st2" d="M4,49.647h3.352H60.65h3.349"/>
-<path class="st2" d="M8.547,57h50.905"/>
-<path class="st2" d="M4,49.647v3.36"/>
-<path class="st2" d="M8.548,57C5.604,57,4,55.472,4,53.007"/>
-<path class="st2" d="M7.353,15.623c0-2.995,1.5-4.623,3.926-4.623"/>
-<path class="st2" d="M7.353,15.623v34.024"/>
-<path class="st2" d="M64,49.647v3.36"/>
-<path class="st2" d="M59.452,57C62.399,57,64,55.472,64,53.007"/>
-<path class="st2" d="M60.651,15.623c0-2.995-1.503-4.623-3.929-4.623"/>
-<path class="st2" d="M60.65,15.623v34.024"/>
-<path class="st2" d="M11.278,11h45.443"/>
-<path class="st3" d="M10.137,14.628h47.726v35.027H10.137V14.628z"/>
-<path class="st4" d="M34.405,43.932c6.403,0,11.594-5.242,11.594-11.709s-5.191-11.709-11.594-11.709
-	c-6.403,0-11.594,5.242-11.594,11.709S28.002,43.932,34.405,43.932z"/>
-<path class="st5" d="M27.923,42.173c0,0,2.672-1.651,3.117-2.391c0.445-0.74,0.62-4.002,2.491-4.406
-	c1.871-0.404,7.231,1.133,7.981-1.508c0.75-2.641-1.747-4.406-1.747-4.406s-1.995-1.89-1.623-2.647
-	c0.372-0.757,2.092-3.625,0.75-4.913c-1.556-1.493-4.309-1.89-4.309-1.89s-7.781-0.626-11.4,6.927
-	C19.57,34.494,25.426,41.171,27.923,42.173z"/>
-<path class="st5" d="M39.643,38.268c0,0-4.115,1.639-4.487,2.647c-0.372,1.007-0.75,3.022-0.75,3.022s5.986-1.133,7.107-2.391
-	c1.122-1.258,3.241-5.288,3.241-5.288s-3.241-0.125-5.112,2.015V38.268z"/>
-<path class="st6" d="M33.876,44c6.559,0,11.876-5.37,11.876-11.994s-5.317-11.994-11.876-11.994S22,25.382,22,32.006
-	S27.317,44,33.876,44z"/>
-<path class="st6" d="M37.32,20.604c0.941,0.495,1.984,1.104,2.232,2.146c0.44,1.844-1.911,3.626-1.206,5.385
-	c0.4,0.996,1.578,1.377,2.345,2.129c0.84,0.825,1.139,2.169,0.727,3.279c-0.411,1.11-1.516,1.918-2.688,1.975
-	c-1.122,0.057-2.193-0.518-3.314-0.552c-1.437-0.045-2.858,0.882-3.399,2.231c-0.237,0.592-0.316,1.235-0.518,1.839
-	c-0.541,1.617-2.029,2.863-3.703,3.102"/>
-<path class="st6" d="M34.521,43.516c0.096-2.226,1.798-4.275,3.951-4.759c0.406-0.091,0.834-0.137,1.206-0.33
-	c0.395-0.205,0.682-0.558,1.003-0.865c1.127-1.076,2.745-1.599,4.278-1.395"/>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" id="Layer_1" width="68" height="68" x="0" y="0" version="1.1" viewBox="0 0 68 68" style="enable-background:new 0 0 68 68" xml:space="preserve"><style type="text/css">.st0{fill:#0164bf}.st1{fill:#0676de}.st2,.st3{fill:none;stroke:#002140;stroke-width:.999;stroke-linecap:round;stroke-linejoin:round}.st3{fill:#50eef6}.st4{fill:#0185ff}.st5{fill:#03d47c}.st6{fill:none;stroke:#002140;stroke-width:.9999;stroke-linecap:round;stroke-linejoin:round}</style><path d="M56.721,11c2.426,0,3.929,1.627,3.929,4.623v34.024H7.353V15.623c0-2.995,1.5-4.623,3.926-4.623H56.721z" class="st0"/><path d="M63.999,49.647v3.36c0,2.466-1.601,3.993-4.548,3.993H8.548C5.604,57,4,55.472,4,53.007v-3.36H63.999z" class="st1"/><path d="M4,49.647h3.352H60.65h3.349" class="st2"/><path d="M8.547,57h50.905" class="st2"/><path d="M4,49.647v3.36" class="st2"/><path d="M8.548,57C5.604,57,4,55.472,4,53.007" class="st2"/><path d="M7.353,15.623c0-2.995,1.5-4.623,3.926-4.623" class="st2"/><path d="M7.353,15.623v34.024" class="st2"/><path d="M64,49.647v3.36" class="st2"/><path d="M59.452,57C62.399,57,64,55.472,64,53.007" class="st2"/><path d="M60.651,15.623c0-2.995-1.503-4.623-3.929-4.623" class="st2"/><path d="M60.65,15.623v34.024" class="st2"/><path d="M11.278,11h45.443" class="st2"/><path d="M10.137,14.628h47.726v35.027H10.137V14.628z" class="st3"/><path d="M34.405,43.932c6.403,0,11.594-5.242,11.594-11.709s-5.191-11.709-11.594-11.709	c-6.403,0-11.594,5.242-11.594,11.709S28.002,43.932,34.405,43.932z" class="st4"/><path d="M27.923,42.173c0,0,2.672-1.651,3.117-2.391c0.445-0.74,0.62-4.002,2.491-4.406	c1.871-0.404,7.231,1.133,7.981-1.508c0.75-2.641-1.747-4.406-1.747-4.406s-1.995-1.89-1.623-2.647	c0.372-0.757,2.092-3.625,0.75-4.913c-1.556-1.493-4.309-1.89-4.309-1.89s-7.781-0.626-11.4,6.927	C19.57,34.494,25.426,41.171,27.923,42.173z" class="st5"/><path d="M39.643,38.268c0,0-4.115,1.639-4.487,2.647c-0.372,1.007-0.75,3.022-0.75,3.022s5.986-1.133,7.107-2.391	c1.122-1.258,3.241-5.288,3.241-5.288s-3.241-0.125-5.112,2.015V38.268z" class="st5"/><path d="M33.876,44c6.559,0,11.876-5.37,11.876-11.994s-5.317-11.994-11.876-11.994S22,25.382,22,32.006	S27.317,44,33.876,44z" class="st6"/><path d="M37.32,20.604c0.941,0.495,1.984,1.104,2.232,2.146c0.44,1.844-1.911,3.626-1.206,5.385	c0.4,0.996,1.578,1.377,2.345,2.129c0.84,0.825,1.139,2.169,0.727,3.279c-0.411,1.11-1.516,1.918-2.688,1.975	c-1.122,0.057-2.193-0.518-3.314-0.552c-1.437-0.045-2.858,0.882-3.399,2.231c-0.237,0.592-0.316,1.235-0.518,1.839	c-0.541,1.617-2.029,2.863-3.703,3.102" class="st6"/><path d="M34.521,43.516c0.096-2.226,1.798-4.275,3.951-4.759c0.406-0.091,0.834-0.137,1.206-0.33	c0.395-0.205,0.682-0.558,1.003-0.865c1.127-1.076,2.745-1.599,4.278-1.395" class="st6"/></svg>
\ No newline at end of file
diff --git a/docs/assets/images/plane.svg b/docs/assets/images/plane.svg
new file mode 100644
index 000000000000..bd7fceba3607
--- /dev/null
+++ b/docs/assets/images/plane.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="68" height="68" fill="none" viewBox="0 0 68 68"><path fill="#FEE45E" d="M33.6221 39.562L27.5205 42.3266L28.729 46.4862L33.9062 45.6594L33.6221 39.562Z"/><path fill="#002140" d="M28.5285 44.7318C28.6959 43.58 28.0576 42.5338 27.1028 42.3951C26.148 42.2563 25.2383 43.0775 25.0709 44.2292C24.9035 45.381 25.5418 46.4272 26.4966 46.566C27.4513 46.7048 28.3611 45.8836 28.5285 44.7318Z"/><path stroke="#002140" stroke-linecap="round" stroke-linejoin="round" stroke-width=".999" d="M28.4113 44.5719C28.5787 43.4201 27.9404 42.3739 26.9856 42.2351C26.0308 42.0964 25.1211 42.9176 24.9537 44.0693C24.7863 45.2211 25.4246 46.2673 26.3794 46.4061C27.3342 46.5448 28.2439 45.7237 28.4113 44.5719Z"/><path stroke="#002140" stroke-linecap="round" stroke-linejoin="round" stroke-width=".999" d="M26.6669 42.1741L31.9205 40.5034"/><path fill="#FEE45E" d="M32.2641 22.4186C32.3065 22.5374 33.9178 25.5776 33.9178 25.5776L37.6831 24.3649L36.1778 20.7734L32.2641 22.4186Z"/><path fill="#FEE45E" d="M32.6795 38.1625C32.6795 38.1625 23.385 41.0967 20.1413 39.4388C16.8975 37.7809 16.3675 35.9618 16.3675 35.9618L23.2705 29.8305L53.024 19.2851C53.024 19.2851 58.7143 18.0088 62.0429 20.43C65.3757 22.8511 63.4888 25.2299 60.2366 26.9005C56.9843 28.5669 46.7485 32.5527 46.7485 32.5527L32.6753 38.1625H32.6795Z"/><path fill="#FED607" d="M36.6231 24.8355L31.1278 16.8343L31.7384 15.8929L34.4436 14.9771L45.519 21.367L36.6231 24.8355Z"/><path fill="#FED607" d="M22.8472 30.0128C22.8472 30.0128 19.9681 34.3081 17.7929 35.9363C15.6177 37.5646 15.3505 37.2084 15.3505 37.2084L3.60944 29.169L7.5613 26.769L22.8514 30.0086L22.8472 30.0128Z"/><path fill="#FED607" d="M21.9391 37.1238L13.5138 43.9039L10.0792 44.1201L15.354 37.2001C15.354 37.2001 19.8783 35.4786 21.9391 37.1238Z"/><path fill="#FED607" d="M33.045 38.099C33.045 38.099 39.5961 30.8483 47.5974 31.9253L47.2963 32.6334L29.3985 51.8245L24.7639 52.1044L33.045 38.0948V38.099Z"/><path fill="#002140" d="M55.0551 26.0737C55.0551 26.0737 53.7364 25.3275 53.3039 24.7508C52.8714 24.1741 51.9089 22.6095 51.9089 22.6095L53.5838 21.7021C53.5838 21.7021 56.5816 19.8788 56.5137 19.5142C56.4459 19.1495 56.9038 19.0181 56.9038 19.0181C56.9038 19.0181 61.0168 19.8873 61.356 20.2562C61.6995 20.6209 60.3893 22.5713 60.3893 22.5713C60.3893 22.5713 55.8395 26.1119 55.0509 26.078L55.0551 26.0737Z"/><path stroke="#002140" stroke-linecap="round" stroke-linejoin="round" stroke-width=".999" d="M47.8512 32.2981L29.3937 51.7987C29.3385 51.8581 29.2622 51.8963 29.1817 51.909L25.3485 52.456C25.0517 52.4984 24.8355 52.1803 24.9881 51.9217L33.3667 37.399C33.3837 37.3694 33.4049 37.3439 33.4261 37.3227C33.9561 36.8096 40.2952 30.8479 47.6308 31.696C47.9276 31.7299 48.0548 32.0861 47.8512 32.3023V32.2981Z"/><path stroke="#002140" stroke-linecap="round" stroke-linejoin="round" stroke-width=".999" d="M22.9271 30.0212C22.9271 30.0212 50.4418 20.0525 51.752 19.5522C53.0622 19.0518 60.6479 17.5338 63.7645 21.9861C65.7743 25.6029 54.2749 29.8389 54.2749 29.8389L48.2326 31.9335"/><path stroke="#002140" stroke-linecap="round" stroke-linejoin="round" stroke-width=".999" d="M36.7457 24.8145L31.1826 17.3729C30.8137 16.8768 31.0215 16.1645 31.6024 15.9525L34.0362 15.0578C34.2991 14.9603 34.5917 14.9899 34.8334 15.1341L45.5611 21.6174"/><path stroke="#002140" stroke-linecap="round" stroke-linejoin="round" stroke-width=".999" d="M33.0315 37.6196C33.0315 37.6196 25.7638 41.5969 19.5731 39.2394"/><path stroke="#002140" stroke-linecap="round" stroke-linejoin="round" stroke-width=".999" d="M15.6299 37.2041C15.6299 37.2041 18.7804 34.8466 22.0581 37.1023C21.7952 37.3186 13.8321 43.8739 13.8321 43.8739L9.58765 44.4888L15.6299 37.2041Z"/><path stroke="#002140" stroke-linecap="round" stroke-linejoin="round" stroke-width=".999" d="M22.9271 30.0215C22.9271 30.0215 22.1596 32.8794 15.634 37.2044"/><path stroke="#002140" stroke-linecap="round" stroke-linejoin="round" stroke-width=".999" d="M15.63 37.2043L3.50732 29.3133L7.24718 26.7268L22.9274 30.0214"/><path fill="#002140" d="M33.5485 25.1085C33.6887 23.9531 33.0259 22.9222 32.0682 22.806C31.1104 22.6897 30.2202 23.5321 30.08 24.6875C29.9398 25.8429 30.6026 26.8738 31.5603 26.99C32.5181 27.1063 33.4083 26.2639 33.5485 25.1085Z"/><path stroke="#002140" stroke-linecap="round" stroke-linejoin="round" stroke-width=".999" d="M33.2025 24.9522C33.3427 23.7968 32.6799 22.766 31.7221 22.6497C30.7644 22.5335 29.8742 23.3759 29.734 24.5313C29.5938 25.6867 30.2565 26.7175 31.2143 26.8338C32.1721 26.95 33.0622 26.1076 33.2025 24.9522Z"/><path stroke="#002140" stroke-linecap="round" stroke-linejoin="round" stroke-width=".999" d="M30.7128 22.8937L34.088 21.5962"/><path stroke="#002140" stroke-linecap="round" stroke-linejoin="round" stroke-width=".999" d="M56.7651 18.9165C56.7651 18.9165 56.587 19.879 55.3191 20.6889C54.3057 21.3334 52.563 22.1263 51.9058 22.4189C51.7701 22.4783 51.7277 22.6479 51.8167 22.7624L54.2676 26.04C54.3269 26.1206 54.4287 26.1545 54.5262 26.1206C55.5312 25.7644 61.0222 23.6613 61.4377 20.2691"/><path fill="#002140" d="M44.8287 27.4985C44.8287 27.4985 44.7651 27.1593 44.9856 26.8158C45.2061 26.4723 46.0456 26.3833 46.0456 26.3833L46.5799 27.1635L46.9488 28.0667C46.9488 28.0667 46.6435 28.3465 46.3976 28.4271C46.1516 28.5076 45.7573 28.3932 45.7573 28.3932L44.8287 27.4942V27.4985Z"/><path stroke="#002140" stroke-linecap="round" stroke-linejoin="round" stroke-width=".999" d="M45.2095 26.4765L45.5487 26.3239C45.8582 26.1839 46.2229 26.2857 46.4137 26.5656L47.0031 27.4178C47.2575 27.7867 47.1049 28.2998 46.6893 28.4694L46.3543 28.6051C46.0491 28.7281 45.7014 28.6263 45.5148 28.3592L44.9254 27.5196C44.671 27.1592 44.8109 26.6546 45.2137 26.4723L45.2095 26.4765Z"/><path fill="#002140" d="M40.4896 29.0378C40.4896 29.0378 40.426 28.6986 40.6465 28.3551C40.867 28.0117 41.7065 27.9226 41.7065 27.9226L42.2408 28.7028L42.6097 29.606C42.6097 29.606 42.3044 29.8858 42.0585 29.9664C41.8125 30.0469 41.4182 29.9325 41.4182 29.9325L40.4896 29.0335V29.0378Z"/><path stroke="#002140" stroke-linecap="round" stroke-linejoin="round" stroke-width=".999" d="M40.8673 28.0158L41.2065 27.8632C41.5161 27.7233 41.8807 27.825 42.0715 28.1049L42.6609 28.9571C42.9153 29.326 42.7627 29.8391 42.3472 30.0087L42.0122 30.1444C41.7069 30.2674 41.3592 30.1656 41.1726 29.8985L40.5832 29.0589C40.3288 28.6985 40.4688 28.1939 40.8716 28.0116L40.8673 28.0158Z"/><path fill="#002140" d="M36.504 30.496C36.504 30.496 36.4404 30.1568 36.6609 29.8134C36.8814 29.4699 37.7209 29.3809 37.7209 29.3809L38.2552 30.1611L38.6241 31.0642C38.6241 31.0642 38.3188 31.3441 38.0729 31.4246C37.8269 31.5052 37.4326 31.3907 37.4326 31.3907L36.504 30.4918V30.496Z"/><path stroke="#002140" stroke-linecap="round" stroke-linejoin="round" stroke-width=".999" d="M36.8819 29.4699L37.2211 29.3173C37.5306 29.1774 37.8953 29.2791 38.0861 29.559L38.6755 30.4112C38.9299 30.7801 38.7772 31.2932 38.3617 31.4628L38.0267 31.5985C37.7214 31.7215 37.3737 31.6197 37.1872 31.3526L36.5978 30.513C36.3434 30.1526 36.4833 29.648 36.8861 29.4657L36.8819 29.4699Z"/><path fill="#002140" d="M32.6082 32.0695C32.6082 32.0695 32.5446 31.7303 32.7651 31.3868C32.9856 31.0434 33.8251 30.9543 33.8251 30.9543L34.3594 31.7345L34.7283 32.6377C34.7283 32.6377 34.423 32.9176 34.1771 32.9981C33.9311 33.0787 33.5368 32.9642 33.5368 32.9642L32.6082 32.0653V32.0695Z"/><path stroke="#002140" stroke-linecap="round" stroke-linejoin="round" stroke-width=".999" d="M32.9852 31.0476L33.3245 30.8949C33.634 30.755 33.9987 30.8568 34.1895 31.1366L34.7789 31.9889C35.0333 32.3578 34.8806 32.8708 34.4651 33.0405L34.1301 33.1761C33.8248 33.2991 33.4771 33.1973 33.2905 32.9302L32.7012 32.0906C32.4467 31.7302 32.5867 31.2257 32.9895 31.0433L32.9852 31.0476Z"/><path fill="#002140" d="M28.8515 33.5876C28.8515 33.5876 28.7879 33.2484 29.0084 32.9049C29.2289 32.5615 30.0685 32.4724 30.0685 32.4724L30.6027 33.2526L30.9716 34.1558C30.9716 34.1558 30.6663 34.4356 30.4204 34.5162C30.1745 34.5967 29.7801 34.4823 29.7801 34.4823L28.8515 33.5833V33.5876Z"/><path stroke="#002140" stroke-linecap="round" stroke-linejoin="round" stroke-width=".999" d="M29.2295 32.5615L29.5687 32.4088C29.8782 32.2689 30.2429 32.3707 30.4337 32.6505L31.0231 33.5028C31.2775 33.8717 31.1248 34.3848 30.7093 34.5544L30.3743 34.6901C30.069 34.813 29.7213 34.7113 29.5347 34.4441L28.9454 33.6046C28.6909 33.2441 28.8309 32.7396 29.2337 32.5572L29.2295 32.5615Z"/></svg>
\ No newline at end of file
diff --git a/docs/assets/images/simple-illustration__monitor-remotesync.svg b/docs/assets/images/simple-illustration__monitor-remotesync.svg
new file mode 100644
index 000000000000..f0f6f363036e
--- /dev/null
+++ b/docs/assets/images/simple-illustration__monitor-remotesync.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" id="Layer_1" width="68" height="68" data-name="Layer 1" version="1.1" viewBox="0 0 68 68"><defs><style>.cls-1{fill:#03d47c;stroke-linecap:round;stroke:#002140}.cls-2,.cls-3{stroke:#002140;fill:#8eecc4;stroke-miterlimit:10}.cls-3{fill:#28736d}</style></defs><path d="M34.418,59.869h-14.474c-1.408,0-1.505-2.694.092-2.694,6.155,0,12.125-2.155,12.125-5.926l.018-.014v-4.199H11.452c-2.909,0-5.287-2.477-5.287-5.507V14.507c0-3.03,2.378-5.507,5.287-5.507h45.261c2.909,0,5.287,2.477,5.287,5.507v27.027c0,3.03-2.378,5.507-5.287,5.507h-20.675v.029l-.051,4.17v.014c.005,3.771,5.974,5.926,12.134,5.926,1.597,0,1.505,2.694.092,2.694h-14.475.683l-.005-.005Z" class="cls-3"/><path d="M57.272,11.742H10.889c-1.26,0-2.281,1.064-2.281,2.376v27.969c0,1.312,1.021,2.376,2.281,2.376h46.383c1.26,0,2.281-1.064,2.281-2.376V14.118c0-1.312-1.021-2.376-2.281-2.376Z" class="cls-2"/><path d="M27.25,20.563v1.166l.845-.803c1.571-1.494,3.655-2.426,5.989-2.426,3.578,0,6.585,2.198,8.025,5.248.351.743.025,1.632-.748,1.983-.778.353-1.694.017-2.048-.732-1.013-2.146-3.022-3.504-5.229-3.504-1.822,0-3.517.93-4.619,2.464l-.569.792h3.229c.759,0,1.375.616,1.375,1.375s-.616,1.375-1.375,1.375h-7.625v-7.625c0-.759.616-1.375,1.375-1.375s1.375.616,1.375,1.375v.688ZM35.875,28.5h7.625v7.625c0,.759-.616,1.375-1.375,1.375s-1.375-.616-1.375-1.375v-1.854l-.845.804c-1.57,1.494-3.655,2.426-5.989,2.426-3.579,0-6.585-2.199-8.025-5.249-.351-.743-.025-1.631.749-1.982.779-.353,1.694-.016,2.047.732,1.013,2.146,3.022,3.505,5.23,3.505,1.823,0,3.517-.931,4.619-2.465l.569-.792h-3.229c-.759,0-1.375-.616-1.375-1.375s.616-1.375,1.375-1.375Z" class="cls-1"/></svg>
\ No newline at end of file
diff --git a/docs/assets/js/main.js b/docs/assets/js/main.js
index 6b3390148ff0..9e4880780e91 100644
--- a/docs/assets/js/main.js
+++ b/docs/assets/js/main.js
@@ -196,6 +196,35 @@ const tocbotOptions = {
     scrollContainer: 'content-area',
 };
 
+function selectNewExpensify(newExpensifyTab, newExpensifyContent, expensifyClassicTab, expensifyClassicContent) {
+    newExpensifyTab.classList.add('active');
+    newExpensifyContent.classList.remove('hidden');
+
+    if (expensifyClassicTab && expensifyClassicContent) {
+        expensifyClassicTab.classList.remove('active');
+        expensifyClassicContent.classList.add('hidden');
+    }
+    window.tocbot.refresh({
+        ...tocbotOptions,
+        contentSelector: '#new-expensify',
+    });
+}
+
+function selectExpensifyClassic(newExpensifyTab, newExpensifyContent, expensifyClassicTab, expensifyClassicContent) {
+    expensifyClassicTab.classList.add('active');
+    expensifyClassicContent.classList.remove('hidden');
+
+    if (newExpensifyTab && newExpensifyContent) {
+        newExpensifyTab.classList.remove('active');
+        newExpensifyContent.classList.add('hidden');
+    }
+
+    window.tocbot.refresh({
+        ...tocbotOptions,
+        contentSelector: '#expensify-classic',
+    });
+}
+
 window.addEventListener('DOMContentLoaded', () => {
     injectFooterCopywrite();
 
@@ -219,8 +248,10 @@ window.addEventListener('DOMContentLoaded', () => {
     let contentSelector = '.article-toc-content';
     if (expensifyClassicContent) {
         contentSelector = '#expensify-classic';
+        selectExpensifyClassic(newExpensifyTab, newExpensifyContent, expensifyClassicTab, expensifyClassicContent);
     } else if (newExpensifyContent) {
         contentSelector = '#new-expensify';
+        selectNewExpensify(newExpensifyTab, newExpensifyContent, expensifyClassicTab, expensifyClassicContent);
     }
 
     if (window.tocbot) {
@@ -232,28 +263,12 @@ window.addEventListener('DOMContentLoaded', () => {
 
     // eslint-disable-next-line es/no-optional-chaining
     expensifyClassicTab?.addEventListener('click', () => {
-        expensifyClassicTab.classList.add('active');
-        expensifyClassicContent.classList.remove('hidden');
-
-        newExpensifyTab.classList.remove('active');
-        newExpensifyContent.classList.add('hidden');
-        window.tocbot.refresh({
-            ...tocbotOptions,
-            contentSelector: '#expensify-classic',
-        });
+        selectExpensifyClassic(newExpensifyTab, newExpensifyContent, expensifyClassicTab, expensifyClassicContent);
     });
 
     // eslint-disable-next-line es/no-optional-chaining
     newExpensifyTab?.addEventListener('click', () => {
-        newExpensifyTab.classList.add('active');
-        newExpensifyContent.classList.remove('hidden');
-
-        expensifyClassicTab.classList.remove('active');
-        expensifyClassicContent.classList.add('hidden');
-        window.tocbot.refresh({
-            ...tocbotOptions,
-            contentSelector: '#new-expensify',
-        });
+        selectNewExpensify(newExpensifyTab, newExpensifyContent, expensifyClassicTab, expensifyClassicContent);
     });
 
     document.getElementById('header-button').addEventListener('click', toggleHeaderMenu);
diff --git a/docs/expensify-classic/hubs/connect-credit-cards/business-bank-accounts.html b/docs/expensify-classic/hubs/bank-accounts-and-payments/bank-accounts.html
similarity index 100%
rename from docs/expensify-classic/hubs/connect-credit-cards/business-bank-accounts.html
rename to docs/expensify-classic/hubs/bank-accounts-and-payments/bank-accounts.html
diff --git a/docs/expensify-classic/hubs/connect-credit-cards/deposit-accounts.html b/docs/expensify-classic/hubs/bank-accounts-and-payments/payments.html
similarity index 100%
rename from docs/expensify-classic/hubs/connect-credit-cards/deposit-accounts.html
rename to docs/expensify-classic/hubs/bank-accounts-and-payments/payments.html
diff --git a/docs/expensify-classic/hubs/expenses/expenses.html b/docs/expensify-classic/hubs/connections/accelo.html
similarity index 100%
rename from docs/expensify-classic/hubs/expenses/expenses.html
rename to docs/expensify-classic/hubs/connections/accelo.html
diff --git a/docs/expensify-classic/hubs/expenses/reports.html b/docs/expensify-classic/hubs/connections/certinia.html
similarity index 100%
rename from docs/expensify-classic/hubs/expenses/reports.html
rename to docs/expensify-classic/hubs/connections/certinia.html
diff --git a/docs/expensify-classic/hubs/integrations/index.html b/docs/expensify-classic/hubs/connections/index.html
similarity index 100%
rename from docs/expensify-classic/hubs/integrations/index.html
rename to docs/expensify-classic/hubs/connections/index.html
diff --git a/docs/expensify-classic/hubs/getting-started/approved-accountants.html b/docs/expensify-classic/hubs/connections/netsuite.html
similarity index 100%
rename from docs/expensify-classic/hubs/getting-started/approved-accountants.html
rename to docs/expensify-classic/hubs/connections/netsuite.html
diff --git a/docs/expensify-classic/hubs/getting-started/support.html b/docs/expensify-classic/hubs/connections/quickbooks-desktop.html
similarity index 100%
rename from docs/expensify-classic/hubs/getting-started/support.html
rename to docs/expensify-classic/hubs/connections/quickbooks-desktop.html
diff --git a/docs/expensify-classic/hubs/getting-started/tips-and-tricks.html b/docs/expensify-classic/hubs/connections/quickbooks-online.html
similarity index 100%
rename from docs/expensify-classic/hubs/getting-started/tips-and-tricks.html
rename to docs/expensify-classic/hubs/connections/quickbooks-online.html
diff --git a/docs/expensify-classic/hubs/integrations/HR-integrations.html b/docs/expensify-classic/hubs/connections/sage-intacct.html
similarity index 100%
rename from docs/expensify-classic/hubs/integrations/HR-integrations.html
rename to docs/expensify-classic/hubs/connections/sage-intacct.html
diff --git a/docs/expensify-classic/hubs/integrations/accounting-integrations.html b/docs/expensify-classic/hubs/connections/xero.html
similarity index 100%
rename from docs/expensify-classic/hubs/integrations/accounting-integrations.html
rename to docs/expensify-classic/hubs/connections/xero.html
diff --git a/docs/expensify-classic/hubs/travel/index.html b/docs/expensify-classic/hubs/travel/index.html
new file mode 100644
index 000000000000..7c8c3d363d5e
--- /dev/null
+++ b/docs/expensify-classic/hubs/travel/index.html
@@ -0,0 +1,6 @@
+---
+layout: default
+title: Travel
+---
+
+{% include hub.html %}
diff --git a/docs/new-expensify/hubs/bank-accounts-and-payments/index.html b/docs/new-expensify/hubs/bank-accounts-and-payments/index.html
deleted file mode 100644
index 94db3c798710..000000000000
--- a/docs/new-expensify/hubs/bank-accounts-and-payments/index.html
+++ /dev/null
@@ -1,6 +0,0 @@
----
-layout: default
-title: Bank Accounts & Payments
----
-
-{% include hub.html %}
\ No newline at end of file
diff --git a/docs/expensify-classic/hubs/integrations/other-integrations.html b/docs/new-expensify/hubs/connections/netsuite.html
similarity index 100%
rename from docs/expensify-classic/hubs/integrations/other-integrations.html
rename to docs/new-expensify/hubs/connections/netsuite.html
diff --git a/docs/expensify-classic/hubs/integrations/travel-integrations.html b/docs/new-expensify/hubs/connections/quickbooks-online.html
similarity index 100%
rename from docs/expensify-classic/hubs/integrations/travel-integrations.html
rename to docs/new-expensify/hubs/connections/quickbooks-online.html
diff --git a/docs/expensify-classic/hubs/workspaces/reports.html b/docs/new-expensify/hubs/connections/sage-intacct.html
similarity index 100%
rename from docs/expensify-classic/hubs/workspaces/reports.html
rename to docs/new-expensify/hubs/connections/sage-intacct.html
diff --git a/docs/new-expensify/hubs/connections/xero.html b/docs/new-expensify/hubs/connections/xero.html
new file mode 100644
index 000000000000..86641ee60b7d
--- /dev/null
+++ b/docs/new-expensify/hubs/connections/xero.html
@@ -0,0 +1,5 @@
+---
+layout: default
+---
+
+{% include section.html %}
diff --git a/docs/new-expensify/hubs/expenses/index.html b/docs/new-expensify/hubs/expenses-&-payments/index.html
similarity index 100%
rename from docs/new-expensify/hubs/expenses/index.html
rename to docs/new-expensify/hubs/expenses-&-payments/index.html
diff --git a/docs/new-expensify/hubs/travel/index.html b/docs/new-expensify/hubs/travel/index.html
new file mode 100644
index 000000000000..7c8c3d363d5e
--- /dev/null
+++ b/docs/new-expensify/hubs/travel/index.html
@@ -0,0 +1,6 @@
+---
+layout: default
+title: Travel
+---
+
+{% include hub.html %}
diff --git a/docs/redirects.csv b/docs/redirects.csv
index f775d2f97094..480fd4220bd4 100644
--- a/docs/redirects.csv
+++ b/docs/redirects.csv
@@ -1,4 +1,5 @@
 sourceURL,targetURL
+https://community.expensify.com,https://help.expensify.com
 https://community.expensify.com/discussion/5634/deep-dive-how-long-will-it-take-for-me-to-receive-my-reimbursement,https://help.expensify.com/articles/expensify-classic/expenses/reports/Reimbursements
 https://community.expensify.com/discussion/4925/how-to-dispute-an-expensify-card-transaction,https://help.expensify.com/articles/expensify-classic/expensify-card/Dispute-A-Transaction
 https://community.expensify.com/discussion/5184/faq-how-am-i-protected-from-fraud-using-the-expensify-card,https://help.expensify.com/articles/expensify-classic/expensify-card/Dispute-A-Transaction
@@ -24,15 +25,35 @@ https://community.expensify.com/discussion/5655/deep-dive-what-is-a-vacation-del
 https://community.expensify.com/discussion/5194/how-to-assign-a-vacation-delegate-for-an-employee-through-domains,https://help.expensify.com/articles/expensify-classic/copilots-and-delegates/Vacation-Delegate
 https://community.expensify.com/discussion/5190/how-to-individually-assign-a-vacation-delegate-from-account-settings,https://help.expensify.com/articles/expensify-classic/copilots-and-delegates/Vacation-Delegate
 https://community.expensify.com/discussion/5274/how-to-set-up-an-adp-indirect-integration-with-expensify,https://help.expensify.com/articles/expensify-classic/integrations/HR-integrations/ADP
-https://community.expensify.com/discussion/5776/how-to-create-mileage-expenses-in-expensify,https://help.expensify.com/articles/expensify-classic/expenses/Distance-Tracking
-https://community.expensify.com/discussion/7385/how-to-enable-two-factor-authentication-in-your-account,https://help.expensify.com/expensify-classic/hubs/settings/account-settings
-https://community.expensify.com/discussion/5124/how-to-add-your-name-and-photo-to-your-account,https://help.expensify.com/expensify-classic/hubs/settings/account-settings
+https://community.expensify.com/discussion/5776/how-to-create-mileage-expenses-in-expensify,https://help.expensify.com/articles/expensify-classic/workspaces/Expense-Settings#distance-expenses
 https://community.expensify.com/discussion/5149/how-to-manage-your-devices-in-expensify,https://help.expensify.com/expensify-classic/hubs/settings/account-settings
 https://community.expensify.com/discussion/4432/how-to-add-a-secondary-login,https://help.expensify.com/expensify-classic/hubs/settings/account-settings
 https://community.expensify.com/discussion/6794/how-to-change-your-email-in-expensify,https://help.expensify.com/expensify-classic/hubs/settings/account-settings
+https://community.expensify.com/discussion/3498/how-do-i-invite-users-in-my-company,https://help.expensify.com/expensify-classic/hubs/getting-started
+https://community.expensify.com/discussion/6015/tutorial,https://help.expensify.com/expensify-classic/hubs/getting-started
+https://community.expensify.com/discussion/2596/setting-up-accounts,https://help.expensify.com/expensify-classic/hubs/getting-started
+https://community.expensify.com/discussion/7665/how-do-i-add-another-person-to-my-account-to-keep-track-of-there-expenses,https://help.expensify.com/expensify-classic/hubs/getting-started
+https://community.expensify.com/discussion/7456/how-do-i-submit-an-expense-for-reimbursement,https://help.expensify.com/expensify-classic/hubs/getting-started
+https://community.expensify.com/discussion/1460/schedule-a-demo,https://help.expensify.com/expensify-classic/hubs/getting-started
+https://community.expensify.com/discussion/835/what-is-the-difference-between-a-category-and-a-tag,https://help.expensify.com/expensify-classic/hubs/getting-started
+https://community.expensify.com/discussion/7703/getting-started-video,https://help.expensify.com/expensify-classic/hubs/getting-started
+https://community.expensify.com/discussion/1845/how-to-set-up-account-and-add-users,https://help.expensify.com/expensify-classic/hubs/getting-started
+https://community.expensify.com/discussion/8629/employee-training-e-learning-program,https://help.expensify.com/articles/expensify-classic/getting-started/Join-your-company's-workspace
+https://community.expensify.com/discussion/1607/on-demand-webinars,https://help.expensify.com/expensify-classic/hubs/getting-started
+https://community.expensify.com/discussion/5444/admin-onboarding-webinar-faqs,https://help.expensify.com/expensify-classic/hubs/getting-started
+https://community.expensify.com/discussion/5417/employee-training-webinar-faqs,https://help.expensify.com/expensify-classic/hubs/getting-started
+https://community.expensify.com/discussion/5885/overview-the-employee-training-webinar,https://help.expensify.com/expensify-classic/hubs/getting-started
+https://community.expensify.com/discussion/5854/overview-the-expensify-admin-onboarding-webinar,https://help.expensify.com/expensify-classic/hubs/getting-started
+https://community.expensify.com/discussion/4699/how-to-download-the-mobile-app,https://help.expensify.com/expensify-classic/hubs/getting-started
+https://community.expensify.com/discussion/4524/how-to-set-up-the-uber-integration,https://help.expensify.com/articles/expensify-classic/connections/Uber
+https://community.expensify.com/discussion/5212/how-to-connect-your-policy-to-netsuite-token-based-authentication,https://help.expensify.com/articles/expensify-classic/connections/netsuite/Connect-To-NetSuite
+https://community.expensify.com/discussion/5124/how-to-add-your-name-and-photo-to-your-account,https://help.expensify.com/articles/expensify-classic/settings/account-settings/Add-profile-photo
+https://community.expensify.com/discussion/5922/deep-dive-day-1-with-expensify-for-submitters,https://help.expensify.com/articles/expensify-classic/getting-started/Join-your-company's-workspace
+https://community.expensify.com/discussion/5934/day-1-with-expensify-admins-and-accountants,https://help.expensify.com/articles/expensify-classic/getting-started/Create-a-company-workspace
+https://community.expensify.com/discussion/5694/deep-dive-admin-training-and-setup-resources,https://help.expensify.com/expensify-classic/hubs/getting-started
 https://help.expensify.com/articles/expensify-classic/expensify-card/Expensify-Card-Perks.html,https://use.expensify.com/company-credit-card
 https://help.expensify.com/articles/expensify-classic/expensify-partner-program/How-to-Join-the-ExpensifyApproved!-Partner-Program.html,https://use.expensify.com/accountants-program
-https://help.expensify.com/articles/expensify-classic/getting-started/approved-accountants/Card-Revenue-Share-For-Expensify-Approved-Partners, https://use.expensify.com/blog/maximizing-rewards-expensifyapproved-accounting-partners-now-earn-0-5-revenue-share
+https://help.expensify.com/articles/expensify-classic/getting-started/approved-accountants/Card-Revenue-Share-For-Expensify-Approved-Partners,https://use.expensify.com/blog/maximizing-rewards-expensifyapproved-accounting-partners-now-earn-0-5-revenue-share
 https://help.expensify.com/articles/expensify-classic/bank-accounts-and-credit-cards/International-Reimbursements,https://help.expensify.com/articles/expensify-classic/bank-accounts-and-credit-cards/Global-Reimbursements
 https://community.expensify.com/discussion/4452/how-to-merge-accounts,https://help.expensify.com/articles/expensify-classic/settings/account-settings/Merge-accounts
 https://community.expensify.com/discussion/4783/how-to-add-or-remove-a-copilot,https://help.expensify.com/articles/expensify-classic/account-settings/Copilot
@@ -41,12 +62,10 @@ https://community.expensify.com/discussion/7318/deep-dive-company-credit-card-im
 https://community.expensify.com/discussion/2673/personalize-your-commercial-card-feed-name,https://help.expensify.com/articles/expensify-classic/bank-accounts-and-credit-cards/company-cards/Commercial-Card-Feeds
 https://community.expensify.com/discussion/6569/how-to-import-and-assign-company-cards-from-csv-file,https://help.expensify.com/articles/expensify-classic/bank-accounts-and-credit-cards/company-cards/CSV-Import
 https://community.expensify.com/discussion/4714/how-to-set-up-a-direct-bank-connection-for-company-cards,https://help.expensify.com/articles/expensify-classic/bank-accounts-and-credit-cards/company-cards/Direct-Bank-Connections
-https://community.expensify.com/discussion/4828/how-to-reconcile-your-company-cards-statement-in-expensify,https://help.expensify.com/articles/expensify-classic/bank-accounts-and-credit-cards/company-cards/Reconciliation
 https://community.expensify.com/discussion/5366/deep-dive-troubleshooting-credit-card-issues-in-expensify,https://help.expensify.com/articles/expensify-classic/bank-accounts-and-credit-cards/company-cards/Troubleshooting
 https://community.expensify.com/discussion/9554/how-to-set-up-global-reimbursemen,https://help.expensify.com/articles/expensify-classic/bank-accounts-and-credit-cards/Global-Reimbursements
 https://community.expensify.com/discussion/4463/how-to-remove-or-manage-settings-for-imported-personal-cards,https://help.expensify.com/articles/expensify-classic/bank-accounts-and-credit-cards/Personal-Credit-Cards
-https://community.expensify.com/discussion/5793/how-to-connect-your-personal-card-to-import-expenses,https://help.expensify.com/articles/expensify-classic/bank-accounts-and-credit-cards/Personal-Credit-Cards
-https://community.expensify.com/discussion/4826/how-to-set-your-annual-subscription-size,https://use.expensify.com/
+https://community.expensify.com/discussion/5793/how-to-connect-your-personal-card-to-import-expenses,https://help.expensify.com/articles/expensify-classic/connect-credit-cards/Personal-Credit-Cards
 https://community.expensify.com/discussion/5667/deep-dive-how-does-the-annual-subscription-billing-work,https://use.expensify.com/
 https://help.expensify.com/articles/expensify-classic/getting-started/approved-accountants/Your-Expensify-Partner-Manager,https://help.expensify.com/articles/expensify-classic/expensify-partner-program/Your-Expensify-Partner-Manager
 https://help.expensify.com/expensify-classic/hubs/getting-started/plan-types,https://use.expensify.com/
@@ -170,3 +189,383 @@ https://help.expensify.com/articles/expensify-classic/reports/Report-Audit-Log-a
 https://help.expensify.com/articles/expensify-classic/reports/The-Reports-Page,https://help.expensify.com/articles/expensify-classic/reports/Report-statuses
 https://help.expensify.com/articles/new-expensify/getting-started/Free-plan-upgrade-to-collect-plan,https://help.expensify.com/articles/new-expensify/getting-started/Upgrade-to-a-Collect-Plan
 https://help.expensify.com/articles/new-expensify/bank-accounts-and-payments/Connect-a-Bank-Account,https://help.expensify.com/new-expensify/hubs/expenses/Connect-a-Bank-Account
+https://help.expensify.com/articles/new-expensify/settings/Profile,https://help.expensify.com/new-expensify/hubs/settings/
+https://help.expensify.com/articles/new-expensify/expenses/Referral-Program.html,https://help.expensify.com/articles/expensify-classic/expensify-partner-program/Referral-Program
+https://help.expensify.com/articles/new-expensify/workspaces/The-Free-Plan,https://help.expensify.com/new-expensify/hubs/workspaces/
+https://help.expensify.com/new-expensify/hubs/expenses/Connect-a-Bank-Account,https://help.expensify.com/articles/new-expensify/expenses/Connect-a-Business-Bank-Account
+https://help.expensify.com/articles/new-expensify/settings/Security,https://help.expensify.com/articles/new-expensify/settings/Encryption-and-Data-Security
+https://help.expensify.com/articles/expensify-classic/workspaces/reports/Currency,https://help.expensify.com/articles/expensify-classic/workspaces/Currency
+https://help.expensify.com/articles/expensify-classic/workspaces/reports/Report-Fields-And-Titles,https://help.expensify.com/expensify-classic/hubs/workspaces/
+https://help.expensify.com/articles/expensify-classic/workspaces/reports/Scheduled-Submit,https://help.expensify.com/articles/expensify-classic/reports/Automatically-submit-employee-reports
+https://help.expensify.com/articles/new-expensify/chat/Expensify-Chat-For-Admins,https://help.expensify.com/new-expensify/hubs/chat/
+https://help.expensify.com/articles/new-expensify/bank-accounts-and-payments/Connect-a-Bank-Account.html,https://help.expensify.com/articles/new-expensify/expenses/Connect-a-Business-Bank-Account
+https://help.expensify.com/articles/expensify-classic/travel/Coming-Soon,https://help.expensify.com/expensify-classic/hubs/travel/
+https://help.expensify.com/articles/new-expensify/expenses/Manually-submit-reports-for-approval,https://help.expensify.com/new-expensify/hubs/expenses/
+https://help.expensify.com/articles/expensify-classic/bank-accounts-and-payments/Reimbursements.html,https://help.expensify.com/articles/expensify-classic/bank-accounts-and-payments/payments/Receive-Payments
+https://help.expensify.com/articles/expensify-classic/bank-accounts-and-payments/Pay-Bills.html,https://help.expensify.com/articles/expensify-classic/bank-accounts-and-payments/payments/Reimburse-Reports-Invoices-and-Bills
+https://help.expensify.com/articles/expensify-classic/bank-accounts-and-payments/Reimbursing-Reports.html,https://help.expensify.com/articles/expensify-classic/bank-accounts-and-payments/payments/Reimburse-Reports-Invoices-and-Bills
+https://help.expensify.com/articles/expensify-classic/expensify-card/Auto-Reconciliation,https://help.expensify.com/articles/expensify-classic/expensify-card/Expensify-Card-Reconciliation.md
+https://help.expensify.com/articles/new-expensify/expenses/Approve-and-pay-expenses,https://help.expensify.com/articles/new-expensify/expenses-&-payments/Approve-and-pay-expenses
+https://help.expensify.com/articles/new-expensify/expenses/Connect-a-Business-Bank-Account,https://help.expensify.com/articles/new-expensify/expenses-&-payments/Connect-a-Business-Bank-Account
+https://help.expensify.com/articles/new-expensify/expenses/Create-an-expense,https://help.expensify.com/articles/new-expensify/expenses-&-payments/Create-an-expense
+https://help.expensify.com/articles/new-expensify/expenses/Distance-Requests,https://help.expensify.com/articles/new-expensify/expenses-&-payments/Distance-Requests
+https://help.expensify.com/articles/new-expensify/expenses/Resolve-Errors-Adding-a-Bank-Account,https://help.expensify.com/articles/new-expensify/expenses-&-payments/Resolve-Errors-Adding-a-Bank-Account
+https://help.expensify.com/articles/new-expensify/expenses/Send-an-invoice,https://help.expensify.com/articles/new-expensify/expenses-&-payments/Send-an-invoice
+https://help.expensify.com/articles/new-expensify/expenses/Set-up-your-wallet,https://help.expensify.com/articles/new-expensify/expenses-&-payments/Set-up-your-wallet
+https://help.expensify.com/articles/new-expensify/expenses/Split-an-expense,https://help.expensify.com/articles/new-expensify/expenses-&-payments/Split-an-expense
+https://help.expensify.com/articles/new-expensify/expenses/Track-expenses,https://help.expensify.com/articles/new-expensify/expenses-&-payments/Track-expenses
+https://help.expensify.com/articles/new-expensify/expenses/Unlock-a-Business-Bank-Account,https://help.expensify.com/articles/new-expensify/expenses-&-payments/Unlock-a-Business-Bank-Account
+https://help.expensify.com/expensify-classic/hubs/integrations/HR-integrations,https://help.expensify.com/expensify-classic/hubs/connections
+https://help.expensify.com/expensify-classic/hubs/integrations/accounting-integrations,https://help.expensify.com/expensify-classic/hubs/connections
+https://help.expensify.com/expensify-classic/hubs/integrations/other-integrations,https://help.expensify.com/expensify-classic/hubs/connections
+https://help.expensify.com/expensify-classic/hubs/integrations/travel-integrations,https://help.expensify.com/expensify-classic/hubs/connections
+https://help.expensify.com/articles/expensify-classic/integrations/HR-integrations/ADP,https://help.expensify.com/articles/expensify-classic/connections/ADP
+https://help.expensify.com/articles/expensify-classic/integrations/accounting-integrations/Accelo,https://help.expensify.com/expensify-classic/hubs/connections/accelo
+https://help.expensify.com/articles/expensify-classic/integrations/travel-integrations/Additional-Travel-Integrations,https://help.expensify.com/articles/expensify-classic/connections/Additional-Travel-Integrations
+https://help.expensify.com/articles/expensify-classic/integrations/accounting-integrations/Certinia,https://help.expensify.com/expensify-classic/hubs/connections/certinia
+https://help.expensify.com/articles/expensify-classic/integrations/travel-integrations/Egencia,https://help.expensify.com/articles/expensify-classic/connections/Egencia
+https://help.expensify.com/articles/expensify-classic/integrations/travel-integrations/Global-VaTax,https://help.expensify.com/articles/expensify-classic/connections/Global-VaTax
+https://help.expensify.com/articles/expensify-classic/integrations/other-integrations/Google-Apps-SSO,https://help.expensify.com/articles/expensify-classic/connections/Google-Apps-SSO
+https://help.expensify.com/articles/expensify-classic/integrations/HR-integrations/Greenhouse,https://help.expensify.com/articles/expensify-classic/connections/Greenhouse
+https://help.expensify.com/articles/expensify-classic/integrations/HR-integrations/Gusto,https://help.expensify.com/articles/expensify-classic/connections/Gusto
+https://help.expensify.com/articles/expensify-classic/integrations/accounting-integrations/Indirect-Accounting-Integrations,https://help.expensify.com/articles/expensify-classic/connections/Indirect-Accounting-Integrations
+https://help.expensify.com/articles/expensify-classic/integrations/travel-integrations/Lyft,https://help.expensify.com/articles/expensify-classic/connections/Lyft
+https://help.expensify.com/articles/expensify-classic/integrations/travel-integrations/Navan,https://help.expensify.com/articles/expensify-classic/connections/Navan
+https://help.expensify.com/articles/expensify-classic/integrations/accounting-integrations/NetSuite,https://help.expensify.com/expensify-classic/hubs/connections/netsuite
+https://help.expensify.com/articles/expensify-classic/integrations/HR-integrations/QuickBooks-Time,https://help.expensify.com/articles/expensify-classic/connections/QuickBooks-Time
+https://help.expensify.com/articles/expensify-classic/integrations/accounting-integrations/QuickBooks-Desktop,https://help.expensify.com/expensify-classic/hubs/connections/quickbooks-desktop
+https://help.expensify.com/articles/expensify-classic/integrations/accounting-integrations/QuickBooks-Online,https://help.expensify.com/expensify-classic/hubs/connections/quickbooks-online
+https://help.expensify.com/articles/expensify-classic/integrations/HR-integrations/Rippling,https://help.expensify.com/articles/expensify-classic/connections/Rippling
+https://help.expensify.com/articles/expensify-classic/integrations/accounting-integrations/Sage-Intacct,https://help.expensify.com/expensify-classic/hubs/connections/sage-intacct
+https://help.expensify.com/articles/expensify-classic/integrations/travel-integrations/TravelPerk,https://help.expensify.com/articles/expensify-classic/connections/TravelPerk
+https://help.expensify.com/articles/expensify-classic/integrations/travel-integrations/Uber,https://help.expensify.com/articles/expensify-classic/connections/Uber
+https://help.expensify.com/articles/expensify-classic/integrations/HR-integrations/Workday,https://help.expensify.com/articles/expensify-classic/connections/Workday
+https://help.expensify.com/articles/expensify-classic/integrations/accounting-integrations/Xero,https://help.expensify.com/expensify-classic/hubs/connections/xero
+https://help.expensify.com/articles/expensify-classic/integrations/HR-integrations/Zenefits,https://help.expensify.com/articles/expensify-classic/connections/Zenefits
+https://help.expensify.com/articles/expensify-classic/workspaces/tax-tracking,https://help.expensify.com/articles/expensify-classic/workspaces/Tax-Tracking
+https://help.expensify.com/articles/expensify-classic/copilots-and-delegates/Approval-Workflows,https://help.expensify.com/articles/expensify-classic/reports/Assign-report-approvers-to-specific-employees
+https://help.expensify.com/articles/expensify-classic/settings/Notification-Troubleshooting,https://help.expensify.com/articles/expensify-classic/settings/account-settings/Set-Notifications
+https://help.expensify.com/articles/new-expensify/expenses/Validate-a-Business-Bank-Account,https://help.expensify.com/articles/new-expensify/expenses-&-payments/Validate-a-Business-Bank-Account
+https://help.expensify.com/articles/expensify-classic/workspaces/Currency,https://help.expensify.com/articles/expensify-classic/workspaces/Set-Currency
+https://help.expensify.com/articles/expensify-classic/workspaces/Expenses,https://help.expensify.com/articles/expensify-classic/workspaces/Expense-Settings
+https://help.expensify.com/articles/expensify-classic/workspaces/Reimbursement,https://help.expensify.com/articles/expensify-classic/workspaces/Configure-Reimbursement-Settings
+https://help.expensify.com/articles/expensify-classic/integrations/HR-integrations/ADP.html,https://help.expensify.com/articles/expensify-classic/connections/ADP
+https://help.expensify.com/articles/expensify-classic/integrations/accounting-integrations/Accelo.html,https://help.expensify.com/expensify-classic/hubs/connections/accelo
+https://help.expensify.com/articles/expensify-classic/integrations/travel-integrations/Additional-Travel-Integrations.html,https://help.expensify.com/articles/expensify-classic/connections/Additional-Travel-Integrations
+https://help.expensify.com/articles/expensify-classic/integrations/accounting-integrations/Certinia.html,https://help.expensify.com/expensify-classic/hubs/connections/certinia
+https://help.expensify.com/articles/expensify-classic/integrations/travel-integrations/Egencia.html,https://help.expensify.com/articles/expensify-classic/connections/Egencia
+https://help.expensify.com/articles/expensify-classic/integrations/travel-integrations/Global-VaTax.html,https://help.expensify.com/articles/expensify-classic/connections/Global-VaTax
+https://help.expensify.com/articles/expensify-classic/integrations/other-integrations/Google-Apps-SSO.html,https://help.expensify.com/articles/expensify-classic/connections/Google-Apps-SSO
+https://help.expensify.com/articles/expensify-classic/integrations/HR-integrations/Greenhouse.html,https://help.expensify.com/articles/expensify-classic/connections/Greenhouse
+https://help.expensify.com/articles/expensify-classic/integrations/HR-integrations/Gusto.html,https://help.expensify.com/articles/expensify-classic/connections/Gusto
+https://help.expensify.com/articles/expensify-classic/integrations/accounting-integrations/Indirect-Accounting-Integrations.html,https://help.expensify.com/articles/expensify-classic/connections/Indirect-Accounting-Integrations
+https://help.expensify.com/articles/expensify-classic/integrations/travel-integrations/Lyft.html,https://help.expensify.com/articles/expensify-classic/connections/Lyft
+https://help.expensify.com/articles/expensify-classic/integrations/travel-integrations/Navan.html,https://help.expensify.com/articles/expensify-classic/connections/Navan
+https://help.expensify.com/articles/expensify-classic/integrations/accounting-integrations/NetSuite.html,https://help.expensify.com/expensify-classic/hubs/connections/netsuite
+https://help.expensify.com/articles/expensify-classic/integrations/HR-integrations/QuickBooks-Time.html,https://help.expensify.com/articles/expensify-classic/connections/QuickBooks-Time
+https://help.expensify.com/articles/expensify-classic/integrations/accounting-integrations/QuickBooks-Desktop.html,https://help.expensify.com/expensify-classic/hubs/connections/quickbooks-desktop
+https://help.expensify.com/articles/expensify-classic/integrations/accounting-integrations/QuickBooks-Online.html,https://help.expensify.com/expensify-classic/hubs/connections/quickbooks-online
+https://help.expensify.com/articles/expensify-classic/integrations/HR-integrations/Rippling.html,https://help.expensify.com/articles/expensify-classic/connections/Rippling
+https://help.expensify.com/articles/expensify-classic/integrations/accounting-integrations/Sage-Intacct.html,https://help.expensify.com/expensify-classic/hubs/connections/sage-intacct
+https://help.expensify.com/articles/expensify-classic/integrations/travel-integrations/TravelPerk.html,https://help.expensify.com/articles/expensify-classic/connections/TravelPerk
+https://help.expensify.com/articles/expensify-classic/integrations/travel-integrations/Uber.html,https://help.expensify.com/articles/expensify-classic/connections/Uber
+https://help.expensify.com/articles/expensify-classic/integrations/HR-integrations/Workday.html,https://help.expensify.com/articles/expensify-classic/connections/Workday
+https://help.expensify.com/articles/expensify-classic/integrations/accounting-integrations/Xero.html,https://help.expensify.com/expensify-classic/hubs/connections/xero
+https://help.expensify.com/articles/expensify-classic/integrations/HR-integrations/Zenefits.html,https://help.expensify.com/articles/expensify-classic/connections/Zenefits
+https://help.expensify.com/articles/expensify-classic/settings/Close-or-reopen-account,https://help.expensify.com/articles/expensify-classic/settings/account-settings/Close-or-reopen-account
+https://help.expensify.com/articles/new-expensify/connections/Set-Up-NetSuite-Connection,https://help.expensify.com/articles/new-expensify/connections/netsuite/Connect-to-NetSuite
+https://help.expensify.com/articles/new-expensify/connections/Set-Up-NetSuite-Connection.html,https://help.expensify.com/articles/new-expensify/connections/netsuite/Connect-to-NetSuite
+https://help.expensify.com/articles/new-expensify/connections/Set-up-QuickBooks-Online-connection,https://help.expensify.com/articles/new-expensify/connections/quickbooks-online/Connect-to-QuickBooks-Online
+https://help.expensify.com/articles/new-expensify/connections/Set-up-QuickBooks-Online-connection.html,https://help.expensify.com/articles/new-expensify/connections/quickbooks-online/Connect-to-QuickBooks-Online
+https://help.expensify.com/articles/new-expensify/connections/Set-Up-Sage-Intacct-connection,https://help.expensify.com/articles/new-expensify/connections/sage-intacct/Connect-to-Sage-Intacct
+https://help.expensify.com/articles/new-expensify/connections/Set-Up-Sage-Intacct-connection.html,https://help.expensify.com/articles/new-expensify/connections/sage-intacct/Connect-to-Sage-Intacct
+https://help.expensify.com/articles/new-expensify/connections/Set-up-Xero-connection,https://help.expensify.com/articles/new-expensify/connections/xero/Connect-to-Xero
+https://help.expensify.com/articles/new-expensify/connections/Set-up-Xero-connection.html,https://help.expensify.com/articles/new-expensify/connections/xero/Connect-to-Xero
+https://help.expensify.com/articles/expensify-classic/bank-accounts-and-payments/Business-Bank-Accounts-USD,https://help.expensify.com/articles/expensify-classic/bank-accounts-and-payments/bank-accounts/Connect-US-Business-Bank-Account
+https://help.expensify.com/articles/expensify-classic/bank-accounts-and-payments/Deposit-Accounts-USD,https://help.expensify.com/articles/expensify-classic/bank-accounts-and-payments/bank-accounts/Connect-Personal-US-Bank-Account.md
+https://help.expensify.com/articles/expensify-classic/bank-accounts-and-payments/Business-Bank-Accounts-AUD,https://help.expensify.com/articles/expensify-classic/bank-accounts-and-payments/bank-accounts/Enable-Australian-Reimbursements.md
+https://help.expensify.com/articles/expensify-classic/bank-accounts-and-payments/Deposit-Accounts-AUD,https://help.expensify.com/articles/expensify-classic/bank-accounts-and-payments/bank-accounts/Add-Personal-Australian-Bank-Account.md
+https://help.expensify.com/articles/expensify-classic/bank-accounts-and-payments/Global-Reimbursements,https://help.expensify.com/articles/expensify-classic/bank-accounts-and-payments/bank-accounts/Enable-Global-Reimbursements.md
+https://community.expensify.com/discussion/6904/faq-troubleshooting-company-and-personal-card-import-issues,https://help.expensify.com/articles/expensify-classic/connect-credit-cards/company-cards/Troubleshooting
+https://community.expensify.com/discussion/4910/faq-expensierror-ff0047-you-must-have-an-ops-edit-permission-to-edit-approved-records,https://help.expensify.com/articles/expensify-classic/connections/certinia/Certinia-Troubleshooting
+https://community.expensify.com/discussion/4911/faq-expensierror-ff0061-object-validation-has-failed-the-credit-terms,https://help.expensify.com/articles/expensify-classic/connections/certinia/Certinia-Troubleshooting
+https://community.expensify.com/discussion/4912/faq-expensierror-ff0074-you-do-not-have-permissions-for-this-resource,https://help.expensify.com/articles/expensify-classic/connections/certinia/Certinia-Troubleshooting
+https://community.expensify.com/discussion/4915/faq-expensierror-ff0076-could-not-find-employee-in-financialforce,https://help.expensify.com/articles/expensify-classic/connections/certinia/Certinia-Troubleshooting
+https://community.expensify.com/discussion/4916/faq-expensierror-ff0089-expense-reports-for-this-project-require-an-assignment,https://help.expensify.com/articles/expensify-classic/connections/certinia/Certinia-Troubleshooting
+https://community.expensify.com/discussion/4909/faq-expensierror-ff0091-bad-field-name-field-is-invalid-for-object,https://help.expensify.com/articles/expensify-classic/connections/certinia/Certinia-Troubleshooting
+https://community.expensify.com/discussion/4908/faq-expensierror-ff0132-insufficient-access-make-sure-you-are-connecting-to-salesforce,https://help.expensify.com/articles/expensify-classic/connections/certinia/Certinia-Troubleshooting
+https://community.expensify.com/discussion/4966/faq-financialforce-psa-duplicate-value-on-record,https://help.expensify.com/articles/expensify-classic/connections/certinia/Certinia-Troubleshooting
+https://community.expensify.com/discussion/2319/update-exporting-reports-with-negative-totals-to-netsuite,https://help.expensify.com/articles/expensify-classic/connections/netsuite/Configure-Netsuite
+https://community.expensify.com/discussion/5140/faq-expensierror-ns0005-please-enter-value-s-for-department-location-or-class,https://help.expensify.com/articles/expensify-classic/connections/netsuite/Netsuite-Troubleshooting
+https://community.expensify.com/discussion/5141/faq-expensierror-ns0012-currency-does-not-exist-in-netsuite,https://help.expensify.com/articles/expensify-classic/connections/netsuite/Netsuite-Troubleshooting
+https://community.expensify.com/discussion/5142/faq-expensierror-ns0021-invalid-taxcode-reference-key,https://help.expensify.com/articles/expensify-classic/connections/netsuite/Netsuite-Troubleshooting
+https://community.expensify.com/discussion/5143/faq-expensierror-ns0023-employee-does-not-exist-in-netsuite-or-invalid-employee,https://help.expensify.com/articles/expensify-classic/connections/netsuite/Netsuite-Troubleshooting
+https://community.expensify.com/discussion/5144/faq-expensierror-ns0024-invalid-customer-or-project-tag,https://help.expensify.com/articles/expensify-classic/connections/netsuite/Netsuite-Troubleshooting
+https://community.expensify.com/discussion/5232/faq-expensierror-ns0034-this-record-already-exists,https://help.expensify.com/articles/expensify-classic/connections/netsuite/Netsuite-Troubleshooting
+https://community.expensify.com/discussion/5235/faq-expensierror-ns0046-billable-expenses-not-coded-with-a-netsuite-customer-or-billable-project,https://help.expensify.com/articles/expensify-classic/connections/netsuite/Netsuite-Troubleshooting
+https://community.expensify.com/discussion/5166/faq-expensierror-ns0089-make-sure-the-categories-you-are-using-do-not-require-a-rate-in-netsuite,https://help.expensify.com/articles/expensify-classic/connections/netsuite/Netsuite-Troubleshooting
+https://community.expensify.com/discussion/5167/faq-expensierror-ns0109-failed-to-login-to-netsuite-please-verify-your-credentials,https://help.expensify.com/articles/expensify-classic/connections/netsuite/Netsuite-Troubleshooting
+https://community.expensify.com/discussion/5168/faq-expensierror-ns0123-login-error-please-make-sure-that-the-expensify-integration-is-enabled,https://help.expensify.com/articles/expensify-classic/connections/netsuite/Netsuite-Troubleshooting
+https://community.expensify.com/discussion/5240/faq-expensierror-ns0186-record-parent-company-not-found-for-datatype-subsidiaries,https://help.expensify.com/articles/expensify-classic/connections/netsuite/Netsuite-Troubleshooting
+https://community.expensify.com/discussion/4965/faq-netsuite-elimination-settings-for-x-do-not-match,https://help.expensify.com/articles/expensify-classic/connections/netsuite/Netsuite-Troubleshooting
+https://community.expensify.com/discussion/5233/faq-netsuite-exporting-negative-expenses,https://help.expensify.com/articles/expensify-classic/connections/netsuite/Netsuite-Troubleshooting
+https://community.expensify.com/discussion/5526/faq-netsuite-reports-exporting-as-accounting-approved-instead-of-paid-in-full,https://help.expensify.com/articles/expensify-classic/connections/netsuite/Netsuite-Troubleshooting
+https://community.expensify.com/discussion/5527/faq-netsuite-reports-exporting-as-pending-approval,https://help.expensify.com/articles/expensify-classic/connections/netsuite/Netsuite-Troubleshooting
+https://community.expensify.com/discussion/5236/faq-netsuite-switching-ownership-of-a-netsuite-connection,https://help.expensify.com/articles/expensify-classic/connections/netsuite/Netsuite-Troubleshooting
+https://community.expensify.com/discussion/7248/faq-expensierror-ns0059-a-credit-card-account-has-not-been-selected-for-corporate-card-expenses,https://help.expensify.com/articles/expensify-classic/connections/netsuite/Netsuite-Troubleshooting
+https://community.expensify.com/discussion/5162/faq-how-do-i-change-the-default-payable-account-for-reimbursable-expenses-in-netsuite,https://help.expensify.com/articles/expensify-classic/connections/netsuite/Netsuite-Troubleshooting
+https://community.expensify.com/discussion/5244/faq-netsuite-error-creating-vendor-this-entity-already-exists,https://help.expensify.com/articles/expensify-classic/connections/netsuite/Netsuite-Troubleshooting
+https://community.expensify.com/discussion/5258/faq-netsuite-expense-does-not-have-appropriate-permissions-for-setting-an-exchange-rate,https://help.expensify.com/articles/expensify-classic/connections/netsuite/Netsuite-Troubleshooting
+https://community.expensify.com/discussion/5246/faq-netsuite-expenses-not-categorized-with-a-ns-account,https://help.expensify.com/articles/expensify-classic/connections/netsuite/Netsuite-Troubleshooting
+https://community.expensify.com/discussion/5255/faq-netsuite-please-enter-value-s-for-tax-code,https://help.expensify.com/articles/expensify-classic/connections/netsuite/Netsuite-Troubleshooting
+https://community.expensify.com/discussion/5257/faq-netsuite-the-transaction-date-is-not-within-the-date-range-of-your-accounting-period,https://help.expensify.com/articles/expensify-classic/connections/netsuite/Netsuite-Troubleshooting
+https://community.expensify.com/discussion/5247/faq-netsuite-the-vendor-you-are-trying-to-export-to-does-not-have-access-to-the-currency,https://help.expensify.com/articles/expensify-classic/connections/netsuite/Netsuite-Troubleshooting
+https://community.expensify.com/discussion/5256/faq-netsuite-you-do-not-have-permissions-to-set-a-value-for-element-createdfrom,https://help.expensify.com/articles/expensify-classic/connections/netsuite/Netsuite-Troubleshooting
+https://community.expensify.com/discussion/5242/faq-netsuite-you-do-not-have-permissions-to-set-a-value-for-element-receipturl,https://help.expensify.com/articles/expensify-classic/connections/netsuite/Netsuite-Troubleshooting
+https://community.expensify.com/discussion/8301/faq-what-does-the-hmac-sha1-warning-mean-for-netsuite-tba,https://help.expensify.com/articles/expensify-classic/connections/netsuite/Netsuite-Troubleshooting
+https://community.expensify.com/discussion/5163/faq-why-are-my-company-card-expenses-exporting-to-the-wrong-account-in-netsuite,https://help.expensify.com/articles/expensify-classic/connections/netsuite/Netsuite-Troubleshooting
+https://community.expensify.com/discussion/5175/faq-why-are-some-of-my-customers-not-importing-from-netsuite,https://help.expensify.com/articles/expensify-classic/connections/netsuite/Netsuite-Troubleshooting
+https://community.expensify.com/discussion/5174/faq-why-arent-all-my-categories-pulling-into-expensify-from-netsuite,https://help.expensify.com/articles/expensify-classic/connections/netsuite/Netsuite-Troubleshooting
+https://community.expensify.com/discussion/7129/netsuite-error-creating-employee-your-current-role-does-not-have-permission-to-access-this-record,https://help.expensify.com/articles/expensify-classic/connections/netsuite/Netsuite-Troubleshooting
+https://community.expensify.com/discussion/5716/faq-quickbooks-desktop-can-i-export-negative-expenses,https://help.expensify.com/articles/expensify-classic/connections/quickbooks-desktop/Configure-Quickbooks-Desktop
+https://community.expensify.com/discussion/5718/faq-quickbooks-desktop-how-do-i-export-to-employee-records-instead-of-vendor-records,https://help.expensify.com/articles/expensify-classic/connections/quickbooks-desktop/Configure-Quickbooks-Desktop
+https://community.expensify.com/discussion/5721/faq-quickbooks-desktop-how-do-i-export-reports-to-quickbooks-desktop,https://help.expensify.com/articles/expensify-classic/connections/quickbooks-desktop/Configure-Quickbooks-Desktop
+https://community.expensify.com/discussion/5723/faq-quickbooks-desktop-transaction-split-lines-to-accounts-payable-must-include-a-vendor,https://help.expensify.com/articles/expensify-classic/connections/quickbooks-desktop/Configure-Quickbooks-Desktop
+https://community.expensify.com/discussion/5169/faq-expensierror-qbo022-when-exporting-billable-expenses-please-make-sure-the-account,https://help.expensify.com/articles/expensify-classic/connections/quickbooks-online/Quickbooks-Online-Troubleshooting
+https://community.expensify.com/discussion/5198/faq-expensierror-qbo046-feature-not-included-in-subscription,https://help.expensify.com/articles/expensify-classic/connections/quickbooks-online/Quickbooks-Online-Troubleshooting
+https://community.expensify.com/discussion/5216/faq-expensierror-qbo056-expenses-are-not-categorized-with-a-quickbooks-online-account,https://help.expensify.com/articles/expensify-classic/connections/quickbooks-online/Quickbooks-Online-Troubleshooting
+https://community.expensify.com/discussion/5201/faq-expensierror-qbo088-error-creating-vendor,https://help.expensify.com/articles/expensify-classic/connections/quickbooks-online/Quickbooks-Online-Troubleshooting
+https://community.expensify.com/discussion/5202/faq-expensierror-qbo097-when-you-use-accounts-payable-you-must-choose-a-vendor-in-the-name-field,https://help.expensify.com/articles/expensify-classic/connections/quickbooks-online/Quickbooks-Online-Troubleshooting
+https://community.expensify.com/discussion/5191/faq-expensierror-qbo099-items-marked-as-billable-must-have-sales-information-checked,https://help.expensify.com/articles/expensify-classic/connections/quickbooks-online/Quickbooks-Online-Troubleshooting
+https://community.expensify.com/discussion/5193/faq-expensierror-qbo193-couldnt-connect-to-quickbooks-online,https://help.expensify.com/articles/expensify-classic/connections/quickbooks-online/Quickbooks-Online-Troubleshooting
+https://community.expensify.com/discussion/5531/faq-quickbooks-online-company-card-expenses-exporting-to-the-wrong-account,https://help.expensify.com/articles/expensify-classic/connections/quickbooks-online/Quickbooks-Online-Troubleshooting
+https://community.expensify.com/discussion/5238/faq-quickbooks-online-exporting-negative-expenses,https://help.expensify.com/articles/expensify-classic/connections/quickbooks-online/Quickbooks-Online-Troubleshooting
+https://community.expensify.com/discussion/5199/faq-expensierror-qbo077-duplicate-document-number-this-bill-number-has-already-been-used,https://help.expensify.com/articles/expensify-classic/connections/quickbooks-online/Quickbooks-Online-Troubleshooting
+https://community.expensify.com/discussion/7731/faq-quickbooks-online-the-transaction-needs-to-be-in-the-same-currency-as-the-a-r-and-a-p-accounts,https://help.expensify.com/articles/expensify-classic/connections/quickbooks-online/Quickbooks-Online-Troubleshooting
+https://community.expensify.com/discussion/4907/faq-expensierror-int009-the-employee-manager-does-not-have-a-user-associated,https://help.expensify.com/articles/expensify-classic/connections/sage-intacct/Sage-Intacct-Troubleshooting
+https://community.expensify.com/discussion/4906/faq-expensierror-int012-reason-for-expense-note-is-invalid,https://help.expensify.com/articles/expensify-classic/connections/sage-intacct/Sage-Intacct-Troubleshooting
+https://community.expensify.com/discussion/5682/faq-expensierror-int028-use-of-an-empty-location-is-invalid,https://help.expensify.com/articles/expensify-classic/connections/sage-intacct/Sage-Intacct-Troubleshooting
+https://community.expensify.com/discussion/5138/faq-expensierror-int043-not-authorized-to-execute-this-function,https://help.expensify.com/articles/expensify-classic/connections/sage-intacct/Sage-Intacct-Troubleshooting
+https://community.expensify.com/discussion/5139/faq-expensierror-int054-no-sage-intacct-employee-found-for-x,https://help.expensify.com/articles/expensify-classic/connections/sage-intacct/Sage-Intacct-Troubleshooting
+https://community.expensify.com/discussion/5299/faq-sage-intacct-authentication-error,https://help.expensify.com/articles/expensify-classic/connections/sage-intacct/Sage-Intacct-Troubleshooting
+https://community.expensify.com/discussion/5300/faq-sage-intacct-company-card-expenses-exporting-to-the-wrong-account,https://help.expensify.com/articles/expensify-classic/connections/sage-intacct/Sage-Intacct-Troubleshooting
+https://community.expensify.com/discussion/5239/faq-sage-intacct-credit-card-configuration-is-missing,https://help.expensify.com/articles/expensify-classic/connections/sage-intacct/Sage-Intacct-Troubleshooting
+https://community.expensify.com/discussion/5302/faq-sage-intacct-expensify-not-displaying-customers-projects,https://help.expensify.com/articles/expensify-classic/connections/sage-intacct/Sage-Intacct-Troubleshooting
+https://community.expensify.com/discussion/5230/faq-expensierror-xro014-billable-expenses-require-a-customer,https://help.expensify.com/articles/expensify-classic/connections/xero/Xero-Troubleshooting
+https://community.expensify.com/discussion/5231/faq-expensierror-xro027-expense-on-this-report-is-categorized-with-a-category-no-longer-in-xero,https://help.expensify.com/articles/expensify-classic/connections/xero/Xero-Troubleshooting
+https://community.expensify.com/discussion/5196/faq-expensierror-xro031-payment-has-been-already-been-allocated-to-reimbursable-expenses,https://help.expensify.com/articles/expensify-classic/connections/xero/Xero-Troubleshooting
+https://community.expensify.com/discussion/5228/faq-expensierror-xro087-no-bank-account-or-incorrect-bank-account,https://help.expensify.com/articles/expensify-classic/connections/xero/Xero-Troubleshooting
+https://community.expensify.com/discussion/5217/faq-xero-company-card-expenses-exporting-to-the-wrong-account,https://help.expensify.com/articles/expensify-classic/connections/xero/Xero-Troubleshooting
+https://community.expensify.com/discussion/5204/faq-xero-credit-card-expenses-say-credit-card-misc-instead-of-the-merchant,https://help.expensify.com/articles/expensify-classic/connections/xero/Xero-Troubleshooting
+https://community.expensify.com/discussion/5042/faq-xero-expenses-are-not-categorized-with-a-xero-account,https://help.expensify.com/articles/expensify-classic/connections/xero/Xero-Troubleshooting
+https://community.expensify.com/discussion/5067/faq-xero-organization-is-not-subscribed-to-currency-x,https://help.expensify.com/articles/expensify-classic/connections/xero/Xero-Troubleshooting
+https://community.expensify.com/discussion/5068/faq-xero-this-report-has-already-been-exported-once-to-xero-but-has-been-voided,https://help.expensify.com/articles/expensify-classic/connections/xero/Xero-Troubleshooting
+https://community.expensify.com/discussion/5069/faq-xero-you-have-reached-the-limit-of-invoices-you-can-approve-with-your-xero-account,https://help.expensify.com/articles/expensify-classic/connections/xero/Xero-Troubleshooting
+https://community.expensify.com/discussion/2971/deep-dive-domain-migration-part-two-manual-migration,https://help.expensify.com/articles/expensify-classic/domains/Domain-Migration
+https://community.expensify.com/discussion/2970/deep-dive-domain-migration-part-one-automatic-migration,https://help.expensify.com/articles/expensify-classic/domains/Domain-Migration
+https://community.expensify.com/discussion/4349/deep-dive-easily-identify-expenses,https://help.expensify.com/articles/expensify-classic/expenses/Expense-Types
+https://community.expensify.com/discussion/5665/deep-dive-troubleshooting-expense-receipt-merge-failures,https://help.expensify.com/articles/expensify-classic/expenses/Merge-expenses
+https://community.expensify.com/discussion/3998/expensify-grab-smoother-business-travel-in-southeast-asia,https://help.expensify.com/articles/expensify-classic/integrations/travel-integrations/Additional-Travel-Integrations
+https://community.expensify.com/discussion/5125/faq-why-is-uber-creating-an-expensify-account-for-me,https://help.expensify.com/articles/expensify-classic/integrations/travel-integrations/Uber
+https://community.expensify.com/discussion/4051/deep-dive-taking-over-as-an-expensify-admin-here-s-your-guide-to-a-smooth-transition,https://help.expensify.com/articles/expensify-classic/workspaces/Admin-offboarding-checklist
+https://community.expensify.com/discussion/6569/how-to-import-and-assign-company-cards-from-spreadsheet-or-ofx-file/p1,https://help.expensify.com/articles/expensify-classic/connect-credit-cards/company-cards/CSV-Import
+https://community.expensify.com/discussion/4476/how-to-enable-scheduled-submit-for-a-group-policy,https://help.expensify.com/articles/expensify-classic/reports/Automatically-submit-employee-reports
+https://community.expensify.com/discussion/6018/deep-dive-day-1-with-the-expensify-card,https://help.expensify.com/articles/expensify-classic/expensify-card/Cardholder-Settings-and-Features
+https://community.expensify.com/discussion/5836/how-to-email-receipts-to-expensify,https://help.expensify.com/articles/expensify-classic/expenses/Add-an-expense#email-a-receipt
+https://community.expensify.com/discussion/7500/how-to-pay-your-company-bills-in-expensify/,https://help.expensify.com/articles/expensify-classic/bank-accounts-and-payments/payments/Reimburse-Reports-Invoices-and-Bills
+https://community.expensify.com/discussion/7385/how-to-enable-two-factor-authentication-in-your-account,https://help.expensify.com/articles/expensify-classic/settings/Enable-two-factor-authentication
+https://community.expensify.com/discussion/4432/how-to-add-a-secondary-login/,https://help.expensify.com/articles/expensify-classic/settings/account-settings/Change-or-add-email-address
+https://community.expensify.com/discussion/5539/deep-dive-what-is-a-copilot-what-are-the-different-types/,https://help.expensify.com/articles/expensify-classic/copilots-and-delegates/Assign-or-remove-a-Copilot
+https://help.expensify.com/articles/expensify-classic/copilots-and-delegates/Vacation-Delegate,https://help.expensify.com/articles/expensify-classic/copilots-and-delegates/Delegate-when-out-of-office
+https://community.expensify.com/discussion/5678/deep-dive-secondary-login-merge-accounts-what-does-this-mean,https://help.expensify.com/articles/expensify-classic/settings/account-settings/Merge-accounts
+https://community.expensify.com/discussion/5103/how-to-create-and-use-custom-units/,https://help.expensify.com/
+https://community.expensify.com/discussion/6530/how-to-set-your-time-zone-for-report-history-comments,https://help.expensify.com/articles/expensify-classic/settings/account-settings/Set-time-zone
+https://community.expensify.com/discussion/5651/deep-dive--practices-when-youre-running-into-trouble-receiving-emails-from-expensify,https://help.expensify.com/articles/expensify-classic/settings/account-settings/Set-Notifications
+https://community.expensify.com/discussion/5793/how-to-connect-your-personal-card-to-import-expenses/,https://help.expensify.com/articles/expensify-classic/connect-credit-cards/Personal-Credit-Cards
+https://community.expensify.com/discussion/5677/deep-dive-security-how-expensify-protects-your-information,https://help.expensify.com/articles/new-expensify/settings/Encryption-and-Data-Security
+https://community.expensify.com/discussion/4641/how-to-add-a-u-s-deposit-account,https://help.expensify.com/articles/expensify-classic/bank-accounts-and-payments/bank-accounts/Connect-Personal-US-Bank-Account
+https://community.expensify.com/discussion/4751/how-to-how-to-add-an-ach-withdrawal-account-us-only/,https://help.expensify.com/articles/expensify-classic/bank-accounts-and-payments/bank-accounts/Connect-US-Business-Bank-Account
+https://community.expensify.com/discussion/7428/how-to-pay-get-paid-for-invoices-using-paypal-me-and-expensify,https://help.expensify.com/articles/expensify-classic/bank-accounts-and-payments/Third-Party-Payments
+https://community.expensify.com/discussion/7252/deep-dive-best-practices-for-creating-and-sending-invoices,https://help.expensify.com/articles/expensify-classic/bank-accounts-and-payments/Third-Party-Payments
+https://community.expensify.com/discussion/4482/how-to-update-payment-details,https://help.expensify.com/articles/expensify-classic/workspaces/Assign-billing-owner-and-payment-account
+https://community.expensify.com/discussion/5934/day-1-with-expensify-admins-and-accountants/,https://help.expensify.com/articles/expensify-classic/getting-started/Create-a-company-workspace
+https://community.expensify.com/discussion/5542/deep-dive-what-are-ereceipts/,https://help.expensify.com/articles/expensify-classic/workspaces/Expense-Settings#ereceipts
+https://community.expensify.com/discussion/5776/how-to-create-mileage-expenses-in-expensify/,https://help.expensify.com/articles/expensify-classic/workspaces/Expense-Settings#distance-expenses
+https://community.expensify.com/discussion/4740/how-to-create-a-time-expense,https://help.expensify.com/articles/expensify-classic/workspaces/Expense-Settings#time-expenses
+https://community.expensify.com/discussion/5743/deep-dive-currency-in-expensify-overview/,https://help.expensify.com/articles/expensify-classic/workspaces/Set-Currency
+https://community.expensify.com/discussion/4976/,https://help.expensify.com/articles/expensify-classic/reports/Automatically-submit-employee-reports
+https://community.expensify.com/discussion/4831/how-to-set-up-default-report-titles,https://help.expensify.com/articles/expensify-classic/reports/Set-default-report-title
+https://community.expensify.com/discussion/4485/how-to-set-up-and-use-report-fields,https://help.expensify.com/articles/expensify-classic/reports/Add-custom-fields-to-reports-and-invoices
+https://community.expensify.com/discussion/5212/how-to-connect-your-policy-to-netsuite-token-based-authentication/,https://help.expensify.com/articles/expensify-classic/connections/netsuite/Connect-To-NetSuite
+https://community.expensify.com/discussion/4833/how-to-connect-your-policy-to-quickbooks-online/,https://help.expensify.com/articles/expensify-classic/connections/quickbooks-online/Connect-To-QuickBooks-Online
+https://community.expensify.com/discussion/5715/how-to-connect-to-quickbooks-desktop,https://help.expensify.com/articles/expensify-classic/connections/quickbooks-desktop/Connect-To-QuickBooks-Desktop
+https://community.expensify.com/discussion/5282/how-to-connect-your-policy-to-xero/,https://help.expensify.com/articles/expensify-classic/connections/xero/Connect-To-Xero
+https://community.expensify.com/discussion/6487/how-to-connect-to-sage-intacct,https://help.expensify.com/articles/expensify-classic/connections/sage-intacct/Connect-To-Sage-Intacct
+https://community.expensify.com/discussion/5241/how-to-connect-financialforce-psa-srp-to-your-policy/,https://help.expensify.com/articles/expensify-classic/connections/certinia/Connect-To-Certinia
+https://community.expensify.com/discussion/5536/deep-dive-what-is-a-secondary-login-and-when-you-d-use-it/,https://help.expensify.com/articles/expensify-classic/settings/account-settings/Change-or-add-email-address
+https://community.expensify.com/discussion/5732/deep-dive-all-about-policy-categories/,https://help.expensify.com/articles/expensify-classic/workspaces/Create-categories
+https://community.expensify.com/discussion/5469/deep-dive-auto-categorize-card-expenses-with-default-categories,https://help.expensify.com/articles/expensify-classic/workspaces/Set-up-category-automation
+https://community.expensify.com/discussion/4708/how-to-set-up-and-add-single-tags,https://help.expensify.com/articles/expensify-classic/workspaces/Create-tags
+https://community.expensify.com/discussion/5756/how-to-set-up-and-manage-multi-level-tagging/,https://help.expensify.com/articles/expensify-classic/workspaces/Create-tags#multi-level-tags
+https://community.expensify.com/discussion/5044/how-to-set-up-multiple-taxes-on-indirect-connections,https://help.expensify.com/articles/expensify-classic/workspaces/Tax-Tracking
+https://community.expensify.com/discussion/4643/how-to-invite-people-to-your-policy-using-a-join-link/,https://help.expensify.com/articles/expensify-classic/workspaces/Invite-members-and-assign-roles#invite-with-a-link
+https://community.expensify.com/discussion/5700/deep-dive-approval-workflow-overview,https://help.expensify.com/articles/expensify-classic/reports/Create-a-report-approval-workflow
+https://community.expensify.com/discussion/4804/how-to-set-up-concierge-report-approval,https://help.expensify.com/articles/expensify-classic/reports/Require-review-for-over-limit-expenses
+https://community.expensify.com/discussion/4975/how-to-invite-users-to-your-policy-manually-or-in-bulk/,https://help.expensify.com/articles/expensify-classic/workspaces/Invite-members-and-assign-roles#invite-with-a-link
+https://community.expensify.com/discussion/4743/how-to-enforce-your-group-policys-approval-work-flow,https://help.expensify.com/articles/expensify-classic/reports/Create-a-report-approval-workflow#enforce-workflow
+https://community.expensify.com/discussion/4781/how-to-add-an-australian-withdrawal-account-details,https://help.expensify.com/articles/expensify-classic/bank-accounts-and-payments/bank-accounts/Enable-Australian-Reimbursements
+https://community.expensify.com/discussion/4772/how-to-add-a-single-rate-per-diem,https://help.expensify.com/articles/expensify-classic/workspaces/Enable-per-diem-expenses
+https://community.expensify.com/discussion/4825/how-to-create-and-send-invoices-web-mobile/,https://help.expensify.com/articles/expensify-classic/workspaces/Set-Up-Invoicing
+https://community.expensify.com/discussion/8850/how-to-enable-monthly-settlement,https://help.expensify.com/articles/expensify-classic/expensify-card/Admin-Card-Settings-and-Features#change-the-settlement-frequency
+https://community.expensify.com/discussion/4828/how-to-match-your-company-cards-statement-to-expensify/,https://help.expensify.com/articles/expensify-classic/expensify-card/Admin-Card-Settings-and-Features#reconciling-expenses-and-settlements
+https://community.expensify.com/discussion/5751/deep-dive-domain-groups-and-permissions-what-are-they-all-about,https://help.expensify.com/articles/expensify-classic/domains/Create-A-Group
+https://community.expensify.com/categories/expensify-org-general-questions-and-discussions,https://www.expensify.org/
+https://community.expensify.com/discussion/4832/how-to-enable-saml-sso,https://help.expensify.com/articles/expensify-classic/domains/SAML-SSO
+https://community.expensify.com/discussion/4476/how-to-enable-scheduled-submit-for-a-group-policy/,https://help.expensify.com/articles/expensify-classic/reports/Automatically-submit-employee-reports
+https://community.expensify.com/discussion/4524/how-to-set-up-the-uber-integration/,https://help.expensify.com/articles/expensify-classic/connections/Uber
+https://community.expensify.com/discussion/4828/how-to-match-your-company-cards-statement-to-expensify/p1,https://help.expensify.com/articles/expensify-classic/expensify-card/Admin-Card-Settings-and-Features#reconciling-expenses-and-settlements
+https://community.expensify.com/discussion/4842/how-to-split-expenses-on-the-web-and-mobile-app,https://help.expensify.com/articles/expensify-classic/expenses/Split-an-expense
+https://community.expensify.com/discussion/4948/faq-why-didnt-my-ereceipt-generate/,https://help.expensify.com/articles/expensify-classic/workspaces/Expense-Settings#ereceipts
+https://community.expensify.com/discussion/5145/how-to-connect-to-sage-intacct-role-based-permissions-expense-reports/,https://help.expensify.com/articles/expensify-classic/connections/sage-intacct/Connect-To-Sage-Intacct
+https://community.expensify.com/discussion/5366/troubleshooting-credit-card-issues-in-expensify/,https://help.expensify.com/articles/expensify-classic/connect-credit-cards/company-cards/Troubleshooting
+https://community.expensify.com/discussion/5541/deep-dive-what-is-smartscan-and-how-it-works/,https://help.expensify.com/articles/expensify-classic/expenses/Add-an-expense#smartscan-a-receipt
+https://community.expensify.com/discussion/5678/deep-dive-secondary-login-merge-accounts-what-does-this-mean/p1,https://help.expensify.com/articles/expensify-classic/settings/account-settings/Merge-accounts
+https://community.expensify.com/discussion/5922/deep-dive-day-1-with-expensify-for-submitters/p1,https://help.expensify.com/articles/expensify-classic/getting-started/Join-your-company's-workspace
+https://community.expensify.com/discussion/8629/employee-training-e-learning-programme/p1,https://help.expensify.com/articles/expensify-classic/getting-started/Join-your-company's-workspace
+https://community.expensify.com/discussion/5124/how-to-add-your-name-and-photo-to-your-account/,https://help.expensify.com/expensify-classic/hubs/settings/account-settings
+https://community.expensify.com/post/discussion/3rd-party-integrations,https://help.expensify.com/expensify-classic/hubs/connections/
+https://community.expensify.com/post/discussion/advanced-admin-controls,https://help.expensify.com/expensify-classic/hubs/workspaces/
+https://community.expensify.com/post/discussion/becoming-an-expensifyapproved!-accountant,https://help.expensify.com/expensify-classic/hubs/expensify-partner-program/
+https://help.expensify.com/articles/expensify-classic/workspaces/Invoicing.html,https://help.expensify.com/articles/expensify-classic/workspaces/Set-Up-Invoicing
+https://community.expensify.com/discussion/4288/netsuite-expensierror-ns0092-you-do-not-have-permission-to-set-a-value-for-expense-isbillable,https://help.expensify.com/articles/expensify-classic/connections/netsuite/Netsuite-Troubleshooting
+https://community.expensify.com/discussion/4461/how-to-set-up-lyft-for-individual-use,https://help.expensify.com/articles/expensify-classic/connections/Lyft
+https://community.expensify.com/discussion/4520/how-to-close-your-account,https://help.expensify.com/articles/new-expensify/settings/Close-account
+https://community.expensify.com/discussion/4520/how-to-delete-your-account,https://help.expensify.com/articles/new-expensify/settings/Close-account
+https://community.expensify.com/discussion/4525/how-to-resend-an-invite,https://help.expensify.com/articles/expensify-classic/workspaces/Invite-members-and-assign-roles
+https://community.expensify.com/discussion/4638/how-to-enable-category-specific-rules-and-descriptions,https://help.expensify.com/articles/expensify-classic/workspaces/Enable-and-set-up-expense-violations
+https://community.expensify.com/discussion/4644/how-to-claim-and-validate-your-domain-in-expensify,https://help.expensify.com/articles/expensify-classic/domains/Claim-And-Verify-A-Domain
+https://community.expensify.com/discussion/4704/how-to-set-mileage-rates-and-track-tax-on-distance-expenses,https://help.expensify.com/articles/expensify-classic/workspaces/Expense-Settings
+https://community.expensify.com/discussion/4774/how-to-enable-google-apps-sso-with-your-expensify-group-policy,https://help.expensify.com/articles/expensify-classic/domains/SAML-SSO
+https://community.expensify.com/discussion/4780/how-to-export-to-individual-gl-accounts,https://help.expensify.com/articles/expensify-classic/connect-credit-cards/company-cards/Company-Card-Settings
+https://community.expensify.com/discussion/4819/how-to-set-up-a-visa-commercial-feed,https://help.expensify.com/articles/expensify-classic/connect-credit-cards/company-cards/Commercial-Card-Feeds
+https://community.expensify.com/discussion/4820/how-to-set-up-a-mastercard-commercial-feed,https://help.expensify.com/articles/expensify-classic/connect-credit-cards/company-cards/Commercial-Card-Feeds
+https://community.expensify.com/discussion/4822/how-to-set-up-an-american-express-commercial-feed,https://help.expensify.com/articles/expensify-classic/connect-credit-cards/company-cards/Commercial-Card-Feeds
+https://community.expensify.com/discussion/4822/how-to-set-up-an-american-express-commercial-feed%23latest,https://help.expensify.com/articles/expensify-classic/connect-credit-cards/company-cards/Commercial-Card-Feeds
+https://community.expensify.com/discussion/4826/how-to-set-your-annual-subscription-size,https://help.expensify.com/articles/expensify-classic/expensify-billing/Billing-Overview#annual-subscription
+https://community.expensify.com/discussion/4841/how-to-change-the-billing-owner-for-your-policy,https://help.expensify.com/articles/expensify-classic/workspaces/Assign-billing-owner-and-payment-account
+https://community.expensify.com/discussion/4848/deep-dive-expensify-card-and-quickbooks-online-auto-reconciliation-how-it-works,https://help.expensify.com/articles/expensify-classic/expensify-card/Expensify-Card-Reconciliation
+https://community.expensify.com/discussion/4851/deep-dive-what-are-smart-limits,https://help.expensify.com/articles/expensify-classic/expensify-card/Admin-Card-Settings-and-Features#smart-limits
+https://community.expensify.com/discussion/4851/deep-dive-what-are-unapproved-expense-limits,https://help.expensify.com/articles/expensify-classic/expensify-card/Admin-Card-Settings-and-Features#smart-limits
+https://community.expensify.com/discussion/4853/how-to-set-or-edit-the-default-unapproved-expense-limit-for-a-group,https://help.expensify.com/articles/expensify-classic/expensify-card/Admin-Card-Settings-and-Features#smart-limits
+https://community.expensify.com/discussion/4854/how-to-set-or-edit-the-default-unapproved-expense-limit-for-an-individual-cardholder,https://help.expensify.com/articles/expensify-classic/expensify-card/Admin-Card-Settings-and-Features#smart-limits
+https://community.expensify.com/discussion/4874/how-to-apply-for-the-expensify-card,https://help.expensify.com/articles/expensify-classic/expensify-card/Request-the-Card
+https://community.expensify.com/discussion/4875/how-to-connect-your-business-bank-account,https://help.expensify.com/articles/new-expensify/expenses-&-payments/Connect-a-Business-Bank-Account
+https://community.expensify.com/discussion/4931/how-to-cancel-your-expensify-card,https://help.expensify.com/articles/expensify-classic/expensify-card/Deactivate-or-cancel-an-Expensify-Card
+https://community.expensify.com/discussion/4977/how-to-enable-tax-tracking,https://help.expensify.com/articles/expensify-classic/workspaces/Tax-Tracking
+https://community.expensify.com/discussion/4978/how-to-reimburse-a-report-via-ach,https://help.expensify.com/articles/expensify-classic/bank-accounts-and-payments/payments/Reimburse-Reports-Invoices-and-Bills
+https://community.expensify.com/discussion/5067/faq-expensierror-xro068-organization-is-not-subscribed-to-currency-x,https://help.expensify.com/articles/expensify-classic/connections/xero/Xero-Troubleshooting
+https://community.expensify.com/discussion/5068/faq-expensierror-xro076-this-report-has-already-been-exported-once-to-xero,https://help.expensify.com/articles/expensify-classic/connections/xero/Xero-Troubleshooting
+https://community.expensify.com/discussion/5143/faq-expensierror-ns0023-employee-does-not-exist-in-netsuite,https://help.expensify.com/articles/expensify-classic/connections/netsuite/Netsuite-Troubleshooting
+https://community.expensify.com/discussion/5144/faq-expensierror-ns0024-invalid-customer-tag,https://help.expensify.com/articles/expensify-classic/connections/netsuite/Netsuite-Troubleshooting
+https://community.expensify.com/discussion/5209/deep-dive-the-expensify-card,https://help.expensify.com/expensify-classic/hubs/expensify-card/
+https://community.expensify.com/discussion/5222/faq-why-am-i-getting-an-invalid-credentials-login-failed-error-message-when-importing-my-card,https://help.expensify.com/articles/expensify-classic/connect-credit-cards/company-cards/Troubleshooting
+https://community.expensify.com/discussion/5231/faq-expensierror-xro027-expense-s-on-the-report-is-categorized-with-a-category-no-longer-in-xero,https://help.expensify.com/articles/expensify-classic/connections/xero/Xero-Troubleshooting
+https://community.expensify.com/discussion/5242/faq-netsuite-you-do-not-have-permissions-to-set-a-value-for-element-recipturl,https://help.expensify.com/articles/expensify-classic/connections/netsuite/Netsuite-Troubleshooting
+https://community.expensify.com/discussion/5251/faq-netsuite-you-do-not-have-permissions-to-set-a-value-for-element,https://help.expensify.com/articles/expensify-classic/connections/netsuite/Netsuite-Troubleshooting
+https://community.expensify.com/discussion/5271/how-to-set-up-an-indirect-accounting-integration,https://help.expensify.com/articles/expensify-classic/connections/Indirect-Accounting-Integrations
+https://community.expensify.com/discussion/5321/how-to-set-up-saml-authentication-with-adfs-in-expensify,https://help.expensify.com/articles/expensify-classic/domains/SAML-SSO
+https://community.expensify.com/discussion/5499/deep-dive-configure-coding-for-sage-intacct,https://help.expensify.com/articles/expensify-classic/connections/sage-intacct/Configure-Sage-Intacct
+https://community.expensify.com/discussion/5580/deep-dive-configure-advanced-settings-for-netsuite,https://help.expensify.com/articles/new-expensify/connections/netsuite/Connect-to-NetSuite#step-3-configure-advanced-settings
+https://community.expensify.com/discussion/5632/deep-dive-configure-coding-for-netsuite,https://help.expensify.com/articles/new-expensify/connections/netsuite/Connect-to-NetSuite#configure-netsuite-integration
+https://community.expensify.com/discussion/5649/deep-dive-configure-advanced-settings-for-quickbooks-online,https://help.expensify.com/articles/expensify-classic/connections/quickbooks-online/Configure-Quickbooks-Online
+https://community.expensify.com/discussion/5654/deep-dive-using-expense-rules-to-vendor-match-when-exporting-to-an-accounting-package,https://help.expensify.com/articles/expensify-classic/expenses/Expense-Rules#how-can-i-use-expense-rules-to-vendor-match-when-exporting-to-an-accounting-package
+https://community.expensify.com/discussion/5656/deep-dive-configure-coding-for-xero/,https://help.expensify.com/articles/new-expensify/connections/xero/Connect-to-Xero#step-2-configure-import-settings
+https://community.expensify.com/discussion/5698/deep-dive-financialforce-ffa-coding-configurations/,https://help.expensify.com/articles/expensify-classic/connections/certinia/Connect-To-Certinia
+https://community.expensify.com/discussion/5742/deep-dive-what-is-scheduled-submit-and-how-does-it-work,https://help.expensify.com/articles/expensify-classic/reports/Automatically-submit-employee-reports
+https://community.expensify.com/discussion/5752/how-to-use-the-comments-section-of-a-report,https://help.expensify.com/articles/expensify-classic/reports/Add-comments-and-attachments-to-a-report
+https://community.expensify.com/discussion/5781/how-to-cancel-your-expensify-card,https://help.expensify.com/articles/expensify-classic/expensify-card/Deactivate-or-cancel-an-Expensify-Card
+https://community.expensify.com/discussion/5799/deep-dive-date-formating-for-formulas,https://help.expensify.com/articles/expensify-classic/spending-insights/Custom-Templates
+https://community.expensify.com/discussion/5864/how-to-add-a-personal-bank-account-to-receive-reimbursement,https://help.expensify.com/articles/expensify-classic/bank-accounts-and-payments/bank-accounts/Connect-Personal-US-Bank-Account
+https://community.expensify.com/discussion/5941/how-to-reimburse-overseas-employees-for-us-employers/,https://help.expensify.com/articles/expensify-classic/bank-accounts-and-payments/bank-accounts/Enable-Global-Reimbursements
+https://community.expensify.com/discussion/6203/deep-dive-expensify-card-and-netsuite-auto-reconciliation-how-it-works,https://help.expensify.com/articles/expensify-classic/expensify-card/Expensify-Card-Reconciliation
+https://community.expensify.com/discussion/6698/faq-troubleshooting-bank-and-card-errors,https://help.expensify.com/articles/expensify-classic/connect-credit-cards/company-cards/Troubleshooting
+https://community.expensify.com/discussion/6827/what-s-happening-to-my-expensify-bill,https://help.expensify.com/articles/expensify-classic/expensify-billing/Billing-Overview
+https://community.expensify.com/discussion/6898/deep-dive-guide-to-billing,https://help.expensify.com/articles/expensify-classic/expensify-billing/Billing-Overview
+https://community.expensify.com/discussion/7231/how-to-export-invoices-to-netsuite,https://help.expensify.com/articles/new-expensify/connections/netsuite/Connect-to-NetSuite#export-invoices-to
+https://community.expensify.com/discussion/7335/faq-what-is-the-expensify-card-auto-reconciliation-process,https://help.expensify.com/articles/new-expensify/expenses-&-payments/Send-an-invoice
+https://community.expensify.com/discussion/7524/how-to-set-up-disable-2fa-for-your-domain,https://help.expensify.com/articles/expensify-classic/domains/Add-Domain-Members-and-Admins
+https://community.expensify.com/discussion/7736/faq-troubleshooting-two-factor-authentication-issues,https://help.expensify.com/articles/expensify-classic/settings/Enable-two-factor-authentication
+https://community.expensify.com/discussion/7862/introducing-expensify-cash-open-source-financial-group-chat-built-with-react-native,https://help.expensify.com/articles/expensify-classic/bank-accounts-and-payments/payments/Reimburse-Reports-Invoices-and-Bills
+https://community.expensify.com/discussion/7931/how-to-become-an-expensify-org-donor,https://www.expensify.org/donate
+https://community.expensify.com/discussion/8705/how-to-change-an-invoice-to-an-expense-report/,https://help.expensify.com/articles/expensify-classic/reports/Edit-a-report
+https://community.expensify.com/discussion/8803/settle-your-expensify-cards-monthly-or-daily-you-pick,https://help.expensify.com/articles/expensify-classic/expensify-card/Statements#expensify-card-settlement-frequency
+https://community.expensify.com/discussion/4784/how-to-alternate-option-submit-as-part-of-approval-workflow,https://help.expensify.com/articles/expensify-classic/reports/Create-a-report-approval-workflow
+https://community.expensify.com/discussion/4863/how-to-assign-and-unassign-company-cards,https://help.expensify.com/articles/expensify-classic/connect-credit-cards/company-cards/Commercial-Card-Feeds#how-to-assign-company-cards
+https://community.expensify.com/discussion/4902/how-to-expense-grab-airport-mobile-orders-with-expensify,https://help.expensify.com/articles/expensify-classic/connections/Additional-Travel-Integrations#how-to-connect-to-grab
+https://community.expensify.com/discussion/4953/how-to-forward-hoteltonight-expenses-to-your-expensify-account,https://help.expensify.com/articles/expensify-classic/connections/Additional-Travel-Integrations#how-to-connect-to-hoteltonight
+https://community.expensify.com/discussion/5042/faq-expensierror-xro052-expenses-are-not-categorized-with-a-xero-account,https://help.expensify.com/articles/expensify-classic/connections/xero/Xero-Troubleshooting
+https://community.expensify.com/discussion/5151/how-to-connect-spothero-to-your-expensify-account-using-a-business-profile,https://help.expensify.com/articles/expensify-classic/connections/Additional-Travel-Integrations#how-to-connect-to-spothero
+https://community.expensify.com/discussion/5154/how-to-connect-tripactions-to-your-expensify-group-policy,https://help.expensify.com/articles/expensify-classic/connections/Navan
+https://community.expensify.com/discussion/5156/how-to-connect-grab-to-your-expensify-account-using-a-business-profile,https://help.expensify.com/articles/expensify-classic/connections/Additional-Travel-Integrations#how-to-connect-to-grab
+https://community.expensify.com/discussion/5159/faq-what-does-please-update-your-expensify-bundle-mean-financialforce-psa-srp,https://help.expensify.com/articles/expensify-classic/connections/certinia/Certinia-Troubleshooting
+https://community.expensify.com/discussion/5554/deep-dive-what-are-domains-and-how-do-i-use-them,https://help.expensify.com/expensify-classic/hubs/domains/
+https://community.expensify.com/discussion/5587/deep-dive-understanding-policy-types-and-billing-options,https://help.expensify.com/articles/expensify-classic/expensify-billing/Change-Plan-Or-Subscription
+https://community.expensify.com/discussion/5643/deep-dive-submit-and-approve,https://help.expensify.com/articles/new-expensify/expenses-&-payments/Approve-and-pay-expenses
+https://community.expensify.com/discussion/5668/deep-dive-how-trips-work-and-benefits,https://help.expensify.com/articles/expensify-classic/expenses/Trips
+https://community.expensify.com/discussion/5689/deep-dive-is-a-direct-connection-the-best-option/,https://help.expensify.com/articles/expensify-classic/connect-credit-cards/company-cards/Direct-Bank-Connections
+https://community.expensify.com/discussion/6592/deep-dive-ach-reimbursement-timing,https://help.expensify.com/articles/expensify-classic/bank-accounts-and-payments/payments/Receive-Payments#faq
+https://community.expensify.com/discussion/7914/how-to-pay-an-invoice-and-bill-in-expensify,https://help.expensify.com/articles/expensify-classic/bank-accounts-and-payments/payments/Reimburse-Reports-Invoices-and-Bills
+https://community.expensify.com/discussion/8229/connecting-kayak-for-business,https://help.expensify.com/articles/expensify-classic/connections/Additional-Travel-Integrations#how-to-connect-to-kayak-for-business
+https://community.expensify.com/discussion/9507/how-to-use-the-delta-receipt-integration,https://help.expensify.com/articles/expensify-classic/connections/Additional-Travel-Integrations
+https://community.expensify.com/discussion/8814/a-welcome-update-to-expensifyapproved-billing,https://help.expensify.com/articles/expensify-classic/expensify-partner-program/Partner-Billing-Guide
+https://community.expensify.com/discussion/4480/how-to-connect-to-bill-com,https://integrations.expensify.com/Integration-Server/doc/#report-exporter
+https://community.expensify.com/discussion/5509/deep-dive-who-can-reimburse-reports-and-what-happens-when-you-do,https://help.expensify.com/articles/expensify-classic/workspaces/Configure-Reimbursement-Settings
+https://community.expensify.com/discussion/4952/how-to-connect-pana-to-your-expensify-account,https://help.expensify.com/articles/expensify-classic/connections/Additional-Travel-Integrations
+https://community.expensify.com/discussion/4939/how-to-connect-upside-to-your-expensify-account,https://help.expensify.com/articles/expensify-classic/connections/Additional-Travel-Integrations
+https://community.expensify.com/discussion/4905/how-to-setup-the-parking-spot-to-automatically-forward-airport-parking-receipts-to-expensify,https://help.expensify.com/articles/expensify-classic/connections/Additional-Travel-Integrations
+https://community.expensify.com/discussion/5324/how-to-connect-parkwhiz-to-your-expensify-account-using-a-business-profile,https://help.expensify.com/articles/expensify-classic/connections/Additional-Travel-Integrations
+https://community.expensify.com/discussion/6983/faq-why-do-i-need-to-provide-personal-documentation-when-setting-up-updating-my-bank-account,https://help.expensify.com/articles/new-expensify/expenses-&-payments/Connect-a-Business-Bank-Account#faq
+https://community.expensify.com/discussion/6191/list-of-restricted-businesses,https://help.expensify.com/articles/expensify-classic/bank-accounts-and-payments/bank-accounts/Connect-US-Business-Bank-Account#are-there-certain-industries-or-businesses-for-which-expensify-cannot-process-payments
+https://community.expensify.com/discussion/5344/how-to-redeem-5-000-in-aws-credits-with-the-expensify-card,https://help.expensify.com/articles/expensify-classic/expensify-card/Expensify-Card-Perks#amazon-aws
+https://community.expensify.com/discussion/5403/how-do-i-receive-50-off-quickbooks-online-using-my-expensify-card,https://help.expensify.com/articles/expensify-classic/expensify-card/Expensify-Card-Perks#quickbooks-online
+https://community.expensify.com/discussion/5404/how-do-i-receive-20-off-carta-with-my-expensify-card,https://help.expensify.com/articles/expensify-classic/expensify-card/Expensify-Card-Perks#carta
+https://community.expensify.com/discussion/5406/how-do-i-receive-10-off-lamar-advertising-with-my-expensify-card,https://help.expensify.com/articles/expensify-classic/expensify-card/Expensify-Card-Perks#lamar-advertising
+https://community.expensify.com/discussion/5409/how-do-i-receive-20-off-spotlight-reporting-with-my-expensify-card,https://help.expensify.com/articles/expensify-classic/expensify-card/Expensify-Card-Perks#spotlight-reporting
+https://community.expensify.com/discussion/5410/how-do-i-receive-25-off-pagerduty-with-my-expensify-card,https://help.expensify.com/articles/expensify-classic/expensify-card/Expensify-Card-Perks#pagerduty
+https://community.expensify.com/discussion/5411/how-do-i-receive-3-months-free-intercom-with-my-expensify-card,https://help.expensify.com/articles/expensify-classic/expensify-card/Expensify-Card-Perks#intercom
+https://community.expensify.com/discussion/5412/how-do-i-receive-3-months-free-gusto-with-my-expensify-card,https://help.expensify.com/articles/expensify-classic/expensify-card/Expensify-Card-Perks#gusto
+https://community.expensify.com/discussion/5413/how-do-i-receive-20-off-six-months-of-pilot-with-my-expensify-card,https://help.expensify.com/articles/expensify-classic/expensify-card/Expensify-Card-Perks#pilot
+https://community.expensify.com/discussion/5829/how-do-i-receive-i-receive-30-off-typeform-with-my-expensify-card,https://help.expensify.com/articles/expensify-classic/expensify-card/Expensify-Card-Perks#typeform
+https://community.expensify.com/discussion/6377/how-to-redeem-the-aircall-expensify-card-perk,https://help.expensify.com/articles/expensify-classic/expensify-card/Expensify-Card-Perks#aircall
+https://community.expensify.com/discussion/7474/how-to-redeem-talkspace-offer-with-the-expensify-card,https://help.expensify.com/articles/expensify-classic/expensify-card/Expensify-Card-Perks#talkspace
+https://community.expensify.com/discussion/8118/how-to-redeem-deel-com-perk,https://help.expensify.com/articles/expensify-classic/expensify-card/Expensify-Card-Perks#deelcom
+https://community.expensify.com/discussion/8256/how-to-redeem-25-off-slack-with-the-expensify-card,https://help.expensify.com/articles/expensify-classic/expensify-card/Expensify-Card-Perks#slack
+https://community.expensify.com/discussion/8737/exclusive-perks-for-expensify-card-members,https://help.expensify.com/articles/expensify-classic/expensify-card/Expensify-Card-Perks
+https://community.expensify.com/discussion/9040/how-to-redeem-10-off-netsuite-with-the-expensify-card,https://help.expensify.com/articles/expensify-classic/expensify-card/Expensify-Card-Perks#netsuite
+https://community.expensify.com/discussion/4828/how-to-match-your-company-cards-statement-to-expensify/p1?new=1,https://help.expensify.com/articles/expensify-classic/connect-credit-cards/company-cards/Reconciliation
+https://community.expensify.com/discussion/5580/deep-dive-configure-advanced-settings-for-netsuite/,https://help.expensify.com/articles/expensify-classic/connections/netsuite/Configure-Netsuite#step-3-configure-advanced-settings
+https://community.expensify.com/discussion/7231/how-to-export-invoices-to-netsuite/p1?new=1,https://help.expensify.com/articles/expensify-classic/connections/netsuite/Configure-Netsuite#export-invoices
+https://community.expensify.com/discussion/9168/how-to-troubleshoot-general-errors-when-uploading-your-id-via-onfido,https://help.expensify.com/articles/new-expensify/expenses-&-payments/Resolve-Errors-Adding-a-Bank-Account
+https://community.expensify.com/discussion/4707/how-to-set-up-your-mobile-app,https://use.expensify.com/expensify-mobile-app
+https://community.expensify.com/discussion/7066/introducing-concierge-travel,https://help.expensify.com/expensify-classic/hubs/travel/
+https://help.expensify.com/expensify-classic/hubs/integrations/,https://help.expensify.com/expensify-classic/hubs/connections/
+https://help.expensify.com/articles/expensify-classic/policy-and-domain-settings/reports/Scheduled-Submit,https://help.expensify.com/articles/expensify-classic/reports/Automatically-submit-employee-reports
+https://help.expensify.com/articles/expensify-classic/expensify-card/Set-Up-the-Card-for-Your-Company,https://help.expensify.com/articles/expensify-classic/expensify-card/Set-Up-the-Expensify-Visa%C2%AE-Commercial-Card-for-your-Company
+https://community.expensify.com/discussion/5542/deep-dive-what-are-ereceipts,https://help.expensify.com/articles/expensify-classic/workspaces/Expense-Settings#ereceipts
+https://community.expensify.com/discussion/5738/deep-dive-how-does-concierge-receipt-audit-work,https://help.expensify.com/articles/expensify-classic/workspaces/Expense-Settings#concierge-receipt-audit
+https://community.expensify.com/discussion/4643/how-to-invite-people-to-your-policy-using-a-join-link,https://help.expensify.com/articles/expensify-classic/workspaces/Invite-members-and-assign-roles#invite-with-a-link
+https://community.expensify.com/discussion/4975/how-to-invite-users-to-your-policy-manually-or-in-bulk/p1?new=1,https://help.expensify.com/articles/expensify-classic/workspaces/Invite-members-and-assign-roles
+https://help.expensify.com/articles/expensify-classic/workspaces/Invoicing,https://help.expensify.com/articles/expensify-classic/workspaces/Set-Up-Invoicing
+https://help.expensify.com/articles/expensify-classic/bank-accounts-and-payments/bank-accounts/Enable-Global-Reimbursements.md,https://help.expensify.com/articles/expensify-classic/bank-accounts-and-payments/bank-accounts/Enable-Global-Reimbursements
+https://help.expensify.com/articles/expensify-classic/integrations/travel-integrations/Trip-Actions,https://help.expensify.com/expensify-classic/hubs/connections/
+https://help.expensify.com/articles/expensify-classic/bank-accounts-and-payments/bank-accounts/Add-Personal-Australian-Bank-Account.md,https://help.expensify.com/articles/expensify-classic/bank-accounts-and-payments/bank-accounts/Add-Personal-Australian-Bank-Account
+https://help.expensify.com/articles/expensify-classic/bank-accounts-and-payments/bank-accounts/Connect-Personal-US-Bank-Account.md,https://help.expensify.com/articles/expensify-classic/bank-accounts-and-payments/bank-accounts/Connect-Personal-US-Bank-Account
+https://help.expensify.com/articles/expensify-classic/bank-accounts-and-payments/Pay-Bills,https://help.expensify.com/articles/expensify-classic/bank-accounts-and-payments/payments/Reimburse-Reports-Invoices-and-Bills
+https://help.expensify.com/articles/expensify-classic/bank-accounts-and-payments/Reimbursing-Reports,https://help.expensify.com/articles/expensify-classic/bank-accounts-and-payments/payments/Reimburse-Reports-Invoices-and-Bills
+https://help.expensify.com/articles/expensify-classic/connect-credit-cards/Global-Reimbursements,https://help.expensify.com/articles/expensify-classic/bank-accounts-and-payments/bank-accounts/Enable-Global-Reimbursements
+https://community.expensify.com/discussion/4641/how-to-add-a-deposit-only-bank-account-both-personal-and-business,https://help.expensify.com/articles/expensify-classic/bank-accounts-and-payments/bank-accounts/Connect-US-Business-Bank-Account
+https://community.expensify.com/discussion/5940/how-to-get-reimbursed-outside-the-us-with-wise-for-non-us-employees,https://help.expensify.com/articles/expensify-classic/bank-accounts-and-payments/Third-Party-Payments
+https://community.expensify.com/home/leaving?allowTrusted=1&target=https%3A%2F%2Fqbo.intuit.com%2Fapp%2Fvendors,https://help.expensify.com/articles/expensify-classic/connections/quickbooks-online/Quickbooks-Online-Troubleshooting
+https://community.expensify.com/discussion/5654/deep-dive-using-expense-rules-to-vendor-match-when-exporting-to-an-accounting-package/p1?new=1,https://help.expensify.com/articles/expensify-classic/connections/xero/Xero-Troubleshooting
+https://help.expensify.com/articles/expensify-classic/spending-insights/(https://help.expensify.com/articles/expensify-classic/spending-insights/Custom-Templates),https://help.expensify.com/articles/expensify-classic/spending-insights/Custom-Templates
+https://help.expensify.com/articles/expensify-classic/settings/account-settings/Set-notifications,https://help.expensify.com/articles/expensify-classic/settings/account-settings/Set-Notifications
diff --git a/fastlane/Fastfile b/fastlane/Fastfile
index b7d3334c902f..2560e48728c5 100644
--- a/fastlane/Fastfile
+++ b/fastlane/Fastfile
@@ -10,6 +10,8 @@
 #     https://docs.fastlane.tools/plugins/available-plugins
 #
 
+require 'ostruct'
+
 skip_docs
 opt_out_usage
 
@@ -239,35 +241,27 @@ platform :ios do
         }
     )
 
-    begin
-      upload_to_testflight(
-          api_key_path: "./ios/ios-fastlane-json-key.json",
-          distribute_external: true,
-          notify_external_testers: true,
-          changelog: "Thank you for beta testing New Expensify, this version includes bug fixes and improvements.",
-          groups: ["Beta"],
-          demo_account_required: true,
-          beta_app_review_info: {
-              contact_email: ENV["APPLE_CONTACT_EMAIL"],
-              contact_first_name: "Andrew",
-              contact_last_name: "Gable",
-              contact_phone: ENV["APPLE_CONTACT_PHONE"],
-              demo_account_name: ENV["APPLE_DEMO_EMAIL"],
-              demo_account_password: ENV["APPLE_DEMO_PASSWORD"],
-              notes: "1. In the Expensify app, enter the email 'appletest.expensify@proton.me'. This will trigger a sign-in link to be sent to 'appletest.expensify@proton.me'
-                      2. Navigate to https://account.proton.me/login, log into Proton Mail using 'appletest.expensify@proton.me' as email and the password associated with 'appletest.expensify@proton.me', provided above
-                      3. Once logged into Proton Mail, navigate to your inbox and locate the email triggered in step 1. The email subject should be 'Your magic sign-in link for Expensify'
-                      4. Open the email and copy the 6-digit sign-in code provided within
-                      5. Return to the Expensify app and enter the copied 6-digit code in the designated login field"
-          }
-      )
-    rescue Exception => e
-      if e.message.include? "Another build is in review"
-        UI.important("Another build is already in external beta review. Skipping external beta review submission")
-      else
-        raise
-      end
-    end
+    upload_to_testflight(
+      api_key_path: "./ios/ios-fastlane-json-key.json",
+      distribute_external: true,
+      notify_external_testers: true,
+      changelog: "Thank you for beta testing New Expensify, this version includes bug fixes and improvements.",
+      groups: ["Beta"],
+      demo_account_required: true,
+      beta_app_review_info: {
+          contact_email: ENV["APPLE_CONTACT_EMAIL"],
+          contact_first_name: "Andrew",
+          contact_last_name: "Gable",
+          contact_phone: ENV["APPLE_CONTACT_PHONE"],
+          demo_account_name: ENV["APPLE_DEMO_EMAIL"],
+          demo_account_password: ENV["APPLE_DEMO_PASSWORD"],
+          notes: "1. In the Expensify app, enter the email 'appletest.expensify@proton.me'. This will trigger a sign-in link to be sent to 'appletest.expensify@proton.me'
+                  2. Navigate to https://account.proton.me/login, log into Proton Mail using 'appletest.expensify@proton.me' as email and the password associated with 'appletest.expensify@proton.me', provided above
+                  3. Once logged into Proton Mail, navigate to your inbox and locate the email triggered in step 1. The email subject should be 'Your magic sign-in link for Expensify'
+                  4. Open the email and copy the 6-digit sign-in code provided within
+                  5. Return to the Expensify app and enter the copied 6-digit code in the designated login field"
+      }
+    )
 
     upload_symbols_to_crashlytics(
       app_id: "1:921154746561:ios:216bd10ccc947659027c40",
diff --git a/ios/.xcode.env b/ios/.xcode.env
index 3d5782c71568..0ef3f59d606a 100644
--- a/ios/.xcode.env
+++ b/ios/.xcode.env
@@ -9,3 +9,8 @@
 # For example, to use nvm with brew, add the following line
 # . "$(brew --prefix nvm)/nvm.sh" --no-use
 export NODE_BINARY=$(command -v node)
+
+# Provide a sourcemap path so that in release builds a source map file will be
+# created at the specified location.
+# (RN's default behaviour on iOS is to skip creating a sourcemap file):
+export SOURCEMAP_FILE="$(pwd)/../main.jsbundle.map";
diff --git a/ios/Certificates.p12.gpg b/ios/Certificates.p12.gpg
index f63d6861f888..91f827416367 100644
Binary files a/ios/Certificates.p12.gpg and b/ios/Certificates.p12.gpg differ
diff --git a/ios/NewApp_AdHoc.mobileprovision.gpg b/ios/NewApp_AdHoc.mobileprovision.gpg
index 440309f63c6e..78fb5d53d9e9 100644
Binary files a/ios/NewApp_AdHoc.mobileprovision.gpg and b/ios/NewApp_AdHoc.mobileprovision.gpg differ
diff --git a/ios/NewApp_AdHoc_Notification_Service.mobileprovision.gpg b/ios/NewApp_AdHoc_Notification_Service.mobileprovision.gpg
index 2de81ee85018..ac2c76a118d5 100644
Binary files a/ios/NewApp_AdHoc_Notification_Service.mobileprovision.gpg and b/ios/NewApp_AdHoc_Notification_Service.mobileprovision.gpg differ
diff --git a/ios/NewApp_AppStore.mobileprovision.gpg b/ios/NewApp_AppStore.mobileprovision.gpg
index 2e73cc7661e3..22624c6f41d6 100644
Binary files a/ios/NewApp_AppStore.mobileprovision.gpg and b/ios/NewApp_AppStore.mobileprovision.gpg differ
diff --git a/ios/NewApp_AppStore_Notification_Service.mobileprovision.gpg b/ios/NewApp_AppStore_Notification_Service.mobileprovision.gpg
index 4af7b16c5041..503a096f1726 100644
Binary files a/ios/NewApp_AppStore_Notification_Service.mobileprovision.gpg and b/ios/NewApp_AppStore_Notification_Service.mobileprovision.gpg differ
diff --git a/ios/NewExpensify.xcodeproj/project.pbxproj b/ios/NewExpensify.xcodeproj/project.pbxproj
index 9a9ca9c7dcbb..0f9edeab601d 100644
--- a/ios/NewExpensify.xcodeproj/project.pbxproj
+++ b/ios/NewExpensify.xcodeproj/project.pbxproj
@@ -38,6 +38,7 @@
 		9E17CB36A6B22BDD4BE53561 /* libPods-NotificationServiceExtension.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 9196A72C11B91A52A43D6E8A /* libPods-NotificationServiceExtension.a */; };
 		ACA597C323AA39404655647F /* libPods-NewExpensify-NewExpensifyTests.a in Frameworks */ = {isa = PBXBuildFile; fileRef = EF33B19FC6A7FE676839430D /* libPods-NewExpensify-NewExpensifyTests.a */; };
 		BDB853621F354EBB84E619C2 /* ExpensifyNewKansas-MediumItalic.otf in Resources */ = {isa = PBXBuildFile; fileRef = D2AFB39EC1D44BF9B91D3227 /* ExpensifyNewKansas-MediumItalic.otf */; };
+		D27CE6B77196EF3EF450EEAC /* PrivacyInfo.xcprivacy in Resources */ = {isa = PBXBuildFile; fileRef = 0D3F9E814828D91464DF9D35 /* PrivacyInfo.xcprivacy */; };
 		DD79042B2792E76D004484B4 /* RCTBootSplash.mm in Sources */ = {isa = PBXBuildFile; fileRef = DD79042A2792E76D004484B4 /* RCTBootSplash.mm */; };
 		DDCB2E57F334C143AC462B43 /* ExpoModulesProvider.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4D20D83B0E39BA6D21761E72 /* ExpoModulesProvider.swift */; };
 		E51DC681C7DEE40AEBDDFBFE /* BuildFile in Frameworks */ = {isa = PBXBuildFile; };
@@ -88,6 +89,7 @@
 		083353EA2B5AB22900C603C0 /* success.mp3 */ = {isa = PBXFileReference; lastKnownFileType = audio.mp3; name = success.mp3; path = ../assets/sounds/success.mp3; 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>"; };
+		0D3F9E814828D91464DF9D35 /* PrivacyInfo.xcprivacy */ = {isa = PBXFileReference; includeInIndex = 1; name = PrivacyInfo.xcprivacy; path = NewExpensify/PrivacyInfo.xcprivacy; sourceTree = "<group>"; };
 		0F5BE0CD252686320097D869 /* GoogleService-Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = "GoogleService-Info.plist"; sourceTree = "<group>"; };
 		0F5E534E263B73D5004CA14F /* EnvironmentChecker.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = EnvironmentChecker.h; sourceTree = "<group>"; };
 		0F5E534F263B73FD004CA14F /* EnvironmentChecker.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = EnvironmentChecker.m; sourceTree = "<group>"; };
@@ -105,9 +107,11 @@
 		3EA3D64F00384537597190CE /* 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>"; };
 		3F17376D588832EE0C4E7E13 /* 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>"; };
 		417E30386DDC804B3693037A /* 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>"; };
+		41D2EDB009CF19BA59C5181C /* Pods-NotificationServiceExtension.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-NotificationServiceExtension.debug.xcconfig"; path = "Target Support Files/Pods-NotificationServiceExtension/Pods-NotificationServiceExtension.debug.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>"; };
 		46B1FE4DE317D30C25A74C15 /* 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>"; };
 		48E7775E0D42D3E3F53A5B99 /* Pods-NotificationServiceExtension.releaseadhoc.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-NotificationServiceExtension.releaseadhoc.xcconfig"; path = "Target Support Files/Pods-NotificationServiceExtension/Pods-NotificationServiceExtension.releaseadhoc.xcconfig"; sourceTree = "<group>"; };
+		499B0DA92BE2A1C000CABFB0 /* PrivacyInfo.xcprivacy */ = {isa = PBXFileReference; lastKnownFileType = text.xml; path = PrivacyInfo.xcprivacy; sourceTree = "<group>"; };
 		4A39BBFB1A6AA6A0EB08878C /* Pods-NotificationServiceExtension.debugproduction.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-NotificationServiceExtension.debugproduction.xcconfig"; path = "Target Support Files/Pods-NotificationServiceExtension/Pods-NotificationServiceExtension.debugproduction.xcconfig"; sourceTree = "<group>"; };
 		4D20D83B0E39BA6D21761E72 /* ExpoModulesProvider.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = ExpoModulesProvider.swift; path = "Pods/Target Support Files/Pods-NewExpensify/ExpoModulesProvider.swift"; 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>"; };
@@ -115,6 +119,7 @@
 		687A6DD50C2B5D0DC530C207 /* 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>"; };
 		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>"; };
+		707151F8A56D2431696273AB /* Pods-NewExpensify.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-NewExpensify.debug.xcconfig"; path = "Target Support Files/Pods-NewExpensify/Pods-NewExpensify.debug.xcconfig"; sourceTree = "<group>"; };
 		70CF6E81262E297300711ADC /* BootSplash.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; name = BootSplash.storyboard; path = NewExpensify/BootSplash.storyboard; sourceTree = "<group>"; };
 		7F9DD8D92B2A445B005E3AFA /* ExpError.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ExpError.swift; sourceTree = "<group>"; };
 		7FD73C9B2B23CE9500420AF3 /* NotificationServiceExtension.appex */ = {isa = PBXFileReference; explicitFileType = "wrapper.app-extension"; includeInIndex = 0; path = NotificationServiceExtension.appex; sourceTree = BUILT_PRODUCTS_DIR; };
@@ -127,6 +132,7 @@
 		BCD444BEDDB0AF1745B39049 /* ExpoModulesProvider.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = ExpoModulesProvider.swift; path = "Pods/Target Support Files/Pods-NewExpensify-NewExpensifyTests/ExpoModulesProvider.swift"; 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>"; };
 		C0417E996D1C834CDF0BF0F7 /* 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>"; };
+		CA5677EEAC9784567B912881 /* Pods-NewExpensify-NewExpensifyTests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-NewExpensify-NewExpensifyTests.debug.xcconfig"; path = "Target Support Files/Pods-NewExpensify-NewExpensifyTests/Pods-NewExpensify-NewExpensifyTests.debug.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>"; };
 		D7C206AC464C89FB4899E0AD /* Pods-NotificationServiceExtension.releasedevelopment.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-NotificationServiceExtension.releasedevelopment.xcconfig"; path = "Target Support Files/Pods-NotificationServiceExtension/Pods-NotificationServiceExtension.releasedevelopment.xcconfig"; sourceTree = "<group>"; };
 		D846D749FDDC2C914007C87D /* 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>"; };
@@ -206,6 +212,7 @@
 				13B07FB71A68108700A75B9A /* main.m */,
 				0F5E534E263B73D5004CA14F /* EnvironmentChecker.h */,
 				0F5E534F263B73FD004CA14F /* EnvironmentChecker.m */,
+				0D3F9E814828D91464DF9D35 /* PrivacyInfo.xcprivacy */,
 			);
 			name = NewExpensify;
 			sourceTree = "<group>";
@@ -260,6 +267,7 @@
 		83CBB9F61A601CBA00E9B192 = {
 			isa = PBXGroup;
 			children = (
+				499B0DA92BE2A1C000CABFB0 /* PrivacyInfo.xcprivacy */,
 				374FB8D528A133A7000D84EF /* OriginImageRequestHandler.h */,
 				374FB8D628A133FE000D84EF /* OriginImageRequestHandler.mm */,
 				F0C450E92705020500FD2970 /* colors.json */,
@@ -341,6 +349,9 @@
 				D7C206AC464C89FB4899E0AD /* Pods-NotificationServiceExtension.releasedevelopment.xcconfig */,
 				48E7775E0D42D3E3F53A5B99 /* Pods-NotificationServiceExtension.releaseadhoc.xcconfig */,
 				1C839668BD5515A8ADE6B15E /* Pods-NotificationServiceExtension.releaseproduction.xcconfig */,
+				707151F8A56D2431696273AB /* Pods-NewExpensify.debug.xcconfig */,
+				CA5677EEAC9784567B912881 /* Pods-NewExpensify-NewExpensifyTests.debug.xcconfig */,
+				41D2EDB009CF19BA59C5181C /* Pods-NotificationServiceExtension.debug.xcconfig */,
 			);
 			path = Pods;
 			sourceTree = "<group>";
@@ -386,6 +397,7 @@
 				FBC7D704E4E9CC08E91D7919 /* [CP] Copy Pods Resources */,
 				9FF963998EFF771D82D473D2 /* [CP-User] [RNFB] Core Configuration */,
 				A2BE84E8C8EFD6C81A2B41F1 /* [CP-User] [RNFB] Crashlytics Configuration */,
+				498240F82C49553900C15857 /* Run Fullstory Asset Uploader */,
 			);
 			buildRules = (
 			);
@@ -492,6 +504,7 @@
 				ED222ED90E074A5481A854FA /* ExpensifyNeue-BoldItalic.otf in Resources */,
 				30581EA8AAFD4FCE88C5D191 /* ExpensifyNeue-Italic.otf in Resources */,
 				1246A3EF20E54E7A9494C8B9 /* ExpensifyNeue-Regular.otf in Resources */,
+				D27CE6B77196EF3EF450EEAC /* PrivacyInfo.xcprivacy in Resources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -592,32 +605,64 @@
 				"${PODS_CONFIGURATION_BUILD_DIR}/Airship/AirshipAutomationResources.bundle",
 				"${PODS_CONFIGURATION_BUILD_DIR}/Airship/AirshipCoreResources.bundle",
 				"${PODS_CONFIGURATION_BUILD_DIR}/Airship/AirshipMessageCenterResources.bundle",
+				"${PODS_CONFIGURATION_BUILD_DIR}/AppAuth/AppAuthCore_Privacy.bundle",
+				"${PODS_CONFIGURATION_BUILD_DIR}/GTMAppAuth/GTMAppAuth_Privacy.bundle",
 				"${PODS_CONFIGURATION_BUILD_DIR}/GTMSessionFetcher/GTMSessionFetcher_Core_Privacy.bundle",
 				"${PODS_CONFIGURATION_BUILD_DIR}/GoogleDataTransport/GoogleDataTransport_Privacy.bundle",
 				"${PODS_CONFIGURATION_BUILD_DIR}/GoogleSignIn/GoogleSignIn.bundle",
 				"${PODS_CONFIGURATION_BUILD_DIR}/GoogleUtilities/GoogleUtilities_Privacy.bundle",
 				"${PODS_CONFIGURATION_BUILD_DIR}/PromisesObjC/FBLPromises_Privacy.bundle",
+				"${PODS_CONFIGURATION_BUILD_DIR}/RCT-Folly/RCT-Folly_privacy.bundle",
 				"${PODS_ROOT}/../../node_modules/@expensify/react-native-live-markdown/parser/react-native-live-markdown-parser.js",
-				"${PODS_CONFIGURATION_BUILD_DIR}/React-Core/RCTI18nStrings.bundle",
+				"${PODS_CONFIGURATION_BUILD_DIR}/React-Core/React-Core_privacy.bundle",
+				"${PODS_CONFIGURATION_BUILD_DIR}/React-cxxreact/React-cxxreact_privacy.bundle",
+				"${PODS_CONFIGURATION_BUILD_DIR}/SDWebImage/SDWebImage.bundle",
+				"${PODS_CONFIGURATION_BUILD_DIR}/boost/boost_privacy.bundle",
+				"${PODS_CONFIGURATION_BUILD_DIR}/glog/glog_privacy.bundle",
 			);
 			name = "[CP] Copy Pods Resources";
 			outputPaths = (
 				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/AirshipAutomationResources.bundle",
 				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/AirshipCoreResources.bundle",
 				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/AirshipMessageCenterResources.bundle",
+				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/AppAuthCore_Privacy.bundle",
+				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/GTMAppAuth_Privacy.bundle",
 				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/GTMSessionFetcher_Core_Privacy.bundle",
 				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/GoogleDataTransport_Privacy.bundle",
 				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/GoogleSignIn.bundle",
 				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/GoogleUtilities_Privacy.bundle",
 				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/FBLPromises_Privacy.bundle",
+				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/RCT-Folly_privacy.bundle",
 				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/react-native-live-markdown-parser.js",
-				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/RCTI18nStrings.bundle",
+				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/React-Core_privacy.bundle",
+				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/React-cxxreact_privacy.bundle",
+				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/SDWebImage.bundle",
+				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/boost_privacy.bundle",
+				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/glog_privacy.bundle",
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
 			shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-NewExpensify-NewExpensifyTests/Pods-NewExpensify-NewExpensifyTests-resources.sh\"\n";
 			showEnvVarsInLog = 0;
 		};
+		498240F82C49553900C15857 /* Run Fullstory Asset Uploader */ = {
+			isa = PBXShellScriptBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			inputFileListPaths = (
+			);
+			inputPaths = (
+			);
+			name = "Run Fullstory Asset Uploader";
+			outputFileListPaths = (
+			);
+			outputPaths = (
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+			shellPath = /bin/sh;
+			shellScript = "\"${PODS_ROOT}/FullStory/tools/FullStoryCommandLine\" \"${CONFIGURATION_BUILD_DIR}/${WRAPPER_NAME}\"\n";
+		};
 		5CF45ABA52C0BB0D7B9D139A /* [Expo] Configure project */ = {
 			isa = PBXShellScriptBuildPhase;
 			alwaysOutOfDate = 1;
@@ -646,6 +691,7 @@
 				"${PODS_ROOT}/Target Support Files/Pods-NewExpensify/Pods-NewExpensify-frameworks.sh",
 				"${BUILT_PRODUCTS_DIR}/MapboxMaps/MapboxMaps.framework",
 				"${BUILT_PRODUCTS_DIR}/Turf/Turf.framework",
+				"${PODS_XCFRAMEWORKS_BUILD_DIR}/FullStory/FullStory.framework/FullStory",
 				"${PODS_XCFRAMEWORKS_BUILD_DIR}/MapboxCommon/MapboxCommon.framework/MapboxCommon",
 				"${PODS_XCFRAMEWORKS_BUILD_DIR}/MapboxCoreMaps/MapboxCoreMaps.framework/MapboxCoreMaps",
 				"${PODS_XCFRAMEWORKS_BUILD_DIR}/MapboxMobileEvents/MapboxMobileEvents.framework/MapboxMobileEvents",
@@ -657,6 +703,7 @@
 			outputPaths = (
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/MapboxMaps.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Turf.framework",
+				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/FullStory.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/MapboxCommon.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/MapboxCoreMaps.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/MapboxMobileEvents.framework",
@@ -678,6 +725,7 @@
 				"${PODS_ROOT}/Target Support Files/Pods-NewExpensify-NewExpensifyTests/Pods-NewExpensify-NewExpensifyTests-frameworks.sh",
 				"${BUILT_PRODUCTS_DIR}/MapboxMaps/MapboxMaps.framework",
 				"${BUILT_PRODUCTS_DIR}/Turf/Turf.framework",
+				"${PODS_XCFRAMEWORKS_BUILD_DIR}/FullStory/FullStory.framework/FullStory",
 				"${PODS_XCFRAMEWORKS_BUILD_DIR}/MapboxCommon/MapboxCommon.framework/MapboxCommon",
 				"${PODS_XCFRAMEWORKS_BUILD_DIR}/MapboxCoreMaps/MapboxCoreMaps.framework/MapboxCoreMaps",
 				"${PODS_XCFRAMEWORKS_BUILD_DIR}/MapboxMobileEvents/MapboxMobileEvents.framework/MapboxMobileEvents",
@@ -689,6 +737,7 @@
 			outputPaths = (
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/MapboxMaps.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Turf.framework",
+				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/FullStory.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/MapboxCommon.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/MapboxCoreMaps.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/MapboxMobileEvents.framework",
@@ -760,26 +809,40 @@
 				"${PODS_CONFIGURATION_BUILD_DIR}/Airship/AirshipAutomationResources.bundle",
 				"${PODS_CONFIGURATION_BUILD_DIR}/Airship/AirshipCoreResources.bundle",
 				"${PODS_CONFIGURATION_BUILD_DIR}/Airship/AirshipMessageCenterResources.bundle",
+				"${PODS_CONFIGURATION_BUILD_DIR}/AppAuth/AppAuthCore_Privacy.bundle",
+				"${PODS_CONFIGURATION_BUILD_DIR}/GTMAppAuth/GTMAppAuth_Privacy.bundle",
 				"${PODS_CONFIGURATION_BUILD_DIR}/GTMSessionFetcher/GTMSessionFetcher_Core_Privacy.bundle",
 				"${PODS_CONFIGURATION_BUILD_DIR}/GoogleDataTransport/GoogleDataTransport_Privacy.bundle",
 				"${PODS_CONFIGURATION_BUILD_DIR}/GoogleSignIn/GoogleSignIn.bundle",
 				"${PODS_CONFIGURATION_BUILD_DIR}/GoogleUtilities/GoogleUtilities_Privacy.bundle",
 				"${PODS_CONFIGURATION_BUILD_DIR}/PromisesObjC/FBLPromises_Privacy.bundle",
+				"${PODS_CONFIGURATION_BUILD_DIR}/RCT-Folly/RCT-Folly_privacy.bundle",
 				"${PODS_ROOT}/../../node_modules/@expensify/react-native-live-markdown/parser/react-native-live-markdown-parser.js",
-				"${PODS_CONFIGURATION_BUILD_DIR}/React-Core/RCTI18nStrings.bundle",
+				"${PODS_CONFIGURATION_BUILD_DIR}/React-Core/React-Core_privacy.bundle",
+				"${PODS_CONFIGURATION_BUILD_DIR}/React-cxxreact/React-cxxreact_privacy.bundle",
+				"${PODS_CONFIGURATION_BUILD_DIR}/SDWebImage/SDWebImage.bundle",
+				"${PODS_CONFIGURATION_BUILD_DIR}/boost/boost_privacy.bundle",
+				"${PODS_CONFIGURATION_BUILD_DIR}/glog/glog_privacy.bundle",
 			);
 			name = "[CP] Copy Pods Resources";
 			outputPaths = (
 				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/AirshipAutomationResources.bundle",
 				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/AirshipCoreResources.bundle",
 				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/AirshipMessageCenterResources.bundle",
+				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/AppAuthCore_Privacy.bundle",
+				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/GTMAppAuth_Privacy.bundle",
 				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/GTMSessionFetcher_Core_Privacy.bundle",
 				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/GoogleDataTransport_Privacy.bundle",
 				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/GoogleSignIn.bundle",
 				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/GoogleUtilities_Privacy.bundle",
 				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/FBLPromises_Privacy.bundle",
+				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/RCT-Folly_privacy.bundle",
 				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/react-native-live-markdown-parser.js",
-				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/RCTI18nStrings.bundle",
+				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/React-Core_privacy.bundle",
+				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/React-cxxreact_privacy.bundle",
+				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/SDWebImage.bundle",
+				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/boost_privacy.bundle",
+				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/glog_privacy.bundle",
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
@@ -916,6 +979,243 @@
 			};
 			name = ReleaseDevelopment;
 		};
+		0CBE08762C5D0872008661F8 /* Debug */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				ALWAYS_SEARCH_USER_PATHS = NO;
+				CC = "";
+				CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
+				CLANG_CXX_LANGUAGE_STANDARD = "c++20";
+				CLANG_CXX_LIBRARY = "libc++";
+				CLANG_ENABLE_MODULES = YES;
+				CLANG_ENABLE_OBJC_ARC = YES;
+				CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
+				CLANG_WARN_BOOL_CONVERSION = YES;
+				CLANG_WARN_COMMA = YES;
+				CLANG_WARN_CONSTANT_CONVERSION = YES;
+				CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
+				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
+				CLANG_WARN_EMPTY_BODY = YES;
+				CLANG_WARN_ENUM_CONVERSION = YES;
+				CLANG_WARN_INFINITE_RECURSION = YES;
+				CLANG_WARN_INT_CONVERSION = YES;
+				CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
+				CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
+				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
+				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
+				CLANG_WARN_STRICT_PROTOTYPES = YES;
+				CLANG_WARN_SUSPICIOUS_MOVE = YES;
+				CLANG_WARN_UNREACHABLE_CODE = YES;
+				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
+				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
+				COPY_PHASE_STRIP = NO;
+				CXX = "";
+				ENABLE_STRICT_OBJC_MSGSEND = YES;
+				ENABLE_TESTABILITY = YES;
+				"EXCLUDED_ARCHS[sdk=iphonesimulator*]" = i386;
+				GCC_C_LANGUAGE_STANDARD = gnu99;
+				GCC_DYNAMIC_NO_PIC = NO;
+				GCC_NO_COMMON_BLOCKS = YES;
+				GCC_OPTIMIZATION_LEVEL = 0;
+				GCC_PREPROCESSOR_DEFINITIONS = (
+					"DEBUG=1",
+					"$(inherited)",
+				);
+				GCC_SYMBOLS_PRIVATE_EXTERN = NO;
+				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
+				GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
+				GCC_WARN_UNDECLARED_SELECTOR = YES;
+				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
+				GCC_WARN_UNUSED_FUNCTION = YES;
+				GCC_WARN_UNUSED_VARIABLE = YES;
+				IPHONEOS_DEPLOYMENT_TARGET = 16.1;
+				LD = "";
+				LDPLUSPLUS = "";
+				LD_RUNPATH_SEARCH_PATHS = (
+					/usr/lib/swift,
+					"$(inherited)",
+				);
+				LIBRARY_SEARCH_PATHS = (
+					"$(SDKROOT)/usr/lib/swift",
+					"\"$(TOOLCHAIN_DIR)/usr/lib/swift/$(PLATFORM_NAME)\"",
+					"\"$(inherited)\"",
+				);
+				MTL_ENABLE_DEBUG_INFO = YES;
+				ONLY_ACTIVE_ARCH = YES;
+				OTHER_CFLAGS = (
+					"$(inherited)",
+					"-DRN_FABRIC_ENABLED",
+				);
+				OTHER_CPLUSPLUSFLAGS = (
+					"$(inherited)",
+					"-DRN_FABRIC_ENABLED",
+				);
+				OTHER_LDFLAGS = "$(inherited)";
+				PRODUCT_BUNDLE_IDENTIFIER = "";
+				REACT_NATIVE_PATH = "${PODS_ROOT}/../../node_modules/react-native";
+				SDKROOT = iphoneos;
+				SWIFT_ACTIVE_COMPILATION_CONDITIONS = "$(inherited) DEBUG";
+				USE_HERMES = true;
+			};
+			name = Debug;
+		};
+		0CBE08772C5D0872008661F8 /* Debug */ = {
+			isa = XCBuildConfiguration;
+			baseConfigurationReference = 707151F8A56D2431696273AB /* Pods-NewExpensify.debug.xcconfig */;
+			buildSettings = {
+				ASSETCATALOG_COMPILER_APPICON_NAME = AppIconDev;
+				ASSETCATALOG_COMPILER_INCLUDE_ALL_APPICON_ASSETS = NO;
+				CLANG_CXX_LANGUAGE_STANDARD = "c++20";
+				CLANG_ENABLE_MODULES = YES;
+				CODE_SIGN_ENTITLEMENTS = NewExpensify/Chat.entitlements;
+				CODE_SIGN_IDENTITY = "iPhone Distribution";
+				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
+				CODE_SIGN_STYLE = Manual;
+				CURRENT_PROJECT_VERSION = 3;
+				DEVELOPMENT_TEAM = 368M544MTT;
+				"DEVELOPMENT_TEAM[sdk=iphoneos*]" = 368M544MTT;
+				ENABLE_BITCODE = NO;
+				INFOPLIST_FILE = "$(SRCROOT)/NewExpensify/Info.plist";
+				IPHONEOS_DEPLOYMENT_TARGET = 15.0;
+				LD_RUNPATH_SEARCH_PATHS = (
+					"$(inherited)",
+					"@executable_path/Frameworks",
+				);
+				MARKETING_VERSION = 1.0.0;
+				OTHER_LDFLAGS = (
+					"$(inherited)",
+					"-ObjC",
+					"-lc++",
+				);
+				OTHER_SWIFT_FLAGS = "$(inherited) -D EXPO_CONFIGURATION_DEBUG";
+				PRODUCT_BUNDLE_IDENTIFIER = com.expensify.chat.dev;
+				PRODUCT_NAME = "New Expensify Dev";
+				PROVISIONING_PROFILE_SPECIFIER = "(NewApp) Development";
+				"PROVISIONING_PROFILE_SPECIFIER[sdk=iphoneos*]" = "(NewApp) Development";
+				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
+				SWIFT_VERSION = 5.0;
+				TARGETED_DEVICE_FAMILY = "1,2";
+				VERSIONING_SYSTEM = "apple-generic";
+			};
+			name = Debug;
+		};
+		0CBE08782C5D0872008661F8 /* Debug */ = {
+			isa = XCBuildConfiguration;
+			baseConfigurationReference = CA5677EEAC9784567B912881 /* Pods-NewExpensify-NewExpensifyTests.debug.xcconfig */;
+			buildSettings = {
+				ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
+				BUNDLE_LOADER = "$(TEST_HOST)";
+				CODE_SIGN_STYLE = Automatic;
+				GCC_PREPROCESSOR_DEFINITIONS = (
+					"DEBUG=1",
+					"$(inherited)",
+				);
+				INFOPLIST_FILE = NewExpensifyTests/Info.plist;
+				IPHONEOS_DEPLOYMENT_TARGET = 11.0;
+				LD_RUNPATH_SEARCH_PATHS = (
+					"$(inherited)",
+					"@executable_path/Frameworks",
+					"@loader_path/Frameworks",
+				);
+				OTHER_LDFLAGS = (
+					"-ObjC",
+					"-lc++",
+					"$(inherited)",
+				);
+				OTHER_SWIFT_FLAGS = "$(inherited) -D EXPO_CONFIGURATION_DEBUG";
+				PRODUCT_BUNDLE_IDENTIFIER = "org.reactjs.native.example.$(PRODUCT_NAME:rfc1034identifier)";
+				PRODUCT_NAME = "$(TARGET_NAME)";
+				TEST_HOST = "$(BUILT_PRODUCTS_DIR)/NewExpensify.app/NewExpensify";
+			};
+			name = Debug;
+		};
+		0CBE08792C5D0872008661F8 /* Debug */ = {
+			isa = XCBuildConfiguration;
+			baseConfigurationReference = 41D2EDB009CF19BA59C5181C /* Pods-NotificationServiceExtension.debug.xcconfig */;
+			buildSettings = {
+				ALWAYS_SEARCH_USER_PATHS = NO;
+				ASSETCATALOG_COMPILER_GENERATE_SWIFT_ASSET_SYMBOL_EXTENSIONS = YES;
+				CLANG_ANALYZER_NONNULL = YES;
+				CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
+				CLANG_CXX_LANGUAGE_STANDARD = "gnu++20";
+				CLANG_ENABLE_MODULES = YES;
+				CLANG_ENABLE_OBJC_ARC = YES;
+				CLANG_ENABLE_OBJC_WEAK = YES;
+				CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
+				CLANG_WARN_BOOL_CONVERSION = YES;
+				CLANG_WARN_COMMA = YES;
+				CLANG_WARN_CONSTANT_CONVERSION = YES;
+				CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
+				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
+				CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
+				CLANG_WARN_EMPTY_BODY = YES;
+				CLANG_WARN_ENUM_CONVERSION = YES;
+				CLANG_WARN_INFINITE_RECURSION = YES;
+				CLANG_WARN_INT_CONVERSION = YES;
+				CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
+				CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
+				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
+				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
+				CLANG_WARN_STRICT_PROTOTYPES = YES;
+				CLANG_WARN_SUSPICIOUS_MOVE = YES;
+				CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
+				CLANG_WARN_UNREACHABLE_CODE = YES;
+				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
+				CODE_SIGN_IDENTITY = "iPhone Distribution";
+				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
+				CODE_SIGN_STYLE = Manual;
+				COPY_PHASE_STRIP = NO;
+				DEBUG_INFORMATION_FORMAT = dwarf;
+				DEVELOPMENT_TEAM = "";
+				"DEVELOPMENT_TEAM[sdk=iphoneos*]" = 368M544MTT;
+				ENABLE_STRICT_OBJC_MSGSEND = YES;
+				ENABLE_TESTABILITY = YES;
+				ENABLE_USER_SCRIPT_SANDBOXING = YES;
+				GCC_C_LANGUAGE_STANDARD = gnu17;
+				GCC_DYNAMIC_NO_PIC = NO;
+				GCC_NO_COMMON_BLOCKS = YES;
+				GCC_OPTIMIZATION_LEVEL = 0;
+				GCC_PREPROCESSOR_DEFINITIONS = (
+					"DEBUG=1",
+					"$(inherited)",
+				);
+				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
+				GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
+				GCC_WARN_UNDECLARED_SELECTOR = YES;
+				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
+				GCC_WARN_UNUSED_FUNCTION = YES;
+				GCC_WARN_UNUSED_VARIABLE = YES;
+				GENERATE_INFOPLIST_FILE = NO;
+				INFOPLIST_FILE = NotificationServiceExtension/Info.plist;
+				INFOPLIST_KEY_CFBundleDisplayName = NotificationServiceExtension;
+				INFOPLIST_KEY_NSHumanReadableCopyright = "";
+				IPHONEOS_DEPLOYMENT_TARGET = 15.0;
+				LD_RUNPATH_SEARCH_PATHS = (
+					"$(inherited)",
+					"@executable_path/Frameworks",
+					"@executable_path/../../Frameworks",
+				);
+				LOCALIZATION_PREFERS_STRING_CATALOGS = YES;
+				MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
+				MTL_FAST_MATH = YES;
+				ONLY_ACTIVE_ARCH = YES;
+				OTHER_SWIFT_FLAGS = "$(inherited) -D EXPO_CONFIGURATION_DEBUG";
+				PRODUCT_BUNDLE_IDENTIFIER = com.expensify.chat.dev.NotificationServiceExtension;
+				PRODUCT_NAME = "$(TARGET_NAME)";
+				PROVISIONING_PROFILE_SPECIFIER = "";
+				"PROVISIONING_PROFILE_SPECIFIER[sdk=iphoneos*]" = "(NewApp) Development: Notification Service";
+				SDKROOT = iphoneos;
+				SKIP_INSTALL = YES;
+				SWIFT_ACTIVE_COMPILATION_CONDITIONS = "DEBUG $(inherited)";
+				SWIFT_EMIT_LOC_STRINGS = YES;
+				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
+				SWIFT_VERSION = 5.0;
+				TARGETED_DEVICE_FAMILY = "1,2";
+			};
+			name = Debug;
+		};
 		13B07F941A680F5B00A75B9A /* DebugDevelopment */ = {
 			isa = XCBuildConfiguration;
 			baseConfigurationReference = 46B1FE4DE317D30C25A74C15 /* Pods-NewExpensify.debugdevelopment.xcconfig */;
@@ -933,7 +1233,7 @@
 				"DEVELOPMENT_TEAM[sdk=iphoneos*]" = 368M544MTT;
 				ENABLE_BITCODE = NO;
 				INFOPLIST_FILE = "$(SRCROOT)/NewExpensify/Info.plist";
-				IPHONEOS_DEPLOYMENT_TARGET = 14.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 15.0;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
@@ -972,7 +1272,7 @@
 				DEVELOPMENT_TEAM = 368M544MTT;
 				"DEVELOPMENT_TEAM[sdk=iphoneos*]" = 368M544MTT;
 				INFOPLIST_FILE = NewExpensify/Info.plist;
-				IPHONEOS_DEPLOYMENT_TARGET = 14.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 15.0;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
@@ -1055,7 +1355,7 @@
 				INFOPLIST_FILE = NotificationServiceExtension/Info.plist;
 				INFOPLIST_KEY_CFBundleDisplayName = NotificationServiceExtension;
 				INFOPLIST_KEY_NSHumanReadableCopyright = "";
-				IPHONEOS_DEPLOYMENT_TARGET = 14.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 15.0;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
@@ -1140,7 +1440,7 @@
 				INFOPLIST_FILE = NotificationServiceExtension/Info.plist;
 				INFOPLIST_KEY_CFBundleDisplayName = NotificationServiceExtension;
 				INFOPLIST_KEY_NSHumanReadableCopyright = "";
-				IPHONEOS_DEPLOYMENT_TARGET = 14.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 15.0;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
@@ -1226,7 +1526,7 @@
 				INFOPLIST_FILE = NotificationServiceExtension/Info.plist;
 				INFOPLIST_KEY_CFBundleDisplayName = NotificationServiceExtension;
 				INFOPLIST_KEY_NSHumanReadableCopyright = "";
-				IPHONEOS_DEPLOYMENT_TARGET = 14.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 15.0;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
@@ -1306,7 +1606,7 @@
 				INFOPLIST_FILE = NotificationServiceExtension/Info.plist;
 				INFOPLIST_KEY_CFBundleDisplayName = NotificationServiceExtension;
 				INFOPLIST_KEY_NSHumanReadableCopyright = "";
-				IPHONEOS_DEPLOYMENT_TARGET = 14.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 15.0;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
@@ -1384,7 +1684,7 @@
 				INFOPLIST_FILE = NotificationServiceExtension/Info.plist;
 				INFOPLIST_KEY_CFBundleDisplayName = NotificationServiceExtension;
 				INFOPLIST_KEY_NSHumanReadableCopyright = "";
-				IPHONEOS_DEPLOYMENT_TARGET = 14.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 15.0;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
@@ -1463,7 +1763,7 @@
 				INFOPLIST_FILE = NotificationServiceExtension/Info.plist;
 				INFOPLIST_KEY_CFBundleDisplayName = NotificationServiceExtension;
 				INFOPLIST_KEY_NSHumanReadableCopyright = "";
-				IPHONEOS_DEPLOYMENT_TARGET = 14.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 15.0;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
@@ -1491,8 +1791,9 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
+				CC = "";
 				CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
-				CLANG_CXX_LANGUAGE_STANDARD = "gnu++14";
+				CLANG_CXX_LANGUAGE_STANDARD = "c++20";
 				CLANG_CXX_LIBRARY = "libc++";
 				CLANG_ENABLE_MODULES = YES;
 				CLANG_ENABLE_OBJC_ARC = YES;
@@ -1517,6 +1818,7 @@
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				COPY_PHASE_STRIP = NO;
+				CXX = "";
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
 				ENABLE_TESTABILITY = YES;
 				"EXCLUDED_ARCHS[sdk=iphonesimulator*]" = i386;
@@ -1536,6 +1838,8 @@
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
 				IPHONEOS_DEPLOYMENT_TARGET = 16.1;
+				LD = "";
+				LDPLUSPLUS = "";
 				LD_RUNPATH_SEARCH_PATHS = (
 					/usr/lib/swift,
 					"$(inherited)",
@@ -1555,11 +1859,7 @@
 					"$(inherited)",
 					"-DRN_FABRIC_ENABLED",
 				);
-				OTHER_LDFLAGS = (
-					"$(inherited)",
-					"-Wl",
-					"-ld_classic",
-				);
+				OTHER_LDFLAGS = "$(inherited)";
 				PRODUCT_BUNDLE_IDENTIFIER = "";
 				REACT_NATIVE_PATH = "${PODS_ROOT}/../../node_modules/react-native";
 				SDKROOT = iphoneos;
@@ -1571,8 +1871,9 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
+				CC = "";
 				CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
-				CLANG_CXX_LANGUAGE_STANDARD = "gnu++14";
+				CLANG_CXX_LANGUAGE_STANDARD = "c++20";
 				CLANG_CXX_LIBRARY = "libc++";
 				CLANG_ENABLE_MODULES = YES;
 				CLANG_ENABLE_OBJC_ARC = YES;
@@ -1597,6 +1898,7 @@
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				COPY_PHASE_STRIP = YES;
+				CXX = "";
 				ENABLE_NS_ASSERTIONS = NO;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
 				"EXCLUDED_ARCHS[sdk=iphonesimulator*]" = i386;
@@ -1609,6 +1911,8 @@
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
 				IPHONEOS_DEPLOYMENT_TARGET = 16.1;
+				LD = "";
+				LDPLUSPLUS = "";
 				LD_RUNPATH_SEARCH_PATHS = (
 					/usr/lib/swift,
 					"$(inherited)",
@@ -1627,11 +1931,7 @@
 					"$(inherited)",
 					"-DRN_FABRIC_ENABLED",
 				);
-				OTHER_LDFLAGS = (
-					"$(inherited)",
-					"-Wl",
-					"-ld_classic",
-				);
+				OTHER_LDFLAGS = "$(inherited)";
 				PRODUCT_BUNDLE_IDENTIFIER = "";
 				PRODUCT_NAME = "";
 				REACT_NATIVE_PATH = "${PODS_ROOT}/../../node_modules/react-native";
@@ -1645,8 +1945,9 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
+				CC = "";
 				CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
-				CLANG_CXX_LANGUAGE_STANDARD = "gnu++14";
+				CLANG_CXX_LANGUAGE_STANDARD = "c++20";
 				CLANG_CXX_LIBRARY = "libc++";
 				CLANG_ENABLE_MODULES = YES;
 				CLANG_ENABLE_OBJC_ARC = YES;
@@ -1671,6 +1972,7 @@
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				COPY_PHASE_STRIP = NO;
+				CXX = "";
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
 				ENABLE_TESTABILITY = YES;
 				"EXCLUDED_ARCHS[sdk=iphonesimulator*]" = i386;
@@ -1690,6 +1992,8 @@
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
 				IPHONEOS_DEPLOYMENT_TARGET = 16.1;
+				LD = "";
+				LDPLUSPLUS = "";
 				LD_RUNPATH_SEARCH_PATHS = (
 					/usr/lib/swift,
 					"$(inherited)",
@@ -1709,11 +2013,7 @@
 					"$(inherited)",
 					"-DRN_FABRIC_ENABLED",
 				);
-				OTHER_LDFLAGS = (
-					"$(inherited)",
-					"-Wl",
-					"-ld_classic",
-				);
+				OTHER_LDFLAGS = "$(inherited)";
 				PRODUCT_BUNDLE_IDENTIFIER = "";
 				REACT_NATIVE_PATH = "${PODS_ROOT}/../../node_modules/react-native";
 				SDKROOT = iphoneos;
@@ -1737,7 +2037,7 @@
 				"DEVELOPMENT_TEAM[sdk=iphoneos*]" = 368M544MTT;
 				ENABLE_BITCODE = NO;
 				INFOPLIST_FILE = "$(SRCROOT)/NewExpensify/Info.plist";
-				IPHONEOS_DEPLOYMENT_TARGET = 14.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 15.0;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
@@ -1794,8 +2094,9 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
+				CC = "";
 				CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
-				CLANG_CXX_LANGUAGE_STANDARD = "gnu++14";
+				CLANG_CXX_LANGUAGE_STANDARD = "c++20";
 				CLANG_CXX_LIBRARY = "libc++";
 				CLANG_ENABLE_MODULES = YES;
 				CLANG_ENABLE_OBJC_ARC = YES;
@@ -1820,6 +2121,7 @@
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				COPY_PHASE_STRIP = NO;
+				CXX = "";
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
 				ENABLE_TESTABILITY = YES;
 				"EXCLUDED_ARCHS[sdk=iphonesimulator*]" = i386;
@@ -1839,6 +2141,8 @@
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
 				IPHONEOS_DEPLOYMENT_TARGET = 16.1;
+				LD = "";
+				LDPLUSPLUS = "";
 				LD_RUNPATH_SEARCH_PATHS = (
 					/usr/lib/swift,
 					"$(inherited)",
@@ -1858,11 +2162,7 @@
 					"$(inherited)",
 					"-DRN_FABRIC_ENABLED",
 				);
-				OTHER_LDFLAGS = (
-					"$(inherited)",
-					"-Wl",
-					"-ld_classic",
-				);
+				OTHER_LDFLAGS = "$(inherited)";
 				PRODUCT_BUNDLE_IDENTIFIER = "";
 				REACT_NATIVE_PATH = "${PODS_ROOT}/../../node_modules/react-native";
 				SDKROOT = iphoneos;
@@ -1886,7 +2186,7 @@
 				"DEVELOPMENT_TEAM[sdk=iphoneos*]" = 368M544MTT;
 				ENABLE_BITCODE = NO;
 				INFOPLIST_FILE = "$(SRCROOT)/NewExpensify/Info.plist";
-				IPHONEOS_DEPLOYMENT_TARGET = 14.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 15.0;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
@@ -1943,8 +2243,9 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
+				CC = "";
 				CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
-				CLANG_CXX_LANGUAGE_STANDARD = "gnu++14";
+				CLANG_CXX_LANGUAGE_STANDARD = "c++20";
 				CLANG_CXX_LIBRARY = "libc++";
 				CLANG_ENABLE_MODULES = YES;
 				CLANG_ENABLE_OBJC_ARC = YES;
@@ -1969,6 +2270,7 @@
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				COPY_PHASE_STRIP = YES;
+				CXX = "";
 				ENABLE_NS_ASSERTIONS = NO;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
 				"EXCLUDED_ARCHS[sdk=iphonesimulator*]" = i386;
@@ -1981,6 +2283,8 @@
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
 				IPHONEOS_DEPLOYMENT_TARGET = 16.1;
+				LD = "";
+				LDPLUSPLUS = "";
 				LD_RUNPATH_SEARCH_PATHS = (
 					/usr/lib/swift,
 					"$(inherited)",
@@ -1999,11 +2303,7 @@
 					"$(inherited)",
 					"-DRN_FABRIC_ENABLED",
 				);
-				OTHER_LDFLAGS = (
-					"$(inherited)",
-					"-Wl",
-					"-ld_classic",
-				);
+				OTHER_LDFLAGS = "$(inherited)";
 				PRODUCT_BUNDLE_IDENTIFIER = "";
 				PRODUCT_NAME = "";
 				REACT_NATIVE_PATH = "${PODS_ROOT}/../../node_modules/react-native";
@@ -2028,7 +2328,7 @@
 				DEVELOPMENT_TEAM = 368M544MTT;
 				"DEVELOPMENT_TEAM[sdk=iphoneos*]" = 368M544MTT;
 				INFOPLIST_FILE = NewExpensify/Info.plist;
-				IPHONEOS_DEPLOYMENT_TARGET = 14.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 15.0;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
@@ -2082,8 +2382,9 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
+				CC = "";
 				CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
-				CLANG_CXX_LANGUAGE_STANDARD = "gnu++14";
+				CLANG_CXX_LANGUAGE_STANDARD = "c++20";
 				CLANG_CXX_LIBRARY = "libc++";
 				CLANG_ENABLE_MODULES = YES;
 				CLANG_ENABLE_OBJC_ARC = YES;
@@ -2108,6 +2409,7 @@
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				COPY_PHASE_STRIP = YES;
+				CXX = "";
 				ENABLE_NS_ASSERTIONS = NO;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
 				"EXCLUDED_ARCHS[sdk=iphonesimulator*]" = i386;
@@ -2120,6 +2422,8 @@
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
 				IPHONEOS_DEPLOYMENT_TARGET = 16.1;
+				LD = "";
+				LDPLUSPLUS = "";
 				LD_RUNPATH_SEARCH_PATHS = (
 					/usr/lib/swift,
 					"$(inherited)",
@@ -2138,11 +2442,7 @@
 					"$(inherited)",
 					"-DRN_FABRIC_ENABLED",
 				);
-				OTHER_LDFLAGS = (
-					"$(inherited)",
-					"-Wl",
-					"-ld_classic",
-				);
+				OTHER_LDFLAGS = "$(inherited)";
 				PRODUCT_BUNDLE_IDENTIFIER = "";
 				PRODUCT_NAME = "";
 				REACT_NATIVE_PATH = "${PODS_ROOT}/../../node_modules/react-native";
@@ -2167,7 +2467,7 @@
 				DEVELOPMENT_TEAM = 368M544MTT;
 				"DEVELOPMENT_TEAM[sdk=iphoneos*]" = 368M544MTT;
 				INFOPLIST_FILE = NewExpensify/Info.plist;
-				IPHONEOS_DEPLOYMENT_TARGET = 14.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 15.0;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
@@ -2224,6 +2524,7 @@
 			isa = XCConfigurationList;
 			buildConfigurations = (
 				00E356F61AD99517003FC87E /* DebugDevelopment */,
+				0CBE08782C5D0872008661F8 /* Debug */,
 				CF9AF94629EE927A001FA527 /* DebugAdHoc */,
 				CF9AF94029EE9276001FA527 /* DebugProduction */,
 				00E356F71AD99517003FC87E /* ReleaseDevelopment */,
@@ -2237,6 +2538,7 @@
 			isa = XCConfigurationList;
 			buildConfigurations = (
 				13B07F941A680F5B00A75B9A /* DebugDevelopment */,
+				0CBE08772C5D0872008661F8 /* Debug */,
 				CF9AF94529EE927A001FA527 /* DebugAdHoc */,
 				CF9AF93F29EE9276001FA527 /* DebugProduction */,
 				13B07F951A680F5B00A75B9A /* ReleaseDevelopment */,
@@ -2250,6 +2552,7 @@
 			isa = XCConfigurationList;
 			buildConfigurations = (
 				7FD73CA42B23CE9500420AF3 /* DebugDevelopment */,
+				0CBE08792C5D0872008661F8 /* Debug */,
 				7FD73CA52B23CE9500420AF3 /* DebugAdHoc */,
 				7FD73CA62B23CE9500420AF3 /* DebugProduction */,
 				7FD73CA72B23CE9500420AF3 /* ReleaseDevelopment */,
@@ -2263,6 +2566,7 @@
 			isa = XCConfigurationList;
 			buildConfigurations = (
 				83CBBA201A601CBA00E9B192 /* DebugDevelopment */,
+				0CBE08762C5D0872008661F8 /* Debug */,
 				CF9AF94429EE927A001FA527 /* DebugAdHoc */,
 				CF9AF93E29EE9276001FA527 /* DebugProduction */,
 				83CBBA211A601CBA00E9B192 /* ReleaseDevelopment */,
diff --git a/ios/NewExpensify/AppDelegate.mm b/ios/NewExpensify/AppDelegate.mm
index f4f7f3bc8dbc..dc0ef2812031 100644
--- a/ios/NewExpensify/AppDelegate.mm
+++ b/ios/NewExpensify/AppDelegate.mm
@@ -74,10 +74,10 @@ - (BOOL)application:(UIApplication *)application
 
 - (NSURL *)sourceURLForBridge:(RCTBridge *)bridge
 {
-  return [self getBundleURL];
+  return [self bundleURL];
 }
 
-- (NSURL *)getBundleURL
+- (NSURL *)bundleURL
 {
 #if DEBUG
   return
@@ -88,6 +88,11 @@ - (NSURL *)getBundleURL
 #endif
 }
 
+- (BOOL)bridgelessEnabled
+{
+  return NO;
+}
+
 // This methods is needed to support the hardware keyboard shortcuts
 - (NSArray *)keyCommands {
   return [HardwareShortcuts sharedInstance].keyCommands;
diff --git a/ios/NewExpensify/Info.plist b/ios/NewExpensify/Info.plist
index 647c12d51353..f17fea1f2db8 100644
--- a/ios/NewExpensify/Info.plist
+++ b/ios/NewExpensify/Info.plist
@@ -19,7 +19,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.4.70</string>
+	<string>9.0.26</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleURLTypes</key>
@@ -40,11 +40,13 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>1.4.70.2</string>
+	<string>9.0.26.1</string>
 	<key>FullStory</key>
 	<dict>
 		<key>OrgId</key>
 		<string>o-1WN56P-na1</string>
+		<key>RecordOnStart</key>
+		<false/>
 	</dict>
 	<key>ITSAppUsesNonExemptEncryption</key>
 	<false/>
diff --git a/ios/NewExpensify/PrivacyInfo.xcprivacy b/ios/NewExpensify/PrivacyInfo.xcprivacy
new file mode 100644
index 000000000000..3ea8e1fd72bf
--- /dev/null
+++ b/ios/NewExpensify/PrivacyInfo.xcprivacy
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>NSPrivacyAccessedAPITypes</key>
+	<array>
+		<dict>
+			<key>NSPrivacyAccessedAPIType</key>
+			<string>NSPrivacyAccessedAPICategoryUserDefaults</string>
+			<key>NSPrivacyAccessedAPITypeReasons</key>
+			<array>
+				<string>CA92.1</string>
+				<string>1C8F.1</string>
+				<string>C56D.1</string>
+			</array>
+		</dict>
+		<dict>
+			<key>NSPrivacyAccessedAPIType</key>
+			<string>NSPrivacyAccessedAPICategoryFileTimestamp</string>
+			<key>NSPrivacyAccessedAPITypeReasons</key>
+			<array>
+				<string>C617.1</string>
+			</array>
+		</dict>
+		<dict>
+			<key>NSPrivacyAccessedAPIType</key>
+			<string>NSPrivacyAccessedAPICategorySystemBootTime</string>
+			<key>NSPrivacyAccessedAPITypeReasons</key>
+			<array>
+				<string>35F9.1</string>
+			</array>
+		</dict>
+	</array>
+	<key>NSPrivacyCollectedDataTypes</key>
+	<array/>
+	<key>NSPrivacyTracking</key>
+	<false/>
+</dict>
+</plist>
diff --git a/ios/NewExpensifyTests/Info.plist b/ios/NewExpensifyTests/Info.plist
index c692d84e11a2..171aecbe3043 100644
--- a/ios/NewExpensifyTests/Info.plist
+++ b/ios/NewExpensifyTests/Info.plist
@@ -15,10 +15,10 @@
 	<key>CFBundlePackageType</key>
 	<string>BNDL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.4.70</string>
+	<string>9.0.26</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>1.4.70.2</string>
+	<string>9.0.26.1</string>
 </dict>
 </plist>
diff --git a/ios/NotificationServiceExtension/Info.plist b/ios/NotificationServiceExtension/Info.plist
index 8bb62f9d5f56..34c98efcc9f6 100644
--- a/ios/NotificationServiceExtension/Info.plist
+++ b/ios/NotificationServiceExtension/Info.plist
@@ -11,9 +11,9 @@
 	<key>CFBundleName</key>
 	<string>$(PRODUCT_NAME)</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.4.70</string>
+	<string>9.0.26</string>
 	<key>CFBundleVersion</key>
-	<string>1.4.70.2</string>
+	<string>9.0.26.1</string>
 	<key>NSExtension</key>
 	<dict>
 		<key>NSExtensionPointIdentifier</key>
diff --git a/ios/Podfile b/ios/Podfile
index 4f00eb2adfdd..2ed1752abf4f 100644
--- a/ios/Podfile
+++ b/ios/Podfile
@@ -20,6 +20,7 @@ node_require('react-native-permissions/scripts/setup.rb')
 platform :ios, 14.0
 prepare_react_native_project!
 
+
 setup_permissions([
   'Camera',
   'LocationAccuracy',
@@ -70,7 +71,8 @@ target 'NewExpensify' do
     'DebugProduction' => :debug,
     'ReleaseDevelopment' => :release,
     'ReleaseAdHoc' => :release,
-    'ReleaseProduction' => :release
+    'ReleaseProduction' => :release,
+    'Debug' => :debug
 
   config = use_native_modules!
 
@@ -100,7 +102,8 @@ target 'NewExpensify' do
     react_native_post_install(
       installer,
       config[:reactNativePath],
-      :mac_catalyst_enabled => false
+      :mac_catalyst_enabled => false,
+      # :ccache_enabled => true
     )
     __apply_Xcode_14_3_RC_post_install_workaround(installer)
 
@@ -117,3 +120,5 @@ end
 target 'NotificationServiceExtension' do
   pod 'AirshipServiceExtension'
 end
+
+pod 'FullStory', :http => 'https://ios-releases.fullstory.com/fullstory-1.49.0-xcframework.tar.gz'
\ No newline at end of file
diff --git a/ios/Podfile.lock b/ios/Podfile.lock
index 0b882eb6c1e8..0410bf7ba4e0 100644
--- a/ios/Podfile.lock
+++ b/ios/Podfile.lock
@@ -1,73 +1,80 @@
 PODS:
-  - Airship (17.7.3):
-    - Airship/Automation (= 17.7.3)
-    - Airship/Basement (= 17.7.3)
-    - Airship/Core (= 17.7.3)
-    - Airship/FeatureFlags (= 17.7.3)
-    - Airship/MessageCenter (= 17.7.3)
-    - Airship/PreferenceCenter (= 17.7.3)
-  - Airship/Automation (17.7.3):
+  - Airship (18.7.2):
+    - Airship/Automation (= 18.7.2)
+    - Airship/Basement (= 18.7.2)
+    - Airship/Core (= 18.7.2)
+    - Airship/FeatureFlags (= 18.7.2)
+    - Airship/MessageCenter (= 18.7.2)
+    - Airship/PreferenceCenter (= 18.7.2)
+  - Airship/Automation (18.7.2):
     - Airship/Core
-  - Airship/Basement (17.7.3)
-  - Airship/Core (17.7.3):
+  - Airship/Basement (18.7.2)
+  - Airship/Core (18.7.2):
     - Airship/Basement
-  - Airship/FeatureFlags (17.7.3):
+  - Airship/FeatureFlags (18.7.2):
     - Airship/Core
-  - Airship/MessageCenter (17.7.3):
+  - Airship/MessageCenter (18.7.2):
     - Airship/Core
-  - Airship/PreferenceCenter (17.7.3):
+  - Airship/PreferenceCenter (18.7.2):
     - Airship/Core
-  - AirshipFrameworkProxy (5.1.1):
-    - Airship (= 17.7.3)
-  - AirshipServiceExtension (17.8.0)
-  - AppAuth (1.6.2):
-    - AppAuth/Core (= 1.6.2)
-    - AppAuth/ExternalUserAgent (= 1.6.2)
-  - AppAuth/Core (1.6.2)
-  - AppAuth/ExternalUserAgent (1.6.2):
+  - AirshipFrameworkProxy (7.1.2):
+    - Airship (= 18.7.2)
+  - AirshipServiceExtension (18.7.2)
+  - AppAuth (1.7.5):
+    - AppAuth/Core (= 1.7.5)
+    - AppAuth/ExternalUserAgent (= 1.7.5)
+  - AppAuth/Core (1.7.5)
+  - AppAuth/ExternalUserAgent (1.7.5):
     - AppAuth/Core
-  - boost (1.83.0)
+  - boost (1.84.0)
   - BVLinearGradient (2.8.1):
     - React-Core
   - DoubleConversion (1.1.6)
-  - EXAV (13.10.4):
+  - EXAV (14.0.6):
     - ExpoModulesCore
     - ReactCommon/turbomodule/core
-  - EXImageLoader (4.6.0):
+  - EXImageLoader (4.7.0):
     - ExpoModulesCore
     - React-Core
-  - Expo (50.0.4):
+  - Expo (51.0.17):
     - ExpoModulesCore
-  - ExpoImage (1.11.0):
+  - ExpoAsset (10.0.10):
     - ExpoModulesCore
-    - SDWebImage (~> 5.17.0)
-    - SDWebImageAVIFCoder (~> 0.10.1)
+  - ExpoImage (1.12.12):
+    - ExpoModulesCore
+    - libavif/libdav1d
+    - SDWebImage (~> 5.19.1)
+    - SDWebImageAVIFCoder (~> 0.11.0)
     - SDWebImageSVGCoder (~> 1.7.0)
-    - SDWebImageWebPCoder (~> 0.13.0)
-  - ExpoImageManipulator (11.8.0):
+    - SDWebImageWebPCoder (~> 0.14.6)
+  - ExpoImageManipulator (12.0.5):
     - EXImageLoader
     - ExpoModulesCore
-  - ExpoModulesCore (1.11.8):
+    - SDWebImageWebPCoder
+  - ExpoModulesCore (1.12.18):
+    - DoubleConversion
     - glog
     - hermes-engine
-    - RCT-Folly (= 2022.05.16.00)
+    - RCT-Folly (= 2024.01.01.00)
     - RCTRequired
     - RCTTypeSafety
-    - React-Codegen
     - React-Core
     - React-debug
     - React-Fabric
+    - React-featureflags
     - React-graphics
     - React-ImageManager
+    - React-jsinspector
     - React-NativeModulesApple
     - React-RCTAppDelegate
     - React-RCTFabric
     - React-rendererdebug
     - React-utils
+    - ReactCodegen
     - ReactCommon/turbomodule/bridging
     - ReactCommon/turbomodule/core
     - Yoga
-  - FBLazyVector (0.73.4)
+  - FBLazyVector (0.75.2)
   - Firebase/Analytics (8.8.0):
     - Firebase/Core
   - Firebase/Core (8.8.0):
@@ -137,7 +144,30 @@ PODS:
     - FirebaseInstallations (~> 8.0)
     - GoogleUtilities/Environment (~> 7.7)
     - "GoogleUtilities/NSData+zlib (~> 7.7)"
-  - fmt (6.2.1)
+  - fmt (9.1.0)
+  - FullStory (1.49.0)
+  - fullstory_react-native (1.4.2):
+    - DoubleConversion
+    - FullStory (~> 1.14)
+    - glog
+    - hermes-engine
+    - RCT-Folly (= 2024.01.01.00)
+    - RCTRequired
+    - RCTTypeSafety
+    - React-Core
+    - React-debug
+    - React-Fabric
+    - React-featureflags
+    - React-graphics
+    - React-ImageManager
+    - React-NativeModulesApple
+    - React-RCTFabric
+    - React-rendererdebug
+    - React-utils
+    - ReactCodegen
+    - ReactCommon/turbomodule/bridging
+    - ReactCommon/turbomodule/core
+    - Yoga
   - glog (0.3.5)
   - GoogleAppMeasurement (8.8.0):
     - GoogleAppMeasurement/AdIdSupport (= 8.8.0)
@@ -163,57 +193,52 @@ PODS:
     - GoogleUtilities/Environment (~> 7.7)
     - nanopb (< 2.30911.0, >= 2.30908.0)
     - PromisesObjC (< 3.0, >= 1.2)
-  - GoogleSignIn (7.0.0):
-    - AppAuth (~> 1.5)
-    - GTMAppAuth (< 3.0, >= 1.3)
-    - GTMSessionFetcher/Core (< 4.0, >= 1.1)
-  - GoogleUtilities/AppDelegateSwizzler (7.13.0):
+  - GoogleSignIn (7.1.0):
+    - AppAuth (< 2.0, >= 1.7.3)
+    - GTMAppAuth (< 5.0, >= 4.1.1)
+    - GTMSessionFetcher/Core (~> 3.3)
+  - GoogleUtilities/AppDelegateSwizzler (7.13.3):
     - GoogleUtilities/Environment
     - GoogleUtilities/Logger
     - GoogleUtilities/Network
     - GoogleUtilities/Privacy
-  - GoogleUtilities/Environment (7.13.0):
+  - GoogleUtilities/Environment (7.13.3):
     - GoogleUtilities/Privacy
     - PromisesObjC (< 3.0, >= 1.2)
-  - GoogleUtilities/ISASwizzler (7.13.0):
+  - GoogleUtilities/ISASwizzler (7.13.3):
     - GoogleUtilities/Privacy
-  - GoogleUtilities/Logger (7.13.0):
+  - GoogleUtilities/Logger (7.13.3):
     - GoogleUtilities/Environment
     - GoogleUtilities/Privacy
-  - GoogleUtilities/MethodSwizzler (7.13.0):
+  - GoogleUtilities/MethodSwizzler (7.13.3):
     - GoogleUtilities/Logger
     - GoogleUtilities/Privacy
-  - GoogleUtilities/Network (7.13.0):
+  - GoogleUtilities/Network (7.13.3):
     - GoogleUtilities/Logger
     - "GoogleUtilities/NSData+zlib"
     - GoogleUtilities/Privacy
     - GoogleUtilities/Reachability
-  - "GoogleUtilities/NSData+zlib (7.13.0)":
+  - "GoogleUtilities/NSData+zlib (7.13.3)":
     - GoogleUtilities/Privacy
-  - GoogleUtilities/Privacy (7.13.0)
-  - GoogleUtilities/Reachability (7.13.0):
+  - GoogleUtilities/Privacy (7.13.3)
+  - GoogleUtilities/Reachability (7.13.3):
     - GoogleUtilities/Logger
     - GoogleUtilities/Privacy
-  - GoogleUtilities/UserDefaults (7.13.0):
+  - GoogleUtilities/UserDefaults (7.13.3):
     - GoogleUtilities/Logger
     - GoogleUtilities/Privacy
-  - GTMAppAuth (2.0.0):
-    - AppAuth/Core (~> 1.6)
-    - GTMSessionFetcher/Core (< 4.0, >= 1.5)
-  - GTMSessionFetcher/Core (3.3.1)
-  - hermes-engine (0.73.4):
-    - hermes-engine/Pre-built (= 0.73.4)
-  - hermes-engine/Pre-built (0.73.4)
-  - libaom (3.0.0):
-    - libvmaf (>= 2.2.0)
-  - libavif (0.11.1):
-    - libavif/libaom (= 0.11.1)
+  - GTMAppAuth (4.1.1):
+    - AppAuth/Core (~> 1.7)
+    - GTMSessionFetcher/Core (< 4.0, >= 3.3)
+  - GTMSessionFetcher/Core (3.5.0)
+  - hermes-engine (0.75.2):
+    - hermes-engine/Pre-built (= 0.75.2)
+  - hermes-engine/Pre-built (0.75.2)
   - libavif/core (0.11.1)
-  - libavif/libaom (0.11.1):
-    - libaom (>= 2.0.0)
+  - libavif/libdav1d (0.11.1):
     - libavif/core
-  - libevent (2.1.12)
-  - libvmaf (2.3.1)
+    - libdav1d (>= 0.6.0)
+  - libdav1d (1.2.0)
   - libwebp (1.3.2):
     - libwebp/demux (= 1.3.2)
     - libwebp/mux (= 1.3.2)
@@ -228,370 +253,484 @@ PODS:
     - libwebp/sharpyuv
   - lottie-ios (4.3.4)
   - lottie-react-native (6.5.1):
+    - DoubleConversion
     - glog
     - hermes-engine
     - lottie-ios (~> 4.3.3)
-    - RCT-Folly (= 2022.05.16.00)
+    - RCT-Folly (= 2024.01.01.00)
     - RCTRequired
     - RCTTypeSafety
-    - React-Codegen
     - React-Core
     - React-debug
     - React-Fabric
+    - React-featureflags
     - React-graphics
     - React-ImageManager
     - React-NativeModulesApple
     - React-RCTFabric
     - React-rendererdebug
     - React-utils
+    - ReactCodegen
     - ReactCommon/turbomodule/bridging
     - ReactCommon/turbomodule/core
     - Yoga
-  - MapboxCommon (23.9.1)
-  - MapboxCoreMaps (10.16.6):
-    - MapboxCommon (~> 23.9)
-  - MapboxMaps (10.16.6):
-    - MapboxCommon (= 23.9.1)
-    - MapboxCoreMaps (= 10.16.6)
+  - MapboxCommon (23.10.1)
+  - MapboxCoreMaps (10.18.0):
+    - MapboxCommon (~> 23.10)
+  - MapboxMaps (10.18.2):
+    - MapboxCommon (= 23.10.1)
+    - MapboxCoreMaps (= 10.18.0)
     - MapboxMobileEvents (= 1.0.10)
-    - Turf (= 2.7.0)
+    - Turf (= 2.8.0)
   - MapboxMobileEvents (1.0.10)
   - nanopb (2.30908.0):
     - nanopb/decode (= 2.30908.0)
     - nanopb/encode (= 2.30908.0)
   - nanopb/decode (2.30908.0)
   - nanopb/encode (2.30908.0)
-  - Onfido (29.7.1)
+  - Onfido (29.7.2)
   - onfido-react-native-sdk (10.6.0):
+    - DoubleConversion
     - glog
     - hermes-engine
     - Onfido (~> 29.7.0)
-    - RCT-Folly (= 2022.05.16.00)
+    - RCT-Folly (= 2024.01.01.00)
     - RCTRequired
     - RCTTypeSafety
-    - React-Codegen
     - React-Core
     - React-debug
     - React-Fabric
+    - React-featureflags
     - React-graphics
     - React-ImageManager
     - React-NativeModulesApple
     - React-RCTFabric
     - React-rendererdebug
     - React-utils
+    - ReactCodegen
     - ReactCommon/turbomodule/bridging
     - ReactCommon/turbomodule/core
     - Yoga
-  - Plaid (5.2.1)
+  - Plaid (5.6.0)
   - PromisesObjC (2.4.0)
-  - RCT-Folly (2022.05.16.00):
+  - RCT-Folly (2024.01.01.00):
     - boost
     - DoubleConversion
-    - fmt (~> 6.2.1)
+    - fmt (= 9.1.0)
     - glog
-    - RCT-Folly/Default (= 2022.05.16.00)
-  - RCT-Folly/Default (2022.05.16.00):
+    - RCT-Folly/Default (= 2024.01.01.00)
+  - RCT-Folly/Default (2024.01.01.00):
     - boost
     - DoubleConversion
-    - fmt (~> 6.2.1)
+    - fmt (= 9.1.0)
     - glog
-  - RCT-Folly/Fabric (2022.05.16.00):
+  - RCT-Folly/Fabric (2024.01.01.00):
     - boost
     - DoubleConversion
-    - fmt (~> 6.2.1)
-    - glog
-  - RCT-Folly/Futures (2022.05.16.00):
-    - boost
-    - DoubleConversion
-    - fmt (~> 6.2.1)
-    - glog
-    - libevent
-  - RCTRequired (0.73.4)
-  - RCTTypeSafety (0.73.4):
-    - FBLazyVector (= 0.73.4)
-    - RCTRequired (= 0.73.4)
-    - React-Core (= 0.73.4)
-  - React (0.73.4):
-    - React-Core (= 0.73.4)
-    - React-Core/DevSupport (= 0.73.4)
-    - React-Core/RCTWebSocket (= 0.73.4)
-    - React-RCTActionSheet (= 0.73.4)
-    - React-RCTAnimation (= 0.73.4)
-    - React-RCTBlob (= 0.73.4)
-    - React-RCTImage (= 0.73.4)
-    - React-RCTLinking (= 0.73.4)
-    - React-RCTNetwork (= 0.73.4)
-    - React-RCTSettings (= 0.73.4)
-    - React-RCTText (= 0.73.4)
-    - React-RCTVibration (= 0.73.4)
-  - React-callinvoker (0.73.4)
-  - React-Codegen (0.73.4):
-    - DoubleConversion
-    - glog
-    - hermes-engine
-    - RCT-Folly
-    - RCTRequired
-    - RCTTypeSafety
-    - React-Core
-    - React-debug
-    - React-Fabric
-    - React-FabricImage
-    - React-graphics
-    - React-jsi
-    - React-jsiexecutor
-    - React-NativeModulesApple
-    - React-rendererdebug
-    - React-utils
-    - ReactCommon/turbomodule/bridging
-    - ReactCommon/turbomodule/core
-  - React-Core (0.73.4):
-    - glog
-    - hermes-engine
-    - RCT-Folly (= 2022.05.16.00)
-    - React-Core/Default (= 0.73.4)
+    - fmt (= 9.1.0)
+    - glog
+  - RCTDeprecation (0.75.2)
+  - RCTRequired (0.75.2)
+  - RCTTypeSafety (0.75.2):
+    - FBLazyVector (= 0.75.2)
+    - RCTRequired (= 0.75.2)
+    - React-Core (= 0.75.2)
+  - React (0.75.2):
+    - React-Core (= 0.75.2)
+    - React-Core/DevSupport (= 0.75.2)
+    - React-Core/RCTWebSocket (= 0.75.2)
+    - React-RCTActionSheet (= 0.75.2)
+    - React-RCTAnimation (= 0.75.2)
+    - React-RCTBlob (= 0.75.2)
+    - React-RCTImage (= 0.75.2)
+    - React-RCTLinking (= 0.75.2)
+    - React-RCTNetwork (= 0.75.2)
+    - React-RCTSettings (= 0.75.2)
+    - React-RCTText (= 0.75.2)
+    - React-RCTVibration (= 0.75.2)
+  - React-callinvoker (0.75.2)
+  - React-Codegen (0.1.0)
+  - React-Core (0.75.2):
+    - glog
+    - hermes-engine
+    - RCT-Folly (= 2024.01.01.00)
+    - RCTDeprecation
+    - React-Core/Default (= 0.75.2)
     - React-cxxreact
+    - React-featureflags
     - React-hermes
     - React-jsi
     - React-jsiexecutor
+    - React-jsinspector
     - React-perflogger
     - React-runtimescheduler
     - React-utils
-    - SocketRocket (= 0.6.1)
+    - SocketRocket (= 0.7.0)
     - Yoga
-  - React-Core/CoreModulesHeaders (0.73.4):
+  - React-Core/CoreModulesHeaders (0.75.2):
     - glog
     - hermes-engine
-    - RCT-Folly (= 2022.05.16.00)
+    - RCT-Folly (= 2024.01.01.00)
+    - RCTDeprecation
     - React-Core/Default
     - React-cxxreact
+    - React-featureflags
     - React-hermes
     - React-jsi
     - React-jsiexecutor
+    - React-jsinspector
     - React-perflogger
     - React-runtimescheduler
     - React-utils
-    - SocketRocket (= 0.6.1)
+    - SocketRocket (= 0.7.0)
     - Yoga
-  - React-Core/Default (0.73.4):
+  - React-Core/Default (0.75.2):
     - glog
     - hermes-engine
-    - RCT-Folly (= 2022.05.16.00)
+    - RCT-Folly (= 2024.01.01.00)
+    - RCTDeprecation
     - React-cxxreact
+    - React-featureflags
     - React-hermes
     - React-jsi
     - React-jsiexecutor
+    - React-jsinspector
     - React-perflogger
     - React-runtimescheduler
     - React-utils
-    - SocketRocket (= 0.6.1)
+    - SocketRocket (= 0.7.0)
     - Yoga
-  - React-Core/DevSupport (0.73.4):
+  - React-Core/DevSupport (0.75.2):
     - glog
     - hermes-engine
-    - RCT-Folly (= 2022.05.16.00)
-    - React-Core/Default (= 0.73.4)
-    - React-Core/RCTWebSocket (= 0.73.4)
+    - RCT-Folly (= 2024.01.01.00)
+    - RCTDeprecation
+    - React-Core/Default (= 0.75.2)
+    - React-Core/RCTWebSocket (= 0.75.2)
     - React-cxxreact
+    - React-featureflags
     - React-hermes
     - React-jsi
     - React-jsiexecutor
-    - React-jsinspector (= 0.73.4)
+    - React-jsinspector
     - React-perflogger
     - React-runtimescheduler
     - React-utils
-    - SocketRocket (= 0.6.1)
+    - SocketRocket (= 0.7.0)
     - Yoga
-  - React-Core/RCTActionSheetHeaders (0.73.4):
+  - React-Core/RCTActionSheetHeaders (0.75.2):
     - glog
     - hermes-engine
-    - RCT-Folly (= 2022.05.16.00)
+    - RCT-Folly (= 2024.01.01.00)
+    - RCTDeprecation
     - React-Core/Default
     - React-cxxreact
+    - React-featureflags
     - React-hermes
     - React-jsi
     - React-jsiexecutor
+    - React-jsinspector
     - React-perflogger
     - React-runtimescheduler
     - React-utils
-    - SocketRocket (= 0.6.1)
+    - SocketRocket (= 0.7.0)
     - Yoga
-  - React-Core/RCTAnimationHeaders (0.73.4):
+  - React-Core/RCTAnimationHeaders (0.75.2):
     - glog
     - hermes-engine
-    - RCT-Folly (= 2022.05.16.00)
+    - RCT-Folly (= 2024.01.01.00)
+    - RCTDeprecation
     - React-Core/Default
     - React-cxxreact
+    - React-featureflags
     - React-hermes
     - React-jsi
     - React-jsiexecutor
+    - React-jsinspector
     - React-perflogger
     - React-runtimescheduler
     - React-utils
-    - SocketRocket (= 0.6.1)
+    - SocketRocket (= 0.7.0)
     - Yoga
-  - React-Core/RCTBlobHeaders (0.73.4):
+  - React-Core/RCTBlobHeaders (0.75.2):
     - glog
     - hermes-engine
-    - RCT-Folly (= 2022.05.16.00)
+    - RCT-Folly (= 2024.01.01.00)
+    - RCTDeprecation
     - React-Core/Default
     - React-cxxreact
+    - React-featureflags
     - React-hermes
     - React-jsi
     - React-jsiexecutor
+    - React-jsinspector
     - React-perflogger
     - React-runtimescheduler
     - React-utils
-    - SocketRocket (= 0.6.1)
+    - SocketRocket (= 0.7.0)
     - Yoga
-  - React-Core/RCTImageHeaders (0.73.4):
+  - React-Core/RCTImageHeaders (0.75.2):
     - glog
     - hermes-engine
-    - RCT-Folly (= 2022.05.16.00)
+    - RCT-Folly (= 2024.01.01.00)
+    - RCTDeprecation
     - React-Core/Default
     - React-cxxreact
+    - React-featureflags
     - React-hermes
     - React-jsi
     - React-jsiexecutor
+    - React-jsinspector
     - React-perflogger
     - React-runtimescheduler
     - React-utils
-    - SocketRocket (= 0.6.1)
+    - SocketRocket (= 0.7.0)
     - Yoga
-  - React-Core/RCTLinkingHeaders (0.73.4):
+  - React-Core/RCTLinkingHeaders (0.75.2):
     - glog
     - hermes-engine
-    - RCT-Folly (= 2022.05.16.00)
+    - RCT-Folly (= 2024.01.01.00)
+    - RCTDeprecation
     - React-Core/Default
     - React-cxxreact
+    - React-featureflags
     - React-hermes
     - React-jsi
     - React-jsiexecutor
+    - React-jsinspector
     - React-perflogger
     - React-runtimescheduler
     - React-utils
-    - SocketRocket (= 0.6.1)
+    - SocketRocket (= 0.7.0)
     - Yoga
-  - React-Core/RCTNetworkHeaders (0.73.4):
+  - React-Core/RCTNetworkHeaders (0.75.2):
     - glog
     - hermes-engine
-    - RCT-Folly (= 2022.05.16.00)
+    - RCT-Folly (= 2024.01.01.00)
+    - RCTDeprecation
     - React-Core/Default
     - React-cxxreact
+    - React-featureflags
     - React-hermes
     - React-jsi
     - React-jsiexecutor
+    - React-jsinspector
     - React-perflogger
     - React-runtimescheduler
     - React-utils
-    - SocketRocket (= 0.6.1)
+    - SocketRocket (= 0.7.0)
     - Yoga
-  - React-Core/RCTSettingsHeaders (0.73.4):
+  - React-Core/RCTSettingsHeaders (0.75.2):
     - glog
     - hermes-engine
-    - RCT-Folly (= 2022.05.16.00)
+    - RCT-Folly (= 2024.01.01.00)
+    - RCTDeprecation
     - React-Core/Default
     - React-cxxreact
+    - React-featureflags
     - React-hermes
     - React-jsi
     - React-jsiexecutor
+    - React-jsinspector
     - React-perflogger
     - React-runtimescheduler
     - React-utils
-    - SocketRocket (= 0.6.1)
+    - SocketRocket (= 0.7.0)
     - Yoga
-  - React-Core/RCTTextHeaders (0.73.4):
+  - React-Core/RCTTextHeaders (0.75.2):
     - glog
     - hermes-engine
-    - RCT-Folly (= 2022.05.16.00)
+    - RCT-Folly (= 2024.01.01.00)
+    - RCTDeprecation
     - React-Core/Default
     - React-cxxreact
+    - React-featureflags
     - React-hermes
     - React-jsi
     - React-jsiexecutor
+    - React-jsinspector
     - React-perflogger
     - React-runtimescheduler
     - React-utils
-    - SocketRocket (= 0.6.1)
+    - SocketRocket (= 0.7.0)
     - Yoga
-  - React-Core/RCTVibrationHeaders (0.73.4):
+  - React-Core/RCTVibrationHeaders (0.75.2):
     - glog
     - hermes-engine
-    - RCT-Folly (= 2022.05.16.00)
+    - RCT-Folly (= 2024.01.01.00)
+    - RCTDeprecation
     - React-Core/Default
     - React-cxxreact
+    - React-featureflags
     - React-hermes
     - React-jsi
     - React-jsiexecutor
+    - React-jsinspector
     - React-perflogger
     - React-runtimescheduler
     - React-utils
-    - SocketRocket (= 0.6.1)
+    - SocketRocket (= 0.7.0)
     - Yoga
-  - React-Core/RCTWebSocket (0.73.4):
+  - React-Core/RCTWebSocket (0.75.2):
     - glog
     - hermes-engine
-    - RCT-Folly (= 2022.05.16.00)
-    - React-Core/Default (= 0.73.4)
+    - RCT-Folly (= 2024.01.01.00)
+    - RCTDeprecation
+    - React-Core/Default (= 0.75.2)
     - React-cxxreact
+    - React-featureflags
     - React-hermes
     - React-jsi
     - React-jsiexecutor
+    - React-jsinspector
     - React-perflogger
     - React-runtimescheduler
     - React-utils
-    - SocketRocket (= 0.6.1)
+    - SocketRocket (= 0.7.0)
     - Yoga
-  - React-CoreModules (0.73.4):
-    - RCT-Folly (= 2022.05.16.00)
-    - RCTTypeSafety (= 0.73.4)
-    - React-Codegen
-    - React-Core/CoreModulesHeaders (= 0.73.4)
-    - React-jsi (= 0.73.4)
+  - React-CoreModules (0.75.2):
+    - DoubleConversion
+    - fmt (= 9.1.0)
+    - RCT-Folly (= 2024.01.01.00)
+    - RCTTypeSafety (= 0.75.2)
+    - React-Core/CoreModulesHeaders (= 0.75.2)
+    - React-jsi (= 0.75.2)
+    - React-jsinspector
     - React-NativeModulesApple
     - React-RCTBlob
-    - React-RCTImage (= 0.73.4)
+    - React-RCTImage (= 0.75.2)
+    - ReactCodegen
     - ReactCommon
-    - SocketRocket (= 0.6.1)
-  - React-cxxreact (0.73.4):
-    - boost (= 1.83.0)
+    - SocketRocket (= 0.7.0)
+  - React-cxxreact (0.75.2):
+    - boost
+    - DoubleConversion
+    - fmt (= 9.1.0)
+    - glog
+    - hermes-engine
+    - RCT-Folly (= 2024.01.01.00)
+    - React-callinvoker (= 0.75.2)
+    - React-debug (= 0.75.2)
+    - React-jsi (= 0.75.2)
+    - React-jsinspector
+    - React-logger (= 0.75.2)
+    - React-perflogger (= 0.75.2)
+    - React-runtimeexecutor (= 0.75.2)
+  - React-debug (0.75.2)
+  - React-defaultsnativemodule (0.75.2):
+    - DoubleConversion
+    - glog
+    - hermes-engine
+    - RCT-Folly (= 2024.01.01.00)
+    - RCTRequired
+    - RCTTypeSafety
+    - React-Core
+    - React-debug
+    - React-domnativemodule
+    - React-Fabric
+    - React-featureflags
+    - React-featureflagsnativemodule
+    - React-graphics
+    - React-idlecallbacksnativemodule
+    - React-ImageManager
+    - React-microtasksnativemodule
+    - React-NativeModulesApple
+    - React-RCTFabric
+    - React-rendererdebug
+    - React-utils
+    - ReactCodegen
+    - ReactCommon/turbomodule/bridging
+    - ReactCommon/turbomodule/core
+    - Yoga
+  - React-domnativemodule (0.75.2):
+    - DoubleConversion
+    - glog
+    - hermes-engine
+    - RCT-Folly (= 2024.01.01.00)
+    - RCTRequired
+    - RCTTypeSafety
+    - React-Core
+    - React-debug
+    - React-Fabric
+    - React-FabricComponents
+    - React-featureflags
+    - React-graphics
+    - React-ImageManager
+    - React-NativeModulesApple
+    - React-RCTFabric
+    - React-rendererdebug
+    - React-utils
+    - ReactCodegen
+    - ReactCommon/turbomodule/bridging
+    - ReactCommon/turbomodule/core
+    - Yoga
+  - React-Fabric (0.75.2):
+    - DoubleConversion
+    - fmt (= 9.1.0)
+    - glog
+    - hermes-engine
+    - RCT-Folly/Fabric (= 2024.01.01.00)
+    - RCTRequired
+    - RCTTypeSafety
+    - React-Core
+    - React-cxxreact
+    - React-debug
+    - React-Fabric/animations (= 0.75.2)
+    - React-Fabric/attributedstring (= 0.75.2)
+    - React-Fabric/componentregistry (= 0.75.2)
+    - React-Fabric/componentregistrynative (= 0.75.2)
+    - React-Fabric/components (= 0.75.2)
+    - React-Fabric/core (= 0.75.2)
+    - React-Fabric/dom (= 0.75.2)
+    - React-Fabric/imagemanager (= 0.75.2)
+    - React-Fabric/leakchecker (= 0.75.2)
+    - React-Fabric/mounting (= 0.75.2)
+    - React-Fabric/observers (= 0.75.2)
+    - React-Fabric/scheduler (= 0.75.2)
+    - React-Fabric/telemetry (= 0.75.2)
+    - React-Fabric/templateprocessor (= 0.75.2)
+    - React-Fabric/uimanager (= 0.75.2)
+    - React-featureflags
+    - React-graphics
+    - React-jsi
+    - React-jsiexecutor
+    - React-logger
+    - React-rendererdebug
+    - React-runtimescheduler
+    - React-utils
+    - ReactCommon/turbomodule/core
+  - React-Fabric/animations (0.75.2):
     - DoubleConversion
-    - fmt (~> 6.2.1)
+    - fmt (= 9.1.0)
     - glog
     - hermes-engine
-    - RCT-Folly (= 2022.05.16.00)
-    - React-callinvoker (= 0.73.4)
-    - React-debug (= 0.73.4)
-    - React-jsi (= 0.73.4)
-    - React-jsinspector (= 0.73.4)
-    - React-logger (= 0.73.4)
-    - React-perflogger (= 0.73.4)
-    - React-runtimeexecutor (= 0.73.4)
-  - React-debug (0.73.4)
-  - React-Fabric (0.73.4):
+    - RCT-Folly/Fabric (= 2024.01.01.00)
+    - RCTRequired
+    - RCTTypeSafety
+    - React-Core
+    - React-cxxreact
+    - React-debug
+    - React-featureflags
+    - React-graphics
+    - React-jsi
+    - React-jsiexecutor
+    - React-logger
+    - React-rendererdebug
+    - React-runtimescheduler
+    - React-utils
+    - ReactCommon/turbomodule/core
+  - React-Fabric/attributedstring (0.75.2):
     - DoubleConversion
-    - fmt (~> 6.2.1)
+    - fmt (= 9.1.0)
     - glog
     - hermes-engine
-    - RCT-Folly/Fabric (= 2022.05.16.00)
+    - RCT-Folly/Fabric (= 2024.01.01.00)
     - RCTRequired
     - RCTTypeSafety
     - React-Core
     - React-cxxreact
     - React-debug
-    - React-Fabric/animations (= 0.73.4)
-    - React-Fabric/attributedstring (= 0.73.4)
-    - React-Fabric/componentregistry (= 0.73.4)
-    - React-Fabric/componentregistrynative (= 0.73.4)
-    - React-Fabric/components (= 0.73.4)
-    - React-Fabric/core (= 0.73.4)
-    - React-Fabric/imagemanager (= 0.73.4)
-    - React-Fabric/leakchecker (= 0.73.4)
-    - React-Fabric/mounting (= 0.73.4)
-    - React-Fabric/scheduler (= 0.73.4)
-    - React-Fabric/telemetry (= 0.73.4)
-    - React-Fabric/templateprocessor (= 0.73.4)
-    - React-Fabric/textlayoutmanager (= 0.73.4)
-    - React-Fabric/uimanager (= 0.73.4)
+    - React-featureflags
     - React-graphics
     - React-jsi
     - React-jsiexecutor
@@ -600,17 +739,18 @@ PODS:
     - React-runtimescheduler
     - React-utils
     - ReactCommon/turbomodule/core
-  - React-Fabric/animations (0.73.4):
+  - React-Fabric/componentregistry (0.75.2):
     - DoubleConversion
-    - fmt (~> 6.2.1)
+    - fmt (= 9.1.0)
     - glog
     - hermes-engine
-    - RCT-Folly/Fabric (= 2022.05.16.00)
+    - RCT-Folly/Fabric (= 2024.01.01.00)
     - RCTRequired
     - RCTTypeSafety
     - React-Core
     - React-cxxreact
     - React-debug
+    - React-featureflags
     - React-graphics
     - React-jsi
     - React-jsiexecutor
@@ -619,17 +759,18 @@ PODS:
     - React-runtimescheduler
     - React-utils
     - ReactCommon/turbomodule/core
-  - React-Fabric/attributedstring (0.73.4):
+  - React-Fabric/componentregistrynative (0.75.2):
     - DoubleConversion
-    - fmt (~> 6.2.1)
+    - fmt (= 9.1.0)
     - glog
     - hermes-engine
-    - RCT-Folly/Fabric (= 2022.05.16.00)
+    - RCT-Folly/Fabric (= 2024.01.01.00)
     - RCTRequired
     - RCTTypeSafety
     - React-Core
     - React-cxxreact
     - React-debug
+    - React-featureflags
     - React-graphics
     - React-jsi
     - React-jsiexecutor
@@ -638,17 +779,21 @@ PODS:
     - React-runtimescheduler
     - React-utils
     - ReactCommon/turbomodule/core
-  - React-Fabric/componentregistry (0.73.4):
+  - React-Fabric/components (0.75.2):
     - DoubleConversion
-    - fmt (~> 6.2.1)
+    - fmt (= 9.1.0)
     - glog
     - hermes-engine
-    - RCT-Folly/Fabric (= 2022.05.16.00)
+    - RCT-Folly/Fabric (= 2024.01.01.00)
     - RCTRequired
     - RCTTypeSafety
     - React-Core
     - React-cxxreact
     - React-debug
+    - React-Fabric/components/legacyviewmanagerinterop (= 0.75.2)
+    - React-Fabric/components/root (= 0.75.2)
+    - React-Fabric/components/view (= 0.75.2)
+    - React-featureflags
     - React-graphics
     - React-jsi
     - React-jsiexecutor
@@ -657,17 +802,18 @@ PODS:
     - React-runtimescheduler
     - React-utils
     - ReactCommon/turbomodule/core
-  - React-Fabric/componentregistrynative (0.73.4):
+  - React-Fabric/components/legacyviewmanagerinterop (0.75.2):
     - DoubleConversion
-    - fmt (~> 6.2.1)
+    - fmt (= 9.1.0)
     - glog
     - hermes-engine
-    - RCT-Folly/Fabric (= 2022.05.16.00)
+    - RCT-Folly/Fabric (= 2024.01.01.00)
     - RCTRequired
     - RCTTypeSafety
     - React-Core
     - React-cxxreact
     - React-debug
+    - React-featureflags
     - React-graphics
     - React-jsi
     - React-jsiexecutor
@@ -676,28 +822,18 @@ PODS:
     - React-runtimescheduler
     - React-utils
     - ReactCommon/turbomodule/core
-  - React-Fabric/components (0.73.4):
+  - React-Fabric/components/root (0.75.2):
     - DoubleConversion
-    - fmt (~> 6.2.1)
+    - fmt (= 9.1.0)
     - glog
     - hermes-engine
-    - RCT-Folly/Fabric (= 2022.05.16.00)
+    - RCT-Folly/Fabric (= 2024.01.01.00)
     - RCTRequired
     - RCTTypeSafety
     - React-Core
     - React-cxxreact
     - React-debug
-    - React-Fabric/components/inputaccessory (= 0.73.4)
-    - React-Fabric/components/legacyviewmanagerinterop (= 0.73.4)
-    - React-Fabric/components/modal (= 0.73.4)
-    - React-Fabric/components/rncore (= 0.73.4)
-    - React-Fabric/components/root (= 0.73.4)
-    - React-Fabric/components/safeareaview (= 0.73.4)
-    - React-Fabric/components/scrollview (= 0.73.4)
-    - React-Fabric/components/text (= 0.73.4)
-    - React-Fabric/components/textinput (= 0.73.4)
-    - React-Fabric/components/unimplementedview (= 0.73.4)
-    - React-Fabric/components/view (= 0.73.4)
+    - React-featureflags
     - React-graphics
     - React-jsi
     - React-jsiexecutor
@@ -706,17 +842,18 @@ PODS:
     - React-runtimescheduler
     - React-utils
     - ReactCommon/turbomodule/core
-  - React-Fabric/components/inputaccessory (0.73.4):
+  - React-Fabric/components/view (0.75.2):
     - DoubleConversion
-    - fmt (~> 6.2.1)
+    - fmt (= 9.1.0)
     - glog
     - hermes-engine
-    - RCT-Folly/Fabric (= 2022.05.16.00)
+    - RCT-Folly/Fabric (= 2024.01.01.00)
     - RCTRequired
     - RCTTypeSafety
     - React-Core
     - React-cxxreact
     - React-debug
+    - React-featureflags
     - React-graphics
     - React-jsi
     - React-jsiexecutor
@@ -725,17 +862,19 @@ PODS:
     - React-runtimescheduler
     - React-utils
     - ReactCommon/turbomodule/core
-  - React-Fabric/components/legacyviewmanagerinterop (0.73.4):
+    - Yoga
+  - React-Fabric/core (0.75.2):
     - DoubleConversion
-    - fmt (~> 6.2.1)
+    - fmt (= 9.1.0)
     - glog
     - hermes-engine
-    - RCT-Folly/Fabric (= 2022.05.16.00)
+    - RCT-Folly/Fabric (= 2024.01.01.00)
     - RCTRequired
     - RCTTypeSafety
     - React-Core
     - React-cxxreact
     - React-debug
+    - React-featureflags
     - React-graphics
     - React-jsi
     - React-jsiexecutor
@@ -744,17 +883,18 @@ PODS:
     - React-runtimescheduler
     - React-utils
     - ReactCommon/turbomodule/core
-  - React-Fabric/components/modal (0.73.4):
+  - React-Fabric/dom (0.75.2):
     - DoubleConversion
-    - fmt (~> 6.2.1)
+    - fmt (= 9.1.0)
     - glog
     - hermes-engine
-    - RCT-Folly/Fabric (= 2022.05.16.00)
+    - RCT-Folly/Fabric (= 2024.01.01.00)
     - RCTRequired
     - RCTTypeSafety
     - React-Core
     - React-cxxreact
     - React-debug
+    - React-featureflags
     - React-graphics
     - React-jsi
     - React-jsiexecutor
@@ -763,17 +903,18 @@ PODS:
     - React-runtimescheduler
     - React-utils
     - ReactCommon/turbomodule/core
-  - React-Fabric/components/rncore (0.73.4):
+  - React-Fabric/imagemanager (0.75.2):
     - DoubleConversion
-    - fmt (~> 6.2.1)
+    - fmt (= 9.1.0)
     - glog
     - hermes-engine
-    - RCT-Folly/Fabric (= 2022.05.16.00)
+    - RCT-Folly/Fabric (= 2024.01.01.00)
     - RCTRequired
     - RCTTypeSafety
     - React-Core
     - React-cxxreact
     - React-debug
+    - React-featureflags
     - React-graphics
     - React-jsi
     - React-jsiexecutor
@@ -782,17 +923,18 @@ PODS:
     - React-runtimescheduler
     - React-utils
     - ReactCommon/turbomodule/core
-  - React-Fabric/components/root (0.73.4):
+  - React-Fabric/leakchecker (0.75.2):
     - DoubleConversion
-    - fmt (~> 6.2.1)
+    - fmt (= 9.1.0)
     - glog
     - hermes-engine
-    - RCT-Folly/Fabric (= 2022.05.16.00)
+    - RCT-Folly/Fabric (= 2024.01.01.00)
     - RCTRequired
     - RCTTypeSafety
     - React-Core
     - React-cxxreact
     - React-debug
+    - React-featureflags
     - React-graphics
     - React-jsi
     - React-jsiexecutor
@@ -801,17 +943,18 @@ PODS:
     - React-runtimescheduler
     - React-utils
     - ReactCommon/turbomodule/core
-  - React-Fabric/components/safeareaview (0.73.4):
+  - React-Fabric/mounting (0.75.2):
     - DoubleConversion
-    - fmt (~> 6.2.1)
+    - fmt (= 9.1.0)
     - glog
     - hermes-engine
-    - RCT-Folly/Fabric (= 2022.05.16.00)
+    - RCT-Folly/Fabric (= 2024.01.01.00)
     - RCTRequired
     - RCTTypeSafety
     - React-Core
     - React-cxxreact
     - React-debug
+    - React-featureflags
     - React-graphics
     - React-jsi
     - React-jsiexecutor
@@ -820,17 +963,19 @@ PODS:
     - React-runtimescheduler
     - React-utils
     - ReactCommon/turbomodule/core
-  - React-Fabric/components/scrollview (0.73.4):
+  - React-Fabric/observers (0.75.2):
     - DoubleConversion
-    - fmt (~> 6.2.1)
+    - fmt (= 9.1.0)
     - glog
     - hermes-engine
-    - RCT-Folly/Fabric (= 2022.05.16.00)
+    - RCT-Folly/Fabric (= 2024.01.01.00)
     - RCTRequired
     - RCTTypeSafety
     - React-Core
     - React-cxxreact
     - React-debug
+    - React-Fabric/observers/events (= 0.75.2)
+    - React-featureflags
     - React-graphics
     - React-jsi
     - React-jsiexecutor
@@ -839,17 +984,18 @@ PODS:
     - React-runtimescheduler
     - React-utils
     - ReactCommon/turbomodule/core
-  - React-Fabric/components/text (0.73.4):
+  - React-Fabric/observers/events (0.75.2):
     - DoubleConversion
-    - fmt (~> 6.2.1)
+    - fmt (= 9.1.0)
     - glog
     - hermes-engine
-    - RCT-Folly/Fabric (= 2022.05.16.00)
+    - RCT-Folly/Fabric (= 2024.01.01.00)
     - RCTRequired
     - RCTTypeSafety
     - React-Core
     - React-cxxreact
     - React-debug
+    - React-featureflags
     - React-graphics
     - React-jsi
     - React-jsiexecutor
@@ -858,36 +1004,40 @@ PODS:
     - React-runtimescheduler
     - React-utils
     - ReactCommon/turbomodule/core
-  - React-Fabric/components/textinput (0.73.4):
+  - React-Fabric/scheduler (0.75.2):
     - DoubleConversion
-    - fmt (~> 6.2.1)
+    - fmt (= 9.1.0)
     - glog
     - hermes-engine
-    - RCT-Folly/Fabric (= 2022.05.16.00)
+    - RCT-Folly/Fabric (= 2024.01.01.00)
     - RCTRequired
     - RCTTypeSafety
     - React-Core
     - React-cxxreact
     - React-debug
+    - React-Fabric/observers/events
+    - React-featureflags
     - React-graphics
     - React-jsi
     - React-jsiexecutor
     - React-logger
+    - React-performancetimeline
     - React-rendererdebug
     - React-runtimescheduler
     - React-utils
     - ReactCommon/turbomodule/core
-  - React-Fabric/components/unimplementedview (0.73.4):
+  - React-Fabric/telemetry (0.75.2):
     - DoubleConversion
-    - fmt (~> 6.2.1)
+    - fmt (= 9.1.0)
     - glog
     - hermes-engine
-    - RCT-Folly/Fabric (= 2022.05.16.00)
+    - RCT-Folly/Fabric (= 2024.01.01.00)
     - RCTRequired
     - RCTTypeSafety
     - React-Core
     - React-cxxreact
     - React-debug
+    - React-featureflags
     - React-graphics
     - React-jsi
     - React-jsiexecutor
@@ -896,17 +1046,18 @@ PODS:
     - React-runtimescheduler
     - React-utils
     - ReactCommon/turbomodule/core
-  - React-Fabric/components/view (0.73.4):
+  - React-Fabric/templateprocessor (0.75.2):
     - DoubleConversion
-    - fmt (~> 6.2.1)
+    - fmt (= 9.1.0)
     - glog
     - hermes-engine
-    - RCT-Folly/Fabric (= 2022.05.16.00)
+    - RCT-Folly/Fabric (= 2024.01.01.00)
     - RCTRequired
     - RCTTypeSafety
     - React-Core
     - React-cxxreact
     - React-debug
+    - React-featureflags
     - React-graphics
     - React-jsi
     - React-jsiexecutor
@@ -915,18 +1066,96 @@ PODS:
     - React-runtimescheduler
     - React-utils
     - ReactCommon/turbomodule/core
+  - React-Fabric/uimanager (0.75.2):
+    - DoubleConversion
+    - fmt (= 9.1.0)
+    - glog
+    - hermes-engine
+    - RCT-Folly/Fabric (= 2024.01.01.00)
+    - RCTRequired
+    - RCTTypeSafety
+    - React-Core
+    - React-cxxreact
+    - React-debug
+    - React-Fabric/uimanager/consistency (= 0.75.2)
+    - React-featureflags
+    - React-graphics
+    - React-jsi
+    - React-jsiexecutor
+    - React-logger
+    - React-rendererconsistency
+    - React-rendererdebug
+    - React-runtimescheduler
+    - React-utils
+    - ReactCommon/turbomodule/core
+  - React-Fabric/uimanager/consistency (0.75.2):
+    - DoubleConversion
+    - fmt (= 9.1.0)
+    - glog
+    - hermes-engine
+    - RCT-Folly/Fabric (= 2024.01.01.00)
+    - RCTRequired
+    - RCTTypeSafety
+    - React-Core
+    - React-cxxreact
+    - React-debug
+    - React-featureflags
+    - React-graphics
+    - React-jsi
+    - React-jsiexecutor
+    - React-logger
+    - React-rendererconsistency
+    - React-rendererdebug
+    - React-runtimescheduler
+    - React-utils
+    - ReactCommon/turbomodule/core
+  - React-FabricComponents (0.75.2):
+    - DoubleConversion
+    - fmt (= 9.1.0)
+    - glog
+    - hermes-engine
+    - RCT-Folly/Fabric (= 2024.01.01.00)
+    - RCTRequired
+    - RCTTypeSafety
+    - React-Core
+    - React-cxxreact
+    - React-debug
+    - React-Fabric
+    - React-FabricComponents/components (= 0.75.2)
+    - React-FabricComponents/textlayoutmanager (= 0.75.2)
+    - React-featureflags
+    - React-graphics
+    - React-jsi
+    - React-jsiexecutor
+    - React-logger
+    - React-rendererdebug
+    - React-runtimescheduler
+    - React-utils
+    - ReactCodegen
+    - ReactCommon/turbomodule/core
     - Yoga
-  - React-Fabric/core (0.73.4):
+  - React-FabricComponents/components (0.75.2):
     - DoubleConversion
-    - fmt (~> 6.2.1)
+    - fmt (= 9.1.0)
     - glog
     - hermes-engine
-    - RCT-Folly/Fabric (= 2022.05.16.00)
+    - RCT-Folly/Fabric (= 2024.01.01.00)
     - RCTRequired
     - RCTTypeSafety
     - React-Core
     - React-cxxreact
     - React-debug
+    - React-Fabric
+    - React-FabricComponents/components/inputaccessory (= 0.75.2)
+    - React-FabricComponents/components/iostextinput (= 0.75.2)
+    - React-FabricComponents/components/modal (= 0.75.2)
+    - React-FabricComponents/components/rncore (= 0.75.2)
+    - React-FabricComponents/components/safeareaview (= 0.75.2)
+    - React-FabricComponents/components/scrollview (= 0.75.2)
+    - React-FabricComponents/components/text (= 0.75.2)
+    - React-FabricComponents/components/textinput (= 0.75.2)
+    - React-FabricComponents/components/unimplementedview (= 0.75.2)
+    - React-featureflags
     - React-graphics
     - React-jsi
     - React-jsiexecutor
@@ -934,18 +1163,22 @@ PODS:
     - React-rendererdebug
     - React-runtimescheduler
     - React-utils
+    - ReactCodegen
     - ReactCommon/turbomodule/core
-  - React-Fabric/imagemanager (0.73.4):
+    - Yoga
+  - React-FabricComponents/components/inputaccessory (0.75.2):
     - DoubleConversion
-    - fmt (~> 6.2.1)
+    - fmt (= 9.1.0)
     - glog
     - hermes-engine
-    - RCT-Folly/Fabric (= 2022.05.16.00)
+    - RCT-Folly/Fabric (= 2024.01.01.00)
     - RCTRequired
     - RCTTypeSafety
     - React-Core
     - React-cxxreact
     - React-debug
+    - React-Fabric
+    - React-featureflags
     - React-graphics
     - React-jsi
     - React-jsiexecutor
@@ -953,18 +1186,22 @@ PODS:
     - React-rendererdebug
     - React-runtimescheduler
     - React-utils
+    - ReactCodegen
     - ReactCommon/turbomodule/core
-  - React-Fabric/leakchecker (0.73.4):
+    - Yoga
+  - React-FabricComponents/components/iostextinput (0.75.2):
     - DoubleConversion
-    - fmt (~> 6.2.1)
+    - fmt (= 9.1.0)
     - glog
     - hermes-engine
-    - RCT-Folly/Fabric (= 2022.05.16.00)
+    - RCT-Folly/Fabric (= 2024.01.01.00)
     - RCTRequired
     - RCTTypeSafety
     - React-Core
     - React-cxxreact
     - React-debug
+    - React-Fabric
+    - React-featureflags
     - React-graphics
     - React-jsi
     - React-jsiexecutor
@@ -972,18 +1209,22 @@ PODS:
     - React-rendererdebug
     - React-runtimescheduler
     - React-utils
+    - ReactCodegen
     - ReactCommon/turbomodule/core
-  - React-Fabric/mounting (0.73.4):
+    - Yoga
+  - React-FabricComponents/components/modal (0.75.2):
     - DoubleConversion
-    - fmt (~> 6.2.1)
+    - fmt (= 9.1.0)
     - glog
     - hermes-engine
-    - RCT-Folly/Fabric (= 2022.05.16.00)
+    - RCT-Folly/Fabric (= 2024.01.01.00)
     - RCTRequired
     - RCTTypeSafety
     - React-Core
     - React-cxxreact
     - React-debug
+    - React-Fabric
+    - React-featureflags
     - React-graphics
     - React-jsi
     - React-jsiexecutor
@@ -991,18 +1232,22 @@ PODS:
     - React-rendererdebug
     - React-runtimescheduler
     - React-utils
+    - ReactCodegen
     - ReactCommon/turbomodule/core
-  - React-Fabric/scheduler (0.73.4):
+    - Yoga
+  - React-FabricComponents/components/rncore (0.75.2):
     - DoubleConversion
-    - fmt (~> 6.2.1)
+    - fmt (= 9.1.0)
     - glog
     - hermes-engine
-    - RCT-Folly/Fabric (= 2022.05.16.00)
+    - RCT-Folly/Fabric (= 2024.01.01.00)
     - RCTRequired
     - RCTTypeSafety
     - React-Core
     - React-cxxreact
     - React-debug
+    - React-Fabric
+    - React-featureflags
     - React-graphics
     - React-jsi
     - React-jsiexecutor
@@ -1010,18 +1255,22 @@ PODS:
     - React-rendererdebug
     - React-runtimescheduler
     - React-utils
+    - ReactCodegen
     - ReactCommon/turbomodule/core
-  - React-Fabric/telemetry (0.73.4):
+    - Yoga
+  - React-FabricComponents/components/safeareaview (0.75.2):
     - DoubleConversion
-    - fmt (~> 6.2.1)
+    - fmt (= 9.1.0)
     - glog
     - hermes-engine
-    - RCT-Folly/Fabric (= 2022.05.16.00)
+    - RCT-Folly/Fabric (= 2024.01.01.00)
     - RCTRequired
     - RCTTypeSafety
     - React-Core
     - React-cxxreact
     - React-debug
+    - React-Fabric
+    - React-featureflags
     - React-graphics
     - React-jsi
     - React-jsiexecutor
@@ -1029,18 +1278,22 @@ PODS:
     - React-rendererdebug
     - React-runtimescheduler
     - React-utils
+    - ReactCodegen
     - ReactCommon/turbomodule/core
-  - React-Fabric/templateprocessor (0.73.4):
+    - Yoga
+  - React-FabricComponents/components/scrollview (0.75.2):
     - DoubleConversion
-    - fmt (~> 6.2.1)
+    - fmt (= 9.1.0)
     - glog
     - hermes-engine
-    - RCT-Folly/Fabric (= 2022.05.16.00)
+    - RCT-Folly/Fabric (= 2024.01.01.00)
     - RCTRequired
     - RCTTypeSafety
     - React-Core
     - React-cxxreact
     - React-debug
+    - React-Fabric
+    - React-featureflags
     - React-graphics
     - React-jsi
     - React-jsiexecutor
@@ -1048,19 +1301,22 @@ PODS:
     - React-rendererdebug
     - React-runtimescheduler
     - React-utils
+    - ReactCodegen
     - ReactCommon/turbomodule/core
-  - React-Fabric/textlayoutmanager (0.73.4):
+    - Yoga
+  - React-FabricComponents/components/text (0.75.2):
     - DoubleConversion
-    - fmt (~> 6.2.1)
+    - fmt (= 9.1.0)
     - glog
     - hermes-engine
-    - RCT-Folly/Fabric (= 2022.05.16.00)
+    - RCT-Folly/Fabric (= 2024.01.01.00)
     - RCTRequired
     - RCTTypeSafety
     - React-Core
     - React-cxxreact
     - React-debug
-    - React-Fabric/uimanager
+    - React-Fabric
+    - React-featureflags
     - React-graphics
     - React-jsi
     - React-jsiexecutor
@@ -1068,18 +1324,22 @@ PODS:
     - React-rendererdebug
     - React-runtimescheduler
     - React-utils
+    - ReactCodegen
     - ReactCommon/turbomodule/core
-  - React-Fabric/uimanager (0.73.4):
+    - Yoga
+  - React-FabricComponents/components/textinput (0.75.2):
     - DoubleConversion
-    - fmt (~> 6.2.1)
+    - fmt (= 9.1.0)
     - glog
     - hermes-engine
-    - RCT-Folly/Fabric (= 2022.05.16.00)
+    - RCT-Folly/Fabric (= 2024.01.01.00)
     - RCTRequired
     - RCTTypeSafety
     - React-Core
     - React-cxxreact
     - React-debug
+    - React-Fabric
+    - React-featureflags
     - React-graphics
     - React-jsi
     - React-jsiexecutor
@@ -1087,43 +1347,138 @@ PODS:
     - React-rendererdebug
     - React-runtimescheduler
     - React-utils
+    - ReactCodegen
     - ReactCommon/turbomodule/core
-  - React-FabricImage (0.73.4):
+    - Yoga
+  - React-FabricComponents/components/unimplementedview (0.75.2):
     - DoubleConversion
-    - fmt (~> 6.2.1)
+    - fmt (= 9.1.0)
     - glog
     - hermes-engine
-    - RCT-Folly/Fabric (= 2022.05.16.00)
-    - RCTRequired (= 0.73.4)
-    - RCTTypeSafety (= 0.73.4)
+    - RCT-Folly/Fabric (= 2024.01.01.00)
+    - RCTRequired
+    - RCTTypeSafety
+    - React-Core
+    - React-cxxreact
+    - React-debug
+    - React-Fabric
+    - React-featureflags
+    - React-graphics
+    - React-jsi
+    - React-jsiexecutor
+    - React-logger
+    - React-rendererdebug
+    - React-runtimescheduler
+    - React-utils
+    - ReactCodegen
+    - ReactCommon/turbomodule/core
+    - Yoga
+  - React-FabricComponents/textlayoutmanager (0.75.2):
+    - DoubleConversion
+    - fmt (= 9.1.0)
+    - glog
+    - hermes-engine
+    - RCT-Folly/Fabric (= 2024.01.01.00)
+    - RCTRequired
+    - RCTTypeSafety
+    - React-Core
+    - React-cxxreact
+    - React-debug
+    - React-Fabric
+    - React-featureflags
+    - React-graphics
+    - React-jsi
+    - React-jsiexecutor
+    - React-logger
+    - React-rendererdebug
+    - React-runtimescheduler
+    - React-utils
+    - ReactCodegen
+    - ReactCommon/turbomodule/core
+    - Yoga
+  - React-FabricImage (0.75.2):
+    - DoubleConversion
+    - fmt (= 9.1.0)
+    - glog
+    - hermes-engine
+    - RCT-Folly/Fabric (= 2024.01.01.00)
+    - RCTRequired (= 0.75.2)
+    - RCTTypeSafety (= 0.75.2)
     - React-Fabric
     - React-graphics
     - React-ImageManager
     - React-jsi
-    - React-jsiexecutor (= 0.73.4)
+    - React-jsiexecutor (= 0.75.2)
     - React-logger
     - React-rendererdebug
     - React-utils
     - ReactCommon
     - Yoga
-  - React-graphics (0.73.4):
+  - React-featureflags (0.75.2)
+  - React-featureflagsnativemodule (0.75.2):
+    - DoubleConversion
+    - glog
+    - hermes-engine
+    - RCT-Folly (= 2024.01.01.00)
+    - RCTRequired
+    - RCTTypeSafety
+    - React-Core
+    - React-debug
+    - React-Fabric
+    - React-featureflags
+    - React-graphics
+    - React-ImageManager
+    - React-NativeModulesApple
+    - React-RCTFabric
+    - React-rendererdebug
+    - React-utils
+    - ReactCodegen
+    - ReactCommon/turbomodule/bridging
+    - ReactCommon/turbomodule/core
+    - Yoga
+  - React-graphics (0.75.2):
+    - DoubleConversion
+    - fmt (= 9.1.0)
     - glog
-    - RCT-Folly/Fabric (= 2022.05.16.00)
-    - React-Core/Default (= 0.73.4)
+    - RCT-Folly/Fabric (= 2024.01.01.00)
+    - React-jsi
+    - React-jsiexecutor
     - React-utils
-  - React-hermes (0.73.4):
+  - React-hermes (0.75.2):
     - DoubleConversion
-    - fmt (~> 6.2.1)
+    - fmt (= 9.1.0)
     - glog
     - hermes-engine
-    - RCT-Folly (= 2022.05.16.00)
-    - RCT-Folly/Futures (= 2022.05.16.00)
-    - React-cxxreact (= 0.73.4)
+    - RCT-Folly (= 2024.01.01.00)
+    - React-cxxreact (= 0.75.2)
     - React-jsi
-    - React-jsiexecutor (= 0.73.4)
-    - React-jsinspector (= 0.73.4)
-    - React-perflogger (= 0.73.4)
-  - React-ImageManager (0.73.4):
+    - React-jsiexecutor (= 0.75.2)
+    - React-jsinspector
+    - React-perflogger (= 0.75.2)
+    - React-runtimeexecutor
+  - React-idlecallbacksnativemodule (0.75.2):
+    - DoubleConversion
+    - glog
+    - hermes-engine
+    - RCT-Folly (= 2024.01.01.00)
+    - RCTRequired
+    - RCTTypeSafety
+    - React-Core
+    - React-debug
+    - React-Fabric
+    - React-featureflags
+    - React-graphics
+    - React-ImageManager
+    - React-NativeModulesApple
+    - React-RCTFabric
+    - React-rendererdebug
+    - React-runtimescheduler
+    - React-utils
+    - ReactCodegen
+    - ReactCommon/turbomodule/bridging
+    - ReactCommon/turbomodule/core
+    - Yoga
+  - React-ImageManager (0.75.2):
     - glog
     - RCT-Folly/Fabric
     - React-Core/Default
@@ -1132,90 +1487,124 @@ PODS:
     - React-graphics
     - React-rendererdebug
     - React-utils
-  - React-jserrorhandler (0.73.4):
-    - RCT-Folly/Fabric (= 2022.05.16.00)
+  - React-jserrorhandler (0.75.2):
+    - RCT-Folly/Fabric (= 2024.01.01.00)
     - React-debug
     - React-jsi
-    - React-Mapbuffer
-  - React-jsi (0.73.4):
-    - boost (= 1.83.0)
+  - React-jsi (0.75.2):
+    - boost
     - DoubleConversion
-    - fmt (~> 6.2.1)
+    - fmt (= 9.1.0)
     - glog
     - hermes-engine
-    - RCT-Folly (= 2022.05.16.00)
-  - React-jsiexecutor (0.73.4):
+    - RCT-Folly (= 2024.01.01.00)
+  - React-jsiexecutor (0.75.2):
     - DoubleConversion
-    - fmt (~> 6.2.1)
+    - fmt (= 9.1.0)
     - glog
     - hermes-engine
-    - RCT-Folly (= 2022.05.16.00)
-    - React-cxxreact (= 0.73.4)
-    - React-jsi (= 0.73.4)
-    - React-perflogger (= 0.73.4)
-  - React-jsinspector (0.73.4)
-  - React-jsitracing (0.73.4):
+    - RCT-Folly (= 2024.01.01.00)
+    - React-cxxreact (= 0.75.2)
+    - React-jsi (= 0.75.2)
+    - React-jsinspector
+    - React-perflogger (= 0.75.2)
+  - React-jsinspector (0.75.2):
+    - DoubleConversion
+    - glog
+    - hermes-engine
+    - RCT-Folly (= 2024.01.01.00)
+    - React-featureflags
+    - React-jsi
+    - React-runtimeexecutor (= 0.75.2)
+  - React-jsitracing (0.75.2):
     - React-jsi
-  - React-logger (0.73.4):
+  - React-logger (0.75.2):
     - glog
-  - React-Mapbuffer (0.73.4):
+  - React-Mapbuffer (0.75.2):
     - glog
     - React-debug
-  - react-native-airship (17.2.1):
-    - AirshipFrameworkProxy (= 5.1.1)
+  - React-microtasksnativemodule (0.75.2):
+    - DoubleConversion
     - glog
     - hermes-engine
-    - RCT-Folly (= 2022.05.16.00)
+    - RCT-Folly (= 2024.01.01.00)
     - RCTRequired
     - RCTTypeSafety
-    - React-Codegen
     - React-Core
     - React-debug
     - React-Fabric
+    - React-featureflags
     - React-graphics
     - React-ImageManager
     - React-NativeModulesApple
     - React-RCTFabric
     - React-rendererdebug
     - React-utils
+    - ReactCodegen
+    - ReactCommon/turbomodule/bridging
+    - ReactCommon/turbomodule/core
+    - Yoga
+  - react-native-airship (19.2.1):
+    - AirshipFrameworkProxy (= 7.1.2)
+    - DoubleConversion
+    - glog
+    - hermes-engine
+    - RCT-Folly (= 2024.01.01.00)
+    - RCTRequired
+    - RCTTypeSafety
+    - React-Core
+    - React-debug
+    - React-Fabric
+    - React-featureflags
+    - React-graphics
+    - React-ImageManager
+    - React-NativeModulesApple
+    - React-RCTFabric
+    - React-rendererdebug
+    - React-utils
+    - ReactCodegen
     - ReactCommon/turbomodule/bridging
     - ReactCommon/turbomodule/core
     - Yoga
   - react-native-blob-util (0.19.4):
+    - DoubleConversion
     - glog
     - hermes-engine
-    - RCT-Folly (= 2022.05.16.00)
+    - RCT-Folly (= 2024.01.01.00)
     - RCTRequired
     - RCTTypeSafety
-    - React-Codegen
     - React-Core
     - React-debug
     - React-Fabric
+    - React-featureflags
     - React-graphics
     - React-ImageManager
     - React-NativeModulesApple
     - React-RCTFabric
     - React-rendererdebug
     - React-utils
+    - ReactCodegen
     - ReactCommon/turbomodule/bridging
     - ReactCommon/turbomodule/core
     - Yoga
   - react-native-cameraroll (7.4.0):
+    - DoubleConversion
     - glog
     - hermes-engine
-    - RCT-Folly (= 2022.05.16.00)
+    - RCT-Folly (= 2024.01.01.00)
     - RCTRequired
     - RCTTypeSafety
-    - React-Codegen
     - React-Core
     - React-debug
     - React-Fabric
+    - React-featureflags
     - React-graphics
     - React-ImageManager
     - React-NativeModulesApple
     - React-RCTFabric
     - React-rendererdebug
     - React-utils
+    - ReactCodegen
     - ReactCommon/turbomodule/bridging
     - ReactCommon/turbomodule/core
     - Yoga
@@ -1230,28 +1619,44 @@ PODS:
     - React-RCTFabric
     - ReactCommon/turbomodule/core
   - react-native-document-picker (9.1.1):
-    - RCT-Folly
+    - DoubleConversion
+    - glog
+    - hermes-engine
+    - RCT-Folly (= 2024.01.01.00)
     - RCTRequired
     - RCTTypeSafety
-    - React-Codegen
     - React-Core
+    - React-debug
+    - React-Fabric
+    - React-featureflags
+    - React-graphics
+    - React-ImageManager
+    - React-NativeModulesApple
+    - React-RCTFabric
+    - React-rendererdebug
+    - React-utils
+    - ReactCodegen
+    - ReactCommon/turbomodule/bridging
     - ReactCommon/turbomodule/core
-  - react-native-geolocation (3.2.1):
+    - Yoga
+  - react-native-geolocation (3.3.0):
+    - DoubleConversion
     - glog
     - hermes-engine
-    - RCT-Folly (= 2022.05.16.00)
+    - RCT-Folly (= 2024.01.01.00)
     - RCTRequired
     - RCTTypeSafety
-    - React-Codegen
     - React-Core
     - React-debug
     - React-Fabric
+    - React-featureflags
     - React-graphics
     - React-ImageManager
     - React-NativeModulesApple
     - React-RCTFabric
     - React-rendererdebug
     - React-utils
+    - ReactCodegen
     - ReactCommon/turbomodule/bridging
     - ReactCommon/turbomodule/core
     - Yoga
@@ -1264,212 +1669,274 @@ PODS:
     - React-RCTFabric
     - ReactCommon/turbomodule/core
   - react-native-key-command (1.0.8):
+    - DoubleConversion
     - glog
     - hermes-engine
-    - RCT-Folly (= 2022.05.16.00)
+    - RCT-Folly (= 2024.01.01.00)
+    - RCTRequired
+    - RCTTypeSafety
+    - React-Core
+    - React-debug
+    - React-Fabric
+    - React-featureflags
+    - React-graphics
+    - React-ImageManager
+    - React-NativeModulesApple
+    - React-RCTFabric
+    - React-rendererdebug
+    - React-utils
+    - ReactCodegen
+    - ReactCommon/turbomodule/bridging
+    - ReactCommon/turbomodule/core
+    - Yoga
+  - react-native-keyboard-controller (1.12.2):
+    - DoubleConversion
+    - glog
+    - hermes-engine
+    - RCT-Folly (= 2024.01.01.00)
     - RCTRequired
     - RCTTypeSafety
-    - React-Codegen
     - React-Core
     - React-debug
     - React-Fabric
+    - React-featureflags
     - React-graphics
     - React-ImageManager
     - React-NativeModulesApple
     - React-RCTFabric
     - React-rendererdebug
     - React-utils
+    - ReactCodegen
     - ReactCommon/turbomodule/bridging
     - ReactCommon/turbomodule/core
     - Yoga
   - react-native-launch-arguments (4.0.2):
     - React
   - react-native-netinfo (11.2.1):
+    - DoubleConversion
     - glog
     - hermes-engine
-    - RCT-Folly (= 2022.05.16.00)
+    - RCT-Folly (= 2024.01.01.00)
     - RCTRequired
     - RCTTypeSafety
-    - React-Codegen
     - React-Core
     - React-debug
     - React-Fabric
+    - React-featureflags
     - React-graphics
     - React-ImageManager
     - React-NativeModulesApple
     - React-RCTFabric
     - React-rendererdebug
     - React-utils
+    - ReactCodegen
     - ReactCommon/turbomodule/bridging
     - ReactCommon/turbomodule/core
     - Yoga
-  - react-native-pager-view (6.2.3):
+  - react-native-pager-view (6.3.4):
+    - DoubleConversion
     - glog
     - hermes-engine
-    - RCT-Folly (= 2022.05.16.00)
+    - RCT-Folly (= 2024.01.01.00)
     - RCTRequired
     - RCTTypeSafety
-    - React-Codegen
     - React-Core
     - React-debug
     - React-Fabric
+    - React-featureflags
     - React-graphics
     - React-ImageManager
+    - react-native-pager-view/common (= 6.3.4)
     - React-NativeModulesApple
     - React-RCTFabric
     - React-rendererdebug
     - React-utils
+    - ReactCodegen
+    - ReactCommon/turbomodule/bridging
+    - ReactCommon/turbomodule/core
+    - Yoga
+  - react-native-pager-view/common (6.3.4):
+    - DoubleConversion
+    - glog
+    - hermes-engine
+    - RCT-Folly (= 2024.01.01.00)
+    - RCTRequired
+    - RCTTypeSafety
+    - React-Core
+    - React-debug
+    - React-Fabric
+    - React-featureflags
+    - React-graphics
+    - React-ImageManager
+    - React-NativeModulesApple
+    - React-RCTFabric
+    - React-rendererdebug
+    - React-utils
+    - ReactCodegen
     - ReactCommon/turbomodule/bridging
     - ReactCommon/turbomodule/core
     - Yoga
   - react-native-pdf (6.7.3):
+    - DoubleConversion
     - glog
     - hermes-engine
-    - RCT-Folly (= 2022.05.16.00)
+    - RCT-Folly (= 2024.01.01.00)
     - RCTRequired
     - RCTTypeSafety
-    - React-Codegen
     - React-Core
     - React-debug
     - React-Fabric
+    - React-featureflags
     - React-graphics
     - React-ImageManager
     - React-NativeModulesApple
     - React-RCTFabric
     - React-rendererdebug
     - React-utils
+    - ReactCodegen
     - ReactCommon/turbomodule/bridging
     - ReactCommon/turbomodule/core
     - Yoga
   - react-native-performance (5.1.0):
+    - DoubleConversion
     - glog
     - hermes-engine
-    - RCT-Folly (= 2022.05.16.00)
+    - RCT-Folly (= 2024.01.01.00)
     - RCTRequired
     - RCTTypeSafety
-    - React-Codegen
     - React-Core
     - React-debug
     - React-Fabric
+    - React-featureflags
     - React-graphics
     - React-ImageManager
     - React-NativeModulesApple
     - React-RCTFabric
     - React-rendererdebug
     - React-utils
+    - ReactCodegen
     - ReactCommon/turbomodule/bridging
     - ReactCommon/turbomodule/core
     - Yoga
-  - react-native-plaid-link-sdk (11.5.0):
+  - react-native-plaid-link-sdk (11.11.0):
+    - DoubleConversion
     - glog
     - hermes-engine
-    - Plaid (~> 5.2.0)
-    - RCT-Folly (= 2022.05.16.00)
+    - Plaid (~> 5.6.0)
+    - RCT-Folly (= 2024.01.01.00)
     - RCTRequired
     - RCTTypeSafety
-    - React-Codegen
     - React-Core
     - React-debug
     - React-Fabric
+    - React-featureflags
     - React-graphics
     - React-ImageManager
     - React-NativeModulesApple
     - React-RCTFabric
     - React-rendererdebug
     - React-utils
+    - ReactCodegen
     - ReactCommon/turbomodule/bridging
     - ReactCommon/turbomodule/core
     - Yoga
   - react-native-quick-sqlite (8.0.6):
+    - DoubleConversion
     - glog
     - hermes-engine
-    - RCT-Folly (= 2022.05.16.00)
+    - RCT-Folly (= 2024.01.01.00)
     - RCTRequired
     - RCTTypeSafety
-    - React-Codegen
     - React-Core
     - React-debug
     - React-Fabric
+    - React-featureflags
     - React-graphics
     - React-ImageManager
     - React-NativeModulesApple
     - React-RCTFabric
     - React-rendererdebug
     - React-utils
+    - ReactCodegen
     - ReactCommon/turbomodule/bridging
     - ReactCommon/turbomodule/core
     - Yoga
-  - react-native-release-profiler (0.1.6):
+  - react-native-release-profiler (0.2.1):
+    - DoubleConversion
     - glog
     - hermes-engine
-    - RCT-Folly (= 2022.05.16.00)
+    - RCT-Folly (= 2024.01.01.00)
     - RCTRequired
     - RCTTypeSafety
-    - React-Codegen
     - React-Core
     - React-debug
     - React-Fabric
+    - React-featureflags
     - React-graphics
     - React-ImageManager
     - React-NativeModulesApple
     - React-RCTFabric
     - React-rendererdebug
     - React-utils
+    - ReactCodegen
     - ReactCommon/turbomodule/bridging
     - ReactCommon/turbomodule/core
     - Yoga
-  - react-native-render-html (6.3.1):
-    - React-Core
-  - react-native-safe-area-context (4.8.2):
+  - react-native-safe-area-context (4.10.9):
+    - DoubleConversion
     - glog
     - hermes-engine
-    - RCT-Folly (= 2022.05.16.00)
+    - RCT-Folly (= 2024.01.01.00)
     - RCTRequired
     - RCTTypeSafety
-    - React-Codegen
     - React-Core
     - React-debug
     - React-Fabric
+    - React-featureflags
     - React-graphics
     - React-ImageManager
-    - react-native-safe-area-context/common (= 4.8.2)
-    - react-native-safe-area-context/fabric (= 4.8.2)
+    - react-native-safe-area-context/common (= 4.10.9)
+    - react-native-safe-area-context/fabric (= 4.10.9)
     - React-NativeModulesApple
     - React-RCTFabric
     - React-rendererdebug
     - React-utils
+    - ReactCodegen
     - ReactCommon/turbomodule/bridging
     - ReactCommon/turbomodule/core
     - Yoga
-  - react-native-safe-area-context/common (4.8.2):
+  - react-native-safe-area-context/common (4.10.9):
+    - DoubleConversion
     - glog
     - hermes-engine
-    - RCT-Folly (= 2022.05.16.00)
+    - RCT-Folly (= 2024.01.01.00)
     - RCTRequired
     - RCTTypeSafety
-    - React-Codegen
     - React-Core
     - React-debug
     - React-Fabric
+    - React-featureflags
     - React-graphics
     - React-ImageManager
     - React-NativeModulesApple
     - React-RCTFabric
     - React-rendererdebug
     - React-utils
+    - ReactCodegen
     - ReactCommon/turbomodule/bridging
     - ReactCommon/turbomodule/core
     - Yoga
-  - react-native-safe-area-context/fabric (4.8.2):
+  - react-native-safe-area-context/fabric (4.10.9):
+    - DoubleConversion
     - glog
     - hermes-engine
-    - RCT-Folly (= 2022.05.16.00)
+    - RCT-Folly (= 2024.01.01.00)
     - RCTRequired
     - RCTTypeSafety
-    - React-Codegen
     - React-Core
     - React-debug
     - React-Fabric
+    - React-featureflags
     - React-graphics
     - React-ImageManager
     - react-native-safe-area-context/common
@@ -1477,60 +1944,69 @@ PODS:
     - React-RCTFabric
     - React-rendererdebug
     - React-utils
+    - ReactCodegen
     - ReactCommon/turbomodule/bridging
     - ReactCommon/turbomodule/core
     - Yoga
   - react-native-view-shot (3.8.0):
     - React-Core
-  - react-native-webview (13.6.4):
+  - react-native-webview (13.8.6):
+    - DoubleConversion
     - glog
     - hermes-engine
-    - RCT-Folly (= 2022.05.16.00)
+    - RCT-Folly (= 2024.01.01.00)
     - RCTRequired
     - RCTTypeSafety
-    - React-Codegen
     - React-Core
     - React-debug
     - React-Fabric
+    - React-featureflags
     - React-graphics
     - React-ImageManager
     - React-NativeModulesApple
     - React-RCTFabric
     - React-rendererdebug
     - React-utils
+    - ReactCodegen
     - ReactCommon/turbomodule/bridging
     - ReactCommon/turbomodule/core
     - Yoga
-  - React-nativeconfig (0.73.4)
-  - React-NativeModulesApple (0.73.4):
+  - React-nativeconfig (0.75.2)
+  - React-NativeModulesApple (0.75.2):
     - glog
     - hermes-engine
     - React-callinvoker
     - React-Core
     - React-cxxreact
     - React-jsi
+    - React-jsinspector
     - React-runtimeexecutor
     - ReactCommon/turbomodule/bridging
     - ReactCommon/turbomodule/core
-  - React-perflogger (0.73.4)
-  - React-RCTActionSheet (0.73.4):
-    - React-Core/RCTActionSheetHeaders (= 0.73.4)
-  - React-RCTAnimation (0.73.4):
-    - RCT-Folly (= 2022.05.16.00)
+  - React-perflogger (0.75.2)
+  - React-performancetimeline (0.75.2):
+    - RCT-Folly (= 2024.01.01.00)
+    - React-cxxreact
+  - React-RCTActionSheet (0.75.2):
+    - React-Core/RCTActionSheetHeaders (= 0.75.2)
+  - React-RCTAnimation (0.75.2):
+    - RCT-Folly (= 2024.01.01.00)
     - RCTTypeSafety
-    - React-Codegen
     - React-Core/RCTAnimationHeaders
     - React-jsi
     - React-NativeModulesApple
+    - ReactCodegen
     - ReactCommon
-  - React-RCTAppDelegate (0.73.4):
-    - RCT-Folly
+  - React-RCTAppDelegate (0.75.2):
+    - RCT-Folly (= 2024.01.01.00)
     - RCTRequired
     - RCTTypeSafety
     - React-Core
     - React-CoreModules
     - React-debug
+    - React-defaultsnativemodule
     - React-Fabric
+    - React-featureflags
     - React-graphics
     - React-hermes
     - React-nativeconfig
@@ -1544,86 +2020,96 @@ PODS:
     - React-RuntimeHermes
     - React-runtimescheduler
     - React-utils
+    - ReactCodegen
     - ReactCommon
-  - React-RCTBlob (0.73.4):
+  - React-RCTBlob (0.75.2):
+    - DoubleConversion
+    - fmt (= 9.1.0)
     - hermes-engine
-    - RCT-Folly (= 2022.05.16.00)
-    - React-Codegen
+    - RCT-Folly (= 2024.01.01.00)
     - React-Core/RCTBlobHeaders
     - React-Core/RCTWebSocket
     - React-jsi
+    - React-jsinspector
     - React-NativeModulesApple
     - React-RCTNetwork
+    - ReactCodegen
     - ReactCommon
-  - React-RCTFabric (0.73.4):
+  - React-RCTFabric (0.75.2):
     - glog
     - hermes-engine
-    - RCT-Folly/Fabric (= 2022.05.16.00)
+    - RCT-Folly/Fabric (= 2024.01.01.00)
     - React-Core
     - React-debug
     - React-Fabric
+    - React-FabricComponents
     - React-FabricImage
+    - React-featureflags
     - React-graphics
     - React-ImageManager
     - React-jsi
+    - React-jsinspector
     - React-nativeconfig
+    - React-performancetimeline
     - React-RCTImage
     - React-RCTText
+    - React-rendererconsistency
     - React-rendererdebug
     - React-runtimescheduler
     - React-utils
     - Yoga
-  - React-RCTImage (0.73.4):
-    - RCT-Folly (= 2022.05.16.00)
+  - React-RCTImage (0.75.2):
+    - RCT-Folly (= 2024.01.01.00)
     - RCTTypeSafety
-    - React-Codegen
     - React-Core/RCTImageHeaders
     - React-jsi
     - React-NativeModulesApple
     - React-RCTNetwork
+    - ReactCodegen
     - ReactCommon
-  - React-RCTLinking (0.73.4):
-    - React-Codegen
-    - React-Core/RCTLinkingHeaders (= 0.73.4)
-    - React-jsi (= 0.73.4)
+  - React-RCTLinking (0.75.2):
+    - React-Core/RCTLinkingHeaders (= 0.75.2)
+    - React-jsi (= 0.75.2)
     - React-NativeModulesApple
+    - ReactCodegen
     - ReactCommon
-    - ReactCommon/turbomodule/core (= 0.73.4)
-  - React-RCTNetwork (0.73.4):
-    - RCT-Folly (= 2022.05.16.00)
+    - ReactCommon/turbomodule/core (= 0.75.2)
+  - React-RCTNetwork (0.75.2):
+    - RCT-Folly (= 2024.01.01.00)
     - RCTTypeSafety
-    - React-Codegen
     - React-Core/RCTNetworkHeaders
     - React-jsi
     - React-NativeModulesApple
+    - ReactCodegen
     - ReactCommon
-  - React-RCTSettings (0.73.4):
-    - RCT-Folly (= 2022.05.16.00)
+  - React-RCTSettings (0.75.2):
+    - RCT-Folly (= 2024.01.01.00)
     - RCTTypeSafety
-    - React-Codegen
     - React-Core/RCTSettingsHeaders
     - React-jsi
     - React-NativeModulesApple
+    - ReactCodegen
     - ReactCommon
-  - React-RCTText (0.73.4):
-    - React-Core/RCTTextHeaders (= 0.73.4)
+  - React-RCTText (0.75.2):
+    - React-Core/RCTTextHeaders (= 0.75.2)
     - Yoga
-  - React-RCTVibration (0.73.4):
-    - RCT-Folly (= 2022.05.16.00)
-    - React-Codegen
+  - React-RCTVibration (0.75.2):
+    - RCT-Folly (= 2024.01.01.00)
     - React-Core/RCTVibrationHeaders
     - React-jsi
     - React-NativeModulesApple
+    - ReactCodegen
     - ReactCommon
-  - React-rendererdebug (0.73.4):
+  - React-rendererconsistency (0.75.2)
+  - React-rendererdebug (0.75.2):
     - DoubleConversion
-    - fmt (~> 6.2.1)
-    - RCT-Folly (= 2022.05.16.00)
+    - fmt (= 9.1.0)
+    - RCT-Folly (= 2024.01.01.00)
     - React-debug
-  - React-rncore (0.73.4)
-  - React-RuntimeApple (0.73.4):
+  - React-rncore (0.75.2)
+  - React-RuntimeApple (0.75.2):
     - hermes-engine
-    - RCT-Folly/Fabric (= 2022.05.16.00)
+    - RCT-Folly/Fabric (= 2024.01.01.00)
     - React-callinvoker
     - React-Core/Default
     - React-CoreModules
@@ -1631,141 +2117,182 @@ PODS:
     - React-jserrorhandler
     - React-jsi
     - React-jsiexecutor
+    - React-jsinspector
     - React-Mapbuffer
     - React-NativeModulesApple
     - React-RCTFabric
     - React-RuntimeCore
     - React-runtimeexecutor
     - React-RuntimeHermes
+    - React-runtimescheduler
     - React-utils
-  - React-RuntimeCore (0.73.4):
+  - React-RuntimeCore (0.75.2):
     - glog
     - hermes-engine
-    - RCT-Folly/Fabric (= 2022.05.16.00)
+    - RCT-Folly/Fabric (= 2024.01.01.00)
     - React-cxxreact
+    - React-featureflags
     - React-jserrorhandler
     - React-jsi
     - React-jsiexecutor
+    - React-jsinspector
     - React-runtimeexecutor
     - React-runtimescheduler
-  - React-runtimeexecutor (0.73.4):
-    - React-jsi (= 0.73.4)
-  - React-RuntimeHermes (0.73.4):
+    - React-utils
+  - React-runtimeexecutor (0.75.2):
+    - React-jsi (= 0.75.2)
+  - React-RuntimeHermes (0.75.2):
     - hermes-engine
-    - RCT-Folly/Fabric (= 2022.05.16.00)
+    - RCT-Folly/Fabric (= 2024.01.01.00)
+    - React-featureflags
+    - React-hermes
     - React-jsi
+    - React-jsinspector
     - React-jsitracing
     - React-nativeconfig
+    - React-RuntimeCore
     - React-utils
-  - React-runtimescheduler (0.73.4):
+  - React-runtimescheduler (0.75.2):
     - glog
     - hermes-engine
-    - RCT-Folly (= 2022.05.16.00)
+    - RCT-Folly (= 2024.01.01.00)
     - React-callinvoker
     - React-cxxreact
     - React-debug
+    - React-featureflags
     - React-jsi
+    - React-rendererconsistency
     - React-rendererdebug
     - React-runtimeexecutor
     - React-utils
-  - React-utils (0.73.4):
+  - React-utils (0.75.2):
     - glog
-    - RCT-Folly (= 2022.05.16.00)
+    - hermes-engine
+    - RCT-Folly (= 2024.01.01.00)
     - React-debug
-  - ReactCommon (0.73.4):
-    - React-logger (= 0.73.4)
-    - ReactCommon/turbomodule (= 0.73.4)
-  - ReactCommon/turbomodule (0.73.4):
+    - React-jsi (= 0.75.2)
+  - ReactCodegen (0.75.2):
     - DoubleConversion
-    - fmt (~> 6.2.1)
     - glog
     - hermes-engine
-    - RCT-Folly (= 2022.05.16.00)
-    - React-callinvoker (= 0.73.4)
-    - React-cxxreact (= 0.73.4)
-    - React-jsi (= 0.73.4)
-    - React-logger (= 0.73.4)
-    - React-perflogger (= 0.73.4)
-    - ReactCommon/turbomodule/bridging (= 0.73.4)
-    - ReactCommon/turbomodule/core (= 0.73.4)
-  - ReactCommon/turbomodule/bridging (0.73.4):
+    - RCT-Folly
+    - RCTRequired
+    - RCTTypeSafety
+    - React-Core
+    - React-debug
+    - React-Fabric
+    - React-FabricImage
+    - React-featureflags
+    - React-graphics
+    - React-jsi
+    - React-jsiexecutor
+    - React-NativeModulesApple
+    - React-rendererdebug
+    - React-utils
+    - ReactCommon/turbomodule/bridging
+    - ReactCommon/turbomodule/core
+  - ReactCommon (0.75.2):
+    - ReactCommon/turbomodule (= 0.75.2)
+  - ReactCommon/turbomodule (0.75.2):
     - DoubleConversion
-    - fmt (~> 6.2.1)
-    - glog
-    - hermes-engine
-    - RCT-Folly (= 2022.05.16.00)
-    - React-callinvoker (= 0.73.4)
-    - React-cxxreact (= 0.73.4)
-    - React-jsi (= 0.73.4)
-    - React-logger (= 0.73.4)
-    - React-perflogger (= 0.73.4)
-  - ReactCommon/turbomodule/core (0.73.4):
+    - fmt (= 9.1.0)
+    - glog
+    - hermes-engine
+    - RCT-Folly (= 2024.01.01.00)
+    - React-callinvoker (= 0.75.2)
+    - React-cxxreact (= 0.75.2)
+    - React-jsi (= 0.75.2)
+    - React-logger (= 0.75.2)
+    - React-perflogger (= 0.75.2)
+    - ReactCommon/turbomodule/bridging (= 0.75.2)
+    - ReactCommon/turbomodule/core (= 0.75.2)
+  - ReactCommon/turbomodule/bridging (0.75.2):
     - DoubleConversion
-    - fmt (~> 6.2.1)
+    - fmt (= 9.1.0)
     - glog
     - hermes-engine
-    - RCT-Folly (= 2022.05.16.00)
-    - React-callinvoker (= 0.73.4)
-    - React-cxxreact (= 0.73.4)
-    - React-jsi (= 0.73.4)
-    - React-logger (= 0.73.4)
-    - React-perflogger (= 0.73.4)
+    - RCT-Folly (= 2024.01.01.00)
+    - React-callinvoker (= 0.75.2)
+    - React-cxxreact (= 0.75.2)
+    - React-jsi (= 0.75.2)
+    - React-logger (= 0.75.2)
+    - React-perflogger (= 0.75.2)
+  - ReactCommon/turbomodule/core (0.75.2):
+    - DoubleConversion
+    - fmt (= 9.1.0)
+    - glog
+    - hermes-engine
+    - RCT-Folly (= 2024.01.01.00)
+    - React-callinvoker (= 0.75.2)
+    - React-cxxreact (= 0.75.2)
+    - React-debug (= 0.75.2)
+    - React-featureflags (= 0.75.2)
+    - React-jsi (= 0.75.2)
+    - React-logger (= 0.75.2)
+    - React-perflogger (= 0.75.2)
+    - React-utils (= 0.75.2)
   - RNAppleAuthentication (2.2.2):
     - React-Core
-  - RNCClipboard (1.13.2):
+  - RNCClipboard (1.14.0):
+    - DoubleConversion
     - glog
     - hermes-engine
-    - RCT-Folly (= 2022.05.16.00)
+    - RCT-Folly (= 2024.01.01.00)
     - RCTRequired
     - RCTTypeSafety
-    - React-Codegen
     - React-Core
     - React-debug
     - React-Fabric
+    - React-featureflags
     - React-graphics
     - React-ImageManager
     - React-NativeModulesApple
     - React-RCTFabric
     - React-rendererdebug
     - React-utils
+    - ReactCodegen
     - ReactCommon/turbomodule/bridging
     - ReactCommon/turbomodule/core
     - Yoga
-  - RNCPicker (2.6.1):
+  - RNCPicker (2.7.6):
+    - DoubleConversion
     - glog
     - hermes-engine
-    - RCT-Folly (= 2022.05.16.00)
+    - RCT-Folly (= 2024.01.01.00)
     - RCTRequired
     - RCTTypeSafety
-    - React-Codegen
     - React-Core
     - React-debug
     - React-Fabric
+    - React-featureflags
     - React-graphics
     - React-ImageManager
     - React-NativeModulesApple
     - React-RCTFabric
     - React-rendererdebug
     - React-utils
+    - ReactCodegen
     - ReactCommon/turbomodule/bridging
     - ReactCommon/turbomodule/core
     - Yoga
   - RNDeviceInfo (10.3.1):
+    - DoubleConversion
     - glog
     - hermes-engine
-    - RCT-Folly (= 2022.05.16.00)
+    - RCT-Folly (= 2024.01.01.00)
     - RCTRequired
     - RCTTypeSafety
-    - React-Codegen
     - React-Core
     - React-debug
     - React-Fabric
+    - React-featureflags
     - React-graphics
     - React-ImageManager
     - React-NativeModulesApple
     - React-RCTFabric
     - React-rendererdebug
     - React-utils
+    - ReactCodegen
     - ReactCommon/turbomodule/bridging
     - ReactCommon/turbomodule/core
     - Yoga
@@ -1785,281 +2312,334 @@ PODS:
     - React-Core
     - RNFBApp
   - RNFlashList (1.6.3):
+    - DoubleConversion
     - glog
     - hermes-engine
-    - RCT-Folly (= 2022.05.16.00)
+    - RCT-Folly (= 2024.01.01.00)
     - RCTRequired
     - RCTTypeSafety
-    - React-Codegen
     - React-Core
     - React-debug
     - React-Fabric
+    - React-featureflags
     - React-graphics
     - React-ImageManager
     - React-NativeModulesApple
     - React-RCTFabric
     - React-rendererdebug
     - React-utils
+    - ReactCodegen
     - ReactCommon/turbomodule/bridging
     - ReactCommon/turbomodule/core
     - Yoga
   - RNFS (2.20.0):
     - React-Core
-  - RNGestureHandler (2.14.1):
+  - RNGestureHandler (2.18.0):
+    - DoubleConversion
     - glog
     - hermes-engine
-    - RCT-Folly (= 2022.05.16.00)
+    - RCT-Folly (= 2024.01.01.00)
     - RCTRequired
     - RCTTypeSafety
-    - React-Codegen
     - React-Core
     - React-debug
     - React-Fabric
+    - React-featureflags
     - React-graphics
     - React-ImageManager
     - React-NativeModulesApple
     - React-RCTFabric
     - React-rendererdebug
     - React-utils
+    - ReactCodegen
     - ReactCommon/turbomodule/bridging
     - ReactCommon/turbomodule/core
     - Yoga
   - RNGoogleSignin (10.0.1):
     - GoogleSignIn (~> 7.0)
     - React-Core
-  - RNLiveMarkdown (0.1.69):
+  - RNLiveMarkdown (0.1.117):
+    - DoubleConversion
     - glog
     - hermes-engine
-    - RCT-Folly (= 2022.05.16.00)
+    - RCT-Folly (= 2024.01.01.00)
     - RCTRequired
     - RCTTypeSafety
-    - React-Codegen
     - React-Core
     - React-debug
     - React-Fabric
+    - React-featureflags
     - React-graphics
     - React-ImageManager
     - React-NativeModulesApple
     - React-RCTFabric
     - React-rendererdebug
     - React-utils
+    - ReactCodegen
     - ReactCommon/turbomodule/bridging
     - ReactCommon/turbomodule/core
-    - RNLiveMarkdown/common (= 0.1.69)
+    - RNLiveMarkdown/common (= 0.1.117)
     - Yoga
-  - RNLiveMarkdown/common (0.1.69):
+  - RNLiveMarkdown/common (0.1.117):
+    - DoubleConversion
     - glog
     - hermes-engine
-    - RCT-Folly (= 2022.05.16.00)
+    - RCT-Folly (= 2024.01.01.00)
     - RCTRequired
     - RCTTypeSafety
-    - React-Codegen
     - React-Core
     - React-debug
     - React-Fabric
+    - React-featureflags
     - React-graphics
     - React-ImageManager
     - React-NativeModulesApple
     - React-RCTFabric
     - React-rendererdebug
     - React-utils
+    - ReactCodegen
     - ReactCommon/turbomodule/bridging
     - ReactCommon/turbomodule/core
     - Yoga
   - RNLocalize (2.2.6):
     - React-Core
-  - rnmapbox-maps (10.1.12):
-    - MapboxMaps (~> 10.16.4)
+  - rnmapbox-maps (10.1.26):
+    - MapboxMaps (~> 10.18.2)
     - React
     - React-Core
-    - rnmapbox-maps/DynamicLibrary (= 10.1.12)
+    - rnmapbox-maps/DynamicLibrary (= 10.1.26)
     - Turf
-  - rnmapbox-maps/DynamicLibrary (10.1.12):
+  - rnmapbox-maps/DynamicLibrary (10.1.26):
+    - DoubleConversion
     - hermes-engine
-    - MapboxMaps (~> 10.16.4)
+    - MapboxMaps (~> 10.18.2)
     - RCT-Folly
     - RCTRequired
     - RCTTypeSafety
     - React
-    - React-Codegen
     - React-Core
+    - React-featureflags
     - React-ImageManager
     - React-NativeModulesApple
     - React-RCTFabric
     - React-rendererdebug
+    - ReactCodegen
     - ReactCommon/turbomodule/bridging
     - ReactCommon/turbomodule/core
     - Turf
     - Yoga
-  - RNPermissions (3.9.3):
+  - RNPermissions (3.10.1):
+    - DoubleConversion
     - glog
     - hermes-engine
-    - RCT-Folly (= 2022.05.16.00)
+    - RCT-Folly (= 2024.01.01.00)
     - RCTRequired
     - RCTTypeSafety
-    - React-Codegen
     - React-Core
     - React-debug
     - React-Fabric
+    - React-featureflags
     - React-graphics
     - React-ImageManager
     - React-NativeModulesApple
     - React-RCTFabric
     - React-rendererdebug
     - React-utils
+    - ReactCodegen
     - ReactCommon/turbomodule/bridging
     - ReactCommon/turbomodule/core
     - Yoga
   - RNReactNativeHapticFeedback (2.2.0):
-    - RCT-Folly
+    - DoubleConversion
+    - glog
+    - hermes-engine
+    - RCT-Folly (= 2024.01.01.00)
     - RCTRequired
     - RCTTypeSafety
-    - React-Codegen
     - React-Core
+    - React-debug
+    - React-Fabric
+    - React-featureflags
+    - React-graphics
+    - React-ImageManager
+    - React-NativeModulesApple
+    - React-RCTFabric
+    - React-rendererdebug
+    - React-utils
+    - ReactCodegen
+    - ReactCommon/turbomodule/bridging
     - ReactCommon/turbomodule/core
-  - RNReanimated (3.7.2):
+    - Yoga
+  - RNReanimated (3.13.0):
+    - DoubleConversion
     - glog
     - hermes-engine
-    - RCT-Folly (= 2022.05.16.00)
+    - RCT-Folly (= 2024.01.01.00)
     - RCTRequired
     - RCTTypeSafety
-    - React-Codegen
     - React-Core
     - React-debug
     - React-Fabric
+    - React-featureflags
     - React-graphics
     - React-ImageManager
     - React-NativeModulesApple
     - React-RCTFabric
     - React-rendererdebug
     - React-utils
+    - ReactCodegen
     - ReactCommon/turbomodule/bridging
     - ReactCommon/turbomodule/core
     - Yoga
-  - RNScreens (3.30.1):
+  - RNScreens (3.34.0):
+    - DoubleConversion
     - glog
     - hermes-engine
-    - RCT-Folly (= 2022.05.16.00)
+    - RCT-Folly (= 2024.01.01.00)
     - RCTRequired
     - RCTTypeSafety
-    - React-Codegen
     - React-Core
     - React-debug
     - React-Fabric
+    - React-featureflags
     - React-graphics
     - React-ImageManager
     - React-NativeModulesApple
     - React-RCTFabric
+    - React-RCTImage
     - React-rendererdebug
     - React-utils
+    - ReactCodegen
     - ReactCommon/turbomodule/bridging
     - ReactCommon/turbomodule/core
-    - RNScreens/common (= 3.30.1)
+    - RNScreens/common (= 3.34.0)
     - Yoga
-  - RNScreens/common (3.30.1):
+  - RNScreens/common (3.34.0):
+    - DoubleConversion
     - glog
     - hermes-engine
-    - RCT-Folly (= 2022.05.16.00)
+    - RCT-Folly (= 2024.01.01.00)
     - RCTRequired
     - RCTTypeSafety
-    - React-Codegen
     - React-Core
     - React-debug
     - React-Fabric
+    - React-featureflags
     - React-graphics
     - React-ImageManager
     - React-NativeModulesApple
     - React-RCTFabric
+    - React-RCTImage
     - React-rendererdebug
     - React-utils
+    - ReactCodegen
     - ReactCommon/turbomodule/bridging
     - ReactCommon/turbomodule/core
     - Yoga
   - RNShare (10.0.2):
-    - RCT-Folly
+    - DoubleConversion
+    - glog
+    - hermes-engine
+    - RCT-Folly (= 2024.01.01.00)
     - RCTRequired
     - RCTTypeSafety
-    - React-Codegen
     - React-Core
+    - React-debug
+    - React-Fabric
+    - React-featureflags
+    - React-graphics
+    - React-ImageManager
+    - React-NativeModulesApple
     - React-RCTFabric
+    - React-rendererdebug
+    - React-utils
+    - ReactCodegen
+    - ReactCommon/turbomodule/bridging
     - ReactCommon/turbomodule/core
+    - Yoga
   - RNSound (0.11.2):
     - React-Core
     - RNSound/Core (= 0.11.2)
   - RNSound/Core (0.11.2):
     - React-Core
-  - RNSVG (14.1.0):
+  - RNSVG (15.4.0):
+    - DoubleConversion
     - glog
     - hermes-engine
-    - RCT-Folly (= 2022.05.16.00)
+    - RCT-Folly (= 2024.01.01.00)
     - RCTRequired
     - RCTTypeSafety
-    - React-Codegen
     - React-Core
     - React-debug
     - React-Fabric
+    - React-featureflags
     - React-graphics
     - React-ImageManager
     - React-NativeModulesApple
     - React-RCTFabric
     - React-rendererdebug
     - React-utils
+    - ReactCodegen
     - ReactCommon/turbomodule/bridging
     - ReactCommon/turbomodule/core
-    - RNSVG/common (= 14.1.0)
+    - RNSVG/common (= 15.4.0)
     - Yoga
-  - RNSVG/common (14.1.0):
+  - RNSVG/common (15.4.0):
+    - DoubleConversion
     - glog
     - hermes-engine
-    - RCT-Folly (= 2022.05.16.00)
+    - RCT-Folly (= 2024.01.01.00)
     - RCTRequired
     - RCTTypeSafety
-    - React-Codegen
     - React-Core
     - React-debug
     - React-Fabric
+    - React-featureflags
     - React-graphics
     - React-ImageManager
     - React-NativeModulesApple
     - React-RCTFabric
     - React-rendererdebug
     - React-utils
+    - ReactCodegen
     - ReactCommon/turbomodule/bridging
     - ReactCommon/turbomodule/core
     - Yoga
-  - SDWebImage (5.17.0):
-    - SDWebImage/Core (= 5.17.0)
-  - SDWebImage/Core (5.17.0)
-  - SDWebImageAVIFCoder (0.10.1):
-    - libavif (>= 0.11.0)
+  - SDWebImage (5.19.4):
+    - SDWebImage/Core (= 5.19.4)
+  - SDWebImage/Core (5.19.4)
+  - SDWebImageAVIFCoder (0.11.0):
+    - libavif/core (>= 0.11.0)
     - SDWebImage (~> 5.10)
   - SDWebImageSVGCoder (1.7.0):
     - SDWebImage/Core (~> 5.6)
-  - SDWebImageWebPCoder (0.13.0):
+  - SDWebImageWebPCoder (0.14.6):
     - libwebp (~> 1.0)
     - SDWebImage/Core (~> 5.17)
-  - SocketRocket (0.6.1)
-  - Turf (2.7.0)
+  - SocketRocket (0.7.0)
+  - Turf (2.8.0)
   - VisionCamera (4.0.0-beta.13):
+    - DoubleConversion
     - glog
     - hermes-engine
-    - RCT-Folly (= 2022.05.16.00)
+    - RCT-Folly (= 2024.01.01.00)
     - RCTRequired
     - RCTTypeSafety
-    - React-Codegen
     - React-Core
     - React-debug
     - React-Fabric
+    - React-featureflags
     - React-graphics
     - React-ImageManager
     - React-NativeModulesApple
     - React-RCTFabric
     - React-rendererdebug
     - React-utils
+    - ReactCodegen
     - ReactCommon/turbomodule/bridging
     - ReactCommon/turbomodule/core
     - Yoga
-  - Yoga (1.14.0)
+  - Yoga (0.0.0)
 
 DEPENDENCIES:
   - AirshipServiceExtension
@@ -2069,31 +2649,40 @@ DEPENDENCIES:
   - EXAV (from `../node_modules/expo-av/ios`)
   - EXImageLoader (from `../node_modules/expo-image-loader/ios`)
   - Expo (from `../node_modules/expo`)
+  - ExpoAsset (from `../node_modules/expo-asset/ios`)
   - ExpoImage (from `../node_modules/expo-image/ios`)
   - ExpoImageManipulator (from `../node_modules/expo-image-manipulator/ios`)
   - ExpoModulesCore (from `../node_modules/expo-modules-core`)
   - FBLazyVector (from `../node_modules/react-native/Libraries/FBLazyVector`)
+  - fmt (from `../node_modules/react-native/third-party-podspecs/fmt.podspec`)
+  - "FullStory (from `{:http=>\"https://ios-releases.fullstory.com/fullstory-1.49.0-xcframework.tar.gz\"}`)"
+  - "fullstory_react-native (from `../node_modules/@fullstory/react-native`)"
   - glog (from `../node_modules/react-native/third-party-podspecs/glog.podspec`)
   - hermes-engine (from `../node_modules/react-native/sdks/hermes-engine/hermes-engine.podspec`)
-  - libevent (~> 2.1.12)
   - lottie-react-native (from `../node_modules/lottie-react-native`)
   - "onfido-react-native-sdk (from `../node_modules/@onfido/react-native-sdk`)"
   - RCT-Folly (from `../node_modules/react-native/third-party-podspecs/RCT-Folly.podspec`)
   - RCT-Folly/Fabric (from `../node_modules/react-native/third-party-podspecs/RCT-Folly.podspec`)
-  - RCTRequired (from `../node_modules/react-native/Libraries/RCTRequired`)
+  - RCTDeprecation (from `../node_modules/react-native/ReactApple/Libraries/RCTFoundation/RCTDeprecation`)
+  - RCTRequired (from `../node_modules/react-native/Libraries/Required`)
   - RCTTypeSafety (from `../node_modules/react-native/Libraries/TypeSafety`)
   - React (from `../node_modules/react-native/`)
   - React-callinvoker (from `../node_modules/react-native/ReactCommon/callinvoker`)
-  - React-Codegen (from `build/generated/ios`)
   - React-Core (from `../node_modules/react-native/`)
   - React-Core/RCTWebSocket (from `../node_modules/react-native/`)
   - React-CoreModules (from `../node_modules/react-native/React/CoreModules`)
   - React-cxxreact (from `../node_modules/react-native/ReactCommon/cxxreact`)
   - React-debug (from `../node_modules/react-native/ReactCommon/react/debug`)
+  - React-defaultsnativemodule (from `../node_modules/react-native/ReactCommon/react/nativemodule/defaults`)
+  - React-domnativemodule (from `../node_modules/react-native/ReactCommon/react/nativemodule/dom`)
   - React-Fabric (from `../node_modules/react-native/ReactCommon`)
+  - React-FabricComponents (from `../node_modules/react-native/ReactCommon`)
   - React-FabricImage (from `../node_modules/react-native/ReactCommon`)
+  - React-featureflags (from `../node_modules/react-native/ReactCommon/react/featureflags`)
+  - React-featureflagsnativemodule (from `../node_modules/react-native/ReactCommon/react/nativemodule/featureflags`)
   - React-graphics (from `../node_modules/react-native/ReactCommon/react/renderer/graphics`)
   - React-hermes (from `../node_modules/react-native/ReactCommon/hermes`)
+  - React-idlecallbacksnativemodule (from `../node_modules/react-native/ReactCommon/react/nativemodule/idlecallbacks`)
   - React-ImageManager (from `../node_modules/react-native/ReactCommon/react/renderer/imagemanager/platform/ios`)
   - React-jserrorhandler (from `../node_modules/react-native/ReactCommon/jserrorhandler`)
   - React-jsi (from `../node_modules/react-native/ReactCommon/jsi`)
@@ -2102,6 +2691,7 @@ DEPENDENCIES:
   - React-jsitracing (from `../node_modules/react-native/ReactCommon/hermes/executor/`)
   - React-logger (from `../node_modules/react-native/ReactCommon/logger`)
   - React-Mapbuffer (from `../node_modules/react-native/ReactCommon`)
+  - React-microtasksnativemodule (from `../node_modules/react-native/ReactCommon/react/nativemodule/microtasks`)
   - "react-native-airship (from `../node_modules/@ua/react-native-airship`)"
   - react-native-blob-util (from `../node_modules/react-native-blob-util`)
   - "react-native-cameraroll (from `../node_modules/@react-native-camera-roll/camera-roll`)"
@@ -2110,6 +2700,7 @@ DEPENDENCIES:
   - "react-native-geolocation (from `../node_modules/@react-native-community/geolocation`)"
   - react-native-image-picker (from `../node_modules/react-native-image-picker`)
   - react-native-key-command (from `../node_modules/react-native-key-command`)
+  - react-native-keyboard-controller (from `../node_modules/react-native-keyboard-controller`)
   - react-native-launch-arguments (from `../node_modules/react-native-launch-arguments`)
   - "react-native-netinfo (from `../node_modules/@react-native-community/netinfo`)"
   - react-native-pager-view (from `../node_modules/react-native-pager-view`)
@@ -2118,13 +2709,13 @@ DEPENDENCIES:
   - react-native-plaid-link-sdk (from `../node_modules/react-native-plaid-link-sdk`)
   - react-native-quick-sqlite (from `../node_modules/react-native-quick-sqlite`)
   - react-native-release-profiler (from `../node_modules/react-native-release-profiler`)
-  - react-native-render-html (from `../node_modules/react-native-render-html`)
   - react-native-safe-area-context (from `../node_modules/react-native-safe-area-context`)
   - react-native-view-shot (from `../node_modules/react-native-view-shot`)
   - react-native-webview (from `../node_modules/react-native-webview`)
   - React-nativeconfig (from `../node_modules/react-native/ReactCommon`)
   - React-NativeModulesApple (from `../node_modules/react-native/ReactCommon/react/nativemodule/core/platform/ios`)
   - React-perflogger (from `../node_modules/react-native/ReactCommon/reactperflogger`)
+  - React-performancetimeline (from `../node_modules/react-native/ReactCommon/react/performance/timeline`)
   - React-RCTActionSheet (from `../node_modules/react-native/Libraries/ActionSheetIOS`)
   - React-RCTAnimation (from `../node_modules/react-native/Libraries/NativeAnimation`)
   - React-RCTAppDelegate (from `../node_modules/react-native/Libraries/AppDelegate`)
@@ -2136,6 +2727,7 @@ DEPENDENCIES:
   - React-RCTSettings (from `../node_modules/react-native/Libraries/Settings`)
   - React-RCTText (from `../node_modules/react-native/Libraries/Text`)
   - React-RCTVibration (from `../node_modules/react-native/Libraries/Vibration`)
+  - React-rendererconsistency (from `../node_modules/react-native/ReactCommon/react/renderer/consistency`)
   - React-rendererdebug (from `../node_modules/react-native/ReactCommon/react/renderer/debug`)
   - React-rncore (from `../node_modules/react-native/ReactCommon`)
   - React-RuntimeApple (from `../node_modules/react-native/ReactCommon/react/runtime/platform/ios`)
@@ -2144,6 +2736,7 @@ DEPENDENCIES:
   - React-RuntimeHermes (from `../node_modules/react-native/ReactCommon/react/runtime`)
   - React-runtimescheduler (from `../node_modules/react-native/ReactCommon/react/renderer/runtimescheduler`)
   - React-utils (from `../node_modules/react-native/ReactCommon/react/utils`)
+  - ReactCodegen (from `build/generated/ios`)
   - ReactCommon/turbomodule/core (from `../node_modules/react-native/ReactCommon`)
   - "RNAppleAuthentication (from `../node_modules/@invertase/react-native-apple-authentication`)"
   - "RNCClipboard (from `../node_modules/@react-native-clipboard/clipboard`)"
@@ -2185,17 +2778,14 @@ SPEC REPOS:
     - FirebaseInstallations
     - FirebasePerformance
     - FirebaseRemoteConfig
-    - fmt
     - GoogleAppMeasurement
     - GoogleDataTransport
     - GoogleSignIn
     - GoogleUtilities
     - GTMAppAuth
     - GTMSessionFetcher
-    - libaom
     - libavif
-    - libevent
-    - libvmaf
+    - libdav1d
     - libwebp
     - lottie-ios
     - MapboxCommon
@@ -2206,6 +2796,7 @@ SPEC REPOS:
     - Onfido
     - Plaid
     - PromisesObjC
+    - React-Codegen
     - SDWebImage
     - SDWebImageAVIFCoder
     - SDWebImageSVGCoder
@@ -2226,6 +2817,8 @@ EXTERNAL SOURCES:
     :path: "../node_modules/expo-image-loader/ios"
   Expo:
     :path: "../node_modules/expo"
+  ExpoAsset:
+    :path: "../node_modules/expo-asset/ios"
   ExpoImage:
     :path: "../node_modules/expo-image/ios"
   ExpoImageManipulator:
@@ -2234,27 +2827,33 @@ EXTERNAL SOURCES:
     :path: "../node_modules/expo-modules-core"
   FBLazyVector:
     :path: "../node_modules/react-native/Libraries/FBLazyVector"
+  fmt:
+    :podspec: "../node_modules/react-native/third-party-podspecs/fmt.podspec"
+  FullStory:
+    :http: https://ios-releases.fullstory.com/fullstory-1.49.0-xcframework.tar.gz
+  fullstory_react-native:
+    :path: "../node_modules/@fullstory/react-native"
   glog:
     :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-11-17-RNv0.73.0-21043a3fc062be445e56a2c10ecd8be028dd9cc5
+    :tag: hermes-2024-08-15-RNv0.75.1-4b3bf912cc0f705b51b71ce1a5b8bd79b93a451b
   lottie-react-native:
     :path: "../node_modules/lottie-react-native"
   onfido-react-native-sdk:
     :path: "../node_modules/@onfido/react-native-sdk"
   RCT-Folly:
     :podspec: "../node_modules/react-native/third-party-podspecs/RCT-Folly.podspec"
+  RCTDeprecation:
+    :path: "../node_modules/react-native/ReactApple/Libraries/RCTFoundation/RCTDeprecation"
   RCTRequired:
-    :path: "../node_modules/react-native/Libraries/RCTRequired"
+    :path: "../node_modules/react-native/Libraries/Required"
   RCTTypeSafety:
     :path: "../node_modules/react-native/Libraries/TypeSafety"
   React:
     :path: "../node_modules/react-native/"
   React-callinvoker:
     :path: "../node_modules/react-native/ReactCommon/callinvoker"
-  React-Codegen:
-    :path: build/generated/ios
   React-Core:
     :path: "../node_modules/react-native/"
   React-CoreModules:
@@ -2263,14 +2862,26 @@ EXTERNAL SOURCES:
     :path: "../node_modules/react-native/ReactCommon/cxxreact"
   React-debug:
     :path: "../node_modules/react-native/ReactCommon/react/debug"
+  React-defaultsnativemodule:
+    :path: "../node_modules/react-native/ReactCommon/react/nativemodule/defaults"
+  React-domnativemodule:
+    :path: "../node_modules/react-native/ReactCommon/react/nativemodule/dom"
   React-Fabric:
     :path: "../node_modules/react-native/ReactCommon"
+  React-FabricComponents:
+    :path: "../node_modules/react-native/ReactCommon"
   React-FabricImage:
     :path: "../node_modules/react-native/ReactCommon"
+  React-featureflags:
+    :path: "../node_modules/react-native/ReactCommon/react/featureflags"
+  React-featureflagsnativemodule:
+    :path: "../node_modules/react-native/ReactCommon/react/nativemodule/featureflags"
   React-graphics:
     :path: "../node_modules/react-native/ReactCommon/react/renderer/graphics"
   React-hermes:
     :path: "../node_modules/react-native/ReactCommon/hermes"
+  React-idlecallbacksnativemodule:
+    :path: "../node_modules/react-native/ReactCommon/react/nativemodule/idlecallbacks"
   React-ImageManager:
     :path: "../node_modules/react-native/ReactCommon/react/renderer/imagemanager/platform/ios"
   React-jserrorhandler:
@@ -2287,6 +2898,8 @@ EXTERNAL SOURCES:
     :path: "../node_modules/react-native/ReactCommon/logger"
   React-Mapbuffer:
     :path: "../node_modules/react-native/ReactCommon"
+  React-microtasksnativemodule:
+    :path: "../node_modules/react-native/ReactCommon/react/nativemodule/microtasks"
   react-native-airship:
     :path: "../node_modules/@ua/react-native-airship"
   react-native-blob-util:
@@ -2303,6 +2916,8 @@ EXTERNAL SOURCES:
     :path: "../node_modules/react-native-image-picker"
   react-native-key-command:
     :path: "../node_modules/react-native-key-command"
+  react-native-keyboard-controller:
+    :path: "../node_modules/react-native-keyboard-controller"
   react-native-launch-arguments:
     :path: "../node_modules/react-native-launch-arguments"
   react-native-netinfo:
@@ -2319,8 +2934,6 @@ EXTERNAL SOURCES:
     :path: "../node_modules/react-native-quick-sqlite"
   react-native-release-profiler:
     :path: "../node_modules/react-native-release-profiler"
-  react-native-render-html:
-    :path: "../node_modules/react-native-render-html"
   react-native-safe-area-context:
     :path: "../node_modules/react-native-safe-area-context"
   react-native-view-shot:
@@ -2333,6 +2946,8 @@ EXTERNAL SOURCES:
     :path: "../node_modules/react-native/ReactCommon/react/nativemodule/core/platform/ios"
   React-perflogger:
     :path: "../node_modules/react-native/ReactCommon/reactperflogger"
+  React-performancetimeline:
+    :path: "../node_modules/react-native/ReactCommon/react/performance/timeline"
   React-RCTActionSheet:
     :path: "../node_modules/react-native/Libraries/ActionSheetIOS"
   React-RCTAnimation:
@@ -2355,6 +2970,8 @@ EXTERNAL SOURCES:
     :path: "../node_modules/react-native/Libraries/Text"
   React-RCTVibration:
     :path: "../node_modules/react-native/Libraries/Vibration"
+  React-rendererconsistency:
+    :path: "../node_modules/react-native/ReactCommon/react/renderer/consistency"
   React-rendererdebug:
     :path: "../node_modules/react-native/ReactCommon/react/renderer/debug"
   React-rncore:
@@ -2371,6 +2988,8 @@ EXTERNAL SOURCES:
     :path: "../node_modules/react-native/ReactCommon/react/renderer/runtimescheduler"
   React-utils:
     :path: "../node_modules/react-native/ReactCommon/react/utils"
+  ReactCodegen:
+    :path: build/generated/ios
   ReactCommon:
     :path: "../node_modules/react-native/ReactCommon"
   RNAppleAuthentication:
@@ -2422,21 +3041,26 @@ EXTERNAL SOURCES:
   Yoga:
     :path: "../node_modules/react-native/ReactCommon/yoga"
 
+CHECKOUT OPTIONS:
+  FullStory:
+    :http: https://ios-releases.fullstory.com/fullstory-1.49.0-xcframework.tar.gz
+
 SPEC CHECKSUMS:
-  Airship: 5a6d3f8a982398940b0d48423bb9b8736717c123
-  AirshipFrameworkProxy: 7255f4ed9836dc2920f2f1ea5657ced4cee8a35c
-  AirshipServiceExtension: 0a5fb14c3fd1879355ab05a81d10f64512a4f79c
-  AppAuth: 3bb1d1cd9340bd09f5ed189fb00b1cc28e1e8570
-  boost: d3f49c53809116a5d38da093a8aa78bf551aed09
+  Airship: bb32ff2c5a811352da074480357d9f02dbb8f327
+  AirshipFrameworkProxy: dbd862dc6fb21b13e8b196458d626123e2a43a50
+  AirshipServiceExtension: 9c73369f426396d9fb9ff222d86d842fac76ba46
+  AppAuth: 501c04eda8a8d11f179dbe8637b7a91bb7e5d2fa
+  boost: 26992d1adf73c1c7676360643e687aee6dda994b
   BVLinearGradient: 421743791a59d259aec53f4c58793aad031da2ca
-  DoubleConversion: fea03f2699887d960129cc54bba7e52542b6f953
-  EXAV: 09a4d87fa6b113fbb0ada3aade6799f78271cb44
-  EXImageLoader: 55080616b2fe9da19ef8c7f706afd9814e279b6b
-  Expo: 1e3bcf9dd99de57a636127057f6b488f0609681a
-  ExpoImage: 390c524542b258f8173f475c1cc71f016444a7be
-  ExpoImageManipulator: c1d7cb865eacd620a35659f3da34c70531f10b59
-  ExpoModulesCore: 83dfc98358de225bd0953401ce5b0c14fa8eabd0
-  FBLazyVector: 84f6edbe225f38aebd9deaf1540a4160b1f087d7
+  DoubleConversion: 76ab83afb40bddeeee456813d9c04f67f78771b5
+  EXAV: 62e66b067185d630fe4cb4aa6eb0e48f72e67e0f
+  EXImageLoader: ab589d67d6c5f2c33572afea9917304418566334
+  Expo: 675a5642b5860771507237259da50b921c03a9f3
+  ExpoAsset: 323700f291684f110fb55f0d4022a3362ea9f875
+  ExpoImage: 2ccccff1219ebc765e344f3338f2430af2df4824
+  ExpoImageManipulator: aea99205c66043a00a0af90e345395637b9902fa
+  ExpoModulesCore: 606b7ca7c74186324975750c8a6f97b643f54ec9
+  FBLazyVector: 38bb611218305c3bc61803e287b8a81c6f63b619
   Firebase: 629510f1a9ddb235f3a7c5c8ceb23ba887f0f814
   FirebaseABTesting: 10cbce8db9985ae2e3847ea44e9947dd18f94e10
   FirebaseAnalytics: 5506ea8b867d8423485a84b4cd612d279f7b0b8a
@@ -2446,127 +3070,138 @@ SPEC CHECKSUMS:
   FirebaseInstallations: 40bd9054049b2eae9a2c38ef1c3dd213df3605cd
   FirebasePerformance: 0c01a7a496657d7cea86d40c0b1725259d164c6c
   FirebaseRemoteConfig: 2d6e2cfdb49af79535c8af8a80a4a5009038ec2b
-  fmt: ff9d55029c625d3757ed641535fd4a75fedc7ce9
-  glog: c5d68082e772fa1c511173d6b30a9de2c05a69a2
+  fmt: 4c2741a687cc09f0634a2e2c72a838b99f1ff120
+  FullStory: c95f74445f871bc344cdc4a4e4ece61b5554e55d
+  fullstory_react-native: 1818ee93dc38801665f26869f7ad68abb698a89a
+  glog: 69ef571f3de08433d766d614c73a9838a06bf7eb
   GoogleAppMeasurement: 5ba1164e3c844ba84272555e916d0a6d3d977e91
   GoogleDataTransport: 6c09b596d841063d76d4288cc2d2f42cc36e1e2a
-  GoogleSignIn: b232380cf495a429b8095d3178a8d5855b42e842
-  GoogleUtilities: d053d902a8edaa9904e1bd00c37535385b8ed152
-  GTMAppAuth: 99fb010047ba3973b7026e45393f51f27ab965ae
-  GTMSessionFetcher: 8a1b34ad97ebe6f909fb8b9b77fba99943007556
-  hermes-engine: b2669ce35fc4ac14f523b307aff8896799829fe2
-  libaom: 144606b1da4b5915a1054383c3a4459ccdb3c661
+  GoogleSignIn: d4281ab6cf21542b1cfaff85c191f230b399d2db
+  GoogleUtilities: ea963c370a38a8069cc5f7ba4ca849a60b6d7d15
+  GTMAppAuth: f69bd07d68cd3b766125f7e072c45d7340dea0de
+  GTMSessionFetcher: 5aea5ba6bd522a239e236100971f10cb71b96ab6
+  hermes-engine: 3b6e0717ca847e2fc90a201e59db36caf04dee88
   libavif: 84bbb62fb232c3018d6f1bab79beea87e35de7b7
-  libevent: 4049cae6c81cdb3654a443be001fb9bdceff7913
-  libvmaf: 27f523f1e63c694d14d534cd0fddd2fab0ae8711
+  libdav1d: 23581a4d8ec811ff171ed5e2e05cd27bad64c39f
   libwebp: 1786c9f4ff8a279e4dac1e8f385004d5fc253009
   lottie-ios: 3d98679b41fa6fd6aff2352b3953dbd3df8a397e
-  lottie-react-native: d0e530160e1a0116ab567343d843033c496d0d97
-  MapboxCommon: 20466d839cc43381c44df09d19f7f794b55b9a93
-  MapboxCoreMaps: c21f433decbb295874f0c2464e492166db813b56
-  MapboxMaps: c3b36646b9038706bbceb5de203bcdd0f411e9d0
+  lottie-react-native: e50d25429207f95045253c19fa7463e288594f87
+  MapboxCommon: 0ff437e44988da6856e280d00ffb266564ed0487
+  MapboxCoreMaps: f1bd9405f5b9d3e343f2fe4138775299699a22fb
+  MapboxMaps: e76b14f52c54c40b76ddecd04f40448e6f35a864
   MapboxMobileEvents: de50b3a4de180dd129c326e09cd12c8adaaa46d6
   nanopb: a0ba3315591a9ae0a16a309ee504766e90db0c96
-  Onfido: 342cbecd7a4383e98dfe7f9c35e98aaece599062
-  onfido-react-native-sdk: 3e3b0dd70afa97410fb318d54c6a415137968ef2
-  Plaid: 7829e84db6d766a751c91a402702946d2977ddcb
+  Onfido: f3af62ea1c9a419589c133e3e511e5d2c4f3f8af
+  onfido-react-native-sdk: 4ccfdeb10f9ccb4a5799d2555cdbc2a068a42c0d
+  Plaid: c32f22ffce5ec67c9e6147eaf6c4d7d5f8086d89
   PromisesObjC: f5707f49cb48b9636751c5b2e7d227e43fba9f47
-  RCT-Folly: 7169b2b1c44399c76a47b5deaaba715eeeb476c0
-  RCTRequired: ab7f915c15569f04a49669e573e6e319a53f9faa
-  RCTTypeSafety: 63b97ced7b766865057e7154db0e81ce4ee6cf1e
-  React: 1c87497e50fa40ba9c54e5ea5e53483a0f8eecc0
-  React-callinvoker: e3a52a9a93e3eb004d7282c26a4fb27003273fe6
-  React-Codegen: 05f85e0e087f402978cfe57822a8debc07127a13
-  React-Core: d0ecde72894b792cb8922efaa0990199cbe85169
-  React-CoreModules: 2ff1684dd517f0c441495d90a704d499f05e9d0a
-  React-cxxreact: d9be2fac926741052395da0a6d0bab8d71e2f297
-  React-debug: 4678e73a37cb501d784e99ff0f219b4940362a3b
-  React-Fabric: 460ee9d4b8b9de3382504a711430bfead1d5be1e
-  React-FabricImage: d0a0631bc8ad9143f42bfccf9d3d533a144cc3d6
-  React-graphics: f0d5040263a9649e2a70ebe27b3120c49411afef
-  React-hermes: b9ac2f7b0c1eeb206eb883583cab7a973d570a6e
-  React-ImageManager: 6c4bf9d5ed363ead7b5aaf820a3feab221b7063e
-  React-jserrorhandler: 6e7a7e187583e14dc7a0053a2bdd66c252ea3b21
-  React-jsi: 380cd24dd81a705dd042c18989fb10b07182210c
-  React-jsiexecutor: 8ed7a18b9f119440efdcd424c8257dc7e18067e2
-  React-jsinspector: 9ac353eccf6ab54d1e0a33862ba91221d1e88460
-  React-jsitracing: e8a2dafb9878dbcad02b6b2b88e66267fb427b74
-  React-logger: 0a57b68dd2aec7ff738195f081f0520724b35dab
-  React-Mapbuffer: 63913773ed7f96b814a2521e13e6d010282096ad
-  react-native-airship: 38e2596999242b68c933959d6145512e77937ac0
-  react-native-blob-util: 1ddace5234c62e3e6e4e154d305ad07ef686599b
-  react-native-cameraroll: f373bebbe9f6b7c3fd2a6f97c5171cda574cf957
+  RCT-Folly: 4464f4d875961fce86008d45f4ecf6cef6de0740
+  RCTDeprecation: 34cbf122b623037ea9facad2e92e53434c5c7422
+  RCTRequired: 24c446d7bcd0f517d516b6265d8df04dc3eb1219
+  RCTTypeSafety: ef5e91bd791abd3a99b2c75fd565791102a66352
+  React: 643f06bc294806d2db2526b424fdf759e107f514
+  React-callinvoker: 34d1fa0c340104f324e2521f546196beb44dfad2
+  React-Codegen: 4b8b4817cea7a54b83851d4c1f91f79aa73de30a
+  React-Core: facd883836d8d1cc1949d2053c58eab5fb22eb75
+  React-CoreModules: f92a2cb11d22f6066823ca547c61e900325dfe44
+  React-cxxreact: f5595a4cbfe5a4e9d401dffa2c1c78bbbbbe75e4
+  React-debug: 4a91c177b5b2efcc546fb50bc2f676f3f589efab
+  React-defaultsnativemodule: 6b666572abf5fe7fe87836a42776abd6ad5ed173
+  React-domnativemodule: 785d767c4edbb9f011b8c976271077759ca5c4aa
+  React-Fabric: a33cc1fdc62a3085774783bb30970531589d2028
+  React-FabricComponents: 98de5f94cbd35d407f4fc78855298b562d8289cb
+  React-FabricImage: 0ce8fd83844d9edef5825116d38f0e208b9ad786
+  React-featureflags: 37a78859ad71db758e2efdcbdb7384afefa8701e
+  React-featureflagsnativemodule: f94aacb52c463e200ee185bff90ae3b392e60263
+  React-graphics: c16f1bab97a5d473831a79360d84300e93a614e5
+  React-hermes: 7801f8c0e12f326524b461dc368d3e74f3d2a385
+  React-idlecallbacksnativemodule: d81bb7b5d26cea9852a8edc6ad1979cd7ed0841f
+  React-ImageManager: 98a1e5b0b05528dde47ebcd953d916ac66d46c09
+  React-jserrorhandler: 08f1c3465a71a6549c27ad82809ce145ad52d4f1
+  React-jsi: 161428ab2c706d5fcd9878d260ff1513fdb356ab
+  React-jsiexecutor: abfdc7526151c6755f836235bbaa53b267a0803c
+  React-jsinspector: f0786053a1a258a4d8dde859d1a820c26ee686f0
+  React-jsitracing: 52b849a77d02e2dc262a3031454c23be8dabb4d9
+  React-logger: 8db32983d75dc2ad54f278f344ccb9b256e694fc
+  React-Mapbuffer: 1c08607305558666fd16678b85ef135e455d5c96
+  React-microtasksnativemodule: f13f03163b6a5ec66665dfe80a0df4468bb766a6
+  react-native-airship: e10f6823d8da49bbcb2db4bdb16ff954188afccc
+  react-native-blob-util: 221c61c98ae507b758472ac4d2d489119d1a6c44
+  react-native-cameraroll: 478a0c1fcdd39f08f6ac272b7ed06e92b2c7c129
   react-native-config: 5ce986133b07fc258828b20b9506de0e683efc1c
-  react-native-document-picker: 8532b8af7c2c930f9e202aac484ac785b0f4f809
-  react-native-geolocation: f9e92eb774cb30ac1e099f34b3a94f03b4db7eb3
+  react-native-document-picker: 2789e41dc92aa3256455aa54639a42f4dc4ee824
+  react-native-geolocation: b9bd12beaf0ebca61a01514517ca8455bd26fa06
   react-native-image-picker: f8a13ff106bcc7eb00c71ce11fdc36aac2a44440
-  react-native-key-command: 28ccfa09520e7d7e30739480dea4df003493bfe8
+  react-native-key-command: aae312752fcdfaa2240be9a015fc41ce54087546
+  react-native-keyboard-controller: 5075321af7b1c834cfb9582230659d032c963278
   react-native-launch-arguments: 5f41e0abf88a15e3c5309b8875d6fd5ac43df49d
-  react-native-netinfo: 02d31de0e08ab043d48f2a1a8baade109d7b6ca5
-  react-native-pager-view: ccd4bbf9fc7effaf8f91f8dae43389844d9ef9fa
-  react-native-pdf: 762369633665ec02ac227aefe2f4558b92475c23
-  react-native-performance: fb21ff0c9bd7a10789c69d948f25b0067d29f7a9
-  react-native-plaid-link-sdk: 2a91ef7e257ae16d180a1ca14ba3041ae0836fbf
-  react-native-quick-sqlite: e3ab3e0a29d8c705f47a60aaa6ceaa42eb6a9ec1
-  react-native-release-profiler: 14ccdc0eeb03bedf625cf68d53d80275a81b19dd
-  react-native-render-html: 96c979fe7452a0a41559685d2f83b12b93edac8c
-  react-native-safe-area-context: 9d79895b60b8be151fdf6faef9d2d0591eeecc63
+  react-native-netinfo: fb5112b1fa754975485884ae85a3fb6a684f49d5
+  react-native-pager-view: 6bff9b0883b902571530ddd1b2ea9dc570f321f6
+  react-native-pdf: dd6ae39a93607a80919bef9f3499e840c693989d
+  react-native-performance: 3c608307be10964f8a97d3af462f37125b6d8fa5
+  react-native-plaid-link-sdk: f91a22b45b7c3d4cd6c47273200dc57df35068b0
+  react-native-quick-sqlite: cc2939134fbd404ac7d51d3dc8d69219eff242a8
+  react-native-release-profiler: 131ec5e4145d900b2be2a8d6641e2ce0dd784259
+  react-native-safe-area-context: 38fdd9b3c5561de7cabae64bd0cd2ce05d2768a1
   react-native-view-shot: 6b7ed61d77d88580fed10954d45fad0eb2d47688
-  react-native-webview: f8ab7a37905b2366a3e849ce5992b9724f6a528d
-  React-nativeconfig: d7af5bae6da70fa15ce44f045621cf99ed24087c
-  React-NativeModulesApple: 0123905d5699853ac68519607555a9a4f5c7b3ac
-  React-perflogger: 8a1e1af5733004bdd91258dcefbde21e0d1faccd
-  React-RCTActionSheet: 64bbff3a3963664c2d0146f870fe8e0264aee4c4
-  React-RCTAnimation: b698168a7269265a4694727196484342d695f0c1
-  React-RCTAppDelegate: a84b4bf99b871d87b41d7a768e7860d207fb4e31
-  React-RCTBlob: 47f8c3b2b4b7fa2c5f19c43f0b7f77f57fb9d953
-  React-RCTFabric: 6067a32d683d0c2b84d444548bc15a263c64abed
-  React-RCTImage: ac0e77a44c290b20db783649b2b9cddc93e3eb99
-  React-RCTLinking: e626fd2900913fe5d25922ea1be394b7aafa09c9
-  React-RCTNetwork: d3114bce3977dafe8bd06421b29812f5a8527ba0
-  React-RCTSettings: a53511f90d8df637a1a11ac729179a4d2f734481
-  React-RCTText: f0176f5f5952f9a4a2c7354f5ae71f7c420aaf34
-  React-RCTVibration: 8160223c6eda5b187079fec204f80eca8b8f3177
-  React-rendererdebug: ed286b4da8648c27d6ed3ae1410d4b21ba890d5a
-  React-rncore: 75cbcc46868e809bb7e738d4565ba85f3dbd5cdc
-  React-RuntimeApple: f4848a388e4c782d3b8d4ca9c48179163418fe56
-  React-RuntimeCore: 272998adc56066404df36b1a3a2be9a56c6ee086
-  React-runtimeexecutor: e6ab6bb083dbdbdd489cff426ed0bce0652e6edf
-  React-RuntimeHermes: d2c368065ef82d4f8e6daa662352de5a195bdb57
-  React-runtimescheduler: ed48e5faac6751e66ee1261c4bd01643b436f112
-  React-utils: 6e5ad394416482ae21831050928ae27348f83487
-  ReactCommon: 840a955d37b7f3358554d819446bffcf624b2522
+  react-native-webview: ad29375839c9aa0409ce8e8693291b42bdc067a4
+  React-nativeconfig: 57781b79e11d5af7573e6f77cbf1143b71802a6d
+  React-NativeModulesApple: 7ff2e2cfb2e5fa5bdedcecf28ce37e696c6ef1e1
+  React-perflogger: 8a360ccf603de6ddbe9ff8f54383146d26e6c936
+  React-performancetimeline: 3cfec915adcb3653a5a633b41e711903844c35d8
+  React-RCTActionSheet: 1c0e26a88eec41215089cf4436e38188cfe9f01a
+  React-RCTAnimation: d87207841b1e2ae1389e684262ea8c73c887cb04
+  React-RCTAppDelegate: 328e56399c4f1c3d20cfe547ea24ebded2b3a87f
+  React-RCTBlob: 79b42cb7db55f34079297687a480dbcf37f023f6
+  React-RCTFabric: 27636a6a5fa5622159297fce26881945d3658cf6
+  React-RCTImage: 0c10a75de59f7384a2a55545d5f36fe783e6ecda
+  React-RCTLinking: bf08f4f655bf777af292b8d97449072c8bb196ca
+  React-RCTNetwork: 1b690846b40fc5685af58e088720657db6814637
+  React-RCTSettings: 097e420926dd44153fb25174835b572aded224d6
+  React-RCTText: d8fe2ae9f95b2ccd03b2f534286e938254791992
+  React-RCTVibration: 976466dba32c0981a836e45ce38bcd4c8d6d924e
+  React-rendererconsistency: ee0d6f1b4420e1ad5bb01c02170e7ecbd278e307
+  React-rendererdebug: 7fbf02f30d1e0bb0d96d65cf2548219cb53b29b6
+  React-rncore: 7ffc5be03adbf0a5cbf1b654483f487a899cff08
+  React-RuntimeApple: e623f002e1871de30a443291171d3f2fb134a6ec
+  React-RuntimeCore: a67357d4f073b1dbe6fbefc5273072027f201e1c
+  React-runtimeexecutor: 5bb52479abf8081086afb0397dc33dc97202a439
+  React-RuntimeHermes: 860cf64708a12a2fa62366fe51fe000121fa031b
+  React-runtimescheduler: fff88d51ad2c8815fc75930dbac224d680593e6b
+  React-utils: 81a715d9c0a2a49047e77a86f3a2247408540deb
+  ReactCodegen: 60973d382704c793c605b9be0fc7f31cb279442f
+  ReactCommon: 6ef348087d250257c44c0204461c03f036650e9b
   RNAppleAuthentication: 0571c08da8c327ae2afc0261b48b4a515b0286a6
-  RNCClipboard: 081418ae3b391b1012c3f41d045e5e39f1beed71
-  RNCPicker: a37026a67de0cf1a33ffe8722783527e3b18ea9f
-  RNDeviceInfo: 449272e9faf2afe94a3fe2896d169e92277fffa8
+  RNCClipboard: c84275d07e3f73ff296b17e6c27e9ccdc194a0bb
+  RNCPicker: 21ae0659666767a5c1253aef985ee5b7c527e345
+  RNDeviceInfo: 130237d8e97a89b68f2202d5dd18ac6bb68e7648
   RNFBAnalytics: f76bfa164ac235b00505deb9fc1776634056898c
   RNFBApp: 729c0666395b1953198dc4a1ec6deb8fbe1c302e
   RNFBCrashlytics: 2061ca863e8e2fa1aae9b12477d7dfa8e88ca0f9
   RNFBPerf: 389914cda4000fe0d996a752532a591132cbf3f9
-  RNFlashList: 76c2fab003330924ab1a140d13aadf3834dc32e0
+  RNFlashList: 65349fc4f2c270ae3feca9769dfb5065dffd1210
   RNFS: 4ac0f0ea233904cb798630b3c077808c06931688
-  RNGestureHandler: 74b7b3d06d667ba0bbf41da7718f2607ae0dfe8f
+  RNGestureHandler: 8781e2529230a1bc3ea8d75e5c3cd071b6c6aed7
   RNGoogleSignin: ccaa4a81582cf713eea562c5dd9dc1961a715fd0
-  RNLiveMarkdown: bfabd5938e5af5afc1e60e4e34286b17f8308184
+  RNLiveMarkdown: 919ab2853030c16732ad1d3339b0516264f63783
   RNLocalize: d4b8af4e442d4bcca54e68fc687a2129b4d71a81
-  rnmapbox-maps: 211f3cb9d33b3b8737d6d21c16bd49e9d97be2f8
-  RNPermissions: 0b61d30d21acbeafe25baaa47d9bae40a0c65216
-  RNReactNativeHapticFeedback: 616c35bdec7d20d4c524a7949ca9829c09e35f37
-  RNReanimated: 51db0fff543694d931bd3b7cab1a3b36bd86c738
-  RNScreens: 9ec969a95987a6caae170ef09313138abf3331e1
-  RNShare: 2a4cdfc0626ad56b0ef583d424f2038f772afe58
+  rnmapbox-maps: 5ab6bfd249cd67262615153c648f8d809aab781c
+  RNPermissions: 0b1429b55af59d1d08b75a8be2459f65a8ac3f28
+  RNReactNativeHapticFeedback: a15b431d2903bc2eb3474ff8d9a05d3e67a70199
+  RNReanimated: 601912257776588e7c0543f8dea4ba6dd393e9d0
+  RNScreens: de6e57426ba0e6cbc3fb5b4f496e7f08cb2773c2
+  RNShare: a3c2fbbca5682530b65ff405b34c91dad1e22442
   RNSound: 6c156f925295bdc83e8e422e7d8b38d33bc71852
-  RNSVG: 18f1381e046be2f1c30b4724db8d0c966238089f
-  SDWebImage: 750adf017a315a280c60fde706ab1e552a3ae4e9
-  SDWebImageAVIFCoder: 8348fef6d0ec69e129c66c9fe4d74fbfbf366112
+  RNSVG: 6b65086b51556fd9723d5570a3455e865e1304a3
+  SDWebImage: 066c47b573f408f18caa467d71deace7c0f8280d
+  SDWebImageAVIFCoder: 00310d246aab3232ce77f1d8f0076f8c4b021d90
   SDWebImageSVGCoder: 15a300a97ec1c8ac958f009c02220ac0402e936c
-  SDWebImageWebPCoder: af09429398d99d524cae2fe00f6f0f6e491ed102
-  SocketRocket: f32cd54efbe0f095c4d7594881e52619cfe80b17
-  Turf: 13d1a92d969ca0311bbc26e8356cca178ce95da2
-  VisionCamera: 1394a316c7add37e619c48d7aa40b38b954bf055
-  Yoga: 1b901a6d6eeba4e8a2e8f308f708691cdb5db312
+  SDWebImageWebPCoder: e38c0a70396191361d60c092933e22c20d5b1380
+  SocketRocket: abac6f5de4d4d62d24e11868d7a2f427e0ef940d
+  Turf: aa2ede4298009639d10db36aba1a7ebaad072a5e
+  VisionCamera: c6c8aa4b028501fc87644550fbc35a537d4da3fb
+  Yoga: 2a45d7e59592db061217551fd3bbe2dd993817ae
 
-PODFILE CHECKSUM: a25a81f2b50270f0c0bd0aff2e2ebe4d0b4ec06d
+PODFILE CHECKSUM: e479ec84cb53e5fd463486d71dfee91708d3fd9a
 
-COCOAPODS: 1.13.0
+COCOAPODS: 1.15.2
diff --git a/ios/PrivacyInfo.xcprivacy b/ios/PrivacyInfo.xcprivacy
new file mode 100644
index 000000000000..db7d8b7833b4
--- /dev/null
+++ b/ios/PrivacyInfo.xcprivacy
@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<!--
+   PrivacyInfo.xcprivacy
+   NewExpensify
+
+   Created by Andrew Gable on 5/1/24.
+-->
+<plist version="1.0">
+<dict>
+	<key>NSPrivacyAccessedAPITypes</key>
+	<array>
+		<dict>
+			<key>NSPrivacyAccessedAPIType</key>
+			<string>NSPrivacyAccessedAPICategoryFileTimestamp</string>
+			<key>NSPrivacyAccessedAPITypeReasons</key>
+			<array>
+				<string>C617.1</string>
+			</array>
+		</dict>
+		<dict>
+			<key>NSPrivacyAccessedAPIType</key>
+			<string>NSPrivacyAccessedAPICategoryDiskSpace</string>
+			<key>NSPrivacyAccessedAPITypeReasons</key>
+			<array>
+				<string>E174.1</string>
+			</array>
+		</dict>
+      <dict>
+			<key>NSPrivacyAccessedAPIType</key>
+			<string>NSPrivacyAccessedAPICategoryUserDefaults</string>
+			<key>NSPrivacyAccessedAPITypeReasons</key>
+			<array>
+				<string>CA92.1</string>
+			</array>
+		</dict>
+		<dict>
+			<key>NSPrivacyAccessedAPIType</key>
+			<string>NSPrivacyAccessedAPICategorySystemBootTime</string>
+			<key>NSPrivacyAccessedAPITypeReasons</key>
+			<array>
+				<string>35F9.1</string>
+			</array>
+		</dict>
+	</array>
+	<key>NSPrivacyCollectedDataTypes</key>
+	<array/>
+	<key>NSPrivacyTracking</key>
+	<false/>
+</dict>
+</plist>
diff --git a/ios/link-assets-manifest.json b/ios/link-assets-manifest.json
index a3ac1c2332f9..1c59d667fca1 100644
--- a/ios/link-assets-manifest.json
+++ b/ios/link-assets-manifest.json
@@ -1,5 +1,5 @@
 {
-  "migIndex": 1,
+  "migIndex": 2,
   "data": [
     {
       "path": "assets/fonts/native/ExpensifyMono-Bold.otf",
diff --git a/jest/setup.ts b/jest/setup.ts
index 488e3e36a1d3..19e20a6d0395 100644
--- a/jest/setup.ts
+++ b/jest/setup.ts
@@ -1,10 +1,14 @@
 import '@shopify/flash-list/jestSetup';
 import 'react-native-gesture-handler/jestSetup';
+import type * as RNKeyboardController from 'react-native-keyboard-controller';
 import mockStorage from 'react-native-onyx/dist/storage/__mocks__';
+import type Animated from 'react-native-reanimated';
 import 'setimmediate';
+import mockFSLibrary from './setupMockFullstoryLib';
 import setupMockImages from './setupMockImages';
 
 setupMockImages();
+mockFSLibrary();
 
 // This mock is required as per setup instructions for react-navigation testing
 // https://reactnavigation.org/docs/testing/#mocking-native-modules
@@ -18,9 +22,19 @@ jest.mock('react-native-onyx/dist/storage', () => mockStorage);
 // Mock NativeEventEmitter as it is needed to provide mocks of libraries which include it
 jest.mock('react-native/Libraries/EventEmitter/NativeEventEmitter');
 
+// Needed for: https://stackoverflow.com/questions/76903168/mocking-libraries-in-jest
+jest.mock('react-native/Libraries/LogBox/LogBox', () => ({
+    // eslint-disable-next-line @typescript-eslint/naming-convention
+    __esModule: true,
+    default: {
+        ignoreLogs: jest.fn(),
+        ignoreAllLogs: jest.fn(),
+    },
+}));
+
 // Turn off the console logs for timing events. They are not relevant for unit tests and create a lot of noise
-jest.spyOn(console, 'debug').mockImplementation((...params) => {
-    if (params[0].indexOf('Timing:') === 0) {
+jest.spyOn(console, 'debug').mockImplementation((...params: string[]) => {
+    if (params[0].startsWith('Timing:')) {
         return;
     }
 
@@ -51,3 +65,16 @@ jest.mock('react-native-sound', () => {
 jest.mock('react-native-share', () => ({
     default: jest.fn(),
 }));
+
+jest.mock('react-native-reanimated', () => ({
+    ...jest.requireActual<typeof Animated>('react-native-reanimated/mock'),
+    createAnimatedPropAdapter: jest.fn,
+    useReducedMotion: jest.fn,
+}));
+
+jest.mock('react-native-keyboard-controller', () => require<typeof RNKeyboardController>('react-native-keyboard-controller/jest'));
+
+jest.mock('@src/libs/actions/Timing', () => ({
+    start: jest.fn(),
+    end: jest.fn(),
+}));
diff --git a/jest/setupMockFullstoryLib.ts b/jest/setupMockFullstoryLib.ts
new file mode 100644
index 000000000000..eae3ea1f51bd
--- /dev/null
+++ b/jest/setupMockFullstoryLib.ts
@@ -0,0 +1,24 @@
+type FSPageInterface = {
+    start: jest.Mock<void, []>;
+};
+
+export default function mockFSLibrary() {
+    jest.mock('@fullstory/react-native', () => {
+        class Fullstory {
+            consent = jest.fn();
+
+            anonymize = jest.fn();
+
+            identify = jest.fn();
+        }
+
+        return {
+            FSPage(): FSPageInterface {
+                return {
+                    start: jest.fn(() => {}),
+                };
+            },
+            default: Fullstory,
+        };
+    });
+}
diff --git a/lib/react-compiler-runtime/index.js b/lib/react-compiler-runtime/index.js
new file mode 100644
index 000000000000..54e88d2b703a
--- /dev/null
+++ b/lib/react-compiler-runtime/index.js
@@ -0,0 +1,21 @@
+// lib/react-compiler-runtime.js
+const $empty = Symbol.for("react.memo_cache_sentinel");
+const React = require('react');
+/**
+ * DANGER: this hook is NEVER meant to be called directly!
+ *
+ * Note that this is a temporary userspace implementation of this function
+ * from React 19. It is not as efficient and may invalidate more frequently
+ * than the official API. Better to upgrade to React 19 as soon as we can.
+ **/
+export function c(size) {
+  return React.useState(() => {
+    const $ = new Array(size);
+    for (let ii = 0; ii < size; ii++) {
+      $[ii] = $empty;
+    }
+    // @ts-ignore
+    $[$empty] = true;
+    return $;
+  })[0];
+}
diff --git a/lib/react-compiler-runtime/package.json b/lib/react-compiler-runtime/package.json
new file mode 100644
index 000000000000..3a0323538b6e
--- /dev/null
+++ b/lib/react-compiler-runtime/package.json
@@ -0,0 +1,10 @@
+{
+  "name": "react-compiler-runtime",
+  "version": "0.0.1",
+  "description": "Runtime for React Compiler",
+  "license": "MIT",
+  "main": "index.js",
+  "dependencies": {
+    "react": "18.3.1"
+  }
+}
diff --git a/metro.config.js b/metro.config.js
index 68ed72d52ba0..0ad3bafc011e 100644
--- a/metro.config.js
+++ b/metro.config.js
@@ -11,7 +11,7 @@ const e2eSourceExts = ['e2e.js', 'e2e.ts', 'e2e.tsx'];
 
 /**
  * Metro configuration
- * https://facebook.github.io/metro/docs/configuration
+ * https://reactnative.dev/docs/metro
  *
  * @type {import('metro-config').MetroConfig}
  */
diff --git a/package-lock.json b/package-lock.json
index c496e4f0dc73..f27e15a3bcb9 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,52 +1,52 @@
 {
   "name": "new.expensify",
-  "version": "1.4.70-2",
+  "version": "9.0.26-1",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "new.expensify",
-      "version": "1.4.70-2",
+      "version": "9.0.26-1",
       "hasInstallScript": true,
       "license": "MIT",
       "dependencies": {
         "@babel/plugin-proposal-private-methods": "^7.18.6",
         "@babel/plugin-proposal-private-property-in-object": "^7.21.11",
         "@dotlottie/react-player": "^1.6.3",
-        "@expensify/react-native-live-markdown": "0.1.69",
+        "@expensify/react-native-live-markdown": "0.1.117",
         "@expo/metro-runtime": "~3.1.1",
         "@formatjs/intl-datetimeformat": "^6.10.0",
         "@formatjs/intl-listformat": "^7.2.2",
         "@formatjs/intl-locale": "^3.3.0",
         "@formatjs/intl-numberformat": "^8.5.0",
         "@formatjs/intl-pluralrules": "^5.2.2",
+        "@fullstory/babel-plugin-annotate-react": "github:fullstorydev/fullstory-babel-plugin-annotate-react#ryanwang/react-native-web-demo",
+        "@fullstory/babel-plugin-react-native": "^1.2.1",
+        "@fullstory/browser": "^2.0.3",
+        "@fullstory/react-native": "^1.4.2",
         "@gorhom/portal": "^1.0.14",
         "@invertase/react-native-apple-authentication": "^2.2.2",
-        "@kie/act-js": "^2.6.0",
-        "@kie/mock-github": "^1.0.0",
+        "@kie/act-js": "^2.6.2",
+        "@kie/mock-github": "2.0.1",
         "@onfido/react-native-sdk": "10.6.0",
         "@react-native-camera-roll/camera-roll": "7.4.0",
         "@react-native-clipboard/clipboard": "^1.13.2",
-        "@react-native-community/geolocation": "3.2.1",
+        "@react-native-community/geolocation": "3.3.0",
         "@react-native-community/netinfo": "11.2.1",
         "@react-native-firebase/analytics": "^12.3.0",
         "@react-native-firebase/app": "^12.3.0",
         "@react-native-firebase/crashlytics": "^12.3.0",
         "@react-native-firebase/perf": "^12.3.0",
         "@react-native-google-signin/google-signin": "^10.0.1",
-        "@react-native-picker/picker": "2.6.1",
+        "@react-native-picker/picker": "2.7.6",
         "@react-navigation/material-top-tabs": "^6.6.3",
         "@react-navigation/native": "6.1.12",
         "@react-navigation/stack": "6.3.29",
         "@react-ng/bounds-observer": "^0.2.1",
-        "@rnmapbox/maps": "10.1.12",
+        "@rnmapbox/maps": "10.1.26",
         "@shopify/flash-list": "1.6.3",
-        "@storybook/addon-a11y": "^8.0.6",
-        "@storybook/addon-essentials": "^8.0.6",
-        "@storybook/cli": "^8.0.6",
-        "@storybook/react": "^8.0.6",
-        "@storybook/theming": "^8.0.6",
-        "@ua/react-native-airship": "17.2.1",
+        "@types/mime-db": "^1.43.5",
+        "@ua/react-native-airship": "19.2.1",
         "@vue/preload-webpack-plugin": "^2.0.0",
         "awesome-phonenumber": "^5.4.0",
         "babel-polyfill": "^6.26.0",
@@ -56,81 +56,83 @@
         "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#9a68635cdcef4c81593c0f816a007bc9c707d46a",
-        "expo": "^50.0.3",
-        "expo-av": "~13.10.4",
-        "expo-image": "1.11.0",
-        "expo-image-manipulator": "11.8.0",
+        "expensify-common": "2.0.77",
+        "expo": "51.0.17",
+        "expo-av": "14.0.6",
+        "expo-image": "1.12.12",
+        "expo-image-manipulator": "12.0.5",
+        "fast-equals": "^4.0.3",
+        "focus-trap-react": "^10.2.3",
         "htmlparser2": "^7.2.0",
         "idb-keyval": "^6.2.1",
-        "jest-expo": "50.0.1",
+        "jest-expo": "51.0.3",
         "jest-when": "^3.5.2",
         "lodash": "4.17.21",
         "lottie-react-native": "6.5.1",
         "mapbox-gl": "^2.15.0",
         "onfido-sdk-ui": "14.15.0",
         "process": "^0.11.10",
-        "prop-types": "^15.7.2",
         "pusher-js": "8.3.0",
-        "react": "18.2.0",
+        "react": "18.3.1",
         "react-beautiful-dnd": "^13.1.1",
         "react-collapse": "^5.1.0",
+        "react-compiler-runtime": "file:./lib/react-compiler-runtime",
         "react-content-loader": "^7.0.0",
-        "react-dom": "18.1.0",
+        "react-dom": "18.3.1",
         "react-error-boundary": "^4.0.11",
-        "react-fast-pdf": "^1.0.12",
+        "react-fast-pdf": "1.0.14",
         "react-map-gl": "^7.1.3",
-        "react-native": "0.73.4",
+        "react-native": "0.75.2",
         "react-native-android-location-enabler": "^2.0.1",
         "react-native-blob-util": "0.19.4",
-        "react-native-collapsible": "^1.6.1",
+        "react-native-collapsible": "^1.6.2",
         "react-native-config": "1.5.0",
         "react-native-device-info": "10.3.1",
         "react-native-document-picker": "^9.1.1",
         "react-native-draggable-flatlist": "^4.0.1",
         "react-native-fs": "^2.20.0",
-        "react-native-gesture-handler": "2.14.1",
+        "react-native-gesture-handler": "2.18.0",
         "react-native-google-places-autocomplete": "2.5.6",
         "react-native-haptic-feedback": "^2.2.0",
         "react-native-image-picker": "^7.0.3",
-        "react-native-image-size": "git+https://github.com/Expensify/react-native-image-size#bf3ad41a61c4f6f80ed4d497599ef5247a2dd002",
+        "react-native-image-size": "git+https://github.com/Expensify/react-native-image-size#93399c6410de32966eb57085936ef6951398c2c3",
         "react-native-key-command": "^1.0.8",
+        "react-native-keyboard-controller": "^1.12.2",
         "react-native-launch-arguments": "^4.0.2",
         "react-native-linear-gradient": "^2.8.1",
         "react-native-localize": "^2.2.6",
         "react-native-modal": "^13.0.0",
-        "react-native-onyx": "2.0.32",
-        "react-native-pager-view": "6.2.3",
+        "react-native-onyx": "2.0.66",
+        "react-native-pager-view": "6.3.4",
         "react-native-pdf": "6.7.3",
         "react-native-performance": "^5.1.0",
-        "react-native-permissions": "^3.9.3",
+        "react-native-permissions": "^3.10.0",
         "react-native-picker-select": "git+https://github.com/Expensify/react-native-picker-select.git#da50d2c5c54e268499047f9cc98b8df4196c1ddf",
-        "react-native-plaid-link-sdk": "11.5.0",
-        "react-native-qrcode-svg": "^6.2.0",
+        "react-native-plaid-link-sdk": "11.11.0",
+        "react-native-qrcode-svg": "git+https://github.com/Expensify/react-native-qrcode-svg-old",
         "react-native-quick-sqlite": "git+https://github.com/margelo/react-native-quick-sqlite#abc91857d4b3efb2020ec43abd2a508563b64316",
-        "react-native-reanimated": "^3.7.2",
-        "react-native-release-profiler": "^0.1.6",
+        "react-native-reanimated": "3.13.0",
+        "react-native-release-profiler": "^0.2.1",
         "react-native-render-html": "6.3.1",
-        "react-native-safe-area-context": "4.8.2",
-        "react-native-screens": "3.30.1",
+        "react-native-safe-area-context": "4.10.9",
+        "react-native-screens": "3.34.0",
         "react-native-share": "^10.0.2",
         "react-native-sound": "^0.11.2",
-        "react-native-svg": "14.1.0",
+        "react-native-svg": "15.4.0",
         "react-native-tab-view": "^3.5.2",
         "react-native-url-polyfill": "^2.0.0",
         "react-native-view-shot": "3.8.0",
-        "react-native-vision-camera": "^4.0.0-beta.13",
-        "react-native-web": "^0.19.9",
+        "react-native-vision-camera": "4.0.0-beta.13",
+        "react-native-web": "^0.19.12",
         "react-native-web-linear-gradient": "^1.1.2",
         "react-native-web-sound": "^0.1.3",
-        "react-native-webview": "13.6.4",
-        "react-pdf": "^7.7.0",
+        "react-native-webview": "13.8.6",
+        "react-pdf": "^7.7.3",
         "react-plaid-link": "3.3.2",
         "react-web-config": "^1.0.0",
         "react-webcam": "^7.1.1",
         "react-window": "^1.8.9",
-        "semver": "^7.5.2",
-        "shim-keyboard-event-key": "^1.0.3"
+        "semver": "^7.5.2"
       },
       "devDependencies": {
         "@actions/core": "1.10.0",
@@ -146,23 +148,34 @@
         "@babel/runtime": "^7.20.0",
         "@babel/traverse": "^7.22.20",
         "@babel/types": "^7.22.19",
-        "@dword-design/eslint-plugin-import-alias": "^4.0.8",
+        "@callstack/reassure-compare": "^1.0.0-rc.4",
+        "@dword-design/eslint-plugin-import-alias": "^5.0.0",
         "@electron/notarize": "^2.1.0",
         "@jest/globals": "^29.5.0",
         "@ngneat/falso": "^7.1.1",
         "@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/babel-preset": "^0.73.21",
-        "@react-native/metro-config": "^0.73.5",
+        "@octokit/webhooks-types": "^7.5.1",
+        "@perf-profiler/profiler": "^0.10.10",
+        "@perf-profiler/reporter": "^0.9.0",
+        "@perf-profiler/types": "^0.8.0",
+        "@react-native-community/eslint-config": "3.2.0",
+        "@react-native/babel-preset": "0.75.2",
+        "@react-native/metro-config": "0.75.2",
         "@react-navigation/devtools": "^6.0.10",
+        "@storybook/addon-a11y": "^8.1.10",
+        "@storybook/addon-essentials": "^8.1.10",
         "@storybook/addon-webpack5-compiler-babel": "^3.0.3",
-        "@storybook/react-webpack5": "^8.0.6",
+        "@storybook/cli": "^8.1.10",
+        "@storybook/react": "^8.1.10",
+        "@storybook/react-webpack5": "^8.1.6",
+        "@storybook/theming": "^8.1.10",
         "@svgr/webpack": "^6.0.0",
         "@testing-library/jest-native": "5.4.1",
         "@testing-library/react-native": "11.5.1",
         "@trivago/prettier-plugin-sort-imports": "^4.2.0",
+        "@types/base-64": "^1.0.2",
         "@types/canvas-size": "^1.2.2",
         "@types/concurrently": "^7.0.0",
         "@types/jest": "^29.5.2",
@@ -172,24 +185,26 @@
         "@types/mapbox-gl": "^2.7.13",
         "@types/node": "^20.11.5",
         "@types/pusher-js": "^5.1.0",
-        "@types/react": "18.2.45",
+        "@types/react": "^18.2.6",
         "@types/react-beautiful-dnd": "^13.1.4",
         "@types/react-collapse": "^5.0.1",
         "@types/react-dom": "^18.2.4",
+        "@types/react-is": "^18.3.0",
+        "@types/react-native-web": "^0.0.0",
         "@types/react-test-renderer": "^18.0.0",
         "@types/semver": "^7.5.4",
         "@types/setimmediate": "^1.0.2",
         "@types/webpack": "^5.28.5",
         "@types/webpack-bundle-analyzer": "^4.7.0",
-        "@typescript-eslint/eslint-plugin": "^6.13.2",
-        "@typescript-eslint/parser": "^6.13.2",
+        "@typescript-eslint/eslint-plugin": "^7.13.1",
+        "@typescript-eslint/parser": "^7.13.1",
         "@vercel/ncc": "0.38.1",
         "@welldone-software/why-did-you-render": "7.0.1",
         "ajv-cli": "^5.0.0",
-        "babel-eslint": "^10.1.0",
         "babel-jest": "29.4.1",
         "babel-loader": "^9.1.3",
         "babel-plugin-module-resolver": "^5.0.0",
+        "babel-plugin-react-compiler": "0.0.0-experimental-334f00b-20240725",
         "babel-plugin-react-native-web": "^0.18.7",
         "babel-plugin-transform-class-properties": "^6.24.1",
         "babel-plugin-transform-remove-console": "^6.9.4",
@@ -200,44 +215,51 @@
         "csv-parse": "^5.5.5",
         "diff-so-fancy": "^1.3.0",
         "dotenv": "^16.0.3",
-        "electron": "^29.2.0",
-        "electron-builder": "24.13.2",
-        "eslint": "^7.6.0",
-        "eslint-config-airbnb-typescript": "^17.1.0",
-        "eslint-config-expensify": "^2.0.47",
-        "eslint-config-prettier": "^8.8.0",
-        "eslint-plugin-import": "^2.29.1",
-        "eslint-plugin-jest": "^24.1.0",
+        "electron": "^29.4.6",
+        "electron-builder": "25.0.0",
+        "eslint": "^8.57.0",
+        "eslint-config-airbnb-typescript": "^18.0.0",
+        "eslint-config-expensify": "^2.0.58",
+        "eslint-config-prettier": "^9.1.0",
+        "eslint-plugin-jest": "^28.6.0",
         "eslint-plugin-jsdoc": "^46.2.6",
-        "eslint-plugin-jsx-a11y": "^6.6.1",
+        "eslint-plugin-react-compiler": "0.0.0-experimental-9ed098e-20240725",
         "eslint-plugin-react-native-a11y": "^3.3.0",
         "eslint-plugin-storybook": "^0.8.0",
         "eslint-plugin-testing-library": "^6.2.2",
-        "eslint-plugin-you-dont-need-lodash-underscore": "^6.12.0",
+        "eslint-plugin-you-dont-need-lodash-underscore": "^6.14.0",
         "html-webpack-plugin": "^5.5.0",
+        "http-server": "^14.1.1",
         "jest": "29.4.1",
         "jest-circus": "29.4.1",
         "jest-cli": "29.4.1",
         "jest-environment-jsdom": "^29.4.1",
         "jest-transformer-svg": "^2.0.1",
+        "link": "^2.1.1",
         "memfs": "^4.6.0",
         "onchange": "^7.1.0",
+        "openai": "^4.47.2",
         "patch-package": "^8.0.0",
+        "peggy": "^4.0.3",
         "portfinder": "^1.0.28",
         "prettier": "^2.8.8",
         "pusher-js-mock": "^0.3.3",
+        "react-compiler-healthcheck": "^0.0.0-experimental-ab3118d-20240725",
+        "react-is": "^18.3.1",
         "react-native-clean-project": "^4.0.0-alpha4.0",
-        "react-test-renderer": "18.2.0",
-        "reassure": "^0.10.1",
+        "react-test-renderer": "18.3.1",
+        "reassure": "^1.0.0-rc.4",
         "setimmediate": "^1.0.5",
         "shellcheck": "^1.1.0",
-        "storybook": "^8.0.6",
+        "source-map": "^0.7.4",
+        "storybook": "^8.1.10",
         "style-loader": "^2.0.0",
         "time-analytics-webpack-plugin": "^0.1.17",
         "ts-jest": "^29.1.2",
         "ts-node": "^10.9.2",
-        "type-fest": "^4.10.2",
-        "typescript": "^5.3.2",
+        "tsconfig-paths": "^4.2.0",
+        "type-fest": "4.20.0",
+        "typescript": "^5.4.5",
         "wait-port": "^0.2.9",
         "webpack": "^5.76.0",
         "webpack-bundle-analyzer": "^4.5.0",
@@ -247,16 +269,15 @@
         "yaml": "^2.2.1"
       },
       "engines": {
-        "node": "20.10.0",
-        "npm": "10.2.3"
+        "node": "20.15.1",
+        "npm": "10.7.0"
       }
     },
-    "node_modules/@aashutoshrathi/word-wrap": {
-      "version": "1.2.6",
-      "dev": true,
+    "lib/react-compiler-runtime": {
+      "version": "0.0.1",
       "license": "MIT",
-      "engines": {
-        "node": ">=0.10.0"
+      "dependencies": {
+        "react": "18.3.1"
       }
     },
     "node_modules/@actions/core": {
@@ -376,8 +397,8 @@
     },
     "node_modules/@aw-web-design/x-default-browser": {
       "version": "1.4.126",
-      "resolved": "https://registry.npmjs.org/@aw-web-design/x-default-browser/-/x-default-browser-1.4.126.tgz",
-      "integrity": "sha512-Xk1sIhyNC/esHGGVjL/niHLowM0csl/kFO5uawBy4IrWwy0o1G8LGt3jP6nmWGz+USxeeqbihAmp/oVZju6wug==",
+      "dev": true,
+      "license": "MIT",
       "dependencies": {
         "default-browser-id": "3.0.0"
       },
@@ -385,12 +406,160 @@
         "x-default-browser": "bin/x-default-browser.js"
       }
     },
+    "node_modules/@azure/abort-controller": {
+      "version": "2.1.2",
+      "license": "MIT",
+      "peer": true,
+      "dependencies": {
+        "tslib": "^2.6.2"
+      },
+      "engines": {
+        "node": ">=18.0.0"
+      }
+    },
+    "node_modules/@azure/abort-controller/node_modules/tslib": {
+      "version": "2.6.3",
+      "license": "0BSD",
+      "peer": true
+    },
+    "node_modules/@azure/core-auth": {
+      "version": "1.7.2",
+      "license": "MIT",
+      "peer": true,
+      "dependencies": {
+        "@azure/abort-controller": "^2.0.0",
+        "@azure/core-util": "^1.1.0",
+        "tslib": "^2.6.2"
+      },
+      "engines": {
+        "node": ">=18.0.0"
+      }
+    },
+    "node_modules/@azure/core-auth/node_modules/tslib": {
+      "version": "2.6.3",
+      "license": "0BSD",
+      "peer": true
+    },
+    "node_modules/@azure/core-rest-pipeline": {
+      "version": "1.10.1",
+      "license": "MIT",
+      "peer": true,
+      "dependencies": {
+        "@azure/abort-controller": "^1.0.0",
+        "@azure/core-auth": "^1.4.0",
+        "@azure/core-tracing": "^1.0.1",
+        "@azure/core-util": "^1.0.0",
+        "@azure/logger": "^1.0.0",
+        "form-data": "^4.0.0",
+        "http-proxy-agent": "^5.0.0",
+        "https-proxy-agent": "^5.0.0",
+        "tslib": "^2.2.0",
+        "uuid": "^8.3.0"
+      },
+      "engines": {
+        "node": ">=14.0.0"
+      }
+    },
+    "node_modules/@azure/core-rest-pipeline/node_modules/@azure/abort-controller": {
+      "version": "1.1.0",
+      "license": "MIT",
+      "peer": true,
+      "dependencies": {
+        "tslib": "^2.2.0"
+      },
+      "engines": {
+        "node": ">=12.0.0"
+      }
+    },
+    "node_modules/@azure/core-rest-pipeline/node_modules/form-data": {
+      "version": "4.0.0",
+      "license": "MIT",
+      "peer": true,
+      "dependencies": {
+        "asynckit": "^0.4.0",
+        "combined-stream": "^1.0.8",
+        "mime-types": "^2.1.12"
+      },
+      "engines": {
+        "node": ">= 6"
+      }
+    },
+    "node_modules/@azure/core-tracing": {
+      "version": "1.1.2",
+      "license": "MIT",
+      "peer": true,
+      "dependencies": {
+        "tslib": "^2.6.2"
+      },
+      "engines": {
+        "node": ">=18.0.0"
+      }
+    },
+    "node_modules/@azure/core-tracing/node_modules/tslib": {
+      "version": "2.6.3",
+      "license": "0BSD",
+      "peer": true
+    },
+    "node_modules/@azure/core-util": {
+      "version": "1.2.0",
+      "license": "MIT",
+      "peer": true,
+      "dependencies": {
+        "@azure/abort-controller": "^1.0.0",
+        "tslib": "^2.2.0"
+      },
+      "engines": {
+        "node": ">=14.0.0"
+      }
+    },
+    "node_modules/@azure/core-util/node_modules/@azure/abort-controller": {
+      "version": "1.1.0",
+      "license": "MIT",
+      "peer": true,
+      "dependencies": {
+        "tslib": "^2.2.0"
+      },
+      "engines": {
+        "node": ">=12.0.0"
+      }
+    },
+    "node_modules/@azure/logger": {
+      "version": "1.1.2",
+      "license": "MIT",
+      "peer": true,
+      "dependencies": {
+        "tslib": "^2.6.2"
+      },
+      "engines": {
+        "node": ">=18.0.0"
+      }
+    },
+    "node_modules/@azure/logger/node_modules/tslib": {
+      "version": "2.6.3",
+      "license": "0BSD",
+      "peer": true
+    },
+    "node_modules/@azure/opentelemetry-instrumentation-azure-sdk": {
+      "version": "1.0.0-beta.5",
+      "license": "MIT",
+      "peer": true,
+      "dependencies": {
+        "@azure/core-tracing": "^1.0.0",
+        "@azure/logger": "^1.0.0",
+        "@opentelemetry/api": "^1.4.1",
+        "@opentelemetry/core": "^1.15.2",
+        "@opentelemetry/instrumentation": "^0.41.2",
+        "tslib": "^2.2.0"
+      },
+      "engines": {
+        "node": ">=14.0.0"
+      }
+    },
     "node_modules/@babel/code-frame": {
-      "version": "7.24.2",
-      "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.24.2.tgz",
-      "integrity": "sha512-y5+tLQyV8pg3fsiln67BVLD1P13Eg4lh5RW9mF0zUuvLrv9uIQ4MCL+CRT+FTsBlBjcIan6PGsLcBN0m3ClUyQ==",
+      "version": "7.24.7",
+      "license": "MIT",
       "dependencies": {
-        "@babel/highlight": "^7.24.2",
+        "@babel/highlight": "^7.24.7",
         "picocolors": "^1.0.0"
       },
       "engines": {
@@ -398,28 +567,26 @@
       }
     },
     "node_modules/@babel/compat-data": {
-      "version": "7.24.1",
-      "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.24.1.tgz",
-      "integrity": "sha512-Pc65opHDliVpRHuKfzI+gSA4zcgr65O4cl64fFJIWEEh8JoHIHh0Oez1Eo8Arz8zq/JhgKodQaxEwUPRtZylVA==",
+      "version": "7.24.7",
+      "license": "MIT",
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/core": {
-      "version": "7.24.3",
-      "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.24.3.tgz",
-      "integrity": "sha512-5FcvN1JHw2sHJChotgx8Ek0lyuh4kCKelgMTTqhYJJtloNvUfpAFMeNQUtdlIaktwrSV9LtCdqwk48wL2wBacQ==",
+      "version": "7.24.5",
+      "license": "MIT",
       "dependencies": {
         "@ampproject/remapping": "^2.2.0",
         "@babel/code-frame": "^7.24.2",
-        "@babel/generator": "^7.24.1",
+        "@babel/generator": "^7.24.5",
         "@babel/helper-compilation-targets": "^7.23.6",
-        "@babel/helper-module-transforms": "^7.23.3",
-        "@babel/helpers": "^7.24.1",
-        "@babel/parser": "^7.24.1",
+        "@babel/helper-module-transforms": "^7.24.5",
+        "@babel/helpers": "^7.24.5",
+        "@babel/parser": "^7.24.5",
         "@babel/template": "^7.24.0",
-        "@babel/traverse": "^7.24.1",
-        "@babel/types": "^7.24.0",
+        "@babel/traverse": "^7.24.5",
+        "@babel/types": "^7.24.5",
         "convert-source-map": "^2.0.0",
         "debug": "^4.1.0",
         "gensync": "^1.0.0-beta.2",
@@ -435,18 +602,17 @@
       }
     },
     "node_modules/@babel/core/node_modules/@babel/traverse": {
-      "version": "7.24.1",
-      "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.24.1.tgz",
-      "integrity": "sha512-xuU6o9m68KeqZbQuDt2TcKSxUw/mrsvavlEqQ1leZ/B+C9tk6E4sRWy97WaXgvq5E+nU3cXMxv3WKOCanVMCmQ==",
+      "version": "7.24.5",
+      "license": "MIT",
       "dependencies": {
-        "@babel/code-frame": "^7.24.1",
-        "@babel/generator": "^7.24.1",
+        "@babel/code-frame": "^7.24.2",
+        "@babel/generator": "^7.24.5",
         "@babel/helper-environment-visitor": "^7.22.20",
         "@babel/helper-function-name": "^7.23.0",
         "@babel/helper-hoist-variables": "^7.22.5",
-        "@babel/helper-split-export-declaration": "^7.22.6",
-        "@babel/parser": "^7.24.1",
-        "@babel/types": "^7.24.0",
+        "@babel/helper-split-export-declaration": "^7.24.5",
+        "@babel/parser": "^7.24.5",
+        "@babel/types": "^7.24.5",
         "debug": "^4.3.1",
         "globals": "^11.1.0"
       },
@@ -454,11 +620,6 @@
         "node": ">=6.9.0"
       }
     },
-    "node_modules/@babel/core/node_modules/convert-source-map": {
-      "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=="
-    },
     "node_modules/@babel/core/node_modules/semver": {
       "version": "6.3.1",
       "license": "ISC",
@@ -467,10 +628,9 @@
       }
     },
     "node_modules/@babel/eslint-parser": {
-      "version": "7.23.10",
+      "version": "7.24.7",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "@nicolo-ribaudo/eslint-scope-5-internals": "5.1.1-v1",
         "eslint-visitor-keys": "^2.1.0",
@@ -481,24 +641,22 @@
       },
       "peerDependencies": {
         "@babel/core": "^7.11.0",
-        "eslint": "^7.5.0 || ^8.0.0"
+        "eslint": "^7.5.0 || ^8.0.0 || ^9.0.0"
       }
     },
     "node_modules/@babel/eslint-parser/node_modules/semver": {
       "version": "6.3.1",
       "dev": true,
       "license": "ISC",
-      "peer": true,
       "bin": {
         "semver": "bin/semver.js"
       }
     },
     "node_modules/@babel/generator": {
-      "version": "7.24.1",
-      "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.24.1.tgz",
-      "integrity": "sha512-DfCRfZsBcrPEHUfuBMgbJ1Ut01Y/itOs+hY2nFLgqsqXd52/iSiVq5TITtUasIUgm+IIKdY2/1I7auiQOEeC9A==",
+      "version": "7.24.7",
+      "license": "MIT",
       "dependencies": {
-        "@babel/types": "^7.24.0",
+        "@babel/types": "^7.24.7",
         "@jridgewell/gen-mapping": "^0.3.5",
         "@jridgewell/trace-mapping": "^0.3.25",
         "jsesc": "^2.5.1"
@@ -509,8 +667,7 @@
     },
     "node_modules/@babel/generator/node_modules/@jridgewell/gen-mapping": {
       "version": "0.3.5",
-      "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.5.tgz",
-      "integrity": "sha512-IzL8ZoEDIBRWEzlCcRhOaCupYyN5gdIK+Q6fbFdPDg6HqX6jpkItn7DFIpW9LQzXG6Df9sA7+OKnq0qlz/GaQg==",
+      "license": "MIT",
       "dependencies": {
         "@jridgewell/set-array": "^1.2.1",
         "@jridgewell/sourcemap-codec": "^1.4.10",
@@ -521,33 +678,51 @@
       }
     },
     "node_modules/@babel/helper-annotate-as-pure": {
-      "version": "7.22.5",
+      "version": "7.24.7",
       "license": "MIT",
       "dependencies": {
-        "@babel/types": "^7.22.5"
+        "@babel/types": "^7.24.7"
       },
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/helper-builder-binary-assignment-operator-visitor": {
-      "version": "7.22.15",
-      "resolved": "https://registry.npmjs.org/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.22.15.tgz",
-      "integrity": "sha512-QkBXwGgaoC2GtGZRoma6kv7Szfv06khvhFav67ZExau2RaXzy8MpHSMO2PNoP2XtmQphJQRHFfg77Bq731Yizw==",
+      "version": "7.24.7",
+      "license": "MIT",
       "dependencies": {
-        "@babel/types": "^7.22.15"
+        "@babel/traverse": "^7.24.7",
+        "@babel/types": "^7.24.7"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/@babel/helper-builder-binary-assignment-operator-visitor/node_modules/@babel/traverse": {
+      "version": "7.24.7",
+      "license": "MIT",
+      "dependencies": {
+        "@babel/code-frame": "^7.24.7",
+        "@babel/generator": "^7.24.7",
+        "@babel/helper-environment-visitor": "^7.24.7",
+        "@babel/helper-function-name": "^7.24.7",
+        "@babel/helper-hoist-variables": "^7.24.7",
+        "@babel/helper-split-export-declaration": "^7.24.7",
+        "@babel/parser": "^7.24.7",
+        "@babel/types": "^7.24.7",
+        "debug": "^4.3.1",
+        "globals": "^11.1.0"
       },
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/helper-compilation-targets": {
-      "version": "7.23.6",
-      "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.23.6.tgz",
-      "integrity": "sha512-9JB548GZoQVmzrFgp8o7KxdgkTGm6xs9DW0o/Pim72UDjzr5ObUQ6ZzYPqA+g9OTS2bBQoctLJrky0RDCAWRgQ==",
+      "version": "7.24.7",
+      "license": "MIT",
       "dependencies": {
-        "@babel/compat-data": "^7.23.5",
-        "@babel/helper-validator-option": "^7.23.5",
+        "@babel/compat-data": "^7.24.7",
+        "@babel/helper-validator-option": "^7.24.7",
         "browserslist": "^4.22.2",
         "lru-cache": "^5.1.1",
         "semver": "^6.3.1"
@@ -575,18 +750,17 @@
       "license": "ISC"
     },
     "node_modules/@babel/helper-create-class-features-plugin": {
-      "version": "7.24.1",
-      "resolved": "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.24.1.tgz",
-      "integrity": "sha512-1yJa9dX9g//V6fDebXoEfEsxkZHk3Hcbm+zLhyu6qVgYFLvmTALTeV+jNU9e5RnYtioBrGEOdoI2joMSNQ/+aA==",
+      "version": "7.24.7",
+      "license": "MIT",
       "dependencies": {
-        "@babel/helper-annotate-as-pure": "^7.22.5",
-        "@babel/helper-environment-visitor": "^7.22.20",
-        "@babel/helper-function-name": "^7.23.0",
-        "@babel/helper-member-expression-to-functions": "^7.23.0",
-        "@babel/helper-optimise-call-expression": "^7.22.5",
-        "@babel/helper-replace-supers": "^7.24.1",
-        "@babel/helper-skip-transparent-expression-wrappers": "^7.22.5",
-        "@babel/helper-split-export-declaration": "^7.22.6",
+        "@babel/helper-annotate-as-pure": "^7.24.7",
+        "@babel/helper-environment-visitor": "^7.24.7",
+        "@babel/helper-function-name": "^7.24.7",
+        "@babel/helper-member-expression-to-functions": "^7.24.7",
+        "@babel/helper-optimise-call-expression": "^7.24.7",
+        "@babel/helper-replace-supers": "^7.24.7",
+        "@babel/helper-skip-transparent-expression-wrappers": "^7.24.7",
+        "@babel/helper-split-export-declaration": "^7.24.7",
         "semver": "^6.3.1"
       },
       "engines": {
@@ -604,11 +778,10 @@
       }
     },
     "node_modules/@babel/helper-create-regexp-features-plugin": {
-      "version": "7.22.15",
-      "resolved": "https://registry.npmjs.org/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.22.15.tgz",
-      "integrity": "sha512-29FkPLFjn4TPEa3RE7GpW+qbE8tlsu3jntNYNfcGsc49LphF1PQIiD+vMZ1z1xVOKt+93khA9tc2JBs3kBjA7w==",
+      "version": "7.24.7",
+      "license": "MIT",
       "dependencies": {
-        "@babel/helper-annotate-as-pure": "^7.22.5",
+        "@babel/helper-annotate-as-pure": "^7.24.7",
         "regexpu-core": "^5.3.1",
         "semver": "^6.3.1"
       },
@@ -649,64 +822,105 @@
       }
     },
     "node_modules/@babel/helper-environment-visitor": {
-      "version": "7.22.20",
+      "version": "7.24.7",
       "license": "MIT",
+      "dependencies": {
+        "@babel/types": "^7.24.7"
+      },
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/helper-function-name": {
-      "version": "7.23.0",
+      "version": "7.24.7",
       "license": "MIT",
       "dependencies": {
-        "@babel/template": "^7.22.15",
-        "@babel/types": "^7.23.0"
+        "@babel/template": "^7.24.7",
+        "@babel/types": "^7.24.7"
       },
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/helper-hoist-variables": {
-      "version": "7.22.5",
+      "version": "7.24.7",
       "license": "MIT",
       "dependencies": {
-        "@babel/types": "^7.22.5"
+        "@babel/types": "^7.24.7"
       },
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/helper-member-expression-to-functions": {
-      "version": "7.23.0",
+      "version": "7.24.7",
       "license": "MIT",
       "dependencies": {
-        "@babel/types": "^7.23.0"
+        "@babel/traverse": "^7.24.7",
+        "@babel/types": "^7.24.7"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/@babel/helper-member-expression-to-functions/node_modules/@babel/traverse": {
+      "version": "7.24.7",
+      "license": "MIT",
+      "dependencies": {
+        "@babel/code-frame": "^7.24.7",
+        "@babel/generator": "^7.24.7",
+        "@babel/helper-environment-visitor": "^7.24.7",
+        "@babel/helper-function-name": "^7.24.7",
+        "@babel/helper-hoist-variables": "^7.24.7",
+        "@babel/helper-split-export-declaration": "^7.24.7",
+        "@babel/parser": "^7.24.7",
+        "@babel/types": "^7.24.7",
+        "debug": "^4.3.1",
+        "globals": "^11.1.0"
       },
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/helper-module-imports": {
-      "version": "7.24.3",
-      "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.24.3.tgz",
-      "integrity": "sha512-viKb0F9f2s0BCS22QSF308z/+1YWKV/76mwt61NBzS5izMzDPwdq1pTrzf+Li3npBWX9KdQbkeCt1jSAM7lZqg==",
+      "version": "7.24.7",
+      "license": "MIT",
       "dependencies": {
-        "@babel/types": "^7.24.0"
+        "@babel/traverse": "^7.24.7",
+        "@babel/types": "^7.24.7"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/@babel/helper-module-imports/node_modules/@babel/traverse": {
+      "version": "7.24.7",
+      "license": "MIT",
+      "dependencies": {
+        "@babel/code-frame": "^7.24.7",
+        "@babel/generator": "^7.24.7",
+        "@babel/helper-environment-visitor": "^7.24.7",
+        "@babel/helper-function-name": "^7.24.7",
+        "@babel/helper-hoist-variables": "^7.24.7",
+        "@babel/helper-split-export-declaration": "^7.24.7",
+        "@babel/parser": "^7.24.7",
+        "@babel/types": "^7.24.7",
+        "debug": "^4.3.1",
+        "globals": "^11.1.0"
       },
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/helper-module-transforms": {
-      "version": "7.23.3",
-      "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.23.3.tgz",
-      "integrity": "sha512-7bBs4ED9OmswdfDzpz4MpWgSrV7FXlc3zIagvLFjS5H+Mk7Snr21vQ6QwrsoCGMfNC4e4LQPdoULEt4ykz0SRQ==",
+      "version": "7.24.7",
+      "license": "MIT",
       "dependencies": {
-        "@babel/helper-environment-visitor": "^7.22.20",
-        "@babel/helper-module-imports": "^7.22.15",
-        "@babel/helper-simple-access": "^7.22.5",
-        "@babel/helper-split-export-declaration": "^7.22.6",
-        "@babel/helper-validator-identifier": "^7.22.20"
+        "@babel/helper-environment-visitor": "^7.24.7",
+        "@babel/helper-module-imports": "^7.24.7",
+        "@babel/helper-simple-access": "^7.24.7",
+        "@babel/helper-split-export-declaration": "^7.24.7",
+        "@babel/helper-validator-identifier": "^7.24.7"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -716,31 +930,29 @@
       }
     },
     "node_modules/@babel/helper-optimise-call-expression": {
-      "version": "7.22.5",
+      "version": "7.24.7",
       "license": "MIT",
       "dependencies": {
-        "@babel/types": "^7.22.5"
+        "@babel/types": "^7.24.7"
       },
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/helper-plugin-utils": {
-      "version": "7.24.0",
-      "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.24.0.tgz",
-      "integrity": "sha512-9cUznXMG0+FxRuJfvL82QlTqIzhVW9sL0KjMPHhAOOvpQGL8QtdxnBKILjBqxlHyliz0yCa1G903ZXI/FuHy2w==",
+      "version": "7.24.7",
+      "license": "MIT",
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/helper-remap-async-to-generator": {
-      "version": "7.22.20",
-      "resolved": "https://registry.npmjs.org/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.22.20.tgz",
-      "integrity": "sha512-pBGyV4uBqOns+0UvhsTO8qgl8hO89PmiDYv+/COyp1aeMcmfrfruz+/nCMFiYyFF/Knn0yfrC85ZzNFjembFTw==",
+      "version": "7.24.7",
+      "license": "MIT",
       "dependencies": {
-        "@babel/helper-annotate-as-pure": "^7.22.5",
-        "@babel/helper-environment-visitor": "^7.22.20",
-        "@babel/helper-wrap-function": "^7.22.20"
+        "@babel/helper-annotate-as-pure": "^7.24.7",
+        "@babel/helper-environment-visitor": "^7.24.7",
+        "@babel/helper-wrap-function": "^7.24.7"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -750,13 +962,12 @@
       }
     },
     "node_modules/@babel/helper-replace-supers": {
-      "version": "7.24.1",
-      "resolved": "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.24.1.tgz",
-      "integrity": "sha512-QCR1UqC9BzG5vZl8BMicmZ28RuUBnHhAMddD8yHFHDRH9lLTZ9uUPehX8ctVPT8l0TKblJidqcgUUKGVrePleQ==",
+      "version": "7.24.7",
+      "license": "MIT",
       "dependencies": {
-        "@babel/helper-environment-visitor": "^7.22.20",
-        "@babel/helper-member-expression-to-functions": "^7.23.0",
-        "@babel/helper-optimise-call-expression": "^7.22.5"
+        "@babel/helper-environment-visitor": "^7.24.7",
+        "@babel/helper-member-expression-to-functions": "^7.24.7",
+        "@babel/helper-optimise-call-expression": "^7.24.7"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -766,95 +977,152 @@
       }
     },
     "node_modules/@babel/helper-simple-access": {
-      "version": "7.22.5",
+      "version": "7.24.7",
       "license": "MIT",
       "dependencies": {
-        "@babel/types": "^7.22.5"
+        "@babel/traverse": "^7.24.7",
+        "@babel/types": "^7.24.7"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/@babel/helper-simple-access/node_modules/@babel/traverse": {
+      "version": "7.24.7",
+      "license": "MIT",
+      "dependencies": {
+        "@babel/code-frame": "^7.24.7",
+        "@babel/generator": "^7.24.7",
+        "@babel/helper-environment-visitor": "^7.24.7",
+        "@babel/helper-function-name": "^7.24.7",
+        "@babel/helper-hoist-variables": "^7.24.7",
+        "@babel/helper-split-export-declaration": "^7.24.7",
+        "@babel/parser": "^7.24.7",
+        "@babel/types": "^7.24.7",
+        "debug": "^4.3.1",
+        "globals": "^11.1.0"
       },
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/helper-skip-transparent-expression-wrappers": {
-      "version": "7.22.5",
+      "version": "7.24.7",
       "license": "MIT",
       "dependencies": {
-        "@babel/types": "^7.22.5"
+        "@babel/traverse": "^7.24.7",
+        "@babel/types": "^7.24.7"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/@babel/helper-skip-transparent-expression-wrappers/node_modules/@babel/traverse": {
+      "version": "7.24.7",
+      "license": "MIT",
+      "dependencies": {
+        "@babel/code-frame": "^7.24.7",
+        "@babel/generator": "^7.24.7",
+        "@babel/helper-environment-visitor": "^7.24.7",
+        "@babel/helper-function-name": "^7.24.7",
+        "@babel/helper-hoist-variables": "^7.24.7",
+        "@babel/helper-split-export-declaration": "^7.24.7",
+        "@babel/parser": "^7.24.7",
+        "@babel/types": "^7.24.7",
+        "debug": "^4.3.1",
+        "globals": "^11.1.0"
       },
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/helper-split-export-declaration": {
-      "version": "7.22.6",
+      "version": "7.24.7",
       "license": "MIT",
       "dependencies": {
-        "@babel/types": "^7.22.5"
+        "@babel/types": "^7.24.7"
       },
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/helper-string-parser": {
-      "version": "7.23.4",
+      "version": "7.24.7",
       "license": "MIT",
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/helper-validator-identifier": {
-      "version": "7.22.20",
+      "version": "7.24.7",
       "license": "MIT",
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/helper-validator-option": {
-      "version": "7.23.5",
+      "version": "7.24.7",
       "license": "MIT",
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/helper-wrap-function": {
-      "version": "7.22.20",
-      "resolved": "https://registry.npmjs.org/@babel/helper-wrap-function/-/helper-wrap-function-7.22.20.tgz",
-      "integrity": "sha512-pms/UwkOpnQe/PDAEdV/d7dVCoBbB+R4FvYoHGZz+4VPcg7RtYy2KP7S2lbuWM6FCSgob5wshfGESbC/hzNXZw==",
+      "version": "7.24.7",
+      "license": "MIT",
+      "dependencies": {
+        "@babel/helper-function-name": "^7.24.7",
+        "@babel/template": "^7.24.7",
+        "@babel/traverse": "^7.24.7",
+        "@babel/types": "^7.24.7"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/@babel/helper-wrap-function/node_modules/@babel/traverse": {
+      "version": "7.24.7",
+      "license": "MIT",
       "dependencies": {
-        "@babel/helper-function-name": "^7.22.5",
-        "@babel/template": "^7.22.15",
-        "@babel/types": "^7.22.19"
+        "@babel/code-frame": "^7.24.7",
+        "@babel/generator": "^7.24.7",
+        "@babel/helper-environment-visitor": "^7.24.7",
+        "@babel/helper-function-name": "^7.24.7",
+        "@babel/helper-hoist-variables": "^7.24.7",
+        "@babel/helper-split-export-declaration": "^7.24.7",
+        "@babel/parser": "^7.24.7",
+        "@babel/types": "^7.24.7",
+        "debug": "^4.3.1",
+        "globals": "^11.1.0"
       },
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/helpers": {
-      "version": "7.24.1",
-      "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.24.1.tgz",
-      "integrity": "sha512-BpU09QqEe6ZCHuIHFphEFgvNSrubve1FtyMton26ekZ85gRGi6LrTF7zArARp2YvyFxloeiRmtSCq5sjh1WqIg==",
+      "version": "7.24.5",
+      "license": "MIT",
       "dependencies": {
         "@babel/template": "^7.24.0",
-        "@babel/traverse": "^7.24.1",
-        "@babel/types": "^7.24.0"
+        "@babel/traverse": "^7.24.5",
+        "@babel/types": "^7.24.5"
       },
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/helpers/node_modules/@babel/traverse": {
-      "version": "7.24.1",
-      "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.24.1.tgz",
-      "integrity": "sha512-xuU6o9m68KeqZbQuDt2TcKSxUw/mrsvavlEqQ1leZ/B+C9tk6E4sRWy97WaXgvq5E+nU3cXMxv3WKOCanVMCmQ==",
+      "version": "7.24.5",
+      "license": "MIT",
       "dependencies": {
-        "@babel/code-frame": "^7.24.1",
-        "@babel/generator": "^7.24.1",
+        "@babel/code-frame": "^7.24.2",
+        "@babel/generator": "^7.24.5",
         "@babel/helper-environment-visitor": "^7.22.20",
         "@babel/helper-function-name": "^7.23.0",
         "@babel/helper-hoist-variables": "^7.22.5",
-        "@babel/helper-split-export-declaration": "^7.22.6",
-        "@babel/parser": "^7.24.1",
-        "@babel/types": "^7.24.0",
+        "@babel/helper-split-export-declaration": "^7.24.5",
+        "@babel/parser": "^7.24.5",
+        "@babel/types": "^7.24.5",
         "debug": "^4.3.1",
         "globals": "^11.1.0"
       },
@@ -863,11 +1131,10 @@
       }
     },
     "node_modules/@babel/highlight": {
-      "version": "7.24.2",
-      "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.24.2.tgz",
-      "integrity": "sha512-Yac1ao4flkTxTteCDZLEvdxg2fZfz1v8M4QpaGypq/WPDqg3ijHYbDfs+LG5hvzSoqaSZ9/Z9lKSP3CjZjv+pA==",
+      "version": "7.24.7",
+      "license": "MIT",
       "dependencies": {
-        "@babel/helper-validator-identifier": "^7.22.20",
+        "@babel/helper-validator-identifier": "^7.24.7",
         "chalk": "^2.4.2",
         "js-tokens": "^4.0.0",
         "picocolors": "^1.0.0"
@@ -877,9 +1144,8 @@
       }
     },
     "node_modules/@babel/parser": {
-      "version": "7.24.1",
-      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.24.1.tgz",
-      "integrity": "sha512-Zo9c7N3xdOIQrNip7Lc9wvRPzlRtovHVE4lkz8WEDr7uYh/GMQhSiIgFxGIArRHYdJE5kxtZjAf8rT0xhdLCzg==",
+      "version": "7.24.7",
+      "license": "MIT",
       "bin": {
         "parser": "bin/babel-parser.js"
       },
@@ -887,12 +1153,25 @@
         "node": ">=6.0.0"
       }
     },
+    "node_modules/@babel/plugin-bugfix-firefox-class-in-computed-class-key": {
+      "version": "7.24.7",
+      "license": "MIT",
+      "dependencies": {
+        "@babel/helper-environment-visitor": "^7.24.7",
+        "@babel/helper-plugin-utils": "^7.24.7"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0"
+      }
+    },
     "node_modules/@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression": {
-      "version": "7.24.1",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression/-/plugin-bugfix-safari-id-destructuring-collision-in-function-expression-7.24.1.tgz",
-      "integrity": "sha512-y4HqEnkelJIOQGd+3g1bTeKsA5c6qM7eOn7VggGVbBc0y8MLSKHacwcIE2PplNlQSj0PqS9rrXL/nkPVK+kUNg==",
+      "version": "7.24.7",
+      "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.24.0"
+        "@babel/helper-plugin-utils": "^7.24.7"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -902,13 +1181,12 @@
       }
     },
     "node_modules/@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining": {
-      "version": "7.24.1",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining/-/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.24.1.tgz",
-      "integrity": "sha512-Hj791Ii4ci8HqnaKHAlLNs+zaLXb0EzSDhiAWp5VNlyvCNymYfacs64pxTxbH1znW/NcArSmwpmG9IKE/TUVVQ==",
+      "version": "7.24.7",
+      "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.24.0",
-        "@babel/helper-skip-transparent-expression-wrappers": "^7.22.5",
-        "@babel/plugin-transform-optional-chaining": "^7.24.1"
+        "@babel/helper-plugin-utils": "^7.24.7",
+        "@babel/helper-skip-transparent-expression-wrappers": "^7.24.7",
+        "@babel/plugin-transform-optional-chaining": "^7.24.7"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -918,12 +1196,11 @@
       }
     },
     "node_modules/@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly": {
-      "version": "7.24.1",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly/-/plugin-bugfix-v8-static-class-fields-redefine-readonly-7.24.1.tgz",
-      "integrity": "sha512-m9m/fXsXLiHfwdgydIFnpk+7jlVbnvlK5B2EKiPdLUb6WX654ZaaEWJUjk8TftRbZpK0XibovlLWX4KIZhV6jw==",
+      "version": "7.24.7",
+      "license": "MIT",
       "dependencies": {
-        "@babel/helper-environment-visitor": "^7.22.20",
-        "@babel/helper-plugin-utils": "^7.24.0"
+        "@babel/helper-environment-visitor": "^7.24.7",
+        "@babel/helper-plugin-utils": "^7.24.7"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -963,14 +1240,12 @@
       }
     },
     "node_modules/@babel/plugin-proposal-decorators": {
-      "version": "7.19.1",
+      "version": "7.24.7",
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-create-class-features-plugin": "^7.19.0",
-        "@babel/helper-plugin-utils": "^7.19.0",
-        "@babel/helper-replace-supers": "^7.19.1",
-        "@babel/helper-split-export-declaration": "^7.18.6",
-        "@babel/plugin-syntax-decorators": "^7.19.0"
+        "@babel/helper-create-class-features-plugin": "^7.24.7",
+        "@babel/helper-plugin-utils": "^7.24.7",
+        "@babel/plugin-syntax-decorators": "^7.24.7"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1008,6 +1283,20 @@
         "@babel/core": "^7.0.0-0"
       }
     },
+    "node_modules/@babel/plugin-proposal-logical-assignment-operators": {
+      "version": "7.20.7",
+      "license": "MIT",
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.20.2",
+        "@babel/plugin-syntax-logical-assignment-operators": "^7.10.4"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
     "node_modules/@babel/plugin-proposal-nullish-coalescing-operator": {
       "version": "7.18.6",
       "license": "MIT",
@@ -1084,9 +1373,7 @@
     },
     "node_modules/@babel/plugin-proposal-private-methods": {
       "version": "7.18.6",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-private-methods/-/plugin-proposal-private-methods-7.18.6.tgz",
-      "integrity": "sha512-nutsvktDItsNn4rpGItSNV2sz1XwS+nfU0Rg8aCx3W3NOKVzdMjJRu0O5OkgDp3ZGICSTbgRpxZoWsxoKRvbeA==",
-      "deprecated": "This proposal has been merged to the ECMAScript standard and thus this plugin is no longer maintained. Please use @babel/plugin-transform-private-methods instead.",
+      "license": "MIT",
       "dependencies": {
         "@babel/helper-create-class-features-plugin": "^7.18.6",
         "@babel/helper-plugin-utils": "^7.18.6"
@@ -1100,9 +1387,7 @@
     },
     "node_modules/@babel/plugin-proposal-private-property-in-object": {
       "version": "7.21.11",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-private-property-in-object/-/plugin-proposal-private-property-in-object-7.21.11.tgz",
-      "integrity": "sha512-0QZ8qP/3RLDVBwBFoWAwCtgcDZJVwA5LUJRZU8x2YFfKNuFq161wK3cuGrALu5yiPu+vzwTAg/sMWVNeWeNyaw==",
-      "deprecated": "This proposal has been merged to the ECMAScript standard and thus this plugin is no longer maintained. Please use @babel/plugin-transform-private-property-in-object instead.",
+      "license": "MIT",
       "dependencies": {
         "@babel/helper-annotate-as-pure": "^7.18.6",
         "@babel/helper-create-class-features-plugin": "^7.21.0",
@@ -1148,8 +1433,7 @@
     },
     "node_modules/@babel/plugin-syntax-class-static-block": {
       "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-class-static-block/-/plugin-syntax-class-static-block-7.14.5.tgz",
-      "integrity": "sha512-b+YyPmr6ldyNnM6sqYeMWE+bgJcJpO6yS4QD7ymxgH34GBPNDM/THBh8iunyvKIZztiwLH4CJZ0RxTk9emgpjw==",
+      "license": "MIT",
       "dependencies": {
         "@babel/helper-plugin-utils": "^7.14.5"
       },
@@ -1161,10 +1445,10 @@
       }
     },
     "node_modules/@babel/plugin-syntax-decorators": {
-      "version": "7.19.0",
+      "version": "7.24.7",
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.19.0"
+        "@babel/helper-plugin-utils": "^7.24.7"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1208,8 +1492,7 @@
     },
     "node_modules/@babel/plugin-syntax-flow": {
       "version": "7.24.1",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-flow/-/plugin-syntax-flow-7.24.1.tgz",
-      "integrity": "sha512-sxi2kLTI5DeW5vDtMUsk4mTPwvlUDbjOnoWayhynCwrw4QXRld4QEYwqzY8JmQXaJUtgUuCIurtSRH5sn4c7mA==",
+      "license": "MIT",
       "dependencies": {
         "@babel/helper-plugin-utils": "^7.24.0"
       },
@@ -1221,11 +1504,10 @@
       }
     },
     "node_modules/@babel/plugin-syntax-import-assertions": {
-      "version": "7.24.1",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-import-assertions/-/plugin-syntax-import-assertions-7.24.1.tgz",
-      "integrity": "sha512-IuwnI5XnuF189t91XbxmXeCDz3qs6iDRO7GJ++wcfgeXNs/8FmIlKcpDSXNVyuLQxlwvskmI3Ct73wUODkJBlQ==",
+      "version": "7.24.7",
+      "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.24.0"
+        "@babel/helper-plugin-utils": "^7.24.7"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1235,11 +1517,10 @@
       }
     },
     "node_modules/@babel/plugin-syntax-import-attributes": {
-      "version": "7.24.1",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-import-attributes/-/plugin-syntax-import-attributes-7.24.1.tgz",
-      "integrity": "sha512-zhQTMH0X2nVLnb04tz+s7AMuasX8U0FnpE+nHTOhSOINjWMnopoZTxtIKsd45n4GQ/HIZLyfIpoul8e2m0DnRA==",
+      "version": "7.24.7",
+      "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.24.0"
+        "@babel/helper-plugin-utils": "^7.24.7"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1270,8 +1551,7 @@
     },
     "node_modules/@babel/plugin-syntax-jsx": {
       "version": "7.24.1",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.24.1.tgz",
-      "integrity": "sha512-2eCtxZXf+kbkMIsXS4poTvT4Yu5rXiRa+9xGVT56raghjmBTKMpFNc9R4IDiB4emao9eO22Ox7CxuJG7BgExqA==",
+      "license": "MIT",
       "dependencies": {
         "@babel/helper-plugin-utils": "^7.24.0"
       },
@@ -1370,8 +1650,7 @@
     },
     "node_modules/@babel/plugin-syntax-typescript": {
       "version": "7.24.1",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-typescript/-/plugin-syntax-typescript-7.24.1.tgz",
-      "integrity": "sha512-Yhnmvy5HZEnHUty6i++gcfH1/l68AHnItFHnaCv6hn9dNh0hQvvQJsxpi4BMBFN5DLeHBuucT/0DgzXif/OyRw==",
+      "license": "MIT",
       "dependencies": {
         "@babel/helper-plugin-utils": "^7.24.0"
       },
@@ -1397,11 +1676,10 @@
       }
     },
     "node_modules/@babel/plugin-transform-arrow-functions": {
-      "version": "7.24.1",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.24.1.tgz",
-      "integrity": "sha512-ngT/3NkRhsaep9ck9uj2Xhv9+xB1zShY3tM3g6om4xxCELwCDN4g4Aq5dRn48+0hasAql7s2hdBOysCfNpr4fw==",
+      "version": "7.24.7",
+      "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.24.0"
+        "@babel/helper-plugin-utils": "^7.24.7"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1411,13 +1689,12 @@
       }
     },
     "node_modules/@babel/plugin-transform-async-generator-functions": {
-      "version": "7.24.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-async-generator-functions/-/plugin-transform-async-generator-functions-7.24.3.tgz",
-      "integrity": "sha512-Qe26CMYVjpQxJ8zxM1340JFNjZaF+ISWpr1Kt/jGo+ZTUzKkfw/pphEWbRCb+lmSM6k/TOgfYLvmbHkUQ0asIg==",
+      "version": "7.24.7",
+      "license": "MIT",
       "dependencies": {
-        "@babel/helper-environment-visitor": "^7.22.20",
-        "@babel/helper-plugin-utils": "^7.24.0",
-        "@babel/helper-remap-async-to-generator": "^7.22.20",
+        "@babel/helper-environment-visitor": "^7.24.7",
+        "@babel/helper-plugin-utils": "^7.24.7",
+        "@babel/helper-remap-async-to-generator": "^7.24.7",
         "@babel/plugin-syntax-async-generators": "^7.8.4"
       },
       "engines": {
@@ -1428,13 +1705,12 @@
       }
     },
     "node_modules/@babel/plugin-transform-async-to-generator": {
-      "version": "7.24.1",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.24.1.tgz",
-      "integrity": "sha512-AawPptitRXp1y0n4ilKcGbRYWfbbzFWz2NqNu7dacYDtFtz0CMjG64b3LQsb3KIgnf4/obcUL78hfaOS7iCUfw==",
+      "version": "7.24.7",
+      "license": "MIT",
       "dependencies": {
-        "@babel/helper-module-imports": "^7.24.1",
-        "@babel/helper-plugin-utils": "^7.24.0",
-        "@babel/helper-remap-async-to-generator": "^7.22.20"
+        "@babel/helper-module-imports": "^7.24.7",
+        "@babel/helper-plugin-utils": "^7.24.7",
+        "@babel/helper-remap-async-to-generator": "^7.24.7"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1444,11 +1720,10 @@
       }
     },
     "node_modules/@babel/plugin-transform-block-scoped-functions": {
-      "version": "7.24.1",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.24.1.tgz",
-      "integrity": "sha512-TWWC18OShZutrv9C6mye1xwtam+uNi2bnTOCBUd5sZxyHOiWbU6ztSROofIMrK84uweEZC219POICK/sTYwfgg==",
+      "version": "7.24.7",
+      "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.24.0"
+        "@babel/helper-plugin-utils": "^7.24.7"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1458,11 +1733,10 @@
       }
     },
     "node_modules/@babel/plugin-transform-block-scoping": {
-      "version": "7.24.1",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.24.1.tgz",
-      "integrity": "sha512-h71T2QQvDgM2SmT29UYU6ozjMlAt7s7CSs5Hvy8f8cf/GM/Z4a2zMfN+fjVGaieeCrXR3EdQl6C4gQG+OgmbKw==",
+      "version": "7.24.7",
+      "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.24.0"
+        "@babel/helper-plugin-utils": "^7.24.7"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1472,12 +1746,11 @@
       }
     },
     "node_modules/@babel/plugin-transform-class-properties": {
-      "version": "7.24.1",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-class-properties/-/plugin-transform-class-properties-7.24.1.tgz",
-      "integrity": "sha512-OMLCXi0NqvJfORTaPQBwqLXHhb93wkBKZ4aNwMl6WtehO7ar+cmp+89iPEQPqxAnxsOKTaMcs3POz3rKayJ72g==",
+      "version": "7.24.7",
+      "license": "MIT",
       "dependencies": {
-        "@babel/helper-create-class-features-plugin": "^7.24.1",
-        "@babel/helper-plugin-utils": "^7.24.0"
+        "@babel/helper-create-class-features-plugin": "^7.24.7",
+        "@babel/helper-plugin-utils": "^7.24.7"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1487,12 +1760,11 @@
       }
     },
     "node_modules/@babel/plugin-transform-class-static-block": {
-      "version": "7.24.1",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-class-static-block/-/plugin-transform-class-static-block-7.24.1.tgz",
-      "integrity": "sha512-FUHlKCn6J3ERiu8Dv+4eoz7w8+kFLSyeVG4vDAikwADGjUCoHw/JHokyGtr8OR4UjpwPVivyF+h8Q5iv/JmrtA==",
+      "version": "7.24.7",
+      "license": "MIT",
       "dependencies": {
-        "@babel/helper-create-class-features-plugin": "^7.24.1",
-        "@babel/helper-plugin-utils": "^7.24.0",
+        "@babel/helper-create-class-features-plugin": "^7.24.7",
+        "@babel/helper-plugin-utils": "^7.24.7",
         "@babel/plugin-syntax-class-static-block": "^7.14.5"
       },
       "engines": {
@@ -1503,17 +1775,16 @@
       }
     },
     "node_modules/@babel/plugin-transform-classes": {
-      "version": "7.24.1",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-classes/-/plugin-transform-classes-7.24.1.tgz",
-      "integrity": "sha512-ZTIe3W7UejJd3/3R4p7ScyyOoafetUShSf4kCqV0O7F/RiHxVj/wRaRnQlrGwflvcehNA8M42HkAiEDYZu2F1Q==",
+      "version": "7.24.7",
+      "license": "MIT",
       "dependencies": {
-        "@babel/helper-annotate-as-pure": "^7.22.5",
-        "@babel/helper-compilation-targets": "^7.23.6",
-        "@babel/helper-environment-visitor": "^7.22.20",
-        "@babel/helper-function-name": "^7.23.0",
-        "@babel/helper-plugin-utils": "^7.24.0",
-        "@babel/helper-replace-supers": "^7.24.1",
-        "@babel/helper-split-export-declaration": "^7.22.6",
+        "@babel/helper-annotate-as-pure": "^7.24.7",
+        "@babel/helper-compilation-targets": "^7.24.7",
+        "@babel/helper-environment-visitor": "^7.24.7",
+        "@babel/helper-function-name": "^7.24.7",
+        "@babel/helper-plugin-utils": "^7.24.7",
+        "@babel/helper-replace-supers": "^7.24.7",
+        "@babel/helper-split-export-declaration": "^7.24.7",
         "globals": "^11.1.0"
       },
       "engines": {
@@ -1524,12 +1795,11 @@
       }
     },
     "node_modules/@babel/plugin-transform-computed-properties": {
-      "version": "7.24.1",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.24.1.tgz",
-      "integrity": "sha512-5pJGVIUfJpOS+pAqBQd+QMaTD2vCL/HcePooON6pDpHgRp4gNRmzyHTPIkXntwKsq3ayUFVfJaIKPw2pOkOcTw==",
+      "version": "7.24.7",
+      "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.24.0",
-        "@babel/template": "^7.24.0"
+        "@babel/helper-plugin-utils": "^7.24.7",
+        "@babel/template": "^7.24.7"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1539,11 +1809,10 @@
       }
     },
     "node_modules/@babel/plugin-transform-destructuring": {
-      "version": "7.24.1",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.24.1.tgz",
-      "integrity": "sha512-ow8jciWqNxR3RYbSNVuF4U2Jx130nwnBnhRw6N6h1bOejNkABmcI5X5oz29K4alWX7vf1C+o6gtKXikzRKkVdw==",
+      "version": "7.24.7",
+      "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.24.0"
+        "@babel/helper-plugin-utils": "^7.24.7"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1553,12 +1822,11 @@
       }
     },
     "node_modules/@babel/plugin-transform-dotall-regex": {
-      "version": "7.24.1",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.24.1.tgz",
-      "integrity": "sha512-p7uUxgSoZwZ2lPNMzUkqCts3xlp8n+o05ikjy7gbtFJSt9gdU88jAmtfmOxHM14noQXBxfgzf2yRWECiNVhTCw==",
+      "version": "7.24.7",
+      "license": "MIT",
       "dependencies": {
-        "@babel/helper-create-regexp-features-plugin": "^7.22.15",
-        "@babel/helper-plugin-utils": "^7.24.0"
+        "@babel/helper-create-regexp-features-plugin": "^7.24.7",
+        "@babel/helper-plugin-utils": "^7.24.7"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1568,11 +1836,10 @@
       }
     },
     "node_modules/@babel/plugin-transform-duplicate-keys": {
-      "version": "7.24.1",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.24.1.tgz",
-      "integrity": "sha512-msyzuUnvsjsaSaocV6L7ErfNsa5nDWL1XKNnDePLgmz+WdU4w/J8+AxBMrWfi9m4IxfL5sZQKUPQKDQeeAT6lA==",
+      "version": "7.24.7",
+      "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.24.0"
+        "@babel/helper-plugin-utils": "^7.24.7"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1582,11 +1849,10 @@
       }
     },
     "node_modules/@babel/plugin-transform-dynamic-import": {
-      "version": "7.24.1",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-dynamic-import/-/plugin-transform-dynamic-import-7.24.1.tgz",
-      "integrity": "sha512-av2gdSTyXcJVdI+8aFZsCAtR29xJt0S5tas+Ef8NvBNmD1a+N/3ecMLeMBgfcK+xzsjdLDT6oHt+DFPyeqUbDA==",
+      "version": "7.24.7",
+      "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.24.0",
+        "@babel/helper-plugin-utils": "^7.24.7",
         "@babel/plugin-syntax-dynamic-import": "^7.8.3"
       },
       "engines": {
@@ -1597,12 +1863,11 @@
       }
     },
     "node_modules/@babel/plugin-transform-exponentiation-operator": {
-      "version": "7.24.1",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.24.1.tgz",
-      "integrity": "sha512-U1yX13dVBSwS23DEAqU+Z/PkwE9/m7QQy8Y9/+Tdb8UWYaGNDYwTLi19wqIAiROr8sXVum9A/rtiH5H0boUcTw==",
+      "version": "7.24.7",
+      "license": "MIT",
       "dependencies": {
-        "@babel/helper-builder-binary-assignment-operator-visitor": "^7.22.15",
-        "@babel/helper-plugin-utils": "^7.24.0"
+        "@babel/helper-builder-binary-assignment-operator-visitor": "^7.24.7",
+        "@babel/helper-plugin-utils": "^7.24.7"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1612,11 +1877,10 @@
       }
     },
     "node_modules/@babel/plugin-transform-export-namespace-from": {
-      "version": "7.24.1",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-export-namespace-from/-/plugin-transform-export-namespace-from-7.24.1.tgz",
-      "integrity": "sha512-Ft38m/KFOyzKw2UaJFkWG9QnHPG/Q/2SkOrRk4pNBPg5IPZ+dOxcmkK5IyuBcxiNPyyYowPGUReyBvrvZs7IlQ==",
+      "version": "7.24.7",
+      "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.24.0",
+        "@babel/helper-plugin-utils": "^7.24.7",
         "@babel/plugin-syntax-export-namespace-from": "^7.8.3"
       },
       "engines": {
@@ -1628,8 +1892,7 @@
     },
     "node_modules/@babel/plugin-transform-flow-strip-types": {
       "version": "7.24.1",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-flow-strip-types/-/plugin-transform-flow-strip-types-7.24.1.tgz",
-      "integrity": "sha512-iIYPIWt3dUmUKKE10s3W+jsQ3icFkw0JyRVyY1B7G4yK/nngAOHLVx8xlhA6b/Jzl/Y0nis8gjqhqKtRDQqHWQ==",
+      "license": "MIT",
       "dependencies": {
         "@babel/helper-plugin-utils": "^7.24.0",
         "@babel/plugin-syntax-flow": "^7.24.1"
@@ -1642,12 +1905,11 @@
       }
     },
     "node_modules/@babel/plugin-transform-for-of": {
-      "version": "7.24.1",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.24.1.tgz",
-      "integrity": "sha512-OxBdcnF04bpdQdR3i4giHZNZQn7cm8RQKcSwA17wAAqEELo1ZOwp5FFgeptWUQXFyT9kwHo10aqqauYkRZPCAg==",
+      "version": "7.24.7",
+      "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.24.0",
-        "@babel/helper-skip-transparent-expression-wrappers": "^7.22.5"
+        "@babel/helper-plugin-utils": "^7.24.7",
+        "@babel/helper-skip-transparent-expression-wrappers": "^7.24.7"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1657,13 +1919,12 @@
       }
     },
     "node_modules/@babel/plugin-transform-function-name": {
-      "version": "7.24.1",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.24.1.tgz",
-      "integrity": "sha512-BXmDZpPlh7jwicKArQASrj8n22/w6iymRnvHYYd2zO30DbE277JO20/7yXJT3QxDPtiQiOxQBbZH4TpivNXIxA==",
+      "version": "7.24.7",
+      "license": "MIT",
       "dependencies": {
-        "@babel/helper-compilation-targets": "^7.23.6",
-        "@babel/helper-function-name": "^7.23.0",
-        "@babel/helper-plugin-utils": "^7.24.0"
+        "@babel/helper-compilation-targets": "^7.24.7",
+        "@babel/helper-function-name": "^7.24.7",
+        "@babel/helper-plugin-utils": "^7.24.7"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1673,11 +1934,10 @@
       }
     },
     "node_modules/@babel/plugin-transform-json-strings": {
-      "version": "7.24.1",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-json-strings/-/plugin-transform-json-strings-7.24.1.tgz",
-      "integrity": "sha512-U7RMFmRvoasscrIFy5xA4gIp8iWnWubnKkKuUGJjsuOH7GfbMkB+XZzeslx2kLdEGdOJDamEmCqOks6e8nv8DQ==",
+      "version": "7.24.7",
+      "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.24.0",
+        "@babel/helper-plugin-utils": "^7.24.7",
         "@babel/plugin-syntax-json-strings": "^7.8.3"
       },
       "engines": {
@@ -1688,11 +1948,10 @@
       }
     },
     "node_modules/@babel/plugin-transform-literals": {
-      "version": "7.24.1",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-literals/-/plugin-transform-literals-7.24.1.tgz",
-      "integrity": "sha512-zn9pwz8U7nCqOYIiBaOxoQOtYmMODXTJnkxG4AtX8fPmnCRYWBOHD0qcpwS9e2VDSp1zNJYpdnFMIKb8jmwu6g==",
+      "version": "7.24.7",
+      "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.24.0"
+        "@babel/helper-plugin-utils": "^7.24.7"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1702,11 +1961,10 @@
       }
     },
     "node_modules/@babel/plugin-transform-logical-assignment-operators": {
-      "version": "7.24.1",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-logical-assignment-operators/-/plugin-transform-logical-assignment-operators-7.24.1.tgz",
-      "integrity": "sha512-OhN6J4Bpz+hIBqItTeWJujDOfNP+unqv/NJgyhlpSqgBTPm37KkMmZV6SYcOj+pnDbdcl1qRGV/ZiIjX9Iy34w==",
+      "version": "7.24.7",
+      "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.24.0",
+        "@babel/helper-plugin-utils": "^7.24.7",
         "@babel/plugin-syntax-logical-assignment-operators": "^7.10.4"
       },
       "engines": {
@@ -1717,11 +1975,10 @@
       }
     },
     "node_modules/@babel/plugin-transform-member-expression-literals": {
-      "version": "7.24.1",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.24.1.tgz",
-      "integrity": "sha512-4ojai0KysTWXzHseJKa1XPNXKRbuUrhkOPY4rEGeR+7ChlJVKxFa3H3Bz+7tWaGKgJAXUWKOGmltN+u9B3+CVg==",
+      "version": "7.24.7",
+      "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.24.0"
+        "@babel/helper-plugin-utils": "^7.24.7"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1731,12 +1988,11 @@
       }
     },
     "node_modules/@babel/plugin-transform-modules-amd": {
-      "version": "7.24.1",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.24.1.tgz",
-      "integrity": "sha512-lAxNHi4HVtjnHd5Rxg3D5t99Xm6H7b04hUS7EHIXcUl2EV4yl1gWdqZrNzXnSrHveL9qMdbODlLF55mvgjAfaQ==",
+      "version": "7.24.7",
+      "license": "MIT",
       "dependencies": {
-        "@babel/helper-module-transforms": "^7.23.3",
-        "@babel/helper-plugin-utils": "^7.24.0"
+        "@babel/helper-module-transforms": "^7.24.7",
+        "@babel/helper-plugin-utils": "^7.24.7"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1746,13 +2002,12 @@
       }
     },
     "node_modules/@babel/plugin-transform-modules-commonjs": {
-      "version": "7.24.1",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.24.1.tgz",
-      "integrity": "sha512-szog8fFTUxBfw0b98gEWPaEqF42ZUD/T3bkynW/wtgx2p/XCP55WEsb+VosKceRSd6njipdZvNogqdtI4Q0chw==",
+      "version": "7.24.7",
+      "license": "MIT",
       "dependencies": {
-        "@babel/helper-module-transforms": "^7.23.3",
-        "@babel/helper-plugin-utils": "^7.24.0",
-        "@babel/helper-simple-access": "^7.22.5"
+        "@babel/helper-module-transforms": "^7.24.7",
+        "@babel/helper-plugin-utils": "^7.24.7",
+        "@babel/helper-simple-access": "^7.24.7"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1762,14 +2017,13 @@
       }
     },
     "node_modules/@babel/plugin-transform-modules-systemjs": {
-      "version": "7.24.1",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.24.1.tgz",
-      "integrity": "sha512-mqQ3Zh9vFO1Tpmlt8QPnbwGHzNz3lpNEMxQb1kAemn/erstyqw1r9KeOlOfo3y6xAnFEcOv2tSyrXfmMk+/YZA==",
+      "version": "7.24.7",
+      "license": "MIT",
       "dependencies": {
-        "@babel/helper-hoist-variables": "^7.22.5",
-        "@babel/helper-module-transforms": "^7.23.3",
-        "@babel/helper-plugin-utils": "^7.24.0",
-        "@babel/helper-validator-identifier": "^7.22.20"
+        "@babel/helper-hoist-variables": "^7.24.7",
+        "@babel/helper-module-transforms": "^7.24.7",
+        "@babel/helper-plugin-utils": "^7.24.7",
+        "@babel/helper-validator-identifier": "^7.24.7"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1779,12 +2033,11 @@
       }
     },
     "node_modules/@babel/plugin-transform-modules-umd": {
-      "version": "7.24.1",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.24.1.tgz",
-      "integrity": "sha512-tuA3lpPj+5ITfcCluy6nWonSL7RvaG0AOTeAuvXqEKS34lnLzXpDb0dcP6K8jD0zWZFNDVly90AGFJPnm4fOYg==",
+      "version": "7.24.7",
+      "license": "MIT",
       "dependencies": {
-        "@babel/helper-module-transforms": "^7.23.3",
-        "@babel/helper-plugin-utils": "^7.24.0"
+        "@babel/helper-module-transforms": "^7.24.7",
+        "@babel/helper-plugin-utils": "^7.24.7"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1794,11 +2047,11 @@
       }
     },
     "node_modules/@babel/plugin-transform-named-capturing-groups-regex": {
-      "version": "7.22.5",
+      "version": "7.24.7",
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-create-regexp-features-plugin": "^7.22.5",
-        "@babel/helper-plugin-utils": "^7.22.5"
+        "@babel/helper-create-regexp-features-plugin": "^7.24.7",
+        "@babel/helper-plugin-utils": "^7.24.7"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1808,11 +2061,10 @@
       }
     },
     "node_modules/@babel/plugin-transform-new-target": {
-      "version": "7.24.1",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.24.1.tgz",
-      "integrity": "sha512-/rurytBM34hYy0HKZQyA0nHbQgQNFm4Q/BOc9Hflxi2X3twRof7NaE5W46j4kQitm7SvACVRXsa6N/tSZxvPug==",
+      "version": "7.24.7",
+      "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.24.0"
+        "@babel/helper-plugin-utils": "^7.24.7"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1822,11 +2074,10 @@
       }
     },
     "node_modules/@babel/plugin-transform-nullish-coalescing-operator": {
-      "version": "7.24.1",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-nullish-coalescing-operator/-/plugin-transform-nullish-coalescing-operator-7.24.1.tgz",
-      "integrity": "sha512-iQ+caew8wRrhCikO5DrUYx0mrmdhkaELgFa+7baMcVuhxIkN7oxt06CZ51D65ugIb1UWRQ8oQe+HXAVM6qHFjw==",
+      "version": "7.24.7",
+      "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.24.0",
+        "@babel/helper-plugin-utils": "^7.24.7",
         "@babel/plugin-syntax-nullish-coalescing-operator": "^7.8.3"
       },
       "engines": {
@@ -1837,25 +2088,11 @@
       }
     },
     "node_modules/@babel/plugin-transform-numeric-separator": {
-      "version": "7.24.1",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-numeric-separator/-/plugin-transform-numeric-separator-7.24.1.tgz",
-      "integrity": "sha512-7GAsGlK4cNL2OExJH1DzmDeKnRv/LXq0eLUSvudrehVA5Rgg4bIrqEUW29FbKMBRT0ztSqisv7kjP+XIC4ZMNw==",
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.24.0",
-        "@babel/plugin-syntax-numeric-separator": "^7.10.4"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-transform-object-assign": {
-      "version": "7.18.6",
+      "version": "7.24.7",
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.18.6"
+        "@babel/helper-plugin-utils": "^7.24.7",
+        "@babel/plugin-syntax-numeric-separator": "^7.10.4"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1865,14 +2102,13 @@
       }
     },
     "node_modules/@babel/plugin-transform-object-rest-spread": {
-      "version": "7.24.1",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-object-rest-spread/-/plugin-transform-object-rest-spread-7.24.1.tgz",
-      "integrity": "sha512-XjD5f0YqOtebto4HGISLNfiNMTTs6tbkFf2TOqJlYKYmbo+mN9Dnpl4SRoofiziuOWMIyq3sZEUqLo3hLITFEA==",
+      "version": "7.24.7",
+      "license": "MIT",
       "dependencies": {
-        "@babel/helper-compilation-targets": "^7.23.6",
-        "@babel/helper-plugin-utils": "^7.24.0",
+        "@babel/helper-compilation-targets": "^7.24.7",
+        "@babel/helper-plugin-utils": "^7.24.7",
         "@babel/plugin-syntax-object-rest-spread": "^7.8.3",
-        "@babel/plugin-transform-parameters": "^7.24.1"
+        "@babel/plugin-transform-parameters": "^7.24.7"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1882,12 +2118,11 @@
       }
     },
     "node_modules/@babel/plugin-transform-object-super": {
-      "version": "7.24.1",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.24.1.tgz",
-      "integrity": "sha512-oKJqR3TeI5hSLRxudMjFQ9re9fBVUU0GICqM3J1mi8MqlhVr6hC/ZN4ttAyMuQR6EZZIY6h/exe5swqGNNIkWQ==",
+      "version": "7.24.7",
+      "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.24.0",
-        "@babel/helper-replace-supers": "^7.24.1"
+        "@babel/helper-plugin-utils": "^7.24.7",
+        "@babel/helper-replace-supers": "^7.24.7"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1897,11 +2132,10 @@
       }
     },
     "node_modules/@babel/plugin-transform-optional-catch-binding": {
-      "version": "7.24.1",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-optional-catch-binding/-/plugin-transform-optional-catch-binding-7.24.1.tgz",
-      "integrity": "sha512-oBTH7oURV4Y+3EUrf6cWn1OHio3qG/PVwO5J03iSJmBg6m2EhKjkAu/xuaXaYwWW9miYtvbWv4LNf0AmR43LUA==",
+      "version": "7.24.7",
+      "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.24.0",
+        "@babel/helper-plugin-utils": "^7.24.7",
         "@babel/plugin-syntax-optional-catch-binding": "^7.8.3"
       },
       "engines": {
@@ -1912,12 +2146,11 @@
       }
     },
     "node_modules/@babel/plugin-transform-optional-chaining": {
-      "version": "7.24.1",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-optional-chaining/-/plugin-transform-optional-chaining-7.24.1.tgz",
-      "integrity": "sha512-n03wmDt+987qXwAgcBlnUUivrZBPZ8z1plL0YvgQalLm+ZE5BMhGm94jhxXtA1wzv1Cu2aaOv1BM9vbVttrzSg==",
+      "version": "7.24.7",
+      "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.24.0",
-        "@babel/helper-skip-transparent-expression-wrappers": "^7.22.5",
+        "@babel/helper-plugin-utils": "^7.24.7",
+        "@babel/helper-skip-transparent-expression-wrappers": "^7.24.7",
         "@babel/plugin-syntax-optional-chaining": "^7.8.3"
       },
       "engines": {
@@ -1928,11 +2161,10 @@
       }
     },
     "node_modules/@babel/plugin-transform-parameters": {
-      "version": "7.24.1",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.24.1.tgz",
-      "integrity": "sha512-8Jl6V24g+Uw5OGPeWNKrKqXPDw2YDjLc53ojwfMcKwlEoETKU9rU0mHUtcg9JntWI/QYzGAXNWEcVHZ+fR+XXg==",
+      "version": "7.24.7",
+      "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.24.0"
+        "@babel/helper-plugin-utils": "^7.24.7"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1942,12 +2174,11 @@
       }
     },
     "node_modules/@babel/plugin-transform-private-methods": {
-      "version": "7.24.1",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-private-methods/-/plugin-transform-private-methods-7.24.1.tgz",
-      "integrity": "sha512-tGvisebwBO5em4PaYNqt4fkw56K2VALsAbAakY0FjTYqJp7gfdrgr7YX76Or8/cpik0W6+tj3rZ0uHU9Oil4tw==",
+      "version": "7.24.7",
+      "license": "MIT",
       "dependencies": {
-        "@babel/helper-create-class-features-plugin": "^7.24.1",
-        "@babel/helper-plugin-utils": "^7.24.0"
+        "@babel/helper-create-class-features-plugin": "^7.24.7",
+        "@babel/helper-plugin-utils": "^7.24.7"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1957,13 +2188,12 @@
       }
     },
     "node_modules/@babel/plugin-transform-private-property-in-object": {
-      "version": "7.24.1",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-private-property-in-object/-/plugin-transform-private-property-in-object-7.24.1.tgz",
-      "integrity": "sha512-pTHxDVa0BpUbvAgX3Gat+7cSciXqUcY9j2VZKTbSB6+VQGpNgNO9ailxTGHSXlqOnX1Hcx1Enme2+yv7VqP9bg==",
+      "version": "7.24.7",
+      "license": "MIT",
       "dependencies": {
-        "@babel/helper-annotate-as-pure": "^7.22.5",
-        "@babel/helper-create-class-features-plugin": "^7.24.1",
-        "@babel/helper-plugin-utils": "^7.24.0",
+        "@babel/helper-annotate-as-pure": "^7.24.7",
+        "@babel/helper-create-class-features-plugin": "^7.24.7",
+        "@babel/helper-plugin-utils": "^7.24.7",
         "@babel/plugin-syntax-private-property-in-object": "^7.14.5"
       },
       "engines": {
@@ -1974,11 +2204,10 @@
       }
     },
     "node_modules/@babel/plugin-transform-property-literals": {
-      "version": "7.24.1",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.24.1.tgz",
-      "integrity": "sha512-LetvD7CrHmEx0G442gOomRr66d7q8HzzGGr4PMHGr+5YIm6++Yke+jxj246rpvsbyhJwCLxcTn6zW1P1BSenqA==",
+      "version": "7.24.7",
+      "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.24.0"
+        "@babel/helper-plugin-utils": "^7.24.7"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -2085,11 +2314,10 @@
       }
     },
     "node_modules/@babel/plugin-transform-regenerator": {
-      "version": "7.24.1",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.24.1.tgz",
-      "integrity": "sha512-sJwZBCzIBE4t+5Q4IGLaaun5ExVMRY0lYwos/jNecjMrVCygCdph3IKv0tkP5Fc87e/1+bebAmEAGBfnRD+cnw==",
+      "version": "7.24.7",
+      "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.24.0",
+        "@babel/helper-plugin-utils": "^7.24.7",
         "regenerator-transform": "^0.15.2"
       },
       "engines": {
@@ -2100,11 +2328,10 @@
       }
     },
     "node_modules/@babel/plugin-transform-reserved-words": {
-      "version": "7.24.1",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.24.1.tgz",
-      "integrity": "sha512-JAclqStUfIwKN15HrsQADFgeZt+wexNQ0uLhuqvqAUFoqPMjEcFCYZBhq0LUdz6dZK/mD+rErhW71fbx8RYElg==",
+      "version": "7.24.7",
+      "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.24.0"
+        "@babel/helper-plugin-utils": "^7.24.7"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -2139,11 +2366,10 @@
       }
     },
     "node_modules/@babel/plugin-transform-shorthand-properties": {
-      "version": "7.24.1",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.24.1.tgz",
-      "integrity": "sha512-LyjVB1nsJ6gTTUKRjRWx9C1s9hE7dLfP/knKdrfeH9UPtAGjYGgxIbFfx7xyLIEWs7Xe1Gnf8EWiUqfjLhInZA==",
+      "version": "7.24.7",
+      "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.24.0"
+        "@babel/helper-plugin-utils": "^7.24.7"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -2153,12 +2379,11 @@
       }
     },
     "node_modules/@babel/plugin-transform-spread": {
-      "version": "7.24.1",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-spread/-/plugin-transform-spread-7.24.1.tgz",
-      "integrity": "sha512-KjmcIM+fxgY+KxPVbjelJC6hrH1CgtPmTvdXAfn3/a9CnWGSTY7nH4zm5+cjmWJybdcPSsD0++QssDsjcpe47g==",
+      "version": "7.24.7",
+      "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.24.0",
-        "@babel/helper-skip-transparent-expression-wrappers": "^7.22.5"
+        "@babel/helper-plugin-utils": "^7.24.7",
+        "@babel/helper-skip-transparent-expression-wrappers": "^7.24.7"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -2168,11 +2393,10 @@
       }
     },
     "node_modules/@babel/plugin-transform-sticky-regex": {
-      "version": "7.24.1",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.24.1.tgz",
-      "integrity": "sha512-9v0f1bRXgPVcPrngOQvLXeGNNVLc8UjMVfebo9ka0WF3/7+aVUHmaJVT3sa0XCzEFioPfPHZiOcYG9qOsH63cw==",
+      "version": "7.24.7",
+      "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.24.0"
+        "@babel/helper-plugin-utils": "^7.24.7"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -2182,11 +2406,10 @@
       }
     },
     "node_modules/@babel/plugin-transform-template-literals": {
-      "version": "7.24.1",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.24.1.tgz",
-      "integrity": "sha512-WRkhROsNzriarqECASCNu/nojeXCDTE/F2HmRgOzi7NGvyfYGq1NEjKBK3ckLfRgGc6/lPAqP0vDOSw3YtG34g==",
+      "version": "7.24.7",
+      "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.24.0"
+        "@babel/helper-plugin-utils": "^7.24.7"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -2196,11 +2419,10 @@
       }
     },
     "node_modules/@babel/plugin-transform-typeof-symbol": {
-      "version": "7.24.1",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.24.1.tgz",
-      "integrity": "sha512-CBfU4l/A+KruSUoW+vTQthwcAdwuqbpRNB8HQKlZABwHRhsdHZ9fezp4Sn18PeAlYxTNiLMlx4xUBV3AWfg1BA==",
+      "version": "7.24.7",
+      "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.24.0"
+        "@babel/helper-plugin-utils": "^7.24.7"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -2211,8 +2433,7 @@
     },
     "node_modules/@babel/plugin-transform-typescript": {
       "version": "7.24.1",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-typescript/-/plugin-transform-typescript-7.24.1.tgz",
-      "integrity": "sha512-liYSESjX2fZ7JyBFkYG78nfvHlMKE6IpNdTVnxmlYUR+j5ZLsitFbaAE+eJSK2zPPkNWNw4mXL51rQ8WrvdK0w==",
+      "license": "MIT",
       "dependencies": {
         "@babel/helper-annotate-as-pure": "^7.22.5",
         "@babel/helper-create-class-features-plugin": "^7.24.1",
@@ -2227,11 +2448,10 @@
       }
     },
     "node_modules/@babel/plugin-transform-unicode-escapes": {
-      "version": "7.24.1",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-escapes/-/plugin-transform-unicode-escapes-7.24.1.tgz",
-      "integrity": "sha512-RlkVIcWT4TLI96zM660S877E7beKlQw7Ig+wqkKBiWfj0zH5Q4h50q6er4wzZKRNSYpfo6ILJ+hrJAGSX2qcNw==",
+      "version": "7.24.7",
+      "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.24.0"
+        "@babel/helper-plugin-utils": "^7.24.7"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -2241,12 +2461,11 @@
       }
     },
     "node_modules/@babel/plugin-transform-unicode-property-regex": {
-      "version": "7.24.1",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-property-regex/-/plugin-transform-unicode-property-regex-7.24.1.tgz",
-      "integrity": "sha512-Ss4VvlfYV5huWApFsF8/Sq0oXnGO+jB+rijFEFugTd3cwSObUSnUi88djgR5528Csl0uKlrI331kRqe56Ov2Ng==",
+      "version": "7.24.7",
+      "license": "MIT",
       "dependencies": {
-        "@babel/helper-create-regexp-features-plugin": "^7.22.15",
-        "@babel/helper-plugin-utils": "^7.24.0"
+        "@babel/helper-create-regexp-features-plugin": "^7.24.7",
+        "@babel/helper-plugin-utils": "^7.24.7"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -2256,12 +2475,11 @@
       }
     },
     "node_modules/@babel/plugin-transform-unicode-regex": {
-      "version": "7.24.1",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.24.1.tgz",
-      "integrity": "sha512-2A/94wgZgxfTsiLaQ2E36XAOdcZmGAaEEgVmxQWwZXWkGhvoHbaqXcKnU8zny4ycpu3vNqg0L/PcCiYtHtA13g==",
+      "version": "7.24.7",
+      "license": "MIT",
       "dependencies": {
-        "@babel/helper-create-regexp-features-plugin": "^7.22.15",
-        "@babel/helper-plugin-utils": "^7.24.0"
+        "@babel/helper-create-regexp-features-plugin": "^7.24.7",
+        "@babel/helper-plugin-utils": "^7.24.7"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -2271,12 +2489,11 @@
       }
     },
     "node_modules/@babel/plugin-transform-unicode-sets-regex": {
-      "version": "7.24.1",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-sets-regex/-/plugin-transform-unicode-sets-regex-7.24.1.tgz",
-      "integrity": "sha512-fqj4WuzzS+ukpgerpAoOnMfQXwUHFxXUZUE84oL2Kao2N8uSlvcpnAidKASgsNgzZHBsHWvcm8s9FPWUhAb8fA==",
+      "version": "7.24.7",
+      "license": "MIT",
       "dependencies": {
-        "@babel/helper-create-regexp-features-plugin": "^7.22.15",
-        "@babel/helper-plugin-utils": "^7.24.0"
+        "@babel/helper-create-regexp-features-plugin": "^7.24.7",
+        "@babel/helper-plugin-utils": "^7.24.7"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -2286,25 +2503,25 @@
       }
     },
     "node_modules/@babel/preset-env": {
-      "version": "7.24.3",
-      "resolved": "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.24.3.tgz",
-      "integrity": "sha512-fSk430k5c2ff8536JcPvPWK4tZDwehWLGlBp0wrsBUjZVdeQV6lePbwKWZaZfK2vnh/1kQX1PzAJWsnBmVgGJA==",
+      "version": "7.24.7",
+      "license": "MIT",
       "dependencies": {
-        "@babel/compat-data": "^7.24.1",
-        "@babel/helper-compilation-targets": "^7.23.6",
-        "@babel/helper-plugin-utils": "^7.24.0",
-        "@babel/helper-validator-option": "^7.23.5",
-        "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression": "^7.24.1",
-        "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining": "^7.24.1",
-        "@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly": "^7.24.1",
+        "@babel/compat-data": "^7.24.7",
+        "@babel/helper-compilation-targets": "^7.24.7",
+        "@babel/helper-plugin-utils": "^7.24.7",
+        "@babel/helper-validator-option": "^7.24.7",
+        "@babel/plugin-bugfix-firefox-class-in-computed-class-key": "^7.24.7",
+        "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression": "^7.24.7",
+        "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining": "^7.24.7",
+        "@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly": "^7.24.7",
         "@babel/plugin-proposal-private-property-in-object": "7.21.0-placeholder-for-preset-env.2",
         "@babel/plugin-syntax-async-generators": "^7.8.4",
         "@babel/plugin-syntax-class-properties": "^7.12.13",
         "@babel/plugin-syntax-class-static-block": "^7.14.5",
         "@babel/plugin-syntax-dynamic-import": "^7.8.3",
         "@babel/plugin-syntax-export-namespace-from": "^7.8.3",
-        "@babel/plugin-syntax-import-assertions": "^7.24.1",
-        "@babel/plugin-syntax-import-attributes": "^7.24.1",
+        "@babel/plugin-syntax-import-assertions": "^7.24.7",
+        "@babel/plugin-syntax-import-attributes": "^7.24.7",
         "@babel/plugin-syntax-import-meta": "^7.10.4",
         "@babel/plugin-syntax-json-strings": "^7.8.3",
         "@babel/plugin-syntax-logical-assignment-operators": "^7.10.4",
@@ -2316,54 +2533,54 @@
         "@babel/plugin-syntax-private-property-in-object": "^7.14.5",
         "@babel/plugin-syntax-top-level-await": "^7.14.5",
         "@babel/plugin-syntax-unicode-sets-regex": "^7.18.6",
-        "@babel/plugin-transform-arrow-functions": "^7.24.1",
-        "@babel/plugin-transform-async-generator-functions": "^7.24.3",
-        "@babel/plugin-transform-async-to-generator": "^7.24.1",
-        "@babel/plugin-transform-block-scoped-functions": "^7.24.1",
-        "@babel/plugin-transform-block-scoping": "^7.24.1",
-        "@babel/plugin-transform-class-properties": "^7.24.1",
-        "@babel/plugin-transform-class-static-block": "^7.24.1",
-        "@babel/plugin-transform-classes": "^7.24.1",
-        "@babel/plugin-transform-computed-properties": "^7.24.1",
-        "@babel/plugin-transform-destructuring": "^7.24.1",
-        "@babel/plugin-transform-dotall-regex": "^7.24.1",
-        "@babel/plugin-transform-duplicate-keys": "^7.24.1",
-        "@babel/plugin-transform-dynamic-import": "^7.24.1",
-        "@babel/plugin-transform-exponentiation-operator": "^7.24.1",
-        "@babel/plugin-transform-export-namespace-from": "^7.24.1",
-        "@babel/plugin-transform-for-of": "^7.24.1",
-        "@babel/plugin-transform-function-name": "^7.24.1",
-        "@babel/plugin-transform-json-strings": "^7.24.1",
-        "@babel/plugin-transform-literals": "^7.24.1",
-        "@babel/plugin-transform-logical-assignment-operators": "^7.24.1",
-        "@babel/plugin-transform-member-expression-literals": "^7.24.1",
-        "@babel/plugin-transform-modules-amd": "^7.24.1",
-        "@babel/plugin-transform-modules-commonjs": "^7.24.1",
-        "@babel/plugin-transform-modules-systemjs": "^7.24.1",
-        "@babel/plugin-transform-modules-umd": "^7.24.1",
-        "@babel/plugin-transform-named-capturing-groups-regex": "^7.22.5",
-        "@babel/plugin-transform-new-target": "^7.24.1",
-        "@babel/plugin-transform-nullish-coalescing-operator": "^7.24.1",
-        "@babel/plugin-transform-numeric-separator": "^7.24.1",
-        "@babel/plugin-transform-object-rest-spread": "^7.24.1",
-        "@babel/plugin-transform-object-super": "^7.24.1",
-        "@babel/plugin-transform-optional-catch-binding": "^7.24.1",
-        "@babel/plugin-transform-optional-chaining": "^7.24.1",
-        "@babel/plugin-transform-parameters": "^7.24.1",
-        "@babel/plugin-transform-private-methods": "^7.24.1",
-        "@babel/plugin-transform-private-property-in-object": "^7.24.1",
-        "@babel/plugin-transform-property-literals": "^7.24.1",
-        "@babel/plugin-transform-regenerator": "^7.24.1",
-        "@babel/plugin-transform-reserved-words": "^7.24.1",
-        "@babel/plugin-transform-shorthand-properties": "^7.24.1",
-        "@babel/plugin-transform-spread": "^7.24.1",
-        "@babel/plugin-transform-sticky-regex": "^7.24.1",
-        "@babel/plugin-transform-template-literals": "^7.24.1",
-        "@babel/plugin-transform-typeof-symbol": "^7.24.1",
-        "@babel/plugin-transform-unicode-escapes": "^7.24.1",
-        "@babel/plugin-transform-unicode-property-regex": "^7.24.1",
-        "@babel/plugin-transform-unicode-regex": "^7.24.1",
-        "@babel/plugin-transform-unicode-sets-regex": "^7.24.1",
+        "@babel/plugin-transform-arrow-functions": "^7.24.7",
+        "@babel/plugin-transform-async-generator-functions": "^7.24.7",
+        "@babel/plugin-transform-async-to-generator": "^7.24.7",
+        "@babel/plugin-transform-block-scoped-functions": "^7.24.7",
+        "@babel/plugin-transform-block-scoping": "^7.24.7",
+        "@babel/plugin-transform-class-properties": "^7.24.7",
+        "@babel/plugin-transform-class-static-block": "^7.24.7",
+        "@babel/plugin-transform-classes": "^7.24.7",
+        "@babel/plugin-transform-computed-properties": "^7.24.7",
+        "@babel/plugin-transform-destructuring": "^7.24.7",
+        "@babel/plugin-transform-dotall-regex": "^7.24.7",
+        "@babel/plugin-transform-duplicate-keys": "^7.24.7",
+        "@babel/plugin-transform-dynamic-import": "^7.24.7",
+        "@babel/plugin-transform-exponentiation-operator": "^7.24.7",
+        "@babel/plugin-transform-export-namespace-from": "^7.24.7",
+        "@babel/plugin-transform-for-of": "^7.24.7",
+        "@babel/plugin-transform-function-name": "^7.24.7",
+        "@babel/plugin-transform-json-strings": "^7.24.7",
+        "@babel/plugin-transform-literals": "^7.24.7",
+        "@babel/plugin-transform-logical-assignment-operators": "^7.24.7",
+        "@babel/plugin-transform-member-expression-literals": "^7.24.7",
+        "@babel/plugin-transform-modules-amd": "^7.24.7",
+        "@babel/plugin-transform-modules-commonjs": "^7.24.7",
+        "@babel/plugin-transform-modules-systemjs": "^7.24.7",
+        "@babel/plugin-transform-modules-umd": "^7.24.7",
+        "@babel/plugin-transform-named-capturing-groups-regex": "^7.24.7",
+        "@babel/plugin-transform-new-target": "^7.24.7",
+        "@babel/plugin-transform-nullish-coalescing-operator": "^7.24.7",
+        "@babel/plugin-transform-numeric-separator": "^7.24.7",
+        "@babel/plugin-transform-object-rest-spread": "^7.24.7",
+        "@babel/plugin-transform-object-super": "^7.24.7",
+        "@babel/plugin-transform-optional-catch-binding": "^7.24.7",
+        "@babel/plugin-transform-optional-chaining": "^7.24.7",
+        "@babel/plugin-transform-parameters": "^7.24.7",
+        "@babel/plugin-transform-private-methods": "^7.24.7",
+        "@babel/plugin-transform-private-property-in-object": "^7.24.7",
+        "@babel/plugin-transform-property-literals": "^7.24.7",
+        "@babel/plugin-transform-regenerator": "^7.24.7",
+        "@babel/plugin-transform-reserved-words": "^7.24.7",
+        "@babel/plugin-transform-shorthand-properties": "^7.24.7",
+        "@babel/plugin-transform-spread": "^7.24.7",
+        "@babel/plugin-transform-sticky-regex": "^7.24.7",
+        "@babel/plugin-transform-template-literals": "^7.24.7",
+        "@babel/plugin-transform-typeof-symbol": "^7.24.7",
+        "@babel/plugin-transform-unicode-escapes": "^7.24.7",
+        "@babel/plugin-transform-unicode-property-regex": "^7.24.7",
+        "@babel/plugin-transform-unicode-regex": "^7.24.7",
+        "@babel/plugin-transform-unicode-sets-regex": "^7.24.7",
         "@babel/preset-modules": "0.1.6-no-external-plugins",
         "babel-plugin-polyfill-corejs2": "^0.4.10",
         "babel-plugin-polyfill-corejs3": "^0.10.4",
@@ -2380,8 +2597,7 @@
     },
     "node_modules/@babel/preset-env/node_modules/@babel/helper-define-polyfill-provider": {
       "version": "0.6.1",
-      "resolved": "https://registry.npmjs.org/@babel/helper-define-polyfill-provider/-/helper-define-polyfill-provider-0.6.1.tgz",
-      "integrity": "sha512-o7SDgTJuvx5vLKD6SFvkydkSMBvahDKGiNJzG22IZYXhiqoe9efY7zocICBgzHV4IRg5wdgl2nEL/tulKIEIbA==",
+      "license": "MIT",
       "dependencies": {
         "@babel/helper-compilation-targets": "^7.22.6",
         "@babel/helper-plugin-utils": "^7.22.5",
@@ -2405,8 +2621,7 @@
     },
     "node_modules/@babel/preset-env/node_modules/babel-plugin-polyfill-corejs2": {
       "version": "0.4.10",
-      "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-corejs2/-/babel-plugin-polyfill-corejs2-0.4.10.tgz",
-      "integrity": "sha512-rpIuu//y5OX6jVU+a5BCn1R5RSZYWAl2Nar76iwaOdycqb6JPxediskWFMMl7stfwNJR4b7eiQvh5fB5TEQJTQ==",
+      "license": "MIT",
       "dependencies": {
         "@babel/compat-data": "^7.22.6",
         "@babel/helper-define-polyfill-provider": "^0.6.1",
@@ -2418,8 +2633,7 @@
     },
     "node_modules/@babel/preset-env/node_modules/babel-plugin-polyfill-corejs3": {
       "version": "0.10.4",
-      "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-corejs3/-/babel-plugin-polyfill-corejs3-0.10.4.tgz",
-      "integrity": "sha512-25J6I8NGfa5YkCDogHRID3fVCadIR8/pGl1/spvCkzb6lVn6SR3ojpx9nOn9iEBcUsjY24AmdKm5khcfKdylcg==",
+      "license": "MIT",
       "dependencies": {
         "@babel/helper-define-polyfill-provider": "^0.6.1",
         "core-js-compat": "^3.36.1"
@@ -2430,8 +2644,7 @@
     },
     "node_modules/@babel/preset-env/node_modules/babel-plugin-polyfill-regenerator": {
       "version": "0.6.1",
-      "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-regenerator/-/babel-plugin-polyfill-regenerator-0.6.1.tgz",
-      "integrity": "sha512-JfTApdE++cgcTWjsiCQlLyFBMbTUft9ja17saCc93lgV33h4tuCVj7tlvu//qpLwaG+3yEz7/KhahGrUMkVq9g==",
+      "license": "MIT",
       "dependencies": {
         "@babel/helper-define-polyfill-provider": "^0.6.1"
       },
@@ -2441,16 +2654,14 @@
     },
     "node_modules/@babel/preset-env/node_modules/semver": {
       "version": "6.3.1",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",
-      "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==",
+      "license": "ISC",
       "bin": {
         "semver": "bin/semver.js"
       }
     },
     "node_modules/@babel/preset-flow": {
       "version": "7.24.1",
-      "resolved": "https://registry.npmjs.org/@babel/preset-flow/-/preset-flow-7.24.1.tgz",
-      "integrity": "sha512-sWCV2G9pcqZf+JHyv/RyqEIpFypxdCSxWIxQjpdaQxenNog7cN1pr76hg8u0Fz8Qgg0H4ETkGcJnXL8d4j0PPA==",
+      "license": "MIT",
       "dependencies": {
         "@babel/helper-plugin-utils": "^7.24.0",
         "@babel/helper-validator-option": "^7.23.5",
@@ -2465,8 +2676,7 @@
     },
     "node_modules/@babel/preset-modules": {
       "version": "0.1.6-no-external-plugins",
-      "resolved": "https://registry.npmjs.org/@babel/preset-modules/-/preset-modules-0.1.6-no-external-plugins.tgz",
-      "integrity": "sha512-HrcgcIESLm9aIR842yhJ5RWan/gebQUJ6E/E5+rf0y9o6oj7w0Br+sWuL6kEQ/o/AdfvR1Je9jG18/gnpwjEyA==",
+      "license": "MIT",
       "dependencies": {
         "@babel/helper-plugin-utils": "^7.0.0",
         "@babel/types": "^7.4.4",
@@ -2496,8 +2706,7 @@
     },
     "node_modules/@babel/preset-typescript": {
       "version": "7.24.1",
-      "resolved": "https://registry.npmjs.org/@babel/preset-typescript/-/preset-typescript-7.24.1.tgz",
-      "integrity": "sha512-1DBaMmRDpuYQBPWD8Pf/WEwCrtgRHxsZnP4mIy9G/X+hFfbI47Q2G4t1Paakld84+qsk2fSsUPMKg71jkoOOaQ==",
+      "license": "MIT",
       "dependencies": {
         "@babel/helper-plugin-utils": "^7.24.0",
         "@babel/helper-validator-option": "^7.23.5",
@@ -2514,8 +2723,7 @@
     },
     "node_modules/@babel/register": {
       "version": "7.23.7",
-      "resolved": "https://registry.npmjs.org/@babel/register/-/register-7.23.7.tgz",
-      "integrity": "sha512-EjJeB6+kvpk+Y5DAkEAmbOBEFkh9OASx0huoEkqYTFxAZHzOAX2Oh5uwAUuL2rUddqfM0SA+KPXV2TbzoZ2kvQ==",
+      "license": "MIT",
       "dependencies": {
         "clone-deep": "^4.0.1",
         "find-cache-dir": "^2.0.0",
@@ -2535,7 +2743,7 @@
       "license": "MIT"
     },
     "node_modules/@babel/runtime": {
-      "version": "7.23.2",
+      "version": "7.24.6",
       "license": "MIT",
       "dependencies": {
         "regenerator-runtime": "^0.14.0"
@@ -2549,13 +2757,12 @@
       "license": "MIT"
     },
     "node_modules/@babel/template": {
-      "version": "7.24.0",
-      "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.24.0.tgz",
-      "integrity": "sha512-Bkf2q8lMB0AFpX0NFEqSbx1OkTHf0f+0j82mkw+ZpzBnkk7e9Ql0891vlfgi+kHwOk8tQjiQHpqh4LaSa0fKEA==",
+      "version": "7.24.7",
+      "license": "MIT",
       "dependencies": {
-        "@babel/code-frame": "^7.23.5",
-        "@babel/parser": "^7.24.0",
-        "@babel/types": "^7.24.0"
+        "@babel/code-frame": "^7.24.7",
+        "@babel/parser": "^7.24.7",
+        "@babel/types": "^7.24.7"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -2581,12 +2788,11 @@
       }
     },
     "node_modules/@babel/types": {
-      "version": "7.24.0",
-      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.24.0.tgz",
-      "integrity": "sha512-+j7a5c253RfKh8iABBhywc8NSfP5LURe7Uh4qpsh6jc+aLJguvmIUBdjSdEMQv2bENrCR5MfRdjGo7vzS/ob7w==",
+      "version": "7.24.7",
+      "license": "MIT",
       "dependencies": {
-        "@babel/helper-string-parser": "^7.23.4",
-        "@babel/helper-validator-identifier": "^7.22.20",
+        "@babel/helper-string-parser": "^7.24.7",
+        "@babel/helper-validator-identifier": "^7.24.7",
         "to-fast-properties": "^2.0.0"
       },
       "engines": {
@@ -2595,8 +2801,8 @@
     },
     "node_modules/@base2/pretty-print-object": {
       "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/@base2/pretty-print-object/-/pretty-print-object-1.0.1.tgz",
-      "integrity": "sha512-4iri8i1AqYHJE2DstZYkyEprg6Pq6sKx3xn5FpySk9sNhH7qN2LLlHJCfDTZRILNwQNPD7mATWM0TBui7uC1pA=="
+      "dev": true,
+      "license": "BSD-2-Clause"
     },
     "node_modules/@bcoe/v8-coverage": {
       "version": "0.2.3",
@@ -2613,15 +2819,15 @@
       "license": "Apache-2.0"
     },
     "node_modules/@callstack/reassure-cli": {
-      "version": "0.10.0",
+      "version": "1.0.0-rc.4",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@callstack/reassure-compare": "0.6.0",
-        "@callstack/reassure-logger": "0.3.1",
+        "@callstack/reassure-compare": "1.0.0-rc.4",
+        "@callstack/reassure-logger": "1.0.0-rc.4",
         "chalk": "4.1.2",
-        "simple-git": "^3.16.0",
-        "yargs": "^17.6.2"
+        "simple-git": "^3.24.0",
+        "yargs": "^17.7.2"
       },
       "bin": {
         "reassure": "lib/commonjs/bin.js"
@@ -2692,23 +2898,23 @@
       }
     },
     "node_modules/@callstack/reassure-compare": {
-      "version": "0.6.0",
+      "version": "1.0.0-rc.4",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@callstack/reassure-logger": "0.3.1",
-        "markdown-builder": "^0.9.0",
+        "@callstack/reassure-logger": "1.0.0-rc.4",
         "markdown-table": "^2.0.0",
-        "zod": "^3.20.2"
+        "ts-regex-builder": "^1.7.1",
+        "zod": "^3.23.8"
       }
     },
     "node_modules/@callstack/reassure-danger": {
-      "version": "0.1.1",
+      "version": "1.0.0-rc.4",
       "dev": true,
       "license": "MIT"
     },
     "node_modules/@callstack/reassure-logger": {
-      "version": "0.3.1",
+      "version": "1.0.0-rc.4",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -2780,21 +2986,21 @@
       }
     },
     "node_modules/@callstack/reassure-measure": {
-      "version": "0.6.0",
+      "version": "1.0.0-rc.4",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@callstack/reassure-logger": "0.3.1",
-        "mathjs": "^11.5.0"
+        "@callstack/reassure-logger": "1.0.0-rc.4",
+        "mathjs": "^12.4.2"
       },
       "peerDependencies": {
-        "react": "*"
+        "react": ">=18.0.0"
       }
     },
     "node_modules/@colors/colors": {
       "version": "1.5.0",
-      "resolved": "https://registry.npmjs.org/@colors/colors/-/colors-1.5.0.tgz",
-      "integrity": "sha512-ooWCrlZP11i8GImSjTHYHLkvFDP48nS4+204nGb1RiX/WXYHmJA2III9/e2DWVabCESdW7hBAEzHRqUn9OUVvQ==",
+      "dev": true,
+      "license": "MIT",
       "optional": true,
       "engines": {
         "node": ">=0.1.90"
@@ -2866,6 +3072,7 @@
     },
     "node_modules/@discoveryjs/json-ext": {
       "version": "0.5.7",
+      "dev": true,
       "license": "MIT",
       "engines": {
         "node": ">=10.0.0"
@@ -2897,35 +3104,35 @@
       }
     },
     "node_modules/@dword-design/eslint-plugin-import-alias": {
-      "version": "4.0.8",
+      "version": "5.0.0",
       "dev": true,
       "license": "MIT",
       "dependencies": {
         "@babel/core": "^7.10.2",
-        "@dword-design/functions": "^5.0.22",
+        "@dword-design/functions": "^6.0.0",
         "babel-plugin-module-resolver": "^5.0.0",
         "deepmerge": "^4.3.1",
         "jiti": "^1.18.2"
       },
       "engines": {
-        "node": ">=16"
+        "node": ">=18"
       },
       "funding": {
         "url": "https://github.com/sponsors/dword-design"
       }
     },
     "node_modules/@dword-design/functions": {
-      "version": "5.0.26",
+      "version": "6.0.0",
       "dev": true,
       "license": "MIT",
       "dependencies": {
         "@dword-design/endent": "^1.0.0",
-        "delay": "^5.0.0",
+        "delay": "^6.0.0",
         "lodash": "^4.17.15",
         "tinycolor2": "^1.4.1"
       },
       "engines": {
-        "node": ">=14"
+        "node": ">=18"
       },
       "funding": {
         "url": "https://github.com/sponsors/dword-design"
@@ -2942,7 +3149,7 @@
       }
     },
     "node_modules/@electron/asar": {
-      "version": "3.2.8",
+      "version": "3.2.10",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -3023,7 +3230,7 @@
       }
     },
     "node_modules/@electron/notarize": {
-      "version": "2.2.1",
+      "version": "2.3.2",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -3036,7 +3243,7 @@
       }
     },
     "node_modules/@electron/osx-sign": {
-      "version": "1.0.5",
+      "version": "1.3.0",
       "dev": true,
       "license": "BSD-2-Clause",
       "dependencies": {
@@ -3079,439 +3286,251 @@
         "url": "https://github.com/sponsors/gjtorikian/"
       }
     },
-    "node_modules/@electron/universal": {
-      "version": "1.5.1",
+    "node_modules/@electron/rebuild": {
+      "version": "3.6.0",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@electron/asar": "^3.2.1",
-        "@malept/cross-spawn-promise": "^1.1.0",
-        "debug": "^4.3.1",
-        "dir-compare": "^3.0.0",
-        "fs-extra": "^9.0.1",
-        "minimatch": "^3.0.4",
-        "plist": "^3.0.4"
+        "@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.45.0",
+        "node-api-version": "^0.2.0",
+        "node-gyp": "^9.0.0",
+        "ora": "^5.1.0",
+        "read-binary-file-arch": "^1.0.6",
+        "semver": "^7.3.5",
+        "tar": "^6.0.5",
+        "yargs": "^17.0.1"
+      },
+      "bin": {
+        "electron-rebuild": "lib/cli.js"
       },
       "engines": {
-        "node": ">=8.6"
-      }
-    },
-    "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",
-      "integrity": "sha512-jT/qyKZ9rzLErtrjGgdkMBn2OP8wl0G3sQlBb3YPryvKHsjvINUhVaPFfP+fpBcOkmrVOVEEHQFJ7nbj2TH2gw==",
-      "peerDependencies": {
-        "react": ">=16.8.0"
+        "node": ">=12.13.0"
       }
     },
-    "node_modules/@es-joy/jsdoccomment": {
-      "version": "0.39.4",
+    "node_modules/@electron/rebuild/node_modules/ansi-styles": {
+      "version": "4.3.0",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "comment-parser": "1.3.1",
-        "esquery": "^1.5.0",
-        "jsdoc-type-pratt-parser": "~4.0.0"
+        "color-convert": "^2.0.1"
       },
       "engines": {
-        "node": ">=16"
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
       }
     },
-    "node_modules/@esbuild/aix-ppc64": {
-      "version": "0.20.2",
-      "resolved": "https://registry.npmjs.org/@esbuild/aix-ppc64/-/aix-ppc64-0.20.2.tgz",
-      "integrity": "sha512-D+EBOJHXdNZcLJRBkhENNG8Wji2kgc9AZ9KiPr1JuZjsNtyHzrsfLRrY0tk2H2aoFu6RANO1y1iPPUCDYWkb5g==",
-      "cpu": [
-        "ppc64"
-      ],
-      "optional": true,
-      "os": [
-        "aix"
-      ],
+    "node_modules/@electron/rebuild/node_modules/chalk": {
+      "version": "4.1.2",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "ansi-styles": "^4.1.0",
+        "supports-color": "^7.1.0"
+      },
       "engines": {
-        "node": ">=12"
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/chalk?sponsor=1"
       }
     },
-    "node_modules/@esbuild/android-arm": {
-      "version": "0.20.2",
-      "resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.20.2.tgz",
-      "integrity": "sha512-t98Ra6pw2VaDhqNWO2Oph2LXbz/EJcnLmKLGBJwEwXX/JAN83Fym1rU8l0JUWK6HkIbWONCSSatf4sf2NBRx/w==",
-      "cpu": [
-        "arm"
-      ],
-      "optional": true,
-      "os": [
-        "android"
-      ],
+    "node_modules/@electron/rebuild/node_modules/color-convert": {
+      "version": "2.0.1",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "color-name": "~1.1.4"
+      },
       "engines": {
-        "node": ">=12"
+        "node": ">=7.0.0"
       }
     },
-    "node_modules/@esbuild/android-arm64": {
-      "version": "0.20.2",
-      "resolved": "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.20.2.tgz",
-      "integrity": "sha512-mRzjLacRtl/tWU0SvD8lUEwb61yP9cqQo6noDZP/O8VkwafSYwZ4yWy24kan8jE/IMERpYncRt2dw438LP3Xmg==",
-      "cpu": [
-        "arm64"
-      ],
-      "optional": true,
-      "os": [
-        "android"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
+    "node_modules/@electron/rebuild/node_modules/color-name": {
+      "version": "1.1.4",
+      "dev": true,
+      "license": "MIT"
     },
-    "node_modules/@esbuild/android-x64": {
-      "version": "0.20.2",
-      "resolved": "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.20.2.tgz",
-      "integrity": "sha512-btzExgV+/lMGDDa194CcUQm53ncxzeBrWJcncOBxuC6ndBkKxnHdFJn86mCIgTELsooUmwUm9FkhSp5HYu00Rg==",
-      "cpu": [
-        "x64"
-      ],
-      "optional": true,
-      "os": [
-        "android"
-      ],
+    "node_modules/@electron/rebuild/node_modules/fs-extra": {
+      "version": "10.1.0",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "graceful-fs": "^4.2.0",
+        "jsonfile": "^6.0.1",
+        "universalify": "^2.0.0"
+      },
       "engines": {
         "node": ">=12"
       }
     },
-    "node_modules/@esbuild/darwin-arm64": {
-      "version": "0.20.2",
-      "resolved": "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.20.2.tgz",
-      "integrity": "sha512-4J6IRT+10J3aJH3l1yzEg9y3wkTDgDk7TSDFX+wKFiWjqWp/iCfLIYzGyasx9l0SAFPT1HwSCR+0w/h1ES/MjA==",
-      "cpu": [
-        "arm64"
-      ],
-      "optional": true,
-      "os": [
-        "darwin"
-      ],
+    "node_modules/@electron/rebuild/node_modules/has-flag": {
+      "version": "4.0.0",
+      "dev": true,
+      "license": "MIT",
       "engines": {
-        "node": ">=12"
+        "node": ">=8"
       }
     },
-    "node_modules/@esbuild/darwin-x64": {
-      "version": "0.20.2",
-      "resolved": "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.20.2.tgz",
-      "integrity": "sha512-tBcXp9KNphnNH0dfhv8KYkZhjc+H3XBkF5DKtswJblV7KlT9EI2+jeA8DgBjp908WEuYll6pF+UStUCfEpdysA==",
-      "cpu": [
-        "x64"
-      ],
-      "optional": true,
-      "os": [
-        "darwin"
-      ],
+    "node_modules/@electron/rebuild/node_modules/supports-color": {
+      "version": "7.2.0",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "has-flag": "^4.0.0"
+      },
       "engines": {
-        "node": ">=12"
+        "node": ">=8"
       }
     },
-    "node_modules/@esbuild/freebsd-arm64": {
-      "version": "0.20.2",
-      "resolved": "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.20.2.tgz",
-      "integrity": "sha512-d3qI41G4SuLiCGCFGUrKsSeTXyWG6yem1KcGZVS+3FYlYhtNoNgYrWcvkOoaqMhwXSMrZRl69ArHsGJ9mYdbbw==",
-      "cpu": [
-        "arm64"
-      ],
-      "optional": true,
-      "os": [
-        "freebsd"
-      ],
+    "node_modules/@electron/universal": {
+      "version": "2.0.1",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@electron/asar": "^3.2.7",
+        "@malept/cross-spawn-promise": "^2.0.0",
+        "debug": "^4.3.1",
+        "dir-compare": "^4.2.0",
+        "fs-extra": "^11.1.1",
+        "minimatch": "^9.0.3",
+        "plist": "^3.1.0"
+      },
       "engines": {
-        "node": ">=12"
+        "node": ">=16.4"
       }
     },
-    "node_modules/@esbuild/freebsd-x64": {
-      "version": "0.20.2",
-      "resolved": "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.20.2.tgz",
-      "integrity": "sha512-d+DipyvHRuqEeM5zDivKV1KuXn9WeRX6vqSqIDgwIfPQtwMP4jaDsQsDncjTDDsExT4lR/91OLjRo8bmC1e+Cw==",
-      "cpu": [
-        "x64"
-      ],
-      "optional": true,
-      "os": [
-        "freebsd"
-      ],
-      "engines": {
-        "node": ">=12"
+    "node_modules/@electron/universal/node_modules/brace-expansion": {
+      "version": "2.0.1",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "balanced-match": "^1.0.0"
       }
     },
-    "node_modules/@esbuild/linux-arm": {
-      "version": "0.20.2",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.20.2.tgz",
-      "integrity": "sha512-VhLPeR8HTMPccbuWWcEUD1Az68TqaTYyj6nfE4QByZIQEQVWBB8vup8PpR7y1QHL3CpcF6xd5WVBU/+SBEvGTg==",
-      "cpu": [
-        "arm"
-      ],
-      "optional": true,
-      "os": [
-        "linux"
-      ],
+    "node_modules/@electron/universal/node_modules/fs-extra": {
+      "version": "11.2.0",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "graceful-fs": "^4.2.0",
+        "jsonfile": "^6.0.1",
+        "universalify": "^2.0.0"
+      },
       "engines": {
-        "node": ">=12"
+        "node": ">=14.14"
       }
     },
-    "node_modules/@esbuild/linux-arm64": {
-      "version": "0.20.2",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.20.2.tgz",
-      "integrity": "sha512-9pb6rBjGvTFNira2FLIWqDk/uaf42sSyLE8j1rnUpuzsODBq7FvpwHYZxQ/It/8b+QOS1RYfqgGFNLRI+qlq2A==",
-      "cpu": [
-        "arm64"
-      ],
-      "optional": true,
-      "os": [
-        "linux"
-      ],
+    "node_modules/@electron/universal/node_modules/minimatch": {
+      "version": "9.0.5",
+      "dev": true,
+      "license": "ISC",
+      "dependencies": {
+        "brace-expansion": "^2.0.1"
+      },
       "engines": {
-        "node": ">=12"
+        "node": ">=16 || 14 >=14.17"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
       }
     },
-    "node_modules/@esbuild/linux-ia32": {
-      "version": "0.20.2",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.20.2.tgz",
-      "integrity": "sha512-o10utieEkNPFDZFQm9CoP7Tvb33UutoJqg3qKf1PWVeeJhJw0Q347PxMvBgVVFgouYLGIhFYG0UGdBumROyiig==",
-      "cpu": [
-        "ia32"
-      ],
-      "optional": true,
-      "os": [
-        "linux"
-      ],
-      "engines": {
-        "node": ">=12"
+    "node_modules/@emotion/use-insertion-effect-with-fallbacks": {
+      "version": "1.0.1",
+      "dev": true,
+      "license": "MIT",
+      "peerDependencies": {
+        "react": ">=16.8.0"
       }
     },
-    "node_modules/@esbuild/linux-loong64": {
-      "version": "0.20.2",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.20.2.tgz",
-      "integrity": "sha512-PR7sp6R/UC4CFVomVINKJ80pMFlfDfMQMYynX7t1tNTeivQ6XdX5r2XovMmha/VjR1YN/HgHWsVcTRIMkymrgQ==",
-      "cpu": [
-        "loong64"
-      ],
-      "optional": true,
-      "os": [
-        "linux"
-      ],
+    "node_modules/@es-joy/jsdoccomment": {
+      "version": "0.39.4",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "comment-parser": "1.3.1",
+        "esquery": "^1.5.0",
+        "jsdoc-type-pratt-parser": "~4.0.0"
+      },
       "engines": {
-        "node": ">=12"
+        "node": ">=16"
       }
     },
-    "node_modules/@esbuild/linux-mips64el": {
+    "node_modules/@esbuild/darwin-arm64": {
       "version": "0.20.2",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.20.2.tgz",
-      "integrity": "sha512-4BlTqeutE/KnOiTG5Y6Sb/Hw6hsBOZapOVF6njAESHInhlQAghVVZL1ZpIctBOoTFbQyGW+LsVYZ8lSSB3wkjA==",
       "cpu": [
-        "mips64el"
+        "arm64"
       ],
+      "dev": true,
+      "license": "MIT",
       "optional": true,
       "os": [
-        "linux"
+        "darwin"
       ],
       "engines": {
         "node": ">=12"
       }
     },
-    "node_modules/@esbuild/linux-ppc64": {
-      "version": "0.20.2",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.20.2.tgz",
-      "integrity": "sha512-rD3KsaDprDcfajSKdn25ooz5J5/fWBylaaXkuotBDGnMnDP1Uv5DLAN/45qfnf3JDYyJv/ytGHQaziHUdyzaAg==",
-      "cpu": [
-        "ppc64"
-      ],
-      "optional": true,
-      "os": [
-        "linux"
-      ],
+    "node_modules/@eslint-community/eslint-utils": {
+      "version": "4.4.0",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "eslint-visitor-keys": "^3.3.0"
+      },
       "engines": {
-        "node": ">=12"
+        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+      },
+      "peerDependencies": {
+        "eslint": "^6.0.0 || ^7.0.0 || >=8.0.0"
       }
     },
-    "node_modules/@esbuild/linux-riscv64": {
-      "version": "0.20.2",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.20.2.tgz",
-      "integrity": "sha512-snwmBKacKmwTMmhLlz/3aH1Q9T8v45bKYGE3j26TsaOVtjIag4wLfWSiZykXzXuE1kbCE+zJRmwp+ZbIHinnVg==",
-      "cpu": [
-        "riscv64"
-      ],
-      "optional": true,
-      "os": [
-        "linux"
-      ],
+    "node_modules/@eslint-community/eslint-utils/node_modules/eslint-visitor-keys": {
+      "version": "3.4.3",
+      "dev": true,
+      "license": "Apache-2.0",
       "engines": {
-        "node": ">=12"
+        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+      },
+      "funding": {
+        "url": "https://opencollective.com/eslint"
       }
     },
-    "node_modules/@esbuild/linux-s390x": {
-      "version": "0.20.2",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.20.2.tgz",
-      "integrity": "sha512-wcWISOobRWNm3cezm5HOZcYz1sKoHLd8VL1dl309DiixxVFoFe/o8HnwuIwn6sXre88Nwj+VwZUvJf4AFxkyrQ==",
-      "cpu": [
-        "s390x"
-      ],
-      "optional": true,
-      "os": [
-        "linux"
-      ],
+    "node_modules/@eslint-community/regexpp": {
+      "version": "4.10.1",
+      "dev": true,
+      "license": "MIT",
       "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/@esbuild/linux-x64": {
-      "version": "0.20.2",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.20.2.tgz",
-      "integrity": "sha512-1MdwI6OOTsfQfek8sLwgyjOXAu+wKhLEoaOLTjbijk6E2WONYpH9ZU2mNtR+lZ2B4uwr+usqGuVfFT9tMtGvGw==",
-      "cpu": [
-        "x64"
-      ],
-      "optional": true,
-      "os": [
-        "linux"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/@esbuild/netbsd-x64": {
-      "version": "0.20.2",
-      "resolved": "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.20.2.tgz",
-      "integrity": "sha512-K8/DhBxcVQkzYc43yJXDSyjlFeHQJBiowJ0uVL6Tor3jGQfSGHNNJcWxNbOI8v5k82prYqzPuwkzHt3J1T1iZQ==",
-      "cpu": [
-        "x64"
-      ],
-      "optional": true,
-      "os": [
-        "netbsd"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/@esbuild/openbsd-x64": {
-      "version": "0.20.2",
-      "resolved": "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.20.2.tgz",
-      "integrity": "sha512-eMpKlV0SThJmmJgiVyN9jTPJ2VBPquf6Kt/nAoo6DgHAoN57K15ZghiHaMvqjCye/uU4X5u3YSMgVBI1h3vKrQ==",
-      "cpu": [
-        "x64"
-      ],
-      "optional": true,
-      "os": [
-        "openbsd"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/@esbuild/sunos-x64": {
-      "version": "0.20.2",
-      "resolved": "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.20.2.tgz",
-      "integrity": "sha512-2UyFtRC6cXLyejf/YEld4Hajo7UHILetzE1vsRcGL3earZEW77JxrFjH4Ez2qaTiEfMgAXxfAZCm1fvM/G/o8w==",
-      "cpu": [
-        "x64"
-      ],
-      "optional": true,
-      "os": [
-        "sunos"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/@esbuild/win32-arm64": {
-      "version": "0.20.2",
-      "resolved": "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.20.2.tgz",
-      "integrity": "sha512-GRibxoawM9ZCnDxnP3usoUDO9vUkpAxIIZ6GQI+IlVmr5kP3zUq+l17xELTHMWTWzjxa2guPNyrpq1GWmPvcGQ==",
-      "cpu": [
-        "arm64"
-      ],
-      "optional": true,
-      "os": [
-        "win32"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/@esbuild/win32-ia32": {
-      "version": "0.20.2",
-      "resolved": "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.20.2.tgz",
-      "integrity": "sha512-HfLOfn9YWmkSKRQqovpnITazdtquEW8/SoHW7pWpuEeguaZI4QnCRW6b+oZTztdBnZOS2hqJ6im/D5cPzBTTlQ==",
-      "cpu": [
-        "ia32"
-      ],
-      "optional": true,
-      "os": [
-        "win32"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/@esbuild/win32-x64": {
-      "version": "0.20.2",
-      "resolved": "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.20.2.tgz",
-      "integrity": "sha512-N49X4lJX27+l9jbLKSqZ6bKNjzQvHaT8IIFUy+YIqmXQdjYCToGWwOItDrfby14c78aDd5NHQl29xingXfCdLQ==",
-      "cpu": [
-        "x64"
-      ],
-      "optional": true,
-      "os": [
-        "win32"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/@eslint-community/eslint-utils": {
-      "version": "4.4.0",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "eslint-visitor-keys": "^3.3.0"
-      },
-      "engines": {
-        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
-      },
-      "peerDependencies": {
-        "eslint": "^6.0.0 || ^7.0.0 || >=8.0.0"
-      }
-    },
-    "node_modules/@eslint-community/eslint-utils/node_modules/eslint-visitor-keys": {
-      "version": "3.4.3",
-      "dev": true,
-      "license": "Apache-2.0",
-      "engines": {
-        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
-      },
-      "funding": {
-        "url": "https://opencollective.com/eslint"
-      }
-    },
-    "node_modules/@eslint-community/regexpp": {
-      "version": "4.6.2",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": "^12.0.0 || ^14.0.0 || >=16.0.0"
+        "node": "^12.0.0 || ^14.0.0 || >=16.0.0"
       }
     },
     "node_modules/@eslint/eslintrc": {
-      "version": "0.4.3",
+      "version": "2.1.4",
       "dev": true,
       "license": "MIT",
       "dependencies": {
         "ajv": "^6.12.4",
-        "debug": "^4.1.1",
-        "espree": "^7.3.0",
-        "globals": "^13.9.0",
-        "ignore": "^4.0.6",
+        "debug": "^4.3.2",
+        "espree": "^9.6.0",
+        "globals": "^13.19.0",
+        "ignore": "^5.2.0",
         "import-fresh": "^3.2.1",
-        "js-yaml": "^3.13.1",
-        "minimatch": "^3.0.4",
+        "js-yaml": "^4.1.0",
+        "minimatch": "^3.1.2",
         "strip-json-comments": "^3.1.1"
       },
       "engines": {
-        "node": "^10.12.0 || >=12.0.0"
+        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+      },
+      "funding": {
+        "url": "https://opencollective.com/eslint"
       }
     },
     "node_modules/@eslint/eslintrc/node_modules/ajv": {
@@ -3529,8 +3548,13 @@
         "url": "https://github.com/sponsors/epoberezkin"
       }
     },
+    "node_modules/@eslint/eslintrc/node_modules/argparse": {
+      "version": "2.0.1",
+      "dev": true,
+      "license": "Python-2.0"
+    },
     "node_modules/@eslint/eslintrc/node_modules/globals": {
-      "version": "13.21.0",
+      "version": "13.24.0",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -3543,12 +3567,15 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/@eslint/eslintrc/node_modules/ignore": {
-      "version": "4.0.6",
+    "node_modules/@eslint/eslintrc/node_modules/js-yaml": {
+      "version": "4.1.0",
       "dev": true,
       "license": "MIT",
-      "engines": {
-        "node": ">= 4"
+      "dependencies": {
+        "argparse": "^2.0.1"
+      },
+      "bin": {
+        "js-yaml": "bin/js-yaml.js"
       }
     },
     "node_modules/@eslint/eslintrc/node_modules/json-schema-traverse": {
@@ -3567,10 +3594,23 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
+    "node_modules/@eslint/js": {
+      "version": "8.57.0",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+      }
+    },
     "node_modules/@expensify/react-native-live-markdown": {
-      "version": "0.1.69",
-      "resolved": "https://registry.npmjs.org/@expensify/react-native-live-markdown/-/react-native-live-markdown-0.1.69.tgz",
-      "integrity": "sha512-ZJG6f06lHrNb0s/92JyyvsSDGGZLdU/a/YXir2A5UFCiERVWkgJxcugsYbEMemh2HsWD6GXvhq1Sngj2H620nw==",
+      "version": "0.1.117",
+      "resolved": "https://registry.npmjs.org/@expensify/react-native-live-markdown/-/react-native-live-markdown-0.1.117.tgz",
+      "integrity": "sha512-MMs8U7HRNilTc5PaCODpWL89/+fo61Np1tUBjVaiA4QQw2h5Qta8V5/YexUA4wG29M0N7gcGkxapVhfUoEB0vQ==",
+      "workspaces": [
+        "parser",
+        "example",
+        "WebExample"
+      ],
       "engines": {
         "node": ">= 18.0.0"
       },
@@ -3594,38 +3634,40 @@
       }
     },
     "node_modules/@expo/cli": {
-      "version": "0.17.3",
+      "version": "0.18.21",
       "license": "MIT",
       "dependencies": {
         "@babel/runtime": "^7.20.0",
         "@expo/code-signing-certificates": "0.0.5",
-        "@expo/config": "~8.5.0",
-        "@expo/config-plugins": "~7.8.0",
+        "@expo/config": "~9.0.0-beta.0",
+        "@expo/config-plugins": "~8.0.0-beta.0",
         "@expo/devcert": "^1.0.0",
-        "@expo/env": "~0.2.0",
-        "@expo/image-utils": "^0.4.0",
-        "@expo/json-file": "^8.2.37",
-        "@expo/metro-config": "~0.17.0",
+        "@expo/env": "~0.3.0",
+        "@expo/image-utils": "^0.5.0",
+        "@expo/json-file": "^8.3.0",
+        "@expo/metro-config": "~0.18.6",
         "@expo/osascript": "^2.0.31",
-        "@expo/package-manager": "^1.1.1",
+        "@expo/package-manager": "^1.5.0",
         "@expo/plist": "^0.1.0",
-        "@expo/prebuild-config": "6.7.4",
+        "@expo/prebuild-config": "7.0.6",
         "@expo/rudder-sdk-node": "1.1.1",
-        "@expo/spawn-async": "1.5.0",
+        "@expo/spawn-async": "^1.7.2",
         "@expo/xcpretty": "^4.3.0",
-        "@react-native/dev-middleware": "^0.73.6",
+        "@react-native/dev-middleware": "0.74.84",
         "@urql/core": "2.3.6",
         "@urql/exchange-retry": "0.3.0",
         "accepts": "^1.3.8",
         "arg": "5.0.2",
         "better-opn": "~3.0.2",
+        "bplist-creator": "0.0.7",
         "bplist-parser": "^0.3.1",
-        "cacache": "^15.3.0",
+        "cacache": "^18.0.2",
         "chalk": "^4.0.0",
         "ci-info": "^3.3.0",
         "connect": "^3.7.0",
         "debug": "^4.3.4",
         "env-editor": "^0.4.1",
+        "fast-glob": "^3.3.2",
         "find-yarn-workspace-root": "~2.0.0",
         "form-data": "^3.0.1",
         "freeport-async": "2.0.0",
@@ -3643,7 +3685,6 @@
         "lodash.debounce": "^4.0.8",
         "md5hex": "^1.0.0",
         "minimatch": "^3.0.4",
-        "minipass": "3.3.6",
         "node-fetch": "^2.6.7",
         "node-forge": "^1.3.1",
         "npm-package-arg": "^7.0.0",
@@ -3659,10 +3700,11 @@
         "resolve": "^1.22.2",
         "resolve-from": "^5.0.0",
         "resolve.exports": "^2.0.2",
-        "semver": "^7.5.3",
+        "semver": "^7.6.0",
         "send": "^0.18.0",
         "slugify": "^1.3.4",
         "source-map-support": "~0.5.21",
+        "stacktrace-parser": "^0.1.10",
         "structured-headers": "^0.4.1",
         "tar": "^6.0.5",
         "temp-dir": "^2.0.0",
@@ -3685,22 +3727,20 @@
       }
     },
     "node_modules/@expo/cli/node_modules/@expo/config-plugins": {
-      "version": "7.8.4",
+      "version": "8.0.6",
       "license": "MIT",
       "dependencies": {
-        "@expo/config-types": "^50.0.0-alpha.1",
-        "@expo/fingerprint": "^0.6.0",
+        "@expo/config-types": "^51.0.0-unreleased",
         "@expo/json-file": "~8.3.0",
         "@expo/plist": "^0.1.0",
         "@expo/sdk-runtime-versions": "^1.0.0",
-        "@react-native/normalize-color": "^2.0.0",
         "chalk": "^4.1.2",
         "debug": "^4.3.1",
         "find-up": "~5.0.0",
         "getenv": "^1.0.0",
         "glob": "7.1.6",
         "resolve-from": "^5.0.0",
-        "semver": "^7.5.3",
+        "semver": "^7.5.4",
         "slash": "^3.0.0",
         "slugify": "^1.6.6",
         "xcode": "^3.0.1",
@@ -3726,11 +3766,11 @@
       }
     },
     "node_modules/@expo/cli/node_modules/@expo/config-types": {
-      "version": "50.0.0",
+      "version": "51.0.2",
       "license": "MIT"
     },
     "node_modules/@expo/cli/node_modules/@expo/json-file": {
-      "version": "8.3.0",
+      "version": "8.3.3",
       "license": "MIT",
       "dependencies": {
         "@babel/code-frame": "~7.10.4",
@@ -3739,7 +3779,7 @@
       }
     },
     "node_modules/@expo/cli/node_modules/@expo/plist": {
-      "version": "0.1.0",
+      "version": "0.1.3",
       "license": "MIT",
       "dependencies": {
         "@xmldom/xmldom": "~0.7.7",
@@ -3764,6 +3804,13 @@
       "version": "5.0.2",
       "license": "MIT"
     },
+    "node_modules/@expo/cli/node_modules/bplist-creator": {
+      "version": "0.0.7",
+      "license": "MIT",
+      "dependencies": {
+        "stream-buffers": "~2.2.0"
+      }
+    },
     "node_modules/@expo/cli/node_modules/bplist-parser": {
       "version": "0.3.2",
       "license": "MIT",
@@ -4062,18 +4109,18 @@
       }
     },
     "node_modules/@expo/config": {
-      "version": "8.5.4",
+      "version": "9.0.1",
       "license": "MIT",
       "dependencies": {
         "@babel/code-frame": "~7.10.4",
-        "@expo/config-plugins": "~7.8.2",
-        "@expo/config-types": "^50.0.0",
-        "@expo/json-file": "^8.2.37",
+        "@expo/config-plugins": "~8.0.0-beta.0",
+        "@expo/config-types": "^51.0.0-unreleased",
+        "@expo/json-file": "^8.3.0",
         "getenv": "^1.0.0",
         "glob": "7.1.6",
         "require-from-string": "^2.0.2",
         "resolve-from": "^5.0.0",
-        "semver": "7.5.3",
+        "semver": "^7.6.0",
         "slugify": "^1.3.4",
         "sucrase": "3.34.0"
       }
@@ -4187,22 +4234,20 @@
       }
     },
     "node_modules/@expo/config/node_modules/@expo/config-plugins": {
-      "version": "7.8.2",
+      "version": "8.0.0",
       "license": "MIT",
       "dependencies": {
-        "@expo/config-types": "^50.0.0-alpha.1",
-        "@expo/fingerprint": "^0.6.0",
+        "@expo/config-types": "^51.0.0-unreleased",
         "@expo/json-file": "~8.3.0",
         "@expo/plist": "^0.1.0",
         "@expo/sdk-runtime-versions": "^1.0.0",
-        "@react-native/normalize-color": "^2.0.0",
         "chalk": "^4.1.2",
         "debug": "^4.3.1",
         "find-up": "~5.0.0",
         "getenv": "^1.0.0",
         "glob": "7.1.6",
         "resolve-from": "^5.0.0",
-        "semver": "^7.5.3",
+        "semver": "^7.5.4",
         "slash": "^3.0.0",
         "slugify": "^1.6.6",
         "xcode": "^3.0.1",
@@ -4210,11 +4255,11 @@
       }
     },
     "node_modules/@expo/config/node_modules/@expo/config-types": {
-      "version": "50.0.0",
+      "version": "51.0.0",
       "license": "MIT"
     },
     "node_modules/@expo/config/node_modules/@expo/json-file": {
-      "version": "8.3.0",
+      "version": "8.3.1",
       "license": "MIT",
       "dependencies": {
         "@babel/code-frame": "~7.10.4",
@@ -4223,7 +4268,7 @@
       }
     },
     "node_modules/@expo/config/node_modules/@expo/plist": {
-      "version": "0.1.0",
+      "version": "0.1.1",
       "license": "MIT",
       "dependencies": {
         "@xmldom/xmldom": "~0.7.7",
@@ -4279,19 +4324,6 @@
         "node": ">=8"
       }
     },
-    "node_modules/@expo/config/node_modules/semver": {
-      "version": "7.5.3",
-      "license": "ISC",
-      "dependencies": {
-        "lru-cache": "^6.0.0"
-      },
-      "bin": {
-        "semver": "bin/semver.js"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
     "node_modules/@expo/config/node_modules/supports-color": {
       "version": "7.2.0",
       "license": "MIT",
@@ -4303,7 +4335,7 @@
       }
     },
     "node_modules/@expo/devcert": {
-      "version": "1.1.0",
+      "version": "1.1.2",
       "license": "MIT",
       "dependencies": {
         "application-config-path": "^0.1.0",
@@ -4312,7 +4344,7 @@
         "eol": "^0.9.1",
         "get-port": "^3.2.0",
         "glob": "^7.1.2",
-        "lodash": "^4.17.4",
+        "lodash": "^4.17.21",
         "mkdirp": "^0.5.1",
         "password-prompt": "^1.0.4",
         "rimraf": "^2.6.2",
@@ -4363,13 +4395,13 @@
       }
     },
     "node_modules/@expo/env": {
-      "version": "0.2.1",
+      "version": "0.3.0",
       "license": "MIT",
       "dependencies": {
         "chalk": "^4.0.0",
         "debug": "^4.3.4",
-        "dotenv": "~16.0.3",
-        "dotenv-expand": "~10.0.0",
+        "dotenv": "~16.4.5",
+        "dotenv-expand": "~11.0.6",
         "getenv": "^1.0.0"
       }
     },
@@ -4414,20 +4446,6 @@
       "version": "1.1.4",
       "license": "MIT"
     },
-    "node_modules/@expo/env/node_modules/dotenv": {
-      "version": "16.0.3",
-      "license": "BSD-2-Clause",
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/@expo/env/node_modules/dotenv-expand": {
-      "version": "10.0.0",
-      "license": "BSD-2-Clause",
-      "engines": {
-        "node": ">=12"
-      }
-    },
     "node_modules/@expo/env/node_modules/has-flag": {
       "version": "4.0.0",
       "license": "MIT",
@@ -4445,85 +4463,11 @@
         "node": ">=8"
       }
     },
-    "node_modules/@expo/fingerprint": {
-      "version": "0.6.0",
-      "license": "MIT",
-      "dependencies": {
-        "@expo/spawn-async": "^1.5.0",
-        "chalk": "^4.1.2",
-        "debug": "^4.3.4",
-        "find-up": "^5.0.0",
-        "minimatch": "^3.0.4",
-        "p-limit": "^3.1.0",
-        "resolve-from": "^5.0.0"
-      },
-      "bin": {
-        "fingerprint": "bin/cli.js"
-      }
-    },
-    "node_modules/@expo/fingerprint/node_modules/ansi-styles": {
-      "version": "4.3.0",
-      "license": "MIT",
-      "dependencies": {
-        "color-convert": "^2.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
-      }
-    },
-    "node_modules/@expo/fingerprint/node_modules/chalk": {
-      "version": "4.1.2",
-      "license": "MIT",
-      "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/@expo/fingerprint/node_modules/color-convert": {
-      "version": "2.0.1",
-      "license": "MIT",
-      "dependencies": {
-        "color-name": "~1.1.4"
-      },
-      "engines": {
-        "node": ">=7.0.0"
-      }
-    },
-    "node_modules/@expo/fingerprint/node_modules/color-name": {
-      "version": "1.1.4",
-      "license": "MIT"
-    },
-    "node_modules/@expo/fingerprint/node_modules/has-flag": {
-      "version": "4.0.0",
-      "license": "MIT",
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/@expo/fingerprint/node_modules/supports-color": {
-      "version": "7.2.0",
-      "license": "MIT",
-      "dependencies": {
-        "has-flag": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
     "node_modules/@expo/image-utils": {
-      "version": "0.4.1",
+      "version": "0.5.1",
       "license": "MIT",
       "dependencies": {
-        "@expo/spawn-async": "1.5.0",
+        "@expo/spawn-async": "^1.7.2",
         "chalk": "^4.0.0",
         "fs-extra": "9.0.0",
         "getenv": "^1.0.0",
@@ -4531,7 +4475,7 @@
         "node-fetch": "^2.6.0",
         "parse-png": "^2.1.0",
         "resolve-from": "^5.0.0",
-        "semver": "7.3.2",
+        "semver": "^7.6.0",
         "tempy": "0.3.0"
       }
     },
@@ -4603,16 +4547,6 @@
         "node": ">=8"
       }
     },
-    "node_modules/@expo/image-utils/node_modules/semver": {
-      "version": "7.3.2",
-      "license": "ISC",
-      "bin": {
-        "semver": "bin/semver.js"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
     "node_modules/@expo/image-utils/node_modules/supports-color": {
       "version": "7.2.0",
       "license": "MIT",
@@ -4693,18 +4627,17 @@
       }
     },
     "node_modules/@expo/metro-config": {
-      "version": "0.17.3",
+      "version": "0.18.8",
       "license": "MIT",
       "dependencies": {
         "@babel/core": "^7.20.0",
         "@babel/generator": "^7.20.5",
         "@babel/parser": "^7.20.0",
         "@babel/types": "^7.20.0",
-        "@expo/config": "~8.5.0",
-        "@expo/env": "~0.2.0",
+        "@expo/config": "~9.0.0-beta.0",
+        "@expo/env": "~0.3.0",
         "@expo/json-file": "~8.3.0",
         "@expo/spawn-async": "^1.7.2",
-        "babel-preset-fbjs": "^3.4.0",
         "chalk": "^4.1.0",
         "debug": "^4.3.2",
         "find-yarn-workspace-root": "~2.0.0",
@@ -4714,11 +4647,7 @@
         "jsc-safe-url": "^0.2.4",
         "lightningcss": "~1.19.0",
         "postcss": "~8.4.32",
-        "resolve-from": "^5.0.0",
-        "sucrase": "3.34.0"
-      },
-      "peerDependencies": {
-        "@react-native/babel-preset": "*"
+        "resolve-from": "^5.0.0"
       }
     },
     "node_modules/@expo/metro-config/node_modules/@babel/code-frame": {
@@ -4729,7 +4658,7 @@
       }
     },
     "node_modules/@expo/metro-config/node_modules/@expo/json-file": {
-      "version": "8.3.0",
+      "version": "8.3.3",
       "license": "MIT",
       "dependencies": {
         "@babel/code-frame": "~7.10.4",
@@ -4737,16 +4666,6 @@
         "write-file-atomic": "^2.3.0"
       }
     },
-    "node_modules/@expo/metro-config/node_modules/@expo/spawn-async": {
-      "version": "1.7.2",
-      "license": "MIT",
-      "dependencies": {
-        "cross-spawn": "^7.0.3"
-      },
-      "engines": {
-        "node": ">=12"
-      }
-    },
     "node_modules/@expo/metro-config/node_modules/ansi-styles": {
       "version": "4.3.0",
       "license": "MIT",
@@ -4813,32 +4732,6 @@
         "node": ">=8"
       }
     },
-    "node_modules/@expo/metro-config/node_modules/postcss": {
-      "version": "8.4.33",
-      "funding": [
-        {
-          "type": "opencollective",
-          "url": "https://opencollective.com/postcss/"
-        },
-        {
-          "type": "tidelift",
-          "url": "https://tidelift.com/funding/github/npm/postcss"
-        },
-        {
-          "type": "github",
-          "url": "https://github.com/sponsors/ai"
-        }
-      ],
-      "license": "MIT",
-      "dependencies": {
-        "nanoid": "^3.3.7",
-        "picocolors": "^1.0.0",
-        "source-map-js": "^1.0.2"
-      },
-      "engines": {
-        "node": "^10 || ^12 || >=14"
-      }
-    },
     "node_modules/@expo/metro-config/node_modules/supports-color": {
       "version": "7.2.0",
       "license": "MIT",
@@ -4857,10 +4750,10 @@
       }
     },
     "node_modules/@expo/osascript": {
-      "version": "2.1.0",
+      "version": "2.1.3",
       "license": "MIT",
       "dependencies": {
-        "@expo/spawn-async": "^1.5.0",
+        "@expo/spawn-async": "^1.7.2",
         "exec-async": "^2.2.0"
       },
       "engines": {
@@ -4868,11 +4761,11 @@
       }
     },
     "node_modules/@expo/package-manager": {
-      "version": "1.4.2",
+      "version": "1.5.2",
       "license": "MIT",
       "dependencies": {
-        "@expo/json-file": "^8.2.37",
-        "@expo/spawn-async": "^1.5.0",
+        "@expo/json-file": "^8.3.0",
+        "@expo/spawn-async": "^1.7.2",
         "ansi-regex": "^5.0.0",
         "chalk": "^4.0.0",
         "find-up": "^5.0.0",
@@ -4893,7 +4786,7 @@
       }
     },
     "node_modules/@expo/package-manager/node_modules/@expo/json-file": {
-      "version": "8.3.0",
+      "version": "8.3.3",
       "license": "MIT",
       "dependencies": {
         "@babel/code-frame": "~7.10.4",
@@ -5167,18 +5060,19 @@
       }
     },
     "node_modules/@expo/prebuild-config": {
-      "version": "6.7.4",
+      "version": "7.0.6",
       "license": "MIT",
       "dependencies": {
-        "@expo/config": "~8.5.0",
-        "@expo/config-plugins": "~7.8.0",
-        "@expo/config-types": "^50.0.0-alpha.1",
-        "@expo/image-utils": "^0.4.0",
-        "@expo/json-file": "^8.2.37",
+        "@expo/config": "~9.0.0-beta.0",
+        "@expo/config-plugins": "~8.0.0-beta.0",
+        "@expo/config-types": "^51.0.0-unreleased",
+        "@expo/image-utils": "^0.5.0",
+        "@expo/json-file": "^8.3.0",
+        "@react-native/normalize-colors": "0.74.84",
         "debug": "^4.3.1",
         "fs-extra": "^9.0.0",
         "resolve-from": "^5.0.0",
-        "semver": "7.5.3",
+        "semver": "^7.6.0",
         "xml2js": "0.6.0"
       },
       "peerDependencies": {
@@ -5193,22 +5087,20 @@
       }
     },
     "node_modules/@expo/prebuild-config/node_modules/@expo/config-plugins": {
-      "version": "7.8.4",
+      "version": "8.0.6",
       "license": "MIT",
       "dependencies": {
-        "@expo/config-types": "^50.0.0-alpha.1",
-        "@expo/fingerprint": "^0.6.0",
+        "@expo/config-types": "^51.0.0-unreleased",
         "@expo/json-file": "~8.3.0",
         "@expo/plist": "^0.1.0",
         "@expo/sdk-runtime-versions": "^1.0.0",
-        "@react-native/normalize-color": "^2.0.0",
         "chalk": "^4.1.2",
         "debug": "^4.3.1",
         "find-up": "~5.0.0",
         "getenv": "^1.0.0",
         "glob": "7.1.6",
         "resolve-from": "^5.0.0",
-        "semver": "^7.5.3",
+        "semver": "^7.5.4",
         "slash": "^3.0.0",
         "slugify": "^1.6.6",
         "xcode": "^3.0.1",
@@ -5216,11 +5108,11 @@
       }
     },
     "node_modules/@expo/prebuild-config/node_modules/@expo/config-types": {
-      "version": "50.0.0",
+      "version": "51.0.2",
       "license": "MIT"
     },
     "node_modules/@expo/prebuild-config/node_modules/@expo/json-file": {
-      "version": "8.3.0",
+      "version": "8.3.3",
       "license": "MIT",
       "dependencies": {
         "@babel/code-frame": "~7.10.4",
@@ -5229,7 +5121,7 @@
       }
     },
     "node_modules/@expo/prebuild-config/node_modules/@expo/plist": {
-      "version": "0.1.0",
+      "version": "0.1.3",
       "license": "MIT",
       "dependencies": {
         "@xmldom/xmldom": "~0.7.7",
@@ -5285,19 +5177,6 @@
         "node": ">=8"
       }
     },
-    "node_modules/@expo/prebuild-config/node_modules/semver": {
-      "version": "7.5.3",
-      "license": "ISC",
-      "dependencies": {
-        "lru-cache": "^6.0.0"
-      },
-      "bin": {
-        "semver": "bin/semver.js"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
     "node_modules/@expo/prebuild-config/node_modules/supports-color": {
       "version": "7.2.0",
       "license": "MIT",
@@ -5333,68 +5212,13 @@
       "license": "MIT"
     },
     "node_modules/@expo/spawn-async": {
-      "version": "1.5.0",
-      "license": "MIT",
-      "dependencies": {
-        "cross-spawn": "^6.0.5"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/@expo/spawn-async/node_modules/cross-spawn": {
-      "version": "6.0.5",
-      "license": "MIT",
-      "dependencies": {
-        "nice-try": "^1.0.4",
-        "path-key": "^2.0.1",
-        "semver": "^5.5.0",
-        "shebang-command": "^1.2.0",
-        "which": "^1.2.9"
-      },
-      "engines": {
-        "node": ">=4.8"
-      }
-    },
-    "node_modules/@expo/spawn-async/node_modules/path-key": {
-      "version": "2.0.1",
-      "license": "MIT",
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/@expo/spawn-async/node_modules/semver": {
-      "version": "5.7.2",
-      "license": "ISC",
-      "bin": {
-        "semver": "bin/semver"
-      }
-    },
-    "node_modules/@expo/spawn-async/node_modules/shebang-command": {
-      "version": "1.2.0",
+      "version": "1.7.2",
       "license": "MIT",
       "dependencies": {
-        "shebang-regex": "^1.0.0"
+        "cross-spawn": "^7.0.3"
       },
       "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/@expo/spawn-async/node_modules/shebang-regex": {
-      "version": "1.0.0",
-      "license": "MIT",
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/@expo/spawn-async/node_modules/which": {
-      "version": "1.3.1",
-      "license": "ISC",
-      "dependencies": {
-        "isexe": "^2.0.0"
-      },
-      "bin": {
-        "which": "bin/which"
+        "node": ">=12"
       }
     },
     "node_modules/@expo/vector-icons": {
@@ -5495,8 +5319,8 @@
     },
     "node_modules/@fal-works/esbuild-plugin-global-externals": {
       "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/@fal-works/esbuild-plugin-global-externals/-/esbuild-plugin-global-externals-2.1.2.tgz",
-      "integrity": "sha512-cEee/Z+I12mZcFJshKcCqC8tuX5hG3s+d+9nZ3LabqKF1vKdF41B92pJVCBggjAGORAeOzyyDDKrZwIkLffeOQ=="
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/@formatjs/ecma402-abstract": {
       "version": "1.15.0",
@@ -5588,8 +5412,50 @@
         "tslib": "^2.4.0"
       }
     },
+    "node_modules/@fullstory/babel-plugin-annotate-react": {
+      "version": "2.3.0",
+      "resolved": "git+ssh://git@github.com/fullstorydev/fullstory-babel-plugin-annotate-react.git#25c26dadb644d5355e381a4ea4ca1cd05af4a8f6"
+    },
+    "node_modules/@fullstory/babel-plugin-react-native": {
+      "version": "1.2.1",
+      "license": "MIT",
+      "dependencies": {
+        "@babel/parser": "^7.0.0",
+        "@babel/types": "^7.0.0"
+      }
+    },
+    "node_modules/@fullstory/browser": {
+      "version": "2.0.3",
+      "license": "MIT",
+      "dependencies": {
+        "@fullstory/snippet": "2.0.3"
+      }
+    },
+    "node_modules/@fullstory/react-native": {
+      "version": "1.4.2",
+      "license": "MIT",
+      "dependencies": {
+        "@fullstory/babel-plugin-annotate-react": "^2.2.0",
+        "@fullstory/babel-plugin-react-native": "^1.1.0"
+      },
+      "peerDependencies": {
+        "expo": ">=47.0.0",
+        "react": "*",
+        "react-native": ">=0.61.0"
+      },
+      "peerDependenciesMeta": {
+        "expo": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@fullstory/snippet": {
+      "version": "2.0.3",
+      "license": "ISC"
+    },
     "node_modules/@gar/promisify": {
       "version": "1.1.3",
+      "dev": true,
       "license": "MIT"
     },
     "node_modules/@gorhom/portal": {
@@ -5612,13 +5478,11 @@
     },
     "node_modules/@hapi/hoek": {
       "version": "9.3.0",
-      "resolved": "https://registry.npmjs.org/@hapi/hoek/-/hoek-9.3.0.tgz",
-      "integrity": "sha512-/c6rf4UJlmHlC9b5BaNvzAcFv7HZ2QHaV0D4/HNlBdvFnvQq8RI4kYdhyPCl7Xj+oWvTWQ8ujhqS53LIgAe6KQ=="
+      "license": "BSD-3-Clause"
     },
     "node_modules/@hapi/topo": {
       "version": "5.1.0",
-      "resolved": "https://registry.npmjs.org/@hapi/topo/-/topo-5.1.0.tgz",
-      "integrity": "sha512-foQZKJig7Ob0BMAYBfcJk8d77QtOe7Wo4ox7ff1lQYoNNAb6jwcY1ncdoy2e9wQZzvNy7ODZCYJkK8kzmcAnAg==",
+      "license": "BSD-3-Clause",
       "dependencies": {
         "@hapi/hoek": "^9.0.0"
       }
@@ -5628,20 +5492,32 @@
       "license": "Apache-2.0"
     },
     "node_modules/@humanwhocodes/config-array": {
-      "version": "0.5.0",
+      "version": "0.11.14",
       "dev": true,
       "license": "Apache-2.0",
       "dependencies": {
-        "@humanwhocodes/object-schema": "^1.2.0",
-        "debug": "^4.1.1",
-        "minimatch": "^3.0.4"
+        "@humanwhocodes/object-schema": "^2.0.2",
+        "debug": "^4.3.1",
+        "minimatch": "^3.0.5"
       },
       "engines": {
         "node": ">=10.10.0"
       }
     },
+    "node_modules/@humanwhocodes/module-importer": {
+      "version": "1.0.1",
+      "dev": true,
+      "license": "Apache-2.0",
+      "engines": {
+        "node": ">=12.22"
+      },
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/nzakas"
+      }
+    },
     "node_modules/@humanwhocodes/object-schema": {
-      "version": "1.2.1",
+      "version": "2.0.3",
       "dev": true,
       "license": "BSD-3-Clause"
     },
@@ -5818,42 +5694,20 @@
       }
     },
     "node_modules/@jest/console": {
-      "version": "29.4.1",
+      "version": "29.7.0",
       "license": "MIT",
       "dependencies": {
-        "@jest/types": "^29.4.1",
+        "@jest/types": "^29.6.3",
         "@types/node": "*",
         "chalk": "^4.0.0",
-        "jest-message-util": "^29.4.1",
-        "jest-util": "^29.4.1",
+        "jest-message-util": "^29.7.0",
+        "jest-util": "^29.7.0",
         "slash": "^3.0.0"
       },
       "engines": {
         "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
       }
     },
-    "node_modules/@jest/console/node_modules/@jest/types": {
-      "version": "29.6.3",
-      "license": "MIT",
-      "dependencies": {
-        "@jest/schemas": "^29.6.3",
-        "@types/istanbul-lib-coverage": "^2.0.0",
-        "@types/istanbul-reports": "^3.0.0",
-        "@types/node": "*",
-        "@types/yargs": "^17.0.8",
-        "chalk": "^4.0.0"
-      },
-      "engines": {
-        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
-      }
-    },
-    "node_modules/@jest/console/node_modules/@types/yargs": {
-      "version": "17.0.24",
-      "license": "MIT",
-      "dependencies": {
-        "@types/yargs-parser": "*"
-      }
-    },
     "node_modules/@jest/console/node_modules/ansi-styles": {
       "version": "4.3.0",
       "license": "MIT",
@@ -5913,35 +5767,35 @@
       }
     },
     "node_modules/@jest/core": {
-      "version": "29.4.1",
+      "version": "29.7.0",
       "license": "MIT",
       "dependencies": {
-        "@jest/console": "^29.4.1",
-        "@jest/reporters": "^29.4.1",
-        "@jest/test-result": "^29.4.1",
-        "@jest/transform": "^29.4.1",
-        "@jest/types": "^29.4.1",
+        "@jest/console": "^29.7.0",
+        "@jest/reporters": "^29.7.0",
+        "@jest/test-result": "^29.7.0",
+        "@jest/transform": "^29.7.0",
+        "@jest/types": "^29.6.3",
         "@types/node": "*",
         "ansi-escapes": "^4.2.1",
         "chalk": "^4.0.0",
         "ci-info": "^3.2.0",
         "exit": "^0.1.2",
         "graceful-fs": "^4.2.9",
-        "jest-changed-files": "^29.4.0",
-        "jest-config": "^29.4.1",
-        "jest-haste-map": "^29.4.1",
-        "jest-message-util": "^29.4.1",
-        "jest-regex-util": "^29.2.0",
-        "jest-resolve": "^29.4.1",
-        "jest-resolve-dependencies": "^29.4.1",
-        "jest-runner": "^29.4.1",
-        "jest-runtime": "^29.4.1",
-        "jest-snapshot": "^29.4.1",
-        "jest-util": "^29.4.1",
-        "jest-validate": "^29.4.1",
-        "jest-watcher": "^29.4.1",
+        "jest-changed-files": "^29.7.0",
+        "jest-config": "^29.7.0",
+        "jest-haste-map": "^29.7.0",
+        "jest-message-util": "^29.7.0",
+        "jest-regex-util": "^29.6.3",
+        "jest-resolve": "^29.7.0",
+        "jest-resolve-dependencies": "^29.7.0",
+        "jest-runner": "^29.7.0",
+        "jest-runtime": "^29.7.0",
+        "jest-snapshot": "^29.7.0",
+        "jest-util": "^29.7.0",
+        "jest-validate": "^29.7.0",
+        "jest-watcher": "^29.7.0",
         "micromatch": "^4.0.4",
-        "pretty-format": "^29.4.1",
+        "pretty-format": "^29.7.0",
         "slash": "^3.0.0",
         "strip-ansi": "^6.0.0"
       },
@@ -5957,28 +5811,6 @@
         }
       }
     },
-    "node_modules/@jest/core/node_modules/@jest/types": {
-      "version": "29.6.3",
-      "license": "MIT",
-      "dependencies": {
-        "@jest/schemas": "^29.6.3",
-        "@types/istanbul-lib-coverage": "^2.0.0",
-        "@types/istanbul-reports": "^3.0.0",
-        "@types/node": "*",
-        "@types/yargs": "^17.0.8",
-        "chalk": "^4.0.0"
-      },
-      "engines": {
-        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
-      }
-    },
-    "node_modules/@jest/core/node_modules/@types/yargs": {
-      "version": "17.0.24",
-      "license": "MIT",
-      "dependencies": {
-        "@types/yargs-parser": "*"
-      }
-    },
     "node_modules/@jest/core/node_modules/ansi-styles": {
       "version": "4.3.0",
       "license": "MIT",
@@ -6047,86 +5879,6 @@
         "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
       }
     },
-    "node_modules/@jest/create-cache-key-function/node_modules/@jest/types": {
-      "version": "29.6.3",
-      "license": "MIT",
-      "dependencies": {
-        "@jest/schemas": "^29.6.3",
-        "@types/istanbul-lib-coverage": "^2.0.0",
-        "@types/istanbul-reports": "^3.0.0",
-        "@types/node": "*",
-        "@types/yargs": "^17.0.8",
-        "chalk": "^4.0.0"
-      },
-      "engines": {
-        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
-      }
-    },
-    "node_modules/@jest/create-cache-key-function/node_modules/@types/yargs": {
-      "version": "17.0.31",
-      "license": "MIT",
-      "dependencies": {
-        "@types/yargs-parser": "*"
-      }
-    },
-    "node_modules/@jest/create-cache-key-function/node_modules/ansi-styles": {
-      "version": "4.3.0",
-      "license": "MIT",
-      "dependencies": {
-        "color-convert": "^2.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
-      }
-    },
-    "node_modules/@jest/create-cache-key-function/node_modules/chalk": {
-      "version": "4.1.2",
-      "license": "MIT",
-      "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/@jest/create-cache-key-function/node_modules/color-convert": {
-      "version": "2.0.1",
-      "license": "MIT",
-      "dependencies": {
-        "color-name": "~1.1.4"
-      },
-      "engines": {
-        "node": ">=7.0.0"
-      }
-    },
-    "node_modules/@jest/create-cache-key-function/node_modules/color-name": {
-      "version": "1.1.4",
-      "license": "MIT"
-    },
-    "node_modules/@jest/create-cache-key-function/node_modules/has-flag": {
-      "version": "4.0.0",
-      "license": "MIT",
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/@jest/create-cache-key-function/node_modules/supports-color": {
-      "version": "7.2.0",
-      "license": "MIT",
-      "dependencies": {
-        "has-flag": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
     "node_modules/@jest/environment": {
       "version": "29.7.0",
       "license": "MIT",
@@ -6140,102 +5892,22 @@
         "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
       }
     },
-    "node_modules/@jest/environment/node_modules/@jest/types": {
-      "version": "29.6.3",
-      "license": "MIT",
-      "dependencies": {
-        "@jest/schemas": "^29.6.3",
-        "@types/istanbul-lib-coverage": "^2.0.0",
-        "@types/istanbul-reports": "^3.0.0",
-        "@types/node": "*",
-        "@types/yargs": "^17.0.8",
-        "chalk": "^4.0.0"
-      },
-      "engines": {
-        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
-      }
-    },
-    "node_modules/@jest/environment/node_modules/@types/yargs": {
-      "version": "17.0.24",
-      "license": "MIT",
-      "dependencies": {
-        "@types/yargs-parser": "*"
-      }
-    },
-    "node_modules/@jest/environment/node_modules/ansi-styles": {
-      "version": "4.3.0",
-      "license": "MIT",
-      "dependencies": {
-        "color-convert": "^2.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
-      }
-    },
-    "node_modules/@jest/environment/node_modules/chalk": {
-      "version": "4.1.2",
-      "license": "MIT",
-      "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/@jest/environment/node_modules/color-convert": {
-      "version": "2.0.1",
-      "license": "MIT",
-      "dependencies": {
-        "color-name": "~1.1.4"
-      },
-      "engines": {
-        "node": ">=7.0.0"
-      }
-    },
-    "node_modules/@jest/environment/node_modules/color-name": {
-      "version": "1.1.4",
-      "license": "MIT"
-    },
-    "node_modules/@jest/environment/node_modules/has-flag": {
-      "version": "4.0.0",
-      "license": "MIT",
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/@jest/environment/node_modules/supports-color": {
-      "version": "7.2.0",
-      "license": "MIT",
-      "dependencies": {
-        "has-flag": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
     "node_modules/@jest/expect": {
-      "version": "29.6.2",
+      "version": "29.7.0",
       "license": "MIT",
       "dependencies": {
-        "expect": "^29.6.2",
-        "jest-snapshot": "^29.6.2"
+        "expect": "^29.7.0",
+        "jest-snapshot": "^29.7.0"
       },
       "engines": {
         "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
       }
     },
     "node_modules/@jest/expect-utils": {
-      "version": "29.6.2",
+      "version": "29.7.0",
       "license": "MIT",
       "dependencies": {
-        "jest-get-type": "^29.4.3"
+        "jest-get-type": "^29.6.3"
       },
       "engines": {
         "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
@@ -6256,189 +5928,29 @@
         "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
       }
     },
-    "node_modules/@jest/fake-timers/node_modules/@jest/types": {
-      "version": "29.6.3",
-      "license": "MIT",
-      "dependencies": {
-        "@jest/schemas": "^29.6.3",
-        "@types/istanbul-lib-coverage": "^2.0.0",
-        "@types/istanbul-reports": "^3.0.0",
-        "@types/node": "*",
-        "@types/yargs": "^17.0.8",
-        "chalk": "^4.0.0"
-      },
-      "engines": {
-        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
-      }
-    },
-    "node_modules/@jest/fake-timers/node_modules/@types/yargs": {
-      "version": "17.0.24",
-      "license": "MIT",
-      "dependencies": {
-        "@types/yargs-parser": "*"
-      }
-    },
-    "node_modules/@jest/fake-timers/node_modules/ansi-styles": {
-      "version": "4.3.0",
-      "license": "MIT",
-      "dependencies": {
-        "color-convert": "^2.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
-      }
-    },
-    "node_modules/@jest/fake-timers/node_modules/chalk": {
-      "version": "4.1.2",
-      "license": "MIT",
-      "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/@jest/fake-timers/node_modules/color-convert": {
-      "version": "2.0.1",
-      "license": "MIT",
-      "dependencies": {
-        "color-name": "~1.1.4"
-      },
-      "engines": {
-        "node": ">=7.0.0"
-      }
-    },
-    "node_modules/@jest/fake-timers/node_modules/color-name": {
-      "version": "1.1.4",
-      "license": "MIT"
-    },
-    "node_modules/@jest/fake-timers/node_modules/has-flag": {
-      "version": "4.0.0",
-      "license": "MIT",
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/@jest/fake-timers/node_modules/supports-color": {
-      "version": "7.2.0",
-      "license": "MIT",
-      "dependencies": {
-        "has-flag": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
     "node_modules/@jest/globals": {
-      "version": "29.5.0",
-      "license": "MIT",
-      "dependencies": {
-        "@jest/environment": "^29.5.0",
-        "@jest/expect": "^29.5.0",
-        "@jest/types": "^29.5.0",
-        "jest-mock": "^29.5.0"
-      },
-      "engines": {
-        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
-      }
-    },
-    "node_modules/@jest/globals/node_modules/@jest/types": {
-      "version": "29.6.3",
+      "version": "29.7.0",
       "license": "MIT",
       "dependencies": {
-        "@jest/schemas": "^29.6.3",
-        "@types/istanbul-lib-coverage": "^2.0.0",
-        "@types/istanbul-reports": "^3.0.0",
-        "@types/node": "*",
-        "@types/yargs": "^17.0.8",
-        "chalk": "^4.0.0"
+        "@jest/environment": "^29.7.0",
+        "@jest/expect": "^29.7.0",
+        "@jest/types": "^29.6.3",
+        "jest-mock": "^29.7.0"
       },
       "engines": {
         "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
       }
     },
-    "node_modules/@jest/globals/node_modules/@types/yargs": {
-      "version": "17.0.24",
-      "license": "MIT",
-      "dependencies": {
-        "@types/yargs-parser": "*"
-      }
-    },
-    "node_modules/@jest/globals/node_modules/ansi-styles": {
-      "version": "4.3.0",
-      "license": "MIT",
-      "dependencies": {
-        "color-convert": "^2.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
-      }
-    },
-    "node_modules/@jest/globals/node_modules/chalk": {
-      "version": "4.1.2",
-      "license": "MIT",
-      "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/@jest/globals/node_modules/color-convert": {
-      "version": "2.0.1",
-      "license": "MIT",
-      "dependencies": {
-        "color-name": "~1.1.4"
-      },
-      "engines": {
-        "node": ">=7.0.0"
-      }
-    },
-    "node_modules/@jest/globals/node_modules/color-name": {
-      "version": "1.1.4",
-      "license": "MIT"
-    },
-    "node_modules/@jest/globals/node_modules/has-flag": {
-      "version": "4.0.0",
-      "license": "MIT",
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/@jest/globals/node_modules/supports-color": {
-      "version": "7.2.0",
-      "license": "MIT",
-      "dependencies": {
-        "has-flag": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
     "node_modules/@jest/reporters": {
-      "version": "29.4.1",
+      "version": "29.7.0",
       "license": "MIT",
       "dependencies": {
         "@bcoe/v8-coverage": "^0.2.3",
-        "@jest/console": "^29.4.1",
-        "@jest/test-result": "^29.4.1",
-        "@jest/transform": "^29.4.1",
-        "@jest/types": "^29.4.1",
-        "@jridgewell/trace-mapping": "^0.3.15",
+        "@jest/console": "^29.7.0",
+        "@jest/test-result": "^29.7.0",
+        "@jest/transform": "^29.7.0",
+        "@jest/types": "^29.6.3",
+        "@jridgewell/trace-mapping": "^0.3.18",
         "@types/node": "*",
         "chalk": "^4.0.0",
         "collect-v8-coverage": "^1.0.0",
@@ -6446,13 +5958,13 @@
         "glob": "^7.1.3",
         "graceful-fs": "^4.2.9",
         "istanbul-lib-coverage": "^3.0.0",
-        "istanbul-lib-instrument": "^5.1.0",
+        "istanbul-lib-instrument": "^6.0.0",
         "istanbul-lib-report": "^3.0.0",
         "istanbul-lib-source-maps": "^4.0.0",
         "istanbul-reports": "^3.1.3",
-        "jest-message-util": "^29.4.1",
-        "jest-util": "^29.4.1",
-        "jest-worker": "^29.4.1",
+        "jest-message-util": "^29.7.0",
+        "jest-util": "^29.7.0",
+        "jest-worker": "^29.7.0",
         "slash": "^3.0.0",
         "string-length": "^4.0.1",
         "strip-ansi": "^6.0.0",
@@ -6470,28 +5982,6 @@
         }
       }
     },
-    "node_modules/@jest/reporters/node_modules/@jest/types": {
-      "version": "29.6.3",
-      "license": "MIT",
-      "dependencies": {
-        "@jest/schemas": "^29.6.3",
-        "@types/istanbul-lib-coverage": "^2.0.0",
-        "@types/istanbul-reports": "^3.0.0",
-        "@types/node": "*",
-        "@types/yargs": "^17.0.8",
-        "chalk": "^4.0.0"
-      },
-      "engines": {
-        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
-      }
-    },
-    "node_modules/@jest/reporters/node_modules/@types/yargs": {
-      "version": "17.0.24",
-      "license": "MIT",
-      "dependencies": {
-        "@types/yargs-parser": "*"
-      }
-    },
     "node_modules/@jest/reporters/node_modules/ansi-styles": {
       "version": "4.3.0",
       "license": "MIT",
@@ -6540,12 +6030,26 @@
         "node": ">=8"
       }
     },
+    "node_modules/@jest/reporters/node_modules/istanbul-lib-instrument": {
+      "version": "6.0.2",
+      "license": "BSD-3-Clause",
+      "dependencies": {
+        "@babel/core": "^7.23.9",
+        "@babel/parser": "^7.23.9",
+        "@istanbuljs/schema": "^0.1.3",
+        "istanbul-lib-coverage": "^3.2.0",
+        "semver": "^7.5.4"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
     "node_modules/@jest/reporters/node_modules/jest-worker": {
-      "version": "29.6.4",
+      "version": "29.7.0",
       "license": "MIT",
       "dependencies": {
         "@types/node": "*",
-        "jest-util": "^29.6.3",
+        "jest-util": "^29.7.0",
         "merge-stream": "^2.0.0",
         "supports-color": "^8.0.0"
       },
@@ -6587,10 +6091,10 @@
       }
     },
     "node_modules/@jest/source-map": {
-      "version": "29.2.0",
+      "version": "29.6.3",
       "license": "MIT",
       "dependencies": {
-        "@jridgewell/trace-mapping": "^0.3.15",
+        "@jridgewell/trace-mapping": "^0.3.18",
         "callsites": "^3.0.0",
         "graceful-fs": "^4.2.9"
       },
@@ -6599,11 +6103,11 @@
       }
     },
     "node_modules/@jest/test-result": {
-      "version": "29.4.1",
+      "version": "29.7.0",
       "license": "MIT",
       "dependencies": {
-        "@jest/console": "^29.4.1",
-        "@jest/types": "^29.4.1",
+        "@jest/console": "^29.7.0",
+        "@jest/types": "^29.6.3",
         "@types/istanbul-lib-coverage": "^2.0.0",
         "collect-v8-coverage": "^1.0.0"
       },
@@ -6611,93 +6115,13 @@
         "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
       }
     },
-    "node_modules/@jest/test-result/node_modules/@jest/types": {
-      "version": "29.6.3",
-      "license": "MIT",
-      "dependencies": {
-        "@jest/schemas": "^29.6.3",
-        "@types/istanbul-lib-coverage": "^2.0.0",
-        "@types/istanbul-reports": "^3.0.0",
-        "@types/node": "*",
-        "@types/yargs": "^17.0.8",
-        "chalk": "^4.0.0"
-      },
-      "engines": {
-        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
-      }
-    },
-    "node_modules/@jest/test-result/node_modules/@types/yargs": {
-      "version": "17.0.24",
-      "license": "MIT",
-      "dependencies": {
-        "@types/yargs-parser": "*"
-      }
-    },
-    "node_modules/@jest/test-result/node_modules/ansi-styles": {
-      "version": "4.3.0",
-      "license": "MIT",
-      "dependencies": {
-        "color-convert": "^2.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
-      }
-    },
-    "node_modules/@jest/test-result/node_modules/chalk": {
-      "version": "4.1.2",
-      "license": "MIT",
-      "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/@jest/test-result/node_modules/color-convert": {
-      "version": "2.0.1",
-      "license": "MIT",
-      "dependencies": {
-        "color-name": "~1.1.4"
-      },
-      "engines": {
-        "node": ">=7.0.0"
-      }
-    },
-    "node_modules/@jest/test-result/node_modules/color-name": {
-      "version": "1.1.4",
-      "license": "MIT"
-    },
-    "node_modules/@jest/test-result/node_modules/has-flag": {
-      "version": "4.0.0",
-      "license": "MIT",
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/@jest/test-result/node_modules/supports-color": {
-      "version": "7.2.0",
-      "license": "MIT",
-      "dependencies": {
-        "has-flag": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
     "node_modules/@jest/test-sequencer": {
-      "version": "29.4.1",
+      "version": "29.7.0",
       "license": "MIT",
       "dependencies": {
-        "@jest/test-result": "^29.4.1",
+        "@jest/test-result": "^29.7.0",
         "graceful-fs": "^4.2.9",
-        "jest-haste-map": "^29.4.1",
+        "jest-haste-map": "^29.7.0",
         "slash": "^3.0.0"
       },
       "engines": {
@@ -6705,20 +6129,20 @@
       }
     },
     "node_modules/@jest/transform": {
-      "version": "29.6.2",
+      "version": "29.7.0",
       "license": "MIT",
       "dependencies": {
         "@babel/core": "^7.11.6",
-        "@jest/types": "^29.6.1",
+        "@jest/types": "^29.6.3",
         "@jridgewell/trace-mapping": "^0.3.18",
         "babel-plugin-istanbul": "^6.1.1",
         "chalk": "^4.0.0",
         "convert-source-map": "^2.0.0",
         "fast-json-stable-stringify": "^2.1.0",
         "graceful-fs": "^4.2.9",
-        "jest-haste-map": "^29.6.2",
-        "jest-regex-util": "^29.4.3",
-        "jest-util": "^29.6.2",
+        "jest-haste-map": "^29.7.0",
+        "jest-regex-util": "^29.6.3",
+        "jest-util": "^29.7.0",
         "micromatch": "^4.0.4",
         "pirates": "^4.0.4",
         "slash": "^3.0.0",
@@ -6728,28 +6152,6 @@
         "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
       }
     },
-    "node_modules/@jest/transform/node_modules/@jest/types": {
-      "version": "29.6.3",
-      "license": "MIT",
-      "dependencies": {
-        "@jest/schemas": "^29.6.3",
-        "@types/istanbul-lib-coverage": "^2.0.0",
-        "@types/istanbul-reports": "^3.0.0",
-        "@types/node": "*",
-        "@types/yargs": "^17.0.8",
-        "chalk": "^4.0.0"
-      },
-      "engines": {
-        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
-      }
-    },
-    "node_modules/@jest/transform/node_modules/@types/yargs": {
-      "version": "17.0.24",
-      "license": "MIT",
-      "dependencies": {
-        "@types/yargs-parser": "*"
-      }
-    },
     "node_modules/@jest/transform/node_modules/ansi-styles": {
       "version": "4.3.0",
       "license": "MIT",
@@ -6791,10 +6193,6 @@
       "version": "1.1.4",
       "license": "MIT"
     },
-    "node_modules/@jest/transform/node_modules/convert-source-map": {
-      "version": "2.0.0",
-      "license": "MIT"
-    },
     "node_modules/@jest/transform/node_modules/has-flag": {
       "version": "4.0.0",
       "license": "MIT",
@@ -6825,12 +6223,7 @@
     },
     "node_modules/@jest/types": {
       "version": "29.6.3",
-      "resolved": "https://registry.npmjs.org/@jest/types/-/types-29.6.3.tgz",
-      "integrity": "sha512-u3UPsIilWKOM3F9CXtrG8LEJmNxwoCQC/XVj4IKYXvvpx7QIi/Kg1LI5uDmDpKlac62NUtX7eLjRh+jVZcLOzw==",
-      "dev": true,
       "license": "MIT",
-      "optional": true,
-      "peer": true,
       "dependencies": {
         "@jest/schemas": "^29.6.3",
         "@types/istanbul-lib-coverage": "^2.0.0",
@@ -6845,10 +6238,7 @@
     },
     "node_modules/@jest/types/node_modules/ansi-styles": {
       "version": "4.3.0",
-      "dev": true,
       "license": "MIT",
-      "optional": true,
-      "peer": true,
       "dependencies": {
         "color-convert": "^2.0.1"
       },
@@ -6861,10 +6251,7 @@
     },
     "node_modules/@jest/types/node_modules/chalk": {
       "version": "4.1.2",
-      "dev": true,
       "license": "MIT",
-      "optional": true,
-      "peer": true,
       "dependencies": {
         "ansi-styles": "^4.1.0",
         "supports-color": "^7.1.0"
@@ -6878,10 +6265,7 @@
     },
     "node_modules/@jest/types/node_modules/color-convert": {
       "version": "2.0.1",
-      "dev": true,
       "license": "MIT",
-      "optional": true,
-      "peer": true,
       "dependencies": {
         "color-name": "~1.1.4"
       },
@@ -6891,27 +6275,18 @@
     },
     "node_modules/@jest/types/node_modules/color-name": {
       "version": "1.1.4",
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "peer": true
+      "license": "MIT"
     },
     "node_modules/@jest/types/node_modules/has-flag": {
       "version": "4.0.0",
-      "dev": true,
       "license": "MIT",
-      "optional": true,
-      "peer": true,
       "engines": {
         "node": ">=8"
       }
     },
     "node_modules/@jest/types/node_modules/supports-color": {
       "version": "7.2.0",
-      "dev": true,
       "license": "MIT",
-      "optional": true,
-      "peer": true,
       "dependencies": {
         "has-flag": "^4.0.0"
       },
@@ -6939,8 +6314,7 @@
     },
     "node_modules/@jridgewell/set-array": {
       "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/@jridgewell/set-array/-/set-array-1.2.1.tgz",
-      "integrity": "sha512-R8gLRTZeyp03ymzP/6Lil/28tGeGEzhx1q2k703KGWRAI1VdvPIXdG70VJc2pAMw3NA6JKL5hhFu1sJX0Mnn/A==",
+      "license": "MIT",
       "engines": {
         "node": ">=6.0.0"
       }
@@ -6967,13 +6341,11 @@
     },
     "node_modules/@jridgewell/sourcemap-codec": {
       "version": "1.4.15",
-      "resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.15.tgz",
-      "integrity": "sha512-eF2rxCRulEKXHTRiDrDy6erMYWqNw4LPdQ8UQA4huuxaQsVeRPFl2oM8oDGxMFhJUWZf9McpLtJasDDZb/Bpeg=="
+      "license": "MIT"
     },
     "node_modules/@jridgewell/trace-mapping": {
       "version": "0.3.25",
-      "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.25.tgz",
-      "integrity": "sha512-vNk6aEwybGtawWmy/PzwnGDOjCkLWSD2wqvjGGAgOAwCGWySYXfYoxt00IJkTF+8Lb57DwOb3Aa0o9CApepiYQ==",
+      "license": "MIT",
       "dependencies": {
         "@jridgewell/resolve-uri": "^3.1.0",
         "@jridgewell/sourcemap-codec": "^1.4.14"
@@ -6993,7 +6365,7 @@
       }
     },
     "node_modules/@kie/act-js": {
-      "version": "2.6.0",
+      "version": "2.6.2",
       "hasInstallScript": true,
       "license": "SEE LICENSE IN LICENSE",
       "dependencies": {
@@ -7010,48 +6382,11 @@
         "act-js": "bin/act"
       }
     },
-    "node_modules/@kie/act-js/node_modules/@kie/mock-github": {
-      "version": "2.0.0",
-      "license": "SEE LICENSE IN LICENSE",
-      "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.1.1",
-      "license": "MIT"
-    },
-    "node_modules/@kie/act-js/node_modules/fs-extra": {
-      "version": "10.1.0",
-      "license": "MIT",
-      "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",
-      "license": "MIT",
-      "engines": {
-        "node": ">=6"
-      }
-    },
     "node_modules/@kie/mock-github": {
-      "version": "1.1.0",
+      "version": "2.0.1",
       "license": "SEE LICENSE IN LICENSE",
       "dependencies": {
-        "@octokit/openapi-types-ghec": "^14.0.0",
+        "@octokit/openapi-types-ghec": "^18.0.0",
         "ajv": "^8.11.0",
         "express": "^4.18.1",
         "fast-glob": "^3.2.12",
@@ -7093,9 +6428,8 @@
     },
     "node_modules/@leichtgewicht/ip-codec": {
       "version": "2.0.5",
-      "resolved": "https://registry.npmjs.org/@leichtgewicht/ip-codec/-/ip-codec-2.0.5.tgz",
-      "integrity": "sha512-Vo+PSpZG2/fmgmiNzYK9qWRh8h/CHrwD0mo1h1DzL4yzHNSfWYujGTYsWGreD000gcgmZ7K4Ys6Tx9TxtsKdDw==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/@lwc/eslint-plugin-lwc": {
       "version": "1.7.2",
@@ -7161,7 +6495,7 @@
       }
     },
     "node_modules/@malept/cross-spawn-promise": {
-      "version": "1.1.1",
+      "version": "2.0.0",
       "dev": true,
       "funding": [
         {
@@ -7178,7 +6512,7 @@
         "cross-spawn": "^7.0.1"
       },
       "engines": {
-        "node": ">= 10"
+        "node": ">= 12.13.0"
       }
     },
     "node_modules/@malept/flatpak-bundler": {
@@ -7316,8 +6650,8 @@
     },
     "node_modules/@mdx-js/react": {
       "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/@mdx-js/react/-/react-3.0.1.tgz",
-      "integrity": "sha512-9ZrPIU4MGf6et1m1ov3zKf+q9+deetI51zprKB1D/z3NOb+rUxxtEl3mCjW5wTGh6VhRdwPueh1oRzi6ezkA8A==",
+      "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@types/mdx": "^2.0.0"
       },
@@ -7330,6 +6664,11 @@
         "react": ">=16"
       }
     },
+    "node_modules/@microsoft/applicationinsights-web-snippet": {
+      "version": "1.1.2",
+      "license": "MIT",
+      "peer": true
+    },
     "node_modules/@native-html/css-processor": {
       "version": "1.11.0",
       "license": "MIT",
@@ -7344,8 +6683,8 @@
     },
     "node_modules/@ndelangen/get-tarball": {
       "version": "3.0.9",
-      "resolved": "https://registry.npmjs.org/@ndelangen/get-tarball/-/get-tarball-3.0.9.tgz",
-      "integrity": "sha512-9JKTEik4vq+yGosHYhZ1tiH/3WpUS0Nh0kej4Agndhox8pAdWhEx5knFVRcb/ya9knCRCs1rPxNrSXTDdfVqpA==",
+      "dev": true,
+      "license": "MIT",
       "dependencies": {
         "gunzip-maybe": "^1.4.2",
         "pump": "^3.0.0",
@@ -7365,7 +6704,6 @@
       "version": "5.1.1-v1",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "eslint-scope": "5.1.1"
       }
@@ -7400,22 +6738,25 @@
       }
     },
     "node_modules/@npmcli/fs": {
-      "version": "1.1.1",
+      "version": "3.1.1",
       "license": "ISC",
       "dependencies": {
-        "@gar/promisify": "^1.0.1",
         "semver": "^7.3.5"
+      },
+      "engines": {
+        "node": "^14.17.0 || ^16.13.0 || >=18.0.0"
       }
     },
     "node_modules/@npmcli/move-file": {
-      "version": "1.1.2",
+      "version": "2.0.1",
+      "dev": true,
       "license": "MIT",
       "dependencies": {
         "mkdirp": "^1.0.4",
         "rimraf": "^3.0.2"
       },
       "engines": {
-        "node": ">=10"
+        "node": "^12.13.0 || ^14.15.0 || >=16.0.0"
       }
     },
     "node_modules/@octokit/auth-token": {
@@ -7501,7 +6842,7 @@
       "license": "MIT"
     },
     "node_modules/@octokit/openapi-types-ghec": {
-      "version": "14.0.0",
+      "version": "18.1.1",
       "license": "MIT"
     },
     "node_modules/@octokit/plugin-paginate-rest": {
@@ -7608,6 +6949,11 @@
         "@octokit/openapi-types": "^12.11.0"
       }
     },
+    "node_modules/@octokit/webhooks-types": {
+      "version": "7.5.1",
+      "dev": true,
+      "license": "MIT"
+    },
     "node_modules/@onfido/react-native-sdk": {
       "version": "10.6.0",
       "license": "MIT",
@@ -7622,6 +6968,208 @@
         "react-native": ">=0.70.0 <1.0.x"
       }
     },
+    "node_modules/@opentelemetry/api": {
+      "version": "1.9.0",
+      "license": "Apache-2.0",
+      "peer": true,
+      "engines": {
+        "node": ">=8.0.0"
+      }
+    },
+    "node_modules/@opentelemetry/core": {
+      "version": "1.25.1",
+      "license": "Apache-2.0",
+      "peer": true,
+      "dependencies": {
+        "@opentelemetry/semantic-conventions": "1.25.1"
+      },
+      "engines": {
+        "node": ">=14"
+      },
+      "peerDependencies": {
+        "@opentelemetry/api": ">=1.0.0 <1.10.0"
+      }
+    },
+    "node_modules/@opentelemetry/instrumentation": {
+      "version": "0.41.2",
+      "license": "Apache-2.0",
+      "peer": true,
+      "dependencies": {
+        "@types/shimmer": "^1.0.2",
+        "import-in-the-middle": "1.4.2",
+        "require-in-the-middle": "^7.1.1",
+        "semver": "^7.5.1",
+        "shimmer": "^1.2.1"
+      },
+      "engines": {
+        "node": ">=14"
+      },
+      "peerDependencies": {
+        "@opentelemetry/api": "^1.3.0"
+      }
+    },
+    "node_modules/@opentelemetry/resources": {
+      "version": "1.25.1",
+      "license": "Apache-2.0",
+      "peer": true,
+      "dependencies": {
+        "@opentelemetry/core": "1.25.1",
+        "@opentelemetry/semantic-conventions": "1.25.1"
+      },
+      "engines": {
+        "node": ">=14"
+      },
+      "peerDependencies": {
+        "@opentelemetry/api": ">=1.0.0 <1.10.0"
+      }
+    },
+    "node_modules/@opentelemetry/sdk-trace-base": {
+      "version": "1.25.1",
+      "license": "Apache-2.0",
+      "peer": true,
+      "dependencies": {
+        "@opentelemetry/core": "1.25.1",
+        "@opentelemetry/resources": "1.25.1",
+        "@opentelemetry/semantic-conventions": "1.25.1"
+      },
+      "engines": {
+        "node": ">=14"
+      },
+      "peerDependencies": {
+        "@opentelemetry/api": ">=1.0.0 <1.10.0"
+      }
+    },
+    "node_modules/@opentelemetry/semantic-conventions": {
+      "version": "1.25.1",
+      "license": "Apache-2.0",
+      "peer": true,
+      "engines": {
+        "node": ">=14"
+      }
+    },
+    "node_modules/@peggyjs/from-mem": {
+      "version": "1.3.0",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "semver": "7.6.0"
+      },
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/@peggyjs/from-mem/node_modules/semver": {
+      "version": "7.6.0",
+      "dev": true,
+      "license": "ISC",
+      "dependencies": {
+        "lru-cache": "^6.0.0"
+      },
+      "bin": {
+        "semver": "bin/semver.js"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/@perf-profiler/android": {
+      "version": "0.13.0",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@perf-profiler/logger": "^0.3.3",
+        "@perf-profiler/profiler": "^0.10.11",
+        "@perf-profiler/types": "^0.8.0",
+        "commander": "^12.0.0",
+        "lodash": "^4.17.21"
+      },
+      "bin": {
+        "perf-profiler-commands": "dist/src/commands.js"
+      }
+    },
+    "node_modules/@perf-profiler/android/node_modules/commander": {
+      "version": "12.1.0",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/@perf-profiler/ios": {
+      "version": "0.3.3",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@perf-profiler/ios-instruments": "^0.3.3",
+        "@perf-profiler/logger": "^0.3.3",
+        "@perf-profiler/types": "^0.8.0"
+      }
+    },
+    "node_modules/@perf-profiler/ios-instruments": {
+      "version": "0.3.3",
+      "dev": true,
+      "license": "ISC",
+      "dependencies": {
+        "@perf-profiler/logger": "^0.3.3",
+        "@perf-profiler/profiler": "^0.10.11",
+        "@perf-profiler/types": "^0.8.0",
+        "commander": "^12.0.0",
+        "fast-xml-parser": "^4.2.7"
+      },
+      "bin": {
+        "flashlight-ios-poc": "dist/launchIOS.js"
+      }
+    },
+    "node_modules/@perf-profiler/ios-instruments/node_modules/commander": {
+      "version": "12.1.0",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/@perf-profiler/logger": {
+      "version": "0.3.3",
+      "dev": true,
+      "dependencies": {
+        "kleur": "^4.1.5",
+        "luxon": "^3.4.4"
+      },
+      "bin": {
+        "perf-profiler-logger": "dist/bin.js"
+      }
+    },
+    "node_modules/@perf-profiler/logger/node_modules/kleur": {
+      "version": "4.1.5",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/@perf-profiler/profiler": {
+      "version": "0.10.11",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@perf-profiler/android": "^0.13.0",
+        "@perf-profiler/ios": "^0.3.3",
+        "@perf-profiler/types": "^0.8.0"
+      }
+    },
+    "node_modules/@perf-profiler/reporter": {
+      "version": "0.9.0",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@perf-profiler/types": "^0.8.0",
+        "lodash": "^4.17.21"
+      }
+    },
+    "node_modules/@perf-profiler/types": {
+      "version": "0.8.0",
+      "dev": true
+    },
     "node_modules/@pkgjs/parseargs": {
       "version": "0.11.0",
       "license": "MIT",
@@ -7635,34 +7183,295 @@
       "dev": true,
       "license": "MIT"
     },
+    "node_modules/@radix-ui/primitive": {
+      "version": "1.1.0",
+      "dev": true,
+      "license": "MIT"
+    },
     "node_modules/@radix-ui/react-compose-refs": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/@radix-ui/react-compose-refs/-/react-compose-refs-1.0.1.tgz",
-      "integrity": "sha512-fDSBgd44FKHa1FRMU59qBMPFcl2PZE+2nmqunj+BWFyYYjnhIDWL2ItDs3rrbJDQOtzt5nIebLCQc4QRfz6LJw==",
+      "version": "1.1.0",
+      "dev": true,
+      "license": "MIT",
+      "peerDependencies": {
+        "@types/react": "*",
+        "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc"
+      },
+      "peerDependenciesMeta": {
+        "@types/react": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@radix-ui/react-context": {
+      "version": "1.1.0",
+      "dev": true,
+      "license": "MIT",
+      "peerDependencies": {
+        "@types/react": "*",
+        "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc"
+      },
+      "peerDependenciesMeta": {
+        "@types/react": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@radix-ui/react-dialog": {
+      "version": "1.1.1",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@radix-ui/primitive": "1.1.0",
+        "@radix-ui/react-compose-refs": "1.1.0",
+        "@radix-ui/react-context": "1.1.0",
+        "@radix-ui/react-dismissable-layer": "1.1.0",
+        "@radix-ui/react-focus-guards": "1.1.0",
+        "@radix-ui/react-focus-scope": "1.1.0",
+        "@radix-ui/react-id": "1.1.0",
+        "@radix-ui/react-portal": "1.1.1",
+        "@radix-ui/react-presence": "1.1.0",
+        "@radix-ui/react-primitive": "2.0.0",
+        "@radix-ui/react-slot": "1.1.0",
+        "@radix-ui/react-use-controllable-state": "1.1.0",
+        "aria-hidden": "^1.1.1",
+        "react-remove-scroll": "2.5.7"
+      },
+      "peerDependencies": {
+        "@types/react": "*",
+        "@types/react-dom": "*",
+        "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc",
+        "react-dom": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc"
+      },
+      "peerDependenciesMeta": {
+        "@types/react": {
+          "optional": true
+        },
+        "@types/react-dom": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@radix-ui/react-dismissable-layer": {
+      "version": "1.1.0",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@radix-ui/primitive": "1.1.0",
+        "@radix-ui/react-compose-refs": "1.1.0",
+        "@radix-ui/react-primitive": "2.0.0",
+        "@radix-ui/react-use-callback-ref": "1.1.0",
+        "@radix-ui/react-use-escape-keydown": "1.1.0"
+      },
+      "peerDependencies": {
+        "@types/react": "*",
+        "@types/react-dom": "*",
+        "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc",
+        "react-dom": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc"
+      },
+      "peerDependenciesMeta": {
+        "@types/react": {
+          "optional": true
+        },
+        "@types/react-dom": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@radix-ui/react-focus-guards": {
+      "version": "1.1.0",
+      "dev": true,
+      "license": "MIT",
+      "peerDependencies": {
+        "@types/react": "*",
+        "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc"
+      },
+      "peerDependenciesMeta": {
+        "@types/react": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@radix-ui/react-focus-scope": {
+      "version": "1.1.0",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@radix-ui/react-compose-refs": "1.1.0",
+        "@radix-ui/react-primitive": "2.0.0",
+        "@radix-ui/react-use-callback-ref": "1.1.0"
+      },
+      "peerDependencies": {
+        "@types/react": "*",
+        "@types/react-dom": "*",
+        "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc",
+        "react-dom": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc"
+      },
+      "peerDependenciesMeta": {
+        "@types/react": {
+          "optional": true
+        },
+        "@types/react-dom": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@radix-ui/react-id": {
+      "version": "1.1.0",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@radix-ui/react-use-layout-effect": "1.1.0"
+      },
+      "peerDependencies": {
+        "@types/react": "*",
+        "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc"
+      },
+      "peerDependenciesMeta": {
+        "@types/react": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@radix-ui/react-portal": {
+      "version": "1.1.1",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@radix-ui/react-primitive": "2.0.0",
+        "@radix-ui/react-use-layout-effect": "1.1.0"
+      },
+      "peerDependencies": {
+        "@types/react": "*",
+        "@types/react-dom": "*",
+        "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc",
+        "react-dom": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc"
+      },
+      "peerDependenciesMeta": {
+        "@types/react": {
+          "optional": true
+        },
+        "@types/react-dom": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@radix-ui/react-presence": {
+      "version": "1.1.0",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@radix-ui/react-compose-refs": "1.1.0",
+        "@radix-ui/react-use-layout-effect": "1.1.0"
+      },
+      "peerDependencies": {
+        "@types/react": "*",
+        "@types/react-dom": "*",
+        "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc",
+        "react-dom": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc"
+      },
+      "peerDependenciesMeta": {
+        "@types/react": {
+          "optional": true
+        },
+        "@types/react-dom": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@radix-ui/react-primitive": {
+      "version": "2.0.0",
+      "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "@babel/runtime": "^7.13.10"
+        "@radix-ui/react-slot": "1.1.0"
       },
       "peerDependencies": {
         "@types/react": "*",
-        "react": "^16.8 || ^17.0 || ^18.0"
+        "@types/react-dom": "*",
+        "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc",
+        "react-dom": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc"
       },
       "peerDependenciesMeta": {
         "@types/react": {
           "optional": true
+        },
+        "@types/react-dom": {
+          "optional": true
         }
       }
     },
     "node_modules/@radix-ui/react-slot": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/@radix-ui/react-slot/-/react-slot-1.0.2.tgz",
-      "integrity": "sha512-YeTpuq4deV+6DusvVUW4ivBgnkHwECUu0BiN43L5UCDFgdhsRUWAghhTF5MbvNTPzmiFOx90asDSUjWuCNapwg==",
+      "version": "1.1.0",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@radix-ui/react-compose-refs": "1.1.0"
+      },
+      "peerDependencies": {
+        "@types/react": "*",
+        "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc"
+      },
+      "peerDependenciesMeta": {
+        "@types/react": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@radix-ui/react-use-callback-ref": {
+      "version": "1.1.0",
+      "dev": true,
+      "license": "MIT",
+      "peerDependencies": {
+        "@types/react": "*",
+        "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc"
+      },
+      "peerDependenciesMeta": {
+        "@types/react": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@radix-ui/react-use-controllable-state": {
+      "version": "1.1.0",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@radix-ui/react-use-callback-ref": "1.1.0"
+      },
+      "peerDependencies": {
+        "@types/react": "*",
+        "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc"
+      },
+      "peerDependenciesMeta": {
+        "@types/react": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@radix-ui/react-use-escape-keydown": {
+      "version": "1.1.0",
+      "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "@babel/runtime": "^7.13.10",
-        "@radix-ui/react-compose-refs": "1.0.1"
+        "@radix-ui/react-use-callback-ref": "1.1.0"
+      },
+      "peerDependencies": {
+        "@types/react": "*",
+        "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc"
       },
+      "peerDependenciesMeta": {
+        "@types/react": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@radix-ui/react-use-layout-effect": {
+      "version": "1.1.0",
+      "dev": true,
+      "license": "MIT",
       "peerDependencies": {
         "@types/react": "*",
-        "react": "^16.8 || ^17.0 || ^18.0"
+        "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc"
       },
       "peerDependenciesMeta": {
         "@types/react": {
@@ -7681,58 +7490,72 @@
       }
     },
     "node_modules/@react-native-clipboard/clipboard": {
-      "version": "1.13.2",
+      "version": "1.14.0",
       "license": "MIT",
       "peerDependencies": {
-        "react": ">=16.0",
-        "react-native": ">=0.57.0"
+        "react": "18.2.0",
+        "react-native": "^0.73.0",
+        "react-native-macos": "^0.73.0",
+        "react-native-windows": "^0.73.0"
       }
     },
     "node_modules/@react-native-community/cli": {
-      "version": "12.3.2",
-      "resolved": "https://registry.npmjs.org/@react-native-community/cli/-/cli-12.3.2.tgz",
-      "integrity": "sha512-WgoUWwLDcf/G1Su2COUUVs3RzAwnV/vUTdISSpAUGgSc57mPabaAoUctKTnfYEhCnE3j02k3VtaVPwCAFRO3TQ==",
-      "dependencies": {
-        "@react-native-community/cli-clean": "12.3.2",
-        "@react-native-community/cli-config": "12.3.2",
-        "@react-native-community/cli-debugger-ui": "12.3.2",
-        "@react-native-community/cli-doctor": "12.3.2",
-        "@react-native-community/cli-hermes": "12.3.2",
-        "@react-native-community/cli-plugin-metro": "12.3.2",
-        "@react-native-community/cli-server-api": "12.3.2",
-        "@react-native-community/cli-tools": "12.3.2",
-        "@react-native-community/cli-types": "12.3.2",
+      "version": "14.0.0",
+      "license": "MIT",
+      "dependencies": {
+        "@react-native-community/cli-clean": "14.0.0",
+        "@react-native-community/cli-config": "14.0.0",
+        "@react-native-community/cli-debugger-ui": "14.0.0",
+        "@react-native-community/cli-doctor": "14.0.0",
+        "@react-native-community/cli-server-api": "14.0.0",
+        "@react-native-community/cli-tools": "14.0.0",
+        "@react-native-community/cli-types": "14.0.0",
         "chalk": "^4.1.2",
         "commander": "^9.4.1",
         "deepmerge": "^4.3.0",
         "execa": "^5.0.0",
-        "find-up": "^4.1.0",
+        "find-up": "^5.0.0",
         "fs-extra": "^8.1.0",
         "graceful-fs": "^4.1.3",
         "prompts": "^2.4.2",
         "semver": "^7.5.2"
       },
       "bin": {
-        "react-native": "build/bin.js"
+        "rnc-cli": "build/bin.js"
       },
       "engines": {
         "node": ">=18"
       }
     },
     "node_modules/@react-native-community/cli-clean": {
-      "version": "12.3.2",
-      "resolved": "https://registry.npmjs.org/@react-native-community/cli-clean/-/cli-clean-12.3.2.tgz",
-      "integrity": "sha512-90k2hCX0ddSFPT7EN7h5SZj0XZPXP0+y/++v262hssoey3nhurwF57NGWN0XAR0o9BSW7+mBfeInfabzDraO6A==",
+      "version": "14.0.0",
+      "license": "MIT",
       "dependencies": {
-        "@react-native-community/cli-tools": "12.3.2",
+        "@react-native-community/cli-tools": "14.0.0",
         "chalk": "^4.1.2",
-        "execa": "^5.0.0"
+        "execa": "^5.0.0",
+        "fast-glob": "^3.3.2"
+      }
+    },
+    "node_modules/@react-native-community/cli-clean/node_modules/@react-native-community/cli-tools": {
+      "version": "14.0.0",
+      "license": "MIT",
+      "dependencies": {
+        "appdirsjs": "^1.2.4",
+        "chalk": "^4.1.2",
+        "execa": "^5.0.0",
+        "find-up": "^5.0.0",
+        "mime": "^2.4.1",
+        "open": "^6.2.0",
+        "ora": "^5.4.1",
+        "semver": "^7.5.2",
+        "shell-quote": "^1.7.3",
+        "sudo-prompt": "^9.0.0"
       }
     },
     "node_modules/@react-native-community/cli-clean/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==",
+      "license": "MIT",
       "dependencies": {
         "color-convert": "^2.0.1"
       },
@@ -7745,8 +7568,7 @@
     },
     "node_modules/@react-native-community/cli-clean/node_modules/chalk": {
       "version": "4.1.2",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
-      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
+      "license": "MIT",
       "dependencies": {
         "ansi-styles": "^4.1.0",
         "supports-color": "^7.1.0"
@@ -7760,8 +7582,7 @@
     },
     "node_modules/@react-native-community/cli-clean/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==",
+      "license": "MIT",
       "dependencies": {
         "color-name": "~1.1.4"
       },
@@ -7771,21 +7592,35 @@
     },
     "node_modules/@react-native-community/cli-clean/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=="
+      "license": "MIT"
     },
     "node_modules/@react-native-community/cli-clean/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==",
+      "license": "MIT",
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/@react-native-community/cli-clean/node_modules/is-wsl": {
+      "version": "1.1.0",
+      "license": "MIT",
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/@react-native-community/cli-clean/node_modules/open": {
+      "version": "6.4.0",
+      "license": "MIT",
+      "dependencies": {
+        "is-wsl": "^1.1.0"
+      },
       "engines": {
         "node": ">=8"
       }
     },
     "node_modules/@react-native-community/cli-clean/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==",
+      "license": "MIT",
       "dependencies": {
         "has-flag": "^4.0.0"
       },
@@ -7794,22 +7629,36 @@
       }
     },
     "node_modules/@react-native-community/cli-config": {
-      "version": "12.3.2",
-      "resolved": "https://registry.npmjs.org/@react-native-community/cli-config/-/cli-config-12.3.2.tgz",
-      "integrity": "sha512-UUCzDjQgvAVL/57rL7eOuFUhd+d+6qfM7V8uOegQFeFEmSmvUUDLYoXpBa5vAK9JgQtSqMBJ1Shmwao+/oElxQ==",
+      "version": "14.0.0",
+      "license": "MIT",
       "dependencies": {
-        "@react-native-community/cli-tools": "12.3.2",
+        "@react-native-community/cli-tools": "14.0.0",
         "chalk": "^4.1.2",
-        "cosmiconfig": "^5.1.0",
+        "cosmiconfig": "^9.0.0",
         "deepmerge": "^4.3.0",
-        "glob": "^7.1.3",
+        "fast-glob": "^3.3.2",
         "joi": "^17.2.1"
       }
     },
+    "node_modules/@react-native-community/cli-config/node_modules/@react-native-community/cli-tools": {
+      "version": "14.0.0",
+      "license": "MIT",
+      "dependencies": {
+        "appdirsjs": "^1.2.4",
+        "chalk": "^4.1.2",
+        "execa": "^5.0.0",
+        "find-up": "^5.0.0",
+        "mime": "^2.4.1",
+        "open": "^6.2.0",
+        "ora": "^5.4.1",
+        "semver": "^7.5.2",
+        "shell-quote": "^1.7.3",
+        "sudo-prompt": "^9.0.0"
+      }
+    },
     "node_modules/@react-native-community/cli-config/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==",
+      "license": "MIT",
       "dependencies": {
         "color-convert": "^2.0.1"
       },
@@ -7820,10 +7669,13 @@
         "url": "https://github.com/chalk/ansi-styles?sponsor=1"
       }
     },
+    "node_modules/@react-native-community/cli-config/node_modules/argparse": {
+      "version": "2.0.1",
+      "license": "Python-2.0"
+    },
     "node_modules/@react-native-community/cli-config/node_modules/chalk": {
       "version": "4.1.2",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
-      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
+      "license": "MIT",
       "dependencies": {
         "ansi-styles": "^4.1.0",
         "supports-color": "^7.1.0"
@@ -7837,8 +7689,7 @@
     },
     "node_modules/@react-native-community/cli-config/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==",
+      "license": "MIT",
       "dependencies": {
         "color-name": "~1.1.4"
       },
@@ -7848,67 +7699,69 @@
     },
     "node_modules/@react-native-community/cli-config/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=="
+      "license": "MIT"
     },
     "node_modules/@react-native-community/cli-config/node_modules/cosmiconfig": {
-      "version": "5.2.1",
-      "resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-5.2.1.tgz",
-      "integrity": "sha512-H65gsXo1SKjf8zmrJ67eJk8aIRKV5ff2D4uKZIBZShbhGSpEmsQOPW/SKMKYhSTrqR7ufy6RP69rPogdaPh/kA==",
+      "version": "9.0.0",
+      "license": "MIT",
       "dependencies": {
-        "import-fresh": "^2.0.0",
-        "is-directory": "^0.3.1",
-        "js-yaml": "^3.13.1",
-        "parse-json": "^4.0.0"
+        "env-paths": "^2.2.1",
+        "import-fresh": "^3.3.0",
+        "js-yaml": "^4.1.0",
+        "parse-json": "^5.2.0"
       },
       "engines": {
-        "node": ">=4"
+        "node": ">=14"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/d-fischer"
+      },
+      "peerDependencies": {
+        "typescript": ">=4.9.5"
+      },
+      "peerDependenciesMeta": {
+        "typescript": {
+          "optional": true
+        }
       }
     },
     "node_modules/@react-native-community/cli-config/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==",
+      "license": "MIT",
       "engines": {
         "node": ">=8"
       }
     },
-    "node_modules/@react-native-community/cli-config/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"
-      },
+    "node_modules/@react-native-community/cli-config/node_modules/is-wsl": {
+      "version": "1.1.0",
+      "license": "MIT",
       "engines": {
         "node": ">=4"
       }
     },
-    "node_modules/@react-native-community/cli-config/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==",
+    "node_modules/@react-native-community/cli-config/node_modules/js-yaml": {
+      "version": "4.1.0",
+      "license": "MIT",
       "dependencies": {
-        "error-ex": "^1.3.1",
-        "json-parse-better-errors": "^1.0.1"
+        "argparse": "^2.0.1"
       },
-      "engines": {
-        "node": ">=4"
+      "bin": {
+        "js-yaml": "bin/js-yaml.js"
       }
     },
-    "node_modules/@react-native-community/cli-config/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==",
+    "node_modules/@react-native-community/cli-config/node_modules/open": {
+      "version": "6.4.0",
+      "license": "MIT",
+      "dependencies": {
+        "is-wsl": "^1.1.0"
+      },
       "engines": {
-        "node": ">=4"
+        "node": ">=8"
       }
     },
     "node_modules/@react-native-community/cli-config/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==",
+      "license": "MIT",
       "dependencies": {
         "has-flag": "^4.0.0"
       },
@@ -7917,29 +7770,27 @@
       }
     },
     "node_modules/@react-native-community/cli-debugger-ui": {
-      "version": "12.3.2",
-      "resolved": "https://registry.npmjs.org/@react-native-community/cli-debugger-ui/-/cli-debugger-ui-12.3.2.tgz",
-      "integrity": "sha512-nSWQUL+51J682DlfcC1bjkUbQbGvHCC25jpqTwHIjmmVjYCX1uHuhPSqQKgPNdvtfOkrkACxczd7kVMmetxY2Q==",
+      "version": "12.3.6",
+      "license": "MIT",
+      "peer": true,
       "dependencies": {
         "serve-static": "^1.13.1"
       }
     },
     "node_modules/@react-native-community/cli-doctor": {
-      "version": "12.3.2",
-      "resolved": "https://registry.npmjs.org/@react-native-community/cli-doctor/-/cli-doctor-12.3.2.tgz",
-      "integrity": "sha512-GrAabdY4qtBX49knHFvEAdLtCjkmndjTeqhYO6BhsbAeKOtspcLT/0WRgdLIaKODRa61ADNB3K5Zm4dU0QrZOg==",
-      "dependencies": {
-        "@react-native-community/cli-config": "12.3.2",
-        "@react-native-community/cli-platform-android": "12.3.2",
-        "@react-native-community/cli-platform-ios": "12.3.2",
-        "@react-native-community/cli-tools": "12.3.2",
+      "version": "14.0.0",
+      "license": "MIT",
+      "dependencies": {
+        "@react-native-community/cli-config": "14.0.0",
+        "@react-native-community/cli-platform-android": "14.0.0",
+        "@react-native-community/cli-platform-apple": "14.0.0",
+        "@react-native-community/cli-platform-ios": "14.0.0",
+        "@react-native-community/cli-tools": "14.0.0",
         "chalk": "^4.1.2",
         "command-exists": "^1.2.8",
         "deepmerge": "^4.3.0",
-        "envinfo": "^7.10.0",
+        "envinfo": "^7.13.0",
         "execa": "^5.0.0",
-        "hermes-profile-transformer": "^0.0.6",
-        "ip": "^1.1.5",
         "node-stream-zip": "^1.9.1",
         "ora": "^5.4.1",
         "semver": "^7.5.2",
@@ -7948,24 +7799,38 @@
         "yaml": "^2.2.1"
       }
     },
-    "node_modules/@react-native-community/cli-doctor/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==",
+    "node_modules/@react-native-community/cli-doctor/node_modules/@react-native-community/cli-tools": {
+      "version": "14.0.0",
+      "license": "MIT",
       "dependencies": {
-        "color-convert": "^2.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      },
+        "appdirsjs": "^1.2.4",
+        "chalk": "^4.1.2",
+        "execa": "^5.0.0",
+        "find-up": "^5.0.0",
+        "mime": "^2.4.1",
+        "open": "^6.2.0",
+        "ora": "^5.4.1",
+        "semver": "^7.5.2",
+        "shell-quote": "^1.7.3",
+        "sudo-prompt": "^9.0.0"
+      }
+    },
+    "node_modules/@react-native-community/cli-doctor/node_modules/ansi-styles": {
+      "version": "4.3.0",
+      "license": "MIT",
+      "dependencies": {
+        "color-convert": "^2.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      },
       "funding": {
         "url": "https://github.com/chalk/ansi-styles?sponsor=1"
       }
     },
     "node_modules/@react-native-community/cli-doctor/node_modules/chalk": {
       "version": "4.1.2",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
-      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
+      "license": "MIT",
       "dependencies": {
         "ansi-styles": "^4.1.0",
         "supports-color": "^7.1.0"
@@ -7979,8 +7844,7 @@
     },
     "node_modules/@react-native-community/cli-doctor/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==",
+      "license": "MIT",
       "dependencies": {
         "color-name": "~1.1.4"
       },
@@ -7990,118 +7854,45 @@
     },
     "node_modules/@react-native-community/cli-doctor/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=="
+      "license": "MIT"
     },
     "node_modules/@react-native-community/cli-doctor/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==",
+      "license": "MIT",
       "engines": {
         "node": ">=8"
       }
     },
-    "node_modules/@react-native-community/cli-doctor/node_modules/ip": {
-      "version": "1.1.9",
-      "resolved": "https://registry.npmjs.org/ip/-/ip-1.1.9.tgz",
-      "integrity": "sha512-cyRxvOEpNHNtchU3Ln9KC/auJgup87llfQpQ+t5ghoC/UhL16SWzbueiCsdTnWmqAWl7LadfuwhlqmtOaqMHdQ=="
-    },
-    "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",
-      "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==",
-      "dependencies": {
-        "ansi-regex": "^4.1.0"
-      },
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/@react-native-community/cli-doctor/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==",
-      "dependencies": {
-        "has-flag": "^4.0.0"
-      },
+    "node_modules/@react-native-community/cli-doctor/node_modules/is-wsl": {
+      "version": "1.1.0",
+      "license": "MIT",
       "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/@react-native-community/cli-hermes": {
-      "version": "12.3.2",
-      "resolved": "https://registry.npmjs.org/@react-native-community/cli-hermes/-/cli-hermes-12.3.2.tgz",
-      "integrity": "sha512-SL6F9O8ghp4ESBFH2YAPLtIN39jdnvGBKnK4FGKpDCjtB3DnUmDsGFlH46S+GGt5M6VzfG2eeKEOKf3pZ6jUzA==",
-      "dependencies": {
-        "@react-native-community/cli-platform-android": "12.3.2",
-        "@react-native-community/cli-tools": "12.3.2",
-        "chalk": "^4.1.2",
-        "hermes-profile-transformer": "^0.0.6",
-        "ip": "^1.1.5"
+        "node": ">=4"
       }
     },
-    "node_modules/@react-native-community/cli-hermes/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==",
+    "node_modules/@react-native-community/cli-doctor/node_modules/open": {
+      "version": "6.4.0",
+      "license": "MIT",
       "dependencies": {
-        "color-convert": "^2.0.1"
+        "is-wsl": "^1.1.0"
       },
       "engines": {
         "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
-      }
-    },
-    "node_modules/@react-native-community/cli-hermes/node_modules/chalk": {
-      "version": "4.1.2",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
-      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
-      "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/@react-native-community/cli-hermes/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==",
+    "node_modules/@react-native-community/cli-doctor/node_modules/strip-ansi": {
+      "version": "5.2.0",
+      "license": "MIT",
       "dependencies": {
-        "color-name": "~1.1.4"
+        "ansi-regex": "^4.1.0"
       },
       "engines": {
-        "node": ">=7.0.0"
-      }
-    },
-    "node_modules/@react-native-community/cli-hermes/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=="
-    },
-    "node_modules/@react-native-community/cli-hermes/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==",
-      "engines": {
-        "node": ">=8"
+        "node": ">=6"
       }
     },
-    "node_modules/@react-native-community/cli-hermes/node_modules/ip": {
-      "version": "1.1.9",
-      "resolved": "https://registry.npmjs.org/ip/-/ip-1.1.9.tgz",
-      "integrity": "sha512-cyRxvOEpNHNtchU3Ln9KC/auJgup87llfQpQ+t5ghoC/UhL16SWzbueiCsdTnWmqAWl7LadfuwhlqmtOaqMHdQ=="
-    },
-    "node_modules/@react-native-community/cli-hermes/node_modules/supports-color": {
+    "node_modules/@react-native-community/cli-doctor/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==",
+      "license": "MIT",
       "dependencies": {
         "has-flag": "^4.0.0"
       },
@@ -8110,22 +7901,36 @@
       }
     },
     "node_modules/@react-native-community/cli-platform-android": {
-      "version": "12.3.2",
-      "resolved": "https://registry.npmjs.org/@react-native-community/cli-platform-android/-/cli-platform-android-12.3.2.tgz",
-      "integrity": "sha512-MZ5nO8yi/N+Fj2i9BJcJ9C/ez+9/Ir7lQt49DWRo9YDmzye66mYLr/P2l/qxsixllbbDi7BXrlLpxaEhMrDopg==",
+      "version": "14.0.0",
+      "license": "MIT",
       "dependencies": {
-        "@react-native-community/cli-tools": "12.3.2",
+        "@react-native-community/cli-tools": "14.0.0",
         "chalk": "^4.1.2",
         "execa": "^5.0.0",
+        "fast-glob": "^3.3.2",
         "fast-xml-parser": "^4.2.4",
-        "glob": "^7.1.3",
         "logkitty": "^0.7.1"
       }
     },
+    "node_modules/@react-native-community/cli-platform-android/node_modules/@react-native-community/cli-tools": {
+      "version": "14.0.0",
+      "license": "MIT",
+      "dependencies": {
+        "appdirsjs": "^1.2.4",
+        "chalk": "^4.1.2",
+        "execa": "^5.0.0",
+        "find-up": "^5.0.0",
+        "mime": "^2.4.1",
+        "open": "^6.2.0",
+        "ora": "^5.4.1",
+        "semver": "^7.5.2",
+        "shell-quote": "^1.7.3",
+        "sudo-prompt": "^9.0.0"
+      }
+    },
     "node_modules/@react-native-community/cli-platform-android/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==",
+      "license": "MIT",
       "dependencies": {
         "color-convert": "^2.0.1"
       },
@@ -8138,8 +7943,7 @@
     },
     "node_modules/@react-native-community/cli-platform-android/node_modules/chalk": {
       "version": "4.1.2",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
-      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
+      "license": "MIT",
       "dependencies": {
         "ansi-styles": "^4.1.0",
         "supports-color": "^7.1.0"
@@ -8153,8 +7957,7 @@
     },
     "node_modules/@react-native-community/cli-platform-android/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==",
+      "license": "MIT",
       "dependencies": {
         "color-name": "~1.1.4"
       },
@@ -8164,21 +7967,35 @@
     },
     "node_modules/@react-native-community/cli-platform-android/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=="
+      "license": "MIT"
     },
     "node_modules/@react-native-community/cli-platform-android/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==",
+      "license": "MIT",
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/@react-native-community/cli-platform-android/node_modules/is-wsl": {
+      "version": "1.1.0",
+      "license": "MIT",
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/@react-native-community/cli-platform-android/node_modules/open": {
+      "version": "6.4.0",
+      "license": "MIT",
+      "dependencies": {
+        "is-wsl": "^1.1.0"
+      },
       "engines": {
         "node": ">=8"
       }
     },
     "node_modules/@react-native-community/cli-platform-android/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==",
+      "license": "MIT",
       "dependencies": {
         "has-flag": "^4.0.0"
       },
@@ -8186,23 +8003,37 @@
         "node": ">=8"
       }
     },
-    "node_modules/@react-native-community/cli-platform-ios": {
-      "version": "12.3.2",
-      "resolved": "https://registry.npmjs.org/@react-native-community/cli-platform-ios/-/cli-platform-ios-12.3.2.tgz",
-      "integrity": "sha512-OcWEAbkev1IL6SUiQnM6DQdsvfsKZhRZtoBNSj9MfdmwotVZSOEZJ+IjZ1FR9ChvMWayO9ns/o8LgoQxr1ZXeg==",
+    "node_modules/@react-native-community/cli-platform-apple": {
+      "version": "14.0.0",
+      "license": "MIT",
       "dependencies": {
-        "@react-native-community/cli-tools": "12.3.2",
+        "@react-native-community/cli-tools": "14.0.0",
         "chalk": "^4.1.2",
         "execa": "^5.0.0",
-        "fast-xml-parser": "^4.0.12",
-        "glob": "^7.1.3",
+        "fast-glob": "^3.3.2",
+        "fast-xml-parser": "^4.2.4",
         "ora": "^5.4.1"
       }
     },
-    "node_modules/@react-native-community/cli-platform-ios/node_modules/ansi-styles": {
+    "node_modules/@react-native-community/cli-platform-apple/node_modules/@react-native-community/cli-tools": {
+      "version": "14.0.0",
+      "license": "MIT",
+      "dependencies": {
+        "appdirsjs": "^1.2.4",
+        "chalk": "^4.1.2",
+        "execa": "^5.0.0",
+        "find-up": "^5.0.0",
+        "mime": "^2.4.1",
+        "open": "^6.2.0",
+        "ora": "^5.4.1",
+        "semver": "^7.5.2",
+        "shell-quote": "^1.7.3",
+        "sudo-prompt": "^9.0.0"
+      }
+    },
+    "node_modules/@react-native-community/cli-platform-apple/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==",
+      "license": "MIT",
       "dependencies": {
         "color-convert": "^2.0.1"
       },
@@ -8213,10 +8044,9 @@
         "url": "https://github.com/chalk/ansi-styles?sponsor=1"
       }
     },
-    "node_modules/@react-native-community/cli-platform-ios/node_modules/chalk": {
+    "node_modules/@react-native-community/cli-platform-apple/node_modules/chalk": {
       "version": "4.1.2",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
-      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
+      "license": "MIT",
       "dependencies": {
         "ansi-styles": "^4.1.0",
         "supports-color": "^7.1.0"
@@ -8228,10 +8058,9 @@
         "url": "https://github.com/chalk/chalk?sponsor=1"
       }
     },
-    "node_modules/@react-native-community/cli-platform-ios/node_modules/color-convert": {
+    "node_modules/@react-native-community/cli-platform-apple/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==",
+      "license": "MIT",
       "dependencies": {
         "color-name": "~1.1.4"
       },
@@ -8239,23 +8068,37 @@
         "node": ">=7.0.0"
       }
     },
-    "node_modules/@react-native-community/cli-platform-ios/node_modules/color-name": {
+    "node_modules/@react-native-community/cli-platform-apple/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=="
+      "license": "MIT"
     },
-    "node_modules/@react-native-community/cli-platform-ios/node_modules/has-flag": {
+    "node_modules/@react-native-community/cli-platform-apple/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==",
+      "license": "MIT",
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/@react-native-community/cli-platform-apple/node_modules/is-wsl": {
+      "version": "1.1.0",
+      "license": "MIT",
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/@react-native-community/cli-platform-apple/node_modules/open": {
+      "version": "6.4.0",
+      "license": "MIT",
+      "dependencies": {
+        "is-wsl": "^1.1.0"
+      },
       "engines": {
         "node": ">=8"
       }
     },
-    "node_modules/@react-native-community/cli-platform-ios/node_modules/supports-color": {
+    "node_modules/@react-native-community/cli-platform-apple/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==",
+      "license": "MIT",
       "dependencies": {
         "has-flag": "^4.0.0"
       },
@@ -8263,18 +8106,25 @@
         "node": ">=8"
       }
     },
+    "node_modules/@react-native-community/cli-platform-ios": {
+      "version": "14.0.0",
+      "license": "MIT",
+      "dependencies": {
+        "@react-native-community/cli-platform-apple": "14.0.0"
+      }
+    },
     "node_modules/@react-native-community/cli-plugin-metro": {
-      "version": "12.3.2",
-      "resolved": "https://registry.npmjs.org/@react-native-community/cli-plugin-metro/-/cli-plugin-metro-12.3.2.tgz",
-      "integrity": "sha512-FpFBwu+d2E7KRhYPTkKvQsWb2/JKsJv+t1tcqgQkn+oByhp+qGyXBobFB8/R3yYvRRDCSDhS+atWTJzk9TjM8g=="
+      "version": "12.3.6",
+      "license": "MIT",
+      "peer": true
     },
     "node_modules/@react-native-community/cli-server-api": {
-      "version": "12.3.2",
-      "resolved": "https://registry.npmjs.org/@react-native-community/cli-server-api/-/cli-server-api-12.3.2.tgz",
-      "integrity": "sha512-iwa7EO9XFA/OjI5pPLLpI/6mFVqv8L73kNck3CNOJIUCCveGXBKK0VMyOkXaf/BYnihgQrXh+x5cxbDbggr7+Q==",
+      "version": "12.3.6",
+      "license": "MIT",
+      "peer": true,
       "dependencies": {
-        "@react-native-community/cli-debugger-ui": "12.3.2",
-        "@react-native-community/cli-tools": "12.3.2",
+        "@react-native-community/cli-debugger-ui": "12.3.6",
+        "@react-native-community/cli-tools": "12.3.6",
         "compression": "^1.7.1",
         "connect": "^3.6.5",
         "errorhandler": "^1.5.1",
@@ -8286,8 +8136,8 @@
     },
     "node_modules/@react-native-community/cli-server-api/node_modules/@jest/types": {
       "version": "26.6.2",
-      "resolved": "https://registry.npmjs.org/@jest/types/-/types-26.6.2.tgz",
-      "integrity": "sha512-fC6QCp7Sc5sX6g8Tvbmj4XUTbyrik0akgRy03yjXbQaBWWNWGE7SGtJk98m0N8nzegD/7SggrUlivxo5ax4KWQ==",
+      "license": "MIT",
+      "peer": true,
       "dependencies": {
         "@types/istanbul-lib-coverage": "^2.0.0",
         "@types/istanbul-reports": "^3.0.0",
@@ -8301,24 +8151,24 @@
     },
     "node_modules/@react-native-community/cli-server-api/node_modules/@types/yargs": {
       "version": "15.0.19",
-      "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-15.0.19.tgz",
-      "integrity": "sha512-2XUaGVmyQjgyAZldf0D0c14vvo/yv0MhQBSTJcejMMaitsn3nxCB6TmH4G0ZQf+uxROOa9mpanoSm8h6SG/1ZA==",
+      "license": "MIT",
+      "peer": true,
       "dependencies": {
         "@types/yargs-parser": "*"
       }
     },
     "node_modules/@react-native-community/cli-server-api/node_modules/ansi-regex": {
       "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
-      "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==",
+      "license": "MIT",
+      "peer": true,
       "engines": {
         "node": ">=8"
       }
     },
     "node_modules/@react-native-community/cli-server-api/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==",
+      "license": "MIT",
+      "peer": true,
       "dependencies": {
         "color-convert": "^2.0.1"
       },
@@ -8331,8 +8181,8 @@
     },
     "node_modules/@react-native-community/cli-server-api/node_modules/chalk": {
       "version": "4.1.2",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
-      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
+      "license": "MIT",
+      "peer": true,
       "dependencies": {
         "ansi-styles": "^4.1.0",
         "supports-color": "^7.1.0"
@@ -8346,8 +8196,8 @@
     },
     "node_modules/@react-native-community/cli-server-api/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==",
+      "license": "MIT",
+      "peer": true,
       "dependencies": {
         "color-name": "~1.1.4"
       },
@@ -8357,21 +8207,21 @@
     },
     "node_modules/@react-native-community/cli-server-api/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=="
+      "license": "MIT",
+      "peer": true
     },
     "node_modules/@react-native-community/cli-server-api/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==",
+      "license": "MIT",
+      "peer": true,
       "engines": {
         "node": ">=8"
       }
     },
     "node_modules/@react-native-community/cli-server-api/node_modules/pretty-format": {
       "version": "26.6.2",
-      "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-26.6.2.tgz",
-      "integrity": "sha512-7AeGuCYNGmycyQbCqd/3PWH4eOoX/OiCa0uphp57NVTeAGdJGaAliecxwBDHYQCIvrW7aDBZCYeNTP/WX69mkg==",
+      "license": "MIT",
+      "peer": true,
       "dependencies": {
         "@jest/types": "^26.6.2",
         "ansi-regex": "^5.0.0",
@@ -8384,13 +8234,13 @@
     },
     "node_modules/@react-native-community/cli-server-api/node_modules/react-is": {
       "version": "17.0.2",
-      "resolved": "https://registry.npmjs.org/react-is/-/react-is-17.0.2.tgz",
-      "integrity": "sha512-w2GsyukL62IJnlaff/nRegPQR94C/XXamvMWmSHRJ4y7Ts/4ocGRmTHvOs8PSE6pB3dWOrD/nueuU5sduBsQ4w=="
+      "license": "MIT",
+      "peer": true
     },
     "node_modules/@react-native-community/cli-server-api/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==",
+      "license": "MIT",
+      "peer": true,
       "dependencies": {
         "has-flag": "^4.0.0"
       },
@@ -8400,8 +8250,8 @@
     },
     "node_modules/@react-native-community/cli-server-api/node_modules/ws": {
       "version": "7.5.9",
-      "resolved": "https://registry.npmjs.org/ws/-/ws-7.5.9.tgz",
-      "integrity": "sha512-F+P9Jil7UiSKSkppIiD94dN07AwvFixvLIj1Og1Rl9GGMuNipJnV9JzjD6XuqmAeiswGvUmNLjr5cFuXwNS77Q==",
+      "license": "MIT",
+      "peer": true,
       "engines": {
         "node": ">=8.3.0"
       },
@@ -8419,9 +8269,9 @@
       }
     },
     "node_modules/@react-native-community/cli-tools": {
-      "version": "12.3.2",
-      "resolved": "https://registry.npmjs.org/@react-native-community/cli-tools/-/cli-tools-12.3.2.tgz",
-      "integrity": "sha512-nDH7vuEicHI2TI0jac/DjT3fr977iWXRdgVAqPZFFczlbs7A8GQvEdGnZ1G8dqRUmg+kptw0e4hwczAOG89JzQ==",
+      "version": "12.3.6",
+      "license": "MIT",
+      "peer": true,
       "dependencies": {
         "appdirsjs": "^1.2.4",
         "chalk": "^4.1.2",
@@ -8437,8 +8287,8 @@
     },
     "node_modules/@react-native-community/cli-tools/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==",
+      "license": "MIT",
+      "peer": true,
       "dependencies": {
         "color-convert": "^2.0.1"
       },
@@ -8451,8 +8301,8 @@
     },
     "node_modules/@react-native-community/cli-tools/node_modules/chalk": {
       "version": "4.1.2",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
-      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
+      "license": "MIT",
+      "peer": true,
       "dependencies": {
         "ansi-styles": "^4.1.0",
         "supports-color": "^7.1.0"
@@ -8466,8 +8316,8 @@
     },
     "node_modules/@react-native-community/cli-tools/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==",
+      "license": "MIT",
+      "peer": true,
       "dependencies": {
         "color-name": "~1.1.4"
       },
@@ -8477,29 +8327,29 @@
     },
     "node_modules/@react-native-community/cli-tools/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=="
+      "license": "MIT",
+      "peer": true
     },
     "node_modules/@react-native-community/cli-tools/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==",
+      "license": "MIT",
+      "peer": true,
       "engines": {
         "node": ">=8"
       }
     },
     "node_modules/@react-native-community/cli-tools/node_modules/is-wsl": {
       "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/is-wsl/-/is-wsl-1.1.0.tgz",
-      "integrity": "sha512-gfygJYZ2gLTDlmbWMI0CE2MwnFzSN/2SZfkMlItC4K/JBlsWVDB0bO6XhqcY13YXE7iMcAJnzTCJjPiTeJJ0Mw==",
+      "license": "MIT",
+      "peer": true,
       "engines": {
         "node": ">=4"
       }
     },
     "node_modules/@react-native-community/cli-tools/node_modules/open": {
       "version": "6.4.0",
-      "resolved": "https://registry.npmjs.org/open/-/open-6.4.0.tgz",
-      "integrity": "sha512-IFenVPgF70fSm1keSd2iDBIDIBZkroLeuffXq+wKTzTJlBpesFWojV9lb8mzOfaAzM1sr7HQHuO0vtV0zYekGg==",
+      "license": "MIT",
+      "peer": true,
       "dependencies": {
         "is-wsl": "^1.1.0"
       },
@@ -8509,8 +8359,8 @@
     },
     "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",
-      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+      "license": "MIT",
+      "peer": true,
       "dependencies": {
         "has-flag": "^4.0.0"
       },
@@ -8519,13 +8369,78 @@
       }
     },
     "node_modules/@react-native-community/cli-types": {
-      "version": "12.3.2",
-      "resolved": "https://registry.npmjs.org/@react-native-community/cli-types/-/cli-types-12.3.2.tgz",
-      "integrity": "sha512-9D0UEFqLW8JmS16mjHJxUJWX8E+zJddrHILSH8AJHZ0NNHv4u2DXKdb0wFLMobFxGNxPT+VSOjc60fGvXzWHog==",
+      "version": "14.0.0",
+      "license": "MIT",
       "dependencies": {
         "joi": "^17.2.1"
       }
     },
+    "node_modules/@react-native-community/cli/node_modules/@jest/types": {
+      "version": "26.6.2",
+      "license": "MIT",
+      "dependencies": {
+        "@types/istanbul-lib-coverage": "^2.0.0",
+        "@types/istanbul-reports": "^3.0.0",
+        "@types/node": "*",
+        "@types/yargs": "^15.0.0",
+        "chalk": "^4.0.0"
+      },
+      "engines": {
+        "node": ">= 10.14.2"
+      }
+    },
+    "node_modules/@react-native-community/cli/node_modules/@react-native-community/cli-debugger-ui": {
+      "version": "14.0.0",
+      "license": "MIT",
+      "dependencies": {
+        "serve-static": "^1.13.1"
+      }
+    },
+    "node_modules/@react-native-community/cli/node_modules/@react-native-community/cli-server-api": {
+      "version": "14.0.0",
+      "license": "MIT",
+      "dependencies": {
+        "@react-native-community/cli-debugger-ui": "14.0.0",
+        "@react-native-community/cli-tools": "14.0.0",
+        "compression": "^1.7.1",
+        "connect": "^3.6.5",
+        "errorhandler": "^1.5.1",
+        "nocache": "^3.0.1",
+        "pretty-format": "^26.6.2",
+        "serve-static": "^1.13.1",
+        "ws": "^6.2.3"
+      }
+    },
+    "node_modules/@react-native-community/cli/node_modules/@react-native-community/cli-tools": {
+      "version": "14.0.0",
+      "license": "MIT",
+      "dependencies": {
+        "appdirsjs": "^1.2.4",
+        "chalk": "^4.1.2",
+        "execa": "^5.0.0",
+        "find-up": "^5.0.0",
+        "mime": "^2.4.1",
+        "open": "^6.2.0",
+        "ora": "^5.4.1",
+        "semver": "^7.5.2",
+        "shell-quote": "^1.7.3",
+        "sudo-prompt": "^9.0.0"
+      }
+    },
+    "node_modules/@react-native-community/cli/node_modules/@types/yargs": {
+      "version": "15.0.19",
+      "license": "MIT",
+      "dependencies": {
+        "@types/yargs-parser": "*"
+      }
+    },
+    "node_modules/@react-native-community/cli/node_modules/ansi-regex": {
+      "version": "5.0.1",
+      "license": "MIT",
+      "engines": {
+        "node": ">=8"
+      }
+    },
     "node_modules/@react-native-community/cli/node_modules/ansi-styles": {
       "version": "4.3.0",
       "license": "MIT",
@@ -8574,17 +8489,6 @@
         "node": "^12.20.0 || >=14"
       }
     },
-    "node_modules/@react-native-community/cli/node_modules/find-up": {
-      "version": "4.1.0",
-      "license": "MIT",
-      "dependencies": {
-        "locate-path": "^5.0.0",
-        "path-exists": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
     "node_modules/@react-native-community/cli/node_modules/fs-extra": {
       "version": "8.1.0",
       "license": "MIT",
@@ -8604,6 +8508,13 @@
         "node": ">=8"
       }
     },
+    "node_modules/@react-native-community/cli/node_modules/is-wsl": {
+      "version": "1.1.0",
+      "license": "MIT",
+      "engines": {
+        "node": ">=4"
+      }
+    },
     "node_modules/@react-native-community/cli/node_modules/jsonfile": {
       "version": "4.0.0",
       "license": "MIT",
@@ -8611,45 +8522,32 @@
         "graceful-fs": "^4.1.6"
       }
     },
-    "node_modules/@react-native-community/cli/node_modules/locate-path": {
-      "version": "5.0.0",
+    "node_modules/@react-native-community/cli/node_modules/open": {
+      "version": "6.4.0",
       "license": "MIT",
       "dependencies": {
-        "p-locate": "^4.1.0"
+        "is-wsl": "^1.1.0"
       },
       "engines": {
         "node": ">=8"
       }
     },
-    "node_modules/@react-native-community/cli/node_modules/p-limit": {
-      "version": "2.3.0",
-      "license": "MIT",
-      "dependencies": {
-        "p-try": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=6"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/@react-native-community/cli/node_modules/p-locate": {
-      "version": "4.1.0",
+    "node_modules/@react-native-community/cli/node_modules/pretty-format": {
+      "version": "26.6.2",
       "license": "MIT",
       "dependencies": {
-        "p-limit": "^2.2.0"
+        "@jest/types": "^26.6.2",
+        "ansi-regex": "^5.0.0",
+        "ansi-styles": "^4.0.0",
+        "react-is": "^17.0.1"
       },
       "engines": {
-        "node": ">=8"
+        "node": ">= 10"
       }
     },
-    "node_modules/@react-native-community/cli/node_modules/path-exists": {
-      "version": "4.0.0",
-      "license": "MIT",
-      "engines": {
-        "node": ">=8"
-      }
+    "node_modules/@react-native-community/cli/node_modules/react-is": {
+      "version": "17.0.2",
+      "license": "MIT"
     },
     "node_modules/@react-native-community/cli/node_modules/supports-color": {
       "version": "7.2.0",
@@ -8668,53 +8566,63 @@
         "node": ">= 4.0.0"
       }
     },
+    "node_modules/@react-native-community/cli/node_modules/ws": {
+      "version": "6.2.3",
+      "license": "MIT",
+      "dependencies": {
+        "async-limiter": "~1.0.0"
+      }
+    },
     "node_modules/@react-native-community/eslint-config": {
-      "version": "3.0.0",
+      "version": "3.2.0",
       "dev": true,
       "license": "MIT",
       "dependencies": {
+        "@babel/core": "^7.14.0",
+        "@babel/eslint-parser": "^7.18.2",
         "@react-native-community/eslint-plugin": "^1.1.0",
-        "@typescript-eslint/eslint-plugin": "^4.22.1",
-        "@typescript-eslint/parser": "^4.22.1",
-        "babel-eslint": "^10.1.0",
-        "eslint-config-prettier": "^6.10.1",
-        "eslint-plugin-eslint-comments": "^3.1.2",
-        "eslint-plugin-flowtype": "2.50.3",
-        "eslint-plugin-jest": "22.4.1",
-        "eslint-plugin-prettier": "3.1.2",
-        "eslint-plugin-react": "^7.20.0",
-        "eslint-plugin-react-hooks": "^4.0.7",
-        "eslint-plugin-react-native": "^3.10.0",
-        "prettier": "^2.0.2"
+        "@typescript-eslint/eslint-plugin": "^5.30.5",
+        "@typescript-eslint/parser": "^5.30.5",
+        "eslint-config-prettier": "^8.5.0",
+        "eslint-plugin-eslint-comments": "^3.2.0",
+        "eslint-plugin-ft-flow": "^2.0.1",
+        "eslint-plugin-jest": "^26.5.3",
+        "eslint-plugin-prettier": "^4.2.1",
+        "eslint-plugin-react": "^7.30.1",
+        "eslint-plugin-react-hooks": "^4.6.0",
+        "eslint-plugin-react-native": "^4.0.0"
       },
       "peerDependencies": {
-        "eslint": ">=7"
+        "eslint": ">=8",
+        "prettier": ">=2"
       }
     },
     "node_modules/@react-native-community/eslint-config/node_modules/@typescript-eslint/eslint-plugin": {
-      "version": "4.33.0",
+      "version": "5.62.0",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@typescript-eslint/experimental-utils": "4.33.0",
-        "@typescript-eslint/scope-manager": "4.33.0",
-        "debug": "^4.3.1",
-        "functional-red-black-tree": "^1.0.1",
-        "ignore": "^5.1.8",
-        "regexpp": "^3.1.0",
-        "semver": "^7.3.5",
+        "@eslint-community/regexpp": "^4.4.0",
+        "@typescript-eslint/scope-manager": "5.62.0",
+        "@typescript-eslint/type-utils": "5.62.0",
+        "@typescript-eslint/utils": "5.62.0",
+        "debug": "^4.3.4",
+        "graphemer": "^1.4.0",
+        "ignore": "^5.2.0",
+        "natural-compare-lite": "^1.4.0",
+        "semver": "^7.3.7",
         "tsutils": "^3.21.0"
       },
       "engines": {
-        "node": "^10.12.0 || >=12.0.0"
+        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
       },
       "funding": {
         "type": "opencollective",
         "url": "https://opencollective.com/typescript-eslint"
       },
       "peerDependencies": {
-        "@typescript-eslint/parser": "^4.0.0",
-        "eslint": "^5.0.0 || ^6.0.0 || ^7.0.0"
+        "@typescript-eslint/parser": "^5.0.0",
+        "eslint": "^6.0.0 || ^7.0.0 || ^8.0.0"
       },
       "peerDependenciesMeta": {
         "typescript": {
@@ -8723,24 +8631,24 @@
       }
     },
     "node_modules/@react-native-community/eslint-config/node_modules/@typescript-eslint/parser": {
-      "version": "4.33.0",
+      "version": "5.62.0",
       "dev": true,
       "license": "BSD-2-Clause",
       "dependencies": {
-        "@typescript-eslint/scope-manager": "4.33.0",
-        "@typescript-eslint/types": "4.33.0",
-        "@typescript-eslint/typescript-estree": "4.33.0",
-        "debug": "^4.3.1"
+        "@typescript-eslint/scope-manager": "5.62.0",
+        "@typescript-eslint/types": "5.62.0",
+        "@typescript-eslint/typescript-estree": "5.62.0",
+        "debug": "^4.3.4"
       },
       "engines": {
-        "node": "^10.12.0 || >=12.0.0"
+        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
       },
       "funding": {
         "type": "opencollective",
         "url": "https://opencollective.com/typescript-eslint"
       },
       "peerDependencies": {
-        "eslint": "^5.0.0 || ^6.0.0 || ^7.0.0"
+        "eslint": "^6.0.0 || ^7.0.0 || ^8.0.0"
       },
       "peerDependenciesMeta": {
         "typescript": {
@@ -8748,71 +8656,186 @@
         }
       }
     },
-    "node_modules/@react-native-community/eslint-config/node_modules/eslint-config-prettier": {
-      "version": "6.15.0",
+    "node_modules/@react-native-community/eslint-config/node_modules/@typescript-eslint/scope-manager": {
+      "version": "5.62.0",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "get-stdin": "^6.0.0"
+        "@typescript-eslint/types": "5.62.0",
+        "@typescript-eslint/visitor-keys": "5.62.0"
       },
-      "bin": {
-        "eslint-config-prettier-check": "bin/cli.js"
+      "engines": {
+        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
       },
-      "peerDependencies": {
-        "eslint": ">=3.14.1"
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
       }
     },
-    "node_modules/@react-native-community/eslint-config/node_modules/eslint-plugin-jest": {
-      "version": "22.4.1",
+    "node_modules/@react-native-community/eslint-config/node_modules/@typescript-eslint/type-utils": {
+      "version": "5.62.0",
       "dev": true,
       "license": "MIT",
+      "dependencies": {
+        "@typescript-eslint/typescript-estree": "5.62.0",
+        "@typescript-eslint/utils": "5.62.0",
+        "debug": "^4.3.4",
+        "tsutils": "^3.21.0"
+      },
       "engines": {
-        "node": ">=6"
+        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
       },
       "peerDependencies": {
-        "eslint": ">=5"
+        "eslint": "*"
+      },
+      "peerDependenciesMeta": {
+        "typescript": {
+          "optional": true
+        }
       }
     },
-    "node_modules/@react-native-community/eslint-plugin": {
-      "version": "1.2.0",
+    "node_modules/@react-native-community/eslint-config/node_modules/@typescript-eslint/types": {
+      "version": "5.62.0",
       "dev": true,
-      "license": "MIT"
-    },
-    "node_modules/@react-native-community/geolocation": {
-      "version": "3.2.1",
-      "resolved": "https://registry.npmjs.org/@react-native-community/geolocation/-/geolocation-3.2.1.tgz",
-      "integrity": "sha512-/+HNzuRl4UCMma7KK+KYL8k2nxAGuW+DGxqmqfpiqKBlCkCUbuFHaZZdqVD6jpsn9r/ghe583ECLmd9SV9I4Bw==",
+      "license": "MIT",
       "engines": {
-        "node": ">=18.0.0"
+        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
       },
-      "peerDependencies": {
-        "react": "*",
-        "react-native": "*"
-      }
-    },
-    "node_modules/@react-native-community/netinfo": {
-      "version": "11.2.1",
-      "license": "MIT",
-      "peerDependencies": {
-        "react-native": ">=0.59"
-      }
-    },
-    "node_modules/@react-native-firebase/analytics": {
-      "version": "12.9.3",
-      "license": "Apache-2.0",
-      "peerDependencies": {
-        "@react-native-firebase/app": "12.9.3"
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
       }
     },
-    "node_modules/@react-native-firebase/app": {
-      "version": "12.9.3",
-      "license": "Apache-2.0",
+    "node_modules/@react-native-community/eslint-config/node_modules/@typescript-eslint/typescript-estree": {
+      "version": "5.62.0",
+      "dev": true,
+      "license": "BSD-2-Clause",
       "dependencies": {
-        "@expo/config-plugins": "^4.0.3",
-        "opencollective-postinstall": "^2.0.1",
-        "superstruct": "^0.6.2"
-      },
-      "peerDependencies": {
+        "@typescript-eslint/types": "5.62.0",
+        "@typescript-eslint/visitor-keys": "5.62.0",
+        "debug": "^4.3.4",
+        "globby": "^11.1.0",
+        "is-glob": "^4.0.3",
+        "semver": "^7.3.7",
+        "tsutils": "^3.21.0"
+      },
+      "engines": {
+        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
+      },
+      "peerDependenciesMeta": {
+        "typescript": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@react-native-community/eslint-config/node_modules/@typescript-eslint/visitor-keys": {
+      "version": "5.62.0",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@typescript-eslint/types": "5.62.0",
+        "eslint-visitor-keys": "^3.3.0"
+      },
+      "engines": {
+        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
+      }
+    },
+    "node_modules/@react-native-community/eslint-config/node_modules/eslint-config-prettier": {
+      "version": "8.10.0",
+      "dev": true,
+      "license": "MIT",
+      "bin": {
+        "eslint-config-prettier": "bin/cli.js"
+      },
+      "peerDependencies": {
+        "eslint": ">=7.0.0"
+      }
+    },
+    "node_modules/@react-native-community/eslint-config/node_modules/eslint-plugin-jest": {
+      "version": "26.9.0",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@typescript-eslint/utils": "^5.10.0"
+      },
+      "engines": {
+        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+      },
+      "peerDependencies": {
+        "@typescript-eslint/eslint-plugin": "^5.0.0",
+        "eslint": "^6.0.0 || ^7.0.0 || ^8.0.0"
+      },
+      "peerDependenciesMeta": {
+        "@typescript-eslint/eslint-plugin": {
+          "optional": true
+        },
+        "jest": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@react-native-community/eslint-config/node_modules/eslint-visitor-keys": {
+      "version": "3.4.3",
+      "dev": true,
+      "license": "Apache-2.0",
+      "engines": {
+        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+      },
+      "funding": {
+        "url": "https://opencollective.com/eslint"
+      }
+    },
+    "node_modules/@react-native-community/eslint-plugin": {
+      "version": "1.2.0",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/@react-native-community/geolocation": {
+      "version": "3.3.0",
+      "license": "MIT",
+      "engines": {
+        "node": ">=18.0.0"
+      },
+      "peerDependencies": {
+        "react": "*",
+        "react-native": "*"
+      }
+    },
+    "node_modules/@react-native-community/netinfo": {
+      "version": "11.2.1",
+      "license": "MIT",
+      "peerDependencies": {
+        "react-native": ">=0.59"
+      }
+    },
+    "node_modules/@react-native-firebase/analytics": {
+      "version": "12.9.3",
+      "license": "Apache-2.0",
+      "peerDependencies": {
+        "@react-native-firebase/app": "12.9.3"
+      }
+    },
+    "node_modules/@react-native-firebase/app": {
+      "version": "12.9.3",
+      "license": "Apache-2.0",
+      "dependencies": {
+        "@expo/config-plugins": "^4.0.3",
+        "opencollective-postinstall": "^2.0.1",
+        "superstruct": "^0.6.2"
+      },
+      "peerDependencies": {
         "react": "*",
         "react-native": "*"
       }
@@ -8852,151 +8875,67 @@
         }
       }
     },
-    "node_modules/@react-native-picker/picker": {
-      "version": "2.6.1",
-      "resolved": "https://registry.npmjs.org/@react-native-picker/picker/-/picker-2.6.1.tgz",
-      "integrity": "sha512-oJftvmLOj6Y6/bF4kPcK6L83yNBALGmqNYugf94BzP0FQGpHBwimVN2ygqkQ2Sn2ZU3pGUZMs0jV6+Gku2GyYg==",
-      "peerDependencies": {
-        "react": ">=16",
-        "react-native": ">=0.57"
-      }
-    },
-    "node_modules/@react-native/assets-registry": {
-      "version": "0.73.1",
+    "node_modules/@react-native-mac/virtualized-lists": {
+      "version": "0.73.3",
       "license": "MIT",
-      "engines": {
-        "node": ">=18"
-      }
-    },
-    "node_modules/@react-native/babel-plugin-codegen": {
-      "version": "0.73.4",
-      "resolved": "https://registry.npmjs.org/@react-native/babel-plugin-codegen/-/babel-plugin-codegen-0.73.4.tgz",
-      "integrity": "sha512-XzRd8MJGo4Zc5KsphDHBYJzS1ryOHg8I2gOZDAUCGcwLFhdyGu1zBNDJYH2GFyDrInn9TzAbRIf3d4O+eltXQQ==",
-      "dependencies": {
-        "@react-native/codegen": "0.73.3"
-      },
-      "engines": {
-        "node": ">=18"
-      }
-    },
-    "node_modules/@react-native/babel-preset": {
-      "version": "0.73.21",
-      "resolved": "https://registry.npmjs.org/@react-native/babel-preset/-/babel-preset-0.73.21.tgz",
-      "integrity": "sha512-WlFttNnySKQMeujN09fRmrdWqh46QyJluM5jdtDNrkl/2Hx6N4XeDUGhABvConeK95OidVO7sFFf7sNebVXogA==",
+      "peer": true,
       "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-private-methods": "^7.22.5",
-        "@babel/plugin-transform-private-property-in-object": "^7.22.11",
-        "@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",
-        "@react-native/babel-plugin-codegen": "0.73.4",
-        "babel-plugin-transform-flow-enums": "^0.0.2",
-        "react-refresh": "^0.14.0"
+        "invariant": "^2.2.4",
+        "nullthrows": "^1.1.1"
       },
       "engines": {
         "node": ">=18"
       },
       "peerDependencies": {
-        "@babel/core": "*"
+        "react-native": "*"
       }
     },
-    "node_modules/@react-native/babel-preset/node_modules/react-refresh": {
-      "version": "0.14.0",
+    "node_modules/@react-native-picker/picker": {
+      "version": "2.7.6",
       "license": "MIT",
-      "engines": {
-        "node": ">=0.10.0"
+      "peerDependencies": {
+        "react": "*",
+        "react-native": "*"
       }
     },
-    "node_modules/@react-native/codegen": {
-      "version": "0.73.3",
-      "resolved": "https://registry.npmjs.org/@react-native/codegen/-/codegen-0.73.3.tgz",
-      "integrity": "sha512-sxslCAAb8kM06vGy9Jyh4TtvjhcP36k/rvj2QE2Jdhdm61KvfafCATSIsOfc0QvnduWFcpXUPvAVyYwuv7PYDg==",
+    "node_modules/@react-native-windows/cli": {
+      "version": "0.73.2",
+      "license": "MIT",
+      "peer": true,
       "dependencies": {
-        "@babel/parser": "^7.20.0",
-        "flow-parser": "^0.206.0",
+        "@react-native-windows/codegen": "0.73.0",
+        "@react-native-windows/fs": "0.73.0",
+        "@react-native-windows/package-utils": "0.73.0",
+        "@react-native-windows/telemetry": "0.73.1",
+        "@xmldom/xmldom": "^0.7.7",
+        "chalk": "^4.1.0",
+        "cli-spinners": "^2.2.0",
+        "envinfo": "^7.5.0",
+        "find-up": "^4.1.0",
         "glob": "^7.1.1",
-        "invariant": "^2.2.4",
-        "jscodeshift": "^0.14.0",
-        "mkdirp": "^0.5.1",
-        "nullthrows": "^1.1.1"
+        "lodash": "^4.17.15",
+        "mustache": "^4.0.1",
+        "ora": "^3.4.0",
+        "prompts": "^2.4.1",
+        "semver": "^7.3.2",
+        "shelljs": "^0.8.4",
+        "username": "^5.1.0",
+        "uuid": "^3.3.2",
+        "xml-formatter": "^2.4.0",
+        "xml-parser": "^1.2.1",
+        "xpath": "^0.0.27"
       },
       "engines": {
-        "node": ">=18"
+        "node": ">= 18"
       },
       "peerDependencies": {
-        "@babel/preset-env": "^7.1.6"
-      }
-    },
-    "node_modules/@react-native/codegen/node_modules/mkdirp": {
-      "version": "0.5.6",
-      "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.6.tgz",
-      "integrity": "sha512-FP+p8RB8OWpF3YZBCrP5gtADmtXApB5AMLn+vdyA+PyxCjrCs00mjyUozssO33cwDeT3wNGdLxJ5M//YqtHAJw==",
-      "dependencies": {
-        "minimist": "^1.2.6"
-      },
-      "bin": {
-        "mkdirp": "bin/cmd.js"
-      }
-    },
-    "node_modules/@react-native/community-cli-plugin": {
-      "version": "0.73.16",
-      "resolved": "https://registry.npmjs.org/@react-native/community-cli-plugin/-/community-cli-plugin-0.73.16.tgz",
-      "integrity": "sha512-eNH3v3qJJF6f0n/Dck90qfC9gVOR4coAXMTdYECO33GfgjTi+73vf/SBqlXw9HICH/RNZYGPM3wca4FRF7TYeQ==",
-      "dependencies": {
-        "@react-native-community/cli-server-api": "12.3.2",
-        "@react-native-community/cli-tools": "12.3.2",
-        "@react-native/dev-middleware": "0.73.7",
-        "@react-native/metro-babel-transformer": "0.73.15",
-        "chalk": "^4.0.0",
-        "execa": "^5.1.1",
-        "metro": "^0.80.3",
-        "metro-config": "^0.80.3",
-        "metro-core": "^0.80.3",
-        "node-fetch": "^2.2.0",
-        "readline": "^1.3.0"
-      },
-      "engines": {
-        "node": ">=18"
+        "react-native": "*"
       }
     },
-    "node_modules/@react-native/community-cli-plugin/node_modules/ansi-styles": {
+    "node_modules/@react-native-windows/cli/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==",
+      "license": "MIT",
+      "peer": true,
       "dependencies": {
         "color-convert": "^2.0.1"
       },
@@ -9007,10 +8946,10 @@
         "url": "https://github.com/chalk/ansi-styles?sponsor=1"
       }
     },
-    "node_modules/@react-native/community-cli-plugin/node_modules/chalk": {
+    "node_modules/@react-native-windows/cli/node_modules/chalk": {
       "version": "4.1.2",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
-      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
+      "license": "MIT",
+      "peer": true,
       "dependencies": {
         "ansi-styles": "^4.1.0",
         "supports-color": "^7.1.0"
@@ -9022,10 +8961,21 @@
         "url": "https://github.com/chalk/chalk?sponsor=1"
       }
     },
-    "node_modules/@react-native/community-cli-plugin/node_modules/color-convert": {
+    "node_modules/@react-native-windows/cli/node_modules/cli-cursor": {
+      "version": "2.1.0",
+      "license": "MIT",
+      "peer": true,
+      "dependencies": {
+        "restore-cursor": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/@react-native-windows/cli/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==",
+      "license": "MIT",
+      "peer": true,
       "dependencies": {
         "color-name": "~1.1.4"
       },
@@ -9033,1120 +8983,859 @@
         "node": ">=7.0.0"
       }
     },
-    "node_modules/@react-native/community-cli-plugin/node_modules/color-name": {
+    "node_modules/@react-native-windows/cli/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=="
+      "license": "MIT",
+      "peer": true
     },
-    "node_modules/@react-native/community-cli-plugin/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==",
+    "node_modules/@react-native-windows/cli/node_modules/escape-string-regexp": {
+      "version": "1.0.5",
+      "license": "MIT",
+      "peer": true,
       "engines": {
-        "node": ">=8"
+        "node": ">=0.8.0"
       }
     },
-    "node_modules/@react-native/community-cli-plugin/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==",
+    "node_modules/@react-native-windows/cli/node_modules/find-up": {
+      "version": "4.1.0",
+      "license": "MIT",
+      "peer": true,
       "dependencies": {
-        "has-flag": "^4.0.0"
+        "locate-path": "^5.0.0",
+        "path-exists": "^4.0.0"
       },
       "engines": {
         "node": ">=8"
       }
     },
-    "node_modules/@react-native/debugger-frontend": {
-      "version": "0.73.3",
-      "license": "BSD-3-Clause",
+    "node_modules/@react-native-windows/cli/node_modules/has-flag": {
+      "version": "4.0.0",
+      "license": "MIT",
+      "peer": true,
       "engines": {
-        "node": ">=18"
+        "node": ">=8"
       }
     },
-    "node_modules/@react-native/dev-middleware": {
-      "version": "0.73.7",
+    "node_modules/@react-native-windows/cli/node_modules/locate-path": {
+      "version": "5.0.0",
       "license": "MIT",
+      "peer": true,
       "dependencies": {
-        "@isaacs/ttlcache": "^1.4.1",
-        "@react-native/debugger-frontend": "0.73.3",
-        "chrome-launcher": "^0.15.2",
-        "chromium-edge-launcher": "^1.0.0",
-        "connect": "^3.6.5",
-        "debug": "^2.2.0",
-        "node-fetch": "^2.2.0",
-        "open": "^7.0.3",
-        "serve-static": "^1.13.1",
-        "temp-dir": "^2.0.0"
+        "p-locate": "^4.1.0"
       },
       "engines": {
-        "node": ">=18"
+        "node": ">=8"
       }
     },
-    "node_modules/@react-native/dev-middleware/node_modules/debug": {
-      "version": "2.6.9",
+    "node_modules/@react-native-windows/cli/node_modules/log-symbols": {
+      "version": "2.2.0",
       "license": "MIT",
+      "peer": true,
       "dependencies": {
-        "ms": "2.0.0"
+        "chalk": "^2.0.1"
+      },
+      "engines": {
+        "node": ">=4"
       }
     },
-    "node_modules/@react-native/dev-middleware/node_modules/ms": {
-      "version": "2.0.0",
-      "license": "MIT"
-    },
-    "node_modules/@react-native/dev-middleware/node_modules/open": {
-      "version": "7.4.2",
+    "node_modules/@react-native-windows/cli/node_modules/log-symbols/node_modules/ansi-styles": {
+      "version": "3.2.1",
       "license": "MIT",
+      "peer": true,
       "dependencies": {
-        "is-docker": "^2.0.0",
-        "is-wsl": "^2.1.1"
+        "color-convert": "^1.9.0"
       },
       "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
+        "node": ">=4"
       }
     },
-    "node_modules/@react-native/gradle-plugin": {
-      "version": "0.73.4",
+    "node_modules/@react-native-windows/cli/node_modules/log-symbols/node_modules/chalk": {
+      "version": "2.4.2",
       "license": "MIT",
+      "peer": true,
+      "dependencies": {
+        "ansi-styles": "^3.2.1",
+        "escape-string-regexp": "^1.0.5",
+        "supports-color": "^5.3.0"
+      },
       "engines": {
-        "node": ">=18"
+        "node": ">=4"
       }
     },
-    "node_modules/@react-native/js-polyfills": {
-      "version": "0.73.1",
+    "node_modules/@react-native-windows/cli/node_modules/log-symbols/node_modules/color-convert": {
+      "version": "1.9.3",
+      "license": "MIT",
+      "peer": true,
+      "dependencies": {
+        "color-name": "1.1.3"
+      }
+    },
+    "node_modules/@react-native-windows/cli/node_modules/log-symbols/node_modules/color-name": {
+      "version": "1.1.3",
+      "license": "MIT",
+      "peer": true
+    },
+    "node_modules/@react-native-windows/cli/node_modules/log-symbols/node_modules/has-flag": {
+      "version": "3.0.0",
       "license": "MIT",
+      "peer": true,
       "engines": {
-        "node": ">=18"
+        "node": ">=4"
       }
     },
-    "node_modules/@react-native/metro-babel-transformer": {
-      "version": "0.73.15",
-      "resolved": "https://registry.npmjs.org/@react-native/metro-babel-transformer/-/metro-babel-transformer-0.73.15.tgz",
-      "integrity": "sha512-LlkSGaXCz+xdxc9819plmpsl4P4gZndoFtpjN3GMBIu6f7TBV0GVbyJAU4GE8fuAWPVSVL5ArOcdkWKSbI1klw==",
+    "node_modules/@react-native-windows/cli/node_modules/log-symbols/node_modules/supports-color": {
+      "version": "5.5.0",
+      "license": "MIT",
+      "peer": true,
       "dependencies": {
-        "@babel/core": "^7.20.0",
-        "@react-native/babel-preset": "0.73.21",
-        "hermes-parser": "0.15.0",
-        "nullthrows": "^1.1.1"
+        "has-flag": "^3.0.0"
       },
       "engines": {
-        "node": ">=18"
-      },
-      "peerDependencies": {
-        "@babel/core": "*"
+        "node": ">=4"
       }
     },
-    "node_modules/@react-native/metro-config": {
-      "version": "0.73.5",
-      "resolved": "https://registry.npmjs.org/@react-native/metro-config/-/metro-config-0.73.5.tgz",
-      "integrity": "sha512-3bNWoHzOzP/+qoLJtRhOVXrnxKmSY3i4y5PXyMQlIvvOI/GQbXulPpEZxK/yUrf1MmeXHLLFufFbQWlfDEDoxA==",
-      "dev": true,
+    "node_modules/@react-native-windows/cli/node_modules/mimic-fn": {
+      "version": "1.2.0",
+      "license": "MIT",
+      "peer": true,
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/@react-native-windows/cli/node_modules/onetime": {
+      "version": "2.0.1",
+      "license": "MIT",
+      "peer": true,
       "dependencies": {
-        "@react-native/js-polyfills": "0.73.1",
-        "@react-native/metro-babel-transformer": "0.73.15",
-        "metro-config": "^0.80.3",
-        "metro-runtime": "^0.80.3"
+        "mimic-fn": "^1.0.0"
       },
       "engines": {
-        "node": ">=18"
+        "node": ">=4"
       }
     },
-    "node_modules/@react-native/normalize-color": {
-      "version": "2.1.0",
-      "license": "MIT"
-    },
-    "node_modules/@react-native/normalize-colors": {
-      "version": "0.73.2",
-      "license": "MIT"
-    },
-    "node_modules/@react-native/virtualized-lists": {
-      "version": "0.73.4",
+    "node_modules/@react-native-windows/cli/node_modules/ora": {
+      "version": "3.4.0",
       "license": "MIT",
+      "peer": true,
       "dependencies": {
-        "invariant": "^2.2.4",
-        "nullthrows": "^1.1.1"
+        "chalk": "^2.4.2",
+        "cli-cursor": "^2.1.0",
+        "cli-spinners": "^2.0.0",
+        "log-symbols": "^2.2.0",
+        "strip-ansi": "^5.2.0",
+        "wcwidth": "^1.0.1"
       },
       "engines": {
-        "node": ">=18"
-      },
-      "peerDependencies": {
-        "react-native": "*"
+        "node": ">=6"
       }
     },
-    "node_modules/@react-navigation/core": {
-      "version": "6.4.11",
+    "node_modules/@react-native-windows/cli/node_modules/ora/node_modules/ansi-styles": {
+      "version": "3.2.1",
       "license": "MIT",
+      "peer": true,
       "dependencies": {
-        "@react-navigation/routers": "^6.1.9",
-        "escape-string-regexp": "^4.0.0",
-        "nanoid": "^3.1.23",
-        "query-string": "^7.1.3",
-        "react-is": "^16.13.0",
-        "use-latest-callback": "^0.1.7"
+        "color-convert": "^1.9.0"
       },
-      "peerDependencies": {
-        "react": "*"
+      "engines": {
+        "node": ">=4"
       }
     },
-    "node_modules/@react-navigation/devtools": {
-      "version": "6.0.10",
-      "dev": true,
+    "node_modules/@react-native-windows/cli/node_modules/ora/node_modules/chalk": {
+      "version": "2.4.2",
       "license": "MIT",
+      "peer": true,
       "dependencies": {
-        "deep-equal": "^2.0.5",
-        "nanoid": "^3.1.23",
-        "stacktrace-parser": "^0.1.10"
+        "ansi-styles": "^3.2.1",
+        "escape-string-regexp": "^1.0.5",
+        "supports-color": "^5.3.0"
       },
-      "peerDependencies": {
-        "react": "*"
+      "engines": {
+        "node": ">=4"
       }
     },
-    "node_modules/@react-navigation/elements": {
-      "version": "1.3.30",
-      "resolved": "https://registry.npmjs.org/@react-navigation/elements/-/elements-1.3.30.tgz",
-      "integrity": "sha512-plhc8UvCZs0UkV+sI+3bisIyn78wz9O/BiWZXpounu72k/R/Sj5PuZYFJ1fi6psvriUveMCGh4LeZckAZu2qiQ==",
-      "peerDependencies": {
-        "@react-navigation/native": "^6.0.0",
-        "react": "*",
-        "react-native": "*",
-        "react-native-safe-area-context": ">= 3.0.0"
+    "node_modules/@react-native-windows/cli/node_modules/ora/node_modules/color-convert": {
+      "version": "1.9.3",
+      "license": "MIT",
+      "peer": true,
+      "dependencies": {
+        "color-name": "1.1.3"
       }
     },
-    "node_modules/@react-navigation/material-top-tabs": {
-      "version": "6.6.3",
+    "node_modules/@react-native-windows/cli/node_modules/ora/node_modules/color-name": {
+      "version": "1.1.3",
       "license": "MIT",
-      "dependencies": {
-        "color": "^4.2.3",
-        "warn-once": "^0.1.0"
-      },
-      "peerDependencies": {
-        "@react-navigation/native": "^6.0.0",
-        "react": "*",
-        "react-native": "*",
-        "react-native-pager-view": ">= 4.0.0",
-        "react-native-tab-view": ">= 3.0.0"
+      "peer": true
+    },
+    "node_modules/@react-native-windows/cli/node_modules/ora/node_modules/has-flag": {
+      "version": "3.0.0",
+      "license": "MIT",
+      "peer": true,
+      "engines": {
+        "node": ">=4"
       }
     },
-    "node_modules/@react-navigation/native": {
-      "version": "6.1.12",
+    "node_modules/@react-native-windows/cli/node_modules/ora/node_modules/supports-color": {
+      "version": "5.5.0",
       "license": "MIT",
+      "peer": true,
       "dependencies": {
-        "@react-navigation/core": "^6.4.11",
-        "escape-string-regexp": "^4.0.0",
-        "fast-deep-equal": "^3.1.3",
-        "nanoid": "^3.1.23"
+        "has-flag": "^3.0.0"
       },
-      "peerDependencies": {
-        "react": "*",
-        "react-native": "*"
+      "engines": {
+        "node": ">=4"
       }
     },
-    "node_modules/@react-navigation/routers": {
-      "version": "6.1.9",
+    "node_modules/@react-native-windows/cli/node_modules/p-limit": {
+      "version": "2.3.0",
       "license": "MIT",
+      "peer": true,
       "dependencies": {
-        "nanoid": "^3.1.23"
+        "p-try": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=6"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/@react-navigation/stack": {
-      "version": "6.3.29",
-      "resolved": "https://registry.npmjs.org/@react-navigation/stack/-/stack-6.3.29.tgz",
-      "integrity": "sha512-tzlGkoRgB6P7vgw7rHuWo3TL7Gzu6xh5LMf+zSdCuEiKp/qASzxYfnTEr9tOLbVs/gf+qeukEDheCSAJKVpBXw==",
+    "node_modules/@react-native-windows/cli/node_modules/p-locate": {
+      "version": "4.1.0",
+      "license": "MIT",
+      "peer": true,
       "dependencies": {
-        "@react-navigation/elements": "^1.3.30",
-        "color": "^4.2.3",
-        "warn-once": "^0.1.0"
+        "p-limit": "^2.2.0"
       },
-      "peerDependencies": {
-        "@react-navigation/native": "^6.0.0",
-        "react": "*",
-        "react-native": "*",
-        "react-native-gesture-handler": ">= 1.0.0",
-        "react-native-safe-area-context": ">= 3.0.0",
-        "react-native-screens": ">= 3.0.0"
+      "engines": {
+        "node": ">=8"
       }
     },
-    "node_modules/@react-ng/bounds-observer": {
-      "version": "0.2.1",
-      "license": "Apache-2.0",
-      "dependencies": {
-        "@html-ng/bounding-client-rect-observer": "^0.1.3",
-        "@types/react": "^18.0.31",
-        "@types/react-dom": "^18.0.11",
-        "react": "^18.2.0",
-        "react-dom": "^18.2.0"
+    "node_modules/@react-native-windows/cli/node_modules/path-exists": {
+      "version": "4.0.0",
+      "license": "MIT",
+      "peer": true,
+      "engines": {
+        "node": ">=8"
       }
     },
-    "node_modules/@react-ng/bounds-observer/node_modules/react-dom": {
-      "version": "18.2.0",
+    "node_modules/@react-native-windows/cli/node_modules/restore-cursor": {
+      "version": "2.0.0",
       "license": "MIT",
+      "peer": true,
       "dependencies": {
-        "loose-envify": "^1.1.0",
-        "scheduler": "^0.23.0"
+        "onetime": "^2.0.0",
+        "signal-exit": "^3.0.2"
       },
-      "peerDependencies": {
-        "react": "^18.2.0"
+      "engines": {
+        "node": ">=4"
       }
     },
-    "node_modules/@react-ng/bounds-observer/node_modules/scheduler": {
-      "version": "0.23.0",
+    "node_modules/@react-native-windows/cli/node_modules/strip-ansi": {
+      "version": "5.2.0",
       "license": "MIT",
+      "peer": true,
       "dependencies": {
-        "loose-envify": "^1.1.0"
+        "ansi-regex": "^4.1.0"
+      },
+      "engines": {
+        "node": ">=6"
       }
     },
-    "node_modules/@rnmapbox/maps": {
-      "version": "10.1.12",
-      "resolved": "https://registry.npmjs.org/@rnmapbox/maps/-/maps-10.1.12.tgz",
-      "integrity": "sha512-2SjSlFZYWNr/6B/yEpIHF6rrmRf7xC08gNsoMzJCDb8bgYuMa7pNCcftA2Ko6NQnGijdbbbTJIZcG2jXePxGpw==",
+    "node_modules/@react-native-windows/cli/node_modules/supports-color": {
+      "version": "7.2.0",
+      "license": "MIT",
+      "peer": true,
       "dependencies": {
-        "@turf/along": "6.5.0",
-        "@turf/distance": "6.5.0",
-        "@turf/helpers": "6.5.0",
-        "@turf/length": "6.5.0",
-        "@turf/nearest-point-on-line": "6.5.0",
-        "@types/geojson": "^7946.0.7",
-        "debounce": "^1.2.0"
-      },
-      "peerDependencies": {
-        "expo": ">=47.0.0",
-        "mapbox-gl": "^2.9.0",
-        "react": ">=16.6.1",
-        "react-native": ">=0.59.9"
+        "has-flag": "^4.0.0"
       },
-      "peerDependenciesMeta": {
-        "expo": {
-          "optional": true
-        },
-        "mapbox-gl": {
-          "optional": true
-        }
+      "engines": {
+        "node": ">=8"
       }
     },
-    "node_modules/@segment/loosely-validate-event": {
-      "version": "2.0.0",
-      "dependencies": {
-        "component-type": "^1.2.1",
-        "join-component": "^1.1.0"
+    "node_modules/@react-native-windows/cli/node_modules/uuid": {
+      "version": "3.4.0",
+      "license": "MIT",
+      "peer": true,
+      "bin": {
+        "uuid": "bin/uuid"
       }
     },
-    "node_modules/@shopify/flash-list": {
-      "version": "1.6.3",
+    "node_modules/@react-native-windows/codegen": {
+      "version": "0.73.0",
       "license": "MIT",
+      "peer": true,
       "dependencies": {
-        "recyclerlistview": "4.2.0",
-        "tslib": "2.4.0"
+        "@react-native-windows/fs": "0.73.0",
+        "chalk": "^4.1.0",
+        "globby": "^11.0.4",
+        "mustache": "^4.0.1",
+        "source-map-support": "^0.5.19",
+        "yargs": "^16.2.0"
+      },
+      "bin": {
+        "react-native-windows-codegen": "bin.js"
+      },
+      "engines": {
+        "node": ">= 18"
       },
       "peerDependencies": {
-        "@babel/runtime": "*",
-        "react": "*",
         "react-native": "*"
       }
     },
-    "node_modules/@shopify/flash-list/node_modules/recyclerlistview": {
-      "version": "4.2.0",
-      "license": "Apache-2.0",
+    "node_modules/@react-native-windows/codegen/node_modules/ansi-styles": {
+      "version": "4.3.0",
+      "license": "MIT",
+      "peer": true,
       "dependencies": {
-        "lodash.debounce": "4.0.8",
-        "prop-types": "15.8.1",
-        "ts-object-utils": "0.0.5"
+        "color-convert": "^2.0.1"
       },
-      "peerDependencies": {
-        "react": ">= 15.2.1",
-        "react-native": ">= 0.30.0"
-      }
-    },
-    "node_modules/@sideway/address": {
-      "version": "4.1.5",
-      "resolved": "https://registry.npmjs.org/@sideway/address/-/address-4.1.5.tgz",
-      "integrity": "sha512-IqO/DUQHUkPeixNQ8n0JA6102hT9CmaljNTPmQ1u8MEhBo/R4Q8eKLN/vGZxuebwOroDB4cbpjheD4+/sKFK4Q==",
-      "dependencies": {
-        "@hapi/hoek": "^9.0.0"
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
       }
     },
-    "node_modules/@sideway/formula": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/@sideway/formula/-/formula-3.0.1.tgz",
-      "integrity": "sha512-/poHZJJVjx3L+zVD6g9KgHfYnb443oi7wLu/XKojDviHy6HOEOA6z1Trk5aR1dGcmPenJEgb2sK2I80LeS3MIg=="
-    },
-    "node_modules/@sideway/pinpoint": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/@sideway/pinpoint/-/pinpoint-2.0.0.tgz",
-      "integrity": "sha512-RNiOoTPkptFtSVzQevY/yWtZwf/RxyVnPy/OcA9HBM3MlGDnBEYL5B41H0MTn0Uec8Hi+2qUtTfG2WWZBmMejQ=="
-    },
-    "node_modules/@sinclair/typebox": {
-      "version": "0.27.8",
-      "license": "MIT"
-    },
-    "node_modules/@sindresorhus/is": {
-      "version": "4.6.0",
-      "dev": true,
+    "node_modules/@react-native-windows/codegen/node_modules/chalk": {
+      "version": "4.1.2",
       "license": "MIT",
+      "peer": true,
+      "dependencies": {
+        "ansi-styles": "^4.1.0",
+        "supports-color": "^7.1.0"
+      },
       "engines": {
         "node": ">=10"
       },
       "funding": {
-        "url": "https://github.com/sindresorhus/is?sponsor=1"
-      }
-    },
-    "node_modules/@sinonjs/commons": {
-      "version": "2.0.0",
-      "license": "BSD-3-Clause",
-      "dependencies": {
-        "type-detect": "4.0.8"
+        "url": "https://github.com/chalk/chalk?sponsor=1"
       }
     },
-    "node_modules/@sinonjs/fake-timers": {
-      "version": "10.0.2",
-      "license": "BSD-3-Clause",
+    "node_modules/@react-native-windows/codegen/node_modules/cliui": {
+      "version": "7.0.4",
+      "license": "ISC",
+      "peer": true,
       "dependencies": {
-        "@sinonjs/commons": "^2.0.0"
+        "string-width": "^4.2.0",
+        "strip-ansi": "^6.0.0",
+        "wrap-ansi": "^7.0.0"
       }
     },
-    "node_modules/@storybook/addon-a11y": {
-      "version": "8.0.6",
-      "resolved": "https://registry.npmjs.org/@storybook/addon-a11y/-/addon-a11y-8.0.6.tgz",
-      "integrity": "sha512-p84GRmEU4f9uro71et4X4elnCFReq16UC44h8neLhcZHlMLkPop5oSRslcvF7MlKrM+mJepO1tsKmBmoTaq2PQ==",
+    "node_modules/@react-native-windows/codegen/node_modules/color-convert": {
+      "version": "2.0.1",
+      "license": "MIT",
+      "peer": true,
       "dependencies": {
-        "@storybook/addon-highlight": "8.0.6",
-        "axe-core": "^4.2.0"
+        "color-name": "~1.1.4"
       },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/storybook"
+      "engines": {
+        "node": ">=7.0.0"
       }
     },
-    "node_modules/@storybook/addon-actions": {
-      "version": "8.0.6",
-      "resolved": "https://registry.npmjs.org/@storybook/addon-actions/-/addon-actions-8.0.6.tgz",
-      "integrity": "sha512-3R/d2Td6+yeR+UnyCAeZ4tuiRGSm+6gKUQP9vB1bvEFQGuFBrV+zs3eakcYegOqZu3IXuejgaB0Knq987gUL5A==",
-      "dependencies": {
-        "@storybook/core-events": "8.0.6",
-        "@storybook/global": "^5.0.0",
-        "@types/uuid": "^9.0.1",
-        "dequal": "^2.0.2",
-        "polished": "^4.2.2",
-        "uuid": "^9.0.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/storybook"
-      }
+    "node_modules/@react-native-windows/codegen/node_modules/color-name": {
+      "version": "1.1.4",
+      "license": "MIT",
+      "peer": true
     },
-    "node_modules/@storybook/addon-actions/node_modules/uuid": {
-      "version": "9.0.1",
-      "resolved": "https://registry.npmjs.org/uuid/-/uuid-9.0.1.tgz",
-      "integrity": "sha512-b+1eJOlsR9K8HJpow9Ok3fiWOWSIcIzXodvv0rQjVoOVNpWMpxf1wZNpt4y9h10odCNrqnYp1OBzRktckBe3sA==",
-      "funding": [
-        "https://github.com/sponsors/broofa",
-        "https://github.com/sponsors/ctavan"
-      ],
-      "bin": {
-        "uuid": "dist/bin/uuid"
+    "node_modules/@react-native-windows/codegen/node_modules/has-flag": {
+      "version": "4.0.0",
+      "license": "MIT",
+      "peer": true,
+      "engines": {
+        "node": ">=8"
       }
     },
-    "node_modules/@storybook/addon-backgrounds": {
-      "version": "8.0.6",
-      "resolved": "https://registry.npmjs.org/@storybook/addon-backgrounds/-/addon-backgrounds-8.0.6.tgz",
-      "integrity": "sha512-NRTmSsJiqpXqJMVrRuQ+P1wt26ZCLjBNaMafcjgicfWeyUsdhNF63yYvyrHkMRuNmYPZm0hKvtjLhW3s9VohSA==",
+    "node_modules/@react-native-windows/codegen/node_modules/supports-color": {
+      "version": "7.2.0",
+      "license": "MIT",
+      "peer": true,
       "dependencies": {
-        "@storybook/global": "^5.0.0",
-        "memoizerific": "^1.11.3",
-        "ts-dedent": "^2.0.0"
+        "has-flag": "^4.0.0"
       },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/storybook"
+      "engines": {
+        "node": ">=8"
       }
     },
-    "node_modules/@storybook/addon-controls": {
-      "version": "8.0.6",
-      "resolved": "https://registry.npmjs.org/@storybook/addon-controls/-/addon-controls-8.0.6.tgz",
-      "integrity": "sha512-bNXDhi1xl7eat1dUsKTrUgu5mkwXjfFWDjIYxrzatqDOW1+rdkNaPFduQRJ2mpCs4cYcHKAr5chEcMm6byuTnA==",
-      "dependencies": {
-        "@storybook/blocks": "8.0.6",
-        "lodash": "^4.17.21",
-        "ts-dedent": "^2.0.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/storybook"
+    "node_modules/@react-native-windows/codegen/node_modules/y18n": {
+      "version": "5.0.8",
+      "license": "ISC",
+      "peer": true,
+      "engines": {
+        "node": ">=10"
       }
     },
-    "node_modules/@storybook/addon-docs": {
-      "version": "8.0.6",
-      "resolved": "https://registry.npmjs.org/@storybook/addon-docs/-/addon-docs-8.0.6.tgz",
-      "integrity": "sha512-QOlOE2XEFcUaR85YytBuf/nfKFkbIlD0Qc9CI4E65FoZPTCMhRVKAEN2CpsKI63fs/qQxM2mWkPXb6w7QXGxvg==",
+    "node_modules/@react-native-windows/codegen/node_modules/yargs": {
+      "version": "16.2.0",
+      "license": "MIT",
+      "peer": true,
       "dependencies": {
-        "@babel/core": "^7.12.3",
-        "@mdx-js/react": "^3.0.0",
-        "@storybook/blocks": "8.0.6",
-        "@storybook/client-logger": "8.0.6",
-        "@storybook/components": "8.0.6",
-        "@storybook/csf-plugin": "8.0.6",
-        "@storybook/csf-tools": "8.0.6",
-        "@storybook/global": "^5.0.0",
-        "@storybook/node-logger": "8.0.6",
-        "@storybook/preview-api": "8.0.6",
-        "@storybook/react-dom-shim": "8.0.6",
-        "@storybook/theming": "8.0.6",
-        "@storybook/types": "8.0.6",
-        "@types/react": "^16.8.0 || ^17.0.0 || ^18.0.0",
-        "fs-extra": "^11.1.0",
-        "react": "^16.8.0 || ^17.0.0 || ^18.0.0",
-        "react-dom": "^16.8.0 || ^17.0.0 || ^18.0.0",
-        "rehype-external-links": "^3.0.0",
-        "rehype-slug": "^6.0.0",
-        "ts-dedent": "^2.0.0"
+        "cliui": "^7.0.2",
+        "escalade": "^3.1.1",
+        "get-caller-file": "^2.0.5",
+        "require-directory": "^2.1.1",
+        "string-width": "^4.2.0",
+        "y18n": "^5.0.5",
+        "yargs-parser": "^20.2.2"
       },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/storybook"
+      "engines": {
+        "node": ">=10"
       }
     },
-    "node_modules/@storybook/addon-docs/node_modules/fs-extra": {
-      "version": "11.2.0",
-      "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-11.2.0.tgz",
-      "integrity": "sha512-PmDi3uwK5nFuXh7XDTlVnS17xJS7vW36is2+w3xcv8SVxiB4NyATf4ctkVY5bkSjX0Y4nbvZCq1/EjtEyr9ktw==",
+    "node_modules/@react-native-windows/find-repo-root": {
+      "version": "0.73.0",
+      "license": "MIT",
+      "peer": true,
       "dependencies": {
-        "graceful-fs": "^4.2.0",
-        "jsonfile": "^6.0.1",
-        "universalify": "^2.0.0"
+        "@react-native-windows/fs": "0.73.0",
+        "find-up": "^4.1.0"
       },
       "engines": {
-        "node": ">=14.14"
+        "node": ">= 18"
       }
     },
-    "node_modules/@storybook/addon-essentials": {
-      "version": "8.0.6",
-      "resolved": "https://registry.npmjs.org/@storybook/addon-essentials/-/addon-essentials-8.0.6.tgz",
-      "integrity": "sha512-L9SSsdN1EG2FZ1mNT59vwf0fpseLrzO1cWPwH6hVtp0+kci3tfropch2tEwO7Vr+YLSesJihfr4uvpI/l0jCsw==",
-      "dependencies": {
-        "@storybook/addon-actions": "8.0.6",
-        "@storybook/addon-backgrounds": "8.0.6",
-        "@storybook/addon-controls": "8.0.6",
-        "@storybook/addon-docs": "8.0.6",
-        "@storybook/addon-highlight": "8.0.6",
-        "@storybook/addon-measure": "8.0.6",
-        "@storybook/addon-outline": "8.0.6",
-        "@storybook/addon-toolbars": "8.0.6",
-        "@storybook/addon-viewport": "8.0.6",
-        "@storybook/core-common": "8.0.6",
-        "@storybook/manager-api": "8.0.6",
-        "@storybook/node-logger": "8.0.6",
-        "@storybook/preview-api": "8.0.6",
-        "ts-dedent": "^2.0.0"
+    "node_modules/@react-native-windows/find-repo-root/node_modules/find-up": {
+      "version": "4.1.0",
+      "license": "MIT",
+      "peer": true,
+      "dependencies": {
+        "locate-path": "^5.0.0",
+        "path-exists": "^4.0.0"
       },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/storybook"
+      "engines": {
+        "node": ">=8"
       }
     },
-    "node_modules/@storybook/addon-highlight": {
-      "version": "8.0.6",
-      "resolved": "https://registry.npmjs.org/@storybook/addon-highlight/-/addon-highlight-8.0.6.tgz",
-      "integrity": "sha512-CxXzzgIK5sXy2RNIkwU5JXZNq+PNGhUptRm/5M5ylcB7rk0pdwnE0TLXsMU+lzD0ji+cj61LWVLdeXQa+/whSw==",
+    "node_modules/@react-native-windows/find-repo-root/node_modules/locate-path": {
+      "version": "5.0.0",
+      "license": "MIT",
+      "peer": true,
       "dependencies": {
-        "@storybook/global": "^5.0.0"
+        "p-locate": "^4.1.0"
       },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/storybook"
+      "engines": {
+        "node": ">=8"
       }
     },
-    "node_modules/@storybook/addon-measure": {
-      "version": "8.0.6",
-      "resolved": "https://registry.npmjs.org/@storybook/addon-measure/-/addon-measure-8.0.6.tgz",
-      "integrity": "sha512-2PnytDaQzCxcgykEM5Njb71Olm+Z2EFERL5X+5RhsG2EQxEqobwh1fUtXLY4aqiImdSJOrjQnkMJchzzoTRtug==",
+    "node_modules/@react-native-windows/find-repo-root/node_modules/p-limit": {
+      "version": "2.3.0",
+      "license": "MIT",
+      "peer": true,
       "dependencies": {
-        "@storybook/global": "^5.0.0",
-        "tiny-invariant": "^1.3.1"
+        "p-try": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=6"
       },
       "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/storybook"
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/@storybook/addon-outline": {
-      "version": "8.0.6",
-      "resolved": "https://registry.npmjs.org/@storybook/addon-outline/-/addon-outline-8.0.6.tgz",
-      "integrity": "sha512-PfTIy64kV5h7F0tXrj5rlwdPFpOQiGrn01AQudSJDVWaMsbVgjruPU+cHG4i/L1mzzERzeHYd46bNENWZiQgDw==",
+    "node_modules/@react-native-windows/find-repo-root/node_modules/p-locate": {
+      "version": "4.1.0",
+      "license": "MIT",
+      "peer": true,
       "dependencies": {
-        "@storybook/global": "^5.0.0",
-        "ts-dedent": "^2.0.0"
+        "p-limit": "^2.2.0"
       },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/storybook"
+      "engines": {
+        "node": ">=8"
       }
     },
-    "node_modules/@storybook/addon-toolbars": {
-      "version": "8.0.6",
-      "resolved": "https://registry.npmjs.org/@storybook/addon-toolbars/-/addon-toolbars-8.0.6.tgz",
-      "integrity": "sha512-g4GjrMEHKOIQVwG1DKUHBAn4B8xmdqlxFlVusOrYD9FVfakgMNllN6WBc02hg/IiuzqIDxVK5BXiY9MbXnoguQ==",
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/storybook"
+    "node_modules/@react-native-windows/find-repo-root/node_modules/path-exists": {
+      "version": "4.0.0",
+      "license": "MIT",
+      "peer": true,
+      "engines": {
+        "node": ">=8"
       }
     },
-    "node_modules/@storybook/addon-viewport": {
-      "version": "8.0.6",
-      "resolved": "https://registry.npmjs.org/@storybook/addon-viewport/-/addon-viewport-8.0.6.tgz",
-      "integrity": "sha512-R6aGEPA5e05L/NPs6Nbj0u9L6oKmchnJ/x8Rr/Xuc+nqVgXC1rslI0BcjJuC571Bewz7mT8zJ+BjP/gs7T4lnQ==",
+    "node_modules/@react-native-windows/fs": {
+      "version": "0.73.0",
+      "license": "MIT",
+      "peer": true,
       "dependencies": {
-        "memoizerific": "^1.11.3"
+        "graceful-fs": "^4.2.8"
       },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/storybook"
+      "engines": {
+        "node": ">= 18"
       }
     },
-    "node_modules/@storybook/addon-webpack5-compiler-babel": {
-      "version": "3.0.3",
-      "resolved": "https://registry.npmjs.org/@storybook/addon-webpack5-compiler-babel/-/addon-webpack5-compiler-babel-3.0.3.tgz",
-      "integrity": "sha512-rVQTTw+oxJltbVKaejIWSHwVKOBJs3au21f/pYXhV0aiNgNhxEa3vr79t/j0j8ox8uJtzM8XYOb7FlkvGfHlwQ==",
-      "dev": true,
+    "node_modules/@react-native-windows/package-utils": {
+      "version": "0.73.0",
+      "license": "MIT",
+      "peer": true,
       "dependencies": {
-        "@babel/core": "^7.23.7",
-        "babel-loader": "^9.1.3"
+        "@react-native-windows/find-repo-root": "0.73.0",
+        "@react-native-windows/fs": "0.73.0",
+        "get-monorepo-packages": "^1.2.0",
+        "lodash": "^4.17.15"
       },
       "engines": {
-        "node": ">=18"
+        "node": ">= 18"
       }
     },
-    "node_modules/@storybook/blocks": {
-      "version": "8.0.6",
-      "resolved": "https://registry.npmjs.org/@storybook/blocks/-/blocks-8.0.6.tgz",
-      "integrity": "sha512-ycuPJwxyngSor4YNa4kkX3rAmX+w2pXNsIo+Zs4fEdAfCvha9+GZ/3jQSdrsHxjeIm9l9guiv4Ag8QTnnllXkw==",
-      "dependencies": {
-        "@storybook/channels": "8.0.6",
-        "@storybook/client-logger": "8.0.6",
-        "@storybook/components": "8.0.6",
-        "@storybook/core-events": "8.0.6",
-        "@storybook/csf": "^0.1.2",
-        "@storybook/docs-tools": "8.0.6",
-        "@storybook/global": "^5.0.0",
-        "@storybook/icons": "^1.2.5",
-        "@storybook/manager-api": "8.0.6",
-        "@storybook/preview-api": "8.0.6",
-        "@storybook/theming": "8.0.6",
-        "@storybook/types": "8.0.6",
-        "@types/lodash": "^4.14.167",
-        "color-convert": "^2.0.1",
-        "dequal": "^2.0.2",
+    "node_modules/@react-native-windows/telemetry": {
+      "version": "0.73.1",
+      "license": "MIT",
+      "peer": true,
+      "dependencies": {
+        "@react-native-windows/fs": "0.73.0",
+        "@xmldom/xmldom": "^0.7.7",
+        "applicationinsights": "2.7.3",
+        "ci-info": "^3.2.0",
+        "envinfo": "^7.8.1",
         "lodash": "^4.17.21",
-        "markdown-to-jsx": "7.3.2",
-        "memoizerific": "^1.11.3",
-        "polished": "^4.2.2",
-        "react-colorful": "^5.1.2",
-        "telejson": "^7.2.0",
-        "tocbot": "^4.20.1",
-        "ts-dedent": "^2.0.0",
-        "util-deprecate": "^1.0.2"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/storybook"
-      },
-      "peerDependencies": {
-        "react": "^16.8.0 || ^17.0.0 || ^18.0.0",
-        "react-dom": "^16.8.0 || ^17.0.0 || ^18.0.0"
+        "os-locale": "^5.0.0",
+        "xpath": "^0.0.27"
       },
-      "peerDependenciesMeta": {
-        "react": {
-          "optional": true
-        },
-        "react-dom": {
-          "optional": true
-        }
+      "engines": {
+        "node": ">= 18"
       }
     },
-    "node_modules/@storybook/blocks/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==",
+    "node_modules/@react-native-windows/telemetry/node_modules/execa": {
+      "version": "4.1.0",
+      "license": "MIT",
+      "peer": true,
       "dependencies": {
-        "color-name": "~1.1.4"
+        "cross-spawn": "^7.0.0",
+        "get-stream": "^5.0.0",
+        "human-signals": "^1.1.1",
+        "is-stream": "^2.0.0",
+        "merge-stream": "^2.0.0",
+        "npm-run-path": "^4.0.0",
+        "onetime": "^5.1.0",
+        "signal-exit": "^3.0.2",
+        "strip-final-newline": "^2.0.0"
       },
       "engines": {
-        "node": ">=7.0.0"
-      }
-    },
-    "node_modules/@storybook/blocks/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=="
-    },
-    "node_modules/@storybook/builder-manager": {
-      "version": "8.0.6",
-      "resolved": "https://registry.npmjs.org/@storybook/builder-manager/-/builder-manager-8.0.6.tgz",
-      "integrity": "sha512-N61Gh9FKsSYvsbdBy5qFvq1anTIuUAjh2Z+ezDMlxnfMGG77nZP9heuy1NnCaYCTFzl+lq4BsmRfXXDcKtSPRA==",
-      "dependencies": {
-        "@fal-works/esbuild-plugin-global-externals": "^2.1.2",
-        "@storybook/core-common": "8.0.6",
-        "@storybook/manager": "8.0.6",
-        "@storybook/node-logger": "8.0.6",
-        "@types/ejs": "^3.1.1",
-        "@yarnpkg/esbuild-plugin-pnp": "^3.0.0-rc.10",
-        "browser-assert": "^1.2.1",
-        "ejs": "^3.1.8",
-        "esbuild": "^0.18.0 || ^0.19.0 || ^0.20.0",
-        "esbuild-plugin-alias": "^0.2.1",
-        "express": "^4.17.3",
-        "fs-extra": "^11.1.0",
-        "process": "^0.11.10",
-        "util": "^0.12.4"
+        "node": ">=10"
       },
       "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/storybook"
+        "url": "https://github.com/sindresorhus/execa?sponsor=1"
       }
     },
-    "node_modules/@storybook/builder-manager/node_modules/fs-extra": {
-      "version": "11.2.0",
-      "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-11.2.0.tgz",
-      "integrity": "sha512-PmDi3uwK5nFuXh7XDTlVnS17xJS7vW36is2+w3xcv8SVxiB4NyATf4ctkVY5bkSjX0Y4nbvZCq1/EjtEyr9ktw==",
+    "node_modules/@react-native-windows/telemetry/node_modules/get-stream": {
+      "version": "5.2.0",
+      "license": "MIT",
+      "peer": true,
       "dependencies": {
-        "graceful-fs": "^4.2.0",
-        "jsonfile": "^6.0.1",
-        "universalify": "^2.0.0"
+        "pump": "^3.0.0"
       },
       "engines": {
-        "node": ">=14.14"
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/@storybook/builder-manager/node_modules/util": {
-      "version": "0.12.5",
-      "resolved": "https://registry.npmjs.org/util/-/util-0.12.5.tgz",
-      "integrity": "sha512-kZf/K6hEIrWHI6XqOFUiiMa+79wE/D8Q+NCNAWclkyg3b4d2k7s0QGepNjiABc+aR3N1PAyHL7p6UcLY6LmrnA==",
-      "dependencies": {
-        "inherits": "^2.0.3",
-        "is-arguments": "^1.0.4",
-        "is-generator-function": "^1.0.7",
-        "is-typed-array": "^1.1.3",
-        "which-typed-array": "^1.1.2"
+    "node_modules/@react-native-windows/telemetry/node_modules/human-signals": {
+      "version": "1.1.1",
+      "license": "Apache-2.0",
+      "peer": true,
+      "engines": {
+        "node": ">=8.12.0"
       }
     },
-    "node_modules/@storybook/builder-webpack5": {
-      "version": "8.0.6",
-      "resolved": "https://registry.npmjs.org/@storybook/builder-webpack5/-/builder-webpack5-8.0.6.tgz",
-      "integrity": "sha512-xhGmjDufD4nhOC9D10A78V73gw5foGWXACs0Trz76PdrSymwHdaTIZ4y4lMJMdp7qkqhO4o2K9kHweO4YPbajg==",
-      "dev": true,
-      "dependencies": {
-        "@storybook/channels": "8.0.6",
-        "@storybook/client-logger": "8.0.6",
-        "@storybook/core-common": "8.0.6",
-        "@storybook/core-events": "8.0.6",
-        "@storybook/core-webpack": "8.0.6",
-        "@storybook/node-logger": "8.0.6",
-        "@storybook/preview": "8.0.6",
-        "@storybook/preview-api": "8.0.6",
-        "@types/node": "^18.0.0",
-        "@types/semver": "^7.3.4",
-        "browser-assert": "^1.2.1",
-        "case-sensitive-paths-webpack-plugin": "^2.4.0",
-        "cjs-module-lexer": "^1.2.3",
-        "constants-browserify": "^1.0.0",
-        "css-loader": "^6.7.1",
-        "es-module-lexer": "^1.4.1",
-        "express": "^4.17.3",
-        "fork-ts-checker-webpack-plugin": "^8.0.0",
-        "fs-extra": "^11.1.0",
-        "html-webpack-plugin": "^5.5.0",
-        "magic-string": "^0.30.5",
-        "path-browserify": "^1.0.1",
-        "process": "^0.11.10",
-        "semver": "^7.3.7",
-        "style-loader": "^3.3.1",
-        "terser-webpack-plugin": "^5.3.1",
-        "ts-dedent": "^2.0.0",
-        "url": "^0.11.0",
-        "util": "^0.12.4",
-        "util-deprecate": "^1.0.2",
-        "webpack": "5",
-        "webpack-dev-middleware": "^6.1.1",
-        "webpack-hot-middleware": "^2.25.1",
-        "webpack-virtual-modules": "^0.5.0"
+    "node_modules/@react-native-windows/telemetry/node_modules/invert-kv": {
+      "version": "3.0.1",
+      "license": "MIT",
+      "peer": true,
+      "engines": {
+        "node": ">=8"
       },
       "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/storybook"
-      },
-      "peerDependenciesMeta": {
-        "typescript": {
-          "optional": true
-        }
+        "url": "https://github.com/sindresorhus/invert-kv?sponsor=1"
       }
     },
-    "node_modules/@storybook/builder-webpack5/node_modules/@types/node": {
-      "version": "18.19.30",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-18.19.30.tgz",
-      "integrity": "sha512-453z1zPuJLVDbyahaa1sSD5C2sht6ZpHp5rgJNs+H8YGqhluCXcuOUmBYsAo0Tos0cHySJ3lVUGbGgLlqIkpyg==",
-      "dev": true,
+    "node_modules/@react-native-windows/telemetry/node_modules/lcid": {
+      "version": "3.1.1",
+      "license": "MIT",
+      "peer": true,
       "dependencies": {
-        "undici-types": "~5.26.4"
+        "invert-kv": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=8"
       }
     },
-    "node_modules/@storybook/builder-webpack5/node_modules/fs-extra": {
-      "version": "11.2.0",
-      "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-11.2.0.tgz",
-      "integrity": "sha512-PmDi3uwK5nFuXh7XDTlVnS17xJS7vW36is2+w3xcv8SVxiB4NyATf4ctkVY5bkSjX0Y4nbvZCq1/EjtEyr9ktw==",
-      "dev": true,
+    "node_modules/@react-native-windows/telemetry/node_modules/mem": {
+      "version": "5.1.1",
+      "license": "MIT",
+      "peer": true,
       "dependencies": {
-        "graceful-fs": "^4.2.0",
-        "jsonfile": "^6.0.1",
-        "universalify": "^2.0.0"
+        "map-age-cleaner": "^0.1.3",
+        "mimic-fn": "^2.1.0",
+        "p-is-promise": "^2.1.0"
       },
       "engines": {
-        "node": ">=14.14"
+        "node": ">=8"
       }
     },
-    "node_modules/@storybook/builder-webpack5/node_modules/path-browserify": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/path-browserify/-/path-browserify-1.0.1.tgz",
-      "integrity": "sha512-b7uo2UCUOYZcnF/3ID0lulOJi/bafxa1xPe7ZPsammBSpjSWQkjNxlt635YGS2MiR9GjvuXCtz2emr3jbsz98g==",
-      "dev": true
-    },
-    "node_modules/@storybook/builder-webpack5/node_modules/style-loader": {
-      "version": "3.3.4",
-      "resolved": "https://registry.npmjs.org/style-loader/-/style-loader-3.3.4.tgz",
-      "integrity": "sha512-0WqXzrsMTyb8yjZJHDqwmnwRJvhALK9LfRtRc6B4UTWe8AijYLZYZ9thuJTZc2VfQWINADW/j+LiJnfy2RoC1w==",
-      "dev": true,
+    "node_modules/@react-native-windows/telemetry/node_modules/os-locale": {
+      "version": "5.0.0",
+      "license": "MIT",
+      "peer": true,
+      "dependencies": {
+        "execa": "^4.0.0",
+        "lcid": "^3.0.0",
+        "mem": "^5.0.0"
+      },
       "engines": {
-        "node": ">= 12.13.0"
+        "node": ">=10"
       },
       "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/webpack"
-      },
-      "peerDependencies": {
-        "webpack": "^5.0.0"
-      }
-    },
-    "node_modules/@storybook/builder-webpack5/node_modules/util": {
-      "version": "0.12.5",
-      "resolved": "https://registry.npmjs.org/util/-/util-0.12.5.tgz",
-      "integrity": "sha512-kZf/K6hEIrWHI6XqOFUiiMa+79wE/D8Q+NCNAWclkyg3b4d2k7s0QGepNjiABc+aR3N1PAyHL7p6UcLY6LmrnA==",
-      "dev": true,
-      "dependencies": {
-        "inherits": "^2.0.3",
-        "is-arguments": "^1.0.4",
-        "is-generator-function": "^1.0.7",
-        "is-typed-array": "^1.1.3",
-        "which-typed-array": "^1.1.2"
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/@storybook/channels": {
-      "version": "8.0.6",
-      "resolved": "https://registry.npmjs.org/@storybook/channels/-/channels-8.0.6.tgz",
-      "integrity": "sha512-IbNvjxeyQKiMpb+gSpQ7yYsFqb8BM/KYgfypJM3yJV6iU/NFeevrC/DA6/R+8xWFyPc70unRNLv8fPvxhcIu8Q==",
-      "dependencies": {
-        "@storybook/client-logger": "8.0.6",
-        "@storybook/core-events": "8.0.6",
-        "@storybook/global": "^5.0.0",
-        "telejson": "^7.2.0",
-        "tiny-invariant": "^1.3.1"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/storybook"
+    "node_modules/@react-native/assets-registry": {
+      "version": "0.75.2",
+      "resolved": "https://registry.npmjs.org/@react-native/assets-registry/-/assets-registry-0.75.2.tgz",
+      "integrity": "sha512-P1dLHjpUeC0AIkDHRYcx0qLMr+p92IPWL3pmczzo6T76Qa9XzruQOYy0jittxyBK91Csn6HHQ/eit8TeXW8MVw==",
+      "engines": {
+        "node": ">=18"
       }
     },
-    "node_modules/@storybook/cli": {
-      "version": "8.0.6",
-      "resolved": "https://registry.npmjs.org/@storybook/cli/-/cli-8.0.6.tgz",
-      "integrity": "sha512-gAnl9soQUu1BtB4sANaqaaeTZAt/ThBSwCdzSLut5p21fP4ovi3FeP7hcDCJbyJZ/AvnD4k6leDrqRQxMVPr0A==",
+    "node_modules/@react-native/babel-plugin-codegen": {
+      "version": "0.75.2",
+      "resolved": "https://registry.npmjs.org/@react-native/babel-plugin-codegen/-/babel-plugin-codegen-0.75.2.tgz",
+      "integrity": "sha512-BIKVh2ZJPkzluUGgCNgpoh6NTHgX8j04FCS0Z/rTmRJ66hir/EUBl8frMFKrOy/6i4VvZEltOWB5eWfHe1AYgw==",
       "dependencies": {
-        "@babel/core": "^7.23.0",
-        "@babel/types": "^7.23.0",
-        "@ndelangen/get-tarball": "^3.0.7",
-        "@storybook/codemod": "8.0.6",
-        "@storybook/core-common": "8.0.6",
-        "@storybook/core-events": "8.0.6",
-        "@storybook/core-server": "8.0.6",
-        "@storybook/csf-tools": "8.0.6",
-        "@storybook/node-logger": "8.0.6",
-        "@storybook/telemetry": "8.0.6",
-        "@storybook/types": "8.0.6",
-        "@types/semver": "^7.3.4",
-        "@yarnpkg/fslib": "2.10.3",
-        "@yarnpkg/libzip": "2.3.0",
-        "chalk": "^4.1.0",
-        "commander": "^6.2.1",
-        "cross-spawn": "^7.0.3",
-        "detect-indent": "^6.1.0",
-        "envinfo": "^7.7.3",
-        "execa": "^5.0.0",
-        "find-up": "^5.0.0",
-        "fs-extra": "^11.1.0",
-        "get-npm-tarball-url": "^2.0.3",
-        "giget": "^1.0.0",
-        "globby": "^11.0.2",
-        "jscodeshift": "^0.15.1",
-        "leven": "^3.1.0",
-        "ora": "^5.4.1",
-        "prettier": "^3.1.1",
-        "prompts": "^2.4.0",
-        "read-pkg-up": "^7.0.1",
-        "semver": "^7.3.7",
-        "strip-json-comments": "^3.0.1",
-        "tempy": "^1.0.1",
-        "tiny-invariant": "^1.3.1",
-        "ts-dedent": "^2.0.0"
-      },
-      "bin": {
-        "getstorybook": "bin/index.js",
-        "sb": "bin/index.js"
+        "@react-native/codegen": "0.75.2"
       },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/storybook"
+      "engines": {
+        "node": ">=18"
       }
     },
-    "node_modules/@storybook/cli/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==",
+    "node_modules/@react-native/babel-preset": {
+      "version": "0.75.2",
+      "resolved": "https://registry.npmjs.org/@react-native/babel-preset/-/babel-preset-0.75.2.tgz",
+      "integrity": "sha512-mprpsas+WdCEMjQZnbDiAC4KKRmmLbMB+o/v4mDqKlH4Mcm7RdtP5t80MZGOVCHlceNp1uEIpXywx69DNwgbgg==",
       "dependencies": {
-        "color-convert": "^2.0.1"
+        "@babel/core": "^7.20.0",
+        "@babel/plugin-proposal-export-default-from": "^7.0.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-generator-functions": "^7.24.3",
+        "@babel/plugin-transform-async-to-generator": "^7.20.0",
+        "@babel/plugin-transform-block-scoping": "^7.0.0",
+        "@babel/plugin-transform-class-properties": "^7.24.1",
+        "@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-for-of": "^7.0.0",
+        "@babel/plugin-transform-function-name": "^7.0.0",
+        "@babel/plugin-transform-literals": "^7.0.0",
+        "@babel/plugin-transform-logical-assignment-operators": "^7.24.1",
+        "@babel/plugin-transform-modules-commonjs": "^7.0.0",
+        "@babel/plugin-transform-named-capturing-groups-regex": "^7.0.0",
+        "@babel/plugin-transform-nullish-coalescing-operator": "^7.24.1",
+        "@babel/plugin-transform-numeric-separator": "^7.24.1",
+        "@babel/plugin-transform-object-rest-spread": "^7.24.5",
+        "@babel/plugin-transform-optional-catch-binding": "^7.24.1",
+        "@babel/plugin-transform-optional-chaining": "^7.24.5",
+        "@babel/plugin-transform-parameters": "^7.0.0",
+        "@babel/plugin-transform-private-methods": "^7.22.5",
+        "@babel/plugin-transform-private-property-in-object": "^7.22.11",
+        "@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-regenerator": "^7.20.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",
+        "@react-native/babel-plugin-codegen": "0.75.2",
+        "babel-plugin-transform-flow-enums": "^0.0.2",
+        "react-refresh": "^0.14.0"
       },
       "engines": {
-        "node": ">=8"
+        "node": ">=18"
       },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
+      "peerDependencies": {
+        "@babel/core": "*"
       }
     },
-    "node_modules/@storybook/cli/node_modules/chalk": {
-      "version": "4.1.2",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
-      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
+    "node_modules/@react-native/codegen": {
+      "version": "0.75.2",
+      "resolved": "https://registry.npmjs.org/@react-native/codegen/-/codegen-0.75.2.tgz",
+      "integrity": "sha512-OkWdbtO2jTkfOXfj3ibIL27rM6LoaEuApOByU2G8X+HS6v9U87uJVJlMIRWBDmnxODzazuHwNVA2/wAmSbucaw==",
       "dependencies": {
-        "ansi-styles": "^4.1.0",
-        "supports-color": "^7.1.0"
+        "@babel/parser": "^7.20.0",
+        "glob": "^7.1.1",
+        "hermes-parser": "0.22.0",
+        "invariant": "^2.2.4",
+        "jscodeshift": "^0.14.0",
+        "mkdirp": "^0.5.1",
+        "nullthrows": "^1.1.1",
+        "yargs": "^17.6.2"
       },
       "engines": {
-        "node": ">=10"
+        "node": ">=18"
       },
-      "funding": {
-        "url": "https://github.com/chalk/chalk?sponsor=1"
+      "peerDependencies": {
+        "@babel/preset-env": "^7.1.6"
       }
     },
-    "node_modules/@storybook/cli/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==",
+    "node_modules/@react-native/codegen/node_modules/mkdirp": {
+      "version": "0.5.6",
+      "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.6.tgz",
+      "integrity": "sha512-FP+p8RB8OWpF3YZBCrP5gtADmtXApB5AMLn+vdyA+PyxCjrCs00mjyUozssO33cwDeT3wNGdLxJ5M//YqtHAJw==",
       "dependencies": {
-        "color-name": "~1.1.4"
+        "minimist": "^1.2.6"
       },
-      "engines": {
-        "node": ">=7.0.0"
+      "bin": {
+        "mkdirp": "bin/cmd.js"
       }
     },
-    "node_modules/@storybook/cli/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=="
-    },
-    "node_modules/@storybook/cli/node_modules/del": {
-      "version": "6.1.1",
-      "resolved": "https://registry.npmjs.org/del/-/del-6.1.1.tgz",
-      "integrity": "sha512-ua8BhapfP0JUJKC/zV9yHHDW/rDoDxP4Zhn3AkA6/xT6gY7jYXJiaeyBZznYVujhZZET+UgcbZiQ7sN3WqcImg==",
-      "dependencies": {
-        "globby": "^11.0.1",
-        "graceful-fs": "^4.2.4",
-        "is-glob": "^4.0.1",
-        "is-path-cwd": "^2.2.0",
-        "is-path-inside": "^3.0.2",
-        "p-map": "^4.0.0",
-        "rimraf": "^3.0.2",
-        "slash": "^3.0.0"
+    "node_modules/@react-native/community-cli-plugin": {
+      "version": "0.75.2",
+      "resolved": "https://registry.npmjs.org/@react-native/community-cli-plugin/-/community-cli-plugin-0.75.2.tgz",
+      "integrity": "sha512-/tz0bzVja4FU0aAimzzQ7iYR43peaD6pzksArdrrGhlm8OvFYAQPOYSNeIQVMSarwnkNeg1naFKaeYf1o3++yA==",
+      "dependencies": {
+        "@react-native-community/cli-server-api": "14.0.0-alpha.11",
+        "@react-native-community/cli-tools": "14.0.0-alpha.11",
+        "@react-native/dev-middleware": "0.75.2",
+        "@react-native/metro-babel-transformer": "0.75.2",
+        "chalk": "^4.0.0",
+        "execa": "^5.1.1",
+        "metro": "^0.80.3",
+        "metro-config": "^0.80.3",
+        "metro-core": "^0.80.3",
+        "node-fetch": "^2.2.0",
+        "querystring": "^0.2.1",
+        "readline": "^1.3.0"
       },
       "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
+        "node": ">=18"
       }
     },
-    "node_modules/@storybook/cli/node_modules/fs-extra": {
-      "version": "11.2.0",
-      "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-11.2.0.tgz",
-      "integrity": "sha512-PmDi3uwK5nFuXh7XDTlVnS17xJS7vW36is2+w3xcv8SVxiB4NyATf4ctkVY5bkSjX0Y4nbvZCq1/EjtEyr9ktw==",
+    "node_modules/@react-native/community-cli-plugin/node_modules/@jest/types": {
+      "version": "26.6.2",
+      "resolved": "https://registry.npmjs.org/@jest/types/-/types-26.6.2.tgz",
+      "integrity": "sha512-fC6QCp7Sc5sX6g8Tvbmj4XUTbyrik0akgRy03yjXbQaBWWNWGE7SGtJk98m0N8nzegD/7SggrUlivxo5ax4KWQ==",
       "dependencies": {
-        "graceful-fs": "^4.2.0",
-        "jsonfile": "^6.0.1",
-        "universalify": "^2.0.0"
+        "@types/istanbul-lib-coverage": "^2.0.0",
+        "@types/istanbul-reports": "^3.0.0",
+        "@types/node": "*",
+        "@types/yargs": "^15.0.0",
+        "chalk": "^4.0.0"
       },
       "engines": {
-        "node": ">=14.14"
+        "node": ">= 10.14.2"
       }
     },
-    "node_modules/@storybook/cli/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==",
-      "engines": {
-        "node": ">=8"
+    "node_modules/@react-native/community-cli-plugin/node_modules/@react-native-community/cli-debugger-ui": {
+      "version": "14.0.0-alpha.11",
+      "resolved": "https://registry.npmjs.org/@react-native-community/cli-debugger-ui/-/cli-debugger-ui-14.0.0-alpha.11.tgz",
+      "integrity": "sha512-0wCNQxhCniyjyMXgR1qXliY180y/2QbvoiYpp2MleGQADr5M1b8lgI4GoyADh5kE+kX3VL0ssjgyxpmbpCD86A==",
+      "dependencies": {
+        "serve-static": "^1.13.1"
       }
     },
-    "node_modules/@storybook/cli/node_modules/is-path-inside": {
-      "version": "3.0.3",
-      "resolved": "https://registry.npmjs.org/is-path-inside/-/is-path-inside-3.0.3.tgz",
-      "integrity": "sha512-Fd4gABb+ycGAmKou8eMftCupSir5lRxqf4aD/vd0cD2qc4HL07OjCeuHMr8Ro4CoMaeCKDB0/ECBOVWjTwUvPQ==",
-      "engines": {
-        "node": ">=8"
+    "node_modules/@react-native/community-cli-plugin/node_modules/@react-native-community/cli-server-api": {
+      "version": "14.0.0-alpha.11",
+      "resolved": "https://registry.npmjs.org/@react-native-community/cli-server-api/-/cli-server-api-14.0.0-alpha.11.tgz",
+      "integrity": "sha512-I7YeYI7S5wSxnQAqeG8LNqhT99FojiGIk87DU0vTp6U8hIMLcA90fUuBAyJY38AuQZ12ZJpGa8ObkhIhWzGkvg==",
+      "dependencies": {
+        "@react-native-community/cli-debugger-ui": "14.0.0-alpha.11",
+        "@react-native-community/cli-tools": "14.0.0-alpha.11",
+        "compression": "^1.7.1",
+        "connect": "^3.6.5",
+        "errorhandler": "^1.5.1",
+        "nocache": "^3.0.1",
+        "pretty-format": "^26.6.2",
+        "serve-static": "^1.13.1",
+        "ws": "^6.2.3"
       }
     },
-    "node_modules/@storybook/cli/node_modules/jscodeshift": {
-      "version": "0.15.2",
-      "resolved": "https://registry.npmjs.org/jscodeshift/-/jscodeshift-0.15.2.tgz",
-      "integrity": "sha512-FquR7Okgmc4Sd0aEDwqho3rEiKR3BdvuG9jfdHjLJ6JQoWSMpavug3AoIfnfWhxFlf+5pzQh8qjqz0DWFrNQzA==",
+    "node_modules/@react-native/community-cli-plugin/node_modules/@react-native-community/cli-tools": {
+      "version": "14.0.0-alpha.11",
+      "resolved": "https://registry.npmjs.org/@react-native-community/cli-tools/-/cli-tools-14.0.0-alpha.11.tgz",
+      "integrity": "sha512-HQCfVnX9aqRdKdLxmQy4fUAUo+YhNGlBV7ZjOayPbuEGWJ4RN+vSy0Cawk7epo7hXd6vKzc7P7y3HlU6Kxs7+w==",
       "dependencies": {
-        "@babel/core": "^7.23.0",
-        "@babel/parser": "^7.23.0",
-        "@babel/plugin-transform-class-properties": "^7.22.5",
-        "@babel/plugin-transform-modules-commonjs": "^7.23.0",
-        "@babel/plugin-transform-nullish-coalescing-operator": "^7.22.11",
-        "@babel/plugin-transform-optional-chaining": "^7.23.0",
-        "@babel/plugin-transform-private-methods": "^7.22.5",
-        "@babel/preset-flow": "^7.22.15",
-        "@babel/preset-typescript": "^7.23.0",
-        "@babel/register": "^7.22.15",
-        "babel-core": "^7.0.0-bridge.0",
+        "appdirsjs": "^1.2.4",
         "chalk": "^4.1.2",
-        "flow-parser": "0.*",
-        "graceful-fs": "^4.2.4",
-        "micromatch": "^4.0.4",
-        "neo-async": "^2.5.0",
-        "node-dir": "^0.1.17",
-        "recast": "^0.23.3",
-        "temp": "^0.8.4",
-        "write-file-atomic": "^2.3.0"
-      },
-      "bin": {
-        "jscodeshift": "bin/jscodeshift.js"
-      },
-      "peerDependencies": {
-        "@babel/preset-env": "^7.1.6"
-      },
-      "peerDependenciesMeta": {
-        "@babel/preset-env": {
-          "optional": true
-        }
+        "execa": "^5.0.0",
+        "find-up": "^5.0.0",
+        "mime": "^2.4.1",
+        "open": "^6.2.0",
+        "ora": "^5.4.1",
+        "semver": "^7.5.2",
+        "shell-quote": "^1.7.3",
+        "sudo-prompt": "^9.0.0"
       }
     },
-    "node_modules/@storybook/cli/node_modules/prettier": {
-      "version": "3.2.5",
-      "resolved": "https://registry.npmjs.org/prettier/-/prettier-3.2.5.tgz",
-      "integrity": "sha512-3/GWa9aOC0YeD7LUfvOG2NiDyhOWRvt1k+rcKhOuYnMY24iiCphgneUfJDyFXd6rZCAnuLBv6UeAULtrhT/F4A==",
-      "bin": {
-        "prettier": "bin/prettier.cjs"
-      },
+    "node_modules/@react-native/community-cli-plugin/node_modules/@react-native/debugger-frontend": {
+      "version": "0.75.2",
+      "resolved": "https://registry.npmjs.org/@react-native/debugger-frontend/-/debugger-frontend-0.75.2.tgz",
+      "integrity": "sha512-qIC6mrlG8RQOPaYLZQiJwqnPchAVGnHWcVDeQxPMPLkM/D5+PC8tuKWYOwgLcEau3RZlgz7QQNk31Qj2/OJG6Q==",
       "engines": {
-        "node": ">=14"
-      },
-      "funding": {
-        "url": "https://github.com/prettier/prettier?sponsor=1"
+        "node": ">=18"
       }
     },
-    "node_modules/@storybook/cli/node_modules/recast": {
-      "version": "0.23.6",
-      "resolved": "https://registry.npmjs.org/recast/-/recast-0.23.6.tgz",
-      "integrity": "sha512-9FHoNjX1yjuesMwuthAmPKabxYQdOgihFYmT5ebXfYGBcnqXZf3WOVz+5foEZ8Y83P4ZY6yQD5GMmtV+pgCCAQ==",
+    "node_modules/@react-native/community-cli-plugin/node_modules/@react-native/dev-middleware": {
+      "version": "0.75.2",
+      "resolved": "https://registry.npmjs.org/@react-native/dev-middleware/-/dev-middleware-0.75.2.tgz",
+      "integrity": "sha512-fTC5m2uVjYp1XPaIJBFgscnQjPdGVsl96z/RfLgXDq0HBffyqbg29ttx6yTCx7lIa9Gdvf6nKQom+e+Oa4izSw==",
       "dependencies": {
-        "ast-types": "^0.16.1",
-        "esprima": "~4.0.0",
-        "source-map": "~0.6.1",
-        "tiny-invariant": "^1.3.3",
-        "tslib": "^2.0.1"
+        "@isaacs/ttlcache": "^1.4.1",
+        "@react-native/debugger-frontend": "0.75.2",
+        "chrome-launcher": "^0.15.2",
+        "chromium-edge-launcher": "^0.2.0",
+        "connect": "^3.6.5",
+        "debug": "^2.2.0",
+        "node-fetch": "^2.2.0",
+        "nullthrows": "^1.1.1",
+        "open": "^7.0.3",
+        "selfsigned": "^2.4.1",
+        "serve-static": "^1.13.1",
+        "ws": "^6.2.2"
       },
       "engines": {
-        "node": ">= 4"
+        "node": ">=18"
       }
     },
-    "node_modules/@storybook/cli/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==",
+    "node_modules/@react-native/community-cli-plugin/node_modules/@react-native/dev-middleware/node_modules/open": {
+      "version": "7.4.2",
+      "resolved": "https://registry.npmjs.org/open/-/open-7.4.2.tgz",
+      "integrity": "sha512-MVHddDVweXZF3awtlAS+6pgKLlm/JgxZ90+/NBurBoQctVOOB/zDdVjcyPzQ+0laDGbsWgrRkflI65sQeOgT9Q==",
       "dependencies": {
-        "has-flag": "^4.0.0"
+        "is-docker": "^2.0.0",
+        "is-wsl": "^2.1.1"
       },
       "engines": {
         "node": ">=8"
-      }
-    },
-    "node_modules/@storybook/cli/node_modules/tempy": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/tempy/-/tempy-1.0.1.tgz",
-      "integrity": "sha512-biM9brNqxSc04Ee71hzFbryD11nX7VPhQQY32AdDmjFvodsRFz/3ufeoTZ6uYkRFfGo188tENcASNs3vTdsM0w==",
-      "dependencies": {
-        "del": "^6.0.0",
-        "is-stream": "^2.0.0",
-        "temp-dir": "^2.0.0",
-        "type-fest": "^0.16.0",
-        "unique-string": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/@storybook/cli/node_modules/type-fest": {
-      "version": "0.16.0",
-      "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.16.0.tgz",
-      "integrity": "sha512-eaBzG6MxNzEn9kiwvtre90cXaNLkmadMWa1zQMs3XORCXNbsH/OewwbxC5ia9dCxIxnTAsSxXJaa/p5y8DlvJg==",
-      "engines": {
-        "node": ">=10"
       },
       "funding": {
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/@storybook/client-logger": {
-      "version": "8.0.6",
-      "resolved": "https://registry.npmjs.org/@storybook/client-logger/-/client-logger-8.0.6.tgz",
-      "integrity": "sha512-et/IHPHiiOwMg93l5KSgw47NZXz5xOyIrIElRcsT1wr8OJeIB9DzopB/suoHBZ/IML+t8x91atdutzUN2BLF6A==",
+    "node_modules/@react-native/community-cli-plugin/node_modules/@types/yargs": {
+      "version": "15.0.19",
+      "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-15.0.19.tgz",
+      "integrity": "sha512-2XUaGVmyQjgyAZldf0D0c14vvo/yv0MhQBSTJcejMMaitsn3nxCB6TmH4G0ZQf+uxROOa9mpanoSm8h6SG/1ZA==",
       "dependencies": {
-        "@storybook/global": "^5.0.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/storybook"
+        "@types/yargs-parser": "*"
       }
     },
-    "node_modules/@storybook/codemod": {
-      "version": "8.0.6",
-      "resolved": "https://registry.npmjs.org/@storybook/codemod/-/codemod-8.0.6.tgz",
-      "integrity": "sha512-IMaTVI+EvmFxkz4leKWKForPC3LFxzfeTmd/QnTNF3nCeyvmIXvP01pQXRjro0+XcGDncEStuxa1d9ClMlac9Q==",
-      "dependencies": {
-        "@babel/core": "^7.23.2",
-        "@babel/preset-env": "^7.23.2",
-        "@babel/types": "^7.23.0",
-        "@storybook/csf": "^0.1.2",
-        "@storybook/csf-tools": "8.0.6",
-        "@storybook/node-logger": "8.0.6",
-        "@storybook/types": "8.0.6",
-        "@types/cross-spawn": "^6.0.2",
-        "cross-spawn": "^7.0.3",
-        "globby": "^11.0.2",
-        "jscodeshift": "^0.15.1",
-        "lodash": "^4.17.21",
-        "prettier": "^3.1.1",
-        "recast": "^0.23.5",
-        "tiny-invariant": "^1.3.1"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/storybook"
+    "node_modules/@react-native/community-cli-plugin/node_modules/ansi-regex": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
+      "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==",
+      "engines": {
+        "node": ">=8"
       }
     },
-    "node_modules/@storybook/codemod/node_modules/ansi-styles": {
+    "node_modules/@react-native/community-cli-plugin/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==",
@@ -10160,7 +9849,7 @@
         "url": "https://github.com/chalk/ansi-styles?sponsor=1"
       }
     },
-    "node_modules/@storybook/codemod/node_modules/chalk": {
+    "node_modules/@react-native/community-cli-plugin/node_modules/chalk": {
       "version": "4.1.2",
       "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
       "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
@@ -10175,7 +9864,20 @@
         "url": "https://github.com/chalk/chalk?sponsor=1"
       }
     },
-    "node_modules/@storybook/codemod/node_modules/color-convert": {
+    "node_modules/@react-native/community-cli-plugin/node_modules/chromium-edge-launcher": {
+      "version": "0.2.0",
+      "resolved": "https://registry.npmjs.org/chromium-edge-launcher/-/chromium-edge-launcher-0.2.0.tgz",
+      "integrity": "sha512-JfJjUnq25y9yg4FABRRVPmBGWPZZi+AQXT4mxupb67766/0UlhG8PAZCz6xzEMXTbW3CsSoE8PcCWA49n35mKg==",
+      "dependencies": {
+        "@types/node": "*",
+        "escape-string-regexp": "^4.0.0",
+        "is-wsl": "^2.2.0",
+        "lighthouse-logger": "^1.0.0",
+        "mkdirp": "^1.0.4",
+        "rimraf": "^3.0.2"
+      }
+    },
+    "node_modules/@react-native/community-cli-plugin/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==",
@@ -10186,12 +9888,20 @@
         "node": ">=7.0.0"
       }
     },
-    "node_modules/@storybook/codemod/node_modules/color-name": {
+    "node_modules/@react-native/community-cli-plugin/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=="
     },
-    "node_modules/@storybook/codemod/node_modules/has-flag": {
+    "node_modules/@react-native/community-cli-plugin/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/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==",
@@ -10199,74 +9909,59 @@
         "node": ">=8"
       }
     },
-    "node_modules/@storybook/codemod/node_modules/jscodeshift": {
-      "version": "0.15.2",
-      "resolved": "https://registry.npmjs.org/jscodeshift/-/jscodeshift-0.15.2.tgz",
-      "integrity": "sha512-FquR7Okgmc4Sd0aEDwqho3rEiKR3BdvuG9jfdHjLJ6JQoWSMpavug3AoIfnfWhxFlf+5pzQh8qjqz0DWFrNQzA==",
+    "node_modules/@react-native/community-cli-plugin/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/node_modules/open": {
+      "version": "6.4.0",
+      "resolved": "https://registry.npmjs.org/open/-/open-6.4.0.tgz",
+      "integrity": "sha512-IFenVPgF70fSm1keSd2iDBIDIBZkroLeuffXq+wKTzTJlBpesFWojV9lb8mzOfaAzM1sr7HQHuO0vtV0zYekGg==",
       "dependencies": {
-        "@babel/core": "^7.23.0",
-        "@babel/parser": "^7.23.0",
-        "@babel/plugin-transform-class-properties": "^7.22.5",
-        "@babel/plugin-transform-modules-commonjs": "^7.23.0",
-        "@babel/plugin-transform-nullish-coalescing-operator": "^7.22.11",
-        "@babel/plugin-transform-optional-chaining": "^7.23.0",
-        "@babel/plugin-transform-private-methods": "^7.22.5",
-        "@babel/preset-flow": "^7.22.15",
-        "@babel/preset-typescript": "^7.23.0",
-        "@babel/register": "^7.22.15",
-        "babel-core": "^7.0.0-bridge.0",
-        "chalk": "^4.1.2",
-        "flow-parser": "0.*",
-        "graceful-fs": "^4.2.4",
-        "micromatch": "^4.0.4",
-        "neo-async": "^2.5.0",
-        "node-dir": "^0.1.17",
-        "recast": "^0.23.3",
-        "temp": "^0.8.4",
-        "write-file-atomic": "^2.3.0"
-      },
-      "bin": {
-        "jscodeshift": "bin/jscodeshift.js"
-      },
-      "peerDependencies": {
-        "@babel/preset-env": "^7.1.6"
+        "is-wsl": "^1.1.0"
       },
-      "peerDependenciesMeta": {
-        "@babel/preset-env": {
-          "optional": true
-        }
+      "engines": {
+        "node": ">=8"
       }
     },
-    "node_modules/@storybook/codemod/node_modules/prettier": {
-      "version": "3.2.5",
-      "resolved": "https://registry.npmjs.org/prettier/-/prettier-3.2.5.tgz",
-      "integrity": "sha512-3/GWa9aOC0YeD7LUfvOG2NiDyhOWRvt1k+rcKhOuYnMY24iiCphgneUfJDyFXd6rZCAnuLBv6UeAULtrhT/F4A==",
-      "bin": {
-        "prettier": "bin/prettier.cjs"
-      },
+    "node_modules/@react-native/community-cli-plugin/node_modules/open/node_modules/is-wsl": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/is-wsl/-/is-wsl-1.1.0.tgz",
+      "integrity": "sha512-gfygJYZ2gLTDlmbWMI0CE2MwnFzSN/2SZfkMlItC4K/JBlsWVDB0bO6XhqcY13YXE7iMcAJnzTCJjPiTeJJ0Mw==",
       "engines": {
-        "node": ">=14"
-      },
-      "funding": {
-        "url": "https://github.com/prettier/prettier?sponsor=1"
+        "node": ">=4"
       }
     },
-    "node_modules/@storybook/codemod/node_modules/recast": {
-      "version": "0.23.6",
-      "resolved": "https://registry.npmjs.org/recast/-/recast-0.23.6.tgz",
-      "integrity": "sha512-9FHoNjX1yjuesMwuthAmPKabxYQdOgihFYmT5ebXfYGBcnqXZf3WOVz+5foEZ8Y83P4ZY6yQD5GMmtV+pgCCAQ==",
+    "node_modules/@react-native/community-cli-plugin/node_modules/pretty-format": {
+      "version": "26.6.2",
+      "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-26.6.2.tgz",
+      "integrity": "sha512-7AeGuCYNGmycyQbCqd/3PWH4eOoX/OiCa0uphp57NVTeAGdJGaAliecxwBDHYQCIvrW7aDBZCYeNTP/WX69mkg==",
       "dependencies": {
-        "ast-types": "^0.16.1",
-        "esprima": "~4.0.0",
-        "source-map": "~0.6.1",
-        "tiny-invariant": "^1.3.3",
-        "tslib": "^2.0.1"
+        "@jest/types": "^26.6.2",
+        "ansi-regex": "^5.0.0",
+        "ansi-styles": "^4.0.0",
+        "react-is": "^17.0.1"
       },
       "engines": {
-        "node": ">= 4"
+        "node": ">= 10"
       }
     },
-    "node_modules/@storybook/codemod/node_modules/supports-color": {
+    "node_modules/@react-native/community-cli-plugin/node_modules/querystring": {
+      "version": "0.2.1",
+      "resolved": "https://registry.npmjs.org/querystring/-/querystring-0.2.1.tgz",
+      "integrity": "sha512-wkvS7mL/JMugcup3/rMitHmd9ecIGd2lhFhK9N3UUQ450h66d1r3Y9nvXzQAW1Lq+wyx61k/1pfKS5KuKiyEbg==",
+      "deprecated": "The querystring API is considered Legacy. new code should use the URLSearchParams API instead.",
+      "engines": {
+        "node": ">=0.4.x"
+      }
+    },
+    "node_modules/@react-native/community-cli-plugin/node_modules/react-is": {
+      "version": "17.0.2",
+      "resolved": "https://registry.npmjs.org/react-is/-/react-is-17.0.2.tgz",
+      "integrity": "sha512-w2GsyukL62IJnlaff/nRegPQR94C/XXamvMWmSHRJ4y7Ts/4ocGRmTHvOs8PSE6pB3dWOrD/nueuU5sduBsQ4w=="
+    },
+    "node_modules/@react-native/community-cli-plugin/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==",
@@ -10277,545 +9972,569 @@
         "node": ">=8"
       }
     },
-    "node_modules/@storybook/components": {
-      "version": "8.0.6",
-      "resolved": "https://registry.npmjs.org/@storybook/components/-/components-8.0.6.tgz",
-      "integrity": "sha512-6W2BAqAPJkrExk8D/ug2NPBPvMs05p6Bdt9tk3eWjiMrhG/CUKBzlBTEfNK/mzy3YVB6ijyT2DgsqzmWWYJ/Xw==",
+    "node_modules/@react-native/community-cli-plugin/node_modules/ws": {
+      "version": "6.2.3",
+      "resolved": "https://registry.npmjs.org/ws/-/ws-6.2.3.tgz",
+      "integrity": "sha512-jmTjYU0j60B+vHey6TfR3Z7RD61z/hmxBS3VMSGIrroOWXQEneK1zNuotOUrGyBHQj0yrpsLHPWtigEFd13ndA==",
       "dependencies": {
-        "@radix-ui/react-slot": "^1.0.2",
-        "@storybook/client-logger": "8.0.6",
-        "@storybook/csf": "^0.1.2",
-        "@storybook/global": "^5.0.0",
-        "@storybook/icons": "^1.2.5",
-        "@storybook/theming": "8.0.6",
-        "@storybook/types": "8.0.6",
-        "memoizerific": "^1.11.3",
-        "util-deprecate": "^1.0.2"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/storybook"
-      },
-      "peerDependencies": {
-        "react": "^16.8.0 || ^17.0.0 || ^18.0.0",
-        "react-dom": "^16.8.0 || ^17.0.0 || ^18.0.0"
+        "async-limiter": "~1.0.0"
       }
     },
-    "node_modules/@storybook/core-common": {
-      "version": "8.0.6",
-      "resolved": "https://registry.npmjs.org/@storybook/core-common/-/core-common-8.0.6.tgz",
-      "integrity": "sha512-Z4cA52SjcW6SAV9hayqVm5kyr362O20Zmwz7+H2nYEhcu8bY69y5p45aaoyElMxL1GDNu84GrmTp7dY4URw1fQ==",
-      "dependencies": {
-        "@storybook/core-events": "8.0.6",
-        "@storybook/csf-tools": "8.0.6",
-        "@storybook/node-logger": "8.0.6",
-        "@storybook/types": "8.0.6",
-        "@yarnpkg/fslib": "2.10.3",
-        "@yarnpkg/libzip": "2.3.0",
-        "chalk": "^4.1.0",
-        "cross-spawn": "^7.0.3",
-        "esbuild": "^0.18.0 || ^0.19.0 || ^0.20.0",
-        "esbuild-register": "^3.5.0",
-        "execa": "^5.0.0",
-        "file-system-cache": "2.3.0",
-        "find-cache-dir": "^3.0.0",
-        "find-up": "^5.0.0",
-        "fs-extra": "^11.1.0",
-        "glob": "^10.0.0",
-        "handlebars": "^4.7.7",
-        "lazy-universal-dotenv": "^4.0.0",
-        "node-fetch": "^2.0.0",
-        "picomatch": "^2.3.0",
-        "pkg-dir": "^5.0.0",
-        "pretty-hrtime": "^1.0.3",
-        "resolve-from": "^5.0.0",
-        "semver": "^7.3.7",
-        "tempy": "^1.0.1",
-        "tiny-invariant": "^1.3.1",
-        "ts-dedent": "^2.0.0",
-        "util": "^0.12.4"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/storybook"
+    "node_modules/@react-native/debugger-frontend": {
+      "version": "0.74.84",
+      "license": "BSD-3-Clause",
+      "engines": {
+        "node": ">=18"
       }
     },
-    "node_modules/@storybook/core-common/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==",
+    "node_modules/@react-native/dev-middleware": {
+      "version": "0.74.84",
+      "license": "MIT",
       "dependencies": {
-        "color-convert": "^2.0.1"
+        "@isaacs/ttlcache": "^1.4.1",
+        "@react-native/debugger-frontend": "0.74.84",
+        "@rnx-kit/chromium-edge-launcher": "^1.0.0",
+        "chrome-launcher": "^0.15.2",
+        "connect": "^3.6.5",
+        "debug": "^2.2.0",
+        "node-fetch": "^2.2.0",
+        "nullthrows": "^1.1.1",
+        "open": "^7.0.3",
+        "selfsigned": "^2.4.1",
+        "serve-static": "^1.13.1",
+        "temp-dir": "^2.0.0",
+        "ws": "^6.2.2"
       },
       "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
+        "node": ">=18"
       }
     },
-    "node_modules/@storybook/core-common/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==",
+    "node_modules/@react-native/dev-middleware/node_modules/debug": {
+      "version": "2.6.9",
+      "license": "MIT",
       "dependencies": {
-        "balanced-match": "^1.0.0"
+        "ms": "2.0.0"
       }
     },
-    "node_modules/@storybook/core-common/node_modules/chalk": {
-      "version": "4.1.2",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
-      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
+    "node_modules/@react-native/dev-middleware/node_modules/ms": {
+      "version": "2.0.0",
+      "license": "MIT"
+    },
+    "node_modules/@react-native/dev-middleware/node_modules/open": {
+      "version": "7.4.2",
+      "license": "MIT",
       "dependencies": {
-        "ansi-styles": "^4.1.0",
-        "supports-color": "^7.1.0"
+        "is-docker": "^2.0.0",
+        "is-wsl": "^2.1.1"
       },
       "engines": {
-        "node": ">=10"
+        "node": ">=8"
       },
       "funding": {
-        "url": "https://github.com/chalk/chalk?sponsor=1"
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/@storybook/core-common/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==",
+    "node_modules/@react-native/dev-middleware/node_modules/ws": {
+      "version": "6.2.2",
+      "license": "MIT",
       "dependencies": {
-        "color-name": "~1.1.4"
-      },
+        "async-limiter": "~1.0.0"
+      }
+    },
+    "node_modules/@react-native/gradle-plugin": {
+      "version": "0.75.2",
+      "resolved": "https://registry.npmjs.org/@react-native/gradle-plugin/-/gradle-plugin-0.75.2.tgz",
+      "integrity": "sha512-AELeAOCZi3B2vE6SeN+mjpZjjqzqa76yfFBB3L3f3NWiu4dm/YClTGOj+5IVRRgbt8LDuRImhDoaj7ukheXr4Q==",
       "engines": {
-        "node": ">=7.0.0"
+        "node": ">=18"
       }
     },
-    "node_modules/@storybook/core-common/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=="
+    "node_modules/@react-native/js-polyfills": {
+      "version": "0.75.2",
+      "resolved": "https://registry.npmjs.org/@react-native/js-polyfills/-/js-polyfills-0.75.2.tgz",
+      "integrity": "sha512-AtLd3mbiE+FXK2Ru3l2NFOXDhUvzdUsCP4qspUw0haVaO/9xzV97RVD2zz0lur2f/LmZqQ2+KXyYzr7048b5iw==",
+      "engines": {
+        "node": ">=18"
+      }
     },
-    "node_modules/@storybook/core-common/node_modules/del": {
-      "version": "6.1.1",
-      "resolved": "https://registry.npmjs.org/del/-/del-6.1.1.tgz",
-      "integrity": "sha512-ua8BhapfP0JUJKC/zV9yHHDW/rDoDxP4Zhn3AkA6/xT6gY7jYXJiaeyBZznYVujhZZET+UgcbZiQ7sN3WqcImg==",
+    "node_modules/@react-native/metro-babel-transformer": {
+      "version": "0.75.2",
+      "resolved": "https://registry.npmjs.org/@react-native/metro-babel-transformer/-/metro-babel-transformer-0.75.2.tgz",
+      "integrity": "sha512-EygglCCuOub2sZ00CSIiEekCXoGL2XbOC6ssOB47M55QKvhdPG/0WBQXvmOmiN42uZgJK99Lj749v4rB0PlPIQ==",
       "dependencies": {
-        "globby": "^11.0.1",
-        "graceful-fs": "^4.2.4",
-        "is-glob": "^4.0.1",
-        "is-path-cwd": "^2.2.0",
-        "is-path-inside": "^3.0.2",
-        "p-map": "^4.0.0",
-        "rimraf": "^3.0.2",
-        "slash": "^3.0.0"
+        "@babel/core": "^7.20.0",
+        "@react-native/babel-preset": "0.75.2",
+        "hermes-parser": "0.22.0",
+        "nullthrows": "^1.1.1"
       },
       "engines": {
-        "node": ">=10"
+        "node": ">=18"
       },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
+      "peerDependencies": {
+        "@babel/core": "*"
       }
     },
-    "node_modules/@storybook/core-common/node_modules/find-cache-dir": {
-      "version": "3.3.2",
-      "resolved": "https://registry.npmjs.org/find-cache-dir/-/find-cache-dir-3.3.2.tgz",
-      "integrity": "sha512-wXZV5emFEjrridIgED11OoUKLxiYjAcqot/NJdAkOhlJ+vGzwhOAfcG5OX1jP+S0PcjEn8bdMJv+g2jwQ3Onig==",
+    "node_modules/@react-native/metro-config": {
+      "version": "0.75.2",
+      "resolved": "https://registry.npmjs.org/@react-native/metro-config/-/metro-config-0.75.2.tgz",
+      "integrity": "sha512-LBcNF0csApOirPVmRhIAAb4ovAXDhn0Dbli5LMaLCosgQwJuhb05z7s1weavcAylPPUS7DuICUQpMoRU6hZzeQ==",
+      "dev": true,
       "dependencies": {
-        "commondir": "^1.0.1",
-        "make-dir": "^3.0.2",
-        "pkg-dir": "^4.1.0"
+        "@react-native/js-polyfills": "0.75.2",
+        "@react-native/metro-babel-transformer": "0.75.2",
+        "metro-config": "^0.80.3",
+        "metro-runtime": "^0.80.3"
       },
       "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/avajs/find-cache-dir?sponsor=1"
+        "node": ">=18"
       }
     },
-    "node_modules/@storybook/core-common/node_modules/find-cache-dir/node_modules/find-up": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz",
-      "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==",
+    "node_modules/@react-native/normalize-color": {
+      "version": "2.1.0",
+      "license": "MIT"
+    },
+    "node_modules/@react-native/normalize-colors": {
+      "version": "0.74.84",
+      "license": "MIT"
+    },
+    "node_modules/@react-native/virtualized-lists": {
+      "version": "0.75.2",
+      "resolved": "https://registry.npmjs.org/@react-native/virtualized-lists/-/virtualized-lists-0.75.2.tgz",
+      "integrity": "sha512-pD5SVCjxc8k+JdoyQ+IlulBTEqJc3S4KUKsmv5zqbNCyETB0ZUvd4Su7bp+lLF6ALxx6KKmbGk8E3LaWEjUFFQ==",
       "dependencies": {
-        "locate-path": "^5.0.0",
-        "path-exists": "^4.0.0"
+        "invariant": "^2.2.4",
+        "nullthrows": "^1.1.1"
       },
       "engines": {
-        "node": ">=8"
+        "node": ">=18"
+      },
+      "peerDependencies": {
+        "@types/react": "^18.2.6",
+        "react": "*",
+        "react-native": "*"
+      },
+      "peerDependenciesMeta": {
+        "@types/react": {
+          "optional": true
+        }
       }
     },
-    "node_modules/@storybook/core-common/node_modules/find-cache-dir/node_modules/pkg-dir": {
-      "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-4.2.0.tgz",
-      "integrity": "sha512-HRDzbaKjC+AOWVXxAU/x54COGeIv9eb+6CkDSQoNTt4XyWoIJvuPsXizxu/Fr23EiekbtZwmh1IcIG/l/a10GQ==",
+    "node_modules/@react-navigation/core": {
+      "version": "6.4.11",
+      "license": "MIT",
       "dependencies": {
-        "find-up": "^4.0.0"
+        "@react-navigation/routers": "^6.1.9",
+        "escape-string-regexp": "^4.0.0",
+        "nanoid": "^3.1.23",
+        "query-string": "^7.1.3",
+        "react-is": "^16.13.0",
+        "use-latest-callback": "^0.1.7"
       },
-      "engines": {
-        "node": ">=8"
+      "peerDependencies": {
+        "react": "*"
       }
     },
-    "node_modules/@storybook/core-common/node_modules/fs-extra": {
-      "version": "11.2.0",
-      "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-11.2.0.tgz",
-      "integrity": "sha512-PmDi3uwK5nFuXh7XDTlVnS17xJS7vW36is2+w3xcv8SVxiB4NyATf4ctkVY5bkSjX0Y4nbvZCq1/EjtEyr9ktw==",
+    "node_modules/@react-navigation/core/node_modules/react-is": {
+      "version": "16.13.1",
+      "license": "MIT"
+    },
+    "node_modules/@react-navigation/devtools": {
+      "version": "6.0.10",
+      "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "graceful-fs": "^4.2.0",
-        "jsonfile": "^6.0.1",
-        "universalify": "^2.0.0"
+        "deep-equal": "^2.0.5",
+        "nanoid": "^3.1.23",
+        "stacktrace-parser": "^0.1.10"
       },
-      "engines": {
-        "node": ">=14.14"
+      "peerDependencies": {
+        "react": "*"
       }
     },
-    "node_modules/@storybook/core-common/node_modules/glob": {
-      "version": "10.3.12",
-      "resolved": "https://registry.npmjs.org/glob/-/glob-10.3.12.tgz",
-      "integrity": "sha512-TCNv8vJ+xz4QiqTpfOJA7HvYv+tNIRHKfUWw/q+v2jdgN4ebz+KY9tGx5J4rHP0o84mNP+ApH66HRX8us3Khqg==",
+    "node_modules/@react-navigation/material-top-tabs": {
+      "version": "6.6.3",
+      "license": "MIT",
       "dependencies": {
-        "foreground-child": "^3.1.0",
-        "jackspeak": "^2.3.6",
-        "minimatch": "^9.0.1",
-        "minipass": "^7.0.4",
-        "path-scurry": "^1.10.2"
-      },
-      "bin": {
-        "glob": "dist/esm/bin.mjs"
-      },
-      "engines": {
-        "node": ">=16 || 14 >=14.17"
+        "color": "^4.2.3",
+        "warn-once": "^0.1.0"
       },
-      "funding": {
-        "url": "https://github.com/sponsors/isaacs"
+      "peerDependencies": {
+        "@react-navigation/native": "^6.0.0",
+        "react": "*",
+        "react-native": "*",
+        "react-native-pager-view": ">= 4.0.0",
+        "react-native-tab-view": ">= 3.0.0"
       }
     },
-    "node_modules/@storybook/core-common/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==",
-      "engines": {
-        "node": ">=8"
+    "node_modules/@react-navigation/native": {
+      "version": "6.1.12",
+      "license": "MIT",
+      "dependencies": {
+        "@react-navigation/core": "^6.4.11",
+        "escape-string-regexp": "^4.0.0",
+        "fast-deep-equal": "^3.1.3",
+        "nanoid": "^3.1.23"
+      },
+      "peerDependencies": {
+        "react": "*",
+        "react-native": "*"
       }
     },
-    "node_modules/@storybook/core-common/node_modules/is-path-inside": {
-      "version": "3.0.3",
-      "resolved": "https://registry.npmjs.org/is-path-inside/-/is-path-inside-3.0.3.tgz",
-      "integrity": "sha512-Fd4gABb+ycGAmKou8eMftCupSir5lRxqf4aD/vd0cD2qc4HL07OjCeuHMr8Ro4CoMaeCKDB0/ECBOVWjTwUvPQ==",
-      "engines": {
-        "node": ">=8"
+    "node_modules/@react-navigation/routers": {
+      "version": "6.1.9",
+      "license": "MIT",
+      "dependencies": {
+        "nanoid": "^3.1.23"
       }
     },
-    "node_modules/@storybook/core-common/node_modules/locate-path": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz",
-      "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==",
+    "node_modules/@react-navigation/stack": {
+      "version": "6.3.29",
+      "license": "MIT",
       "dependencies": {
-        "p-locate": "^4.1.0"
+        "@react-navigation/elements": "^1.3.30",
+        "color": "^4.2.3",
+        "warn-once": "^0.1.0"
       },
-      "engines": {
-        "node": ">=8"
+      "peerDependencies": {
+        "@react-navigation/native": "^6.0.0",
+        "react": "*",
+        "react-native": "*",
+        "react-native-gesture-handler": ">= 1.0.0",
+        "react-native-safe-area-context": ">= 3.0.0",
+        "react-native-screens": ">= 3.0.0"
       }
     },
-    "node_modules/@storybook/core-common/node_modules/make-dir": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-3.1.0.tgz",
-      "integrity": "sha512-g3FeP20LNwhALb/6Cz6Dd4F2ngze0jz7tbzrD2wAV+o9FeNHe4rL+yK2md0J/fiSf1sa1ADhXqi5+oVwOM/eGw==",
-      "dependencies": {
-        "semver": "^6.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
+    "node_modules/@react-navigation/stack/node_modules/@react-navigation/elements": {
+      "version": "1.3.30",
+      "license": "MIT",
+      "peerDependencies": {
+        "@react-navigation/native": "^6.0.0",
+        "react": "*",
+        "react-native": "*",
+        "react-native-safe-area-context": ">= 3.0.0"
       }
     },
-    "node_modules/@storybook/core-common/node_modules/make-dir/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-ng/bounds-observer": {
+      "version": "0.2.1",
+      "license": "Apache-2.0",
+      "dependencies": {
+        "@html-ng/bounding-client-rect-observer": "^0.1.3",
+        "@types/react": "^18.0.31",
+        "@types/react-dom": "^18.0.11",
+        "react": "^18.2.0",
+        "react-dom": "^18.2.0"
       }
     },
-    "node_modules/@storybook/core-common/node_modules/minimatch": {
-      "version": "9.0.4",
-      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.4.tgz",
-      "integrity": "sha512-KqWh+VchfxcMNRAJjj2tnsSJdNbHsVgnkBhTNrW7AjVo6OvLtxw8zfT9oLw1JSohlFzJ8jCoTgaoXvJ+kHt6fw==",
+    "node_modules/@rnmapbox/maps": {
+      "version": "10.1.26",
+      "license": "MIT",
       "dependencies": {
-        "brace-expansion": "^2.0.1"
+        "@turf/along": "6.5.0",
+        "@turf/distance": "6.5.0",
+        "@turf/helpers": "6.5.0",
+        "@turf/length": "6.5.0",
+        "@turf/nearest-point-on-line": "6.5.0",
+        "@types/geojson": "^7946.0.7",
+        "debounce": "^1.2.0"
       },
-      "engines": {
-        "node": ">=16 || 14 >=14.17"
+      "peerDependencies": {
+        "expo": ">=47.0.0",
+        "mapbox-gl": "^2.9.0",
+        "react": ">=16.6.1",
+        "react-dom": ">= 17.0.0",
+        "react-native": ">=0.59.9"
       },
-      "funding": {
-        "url": "https://github.com/sponsors/isaacs"
-      }
-    },
-    "node_modules/@storybook/core-common/node_modules/minipass": {
-      "version": "7.0.4",
-      "resolved": "https://registry.npmjs.org/minipass/-/minipass-7.0.4.tgz",
-      "integrity": "sha512-jYofLM5Dam9279rdkWzqHozUo4ybjdZmCsDHePy5V/PbBcVMiSZR97gmAy45aqi8CK1lG2ECd356FU86avfwUQ==",
-      "engines": {
-        "node": ">=16 || 14 >=14.17"
+      "peerDependenciesMeta": {
+        "expo": {
+          "optional": true
+        },
+        "mapbox-gl": {
+          "optional": true
+        },
+        "react-dom": {
+          "optional": true
+        }
       }
     },
-    "node_modules/@storybook/core-common/node_modules/p-limit": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz",
-      "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==",
+    "node_modules/@rnx-kit/chromium-edge-launcher": {
+      "version": "1.0.0",
+      "license": "Apache-2.0",
       "dependencies": {
-        "p-try": "^2.0.0"
+        "@types/node": "^18.0.0",
+        "escape-string-regexp": "^4.0.0",
+        "is-wsl": "^2.2.0",
+        "lighthouse-logger": "^1.0.0",
+        "mkdirp": "^1.0.4",
+        "rimraf": "^3.0.2"
       },
       "engines": {
-        "node": ">=6"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
+        "node": ">=14.15"
       }
     },
-    "node_modules/@storybook/core-common/node_modules/p-locate": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz",
-      "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==",
+    "node_modules/@rnx-kit/chromium-edge-launcher/node_modules/@types/node": {
+      "version": "18.19.31",
+      "license": "MIT",
       "dependencies": {
-        "p-limit": "^2.2.0"
-      },
-      "engines": {
-        "node": ">=8"
+        "undici-types": "~5.26.4"
       }
     },
-    "node_modules/@storybook/core-common/node_modules/path-exists": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz",
-      "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==",
-      "engines": {
-        "node": ">=8"
+    "node_modules/@segment/loosely-validate-event": {
+      "version": "2.0.0",
+      "dependencies": {
+        "component-type": "^1.2.1",
+        "join-component": "^1.1.0"
       }
     },
-    "node_modules/@storybook/core-common/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==",
+    "node_modules/@shopify/flash-list": {
+      "version": "1.6.3",
+      "license": "MIT",
       "dependencies": {
-        "has-flag": "^4.0.0"
+        "recyclerlistview": "4.2.0",
+        "tslib": "2.4.0"
       },
-      "engines": {
-        "node": ">=8"
+      "peerDependencies": {
+        "@babel/runtime": "*",
+        "react": "*",
+        "react-native": "*"
       }
     },
-    "node_modules/@storybook/core-common/node_modules/tempy": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/tempy/-/tempy-1.0.1.tgz",
-      "integrity": "sha512-biM9brNqxSc04Ee71hzFbryD11nX7VPhQQY32AdDmjFvodsRFz/3ufeoTZ6uYkRFfGo188tENcASNs3vTdsM0w==",
+    "node_modules/@shopify/flash-list/node_modules/recyclerlistview": {
+      "version": "4.2.0",
+      "license": "Apache-2.0",
       "dependencies": {
-        "del": "^6.0.0",
-        "is-stream": "^2.0.0",
-        "temp-dir": "^2.0.0",
-        "type-fest": "^0.16.0",
-        "unique-string": "^2.0.0"
+        "lodash.debounce": "4.0.8",
+        "prop-types": "15.8.1",
+        "ts-object-utils": "0.0.5"
       },
+      "peerDependencies": {
+        "react": ">= 15.2.1",
+        "react-native": ">= 0.30.0"
+      }
+    },
+    "node_modules/@sideway/address": {
+      "version": "4.1.5",
+      "license": "BSD-3-Clause",
+      "dependencies": {
+        "@hapi/hoek": "^9.0.0"
+      }
+    },
+    "node_modules/@sideway/formula": {
+      "version": "3.0.1",
+      "license": "BSD-3-Clause"
+    },
+    "node_modules/@sideway/pinpoint": {
+      "version": "2.0.0",
+      "license": "BSD-3-Clause"
+    },
+    "node_modules/@sinclair/typebox": {
+      "version": "0.27.8",
+      "license": "MIT"
+    },
+    "node_modules/@sindresorhus/is": {
+      "version": "4.6.0",
+      "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=10"
       },
       "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
+        "url": "https://github.com/sindresorhus/is?sponsor=1"
       }
     },
-    "node_modules/@storybook/core-common/node_modules/type-fest": {
-      "version": "0.16.0",
-      "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.16.0.tgz",
-      "integrity": "sha512-eaBzG6MxNzEn9kiwvtre90cXaNLkmadMWa1zQMs3XORCXNbsH/OewwbxC5ia9dCxIxnTAsSxXJaa/p5y8DlvJg==",
+    "node_modules/@sindresorhus/merge-streams": {
+      "version": "2.3.0",
+      "dev": true,
+      "license": "MIT",
       "engines": {
-        "node": ">=10"
+        "node": ">=18"
       },
       "funding": {
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/@storybook/core-common/node_modules/util": {
-      "version": "0.12.5",
-      "resolved": "https://registry.npmjs.org/util/-/util-0.12.5.tgz",
-      "integrity": "sha512-kZf/K6hEIrWHI6XqOFUiiMa+79wE/D8Q+NCNAWclkyg3b4d2k7s0QGepNjiABc+aR3N1PAyHL7p6UcLY6LmrnA==",
+    "node_modules/@sinonjs/commons": {
+      "version": "2.0.0",
+      "license": "BSD-3-Clause",
       "dependencies": {
-        "inherits": "^2.0.3",
-        "is-arguments": "^1.0.4",
-        "is-generator-function": "^1.0.7",
-        "is-typed-array": "^1.1.3",
-        "which-typed-array": "^1.1.2"
+        "type-detect": "4.0.8"
       }
     },
-    "node_modules/@storybook/core-events": {
-      "version": "8.0.6",
-      "resolved": "https://registry.npmjs.org/@storybook/core-events/-/core-events-8.0.6.tgz",
-      "integrity": "sha512-EwGmuMm8QTUAHPhab4yftQWoSCX3OzEk6cQdpLtbNFtRRLE9aPZzxhk5Z/d3KhLNSCUAGyCiDt5I9JxTBetT9A==",
+    "node_modules/@sinonjs/fake-timers": {
+      "version": "10.0.2",
+      "license": "BSD-3-Clause",
       "dependencies": {
-        "ts-dedent": "^2.0.0"
+        "@sinonjs/commons": "^2.0.0"
+      }
+    },
+    "node_modules/@storybook/addon-a11y": {
+      "version": "8.1.10",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@storybook/addon-highlight": "8.1.10",
+        "axe-core": "^4.2.0"
       },
       "funding": {
         "type": "opencollective",
         "url": "https://opencollective.com/storybook"
       }
     },
-    "node_modules/@storybook/core-server": {
-      "version": "8.0.6",
-      "resolved": "https://registry.npmjs.org/@storybook/core-server/-/core-server-8.0.6.tgz",
-      "integrity": "sha512-COmcjrry8vZXDh08ZGbfDz2bFB4of5wnwOwYf8uwlVND6HnhQzV22On1s3/p8qw+dKOpjpwDdHWtMnndnPNuqQ==",
+    "node_modules/@storybook/addon-actions": {
+      "version": "8.1.10",
+      "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "@aw-web-design/x-default-browser": "1.4.126",
-        "@babel/core": "^7.23.9",
-        "@discoveryjs/json-ext": "^0.5.3",
-        "@storybook/builder-manager": "8.0.6",
-        "@storybook/channels": "8.0.6",
-        "@storybook/core-common": "8.0.6",
-        "@storybook/core-events": "8.0.6",
-        "@storybook/csf": "^0.1.2",
-        "@storybook/csf-tools": "8.0.6",
-        "@storybook/docs-mdx": "3.0.0",
+        "@storybook/core-events": "8.1.10",
         "@storybook/global": "^5.0.0",
-        "@storybook/manager": "8.0.6",
-        "@storybook/manager-api": "8.0.6",
-        "@storybook/node-logger": "8.0.6",
-        "@storybook/preview-api": "8.0.6",
-        "@storybook/telemetry": "8.0.6",
-        "@storybook/types": "8.0.6",
-        "@types/detect-port": "^1.3.0",
-        "@types/node": "^18.0.0",
-        "@types/pretty-hrtime": "^1.0.0",
-        "@types/semver": "^7.3.4",
-        "better-opn": "^3.0.2",
-        "chalk": "^4.1.0",
-        "cli-table3": "^0.6.1",
-        "compression": "^1.7.4",
-        "detect-port": "^1.3.0",
-        "express": "^4.17.3",
-        "fs-extra": "^11.1.0",
-        "globby": "^11.0.2",
-        "ip": "^2.0.1",
-        "lodash": "^4.17.21",
-        "open": "^8.4.0",
-        "pretty-hrtime": "^1.0.3",
-        "prompts": "^2.4.0",
-        "read-pkg-up": "^7.0.1",
-        "semver": "^7.3.7",
-        "telejson": "^7.2.0",
-        "tiny-invariant": "^1.3.1",
-        "ts-dedent": "^2.0.0",
-        "util": "^0.12.4",
-        "util-deprecate": "^1.0.2",
-        "watchpack": "^2.2.0",
-        "ws": "^8.2.3"
+        "@types/uuid": "^9.0.1",
+        "dequal": "^2.0.2",
+        "polished": "^4.2.2",
+        "uuid": "^9.0.0"
       },
       "funding": {
         "type": "opencollective",
         "url": "https://opencollective.com/storybook"
       }
     },
-    "node_modules/@storybook/core-server/node_modules/@types/node": {
-      "version": "18.19.30",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-18.19.30.tgz",
-      "integrity": "sha512-453z1zPuJLVDbyahaa1sSD5C2sht6ZpHp5rgJNs+H8YGqhluCXcuOUmBYsAo0Tos0cHySJ3lVUGbGgLlqIkpyg==",
-      "dependencies": {
-        "undici-types": "~5.26.4"
-      }
-    },
-    "node_modules/@storybook/core-server/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==",
+    "node_modules/@storybook/addon-actions/node_modules/@storybook/core-events": {
+      "version": "8.1.10",
+      "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "color-convert": "^2.0.1"
-      },
-      "engines": {
-        "node": ">=8"
+        "@storybook/csf": "^0.1.7",
+        "ts-dedent": "^2.0.0"
       },
       "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
+        "type": "opencollective",
+        "url": "https://opencollective.com/storybook"
       }
     },
-    "node_modules/@storybook/core-server/node_modules/chalk": {
-      "version": "4.1.2",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
-      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
+    "node_modules/@storybook/addon-actions/node_modules/uuid": {
+      "version": "9.0.1",
+      "dev": true,
+      "funding": [
+        "https://github.com/sponsors/broofa",
+        "https://github.com/sponsors/ctavan"
+      ],
+      "license": "MIT",
+      "bin": {
+        "uuid": "dist/bin/uuid"
+      }
+    },
+    "node_modules/@storybook/addon-backgrounds": {
+      "version": "8.1.10",
+      "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "ansi-styles": "^4.1.0",
-        "supports-color": "^7.1.0"
-      },
-      "engines": {
-        "node": ">=10"
+        "@storybook/global": "^5.0.0",
+        "memoizerific": "^1.11.3",
+        "ts-dedent": "^2.0.0"
       },
       "funding": {
-        "url": "https://github.com/chalk/chalk?sponsor=1"
+        "type": "opencollective",
+        "url": "https://opencollective.com/storybook"
       }
     },
-    "node_modules/@storybook/core-server/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==",
+    "node_modules/@storybook/addon-controls": {
+      "version": "8.1.10",
+      "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "color-name": "~1.1.4"
+        "@storybook/blocks": "8.1.10",
+        "dequal": "^2.0.2",
+        "lodash": "^4.17.21",
+        "ts-dedent": "^2.0.0"
       },
-      "engines": {
-        "node": ">=7.0.0"
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/storybook"
       }
     },
-    "node_modules/@storybook/core-server/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=="
-    },
-    "node_modules/@storybook/core-server/node_modules/fs-extra": {
-      "version": "11.2.0",
-      "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-11.2.0.tgz",
-      "integrity": "sha512-PmDi3uwK5nFuXh7XDTlVnS17xJS7vW36is2+w3xcv8SVxiB4NyATf4ctkVY5bkSjX0Y4nbvZCq1/EjtEyr9ktw==",
+    "node_modules/@storybook/addon-docs": {
+      "version": "8.1.10",
+      "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "graceful-fs": "^4.2.0",
-        "jsonfile": "^6.0.1",
-        "universalify": "^2.0.0"
+        "@babel/core": "^7.24.4",
+        "@mdx-js/react": "^3.0.0",
+        "@storybook/blocks": "8.1.10",
+        "@storybook/client-logger": "8.1.10",
+        "@storybook/components": "8.1.10",
+        "@storybook/csf-plugin": "8.1.10",
+        "@storybook/csf-tools": "8.1.10",
+        "@storybook/global": "^5.0.0",
+        "@storybook/node-logger": "8.1.10",
+        "@storybook/preview-api": "8.1.10",
+        "@storybook/react-dom-shim": "8.1.10",
+        "@storybook/theming": "8.1.10",
+        "@storybook/types": "8.1.10",
+        "@types/react": "^16.8.0 || ^17.0.0 || ^18.0.0",
+        "fs-extra": "^11.1.0",
+        "react": "^16.8.0 || ^17.0.0 || ^18.0.0",
+        "react-dom": "^16.8.0 || ^17.0.0 || ^18.0.0",
+        "rehype-external-links": "^3.0.0",
+        "rehype-slug": "^6.0.0",
+        "ts-dedent": "^2.0.0"
       },
-      "engines": {
-        "node": ">=14.14"
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/storybook"
       }
     },
-    "node_modules/@storybook/core-server/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==",
+    "node_modules/@storybook/addon-docs/node_modules/@babel/traverse": {
+      "version": "7.24.7",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@babel/code-frame": "^7.24.7",
+        "@babel/generator": "^7.24.7",
+        "@babel/helper-environment-visitor": "^7.24.7",
+        "@babel/helper-function-name": "^7.24.7",
+        "@babel/helper-hoist-variables": "^7.24.7",
+        "@babel/helper-split-export-declaration": "^7.24.7",
+        "@babel/parser": "^7.24.7",
+        "@babel/types": "^7.24.7",
+        "debug": "^4.3.1",
+        "globals": "^11.1.0"
+      },
       "engines": {
-        "node": ">=8"
+        "node": ">=6.9.0"
       }
     },
-    "node_modules/@storybook/core-server/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==",
+    "node_modules/@storybook/addon-docs/node_modules/@storybook/channels": {
+      "version": "8.1.10",
+      "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "has-flag": "^4.0.0"
+        "@storybook/client-logger": "8.1.10",
+        "@storybook/core-events": "8.1.10",
+        "@storybook/global": "^5.0.0",
+        "telejson": "^7.2.0",
+        "tiny-invariant": "^1.3.1"
       },
-      "engines": {
-        "node": ">=8"
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/storybook"
       }
     },
-    "node_modules/@storybook/core-server/node_modules/util": {
-      "version": "0.12.5",
-      "resolved": "https://registry.npmjs.org/util/-/util-0.12.5.tgz",
-      "integrity": "sha512-kZf/K6hEIrWHI6XqOFUiiMa+79wE/D8Q+NCNAWclkyg3b4d2k7s0QGepNjiABc+aR3N1PAyHL7p6UcLY6LmrnA==",
+    "node_modules/@storybook/addon-docs/node_modules/@storybook/client-logger": {
+      "version": "8.1.10",
+      "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "inherits": "^2.0.3",
-        "is-arguments": "^1.0.4",
-        "is-generator-function": "^1.0.7",
-        "is-typed-array": "^1.1.3",
-        "which-typed-array": "^1.1.2"
+        "@storybook/global": "^5.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/storybook"
       }
     },
-    "node_modules/@storybook/core-webpack": {
-      "version": "8.0.6",
-      "resolved": "https://registry.npmjs.org/@storybook/core-webpack/-/core-webpack-8.0.6.tgz",
-      "integrity": "sha512-77f3vc8wQz22hWBzW1pf+MB2K8LBhyUjST0vr0NoO7tPf/7LMvVgtIr/qZdumx9jjytv8P3reJ92pkarqdvdQQ==",
+    "node_modules/@storybook/addon-docs/node_modules/@storybook/core-events": {
+      "version": "8.1.10",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "@storybook/core-common": "8.0.6",
-        "@storybook/node-logger": "8.0.6",
-        "@storybook/types": "8.0.6",
-        "@types/node": "^18.0.0",
+        "@storybook/csf": "^0.1.7",
         "ts-dedent": "^2.0.0"
       },
       "funding": {
@@ -10823,60 +10542,78 @@
         "url": "https://opencollective.com/storybook"
       }
     },
-    "node_modules/@storybook/core-webpack/node_modules/@types/node": {
-      "version": "18.19.30",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-18.19.30.tgz",
-      "integrity": "sha512-453z1zPuJLVDbyahaa1sSD5C2sht6ZpHp5rgJNs+H8YGqhluCXcuOUmBYsAo0Tos0cHySJ3lVUGbGgLlqIkpyg==",
+    "node_modules/@storybook/addon-docs/node_modules/@storybook/csf-tools": {
+      "version": "8.1.10",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "undici-types": "~5.26.4"
+        "@babel/generator": "^7.24.4",
+        "@babel/parser": "^7.24.4",
+        "@babel/traverse": "^7.24.1",
+        "@babel/types": "^7.24.0",
+        "@storybook/csf": "^0.1.7",
+        "@storybook/types": "8.1.10",
+        "fs-extra": "^11.1.0",
+        "recast": "^0.23.5",
+        "ts-dedent": "^2.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/storybook"
       }
     },
-    "node_modules/@storybook/csf": {
-      "version": "0.1.3",
-      "resolved": "https://registry.npmjs.org/@storybook/csf/-/csf-0.1.3.tgz",
-      "integrity": "sha512-IPZvXXo4b3G+gpmgBSBqVM81jbp2ePOKsvhgJdhyZJtkYQCII7rg9KKLQhvBQM5sLaF1eU6r0iuwmyynC9d9SA==",
-      "dependencies": {
-        "type-fest": "^2.19.0"
+    "node_modules/@storybook/addon-docs/node_modules/@storybook/node-logger": {
+      "version": "8.1.10",
+      "dev": true,
+      "license": "MIT",
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/storybook"
       }
     },
-    "node_modules/@storybook/csf-plugin": {
-      "version": "8.0.6",
-      "resolved": "https://registry.npmjs.org/@storybook/csf-plugin/-/csf-plugin-8.0.6.tgz",
-      "integrity": "sha512-ULaAFGhdgDDbknGnCqxitzeBlSzYZJQvZT4HtFgxfNU2McOu+GLIzyUOx3xG5eoziLvvm+oW+lxLr5nDkSaBUg==",
+    "node_modules/@storybook/addon-docs/node_modules/@storybook/preview-api": {
+      "version": "8.1.10",
+      "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "@storybook/csf-tools": "8.0.6",
-        "unplugin": "^1.3.1"
+        "@storybook/channels": "8.1.10",
+        "@storybook/client-logger": "8.1.10",
+        "@storybook/core-events": "8.1.10",
+        "@storybook/csf": "^0.1.7",
+        "@storybook/global": "^5.0.0",
+        "@storybook/types": "8.1.10",
+        "@types/qs": "^6.9.5",
+        "dequal": "^2.0.2",
+        "lodash": "^4.17.21",
+        "memoizerific": "^1.11.3",
+        "qs": "^6.10.0",
+        "tiny-invariant": "^1.3.1",
+        "ts-dedent": "^2.0.0",
+        "util-deprecate": "^1.0.2"
       },
       "funding": {
         "type": "opencollective",
         "url": "https://opencollective.com/storybook"
       }
     },
-    "node_modules/@storybook/csf-tools": {
-      "version": "8.0.6",
-      "resolved": "https://registry.npmjs.org/@storybook/csf-tools/-/csf-tools-8.0.6.tgz",
-      "integrity": "sha512-MEBVxpnzqkBPyYXdtYQrY0SQC3oflmAQdEM0qWFzPvZXTnIMk3Q2ft8JNiBht6RlrKGvKql8TodwpbOiPeJI/w==",
+    "node_modules/@storybook/addon-docs/node_modules/@storybook/types": {
+      "version": "8.1.10",
+      "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "@babel/generator": "^7.23.0",
-        "@babel/parser": "^7.23.0",
-        "@babel/traverse": "^7.23.2",
-        "@babel/types": "^7.23.0",
-        "@storybook/csf": "^0.1.2",
-        "@storybook/types": "8.0.6",
-        "fs-extra": "^11.1.0",
-        "recast": "^0.23.5",
-        "ts-dedent": "^2.0.0"
+        "@storybook/channels": "8.1.10",
+        "@types/express": "^4.7.0",
+        "file-system-cache": "2.3.0"
       },
       "funding": {
         "type": "opencollective",
         "url": "https://opencollective.com/storybook"
       }
     },
-    "node_modules/@storybook/csf-tools/node_modules/fs-extra": {
+    "node_modules/@storybook/addon-docs/node_modules/fs-extra": {
       "version": "11.2.0",
-      "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-11.2.0.tgz",
-      "integrity": "sha512-PmDi3uwK5nFuXh7XDTlVnS17xJS7vW36is2+w3xcv8SVxiB4NyATf4ctkVY5bkSjX0Y4nbvZCq1/EjtEyr9ktw==",
+      "dev": true,
+      "license": "MIT",
       "dependencies": {
         "graceful-fs": "^4.2.0",
         "jsonfile": "^6.0.1",
@@ -10886,10 +10623,10 @@
         "node": ">=14.14"
       }
     },
-    "node_modules/@storybook/csf-tools/node_modules/recast": {
-      "version": "0.23.6",
-      "resolved": "https://registry.npmjs.org/recast/-/recast-0.23.6.tgz",
-      "integrity": "sha512-9FHoNjX1yjuesMwuthAmPKabxYQdOgihFYmT5ebXfYGBcnqXZf3WOVz+5foEZ8Y83P4ZY6yQD5GMmtV+pgCCAQ==",
+    "node_modules/@storybook/addon-docs/node_modules/recast": {
+      "version": "0.23.9",
+      "dev": true,
+      "license": "MIT",
       "dependencies": {
         "ast-types": "^0.16.1",
         "esprima": "~4.0.0",
@@ -10901,231 +10638,188 @@
         "node": ">= 4"
       }
     },
-    "node_modules/@storybook/csf/node_modules/type-fest": {
-      "version": "2.19.0",
-      "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-2.19.0.tgz",
-      "integrity": "sha512-RAH822pAdBgcNMAfWnCBU3CFZcfZ/i1eZjwFU/dsLKumyuuP3niueg2UAukXYF0E2AAoc82ZSSf9J0WQBinzHA==",
+    "node_modules/@storybook/addon-docs/node_modules/source-map": {
+      "version": "0.6.1",
+      "dev": true,
+      "license": "BSD-3-Clause",
       "engines": {
-        "node": ">=12.20"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
+        "node": ">=0.10.0"
       }
     },
-    "node_modules/@storybook/docs-mdx": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/@storybook/docs-mdx/-/docs-mdx-3.0.0.tgz",
-      "integrity": "sha512-NmiGXl2HU33zpwTv1XORe9XG9H+dRUC1Jl11u92L4xr062pZtrShLmD4VKIsOQujxhhOrbxpwhNOt+6TdhyIdQ=="
-    },
-    "node_modules/@storybook/docs-tools": {
-      "version": "8.0.6",
-      "resolved": "https://registry.npmjs.org/@storybook/docs-tools/-/docs-tools-8.0.6.tgz",
-      "integrity": "sha512-PsAA2b/Q1ki5IR0fa52MI+fdDkQ0W+mrZVRRj3eJzonGZYcQtXofTXQB7yi0CaX7zzI/N8JcdE4bO9sI6SrOTg==",
-      "dependencies": {
-        "@storybook/core-common": "8.0.6",
-        "@storybook/preview-api": "8.0.6",
-        "@storybook/types": "8.0.6",
-        "@types/doctrine": "^0.0.3",
-        "assert": "^2.1.0",
-        "doctrine": "^3.0.0",
-        "lodash": "^4.17.21"
+    "node_modules/@storybook/addon-essentials": {
+      "version": "8.1.10",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@storybook/addon-actions": "8.1.10",
+        "@storybook/addon-backgrounds": "8.1.10",
+        "@storybook/addon-controls": "8.1.10",
+        "@storybook/addon-docs": "8.1.10",
+        "@storybook/addon-highlight": "8.1.10",
+        "@storybook/addon-measure": "8.1.10",
+        "@storybook/addon-outline": "8.1.10",
+        "@storybook/addon-toolbars": "8.1.10",
+        "@storybook/addon-viewport": "8.1.10",
+        "@storybook/core-common": "8.1.10",
+        "@storybook/manager-api": "8.1.10",
+        "@storybook/node-logger": "8.1.10",
+        "@storybook/preview-api": "8.1.10",
+        "ts-dedent": "^2.0.0"
       },
       "funding": {
         "type": "opencollective",
         "url": "https://opencollective.com/storybook"
       }
     },
-    "node_modules/@storybook/docs-tools/node_modules/assert": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/assert/-/assert-2.1.0.tgz",
-      "integrity": "sha512-eLHpSK/Y4nhMJ07gDaAzoX/XAKS8PSaojml3M0DM4JpV1LAi5JOJ/p6H/XWrl8L+DzVEvVCW1z3vWAaB9oTsQw==",
-      "dependencies": {
-        "call-bind": "^1.0.2",
-        "is-nan": "^1.3.2",
-        "object-is": "^1.1.5",
-        "object.assign": "^4.1.4",
-        "util": "^0.12.5"
-      }
-    },
-    "node_modules/@storybook/docs-tools/node_modules/util": {
-      "version": "0.12.5",
-      "resolved": "https://registry.npmjs.org/util/-/util-0.12.5.tgz",
-      "integrity": "sha512-kZf/K6hEIrWHI6XqOFUiiMa+79wE/D8Q+NCNAWclkyg3b4d2k7s0QGepNjiABc+aR3N1PAyHL7p6UcLY6LmrnA==",
+    "node_modules/@storybook/addon-essentials/node_modules/@babel/traverse": {
+      "version": "7.24.7",
+      "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "inherits": "^2.0.3",
-        "is-arguments": "^1.0.4",
-        "is-generator-function": "^1.0.7",
-        "is-typed-array": "^1.1.3",
-        "which-typed-array": "^1.1.2"
-      }
-    },
-    "node_modules/@storybook/global": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/@storybook/global/-/global-5.0.0.tgz",
-      "integrity": "sha512-FcOqPAXACP0I3oJ/ws6/rrPT9WGhu915Cg8D02a9YxLo0DE9zI+a9A5gRGvmQ09fiWPukqI8ZAEoQEdWUKMQdQ=="
-    },
-    "node_modules/@storybook/icons": {
-      "version": "1.2.9",
-      "resolved": "https://registry.npmjs.org/@storybook/icons/-/icons-1.2.9.tgz",
-      "integrity": "sha512-cOmylsz25SYXaJL/gvTk/dl3pyk7yBFRfeXTsHvTA3dfhoU/LWSq0NKL9nM7WBasJyn6XPSGnLS4RtKXLw5EUg==",
-      "engines": {
-        "node": ">=14.0.0"
+        "@babel/code-frame": "^7.24.7",
+        "@babel/generator": "^7.24.7",
+        "@babel/helper-environment-visitor": "^7.24.7",
+        "@babel/helper-function-name": "^7.24.7",
+        "@babel/helper-hoist-variables": "^7.24.7",
+        "@babel/helper-split-export-declaration": "^7.24.7",
+        "@babel/parser": "^7.24.7",
+        "@babel/types": "^7.24.7",
+        "debug": "^4.3.1",
+        "globals": "^11.1.0"
       },
-      "peerDependencies": {
-        "react": "^16.8.0 || ^17.0.0 || ^18.0.0",
-        "react-dom": "^16.8.0 || ^17.0.0 || ^18.0.0"
-      }
-    },
-    "node_modules/@storybook/manager": {
-      "version": "8.0.6",
-      "resolved": "https://registry.npmjs.org/@storybook/manager/-/manager-8.0.6.tgz",
-      "integrity": "sha512-wdL3lG72qrCOLkxEUW49+hmwA4fIFXFvAEU7wVgEt4KyRRGWhHa8Dr/5Tnq54CWJrA+BTrTPHaoo/Vu4BAjgow==",
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/storybook"
+      "engines": {
+        "node": ">=6.9.0"
       }
     },
-    "node_modules/@storybook/manager-api": {
-      "version": "8.0.6",
-      "resolved": "https://registry.npmjs.org/@storybook/manager-api/-/manager-api-8.0.6.tgz",
-      "integrity": "sha512-khYA5CM+LY/B5VsqqUmt2ivNLNqyIKfcgGsXHkOs3Kr5BOz8LhEmSwZOB348ey2C2ejFJmvKlkcsE+rB9ixlww==",
+    "node_modules/@storybook/addon-essentials/node_modules/@storybook/channels": {
+      "version": "8.1.10",
+      "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "@storybook/channels": "8.0.6",
-        "@storybook/client-logger": "8.0.6",
-        "@storybook/core-events": "8.0.6",
-        "@storybook/csf": "^0.1.2",
+        "@storybook/client-logger": "8.1.10",
+        "@storybook/core-events": "8.1.10",
         "@storybook/global": "^5.0.0",
-        "@storybook/icons": "^1.2.5",
-        "@storybook/router": "8.0.6",
-        "@storybook/theming": "8.0.6",
-        "@storybook/types": "8.0.6",
-        "dequal": "^2.0.2",
-        "lodash": "^4.17.21",
-        "memoizerific": "^1.11.3",
-        "store2": "^2.14.2",
         "telejson": "^7.2.0",
-        "ts-dedent": "^2.0.0"
+        "tiny-invariant": "^1.3.1"
       },
       "funding": {
         "type": "opencollective",
         "url": "https://opencollective.com/storybook"
       }
     },
-    "node_modules/@storybook/node-logger": {
-      "version": "8.0.6",
-      "resolved": "https://registry.npmjs.org/@storybook/node-logger/-/node-logger-8.0.6.tgz",
-      "integrity": "sha512-mDRJLVAuTWauO0mnrwajfJV/6zKBJVPp/9g0ULccE3Q+cuqNfUefqfCd17cZBlJHeRsdB9jy9tod48d4qzGEkQ==",
+    "node_modules/@storybook/addon-essentials/node_modules/@storybook/client-logger": {
+      "version": "8.1.10",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@storybook/global": "^5.0.0"
+      },
       "funding": {
         "type": "opencollective",
         "url": "https://opencollective.com/storybook"
       }
     },
-    "node_modules/@storybook/preset-react-webpack": {
-      "version": "8.0.6",
-      "resolved": "https://registry.npmjs.org/@storybook/preset-react-webpack/-/preset-react-webpack-8.0.6.tgz",
-      "integrity": "sha512-nOcpjqefSh0kTtKBJEyvWv1QIeWfp47RSwR2z1/jPtU8XT4Tw+Y1g0Vu+RkeL/UWRWYrAoIO++14CxCwFu1Knw==",
+    "node_modules/@storybook/addon-essentials/node_modules/@storybook/core-common": {
+      "version": "8.1.10",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "@storybook/core-webpack": "8.0.6",
-        "@storybook/docs-tools": "8.0.6",
-        "@storybook/node-logger": "8.0.6",
-        "@storybook/react": "8.0.6",
-        "@storybook/react-docgen-typescript-plugin": "1.0.6--canary.9.0c3f3b7.0",
-        "@types/node": "^18.0.0",
-        "@types/semver": "^7.3.4",
+        "@storybook/core-events": "8.1.10",
+        "@storybook/csf-tools": "8.1.10",
+        "@storybook/node-logger": "8.1.10",
+        "@storybook/types": "8.1.10",
+        "@yarnpkg/fslib": "2.10.3",
+        "@yarnpkg/libzip": "2.3.0",
+        "chalk": "^4.1.0",
+        "cross-spawn": "^7.0.3",
+        "esbuild": "^0.18.0 || ^0.19.0 || ^0.20.0",
+        "esbuild-register": "^3.5.0",
+        "execa": "^5.0.0",
+        "file-system-cache": "2.3.0",
+        "find-cache-dir": "^3.0.0",
         "find-up": "^5.0.0",
         "fs-extra": "^11.1.0",
-        "magic-string": "^0.30.5",
-        "react-docgen": "^7.0.0",
-        "resolve": "^1.22.8",
+        "glob": "^10.0.0",
+        "handlebars": "^4.7.7",
+        "lazy-universal-dotenv": "^4.0.0",
+        "node-fetch": "^2.0.0",
+        "picomatch": "^2.3.0",
+        "pkg-dir": "^5.0.0",
+        "prettier-fallback": "npm:prettier@^3",
+        "pretty-hrtime": "^1.0.3",
+        "resolve-from": "^5.0.0",
         "semver": "^7.3.7",
-        "tsconfig-paths": "^4.2.0",
-        "webpack": "5"
-      },
-      "engines": {
-        "node": ">=18.0.0"
+        "tempy": "^3.1.0",
+        "tiny-invariant": "^1.3.1",
+        "ts-dedent": "^2.0.0",
+        "util": "^0.12.4"
       },
       "funding": {
         "type": "opencollective",
         "url": "https://opencollective.com/storybook"
       },
       "peerDependencies": {
-        "react": "^16.8.0 || ^17.0.0 || ^18.0.0",
-        "react-dom": "^16.8.0 || ^17.0.0 || ^18.0.0"
+        "prettier": "^2 || ^3"
       },
       "peerDependenciesMeta": {
-        "typescript": {
+        "prettier": {
           "optional": true
         }
       }
     },
-    "node_modules/@storybook/preset-react-webpack/node_modules/@types/node": {
-      "version": "18.19.30",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-18.19.30.tgz",
-      "integrity": "sha512-453z1zPuJLVDbyahaa1sSD5C2sht6ZpHp5rgJNs+H8YGqhluCXcuOUmBYsAo0Tos0cHySJ3lVUGbGgLlqIkpyg==",
-      "dev": true,
-      "dependencies": {
-        "undici-types": "~5.26.4"
-      }
-    },
-    "node_modules/@storybook/preset-react-webpack/node_modules/fs-extra": {
-      "version": "11.2.0",
-      "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-11.2.0.tgz",
-      "integrity": "sha512-PmDi3uwK5nFuXh7XDTlVnS17xJS7vW36is2+w3xcv8SVxiB4NyATf4ctkVY5bkSjX0Y4nbvZCq1/EjtEyr9ktw==",
+    "node_modules/@storybook/addon-essentials/node_modules/@storybook/core-events": {
+      "version": "8.1.10",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "graceful-fs": "^4.2.0",
-        "jsonfile": "^6.0.1",
-        "universalify": "^2.0.0"
+        "@storybook/csf": "^0.1.7",
+        "ts-dedent": "^2.0.0"
       },
-      "engines": {
-        "node": ">=14.14"
-      }
-    },
-    "node_modules/@storybook/preset-react-webpack/node_modules/strip-bom": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-3.0.0.tgz",
-      "integrity": "sha512-vavAMRXOgBVNF6nyEEmL3DBK19iRpDcoIwW+swQ+CbGiu7lju6t+JklA1MHweoWtadgt4ISVUsXLyDq34ddcwA==",
-      "dev": true,
-      "engines": {
-        "node": ">=4"
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/storybook"
       }
     },
-    "node_modules/@storybook/preset-react-webpack/node_modules/tsconfig-paths": {
-      "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/tsconfig-paths/-/tsconfig-paths-4.2.0.tgz",
-      "integrity": "sha512-NoZ4roiN7LnbKn9QqE1amc9DJfzvZXxF4xDavcOWt1BPkdx+m+0gJuPM+S0vCe7zTJMYUP0R8pO2XMr+Y8oLIg==",
+    "node_modules/@storybook/addon-essentials/node_modules/@storybook/csf-tools": {
+      "version": "8.1.10",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "json5": "^2.2.2",
-        "minimist": "^1.2.6",
-        "strip-bom": "^3.0.0"
+        "@babel/generator": "^7.24.4",
+        "@babel/parser": "^7.24.4",
+        "@babel/traverse": "^7.24.1",
+        "@babel/types": "^7.24.0",
+        "@storybook/csf": "^0.1.7",
+        "@storybook/types": "8.1.10",
+        "fs-extra": "^11.1.0",
+        "recast": "^0.23.5",
+        "ts-dedent": "^2.0.0"
       },
-      "engines": {
-        "node": ">=6"
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/storybook"
       }
     },
-    "node_modules/@storybook/preview": {
-      "version": "8.0.6",
-      "resolved": "https://registry.npmjs.org/@storybook/preview/-/preview-8.0.6.tgz",
-      "integrity": "sha512-NdVstxdUghv5goQJ4zFftyezfCEPKHOSNu8k02KU6u6g5IiK430jp5y71E/eiBK3m1AivtluC7tPRSch0HsidA==",
+    "node_modules/@storybook/addon-essentials/node_modules/@storybook/node-logger": {
+      "version": "8.1.10",
       "dev": true,
+      "license": "MIT",
       "funding": {
         "type": "opencollective",
         "url": "https://opencollective.com/storybook"
       }
     },
-    "node_modules/@storybook/preview-api": {
-      "version": "8.0.6",
-      "resolved": "https://registry.npmjs.org/@storybook/preview-api/-/preview-api-8.0.6.tgz",
-      "integrity": "sha512-O5SvBqlHIO/Cf5oGZUJV2npkp9bLqg9Sn0T0a5zXolJbRy+gP7MDyz4AnliLpTn5bT2rzVQ6VH8IDlhHBq3K6g==",
+    "node_modules/@storybook/addon-essentials/node_modules/@storybook/preview-api": {
+      "version": "8.1.10",
+      "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "@storybook/channels": "8.0.6",
-        "@storybook/client-logger": "8.0.6",
-        "@storybook/core-events": "8.0.6",
-        "@storybook/csf": "^0.1.2",
+        "@storybook/channels": "8.1.10",
+        "@storybook/client-logger": "8.1.10",
+        "@storybook/core-events": "8.1.10",
+        "@storybook/csf": "^0.1.7",
         "@storybook/global": "^5.0.0",
-        "@storybook/types": "8.0.6",
+        "@storybook/types": "8.1.10",
         "@types/qs": "^6.9.5",
         "dequal": "^2.0.2",
         "lodash": "^4.17.21",
@@ -11140,168 +10834,130 @@
         "url": "https://opencollective.com/storybook"
       }
     },
-    "node_modules/@storybook/react": {
-      "version": "8.0.6",
-      "resolved": "https://registry.npmjs.org/@storybook/react/-/react-8.0.6.tgz",
-      "integrity": "sha512-A1zivNti15nHkJ6EcVKpxKwlDkyMb5MlJMUb8chX/xBWxoR1f5R8eI484rhdPRYUzBY7JwvgZfy4y/murqg6hA==",
+    "node_modules/@storybook/addon-essentials/node_modules/@storybook/types": {
+      "version": "8.1.10",
+      "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "@storybook/client-logger": "8.0.6",
-        "@storybook/docs-tools": "8.0.6",
-        "@storybook/global": "^5.0.0",
-        "@storybook/preview-api": "8.0.6",
-        "@storybook/react-dom-shim": "8.0.6",
-        "@storybook/types": "8.0.6",
-        "@types/escodegen": "^0.0.6",
-        "@types/estree": "^0.0.51",
-        "@types/node": "^18.0.0",
-        "acorn": "^7.4.1",
-        "acorn-jsx": "^5.3.1",
-        "acorn-walk": "^7.2.0",
-        "escodegen": "^2.1.0",
-        "html-tags": "^3.1.0",
-        "lodash": "^4.17.21",
-        "prop-types": "^15.7.2",
-        "react-element-to-jsx-string": "^15.0.0",
-        "semver": "^7.3.7",
-        "ts-dedent": "^2.0.0",
-        "type-fest": "~2.19",
-        "util-deprecate": "^1.0.2"
-      },
-      "engines": {
-        "node": ">=18.0.0"
+        "@storybook/channels": "8.1.10",
+        "@types/express": "^4.7.0",
+        "file-system-cache": "2.3.0"
       },
       "funding": {
         "type": "opencollective",
         "url": "https://opencollective.com/storybook"
+      }
+    },
+    "node_modules/@storybook/addon-essentials/node_modules/ansi-styles": {
+      "version": "4.3.0",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "color-convert": "^2.0.1"
       },
-      "peerDependencies": {
-        "react": "^16.8.0 || ^17.0.0 || ^18.0.0",
-        "react-dom": "^16.8.0 || ^17.0.0 || ^18.0.0",
-        "typescript": ">= 4.2.x"
+      "engines": {
+        "node": ">=8"
       },
-      "peerDependenciesMeta": {
-        "typescript": {
-          "optional": true
-        }
+      "funding": {
+        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
       }
     },
-    "node_modules/@storybook/react-docgen-typescript-plugin": {
-      "version": "1.0.6--canary.9.0c3f3b7.0",
-      "resolved": "https://registry.npmjs.org/@storybook/react-docgen-typescript-plugin/-/react-docgen-typescript-plugin-1.0.6--canary.9.0c3f3b7.0.tgz",
-      "integrity": "sha512-KUqXC3oa9JuQ0kZJLBhVdS4lOneKTOopnNBK4tUAgoxWQ3u/IjzdueZjFr7gyBrXMoU6duutk3RQR9u8ZpYJ4Q==",
+    "node_modules/@storybook/addon-essentials/node_modules/brace-expansion": {
+      "version": "2.0.1",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "debug": "^4.1.1",
-        "endent": "^2.0.1",
-        "find-cache-dir": "^3.3.1",
-        "flat-cache": "^3.0.4",
-        "micromatch": "^4.0.2",
-        "react-docgen-typescript": "^2.2.2",
-        "tslib": "^2.0.0"
-      },
-      "peerDependencies": {
-        "typescript": ">= 4.x",
-        "webpack": ">= 4"
+        "balanced-match": "^1.0.0"
       }
     },
-    "node_modules/@storybook/react-docgen-typescript-plugin/node_modules/find-cache-dir": {
-      "version": "3.3.2",
-      "resolved": "https://registry.npmjs.org/find-cache-dir/-/find-cache-dir-3.3.2.tgz",
-      "integrity": "sha512-wXZV5emFEjrridIgED11OoUKLxiYjAcqot/NJdAkOhlJ+vGzwhOAfcG5OX1jP+S0PcjEn8bdMJv+g2jwQ3Onig==",
+    "node_modules/@storybook/addon-essentials/node_modules/chalk": {
+      "version": "4.1.2",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "commondir": "^1.0.1",
-        "make-dir": "^3.0.2",
-        "pkg-dir": "^4.1.0"
+        "ansi-styles": "^4.1.0",
+        "supports-color": "^7.1.0"
       },
       "engines": {
-        "node": ">=8"
+        "node": ">=10"
       },
       "funding": {
-        "url": "https://github.com/avajs/find-cache-dir?sponsor=1"
+        "url": "https://github.com/chalk/chalk?sponsor=1"
       }
     },
-    "node_modules/@storybook/react-docgen-typescript-plugin/node_modules/find-up": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz",
-      "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==",
+    "node_modules/@storybook/addon-essentials/node_modules/color-convert": {
+      "version": "2.0.1",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "locate-path": "^5.0.0",
-        "path-exists": "^4.0.0"
+        "color-name": "~1.1.4"
       },
       "engines": {
-        "node": ">=8"
+        "node": ">=7.0.0"
       }
     },
-    "node_modules/@storybook/react-docgen-typescript-plugin/node_modules/locate-path": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz",
-      "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==",
+    "node_modules/@storybook/addon-essentials/node_modules/color-name": {
+      "version": "1.1.4",
       "dev": true,
-      "dependencies": {
-        "p-locate": "^4.1.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
+      "license": "MIT"
     },
-    "node_modules/@storybook/react-docgen-typescript-plugin/node_modules/make-dir": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-3.1.0.tgz",
-      "integrity": "sha512-g3FeP20LNwhALb/6Cz6Dd4F2ngze0jz7tbzrD2wAV+o9FeNHe4rL+yK2md0J/fiSf1sa1ADhXqi5+oVwOM/eGw==",
+    "node_modules/@storybook/addon-essentials/node_modules/crypto-random-string": {
+      "version": "4.0.0",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "semver": "^6.0.0"
+        "type-fest": "^1.0.1"
       },
       "engines": {
-        "node": ">=8"
+        "node": ">=12"
       },
       "funding": {
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/@storybook/react-docgen-typescript-plugin/node_modules/p-limit": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz",
-      "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==",
+    "node_modules/@storybook/addon-essentials/node_modules/crypto-random-string/node_modules/type-fest": {
+      "version": "1.4.0",
       "dev": true,
-      "dependencies": {
-        "p-try": "^2.0.0"
-      },
+      "license": "(MIT OR CC0-1.0)",
       "engines": {
-        "node": ">=6"
+        "node": ">=10"
       },
       "funding": {
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/@storybook/react-docgen-typescript-plugin/node_modules/p-locate": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz",
-      "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==",
+    "node_modules/@storybook/addon-essentials/node_modules/find-cache-dir": {
+      "version": "3.3.2",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "p-limit": "^2.2.0"
+        "commondir": "^1.0.1",
+        "make-dir": "^3.0.2",
+        "pkg-dir": "^4.1.0"
       },
       "engines": {
         "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/avajs/find-cache-dir?sponsor=1"
       }
     },
-    "node_modules/@storybook/react-docgen-typescript-plugin/node_modules/path-exists": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz",
-      "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==",
+    "node_modules/@storybook/addon-essentials/node_modules/find-cache-dir/node_modules/find-up": {
+      "version": "4.1.0",
       "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "locate-path": "^5.0.0",
+        "path-exists": "^4.0.0"
+      },
       "engines": {
         "node": ">=8"
       }
     },
-    "node_modules/@storybook/react-docgen-typescript-plugin/node_modules/pkg-dir": {
+    "node_modules/@storybook/addon-essentials/node_modules/find-cache-dir/node_modules/pkg-dir": {
       "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-4.2.0.tgz",
-      "integrity": "sha512-HRDzbaKjC+AOWVXxAU/x54COGeIv9eb+6CkDSQoNTt4XyWoIJvuPsXizxu/Fr23EiekbtZwmh1IcIG/l/a10GQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "find-up": "^4.0.0"
       },
@@ -11309,188 +10965,192 @@
         "node": ">=8"
       }
     },
-    "node_modules/@storybook/react-docgen-typescript-plugin/node_modules/semver": {
-      "version": "6.3.1",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",
-      "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==",
+    "node_modules/@storybook/addon-essentials/node_modules/fs-extra": {
+      "version": "11.2.0",
       "dev": true,
-      "bin": {
-        "semver": "bin/semver.js"
-      }
-    },
-    "node_modules/@storybook/react-dom-shim": {
-      "version": "8.0.6",
-      "resolved": "https://registry.npmjs.org/@storybook/react-dom-shim/-/react-dom-shim-8.0.6.tgz",
-      "integrity": "sha512-NC4k0dBIypvVqwqnMhKDUxNc1OeL6lgspn8V26PnmCYbvY97ZqoGQ7n2a5Kw/kubN6yWX1nxNkV6HcTRgEnYTw==",
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/storybook"
+      "license": "MIT",
+      "dependencies": {
+        "graceful-fs": "^4.2.0",
+        "jsonfile": "^6.0.1",
+        "universalify": "^2.0.0"
       },
-      "peerDependencies": {
-        "react": "^16.8.0 || ^17.0.0 || ^18.0.0",
-        "react-dom": "^16.8.0 || ^17.0.0 || ^18.0.0"
+      "engines": {
+        "node": ">=14.14"
       }
     },
-    "node_modules/@storybook/react-webpack5": {
-      "version": "8.0.6",
-      "resolved": "https://registry.npmjs.org/@storybook/react-webpack5/-/react-webpack5-8.0.6.tgz",
-      "integrity": "sha512-Ai8gPnQiz7EAsoVw8nGBx5S28r7L4LMlb7o7HS44XlsDR0ZlMGe2H0ZiAFyf8i8SvLK708KRaXCfcT5zGcetMQ==",
+    "node_modules/@storybook/addon-essentials/node_modules/glob": {
+      "version": "10.4.2",
       "dev": true,
+      "license": "ISC",
       "dependencies": {
-        "@storybook/builder-webpack5": "8.0.6",
-        "@storybook/preset-react-webpack": "8.0.6",
-        "@storybook/react": "8.0.6",
-        "@types/node": "^18.0.0"
+        "foreground-child": "^3.1.0",
+        "jackspeak": "^3.1.2",
+        "minimatch": "^9.0.4",
+        "minipass": "^7.1.2",
+        "package-json-from-dist": "^1.0.0",
+        "path-scurry": "^1.11.1"
+      },
+      "bin": {
+        "glob": "dist/esm/bin.mjs"
       },
       "engines": {
-        "node": ">=18.0.0"
+        "node": ">=16 || 14 >=14.18"
       },
       "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/storybook"
-      },
-      "peerDependencies": {
-        "react": "^16.8.0 || ^17.0.0 || ^18.0.0",
-        "react-dom": "^16.8.0 || ^17.0.0 || ^18.0.0",
-        "typescript": ">= 4.2.x"
-      },
-      "peerDependenciesMeta": {
-        "typescript": {
-          "optional": true
-        }
+        "url": "https://github.com/sponsors/isaacs"
       }
     },
-    "node_modules/@storybook/react-webpack5/node_modules/@types/node": {
-      "version": "18.19.28",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-18.19.28.tgz",
-      "integrity": "sha512-J5cOGD9n4x3YGgVuaND6khm5x07MMdAKkRyXnjVR6KFhLMNh2yONGiP7Z+4+tBOt5mK+GvDTiacTOVGGpqiecw==",
+    "node_modules/@storybook/addon-essentials/node_modules/has-flag": {
+      "version": "4.0.0",
       "dev": true,
-      "dependencies": {
-        "undici-types": "~5.26.4"
-      }
-    },
-    "node_modules/@storybook/react/node_modules/@types/node": {
-      "version": "18.19.28",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-18.19.28.tgz",
-      "integrity": "sha512-J5cOGD9n4x3YGgVuaND6khm5x07MMdAKkRyXnjVR6KFhLMNh2yONGiP7Z+4+tBOt5mK+GvDTiacTOVGGpqiecw==",
-      "dependencies": {
-        "undici-types": "~5.26.4"
+      "license": "MIT",
+      "engines": {
+        "node": ">=8"
       }
     },
-    "node_modules/@storybook/react/node_modules/type-fest": {
-      "version": "2.19.0",
-      "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-2.19.0.tgz",
-      "integrity": "sha512-RAH822pAdBgcNMAfWnCBU3CFZcfZ/i1eZjwFU/dsLKumyuuP3niueg2UAukXYF0E2AAoc82ZSSf9J0WQBinzHA==",
+    "node_modules/@storybook/addon-essentials/node_modules/is-stream": {
+      "version": "3.0.0",
+      "dev": true,
+      "license": "MIT",
       "engines": {
-        "node": ">=12.20"
+        "node": "^12.20.0 || ^14.13.1 || >=16.0.0"
       },
       "funding": {
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/@storybook/router": {
-      "version": "8.0.6",
-      "resolved": "https://registry.npmjs.org/@storybook/router/-/router-8.0.6.tgz",
-      "integrity": "sha512-ektN0+TyQPxVxcUvt9ksGizgDM1bKFEdGJeeqv0yYaOSyC4M1e4S8QZ+Iq/p/NFNt5XJWsWU+HtQ8AzQWagQfQ==",
+    "node_modules/@storybook/addon-essentials/node_modules/jackspeak": {
+      "version": "3.4.0",
+      "dev": true,
+      "license": "BlueOak-1.0.0",
       "dependencies": {
-        "@storybook/client-logger": "8.0.6",
-        "memoizerific": "^1.11.3",
-        "qs": "^6.10.0"
+        "@isaacs/cliui": "^8.0.2"
+      },
+      "engines": {
+        "node": ">=14"
       },
       "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/storybook"
+        "url": "https://github.com/sponsors/isaacs"
+      },
+      "optionalDependencies": {
+        "@pkgjs/parseargs": "^0.11.0"
       }
     },
-    "node_modules/@storybook/telemetry": {
-      "version": "8.0.6",
-      "resolved": "https://registry.npmjs.org/@storybook/telemetry/-/telemetry-8.0.6.tgz",
-      "integrity": "sha512-kzxhhzGRSBYR4oe/Vlp/adKVxD8KWbIDMCgLWaINe14ILfEmpyrC00MXRSjS1tMF1qfrtn600Oe/xkHFQUpivQ==",
+    "node_modules/@storybook/addon-essentials/node_modules/locate-path": {
+      "version": "5.0.0",
+      "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "@storybook/client-logger": "8.0.6",
-        "@storybook/core-common": "8.0.6",
-        "@storybook/csf-tools": "8.0.6",
-        "chalk": "^4.1.0",
-        "detect-package-manager": "^2.0.1",
-        "fetch-retry": "^5.0.2",
-        "fs-extra": "^11.1.0",
-        "read-pkg-up": "^7.0.1"
+        "p-locate": "^4.1.0"
       },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/storybook"
+      "engines": {
+        "node": ">=8"
       }
     },
-    "node_modules/@storybook/telemetry/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==",
+    "node_modules/@storybook/addon-essentials/node_modules/make-dir": {
+      "version": "3.1.0",
+      "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "color-convert": "^2.0.1"
+        "semver": "^6.0.0"
       },
       "engines": {
         "node": ">=8"
       },
       "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/@storybook/telemetry/node_modules/chalk": {
-      "version": "4.1.2",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
-      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
+    "node_modules/@storybook/addon-essentials/node_modules/make-dir/node_modules/semver": {
+      "version": "6.3.1",
+      "dev": true,
+      "license": "ISC",
+      "bin": {
+        "semver": "bin/semver.js"
+      }
+    },
+    "node_modules/@storybook/addon-essentials/node_modules/minimatch": {
+      "version": "9.0.4",
+      "dev": true,
+      "license": "ISC",
       "dependencies": {
-        "ansi-styles": "^4.1.0",
-        "supports-color": "^7.1.0"
+        "brace-expansion": "^2.0.1"
       },
       "engines": {
-        "node": ">=10"
+        "node": ">=16 || 14 >=14.17"
       },
       "funding": {
-        "url": "https://github.com/chalk/chalk?sponsor=1"
+        "url": "https://github.com/sponsors/isaacs"
       }
     },
-    "node_modules/@storybook/telemetry/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==",
+    "node_modules/@storybook/addon-essentials/node_modules/minipass": {
+      "version": "7.1.2",
+      "dev": true,
+      "license": "ISC",
+      "engines": {
+        "node": ">=16 || 14 >=14.17"
+      }
+    },
+    "node_modules/@storybook/addon-essentials/node_modules/p-limit": {
+      "version": "2.3.0",
+      "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "color-name": "~1.1.4"
+        "p-try": "^2.0.0"
       },
       "engines": {
-        "node": ">=7.0.0"
+        "node": ">=6"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/@storybook/telemetry/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=="
-    },
-    "node_modules/@storybook/telemetry/node_modules/fs-extra": {
-      "version": "11.2.0",
-      "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-11.2.0.tgz",
-      "integrity": "sha512-PmDi3uwK5nFuXh7XDTlVnS17xJS7vW36is2+w3xcv8SVxiB4NyATf4ctkVY5bkSjX0Y4nbvZCq1/EjtEyr9ktw==",
+    "node_modules/@storybook/addon-essentials/node_modules/p-locate": {
+      "version": "4.1.0",
+      "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "graceful-fs": "^4.2.0",
-        "jsonfile": "^6.0.1",
-        "universalify": "^2.0.0"
+        "p-limit": "^2.2.0"
       },
       "engines": {
-        "node": ">=14.14"
+        "node": ">=8"
       }
     },
-    "node_modules/@storybook/telemetry/node_modules/has-flag": {
+    "node_modules/@storybook/addon-essentials/node_modules/path-exists": {
       "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+      "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=8"
       }
     },
-    "node_modules/@storybook/telemetry/node_modules/supports-color": {
+    "node_modules/@storybook/addon-essentials/node_modules/recast": {
+      "version": "0.23.9",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "ast-types": "^0.16.1",
+        "esprima": "~4.0.0",
+        "source-map": "~0.6.1",
+        "tiny-invariant": "^1.3.3",
+        "tslib": "^2.0.1"
+      },
+      "engines": {
+        "node": ">= 4"
+      }
+    },
+    "node_modules/@storybook/addon-essentials/node_modules/source-map": {
+      "version": "0.6.1",
+      "dev": true,
+      "license": "BSD-3-Clause",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/@storybook/addon-essentials/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,
+      "license": "MIT",
       "dependencies": {
         "has-flag": "^4.0.0"
       },
@@ -11498,2470 +11158,2635 @@
         "node": ">=8"
       }
     },
-    "node_modules/@storybook/theming": {
-      "version": "8.0.6",
-      "resolved": "https://registry.npmjs.org/@storybook/theming/-/theming-8.0.6.tgz",
-      "integrity": "sha512-o/b12+nDp8WDFlE0qQilzJ2aIeOHD48MCoc+ouFRPRH4tUS5xNaBPYxBxTgdtFbwZNuOC2my4A37Uhjn6IwkuQ==",
-      "dependencies": {
-        "@emotion/use-insertion-effect-with-fallbacks": "^1.0.1",
-        "@storybook/client-logger": "8.0.6",
-        "@storybook/global": "^5.0.0",
-        "memoizerific": "^1.11.3"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/storybook"
-      },
-      "peerDependencies": {
-        "react": "^16.8.0 || ^17.0.0 || ^18.0.0",
-        "react-dom": "^16.8.0 || ^17.0.0 || ^18.0.0"
-      },
-      "peerDependenciesMeta": {
-        "react": {
-          "optional": true
-        },
-        "react-dom": {
-          "optional": true
-        }
+    "node_modules/@storybook/addon-essentials/node_modules/temp-dir": {
+      "version": "3.0.0",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=14.16"
       }
     },
-    "node_modules/@storybook/types": {
-      "version": "8.0.6",
-      "resolved": "https://registry.npmjs.org/@storybook/types/-/types-8.0.6.tgz",
-      "integrity": "sha512-YKq4A+3diQ7UCGuyrB/9LkB29jjGoEmPl3TfV7mO1FvdRw22BNuV3GyJCiLUHigSKiZgFo+pfQhmsNRJInHUnQ==",
+    "node_modules/@storybook/addon-essentials/node_modules/tempy": {
+      "version": "3.1.0",
+      "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "@storybook/channels": "8.0.6",
-        "@types/express": "^4.7.0",
-        "file-system-cache": "2.3.0"
+        "is-stream": "^3.0.0",
+        "temp-dir": "^3.0.0",
+        "type-fest": "^2.12.2",
+        "unique-string": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=14.16"
       },
       "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/storybook"
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/@svgr/babel-plugin-add-jsx-attribute": {
-      "version": "6.5.1",
+    "node_modules/@storybook/addon-essentials/node_modules/type-fest": {
+      "version": "2.19.0",
       "dev": true,
-      "license": "MIT",
+      "license": "(MIT OR CC0-1.0)",
       "engines": {
-        "node": ">=10"
+        "node": ">=12.20"
       },
       "funding": {
-        "type": "github",
-        "url": "https://github.com/sponsors/gregberge"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/@svgr/babel-plugin-remove-jsx-attribute": {
-      "version": "8.0.0",
+    "node_modules/@storybook/addon-essentials/node_modules/unique-string": {
+      "version": "3.0.0",
       "dev": true,
       "license": "MIT",
+      "dependencies": {
+        "crypto-random-string": "^4.0.0"
+      },
       "engines": {
-        "node": ">=14"
+        "node": ">=12"
       },
       "funding": {
-        "type": "github",
-        "url": "https://github.com/sponsors/gregberge"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/@svgr/babel-plugin-remove-jsx-empty-expression": {
-      "version": "8.0.0",
+    "node_modules/@storybook/addon-essentials/node_modules/util": {
+      "version": "0.12.5",
       "dev": true,
       "license": "MIT",
-      "engines": {
-        "node": ">=14"
-      },
-      "funding": {
-        "type": "github",
-        "url": "https://github.com/sponsors/gregberge"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
+      "dependencies": {
+        "inherits": "^2.0.3",
+        "is-arguments": "^1.0.4",
+        "is-generator-function": "^1.0.7",
+        "is-typed-array": "^1.1.3",
+        "which-typed-array": "^1.1.2"
       }
     },
-    "node_modules/@svgr/babel-plugin-replace-jsx-attribute-value": {
-      "version": "6.5.1",
+    "node_modules/@storybook/addon-highlight": {
+      "version": "8.1.10",
       "dev": true,
       "license": "MIT",
-      "engines": {
-        "node": ">=10"
+      "dependencies": {
+        "@storybook/global": "^5.0.0"
       },
       "funding": {
-        "type": "github",
-        "url": "https://github.com/sponsors/gregberge"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
+        "type": "opencollective",
+        "url": "https://opencollective.com/storybook"
       }
     },
-    "node_modules/@svgr/babel-plugin-svg-dynamic-title": {
-      "version": "6.5.1",
+    "node_modules/@storybook/addon-measure": {
+      "version": "8.1.10",
       "dev": true,
       "license": "MIT",
-      "engines": {
-        "node": ">=10"
+      "dependencies": {
+        "@storybook/global": "^5.0.0",
+        "tiny-invariant": "^1.3.1"
       },
       "funding": {
-        "type": "github",
-        "url": "https://github.com/sponsors/gregberge"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
+        "type": "opencollective",
+        "url": "https://opencollective.com/storybook"
       }
     },
-    "node_modules/@svgr/babel-plugin-svg-em-dimensions": {
-      "version": "6.5.1",
+    "node_modules/@storybook/addon-outline": {
+      "version": "8.1.10",
       "dev": true,
       "license": "MIT",
-      "engines": {
-        "node": ">=10"
+      "dependencies": {
+        "@storybook/global": "^5.0.0",
+        "ts-dedent": "^2.0.0"
       },
       "funding": {
-        "type": "github",
-        "url": "https://github.com/sponsors/gregberge"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
+        "type": "opencollective",
+        "url": "https://opencollective.com/storybook"
       }
     },
-    "node_modules/@svgr/babel-plugin-transform-react-native-svg": {
-      "version": "6.5.1",
+    "node_modules/@storybook/addon-toolbars": {
+      "version": "8.1.10",
       "dev": true,
       "license": "MIT",
-      "engines": {
-        "node": ">=10"
-      },
       "funding": {
-        "type": "github",
-        "url": "https://github.com/sponsors/gregberge"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
+        "type": "opencollective",
+        "url": "https://opencollective.com/storybook"
       }
     },
-    "node_modules/@svgr/babel-plugin-transform-svg-component": {
-      "version": "6.5.1",
+    "node_modules/@storybook/addon-viewport": {
+      "version": "8.1.10",
       "dev": true,
       "license": "MIT",
-      "engines": {
-        "node": ">=12"
+      "dependencies": {
+        "memoizerific": "^1.11.3"
       },
       "funding": {
-        "type": "github",
-        "url": "https://github.com/sponsors/gregberge"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
+        "type": "opencollective",
+        "url": "https://opencollective.com/storybook"
       }
     },
-    "node_modules/@svgr/babel-preset": {
-      "version": "6.5.1",
+    "node_modules/@storybook/addon-webpack5-compiler-babel": {
+      "version": "3.0.3",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@svgr/babel-plugin-add-jsx-attribute": "^6.5.1",
-        "@svgr/babel-plugin-remove-jsx-attribute": "*",
-        "@svgr/babel-plugin-remove-jsx-empty-expression": "*",
-        "@svgr/babel-plugin-replace-jsx-attribute-value": "^6.5.1",
-        "@svgr/babel-plugin-svg-dynamic-title": "^6.5.1",
-        "@svgr/babel-plugin-svg-em-dimensions": "^6.5.1",
-        "@svgr/babel-plugin-transform-react-native-svg": "^6.5.1",
-        "@svgr/babel-plugin-transform-svg-component": "^6.5.1"
+        "@babel/core": "^7.23.7",
+        "babel-loader": "^9.1.3"
       },
       "engines": {
-        "node": ">=10"
+        "node": ">=18"
+      }
+    },
+    "node_modules/@storybook/blocks": {
+      "version": "8.1.10",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@storybook/channels": "8.1.10",
+        "@storybook/client-logger": "8.1.10",
+        "@storybook/components": "8.1.10",
+        "@storybook/core-events": "8.1.10",
+        "@storybook/csf": "^0.1.7",
+        "@storybook/docs-tools": "8.1.10",
+        "@storybook/global": "^5.0.0",
+        "@storybook/icons": "^1.2.5",
+        "@storybook/manager-api": "8.1.10",
+        "@storybook/preview-api": "8.1.10",
+        "@storybook/theming": "8.1.10",
+        "@storybook/types": "8.1.10",
+        "@types/lodash": "^4.14.167",
+        "color-convert": "^2.0.1",
+        "dequal": "^2.0.2",
+        "lodash": "^4.17.21",
+        "markdown-to-jsx": "7.3.2",
+        "memoizerific": "^1.11.3",
+        "polished": "^4.2.2",
+        "react-colorful": "^5.1.2",
+        "telejson": "^7.2.0",
+        "tocbot": "^4.20.1",
+        "ts-dedent": "^2.0.0",
+        "util-deprecate": "^1.0.2"
       },
       "funding": {
-        "type": "github",
-        "url": "https://github.com/sponsors/gregberge"
+        "type": "opencollective",
+        "url": "https://opencollective.com/storybook"
       },
       "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
+        "react": "^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0-beta",
+        "react-dom": "^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0-beta"
+      },
+      "peerDependenciesMeta": {
+        "react": {
+          "optional": true
+        },
+        "react-dom": {
+          "optional": true
+        }
       }
     },
-    "node_modules/@svgr/core": {
-      "version": "6.5.1",
+    "node_modules/@storybook/blocks/node_modules/@babel/traverse": {
+      "version": "7.24.7",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/core": "^7.19.6",
-        "@svgr/babel-preset": "^6.5.1",
-        "@svgr/plugin-jsx": "^6.5.1",
-        "camelcase": "^6.2.0",
-        "cosmiconfig": "^7.0.1"
+        "@babel/code-frame": "^7.24.7",
+        "@babel/generator": "^7.24.7",
+        "@babel/helper-environment-visitor": "^7.24.7",
+        "@babel/helper-function-name": "^7.24.7",
+        "@babel/helper-hoist-variables": "^7.24.7",
+        "@babel/helper-split-export-declaration": "^7.24.7",
+        "@babel/parser": "^7.24.7",
+        "@babel/types": "^7.24.7",
+        "debug": "^4.3.1",
+        "globals": "^11.1.0"
       },
       "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "type": "github",
-        "url": "https://github.com/sponsors/gregberge"
+        "node": ">=6.9.0"
       }
     },
-    "node_modules/@svgr/hast-util-to-babel-ast": {
-      "version": "6.5.1",
+    "node_modules/@storybook/blocks/node_modules/@storybook/channels": {
+      "version": "8.1.10",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/types": "^7.20.0",
-        "entities": "^4.4.0"
-      },
-      "engines": {
-        "node": ">=10"
+        "@storybook/client-logger": "8.1.10",
+        "@storybook/core-events": "8.1.10",
+        "@storybook/global": "^5.0.0",
+        "telejson": "^7.2.0",
+        "tiny-invariant": "^1.3.1"
       },
       "funding": {
-        "type": "github",
-        "url": "https://github.com/sponsors/gregberge"
+        "type": "opencollective",
+        "url": "https://opencollective.com/storybook"
       }
     },
-    "node_modules/@svgr/hast-util-to-babel-ast/node_modules/entities": {
-      "version": "4.5.0",
+    "node_modules/@storybook/blocks/node_modules/@storybook/client-logger": {
+      "version": "8.1.10",
       "dev": true,
-      "license": "BSD-2-Clause",
-      "engines": {
-        "node": ">=0.12"
+      "license": "MIT",
+      "dependencies": {
+        "@storybook/global": "^5.0.0"
       },
       "funding": {
-        "url": "https://github.com/fb55/entities?sponsor=1"
+        "type": "opencollective",
+        "url": "https://opencollective.com/storybook"
       }
     },
-    "node_modules/@svgr/plugin-jsx": {
-      "version": "6.5.1",
+    "node_modules/@storybook/blocks/node_modules/@storybook/core-common": {
+      "version": "8.1.10",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/core": "^7.19.6",
-        "@svgr/babel-preset": "^6.5.1",
-        "@svgr/hast-util-to-babel-ast": "^6.5.1",
-        "svg-parser": "^2.0.4"
-      },
-      "engines": {
-        "node": ">=10"
+        "@storybook/core-events": "8.1.10",
+        "@storybook/csf-tools": "8.1.10",
+        "@storybook/node-logger": "8.1.10",
+        "@storybook/types": "8.1.10",
+        "@yarnpkg/fslib": "2.10.3",
+        "@yarnpkg/libzip": "2.3.0",
+        "chalk": "^4.1.0",
+        "cross-spawn": "^7.0.3",
+        "esbuild": "^0.18.0 || ^0.19.0 || ^0.20.0",
+        "esbuild-register": "^3.5.0",
+        "execa": "^5.0.0",
+        "file-system-cache": "2.3.0",
+        "find-cache-dir": "^3.0.0",
+        "find-up": "^5.0.0",
+        "fs-extra": "^11.1.0",
+        "glob": "^10.0.0",
+        "handlebars": "^4.7.7",
+        "lazy-universal-dotenv": "^4.0.0",
+        "node-fetch": "^2.0.0",
+        "picomatch": "^2.3.0",
+        "pkg-dir": "^5.0.0",
+        "prettier-fallback": "npm:prettier@^3",
+        "pretty-hrtime": "^1.0.3",
+        "resolve-from": "^5.0.0",
+        "semver": "^7.3.7",
+        "tempy": "^3.1.0",
+        "tiny-invariant": "^1.3.1",
+        "ts-dedent": "^2.0.0",
+        "util": "^0.12.4"
       },
       "funding": {
-        "type": "github",
-        "url": "https://github.com/sponsors/gregberge"
+        "type": "opencollective",
+        "url": "https://opencollective.com/storybook"
       },
       "peerDependencies": {
-        "@svgr/core": "^6.0.0"
+        "prettier": "^2 || ^3"
+      },
+      "peerDependenciesMeta": {
+        "prettier": {
+          "optional": true
+        }
       }
     },
-    "node_modules/@svgr/plugin-svgo": {
-      "version": "6.5.1",
+    "node_modules/@storybook/blocks/node_modules/@storybook/core-events": {
+      "version": "8.1.10",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "cosmiconfig": "^7.0.1",
-        "deepmerge": "^4.2.2",
-        "svgo": "^2.8.0"
-      },
-      "engines": {
-        "node": ">=10"
+        "@storybook/csf": "^0.1.7",
+        "ts-dedent": "^2.0.0"
       },
       "funding": {
-        "type": "github",
-        "url": "https://github.com/sponsors/gregberge"
-      },
-      "peerDependencies": {
-        "@svgr/core": "*"
+        "type": "opencollective",
+        "url": "https://opencollective.com/storybook"
       }
     },
-    "node_modules/@svgr/webpack": {
-      "version": "6.5.1",
+    "node_modules/@storybook/blocks/node_modules/@storybook/csf-tools": {
+      "version": "8.1.10",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/core": "^7.19.6",
-        "@babel/plugin-transform-react-constant-elements": "^7.18.12",
-        "@babel/preset-env": "^7.19.4",
-        "@babel/preset-react": "^7.18.6",
-        "@babel/preset-typescript": "^7.18.6",
-        "@svgr/core": "^6.5.1",
-        "@svgr/plugin-jsx": "^6.5.1",
-        "@svgr/plugin-svgo": "^6.5.1"
-      },
-      "engines": {
-        "node": ">=10"
+        "@babel/generator": "^7.24.4",
+        "@babel/parser": "^7.24.4",
+        "@babel/traverse": "^7.24.1",
+        "@babel/types": "^7.24.0",
+        "@storybook/csf": "^0.1.7",
+        "@storybook/types": "8.1.10",
+        "fs-extra": "^11.1.0",
+        "recast": "^0.23.5",
+        "ts-dedent": "^2.0.0"
       },
       "funding": {
-        "type": "github",
-        "url": "https://github.com/sponsors/gregberge"
+        "type": "opencollective",
+        "url": "https://opencollective.com/storybook"
       }
     },
-    "node_modules/@szmarczak/http-timer": {
-      "version": "4.0.6",
+    "node_modules/@storybook/blocks/node_modules/@storybook/docs-tools": {
+      "version": "8.1.10",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "defer-to-connect": "^2.0.0"
+        "@storybook/core-common": "8.1.10",
+        "@storybook/core-events": "8.1.10",
+        "@storybook/preview-api": "8.1.10",
+        "@storybook/types": "8.1.10",
+        "@types/doctrine": "^0.0.3",
+        "assert": "^2.1.0",
+        "doctrine": "^3.0.0",
+        "lodash": "^4.17.21"
       },
-      "engines": {
-        "node": ">=10"
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/storybook"
       }
     },
-    "node_modules/@testing-library/jest-native": {
-      "version": "5.4.1",
+    "node_modules/@storybook/blocks/node_modules/@storybook/node-logger": {
+      "version": "8.1.10",
+      "dev": true,
+      "license": "MIT",
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/storybook"
+      }
+    },
+    "node_modules/@storybook/blocks/node_modules/@storybook/preview-api": {
+      "version": "8.1.10",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "chalk": "^4.1.2",
-        "jest-diff": "^29.0.1",
-        "jest-matcher-utils": "^29.0.1",
-        "pretty-format": "^29.0.3",
-        "redent": "^3.0.0"
+        "@storybook/channels": "8.1.10",
+        "@storybook/client-logger": "8.1.10",
+        "@storybook/core-events": "8.1.10",
+        "@storybook/csf": "^0.1.7",
+        "@storybook/global": "^5.0.0",
+        "@storybook/types": "8.1.10",
+        "@types/qs": "^6.9.5",
+        "dequal": "^2.0.2",
+        "lodash": "^4.17.21",
+        "memoizerific": "^1.11.3",
+        "qs": "^6.10.0",
+        "tiny-invariant": "^1.3.1",
+        "ts-dedent": "^2.0.0",
+        "util-deprecate": "^1.0.2"
       },
-      "peerDependencies": {
-        "react": ">=16.0.0",
-        "react-native": ">=0.59",
-        "react-test-renderer": ">=16.0.0"
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/storybook"
       }
     },
-    "node_modules/@testing-library/jest-native/node_modules/ansi-styles": {
-      "version": "4.3.0",
+    "node_modules/@storybook/blocks/node_modules/@storybook/types": {
+      "version": "8.1.10",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "color-convert": "^2.0.1"
-      },
-      "engines": {
-        "node": ">=8"
+        "@storybook/channels": "8.1.10",
+        "@types/express": "^4.7.0",
+        "file-system-cache": "2.3.0"
       },
       "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
+        "type": "opencollective",
+        "url": "https://opencollective.com/storybook"
       }
     },
-    "node_modules/@testing-library/jest-native/node_modules/chalk": {
-      "version": "4.1.2",
+    "node_modules/@storybook/blocks/node_modules/ansi-styles": {
+      "version": "4.3.0",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "ansi-styles": "^4.1.0",
-        "supports-color": "^7.1.0"
+        "color-convert": "^2.0.1"
       },
       "engines": {
-        "node": ">=10"
+        "node": ">=8"
       },
       "funding": {
-        "url": "https://github.com/chalk/chalk?sponsor=1"
+        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
       }
     },
-    "node_modules/@testing-library/jest-native/node_modules/color-convert": {
-      "version": "2.0.1",
+    "node_modules/@storybook/blocks/node_modules/assert": {
+      "version": "2.1.0",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "color-name": "~1.1.4"
-      },
-      "engines": {
-        "node": ">=7.0.0"
+        "call-bind": "^1.0.2",
+        "is-nan": "^1.3.2",
+        "object-is": "^1.1.5",
+        "object.assign": "^4.1.4",
+        "util": "^0.12.5"
       }
     },
-    "node_modules/@testing-library/jest-native/node_modules/color-name": {
-      "version": "1.1.4",
+    "node_modules/@storybook/blocks/node_modules/brace-expansion": {
+      "version": "2.0.1",
       "dev": true,
-      "license": "MIT"
+      "license": "MIT",
+      "dependencies": {
+        "balanced-match": "^1.0.0"
+      }
     },
-    "node_modules/@testing-library/jest-native/node_modules/has-flag": {
-      "version": "4.0.0",
+    "node_modules/@storybook/blocks/node_modules/chalk": {
+      "version": "4.1.2",
       "dev": true,
       "license": "MIT",
+      "dependencies": {
+        "ansi-styles": "^4.1.0",
+        "supports-color": "^7.1.0"
+      },
       "engines": {
-        "node": ">=8"
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/chalk?sponsor=1"
       }
     },
-    "node_modules/@testing-library/jest-native/node_modules/supports-color": {
-      "version": "7.2.0",
+    "node_modules/@storybook/blocks/node_modules/color-convert": {
+      "version": "2.0.1",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "has-flag": "^4.0.0"
+        "color-name": "~1.1.4"
       },
       "engines": {
-        "node": ">=8"
+        "node": ">=7.0.0"
       }
     },
-    "node_modules/@testing-library/react-native": {
-      "version": "11.5.1",
+    "node_modules/@storybook/blocks/node_modules/color-name": {
+      "version": "1.1.4",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/@storybook/blocks/node_modules/crypto-random-string": {
+      "version": "4.0.0",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "pretty-format": "^29.4.0"
+        "type-fest": "^1.0.1"
       },
-      "peerDependencies": {
-        "jest": ">=28.0.0",
-        "react": ">=16.8.0",
-        "react-native": ">=0.59",
-        "react-test-renderer": ">=16.8.0"
+      "engines": {
+        "node": ">=12"
       },
-      "peerDependenciesMeta": {
-        "jest": {
-          "optional": true
-        }
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/@tootallnate/once": {
-      "version": "2.0.0",
-      "license": "MIT",
+    "node_modules/@storybook/blocks/node_modules/crypto-random-string/node_modules/type-fest": {
+      "version": "1.4.0",
+      "dev": true,
+      "license": "(MIT OR CC0-1.0)",
       "engines": {
-        "node": ">= 10"
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/@trivago/prettier-plugin-sort-imports": {
-      "version": "4.2.1",
+    "node_modules/@storybook/blocks/node_modules/find-cache-dir": {
+      "version": "3.3.2",
       "dev": true,
-      "license": "Apache-2.0",
+      "license": "MIT",
       "dependencies": {
-        "@babel/generator": "7.17.7",
-        "@babel/parser": "^7.20.5",
-        "@babel/traverse": "7.23.2",
-        "@babel/types": "7.17.0",
-        "javascript-natural-sort": "0.7.1",
-        "lodash": "^4.17.21"
+        "commondir": "^1.0.1",
+        "make-dir": "^3.0.2",
+        "pkg-dir": "^4.1.0"
       },
-      "peerDependencies": {
-        "@vue/compiler-sfc": "3.x",
-        "prettier": "2.x - 3.x"
+      "engines": {
+        "node": ">=8"
       },
-      "peerDependenciesMeta": {
-        "@vue/compiler-sfc": {
-          "optional": true
-        }
+      "funding": {
+        "url": "https://github.com/avajs/find-cache-dir?sponsor=1"
       }
     },
-    "node_modules/@trivago/prettier-plugin-sort-imports/node_modules/@babel/generator": {
-      "version": "7.17.7",
+    "node_modules/@storybook/blocks/node_modules/find-cache-dir/node_modules/find-up": {
+      "version": "4.1.0",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/types": "^7.17.0",
-        "jsesc": "^2.5.1",
-        "source-map": "^0.5.0"
+        "locate-path": "^5.0.0",
+        "path-exists": "^4.0.0"
       },
       "engines": {
-        "node": ">=6.9.0"
+        "node": ">=8"
       }
     },
-    "node_modules/@trivago/prettier-plugin-sort-imports/node_modules/@babel/types": {
-      "version": "7.17.0",
+    "node_modules/@storybook/blocks/node_modules/find-cache-dir/node_modules/pkg-dir": {
+      "version": "4.2.0",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-validator-identifier": "^7.16.7",
-        "to-fast-properties": "^2.0.0"
+        "find-up": "^4.0.0"
       },
       "engines": {
-        "node": ">=6.9.0"
+        "node": ">=8"
       }
     },
-    "node_modules/@trivago/prettier-plugin-sort-imports/node_modules/source-map": {
-      "version": "0.5.7",
+    "node_modules/@storybook/blocks/node_modules/fs-extra": {
+      "version": "11.2.0",
       "dev": true,
-      "license": "BSD-3-Clause",
+      "license": "MIT",
+      "dependencies": {
+        "graceful-fs": "^4.2.0",
+        "jsonfile": "^6.0.1",
+        "universalify": "^2.0.0"
+      },
       "engines": {
-        "node": ">=0.10.0"
+        "node": ">=14.14"
       }
     },
-    "node_modules/@trysound/sax": {
-      "version": "0.2.0",
+    "node_modules/@storybook/blocks/node_modules/glob": {
+      "version": "10.4.2",
       "dev": true,
       "license": "ISC",
+      "dependencies": {
+        "foreground-child": "^3.1.0",
+        "jackspeak": "^3.1.2",
+        "minimatch": "^9.0.4",
+        "minipass": "^7.1.2",
+        "package-json-from-dist": "^1.0.0",
+        "path-scurry": "^1.11.1"
+      },
+      "bin": {
+        "glob": "dist/esm/bin.mjs"
+      },
       "engines": {
-        "node": ">=10.13.0"
+        "node": ">=16 || 14 >=14.18"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
       }
     },
-    "node_modules/@tsconfig/node10": {
-      "version": "1.0.9",
-      "devOptional": true,
-      "license": "MIT"
-    },
-    "node_modules/@tsconfig/node12": {
-      "version": "1.0.11",
-      "devOptional": true,
-      "license": "MIT"
-    },
-    "node_modules/@tsconfig/node14": {
-      "version": "1.0.3",
-      "devOptional": true,
-      "license": "MIT"
-    },
-    "node_modules/@tsconfig/node16": {
-      "version": "1.0.4",
-      "devOptional": true,
-      "license": "MIT"
+    "node_modules/@storybook/blocks/node_modules/has-flag": {
+      "version": "4.0.0",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=8"
+      }
     },
-    "node_modules/@turf/along": {
-      "version": "6.5.0",
+    "node_modules/@storybook/blocks/node_modules/is-stream": {
+      "version": "3.0.0",
+      "dev": true,
       "license": "MIT",
-      "dependencies": {
-        "@turf/bearing": "^6.5.0",
-        "@turf/destination": "^6.5.0",
-        "@turf/distance": "^6.5.0",
-        "@turf/helpers": "^6.5.0",
-        "@turf/invariant": "^6.5.0"
+      "engines": {
+        "node": "^12.20.0 || ^14.13.1 || >=16.0.0"
       },
       "funding": {
-        "url": "https://opencollective.com/turf"
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/@turf/bbox": {
-      "version": "6.5.0",
-      "license": "MIT",
+    "node_modules/@storybook/blocks/node_modules/jackspeak": {
+      "version": "3.4.0",
+      "dev": true,
+      "license": "BlueOak-1.0.0",
       "dependencies": {
-        "@turf/helpers": "^6.5.0",
-        "@turf/meta": "^6.5.0"
+        "@isaacs/cliui": "^8.0.2"
+      },
+      "engines": {
+        "node": ">=14"
       },
       "funding": {
-        "url": "https://opencollective.com/turf"
+        "url": "https://github.com/sponsors/isaacs"
+      },
+      "optionalDependencies": {
+        "@pkgjs/parseargs": "^0.11.0"
       }
     },
-    "node_modules/@turf/bearing": {
-      "version": "6.5.0",
+    "node_modules/@storybook/blocks/node_modules/locate-path": {
+      "version": "5.0.0",
+      "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@turf/helpers": "^6.5.0",
-        "@turf/invariant": "^6.5.0"
+        "p-locate": "^4.1.0"
       },
-      "funding": {
-        "url": "https://opencollective.com/turf"
+      "engines": {
+        "node": ">=8"
       }
     },
-    "node_modules/@turf/destination": {
-      "version": "6.5.0",
+    "node_modules/@storybook/blocks/node_modules/make-dir": {
+      "version": "3.1.0",
+      "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@turf/helpers": "^6.5.0",
-        "@turf/invariant": "^6.5.0"
+        "semver": "^6.0.0"
+      },
+      "engines": {
+        "node": ">=8"
       },
       "funding": {
-        "url": "https://opencollective.com/turf"
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/@turf/distance": {
-      "version": "6.5.0",
-      "license": "MIT",
+    "node_modules/@storybook/blocks/node_modules/make-dir/node_modules/semver": {
+      "version": "6.3.1",
+      "dev": true,
+      "license": "ISC",
+      "bin": {
+        "semver": "bin/semver.js"
+      }
+    },
+    "node_modules/@storybook/blocks/node_modules/minimatch": {
+      "version": "9.0.4",
+      "dev": true,
+      "license": "ISC",
       "dependencies": {
-        "@turf/helpers": "^6.5.0",
-        "@turf/invariant": "^6.5.0"
+        "brace-expansion": "^2.0.1"
+      },
+      "engines": {
+        "node": ">=16 || 14 >=14.17"
       },
       "funding": {
-        "url": "https://opencollective.com/turf"
+        "url": "https://github.com/sponsors/isaacs"
       }
     },
-    "node_modules/@turf/helpers": {
-      "version": "6.5.0",
-      "license": "MIT",
-      "funding": {
-        "url": "https://opencollective.com/turf"
+    "node_modules/@storybook/blocks/node_modules/minipass": {
+      "version": "7.1.2",
+      "dev": true,
+      "license": "ISC",
+      "engines": {
+        "node": ">=16 || 14 >=14.17"
       }
     },
-    "node_modules/@turf/invariant": {
-      "version": "6.5.0",
+    "node_modules/@storybook/blocks/node_modules/p-limit": {
+      "version": "2.3.0",
+      "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@turf/helpers": "^6.5.0"
+        "p-try": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=6"
       },
       "funding": {
-        "url": "https://opencollective.com/turf"
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/@turf/length": {
-      "version": "6.5.0",
+    "node_modules/@storybook/blocks/node_modules/p-locate": {
+      "version": "4.1.0",
+      "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@turf/distance": "^6.5.0",
-        "@turf/helpers": "^6.5.0",
-        "@turf/meta": "^6.5.0"
+        "p-limit": "^2.2.0"
       },
-      "funding": {
-        "url": "https://opencollective.com/turf"
+      "engines": {
+        "node": ">=8"
       }
     },
-    "node_modules/@turf/line-intersect": {
-      "version": "6.5.0",
+    "node_modules/@storybook/blocks/node_modules/path-exists": {
+      "version": "4.0.0",
+      "dev": true,
       "license": "MIT",
-      "dependencies": {
-        "@turf/helpers": "^6.5.0",
-        "@turf/invariant": "^6.5.0",
-        "@turf/line-segment": "^6.5.0",
-        "@turf/meta": "^6.5.0",
-        "geojson-rbush": "3.x"
-      },
-      "funding": {
-        "url": "https://opencollective.com/turf"
+      "engines": {
+        "node": ">=8"
       }
     },
-    "node_modules/@turf/line-segment": {
-      "version": "6.5.0",
+    "node_modules/@storybook/blocks/node_modules/recast": {
+      "version": "0.23.9",
+      "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@turf/helpers": "^6.5.0",
-        "@turf/invariant": "^6.5.0",
-        "@turf/meta": "^6.5.0"
+        "ast-types": "^0.16.1",
+        "esprima": "~4.0.0",
+        "source-map": "~0.6.1",
+        "tiny-invariant": "^1.3.3",
+        "tslib": "^2.0.1"
       },
-      "funding": {
-        "url": "https://opencollective.com/turf"
+      "engines": {
+        "node": ">= 4"
       }
     },
-    "node_modules/@turf/meta": {
-      "version": "6.5.0",
+    "node_modules/@storybook/blocks/node_modules/source-map": {
+      "version": "0.6.1",
+      "dev": true,
+      "license": "BSD-3-Clause",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/@storybook/blocks/node_modules/supports-color": {
+      "version": "7.2.0",
+      "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@turf/helpers": "^6.5.0"
+        "has-flag": "^4.0.0"
       },
-      "funding": {
-        "url": "https://opencollective.com/turf"
+      "engines": {
+        "node": ">=8"
       }
     },
-    "node_modules/@turf/nearest-point-on-line": {
-      "version": "6.5.0",
+    "node_modules/@storybook/blocks/node_modules/temp-dir": {
+      "version": "3.0.0",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=14.16"
+      }
+    },
+    "node_modules/@storybook/blocks/node_modules/tempy": {
+      "version": "3.1.0",
+      "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@turf/bearing": "^6.5.0",
-        "@turf/destination": "^6.5.0",
-        "@turf/distance": "^6.5.0",
-        "@turf/helpers": "^6.5.0",
-        "@turf/invariant": "^6.5.0",
-        "@turf/line-intersect": "^6.5.0",
-        "@turf/meta": "^6.5.0"
+        "is-stream": "^3.0.0",
+        "temp-dir": "^3.0.0",
+        "type-fest": "^2.12.2",
+        "unique-string": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=14.16"
       },
       "funding": {
-        "url": "https://opencollective.com/turf"
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/@types/babel__core": {
-      "version": "7.20.5",
-      "resolved": "https://registry.npmjs.org/@types/babel__core/-/babel__core-7.20.5.tgz",
-      "integrity": "sha512-qoQprZvz5wQFJwMDqeseRXWv3rqMvhgpbXFfVyWhbx9X47POIA6i/+dXefEmZKoAgOaTdaIgNSMqMIU61yRyzA==",
-      "dependencies": {
-        "@babel/parser": "^7.20.7",
-        "@babel/types": "^7.20.7",
-        "@types/babel__generator": "*",
-        "@types/babel__template": "*",
-        "@types/babel__traverse": "*"
+    "node_modules/@storybook/blocks/node_modules/type-fest": {
+      "version": "2.19.0",
+      "dev": true,
+      "license": "(MIT OR CC0-1.0)",
+      "engines": {
+        "node": ">=12.20"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/@types/babel__generator": {
-      "version": "7.6.4",
+    "node_modules/@storybook/blocks/node_modules/unique-string": {
+      "version": "3.0.0",
+      "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/types": "^7.0.0"
+        "crypto-random-string": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/@types/babel__template": {
-      "version": "7.4.1",
+    "node_modules/@storybook/blocks/node_modules/util": {
+      "version": "0.12.5",
+      "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/parser": "^7.1.0",
-        "@babel/types": "^7.0.0"
+        "inherits": "^2.0.3",
+        "is-arguments": "^1.0.4",
+        "is-generator-function": "^1.0.7",
+        "is-typed-array": "^1.1.3",
+        "which-typed-array": "^1.1.2"
       }
     },
-    "node_modules/@types/babel__traverse": {
-      "version": "7.18.0",
+    "node_modules/@storybook/builder-manager": {
+      "version": "8.1.10",
+      "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/types": "^7.3.0"
+        "@fal-works/esbuild-plugin-global-externals": "^2.1.2",
+        "@storybook/core-common": "8.1.10",
+        "@storybook/manager": "8.1.10",
+        "@storybook/node-logger": "8.1.10",
+        "@types/ejs": "^3.1.1",
+        "@yarnpkg/esbuild-plugin-pnp": "^3.0.0-rc.10",
+        "browser-assert": "^1.2.1",
+        "ejs": "^3.1.10",
+        "esbuild": "^0.18.0 || ^0.19.0 || ^0.20.0",
+        "esbuild-plugin-alias": "^0.2.1",
+        "express": "^4.17.3",
+        "fs-extra": "^11.1.0",
+        "process": "^0.11.10",
+        "util": "^0.12.4"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/storybook"
       }
     },
-    "node_modules/@types/body-parser": {
-      "version": "1.19.2",
+    "node_modules/@storybook/builder-manager/node_modules/@babel/traverse": {
+      "version": "7.24.7",
+      "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@types/connect": "*",
-        "@types/node": "*"
+        "@babel/code-frame": "^7.24.7",
+        "@babel/generator": "^7.24.7",
+        "@babel/helper-environment-visitor": "^7.24.7",
+        "@babel/helper-function-name": "^7.24.7",
+        "@babel/helper-hoist-variables": "^7.24.7",
+        "@babel/helper-split-export-declaration": "^7.24.7",
+        "@babel/parser": "^7.24.7",
+        "@babel/types": "^7.24.7",
+        "debug": "^4.3.1",
+        "globals": "^11.1.0"
+      },
+      "engines": {
+        "node": ">=6.9.0"
       }
     },
-    "node_modules/@types/bonjour": {
-      "version": "3.5.13",
-      "resolved": "https://registry.npmjs.org/@types/bonjour/-/bonjour-3.5.13.tgz",
-      "integrity": "sha512-z9fJ5Im06zvUL548KvYNecEVlA7cVDkGUi6kZusb04mpyEFKCIZJvloCcmpmLaIahDpOQGHaHmG6imtPMmPXGQ==",
+    "node_modules/@storybook/builder-manager/node_modules/@storybook/channels": {
+      "version": "8.1.10",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "@types/node": "*"
+        "@storybook/client-logger": "8.1.10",
+        "@storybook/core-events": "8.1.10",
+        "@storybook/global": "^5.0.0",
+        "telejson": "^7.2.0",
+        "tiny-invariant": "^1.3.1"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/storybook"
       }
     },
-    "node_modules/@types/cacheable-request": {
-      "version": "6.0.3",
+    "node_modules/@storybook/builder-manager/node_modules/@storybook/client-logger": {
+      "version": "8.1.10",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@types/http-cache-semantics": "*",
-        "@types/keyv": "^3.1.4",
-        "@types/node": "*",
-        "@types/responselike": "^1.0.0"
+        "@storybook/global": "^5.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/storybook"
       }
     },
-    "node_modules/@types/canvas-size": {
-      "version": "1.2.2",
-      "dev": true,
-      "license": "MIT"
-    },
-    "node_modules/@types/concurrently": {
-      "version": "7.0.0",
+    "node_modules/@storybook/builder-manager/node_modules/@storybook/core-common": {
+      "version": "8.1.10",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "concurrently": "*"
+        "@storybook/core-events": "8.1.10",
+        "@storybook/csf-tools": "8.1.10",
+        "@storybook/node-logger": "8.1.10",
+        "@storybook/types": "8.1.10",
+        "@yarnpkg/fslib": "2.10.3",
+        "@yarnpkg/libzip": "2.3.0",
+        "chalk": "^4.1.0",
+        "cross-spawn": "^7.0.3",
+        "esbuild": "^0.18.0 || ^0.19.0 || ^0.20.0",
+        "esbuild-register": "^3.5.0",
+        "execa": "^5.0.0",
+        "file-system-cache": "2.3.0",
+        "find-cache-dir": "^3.0.0",
+        "find-up": "^5.0.0",
+        "fs-extra": "^11.1.0",
+        "glob": "^10.0.0",
+        "handlebars": "^4.7.7",
+        "lazy-universal-dotenv": "^4.0.0",
+        "node-fetch": "^2.0.0",
+        "picomatch": "^2.3.0",
+        "pkg-dir": "^5.0.0",
+        "prettier-fallback": "npm:prettier@^3",
+        "pretty-hrtime": "^1.0.3",
+        "resolve-from": "^5.0.0",
+        "semver": "^7.3.7",
+        "tempy": "^3.1.0",
+        "tiny-invariant": "^1.3.1",
+        "ts-dedent": "^2.0.0",
+        "util": "^0.12.4"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/storybook"
+      },
+      "peerDependencies": {
+        "prettier": "^2 || ^3"
+      },
+      "peerDependenciesMeta": {
+        "prettier": {
+          "optional": true
+        }
       }
     },
-    "node_modules/@types/connect": {
-      "version": "3.4.35",
+    "node_modules/@storybook/builder-manager/node_modules/@storybook/core-events": {
+      "version": "8.1.10",
+      "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@types/node": "*"
+        "@storybook/csf": "^0.1.7",
+        "ts-dedent": "^2.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/storybook"
       }
     },
-    "node_modules/@types/connect-history-api-fallback": {
-      "version": "1.5.4",
-      "resolved": "https://registry.npmjs.org/@types/connect-history-api-fallback/-/connect-history-api-fallback-1.5.4.tgz",
-      "integrity": "sha512-n6Cr2xS1h4uAulPRdlw6Jl6s1oG8KrVilPN2yUITEs+K48EzMJJ3W1xy8K5eWuFvjp3R74AOIGSmp2UfBJ8HFw==",
+    "node_modules/@storybook/builder-manager/node_modules/@storybook/csf-tools": {
+      "version": "8.1.10",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "@types/express-serve-static-core": "*",
-        "@types/node": "*"
+        "@babel/generator": "^7.24.4",
+        "@babel/parser": "^7.24.4",
+        "@babel/traverse": "^7.24.1",
+        "@babel/types": "^7.24.0",
+        "@storybook/csf": "^0.1.7",
+        "@storybook/types": "8.1.10",
+        "fs-extra": "^11.1.0",
+        "recast": "^0.23.5",
+        "ts-dedent": "^2.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/storybook"
       }
     },
-    "node_modules/@types/cross-spawn": {
-      "version": "6.0.6",
-      "resolved": "https://registry.npmjs.org/@types/cross-spawn/-/cross-spawn-6.0.6.tgz",
-      "integrity": "sha512-fXRhhUkG4H3TQk5dBhQ7m/JDdSNHKwR2BBia62lhwEIq9xGiQKLxd6LymNhn47SjXhsUEPmxi+PKw2OkW4LLjA==",
-      "dependencies": {
-        "@types/node": "*"
+    "node_modules/@storybook/builder-manager/node_modules/@storybook/node-logger": {
+      "version": "8.1.10",
+      "dev": true,
+      "license": "MIT",
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/storybook"
       }
     },
-    "node_modules/@types/debug": {
-      "version": "4.1.12",
+    "node_modules/@storybook/builder-manager/node_modules/@storybook/types": {
+      "version": "8.1.10",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@types/ms": "*"
+        "@storybook/channels": "8.1.10",
+        "@types/express": "^4.7.0",
+        "file-system-cache": "2.3.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/storybook"
       }
     },
-    "node_modules/@types/detect-port": {
-      "version": "1.3.5",
-      "resolved": "https://registry.npmjs.org/@types/detect-port/-/detect-port-1.3.5.tgz",
-      "integrity": "sha512-Rf3/lB9WkDfIL9eEKaSYKc+1L/rNVYBjThk22JTqQw0YozXarX8YljFAz+HCoC6h4B4KwCMsBPZHaFezwT4BNA=="
-    },
-    "node_modules/@types/doctrine": {
-      "version": "0.0.3",
-      "resolved": "https://registry.npmjs.org/@types/doctrine/-/doctrine-0.0.3.tgz",
-      "integrity": "sha512-w5jZ0ee+HaPOaX25X2/2oGR/7rgAQSYII7X7pp0m9KgBfMP7uKfMfTvcpl5Dj+eDBbpxKGiqE+flqDr6XTd2RA=="
-    },
-    "node_modules/@types/ejs": {
-      "version": "3.1.5",
-      "resolved": "https://registry.npmjs.org/@types/ejs/-/ejs-3.1.5.tgz",
-      "integrity": "sha512-nv+GSx77ZtXiJzwKdsASqi+YQ5Z7vwHsTP0JY2SiQgjGckkBRKZnk8nIM+7oUZ1VCtuTz0+By4qVR7fqzp/Dfg=="
-    },
-    "node_modules/@types/emscripten": {
-      "version": "1.39.10",
-      "resolved": "https://registry.npmjs.org/@types/emscripten/-/emscripten-1.39.10.tgz",
-      "integrity": "sha512-TB/6hBkYQJxsZHSqyeuO1Jt0AB/bW6G7rHt9g7lML7SOF6lbgcHvw/Lr+69iqN0qxgXLhWKScAon73JNnptuDw=="
-    },
-    "node_modules/@types/escodegen": {
-      "version": "0.0.6",
-      "resolved": "https://registry.npmjs.org/@types/escodegen/-/escodegen-0.0.6.tgz",
-      "integrity": "sha512-AjwI4MvWx3HAOaZqYsjKWyEObT9lcVV0Y0V8nXo6cXzN8ZiMxVhf6F3d/UNvXVGKrEzL/Dluc5p+y9GkzlTWig=="
-    },
-    "node_modules/@types/eslint": {
-      "version": "8.4.6",
+    "node_modules/@storybook/builder-manager/node_modules/ansi-styles": {
+      "version": "4.3.0",
+      "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@types/estree": "*",
-        "@types/json-schema": "*"
+        "color-convert": "^2.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
       }
     },
-    "node_modules/@types/eslint-scope": {
-      "version": "3.7.4",
+    "node_modules/@storybook/builder-manager/node_modules/brace-expansion": {
+      "version": "2.0.1",
+      "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@types/eslint": "*",
-        "@types/estree": "*"
-      }
-    },
-    "node_modules/@types/estree": {
-      "version": "0.0.51",
-      "license": "MIT"
-    },
-    "node_modules/@types/express": {
-      "version": "4.17.21",
-      "resolved": "https://registry.npmjs.org/@types/express/-/express-4.17.21.tgz",
-      "integrity": "sha512-ejlPM315qwLpaQlQDTjPdsUFSc6ZsP4AN6AlWnogPjQ7CVi7PYF3YVz+CY3jE2pwYf7E/7HlDAN0rV2GxTG0HQ==",
-      "dependencies": {
-        "@types/body-parser": "*",
-        "@types/express-serve-static-core": "^4.17.33",
-        "@types/qs": "*",
-        "@types/serve-static": "*"
+        "balanced-match": "^1.0.0"
       }
     },
-    "node_modules/@types/express-serve-static-core": {
-      "version": "4.19.0",
-      "resolved": "https://registry.npmjs.org/@types/express-serve-static-core/-/express-serve-static-core-4.19.0.tgz",
-      "integrity": "sha512-bGyep3JqPCRry1wq+O5n7oiBgGWmeIJXPjXXCo8EK0u8duZGSYar7cGqd3ML2JUsLGeB7fmc06KYo9fLGWqPvQ==",
+    "node_modules/@storybook/builder-manager/node_modules/chalk": {
+      "version": "4.1.2",
+      "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "@types/node": "*",
-        "@types/qs": "*",
-        "@types/range-parser": "*",
-        "@types/send": "*"
+        "ansi-styles": "^4.1.0",
+        "supports-color": "^7.1.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/chalk?sponsor=1"
       }
     },
-    "node_modules/@types/fs-extra": {
-      "version": "9.0.13",
+    "node_modules/@storybook/builder-manager/node_modules/color-convert": {
+      "version": "2.0.1",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@types/node": "*"
+        "color-name": "~1.1.4"
+      },
+      "engines": {
+        "node": ">=7.0.0"
       }
     },
-    "node_modules/@types/geojson": {
-      "version": "7946.0.8",
+    "node_modules/@storybook/builder-manager/node_modules/color-name": {
+      "version": "1.1.4",
+      "dev": true,
       "license": "MIT"
     },
-    "node_modules/@types/glob": {
-      "version": "7.2.0",
+    "node_modules/@storybook/builder-manager/node_modules/crypto-random-string": {
+      "version": "4.0.0",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@types/minimatch": "*",
-        "@types/node": "*"
-      }
-    },
-    "node_modules/@types/graceful-fs": {
-      "version": "4.1.5",
-      "license": "MIT",
-      "dependencies": {
-        "@types/node": "*"
+        "type-fest": "^1.0.1"
+      },
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/@types/hammerjs": {
-      "version": "2.0.41",
-      "license": "MIT"
-    },
-    "node_modules/@types/hast": {
-      "version": "3.0.4",
-      "resolved": "https://registry.npmjs.org/@types/hast/-/hast-3.0.4.tgz",
-      "integrity": "sha512-WPs+bbQw5aCj+x6laNGWLH3wviHtoCv/P3+otBhbOhJgG8qtpdAMlTCxLtsTWA7LH1Oh/bFCHsBn0TPS5m30EQ==",
-      "dependencies": {
-        "@types/unist": "*"
+    "node_modules/@storybook/builder-manager/node_modules/crypto-random-string/node_modules/type-fest": {
+      "version": "1.4.0",
+      "dev": true,
+      "license": "(MIT OR CC0-1.0)",
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/@types/hoist-non-react-statics": {
+    "node_modules/@storybook/builder-manager/node_modules/find-cache-dir": {
       "version": "3.3.2",
+      "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@types/react": "*",
-        "hoist-non-react-statics": "^3.3.0"
+        "commondir": "^1.0.1",
+        "make-dir": "^3.0.2",
+        "pkg-dir": "^4.1.0"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/avajs/find-cache-dir?sponsor=1"
       }
     },
-    "node_modules/@types/html-minifier-terser": {
-      "version": "6.1.0",
-      "license": "MIT"
-    },
-    "node_modules/@types/http-cache-semantics": {
-      "version": "4.0.1",
-      "dev": true,
-      "license": "MIT"
-    },
-    "node_modules/@types/http-errors": {
-      "version": "2.0.4",
-      "resolved": "https://registry.npmjs.org/@types/http-errors/-/http-errors-2.0.4.tgz",
-      "integrity": "sha512-D0CFMMtydbJAegzOyHjtiKPLlvnm3iTZyZRSZoLq2mRhDdmLfIWOCYPfQJ4cu2erKghU++QvjcUjp/5h7hESpA=="
-    },
-    "node_modules/@types/http-proxy": {
-      "version": "1.17.9",
+    "node_modules/@storybook/builder-manager/node_modules/find-cache-dir/node_modules/find-up": {
+      "version": "4.1.0",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@types/node": "*"
+        "locate-path": "^5.0.0",
+        "path-exists": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=8"
       }
     },
-    "node_modules/@types/istanbul-lib-coverage": {
-      "version": "2.0.4",
-      "license": "MIT"
-    },
-    "node_modules/@types/istanbul-lib-report": {
-      "version": "3.0.0",
+    "node_modules/@storybook/builder-manager/node_modules/find-cache-dir/node_modules/pkg-dir": {
+      "version": "4.2.0",
+      "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@types/istanbul-lib-coverage": "*"
+        "find-up": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=8"
       }
     },
-    "node_modules/@types/istanbul-reports": {
-      "version": "3.0.1",
+    "node_modules/@storybook/builder-manager/node_modules/fs-extra": {
+      "version": "11.2.0",
+      "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@types/istanbul-lib-report": "*"
+        "graceful-fs": "^4.2.0",
+        "jsonfile": "^6.0.1",
+        "universalify": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=14.14"
       }
     },
-    "node_modules/@types/jest": {
-      "version": "29.5.2",
+    "node_modules/@storybook/builder-manager/node_modules/glob": {
+      "version": "10.4.2",
       "dev": true,
-      "license": "MIT",
+      "license": "ISC",
       "dependencies": {
-        "expect": "^29.0.0",
-        "pretty-format": "^29.0.0"
+        "foreground-child": "^3.1.0",
+        "jackspeak": "^3.1.2",
+        "minimatch": "^9.0.4",
+        "minipass": "^7.1.2",
+        "package-json-from-dist": "^1.0.0",
+        "path-scurry": "^1.11.1"
+      },
+      "bin": {
+        "glob": "dist/esm/bin.mjs"
+      },
+      "engines": {
+        "node": ">=16 || 14 >=14.18"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
       }
     },
-    "node_modules/@types/jest-when": {
-      "version": "3.5.2",
+    "node_modules/@storybook/builder-manager/node_modules/has-flag": {
+      "version": "4.0.0",
       "dev": true,
       "license": "MIT",
-      "dependencies": {
-        "@types/jest": "*"
+      "engines": {
+        "node": ">=8"
       }
     },
-    "node_modules/@types/js-yaml": {
-      "version": "4.0.5",
+    "node_modules/@storybook/builder-manager/node_modules/is-stream": {
+      "version": "3.0.0",
       "dev": true,
-      "license": "MIT"
-    },
-    "node_modules/@types/jsdom": {
-      "version": "20.0.1",
       "license": "MIT",
-      "dependencies": {
-        "@types/node": "*",
-        "@types/tough-cookie": "*",
-        "parse5": "^7.0.0"
-      }
-    },
-    "node_modules/@types/jsdom/node_modules/entities": {
-      "version": "4.5.0",
-      "license": "BSD-2-Clause",
       "engines": {
-        "node": ">=0.12"
+        "node": "^12.20.0 || ^14.13.1 || >=16.0.0"
       },
       "funding": {
-        "url": "https://github.com/fb55/entities?sponsor=1"
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/@types/jsdom/node_modules/parse5": {
-      "version": "7.1.2",
-      "license": "MIT",
+    "node_modules/@storybook/builder-manager/node_modules/jackspeak": {
+      "version": "3.4.0",
+      "dev": true,
+      "license": "BlueOak-1.0.0",
       "dependencies": {
-        "entities": "^4.4.0"
+        "@isaacs/cliui": "^8.0.2"
+      },
+      "engines": {
+        "node": ">=14"
       },
       "funding": {
-        "url": "https://github.com/inikulin/parse5?sponsor=1"
+        "url": "https://github.com/sponsors/isaacs"
+      },
+      "optionalDependencies": {
+        "@pkgjs/parseargs": "^0.11.0"
       }
     },
-    "node_modules/@types/json-schema": {
-      "version": "7.0.12",
-      "license": "MIT"
-    },
-    "node_modules/@types/json5": {
-      "version": "0.0.29",
-      "dev": true,
-      "license": "MIT"
-    },
-    "node_modules/@types/keyv": {
-      "version": "3.1.4",
+    "node_modules/@storybook/builder-manager/node_modules/locate-path": {
+      "version": "5.0.0",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@types/node": "*"
+        "p-locate": "^4.1.0"
+      },
+      "engines": {
+        "node": ">=8"
       }
     },
-    "node_modules/@types/lodash": {
-      "version": "4.14.195",
-      "license": "MIT"
-    },
-    "node_modules/@types/mapbox-gl": {
-      "version": "2.7.13",
+    "node_modules/@storybook/builder-manager/node_modules/make-dir": {
+      "version": "3.1.0",
+      "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@types/geojson": "*"
+        "semver": "^6.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/@types/mdx": {
-      "version": "2.0.12",
-      "resolved": "https://registry.npmjs.org/@types/mdx/-/mdx-2.0.12.tgz",
-      "integrity": "sha512-H9VZ9YqE+H28FQVchC83RCs5xQ2J7mAAv6qdDEaWmXEVl3OpdH+xfrSUzQ1lp7U7oSTRZ0RvW08ASPJsYBi7Cw=="
-    },
-    "node_modules/@types/mime": {
-      "version": "1.3.5",
-      "resolved": "https://registry.npmjs.org/@types/mime/-/mime-1.3.5.tgz",
-      "integrity": "sha512-/pyBZWSLD2n0dcHE3hq8s8ZvcETHtEuF+3E7XVt0Ig2nvsVQXdghHVcEkIWjy9A0wKfTn97a/PSDYohKIlnP/w=="
+    "node_modules/@storybook/builder-manager/node_modules/make-dir/node_modules/semver": {
+      "version": "6.3.1",
+      "dev": true,
+      "license": "ISC",
+      "bin": {
+        "semver": "bin/semver.js"
+      }
     },
-    "node_modules/@types/minimatch": {
-      "version": "3.0.5",
+    "node_modules/@storybook/builder-manager/node_modules/minimatch": {
+      "version": "9.0.4",
       "dev": true,
-      "license": "MIT"
+      "license": "ISC",
+      "dependencies": {
+        "brace-expansion": "^2.0.1"
+      },
+      "engines": {
+        "node": ">=16 || 14 >=14.17"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
+      }
     },
-    "node_modules/@types/ms": {
-      "version": "0.7.34",
+    "node_modules/@storybook/builder-manager/node_modules/minipass": {
+      "version": "7.1.2",
       "dev": true,
-      "license": "MIT"
+      "license": "ISC",
+      "engines": {
+        "node": ">=16 || 14 >=14.17"
+      }
     },
-    "node_modules/@types/node": {
-      "version": "20.11.5",
+    "node_modules/@storybook/builder-manager/node_modules/p-limit": {
+      "version": "2.3.0",
+      "dev": true,
       "license": "MIT",
       "dependencies": {
-        "undici-types": "~5.26.4"
+        "p-try": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=6"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/@types/node-forge": {
-      "version": "1.3.11",
-      "resolved": "https://registry.npmjs.org/@types/node-forge/-/node-forge-1.3.11.tgz",
-      "integrity": "sha512-FQx220y22OKNTqaByeBGqHWYz4cl94tpcxeFdvBo3wjG6XPBuZ0BNgNZRV5J5TFmmcsJ4IzsLkmGRiQbnYsBEQ==",
+    "node_modules/@storybook/builder-manager/node_modules/p-locate": {
+      "version": "4.1.0",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "@types/node": "*"
+        "p-limit": "^2.2.0"
+      },
+      "engines": {
+        "node": ">=8"
       }
     },
-    "node_modules/@types/normalize-package-data": {
-      "version": "2.4.4",
-      "resolved": "https://registry.npmjs.org/@types/normalize-package-data/-/normalize-package-data-2.4.4.tgz",
-      "integrity": "sha512-37i+OaWTh9qeK4LSHPsyRC7NahnGotNuZvjLSgcPzblpHB3rrCJxAOgI5gCdKm7coonsaX1Of0ILiTcnZjbfxA=="
-    },
-    "node_modules/@types/parse-json": {
+    "node_modules/@storybook/builder-manager/node_modules/path-exists": {
       "version": "4.0.0",
       "dev": true,
-      "license": "MIT"
+      "license": "MIT",
+      "engines": {
+        "node": ">=8"
+      }
     },
-    "node_modules/@types/plist": {
-      "version": "3.0.5",
+    "node_modules/@storybook/builder-manager/node_modules/recast": {
+      "version": "0.23.9",
       "dev": true,
       "license": "MIT",
-      "optional": true,
       "dependencies": {
-        "@types/node": "*",
-        "xmlbuilder": ">=11.0.1"
+        "ast-types": "^0.16.1",
+        "esprima": "~4.0.0",
+        "source-map": "~0.6.1",
+        "tiny-invariant": "^1.3.3",
+        "tslib": "^2.0.1"
+      },
+      "engines": {
+        "node": ">= 4"
       }
     },
-    "node_modules/@types/pretty-hrtime": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/@types/pretty-hrtime/-/pretty-hrtime-1.0.3.tgz",
-      "integrity": "sha512-nj39q0wAIdhwn7DGUyT9irmsKK1tV0bd5WFEhgpqNTMFZ8cE+jieuTphCW0tfdm47S2zVT5mr09B28b1chmQMA=="
-    },
-    "node_modules/@types/prop-types": {
-      "version": "15.7.5",
-      "license": "MIT"
+    "node_modules/@storybook/builder-manager/node_modules/source-map": {
+      "version": "0.6.1",
+      "dev": true,
+      "license": "BSD-3-Clause",
+      "engines": {
+        "node": ">=0.10.0"
+      }
     },
-    "node_modules/@types/pusher-js": {
-      "version": "5.1.0",
+    "node_modules/@storybook/builder-manager/node_modules/supports-color": {
+      "version": "7.2.0",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "pusher-js": "*"
+        "has-flag": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=8"
       }
     },
-    "node_modules/@types/qs": {
-      "version": "6.9.7",
-      "license": "MIT"
+    "node_modules/@storybook/builder-manager/node_modules/temp-dir": {
+      "version": "3.0.0",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=14.16"
+      }
     },
-    "node_modules/@types/ramda": {
-      "version": "0.27.66",
+    "node_modules/@storybook/builder-manager/node_modules/tempy": {
+      "version": "3.1.0",
+      "dev": true,
       "license": "MIT",
       "dependencies": {
-        "ts-toolbelt": "^6.15.1"
+        "is-stream": "^3.0.0",
+        "temp-dir": "^3.0.0",
+        "type-fest": "^2.12.2",
+        "unique-string": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=14.16"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/@types/range-parser": {
-      "version": "1.2.4",
-      "license": "MIT"
+    "node_modules/@storybook/builder-manager/node_modules/type-fest": {
+      "version": "2.19.0",
+      "dev": true,
+      "license": "(MIT OR CC0-1.0)",
+      "engines": {
+        "node": ">=12.20"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
     },
-    "node_modules/@types/react": {
-      "version": "18.2.45",
+    "node_modules/@storybook/builder-manager/node_modules/unique-string": {
+      "version": "3.0.0",
+      "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@types/prop-types": "*",
-        "@types/scheduler": "*",
-        "csstype": "^3.0.2"
+        "crypto-random-string": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/@types/react-beautiful-dnd": {
-      "version": "13.1.5",
+    "node_modules/@storybook/builder-manager/node_modules/util": {
+      "version": "0.12.5",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@types/react": "*"
+        "inherits": "^2.0.3",
+        "is-arguments": "^1.0.4",
+        "is-generator-function": "^1.0.7",
+        "is-typed-array": "^1.1.3",
+        "which-typed-array": "^1.1.2"
       }
     },
-    "node_modules/@types/react-collapse": {
-      "version": "5.0.1",
+    "node_modules/@storybook/builder-webpack5": {
+      "version": "8.1.6",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@types/react": "*"
+        "@storybook/channels": "8.1.6",
+        "@storybook/client-logger": "8.1.6",
+        "@storybook/core-common": "8.1.6",
+        "@storybook/core-events": "8.1.6",
+        "@storybook/core-webpack": "8.1.6",
+        "@storybook/node-logger": "8.1.6",
+        "@storybook/preview": "8.1.6",
+        "@storybook/preview-api": "8.1.6",
+        "@types/node": "^18.0.0",
+        "@types/semver": "^7.3.4",
+        "browser-assert": "^1.2.1",
+        "case-sensitive-paths-webpack-plugin": "^2.4.0",
+        "cjs-module-lexer": "^1.2.3",
+        "constants-browserify": "^1.0.0",
+        "css-loader": "^6.7.1",
+        "es-module-lexer": "^1.5.0",
+        "express": "^4.17.3",
+        "fork-ts-checker-webpack-plugin": "^8.0.0",
+        "fs-extra": "^11.1.0",
+        "html-webpack-plugin": "^5.5.0",
+        "magic-string": "^0.30.5",
+        "path-browserify": "^1.0.1",
+        "process": "^0.11.10",
+        "semver": "^7.3.7",
+        "style-loader": "^3.3.1",
+        "terser-webpack-plugin": "^5.3.1",
+        "ts-dedent": "^2.0.0",
+        "url": "^0.11.0",
+        "util": "^0.12.4",
+        "util-deprecate": "^1.0.2",
+        "webpack": "5",
+        "webpack-dev-middleware": "^6.1.2",
+        "webpack-hot-middleware": "^2.25.1",
+        "webpack-virtual-modules": "^0.5.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/storybook"
+      },
+      "peerDependenciesMeta": {
+        "typescript": {
+          "optional": true
+        }
       }
     },
-    "node_modules/@types/react-dom": {
-      "version": "18.2.4",
+    "node_modules/@storybook/builder-webpack5/node_modules/@types/node": {
+      "version": "18.19.34",
+      "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@types/react": "*"
+        "undici-types": "~5.26.4"
       }
     },
-    "node_modules/@types/react-native": {
-      "version": "0.73.0",
-      "deprecated": "This is a stub types definition. react-native provides its own type definitions, so you do not need this installed.",
+    "node_modules/@storybook/builder-webpack5/node_modules/fs-extra": {
+      "version": "11.2.0",
+      "dev": true,
       "license": "MIT",
-      "peer": true,
       "dependencies": {
-        "react-native": "*"
+        "graceful-fs": "^4.2.0",
+        "jsonfile": "^6.0.1",
+        "universalify": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=14.14"
       }
     },
-    "node_modules/@types/react-redux": {
-      "version": "7.1.27",
+    "node_modules/@storybook/builder-webpack5/node_modules/path-browserify": {
+      "version": "1.0.1",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/@storybook/builder-webpack5/node_modules/style-loader": {
+      "version": "3.3.4",
+      "dev": true,
       "license": "MIT",
-      "dependencies": {
-        "@types/hoist-non-react-statics": "^3.3.0",
-        "@types/react": "*",
-        "hoist-non-react-statics": "^3.3.0",
-        "redux": "^4.0.0"
+      "engines": {
+        "node": ">= 12.13.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/webpack"
+      },
+      "peerDependencies": {
+        "webpack": "^5.0.0"
       }
     },
-    "node_modules/@types/react-test-renderer": {
-      "version": "18.0.0",
+    "node_modules/@storybook/builder-webpack5/node_modules/util": {
+      "version": "0.12.5",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@types/react": "*"
+        "inherits": "^2.0.3",
+        "is-arguments": "^1.0.4",
+        "is-generator-function": "^1.0.7",
+        "is-typed-array": "^1.1.3",
+        "which-typed-array": "^1.1.2"
       }
     },
-    "node_modules/@types/resolve": {
-      "version": "1.20.6",
-      "resolved": "https://registry.npmjs.org/@types/resolve/-/resolve-1.20.6.tgz",
-      "integrity": "sha512-A4STmOXPhMUtHH+S6ymgE2GiBSMqf4oTvcQZMcHzokuTLVYzXTB8ttjcgxOVaAp2lGwEdzZ0J+cRbbeevQj1UQ==",
-      "dev": true
-    },
-    "node_modules/@types/responselike": {
-      "version": "1.0.0",
+    "node_modules/@storybook/channels": {
+      "version": "8.1.6",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@types/node": "*"
-      }
-    },
-    "node_modules/@types/retry": {
-      "version": "0.12.2",
-      "resolved": "https://registry.npmjs.org/@types/retry/-/retry-0.12.2.tgz",
-      "integrity": "sha512-XISRgDJ2Tc5q4TRqvgJtzsRkFYNJzZrhTdtMoGVBttwzzQJkPnS3WWTFc7kuDRoPtPakl+T+OfdEUjYJj7Jbow==",
-      "dev": true
-    },
-    "node_modules/@types/scheduler": {
-      "version": "0.16.2",
-      "license": "MIT"
-    },
-    "node_modules/@types/semver": {
-      "version": "7.5.4",
-      "license": "MIT"
-    },
-    "node_modules/@types/send": {
-      "version": "0.17.4",
-      "resolved": "https://registry.npmjs.org/@types/send/-/send-0.17.4.tgz",
-      "integrity": "sha512-x2EM6TJOybec7c52BX0ZspPodMsQUd5L6PRwOunVyVUhXiBSKf3AezDL8Dgvgt5o0UfKNfuA0eMLr2wLT4AiBA==",
-      "dependencies": {
-        "@types/mime": "^1",
-        "@types/node": "*"
+        "@storybook/client-logger": "8.1.6",
+        "@storybook/core-events": "8.1.6",
+        "@storybook/global": "^5.0.0",
+        "telejson": "^7.2.0",
+        "tiny-invariant": "^1.3.1"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/storybook"
       }
     },
-    "node_modules/@types/serve-index": {
-      "version": "1.9.4",
-      "resolved": "https://registry.npmjs.org/@types/serve-index/-/serve-index-1.9.4.tgz",
-      "integrity": "sha512-qLpGZ/c2fhSs5gnYsQxtDEq3Oy8SXPClIXkW5ghvAvsNuVSA8k+gCONcUCS/UjLEYvYps+e8uBtfgXgvhwfNug==",
+    "node_modules/@storybook/cli": {
+      "version": "8.1.10",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "@types/express": "*"
-      }
-    },
-    "node_modules/@types/serve-static": {
-      "version": "1.15.7",
-      "resolved": "https://registry.npmjs.org/@types/serve-static/-/serve-static-1.15.7.tgz",
-      "integrity": "sha512-W8Ym+h8nhuRwaKPaDw34QUkwsGi6Rc4yYqvKFo5rm2FUEhCFbzVWrxXUxuKK8TASjWsysJY0nsmNCGhCOIsrOw==",
-      "dependencies": {
-        "@types/http-errors": "*",
-        "@types/node": "*",
-        "@types/send": "*"
+        "@babel/core": "^7.24.4",
+        "@babel/types": "^7.24.0",
+        "@ndelangen/get-tarball": "^3.0.7",
+        "@storybook/codemod": "8.1.10",
+        "@storybook/core-common": "8.1.10",
+        "@storybook/core-events": "8.1.10",
+        "@storybook/core-server": "8.1.10",
+        "@storybook/csf-tools": "8.1.10",
+        "@storybook/node-logger": "8.1.10",
+        "@storybook/telemetry": "8.1.10",
+        "@storybook/types": "8.1.10",
+        "@types/semver": "^7.3.4",
+        "@yarnpkg/fslib": "2.10.3",
+        "@yarnpkg/libzip": "2.3.0",
+        "chalk": "^4.1.0",
+        "commander": "^6.2.1",
+        "cross-spawn": "^7.0.3",
+        "detect-indent": "^6.1.0",
+        "envinfo": "^7.7.3",
+        "execa": "^5.0.0",
+        "find-up": "^5.0.0",
+        "fs-extra": "^11.1.0",
+        "get-npm-tarball-url": "^2.0.3",
+        "giget": "^1.0.0",
+        "globby": "^14.0.1",
+        "jscodeshift": "^0.15.1",
+        "leven": "^3.1.0",
+        "ora": "^5.4.1",
+        "prettier": "^3.1.1",
+        "prompts": "^2.4.0",
+        "read-pkg-up": "^7.0.1",
+        "semver": "^7.3.7",
+        "strip-json-comments": "^3.0.1",
+        "tempy": "^3.1.0",
+        "tiny-invariant": "^1.3.1",
+        "ts-dedent": "^2.0.0"
+      },
+      "bin": {
+        "getstorybook": "bin/index.js",
+        "sb": "bin/index.js"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/storybook"
       }
     },
-    "node_modules/@types/setimmediate": {
-      "version": "1.0.2",
-      "dev": true,
-      "license": "MIT"
-    },
-    "node_modules/@types/sockjs": {
-      "version": "0.3.36",
-      "resolved": "https://registry.npmjs.org/@types/sockjs/-/sockjs-0.3.36.tgz",
-      "integrity": "sha512-MK9V6NzAS1+Ud7JV9lJLFqW85VbC9dq3LmwZCuBe4wBDgKC0Kj/jd8Xl+nSviU+Qc3+m7umHHyHg//2KSa0a0Q==",
+    "node_modules/@storybook/cli/node_modules/@babel/traverse": {
+      "version": "7.24.7",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "@types/node": "*"
+        "@babel/code-frame": "^7.24.7",
+        "@babel/generator": "^7.24.7",
+        "@babel/helper-environment-visitor": "^7.24.7",
+        "@babel/helper-function-name": "^7.24.7",
+        "@babel/helper-hoist-variables": "^7.24.7",
+        "@babel/helper-split-export-declaration": "^7.24.7",
+        "@babel/parser": "^7.24.7",
+        "@babel/types": "^7.24.7",
+        "debug": "^4.3.1",
+        "globals": "^11.1.0"
+      },
+      "engines": {
+        "node": ">=6.9.0"
       }
     },
-    "node_modules/@types/stack-utils": {
-      "version": "2.0.1",
-      "license": "MIT"
-    },
-    "node_modules/@types/tough-cookie": {
-      "version": "4.0.2",
-      "license": "MIT"
-    },
-    "node_modules/@types/unist": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/@types/unist/-/unist-3.0.2.tgz",
-      "integrity": "sha512-dqId9J8K/vGi5Zr7oo212BGii5m3q5Hxlkwy3WpYuKPklmBEvsbMYYyLxAQpSffdLl/gdW0XUpKWFvYmyoWCoQ=="
-    },
-    "node_modules/@types/urijs": {
-      "version": "1.19.19",
-      "license": "MIT"
-    },
-    "node_modules/@types/uuid": {
-      "version": "9.0.8",
-      "resolved": "https://registry.npmjs.org/@types/uuid/-/uuid-9.0.8.tgz",
-      "integrity": "sha512-jg+97EGIcY9AGHJJRaaPVgetKDsrTgbRjQ5Msgjh/DQKEFl0DtyRr/VCOyD1T2R1MNeWPK/u7JoGhlDZnKBAfA=="
-    },
-    "node_modules/@types/verror": {
-      "version": "1.10.9",
+    "node_modules/@storybook/cli/node_modules/@storybook/channels": {
+      "version": "8.1.10",
       "dev": true,
       "license": "MIT",
-      "optional": true
+      "dependencies": {
+        "@storybook/client-logger": "8.1.10",
+        "@storybook/core-events": "8.1.10",
+        "@storybook/global": "^5.0.0",
+        "telejson": "^7.2.0",
+        "tiny-invariant": "^1.3.1"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/storybook"
+      }
     },
-    "node_modules/@types/webpack": {
-      "version": "5.28.5",
+    "node_modules/@storybook/cli/node_modules/@storybook/client-logger": {
+      "version": "8.1.10",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@types/node": "*",
-        "tapable": "^2.2.0",
-        "webpack": "^5"
+        "@storybook/global": "^5.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/storybook"
       }
     },
-    "node_modules/@types/webpack-bundle-analyzer": {
-      "version": "4.7.0",
+    "node_modules/@storybook/cli/node_modules/@storybook/core-common": {
+      "version": "8.1.10",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@types/node": "*",
-        "tapable": "^2.2.0",
-        "webpack": "^5"
+        "@storybook/core-events": "8.1.10",
+        "@storybook/csf-tools": "8.1.10",
+        "@storybook/node-logger": "8.1.10",
+        "@storybook/types": "8.1.10",
+        "@yarnpkg/fslib": "2.10.3",
+        "@yarnpkg/libzip": "2.3.0",
+        "chalk": "^4.1.0",
+        "cross-spawn": "^7.0.3",
+        "esbuild": "^0.18.0 || ^0.19.0 || ^0.20.0",
+        "esbuild-register": "^3.5.0",
+        "execa": "^5.0.0",
+        "file-system-cache": "2.3.0",
+        "find-cache-dir": "^3.0.0",
+        "find-up": "^5.0.0",
+        "fs-extra": "^11.1.0",
+        "glob": "^10.0.0",
+        "handlebars": "^4.7.7",
+        "lazy-universal-dotenv": "^4.0.0",
+        "node-fetch": "^2.0.0",
+        "picomatch": "^2.3.0",
+        "pkg-dir": "^5.0.0",
+        "prettier-fallback": "npm:prettier@^3",
+        "pretty-hrtime": "^1.0.3",
+        "resolve-from": "^5.0.0",
+        "semver": "^7.3.7",
+        "tempy": "^3.1.0",
+        "tiny-invariant": "^1.3.1",
+        "ts-dedent": "^2.0.0",
+        "util": "^0.12.4"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/storybook"
+      },
+      "peerDependencies": {
+        "prettier": "^2 || ^3"
+      },
+      "peerDependenciesMeta": {
+        "prettier": {
+          "optional": true
+        }
       }
     },
-    "node_modules/@types/ws": {
-      "version": "8.5.10",
-      "resolved": "https://registry.npmjs.org/@types/ws/-/ws-8.5.10.tgz",
-      "integrity": "sha512-vmQSUcfalpIq0R9q7uTo2lXs6eGIpt9wtnLdMv9LVpIjCA/+ufZRozlVoVelIYixx1ugCBKDhn89vnsEGOCx9A==",
+    "node_modules/@storybook/cli/node_modules/@storybook/core-events": {
+      "version": "8.1.10",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "@types/node": "*"
+        "@storybook/csf": "^0.1.7",
+        "ts-dedent": "^2.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/storybook"
       }
     },
-    "node_modules/@types/yargs": {
-      "version": "17.0.32",
-      "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-17.0.32.tgz",
-      "integrity": "sha512-xQ67Yc/laOG5uMfX/093MRlGGCIBzZMarVa+gfNKJxWAIgykYpVGkBdbqEzGDDfCrVUj6Hiff4mTZ5BA6TmAog==",
+    "node_modules/@storybook/cli/node_modules/@storybook/csf-tools": {
+      "version": "8.1.10",
       "dev": true,
       "license": "MIT",
-      "optional": true,
-      "peer": true,
       "dependencies": {
-        "@types/yargs-parser": "*"
+        "@babel/generator": "^7.24.4",
+        "@babel/parser": "^7.24.4",
+        "@babel/traverse": "^7.24.1",
+        "@babel/types": "^7.24.0",
+        "@storybook/csf": "^0.1.7",
+        "@storybook/types": "8.1.10",
+        "fs-extra": "^11.1.0",
+        "recast": "^0.23.5",
+        "ts-dedent": "^2.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/storybook"
       }
     },
-    "node_modules/@types/yargs-parser": {
-      "version": "21.0.3",
-      "resolved": "https://registry.npmjs.org/@types/yargs-parser/-/yargs-parser-21.0.3.tgz",
-      "integrity": "sha512-I4q9QU9MQv4oEOz4tAHJtNz1cwuLxn2F3xcc2iV5WdqLPpUnj30aUuxt1mAxYTG+oe8CZMV/+6rU4S4gRDzqtQ==",
-      "license": "MIT"
-    },
-    "node_modules/@types/yauzl": {
-      "version": "2.10.0",
+    "node_modules/@storybook/cli/node_modules/@storybook/node-logger": {
+      "version": "8.1.10",
       "dev": true,
       "license": "MIT",
-      "optional": true,
-      "dependencies": {
-        "@types/node": "*"
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/storybook"
       }
     },
-    "node_modules/@typescript-eslint/eslint-plugin": {
-      "version": "6.13.2",
+    "node_modules/@storybook/cli/node_modules/@storybook/types": {
+      "version": "8.1.10",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@eslint-community/regexpp": "^4.5.1",
-        "@typescript-eslint/scope-manager": "6.13.2",
-        "@typescript-eslint/type-utils": "6.13.2",
-        "@typescript-eslint/utils": "6.13.2",
-        "@typescript-eslint/visitor-keys": "6.13.2",
-        "debug": "^4.3.4",
-        "graphemer": "^1.4.0",
-        "ignore": "^5.2.4",
-        "natural-compare": "^1.4.0",
-        "semver": "^7.5.4",
-        "ts-api-utils": "^1.0.1"
-      },
-      "engines": {
-        "node": "^16.0.0 || >=18.0.0"
+        "@storybook/channels": "8.1.10",
+        "@types/express": "^4.7.0",
+        "file-system-cache": "2.3.0"
       },
       "funding": {
         "type": "opencollective",
-        "url": "https://opencollective.com/typescript-eslint"
-      },
-      "peerDependencies": {
-        "@typescript-eslint/parser": "^6.0.0 || ^6.0.0-alpha",
-        "eslint": "^7.0.0 || ^8.0.0"
-      },
-      "peerDependenciesMeta": {
-        "typescript": {
-          "optional": true
-        }
+        "url": "https://opencollective.com/storybook"
       }
     },
-    "node_modules/@typescript-eslint/eslint-plugin/node_modules/@typescript-eslint/scope-manager": {
-      "version": "6.13.2",
+    "node_modules/@storybook/cli/node_modules/ansi-styles": {
+      "version": "4.3.0",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@typescript-eslint/types": "6.13.2",
-        "@typescript-eslint/visitor-keys": "6.13.2"
+        "color-convert": "^2.0.1"
       },
       "engines": {
-        "node": "^16.0.0 || >=18.0.0"
+        "node": ">=8"
       },
       "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/typescript-eslint"
+        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
       }
     },
-    "node_modules/@typescript-eslint/eslint-plugin/node_modules/@typescript-eslint/types": {
-      "version": "6.13.2",
+    "node_modules/@storybook/cli/node_modules/brace-expansion": {
+      "version": "2.0.1",
       "dev": true,
       "license": "MIT",
-      "engines": {
-        "node": "^16.0.0 || >=18.0.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/typescript-eslint"
+      "dependencies": {
+        "balanced-match": "^1.0.0"
       }
     },
-    "node_modules/@typescript-eslint/eslint-plugin/node_modules/@typescript-eslint/typescript-estree": {
-      "version": "6.13.2",
+    "node_modules/@storybook/cli/node_modules/chalk": {
+      "version": "4.1.2",
       "dev": true,
-      "license": "BSD-2-Clause",
+      "license": "MIT",
       "dependencies": {
-        "@typescript-eslint/types": "6.13.2",
-        "@typescript-eslint/visitor-keys": "6.13.2",
-        "debug": "^4.3.4",
-        "globby": "^11.1.0",
-        "is-glob": "^4.0.3",
-        "semver": "^7.5.4",
-        "ts-api-utils": "^1.0.1"
+        "ansi-styles": "^4.1.0",
+        "supports-color": "^7.1.0"
       },
       "engines": {
-        "node": "^16.0.0 || >=18.0.0"
+        "node": ">=10"
       },
       "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/typescript-eslint"
-      },
-      "peerDependenciesMeta": {
-        "typescript": {
-          "optional": true
-        }
+        "url": "https://github.com/chalk/chalk?sponsor=1"
       }
     },
-    "node_modules/@typescript-eslint/eslint-plugin/node_modules/@typescript-eslint/utils": {
-      "version": "6.13.2",
+    "node_modules/@storybook/cli/node_modules/color-convert": {
+      "version": "2.0.1",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@eslint-community/eslint-utils": "^4.4.0",
-        "@types/json-schema": "^7.0.12",
-        "@types/semver": "^7.5.0",
-        "@typescript-eslint/scope-manager": "6.13.2",
-        "@typescript-eslint/types": "6.13.2",
-        "@typescript-eslint/typescript-estree": "6.13.2",
-        "semver": "^7.5.4"
+        "color-name": "~1.1.4"
       },
       "engines": {
-        "node": "^16.0.0 || >=18.0.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/typescript-eslint"
-      },
-      "peerDependencies": {
-        "eslint": "^7.0.0 || ^8.0.0"
+        "node": ">=7.0.0"
       }
     },
-    "node_modules/@typescript-eslint/eslint-plugin/node_modules/@typescript-eslint/visitor-keys": {
-      "version": "6.13.2",
+    "node_modules/@storybook/cli/node_modules/color-name": {
+      "version": "1.1.4",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/@storybook/cli/node_modules/crypto-random-string": {
+      "version": "4.0.0",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@typescript-eslint/types": "6.13.2",
-        "eslint-visitor-keys": "^3.4.1"
+        "type-fest": "^1.0.1"
       },
       "engines": {
-        "node": "^16.0.0 || >=18.0.0"
+        "node": ">=12"
       },
       "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/typescript-eslint"
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/@typescript-eslint/eslint-plugin/node_modules/eslint-visitor-keys": {
-      "version": "3.4.3",
+    "node_modules/@storybook/cli/node_modules/crypto-random-string/node_modules/type-fest": {
+      "version": "1.4.0",
       "dev": true,
-      "license": "Apache-2.0",
+      "license": "(MIT OR CC0-1.0)",
       "engines": {
-        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+        "node": ">=10"
       },
       "funding": {
-        "url": "https://opencollective.com/eslint"
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/@typescript-eslint/experimental-utils": {
-      "version": "4.33.0",
+    "node_modules/@storybook/cli/node_modules/find-cache-dir": {
+      "version": "3.3.2",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@types/json-schema": "^7.0.7",
-        "@typescript-eslint/scope-manager": "4.33.0",
-        "@typescript-eslint/types": "4.33.0",
-        "@typescript-eslint/typescript-estree": "4.33.0",
-        "eslint-scope": "^5.1.1",
-        "eslint-utils": "^3.0.0"
+        "commondir": "^1.0.1",
+        "make-dir": "^3.0.2",
+        "pkg-dir": "^4.1.0"
       },
       "engines": {
-        "node": "^10.12.0 || >=12.0.0"
+        "node": ">=8"
       },
       "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/typescript-eslint"
-      },
-      "peerDependencies": {
-        "eslint": "*"
+        "url": "https://github.com/avajs/find-cache-dir?sponsor=1"
       }
     },
-    "node_modules/@typescript-eslint/parser": {
-      "version": "6.13.2",
+    "node_modules/@storybook/cli/node_modules/find-cache-dir/node_modules/find-up": {
+      "version": "4.1.0",
       "dev": true,
-      "license": "BSD-2-Clause",
+      "license": "MIT",
       "dependencies": {
-        "@typescript-eslint/scope-manager": "6.13.2",
-        "@typescript-eslint/types": "6.13.2",
-        "@typescript-eslint/typescript-estree": "6.13.2",
-        "@typescript-eslint/visitor-keys": "6.13.2",
-        "debug": "^4.3.4"
+        "locate-path": "^5.0.0",
+        "path-exists": "^4.0.0"
       },
       "engines": {
-        "node": "^16.0.0 || >=18.0.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/typescript-eslint"
-      },
-      "peerDependencies": {
-        "eslint": "^7.0.0 || ^8.0.0"
-      },
-      "peerDependenciesMeta": {
-        "typescript": {
-          "optional": true
-        }
+        "node": ">=8"
       }
     },
-    "node_modules/@typescript-eslint/parser/node_modules/@typescript-eslint/scope-manager": {
-      "version": "6.13.2",
+    "node_modules/@storybook/cli/node_modules/find-cache-dir/node_modules/pkg-dir": {
+      "version": "4.2.0",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@typescript-eslint/types": "6.13.2",
-        "@typescript-eslint/visitor-keys": "6.13.2"
+        "find-up": "^4.0.0"
       },
       "engines": {
-        "node": "^16.0.0 || >=18.0.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/typescript-eslint"
+        "node": ">=8"
       }
     },
-    "node_modules/@typescript-eslint/parser/node_modules/@typescript-eslint/types": {
-      "version": "6.13.2",
+    "node_modules/@storybook/cli/node_modules/fs-extra": {
+      "version": "11.2.0",
       "dev": true,
       "license": "MIT",
-      "engines": {
-        "node": "^16.0.0 || >=18.0.0"
+      "dependencies": {
+        "graceful-fs": "^4.2.0",
+        "jsonfile": "^6.0.1",
+        "universalify": "^2.0.0"
       },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/typescript-eslint"
+      "engines": {
+        "node": ">=14.14"
       }
     },
-    "node_modules/@typescript-eslint/parser/node_modules/@typescript-eslint/typescript-estree": {
-      "version": "6.13.2",
+    "node_modules/@storybook/cli/node_modules/glob": {
+      "version": "10.4.2",
       "dev": true,
-      "license": "BSD-2-Clause",
+      "license": "ISC",
       "dependencies": {
-        "@typescript-eslint/types": "6.13.2",
-        "@typescript-eslint/visitor-keys": "6.13.2",
-        "debug": "^4.3.4",
-        "globby": "^11.1.0",
-        "is-glob": "^4.0.3",
-        "semver": "^7.5.4",
-        "ts-api-utils": "^1.0.1"
+        "foreground-child": "^3.1.0",
+        "jackspeak": "^3.1.2",
+        "minimatch": "^9.0.4",
+        "minipass": "^7.1.2",
+        "package-json-from-dist": "^1.0.0",
+        "path-scurry": "^1.11.1"
+      },
+      "bin": {
+        "glob": "dist/esm/bin.mjs"
       },
       "engines": {
-        "node": "^16.0.0 || >=18.0.0"
+        "node": ">=16 || 14 >=14.18"
       },
       "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/typescript-eslint"
-      },
-      "peerDependenciesMeta": {
-        "typescript": {
-          "optional": true
-        }
+        "url": "https://github.com/sponsors/isaacs"
       }
     },
-    "node_modules/@typescript-eslint/parser/node_modules/@typescript-eslint/visitor-keys": {
-      "version": "6.13.2",
+    "node_modules/@storybook/cli/node_modules/globby": {
+      "version": "14.0.1",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@typescript-eslint/types": "6.13.2",
-        "eslint-visitor-keys": "^3.4.1"
+        "@sindresorhus/merge-streams": "^2.1.0",
+        "fast-glob": "^3.3.2",
+        "ignore": "^5.2.4",
+        "path-type": "^5.0.0",
+        "slash": "^5.1.0",
+        "unicorn-magic": "^0.1.0"
       },
       "engines": {
-        "node": "^16.0.0 || >=18.0.0"
+        "node": ">=18"
       },
       "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/typescript-eslint"
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/@typescript-eslint/parser/node_modules/eslint-visitor-keys": {
-      "version": "3.4.3",
+    "node_modules/@storybook/cli/node_modules/has-flag": {
+      "version": "4.0.0",
       "dev": true,
-      "license": "Apache-2.0",
+      "license": "MIT",
       "engines": {
-        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+        "node": ">=8"
+      }
+    },
+    "node_modules/@storybook/cli/node_modules/is-stream": {
+      "version": "3.0.0",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": "^12.20.0 || ^14.13.1 || >=16.0.0"
       },
       "funding": {
-        "url": "https://opencollective.com/eslint"
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/@typescript-eslint/scope-manager": {
-      "version": "4.33.0",
+    "node_modules/@storybook/cli/node_modules/jackspeak": {
+      "version": "3.4.0",
       "dev": true,
-      "license": "MIT",
+      "license": "BlueOak-1.0.0",
       "dependencies": {
-        "@typescript-eslint/types": "4.33.0",
-        "@typescript-eslint/visitor-keys": "4.33.0"
+        "@isaacs/cliui": "^8.0.2"
       },
       "engines": {
-        "node": "^8.10.0 || ^10.13.0 || >=11.10.1"
+        "node": ">=14"
       },
       "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/typescript-eslint"
+        "url": "https://github.com/sponsors/isaacs"
+      },
+      "optionalDependencies": {
+        "@pkgjs/parseargs": "^0.11.0"
       }
     },
-    "node_modules/@typescript-eslint/type-utils": {
-      "version": "6.13.2",
+    "node_modules/@storybook/cli/node_modules/jscodeshift": {
+      "version": "0.15.2",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@typescript-eslint/typescript-estree": "6.13.2",
-        "@typescript-eslint/utils": "6.13.2",
-        "debug": "^4.3.4",
-        "ts-api-utils": "^1.0.1"
-      },
-      "engines": {
-        "node": "^16.0.0 || >=18.0.0"
+        "@babel/core": "^7.23.0",
+        "@babel/parser": "^7.23.0",
+        "@babel/plugin-transform-class-properties": "^7.22.5",
+        "@babel/plugin-transform-modules-commonjs": "^7.23.0",
+        "@babel/plugin-transform-nullish-coalescing-operator": "^7.22.11",
+        "@babel/plugin-transform-optional-chaining": "^7.23.0",
+        "@babel/plugin-transform-private-methods": "^7.22.5",
+        "@babel/preset-flow": "^7.22.15",
+        "@babel/preset-typescript": "^7.23.0",
+        "@babel/register": "^7.22.15",
+        "babel-core": "^7.0.0-bridge.0",
+        "chalk": "^4.1.2",
+        "flow-parser": "0.*",
+        "graceful-fs": "^4.2.4",
+        "micromatch": "^4.0.4",
+        "neo-async": "^2.5.0",
+        "node-dir": "^0.1.17",
+        "recast": "^0.23.3",
+        "temp": "^0.8.4",
+        "write-file-atomic": "^2.3.0"
       },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/typescript-eslint"
+      "bin": {
+        "jscodeshift": "bin/jscodeshift.js"
       },
       "peerDependencies": {
-        "eslint": "^7.0.0 || ^8.0.0"
+        "@babel/preset-env": "^7.1.6"
       },
       "peerDependenciesMeta": {
-        "typescript": {
+        "@babel/preset-env": {
           "optional": true
         }
       }
     },
-    "node_modules/@typescript-eslint/type-utils/node_modules/@typescript-eslint/scope-manager": {
-      "version": "6.13.2",
+    "node_modules/@storybook/cli/node_modules/locate-path": {
+      "version": "5.0.0",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@typescript-eslint/types": "6.13.2",
-        "@typescript-eslint/visitor-keys": "6.13.2"
+        "p-locate": "^4.1.0"
       },
       "engines": {
-        "node": "^16.0.0 || >=18.0.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/typescript-eslint"
+        "node": ">=8"
       }
     },
-    "node_modules/@typescript-eslint/type-utils/node_modules/@typescript-eslint/types": {
-      "version": "6.13.2",
+    "node_modules/@storybook/cli/node_modules/make-dir": {
+      "version": "3.1.0",
       "dev": true,
       "license": "MIT",
+      "dependencies": {
+        "semver": "^6.0.0"
+      },
       "engines": {
-        "node": "^16.0.0 || >=18.0.0"
+        "node": ">=8"
       },
       "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/typescript-eslint"
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/@typescript-eslint/type-utils/node_modules/@typescript-eslint/typescript-estree": {
-      "version": "6.13.2",
+    "node_modules/@storybook/cli/node_modules/make-dir/node_modules/semver": {
+      "version": "6.3.1",
       "dev": true,
-      "license": "BSD-2-Clause",
+      "license": "ISC",
+      "bin": {
+        "semver": "bin/semver.js"
+      }
+    },
+    "node_modules/@storybook/cli/node_modules/minimatch": {
+      "version": "9.0.4",
+      "dev": true,
+      "license": "ISC",
       "dependencies": {
-        "@typescript-eslint/types": "6.13.2",
-        "@typescript-eslint/visitor-keys": "6.13.2",
-        "debug": "^4.3.4",
-        "globby": "^11.1.0",
-        "is-glob": "^4.0.3",
-        "semver": "^7.5.4",
-        "ts-api-utils": "^1.0.1"
+        "brace-expansion": "^2.0.1"
       },
       "engines": {
-        "node": "^16.0.0 || >=18.0.0"
+        "node": ">=16 || 14 >=14.17"
       },
       "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/typescript-eslint"
-      },
-      "peerDependenciesMeta": {
-        "typescript": {
-          "optional": true
-        }
+        "url": "https://github.com/sponsors/isaacs"
       }
     },
-    "node_modules/@typescript-eslint/type-utils/node_modules/@typescript-eslint/utils": {
-      "version": "6.13.2",
+    "node_modules/@storybook/cli/node_modules/minipass": {
+      "version": "7.1.2",
+      "dev": true,
+      "license": "ISC",
+      "engines": {
+        "node": ">=16 || 14 >=14.17"
+      }
+    },
+    "node_modules/@storybook/cli/node_modules/p-limit": {
+      "version": "2.3.0",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@eslint-community/eslint-utils": "^4.4.0",
-        "@types/json-schema": "^7.0.12",
-        "@types/semver": "^7.5.0",
-        "@typescript-eslint/scope-manager": "6.13.2",
-        "@typescript-eslint/types": "6.13.2",
-        "@typescript-eslint/typescript-estree": "6.13.2",
-        "semver": "^7.5.4"
+        "p-try": "^2.0.0"
       },
       "engines": {
-        "node": "^16.0.0 || >=18.0.0"
+        "node": ">=6"
       },
       "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/typescript-eslint"
-      },
-      "peerDependencies": {
-        "eslint": "^7.0.0 || ^8.0.0"
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/@typescript-eslint/type-utils/node_modules/@typescript-eslint/visitor-keys": {
-      "version": "6.13.2",
+    "node_modules/@storybook/cli/node_modules/p-locate": {
+      "version": "4.1.0",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@typescript-eslint/types": "6.13.2",
-        "eslint-visitor-keys": "^3.4.1"
+        "p-limit": "^2.2.0"
       },
       "engines": {
-        "node": "^16.0.0 || >=18.0.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/typescript-eslint"
+        "node": ">=8"
       }
     },
-    "node_modules/@typescript-eslint/type-utils/node_modules/eslint-visitor-keys": {
-      "version": "3.4.3",
+    "node_modules/@storybook/cli/node_modules/path-exists": {
+      "version": "4.0.0",
       "dev": true,
-      "license": "Apache-2.0",
+      "license": "MIT",
       "engines": {
-        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
-      },
-      "funding": {
-        "url": "https://opencollective.com/eslint"
+        "node": ">=8"
       }
     },
-    "node_modules/@typescript-eslint/types": {
-      "version": "4.33.0",
+    "node_modules/@storybook/cli/node_modules/path-type": {
+      "version": "5.0.0",
       "dev": true,
       "license": "MIT",
       "engines": {
-        "node": "^8.10.0 || ^10.13.0 || >=11.10.1"
+        "node": ">=12"
       },
       "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/typescript-eslint"
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/@typescript-eslint/typescript-estree": {
-      "version": "4.33.0",
+    "node_modules/@storybook/cli/node_modules/prettier": {
+      "version": "3.3.2",
       "dev": true,
-      "license": "BSD-2-Clause",
-      "dependencies": {
-        "@typescript-eslint/types": "4.33.0",
-        "@typescript-eslint/visitor-keys": "4.33.0",
-        "debug": "^4.3.1",
-        "globby": "^11.0.3",
-        "is-glob": "^4.0.1",
-        "semver": "^7.3.5",
-        "tsutils": "^3.21.0"
+      "license": "MIT",
+      "bin": {
+        "prettier": "bin/prettier.cjs"
       },
       "engines": {
-        "node": "^10.12.0 || >=12.0.0"
+        "node": ">=14"
       },
       "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/typescript-eslint"
-      },
-      "peerDependenciesMeta": {
-        "typescript": {
-          "optional": true
-        }
+        "url": "https://github.com/prettier/prettier?sponsor=1"
       }
     },
-    "node_modules/@typescript-eslint/utils": {
-      "version": "5.62.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-5.62.0.tgz",
-      "integrity": "sha512-n8oxjeb5aIbPFEtmQxQYOLI0i9n5ySBEY/ZEHHZqKQSFnxio1rv6dthascc9dLuwrL0RC5mPCxB7vnAVGAYWAQ==",
+    "node_modules/@storybook/cli/node_modules/recast": {
+      "version": "0.23.9",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "@eslint-community/eslint-utils": "^4.2.0",
-        "@types/json-schema": "^7.0.9",
-        "@types/semver": "^7.3.12",
-        "@typescript-eslint/scope-manager": "5.62.0",
-        "@typescript-eslint/types": "5.62.0",
-        "@typescript-eslint/typescript-estree": "5.62.0",
-        "eslint-scope": "^5.1.1",
-        "semver": "^7.3.7"
+        "ast-types": "^0.16.1",
+        "esprima": "~4.0.0",
+        "source-map": "~0.6.1",
+        "tiny-invariant": "^1.3.3",
+        "tslib": "^2.0.1"
       },
       "engines": {
-        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/typescript-eslint"
-      },
-      "peerDependencies": {
-        "eslint": "^6.0.0 || ^7.0.0 || ^8.0.0"
+        "node": ">= 4"
       }
     },
-    "node_modules/@typescript-eslint/utils/node_modules/@typescript-eslint/scope-manager": {
-      "version": "5.62.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-5.62.0.tgz",
-      "integrity": "sha512-VXuvVvZeQCQb5Zgf4HAxc04q5j+WrNAtNh9OwCsCgpKqESMTu3tF/jhZ3xG6T4NZwWl65Bg8KuS2uEvhSfLl0w==",
+    "node_modules/@storybook/cli/node_modules/slash": {
+      "version": "5.1.0",
       "dev": true,
-      "dependencies": {
-        "@typescript-eslint/types": "5.62.0",
-        "@typescript-eslint/visitor-keys": "5.62.0"
-      },
+      "license": "MIT",
       "engines": {
-        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+        "node": ">=14.16"
       },
       "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/typescript-eslint"
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/@typescript-eslint/utils/node_modules/@typescript-eslint/types": {
-      "version": "5.62.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-5.62.0.tgz",
-      "integrity": "sha512-87NVngcbVXUahrRTqIK27gD2t5Cu1yuCXxbLcFtCzZGlfyVWWh8mLHkoxzjsB6DDNnvdL+fW8MiwPEJyGJQDgQ==",
+    "node_modules/@storybook/cli/node_modules/source-map": {
+      "version": "0.6.1",
       "dev": true,
+      "license": "BSD-3-Clause",
       "engines": {
-        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/typescript-eslint"
+        "node": ">=0.10.0"
       }
     },
-    "node_modules/@typescript-eslint/utils/node_modules/@typescript-eslint/typescript-estree": {
-      "version": "5.62.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-5.62.0.tgz",
-      "integrity": "sha512-CmcQ6uY7b9y694lKdRB8FEel7JbU/40iSAPomu++SjLMntB+2Leay2LO6i8VnJk58MtE9/nQSFIH6jpyRWyYzA==",
+    "node_modules/@storybook/cli/node_modules/supports-color": {
+      "version": "7.2.0",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "@typescript-eslint/types": "5.62.0",
-        "@typescript-eslint/visitor-keys": "5.62.0",
-        "debug": "^4.3.4",
-        "globby": "^11.1.0",
-        "is-glob": "^4.0.3",
-        "semver": "^7.3.7",
-        "tsutils": "^3.21.0"
+        "has-flag": "^4.0.0"
       },
       "engines": {
-        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/typescript-eslint"
-      },
-      "peerDependenciesMeta": {
-        "typescript": {
-          "optional": true
-        }
+        "node": ">=8"
       }
     },
-    "node_modules/@typescript-eslint/utils/node_modules/@typescript-eslint/visitor-keys": {
-      "version": "5.62.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-5.62.0.tgz",
-      "integrity": "sha512-07ny+LHRzQXepkGg6w0mFY41fVUNBrL2Roj/++7V1txKugfjm/Ci/qSND03r2RhlJhJYMcTn9AhhSSqQp0Ysyw==",
+    "node_modules/@storybook/cli/node_modules/temp-dir": {
+      "version": "3.0.0",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=14.16"
+      }
+    },
+    "node_modules/@storybook/cli/node_modules/tempy": {
+      "version": "3.1.0",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "@typescript-eslint/types": "5.62.0",
-        "eslint-visitor-keys": "^3.3.0"
+        "is-stream": "^3.0.0",
+        "temp-dir": "^3.0.0",
+        "type-fest": "^2.12.2",
+        "unique-string": "^3.0.0"
       },
       "engines": {
-        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+        "node": ">=14.16"
       },
       "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/typescript-eslint"
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/@typescript-eslint/utils/node_modules/eslint-visitor-keys": {
-      "version": "3.4.3",
-      "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.4.3.tgz",
-      "integrity": "sha512-wpc+LXeiyiisxPlEkUzU6svyS1frIO3Mgxj1fdy7Pm8Ygzguax2N3Fa/D/ag1WqbOprdI+uY6wMUl8/a2G+iag==",
+    "node_modules/@storybook/cli/node_modules/type-fest": {
+      "version": "2.19.0",
       "dev": true,
+      "license": "(MIT OR CC0-1.0)",
       "engines": {
-        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+        "node": ">=12.20"
       },
       "funding": {
-        "url": "https://opencollective.com/eslint"
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/@typescript-eslint/visitor-keys": {
-      "version": "4.33.0",
+    "node_modules/@storybook/cli/node_modules/unique-string": {
+      "version": "3.0.0",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@typescript-eslint/types": "4.33.0",
-        "eslint-visitor-keys": "^2.0.0"
+        "crypto-random-string": "^4.0.0"
       },
       "engines": {
-        "node": "^8.10.0 || ^10.13.0 || >=11.10.1"
+        "node": ">=12"
       },
       "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/typescript-eslint"
-      }
-    },
-    "node_modules/@ua/react-native-airship": {
-      "version": "17.2.1",
-      "resolved": "https://registry.npmjs.org/@ua/react-native-airship/-/react-native-airship-17.2.1.tgz",
-      "integrity": "sha512-+C5fuPU4MMEpN7I5NbrR8F8awPyaHC732ONxMAZhrjVbfNVuZlpCwptz1xmiRkfiH/nzxhF5uvf+CiOKVYamPQ==",
-      "engines": {
-        "node": ">= 16.0.0"
-      },
-      "peerDependencies": {
-        "react": "*",
-        "react-native": "*"
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/@ungap/structured-clone": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/@ungap/structured-clone/-/structured-clone-1.2.0.tgz",
-      "integrity": "sha512-zuVdFrMJiuCDQUMCzQaD6KL28MjnqqN8XnAqiEq9PNm/hCPTSGfrXCOfwj1ow4LFb/tNymJPwsNbVePc1xFqrQ=="
-    },
-    "node_modules/@urql/core": {
-      "version": "2.3.6",
+    "node_modules/@storybook/cli/node_modules/util": {
+      "version": "0.12.5",
+      "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@graphql-typed-document-node/core": "^3.1.0",
-        "wonka": "^4.0.14"
-      },
-      "peerDependencies": {
-        "graphql": "^0.11.0 || ^0.12.0 || ^0.13.0 || ^14.0.0 || ^15.0.0 || ^16.0.0"
+        "inherits": "^2.0.3",
+        "is-arguments": "^1.0.4",
+        "is-generator-function": "^1.0.7",
+        "is-typed-array": "^1.1.3",
+        "which-typed-array": "^1.1.2"
       }
     },
-    "node_modules/@urql/exchange-retry": {
-      "version": "0.3.0",
+    "node_modules/@storybook/client-logger": {
+      "version": "8.1.6",
+      "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@urql/core": ">=2.3.1",
-        "wonka": "^4.0.14"
+        "@storybook/global": "^5.0.0"
       },
-      "peerDependencies": {
-        "graphql": "^0.11.0 || ^0.12.0 || ^0.13.0 || ^14.0.0 || ^15.0.0"
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/storybook"
       }
     },
-    "node_modules/@vercel/ncc": {
-      "version": "0.38.1",
+    "node_modules/@storybook/codemod": {
+      "version": "8.1.10",
       "dev": true,
       "license": "MIT",
-      "bin": {
-        "ncc": "dist/ncc/cli.js"
-      }
-    },
-    "node_modules/@vue/preload-webpack-plugin": {
-      "version": "2.0.0",
-      "license": "Apache-2.0",
-      "engines": {
-        "node": ">=6.0.0"
-      },
-      "peerDependencies": {
-        "html-webpack-plugin": "^5.0.0 || ^4.5.1",
-        "webpack": "^5.20.0 || ^4.1.0"
-      }
-    },
-    "node_modules/@webassemblyjs/helper-buffer": {
-      "version": "1.11.6",
-      "license": "MIT"
-    },
-    "node_modules/@webassemblyjs/helper-numbers": {
-      "version": "1.11.6",
-      "license": "MIT",
       "dependencies": {
-        "@webassemblyjs/floating-point-hex-parser": "1.11.6",
-        "@webassemblyjs/helper-api-error": "1.11.6",
-        "@xtuc/long": "4.2.2"
+        "@babel/core": "^7.24.4",
+        "@babel/preset-env": "^7.24.4",
+        "@babel/types": "^7.24.0",
+        "@storybook/csf": "^0.1.7",
+        "@storybook/csf-tools": "8.1.10",
+        "@storybook/node-logger": "8.1.10",
+        "@storybook/types": "8.1.10",
+        "@types/cross-spawn": "^6.0.2",
+        "cross-spawn": "^7.0.3",
+        "globby": "^14.0.1",
+        "jscodeshift": "^0.15.1",
+        "lodash": "^4.17.21",
+        "prettier": "^3.1.1",
+        "recast": "^0.23.5",
+        "tiny-invariant": "^1.3.1"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/storybook"
       }
     },
-    "node_modules/@webassemblyjs/helper-numbers/node_modules/@webassemblyjs/floating-point-hex-parser": {
-      "version": "1.11.6",
-      "license": "MIT"
-    },
-    "node_modules/@webassemblyjs/helper-numbers/node_modules/@webassemblyjs/helper-api-error": {
-      "version": "1.11.6",
-      "license": "MIT"
-    },
-    "node_modules/@webassemblyjs/helper-wasm-section": {
-      "version": "1.11.6",
+    "node_modules/@storybook/codemod/node_modules/@babel/traverse": {
+      "version": "7.24.7",
+      "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@webassemblyjs/ast": "1.11.6",
-        "@webassemblyjs/helper-buffer": "1.11.6",
-        "@webassemblyjs/helper-wasm-bytecode": "1.11.6",
-        "@webassemblyjs/wasm-gen": "1.11.6"
+        "@babel/code-frame": "^7.24.7",
+        "@babel/generator": "^7.24.7",
+        "@babel/helper-environment-visitor": "^7.24.7",
+        "@babel/helper-function-name": "^7.24.7",
+        "@babel/helper-hoist-variables": "^7.24.7",
+        "@babel/helper-split-export-declaration": "^7.24.7",
+        "@babel/parser": "^7.24.7",
+        "@babel/types": "^7.24.7",
+        "debug": "^4.3.1",
+        "globals": "^11.1.0"
+      },
+      "engines": {
+        "node": ">=6.9.0"
       }
     },
-    "node_modules/@webassemblyjs/helper-wasm-section/node_modules/@webassemblyjs/ast": {
-      "version": "1.11.6",
+    "node_modules/@storybook/codemod/node_modules/@storybook/channels": {
+      "version": "8.1.10",
+      "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@webassemblyjs/helper-numbers": "1.11.6",
-        "@webassemblyjs/helper-wasm-bytecode": "1.11.6"
+        "@storybook/client-logger": "8.1.10",
+        "@storybook/core-events": "8.1.10",
+        "@storybook/global": "^5.0.0",
+        "telejson": "^7.2.0",
+        "tiny-invariant": "^1.3.1"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/storybook"
       }
     },
-    "node_modules/@webassemblyjs/helper-wasm-section/node_modules/@webassemblyjs/helper-wasm-bytecode": {
-      "version": "1.11.6",
-      "license": "MIT"
-    },
-    "node_modules/@webassemblyjs/ieee754": {
-      "version": "1.11.6",
+    "node_modules/@storybook/codemod/node_modules/@storybook/client-logger": {
+      "version": "8.1.10",
+      "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@xtuc/ieee754": "^1.2.0"
-      }
-    },
-    "node_modules/@webassemblyjs/leb128": {
-      "version": "1.11.6",
-      "license": "Apache-2.0",
-      "dependencies": {
-        "@xtuc/long": "4.2.2"
+        "@storybook/global": "^5.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/storybook"
       }
     },
-    "node_modules/@webassemblyjs/utf8": {
-      "version": "1.11.6",
-      "license": "MIT"
-    },
-    "node_modules/@webassemblyjs/wasm-edit": {
-      "version": "1.11.6",
+    "node_modules/@storybook/codemod/node_modules/@storybook/core-events": {
+      "version": "8.1.10",
+      "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@webassemblyjs/ast": "1.11.6",
-        "@webassemblyjs/helper-buffer": "1.11.6",
-        "@webassemblyjs/helper-wasm-bytecode": "1.11.6",
-        "@webassemblyjs/helper-wasm-section": "1.11.6",
-        "@webassemblyjs/wasm-gen": "1.11.6",
-        "@webassemblyjs/wasm-opt": "1.11.6",
-        "@webassemblyjs/wasm-parser": "1.11.6",
-        "@webassemblyjs/wast-printer": "1.11.6"
+        "@storybook/csf": "^0.1.7",
+        "ts-dedent": "^2.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/storybook"
       }
     },
-    "node_modules/@webassemblyjs/wasm-edit/node_modules/@webassemblyjs/ast": {
-      "version": "1.11.6",
+    "node_modules/@storybook/codemod/node_modules/@storybook/csf-tools": {
+      "version": "8.1.10",
+      "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@webassemblyjs/helper-numbers": "1.11.6",
-        "@webassemblyjs/helper-wasm-bytecode": "1.11.6"
+        "@babel/generator": "^7.24.4",
+        "@babel/parser": "^7.24.4",
+        "@babel/traverse": "^7.24.1",
+        "@babel/types": "^7.24.0",
+        "@storybook/csf": "^0.1.7",
+        "@storybook/types": "8.1.10",
+        "fs-extra": "^11.1.0",
+        "recast": "^0.23.5",
+        "ts-dedent": "^2.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/storybook"
       }
     },
-    "node_modules/@webassemblyjs/wasm-edit/node_modules/@webassemblyjs/helper-wasm-bytecode": {
-      "version": "1.11.6",
-      "license": "MIT"
-    },
-    "node_modules/@webassemblyjs/wasm-edit/node_modules/@webassemblyjs/wast-printer": {
-      "version": "1.11.6",
+    "node_modules/@storybook/codemod/node_modules/@storybook/node-logger": {
+      "version": "8.1.10",
+      "dev": true,
       "license": "MIT",
-      "dependencies": {
-        "@webassemblyjs/ast": "1.11.6",
-        "@xtuc/long": "4.2.2"
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/storybook"
       }
     },
-    "node_modules/@webassemblyjs/wasm-gen": {
-      "version": "1.11.6",
+    "node_modules/@storybook/codemod/node_modules/@storybook/types": {
+      "version": "8.1.10",
+      "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@webassemblyjs/ast": "1.11.6",
-        "@webassemblyjs/helper-wasm-bytecode": "1.11.6",
-        "@webassemblyjs/ieee754": "1.11.6",
-        "@webassemblyjs/leb128": "1.11.6",
-        "@webassemblyjs/utf8": "1.11.6"
+        "@storybook/channels": "8.1.10",
+        "@types/express": "^4.7.0",
+        "file-system-cache": "2.3.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/storybook"
       }
     },
-    "node_modules/@webassemblyjs/wasm-gen/node_modules/@webassemblyjs/ast": {
-      "version": "1.11.6",
+    "node_modules/@storybook/codemod/node_modules/ansi-styles": {
+      "version": "4.3.0",
+      "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@webassemblyjs/helper-numbers": "1.11.6",
-        "@webassemblyjs/helper-wasm-bytecode": "1.11.6"
+        "color-convert": "^2.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
       }
     },
-    "node_modules/@webassemblyjs/wasm-gen/node_modules/@webassemblyjs/helper-wasm-bytecode": {
-      "version": "1.11.6",
-      "license": "MIT"
-    },
-    "node_modules/@webassemblyjs/wasm-opt": {
-      "version": "1.11.6",
+    "node_modules/@storybook/codemod/node_modules/chalk": {
+      "version": "4.1.2",
+      "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@webassemblyjs/ast": "1.11.6",
-        "@webassemblyjs/helper-buffer": "1.11.6",
-        "@webassemblyjs/wasm-gen": "1.11.6",
-        "@webassemblyjs/wasm-parser": "1.11.6"
+        "ansi-styles": "^4.1.0",
+        "supports-color": "^7.1.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/chalk?sponsor=1"
       }
     },
-    "node_modules/@webassemblyjs/wasm-opt/node_modules/@webassemblyjs/ast": {
-      "version": "1.11.6",
+    "node_modules/@storybook/codemod/node_modules/color-convert": {
+      "version": "2.0.1",
+      "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@webassemblyjs/helper-numbers": "1.11.6",
-        "@webassemblyjs/helper-wasm-bytecode": "1.11.6"
+        "color-name": "~1.1.4"
+      },
+      "engines": {
+        "node": ">=7.0.0"
       }
     },
-    "node_modules/@webassemblyjs/wasm-opt/node_modules/@webassemblyjs/helper-wasm-bytecode": {
-      "version": "1.11.6",
+    "node_modules/@storybook/codemod/node_modules/color-name": {
+      "version": "1.1.4",
+      "dev": true,
       "license": "MIT"
     },
-    "node_modules/@webassemblyjs/wasm-parser": {
-      "version": "1.11.6",
+    "node_modules/@storybook/codemod/node_modules/fs-extra": {
+      "version": "11.2.0",
+      "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@webassemblyjs/ast": "1.11.6",
-        "@webassemblyjs/helper-api-error": "1.11.6",
-        "@webassemblyjs/helper-wasm-bytecode": "1.11.6",
-        "@webassemblyjs/ieee754": "1.11.6",
-        "@webassemblyjs/leb128": "1.11.6",
-        "@webassemblyjs/utf8": "1.11.6"
+        "graceful-fs": "^4.2.0",
+        "jsonfile": "^6.0.1",
+        "universalify": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=14.14"
       }
     },
-    "node_modules/@webassemblyjs/wasm-parser/node_modules/@webassemblyjs/ast": {
-      "version": "1.11.6",
+    "node_modules/@storybook/codemod/node_modules/globby": {
+      "version": "14.0.1",
+      "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@webassemblyjs/helper-numbers": "1.11.6",
-        "@webassemblyjs/helper-wasm-bytecode": "1.11.6"
-      }
-    },
-    "node_modules/@webassemblyjs/wasm-parser/node_modules/@webassemblyjs/helper-api-error": {
-      "version": "1.11.6",
-      "license": "MIT"
-    },
-    "node_modules/@webassemblyjs/wasm-parser/node_modules/@webassemblyjs/helper-wasm-bytecode": {
-      "version": "1.11.6",
-      "license": "MIT"
-    },
-    "node_modules/@webpack-cli/configtest": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/@webpack-cli/configtest/-/configtest-2.1.1.tgz",
-      "integrity": "sha512-wy0mglZpDSiSS0XHrVR+BAdId2+yxPSoJW8fsna3ZpYSlufjvxnP4YbKTCBZnNIcGN4r6ZPXV55X4mYExOfLmw==",
-      "dev": true,
+        "@sindresorhus/merge-streams": "^2.1.0",
+        "fast-glob": "^3.3.2",
+        "ignore": "^5.2.4",
+        "path-type": "^5.0.0",
+        "slash": "^5.1.0",
+        "unicorn-magic": "^0.1.0"
+      },
       "engines": {
-        "node": ">=14.15.0"
+        "node": ">=18"
       },
-      "peerDependencies": {
-        "webpack": "5.x.x",
-        "webpack-cli": "5.x.x"
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/@webpack-cli/info": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/@webpack-cli/info/-/info-2.0.2.tgz",
-      "integrity": "sha512-zLHQdI/Qs1UyT5UBdWNqsARasIA+AaF8t+4u2aS2nEpBQh2mWIVb8qAklq0eUENnC5mOItrIB4LiS9xMtph18A==",
+    "node_modules/@storybook/codemod/node_modules/has-flag": {
+      "version": "4.0.0",
       "dev": true,
+      "license": "MIT",
       "engines": {
-        "node": ">=14.15.0"
-      },
-      "peerDependencies": {
-        "webpack": "5.x.x",
-        "webpack-cli": "5.x.x"
+        "node": ">=8"
       }
     },
-    "node_modules/@webpack-cli/serve": {
-      "version": "2.0.5",
-      "resolved": "https://registry.npmjs.org/@webpack-cli/serve/-/serve-2.0.5.tgz",
-      "integrity": "sha512-lqaoKnRYBdo1UgDX8uF24AfGMifWK19TxPmM5FHc2vAGxrJ/qtyUyFBWoY1tISZdelsQ5fBcOusifo5o5wSJxQ==",
+    "node_modules/@storybook/codemod/node_modules/jscodeshift": {
+      "version": "0.15.2",
       "dev": true,
-      "engines": {
-        "node": ">=14.15.0"
+      "license": "MIT",
+      "dependencies": {
+        "@babel/core": "^7.23.0",
+        "@babel/parser": "^7.23.0",
+        "@babel/plugin-transform-class-properties": "^7.22.5",
+        "@babel/plugin-transform-modules-commonjs": "^7.23.0",
+        "@babel/plugin-transform-nullish-coalescing-operator": "^7.22.11",
+        "@babel/plugin-transform-optional-chaining": "^7.23.0",
+        "@babel/plugin-transform-private-methods": "^7.22.5",
+        "@babel/preset-flow": "^7.22.15",
+        "@babel/preset-typescript": "^7.23.0",
+        "@babel/register": "^7.22.15",
+        "babel-core": "^7.0.0-bridge.0",
+        "chalk": "^4.1.2",
+        "flow-parser": "0.*",
+        "graceful-fs": "^4.2.4",
+        "micromatch": "^4.0.4",
+        "neo-async": "^2.5.0",
+        "node-dir": "^0.1.17",
+        "recast": "^0.23.3",
+        "temp": "^0.8.4",
+        "write-file-atomic": "^2.3.0"
+      },
+      "bin": {
+        "jscodeshift": "bin/jscodeshift.js"
       },
       "peerDependencies": {
-        "webpack": "5.x.x",
-        "webpack-cli": "5.x.x"
+        "@babel/preset-env": "^7.1.6"
       },
       "peerDependenciesMeta": {
-        "webpack-dev-server": {
+        "@babel/preset-env": {
           "optional": true
         }
       }
     },
-    "node_modules/@welldone-software/why-did-you-render": {
-      "version": "7.0.1",
+    "node_modules/@storybook/codemod/node_modules/path-type": {
+      "version": "5.0.0",
       "dev": true,
       "license": "MIT",
-      "dependencies": {
-        "lodash": "^4"
+      "engines": {
+        "node": ">=12"
       },
-      "peerDependencies": {
-        "react": "^16 || ^17 || ^18"
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/@xmldom/xmldom": {
-      "version": "0.7.13",
+    "node_modules/@storybook/codemod/node_modules/prettier": {
+      "version": "3.3.2",
+      "dev": true,
       "license": "MIT",
-      "engines": {
-        "node": ">=10.0.0"
-      }
-    },
-    "node_modules/@xtuc/ieee754": {
-      "version": "1.2.0",
-      "license": "BSD-3-Clause"
-    },
-    "node_modules/@xtuc/long": {
-      "version": "4.2.2",
-      "license": "Apache-2.0"
-    },
-    "node_modules/@yarnpkg/esbuild-plugin-pnp": {
-      "version": "3.0.0-rc.15",
-      "resolved": "https://registry.npmjs.org/@yarnpkg/esbuild-plugin-pnp/-/esbuild-plugin-pnp-3.0.0-rc.15.tgz",
-      "integrity": "sha512-kYzDJO5CA9sy+on/s2aIW0411AklfCi8Ck/4QDivOqsMKpStZA2SsR+X27VTggGwpStWaLrjJcDcdDMowtG8MA==",
-      "dependencies": {
-        "tslib": "^2.4.0"
+      "bin": {
+        "prettier": "bin/prettier.cjs"
       },
       "engines": {
-        "node": ">=14.15.0"
+        "node": ">=14"
       },
-      "peerDependencies": {
-        "esbuild": ">=0.10.0"
+      "funding": {
+        "url": "https://github.com/prettier/prettier?sponsor=1"
       }
     },
-    "node_modules/@yarnpkg/fslib": {
-      "version": "2.10.3",
-      "resolved": "https://registry.npmjs.org/@yarnpkg/fslib/-/fslib-2.10.3.tgz",
-      "integrity": "sha512-41H+Ga78xT9sHvWLlFOZLIhtU6mTGZ20pZ29EiZa97vnxdohJD2AF42rCoAoWfqUz486xY6fhjMH+DYEM9r14A==",
+    "node_modules/@storybook/codemod/node_modules/recast": {
+      "version": "0.23.9",
+      "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "@yarnpkg/libzip": "^2.3.0",
-        "tslib": "^1.13.0"
+        "ast-types": "^0.16.1",
+        "esprima": "~4.0.0",
+        "source-map": "~0.6.1",
+        "tiny-invariant": "^1.3.3",
+        "tslib": "^2.0.1"
       },
       "engines": {
-        "node": ">=12 <14 || 14.2 - 14.9 || >14.10.0"
+        "node": ">= 4"
       }
     },
-    "node_modules/@yarnpkg/fslib/node_modules/tslib": {
-      "version": "1.14.1",
-      "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz",
-      "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg=="
-    },
-    "node_modules/@yarnpkg/libzip": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/@yarnpkg/libzip/-/libzip-2.3.0.tgz",
-      "integrity": "sha512-6xm38yGVIa6mKm/DUCF2zFFJhERh/QWp1ufm4cNUvxsONBmfPg8uZ9pZBdOmF6qFGr/HlT6ABBkCSx/dlEtvWg==",
-      "dependencies": {
-        "@types/emscripten": "^1.39.6",
-        "tslib": "^1.13.0"
-      },
-      "engines": {
-        "node": ">=12 <14 || 14.2 - 14.9 || >14.10.0"
-      }
-    },
-    "node_modules/@yarnpkg/libzip/node_modules/tslib": {
-      "version": "1.14.1",
-      "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz",
-      "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg=="
-    },
-    "node_modules/@yarnpkg/lockfile": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/@yarnpkg/lockfile/-/lockfile-1.1.0.tgz",
-      "integrity": "sha512-GpSwvyXOcOOlV70vbnzjj4fW5xW/FdUF6nQEt1ENy7m4ZCczi1+/buVUPAqmGfqznsORNFzUMjctTIp8a9tuCQ==",
-      "dev": true,
-      "license": "BSD-2-Clause"
-    },
-    "node_modules/7zip-bin": {
-      "version": "5.2.0",
+    "node_modules/@storybook/codemod/node_modules/slash": {
+      "version": "5.1.0",
       "dev": true,
-      "license": "MIT"
-    },
-    "node_modules/abab": {
-      "version": "2.0.6",
-      "license": "BSD-3-Clause"
-    },
-    "node_modules/abbrev": {
-      "version": "1.1.1",
-      "license": "ISC",
-      "optional": true
-    },
-    "node_modules/abort-controller": {
-      "version": "3.0.0",
       "license": "MIT",
-      "dependencies": {
-        "event-target-shim": "^5.0.0"
-      },
       "engines": {
-        "node": ">=6.5"
-      }
-    },
-    "node_modules/accepts": {
-      "version": "1.3.8",
-      "license": "MIT",
-      "dependencies": {
-        "mime-types": "~2.1.34",
-        "negotiator": "0.6.3"
+        "node": ">=14.16"
       },
-      "engines": {
-        "node": ">= 0.6"
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/acorn": {
-      "version": "7.4.1",
-      "license": "MIT",
-      "bin": {
-        "acorn": "bin/acorn"
-      },
+    "node_modules/@storybook/codemod/node_modules/source-map": {
+      "version": "0.6.1",
+      "dev": true,
+      "license": "BSD-3-Clause",
       "engines": {
-        "node": ">=0.4.0"
+        "node": ">=0.10.0"
       }
     },
-    "node_modules/acorn-dynamic-import": {
-      "version": "2.0.2",
+    "node_modules/@storybook/codemod/node_modules/supports-color": {
+      "version": "7.2.0",
+      "dev": true,
       "license": "MIT",
       "dependencies": {
-        "acorn": "^4.0.3"
-      }
-    },
-    "node_modules/acorn-dynamic-import/node_modules/acorn": {
-      "version": "4.0.13",
-      "license": "MIT",
-      "bin": {
-        "acorn": "bin/acorn"
+        "has-flag": "^4.0.0"
       },
       "engines": {
-        "node": ">=0.4.0"
+        "node": ">=8"
       }
     },
-    "node_modules/acorn-globals": {
-      "version": "7.0.1",
+    "node_modules/@storybook/components": {
+      "version": "8.1.10",
+      "dev": true,
       "license": "MIT",
       "dependencies": {
-        "acorn": "^8.1.0",
-        "acorn-walk": "^8.0.2"
-      }
-    },
-    "node_modules/acorn-globals/node_modules/acorn": {
-      "version": "8.11.3",
-      "license": "MIT",
-      "bin": {
-        "acorn": "bin/acorn"
+        "@radix-ui/react-dialog": "^1.0.5",
+        "@radix-ui/react-slot": "^1.0.2",
+        "@storybook/client-logger": "8.1.10",
+        "@storybook/csf": "^0.1.7",
+        "@storybook/global": "^5.0.0",
+        "@storybook/icons": "^1.2.5",
+        "@storybook/theming": "8.1.10",
+        "@storybook/types": "8.1.10",
+        "memoizerific": "^1.11.3",
+        "util-deprecate": "^1.0.2"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/storybook"
       },
-      "engines": {
-        "node": ">=0.4.0"
-      }
-    },
-    "node_modules/acorn-globals/node_modules/acorn-walk": {
-      "version": "8.3.1",
-      "license": "MIT",
-      "engines": {
-        "node": ">=0.4.0"
-      }
-    },
-    "node_modules/acorn-jsx": {
-      "version": "5.3.2",
-      "license": "MIT",
       "peerDependencies": {
-        "acorn": "^6.0.0 || ^7.0.0 || ^8.0.0"
-      }
-    },
-    "node_modules/acorn-walk": {
-      "version": "7.2.0",
-      "license": "MIT",
-      "engines": {
-        "node": ">=0.4.0"
-      }
-    },
-    "node_modules/address": {
-      "version": "1.2.2",
-      "resolved": "https://registry.npmjs.org/address/-/address-1.2.2.tgz",
-      "integrity": "sha512-4B/qKCfeE/ODUaAUpSwfzazo5x29WD4r3vXiWsB7I2mSDAihwEqKO+g8GELZUQSSAo5e1XTYh3ZVfLyxBc12nA==",
-      "engines": {
-        "node": ">= 10.0.0"
+        "react": "^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0-beta",
+        "react-dom": "^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0-beta"
       }
     },
-    "node_modules/adm-zip": {
-      "version": "0.5.10",
+    "node_modules/@storybook/components/node_modules/@storybook/channels": {
+      "version": "8.1.10",
+      "dev": true,
       "license": "MIT",
-      "engines": {
-        "node": ">=6.0"
+      "dependencies": {
+        "@storybook/client-logger": "8.1.10",
+        "@storybook/core-events": "8.1.10",
+        "@storybook/global": "^5.0.0",
+        "telejson": "^7.2.0",
+        "tiny-invariant": "^1.3.1"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/storybook"
       }
     },
-    "node_modules/agent-base": {
-      "version": "6.0.2",
+    "node_modules/@storybook/components/node_modules/@storybook/client-logger": {
+      "version": "8.1.10",
+      "dev": true,
       "license": "MIT",
       "dependencies": {
-        "debug": "4"
+        "@storybook/global": "^5.0.0"
       },
-      "engines": {
-        "node": ">= 6.0.0"
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/storybook"
       }
     },
-    "node_modules/aggregate-error": {
-      "version": "3.1.0",
+    "node_modules/@storybook/components/node_modules/@storybook/core-events": {
+      "version": "8.1.10",
+      "dev": true,
       "license": "MIT",
       "dependencies": {
-        "clean-stack": "^2.0.0",
-        "indent-string": "^4.0.0"
+        "@storybook/csf": "^0.1.7",
+        "ts-dedent": "^2.0.0"
       },
-      "engines": {
-        "node": ">=8"
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/storybook"
       }
     },
-    "node_modules/ajv": {
-      "version": "8.12.0",
+    "node_modules/@storybook/components/node_modules/@storybook/types": {
+      "version": "8.1.10",
+      "dev": true,
       "license": "MIT",
       "dependencies": {
-        "fast-deep-equal": "^3.1.1",
-        "json-schema-traverse": "^1.0.0",
-        "require-from-string": "^2.0.2",
-        "uri-js": "^4.2.2"
+        "@storybook/channels": "8.1.10",
+        "@types/express": "^4.7.0",
+        "file-system-cache": "2.3.0"
       },
       "funding": {
-        "type": "github",
-        "url": "https://github.com/sponsors/epoberezkin"
+        "type": "opencollective",
+        "url": "https://opencollective.com/storybook"
       }
     },
-    "node_modules/ajv-cli": {
-      "version": "5.0.0",
+    "node_modules/@storybook/core-common": {
+      "version": "8.1.6",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "ajv": "^8.0.0",
-        "fast-json-patch": "^2.0.0",
-        "glob": "^7.1.0",
-        "js-yaml": "^3.14.0",
-        "json-schema-migrate": "^2.0.0",
-        "json5": "^2.1.3",
-        "minimist": "^1.2.0"
+        "@storybook/core-events": "8.1.6",
+        "@storybook/csf-tools": "8.1.6",
+        "@storybook/node-logger": "8.1.6",
+        "@storybook/types": "8.1.6",
+        "@yarnpkg/fslib": "2.10.3",
+        "@yarnpkg/libzip": "2.3.0",
+        "chalk": "^4.1.0",
+        "cross-spawn": "^7.0.3",
+        "esbuild": "^0.18.0 || ^0.19.0 || ^0.20.0",
+        "esbuild-register": "^3.5.0",
+        "execa": "^5.0.0",
+        "file-system-cache": "2.3.0",
+        "find-cache-dir": "^3.0.0",
+        "find-up": "^5.0.0",
+        "fs-extra": "^11.1.0",
+        "glob": "^10.0.0",
+        "handlebars": "^4.7.7",
+        "lazy-universal-dotenv": "^4.0.0",
+        "node-fetch": "^2.0.0",
+        "picomatch": "^2.3.0",
+        "pkg-dir": "^5.0.0",
+        "prettier-fallback": "npm:prettier@^3",
+        "pretty-hrtime": "^1.0.3",
+        "resolve-from": "^5.0.0",
+        "semver": "^7.3.7",
+        "tempy": "^3.1.0",
+        "tiny-invariant": "^1.3.1",
+        "ts-dedent": "^2.0.0",
+        "util": "^0.12.4"
       },
-      "bin": {
-        "ajv": "dist/index.js"
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/storybook"
       },
       "peerDependencies": {
-        "ts-node": ">=9.0.0"
+        "prettier": "^2 || ^3"
       },
       "peerDependenciesMeta": {
-        "ts-node": {
+        "prettier": {
           "optional": true
         }
       }
     },
-    "node_modules/ajv-formats": {
-      "version": "2.1.1",
+    "node_modules/@storybook/core-common/node_modules/ansi-styles": {
+      "version": "4.3.0",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "ajv": "^8.0.0"
+        "color-convert": "^2.0.1"
       },
-      "peerDependencies": {
-        "ajv": "^8.0.0"
+      "engines": {
+        "node": ">=8"
       },
-      "peerDependenciesMeta": {
-        "ajv": {
-          "optional": true
-        }
+      "funding": {
+        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
       }
     },
-    "node_modules/ajv-keywords": {
-      "version": "1.5.1",
+    "node_modules/@storybook/core-common/node_modules/brace-expansion": {
+      "version": "2.0.1",
+      "dev": true,
       "license": "MIT",
-      "peerDependencies": {
-        "ajv": ">=4.10.0"
+      "dependencies": {
+        "balanced-match": "^1.0.0"
       }
     },
-    "node_modules/align-text": {
-      "version": "0.1.4",
+    "node_modules/@storybook/core-common/node_modules/chalk": {
+      "version": "4.1.2",
+      "dev": true,
       "license": "MIT",
       "dependencies": {
-        "kind-of": "^3.0.2",
-        "longest": "^1.0.1",
-        "repeat-string": "^1.5.2"
+        "ansi-styles": "^4.1.0",
+        "supports-color": "^7.1.0"
       },
       "engines": {
-        "node": ">=0.10.0"
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/chalk?sponsor=1"
       }
     },
-    "node_modules/align-text/node_modules/is-buffer": {
-      "version": "1.1.6",
-      "license": "MIT"
-    },
-    "node_modules/align-text/node_modules/kind-of": {
-      "version": "3.2.2",
+    "node_modules/@storybook/core-common/node_modules/color-convert": {
+      "version": "2.0.1",
+      "dev": true,
       "license": "MIT",
       "dependencies": {
-        "is-buffer": "^1.1.5"
+        "color-name": "~1.1.4"
       },
       "engines": {
-        "node": ">=0.10.0"
+        "node": ">=7.0.0"
       }
     },
-    "node_modules/anser": {
-      "version": "1.4.10",
+    "node_modules/@storybook/core-common/node_modules/color-name": {
+      "version": "1.1.4",
+      "dev": true,
       "license": "MIT"
     },
-    "node_modules/ansi-colors": {
-      "version": "4.1.3",
+    "node_modules/@storybook/core-common/node_modules/crypto-random-string": {
+      "version": "4.0.0",
       "dev": true,
       "license": "MIT",
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/ansi-escapes": {
-      "version": "4.3.2",
-      "license": "MIT",
       "dependencies": {
-        "type-fest": "^0.21.3"
+        "type-fest": "^1.0.1"
       },
       "engines": {
-        "node": ">=8"
+        "node": ">=12"
       },
       "funding": {
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/ansi-escapes/node_modules/type-fest": {
-      "version": "0.21.3",
+    "node_modules/@storybook/core-common/node_modules/crypto-random-string/node_modules/type-fest": {
+      "version": "1.4.0",
+      "dev": true,
       "license": "(MIT OR CC0-1.0)",
       "engines": {
         "node": ">=10"
@@ -13970,898 +13795,906 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/ansi-fragments": {
-      "version": "0.2.1",
-      "resolved": "https://registry.npmjs.org/ansi-fragments/-/ansi-fragments-0.2.1.tgz",
-      "integrity": "sha512-DykbNHxuXQwUDRv5ibc2b0x7uw7wmwOGLBUd5RmaQ5z8Lhx19vwvKV+FAsM5rEA6dEcHxX+/Ad5s9eF2k2bB+w==",
-      "dependencies": {
-        "colorette": "^1.0.7",
-        "slice-ansi": "^2.0.0",
-        "strip-ansi": "^5.0.0"
-      }
-    },
-    "node_modules/ansi-fragments/node_modules/astral-regex": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/astral-regex/-/astral-regex-1.0.0.tgz",
-      "integrity": "sha512-+Ryf6g3BKoRc7jfp7ad8tM4TtMiaWvbF/1/sQcZPkkS7ag3D5nMBCe2UfOTONtAkaG0tO0ij3C5Lwmf1EiyjHg==",
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/ansi-fragments/node_modules/is-fullwidth-code-point": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz",
-      "integrity": "sha512-VHskAKYM8RfSFXwee5t5cbN5PZeq1Wrh6qd5bkyiXIf6UQcN6w/A0eXM9r6t8d+GYOh+o6ZhiEnb88LN/Y8m2w==",
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/ansi-fragments/node_modules/slice-ansi": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-2.1.0.tgz",
-      "integrity": "sha512-Qu+VC3EwYLldKa1fCxuuvULvSJOKEgk9pi8dZeCVK7TqBfUNTH4sFkk4joj8afVSfAYgJoSOetjx9QWOJ5mYoQ==",
+    "node_modules/@storybook/core-common/node_modules/find-cache-dir": {
+      "version": "3.3.2",
+      "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "ansi-styles": "^3.2.0",
-        "astral-regex": "^1.0.0",
-        "is-fullwidth-code-point": "^2.0.0"
+        "commondir": "^1.0.1",
+        "make-dir": "^3.0.2",
+        "pkg-dir": "^4.1.0"
       },
       "engines": {
-        "node": ">=6"
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/avajs/find-cache-dir?sponsor=1"
       }
     },
-    "node_modules/ansi-fragments/node_modules/strip-ansi": {
-      "version": "5.2.0",
-      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz",
-      "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==",
+    "node_modules/@storybook/core-common/node_modules/find-cache-dir/node_modules/find-up": {
+      "version": "4.1.0",
+      "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "ansi-regex": "^4.1.0"
+        "locate-path": "^5.0.0",
+        "path-exists": "^4.0.0"
       },
       "engines": {
-        "node": ">=6"
+        "node": ">=8"
       }
     },
-    "node_modules/ansi-html-community": {
-      "version": "0.0.8",
+    "node_modules/@storybook/core-common/node_modules/find-cache-dir/node_modules/pkg-dir": {
+      "version": "4.2.0",
       "dev": true,
-      "engines": [
-        "node >= 0.8.0"
-      ],
-      "license": "Apache-2.0",
-      "bin": {
-        "ansi-html": "bin/ansi-html"
-      }
-    },
-    "node_modules/ansi-regex": {
-      "version": "4.1.1",
       "license": "MIT",
+      "dependencies": {
+        "find-up": "^4.0.0"
+      },
       "engines": {
-        "node": ">=6"
+        "node": ">=8"
       }
     },
-    "node_modules/ansi-styles": {
-      "version": "3.2.1",
+    "node_modules/@storybook/core-common/node_modules/fs-extra": {
+      "version": "11.2.0",
+      "dev": true,
       "license": "MIT",
       "dependencies": {
-        "color-convert": "^1.9.0"
+        "graceful-fs": "^4.2.0",
+        "jsonfile": "^6.0.1",
+        "universalify": "^2.0.0"
       },
       "engines": {
-        "node": ">=4"
+        "node": ">=14.14"
       }
     },
-    "node_modules/any-promise": {
-      "version": "1.3.0",
-      "license": "MIT"
-    },
-    "node_modules/anymatch": {
-      "version": "3.1.3",
+    "node_modules/@storybook/core-common/node_modules/glob": {
+      "version": "10.3.12",
+      "dev": true,
       "license": "ISC",
       "dependencies": {
-        "normalize-path": "^3.0.0",
-        "picomatch": "^2.0.4"
+        "foreground-child": "^3.1.0",
+        "jackspeak": "^2.3.6",
+        "minimatch": "^9.0.1",
+        "minipass": "^7.0.4",
+        "path-scurry": "^1.10.2"
+      },
+      "bin": {
+        "glob": "dist/esm/bin.mjs"
       },
       "engines": {
-        "node": ">= 8"
+        "node": ">=16 || 14 >=14.17"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
       }
     },
-    "node_modules/app-builder-bin": {
-      "version": "4.0.0",
-      "dev": true,
-      "license": "MIT"
-    },
-    "node_modules/app-builder-lib": {
-      "version": "24.13.2",
+    "node_modules/@storybook/core-common/node_modules/glob/node_modules/jackspeak": {
+      "version": "2.3.6",
       "dev": true,
-      "license": "MIT",
+      "license": "BlueOak-1.0.0",
       "dependencies": {
-        "@develar/schema-utils": "~2.6.5",
-        "@electron/notarize": "2.2.1",
-        "@electron/osx-sign": "1.0.5",
-        "@electron/universal": "1.5.1",
-        "@malept/flatpak-bundler": "^0.4.0",
-        "@types/fs-extra": "9.0.13",
-        "async-exit-hook": "^2.0.1",
-        "bluebird-lst": "^1.0.9",
-        "builder-util": "24.13.1",
-        "builder-util-runtime": "9.2.4",
-        "chromium-pickle-js": "^0.2.0",
-        "debug": "^4.3.4",
-        "ejs": "^3.1.8",
-        "electron-publish": "24.13.1",
-        "form-data": "^4.0.0",
-        "fs-extra": "^10.1.0",
-        "hosted-git-info": "^4.1.0",
-        "is-ci": "^3.0.0",
-        "isbinaryfile": "^5.0.0",
-        "js-yaml": "^4.1.0",
-        "lazy-val": "^1.0.5",
-        "minimatch": "^5.1.1",
-        "read-config-file": "6.3.2",
-        "sanitize-filename": "^1.6.3",
-        "semver": "^7.3.8",
-        "tar": "^6.1.12",
-        "temp-file": "^3.4.0"
+        "@isaacs/cliui": "^8.0.2"
       },
       "engines": {
-        "node": ">=14.0.0"
+        "node": ">=14"
       },
-      "peerDependencies": {
-        "dmg-builder": "24.13.2",
-        "electron-builder-squirrel-windows": "24.13.2"
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
+      },
+      "optionalDependencies": {
+        "@pkgjs/parseargs": "^0.11.0"
       }
     },
-    "node_modules/app-builder-lib/node_modules/argparse": {
-      "version": "2.0.1",
+    "node_modules/@storybook/core-common/node_modules/has-flag": {
+      "version": "4.0.0",
       "dev": true,
-      "license": "Python-2.0"
+      "license": "MIT",
+      "engines": {
+        "node": ">=8"
+      }
     },
-    "node_modules/app-builder-lib/node_modules/brace-expansion": {
-      "version": "2.0.1",
+    "node_modules/@storybook/core-common/node_modules/is-stream": {
+      "version": "3.0.0",
       "dev": true,
       "license": "MIT",
-      "dependencies": {
-        "balanced-match": "^1.0.0"
+      "engines": {
+        "node": "^12.20.0 || ^14.13.1 || >=16.0.0"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/app-builder-lib/node_modules/form-data": {
-      "version": "4.0.0",
+    "node_modules/@storybook/core-common/node_modules/locate-path": {
+      "version": "5.0.0",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "asynckit": "^0.4.0",
-        "combined-stream": "^1.0.8",
-        "mime-types": "^2.1.12"
+        "p-locate": "^4.1.0"
       },
       "engines": {
-        "node": ">= 6"
+        "node": ">=8"
       }
     },
-    "node_modules/app-builder-lib/node_modules/fs-extra": {
-      "version": "10.1.0",
+    "node_modules/@storybook/core-common/node_modules/make-dir": {
+      "version": "3.1.0",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "graceful-fs": "^4.2.0",
-        "jsonfile": "^6.0.1",
-        "universalify": "^2.0.0"
+        "semver": "^6.0.0"
       },
       "engines": {
-        "node": ">=12"
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/app-builder-lib/node_modules/js-yaml": {
-      "version": "4.1.0",
+    "node_modules/@storybook/core-common/node_modules/make-dir/node_modules/semver": {
+      "version": "6.3.1",
       "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "argparse": "^2.0.1"
-      },
+      "license": "ISC",
       "bin": {
-        "js-yaml": "bin/js-yaml.js"
+        "semver": "bin/semver.js"
       }
     },
-    "node_modules/app-builder-lib/node_modules/minimatch": {
-      "version": "5.1.6",
+    "node_modules/@storybook/core-common/node_modules/minimatch": {
+      "version": "9.0.4",
       "dev": true,
       "license": "ISC",
       "dependencies": {
         "brace-expansion": "^2.0.1"
       },
       "engines": {
-        "node": ">=10"
+        "node": ">=16 || 14 >=14.17"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
       }
     },
-    "node_modules/app-root-dir": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/app-root-dir/-/app-root-dir-1.0.2.tgz",
-      "integrity": "sha512-jlpIfsOoNoafl92Sz//64uQHGSyMrD2vYG5d8o2a4qGvyNCvXur7bzIsWtAC/6flI2RYAp3kv8rsfBtaLm7w0g=="
-    },
-    "node_modules/appdirsjs": {
-      "version": "1.2.7",
-      "resolved": "https://registry.npmjs.org/appdirsjs/-/appdirsjs-1.2.7.tgz",
-      "integrity": "sha512-Quji6+8kLBC3NnBeo14nPDq0+2jUs5s3/xEye+udFHumHhRk4M7aAMXp/PBJqkKYGuuyR9M/6Dq7d2AViiGmhw=="
-    },
-    "node_modules/application-config-path": {
-      "version": "0.1.1",
-      "license": "MIT"
-    },
-    "node_modules/aproba": {
-      "version": "1.2.0",
+    "node_modules/@storybook/core-common/node_modules/minipass": {
+      "version": "7.1.2",
+      "dev": true,
       "license": "ISC",
-      "optional": true
+      "engines": {
+        "node": ">=16 || 14 >=14.17"
+      }
     },
-    "node_modules/archiver": {
-      "version": "5.3.2",
-      "dev": true,
+    "node_modules/@storybook/core-common/node_modules/p-limit": {
+      "version": "2.3.0",
+      "dev": true,
       "license": "MIT",
-      "peer": true,
       "dependencies": {
-        "archiver-utils": "^2.1.0",
-        "async": "^3.2.4",
-        "buffer-crc32": "^0.2.1",
-        "readable-stream": "^3.6.0",
-        "readdir-glob": "^1.1.2",
-        "tar-stream": "^2.2.0",
-        "zip-stream": "^4.1.0"
+        "p-try": "^2.0.0"
       },
       "engines": {
-        "node": ">= 10"
+        "node": ">=6"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/archiver-utils": {
-      "version": "2.1.0",
+    "node_modules/@storybook/core-common/node_modules/p-locate": {
+      "version": "4.1.0",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "dependencies": {
-        "glob": "^7.1.4",
-        "graceful-fs": "^4.2.0",
-        "lazystream": "^1.0.0",
-        "lodash.defaults": "^4.2.0",
-        "lodash.difference": "^4.5.0",
-        "lodash.flatten": "^4.4.0",
-        "lodash.isplainobject": "^4.0.6",
-        "lodash.union": "^4.6.0",
-        "normalize-path": "^3.0.0",
-        "readable-stream": "^2.0.0"
+        "p-limit": "^2.2.0"
       },
       "engines": {
-        "node": ">= 6"
+        "node": ">=8"
       }
     },
-    "node_modules/archiver/node_modules/readable-stream": {
-      "version": "3.6.2",
+    "node_modules/@storybook/core-common/node_modules/path-exists": {
+      "version": "4.0.0",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/@storybook/core-common/node_modules/supports-color": {
+      "version": "7.2.0",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "dependencies": {
-        "inherits": "^2.0.3",
-        "string_decoder": "^1.1.1",
-        "util-deprecate": "^1.0.1"
+        "has-flag": "^4.0.0"
       },
       "engines": {
-        "node": ">= 6"
+        "node": ">=8"
       }
     },
-    "node_modules/are-docs-informative": {
-      "version": "0.0.2",
+    "node_modules/@storybook/core-common/node_modules/temp-dir": {
+      "version": "3.0.0",
       "dev": true,
       "license": "MIT",
       "engines": {
-        "node": ">=14"
+        "node": ">=14.16"
       }
     },
-    "node_modules/are-we-there-yet": {
-      "version": "2.0.0",
-      "license": "ISC",
-      "optional": true,
+    "node_modules/@storybook/core-common/node_modules/tempy": {
+      "version": "3.1.0",
+      "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "delegates": "^1.0.0",
-        "readable-stream": "^3.6.0"
+        "is-stream": "^3.0.0",
+        "temp-dir": "^3.0.0",
+        "type-fest": "^2.12.2",
+        "unique-string": "^3.0.0"
       },
       "engines": {
-        "node": ">=10"
+        "node": ">=14.16"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/are-we-there-yet/node_modules/readable-stream": {
-      "version": "3.6.2",
+    "node_modules/@storybook/core-common/node_modules/type-fest": {
+      "version": "2.19.0",
+      "dev": true,
+      "license": "(MIT OR CC0-1.0)",
+      "engines": {
+        "node": ">=12.20"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/@storybook/core-common/node_modules/unique-string": {
+      "version": "3.0.0",
+      "dev": true,
       "license": "MIT",
-      "optional": true,
       "dependencies": {
-        "inherits": "^2.0.3",
-        "string_decoder": "^1.1.1",
-        "util-deprecate": "^1.0.1"
+        "crypto-random-string": "^4.0.0"
       },
       "engines": {
-        "node": ">= 6"
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/arg": {
-      "version": "4.1.3",
-      "devOptional": true,
-      "license": "MIT"
-    },
-    "node_modules/argparse": {
-      "version": "1.0.10",
+    "node_modules/@storybook/core-common/node_modules/util": {
+      "version": "0.12.5",
+      "dev": true,
       "license": "MIT",
       "dependencies": {
-        "sprintf-js": "~1.0.2"
+        "inherits": "^2.0.3",
+        "is-arguments": "^1.0.4",
+        "is-generator-function": "^1.0.7",
+        "is-typed-array": "^1.1.3",
+        "which-typed-array": "^1.1.2"
       }
     },
-    "node_modules/aria-query": {
-      "version": "5.3.0",
-      "resolved": "https://registry.npmjs.org/aria-query/-/aria-query-5.3.0.tgz",
-      "integrity": "sha512-b0P0sZPKtyu8HkeRAfCq0IfURZK+SuwMjY1UXGBU27wpAiTwQAIlq56IbIO+ytk/JjS1fMR14ee5WBBfKi5J6A==",
+    "node_modules/@storybook/core-events": {
+      "version": "8.1.6",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "dequal": "^2.0.3"
+        "@storybook/csf": "^0.1.7",
+        "ts-dedent": "^2.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/storybook"
       }
     },
-    "node_modules/arr-diff": {
-      "version": "4.0.0",
+    "node_modules/@storybook/core-server": {
+      "version": "8.1.10",
+      "dev": true,
       "license": "MIT",
-      "optional": true,
-      "engines": {
-        "node": ">=0.10.0"
+      "dependencies": {
+        "@aw-web-design/x-default-browser": "1.4.126",
+        "@babel/core": "^7.24.4",
+        "@babel/parser": "^7.24.4",
+        "@discoveryjs/json-ext": "^0.5.3",
+        "@storybook/builder-manager": "8.1.10",
+        "@storybook/channels": "8.1.10",
+        "@storybook/core-common": "8.1.10",
+        "@storybook/core-events": "8.1.10",
+        "@storybook/csf": "^0.1.7",
+        "@storybook/csf-tools": "8.1.10",
+        "@storybook/docs-mdx": "3.1.0-next.0",
+        "@storybook/global": "^5.0.0",
+        "@storybook/manager": "8.1.10",
+        "@storybook/manager-api": "8.1.10",
+        "@storybook/node-logger": "8.1.10",
+        "@storybook/preview-api": "8.1.10",
+        "@storybook/telemetry": "8.1.10",
+        "@storybook/types": "8.1.10",
+        "@types/detect-port": "^1.3.0",
+        "@types/diff": "^5.0.9",
+        "@types/node": "^18.0.0",
+        "@types/pretty-hrtime": "^1.0.0",
+        "@types/semver": "^7.3.4",
+        "better-opn": "^3.0.2",
+        "chalk": "^4.1.0",
+        "cli-table3": "^0.6.1",
+        "compression": "^1.7.4",
+        "detect-port": "^1.3.0",
+        "diff": "^5.2.0",
+        "express": "^4.17.3",
+        "fs-extra": "^11.1.0",
+        "globby": "^14.0.1",
+        "lodash": "^4.17.21",
+        "open": "^8.4.0",
+        "pretty-hrtime": "^1.0.3",
+        "prompts": "^2.4.0",
+        "read-pkg-up": "^7.0.1",
+        "semver": "^7.3.7",
+        "telejson": "^7.2.0",
+        "tiny-invariant": "^1.3.1",
+        "ts-dedent": "^2.0.0",
+        "util": "^0.12.4",
+        "util-deprecate": "^1.0.2",
+        "watchpack": "^2.2.0",
+        "ws": "^8.2.3"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/storybook"
       }
     },
-    "node_modules/arr-flatten": {
-      "version": "1.1.0",
+    "node_modules/@storybook/core-server/node_modules/@babel/traverse": {
+      "version": "7.24.7",
+      "dev": true,
       "license": "MIT",
-      "optional": true,
+      "dependencies": {
+        "@babel/code-frame": "^7.24.7",
+        "@babel/generator": "^7.24.7",
+        "@babel/helper-environment-visitor": "^7.24.7",
+        "@babel/helper-function-name": "^7.24.7",
+        "@babel/helper-hoist-variables": "^7.24.7",
+        "@babel/helper-split-export-declaration": "^7.24.7",
+        "@babel/parser": "^7.24.7",
+        "@babel/types": "^7.24.7",
+        "debug": "^4.3.1",
+        "globals": "^11.1.0"
+      },
       "engines": {
-        "node": ">=0.10.0"
+        "node": ">=6.9.0"
       }
     },
-    "node_modules/arr-union": {
-      "version": "3.1.0",
+    "node_modules/@storybook/core-server/node_modules/@storybook/channels": {
+      "version": "8.1.10",
+      "dev": true,
       "license": "MIT",
-      "engines": {
-        "node": ">=0.10.0"
+      "dependencies": {
+        "@storybook/client-logger": "8.1.10",
+        "@storybook/core-events": "8.1.10",
+        "@storybook/global": "^5.0.0",
+        "telejson": "^7.2.0",
+        "tiny-invariant": "^1.3.1"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/storybook"
       }
     },
-    "node_modules/array-buffer-byte-length": {
-      "version": "1.0.0",
+    "node_modules/@storybook/core-server/node_modules/@storybook/client-logger": {
+      "version": "8.1.10",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "call-bind": "^1.0.2",
-        "is-array-buffer": "^3.0.1"
+        "@storybook/global": "^5.0.0"
       },
       "funding": {
-        "url": "https://github.com/sponsors/ljharb"
+        "type": "opencollective",
+        "url": "https://opencollective.com/storybook"
       }
     },
-    "node_modules/array-flatten": {
-      "version": "1.1.1",
-      "license": "MIT"
-    },
-    "node_modules/array-includes": {
-      "version": "3.1.7",
+    "node_modules/@storybook/core-server/node_modules/@storybook/core-common": {
+      "version": "8.1.10",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.2.0",
-        "es-abstract": "^1.22.1",
-        "get-intrinsic": "^1.2.1",
-        "is-string": "^1.0.7"
-      },
-      "engines": {
-        "node": ">= 0.4"
+        "@storybook/core-events": "8.1.10",
+        "@storybook/csf-tools": "8.1.10",
+        "@storybook/node-logger": "8.1.10",
+        "@storybook/types": "8.1.10",
+        "@yarnpkg/fslib": "2.10.3",
+        "@yarnpkg/libzip": "2.3.0",
+        "chalk": "^4.1.0",
+        "cross-spawn": "^7.0.3",
+        "esbuild": "^0.18.0 || ^0.19.0 || ^0.20.0",
+        "esbuild-register": "^3.5.0",
+        "execa": "^5.0.0",
+        "file-system-cache": "2.3.0",
+        "find-cache-dir": "^3.0.0",
+        "find-up": "^5.0.0",
+        "fs-extra": "^11.1.0",
+        "glob": "^10.0.0",
+        "handlebars": "^4.7.7",
+        "lazy-universal-dotenv": "^4.0.0",
+        "node-fetch": "^2.0.0",
+        "picomatch": "^2.3.0",
+        "pkg-dir": "^5.0.0",
+        "prettier-fallback": "npm:prettier@^3",
+        "pretty-hrtime": "^1.0.3",
+        "resolve-from": "^5.0.0",
+        "semver": "^7.3.7",
+        "tempy": "^3.1.0",
+        "tiny-invariant": "^1.3.1",
+        "ts-dedent": "^2.0.0",
+        "util": "^0.12.4"
       },
       "funding": {
-        "url": "https://github.com/sponsors/ljharb"
+        "type": "opencollective",
+        "url": "https://opencollective.com/storybook"
+      },
+      "peerDependencies": {
+        "prettier": "^2 || ^3"
+      },
+      "peerDependenciesMeta": {
+        "prettier": {
+          "optional": true
+        }
       }
     },
-    "node_modules/array-union": {
-      "version": "2.1.0",
+    "node_modules/@storybook/core-server/node_modules/@storybook/core-events": {
+      "version": "8.1.10",
+      "dev": true,
       "license": "MIT",
-      "engines": {
-        "node": ">=8"
+      "dependencies": {
+        "@storybook/csf": "^0.1.7",
+        "ts-dedent": "^2.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/storybook"
       }
     },
-    "node_modules/array-uniq": {
-      "version": "1.0.3",
+    "node_modules/@storybook/core-server/node_modules/@storybook/csf-tools": {
+      "version": "8.1.10",
       "dev": true,
       "license": "MIT",
-      "engines": {
-        "node": ">=0.10.0"
+      "dependencies": {
+        "@babel/generator": "^7.24.4",
+        "@babel/parser": "^7.24.4",
+        "@babel/traverse": "^7.24.1",
+        "@babel/types": "^7.24.0",
+        "@storybook/csf": "^0.1.7",
+        "@storybook/types": "8.1.10",
+        "fs-extra": "^11.1.0",
+        "recast": "^0.23.5",
+        "ts-dedent": "^2.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/storybook"
       }
     },
-    "node_modules/array-unique": {
-      "version": "0.3.2",
+    "node_modules/@storybook/core-server/node_modules/@storybook/node-logger": {
+      "version": "8.1.10",
+      "dev": true,
       "license": "MIT",
-      "optional": true,
-      "engines": {
-        "node": ">=0.10.0"
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/storybook"
       }
     },
-    "node_modules/array.prototype.findlastindex": {
-      "version": "1.2.3",
+    "node_modules/@storybook/core-server/node_modules/@storybook/preview-api": {
+      "version": "8.1.10",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.2.0",
-        "es-abstract": "^1.22.1",
-        "es-shim-unscopables": "^1.0.0",
-        "get-intrinsic": "^1.2.1"
-      },
-      "engines": {
-        "node": ">= 0.4"
+        "@storybook/channels": "8.1.10",
+        "@storybook/client-logger": "8.1.10",
+        "@storybook/core-events": "8.1.10",
+        "@storybook/csf": "^0.1.7",
+        "@storybook/global": "^5.0.0",
+        "@storybook/types": "8.1.10",
+        "@types/qs": "^6.9.5",
+        "dequal": "^2.0.2",
+        "lodash": "^4.17.21",
+        "memoizerific": "^1.11.3",
+        "qs": "^6.10.0",
+        "tiny-invariant": "^1.3.1",
+        "ts-dedent": "^2.0.0",
+        "util-deprecate": "^1.0.2"
       },
       "funding": {
-        "url": "https://github.com/sponsors/ljharb"
+        "type": "opencollective",
+        "url": "https://opencollective.com/storybook"
       }
     },
-    "node_modules/array.prototype.flat": {
-      "version": "1.3.2",
+    "node_modules/@storybook/core-server/node_modules/@storybook/types": {
+      "version": "8.1.10",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.2.0",
-        "es-abstract": "^1.22.1",
-        "es-shim-unscopables": "^1.0.0"
-      },
-      "engines": {
-        "node": ">= 0.4"
+        "@storybook/channels": "8.1.10",
+        "@types/express": "^4.7.0",
+        "file-system-cache": "2.3.0"
       },
       "funding": {
-        "url": "https://github.com/sponsors/ljharb"
+        "type": "opencollective",
+        "url": "https://opencollective.com/storybook"
       }
     },
-    "node_modules/array.prototype.flatmap": {
-      "version": "1.3.2",
+    "node_modules/@storybook/core-server/node_modules/@types/node": {
+      "version": "18.19.39",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.2.0",
-        "es-abstract": "^1.22.1",
-        "es-shim-unscopables": "^1.0.0"
+        "undici-types": "~5.26.4"
+      }
+    },
+    "node_modules/@storybook/core-server/node_modules/ansi-styles": {
+      "version": "4.3.0",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "color-convert": "^2.0.1"
       },
       "engines": {
-        "node": ">= 0.4"
+        "node": ">=8"
       },
       "funding": {
-        "url": "https://github.com/sponsors/ljharb"
+        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
       }
     },
-    "node_modules/array.prototype.tosorted": {
-      "version": "1.1.1",
+    "node_modules/@storybook/core-server/node_modules/brace-expansion": {
+      "version": "2.0.1",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.1.4",
-        "es-abstract": "^1.20.4",
-        "es-shim-unscopables": "^1.0.0",
-        "get-intrinsic": "^1.1.3"
+        "balanced-match": "^1.0.0"
       }
     },
-    "node_modules/arraybuffer.prototype.slice": {
-      "version": "1.0.1",
+    "node_modules/@storybook/core-server/node_modules/chalk": {
+      "version": "4.1.2",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "array-buffer-byte-length": "^1.0.0",
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.2.0",
-        "get-intrinsic": "^1.2.1",
-        "is-array-buffer": "^3.0.2",
-        "is-shared-array-buffer": "^1.0.2"
+        "ansi-styles": "^4.1.0",
+        "supports-color": "^7.1.0"
       },
       "engines": {
-        "node": ">= 0.4"
+        "node": ">=10"
       },
       "funding": {
-        "url": "https://github.com/sponsors/ljharb"
+        "url": "https://github.com/chalk/chalk?sponsor=1"
       }
     },
-    "node_modules/asap": {
-      "version": "2.0.6",
-      "license": "MIT"
-    },
-    "node_modules/ascii-table": {
-      "version": "0.0.9",
-      "license": "MIT"
-    },
-    "node_modules/asn1.js": {
-      "version": "5.4.1",
+    "node_modules/@storybook/core-server/node_modules/color-convert": {
+      "version": "2.0.1",
+      "dev": true,
       "license": "MIT",
       "dependencies": {
-        "bn.js": "^4.0.0",
-        "inherits": "^2.0.1",
-        "minimalistic-assert": "^1.0.0",
-        "safer-buffer": "^2.1.0"
+        "color-name": "~1.1.4"
+      },
+      "engines": {
+        "node": ">=7.0.0"
       }
     },
-    "node_modules/asn1.js/node_modules/bn.js": {
-      "version": "4.12.0",
+    "node_modules/@storybook/core-server/node_modules/color-name": {
+      "version": "1.1.4",
+      "dev": true,
       "license": "MIT"
     },
-    "node_modules/assert": {
-      "version": "1.5.0",
+    "node_modules/@storybook/core-server/node_modules/crypto-random-string": {
+      "version": "4.0.0",
+      "dev": true,
       "license": "MIT",
       "dependencies": {
-        "object-assign": "^4.1.1",
-        "util": "0.10.3"
+        "type-fest": "^1.0.1"
+      },
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/assert-plus": {
-      "version": "1.0.0",
+    "node_modules/@storybook/core-server/node_modules/crypto-random-string/node_modules/type-fest": {
+      "version": "1.4.0",
       "dev": true,
-      "license": "MIT",
-      "optional": true,
+      "license": "(MIT OR CC0-1.0)",
       "engines": {
-        "node": ">=0.8"
-      }
-    },
-    "node_modules/assert/node_modules/inherits": {
-      "version": "2.0.1",
-      "license": "ISC"
-    },
-    "node_modules/assert/node_modules/util": {
-      "version": "0.10.3",
-      "license": "MIT",
-      "dependencies": {
-        "inherits": "2.0.1"
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/assign-symbols": {
-      "version": "1.0.0",
-      "license": "MIT",
+    "node_modules/@storybook/core-server/node_modules/diff": {
+      "version": "5.2.0",
+      "dev": true,
+      "license": "BSD-3-Clause",
       "engines": {
-        "node": ">=0.10.0"
+        "node": ">=0.3.1"
       }
     },
-    "node_modules/ast-types": {
-      "version": "0.16.1",
-      "resolved": "https://registry.npmjs.org/ast-types/-/ast-types-0.16.1.tgz",
-      "integrity": "sha512-6t10qk83GOG8p0vKmaCr8eiilZwO171AvbROMtvvNiwrTly62t+7XkA8RdIIVbpMhCASAsxgAzdRSwh6nw/5Dg==",
+    "node_modules/@storybook/core-server/node_modules/find-cache-dir": {
+      "version": "3.3.2",
+      "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "tslib": "^2.0.1"
+        "commondir": "^1.0.1",
+        "make-dir": "^3.0.2",
+        "pkg-dir": "^4.1.0"
       },
       "engines": {
-        "node": ">=4"
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/avajs/find-cache-dir?sponsor=1"
       }
     },
-    "node_modules/ast-types-flow": {
-      "version": "0.0.7",
-      "dev": true,
-      "license": "ISC"
-    },
-    "node_modules/astral-regex": {
-      "version": "2.0.0",
+    "node_modules/@storybook/core-server/node_modules/find-cache-dir/node_modules/find-up": {
+      "version": "4.1.0",
       "dev": true,
       "license": "MIT",
+      "dependencies": {
+        "locate-path": "^5.0.0",
+        "path-exists": "^4.0.0"
+      },
       "engines": {
         "node": ">=8"
       }
     },
-    "node_modules/async": {
-      "version": "3.2.4",
-      "resolved": "https://registry.npmjs.org/async/-/async-3.2.4.tgz",
-      "integrity": "sha512-iAB+JbDEGXhyIUavoDl9WP/Jj106Kz9DEn1DPgYw5ruDn0e3Wgi3sKFm55sASdGBNOQB8F59d9qQ7deqrHA8wQ==",
-      "license": "MIT"
-    },
-    "node_modules/async-each": {
-      "version": "1.0.3",
-      "license": "MIT",
-      "optional": true
-    },
-    "node_modules/async-exit-hook": {
-      "version": "2.0.1",
+    "node_modules/@storybook/core-server/node_modules/find-cache-dir/node_modules/pkg-dir": {
+      "version": "4.2.0",
       "dev": true,
       "license": "MIT",
+      "dependencies": {
+        "find-up": "^4.0.0"
+      },
       "engines": {
-        "node": ">=0.12.0"
+        "node": ">=8"
       }
     },
-    "node_modules/async-limiter": {
-      "version": "1.0.1",
-      "license": "MIT"
-    },
-    "node_modules/asynciterator.prototype": {
-      "version": "1.0.0",
+    "node_modules/@storybook/core-server/node_modules/fs-extra": {
+      "version": "11.2.0",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "has-symbols": "^1.0.3"
-      }
-    },
-    "node_modules/asynckit": {
-      "version": "0.4.0",
-      "license": "MIT"
-    },
-    "node_modules/at-least-node": {
-      "version": "1.0.0",
-      "license": "ISC",
+        "graceful-fs": "^4.2.0",
+        "jsonfile": "^6.0.1",
+        "universalify": "^2.0.0"
+      },
       "engines": {
-        "node": ">= 4.0.0"
+        "node": ">=14.14"
       }
     },
-    "node_modules/atob": {
-      "version": "2.1.2",
-      "license": "(MIT OR Apache-2.0)",
-      "optional": true,
+    "node_modules/@storybook/core-server/node_modules/glob": {
+      "version": "10.4.2",
+      "dev": true,
+      "license": "ISC",
+      "dependencies": {
+        "foreground-child": "^3.1.0",
+        "jackspeak": "^3.1.2",
+        "minimatch": "^9.0.4",
+        "minipass": "^7.1.2",
+        "package-json-from-dist": "^1.0.0",
+        "path-scurry": "^1.11.1"
+      },
       "bin": {
-        "atob": "bin/atob.js"
+        "glob": "dist/esm/bin.mjs"
       },
       "engines": {
-        "node": ">= 4.5.0"
+        "node": ">=16 || 14 >=14.18"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
       }
     },
-    "node_modules/available-typed-arrays": {
-      "version": "1.0.5",
+    "node_modules/@storybook/core-server/node_modules/globby": {
+      "version": "14.0.1",
+      "dev": true,
       "license": "MIT",
+      "dependencies": {
+        "@sindresorhus/merge-streams": "^2.1.0",
+        "fast-glob": "^3.3.2",
+        "ignore": "^5.2.4",
+        "path-type": "^5.0.0",
+        "slash": "^5.1.0",
+        "unicorn-magic": "^0.1.0"
+      },
       "engines": {
-        "node": ">= 0.4"
+        "node": ">=18"
       },
       "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/awesome-phonenumber": {
-      "version": "5.4.0",
-      "license": "MIT",
-      "workspaces": [
-        "webpack",
-        "cjs-test",
-        "esm-test"
-      ],
-      "engines": {
-        "node": ">=14"
-      }
-    },
-    "node_modules/axe-core": {
-      "version": "4.7.2",
-      "license": "MPL-2.0",
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/babel-code-frame": {
-      "version": "6.26.0",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "chalk": "^1.1.3",
-        "esutils": "^2.0.2",
-        "js-tokens": "^3.0.2"
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/babel-code-frame/node_modules/ansi-regex": {
-      "version": "2.1.1",
+    "node_modules/@storybook/core-server/node_modules/has-flag": {
+      "version": "4.0.0",
       "dev": true,
       "license": "MIT",
       "engines": {
-        "node": ">=0.10.0"
+        "node": ">=8"
       }
     },
-    "node_modules/babel-code-frame/node_modules/ansi-styles": {
-      "version": "2.2.1",
+    "node_modules/@storybook/core-server/node_modules/is-stream": {
+      "version": "3.0.0",
       "dev": true,
       "license": "MIT",
       "engines": {
-        "node": ">=0.10.0"
+        "node": "^12.20.0 || ^14.13.1 || >=16.0.0"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/babel-code-frame/node_modules/chalk": {
-      "version": "1.1.3",
+    "node_modules/@storybook/core-server/node_modules/jackspeak": {
+      "version": "3.4.0",
       "dev": true,
-      "license": "MIT",
+      "license": "BlueOak-1.0.0",
       "dependencies": {
-        "ansi-styles": "^2.2.1",
-        "escape-string-regexp": "^1.0.2",
-        "has-ansi": "^2.0.0",
-        "strip-ansi": "^3.0.0",
-        "supports-color": "^2.0.0"
+        "@isaacs/cliui": "^8.0.2"
       },
       "engines": {
-        "node": ">=0.10.0"
+        "node": ">=14"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
+      },
+      "optionalDependencies": {
+        "@pkgjs/parseargs": "^0.11.0"
       }
     },
-    "node_modules/babel-code-frame/node_modules/escape-string-regexp": {
-      "version": "1.0.5",
+    "node_modules/@storybook/core-server/node_modules/locate-path": {
+      "version": "5.0.0",
       "dev": true,
       "license": "MIT",
+      "dependencies": {
+        "p-locate": "^4.1.0"
+      },
       "engines": {
-        "node": ">=0.8.0"
+        "node": ">=8"
       }
     },
-    "node_modules/babel-code-frame/node_modules/js-tokens": {
-      "version": "3.0.2",
-      "dev": true,
-      "license": "MIT"
-    },
-    "node_modules/babel-code-frame/node_modules/strip-ansi": {
-      "version": "3.0.1",
+    "node_modules/@storybook/core-server/node_modules/make-dir": {
+      "version": "3.1.0",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "ansi-regex": "^2.0.0"
+        "semver": "^6.0.0"
       },
       "engines": {
-        "node": ">=0.10.0"
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/babel-code-frame/node_modules/supports-color": {
-      "version": "2.0.0",
+    "node_modules/@storybook/core-server/node_modules/make-dir/node_modules/semver": {
+      "version": "6.3.1",
       "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=0.8.0"
-      }
-    },
-    "node_modules/babel-core": {
-      "version": "7.0.0-bridge.0",
-      "resolved": "https://registry.npmjs.org/babel-core/-/babel-core-7.0.0-bridge.0.tgz",
-      "integrity": "sha512-poPX9mZH/5CSanm50Q+1toVci6pv5KSRv/5TWCwtzQS5XEwn40BcCrgIeMFWP9CKKIniKXNxoIOnOq4VVlGXhg==",
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
+      "license": "ISC",
+      "bin": {
+        "semver": "bin/semver.js"
       }
     },
-    "node_modules/babel-eslint": {
-      "version": "10.1.0",
+    "node_modules/@storybook/core-server/node_modules/minimatch": {
+      "version": "9.0.4",
       "dev": true,
-      "license": "MIT",
+      "license": "ISC",
       "dependencies": {
-        "@babel/code-frame": "^7.0.0",
-        "@babel/parser": "^7.7.0",
-        "@babel/traverse": "^7.7.0",
-        "@babel/types": "^7.7.0",
-        "eslint-visitor-keys": "^1.0.0",
-        "resolve": "^1.12.0"
+        "brace-expansion": "^2.0.1"
       },
       "engines": {
-        "node": ">=6"
+        "node": ">=16 || 14 >=14.17"
       },
-      "peerDependencies": {
-        "eslint": ">= 4.12.1"
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
       }
     },
-    "node_modules/babel-eslint/node_modules/eslint-visitor-keys": {
-      "version": "1.3.0",
+    "node_modules/@storybook/core-server/node_modules/minipass": {
+      "version": "7.1.2",
       "dev": true,
-      "license": "Apache-2.0",
+      "license": "ISC",
       "engines": {
-        "node": ">=4"
+        "node": ">=16 || 14 >=14.17"
       }
     },
-    "node_modules/babel-helper-function-name": {
-      "version": "6.24.1",
+    "node_modules/@storybook/core-server/node_modules/p-limit": {
+      "version": "2.3.0",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "babel-helper-get-function-arity": "^6.24.1",
-        "babel-runtime": "^6.22.0",
-        "babel-template": "^6.24.1",
-        "babel-traverse": "^6.24.1",
-        "babel-types": "^6.24.1"
+        "p-try": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=6"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/babel-helper-get-function-arity": {
-      "version": "6.24.1",
+    "node_modules/@storybook/core-server/node_modules/p-locate": {
+      "version": "4.1.0",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "babel-runtime": "^6.22.0",
-        "babel-types": "^6.24.1"
-      }
-    },
-    "node_modules/babel-jest": {
-      "version": "29.4.1",
-      "license": "MIT",
-      "dependencies": {
-        "@jest/transform": "^29.4.1",
-        "@types/babel__core": "^7.1.14",
-        "babel-plugin-istanbul": "^6.1.1",
-        "babel-preset-jest": "^29.4.0",
-        "chalk": "^4.0.0",
-        "graceful-fs": "^4.2.9",
-        "slash": "^3.0.0"
+        "p-limit": "^2.2.0"
       },
       "engines": {
-        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.8.0"
+        "node": ">=8"
       }
     },
-    "node_modules/babel-jest/node_modules/ansi-styles": {
-      "version": "4.3.0",
+    "node_modules/@storybook/core-server/node_modules/path-exists": {
+      "version": "4.0.0",
+      "dev": true,
       "license": "MIT",
-      "dependencies": {
-        "color-convert": "^2.0.1"
-      },
       "engines": {
         "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
       }
     },
-    "node_modules/babel-jest/node_modules/chalk": {
-      "version": "4.1.2",
+    "node_modules/@storybook/core-server/node_modules/path-type": {
+      "version": "5.0.0",
+      "dev": true,
       "license": "MIT",
-      "dependencies": {
-        "ansi-styles": "^4.1.0",
-        "supports-color": "^7.1.0"
-      },
       "engines": {
-        "node": ">=10"
+        "node": ">=12"
       },
       "funding": {
-        "url": "https://github.com/chalk/chalk?sponsor=1"
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/babel-jest/node_modules/color-convert": {
-      "version": "2.0.1",
+    "node_modules/@storybook/core-server/node_modules/recast": {
+      "version": "0.23.9",
+      "dev": true,
       "license": "MIT",
       "dependencies": {
-        "color-name": "~1.1.4"
+        "ast-types": "^0.16.1",
+        "esprima": "~4.0.0",
+        "source-map": "~0.6.1",
+        "tiny-invariant": "^1.3.3",
+        "tslib": "^2.0.1"
       },
       "engines": {
-        "node": ">=7.0.0"
+        "node": ">= 4"
       }
     },
-    "node_modules/babel-jest/node_modules/color-name": {
-      "version": "1.1.4",
-      "license": "MIT"
-    },
-    "node_modules/babel-jest/node_modules/has-flag": {
-      "version": "4.0.0",
+    "node_modules/@storybook/core-server/node_modules/slash": {
+      "version": "5.1.0",
+      "dev": true,
       "license": "MIT",
       "engines": {
-        "node": ">=8"
+        "node": ">=14.16"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/babel-jest/node_modules/supports-color": {
-      "version": "7.2.0",
-      "license": "MIT",
-      "dependencies": {
-        "has-flag": "^4.0.0"
-      },
+    "node_modules/@storybook/core-server/node_modules/source-map": {
+      "version": "0.6.1",
+      "dev": true,
+      "license": "BSD-3-Clause",
       "engines": {
-        "node": ">=8"
+        "node": ">=0.10.0"
       }
     },
-    "node_modules/babel-loader": {
-      "version": "9.1.3",
+    "node_modules/@storybook/core-server/node_modules/supports-color": {
+      "version": "7.2.0",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "find-cache-dir": "^4.0.0",
-        "schema-utils": "^4.0.0"
+        "has-flag": "^4.0.0"
       },
       "engines": {
-        "node": ">= 14.15.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.12.0",
-        "webpack": ">=5"
+        "node": ">=8"
       }
     },
-    "node_modules/babel-loader/node_modules/ajv-keywords": {
-      "version": "5.1.0",
+    "node_modules/@storybook/core-server/node_modules/temp-dir": {
+      "version": "3.0.0",
       "dev": true,
       "license": "MIT",
-      "dependencies": {
-        "fast-deep-equal": "^3.1.3"
-      },
-      "peerDependencies": {
-        "ajv": "^8.8.2"
+      "engines": {
+        "node": ">=14.16"
       }
     },
-    "node_modules/babel-loader/node_modules/find-cache-dir": {
-      "version": "4.0.0",
+    "node_modules/@storybook/core-server/node_modules/tempy": {
+      "version": "3.1.0",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "common-path-prefix": "^3.0.0",
-        "pkg-dir": "^7.0.0"
+        "is-stream": "^3.0.0",
+        "temp-dir": "^3.0.0",
+        "type-fest": "^2.12.2",
+        "unique-string": "^3.0.0"
       },
       "engines": {
         "node": ">=14.16"
@@ -14870,1037 +14703,1124 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/babel-loader/node_modules/find-up": {
-      "version": "6.3.0",
+    "node_modules/@storybook/core-server/node_modules/type-fest": {
+      "version": "2.19.0",
       "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "locate-path": "^7.1.0",
-        "path-exists": "^5.0.0"
-      },
+      "license": "(MIT OR CC0-1.0)",
       "engines": {
-        "node": "^12.20.0 || ^14.13.1 || >=16.0.0"
+        "node": ">=12.20"
       },
       "funding": {
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/babel-loader/node_modules/locate-path": {
-      "version": "7.2.0",
+    "node_modules/@storybook/core-server/node_modules/unique-string": {
+      "version": "3.0.0",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "p-locate": "^6.0.0"
+        "crypto-random-string": "^4.0.0"
       },
       "engines": {
-        "node": "^12.20.0 || ^14.13.1 || >=16.0.0"
+        "node": ">=12"
       },
       "funding": {
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/babel-loader/node_modules/p-limit": {
-      "version": "4.0.0",
+    "node_modules/@storybook/core-server/node_modules/util": {
+      "version": "0.12.5",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "yocto-queue": "^1.0.0"
-      },
-      "engines": {
-        "node": "^12.20.0 || ^14.13.1 || >=16.0.0"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
+        "inherits": "^2.0.3",
+        "is-arguments": "^1.0.4",
+        "is-generator-function": "^1.0.7",
+        "is-typed-array": "^1.1.3",
+        "which-typed-array": "^1.1.2"
       }
     },
-    "node_modules/babel-loader/node_modules/p-locate": {
-      "version": "6.0.0",
+    "node_modules/@storybook/core-webpack": {
+      "version": "8.1.6",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "p-limit": "^4.0.0"
-      },
-      "engines": {
-        "node": "^12.20.0 || ^14.13.1 || >=16.0.0"
+        "@storybook/core-common": "8.1.6",
+        "@storybook/node-logger": "8.1.6",
+        "@storybook/types": "8.1.6",
+        "@types/node": "^18.0.0",
+        "ts-dedent": "^2.0.0"
       },
       "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
+        "type": "opencollective",
+        "url": "https://opencollective.com/storybook"
       }
     },
-    "node_modules/babel-loader/node_modules/path-exists": {
-      "version": "5.0.0",
+    "node_modules/@storybook/core-webpack/node_modules/@types/node": {
+      "version": "18.19.34",
       "dev": true,
       "license": "MIT",
-      "engines": {
-        "node": "^12.20.0 || ^14.13.1 || >=16.0.0"
+      "dependencies": {
+        "undici-types": "~5.26.4"
       }
     },
-    "node_modules/babel-loader/node_modules/pkg-dir": {
-      "version": "7.0.0",
+    "node_modules/@storybook/csf": {
+      "version": "0.1.9",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "find-up": "^6.3.0"
-      },
-      "engines": {
-        "node": ">=14.16"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
+        "type-fest": "^2.19.0"
       }
     },
-    "node_modules/babel-loader/node_modules/schema-utils": {
-      "version": "4.2.0",
+    "node_modules/@storybook/csf-plugin": {
+      "version": "8.1.10",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@types/json-schema": "^7.0.9",
-        "ajv": "^8.9.0",
-        "ajv-formats": "^2.1.1",
-        "ajv-keywords": "^5.1.0"
-      },
-      "engines": {
-        "node": ">= 12.13.0"
+        "@storybook/csf-tools": "8.1.10",
+        "unplugin": "^1.3.1"
       },
       "funding": {
         "type": "opencollective",
-        "url": "https://opencollective.com/webpack"
+        "url": "https://opencollective.com/storybook"
       }
     },
-    "node_modules/babel-loader/node_modules/yocto-queue": {
-      "version": "1.0.0",
+    "node_modules/@storybook/csf-plugin/node_modules/@babel/traverse": {
+      "version": "7.24.7",
       "dev": true,
       "license": "MIT",
-      "engines": {
-        "node": ">=12.20"
+      "dependencies": {
+        "@babel/code-frame": "^7.24.7",
+        "@babel/generator": "^7.24.7",
+        "@babel/helper-environment-visitor": "^7.24.7",
+        "@babel/helper-function-name": "^7.24.7",
+        "@babel/helper-hoist-variables": "^7.24.7",
+        "@babel/helper-split-export-declaration": "^7.24.7",
+        "@babel/parser": "^7.24.7",
+        "@babel/types": "^7.24.7",
+        "debug": "^4.3.1",
+        "globals": "^11.1.0"
       },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
+      "engines": {
+        "node": ">=6.9.0"
       }
     },
-    "node_modules/babel-messages": {
-      "version": "6.23.0",
+    "node_modules/@storybook/csf-plugin/node_modules/@storybook/channels": {
+      "version": "8.1.10",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "babel-runtime": "^6.22.0"
-      }
-    },
-    "node_modules/babel-plugin-add-module-exports": {
-      "version": "1.0.4",
-      "dev": true,
-      "license": "MIT"
-    },
-    "node_modules/babel-plugin-istanbul": {
-      "version": "6.1.1",
-      "license": "BSD-3-Clause",
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.0.0",
-        "@istanbuljs/load-nyc-config": "^1.0.0",
-        "@istanbuljs/schema": "^0.1.2",
-        "istanbul-lib-instrument": "^5.0.4",
-        "test-exclude": "^6.0.0"
+        "@storybook/client-logger": "8.1.10",
+        "@storybook/core-events": "8.1.10",
+        "@storybook/global": "^5.0.0",
+        "telejson": "^7.2.0",
+        "tiny-invariant": "^1.3.1"
       },
-      "engines": {
-        "node": ">=8"
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/storybook"
       }
     },
-    "node_modules/babel-plugin-jest-hoist": {
-      "version": "29.4.0",
+    "node_modules/@storybook/csf-plugin/node_modules/@storybook/client-logger": {
+      "version": "8.1.10",
+      "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/template": "^7.3.3",
-        "@babel/types": "^7.3.3",
-        "@types/babel__core": "^7.1.14",
-        "@types/babel__traverse": "^7.0.6"
+        "@storybook/global": "^5.0.0"
       },
-      "engines": {
-        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/storybook"
       }
     },
-    "node_modules/babel-plugin-module-resolver": {
-      "version": "5.0.0",
+    "node_modules/@storybook/csf-plugin/node_modules/@storybook/core-events": {
+      "version": "8.1.10",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "find-babel-config": "^2.0.0",
-        "glob": "^8.0.3",
-        "pkg-up": "^3.1.0",
-        "reselect": "^4.1.7",
-        "resolve": "^1.22.1"
+        "@storybook/csf": "^0.1.7",
+        "ts-dedent": "^2.0.0"
       },
-      "engines": {
-        "node": ">= 16"
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/storybook"
       }
     },
-    "node_modules/babel-plugin-module-resolver/node_modules/brace-expansion": {
-      "version": "2.0.1",
+    "node_modules/@storybook/csf-plugin/node_modules/@storybook/csf-tools": {
+      "version": "8.1.10",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "balanced-match": "^1.0.0"
+        "@babel/generator": "^7.24.4",
+        "@babel/parser": "^7.24.4",
+        "@babel/traverse": "^7.24.1",
+        "@babel/types": "^7.24.0",
+        "@storybook/csf": "^0.1.7",
+        "@storybook/types": "8.1.10",
+        "fs-extra": "^11.1.0",
+        "recast": "^0.23.5",
+        "ts-dedent": "^2.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/storybook"
       }
     },
-    "node_modules/babel-plugin-module-resolver/node_modules/glob": {
-      "version": "8.1.0",
+    "node_modules/@storybook/csf-plugin/node_modules/@storybook/types": {
+      "version": "8.1.10",
       "dev": true,
-      "license": "ISC",
+      "license": "MIT",
       "dependencies": {
-        "fs.realpath": "^1.0.0",
-        "inflight": "^1.0.4",
-        "inherits": "2",
-        "minimatch": "^5.0.1",
-        "once": "^1.3.0"
-      },
-      "engines": {
-        "node": ">=12"
+        "@storybook/channels": "8.1.10",
+        "@types/express": "^4.7.0",
+        "file-system-cache": "2.3.0"
       },
       "funding": {
-        "url": "https://github.com/sponsors/isaacs"
+        "type": "opencollective",
+        "url": "https://opencollective.com/storybook"
       }
     },
-    "node_modules/babel-plugin-module-resolver/node_modules/minimatch": {
-      "version": "5.1.6",
+    "node_modules/@storybook/csf-plugin/node_modules/fs-extra": {
+      "version": "11.2.0",
       "dev": true,
-      "license": "ISC",
+      "license": "MIT",
       "dependencies": {
-        "brace-expansion": "^2.0.1"
+        "graceful-fs": "^4.2.0",
+        "jsonfile": "^6.0.1",
+        "universalify": "^2.0.0"
       },
       "engines": {
-        "node": ">=10"
+        "node": ">=14.14"
       }
     },
-    "node_modules/babel-plugin-polyfill-corejs2": {
-      "version": "0.3.3",
+    "node_modules/@storybook/csf-plugin/node_modules/recast": {
+      "version": "0.23.9",
+      "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/compat-data": "^7.17.7",
-        "@babel/helper-define-polyfill-provider": "^0.3.3",
-        "semver": "^6.1.1"
+        "ast-types": "^0.16.1",
+        "esprima": "~4.0.0",
+        "source-map": "~0.6.1",
+        "tiny-invariant": "^1.3.3",
+        "tslib": "^2.0.1"
       },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
+      "engines": {
+        "node": ">= 4"
       }
     },
-    "node_modules/babel-plugin-polyfill-corejs2/node_modules/semver": {
-      "version": "6.3.1",
-      "license": "ISC",
-      "bin": {
-        "semver": "bin/semver.js"
+    "node_modules/@storybook/csf-plugin/node_modules/source-map": {
+      "version": "0.6.1",
+      "dev": true,
+      "license": "BSD-3-Clause",
+      "engines": {
+        "node": ">=0.10.0"
       }
     },
-    "node_modules/babel-plugin-polyfill-corejs3": {
-      "version": "0.5.3",
+    "node_modules/@storybook/csf-tools": {
+      "version": "8.1.6",
+      "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-define-polyfill-provider": "^0.3.2",
-        "core-js-compat": "^3.21.0"
+        "@babel/generator": "^7.24.4",
+        "@babel/parser": "^7.24.4",
+        "@babel/traverse": "^7.24.1",
+        "@babel/types": "^7.24.0",
+        "@storybook/csf": "^0.1.7",
+        "@storybook/types": "8.1.6",
+        "fs-extra": "^11.1.0",
+        "recast": "^0.23.5",
+        "ts-dedent": "^2.0.0"
       },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/storybook"
       }
     },
-    "node_modules/babel-plugin-polyfill-regenerator": {
-      "version": "0.4.1",
+    "node_modules/@storybook/csf-tools/node_modules/@babel/traverse": {
+      "version": "7.24.7",
+      "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/helper-define-polyfill-provider": "^0.3.3"
+        "@babel/code-frame": "^7.24.7",
+        "@babel/generator": "^7.24.7",
+        "@babel/helper-environment-visitor": "^7.24.7",
+        "@babel/helper-function-name": "^7.24.7",
+        "@babel/helper-hoist-variables": "^7.24.7",
+        "@babel/helper-split-export-declaration": "^7.24.7",
+        "@babel/parser": "^7.24.7",
+        "@babel/types": "^7.24.7",
+        "debug": "^4.3.1",
+        "globals": "^11.1.0"
       },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
+      "engines": {
+        "node": ">=6.9.0"
       }
     },
-    "node_modules/babel-plugin-react-native-web": {
-      "version": "0.18.12",
-      "license": "MIT"
-    },
-    "node_modules/babel-plugin-syntax-class-properties": {
-      "version": "6.13.0",
-      "dev": true,
-      "license": "MIT"
-    },
-    "node_modules/babel-plugin-syntax-trailing-function-commas": {
-      "version": "7.0.0-beta.0",
-      "license": "MIT"
-    },
-    "node_modules/babel-plugin-transform-class-properties": {
-      "version": "6.24.1",
+    "node_modules/@storybook/csf-tools/node_modules/fs-extra": {
+      "version": "11.2.0",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "babel-helper-function-name": "^6.24.1",
-        "babel-plugin-syntax-class-properties": "^6.8.0",
-        "babel-runtime": "^6.22.0",
-        "babel-template": "^6.24.1"
+        "graceful-fs": "^4.2.0",
+        "jsonfile": "^6.0.1",
+        "universalify": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=14.14"
       }
     },
-    "node_modules/babel-plugin-transform-flow-enums": {
-      "version": "0.0.2",
+    "node_modules/@storybook/csf-tools/node_modules/recast": {
+      "version": "0.23.9",
+      "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/plugin-syntax-flow": "^7.12.1"
+        "ast-types": "^0.16.1",
+        "esprima": "~4.0.0",
+        "source-map": "~0.6.1",
+        "tiny-invariant": "^1.3.3",
+        "tslib": "^2.0.1"
+      },
+      "engines": {
+        "node": ">= 4"
       }
     },
-    "node_modules/babel-plugin-transform-remove-console": {
-      "version": "6.9.4",
+    "node_modules/@storybook/csf-tools/node_modules/source-map": {
+      "version": "0.6.1",
       "dev": true,
-      "license": "MIT"
-    },
-    "node_modules/babel-polyfill": {
-      "version": "6.26.0",
-      "license": "MIT",
-      "dependencies": {
-        "babel-runtime": "^6.26.0",
-        "core-js": "^2.5.0",
-        "regenerator-runtime": "^0.10.5"
+      "license": "BSD-3-Clause",
+      "engines": {
+        "node": ">=0.10.0"
       }
     },
-    "node_modules/babel-polyfill/node_modules/core-js": {
-      "version": "2.6.12",
-      "hasInstallScript": true,
-      "license": "MIT"
+    "node_modules/@storybook/csf/node_modules/type-fest": {
+      "version": "2.19.0",
+      "dev": true,
+      "license": "(MIT OR CC0-1.0)",
+      "engines": {
+        "node": ">=12.20"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
     },
-    "node_modules/babel-polyfill/node_modules/regenerator-runtime": {
-      "version": "0.10.5",
+    "node_modules/@storybook/docs-mdx": {
+      "version": "3.1.0-next.0",
+      "dev": true,
       "license": "MIT"
     },
-    "node_modules/babel-preset-current-node-syntax": {
-      "version": "1.0.1",
+    "node_modules/@storybook/docs-tools": {
+      "version": "8.1.6",
+      "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/plugin-syntax-async-generators": "^7.8.4",
-        "@babel/plugin-syntax-bigint": "^7.8.3",
-        "@babel/plugin-syntax-class-properties": "^7.8.3",
-        "@babel/plugin-syntax-import-meta": "^7.8.3",
-        "@babel/plugin-syntax-json-strings": "^7.8.3",
-        "@babel/plugin-syntax-logical-assignment-operators": "^7.8.3",
-        "@babel/plugin-syntax-nullish-coalescing-operator": "^7.8.3",
-        "@babel/plugin-syntax-numeric-separator": "^7.8.3",
-        "@babel/plugin-syntax-object-rest-spread": "^7.8.3",
-        "@babel/plugin-syntax-optional-catch-binding": "^7.8.3",
-        "@babel/plugin-syntax-optional-chaining": "^7.8.3",
-        "@babel/plugin-syntax-top-level-await": "^7.8.3"
+        "@storybook/core-common": "8.1.6",
+        "@storybook/core-events": "8.1.6",
+        "@storybook/preview-api": "8.1.6",
+        "@storybook/types": "8.1.6",
+        "@types/doctrine": "^0.0.3",
+        "assert": "^2.1.0",
+        "doctrine": "^3.0.0",
+        "lodash": "^4.17.21"
       },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0"
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/storybook"
       }
     },
-    "node_modules/babel-preset-expo": {
-      "version": "10.0.1",
+    "node_modules/@storybook/docs-tools/node_modules/assert": {
+      "version": "2.1.0",
+      "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/plugin-proposal-decorators": "^7.12.9",
-        "@babel/plugin-transform-export-namespace-from": "^7.22.11",
-        "@babel/plugin-transform-object-rest-spread": "^7.12.13",
-        "@babel/plugin-transform-parameters": "^7.22.15",
-        "@babel/preset-env": "^7.20.0",
-        "@babel/preset-react": "^7.22.15",
-        "@react-native/babel-preset": "^0.73.18",
-        "babel-plugin-react-native-web": "~0.18.10",
-        "react-refresh": "0.14.0"
-      }
-    },
-    "node_modules/babel-preset-expo/node_modules/react-refresh": {
-      "version": "0.14.0",
-      "license": "MIT",
-      "engines": {
-        "node": ">=0.10.0"
+        "call-bind": "^1.0.2",
+        "is-nan": "^1.3.2",
+        "object-is": "^1.1.5",
+        "object.assign": "^4.1.4",
+        "util": "^0.12.5"
       }
     },
-    "node_modules/babel-preset-fbjs": {
-      "version": "3.4.0",
+    "node_modules/@storybook/docs-tools/node_modules/util": {
+      "version": "0.12.5",
+      "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/plugin-proposal-class-properties": "^7.0.0",
-        "@babel/plugin-proposal-object-rest-spread": "^7.0.0",
-        "@babel/plugin-syntax-class-properties": "^7.0.0",
-        "@babel/plugin-syntax-flow": "^7.0.0",
-        "@babel/plugin-syntax-jsx": "^7.0.0",
-        "@babel/plugin-syntax-object-rest-spread": "^7.0.0",
-        "@babel/plugin-transform-arrow-functions": "^7.0.0",
-        "@babel/plugin-transform-block-scoped-functions": "^7.0.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.0.0",
-        "@babel/plugin-transform-flow-strip-types": "^7.0.0",
-        "@babel/plugin-transform-for-of": "^7.0.0",
-        "@babel/plugin-transform-function-name": "^7.0.0",
-        "@babel/plugin-transform-literals": "^7.0.0",
-        "@babel/plugin-transform-member-expression-literals": "^7.0.0",
-        "@babel/plugin-transform-modules-commonjs": "^7.0.0",
-        "@babel/plugin-transform-object-super": "^7.0.0",
-        "@babel/plugin-transform-parameters": "^7.0.0",
-        "@babel/plugin-transform-property-literals": "^7.0.0",
-        "@babel/plugin-transform-react-display-name": "^7.0.0",
-        "@babel/plugin-transform-react-jsx": "^7.0.0",
-        "@babel/plugin-transform-shorthand-properties": "^7.0.0",
-        "@babel/plugin-transform-spread": "^7.0.0",
-        "@babel/plugin-transform-template-literals": "^7.0.0",
-        "babel-plugin-syntax-trailing-function-commas": "^7.0.0-beta.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0"
+        "inherits": "^2.0.3",
+        "is-arguments": "^1.0.4",
+        "is-generator-function": "^1.0.7",
+        "is-typed-array": "^1.1.3",
+        "which-typed-array": "^1.1.2"
       }
     },
-    "node_modules/babel-preset-jest": {
-      "version": "29.4.0",
+    "node_modules/@storybook/global": {
+      "version": "5.0.0",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/@storybook/icons": {
+      "version": "1.2.9",
+      "dev": true,
       "license": "MIT",
-      "dependencies": {
-        "babel-plugin-jest-hoist": "^29.4.0",
-        "babel-preset-current-node-syntax": "^1.0.0"
-      },
       "engines": {
-        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+        "node": ">=14.0.0"
       },
       "peerDependencies": {
-        "@babel/core": "^7.0.0"
+        "react": "^16.8.0 || ^17.0.0 || ^18.0.0",
+        "react-dom": "^16.8.0 || ^17.0.0 || ^18.0.0"
       }
     },
-    "node_modules/babel-runtime": {
-      "version": "6.26.0",
+    "node_modules/@storybook/manager": {
+      "version": "8.1.10",
+      "dev": true,
       "license": "MIT",
-      "dependencies": {
-        "core-js": "^2.4.0",
-        "regenerator-runtime": "^0.11.0"
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/storybook"
       }
     },
-    "node_modules/babel-runtime/node_modules/core-js": {
-      "version": "2.6.12",
-      "hasInstallScript": true,
-      "license": "MIT"
-    },
-    "node_modules/babel-runtime/node_modules/regenerator-runtime": {
-      "version": "0.11.1",
-      "license": "MIT"
-    },
-    "node_modules/babel-template": {
-      "version": "6.26.0",
+    "node_modules/@storybook/manager-api": {
+      "version": "8.1.10",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "babel-runtime": "^6.26.0",
-        "babel-traverse": "^6.26.0",
-        "babel-types": "^6.26.0",
-        "babylon": "^6.18.0",
-        "lodash": "^4.17.4"
+        "@storybook/channels": "8.1.10",
+        "@storybook/client-logger": "8.1.10",
+        "@storybook/core-events": "8.1.10",
+        "@storybook/csf": "^0.1.7",
+        "@storybook/global": "^5.0.0",
+        "@storybook/icons": "^1.2.5",
+        "@storybook/router": "8.1.10",
+        "@storybook/theming": "8.1.10",
+        "@storybook/types": "8.1.10",
+        "dequal": "^2.0.2",
+        "lodash": "^4.17.21",
+        "memoizerific": "^1.11.3",
+        "store2": "^2.14.2",
+        "telejson": "^7.2.0",
+        "ts-dedent": "^2.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/storybook"
       }
     },
-    "node_modules/babel-traverse": {
-      "version": "6.26.0",
+    "node_modules/@storybook/manager-api/node_modules/@storybook/channels": {
+      "version": "8.1.10",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "babel-code-frame": "^6.26.0",
-        "babel-messages": "^6.23.0",
-        "babel-runtime": "^6.26.0",
-        "babel-types": "^6.26.0",
-        "babylon": "^6.18.0",
-        "debug": "^2.6.8",
-        "globals": "^9.18.0",
-        "invariant": "^2.2.2",
-        "lodash": "^4.17.4"
+        "@storybook/client-logger": "8.1.10",
+        "@storybook/core-events": "8.1.10",
+        "@storybook/global": "^5.0.0",
+        "telejson": "^7.2.0",
+        "tiny-invariant": "^1.3.1"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/storybook"
       }
     },
-    "node_modules/babel-traverse/node_modules/debug": {
-      "version": "2.6.9",
+    "node_modules/@storybook/manager-api/node_modules/@storybook/client-logger": {
+      "version": "8.1.10",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "ms": "2.0.0"
+        "@storybook/global": "^5.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/storybook"
       }
     },
-    "node_modules/babel-traverse/node_modules/globals": {
-      "version": "9.18.0",
+    "node_modules/@storybook/manager-api/node_modules/@storybook/core-events": {
+      "version": "8.1.10",
       "dev": true,
       "license": "MIT",
-      "engines": {
-        "node": ">=0.10.0"
+      "dependencies": {
+        "@storybook/csf": "^0.1.7",
+        "ts-dedent": "^2.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/storybook"
       }
     },
-    "node_modules/babel-traverse/node_modules/ms": {
-      "version": "2.0.0",
-      "dev": true,
-      "license": "MIT"
-    },
-    "node_modules/babel-types": {
-      "version": "6.26.0",
+    "node_modules/@storybook/manager-api/node_modules/@storybook/types": {
+      "version": "8.1.10",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "babel-runtime": "^6.26.0",
-        "esutils": "^2.0.2",
-        "lodash": "^4.17.4",
-        "to-fast-properties": "^1.0.3"
+        "@storybook/channels": "8.1.10",
+        "@types/express": "^4.7.0",
+        "file-system-cache": "2.3.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/storybook"
       }
     },
-    "node_modules/babel-types/node_modules/to-fast-properties": {
-      "version": "1.0.3",
+    "node_modules/@storybook/node-logger": {
+      "version": "8.1.6",
       "dev": true,
       "license": "MIT",
-      "engines": {
-        "node": ">=0.10.0"
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/storybook"
       }
     },
-    "node_modules/babylon": {
-      "version": "6.18.0",
+    "node_modules/@storybook/preset-react-webpack": {
+      "version": "8.1.6",
       "dev": true,
       "license": "MIT",
-      "bin": {
-        "babylon": "bin/babylon.js"
-      }
-    },
-    "node_modules/balanced-match": {
-      "version": "1.0.2",
-      "license": "MIT"
-    },
-    "node_modules/base": {
-      "version": "0.11.2",
-      "license": "MIT",
-      "optional": true,
       "dependencies": {
-        "cache-base": "^1.0.1",
-        "class-utils": "^0.3.5",
-        "component-emitter": "^1.2.1",
-        "define-property": "^1.0.0",
-        "isobject": "^3.0.1",
-        "mixin-deep": "^1.2.0",
-        "pascalcase": "^0.1.1"
+        "@storybook/core-webpack": "8.1.6",
+        "@storybook/docs-tools": "8.1.6",
+        "@storybook/node-logger": "8.1.6",
+        "@storybook/react": "8.1.6",
+        "@storybook/react-docgen-typescript-plugin": "1.0.6--canary.9.0c3f3b7.0",
+        "@types/node": "^18.0.0",
+        "@types/semver": "^7.3.4",
+        "find-up": "^5.0.0",
+        "fs-extra": "^11.1.0",
+        "magic-string": "^0.30.5",
+        "react-docgen": "^7.0.0",
+        "resolve": "^1.22.8",
+        "semver": "^7.3.7",
+        "tsconfig-paths": "^4.2.0",
+        "webpack": "5"
       },
       "engines": {
-        "node": ">=0.10.0"
+        "node": ">=18.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/storybook"
+      },
+      "peerDependencies": {
+        "react": "^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0-beta",
+        "react-dom": "^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0-beta"
+      },
+      "peerDependenciesMeta": {
+        "typescript": {
+          "optional": true
+        }
       }
     },
-    "node_modules/base-64": {
-      "version": "0.1.0"
-    },
-    "node_modules/base/node_modules/define-property": {
-      "version": "1.0.0",
+    "node_modules/@storybook/preset-react-webpack/node_modules/@storybook/react": {
+      "version": "8.1.6",
+      "dev": true,
       "license": "MIT",
-      "optional": true,
       "dependencies": {
-        "is-descriptor": "^1.0.0"
+        "@storybook/client-logger": "8.1.6",
+        "@storybook/docs-tools": "8.1.6",
+        "@storybook/global": "^5.0.0",
+        "@storybook/preview-api": "8.1.6",
+        "@storybook/react-dom-shim": "8.1.6",
+        "@storybook/types": "8.1.6",
+        "@types/escodegen": "^0.0.6",
+        "@types/estree": "^0.0.51",
+        "@types/node": "^18.0.0",
+        "acorn": "^7.4.1",
+        "acorn-jsx": "^5.3.1",
+        "acorn-walk": "^7.2.0",
+        "escodegen": "^2.1.0",
+        "html-tags": "^3.1.0",
+        "lodash": "^4.17.21",
+        "prop-types": "^15.7.2",
+        "react-element-to-jsx-string": "^15.0.0",
+        "semver": "^7.3.7",
+        "ts-dedent": "^2.0.0",
+        "type-fest": "~2.19",
+        "util-deprecate": "^1.0.2"
       },
       "engines": {
-        "node": ">=0.10.0"
+        "node": ">=18.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/storybook"
+      },
+      "peerDependencies": {
+        "react": "^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0-beta",
+        "react-dom": "^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0-beta",
+        "typescript": ">= 4.2.x"
+      },
+      "peerDependenciesMeta": {
+        "typescript": {
+          "optional": true
+        }
       }
     },
-    "node_modules/base64-arraybuffer": {
-      "version": "1.0.2",
+    "node_modules/@storybook/preset-react-webpack/node_modules/@storybook/react-dom-shim": {
+      "version": "8.1.6",
+      "dev": true,
       "license": "MIT",
-      "engines": {
-        "node": ">= 0.6.0"
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/storybook"
+      },
+      "peerDependencies": {
+        "react": "^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0-beta",
+        "react-dom": "^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0-beta"
       }
     },
-    "node_modules/base64-js": {
-      "version": "1.5.1",
-      "funding": [
-        {
-          "type": "github",
-          "url": "https://github.com/sponsors/feross"
-        },
-        {
-          "type": "patreon",
-          "url": "https://www.patreon.com/feross"
-        },
-        {
-          "type": "consulting",
-          "url": "https://feross.org/support"
-        }
-      ],
-      "license": "MIT"
-    },
-    "node_modules/batch": {
-      "version": "0.6.1",
+    "node_modules/@storybook/preset-react-webpack/node_modules/@types/node": {
+      "version": "18.19.30",
       "dev": true,
-      "license": "MIT"
+      "license": "MIT",
+      "dependencies": {
+        "undici-types": "~5.26.4"
+      }
     },
-    "node_modules/before-after-hook": {
-      "version": "2.2.2",
+    "node_modules/@storybook/preset-react-webpack/node_modules/fs-extra": {
+      "version": "11.2.0",
       "dev": true,
-      "license": "Apache-2.0"
-    },
-    "node_modules/better-opn": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/better-opn/-/better-opn-3.0.2.tgz",
-      "integrity": "sha512-aVNobHnJqLiUelTaHat9DZ1qM2w0C0Eym4LPI/3JxOnSokGVdsl1T1kN7TFvsEAD8G47A6VKQ0TVHqbBnYMJlQ==",
+      "license": "MIT",
       "dependencies": {
-        "open": "^8.0.4"
+        "graceful-fs": "^4.2.0",
+        "jsonfile": "^6.0.1",
+        "universalify": "^2.0.0"
       },
       "engines": {
-        "node": ">=12.0.0"
+        "node": ">=14.14"
       }
     },
-    "node_modules/big-integer": {
-      "version": "1.6.51",
-      "license": "Unlicense",
+    "node_modules/@storybook/preset-react-webpack/node_modules/type-fest": {
+      "version": "2.19.0",
+      "dev": true,
+      "license": "(MIT OR CC0-1.0)",
       "engines": {
-        "node": ">=0.6"
+        "node": ">=12.20"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/big.js": {
-      "version": "5.2.2",
+    "node_modules/@storybook/preview": {
+      "version": "8.1.6",
       "dev": true,
       "license": "MIT",
-      "engines": {
-        "node": "*"
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/storybook"
       }
     },
-    "node_modules/bin-links": {
-      "version": "4.0.2",
-      "license": "ISC",
+    "node_modules/@storybook/preview-api": {
+      "version": "8.1.6",
+      "dev": true,
+      "license": "MIT",
       "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"
+        "@storybook/channels": "8.1.6",
+        "@storybook/client-logger": "8.1.6",
+        "@storybook/core-events": "8.1.6",
+        "@storybook/csf": "^0.1.7",
+        "@storybook/global": "^5.0.0",
+        "@storybook/types": "8.1.6",
+        "@types/qs": "^6.9.5",
+        "dequal": "^2.0.2",
+        "lodash": "^4.17.21",
+        "memoizerific": "^1.11.3",
+        "qs": "^6.10.0",
+        "tiny-invariant": "^1.3.1",
+        "ts-dedent": "^2.0.0",
+        "util-deprecate": "^1.0.2"
       },
-      "engines": {
-        "node": "^14.17.0 || ^16.13.0 || >=18.0.0"
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/storybook"
       }
     },
-    "node_modules/bin-links/node_modules/signal-exit": {
-      "version": "4.1.0",
-      "license": "ISC",
+    "node_modules/@storybook/react": {
+      "version": "8.1.10",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@storybook/client-logger": "8.1.10",
+        "@storybook/docs-tools": "8.1.10",
+        "@storybook/global": "^5.0.0",
+        "@storybook/preview-api": "8.1.10",
+        "@storybook/react-dom-shim": "8.1.10",
+        "@storybook/types": "8.1.10",
+        "@types/escodegen": "^0.0.6",
+        "@types/estree": "^0.0.51",
+        "@types/node": "^18.0.0",
+        "acorn": "^7.4.1",
+        "acorn-jsx": "^5.3.1",
+        "acorn-walk": "^7.2.0",
+        "escodegen": "^2.1.0",
+        "html-tags": "^3.1.0",
+        "lodash": "^4.17.21",
+        "prop-types": "^15.7.2",
+        "react-element-to-jsx-string": "^15.0.0",
+        "semver": "^7.3.7",
+        "ts-dedent": "^2.0.0",
+        "type-fest": "~2.19",
+        "util-deprecate": "^1.0.2"
+      },
       "engines": {
-        "node": ">=14"
+        "node": ">=18.0.0"
       },
       "funding": {
-        "url": "https://github.com/sponsors/isaacs"
+        "type": "opencollective",
+        "url": "https://opencollective.com/storybook"
+      },
+      "peerDependencies": {
+        "react": "^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0-beta",
+        "react-dom": "^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0-beta",
+        "typescript": ">= 4.2.x"
+      },
+      "peerDependenciesMeta": {
+        "typescript": {
+          "optional": true
+        }
       }
     },
-    "node_modules/bin-links/node_modules/write-file-atomic": {
-      "version": "5.0.1",
-      "license": "ISC",
+    "node_modules/@storybook/react-docgen-typescript-plugin": {
+      "version": "1.0.6--canary.9.0c3f3b7.0",
+      "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "imurmurhash": "^0.1.4",
-        "signal-exit": "^4.0.1"
+        "debug": "^4.1.1",
+        "endent": "^2.0.1",
+        "find-cache-dir": "^3.3.1",
+        "flat-cache": "^3.0.4",
+        "micromatch": "^4.0.2",
+        "react-docgen-typescript": "^2.2.2",
+        "tslib": "^2.0.0"
       },
-      "engines": {
-        "node": "^14.17.0 || ^16.13.0 || >=18.0.0"
+      "peerDependencies": {
+        "typescript": ">= 4.x",
+        "webpack": ">= 4"
       }
     },
-    "node_modules/binary-extensions": {
-      "version": "2.2.0",
+    "node_modules/@storybook/react-docgen-typescript-plugin/node_modules/find-cache-dir": {
+      "version": "3.3.2",
+      "dev": true,
       "license": "MIT",
+      "dependencies": {
+        "commondir": "^1.0.1",
+        "make-dir": "^3.0.2",
+        "pkg-dir": "^4.1.0"
+      },
       "engines": {
         "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/avajs/find-cache-dir?sponsor=1"
       }
     },
-    "node_modules/bindings": {
-      "version": "1.5.0",
-      "license": "MIT",
-      "optional": true,
-      "dependencies": {
-        "file-uri-to-path": "1.0.0"
-      }
-    },
-    "node_modules/bl": {
+    "node_modules/@storybook/react-docgen-typescript-plugin/node_modules/find-up": {
       "version": "4.1.0",
+      "dev": true,
       "license": "MIT",
       "dependencies": {
-        "buffer": "^5.5.0",
-        "inherits": "^2.0.4",
-        "readable-stream": "^3.4.0"
+        "locate-path": "^5.0.0",
+        "path-exists": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=8"
       }
     },
-    "node_modules/bl/node_modules/readable-stream": {
-      "version": "3.6.2",
+    "node_modules/@storybook/react-docgen-typescript-plugin/node_modules/locate-path": {
+      "version": "5.0.0",
+      "dev": true,
       "license": "MIT",
       "dependencies": {
-        "inherits": "^2.0.3",
-        "string_decoder": "^1.1.1",
-        "util-deprecate": "^1.0.1"
+        "p-locate": "^4.1.0"
       },
       "engines": {
-        "node": ">= 6"
+        "node": ">=8"
       }
     },
-    "node_modules/bluebird": {
-      "version": "3.7.2",
-      "dev": true,
-      "license": "MIT"
-    },
-    "node_modules/bluebird-lst": {
-      "version": "1.0.9",
+    "node_modules/@storybook/react-docgen-typescript-plugin/node_modules/make-dir": {
+      "version": "3.1.0",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "bluebird": "^3.5.5"
+        "semver": "^6.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/blueimp-md5": {
-      "version": "2.19.0",
-      "license": "MIT"
-    },
-    "node_modules/bn.js": {
-      "version": "5.2.1",
-      "license": "MIT"
-    },
-    "node_modules/body-parser": {
-      "version": "1.20.0",
+    "node_modules/@storybook/react-docgen-typescript-plugin/node_modules/p-limit": {
+      "version": "2.3.0",
+      "dev": true,
       "license": "MIT",
       "dependencies": {
-        "bytes": "3.1.2",
-        "content-type": "~1.0.4",
-        "debug": "2.6.9",
-        "depd": "2.0.0",
-        "destroy": "1.2.0",
-        "http-errors": "2.0.0",
-        "iconv-lite": "0.4.24",
-        "on-finished": "2.4.1",
-        "qs": "6.10.3",
-        "raw-body": "2.5.1",
-        "type-is": "~1.6.18",
-        "unpipe": "1.0.0"
+        "p-try": "^2.0.0"
       },
       "engines": {
-        "node": ">= 0.8",
-        "npm": "1.2.8000 || >= 1.4.16"
+        "node": ">=6"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/body-parser/node_modules/bytes": {
-      "version": "3.1.2",
+    "node_modules/@storybook/react-docgen-typescript-plugin/node_modules/p-locate": {
+      "version": "4.1.0",
+      "dev": true,
       "license": "MIT",
+      "dependencies": {
+        "p-limit": "^2.2.0"
+      },
       "engines": {
-        "node": ">= 0.8"
+        "node": ">=8"
       }
     },
-    "node_modules/body-parser/node_modules/debug": {
-      "version": "2.6.9",
+    "node_modules/@storybook/react-docgen-typescript-plugin/node_modules/path-exists": {
+      "version": "4.0.0",
+      "dev": true,
       "license": "MIT",
-      "dependencies": {
-        "ms": "2.0.0"
+      "engines": {
+        "node": ">=8"
       }
     },
-    "node_modules/body-parser/node_modules/iconv-lite": {
-      "version": "0.4.24",
+    "node_modules/@storybook/react-docgen-typescript-plugin/node_modules/pkg-dir": {
+      "version": "4.2.0",
+      "dev": true,
       "license": "MIT",
       "dependencies": {
-        "safer-buffer": ">= 2.1.2 < 3"
+        "find-up": "^4.0.0"
       },
       "engines": {
-        "node": ">=0.10.0"
+        "node": ">=8"
       }
     },
-    "node_modules/body-parser/node_modules/ms": {
-      "version": "2.0.0",
-      "license": "MIT"
-    },
-    "node_modules/bonjour-service": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/bonjour-service/-/bonjour-service-1.2.1.tgz",
-      "integrity": "sha512-oSzCS2zV14bh2kji6vNe7vrpJYCHGvcZnlffFQ1MEoX/WOeQ/teD8SYWKR942OI3INjq8OMNJlbPK5LLLUxFDw==",
+    "node_modules/@storybook/react-docgen-typescript-plugin/node_modules/semver": {
+      "version": "6.3.1",
       "dev": true,
-      "dependencies": {
-        "fast-deep-equal": "^3.1.3",
-        "multicast-dns": "^7.2.5"
+      "license": "ISC",
+      "bin": {
+        "semver": "bin/semver.js"
       }
     },
-    "node_modules/boolbase": {
-      "version": "1.0.0",
-      "license": "ISC"
-    },
-    "node_modules/boolean": {
-      "version": "3.2.0",
-      "dev": true,
-      "license": "MIT"
-    },
-    "node_modules/bottleneck": {
-      "version": "2.19.5",
+    "node_modules/@storybook/react-dom-shim": {
+      "version": "8.1.10",
       "dev": true,
-      "license": "MIT"
-    },
-    "node_modules/bplist-creator": {
-      "version": "0.1.0",
       "license": "MIT",
-      "dependencies": {
-        "stream-buffers": "2.2.x"
-      }
-    },
-    "node_modules/bplist-parser": {
-      "version": "0.2.0",
-      "resolved": "https://registry.npmjs.org/bplist-parser/-/bplist-parser-0.2.0.tgz",
-      "integrity": "sha512-z0M+byMThzQmD9NILRniCUXYsYpjwnlO8N5uCFaCqIOpqRsJCrQL9NK3JsD67CN5a08nF5oIL2bD6loTdHOuKw==",
-      "dependencies": {
-        "big-integer": "^1.6.44"
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/storybook"
       },
-      "engines": {
-        "node": ">= 5.10.0"
+      "peerDependencies": {
+        "react": "^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0-beta",
+        "react-dom": "^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0-beta"
       }
     },
-    "node_modules/brace-expansion": {
-      "version": "1.1.11",
+    "node_modules/@storybook/react-webpack5": {
+      "version": "8.1.6",
+      "dev": true,
       "license": "MIT",
       "dependencies": {
-        "balanced-match": "^1.0.0",
-        "concat-map": "0.0.1"
+        "@storybook/builder-webpack5": "8.1.6",
+        "@storybook/preset-react-webpack": "8.1.6",
+        "@storybook/react": "8.1.6",
+        "@storybook/types": "8.1.6",
+        "@types/node": "^18.0.0"
+      },
+      "engines": {
+        "node": ">=18.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/storybook"
+      },
+      "peerDependencies": {
+        "react": "^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0-beta",
+        "react-dom": "^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0-beta",
+        "typescript": ">= 4.2.x"
+      },
+      "peerDependenciesMeta": {
+        "typescript": {
+          "optional": true
+        }
       }
     },
-    "node_modules/braces": {
-      "version": "3.0.2",
+    "node_modules/@storybook/react-webpack5/node_modules/@storybook/react": {
+      "version": "8.1.6",
+      "dev": true,
       "license": "MIT",
       "dependencies": {
-        "fill-range": "^7.0.1"
+        "@storybook/client-logger": "8.1.6",
+        "@storybook/docs-tools": "8.1.6",
+        "@storybook/global": "^5.0.0",
+        "@storybook/preview-api": "8.1.6",
+        "@storybook/react-dom-shim": "8.1.6",
+        "@storybook/types": "8.1.6",
+        "@types/escodegen": "^0.0.6",
+        "@types/estree": "^0.0.51",
+        "@types/node": "^18.0.0",
+        "acorn": "^7.4.1",
+        "acorn-jsx": "^5.3.1",
+        "acorn-walk": "^7.2.0",
+        "escodegen": "^2.1.0",
+        "html-tags": "^3.1.0",
+        "lodash": "^4.17.21",
+        "prop-types": "^15.7.2",
+        "react-element-to-jsx-string": "^15.0.0",
+        "semver": "^7.3.7",
+        "ts-dedent": "^2.0.0",
+        "type-fest": "~2.19",
+        "util-deprecate": "^1.0.2"
       },
       "engines": {
-        "node": ">=8"
+        "node": ">=18.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/storybook"
+      },
+      "peerDependencies": {
+        "react": "^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0-beta",
+        "react-dom": "^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0-beta",
+        "typescript": ">= 4.2.x"
+      },
+      "peerDependenciesMeta": {
+        "typescript": {
+          "optional": true
+        }
       }
     },
-    "node_modules/brorand": {
-      "version": "1.1.0",
-      "license": "MIT"
-    },
-    "node_modules/browser-assert": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/browser-assert/-/browser-assert-1.2.1.tgz",
-      "integrity": "sha512-nfulgvOR6S4gt9UKCeGJOuSGBPGiFT6oQ/2UBnvTY/5aQ1PnksW72fhZkM30DzoRRv2WpwZf1vHHEr3mtuXIWQ=="
-    },
-    "node_modules/browserify-aes": {
-      "version": "1.2.0",
+    "node_modules/@storybook/react-webpack5/node_modules/@storybook/react-dom-shim": {
+      "version": "8.1.6",
+      "dev": true,
       "license": "MIT",
-      "dependencies": {
-        "buffer-xor": "^1.0.3",
-        "cipher-base": "^1.0.0",
-        "create-hash": "^1.1.0",
-        "evp_bytestokey": "^1.0.3",
-        "inherits": "^2.0.1",
-        "safe-buffer": "^5.0.1"
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/storybook"
+      },
+      "peerDependencies": {
+        "react": "^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0-beta",
+        "react-dom": "^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0-beta"
       }
     },
-    "node_modules/browserify-cipher": {
-      "version": "1.0.1",
+    "node_modules/@storybook/react-webpack5/node_modules/@types/node": {
+      "version": "18.19.28",
+      "dev": true,
       "license": "MIT",
       "dependencies": {
-        "browserify-aes": "^1.0.4",
-        "browserify-des": "^1.0.0",
-        "evp_bytestokey": "^1.0.0"
+        "undici-types": "~5.26.4"
       }
     },
-    "node_modules/browserify-des": {
-      "version": "1.0.2",
-      "license": "MIT",
-      "dependencies": {
-        "cipher-base": "^1.0.1",
-        "des.js": "^1.0.0",
-        "inherits": "^2.0.1",
-        "safe-buffer": "^5.1.2"
+    "node_modules/@storybook/react-webpack5/node_modules/type-fest": {
+      "version": "2.19.0",
+      "dev": true,
+      "license": "(MIT OR CC0-1.0)",
+      "engines": {
+        "node": ">=12.20"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/browserify-rsa": {
-      "version": "4.1.0",
+    "node_modules/@storybook/react/node_modules/@babel/traverse": {
+      "version": "7.24.7",
+      "dev": true,
       "license": "MIT",
       "dependencies": {
-        "bn.js": "^5.0.0",
-        "randombytes": "^2.0.1"
-      }
-    },
-    "node_modules/browserify-sign": {
-      "version": "4.2.2",
-      "license": "ISC",
-      "dependencies": {
-        "bn.js": "^5.2.1",
-        "browserify-rsa": "^4.1.0",
-        "create-hash": "^1.2.0",
-        "create-hmac": "^1.1.7",
-        "elliptic": "^6.5.4",
-        "inherits": "^2.0.4",
-        "parse-asn1": "^5.1.6",
-        "readable-stream": "^3.6.2",
-        "safe-buffer": "^5.2.1"
+        "@babel/code-frame": "^7.24.7",
+        "@babel/generator": "^7.24.7",
+        "@babel/helper-environment-visitor": "^7.24.7",
+        "@babel/helper-function-name": "^7.24.7",
+        "@babel/helper-hoist-variables": "^7.24.7",
+        "@babel/helper-split-export-declaration": "^7.24.7",
+        "@babel/parser": "^7.24.7",
+        "@babel/types": "^7.24.7",
+        "debug": "^4.3.1",
+        "globals": "^11.1.0"
       },
       "engines": {
-        "node": ">= 4"
+        "node": ">=6.9.0"
       }
     },
-    "node_modules/browserify-sign/node_modules/readable-stream": {
-      "version": "3.6.2",
+    "node_modules/@storybook/react/node_modules/@storybook/channels": {
+      "version": "8.1.10",
+      "dev": true,
       "license": "MIT",
       "dependencies": {
-        "inherits": "^2.0.3",
-        "string_decoder": "^1.1.1",
-        "util-deprecate": "^1.0.1"
+        "@storybook/client-logger": "8.1.10",
+        "@storybook/core-events": "8.1.10",
+        "@storybook/global": "^5.0.0",
+        "telejson": "^7.2.0",
+        "tiny-invariant": "^1.3.1"
       },
-      "engines": {
-        "node": ">= 6"
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/storybook"
       }
     },
-    "node_modules/browserify-sign/node_modules/safe-buffer": {
-      "version": "5.2.1",
-      "funding": [
-        {
-          "type": "github",
-          "url": "https://github.com/sponsors/feross"
-        },
-        {
-          "type": "patreon",
-          "url": "https://www.patreon.com/feross"
-        },
-        {
-          "type": "consulting",
-          "url": "https://feross.org/support"
-        }
-      ],
-      "license": "MIT"
-    },
-    "node_modules/browserify-zlib": {
-      "version": "0.2.0",
+    "node_modules/@storybook/react/node_modules/@storybook/client-logger": {
+      "version": "8.1.10",
+      "dev": true,
       "license": "MIT",
       "dependencies": {
-        "pako": "~1.0.5"
+        "@storybook/global": "^5.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/storybook"
       }
     },
-    "node_modules/browserslist": {
-      "version": "4.23.0",
-      "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.23.0.tgz",
-      "integrity": "sha512-QW8HiM1shhT2GuzkvklfjcKDiWFXHOeFCIA/huJPwHsslwcydgk7X+z2zXpEijP98UCY7HbubZt5J2Zgvf0CaQ==",
-      "funding": [
-        {
-          "type": "opencollective",
-          "url": "https://opencollective.com/browserslist"
-        },
-        {
-          "type": "tidelift",
-          "url": "https://tidelift.com/funding/github/npm/browserslist"
-        },
-        {
-          "type": "github",
-          "url": "https://github.com/sponsors/ai"
-        }
-      ],
+    "node_modules/@storybook/react/node_modules/@storybook/core-common": {
+      "version": "8.1.10",
+      "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "caniuse-lite": "^1.0.30001587",
-        "electron-to-chromium": "^1.4.668",
-        "node-releases": "^2.0.14",
-        "update-browserslist-db": "^1.0.13"
+        "@storybook/core-events": "8.1.10",
+        "@storybook/csf-tools": "8.1.10",
+        "@storybook/node-logger": "8.1.10",
+        "@storybook/types": "8.1.10",
+        "@yarnpkg/fslib": "2.10.3",
+        "@yarnpkg/libzip": "2.3.0",
+        "chalk": "^4.1.0",
+        "cross-spawn": "^7.0.3",
+        "esbuild": "^0.18.0 || ^0.19.0 || ^0.20.0",
+        "esbuild-register": "^3.5.0",
+        "execa": "^5.0.0",
+        "file-system-cache": "2.3.0",
+        "find-cache-dir": "^3.0.0",
+        "find-up": "^5.0.0",
+        "fs-extra": "^11.1.0",
+        "glob": "^10.0.0",
+        "handlebars": "^4.7.7",
+        "lazy-universal-dotenv": "^4.0.0",
+        "node-fetch": "^2.0.0",
+        "picomatch": "^2.3.0",
+        "pkg-dir": "^5.0.0",
+        "prettier-fallback": "npm:prettier@^3",
+        "pretty-hrtime": "^1.0.3",
+        "resolve-from": "^5.0.0",
+        "semver": "^7.3.7",
+        "tempy": "^3.1.0",
+        "tiny-invariant": "^1.3.1",
+        "ts-dedent": "^2.0.0",
+        "util": "^0.12.4"
       },
-      "bin": {
-        "browserslist": "cli.js"
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/storybook"
       },
-      "engines": {
-        "node": "^6 || ^7 || ^8 || ^9 || ^10 || ^11 || ^12 || >=13.7"
+      "peerDependencies": {
+        "prettier": "^2 || ^3"
+      },
+      "peerDependenciesMeta": {
+        "prettier": {
+          "optional": true
+        }
       }
     },
-    "node_modules/bs-logger": {
-      "version": "0.2.6",
-      "resolved": "https://registry.npmjs.org/bs-logger/-/bs-logger-0.2.6.tgz",
-      "integrity": "sha512-pd8DCoxmbgc7hyPKOvxtqNcjYoOsABPQdcCUjGp3d42VR2CX1ORhk2A87oqqu5R1kk+76nsxZupkmyd+MVtCog==",
+    "node_modules/@storybook/react/node_modules/@storybook/core-events": {
+      "version": "8.1.10",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "fast-json-stable-stringify": "2.x"
+        "@storybook/csf": "^0.1.7",
+        "ts-dedent": "^2.0.0"
       },
-      "engines": {
-        "node": ">= 6"
-      }
-    },
-    "node_modules/bser": {
-      "version": "2.1.1",
-      "license": "Apache-2.0",
-      "dependencies": {
-        "node-int64": "^0.4.0"
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/storybook"
       }
     },
-    "node_modules/buffer": {
-      "version": "5.7.1",
-      "funding": [
-        {
-          "type": "github",
-          "url": "https://github.com/sponsors/feross"
-        },
-        {
-          "type": "patreon",
-          "url": "https://www.patreon.com/feross"
-        },
-        {
-          "type": "consulting",
-          "url": "https://feross.org/support"
-        }
-      ],
+    "node_modules/@storybook/react/node_modules/@storybook/csf-tools": {
+      "version": "8.1.10",
+      "dev": true,
       "license": "MIT",
       "dependencies": {
-        "base64-js": "^1.3.1",
-        "ieee754": "^1.1.13"
+        "@babel/generator": "^7.24.4",
+        "@babel/parser": "^7.24.4",
+        "@babel/traverse": "^7.24.1",
+        "@babel/types": "^7.24.0",
+        "@storybook/csf": "^0.1.7",
+        "@storybook/types": "8.1.10",
+        "fs-extra": "^11.1.0",
+        "recast": "^0.23.5",
+        "ts-dedent": "^2.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/storybook"
       }
     },
-    "node_modules/buffer-alloc": {
-      "version": "1.2.0",
+    "node_modules/@storybook/react/node_modules/@storybook/docs-tools": {
+      "version": "8.1.10",
+      "dev": true,
       "license": "MIT",
       "dependencies": {
-        "buffer-alloc-unsafe": "^1.1.0",
-        "buffer-fill": "^1.0.0"
+        "@storybook/core-common": "8.1.10",
+        "@storybook/core-events": "8.1.10",
+        "@storybook/preview-api": "8.1.10",
+        "@storybook/types": "8.1.10",
+        "@types/doctrine": "^0.0.3",
+        "assert": "^2.1.0",
+        "doctrine": "^3.0.0",
+        "lodash": "^4.17.21"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/storybook"
       }
     },
-    "node_modules/buffer-alloc-unsafe": {
-      "version": "1.1.0",
-      "license": "MIT"
-    },
-    "node_modules/buffer-crc32": {
-      "version": "0.2.13",
+    "node_modules/@storybook/react/node_modules/@storybook/node-logger": {
+      "version": "8.1.10",
       "dev": true,
       "license": "MIT",
-      "engines": {
-        "node": "*"
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/storybook"
       }
     },
-    "node_modules/buffer-equal": {
-      "version": "1.0.1",
+    "node_modules/@storybook/react/node_modules/@storybook/preview-api": {
+      "version": "8.1.10",
       "dev": true,
       "license": "MIT",
-      "engines": {
-        "node": ">=0.4"
+      "dependencies": {
+        "@storybook/channels": "8.1.10",
+        "@storybook/client-logger": "8.1.10",
+        "@storybook/core-events": "8.1.10",
+        "@storybook/csf": "^0.1.7",
+        "@storybook/global": "^5.0.0",
+        "@storybook/types": "8.1.10",
+        "@types/qs": "^6.9.5",
+        "dequal": "^2.0.2",
+        "lodash": "^4.17.21",
+        "memoizerific": "^1.11.3",
+        "qs": "^6.10.0",
+        "tiny-invariant": "^1.3.1",
+        "ts-dedent": "^2.0.0",
+        "util-deprecate": "^1.0.2"
       },
       "funding": {
-        "url": "https://github.com/sponsors/ljharb"
+        "type": "opencollective",
+        "url": "https://opencollective.com/storybook"
       }
     },
-    "node_modules/buffer-fill": {
-      "version": "1.0.0",
-      "license": "MIT"
-    },
-    "node_modules/buffer-from": {
-      "version": "1.1.2",
-      "license": "MIT"
-    },
-    "node_modules/buffer-xor": {
-      "version": "1.0.3",
-      "license": "MIT"
-    },
-    "node_modules/builder-util": {
-      "version": "24.13.1",
+    "node_modules/@storybook/react/node_modules/@storybook/types": {
+      "version": "8.1.10",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@types/debug": "^4.1.6",
-        "7zip-bin": "~5.2.0",
-        "app-builder-bin": "4.0.0",
-        "bluebird-lst": "^1.0.9",
-        "builder-util-runtime": "9.2.4",
-        "chalk": "^4.1.2",
-        "cross-spawn": "^7.0.3",
-        "debug": "^4.3.4",
-        "fs-extra": "^10.1.0",
-        "http-proxy-agent": "^5.0.0",
-        "https-proxy-agent": "^5.0.1",
-        "is-ci": "^3.0.0",
-        "js-yaml": "^4.1.0",
-        "source-map-support": "^0.5.19",
-        "stat-mode": "^1.0.0",
-        "temp-file": "^3.4.0"
+        "@storybook/channels": "8.1.10",
+        "@types/express": "^4.7.0",
+        "file-system-cache": "2.3.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/storybook"
       }
     },
-    "node_modules/builder-util-runtime": {
-      "version": "9.2.4",
+    "node_modules/@storybook/react/node_modules/@types/node": {
+      "version": "18.19.39",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "debug": "^4.3.4",
-        "sax": "^1.2.4"
-      },
-      "engines": {
-        "node": ">=12.0.0"
+        "undici-types": "~5.26.4"
       }
     },
-    "node_modules/builder-util/node_modules/ansi-styles": {
+    "node_modules/@storybook/react/node_modules/ansi-styles": {
       "version": "4.3.0",
       "dev": true,
       "license": "MIT",
@@ -15914,12 +15834,27 @@
         "url": "https://github.com/chalk/ansi-styles?sponsor=1"
       }
     },
-    "node_modules/builder-util/node_modules/argparse": {
+    "node_modules/@storybook/react/node_modules/assert": {
+      "version": "2.1.0",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "call-bind": "^1.0.2",
+        "is-nan": "^1.3.2",
+        "object-is": "^1.1.5",
+        "object.assign": "^4.1.4",
+        "util": "^0.12.5"
+      }
+    },
+    "node_modules/@storybook/react/node_modules/brace-expansion": {
       "version": "2.0.1",
       "dev": true,
-      "license": "Python-2.0"
+      "license": "MIT",
+      "dependencies": {
+        "balanced-match": "^1.0.0"
+      }
     },
-    "node_modules/builder-util/node_modules/chalk": {
+    "node_modules/@storybook/react/node_modules/chalk": {
       "version": "4.1.2",
       "dev": true,
       "license": "MIT",
@@ -15934,7 +15869,7 @@
         "url": "https://github.com/chalk/chalk?sponsor=1"
       }
     },
-    "node_modules/builder-util/node_modules/color-convert": {
+    "node_modules/@storybook/react/node_modules/color-convert": {
       "version": "2.0.1",
       "dev": true,
       "license": "MIT",
@@ -15945,649 +15880,732 @@
         "node": ">=7.0.0"
       }
     },
-    "node_modules/builder-util/node_modules/color-name": {
+    "node_modules/@storybook/react/node_modules/color-name": {
       "version": "1.1.4",
       "dev": true,
       "license": "MIT"
     },
-    "node_modules/builder-util/node_modules/fs-extra": {
-      "version": "10.1.0",
+    "node_modules/@storybook/react/node_modules/crypto-random-string": {
+      "version": "4.0.0",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "graceful-fs": "^4.2.0",
-        "jsonfile": "^6.0.1",
-        "universalify": "^2.0.0"
+        "type-fest": "^1.0.1"
       },
       "engines": {
         "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/builder-util/node_modules/has-flag": {
-      "version": "4.0.0",
+    "node_modules/@storybook/react/node_modules/crypto-random-string/node_modules/type-fest": {
+      "version": "1.4.0",
       "dev": true,
-      "license": "MIT",
+      "license": "(MIT OR CC0-1.0)",
       "engines": {
-        "node": ">=8"
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/builder-util/node_modules/js-yaml": {
-      "version": "4.1.0",
+    "node_modules/@storybook/react/node_modules/find-cache-dir": {
+      "version": "3.3.2",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "argparse": "^2.0.1"
+        "commondir": "^1.0.1",
+        "make-dir": "^3.0.2",
+        "pkg-dir": "^4.1.0"
       },
-      "bin": {
-        "js-yaml": "bin/js-yaml.js"
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/avajs/find-cache-dir?sponsor=1"
       }
     },
-    "node_modules/builder-util/node_modules/supports-color": {
-      "version": "7.2.0",
+    "node_modules/@storybook/react/node_modules/find-cache-dir/node_modules/find-up": {
+      "version": "4.1.0",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "has-flag": "^4.0.0"
+        "locate-path": "^5.0.0",
+        "path-exists": "^4.0.0"
       },
       "engines": {
         "node": ">=8"
       }
     },
-    "node_modules/builtin-modules": {
-      "version": "3.3.0",
+    "node_modules/@storybook/react/node_modules/find-cache-dir/node_modules/pkg-dir": {
+      "version": "4.2.0",
       "dev": true,
       "license": "MIT",
-      "engines": {
-        "node": ">=6"
+      "dependencies": {
+        "find-up": "^4.0.0"
       },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
+      "engines": {
+        "node": ">=8"
       }
     },
-    "node_modules/builtin-status-codes": {
-      "version": "3.0.0",
-      "license": "MIT"
-    },
-    "node_modules/builtins": {
-      "version": "1.0.3",
-      "license": "MIT"
+    "node_modules/@storybook/react/node_modules/fs-extra": {
+      "version": "11.2.0",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "graceful-fs": "^4.2.0",
+        "jsonfile": "^6.0.1",
+        "universalify": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=14.14"
+      }
     },
-    "node_modules/bundle-name": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/bundle-name/-/bundle-name-4.1.0.tgz",
-      "integrity": "sha512-tjwM5exMg6BGRI+kNmTntNsvdZS1X8BFYS6tnJ2hdH0kVxM6/eVZ2xy+FqStSWvYmtfFMDLIxurorHwDKfDz5Q==",
+    "node_modules/@storybook/react/node_modules/glob": {
+      "version": "10.4.2",
       "dev": true,
+      "license": "ISC",
       "dependencies": {
-        "run-applescript": "^7.0.0"
+        "foreground-child": "^3.1.0",
+        "jackspeak": "^3.1.2",
+        "minimatch": "^9.0.4",
+        "minipass": "^7.1.2",
+        "package-json-from-dist": "^1.0.0",
+        "path-scurry": "^1.11.1"
+      },
+      "bin": {
+        "glob": "dist/esm/bin.mjs"
       },
       "engines": {
-        "node": ">=18"
+        "node": ">=16 || 14 >=14.18"
       },
       "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
+        "url": "https://github.com/sponsors/isaacs"
       }
     },
-    "node_modules/bytes": {
-      "version": "3.0.0",
+    "node_modules/@storybook/react/node_modules/has-flag": {
+      "version": "4.0.0",
+      "dev": true,
       "license": "MIT",
       "engines": {
-        "node": ">= 0.8"
+        "node": ">=8"
       }
     },
-    "node_modules/bytewise": {
-      "version": "1.1.0",
+    "node_modules/@storybook/react/node_modules/is-stream": {
+      "version": "3.0.0",
+      "dev": true,
       "license": "MIT",
-      "dependencies": {
-        "bytewise-core": "^1.2.2",
-        "typewise": "^1.0.3"
+      "engines": {
+        "node": "^12.20.0 || ^14.13.1 || >=16.0.0"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/bytewise-core": {
-      "version": "1.2.3",
-      "license": "MIT",
+    "node_modules/@storybook/react/node_modules/jackspeak": {
+      "version": "3.4.0",
+      "dev": true,
+      "license": "BlueOak-1.0.0",
       "dependencies": {
-        "typewise-core": "^1.2"
+        "@isaacs/cliui": "^8.0.2"
+      },
+      "engines": {
+        "node": ">=14"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
+      },
+      "optionalDependencies": {
+        "@pkgjs/parseargs": "^0.11.0"
       }
     },
-    "node_modules/cacache": {
-      "version": "15.3.0",
-      "license": "ISC",
+    "node_modules/@storybook/react/node_modules/locate-path": {
+      "version": "5.0.0",
+      "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "@npmcli/fs": "^1.0.0",
-        "@npmcli/move-file": "^1.0.1",
-        "chownr": "^2.0.0",
-        "fs-minipass": "^2.0.0",
-        "glob": "^7.1.4",
-        "infer-owner": "^1.0.4",
-        "lru-cache": "^6.0.0",
-        "minipass": "^3.1.1",
-        "minipass-collect": "^1.0.2",
-        "minipass-flush": "^1.0.5",
-        "minipass-pipeline": "^1.2.2",
-        "mkdirp": "^1.0.3",
-        "p-map": "^4.0.0",
-        "promise-inflight": "^1.0.1",
-        "rimraf": "^3.0.2",
-        "ssri": "^8.0.1",
-        "tar": "^6.0.2",
-        "unique-filename": "^1.1.1"
+        "p-locate": "^4.1.0"
       },
       "engines": {
-        "node": ">= 10"
+        "node": ">=8"
       }
     },
-    "node_modules/cache-base": {
-      "version": "1.0.1",
+    "node_modules/@storybook/react/node_modules/make-dir": {
+      "version": "3.1.0",
+      "dev": true,
       "license": "MIT",
-      "optional": true,
       "dependencies": {
-        "collection-visit": "^1.0.0",
-        "component-emitter": "^1.2.1",
-        "get-value": "^2.0.6",
-        "has-value": "^1.0.0",
-        "isobject": "^3.0.1",
-        "set-value": "^2.0.0",
-        "to-object-path": "^0.3.0",
-        "union-value": "^1.0.0",
-        "unset-value": "^1.0.0"
+        "semver": "^6.0.0"
       },
       "engines": {
-        "node": ">=0.10.0"
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/cacheable-lookup": {
-      "version": "5.0.4",
+    "node_modules/@storybook/react/node_modules/make-dir/node_modules/semver": {
+      "version": "6.3.1",
       "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=10.6.0"
+      "license": "ISC",
+      "bin": {
+        "semver": "bin/semver.js"
       }
     },
-    "node_modules/cacheable-request": {
-      "version": "7.0.2",
+    "node_modules/@storybook/react/node_modules/minimatch": {
+      "version": "9.0.4",
       "dev": true,
-      "license": "MIT",
+      "license": "ISC",
       "dependencies": {
-        "clone-response": "^1.0.2",
-        "get-stream": "^5.1.0",
-        "http-cache-semantics": "^4.0.0",
-        "keyv": "^4.0.0",
-        "lowercase-keys": "^2.0.0",
-        "normalize-url": "^6.0.1",
-        "responselike": "^2.0.0"
+        "brace-expansion": "^2.0.1"
       },
       "engines": {
-        "node": ">=8"
+        "node": ">=16 || 14 >=14.17"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
       }
     },
-    "node_modules/cacheable-request/node_modules/get-stream": {
-      "version": "5.2.0",
+    "node_modules/@storybook/react/node_modules/minipass": {
+      "version": "7.1.2",
+      "dev": true,
+      "license": "ISC",
+      "engines": {
+        "node": ">=16 || 14 >=14.17"
+      }
+    },
+    "node_modules/@storybook/react/node_modules/p-limit": {
+      "version": "2.3.0",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "pump": "^3.0.0"
+        "p-try": "^2.0.0"
       },
       "engines": {
-        "node": ">=8"
+        "node": ">=6"
       },
       "funding": {
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/call-bind": {
-      "version": "1.0.2",
+    "node_modules/@storybook/react/node_modules/p-locate": {
+      "version": "4.1.0",
+      "dev": true,
       "license": "MIT",
       "dependencies": {
-        "function-bind": "^1.1.1",
-        "get-intrinsic": "^1.0.2"
+        "p-limit": "^2.2.0"
       },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
+      "engines": {
+        "node": ">=8"
       }
     },
-    "node_modules/caller-callsite": {
-      "version": "2.0.0",
+    "node_modules/@storybook/react/node_modules/path-exists": {
+      "version": "4.0.0",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/@storybook/react/node_modules/recast": {
+      "version": "0.23.9",
+      "dev": true,
       "license": "MIT",
       "dependencies": {
-        "callsites": "^2.0.0"
+        "ast-types": "^0.16.1",
+        "esprima": "~4.0.0",
+        "source-map": "~0.6.1",
+        "tiny-invariant": "^1.3.3",
+        "tslib": "^2.0.1"
       },
       "engines": {
-        "node": ">=4"
+        "node": ">= 4"
       }
     },
-    "node_modules/caller-callsite/node_modules/callsites": {
-      "version": "2.0.0",
-      "license": "MIT",
+    "node_modules/@storybook/react/node_modules/source-map": {
+      "version": "0.6.1",
+      "dev": true,
+      "license": "BSD-3-Clause",
       "engines": {
-        "node": ">=4"
+        "node": ">=0.10.0"
       }
     },
-    "node_modules/caller-path": {
-      "version": "2.0.0",
+    "node_modules/@storybook/react/node_modules/supports-color": {
+      "version": "7.2.0",
+      "dev": true,
       "license": "MIT",
       "dependencies": {
-        "caller-callsite": "^2.0.0"
+        "has-flag": "^4.0.0"
       },
       "engines": {
-        "node": ">=4"
+        "node": ">=8"
       }
     },
-    "node_modules/callsites": {
-      "version": "3.1.0",
+    "node_modules/@storybook/react/node_modules/temp-dir": {
+      "version": "3.0.0",
+      "dev": true,
       "license": "MIT",
       "engines": {
-        "node": ">=6"
+        "node": ">=14.16"
       }
     },
-    "node_modules/camel-case": {
-      "version": "4.1.2",
+    "node_modules/@storybook/react/node_modules/tempy": {
+      "version": "3.1.0",
+      "dev": true,
       "license": "MIT",
       "dependencies": {
-        "pascal-case": "^3.1.2",
-        "tslib": "^2.0.3"
-      }
-    },
-    "node_modules/camelcase": {
-      "version": "6.3.0",
-      "license": "MIT",
+        "is-stream": "^3.0.0",
+        "temp-dir": "^3.0.0",
+        "type-fest": "^2.12.2",
+        "unique-string": "^3.0.0"
+      },
       "engines": {
-        "node": ">=10"
+        "node": ">=14.16"
       },
       "funding": {
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/camelize": {
-      "version": "1.0.1",
-      "license": "MIT",
+    "node_modules/@storybook/react/node_modules/type-fest": {
+      "version": "2.19.0",
+      "dev": true,
+      "license": "(MIT OR CC0-1.0)",
+      "engines": {
+        "node": ">=12.20"
+      },
       "funding": {
-        "url": "https://github.com/sponsors/ljharb"
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/caniuse-lite": {
-      "version": "1.0.30001603",
-      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001603.tgz",
-      "integrity": "sha512-iL2iSS0eDILMb9n5yKQoTBim9jMZ0Yrk8g0N9K7UzYyWnfIKzXBZD5ngpM37ZcL/cv0Mli8XtVMRYMQAfFpi5Q==",
-      "funding": [
-        {
-          "type": "opencollective",
-          "url": "https://opencollective.com/browserslist"
-        },
-        {
-          "type": "tidelift",
-          "url": "https://tidelift.com/funding/github/npm/caniuse-lite"
-        },
-        {
-          "type": "github",
-          "url": "https://github.com/sponsors/ai"
-        }
-      ]
-    },
-    "node_modules/canvas": {
-      "version": "2.11.2",
-      "hasInstallScript": true,
+    "node_modules/@storybook/react/node_modules/unique-string": {
+      "version": "3.0.0",
+      "dev": true,
       "license": "MIT",
-      "optional": true,
       "dependencies": {
-        "@mapbox/node-pre-gyp": "^1.0.0",
-        "nan": "^2.17.0",
-        "simple-get": "^3.0.3"
+        "crypto-random-string": "^4.0.0"
       },
       "engines": {
-        "node": ">=6"
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/canvas-size": {
-      "version": "1.2.6",
-      "license": "MIT"
-    },
-    "node_modules/case-sensitive-paths-webpack-plugin": {
-      "version": "2.4.0",
-      "resolved": "https://registry.npmjs.org/case-sensitive-paths-webpack-plugin/-/case-sensitive-paths-webpack-plugin-2.4.0.tgz",
-      "integrity": "sha512-roIFONhcxog0JSSWbvVAh3OocukmSgpqOH6YpMkCvav/ySIV3JKg4Dc8vYtQjYi/UxpNE36r/9v+VqTQqgkYmw==",
+    "node_modules/@storybook/react/node_modules/util": {
+      "version": "0.12.5",
       "dev": true,
-      "engines": {
-        "node": ">=4"
+      "license": "MIT",
+      "dependencies": {
+        "inherits": "^2.0.3",
+        "is-arguments": "^1.0.4",
+        "is-generator-function": "^1.0.7",
+        "is-typed-array": "^1.1.3",
+        "which-typed-array": "^1.1.2"
       }
     },
-    "node_modules/center-align": {
-      "version": "0.1.3",
+    "node_modules/@storybook/router": {
+      "version": "8.1.10",
+      "dev": true,
       "license": "MIT",
       "dependencies": {
-        "align-text": "^0.1.3",
-        "lazy-cache": "^1.0.3"
+        "@storybook/client-logger": "8.1.10",
+        "memoizerific": "^1.11.3",
+        "qs": "^6.10.0"
       },
-      "engines": {
-        "node": ">=0.10.0"
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/storybook"
       }
     },
-    "node_modules/chalk": {
-      "version": "2.4.2",
+    "node_modules/@storybook/router/node_modules/@storybook/client-logger": {
+      "version": "8.1.10",
+      "dev": true,
       "license": "MIT",
       "dependencies": {
-        "ansi-styles": "^3.2.1",
-        "escape-string-regexp": "^1.0.5",
-        "supports-color": "^5.3.0"
+        "@storybook/global": "^5.0.0"
       },
-      "engines": {
-        "node": ">=4"
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/storybook"
       }
     },
-    "node_modules/chalk/node_modules/escape-string-regexp": {
-      "version": "1.0.5",
+    "node_modules/@storybook/telemetry": {
+      "version": "8.1.10",
+      "dev": true,
       "license": "MIT",
-      "engines": {
-        "node": ">=0.8.0"
+      "dependencies": {
+        "@storybook/client-logger": "8.1.10",
+        "@storybook/core-common": "8.1.10",
+        "@storybook/csf-tools": "8.1.10",
+        "chalk": "^4.1.0",
+        "detect-package-manager": "^2.0.1",
+        "fetch-retry": "^5.0.2",
+        "fs-extra": "^11.1.0",
+        "read-pkg-up": "^7.0.1"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/storybook"
       }
     },
-    "node_modules/char-regex": {
-      "version": "1.0.2",
+    "node_modules/@storybook/telemetry/node_modules/@babel/traverse": {
+      "version": "7.24.7",
+      "dev": true,
       "license": "MIT",
+      "dependencies": {
+        "@babel/code-frame": "^7.24.7",
+        "@babel/generator": "^7.24.7",
+        "@babel/helper-environment-visitor": "^7.24.7",
+        "@babel/helper-function-name": "^7.24.7",
+        "@babel/helper-hoist-variables": "^7.24.7",
+        "@babel/helper-split-export-declaration": "^7.24.7",
+        "@babel/parser": "^7.24.7",
+        "@babel/types": "^7.24.7",
+        "debug": "^4.3.1",
+        "globals": "^11.1.0"
+      },
       "engines": {
-        "node": ">=10"
+        "node": ">=6.9.0"
       }
     },
-    "node_modules/character-entities-html4": {
-      "version": "1.1.4",
+    "node_modules/@storybook/telemetry/node_modules/@storybook/channels": {
+      "version": "8.1.10",
+      "dev": true,
       "license": "MIT",
+      "dependencies": {
+        "@storybook/client-logger": "8.1.10",
+        "@storybook/core-events": "8.1.10",
+        "@storybook/global": "^5.0.0",
+        "telejson": "^7.2.0",
+        "tiny-invariant": "^1.3.1"
+      },
       "funding": {
-        "type": "github",
-        "url": "https://github.com/sponsors/wooorm"
+        "type": "opencollective",
+        "url": "https://opencollective.com/storybook"
       }
     },
-    "node_modules/character-entities-legacy": {
-      "version": "1.1.4",
+    "node_modules/@storybook/telemetry/node_modules/@storybook/client-logger": {
+      "version": "8.1.10",
+      "dev": true,
       "license": "MIT",
+      "dependencies": {
+        "@storybook/global": "^5.0.0"
+      },
       "funding": {
-        "type": "github",
-        "url": "https://github.com/sponsors/wooorm"
-      }
-    },
-    "node_modules/charenc": {
-      "version": "0.0.2",
-      "license": "BSD-3-Clause",
-      "engines": {
-        "node": "*"
+        "type": "opencollective",
+        "url": "https://opencollective.com/storybook"
       }
     },
-    "node_modules/chokidar": {
-      "version": "3.6.0",
-      "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.6.0.tgz",
-      "integrity": "sha512-7VT13fmjotKpGipCW9JEQAusEPE+Ei8nl6/g4FBAmIm0GOOLMua9NDDo/DWp0ZAxCr3cPq5ZpBqmPAQgDda2Pw==",
+    "node_modules/@storybook/telemetry/node_modules/@storybook/core-common": {
+      "version": "8.1.10",
+      "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "anymatch": "~3.1.2",
-        "braces": "~3.0.2",
-        "glob-parent": "~5.1.2",
-        "is-binary-path": "~2.1.0",
-        "is-glob": "~4.0.1",
-        "normalize-path": "~3.0.0",
-        "readdirp": "~3.6.0"
-      },
-      "engines": {
-        "node": ">= 8.10.0"
+        "@storybook/core-events": "8.1.10",
+        "@storybook/csf-tools": "8.1.10",
+        "@storybook/node-logger": "8.1.10",
+        "@storybook/types": "8.1.10",
+        "@yarnpkg/fslib": "2.10.3",
+        "@yarnpkg/libzip": "2.3.0",
+        "chalk": "^4.1.0",
+        "cross-spawn": "^7.0.3",
+        "esbuild": "^0.18.0 || ^0.19.0 || ^0.20.0",
+        "esbuild-register": "^3.5.0",
+        "execa": "^5.0.0",
+        "file-system-cache": "2.3.0",
+        "find-cache-dir": "^3.0.0",
+        "find-up": "^5.0.0",
+        "fs-extra": "^11.1.0",
+        "glob": "^10.0.0",
+        "handlebars": "^4.7.7",
+        "lazy-universal-dotenv": "^4.0.0",
+        "node-fetch": "^2.0.0",
+        "picomatch": "^2.3.0",
+        "pkg-dir": "^5.0.0",
+        "prettier-fallback": "npm:prettier@^3",
+        "pretty-hrtime": "^1.0.3",
+        "resolve-from": "^5.0.0",
+        "semver": "^7.3.7",
+        "tempy": "^3.1.0",
+        "tiny-invariant": "^1.3.1",
+        "ts-dedent": "^2.0.0",
+        "util": "^0.12.4"
       },
       "funding": {
-        "url": "https://paulmillr.com/funding/"
+        "type": "opencollective",
+        "url": "https://opencollective.com/storybook"
       },
-      "optionalDependencies": {
-        "fsevents": "~2.3.2"
+      "peerDependencies": {
+        "prettier": "^2 || ^3"
+      },
+      "peerDependenciesMeta": {
+        "prettier": {
+          "optional": true
+        }
       }
     },
-    "node_modules/chownr": {
-      "version": "2.0.0",
-      "license": "ISC",
-      "engines": {
-        "node": ">=10"
+    "node_modules/@storybook/telemetry/node_modules/@storybook/core-events": {
+      "version": "8.1.10",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@storybook/csf": "^0.1.7",
+        "ts-dedent": "^2.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/storybook"
       }
     },
-    "node_modules/chrome-launcher": {
-      "version": "0.15.2",
-      "license": "Apache-2.0",
+    "node_modules/@storybook/telemetry/node_modules/@storybook/csf-tools": {
+      "version": "8.1.10",
+      "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "@types/node": "*",
-        "escape-string-regexp": "^4.0.0",
-        "is-wsl": "^2.2.0",
-        "lighthouse-logger": "^1.0.0"
-      },
-      "bin": {
-        "print-chrome-path": "bin/print-chrome-path.js"
+        "@babel/generator": "^7.24.4",
+        "@babel/parser": "^7.24.4",
+        "@babel/traverse": "^7.24.1",
+        "@babel/types": "^7.24.0",
+        "@storybook/csf": "^0.1.7",
+        "@storybook/types": "8.1.10",
+        "fs-extra": "^11.1.0",
+        "recast": "^0.23.5",
+        "ts-dedent": "^2.0.0"
       },
-      "engines": {
-        "node": ">=12.13.0"
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/storybook"
       }
     },
-    "node_modules/chrome-trace-event": {
-      "version": "1.0.3",
+    "node_modules/@storybook/telemetry/node_modules/@storybook/node-logger": {
+      "version": "8.1.10",
+      "dev": true,
       "license": "MIT",
-      "engines": {
-        "node": ">=6.0"
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/storybook"
       }
     },
-    "node_modules/chromium-edge-launcher": {
-      "version": "1.0.0",
-      "license": "Apache-2.0",
+    "node_modules/@storybook/telemetry/node_modules/@storybook/types": {
+      "version": "8.1.10",
+      "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "@types/node": "*",
-        "escape-string-regexp": "^4.0.0",
-        "is-wsl": "^2.2.0",
-        "lighthouse-logger": "^1.0.0",
-        "mkdirp": "^1.0.4",
-        "rimraf": "^3.0.2"
+        "@storybook/channels": "8.1.10",
+        "@types/express": "^4.7.0",
+        "file-system-cache": "2.3.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/storybook"
       }
     },
-    "node_modules/chromium-pickle-js": {
-      "version": "0.2.0",
+    "node_modules/@storybook/telemetry/node_modules/ansi-styles": {
+      "version": "4.3.0",
       "dev": true,
-      "license": "MIT"
-    },
-    "node_modules/ci-info": {
-      "version": "3.8.0",
-      "funding": [
-        {
-          "type": "github",
-          "url": "https://github.com/sponsors/sibiraj-s"
-        }
-      ],
       "license": "MIT",
+      "dependencies": {
+        "color-convert": "^2.0.1"
+      },
       "engines": {
         "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
       }
     },
-    "node_modules/cipher-base": {
-      "version": "1.0.4",
+    "node_modules/@storybook/telemetry/node_modules/brace-expansion": {
+      "version": "2.0.1",
+      "dev": true,
       "license": "MIT",
       "dependencies": {
-        "inherits": "^2.0.1",
-        "safe-buffer": "^5.0.1"
+        "balanced-match": "^1.0.0"
       }
     },
-    "node_modules/citty": {
-      "version": "0.1.6",
-      "resolved": "https://registry.npmjs.org/citty/-/citty-0.1.6.tgz",
-      "integrity": "sha512-tskPPKEs8D2KPafUypv2gxwJP8h/OaJmC82QQGGDQcHvXX43xF2VDACcJVmZ0EuSxkpO9Kc4MlrA3q0+FG58AQ==",
-      "dependencies": {
-        "consola": "^3.2.3"
-      }
-    },
-    "node_modules/cjs-module-lexer": {
-      "version": "1.2.3",
-      "resolved": "https://registry.npmjs.org/cjs-module-lexer/-/cjs-module-lexer-1.2.3.tgz",
-      "integrity": "sha512-0TNiGstbQmCFwt4akjjBg5pLRTSyj/PkWQ1ZoO2zntmg9yLqSRxwEa4iCfQLGjqhiqBfOJa7W/E8wfGrTDmlZQ=="
-    },
-    "node_modules/class-utils": {
-      "version": "0.3.6",
+    "node_modules/@storybook/telemetry/node_modules/chalk": {
+      "version": "4.1.2",
+      "dev": true,
       "license": "MIT",
-      "optional": true,
       "dependencies": {
-        "arr-union": "^3.1.0",
-        "define-property": "^0.2.5",
-        "isobject": "^3.0.0",
-        "static-extend": "^0.1.1"
+        "ansi-styles": "^4.1.0",
+        "supports-color": "^7.1.0"
       },
       "engines": {
-        "node": ">=0.10.0"
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/chalk?sponsor=1"
       }
     },
-    "node_modules/class-utils/node_modules/define-property": {
-      "version": "0.2.5",
+    "node_modules/@storybook/telemetry/node_modules/color-convert": {
+      "version": "2.0.1",
+      "dev": true,
       "license": "MIT",
-      "optional": true,
       "dependencies": {
-        "is-descriptor": "^0.1.0"
+        "color-name": "~1.1.4"
       },
       "engines": {
-        "node": ">=0.10.0"
+        "node": ">=7.0.0"
       }
     },
-    "node_modules/class-utils/node_modules/is-accessor-descriptor": {
-      "version": "0.1.6",
+    "node_modules/@storybook/telemetry/node_modules/color-name": {
+      "version": "1.1.4",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/@storybook/telemetry/node_modules/crypto-random-string": {
+      "version": "4.0.0",
+      "dev": true,
       "license": "MIT",
-      "optional": true,
       "dependencies": {
-        "kind-of": "^3.0.2"
+        "type-fest": "^1.0.1"
       },
       "engines": {
-        "node": ">=0.10.0"
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/class-utils/node_modules/is-accessor-descriptor/node_modules/kind-of": {
-      "version": "3.2.2",
-      "license": "MIT",
-      "optional": true,
-      "dependencies": {
-        "is-buffer": "^1.1.5"
-      },
+    "node_modules/@storybook/telemetry/node_modules/crypto-random-string/node_modules/type-fest": {
+      "version": "1.4.0",
+      "dev": true,
+      "license": "(MIT OR CC0-1.0)",
       "engines": {
-        "node": ">=0.10.0"
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/class-utils/node_modules/is-buffer": {
-      "version": "1.1.6",
-      "license": "MIT",
-      "optional": true
-    },
-    "node_modules/class-utils/node_modules/is-data-descriptor": {
-      "version": "0.1.4",
+    "node_modules/@storybook/telemetry/node_modules/find-cache-dir": {
+      "version": "3.3.2",
+      "dev": true,
       "license": "MIT",
-      "optional": true,
       "dependencies": {
-        "kind-of": "^3.0.2"
+        "commondir": "^1.0.1",
+        "make-dir": "^3.0.2",
+        "pkg-dir": "^4.1.0"
       },
       "engines": {
-        "node": ">=0.10.0"
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/avajs/find-cache-dir?sponsor=1"
       }
     },
-    "node_modules/class-utils/node_modules/is-data-descriptor/node_modules/kind-of": {
-      "version": "3.2.2",
+    "node_modules/@storybook/telemetry/node_modules/find-cache-dir/node_modules/find-up": {
+      "version": "4.1.0",
+      "dev": true,
       "license": "MIT",
-      "optional": true,
       "dependencies": {
-        "is-buffer": "^1.1.5"
+        "locate-path": "^5.0.0",
+        "path-exists": "^4.0.0"
       },
       "engines": {
-        "node": ">=0.10.0"
+        "node": ">=8"
       }
     },
-    "node_modules/class-utils/node_modules/is-descriptor": {
-      "version": "0.1.6",
+    "node_modules/@storybook/telemetry/node_modules/find-cache-dir/node_modules/pkg-dir": {
+      "version": "4.2.0",
+      "dev": true,
       "license": "MIT",
-      "optional": true,
       "dependencies": {
-        "is-accessor-descriptor": "^0.1.6",
-        "is-data-descriptor": "^0.1.4",
-        "kind-of": "^5.0.0"
+        "find-up": "^4.0.0"
       },
       "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/class-utils/node_modules/kind-of": {
-      "version": "5.1.0",
-      "license": "MIT",
-      "optional": true,
-      "engines": {
-        "node": ">=0.10.0"
+        "node": ">=8"
       }
     },
-    "node_modules/classnames": {
-      "version": "2.5.0",
-      "resolved": "https://registry.npmjs.org/classnames/-/classnames-2.5.0.tgz",
-      "integrity": "sha512-FQuRlyKinxrb5gwJlfVASbSrDlikDJ07426TrfPsdGLvtochowmkbnSFdQGJ2aoXrSetq5KqGV9emvWpy+91xA=="
-    },
-    "node_modules/clean-css": {
-      "version": "5.3.2",
+    "node_modules/@storybook/telemetry/node_modules/fs-extra": {
+      "version": "11.2.0",
+      "dev": true,
       "license": "MIT",
       "dependencies": {
-        "source-map": "~0.6.0"
+        "graceful-fs": "^4.2.0",
+        "jsonfile": "^6.0.1",
+        "universalify": "^2.0.0"
       },
       "engines": {
-        "node": ">= 10.0"
-      }
-    },
-    "node_modules/clean-stack": {
-      "version": "2.2.0",
-      "license": "MIT",
-      "engines": {
-        "node": ">=6"
+        "node": ">=14.14"
       }
     },
-    "node_modules/clean-webpack-plugin": {
-      "version": "4.0.0",
+    "node_modules/@storybook/telemetry/node_modules/glob": {
+      "version": "10.4.2",
       "dev": true,
-      "license": "MIT",
+      "license": "ISC",
       "dependencies": {
-        "del": "^4.1.1"
+        "foreground-child": "^3.1.0",
+        "jackspeak": "^3.1.2",
+        "minimatch": "^9.0.4",
+        "minipass": "^7.1.2",
+        "package-json-from-dist": "^1.0.0",
+        "path-scurry": "^1.11.1"
+      },
+      "bin": {
+        "glob": "dist/esm/bin.mjs"
       },
       "engines": {
-        "node": ">=10.0.0"
+        "node": ">=16 || 14 >=14.18"
       },
-      "peerDependencies": {
-        "webpack": ">=4.0.0 <6.0.0"
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
       }
     },
-    "node_modules/cli-cursor": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/cli-cursor/-/cli-cursor-3.1.0.tgz",
-      "integrity": "sha512-I/zHAwsKf9FqGoXM4WWRACob9+SNukZTd94DWF57E4toouRulbCxcUh6RKUEOQlYTHJnzkPMySvPNaaSLNfLZw==",
-      "dependencies": {
-        "restore-cursor": "^3.1.0"
-      },
+    "node_modules/@storybook/telemetry/node_modules/has-flag": {
+      "version": "4.0.0",
+      "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=8"
       }
     },
-    "node_modules/cli-spinners": {
-      "version": "2.9.2",
+    "node_modules/@storybook/telemetry/node_modules/is-stream": {
+      "version": "3.0.0",
+      "dev": true,
       "license": "MIT",
       "engines": {
-        "node": ">=6"
+        "node": "^12.20.0 || ^14.13.1 || >=16.0.0"
       },
       "funding": {
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/cli-table3": {
-      "version": "0.6.4",
-      "resolved": "https://registry.npmjs.org/cli-table3/-/cli-table3-0.6.4.tgz",
-      "integrity": "sha512-Lm3L0p+/npIQWNIiyF/nAn7T5dnOwR3xNTHXYEBFBFVPXzCVNZ5lqEC/1eo/EVfpDsQ1I+TX4ORPQgp+UI0CRw==",
+    "node_modules/@storybook/telemetry/node_modules/jackspeak": {
+      "version": "3.4.0",
+      "dev": true,
+      "license": "BlueOak-1.0.0",
       "dependencies": {
-        "string-width": "^4.2.0"
+        "@isaacs/cliui": "^8.0.2"
       },
       "engines": {
-        "node": "10.* || >= 12.*"
+        "node": ">=14"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
       },
       "optionalDependencies": {
-        "@colors/colors": "1.5.0"
+        "@pkgjs/parseargs": "^0.11.0"
       }
     },
-    "node_modules/cli-truncate": {
-      "version": "2.1.0",
+    "node_modules/@storybook/telemetry/node_modules/locate-path": {
+      "version": "5.0.0",
       "dev": true,
       "license": "MIT",
-      "optional": true,
       "dependencies": {
-        "slice-ansi": "^3.0.0",
-        "string-width": "^4.2.0"
+        "p-locate": "^4.1.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/@storybook/telemetry/node_modules/make-dir": {
+      "version": "3.1.0",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "semver": "^6.0.0"
       },
       "engines": {
         "node": ">=8"
@@ -16596,1792 +16614,1711 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/clipboard": {
-      "version": "2.0.11",
-      "resolved": "https://registry.npmjs.org/clipboard/-/clipboard-2.0.11.tgz",
-      "integrity": "sha512-C+0bbOqkezLIsmWSvlsXS0Q0bmkugu7jcfMIACB+RDEntIzQIkdr148we28AfSloQLRdZlYL/QYyrq05j/3Faw==",
-      "dependencies": {
-        "good-listener": "^1.2.2",
-        "select": "^1.1.2",
-        "tiny-emitter": "^2.0.0"
+    "node_modules/@storybook/telemetry/node_modules/make-dir/node_modules/semver": {
+      "version": "6.3.1",
+      "dev": true,
+      "license": "ISC",
+      "bin": {
+        "semver": "bin/semver.js"
       }
     },
-    "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==",
+    "node_modules/@storybook/telemetry/node_modules/minimatch": {
+      "version": "9.0.4",
+      "dev": true,
+      "license": "ISC",
       "dependencies": {
-        "string-width": "^4.2.0",
-        "strip-ansi": "^6.0.1",
-        "wrap-ansi": "^7.0.0"
+        "brace-expansion": "^2.0.1"
       },
       "engines": {
-        "node": ">=12"
+        "node": ">=16 || 14 >=14.17"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
       }
     },
-    "node_modules/clone": {
-      "version": "1.0.4",
-      "license": "MIT",
+    "node_modules/@storybook/telemetry/node_modules/minipass": {
+      "version": "7.1.2",
+      "dev": true,
+      "license": "ISC",
       "engines": {
-        "node": ">=0.8"
+        "node": ">=16 || 14 >=14.17"
       }
     },
-    "node_modules/clone-deep": {
-      "version": "4.0.1",
+    "node_modules/@storybook/telemetry/node_modules/p-limit": {
+      "version": "2.3.0",
+      "dev": true,
       "license": "MIT",
       "dependencies": {
-        "is-plain-object": "^2.0.4",
-        "kind-of": "^6.0.2",
-        "shallow-clone": "^3.0.0"
+        "p-try": "^2.0.0"
       },
       "engines": {
         "node": ">=6"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/clone-deep/node_modules/is-plain-object": {
-      "version": "2.0.4",
+    "node_modules/@storybook/telemetry/node_modules/p-locate": {
+      "version": "4.1.0",
+      "dev": true,
       "license": "MIT",
       "dependencies": {
-        "isobject": "^3.0.1"
+        "p-limit": "^2.2.0"
       },
       "engines": {
-        "node": ">=0.10.0"
+        "node": ">=8"
       }
     },
-    "node_modules/clone-response": {
-      "version": "1.0.3",
+    "node_modules/@storybook/telemetry/node_modules/path-exists": {
+      "version": "4.0.0",
       "dev": true,
       "license": "MIT",
-      "dependencies": {
-        "mimic-response": "^1.0.0"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
+      "engines": {
+        "node": ">=8"
       }
     },
-    "node_modules/clsx": {
-      "version": "2.0.0",
+    "node_modules/@storybook/telemetry/node_modules/recast": {
+      "version": "0.23.9",
+      "dev": true,
       "license": "MIT",
+      "dependencies": {
+        "ast-types": "^0.16.1",
+        "esprima": "~4.0.0",
+        "source-map": "~0.6.1",
+        "tiny-invariant": "^1.3.3",
+        "tslib": "^2.0.1"
+      },
       "engines": {
-        "node": ">=6"
+        "node": ">= 4"
       }
     },
-    "node_modules/cmd-shim": {
-      "version": "6.0.1",
-      "license": "ISC",
+    "node_modules/@storybook/telemetry/node_modules/source-map": {
+      "version": "0.6.1",
+      "dev": true,
+      "license": "BSD-3-Clause",
       "engines": {
-        "node": "^14.17.0 || ^16.13.0 || >=18.0.0"
+        "node": ">=0.10.0"
       }
     },
-    "node_modules/co": {
-      "version": "4.6.0",
+    "node_modules/@storybook/telemetry/node_modules/supports-color": {
+      "version": "7.2.0",
+      "dev": true,
       "license": "MIT",
+      "dependencies": {
+        "has-flag": "^4.0.0"
+      },
       "engines": {
-        "iojs": ">= 1.0.0",
-        "node": ">= 0.12.0"
+        "node": ">=8"
       }
     },
-    "node_modules/code-point-at": {
-      "version": "1.1.0",
+    "node_modules/@storybook/telemetry/node_modules/temp-dir": {
+      "version": "3.0.0",
+      "dev": true,
       "license": "MIT",
       "engines": {
-        "node": ">=0.10.0"
+        "node": ">=14.16"
       }
     },
-    "node_modules/collect-v8-coverage": {
-      "version": "1.0.1",
-      "license": "MIT"
-    },
-    "node_modules/collection-visit": {
-      "version": "1.0.0",
+    "node_modules/@storybook/telemetry/node_modules/tempy": {
+      "version": "3.1.0",
+      "dev": true,
       "license": "MIT",
-      "optional": true,
       "dependencies": {
-        "map-visit": "^1.0.0",
-        "object-visit": "^1.0.0"
+        "is-stream": "^3.0.0",
+        "temp-dir": "^3.0.0",
+        "type-fest": "^2.12.2",
+        "unique-string": "^3.0.0"
       },
       "engines": {
-        "node": ">=0.10.0"
+        "node": ">=14.16"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/color": {
-      "version": "4.2.3",
+    "node_modules/@storybook/telemetry/node_modules/type-fest": {
+      "version": "2.19.0",
+      "dev": true,
+      "license": "(MIT OR CC0-1.0)",
+      "engines": {
+        "node": ">=12.20"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/@storybook/telemetry/node_modules/unique-string": {
+      "version": "3.0.0",
+      "dev": true,
       "license": "MIT",
       "dependencies": {
-        "color-convert": "^2.0.1",
-        "color-string": "^1.9.0"
+        "crypto-random-string": "^4.0.0"
       },
       "engines": {
-        "node": ">=12.5.0"
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/color-convert": {
-      "version": "1.9.3",
+    "node_modules/@storybook/telemetry/node_modules/util": {
+      "version": "0.12.5",
+      "dev": true,
       "license": "MIT",
       "dependencies": {
-        "color-name": "1.1.3"
+        "inherits": "^2.0.3",
+        "is-arguments": "^1.0.4",
+        "is-generator-function": "^1.0.7",
+        "is-typed-array": "^1.1.3",
+        "which-typed-array": "^1.1.2"
       }
     },
-    "node_modules/color-name": {
-      "version": "1.1.3",
-      "license": "MIT"
-    },
-    "node_modules/color-string": {
-      "version": "1.9.1",
+    "node_modules/@storybook/theming": {
+      "version": "8.1.10",
+      "dev": true,
       "license": "MIT",
       "dependencies": {
-        "color-name": "^1.0.0",
-        "simple-swizzle": "^0.2.2"
-      }
-    },
-    "node_modules/color-support": {
-      "version": "1.1.3",
-      "license": "ISC",
-      "optional": true,
-      "bin": {
-        "color-support": "bin.js"
+        "@emotion/use-insertion-effect-with-fallbacks": "^1.0.1",
+        "@storybook/client-logger": "8.1.10",
+        "@storybook/global": "^5.0.0",
+        "memoizerific": "^1.11.3"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/storybook"
+      },
+      "peerDependencies": {
+        "react": "^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0-beta",
+        "react-dom": "^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0-beta"
+      },
+      "peerDependenciesMeta": {
+        "react": {
+          "optional": true
+        },
+        "react-dom": {
+          "optional": true
+        }
       }
     },
-    "node_modules/color/node_modules/color-convert": {
-      "version": "2.0.1",
+    "node_modules/@storybook/theming/node_modules/@storybook/client-logger": {
+      "version": "8.1.10",
+      "dev": true,
       "license": "MIT",
       "dependencies": {
-        "color-name": "~1.1.4"
+        "@storybook/global": "^5.0.0"
       },
-      "engines": {
-        "node": ">=7.0.0"
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/storybook"
       }
     },
-    "node_modules/color/node_modules/color-name": {
-      "version": "1.1.4",
-      "license": "MIT"
-    },
-    "node_modules/colorette": {
-      "version": "1.4.0",
-      "license": "MIT"
-    },
-    "node_modules/combined-stream": {
-      "version": "1.0.8",
+    "node_modules/@storybook/types": {
+      "version": "8.1.6",
+      "dev": true,
       "license": "MIT",
       "dependencies": {
-        "delayed-stream": "~1.0.0"
+        "@storybook/channels": "8.1.6",
+        "@types/express": "^4.7.0",
+        "file-system-cache": "2.3.0"
       },
-      "engines": {
-        "node": ">= 0.8"
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/storybook"
       }
     },
-    "node_modules/command-exists": {
-      "version": "1.2.9",
-      "license": "MIT"
-    },
-    "node_modules/commander": {
-      "version": "6.2.1",
+    "node_modules/@svgr/babel-plugin-add-jsx-attribute": {
+      "version": "6.5.1",
+      "dev": true,
       "license": "MIT",
       "engines": {
-        "node": ">= 6"
+        "node": ">=10"
+      },
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/gregberge"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
       }
     },
-    "node_modules/comment-parser": {
-      "version": "1.3.1",
+    "node_modules/@svgr/babel-plugin-remove-jsx-attribute": {
+      "version": "8.0.0",
       "dev": true,
       "license": "MIT",
       "engines": {
-        "node": ">= 12.0.0"
+        "node": ">=14"
+      },
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/gregberge"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
       }
     },
-    "node_modules/common-path-prefix": {
-      "version": "3.0.0",
-      "dev": true,
-      "license": "ISC"
-    },
-    "node_modules/commondir": {
-      "version": "1.0.1",
-      "license": "MIT"
-    },
-    "node_modules/compare-version": {
-      "version": "0.1.2",
+    "node_modules/@svgr/babel-plugin-remove-jsx-empty-expression": {
+      "version": "8.0.0",
       "dev": true,
       "license": "MIT",
       "engines": {
-        "node": ">=0.10.0"
+        "node": ">=14"
+      },
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/gregberge"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
       }
     },
-    "node_modules/complex.js": {
-      "version": "2.1.1",
+    "node_modules/@svgr/babel-plugin-replace-jsx-attribute-value": {
+      "version": "6.5.1",
       "dev": true,
       "license": "MIT",
       "engines": {
-        "node": "*"
+        "node": ">=10"
       },
       "funding": {
-        "type": "patreon",
-        "url": "https://www.patreon.com/infusion"
+        "type": "github",
+        "url": "https://github.com/sponsors/gregberge"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
       }
     },
-    "node_modules/component-emitter": {
-      "version": "1.3.0",
-      "license": "MIT",
-      "optional": true
-    },
-    "node_modules/component-type": {
-      "version": "1.2.2",
+    "node_modules/@svgr/babel-plugin-svg-dynamic-title": {
+      "version": "6.5.1",
+      "dev": true,
       "license": "MIT",
+      "engines": {
+        "node": ">=10"
+      },
       "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
+        "type": "github",
+        "url": "https://github.com/sponsors/gregberge"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
       }
     },
-    "node_modules/compress-commons": {
-      "version": "4.1.2",
+    "node_modules/@svgr/babel-plugin-svg-em-dimensions": {
+      "version": "6.5.1",
       "dev": true,
       "license": "MIT",
-      "peer": true,
-      "dependencies": {
-        "buffer-crc32": "^0.2.13",
-        "crc32-stream": "^4.0.2",
-        "normalize-path": "^3.0.0",
-        "readable-stream": "^3.6.0"
-      },
       "engines": {
-        "node": ">= 10"
+        "node": ">=10"
+      },
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/gregberge"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
       }
     },
-    "node_modules/compress-commons/node_modules/readable-stream": {
-      "version": "3.6.2",
+    "node_modules/@svgr/babel-plugin-transform-react-native-svg": {
+      "version": "6.5.1",
       "dev": true,
       "license": "MIT",
-      "peer": true,
-      "dependencies": {
-        "inherits": "^2.0.3",
-        "string_decoder": "^1.1.1",
-        "util-deprecate": "^1.0.1"
-      },
       "engines": {
-        "node": ">= 6"
-      }
-    },
-    "node_modules/compressible": {
-      "version": "2.0.18",
-      "license": "MIT",
-      "dependencies": {
-        "mime-db": ">= 1.43.0 < 2"
+        "node": ">=10"
       },
-      "engines": {
-        "node": ">= 0.6"
-      }
-    },
-    "node_modules/compression": {
-      "version": "1.7.4",
-      "license": "MIT",
-      "dependencies": {
-        "accepts": "~1.3.5",
-        "bytes": "3.0.0",
-        "compressible": "~2.0.16",
-        "debug": "2.6.9",
-        "on-headers": "~1.0.2",
-        "safe-buffer": "5.1.2",
-        "vary": "~1.1.2"
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/gregberge"
       },
-      "engines": {
-        "node": ">= 0.8.0"
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
       }
     },
-    "node_modules/compression/node_modules/debug": {
-      "version": "2.6.9",
+    "node_modules/@svgr/babel-plugin-transform-svg-component": {
+      "version": "6.5.1",
+      "dev": true,
       "license": "MIT",
-      "dependencies": {
-        "ms": "2.0.0"
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/gregberge"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
       }
     },
-    "node_modules/compression/node_modules/ms": {
-      "version": "2.0.0",
-      "license": "MIT"
-    },
-    "node_modules/concat-map": {
-      "version": "0.0.1",
-      "license": "MIT"
-    },
-    "node_modules/concurrently": {
-      "version": "8.2.2",
-      "resolved": "https://registry.npmjs.org/concurrently/-/concurrently-8.2.2.tgz",
-      "integrity": "sha512-1dP4gpXFhei8IOtlXRE/T/4H88ElHgTiUzh71YUmtjTEHMSRS2Z/fgOxHSxxusGHogsRfxNq1vyAwxSC+EVyDg==",
+    "node_modules/@svgr/babel-preset": {
+      "version": "6.5.1",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "chalk": "^4.1.2",
-        "date-fns": "^2.30.0",
-        "lodash": "^4.17.21",
-        "rxjs": "^7.8.1",
-        "shell-quote": "^1.8.1",
-        "spawn-command": "0.0.2",
-        "supports-color": "^8.1.1",
-        "tree-kill": "^1.2.2",
-        "yargs": "^17.7.2"
-      },
-      "bin": {
-        "conc": "dist/bin/concurrently.js",
-        "concurrently": "dist/bin/concurrently.js"
+        "@svgr/babel-plugin-add-jsx-attribute": "^6.5.1",
+        "@svgr/babel-plugin-remove-jsx-attribute": "*",
+        "@svgr/babel-plugin-remove-jsx-empty-expression": "*",
+        "@svgr/babel-plugin-replace-jsx-attribute-value": "^6.5.1",
+        "@svgr/babel-plugin-svg-dynamic-title": "^6.5.1",
+        "@svgr/babel-plugin-svg-em-dimensions": "^6.5.1",
+        "@svgr/babel-plugin-transform-react-native-svg": "^6.5.1",
+        "@svgr/babel-plugin-transform-svg-component": "^6.5.1"
       },
       "engines": {
-        "node": "^14.13.0 || >=16.0.0"
+        "node": ">=10"
       },
       "funding": {
-        "url": "https://github.com/open-cli-tools/concurrently?sponsor=1"
+        "type": "github",
+        "url": "https://github.com/sponsors/gregberge"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
       }
     },
-    "node_modules/concurrently/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==",
+    "node_modules/@svgr/core": {
+      "version": "6.5.1",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "color-convert": "^2.0.1"
+        "@babel/core": "^7.19.6",
+        "@svgr/babel-preset": "^6.5.1",
+        "@svgr/plugin-jsx": "^6.5.1",
+        "camelcase": "^6.2.0",
+        "cosmiconfig": "^7.0.1"
       },
       "engines": {
-        "node": ">=8"
+        "node": ">=10"
       },
       "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
+        "type": "github",
+        "url": "https://github.com/sponsors/gregberge"
       }
     },
-    "node_modules/concurrently/node_modules/chalk": {
-      "version": "4.1.2",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
-      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
+    "node_modules/@svgr/hast-util-to-babel-ast": {
+      "version": "6.5.1",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "ansi-styles": "^4.1.0",
-        "supports-color": "^7.1.0"
+        "@babel/types": "^7.20.0",
+        "entities": "^4.4.0"
       },
       "engines": {
         "node": ">=10"
       },
       "funding": {
-        "url": "https://github.com/chalk/chalk?sponsor=1"
+        "type": "github",
+        "url": "https://github.com/sponsors/gregberge"
       }
     },
-    "node_modules/concurrently/node_modules/chalk/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==",
+    "node_modules/@svgr/hast-util-to-babel-ast/node_modules/entities": {
+      "version": "4.5.0",
       "dev": true,
-      "dependencies": {
-        "has-flag": "^4.0.0"
-      },
+      "license": "BSD-2-Clause",
       "engines": {
-        "node": ">=8"
+        "node": ">=0.12"
+      },
+      "funding": {
+        "url": "https://github.com/fb55/entities?sponsor=1"
       }
     },
-    "node_modules/concurrently/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==",
+    "node_modules/@svgr/plugin-jsx": {
+      "version": "6.5.1",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "color-name": "~1.1.4"
+        "@babel/core": "^7.19.6",
+        "@svgr/babel-preset": "^6.5.1",
+        "@svgr/hast-util-to-babel-ast": "^6.5.1",
+        "svg-parser": "^2.0.4"
       },
       "engines": {
-        "node": ">=7.0.0"
+        "node": ">=10"
+      },
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/gregberge"
+      },
+      "peerDependencies": {
+        "@svgr/core": "^6.0.0"
       }
     },
-    "node_modules/concurrently/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/concurrently/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==",
+    "node_modules/@svgr/plugin-svgo": {
+      "version": "6.5.1",
       "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "cosmiconfig": "^7.0.1",
+        "deepmerge": "^4.2.2",
+        "svgo": "^2.8.0"
+      },
       "engines": {
-        "node": ">=8"
+        "node": ">=10"
+      },
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/gregberge"
+      },
+      "peerDependencies": {
+        "@svgr/core": "*"
       }
     },
-    "node_modules/concurrently/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==",
+    "node_modules/@svgr/webpack": {
+      "version": "6.5.1",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "has-flag": "^4.0.0"
+        "@babel/core": "^7.19.6",
+        "@babel/plugin-transform-react-constant-elements": "^7.18.12",
+        "@babel/preset-env": "^7.19.4",
+        "@babel/preset-react": "^7.18.6",
+        "@babel/preset-typescript": "^7.18.6",
+        "@svgr/core": "^6.5.1",
+        "@svgr/plugin-jsx": "^6.5.1",
+        "@svgr/plugin-svgo": "^6.5.1"
       },
       "engines": {
         "node": ">=10"
       },
       "funding": {
-        "url": "https://github.com/chalk/supports-color?sponsor=1"
+        "type": "github",
+        "url": "https://github.com/sponsors/gregberge"
       }
     },
-    "node_modules/config-file-ts": {
-      "version": "0.2.6",
+    "node_modules/@szmarczak/http-timer": {
+      "version": "4.0.6",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "glob": "^10.3.10",
-        "typescript": "^5.3.3"
+        "defer-to-connect": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=10"
       }
     },
-    "node_modules/config-file-ts/node_modules/brace-expansion": {
-      "version": "2.0.1",
+    "node_modules/@testing-library/jest-native": {
+      "version": "5.4.1",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "balanced-match": "^1.0.0"
+        "chalk": "^4.1.2",
+        "jest-diff": "^29.0.1",
+        "jest-matcher-utils": "^29.0.1",
+        "pretty-format": "^29.0.3",
+        "redent": "^3.0.0"
+      },
+      "peerDependencies": {
+        "react": ">=16.0.0",
+        "react-native": ">=0.59",
+        "react-test-renderer": ">=16.0.0"
       }
     },
-    "node_modules/config-file-ts/node_modules/glob": {
-      "version": "10.3.10",
+    "node_modules/@testing-library/jest-native/node_modules/ansi-styles": {
+      "version": "4.3.0",
       "dev": true,
-      "license": "ISC",
+      "license": "MIT",
       "dependencies": {
-        "foreground-child": "^3.1.0",
-        "jackspeak": "^2.3.5",
-        "minimatch": "^9.0.1",
-        "minipass": "^5.0.0 || ^6.0.2 || ^7.0.0",
-        "path-scurry": "^1.10.1"
-      },
-      "bin": {
-        "glob": "dist/esm/bin.mjs"
+        "color-convert": "^2.0.1"
       },
       "engines": {
-        "node": ">=16 || 14 >=14.17"
+        "node": ">=8"
       },
       "funding": {
-        "url": "https://github.com/sponsors/isaacs"
+        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
       }
     },
-    "node_modules/config-file-ts/node_modules/minimatch": {
-      "version": "9.0.3",
+    "node_modules/@testing-library/jest-native/node_modules/chalk": {
+      "version": "4.1.2",
       "dev": true,
-      "license": "ISC",
+      "license": "MIT",
       "dependencies": {
-        "brace-expansion": "^2.0.1"
+        "ansi-styles": "^4.1.0",
+        "supports-color": "^7.1.0"
       },
       "engines": {
-        "node": ">=16 || 14 >=14.17"
+        "node": ">=10"
       },
       "funding": {
-        "url": "https://github.com/sponsors/isaacs"
+        "url": "https://github.com/chalk/chalk?sponsor=1"
       }
     },
-    "node_modules/config-file-ts/node_modules/minipass": {
-      "version": "7.0.4",
+    "node_modules/@testing-library/jest-native/node_modules/color-convert": {
+      "version": "2.0.1",
       "dev": true,
-      "license": "ISC",
+      "license": "MIT",
+      "dependencies": {
+        "color-name": "~1.1.4"
+      },
       "engines": {
-        "node": ">=16 || 14 >=14.17"
+        "node": ">=7.0.0"
       }
     },
-    "node_modules/confusing-browser-globals": {
-      "version": "1.0.11",
+    "node_modules/@testing-library/jest-native/node_modules/color-name": {
+      "version": "1.1.4",
       "dev": true,
       "license": "MIT"
     },
-    "node_modules/connect": {
-      "version": "3.7.0",
+    "node_modules/@testing-library/jest-native/node_modules/has-flag": {
+      "version": "4.0.0",
+      "dev": true,
       "license": "MIT",
-      "dependencies": {
-        "debug": "2.6.9",
-        "finalhandler": "1.1.2",
-        "parseurl": "~1.3.3",
-        "utils-merge": "1.0.1"
-      },
       "engines": {
-        "node": ">= 0.10.0"
+        "node": ">=8"
       }
     },
-    "node_modules/connect-history-api-fallback": {
-      "version": "2.0.0",
+    "node_modules/@testing-library/jest-native/node_modules/supports-color": {
+      "version": "7.2.0",
       "dev": true,
       "license": "MIT",
+      "dependencies": {
+        "has-flag": "^4.0.0"
+      },
       "engines": {
-        "node": ">=0.8"
+        "node": ">=8"
       }
     },
-    "node_modules/connect/node_modules/debug": {
-      "version": "2.6.9",
+    "node_modules/@testing-library/react-native": {
+      "version": "11.5.1",
+      "dev": true,
       "license": "MIT",
       "dependencies": {
-        "ms": "2.0.0"
+        "pretty-format": "^29.4.0"
+      },
+      "peerDependencies": {
+        "jest": ">=28.0.0",
+        "react": ">=16.8.0",
+        "react-native": ">=0.59",
+        "react-test-renderer": ">=16.8.0"
+      },
+      "peerDependenciesMeta": {
+        "jest": {
+          "optional": true
+        }
       }
     },
-    "node_modules/connect/node_modules/finalhandler": {
-      "version": "1.1.2",
+    "node_modules/@tootallnate/once": {
+      "version": "2.0.0",
       "license": "MIT",
-      "dependencies": {
-        "debug": "2.6.9",
-        "encodeurl": "~1.0.2",
-        "escape-html": "~1.0.3",
-        "on-finished": "~2.3.0",
-        "parseurl": "~1.3.3",
-        "statuses": "~1.5.0",
-        "unpipe": "~1.0.0"
-      },
       "engines": {
-        "node": ">= 0.8"
+        "node": ">= 10"
       }
     },
-    "node_modules/connect/node_modules/ms": {
-      "version": "2.0.0",
-      "license": "MIT"
+    "node_modules/@trivago/prettier-plugin-sort-imports": {
+      "version": "4.2.1",
+      "dev": true,
+      "license": "Apache-2.0",
+      "dependencies": {
+        "@babel/generator": "7.17.7",
+        "@babel/parser": "^7.20.5",
+        "@babel/traverse": "7.23.2",
+        "@babel/types": "7.17.0",
+        "javascript-natural-sort": "0.7.1",
+        "lodash": "^4.17.21"
+      },
+      "peerDependencies": {
+        "@vue/compiler-sfc": "3.x",
+        "prettier": "2.x - 3.x"
+      },
+      "peerDependenciesMeta": {
+        "@vue/compiler-sfc": {
+          "optional": true
+        }
+      }
     },
-    "node_modules/connect/node_modules/on-finished": {
-      "version": "2.3.0",
+    "node_modules/@trivago/prettier-plugin-sort-imports/node_modules/@babel/generator": {
+      "version": "7.17.7",
+      "dev": true,
       "license": "MIT",
       "dependencies": {
-        "ee-first": "1.1.1"
+        "@babel/types": "^7.17.0",
+        "jsesc": "^2.5.1",
+        "source-map": "^0.5.0"
       },
       "engines": {
-        "node": ">= 0.8"
+        "node": ">=6.9.0"
       }
     },
-    "node_modules/connect/node_modules/statuses": {
-      "version": "1.5.0",
+    "node_modules/@trivago/prettier-plugin-sort-imports/node_modules/@babel/types": {
+      "version": "7.17.0",
+      "dev": true,
       "license": "MIT",
+      "dependencies": {
+        "@babel/helper-validator-identifier": "^7.16.7",
+        "to-fast-properties": "^2.0.0"
+      },
       "engines": {
-        "node": ">= 0.6"
+        "node": ">=6.9.0"
       }
     },
-    "node_modules/consola": {
-      "version": "3.2.3",
-      "resolved": "https://registry.npmjs.org/consola/-/consola-3.2.3.tgz",
-      "integrity": "sha512-I5qxpzLv+sJhTVEoLYNcTW+bThDCPsit0vLNKShZx6rLtpilNpmmeTPaeqJb9ZE9dV3DGaeby6Vuhrw38WjeyQ==",
+    "node_modules/@trivago/prettier-plugin-sort-imports/node_modules/source-map": {
+      "version": "0.5.7",
+      "dev": true,
+      "license": "BSD-3-Clause",
       "engines": {
-        "node": "^14.18.0 || >=16.10.0"
+        "node": ">=0.10.0"
       }
     },
-    "node_modules/console-browserify": {
-      "version": "1.2.0"
-    },
-    "node_modules/console-control-strings": {
-      "version": "1.1.0",
+    "node_modules/@trysound/sax": {
+      "version": "0.2.0",
+      "dev": true,
       "license": "ISC",
-      "optional": true
-    },
-    "node_modules/constants-browserify": {
-      "version": "1.0.0",
-      "license": "MIT"
-    },
-    "node_modules/content-disposition": {
-      "version": "0.5.4",
-      "license": "MIT",
-      "dependencies": {
-        "safe-buffer": "5.2.1"
-      },
       "engines": {
-        "node": ">= 0.6"
+        "node": ">=10.13.0"
       }
     },
-    "node_modules/content-disposition/node_modules/safe-buffer": {
-      "version": "5.2.1",
-      "funding": [
-        {
-          "type": "github",
-          "url": "https://github.com/sponsors/feross"
-        },
-        {
-          "type": "patreon",
-          "url": "https://www.patreon.com/feross"
-        },
-        {
-          "type": "consulting",
-          "url": "https://feross.org/support"
-        }
-      ],
+    "node_modules/@tsconfig/node10": {
+      "version": "1.0.9",
+      "devOptional": true,
       "license": "MIT"
     },
-    "node_modules/content-type": {
-      "version": "1.0.5",
-      "license": "MIT",
-      "engines": {
-        "node": ">= 0.6"
-      }
-    },
-    "node_modules/convert-source-map": {
-      "version": "1.9.0",
+    "node_modules/@tsconfig/node12": {
+      "version": "1.0.11",
+      "devOptional": true,
       "license": "MIT"
     },
-    "node_modules/cookie": {
-      "version": "0.5.0",
-      "license": "MIT",
-      "engines": {
-        "node": ">= 0.6"
-      }
+    "node_modules/@tsconfig/node14": {
+      "version": "1.0.3",
+      "devOptional": true,
+      "license": "MIT"
     },
-    "node_modules/cookie-signature": {
-      "version": "1.0.6",
+    "node_modules/@tsconfig/node16": {
+      "version": "1.0.4",
+      "devOptional": true,
       "license": "MIT"
     },
-    "node_modules/copy-descriptor": {
-      "version": "0.1.1",
+    "node_modules/@turf/along": {
+      "version": "6.5.0",
       "license": "MIT",
-      "optional": true,
-      "engines": {
-        "node": ">=0.10.0"
+      "dependencies": {
+        "@turf/bearing": "^6.5.0",
+        "@turf/destination": "^6.5.0",
+        "@turf/distance": "^6.5.0",
+        "@turf/helpers": "^6.5.0",
+        "@turf/invariant": "^6.5.0"
+      },
+      "funding": {
+        "url": "https://opencollective.com/turf"
       }
     },
-    "node_modules/copy-webpack-plugin": {
-      "version": "10.2.4",
-      "dev": true,
+    "node_modules/@turf/bbox": {
+      "version": "6.5.0",
       "license": "MIT",
       "dependencies": {
-        "fast-glob": "^3.2.7",
-        "glob-parent": "^6.0.1",
-        "globby": "^12.0.2",
-        "normalize-path": "^3.0.0",
-        "schema-utils": "^4.0.0",
-        "serialize-javascript": "^6.0.0"
-      },
-      "engines": {
-        "node": ">= 12.20.0"
+        "@turf/helpers": "^6.5.0",
+        "@turf/meta": "^6.5.0"
       },
       "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/webpack"
-      },
-      "peerDependencies": {
-        "webpack": "^5.1.0"
+        "url": "https://opencollective.com/turf"
       }
     },
-    "node_modules/copy-webpack-plugin/node_modules/ajv-keywords": {
-      "version": "5.1.0",
-      "dev": true,
+    "node_modules/@turf/bearing": {
+      "version": "6.5.0",
       "license": "MIT",
       "dependencies": {
-        "fast-deep-equal": "^3.1.3"
+        "@turf/helpers": "^6.5.0",
+        "@turf/invariant": "^6.5.0"
       },
-      "peerDependencies": {
-        "ajv": "^8.8.2"
+      "funding": {
+        "url": "https://opencollective.com/turf"
       }
     },
-    "node_modules/copy-webpack-plugin/node_modules/array-union": {
-      "version": "3.0.1",
-      "dev": true,
+    "node_modules/@turf/destination": {
+      "version": "6.5.0",
       "license": "MIT",
-      "engines": {
-        "node": ">=12"
+      "dependencies": {
+        "@turf/helpers": "^6.5.0",
+        "@turf/invariant": "^6.5.0"
       },
       "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
+        "url": "https://opencollective.com/turf"
       }
     },
-    "node_modules/copy-webpack-plugin/node_modules/glob-parent": {
-      "version": "6.0.2",
-      "dev": true,
-      "license": "ISC",
+    "node_modules/@turf/distance": {
+      "version": "6.5.0",
+      "license": "MIT",
       "dependencies": {
-        "is-glob": "^4.0.3"
+        "@turf/helpers": "^6.5.0",
+        "@turf/invariant": "^6.5.0"
       },
-      "engines": {
-        "node": ">=10.13.0"
+      "funding": {
+        "url": "https://opencollective.com/turf"
       }
     },
-    "node_modules/copy-webpack-plugin/node_modules/globby": {
-      "version": "12.2.0",
-      "dev": true,
+    "node_modules/@turf/helpers": {
+      "version": "6.5.0",
+      "license": "MIT",
+      "funding": {
+        "url": "https://opencollective.com/turf"
+      }
+    },
+    "node_modules/@turf/invariant": {
+      "version": "6.5.0",
       "license": "MIT",
       "dependencies": {
-        "array-union": "^3.0.1",
-        "dir-glob": "^3.0.1",
-        "fast-glob": "^3.2.7",
-        "ignore": "^5.1.9",
-        "merge2": "^1.4.1",
-        "slash": "^4.0.0"
-      },
-      "engines": {
-        "node": "^12.20.0 || ^14.13.1 || >=16.0.0"
+        "@turf/helpers": "^6.5.0"
       },
       "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
+        "url": "https://opencollective.com/turf"
       }
     },
-    "node_modules/copy-webpack-plugin/node_modules/schema-utils": {
-      "version": "4.2.0",
-      "dev": true,
+    "node_modules/@turf/length": {
+      "version": "6.5.0",
       "license": "MIT",
       "dependencies": {
-        "@types/json-schema": "^7.0.9",
-        "ajv": "^8.9.0",
-        "ajv-formats": "^2.1.1",
-        "ajv-keywords": "^5.1.0"
+        "@turf/distance": "^6.5.0",
+        "@turf/helpers": "^6.5.0",
+        "@turf/meta": "^6.5.0"
       },
-      "engines": {
-        "node": ">= 12.13.0"
+      "funding": {
+        "url": "https://opencollective.com/turf"
+      }
+    },
+    "node_modules/@turf/line-intersect": {
+      "version": "6.5.0",
+      "license": "MIT",
+      "dependencies": {
+        "@turf/helpers": "^6.5.0",
+        "@turf/invariant": "^6.5.0",
+        "@turf/line-segment": "^6.5.0",
+        "@turf/meta": "^6.5.0",
+        "geojson-rbush": "3.x"
       },
       "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/webpack"
+        "url": "https://opencollective.com/turf"
       }
     },
-    "node_modules/copy-webpack-plugin/node_modules/slash": {
-      "version": "4.0.0",
-      "dev": true,
+    "node_modules/@turf/line-segment": {
+      "version": "6.5.0",
       "license": "MIT",
-      "engines": {
-        "node": ">=12"
+      "dependencies": {
+        "@turf/helpers": "^6.5.0",
+        "@turf/invariant": "^6.5.0",
+        "@turf/meta": "^6.5.0"
       },
       "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
+        "url": "https://opencollective.com/turf"
       }
     },
-    "node_modules/core-js": {
-      "version": "3.32.1",
-      "hasInstallScript": true,
+    "node_modules/@turf/meta": {
+      "version": "6.5.0",
       "license": "MIT",
+      "dependencies": {
+        "@turf/helpers": "^6.5.0"
+      },
       "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/core-js"
+        "url": "https://opencollective.com/turf"
       }
     },
-    "node_modules/core-js-compat": {
-      "version": "3.36.1",
-      "resolved": "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.36.1.tgz",
-      "integrity": "sha512-Dk997v9ZCt3X/npqzyGdTlq6t7lDBhZwGvV94PKzDArjp7BTRm7WlDAXYd/OWdeFHO8OChQYRJNJvUCqCbrtKA==",
+    "node_modules/@turf/nearest-point-on-line": {
+      "version": "6.5.0",
+      "license": "MIT",
       "dependencies": {
-        "browserslist": "^4.23.0"
+        "@turf/bearing": "^6.5.0",
+        "@turf/destination": "^6.5.0",
+        "@turf/distance": "^6.5.0",
+        "@turf/helpers": "^6.5.0",
+        "@turf/invariant": "^6.5.0",
+        "@turf/line-intersect": "^6.5.0",
+        "@turf/meta": "^6.5.0"
       },
       "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/core-js"
+        "url": "https://opencollective.com/turf"
       }
     },
-    "node_modules/core-util-is": {
+    "node_modules/@types/babel__core": {
+      "version": "7.20.5",
+      "license": "MIT",
+      "dependencies": {
+        "@babel/parser": "^7.20.7",
+        "@babel/types": "^7.20.7",
+        "@types/babel__generator": "*",
+        "@types/babel__template": "*",
+        "@types/babel__traverse": "*"
+      }
+    },
+    "node_modules/@types/babel__generator": {
+      "version": "7.6.4",
+      "license": "MIT",
+      "dependencies": {
+        "@babel/types": "^7.0.0"
+      }
+    },
+    "node_modules/@types/babel__template": {
+      "version": "7.4.1",
+      "license": "MIT",
+      "dependencies": {
+        "@babel/parser": "^7.1.0",
+        "@babel/types": "^7.0.0"
+      }
+    },
+    "node_modules/@types/babel__traverse": {
+      "version": "7.18.0",
+      "license": "MIT",
+      "dependencies": {
+        "@babel/types": "^7.3.0"
+      }
+    },
+    "node_modules/@types/base-64": {
       "version": "1.0.2",
+      "dev": true,
       "license": "MIT"
     },
-    "node_modules/cosmiconfig": {
-      "version": "7.1.0",
+    "node_modules/@types/body-parser": {
+      "version": "1.19.2",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@types/parse-json": "^4.0.0",
-        "import-fresh": "^3.2.1",
-        "parse-json": "^5.0.0",
-        "path-type": "^4.0.0",
-        "yaml": "^1.10.0"
-      },
-      "engines": {
-        "node": ">=10"
+        "@types/connect": "*",
+        "@types/node": "*"
       }
     },
-    "node_modules/cosmiconfig/node_modules/yaml": {
-      "version": "1.10.2",
+    "node_modules/@types/bonjour": {
+      "version": "3.5.13",
       "dev": true,
-      "license": "ISC",
-      "engines": {
-        "node": ">= 6"
+      "license": "MIT",
+      "dependencies": {
+        "@types/node": "*"
       }
     },
-    "node_modules/crc": {
-      "version": "3.8.0",
+    "node_modules/@types/cacheable-request": {
+      "version": "6.0.3",
       "dev": true,
       "license": "MIT",
-      "optional": true,
       "dependencies": {
-        "buffer": "^5.1.0"
+        "@types/http-cache-semantics": "*",
+        "@types/keyv": "^3.1.4",
+        "@types/node": "*",
+        "@types/responselike": "^1.0.0"
       }
     },
-    "node_modules/crc-32": {
+    "node_modules/@types/canvas-size": {
       "version": "1.2.2",
       "dev": true,
-      "license": "Apache-2.0",
-      "peer": true,
-      "bin": {
-        "crc32": "bin/crc32.njs"
-      },
-      "engines": {
-        "node": ">=0.8"
+      "license": "MIT"
+    },
+    "node_modules/@types/concurrently": {
+      "version": "7.0.0",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "concurrently": "*"
       }
     },
-    "node_modules/crc32-stream": {
-      "version": "4.0.3",
+    "node_modules/@types/connect": {
+      "version": "3.4.35",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "dependencies": {
-        "crc-32": "^1.2.0",
-        "readable-stream": "^3.4.0"
-      },
-      "engines": {
-        "node": ">= 10"
+        "@types/node": "*"
       }
     },
-    "node_modules/crc32-stream/node_modules/readable-stream": {
-      "version": "3.6.2",
+    "node_modules/@types/connect-history-api-fallback": {
+      "version": "1.5.4",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "dependencies": {
-        "inherits": "^2.0.3",
-        "string_decoder": "^1.1.1",
-        "util-deprecate": "^1.0.1"
-      },
-      "engines": {
-        "node": ">= 6"
+        "@types/express-serve-static-core": "*",
+        "@types/node": "*"
       }
     },
-    "node_modules/create-ecdh": {
-      "version": "4.0.4",
+    "node_modules/@types/cross-spawn": {
+      "version": "6.0.6",
+      "dev": true,
       "license": "MIT",
       "dependencies": {
-        "bn.js": "^4.1.0",
-        "elliptic": "^6.5.3"
+        "@types/node": "*"
       }
     },
-    "node_modules/create-ecdh/node_modules/bn.js": {
-      "version": "4.12.0",
+    "node_modules/@types/debug": {
+      "version": "4.1.12",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@types/ms": "*"
+      }
+    },
+    "node_modules/@types/detect-port": {
+      "version": "1.3.5",
+      "dev": true,
       "license": "MIT"
     },
-    "node_modules/create-hash": {
-      "version": "1.2.0",
+    "node_modules/@types/diff": {
+      "version": "5.2.1",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/@types/doctrine": {
+      "version": "0.0.3",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/@types/ejs": {
+      "version": "3.1.5",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/@types/emscripten": {
+      "version": "1.39.10",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/@types/escodegen": {
+      "version": "0.0.6",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/@types/eslint": {
+      "version": "8.4.6",
       "license": "MIT",
       "dependencies": {
-        "cipher-base": "^1.0.1",
-        "inherits": "^2.0.1",
-        "md5.js": "^1.3.4",
-        "ripemd160": "^2.0.1",
-        "sha.js": "^2.4.0"
+        "@types/estree": "*",
+        "@types/json-schema": "*"
       }
     },
-    "node_modules/create-hmac": {
-      "version": "1.1.7",
+    "node_modules/@types/eslint-scope": {
+      "version": "3.7.4",
       "license": "MIT",
       "dependencies": {
-        "cipher-base": "^1.0.3",
-        "create-hash": "^1.1.0",
-        "inherits": "^2.0.1",
-        "ripemd160": "^2.0.0",
-        "safe-buffer": "^5.0.1",
-        "sha.js": "^2.4.8"
+        "@types/eslint": "*",
+        "@types/estree": "*"
       }
     },
-    "node_modules/create-require": {
-      "version": "1.1.1",
-      "devOptional": true,
+    "node_modules/@types/estree": {
+      "version": "0.0.51",
       "license": "MIT"
     },
-    "node_modules/cross-fetch": {
-      "version": "3.1.5",
+    "node_modules/@types/express": {
+      "version": "4.17.21",
+      "dev": true,
       "license": "MIT",
       "dependencies": {
-        "node-fetch": "2.6.7"
+        "@types/body-parser": "*",
+        "@types/express-serve-static-core": "^4.17.33",
+        "@types/qs": "*",
+        "@types/serve-static": "*"
       }
     },
-    "node_modules/cross-spawn": {
-      "version": "7.0.3",
+    "node_modules/@types/express-serve-static-core": {
+      "version": "4.19.0",
+      "dev": true,
       "license": "MIT",
       "dependencies": {
-        "path-key": "^3.1.0",
-        "shebang-command": "^2.0.0",
-        "which": "^2.0.1"
-      },
-      "engines": {
-        "node": ">= 8"
+        "@types/node": "*",
+        "@types/qs": "*",
+        "@types/range-parser": "*",
+        "@types/send": "*"
       }
     },
-    "node_modules/crypt": {
-      "version": "0.0.2",
-      "license": "BSD-3-Clause",
-      "engines": {
-        "node": "*"
+    "node_modules/@types/fs-extra": {
+      "version": "9.0.13",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@types/node": "*"
       }
     },
-    "node_modules/crypto-browserify": {
-      "version": "3.12.0",
+    "node_modules/@types/geojson": {
+      "version": "7946.0.8",
+      "license": "MIT"
+    },
+    "node_modules/@types/glob": {
+      "version": "7.2.0",
+      "dev": true,
       "license": "MIT",
       "dependencies": {
-        "browserify-cipher": "^1.0.0",
-        "browserify-sign": "^4.0.0",
-        "create-ecdh": "^4.0.0",
-        "create-hash": "^1.1.0",
-        "create-hmac": "^1.1.0",
-        "diffie-hellman": "^5.0.0",
-        "inherits": "^2.0.1",
-        "pbkdf2": "^3.0.3",
-        "public-encrypt": "^4.0.0",
-        "randombytes": "^2.0.0",
-        "randomfill": "^1.0.3"
-      },
-      "engines": {
-        "node": "*"
+        "@types/minimatch": "*",
+        "@types/node": "*"
       }
     },
-    "node_modules/crypto-js": {
-      "version": "4.2.0",
+    "node_modules/@types/graceful-fs": {
+      "version": "4.1.9",
+      "license": "MIT",
+      "dependencies": {
+        "@types/node": "*"
+      }
+    },
+    "node_modules/@types/hammerjs": {
+      "version": "2.0.41",
       "license": "MIT"
     },
-    "node_modules/crypto-random-string": {
-      "version": "2.0.0",
+    "node_modules/@types/hast": {
+      "version": "3.0.4",
+      "dev": true,
       "license": "MIT",
-      "engines": {
-        "node": ">=8"
+      "dependencies": {
+        "@types/unist": "*"
       }
     },
-    "node_modules/css-box-model": {
-      "version": "1.2.1",
+    "node_modules/@types/hoist-non-react-statics": {
+      "version": "3.3.2",
       "license": "MIT",
       "dependencies": {
-        "tiny-invariant": "^1.0.6"
+        "@types/react": "*",
+        "hoist-non-react-statics": "^3.3.0"
       }
     },
-    "node_modules/css-color-keywords": {
-      "version": "1.0.0",
-      "license": "ISC",
-      "engines": {
-        "node": ">=4"
+    "node_modules/@types/html-minifier-terser": {
+      "version": "6.1.0",
+      "license": "MIT"
+    },
+    "node_modules/@types/http-cache-semantics": {
+      "version": "4.0.1",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/@types/http-errors": {
+      "version": "2.0.4",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/@types/http-proxy": {
+      "version": "1.17.9",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@types/node": "*"
       }
     },
-    "node_modules/css-in-js-utils": {
-      "version": "2.0.1",
+    "node_modules/@types/istanbul-lib-coverage": {
+      "version": "2.0.4",
+      "license": "MIT"
+    },
+    "node_modules/@types/istanbul-lib-report": {
+      "version": "3.0.0",
       "license": "MIT",
       "dependencies": {
-        "hyphenate-style-name": "^1.0.2",
-        "isobject": "^3.0.1"
+        "@types/istanbul-lib-coverage": "*"
       }
     },
-    "node_modules/css-line-break": {
-      "version": "2.1.0",
+    "node_modules/@types/istanbul-reports": {
+      "version": "3.0.1",
       "license": "MIT",
       "dependencies": {
-        "utrie": "^1.0.2"
+        "@types/istanbul-lib-report": "*"
       }
     },
-    "node_modules/css-loader": {
-      "version": "6.8.1",
+    "node_modules/@types/jest": {
+      "version": "29.5.2",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "icss-utils": "^5.1.0",
-        "postcss": "^8.4.21",
-        "postcss-modules-extract-imports": "^3.0.0",
-        "postcss-modules-local-by-default": "^4.0.3",
-        "postcss-modules-scope": "^3.0.0",
-        "postcss-modules-values": "^4.0.0",
-        "postcss-value-parser": "^4.2.0",
-        "semver": "^7.3.8"
-      },
-      "engines": {
-        "node": ">= 12.13.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/webpack"
-      },
-      "peerDependencies": {
-        "webpack": "^5.0.0"
+        "expect": "^29.0.0",
+        "pretty-format": "^29.0.0"
       }
     },
-    "node_modules/css-loader/node_modules/icss-utils": {
-      "version": "5.1.0",
+    "node_modules/@types/jest-when": {
+      "version": "3.5.2",
       "dev": true,
-      "license": "ISC",
-      "engines": {
-        "node": "^10 || ^12 || >= 14"
-      },
-      "peerDependencies": {
-        "postcss": "^8.1.0"
+      "license": "MIT",
+      "dependencies": {
+        "@types/jest": "*"
       }
     },
-    "node_modules/css-loader/node_modules/postcss": {
-      "version": "8.4.28",
+    "node_modules/@types/js-yaml": {
+      "version": "4.0.5",
       "dev": true,
-      "funding": [
-        {
-          "type": "opencollective",
-          "url": "https://opencollective.com/postcss/"
-        },
-        {
-          "type": "tidelift",
-          "url": "https://tidelift.com/funding/github/npm/postcss"
-        },
-        {
-          "type": "github",
-          "url": "https://github.com/sponsors/ai"
-        }
-      ],
+      "license": "MIT"
+    },
+    "node_modules/@types/jsdom": {
+      "version": "20.0.1",
       "license": "MIT",
       "dependencies": {
-        "nanoid": "^3.3.6",
-        "picocolors": "^1.0.0",
-        "source-map-js": "^1.0.2"
-      },
-      "engines": {
-        "node": "^10 || ^12 || >=14"
+        "@types/node": "*",
+        "@types/tough-cookie": "*",
+        "parse5": "^7.0.0"
       }
     },
-    "node_modules/css-loader/node_modules/postcss-modules-extract-imports": {
-      "version": "3.0.0",
-      "dev": true,
-      "license": "ISC",
+    "node_modules/@types/jsdom/node_modules/entities": {
+      "version": "4.5.0",
+      "license": "BSD-2-Clause",
       "engines": {
-        "node": "^10 || ^12 || >= 14"
+        "node": ">=0.12"
       },
-      "peerDependencies": {
-        "postcss": "^8.1.0"
+      "funding": {
+        "url": "https://github.com/fb55/entities?sponsor=1"
       }
     },
-    "node_modules/css-loader/node_modules/postcss-modules-local-by-default": {
-      "version": "4.0.3",
-      "dev": true,
+    "node_modules/@types/jsdom/node_modules/parse5": {
+      "version": "7.1.2",
       "license": "MIT",
       "dependencies": {
-        "icss-utils": "^5.0.0",
-        "postcss-selector-parser": "^6.0.2",
-        "postcss-value-parser": "^4.1.0"
-      },
-      "engines": {
-        "node": "^10 || ^12 || >= 14"
+        "entities": "^4.4.0"
       },
-      "peerDependencies": {
-        "postcss": "^8.1.0"
+      "funding": {
+        "url": "https://github.com/inikulin/parse5?sponsor=1"
       }
     },
-    "node_modules/css-loader/node_modules/postcss-modules-scope": {
-      "version": "3.0.0",
+    "node_modules/@types/json-schema": {
+      "version": "7.0.12",
+      "license": "MIT"
+    },
+    "node_modules/@types/json5": {
+      "version": "0.0.29",
       "dev": true,
-      "license": "ISC",
-      "dependencies": {
-        "postcss-selector-parser": "^6.0.4"
-      },
-      "engines": {
-        "node": "^10 || ^12 || >= 14"
-      },
-      "peerDependencies": {
-        "postcss": "^8.1.0"
-      }
+      "license": "MIT"
     },
-    "node_modules/css-loader/node_modules/postcss-modules-values": {
-      "version": "4.0.0",
+    "node_modules/@types/keyv": {
+      "version": "3.1.4",
       "dev": true,
-      "license": "ISC",
+      "license": "MIT",
       "dependencies": {
-        "icss-utils": "^5.0.0"
-      },
-      "engines": {
-        "node": "^10 || ^12 || >= 14"
-      },
-      "peerDependencies": {
-        "postcss": "^8.1.0"
+        "@types/node": "*"
       }
     },
-    "node_modules/css-select": {
-      "version": "5.1.0",
-      "license": "BSD-2-Clause",
-      "dependencies": {
-        "boolbase": "^1.0.0",
-        "css-what": "^6.1.0",
-        "domhandler": "^5.0.2",
-        "domutils": "^3.0.1",
-        "nth-check": "^2.0.1"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/fb55"
-      }
+    "node_modules/@types/lodash": {
+      "version": "4.14.195",
+      "dev": true,
+      "license": "MIT"
     },
-    "node_modules/css-select/node_modules/dom-serializer": {
-      "version": "2.0.0",
+    "node_modules/@types/mapbox-gl": {
+      "version": "2.7.13",
       "license": "MIT",
       "dependencies": {
-        "domelementtype": "^2.3.0",
-        "domhandler": "^5.0.2",
-        "entities": "^4.2.0"
-      },
-      "funding": {
-        "url": "https://github.com/cheeriojs/dom-serializer?sponsor=1"
+        "@types/geojson": "*"
       }
     },
-    "node_modules/css-select/node_modules/domhandler": {
-      "version": "5.0.3",
-      "license": "BSD-2-Clause",
-      "dependencies": {
-        "domelementtype": "^2.3.0"
-      },
-      "engines": {
-        "node": ">= 4"
-      },
-      "funding": {
-        "url": "https://github.com/fb55/domhandler?sponsor=1"
-      }
+    "node_modules/@types/mdx": {
+      "version": "2.0.13",
+      "dev": true,
+      "license": "MIT"
     },
-    "node_modules/css-select/node_modules/domutils": {
-      "version": "3.1.0",
-      "license": "BSD-2-Clause",
-      "dependencies": {
-        "dom-serializer": "^2.0.0",
-        "domelementtype": "^2.3.0",
-        "domhandler": "^5.0.3"
-      },
-      "funding": {
-        "url": "https://github.com/fb55/domutils?sponsor=1"
-      }
+    "node_modules/@types/mime": {
+      "version": "1.3.5",
+      "dev": true,
+      "license": "MIT"
     },
-    "node_modules/css-select/node_modules/entities": {
-      "version": "4.5.0",
-      "license": "BSD-2-Clause",
-      "engines": {
-        "node": ">=0.12"
-      },
-      "funding": {
-        "url": "https://github.com/fb55/entities?sponsor=1"
-      }
+    "node_modules/@types/mime-db": {
+      "version": "1.43.5",
+      "resolved": "https://registry.npmjs.org/@types/mime-db/-/mime-db-1.43.5.tgz",
+      "integrity": "sha512-/bfTiIUTNPUBnwnYvUxXAre5MhD88jgagLEQiQtIASjU+bwxd8kS/ASDA4a8ufd8m0Lheu6eeMJHEUpLHoJ28A=="
     },
-    "node_modules/css-to-react-native": {
-      "version": "3.0.0",
+    "node_modules/@types/minimatch": {
+      "version": "3.0.5",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/@types/ms": {
+      "version": "0.7.34",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/@types/node": {
+      "version": "20.11.5",
       "license": "MIT",
       "dependencies": {
-        "camelize": "^1.0.0",
-        "css-color-keywords": "^1.0.0",
-        "postcss-value-parser": "^4.0.2"
+        "undici-types": "~5.26.4"
       }
     },
-    "node_modules/css-tree": {
-      "version": "1.1.3",
+    "node_modules/@types/node-fetch": {
+      "version": "2.6.11",
+      "dev": true,
       "license": "MIT",
       "dependencies": {
-        "mdn-data": "2.0.14",
-        "source-map": "^0.6.1"
-      },
-      "engines": {
-        "node": ">=8.0.0"
-      }
-    },
-    "node_modules/css-what": {
-      "version": "6.1.0",
-      "license": "BSD-2-Clause",
-      "engines": {
-        "node": ">= 6"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/fb55"
+        "@types/node": "*",
+        "form-data": "^4.0.0"
       }
     },
-    "node_modules/csscolorparser": {
-      "version": "1.0.3",
-      "license": "MIT"
-    },
-    "node_modules/cssesc": {
-      "version": "3.0.0",
+    "node_modules/@types/node-fetch/node_modules/form-data": {
+      "version": "4.0.0",
       "dev": true,
       "license": "MIT",
-      "bin": {
-        "cssesc": "bin/cssesc"
+      "dependencies": {
+        "asynckit": "^0.4.0",
+        "combined-stream": "^1.0.8",
+        "mime-types": "^2.1.12"
       },
       "engines": {
-        "node": ">=4"
+        "node": ">= 6"
       }
     },
-    "node_modules/csso": {
-      "version": "4.2.0",
-      "dev": true,
+    "node_modules/@types/node-forge": {
+      "version": "1.3.11",
       "license": "MIT",
       "dependencies": {
-        "css-tree": "^1.1.2"
-      },
-      "engines": {
-        "node": ">=8.0.0"
+        "@types/node": "*"
       }
     },
-    "node_modules/cssom": {
-      "version": "0.5.0",
-      "license": "MIT"
-    },
-    "node_modules/csstype": {
-      "version": "3.1.1",
+    "node_modules/@types/normalize-package-data": {
+      "version": "2.4.4",
+      "dev": true,
       "license": "MIT"
     },
-    "node_modules/csv-parse": {
-      "version": "5.5.5",
-      "resolved": "https://registry.npmjs.org/csv-parse/-/csv-parse-5.5.5.tgz",
-      "integrity": "sha512-erCk7tyU3yLWAhk6wvKxnyPtftuy/6Ak622gOO7BCJ05+TYffnPCJF905wmOQm+BpkX54OdAl8pveJwUdpnCXQ==",
-      "dev": true
-    },
-    "node_modules/dag-map": {
-      "version": "1.0.2",
+    "node_modules/@types/parse-json": {
+      "version": "4.0.0",
+      "dev": true,
       "license": "MIT"
     },
-    "node_modules/damerau-levenshtein": {
-      "version": "1.0.8",
+    "node_modules/@types/plist": {
+      "version": "3.0.5",
       "dev": true,
-      "license": "BSD-2-Clause"
-    },
-    "node_modules/date-fns": {
-      "version": "2.30.0",
       "license": "MIT",
+      "optional": true,
       "dependencies": {
-        "@babel/runtime": "^7.21.0"
-      },
-      "engines": {
-        "node": ">=0.11"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/date-fns"
-      }
-    },
-    "node_modules/date-fns-tz": {
-      "version": "2.0.0",
-      "license": "MIT",
-      "peerDependencies": {
-        "date-fns": ">=2.0.0"
+        "@types/node": "*",
+        "xmlbuilder": ">=11.0.1"
       }
     },
-    "node_modules/dayjs": {
-      "version": "1.11.10",
-      "resolved": "https://registry.npmjs.org/dayjs/-/dayjs-1.11.10.tgz",
-      "integrity": "sha512-vjAczensTgRcqDERK0SR2XMwsF/tSvnvlv6VcF2GIhg6Sx4yOIt/irsr1RDJsKiIyBzJDpCoXiWWq28MqH2cnQ=="
+    "node_modules/@types/pretty-hrtime": {
+      "version": "1.0.3",
+      "dev": true,
+      "license": "MIT"
     },
-    "node_modules/debounce": {
-      "version": "1.2.1",
+    "node_modules/@types/prop-types": {
+      "version": "15.7.5",
       "license": "MIT"
     },
-    "node_modules/debug": {
-      "version": "4.3.4",
+    "node_modules/@types/pusher-js": {
+      "version": "5.1.0",
+      "dev": true,
       "license": "MIT",
       "dependencies": {
-        "ms": "2.1.2"
-      },
-      "engines": {
-        "node": ">=6.0"
-      },
-      "peerDependenciesMeta": {
-        "supports-color": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/decamelize": {
-      "version": "1.2.0",
-      "license": "MIT",
-      "engines": {
-        "node": ">=0.10.0"
+        "pusher-js": "*"
       }
     },
-    "node_modules/decimal.js": {
-      "version": "10.4.3",
+    "node_modules/@types/qs": {
+      "version": "6.9.7",
+      "dev": true,
       "license": "MIT"
     },
-    "node_modules/decode-uri-component": {
-      "version": "0.2.2",
+    "node_modules/@types/ramda": {
+      "version": "0.27.66",
       "license": "MIT",
-      "engines": {
-        "node": ">=0.10"
+      "dependencies": {
+        "ts-toolbelt": "^6.15.1"
       }
     },
-    "node_modules/decompress-response": {
-      "version": "6.0.0",
+    "node_modules/@types/range-parser": {
+      "version": "1.2.4",
       "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/@types/react": {
+      "version": "18.2.45",
       "license": "MIT",
       "dependencies": {
-        "mimic-response": "^3.1.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
+        "@types/prop-types": "*",
+        "@types/scheduler": "*",
+        "csstype": "^3.0.2"
       }
     },
-    "node_modules/decompress-response/node_modules/mimic-response": {
-      "version": "3.1.0",
+    "node_modules/@types/react-beautiful-dnd": {
+      "version": "13.1.5",
       "dev": true,
       "license": "MIT",
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
+      "dependencies": {
+        "@types/react": "*"
       }
     },
-    "node_modules/dedent": {
-      "version": "0.7.0",
-      "license": "MIT"
-    },
-    "node_modules/deep-equal": {
-      "version": "2.0.5",
+    "node_modules/@types/react-collapse": {
+      "version": "5.0.1",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "call-bind": "^1.0.0",
-        "es-get-iterator": "^1.1.1",
-        "get-intrinsic": "^1.0.1",
-        "is-arguments": "^1.0.4",
-        "is-date-object": "^1.0.2",
-        "is-regex": "^1.1.1",
-        "isarray": "^2.0.5",
-        "object-is": "^1.1.4",
-        "object-keys": "^1.1.1",
-        "object.assign": "^4.1.2",
-        "regexp.prototype.flags": "^1.3.0",
-        "side-channel": "^1.0.3",
-        "which-boxed-primitive": "^1.0.1",
-        "which-collection": "^1.0.1",
-        "which-typed-array": "^1.1.2"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
+        "@types/react": "*"
       }
     },
-    "node_modules/deep-extend": {
-      "version": "0.6.0",
+    "node_modules/@types/react-dom": {
+      "version": "18.2.4",
       "license": "MIT",
-      "engines": {
-        "node": ">=4.0.0"
+      "dependencies": {
+        "@types/react": "*"
       }
     },
-    "node_modules/deep-is": {
-      "version": "0.1.4",
+    "node_modules/@types/react-is": {
+      "version": "18.3.0",
       "dev": true,
-      "license": "MIT"
-    },
-    "node_modules/deepmerge": {
-      "version": "4.3.1",
       "license": "MIT",
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/default-browser": {
-      "version": "5.2.1",
-      "resolved": "https://registry.npmjs.org/default-browser/-/default-browser-5.2.1.tgz",
-      "integrity": "sha512-WY/3TUME0x3KPYdRRxEJJvXRHV4PyPoUsxtZa78lwItwRQRHhd2U9xOscaT/YTf8uCXIAjeJOFBVEh/7FtD8Xg==",
-      "dev": true,
       "dependencies": {
-        "bundle-name": "^4.1.0",
-        "default-browser-id": "^5.0.0"
-      },
-      "engines": {
-        "node": ">=18"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
+        "@types/react": "*"
       }
     },
-    "node_modules/default-browser-id": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/default-browser-id/-/default-browser-id-3.0.0.tgz",
-      "integrity": "sha512-OZ1y3y0SqSICtE8DE4S8YOE9UZOJ8wO16fKWVP5J1Qz42kV9jcnMVFrEE/noXb/ss3Q4pZIH79kxofzyNNtUNA==",
+    "node_modules/@types/react-native": {
+      "version": "0.73.0",
+      "deprecated": "This is a stub types definition. react-native provides its own type definitions, so you do not need this installed.",
+      "license": "MIT",
+      "peer": true,
       "dependencies": {
-        "bplist-parser": "^0.2.0",
-        "untildify": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=12"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/default-browser/node_modules/default-browser-id": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/default-browser-id/-/default-browser-id-5.0.0.tgz",
-      "integrity": "sha512-A6p/pu/6fyBcA1TRz/GqWYPViplrftcW2gZC9q79ngNCKAeR/X3gcEdXQHl4KNXV+3wgIJ1CPkJQ3IHM6lcsyA==",
-      "dev": true,
-      "engines": {
-        "node": ">=18"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
+        "react-native": "*"
       }
     },
-    "node_modules/default-gateway": {
-      "version": "6.0.3",
+    "node_modules/@types/react-native-web": {
+      "version": "0.0.0",
+      "resolved": "https://registry.npmjs.org/@types/react-native-web/-/react-native-web-0.0.0.tgz",
+      "integrity": "sha512-WeaDnb57Z60pUVu6FO6WybA+7BAbPz83otLVbOpcPvRN2f/PIDt/9ViiXJ989QFrLhdex/Jen15xMOyO2X2L2A==",
       "dev": true,
-      "license": "BSD-2-Clause",
       "dependencies": {
-        "execa": "^5.0.0"
-      },
-      "engines": {
-        "node": ">= 10"
+        "@types/react": "*",
+        "react-native": "*"
       }
     },
-    "node_modules/defaults": {
-      "version": "1.0.4",
+    "node_modules/@types/react-redux": {
+      "version": "7.1.27",
       "license": "MIT",
       "dependencies": {
-        "clone": "^1.0.2"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
+        "@types/hoist-non-react-statics": "^3.3.0",
+        "@types/react": "*",
+        "hoist-non-react-statics": "^3.3.0",
+        "redux": "^4.0.0"
       }
     },
-    "node_modules/defer-to-connect": {
-      "version": "2.0.1",
+    "node_modules/@types/react-test-renderer": {
+      "version": "18.0.0",
       "dev": true,
       "license": "MIT",
-      "engines": {
-        "node": ">=10"
+      "dependencies": {
+        "@types/react": "*"
       }
     },
-    "node_modules/define-lazy-prop": {
-      "version": "2.0.0",
-      "license": "MIT",
-      "engines": {
-        "node": ">=8"
-      }
+    "node_modules/@types/resolve": {
+      "version": "1.20.6",
+      "dev": true,
+      "license": "MIT"
     },
-    "node_modules/define-properties": {
-      "version": "1.2.0",
+    "node_modules/@types/responselike": {
+      "version": "1.0.0",
+      "dev": true,
       "license": "MIT",
       "dependencies": {
-        "has-property-descriptors": "^1.0.0",
-        "object-keys": "^1.1.1"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
+        "@types/node": "*"
       }
     },
-    "node_modules/define-property": {
-      "version": "2.0.2",
-      "license": "MIT",
-      "optional": true,
-      "dependencies": {
-        "is-descriptor": "^1.0.2",
-        "isobject": "^3.0.1"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
+    "node_modules/@types/retry": {
+      "version": "0.12.2",
+      "dev": true,
+      "license": "MIT"
     },
-    "node_modules/defu": {
-      "version": "6.1.4",
-      "resolved": "https://registry.npmjs.org/defu/-/defu-6.1.4.tgz",
-      "integrity": "sha512-mEQCMmwJu317oSz8CwdIOdwf3xMif1ttiM8LTufzc3g6kR+9Pe236twL8j3IYT1F7GfRgGcW6MWxzZjLIkuHIg=="
+    "node_modules/@types/scheduler": {
+      "version": "0.16.2",
+      "license": "MIT"
     },
-    "node_modules/del": {
-      "version": "4.1.1",
+    "node_modules/@types/semver": {
+      "version": "7.5.4",
       "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "@types/glob": "^7.1.1",
-        "globby": "^6.1.0",
-        "is-path-cwd": "^2.0.0",
-        "is-path-in-cwd": "^2.0.0",
-        "p-map": "^2.0.0",
-        "pify": "^4.0.1",
-        "rimraf": "^2.6.3"
-      },
-      "engines": {
-        "node": ">=6"
-      }
+      "license": "MIT"
     },
-    "node_modules/del/node_modules/array-union": {
-      "version": "1.0.2",
+    "node_modules/@types/send": {
+      "version": "0.17.4",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "array-uniq": "^1.0.1"
-      },
-      "engines": {
-        "node": ">=0.10.0"
+        "@types/mime": "^1",
+        "@types/node": "*"
       }
     },
-    "node_modules/del/node_modules/globby": {
-      "version": "6.1.0",
+    "node_modules/@types/serve-index": {
+      "version": "1.9.4",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "array-union": "^1.0.1",
-        "glob": "^7.0.3",
-        "object-assign": "^4.0.1",
-        "pify": "^2.0.0",
-        "pinkie-promise": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
+        "@types/express": "*"
       }
     },
-    "node_modules/del/node_modules/globby/node_modules/pify": {
-      "version": "2.3.0",
+    "node_modules/@types/serve-static": {
+      "version": "1.15.7",
       "dev": true,
       "license": "MIT",
-      "engines": {
-        "node": ">=0.10.0"
+      "dependencies": {
+        "@types/http-errors": "*",
+        "@types/node": "*",
+        "@types/send": "*"
       }
     },
-    "node_modules/del/node_modules/p-map": {
-      "version": "2.1.0",
+    "node_modules/@types/setimmediate": {
+      "version": "1.0.2",
       "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/@types/shimmer": {
+      "version": "1.0.5",
       "license": "MIT",
-      "engines": {
-        "node": ">=6"
-      }
+      "peer": true
     },
-    "node_modules/del/node_modules/rimraf": {
-      "version": "2.7.1",
+    "node_modules/@types/sockjs": {
+      "version": "0.3.36",
       "dev": true,
-      "license": "ISC",
+      "license": "MIT",
       "dependencies": {
-        "glob": "^7.1.3"
-      },
-      "bin": {
-        "rimraf": "bin.js"
+        "@types/node": "*"
       }
     },
-    "node_modules/delay": {
-      "version": "5.0.0",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
+    "node_modules/@types/stack-utils": {
+      "version": "2.0.1",
+      "license": "MIT"
     },
-    "node_modules/delayed-stream": {
-      "version": "1.0.0",
-      "license": "MIT",
-      "engines": {
-        "node": ">=0.4.0"
-      }
+    "node_modules/@types/tough-cookie": {
+      "version": "4.0.2",
+      "license": "MIT"
     },
-    "node_modules/delegate": {
-      "version": "3.2.0",
-      "resolved": "https://registry.npmjs.org/delegate/-/delegate-3.2.0.tgz",
-      "integrity": "sha512-IofjkYBZaZivn0V8nnsMJGBr4jVLxHDheKSW88PyxS5QC4Vo9ZbZVvhzlSxY87fVq3STR6r+4cGepyHkcWOQSw=="
+    "node_modules/@types/unist": {
+      "version": "3.0.2",
+      "dev": true,
+      "license": "MIT"
     },
-    "node_modules/delegates": {
-      "version": "1.0.0",
-      "license": "MIT",
-      "optional": true
+    "node_modules/@types/urijs": {
+      "version": "1.19.19",
+      "license": "MIT"
     },
-    "node_modules/denodeify": {
-      "version": "1.2.1",
+    "node_modules/@types/uuid": {
+      "version": "9.0.8",
+      "dev": true,
       "license": "MIT"
     },
-    "node_modules/depd": {
-      "version": "2.0.0",
+    "node_modules/@types/verror": {
+      "version": "1.10.10",
+      "dev": true,
       "license": "MIT",
-      "engines": {
-        "node": ">= 0.8"
-      }
+      "optional": true
     },
-    "node_modules/deprecated-react-native-prop-types": {
-      "version": "2.3.0",
+    "node_modules/@types/webpack": {
+      "version": "5.28.5",
+      "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@react-native/normalize-color": "*",
-        "invariant": "*",
-        "prop-types": "*"
+        "@types/node": "*",
+        "tapable": "^2.2.0",
+        "webpack": "^5"
       }
     },
-    "node_modules/deprecation": {
-      "version": "2.3.1",
+    "node_modules/@types/webpack-bundle-analyzer": {
+      "version": "4.7.0",
       "dev": true,
-      "license": "ISC"
-    },
-    "node_modules/dequal": {
-      "version": "2.0.3",
       "license": "MIT",
-      "engines": {
-        "node": ">=6"
+      "dependencies": {
+        "@types/node": "*",
+        "tapable": "^2.2.0",
+        "webpack": "^5"
       }
     },
-    "node_modules/des.js": {
-      "version": "1.0.1",
+    "node_modules/@types/ws": {
+      "version": "8.5.10",
+      "dev": true,
       "license": "MIT",
       "dependencies": {
-        "inherits": "^2.0.1",
-        "minimalistic-assert": "^1.0.0"
+        "@types/node": "*"
       }
     },
-    "node_modules/destroy": {
-      "version": "1.2.0",
+    "node_modules/@types/yargs": {
+      "version": "17.0.32",
       "license": "MIT",
-      "engines": {
-        "node": ">= 0.8",
-        "npm": "1.2.8000 || >= 1.4.16"
+      "dependencies": {
+        "@types/yargs-parser": "*"
       }
     },
-    "node_modules/detect-indent": {
-      "version": "6.1.0",
-      "resolved": "https://registry.npmjs.org/detect-indent/-/detect-indent-6.1.0.tgz",
-      "integrity": "sha512-reYkTUJAZb9gUuZ2RvVCNhVHdg62RHnJ7WJl8ftMi4diZ6NWlciOzQN88pUhSELEwflJht4oQDv0F0BMlwaYtA==",
-      "engines": {
-        "node": ">=8"
-      }
+    "node_modules/@types/yargs-parser": {
+      "version": "21.0.3",
+      "license": "MIT"
     },
-    "node_modules/detect-libc": {
-      "version": "2.0.1",
-      "license": "Apache-2.0",
+    "node_modules/@types/yauzl": {
+      "version": "2.10.0",
+      "dev": true,
+      "license": "MIT",
       "optional": true,
-      "engines": {
-        "node": ">=8"
+      "dependencies": {
+        "@types/node": "*"
       }
     },
-    "node_modules/detect-newline": {
-      "version": "3.1.0",
+    "node_modules/@typescript-eslint/eslint-plugin": {
+      "version": "7.13.1",
+      "dev": true,
       "license": "MIT",
+      "dependencies": {
+        "@eslint-community/regexpp": "^4.10.0",
+        "@typescript-eslint/scope-manager": "7.13.1",
+        "@typescript-eslint/type-utils": "7.13.1",
+        "@typescript-eslint/utils": "7.13.1",
+        "@typescript-eslint/visitor-keys": "7.13.1",
+        "graphemer": "^1.4.0",
+        "ignore": "^5.3.1",
+        "natural-compare": "^1.4.0",
+        "ts-api-utils": "^1.3.0"
+      },
       "engines": {
-        "node": ">=8"
+        "node": "^18.18.0 || >=20.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
+      },
+      "peerDependencies": {
+        "@typescript-eslint/parser": "^7.0.0",
+        "eslint": "^8.56.0"
+      },
+      "peerDependenciesMeta": {
+        "typescript": {
+          "optional": true
+        }
       }
     },
-    "node_modules/detect-node": {
-      "version": "2.1.0",
+    "node_modules/@typescript-eslint/eslint-plugin/node_modules/@typescript-eslint/utils": {
+      "version": "7.13.1",
       "dev": true,
-      "license": "MIT"
-    },
-    "node_modules/detect-package-manager": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/detect-package-manager/-/detect-package-manager-2.0.1.tgz",
-      "integrity": "sha512-j/lJHyoLlWi6G1LDdLgvUtz60Zo5GEj+sVYtTVXnYLDPuzgC3llMxonXym9zIwhhUII8vjdw0LXxavpLqTbl1A==",
+      "license": "MIT",
       "dependencies": {
-        "execa": "^5.1.1"
+        "@eslint-community/eslint-utils": "^4.4.0",
+        "@typescript-eslint/scope-manager": "7.13.1",
+        "@typescript-eslint/types": "7.13.1",
+        "@typescript-eslint/typescript-estree": "7.13.1"
       },
       "engines": {
-        "node": ">=12"
+        "node": "^18.18.0 || >=20.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
+      },
+      "peerDependencies": {
+        "eslint": "^8.56.0"
       }
     },
-    "node_modules/detect-port": {
-      "version": "1.5.1",
-      "resolved": "https://registry.npmjs.org/detect-port/-/detect-port-1.5.1.tgz",
-      "integrity": "sha512-aBzdj76lueB6uUst5iAs7+0H/oOjqI5D16XUWxlWMIMROhcM0rfsNVk93zTngq1dDNpoXRr++Sus7ETAExppAQ==",
+    "node_modules/@typescript-eslint/parser": {
+      "version": "7.13.1",
+      "dev": true,
+      "license": "BSD-2-Clause",
       "dependencies": {
-        "address": "^1.0.1",
-        "debug": "4"
+        "@typescript-eslint/scope-manager": "7.13.1",
+        "@typescript-eslint/types": "7.13.1",
+        "@typescript-eslint/typescript-estree": "7.13.1",
+        "@typescript-eslint/visitor-keys": "7.13.1",
+        "debug": "^4.3.4"
       },
-      "bin": {
-        "detect": "bin/detect-port.js",
-        "detect-port": "bin/detect-port.js"
-      }
-    },
-    "node_modules/diff": {
-      "version": "4.0.2",
-      "devOptional": true,
-      "license": "BSD-3-Clause",
-      "engines": {
-        "node": ">=0.3.1"
-      }
-    },
-    "node_modules/diff-sequences": {
-      "version": "29.4.3",
-      "license": "MIT",
       "engines": {
-        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+        "node": "^18.18.0 || >=20.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
+      },
+      "peerDependencies": {
+        "eslint": "^8.56.0"
+      },
+      "peerDependenciesMeta": {
+        "typescript": {
+          "optional": true
+        }
       }
     },
-    "node_modules/diff-so-fancy": {
-      "version": "1.4.3",
+    "node_modules/@typescript-eslint/rule-tester": {
+      "version": "7.18.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/rule-tester/-/rule-tester-7.18.0.tgz",
+      "integrity": "sha512-ClrFQlwen9pJcYPIBLuarzBpONQAwjmJ0+YUjAo1TGzoZFJPyUK/A7bb4Mps0u+SMJJnFXbfMN8I9feQDf0O5A==",
       "dev": true,
-      "license": "MIT",
-      "bin": {
-        "diff-so-fancy": "third_party/build_fatpack/diff-so-fancy"
-      }
-    },
-    "node_modules/diffie-hellman": {
-      "version": "5.0.3",
-      "license": "MIT",
       "dependencies": {
-        "bn.js": "^4.1.0",
-        "miller-rabin": "^4.0.0",
-        "randombytes": "^2.0.0"
+        "@typescript-eslint/typescript-estree": "7.18.0",
+        "@typescript-eslint/utils": "7.18.0",
+        "ajv": "^6.12.6",
+        "json-stable-stringify-without-jsonify": "^1.0.1",
+        "lodash.merge": "4.6.2",
+        "semver": "^7.6.0"
+      },
+      "engines": {
+        "node": "^18.18.0 || >=20.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
+      },
+      "peerDependencies": {
+        "@eslint/eslintrc": ">=2",
+        "eslint": "^8.56.0"
       }
     },
-    "node_modules/diffie-hellman/node_modules/bn.js": {
-      "version": "4.12.0",
-      "license": "MIT"
-    },
-    "node_modules/dijkstrajs": {
-      "version": "1.0.3",
-      "license": "MIT"
-    },
-    "node_modules/dir-compare": {
-      "version": "3.3.0",
+    "node_modules/@typescript-eslint/rule-tester/node_modules/@typescript-eslint/scope-manager": {
+      "version": "7.18.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-7.18.0.tgz",
+      "integrity": "sha512-jjhdIE/FPF2B7Z1uzc6i3oWKbGcHb87Qw7AWj6jmEqNOfDFbJWtjt/XfwCpvNkpGWlcJaog5vTR+VV8+w9JflA==",
       "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "buffer-equal": "^1.0.0",
-        "minimatch": "^3.0.4"
-      }
-    },
-    "node_modules/dir-glob": {
-      "version": "3.0.1",
-      "license": "MIT",
       "dependencies": {
-        "path-type": "^4.0.0"
+        "@typescript-eslint/types": "7.18.0",
+        "@typescript-eslint/visitor-keys": "7.18.0"
       },
       "engines": {
-        "node": ">=8"
+        "node": "^18.18.0 || >=20.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
       }
     },
-    "node_modules/dmg-builder": {
-      "version": "24.13.2",
+    "node_modules/@typescript-eslint/rule-tester/node_modules/@typescript-eslint/types": {
+      "version": "7.18.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-7.18.0.tgz",
+      "integrity": "sha512-iZqi+Ds1y4EDYUtlOOC+aUmxnE9xS/yCigkjA7XpTKV6nCBd3Hp/PRGGmdwnfkV2ThMyYldP1wRpm/id99spTQ==",
       "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "app-builder-lib": "24.13.2",
-        "builder-util": "24.13.1",
-        "builder-util-runtime": "9.2.4",
-        "fs-extra": "^10.1.0",
-        "iconv-lite": "^0.6.2",
-        "js-yaml": "^4.1.0"
+      "engines": {
+        "node": "^18.18.0 || >=20.0.0"
       },
-      "optionalDependencies": {
-        "dmg-license": "^1.0.11"
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
       }
     },
-    "node_modules/dmg-builder/node_modules/argparse": {
-      "version": "2.0.1",
-      "dev": true,
-      "license": "Python-2.0"
-    },
-    "node_modules/dmg-builder/node_modules/fs-extra": {
-      "version": "10.1.0",
+    "node_modules/@typescript-eslint/rule-tester/node_modules/@typescript-eslint/typescript-estree": {
+      "version": "7.18.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-7.18.0.tgz",
+      "integrity": "sha512-aP1v/BSPnnyhMHts8cf1qQ6Q1IFwwRvAQGRvBFkWlo3/lH29OXA3Pts+c10nxRxIBrDnoMqzhgdwVe5f2D6OzA==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
-        "graceful-fs": "^4.2.0",
-        "jsonfile": "^6.0.1",
-        "universalify": "^2.0.0"
+        "@typescript-eslint/types": "7.18.0",
+        "@typescript-eslint/visitor-keys": "7.18.0",
+        "debug": "^4.3.4",
+        "globby": "^11.1.0",
+        "is-glob": "^4.0.3",
+        "minimatch": "^9.0.4",
+        "semver": "^7.6.0",
+        "ts-api-utils": "^1.3.0"
       },
       "engines": {
-        "node": ">=12"
+        "node": "^18.18.0 || >=20.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
+      },
+      "peerDependenciesMeta": {
+        "typescript": {
+          "optional": true
+        }
       }
     },
-    "node_modules/dmg-builder/node_modules/js-yaml": {
-      "version": "4.1.0",
+    "node_modules/@typescript-eslint/rule-tester/node_modules/@typescript-eslint/utils": {
+      "version": "7.18.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-7.18.0.tgz",
+      "integrity": "sha512-kK0/rNa2j74XuHVcoCZxdFBMF+aq/vH83CXAOHieC+2Gis4mF8jJXT5eAfyD3K0sAxtPuwxaIOIOvhwzVDt/kw==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
-        "argparse": "^2.0.1"
+        "@eslint-community/eslint-utils": "^4.4.0",
+        "@typescript-eslint/scope-manager": "7.18.0",
+        "@typescript-eslint/types": "7.18.0",
+        "@typescript-eslint/typescript-estree": "7.18.0"
       },
-      "bin": {
-        "js-yaml": "bin/js-yaml.js"
+      "engines": {
+        "node": "^18.18.0 || >=20.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
+      },
+      "peerDependencies": {
+        "eslint": "^8.56.0"
       }
     },
-    "node_modules/dmg-license": {
-      "version": "1.0.11",
+    "node_modules/@typescript-eslint/rule-tester/node_modules/@typescript-eslint/visitor-keys": {
+      "version": "7.18.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-7.18.0.tgz",
+      "integrity": "sha512-cDF0/Gf81QpY3xYyJKDV14Zwdmid5+uuENhjH2EqFaF0ni+yAyq/LzMaIJdhNJXZI7uLzwIlA+V7oWoyn6Curg==",
       "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "darwin"
-      ],
       "dependencies": {
-        "@types/plist": "^3.0.1",
-        "@types/verror": "^1.10.3",
-        "ajv": "^6.10.0",
-        "crc": "^3.8.0",
-        "iconv-corefoundation": "^1.1.7",
-        "plist": "^3.0.4",
-        "smart-buffer": "^4.0.2",
-        "verror": "^1.10.0"
-      },
-      "bin": {
-        "dmg-license": "bin/dmg-license.js"
+        "@typescript-eslint/types": "7.18.0",
+        "eslint-visitor-keys": "^3.4.3"
       },
       "engines": {
-        "node": ">=8"
+        "node": "^18.18.0 || >=20.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
       }
     },
-    "node_modules/dmg-license/node_modules/ajv": {
+    "node_modules/@typescript-eslint/rule-tester/node_modules/ajv": {
       "version": "6.12.6",
+      "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
+      "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==",
       "dev": true,
-      "license": "MIT",
-      "optional": true,
       "dependencies": {
         "fast-deep-equal": "^3.1.1",
         "fast-json-stable-stringify": "^2.0.0",
@@ -18393,2248 +18330,2188 @@
         "url": "https://github.com/sponsors/epoberezkin"
       }
     },
-    "node_modules/dmg-license/node_modules/json-schema-traverse": {
-      "version": "0.4.1",
+    "node_modules/@typescript-eslint/rule-tester/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,
-      "license": "MIT",
-      "optional": true
+      "dependencies": {
+        "balanced-match": "^1.0.0"
+      }
     },
-    "node_modules/dns-packet": {
-      "version": "5.6.1",
-      "resolved": "https://registry.npmjs.org/dns-packet/-/dns-packet-5.6.1.tgz",
-      "integrity": "sha512-l4gcSouhcgIKRvyy99RNVOgxXiicE+2jZoNmaNmZ6JXiGajBOJAesk1OBlJuM5k2c+eudGdLxDqXuPCKIj6kpw==",
+    "node_modules/@typescript-eslint/rule-tester/node_modules/eslint-visitor-keys": {
+      "version": "3.4.3",
+      "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.4.3.tgz",
+      "integrity": "sha512-wpc+LXeiyiisxPlEkUzU6svyS1frIO3Mgxj1fdy7Pm8Ygzguax2N3Fa/D/ag1WqbOprdI+uY6wMUl8/a2G+iag==",
       "dev": true,
-      "dependencies": {
-        "@leichtgewicht/ip-codec": "^2.0.1"
-      },
       "engines": {
-        "node": ">=6"
+        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+      },
+      "funding": {
+        "url": "https://opencollective.com/eslint"
       }
     },
-    "node_modules/doctrine": {
-      "version": "3.0.0",
-      "license": "Apache-2.0",
+    "node_modules/@typescript-eslint/rule-tester/node_modules/json-schema-traverse": {
+      "version": "0.4.1",
+      "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
+      "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==",
+      "dev": true
+    },
+    "node_modules/@typescript-eslint/rule-tester/node_modules/minimatch": {
+      "version": "9.0.5",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.5.tgz",
+      "integrity": "sha512-G6T0ZX48xgozx7587koeX9Ys2NYy6Gmv//P89sEte9V9whIapMNF4idKxnW2QtCcLiTWlb/wfCabAtAFWhhBow==",
+      "dev": true,
       "dependencies": {
-        "esutils": "^2.0.2"
+        "brace-expansion": "^2.0.1"
       },
       "engines": {
-        "node": ">=6.0.0"
+        "node": ">=16 || 14 >=14.17"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
       }
     },
-    "node_modules/dom-converter": {
-      "version": "0.2.0",
+    "node_modules/@typescript-eslint/scope-manager": {
+      "version": "7.13.1",
+      "dev": true,
       "license": "MIT",
       "dependencies": {
-        "utila": "~0.4"
+        "@typescript-eslint/types": "7.13.1",
+        "@typescript-eslint/visitor-keys": "7.13.1"
+      },
+      "engines": {
+        "node": "^18.18.0 || >=20.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
       }
     },
-    "node_modules/dom-serializer": {
-      "version": "0.2.2",
+    "node_modules/@typescript-eslint/type-utils": {
+      "version": "7.13.1",
+      "dev": true,
       "license": "MIT",
       "dependencies": {
-        "domelementtype": "^2.0.1",
-        "entities": "^2.0.0"
+        "@typescript-eslint/typescript-estree": "7.13.1",
+        "@typescript-eslint/utils": "7.13.1",
+        "debug": "^4.3.4",
+        "ts-api-utils": "^1.3.0"
+      },
+      "engines": {
+        "node": "^18.18.0 || >=20.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
+      },
+      "peerDependencies": {
+        "eslint": "^8.56.0"
+      },
+      "peerDependenciesMeta": {
+        "typescript": {
+          "optional": true
+        }
       }
     },
-    "node_modules/domain-browser": {
-      "version": "1.2.0",
+    "node_modules/@typescript-eslint/type-utils/node_modules/@typescript-eslint/utils": {
+      "version": "7.13.1",
+      "dev": true,
       "license": "MIT",
+      "dependencies": {
+        "@eslint-community/eslint-utils": "^4.4.0",
+        "@typescript-eslint/scope-manager": "7.13.1",
+        "@typescript-eslint/types": "7.13.1",
+        "@typescript-eslint/typescript-estree": "7.13.1"
+      },
       "engines": {
-        "node": ">=0.4",
-        "npm": ">=1.2"
+        "node": "^18.18.0 || >=20.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
+      },
+      "peerDependencies": {
+        "eslint": "^8.56.0"
       }
     },
-    "node_modules/domelementtype": {
-      "version": "2.3.0",
-      "funding": [
-        {
-          "type": "github",
-          "url": "https://github.com/sponsors/fb55"
-        }
-      ],
-      "license": "BSD-2-Clause"
-    },
-    "node_modules/domexception": {
-      "version": "4.0.0",
+    "node_modules/@typescript-eslint/types": {
+      "version": "7.13.1",
+      "dev": true,
       "license": "MIT",
-      "dependencies": {
-        "webidl-conversions": "^7.0.0"
-      },
       "engines": {
-        "node": ">=12"
+        "node": "^18.18.0 || >=20.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
       }
     },
-    "node_modules/domhandler": {
-      "version": "4.3.1",
+    "node_modules/@typescript-eslint/typescript-estree": {
+      "version": "7.13.1",
+      "dev": true,
       "license": "BSD-2-Clause",
       "dependencies": {
-        "domelementtype": "^2.2.0"
+        "@typescript-eslint/types": "7.13.1",
+        "@typescript-eslint/visitor-keys": "7.13.1",
+        "debug": "^4.3.4",
+        "globby": "^11.1.0",
+        "is-glob": "^4.0.3",
+        "minimatch": "^9.0.4",
+        "semver": "^7.6.0",
+        "ts-api-utils": "^1.3.0"
       },
       "engines": {
-        "node": ">= 4"
+        "node": "^18.18.0 || >=20.0.0"
       },
       "funding": {
-        "url": "https://github.com/fb55/domhandler?sponsor=1"
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
+      },
+      "peerDependenciesMeta": {
+        "typescript": {
+          "optional": true
+        }
       }
     },
-    "node_modules/domutils": {
-      "version": "2.8.0",
-      "license": "BSD-2-Clause",
+    "node_modules/@typescript-eslint/typescript-estree/node_modules/brace-expansion": {
+      "version": "2.0.1",
+      "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "dom-serializer": "^1.0.1",
-        "domelementtype": "^2.2.0",
-        "domhandler": "^4.2.0"
+        "balanced-match": "^1.0.0"
+      }
+    },
+    "node_modules/@typescript-eslint/typescript-estree/node_modules/minimatch": {
+      "version": "9.0.4",
+      "dev": true,
+      "license": "ISC",
+      "dependencies": {
+        "brace-expansion": "^2.0.1"
+      },
+      "engines": {
+        "node": ">=16 || 14 >=14.17"
       },
       "funding": {
-        "url": "https://github.com/fb55/domutils?sponsor=1"
+        "url": "https://github.com/sponsors/isaacs"
       }
     },
-    "node_modules/domutils/node_modules/dom-serializer": {
-      "version": "1.4.1",
+    "node_modules/@typescript-eslint/utils": {
+      "version": "5.62.0",
+      "dev": true,
       "license": "MIT",
       "dependencies": {
-        "domelementtype": "^2.0.1",
-        "domhandler": "^4.2.0",
-        "entities": "^2.0.0"
+        "@eslint-community/eslint-utils": "^4.2.0",
+        "@types/json-schema": "^7.0.9",
+        "@types/semver": "^7.3.12",
+        "@typescript-eslint/scope-manager": "5.62.0",
+        "@typescript-eslint/types": "5.62.0",
+        "@typescript-eslint/typescript-estree": "5.62.0",
+        "eslint-scope": "^5.1.1",
+        "semver": "^7.3.7"
+      },
+      "engines": {
+        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
       },
       "funding": {
-        "url": "https://github.com/cheeriojs/dom-serializer?sponsor=1"
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
+      },
+      "peerDependencies": {
+        "eslint": "^6.0.0 || ^7.0.0 || ^8.0.0"
       }
     },
-    "node_modules/dot-case": {
-      "version": "3.0.4",
+    "node_modules/@typescript-eslint/utils/node_modules/@typescript-eslint/scope-manager": {
+      "version": "5.62.0",
+      "dev": true,
       "license": "MIT",
       "dependencies": {
-        "no-case": "^3.0.4",
-        "tslib": "^2.0.3"
-      }
-    },
-    "node_modules/dotenv": {
-      "version": "16.3.1",
-      "license": "BSD-2-Clause",
+        "@typescript-eslint/types": "5.62.0",
+        "@typescript-eslint/visitor-keys": "5.62.0"
+      },
       "engines": {
-        "node": ">=12"
+        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
       },
       "funding": {
-        "url": "https://github.com/motdotla/dotenv?sponsor=1"
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
       }
     },
-    "node_modules/dotenv-expand": {
-      "version": "5.1.0",
+    "node_modules/@typescript-eslint/utils/node_modules/@typescript-eslint/types": {
+      "version": "5.62.0",
       "dev": true,
-      "license": "BSD-2-Clause"
+      "license": "MIT",
+      "engines": {
+        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
+      }
     },
-    "node_modules/duplexer": {
-      "version": "0.1.2",
-      "resolved": "https://registry.npmjs.org/duplexer/-/duplexer-0.1.2.tgz",
-      "integrity": "sha512-jtD6YG370ZCIi/9GTaJKQxWTZD045+4R4hTk/x1UyoqadyJ9x9CgSi1RlVDQF8U2sxLLSnFkCaMihqljHIWgMg==",
+    "node_modules/@typescript-eslint/utils/node_modules/@typescript-eslint/typescript-estree": {
+      "version": "5.62.0",
       "dev": true,
-      "license": "MIT"
-    },
-    "node_modules/duplexify": {
-      "version": "3.7.1",
-      "license": "MIT",
-      "dependencies": {
-        "end-of-stream": "^1.0.0",
-        "inherits": "^2.0.1",
-        "readable-stream": "^2.0.0",
-        "stream-shift": "^1.0.0"
-      }
-    },
-    "node_modules/earcut": {
-      "version": "2.2.4",
-      "license": "ISC"
-    },
-    "node_modules/eastasianwidth": {
-      "version": "0.2.0",
-      "license": "MIT"
-    },
-    "node_modules/ee-first": {
-      "version": "1.1.1",
-      "license": "MIT"
-    },
-    "node_modules/ejs": {
-      "version": "3.1.9",
-      "license": "Apache-2.0",
+      "license": "BSD-2-Clause",
       "dependencies": {
-        "jake": "^10.8.5"
-      },
-      "bin": {
-        "ejs": "bin/cli.js"
+        "@typescript-eslint/types": "5.62.0",
+        "@typescript-eslint/visitor-keys": "5.62.0",
+        "debug": "^4.3.4",
+        "globby": "^11.1.0",
+        "is-glob": "^4.0.3",
+        "semver": "^7.3.7",
+        "tsutils": "^3.21.0"
       },
       "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/electron": {
-      "version": "29.2.0",
-      "resolved": "https://registry.npmjs.org/electron/-/electron-29.2.0.tgz",
-      "integrity": "sha512-ALKrCN52RG4g9prx4DriXSPnY5WoiyRUCNp7zEVQuoiNOpHTNqMMpRidQAHzntV4hajF1LMWHVoBkwqIs1jHhg==",
-      "dev": true,
-      "hasInstallScript": true,
-      "dependencies": {
-        "@electron/get": "^2.0.0",
-        "@types/node": "^20.9.0",
-        "extract-zip": "^2.0.1"
+        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
       },
-      "bin": {
-        "electron": "cli.js"
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
       },
-      "engines": {
-        "node": ">= 12.20.55"
+      "peerDependenciesMeta": {
+        "typescript": {
+          "optional": true
+        }
       }
     },
-    "node_modules/electron-builder": {
-      "version": "24.13.2",
+    "node_modules/@typescript-eslint/utils/node_modules/@typescript-eslint/visitor-keys": {
+      "version": "5.62.0",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "app-builder-lib": "24.13.2",
-        "builder-util": "24.13.1",
-        "builder-util-runtime": "9.2.4",
-        "chalk": "^4.1.2",
-        "dmg-builder": "24.13.2",
-        "fs-extra": "^10.1.0",
-        "is-ci": "^3.0.0",
-        "lazy-val": "^1.0.5",
-        "read-config-file": "6.3.2",
-        "simple-update-notifier": "2.0.0",
-        "yargs": "^17.6.2"
-      },
-      "bin": {
-        "electron-builder": "cli.js",
-        "install-app-deps": "install-app-deps.js"
+        "@typescript-eslint/types": "5.62.0",
+        "eslint-visitor-keys": "^3.3.0"
       },
       "engines": {
-        "node": ">=14.0.0"
-      }
-    },
-    "node_modules/electron-builder-squirrel-windows": {
-      "version": "24.13.2",
-      "dev": true,
-      "license": "MIT",
-      "peer": true,
-      "dependencies": {
-        "app-builder-lib": "24.13.2",
-        "archiver": "^5.3.1",
-        "builder-util": "24.13.1",
-        "fs-extra": "^10.1.0"
+        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
       }
     },
-    "node_modules/electron-builder-squirrel-windows/node_modules/fs-extra": {
-      "version": "10.1.0",
+    "node_modules/@typescript-eslint/utils/node_modules/eslint-visitor-keys": {
+      "version": "3.4.3",
       "dev": true,
-      "license": "MIT",
-      "peer": true,
-      "dependencies": {
-        "graceful-fs": "^4.2.0",
-        "jsonfile": "^6.0.1",
-        "universalify": "^2.0.0"
-      },
+      "license": "Apache-2.0",
       "engines": {
-        "node": ">=12"
+        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+      },
+      "funding": {
+        "url": "https://opencollective.com/eslint"
       }
     },
-    "node_modules/electron-builder/node_modules/ansi-styles": {
-      "version": "4.3.0",
+    "node_modules/@typescript-eslint/visitor-keys": {
+      "version": "7.13.1",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "color-convert": "^2.0.1"
+        "@typescript-eslint/types": "7.13.1",
+        "eslint-visitor-keys": "^3.4.3"
       },
       "engines": {
-        "node": ">=8"
+        "node": "^18.18.0 || >=20.0.0"
       },
       "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
       }
     },
-    "node_modules/electron-builder/node_modules/chalk": {
-      "version": "4.1.2",
+    "node_modules/@typescript-eslint/visitor-keys/node_modules/eslint-visitor-keys": {
+      "version": "3.4.3",
       "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "ansi-styles": "^4.1.0",
-        "supports-color": "^7.1.0"
-      },
+      "license": "Apache-2.0",
       "engines": {
-        "node": ">=10"
+        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
       },
       "funding": {
-        "url": "https://github.com/chalk/chalk?sponsor=1"
+        "url": "https://opencollective.com/eslint"
       }
     },
-    "node_modules/electron-builder/node_modules/color-convert": {
-      "version": "2.0.1",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "color-name": "~1.1.4"
-      },
+    "node_modules/@ua/react-native-airship": {
+      "version": "19.2.1",
+      "resolved": "https://registry.npmjs.org/@ua/react-native-airship/-/react-native-airship-19.2.1.tgz",
+      "integrity": "sha512-DnSTR31OIUWypbUmdtbz7VyXAp+2c7737EKmfG5o2LVDkBNnJ8hO5/2G4eEGmkBLn5tv2zP8vP6nUmq8Pt2wCA==",
       "engines": {
-        "node": ">=7.0.0"
+        "node": ">= 16.0.0"
+      },
+      "peerDependencies": {
+        "react": "*",
+        "react-native": "*"
       }
     },
-    "node_modules/electron-builder/node_modules/color-name": {
-      "version": "1.1.4",
+    "node_modules/@ungap/structured-clone": {
+      "version": "1.2.0",
       "dev": true,
-      "license": "MIT"
+      "license": "ISC"
     },
-    "node_modules/electron-builder/node_modules/fs-extra": {
-      "version": "10.1.0",
-      "dev": true,
+    "node_modules/@urql/core": {
+      "version": "2.3.6",
       "license": "MIT",
       "dependencies": {
-        "graceful-fs": "^4.2.0",
-        "jsonfile": "^6.0.1",
-        "universalify": "^2.0.0"
+        "@graphql-typed-document-node/core": "^3.1.0",
+        "wonka": "^4.0.14"
       },
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/electron-builder/node_modules/has-flag": {
-      "version": "4.0.0",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=8"
+      "peerDependencies": {
+        "graphql": "^0.11.0 || ^0.12.0 || ^0.13.0 || ^14.0.0 || ^15.0.0 || ^16.0.0"
       }
     },
-    "node_modules/electron-builder/node_modules/supports-color": {
-      "version": "7.2.0",
-      "dev": true,
+    "node_modules/@urql/exchange-retry": {
+      "version": "0.3.0",
       "license": "MIT",
       "dependencies": {
-        "has-flag": "^4.0.0"
+        "@urql/core": ">=2.3.1",
+        "wonka": "^4.0.14"
       },
-      "engines": {
-        "node": ">=8"
+      "peerDependencies": {
+        "graphql": "^0.11.0 || ^0.12.0 || ^0.13.0 || ^14.0.0 || ^15.0.0"
       }
     },
-    "node_modules/electron-publish": {
-      "version": "24.13.1",
+    "node_modules/@vercel/ncc": {
+      "version": "0.38.1",
       "dev": true,
       "license": "MIT",
-      "dependencies": {
-        "@types/fs-extra": "^9.0.11",
-        "builder-util": "24.13.1",
-        "builder-util-runtime": "9.2.4",
-        "chalk": "^4.1.2",
-        "fs-extra": "^10.1.0",
-        "lazy-val": "^1.0.5",
-        "mime": "^2.5.2"
+      "bin": {
+        "ncc": "dist/ncc/cli.js"
       }
     },
-    "node_modules/electron-publish/node_modules/ansi-styles": {
-      "version": "4.3.0",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "color-convert": "^2.0.1"
-      },
+    "node_modules/@vue/preload-webpack-plugin": {
+      "version": "2.0.0",
+      "license": "Apache-2.0",
       "engines": {
-        "node": ">=8"
+        "node": ">=6.0.0"
       },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
+      "peerDependencies": {
+        "html-webpack-plugin": "^5.0.0 || ^4.5.1",
+        "webpack": "^5.20.0 || ^4.1.0"
       }
     },
-    "node_modules/electron-publish/node_modules/chalk": {
-      "version": "4.1.2",
-      "dev": true,
-      "license": "MIT",
-      "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/@webassemblyjs/helper-buffer": {
+      "version": "1.11.6",
+      "license": "MIT"
     },
-    "node_modules/electron-publish/node_modules/color-convert": {
-      "version": "2.0.1",
-      "dev": true,
+    "node_modules/@webassemblyjs/helper-numbers": {
+      "version": "1.11.6",
       "license": "MIT",
       "dependencies": {
-        "color-name": "~1.1.4"
-      },
-      "engines": {
-        "node": ">=7.0.0"
+        "@webassemblyjs/floating-point-hex-parser": "1.11.6",
+        "@webassemblyjs/helper-api-error": "1.11.6",
+        "@xtuc/long": "4.2.2"
       }
     },
-    "node_modules/electron-publish/node_modules/color-name": {
-      "version": "1.1.4",
-      "dev": true,
+    "node_modules/@webassemblyjs/helper-numbers/node_modules/@webassemblyjs/floating-point-hex-parser": {
+      "version": "1.11.6",
       "license": "MIT"
     },
-    "node_modules/electron-publish/node_modules/fs-extra": {
-      "version": "10.1.0",
-      "dev": true,
+    "node_modules/@webassemblyjs/helper-numbers/node_modules/@webassemblyjs/helper-api-error": {
+      "version": "1.11.6",
+      "license": "MIT"
+    },
+    "node_modules/@webassemblyjs/helper-wasm-section": {
+      "version": "1.11.6",
       "license": "MIT",
       "dependencies": {
-        "graceful-fs": "^4.2.0",
-        "jsonfile": "^6.0.1",
-        "universalify": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=12"
+        "@webassemblyjs/ast": "1.11.6",
+        "@webassemblyjs/helper-buffer": "1.11.6",
+        "@webassemblyjs/helper-wasm-bytecode": "1.11.6",
+        "@webassemblyjs/wasm-gen": "1.11.6"
       }
     },
-    "node_modules/electron-publish/node_modules/has-flag": {
-      "version": "4.0.0",
-      "dev": true,
+    "node_modules/@webassemblyjs/helper-wasm-section/node_modules/@webassemblyjs/ast": {
+      "version": "1.11.6",
       "license": "MIT",
-      "engines": {
-        "node": ">=8"
+      "dependencies": {
+        "@webassemblyjs/helper-numbers": "1.11.6",
+        "@webassemblyjs/helper-wasm-bytecode": "1.11.6"
       }
     },
-    "node_modules/electron-publish/node_modules/supports-color": {
-      "version": "7.2.0",
-      "dev": true,
+    "node_modules/@webassemblyjs/helper-wasm-section/node_modules/@webassemblyjs/helper-wasm-bytecode": {
+      "version": "1.11.6",
+      "license": "MIT"
+    },
+    "node_modules/@webassemblyjs/ieee754": {
+      "version": "1.11.6",
       "license": "MIT",
       "dependencies": {
-        "has-flag": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=8"
+        "@xtuc/ieee754": "^1.2.0"
       }
     },
-    "node_modules/electron-to-chromium": {
-      "version": "1.4.723",
-      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.723.tgz",
-      "integrity": "sha512-rxFVtrMGMFROr4qqU6n95rUi9IlfIm+lIAt+hOToy/9r6CDv0XiEcQdC3VP71y1pE5CFTzKV0RvxOGYCPWWHPw=="
-    },
-    "node_modules/elliptic": {
-      "version": "6.5.4",
-      "license": "MIT",
+    "node_modules/@webassemblyjs/leb128": {
+      "version": "1.11.6",
+      "license": "Apache-2.0",
       "dependencies": {
-        "bn.js": "^4.11.9",
-        "brorand": "^1.1.0",
-        "hash.js": "^1.0.0",
-        "hmac-drbg": "^1.0.1",
-        "inherits": "^2.0.4",
-        "minimalistic-assert": "^1.0.1",
-        "minimalistic-crypto-utils": "^1.0.1"
+        "@xtuc/long": "4.2.2"
       }
     },
-    "node_modules/elliptic/node_modules/bn.js": {
-      "version": "4.12.0",
+    "node_modules/@webassemblyjs/utf8": {
+      "version": "1.11.6",
       "license": "MIT"
     },
-    "node_modules/emittery": {
-      "version": "0.13.1",
+    "node_modules/@webassemblyjs/wasm-edit": {
+      "version": "1.11.6",
       "license": "MIT",
-      "engines": {
-        "node": ">=12"
-      },
-      "funding": {
-        "url": "https://github.com/sindresorhus/emittery?sponsor=1"
+      "dependencies": {
+        "@webassemblyjs/ast": "1.11.6",
+        "@webassemblyjs/helper-buffer": "1.11.6",
+        "@webassemblyjs/helper-wasm-bytecode": "1.11.6",
+        "@webassemblyjs/helper-wasm-section": "1.11.6",
+        "@webassemblyjs/wasm-gen": "1.11.6",
+        "@webassemblyjs/wasm-opt": "1.11.6",
+        "@webassemblyjs/wasm-parser": "1.11.6",
+        "@webassemblyjs/wast-printer": "1.11.6"
       }
     },
-    "node_modules/emoji-regex": {
-      "version": "8.0.0",
-      "license": "MIT"
-    },
-    "node_modules/emojis-list": {
-      "version": "3.0.0",
-      "dev": true,
+    "node_modules/@webassemblyjs/wasm-edit/node_modules/@webassemblyjs/ast": {
+      "version": "1.11.6",
       "license": "MIT",
-      "engines": {
-        "node": ">= 4"
+      "dependencies": {
+        "@webassemblyjs/helper-numbers": "1.11.6",
+        "@webassemblyjs/helper-wasm-bytecode": "1.11.6"
       }
     },
-    "node_modules/encode-utf8": {
-      "version": "1.0.3",
+    "node_modules/@webassemblyjs/wasm-edit/node_modules/@webassemblyjs/helper-wasm-bytecode": {
+      "version": "1.11.6",
       "license": "MIT"
     },
-    "node_modules/encodeurl": {
-      "version": "1.0.2",
+    "node_modules/@webassemblyjs/wasm-edit/node_modules/@webassemblyjs/wast-printer": {
+      "version": "1.11.6",
       "license": "MIT",
-      "engines": {
-        "node": ">= 0.8"
+      "dependencies": {
+        "@webassemblyjs/ast": "1.11.6",
+        "@xtuc/long": "4.2.2"
       }
     },
-    "node_modules/end-of-stream": {
-      "version": "1.4.4",
+    "node_modules/@webassemblyjs/wasm-gen": {
+      "version": "1.11.6",
       "license": "MIT",
       "dependencies": {
-        "once": "^1.4.0"
+        "@webassemblyjs/ast": "1.11.6",
+        "@webassemblyjs/helper-wasm-bytecode": "1.11.6",
+        "@webassemblyjs/ieee754": "1.11.6",
+        "@webassemblyjs/leb128": "1.11.6",
+        "@webassemblyjs/utf8": "1.11.6"
       }
     },
-    "node_modules/endent": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/endent/-/endent-2.1.0.tgz",
-      "integrity": "sha512-r8VyPX7XL8U01Xgnb1CjZ3XV+z90cXIJ9JPE/R9SEC9vpw2P6CfsRPJmp20DppC5N7ZAMCmjYkJIa744Iyg96w==",
-      "dev": true,
+    "node_modules/@webassemblyjs/wasm-gen/node_modules/@webassemblyjs/ast": {
+      "version": "1.11.6",
+      "license": "MIT",
       "dependencies": {
-        "dedent": "^0.7.0",
-        "fast-json-parse": "^1.0.3",
-        "objectorarray": "^1.0.5"
+        "@webassemblyjs/helper-numbers": "1.11.6",
+        "@webassemblyjs/helper-wasm-bytecode": "1.11.6"
       }
     },
-    "node_modules/enhanced-resolve": {
-      "version": "5.15.0",
+    "node_modules/@webassemblyjs/wasm-gen/node_modules/@webassemblyjs/helper-wasm-bytecode": {
+      "version": "1.11.6",
+      "license": "MIT"
+    },
+    "node_modules/@webassemblyjs/wasm-opt": {
+      "version": "1.11.6",
       "license": "MIT",
       "dependencies": {
-        "graceful-fs": "^4.2.4",
-        "tapable": "^2.2.0"
-      },
-      "engines": {
-        "node": ">=10.13.0"
+        "@webassemblyjs/ast": "1.11.6",
+        "@webassemblyjs/helper-buffer": "1.11.6",
+        "@webassemblyjs/wasm-gen": "1.11.6",
+        "@webassemblyjs/wasm-parser": "1.11.6"
       }
     },
-    "node_modules/enquirer": {
-      "version": "2.3.6",
-      "dev": true,
+    "node_modules/@webassemblyjs/wasm-opt/node_modules/@webassemblyjs/ast": {
+      "version": "1.11.6",
       "license": "MIT",
       "dependencies": {
-        "ansi-colors": "^4.1.1"
-      },
-      "engines": {
-        "node": ">=8.6"
+        "@webassemblyjs/helper-numbers": "1.11.6",
+        "@webassemblyjs/helper-wasm-bytecode": "1.11.6"
       }
     },
-    "node_modules/entities": {
-      "version": "2.2.0",
-      "license": "BSD-2-Clause",
-      "funding": {
-        "url": "https://github.com/fb55/entities?sponsor=1"
+    "node_modules/@webassemblyjs/wasm-opt/node_modules/@webassemblyjs/helper-wasm-bytecode": {
+      "version": "1.11.6",
+      "license": "MIT"
+    },
+    "node_modules/@webassemblyjs/wasm-parser": {
+      "version": "1.11.6",
+      "license": "MIT",
+      "dependencies": {
+        "@webassemblyjs/ast": "1.11.6",
+        "@webassemblyjs/helper-api-error": "1.11.6",
+        "@webassemblyjs/helper-wasm-bytecode": "1.11.6",
+        "@webassemblyjs/ieee754": "1.11.6",
+        "@webassemblyjs/leb128": "1.11.6",
+        "@webassemblyjs/utf8": "1.11.6"
       }
     },
-    "node_modules/env-editor": {
-      "version": "0.4.2",
+    "node_modules/@webassemblyjs/wasm-parser/node_modules/@webassemblyjs/ast": {
+      "version": "1.11.6",
       "license": "MIT",
-      "engines": {
-        "node": ">=8"
+      "dependencies": {
+        "@webassemblyjs/helper-numbers": "1.11.6",
+        "@webassemblyjs/helper-wasm-bytecode": "1.11.6"
       }
     },
-    "node_modules/env-paths": {
-      "version": "2.2.1",
+    "node_modules/@webassemblyjs/wasm-parser/node_modules/@webassemblyjs/helper-api-error": {
+      "version": "1.11.6",
+      "license": "MIT"
+    },
+    "node_modules/@webassemblyjs/wasm-parser/node_modules/@webassemblyjs/helper-wasm-bytecode": {
+      "version": "1.11.6",
+      "license": "MIT"
+    },
+    "node_modules/@webpack-cli/configtest": {
+      "version": "2.1.1",
       "dev": true,
       "license": "MIT",
       "engines": {
-        "node": ">=6"
+        "node": ">=14.15.0"
+      },
+      "peerDependencies": {
+        "webpack": "5.x.x",
+        "webpack-cli": "5.x.x"
       }
     },
-    "node_modules/envinfo": {
-      "version": "7.11.0",
+    "node_modules/@webpack-cli/info": {
+      "version": "2.0.2",
+      "dev": true,
       "license": "MIT",
-      "bin": {
-        "envinfo": "dist/cli.js"
-      },
       "engines": {
-        "node": ">=4"
+        "node": ">=14.15.0"
+      },
+      "peerDependencies": {
+        "webpack": "5.x.x",
+        "webpack-cli": "5.x.x"
       }
     },
-    "node_modules/eol": {
-      "version": "0.9.1",
-      "license": "MIT"
-    },
-    "node_modules/err-code": {
-      "version": "2.0.3",
+    "node_modules/@webpack-cli/serve": {
+      "version": "2.0.5",
       "dev": true,
-      "license": "MIT"
-    },
-    "node_modules/errno": {
-      "version": "0.1.8",
       "license": "MIT",
-      "dependencies": {
-        "prr": "~1.0.1"
+      "engines": {
+        "node": ">=14.15.0"
       },
-      "bin": {
-        "errno": "cli.js"
+      "peerDependencies": {
+        "webpack": "5.x.x",
+        "webpack-cli": "5.x.x"
+      },
+      "peerDependenciesMeta": {
+        "webpack-dev-server": {
+          "optional": true
+        }
       }
     },
-    "node_modules/error-ex": {
-      "version": "1.3.2",
+    "node_modules/@welldone-software/why-did-you-render": {
+      "version": "7.0.1",
+      "dev": true,
       "license": "MIT",
       "dependencies": {
-        "is-arrayish": "^0.2.1"
+        "lodash": "^4"
+      },
+      "peerDependencies": {
+        "react": "^16 || ^17 || ^18"
       }
     },
-    "node_modules/error-stack-parser": {
-      "version": "2.1.4",
+    "node_modules/@xmldom/xmldom": {
+      "version": "0.7.13",
       "license": "MIT",
-      "dependencies": {
-        "stackframe": "^1.3.4"
-      }
-    },
-    "node_modules/errorhandler": {
-      "version": "1.5.1",
-      "resolved": "https://registry.npmjs.org/errorhandler/-/errorhandler-1.5.1.tgz",
-      "integrity": "sha512-rcOwbfvP1WTViVoUjcfZicVzjhjTuhSMntHh6mW3IrEiyE6mJyXvsToJUJGlGlw/2xU9P5whlWNGlIDVeCiT4A==",
-      "dependencies": {
-        "accepts": "~1.3.7",
-        "escape-html": "~1.0.3"
-      },
       "engines": {
-        "node": ">= 0.8"
+        "node": ">=10.0.0"
       }
     },
-    "node_modules/es-abstract": {
-      "version": "1.22.1",
-      "dev": true,
-      "license": "MIT",
+    "node_modules/@xtuc/ieee754": {
+      "version": "1.2.0",
+      "license": "BSD-3-Clause"
+    },
+    "node_modules/@xtuc/long": {
+      "version": "4.2.2",
+      "license": "Apache-2.0"
+    },
+    "node_modules/@yarnpkg/esbuild-plugin-pnp": {
+      "version": "3.0.0-rc.15",
+      "dev": true,
+      "license": "BSD-2-Clause",
       "dependencies": {
-        "array-buffer-byte-length": "^1.0.0",
-        "arraybuffer.prototype.slice": "^1.0.1",
-        "available-typed-arrays": "^1.0.5",
-        "call-bind": "^1.0.2",
-        "es-set-tostringtag": "^2.0.1",
-        "es-to-primitive": "^1.2.1",
-        "function.prototype.name": "^1.1.5",
-        "get-intrinsic": "^1.2.1",
-        "get-symbol-description": "^1.0.0",
-        "globalthis": "^1.0.3",
-        "gopd": "^1.0.1",
-        "has": "^1.0.3",
-        "has-property-descriptors": "^1.0.0",
-        "has-proto": "^1.0.1",
-        "has-symbols": "^1.0.3",
-        "internal-slot": "^1.0.5",
-        "is-array-buffer": "^3.0.2",
-        "is-callable": "^1.2.7",
-        "is-negative-zero": "^2.0.2",
-        "is-regex": "^1.1.4",
-        "is-shared-array-buffer": "^1.0.2",
-        "is-string": "^1.0.7",
-        "is-typed-array": "^1.1.10",
-        "is-weakref": "^1.0.2",
-        "object-inspect": "^1.12.3",
-        "object-keys": "^1.1.1",
-        "object.assign": "^4.1.4",
-        "regexp.prototype.flags": "^1.5.0",
-        "safe-array-concat": "^1.0.0",
-        "safe-regex-test": "^1.0.0",
-        "string.prototype.trim": "^1.2.7",
-        "string.prototype.trimend": "^1.0.6",
-        "string.prototype.trimstart": "^1.0.6",
-        "typed-array-buffer": "^1.0.0",
-        "typed-array-byte-length": "^1.0.0",
-        "typed-array-byte-offset": "^1.0.0",
-        "typed-array-length": "^1.0.4",
-        "unbox-primitive": "^1.0.2",
-        "which-typed-array": "^1.1.10"
+        "tslib": "^2.4.0"
       },
       "engines": {
-        "node": ">= 0.4"
+        "node": ">=14.15.0"
       },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
+      "peerDependencies": {
+        "esbuild": ">=0.10.0"
       }
     },
-    "node_modules/es-get-iterator": {
-      "version": "1.1.2",
+    "node_modules/@yarnpkg/fslib": {
+      "version": "2.10.3",
       "dev": true,
-      "license": "MIT",
+      "license": "BSD-2-Clause",
       "dependencies": {
-        "call-bind": "^1.0.2",
-        "get-intrinsic": "^1.1.0",
-        "has-symbols": "^1.0.1",
-        "is-arguments": "^1.1.0",
-        "is-map": "^2.0.2",
-        "is-set": "^2.0.2",
-        "is-string": "^1.0.5",
-        "isarray": "^2.0.5"
+        "@yarnpkg/libzip": "^2.3.0",
+        "tslib": "^1.13.0"
       },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
+      "engines": {
+        "node": ">=12 <14 || 14.2 - 14.9 || >14.10.0"
       }
     },
-    "node_modules/es-iterator-helpers": {
-      "version": "1.0.13",
+    "node_modules/@yarnpkg/fslib/node_modules/tslib": {
+      "version": "1.14.1",
       "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "asynciterator.prototype": "^1.0.0",
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.2.0",
-        "es-abstract": "^1.21.3",
-        "es-set-tostringtag": "^2.0.1",
-        "function-bind": "^1.1.1",
-        "get-intrinsic": "^1.2.1",
-        "globalthis": "^1.0.3",
-        "has-property-descriptors": "^1.0.0",
-        "has-proto": "^1.0.1",
-        "has-symbols": "^1.0.3",
-        "internal-slot": "^1.0.5",
-        "iterator.prototype": "^1.1.0",
-        "safe-array-concat": "^1.0.0"
-      }
-    },
-    "node_modules/es-module-lexer": {
-      "version": "1.5.0",
-      "resolved": "https://registry.npmjs.org/es-module-lexer/-/es-module-lexer-1.5.0.tgz",
-      "integrity": "sha512-pqrTKmwEIgafsYZAGw9kszYzmagcE/n4dbgwGWLEXg7J4QFJVQRBld8j3Q3GNez79jzxZshq0bcT962QHOghjw=="
+      "license": "0BSD"
     },
-    "node_modules/es-set-tostringtag": {
-      "version": "2.0.1",
+    "node_modules/@yarnpkg/libzip": {
+      "version": "2.3.0",
       "dev": true,
-      "license": "MIT",
+      "license": "BSD-2-Clause",
       "dependencies": {
-        "get-intrinsic": "^1.1.3",
-        "has": "^1.0.3",
-        "has-tostringtag": "^1.0.0"
+        "@types/emscripten": "^1.39.6",
+        "tslib": "^1.13.0"
       },
       "engines": {
-        "node": ">= 0.4"
+        "node": ">=12 <14 || 14.2 - 14.9 || >14.10.0"
       }
     },
-    "node_modules/es-shim-unscopables": {
-      "version": "1.0.0",
+    "node_modules/@yarnpkg/libzip/node_modules/tslib": {
+      "version": "1.14.1",
+      "dev": true,
+      "license": "0BSD"
+    },
+    "node_modules/@yarnpkg/lockfile": {
+      "version": "1.1.0",
+      "dev": true,
+      "license": "BSD-2-Clause"
+    },
+    "node_modules/7zip-bin": {
+      "version": "5.2.0",
       "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/abab": {
+      "version": "2.0.6",
+      "license": "BSD-3-Clause"
+    },
+    "node_modules/abbrev": {
+      "version": "1.1.1",
+      "devOptional": true,
+      "license": "ISC"
+    },
+    "node_modules/abort-controller": {
+      "version": "3.0.0",
       "license": "MIT",
       "dependencies": {
-        "has": "^1.0.3"
+        "event-target-shim": "^5.0.0"
+      },
+      "engines": {
+        "node": ">=6.5"
       }
     },
-    "node_modules/es-to-primitive": {
-      "version": "1.2.1",
-      "dev": true,
+    "node_modules/accepts": {
+      "version": "1.3.8",
       "license": "MIT",
       "dependencies": {
-        "is-callable": "^1.1.4",
-        "is-date-object": "^1.0.1",
-        "is-symbol": "^1.0.2"
+        "mime-types": "~2.1.34",
+        "negotiator": "0.6.3"
       },
       "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
+        "node": ">= 0.6"
       }
     },
-    "node_modules/es6-error": {
-      "version": "4.1.1",
+    "node_modules/acorn": {
+      "version": "7.4.1",
       "dev": true,
-      "license": "MIT"
-    },
-    "node_modules/esbuild": {
-      "version": "0.20.2",
-      "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.20.2.tgz",
-      "integrity": "sha512-WdOOppmUNU+IbZ0PaDiTst80zjnrOkyJNHoKupIcVyU8Lvla3Ugx94VzkQ32Ijqd7UhHJy75gNWDMUekcrSJ6g==",
-      "hasInstallScript": true,
+      "license": "MIT",
       "bin": {
-        "esbuild": "bin/esbuild"
+        "acorn": "bin/acorn"
       },
       "engines": {
-        "node": ">=12"
-      },
-      "optionalDependencies": {
-        "@esbuild/aix-ppc64": "0.20.2",
-        "@esbuild/android-arm": "0.20.2",
-        "@esbuild/android-arm64": "0.20.2",
-        "@esbuild/android-x64": "0.20.2",
-        "@esbuild/darwin-arm64": "0.20.2",
-        "@esbuild/darwin-x64": "0.20.2",
-        "@esbuild/freebsd-arm64": "0.20.2",
-        "@esbuild/freebsd-x64": "0.20.2",
-        "@esbuild/linux-arm": "0.20.2",
-        "@esbuild/linux-arm64": "0.20.2",
-        "@esbuild/linux-ia32": "0.20.2",
-        "@esbuild/linux-loong64": "0.20.2",
-        "@esbuild/linux-mips64el": "0.20.2",
-        "@esbuild/linux-ppc64": "0.20.2",
-        "@esbuild/linux-riscv64": "0.20.2",
-        "@esbuild/linux-s390x": "0.20.2",
-        "@esbuild/linux-x64": "0.20.2",
-        "@esbuild/netbsd-x64": "0.20.2",
-        "@esbuild/openbsd-x64": "0.20.2",
-        "@esbuild/sunos-x64": "0.20.2",
-        "@esbuild/win32-arm64": "0.20.2",
-        "@esbuild/win32-ia32": "0.20.2",
-        "@esbuild/win32-x64": "0.20.2"
+        "node": ">=0.4.0"
       }
     },
-    "node_modules/esbuild-plugin-alias": {
-      "version": "0.2.1",
-      "resolved": "https://registry.npmjs.org/esbuild-plugin-alias/-/esbuild-plugin-alias-0.2.1.tgz",
-      "integrity": "sha512-jyfL/pwPqaFXyKnj8lP8iLk6Z0m099uXR45aSN8Av1XD4vhvQutxxPzgA2bTcAwQpa1zCXDcWOlhFgyP3GKqhQ=="
-    },
-    "node_modules/esbuild-register": {
-      "version": "3.5.0",
-      "resolved": "https://registry.npmjs.org/esbuild-register/-/esbuild-register-3.5.0.tgz",
-      "integrity": "sha512-+4G/XmakeBAsvJuDugJvtyF1x+XJT4FMocynNpxrvEBViirpfUn2PgNpCHedfWhF4WokNsO/OvMKrmJOIJsI5A==",
+    "node_modules/acorn-dynamic-import": {
+      "version": "2.0.2",
+      "license": "MIT",
       "dependencies": {
-        "debug": "^4.3.4"
-      },
-      "peerDependencies": {
-        "esbuild": ">=0.12 <1"
+        "acorn": "^4.0.3"
       }
     },
-    "node_modules/escalade": {
-      "version": "3.1.1",
+    "node_modules/acorn-dynamic-import/node_modules/acorn": {
+      "version": "4.0.13",
       "license": "MIT",
+      "bin": {
+        "acorn": "bin/acorn"
+      },
       "engines": {
-        "node": ">=6"
+        "node": ">=0.4.0"
       }
     },
-    "node_modules/escape-html": {
-      "version": "1.0.3",
-      "license": "MIT"
-    },
-    "node_modules/escape-latex": {
-      "version": "1.2.0",
-      "dev": true,
-      "license": "MIT"
-    },
-    "node_modules/escape-string-regexp": {
-      "version": "4.0.0",
+    "node_modules/acorn-globals": {
+      "version": "7.0.1",
       "license": "MIT",
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
+      "dependencies": {
+        "acorn": "^8.1.0",
+        "acorn-walk": "^8.0.2"
       }
     },
-    "node_modules/escodegen": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/escodegen/-/escodegen-2.1.0.tgz",
-      "integrity": "sha512-2NlIDTwUWJN0mRPQOdtQBzbUHvdGY2P1VXSyU83Q3xKxM7WHX2Ql8dKq782Q9TgQUNOLEzEYu9bzLNj1q88I5w==",
-      "dependencies": {
-        "esprima": "^4.0.1",
-        "estraverse": "^5.2.0",
-        "esutils": "^2.0.2"
-      },
+    "node_modules/acorn-globals/node_modules/acorn": {
+      "version": "8.11.3",
+      "license": "MIT",
       "bin": {
-        "escodegen": "bin/escodegen.js",
-        "esgenerate": "bin/esgenerate.js"
+        "acorn": "bin/acorn"
       },
       "engines": {
-        "node": ">=6.0"
-      },
-      "optionalDependencies": {
-        "source-map": "~0.6.1"
+        "node": ">=0.4.0"
       }
     },
-    "node_modules/eslint": {
-      "version": "7.32.0",
-      "dev": true,
+    "node_modules/acorn-globals/node_modules/acorn-walk": {
+      "version": "8.3.1",
       "license": "MIT",
-      "dependencies": {
-        "@babel/code-frame": "7.12.11",
-        "@eslint/eslintrc": "^0.4.3",
-        "@humanwhocodes/config-array": "^0.5.0",
-        "ajv": "^6.10.0",
-        "chalk": "^4.0.0",
-        "cross-spawn": "^7.0.2",
-        "debug": "^4.0.1",
-        "doctrine": "^3.0.0",
-        "enquirer": "^2.3.5",
-        "escape-string-regexp": "^4.0.0",
-        "eslint-scope": "^5.1.1",
-        "eslint-utils": "^2.1.0",
-        "eslint-visitor-keys": "^2.0.0",
-        "espree": "^7.3.1",
-        "esquery": "^1.4.0",
-        "esutils": "^2.0.2",
-        "fast-deep-equal": "^3.1.3",
-        "file-entry-cache": "^6.0.1",
-        "functional-red-black-tree": "^1.0.1",
-        "glob-parent": "^5.1.2",
-        "globals": "^13.6.0",
-        "ignore": "^4.0.6",
-        "import-fresh": "^3.0.0",
-        "imurmurhash": "^0.1.4",
-        "is-glob": "^4.0.0",
-        "js-yaml": "^3.13.1",
-        "json-stable-stringify-without-jsonify": "^1.0.1",
-        "levn": "^0.4.1",
-        "lodash.merge": "^4.6.2",
-        "minimatch": "^3.0.4",
-        "natural-compare": "^1.4.0",
-        "optionator": "^0.9.1",
-        "progress": "^2.0.0",
-        "regexpp": "^3.1.0",
-        "semver": "^7.2.1",
-        "strip-ansi": "^6.0.0",
-        "strip-json-comments": "^3.1.0",
-        "table": "^6.0.9",
-        "text-table": "^0.2.0",
-        "v8-compile-cache": "^2.0.3"
-      },
-      "bin": {
-        "eslint": "bin/eslint.js"
-      },
       "engines": {
-        "node": "^10.12.0 || >=12.0.0"
-      },
-      "funding": {
-        "url": "https://opencollective.com/eslint"
+        "node": ">=0.4.0"
       }
     },
-    "node_modules/eslint-config-airbnb": {
-      "version": "19.0.4",
+    "node_modules/acorn-jsx": {
+      "version": "5.3.2",
       "dev": true,
       "license": "MIT",
-      "dependencies": {
-        "eslint-config-airbnb-base": "^15.0.0",
-        "object.assign": "^4.1.2",
-        "object.entries": "^1.1.5"
-      },
-      "engines": {
-        "node": "^10.12.0 || ^12.22.0 || ^14.17.0 || >=16.0.0"
-      },
       "peerDependencies": {
-        "eslint": "^7.32.0 || ^8.2.0",
-        "eslint-plugin-import": "^2.25.3",
-        "eslint-plugin-jsx-a11y": "^6.5.1",
-        "eslint-plugin-react": "^7.28.0",
-        "eslint-plugin-react-hooks": "^4.3.0"
+        "acorn": "^6.0.0 || ^7.0.0 || ^8.0.0"
       }
     },
-    "node_modules/eslint-config-airbnb-base": {
-      "version": "15.0.0",
+    "node_modules/acorn-walk": {
+      "version": "7.2.0",
       "dev": true,
       "license": "MIT",
-      "dependencies": {
-        "confusing-browser-globals": "^1.0.10",
-        "object.assign": "^4.1.2",
-        "object.entries": "^1.1.5",
-        "semver": "^6.3.0"
-      },
       "engines": {
-        "node": "^10.12.0 || >=12.0.0"
-      },
-      "peerDependencies": {
-        "eslint": "^7.32.0 || ^8.2.0",
-        "eslint-plugin-import": "^2.25.2"
+        "node": ">=0.4.0"
       }
     },
-    "node_modules/eslint-config-airbnb-base/node_modules/semver": {
-      "version": "6.3.1",
+    "node_modules/address": {
+      "version": "1.2.2",
       "dev": true,
-      "license": "ISC",
-      "bin": {
-        "semver": "bin/semver.js"
+      "license": "MIT",
+      "engines": {
+        "node": ">= 10.0.0"
       }
     },
-    "node_modules/eslint-config-airbnb-typescript": {
-      "version": "17.1.0",
-      "dev": true,
+    "node_modules/adm-zip": {
+      "version": "0.5.10",
+      "license": "MIT",
+      "engines": {
+        "node": ">=6.0"
+      }
+    },
+    "node_modules/agent-base": {
+      "version": "6.0.2",
       "license": "MIT",
       "dependencies": {
-        "eslint-config-airbnb-base": "^15.0.0"
+        "debug": "4"
       },
-      "peerDependencies": {
-        "@typescript-eslint/eslint-plugin": "^5.13.0 || ^6.0.0",
-        "@typescript-eslint/parser": "^5.0.0 || ^6.0.0",
-        "eslint": "^7.32.0 || ^8.2.0",
-        "eslint-plugin-import": "^2.25.3"
+      "engines": {
+        "node": ">= 6.0.0"
       }
     },
-    "node_modules/eslint-config-expensify": {
-      "version": "2.0.48",
-      "resolved": "https://registry.npmjs.org/eslint-config-expensify/-/eslint-config-expensify-2.0.48.tgz",
-      "integrity": "sha512-PFegJ9Wfsiu5tgevhjA1toCxsZ8Etfk6pIjtXAnwpmVj7q4CtB3QDRusJoUDyJ3HrZr8AsFKViz7CU/CBTfwOw==",
+    "node_modules/agentkeepalive": {
+      "version": "4.5.0",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "@lwc/eslint-plugin-lwc": "^1.7.2",
-        "babel-eslint": "^10.1.0",
-        "eslint": "^7.32.0",
-        "eslint-config-airbnb": "19.0.4",
-        "eslint-config-airbnb-base": "15.0.0",
-        "eslint-plugin-es": "^4.1.0",
-        "eslint-plugin-import": "^2.25.2",
-        "eslint-plugin-jsx-a11y": "^6.2.3",
-        "eslint-plugin-react": "^7.18.0",
-        "eslint-plugin-react-hooks": "^4.6.0",
-        "eslint-plugin-rulesdir": "^0.2.2",
-        "lodash": "^4.17.21",
-        "underscore": "^1.13.6"
+        "humanize-ms": "^1.2.1"
+      },
+      "engines": {
+        "node": ">= 8.0.0"
       }
     },
-    "node_modules/eslint-config-prettier": {
-      "version": "8.10.0",
-      "dev": true,
+    "node_modules/aggregate-error": {
+      "version": "3.1.0",
       "license": "MIT",
-      "bin": {
-        "eslint-config-prettier": "bin/cli.js"
+      "dependencies": {
+        "clean-stack": "^2.0.0",
+        "indent-string": "^4.0.0"
       },
-      "peerDependencies": {
-        "eslint": ">=7.0.0"
+      "engines": {
+        "node": ">=8"
       }
     },
-    "node_modules/eslint-import-resolver-node": {
-      "version": "0.3.9",
-      "dev": true,
+    "node_modules/ajv": {
+      "version": "8.12.0",
       "license": "MIT",
       "dependencies": {
-        "debug": "^3.2.7",
-        "is-core-module": "^2.13.0",
-        "resolve": "^1.22.4"
+        "fast-deep-equal": "^3.1.1",
+        "json-schema-traverse": "^1.0.0",
+        "require-from-string": "^2.0.2",
+        "uri-js": "^4.2.2"
+      },
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/epoberezkin"
       }
     },
-    "node_modules/eslint-import-resolver-node/node_modules/debug": {
-      "version": "3.2.7",
+    "node_modules/ajv-cli": {
+      "version": "5.0.0",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "ms": "^2.1.1"
+        "ajv": "^8.0.0",
+        "fast-json-patch": "^2.0.0",
+        "glob": "^7.1.0",
+        "js-yaml": "^3.14.0",
+        "json-schema-migrate": "^2.0.0",
+        "json5": "^2.1.3",
+        "minimist": "^1.2.0"
+      },
+      "bin": {
+        "ajv": "dist/index.js"
+      },
+      "peerDependencies": {
+        "ts-node": ">=9.0.0"
+      },
+      "peerDependenciesMeta": {
+        "ts-node": {
+          "optional": true
+        }
       }
     },
-    "node_modules/eslint-module-utils": {
-      "version": "2.8.0",
+    "node_modules/ajv-formats": {
+      "version": "2.1.1",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "debug": "^3.2.7"
+        "ajv": "^8.0.0"
       },
-      "engines": {
-        "node": ">=4"
+      "peerDependencies": {
+        "ajv": "^8.0.0"
       },
       "peerDependenciesMeta": {
-        "eslint": {
+        "ajv": {
           "optional": true
         }
       }
     },
-    "node_modules/eslint-module-utils/node_modules/debug": {
-      "version": "3.2.7",
-      "dev": true,
+    "node_modules/ajv-keywords": {
+      "version": "1.5.1",
       "license": "MIT",
-      "dependencies": {
-        "ms": "^2.1.1"
+      "peerDependencies": {
+        "ajv": ">=4.10.0"
       }
     },
-    "node_modules/eslint-plugin-es": {
-      "version": "4.1.0",
-      "dev": true,
+    "node_modules/align-text": {
+      "version": "0.1.4",
       "license": "MIT",
       "dependencies": {
-        "eslint-utils": "^2.0.0",
-        "regexpp": "^3.0.0"
+        "kind-of": "^3.0.2",
+        "longest": "^1.0.1",
+        "repeat-string": "^1.5.2"
       },
       "engines": {
-        "node": ">=8.10.0"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/mysticatea"
-      },
-      "peerDependencies": {
-        "eslint": ">=4.19.1"
+        "node": ">=0.10.0"
       }
     },
-    "node_modules/eslint-plugin-es/node_modules/eslint-utils": {
-      "version": "2.1.0",
-      "dev": true,
+    "node_modules/align-text/node_modules/kind-of": {
+      "version": "3.2.2",
       "license": "MIT",
       "dependencies": {
-        "eslint-visitor-keys": "^1.1.0"
+        "is-buffer": "^1.1.5"
       },
       "engines": {
-        "node": ">=6"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/mysticatea"
+        "node": ">=0.10.0"
       }
     },
-    "node_modules/eslint-plugin-es/node_modules/eslint-visitor-keys": {
-      "version": "1.3.0",
-      "dev": true,
-      "license": "Apache-2.0",
-      "engines": {
-        "node": ">=4"
-      }
+    "node_modules/anser": {
+      "version": "1.4.10",
+      "license": "MIT"
     },
-    "node_modules/eslint-plugin-eslint-comments": {
-      "version": "3.2.0",
-      "dev": true,
+    "node_modules/ansi-escapes": {
+      "version": "4.3.2",
       "license": "MIT",
       "dependencies": {
-        "escape-string-regexp": "^1.0.5",
-        "ignore": "^5.0.5"
+        "type-fest": "^0.21.3"
       },
       "engines": {
-        "node": ">=6.5.0"
+        "node": ">=8"
       },
       "funding": {
-        "url": "https://github.com/sponsors/mysticatea"
-      },
-      "peerDependencies": {
-        "eslint": ">=4.19.1"
-      }
-    },
-    "node_modules/eslint-plugin-eslint-comments/node_modules/escape-string-regexp": {
-      "version": "1.0.5",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=0.8.0"
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/eslint-plugin-flowtype": {
-      "version": "2.50.3",
-      "dev": true,
-      "license": "BSD-3-Clause",
-      "dependencies": {
-        "lodash": "^4.17.10"
-      },
+    "node_modules/ansi-escapes/node_modules/type-fest": {
+      "version": "0.21.3",
+      "license": "(MIT OR CC0-1.0)",
       "engines": {
-        "node": ">=4"
+        "node": ">=10"
       },
-      "peerDependencies": {
-        "eslint": ">=2.0.0"
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/eslint-plugin-import": {
-      "version": "2.29.1",
-      "dev": true,
+    "node_modules/ansi-fragments": {
+      "version": "0.2.1",
       "license": "MIT",
       "dependencies": {
-        "array-includes": "^3.1.7",
-        "array.prototype.findlastindex": "^1.2.3",
-        "array.prototype.flat": "^1.3.2",
-        "array.prototype.flatmap": "^1.3.2",
-        "debug": "^3.2.7",
-        "doctrine": "^2.1.0",
-        "eslint-import-resolver-node": "^0.3.9",
-        "eslint-module-utils": "^2.8.0",
-        "hasown": "^2.0.0",
-        "is-core-module": "^2.13.1",
-        "is-glob": "^4.0.3",
-        "minimatch": "^3.1.2",
-        "object.fromentries": "^2.0.7",
-        "object.groupby": "^1.0.1",
-        "object.values": "^1.1.7",
-        "semver": "^6.3.1",
-        "tsconfig-paths": "^3.15.0"
-      },
+        "colorette": "^1.0.7",
+        "slice-ansi": "^2.0.0",
+        "strip-ansi": "^5.0.0"
+      }
+    },
+    "node_modules/ansi-fragments/node_modules/astral-regex": {
+      "version": "1.0.0",
+      "license": "MIT",
       "engines": {
         "node": ">=4"
-      },
-      "peerDependencies": {
-        "eslint": "^2 || ^3 || ^4 || ^5 || ^6 || ^7.2.0 || ^8"
       }
     },
-    "node_modules/eslint-plugin-import/node_modules/debug": {
-      "version": "3.2.7",
-      "dev": true,
+    "node_modules/ansi-fragments/node_modules/is-fullwidth-code-point": {
+      "version": "2.0.0",
       "license": "MIT",
-      "dependencies": {
-        "ms": "^2.1.1"
+      "engines": {
+        "node": ">=4"
       }
     },
-    "node_modules/eslint-plugin-import/node_modules/doctrine": {
+    "node_modules/ansi-fragments/node_modules/slice-ansi": {
       "version": "2.1.0",
-      "dev": true,
-      "license": "Apache-2.0",
+      "license": "MIT",
       "dependencies": {
-        "esutils": "^2.0.2"
+        "ansi-styles": "^3.2.0",
+        "astral-regex": "^1.0.0",
+        "is-fullwidth-code-point": "^2.0.0"
       },
       "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/eslint-plugin-import/node_modules/semver": {
-      "version": "6.3.1",
-      "dev": true,
-      "license": "ISC",
-      "bin": {
-        "semver": "bin/semver.js"
+        "node": ">=6"
       }
     },
-    "node_modules/eslint-plugin-jest": {
-      "version": "24.7.0",
-      "dev": true,
+    "node_modules/ansi-fragments/node_modules/strip-ansi": {
+      "version": "5.2.0",
       "license": "MIT",
       "dependencies": {
-        "@typescript-eslint/experimental-utils": "^4.0.1"
+        "ansi-regex": "^4.1.0"
       },
       "engines": {
-        "node": ">=10"
-      },
-      "peerDependencies": {
-        "@typescript-eslint/eslint-plugin": ">= 4",
-        "eslint": ">=5"
-      },
-      "peerDependenciesMeta": {
-        "@typescript-eslint/eslint-plugin": {
-          "optional": true
-        }
+        "node": ">=6"
       }
     },
-    "node_modules/eslint-plugin-jsdoc": {
-      "version": "46.2.6",
+    "node_modules/ansi-html-community": {
+      "version": "0.0.8",
       "dev": true,
-      "license": "BSD-3-Clause",
-      "dependencies": {
-        "@es-joy/jsdoccomment": "~0.39.4",
-        "are-docs-informative": "^0.0.2",
-        "comment-parser": "1.3.1",
-        "debug": "^4.3.4",
-        "escape-string-regexp": "^4.0.0",
-        "esquery": "^1.5.0",
-        "is-builtin-module": "^3.2.1",
-        "semver": "^7.5.1",
-        "spdx-expression-parse": "^3.0.1"
-      },
-      "engines": {
-        "node": ">=16"
-      },
-      "peerDependencies": {
-        "eslint": "^7.0.0 || ^8.0.0"
+      "engines": [
+        "node >= 0.8.0"
+      ],
+      "license": "Apache-2.0",
+      "bin": {
+        "ansi-html": "bin/ansi-html"
       }
     },
-    "node_modules/eslint-plugin-jsx-a11y": {
-      "version": "6.7.1",
-      "dev": true,
+    "node_modules/ansi-regex": {
+      "version": "4.1.1",
       "license": "MIT",
-      "dependencies": {
-        "@babel/runtime": "^7.20.7",
-        "aria-query": "^5.1.3",
-        "array-includes": "^3.1.6",
-        "array.prototype.flatmap": "^1.3.1",
-        "ast-types-flow": "^0.0.7",
-        "axe-core": "^4.6.2",
-        "axobject-query": "^3.1.1",
-        "damerau-levenshtein": "^1.0.8",
-        "emoji-regex": "^9.2.2",
-        "has": "^1.0.3",
-        "jsx-ast-utils": "^3.3.3",
-        "language-tags": "=1.0.5",
-        "minimatch": "^3.1.2",
-        "object.entries": "^1.1.6",
-        "object.fromentries": "^2.0.6",
-        "semver": "^6.3.0"
-      },
       "engines": {
-        "node": ">=4.0"
-      },
-      "peerDependencies": {
-        "eslint": "^3 || ^4 || ^5 || ^6 || ^7 || ^8"
+        "node": ">=6"
       }
     },
-    "node_modules/eslint-plugin-jsx-a11y/node_modules/axobject-query": {
+    "node_modules/ansi-styles": {
       "version": "3.2.1",
-      "dev": true,
-      "license": "Apache-2.0",
+      "license": "MIT",
       "dependencies": {
-        "dequal": "^2.0.3"
+        "color-convert": "^1.9.0"
+      },
+      "engines": {
+        "node": ">=4"
       }
     },
-    "node_modules/eslint-plugin-jsx-a11y/node_modules/emoji-regex": {
-      "version": "9.2.2",
-      "dev": true,
+    "node_modules/any-promise": {
+      "version": "1.3.0",
       "license": "MIT"
     },
-    "node_modules/eslint-plugin-jsx-a11y/node_modules/semver": {
-      "version": "6.3.1",
-      "dev": true,
+    "node_modules/anymatch": {
+      "version": "3.1.3",
       "license": "ISC",
-      "bin": {
-        "semver": "bin/semver.js"
-      }
-    },
-    "node_modules/eslint-plugin-prettier": {
-      "version": "3.1.2",
-      "dev": true,
-      "license": "MIT",
       "dependencies": {
-        "prettier-linter-helpers": "^1.0.0"
+        "normalize-path": "^3.0.0",
+        "picomatch": "^2.0.4"
       },
       "engines": {
-        "node": ">=6.0.0"
-      },
-      "peerDependencies": {
-        "eslint": ">= 5.0.0",
-        "prettier": ">= 1.13.0"
+        "node": ">= 8"
       }
     },
-    "node_modules/eslint-plugin-react": {
-      "version": "7.33.2",
+    "node_modules/app-builder-bin": {
+      "version": "5.0.0-alpha.4",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/app-builder-lib": {
+      "version": "25.0.0",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "array-includes": "^3.1.6",
-        "array.prototype.flatmap": "^1.3.1",
-        "array.prototype.tosorted": "^1.1.1",
-        "doctrine": "^2.1.0",
-        "es-iterator-helpers": "^1.0.12",
-        "estraverse": "^5.3.0",
-        "jsx-ast-utils": "^2.4.1 || ^3.0.0",
-        "minimatch": "^3.1.2",
-        "object.entries": "^1.1.6",
-        "object.fromentries": "^2.0.6",
-        "object.hasown": "^1.1.2",
-        "object.values": "^1.1.6",
-        "prop-types": "^15.8.1",
-        "resolve": "^2.0.0-next.4",
-        "semver": "^6.3.1",
-        "string.prototype.matchall": "^4.0.8"
+        "@develar/schema-utils": "~2.6.5",
+        "@electron/notarize": "2.3.2",
+        "@electron/osx-sign": "1.3.0",
+        "@electron/rebuild": "3.6.0",
+        "@electron/universal": "2.0.1",
+        "@malept/flatpak-bundler": "^0.4.0",
+        "@types/fs-extra": "9.0.13",
+        "async-exit-hook": "^2.0.1",
+        "bluebird-lst": "^1.0.9",
+        "builder-util": "25.0.0",
+        "builder-util-runtime": "9.2.5",
+        "chromium-pickle-js": "^0.2.0",
+        "debug": "^4.3.4",
+        "ejs": "^3.1.8",
+        "electron-publish": "25.0.0",
+        "form-data": "^4.0.0",
+        "fs-extra": "^10.1.0",
+        "hosted-git-info": "^4.1.0",
+        "is-ci": "^3.0.0",
+        "isbinaryfile": "^5.0.0",
+        "js-yaml": "^4.1.0",
+        "lazy-val": "^1.0.5",
+        "minimatch": "^10.0.0",
+        "read-config-file": "6.4.0",
+        "resedit": "^1.7.0",
+        "sanitize-filename": "^1.6.3",
+        "semver": "^7.3.8",
+        "tar": "^6.1.12",
+        "temp-file": "^3.4.0"
       },
       "engines": {
-        "node": ">=4"
+        "node": ">=14.0.0"
       },
       "peerDependencies": {
-        "eslint": "^3 || ^4 || ^5 || ^6 || ^7 || ^8"
+        "dmg-builder": "25.0.0",
+        "electron-builder-squirrel-windows": "25.0.0"
       }
     },
-    "node_modules/eslint-plugin-react-hooks": {
-      "version": "4.6.0",
+    "node_modules/app-builder-lib/node_modules/argparse": {
+      "version": "2.0.1",
       "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=10"
-      },
-      "peerDependencies": {
-        "eslint": "^3.0.0 || ^4.0.0 || ^5.0.0 || ^6.0.0 || ^7.0.0 || ^8.0.0-0"
-      }
+      "license": "Python-2.0"
     },
-    "node_modules/eslint-plugin-react-native": {
-      "version": "3.11.0",
+    "node_modules/app-builder-lib/node_modules/brace-expansion": {
+      "version": "2.0.1",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/traverse": "^7.7.4",
-        "eslint-plugin-react-native-globals": "^0.1.1"
-      },
-      "peerDependencies": {
-        "eslint": "^3.17.0 || ^4 || ^5 || ^6 || ^7"
+        "balanced-match": "^1.0.0"
       }
     },
-    "node_modules/eslint-plugin-react-native-a11y": {
-      "version": "3.3.0",
+    "node_modules/app-builder-lib/node_modules/form-data": {
+      "version": "4.0.0",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/runtime": "^7.15.4",
-        "ast-types-flow": "^0.0.7",
-        "jsx-ast-utils": "^3.2.1"
+        "asynckit": "^0.4.0",
+        "combined-stream": "^1.0.8",
+        "mime-types": "^2.1.12"
       },
       "engines": {
-        "node": ">=12.0"
-      },
-      "peerDependencies": {
-        "eslint": "^3 || ^4 || ^5 || ^6 || ^7 || ^8"
+        "node": ">= 6"
       }
     },
-    "node_modules/eslint-plugin-react-native-globals": {
-      "version": "0.1.2",
-      "dev": true,
-      "license": "MIT"
-    },
-    "node_modules/eslint-plugin-react/node_modules/doctrine": {
-      "version": "2.1.0",
+    "node_modules/app-builder-lib/node_modules/fs-extra": {
+      "version": "10.1.0",
       "dev": true,
-      "license": "Apache-2.0",
+      "license": "MIT",
       "dependencies": {
-        "esutils": "^2.0.2"
+        "graceful-fs": "^4.2.0",
+        "jsonfile": "^6.0.1",
+        "universalify": "^2.0.0"
       },
       "engines": {
-        "node": ">=0.10.0"
+        "node": ">=12"
       }
     },
-    "node_modules/eslint-plugin-react/node_modules/resolve": {
-      "version": "2.0.0-next.4",
+    "node_modules/app-builder-lib/node_modules/js-yaml": {
+      "version": "4.1.0",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "is-core-module": "^2.9.0",
-        "path-parse": "^1.0.7",
-        "supports-preserve-symlinks-flag": "^1.0.0"
+        "argparse": "^2.0.1"
       },
       "bin": {
-        "resolve": "bin/resolve"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
+        "js-yaml": "bin/js-yaml.js"
       }
     },
-    "node_modules/eslint-plugin-react/node_modules/semver": {
-      "version": "6.3.1",
+    "node_modules/app-builder-lib/node_modules/minimatch": {
+      "version": "10.0.1",
       "dev": true,
       "license": "ISC",
-      "bin": {
-        "semver": "bin/semver.js"
+      "dependencies": {
+        "brace-expansion": "^2.0.1"
+      },
+      "engines": {
+        "node": "20 || >=22"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
       }
     },
-    "node_modules/eslint-plugin-rulesdir": {
-      "version": "0.2.2",
+    "node_modules/app-root-dir": {
+      "version": "1.0.2",
       "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/appdirsjs": {
+      "version": "1.2.7",
+      "license": "MIT"
+    },
+    "node_modules/application-config-path": {
+      "version": "0.1.1",
+      "license": "MIT"
+    },
+    "node_modules/applicationinsights": {
+      "version": "2.7.3",
       "license": "MIT",
+      "peer": true,
+      "dependencies": {
+        "@azure/core-auth": "^1.5.0",
+        "@azure/core-rest-pipeline": "1.10.1",
+        "@azure/core-util": "1.2.0",
+        "@azure/opentelemetry-instrumentation-azure-sdk": "^1.0.0-beta.5",
+        "@microsoft/applicationinsights-web-snippet": "^1.0.1",
+        "@opentelemetry/api": "^1.4.1",
+        "@opentelemetry/core": "^1.15.2",
+        "@opentelemetry/sdk-trace-base": "^1.15.2",
+        "@opentelemetry/semantic-conventions": "^1.15.2",
+        "cls-hooked": "^4.2.2",
+        "continuation-local-storage": "^3.2.1",
+        "diagnostic-channel": "1.1.1",
+        "diagnostic-channel-publishers": "1.0.7"
+      },
       "engines": {
-        "node": ">=4.0.0"
+        "node": ">=8.0.0"
+      },
+      "peerDependencies": {
+        "applicationinsights-native-metrics": "*"
+      },
+      "peerDependenciesMeta": {
+        "applicationinsights-native-metrics": {
+          "optional": true
+        }
       }
     },
-    "node_modules/eslint-plugin-storybook": {
-      "version": "0.8.0",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-storybook/-/eslint-plugin-storybook-0.8.0.tgz",
-      "integrity": "sha512-CZeVO5EzmPY7qghO2t64oaFM+8FTaD4uzOEjHKp516exyTKo+skKAL9GI3QALS2BXhyALJjNtwbmr1XinGE8bA==",
+    "node_modules/aproba": {
+      "version": "1.2.0",
+      "devOptional": true,
+      "license": "ISC"
+    },
+    "node_modules/archiver": {
+      "version": "5.3.2",
       "dev": true,
+      "license": "MIT",
+      "peer": true,
       "dependencies": {
-        "@storybook/csf": "^0.0.1",
-        "@typescript-eslint/utils": "^5.62.0",
-        "requireindex": "^1.2.0",
-        "ts-dedent": "^2.2.0"
+        "archiver-utils": "^2.1.0",
+        "async": "^3.2.4",
+        "buffer-crc32": "^0.2.1",
+        "readable-stream": "^3.6.0",
+        "readdir-glob": "^1.1.2",
+        "tar-stream": "^2.2.0",
+        "zip-stream": "^4.1.0"
       },
       "engines": {
-        "node": ">= 18"
-      },
-      "peerDependencies": {
-        "eslint": ">=6"
+        "node": ">= 10"
       }
     },
-    "node_modules/eslint-plugin-storybook/node_modules/@storybook/csf": {
-      "version": "0.0.1",
+    "node_modules/archiver-utils": {
+      "version": "2.1.0",
       "dev": true,
       "license": "MIT",
+      "peer": true,
       "dependencies": {
-        "lodash": "^4.17.15"
+        "glob": "^7.1.4",
+        "graceful-fs": "^4.2.0",
+        "lazystream": "^1.0.0",
+        "lodash.defaults": "^4.2.0",
+        "lodash.difference": "^4.5.0",
+        "lodash.flatten": "^4.4.0",
+        "lodash.isplainobject": "^4.0.6",
+        "lodash.union": "^4.6.0",
+        "normalize-path": "^3.0.0",
+        "readable-stream": "^2.0.0"
+      },
+      "engines": {
+        "node": ">= 6"
       }
     },
-    "node_modules/eslint-plugin-testing-library": {
-      "version": "6.2.2",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-testing-library/-/eslint-plugin-testing-library-6.2.2.tgz",
-      "integrity": "sha512-1E94YOTUDnOjSLyvOwmbVDzQi/WkKm3WVrMXu6SmBr6DN95xTGZmI6HJ/eOkSXh/DlheRsxaPsJvZByDBhWLVQ==",
+    "node_modules/archiver/node_modules/readable-stream": {
+      "version": "3.6.2",
       "dev": true,
+      "license": "MIT",
+      "peer": true,
       "dependencies": {
-        "@typescript-eslint/utils": "^5.58.0"
+        "inherits": "^2.0.3",
+        "string_decoder": "^1.1.1",
+        "util-deprecate": "^1.0.1"
       },
       "engines": {
-        "node": "^12.22.0 || ^14.17.0 || >=16.0.0",
-        "npm": ">=6"
-      },
-      "peerDependencies": {
-        "eslint": "^7.5.0 || ^8.0.0"
+        "node": ">= 6"
       }
     },
-    "node_modules/eslint-plugin-you-dont-need-lodash-underscore": {
-      "version": "6.12.0",
+    "node_modules/are-docs-informative": {
+      "version": "0.0.2",
       "dev": true,
       "license": "MIT",
+      "engines": {
+        "node": ">=14"
+      }
+    },
+    "node_modules/are-we-there-yet": {
+      "version": "2.0.0",
+      "license": "ISC",
+      "optional": true,
       "dependencies": {
-        "kebab-case": "^1.0.0"
+        "delegates": "^1.0.0",
+        "readable-stream": "^3.6.0"
       },
       "engines": {
-        "node": ">=4.0"
+        "node": ">=10"
       }
     },
-    "node_modules/eslint-scope": {
-      "version": "5.1.1",
-      "license": "BSD-2-Clause",
+    "node_modules/are-we-there-yet/node_modules/readable-stream": {
+      "version": "3.6.2",
+      "license": "MIT",
+      "optional": true,
       "dependencies": {
-        "esrecurse": "^4.3.0",
-        "estraverse": "^4.1.1"
+        "inherits": "^2.0.3",
+        "string_decoder": "^1.1.1",
+        "util-deprecate": "^1.0.1"
       },
       "engines": {
-        "node": ">=8.0.0"
+        "node": ">= 6"
       }
     },
-    "node_modules/eslint-scope/node_modules/estraverse": {
-      "version": "4.3.0",
-      "license": "BSD-2-Clause",
-      "engines": {
-        "node": ">=4.0"
+    "node_modules/arg": {
+      "version": "4.1.3",
+      "devOptional": true,
+      "license": "MIT"
+    },
+    "node_modules/argparse": {
+      "version": "1.0.10",
+      "license": "MIT",
+      "dependencies": {
+        "sprintf-js": "~1.0.2"
       }
     },
-    "node_modules/eslint-utils": {
-      "version": "3.0.0",
+    "node_modules/aria-hidden": {
+      "version": "1.2.4",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "eslint-visitor-keys": "^2.0.0"
+        "tslib": "^2.0.0"
       },
       "engines": {
-        "node": "^10.0.0 || ^12.0.0 || >= 14.0.0"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/mysticatea"
-      },
-      "peerDependencies": {
-        "eslint": ">=5"
+        "node": ">=10"
       }
     },
-    "node_modules/eslint-visitor-keys": {
-      "version": "2.1.0",
+    "node_modules/aria-query": {
+      "version": "5.3.0",
       "dev": true,
       "license": "Apache-2.0",
+      "dependencies": {
+        "dequal": "^2.0.3"
+      }
+    },
+    "node_modules/arr-diff": {
+      "version": "4.0.0",
+      "license": "MIT",
+      "optional": true,
       "engines": {
-        "node": ">=10"
+        "node": ">=0.10.0"
       }
     },
-    "node_modules/eslint/node_modules/@babel/code-frame": {
-      "version": "7.12.11",
-      "dev": true,
+    "node_modules/arr-flatten": {
+      "version": "1.1.0",
       "license": "MIT",
-      "dependencies": {
-        "@babel/highlight": "^7.10.4"
+      "optional": true,
+      "engines": {
+        "node": ">=0.10.0"
       }
     },
-    "node_modules/eslint/node_modules/ajv": {
-      "version": "6.12.6",
-      "dev": true,
+    "node_modules/arr-union": {
+      "version": "3.1.0",
       "license": "MIT",
-      "dependencies": {
-        "fast-deep-equal": "^3.1.1",
-        "fast-json-stable-stringify": "^2.0.0",
-        "json-schema-traverse": "^0.4.1",
-        "uri-js": "^4.2.2"
-      },
-      "funding": {
-        "type": "github",
-        "url": "https://github.com/sponsors/epoberezkin"
+      "engines": {
+        "node": ">=0.10.0"
       }
     },
-    "node_modules/eslint/node_modules/ansi-styles": {
-      "version": "4.3.0",
-      "dev": true,
+    "node_modules/array-buffer-byte-length": {
+      "version": "1.0.1",
       "license": "MIT",
       "dependencies": {
-        "color-convert": "^2.0.1"
+        "call-bind": "^1.0.5",
+        "is-array-buffer": "^3.0.4"
       },
       "engines": {
-        "node": ">=8"
+        "node": ">= 0.4"
       },
       "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
+        "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/eslint/node_modules/chalk": {
-      "version": "4.1.2",
+    "node_modules/array-flatten": {
+      "version": "1.1.1",
+      "license": "MIT"
+    },
+    "node_modules/array-includes": {
+      "version": "3.1.7",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "ansi-styles": "^4.1.0",
-        "supports-color": "^7.1.0"
+        "call-bind": "^1.0.2",
+        "define-properties": "^1.2.0",
+        "es-abstract": "^1.22.1",
+        "get-intrinsic": "^1.2.1",
+        "is-string": "^1.0.7"
       },
       "engines": {
-        "node": ">=10"
+        "node": ">= 0.4"
       },
       "funding": {
-        "url": "https://github.com/chalk/chalk?sponsor=1"
+        "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/eslint/node_modules/color-convert": {
-      "version": "2.0.1",
-      "dev": true,
+    "node_modules/array-union": {
+      "version": "2.1.0",
       "license": "MIT",
-      "dependencies": {
-        "color-name": "~1.1.4"
-      },
       "engines": {
-        "node": ">=7.0.0"
+        "node": ">=8"
       }
     },
-    "node_modules/eslint/node_modules/color-name": {
-      "version": "1.1.4",
-      "dev": true,
-      "license": "MIT"
-    },
-    "node_modules/eslint/node_modules/eslint-utils": {
-      "version": "2.1.0",
-      "dev": true,
+    "node_modules/array-uniq": {
+      "version": "1.0.3",
       "license": "MIT",
-      "dependencies": {
-        "eslint-visitor-keys": "^1.1.0"
-      },
       "engines": {
-        "node": ">=6"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/mysticatea"
+        "node": ">=0.10.0"
       }
     },
-    "node_modules/eslint/node_modules/eslint-utils/node_modules/eslint-visitor-keys": {
-      "version": "1.3.0",
-      "dev": true,
-      "license": "Apache-2.0",
+    "node_modules/array-unique": {
+      "version": "0.3.2",
+      "license": "MIT",
+      "optional": true,
       "engines": {
-        "node": ">=4"
+        "node": ">=0.10.0"
       }
     },
-    "node_modules/eslint/node_modules/globals": {
-      "version": "13.21.0",
+    "node_modules/array.prototype.findlastindex": {
+      "version": "1.2.3",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "type-fest": "^0.20.2"
+        "call-bind": "^1.0.2",
+        "define-properties": "^1.2.0",
+        "es-abstract": "^1.22.1",
+        "es-shim-unscopables": "^1.0.0",
+        "get-intrinsic": "^1.2.1"
       },
       "engines": {
-        "node": ">=8"
+        "node": ">= 0.4"
       },
       "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
+        "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/eslint/node_modules/has-flag": {
-      "version": "4.0.0",
+    "node_modules/array.prototype.flat": {
+      "version": "1.3.2",
       "dev": true,
       "license": "MIT",
+      "dependencies": {
+        "call-bind": "^1.0.2",
+        "define-properties": "^1.2.0",
+        "es-abstract": "^1.22.1",
+        "es-shim-unscopables": "^1.0.0"
+      },
       "engines": {
-        "node": ">=8"
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/eslint/node_modules/ignore": {
-      "version": "4.0.6",
+    "node_modules/array.prototype.flatmap": {
+      "version": "1.3.2",
       "dev": true,
       "license": "MIT",
+      "dependencies": {
+        "call-bind": "^1.0.2",
+        "define-properties": "^1.2.0",
+        "es-abstract": "^1.22.1",
+        "es-shim-unscopables": "^1.0.0"
+      },
       "engines": {
-        "node": ">= 4"
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/eslint/node_modules/json-schema-traverse": {
-      "version": "0.4.1",
+    "node_modules/array.prototype.tosorted": {
+      "version": "1.1.1",
       "dev": true,
-      "license": "MIT"
+      "license": "MIT",
+      "dependencies": {
+        "call-bind": "^1.0.2",
+        "define-properties": "^1.1.4",
+        "es-abstract": "^1.20.4",
+        "es-shim-unscopables": "^1.0.0",
+        "get-intrinsic": "^1.1.3"
+      }
     },
-    "node_modules/eslint/node_modules/optionator": {
-      "version": "0.9.3",
-      "dev": true,
+    "node_modules/arraybuffer.prototype.slice": {
+      "version": "1.0.3",
       "license": "MIT",
       "dependencies": {
-        "@aashutoshrathi/word-wrap": "^1.2.3",
-        "deep-is": "^0.1.3",
-        "fast-levenshtein": "^2.0.6",
-        "levn": "^0.4.1",
-        "prelude-ls": "^1.2.1",
-        "type-check": "^0.4.0"
+        "array-buffer-byte-length": "^1.0.1",
+        "call-bind": "^1.0.5",
+        "define-properties": "^1.2.1",
+        "es-abstract": "^1.22.3",
+        "es-errors": "^1.2.1",
+        "get-intrinsic": "^1.2.3",
+        "is-array-buffer": "^3.0.4",
+        "is-shared-array-buffer": "^1.0.2"
       },
       "engines": {
-        "node": ">= 0.8.0"
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/eslint/node_modules/supports-color": {
-      "version": "7.2.0",
-      "dev": true,
+    "node_modules/asap": {
+      "version": "2.0.6",
+      "license": "MIT"
+    },
+    "node_modules/ascii-table": {
+      "version": "0.0.9",
+      "license": "MIT"
+    },
+    "node_modules/asn1.js": {
+      "version": "5.4.1",
       "license": "MIT",
       "dependencies": {
-        "has-flag": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=8"
+        "bn.js": "^4.0.0",
+        "inherits": "^2.0.1",
+        "minimalistic-assert": "^1.0.0",
+        "safer-buffer": "^2.1.0"
       }
     },
-    "node_modules/eslint/node_modules/type-fest": {
-      "version": "0.20.2",
+    "node_modules/asn1.js/node_modules/bn.js": {
+      "version": "4.12.0",
+      "license": "MIT"
+    },
+    "node_modules/assert": {
+      "version": "1.5.0",
+      "license": "MIT",
+      "dependencies": {
+        "object-assign": "^4.1.1",
+        "util": "0.10.3"
+      }
+    },
+    "node_modules/assert-plus": {
+      "version": "1.0.0",
       "dev": true,
-      "license": "(MIT OR CC0-1.0)",
+      "license": "MIT",
+      "optional": true,
       "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
+        "node": ">=0.8"
       }
     },
-    "node_modules/espree": {
-      "version": "7.3.1",
-      "dev": true,
-      "license": "BSD-2-Clause",
+    "node_modules/assert/node_modules/inherits": {
+      "version": "2.0.1",
+      "license": "ISC"
+    },
+    "node_modules/assert/node_modules/util": {
+      "version": "0.10.3",
+      "license": "MIT",
       "dependencies": {
-        "acorn": "^7.4.0",
-        "acorn-jsx": "^5.3.1",
-        "eslint-visitor-keys": "^1.3.0"
-      },
+        "inherits": "2.0.1"
+      }
+    },
+    "node_modules/assign-symbols": {
+      "version": "1.0.0",
+      "license": "MIT",
       "engines": {
-        "node": "^10.12.0 || >=12.0.0"
+        "node": ">=0.10.0"
       }
     },
-    "node_modules/espree/node_modules/eslint-visitor-keys": {
-      "version": "1.3.0",
+    "node_modules/ast-types": {
+      "version": "0.16.1",
       "dev": true,
-      "license": "Apache-2.0",
+      "license": "MIT",
+      "dependencies": {
+        "tslib": "^2.0.1"
+      },
       "engines": {
         "node": ">=4"
       }
     },
-    "node_modules/esprima": {
-      "version": "4.0.1",
-      "license": "BSD-2-Clause",
-      "bin": {
-        "esparse": "bin/esparse.js",
-        "esvalidate": "bin/esvalidate.js"
-      },
+    "node_modules/ast-types-flow": {
+      "version": "0.0.7",
+      "dev": true,
+      "license": "ISC"
+    },
+    "node_modules/astral-regex": {
+      "version": "2.0.0",
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
       "engines": {
-        "node": ">=4"
+        "node": ">=8"
       }
     },
-    "node_modules/esquery": {
-      "version": "1.5.0",
+    "node_modules/async": {
+      "version": "3.2.4",
       "dev": true,
-      "license": "BSD-3-Clause",
-      "dependencies": {
-        "estraverse": "^5.1.0"
-      },
+      "license": "MIT"
+    },
+    "node_modules/async-each": {
+      "version": "1.0.3",
+      "license": "MIT",
+      "optional": true
+    },
+    "node_modules/async-exit-hook": {
+      "version": "2.0.1",
+      "dev": true,
+      "license": "MIT",
       "engines": {
-        "node": ">=0.10"
+        "node": ">=0.12.0"
       }
     },
-    "node_modules/esrecurse": {
-      "version": "4.3.0",
-      "license": "BSD-2-Clause",
+    "node_modules/async-hook-jl": {
+      "version": "1.7.6",
+      "license": "MIT",
+      "peer": true,
       "dependencies": {
-        "estraverse": "^5.2.0"
+        "stack-chain": "^1.3.7"
       },
       "engines": {
-        "node": ">=4.0"
+        "node": "^4.7 || >=6.9 || >=7.3"
       }
     },
-    "node_modules/estraverse": {
-      "version": "5.3.0",
-      "license": "BSD-2-Clause",
-      "engines": {
-        "node": ">=4.0"
-      }
+    "node_modules/async-limiter": {
+      "version": "1.0.1",
+      "license": "MIT"
     },
-    "node_modules/esutils": {
-      "version": "2.0.3",
+    "node_modules/async-listener": {
+      "version": "0.6.10",
       "license": "BSD-2-Clause",
+      "peer": true,
+      "dependencies": {
+        "semver": "^5.3.0",
+        "shimmer": "^1.1.0"
+      },
       "engines": {
-        "node": ">=0.10.0"
+        "node": "<=0.11.8 || >0.11.10"
       }
     },
-    "node_modules/etag": {
-      "version": "1.8.1",
-      "license": "MIT",
-      "engines": {
-        "node": ">= 0.6"
+    "node_modules/async-listener/node_modules/semver": {
+      "version": "5.7.2",
+      "license": "ISC",
+      "peer": true,
+      "bin": {
+        "semver": "bin/semver"
       }
     },
-    "node_modules/event-target-shim": {
-      "version": "5.0.1",
+    "node_modules/asynciterator.prototype": {
+      "version": "1.0.0",
+      "dev": true,
       "license": "MIT",
-      "engines": {
-        "node": ">=6"
+      "dependencies": {
+        "has-symbols": "^1.0.3"
       }
     },
-    "node_modules/eventemitter3": {
-      "version": "4.0.7",
-      "dev": true,
+    "node_modules/asynckit": {
+      "version": "0.4.0",
       "license": "MIT"
     },
-    "node_modules/events": {
-      "version": "3.3.0",
-      "license": "MIT",
+    "node_modules/at-least-node": {
+      "version": "1.0.0",
+      "license": "ISC",
       "engines": {
-        "node": ">=0.8.x"
+        "node": ">= 4.0.0"
       }
     },
-    "node_modules/evp_bytestokey": {
-      "version": "1.0.3",
-      "license": "MIT",
-      "dependencies": {
-        "md5.js": "^1.3.4",
-        "safe-buffer": "^5.1.1"
+    "node_modules/atob": {
+      "version": "2.1.2",
+      "license": "(MIT OR Apache-2.0)",
+      "optional": true,
+      "bin": {
+        "atob": "bin/atob.js"
+      },
+      "engines": {
+        "node": ">= 4.5.0"
       }
     },
-    "node_modules/exec-async": {
-      "version": "2.2.0",
-      "license": "MIT"
-    },
-    "node_modules/execa": {
-      "version": "5.1.1",
+    "node_modules/available-typed-arrays": {
+      "version": "1.0.7",
       "license": "MIT",
       "dependencies": {
-        "cross-spawn": "^7.0.3",
-        "get-stream": "^6.0.0",
-        "human-signals": "^2.1.0",
-        "is-stream": "^2.0.0",
-        "merge-stream": "^2.0.0",
-        "npm-run-path": "^4.0.1",
-        "onetime": "^5.1.2",
-        "signal-exit": "^3.0.3",
-        "strip-final-newline": "^2.0.0"
+        "possible-typed-array-names": "^1.0.0"
       },
       "engines": {
-        "node": ">=10"
+        "node": ">= 0.4"
       },
       "funding": {
-        "url": "https://github.com/sindresorhus/execa?sponsor=1"
+        "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/exit": {
-      "version": "0.1.2",
+    "node_modules/awesome-phonenumber": {
+      "version": "5.4.0",
+      "license": "MIT",
+      "workspaces": [
+        "webpack",
+        "cjs-test",
+        "esm-test"
+      ],
       "engines": {
-        "node": ">= 0.8.0"
+        "node": ">=14"
       }
     },
-    "node_modules/expand-brackets": {
-      "version": "2.1.4",
-      "license": "MIT",
-      "optional": true,
-      "dependencies": {
-        "debug": "^2.3.3",
-        "define-property": "^0.2.5",
-        "extend-shallow": "^2.0.1",
-        "posix-character-classes": "^0.1.0",
-        "regex-not": "^1.0.0",
-        "snapdragon": "^0.8.1",
-        "to-regex": "^3.0.1"
-      },
+    "node_modules/axe-core": {
+      "version": "4.7.2",
+      "dev": true,
+      "license": "MPL-2.0",
       "engines": {
-        "node": ">=0.10.0"
+        "node": ">=4"
       }
     },
-    "node_modules/expand-brackets/node_modules/debug": {
-      "version": "2.6.9",
+    "node_modules/babel-code-frame": {
+      "version": "6.26.0",
+      "dev": true,
       "license": "MIT",
-      "optional": true,
       "dependencies": {
-        "ms": "2.0.0"
+        "chalk": "^1.1.3",
+        "esutils": "^2.0.2",
+        "js-tokens": "^3.0.2"
       }
     },
-    "node_modules/expand-brackets/node_modules/define-property": {
-      "version": "0.2.5",
+    "node_modules/babel-code-frame/node_modules/ansi-regex": {
+      "version": "2.1.1",
+      "dev": true,
       "license": "MIT",
-      "optional": true,
-      "dependencies": {
-        "is-descriptor": "^0.1.0"
-      },
       "engines": {
         "node": ">=0.10.0"
       }
     },
-    "node_modules/expand-brackets/node_modules/extend-shallow": {
-      "version": "2.0.1",
+    "node_modules/babel-code-frame/node_modules/ansi-styles": {
+      "version": "2.2.1",
+      "dev": true,
       "license": "MIT",
-      "optional": true,
-      "dependencies": {
-        "is-extendable": "^0.1.0"
-      },
       "engines": {
         "node": ">=0.10.0"
       }
     },
-    "node_modules/expand-brackets/node_modules/is-accessor-descriptor": {
-      "version": "0.1.6",
+    "node_modules/babel-code-frame/node_modules/chalk": {
+      "version": "1.1.3",
+      "dev": true,
       "license": "MIT",
-      "optional": true,
       "dependencies": {
-        "kind-of": "^3.0.2"
+        "ansi-styles": "^2.2.1",
+        "escape-string-regexp": "^1.0.2",
+        "has-ansi": "^2.0.0",
+        "strip-ansi": "^3.0.0",
+        "supports-color": "^2.0.0"
       },
       "engines": {
         "node": ">=0.10.0"
       }
     },
-    "node_modules/expand-brackets/node_modules/is-accessor-descriptor/node_modules/kind-of": {
-      "version": "3.2.2",
+    "node_modules/babel-code-frame/node_modules/escape-string-regexp": {
+      "version": "1.0.5",
+      "dev": true,
       "license": "MIT",
-      "optional": true,
-      "dependencies": {
-        "is-buffer": "^1.1.5"
-      },
       "engines": {
-        "node": ">=0.10.0"
+        "node": ">=0.8.0"
       }
     },
-    "node_modules/expand-brackets/node_modules/is-buffer": {
-      "version": "1.1.6",
-      "license": "MIT",
-      "optional": true
+    "node_modules/babel-code-frame/node_modules/js-tokens": {
+      "version": "3.0.2",
+      "dev": true,
+      "license": "MIT"
     },
-    "node_modules/expand-brackets/node_modules/is-data-descriptor": {
-      "version": "0.1.4",
+    "node_modules/babel-code-frame/node_modules/strip-ansi": {
+      "version": "3.0.1",
+      "dev": true,
       "license": "MIT",
-      "optional": true,
       "dependencies": {
-        "kind-of": "^3.0.2"
+        "ansi-regex": "^2.0.0"
       },
       "engines": {
         "node": ">=0.10.0"
       }
     },
-    "node_modules/expand-brackets/node_modules/is-data-descriptor/node_modules/kind-of": {
-      "version": "3.2.2",
+    "node_modules/babel-code-frame/node_modules/supports-color": {
+      "version": "2.0.0",
+      "dev": true,
       "license": "MIT",
-      "optional": true,
-      "dependencies": {
-        "is-buffer": "^1.1.5"
-      },
       "engines": {
-        "node": ">=0.10.0"
+        "node": ">=0.8.0"
       }
     },
-    "node_modules/expand-brackets/node_modules/is-descriptor": {
-      "version": "0.1.6",
+    "node_modules/babel-core": {
+      "version": "7.0.0-bridge.0",
+      "license": "MIT",
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/babel-eslint": {
+      "version": "10.1.0",
+      "dev": true,
       "license": "MIT",
-      "optional": true,
       "dependencies": {
-        "is-accessor-descriptor": "^0.1.6",
-        "is-data-descriptor": "^0.1.4",
-        "kind-of": "^5.0.0"
+        "@babel/code-frame": "^7.0.0",
+        "@babel/parser": "^7.7.0",
+        "@babel/traverse": "^7.7.0",
+        "@babel/types": "^7.7.0",
+        "eslint-visitor-keys": "^1.0.0",
+        "resolve": "^1.12.0"
       },
       "engines": {
-        "node": ">=0.10.0"
+        "node": ">=6"
+      },
+      "peerDependencies": {
+        "eslint": ">= 4.12.1"
       }
     },
-    "node_modules/expand-brackets/node_modules/is-extendable": {
-      "version": "0.1.1",
-      "license": "MIT",
-      "optional": true,
+    "node_modules/babel-eslint/node_modules/eslint-visitor-keys": {
+      "version": "1.3.0",
+      "dev": true,
+      "license": "Apache-2.0",
       "engines": {
-        "node": ">=0.10.0"
+        "node": ">=4"
       }
     },
-    "node_modules/expand-brackets/node_modules/kind-of": {
-      "version": "5.1.0",
+    "node_modules/babel-helper-function-name": {
+      "version": "6.24.1",
+      "dev": true,
       "license": "MIT",
-      "optional": true,
-      "engines": {
-        "node": ">=0.10.0"
+      "dependencies": {
+        "babel-helper-get-function-arity": "^6.24.1",
+        "babel-runtime": "^6.22.0",
+        "babel-template": "^6.24.1",
+        "babel-traverse": "^6.24.1",
+        "babel-types": "^6.24.1"
       }
     },
-    "node_modules/expand-brackets/node_modules/ms": {
-      "version": "2.0.0",
+    "node_modules/babel-helper-get-function-arity": {
+      "version": "6.24.1",
+      "dev": true,
       "license": "MIT",
-      "optional": true
+      "dependencies": {
+        "babel-runtime": "^6.22.0",
+        "babel-types": "^6.24.1"
+      }
     },
-    "node_modules/expect": {
-      "version": "29.6.2",
+    "node_modules/babel-jest": {
+      "version": "29.4.1",
       "license": "MIT",
       "dependencies": {
-        "@jest/expect-utils": "^29.6.2",
-        "@types/node": "*",
-        "jest-get-type": "^29.4.3",
-        "jest-matcher-utils": "^29.6.2",
-        "jest-message-util": "^29.6.2",
-        "jest-util": "^29.6.2"
+        "@jest/transform": "^29.4.1",
+        "@types/babel__core": "^7.1.14",
+        "babel-plugin-istanbul": "^6.1.1",
+        "babel-preset-jest": "^29.4.0",
+        "chalk": "^4.0.0",
+        "graceful-fs": "^4.2.9",
+        "slash": "^3.0.0"
       },
       "engines": {
         "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.8.0"
       }
     },
-    "node_modules/expensify-common": {
-      "version": "1.0.0",
-      "resolved": "git+ssh://git@github.com/Expensify/expensify-common.git#9a68635cdcef4c81593c0f816a007bc9c707d46a",
-      "integrity": "sha512-9BHjM3kZs7/dil0oykEQFkEhXjVD5liTttmO7ZYtPZkl4j6g97mubY2p9lYpWwpkWckUfvU7nGuZQjahw9xSFA==",
+    "node_modules/babel-jest/node_modules/ansi-styles": {
+      "version": "4.3.0",
       "license": "MIT",
       "dependencies": {
-        "classnames": "2.5.0",
-        "clipboard": "2.0.11",
-        "html-entities": "^2.5.2",
-        "jquery": "3.6.0",
-        "localforage": "^1.10.0",
-        "lodash": "4.17.21",
-        "prop-types": "15.8.1",
-        "react": "16.12.0",
-        "react-dom": "16.12.0",
-        "semver": "^7.6.0",
-        "simply-deferred": "git+https://github.com/Expensify/simply-deferred.git#77a08a95754660c7bd6e0b6979fdf84e8e831bf5",
-        "ua-parser-js": "^1.0.37",
-        "underscore": "1.13.6"
+        "color-convert": "^2.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
       }
     },
-    "node_modules/expensify-common/node_modules/react": {
-      "version": "16.12.0",
+    "node_modules/babel-jest/node_modules/chalk": {
+      "version": "4.1.2",
       "license": "MIT",
       "dependencies": {
-        "loose-envify": "^1.1.0",
-        "object-assign": "^4.1.1",
-        "prop-types": "^15.6.2"
+        "ansi-styles": "^4.1.0",
+        "supports-color": "^7.1.0"
       },
       "engines": {
-        "node": ">=0.10.0"
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/chalk?sponsor=1"
       }
     },
-    "node_modules/expensify-common/node_modules/react-dom": {
-      "version": "16.12.0",
+    "node_modules/babel-jest/node_modules/color-convert": {
+      "version": "2.0.1",
       "license": "MIT",
       "dependencies": {
-        "loose-envify": "^1.1.0",
-        "object-assign": "^4.1.1",
-        "prop-types": "^15.6.2",
-        "scheduler": "^0.18.0"
+        "color-name": "~1.1.4"
       },
-      "peerDependencies": {
-        "react": "^16.0.0"
-      }
-    },
-    "node_modules/expensify-common/node_modules/scheduler": {
-      "version": "0.18.0",
-      "license": "MIT",
-      "dependencies": {
-        "loose-envify": "^1.1.0",
-        "object-assign": "^4.1.1"
+      "engines": {
+        "node": ">=7.0.0"
       }
     },
-    "node_modules/expensify-common/node_modules/ua-parser-js": {
-      "version": "1.0.37",
-      "resolved": "https://registry.npmjs.org/ua-parser-js/-/ua-parser-js-1.0.37.tgz",
-      "integrity": "sha512-bhTyI94tZofjo+Dn8SN6Zv8nBDvyXTymAdM3LDI/0IboIUwTu1rEhW7v2TfiVsoYWgkQ4kOVqnI8APUFbIQIFQ==",
-      "funding": [
-        {
-          "type": "opencollective",
-          "url": "https://opencollective.com/ua-parser-js"
-        },
-        {
-          "type": "paypal",
-          "url": "https://paypal.me/faisalman"
-        },
-        {
-          "type": "github",
-          "url": "https://github.com/sponsors/faisalman"
-        }
-      ],
+    "node_modules/babel-jest/node_modules/color-name": {
+      "version": "1.1.4",
+      "license": "MIT"
+    },
+    "node_modules/babel-jest/node_modules/has-flag": {
+      "version": "4.0.0",
+      "license": "MIT",
       "engines": {
-        "node": "*"
+        "node": ">=8"
       }
     },
-    "node_modules/expo": {
-      "version": "50.0.4",
+    "node_modules/babel-jest/node_modules/supports-color": {
+      "version": "7.2.0",
       "license": "MIT",
       "dependencies": {
-        "@babel/runtime": "^7.20.0",
-        "@expo/cli": "0.17.3",
-        "@expo/config": "8.5.4",
-        "@expo/config-plugins": "7.8.4",
-        "@expo/metro-config": "0.17.3",
-        "@expo/vector-icons": "^14.0.0",
-        "babel-preset-expo": "~10.0.1",
-        "expo-asset": "~9.0.2",
-        "expo-file-system": "~16.0.5",
-        "expo-font": "~11.10.2",
-        "expo-keep-awake": "~12.8.2",
-        "expo-modules-autolinking": "1.10.2",
-        "expo-modules-core": "1.11.8",
-        "fbemitter": "^3.0.0",
-        "whatwg-url-without-unicode": "8.0.0-3"
+        "has-flag": "^4.0.0"
       },
-      "bin": {
-        "expo": "bin/cli"
+      "engines": {
+        "node": ">=8"
       }
     },
-    "node_modules/expo-asset": {
-      "version": "9.0.2",
+    "node_modules/babel-loader": {
+      "version": "9.1.3",
+      "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@react-native/assets-registry": "~0.73.1",
-        "blueimp-md5": "^2.10.0",
-        "expo-constants": "~15.4.0",
-        "expo-file-system": "~16.0.0",
-        "invariant": "^2.2.4",
-        "md5-file": "^3.2.3"
-      }
-    },
-    "node_modules/expo-av": {
-      "version": "13.10.4",
-      "license": "MIT",
+        "find-cache-dir": "^4.0.0",
+        "schema-utils": "^4.0.0"
+      },
+      "engines": {
+        "node": ">= 14.15.0"
+      },
       "peerDependencies": {
-        "expo": "*"
+        "@babel/core": "^7.12.0",
+        "webpack": ">=5"
       }
     },
-    "node_modules/expo-constants": {
-      "version": "15.4.5",
+    "node_modules/babel-loader/node_modules/ajv-keywords": {
+      "version": "5.1.0",
+      "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@expo/config": "~8.5.0"
+        "fast-deep-equal": "^3.1.3"
       },
       "peerDependencies": {
-        "expo": "*"
+        "ajv": "^8.8.2"
       }
     },
-    "node_modules/expo-file-system": {
-      "version": "16.0.5",
+    "node_modules/babel-loader/node_modules/find-cache-dir": {
+      "version": "4.0.0",
+      "dev": true,
       "license": "MIT",
-      "peerDependencies": {
-        "expo": "*"
+      "dependencies": {
+        "common-path-prefix": "^3.0.0",
+        "pkg-dir": "^7.0.0"
+      },
+      "engines": {
+        "node": ">=14.16"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/expo-font": {
-      "version": "11.10.2",
+    "node_modules/babel-loader/node_modules/find-up": {
+      "version": "6.3.0",
+      "dev": true,
       "license": "MIT",
       "dependencies": {
-        "fontfaceobserver": "^2.1.0"
+        "locate-path": "^7.1.0",
+        "path-exists": "^5.0.0"
       },
-      "peerDependencies": {
-        "expo": "*"
+      "engines": {
+        "node": "^12.20.0 || ^14.13.1 || >=16.0.0"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/expo-image": {
-      "version": "1.11.0",
-      "resolved": "https://registry.npmjs.org/expo-image/-/expo-image-1.11.0.tgz",
-      "integrity": "sha512-CfkSGWIGidxxqzErke16bCS9aefS04qvgjk+T9Nc34LAb3ysBAqCv5hoCnvylHOvi/7jTCC/ouLm5oLLqkDSRQ==",
+    "node_modules/babel-loader/node_modules/locate-path": {
+      "version": "7.2.0",
+      "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "@react-native/assets-registry": "~0.73.1"
+        "p-locate": "^6.0.0"
       },
-      "peerDependencies": {
-        "expo": "*"
+      "engines": {
+        "node": "^12.20.0 || ^14.13.1 || >=16.0.0"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/expo-image-loader": {
-      "version": "4.6.0",
-      "resolved": "https://registry.npmjs.org/expo-image-loader/-/expo-image-loader-4.6.0.tgz",
-      "integrity": "sha512-RHQTDak7/KyhWUxikn2yNzXL7i2cs16cMp6gEAgkHOjVhoCJQoOJ0Ljrt4cKQ3IowxgCuOrAgSUzGkqs7omj8Q==",
-      "peerDependencies": {
-        "expo": "*"
+    "node_modules/babel-loader/node_modules/p-limit": {
+      "version": "4.0.0",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "yocto-queue": "^1.0.0"
+      },
+      "engines": {
+        "node": "^12.20.0 || ^14.13.1 || >=16.0.0"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/expo-image-manipulator": {
-      "version": "11.8.0",
-      "resolved": "https://registry.npmjs.org/expo-image-manipulator/-/expo-image-manipulator-11.8.0.tgz",
-      "integrity": "sha512-ZWVrHnYmwJq6h7auk+ropsxcNi+LyZcPFKQc8oy+JA0SaJosfShvkCm7RADWAunHmfPCmjHrhwPGEu/rs7WG/A==",
+    "node_modules/babel-loader/node_modules/p-locate": {
+      "version": "6.0.0",
+      "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "expo-image-loader": "~4.6.0"
+        "p-limit": "^4.0.0"
       },
-      "peerDependencies": {
-        "expo": "*"
+      "engines": {
+        "node": "^12.20.0 || ^14.13.1 || >=16.0.0"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/expo-keep-awake": {
-      "version": "12.8.2",
+    "node_modules/babel-loader/node_modules/path-exists": {
+      "version": "5.0.0",
+      "dev": true,
       "license": "MIT",
-      "peerDependencies": {
-        "expo": "*"
+      "engines": {
+        "node": "^12.20.0 || ^14.13.1 || >=16.0.0"
       }
     },
-    "node_modules/expo-modules-autolinking": {
-      "version": "1.10.2",
+    "node_modules/babel-loader/node_modules/pkg-dir": {
+      "version": "7.0.0",
+      "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@expo/config": "~8.5.0",
-        "chalk": "^4.1.0",
-        "commander": "^7.2.0",
-        "fast-glob": "^3.2.5",
-        "find-up": "^5.0.0",
-        "fs-extra": "^9.1.0"
+        "find-up": "^6.3.0"
       },
-      "bin": {
-        "expo-modules-autolinking": "bin/expo-modules-autolinking.js"
+      "engines": {
+        "node": ">=14.16"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/expo-modules-autolinking/node_modules/ansi-styles": {
-      "version": "4.3.0",
+    "node_modules/babel-loader/node_modules/schema-utils": {
+      "version": "4.2.0",
+      "dev": true,
       "license": "MIT",
       "dependencies": {
-        "color-convert": "^2.0.1"
+        "@types/json-schema": "^7.0.9",
+        "ajv": "^8.9.0",
+        "ajv-formats": "^2.1.1",
+        "ajv-keywords": "^5.1.0"
       },
       "engines": {
-        "node": ">=8"
+        "node": ">= 12.13.0"
       },
       "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
+        "type": "opencollective",
+        "url": "https://opencollective.com/webpack"
       }
     },
-    "node_modules/expo-modules-autolinking/node_modules/chalk": {
-      "version": "4.1.2",
+    "node_modules/babel-loader/node_modules/yocto-queue": {
+      "version": "1.0.0",
+      "dev": true,
       "license": "MIT",
-      "dependencies": {
-        "ansi-styles": "^4.1.0",
-        "supports-color": "^7.1.0"
-      },
       "engines": {
-        "node": ">=10"
+        "node": ">=12.20"
       },
       "funding": {
-        "url": "https://github.com/chalk/chalk?sponsor=1"
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/expo-modules-autolinking/node_modules/color-convert": {
-      "version": "2.0.1",
+    "node_modules/babel-messages": {
+      "version": "6.23.0",
+      "dev": true,
       "license": "MIT",
       "dependencies": {
-        "color-name": "~1.1.4"
-      },
-      "engines": {
-        "node": ">=7.0.0"
+        "babel-runtime": "^6.22.0"
       }
     },
-    "node_modules/expo-modules-autolinking/node_modules/color-name": {
-      "version": "1.1.4",
+    "node_modules/babel-plugin-add-module-exports": {
+      "version": "1.0.4",
+      "dev": true,
       "license": "MIT"
     },
-    "node_modules/expo-modules-autolinking/node_modules/commander": {
-      "version": "7.2.0",
-      "license": "MIT",
+    "node_modules/babel-plugin-istanbul": {
+      "version": "6.1.1",
+      "license": "BSD-3-Clause",
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.0.0",
+        "@istanbuljs/load-nyc-config": "^1.0.0",
+        "@istanbuljs/schema": "^0.1.2",
+        "istanbul-lib-instrument": "^5.0.4",
+        "test-exclude": "^6.0.0"
+      },
       "engines": {
-        "node": ">= 10"
+        "node": ">=8"
       }
     },
-    "node_modules/expo-modules-autolinking/node_modules/has-flag": {
-      "version": "4.0.0",
+    "node_modules/babel-plugin-jest-hoist": {
+      "version": "29.6.3",
       "license": "MIT",
+      "dependencies": {
+        "@babel/template": "^7.3.3",
+        "@babel/types": "^7.3.3",
+        "@types/babel__core": "^7.1.14",
+        "@types/babel__traverse": "^7.0.6"
+      },
       "engines": {
-        "node": ">=8"
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
       }
     },
-    "node_modules/expo-modules-autolinking/node_modules/supports-color": {
-      "version": "7.2.0",
+    "node_modules/babel-plugin-module-resolver": {
+      "version": "5.0.0",
+      "dev": true,
       "license": "MIT",
       "dependencies": {
-        "has-flag": "^4.0.0"
+        "find-babel-config": "^2.0.0",
+        "glob": "^8.0.3",
+        "pkg-up": "^3.1.0",
+        "reselect": "^4.1.7",
+        "resolve": "^1.22.1"
       },
       "engines": {
-        "node": ">=8"
+        "node": ">= 16"
       }
     },
-    "node_modules/expo-modules-core": {
-      "version": "1.11.8",
+    "node_modules/babel-plugin-module-resolver/node_modules/brace-expansion": {
+      "version": "2.0.1",
+      "dev": true,
       "license": "MIT",
       "dependencies": {
-        "invariant": "^2.2.4"
+        "balanced-match": "^1.0.0"
       }
     },
-    "node_modules/expo/node_modules/@babel/code-frame": {
-      "version": "7.10.4",
+    "node_modules/babel-plugin-module-resolver/node_modules/glob": {
+      "version": "8.1.0",
+      "dev": true,
+      "license": "ISC",
+      "dependencies": {
+        "fs.realpath": "^1.0.0",
+        "inflight": "^1.0.4",
+        "inherits": "2",
+        "minimatch": "^5.0.1",
+        "once": "^1.3.0"
+      },
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
+      }
+    },
+    "node_modules/babel-plugin-module-resolver/node_modules/minimatch": {
+      "version": "5.1.6",
+      "dev": true,
+      "license": "ISC",
+      "dependencies": {
+        "brace-expansion": "^2.0.1"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/babel-plugin-polyfill-corejs2": {
+      "version": "0.3.3",
       "license": "MIT",
       "dependencies": {
-        "@babel/highlight": "^7.10.4"
+        "@babel/compat-data": "^7.17.7",
+        "@babel/helper-define-polyfill-provider": "^0.3.3",
+        "semver": "^6.1.1"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
       }
     },
-    "node_modules/expo/node_modules/@expo/config-plugins": {
-      "version": "7.8.4",
+    "node_modules/babel-plugin-polyfill-corejs2/node_modules/semver": {
+      "version": "6.3.1",
+      "license": "ISC",
+      "bin": {
+        "semver": "bin/semver.js"
+      }
+    },
+    "node_modules/babel-plugin-polyfill-corejs3": {
+      "version": "0.5.3",
       "license": "MIT",
       "dependencies": {
-        "@expo/config-types": "^50.0.0-alpha.1",
-        "@expo/fingerprint": "^0.6.0",
-        "@expo/json-file": "~8.3.0",
-        "@expo/plist": "^0.1.0",
-        "@expo/sdk-runtime-versions": "^1.0.0",
-        "@react-native/normalize-color": "^2.0.0",
-        "chalk": "^4.1.2",
-        "debug": "^4.3.1",
-        "find-up": "~5.0.0",
-        "getenv": "^1.0.0",
-        "glob": "7.1.6",
-        "resolve-from": "^5.0.0",
-        "semver": "^7.5.3",
-        "slash": "^3.0.0",
-        "slugify": "^1.6.6",
-        "xcode": "^3.0.1",
-        "xml2js": "0.6.0"
+        "@babel/helper-define-polyfill-provider": "^0.3.2",
+        "core-js-compat": "^3.21.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
       }
     },
-    "node_modules/expo/node_modules/@expo/config-types": {
-      "version": "50.0.0",
-      "license": "MIT"
+    "node_modules/babel-plugin-polyfill-regenerator": {
+      "version": "0.4.1",
+      "license": "MIT",
+      "dependencies": {
+        "@babel/helper-define-polyfill-provider": "^0.3.3"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
     },
-    "node_modules/expo/node_modules/@expo/json-file": {
-      "version": "8.3.0",
+    "node_modules/babel-plugin-react-compiler": {
+      "version": "0.0.0-experimental-334f00b-20240725",
+      "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/code-frame": "~7.10.4",
-        "json5": "^2.2.2",
-        "write-file-atomic": "^2.3.0"
+        "@babel/generator": "7.2.0",
+        "@babel/types": "^7.19.0",
+        "chalk": "4",
+        "invariant": "^2.2.4",
+        "pretty-format": "^24",
+        "zod": "^3.22.4",
+        "zod-validation-error": "^2.1.0"
       }
     },
-    "node_modules/expo/node_modules/@expo/plist": {
-      "version": "0.1.0",
+    "node_modules/babel-plugin-react-compiler/node_modules/@babel/generator": {
+      "version": "7.2.0",
+      "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@xmldom/xmldom": "~0.7.7",
-        "base64-js": "^1.2.3",
-        "xmlbuilder": "^14.0.0"
+        "@babel/types": "^7.2.0",
+        "jsesc": "^2.5.1",
+        "lodash": "^4.17.10",
+        "source-map": "^0.5.0",
+        "trim-right": "^1.0.1"
       }
     },
-    "node_modules/expo/node_modules/ansi-styles": {
-      "version": "4.3.0",
+    "node_modules/babel-plugin-react-compiler/node_modules/@jest/types": {
+      "version": "24.9.0",
+      "dev": true,
       "license": "MIT",
       "dependencies": {
-        "color-convert": "^2.0.1"
+        "@types/istanbul-lib-coverage": "^2.0.0",
+        "@types/istanbul-reports": "^1.1.1",
+        "@types/yargs": "^13.0.0"
       },
       "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
+        "node": ">= 6"
       }
     },
-    "node_modules/expo/node_modules/chalk": {
+    "node_modules/babel-plugin-react-compiler/node_modules/@types/istanbul-reports": {
+      "version": "1.1.2",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@types/istanbul-lib-coverage": "*",
+        "@types/istanbul-lib-report": "*"
+      }
+    },
+    "node_modules/babel-plugin-react-compiler/node_modules/@types/yargs": {
+      "version": "13.0.12",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@types/yargs-parser": "*"
+      }
+    },
+    "node_modules/babel-plugin-react-compiler/node_modules/chalk": {
       "version": "4.1.2",
+      "dev": true,
       "license": "MIT",
       "dependencies": {
         "ansi-styles": "^4.1.0",
@@ -20647,8 +20524,23 @@
         "url": "https://github.com/chalk/chalk?sponsor=1"
       }
     },
-    "node_modules/expo/node_modules/color-convert": {
+    "node_modules/babel-plugin-react-compiler/node_modules/chalk/node_modules/ansi-styles": {
+      "version": "4.3.0",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "color-convert": "^2.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
+      }
+    },
+    "node_modules/babel-plugin-react-compiler/node_modules/color-convert": {
       "version": "2.0.1",
+      "dev": true,
       "license": "MIT",
       "dependencies": {
         "color-name": "~1.1.4"
@@ -20657,689 +20549,922 @@
         "node": ">=7.0.0"
       }
     },
-    "node_modules/expo/node_modules/color-name": {
+    "node_modules/babel-plugin-react-compiler/node_modules/color-name": {
       "version": "1.1.4",
+      "dev": true,
       "license": "MIT"
     },
-    "node_modules/expo/node_modules/has-flag": {
+    "node_modules/babel-plugin-react-compiler/node_modules/has-flag": {
       "version": "4.0.0",
+      "dev": true,
       "license": "MIT",
       "engines": {
         "node": ">=8"
       }
     },
-    "node_modules/expo/node_modules/supports-color": {
-      "version": "7.2.0",
+    "node_modules/babel-plugin-react-compiler/node_modules/pretty-format": {
+      "version": "24.9.0",
+      "dev": true,
       "license": "MIT",
       "dependencies": {
-        "has-flag": "^4.0.0"
+        "@jest/types": "^24.9.0",
+        "ansi-regex": "^4.0.0",
+        "ansi-styles": "^3.2.0",
+        "react-is": "^16.8.4"
       },
       "engines": {
-        "node": ">=8"
+        "node": ">= 6"
       }
     },
-    "node_modules/express": {
-      "version": "4.18.1",
+    "node_modules/babel-plugin-react-compiler/node_modules/react-is": {
+      "version": "16.13.1",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/babel-plugin-react-compiler/node_modules/source-map": {
+      "version": "0.5.7",
+      "dev": true,
+      "license": "BSD-3-Clause",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/babel-plugin-react-compiler/node_modules/supports-color": {
+      "version": "7.2.0",
+      "dev": true,
       "license": "MIT",
       "dependencies": {
-        "accepts": "~1.3.8",
-        "array-flatten": "1.1.1",
-        "body-parser": "1.20.0",
-        "content-disposition": "0.5.4",
-        "content-type": "~1.0.4",
-        "cookie": "0.5.0",
-        "cookie-signature": "1.0.6",
-        "debug": "2.6.9",
-        "depd": "2.0.0",
-        "encodeurl": "~1.0.2",
-        "escape-html": "~1.0.3",
-        "etag": "~1.8.1",
-        "finalhandler": "1.2.0",
-        "fresh": "0.5.2",
-        "http-errors": "2.0.0",
-        "merge-descriptors": "1.0.1",
-        "methods": "~1.1.2",
-        "on-finished": "2.4.1",
-        "parseurl": "~1.3.3",
-        "path-to-regexp": "0.1.7",
-        "proxy-addr": "~2.0.7",
-        "qs": "6.10.3",
-        "range-parser": "~1.2.1",
-        "safe-buffer": "5.2.1",
-        "send": "0.18.0",
-        "serve-static": "1.15.0",
-        "setprototypeof": "1.2.0",
-        "statuses": "2.0.1",
-        "type-is": "~1.6.18",
-        "utils-merge": "1.0.1",
-        "vary": "~1.1.2"
+        "has-flag": "^4.0.0"
       },
       "engines": {
-        "node": ">= 0.10.0"
+        "node": ">=8"
       }
     },
-    "node_modules/express/node_modules/debug": {
-      "version": "2.6.9",
+    "node_modules/babel-plugin-react-compiler/node_modules/zod-validation-error": {
+      "version": "2.1.0",
+      "dev": true,
       "license": "MIT",
-      "dependencies": {
-        "ms": "2.0.0"
+      "engines": {
+        "node": ">=18.0.0"
+      },
+      "peerDependencies": {
+        "zod": "^3.18.0"
       }
     },
-    "node_modules/express/node_modules/ms": {
-      "version": "2.0.0",
+    "node_modules/babel-plugin-react-native-web": {
+      "version": "0.18.12",
+      "dev": true,
       "license": "MIT"
     },
-    "node_modules/express/node_modules/safe-buffer": {
-      "version": "5.2.1",
-      "funding": [
-        {
-          "type": "github",
-          "url": "https://github.com/sponsors/feross"
-        },
-        {
-          "type": "patreon",
-          "url": "https://www.patreon.com/feross"
-        },
-        {
-          "type": "consulting",
-          "url": "https://feross.org/support"
-        }
-      ],
+    "node_modules/babel-plugin-syntax-class-properties": {
+      "version": "6.13.0",
+      "dev": true,
       "license": "MIT"
     },
-    "node_modules/extend-shallow": {
-      "version": "3.0.2",
+    "node_modules/babel-plugin-transform-class-properties": {
+      "version": "6.24.1",
+      "dev": true,
       "license": "MIT",
       "dependencies": {
-        "assign-symbols": "^1.0.0",
-        "is-extendable": "^1.0.1"
-      },
-      "engines": {
-        "node": ">=0.10.0"
+        "babel-helper-function-name": "^6.24.1",
+        "babel-plugin-syntax-class-properties": "^6.8.0",
+        "babel-runtime": "^6.22.0",
+        "babel-template": "^6.24.1"
       }
     },
-    "node_modules/extglob": {
-      "version": "2.0.4",
+    "node_modules/babel-plugin-transform-flow-enums": {
+      "version": "0.0.2",
       "license": "MIT",
-      "optional": true,
       "dependencies": {
-        "array-unique": "^0.3.2",
-        "define-property": "^1.0.0",
-        "expand-brackets": "^2.1.4",
-        "extend-shallow": "^2.0.1",
-        "fragment-cache": "^0.2.1",
-        "regex-not": "^1.0.0",
-        "snapdragon": "^0.8.1",
-        "to-regex": "^3.0.1"
-      },
-      "engines": {
-        "node": ">=0.10.0"
+        "@babel/plugin-syntax-flow": "^7.12.1"
       }
     },
-    "node_modules/extglob/node_modules/define-property": {
-      "version": "1.0.0",
+    "node_modules/babel-plugin-transform-remove-console": {
+      "version": "6.9.4",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/babel-polyfill": {
+      "version": "6.26.0",
       "license": "MIT",
-      "optional": true,
       "dependencies": {
-        "is-descriptor": "^1.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
+        "babel-runtime": "^6.26.0",
+        "core-js": "^2.5.0",
+        "regenerator-runtime": "^0.10.5"
       }
     },
-    "node_modules/extglob/node_modules/extend-shallow": {
-      "version": "2.0.1",
+    "node_modules/babel-polyfill/node_modules/core-js": {
+      "version": "2.6.12",
+      "hasInstallScript": true,
+      "license": "MIT"
+    },
+    "node_modules/babel-polyfill/node_modules/regenerator-runtime": {
+      "version": "0.10.5",
+      "license": "MIT"
+    },
+    "node_modules/babel-preset-current-node-syntax": {
+      "version": "1.0.1",
       "license": "MIT",
-      "optional": true,
       "dependencies": {
-        "is-extendable": "^0.1.0"
+        "@babel/plugin-syntax-async-generators": "^7.8.4",
+        "@babel/plugin-syntax-bigint": "^7.8.3",
+        "@babel/plugin-syntax-class-properties": "^7.8.3",
+        "@babel/plugin-syntax-import-meta": "^7.8.3",
+        "@babel/plugin-syntax-json-strings": "^7.8.3",
+        "@babel/plugin-syntax-logical-assignment-operators": "^7.8.3",
+        "@babel/plugin-syntax-nullish-coalescing-operator": "^7.8.3",
+        "@babel/plugin-syntax-numeric-separator": "^7.8.3",
+        "@babel/plugin-syntax-object-rest-spread": "^7.8.3",
+        "@babel/plugin-syntax-optional-catch-binding": "^7.8.3",
+        "@babel/plugin-syntax-optional-chaining": "^7.8.3",
+        "@babel/plugin-syntax-top-level-await": "^7.8.3"
       },
-      "engines": {
-        "node": ">=0.10.0"
+      "peerDependencies": {
+        "@babel/core": "^7.0.0"
       }
     },
-    "node_modules/extglob/node_modules/is-extendable": {
-      "version": "0.1.1",
+    "node_modules/babel-preset-expo": {
+      "version": "11.0.11",
       "license": "MIT",
-      "optional": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/extract-zip": {
-      "version": "2.0.1",
-      "dev": true,
-      "license": "BSD-2-Clause",
       "dependencies": {
-        "debug": "^4.1.1",
-        "get-stream": "^5.1.0",
-        "yauzl": "^2.10.0"
-      },
-      "bin": {
-        "extract-zip": "cli.js"
-      },
-      "engines": {
-        "node": ">= 10.17.0"
-      },
-      "optionalDependencies": {
-        "@types/yauzl": "^2.9.1"
+        "@babel/plugin-proposal-decorators": "^7.12.9",
+        "@babel/plugin-transform-export-namespace-from": "^7.22.11",
+        "@babel/plugin-transform-object-rest-spread": "^7.12.13",
+        "@babel/plugin-transform-parameters": "^7.22.15",
+        "@babel/preset-react": "^7.22.15",
+        "@babel/preset-typescript": "^7.23.0",
+        "@react-native/babel-preset": "0.74.84",
+        "babel-plugin-react-compiler": "^0.0.0-experimental-592953e-20240517",
+        "babel-plugin-react-native-web": "~0.19.10",
+        "react-refresh": "^0.14.2"
       }
     },
-    "node_modules/extract-zip/node_modules/get-stream": {
-      "version": "5.2.0",
-      "dev": true,
+    "node_modules/babel-preset-expo/node_modules/@react-native/babel-plugin-codegen": {
+      "version": "0.74.84",
       "license": "MIT",
       "dependencies": {
-        "pump": "^3.0.0"
+        "@react-native/codegen": "0.74.84"
       },
       "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
+        "node": ">=18"
       }
     },
-    "node_modules/extsprintf": {
-      "version": "1.4.1",
-      "dev": true,
-      "engines": [
-        "node >=0.6.0"
-      ],
-      "license": "MIT",
-      "optional": true
-    },
-    "node_modules/fast-deep-equal": {
-      "version": "3.1.3",
-      "license": "MIT"
-    },
-    "node_modules/fast-diff": {
-      "version": "1.3.0",
-      "dev": true,
-      "license": "Apache-2.0"
-    },
-    "node_modules/fast-equals": {
-      "version": "4.0.3",
-      "license": "MIT"
-    },
-    "node_modules/fast-glob": {
-      "version": "3.3.1",
+    "node_modules/babel-preset-expo/node_modules/@react-native/babel-preset": {
+      "version": "0.74.84",
       "license": "MIT",
       "dependencies": {
-        "@nodelib/fs.stat": "^2.0.2",
-        "@nodelib/fs.walk": "^1.2.3",
-        "glob-parent": "^5.1.2",
-        "merge2": "^1.3.0",
-        "micromatch": "^4.0.4"
+        "@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-logical-assignment-operators": "^7.18.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-private-methods": "^7.22.5",
+        "@babel/plugin-transform-private-property-in-object": "^7.22.11",
+        "@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",
+        "@react-native/babel-plugin-codegen": "0.74.84",
+        "babel-plugin-transform-flow-enums": "^0.0.2",
+        "react-refresh": "^0.14.0"
       },
       "engines": {
-        "node": ">=8.6.0"
+        "node": ">=18"
+      },
+      "peerDependencies": {
+        "@babel/core": "*"
       }
     },
-    "node_modules/fast-json-parse": {
-      "version": "1.0.3",
-      "dev": true,
-      "license": "MIT"
-    },
-    "node_modules/fast-json-patch": {
-      "version": "2.2.1",
-      "dev": true,
+    "node_modules/babel-preset-expo/node_modules/@react-native/codegen": {
+      "version": "0.74.84",
       "license": "MIT",
       "dependencies": {
-        "fast-deep-equal": "^2.0.1"
+        "@babel/parser": "^7.20.0",
+        "glob": "^7.1.1",
+        "hermes-parser": "0.19.1",
+        "invariant": "^2.2.4",
+        "jscodeshift": "^0.14.0",
+        "mkdirp": "^0.5.1",
+        "nullthrows": "^1.1.1"
       },
       "engines": {
-        "node": ">= 0.4.0"
+        "node": ">=18"
+      },
+      "peerDependencies": {
+        "@babel/preset-env": "^7.1.6"
       }
     },
-    "node_modules/fast-json-patch/node_modules/fast-deep-equal": {
-      "version": "2.0.1",
-      "dev": true,
+    "node_modules/babel-preset-expo/node_modules/babel-plugin-react-compiler": {
+      "version": "0.0.0",
       "license": "MIT"
     },
-    "node_modules/fast-json-stable-stringify": {
-      "version": "2.1.0",
+    "node_modules/babel-preset-expo/node_modules/babel-plugin-react-native-web": {
+      "version": "0.19.12",
       "license": "MIT"
     },
-    "node_modules/fast-levenshtein": {
-      "version": "2.0.6",
-      "dev": true,
+    "node_modules/babel-preset-expo/node_modules/hermes-estree": {
+      "version": "0.19.1",
       "license": "MIT"
     },
-    "node_modules/fast-xml-parser": {
-      "version": "4.3.6",
-      "resolved": "https://registry.npmjs.org/fast-xml-parser/-/fast-xml-parser-4.3.6.tgz",
-      "integrity": "sha512-M2SovcRxD4+vC493Uc2GZVcZaj66CCJhWurC4viynVSTvrpErCShNcDz1lAho6n9REQKvL/ll4A4/fw6Y9z8nw==",
-      "funding": [
-        {
-          "type": "github",
-          "url": "https://github.com/sponsors/NaturalIntelligence"
-        },
-        {
-          "type": "paypal",
-          "url": "https://paypal.me/naturalintelligence"
-        }
-      ],
+    "node_modules/babel-preset-expo/node_modules/hermes-parser": {
+      "version": "0.19.1",
+      "license": "MIT",
       "dependencies": {
-        "strnum": "^1.0.5"
-      },
-      "bin": {
-        "fxparser": "src/cli/cli.js"
+        "hermes-estree": "0.19.1"
       }
     },
-    "node_modules/fastest-levenshtein": {
-      "version": "1.0.16",
-      "dev": true,
+    "node_modules/babel-preset-expo/node_modules/mkdirp": {
+      "version": "0.5.6",
       "license": "MIT",
-      "engines": {
-        "node": ">= 4.9.1"
-      }
-    },
-    "node_modules/fastq": {
-      "version": "1.13.0",
-      "license": "ISC",
       "dependencies": {
-        "reusify": "^1.0.4"
+        "minimist": "^1.2.6"
+      },
+      "bin": {
+        "mkdirp": "bin/cmd.js"
       }
     },
-    "node_modules/faye-websocket": {
-      "version": "0.11.4",
-      "dev": true,
-      "license": "Apache-2.0",
+    "node_modules/babel-preset-jest": {
+      "version": "29.6.3",
+      "license": "MIT",
       "dependencies": {
-        "websocket-driver": ">=0.5.1"
+        "babel-plugin-jest-hoist": "^29.6.3",
+        "babel-preset-current-node-syntax": "^1.0.0"
       },
       "engines": {
-        "node": ">=0.8.0"
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0"
       }
     },
-    "node_modules/fb-watchman": {
-      "version": "2.0.1",
-      "license": "Apache-2.0",
+    "node_modules/babel-runtime": {
+      "version": "6.26.0",
+      "license": "MIT",
       "dependencies": {
-        "bser": "2.1.1"
+        "core-js": "^2.4.0",
+        "regenerator-runtime": "^0.11.0"
       }
     },
-    "node_modules/fbemitter": {
-      "version": "3.0.0",
-      "license": "BSD-3-Clause",
+    "node_modules/babel-runtime/node_modules/core-js": {
+      "version": "2.6.12",
+      "hasInstallScript": true,
+      "license": "MIT"
+    },
+    "node_modules/babel-runtime/node_modules/regenerator-runtime": {
+      "version": "0.11.1",
+      "license": "MIT"
+    },
+    "node_modules/babel-template": {
+      "version": "6.26.0",
+      "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "fbjs": "^3.0.0"
+        "babel-runtime": "^6.26.0",
+        "babel-traverse": "^6.26.0",
+        "babel-types": "^6.26.0",
+        "babylon": "^6.18.0",
+        "lodash": "^4.17.4"
       }
     },
-    "node_modules/fbjs": {
-      "version": "3.0.4",
+    "node_modules/babel-traverse": {
+      "version": "6.26.0",
+      "dev": true,
       "license": "MIT",
       "dependencies": {
-        "cross-fetch": "^3.1.5",
-        "fbjs-css-vars": "^1.0.0",
-        "loose-envify": "^1.0.0",
-        "object-assign": "^4.1.0",
-        "promise": "^7.1.1",
-        "setimmediate": "^1.0.5",
-        "ua-parser-js": "^0.7.30"
+        "babel-code-frame": "^6.26.0",
+        "babel-messages": "^6.23.0",
+        "babel-runtime": "^6.26.0",
+        "babel-types": "^6.26.0",
+        "babylon": "^6.18.0",
+        "debug": "^2.6.8",
+        "globals": "^9.18.0",
+        "invariant": "^2.2.2",
+        "lodash": "^4.17.4"
       }
     },
-    "node_modules/fbjs-css-vars": {
-      "version": "1.0.2",
-      "license": "MIT"
-    },
-    "node_modules/fd-slicer": {
-      "version": "1.1.0",
+    "node_modules/babel-traverse/node_modules/debug": {
+      "version": "2.6.9",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "pend": "~1.2.0"
+        "ms": "2.0.0"
       }
     },
-    "node_modules/fetch-retry": {
-      "version": "5.0.6",
-      "resolved": "https://registry.npmjs.org/fetch-retry/-/fetch-retry-5.0.6.tgz",
-      "integrity": "sha512-3yurQZ2hD9VISAhJJP9bpYFNQrHHBXE2JxxjY5aLEcDi46RmAzJE2OC9FAde0yis5ElW0jTTzs0zfg/Cca4XqQ=="
-    },
-    "node_modules/file-entry-cache": {
-      "version": "6.0.1",
+    "node_modules/babel-traverse/node_modules/globals": {
+      "version": "9.18.0",
       "dev": true,
       "license": "MIT",
-      "dependencies": {
-        "flat-cache": "^3.0.4"
-      },
       "engines": {
-        "node": "^10.12.0 || >=12.0.0"
+        "node": ">=0.10.0"
       }
     },
-    "node_modules/file-system-cache": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/file-system-cache/-/file-system-cache-2.3.0.tgz",
-      "integrity": "sha512-l4DMNdsIPsVnKrgEXbJwDJsA5mB8rGwHYERMgqQx/xAUtChPJMre1bXBzDEqqVbWv9AIbFezXMxeEkZDSrXUOQ==",
-      "dependencies": {
-        "fs-extra": "11.1.1",
-        "ramda": "0.29.0"
-      }
+    "node_modules/babel-traverse/node_modules/ms": {
+      "version": "2.0.0",
+      "dev": true,
+      "license": "MIT"
     },
-    "node_modules/file-system-cache/node_modules/fs-extra": {
-      "version": "11.1.1",
-      "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-11.1.1.tgz",
-      "integrity": "sha512-MGIE4HOvQCeUCzmlHs0vXpih4ysz4wg9qiSAu6cd42lVwPbTM1TjV7RusoyQqMmk/95gdQZX72u+YW+c3eEpFQ==",
+    "node_modules/babel-types": {
+      "version": "6.26.0",
+      "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "graceful-fs": "^4.2.0",
-        "jsonfile": "^6.0.1",
-        "universalify": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=14.14"
+        "babel-runtime": "^6.26.0",
+        "esutils": "^2.0.2",
+        "lodash": "^4.17.4",
+        "to-fast-properties": "^1.0.3"
       }
     },
-    "node_modules/file-uri-to-path": {
-      "version": "1.0.0",
+    "node_modules/babel-types/node_modules/to-fast-properties": {
+      "version": "1.0.3",
+      "dev": true,
       "license": "MIT",
-      "optional": true
-    },
-    "node_modules/filelist": {
-      "version": "1.0.4",
-      "license": "Apache-2.0",
-      "dependencies": {
-        "minimatch": "^5.0.1"
+      "engines": {
+        "node": ">=0.10.0"
       }
     },
-    "node_modules/filelist/node_modules/brace-expansion": {
-      "version": "2.0.1",
+    "node_modules/babylon": {
+      "version": "6.18.0",
+      "dev": true,
       "license": "MIT",
-      "dependencies": {
-        "balanced-match": "^1.0.0"
+      "bin": {
+        "babylon": "bin/babylon.js"
       }
     },
-    "node_modules/filelist/node_modules/minimatch": {
-      "version": "5.1.6",
-      "license": "ISC",
+    "node_modules/balanced-match": {
+      "version": "1.0.2",
+      "license": "MIT"
+    },
+    "node_modules/base": {
+      "version": "0.11.2",
+      "license": "MIT",
+      "optional": true,
       "dependencies": {
-        "brace-expansion": "^2.0.1"
+        "cache-base": "^1.0.1",
+        "class-utils": "^0.3.5",
+        "component-emitter": "^1.2.1",
+        "define-property": "^1.0.0",
+        "isobject": "^3.0.1",
+        "mixin-deep": "^1.2.0",
+        "pascalcase": "^0.1.1"
       },
       "engines": {
-        "node": ">=10"
+        "node": ">=0.10.0"
       }
     },
-    "node_modules/fill-range": {
-      "version": "7.0.1",
+    "node_modules/base-64": {
+      "version": "0.1.0"
+    },
+    "node_modules/base/node_modules/define-property": {
+      "version": "1.0.0",
       "license": "MIT",
+      "optional": true,
       "dependencies": {
-        "to-regex-range": "^5.0.1"
+        "is-descriptor": "^1.0.0"
       },
       "engines": {
-        "node": ">=8"
+        "node": ">=0.10.0"
       }
     },
-    "node_modules/filter-obj": {
-      "version": "1.1.0",
+    "node_modules/base64-arraybuffer": {
+      "version": "1.0.2",
       "license": "MIT",
       "engines": {
-        "node": ">=0.10.0"
+        "node": ">= 0.6.0"
       }
     },
-    "node_modules/finalhandler": {
-      "version": "1.2.0",
+    "node_modules/base64-js": {
+      "version": "1.5.1",
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/feross"
+        },
+        {
+          "type": "patreon",
+          "url": "https://www.patreon.com/feross"
+        },
+        {
+          "type": "consulting",
+          "url": "https://feross.org/support"
+        }
+      ],
+      "license": "MIT"
+    },
+    "node_modules/basic-auth": {
+      "version": "2.0.1",
+      "dev": true,
       "license": "MIT",
       "dependencies": {
-        "debug": "2.6.9",
-        "encodeurl": "~1.0.2",
-        "escape-html": "~1.0.3",
-        "on-finished": "2.4.1",
-        "parseurl": "~1.3.3",
-        "statuses": "2.0.1",
-        "unpipe": "~1.0.0"
+        "safe-buffer": "5.1.2"
       },
       "engines": {
         "node": ">= 0.8"
       }
     },
-    "node_modules/finalhandler/node_modules/debug": {
-      "version": "2.6.9",
-      "license": "MIT",
-      "dependencies": {
-        "ms": "2.0.0"
-      }
-    },
-    "node_modules/finalhandler/node_modules/ms": {
-      "version": "2.0.0",
+    "node_modules/batch": {
+      "version": "0.6.1",
+      "dev": true,
       "license": "MIT"
     },
-    "node_modules/find-babel-config": {
-      "version": "2.0.0",
+    "node_modules/before-after-hook": {
+      "version": "2.2.2",
       "dev": true,
+      "license": "Apache-2.0"
+    },
+    "node_modules/better-opn": {
+      "version": "3.0.2",
       "license": "MIT",
       "dependencies": {
-        "json5": "^2.1.1",
-        "path-exists": "^4.0.0"
+        "open": "^8.0.4"
       },
       "engines": {
-        "node": ">=16.0.0"
+        "node": ">=12.0.0"
       }
     },
-    "node_modules/find-babel-config/node_modules/path-exists": {
-      "version": "4.0.0",
+    "node_modules/big-integer": {
+      "version": "1.6.51",
+      "license": "Unlicense",
+      "engines": {
+        "node": ">=0.6"
+      }
+    },
+    "node_modules/big.js": {
+      "version": "5.2.2",
       "dev": true,
       "license": "MIT",
       "engines": {
-        "node": ">=8"
+        "node": "*"
       }
     },
-    "node_modules/find-cache-dir": {
-      "version": "2.1.0",
-      "license": "MIT",
+    "node_modules/bin-links": {
+      "version": "4.0.2",
+      "license": "ISC",
       "dependencies": {
-        "commondir": "^1.0.1",
-        "make-dir": "^2.0.0",
-        "pkg-dir": "^3.0.0"
+        "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": ">=6"
+        "node": "^14.17.0 || ^16.13.0 || >=18.0.0"
       }
     },
-    "node_modules/find-cache-dir/node_modules/find-up": {
-      "version": "3.0.0",
-      "license": "MIT",
-      "dependencies": {
-        "locate-path": "^3.0.0"
-      },
+    "node_modules/bin-links/node_modules/signal-exit": {
+      "version": "4.1.0",
+      "license": "ISC",
       "engines": {
-        "node": ">=6"
+        "node": ">=14"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
       }
     },
-    "node_modules/find-cache-dir/node_modules/locate-path": {
-      "version": "3.0.0",
-      "license": "MIT",
+    "node_modules/bin-links/node_modules/write-file-atomic": {
+      "version": "5.0.1",
+      "license": "ISC",
       "dependencies": {
-        "p-locate": "^3.0.0",
-        "path-exists": "^3.0.0"
+        "imurmurhash": "^0.1.4",
+        "signal-exit": "^4.0.1"
       },
       "engines": {
-        "node": ">=6"
+        "node": "^14.17.0 || ^16.13.0 || >=18.0.0"
       }
     },
-    "node_modules/find-cache-dir/node_modules/p-limit": {
-      "version": "2.3.0",
+    "node_modules/binary-extensions": {
+      "version": "2.2.0",
+      "devOptional": true,
       "license": "MIT",
-      "dependencies": {
-        "p-try": "^2.0.0"
-      },
       "engines": {
-        "node": ">=6"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
+        "node": ">=8"
       }
     },
-    "node_modules/find-cache-dir/node_modules/p-locate": {
-      "version": "3.0.0",
+    "node_modules/bindings": {
+      "version": "1.5.0",
       "license": "MIT",
+      "optional": true,
       "dependencies": {
-        "p-limit": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=6"
+        "file-uri-to-path": "1.0.0"
       }
     },
-    "node_modules/find-cache-dir/node_modules/pkg-dir": {
-      "version": "3.0.0",
+    "node_modules/bl": {
+      "version": "4.1.0",
       "license": "MIT",
       "dependencies": {
-        "find-up": "^3.0.0"
+        "buffer": "^5.5.0",
+        "inherits": "^2.0.4",
+        "readable-stream": "^3.4.0"
+      }
+    },
+    "node_modules/bl/node_modules/readable-stream": {
+      "version": "3.6.2",
+      "license": "MIT",
+      "dependencies": {
+        "inherits": "^2.0.3",
+        "string_decoder": "^1.1.1",
+        "util-deprecate": "^1.0.1"
       },
       "engines": {
-        "node": ">=6"
+        "node": ">= 6"
       }
     },
-    "node_modules/find-up": {
-      "version": "5.0.0",
+    "node_modules/bluebird": {
+      "version": "3.7.2",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/bluebird-lst": {
+      "version": "1.0.9",
+      "dev": true,
       "license": "MIT",
       "dependencies": {
-        "locate-path": "^6.0.0",
-        "path-exists": "^4.0.0"
+        "bluebird": "^3.5.5"
+      }
+    },
+    "node_modules/bn.js": {
+      "version": "5.2.1",
+      "license": "MIT"
+    },
+    "node_modules/body-parser": {
+      "version": "1.20.0",
+      "license": "MIT",
+      "dependencies": {
+        "bytes": "3.1.2",
+        "content-type": "~1.0.4",
+        "debug": "2.6.9",
+        "depd": "2.0.0",
+        "destroy": "1.2.0",
+        "http-errors": "2.0.0",
+        "iconv-lite": "0.4.24",
+        "on-finished": "2.4.1",
+        "qs": "6.10.3",
+        "raw-body": "2.5.1",
+        "type-is": "~1.6.18",
+        "unpipe": "1.0.0"
       },
       "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
+        "node": ">= 0.8",
+        "npm": "1.2.8000 || >= 1.4.16"
       }
     },
-    "node_modules/find-up/node_modules/path-exists": {
-      "version": "4.0.0",
+    "node_modules/body-parser/node_modules/bytes": {
+      "version": "3.1.2",
       "license": "MIT",
       "engines": {
-        "node": ">=8"
+        "node": ">= 0.8"
       }
     },
-    "node_modules/find-yarn-workspace-root": {
-      "version": "2.0.0",
-      "license": "Apache-2.0",
+    "node_modules/body-parser/node_modules/debug": {
+      "version": "2.6.9",
+      "license": "MIT",
       "dependencies": {
-        "micromatch": "^4.0.2"
+        "ms": "2.0.0"
       }
     },
-    "node_modules/flat-cache": {
-      "version": "3.0.4",
-      "dev": true,
+    "node_modules/body-parser/node_modules/iconv-lite": {
+      "version": "0.4.24",
       "license": "MIT",
       "dependencies": {
-        "flatted": "^3.1.0",
-        "rimraf": "^3.0.2"
+        "safer-buffer": ">= 2.1.2 < 3"
       },
       "engines": {
-        "node": "^10.12.0 || >=12.0.0"
+        "node": ">=0.10.0"
       }
     },
-    "node_modules/flatted": {
-      "version": "3.2.7",
+    "node_modules/body-parser/node_modules/ms": {
+      "version": "2.0.0",
+      "license": "MIT"
+    },
+    "node_modules/bonjour-service": {
+      "version": "1.2.1",
       "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "fast-deep-equal": "^3.1.3",
+        "multicast-dns": "^7.2.5"
+      }
+    },
+    "node_modules/boolbase": {
+      "version": "1.0.0",
       "license": "ISC"
     },
-    "node_modules/flow-enums-runtime": {
-      "version": "0.0.6",
+    "node_modules/boolean": {
+      "version": "3.2.0",
+      "dev": true,
       "license": "MIT"
     },
-    "node_modules/flow-parser": {
-      "version": "0.206.0",
-      "resolved": "https://registry.npmjs.org/flow-parser/-/flow-parser-0.206.0.tgz",
-      "integrity": "sha512-HVzoK3r6Vsg+lKvlIZzaWNBVai+FXTX1wdYhz/wVlH13tb/gOdLXmlTqy6odmTBhT5UoWUbq0k8263Qhr9d88w==",
-      "engines": {
-        "node": ">=0.4.0"
+    "node_modules/bottleneck": {
+      "version": "2.19.5",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/bplist-creator": {
+      "version": "0.1.0",
+      "license": "MIT",
+      "dependencies": {
+        "stream-buffers": "2.2.x"
       }
     },
-    "node_modules/follow-redirects": {
-      "version": "1.15.5",
-      "funding": [
-        {
-          "type": "individual",
-          "url": "https://github.com/sponsors/RubenVerborgh"
-        }
-      ],
+    "node_modules/bplist-parser": {
+      "version": "0.2.0",
+      "dev": true,
       "license": "MIT",
+      "dependencies": {
+        "big-integer": "^1.6.44"
+      },
       "engines": {
-        "node": ">=4.0"
+        "node": ">= 5.10.0"
+      }
+    },
+    "node_modules/brace-expansion": {
+      "version": "1.1.11",
+      "license": "MIT",
+      "dependencies": {
+        "balanced-match": "^1.0.0",
+        "concat-map": "0.0.1"
+      }
+    },
+    "node_modules/braces": {
+      "version": "3.0.2",
+      "license": "MIT",
+      "dependencies": {
+        "fill-range": "^7.0.1"
       },
-      "peerDependenciesMeta": {
-        "debug": {
-          "optional": true
-        }
+      "engines": {
+        "node": ">=8"
       }
     },
-    "node_modules/fontfaceobserver": {
-      "version": "2.3.0",
-      "license": "BSD-2-Clause"
+    "node_modules/brorand": {
+      "version": "1.1.0",
+      "license": "MIT"
     },
-    "node_modules/for-each": {
-      "version": "0.3.3",
+    "node_modules/browser-assert": {
+      "version": "1.2.1",
+      "dev": true
+    },
+    "node_modules/browserify-aes": {
+      "version": "1.2.0",
       "license": "MIT",
       "dependencies": {
-        "is-callable": "^1.1.3"
+        "buffer-xor": "^1.0.3",
+        "cipher-base": "^1.0.0",
+        "create-hash": "^1.1.0",
+        "evp_bytestokey": "^1.0.3",
+        "inherits": "^2.0.1",
+        "safe-buffer": "^5.0.1"
       }
     },
-    "node_modules/for-in": {
+    "node_modules/browserify-cipher": {
+      "version": "1.0.1",
+      "license": "MIT",
+      "dependencies": {
+        "browserify-aes": "^1.0.4",
+        "browserify-des": "^1.0.0",
+        "evp_bytestokey": "^1.0.0"
+      }
+    },
+    "node_modules/browserify-des": {
       "version": "1.0.2",
       "license": "MIT",
-      "engines": {
-        "node": ">=0.10.0"
+      "dependencies": {
+        "cipher-base": "^1.0.1",
+        "des.js": "^1.0.0",
+        "inherits": "^2.0.1",
+        "safe-buffer": "^5.1.2"
       }
     },
-    "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==",
+    "node_modules/browserify-rsa": {
+      "version": "4.1.0",
+      "license": "MIT",
       "dependencies": {
-        "cross-spawn": "^7.0.0",
-        "signal-exit": "^4.0.1"
+        "bn.js": "^5.0.0",
+        "randombytes": "^2.0.1"
+      }
+    },
+    "node_modules/browserify-sign": {
+      "version": "4.2.2",
+      "license": "ISC",
+      "dependencies": {
+        "bn.js": "^5.2.1",
+        "browserify-rsa": "^4.1.0",
+        "create-hash": "^1.2.0",
+        "create-hmac": "^1.1.7",
+        "elliptic": "^6.5.4",
+        "inherits": "^2.0.4",
+        "parse-asn1": "^5.1.6",
+        "readable-stream": "^3.6.2",
+        "safe-buffer": "^5.2.1"
       },
       "engines": {
-        "node": ">=14"
+        "node": ">= 4"
+      }
+    },
+    "node_modules/browserify-sign/node_modules/readable-stream": {
+      "version": "3.6.2",
+      "license": "MIT",
+      "dependencies": {
+        "inherits": "^2.0.3",
+        "string_decoder": "^1.1.1",
+        "util-deprecate": "^1.0.1"
       },
-      "funding": {
-        "url": "https://github.com/sponsors/isaacs"
+      "engines": {
+        "node": ">= 6"
       }
     },
-    "node_modules/foreground-child/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==",
+    "node_modules/browserify-sign/node_modules/safe-buffer": {
+      "version": "5.2.1",
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/feross"
+        },
+        {
+          "type": "patreon",
+          "url": "https://www.patreon.com/feross"
+        },
+        {
+          "type": "consulting",
+          "url": "https://feross.org/support"
+        }
+      ],
+      "license": "MIT"
+    },
+    "node_modules/browserify-zlib": {
+      "version": "0.2.0",
+      "license": "MIT",
+      "dependencies": {
+        "pako": "~1.0.5"
+      }
+    },
+    "node_modules/browserslist": {
+      "version": "4.23.0",
+      "funding": [
+        {
+          "type": "opencollective",
+          "url": "https://opencollective.com/browserslist"
+        },
+        {
+          "type": "tidelift",
+          "url": "https://tidelift.com/funding/github/npm/browserslist"
+        },
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/ai"
+        }
+      ],
+      "license": "MIT",
+      "dependencies": {
+        "caniuse-lite": "^1.0.30001587",
+        "electron-to-chromium": "^1.4.668",
+        "node-releases": "^2.0.14",
+        "update-browserslist-db": "^1.0.13"
+      },
+      "bin": {
+        "browserslist": "cli.js"
+      },
       "engines": {
-        "node": ">=14"
+        "node": "^6 || ^7 || ^8 || ^9 || ^10 || ^11 || ^12 || >=13.7"
+      }
+    },
+    "node_modules/bs-logger": {
+      "version": "0.2.6",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "fast-json-stable-stringify": "2.x"
       },
-      "funding": {
-        "url": "https://github.com/sponsors/isaacs"
+      "engines": {
+        "node": ">= 6"
       }
     },
-    "node_modules/fork-ts-checker-webpack-plugin": {
-      "version": "8.0.0",
-      "resolved": "https://registry.npmjs.org/fork-ts-checker-webpack-plugin/-/fork-ts-checker-webpack-plugin-8.0.0.tgz",
-      "integrity": "sha512-mX3qW3idpueT2klaQXBzrIM/pHw+T0B/V9KHEvNrqijTq9NFnMZU6oreVxDYcf33P8a5cW+67PjodNHthGnNVg==",
+    "node_modules/bser": {
+      "version": "2.1.1",
+      "license": "Apache-2.0",
+      "dependencies": {
+        "node-int64": "^0.4.0"
+      }
+    },
+    "node_modules/buffer": {
+      "version": "5.7.1",
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/feross"
+        },
+        {
+          "type": "patreon",
+          "url": "https://www.patreon.com/feross"
+        },
+        {
+          "type": "consulting",
+          "url": "https://feross.org/support"
+        }
+      ],
+      "license": "MIT",
+      "dependencies": {
+        "base64-js": "^1.3.1",
+        "ieee754": "^1.1.13"
+      }
+    },
+    "node_modules/buffer-alloc": {
+      "version": "1.2.0",
+      "license": "MIT",
+      "dependencies": {
+        "buffer-alloc-unsafe": "^1.1.0",
+        "buffer-fill": "^1.0.0"
+      }
+    },
+    "node_modules/buffer-alloc-unsafe": {
+      "version": "1.1.0",
+      "license": "MIT"
+    },
+    "node_modules/buffer-crc32": {
+      "version": "0.2.13",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": "*"
+      }
+    },
+    "node_modules/buffer-fill": {
+      "version": "1.0.0",
+      "license": "MIT"
+    },
+    "node_modules/buffer-from": {
+      "version": "1.1.2",
+      "license": "MIT"
+    },
+    "node_modules/buffer-xor": {
+      "version": "1.0.3",
+      "license": "MIT"
+    },
+    "node_modules/builder-util": {
+      "version": "25.0.0",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "@babel/code-frame": "^7.16.7",
+        "@types/debug": "^4.1.6",
+        "7zip-bin": "~5.2.0",
+        "app-builder-bin": "v5.0.0-alpha.4",
+        "bluebird-lst": "^1.0.9",
+        "builder-util-runtime": "9.2.5",
         "chalk": "^4.1.2",
-        "chokidar": "^3.5.3",
-        "cosmiconfig": "^7.0.1",
-        "deepmerge": "^4.2.2",
-        "fs-extra": "^10.0.0",
-        "memfs": "^3.4.1",
-        "minimatch": "^3.0.4",
-        "node-abort-controller": "^3.0.1",
-        "schema-utils": "^3.1.1",
-        "semver": "^7.3.5",
-        "tapable": "^2.2.1"
+        "cross-spawn": "^7.0.3",
+        "debug": "^4.3.4",
+        "fs-extra": "^10.1.0",
+        "http-proxy-agent": "^5.0.0",
+        "https-proxy-agent": "^5.0.1",
+        "is-ci": "^3.0.0",
+        "js-yaml": "^4.1.0",
+        "source-map-support": "^0.5.19",
+        "stat-mode": "^1.0.0",
+        "temp-file": "^3.4.0"
+      }
+    },
+    "node_modules/builder-util-runtime": {
+      "version": "9.2.5",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "debug": "^4.3.4",
+        "sax": "^1.2.4"
       },
       "engines": {
-        "node": ">=12.13.0",
-        "yarn": ">=1.0.0"
-      },
-      "peerDependencies": {
-        "typescript": ">3.6.0",
-        "webpack": "^5.11.0"
+        "node": ">=12.0.0"
       }
     },
-    "node_modules/fork-ts-checker-webpack-plugin/node_modules/ansi-styles": {
+    "node_modules/builder-util/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,
+      "license": "MIT",
       "dependencies": {
         "color-convert": "^2.0.1"
       },
@@ -21350,11 +21475,15 @@
         "url": "https://github.com/chalk/ansi-styles?sponsor=1"
       }
     },
-    "node_modules/fork-ts-checker-webpack-plugin/node_modules/chalk": {
+    "node_modules/builder-util/node_modules/argparse": {
+      "version": "2.0.1",
+      "dev": true,
+      "license": "Python-2.0"
+    },
+    "node_modules/builder-util/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,
+      "license": "MIT",
       "dependencies": {
         "ansi-styles": "^4.1.0",
         "supports-color": "^7.1.0"
@@ -21366,11 +21495,10 @@
         "url": "https://github.com/chalk/chalk?sponsor=1"
       }
     },
-    "node_modules/fork-ts-checker-webpack-plugin/node_modules/color-convert": {
+    "node_modules/builder-util/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,
+      "license": "MIT",
       "dependencies": {
         "color-name": "~1.1.4"
       },
@@ -21378,17 +21506,15 @@
         "node": ">=7.0.0"
       }
     },
-    "node_modules/fork-ts-checker-webpack-plugin/node_modules/color-name": {
+    "node_modules/builder-util/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
+      "dev": true,
+      "license": "MIT"
     },
-    "node_modules/fork-ts-checker-webpack-plugin/node_modules/fs-extra": {
+    "node_modules/builder-util/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,
+      "license": "MIT",
       "dependencies": {
         "graceful-fs": "^4.2.0",
         "jsonfile": "^6.0.1",
@@ -21398,32 +21524,29 @@
         "node": ">=12"
       }
     },
-    "node_modules/fork-ts-checker-webpack-plugin/node_modules/has-flag": {
+    "node_modules/builder-util/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,
+      "license": "MIT",
       "engines": {
         "node": ">=8"
       }
     },
-    "node_modules/fork-ts-checker-webpack-plugin/node_modules/memfs": {
-      "version": "3.5.3",
-      "resolved": "https://registry.npmjs.org/memfs/-/memfs-3.5.3.tgz",
-      "integrity": "sha512-UERzLsxzllchadvbPs5aolHh65ISpKpM+ccLbOJ8/vvpBKmAWf+la7dXFy7Mr0ySHbdHrFv5kGFCUHHe6GFEmw==",
+    "node_modules/builder-util/node_modules/js-yaml": {
+      "version": "4.1.0",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "fs-monkey": "^1.0.4"
+        "argparse": "^2.0.1"
       },
-      "engines": {
-        "node": ">= 4.0.0"
+      "bin": {
+        "js-yaml": "bin/js-yaml.js"
       }
     },
-    "node_modules/fork-ts-checker-webpack-plugin/node_modules/supports-color": {
+    "node_modules/builder-util/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,
+      "license": "MIT",
       "dependencies": {
         "has-flag": "^4.0.0"
       },
@@ -21431,254 +21554,230 @@
         "node": ">=8"
       }
     },
-    "node_modules/form-data": {
-      "version": "3.0.1",
-      "license": "MIT",
-      "dependencies": {
-        "asynckit": "^0.4.0",
-        "combined-stream": "^1.0.8",
-        "mime-types": "^2.1.12"
-      },
-      "engines": {
-        "node": ">= 6"
-      }
-    },
-    "node_modules/forwarded": {
-      "version": "0.2.0",
-      "license": "MIT",
-      "engines": {
-        "node": ">= 0.6"
-      }
-    },
-    "node_modules/fraction.js": {
-      "version": "4.3.4",
+    "node_modules/builtin-modules": {
+      "version": "3.3.0",
       "dev": true,
       "license": "MIT",
       "engines": {
-        "node": "*"
+        "node": ">=6"
       },
       "funding": {
-        "type": "patreon",
-        "url": "https://github.com/sponsors/rawify"
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/fragment-cache": {
-      "version": "0.2.1",
-      "license": "MIT",
-      "optional": true,
+    "node_modules/builtin-status-codes": {
+      "version": "3.0.0",
+      "license": "MIT"
+    },
+    "node_modules/builtins": {
+      "version": "1.0.3",
+      "license": "MIT"
+    },
+    "node_modules/bundle-name": {
+      "version": "4.1.0",
+      "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "map-cache": "^0.2.2"
+        "run-applescript": "^7.0.0"
       },
       "engines": {
-        "node": ">=0.10.0"
+        "node": ">=18"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/freeport-async": {
-      "version": "2.0.0",
+    "node_modules/bytes": {
+      "version": "3.0.0",
       "license": "MIT",
       "engines": {
-        "node": ">=8"
+        "node": ">= 0.8"
       }
     },
-    "node_modules/fresh": {
-      "version": "0.5.2",
+    "node_modules/bytewise": {
+      "version": "1.1.0",
       "license": "MIT",
-      "engines": {
-        "node": ">= 0.6"
+      "dependencies": {
+        "bytewise-core": "^1.2.2",
+        "typewise": "^1.0.3"
       }
     },
-    "node_modules/fs-constants": {
-      "version": "1.0.0",
-      "license": "MIT"
-    },
-    "node_modules/fs-extra": {
-      "version": "9.1.0",
+    "node_modules/bytewise-core": {
+      "version": "1.2.3",
       "license": "MIT",
       "dependencies": {
-        "at-least-node": "^1.0.0",
-        "graceful-fs": "^4.2.0",
-        "jsonfile": "^6.0.1",
-        "universalify": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=10"
+        "typewise-core": "^1.2"
       }
     },
-    "node_modules/fs-minipass": {
-      "version": "2.1.0",
+    "node_modules/cacache": {
+      "version": "18.0.3",
       "license": "ISC",
       "dependencies": {
-        "minipass": "^3.0.0"
+        "@npmcli/fs": "^3.1.0",
+        "fs-minipass": "^3.0.0",
+        "glob": "^10.2.2",
+        "lru-cache": "^10.0.1",
+        "minipass": "^7.0.3",
+        "minipass-collect": "^2.0.1",
+        "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": ">= 8"
-      }
-    },
-    "node_modules/fs-monkey": {
-      "version": "1.0.5",
-      "dev": true,
-      "license": "Unlicense"
-    },
-    "node_modules/fs.realpath": {
-      "version": "1.0.0",
-      "license": "ISC"
-    },
-    "node_modules/fsevents": {
-      "version": "2.3.3",
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "darwin"
-      ],
-      "engines": {
-        "node": "^8.16.0 || ^10.6.0 || >=11.0.0"
+        "node": "^16.14.0 || >=18.0.0"
       }
     },
-    "node_modules/function-bind": {
-      "version": "1.1.2",
+    "node_modules/cacache/node_modules/brace-expansion": {
+      "version": "2.0.1",
       "license": "MIT",
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
+      "dependencies": {
+        "balanced-match": "^1.0.0"
       }
     },
-    "node_modules/function.prototype.name": {
-      "version": "1.1.5",
-      "dev": true,
-      "license": "MIT",
+    "node_modules/cacache/node_modules/fs-minipass": {
+      "version": "3.0.3",
+      "license": "ISC",
       "dependencies": {
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.1.3",
-        "es-abstract": "^1.19.0",
-        "functions-have-names": "^1.2.2"
+        "minipass": "^7.0.3"
       },
       "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/functional-red-black-tree": {
-      "version": "1.0.1",
-      "dev": true,
-      "license": "MIT"
-    },
-    "node_modules/functions-have-names": {
-      "version": "1.2.3",
-      "dev": true,
-      "license": "MIT",
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
+        "node": "^14.17.0 || ^16.13.0 || >=18.0.0"
       }
     },
-    "node_modules/gauge": {
-      "version": "3.0.2",
+    "node_modules/cacache/node_modules/glob": {
+      "version": "10.4.2",
       "license": "ISC",
-      "optional": true,
       "dependencies": {
-        "aproba": "^1.0.3 || ^2.0.0",
-        "color-support": "^1.1.2",
-        "console-control-strings": "^1.0.0",
-        "has-unicode": "^2.0.1",
-        "object-assign": "^4.1.1",
-        "signal-exit": "^3.0.0",
-        "string-width": "^4.2.3",
-        "strip-ansi": "^6.0.1",
-        "wide-align": "^1.1.2"
+        "foreground-child": "^3.1.0",
+        "jackspeak": "^3.1.2",
+        "minimatch": "^9.0.4",
+        "minipass": "^7.1.2",
+        "package-json-from-dist": "^1.0.0",
+        "path-scurry": "^1.11.1"
+      },
+      "bin": {
+        "glob": "dist/esm/bin.mjs"
       },
       "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/gensync": {
-      "version": "1.0.0-beta.2",
-      "license": "MIT",
-      "engines": {
-        "node": ">=6.9.0"
+        "node": ">=16 || 14 >=14.18"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
       }
     },
-    "node_modules/geojson-rbush": {
-      "version": "3.2.0",
-      "license": "MIT",
+    "node_modules/cacache/node_modules/jackspeak": {
+      "version": "3.4.0",
+      "license": "BlueOak-1.0.0",
       "dependencies": {
-        "@turf/bbox": "*",
-        "@turf/helpers": "6.x",
-        "@turf/meta": "6.x",
-        "@types/geojson": "7946.0.8",
-        "rbush": "^3.0.1"
+        "@isaacs/cliui": "^8.0.2"
+      },
+      "engines": {
+        "node": ">=14"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
+      },
+      "optionalDependencies": {
+        "@pkgjs/parseargs": "^0.11.0"
       }
     },
-    "node_modules/geojson-vt": {
-      "version": "3.2.1",
-      "license": "ISC"
-    },
-    "node_modules/get-caller-file": {
-      "version": "2.0.5",
+    "node_modules/cacache/node_modules/lru-cache": {
+      "version": "10.3.0",
       "license": "ISC",
       "engines": {
-        "node": "6.* || 8.* || >= 10.*"
+        "node": "14 || >=16.14"
       }
     },
-    "node_modules/get-intrinsic": {
-      "version": "1.2.1",
-      "license": "MIT",
+    "node_modules/cacache/node_modules/minimatch": {
+      "version": "9.0.5",
+      "license": "ISC",
       "dependencies": {
-        "function-bind": "^1.1.1",
-        "has": "^1.0.3",
-        "has-proto": "^1.0.1",
-        "has-symbols": "^1.0.3"
+        "brace-expansion": "^2.0.1"
+      },
+      "engines": {
+        "node": ">=16 || 14 >=14.17"
       },
       "funding": {
-        "url": "https://github.com/sponsors/ljharb"
+        "url": "https://github.com/sponsors/isaacs"
       }
     },
-    "node_modules/get-npm-tarball-url": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/get-npm-tarball-url/-/get-npm-tarball-url-2.1.0.tgz",
-      "integrity": "sha512-ro+DiMu5DXgRBabqXupW38h7WPZ9+Ad8UjwhvsmmN8w1sU7ab0nzAXvVZ4kqYg57OrqomRtJvepX5/xvFKNtjA==",
+    "node_modules/cacache/node_modules/minipass": {
+      "version": "7.1.2",
+      "license": "ISC",
       "engines": {
-        "node": ">=12.17"
+        "node": ">=16 || 14 >=14.17"
       }
     },
-    "node_modules/get-package-type": {
-      "version": "0.1.0",
+    "node_modules/cache-base": {
+      "version": "1.0.1",
       "license": "MIT",
+      "optional": true,
+      "dependencies": {
+        "collection-visit": "^1.0.0",
+        "component-emitter": "^1.2.1",
+        "get-value": "^2.0.6",
+        "has-value": "^1.0.0",
+        "isobject": "^3.0.1",
+        "set-value": "^2.0.0",
+        "to-object-path": "^0.3.0",
+        "union-value": "^1.0.0",
+        "unset-value": "^1.0.0"
+      },
       "engines": {
-        "node": ">=8.0.0"
+        "node": ">=0.10.0"
       }
     },
-    "node_modules/get-port": {
-      "version": "3.2.0",
+    "node_modules/cacheable-lookup": {
+      "version": "5.0.4",
+      "dev": true,
       "license": "MIT",
       "engines": {
-        "node": ">=4"
+        "node": ">=10.6.0"
       }
     },
-    "node_modules/get-stdin": {
-      "version": "6.0.0",
+    "node_modules/cacheable-request": {
+      "version": "7.0.2",
       "dev": true,
       "license": "MIT",
+      "dependencies": {
+        "clone-response": "^1.0.2",
+        "get-stream": "^5.1.0",
+        "http-cache-semantics": "^4.0.0",
+        "keyv": "^4.0.0",
+        "lowercase-keys": "^2.0.0",
+        "normalize-url": "^6.0.1",
+        "responselike": "^2.0.0"
+      },
       "engines": {
-        "node": ">=4"
+        "node": ">=8"
       }
     },
-    "node_modules/get-stream": {
-      "version": "6.0.1",
+    "node_modules/cacheable-request/node_modules/get-stream": {
+      "version": "5.2.0",
+      "dev": true,
       "license": "MIT",
+      "dependencies": {
+        "pump": "^3.0.0"
+      },
       "engines": {
-        "node": ">=10"
+        "node": ">=8"
       },
       "funding": {
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/get-symbol-description": {
-      "version": "1.0.0",
-      "dev": true,
+    "node_modules/call-bind": {
+      "version": "1.0.7",
       "license": "MIT",
       "dependencies": {
-        "call-bind": "^1.0.2",
-        "get-intrinsic": "^1.1.1"
+        "es-define-property": "^1.0.0",
+        "es-errors": "^1.3.0",
+        "function-bind": "^1.1.2",
+        "get-intrinsic": "^1.2.4",
+        "set-function-length": "^1.2.1"
       },
       "engines": {
         "node": ">= 0.4"
@@ -21687,127 +21786,51 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/get-value": {
-      "version": "2.0.6",
-      "license": "MIT",
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/getenv": {
-      "version": "1.0.0",
-      "license": "MIT",
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/giget": {
-      "version": "1.2.3",
-      "resolved": "https://registry.npmjs.org/giget/-/giget-1.2.3.tgz",
-      "integrity": "sha512-8EHPljDvs7qKykr6uw8b+lqLiUc/vUg+KVTI0uND4s63TdsZM2Xus3mflvF0DDG9SiM4RlCkFGL+7aAjRmV7KA==",
-      "dependencies": {
-        "citty": "^0.1.6",
-        "consola": "^3.2.3",
-        "defu": "^6.1.4",
-        "node-fetch-native": "^1.6.3",
-        "nypm": "^0.3.8",
-        "ohash": "^1.1.3",
-        "pathe": "^1.1.2",
-        "tar": "^6.2.0"
-      },
-      "bin": {
-        "giget": "dist/cli.mjs"
-      }
-    },
-    "node_modules/github-slugger": {
+    "node_modules/caller-callsite": {
       "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/github-slugger/-/github-slugger-2.0.0.tgz",
-      "integrity": "sha512-IaOQ9puYtjrkq7Y0Ygl9KDZnrf/aiUJYUpVf89y8kyaxbRG7Y1SrX/jaumrv81vc61+kiMempujsM3Yw7w5qcw=="
-    },
-    "node_modules/gl-matrix": {
-      "version": "3.4.3",
-      "license": "MIT"
-    },
-    "node_modules/glob": {
-      "version": "7.1.6",
-      "license": "ISC",
+      "license": "MIT",
       "dependencies": {
-        "fs.realpath": "^1.0.0",
-        "inflight": "^1.0.4",
-        "inherits": "2",
-        "minimatch": "^3.0.4",
-        "once": "^1.3.0",
-        "path-is-absolute": "^1.0.0"
+        "callsites": "^2.0.0"
       },
       "engines": {
-        "node": "*"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/isaacs"
+        "node": ">=4"
       }
     },
-    "node_modules/glob-parent": {
-      "version": "5.1.2",
-      "license": "ISC",
-      "dependencies": {
-        "is-glob": "^4.0.1"
-      },
+    "node_modules/caller-callsite/node_modules/callsites": {
+      "version": "2.0.0",
+      "license": "MIT",
       "engines": {
-        "node": ">= 6"
+        "node": ">=4"
       }
     },
-    "node_modules/glob-to-regexp": {
-      "version": "0.4.1",
-      "license": "BSD-2-Clause"
-    },
-    "node_modules/global-agent": {
-      "version": "3.0.0",
-      "dev": true,
-      "license": "BSD-3-Clause",
+    "node_modules/caller-path": {
+      "version": "2.0.0",
+      "license": "MIT",
       "dependencies": {
-        "boolean": "^3.0.1",
-        "es6-error": "^4.1.1",
-        "matcher": "^3.0.0",
-        "roarr": "^2.15.3",
-        "semver": "^7.3.2",
-        "serialize-error": "^7.0.1"
+        "caller-callsite": "^2.0.0"
       },
       "engines": {
-        "node": ">=10.0"
+        "node": ">=4"
       }
     },
-    "node_modules/globals": {
-      "version": "11.12.0",
+    "node_modules/callsites": {
+      "version": "3.1.0",
       "license": "MIT",
       "engines": {
-        "node": ">=4"
+        "node": ">=6"
       }
     },
-    "node_modules/globalthis": {
-      "version": "1.0.3",
-      "dev": true,
+    "node_modules/camel-case": {
+      "version": "4.1.2",
       "license": "MIT",
       "dependencies": {
-        "define-properties": "^1.1.3"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
+        "pascal-case": "^3.1.2",
+        "tslib": "^2.0.3"
       }
     },
-    "node_modules/globby": {
-      "version": "11.1.0",
+    "node_modules/camelcase": {
+      "version": "6.3.0",
       "license": "MIT",
-      "dependencies": {
-        "array-union": "^2.1.0",
-        "dir-glob": "^3.0.1",
-        "fast-glob": "^3.2.9",
-        "ignore": "^5.2.0",
-        "merge2": "^1.4.1",
-        "slash": "^3.0.0"
-      },
       "engines": {
         "node": ">=10"
       },
@@ -21815,273 +21838,270 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/good-listener": {
-      "version": "1.2.2",
-      "resolved": "https://registry.npmjs.org/good-listener/-/good-listener-1.2.2.tgz",
-      "integrity": "sha512-goW1b+d9q/HIwbVYZzZ6SsTr4IgE+WA44A0GmPIQstuOrgsFcT7VEJ48nmr9GaRtNu0XTKacFLGnBPAM6Afouw==",
-      "dependencies": {
-        "delegate": "^3.1.2"
-      }
-    },
-    "node_modules/gopd": {
+    "node_modules/camelize": {
       "version": "1.0.1",
       "license": "MIT",
-      "dependencies": {
-        "get-intrinsic": "^1.1.3"
-      },
       "funding": {
         "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/got": {
-      "version": "11.8.6",
-      "dev": true,
+    "node_modules/caniuse-lite": {
+      "version": "1.0.30001603",
+      "funding": [
+        {
+          "type": "opencollective",
+          "url": "https://opencollective.com/browserslist"
+        },
+        {
+          "type": "tidelift",
+          "url": "https://tidelift.com/funding/github/npm/caniuse-lite"
+        },
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/ai"
+        }
+      ],
+      "license": "CC-BY-4.0"
+    },
+    "node_modules/canvas": {
+      "version": "2.11.2",
+      "hasInstallScript": true,
       "license": "MIT",
+      "optional": true,
       "dependencies": {
-        "@sindresorhus/is": "^4.0.0",
-        "@szmarczak/http-timer": "^4.0.5",
-        "@types/cacheable-request": "^6.0.1",
-        "@types/responselike": "^1.0.0",
-        "cacheable-lookup": "^5.0.3",
-        "cacheable-request": "^7.0.2",
-        "decompress-response": "^6.0.0",
-        "http2-wrapper": "^1.0.0-beta.5.2",
-        "lowercase-keys": "^2.0.0",
-        "p-cancelable": "^2.0.0",
-        "responselike": "^2.0.0"
+        "@mapbox/node-pre-gyp": "^1.0.0",
+        "nan": "^2.17.0",
+        "simple-get": "^3.0.3"
       },
       "engines": {
-        "node": ">=10.19.0"
-      },
-      "funding": {
-        "url": "https://github.com/sindresorhus/got?sponsor=1"
+        "node": ">=6"
       }
     },
-    "node_modules/graceful-fs": {
-      "version": "4.2.10",
-      "license": "ISC"
-    },
-    "node_modules/graphemer": {
-      "version": "1.4.0",
-      "dev": true,
+    "node_modules/canvas-size": {
+      "version": "1.2.6",
       "license": "MIT"
     },
-    "node_modules/graphql": {
-      "version": "15.8.0",
+    "node_modules/case-sensitive-paths-webpack-plugin": {
+      "version": "2.4.0",
+      "dev": true,
       "license": "MIT",
       "engines": {
-        "node": ">= 10.x"
+        "node": ">=4"
       }
     },
-    "node_modules/graphql-tag": {
-      "version": "2.12.6",
+    "node_modules/center-align": {
+      "version": "0.1.3",
       "license": "MIT",
       "dependencies": {
-        "tslib": "^2.1.0"
+        "align-text": "^0.1.3",
+        "lazy-cache": "^1.0.3"
       },
       "engines": {
-        "node": ">=10"
-      },
-      "peerDependencies": {
-        "graphql": "^0.9.0 || ^0.10.0 || ^0.11.0 || ^0.12.0 || ^0.13.0 || ^14.0.0 || ^15.0.0 || ^16.0.0"
+        "node": ">=0.10.0"
       }
     },
-    "node_modules/grid-index": {
-      "version": "1.1.0",
-      "license": "ISC"
-    },
-    "node_modules/gunzip-maybe": {
-      "version": "1.4.2",
-      "resolved": "https://registry.npmjs.org/gunzip-maybe/-/gunzip-maybe-1.4.2.tgz",
-      "integrity": "sha512-4haO1M4mLO91PW57BMsDFf75UmwoRX0GkdD+Faw+Lr+r/OZrOCS0pIBwOL1xCKQqnQzbNFGgK2V2CpBUPeFNTw==",
+    "node_modules/chalk": {
+      "version": "2.4.2",
+      "license": "MIT",
       "dependencies": {
-        "browserify-zlib": "^0.1.4",
-        "is-deflate": "^1.0.0",
-        "is-gzip": "^1.0.0",
-        "peek-stream": "^1.1.0",
-        "pumpify": "^1.3.3",
-        "through2": "^2.0.3"
+        "ansi-styles": "^3.2.1",
+        "escape-string-regexp": "^1.0.5",
+        "supports-color": "^5.3.0"
       },
-      "bin": {
-        "gunzip-maybe": "bin.js"
+      "engines": {
+        "node": ">=4"
       }
     },
-    "node_modules/gunzip-maybe/node_modules/browserify-zlib": {
-      "version": "0.1.4",
-      "resolved": "https://registry.npmjs.org/browserify-zlib/-/browserify-zlib-0.1.4.tgz",
-      "integrity": "sha512-19OEpq7vWgsH6WkvkBJQDFvJS1uPcbFOQ4v9CU839dO+ZZXUZO6XpE6hNCqvlIIj+4fZvRiJ6DsAQ382GwiyTQ==",
-      "dependencies": {
-        "pako": "~0.2.0"
+    "node_modules/chalk/node_modules/escape-string-regexp": {
+      "version": "1.0.5",
+      "license": "MIT",
+      "engines": {
+        "node": ">=0.8.0"
       }
     },
-    "node_modules/gunzip-maybe/node_modules/pako": {
-      "version": "0.2.9",
-      "resolved": "https://registry.npmjs.org/pako/-/pako-0.2.9.tgz",
-      "integrity": "sha512-NUcwaKxUxWrZLpDG+z/xZaCgQITkA/Dv4V/T6bw7VON6l1Xz/VnrBqrYjZQ12TamKHzITTfOEIYUj48y2KXImA=="
-    },
-    "node_modules/gzip-size": {
-      "version": "6.0.0",
-      "dev": true,
+    "node_modules/char-regex": {
+      "version": "1.0.2",
       "license": "MIT",
-      "dependencies": {
-        "duplexer": "^0.1.2"
-      },
       "engines": {
         "node": ">=10"
-      },
+      }
+    },
+    "node_modules/character-entities-html4": {
+      "version": "1.1.4",
+      "license": "MIT",
       "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
+        "type": "github",
+        "url": "https://github.com/sponsors/wooorm"
       }
     },
-    "node_modules/handle-thing": {
-      "version": "2.0.1",
-      "dev": true,
-      "license": "MIT"
+    "node_modules/character-entities-legacy": {
+      "version": "1.1.4",
+      "license": "MIT",
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/wooorm"
+      }
     },
-    "node_modules/handlebars": {
-      "version": "4.7.8",
-      "resolved": "https://registry.npmjs.org/handlebars/-/handlebars-4.7.8.tgz",
-      "integrity": "sha512-vafaFqs8MZkRrSX7sFVUdo3ap/eNiLnb4IakshzvP56X5Nr1iGKAIqdX6tMlm6HcNRIkr6AxO5jFEoJzzpT8aQ==",
+    "node_modules/charenc": {
+      "version": "0.0.2",
+      "license": "BSD-3-Clause",
+      "engines": {
+        "node": "*"
+      }
+    },
+    "node_modules/chokidar": {
+      "version": "3.6.0",
+      "devOptional": true,
+      "license": "MIT",
       "dependencies": {
-        "minimist": "^1.2.5",
-        "neo-async": "^2.6.2",
-        "source-map": "^0.6.1",
-        "wordwrap": "^1.0.0"
-      },
-      "bin": {
-        "handlebars": "bin/handlebars"
+        "anymatch": "~3.1.2",
+        "braces": "~3.0.2",
+        "glob-parent": "~5.1.2",
+        "is-binary-path": "~2.1.0",
+        "is-glob": "~4.0.1",
+        "normalize-path": "~3.0.0",
+        "readdirp": "~3.6.0"
       },
       "engines": {
-        "node": ">=0.4.7"
+        "node": ">= 8.10.0"
+      },
+      "funding": {
+        "url": "https://paulmillr.com/funding/"
       },
       "optionalDependencies": {
-        "uglify-js": "^3.1.4"
+        "fsevents": "~2.3.2"
       }
     },
-    "node_modules/has": {
-      "version": "1.0.3",
-      "license": "MIT",
-      "dependencies": {
-        "function-bind": "^1.1.1"
-      },
+    "node_modules/chownr": {
+      "version": "2.0.0",
+      "license": "ISC",
       "engines": {
-        "node": ">= 0.4.0"
+        "node": ">=10"
       }
     },
-    "node_modules/has-ansi": {
-      "version": "2.0.0",
-      "dev": true,
-      "license": "MIT",
+    "node_modules/chrome-launcher": {
+      "version": "0.15.2",
+      "license": "Apache-2.0",
       "dependencies": {
-        "ansi-regex": "^2.0.0"
+        "@types/node": "*",
+        "escape-string-regexp": "^4.0.0",
+        "is-wsl": "^2.2.0",
+        "lighthouse-logger": "^1.0.0"
+      },
+      "bin": {
+        "print-chrome-path": "bin/print-chrome-path.js"
       },
       "engines": {
-        "node": ">=0.10.0"
+        "node": ">=12.13.0"
       }
     },
-    "node_modules/has-ansi/node_modules/ansi-regex": {
-      "version": "2.1.1",
-      "dev": true,
+    "node_modules/chrome-trace-event": {
+      "version": "1.0.3",
       "license": "MIT",
       "engines": {
-        "node": ">=0.10.0"
+        "node": ">=6.0"
       }
     },
-    "node_modules/has-bigints": {
-      "version": "1.0.2",
-      "dev": true,
-      "license": "MIT",
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
+    "node_modules/chromium-edge-launcher": {
+      "version": "1.0.0",
+      "license": "Apache-2.0",
+      "peer": true,
+      "dependencies": {
+        "@types/node": "*",
+        "escape-string-regexp": "^4.0.0",
+        "is-wsl": "^2.2.0",
+        "lighthouse-logger": "^1.0.0",
+        "mkdirp": "^1.0.4",
+        "rimraf": "^3.0.2"
       }
     },
-    "node_modules/has-flag": {
-      "version": "3.0.0",
+    "node_modules/chromium-pickle-js": {
+      "version": "0.2.0",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/ci-info": {
+      "version": "3.8.0",
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/sibiraj-s"
+        }
+      ],
       "license": "MIT",
       "engines": {
-        "node": ">=4"
+        "node": ">=8"
       }
     },
-    "node_modules/has-property-descriptors": {
-      "version": "1.0.0",
+    "node_modules/cipher-base": {
+      "version": "1.0.4",
       "license": "MIT",
       "dependencies": {
-        "get-intrinsic": "^1.1.1"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
+        "inherits": "^2.0.1",
+        "safe-buffer": "^5.0.1"
       }
     },
-    "node_modules/has-proto": {
-      "version": "1.0.1",
+    "node_modules/citty": {
+      "version": "0.1.6",
+      "dev": true,
       "license": "MIT",
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
+      "dependencies": {
+        "consola": "^3.2.3"
       }
     },
-    "node_modules/has-symbols": {
-      "version": "1.0.3",
+    "node_modules/cjs-module-lexer": {
+      "version": "1.2.3",
+      "license": "MIT"
+    },
+    "node_modules/class-utils": {
+      "version": "0.3.6",
       "license": "MIT",
-      "engines": {
-        "node": ">= 0.4"
+      "optional": true,
+      "dependencies": {
+        "arr-union": "^3.1.0",
+        "define-property": "^0.2.5",
+        "isobject": "^3.0.0",
+        "static-extend": "^0.1.1"
       },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
+      "engines": {
+        "node": ">=0.10.0"
       }
     },
-    "node_modules/has-tostringtag": {
-      "version": "1.0.0",
+    "node_modules/class-utils/node_modules/define-property": {
+      "version": "0.2.5",
       "license": "MIT",
+      "optional": true,
       "dependencies": {
-        "has-symbols": "^1.0.2"
+        "is-descriptor": "^0.1.0"
       },
       "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
+        "node": ">=0.10.0"
       }
     },
-    "node_modules/has-unicode": {
-      "version": "2.0.1",
-      "license": "ISC",
-      "optional": true
-    },
-    "node_modules/has-value": {
-      "version": "1.0.0",
+    "node_modules/class-utils/node_modules/is-accessor-descriptor": {
+      "version": "0.1.6",
       "license": "MIT",
       "optional": true,
       "dependencies": {
-        "get-value": "^2.0.6",
-        "has-values": "^1.0.0",
-        "isobject": "^3.0.0"
+        "kind-of": "^3.0.2"
       },
       "engines": {
         "node": ">=0.10.0"
       }
     },
-    "node_modules/has-values": {
-      "version": "1.0.0",
+    "node_modules/class-utils/node_modules/is-accessor-descriptor/node_modules/kind-of": {
+      "version": "3.2.2",
       "license": "MIT",
       "optional": true,
       "dependencies": {
-        "is-number": "^3.0.0",
-        "kind-of": "^4.0.0"
+        "is-buffer": "^1.1.5"
       },
       "engines": {
         "node": ">=0.10.0"
       }
     },
-    "node_modules/has-values/node_modules/is-buffer": {
-      "version": "1.1.6",
-      "license": "MIT",
-      "optional": true
-    },
-    "node_modules/has-values/node_modules/is-number": {
-      "version": "3.0.0",
+    "node_modules/class-utils/node_modules/is-data-descriptor": {
+      "version": "0.1.4",
       "license": "MIT",
       "optional": true,
       "dependencies": {
@@ -22091,7 +22111,7 @@
         "node": ">=0.10.0"
       }
     },
-    "node_modules/has-values/node_modules/is-number/node_modules/kind-of": {
+    "node_modules/class-utils/node_modules/is-data-descriptor/node_modules/kind-of": {
       "version": "3.2.2",
       "license": "MIT",
       "optional": true,
@@ -22102,735 +22122,724 @@
         "node": ">=0.10.0"
       }
     },
-    "node_modules/has-values/node_modules/kind-of": {
-      "version": "4.0.0",
+    "node_modules/class-utils/node_modules/is-descriptor": {
+      "version": "0.1.6",
       "license": "MIT",
       "optional": true,
       "dependencies": {
-        "is-buffer": "^1.1.5"
+        "is-accessor-descriptor": "^0.1.6",
+        "is-data-descriptor": "^0.1.4",
+        "kind-of": "^5.0.0"
       },
       "engines": {
         "node": ">=0.10.0"
       }
     },
-    "node_modules/hash-base": {
-      "version": "3.1.0",
+    "node_modules/class-utils/node_modules/kind-of": {
+      "version": "5.1.0",
       "license": "MIT",
-      "dependencies": {
-        "inherits": "^2.0.4",
-        "readable-stream": "^3.6.0",
-        "safe-buffer": "^5.2.0"
-      },
+      "optional": true,
       "engines": {
-        "node": ">=4"
+        "node": ">=0.10.0"
       }
     },
-    "node_modules/hash-base/node_modules/readable-stream": {
-      "version": "3.6.2",
+    "node_modules/classnames": {
+      "version": "2.5.0",
+      "license": "MIT",
+      "workspaces": [
+        "benchmarks"
+      ]
+    },
+    "node_modules/clean-css": {
+      "version": "5.3.2",
       "license": "MIT",
       "dependencies": {
-        "inherits": "^2.0.3",
-        "string_decoder": "^1.1.1",
-        "util-deprecate": "^1.0.1"
+        "source-map": "~0.6.0"
       },
       "engines": {
-        "node": ">= 6"
+        "node": ">= 10.0"
       }
     },
-    "node_modules/hash-base/node_modules/safe-buffer": {
-      "version": "5.2.1",
-      "funding": [
-        {
-          "type": "github",
-          "url": "https://github.com/sponsors/feross"
-        },
-        {
-          "type": "patreon",
-          "url": "https://www.patreon.com/feross"
-        },
-        {
-          "type": "consulting",
-          "url": "https://feross.org/support"
-        }
-      ],
-      "license": "MIT"
+    "node_modules/clean-css/node_modules/source-map": {
+      "version": "0.6.1",
+      "license": "BSD-3-Clause",
+      "engines": {
+        "node": ">=0.10.0"
+      }
     },
-    "node_modules/hash.js": {
-      "version": "1.1.7",
+    "node_modules/clean-stack": {
+      "version": "2.2.0",
       "license": "MIT",
-      "dependencies": {
-        "inherits": "^2.0.3",
-        "minimalistic-assert": "^1.0.1"
+      "engines": {
+        "node": ">=6"
       }
     },
-    "node_modules/hasown": {
-      "version": "2.0.0",
+    "node_modules/clean-webpack-plugin": {
+      "version": "4.0.0",
+      "dev": true,
       "license": "MIT",
       "dependencies": {
-        "function-bind": "^1.1.2"
+        "del": "^4.1.1"
       },
       "engines": {
-        "node": ">= 0.4"
+        "node": ">=10.0.0"
+      },
+      "peerDependencies": {
+        "webpack": ">=4.0.0 <6.0.0"
       }
     },
-    "node_modules/hast-util-heading-rank": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/hast-util-heading-rank/-/hast-util-heading-rank-3.0.0.tgz",
-      "integrity": "sha512-EJKb8oMUXVHcWZTDepnr+WNbfnXKFNf9duMesmr4S8SXTJBJ9M4Yok08pu9vxdJwdlGRhVumk9mEhkEvKGifwA==",
+    "node_modules/cli-cursor": {
+      "version": "3.1.0",
+      "license": "MIT",
       "dependencies": {
-        "@types/hast": "^3.0.0"
+        "restore-cursor": "^3.1.0"
       },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/unified"
+      "engines": {
+        "node": ">=8"
       }
     },
-    "node_modules/hast-util-is-element": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/hast-util-is-element/-/hast-util-is-element-3.0.0.tgz",
-      "integrity": "sha512-Val9mnv2IWpLbNPqc/pUem+a7Ipj2aHacCwgNfTiK0vJKl0LF+4Ba4+v1oPHFpf3bLYmreq0/l3Gud9S5OH42g==",
-      "dependencies": {
-        "@types/hast": "^3.0.0"
+    "node_modules/cli-spinners": {
+      "version": "2.9.2",
+      "license": "MIT",
+      "engines": {
+        "node": ">=6"
       },
       "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/unified"
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/hast-util-to-string": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/hast-util-to-string/-/hast-util-to-string-3.0.0.tgz",
-      "integrity": "sha512-OGkAxX1Ua3cbcW6EJ5pT/tslVb90uViVkcJ4ZZIMW/R33DX/AkcJcRrPebPwJkHYwlDHXz4aIwvAAaAdtrACFA==",
+    "node_modules/cli-table3": {
+      "version": "0.6.5",
+      "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "@types/hast": "^3.0.0"
+        "string-width": "^4.2.0"
       },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/unified"
+      "engines": {
+        "node": "10.* || >= 12.*"
+      },
+      "optionalDependencies": {
+        "@colors/colors": "1.5.0"
       }
     },
-    "node_modules/he": {
-      "version": "1.2.0",
+    "node_modules/cli-truncate": {
+      "version": "2.1.0",
+      "dev": true,
       "license": "MIT",
-      "bin": {
-        "he": "bin/he"
+      "optional": true,
+      "dependencies": {
+        "slice-ansi": "^3.0.0",
+        "string-width": "^4.2.0"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/hermes-estree": {
-      "version": "0.15.0",
-      "resolved": "https://registry.npmjs.org/hermes-estree/-/hermes-estree-0.15.0.tgz",
-      "integrity": "sha512-lLYvAd+6BnOqWdnNbP/Q8xfl8LOGw4wVjfrNd9Gt8eoFzhNBRVD95n4l2ksfMVOoxuVyegs85g83KS9QOsxbVQ=="
-    },
-    "node_modules/hermes-parser": {
-      "version": "0.15.0",
-      "resolved": "https://registry.npmjs.org/hermes-parser/-/hermes-parser-0.15.0.tgz",
-      "integrity": "sha512-Q1uks5rjZlE9RjMMjSUCkGrEIPI5pKJILeCtK1VmTj7U4pf3wVPoo+cxfu+s4cBAPy2JzikIIdCZgBoR6x7U1Q==",
+    "node_modules/clipboard": {
+      "version": "2.0.11",
+      "license": "MIT",
       "dependencies": {
-        "hermes-estree": "0.15.0"
+        "good-listener": "^1.2.2",
+        "select": "^1.1.2",
+        "tiny-emitter": "^2.0.0"
       }
     },
-    "node_modules/hermes-profile-transformer": {
-      "version": "0.0.6",
-      "resolved": "https://registry.npmjs.org/hermes-profile-transformer/-/hermes-profile-transformer-0.0.6.tgz",
-      "integrity": "sha512-cnN7bQUm65UWOy6cbGcCcZ3rpwW8Q/j4OP5aWRhEry4Z2t2aR1cjrbp0BS+KiBN0smvP1caBgAuxutvyvJILzQ==",
+    "node_modules/cliui": {
+      "version": "8.0.1",
+      "license": "ISC",
       "dependencies": {
-        "source-map": "^0.7.3"
+        "string-width": "^4.2.0",
+        "strip-ansi": "^6.0.1",
+        "wrap-ansi": "^7.0.0"
       },
       "engines": {
-        "node": ">=8"
+        "node": ">=12"
       }
     },
-    "node_modules/hermes-profile-transformer/node_modules/source-map": {
-      "version": "0.7.4",
-      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.7.4.tgz",
-      "integrity": "sha512-l3BikUxvPOcn5E74dZiq5BGsTb5yEwhaTSzccU6t4sDOH8NWJCstKO5QT2CvtFoK6F0saL7p9xHAqHOlCPJygA==",
+    "node_modules/clone": {
+      "version": "1.0.4",
+      "license": "MIT",
       "engines": {
-        "node": ">= 8"
+        "node": ">=0.8"
       }
     },
-    "node_modules/hmac-drbg": {
-      "version": "1.0.1",
+    "node_modules/clone-deep": {
+      "version": "4.0.1",
       "license": "MIT",
       "dependencies": {
-        "hash.js": "^1.0.3",
-        "minimalistic-assert": "^1.0.0",
-        "minimalistic-crypto-utils": "^1.0.1"
-      }
-    },
-    "node_modules/hoist-non-react-statics": {
-      "version": "3.3.2",
-      "license": "BSD-3-Clause",
-      "dependencies": {
-        "react-is": "^16.7.0"
+        "is-plain-object": "^2.0.4",
+        "kind-of": "^6.0.2",
+        "shallow-clone": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=6"
       }
     },
-    "node_modules/hosted-git-info": {
-      "version": "4.1.0",
-      "dev": true,
-      "license": "ISC",
+    "node_modules/clone-deep/node_modules/is-plain-object": {
+      "version": "2.0.4",
+      "license": "MIT",
       "dependencies": {
-        "lru-cache": "^6.0.0"
+        "isobject": "^3.0.1"
       },
       "engines": {
-        "node": ">=10"
+        "node": ">=0.10.0"
       }
     },
-    "node_modules/howler": {
-      "version": "2.2.4",
-      "license": "MIT"
-    },
-    "node_modules/hpack.js": {
-      "version": "2.1.6",
+    "node_modules/clone-response": {
+      "version": "1.0.3",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "inherits": "^2.0.1",
-        "obuf": "^1.0.0",
-        "readable-stream": "^2.0.1",
-        "wbuf": "^1.1.0"
+        "mimic-response": "^1.0.0"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/html-entities": {
-      "version": "2.5.2",
-      "resolved": "https://registry.npmjs.org/html-entities/-/html-entities-2.5.2.tgz",
-      "integrity": "sha512-K//PSRMQk4FZ78Kyau+mZurHn3FH0Vwr+H36eE0rPbeYkRRi9YxceYPhuN60UwWorxyKHhqoAJl2OFKa4BVtaA==",
-      "funding": [
-        {
-          "type": "github",
-          "url": "https://github.com/sponsors/mdevils"
-        },
-        {
-          "type": "patreon",
-          "url": "https://patreon.com/mdevils"
-        }
-      ]
-    },
-    "node_modules/html-escaper": {
-      "version": "2.0.2",
-      "license": "MIT"
-    },
-    "node_modules/html-minifier-terser": {
-      "version": "6.1.0",
-      "license": "MIT",
+    "node_modules/cls-hooked": {
+      "version": "4.2.2",
+      "license": "BSD-2-Clause",
+      "peer": true,
       "dependencies": {
-        "camel-case": "^4.1.2",
-        "clean-css": "^5.2.2",
-        "commander": "^8.3.0",
-        "he": "^1.2.0",
-        "param-case": "^3.0.4",
-        "relateurl": "^0.2.7",
-        "terser": "^5.10.0"
+        "async-hook-jl": "^1.7.6",
+        "emitter-listener": "^1.0.1",
+        "semver": "^5.4.1"
       },
+      "engines": {
+        "node": "^4.7 || >=6.9 || >=7.3 || >=8.2.1"
+      }
+    },
+    "node_modules/cls-hooked/node_modules/semver": {
+      "version": "5.7.2",
+      "license": "ISC",
+      "peer": true,
       "bin": {
-        "html-minifier-terser": "cli.js"
-      },
+        "semver": "bin/semver"
+      }
+    },
+    "node_modules/clsx": {
+      "version": "2.0.0",
+      "license": "MIT",
       "engines": {
-        "node": ">=12"
+        "node": ">=6"
       }
     },
-    "node_modules/html-minifier-terser/node_modules/commander": {
-      "version": "8.3.0",
+    "node_modules/cmd-shim": {
+      "version": "6.0.1",
+      "license": "ISC",
+      "engines": {
+        "node": "^14.17.0 || ^16.13.0 || >=18.0.0"
+      }
+    },
+    "node_modules/co": {
+      "version": "4.6.0",
       "license": "MIT",
       "engines": {
-        "node": ">= 12"
+        "iojs": ">= 1.0.0",
+        "node": ">= 0.12.0"
       }
     },
-    "node_modules/html-tags": {
-      "version": "3.2.0",
+    "node_modules/code-point-at": {
+      "version": "1.1.0",
       "license": "MIT",
       "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
+        "node": ">=0.10.0"
       }
     },
-    "node_modules/html-webpack-plugin": {
-      "version": "5.5.3",
+    "node_modules/collect-v8-coverage": {
+      "version": "1.0.1",
+      "license": "MIT"
+    },
+    "node_modules/collection-visit": {
+      "version": "1.0.0",
       "license": "MIT",
+      "optional": true,
       "dependencies": {
-        "@types/html-minifier-terser": "^6.0.0",
-        "html-minifier-terser": "^6.0.2",
-        "lodash": "^4.17.21",
-        "pretty-error": "^4.0.0",
-        "tapable": "^2.0.0"
+        "map-visit": "^1.0.0",
+        "object-visit": "^1.0.0"
       },
       "engines": {
-        "node": ">=10.13.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/html-webpack-plugin"
-      },
-      "peerDependencies": {
-        "webpack": "^5.20.0"
+        "node": ">=0.10.0"
       }
     },
-    "node_modules/html2canvas": {
-      "version": "1.4.1",
+    "node_modules/color": {
+      "version": "4.2.3",
       "license": "MIT",
       "dependencies": {
-        "css-line-break": "^2.1.0",
-        "text-segmentation": "^1.0.3"
+        "color-convert": "^2.0.1",
+        "color-string": "^1.9.0"
       },
       "engines": {
-        "node": ">=8.0.0"
+        "node": ">=12.5.0"
       }
     },
-    "node_modules/htmlparser2": {
-      "version": "7.2.0",
-      "funding": [
-        "https://github.com/fb55/htmlparser2?sponsor=1",
-        {
-          "type": "github",
-          "url": "https://github.com/sponsors/fb55"
-        }
-      ],
+    "node_modules/color-convert": {
+      "version": "1.9.3",
       "license": "MIT",
       "dependencies": {
-        "domelementtype": "^2.0.1",
-        "domhandler": "^4.2.2",
-        "domutils": "^2.8.0",
-        "entities": "^3.0.1"
+        "color-name": "1.1.3"
       }
     },
-    "node_modules/htmlparser2/node_modules/entities": {
-      "version": "3.0.1",
-      "license": "BSD-2-Clause",
-      "engines": {
-        "node": ">=0.12"
-      },
-      "funding": {
-        "url": "https://github.com/fb55/entities?sponsor=1"
-      }
+    "node_modules/color-name": {
+      "version": "1.1.3",
+      "license": "MIT"
     },
-    "node_modules/http-cache-semantics": {
-      "version": "4.1.1",
-      "dev": true,
-      "license": "BSD-2-Clause"
+    "node_modules/color-string": {
+      "version": "1.9.1",
+      "license": "MIT",
+      "dependencies": {
+        "color-name": "^1.0.0",
+        "simple-swizzle": "^0.2.2"
+      }
     },
-    "node_modules/http-deceiver": {
-      "version": "1.2.7",
-      "dev": true,
-      "license": "MIT"
+    "node_modules/color-support": {
+      "version": "1.1.3",
+      "devOptional": true,
+      "license": "ISC",
+      "bin": {
+        "color-support": "bin.js"
+      }
     },
-    "node_modules/http-errors": {
-      "version": "2.0.0",
+    "node_modules/color/node_modules/color-convert": {
+      "version": "2.0.1",
       "license": "MIT",
       "dependencies": {
-        "depd": "2.0.0",
-        "inherits": "2.0.4",
-        "setprototypeof": "1.2.0",
-        "statuses": "2.0.1",
-        "toidentifier": "1.0.1"
+        "color-name": "~1.1.4"
       },
       "engines": {
-        "node": ">= 0.8"
+        "node": ">=7.0.0"
       }
     },
-    "node_modules/http-parser-js": {
-      "version": "0.5.8",
-      "dev": true,
+    "node_modules/color/node_modules/color-name": {
+      "version": "1.1.4",
       "license": "MIT"
     },
-    "node_modules/http-proxy": {
-      "version": "1.18.1",
-      "dev": true,
+    "node_modules/colorette": {
+      "version": "1.4.0",
+      "license": "MIT"
+    },
+    "node_modules/combined-stream": {
+      "version": "1.0.8",
       "license": "MIT",
       "dependencies": {
-        "eventemitter3": "^4.0.0",
-        "follow-redirects": "^1.0.0",
-        "requires-port": "^1.0.0"
+        "delayed-stream": "~1.0.0"
       },
       "engines": {
-        "node": ">=8.0.0"
+        "node": ">= 0.8"
       }
     },
-    "node_modules/http-proxy-agent": {
-      "version": "5.0.0",
+    "node_modules/command-exists": {
+      "version": "1.2.9",
+      "license": "MIT"
+    },
+    "node_modules/commander": {
+      "version": "6.2.1",
+      "dev": true,
       "license": "MIT",
-      "dependencies": {
-        "@tootallnate/once": "2",
-        "agent-base": "6",
-        "debug": "4"
-      },
       "engines": {
         "node": ">= 6"
       }
     },
-    "node_modules/http-proxy-middleware": {
-      "version": "2.0.6",
+    "node_modules/comment-parser": {
+      "version": "1.3.1",
       "dev": true,
       "license": "MIT",
-      "dependencies": {
-        "@types/http-proxy": "^1.17.8",
-        "http-proxy": "^1.18.1",
-        "is-glob": "^4.0.1",
-        "is-plain-obj": "^3.0.0",
-        "micromatch": "^4.0.2"
-      },
       "engines": {
-        "node": ">=12.0.0"
-      },
-      "peerDependencies": {
-        "@types/express": "^4.17.13"
-      },
-      "peerDependenciesMeta": {
-        "@types/express": {
-          "optional": true
-        }
+        "node": ">= 12.0.0"
       }
     },
-    "node_modules/http-proxy-middleware/node_modules/is-plain-obj": {
+    "node_modules/common-path-prefix": {
       "version": "3.0.0",
       "dev": true,
+      "license": "ISC"
+    },
+    "node_modules/commondir": {
+      "version": "1.0.1",
+      "license": "MIT"
+    },
+    "node_modules/compare-version": {
+      "version": "0.1.2",
+      "dev": true,
       "license": "MIT",
       "engines": {
-        "node": ">=10"
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/complex.js": {
+      "version": "2.1.1",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": "*"
       },
+      "funding": {
+        "type": "patreon",
+        "url": "https://www.patreon.com/infusion"
+      }
+    },
+    "node_modules/component-emitter": {
+      "version": "1.3.0",
+      "license": "MIT",
+      "optional": true
+    },
+    "node_modules/component-type": {
+      "version": "1.2.2",
+      "license": "MIT",
       "funding": {
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/http2-wrapper": {
-      "version": "1.0.3",
+    "node_modules/compress-commons": {
+      "version": "4.1.2",
       "dev": true,
       "license": "MIT",
+      "peer": true,
       "dependencies": {
-        "quick-lru": "^5.1.1",
-        "resolve-alpn": "^1.0.0"
+        "buffer-crc32": "^0.2.13",
+        "crc32-stream": "^4.0.2",
+        "normalize-path": "^3.0.0",
+        "readable-stream": "^3.6.0"
       },
       "engines": {
-        "node": ">=10.19.0"
+        "node": ">= 10"
       }
     },
-    "node_modules/https-browserify": {
-      "version": "1.0.0",
-      "license": "MIT"
-    },
-    "node_modules/https-proxy-agent": {
-      "version": "5.0.1",
+    "node_modules/compress-commons/node_modules/readable-stream": {
+      "version": "3.6.2",
+      "dev": true,
       "license": "MIT",
+      "peer": true,
       "dependencies": {
-        "agent-base": "6",
-        "debug": "4"
+        "inherits": "^2.0.3",
+        "string_decoder": "^1.1.1",
+        "util-deprecate": "^1.0.1"
       },
       "engines": {
         "node": ">= 6"
       }
     },
-    "node_modules/human-signals": {
-      "version": "2.1.0",
-      "license": "Apache-2.0",
+    "node_modules/compressible": {
+      "version": "2.0.18",
+      "license": "MIT",
+      "dependencies": {
+        "mime-db": ">= 1.43.0 < 2"
+      },
       "engines": {
-        "node": ">=10.17.0"
+        "node": ">= 0.6"
       }
     },
-    "node_modules/husky": {
-      "version": "1.3.1",
-      "dev": true,
-      "hasInstallScript": true,
+    "node_modules/compression": {
+      "version": "1.7.4",
       "license": "MIT",
       "dependencies": {
-        "cosmiconfig": "^5.0.7",
-        "execa": "^1.0.0",
-        "find-up": "^3.0.0",
-        "get-stdin": "^6.0.0",
-        "is-ci": "^2.0.0",
-        "pkg-dir": "^3.0.0",
-        "please-upgrade-node": "^3.1.1",
-        "read-pkg": "^4.0.1",
-        "run-node": "^1.0.0",
-        "slash": "^2.0.0"
-      },
-      "bin": {
-        "husky-upgrade": "lib/upgrader/bin.js"
+        "accepts": "~1.3.5",
+        "bytes": "3.0.0",
+        "compressible": "~2.0.16",
+        "debug": "2.6.9",
+        "on-headers": "~1.0.2",
+        "safe-buffer": "5.1.2",
+        "vary": "~1.1.2"
       },
       "engines": {
-        "node": ">=6"
+        "node": ">= 0.8.0"
       }
     },
-    "node_modules/husky/node_modules/ci-info": {
+    "node_modules/compression/node_modules/debug": {
+      "version": "2.6.9",
+      "license": "MIT",
+      "dependencies": {
+        "ms": "2.0.0"
+      }
+    },
+    "node_modules/compression/node_modules/ms": {
       "version": "2.0.0",
-      "dev": true,
       "license": "MIT"
     },
-    "node_modules/husky/node_modules/cosmiconfig": {
-      "version": "5.2.1",
+    "node_modules/concat-map": {
+      "version": "0.0.1",
+      "license": "MIT"
+    },
+    "node_modules/concurrently": {
+      "version": "8.2.2",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "import-fresh": "^2.0.0",
-        "is-directory": "^0.3.1",
-        "js-yaml": "^3.13.1",
-        "parse-json": "^4.0.0"
+        "chalk": "^4.1.2",
+        "date-fns": "^2.30.0",
+        "lodash": "^4.17.21",
+        "rxjs": "^7.8.1",
+        "shell-quote": "^1.8.1",
+        "spawn-command": "0.0.2",
+        "supports-color": "^8.1.1",
+        "tree-kill": "^1.2.2",
+        "yargs": "^17.7.2"
+      },
+      "bin": {
+        "conc": "dist/bin/concurrently.js",
+        "concurrently": "dist/bin/concurrently.js"
       },
       "engines": {
-        "node": ">=4"
+        "node": "^14.13.0 || >=16.0.0"
+      },
+      "funding": {
+        "url": "https://github.com/open-cli-tools/concurrently?sponsor=1"
       }
     },
-    "node_modules/husky/node_modules/cross-spawn": {
-      "version": "6.0.5",
+    "node_modules/concurrently/node_modules/ansi-styles": {
+      "version": "4.3.0",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "nice-try": "^1.0.4",
-        "path-key": "^2.0.1",
-        "semver": "^5.5.0",
-        "shebang-command": "^1.2.0",
-        "which": "^1.2.9"
+        "color-convert": "^2.0.1"
       },
       "engines": {
-        "node": ">=4.8"
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
       }
     },
-    "node_modules/husky/node_modules/execa": {
-      "version": "1.0.0",
+    "node_modules/concurrently/node_modules/chalk": {
+      "version": "4.1.2",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "cross-spawn": "^6.0.0",
-        "get-stream": "^4.0.0",
-        "is-stream": "^1.1.0",
-        "npm-run-path": "^2.0.0",
-        "p-finally": "^1.0.0",
-        "signal-exit": "^3.0.0",
-        "strip-eof": "^1.0.0"
+        "ansi-styles": "^4.1.0",
+        "supports-color": "^7.1.0"
       },
       "engines": {
-        "node": ">=6"
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/chalk?sponsor=1"
       }
     },
-    "node_modules/husky/node_modules/find-up": {
-      "version": "3.0.0",
+    "node_modules/concurrently/node_modules/chalk/node_modules/supports-color": {
+      "version": "7.2.0",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "locate-path": "^3.0.0"
+        "has-flag": "^4.0.0"
       },
       "engines": {
-        "node": ">=6"
+        "node": ">=8"
       }
     },
-    "node_modules/husky/node_modules/get-stream": {
-      "version": "4.1.0",
+    "node_modules/concurrently/node_modules/color-convert": {
+      "version": "2.0.1",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "pump": "^3.0.0"
+        "color-name": "~1.1.4"
       },
       "engines": {
-        "node": ">=6"
+        "node": ">=7.0.0"
       }
     },
-    "node_modules/husky/node_modules/import-fresh": {
-      "version": "2.0.0",
+    "node_modules/concurrently/node_modules/color-name": {
+      "version": "1.1.4",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/concurrently/node_modules/has-flag": {
+      "version": "4.0.0",
       "dev": true,
       "license": "MIT",
-      "dependencies": {
-        "caller-path": "^2.0.0",
-        "resolve-from": "^3.0.0"
-      },
       "engines": {
-        "node": ">=4"
+        "node": ">=8"
       }
     },
-    "node_modules/husky/node_modules/is-ci": {
-      "version": "2.0.0",
+    "node_modules/concurrently/node_modules/supports-color": {
+      "version": "8.1.1",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "ci-info": "^2.0.0"
+        "has-flag": "^4.0.0"
       },
-      "bin": {
-        "is-ci": "bin.js"
-      }
-    },
-    "node_modules/husky/node_modules/is-stream": {
-      "version": "1.1.0",
-      "dev": true,
-      "license": "MIT",
       "engines": {
-        "node": ">=0.10.0"
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/supports-color?sponsor=1"
       }
     },
-    "node_modules/husky/node_modules/locate-path": {
-      "version": "3.0.0",
+    "node_modules/config-file-ts": {
+      "version": "0.2.8-rc1",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "p-locate": "^3.0.0",
-        "path-exists": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=6"
+        "glob": "^10.3.12",
+        "typescript": "^5.4.3"
       }
     },
-    "node_modules/husky/node_modules/npm-run-path": {
-      "version": "2.0.2",
+    "node_modules/config-file-ts/node_modules/brace-expansion": {
+      "version": "2.0.1",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "path-key": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=4"
+        "balanced-match": "^1.0.0"
       }
     },
-    "node_modules/husky/node_modules/p-limit": {
-      "version": "2.3.0",
+    "node_modules/config-file-ts/node_modules/glob": {
+      "version": "10.4.5",
       "dev": true,
-      "license": "MIT",
+      "license": "ISC",
       "dependencies": {
-        "p-try": "^2.0.0"
+        "foreground-child": "^3.1.0",
+        "jackspeak": "^3.1.2",
+        "minimatch": "^9.0.4",
+        "minipass": "^7.1.2",
+        "package-json-from-dist": "^1.0.0",
+        "path-scurry": "^1.11.1"
       },
-      "engines": {
-        "node": ">=6"
+      "bin": {
+        "glob": "dist/esm/bin.mjs"
       },
       "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
+        "url": "https://github.com/sponsors/isaacs"
       }
     },
-    "node_modules/husky/node_modules/p-locate": {
-      "version": "3.0.0",
+    "node_modules/config-file-ts/node_modules/jackspeak": {
+      "version": "3.4.3",
       "dev": true,
-      "license": "MIT",
+      "license": "BlueOak-1.0.0",
       "dependencies": {
-        "p-limit": "^2.0.0"
+        "@isaacs/cliui": "^8.0.2"
       },
-      "engines": {
-        "node": ">=6"
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
+      },
+      "optionalDependencies": {
+        "@pkgjs/parseargs": "^0.11.0"
       }
     },
-    "node_modules/husky/node_modules/parse-json": {
-      "version": "4.0.0",
+    "node_modules/config-file-ts/node_modules/minimatch": {
+      "version": "9.0.5",
       "dev": true,
-      "license": "MIT",
+      "license": "ISC",
       "dependencies": {
-        "error-ex": "^1.3.1",
-        "json-parse-better-errors": "^1.0.1"
+        "brace-expansion": "^2.0.1"
       },
       "engines": {
-        "node": ">=4"
+        "node": ">=16 || 14 >=14.17"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
       }
     },
-    "node_modules/husky/node_modules/path-key": {
-      "version": "2.0.1",
+    "node_modules/config-file-ts/node_modules/minipass": {
+      "version": "7.1.2",
       "dev": true,
-      "license": "MIT",
+      "license": "ISC",
       "engines": {
-        "node": ">=4"
+        "node": ">=16 || 14 >=14.17"
       }
     },
-    "node_modules/husky/node_modules/pkg-dir": {
-      "version": "3.0.0",
+    "node_modules/confusing-browser-globals": {
+      "version": "1.0.11",
       "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/connect": {
+      "version": "3.7.0",
       "license": "MIT",
       "dependencies": {
-        "find-up": "^3.0.0"
+        "debug": "2.6.9",
+        "finalhandler": "1.1.2",
+        "parseurl": "~1.3.3",
+        "utils-merge": "1.0.1"
       },
       "engines": {
-        "node": ">=6"
+        "node": ">= 0.10.0"
       }
     },
-    "node_modules/husky/node_modules/resolve-from": {
-      "version": "3.0.0",
+    "node_modules/connect-history-api-fallback": {
+      "version": "2.0.0",
       "dev": true,
       "license": "MIT",
       "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/husky/node_modules/semver": {
-      "version": "5.7.2",
-      "dev": true,
-      "license": "ISC",
-      "bin": {
-        "semver": "bin/semver"
+        "node": ">=0.8"
       }
     },
-    "node_modules/husky/node_modules/shebang-command": {
-      "version": "1.2.0",
-      "dev": true,
+    "node_modules/connect/node_modules/debug": {
+      "version": "2.6.9",
       "license": "MIT",
       "dependencies": {
-        "shebang-regex": "^1.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
+        "ms": "2.0.0"
       }
     },
-    "node_modules/husky/node_modules/shebang-regex": {
-      "version": "1.0.0",
-      "dev": true,
+    "node_modules/connect/node_modules/finalhandler": {
+      "version": "1.1.2",
       "license": "MIT",
+      "dependencies": {
+        "debug": "2.6.9",
+        "encodeurl": "~1.0.2",
+        "escape-html": "~1.0.3",
+        "on-finished": "~2.3.0",
+        "parseurl": "~1.3.3",
+        "statuses": "~1.5.0",
+        "unpipe": "~1.0.0"
+      },
       "engines": {
-        "node": ">=0.10.0"
+        "node": ">= 0.8"
       }
     },
-    "node_modules/husky/node_modules/slash": {
+    "node_modules/connect/node_modules/ms": {
       "version": "2.0.0",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=6"
-      }
+      "license": "MIT"
     },
-    "node_modules/husky/node_modules/which": {
-      "version": "1.3.1",
-      "dev": true,
-      "license": "ISC",
+    "node_modules/connect/node_modules/on-finished": {
+      "version": "2.3.0",
+      "license": "MIT",
       "dependencies": {
-        "isexe": "^2.0.0"
+        "ee-first": "1.1.1"
       },
-      "bin": {
-        "which": "bin/which"
+      "engines": {
+        "node": ">= 0.8"
       }
     },
-    "node_modules/hyperdyperid": {
-      "version": "1.2.0",
-      "dev": true,
+    "node_modules/connect/node_modules/statuses": {
+      "version": "1.5.0",
       "license": "MIT",
       "engines": {
-        "node": ">=10.18"
+        "node": ">= 0.6"
       }
     },
-    "node_modules/hyphenate-style-name": {
-      "version": "1.0.4",
-      "license": "BSD-3-Clause"
-    },
-    "node_modules/iconv-corefoundation": {
-      "version": "1.1.7",
+    "node_modules/consola": {
+      "version": "3.2.3",
       "dev": true,
       "license": "MIT",
-      "optional": true,
-      "os": [
-        "darwin"
-      ],
-      "dependencies": {
-        "cli-truncate": "^2.1.0",
-        "node-addon-api": "^1.6.3"
-      },
       "engines": {
-        "node": "^8.11.2 || >=10"
+        "node": "^14.18.0 || >=16.10.0"
       }
     },
-    "node_modules/iconv-lite": {
-      "version": "0.6.3",
+    "node_modules/console-browserify": {
+      "version": "1.2.0"
+    },
+    "node_modules/console-control-strings": {
+      "version": "1.1.0",
+      "devOptional": true,
+      "license": "ISC"
+    },
+    "node_modules/constants-browserify": {
+      "version": "1.0.0",
+      "license": "MIT"
+    },
+    "node_modules/content-disposition": {
+      "version": "0.5.4",
       "license": "MIT",
       "dependencies": {
-        "safer-buffer": ">= 2.1.2 < 3.0.0"
+        "safe-buffer": "5.2.1"
       },
       "engines": {
-        "node": ">=0.10.0"
+        "node": ">= 0.6"
       }
     },
-    "node_modules/idb-keyval": {
-      "version": "6.2.1",
-      "license": "Apache-2.0"
-    },
-    "node_modules/ieee754": {
-      "version": "1.2.1",
+    "node_modules/content-disposition/node_modules/safe-buffer": {
+      "version": "5.2.1",
       "funding": [
         {
           "type": "github",
@@ -22845,618 +22854,624 @@
           "url": "https://feross.org/support"
         }
       ],
-      "license": "BSD-3-Clause"
+      "license": "MIT"
     },
-    "node_modules/ignore": {
-      "version": "5.2.4",
+    "node_modules/content-type": {
+      "version": "1.0.5",
       "license": "MIT",
       "engines": {
-        "node": ">= 4"
+        "node": ">= 0.6"
       }
     },
-    "node_modules/image-size": {
-      "version": "1.1.1",
-      "license": "MIT",
+    "node_modules/continuation-local-storage": {
+      "version": "3.2.1",
+      "license": "BSD-2-Clause",
+      "peer": true,
       "dependencies": {
-        "queue": "6.0.2"
-      },
-      "bin": {
-        "image-size": "bin/image-size.js"
-      },
-      "engines": {
-        "node": ">=16.x"
+        "async-listener": "^0.6.0",
+        "emitter-listener": "^1.1.1"
       }
     },
-    "node_modules/immediate": {
-      "version": "3.0.6",
-      "resolved": "https://registry.npmjs.org/immediate/-/immediate-3.0.6.tgz",
-      "integrity": "sha512-XXOFtyqDjNDAQxVfYxuF7g9Il/IbWmmlQg2MYKOH8ExIT1qg6xc4zyS3HaEEATgs1btfzxq15ciUiY7gjSXRGQ=="
+    "node_modules/convert-source-map": {
+      "version": "2.0.0",
+      "license": "MIT"
     },
-    "node_modules/import-fresh": {
-      "version": "3.3.0",
-      "dev": true,
+    "node_modules/cookie": {
+      "version": "0.5.0",
       "license": "MIT",
-      "dependencies": {
-        "parent-module": "^1.0.0",
-        "resolve-from": "^4.0.0"
-      },
       "engines": {
-        "node": ">=6"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
+        "node": ">= 0.6"
       }
     },
-    "node_modules/import-fresh/node_modules/resolve-from": {
-      "version": "4.0.0",
-      "dev": true,
+    "node_modules/cookie-signature": {
+      "version": "1.0.6",
+      "license": "MIT"
+    },
+    "node_modules/copy-descriptor": {
+      "version": "0.1.1",
       "license": "MIT",
+      "optional": true,
       "engines": {
-        "node": ">=4"
+        "node": ">=0.10.0"
       }
     },
-    "node_modules/import-local": {
-      "version": "3.1.0",
+    "node_modules/copy-webpack-plugin": {
+      "version": "10.2.4",
+      "dev": true,
       "license": "MIT",
       "dependencies": {
-        "pkg-dir": "^4.2.0",
-        "resolve-cwd": "^3.0.0"
-      },
-      "bin": {
-        "import-local-fixture": "fixtures/cli.js"
+        "fast-glob": "^3.2.7",
+        "glob-parent": "^6.0.1",
+        "globby": "^12.0.2",
+        "normalize-path": "^3.0.0",
+        "schema-utils": "^4.0.0",
+        "serialize-javascript": "^6.0.0"
       },
       "engines": {
-        "node": ">=8"
+        "node": ">= 12.20.0"
       },
       "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/import-local/node_modules/find-up": {
-      "version": "4.1.0",
-      "license": "MIT",
-      "dependencies": {
-        "locate-path": "^5.0.0",
-        "path-exists": "^4.0.0"
+        "type": "opencollective",
+        "url": "https://opencollective.com/webpack"
       },
-      "engines": {
-        "node": ">=8"
+      "peerDependencies": {
+        "webpack": "^5.1.0"
       }
     },
-    "node_modules/import-local/node_modules/locate-path": {
-      "version": "5.0.0",
+    "node_modules/copy-webpack-plugin/node_modules/ajv-keywords": {
+      "version": "5.1.0",
+      "dev": true,
       "license": "MIT",
       "dependencies": {
-        "p-locate": "^4.1.0"
+        "fast-deep-equal": "^3.1.3"
       },
-      "engines": {
-        "node": ">=8"
+      "peerDependencies": {
+        "ajv": "^8.8.2"
       }
     },
-    "node_modules/import-local/node_modules/p-limit": {
-      "version": "2.3.0",
+    "node_modules/copy-webpack-plugin/node_modules/array-union": {
+      "version": "3.0.1",
+      "dev": true,
       "license": "MIT",
-      "dependencies": {
-        "p-try": "^2.0.0"
-      },
       "engines": {
-        "node": ">=6"
+        "node": ">=12"
       },
       "funding": {
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/import-local/node_modules/p-locate": {
-      "version": "4.1.0",
-      "license": "MIT",
+    "node_modules/copy-webpack-plugin/node_modules/glob-parent": {
+      "version": "6.0.2",
+      "dev": true,
+      "license": "ISC",
       "dependencies": {
-        "p-limit": "^2.2.0"
+        "is-glob": "^4.0.3"
       },
       "engines": {
-        "node": ">=8"
+        "node": ">=10.13.0"
       }
     },
-    "node_modules/import-local/node_modules/path-exists": {
-      "version": "4.0.0",
+    "node_modules/copy-webpack-plugin/node_modules/globby": {
+      "version": "12.2.0",
+      "dev": true,
       "license": "MIT",
+      "dependencies": {
+        "array-union": "^3.0.1",
+        "dir-glob": "^3.0.1",
+        "fast-glob": "^3.2.7",
+        "ignore": "^5.1.9",
+        "merge2": "^1.4.1",
+        "slash": "^4.0.0"
+      },
       "engines": {
-        "node": ">=8"
+        "node": "^12.20.0 || ^14.13.1 || >=16.0.0"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/import-local/node_modules/pkg-dir": {
+    "node_modules/copy-webpack-plugin/node_modules/schema-utils": {
       "version": "4.2.0",
+      "dev": true,
       "license": "MIT",
       "dependencies": {
-        "find-up": "^4.0.0"
+        "@types/json-schema": "^7.0.9",
+        "ajv": "^8.9.0",
+        "ajv-formats": "^2.1.1",
+        "ajv-keywords": "^5.1.0"
       },
       "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/imurmurhash": {
-      "version": "0.1.4",
-      "license": "MIT",
-      "engines": {
-        "node": ">=0.8.19"
+        "node": ">= 12.13.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/webpack"
       }
     },
-    "node_modules/indent-string": {
+    "node_modules/copy-webpack-plugin/node_modules/slash": {
       "version": "4.0.0",
+      "dev": true,
       "license": "MIT",
       "engines": {
-        "node": ">=8"
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/infer-owner": {
-      "version": "1.0.4",
-      "license": "ISC"
-    },
-    "node_modules/inflight": {
-      "version": "1.0.6",
-      "license": "ISC",
-      "dependencies": {
-        "once": "^1.3.0",
-        "wrappy": "1"
+    "node_modules/core-js": {
+      "version": "3.32.1",
+      "hasInstallScript": true,
+      "license": "MIT",
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/core-js"
       }
     },
-    "node_modules/inherits": {
-      "version": "2.0.4",
-      "license": "ISC"
-    },
-    "node_modules/ini": {
-      "version": "1.3.8",
-      "license": "ISC"
-    },
-    "node_modules/inline-style-prefixer": {
-      "version": "6.0.1",
+    "node_modules/core-js-compat": {
+      "version": "3.36.1",
       "license": "MIT",
       "dependencies": {
-        "css-in-js-utils": "^2.0.0"
+        "browserslist": "^4.23.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/core-js"
       }
     },
-    "node_modules/internal-ip": {
-      "version": "4.3.0",
+    "node_modules/core-util-is": {
+      "version": "1.0.2",
+      "license": "MIT"
+    },
+    "node_modules/corser": {
+      "version": "2.0.1",
+      "dev": true,
       "license": "MIT",
-      "dependencies": {
-        "default-gateway": "^4.2.0",
-        "ipaddr.js": "^1.9.0"
-      },
       "engines": {
-        "node": ">=6"
+        "node": ">= 0.4.0"
       }
     },
-    "node_modules/internal-ip/node_modules/cross-spawn": {
-      "version": "6.0.5",
+    "node_modules/cosmiconfig": {
+      "version": "7.1.0",
+      "dev": true,
       "license": "MIT",
       "dependencies": {
-        "nice-try": "^1.0.4",
-        "path-key": "^2.0.1",
-        "semver": "^5.5.0",
-        "shebang-command": "^1.2.0",
-        "which": "^1.2.9"
+        "@types/parse-json": "^4.0.0",
+        "import-fresh": "^3.2.1",
+        "parse-json": "^5.0.0",
+        "path-type": "^4.0.0",
+        "yaml": "^1.10.0"
       },
       "engines": {
-        "node": ">=4.8"
+        "node": ">=10"
       }
     },
-    "node_modules/internal-ip/node_modules/default-gateway": {
-      "version": "4.2.0",
-      "license": "BSD-2-Clause",
-      "dependencies": {
-        "execa": "^1.0.0",
-        "ip-regex": "^2.1.0"
-      },
+    "node_modules/cosmiconfig/node_modules/yaml": {
+      "version": "1.10.2",
+      "dev": true,
+      "license": "ISC",
       "engines": {
-        "node": ">=6"
+        "node": ">= 6"
       }
     },
-    "node_modules/internal-ip/node_modules/execa": {
-      "version": "1.0.0",
+    "node_modules/crc": {
+      "version": "3.8.0",
+      "dev": true,
       "license": "MIT",
+      "optional": true,
       "dependencies": {
-        "cross-spawn": "^6.0.0",
-        "get-stream": "^4.0.0",
-        "is-stream": "^1.1.0",
-        "npm-run-path": "^2.0.0",
-        "p-finally": "^1.0.0",
-        "signal-exit": "^3.0.0",
-        "strip-eof": "^1.0.0"
-      },
-      "engines": {
-        "node": ">=6"
+        "buffer": "^5.1.0"
       }
     },
-    "node_modules/internal-ip/node_modules/get-stream": {
-      "version": "4.1.0",
-      "license": "MIT",
-      "dependencies": {
-        "pump": "^3.0.0"
+    "node_modules/crc-32": {
+      "version": "1.2.2",
+      "dev": true,
+      "license": "Apache-2.0",
+      "peer": true,
+      "bin": {
+        "crc32": "bin/crc32.njs"
       },
       "engines": {
-        "node": ">=6"
+        "node": ">=0.8"
       }
     },
-    "node_modules/internal-ip/node_modules/is-stream": {
-      "version": "1.1.0",
+    "node_modules/crc32-stream": {
+      "version": "4.0.3",
+      "dev": true,
       "license": "MIT",
+      "peer": true,
+      "dependencies": {
+        "crc-32": "^1.2.0",
+        "readable-stream": "^3.4.0"
+      },
       "engines": {
-        "node": ">=0.10.0"
+        "node": ">= 10"
       }
     },
-    "node_modules/internal-ip/node_modules/npm-run-path": {
-      "version": "2.0.2",
+    "node_modules/crc32-stream/node_modules/readable-stream": {
+      "version": "3.6.2",
+      "dev": true,
       "license": "MIT",
+      "peer": true,
       "dependencies": {
-        "path-key": "^2.0.0"
+        "inherits": "^2.0.3",
+        "string_decoder": "^1.1.1",
+        "util-deprecate": "^1.0.1"
       },
       "engines": {
-        "node": ">=4"
+        "node": ">= 6"
       }
     },
-    "node_modules/internal-ip/node_modules/path-key": {
-      "version": "2.0.1",
+    "node_modules/create-ecdh": {
+      "version": "4.0.4",
       "license": "MIT",
-      "engines": {
-        "node": ">=4"
+      "dependencies": {
+        "bn.js": "^4.1.0",
+        "elliptic": "^6.5.3"
       }
     },
-    "node_modules/internal-ip/node_modules/semver": {
-      "version": "5.7.2",
-      "license": "ISC",
-      "bin": {
-        "semver": "bin/semver"
-      }
+    "node_modules/create-ecdh/node_modules/bn.js": {
+      "version": "4.12.0",
+      "license": "MIT"
     },
-    "node_modules/internal-ip/node_modules/shebang-command": {
+    "node_modules/create-hash": {
       "version": "1.2.0",
       "license": "MIT",
       "dependencies": {
-        "shebang-regex": "^1.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
+        "cipher-base": "^1.0.1",
+        "inherits": "^2.0.1",
+        "md5.js": "^1.3.4",
+        "ripemd160": "^2.0.1",
+        "sha.js": "^2.4.0"
       }
     },
-    "node_modules/internal-ip/node_modules/shebang-regex": {
-      "version": "1.0.0",
+    "node_modules/create-hmac": {
+      "version": "1.1.7",
       "license": "MIT",
-      "engines": {
-        "node": ">=0.10.0"
+      "dependencies": {
+        "cipher-base": "^1.0.3",
+        "create-hash": "^1.1.0",
+        "inherits": "^2.0.1",
+        "ripemd160": "^2.0.0",
+        "safe-buffer": "^5.0.1",
+        "sha.js": "^2.4.8"
       }
     },
-    "node_modules/internal-ip/node_modules/which": {
-      "version": "1.3.1",
-      "license": "ISC",
+    "node_modules/create-require": {
+      "version": "1.1.1",
+      "devOptional": true,
+      "license": "MIT"
+    },
+    "node_modules/cross-fetch": {
+      "version": "3.1.5",
+      "license": "MIT",
       "dependencies": {
-        "isexe": "^2.0.0"
-      },
-      "bin": {
-        "which": "bin/which"
+        "node-fetch": "2.6.7"
       }
     },
-    "node_modules/internal-slot": {
-      "version": "1.0.5",
-      "dev": true,
+    "node_modules/cross-spawn": {
+      "version": "7.0.3",
       "license": "MIT",
       "dependencies": {
-        "get-intrinsic": "^1.2.0",
-        "has": "^1.0.3",
-        "side-channel": "^1.0.4"
+        "path-key": "^3.1.0",
+        "shebang-command": "^2.0.0",
+        "which": "^2.0.1"
       },
       "engines": {
-        "node": ">= 0.4"
+        "node": ">= 8"
       }
     },
-    "node_modules/interpret": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/interpret/-/interpret-3.1.1.tgz",
-      "integrity": "sha512-6xwYfHbajpoF0xLW+iwLkhwgvLoZDfjYfoFNu8ftMoXINzwuymNLd9u/KmwtdT2GbR+/Cz66otEGEVVUHX9QLQ==",
-      "dev": true,
+    "node_modules/crypt": {
+      "version": "0.0.2",
+      "license": "BSD-3-Clause",
       "engines": {
-        "node": ">=10.13.0"
+        "node": "*"
       }
     },
-    "node_modules/invariant": {
-      "version": "2.2.4",
+    "node_modules/crypto-browserify": {
+      "version": "3.12.0",
       "license": "MIT",
       "dependencies": {
-        "loose-envify": "^1.0.0"
-      }
-    },
-    "node_modules/invert-kv": {
-      "version": "1.0.0",
-      "license": "MIT",
+        "browserify-cipher": "^1.0.0",
+        "browserify-sign": "^4.0.0",
+        "create-ecdh": "^4.0.0",
+        "create-hash": "^1.1.0",
+        "create-hmac": "^1.1.0",
+        "diffie-hellman": "^5.0.0",
+        "inherits": "^2.0.1",
+        "pbkdf2": "^3.0.3",
+        "public-encrypt": "^4.0.0",
+        "randombytes": "^2.0.0",
+        "randomfill": "^1.0.3"
+      },
       "engines": {
-        "node": ">=0.10.0"
+        "node": "*"
       }
     },
-    "node_modules/ip": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/ip/-/ip-2.0.1.tgz",
-      "integrity": "sha512-lJUL9imLTNi1ZfXT+DU6rBBdbiKGBuay9B6xGSPVjUeQwaH1RIGqef8RZkUtHioLmSNpPR5M4HVKJGm1j8FWVQ=="
+    "node_modules/crypto-js": {
+      "version": "4.2.0",
+      "license": "MIT"
     },
-    "node_modules/ip-regex": {
-      "version": "2.1.0",
+    "node_modules/crypto-random-string": {
+      "version": "2.0.0",
       "license": "MIT",
       "engines": {
-        "node": ">=4"
+        "node": ">=8"
       }
     },
-    "node_modules/ipaddr.js": {
-      "version": "1.9.1",
+    "node_modules/css-box-model": {
+      "version": "1.2.1",
       "license": "MIT",
-      "engines": {
-        "node": ">= 0.10"
+      "dependencies": {
+        "tiny-invariant": "^1.0.6"
       }
     },
-    "node_modules/is-absolute-url": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/is-absolute-url/-/is-absolute-url-4.0.1.tgz",
-      "integrity": "sha512-/51/TKE88Lmm7Gc4/8btclNXWS+g50wXhYJq8HWIBAGUBnoAdRu1aXeh364t/O7wXDAcTJDP8PNuNKWUDWie+A==",
+    "node_modules/css-color-keywords": {
+      "version": "1.0.0",
+      "license": "ISC",
       "engines": {
-        "node": "^12.20.0 || ^14.13.1 || >=16.0.0"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
+        "node": ">=4"
       }
     },
-    "node_modules/is-accessor-descriptor": {
-      "version": "1.0.0",
+    "node_modules/css-in-js-utils": {
+      "version": "2.0.1",
       "license": "MIT",
-      "optional": true,
       "dependencies": {
-        "kind-of": "^6.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
+        "hyphenate-style-name": "^1.0.2",
+        "isobject": "^3.0.1"
       }
     },
-    "node_modules/is-arguments": {
-      "version": "1.1.1",
+    "node_modules/css-line-break": {
+      "version": "2.1.0",
       "license": "MIT",
       "dependencies": {
-        "call-bind": "^1.0.2",
-        "has-tostringtag": "^1.0.0"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
+        "utrie": "^1.0.2"
       }
     },
-    "node_modules/is-array-buffer": {
-      "version": "3.0.2",
+    "node_modules/css-loader": {
+      "version": "6.8.1",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "call-bind": "^1.0.2",
-        "get-intrinsic": "^1.2.0",
-        "is-typed-array": "^1.1.10"
+        "icss-utils": "^5.1.0",
+        "postcss": "^8.4.21",
+        "postcss-modules-extract-imports": "^3.0.0",
+        "postcss-modules-local-by-default": "^4.0.3",
+        "postcss-modules-scope": "^3.0.0",
+        "postcss-modules-values": "^4.0.0",
+        "postcss-value-parser": "^4.2.0",
+        "semver": "^7.3.8"
+      },
+      "engines": {
+        "node": ">= 12.13.0"
       },
       "funding": {
-        "url": "https://github.com/sponsors/ljharb"
+        "type": "opencollective",
+        "url": "https://opencollective.com/webpack"
+      },
+      "peerDependencies": {
+        "webpack": "^5.0.0"
       }
     },
-    "node_modules/is-arrayish": {
-      "version": "0.2.1",
-      "license": "MIT"
-    },
-    "node_modules/is-async-function": {
-      "version": "2.0.0",
+    "node_modules/css-loader/node_modules/icss-utils": {
+      "version": "5.1.0",
       "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "has-tostringtag": "^1.0.0"
-      },
+      "license": "ISC",
       "engines": {
-        "node": ">= 0.4"
+        "node": "^10 || ^12 || >= 14"
       },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
+      "peerDependencies": {
+        "postcss": "^8.1.0"
       }
     },
-    "node_modules/is-bigint": {
-      "version": "1.0.4",
+    "node_modules/css-loader/node_modules/postcss-modules-extract-imports": {
+      "version": "3.0.0",
       "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "has-bigints": "^1.0.1"
+      "license": "ISC",
+      "engines": {
+        "node": "^10 || ^12 || >= 14"
       },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
+      "peerDependencies": {
+        "postcss": "^8.1.0"
       }
     },
-    "node_modules/is-binary-path": {
-      "version": "2.1.0",
+    "node_modules/css-loader/node_modules/postcss-modules-local-by-default": {
+      "version": "4.0.3",
+      "dev": true,
       "license": "MIT",
       "dependencies": {
-        "binary-extensions": "^2.0.0"
+        "icss-utils": "^5.0.0",
+        "postcss-selector-parser": "^6.0.2",
+        "postcss-value-parser": "^4.1.0"
       },
       "engines": {
-        "node": ">=8"
+        "node": "^10 || ^12 || >= 14"
+      },
+      "peerDependencies": {
+        "postcss": "^8.1.0"
       }
     },
-    "node_modules/is-boolean-object": {
-      "version": "1.1.2",
+    "node_modules/css-loader/node_modules/postcss-modules-scope": {
+      "version": "3.0.0",
       "dev": true,
-      "license": "MIT",
+      "license": "ISC",
       "dependencies": {
-        "call-bind": "^1.0.2",
-        "has-tostringtag": "^1.0.0"
+        "postcss-selector-parser": "^6.0.4"
       },
       "engines": {
-        "node": ">= 0.4"
+        "node": "^10 || ^12 || >= 14"
       },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
+      "peerDependencies": {
+        "postcss": "^8.1.0"
       }
     },
-    "node_modules/is-builtin-module": {
-      "version": "3.2.1",
+    "node_modules/css-loader/node_modules/postcss-modules-values": {
+      "version": "4.0.0",
       "dev": true,
-      "license": "MIT",
+      "license": "ISC",
       "dependencies": {
-        "builtin-modules": "^3.3.0"
+        "icss-utils": "^5.0.0"
       },
       "engines": {
-        "node": ">=6"
+        "node": "^10 || ^12 || >= 14"
       },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
+      "peerDependencies": {
+        "postcss": "^8.1.0"
       }
     },
-    "node_modules/is-callable": {
-      "version": "1.2.7",
-      "license": "MIT",
-      "engines": {
-        "node": ">= 0.4"
+    "node_modules/css-select": {
+      "version": "5.1.0",
+      "license": "BSD-2-Clause",
+      "dependencies": {
+        "boolbase": "^1.0.0",
+        "css-what": "^6.1.0",
+        "domhandler": "^5.0.2",
+        "domutils": "^3.0.1",
+        "nth-check": "^2.0.1"
       },
       "funding": {
-        "url": "https://github.com/sponsors/ljharb"
+        "url": "https://github.com/sponsors/fb55"
       }
     },
-    "node_modules/is-ci": {
-      "version": "3.0.1",
-      "dev": true,
+    "node_modules/css-select/node_modules/dom-serializer": {
+      "version": "2.0.0",
       "license": "MIT",
       "dependencies": {
-        "ci-info": "^3.2.0"
+        "domelementtype": "^2.3.0",
+        "domhandler": "^5.0.2",
+        "entities": "^4.2.0"
       },
-      "bin": {
-        "is-ci": "bin.js"
+      "funding": {
+        "url": "https://github.com/cheeriojs/dom-serializer?sponsor=1"
       }
     },
-    "node_modules/is-core-module": {
-      "version": "2.13.1",
-      "license": "MIT",
+    "node_modules/css-select/node_modules/domhandler": {
+      "version": "5.0.3",
+      "license": "BSD-2-Clause",
       "dependencies": {
-        "hasown": "^2.0.0"
+        "domelementtype": "^2.3.0"
+      },
+      "engines": {
+        "node": ">= 4"
       },
       "funding": {
-        "url": "https://github.com/sponsors/ljharb"
+        "url": "https://github.com/fb55/domhandler?sponsor=1"
       }
     },
-    "node_modules/is-data-descriptor": {
-      "version": "1.0.0",
-      "license": "MIT",
-      "optional": true,
+    "node_modules/css-select/node_modules/domutils": {
+      "version": "3.1.0",
+      "license": "BSD-2-Clause",
       "dependencies": {
-        "kind-of": "^6.0.0"
+        "dom-serializer": "^2.0.0",
+        "domelementtype": "^2.3.0",
+        "domhandler": "^5.0.3"
       },
-      "engines": {
-        "node": ">=0.10.0"
+      "funding": {
+        "url": "https://github.com/fb55/domutils?sponsor=1"
       }
     },
-    "node_modules/is-date-object": {
-      "version": "1.0.5",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "has-tostringtag": "^1.0.0"
-      },
+    "node_modules/css-select/node_modules/entities": {
+      "version": "4.5.0",
+      "license": "BSD-2-Clause",
       "engines": {
-        "node": ">= 0.4"
+        "node": ">=0.12"
       },
       "funding": {
-        "url": "https://github.com/sponsors/ljharb"
+        "url": "https://github.com/fb55/entities?sponsor=1"
       }
     },
-    "node_modules/is-deflate": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/is-deflate/-/is-deflate-1.0.0.tgz",
-      "integrity": "sha512-YDoFpuZWu1VRXlsnlYMzKyVRITXj7Ej/V9gXQ2/pAe7X1J7M/RNOqaIYi6qUn+B7nGyB9pDXrv02dsB58d2ZAQ=="
+    "node_modules/css-to-react-native": {
+      "version": "3.0.0",
+      "license": "MIT",
+      "dependencies": {
+        "camelize": "^1.0.0",
+        "css-color-keywords": "^1.0.0",
+        "postcss-value-parser": "^4.0.2"
+      }
     },
-    "node_modules/is-descriptor": {
-      "version": "1.0.2",
+    "node_modules/css-tree": {
+      "version": "1.1.3",
       "license": "MIT",
-      "optional": true,
       "dependencies": {
-        "is-accessor-descriptor": "^1.0.0",
-        "is-data-descriptor": "^1.0.0",
-        "kind-of": "^6.0.2"
+        "mdn-data": "2.0.14",
+        "source-map": "^0.6.1"
       },
       "engines": {
-        "node": ">=0.10.0"
+        "node": ">=8.0.0"
       }
     },
-    "node_modules/is-directory": {
-      "version": "0.3.1",
-      "license": "MIT",
+    "node_modules/css-tree/node_modules/source-map": {
+      "version": "0.6.1",
+      "license": "BSD-3-Clause",
       "engines": {
         "node": ">=0.10.0"
       }
     },
-    "node_modules/is-docker": {
-      "version": "2.2.1",
-      "license": "MIT",
-      "bin": {
-        "is-docker": "cli.js"
-      },
+    "node_modules/css-what": {
+      "version": "6.1.0",
+      "license": "BSD-2-Clause",
       "engines": {
-        "node": ">=8"
+        "node": ">= 6"
       },
       "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
+        "url": "https://github.com/sponsors/fb55"
       }
     },
-    "node_modules/is-extendable": {
-      "version": "1.0.1",
+    "node_modules/csscolorparser": {
+      "version": "1.0.3",
+      "license": "MIT"
+    },
+    "node_modules/cssesc": {
+      "version": "3.0.0",
+      "dev": true,
       "license": "MIT",
-      "dependencies": {
-        "is-plain-object": "^2.0.4"
+      "bin": {
+        "cssesc": "bin/cssesc"
       },
       "engines": {
-        "node": ">=0.10.0"
+        "node": ">=4"
       }
     },
-    "node_modules/is-extendable/node_modules/is-plain-object": {
-      "version": "2.0.4",
+    "node_modules/csso": {
+      "version": "4.2.0",
+      "dev": true,
       "license": "MIT",
       "dependencies": {
-        "isobject": "^3.0.1"
+        "css-tree": "^1.1.2"
       },
       "engines": {
-        "node": ">=0.10.0"
+        "node": ">=8.0.0"
       }
     },
-    "node_modules/is-extglob": {
-      "version": "2.1.1",
-      "license": "MIT",
-      "engines": {
-        "node": ">=0.10.0"
-      }
+    "node_modules/cssom": {
+      "version": "0.5.0",
+      "license": "MIT"
     },
-    "node_modules/is-finalizationregistry": {
-      "version": "1.0.2",
+    "node_modules/csstype": {
+      "version": "3.1.1",
+      "license": "MIT"
+    },
+    "node_modules/csv-parse": {
+      "version": "5.5.5",
       "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "call-bind": "^1.0.2"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
+      "license": "MIT"
     },
-    "node_modules/is-fullwidth-code-point": {
-      "version": "3.0.0",
-      "license": "MIT",
-      "engines": {
-        "node": ">=8"
-      }
+    "node_modules/dag-map": {
+      "version": "1.0.2",
+      "license": "MIT"
     },
-    "node_modules/is-generator-fn": {
-      "version": "2.1.0",
-      "license": "MIT",
-      "engines": {
-        "node": ">=6"
-      }
+    "node_modules/damerau-levenshtein": {
+      "version": "1.0.8",
+      "dev": true,
+      "license": "BSD-2-Clause"
     },
-    "node_modules/is-generator-function": {
-      "version": "1.0.10",
+    "node_modules/data-view-buffer": {
+      "version": "1.0.1",
       "license": "MIT",
       "dependencies": {
-        "has-tostringtag": "^1.0.0"
+        "call-bind": "^1.0.6",
+        "es-errors": "^1.3.0",
+        "is-data-view": "^1.0.1"
       },
       "engines": {
         "node": ">= 0.4"
@@ -23465,263 +23480,249 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/is-glob": {
-      "version": "4.0.3",
+    "node_modules/data-view-byte-length": {
+      "version": "1.0.1",
       "license": "MIT",
       "dependencies": {
-        "is-extglob": "^2.1.1"
+        "call-bind": "^1.0.7",
+        "es-errors": "^1.3.0",
+        "is-data-view": "^1.0.1"
       },
       "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/is-gzip": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/is-gzip/-/is-gzip-1.0.0.tgz",
-      "integrity": "sha512-rcfALRIb1YewtnksfRIHGcIY93QnK8BIQ/2c9yDYcG/Y6+vRoJuTWBmmSEbyLLYtXm7q35pHOHbZFQBaLrhlWQ==",
-      "engines": {
-        "node": ">=0.10.0"
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/is-inside-container": {
+    "node_modules/data-view-byte-offset": {
       "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/is-inside-container/-/is-inside-container-1.0.0.tgz",
-      "integrity": "sha512-KIYLCCJghfHZxqjYBE7rEy0OBuTd5xCHS7tHVgvCLkx7StIoaxwNW3hCALgEUjFfeRk+MG/Qxmp/vtETEF3tRA==",
-      "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "is-docker": "^3.0.0"
-      },
-      "bin": {
-        "is-inside-container": "cli.js"
+        "call-bind": "^1.0.6",
+        "es-errors": "^1.3.0",
+        "is-data-view": "^1.0.1"
       },
       "engines": {
-        "node": ">=14.16"
+        "node": ">= 0.4"
       },
       "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
+        "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/is-inside-container/node_modules/is-docker": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/is-docker/-/is-docker-3.0.0.tgz",
-      "integrity": "sha512-eljcgEDlEns/7AXFosB5K/2nCM4P7FQPkGc/DWLy5rmFEWvZayGrik1d9/QIY5nJ4f9YsVvBkA6kJpHn9rISdQ==",
-      "dev": true,
-      "bin": {
-        "is-docker": "cli.js"
+    "node_modules/date-fns": {
+      "version": "2.30.0",
+      "license": "MIT",
+      "dependencies": {
+        "@babel/runtime": "^7.21.0"
       },
       "engines": {
-        "node": "^12.20.0 || ^14.13.1 || >=16.0.0"
+        "node": ">=0.11"
       },
       "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
+        "type": "opencollective",
+        "url": "https://opencollective.com/date-fns"
       }
     },
-    "node_modules/is-interactive": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/is-interactive/-/is-interactive-1.0.0.tgz",
-      "integrity": "sha512-2HvIEKRoqS62guEC+qBjpvRubdX910WCMuJTZ+I9yvqKU2/12eSL549HMwtabb4oupdj2sMP50k+XJfB/8JE6w==",
-      "engines": {
-        "node": ">=8"
+    "node_modules/date-fns-tz": {
+      "version": "2.0.0",
+      "license": "MIT",
+      "peerDependencies": {
+        "date-fns": ">=2.0.0"
       }
     },
-    "node_modules/is-invalid-path": {
-      "version": "0.1.0",
+    "node_modules/dayjs": {
+      "version": "1.11.11",
+      "license": "MIT"
+    },
+    "node_modules/debounce": {
+      "version": "1.2.1",
+      "license": "MIT"
+    },
+    "node_modules/debug": {
+      "version": "4.3.4",
       "license": "MIT",
       "dependencies": {
-        "is-glob": "^2.0.0"
+        "ms": "2.1.2"
       },
       "engines": {
-        "node": ">=0.10.0"
+        "node": ">=6.0"
+      },
+      "peerDependenciesMeta": {
+        "supports-color": {
+          "optional": true
+        }
       }
     },
-    "node_modules/is-invalid-path/node_modules/is-extglob": {
-      "version": "1.0.0",
+    "node_modules/decamelize": {
+      "version": "1.2.0",
       "license": "MIT",
       "engines": {
         "node": ">=0.10.0"
       }
     },
-    "node_modules/is-invalid-path/node_modules/is-glob": {
-      "version": "2.0.1",
+    "node_modules/decimal.js": {
+      "version": "10.4.3",
+      "license": "MIT"
+    },
+    "node_modules/decode-uri-component": {
+      "version": "0.2.2",
       "license": "MIT",
-      "dependencies": {
-        "is-extglob": "^1.0.0"
-      },
       "engines": {
-        "node": ">=0.10.0"
+        "node": ">=0.10"
       }
     },
-    "node_modules/is-map": {
-      "version": "2.0.2",
+    "node_modules/decompress-response": {
+      "version": "6.0.0",
       "dev": true,
       "license": "MIT",
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/is-nan": {
-      "version": "1.3.2",
-      "resolved": "https://registry.npmjs.org/is-nan/-/is-nan-1.3.2.tgz",
-      "integrity": "sha512-E+zBKpQ2t6MEo1VsonYmluk9NxGrbzpeeLC2xIViuO2EjU2xsXsBPwTr3Ykv9l08UYEVEdWeRZNouaZqF6RN0w==",
       "dependencies": {
-        "call-bind": "^1.0.0",
-        "define-properties": "^1.1.3"
+        "mimic-response": "^3.1.0"
       },
       "engines": {
-        "node": ">= 0.4"
+        "node": ">=10"
       },
       "funding": {
-        "url": "https://github.com/sponsors/ljharb"
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/is-negative-zero": {
-      "version": "2.0.2",
+    "node_modules/decompress-response/node_modules/mimic-response": {
+      "version": "3.1.0",
       "dev": true,
       "license": "MIT",
       "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/is-network-error": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/is-network-error/-/is-network-error-1.1.0.tgz",
-      "integrity": "sha512-tUdRRAnhT+OtCZR/LxZelH/C7QtjtFrTu5tXCA8pl55eTUElUHT+GPYV8MBMBvea/j+NxQqVt3LbWMRir7Gx9g==",
-      "dev": true,
-      "engines": {
-        "node": ">=16"
+        "node": ">=10"
       },
       "funding": {
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/is-number": {
-      "version": "7.0.0",
-      "license": "MIT",
-      "engines": {
-        "node": ">=0.12.0"
-      }
+    "node_modules/dedent": {
+      "version": "0.7.0",
+      "dev": true,
+      "license": "MIT"
     },
-    "node_modules/is-number-object": {
-      "version": "1.0.7",
+    "node_modules/deep-equal": {
+      "version": "2.0.5",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "has-tostringtag": "^1.0.0"
-      },
-      "engines": {
-        "node": ">= 0.4"
+        "call-bind": "^1.0.0",
+        "es-get-iterator": "^1.1.1",
+        "get-intrinsic": "^1.0.1",
+        "is-arguments": "^1.0.4",
+        "is-date-object": "^1.0.2",
+        "is-regex": "^1.1.1",
+        "isarray": "^2.0.5",
+        "object-is": "^1.1.4",
+        "object-keys": "^1.1.1",
+        "object.assign": "^4.1.2",
+        "regexp.prototype.flags": "^1.3.0",
+        "side-channel": "^1.0.3",
+        "which-boxed-primitive": "^1.0.1",
+        "which-collection": "^1.0.1",
+        "which-typed-array": "^1.1.2"
       },
       "funding": {
         "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/is-path-cwd": {
-      "version": "2.2.0",
+    "node_modules/deep-extend": {
+      "version": "0.6.0",
       "license": "MIT",
       "engines": {
-        "node": ">=6"
+        "node": ">=4.0.0"
       }
     },
-    "node_modules/is-path-in-cwd": {
-      "version": "2.1.0",
+    "node_modules/deep-is": {
+      "version": "0.1.4",
       "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/deepmerge": {
+      "version": "4.3.1",
       "license": "MIT",
-      "dependencies": {
-        "is-path-inside": "^2.1.0"
-      },
       "engines": {
-        "node": ">=6"
+        "node": ">=0.10.0"
       }
     },
-    "node_modules/is-path-inside": {
-      "version": "2.1.0",
+    "node_modules/default-browser": {
+      "version": "5.2.1",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "path-is-inside": "^1.0.2"
+        "bundle-name": "^4.1.0",
+        "default-browser-id": "^5.0.0"
       },
       "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/is-plain-object": {
-      "version": "5.0.0",
-      "license": "MIT",
-      "engines": {
-        "node": ">=0.10.0"
+        "node": ">=18"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/is-potential-custom-element-name": {
-      "version": "1.0.1",
-      "license": "MIT"
-    },
-    "node_modules/is-regex": {
-      "version": "1.1.4",
+    "node_modules/default-browser-id": {
+      "version": "3.0.0",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "call-bind": "^1.0.2",
-        "has-tostringtag": "^1.0.0"
+        "bplist-parser": "^0.2.0",
+        "untildify": "^4.0.0"
       },
       "engines": {
-        "node": ">= 0.4"
+        "node": ">=12"
       },
       "funding": {
-        "url": "https://github.com/sponsors/ljharb"
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/is-set": {
-      "version": "2.0.2",
+    "node_modules/default-browser/node_modules/default-browser-id": {
+      "version": "5.0.0",
       "dev": true,
       "license": "MIT",
+      "engines": {
+        "node": ">=18"
+      },
       "funding": {
-        "url": "https://github.com/sponsors/ljharb"
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/is-shared-array-buffer": {
-      "version": "1.0.2",
+    "node_modules/default-gateway": {
+      "version": "6.0.3",
       "dev": true,
-      "license": "MIT",
+      "license": "BSD-2-Clause",
       "dependencies": {
-        "call-bind": "^1.0.2"
+        "execa": "^5.0.0"
       },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
+      "engines": {
+        "node": ">= 10"
       }
     },
-    "node_modules/is-stream": {
-      "version": "2.0.1",
+    "node_modules/defaults": {
+      "version": "1.0.4",
       "license": "MIT",
-      "engines": {
-        "node": ">=8"
+      "dependencies": {
+        "clone": "^1.0.2"
       },
       "funding": {
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/is-string": {
-      "version": "1.0.7",
+    "node_modules/defer-to-connect": {
+      "version": "2.0.1",
       "dev": true,
       "license": "MIT",
-      "dependencies": {
-        "has-tostringtag": "^1.0.0"
-      },
       "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
+        "node": ">=10"
       }
     },
-    "node_modules/is-symbol": {
-      "version": "1.0.4",
-      "dev": true,
+    "node_modules/define-data-property": {
+      "version": "1.1.4",
       "license": "MIT",
       "dependencies": {
-        "has-symbols": "^1.0.2"
+        "es-define-property": "^1.0.0",
+        "es-errors": "^1.3.0",
+        "gopd": "^1.0.1"
       },
       "engines": {
         "node": ">= 0.4"
@@ -23730,11 +23731,20 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/is-typed-array": {
-      "version": "1.1.12",
+    "node_modules/define-lazy-prop": {
+      "version": "2.0.0",
+      "license": "MIT",
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/define-properties": {
+      "version": "1.2.1",
       "license": "MIT",
       "dependencies": {
-        "which-typed-array": "^1.1.11"
+        "define-data-property": "^1.0.1",
+        "has-property-descriptors": "^1.0.0",
+        "object-keys": "^1.1.1"
       },
       "engines": {
         "node": ">= 0.4"
@@ -23743,636 +23753,643 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/is-unicode-supported": {
-      "version": "0.1.0",
-      "resolved": "https://registry.npmjs.org/is-unicode-supported/-/is-unicode-supported-0.1.0.tgz",
-      "integrity": "sha512-knxG2q4UC3u8stRGyAVJCOdxFmv5DZiRcdlIaAQXAbSfJya+OhopNotLQrstBhququ4ZpuKbDc/8S6mgXgPFPw==",
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/is-utf8": {
-      "version": "0.2.1",
-      "license": "MIT"
-    },
-    "node_modules/is-valid-path": {
-      "version": "0.1.1",
+    "node_modules/define-property": {
+      "version": "2.0.2",
       "license": "MIT",
+      "optional": true,
       "dependencies": {
-        "is-invalid-path": "^0.1.0"
+        "is-descriptor": "^1.0.2",
+        "isobject": "^3.0.1"
       },
       "engines": {
         "node": ">=0.10.0"
       }
     },
-    "node_modules/is-weakmap": {
-      "version": "2.0.1",
+    "node_modules/defu": {
+      "version": "6.1.4",
       "dev": true,
-      "license": "MIT",
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
+      "license": "MIT"
     },
-    "node_modules/is-weakref": {
-      "version": "1.0.2",
+    "node_modules/del": {
+      "version": "4.1.1",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "call-bind": "^1.0.2"
+        "@types/glob": "^7.1.1",
+        "globby": "^6.1.0",
+        "is-path-cwd": "^2.0.0",
+        "is-path-in-cwd": "^2.0.0",
+        "p-map": "^2.0.0",
+        "pify": "^4.0.1",
+        "rimraf": "^2.6.3"
       },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
+      "engines": {
+        "node": ">=6"
       }
     },
-    "node_modules/is-weakset": {
-      "version": "2.0.2",
+    "node_modules/del/node_modules/array-union": {
+      "version": "1.0.2",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "call-bind": "^1.0.2",
-        "get-intrinsic": "^1.1.1"
+        "array-uniq": "^1.0.1"
       },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/is-windows": {
-      "version": "1.0.2",
-      "license": "MIT",
-      "optional": true,
       "engines": {
         "node": ">=0.10.0"
       }
     },
-    "node_modules/is-wsl": {
-      "version": "2.2.0",
+    "node_modules/del/node_modules/globby": {
+      "version": "6.1.0",
+      "dev": true,
       "license": "MIT",
       "dependencies": {
-        "is-docker": "^2.0.0"
+        "array-union": "^1.0.1",
+        "glob": "^7.0.3",
+        "object-assign": "^4.0.1",
+        "pify": "^2.0.0",
+        "pinkie-promise": "^2.0.0"
       },
       "engines": {
-        "node": ">=8"
+        "node": ">=0.10.0"
       }
     },
-    "node_modules/isarray": {
-      "version": "2.0.5",
+    "node_modules/del/node_modules/globby/node_modules/pify": {
+      "version": "2.3.0",
       "dev": true,
-      "license": "MIT"
+      "license": "MIT",
+      "engines": {
+        "node": ">=0.10.0"
+      }
     },
-    "node_modules/isbinaryfile": {
-      "version": "5.0.2",
+    "node_modules/del/node_modules/p-map": {
+      "version": "2.1.0",
       "dev": true,
       "license": "MIT",
       "engines": {
-        "node": ">= 18.0.0"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/gjtorikian/"
+        "node": ">=6"
       }
     },
-    "node_modules/isexe": {
-      "version": "2.0.0",
-      "license": "ISC"
+    "node_modules/del/node_modules/rimraf": {
+      "version": "2.7.1",
+      "dev": true,
+      "license": "ISC",
+      "dependencies": {
+        "glob": "^7.1.3"
+      },
+      "bin": {
+        "rimraf": "bin.js"
+      }
     },
-    "node_modules/isobject": {
-      "version": "3.0.1",
+    "node_modules/delay": {
+      "version": "6.0.0",
+      "dev": true,
       "license": "MIT",
       "engines": {
-        "node": ">=0.10.0"
+        "node": ">=16"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/istanbul-lib-coverage": {
-      "version": "3.2.0",
-      "license": "BSD-3-Clause",
+    "node_modules/delayed-stream": {
+      "version": "1.0.0",
+      "license": "MIT",
       "engines": {
-        "node": ">=8"
+        "node": ">=0.4.0"
       }
     },
-    "node_modules/istanbul-lib-instrument": {
-      "version": "5.2.0",
-      "license": "BSD-3-Clause",
-      "dependencies": {
-        "@babel/core": "^7.12.3",
-        "@babel/parser": "^7.14.7",
-        "@istanbuljs/schema": "^0.1.2",
-        "istanbul-lib-coverage": "^3.2.0",
-        "semver": "^6.3.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
+    "node_modules/delegate": {
+      "version": "3.2.0",
+      "license": "MIT"
     },
-    "node_modules/istanbul-lib-instrument/node_modules/semver": {
-      "version": "6.3.1",
-      "license": "ISC",
-      "bin": {
-        "semver": "bin/semver.js"
+    "node_modules/delegates": {
+      "version": "1.0.0",
+      "devOptional": true,
+      "license": "MIT"
+    },
+    "node_modules/denodeify": {
+      "version": "1.2.1",
+      "license": "MIT"
+    },
+    "node_modules/depd": {
+      "version": "2.0.0",
+      "license": "MIT",
+      "engines": {
+        "node": ">= 0.8"
       }
     },
-    "node_modules/istanbul-lib-report": {
-      "version": "3.0.0",
-      "license": "BSD-3-Clause",
+    "node_modules/deprecated-react-native-prop-types": {
+      "version": "2.3.0",
+      "license": "MIT",
       "dependencies": {
-        "istanbul-lib-coverage": "^3.0.0",
-        "make-dir": "^3.0.0",
-        "supports-color": "^7.1.0"
-      },
-      "engines": {
-        "node": ">=8"
+        "@react-native/normalize-color": "*",
+        "invariant": "*",
+        "prop-types": "*"
       }
     },
-    "node_modules/istanbul-lib-report/node_modules/has-flag": {
-      "version": "4.0.0",
+    "node_modules/deprecation": {
+      "version": "2.3.1",
+      "dev": true,
+      "license": "ISC"
+    },
+    "node_modules/dequal": {
+      "version": "2.0.3",
       "license": "MIT",
       "engines": {
-        "node": ">=8"
+        "node": ">=6"
       }
     },
-    "node_modules/istanbul-lib-report/node_modules/make-dir": {
-      "version": "3.1.0",
+    "node_modules/des.js": {
+      "version": "1.0.1",
       "license": "MIT",
       "dependencies": {
-        "semver": "^6.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
+        "inherits": "^2.0.1",
+        "minimalistic-assert": "^1.0.0"
       }
     },
-    "node_modules/istanbul-lib-report/node_modules/semver": {
-      "version": "6.3.1",
-      "license": "ISC",
-      "bin": {
-        "semver": "bin/semver.js"
+    "node_modules/destroy": {
+      "version": "1.2.0",
+      "license": "MIT",
+      "engines": {
+        "node": ">= 0.8",
+        "npm": "1.2.8000 || >= 1.4.16"
       }
     },
-    "node_modules/istanbul-lib-report/node_modules/supports-color": {
-      "version": "7.2.0",
+    "node_modules/detect-indent": {
+      "version": "6.1.0",
+      "dev": true,
       "license": "MIT",
-      "dependencies": {
-        "has-flag": "^4.0.0"
-      },
       "engines": {
         "node": ">=8"
       }
     },
-    "node_modules/istanbul-lib-source-maps": {
-      "version": "4.0.1",
-      "license": "BSD-3-Clause",
-      "dependencies": {
-        "debug": "^4.1.1",
-        "istanbul-lib-coverage": "^3.0.0",
-        "source-map": "^0.6.1"
-      },
+    "node_modules/detect-libc": {
+      "version": "2.0.1",
+      "devOptional": true,
+      "license": "Apache-2.0",
       "engines": {
-        "node": ">=10"
+        "node": ">=8"
       }
     },
-    "node_modules/istanbul-reports": {
-      "version": "3.1.5",
-      "license": "BSD-3-Clause",
-      "dependencies": {
-        "html-escaper": "^2.0.0",
-        "istanbul-lib-report": "^3.0.0"
-      },
+    "node_modules/detect-newline": {
+      "version": "3.1.0",
+      "license": "MIT",
       "engines": {
         "node": ">=8"
       }
     },
-    "node_modules/iterator.prototype": {
+    "node_modules/detect-node": {
+      "version": "2.1.0",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/detect-node-es": {
       "version": "1.1.0",
       "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "define-properties": "^1.1.4",
-        "get-intrinsic": "^1.1.3",
-        "has-symbols": "^1.0.3",
-        "has-tostringtag": "^1.0.0",
-        "reflect.getprototypeof": "^1.0.3"
-      }
+      "license": "MIT"
     },
-    "node_modules/jackspeak": {
-      "version": "2.3.6",
-      "license": "BlueOak-1.0.0",
+    "node_modules/detect-package-manager": {
+      "version": "2.0.1",
+      "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "@isaacs/cliui": "^8.0.2"
+        "execa": "^5.1.1"
       },
       "engines": {
-        "node": ">=14"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/isaacs"
-      },
-      "optionalDependencies": {
-        "@pkgjs/parseargs": "^0.11.0"
+        "node": ">=12"
       }
     },
-    "node_modules/jake": {
-      "version": "10.8.7",
-      "license": "Apache-2.0",
+    "node_modules/detect-port": {
+      "version": "1.6.1",
+      "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "async": "^3.2.3",
-        "chalk": "^4.0.2",
-        "filelist": "^1.0.4",
-        "minimatch": "^3.1.2"
+        "address": "^1.0.1",
+        "debug": "4"
       },
       "bin": {
-        "jake": "bin/cli.js"
+        "detect": "bin/detect-port.js",
+        "detect-port": "bin/detect-port.js"
       },
       "engines": {
-        "node": ">=10"
+        "node": ">= 4.0.0"
       }
     },
-    "node_modules/jake/node_modules/ansi-styles": {
-      "version": "4.3.0",
+    "node_modules/diagnostic-channel": {
+      "version": "1.1.1",
       "license": "MIT",
+      "peer": true,
       "dependencies": {
-        "color-convert": "^2.0.1"
-      },
+        "semver": "^7.5.3"
+      }
+    },
+    "node_modules/diagnostic-channel-publishers": {
+      "version": "1.0.7",
+      "license": "MIT",
+      "peer": true,
+      "peerDependencies": {
+        "diagnostic-channel": "*"
+      }
+    },
+    "node_modules/diff": {
+      "version": "4.0.2",
+      "devOptional": true,
+      "license": "BSD-3-Clause",
       "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
+        "node": ">=0.3.1"
       }
     },
-    "node_modules/jake/node_modules/chalk": {
-      "version": "4.1.2",
+    "node_modules/diff-sequences": {
+      "version": "29.6.3",
       "license": "MIT",
-      "dependencies": {
-        "ansi-styles": "^4.1.0",
-        "supports-color": "^7.1.0"
-      },
       "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/chalk?sponsor=1"
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
       }
     },
-    "node_modules/jake/node_modules/color-convert": {
-      "version": "2.0.1",
+    "node_modules/diff-so-fancy": {
+      "version": "1.4.3",
+      "dev": true,
+      "license": "MIT",
+      "bin": {
+        "diff-so-fancy": "third_party/build_fatpack/diff-so-fancy"
+      }
+    },
+    "node_modules/diffie-hellman": {
+      "version": "5.0.3",
       "license": "MIT",
       "dependencies": {
-        "color-name": "~1.1.4"
-      },
-      "engines": {
-        "node": ">=7.0.0"
+        "bn.js": "^4.1.0",
+        "miller-rabin": "^4.0.0",
+        "randombytes": "^2.0.0"
       }
     },
-    "node_modules/jake/node_modules/color-name": {
-      "version": "1.1.4",
+    "node_modules/diffie-hellman/node_modules/bn.js": {
+      "version": "4.12.0",
       "license": "MIT"
     },
-    "node_modules/jake/node_modules/has-flag": {
-      "version": "4.0.0",
+    "node_modules/dijkstrajs": {
+      "version": "1.0.3",
+      "license": "MIT"
+    },
+    "node_modules/dir-compare": {
+      "version": "4.2.0",
+      "dev": true,
       "license": "MIT",
-      "engines": {
-        "node": ">=8"
+      "dependencies": {
+        "minimatch": "^3.0.5",
+        "p-limit": "^3.1.0 "
       }
     },
-    "node_modules/jake/node_modules/supports-color": {
-      "version": "7.2.0",
+    "node_modules/dir-glob": {
+      "version": "3.0.1",
       "license": "MIT",
       "dependencies": {
-        "has-flag": "^4.0.0"
+        "path-type": "^4.0.0"
       },
       "engines": {
         "node": ">=8"
       }
     },
-    "node_modules/javascript-natural-sort": {
-      "version": "0.7.1",
+    "node_modules/dmg-builder": {
+      "version": "25.0.0",
       "dev": true,
-      "license": "MIT"
-    },
-    "node_modules/jest": {
-      "version": "29.4.1",
       "license": "MIT",
       "dependencies": {
-        "@jest/core": "^29.4.1",
-        "@jest/types": "^29.4.1",
-        "import-local": "^3.0.2",
-        "jest-cli": "^29.4.1"
-      },
-      "bin": {
-        "jest": "bin/jest.js"
-      },
-      "engines": {
-        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
-      },
-      "peerDependencies": {
-        "node-notifier": "^8.0.1 || ^9.0.0 || ^10.0.0"
+        "app-builder-lib": "25.0.0",
+        "builder-util": "25.0.0",
+        "builder-util-runtime": "9.2.5",
+        "fs-extra": "^10.1.0",
+        "iconv-lite": "^0.6.2",
+        "js-yaml": "^4.1.0"
       },
-      "peerDependenciesMeta": {
-        "node-notifier": {
-          "optional": true
-        }
+      "optionalDependencies": {
+        "dmg-license": "^1.0.11"
       }
     },
-    "node_modules/jest-changed-files": {
-      "version": "29.4.0",
+    "node_modules/dmg-builder/node_modules/argparse": {
+      "version": "2.0.1",
+      "dev": true,
+      "license": "Python-2.0"
+    },
+    "node_modules/dmg-builder/node_modules/fs-extra": {
+      "version": "10.1.0",
+      "dev": true,
       "license": "MIT",
       "dependencies": {
-        "execa": "^5.0.0",
-        "p-limit": "^3.1.0"
+        "graceful-fs": "^4.2.0",
+        "jsonfile": "^6.0.1",
+        "universalify": "^2.0.0"
       },
       "engines": {
-        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+        "node": ">=12"
       }
     },
-    "node_modules/jest-circus": {
-      "version": "29.4.1",
+    "node_modules/dmg-builder/node_modules/js-yaml": {
+      "version": "4.1.0",
+      "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@jest/environment": "^29.4.1",
-        "@jest/expect": "^29.4.1",
-        "@jest/test-result": "^29.4.1",
-        "@jest/types": "^29.4.1",
-        "@types/node": "*",
-        "chalk": "^4.0.0",
-        "co": "^4.6.0",
-        "dedent": "^0.7.0",
-        "is-generator-fn": "^2.0.0",
-        "jest-each": "^29.4.1",
-        "jest-matcher-utils": "^29.4.1",
-        "jest-message-util": "^29.4.1",
-        "jest-runtime": "^29.4.1",
-        "jest-snapshot": "^29.4.1",
-        "jest-util": "^29.4.1",
-        "p-limit": "^3.1.0",
-        "pretty-format": "^29.4.1",
-        "slash": "^3.0.0",
-        "stack-utils": "^2.0.3"
+        "argparse": "^2.0.1"
       },
-      "engines": {
-        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+      "bin": {
+        "js-yaml": "bin/js-yaml.js"
       }
     },
-    "node_modules/jest-circus/node_modules/@jest/types": {
-      "version": "29.6.3",
+    "node_modules/dmg-license": {
+      "version": "1.0.11",
+      "dev": true,
       "license": "MIT",
+      "optional": true,
+      "os": [
+        "darwin"
+      ],
       "dependencies": {
-        "@jest/schemas": "^29.6.3",
-        "@types/istanbul-lib-coverage": "^2.0.0",
-        "@types/istanbul-reports": "^3.0.0",
-        "@types/node": "*",
-        "@types/yargs": "^17.0.8",
-        "chalk": "^4.0.0"
+        "@types/plist": "^3.0.1",
+        "@types/verror": "^1.10.3",
+        "ajv": "^6.10.0",
+        "crc": "^3.8.0",
+        "iconv-corefoundation": "^1.1.7",
+        "plist": "^3.0.4",
+        "smart-buffer": "^4.0.2",
+        "verror": "^1.10.0"
+      },
+      "bin": {
+        "dmg-license": "bin/dmg-license.js"
       },
       "engines": {
-        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+        "node": ">=8"
       }
     },
-    "node_modules/jest-circus/node_modules/@types/yargs": {
-      "version": "17.0.24",
+    "node_modules/dmg-license/node_modules/ajv": {
+      "version": "6.12.6",
+      "dev": true,
       "license": "MIT",
+      "optional": true,
       "dependencies": {
-        "@types/yargs-parser": "*"
+        "fast-deep-equal": "^3.1.1",
+        "fast-json-stable-stringify": "^2.0.0",
+        "json-schema-traverse": "^0.4.1",
+        "uri-js": "^4.2.2"
+      },
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/epoberezkin"
       }
     },
-    "node_modules/jest-circus/node_modules/ansi-styles": {
-      "version": "4.3.0",
+    "node_modules/dmg-license/node_modules/json-schema-traverse": {
+      "version": "0.4.1",
+      "dev": true,
+      "license": "MIT",
+      "optional": true
+    },
+    "node_modules/dns-packet": {
+      "version": "5.6.1",
+      "dev": true,
       "license": "MIT",
       "dependencies": {
-        "color-convert": "^2.0.1"
+        "@leichtgewicht/ip-codec": "^2.0.1"
       },
       "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
+        "node": ">=6"
       }
     },
-    "node_modules/jest-circus/node_modules/chalk": {
-      "version": "4.1.2",
-      "license": "MIT",
+    "node_modules/doctrine": {
+      "version": "3.0.0",
+      "dev": true,
+      "license": "Apache-2.0",
       "dependencies": {
-        "ansi-styles": "^4.1.0",
-        "supports-color": "^7.1.0"
+        "esutils": "^2.0.2"
       },
       "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/chalk?sponsor=1"
+        "node": ">=6.0.0"
       }
     },
-    "node_modules/jest-circus/node_modules/color-convert": {
-      "version": "2.0.1",
+    "node_modules/dom-converter": {
+      "version": "0.2.0",
       "license": "MIT",
       "dependencies": {
-        "color-name": "~1.1.4"
-      },
-      "engines": {
-        "node": ">=7.0.0"
+        "utila": "~0.4"
       }
     },
-    "node_modules/jest-circus/node_modules/color-name": {
-      "version": "1.1.4",
-      "license": "MIT"
+    "node_modules/dom-serializer": {
+      "version": "0.2.2",
+      "license": "MIT",
+      "dependencies": {
+        "domelementtype": "^2.0.1",
+        "entities": "^2.0.0"
+      }
     },
-    "node_modules/jest-circus/node_modules/has-flag": {
-      "version": "4.0.0",
+    "node_modules/domain-browser": {
+      "version": "1.2.0",
       "license": "MIT",
       "engines": {
-        "node": ">=8"
+        "node": ">=0.4",
+        "npm": ">=1.2"
       }
     },
-    "node_modules/jest-circus/node_modules/supports-color": {
-      "version": "7.2.0",
+    "node_modules/domelementtype": {
+      "version": "2.3.0",
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/fb55"
+        }
+      ],
+      "license": "BSD-2-Clause"
+    },
+    "node_modules/domexception": {
+      "version": "4.0.0",
       "license": "MIT",
       "dependencies": {
-        "has-flag": "^4.0.0"
+        "webidl-conversions": "^7.0.0"
       },
       "engines": {
-        "node": ">=8"
+        "node": ">=12"
       }
     },
-    "node_modules/jest-cli": {
-      "version": "29.4.1",
-      "license": "MIT",
+    "node_modules/domhandler": {
+      "version": "4.3.1",
+      "license": "BSD-2-Clause",
       "dependencies": {
-        "@jest/core": "^29.4.1",
-        "@jest/test-result": "^29.4.1",
-        "@jest/types": "^29.4.1",
-        "chalk": "^4.0.0",
-        "exit": "^0.1.2",
-        "graceful-fs": "^4.2.9",
-        "import-local": "^3.0.2",
-        "jest-config": "^29.4.1",
-        "jest-util": "^29.4.1",
-        "jest-validate": "^29.4.1",
-        "prompts": "^2.0.1",
-        "yargs": "^17.3.1"
-      },
-      "bin": {
-        "jest": "bin/jest.js"
+        "domelementtype": "^2.2.0"
       },
       "engines": {
-        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
-      },
-      "peerDependencies": {
-        "node-notifier": "^8.0.1 || ^9.0.0 || ^10.0.0"
+        "node": ">= 4"
       },
-      "peerDependenciesMeta": {
-        "node-notifier": {
-          "optional": true
-        }
+      "funding": {
+        "url": "https://github.com/fb55/domhandler?sponsor=1"
       }
     },
-    "node_modules/jest-cli/node_modules/@jest/types": {
-      "version": "29.6.3",
-      "license": "MIT",
+    "node_modules/domutils": {
+      "version": "2.8.0",
+      "license": "BSD-2-Clause",
       "dependencies": {
-        "@jest/schemas": "^29.6.3",
-        "@types/istanbul-lib-coverage": "^2.0.0",
-        "@types/istanbul-reports": "^3.0.0",
-        "@types/node": "*",
-        "@types/yargs": "^17.0.8",
-        "chalk": "^4.0.0"
+        "dom-serializer": "^1.0.1",
+        "domelementtype": "^2.2.0",
+        "domhandler": "^4.2.0"
       },
-      "engines": {
-        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+      "funding": {
+        "url": "https://github.com/fb55/domutils?sponsor=1"
       }
     },
-    "node_modules/jest-cli/node_modules/@types/yargs": {
-      "version": "17.0.24",
+    "node_modules/domutils/node_modules/dom-serializer": {
+      "version": "1.4.1",
       "license": "MIT",
       "dependencies": {
-        "@types/yargs-parser": "*"
+        "domelementtype": "^2.0.1",
+        "domhandler": "^4.2.0",
+        "entities": "^2.0.0"
+      },
+      "funding": {
+        "url": "https://github.com/cheeriojs/dom-serializer?sponsor=1"
       }
     },
-    "node_modules/jest-cli/node_modules/ansi-styles": {
-      "version": "4.3.0",
+    "node_modules/dot-case": {
+      "version": "3.0.4",
       "license": "MIT",
       "dependencies": {
-        "color-convert": "^2.0.1"
-      },
+        "no-case": "^3.0.4",
+        "tslib": "^2.0.3"
+      }
+    },
+    "node_modules/dotenv": {
+      "version": "16.4.5",
+      "license": "BSD-2-Clause",
       "engines": {
-        "node": ">=8"
+        "node": ">=12"
       },
       "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
+        "url": "https://dotenvx.com"
       }
     },
-    "node_modules/jest-cli/node_modules/chalk": {
-      "version": "4.1.2",
-      "license": "MIT",
+    "node_modules/dotenv-expand": {
+      "version": "11.0.6",
+      "license": "BSD-2-Clause",
       "dependencies": {
-        "ansi-styles": "^4.1.0",
-        "supports-color": "^7.1.0"
+        "dotenv": "^16.4.4"
       },
       "engines": {
-        "node": ">=10"
+        "node": ">=12"
       },
       "funding": {
-        "url": "https://github.com/chalk/chalk?sponsor=1"
+        "url": "https://dotenvx.com"
       }
     },
-    "node_modules/jest-cli/node_modules/color-convert": {
-      "version": "2.0.1",
+    "node_modules/duplexer": {
+      "version": "0.1.2",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/duplexify": {
+      "version": "3.7.1",
+      "dev": true,
       "license": "MIT",
       "dependencies": {
-        "color-name": "~1.1.4"
-      },
-      "engines": {
-        "node": ">=7.0.0"
+        "end-of-stream": "^1.0.0",
+        "inherits": "^2.0.1",
+        "readable-stream": "^2.0.0",
+        "stream-shift": "^1.0.0"
       }
     },
-    "node_modules/jest-cli/node_modules/color-name": {
-      "version": "1.1.4",
+    "node_modules/earcut": {
+      "version": "2.2.4",
+      "license": "ISC"
+    },
+    "node_modules/eastasianwidth": {
+      "version": "0.2.0",
       "license": "MIT"
     },
-    "node_modules/jest-cli/node_modules/has-flag": {
-      "version": "4.0.0",
-      "license": "MIT",
+    "node_modules/ee-first": {
+      "version": "1.1.1",
+      "license": "MIT"
+    },
+    "node_modules/ejs": {
+      "version": "3.1.10",
+      "dev": true,
+      "license": "Apache-2.0",
+      "dependencies": {
+        "jake": "^10.8.5"
+      },
+      "bin": {
+        "ejs": "bin/cli.js"
+      },
       "engines": {
-        "node": ">=8"
+        "node": ">=0.10.0"
       }
     },
-    "node_modules/jest-cli/node_modules/supports-color": {
-      "version": "7.2.0",
+    "node_modules/electron": {
+      "version": "29.4.6",
+      "resolved": "https://registry.npmjs.org/electron/-/electron-29.4.6.tgz",
+      "integrity": "sha512-fz8ndj8cmmf441t4Yh2FDP3Rn0JhLkVGvtUf2YVMbJ5SdJPlc0JWll9jYkhh60jDKVVCr/tBAmfxqRnXMWJpzg==",
+      "dev": true,
+      "hasInstallScript": true,
       "license": "MIT",
       "dependencies": {
-        "has-flag": "^4.0.0"
+        "@electron/get": "^2.0.0",
+        "@types/node": "^20.9.0",
+        "extract-zip": "^2.0.1"
+      },
+      "bin": {
+        "electron": "cli.js"
       },
       "engines": {
-        "node": ">=8"
+        "node": ">= 12.20.55"
       }
     },
-    "node_modules/jest-config": {
-      "version": "29.4.1",
+    "node_modules/electron-builder": {
+      "version": "25.0.0",
+      "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/core": "^7.11.6",
-        "@jest/test-sequencer": "^29.4.1",
-        "@jest/types": "^29.4.1",
-        "babel-jest": "^29.4.1",
-        "chalk": "^4.0.0",
-        "ci-info": "^3.2.0",
-        "deepmerge": "^4.2.2",
-        "glob": "^7.1.3",
-        "graceful-fs": "^4.2.9",
-        "jest-circus": "^29.4.1",
-        "jest-environment-node": "^29.4.1",
-        "jest-get-type": "^29.2.0",
-        "jest-regex-util": "^29.2.0",
-        "jest-resolve": "^29.4.1",
-        "jest-runner": "^29.4.1",
-        "jest-util": "^29.4.1",
-        "jest-validate": "^29.4.1",
-        "micromatch": "^4.0.4",
-        "parse-json": "^5.2.0",
-        "pretty-format": "^29.4.1",
-        "slash": "^3.0.0",
-        "strip-json-comments": "^3.1.1"
-      },
-      "engines": {
-        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+        "app-builder-lib": "25.0.0",
+        "builder-util": "25.0.0",
+        "builder-util-runtime": "9.2.5",
+        "chalk": "^4.1.2",
+        "dmg-builder": "25.0.0",
+        "fs-extra": "^10.1.0",
+        "is-ci": "^3.0.0",
+        "lazy-val": "^1.0.5",
+        "read-config-file": "6.4.0",
+        "simple-update-notifier": "2.0.0",
+        "yargs": "^17.6.2"
       },
-      "peerDependencies": {
-        "@types/node": "*",
-        "ts-node": ">=9.0.0"
+      "bin": {
+        "electron-builder": "cli.js",
+        "install-app-deps": "install-app-deps.js"
       },
-      "peerDependenciesMeta": {
-        "@types/node": {
-          "optional": true
-        },
-        "ts-node": {
-          "optional": true
-        }
+      "engines": {
+        "node": ">=14.0.0"
       }
     },
-    "node_modules/jest-config/node_modules/@jest/types": {
-      "version": "29.6.3",
+    "node_modules/electron-builder-squirrel-windows": {
+      "version": "25.0.0",
+      "dev": true,
       "license": "MIT",
+      "peer": true,
       "dependencies": {
-        "@jest/schemas": "^29.6.3",
-        "@types/istanbul-lib-coverage": "^2.0.0",
-        "@types/istanbul-reports": "^3.0.0",
-        "@types/node": "*",
-        "@types/yargs": "^17.0.8",
-        "chalk": "^4.0.0"
-      },
-      "engines": {
-        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+        "app-builder-lib": "25.0.0",
+        "archiver": "^5.3.1",
+        "builder-util": "25.0.0",
+        "fs-extra": "^10.1.0"
       }
     },
-    "node_modules/jest-config/node_modules/@types/yargs": {
-      "version": "17.0.24",
+    "node_modules/electron-builder-squirrel-windows/node_modules/fs-extra": {
+      "version": "10.1.0",
+      "dev": true,
       "license": "MIT",
+      "peer": true,
       "dependencies": {
-        "@types/yargs-parser": "*"
+        "graceful-fs": "^4.2.0",
+        "jsonfile": "^6.0.1",
+        "universalify": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=12"
       }
     },
-    "node_modules/jest-config/node_modules/ansi-styles": {
+    "node_modules/electron-builder/node_modules/ansi-styles": {
       "version": "4.3.0",
+      "dev": true,
       "license": "MIT",
       "dependencies": {
         "color-convert": "^2.0.1"
@@ -24384,8 +24401,9 @@
         "url": "https://github.com/chalk/ansi-styles?sponsor=1"
       }
     },
-    "node_modules/jest-config/node_modules/chalk": {
+    "node_modules/electron-builder/node_modules/chalk": {
       "version": "4.1.2",
+      "dev": true,
       "license": "MIT",
       "dependencies": {
         "ansi-styles": "^4.1.0",
@@ -24398,8 +24416,9 @@
         "url": "https://github.com/chalk/chalk?sponsor=1"
       }
     },
-    "node_modules/jest-config/node_modules/color-convert": {
+    "node_modules/electron-builder/node_modules/color-convert": {
       "version": "2.0.1",
+      "dev": true,
       "license": "MIT",
       "dependencies": {
         "color-name": "~1.1.4"
@@ -24408,19 +24427,35 @@
         "node": ">=7.0.0"
       }
     },
-    "node_modules/jest-config/node_modules/color-name": {
+    "node_modules/electron-builder/node_modules/color-name": {
       "version": "1.1.4",
+      "dev": true,
       "license": "MIT"
     },
-    "node_modules/jest-config/node_modules/has-flag": {
+    "node_modules/electron-builder/node_modules/fs-extra": {
+      "version": "10.1.0",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "graceful-fs": "^4.2.0",
+        "jsonfile": "^6.0.1",
+        "universalify": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/electron-builder/node_modules/has-flag": {
       "version": "4.0.0",
+      "dev": true,
       "license": "MIT",
       "engines": {
         "node": ">=8"
       }
     },
-    "node_modules/jest-config/node_modules/supports-color": {
+    "node_modules/electron-builder/node_modules/supports-color": {
       "version": "7.2.0",
+      "dev": true,
       "license": "MIT",
       "dependencies": {
         "has-flag": "^4.0.0"
@@ -24429,21 +24464,23 @@
         "node": ">=8"
       }
     },
-    "node_modules/jest-diff": {
-      "version": "29.6.2",
+    "node_modules/electron-publish": {
+      "version": "25.0.0",
+      "dev": true,
       "license": "MIT",
       "dependencies": {
-        "chalk": "^4.0.0",
-        "diff-sequences": "^29.4.3",
-        "jest-get-type": "^29.4.3",
-        "pretty-format": "^29.6.2"
-      },
-      "engines": {
-        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+        "@types/fs-extra": "^9.0.11",
+        "builder-util": "25.0.0",
+        "builder-util-runtime": "9.2.5",
+        "chalk": "^4.1.2",
+        "fs-extra": "^10.1.0",
+        "lazy-val": "^1.0.5",
+        "mime": "^2.5.2"
       }
     },
-    "node_modules/jest-diff/node_modules/ansi-styles": {
+    "node_modules/electron-publish/node_modules/ansi-styles": {
       "version": "4.3.0",
+      "dev": true,
       "license": "MIT",
       "dependencies": {
         "color-convert": "^2.0.1"
@@ -24455,8 +24492,9 @@
         "url": "https://github.com/chalk/ansi-styles?sponsor=1"
       }
     },
-    "node_modules/jest-diff/node_modules/chalk": {
+    "node_modules/electron-publish/node_modules/chalk": {
       "version": "4.1.2",
+      "dev": true,
       "license": "MIT",
       "dependencies": {
         "ansi-styles": "^4.1.0",
@@ -24469,8 +24507,9 @@
         "url": "https://github.com/chalk/chalk?sponsor=1"
       }
     },
-    "node_modules/jest-diff/node_modules/color-convert": {
+    "node_modules/electron-publish/node_modules/color-convert": {
       "version": "2.0.1",
+      "dev": true,
       "license": "MIT",
       "dependencies": {
         "color-name": "~1.1.4"
@@ -24479,19 +24518,35 @@
         "node": ">=7.0.0"
       }
     },
-    "node_modules/jest-diff/node_modules/color-name": {
+    "node_modules/electron-publish/node_modules/color-name": {
       "version": "1.1.4",
+      "dev": true,
       "license": "MIT"
     },
-    "node_modules/jest-diff/node_modules/has-flag": {
+    "node_modules/electron-publish/node_modules/fs-extra": {
+      "version": "10.1.0",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "graceful-fs": "^4.2.0",
+        "jsonfile": "^6.0.1",
+        "universalify": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/electron-publish/node_modules/has-flag": {
       "version": "4.0.0",
+      "dev": true,
       "license": "MIT",
       "engines": {
         "node": ">=8"
       }
     },
-    "node_modules/jest-diff/node_modules/supports-color": {
+    "node_modules/electron-publish/node_modules/supports-color": {
       "version": "7.2.0",
+      "dev": true,
       "license": "MIT",
       "dependencies": {
         "has-flag": "^4.0.0"
@@ -24500,1240 +24555,1332 @@
         "node": ">=8"
       }
     },
-    "node_modules/jest-docblock": {
-      "version": "29.2.0",
+    "node_modules/electron-to-chromium": {
+      "version": "1.4.723",
+      "license": "ISC"
+    },
+    "node_modules/elliptic": {
+      "version": "6.5.4",
       "license": "MIT",
       "dependencies": {
-        "detect-newline": "^3.0.0"
-      },
-      "engines": {
-        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+        "bn.js": "^4.11.9",
+        "brorand": "^1.1.0",
+        "hash.js": "^1.0.0",
+        "hmac-drbg": "^1.0.1",
+        "inherits": "^2.0.4",
+        "minimalistic-assert": "^1.0.1",
+        "minimalistic-crypto-utils": "^1.0.1"
       }
     },
-    "node_modules/jest-each": {
-      "version": "29.4.1",
-      "license": "MIT",
+    "node_modules/elliptic/node_modules/bn.js": {
+      "version": "4.12.0",
+      "license": "MIT"
+    },
+    "node_modules/emitter-listener": {
+      "version": "1.1.2",
+      "license": "BSD-2-Clause",
+      "peer": true,
       "dependencies": {
-        "@jest/types": "^29.4.1",
-        "chalk": "^4.0.0",
-        "jest-get-type": "^29.2.0",
-        "jest-util": "^29.4.1",
-        "pretty-format": "^29.4.1"
+        "shimmer": "^1.2.0"
+      }
+    },
+    "node_modules/emittery": {
+      "version": "0.13.1",
+      "license": "MIT",
+      "engines": {
+        "node": ">=12"
       },
+      "funding": {
+        "url": "https://github.com/sindresorhus/emittery?sponsor=1"
+      }
+    },
+    "node_modules/emoji-regex": {
+      "version": "8.0.0",
+      "license": "MIT"
+    },
+    "node_modules/emojis-list": {
+      "version": "3.0.0",
+      "dev": true,
+      "license": "MIT",
       "engines": {
-        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+        "node": ">= 4"
       }
     },
-    "node_modules/jest-each/node_modules/@jest/types": {
-      "version": "29.6.3",
+    "node_modules/encode-utf8": {
+      "version": "1.0.3",
+      "license": "MIT"
+    },
+    "node_modules/encodeurl": {
+      "version": "1.0.2",
       "license": "MIT",
-      "dependencies": {
-        "@jest/schemas": "^29.6.3",
-        "@types/istanbul-lib-coverage": "^2.0.0",
-        "@types/istanbul-reports": "^3.0.0",
-        "@types/node": "*",
-        "@types/yargs": "^17.0.8",
-        "chalk": "^4.0.0"
-      },
       "engines": {
-        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+        "node": ">= 0.8"
       }
     },
-    "node_modules/jest-each/node_modules/@types/yargs": {
-      "version": "17.0.24",
+    "node_modules/encoding": {
+      "version": "0.1.13",
       "license": "MIT",
+      "optional": true,
       "dependencies": {
-        "@types/yargs-parser": "*"
+        "iconv-lite": "^0.6.2"
       }
     },
-    "node_modules/jest-each/node_modules/ansi-styles": {
-      "version": "4.3.0",
+    "node_modules/end-of-stream": {
+      "version": "1.4.4",
       "license": "MIT",
       "dependencies": {
-        "color-convert": "^2.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
+        "once": "^1.4.0"
       }
     },
-    "node_modules/jest-each/node_modules/chalk": {
-      "version": "4.1.2",
+    "node_modules/endent": {
+      "version": "2.1.0",
+      "dev": true,
       "license": "MIT",
       "dependencies": {
-        "ansi-styles": "^4.1.0",
-        "supports-color": "^7.1.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/chalk?sponsor=1"
+        "dedent": "^0.7.0",
+        "fast-json-parse": "^1.0.3",
+        "objectorarray": "^1.0.5"
       }
     },
-    "node_modules/jest-each/node_modules/color-convert": {
-      "version": "2.0.1",
+    "node_modules/enhanced-resolve": {
+      "version": "5.15.0",
       "license": "MIT",
       "dependencies": {
-        "color-name": "~1.1.4"
+        "graceful-fs": "^4.2.4",
+        "tapable": "^2.2.0"
       },
       "engines": {
-        "node": ">=7.0.0"
+        "node": ">=10.13.0"
       }
     },
-    "node_modules/jest-each/node_modules/color-name": {
-      "version": "1.1.4",
-      "license": "MIT"
+    "node_modules/entities": {
+      "version": "2.2.0",
+      "license": "BSD-2-Clause",
+      "funding": {
+        "url": "https://github.com/fb55/entities?sponsor=1"
+      }
     },
-    "node_modules/jest-each/node_modules/has-flag": {
-      "version": "4.0.0",
+    "node_modules/env-editor": {
+      "version": "0.4.2",
       "license": "MIT",
       "engines": {
         "node": ">=8"
       }
     },
-    "node_modules/jest-each/node_modules/supports-color": {
-      "version": "7.2.0",
+    "node_modules/env-paths": {
+      "version": "2.2.1",
       "license": "MIT",
-      "dependencies": {
-        "has-flag": "^4.0.0"
-      },
       "engines": {
-        "node": ">=8"
+        "node": ">=6"
       }
     },
-    "node_modules/jest-environment-jsdom": {
-      "version": "29.4.1",
+    "node_modules/envinfo": {
+      "version": "7.13.0",
       "license": "MIT",
-      "dependencies": {
-        "@jest/environment": "^29.4.1",
-        "@jest/fake-timers": "^29.4.1",
-        "@jest/types": "^29.4.1",
-        "@types/jsdom": "^20.0.0",
-        "@types/node": "*",
-        "jest-mock": "^29.4.1",
-        "jest-util": "^29.4.1",
-        "jsdom": "^20.0.0"
+      "bin": {
+        "envinfo": "dist/cli.js"
       },
       "engines": {
-        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
-      },
-      "peerDependencies": {
-        "canvas": "^2.5.0"
-      },
-      "peerDependenciesMeta": {
-        "canvas": {
-          "optional": true
-        }
+        "node": ">=4"
       }
     },
-    "node_modules/jest-environment-jsdom/node_modules/@jest/types": {
-      "version": "29.6.3",
+    "node_modules/eol": {
+      "version": "0.9.1",
+      "license": "MIT"
+    },
+    "node_modules/err-code": {
+      "version": "2.0.3",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/errno": {
+      "version": "0.1.8",
       "license": "MIT",
       "dependencies": {
-        "@jest/schemas": "^29.6.3",
-        "@types/istanbul-lib-coverage": "^2.0.0",
-        "@types/istanbul-reports": "^3.0.0",
-        "@types/node": "*",
-        "@types/yargs": "^17.0.8",
-        "chalk": "^4.0.0"
+        "prr": "~1.0.1"
       },
-      "engines": {
-        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+      "bin": {
+        "errno": "cli.js"
       }
     },
-    "node_modules/jest-environment-jsdom/node_modules/@types/yargs": {
-      "version": "17.0.24",
+    "node_modules/error-ex": {
+      "version": "1.3.2",
       "license": "MIT",
       "dependencies": {
-        "@types/yargs-parser": "*"
+        "is-arrayish": "^0.2.1"
       }
     },
-    "node_modules/jest-environment-jsdom/node_modules/acorn": {
-      "version": "8.11.3",
+    "node_modules/error-stack-parser": {
+      "version": "2.1.4",
       "license": "MIT",
-      "bin": {
-        "acorn": "bin/acorn"
-      },
-      "engines": {
-        "node": ">=0.4.0"
+      "dependencies": {
+        "stackframe": "^1.3.4"
       }
     },
-    "node_modules/jest-environment-jsdom/node_modules/ansi-styles": {
-      "version": "4.3.0",
+    "node_modules/errorhandler": {
+      "version": "1.5.1",
       "license": "MIT",
       "dependencies": {
-        "color-convert": "^2.0.1"
+        "accepts": "~1.3.7",
+        "escape-html": "~1.0.3"
       },
       "engines": {
-        "node": ">=8"
+        "node": ">= 0.8"
+      }
+    },
+    "node_modules/es-abstract": {
+      "version": "1.23.3",
+      "license": "MIT",
+      "dependencies": {
+        "array-buffer-byte-length": "^1.0.1",
+        "arraybuffer.prototype.slice": "^1.0.3",
+        "available-typed-arrays": "^1.0.7",
+        "call-bind": "^1.0.7",
+        "data-view-buffer": "^1.0.1",
+        "data-view-byte-length": "^1.0.1",
+        "data-view-byte-offset": "^1.0.0",
+        "es-define-property": "^1.0.0",
+        "es-errors": "^1.3.0",
+        "es-object-atoms": "^1.0.0",
+        "es-set-tostringtag": "^2.0.3",
+        "es-to-primitive": "^1.2.1",
+        "function.prototype.name": "^1.1.6",
+        "get-intrinsic": "^1.2.4",
+        "get-symbol-description": "^1.0.2",
+        "globalthis": "^1.0.3",
+        "gopd": "^1.0.1",
+        "has-property-descriptors": "^1.0.2",
+        "has-proto": "^1.0.3",
+        "has-symbols": "^1.0.3",
+        "hasown": "^2.0.2",
+        "internal-slot": "^1.0.7",
+        "is-array-buffer": "^3.0.4",
+        "is-callable": "^1.2.7",
+        "is-data-view": "^1.0.1",
+        "is-negative-zero": "^2.0.3",
+        "is-regex": "^1.1.4",
+        "is-shared-array-buffer": "^1.0.3",
+        "is-string": "^1.0.7",
+        "is-typed-array": "^1.1.13",
+        "is-weakref": "^1.0.2",
+        "object-inspect": "^1.13.1",
+        "object-keys": "^1.1.1",
+        "object.assign": "^4.1.5",
+        "regexp.prototype.flags": "^1.5.2",
+        "safe-array-concat": "^1.1.2",
+        "safe-regex-test": "^1.0.3",
+        "string.prototype.trim": "^1.2.9",
+        "string.prototype.trimend": "^1.0.8",
+        "string.prototype.trimstart": "^1.0.8",
+        "typed-array-buffer": "^1.0.2",
+        "typed-array-byte-length": "^1.0.1",
+        "typed-array-byte-offset": "^1.0.2",
+        "typed-array-length": "^1.0.6",
+        "unbox-primitive": "^1.0.2",
+        "which-typed-array": "^1.1.15"
+      },
+      "engines": {
+        "node": ">= 0.4"
       },
       "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
+        "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/jest-environment-jsdom/node_modules/chalk": {
-      "version": "4.1.2",
+    "node_modules/es-abstract/node_modules/object.assign": {
+      "version": "4.1.5",
       "license": "MIT",
       "dependencies": {
-        "ansi-styles": "^4.1.0",
-        "supports-color": "^7.1.0"
+        "call-bind": "^1.0.5",
+        "define-properties": "^1.2.1",
+        "has-symbols": "^1.0.3",
+        "object-keys": "^1.1.1"
       },
       "engines": {
-        "node": ">=10"
+        "node": ">= 0.4"
       },
       "funding": {
-        "url": "https://github.com/chalk/chalk?sponsor=1"
+        "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/jest-environment-jsdom/node_modules/color-convert": {
-      "version": "2.0.1",
+    "node_modules/es-define-property": {
+      "version": "1.0.0",
       "license": "MIT",
       "dependencies": {
-        "color-name": "~1.1.4"
+        "get-intrinsic": "^1.2.4"
       },
       "engines": {
-        "node": ">=7.0.0"
+        "node": ">= 0.4"
       }
     },
-    "node_modules/jest-environment-jsdom/node_modules/color-name": {
-      "version": "1.1.4",
-      "license": "MIT"
-    },
-    "node_modules/jest-environment-jsdom/node_modules/cssstyle": {
-      "version": "2.3.0",
+    "node_modules/es-errors": {
+      "version": "1.3.0",
       "license": "MIT",
-      "dependencies": {
-        "cssom": "~0.3.6"
-      },
       "engines": {
-        "node": ">=8"
+        "node": ">= 0.4"
       }
     },
-    "node_modules/jest-environment-jsdom/node_modules/cssstyle/node_modules/cssom": {
-      "version": "0.3.8",
-      "license": "MIT"
-    },
-    "node_modules/jest-environment-jsdom/node_modules/data-urls": {
-      "version": "3.0.2",
+    "node_modules/es-get-iterator": {
+      "version": "1.1.2",
+      "dev": true,
       "license": "MIT",
       "dependencies": {
-        "abab": "^2.0.6",
-        "whatwg-mimetype": "^3.0.0",
-        "whatwg-url": "^11.0.0"
-      },
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/jest-environment-jsdom/node_modules/entities": {
-      "version": "4.5.0",
-      "license": "BSD-2-Clause",
-      "engines": {
-        "node": ">=0.12"
+        "call-bind": "^1.0.2",
+        "get-intrinsic": "^1.1.0",
+        "has-symbols": "^1.0.1",
+        "is-arguments": "^1.1.0",
+        "is-map": "^2.0.2",
+        "is-set": "^2.0.2",
+        "is-string": "^1.0.5",
+        "isarray": "^2.0.5"
       },
       "funding": {
-        "url": "https://github.com/fb55/entities?sponsor=1"
+        "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/jest-environment-jsdom/node_modules/form-data": {
-      "version": "4.0.0",
+    "node_modules/es-iterator-helpers": {
+      "version": "1.0.13",
+      "dev": true,
       "license": "MIT",
       "dependencies": {
-        "asynckit": "^0.4.0",
-        "combined-stream": "^1.0.8",
-        "mime-types": "^2.1.12"
-      },
-      "engines": {
-        "node": ">= 6"
+        "asynciterator.prototype": "^1.0.0",
+        "call-bind": "^1.0.2",
+        "define-properties": "^1.2.0",
+        "es-abstract": "^1.21.3",
+        "es-set-tostringtag": "^2.0.1",
+        "function-bind": "^1.1.1",
+        "get-intrinsic": "^1.2.1",
+        "globalthis": "^1.0.3",
+        "has-property-descriptors": "^1.0.0",
+        "has-proto": "^1.0.1",
+        "has-symbols": "^1.0.3",
+        "internal-slot": "^1.0.5",
+        "iterator.prototype": "^1.1.0",
+        "safe-array-concat": "^1.0.0"
       }
     },
-    "node_modules/jest-environment-jsdom/node_modules/has-flag": {
-      "version": "4.0.0",
-      "license": "MIT",
-      "engines": {
-        "node": ">=8"
-      }
+    "node_modules/es-module-lexer": {
+      "version": "1.5.0",
+      "license": "MIT"
     },
-    "node_modules/jest-environment-jsdom/node_modules/html-encoding-sniffer": {
-      "version": "3.0.0",
+    "node_modules/es-object-atoms": {
+      "version": "1.0.0",
       "license": "MIT",
       "dependencies": {
-        "whatwg-encoding": "^2.0.0"
+        "es-errors": "^1.3.0"
       },
       "engines": {
-        "node": ">=12"
+        "node": ">= 0.4"
       }
     },
-    "node_modules/jest-environment-jsdom/node_modules/jsdom": {
-      "version": "20.0.3",
+    "node_modules/es-set-tostringtag": {
+      "version": "2.0.3",
       "license": "MIT",
       "dependencies": {
-        "abab": "^2.0.6",
-        "acorn": "^8.8.1",
-        "acorn-globals": "^7.0.0",
-        "cssom": "^0.5.0",
-        "cssstyle": "^2.3.0",
-        "data-urls": "^3.0.2",
-        "decimal.js": "^10.4.2",
-        "domexception": "^4.0.0",
-        "escodegen": "^2.0.0",
-        "form-data": "^4.0.0",
-        "html-encoding-sniffer": "^3.0.0",
-        "http-proxy-agent": "^5.0.0",
-        "https-proxy-agent": "^5.0.1",
-        "is-potential-custom-element-name": "^1.0.1",
-        "nwsapi": "^2.2.2",
-        "parse5": "^7.1.1",
-        "saxes": "^6.0.0",
-        "symbol-tree": "^3.2.4",
-        "tough-cookie": "^4.1.2",
-        "w3c-xmlserializer": "^4.0.0",
-        "webidl-conversions": "^7.0.0",
-        "whatwg-encoding": "^2.0.0",
-        "whatwg-mimetype": "^3.0.0",
-        "whatwg-url": "^11.0.0",
-        "ws": "^8.11.0",
-        "xml-name-validator": "^4.0.0"
+        "get-intrinsic": "^1.2.4",
+        "has-tostringtag": "^1.0.2",
+        "hasown": "^2.0.1"
       },
       "engines": {
-        "node": ">=14"
-      },
-      "peerDependencies": {
-        "canvas": "^2.5.0"
-      },
-      "peerDependenciesMeta": {
-        "canvas": {
-          "optional": true
-        }
+        "node": ">= 0.4"
       }
     },
-    "node_modules/jest-environment-jsdom/node_modules/parse5": {
-      "version": "7.1.2",
+    "node_modules/es-shim-unscopables": {
+      "version": "1.0.0",
+      "dev": true,
       "license": "MIT",
       "dependencies": {
-        "entities": "^4.4.0"
-      },
-      "funding": {
-        "url": "https://github.com/inikulin/parse5?sponsor=1"
+        "has": "^1.0.3"
       }
     },
-    "node_modules/jest-environment-jsdom/node_modules/supports-color": {
-      "version": "7.2.0",
+    "node_modules/es-to-primitive": {
+      "version": "1.2.1",
       "license": "MIT",
       "dependencies": {
-        "has-flag": "^4.0.0"
+        "is-callable": "^1.1.4",
+        "is-date-object": "^1.0.1",
+        "is-symbol": "^1.0.2"
       },
       "engines": {
-        "node": ">=8"
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/jest-environment-jsdom/node_modules/tr46": {
-      "version": "3.0.0",
+    "node_modules/es6-error": {
+      "version": "4.1.1",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/esbuild": {
+      "version": "0.20.2",
+      "dev": true,
+      "hasInstallScript": true,
       "license": "MIT",
-      "dependencies": {
-        "punycode": "^2.1.1"
+      "bin": {
+        "esbuild": "bin/esbuild"
       },
       "engines": {
         "node": ">=12"
-      }
-    },
-    "node_modules/jest-environment-jsdom/node_modules/w3c-xmlserializer": {
-      "version": "4.0.0",
-      "license": "MIT",
-      "dependencies": {
-        "xml-name-validator": "^4.0.0"
       },
-      "engines": {
-        "node": ">=14"
+      "optionalDependencies": {
+        "@esbuild/aix-ppc64": "0.20.2",
+        "@esbuild/android-arm": "0.20.2",
+        "@esbuild/android-arm64": "0.20.2",
+        "@esbuild/android-x64": "0.20.2",
+        "@esbuild/darwin-arm64": "0.20.2",
+        "@esbuild/darwin-x64": "0.20.2",
+        "@esbuild/freebsd-arm64": "0.20.2",
+        "@esbuild/freebsd-x64": "0.20.2",
+        "@esbuild/linux-arm": "0.20.2",
+        "@esbuild/linux-arm64": "0.20.2",
+        "@esbuild/linux-ia32": "0.20.2",
+        "@esbuild/linux-loong64": "0.20.2",
+        "@esbuild/linux-mips64el": "0.20.2",
+        "@esbuild/linux-ppc64": "0.20.2",
+        "@esbuild/linux-riscv64": "0.20.2",
+        "@esbuild/linux-s390x": "0.20.2",
+        "@esbuild/linux-x64": "0.20.2",
+        "@esbuild/netbsd-x64": "0.20.2",
+        "@esbuild/openbsd-x64": "0.20.2",
+        "@esbuild/sunos-x64": "0.20.2",
+        "@esbuild/win32-arm64": "0.20.2",
+        "@esbuild/win32-ia32": "0.20.2",
+        "@esbuild/win32-x64": "0.20.2"
       }
     },
-    "node_modules/jest-environment-jsdom/node_modules/whatwg-encoding": {
-      "version": "2.0.0",
+    "node_modules/esbuild-plugin-alias": {
+      "version": "0.2.1",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/esbuild-register": {
+      "version": "3.5.0",
+      "dev": true,
       "license": "MIT",
       "dependencies": {
-        "iconv-lite": "0.6.3"
+        "debug": "^4.3.4"
       },
-      "engines": {
-        "node": ">=12"
+      "peerDependencies": {
+        "esbuild": ">=0.12 <1"
       }
     },
-    "node_modules/jest-environment-jsdom/node_modules/whatwg-mimetype": {
-      "version": "3.0.0",
+    "node_modules/escalade": {
+      "version": "3.1.1",
       "license": "MIT",
       "engines": {
-        "node": ">=12"
+        "node": ">=6"
       }
     },
-    "node_modules/jest-environment-jsdom/node_modules/whatwg-url": {
-      "version": "11.0.0",
-      "license": "MIT",
-      "dependencies": {
-        "tr46": "^3.0.0",
-        "webidl-conversions": "^7.0.0"
-      },
-      "engines": {
-        "node": ">=12"
-      }
+    "node_modules/escape-html": {
+      "version": "1.0.3",
+      "license": "MIT"
     },
-    "node_modules/jest-environment-jsdom/node_modules/xml-name-validator": {
-      "version": "4.0.0",
-      "license": "Apache-2.0",
-      "engines": {
-        "node": ">=12"
-      }
+    "node_modules/escape-latex": {
+      "version": "1.2.0",
+      "dev": true,
+      "license": "MIT"
     },
-    "node_modules/jest-environment-node": {
-      "version": "29.7.0",
+    "node_modules/escape-string-regexp": {
+      "version": "4.0.0",
       "license": "MIT",
-      "dependencies": {
-        "@jest/environment": "^29.7.0",
-        "@jest/fake-timers": "^29.7.0",
-        "@jest/types": "^29.6.3",
-        "@types/node": "*",
-        "jest-mock": "^29.7.0",
-        "jest-util": "^29.7.0"
-      },
       "engines": {
-        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/jest-environment-node/node_modules/@jest/types": {
-      "version": "29.6.3",
-      "license": "MIT",
+    "node_modules/escodegen": {
+      "version": "2.1.0",
+      "license": "BSD-2-Clause",
       "dependencies": {
-        "@jest/schemas": "^29.6.3",
-        "@types/istanbul-lib-coverage": "^2.0.0",
-        "@types/istanbul-reports": "^3.0.0",
-        "@types/node": "*",
-        "@types/yargs": "^17.0.8",
-        "chalk": "^4.0.0"
+        "esprima": "^4.0.1",
+        "estraverse": "^5.2.0",
+        "esutils": "^2.0.2"
+      },
+      "bin": {
+        "escodegen": "bin/escodegen.js",
+        "esgenerate": "bin/esgenerate.js"
       },
       "engines": {
-        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+        "node": ">=6.0"
+      },
+      "optionalDependencies": {
+        "source-map": "~0.6.1"
       }
     },
-    "node_modules/jest-environment-node/node_modules/@types/yargs": {
-      "version": "17.0.31",
-      "license": "MIT",
-      "dependencies": {
-        "@types/yargs-parser": "*"
+    "node_modules/escodegen/node_modules/source-map": {
+      "version": "0.6.1",
+      "license": "BSD-3-Clause",
+      "optional": true,
+      "engines": {
+        "node": ">=0.10.0"
       }
     },
-    "node_modules/jest-environment-node/node_modules/ansi-styles": {
-      "version": "4.3.0",
+    "node_modules/eslint": {
+      "version": "8.57.0",
+      "dev": true,
       "license": "MIT",
       "dependencies": {
-        "color-convert": "^2.0.1"
+        "@eslint-community/eslint-utils": "^4.2.0",
+        "@eslint-community/regexpp": "^4.6.1",
+        "@eslint/eslintrc": "^2.1.4",
+        "@eslint/js": "8.57.0",
+        "@humanwhocodes/config-array": "^0.11.14",
+        "@humanwhocodes/module-importer": "^1.0.1",
+        "@nodelib/fs.walk": "^1.2.8",
+        "@ungap/structured-clone": "^1.2.0",
+        "ajv": "^6.12.4",
+        "chalk": "^4.0.0",
+        "cross-spawn": "^7.0.2",
+        "debug": "^4.3.2",
+        "doctrine": "^3.0.0",
+        "escape-string-regexp": "^4.0.0",
+        "eslint-scope": "^7.2.2",
+        "eslint-visitor-keys": "^3.4.3",
+        "espree": "^9.6.1",
+        "esquery": "^1.4.2",
+        "esutils": "^2.0.2",
+        "fast-deep-equal": "^3.1.3",
+        "file-entry-cache": "^6.0.1",
+        "find-up": "^5.0.0",
+        "glob-parent": "^6.0.2",
+        "globals": "^13.19.0",
+        "graphemer": "^1.4.0",
+        "ignore": "^5.2.0",
+        "imurmurhash": "^0.1.4",
+        "is-glob": "^4.0.0",
+        "is-path-inside": "^3.0.3",
+        "js-yaml": "^4.1.0",
+        "json-stable-stringify-without-jsonify": "^1.0.1",
+        "levn": "^0.4.1",
+        "lodash.merge": "^4.6.2",
+        "minimatch": "^3.1.2",
+        "natural-compare": "^1.4.0",
+        "optionator": "^0.9.3",
+        "strip-ansi": "^6.0.1",
+        "text-table": "^0.2.0"
+      },
+      "bin": {
+        "eslint": "bin/eslint.js"
       },
       "engines": {
-        "node": ">=8"
+        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
       },
       "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
+        "url": "https://opencollective.com/eslint"
       }
     },
-    "node_modules/jest-environment-node/node_modules/chalk": {
-      "version": "4.1.2",
+    "node_modules/eslint-config-airbnb": {
+      "version": "19.0.4",
+      "dev": true,
       "license": "MIT",
       "dependencies": {
-        "ansi-styles": "^4.1.0",
-        "supports-color": "^7.1.0"
+        "eslint-config-airbnb-base": "^15.0.0",
+        "object.assign": "^4.1.2",
+        "object.entries": "^1.1.5"
       },
       "engines": {
-        "node": ">=10"
+        "node": "^10.12.0 || ^12.22.0 || ^14.17.0 || >=16.0.0"
       },
-      "funding": {
-        "url": "https://github.com/chalk/chalk?sponsor=1"
+      "peerDependencies": {
+        "eslint": "^7.32.0 || ^8.2.0",
+        "eslint-plugin-import": "^2.25.3",
+        "eslint-plugin-jsx-a11y": "^6.5.1",
+        "eslint-plugin-react": "^7.28.0",
+        "eslint-plugin-react-hooks": "^4.3.0"
       }
     },
-    "node_modules/jest-environment-node/node_modules/color-convert": {
-      "version": "2.0.1",
+    "node_modules/eslint-config-airbnb-base": {
+      "version": "15.0.0",
+      "dev": true,
       "license": "MIT",
       "dependencies": {
-        "color-name": "~1.1.4"
+        "confusing-browser-globals": "^1.0.10",
+        "object.assign": "^4.1.2",
+        "object.entries": "^1.1.5",
+        "semver": "^6.3.0"
       },
       "engines": {
-        "node": ">=7.0.0"
-      }
-    },
-    "node_modules/jest-environment-node/node_modules/color-name": {
-      "version": "1.1.4",
-      "license": "MIT"
-    },
-    "node_modules/jest-environment-node/node_modules/has-flag": {
-      "version": "4.0.0",
-      "license": "MIT",
-      "engines": {
-        "node": ">=8"
+        "node": "^10.12.0 || >=12.0.0"
+      },
+      "peerDependencies": {
+        "eslint": "^7.32.0 || ^8.2.0",
+        "eslint-plugin-import": "^2.25.2"
       }
     },
-    "node_modules/jest-environment-node/node_modules/supports-color": {
-      "version": "7.2.0",
-      "license": "MIT",
-      "dependencies": {
-        "has-flag": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=8"
+    "node_modules/eslint-config-airbnb-base/node_modules/semver": {
+      "version": "6.3.1",
+      "dev": true,
+      "license": "ISC",
+      "bin": {
+        "semver": "bin/semver.js"
       }
     },
-    "node_modules/jest-expo": {
-      "version": "50.0.1",
+    "node_modules/eslint-config-airbnb-typescript": {
+      "version": "18.0.0",
+      "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@expo/config": "~8.5.0",
-        "@expo/json-file": "^8.2.37",
-        "@jest/create-cache-key-function": "^29.2.1",
-        "babel-jest": "^29.2.1",
-        "find-up": "^5.0.0",
-        "jest-environment-jsdom": "^29.2.1",
-        "jest-watch-select-projects": "^2.0.0",
-        "jest-watch-typeahead": "2.2.1",
-        "json5": "^2.2.3",
-        "lodash": "^4.17.19",
-        "react-test-renderer": "18.2.0",
-        "stacktrace-js": "^2.0.2"
+        "eslint-config-airbnb-base": "^15.0.0"
       },
-      "bin": {
-        "jest": "bin/jest.js"
+      "peerDependencies": {
+        "@typescript-eslint/eslint-plugin": "^7.0.0",
+        "@typescript-eslint/parser": "^7.0.0",
+        "eslint": "^8.56.0"
       }
     },
-    "node_modules/jest-expo/node_modules/@babel/code-frame": {
-      "version": "7.10.4",
-      "license": "MIT",
+    "node_modules/eslint-config-expensify": {
+      "version": "2.0.58",
+      "resolved": "https://registry.npmjs.org/eslint-config-expensify/-/eslint-config-expensify-2.0.58.tgz",
+      "integrity": "sha512-iLDJeXwMYLcBRDnInVReHWjMUsNrHMnWfyoQbvuDTChcJANc+QzuDU0gdsDpBx2xjxVF0vckwEXnzmWcUW1Bpw==",
+      "dev": true,
       "dependencies": {
-        "@babel/highlight": "^7.10.4"
+        "@lwc/eslint-plugin-lwc": "^1.7.2",
+        "@typescript-eslint/parser": "^7.12.0",
+        "@typescript-eslint/rule-tester": "^7.16.1",
+        "@typescript-eslint/utils": "^7.12.0",
+        "babel-eslint": "^10.1.0",
+        "eslint": "^8.56.0",
+        "eslint-config-airbnb": "19.0.4",
+        "eslint-config-airbnb-base": "15.0.0",
+        "eslint-plugin-es": "^4.1.0",
+        "eslint-plugin-import": "^2.25.2",
+        "eslint-plugin-jsx-a11y": "^6.2.3",
+        "eslint-plugin-react": "^7.18.0",
+        "eslint-plugin-react-hooks": "^4.6.0",
+        "eslint-plugin-rulesdir": "^0.2.2",
+        "lodash": "^4.17.21",
+        "underscore": "^1.13.6"
       }
     },
-    "node_modules/jest-expo/node_modules/@expo/json-file": {
-      "version": "8.2.37",
+    "node_modules/eslint-config-expensify/node_modules/@typescript-eslint/scope-manager": {
+      "version": "7.12.0",
+      "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/code-frame": "~7.10.4",
-        "json5": "^2.2.2",
-        "write-file-atomic": "^2.3.0"
+        "@typescript-eslint/types": "7.12.0",
+        "@typescript-eslint/visitor-keys": "7.12.0"
+      },
+      "engines": {
+        "node": "^18.18.0 || >=20.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
       }
     },
-    "node_modules/jest-get-type": {
-      "version": "29.6.3",
+    "node_modules/eslint-config-expensify/node_modules/@typescript-eslint/types": {
+      "version": "7.12.0",
+      "dev": true,
       "license": "MIT",
       "engines": {
-        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+        "node": "^18.18.0 || >=20.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
       }
     },
-    "node_modules/jest-haste-map": {
-      "version": "29.6.2",
-      "license": "MIT",
+    "node_modules/eslint-config-expensify/node_modules/@typescript-eslint/typescript-estree": {
+      "version": "7.12.0",
+      "dev": true,
+      "license": "BSD-2-Clause",
       "dependencies": {
-        "@jest/types": "^29.6.1",
-        "@types/graceful-fs": "^4.1.3",
-        "@types/node": "*",
-        "anymatch": "^3.0.3",
-        "fb-watchman": "^2.0.0",
-        "graceful-fs": "^4.2.9",
-        "jest-regex-util": "^29.4.3",
-        "jest-util": "^29.6.2",
-        "jest-worker": "^29.6.2",
-        "micromatch": "^4.0.4",
-        "walker": "^1.0.8"
+        "@typescript-eslint/types": "7.12.0",
+        "@typescript-eslint/visitor-keys": "7.12.0",
+        "debug": "^4.3.4",
+        "globby": "^11.1.0",
+        "is-glob": "^4.0.3",
+        "minimatch": "^9.0.4",
+        "semver": "^7.6.0",
+        "ts-api-utils": "^1.3.0"
       },
       "engines": {
-        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+        "node": "^18.18.0 || >=20.0.0"
       },
-      "optionalDependencies": {
-        "fsevents": "^2.3.2"
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
+      },
+      "peerDependenciesMeta": {
+        "typescript": {
+          "optional": true
+        }
       }
     },
-    "node_modules/jest-haste-map/node_modules/@jest/types": {
-      "version": "29.6.3",
-      "license": "MIT",
+    "node_modules/eslint-config-expensify/node_modules/@typescript-eslint/typescript-estree/node_modules/minimatch": {
+      "version": "9.0.4",
+      "dev": true,
+      "license": "ISC",
       "dependencies": {
-        "@jest/schemas": "^29.6.3",
-        "@types/istanbul-lib-coverage": "^2.0.0",
-        "@types/istanbul-reports": "^3.0.0",
-        "@types/node": "*",
-        "@types/yargs": "^17.0.8",
-        "chalk": "^4.0.0"
+        "brace-expansion": "^2.0.1"
       },
       "engines": {
-        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
-      }
-    },
-    "node_modules/jest-haste-map/node_modules/@types/yargs": {
-      "version": "17.0.24",
-      "license": "MIT",
-      "dependencies": {
-        "@types/yargs-parser": "*"
+        "node": ">=16 || 14 >=14.17"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
       }
     },
-    "node_modules/jest-haste-map/node_modules/ansi-styles": {
-      "version": "4.3.0",
+    "node_modules/eslint-config-expensify/node_modules/@typescript-eslint/utils": {
+      "version": "7.12.0",
+      "dev": true,
       "license": "MIT",
       "dependencies": {
-        "color-convert": "^2.0.1"
+        "@eslint-community/eslint-utils": "^4.4.0",
+        "@typescript-eslint/scope-manager": "7.12.0",
+        "@typescript-eslint/types": "7.12.0",
+        "@typescript-eslint/typescript-estree": "7.12.0"
       },
       "engines": {
-        "node": ">=8"
+        "node": "^18.18.0 || >=20.0.0"
       },
       "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
+      },
+      "peerDependencies": {
+        "eslint": "^8.56.0"
       }
     },
-    "node_modules/jest-haste-map/node_modules/chalk": {
-      "version": "4.1.2",
+    "node_modules/eslint-config-expensify/node_modules/@typescript-eslint/visitor-keys": {
+      "version": "7.12.0",
+      "dev": true,
       "license": "MIT",
       "dependencies": {
-        "ansi-styles": "^4.1.0",
-        "supports-color": "^7.1.0"
+        "@typescript-eslint/types": "7.12.0",
+        "eslint-visitor-keys": "^3.4.3"
       },
       "engines": {
-        "node": ">=10"
+        "node": "^18.18.0 || >=20.0.0"
       },
       "funding": {
-        "url": "https://github.com/chalk/chalk?sponsor=1"
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
       }
     },
-    "node_modules/jest-haste-map/node_modules/color-convert": {
+    "node_modules/eslint-config-expensify/node_modules/brace-expansion": {
       "version": "2.0.1",
+      "dev": true,
       "license": "MIT",
       "dependencies": {
-        "color-name": "~1.1.4"
-      },
-      "engines": {
-        "node": ">=7.0.0"
+        "balanced-match": "^1.0.0"
       }
     },
-    "node_modules/jest-haste-map/node_modules/color-name": {
-      "version": "1.1.4",
-      "license": "MIT"
-    },
-    "node_modules/jest-haste-map/node_modules/has-flag": {
-      "version": "4.0.0",
-      "license": "MIT",
+    "node_modules/eslint-config-expensify/node_modules/eslint-visitor-keys": {
+      "version": "3.4.3",
+      "dev": true,
+      "license": "Apache-2.0",
       "engines": {
-        "node": ">=8"
+        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+      },
+      "funding": {
+        "url": "https://opencollective.com/eslint"
       }
     },
-    "node_modules/jest-haste-map/node_modules/jest-worker": {
-      "version": "29.6.4",
+    "node_modules/eslint-config-prettier": {
+      "version": "9.1.0",
+      "dev": true,
       "license": "MIT",
-      "dependencies": {
-        "@types/node": "*",
-        "jest-util": "^29.6.3",
-        "merge-stream": "^2.0.0",
-        "supports-color": "^8.0.0"
+      "bin": {
+        "eslint-config-prettier": "bin/cli.js"
       },
-      "engines": {
-        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+      "peerDependencies": {
+        "eslint": ">=7.0.0"
       }
     },
-    "node_modules/jest-haste-map/node_modules/jest-worker/node_modules/supports-color": {
-      "version": "8.1.1",
+    "node_modules/eslint-import-resolver-node": {
+      "version": "0.3.9",
+      "dev": true,
       "license": "MIT",
       "dependencies": {
-        "has-flag": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/supports-color?sponsor=1"
+        "debug": "^3.2.7",
+        "is-core-module": "^2.13.0",
+        "resolve": "^1.22.4"
       }
     },
-    "node_modules/jest-haste-map/node_modules/supports-color": {
-      "version": "7.2.0",
+    "node_modules/eslint-import-resolver-node/node_modules/debug": {
+      "version": "3.2.7",
+      "dev": true,
       "license": "MIT",
       "dependencies": {
-        "has-flag": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=8"
+        "ms": "^2.1.1"
       }
     },
-    "node_modules/jest-leak-detector": {
-      "version": "29.4.1",
+    "node_modules/eslint-module-utils": {
+      "version": "2.8.0",
+      "dev": true,
       "license": "MIT",
       "dependencies": {
-        "jest-get-type": "^29.2.0",
-        "pretty-format": "^29.4.1"
+        "debug": "^3.2.7"
       },
       "engines": {
-        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+        "node": ">=4"
+      },
+      "peerDependenciesMeta": {
+        "eslint": {
+          "optional": true
+        }
       }
     },
-    "node_modules/jest-matcher-utils": {
-      "version": "29.6.2",
+    "node_modules/eslint-module-utils/node_modules/debug": {
+      "version": "3.2.7",
+      "dev": true,
       "license": "MIT",
       "dependencies": {
-        "chalk": "^4.0.0",
-        "jest-diff": "^29.6.2",
-        "jest-get-type": "^29.4.3",
-        "pretty-format": "^29.6.2"
-      },
-      "engines": {
-        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+        "ms": "^2.1.1"
       }
     },
-    "node_modules/jest-matcher-utils/node_modules/ansi-styles": {
-      "version": "4.3.0",
+    "node_modules/eslint-plugin-es": {
+      "version": "4.1.0",
+      "dev": true,
       "license": "MIT",
       "dependencies": {
-        "color-convert": "^2.0.1"
+        "eslint-utils": "^2.0.0",
+        "regexpp": "^3.0.0"
       },
       "engines": {
-        "node": ">=8"
+        "node": ">=8.10.0"
       },
       "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
+        "url": "https://github.com/sponsors/mysticatea"
+      },
+      "peerDependencies": {
+        "eslint": ">=4.19.1"
       }
     },
-    "node_modules/jest-matcher-utils/node_modules/chalk": {
-      "version": "4.1.2",
+    "node_modules/eslint-plugin-es/node_modules/eslint-utils": {
+      "version": "2.1.0",
+      "dev": true,
       "license": "MIT",
       "dependencies": {
-        "ansi-styles": "^4.1.0",
-        "supports-color": "^7.1.0"
+        "eslint-visitor-keys": "^1.1.0"
       },
       "engines": {
-        "node": ">=10"
+        "node": ">=6"
       },
       "funding": {
-        "url": "https://github.com/chalk/chalk?sponsor=1"
+        "url": "https://github.com/sponsors/mysticatea"
       }
     },
-    "node_modules/jest-matcher-utils/node_modules/color-convert": {
-      "version": "2.0.1",
-      "license": "MIT",
-      "dependencies": {
-        "color-name": "~1.1.4"
-      },
+    "node_modules/eslint-plugin-es/node_modules/eslint-visitor-keys": {
+      "version": "1.3.0",
+      "dev": true,
+      "license": "Apache-2.0",
       "engines": {
-        "node": ">=7.0.0"
+        "node": ">=4"
       }
     },
-    "node_modules/jest-matcher-utils/node_modules/color-name": {
-      "version": "1.1.4",
-      "license": "MIT"
-    },
-    "node_modules/jest-matcher-utils/node_modules/has-flag": {
-      "version": "4.0.0",
+    "node_modules/eslint-plugin-eslint-comments": {
+      "version": "3.2.0",
+      "dev": true,
       "license": "MIT",
+      "dependencies": {
+        "escape-string-regexp": "^1.0.5",
+        "ignore": "^5.0.5"
+      },
       "engines": {
-        "node": ">=8"
+        "node": ">=6.5.0"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/mysticatea"
+      },
+      "peerDependencies": {
+        "eslint": ">=4.19.1"
       }
     },
-    "node_modules/jest-matcher-utils/node_modules/supports-color": {
-      "version": "7.2.0",
+    "node_modules/eslint-plugin-eslint-comments/node_modules/escape-string-regexp": {
+      "version": "1.0.5",
+      "dev": true,
       "license": "MIT",
-      "dependencies": {
-        "has-flag": "^4.0.0"
-      },
       "engines": {
-        "node": ">=8"
+        "node": ">=0.8.0"
       }
     },
-    "node_modules/jest-message-util": {
-      "version": "29.7.0",
+    "node_modules/eslint-plugin-ft-flow": {
+      "version": "2.0.3",
+      "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/code-frame": "^7.12.13",
-        "@jest/types": "^29.6.3",
-        "@types/stack-utils": "^2.0.0",
-        "chalk": "^4.0.0",
-        "graceful-fs": "^4.2.9",
-        "micromatch": "^4.0.4",
-        "pretty-format": "^29.7.0",
-        "slash": "^3.0.0",
-        "stack-utils": "^2.0.3"
+        "lodash": "^4.17.21",
+        "string-natural-compare": "^3.0.1"
       },
       "engines": {
-        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+        "node": ">=12.22.0"
+      },
+      "peerDependencies": {
+        "@babel/eslint-parser": "^7.12.0",
+        "eslint": "^8.1.0"
       }
     },
-    "node_modules/jest-message-util/node_modules/@jest/types": {
-      "version": "29.6.3",
+    "node_modules/eslint-plugin-import": {
+      "version": "2.29.1",
+      "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@jest/schemas": "^29.6.3",
-        "@types/istanbul-lib-coverage": "^2.0.0",
-        "@types/istanbul-reports": "^3.0.0",
-        "@types/node": "*",
-        "@types/yargs": "^17.0.8",
-        "chalk": "^4.0.0"
+        "array-includes": "^3.1.7",
+        "array.prototype.findlastindex": "^1.2.3",
+        "array.prototype.flat": "^1.3.2",
+        "array.prototype.flatmap": "^1.3.2",
+        "debug": "^3.2.7",
+        "doctrine": "^2.1.0",
+        "eslint-import-resolver-node": "^0.3.9",
+        "eslint-module-utils": "^2.8.0",
+        "hasown": "^2.0.0",
+        "is-core-module": "^2.13.1",
+        "is-glob": "^4.0.3",
+        "minimatch": "^3.1.2",
+        "object.fromentries": "^2.0.7",
+        "object.groupby": "^1.0.1",
+        "object.values": "^1.1.7",
+        "semver": "^6.3.1",
+        "tsconfig-paths": "^3.15.0"
       },
       "engines": {
-        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+        "node": ">=4"
+      },
+      "peerDependencies": {
+        "eslint": "^2 || ^3 || ^4 || ^5 || ^6 || ^7.2.0 || ^8"
       }
     },
-    "node_modules/jest-message-util/node_modules/@types/yargs": {
-      "version": "17.0.24",
+    "node_modules/eslint-plugin-import/node_modules/debug": {
+      "version": "3.2.7",
+      "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@types/yargs-parser": "*"
+        "ms": "^2.1.1"
       }
     },
-    "node_modules/jest-message-util/node_modules/ansi-styles": {
-      "version": "4.3.0",
-      "license": "MIT",
+    "node_modules/eslint-plugin-import/node_modules/doctrine": {
+      "version": "2.1.0",
+      "dev": true,
+      "license": "Apache-2.0",
       "dependencies": {
-        "color-convert": "^2.0.1"
+        "esutils": "^2.0.2"
       },
       "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
+        "node": ">=0.10.0"
       }
     },
-    "node_modules/jest-message-util/node_modules/chalk": {
-      "version": "4.1.2",
+    "node_modules/eslint-plugin-import/node_modules/json5": {
+      "version": "1.0.2",
+      "dev": true,
       "license": "MIT",
       "dependencies": {
-        "ansi-styles": "^4.1.0",
-        "supports-color": "^7.1.0"
-      },
-      "engines": {
-        "node": ">=10"
+        "minimist": "^1.2.0"
       },
-      "funding": {
-        "url": "https://github.com/chalk/chalk?sponsor=1"
+      "bin": {
+        "json5": "lib/cli.js"
       }
     },
-    "node_modules/jest-message-util/node_modules/color-convert": {
-      "version": "2.0.1",
-      "license": "MIT",
-      "dependencies": {
-        "color-name": "~1.1.4"
-      },
-      "engines": {
-        "node": ">=7.0.0"
+    "node_modules/eslint-plugin-import/node_modules/semver": {
+      "version": "6.3.1",
+      "dev": true,
+      "license": "ISC",
+      "bin": {
+        "semver": "bin/semver.js"
       }
     },
-    "node_modules/jest-message-util/node_modules/color-name": {
-      "version": "1.1.4",
-      "license": "MIT"
-    },
-    "node_modules/jest-message-util/node_modules/has-flag": {
-      "version": "4.0.0",
+    "node_modules/eslint-plugin-import/node_modules/strip-bom": {
+      "version": "3.0.0",
+      "dev": true,
       "license": "MIT",
       "engines": {
-        "node": ">=8"
+        "node": ">=4"
       }
     },
-    "node_modules/jest-message-util/node_modules/supports-color": {
-      "version": "7.2.0",
+    "node_modules/eslint-plugin-import/node_modules/tsconfig-paths": {
+      "version": "3.15.0",
+      "dev": true,
       "license": "MIT",
       "dependencies": {
-        "has-flag": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=8"
+        "@types/json5": "^0.0.29",
+        "json5": "^1.0.2",
+        "minimist": "^1.2.6",
+        "strip-bom": "^3.0.0"
       }
     },
-    "node_modules/jest-mock": {
-      "version": "29.7.0",
+    "node_modules/eslint-plugin-jest": {
+      "version": "28.6.0",
+      "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@jest/types": "^29.6.3",
-        "@types/node": "*",
-        "jest-util": "^29.7.0"
+        "@typescript-eslint/utils": "^6.0.0 || ^7.0.0"
       },
       "engines": {
-        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+        "node": "^16.10.0 || ^18.12.0 || >=20.0.0"
+      },
+      "peerDependencies": {
+        "@typescript-eslint/eslint-plugin": "^6.0.0 || ^7.0.0",
+        "eslint": "^7.0.0 || ^8.0.0 || ^9.0.0",
+        "jest": "*"
+      },
+      "peerDependenciesMeta": {
+        "@typescript-eslint/eslint-plugin": {
+          "optional": true
+        },
+        "jest": {
+          "optional": true
+        }
       }
     },
-    "node_modules/jest-mock/node_modules/@jest/types": {
-      "version": "29.6.3",
+    "node_modules/eslint-plugin-jest/node_modules/@typescript-eslint/utils": {
+      "version": "7.13.1",
+      "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@jest/schemas": "^29.6.3",
-        "@types/istanbul-lib-coverage": "^2.0.0",
-        "@types/istanbul-reports": "^3.0.0",
-        "@types/node": "*",
-        "@types/yargs": "^17.0.8",
-        "chalk": "^4.0.0"
+        "@eslint-community/eslint-utils": "^4.4.0",
+        "@typescript-eslint/scope-manager": "7.13.1",
+        "@typescript-eslint/types": "7.13.1",
+        "@typescript-eslint/typescript-estree": "7.13.1"
       },
       "engines": {
-        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
-      }
-    },
-    "node_modules/jest-mock/node_modules/@types/yargs": {
-      "version": "17.0.24",
-      "license": "MIT",
-      "dependencies": {
-        "@types/yargs-parser": "*"
+        "node": "^18.18.0 || >=20.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
+      },
+      "peerDependencies": {
+        "eslint": "^8.56.0"
       }
     },
-    "node_modules/jest-mock/node_modules/ansi-styles": {
-      "version": "4.3.0",
-      "license": "MIT",
+    "node_modules/eslint-plugin-jsdoc": {
+      "version": "46.2.6",
+      "dev": true,
+      "license": "BSD-3-Clause",
       "dependencies": {
-        "color-convert": "^2.0.1"
+        "@es-joy/jsdoccomment": "~0.39.4",
+        "are-docs-informative": "^0.0.2",
+        "comment-parser": "1.3.1",
+        "debug": "^4.3.4",
+        "escape-string-regexp": "^4.0.0",
+        "esquery": "^1.5.0",
+        "is-builtin-module": "^3.2.1",
+        "semver": "^7.5.1",
+        "spdx-expression-parse": "^3.0.1"
       },
       "engines": {
-        "node": ">=8"
+        "node": ">=16"
       },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
+      "peerDependencies": {
+        "eslint": "^7.0.0 || ^8.0.0"
       }
     },
-    "node_modules/jest-mock/node_modules/chalk": {
-      "version": "4.1.2",
+    "node_modules/eslint-plugin-jsx-a11y": {
+      "version": "6.7.1",
+      "dev": true,
       "license": "MIT",
       "dependencies": {
-        "ansi-styles": "^4.1.0",
-        "supports-color": "^7.1.0"
+        "@babel/runtime": "^7.20.7",
+        "aria-query": "^5.1.3",
+        "array-includes": "^3.1.6",
+        "array.prototype.flatmap": "^1.3.1",
+        "ast-types-flow": "^0.0.7",
+        "axe-core": "^4.6.2",
+        "axobject-query": "^3.1.1",
+        "damerau-levenshtein": "^1.0.8",
+        "emoji-regex": "^9.2.2",
+        "has": "^1.0.3",
+        "jsx-ast-utils": "^3.3.3",
+        "language-tags": "=1.0.5",
+        "minimatch": "^3.1.2",
+        "object.entries": "^1.1.6",
+        "object.fromentries": "^2.0.6",
+        "semver": "^6.3.0"
       },
       "engines": {
-        "node": ">=10"
+        "node": ">=4.0"
       },
-      "funding": {
-        "url": "https://github.com/chalk/chalk?sponsor=1"
+      "peerDependencies": {
+        "eslint": "^3 || ^4 || ^5 || ^6 || ^7 || ^8"
       }
     },
-    "node_modules/jest-mock/node_modules/color-convert": {
-      "version": "2.0.1",
-      "license": "MIT",
+    "node_modules/eslint-plugin-jsx-a11y/node_modules/axobject-query": {
+      "version": "3.2.1",
+      "dev": true,
+      "license": "Apache-2.0",
       "dependencies": {
-        "color-name": "~1.1.4"
-      },
-      "engines": {
-        "node": ">=7.0.0"
+        "dequal": "^2.0.3"
       }
     },
-    "node_modules/jest-mock/node_modules/color-name": {
-      "version": "1.1.4",
+    "node_modules/eslint-plugin-jsx-a11y/node_modules/emoji-regex": {
+      "version": "9.2.2",
+      "dev": true,
       "license": "MIT"
     },
-    "node_modules/jest-mock/node_modules/has-flag": {
-      "version": "4.0.0",
-      "license": "MIT",
-      "engines": {
-        "node": ">=8"
+    "node_modules/eslint-plugin-jsx-a11y/node_modules/semver": {
+      "version": "6.3.1",
+      "dev": true,
+      "license": "ISC",
+      "bin": {
+        "semver": "bin/semver.js"
       }
     },
-    "node_modules/jest-mock/node_modules/supports-color": {
-      "version": "7.2.0",
+    "node_modules/eslint-plugin-prettier": {
+      "version": "4.2.1",
+      "dev": true,
       "license": "MIT",
       "dependencies": {
-        "has-flag": "^4.0.0"
+        "prettier-linter-helpers": "^1.0.0"
       },
       "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/jest-pnp-resolver": {
-      "version": "1.2.3",
-      "license": "MIT",
-      "engines": {
-        "node": ">=6"
+        "node": ">=12.0.0"
       },
       "peerDependencies": {
-        "jest-resolve": "*"
+        "eslint": ">=7.28.0",
+        "prettier": ">=2.0.0"
       },
       "peerDependenciesMeta": {
-        "jest-resolve": {
+        "eslint-config-prettier": {
           "optional": true
         }
       }
     },
-    "node_modules/jest-regex-util": {
-      "version": "29.6.3",
+    "node_modules/eslint-plugin-react": {
+      "version": "7.33.2",
+      "dev": true,
       "license": "MIT",
+      "dependencies": {
+        "array-includes": "^3.1.6",
+        "array.prototype.flatmap": "^1.3.1",
+        "array.prototype.tosorted": "^1.1.1",
+        "doctrine": "^2.1.0",
+        "es-iterator-helpers": "^1.0.12",
+        "estraverse": "^5.3.0",
+        "jsx-ast-utils": "^2.4.1 || ^3.0.0",
+        "minimatch": "^3.1.2",
+        "object.entries": "^1.1.6",
+        "object.fromentries": "^2.0.6",
+        "object.hasown": "^1.1.2",
+        "object.values": "^1.1.6",
+        "prop-types": "^15.8.1",
+        "resolve": "^2.0.0-next.4",
+        "semver": "^6.3.1",
+        "string.prototype.matchall": "^4.0.8"
+      },
       "engines": {
-        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+        "node": ">=4"
+      },
+      "peerDependencies": {
+        "eslint": "^3 || ^4 || ^5 || ^6 || ^7 || ^8"
       }
     },
-    "node_modules/jest-resolve": {
-      "version": "29.4.1",
+    "node_modules/eslint-plugin-react-compiler": {
+      "version": "0.0.0-experimental-9ed098e-20240725",
+      "dev": true,
       "license": "MIT",
       "dependencies": {
-        "chalk": "^4.0.0",
-        "graceful-fs": "^4.2.9",
-        "jest-haste-map": "^29.4.1",
-        "jest-pnp-resolver": "^1.2.2",
-        "jest-util": "^29.4.1",
-        "jest-validate": "^29.4.1",
-        "resolve": "^1.20.0",
-        "resolve.exports": "^2.0.0",
-        "slash": "^3.0.0"
+        "@babel/core": "^7.24.4",
+        "@babel/parser": "^7.24.4",
+        "@babel/plugin-proposal-private-methods": "^7.18.6",
+        "hermes-parser": "^0.20.1",
+        "zod": "^3.22.4",
+        "zod-validation-error": "^3.0.3"
       },
       "engines": {
-        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+        "node": "^14.17.0 || ^16.0.0 || >= 18.0.0"
+      },
+      "peerDependencies": {
+        "eslint": ">=7"
       }
     },
-    "node_modules/jest-resolve-dependencies": {
-      "version": "29.4.1",
+    "node_modules/eslint-plugin-react-compiler/node_modules/hermes-estree": {
+      "version": "0.20.1",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/eslint-plugin-react-compiler/node_modules/hermes-parser": {
+      "version": "0.20.1",
+      "dev": true,
       "license": "MIT",
       "dependencies": {
-        "jest-regex-util": "^29.2.0",
-        "jest-snapshot": "^29.4.1"
-      },
-      "engines": {
-        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+        "hermes-estree": "0.20.1"
       }
     },
-    "node_modules/jest-resolve/node_modules/ansi-styles": {
-      "version": "4.3.0",
+    "node_modules/eslint-plugin-react-hooks": {
+      "version": "4.6.0",
+      "dev": true,
       "license": "MIT",
-      "dependencies": {
-        "color-convert": "^2.0.1"
-      },
       "engines": {
-        "node": ">=8"
+        "node": ">=10"
       },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
+      "peerDependencies": {
+        "eslint": "^3.0.0 || ^4.0.0 || ^5.0.0 || ^6.0.0 || ^7.0.0 || ^8.0.0-0"
       }
     },
-    "node_modules/jest-resolve/node_modules/chalk": {
-      "version": "4.1.2",
+    "node_modules/eslint-plugin-react-native": {
+      "version": "4.1.0",
+      "dev": true,
       "license": "MIT",
       "dependencies": {
-        "ansi-styles": "^4.1.0",
-        "supports-color": "^7.1.0"
-      },
-      "engines": {
-        "node": ">=10"
+        "eslint-plugin-react-native-globals": "^0.1.1"
       },
-      "funding": {
-        "url": "https://github.com/chalk/chalk?sponsor=1"
+      "peerDependencies": {
+        "eslint": "^3.17.0 || ^4 || ^5 || ^6 || ^7 || ^8"
       }
     },
-    "node_modules/jest-resolve/node_modules/color-convert": {
-      "version": "2.0.1",
+    "node_modules/eslint-plugin-react-native-a11y": {
+      "version": "3.3.0",
+      "dev": true,
       "license": "MIT",
       "dependencies": {
-        "color-name": "~1.1.4"
+        "@babel/runtime": "^7.15.4",
+        "ast-types-flow": "^0.0.7",
+        "jsx-ast-utils": "^3.2.1"
       },
       "engines": {
-        "node": ">=7.0.0"
+        "node": ">=12.0"
+      },
+      "peerDependencies": {
+        "eslint": "^3 || ^4 || ^5 || ^6 || ^7 || ^8"
       }
     },
-    "node_modules/jest-resolve/node_modules/color-name": {
-      "version": "1.1.4",
+    "node_modules/eslint-plugin-react-native-globals": {
+      "version": "0.1.2",
+      "dev": true,
       "license": "MIT"
     },
-    "node_modules/jest-resolve/node_modules/has-flag": {
-      "version": "4.0.0",
-      "license": "MIT",
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/jest-resolve/node_modules/supports-color": {
-      "version": "7.2.0",
-      "license": "MIT",
+    "node_modules/eslint-plugin-react/node_modules/doctrine": {
+      "version": "2.1.0",
+      "dev": true,
+      "license": "Apache-2.0",
       "dependencies": {
-        "has-flag": "^4.0.0"
+        "esutils": "^2.0.2"
       },
       "engines": {
-        "node": ">=8"
+        "node": ">=0.10.0"
       }
     },
-    "node_modules/jest-runner": {
-      "version": "29.4.1",
+    "node_modules/eslint-plugin-react/node_modules/resolve": {
+      "version": "2.0.0-next.4",
+      "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@jest/console": "^29.4.1",
-        "@jest/environment": "^29.4.1",
-        "@jest/test-result": "^29.4.1",
-        "@jest/transform": "^29.4.1",
-        "@jest/types": "^29.4.1",
-        "@types/node": "*",
-        "chalk": "^4.0.0",
-        "emittery": "^0.13.1",
-        "graceful-fs": "^4.2.9",
-        "jest-docblock": "^29.2.0",
-        "jest-environment-node": "^29.4.1",
-        "jest-haste-map": "^29.4.1",
-        "jest-leak-detector": "^29.4.1",
-        "jest-message-util": "^29.4.1",
-        "jest-resolve": "^29.4.1",
-        "jest-runtime": "^29.4.1",
-        "jest-util": "^29.4.1",
-        "jest-watcher": "^29.4.1",
-        "jest-worker": "^29.4.1",
-        "p-limit": "^3.1.0",
-        "source-map-support": "0.5.13"
+        "is-core-module": "^2.9.0",
+        "path-parse": "^1.0.7",
+        "supports-preserve-symlinks-flag": "^1.0.0"
       },
-      "engines": {
-        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
-      }
-    },
-    "node_modules/jest-runner/node_modules/@jest/types": {
-      "version": "29.6.3",
-      "license": "MIT",
-      "dependencies": {
-        "@jest/schemas": "^29.6.3",
-        "@types/istanbul-lib-coverage": "^2.0.0",
-        "@types/istanbul-reports": "^3.0.0",
-        "@types/node": "*",
-        "@types/yargs": "^17.0.8",
-        "chalk": "^4.0.0"
+      "bin": {
+        "resolve": "bin/resolve"
       },
-      "engines": {
-        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/jest-runner/node_modules/@types/yargs": {
-      "version": "17.0.24",
-      "license": "MIT",
-      "dependencies": {
-        "@types/yargs-parser": "*"
+    "node_modules/eslint-plugin-react/node_modules/semver": {
+      "version": "6.3.1",
+      "dev": true,
+      "license": "ISC",
+      "bin": {
+        "semver": "bin/semver.js"
       }
     },
-    "node_modules/jest-runner/node_modules/ansi-styles": {
-      "version": "4.3.0",
+    "node_modules/eslint-plugin-rulesdir": {
+      "version": "0.2.2",
+      "dev": true,
       "license": "MIT",
-      "dependencies": {
-        "color-convert": "^2.0.1"
-      },
       "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
+        "node": ">=4.0.0"
       }
     },
-    "node_modules/jest-runner/node_modules/chalk": {
-      "version": "4.1.2",
+    "node_modules/eslint-plugin-storybook": {
+      "version": "0.8.0",
+      "dev": true,
       "license": "MIT",
       "dependencies": {
-        "ansi-styles": "^4.1.0",
-        "supports-color": "^7.1.0"
+        "@storybook/csf": "^0.0.1",
+        "@typescript-eslint/utils": "^5.62.0",
+        "requireindex": "^1.2.0",
+        "ts-dedent": "^2.2.0"
       },
       "engines": {
-        "node": ">=10"
+        "node": ">= 18"
       },
-      "funding": {
-        "url": "https://github.com/chalk/chalk?sponsor=1"
+      "peerDependencies": {
+        "eslint": ">=6"
       }
     },
-    "node_modules/jest-runner/node_modules/color-convert": {
-      "version": "2.0.1",
+    "node_modules/eslint-plugin-storybook/node_modules/@storybook/csf": {
+      "version": "0.0.1",
+      "dev": true,
       "license": "MIT",
       "dependencies": {
-        "color-name": "~1.1.4"
-      },
-      "engines": {
-        "node": ">=7.0.0"
-      }
-    },
-    "node_modules/jest-runner/node_modules/color-name": {
-      "version": "1.1.4",
-      "license": "MIT"
-    },
-    "node_modules/jest-runner/node_modules/has-flag": {
-      "version": "4.0.0",
-      "license": "MIT",
-      "engines": {
-        "node": ">=8"
+        "lodash": "^4.17.15"
       }
     },
-    "node_modules/jest-runner/node_modules/jest-worker": {
-      "version": "29.6.4",
+    "node_modules/eslint-plugin-testing-library": {
+      "version": "6.2.2",
+      "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@types/node": "*",
-        "jest-util": "^29.6.3",
-        "merge-stream": "^2.0.0",
-        "supports-color": "^8.0.0"
+        "@typescript-eslint/utils": "^5.58.0"
       },
       "engines": {
-        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+        "node": "^12.22.0 || ^14.17.0 || >=16.0.0",
+        "npm": ">=6"
+      },
+      "peerDependencies": {
+        "eslint": "^7.5.0 || ^8.0.0"
       }
     },
-    "node_modules/jest-runner/node_modules/jest-worker/node_modules/supports-color": {
-      "version": "8.1.1",
+    "node_modules/eslint-plugin-you-dont-need-lodash-underscore": {
+      "version": "6.14.0",
+      "dev": true,
       "license": "MIT",
       "dependencies": {
-        "has-flag": "^4.0.0"
+        "kebab-case": "^1.0.0"
       },
       "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/supports-color?sponsor=1"
-      }
-    },
-    "node_modules/jest-runner/node_modules/source-map-support": {
-      "version": "0.5.13",
-      "license": "MIT",
-      "dependencies": {
-        "buffer-from": "^1.0.0",
-        "source-map": "^0.6.0"
+        "node": ">=4.0"
       }
     },
-    "node_modules/jest-runner/node_modules/supports-color": {
-      "version": "7.2.0",
-      "license": "MIT",
+    "node_modules/eslint-scope": {
+      "version": "5.1.1",
+      "license": "BSD-2-Clause",
       "dependencies": {
-        "has-flag": "^4.0.0"
+        "esrecurse": "^4.3.0",
+        "estraverse": "^4.1.1"
       },
       "engines": {
-        "node": ">=8"
+        "node": ">=8.0.0"
       }
     },
-    "node_modules/jest-runtime": {
-      "version": "29.4.1",
-      "license": "MIT",
-      "dependencies": {
-        "@jest/environment": "^29.4.1",
-        "@jest/fake-timers": "^29.4.1",
-        "@jest/globals": "^29.4.1",
-        "@jest/source-map": "^29.2.0",
-        "@jest/test-result": "^29.4.1",
-        "@jest/transform": "^29.4.1",
-        "@jest/types": "^29.4.1",
-        "@types/node": "*",
-        "chalk": "^4.0.0",
-        "cjs-module-lexer": "^1.0.0",
-        "collect-v8-coverage": "^1.0.0",
-        "glob": "^7.1.3",
-        "graceful-fs": "^4.2.9",
-        "jest-haste-map": "^29.4.1",
-        "jest-message-util": "^29.4.1",
-        "jest-mock": "^29.4.1",
-        "jest-regex-util": "^29.2.0",
-        "jest-resolve": "^29.4.1",
-        "jest-snapshot": "^29.4.1",
-        "jest-util": "^29.4.1",
-        "semver": "^7.3.5",
-        "slash": "^3.0.0",
-        "strip-bom": "^4.0.0"
-      },
+    "node_modules/eslint-scope/node_modules/estraverse": {
+      "version": "4.3.0",
+      "license": "BSD-2-Clause",
       "engines": {
-        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+        "node": ">=4.0"
       }
     },
-    "node_modules/jest-runtime/node_modules/@jest/types": {
-      "version": "29.6.3",
-      "license": "MIT",
-      "dependencies": {
-        "@jest/schemas": "^29.6.3",
-        "@types/istanbul-lib-coverage": "^2.0.0",
-        "@types/istanbul-reports": "^3.0.0",
-        "@types/node": "*",
-        "@types/yargs": "^17.0.8",
-        "chalk": "^4.0.0"
-      },
+    "node_modules/eslint-visitor-keys": {
+      "version": "2.1.0",
+      "dev": true,
+      "license": "Apache-2.0",
       "engines": {
-        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+        "node": ">=10"
       }
     },
-    "node_modules/jest-runtime/node_modules/@types/yargs": {
-      "version": "17.0.24",
+    "node_modules/eslint/node_modules/ajv": {
+      "version": "6.12.6",
+      "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@types/yargs-parser": "*"
+        "fast-deep-equal": "^3.1.1",
+        "fast-json-stable-stringify": "^2.0.0",
+        "json-schema-traverse": "^0.4.1",
+        "uri-js": "^4.2.2"
+      },
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/epoberezkin"
       }
     },
-    "node_modules/jest-runtime/node_modules/ansi-styles": {
+    "node_modules/eslint/node_modules/ansi-styles": {
       "version": "4.3.0",
+      "dev": true,
       "license": "MIT",
       "dependencies": {
         "color-convert": "^2.0.1"
@@ -25745,8 +25892,14 @@
         "url": "https://github.com/chalk/ansi-styles?sponsor=1"
       }
     },
-    "node_modules/jest-runtime/node_modules/chalk": {
+    "node_modules/eslint/node_modules/argparse": {
+      "version": "2.0.1",
+      "dev": true,
+      "license": "Python-2.0"
+    },
+    "node_modules/eslint/node_modules/chalk": {
       "version": "4.1.2",
+      "dev": true,
       "license": "MIT",
       "dependencies": {
         "ansi-styles": "^4.1.0",
@@ -25759,8 +25912,9 @@
         "url": "https://github.com/chalk/chalk?sponsor=1"
       }
     },
-    "node_modules/jest-runtime/node_modules/color-convert": {
+    "node_modules/eslint/node_modules/color-convert": {
       "version": "2.0.1",
+      "dev": true,
       "license": "MIT",
       "dependencies": {
         "color-name": "~1.1.4"
@@ -25769,593 +25923,562 @@
         "node": ">=7.0.0"
       }
     },
-    "node_modules/jest-runtime/node_modules/color-name": {
+    "node_modules/eslint/node_modules/color-name": {
       "version": "1.1.4",
+      "dev": true,
       "license": "MIT"
     },
-    "node_modules/jest-runtime/node_modules/has-flag": {
-      "version": "4.0.0",
-      "license": "MIT",
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/jest-runtime/node_modules/supports-color": {
-      "version": "7.2.0",
-      "license": "MIT",
-      "dependencies": {
-        "has-flag": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/jest-snapshot": {
-      "version": "29.6.2",
-      "license": "MIT",
+    "node_modules/eslint/node_modules/eslint-scope": {
+      "version": "7.2.2",
+      "dev": true,
+      "license": "BSD-2-Clause",
       "dependencies": {
-        "@babel/core": "^7.11.6",
-        "@babel/generator": "^7.7.2",
-        "@babel/plugin-syntax-jsx": "^7.7.2",
-        "@babel/plugin-syntax-typescript": "^7.7.2",
-        "@babel/types": "^7.3.3",
-        "@jest/expect-utils": "^29.6.2",
-        "@jest/transform": "^29.6.2",
-        "@jest/types": "^29.6.1",
-        "babel-preset-current-node-syntax": "^1.0.0",
-        "chalk": "^4.0.0",
-        "expect": "^29.6.2",
-        "graceful-fs": "^4.2.9",
-        "jest-diff": "^29.6.2",
-        "jest-get-type": "^29.4.3",
-        "jest-matcher-utils": "^29.6.2",
-        "jest-message-util": "^29.6.2",
-        "jest-util": "^29.6.2",
-        "natural-compare": "^1.4.0",
-        "pretty-format": "^29.6.2",
-        "semver": "^7.5.3"
+        "esrecurse": "^4.3.0",
+        "estraverse": "^5.2.0"
       },
       "engines": {
-        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
-      }
-    },
-    "node_modules/jest-snapshot/node_modules/@jest/types": {
-      "version": "29.6.3",
-      "license": "MIT",
-      "dependencies": {
-        "@jest/schemas": "^29.6.3",
-        "@types/istanbul-lib-coverage": "^2.0.0",
-        "@types/istanbul-reports": "^3.0.0",
-        "@types/node": "*",
-        "@types/yargs": "^17.0.8",
-        "chalk": "^4.0.0"
+        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
       },
-      "engines": {
-        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
-      }
-    },
-    "node_modules/jest-snapshot/node_modules/@types/yargs": {
-      "version": "17.0.24",
-      "license": "MIT",
-      "dependencies": {
-        "@types/yargs-parser": "*"
+      "funding": {
+        "url": "https://opencollective.com/eslint"
       }
     },
-    "node_modules/jest-snapshot/node_modules/ansi-styles": {
-      "version": "4.3.0",
-      "license": "MIT",
-      "dependencies": {
-        "color-convert": "^2.0.1"
-      },
+    "node_modules/eslint/node_modules/eslint-visitor-keys": {
+      "version": "3.4.3",
+      "dev": true,
+      "license": "Apache-2.0",
       "engines": {
-        "node": ">=8"
+        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
       },
       "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
+        "url": "https://opencollective.com/eslint"
       }
     },
-    "node_modules/jest-snapshot/node_modules/chalk": {
-      "version": "4.1.2",
-      "license": "MIT",
+    "node_modules/eslint/node_modules/glob-parent": {
+      "version": "6.0.2",
+      "dev": true,
+      "license": "ISC",
       "dependencies": {
-        "ansi-styles": "^4.1.0",
-        "supports-color": "^7.1.0"
+        "is-glob": "^4.0.3"
       },
       "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/chalk?sponsor=1"
+        "node": ">=10.13.0"
       }
     },
-    "node_modules/jest-snapshot/node_modules/color-convert": {
-      "version": "2.0.1",
+    "node_modules/eslint/node_modules/globals": {
+      "version": "13.21.0",
+      "dev": true,
       "license": "MIT",
       "dependencies": {
-        "color-name": "~1.1.4"
+        "type-fest": "^0.20.2"
       },
       "engines": {
-        "node": ">=7.0.0"
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/jest-snapshot/node_modules/color-name": {
-      "version": "1.1.4",
-      "license": "MIT"
-    },
-    "node_modules/jest-snapshot/node_modules/has-flag": {
+    "node_modules/eslint/node_modules/has-flag": {
       "version": "4.0.0",
+      "dev": true,
       "license": "MIT",
       "engines": {
         "node": ">=8"
       }
     },
-    "node_modules/jest-snapshot/node_modules/supports-color": {
-      "version": "7.2.0",
+    "node_modules/eslint/node_modules/is-path-inside": {
+      "version": "3.0.3",
+      "dev": true,
       "license": "MIT",
-      "dependencies": {
-        "has-flag": "^4.0.0"
-      },
       "engines": {
         "node": ">=8"
       }
     },
-    "node_modules/jest-transformer-svg": {
-      "version": "2.0.1",
+    "node_modules/eslint/node_modules/js-yaml": {
+      "version": "4.1.0",
       "dev": true,
       "license": "MIT",
-      "peerDependencies": {
-        "jest": ">= 28.1.0",
-        "react": "^17.0.0 || ^18.0.0"
-      }
-    },
-    "node_modules/jest-util": {
-      "version": "29.7.0",
-      "license": "MIT",
       "dependencies": {
-        "@jest/types": "^29.6.3",
-        "@types/node": "*",
-        "chalk": "^4.0.0",
-        "ci-info": "^3.2.0",
-        "graceful-fs": "^4.2.9",
-        "picomatch": "^2.2.3"
+        "argparse": "^2.0.1"
       },
-      "engines": {
-        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+      "bin": {
+        "js-yaml": "bin/js-yaml.js"
       }
     },
-    "node_modules/jest-util/node_modules/@jest/types": {
-      "version": "29.6.3",
+    "node_modules/eslint/node_modules/json-schema-traverse": {
+      "version": "0.4.1",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/eslint/node_modules/supports-color": {
+      "version": "7.2.0",
+      "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@jest/schemas": "^29.6.3",
-        "@types/istanbul-lib-coverage": "^2.0.0",
-        "@types/istanbul-reports": "^3.0.0",
-        "@types/node": "*",
-        "@types/yargs": "^17.0.8",
-        "chalk": "^4.0.0"
+        "has-flag": "^4.0.0"
       },
       "engines": {
-        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
-      }
-    },
-    "node_modules/jest-util/node_modules/@types/yargs": {
-      "version": "17.0.24",
-      "license": "MIT",
-      "dependencies": {
-        "@types/yargs-parser": "*"
+        "node": ">=8"
       }
     },
-    "node_modules/jest-util/node_modules/ansi-styles": {
-      "version": "4.3.0",
-      "license": "MIT",
-      "dependencies": {
-        "color-convert": "^2.0.1"
-      },
+    "node_modules/eslint/node_modules/type-fest": {
+      "version": "0.20.2",
+      "dev": true,
+      "license": "(MIT OR CC0-1.0)",
       "engines": {
-        "node": ">=8"
+        "node": ">=10"
       },
       "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/jest-util/node_modules/chalk": {
-      "version": "4.1.2",
-      "license": "MIT",
+    "node_modules/espree": {
+      "version": "9.6.1",
+      "dev": true,
+      "license": "BSD-2-Clause",
       "dependencies": {
-        "ansi-styles": "^4.1.0",
-        "supports-color": "^7.1.0"
+        "acorn": "^8.9.0",
+        "acorn-jsx": "^5.3.2",
+        "eslint-visitor-keys": "^3.4.1"
       },
       "engines": {
-        "node": ">=10"
+        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
       },
       "funding": {
-        "url": "https://github.com/chalk/chalk?sponsor=1"
+        "url": "https://opencollective.com/eslint"
       }
     },
-    "node_modules/jest-util/node_modules/color-convert": {
-      "version": "2.0.1",
+    "node_modules/espree/node_modules/acorn": {
+      "version": "8.12.0",
+      "dev": true,
       "license": "MIT",
-      "dependencies": {
-        "color-name": "~1.1.4"
+      "bin": {
+        "acorn": "bin/acorn"
       },
       "engines": {
-        "node": ">=7.0.0"
+        "node": ">=0.4.0"
       }
     },
-    "node_modules/jest-util/node_modules/color-name": {
-      "version": "1.1.4",
-      "license": "MIT"
-    },
-    "node_modules/jest-util/node_modules/has-flag": {
-      "version": "4.0.0",
-      "license": "MIT",
+    "node_modules/espree/node_modules/eslint-visitor-keys": {
+      "version": "3.4.3",
+      "dev": true,
+      "license": "Apache-2.0",
       "engines": {
-        "node": ">=8"
+        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+      },
+      "funding": {
+        "url": "https://opencollective.com/eslint"
       }
     },
-    "node_modules/jest-util/node_modules/supports-color": {
-      "version": "7.2.0",
-      "license": "MIT",
-      "dependencies": {
-        "has-flag": "^4.0.0"
+    "node_modules/esprima": {
+      "version": "4.0.1",
+      "license": "BSD-2-Clause",
+      "bin": {
+        "esparse": "bin/esparse.js",
+        "esvalidate": "bin/esvalidate.js"
       },
       "engines": {
-        "node": ">=8"
+        "node": ">=4"
       }
     },
-    "node_modules/jest-validate": {
-      "version": "29.6.3",
-      "license": "MIT",
+    "node_modules/esquery": {
+      "version": "1.5.0",
+      "dev": true,
+      "license": "BSD-3-Clause",
       "dependencies": {
-        "@jest/types": "^29.6.3",
-        "camelcase": "^6.2.0",
-        "chalk": "^4.0.0",
-        "jest-get-type": "^29.6.3",
-        "leven": "^3.1.0",
-        "pretty-format": "^29.6.3"
+        "estraverse": "^5.1.0"
       },
       "engines": {
-        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+        "node": ">=0.10"
       }
     },
-    "node_modules/jest-validate/node_modules/@jest/types": {
-      "version": "29.6.3",
-      "license": "MIT",
+    "node_modules/esrecurse": {
+      "version": "4.3.0",
+      "license": "BSD-2-Clause",
       "dependencies": {
-        "@jest/schemas": "^29.6.3",
-        "@types/istanbul-lib-coverage": "^2.0.0",
-        "@types/istanbul-reports": "^3.0.0",
-        "@types/node": "*",
-        "@types/yargs": "^17.0.8",
-        "chalk": "^4.0.0"
+        "estraverse": "^5.2.0"
       },
       "engines": {
-        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+        "node": ">=4.0"
       }
     },
-    "node_modules/jest-validate/node_modules/@types/yargs": {
-      "version": "17.0.24",
-      "license": "MIT",
-      "dependencies": {
-        "@types/yargs-parser": "*"
+    "node_modules/estraverse": {
+      "version": "5.3.0",
+      "license": "BSD-2-Clause",
+      "engines": {
+        "node": ">=4.0"
       }
     },
-    "node_modules/jest-validate/node_modules/ansi-styles": {
-      "version": "4.3.0",
-      "license": "MIT",
-      "dependencies": {
-        "color-convert": "^2.0.1"
-      },
+    "node_modules/esutils": {
+      "version": "2.0.3",
+      "license": "BSD-2-Clause",
       "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
+        "node": ">=0.10.0"
       }
     },
-    "node_modules/jest-validate/node_modules/chalk": {
-      "version": "4.1.2",
+    "node_modules/etag": {
+      "version": "1.8.1",
       "license": "MIT",
-      "dependencies": {
-        "ansi-styles": "^4.1.0",
-        "supports-color": "^7.1.0"
-      },
       "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/chalk?sponsor=1"
+        "node": ">= 0.6"
       }
     },
-    "node_modules/jest-validate/node_modules/color-convert": {
-      "version": "2.0.1",
+    "node_modules/event-target-shim": {
+      "version": "5.0.1",
       "license": "MIT",
-      "dependencies": {
-        "color-name": "~1.1.4"
-      },
       "engines": {
-        "node": ">=7.0.0"
+        "node": ">=6"
       }
     },
-    "node_modules/jest-validate/node_modules/color-name": {
-      "version": "1.1.4",
+    "node_modules/eventemitter3": {
+      "version": "4.0.7",
+      "dev": true,
       "license": "MIT"
     },
-    "node_modules/jest-validate/node_modules/has-flag": {
-      "version": "4.0.0",
+    "node_modules/events": {
+      "version": "3.3.0",
       "license": "MIT",
       "engines": {
-        "node": ">=8"
+        "node": ">=0.8.x"
       }
     },
-    "node_modules/jest-validate/node_modules/supports-color": {
-      "version": "7.2.0",
+    "node_modules/evp_bytestokey": {
+      "version": "1.0.3",
       "license": "MIT",
       "dependencies": {
-        "has-flag": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=8"
+        "md5.js": "^1.3.4",
+        "safe-buffer": "^5.1.1"
       }
     },
-    "node_modules/jest-watch-select-projects": {
-      "version": "2.0.0",
-      "license": "MIT",
-      "dependencies": {
-        "ansi-escapes": "^4.3.0",
-        "chalk": "^3.0.0",
-        "prompts": "^2.2.1"
-      }
+    "node_modules/exec-async": {
+      "version": "2.2.0",
+      "license": "MIT"
     },
-    "node_modules/jest-watch-select-projects/node_modules/ansi-styles": {
-      "version": "4.3.0",
+    "node_modules/execa": {
+      "version": "5.1.1",
       "license": "MIT",
       "dependencies": {
-        "color-convert": "^2.0.1"
+        "cross-spawn": "^7.0.3",
+        "get-stream": "^6.0.0",
+        "human-signals": "^2.1.0",
+        "is-stream": "^2.0.0",
+        "merge-stream": "^2.0.0",
+        "npm-run-path": "^4.0.1",
+        "onetime": "^5.1.2",
+        "signal-exit": "^3.0.3",
+        "strip-final-newline": "^2.0.0"
       },
       "engines": {
-        "node": ">=8"
+        "node": ">=10"
       },
       "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
+        "url": "https://github.com/sindresorhus/execa?sponsor=1"
       }
     },
-    "node_modules/jest-watch-select-projects/node_modules/chalk": {
-      "version": "3.0.0",
-      "license": "MIT",
-      "dependencies": {
-        "ansi-styles": "^4.1.0",
-        "supports-color": "^7.1.0"
-      },
+    "node_modules/exit": {
+      "version": "0.1.2",
       "engines": {
-        "node": ">=8"
+        "node": ">= 0.8.0"
       }
     },
-    "node_modules/jest-watch-select-projects/node_modules/color-convert": {
-      "version": "2.0.1",
+    "node_modules/expand-brackets": {
+      "version": "2.1.4",
       "license": "MIT",
+      "optional": true,
       "dependencies": {
-        "color-name": "~1.1.4"
+        "debug": "^2.3.3",
+        "define-property": "^0.2.5",
+        "extend-shallow": "^2.0.1",
+        "posix-character-classes": "^0.1.0",
+        "regex-not": "^1.0.0",
+        "snapdragon": "^0.8.1",
+        "to-regex": "^3.0.1"
       },
       "engines": {
-        "node": ">=7.0.0"
+        "node": ">=0.10.0"
       }
     },
-    "node_modules/jest-watch-select-projects/node_modules/color-name": {
-      "version": "1.1.4",
-      "license": "MIT"
+    "node_modules/expand-brackets/node_modules/debug": {
+      "version": "2.6.9",
+      "license": "MIT",
+      "optional": true,
+      "dependencies": {
+        "ms": "2.0.0"
+      }
     },
-    "node_modules/jest-watch-select-projects/node_modules/has-flag": {
-      "version": "4.0.0",
+    "node_modules/expand-brackets/node_modules/define-property": {
+      "version": "0.2.5",
       "license": "MIT",
+      "optional": true,
+      "dependencies": {
+        "is-descriptor": "^0.1.0"
+      },
       "engines": {
-        "node": ">=8"
+        "node": ">=0.10.0"
       }
     },
-    "node_modules/jest-watch-select-projects/node_modules/supports-color": {
-      "version": "7.2.0",
+    "node_modules/expand-brackets/node_modules/extend-shallow": {
+      "version": "2.0.1",
       "license": "MIT",
+      "optional": true,
       "dependencies": {
-        "has-flag": "^4.0.0"
+        "is-extendable": "^0.1.0"
       },
       "engines": {
-        "node": ">=8"
+        "node": ">=0.10.0"
       }
     },
-    "node_modules/jest-watch-typeahead": {
-      "version": "2.2.1",
+    "node_modules/expand-brackets/node_modules/is-accessor-descriptor": {
+      "version": "0.1.6",
       "license": "MIT",
+      "optional": true,
       "dependencies": {
-        "ansi-escapes": "^6.0.0",
-        "chalk": "^4.0.0",
-        "jest-regex-util": "^29.0.0",
-        "jest-watcher": "^29.0.0",
-        "slash": "^5.0.0",
-        "string-length": "^5.0.1",
-        "strip-ansi": "^7.0.1"
+        "kind-of": "^3.0.2"
       },
       "engines": {
-        "node": "^14.17.0 || ^16.10.0 || >=18.0.0"
-      },
-      "peerDependencies": {
-        "jest": "^27.0.0 || ^28.0.0 || ^29.0.0"
+        "node": ">=0.10.0"
       }
     },
-    "node_modules/jest-watch-typeahead/node_modules/ansi-escapes": {
-      "version": "6.2.0",
+    "node_modules/expand-brackets/node_modules/is-accessor-descriptor/node_modules/kind-of": {
+      "version": "3.2.2",
       "license": "MIT",
+      "optional": true,
       "dependencies": {
-        "type-fest": "^3.0.0"
+        "is-buffer": "^1.1.5"
       },
       "engines": {
-        "node": ">=14.16"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
+        "node": ">=0.10.0"
       }
     },
-    "node_modules/jest-watch-typeahead/node_modules/ansi-regex": {
-      "version": "6.0.1",
+    "node_modules/expand-brackets/node_modules/is-data-descriptor": {
+      "version": "0.1.4",
       "license": "MIT",
-      "engines": {
-        "node": ">=12"
+      "optional": true,
+      "dependencies": {
+        "kind-of": "^3.0.2"
       },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-regex?sponsor=1"
+      "engines": {
+        "node": ">=0.10.0"
       }
     },
-    "node_modules/jest-watch-typeahead/node_modules/ansi-styles": {
-      "version": "4.3.0",
+    "node_modules/expand-brackets/node_modules/is-data-descriptor/node_modules/kind-of": {
+      "version": "3.2.2",
       "license": "MIT",
+      "optional": true,
       "dependencies": {
-        "color-convert": "^2.0.1"
+        "is-buffer": "^1.1.5"
       },
       "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
+        "node": ">=0.10.0"
       }
     },
-    "node_modules/jest-watch-typeahead/node_modules/chalk": {
-      "version": "4.1.2",
+    "node_modules/expand-brackets/node_modules/is-descriptor": {
+      "version": "0.1.6",
       "license": "MIT",
+      "optional": true,
       "dependencies": {
-        "ansi-styles": "^4.1.0",
-        "supports-color": "^7.1.0"
+        "is-accessor-descriptor": "^0.1.6",
+        "is-data-descriptor": "^0.1.4",
+        "kind-of": "^5.0.0"
       },
       "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/chalk?sponsor=1"
+        "node": ">=0.10.0"
       }
     },
-    "node_modules/jest-watch-typeahead/node_modules/char-regex": {
-      "version": "2.0.1",
+    "node_modules/expand-brackets/node_modules/is-extendable": {
+      "version": "0.1.1",
       "license": "MIT",
+      "optional": true,
       "engines": {
-        "node": ">=12.20"
+        "node": ">=0.10.0"
       }
     },
-    "node_modules/jest-watch-typeahead/node_modules/color-convert": {
-      "version": "2.0.1",
+    "node_modules/expand-brackets/node_modules/kind-of": {
+      "version": "5.1.0",
       "license": "MIT",
-      "dependencies": {
-        "color-name": "~1.1.4"
-      },
+      "optional": true,
       "engines": {
-        "node": ">=7.0.0"
+        "node": ">=0.10.0"
       }
     },
-    "node_modules/jest-watch-typeahead/node_modules/color-name": {
-      "version": "1.1.4",
-      "license": "MIT"
+    "node_modules/expand-brackets/node_modules/ms": {
+      "version": "2.0.0",
+      "license": "MIT",
+      "optional": true
     },
-    "node_modules/jest-watch-typeahead/node_modules/has-flag": {
-      "version": "4.0.0",
+    "node_modules/expect": {
+      "version": "29.7.0",
       "license": "MIT",
+      "dependencies": {
+        "@jest/expect-utils": "^29.7.0",
+        "jest-get-type": "^29.6.3",
+        "jest-matcher-utils": "^29.7.0",
+        "jest-message-util": "^29.7.0",
+        "jest-util": "^29.7.0"
+      },
       "engines": {
-        "node": ">=8"
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
       }
     },
-    "node_modules/jest-watch-typeahead/node_modules/slash": {
-      "version": "5.1.0",
+    "node_modules/expensify-common": {
+      "version": "2.0.77",
+      "resolved": "https://registry.npmjs.org/expensify-common/-/expensify-common-2.0.77.tgz",
+      "integrity": "sha512-QMlIKYFIXQQ4bu1dgrUl0PdP+Nx7WgHlYq8nY8p5VhOIAzEt0LABC1xZDHxgDLyEW7skAKu+dDcadATpP1g1hA==",
+      "dependencies": {
+        "awesome-phonenumber": "^5.4.0",
+        "classnames": "2.5.0",
+        "clipboard": "2.0.11",
+        "html-entities": "^2.5.2",
+        "jquery": "3.6.0",
+        "localforage": "^1.10.0",
+        "lodash": "4.17.21",
+        "prop-types": "15.8.1",
+        "react": "16.12.0",
+        "react-dom": "16.12.0",
+        "semver": "^7.6.3",
+        "simply-deferred": "git+https://github.com/Expensify/simply-deferred.git#77a08a95754660c7bd6e0b6979fdf84e8e831bf5",
+        "ua-parser-js": "^1.0.38"
+      }
+    },
+    "node_modules/expensify-common/node_modules/ua-parser-js": {
+      "version": "1.0.38",
+      "funding": [
+        {
+          "type": "opencollective",
+          "url": "https://opencollective.com/ua-parser-js"
+        },
+        {
+          "type": "paypal",
+          "url": "https://paypal.me/faisalman"
+        },
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/faisalman"
+        }
+      ],
       "license": "MIT",
       "engines": {
-        "node": ">=14.16"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
+        "node": "*"
       }
     },
-    "node_modules/jest-watch-typeahead/node_modules/string-length": {
-      "version": "5.0.1",
+    "node_modules/expo": {
+      "version": "51.0.17",
       "license": "MIT",
       "dependencies": {
-        "char-regex": "^2.0.0",
-        "strip-ansi": "^7.0.1"
-      },
-      "engines": {
-        "node": ">=12.20"
+        "@babel/runtime": "^7.20.0",
+        "@expo/cli": "0.18.21",
+        "@expo/config": "9.0.1",
+        "@expo/config-plugins": "8.0.6",
+        "@expo/metro-config": "0.18.8",
+        "@expo/vector-icons": "^14.0.0",
+        "babel-preset-expo": "~11.0.11",
+        "expo-asset": "~10.0.10",
+        "expo-file-system": "~17.0.1",
+        "expo-font": "~12.0.7",
+        "expo-keep-awake": "~13.0.2",
+        "expo-modules-autolinking": "1.11.1",
+        "expo-modules-core": "1.12.18",
+        "fbemitter": "^3.0.0",
+        "whatwg-url-without-unicode": "8.0.0-3"
       },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
+      "bin": {
+        "expo": "bin/cli"
       }
     },
-    "node_modules/jest-watch-typeahead/node_modules/strip-ansi": {
-      "version": "7.1.0",
+    "node_modules/expo-asset": {
+      "version": "10.0.10",
       "license": "MIT",
       "dependencies": {
-        "ansi-regex": "^6.0.1"
-      },
-      "engines": {
-        "node": ">=12"
+        "expo-constants": "~16.0.0",
+        "invariant": "^2.2.4",
+        "md5-file": "^3.2.3"
       },
-      "funding": {
-        "url": "https://github.com/chalk/strip-ansi?sponsor=1"
+      "peerDependencies": {
+        "expo": "*"
       }
     },
-    "node_modules/jest-watch-typeahead/node_modules/supports-color": {
-      "version": "7.2.0",
+    "node_modules/expo-av": {
+      "version": "14.0.6",
+      "license": "MIT",
+      "peerDependencies": {
+        "expo": "*"
+      }
+    },
+    "node_modules/expo-constants": {
+      "version": "16.0.2",
       "license": "MIT",
       "dependencies": {
-        "has-flag": "^4.0.0"
+        "@expo/config": "~9.0.0",
+        "@expo/env": "~0.3.0"
       },
-      "engines": {
-        "node": ">=8"
+      "peerDependencies": {
+        "expo": "*"
       }
     },
-    "node_modules/jest-watch-typeahead/node_modules/type-fest": {
-      "version": "3.13.1",
-      "license": "(MIT OR CC0-1.0)",
-      "engines": {
-        "node": ">=14.16"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
+    "node_modules/expo-file-system": {
+      "version": "17.0.1",
+      "license": "MIT",
+      "peerDependencies": {
+        "expo": "*"
       }
     },
-    "node_modules/jest-watcher": {
-      "version": "29.4.1",
+    "node_modules/expo-font": {
+      "version": "12.0.7",
       "license": "MIT",
       "dependencies": {
-        "@jest/test-result": "^29.4.1",
-        "@jest/types": "^29.4.1",
-        "@types/node": "*",
-        "ansi-escapes": "^4.2.1",
-        "chalk": "^4.0.0",
-        "emittery": "^0.13.1",
-        "jest-util": "^29.4.1",
-        "string-length": "^4.0.1"
+        "fontfaceobserver": "^2.1.0"
       },
-      "engines": {
-        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+      "peerDependencies": {
+        "expo": "*"
       }
     },
-    "node_modules/jest-watcher/node_modules/@jest/types": {
-      "version": "29.6.3",
+    "node_modules/expo-image": {
+      "version": "1.12.12",
+      "license": "MIT",
+      "peerDependencies": {
+        "expo": "*"
+      }
+    },
+    "node_modules/expo-image-loader": {
+      "version": "4.7.0",
+      "license": "MIT",
+      "peerDependencies": {
+        "expo": "*"
+      }
+    },
+    "node_modules/expo-image-manipulator": {
+      "version": "12.0.5",
       "license": "MIT",
       "dependencies": {
-        "@jest/schemas": "^29.6.3",
-        "@types/istanbul-lib-coverage": "^2.0.0",
-        "@types/istanbul-reports": "^3.0.0",
-        "@types/node": "*",
-        "@types/yargs": "^17.0.8",
-        "chalk": "^4.0.0"
+        "expo-image-loader": "~4.7.0"
       },
-      "engines": {
-        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+      "peerDependencies": {
+        "expo": "*"
+      }
+    },
+    "node_modules/expo-keep-awake": {
+      "version": "13.0.2",
+      "license": "MIT",
+      "peerDependencies": {
+        "expo": "*"
       }
     },
-    "node_modules/jest-watcher/node_modules/@types/yargs": {
-      "version": "17.0.24",
+    "node_modules/expo-modules-autolinking": {
+      "version": "1.11.1",
       "license": "MIT",
       "dependencies": {
-        "@types/yargs-parser": "*"
+        "chalk": "^4.1.0",
+        "commander": "^7.2.0",
+        "fast-glob": "^3.2.5",
+        "find-up": "^5.0.0",
+        "fs-extra": "^9.1.0"
+      },
+      "bin": {
+        "expo-modules-autolinking": "bin/expo-modules-autolinking.js"
       }
     },
-    "node_modules/jest-watcher/node_modules/ansi-styles": {
+    "node_modules/expo-modules-autolinking/node_modules/ansi-styles": {
       "version": "4.3.0",
       "license": "MIT",
       "dependencies": {
@@ -26368,7 +26491,7 @@
         "url": "https://github.com/chalk/ansi-styles?sponsor=1"
       }
     },
-    "node_modules/jest-watcher/node_modules/chalk": {
+    "node_modules/expo-modules-autolinking/node_modules/chalk": {
       "version": "4.1.2",
       "license": "MIT",
       "dependencies": {
@@ -26382,7 +26505,7 @@
         "url": "https://github.com/chalk/chalk?sponsor=1"
       }
     },
-    "node_modules/jest-watcher/node_modules/color-convert": {
+    "node_modules/expo-modules-autolinking/node_modules/color-convert": {
       "version": "2.0.1",
       "license": "MIT",
       "dependencies": {
@@ -26392,18 +26515,25 @@
         "node": ">=7.0.0"
       }
     },
-    "node_modules/jest-watcher/node_modules/color-name": {
+    "node_modules/expo-modules-autolinking/node_modules/color-name": {
       "version": "1.1.4",
       "license": "MIT"
     },
-    "node_modules/jest-watcher/node_modules/has-flag": {
+    "node_modules/expo-modules-autolinking/node_modules/commander": {
+      "version": "7.2.0",
+      "license": "MIT",
+      "engines": {
+        "node": ">= 10"
+      }
+    },
+    "node_modules/expo-modules-autolinking/node_modules/has-flag": {
       "version": "4.0.0",
       "license": "MIT",
       "engines": {
         "node": ">=8"
       }
     },
-    "node_modules/jest-watcher/node_modules/supports-color": {
+    "node_modules/expo-modules-autolinking/node_modules/supports-color": {
       "version": "7.2.0",
       "license": "MIT",
       "dependencies": {
@@ -26413,71 +26543,64 @@
         "node": ">=8"
       }
     },
-    "node_modules/jest-when": {
-      "version": "3.5.2",
+    "node_modules/expo-modules-core": {
+      "version": "1.12.18",
       "license": "MIT",
-      "peerDependencies": {
-        "jest": ">= 25"
-      }
-    },
-    "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"
+        "invariant": "^2.2.4"
       }
     },
-    "node_modules/jest-worker/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==",
-      "engines": {
-        "node": ">=8"
+    "node_modules/expo/node_modules/@babel/code-frame": {
+      "version": "7.10.4",
+      "license": "MIT",
+      "dependencies": {
+        "@babel/highlight": "^7.10.4"
       }
     },
-    "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==",
+    "node_modules/expo/node_modules/@expo/config-plugins": {
+      "version": "8.0.6",
+      "license": "MIT",
       "dependencies": {
-        "has-flag": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/supports-color?sponsor=1"
+        "@expo/config-types": "^51.0.0-unreleased",
+        "@expo/json-file": "~8.3.0",
+        "@expo/plist": "^0.1.0",
+        "@expo/sdk-runtime-versions": "^1.0.0",
+        "chalk": "^4.1.2",
+        "debug": "^4.3.1",
+        "find-up": "~5.0.0",
+        "getenv": "^1.0.0",
+        "glob": "7.1.6",
+        "resolve-from": "^5.0.0",
+        "semver": "^7.5.4",
+        "slash": "^3.0.0",
+        "slugify": "^1.6.6",
+        "xcode": "^3.0.1",
+        "xml2js": "0.6.0"
       }
     },
-    "node_modules/jest/node_modules/@jest/types": {
-      "version": "29.6.3",
+    "node_modules/expo/node_modules/@expo/config-types": {
+      "version": "51.0.2",
+      "license": "MIT"
+    },
+    "node_modules/expo/node_modules/@expo/json-file": {
+      "version": "8.3.3",
       "license": "MIT",
       "dependencies": {
-        "@jest/schemas": "^29.6.3",
-        "@types/istanbul-lib-coverage": "^2.0.0",
-        "@types/istanbul-reports": "^3.0.0",
-        "@types/node": "*",
-        "@types/yargs": "^17.0.8",
-        "chalk": "^4.0.0"
-      },
-      "engines": {
-        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+        "@babel/code-frame": "~7.10.4",
+        "json5": "^2.2.2",
+        "write-file-atomic": "^2.3.0"
       }
     },
-    "node_modules/jest/node_modules/@types/yargs": {
-      "version": "17.0.24",
+    "node_modules/expo/node_modules/@expo/plist": {
+      "version": "0.1.3",
       "license": "MIT",
       "dependencies": {
-        "@types/yargs-parser": "*"
+        "@xmldom/xmldom": "~0.7.7",
+        "base64-js": "^1.2.3",
+        "xmlbuilder": "^14.0.0"
       }
     },
-    "node_modules/jest/node_modules/ansi-styles": {
+    "node_modules/expo/node_modules/ansi-styles": {
       "version": "4.3.0",
       "license": "MIT",
       "dependencies": {
@@ -26490,7 +26613,7 @@
         "url": "https://github.com/chalk/ansi-styles?sponsor=1"
       }
     },
-    "node_modules/jest/node_modules/chalk": {
+    "node_modules/expo/node_modules/chalk": {
       "version": "4.1.2",
       "license": "MIT",
       "dependencies": {
@@ -26504,7 +26627,7 @@
         "url": "https://github.com/chalk/chalk?sponsor=1"
       }
     },
-    "node_modules/jest/node_modules/color-convert": {
+    "node_modules/expo/node_modules/color-convert": {
       "version": "2.0.1",
       "license": "MIT",
       "dependencies": {
@@ -26514,18 +26637,18 @@
         "node": ">=7.0.0"
       }
     },
-    "node_modules/jest/node_modules/color-name": {
+    "node_modules/expo/node_modules/color-name": {
       "version": "1.1.4",
       "license": "MIT"
     },
-    "node_modules/jest/node_modules/has-flag": {
+    "node_modules/expo/node_modules/has-flag": {
       "version": "4.0.0",
       "license": "MIT",
       "engines": {
         "node": ">=8"
       }
     },
-    "node_modules/jest/node_modules/supports-color": {
+    "node_modules/expo/node_modules/supports-color": {
       "version": "7.2.0",
       "license": "MIT",
       "dependencies": {
@@ -26535,699 +26658,690 @@
         "node": ">=8"
       }
     },
-    "node_modules/jimp-compact": {
-      "version": "0.16.1",
-      "license": "MIT"
-    },
-    "node_modules/jiti": {
-      "version": "1.20.0",
+    "node_modules/exponential-backoff": {
+      "version": "3.1.1",
       "dev": true,
+      "license": "Apache-2.0"
+    },
+    "node_modules/express": {
+      "version": "4.18.1",
       "license": "MIT",
-      "bin": {
-        "jiti": "bin/jiti.js"
+      "dependencies": {
+        "accepts": "~1.3.8",
+        "array-flatten": "1.1.1",
+        "body-parser": "1.20.0",
+        "content-disposition": "0.5.4",
+        "content-type": "~1.0.4",
+        "cookie": "0.5.0",
+        "cookie-signature": "1.0.6",
+        "debug": "2.6.9",
+        "depd": "2.0.0",
+        "encodeurl": "~1.0.2",
+        "escape-html": "~1.0.3",
+        "etag": "~1.8.1",
+        "finalhandler": "1.2.0",
+        "fresh": "0.5.2",
+        "http-errors": "2.0.0",
+        "merge-descriptors": "1.0.1",
+        "methods": "~1.1.2",
+        "on-finished": "2.4.1",
+        "parseurl": "~1.3.3",
+        "path-to-regexp": "0.1.7",
+        "proxy-addr": "~2.0.7",
+        "qs": "6.10.3",
+        "range-parser": "~1.2.1",
+        "safe-buffer": "5.2.1",
+        "send": "0.18.0",
+        "serve-static": "1.15.0",
+        "setprototypeof": "1.2.0",
+        "statuses": "2.0.1",
+        "type-is": "~1.6.18",
+        "utils-merge": "1.0.1",
+        "vary": "~1.1.2"
+      },
+      "engines": {
+        "node": ">= 0.10.0"
       }
     },
-    "node_modules/joi": {
-      "version": "17.12.3",
-      "resolved": "https://registry.npmjs.org/joi/-/joi-17.12.3.tgz",
-      "integrity": "sha512-2RRziagf555owrm9IRVtdKynOBeITiDpuZqIpgwqXShPncPKNiRQoiGsl/T8SQdq+8ugRzH2LqY67irr2y/d+g==",
+    "node_modules/express/node_modules/debug": {
+      "version": "2.6.9",
+      "license": "MIT",
       "dependencies": {
-        "@hapi/hoek": "^9.3.0",
-        "@hapi/topo": "^5.1.0",
-        "@sideway/address": "^4.1.5",
-        "@sideway/formula": "^3.0.1",
-        "@sideway/pinpoint": "^2.0.0"
+        "ms": "2.0.0"
       }
     },
-    "node_modules/join-component": {
-      "version": "1.1.0",
-      "license": "MIT"
-    },
-    "node_modules/jquery": {
-      "version": "3.6.0",
-      "license": "MIT"
-    },
-    "node_modules/js-base64": {
-      "version": "3.7.5",
-      "license": "BSD-3-Clause"
-    },
-    "node_modules/js-tokens": {
-      "version": "4.0.0",
+    "node_modules/express/node_modules/ms": {
+      "version": "2.0.0",
       "license": "MIT"
     },
-    "node_modules/js-yaml": {
-      "version": "3.14.1",
-      "license": "MIT",
-      "dependencies": {
-        "argparse": "^1.0.7",
-        "esprima": "^4.0.0"
-      },
-      "bin": {
-        "js-yaml": "bin/js-yaml.js"
-      }
-    },
-    "node_modules/jsc-android": {
-      "version": "250231.0.0",
-      "license": "BSD-2-Clause"
-    },
-    "node_modules/jsc-safe-url": {
-      "version": "0.2.4",
-      "license": "0BSD"
+    "node_modules/express/node_modules/safe-buffer": {
+      "version": "5.2.1",
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/feross"
+        },
+        {
+          "type": "patreon",
+          "url": "https://www.patreon.com/feross"
+        },
+        {
+          "type": "consulting",
+          "url": "https://feross.org/support"
+        }
+      ],
+      "license": "MIT"
     },
-    "node_modules/jscodeshift": {
-      "version": "0.14.0",
-      "resolved": "https://registry.npmjs.org/jscodeshift/-/jscodeshift-0.14.0.tgz",
-      "integrity": "sha512-7eCC1knD7bLUPuSCwXsMZUH51O8jIcoVyKtI6P0XM0IVzlGjckPy3FIwQlorzbN0Sg79oK+RlohN32Mqf/lrYA==",
+    "node_modules/extend-shallow": {
+      "version": "3.0.2",
+      "license": "MIT",
       "dependencies": {
-        "@babel/core": "^7.13.16",
-        "@babel/parser": "^7.13.16",
-        "@babel/plugin-proposal-class-properties": "^7.13.0",
-        "@babel/plugin-proposal-nullish-coalescing-operator": "^7.13.8",
-        "@babel/plugin-proposal-optional-chaining": "^7.13.12",
-        "@babel/plugin-transform-modules-commonjs": "^7.13.8",
-        "@babel/preset-flow": "^7.13.13",
-        "@babel/preset-typescript": "^7.13.0",
-        "@babel/register": "^7.13.16",
-        "babel-core": "^7.0.0-bridge.0",
-        "chalk": "^4.1.2",
-        "flow-parser": "0.*",
-        "graceful-fs": "^4.2.4",
-        "micromatch": "^4.0.4",
-        "neo-async": "^2.5.0",
-        "node-dir": "^0.1.17",
-        "recast": "^0.21.0",
-        "temp": "^0.8.4",
-        "write-file-atomic": "^2.3.0"
-      },
-      "bin": {
-        "jscodeshift": "bin/jscodeshift.js"
+        "assign-symbols": "^1.0.0",
+        "is-extendable": "^1.0.1"
       },
-      "peerDependencies": {
-        "@babel/preset-env": "^7.1.6"
+      "engines": {
+        "node": ">=0.10.0"
       }
     },
-    "node_modules/jscodeshift/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==",
+    "node_modules/extglob": {
+      "version": "2.0.4",
+      "license": "MIT",
+      "optional": true,
       "dependencies": {
-        "color-convert": "^2.0.1"
+        "array-unique": "^0.3.2",
+        "define-property": "^1.0.0",
+        "expand-brackets": "^2.1.4",
+        "extend-shallow": "^2.0.1",
+        "fragment-cache": "^0.2.1",
+        "regex-not": "^1.0.0",
+        "snapdragon": "^0.8.1",
+        "to-regex": "^3.0.1"
       },
       "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
+        "node": ">=0.10.0"
       }
     },
-    "node_modules/jscodeshift/node_modules/chalk": {
-      "version": "4.1.2",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
-      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
+    "node_modules/extglob/node_modules/define-property": {
+      "version": "1.0.0",
+      "license": "MIT",
+      "optional": true,
       "dependencies": {
-        "ansi-styles": "^4.1.0",
-        "supports-color": "^7.1.0"
+        "is-descriptor": "^1.0.0"
       },
       "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/chalk?sponsor=1"
+        "node": ">=0.10.0"
       }
     },
-    "node_modules/jscodeshift/node_modules/color-convert": {
+    "node_modules/extglob/node_modules/extend-shallow": {
       "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+      "license": "MIT",
+      "optional": true,
       "dependencies": {
-        "color-name": "~1.1.4"
+        "is-extendable": "^0.1.0"
       },
       "engines": {
-        "node": ">=7.0.0"
+        "node": ">=0.10.0"
       }
     },
-    "node_modules/jscodeshift/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=="
-    },
-    "node_modules/jscodeshift/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==",
+    "node_modules/extglob/node_modules/is-extendable": {
+      "version": "0.1.1",
+      "license": "MIT",
+      "optional": true,
       "engines": {
-        "node": ">=8"
+        "node": ">=0.10.0"
       }
     },
-    "node_modules/jscodeshift/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==",
+    "node_modules/extract-zip": {
+      "version": "2.0.1",
+      "dev": true,
+      "license": "BSD-2-Clause",
       "dependencies": {
-        "has-flag": "^4.0.0"
+        "debug": "^4.1.1",
+        "get-stream": "^5.1.0",
+        "yauzl": "^2.10.0"
+      },
+      "bin": {
+        "extract-zip": "cli.js"
       },
       "engines": {
-        "node": ">=8"
+        "node": ">= 10.17.0"
+      },
+      "optionalDependencies": {
+        "@types/yauzl": "^2.9.1"
       }
     },
-    "node_modules/jsdoc-type-pratt-parser": {
-      "version": "4.0.0",
+    "node_modules/extract-zip/node_modules/get-stream": {
+      "version": "5.2.0",
       "dev": true,
       "license": "MIT",
-      "engines": {
-        "node": ">=12.0.0"
-      }
-    },
-    "node_modules/jsesc": {
-      "version": "2.5.2",
-      "license": "MIT",
-      "bin": {
-        "jsesc": "bin/jsesc"
+      "dependencies": {
+        "pump": "^3.0.0"
       },
       "engines": {
-        "node": ">=4"
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/json-buffer": {
-      "version": "3.0.1",
+    "node_modules/extsprintf": {
+      "version": "1.4.1",
       "dev": true,
-      "license": "MIT"
+      "engines": [
+        "node >=0.6.0"
+      ],
+      "license": "MIT",
+      "optional": true
     },
-    "node_modules/json-loader": {
-      "version": "0.5.7",
+    "node_modules/fast-deep-equal": {
+      "version": "3.1.3",
       "license": "MIT"
     },
-    "node_modules/json-parse-better-errors": {
-      "version": "1.0.2",
-      "license": "MIT"
+    "node_modules/fast-diff": {
+      "version": "1.3.0",
+      "dev": true,
+      "license": "Apache-2.0"
     },
-    "node_modules/json-parse-even-better-errors": {
-      "version": "2.3.1",
+    "node_modules/fast-equals": {
+      "version": "4.0.3",
       "license": "MIT"
     },
-    "node_modules/json-schema-deref-sync": {
-      "version": "0.13.0",
+    "node_modules/fast-glob": {
+      "version": "3.3.2",
       "license": "MIT",
       "dependencies": {
-        "clone": "^2.1.2",
-        "dag-map": "~1.0.0",
-        "is-valid-path": "^0.1.1",
-        "lodash": "^4.17.13",
-        "md5": "~2.2.0",
-        "memory-cache": "~0.2.0",
-        "traverse": "~0.6.6",
-        "valid-url": "~1.0.9"
+        "@nodelib/fs.stat": "^2.0.2",
+        "@nodelib/fs.walk": "^1.2.3",
+        "glob-parent": "^5.1.2",
+        "merge2": "^1.3.0",
+        "micromatch": "^4.0.4"
       },
       "engines": {
-        "node": ">=6.0.0"
-      }
-    },
-    "node_modules/json-schema-deref-sync/node_modules/clone": {
-      "version": "2.1.2",
-      "license": "MIT",
-      "engines": {
-        "node": ">=0.8"
+        "node": ">=8.6.0"
       }
     },
-    "node_modules/json-schema-deref-sync/node_modules/is-buffer": {
-      "version": "1.1.6",
+    "node_modules/fast-json-parse": {
+      "version": "1.0.3",
+      "dev": true,
       "license": "MIT"
     },
-    "node_modules/json-schema-deref-sync/node_modules/md5": {
+    "node_modules/fast-json-patch": {
       "version": "2.2.1",
-      "license": "BSD-3-Clause",
-      "dependencies": {
-        "charenc": "~0.0.1",
-        "crypt": "~0.0.1",
-        "is-buffer": "~1.1.1"
-      }
-    },
-    "node_modules/json-schema-migrate": {
-      "version": "2.0.0",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "ajv": "^8.0.0"
-      }
-    },
-    "node_modules/json-schema-traverse": {
-      "version": "1.0.0",
-      "license": "MIT"
-    },
-    "node_modules/json-stable-stringify": {
-      "version": "1.0.2",
-      "license": "MIT",
-      "dependencies": {
-        "jsonify": "^0.0.1"
+        "fast-deep-equal": "^2.0.1"
       },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
+      "engines": {
+        "node": ">= 0.4.0"
       }
     },
-    "node_modules/json-stable-stringify-without-jsonify": {
-      "version": "1.0.1",
+    "node_modules/fast-json-patch/node_modules/fast-deep-equal": {
+      "version": "2.0.1",
       "dev": true,
       "license": "MIT"
     },
-    "node_modules/json-stringify-pretty-compact": {
-      "version": "3.0.0",
+    "node_modules/fast-json-stable-stringify": {
+      "version": "2.1.0",
       "license": "MIT"
     },
-    "node_modules/json-stringify-safe": {
-      "version": "5.0.1",
-      "license": "ISC"
+    "node_modules/fast-levenshtein": {
+      "version": "2.0.6",
+      "dev": true,
+      "license": "MIT"
     },
-    "node_modules/json5": {
-      "version": "2.2.3",
+    "node_modules/fast-xml-parser": {
+      "version": "4.3.6",
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/NaturalIntelligence"
+        },
+        {
+          "type": "paypal",
+          "url": "https://paypal.me/naturalintelligence"
+        }
+      ],
       "license": "MIT",
-      "bin": {
-        "json5": "lib/cli.js"
+      "dependencies": {
+        "strnum": "^1.0.5"
       },
-      "engines": {
-        "node": ">=6"
+      "bin": {
+        "fxparser": "src/cli/cli.js"
       }
     },
-    "node_modules/jsonfile": {
-      "version": "6.1.0",
+    "node_modules/fastest-levenshtein": {
+      "version": "1.0.16",
+      "dev": true,
       "license": "MIT",
-      "dependencies": {
-        "universalify": "^2.0.0"
-      },
-      "optionalDependencies": {
-        "graceful-fs": "^4.1.6"
+      "engines": {
+        "node": ">= 4.9.1"
       }
     },
-    "node_modules/jsonify": {
-      "version": "0.0.1",
-      "license": "Public Domain",
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
+    "node_modules/fastq": {
+      "version": "1.13.0",
+      "license": "ISC",
+      "dependencies": {
+        "reusify": "^1.0.4"
       }
     },
-    "node_modules/jsx-ast-utils": {
-      "version": "3.3.5",
+    "node_modules/faye-websocket": {
+      "version": "0.11.4",
       "dev": true,
-      "license": "MIT",
+      "license": "Apache-2.0",
       "dependencies": {
-        "array-includes": "^3.1.6",
-        "array.prototype.flat": "^1.3.1",
-        "object.assign": "^4.1.4",
-        "object.values": "^1.1.6"
+        "websocket-driver": ">=0.5.1"
       },
       "engines": {
-        "node": ">=4.0"
+        "node": ">=0.8.0"
       }
     },
-    "node_modules/kdbush": {
-      "version": "4.0.2",
-      "license": "ISC"
+    "node_modules/fb-watchman": {
+      "version": "2.0.1",
+      "license": "Apache-2.0",
+      "dependencies": {
+        "bser": "2.1.1"
+      }
     },
-    "node_modules/kebab-case": {
+    "node_modules/fbemitter": {
+      "version": "3.0.0",
+      "license": "BSD-3-Clause",
+      "dependencies": {
+        "fbjs": "^3.0.0"
+      }
+    },
+    "node_modules/fbjs": {
+      "version": "3.0.4",
+      "license": "MIT",
+      "dependencies": {
+        "cross-fetch": "^3.1.5",
+        "fbjs-css-vars": "^1.0.0",
+        "loose-envify": "^1.0.0",
+        "object-assign": "^4.1.0",
+        "promise": "^7.1.1",
+        "setimmediate": "^1.0.5",
+        "ua-parser-js": "^0.7.30"
+      }
+    },
+    "node_modules/fbjs-css-vars": {
       "version": "1.0.2",
-      "dev": true,
       "license": "MIT"
     },
-    "node_modules/keyv": {
-      "version": "4.5.2",
+    "node_modules/fd-slicer": {
+      "version": "1.1.0",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "json-buffer": "3.0.1"
+        "pend": "~1.2.0"
       }
     },
-    "node_modules/kind-of": {
-      "version": "6.0.3",
+    "node_modules/fetch-retry": {
+      "version": "5.0.6",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/file-entry-cache": {
+      "version": "6.0.1",
+      "dev": true,
       "license": "MIT",
+      "dependencies": {
+        "flat-cache": "^3.0.4"
+      },
       "engines": {
-        "node": ">=0.10.0"
+        "node": "^10.12.0 || >=12.0.0"
       }
     },
-    "node_modules/klaw-sync": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/klaw-sync/-/klaw-sync-6.0.0.tgz",
-      "integrity": "sha512-nIeuVSzdCCs6TDPTqI8w1Yre34sSq7AkZ4B3sfOBbI2CgVSB4Du4aLQijFU2+lhAFCwt9+42Hel6lQNIv6AntQ==",
+    "node_modules/file-system-cache": {
+      "version": "2.3.0",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "graceful-fs": "^4.1.11"
+        "fs-extra": "11.1.1",
+        "ramda": "0.29.0"
       }
     },
-    "node_modules/kleur": {
-      "version": "3.0.3",
+    "node_modules/file-system-cache/node_modules/fs-extra": {
+      "version": "11.1.1",
+      "dev": true,
       "license": "MIT",
+      "dependencies": {
+        "graceful-fs": "^4.2.0",
+        "jsonfile": "^6.0.1",
+        "universalify": "^2.0.0"
+      },
       "engines": {
-        "node": ">=6"
+        "node": ">=14.14"
       }
     },
-    "node_modules/language-subtag-registry": {
-      "version": "0.3.22",
+    "node_modules/file-uri-to-path": {
+      "version": "1.0.0",
+      "license": "MIT",
+      "optional": true
+    },
+    "node_modules/filelist": {
+      "version": "1.0.4",
       "dev": true,
-      "license": "CC0-1.0"
+      "license": "Apache-2.0",
+      "dependencies": {
+        "minimatch": "^5.0.1"
+      }
     },
-    "node_modules/language-tags": {
-      "version": "1.0.5",
+    "node_modules/filelist/node_modules/brace-expansion": {
+      "version": "2.0.1",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "language-subtag-registry": "~0.3.2"
+        "balanced-match": "^1.0.0"
       }
     },
-    "node_modules/launch-editor": {
-      "version": "2.6.1",
-      "resolved": "https://registry.npmjs.org/launch-editor/-/launch-editor-2.6.1.tgz",
-      "integrity": "sha512-eB/uXmFVpY4zezmGp5XtU21kwo7GBbKB+EQ+UZeWtGb9yAM5xt/Evk+lYH3eRNAtId+ej4u7TYPFZ07w4s7rRw==",
+    "node_modules/filelist/node_modules/minimatch": {
+      "version": "5.1.6",
       "dev": true,
+      "license": "ISC",
       "dependencies": {
-        "picocolors": "^1.0.0",
-        "shell-quote": "^1.8.1"
+        "brace-expansion": "^2.0.1"
+      },
+      "engines": {
+        "node": ">=10"
       }
     },
-    "node_modules/lazy-cache": {
-      "version": "1.0.4",
+    "node_modules/fill-range": {
+      "version": "7.0.1",
+      "license": "MIT",
+      "dependencies": {
+        "to-regex-range": "^5.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/filter-obj": {
+      "version": "1.1.0",
       "license": "MIT",
       "engines": {
         "node": ">=0.10.0"
       }
     },
-    "node_modules/lazy-universal-dotenv": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/lazy-universal-dotenv/-/lazy-universal-dotenv-4.0.0.tgz",
-      "integrity": "sha512-aXpZJRnTkpK6gQ/z4nk+ZBLd/Qdp118cvPruLSIQzQNRhKwEcdXCOzXuF55VDqIiuAaY3UGZ10DJtvZzDcvsxg==",
+    "node_modules/finalhandler": {
+      "version": "1.2.0",
+      "license": "MIT",
       "dependencies": {
-        "app-root-dir": "^1.0.2",
-        "dotenv": "^16.0.0",
-        "dotenv-expand": "^10.0.0"
+        "debug": "2.6.9",
+        "encodeurl": "~1.0.2",
+        "escape-html": "~1.0.3",
+        "on-finished": "2.4.1",
+        "parseurl": "~1.3.3",
+        "statuses": "2.0.1",
+        "unpipe": "~1.0.0"
       },
       "engines": {
-        "node": ">=14.0.0"
+        "node": ">= 0.8"
       }
     },
-    "node_modules/lazy-universal-dotenv/node_modules/dotenv-expand": {
-      "version": "10.0.0",
-      "resolved": "https://registry.npmjs.org/dotenv-expand/-/dotenv-expand-10.0.0.tgz",
-      "integrity": "sha512-GopVGCpVS1UKH75VKHGuQFqS1Gusej0z4FyQkPdwjil2gNIv+LNsqBlboOzpJFZKVT95GkCyWJbBSdFEFUWI2A==",
-      "engines": {
-        "node": ">=12"
+    "node_modules/finalhandler/node_modules/debug": {
+      "version": "2.6.9",
+      "license": "MIT",
+      "dependencies": {
+        "ms": "2.0.0"
       }
     },
-    "node_modules/lazy-val": {
-      "version": "1.0.5",
-      "dev": true,
+    "node_modules/finalhandler/node_modules/ms": {
+      "version": "2.0.0",
       "license": "MIT"
     },
-    "node_modules/lazystream": {
-      "version": "1.0.1",
+    "node_modules/find-babel-config": {
+      "version": "2.0.0",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "dependencies": {
-        "readable-stream": "^2.0.5"
+        "json5": "^2.1.1",
+        "path-exists": "^4.0.0"
       },
       "engines": {
-        "node": ">= 0.6.3"
+        "node": ">=16.0.0"
       }
     },
-    "node_modules/lcid": {
-      "version": "1.0.0",
+    "node_modules/find-babel-config/node_modules/path-exists": {
+      "version": "4.0.0",
+      "dev": true,
       "license": "MIT",
-      "dependencies": {
-        "invert-kv": "^1.0.0"
-      },
       "engines": {
-        "node": ">=0.10.0"
+        "node": ">=8"
       }
     },
-    "node_modules/leven": {
-      "version": "3.1.0",
+    "node_modules/find-cache-dir": {
+      "version": "2.1.0",
       "license": "MIT",
+      "dependencies": {
+        "commondir": "^1.0.1",
+        "make-dir": "^2.0.0",
+        "pkg-dir": "^3.0.0"
+      },
       "engines": {
         "node": ">=6"
       }
     },
-    "node_modules/levn": {
-      "version": "0.4.1",
-      "dev": true,
+    "node_modules/find-cache-dir/node_modules/find-up": {
+      "version": "3.0.0",
       "license": "MIT",
       "dependencies": {
-        "prelude-ls": "^1.2.1",
-        "type-check": "~0.4.0"
+        "locate-path": "^3.0.0"
       },
       "engines": {
-        "node": ">= 0.8.0"
+        "node": ">=6"
       }
     },
-    "node_modules/lie": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/lie/-/lie-3.1.1.tgz",
-      "integrity": "sha512-RiNhHysUjhrDQntfYSfY4MU24coXXdEOgw9WGcKHNeEwffDYbF//u87M1EWaMGzuFoSbqW0C9C6lEEhDOAswfw==",
-      "dependencies": {
-        "immediate": "~3.0.5"
-      }
-    },
-    "node_modules/lighthouse-logger": {
-      "version": "1.4.2",
-      "license": "Apache-2.0",
-      "dependencies": {
-        "debug": "^2.6.9",
-        "marky": "^1.2.2"
-      }
-    },
-    "node_modules/lighthouse-logger/node_modules/debug": {
-      "version": "2.6.9",
+    "node_modules/find-cache-dir/node_modules/locate-path": {
+      "version": "3.0.0",
       "license": "MIT",
       "dependencies": {
-        "ms": "2.0.0"
-      }
-    },
-    "node_modules/lighthouse-logger/node_modules/ms": {
-      "version": "2.0.0",
-      "license": "MIT"
-    },
-    "node_modules/lightningcss": {
-      "version": "1.19.0",
-      "license": "MPL-2.0",
-      "dependencies": {
-        "detect-libc": "^1.0.3"
+        "p-locate": "^3.0.0",
+        "path-exists": "^3.0.0"
       },
       "engines": {
-        "node": ">= 12.0.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/parcel"
-      },
-      "optionalDependencies": {
-        "lightningcss-darwin-arm64": "1.19.0",
-        "lightningcss-darwin-x64": "1.19.0",
-        "lightningcss-linux-arm-gnueabihf": "1.19.0",
-        "lightningcss-linux-arm64-gnu": "1.19.0",
-        "lightningcss-linux-arm64-musl": "1.19.0",
-        "lightningcss-linux-x64-gnu": "1.19.0",
-        "lightningcss-linux-x64-musl": "1.19.0",
-        "lightningcss-win32-x64-msvc": "1.19.0"
+        "node": ">=6"
       }
     },
-    "node_modules/lightningcss-darwin-arm64": {
-      "version": "1.19.0",
-      "cpu": [
-        "arm64"
-      ],
-      "license": "MPL-2.0",
-      "optional": true,
-      "os": [
-        "darwin"
-      ],
+    "node_modules/find-cache-dir/node_modules/p-limit": {
+      "version": "2.3.0",
+      "license": "MIT",
+      "dependencies": {
+        "p-try": "^2.0.0"
+      },
       "engines": {
-        "node": ">= 12.0.0"
+        "node": ">=6"
       },
       "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/parcel"
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/lightningcss/node_modules/detect-libc": {
-      "version": "1.0.3",
-      "license": "Apache-2.0",
-      "bin": {
-        "detect-libc": "bin/detect-libc.js"
+    "node_modules/find-cache-dir/node_modules/p-locate": {
+      "version": "3.0.0",
+      "license": "MIT",
+      "dependencies": {
+        "p-limit": "^2.0.0"
       },
       "engines": {
-        "node": ">=0.10"
+        "node": ">=6"
       }
     },
-    "node_modules/lines-and-columns": {
-      "version": "1.2.4",
-      "license": "MIT"
-    },
-    "node_modules/load-json-file": {
-      "version": "1.1.0",
+    "node_modules/find-cache-dir/node_modules/pkg-dir": {
+      "version": "3.0.0",
       "license": "MIT",
       "dependencies": {
-        "graceful-fs": "^4.1.2",
-        "parse-json": "^2.2.0",
-        "pify": "^2.0.0",
-        "pinkie-promise": "^2.0.0",
-        "strip-bom": "^2.0.0"
+        "find-up": "^3.0.0"
       },
       "engines": {
-        "node": ">=0.10.0"
+        "node": ">=6"
       }
     },
-    "node_modules/load-json-file/node_modules/parse-json": {
-      "version": "2.2.0",
+    "node_modules/find-up": {
+      "version": "5.0.0",
       "license": "MIT",
       "dependencies": {
-        "error-ex": "^1.2.0"
+        "locate-path": "^6.0.0",
+        "path-exists": "^4.0.0"
       },
       "engines": {
-        "node": ">=0.10.0"
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/load-json-file/node_modules/pify": {
-      "version": "2.3.0",
+    "node_modules/find-up/node_modules/path-exists": {
+      "version": "4.0.0",
       "license": "MIT",
       "engines": {
-        "node": ">=0.10.0"
+        "node": ">=8"
       }
     },
-    "node_modules/load-json-file/node_modules/strip-bom": {
+    "node_modules/find-yarn-workspace-root": {
       "version": "2.0.0",
-      "license": "MIT",
+      "license": "Apache-2.0",
       "dependencies": {
-        "is-utf8": "^0.2.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
+        "micromatch": "^4.0.2"
       }
     },
-    "node_modules/loader-runner": {
-      "version": "2.4.0",
+    "node_modules/flat-cache": {
+      "version": "3.0.4",
+      "dev": true,
       "license": "MIT",
+      "dependencies": {
+        "flatted": "^3.1.0",
+        "rimraf": "^3.0.2"
+      },
       "engines": {
-        "node": ">=4.3.0 <5.0.0 || >=5.10"
+        "node": "^10.12.0 || >=12.0.0"
       }
     },
-    "node_modules/loader-utils": {
-      "version": "2.0.4",
+    "node_modules/flatted": {
+      "version": "3.2.7",
       "dev": true,
+      "license": "ISC"
+    },
+    "node_modules/flow-enums-runtime": {
+      "version": "0.0.6",
+      "license": "MIT"
+    },
+    "node_modules/flow-parser": {
+      "version": "0.230.0",
       "license": "MIT",
-      "dependencies": {
-        "big.js": "^5.2.2",
-        "emojis-list": "^3.0.0",
-        "json5": "^2.1.2"
-      },
       "engines": {
-        "node": ">=8.9.0"
+        "node": ">=0.4.0"
       }
     },
-    "node_modules/localforage": {
-      "version": "1.10.0",
-      "resolved": "https://registry.npmjs.org/localforage/-/localforage-1.10.0.tgz",
-      "integrity": "sha512-14/H1aX7hzBBmmh7sGPd+AOMkkIrHM3Z1PAyGgZigA1H1p5O5ANnMyWzvpAETtG68/dC4pC0ncy3+PPGzXZHPg==",
+    "node_modules/focus-trap": {
+      "version": "7.5.4",
+      "license": "MIT",
       "dependencies": {
-        "lie": "3.1.1"
+        "tabbable": "^6.2.0"
       }
     },
-    "node_modules/locate-path": {
-      "version": "6.0.0",
+    "node_modules/focus-trap-react": {
+      "version": "10.2.3",
       "license": "MIT",
       "dependencies": {
-        "p-locate": "^5.0.0"
+        "focus-trap": "^7.5.4",
+        "tabbable": "^6.2.0"
       },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
+      "peerDependencies": {
+        "prop-types": "^15.8.1",
+        "react": ">=16.3.0",
+        "react-dom": ">=16.3.0"
       }
     },
-    "node_modules/lodash": {
-      "version": "4.17.21",
-      "license": "MIT"
-    },
-    "node_modules/lodash.clonedeep": {
-      "version": "4.5.0",
-      "dev": true,
-      "license": "MIT",
-      "peer": true
-    },
-    "node_modules/lodash.debounce": {
-      "version": "4.0.8",
-      "license": "MIT"
-    },
-    "node_modules/lodash.defaults": {
-      "version": "4.2.0",
-      "dev": true,
+    "node_modules/follow-redirects": {
+      "version": "1.15.5",
+      "funding": [
+        {
+          "type": "individual",
+          "url": "https://github.com/sponsors/RubenVerborgh"
+        }
+      ],
       "license": "MIT",
-      "peer": true
+      "engines": {
+        "node": ">=4.0"
+      },
+      "peerDependenciesMeta": {
+        "debug": {
+          "optional": true
+        }
+      }
     },
-    "node_modules/lodash.difference": {
-      "version": "4.5.0",
-      "dev": true,
-      "license": "MIT",
-      "peer": true
+    "node_modules/fontfaceobserver": {
+      "version": "2.3.0",
+      "license": "BSD-2-Clause"
     },
-    "node_modules/lodash.flatten": {
-      "version": "4.4.0",
-      "dev": true,
+    "node_modules/for-each": {
+      "version": "0.3.3",
       "license": "MIT",
-      "peer": true
-    },
-    "node_modules/lodash.isequal": {
-      "version": "4.5.0",
-      "license": "MIT"
+      "dependencies": {
+        "is-callable": "^1.1.3"
+      }
     },
-    "node_modules/lodash.isplainobject": {
-      "version": "4.0.6",
-      "dev": true,
+    "node_modules/for-in": {
+      "version": "1.0.2",
       "license": "MIT",
-      "peer": true
-    },
-    "node_modules/lodash.memoize": {
-      "version": "4.1.2",
-      "resolved": "https://registry.npmjs.org/lodash.memoize/-/lodash.memoize-4.1.2.tgz",
-      "integrity": "sha512-t7j+NzmgnQzTAYXcsHYLgimltOV1MXHtlOWf6GjL9Kj8GK5FInw5JotxvbOs+IvV1/Dzo04/fCGfLVs7aXb4Ag==",
-      "dev": true
-    },
-    "node_modules/lodash.merge": {
-      "version": "4.6.2",
-      "dev": true,
-      "license": "MIT"
+      "engines": {
+        "node": ">=0.10.0"
+      }
     },
-    "node_modules/lodash.throttle": {
-      "version": "4.1.1",
-      "license": "MIT"
+    "node_modules/foreground-child": {
+      "version": "3.1.1",
+      "license": "ISC",
+      "dependencies": {
+        "cross-spawn": "^7.0.0",
+        "signal-exit": "^4.0.1"
+      },
+      "engines": {
+        "node": ">=14"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
+      }
     },
-    "node_modules/lodash.truncate": {
-      "version": "4.4.2",
-      "dev": true,
-      "license": "MIT"
+    "node_modules/foreground-child/node_modules/signal-exit": {
+      "version": "4.1.0",
+      "license": "ISC",
+      "engines": {
+        "node": ">=14"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
+      }
     },
-    "node_modules/lodash.union": {
-      "version": "4.6.0",
+    "node_modules/fork-ts-checker-webpack-plugin": {
+      "version": "8.0.0",
       "dev": true,
       "license": "MIT",
-      "peer": true
-    },
-    "node_modules/log-symbols": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/log-symbols/-/log-symbols-4.1.0.tgz",
-      "integrity": "sha512-8XPvpAA8uyhfteu8pIvQxpJZ7SYYdpUivZpGy6sFsBuKRY/7rQGavedeB8aK+Zkyq6upMFVL/9AW6vOYzfRyLg==",
       "dependencies": {
-        "chalk": "^4.1.0",
-        "is-unicode-supported": "^0.1.0"
+        "@babel/code-frame": "^7.16.7",
+        "chalk": "^4.1.2",
+        "chokidar": "^3.5.3",
+        "cosmiconfig": "^7.0.1",
+        "deepmerge": "^4.2.2",
+        "fs-extra": "^10.0.0",
+        "memfs": "^3.4.1",
+        "minimatch": "^3.0.4",
+        "node-abort-controller": "^3.0.1",
+        "schema-utils": "^3.1.1",
+        "semver": "^7.3.5",
+        "tapable": "^2.2.1"
       },
       "engines": {
-        "node": ">=10"
+        "node": ">=12.13.0",
+        "yarn": ">=1.0.0"
       },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
+      "peerDependencies": {
+        "typescript": ">3.6.0",
+        "webpack": "^5.11.0"
       }
     },
-    "node_modules/log-symbols/node_modules/ansi-styles": {
+    "node_modules/fork-ts-checker-webpack-plugin/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,
+      "license": "MIT",
       "dependencies": {
         "color-convert": "^2.0.1"
       },
@@ -27238,10 +27352,10 @@
         "url": "https://github.com/chalk/ansi-styles?sponsor=1"
       }
     },
-    "node_modules/log-symbols/node_modules/chalk": {
+    "node_modules/fork-ts-checker-webpack-plugin/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,
+      "license": "MIT",
       "dependencies": {
         "ansi-styles": "^4.1.0",
         "supports-color": "^7.1.0"
@@ -27253,10 +27367,10 @@
         "url": "https://github.com/chalk/chalk?sponsor=1"
       }
     },
-    "node_modules/log-symbols/node_modules/color-convert": {
+    "node_modules/fork-ts-checker-webpack-plugin/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,
+      "license": "MIT",
       "dependencies": {
         "color-name": "~1.1.4"
       },
@@ -27264,1784 +27378,1851 @@
         "node": ">=7.0.0"
       }
     },
-    "node_modules/log-symbols/node_modules/color-name": {
+    "node_modules/fork-ts-checker-webpack-plugin/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,
+      "license": "MIT"
     },
-    "node_modules/log-symbols/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==",
+    "node_modules/fork-ts-checker-webpack-plugin/node_modules/fs-extra": {
+      "version": "10.1.0",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "graceful-fs": "^4.2.0",
+        "jsonfile": "^6.0.1",
+        "universalify": "^2.0.0"
+      },
       "engines": {
-        "node": ">=8"
+        "node": ">=12"
       }
     },
-    "node_modules/log-symbols/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==",
-      "dependencies": {
-        "has-flag": "^4.0.0"
-      },
+    "node_modules/fork-ts-checker-webpack-plugin/node_modules/has-flag": {
+      "version": "4.0.0",
+      "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=8"
       }
     },
-    "node_modules/logkitty": {
-      "version": "0.7.1",
-      "resolved": "https://registry.npmjs.org/logkitty/-/logkitty-0.7.1.tgz",
-      "integrity": "sha512-/3ER20CTTbahrCrpYfPn7Xavv9diBROZpoXGVZDWMw4b/X4uuUwAC0ki85tgsdMRONURyIJbcOvS94QsUBYPbQ==",
+    "node_modules/fork-ts-checker-webpack-plugin/node_modules/memfs": {
+      "version": "3.5.3",
+      "dev": true,
+      "license": "Unlicense",
       "dependencies": {
-        "ansi-fragments": "^0.2.1",
-        "dayjs": "^1.8.15",
-        "yargs": "^15.1.0"
+        "fs-monkey": "^1.0.4"
       },
-      "bin": {
-        "logkitty": "bin/logkitty.js"
+      "engines": {
+        "node": ">= 4.0.0"
       }
     },
-    "node_modules/logkitty/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==",
+    "node_modules/fork-ts-checker-webpack-plugin/node_modules/supports-color": {
+      "version": "7.2.0",
+      "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "color-convert": "^2.0.1"
+        "has-flag": "^4.0.0"
       },
       "engines": {
         "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
       }
     },
-    "node_modules/logkitty/node_modules/camelcase": {
-      "version": "5.3.1",
-      "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz",
-      "integrity": "sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==",
+    "node_modules/form-data": {
+      "version": "3.0.1",
+      "license": "MIT",
+      "dependencies": {
+        "asynckit": "^0.4.0",
+        "combined-stream": "^1.0.8",
+        "mime-types": "^2.1.12"
+      },
       "engines": {
-        "node": ">=6"
+        "node": ">= 6"
       }
     },
-    "node_modules/logkitty/node_modules/cliui": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/cliui/-/cliui-6.0.0.tgz",
-      "integrity": "sha512-t6wbgtoCXvAzst7QgXxJYqPt0usEfbgQdftEPbLL/cvv6HPE5VgvqCuAIDR0NgU52ds6rFwqrgakNLrHEjCbrQ==",
-      "dependencies": {
-        "string-width": "^4.2.0",
-        "strip-ansi": "^6.0.0",
-        "wrap-ansi": "^6.2.0"
-      }
+    "node_modules/form-data-encoder": {
+      "version": "1.7.2",
+      "dev": true,
+      "license": "MIT"
     },
-    "node_modules/logkitty/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==",
+    "node_modules/formdata-node": {
+      "version": "4.4.1",
+      "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "color-name": "~1.1.4"
+        "node-domexception": "1.0.0",
+        "web-streams-polyfill": "4.0.0-beta.3"
       },
       "engines": {
-        "node": ">=7.0.0"
+        "node": ">= 12.20"
       }
     },
-    "node_modules/logkitty/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=="
-    },
-    "node_modules/logkitty/node_modules/find-up": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz",
-      "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==",
-      "dependencies": {
-        "locate-path": "^5.0.0",
-        "path-exists": "^4.0.0"
-      },
+    "node_modules/formdata-node/node_modules/web-streams-polyfill": {
+      "version": "4.0.0-beta.3",
+      "dev": true,
+      "license": "MIT",
       "engines": {
-        "node": ">=8"
+        "node": ">= 14"
       }
     },
-    "node_modules/logkitty/node_modules/locate-path": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz",
-      "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==",
-      "dependencies": {
-        "p-locate": "^4.1.0"
-      },
+    "node_modules/forwarded": {
+      "version": "0.2.0",
+      "license": "MIT",
       "engines": {
-        "node": ">=8"
+        "node": ">= 0.6"
       }
     },
-    "node_modules/logkitty/node_modules/p-limit": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz",
-      "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==",
-      "dependencies": {
-        "p-try": "^2.0.0"
-      },
+    "node_modules/fraction.js": {
+      "version": "4.3.4",
+      "dev": true,
+      "license": "MIT",
       "engines": {
-        "node": ">=6"
+        "node": "*"
       },
       "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
+        "type": "patreon",
+        "url": "https://github.com/sponsors/rawify"
       }
     },
-    "node_modules/logkitty/node_modules/p-locate": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz",
-      "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==",
+    "node_modules/fragment-cache": {
+      "version": "0.2.1",
+      "license": "MIT",
+      "optional": true,
       "dependencies": {
-        "p-limit": "^2.2.0"
+        "map-cache": "^0.2.2"
       },
       "engines": {
-        "node": ">=8"
+        "node": ">=0.10.0"
       }
     },
-    "node_modules/logkitty/node_modules/path-exists": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz",
-      "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==",
+    "node_modules/freeport-async": {
+      "version": "2.0.0",
+      "license": "MIT",
       "engines": {
         "node": ">=8"
       }
     },
-    "node_modules/logkitty/node_modules/wrap-ansi": {
-      "version": "6.2.0",
-      "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-6.2.0.tgz",
-      "integrity": "sha512-r6lPcBGxZXlIcymEu7InxDMhdW0KDxpLgoFLcguasxCaJ/SOIZwINatK9KY/tf+ZrlywOKU0UDj3ATXUBfxJXA==",
-      "dependencies": {
-        "ansi-styles": "^4.0.0",
-        "string-width": "^4.1.0",
-        "strip-ansi": "^6.0.0"
-      },
+    "node_modules/fresh": {
+      "version": "0.5.2",
+      "license": "MIT",
       "engines": {
-        "node": ">=8"
+        "node": ">= 0.6"
       }
     },
-    "node_modules/logkitty/node_modules/yargs": {
-      "version": "15.4.1",
-      "resolved": "https://registry.npmjs.org/yargs/-/yargs-15.4.1.tgz",
-      "integrity": "sha512-aePbxDmcYW++PaqBsJ+HYUFwCdv4LVvdnhBy78E57PIor8/OVvhMrADFFEDh8DHDFRv/O9i3lPhsENjO7QX0+A==",
+    "node_modules/fs-constants": {
+      "version": "1.0.0",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/fs-extra": {
+      "version": "9.1.0",
+      "license": "MIT",
       "dependencies": {
-        "cliui": "^6.0.0",
-        "decamelize": "^1.2.0",
-        "find-up": "^4.1.0",
-        "get-caller-file": "^2.0.1",
-        "require-directory": "^2.1.1",
-        "require-main-filename": "^2.0.0",
-        "set-blocking": "^2.0.0",
-        "string-width": "^4.2.0",
-        "which-module": "^2.0.0",
-        "y18n": "^4.0.0",
-        "yargs-parser": "^18.1.2"
+        "at-least-node": "^1.0.0",
+        "graceful-fs": "^4.2.0",
+        "jsonfile": "^6.0.1",
+        "universalify": "^2.0.0"
       },
       "engines": {
-        "node": ">=8"
+        "node": ">=10"
       }
     },
-    "node_modules/logkitty/node_modules/yargs-parser": {
-      "version": "18.1.3",
-      "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-18.1.3.tgz",
-      "integrity": "sha512-o50j0JeToy/4K6OZcaQmW6lyXXKhq7csREXcDwk2omFPJEwUNOVtJKvmDr9EI1fAJZUyZcRF7kxGBWmRXudrCQ==",
+    "node_modules/fs-minipass": {
+      "version": "2.1.0",
+      "license": "ISC",
       "dependencies": {
-        "camelcase": "^5.0.0",
-        "decamelize": "^1.2.0"
+        "minipass": "^3.0.0"
       },
       "engines": {
-        "node": ">=6"
+        "node": ">= 8"
       }
     },
-    "node_modules/longest": {
-      "version": "1.0.1",
+    "node_modules/fs-monkey": {
+      "version": "1.0.6",
+      "dev": true,
+      "license": "Unlicense"
+    },
+    "node_modules/fs.realpath": {
+      "version": "1.0.0",
+      "license": "ISC"
+    },
+    "node_modules/fsevents": {
+      "version": "2.3.3",
       "license": "MIT",
+      "optional": true,
+      "os": [
+        "darwin"
+      ],
       "engines": {
-        "node": ">=0.10.0"
+        "node": "^8.16.0 || ^10.6.0 || >=11.0.0"
       }
     },
-    "node_modules/loose-envify": {
-      "version": "1.4.0",
+    "node_modules/function-bind": {
+      "version": "1.1.2",
       "license": "MIT",
-      "dependencies": {
-        "js-tokens": "^3.0.0 || ^4.0.0"
-      },
-      "bin": {
-        "loose-envify": "cli.js"
-      }
-    },
-    "node_modules/lottie-react-native": {
-      "version": "6.5.1",
-      "resolved": "https://registry.npmjs.org/lottie-react-native/-/lottie-react-native-6.5.1.tgz",
-      "integrity": "sha512-pjih71P6qX6Ax5ucUBA+YJO7+fnveI581Bd8LmYeARm3spq3AnoGzEkrWaieM8odnK6WI4d5dwEJsxge/QjFPw==",
-      "peerDependencies": {
-        "@dotlottie/react-player": "^1.6.1",
-        "@lottiefiles/react-lottie-player": "^3.5.3",
-        "react": "*",
-        "react-native": ">=0.46",
-        "react-native-windows": ">=0.63.x"
-      },
-      "peerDependenciesMeta": {
-        "@dotlottie/react-player": {
-          "optional": true
-        },
-        "@lottiefiles/react-lottie-player": {
-          "optional": true
-        },
-        "react-native-windows": {
-          "optional": true
-        }
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/lower-case": {
-      "version": "2.0.2",
+    "node_modules/function.prototype.name": {
+      "version": "1.1.6",
       "license": "MIT",
       "dependencies": {
-        "tslib": "^2.0.3"
+        "call-bind": "^1.0.2",
+        "define-properties": "^1.2.0",
+        "es-abstract": "^1.22.1",
+        "functions-have-names": "^1.2.3"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/lowercase-keys": {
-      "version": "2.0.0",
-      "dev": true,
+    "node_modules/functions-have-names": {
+      "version": "1.2.3",
       "license": "MIT",
-      "engines": {
-        "node": ">=8"
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/lru-cache": {
-      "version": "6.0.0",
+    "node_modules/gauge": {
+      "version": "3.0.2",
       "license": "ISC",
+      "optional": true,
       "dependencies": {
-        "yallist": "^4.0.0"
+        "aproba": "^1.0.3 || ^2.0.0",
+        "color-support": "^1.1.2",
+        "console-control-strings": "^1.0.0",
+        "has-unicode": "^2.0.1",
+        "object-assign": "^4.1.1",
+        "signal-exit": "^3.0.0",
+        "string-width": "^4.2.3",
+        "strip-ansi": "^6.0.1",
+        "wide-align": "^1.1.2"
       },
       "engines": {
         "node": ">=10"
       }
     },
-    "node_modules/magic-string": {
-      "version": "0.30.9",
-      "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.30.9.tgz",
-      "integrity": "sha512-S1+hd+dIrC8EZqKyT9DstTH/0Z+f76kmmvZnkfQVmOpDEF9iVgdYif3Q/pIWHmCoo59bQVGW0kVL3e2nl+9+Sw==",
-      "dev": true,
-      "dependencies": {
-        "@jridgewell/sourcemap-codec": "^1.4.15"
-      },
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/make-cancellable-promise": {
-      "version": "1.3.2",
+    "node_modules/gensync": {
+      "version": "1.0.0-beta.2",
       "license": "MIT",
-      "funding": {
-        "url": "https://github.com/wojtekmaj/make-cancellable-promise?sponsor=1"
+      "engines": {
+        "node": ">=6.9.0"
       }
     },
-    "node_modules/make-dir": {
-      "version": "2.1.0",
+    "node_modules/geojson-rbush": {
+      "version": "3.2.0",
       "license": "MIT",
       "dependencies": {
-        "pify": "^4.0.1",
-        "semver": "^5.6.0"
-      },
-      "engines": {
-        "node": ">=6"
+        "@turf/bbox": "*",
+        "@turf/helpers": "6.x",
+        "@turf/meta": "6.x",
+        "@types/geojson": "7946.0.8",
+        "rbush": "^3.0.1"
       }
     },
-    "node_modules/make-dir/node_modules/semver": {
-      "version": "5.7.2",
+    "node_modules/geojson-vt": {
+      "version": "3.2.1",
+      "license": "ISC"
+    },
+    "node_modules/get-caller-file": {
+      "version": "2.0.5",
       "license": "ISC",
-      "bin": {
-        "semver": "bin/semver"
+      "engines": {
+        "node": "6.* || 8.* || >= 10.*"
       }
     },
-    "node_modules/make-error": {
-      "version": "1.3.6",
-      "devOptional": true,
-      "license": "ISC"
-    },
-    "node_modules/make-event-props": {
-      "version": "1.6.1",
+    "node_modules/get-intrinsic": {
+      "version": "1.2.4",
       "license": "MIT",
+      "dependencies": {
+        "es-errors": "^1.3.0",
+        "function-bind": "^1.1.2",
+        "has-proto": "^1.0.1",
+        "has-symbols": "^1.0.3",
+        "hasown": "^2.0.0"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
       "funding": {
-        "url": "https://github.com/wojtekmaj/make-event-props?sponsor=1"
+        "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/makeerror": {
-      "version": "1.0.12",
-      "license": "BSD-3-Clause",
+    "node_modules/get-monorepo-packages": {
+      "version": "1.2.0",
+      "license": "MIT",
+      "peer": true,
       "dependencies": {
-        "tmpl": "1.0.5"
+        "globby": "^7.1.1",
+        "load-json-file": "^4.0.0"
       }
     },
-    "node_modules/map-cache": {
-      "version": "0.2.2",
+    "node_modules/get-monorepo-packages/node_modules/array-union": {
+      "version": "1.0.2",
       "license": "MIT",
-      "optional": true,
+      "peer": true,
+      "dependencies": {
+        "array-uniq": "^1.0.1"
+      },
       "engines": {
         "node": ">=0.10.0"
       }
     },
-    "node_modules/map-or-similar": {
-      "version": "1.5.0",
-      "resolved": "https://registry.npmjs.org/map-or-similar/-/map-or-similar-1.5.0.tgz",
-      "integrity": "sha512-0aF7ZmVon1igznGI4VS30yugpduQW3y3GkcgGJOp7d8x8QrizhigUxjI/m2UojsXXto+jLAH3KSz+xOJTiORjg=="
+    "node_modules/get-monorepo-packages/node_modules/dir-glob": {
+      "version": "2.2.2",
+      "license": "MIT",
+      "peer": true,
+      "dependencies": {
+        "path-type": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
     },
-    "node_modules/map-visit": {
-      "version": "1.0.0",
+    "node_modules/get-monorepo-packages/node_modules/globby": {
+      "version": "7.1.1",
       "license": "MIT",
-      "optional": true,
+      "peer": true,
       "dependencies": {
-        "object-visit": "^1.0.0"
+        "array-union": "^1.0.1",
+        "dir-glob": "^2.0.0",
+        "glob": "^7.1.2",
+        "ignore": "^3.3.5",
+        "pify": "^3.0.0",
+        "slash": "^1.0.0"
       },
       "engines": {
-        "node": ">=0.10.0"
+        "node": ">=4"
       }
     },
-    "node_modules/mapbox-gl": {
-      "version": "2.15.0",
-      "license": "SEE LICENSE IN LICENSE.txt",
+    "node_modules/get-monorepo-packages/node_modules/ignore": {
+      "version": "3.3.10",
+      "license": "MIT",
+      "peer": true
+    },
+    "node_modules/get-monorepo-packages/node_modules/load-json-file": {
+      "version": "4.0.0",
+      "license": "MIT",
+      "peer": true,
       "dependencies": {
-        "@mapbox/geojson-rewind": "^0.5.2",
-        "@mapbox/jsonlint-lines-primitives": "^2.0.2",
-        "@mapbox/mapbox-gl-supported": "^2.0.1",
-        "@mapbox/point-geometry": "^0.1.0",
-        "@mapbox/tiny-sdf": "^2.0.6",
-        "@mapbox/unitbezier": "^0.0.1",
-        "@mapbox/vector-tile": "^1.3.1",
-        "@mapbox/whoots-js": "^3.1.0",
-        "csscolorparser": "~1.0.3",
-        "earcut": "^2.2.4",
-        "geojson-vt": "^3.2.1",
-        "gl-matrix": "^3.4.3",
-        "grid-index": "^1.1.0",
-        "kdbush": "^4.0.1",
-        "murmurhash-js": "^1.0.0",
-        "pbf": "^3.2.1",
-        "potpack": "^2.0.0",
-        "quickselect": "^2.0.0",
-        "rw": "^1.3.3",
-        "supercluster": "^8.0.0",
-        "tinyqueue": "^2.0.3",
-        "vt-pbf": "^3.1.3"
+        "graceful-fs": "^4.1.2",
+        "parse-json": "^4.0.0",
+        "pify": "^3.0.0",
+        "strip-bom": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=4"
       }
     },
-    "node_modules/markdown-builder": {
-      "version": "0.9.0",
-      "dev": true,
+    "node_modules/get-monorepo-packages/node_modules/parse-json": {
+      "version": "4.0.0",
       "license": "MIT",
+      "peer": true,
       "dependencies": {
-        "husky": "^1.0.0-rc.14"
+        "error-ex": "^1.3.1",
+        "json-parse-better-errors": "^1.0.1"
+      },
+      "engines": {
+        "node": ">=4"
       }
     },
-    "node_modules/markdown-table": {
-      "version": "2.0.0",
-      "dev": true,
+    "node_modules/get-monorepo-packages/node_modules/path-type": {
+      "version": "3.0.0",
       "license": "MIT",
+      "peer": true,
       "dependencies": {
-        "repeat-string": "^1.0.0"
+        "pify": "^3.0.0"
       },
-      "funding": {
-        "type": "github",
-        "url": "https://github.com/sponsors/wooorm"
+      "engines": {
+        "node": ">=4"
       }
     },
-    "node_modules/markdown-to-jsx": {
-      "version": "7.3.2",
-      "resolved": "https://registry.npmjs.org/markdown-to-jsx/-/markdown-to-jsx-7.3.2.tgz",
-      "integrity": "sha512-B+28F5ucp83aQm+OxNrPkS8z0tMKaeHiy0lHJs3LqCyDQFtWuenaIrkaVTgAm1pf1AU85LXltva86hlaT17i8Q==",
+    "node_modules/get-monorepo-packages/node_modules/pify": {
+      "version": "3.0.0",
+      "license": "MIT",
+      "peer": true,
       "engines": {
-        "node": ">= 10"
-      },
-      "peerDependencies": {
-        "react": ">= 0.14.0"
+        "node": ">=4"
       }
     },
-    "node_modules/marky": {
-      "version": "1.2.5",
-      "license": "Apache-2.0"
+    "node_modules/get-monorepo-packages/node_modules/slash": {
+      "version": "1.0.0",
+      "license": "MIT",
+      "peer": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
     },
-    "node_modules/matcher": {
+    "node_modules/get-monorepo-packages/node_modules/strip-bom": {
       "version": "3.0.0",
+      "license": "MIT",
+      "peer": true,
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/get-nonce": {
+      "version": "1.0.1",
       "dev": true,
       "license": "MIT",
-      "dependencies": {
-        "escape-string-regexp": "^4.0.0"
-      },
       "engines": {
-        "node": ">=10"
+        "node": ">=6"
       }
     },
-    "node_modules/mathjs": {
-      "version": "11.11.2",
+    "node_modules/get-npm-tarball-url": {
+      "version": "2.1.0",
       "dev": true,
-      "license": "Apache-2.0",
-      "dependencies": {
-        "@babel/runtime": "^7.23.1",
-        "complex.js": "^2.1.1",
-        "decimal.js": "^10.4.3",
-        "escape-latex": "^1.2.0",
-        "fraction.js": "4.3.4",
-        "javascript-natural-sort": "^0.7.1",
-        "seedrandom": "^3.0.5",
-        "tiny-emitter": "^2.1.0",
-        "typed-function": "^4.1.1"
-      },
-      "bin": {
-        "mathjs": "bin/cli.js"
-      },
+      "license": "MIT",
       "engines": {
-        "node": ">= 14"
+        "node": ">=12.17"
       }
     },
-    "node_modules/md5": {
-      "version": "2.3.0",
-      "license": "BSD-3-Clause",
-      "dependencies": {
-        "charenc": "0.0.2",
-        "crypt": "0.0.2",
-        "is-buffer": "~1.1.6"
+    "node_modules/get-package-type": {
+      "version": "0.1.0",
+      "license": "MIT",
+      "engines": {
+        "node": ">=8.0.0"
       }
     },
-    "node_modules/md5-file": {
-      "version": "3.2.3",
+    "node_modules/get-port": {
+      "version": "3.2.0",
       "license": "MIT",
-      "dependencies": {
-        "buffer-alloc": "^1.1.0"
-      },
-      "bin": {
-        "md5-file": "cli.js"
-      },
       "engines": {
-        "node": ">=0.10"
+        "node": ">=4"
       }
     },
-    "node_modules/md5.js": {
-      "version": "1.3.5",
+    "node_modules/get-stream": {
+      "version": "6.0.1",
+      "license": "MIT",
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/get-symbol-description": {
+      "version": "1.0.2",
       "license": "MIT",
       "dependencies": {
-        "hash-base": "^3.0.0",
-        "inherits": "^2.0.1",
-        "safe-buffer": "^5.1.2"
+        "call-bind": "^1.0.5",
+        "es-errors": "^1.3.0",
+        "get-intrinsic": "^1.2.4"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/md5/node_modules/is-buffer": {
-      "version": "1.1.6",
-      "license": "MIT"
+    "node_modules/get-value": {
+      "version": "2.0.6",
+      "license": "MIT",
+      "engines": {
+        "node": ">=0.10.0"
+      }
     },
-    "node_modules/md5hex": {
+    "node_modules/getenv": {
       "version": "1.0.0",
-      "license": "MIT"
-    },
-    "node_modules/mdn-data": {
-      "version": "2.0.14",
-      "license": "CC0-1.0"
-    },
-    "node_modules/media-typer": {
-      "version": "0.3.0",
       "license": "MIT",
       "engines": {
-        "node": ">= 0.6"
+        "node": ">=6"
       }
     },
-    "node_modules/memfs": {
-      "version": "4.6.0",
+    "node_modules/giget": {
+      "version": "1.2.3",
       "dev": true,
-      "license": "Apache-2.0",
+      "license": "MIT",
       "dependencies": {
-        "json-joy": "^9.2.0",
-        "thingies": "^1.11.1"
-      },
-      "engines": {
-        "node": ">= 4.0.0"
-      },
-      "funding": {
-        "type": "github",
-        "url": "https://github.com/sponsors/streamich"
+        "citty": "^0.1.6",
+        "consola": "^3.2.3",
+        "defu": "^6.1.4",
+        "node-fetch-native": "^1.6.3",
+        "nypm": "^0.3.8",
+        "ohash": "^1.1.3",
+        "pathe": "^1.1.2",
+        "tar": "^6.2.0"
       },
-      "peerDependencies": {
-        "tslib": "2"
+      "bin": {
+        "giget": "dist/cli.mjs"
       }
     },
-    "node_modules/memfs/node_modules/arg": {
-      "version": "5.0.2",
+    "node_modules/github-slugger": {
+      "version": "2.0.0",
       "dev": true,
+      "license": "ISC"
+    },
+    "node_modules/gl-matrix": {
+      "version": "3.4.3",
       "license": "MIT"
     },
-    "node_modules/memfs/node_modules/json-joy": {
-      "version": "9.9.1",
-      "dev": true,
-      "license": "Apache-2.0",
+    "node_modules/glob": {
+      "version": "7.1.6",
+      "license": "ISC",
       "dependencies": {
-        "arg": "^5.0.2",
-        "hyperdyperid": "^1.2.0"
-      },
-      "bin": {
-        "jj": "bin/jj.js",
-        "json-pack": "bin/json-pack.js",
-        "json-pack-test": "bin/json-pack-test.js",
-        "json-patch": "bin/json-patch.js",
-        "json-patch-test": "bin/json-patch-test.js",
-        "json-pointer": "bin/json-pointer.js",
-        "json-pointer-test": "bin/json-pointer-test.js",
-        "json-unpack": "bin/json-unpack.js"
+        "fs.realpath": "^1.0.0",
+        "inflight": "^1.0.4",
+        "inherits": "2",
+        "minimatch": "^3.0.4",
+        "once": "^1.3.0",
+        "path-is-absolute": "^1.0.0"
       },
       "engines": {
-        "node": ">=10.0"
+        "node": "*"
       },
       "funding": {
-        "url": "https://github.com/sponsors/streamich"
-      },
-      "peerDependencies": {
-        "quill-delta": "^5",
-        "rxjs": "7",
-        "tslib": "2"
+        "url": "https://github.com/sponsors/isaacs"
       }
     },
-    "node_modules/memoize-one": {
-      "version": "5.2.1",
-      "license": "MIT"
-    },
-    "node_modules/memoizerific": {
-      "version": "1.11.3",
-      "resolved": "https://registry.npmjs.org/memoizerific/-/memoizerific-1.11.3.tgz",
-      "integrity": "sha512-/EuHYwAPdLtXwAwSZkh/Gutery6pD2KYd44oQLhAvQp/50mpyduZh8Q7PYHXTCJ+wuXxt7oij2LXyIJOOYFPog==",
+    "node_modules/glob-parent": {
+      "version": "5.1.2",
+      "license": "ISC",
       "dependencies": {
-        "map-or-similar": "^1.5.0"
+        "is-glob": "^4.0.1"
+      },
+      "engines": {
+        "node": ">= 6"
       }
     },
-    "node_modules/memory-cache": {
-      "version": "0.2.0",
+    "node_modules/glob-to-regexp": {
+      "version": "0.4.1",
       "license": "BSD-2-Clause"
     },
-    "node_modules/memory-fs": {
-      "version": "0.4.1",
-      "license": "MIT",
+    "node_modules/global-agent": {
+      "version": "3.0.0",
+      "dev": true,
+      "license": "BSD-3-Clause",
       "dependencies": {
-        "errno": "^0.1.3",
-        "readable-stream": "^2.0.1"
+        "boolean": "^3.0.1",
+        "es6-error": "^4.1.1",
+        "matcher": "^3.0.0",
+        "roarr": "^2.15.3",
+        "semver": "^7.3.2",
+        "serialize-error": "^7.0.1"
+      },
+      "engines": {
+        "node": ">=10.0"
       }
     },
-    "node_modules/merge-descriptors": {
-      "version": "1.0.1",
-      "license": "MIT"
+    "node_modules/globals": {
+      "version": "11.12.0",
+      "license": "MIT",
+      "engines": {
+        "node": ">=4"
+      }
     },
-    "node_modules/merge-refs": {
-      "version": "1.2.1",
+    "node_modules/globalthis": {
+      "version": "1.0.3",
       "license": "MIT",
       "dependencies": {
-        "@types/react": "*"
+        "define-properties": "^1.1.3"
+      },
+      "engines": {
+        "node": ">= 0.4"
       },
       "funding": {
-        "url": "https://github.com/wojtekmaj/merge-refs?sponsor=1"
+        "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/merge-stream": {
-      "version": "2.0.0",
-      "license": "MIT"
-    },
-    "node_modules/merge2": {
-      "version": "1.4.1",
+    "node_modules/globby": {
+      "version": "11.1.0",
       "license": "MIT",
+      "dependencies": {
+        "array-union": "^2.1.0",
+        "dir-glob": "^3.0.1",
+        "fast-glob": "^3.2.9",
+        "ignore": "^5.2.0",
+        "merge2": "^1.4.1",
+        "slash": "^3.0.0"
+      },
       "engines": {
-        "node": ">= 8"
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/methods": {
-      "version": "1.1.2",
+    "node_modules/good-listener": {
+      "version": "1.2.2",
       "license": "MIT",
-      "engines": {
-        "node": ">= 0.6"
+      "dependencies": {
+        "delegate": "^3.1.2"
       }
     },
-    "node_modules/metro": {
-      "version": "0.80.3",
+    "node_modules/gopd": {
+      "version": "1.0.1",
       "license": "MIT",
       "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",
-        "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.18.2",
-        "image-size": "^1.0.2",
-        "invariant": "^2.2.4",
-        "jest-worker": "^29.6.3",
-        "jsc-safe-url": "^0.2.2",
-        "lodash.throttle": "^4.1.1",
-        "metro-babel-transformer": "0.80.3",
-        "metro-cache": "0.80.3",
-        "metro-cache-key": "0.80.3",
-        "metro-config": "0.80.3",
-        "metro-core": "0.80.3",
-        "metro-file-map": "0.80.3",
-        "metro-minify-terser": "0.80.3",
-        "metro-resolver": "0.80.3",
-        "metro-runtime": "0.80.3",
-        "metro-source-map": "0.80.3",
-        "metro-symbolicate": "0.80.3",
-        "metro-transform-plugins": "0.80.3",
-        "metro-transform-worker": "0.80.3",
-        "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"
+        "get-intrinsic": "^1.1.3"
       },
-      "engines": {
-        "node": ">=18"
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/metro-babel-transformer": {
-      "version": "0.80.3",
+    "node_modules/got": {
+      "version": "11.8.6",
+      "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@babel/core": "^7.20.0",
-        "hermes-parser": "0.18.2",
-        "nullthrows": "^1.1.1"
+        "@sindresorhus/is": "^4.0.0",
+        "@szmarczak/http-timer": "^4.0.5",
+        "@types/cacheable-request": "^6.0.1",
+        "@types/responselike": "^1.0.0",
+        "cacheable-lookup": "^5.0.3",
+        "cacheable-request": "^7.0.2",
+        "decompress-response": "^6.0.0",
+        "http2-wrapper": "^1.0.0-beta.5.2",
+        "lowercase-keys": "^2.0.0",
+        "p-cancelable": "^2.0.0",
+        "responselike": "^2.0.0"
       },
       "engines": {
-        "node": ">=18"
+        "node": ">=10.19.0"
+      },
+      "funding": {
+        "url": "https://github.com/sindresorhus/got?sponsor=1"
       }
     },
-    "node_modules/metro-babel-transformer/node_modules/hermes-estree": {
-      "version": "0.18.2",
+    "node_modules/graceful-fs": {
+      "version": "4.2.10",
+      "license": "ISC"
+    },
+    "node_modules/graphemer": {
+      "version": "1.4.0",
+      "dev": true,
       "license": "MIT"
     },
-    "node_modules/metro-babel-transformer/node_modules/hermes-parser": {
-      "version": "0.18.2",
+    "node_modules/graphql": {
+      "version": "15.8.0",
       "license": "MIT",
-      "dependencies": {
-        "hermes-estree": "0.18.2"
+      "engines": {
+        "node": ">= 10.x"
       }
     },
-    "node_modules/metro-cache": {
-      "version": "0.80.3",
+    "node_modules/graphql-tag": {
+      "version": "2.12.6",
       "license": "MIT",
       "dependencies": {
-        "metro-core": "0.80.3",
-        "rimraf": "^3.0.2"
+        "tslib": "^2.1.0"
       },
       "engines": {
-        "node": ">=18"
+        "node": ">=10"
+      },
+      "peerDependencies": {
+        "graphql": "^0.9.0 || ^0.10.0 || ^0.11.0 || ^0.12.0 || ^0.13.0 || ^14.0.0 || ^15.0.0 || ^16.0.0"
       }
     },
-    "node_modules/metro-cache-key": {
-      "version": "0.80.3",
-      "license": "MIT",
-      "engines": {
-        "node": ">=18"
-      }
+    "node_modules/grid-index": {
+      "version": "1.1.0",
+      "license": "ISC"
     },
-    "node_modules/metro-config": {
-      "version": "0.80.3",
+    "node_modules/gunzip-maybe": {
+      "version": "1.4.2",
+      "dev": true,
       "license": "MIT",
       "dependencies": {
-        "connect": "^3.6.5",
-        "cosmiconfig": "^5.0.5",
-        "jest-validate": "^29.6.3",
-        "metro": "0.80.3",
-        "metro-cache": "0.80.3",
-        "metro-core": "0.80.3",
-        "metro-runtime": "0.80.3"
+        "browserify-zlib": "^0.1.4",
+        "is-deflate": "^1.0.0",
+        "is-gzip": "^1.0.0",
+        "peek-stream": "^1.1.0",
+        "pumpify": "^1.3.3",
+        "through2": "^2.0.3"
       },
-      "engines": {
-        "node": ">=18"
+      "bin": {
+        "gunzip-maybe": "bin.js"
       }
     },
-    "node_modules/metro-config/node_modules/cosmiconfig": {
-      "version": "5.2.1",
+    "node_modules/gunzip-maybe/node_modules/browserify-zlib": {
+      "version": "0.1.4",
+      "dev": true,
       "license": "MIT",
       "dependencies": {
-        "import-fresh": "^2.0.0",
-        "is-directory": "^0.3.1",
-        "js-yaml": "^3.13.1",
-        "parse-json": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=4"
+        "pako": "~0.2.0"
       }
     },
-    "node_modules/metro-config/node_modules/import-fresh": {
-      "version": "2.0.0",
+    "node_modules/gunzip-maybe/node_modules/pako": {
+      "version": "0.2.9",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/gzip-size": {
+      "version": "6.0.0",
+      "dev": true,
       "license": "MIT",
       "dependencies": {
-        "caller-path": "^2.0.0",
-        "resolve-from": "^3.0.0"
+        "duplexer": "^0.1.2"
       },
       "engines": {
-        "node": ">=4"
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/metro-config/node_modules/parse-json": {
-      "version": "4.0.0",
+    "node_modules/handle-thing": {
+      "version": "2.0.1",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/handlebars": {
+      "version": "4.7.8",
+      "dev": true,
       "license": "MIT",
       "dependencies": {
-        "error-ex": "^1.3.1",
-        "json-parse-better-errors": "^1.0.1"
+        "minimist": "^1.2.5",
+        "neo-async": "^2.6.2",
+        "source-map": "^0.6.1",
+        "wordwrap": "^1.0.0"
+      },
+      "bin": {
+        "handlebars": "bin/handlebars"
       },
       "engines": {
-        "node": ">=4"
+        "node": ">=0.4.7"
+      },
+      "optionalDependencies": {
+        "uglify-js": "^3.1.4"
       }
     },
-    "node_modules/metro-config/node_modules/resolve-from": {
-      "version": "3.0.0",
-      "license": "MIT",
+    "node_modules/handlebars/node_modules/source-map": {
+      "version": "0.6.1",
+      "dev": true,
+      "license": "BSD-3-Clause",
       "engines": {
-        "node": ">=4"
+        "node": ">=0.10.0"
       }
     },
-    "node_modules/metro-core": {
-      "version": "0.80.3",
+    "node_modules/has": {
+      "version": "1.0.3",
+      "dev": true,
       "license": "MIT",
       "dependencies": {
-        "lodash.throttle": "^4.1.1",
-        "metro-resolver": "0.80.3"
+        "function-bind": "^1.1.1"
       },
       "engines": {
-        "node": ">=18"
+        "node": ">= 0.4.0"
       }
     },
-    "node_modules/metro-file-map": {
-      "version": "0.80.3",
+    "node_modules/has-ansi": {
+      "version": "2.0.0",
+      "dev": true,
       "license": "MIT",
       "dependencies": {
-        "anymatch": "^3.0.3",
-        "debug": "^2.2.0",
-        "fb-watchman": "^2.0.0",
-        "graceful-fs": "^4.2.4",
-        "invariant": "^2.2.4",
-        "jest-worker": "^29.6.3",
-        "micromatch": "^4.0.4",
-        "node-abort-controller": "^3.1.1",
-        "nullthrows": "^1.1.1",
-        "walker": "^1.0.7"
+        "ansi-regex": "^2.0.0"
       },
       "engines": {
-        "node": ">=18"
-      },
-      "optionalDependencies": {
-        "fsevents": "^2.3.2"
+        "node": ">=0.10.0"
       }
     },
-    "node_modules/metro-file-map/node_modules/debug": {
-      "version": "2.6.9",
+    "node_modules/has-ansi/node_modules/ansi-regex": {
+      "version": "2.1.1",
+      "dev": true,
       "license": "MIT",
-      "dependencies": {
-        "ms": "2.0.0"
+      "engines": {
+        "node": ">=0.10.0"
       }
     },
-    "node_modules/metro-file-map/node_modules/has-flag": {
-      "version": "4.0.0",
+    "node_modules/has-bigints": {
+      "version": "1.0.2",
       "license": "MIT",
-      "engines": {
-        "node": ">=8"
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/metro-file-map/node_modules/jest-worker": {
-      "version": "29.7.0",
+    "node_modules/has-flag": {
+      "version": "3.0.0",
       "license": "MIT",
-      "dependencies": {
-        "@types/node": "*",
-        "jest-util": "^29.7.0",
-        "merge-stream": "^2.0.0",
-        "supports-color": "^8.0.0"
-      },
       "engines": {
-        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+        "node": ">=4"
       }
     },
-    "node_modules/metro-file-map/node_modules/ms": {
-      "version": "2.0.0",
-      "license": "MIT"
-    },
-    "node_modules/metro-file-map/node_modules/supports-color": {
-      "version": "8.1.1",
+    "node_modules/has-property-descriptors": {
+      "version": "1.0.2",
       "license": "MIT",
       "dependencies": {
-        "has-flag": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=10"
+        "es-define-property": "^1.0.0"
       },
       "funding": {
-        "url": "https://github.com/chalk/supports-color?sponsor=1"
+        "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/metro-minify-terser": {
-      "version": "0.80.3",
+    "node_modules/has-proto": {
+      "version": "1.0.3",
       "license": "MIT",
-      "dependencies": {
-        "terser": "^5.15.0"
-      },
       "engines": {
-        "node": ">=18"
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/metro-resolver": {
-      "version": "0.80.3",
+    "node_modules/has-symbols": {
+      "version": "1.0.3",
       "license": "MIT",
       "engines": {
-        "node": ">=18"
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/metro-runtime": {
-      "version": "0.80.3",
+    "node_modules/has-tostringtag": {
+      "version": "1.0.2",
       "license": "MIT",
       "dependencies": {
-        "@babel/runtime": "^7.0.0"
+        "has-symbols": "^1.0.3"
       },
       "engines": {
-        "node": ">=18"
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/metro-source-map": {
-      "version": "0.80.3",
+    "node_modules/has-unicode": {
+      "version": "2.0.1",
+      "devOptional": true,
+      "license": "ISC"
+    },
+    "node_modules/has-value": {
+      "version": "1.0.0",
       "license": "MIT",
+      "optional": true,
       "dependencies": {
-        "@babel/traverse": "^7.20.0",
-        "@babel/types": "^7.20.0",
-        "invariant": "^2.2.4",
-        "metro-symbolicate": "0.80.3",
-        "nullthrows": "^1.1.1",
-        "ob1": "0.80.3",
-        "source-map": "^0.5.6",
-        "vlq": "^1.0.0"
+        "get-value": "^2.0.6",
+        "has-values": "^1.0.0",
+        "isobject": "^3.0.0"
       },
-      "engines": {
-        "node": ">=18"
-      }
-    },
-    "node_modules/metro-source-map/node_modules/source-map": {
-      "version": "0.5.7",
-      "license": "BSD-3-Clause",
       "engines": {
         "node": ">=0.10.0"
       }
     },
-    "node_modules/metro-symbolicate": {
-      "version": "0.80.3",
+    "node_modules/has-values": {
+      "version": "1.0.0",
       "license": "MIT",
+      "optional": true,
       "dependencies": {
-        "invariant": "^2.2.4",
-        "metro-source-map": "0.80.3",
-        "nullthrows": "^1.1.1",
-        "source-map": "^0.5.6",
-        "through2": "^2.0.1",
-        "vlq": "^1.0.0"
-      },
-      "bin": {
-        "metro-symbolicate": "src/index.js"
+        "is-number": "^3.0.0",
+        "kind-of": "^4.0.0"
       },
-      "engines": {
-        "node": ">=18"
-      }
-    },
-    "node_modules/metro-symbolicate/node_modules/source-map": {
-      "version": "0.5.7",
-      "license": "BSD-3-Clause",
       "engines": {
         "node": ">=0.10.0"
       }
     },
-    "node_modules/metro-transform-plugins": {
-      "version": "0.80.3",
+    "node_modules/has-values/node_modules/is-number": {
+      "version": "3.0.0",
       "license": "MIT",
+      "optional": true,
       "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"
+        "kind-of": "^3.0.2"
       },
       "engines": {
-        "node": ">=18"
+        "node": ">=0.10.0"
       }
     },
-    "node_modules/metro-transform-worker": {
-      "version": "0.80.3",
+    "node_modules/has-values/node_modules/is-number/node_modules/kind-of": {
+      "version": "3.2.2",
       "license": "MIT",
+      "optional": true,
       "dependencies": {
-        "@babel/core": "^7.20.0",
-        "@babel/generator": "^7.20.0",
-        "@babel/parser": "^7.20.0",
-        "@babel/types": "^7.20.0",
-        "metro": "0.80.3",
-        "metro-babel-transformer": "0.80.3",
-        "metro-cache": "0.80.3",
-        "metro-cache-key": "0.80.3",
-        "metro-source-map": "0.80.3",
-        "metro-transform-plugins": "0.80.3",
-        "nullthrows": "^1.1.1"
+        "is-buffer": "^1.1.5"
       },
       "engines": {
-        "node": ">=18"
+        "node": ">=0.10.0"
       }
     },
-    "node_modules/metro/node_modules/ansi-styles": {
-      "version": "4.3.0",
+    "node_modules/has-values/node_modules/kind-of": {
+      "version": "4.0.0",
       "license": "MIT",
+      "optional": true,
       "dependencies": {
-        "color-convert": "^2.0.1"
+        "is-buffer": "^1.1.5"
       },
       "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
+        "node": ">=0.10.0"
       }
     },
-    "node_modules/metro/node_modules/chalk": {
-      "version": "4.1.2",
+    "node_modules/hash-base": {
+      "version": "3.1.0",
       "license": "MIT",
       "dependencies": {
-        "ansi-styles": "^4.1.0",
-        "supports-color": "^7.1.0"
+        "inherits": "^2.0.4",
+        "readable-stream": "^3.6.0",
+        "safe-buffer": "^5.2.0"
       },
       "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/chalk?sponsor=1"
+        "node": ">=4"
       }
     },
-    "node_modules/metro/node_modules/ci-info": {
-      "version": "2.0.0",
-      "license": "MIT"
-    },
-    "node_modules/metro/node_modules/color-convert": {
-      "version": "2.0.1",
+    "node_modules/hash-base/node_modules/readable-stream": {
+      "version": "3.6.2",
       "license": "MIT",
       "dependencies": {
-        "color-name": "~1.1.4"
+        "inherits": "^2.0.3",
+        "string_decoder": "^1.1.1",
+        "util-deprecate": "^1.0.1"
       },
       "engines": {
-        "node": ">=7.0.0"
+        "node": ">= 6"
       }
     },
-    "node_modules/metro/node_modules/color-name": {
-      "version": "1.1.4",
+    "node_modules/hash-base/node_modules/safe-buffer": {
+      "version": "5.2.1",
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/feross"
+        },
+        {
+          "type": "patreon",
+          "url": "https://www.patreon.com/feross"
+        },
+        {
+          "type": "consulting",
+          "url": "https://feross.org/support"
+        }
+      ],
       "license": "MIT"
     },
-    "node_modules/metro/node_modules/debug": {
-      "version": "2.6.9",
+    "node_modules/hash.js": {
+      "version": "1.1.7",
       "license": "MIT",
       "dependencies": {
-        "ms": "2.0.0"
+        "inherits": "^2.0.3",
+        "minimalistic-assert": "^1.0.1"
       }
     },
-    "node_modules/metro/node_modules/has-flag": {
-      "version": "4.0.0",
+    "node_modules/hasown": {
+      "version": "2.0.2",
       "license": "MIT",
+      "dependencies": {
+        "function-bind": "^1.1.2"
+      },
       "engines": {
-        "node": ">=8"
+        "node": ">= 0.4"
       }
     },
-    "node_modules/metro/node_modules/hermes-estree": {
-      "version": "0.18.2",
-      "license": "MIT"
-    },
-    "node_modules/metro/node_modules/hermes-parser": {
-      "version": "0.18.2",
+    "node_modules/hast-util-heading-rank": {
+      "version": "3.0.0",
+      "dev": true,
       "license": "MIT",
       "dependencies": {
-        "hermes-estree": "0.18.2"
+        "@types/hast": "^3.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/unified"
       }
     },
-    "node_modules/metro/node_modules/jest-worker": {
-      "version": "29.7.0",
+    "node_modules/hast-util-is-element": {
+      "version": "3.0.0",
+      "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@types/node": "*",
-        "jest-util": "^29.7.0",
-        "merge-stream": "^2.0.0",
-        "supports-color": "^8.0.0"
+        "@types/hast": "^3.0.0"
       },
-      "engines": {
-        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/unified"
       }
     },
-    "node_modules/metro/node_modules/jest-worker/node_modules/supports-color": {
-      "version": "8.1.1",
+    "node_modules/hast-util-to-string": {
+      "version": "3.0.0",
+      "dev": true,
       "license": "MIT",
       "dependencies": {
-        "has-flag": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=10"
+        "@types/hast": "^3.0.0"
       },
       "funding": {
-        "url": "https://github.com/chalk/supports-color?sponsor=1"
-      }
-    },
-    "node_modules/metro/node_modules/ms": {
-      "version": "2.0.0",
-      "license": "MIT"
+        "type": "opencollective",
+        "url": "https://opencollective.com/unified"
+      }
     },
-    "node_modules/metro/node_modules/serialize-error": {
-      "version": "2.1.0",
+    "node_modules/he": {
+      "version": "1.2.0",
       "license": "MIT",
-      "engines": {
-        "node": ">=0.10.0"
+      "bin": {
+        "he": "bin/he"
       }
     },
-    "node_modules/metro/node_modules/source-map": {
-      "version": "0.5.7",
-      "license": "BSD-3-Clause",
-      "engines": {
-        "node": ">=0.10.0"
+    "node_modules/hermes-estree": {
+      "version": "0.22.0",
+      "resolved": "https://registry.npmjs.org/hermes-estree/-/hermes-estree-0.22.0.tgz",
+      "integrity": "sha512-FLBt5X9OfA8BERUdc6aZS36Xz3rRuB0Y/mfocSADWEJfomc1xfene33GdyAmtTkKTBXTN/EgAy+rjTKkkZJHlw=="
+    },
+    "node_modules/hermes-parser": {
+      "version": "0.22.0",
+      "resolved": "https://registry.npmjs.org/hermes-parser/-/hermes-parser-0.22.0.tgz",
+      "integrity": "sha512-gn5RfZiEXCsIWsFGsKiykekktUoh0PdFWYocXsUdZIyWSckT6UIyPcyyUIPSR3kpnELWeK3n3ztAse7Mat6PSA==",
+      "dependencies": {
+        "hermes-estree": "0.22.0"
       }
     },
-    "node_modules/metro/node_modules/supports-color": {
-      "version": "7.2.0",
+    "node_modules/hermes-profile-transformer": {
+      "version": "0.0.6",
       "license": "MIT",
+      "peer": true,
       "dependencies": {
-        "has-flag": "^4.0.0"
+        "source-map": "^0.7.3"
       },
       "engines": {
         "node": ">=8"
       }
     },
-    "node_modules/metro/node_modules/ws": {
-      "version": "7.5.9",
+    "node_modules/hmac-drbg": {
+      "version": "1.0.1",
       "license": "MIT",
-      "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
-        }
+      "dependencies": {
+        "hash.js": "^1.0.3",
+        "minimalistic-assert": "^1.0.0",
+        "minimalistic-crypto-utils": "^1.0.1"
       }
     },
-    "node_modules/micromatch": {
-      "version": "4.0.5",
-      "license": "MIT",
+    "node_modules/hoist-non-react-statics": {
+      "version": "3.3.2",
+      "license": "BSD-3-Clause",
       "dependencies": {
-        "braces": "^3.0.2",
-        "picomatch": "^2.3.1"
+        "react-is": "^16.7.0"
+      }
+    },
+    "node_modules/hoist-non-react-statics/node_modules/react-is": {
+      "version": "16.13.1",
+      "license": "MIT"
+    },
+    "node_modules/hosted-git-info": {
+      "version": "4.1.0",
+      "dev": true,
+      "license": "ISC",
+      "dependencies": {
+        "lru-cache": "^6.0.0"
       },
       "engines": {
-        "node": ">=8.6"
+        "node": ">=10"
       }
     },
-    "node_modules/miller-rabin": {
-      "version": "4.0.1",
+    "node_modules/howler": {
+      "version": "2.2.4",
+      "license": "MIT"
+    },
+    "node_modules/hpack.js": {
+      "version": "2.1.6",
+      "dev": true,
       "license": "MIT",
       "dependencies": {
-        "bn.js": "^4.0.0",
-        "brorand": "^1.0.1"
+        "inherits": "^2.0.1",
+        "obuf": "^1.0.0",
+        "readable-stream": "^2.0.1",
+        "wbuf": "^1.1.0"
+      }
+    },
+    "node_modules/html-encoding-sniffer": {
+      "version": "3.0.0",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "whatwg-encoding": "^2.0.0"
       },
-      "bin": {
-        "miller-rabin": "bin/miller-rabin"
+      "engines": {
+        "node": ">=12"
       }
     },
-    "node_modules/miller-rabin/node_modules/bn.js": {
-      "version": "4.12.0",
+    "node_modules/html-entities": {
+      "version": "2.5.2",
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/mdevils"
+        },
+        {
+          "type": "patreon",
+          "url": "https://patreon.com/mdevils"
+        }
+      ],
       "license": "MIT"
     },
-    "node_modules/mime": {
-      "version": "2.6.0",
+    "node_modules/html-escaper": {
+      "version": "2.0.2",
+      "license": "MIT"
+    },
+    "node_modules/html-minifier-terser": {
+      "version": "6.1.0",
       "license": "MIT",
+      "dependencies": {
+        "camel-case": "^4.1.2",
+        "clean-css": "^5.2.2",
+        "commander": "^8.3.0",
+        "he": "^1.2.0",
+        "param-case": "^3.0.4",
+        "relateurl": "^0.2.7",
+        "terser": "^5.10.0"
+      },
       "bin": {
-        "mime": "cli.js"
+        "html-minifier-terser": "cli.js"
       },
       "engines": {
-        "node": ">=4.0.0"
+        "node": ">=12"
       }
     },
-    "node_modules/mime-db": {
-      "version": "1.52.0",
+    "node_modules/html-minifier-terser/node_modules/commander": {
+      "version": "8.3.0",
       "license": "MIT",
       "engines": {
-        "node": ">= 0.6"
+        "node": ">= 12"
       }
     },
-    "node_modules/mime-types": {
-      "version": "2.1.35",
+    "node_modules/html-tags": {
+      "version": "3.2.0",
+      "dev": true,
       "license": "MIT",
-      "dependencies": {
-        "mime-db": "1.52.0"
-      },
       "engines": {
-        "node": ">= 0.6"
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/mimic-fn": {
-      "version": "2.1.0",
+    "node_modules/html-webpack-plugin": {
+      "version": "5.5.3",
       "license": "MIT",
+      "dependencies": {
+        "@types/html-minifier-terser": "^6.0.0",
+        "html-minifier-terser": "^6.0.2",
+        "lodash": "^4.17.21",
+        "pretty-error": "^4.0.0",
+        "tapable": "^2.0.0"
+      },
       "engines": {
-        "node": ">=6"
+        "node": ">=10.13.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/html-webpack-plugin"
+      },
+      "peerDependencies": {
+        "webpack": "^5.20.0"
       }
     },
-    "node_modules/mimic-response": {
-      "version": "1.0.1",
-      "dev": true,
+    "node_modules/html2canvas": {
+      "version": "1.4.1",
       "license": "MIT",
+      "dependencies": {
+        "css-line-break": "^2.1.0",
+        "text-segmentation": "^1.0.3"
+      },
       "engines": {
-        "node": ">=4"
+        "node": ">=8.0.0"
       }
     },
-    "node_modules/min-indent": {
-      "version": "1.0.1",
-      "dev": true,
+    "node_modules/htmlparser2": {
+      "version": "7.2.0",
+      "funding": [
+        "https://github.com/fb55/htmlparser2?sponsor=1",
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/fb55"
+        }
+      ],
       "license": "MIT",
+      "dependencies": {
+        "domelementtype": "^2.0.1",
+        "domhandler": "^4.2.2",
+        "domutils": "^2.8.0",
+        "entities": "^3.0.1"
+      }
+    },
+    "node_modules/htmlparser2/node_modules/entities": {
+      "version": "3.0.1",
+      "license": "BSD-2-Clause",
       "engines": {
-        "node": ">=4"
+        "node": ">=0.12"
+      },
+      "funding": {
+        "url": "https://github.com/fb55/entities?sponsor=1"
       }
     },
-    "node_modules/minimalistic-assert": {
-      "version": "1.0.1",
-      "license": "ISC"
+    "node_modules/http-cache-semantics": {
+      "version": "4.1.1",
+      "dev": true,
+      "license": "BSD-2-Clause"
     },
-    "node_modules/minimalistic-crypto-utils": {
-      "version": "1.0.1",
+    "node_modules/http-deceiver": {
+      "version": "1.2.7",
+      "dev": true,
       "license": "MIT"
     },
-    "node_modules/minimatch": {
-      "version": "3.1.2",
-      "license": "ISC",
+    "node_modules/http-errors": {
+      "version": "2.0.0",
+      "license": "MIT",
       "dependencies": {
-        "brace-expansion": "^1.1.7"
+        "depd": "2.0.0",
+        "inherits": "2.0.4",
+        "setprototypeof": "1.2.0",
+        "statuses": "2.0.1",
+        "toidentifier": "1.0.1"
       },
       "engines": {
-        "node": "*"
+        "node": ">= 0.8"
       }
     },
-    "node_modules/minimist": {
-      "version": "1.2.8",
-      "license": "MIT",
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
+    "node_modules/http-parser-js": {
+      "version": "0.5.8",
+      "dev": true,
+      "license": "MIT"
     },
-    "node_modules/minipass": {
-      "version": "3.3.6",
-      "license": "ISC",
+    "node_modules/http-proxy": {
+      "version": "1.18.1",
+      "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "yallist": "^4.0.0"
+        "eventemitter3": "^4.0.0",
+        "follow-redirects": "^1.0.0",
+        "requires-port": "^1.0.0"
       },
       "engines": {
-        "node": ">=8"
+        "node": ">=8.0.0"
       }
     },
-    "node_modules/minipass-collect": {
-      "version": "1.0.2",
-      "license": "ISC",
+    "node_modules/http-proxy-agent": {
+      "version": "5.0.0",
+      "license": "MIT",
       "dependencies": {
-        "minipass": "^3.0.0"
+        "@tootallnate/once": "2",
+        "agent-base": "6",
+        "debug": "4"
       },
       "engines": {
-        "node": ">= 8"
+        "node": ">= 6"
       }
     },
-    "node_modules/minipass-flush": {
-      "version": "1.0.5",
-      "license": "ISC",
+    "node_modules/http-proxy-middleware": {
+      "version": "2.0.6",
+      "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "minipass": "^3.0.0"
+        "@types/http-proxy": "^1.17.8",
+        "http-proxy": "^1.18.1",
+        "is-glob": "^4.0.1",
+        "is-plain-obj": "^3.0.0",
+        "micromatch": "^4.0.2"
       },
       "engines": {
-        "node": ">= 8"
+        "node": ">=12.0.0"
+      },
+      "peerDependencies": {
+        "@types/express": "^4.17.13"
+      },
+      "peerDependenciesMeta": {
+        "@types/express": {
+          "optional": true
+        }
       }
     },
-    "node_modules/minipass-pipeline": {
-      "version": "1.2.4",
-      "license": "ISC",
-      "dependencies": {
-        "minipass": "^3.0.0"
-      },
+    "node_modules/http-proxy-middleware/node_modules/is-plain-obj": {
+      "version": "3.0.0",
+      "dev": true,
+      "license": "MIT",
       "engines": {
-        "node": ">=8"
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/minizlib": {
-      "version": "2.1.2",
+    "node_modules/http-server": {
+      "version": "14.1.1",
+      "dev": true,
       "license": "MIT",
       "dependencies": {
-        "minipass": "^3.0.0",
-        "yallist": "^4.0.0"
+        "basic-auth": "^2.0.1",
+        "chalk": "^4.1.2",
+        "corser": "^2.0.1",
+        "he": "^1.2.0",
+        "html-encoding-sniffer": "^3.0.0",
+        "http-proxy": "^1.18.1",
+        "mime": "^1.6.0",
+        "minimist": "^1.2.6",
+        "opener": "^1.5.1",
+        "portfinder": "^1.0.28",
+        "secure-compare": "3.0.1",
+        "union": "~0.5.0",
+        "url-join": "^4.0.1"
+      },
+      "bin": {
+        "http-server": "bin/http-server"
       },
       "engines": {
-        "node": ">= 8"
+        "node": ">=12"
       }
     },
-    "node_modules/mixin-deep": {
-      "version": "1.3.2",
+    "node_modules/http-server/node_modules/ansi-styles": {
+      "version": "4.3.0",
+      "dev": true,
       "license": "MIT",
-      "optional": true,
       "dependencies": {
-        "for-in": "^1.0.2",
-        "is-extendable": "^1.0.1"
+        "color-convert": "^2.0.1"
       },
       "engines": {
-        "node": ">=0.10.0"
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
       }
     },
-    "node_modules/mixin-object": {
-      "version": "2.0.1",
+    "node_modules/http-server/node_modules/chalk": {
+      "version": "4.1.2",
+      "dev": true,
       "license": "MIT",
       "dependencies": {
-        "for-in": "^0.1.3",
-        "is-extendable": "^0.1.1"
+        "ansi-styles": "^4.1.0",
+        "supports-color": "^7.1.0"
       },
       "engines": {
-        "node": ">=0.10.0"
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/chalk?sponsor=1"
       }
     },
-    "node_modules/mixin-object/node_modules/for-in": {
-      "version": "0.1.8",
+    "node_modules/http-server/node_modules/color-convert": {
+      "version": "2.0.1",
+      "dev": true,
       "license": "MIT",
+      "dependencies": {
+        "color-name": "~1.1.4"
+      },
       "engines": {
-        "node": ">=0.10.0"
+        "node": ">=7.0.0"
       }
     },
-    "node_modules/mixin-object/node_modules/is-extendable": {
-      "version": "0.1.1",
+    "node_modules/http-server/node_modules/color-name": {
+      "version": "1.1.4",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/http-server/node_modules/has-flag": {
+      "version": "4.0.0",
+      "dev": true,
       "license": "MIT",
       "engines": {
-        "node": ">=0.10.0"
+        "node": ">=8"
       }
     },
-    "node_modules/mkdirp": {
-      "version": "1.0.4",
+    "node_modules/http-server/node_modules/mime": {
+      "version": "1.6.0",
+      "dev": true,
       "license": "MIT",
       "bin": {
-        "mkdirp": "bin/cmd.js"
+        "mime": "cli.js"
       },
       "engines": {
-        "node": ">=10"
+        "node": ">=4"
       }
     },
-    "node_modules/mkdirp-classic": {
-      "version": "0.5.3",
-      "resolved": "https://registry.npmjs.org/mkdirp-classic/-/mkdirp-classic-0.5.3.tgz",
-      "integrity": "sha512-gKLcREMhtuZRwRAfqP3RFW+TK4JqApVBtOIftVgjuABpAtpxhPGaDcfvbhNvD0B8iD1oUr/txX35NjcaY6Ns/A=="
-    },
-    "node_modules/mrmime": {
-      "version": "1.0.1",
+    "node_modules/http-server/node_modules/supports-color": {
+      "version": "7.2.0",
       "dev": true,
       "license": "MIT",
+      "dependencies": {
+        "has-flag": "^4.0.0"
+      },
       "engines": {
-        "node": ">=10"
+        "node": ">=8"
       }
     },
-    "node_modules/ms": {
-      "version": "2.1.2",
+    "node_modules/http-server/node_modules/url-join": {
+      "version": "4.0.1",
+      "dev": true,
       "license": "MIT"
     },
-    "node_modules/multicast-dns": {
-      "version": "7.2.5",
-      "resolved": "https://registry.npmjs.org/multicast-dns/-/multicast-dns-7.2.5.tgz",
-      "integrity": "sha512-2eznPJP8z2BFLX50tf0LuODrpINqP1RVIm/CObbTcBRITQgmC/TjcREF1NeTBzIcR5XO/ukWo+YHOjBbFwIupg==",
+    "node_modules/http2-wrapper": {
+      "version": "1.0.3",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "dns-packet": "^5.2.2",
-        "thunky": "^1.0.2"
+        "quick-lru": "^5.1.1",
+        "resolve-alpn": "^1.0.0"
       },
-      "bin": {
-        "multicast-dns": "cli.js"
+      "engines": {
+        "node": ">=10.19.0"
       }
     },
-    "node_modules/murmurhash-js": {
+    "node_modules/https-browserify": {
       "version": "1.0.0",
       "license": "MIT"
     },
-    "node_modules/mv": {
-      "version": "2.1.1",
+    "node_modules/https-proxy-agent": {
+      "version": "5.0.1",
       "license": "MIT",
-      "optional": true,
       "dependencies": {
-        "mkdirp": "~0.5.1",
-        "ncp": "~2.0.0",
-        "rimraf": "~2.4.0"
+        "agent-base": "6",
+        "debug": "4"
       },
       "engines": {
-        "node": ">=0.8.0"
+        "node": ">= 6"
       }
     },
-    "node_modules/mv/node_modules/glob": {
-      "version": "6.0.4",
-      "license": "ISC",
-      "optional": true,
-      "dependencies": {
-        "inflight": "^1.0.4",
-        "inherits": "2",
-        "minimatch": "2 || 3",
-        "once": "^1.3.0",
-        "path-is-absolute": "^1.0.0"
-      },
+    "node_modules/human-signals": {
+      "version": "2.1.0",
+      "license": "Apache-2.0",
       "engines": {
-        "node": "*"
+        "node": ">=10.17.0"
       }
     },
-    "node_modules/mv/node_modules/mkdirp": {
-      "version": "0.5.6",
+    "node_modules/humanize-ms": {
+      "version": "1.2.1",
+      "dev": true,
       "license": "MIT",
-      "optional": true,
       "dependencies": {
-        "minimist": "^1.2.6"
-      },
-      "bin": {
-        "mkdirp": "bin/cmd.js"
+        "ms": "^2.0.0"
       }
     },
-    "node_modules/mv/node_modules/rimraf": {
-      "version": "2.4.5",
-      "license": "ISC",
+    "node_modules/hyperdyperid": {
+      "version": "1.2.0",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=10.18"
+      }
+    },
+    "node_modules/hyphenate-style-name": {
+      "version": "1.0.4",
+      "license": "BSD-3-Clause"
+    },
+    "node_modules/iconv-corefoundation": {
+      "version": "1.1.7",
+      "dev": true,
+      "license": "MIT",
       "optional": true,
+      "os": [
+        "darwin"
+      ],
       "dependencies": {
-        "glob": "^6.0.1"
+        "cli-truncate": "^2.1.0",
+        "node-addon-api": "^1.6.3"
       },
-      "bin": {
-        "rimraf": "bin.js"
+      "engines": {
+        "node": "^8.11.2 || >=10"
       }
     },
-    "node_modules/mz": {
-      "version": "2.7.0",
+    "node_modules/iconv-lite": {
+      "version": "0.6.3",
       "license": "MIT",
       "dependencies": {
-        "any-promise": "^1.0.0",
-        "object-assign": "^4.0.1",
-        "thenify-all": "^1.0.0"
+        "safer-buffer": ">= 2.1.2 < 3.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
       }
     },
-    "node_modules/nan": {
-      "version": "2.17.0",
-      "license": "MIT",
-      "optional": true
+    "node_modules/idb-keyval": {
+      "version": "6.2.1",
+      "license": "Apache-2.0"
     },
-    "node_modules/nanoid": {
-      "version": "3.3.7",
+    "node_modules/ieee754": {
+      "version": "1.2.1",
       "funding": [
         {
           "type": "github",
-          "url": "https://github.com/sponsors/ai"
+          "url": "https://github.com/sponsors/feross"
+        },
+        {
+          "type": "patreon",
+          "url": "https://www.patreon.com/feross"
+        },
+        {
+          "type": "consulting",
+          "url": "https://feross.org/support"
         }
       ],
-      "license": "MIT",
-      "bin": {
-        "nanoid": "bin/nanoid.cjs"
-      },
+      "license": "BSD-3-Clause"
+    },
+    "node_modules/ignore": {
+      "version": "5.3.1",
+      "license": "MIT",
       "engines": {
-        "node": "^10 || ^12 || ^13.7 || ^14 || >=15.0.1"
+        "node": ">= 4"
       }
     },
-    "node_modules/nanomatch": {
-      "version": "1.2.13",
+    "node_modules/image-size": {
+      "version": "1.1.1",
       "license": "MIT",
-      "optional": true,
       "dependencies": {
-        "arr-diff": "^4.0.0",
-        "array-unique": "^0.3.2",
-        "define-property": "^2.0.2",
-        "extend-shallow": "^3.0.2",
-        "fragment-cache": "^0.2.1",
-        "is-windows": "^1.0.2",
-        "kind-of": "^6.0.2",
-        "object.pick": "^1.3.0",
-        "regex-not": "^1.0.0",
-        "snapdragon": "^0.8.1",
-        "to-regex": "^3.0.1"
+        "queue": "6.0.2"
+      },
+      "bin": {
+        "image-size": "bin/image-size.js"
       },
       "engines": {
-        "node": ">=0.10.0"
+        "node": ">=16.x"
       }
     },
-    "node_modules/natural-compare": {
-      "version": "1.4.0",
+    "node_modules/immediate": {
+      "version": "3.0.6",
       "license": "MIT"
     },
-    "node_modules/ncp": {
-      "version": "2.0.0",
+    "node_modules/import-fresh": {
+      "version": "3.3.0",
       "license": "MIT",
-      "optional": true,
-      "bin": {
-        "ncp": "bin/ncp"
+      "dependencies": {
+        "parent-module": "^1.0.0",
+        "resolve-from": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=6"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/negotiator": {
-      "version": "0.6.3",
+    "node_modules/import-fresh/node_modules/resolve-from": {
+      "version": "4.0.0",
       "license": "MIT",
       "engines": {
-        "node": ">= 0.6"
+        "node": ">=4"
       }
     },
-    "node_modules/neo-async": {
-      "version": "2.6.2",
-      "license": "MIT"
-    },
-    "node_modules/nice-try": {
-      "version": "1.0.5",
-      "license": "MIT"
-    },
-    "node_modules/no-case": {
-      "version": "3.0.4",
-      "license": "MIT",
+    "node_modules/import-in-the-middle": {
+      "version": "1.4.2",
+      "license": "Apache-2.0",
+      "peer": true,
       "dependencies": {
-        "lower-case": "^2.0.2",
-        "tslib": "^2.0.3"
+        "acorn": "^8.8.2",
+        "acorn-import-assertions": "^1.9.0",
+        "cjs-module-lexer": "^1.2.2",
+        "module-details-from-path": "^1.0.3"
       }
     },
-    "node_modules/nocache": {
-      "version": "3.0.4",
-      "resolved": "https://registry.npmjs.org/nocache/-/nocache-3.0.4.tgz",
-      "integrity": "sha512-WDD0bdg9mbq6F4mRxEYcPWwfA1vxd0mrvKOyxI7Xj/atfRHVeutzuWByG//jfm4uPzp0y4Kj051EORCBSQMycw==",
+    "node_modules/import-in-the-middle/node_modules/acorn": {
+      "version": "8.11.3",
+      "license": "MIT",
+      "peer": true,
+      "bin": {
+        "acorn": "bin/acorn"
+      },
       "engines": {
-        "node": ">=12.0.0"
+        "node": ">=0.4.0"
       }
     },
-    "node_modules/nock": {
-      "version": "13.3.3",
+    "node_modules/import-in-the-middle/node_modules/acorn-import-assertions": {
+      "version": "1.9.0",
+      "license": "MIT",
+      "peer": true,
+      "peerDependencies": {
+        "acorn": "^8"
+      }
+    },
+    "node_modules/import-local": {
+      "version": "3.1.0",
       "license": "MIT",
       "dependencies": {
-        "debug": "^4.1.0",
-        "json-stringify-safe": "^5.0.1",
-        "lodash": "^4.17.21",
-        "propagate": "^2.0.0"
+        "pkg-dir": "^4.2.0",
+        "resolve-cwd": "^3.0.0"
+      },
+      "bin": {
+        "import-local-fixture": "fixtures/cli.js"
       },
       "engines": {
-        "node": ">= 10.13"
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/node-abort-controller": {
-      "version": "3.1.1",
-      "license": "MIT"
-    },
-    "node_modules/node-addon-api": {
-      "version": "1.7.2",
-      "dev": true,
+    "node_modules/import-local/node_modules/find-up": {
+      "version": "4.1.0",
       "license": "MIT",
-      "optional": true
+      "dependencies": {
+        "locate-path": "^5.0.0",
+        "path-exists": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
     },
-    "node_modules/node-dir": {
-      "version": "0.1.17",
+    "node_modules/import-local/node_modules/locate-path": {
+      "version": "5.0.0",
       "license": "MIT",
       "dependencies": {
-        "minimatch": "^3.0.2"
+        "p-locate": "^4.1.0"
       },
       "engines": {
-        "node": ">= 0.10.5"
+        "node": ">=8"
       }
     },
-    "node_modules/node-fetch": {
-      "version": "2.6.7",
+    "node_modules/import-local/node_modules/p-limit": {
+      "version": "2.3.0",
       "license": "MIT",
       "dependencies": {
-        "whatwg-url": "^5.0.0"
+        "p-try": "^2.0.0"
       },
       "engines": {
-        "node": "4.x || >=6.0.0"
-      },
-      "peerDependencies": {
-        "encoding": "^0.1.0"
+        "node": ">=6"
       },
-      "peerDependenciesMeta": {
-        "encoding": {
-          "optional": true
-        }
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/node-fetch-native": {
-      "version": "1.6.4",
-      "resolved": "https://registry.npmjs.org/node-fetch-native/-/node-fetch-native-1.6.4.tgz",
-      "integrity": "sha512-IhOigYzAKHd244OC0JIMIUrjzctirCmPkaIfhDeGcEETWof5zKYUW7e7MYvChGWh/4CJeXEgsRyGzuF334rOOQ=="
-    },
-    "node_modules/node-fetch/node_modules/tr46": {
-      "version": "0.0.3",
-      "license": "MIT"
-    },
-    "node_modules/node-fetch/node_modules/webidl-conversions": {
-      "version": "3.0.1",
-      "license": "BSD-2-Clause"
-    },
-    "node_modules/node-fetch/node_modules/whatwg-url": {
-      "version": "5.0.0",
+    "node_modules/import-local/node_modules/p-locate": {
+      "version": "4.1.0",
       "license": "MIT",
       "dependencies": {
-        "tr46": "~0.0.3",
-        "webidl-conversions": "^3.0.0"
+        "p-limit": "^2.2.0"
+      },
+      "engines": {
+        "node": ">=8"
       }
     },
-    "node_modules/node-forge": {
-      "version": "1.3.1",
-      "license": "(BSD-3-Clause OR GPL-2.0)",
+    "node_modules/import-local/node_modules/path-exists": {
+      "version": "4.0.0",
+      "license": "MIT",
       "engines": {
-        "node": ">= 6.13.0"
+        "node": ">=8"
       }
     },
-    "node_modules/node-int64": {
-      "version": "0.4.0",
-      "license": "MIT"
-    },
-    "node_modules/node-libs-browser": {
-      "version": "2.2.1",
+    "node_modules/import-local/node_modules/pkg-dir": {
+      "version": "4.2.0",
       "license": "MIT",
       "dependencies": {
-        "assert": "^1.1.1",
-        "browserify-zlib": "^0.2.0",
-        "buffer": "^4.3.0",
-        "console-browserify": "^1.1.0",
-        "constants-browserify": "^1.0.0",
-        "crypto-browserify": "^3.11.0",
-        "domain-browser": "^1.1.1",
-        "events": "^3.0.0",
-        "https-browserify": "^1.0.0",
-        "os-browserify": "^0.3.0",
-        "path-browserify": "0.0.1",
-        "process": "^0.11.10",
-        "punycode": "^1.2.4",
-        "querystring-es3": "^0.2.0",
-        "readable-stream": "^2.3.3",
-        "stream-browserify": "^2.0.1",
-        "stream-http": "^2.7.2",
-        "string_decoder": "^1.0.0",
-        "timers-browserify": "^2.0.4",
-        "tty-browserify": "0.0.0",
-        "url": "^0.11.0",
-        "util": "^0.11.0",
-        "vm-browserify": "^1.0.1"
+        "find-up": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=8"
       }
     },
-    "node_modules/node-libs-browser/node_modules/buffer": {
-      "version": "4.9.2",
+    "node_modules/imurmurhash": {
+      "version": "0.1.4",
       "license": "MIT",
-      "dependencies": {
-        "base64-js": "^1.0.2",
-        "ieee754": "^1.1.4",
-        "isarray": "^1.0.0"
+      "engines": {
+        "node": ">=0.8.19"
       }
     },
-    "node_modules/node-libs-browser/node_modules/isarray": {
-      "version": "1.0.0",
-      "license": "MIT"
-    },
-    "node_modules/node-libs-browser/node_modules/punycode": {
-      "version": "1.4.1",
-      "license": "MIT"
-    },
-    "node_modules/node-releases": {
-      "version": "2.0.14",
-      "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.14.tgz",
-      "integrity": "sha512-y10wOWt8yZpqXmOgRo77WaHEmhYQYGNA6y421PKsKYWEK8aW+cqAphborZDhqfyKrbZEN92CN1X2KbafY2s7Yw=="
-    },
-    "node_modules/node-stream-zip": {
-      "version": "1.15.0",
-      "resolved": "https://registry.npmjs.org/node-stream-zip/-/node-stream-zip-1.15.0.tgz",
-      "integrity": "sha512-LN4fydt9TqhZhThkZIVQnF9cwjU3qmUH9h78Mx/K7d3VvfRqqwthLwJEUOEL0QPZ0XQmNN7be5Ggit5+4dq3Bw==",
+    "node_modules/indent-string": {
+      "version": "4.0.0",
+      "license": "MIT",
       "engines": {
-        "node": ">=0.12.0"
-      },
-      "funding": {
-        "type": "github",
-        "url": "https://github.com/sponsors/antelle"
+        "node": ">=8"
       }
     },
-    "node_modules/normalize-package-data": {
-      "version": "2.5.0",
-      "license": "BSD-2-Clause",
+    "node_modules/infer-owner": {
+      "version": "1.0.4",
+      "dev": true,
+      "license": "ISC"
+    },
+    "node_modules/inflight": {
+      "version": "1.0.6",
+      "license": "ISC",
       "dependencies": {
-        "hosted-git-info": "^2.1.4",
-        "resolve": "^1.10.0",
-        "semver": "2 || 3 || 4 || 5",
-        "validate-npm-package-license": "^3.0.1"
+        "once": "^1.3.0",
+        "wrappy": "1"
       }
     },
-    "node_modules/normalize-package-data/node_modules/hosted-git-info": {
-      "version": "2.8.9",
+    "node_modules/inherits": {
+      "version": "2.0.4",
       "license": "ISC"
     },
-    "node_modules/normalize-package-data/node_modules/semver": {
-      "version": "5.7.2",
-      "license": "ISC",
-      "bin": {
-        "semver": "bin/semver"
+    "node_modules/ini": {
+      "version": "1.3.8",
+      "license": "ISC"
+    },
+    "node_modules/inline-style-prefixer": {
+      "version": "6.0.1",
+      "license": "MIT",
+      "dependencies": {
+        "css-in-js-utils": "^2.0.0"
       }
     },
-    "node_modules/normalize-path": {
-      "version": "3.0.0",
+    "node_modules/internal-ip": {
+      "version": "4.3.0",
       "license": "MIT",
+      "dependencies": {
+        "default-gateway": "^4.2.0",
+        "ipaddr.js": "^1.9.0"
+      },
       "engines": {
-        "node": ">=0.10.0"
+        "node": ">=6"
       }
     },
-    "node_modules/normalize-url": {
-      "version": "6.1.0",
-      "dev": true,
+    "node_modules/internal-ip/node_modules/cross-spawn": {
+      "version": "6.0.5",
       "license": "MIT",
+      "dependencies": {
+        "nice-try": "^1.0.4",
+        "path-key": "^2.0.1",
+        "semver": "^5.5.0",
+        "shebang-command": "^1.2.0",
+        "which": "^1.2.9"
+      },
       "engines": {
-        "node": ">=10"
+        "node": ">=4.8"
+      }
+    },
+    "node_modules/internal-ip/node_modules/default-gateway": {
+      "version": "4.2.0",
+      "license": "BSD-2-Clause",
+      "dependencies": {
+        "execa": "^1.0.0",
+        "ip-regex": "^2.1.0"
       },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
+      "engines": {
+        "node": ">=6"
       }
     },
-    "node_modules/npm-normalize-package-bin": {
-      "version": "3.0.1",
-      "license": "ISC",
+    "node_modules/internal-ip/node_modules/execa": {
+      "version": "1.0.0",
+      "license": "MIT",
+      "dependencies": {
+        "cross-spawn": "^6.0.0",
+        "get-stream": "^4.0.0",
+        "is-stream": "^1.1.0",
+        "npm-run-path": "^2.0.0",
+        "p-finally": "^1.0.0",
+        "signal-exit": "^3.0.0",
+        "strip-eof": "^1.0.0"
+      },
       "engines": {
-        "node": "^14.17.0 || ^16.13.0 || >=18.0.0"
+        "node": ">=6"
       }
     },
-    "node_modules/npm-package-arg": {
-      "version": "7.0.0",
-      "license": "ISC",
+    "node_modules/internal-ip/node_modules/get-stream": {
+      "version": "4.1.0",
+      "license": "MIT",
       "dependencies": {
-        "hosted-git-info": "^3.0.2",
-        "osenv": "^0.1.5",
-        "semver": "^5.6.0",
-        "validate-npm-package-name": "^3.0.0"
+        "pump": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=6"
       }
     },
-    "node_modules/npm-package-arg/node_modules/hosted-git-info": {
-      "version": "3.0.8",
-      "license": "ISC",
+    "node_modules/internal-ip/node_modules/is-stream": {
+      "version": "1.1.0",
+      "license": "MIT",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/internal-ip/node_modules/npm-run-path": {
+      "version": "2.0.2",
+      "license": "MIT",
       "dependencies": {
-        "lru-cache": "^6.0.0"
+        "path-key": "^2.0.0"
       },
       "engines": {
-        "node": ">=10"
+        "node": ">=4"
       }
     },
-    "node_modules/npm-package-arg/node_modules/semver": {
+    "node_modules/internal-ip/node_modules/path-key": {
+      "version": "2.0.1",
+      "license": "MIT",
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/internal-ip/node_modules/semver": {
       "version": "5.7.2",
       "license": "ISC",
       "bin": {
         "semver": "bin/semver"
       }
     },
-    "node_modules/npm-run-path": {
-      "version": "4.0.1",
+    "node_modules/internal-ip/node_modules/shebang-command": {
+      "version": "1.2.0",
       "license": "MIT",
       "dependencies": {
-        "path-key": "^3.0.0"
+        "shebang-regex": "^1.0.0"
       },
       "engines": {
-        "node": ">=8"
+        "node": ">=0.10.0"
       }
     },
-    "node_modules/npmlog": {
-      "version": "5.0.1",
+    "node_modules/internal-ip/node_modules/shebang-regex": {
+      "version": "1.0.0",
+      "license": "MIT",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/internal-ip/node_modules/which": {
+      "version": "1.3.1",
       "license": "ISC",
-      "optional": true,
       "dependencies": {
-        "are-we-there-yet": "^2.0.0",
-        "console-control-strings": "^1.1.0",
-        "gauge": "^3.0.0",
-        "set-blocking": "^2.0.0"
+        "isexe": "^2.0.0"
+      },
+      "bin": {
+        "which": "bin/which"
       }
     },
-    "node_modules/nth-check": {
-      "version": "2.1.1",
-      "license": "BSD-2-Clause",
+    "node_modules/internal-slot": {
+      "version": "1.0.7",
+      "license": "MIT",
       "dependencies": {
-        "boolbase": "^1.0.0"
+        "es-errors": "^1.3.0",
+        "hasown": "^2.0.0",
+        "side-channel": "^1.0.4"
       },
-      "funding": {
-        "url": "https://github.com/fb55/nth-check?sponsor=1"
+      "engines": {
+        "node": ">= 0.4"
       }
     },
-    "node_modules/nullthrows": {
-      "version": "1.1.1",
-      "license": "MIT"
-    },
-    "node_modules/number-is-nan": {
-      "version": "1.0.1",
+    "node_modules/interpret": {
+      "version": "3.1.1",
+      "dev": true,
       "license": "MIT",
       "engines": {
-        "node": ">=0.10.0"
+        "node": ">=10.13.0"
       }
     },
-    "node_modules/nwsapi": {
-      "version": "2.2.7",
-      "license": "MIT"
-    },
-    "node_modules/nypm": {
-      "version": "0.3.8",
-      "resolved": "https://registry.npmjs.org/nypm/-/nypm-0.3.8.tgz",
-      "integrity": "sha512-IGWlC6So2xv6V4cIDmoV0SwwWx7zLG086gyqkyumteH2fIgCAM4nDVFB2iDRszDvmdSVW9xb1N+2KjQ6C7d4og==",
+    "node_modules/invariant": {
+      "version": "2.2.4",
+      "license": "MIT",
       "dependencies": {
-        "citty": "^0.1.6",
-        "consola": "^3.2.3",
-        "execa": "^8.0.1",
-        "pathe": "^1.1.2",
-        "ufo": "^1.4.0"
-      },
-      "bin": {
-        "nypm": "dist/cli.mjs"
-      },
+        "loose-envify": "^1.0.0"
+      }
+    },
+    "node_modules/invert-kv": {
+      "version": "1.0.0",
+      "license": "MIT",
       "engines": {
-        "node": "^14.16.0 || >=16.10.0"
+        "node": ">=0.10.0"
       }
     },
-    "node_modules/nypm/node_modules/execa": {
-      "version": "8.0.1",
-      "resolved": "https://registry.npmjs.org/execa/-/execa-8.0.1.tgz",
-      "integrity": "sha512-VyhnebXciFV2DESc+p6B+y0LjSm0krU4OgJN44qFAhBY0TJ+1V61tYD2+wHusZ6F9n5K+vl8k0sTy7PEfV4qpg==",
+    "node_modules/ip-address": {
+      "version": "9.0.5",
+      "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "cross-spawn": "^7.0.3",
-        "get-stream": "^8.0.1",
-        "human-signals": "^5.0.0",
-        "is-stream": "^3.0.0",
-        "merge-stream": "^2.0.0",
-        "npm-run-path": "^5.1.0",
-        "onetime": "^6.0.0",
-        "signal-exit": "^4.1.0",
-        "strip-final-newline": "^3.0.0"
+        "jsbn": "1.1.0",
+        "sprintf-js": "^1.1.3"
       },
       "engines": {
-        "node": ">=16.17"
-      },
-      "funding": {
-        "url": "https://github.com/sindresorhus/execa?sponsor=1"
+        "node": ">= 12"
       }
     },
-    "node_modules/nypm/node_modules/get-stream": {
-      "version": "8.0.1",
-      "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-8.0.1.tgz",
-      "integrity": "sha512-VaUJspBffn/LMCJVoMvSAdmscJyS1auj5Zulnn5UoYcY531UWmdwhRWkcGKnGU93m5HSXP9LP2usOryrBtQowA==",
+    "node_modules/ip-address/node_modules/sprintf-js": {
+      "version": "1.1.3",
+      "dev": true,
+      "license": "BSD-3-Clause"
+    },
+    "node_modules/ip-regex": {
+      "version": "2.1.0",
+      "license": "MIT",
       "engines": {
-        "node": ">=16"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
+        "node": ">=4"
       }
     },
-    "node_modules/nypm/node_modules/human-signals": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/human-signals/-/human-signals-5.0.0.tgz",
-      "integrity": "sha512-AXcZb6vzzrFAUE61HnN4mpLqd/cSIwNQjtNWR0euPm6y0iqx3G4gOXaIDdtdDwZmhwe82LA6+zinmW4UBWVePQ==",
+    "node_modules/ipaddr.js": {
+      "version": "1.9.1",
+      "license": "MIT",
       "engines": {
-        "node": ">=16.17.0"
+        "node": ">= 0.10"
       }
     },
-    "node_modules/nypm/node_modules/is-stream": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-3.0.0.tgz",
-      "integrity": "sha512-LnQR4bZ9IADDRSkvpqMGvt/tEJWclzklNgSw48V5EAaAeDd6qGvN8ei6k5p0tvxSR171VmGyHuTiAOfxAbr8kA==",
+    "node_modules/is-absolute-url": {
+      "version": "4.0.1",
+      "dev": true,
+      "license": "MIT",
       "engines": {
         "node": "^12.20.0 || ^14.13.1 || >=16.0.0"
       },
@@ -29049,222 +29230,281 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/nypm/node_modules/mimic-fn": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-4.0.0.tgz",
-      "integrity": "sha512-vqiC06CuhBTUdZH+RYl8sFrL096vA45Ok5ISO6sE/Mr1jRbGH4Csnhi8f3wKVl7x8mO4Au7Ir9D3Oyv1VYMFJw==",
-      "engines": {
-        "node": ">=12"
+    "node_modules/is-accessor-descriptor": {
+      "version": "1.0.0",
+      "license": "MIT",
+      "optional": true,
+      "dependencies": {
+        "kind-of": "^6.0.0"
       },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
+      "engines": {
+        "node": ">=0.10.0"
+      }
     },
-    "node_modules/nypm/node_modules/npm-run-path": {
-      "version": "5.3.0",
-      "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-5.3.0.tgz",
-      "integrity": "sha512-ppwTtiJZq0O/ai0z7yfudtBpWIoxM8yE6nHi1X47eFR2EWORqfbu6CnPlNsjeN683eT0qG6H/Pyf9fCcvjnnnQ==",
+    "node_modules/is-arguments": {
+      "version": "1.1.1",
+      "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "path-key": "^4.0.0"
+        "call-bind": "^1.0.2",
+        "has-tostringtag": "^1.0.0"
       },
       "engines": {
-        "node": "^12.20.0 || ^14.13.1 || >=16.0.0"
+        "node": ">= 0.4"
       },
       "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
+        "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/nypm/node_modules/onetime": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/onetime/-/onetime-6.0.0.tgz",
-      "integrity": "sha512-1FlR+gjXK7X+AsAHso35MnyN5KqGwJRi/31ft6x0M194ht7S+rWAvd7PHss9xSKMzE0asv1pyIHaJYq+BbacAQ==",
+    "node_modules/is-array-buffer": {
+      "version": "3.0.4",
+      "license": "MIT",
       "dependencies": {
-        "mimic-fn": "^4.0.0"
+        "call-bind": "^1.0.2",
+        "get-intrinsic": "^1.2.1"
       },
       "engines": {
-        "node": ">=12"
+        "node": ">= 0.4"
       },
       "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
+        "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/nypm/node_modules/path-key": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/path-key/-/path-key-4.0.0.tgz",
-      "integrity": "sha512-haREypq7xkM7ErfgIyA0z+Bj4AGKlMSdlQE2jvJo6huWD1EdkKYV+G/T4nq0YEF2vgTT8kqMFKo1uHn950r4SQ==",
+    "node_modules/is-arrayish": {
+      "version": "0.2.1",
+      "license": "MIT"
+    },
+    "node_modules/is-async-function": {
+      "version": "2.0.0",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "has-tostringtag": "^1.0.0"
+      },
       "engines": {
-        "node": ">=12"
+        "node": ">= 0.4"
       },
       "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
+        "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/nypm/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==",
+    "node_modules/is-bigint": {
+      "version": "1.0.4",
+      "license": "MIT",
+      "dependencies": {
+        "has-bigints": "^1.0.1"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/is-binary-path": {
+      "version": "2.1.0",
+      "devOptional": true,
+      "license": "MIT",
+      "dependencies": {
+        "binary-extensions": "^2.0.0"
+      },
       "engines": {
-        "node": ">=14"
+        "node": ">=8"
+      }
+    },
+    "node_modules/is-boolean-object": {
+      "version": "1.1.2",
+      "license": "MIT",
+      "dependencies": {
+        "call-bind": "^1.0.2",
+        "has-tostringtag": "^1.0.0"
+      },
+      "engines": {
+        "node": ">= 0.4"
       },
       "funding": {
-        "url": "https://github.com/sponsors/isaacs"
+        "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/nypm/node_modules/strip-final-newline": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/strip-final-newline/-/strip-final-newline-3.0.0.tgz",
-      "integrity": "sha512-dOESqjYr96iWYylGObzd39EuNTa5VJxyvVAEm5Jnh7KGo75V43Hk1odPQkNDyXNmUR6k+gEiDVXnjB8HJ3crXw==",
+    "node_modules/is-buffer": {
+      "version": "1.1.6",
+      "license": "MIT"
+    },
+    "node_modules/is-builtin-module": {
+      "version": "3.2.1",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "builtin-modules": "^3.3.0"
+      },
       "engines": {
-        "node": ">=12"
+        "node": ">=6"
       },
       "funding": {
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/ob1": {
-      "version": "0.80.3",
+    "node_modules/is-callable": {
+      "version": "1.2.7",
       "license": "MIT",
       "engines": {
-        "node": ">=18"
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/object-assign": {
-      "version": "4.1.1",
+    "node_modules/is-ci": {
+      "version": "3.0.1",
+      "dev": true,
       "license": "MIT",
-      "engines": {
-        "node": ">=0.10.0"
+      "dependencies": {
+        "ci-info": "^3.2.0"
+      },
+      "bin": {
+        "is-ci": "bin.js"
       }
     },
-    "node_modules/object-copy": {
-      "version": "0.1.0",
+    "node_modules/is-core-module": {
+      "version": "2.13.1",
       "license": "MIT",
-      "optional": true,
       "dependencies": {
-        "copy-descriptor": "^0.1.0",
-        "define-property": "^0.2.5",
-        "kind-of": "^3.0.3"
+        "hasown": "^2.0.0"
       },
-      "engines": {
-        "node": ">=0.10.0"
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/object-copy/node_modules/define-property": {
-      "version": "0.2.5",
+    "node_modules/is-data-descriptor": {
+      "version": "1.0.0",
       "license": "MIT",
       "optional": true,
       "dependencies": {
-        "is-descriptor": "^0.1.0"
+        "kind-of": "^6.0.0"
       },
       "engines": {
         "node": ">=0.10.0"
       }
     },
-    "node_modules/object-copy/node_modules/is-accessor-descriptor": {
-      "version": "0.1.6",
+    "node_modules/is-data-view": {
+      "version": "1.0.1",
       "license": "MIT",
-      "optional": true,
       "dependencies": {
-        "kind-of": "^3.0.2"
+        "is-typed-array": "^1.1.13"
       },
       "engines": {
-        "node": ">=0.10.0"
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/object-copy/node_modules/is-buffer": {
-      "version": "1.1.6",
+    "node_modules/is-date-object": {
+      "version": "1.0.5",
       "license": "MIT",
-      "optional": true
+      "dependencies": {
+        "has-tostringtag": "^1.0.0"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
     },
-    "node_modules/object-copy/node_modules/is-data-descriptor": {
-      "version": "0.1.4",
+    "node_modules/is-deflate": {
+      "version": "1.0.0",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/is-descriptor": {
+      "version": "1.0.2",
       "license": "MIT",
       "optional": true,
       "dependencies": {
-        "kind-of": "^3.0.2"
+        "is-accessor-descriptor": "^1.0.0",
+        "is-data-descriptor": "^1.0.0",
+        "kind-of": "^6.0.2"
       },
       "engines": {
         "node": ">=0.10.0"
       }
     },
-    "node_modules/object-copy/node_modules/is-descriptor": {
-      "version": "0.1.6",
+    "node_modules/is-directory": {
+      "version": "0.3.1",
       "license": "MIT",
-      "optional": true,
-      "dependencies": {
-        "is-accessor-descriptor": "^0.1.6",
-        "is-data-descriptor": "^0.1.4",
-        "kind-of": "^5.0.0"
-      },
       "engines": {
         "node": ">=0.10.0"
       }
     },
-    "node_modules/object-copy/node_modules/is-descriptor/node_modules/kind-of": {
-      "version": "5.1.0",
+    "node_modules/is-docker": {
+      "version": "2.2.1",
       "license": "MIT",
-      "optional": true,
+      "bin": {
+        "is-docker": "cli.js"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/is-extendable": {
+      "version": "1.0.1",
+      "license": "MIT",
+      "dependencies": {
+        "is-plain-object": "^2.0.4"
+      },
       "engines": {
         "node": ">=0.10.0"
       }
     },
-    "node_modules/object-copy/node_modules/kind-of": {
-      "version": "3.2.2",
+    "node_modules/is-extendable/node_modules/is-plain-object": {
+      "version": "2.0.4",
       "license": "MIT",
-      "optional": true,
       "dependencies": {
-        "is-buffer": "^1.1.5"
+        "isobject": "^3.0.1"
       },
       "engines": {
         "node": ">=0.10.0"
       }
     },
-    "node_modules/object-inspect": {
-      "version": "1.12.3",
+    "node_modules/is-extglob": {
+      "version": "2.1.1",
       "license": "MIT",
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
+      "engines": {
+        "node": ">=0.10.0"
       }
     },
-    "node_modules/object-is": {
-      "version": "1.1.5",
+    "node_modules/is-finalizationregistry": {
+      "version": "1.0.2",
+      "dev": true,
       "license": "MIT",
       "dependencies": {
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.1.3"
-      },
-      "engines": {
-        "node": ">= 0.4"
+        "call-bind": "^1.0.2"
       },
       "funding": {
         "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/object-keys": {
-      "version": "1.1.1",
+    "node_modules/is-fullwidth-code-point": {
+      "version": "3.0.0",
       "license": "MIT",
       "engines": {
-        "node": ">= 0.4"
+        "node": ">=8"
       }
     },
-    "node_modules/object-visit": {
-      "version": "1.0.1",
+    "node_modules/is-generator-fn": {
+      "version": "2.1.0",
       "license": "MIT",
-      "optional": true,
-      "dependencies": {
-        "isobject": "^3.0.0"
-      },
       "engines": {
-        "node": ">=0.10.0"
+        "node": ">=6"
       }
     },
-    "node_modules/object.assign": {
-      "version": "4.1.4",
+    "node_modules/is-generator-function": {
+      "version": "1.0.10",
+      "dev": true,
       "license": "MIT",
       "dependencies": {
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.1.4",
-        "has-symbols": "^1.0.3",
-        "object-keys": "^1.1.1"
+        "has-tostringtag": "^1.0.0"
       },
       "engines": {
         "node": ">= 0.4"
@@ -29273,77 +29513,109 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/object.entries": {
-      "version": "1.1.6",
-      "dev": true,
+    "node_modules/is-glob": {
+      "version": "4.0.3",
       "license": "MIT",
       "dependencies": {
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.1.4",
-        "es-abstract": "^1.20.4"
+        "is-extglob": "^2.1.1"
       },
       "engines": {
-        "node": ">= 0.4"
+        "node": ">=0.10.0"
       }
     },
-    "node_modules/object.fromentries": {
-      "version": "2.0.7",
+    "node_modules/is-gzip": {
+      "version": "1.0.0",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/is-inside-container": {
+      "version": "1.0.0",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.2.0",
-        "es-abstract": "^1.22.1"
+        "is-docker": "^3.0.0"
+      },
+      "bin": {
+        "is-inside-container": "cli.js"
       },
       "engines": {
-        "node": ">= 0.4"
+        "node": ">=14.16"
       },
       "funding": {
-        "url": "https://github.com/sponsors/ljharb"
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/object.groupby": {
-      "version": "1.0.1",
+    "node_modules/is-inside-container/node_modules/is-docker": {
+      "version": "3.0.0",
       "dev": true,
       "license": "MIT",
-      "dependencies": {
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.2.0",
-        "es-abstract": "^1.22.1",
-        "get-intrinsic": "^1.2.1"
+      "bin": {
+        "is-docker": "cli.js"
+      },
+      "engines": {
+        "node": "^12.20.0 || ^14.13.1 || >=16.0.0"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/object.hasown": {
-      "version": "1.1.2",
-      "dev": true,
+    "node_modules/is-interactive": {
+      "version": "1.0.0",
+      "license": "MIT",
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/is-invalid-path": {
+      "version": "0.1.0",
       "license": "MIT",
       "dependencies": {
-        "define-properties": "^1.1.4",
-        "es-abstract": "^1.20.4"
+        "is-glob": "^2.0.0"
       },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
+      "engines": {
+        "node": ">=0.10.0"
       }
     },
-    "node_modules/object.pick": {
-      "version": "1.3.0",
+    "node_modules/is-invalid-path/node_modules/is-extglob": {
+      "version": "1.0.0",
+      "license": "MIT",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/is-invalid-path/node_modules/is-glob": {
+      "version": "2.0.1",
       "license": "MIT",
-      "optional": true,
       "dependencies": {
-        "isobject": "^3.0.1"
+        "is-extglob": "^1.0.0"
       },
       "engines": {
         "node": ">=0.10.0"
       }
     },
-    "node_modules/object.values": {
-      "version": "1.1.7",
+    "node_modules/is-lambda": {
+      "version": "1.0.1",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/is-map": {
+      "version": "2.0.2",
+      "dev": true,
+      "license": "MIT",
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/is-nan": {
+      "version": "1.3.2",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.2.0",
-        "es-abstract": "^1.22.1"
+        "call-bind": "^1.0.0",
+        "define-properties": "^1.1.3"
       },
       "engines": {
         "node": ">= 0.4"
@@ -29352,442 +29624,418 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/objectorarray": {
-      "version": "1.0.5",
-      "dev": true,
-      "license": "ISC"
+    "node_modules/is-negative-zero": {
+      "version": "2.0.3",
+      "license": "MIT",
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
     },
-    "node_modules/obuf": {
-      "version": "1.1.2",
+    "node_modules/is-network-error": {
+      "version": "1.1.0",
       "dev": true,
-      "license": "MIT"
+      "license": "MIT",
+      "engines": {
+        "node": ">=16"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
     },
-    "node_modules/ohash": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/ohash/-/ohash-1.1.3.tgz",
-      "integrity": "sha512-zuHHiGTYTA1sYJ/wZN+t5HKZaH23i4yI1HMwbuXm24Nid7Dv0KcuRlKoNKS9UNfAVSBlnGLcuQrnOKWOZoEGaw=="
+    "node_modules/is-number": {
+      "version": "7.0.0",
+      "license": "MIT",
+      "engines": {
+        "node": ">=0.12.0"
+      }
     },
-    "node_modules/on-finished": {
-      "version": "2.4.1",
+    "node_modules/is-number-object": {
+      "version": "1.0.7",
       "license": "MIT",
       "dependencies": {
-        "ee-first": "1.1.1"
+        "has-tostringtag": "^1.0.0"
       },
       "engines": {
-        "node": ">= 0.8"
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/on-headers": {
-      "version": "1.0.2",
+    "node_modules/is-path-cwd": {
+      "version": "2.2.0",
       "license": "MIT",
       "engines": {
-        "node": ">= 0.8"
-      }
-    },
-    "node_modules/once": {
-      "version": "1.4.0",
-      "license": "ISC",
-      "dependencies": {
-        "wrappy": "1"
+        "node": ">=6"
       }
     },
-    "node_modules/onchange": {
-      "version": "7.1.0",
+    "node_modules/is-path-in-cwd": {
+      "version": "2.1.0",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@blakeembrey/deque": "^1.0.5",
-        "@blakeembrey/template": "^1.0.0",
-        "arg": "^4.1.3",
-        "chokidar": "^3.3.1",
-        "cross-spawn": "^7.0.1",
-        "ignore": "^5.1.4",
-        "tree-kill": "^1.2.2"
+        "is-path-inside": "^2.1.0"
       },
-      "bin": {
-        "onchange": "dist/bin.js"
+      "engines": {
+        "node": ">=6"
       }
     },
-    "node_modules/onetime": {
-      "version": "5.1.2",
+    "node_modules/is-path-inside": {
+      "version": "2.1.0",
+      "dev": true,
       "license": "MIT",
       "dependencies": {
-        "mimic-fn": "^2.1.0"
+        "path-is-inside": "^1.0.2"
       },
       "engines": {
         "node": ">=6"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/onfido-sdk-ui": {
-      "version": "14.15.0",
-      "license": "SEE LICENSE in LICENSE"
+    "node_modules/is-plain-object": {
+      "version": "5.0.0",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=0.10.0"
+      }
     },
-    "node_modules/open": {
-      "version": "8.4.2",
+    "node_modules/is-potential-custom-element-name": {
+      "version": "1.0.1",
+      "license": "MIT"
+    },
+    "node_modules/is-regex": {
+      "version": "1.1.4",
       "license": "MIT",
       "dependencies": {
-        "define-lazy-prop": "^2.0.0",
-        "is-docker": "^2.1.1",
-        "is-wsl": "^2.2.0"
+        "call-bind": "^1.0.2",
+        "has-tostringtag": "^1.0.0"
       },
       "engines": {
-        "node": ">=12"
+        "node": ">= 0.4"
       },
       "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/opencollective-postinstall": {
-      "version": "2.0.3",
-      "license": "MIT",
-      "bin": {
-        "opencollective-postinstall": "index.js"
+        "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/opener": {
-      "version": "1.5.2",
+    "node_modules/is-set": {
+      "version": "2.0.2",
       "dev": true,
-      "license": "(WTFPL OR MIT)",
-      "bin": {
-        "opener": "bin/opener-bin.js"
+      "license": "MIT",
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/ora": {
-      "version": "5.4.1",
-      "resolved": "https://registry.npmjs.org/ora/-/ora-5.4.1.tgz",
-      "integrity": "sha512-5b6Y85tPxZZ7QytO+BQzysW31HJku27cRIlkbAXaNx+BdcVi+LlRFmVXzeF6a7JCwJpyw5c4b+YSVImQIrBpuQ==",
+    "node_modules/is-shared-array-buffer": {
+      "version": "1.0.3",
+      "license": "MIT",
       "dependencies": {
-        "bl": "^4.1.0",
-        "chalk": "^4.1.0",
-        "cli-cursor": "^3.1.0",
-        "cli-spinners": "^2.5.0",
-        "is-interactive": "^1.0.0",
-        "is-unicode-supported": "^0.1.0",
-        "log-symbols": "^4.1.0",
-        "strip-ansi": "^6.0.0",
-        "wcwidth": "^1.0.1"
+        "call-bind": "^1.0.7"
       },
       "engines": {
-        "node": ">=10"
+        "node": ">= 0.4"
       },
       "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
+        "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/ora/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==",
-      "dependencies": {
-        "color-convert": "^2.0.1"
-      },
+    "node_modules/is-stream": {
+      "version": "2.0.1",
+      "license": "MIT",
       "engines": {
         "node": ">=8"
       },
       "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/ora/node_modules/chalk": {
-      "version": "4.1.2",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
-      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
+    "node_modules/is-string": {
+      "version": "1.0.7",
+      "license": "MIT",
       "dependencies": {
-        "ansi-styles": "^4.1.0",
-        "supports-color": "^7.1.0"
+        "has-tostringtag": "^1.0.0"
       },
       "engines": {
-        "node": ">=10"
+        "node": ">= 0.4"
       },
       "funding": {
-        "url": "https://github.com/chalk/chalk?sponsor=1"
+        "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/ora/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==",
+    "node_modules/is-symbol": {
+      "version": "1.0.4",
+      "license": "MIT",
       "dependencies": {
-        "color-name": "~1.1.4"
+        "has-symbols": "^1.0.2"
       },
       "engines": {
-        "node": ">=7.0.0"
-      }
-    },
-    "node_modules/ora/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=="
-    },
-    "node_modules/ora/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==",
-      "engines": {
-        "node": ">=8"
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/ora/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==",
+    "node_modules/is-typed-array": {
+      "version": "1.1.13",
+      "license": "MIT",
       "dependencies": {
-        "has-flag": "^4.0.0"
+        "which-typed-array": "^1.1.14"
       },
       "engines": {
-        "node": ">=8"
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/os-browserify": {
-      "version": "0.3.0",
-      "license": "MIT"
-    },
-    "node_modules/os-homedir": {
-      "version": "1.0.2",
+    "node_modules/is-unicode-supported": {
+      "version": "0.1.0",
       "license": "MIT",
       "engines": {
-        "node": ">=0.10.0"
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/os-locale": {
-      "version": "1.4.0",
+    "node_modules/is-utf8": {
+      "version": "0.2.1",
+      "license": "MIT"
+    },
+    "node_modules/is-valid-path": {
+      "version": "0.1.1",
       "license": "MIT",
       "dependencies": {
-        "lcid": "^1.0.0"
+        "is-invalid-path": "^0.1.0"
       },
       "engines": {
         "node": ">=0.10.0"
       }
     },
-    "node_modules/os-tmpdir": {
-      "version": "1.0.2",
+    "node_modules/is-weakmap": {
+      "version": "2.0.1",
+      "dev": true,
       "license": "MIT",
-      "engines": {
-        "node": ">=0.10.0"
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/osenv": {
-      "version": "0.1.5",
-      "license": "ISC",
+    "node_modules/is-weakref": {
+      "version": "1.0.2",
+      "license": "MIT",
       "dependencies": {
-        "os-homedir": "^1.0.0",
-        "os-tmpdir": "^1.0.0"
+        "call-bind": "^1.0.2"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/p-cancelable": {
-      "version": "2.1.1",
+    "node_modules/is-weakset": {
+      "version": "2.0.2",
       "dev": true,
       "license": "MIT",
-      "engines": {
-        "node": ">=8"
+      "dependencies": {
+        "call-bind": "^1.0.2",
+        "get-intrinsic": "^1.1.1"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/p-finally": {
-      "version": "1.0.0",
+    "node_modules/is-windows": {
+      "version": "1.0.2",
       "license": "MIT",
+      "optional": true,
       "engines": {
-        "node": ">=4"
+        "node": ">=0.10.0"
       }
     },
-    "node_modules/p-limit": {
-      "version": "3.1.0",
+    "node_modules/is-wsl": {
+      "version": "2.2.0",
       "license": "MIT",
       "dependencies": {
-        "yocto-queue": "^0.1.0"
+        "is-docker": "^2.0.0"
       },
       "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
+        "node": ">=8"
       }
     },
-    "node_modules/p-locate": {
-      "version": "5.0.0",
+    "node_modules/isarray": {
+      "version": "2.0.5",
+      "license": "MIT"
+    },
+    "node_modules/isbinaryfile": {
+      "version": "5.0.2",
+      "dev": true,
       "license": "MIT",
-      "dependencies": {
-        "p-limit": "^3.0.2"
-      },
       "engines": {
-        "node": ">=10"
+        "node": ">= 18.0.0"
       },
       "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
+        "url": "https://github.com/sponsors/gjtorikian/"
       }
     },
-    "node_modules/p-map": {
-      "version": "4.0.0",
+    "node_modules/isexe": {
+      "version": "2.0.0",
+      "license": "ISC"
+    },
+    "node_modules/isobject": {
+      "version": "3.0.1",
       "license": "MIT",
-      "dependencies": {
-        "aggregate-error": "^3.0.0"
-      },
       "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
+        "node": ">=0.10.0"
       }
     },
-    "node_modules/p-retry": {
-      "version": "6.2.0",
-      "resolved": "https://registry.npmjs.org/p-retry/-/p-retry-6.2.0.tgz",
-      "integrity": "sha512-JA6nkq6hKyWLLasXQXUrO4z8BUZGUt/LjlJxx8Gb2+2ntodU/SS63YZ8b0LUTbQ8ZB9iwOfhEPhg4ykKnn2KsA==",
-      "dev": true,
-      "dependencies": {
-        "@types/retry": "0.12.2",
-        "is-network-error": "^1.0.0",
-        "retry": "^0.13.1"
-      },
+    "node_modules/istanbul-lib-coverage": {
+      "version": "3.2.0",
+      "license": "BSD-3-Clause",
       "engines": {
-        "node": ">=16.17"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
+        "node": ">=8"
       }
     },
-    "node_modules/p-try": {
-      "version": "2.2.0",
-      "license": "MIT",
+    "node_modules/istanbul-lib-instrument": {
+      "version": "5.2.0",
+      "license": "BSD-3-Clause",
+      "dependencies": {
+        "@babel/core": "^7.12.3",
+        "@babel/parser": "^7.14.7",
+        "@istanbuljs/schema": "^0.1.2",
+        "istanbul-lib-coverage": "^3.2.0",
+        "semver": "^6.3.0"
+      },
       "engines": {
-        "node": ">=6"
+        "node": ">=8"
       }
     },
-    "node_modules/pako": {
-      "version": "1.0.11",
-      "license": "(MIT AND Zlib)"
-    },
-    "node_modules/param-case": {
-      "version": "3.0.4",
-      "license": "MIT",
-      "dependencies": {
-        "dot-case": "^3.0.4",
-        "tslib": "^2.0.3"
+    "node_modules/istanbul-lib-instrument/node_modules/semver": {
+      "version": "6.3.1",
+      "license": "ISC",
+      "bin": {
+        "semver": "bin/semver.js"
       }
     },
-    "node_modules/parent-module": {
-      "version": "1.0.1",
-      "dev": true,
-      "license": "MIT",
+    "node_modules/istanbul-lib-report": {
+      "version": "3.0.1",
+      "license": "BSD-3-Clause",
       "dependencies": {
-        "callsites": "^3.0.0"
+        "istanbul-lib-coverage": "^3.0.0",
+        "make-dir": "^4.0.0",
+        "supports-color": "^7.1.0"
       },
       "engines": {
-        "node": ">=6"
+        "node": ">=10"
       }
     },
-    "node_modules/parse-asn1": {
-      "version": "5.1.6",
-      "license": "ISC",
-      "dependencies": {
-        "asn1.js": "^5.2.0",
-        "browserify-aes": "^1.0.0",
-        "evp_bytestokey": "^1.0.0",
-        "pbkdf2": "^3.0.3",
-        "safe-buffer": "^5.1.1"
+    "node_modules/istanbul-lib-report/node_modules/has-flag": {
+      "version": "4.0.0",
+      "license": "MIT",
+      "engines": {
+        "node": ">=8"
       }
     },
-    "node_modules/parse-json": {
-      "version": "5.2.0",
+    "node_modules/istanbul-lib-report/node_modules/make-dir": {
+      "version": "4.0.0",
       "license": "MIT",
       "dependencies": {
-        "@babel/code-frame": "^7.0.0",
-        "error-ex": "^1.3.1",
-        "json-parse-even-better-errors": "^2.3.0",
-        "lines-and-columns": "^1.1.6"
+        "semver": "^7.5.3"
       },
       "engines": {
-        "node": ">=8"
+        "node": ">=10"
       },
       "funding": {
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/parse-png": {
-      "version": "2.1.0",
+    "node_modules/istanbul-lib-report/node_modules/supports-color": {
+      "version": "7.2.0",
       "license": "MIT",
       "dependencies": {
-        "pngjs": "^3.3.0"
+        "has-flag": "^4.0.0"
       },
       "engines": {
-        "node": ">=10"
+        "node": ">=8"
       }
     },
-    "node_modules/parse-png/node_modules/pngjs": {
-      "version": "3.4.0",
-      "license": "MIT",
+    "node_modules/istanbul-lib-source-maps": {
+      "version": "4.0.1",
+      "license": "BSD-3-Clause",
+      "dependencies": {
+        "debug": "^4.1.1",
+        "istanbul-lib-coverage": "^3.0.0",
+        "source-map": "^0.6.1"
+      },
       "engines": {
-        "node": ">=4.0.0"
+        "node": ">=10"
       }
     },
-    "node_modules/parseurl": {
-      "version": "1.3.3",
-      "license": "MIT",
+    "node_modules/istanbul-lib-source-maps/node_modules/source-map": {
+      "version": "0.6.1",
+      "license": "BSD-3-Clause",
       "engines": {
-        "node": ">= 0.8"
+        "node": ">=0.10.0"
       }
     },
-    "node_modules/pascal-case": {
-      "version": "3.1.2",
-      "license": "MIT",
+    "node_modules/istanbul-reports": {
+      "version": "3.1.7",
+      "license": "BSD-3-Clause",
       "dependencies": {
-        "no-case": "^3.0.4",
-        "tslib": "^2.0.3"
+        "html-escaper": "^2.0.0",
+        "istanbul-lib-report": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=8"
       }
     },
-    "node_modules/pascalcase": {
-      "version": "0.1.1",
+    "node_modules/iterator.prototype": {
+      "version": "1.1.0",
+      "dev": true,
       "license": "MIT",
-      "optional": true,
-      "engines": {
-        "node": ">=0.10.0"
+      "dependencies": {
+        "define-properties": "^1.1.4",
+        "get-intrinsic": "^1.1.3",
+        "has-symbols": "^1.0.3",
+        "has-tostringtag": "^1.0.0",
+        "reflect.getprototypeof": "^1.0.3"
       }
     },
-    "node_modules/password-prompt": {
-      "version": "1.1.3",
-      "license": "0BSD",
+    "node_modules/jackspeak": {
+      "version": "2.3.6",
+      "dev": true,
+      "license": "BlueOak-1.0.0",
       "dependencies": {
-        "ansi-escapes": "^4.3.2",
-        "cross-spawn": "^7.0.3"
+        "@isaacs/cliui": "^8.0.2"
+      },
+      "engines": {
+        "node": ">=14"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
+      },
+      "optionalDependencies": {
+        "@pkgjs/parseargs": "^0.11.0"
       }
     },
-    "node_modules/patch-package": {
-      "version": "8.0.0",
-      "resolved": "https://registry.npmjs.org/patch-package/-/patch-package-8.0.0.tgz",
-      "integrity": "sha512-da8BVIhzjtgScwDJ2TtKsfT5JFWz1hYoBl9rUQ1f38MC2HwnEIkK8VN3dKMKcP7P7bvvgzNDbfNHtx3MsQb5vA==",
+    "node_modules/jake": {
+      "version": "10.8.7",
       "dev": true,
-      "license": "MIT",
+      "license": "Apache-2.0",
       "dependencies": {
-        "@yarnpkg/lockfile": "^1.1.0",
-        "chalk": "^4.1.2",
-        "ci-info": "^3.7.0",
-        "cross-spawn": "^7.0.3",
-        "find-yarn-workspace-root": "^2.0.0",
-        "fs-extra": "^9.0.0",
-        "json-stable-stringify": "^1.0.2",
-        "klaw-sync": "^6.0.0",
-        "minimist": "^1.2.6",
-        "open": "^7.4.2",
-        "rimraf": "^2.6.3",
-        "semver": "^7.5.3",
-        "slash": "^2.0.0",
-        "tmp": "^0.0.33",
-        "yaml": "^2.2.2"
+        "async": "^3.2.3",
+        "chalk": "^4.0.2",
+        "filelist": "^1.0.4",
+        "minimatch": "^3.1.2"
       },
       "bin": {
-        "patch-package": "index.js"
+        "jake": "bin/cli.js"
       },
       "engines": {
-        "node": ">=14",
-        "npm": ">5"
+        "node": ">=10"
       }
     },
-    "node_modules/patch-package/node_modules/ansi-styles": {
+    "node_modules/jake/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,
       "license": "MIT",
       "dependencies": {
@@ -29800,10 +30048,8 @@
         "url": "https://github.com/chalk/ansi-styles?sponsor=1"
       }
     },
-    "node_modules/patch-package/node_modules/chalk": {
+    "node_modules/jake/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,
       "license": "MIT",
       "dependencies": {
@@ -29817,10 +30063,8 @@
         "url": "https://github.com/chalk/chalk?sponsor=1"
       }
     },
-    "node_modules/patch-package/node_modules/color-convert": {
+    "node_modules/jake/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,
       "license": "MIT",
       "dependencies": {
@@ -29830,800 +30074,7961 @@
         "node": ">=7.0.0"
       }
     },
-    "node_modules/patch-package/node_modules/color-name": {
+    "node_modules/jake/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,
       "license": "MIT"
     },
-    "node_modules/patch-package/node_modules/has-flag": {
+    "node_modules/jake/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,
       "license": "MIT",
       "engines": {
         "node": ">=8"
       }
     },
-    "node_modules/patch-package/node_modules/open": {
-      "version": "7.4.2",
-      "resolved": "https://registry.npmjs.org/open/-/open-7.4.2.tgz",
-      "integrity": "sha512-MVHddDVweXZF3awtlAS+6pgKLlm/JgxZ90+/NBurBoQctVOOB/zDdVjcyPzQ+0laDGbsWgrRkflI65sQeOgT9Q==",
+    "node_modules/jake/node_modules/supports-color": {
+      "version": "7.2.0",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "is-docker": "^2.0.0",
-        "is-wsl": "^2.1.1"
+        "has-flag": "^4.0.0"
       },
       "engines": {
         "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/patch-package/node_modules/rimraf": {
-      "version": "2.7.1",
-      "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.7.1.tgz",
-      "integrity": "sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==",
+    "node_modules/javascript-natural-sort": {
+      "version": "0.7.1",
       "dev": true,
-      "license": "ISC",
+      "license": "MIT"
+    },
+    "node_modules/jest": {
+      "version": "29.4.1",
+      "license": "MIT",
       "dependencies": {
-        "glob": "^7.1.3"
+        "@jest/core": "^29.4.1",
+        "@jest/types": "^29.4.1",
+        "import-local": "^3.0.2",
+        "jest-cli": "^29.4.1"
       },
       "bin": {
-        "rimraf": "bin.js"
+        "jest": "bin/jest.js"
+      },
+      "engines": {
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+      },
+      "peerDependencies": {
+        "node-notifier": "^8.0.1 || ^9.0.0 || ^10.0.0"
+      },
+      "peerDependenciesMeta": {
+        "node-notifier": {
+          "optional": true
+        }
       }
     },
-    "node_modules/patch-package/node_modules/slash": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/slash/-/slash-2.0.0.tgz",
-      "integrity": "sha512-ZYKh3Wh2z1PpEXWr0MpSBZ0V6mZHAQfYevttO11c51CaWjGTaadiKZ+wVt1PbMlDV5qhMFslpZCemhwOK7C89A==",
-      "dev": true,
+    "node_modules/jest-changed-files": {
+      "version": "29.7.0",
       "license": "MIT",
+      "dependencies": {
+        "execa": "^5.0.0",
+        "jest-util": "^29.7.0",
+        "p-limit": "^3.1.0"
+      },
       "engines": {
-        "node": ">=6"
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
       }
     },
-    "node_modules/patch-package/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==",
+    "node_modules/jest-circus": {
+      "version": "29.4.1",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "has-flag": "^4.0.0"
+        "@jest/environment": "^29.4.1",
+        "@jest/expect": "^29.4.1",
+        "@jest/test-result": "^29.4.1",
+        "@jest/types": "^29.4.1",
+        "@types/node": "*",
+        "chalk": "^4.0.0",
+        "co": "^4.6.0",
+        "dedent": "^0.7.0",
+        "is-generator-fn": "^2.0.0",
+        "jest-each": "^29.4.1",
+        "jest-matcher-utils": "^29.4.1",
+        "jest-message-util": "^29.4.1",
+        "jest-runtime": "^29.4.1",
+        "jest-snapshot": "^29.4.1",
+        "jest-util": "^29.4.1",
+        "p-limit": "^3.1.0",
+        "pretty-format": "^29.4.1",
+        "slash": "^3.0.0",
+        "stack-utils": "^2.0.3"
       },
       "engines": {
-        "node": ">=8"
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
       }
     },
-    "node_modules/patch-package/node_modules/tmp": {
-      "version": "0.0.33",
-      "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.0.33.tgz",
-      "integrity": "sha512-jRCJlojKnZ3addtTOjdIqoRuPEKBvNXcGYqzO6zWZX8KfKEpnGY5jfggJQ3EjKuu8D4bJRr0y+cYJFmYbImXGw==",
+    "node_modules/jest-circus/node_modules/ansi-styles": {
+      "version": "4.3.0",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "os-tmpdir": "~1.0.2"
+        "color-convert": "^2.0.1"
       },
       "engines": {
-        "node": ">=0.6.0"
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
       }
     },
-    "node_modules/path-browserify": {
-      "version": "0.0.1",
-      "license": "MIT"
-    },
-    "node_modules/path-dirname": {
-      "version": "1.0.2",
-      "license": "MIT",
-      "optional": true
-    },
-    "node_modules/path-exists": {
-      "version": "3.0.0",
+    "node_modules/jest-circus/node_modules/chalk": {
+      "version": "4.1.2",
+      "dev": true,
       "license": "MIT",
+      "dependencies": {
+        "ansi-styles": "^4.1.0",
+        "supports-color": "^7.1.0"
+      },
       "engines": {
-        "node": ">=4"
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/chalk?sponsor=1"
       }
     },
-    "node_modules/path-is-absolute": {
-      "version": "1.0.1",
+    "node_modules/jest-circus/node_modules/color-convert": {
+      "version": "2.0.1",
+      "dev": true,
       "license": "MIT",
+      "dependencies": {
+        "color-name": "~1.1.4"
+      },
       "engines": {
-        "node": ">=0.10.0"
+        "node": ">=7.0.0"
       }
     },
-    "node_modules/path-is-inside": {
-      "version": "1.0.2",
+    "node_modules/jest-circus/node_modules/color-name": {
+      "version": "1.1.4",
       "dev": true,
-      "license": "(WTFPL OR MIT)"
+      "license": "MIT"
     },
-    "node_modules/path-key": {
-      "version": "3.1.1",
+    "node_modules/jest-circus/node_modules/has-flag": {
+      "version": "4.0.0",
+      "dev": true,
       "license": "MIT",
       "engines": {
         "node": ">=8"
       }
     },
-    "node_modules/path-parse": {
-      "version": "1.0.7",
-      "license": "MIT"
-    },
-    "node_modules/path-scurry": {
-      "version": "1.10.2",
-      "resolved": "https://registry.npmjs.org/path-scurry/-/path-scurry-1.10.2.tgz",
-      "integrity": "sha512-7xTavNy5RQXnsjANvVvMkEjvloOinkAjv/Z6Ildz9v2RinZ4SBKTWFOVRbaF8p0vpHnyjV/UwNDdKuUv6M5qcA==",
+    "node_modules/jest-circus/node_modules/supports-color": {
+      "version": "7.2.0",
+      "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "lru-cache": "^10.2.0",
-        "minipass": "^5.0.0 || ^6.0.2 || ^7.0.0"
+        "has-flag": "^4.0.0"
       },
       "engines": {
-        "node": ">=16 || 14 >=14.17"
+        "node": ">=8"
+      }
+    },
+    "node_modules/jest-cli": {
+      "version": "29.4.1",
+      "license": "MIT",
+      "dependencies": {
+        "@jest/core": "^29.4.1",
+        "@jest/test-result": "^29.4.1",
+        "@jest/types": "^29.4.1",
+        "chalk": "^4.0.0",
+        "exit": "^0.1.2",
+        "graceful-fs": "^4.2.9",
+        "import-local": "^3.0.2",
+        "jest-config": "^29.4.1",
+        "jest-util": "^29.4.1",
+        "jest-validate": "^29.4.1",
+        "prompts": "^2.0.1",
+        "yargs": "^17.3.1"
+      },
+      "bin": {
+        "jest": "bin/jest.js"
+      },
+      "engines": {
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+      },
+      "peerDependencies": {
+        "node-notifier": "^8.0.1 || ^9.0.0 || ^10.0.0"
+      },
+      "peerDependenciesMeta": {
+        "node-notifier": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/jest-cli/node_modules/ansi-styles": {
+      "version": "4.3.0",
+      "license": "MIT",
+      "dependencies": {
+        "color-convert": "^2.0.1"
+      },
+      "engines": {
+        "node": ">=8"
       },
       "funding": {
-        "url": "https://github.com/sponsors/isaacs"
+        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
       }
     },
-    "node_modules/path-scurry/node_modules/lru-cache": {
-      "version": "10.2.0",
-      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-10.2.0.tgz",
-      "integrity": "sha512-2bIM8x+VAf6JT4bKAljS1qUWgMsqZRPGJS6FSahIMPVvctcNhyVp7AJu7quxOW9jwkryBReKZY5tY5JYv2n/7Q==",
+    "node_modules/jest-cli/node_modules/chalk": {
+      "version": "4.1.2",
+      "license": "MIT",
+      "dependencies": {
+        "ansi-styles": "^4.1.0",
+        "supports-color": "^7.1.0"
+      },
       "engines": {
-        "node": "14 || >=16.14"
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/chalk?sponsor=1"
       }
     },
-    "node_modules/path-scurry/node_modules/minipass": {
-      "version": "7.0.3",
-      "license": "ISC",
+    "node_modules/jest-cli/node_modules/color-convert": {
+      "version": "2.0.1",
+      "license": "MIT",
+      "dependencies": {
+        "color-name": "~1.1.4"
+      },
       "engines": {
-        "node": ">=16 || 14 >=14.17"
+        "node": ">=7.0.0"
       }
     },
-    "node_modules/path-to-regexp": {
-      "version": "0.1.7",
+    "node_modules/jest-cli/node_modules/color-name": {
+      "version": "1.1.4",
       "license": "MIT"
     },
-    "node_modules/path-type": {
+    "node_modules/jest-cli/node_modules/has-flag": {
       "version": "4.0.0",
       "license": "MIT",
       "engines": {
         "node": ">=8"
       }
     },
-    "node_modules/path2d-polyfill": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/path2d-polyfill/-/path2d-polyfill-2.0.1.tgz",
-      "integrity": "sha512-ad/3bsalbbWhmBo0D6FZ4RNMwsLsPpL6gnvhuSaU5Vm7b06Kr5ubSltQQ0T7YKsiJQO+g22zJ4dJKNTXIyOXtA==",
-      "optional": true,
+    "node_modules/jest-cli/node_modules/supports-color": {
+      "version": "7.2.0",
+      "license": "MIT",
+      "dependencies": {
+        "has-flag": "^4.0.0"
+      },
       "engines": {
         "node": ">=8"
       }
     },
-    "node_modules/pathe": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/pathe/-/pathe-1.1.2.tgz",
-      "integrity": "sha512-whLdWMYL2TwI08hn8/ZqAbrVemu0LNaNNJZX73O6qaIdCTfXutsLhMkjdENX0qhsQ9uIimo4/aQOmXkoon2nDQ=="
+    "node_modules/jest-config": {
+      "version": "29.7.0",
+      "license": "MIT",
+      "dependencies": {
+        "@babel/core": "^7.11.6",
+        "@jest/test-sequencer": "^29.7.0",
+        "@jest/types": "^29.6.3",
+        "babel-jest": "^29.7.0",
+        "chalk": "^4.0.0",
+        "ci-info": "^3.2.0",
+        "deepmerge": "^4.2.2",
+        "glob": "^7.1.3",
+        "graceful-fs": "^4.2.9",
+        "jest-circus": "^29.7.0",
+        "jest-environment-node": "^29.7.0",
+        "jest-get-type": "^29.6.3",
+        "jest-regex-util": "^29.6.3",
+        "jest-resolve": "^29.7.0",
+        "jest-runner": "^29.7.0",
+        "jest-util": "^29.7.0",
+        "jest-validate": "^29.7.0",
+        "micromatch": "^4.0.4",
+        "parse-json": "^5.2.0",
+        "pretty-format": "^29.7.0",
+        "slash": "^3.0.0",
+        "strip-json-comments": "^3.1.1"
+      },
+      "engines": {
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+      },
+      "peerDependencies": {
+        "@types/node": "*",
+        "ts-node": ">=9.0.0"
+      },
+      "peerDependenciesMeta": {
+        "@types/node": {
+          "optional": true
+        },
+        "ts-node": {
+          "optional": true
+        }
+      }
     },
-    "node_modules/pbf": {
-      "version": "3.2.1",
-      "license": "BSD-3-Clause",
+    "node_modules/jest-config/node_modules/ansi-styles": {
+      "version": "4.3.0",
+      "license": "MIT",
       "dependencies": {
-        "ieee754": "^1.1.12",
-        "resolve-protobuf-schema": "^2.1.0"
+        "color-convert": "^2.0.1"
       },
-      "bin": {
-        "pbf": "bin/pbf"
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
       }
     },
-    "node_modules/pbkdf2": {
-      "version": "3.1.2",
+    "node_modules/jest-config/node_modules/babel-jest": {
+      "version": "29.7.0",
       "license": "MIT",
       "dependencies": {
-        "create-hash": "^1.1.2",
-        "create-hmac": "^1.1.4",
-        "ripemd160": "^2.0.1",
-        "safe-buffer": "^5.0.1",
-        "sha.js": "^2.4.8"
+        "@jest/transform": "^29.7.0",
+        "@types/babel__core": "^7.1.14",
+        "babel-plugin-istanbul": "^6.1.1",
+        "babel-preset-jest": "^29.6.3",
+        "chalk": "^4.0.0",
+        "graceful-fs": "^4.2.9",
+        "slash": "^3.0.0"
       },
       "engines": {
-        "node": ">=0.12"
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.8.0"
       }
     },
-    "node_modules/pdfjs-dist": {
-      "version": "3.11.174",
-      "resolved": "https://registry.npmjs.org/pdfjs-dist/-/pdfjs-dist-3.11.174.tgz",
-      "integrity": "sha512-TdTZPf1trZ8/UFu5Cx/GXB7GZM30LT+wWUNfsi6Bq8ePLnb+woNKtDymI2mxZYBpMbonNFqKmiz684DIfnd8dA==",
+    "node_modules/jest-config/node_modules/chalk": {
+      "version": "4.1.2",
+      "license": "MIT",
+      "dependencies": {
+        "ansi-styles": "^4.1.0",
+        "supports-color": "^7.1.0"
+      },
       "engines": {
-        "node": ">=18"
+        "node": ">=10"
       },
-      "optionalDependencies": {
-        "canvas": "^2.11.2",
-        "path2d-polyfill": "^2.0.1"
+      "funding": {
+        "url": "https://github.com/chalk/chalk?sponsor=1"
       }
     },
-    "node_modules/peek-stream": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/peek-stream/-/peek-stream-1.1.3.tgz",
-      "integrity": "sha512-FhJ+YbOSBb9/rIl2ZeE/QHEsWn7PqNYt8ARAY3kIgNGOk13g9FGyIY6JIl/xB/3TFRVoTv5as0l11weORrTekA==",
+    "node_modules/jest-config/node_modules/color-convert": {
+      "version": "2.0.1",
+      "license": "MIT",
       "dependencies": {
-        "buffer-from": "^1.0.0",
-        "duplexify": "^3.5.0",
-        "through2": "^2.0.3"
+        "color-name": "~1.1.4"
+      },
+      "engines": {
+        "node": ">=7.0.0"
       }
     },
-    "node_modules/pend": {
-      "version": "1.2.0",
-      "dev": true,
+    "node_modules/jest-config/node_modules/color-name": {
+      "version": "1.1.4",
       "license": "MIT"
     },
-    "node_modules/picocolors": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.0.0.tgz",
-      "integrity": "sha512-1fygroTLlHu66zi26VoTDv8yRgm0Fccecssto+MhsZ0D/DGW2sm8E8AjW7NU5VVTRt5GxbeZ5qBuJr+HyLYkjQ=="
+    "node_modules/jest-config/node_modules/dedent": {
+      "version": "1.5.3",
+      "license": "MIT",
+      "peerDependencies": {
+        "babel-plugin-macros": "^3.1.0"
+      },
+      "peerDependenciesMeta": {
+        "babel-plugin-macros": {
+          "optional": true
+        }
+      }
     },
-    "node_modules/picomatch": {
-      "version": "2.3.1",
+    "node_modules/jest-config/node_modules/has-flag": {
+      "version": "4.0.0",
       "license": "MIT",
       "engines": {
-        "node": ">=8.6"
+        "node": ">=8"
+      }
+    },
+    "node_modules/jest-config/node_modules/jest-circus": {
+      "version": "29.7.0",
+      "license": "MIT",
+      "dependencies": {
+        "@jest/environment": "^29.7.0",
+        "@jest/expect": "^29.7.0",
+        "@jest/test-result": "^29.7.0",
+        "@jest/types": "^29.6.3",
+        "@types/node": "*",
+        "chalk": "^4.0.0",
+        "co": "^4.6.0",
+        "dedent": "^1.0.0",
+        "is-generator-fn": "^2.0.0",
+        "jest-each": "^29.7.0",
+        "jest-matcher-utils": "^29.7.0",
+        "jest-message-util": "^29.7.0",
+        "jest-runtime": "^29.7.0",
+        "jest-snapshot": "^29.7.0",
+        "jest-util": "^29.7.0",
+        "p-limit": "^3.1.0",
+        "pretty-format": "^29.7.0",
+        "pure-rand": "^6.0.0",
+        "slash": "^3.0.0",
+        "stack-utils": "^2.0.3"
       },
-      "funding": {
-        "url": "https://github.com/sponsors/jonschlinkert"
+      "engines": {
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
       }
     },
-    "node_modules/pify": {
-      "version": "4.0.1",
+    "node_modules/jest-config/node_modules/supports-color": {
+      "version": "7.2.0",
       "license": "MIT",
+      "dependencies": {
+        "has-flag": "^4.0.0"
+      },
       "engines": {
-        "node": ">=6"
+        "node": ">=8"
       }
     },
-    "node_modules/pinkie": {
-      "version": "2.0.4",
+    "node_modules/jest-diff": {
+      "version": "29.7.0",
       "license": "MIT",
+      "dependencies": {
+        "chalk": "^4.0.0",
+        "diff-sequences": "^29.6.3",
+        "jest-get-type": "^29.6.3",
+        "pretty-format": "^29.7.0"
+      },
       "engines": {
-        "node": ">=0.10.0"
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
       }
     },
-    "node_modules/pinkie-promise": {
+    "node_modules/jest-diff/node_modules/ansi-styles": {
+      "version": "4.3.0",
+      "license": "MIT",
+      "dependencies": {
+        "color-convert": "^2.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
+      }
+    },
+    "node_modules/jest-diff/node_modules/chalk": {
+      "version": "4.1.2",
+      "license": "MIT",
+      "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/jest-diff/node_modules/color-convert": {
       "version": "2.0.1",
       "license": "MIT",
       "dependencies": {
-        "pinkie": "^2.0.0"
+        "color-name": "~1.1.4"
       },
       "engines": {
-        "node": ">=0.10.0"
+        "node": ">=7.0.0"
       }
     },
-    "node_modules/pirates": {
-      "version": "4.0.6",
-      "resolved": "https://registry.npmjs.org/pirates/-/pirates-4.0.6.tgz",
-      "integrity": "sha512-saLsH7WeYYPiD25LDuLRRY/i+6HaPYr6G1OUlN39otzkSTxKnubR9RTxS3/Kk50s1g2JTgFwWQDQyplC5/SHZg==",
+    "node_modules/jest-diff/node_modules/color-name": {
+      "version": "1.1.4",
+      "license": "MIT"
+    },
+    "node_modules/jest-diff/node_modules/has-flag": {
+      "version": "4.0.0",
+      "license": "MIT",
       "engines": {
-        "node": ">= 6"
+        "node": ">=8"
       }
     },
-    "node_modules/pkg-dir": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-5.0.0.tgz",
-      "integrity": "sha512-NPE8TDbzl/3YQYY7CSS228s3g2ollTFnc+Qi3tqmqJp9Vg2ovUpixcJEo2HJScN2Ez+kEaal6y70c0ehqJBJeA==",
+    "node_modules/jest-diff/node_modules/supports-color": {
+      "version": "7.2.0",
+      "license": "MIT",
       "dependencies": {
-        "find-up": "^5.0.0"
+        "has-flag": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/jest-docblock": {
+      "version": "29.7.0",
+      "license": "MIT",
+      "dependencies": {
+        "detect-newline": "^3.0.0"
+      },
+      "engines": {
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+      }
+    },
+    "node_modules/jest-each": {
+      "version": "29.7.0",
+      "license": "MIT",
+      "dependencies": {
+        "@jest/types": "^29.6.3",
+        "chalk": "^4.0.0",
+        "jest-get-type": "^29.6.3",
+        "jest-util": "^29.7.0",
+        "pretty-format": "^29.7.0"
+      },
+      "engines": {
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+      }
+    },
+    "node_modules/jest-each/node_modules/ansi-styles": {
+      "version": "4.3.0",
+      "license": "MIT",
+      "dependencies": {
+        "color-convert": "^2.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
+      }
+    },
+    "node_modules/jest-each/node_modules/chalk": {
+      "version": "4.1.2",
+      "license": "MIT",
+      "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/pkg-up": {
-      "version": "3.1.0",
-      "dev": true,
+    "node_modules/jest-each/node_modules/color-convert": {
+      "version": "2.0.1",
       "license": "MIT",
       "dependencies": {
-        "find-up": "^3.0.0"
+        "color-name": "~1.1.4"
       },
+      "engines": {
+        "node": ">=7.0.0"
+      }
+    },
+    "node_modules/jest-each/node_modules/color-name": {
+      "version": "1.1.4",
+      "license": "MIT"
+    },
+    "node_modules/jest-each/node_modules/has-flag": {
+      "version": "4.0.0",
+      "license": "MIT",
       "engines": {
         "node": ">=8"
       }
     },
-    "node_modules/pkg-up/node_modules/find-up": {
-      "version": "3.0.0",
-      "dev": true,
+    "node_modules/jest-each/node_modules/supports-color": {
+      "version": "7.2.0",
       "license": "MIT",
       "dependencies": {
-        "locate-path": "^3.0.0"
+        "has-flag": "^4.0.0"
       },
       "engines": {
-        "node": ">=6"
+        "node": ">=8"
       }
     },
-    "node_modules/pkg-up/node_modules/locate-path": {
-      "version": "3.0.0",
-      "dev": true,
+    "node_modules/jest-environment-jsdom": {
+      "version": "29.4.1",
       "license": "MIT",
       "dependencies": {
-        "p-locate": "^3.0.0",
-        "path-exists": "^3.0.0"
+        "@jest/environment": "^29.4.1",
+        "@jest/fake-timers": "^29.4.1",
+        "@jest/types": "^29.4.1",
+        "@types/jsdom": "^20.0.0",
+        "@types/node": "*",
+        "jest-mock": "^29.4.1",
+        "jest-util": "^29.4.1",
+        "jsdom": "^20.0.0"
       },
       "engines": {
-        "node": ">=6"
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+      },
+      "peerDependencies": {
+        "canvas": "^2.5.0"
+      },
+      "peerDependenciesMeta": {
+        "canvas": {
+          "optional": true
+        }
       }
     },
-    "node_modules/pkg-up/node_modules/p-limit": {
+    "node_modules/jest-environment-jsdom/node_modules/acorn": {
+      "version": "8.11.3",
+      "license": "MIT",
+      "bin": {
+        "acorn": "bin/acorn"
+      },
+      "engines": {
+        "node": ">=0.4.0"
+      }
+    },
+    "node_modules/jest-environment-jsdom/node_modules/cssstyle": {
       "version": "2.3.0",
-      "dev": true,
       "license": "MIT",
       "dependencies": {
-        "p-try": "^2.0.0"
+        "cssom": "~0.3.6"
       },
       "engines": {
-        "node": ">=6"
+        "node": ">=8"
+      }
+    },
+    "node_modules/jest-environment-jsdom/node_modules/cssstyle/node_modules/cssom": {
+      "version": "0.3.8",
+      "license": "MIT"
+    },
+    "node_modules/jest-environment-jsdom/node_modules/data-urls": {
+      "version": "3.0.2",
+      "license": "MIT",
+      "dependencies": {
+        "abab": "^2.0.6",
+        "whatwg-mimetype": "^3.0.0",
+        "whatwg-url": "^11.0.0"
+      },
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/jest-environment-jsdom/node_modules/entities": {
+      "version": "4.5.0",
+      "license": "BSD-2-Clause",
+      "engines": {
+        "node": ">=0.12"
       },
       "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
+        "url": "https://github.com/fb55/entities?sponsor=1"
       }
     },
-    "node_modules/pkg-up/node_modules/p-locate": {
+    "node_modules/jest-environment-jsdom/node_modules/form-data": {
+      "version": "4.0.0",
+      "license": "MIT",
+      "dependencies": {
+        "asynckit": "^0.4.0",
+        "combined-stream": "^1.0.8",
+        "mime-types": "^2.1.12"
+      },
+      "engines": {
+        "node": ">= 6"
+      }
+    },
+    "node_modules/jest-environment-jsdom/node_modules/html-encoding-sniffer": {
       "version": "3.0.0",
-      "dev": true,
       "license": "MIT",
       "dependencies": {
-        "p-limit": "^2.0.0"
+        "whatwg-encoding": "^2.0.0"
       },
       "engines": {
-        "node": ">=6"
+        "node": ">=12"
+      }
+    },
+    "node_modules/jest-environment-jsdom/node_modules/jsdom": {
+      "version": "20.0.3",
+      "license": "MIT",
+      "dependencies": {
+        "abab": "^2.0.6",
+        "acorn": "^8.8.1",
+        "acorn-globals": "^7.0.0",
+        "cssom": "^0.5.0",
+        "cssstyle": "^2.3.0",
+        "data-urls": "^3.0.2",
+        "decimal.js": "^10.4.2",
+        "domexception": "^4.0.0",
+        "escodegen": "^2.0.0",
+        "form-data": "^4.0.0",
+        "html-encoding-sniffer": "^3.0.0",
+        "http-proxy-agent": "^5.0.0",
+        "https-proxy-agent": "^5.0.1",
+        "is-potential-custom-element-name": "^1.0.1",
+        "nwsapi": "^2.2.2",
+        "parse5": "^7.1.1",
+        "saxes": "^6.0.0",
+        "symbol-tree": "^3.2.4",
+        "tough-cookie": "^4.1.2",
+        "w3c-xmlserializer": "^4.0.0",
+        "webidl-conversions": "^7.0.0",
+        "whatwg-encoding": "^2.0.0",
+        "whatwg-mimetype": "^3.0.0",
+        "whatwg-url": "^11.0.0",
+        "ws": "^8.11.0",
+        "xml-name-validator": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=14"
+      },
+      "peerDependencies": {
+        "canvas": "^2.5.0"
+      },
+      "peerDependenciesMeta": {
+        "canvas": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/jest-environment-jsdom/node_modules/parse5": {
+      "version": "7.1.2",
+      "license": "MIT",
+      "dependencies": {
+        "entities": "^4.4.0"
+      },
+      "funding": {
+        "url": "https://github.com/inikulin/parse5?sponsor=1"
+      }
+    },
+    "node_modules/jest-environment-jsdom/node_modules/tr46": {
+      "version": "3.0.0",
+      "license": "MIT",
+      "dependencies": {
+        "punycode": "^2.1.1"
+      },
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/jest-environment-jsdom/node_modules/w3c-xmlserializer": {
+      "version": "4.0.0",
+      "license": "MIT",
+      "dependencies": {
+        "xml-name-validator": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=14"
+      }
+    },
+    "node_modules/jest-environment-jsdom/node_modules/whatwg-mimetype": {
+      "version": "3.0.0",
+      "license": "MIT",
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/jest-environment-jsdom/node_modules/whatwg-url": {
+      "version": "11.0.0",
+      "license": "MIT",
+      "dependencies": {
+        "tr46": "^3.0.0",
+        "webidl-conversions": "^7.0.0"
+      },
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/jest-environment-jsdom/node_modules/xml-name-validator": {
+      "version": "4.0.0",
+      "license": "Apache-2.0",
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/jest-environment-node": {
+      "version": "29.7.0",
+      "license": "MIT",
+      "dependencies": {
+        "@jest/environment": "^29.7.0",
+        "@jest/fake-timers": "^29.7.0",
+        "@jest/types": "^29.6.3",
+        "@types/node": "*",
+        "jest-mock": "^29.7.0",
+        "jest-util": "^29.7.0"
+      },
+      "engines": {
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+      }
+    },
+    "node_modules/jest-expo": {
+      "version": "51.0.3",
+      "license": "MIT",
+      "dependencies": {
+        "@expo/config": "~9.0.0-beta.0",
+        "@expo/json-file": "^8.3.0",
+        "@jest/create-cache-key-function": "^29.2.1",
+        "babel-jest": "^29.2.1",
+        "find-up": "^5.0.0",
+        "jest-environment-jsdom": "^29.2.1",
+        "jest-watch-select-projects": "^2.0.0",
+        "jest-watch-typeahead": "2.2.1",
+        "json5": "^2.2.3",
+        "lodash": "^4.17.19",
+        "react-test-renderer": "18.2.0",
+        "stacktrace-js": "^2.0.2"
+      },
+      "bin": {
+        "jest": "bin/jest.js"
+      }
+    },
+    "node_modules/jest-expo/node_modules/@babel/code-frame": {
+      "version": "7.10.4",
+      "license": "MIT",
+      "dependencies": {
+        "@babel/highlight": "^7.10.4"
+      }
+    },
+    "node_modules/jest-expo/node_modules/@expo/json-file": {
+      "version": "8.3.1",
+      "license": "MIT",
+      "dependencies": {
+        "@babel/code-frame": "~7.10.4",
+        "json5": "^2.2.2",
+        "write-file-atomic": "^2.3.0"
+      }
+    },
+    "node_modules/jest-expo/node_modules/react-test-renderer": {
+      "version": "18.2.0",
+      "license": "MIT",
+      "dependencies": {
+        "react-is": "^18.2.0",
+        "react-shallow-renderer": "^16.15.0",
+        "scheduler": "^0.23.0"
+      },
+      "peerDependencies": {
+        "react": "^18.2.0"
+      }
+    },
+    "node_modules/jest-expo/node_modules/scheduler": {
+      "version": "0.23.2",
+      "license": "MIT",
+      "dependencies": {
+        "loose-envify": "^1.1.0"
+      }
+    },
+    "node_modules/jest-get-type": {
+      "version": "29.6.3",
+      "license": "MIT",
+      "engines": {
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+      }
+    },
+    "node_modules/jest-haste-map": {
+      "version": "29.7.0",
+      "license": "MIT",
+      "dependencies": {
+        "@jest/types": "^29.6.3",
+        "@types/graceful-fs": "^4.1.3",
+        "@types/node": "*",
+        "anymatch": "^3.0.3",
+        "fb-watchman": "^2.0.0",
+        "graceful-fs": "^4.2.9",
+        "jest-regex-util": "^29.6.3",
+        "jest-util": "^29.7.0",
+        "jest-worker": "^29.7.0",
+        "micromatch": "^4.0.4",
+        "walker": "^1.0.8"
+      },
+      "engines": {
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+      },
+      "optionalDependencies": {
+        "fsevents": "^2.3.2"
+      }
+    },
+    "node_modules/jest-haste-map/node_modules/has-flag": {
+      "version": "4.0.0",
+      "license": "MIT",
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/jest-haste-map/node_modules/jest-worker": {
+      "version": "29.7.0",
+      "license": "MIT",
+      "dependencies": {
+        "@types/node": "*",
+        "jest-util": "^29.7.0",
+        "merge-stream": "^2.0.0",
+        "supports-color": "^8.0.0"
+      },
+      "engines": {
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+      }
+    },
+    "node_modules/jest-haste-map/node_modules/supports-color": {
+      "version": "8.1.1",
+      "license": "MIT",
+      "dependencies": {
+        "has-flag": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/supports-color?sponsor=1"
+      }
+    },
+    "node_modules/jest-leak-detector": {
+      "version": "29.7.0",
+      "license": "MIT",
+      "dependencies": {
+        "jest-get-type": "^29.6.3",
+        "pretty-format": "^29.7.0"
+      },
+      "engines": {
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+      }
+    },
+    "node_modules/jest-matcher-utils": {
+      "version": "29.7.0",
+      "license": "MIT",
+      "dependencies": {
+        "chalk": "^4.0.0",
+        "jest-diff": "^29.7.0",
+        "jest-get-type": "^29.6.3",
+        "pretty-format": "^29.7.0"
+      },
+      "engines": {
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+      }
+    },
+    "node_modules/jest-matcher-utils/node_modules/ansi-styles": {
+      "version": "4.3.0",
+      "license": "MIT",
+      "dependencies": {
+        "color-convert": "^2.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
+      }
+    },
+    "node_modules/jest-matcher-utils/node_modules/chalk": {
+      "version": "4.1.2",
+      "license": "MIT",
+      "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/jest-matcher-utils/node_modules/color-convert": {
+      "version": "2.0.1",
+      "license": "MIT",
+      "dependencies": {
+        "color-name": "~1.1.4"
+      },
+      "engines": {
+        "node": ">=7.0.0"
+      }
+    },
+    "node_modules/jest-matcher-utils/node_modules/color-name": {
+      "version": "1.1.4",
+      "license": "MIT"
+    },
+    "node_modules/jest-matcher-utils/node_modules/has-flag": {
+      "version": "4.0.0",
+      "license": "MIT",
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/jest-matcher-utils/node_modules/supports-color": {
+      "version": "7.2.0",
+      "license": "MIT",
+      "dependencies": {
+        "has-flag": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/jest-message-util": {
+      "version": "29.7.0",
+      "license": "MIT",
+      "dependencies": {
+        "@babel/code-frame": "^7.12.13",
+        "@jest/types": "^29.6.3",
+        "@types/stack-utils": "^2.0.0",
+        "chalk": "^4.0.0",
+        "graceful-fs": "^4.2.9",
+        "micromatch": "^4.0.4",
+        "pretty-format": "^29.7.0",
+        "slash": "^3.0.0",
+        "stack-utils": "^2.0.3"
+      },
+      "engines": {
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+      }
+    },
+    "node_modules/jest-message-util/node_modules/ansi-styles": {
+      "version": "4.3.0",
+      "license": "MIT",
+      "dependencies": {
+        "color-convert": "^2.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
+      }
+    },
+    "node_modules/jest-message-util/node_modules/chalk": {
+      "version": "4.1.2",
+      "license": "MIT",
+      "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/jest-message-util/node_modules/color-convert": {
+      "version": "2.0.1",
+      "license": "MIT",
+      "dependencies": {
+        "color-name": "~1.1.4"
+      },
+      "engines": {
+        "node": ">=7.0.0"
+      }
+    },
+    "node_modules/jest-message-util/node_modules/color-name": {
+      "version": "1.1.4",
+      "license": "MIT"
+    },
+    "node_modules/jest-message-util/node_modules/has-flag": {
+      "version": "4.0.0",
+      "license": "MIT",
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/jest-message-util/node_modules/supports-color": {
+      "version": "7.2.0",
+      "license": "MIT",
+      "dependencies": {
+        "has-flag": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/jest-mock": {
+      "version": "29.7.0",
+      "license": "MIT",
+      "dependencies": {
+        "@jest/types": "^29.6.3",
+        "@types/node": "*",
+        "jest-util": "^29.7.0"
+      },
+      "engines": {
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+      }
+    },
+    "node_modules/jest-pnp-resolver": {
+      "version": "1.2.3",
+      "license": "MIT",
+      "engines": {
+        "node": ">=6"
+      },
+      "peerDependencies": {
+        "jest-resolve": "*"
+      },
+      "peerDependenciesMeta": {
+        "jest-resolve": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/jest-regex-util": {
+      "version": "29.6.3",
+      "license": "MIT",
+      "engines": {
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+      }
+    },
+    "node_modules/jest-resolve": {
+      "version": "29.7.0",
+      "license": "MIT",
+      "dependencies": {
+        "chalk": "^4.0.0",
+        "graceful-fs": "^4.2.9",
+        "jest-haste-map": "^29.7.0",
+        "jest-pnp-resolver": "^1.2.2",
+        "jest-util": "^29.7.0",
+        "jest-validate": "^29.7.0",
+        "resolve": "^1.20.0",
+        "resolve.exports": "^2.0.0",
+        "slash": "^3.0.0"
+      },
+      "engines": {
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+      }
+    },
+    "node_modules/jest-resolve-dependencies": {
+      "version": "29.7.0",
+      "license": "MIT",
+      "dependencies": {
+        "jest-regex-util": "^29.6.3",
+        "jest-snapshot": "^29.7.0"
+      },
+      "engines": {
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+      }
+    },
+    "node_modules/jest-resolve/node_modules/ansi-styles": {
+      "version": "4.3.0",
+      "license": "MIT",
+      "dependencies": {
+        "color-convert": "^2.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
+      }
+    },
+    "node_modules/jest-resolve/node_modules/chalk": {
+      "version": "4.1.2",
+      "license": "MIT",
+      "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/jest-resolve/node_modules/color-convert": {
+      "version": "2.0.1",
+      "license": "MIT",
+      "dependencies": {
+        "color-name": "~1.1.4"
+      },
+      "engines": {
+        "node": ">=7.0.0"
+      }
+    },
+    "node_modules/jest-resolve/node_modules/color-name": {
+      "version": "1.1.4",
+      "license": "MIT"
+    },
+    "node_modules/jest-resolve/node_modules/has-flag": {
+      "version": "4.0.0",
+      "license": "MIT",
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/jest-resolve/node_modules/supports-color": {
+      "version": "7.2.0",
+      "license": "MIT",
+      "dependencies": {
+        "has-flag": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/jest-runner": {
+      "version": "29.7.0",
+      "license": "MIT",
+      "dependencies": {
+        "@jest/console": "^29.7.0",
+        "@jest/environment": "^29.7.0",
+        "@jest/test-result": "^29.7.0",
+        "@jest/transform": "^29.7.0",
+        "@jest/types": "^29.6.3",
+        "@types/node": "*",
+        "chalk": "^4.0.0",
+        "emittery": "^0.13.1",
+        "graceful-fs": "^4.2.9",
+        "jest-docblock": "^29.7.0",
+        "jest-environment-node": "^29.7.0",
+        "jest-haste-map": "^29.7.0",
+        "jest-leak-detector": "^29.7.0",
+        "jest-message-util": "^29.7.0",
+        "jest-resolve": "^29.7.0",
+        "jest-runtime": "^29.7.0",
+        "jest-util": "^29.7.0",
+        "jest-watcher": "^29.7.0",
+        "jest-worker": "^29.7.0",
+        "p-limit": "^3.1.0",
+        "source-map-support": "0.5.13"
+      },
+      "engines": {
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+      }
+    },
+    "node_modules/jest-runner/node_modules/ansi-styles": {
+      "version": "4.3.0",
+      "license": "MIT",
+      "dependencies": {
+        "color-convert": "^2.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
+      }
+    },
+    "node_modules/jest-runner/node_modules/chalk": {
+      "version": "4.1.2",
+      "license": "MIT",
+      "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/jest-runner/node_modules/color-convert": {
+      "version": "2.0.1",
+      "license": "MIT",
+      "dependencies": {
+        "color-name": "~1.1.4"
+      },
+      "engines": {
+        "node": ">=7.0.0"
+      }
+    },
+    "node_modules/jest-runner/node_modules/color-name": {
+      "version": "1.1.4",
+      "license": "MIT"
+    },
+    "node_modules/jest-runner/node_modules/has-flag": {
+      "version": "4.0.0",
+      "license": "MIT",
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/jest-runner/node_modules/jest-worker": {
+      "version": "29.7.0",
+      "license": "MIT",
+      "dependencies": {
+        "@types/node": "*",
+        "jest-util": "^29.7.0",
+        "merge-stream": "^2.0.0",
+        "supports-color": "^8.0.0"
+      },
+      "engines": {
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+      }
+    },
+    "node_modules/jest-runner/node_modules/jest-worker/node_modules/supports-color": {
+      "version": "8.1.1",
+      "license": "MIT",
+      "dependencies": {
+        "has-flag": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/supports-color?sponsor=1"
+      }
+    },
+    "node_modules/jest-runner/node_modules/source-map": {
+      "version": "0.6.1",
+      "license": "BSD-3-Clause",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/jest-runner/node_modules/source-map-support": {
+      "version": "0.5.13",
+      "license": "MIT",
+      "dependencies": {
+        "buffer-from": "^1.0.0",
+        "source-map": "^0.6.0"
+      }
+    },
+    "node_modules/jest-runner/node_modules/supports-color": {
+      "version": "7.2.0",
+      "license": "MIT",
+      "dependencies": {
+        "has-flag": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/jest-runtime": {
+      "version": "29.7.0",
+      "license": "MIT",
+      "dependencies": {
+        "@jest/environment": "^29.7.0",
+        "@jest/fake-timers": "^29.7.0",
+        "@jest/globals": "^29.7.0",
+        "@jest/source-map": "^29.6.3",
+        "@jest/test-result": "^29.7.0",
+        "@jest/transform": "^29.7.0",
+        "@jest/types": "^29.6.3",
+        "@types/node": "*",
+        "chalk": "^4.0.0",
+        "cjs-module-lexer": "^1.0.0",
+        "collect-v8-coverage": "^1.0.0",
+        "glob": "^7.1.3",
+        "graceful-fs": "^4.2.9",
+        "jest-haste-map": "^29.7.0",
+        "jest-message-util": "^29.7.0",
+        "jest-mock": "^29.7.0",
+        "jest-regex-util": "^29.6.3",
+        "jest-resolve": "^29.7.0",
+        "jest-snapshot": "^29.7.0",
+        "jest-util": "^29.7.0",
+        "slash": "^3.0.0",
+        "strip-bom": "^4.0.0"
+      },
+      "engines": {
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+      }
+    },
+    "node_modules/jest-runtime/node_modules/ansi-styles": {
+      "version": "4.3.0",
+      "license": "MIT",
+      "dependencies": {
+        "color-convert": "^2.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
+      }
+    },
+    "node_modules/jest-runtime/node_modules/chalk": {
+      "version": "4.1.2",
+      "license": "MIT",
+      "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/jest-runtime/node_modules/color-convert": {
+      "version": "2.0.1",
+      "license": "MIT",
+      "dependencies": {
+        "color-name": "~1.1.4"
+      },
+      "engines": {
+        "node": ">=7.0.0"
+      }
+    },
+    "node_modules/jest-runtime/node_modules/color-name": {
+      "version": "1.1.4",
+      "license": "MIT"
+    },
+    "node_modules/jest-runtime/node_modules/has-flag": {
+      "version": "4.0.0",
+      "license": "MIT",
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/jest-runtime/node_modules/supports-color": {
+      "version": "7.2.0",
+      "license": "MIT",
+      "dependencies": {
+        "has-flag": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/jest-snapshot": {
+      "version": "29.7.0",
+      "license": "MIT",
+      "dependencies": {
+        "@babel/core": "^7.11.6",
+        "@babel/generator": "^7.7.2",
+        "@babel/plugin-syntax-jsx": "^7.7.2",
+        "@babel/plugin-syntax-typescript": "^7.7.2",
+        "@babel/types": "^7.3.3",
+        "@jest/expect-utils": "^29.7.0",
+        "@jest/transform": "^29.7.0",
+        "@jest/types": "^29.6.3",
+        "babel-preset-current-node-syntax": "^1.0.0",
+        "chalk": "^4.0.0",
+        "expect": "^29.7.0",
+        "graceful-fs": "^4.2.9",
+        "jest-diff": "^29.7.0",
+        "jest-get-type": "^29.6.3",
+        "jest-matcher-utils": "^29.7.0",
+        "jest-message-util": "^29.7.0",
+        "jest-util": "^29.7.0",
+        "natural-compare": "^1.4.0",
+        "pretty-format": "^29.7.0",
+        "semver": "^7.5.3"
+      },
+      "engines": {
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+      }
+    },
+    "node_modules/jest-snapshot/node_modules/ansi-styles": {
+      "version": "4.3.0",
+      "license": "MIT",
+      "dependencies": {
+        "color-convert": "^2.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
+      }
+    },
+    "node_modules/jest-snapshot/node_modules/chalk": {
+      "version": "4.1.2",
+      "license": "MIT",
+      "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/jest-snapshot/node_modules/color-convert": {
+      "version": "2.0.1",
+      "license": "MIT",
+      "dependencies": {
+        "color-name": "~1.1.4"
+      },
+      "engines": {
+        "node": ">=7.0.0"
+      }
+    },
+    "node_modules/jest-snapshot/node_modules/color-name": {
+      "version": "1.1.4",
+      "license": "MIT"
+    },
+    "node_modules/jest-snapshot/node_modules/has-flag": {
+      "version": "4.0.0",
+      "license": "MIT",
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/jest-snapshot/node_modules/supports-color": {
+      "version": "7.2.0",
+      "license": "MIT",
+      "dependencies": {
+        "has-flag": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/jest-transformer-svg": {
+      "version": "2.0.1",
+      "dev": true,
+      "license": "MIT",
+      "peerDependencies": {
+        "jest": ">= 28.1.0",
+        "react": "^17.0.0 || ^18.0.0"
+      }
+    },
+    "node_modules/jest-util": {
+      "version": "29.7.0",
+      "license": "MIT",
+      "dependencies": {
+        "@jest/types": "^29.6.3",
+        "@types/node": "*",
+        "chalk": "^4.0.0",
+        "ci-info": "^3.2.0",
+        "graceful-fs": "^4.2.9",
+        "picomatch": "^2.2.3"
+      },
+      "engines": {
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+      }
+    },
+    "node_modules/jest-util/node_modules/ansi-styles": {
+      "version": "4.3.0",
+      "license": "MIT",
+      "dependencies": {
+        "color-convert": "^2.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
+      }
+    },
+    "node_modules/jest-util/node_modules/chalk": {
+      "version": "4.1.2",
+      "license": "MIT",
+      "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/jest-util/node_modules/color-convert": {
+      "version": "2.0.1",
+      "license": "MIT",
+      "dependencies": {
+        "color-name": "~1.1.4"
+      },
+      "engines": {
+        "node": ">=7.0.0"
+      }
+    },
+    "node_modules/jest-util/node_modules/color-name": {
+      "version": "1.1.4",
+      "license": "MIT"
+    },
+    "node_modules/jest-util/node_modules/has-flag": {
+      "version": "4.0.0",
+      "license": "MIT",
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/jest-util/node_modules/supports-color": {
+      "version": "7.2.0",
+      "license": "MIT",
+      "dependencies": {
+        "has-flag": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/jest-validate": {
+      "version": "29.7.0",
+      "license": "MIT",
+      "dependencies": {
+        "@jest/types": "^29.6.3",
+        "camelcase": "^6.2.0",
+        "chalk": "^4.0.0",
+        "jest-get-type": "^29.6.3",
+        "leven": "^3.1.0",
+        "pretty-format": "^29.7.0"
+      },
+      "engines": {
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+      }
+    },
+    "node_modules/jest-validate/node_modules/ansi-styles": {
+      "version": "4.3.0",
+      "license": "MIT",
+      "dependencies": {
+        "color-convert": "^2.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
+      }
+    },
+    "node_modules/jest-validate/node_modules/chalk": {
+      "version": "4.1.2",
+      "license": "MIT",
+      "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/jest-validate/node_modules/color-convert": {
+      "version": "2.0.1",
+      "license": "MIT",
+      "dependencies": {
+        "color-name": "~1.1.4"
+      },
+      "engines": {
+        "node": ">=7.0.0"
+      }
+    },
+    "node_modules/jest-validate/node_modules/color-name": {
+      "version": "1.1.4",
+      "license": "MIT"
+    },
+    "node_modules/jest-validate/node_modules/has-flag": {
+      "version": "4.0.0",
+      "license": "MIT",
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/jest-validate/node_modules/supports-color": {
+      "version": "7.2.0",
+      "license": "MIT",
+      "dependencies": {
+        "has-flag": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/jest-watch-select-projects": {
+      "version": "2.0.0",
+      "license": "MIT",
+      "dependencies": {
+        "ansi-escapes": "^4.3.0",
+        "chalk": "^3.0.0",
+        "prompts": "^2.2.1"
+      }
+    },
+    "node_modules/jest-watch-select-projects/node_modules/ansi-styles": {
+      "version": "4.3.0",
+      "license": "MIT",
+      "dependencies": {
+        "color-convert": "^2.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
+      }
+    },
+    "node_modules/jest-watch-select-projects/node_modules/chalk": {
+      "version": "3.0.0",
+      "license": "MIT",
+      "dependencies": {
+        "ansi-styles": "^4.1.0",
+        "supports-color": "^7.1.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/jest-watch-select-projects/node_modules/color-convert": {
+      "version": "2.0.1",
+      "license": "MIT",
+      "dependencies": {
+        "color-name": "~1.1.4"
+      },
+      "engines": {
+        "node": ">=7.0.0"
+      }
+    },
+    "node_modules/jest-watch-select-projects/node_modules/color-name": {
+      "version": "1.1.4",
+      "license": "MIT"
+    },
+    "node_modules/jest-watch-select-projects/node_modules/has-flag": {
+      "version": "4.0.0",
+      "license": "MIT",
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/jest-watch-select-projects/node_modules/supports-color": {
+      "version": "7.2.0",
+      "license": "MIT",
+      "dependencies": {
+        "has-flag": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/jest-watch-typeahead": {
+      "version": "2.2.1",
+      "license": "MIT",
+      "dependencies": {
+        "ansi-escapes": "^6.0.0",
+        "chalk": "^4.0.0",
+        "jest-regex-util": "^29.0.0",
+        "jest-watcher": "^29.0.0",
+        "slash": "^5.0.0",
+        "string-length": "^5.0.1",
+        "strip-ansi": "^7.0.1"
+      },
+      "engines": {
+        "node": "^14.17.0 || ^16.10.0 || >=18.0.0"
+      },
+      "peerDependencies": {
+        "jest": "^27.0.0 || ^28.0.0 || ^29.0.0"
+      }
+    },
+    "node_modules/jest-watch-typeahead/node_modules/ansi-escapes": {
+      "version": "6.2.0",
+      "license": "MIT",
+      "dependencies": {
+        "type-fest": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=14.16"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/jest-watch-typeahead/node_modules/ansi-regex": {
+      "version": "6.0.1",
+      "license": "MIT",
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/ansi-regex?sponsor=1"
+      }
+    },
+    "node_modules/jest-watch-typeahead/node_modules/ansi-styles": {
+      "version": "4.3.0",
+      "license": "MIT",
+      "dependencies": {
+        "color-convert": "^2.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
+      }
+    },
+    "node_modules/jest-watch-typeahead/node_modules/chalk": {
+      "version": "4.1.2",
+      "license": "MIT",
+      "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/jest-watch-typeahead/node_modules/char-regex": {
+      "version": "2.0.1",
+      "license": "MIT",
+      "engines": {
+        "node": ">=12.20"
+      }
+    },
+    "node_modules/jest-watch-typeahead/node_modules/color-convert": {
+      "version": "2.0.1",
+      "license": "MIT",
+      "dependencies": {
+        "color-name": "~1.1.4"
+      },
+      "engines": {
+        "node": ">=7.0.0"
+      }
+    },
+    "node_modules/jest-watch-typeahead/node_modules/color-name": {
+      "version": "1.1.4",
+      "license": "MIT"
+    },
+    "node_modules/jest-watch-typeahead/node_modules/has-flag": {
+      "version": "4.0.0",
+      "license": "MIT",
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/jest-watch-typeahead/node_modules/slash": {
+      "version": "5.1.0",
+      "license": "MIT",
+      "engines": {
+        "node": ">=14.16"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/jest-watch-typeahead/node_modules/string-length": {
+      "version": "5.0.1",
+      "license": "MIT",
+      "dependencies": {
+        "char-regex": "^2.0.0",
+        "strip-ansi": "^7.0.1"
+      },
+      "engines": {
+        "node": ">=12.20"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/jest-watch-typeahead/node_modules/strip-ansi": {
+      "version": "7.1.0",
+      "license": "MIT",
+      "dependencies": {
+        "ansi-regex": "^6.0.1"
+      },
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/strip-ansi?sponsor=1"
+      }
+    },
+    "node_modules/jest-watch-typeahead/node_modules/supports-color": {
+      "version": "7.2.0",
+      "license": "MIT",
+      "dependencies": {
+        "has-flag": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/jest-watch-typeahead/node_modules/type-fest": {
+      "version": "3.13.1",
+      "license": "(MIT OR CC0-1.0)",
+      "engines": {
+        "node": ">=14.16"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/jest-watcher": {
+      "version": "29.7.0",
+      "license": "MIT",
+      "dependencies": {
+        "@jest/test-result": "^29.7.0",
+        "@jest/types": "^29.6.3",
+        "@types/node": "*",
+        "ansi-escapes": "^4.2.1",
+        "chalk": "^4.0.0",
+        "emittery": "^0.13.1",
+        "jest-util": "^29.7.0",
+        "string-length": "^4.0.1"
+      },
+      "engines": {
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+      }
+    },
+    "node_modules/jest-watcher/node_modules/ansi-styles": {
+      "version": "4.3.0",
+      "license": "MIT",
+      "dependencies": {
+        "color-convert": "^2.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
+      }
+    },
+    "node_modules/jest-watcher/node_modules/chalk": {
+      "version": "4.1.2",
+      "license": "MIT",
+      "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/jest-watcher/node_modules/color-convert": {
+      "version": "2.0.1",
+      "license": "MIT",
+      "dependencies": {
+        "color-name": "~1.1.4"
+      },
+      "engines": {
+        "node": ">=7.0.0"
+      }
+    },
+    "node_modules/jest-watcher/node_modules/color-name": {
+      "version": "1.1.4",
+      "license": "MIT"
+    },
+    "node_modules/jest-watcher/node_modules/has-flag": {
+      "version": "4.0.0",
+      "license": "MIT",
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/jest-watcher/node_modules/supports-color": {
+      "version": "7.2.0",
+      "license": "MIT",
+      "dependencies": {
+        "has-flag": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/jest-when": {
+      "version": "3.5.2",
+      "license": "MIT",
+      "peerDependencies": {
+        "jest": ">= 25"
+      }
+    },
+    "node_modules/jest-worker": {
+      "version": "27.5.1",
+      "license": "MIT",
+      "dependencies": {
+        "@types/node": "*",
+        "merge-stream": "^2.0.0",
+        "supports-color": "^8.0.0"
+      },
+      "engines": {
+        "node": ">= 10.13.0"
+      }
+    },
+    "node_modules/jest-worker/node_modules/has-flag": {
+      "version": "4.0.0",
+      "license": "MIT",
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/jest-worker/node_modules/supports-color": {
+      "version": "8.1.1",
+      "license": "MIT",
+      "dependencies": {
+        "has-flag": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/supports-color?sponsor=1"
+      }
+    },
+    "node_modules/jimp-compact": {
+      "version": "0.16.1",
+      "license": "MIT"
+    },
+    "node_modules/jiti": {
+      "version": "1.20.0",
+      "dev": true,
+      "license": "MIT",
+      "bin": {
+        "jiti": "bin/jiti.js"
+      }
+    },
+    "node_modules/joi": {
+      "version": "17.13.3",
+      "license": "BSD-3-Clause",
+      "dependencies": {
+        "@hapi/hoek": "^9.3.0",
+        "@hapi/topo": "^5.1.0",
+        "@sideway/address": "^4.1.5",
+        "@sideway/formula": "^3.0.1",
+        "@sideway/pinpoint": "^2.0.0"
+      }
+    },
+    "node_modules/join-component": {
+      "version": "1.1.0",
+      "license": "MIT"
+    },
+    "node_modules/jquery": {
+      "version": "3.6.0",
+      "license": "MIT"
+    },
+    "node_modules/js-base64": {
+      "version": "3.7.5",
+      "license": "BSD-3-Clause"
+    },
+    "node_modules/js-tokens": {
+      "version": "4.0.0",
+      "license": "MIT"
+    },
+    "node_modules/js-yaml": {
+      "version": "3.14.1",
+      "license": "MIT",
+      "dependencies": {
+        "argparse": "^1.0.7",
+        "esprima": "^4.0.0"
+      },
+      "bin": {
+        "js-yaml": "bin/js-yaml.js"
+      }
+    },
+    "node_modules/jsbn": {
+      "version": "1.1.0",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/jsc-android": {
+      "version": "250231.0.0",
+      "license": "BSD-2-Clause"
+    },
+    "node_modules/jsc-safe-url": {
+      "version": "0.2.4",
+      "license": "0BSD"
+    },
+    "node_modules/jscodeshift": {
+      "version": "0.14.0",
+      "license": "MIT",
+      "dependencies": {
+        "@babel/core": "^7.13.16",
+        "@babel/parser": "^7.13.16",
+        "@babel/plugin-proposal-class-properties": "^7.13.0",
+        "@babel/plugin-proposal-nullish-coalescing-operator": "^7.13.8",
+        "@babel/plugin-proposal-optional-chaining": "^7.13.12",
+        "@babel/plugin-transform-modules-commonjs": "^7.13.8",
+        "@babel/preset-flow": "^7.13.13",
+        "@babel/preset-typescript": "^7.13.0",
+        "@babel/register": "^7.13.16",
+        "babel-core": "^7.0.0-bridge.0",
+        "chalk": "^4.1.2",
+        "flow-parser": "0.*",
+        "graceful-fs": "^4.2.4",
+        "micromatch": "^4.0.4",
+        "neo-async": "^2.5.0",
+        "node-dir": "^0.1.17",
+        "recast": "^0.21.0",
+        "temp": "^0.8.4",
+        "write-file-atomic": "^2.3.0"
+      },
+      "bin": {
+        "jscodeshift": "bin/jscodeshift.js"
+      },
+      "peerDependencies": {
+        "@babel/preset-env": "^7.1.6"
+      }
+    },
+    "node_modules/jscodeshift/node_modules/ansi-styles": {
+      "version": "4.3.0",
+      "license": "MIT",
+      "dependencies": {
+        "color-convert": "^2.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
+      }
+    },
+    "node_modules/jscodeshift/node_modules/chalk": {
+      "version": "4.1.2",
+      "license": "MIT",
+      "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/jscodeshift/node_modules/color-convert": {
+      "version": "2.0.1",
+      "license": "MIT",
+      "dependencies": {
+        "color-name": "~1.1.4"
+      },
+      "engines": {
+        "node": ">=7.0.0"
+      }
+    },
+    "node_modules/jscodeshift/node_modules/color-name": {
+      "version": "1.1.4",
+      "license": "MIT"
+    },
+    "node_modules/jscodeshift/node_modules/has-flag": {
+      "version": "4.0.0",
+      "license": "MIT",
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/jscodeshift/node_modules/supports-color": {
+      "version": "7.2.0",
+      "license": "MIT",
+      "dependencies": {
+        "has-flag": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/jsdoc-type-pratt-parser": {
+      "version": "4.0.0",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=12.0.0"
+      }
+    },
+    "node_modules/jsesc": {
+      "version": "2.5.2",
+      "license": "MIT",
+      "bin": {
+        "jsesc": "bin/jsesc"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/json-buffer": {
+      "version": "3.0.1",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/json-loader": {
+      "version": "0.5.7",
+      "license": "MIT"
+    },
+    "node_modules/json-parse-better-errors": {
+      "version": "1.0.2",
+      "license": "MIT"
+    },
+    "node_modules/json-parse-even-better-errors": {
+      "version": "2.3.1",
+      "license": "MIT"
+    },
+    "node_modules/json-schema-deref-sync": {
+      "version": "0.13.0",
+      "license": "MIT",
+      "dependencies": {
+        "clone": "^2.1.2",
+        "dag-map": "~1.0.0",
+        "is-valid-path": "^0.1.1",
+        "lodash": "^4.17.13",
+        "md5": "~2.2.0",
+        "memory-cache": "~0.2.0",
+        "traverse": "~0.6.6",
+        "valid-url": "~1.0.9"
+      },
+      "engines": {
+        "node": ">=6.0.0"
+      }
+    },
+    "node_modules/json-schema-deref-sync/node_modules/clone": {
+      "version": "2.1.2",
+      "license": "MIT",
+      "engines": {
+        "node": ">=0.8"
+      }
+    },
+    "node_modules/json-schema-deref-sync/node_modules/md5": {
+      "version": "2.2.1",
+      "license": "BSD-3-Clause",
+      "dependencies": {
+        "charenc": "~0.0.1",
+        "crypt": "~0.0.1",
+        "is-buffer": "~1.1.1"
+      }
+    },
+    "node_modules/json-schema-migrate": {
+      "version": "2.0.0",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "ajv": "^8.0.0"
+      }
+    },
+    "node_modules/json-schema-traverse": {
+      "version": "1.0.0",
+      "license": "MIT"
+    },
+    "node_modules/json-stable-stringify": {
+      "version": "1.0.2",
+      "license": "MIT",
+      "dependencies": {
+        "jsonify": "^0.0.1"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/json-stable-stringify-without-jsonify": {
+      "version": "1.0.1",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/json-stringify-pretty-compact": {
+      "version": "3.0.0",
+      "license": "MIT"
+    },
+    "node_modules/json-stringify-safe": {
+      "version": "5.0.1",
+      "license": "ISC"
+    },
+    "node_modules/json5": {
+      "version": "2.2.3",
+      "license": "MIT",
+      "bin": {
+        "json5": "lib/cli.js"
+      },
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/jsonfile": {
+      "version": "6.1.0",
+      "license": "MIT",
+      "dependencies": {
+        "universalify": "^2.0.0"
+      },
+      "optionalDependencies": {
+        "graceful-fs": "^4.1.6"
+      }
+    },
+    "node_modules/jsonify": {
+      "version": "0.0.1",
+      "license": "Public Domain",
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/jsx-ast-utils": {
+      "version": "3.3.5",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "array-includes": "^3.1.6",
+        "array.prototype.flat": "^1.3.1",
+        "object.assign": "^4.1.4",
+        "object.values": "^1.1.6"
+      },
+      "engines": {
+        "node": ">=4.0"
+      }
+    },
+    "node_modules/kdbush": {
+      "version": "4.0.2",
+      "license": "ISC"
+    },
+    "node_modules/kebab-case": {
+      "version": "1.0.2",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/keyv": {
+      "version": "4.5.2",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "json-buffer": "3.0.1"
+      }
+    },
+    "node_modules/kind-of": {
+      "version": "6.0.3",
+      "license": "MIT",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/klaw-sync": {
+      "version": "6.0.0",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "graceful-fs": "^4.1.11"
+      }
+    },
+    "node_modules/kleur": {
+      "version": "3.0.3",
+      "license": "MIT",
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/language-subtag-registry": {
+      "version": "0.3.22",
+      "dev": true,
+      "license": "CC0-1.0"
+    },
+    "node_modules/language-tags": {
+      "version": "1.0.5",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "language-subtag-registry": "~0.3.2"
+      }
+    },
+    "node_modules/launch-editor": {
+      "version": "2.6.1",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "picocolors": "^1.0.0",
+        "shell-quote": "^1.8.1"
+      }
+    },
+    "node_modules/lazy-cache": {
+      "version": "1.0.4",
+      "license": "MIT",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/lazy-universal-dotenv": {
+      "version": "4.0.0",
+      "dev": true,
+      "license": "Apache-2.0",
+      "dependencies": {
+        "app-root-dir": "^1.0.2",
+        "dotenv": "^16.0.0",
+        "dotenv-expand": "^10.0.0"
+      },
+      "engines": {
+        "node": ">=14.0.0"
+      }
+    },
+    "node_modules/lazy-universal-dotenv/node_modules/dotenv-expand": {
+      "version": "10.0.0",
+      "dev": true,
+      "license": "BSD-2-Clause",
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/lazy-val": {
+      "version": "1.0.5",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/lazystream": {
+      "version": "1.0.1",
+      "dev": true,
+      "license": "MIT",
+      "peer": true,
+      "dependencies": {
+        "readable-stream": "^2.0.5"
+      },
+      "engines": {
+        "node": ">= 0.6.3"
+      }
+    },
+    "node_modules/lcid": {
+      "version": "1.0.0",
+      "license": "MIT",
+      "dependencies": {
+        "invert-kv": "^1.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/leven": {
+      "version": "3.1.0",
+      "license": "MIT",
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/levn": {
+      "version": "0.4.1",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "prelude-ls": "^1.2.1",
+        "type-check": "~0.4.0"
+      },
+      "engines": {
+        "node": ">= 0.8.0"
+      }
+    },
+    "node_modules/lie": {
+      "version": "3.1.1",
+      "license": "MIT",
+      "dependencies": {
+        "immediate": "~3.0.5"
+      }
+    },
+    "node_modules/lighthouse-logger": {
+      "version": "1.4.2",
+      "license": "Apache-2.0",
+      "dependencies": {
+        "debug": "^2.6.9",
+        "marky": "^1.2.2"
+      }
+    },
+    "node_modules/lighthouse-logger/node_modules/debug": {
+      "version": "2.6.9",
+      "license": "MIT",
+      "dependencies": {
+        "ms": "2.0.0"
+      }
+    },
+    "node_modules/lighthouse-logger/node_modules/ms": {
+      "version": "2.0.0",
+      "license": "MIT"
+    },
+    "node_modules/lightningcss": {
+      "version": "1.19.0",
+      "license": "MPL-2.0",
+      "dependencies": {
+        "detect-libc": "^1.0.3"
+      },
+      "engines": {
+        "node": ">= 12.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/parcel"
+      },
+      "optionalDependencies": {
+        "lightningcss-darwin-arm64": "1.19.0",
+        "lightningcss-darwin-x64": "1.19.0",
+        "lightningcss-linux-arm-gnueabihf": "1.19.0",
+        "lightningcss-linux-arm64-gnu": "1.19.0",
+        "lightningcss-linux-arm64-musl": "1.19.0",
+        "lightningcss-linux-x64-gnu": "1.19.0",
+        "lightningcss-linux-x64-musl": "1.19.0",
+        "lightningcss-win32-x64-msvc": "1.19.0"
+      }
+    },
+    "node_modules/lightningcss-darwin-arm64": {
+      "version": "1.19.0",
+      "cpu": [
+        "arm64"
+      ],
+      "license": "MPL-2.0",
+      "optional": true,
+      "os": [
+        "darwin"
+      ],
+      "engines": {
+        "node": ">= 12.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/parcel"
+      }
+    },
+    "node_modules/lightningcss/node_modules/detect-libc": {
+      "version": "1.0.3",
+      "license": "Apache-2.0",
+      "bin": {
+        "detect-libc": "bin/detect-libc.js"
+      },
+      "engines": {
+        "node": ">=0.10"
+      }
+    },
+    "node_modules/lines-and-columns": {
+      "version": "1.2.4",
+      "license": "MIT"
+    },
+    "node_modules/link": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/link/-/link-2.1.1.tgz",
+      "integrity": "sha512-NV3AUVYBovJ6eVQcTeRoPnZSxzt2LOijNd+ugEZKRy/XeQlpTRhVRkuDv5kOlXwMAUx30vfUc7asRFb9RT65yg==",
+      "dev": true,
+      "bin": {
+        "link": "dist/cli.js"
+      },
+      "funding": {
+        "url": "https://github.com/privatenumber/link?sponsor=1"
+      }
+    },
+    "node_modules/load-json-file": {
+      "version": "1.1.0",
+      "license": "MIT",
+      "dependencies": {
+        "graceful-fs": "^4.1.2",
+        "parse-json": "^2.2.0",
+        "pify": "^2.0.0",
+        "pinkie-promise": "^2.0.0",
+        "strip-bom": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/load-json-file/node_modules/parse-json": {
+      "version": "2.2.0",
+      "license": "MIT",
+      "dependencies": {
+        "error-ex": "^1.2.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/load-json-file/node_modules/pify": {
+      "version": "2.3.0",
+      "license": "MIT",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/load-json-file/node_modules/strip-bom": {
+      "version": "2.0.0",
+      "license": "MIT",
+      "dependencies": {
+        "is-utf8": "^0.2.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/loader-runner": {
+      "version": "2.4.0",
+      "license": "MIT",
+      "engines": {
+        "node": ">=4.3.0 <5.0.0 || >=5.10"
+      }
+    },
+    "node_modules/loader-utils": {
+      "version": "2.0.4",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "big.js": "^5.2.2",
+        "emojis-list": "^3.0.0",
+        "json5": "^2.1.2"
+      },
+      "engines": {
+        "node": ">=8.9.0"
+      }
+    },
+    "node_modules/localforage": {
+      "version": "1.10.0",
+      "license": "Apache-2.0",
+      "dependencies": {
+        "lie": "3.1.1"
+      }
+    },
+    "node_modules/locate-path": {
+      "version": "6.0.0",
+      "license": "MIT",
+      "dependencies": {
+        "p-locate": "^5.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/lodash": {
+      "version": "4.17.21",
+      "license": "MIT"
+    },
+    "node_modules/lodash.clonedeep": {
+      "version": "4.5.0",
+      "dev": true,
+      "license": "MIT",
+      "peer": true
+    },
+    "node_modules/lodash.debounce": {
+      "version": "4.0.8",
+      "license": "MIT"
+    },
+    "node_modules/lodash.defaults": {
+      "version": "4.2.0",
+      "dev": true,
+      "license": "MIT",
+      "peer": true
+    },
+    "node_modules/lodash.difference": {
+      "version": "4.5.0",
+      "dev": true,
+      "license": "MIT",
+      "peer": true
+    },
+    "node_modules/lodash.flatten": {
+      "version": "4.4.0",
+      "dev": true,
+      "license": "MIT",
+      "peer": true
+    },
+    "node_modules/lodash.isequal": {
+      "version": "4.5.0",
+      "license": "MIT"
+    },
+    "node_modules/lodash.isplainobject": {
+      "version": "4.0.6",
+      "dev": true,
+      "license": "MIT",
+      "peer": true
+    },
+    "node_modules/lodash.memoize": {
+      "version": "4.1.2",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/lodash.merge": {
+      "version": "4.6.2",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/lodash.throttle": {
+      "version": "4.1.1",
+      "license": "MIT"
+    },
+    "node_modules/lodash.union": {
+      "version": "4.6.0",
+      "dev": true,
+      "license": "MIT",
+      "peer": true
+    },
+    "node_modules/log-symbols": {
+      "version": "4.1.0",
+      "license": "MIT",
+      "dependencies": {
+        "chalk": "^4.1.0",
+        "is-unicode-supported": "^0.1.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/log-symbols/node_modules/ansi-styles": {
+      "version": "4.3.0",
+      "license": "MIT",
+      "dependencies": {
+        "color-convert": "^2.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
+      }
+    },
+    "node_modules/log-symbols/node_modules/chalk": {
+      "version": "4.1.2",
+      "license": "MIT",
+      "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/log-symbols/node_modules/color-convert": {
+      "version": "2.0.1",
+      "license": "MIT",
+      "dependencies": {
+        "color-name": "~1.1.4"
+      },
+      "engines": {
+        "node": ">=7.0.0"
+      }
+    },
+    "node_modules/log-symbols/node_modules/color-name": {
+      "version": "1.1.4",
+      "license": "MIT"
+    },
+    "node_modules/log-symbols/node_modules/has-flag": {
+      "version": "4.0.0",
+      "license": "MIT",
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/log-symbols/node_modules/supports-color": {
+      "version": "7.2.0",
+      "license": "MIT",
+      "dependencies": {
+        "has-flag": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/logkitty": {
+      "version": "0.7.1",
+      "license": "MIT",
+      "dependencies": {
+        "ansi-fragments": "^0.2.1",
+        "dayjs": "^1.8.15",
+        "yargs": "^15.1.0"
+      },
+      "bin": {
+        "logkitty": "bin/logkitty.js"
+      }
+    },
+    "node_modules/logkitty/node_modules/ansi-styles": {
+      "version": "4.3.0",
+      "license": "MIT",
+      "dependencies": {
+        "color-convert": "^2.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
+      }
+    },
+    "node_modules/logkitty/node_modules/camelcase": {
+      "version": "5.3.1",
+      "license": "MIT",
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/logkitty/node_modules/cliui": {
+      "version": "6.0.0",
+      "license": "ISC",
+      "dependencies": {
+        "string-width": "^4.2.0",
+        "strip-ansi": "^6.0.0",
+        "wrap-ansi": "^6.2.0"
+      }
+    },
+    "node_modules/logkitty/node_modules/color-convert": {
+      "version": "2.0.1",
+      "license": "MIT",
+      "dependencies": {
+        "color-name": "~1.1.4"
+      },
+      "engines": {
+        "node": ">=7.0.0"
+      }
+    },
+    "node_modules/logkitty/node_modules/color-name": {
+      "version": "1.1.4",
+      "license": "MIT"
+    },
+    "node_modules/logkitty/node_modules/find-up": {
+      "version": "4.1.0",
+      "license": "MIT",
+      "dependencies": {
+        "locate-path": "^5.0.0",
+        "path-exists": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/logkitty/node_modules/locate-path": {
+      "version": "5.0.0",
+      "license": "MIT",
+      "dependencies": {
+        "p-locate": "^4.1.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/logkitty/node_modules/p-limit": {
+      "version": "2.3.0",
+      "license": "MIT",
+      "dependencies": {
+        "p-try": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=6"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/logkitty/node_modules/p-locate": {
+      "version": "4.1.0",
+      "license": "MIT",
+      "dependencies": {
+        "p-limit": "^2.2.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/logkitty/node_modules/path-exists": {
+      "version": "4.0.0",
+      "license": "MIT",
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/logkitty/node_modules/wrap-ansi": {
+      "version": "6.2.0",
+      "license": "MIT",
+      "dependencies": {
+        "ansi-styles": "^4.0.0",
+        "string-width": "^4.1.0",
+        "strip-ansi": "^6.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/logkitty/node_modules/yargs": {
+      "version": "15.4.1",
+      "license": "MIT",
+      "dependencies": {
+        "cliui": "^6.0.0",
+        "decamelize": "^1.2.0",
+        "find-up": "^4.1.0",
+        "get-caller-file": "^2.0.1",
+        "require-directory": "^2.1.1",
+        "require-main-filename": "^2.0.0",
+        "set-blocking": "^2.0.0",
+        "string-width": "^4.2.0",
+        "which-module": "^2.0.0",
+        "y18n": "^4.0.0",
+        "yargs-parser": "^18.1.2"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/logkitty/node_modules/yargs-parser": {
+      "version": "18.1.3",
+      "license": "ISC",
+      "dependencies": {
+        "camelcase": "^5.0.0",
+        "decamelize": "^1.2.0"
+      },
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/longest": {
+      "version": "1.0.1",
+      "license": "MIT",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/loose-envify": {
+      "version": "1.4.0",
+      "license": "MIT",
+      "dependencies": {
+        "js-tokens": "^3.0.0 || ^4.0.0"
+      },
+      "bin": {
+        "loose-envify": "cli.js"
+      }
+    },
+    "node_modules/lottie-react-native": {
+      "version": "6.5.1",
+      "license": "Apache-2.0",
+      "peerDependencies": {
+        "@dotlottie/react-player": "^1.6.1",
+        "@lottiefiles/react-lottie-player": "^3.5.3",
+        "react": "*",
+        "react-native": ">=0.46",
+        "react-native-windows": ">=0.63.x"
+      },
+      "peerDependenciesMeta": {
+        "@dotlottie/react-player": {
+          "optional": true
+        },
+        "@lottiefiles/react-lottie-player": {
+          "optional": true
+        },
+        "react-native-windows": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/lower-case": {
+      "version": "2.0.2",
+      "license": "MIT",
+      "dependencies": {
+        "tslib": "^2.0.3"
+      }
+    },
+    "node_modules/lowercase-keys": {
+      "version": "2.0.0",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/lru-cache": {
+      "version": "6.0.0",
+      "license": "ISC",
+      "dependencies": {
+        "yallist": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/luxon": {
+      "version": "3.4.4",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/magic-string": {
+      "version": "0.30.10",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@jridgewell/sourcemap-codec": "^1.4.15"
+      }
+    },
+    "node_modules/make-cancellable-promise": {
+      "version": "1.3.2",
+      "license": "MIT",
+      "funding": {
+        "url": "https://github.com/wojtekmaj/make-cancellable-promise?sponsor=1"
+      }
+    },
+    "node_modules/make-dir": {
+      "version": "2.1.0",
+      "license": "MIT",
+      "dependencies": {
+        "pify": "^4.0.1",
+        "semver": "^5.6.0"
+      },
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/make-dir/node_modules/semver": {
+      "version": "5.7.2",
+      "license": "ISC",
+      "bin": {
+        "semver": "bin/semver"
+      }
+    },
+    "node_modules/make-error": {
+      "version": "1.3.6",
+      "devOptional": true,
+      "license": "ISC"
+    },
+    "node_modules/make-event-props": {
+      "version": "1.6.1",
+      "license": "MIT",
+      "funding": {
+        "url": "https://github.com/wojtekmaj/make-event-props?sponsor=1"
+      }
+    },
+    "node_modules/make-fetch-happen": {
+      "version": "10.2.1",
+      "dev": true,
+      "license": "ISC",
+      "dependencies": {
+        "agentkeepalive": "^4.2.1",
+        "cacache": "^16.1.0",
+        "http-cache-semantics": "^4.1.0",
+        "http-proxy-agent": "^5.0.0",
+        "https-proxy-agent": "^5.0.0",
+        "is-lambda": "^1.0.1",
+        "lru-cache": "^7.7.1",
+        "minipass": "^3.1.6",
+        "minipass-collect": "^1.0.2",
+        "minipass-fetch": "^2.0.3",
+        "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": "^9.0.0"
+      },
+      "engines": {
+        "node": "^12.13.0 || ^14.15.0 || >=16.0.0"
+      }
+    },
+    "node_modules/make-fetch-happen/node_modules/@npmcli/fs": {
+      "version": "2.1.2",
+      "dev": true,
+      "license": "ISC",
+      "dependencies": {
+        "@gar/promisify": "^1.1.3",
+        "semver": "^7.3.5"
+      },
+      "engines": {
+        "node": "^12.13.0 || ^14.15.0 || >=16.0.0"
+      }
+    },
+    "node_modules/make-fetch-happen/node_modules/brace-expansion": {
+      "version": "2.0.1",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "balanced-match": "^1.0.0"
+      }
+    },
+    "node_modules/make-fetch-happen/node_modules/cacache": {
+      "version": "16.1.3",
+      "dev": true,
+      "license": "ISC",
+      "dependencies": {
+        "@npmcli/fs": "^2.1.0",
+        "@npmcli/move-file": "^2.0.0",
+        "chownr": "^2.0.0",
+        "fs-minipass": "^2.1.0",
+        "glob": "^8.0.1",
+        "infer-owner": "^1.0.4",
+        "lru-cache": "^7.7.1",
+        "minipass": "^3.1.6",
+        "minipass-collect": "^1.0.2",
+        "minipass-flush": "^1.0.5",
+        "minipass-pipeline": "^1.2.4",
+        "mkdirp": "^1.0.4",
+        "p-map": "^4.0.0",
+        "promise-inflight": "^1.0.1",
+        "rimraf": "^3.0.2",
+        "ssri": "^9.0.0",
+        "tar": "^6.1.11",
+        "unique-filename": "^2.0.0"
+      },
+      "engines": {
+        "node": "^12.13.0 || ^14.15.0 || >=16.0.0"
+      }
+    },
+    "node_modules/make-fetch-happen/node_modules/glob": {
+      "version": "8.1.0",
+      "dev": true,
+      "license": "ISC",
+      "dependencies": {
+        "fs.realpath": "^1.0.0",
+        "inflight": "^1.0.4",
+        "inherits": "2",
+        "minimatch": "^5.0.1",
+        "once": "^1.3.0"
+      },
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
+      }
+    },
+    "node_modules/make-fetch-happen/node_modules/lru-cache": {
+      "version": "7.18.3",
+      "dev": true,
+      "license": "ISC",
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/make-fetch-happen/node_modules/minimatch": {
+      "version": "5.1.6",
+      "dev": true,
+      "license": "ISC",
+      "dependencies": {
+        "brace-expansion": "^2.0.1"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/make-fetch-happen/node_modules/minipass-collect": {
+      "version": "1.0.2",
+      "dev": true,
+      "license": "ISC",
+      "dependencies": {
+        "minipass": "^3.0.0"
+      },
+      "engines": {
+        "node": ">= 8"
+      }
+    },
+    "node_modules/make-fetch-happen/node_modules/ssri": {
+      "version": "9.0.1",
+      "dev": true,
+      "license": "ISC",
+      "dependencies": {
+        "minipass": "^3.1.1"
+      },
+      "engines": {
+        "node": "^12.13.0 || ^14.15.0 || >=16.0.0"
+      }
+    },
+    "node_modules/make-fetch-happen/node_modules/unique-filename": {
+      "version": "2.0.1",
+      "dev": true,
+      "license": "ISC",
+      "dependencies": {
+        "unique-slug": "^3.0.0"
+      },
+      "engines": {
+        "node": "^12.13.0 || ^14.15.0 || >=16.0.0"
+      }
+    },
+    "node_modules/make-fetch-happen/node_modules/unique-slug": {
+      "version": "3.0.0",
+      "dev": true,
+      "license": "ISC",
+      "dependencies": {
+        "imurmurhash": "^0.1.4"
+      },
+      "engines": {
+        "node": "^12.13.0 || ^14.15.0 || >=16.0.0"
+      }
+    },
+    "node_modules/makeerror": {
+      "version": "1.0.12",
+      "license": "BSD-3-Clause",
+      "dependencies": {
+        "tmpl": "1.0.5"
+      }
+    },
+    "node_modules/map-age-cleaner": {
+      "version": "0.1.3",
+      "license": "MIT",
+      "peer": true,
+      "dependencies": {
+        "p-defer": "^1.0.0"
+      },
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/map-cache": {
+      "version": "0.2.2",
+      "license": "MIT",
+      "optional": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/map-or-similar": {
+      "version": "1.5.0",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/map-visit": {
+      "version": "1.0.0",
+      "license": "MIT",
+      "optional": true,
+      "dependencies": {
+        "object-visit": "^1.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/mapbox-gl": {
+      "version": "2.15.0",
+      "license": "SEE LICENSE IN LICENSE.txt",
+      "dependencies": {
+        "@mapbox/geojson-rewind": "^0.5.2",
+        "@mapbox/jsonlint-lines-primitives": "^2.0.2",
+        "@mapbox/mapbox-gl-supported": "^2.0.1",
+        "@mapbox/point-geometry": "^0.1.0",
+        "@mapbox/tiny-sdf": "^2.0.6",
+        "@mapbox/unitbezier": "^0.0.1",
+        "@mapbox/vector-tile": "^1.3.1",
+        "@mapbox/whoots-js": "^3.1.0",
+        "csscolorparser": "~1.0.3",
+        "earcut": "^2.2.4",
+        "geojson-vt": "^3.2.1",
+        "gl-matrix": "^3.4.3",
+        "grid-index": "^1.1.0",
+        "kdbush": "^4.0.1",
+        "murmurhash-js": "^1.0.0",
+        "pbf": "^3.2.1",
+        "potpack": "^2.0.0",
+        "quickselect": "^2.0.0",
+        "rw": "^1.3.3",
+        "supercluster": "^8.0.0",
+        "tinyqueue": "^2.0.3",
+        "vt-pbf": "^3.1.3"
+      }
+    },
+    "node_modules/markdown-table": {
+      "version": "2.0.0",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "repeat-string": "^1.0.0"
+      },
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/wooorm"
+      }
+    },
+    "node_modules/markdown-to-jsx": {
+      "version": "7.3.2",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">= 10"
+      },
+      "peerDependencies": {
+        "react": ">= 0.14.0"
+      }
+    },
+    "node_modules/marky": {
+      "version": "1.2.5",
+      "license": "Apache-2.0"
+    },
+    "node_modules/matcher": {
+      "version": "3.0.0",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "escape-string-regexp": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/mathjs": {
+      "version": "12.4.3",
+      "dev": true,
+      "license": "Apache-2.0",
+      "dependencies": {
+        "@babel/runtime": "^7.24.4",
+        "complex.js": "^2.1.1",
+        "decimal.js": "^10.4.3",
+        "escape-latex": "^1.2.0",
+        "fraction.js": "4.3.4",
+        "javascript-natural-sort": "^0.7.1",
+        "seedrandom": "^3.0.5",
+        "tiny-emitter": "^2.1.0",
+        "typed-function": "^4.1.1"
+      },
+      "bin": {
+        "mathjs": "bin/cli.js"
+      },
+      "engines": {
+        "node": ">= 18"
+      }
+    },
+    "node_modules/md5": {
+      "version": "2.3.0",
+      "license": "BSD-3-Clause",
+      "dependencies": {
+        "charenc": "0.0.2",
+        "crypt": "0.0.2",
+        "is-buffer": "~1.1.6"
+      }
+    },
+    "node_modules/md5-file": {
+      "version": "3.2.3",
+      "license": "MIT",
+      "dependencies": {
+        "buffer-alloc": "^1.1.0"
+      },
+      "bin": {
+        "md5-file": "cli.js"
+      },
+      "engines": {
+        "node": ">=0.10"
+      }
+    },
+    "node_modules/md5.js": {
+      "version": "1.3.5",
+      "license": "MIT",
+      "dependencies": {
+        "hash-base": "^3.0.0",
+        "inherits": "^2.0.1",
+        "safe-buffer": "^5.1.2"
+      }
+    },
+    "node_modules/md5hex": {
+      "version": "1.0.0",
+      "license": "MIT"
+    },
+    "node_modules/mdn-data": {
+      "version": "2.0.14",
+      "license": "CC0-1.0"
+    },
+    "node_modules/media-typer": {
+      "version": "0.3.0",
+      "license": "MIT",
+      "engines": {
+        "node": ">= 0.6"
+      }
+    },
+    "node_modules/mem": {
+      "version": "4.3.0",
+      "license": "MIT",
+      "peer": true,
+      "dependencies": {
+        "map-age-cleaner": "^0.1.1",
+        "mimic-fn": "^2.0.0",
+        "p-is-promise": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/memfs": {
+      "version": "4.6.0",
+      "dev": true,
+      "license": "Apache-2.0",
+      "dependencies": {
+        "json-joy": "^9.2.0",
+        "thingies": "^1.11.1"
+      },
+      "engines": {
+        "node": ">= 4.0.0"
+      },
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/streamich"
+      },
+      "peerDependencies": {
+        "tslib": "2"
+      }
+    },
+    "node_modules/memfs/node_modules/arg": {
+      "version": "5.0.2",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/memfs/node_modules/json-joy": {
+      "version": "9.9.1",
+      "dev": true,
+      "license": "Apache-2.0",
+      "dependencies": {
+        "arg": "^5.0.2",
+        "hyperdyperid": "^1.2.0"
+      },
+      "bin": {
+        "jj": "bin/jj.js",
+        "json-pack": "bin/json-pack.js",
+        "json-pack-test": "bin/json-pack-test.js",
+        "json-patch": "bin/json-patch.js",
+        "json-patch-test": "bin/json-patch-test.js",
+        "json-pointer": "bin/json-pointer.js",
+        "json-pointer-test": "bin/json-pointer-test.js",
+        "json-unpack": "bin/json-unpack.js"
+      },
+      "engines": {
+        "node": ">=10.0"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/streamich"
+      },
+      "peerDependencies": {
+        "quill-delta": "^5",
+        "rxjs": "7",
+        "tslib": "2"
+      }
+    },
+    "node_modules/memoize-one": {
+      "version": "5.2.1",
+      "license": "MIT"
+    },
+    "node_modules/memoizerific": {
+      "version": "1.11.3",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "map-or-similar": "^1.5.0"
+      }
+    },
+    "node_modules/memory-cache": {
+      "version": "0.2.0",
+      "license": "BSD-2-Clause"
+    },
+    "node_modules/memory-fs": {
+      "version": "0.4.1",
+      "license": "MIT",
+      "dependencies": {
+        "errno": "^0.1.3",
+        "readable-stream": "^2.0.1"
+      }
+    },
+    "node_modules/merge-descriptors": {
+      "version": "1.0.1",
+      "license": "MIT"
+    },
+    "node_modules/merge-refs": {
+      "version": "1.2.1",
+      "license": "MIT",
+      "dependencies": {
+        "@types/react": "*"
+      },
+      "funding": {
+        "url": "https://github.com/wojtekmaj/merge-refs?sponsor=1"
+      }
+    },
+    "node_modules/merge-stream": {
+      "version": "2.0.0",
+      "license": "MIT"
+    },
+    "node_modules/merge2": {
+      "version": "1.4.1",
+      "license": "MIT",
+      "engines": {
+        "node": ">= 8"
+      }
+    },
+    "node_modules/methods": {
+      "version": "1.1.2",
+      "license": "MIT",
+      "engines": {
+        "node": ">= 0.6"
+      }
+    },
+    "node_modules/metro": {
+      "version": "0.80.3",
+      "license": "MIT",
+      "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",
+        "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.18.2",
+        "image-size": "^1.0.2",
+        "invariant": "^2.2.4",
+        "jest-worker": "^29.6.3",
+        "jsc-safe-url": "^0.2.2",
+        "lodash.throttle": "^4.1.1",
+        "metro-babel-transformer": "0.80.3",
+        "metro-cache": "0.80.3",
+        "metro-cache-key": "0.80.3",
+        "metro-config": "0.80.3",
+        "metro-core": "0.80.3",
+        "metro-file-map": "0.80.3",
+        "metro-minify-terser": "0.80.3",
+        "metro-resolver": "0.80.3",
+        "metro-runtime": "0.80.3",
+        "metro-source-map": "0.80.3",
+        "metro-symbolicate": "0.80.3",
+        "metro-transform-plugins": "0.80.3",
+        "metro-transform-worker": "0.80.3",
+        "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": ">=18"
+      }
+    },
+    "node_modules/metro-babel-transformer": {
+      "version": "0.80.3",
+      "license": "MIT",
+      "dependencies": {
+        "@babel/core": "^7.20.0",
+        "hermes-parser": "0.18.2",
+        "nullthrows": "^1.1.1"
+      },
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/metro-babel-transformer/node_modules/hermes-estree": {
+      "version": "0.18.2",
+      "license": "MIT"
+    },
+    "node_modules/metro-babel-transformer/node_modules/hermes-parser": {
+      "version": "0.18.2",
+      "license": "MIT",
+      "dependencies": {
+        "hermes-estree": "0.18.2"
+      }
+    },
+    "node_modules/metro-cache": {
+      "version": "0.80.3",
+      "license": "MIT",
+      "dependencies": {
+        "metro-core": "0.80.3",
+        "rimraf": "^3.0.2"
+      },
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/metro-cache-key": {
+      "version": "0.80.3",
+      "license": "MIT",
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/metro-config": {
+      "version": "0.80.3",
+      "license": "MIT",
+      "dependencies": {
+        "connect": "^3.6.5",
+        "cosmiconfig": "^5.0.5",
+        "jest-validate": "^29.6.3",
+        "metro": "0.80.3",
+        "metro-cache": "0.80.3",
+        "metro-core": "0.80.3",
+        "metro-runtime": "0.80.3"
+      },
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/metro-config/node_modules/cosmiconfig": {
+      "version": "5.2.1",
+      "license": "MIT",
+      "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/metro-config/node_modules/import-fresh": {
+      "version": "2.0.0",
+      "license": "MIT",
+      "dependencies": {
+        "caller-path": "^2.0.0",
+        "resolve-from": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/metro-config/node_modules/parse-json": {
+      "version": "4.0.0",
+      "license": "MIT",
+      "dependencies": {
+        "error-ex": "^1.3.1",
+        "json-parse-better-errors": "^1.0.1"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/metro-config/node_modules/resolve-from": {
+      "version": "3.0.0",
+      "license": "MIT",
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/metro-core": {
+      "version": "0.80.3",
+      "license": "MIT",
+      "dependencies": {
+        "lodash.throttle": "^4.1.1",
+        "metro-resolver": "0.80.3"
+      },
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/metro-file-map": {
+      "version": "0.80.3",
+      "license": "MIT",
+      "dependencies": {
+        "anymatch": "^3.0.3",
+        "debug": "^2.2.0",
+        "fb-watchman": "^2.0.0",
+        "graceful-fs": "^4.2.4",
+        "invariant": "^2.2.4",
+        "jest-worker": "^29.6.3",
+        "micromatch": "^4.0.4",
+        "node-abort-controller": "^3.1.1",
+        "nullthrows": "^1.1.1",
+        "walker": "^1.0.7"
+      },
+      "engines": {
+        "node": ">=18"
+      },
+      "optionalDependencies": {
+        "fsevents": "^2.3.2"
+      }
+    },
+    "node_modules/metro-file-map/node_modules/debug": {
+      "version": "2.6.9",
+      "license": "MIT",
+      "dependencies": {
+        "ms": "2.0.0"
+      }
+    },
+    "node_modules/metro-file-map/node_modules/has-flag": {
+      "version": "4.0.0",
+      "license": "MIT",
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/metro-file-map/node_modules/jest-worker": {
+      "version": "29.7.0",
+      "license": "MIT",
+      "dependencies": {
+        "@types/node": "*",
+        "jest-util": "^29.7.0",
+        "merge-stream": "^2.0.0",
+        "supports-color": "^8.0.0"
+      },
+      "engines": {
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+      }
+    },
+    "node_modules/metro-file-map/node_modules/ms": {
+      "version": "2.0.0",
+      "license": "MIT"
+    },
+    "node_modules/metro-file-map/node_modules/supports-color": {
+      "version": "8.1.1",
+      "license": "MIT",
+      "dependencies": {
+        "has-flag": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/supports-color?sponsor=1"
+      }
+    },
+    "node_modules/metro-minify-terser": {
+      "version": "0.80.3",
+      "license": "MIT",
+      "dependencies": {
+        "terser": "^5.15.0"
+      },
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/metro-resolver": {
+      "version": "0.80.3",
+      "license": "MIT",
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/metro-runtime": {
+      "version": "0.80.3",
+      "license": "MIT",
+      "dependencies": {
+        "@babel/runtime": "^7.0.0"
+      },
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/metro-source-map": {
+      "version": "0.80.3",
+      "license": "MIT",
+      "dependencies": {
+        "@babel/traverse": "^7.20.0",
+        "@babel/types": "^7.20.0",
+        "invariant": "^2.2.4",
+        "metro-symbolicate": "0.80.3",
+        "nullthrows": "^1.1.1",
+        "ob1": "0.80.3",
+        "source-map": "^0.5.6",
+        "vlq": "^1.0.0"
+      },
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/metro-source-map/node_modules/source-map": {
+      "version": "0.5.7",
+      "license": "BSD-3-Clause",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/metro-symbolicate": {
+      "version": "0.80.3",
+      "license": "MIT",
+      "dependencies": {
+        "invariant": "^2.2.4",
+        "metro-source-map": "0.80.3",
+        "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": ">=18"
+      }
+    },
+    "node_modules/metro-symbolicate/node_modules/source-map": {
+      "version": "0.5.7",
+      "license": "BSD-3-Clause",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/metro-transform-plugins": {
+      "version": "0.80.3",
+      "license": "MIT",
+      "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": ">=18"
+      }
+    },
+    "node_modules/metro-transform-worker": {
+      "version": "0.80.3",
+      "license": "MIT",
+      "dependencies": {
+        "@babel/core": "^7.20.0",
+        "@babel/generator": "^7.20.0",
+        "@babel/parser": "^7.20.0",
+        "@babel/types": "^7.20.0",
+        "metro": "0.80.3",
+        "metro-babel-transformer": "0.80.3",
+        "metro-cache": "0.80.3",
+        "metro-cache-key": "0.80.3",
+        "metro-source-map": "0.80.3",
+        "metro-transform-plugins": "0.80.3",
+        "nullthrows": "^1.1.1"
+      },
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/metro/node_modules/ansi-styles": {
+      "version": "4.3.0",
+      "license": "MIT",
+      "dependencies": {
+        "color-convert": "^2.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
+      }
+    },
+    "node_modules/metro/node_modules/chalk": {
+      "version": "4.1.2",
+      "license": "MIT",
+      "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/metro/node_modules/ci-info": {
+      "version": "2.0.0",
+      "license": "MIT"
+    },
+    "node_modules/metro/node_modules/color-convert": {
+      "version": "2.0.1",
+      "license": "MIT",
+      "dependencies": {
+        "color-name": "~1.1.4"
+      },
+      "engines": {
+        "node": ">=7.0.0"
+      }
+    },
+    "node_modules/metro/node_modules/color-name": {
+      "version": "1.1.4",
+      "license": "MIT"
+    },
+    "node_modules/metro/node_modules/debug": {
+      "version": "2.6.9",
+      "license": "MIT",
+      "dependencies": {
+        "ms": "2.0.0"
+      }
+    },
+    "node_modules/metro/node_modules/has-flag": {
+      "version": "4.0.0",
+      "license": "MIT",
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/metro/node_modules/hermes-estree": {
+      "version": "0.18.2",
+      "license": "MIT"
+    },
+    "node_modules/metro/node_modules/hermes-parser": {
+      "version": "0.18.2",
+      "license": "MIT",
+      "dependencies": {
+        "hermes-estree": "0.18.2"
+      }
+    },
+    "node_modules/metro/node_modules/jest-worker": {
+      "version": "29.7.0",
+      "license": "MIT",
+      "dependencies": {
+        "@types/node": "*",
+        "jest-util": "^29.7.0",
+        "merge-stream": "^2.0.0",
+        "supports-color": "^8.0.0"
+      },
+      "engines": {
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+      }
+    },
+    "node_modules/metro/node_modules/jest-worker/node_modules/supports-color": {
+      "version": "8.1.1",
+      "license": "MIT",
+      "dependencies": {
+        "has-flag": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/supports-color?sponsor=1"
+      }
+    },
+    "node_modules/metro/node_modules/ms": {
+      "version": "2.0.0",
+      "license": "MIT"
+    },
+    "node_modules/metro/node_modules/serialize-error": {
+      "version": "2.1.0",
+      "license": "MIT",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/metro/node_modules/source-map": {
+      "version": "0.5.7",
+      "license": "BSD-3-Clause",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/metro/node_modules/supports-color": {
+      "version": "7.2.0",
+      "license": "MIT",
+      "dependencies": {
+        "has-flag": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/metro/node_modules/ws": {
+      "version": "7.5.9",
+      "license": "MIT",
+      "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/micromatch": {
+      "version": "4.0.5",
+      "license": "MIT",
+      "dependencies": {
+        "braces": "^3.0.2",
+        "picomatch": "^2.3.1"
+      },
+      "engines": {
+        "node": ">=8.6"
+      }
+    },
+    "node_modules/miller-rabin": {
+      "version": "4.0.1",
+      "license": "MIT",
+      "dependencies": {
+        "bn.js": "^4.0.0",
+        "brorand": "^1.0.1"
+      },
+      "bin": {
+        "miller-rabin": "bin/miller-rabin"
+      }
+    },
+    "node_modules/miller-rabin/node_modules/bn.js": {
+      "version": "4.12.0",
+      "license": "MIT"
+    },
+    "node_modules/mime": {
+      "version": "2.6.0",
+      "license": "MIT",
+      "bin": {
+        "mime": "cli.js"
+      },
+      "engines": {
+        "node": ">=4.0.0"
+      }
+    },
+    "node_modules/mime-db": {
+      "version": "1.52.0",
+      "license": "MIT",
+      "engines": {
+        "node": ">= 0.6"
+      }
+    },
+    "node_modules/mime-types": {
+      "version": "2.1.35",
+      "license": "MIT",
+      "dependencies": {
+        "mime-db": "1.52.0"
+      },
+      "engines": {
+        "node": ">= 0.6"
+      }
+    },
+    "node_modules/mimic-fn": {
+      "version": "2.1.0",
+      "license": "MIT",
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/mimic-response": {
+      "version": "1.0.1",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/min-indent": {
+      "version": "1.0.1",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/minimalistic-assert": {
+      "version": "1.0.1",
+      "license": "ISC"
+    },
+    "node_modules/minimalistic-crypto-utils": {
+      "version": "1.0.1",
+      "license": "MIT"
+    },
+    "node_modules/minimatch": {
+      "version": "3.1.2",
+      "license": "ISC",
+      "dependencies": {
+        "brace-expansion": "^1.1.7"
+      },
+      "engines": {
+        "node": "*"
+      }
+    },
+    "node_modules/minimist": {
+      "version": "1.2.8",
+      "license": "MIT",
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/minipass": {
+      "version": "3.3.6",
+      "license": "ISC",
+      "dependencies": {
+        "yallist": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/minipass-collect": {
+      "version": "2.0.1",
+      "license": "ISC",
+      "dependencies": {
+        "minipass": "^7.0.3"
+      },
+      "engines": {
+        "node": ">=16 || 14 >=14.17"
+      }
+    },
+    "node_modules/minipass-collect/node_modules/minipass": {
+      "version": "7.1.2",
+      "license": "ISC",
+      "engines": {
+        "node": ">=16 || 14 >=14.17"
+      }
+    },
+    "node_modules/minipass-fetch": {
+      "version": "2.1.2",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "minipass": "^3.1.6",
+        "minipass-sized": "^1.0.3",
+        "minizlib": "^2.1.2"
+      },
+      "engines": {
+        "node": "^12.13.0 || ^14.15.0 || >=16.0.0"
+      },
+      "optionalDependencies": {
+        "encoding": "^0.1.13"
+      }
+    },
+    "node_modules/minipass-flush": {
+      "version": "1.0.5",
+      "license": "ISC",
+      "dependencies": {
+        "minipass": "^3.0.0"
+      },
+      "engines": {
+        "node": ">= 8"
+      }
+    },
+    "node_modules/minipass-pipeline": {
+      "version": "1.2.4",
+      "license": "ISC",
+      "dependencies": {
+        "minipass": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/minipass-sized": {
+      "version": "1.0.3",
+      "dev": true,
+      "license": "ISC",
+      "dependencies": {
+        "minipass": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/minizlib": {
+      "version": "2.1.2",
+      "license": "MIT",
+      "dependencies": {
+        "minipass": "^3.0.0",
+        "yallist": "^4.0.0"
+      },
+      "engines": {
+        "node": ">= 8"
+      }
+    },
+    "node_modules/mixin-deep": {
+      "version": "1.3.2",
+      "license": "MIT",
+      "optional": true,
+      "dependencies": {
+        "for-in": "^1.0.2",
+        "is-extendable": "^1.0.1"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/mixin-object": {
+      "version": "2.0.1",
+      "license": "MIT",
+      "dependencies": {
+        "for-in": "^0.1.3",
+        "is-extendable": "^0.1.1"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/mixin-object/node_modules/for-in": {
+      "version": "0.1.8",
+      "license": "MIT",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/mixin-object/node_modules/is-extendable": {
+      "version": "0.1.1",
+      "license": "MIT",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/mkdirp": {
+      "version": "1.0.4",
+      "license": "MIT",
+      "bin": {
+        "mkdirp": "bin/cmd.js"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/mkdirp-classic": {
+      "version": "0.5.3",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/module-details-from-path": {
+      "version": "1.0.3",
+      "license": "MIT",
+      "peer": true
+    },
+    "node_modules/mrmime": {
+      "version": "1.0.1",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/ms": {
+      "version": "2.1.2",
+      "license": "MIT"
+    },
+    "node_modules/multicast-dns": {
+      "version": "7.2.5",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "dns-packet": "^5.2.2",
+        "thunky": "^1.0.2"
+      },
+      "bin": {
+        "multicast-dns": "cli.js"
+      }
+    },
+    "node_modules/murmurhash-js": {
+      "version": "1.0.0",
+      "license": "MIT"
+    },
+    "node_modules/mustache": {
+      "version": "4.2.0",
+      "license": "MIT",
+      "peer": true,
+      "bin": {
+        "mustache": "bin/mustache"
+      }
+    },
+    "node_modules/mv": {
+      "version": "2.1.1",
+      "license": "MIT",
+      "optional": true,
+      "dependencies": {
+        "mkdirp": "~0.5.1",
+        "ncp": "~2.0.0",
+        "rimraf": "~2.4.0"
+      },
+      "engines": {
+        "node": ">=0.8.0"
+      }
+    },
+    "node_modules/mv/node_modules/glob": {
+      "version": "6.0.4",
+      "license": "ISC",
+      "optional": true,
+      "dependencies": {
+        "inflight": "^1.0.4",
+        "inherits": "2",
+        "minimatch": "2 || 3",
+        "once": "^1.3.0",
+        "path-is-absolute": "^1.0.0"
+      },
+      "engines": {
+        "node": "*"
+      }
+    },
+    "node_modules/mv/node_modules/mkdirp": {
+      "version": "0.5.6",
+      "license": "MIT",
+      "optional": true,
+      "dependencies": {
+        "minimist": "^1.2.6"
+      },
+      "bin": {
+        "mkdirp": "bin/cmd.js"
+      }
+    },
+    "node_modules/mv/node_modules/rimraf": {
+      "version": "2.4.5",
+      "license": "ISC",
+      "optional": true,
+      "dependencies": {
+        "glob": "^6.0.1"
+      },
+      "bin": {
+        "rimraf": "bin.js"
+      }
+    },
+    "node_modules/mz": {
+      "version": "2.7.0",
+      "license": "MIT",
+      "dependencies": {
+        "any-promise": "^1.0.0",
+        "object-assign": "^4.0.1",
+        "thenify-all": "^1.0.0"
+      }
+    },
+    "node_modules/nan": {
+      "version": "2.17.0",
+      "license": "MIT",
+      "optional": true
+    },
+    "node_modules/nanoid": {
+      "version": "3.3.7",
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/ai"
+        }
+      ],
+      "license": "MIT",
+      "bin": {
+        "nanoid": "bin/nanoid.cjs"
+      },
+      "engines": {
+        "node": "^10 || ^12 || ^13.7 || ^14 || >=15.0.1"
+      }
+    },
+    "node_modules/nanomatch": {
+      "version": "1.2.13",
+      "license": "MIT",
+      "optional": true,
+      "dependencies": {
+        "arr-diff": "^4.0.0",
+        "array-unique": "^0.3.2",
+        "define-property": "^2.0.2",
+        "extend-shallow": "^3.0.2",
+        "fragment-cache": "^0.2.1",
+        "is-windows": "^1.0.2",
+        "kind-of": "^6.0.2",
+        "object.pick": "^1.3.0",
+        "regex-not": "^1.0.0",
+        "snapdragon": "^0.8.1",
+        "to-regex": "^3.0.1"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/natural-compare": {
+      "version": "1.4.0",
+      "license": "MIT"
+    },
+    "node_modules/natural-compare-lite": {
+      "version": "1.4.0",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/ncp": {
+      "version": "2.0.0",
+      "license": "MIT",
+      "optional": true,
+      "bin": {
+        "ncp": "bin/ncp"
+      }
+    },
+    "node_modules/negotiator": {
+      "version": "0.6.3",
+      "license": "MIT",
+      "engines": {
+        "node": ">= 0.6"
+      }
+    },
+    "node_modules/neo-async": {
+      "version": "2.6.2",
+      "license": "MIT"
+    },
+    "node_modules/nested-error-stacks": {
+      "version": "2.0.1",
+      "license": "MIT"
+    },
+    "node_modules/nice-try": {
+      "version": "1.0.5",
+      "license": "MIT"
+    },
+    "node_modules/no-case": {
+      "version": "3.0.4",
+      "license": "MIT",
+      "dependencies": {
+        "lower-case": "^2.0.2",
+        "tslib": "^2.0.3"
+      }
+    },
+    "node_modules/nocache": {
+      "version": "3.0.4",
+      "license": "MIT",
+      "engines": {
+        "node": ">=12.0.0"
+      }
+    },
+    "node_modules/nock": {
+      "version": "13.3.3",
+      "license": "MIT",
+      "dependencies": {
+        "debug": "^4.1.0",
+        "json-stringify-safe": "^5.0.1",
+        "lodash": "^4.17.21",
+        "propagate": "^2.0.0"
+      },
+      "engines": {
+        "node": ">= 10.13"
+      }
+    },
+    "node_modules/node-abi": {
+      "version": "3.65.0",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "semver": "^7.3.5"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/node-abort-controller": {
+      "version": "3.1.1",
+      "license": "MIT"
+    },
+    "node_modules/node-addon-api": {
+      "version": "1.7.2",
+      "dev": true,
+      "license": "MIT",
+      "optional": true
+    },
+    "node_modules/node-api-version": {
+      "version": "0.2.0",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "semver": "^7.3.5"
+      }
+    },
+    "node_modules/node-dir": {
+      "version": "0.1.17",
+      "license": "MIT",
+      "dependencies": {
+        "minimatch": "^3.0.2"
+      },
+      "engines": {
+        "node": ">= 0.10.5"
+      }
+    },
+    "node_modules/node-domexception": {
+      "version": "1.0.0",
+      "dev": true,
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/jimmywarting"
+        },
+        {
+          "type": "github",
+          "url": "https://paypal.me/jimmywarting"
+        }
+      ],
+      "license": "MIT",
+      "engines": {
+        "node": ">=10.5.0"
+      }
+    },
+    "node_modules/node-fetch": {
+      "version": "2.6.7",
+      "license": "MIT",
+      "dependencies": {
+        "whatwg-url": "^5.0.0"
+      },
+      "engines": {
+        "node": "4.x || >=6.0.0"
+      },
+      "peerDependencies": {
+        "encoding": "^0.1.0"
+      },
+      "peerDependenciesMeta": {
+        "encoding": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/node-fetch-native": {
+      "version": "1.6.4",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/node-fetch/node_modules/tr46": {
+      "version": "0.0.3",
+      "license": "MIT"
+    },
+    "node_modules/node-fetch/node_modules/webidl-conversions": {
+      "version": "3.0.1",
+      "license": "BSD-2-Clause"
+    },
+    "node_modules/node-fetch/node_modules/whatwg-url": {
+      "version": "5.0.0",
+      "license": "MIT",
+      "dependencies": {
+        "tr46": "~0.0.3",
+        "webidl-conversions": "^3.0.0"
+      }
+    },
+    "node_modules/node-forge": {
+      "version": "1.3.1",
+      "license": "(BSD-3-Clause OR GPL-2.0)",
+      "engines": {
+        "node": ">= 6.13.0"
+      }
+    },
+    "node_modules/node-gyp": {
+      "version": "9.4.1",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "env-paths": "^2.2.0",
+        "exponential-backoff": "^3.1.1",
+        "glob": "^7.1.4",
+        "graceful-fs": "^4.2.6",
+        "make-fetch-happen": "^10.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",
+      "dev": true,
+      "license": "ISC",
+      "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",
+      "dev": true,
+      "license": "ISC",
+      "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",
+      "dev": true,
+      "license": "ISC",
+      "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",
+      "dev": true,
+      "license": "MIT",
+      "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"
+    },
+    "node_modules/node-libs-browser": {
+      "version": "2.2.1",
+      "license": "MIT",
+      "dependencies": {
+        "assert": "^1.1.1",
+        "browserify-zlib": "^0.2.0",
+        "buffer": "^4.3.0",
+        "console-browserify": "^1.1.0",
+        "constants-browserify": "^1.0.0",
+        "crypto-browserify": "^3.11.0",
+        "domain-browser": "^1.1.1",
+        "events": "^3.0.0",
+        "https-browserify": "^1.0.0",
+        "os-browserify": "^0.3.0",
+        "path-browserify": "0.0.1",
+        "process": "^0.11.10",
+        "punycode": "^1.2.4",
+        "querystring-es3": "^0.2.0",
+        "readable-stream": "^2.3.3",
+        "stream-browserify": "^2.0.1",
+        "stream-http": "^2.7.2",
+        "string_decoder": "^1.0.0",
+        "timers-browserify": "^2.0.4",
+        "tty-browserify": "0.0.0",
+        "url": "^0.11.0",
+        "util": "^0.11.0",
+        "vm-browserify": "^1.0.1"
+      }
+    },
+    "node_modules/node-libs-browser/node_modules/buffer": {
+      "version": "4.9.2",
+      "license": "MIT",
+      "dependencies": {
+        "base64-js": "^1.0.2",
+        "ieee754": "^1.1.4",
+        "isarray": "^1.0.0"
+      }
+    },
+    "node_modules/node-libs-browser/node_modules/isarray": {
+      "version": "1.0.0",
+      "license": "MIT"
+    },
+    "node_modules/node-libs-browser/node_modules/punycode": {
+      "version": "1.4.1",
+      "license": "MIT"
+    },
+    "node_modules/node-releases": {
+      "version": "2.0.14",
+      "license": "MIT"
+    },
+    "node_modules/node-stream-zip": {
+      "version": "1.15.0",
+      "license": "MIT",
+      "engines": {
+        "node": ">=0.12.0"
+      },
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/antelle"
+      }
+    },
+    "node_modules/nopt": {
+      "version": "6.0.0",
+      "dev": true,
+      "license": "ISC",
+      "dependencies": {
+        "abbrev": "^1.0.0"
+      },
+      "bin": {
+        "nopt": "bin/nopt.js"
+      },
+      "engines": {
+        "node": "^12.13.0 || ^14.15.0 || >=16.0.0"
+      }
+    },
+    "node_modules/normalize-package-data": {
+      "version": "2.5.0",
+      "license": "BSD-2-Clause",
+      "dependencies": {
+        "hosted-git-info": "^2.1.4",
+        "resolve": "^1.10.0",
+        "semver": "2 || 3 || 4 || 5",
+        "validate-npm-package-license": "^3.0.1"
+      }
+    },
+    "node_modules/normalize-package-data/node_modules/hosted-git-info": {
+      "version": "2.8.9",
+      "license": "ISC"
+    },
+    "node_modules/normalize-package-data/node_modules/semver": {
+      "version": "5.7.2",
+      "license": "ISC",
+      "bin": {
+        "semver": "bin/semver"
+      }
+    },
+    "node_modules/normalize-path": {
+      "version": "3.0.0",
+      "license": "MIT",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/normalize-url": {
+      "version": "6.1.0",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/npm-normalize-package-bin": {
+      "version": "3.0.1",
+      "license": "ISC",
+      "engines": {
+        "node": "^14.17.0 || ^16.13.0 || >=18.0.0"
+      }
+    },
+    "node_modules/npm-package-arg": {
+      "version": "7.0.0",
+      "license": "ISC",
+      "dependencies": {
+        "hosted-git-info": "^3.0.2",
+        "osenv": "^0.1.5",
+        "semver": "^5.6.0",
+        "validate-npm-package-name": "^3.0.0"
+      }
+    },
+    "node_modules/npm-package-arg/node_modules/hosted-git-info": {
+      "version": "3.0.8",
+      "license": "ISC",
+      "dependencies": {
+        "lru-cache": "^6.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/npm-package-arg/node_modules/semver": {
+      "version": "5.7.2",
+      "license": "ISC",
+      "bin": {
+        "semver": "bin/semver"
+      }
+    },
+    "node_modules/npm-run-path": {
+      "version": "4.0.1",
+      "license": "MIT",
+      "dependencies": {
+        "path-key": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/npmlog": {
+      "version": "5.0.1",
+      "license": "ISC",
+      "optional": true,
+      "dependencies": {
+        "are-we-there-yet": "^2.0.0",
+        "console-control-strings": "^1.1.0",
+        "gauge": "^3.0.0",
+        "set-blocking": "^2.0.0"
+      }
+    },
+    "node_modules/nth-check": {
+      "version": "2.1.1",
+      "license": "BSD-2-Clause",
+      "dependencies": {
+        "boolbase": "^1.0.0"
+      },
+      "funding": {
+        "url": "https://github.com/fb55/nth-check?sponsor=1"
+      }
+    },
+    "node_modules/nullthrows": {
+      "version": "1.1.1",
+      "license": "MIT"
+    },
+    "node_modules/number-is-nan": {
+      "version": "1.0.1",
+      "license": "MIT",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/nwsapi": {
+      "version": "2.2.7",
+      "license": "MIT"
+    },
+    "node_modules/nypm": {
+      "version": "0.3.8",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "citty": "^0.1.6",
+        "consola": "^3.2.3",
+        "execa": "^8.0.1",
+        "pathe": "^1.1.2",
+        "ufo": "^1.4.0"
+      },
+      "bin": {
+        "nypm": "dist/cli.mjs"
+      },
+      "engines": {
+        "node": "^14.16.0 || >=16.10.0"
+      }
+    },
+    "node_modules/nypm/node_modules/execa": {
+      "version": "8.0.1",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "cross-spawn": "^7.0.3",
+        "get-stream": "^8.0.1",
+        "human-signals": "^5.0.0",
+        "is-stream": "^3.0.0",
+        "merge-stream": "^2.0.0",
+        "npm-run-path": "^5.1.0",
+        "onetime": "^6.0.0",
+        "signal-exit": "^4.1.0",
+        "strip-final-newline": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=16.17"
+      },
+      "funding": {
+        "url": "https://github.com/sindresorhus/execa?sponsor=1"
+      }
+    },
+    "node_modules/nypm/node_modules/get-stream": {
+      "version": "8.0.1",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=16"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/nypm/node_modules/human-signals": {
+      "version": "5.0.0",
+      "dev": true,
+      "license": "Apache-2.0",
+      "engines": {
+        "node": ">=16.17.0"
+      }
+    },
+    "node_modules/nypm/node_modules/is-stream": {
+      "version": "3.0.0",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": "^12.20.0 || ^14.13.1 || >=16.0.0"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/nypm/node_modules/mimic-fn": {
+      "version": "4.0.0",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/nypm/node_modules/npm-run-path": {
+      "version": "5.3.0",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "path-key": "^4.0.0"
+      },
+      "engines": {
+        "node": "^12.20.0 || ^14.13.1 || >=16.0.0"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/nypm/node_modules/onetime": {
+      "version": "6.0.0",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "mimic-fn": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/nypm/node_modules/path-key": {
+      "version": "4.0.0",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/nypm/node_modules/signal-exit": {
+      "version": "4.1.0",
+      "dev": true,
+      "license": "ISC",
+      "engines": {
+        "node": ">=14"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
+      }
+    },
+    "node_modules/nypm/node_modules/strip-final-newline": {
+      "version": "3.0.0",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/ob1": {
+      "version": "0.80.3",
+      "license": "MIT",
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/object-assign": {
+      "version": "4.1.1",
+      "license": "MIT",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/object-copy": {
+      "version": "0.1.0",
+      "license": "MIT",
+      "optional": true,
+      "dependencies": {
+        "copy-descriptor": "^0.1.0",
+        "define-property": "^0.2.5",
+        "kind-of": "^3.0.3"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/object-copy/node_modules/define-property": {
+      "version": "0.2.5",
+      "license": "MIT",
+      "optional": true,
+      "dependencies": {
+        "is-descriptor": "^0.1.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/object-copy/node_modules/is-accessor-descriptor": {
+      "version": "0.1.6",
+      "license": "MIT",
+      "optional": true,
+      "dependencies": {
+        "kind-of": "^3.0.2"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/object-copy/node_modules/is-data-descriptor": {
+      "version": "0.1.4",
+      "license": "MIT",
+      "optional": true,
+      "dependencies": {
+        "kind-of": "^3.0.2"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/object-copy/node_modules/is-descriptor": {
+      "version": "0.1.6",
+      "license": "MIT",
+      "optional": true,
+      "dependencies": {
+        "is-accessor-descriptor": "^0.1.6",
+        "is-data-descriptor": "^0.1.4",
+        "kind-of": "^5.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/object-copy/node_modules/is-descriptor/node_modules/kind-of": {
+      "version": "5.1.0",
+      "license": "MIT",
+      "optional": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/object-copy/node_modules/kind-of": {
+      "version": "3.2.2",
+      "license": "MIT",
+      "optional": true,
+      "dependencies": {
+        "is-buffer": "^1.1.5"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/object-inspect": {
+      "version": "1.13.1",
+      "license": "MIT",
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/object-is": {
+      "version": "1.1.5",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "call-bind": "^1.0.2",
+        "define-properties": "^1.1.3"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/object-keys": {
+      "version": "1.1.1",
+      "license": "MIT",
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
+    "node_modules/object-visit": {
+      "version": "1.0.1",
+      "license": "MIT",
+      "optional": true,
+      "dependencies": {
+        "isobject": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/object.assign": {
+      "version": "4.1.4",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "call-bind": "^1.0.2",
+        "define-properties": "^1.1.4",
+        "has-symbols": "^1.0.3",
+        "object-keys": "^1.1.1"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/object.entries": {
+      "version": "1.1.6",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "call-bind": "^1.0.2",
+        "define-properties": "^1.1.4",
+        "es-abstract": "^1.20.4"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
+    "node_modules/object.fromentries": {
+      "version": "2.0.7",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "call-bind": "^1.0.2",
+        "define-properties": "^1.2.0",
+        "es-abstract": "^1.22.1"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/object.groupby": {
+      "version": "1.0.1",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "call-bind": "^1.0.2",
+        "define-properties": "^1.2.0",
+        "es-abstract": "^1.22.1",
+        "get-intrinsic": "^1.2.1"
+      }
+    },
+    "node_modules/object.hasown": {
+      "version": "1.1.2",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "define-properties": "^1.1.4",
+        "es-abstract": "^1.20.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/object.pick": {
+      "version": "1.3.0",
+      "license": "MIT",
+      "optional": true,
+      "dependencies": {
+        "isobject": "^3.0.1"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/object.values": {
+      "version": "1.1.7",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "call-bind": "^1.0.2",
+        "define-properties": "^1.2.0",
+        "es-abstract": "^1.22.1"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/objectorarray": {
+      "version": "1.0.5",
+      "dev": true,
+      "license": "ISC"
+    },
+    "node_modules/obuf": {
+      "version": "1.1.2",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/ohash": {
+      "version": "1.1.3",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/on-finished": {
+      "version": "2.4.1",
+      "license": "MIT",
+      "dependencies": {
+        "ee-first": "1.1.1"
+      },
+      "engines": {
+        "node": ">= 0.8"
+      }
+    },
+    "node_modules/on-headers": {
+      "version": "1.0.2",
+      "license": "MIT",
+      "engines": {
+        "node": ">= 0.8"
+      }
+    },
+    "node_modules/once": {
+      "version": "1.4.0",
+      "license": "ISC",
+      "dependencies": {
+        "wrappy": "1"
+      }
+    },
+    "node_modules/onchange": {
+      "version": "7.1.0",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@blakeembrey/deque": "^1.0.5",
+        "@blakeembrey/template": "^1.0.0",
+        "arg": "^4.1.3",
+        "chokidar": "^3.3.1",
+        "cross-spawn": "^7.0.1",
+        "ignore": "^5.1.4",
+        "tree-kill": "^1.2.2"
+      },
+      "bin": {
+        "onchange": "dist/bin.js"
+      }
+    },
+    "node_modules/onetime": {
+      "version": "5.1.2",
+      "license": "MIT",
+      "dependencies": {
+        "mimic-fn": "^2.1.0"
+      },
+      "engines": {
+        "node": ">=6"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/onfido-sdk-ui": {
+      "version": "14.15.0",
+      "license": "SEE LICENSE in LICENSE"
+    },
+    "node_modules/open": {
+      "version": "8.4.2",
+      "license": "MIT",
+      "dependencies": {
+        "define-lazy-prop": "^2.0.0",
+        "is-docker": "^2.1.1",
+        "is-wsl": "^2.2.0"
+      },
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/openai": {
+      "version": "4.47.2",
+      "dev": true,
+      "license": "Apache-2.0",
+      "dependencies": {
+        "@types/node": "^18.11.18",
+        "@types/node-fetch": "^2.6.4",
+        "abort-controller": "^3.0.0",
+        "agentkeepalive": "^4.2.1",
+        "form-data-encoder": "1.7.2",
+        "formdata-node": "^4.3.2",
+        "node-fetch": "^2.6.7",
+        "web-streams-polyfill": "^3.2.1"
+      },
+      "bin": {
+        "openai": "bin/cli"
+      }
+    },
+    "node_modules/openai/node_modules/@types/node": {
+      "version": "18.19.31",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "undici-types": "~5.26.4"
+      }
+    },
+    "node_modules/opencollective-postinstall": {
+      "version": "2.0.3",
+      "license": "MIT",
+      "bin": {
+        "opencollective-postinstall": "index.js"
+      }
+    },
+    "node_modules/opener": {
+      "version": "1.5.2",
+      "dev": true,
+      "license": "(WTFPL OR MIT)",
+      "bin": {
+        "opener": "bin/opener-bin.js"
+      }
+    },
+    "node_modules/optionator": {
+      "version": "0.9.4",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "deep-is": "^0.1.3",
+        "fast-levenshtein": "^2.0.6",
+        "levn": "^0.4.1",
+        "prelude-ls": "^1.2.1",
+        "type-check": "^0.4.0",
+        "word-wrap": "^1.2.5"
+      },
+      "engines": {
+        "node": ">= 0.8.0"
+      }
+    },
+    "node_modules/ora": {
+      "version": "5.4.1",
+      "license": "MIT",
+      "dependencies": {
+        "bl": "^4.1.0",
+        "chalk": "^4.1.0",
+        "cli-cursor": "^3.1.0",
+        "cli-spinners": "^2.5.0",
+        "is-interactive": "^1.0.0",
+        "is-unicode-supported": "^0.1.0",
+        "log-symbols": "^4.1.0",
+        "strip-ansi": "^6.0.0",
+        "wcwidth": "^1.0.1"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/ora/node_modules/ansi-styles": {
+      "version": "4.3.0",
+      "license": "MIT",
+      "dependencies": {
+        "color-convert": "^2.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
+      }
+    },
+    "node_modules/ora/node_modules/chalk": {
+      "version": "4.1.2",
+      "license": "MIT",
+      "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/ora/node_modules/color-convert": {
+      "version": "2.0.1",
+      "license": "MIT",
+      "dependencies": {
+        "color-name": "~1.1.4"
+      },
+      "engines": {
+        "node": ">=7.0.0"
+      }
+    },
+    "node_modules/ora/node_modules/color-name": {
+      "version": "1.1.4",
+      "license": "MIT"
+    },
+    "node_modules/ora/node_modules/has-flag": {
+      "version": "4.0.0",
+      "license": "MIT",
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/ora/node_modules/supports-color": {
+      "version": "7.2.0",
+      "license": "MIT",
+      "dependencies": {
+        "has-flag": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/os-browserify": {
+      "version": "0.3.0",
+      "license": "MIT"
+    },
+    "node_modules/os-homedir": {
+      "version": "1.0.2",
+      "license": "MIT",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/os-locale": {
+      "version": "1.4.0",
+      "license": "MIT",
+      "dependencies": {
+        "lcid": "^1.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/os-tmpdir": {
+      "version": "1.0.2",
+      "license": "MIT",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/osenv": {
+      "version": "0.1.5",
+      "license": "ISC",
+      "dependencies": {
+        "os-homedir": "^1.0.0",
+        "os-tmpdir": "^1.0.0"
+      }
+    },
+    "node_modules/p-cancelable": {
+      "version": "2.1.1",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/p-defer": {
+      "version": "1.0.0",
+      "license": "MIT",
+      "peer": true,
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/p-finally": {
+      "version": "1.0.0",
+      "license": "MIT",
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/p-is-promise": {
+      "version": "2.1.0",
+      "license": "MIT",
+      "peer": true,
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/p-limit": {
+      "version": "3.1.0",
+      "license": "MIT",
+      "dependencies": {
+        "yocto-queue": "^0.1.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/p-locate": {
+      "version": "5.0.0",
+      "license": "MIT",
+      "dependencies": {
+        "p-limit": "^3.0.2"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/p-map": {
+      "version": "4.0.0",
+      "license": "MIT",
+      "dependencies": {
+        "aggregate-error": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/p-retry": {
+      "version": "6.2.0",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@types/retry": "0.12.2",
+        "is-network-error": "^1.0.0",
+        "retry": "^0.13.1"
+      },
+      "engines": {
+        "node": ">=16.17"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/p-try": {
+      "version": "2.2.0",
+      "license": "MIT",
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/package-json-from-dist": {
+      "version": "1.0.0",
+      "license": "BlueOak-1.0.0"
+    },
+    "node_modules/pako": {
+      "version": "1.0.11",
+      "license": "(MIT AND Zlib)"
+    },
+    "node_modules/param-case": {
+      "version": "3.0.4",
+      "license": "MIT",
+      "dependencies": {
+        "dot-case": "^3.0.4",
+        "tslib": "^2.0.3"
+      }
+    },
+    "node_modules/parent-module": {
+      "version": "1.0.1",
+      "license": "MIT",
+      "dependencies": {
+        "callsites": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/parse-asn1": {
+      "version": "5.1.6",
+      "license": "ISC",
+      "dependencies": {
+        "asn1.js": "^5.2.0",
+        "browserify-aes": "^1.0.0",
+        "evp_bytestokey": "^1.0.0",
+        "pbkdf2": "^3.0.3",
+        "safe-buffer": "^5.1.1"
+      }
+    },
+    "node_modules/parse-json": {
+      "version": "5.2.0",
+      "license": "MIT",
+      "dependencies": {
+        "@babel/code-frame": "^7.0.0",
+        "error-ex": "^1.3.1",
+        "json-parse-even-better-errors": "^2.3.0",
+        "lines-and-columns": "^1.1.6"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/parse-png": {
+      "version": "2.1.0",
+      "license": "MIT",
+      "dependencies": {
+        "pngjs": "^3.3.0"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/parse-png/node_modules/pngjs": {
+      "version": "3.4.0",
+      "license": "MIT",
+      "engines": {
+        "node": ">=4.0.0"
+      }
+    },
+    "node_modules/parseurl": {
+      "version": "1.3.3",
+      "license": "MIT",
+      "engines": {
+        "node": ">= 0.8"
+      }
+    },
+    "node_modules/pascal-case": {
+      "version": "3.1.2",
+      "license": "MIT",
+      "dependencies": {
+        "no-case": "^3.0.4",
+        "tslib": "^2.0.3"
+      }
+    },
+    "node_modules/pascalcase": {
+      "version": "0.1.1",
+      "license": "MIT",
+      "optional": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/password-prompt": {
+      "version": "1.1.3",
+      "license": "0BSD",
+      "dependencies": {
+        "ansi-escapes": "^4.3.2",
+        "cross-spawn": "^7.0.3"
+      }
+    },
+    "node_modules/patch-package": {
+      "version": "8.0.0",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@yarnpkg/lockfile": "^1.1.0",
+        "chalk": "^4.1.2",
+        "ci-info": "^3.7.0",
+        "cross-spawn": "^7.0.3",
+        "find-yarn-workspace-root": "^2.0.0",
+        "fs-extra": "^9.0.0",
+        "json-stable-stringify": "^1.0.2",
+        "klaw-sync": "^6.0.0",
+        "minimist": "^1.2.6",
+        "open": "^7.4.2",
+        "rimraf": "^2.6.3",
+        "semver": "^7.5.3",
+        "slash": "^2.0.0",
+        "tmp": "^0.0.33",
+        "yaml": "^2.2.2"
+      },
+      "bin": {
+        "patch-package": "index.js"
+      },
+      "engines": {
+        "node": ">=14",
+        "npm": ">5"
+      }
+    },
+    "node_modules/patch-package/node_modules/ansi-styles": {
+      "version": "4.3.0",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "color-convert": "^2.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
+      }
+    },
+    "node_modules/patch-package/node_modules/chalk": {
+      "version": "4.1.2",
+      "dev": true,
+      "license": "MIT",
+      "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/patch-package/node_modules/color-convert": {
+      "version": "2.0.1",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "color-name": "~1.1.4"
+      },
+      "engines": {
+        "node": ">=7.0.0"
+      }
+    },
+    "node_modules/patch-package/node_modules/color-name": {
+      "version": "1.1.4",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/patch-package/node_modules/has-flag": {
+      "version": "4.0.0",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/patch-package/node_modules/open": {
+      "version": "7.4.2",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "is-docker": "^2.0.0",
+        "is-wsl": "^2.1.1"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/patch-package/node_modules/rimraf": {
+      "version": "2.7.1",
+      "dev": true,
+      "license": "ISC",
+      "dependencies": {
+        "glob": "^7.1.3"
+      },
+      "bin": {
+        "rimraf": "bin.js"
+      }
+    },
+    "node_modules/patch-package/node_modules/slash": {
+      "version": "2.0.0",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/patch-package/node_modules/supports-color": {
+      "version": "7.2.0",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "has-flag": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/patch-package/node_modules/tmp": {
+      "version": "0.0.33",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "os-tmpdir": "~1.0.2"
+      },
+      "engines": {
+        "node": ">=0.6.0"
+      }
+    },
+    "node_modules/path-browserify": {
+      "version": "0.0.1",
+      "license": "MIT"
+    },
+    "node_modules/path-dirname": {
+      "version": "1.0.2",
+      "license": "MIT",
+      "optional": true
+    },
+    "node_modules/path-exists": {
+      "version": "3.0.0",
+      "license": "MIT",
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/path-is-absolute": {
+      "version": "1.0.1",
+      "license": "MIT",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/path-is-inside": {
+      "version": "1.0.2",
+      "dev": true,
+      "license": "(WTFPL OR MIT)"
+    },
+    "node_modules/path-key": {
+      "version": "3.1.1",
+      "license": "MIT",
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/path-parse": {
+      "version": "1.0.7",
+      "license": "MIT"
+    },
+    "node_modules/path-scurry": {
+      "version": "1.11.1",
+      "license": "BlueOak-1.0.0",
+      "dependencies": {
+        "lru-cache": "^10.2.0",
+        "minipass": "^5.0.0 || ^6.0.2 || ^7.0.0"
+      },
+      "engines": {
+        "node": ">=16 || 14 >=14.18"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
+      }
+    },
+    "node_modules/path-scurry/node_modules/lru-cache": {
+      "version": "10.2.0",
+      "license": "ISC",
+      "engines": {
+        "node": "14 || >=16.14"
+      }
+    },
+    "node_modules/path-scurry/node_modules/minipass": {
+      "version": "7.0.3",
+      "license": "ISC",
+      "engines": {
+        "node": ">=16 || 14 >=14.17"
+      }
+    },
+    "node_modules/path-to-regexp": {
+      "version": "0.1.7",
+      "license": "MIT"
+    },
+    "node_modules/path-type": {
+      "version": "4.0.0",
+      "license": "MIT",
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/path2d-polyfill": {
+      "version": "2.0.1",
+      "license": "MIT",
+      "optional": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/pathe": {
+      "version": "1.1.2",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/pbf": {
+      "version": "3.2.1",
+      "license": "BSD-3-Clause",
+      "dependencies": {
+        "ieee754": "^1.1.12",
+        "resolve-protobuf-schema": "^2.1.0"
+      },
+      "bin": {
+        "pbf": "bin/pbf"
+      }
+    },
+    "node_modules/pbkdf2": {
+      "version": "3.1.2",
+      "license": "MIT",
+      "dependencies": {
+        "create-hash": "^1.1.2",
+        "create-hmac": "^1.1.4",
+        "ripemd160": "^2.0.1",
+        "safe-buffer": "^5.0.1",
+        "sha.js": "^2.4.8"
+      },
+      "engines": {
+        "node": ">=0.12"
+      }
+    },
+    "node_modules/pdfjs-dist": {
+      "version": "3.11.174",
+      "license": "Apache-2.0",
+      "engines": {
+        "node": ">=18"
+      },
+      "optionalDependencies": {
+        "canvas": "^2.11.2",
+        "path2d-polyfill": "^2.0.1"
+      }
+    },
+    "node_modules/pe-library": {
+      "version": "0.4.0",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=12",
+        "npm": ">=6"
+      }
+    },
+    "node_modules/peek-stream": {
+      "version": "1.1.3",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "buffer-from": "^1.0.0",
+        "duplexify": "^3.5.0",
+        "through2": "^2.0.3"
+      }
+    },
+    "node_modules/peggy": {
+      "version": "4.0.3",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@peggyjs/from-mem": "1.3.0",
+        "commander": "^12.1.0",
+        "source-map-generator": "0.8.0"
+      },
+      "bin": {
+        "peggy": "bin/peggy.js"
+      },
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/peggy/node_modules/commander": {
+      "version": "12.1.0",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/pend": {
+      "version": "1.2.0",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/picocolors": {
+      "version": "1.0.0",
+      "license": "ISC"
+    },
+    "node_modules/picomatch": {
+      "version": "2.3.1",
+      "license": "MIT",
+      "engines": {
+        "node": ">=8.6"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/jonschlinkert"
+      }
+    },
+    "node_modules/pify": {
+      "version": "4.0.1",
+      "license": "MIT",
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/pinkie": {
+      "version": "2.0.4",
+      "license": "MIT",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/pinkie-promise": {
+      "version": "2.0.1",
+      "license": "MIT",
+      "dependencies": {
+        "pinkie": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/pirates": {
+      "version": "4.0.6",
+      "license": "MIT",
+      "engines": {
+        "node": ">= 6"
+      }
+    },
+    "node_modules/pkg-dir": {
+      "version": "5.0.0",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "find-up": "^5.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/pkg-up": {
+      "version": "3.1.0",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "find-up": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/pkg-up/node_modules/find-up": {
+      "version": "3.0.0",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "locate-path": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/pkg-up/node_modules/locate-path": {
+      "version": "3.0.0",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "p-locate": "^3.0.0",
+        "path-exists": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/pkg-up/node_modules/p-limit": {
+      "version": "2.3.0",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "p-try": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=6"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/pkg-up/node_modules/p-locate": {
+      "version": "3.0.0",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "p-limit": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/plist": {
+      "version": "3.1.0",
+      "license": "MIT",
+      "dependencies": {
+        "@xmldom/xmldom": "^0.8.8",
+        "base64-js": "^1.5.1",
+        "xmlbuilder": "^15.1.1"
+      },
+      "engines": {
+        "node": ">=10.4.0"
+      }
+    },
+    "node_modules/plist/node_modules/@xmldom/xmldom": {
+      "version": "0.8.10",
+      "license": "MIT",
+      "engines": {
+        "node": ">=10.0.0"
+      }
+    },
+    "node_modules/plist/node_modules/xmlbuilder": {
+      "version": "15.1.1",
+      "license": "MIT",
+      "engines": {
+        "node": ">=8.0"
+      }
+    },
+    "node_modules/pngjs": {
+      "version": "5.0.0",
+      "license": "MIT",
+      "engines": {
+        "node": ">=10.13.0"
+      }
+    },
+    "node_modules/polished": {
+      "version": "4.3.1",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@babel/runtime": "^7.17.8"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/portfinder": {
+      "version": "1.0.32",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "async": "^2.6.4",
+        "debug": "^3.2.7",
+        "mkdirp": "^0.5.6"
+      },
+      "engines": {
+        "node": ">= 0.12.0"
+      }
+    },
+    "node_modules/portfinder/node_modules/async": {
+      "version": "2.6.4",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "lodash": "^4.17.14"
+      }
+    },
+    "node_modules/portfinder/node_modules/debug": {
+      "version": "3.2.7",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "ms": "^2.1.1"
+      }
+    },
+    "node_modules/portfinder/node_modules/mkdirp": {
+      "version": "0.5.6",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "minimist": "^1.2.6"
+      },
+      "bin": {
+        "mkdirp": "bin/cmd.js"
+      }
+    },
+    "node_modules/posix-character-classes": {
+      "version": "0.1.1",
+      "license": "MIT",
+      "optional": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/possible-typed-array-names": {
+      "version": "1.0.0",
+      "license": "MIT",
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
+    "node_modules/postcss": {
+      "version": "8.4.38",
+      "funding": [
+        {
+          "type": "opencollective",
+          "url": "https://opencollective.com/postcss/"
+        },
+        {
+          "type": "tidelift",
+          "url": "https://tidelift.com/funding/github/npm/postcss"
+        },
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/ai"
+        }
+      ],
+      "license": "MIT",
+      "dependencies": {
+        "nanoid": "^3.3.7",
+        "picocolors": "^1.0.0",
+        "source-map-js": "^1.2.0"
+      },
+      "engines": {
+        "node": "^10 || ^12 || >=14"
+      }
+    },
+    "node_modules/postcss-selector-parser": {
+      "version": "6.0.10",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "cssesc": "^3.0.0",
+        "util-deprecate": "^1.0.2"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/postcss-value-parser": {
+      "version": "4.2.0",
+      "license": "MIT"
+    },
+    "node_modules/potpack": {
+      "version": "2.0.0",
+      "license": "ISC"
+    },
+    "node_modules/prelude-ls": {
+      "version": "1.2.1",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">= 0.8.0"
+      }
+    },
+    "node_modules/prettier": {
+      "version": "2.8.8",
+      "dev": true,
+      "license": "MIT",
+      "bin": {
+        "prettier": "bin-prettier.js"
+      },
+      "engines": {
+        "node": ">=10.13.0"
+      },
+      "funding": {
+        "url": "https://github.com/prettier/prettier?sponsor=1"
+      }
+    },
+    "node_modules/prettier-fallback": {
+      "name": "prettier",
+      "version": "3.3.2",
+      "dev": true,
+      "license": "MIT",
+      "bin": {
+        "prettier": "bin/prettier.cjs"
+      },
+      "engines": {
+        "node": ">=14"
+      },
+      "funding": {
+        "url": "https://github.com/prettier/prettier?sponsor=1"
+      }
+    },
+    "node_modules/prettier-linter-helpers": {
+      "version": "1.0.0",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "fast-diff": "^1.1.2"
+      },
+      "engines": {
+        "node": ">=6.0.0"
+      }
+    },
+    "node_modules/pretty-bytes": {
+      "version": "5.6.0",
+      "license": "MIT",
+      "engines": {
+        "node": ">=6"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/pretty-error": {
+      "version": "4.0.0",
+      "license": "MIT",
+      "dependencies": {
+        "lodash": "^4.17.20",
+        "renderkid": "^3.0.0"
+      }
+    },
+    "node_modules/pretty-format": {
+      "version": "29.7.0",
+      "license": "MIT",
+      "dependencies": {
+        "@jest/schemas": "^29.6.3",
+        "ansi-styles": "^5.0.0",
+        "react-is": "^18.0.0"
+      },
+      "engines": {
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+      }
+    },
+    "node_modules/pretty-format/node_modules/ansi-styles": {
+      "version": "5.2.0",
+      "license": "MIT",
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
+      }
+    },
+    "node_modules/pretty-hrtime": {
+      "version": "1.0.3",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">= 0.8"
+      }
+    },
+    "node_modules/process": {
+      "version": "0.11.10",
+      "license": "MIT",
+      "engines": {
+        "node": ">= 0.6.0"
+      }
+    },
+    "node_modules/process-nextick-args": {
+      "version": "2.0.1",
+      "license": "MIT"
+    },
+    "node_modules/progress": {
+      "version": "2.0.3",
+      "license": "MIT",
+      "engines": {
+        "node": ">=0.4.0"
+      }
+    },
+    "node_modules/promise": {
+      "version": "7.3.1",
+      "license": "MIT",
+      "dependencies": {
+        "asap": "~2.0.3"
+      }
+    },
+    "node_modules/promise-inflight": {
+      "version": "1.0.1",
+      "dev": true,
+      "license": "ISC"
+    },
+    "node_modules/promise-retry": {
+      "version": "2.0.1",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "err-code": "^2.0.2",
+        "retry": "^0.12.0"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/promise-retry/node_modules/retry": {
+      "version": "0.12.0",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">= 4"
+      }
+    },
+    "node_modules/prompts": {
+      "version": "2.4.2",
+      "license": "MIT",
+      "dependencies": {
+        "kleur": "^3.0.3",
+        "sisteransi": "^1.0.5"
+      },
+      "engines": {
+        "node": ">= 6"
+      }
+    },
+    "node_modules/prop-types": {
+      "version": "15.8.1",
+      "license": "MIT",
+      "dependencies": {
+        "loose-envify": "^1.4.0",
+        "object-assign": "^4.1.1",
+        "react-is": "^16.13.1"
+      }
+    },
+    "node_modules/prop-types/node_modules/react-is": {
+      "version": "16.13.1",
+      "license": "MIT"
+    },
+    "node_modules/propagate": {
+      "version": "2.0.1",
+      "license": "MIT",
+      "engines": {
+        "node": ">= 8"
+      }
+    },
+    "node_modules/protocol-buffers-schema": {
+      "version": "3.6.0",
+      "license": "MIT"
+    },
+    "node_modules/proxy-addr": {
+      "version": "2.0.7",
+      "license": "MIT",
+      "dependencies": {
+        "forwarded": "0.2.0",
+        "ipaddr.js": "1.9.1"
+      },
+      "engines": {
+        "node": ">= 0.10"
+      }
+    },
+    "node_modules/prr": {
+      "version": "1.0.1",
+      "license": "MIT"
+    },
+    "node_modules/psl": {
+      "version": "1.9.0",
+      "license": "MIT"
+    },
+    "node_modules/public-encrypt": {
+      "version": "4.0.3",
+      "license": "MIT",
+      "dependencies": {
+        "bn.js": "^4.1.0",
+        "browserify-rsa": "^4.0.0",
+        "create-hash": "^1.1.0",
+        "parse-asn1": "^5.0.0",
+        "randombytes": "^2.0.1",
+        "safe-buffer": "^5.1.2"
+      }
+    },
+    "node_modules/public-encrypt/node_modules/bn.js": {
+      "version": "4.12.0",
+      "license": "MIT"
+    },
+    "node_modules/pump": {
+      "version": "3.0.0",
+      "license": "MIT",
+      "dependencies": {
+        "end-of-stream": "^1.1.0",
+        "once": "^1.3.1"
+      }
+    },
+    "node_modules/pumpify": {
+      "version": "1.5.1",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "duplexify": "^3.6.0",
+        "inherits": "^2.0.3",
+        "pump": "^2.0.0"
+      }
+    },
+    "node_modules/pumpify/node_modules/pump": {
+      "version": "2.0.1",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "end-of-stream": "^1.1.0",
+        "once": "^1.3.1"
+      }
+    },
+    "node_modules/punycode": {
+      "version": "2.3.1",
+      "license": "MIT",
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/pure-rand": {
+      "version": "6.0.4",
+      "funding": [
+        {
+          "type": "individual",
+          "url": "https://github.com/sponsors/dubzzz"
+        },
+        {
+          "type": "opencollective",
+          "url": "https://opencollective.com/fast-check"
+        }
+      ],
+      "license": "MIT"
+    },
+    "node_modules/pusher-js": {
+      "version": "8.3.0",
+      "license": "MIT",
+      "dependencies": {
+        "tweetnacl": "^1.0.3"
+      }
+    },
+    "node_modules/pusher-js-mock": {
+      "version": "0.3.8",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=4.2.4"
+      }
+    },
+    "node_modules/qrcode": {
+      "version": "1.5.3",
+      "license": "MIT",
+      "dependencies": {
+        "dijkstrajs": "^1.0.1",
+        "encode-utf8": "^1.0.3",
+        "pngjs": "^5.0.0",
+        "yargs": "^15.3.1"
+      },
+      "bin": {
+        "qrcode": "bin/qrcode"
+      },
+      "engines": {
+        "node": ">=10.13.0"
+      }
+    },
+    "node_modules/qrcode-terminal": {
+      "version": "0.11.0",
+      "bin": {
+        "qrcode-terminal": "bin/qrcode-terminal.js"
+      }
+    },
+    "node_modules/qrcode/node_modules/ansi-styles": {
+      "version": "4.3.0",
+      "license": "MIT",
+      "dependencies": {
+        "color-convert": "^2.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
+      }
+    },
+    "node_modules/qrcode/node_modules/camelcase": {
+      "version": "5.3.1",
+      "license": "MIT",
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/qrcode/node_modules/cliui": {
+      "version": "6.0.0",
+      "license": "ISC",
+      "dependencies": {
+        "string-width": "^4.2.0",
+        "strip-ansi": "^6.0.0",
+        "wrap-ansi": "^6.2.0"
+      }
+    },
+    "node_modules/qrcode/node_modules/color-convert": {
+      "version": "2.0.1",
+      "license": "MIT",
+      "dependencies": {
+        "color-name": "~1.1.4"
+      },
+      "engines": {
+        "node": ">=7.0.0"
+      }
+    },
+    "node_modules/qrcode/node_modules/color-name": {
+      "version": "1.1.4",
+      "license": "MIT"
+    },
+    "node_modules/qrcode/node_modules/find-up": {
+      "version": "4.1.0",
+      "license": "MIT",
+      "dependencies": {
+        "locate-path": "^5.0.0",
+        "path-exists": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/qrcode/node_modules/locate-path": {
+      "version": "5.0.0",
+      "license": "MIT",
+      "dependencies": {
+        "p-locate": "^4.1.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/qrcode/node_modules/p-limit": {
+      "version": "2.3.0",
+      "license": "MIT",
+      "dependencies": {
+        "p-try": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=6"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/qrcode/node_modules/p-locate": {
+      "version": "4.1.0",
+      "license": "MIT",
+      "dependencies": {
+        "p-limit": "^2.2.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/qrcode/node_modules/path-exists": {
+      "version": "4.0.0",
+      "license": "MIT",
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/qrcode/node_modules/wrap-ansi": {
+      "version": "6.2.0",
+      "license": "MIT",
+      "dependencies": {
+        "ansi-styles": "^4.0.0",
+        "string-width": "^4.1.0",
+        "strip-ansi": "^6.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/qrcode/node_modules/yargs": {
+      "version": "15.4.1",
+      "license": "MIT",
+      "dependencies": {
+        "cliui": "^6.0.0",
+        "decamelize": "^1.2.0",
+        "find-up": "^4.1.0",
+        "get-caller-file": "^2.0.1",
+        "require-directory": "^2.1.1",
+        "require-main-filename": "^2.0.0",
+        "set-blocking": "^2.0.0",
+        "string-width": "^4.2.0",
+        "which-module": "^2.0.0",
+        "y18n": "^4.0.0",
+        "yargs-parser": "^18.1.2"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/qrcode/node_modules/yargs-parser": {
+      "version": "18.1.3",
+      "license": "ISC",
+      "dependencies": {
+        "camelcase": "^5.0.0",
+        "decamelize": "^1.2.0"
+      },
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/qs": {
+      "version": "6.10.3",
+      "license": "BSD-3-Clause",
+      "dependencies": {
+        "side-channel": "^1.0.4"
+      },
+      "engines": {
+        "node": ">=0.6"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/query-string": {
+      "version": "7.1.3",
+      "license": "MIT",
+      "dependencies": {
+        "decode-uri-component": "^0.2.2",
+        "filter-obj": "^1.1.0",
+        "split-on-first": "^1.0.0",
+        "strict-uri-encode": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=6"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/querystring": {
+      "version": "0.2.0",
+      "engines": {
+        "node": ">=0.4.x"
+      }
+    },
+    "node_modules/querystring-es3": {
+      "version": "0.2.1",
+      "engines": {
+        "node": ">=0.4.x"
+      }
+    },
+    "node_modules/querystringify": {
+      "version": "2.2.0",
+      "license": "MIT"
+    },
+    "node_modules/queue": {
+      "version": "6.0.2",
+      "license": "MIT",
+      "dependencies": {
+        "inherits": "~2.0.3"
+      }
+    },
+    "node_modules/queue-microtask": {
+      "version": "1.2.3",
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/feross"
+        },
+        {
+          "type": "patreon",
+          "url": "https://www.patreon.com/feross"
+        },
+        {
+          "type": "consulting",
+          "url": "https://feross.org/support"
+        }
+      ],
+      "license": "MIT"
+    },
+    "node_modules/quick-lru": {
+      "version": "5.1.1",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/quickselect": {
+      "version": "2.0.0",
+      "license": "ISC"
+    },
+    "node_modules/quill-delta": {
+      "version": "5.1.0",
+      "dev": true,
+      "license": "MIT",
+      "peer": true,
+      "dependencies": {
+        "fast-diff": "^1.3.0",
+        "lodash.clonedeep": "^4.5.0",
+        "lodash.isequal": "^4.5.0"
+      },
+      "engines": {
+        "node": ">= 12.0.0"
+      }
+    },
+    "node_modules/raf-schd": {
+      "version": "4.0.3",
+      "license": "MIT"
+    },
+    "node_modules/ramda": {
+      "version": "0.29.0",
+      "dev": true,
+      "license": "MIT",
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/ramda"
+      }
+    },
+    "node_modules/randombytes": {
+      "version": "2.1.0",
+      "license": "MIT",
+      "dependencies": {
+        "safe-buffer": "^5.1.0"
+      }
+    },
+    "node_modules/randomfill": {
+      "version": "1.0.4",
+      "license": "MIT",
+      "dependencies": {
+        "randombytes": "^2.0.5",
+        "safe-buffer": "^5.1.0"
+      }
+    },
+    "node_modules/range-parser": {
+      "version": "1.2.1",
+      "license": "MIT",
+      "engines": {
+        "node": ">= 0.6"
+      }
+    },
+    "node_modules/raw-body": {
+      "version": "2.5.1",
+      "license": "MIT",
+      "dependencies": {
+        "bytes": "3.1.2",
+        "http-errors": "2.0.0",
+        "iconv-lite": "0.4.24",
+        "unpipe": "1.0.0"
+      },
+      "engines": {
+        "node": ">= 0.8"
+      }
+    },
+    "node_modules/raw-body/node_modules/bytes": {
+      "version": "3.1.2",
+      "license": "MIT",
+      "engines": {
+        "node": ">= 0.8"
+      }
+    },
+    "node_modules/raw-body/node_modules/iconv-lite": {
+      "version": "0.4.24",
+      "license": "MIT",
+      "dependencies": {
+        "safer-buffer": ">= 2.1.2 < 3"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/rbush": {
+      "version": "3.0.1",
+      "license": "MIT",
+      "dependencies": {
+        "quickselect": "^2.0.0"
+      }
+    },
+    "node_modules/rc": {
+      "version": "1.2.8",
+      "license": "(BSD-2-Clause OR MIT OR Apache-2.0)",
+      "dependencies": {
+        "deep-extend": "^0.6.0",
+        "ini": "~1.3.0",
+        "minimist": "^1.2.0",
+        "strip-json-comments": "~2.0.1"
+      },
+      "bin": {
+        "rc": "cli.js"
+      }
+    },
+    "node_modules/rc/node_modules/strip-json-comments": {
+      "version": "2.0.1",
+      "license": "MIT",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/react": {
+      "version": "18.3.1",
+      "license": "MIT",
+      "dependencies": {
+        "loose-envify": "^1.1.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/react-beautiful-dnd": {
+      "version": "13.1.1",
+      "license": "Apache-2.0",
+      "dependencies": {
+        "@babel/runtime": "^7.9.2",
+        "css-box-model": "^1.2.0",
+        "memoize-one": "^5.1.1",
+        "raf-schd": "^4.0.2",
+        "react-redux": "^7.2.0",
+        "redux": "^4.0.4",
+        "use-memo-one": "^1.1.1"
+      },
+      "peerDependencies": {
+        "react": "^16.8.5 || ^17.0.0 || ^18.0.0",
+        "react-dom": "^16.8.5 || ^17.0.0 || ^18.0.0"
+      }
+    },
+    "node_modules/react-collapse": {
+      "version": "5.1.1",
+      "license": "MIT",
+      "peerDependencies": {
+        "react": ">=16.3.0"
+      }
+    },
+    "node_modules/react-colorful": {
+      "version": "5.6.1",
+      "dev": true,
+      "license": "MIT",
+      "peerDependencies": {
+        "react": ">=16.8.0",
+        "react-dom": ">=16.8.0"
+      }
+    },
+    "node_modules/react-compiler-healthcheck": {
+      "version": "0.0.0-experimental-b130d5f-20240625",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@babel/core": "^7.24.4",
+        "@babel/parser": "^7.24.4",
+        "chalk": "4",
+        "fast-glob": "^3.3.2",
+        "ora": "5.4.1",
+        "yargs": "^17.7.2",
+        "zod": "^3.22.4",
+        "zod-validation-error": "^3.0.3"
+      },
+      "bin": {
+        "react-compiler-healthcheck": "dist/index.js"
+      },
+      "engines": {
+        "node": "^14.17.0 || ^16.0.0 || >= 18.0.0"
+      }
+    },
+    "node_modules/react-compiler-healthcheck/node_modules/ansi-styles": {
+      "version": "4.3.0",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "color-convert": "^2.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
+      }
+    },
+    "node_modules/react-compiler-healthcheck/node_modules/chalk": {
+      "version": "4.1.2",
+      "dev": true,
+      "license": "MIT",
+      "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/react-compiler-healthcheck/node_modules/color-convert": {
+      "version": "2.0.1",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "color-name": "~1.1.4"
+      },
+      "engines": {
+        "node": ">=7.0.0"
+      }
+    },
+    "node_modules/react-compiler-healthcheck/node_modules/color-name": {
+      "version": "1.1.4",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/react-compiler-healthcheck/node_modules/has-flag": {
+      "version": "4.0.0",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/react-compiler-healthcheck/node_modules/supports-color": {
+      "version": "7.2.0",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "has-flag": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/react-compiler-runtime": {
+      "resolved": "lib/react-compiler-runtime",
+      "link": true
+    },
+    "node_modules/react-content-loader": {
+      "version": "7.0.0",
+      "license": "MIT",
+      "engines": {
+        "node": ">=10"
+      },
+      "peerDependencies": {
+        "react": ">=16.0.0"
+      }
+    },
+    "node_modules/react-docgen": {
+      "version": "7.0.3",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@babel/core": "^7.18.9",
+        "@babel/traverse": "^7.18.9",
+        "@babel/types": "^7.18.9",
+        "@types/babel__core": "^7.18.0",
+        "@types/babel__traverse": "^7.18.0",
+        "@types/doctrine": "^0.0.9",
+        "@types/resolve": "^1.20.2",
+        "doctrine": "^3.0.0",
+        "resolve": "^1.22.1",
+        "strip-indent": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=16.14.0"
+      }
+    },
+    "node_modules/react-docgen-typescript": {
+      "version": "2.2.2",
+      "dev": true,
+      "license": "MIT",
+      "peerDependencies": {
+        "typescript": ">= 4.3.x"
+      }
+    },
+    "node_modules/react-docgen/node_modules/@types/doctrine": {
+      "version": "0.0.9",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/react-docgen/node_modules/strip-indent": {
+      "version": "4.0.0",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "min-indent": "^1.0.1"
+      },
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/react-dom": {
+      "version": "18.3.1",
+      "license": "MIT",
+      "dependencies": {
+        "loose-envify": "^1.1.0",
+        "scheduler": "^0.23.2"
+      },
+      "peerDependencies": {
+        "react": "^18.3.1"
+      }
+    },
+    "node_modules/react-dom/node_modules/scheduler": {
+      "version": "0.23.2",
+      "license": "MIT",
+      "dependencies": {
+        "loose-envify": "^1.1.0"
+      }
+    },
+    "node_modules/react-element-to-jsx-string": {
+      "version": "15.0.0",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@base2/pretty-print-object": "1.0.1",
+        "is-plain-object": "5.0.0",
+        "react-is": "18.1.0"
+      },
+      "peerDependencies": {
+        "react": "^0.14.8 || ^15.0.1 || ^16.0.0 || ^17.0.1 || ^18.0.0",
+        "react-dom": "^0.14.8 || ^15.0.1 || ^16.0.0 || ^17.0.1 || ^18.0.0"
+      }
+    },
+    "node_modules/react-element-to-jsx-string/node_modules/react-is": {
+      "version": "18.1.0",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/react-error-boundary": {
+      "version": "4.0.11",
+      "license": "MIT",
+      "dependencies": {
+        "@babel/runtime": "^7.12.5"
+      },
+      "peerDependencies": {
+        "react": ">=16.13.1"
+      }
+    },
+    "node_modules/react-fast-pdf": {
+      "version": "1.0.14",
+      "license": "MIT",
+      "dependencies": {
+        "react-pdf": "^7.7.0",
+        "react-window": "^1.8.10"
+      },
+      "engines": {
+        "node": ">=20.10.0",
+        "npm": ">=10.2.3"
+      },
+      "peerDependencies": {
+        "lodash": "4.x",
+        "prop-types": "15.x",
+        "react": "18.x",
+        "react-dom": "18.x"
+      }
+    },
+    "node_modules/react-freeze": {
+      "version": "1.0.3",
+      "license": "MIT",
+      "engines": {
+        "node": ">=10"
+      },
+      "peerDependencies": {
+        "react": ">=17.0.0"
+      }
+    },
+    "node_modules/react-is": {
+      "version": "18.3.1",
+      "license": "MIT"
+    },
+    "node_modules/react-map-gl": {
+      "version": "7.1.3",
+      "license": "MIT",
+      "dependencies": {
+        "@maplibre/maplibre-gl-style-spec": "^19.2.1",
+        "@types/mapbox-gl": ">=1.0.0"
+      },
+      "peerDependencies": {
+        "mapbox-gl": ">=1.13.0",
+        "maplibre-gl": ">=1.13.0",
+        "react": ">=16.3.0",
+        "react-dom": ">=16.3.0"
+      },
+      "peerDependenciesMeta": {
+        "mapbox-gl": {
+          "optional": true
+        },
+        "maplibre-gl": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/react-native": {
+      "version": "0.75.2",
+      "resolved": "https://registry.npmjs.org/react-native/-/react-native-0.75.2.tgz",
+      "integrity": "sha512-pP+Yswd/EurzAlKizytRrid9LJaPJzuNldc+o5t01md2VLHym8V7FWH2z9omFKtFTer8ERg0fAhG1fpd0Qq6bQ==",
+      "dependencies": {
+        "@jest/create-cache-key-function": "^29.6.3",
+        "@react-native-community/cli": "14.0.0",
+        "@react-native-community/cli-platform-android": "14.0.0",
+        "@react-native-community/cli-platform-ios": "14.0.0",
+        "@react-native/assets-registry": "0.75.2",
+        "@react-native/codegen": "0.75.2",
+        "@react-native/community-cli-plugin": "0.75.2",
+        "@react-native/gradle-plugin": "0.75.2",
+        "@react-native/js-polyfills": "0.75.2",
+        "@react-native/normalize-colors": "0.75.2",
+        "@react-native/virtualized-lists": "0.75.2",
+        "abort-controller": "^3.0.0",
+        "anser": "^1.4.9",
+        "ansi-regex": "^5.0.0",
+        "base64-js": "^1.5.1",
+        "chalk": "^4.0.0",
+        "event-target-shim": "^5.0.1",
+        "flow-enums-runtime": "^0.0.6",
+        "glob": "^7.1.1",
+        "invariant": "^2.2.4",
+        "jest-environment-node": "^29.6.3",
+        "jsc-android": "^250231.0.0",
+        "memoize-one": "^5.0.0",
+        "metro-runtime": "^0.80.3",
+        "metro-source-map": "^0.80.3",
+        "mkdirp": "^0.5.1",
+        "nullthrows": "^1.1.1",
+        "pretty-format": "^26.5.2",
+        "promise": "^8.3.0",
+        "react-devtools-core": "^5.3.1",
+        "react-refresh": "^0.14.0",
+        "regenerator-runtime": "^0.13.2",
+        "scheduler": "0.24.0-canary-efb381bbf-20230505",
+        "semver": "^7.1.3",
+        "stacktrace-parser": "^0.1.10",
+        "whatwg-fetch": "^3.0.0",
+        "ws": "^6.2.2",
+        "yargs": "^17.6.2"
+      },
+      "bin": {
+        "react-native": "cli.js"
+      },
+      "engines": {
+        "node": ">=18"
+      },
+      "peerDependencies": {
+        "@types/react": "^18.2.6",
+        "react": "^18.2.0"
+      },
+      "peerDependenciesMeta": {
+        "@types/react": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/react-native-android-location-enabler": {
+      "version": "2.0.1",
+      "license": "MIT",
+      "engines": {
+        "node": ">= 16.0.0"
+      },
+      "peerDependencies": {
+        "react": ">= 18.2.0",
+        "react-native": ">= 0.71.0"
+      }
+    },
+    "node_modules/react-native-animatable": {
+      "version": "1.3.3",
+      "license": "MIT",
+      "dependencies": {
+        "prop-types": "^15.7.2"
+      }
+    },
+    "node_modules/react-native-blob-util": {
+      "version": "0.19.4",
+      "license": "MIT",
+      "dependencies": {
+        "base-64": "0.1.0",
+        "glob": "^7.2.3"
+      },
+      "peerDependencies": {
+        "react": "*",
+        "react-native": "*"
+      }
+    },
+    "node_modules/react-native-blob-util/node_modules/glob": {
+      "version": "7.2.3",
+      "license": "ISC",
+      "dependencies": {
+        "fs.realpath": "^1.0.0",
+        "inflight": "^1.0.4",
+        "inherits": "2",
+        "minimatch": "^3.1.1",
+        "once": "^1.3.0",
+        "path-is-absolute": "^1.0.0"
+      },
+      "engines": {
+        "node": "*"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
+      }
+    },
+    "node_modules/react-native-clean-project": {
+      "version": "4.0.1",
+      "dev": true,
+      "license": "MIT",
+      "bin": {
+        "react-native-clean-project": "source/index.js"
+      },
+      "engines": {
+        "node": ">=10.0.0"
+      }
+    },
+    "node_modules/react-native-collapsible": {
+      "version": "1.6.2",
+      "resolved": "https://registry.npmjs.org/react-native-collapsible/-/react-native-collapsible-1.6.2.tgz",
+      "integrity": "sha512-MCOBVJWqHNjnDaGkvxX997VONmJeebh6wyJxnHEgg0L1PrlcXU1e/bo6eK+CDVFuMrCafw8Qh4DOv/C4V/+Iew==",
+      "peerDependencies": {
+        "react": "*",
+        "react-native": "*"
+      }
+    },
+    "node_modules/react-native-config": {
+      "version": "1.5.0",
+      "license": "MIT",
+      "peerDependencies": {
+        "react": "*",
+        "react-native": "*",
+        "react-native-windows": ">=0.61"
+      },
+      "peerDependenciesMeta": {
+        "react-native-windows": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/react-native-device-info": {
+      "version": "10.3.1",
+      "license": "MIT",
+      "peerDependencies": {
+        "react-native": "*"
+      }
+    },
+    "node_modules/react-native-document-picker": {
+      "version": "9.1.1",
+      "license": "MIT",
+      "dependencies": {
+        "invariant": "^2.2.4"
+      },
+      "peerDependencies": {
+        "react": "*",
+        "react-native": "*",
+        "react-native-windows": "*"
+      },
+      "peerDependenciesMeta": {
+        "react-native-windows": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/react-native-draggable-flatlist": {
+      "version": "4.0.1",
+      "license": "MIT",
+      "dependencies": {
+        "@babel/preset-typescript": "^7.17.12"
+      },
+      "peerDependencies": {
+        "react-native": ">=0.64.0",
+        "react-native-gesture-handler": ">=2.0.0",
+        "react-native-reanimated": ">=2.8.0"
+      }
+    },
+    "node_modules/react-native-fs": {
+      "version": "2.20.0",
+      "license": "MIT",
+      "dependencies": {
+        "base-64": "^0.1.0",
+        "utf8": "^3.0.0"
+      },
+      "peerDependencies": {
+        "react-native": "*",
+        "react-native-windows": "*"
+      },
+      "peerDependenciesMeta": {
+        "react-native-windows": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/react-native-gesture-handler": {
+      "version": "2.18.0",
+      "license": "MIT",
+      "dependencies": {
+        "@egjs/hammerjs": "^2.0.17",
+        "hoist-non-react-statics": "^3.3.0",
+        "invariant": "^2.2.4",
+        "prop-types": "^15.7.2"
+      },
+      "peerDependencies": {
+        "react": "*",
+        "react-native": "*"
+      }
+    },
+    "node_modules/react-native-google-places-autocomplete": {
+      "version": "2.5.6",
+      "license": "MIT",
+      "dependencies": {
+        "lodash.debounce": "^4.0.8",
+        "prop-types": "^15.7.2",
+        "qs": "~6.9.1"
+      },
+      "peerDependencies": {
+        "react-native": ">= 0.59"
+      }
+    },
+    "node_modules/react-native-google-places-autocomplete/node_modules/qs": {
+      "version": "6.9.7",
+      "license": "BSD-3-Clause",
+      "engines": {
+        "node": ">=0.6"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/react-native-haptic-feedback": {
+      "version": "2.2.0",
+      "license": "MIT",
+      "peerDependencies": {
+        "react-native": ">=0.60.0"
+      }
+    },
+    "node_modules/react-native-image-picker": {
+      "version": "7.0.3",
+      "license": "MIT",
+      "peerDependencies": {
+        "react": "*",
+        "react-native": "*"
+      }
+    },
+    "node_modules/react-native-image-size": {
+      "version": "1.1.3",
+      "resolved": "git+ssh://git@github.com/Expensify/react-native-image-size.git#93399c6410de32966eb57085936ef6951398c2c3",
+      "integrity": "sha512-hR38DhM3ewEv5VPhyCAbrhgWWlA1Hyys69BdUFkUes2wgiZc2ARVaXoLKuvzYT3g9fNYLwijylaSEs3juDkPKg=="
+    },
+    "node_modules/react-native-key-command": {
+      "version": "1.0.8",
+      "license": "MIT",
+      "dependencies": {
+        "eventemitter3": "^5.0.1",
+        "underscore": "^1.13.4"
+      },
+      "peerDependencies": {
+        "react": "^18.1.0",
+        "react-dom": "18.1.0",
+        "react-native": "^0.70.4",
+        "react-native-web": "^0.19.7"
+      }
+    },
+    "node_modules/react-native-key-command/node_modules/eventemitter3": {
+      "version": "5.0.1",
+      "license": "MIT"
+    },
+    "node_modules/react-native-keyboard-controller": {
+      "version": "1.12.2",
+      "resolved": "https://registry.npmjs.org/react-native-keyboard-controller/-/react-native-keyboard-controller-1.12.2.tgz",
+      "integrity": "sha512-10Sy0+neSHGJxOmOxrUJR8TQznnrQ+jTFQtM1PP6YnblNQeAw1eOa+lO6YLGenRr5WuNSMZbks/3Ay0e2yMKLw==",
+      "peerDependencies": {
+        "react": "*",
+        "react-native": "*",
+        "react-native-reanimated": ">=2.3.0"
+      }
+    },
+    "node_modules/react-native-launch-arguments": {
+      "version": "4.0.2",
+      "license": "MIT",
+      "peerDependencies": {
+        "react": ">=16.8.1",
+        "react-native": ">=0.60.0-rc.0 <1.0.x"
+      }
+    },
+    "node_modules/react-native-linear-gradient": {
+      "version": "2.8.1",
+      "license": "MIT",
+      "peerDependencies": {
+        "react": "*",
+        "react-native": "*"
+      }
+    },
+    "node_modules/react-native-localize": {
+      "version": "2.2.6",
+      "license": "MIT",
+      "peerDependencies": {
+        "react": ">=16.8.6",
+        "react-native": ">=0.60.0",
+        "react-native-macos": ">=0.64.0",
+        "react-native-windows": ">=0.62.0"
+      },
+      "peerDependenciesMeta": {
+        "react-native-macos": {
+          "optional": true
+        },
+        "react-native-windows": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/react-native-macos": {
+      "version": "0.73.24",
+      "license": "MIT",
+      "peer": true,
+      "dependencies": {
+        "@jest/create-cache-key-function": "^29.6.3",
+        "@react-native-community/cli": "12.3.6",
+        "@react-native-community/cli-platform-android": "12.3.6",
+        "@react-native-community/cli-platform-ios": "12.3.6",
+        "@react-native-mac/virtualized-lists": "^0.73.3",
+        "@react-native/assets-registry": "0.73.1",
+        "@react-native/codegen": "0.73.3",
+        "@react-native/community-cli-plugin": "0.73.17",
+        "@react-native/gradle-plugin": "0.73.4",
+        "@react-native/js-polyfills": "0.73.1",
+        "@react-native/normalize-colors": "0.73.2",
+        "abort-controller": "^3.0.0",
+        "anser": "^1.4.9",
+        "ansi-regex": "^5.0.0",
+        "base64-js": "^1.5.1",
+        "chalk": "^4.0.0",
+        "deprecated-react-native-prop-types": "^5.0.0",
+        "event-target-shim": "^5.0.1",
+        "flow-enums-runtime": "^0.0.6",
+        "invariant": "^2.2.4",
+        "jest-environment-node": "^29.6.3",
+        "jsc-android": "^250231.0.0",
+        "memoize-one": "^5.0.0",
+        "metro-runtime": "^0.80.3",
+        "metro-source-map": "^0.80.3",
+        "mkdirp": "^0.5.1",
+        "nullthrows": "^1.1.1",
+        "pretty-format": "^26.5.2",
+        "promise": "^8.3.0",
+        "react-devtools-core": "^4.27.7",
+        "react-refresh": "^0.14.0",
+        "react-shallow-renderer": "^16.15.0",
+        "regenerator-runtime": "^0.13.2",
+        "scheduler": "0.24.0-canary-efb381bbf-20230505",
+        "stacktrace-parser": "^0.1.10",
+        "whatwg-fetch": "^3.0.0",
+        "ws": "^6.2.2",
+        "yargs": "^17.6.2"
+      },
+      "bin": {
+        "react-native-macos": "cli.js"
+      },
+      "engines": {
+        "node": ">=18"
+      },
+      "peerDependencies": {
+        "react": "18.2.0"
       }
     },
-    "node_modules/please-upgrade-node": {
-      "version": "3.2.0",
-      "dev": true,
+    "node_modules/react-native-macos/node_modules/@jest/types": {
+      "version": "26.6.2",
       "license": "MIT",
+      "peer": true,
       "dependencies": {
-        "semver-compare": "^1.0.0"
+        "@types/istanbul-lib-coverage": "^2.0.0",
+        "@types/istanbul-reports": "^3.0.0",
+        "@types/node": "*",
+        "@types/yargs": "^15.0.0",
+        "chalk": "^4.0.0"
+      },
+      "engines": {
+        "node": ">= 10.14.2"
       }
     },
-    "node_modules/plist": {
-      "version": "3.0.6",
+    "node_modules/react-native-macos/node_modules/@react-native-community/cli": {
+      "version": "12.3.6",
       "license": "MIT",
+      "peer": true,
       "dependencies": {
-        "base64-js": "^1.5.1",
-        "xmlbuilder": "^15.1.1"
+        "@react-native-community/cli-clean": "12.3.6",
+        "@react-native-community/cli-config": "12.3.6",
+        "@react-native-community/cli-debugger-ui": "12.3.6",
+        "@react-native-community/cli-doctor": "12.3.6",
+        "@react-native-community/cli-hermes": "12.3.6",
+        "@react-native-community/cli-plugin-metro": "12.3.6",
+        "@react-native-community/cli-server-api": "12.3.6",
+        "@react-native-community/cli-tools": "12.3.6",
+        "@react-native-community/cli-types": "12.3.6",
+        "chalk": "^4.1.2",
+        "commander": "^9.4.1",
+        "deepmerge": "^4.3.0",
+        "execa": "^5.0.0",
+        "find-up": "^4.1.0",
+        "fs-extra": "^8.1.0",
+        "graceful-fs": "^4.1.3",
+        "prompts": "^2.4.2",
+        "semver": "^7.5.2"
+      },
+      "bin": {
+        "react-native": "build/bin.js"
       },
       "engines": {
-        "node": ">=6"
+        "node": ">=18"
       }
     },
-    "node_modules/plist/node_modules/xmlbuilder": {
-      "version": "15.1.1",
+    "node_modules/react-native-macos/node_modules/@react-native-community/cli-clean": {
+      "version": "12.3.6",
       "license": "MIT",
-      "engines": {
-        "node": ">=8.0"
+      "peer": true,
+      "dependencies": {
+        "@react-native-community/cli-tools": "12.3.6",
+        "chalk": "^4.1.2",
+        "execa": "^5.0.0"
       }
     },
-    "node_modules/pngjs": {
-      "version": "5.0.0",
+    "node_modules/react-native-macos/node_modules/@react-native-community/cli-config": {
+      "version": "12.3.6",
       "license": "MIT",
-      "engines": {
-        "node": ">=10.13.0"
+      "peer": true,
+      "dependencies": {
+        "@react-native-community/cli-tools": "12.3.6",
+        "chalk": "^4.1.2",
+        "cosmiconfig": "^5.1.0",
+        "deepmerge": "^4.3.0",
+        "glob": "^7.1.3",
+        "joi": "^17.2.1"
       }
     },
-    "node_modules/polished": {
-      "version": "4.3.1",
-      "resolved": "https://registry.npmjs.org/polished/-/polished-4.3.1.tgz",
-      "integrity": "sha512-OBatVyC/N7SCW/FaDHrSd+vn0o5cS855TOmYi4OkdWUMSJCET/xip//ch8xGUvtr3i44X9LVyWwQlRMTN3pwSA==",
+    "node_modules/react-native-macos/node_modules/@react-native-community/cli-doctor": {
+      "version": "12.3.6",
+      "license": "MIT",
+      "peer": true,
       "dependencies": {
-        "@babel/runtime": "^7.17.8"
-      },
-      "engines": {
-        "node": ">=10"
+        "@react-native-community/cli-config": "12.3.6",
+        "@react-native-community/cli-platform-android": "12.3.6",
+        "@react-native-community/cli-platform-ios": "12.3.6",
+        "@react-native-community/cli-tools": "12.3.6",
+        "chalk": "^4.1.2",
+        "command-exists": "^1.2.8",
+        "deepmerge": "^4.3.0",
+        "envinfo": "^7.10.0",
+        "execa": "^5.0.0",
+        "hermes-profile-transformer": "^0.0.6",
+        "node-stream-zip": "^1.9.1",
+        "ora": "^5.4.1",
+        "semver": "^7.5.2",
+        "strip-ansi": "^5.2.0",
+        "wcwidth": "^1.0.1",
+        "yaml": "^2.2.1"
       }
     },
-    "node_modules/portfinder": {
-      "version": "1.0.32",
-      "dev": true,
+    "node_modules/react-native-macos/node_modules/@react-native-community/cli-hermes": {
+      "version": "12.3.6",
       "license": "MIT",
+      "peer": true,
       "dependencies": {
-        "async": "^2.6.4",
-        "debug": "^3.2.7",
-        "mkdirp": "^0.5.6"
-      },
-      "engines": {
-        "node": ">= 0.12.0"
+        "@react-native-community/cli-platform-android": "12.3.6",
+        "@react-native-community/cli-tools": "12.3.6",
+        "chalk": "^4.1.2",
+        "hermes-profile-transformer": "^0.0.6"
       }
     },
-    "node_modules/portfinder/node_modules/async": {
-      "version": "2.6.4",
-      "dev": true,
+    "node_modules/react-native-macos/node_modules/@react-native-community/cli-platform-android": {
+      "version": "12.3.6",
       "license": "MIT",
+      "peer": true,
       "dependencies": {
-        "lodash": "^4.17.14"
+        "@react-native-community/cli-tools": "12.3.6",
+        "chalk": "^4.1.2",
+        "execa": "^5.0.0",
+        "fast-xml-parser": "^4.2.4",
+        "glob": "^7.1.3",
+        "logkitty": "^0.7.1"
       }
     },
-    "node_modules/portfinder/node_modules/debug": {
-      "version": "3.2.7",
-      "dev": true,
+    "node_modules/react-native-macos/node_modules/@react-native-community/cli-platform-ios": {
+      "version": "12.3.6",
       "license": "MIT",
+      "peer": true,
       "dependencies": {
-        "ms": "^2.1.1"
+        "@react-native-community/cli-tools": "12.3.6",
+        "chalk": "^4.1.2",
+        "execa": "^5.0.0",
+        "fast-xml-parser": "^4.0.12",
+        "glob": "^7.1.3",
+        "ora": "^5.4.1"
       }
     },
-    "node_modules/portfinder/node_modules/mkdirp": {
-      "version": "0.5.6",
-      "dev": true,
+    "node_modules/react-native-macos/node_modules/@react-native-community/cli-types": {
+      "version": "12.3.6",
       "license": "MIT",
+      "peer": true,
       "dependencies": {
-        "minimist": "^1.2.6"
-      },
-      "bin": {
-        "mkdirp": "bin/cmd.js"
+        "joi": "^17.2.1"
       }
     },
-    "node_modules/posix-character-classes": {
-      "version": "0.1.1",
+    "node_modules/react-native-macos/node_modules/@react-native/assets-registry": {
+      "version": "0.73.1",
       "license": "MIT",
-      "optional": true,
+      "peer": true,
       "engines": {
-        "node": ">=0.10.0"
+        "node": ">=18"
       }
     },
-    "node_modules/postcss-selector-parser": {
-      "version": "6.0.10",
-      "dev": true,
+    "node_modules/react-native-macos/node_modules/@react-native/babel-plugin-codegen": {
+      "version": "0.73.4",
       "license": "MIT",
+      "peer": true,
       "dependencies": {
-        "cssesc": "^3.0.0",
-        "util-deprecate": "^1.0.2"
+        "@react-native/codegen": "0.73.3"
       },
       "engines": {
-        "node": ">=4"
+        "node": ">=18"
       }
     },
-    "node_modules/postcss-value-parser": {
-      "version": "4.2.0",
-      "license": "MIT"
-    },
-    "node_modules/potpack": {
-      "version": "2.0.0",
-      "license": "ISC"
-    },
-    "node_modules/prelude-ls": {
-      "version": "1.2.1",
-      "dev": true,
+    "node_modules/react-native-macos/node_modules/@react-native/babel-preset": {
+      "version": "0.73.21",
       "license": "MIT",
+      "peer": true,
+      "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-private-methods": "^7.22.5",
+        "@babel/plugin-transform-private-property-in-object": "^7.22.11",
+        "@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",
+        "@react-native/babel-plugin-codegen": "0.73.4",
+        "babel-plugin-transform-flow-enums": "^0.0.2",
+        "react-refresh": "^0.14.0"
+      },
       "engines": {
-        "node": ">= 0.8.0"
+        "node": ">=18"
+      },
+      "peerDependencies": {
+        "@babel/core": "*"
       }
     },
-    "node_modules/prettier": {
-      "version": "2.8.8",
-      "dev": true,
+    "node_modules/react-native-macos/node_modules/@react-native/codegen": {
+      "version": "0.73.3",
       "license": "MIT",
-      "bin": {
-        "prettier": "bin-prettier.js"
+      "peer": true,
+      "dependencies": {
+        "@babel/parser": "^7.20.0",
+        "flow-parser": "^0.206.0",
+        "glob": "^7.1.1",
+        "invariant": "^2.2.4",
+        "jscodeshift": "^0.14.0",
+        "mkdirp": "^0.5.1",
+        "nullthrows": "^1.1.1"
       },
       "engines": {
-        "node": ">=10.13.0"
+        "node": ">=18"
       },
-      "funding": {
-        "url": "https://github.com/prettier/prettier?sponsor=1"
+      "peerDependencies": {
+        "@babel/preset-env": "^7.1.6"
       }
     },
-    "node_modules/prettier-linter-helpers": {
-      "version": "1.0.0",
-      "dev": true,
+    "node_modules/react-native-macos/node_modules/@react-native/community-cli-plugin": {
+      "version": "0.73.17",
       "license": "MIT",
+      "peer": true,
       "dependencies": {
-        "fast-diff": "^1.1.2"
+        "@react-native-community/cli-server-api": "12.3.6",
+        "@react-native-community/cli-tools": "12.3.6",
+        "@react-native/dev-middleware": "0.73.8",
+        "@react-native/metro-babel-transformer": "0.73.15",
+        "chalk": "^4.0.0",
+        "execa": "^5.1.1",
+        "metro": "^0.80.3",
+        "metro-config": "^0.80.3",
+        "metro-core": "^0.80.3",
+        "node-fetch": "^2.2.0",
+        "readline": "^1.3.0"
       },
       "engines": {
-        "node": ">=6.0.0"
+        "node": ">=18"
       }
     },
-    "node_modules/pretty-bytes": {
-      "version": "5.6.0",
-      "license": "MIT",
+    "node_modules/react-native-macos/node_modules/@react-native/debugger-frontend": {
+      "version": "0.73.3",
+      "license": "BSD-3-Clause",
+      "peer": true,
       "engines": {
-        "node": ">=6"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/pretty-error": {
-      "version": "4.0.0",
-      "license": "MIT",
-      "dependencies": {
-        "lodash": "^4.17.20",
-        "renderkid": "^3.0.0"
+        "node": ">=18"
       }
     },
-    "node_modules/pretty-format": {
-      "version": "29.7.0",
+    "node_modules/react-native-macos/node_modules/@react-native/dev-middleware": {
+      "version": "0.73.8",
       "license": "MIT",
+      "peer": true,
       "dependencies": {
-        "@jest/schemas": "^29.6.3",
-        "ansi-styles": "^5.0.0",
-        "react-is": "^18.0.0"
+        "@isaacs/ttlcache": "^1.4.1",
+        "@react-native/debugger-frontend": "0.73.3",
+        "chrome-launcher": "^0.15.2",
+        "chromium-edge-launcher": "^1.0.0",
+        "connect": "^3.6.5",
+        "debug": "^2.2.0",
+        "node-fetch": "^2.2.0",
+        "open": "^7.0.3",
+        "serve-static": "^1.13.1",
+        "temp-dir": "^2.0.0",
+        "ws": "^6.2.2"
       },
       "engines": {
-        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+        "node": ">=18"
       }
     },
-    "node_modules/pretty-format/node_modules/ansi-styles": {
-      "version": "5.2.0",
+    "node_modules/react-native-macos/node_modules/@react-native/gradle-plugin": {
+      "version": "0.73.4",
       "license": "MIT",
+      "peer": true,
       "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
-      }
-    },
-    "node_modules/pretty-format/node_modules/react-is": {
-      "version": "18.2.0",
-      "license": "MIT"
-    },
-    "node_modules/pretty-hrtime": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/pretty-hrtime/-/pretty-hrtime-1.0.3.tgz",
-      "integrity": "sha512-66hKPCr+72mlfiSjlEB1+45IjXSqvVAIy6mocupoww4tBFE9R9IhwwUGoI4G++Tc9Aq+2rxOt0RFU6gPcrte0A==",
-      "engines": {
-        "node": ">= 0.8"
+        "node": ">=18"
       }
     },
-    "node_modules/process": {
-      "version": "0.11.10",
+    "node_modules/react-native-macos/node_modules/@react-native/js-polyfills": {
+      "version": "0.73.1",
       "license": "MIT",
+      "peer": true,
       "engines": {
-        "node": ">= 0.6.0"
+        "node": ">=18"
       }
     },
-    "node_modules/process-nextick-args": {
-      "version": "2.0.1",
-      "license": "MIT"
-    },
-    "node_modules/progress": {
-      "version": "2.0.3",
+    "node_modules/react-native-macos/node_modules/@react-native/metro-babel-transformer": {
+      "version": "0.73.15",
       "license": "MIT",
+      "peer": true,
+      "dependencies": {
+        "@babel/core": "^7.20.0",
+        "@react-native/babel-preset": "0.73.21",
+        "hermes-parser": "0.15.0",
+        "nullthrows": "^1.1.1"
+      },
       "engines": {
-        "node": ">=0.4.0"
+        "node": ">=18"
+      },
+      "peerDependencies": {
+        "@babel/core": "*"
       }
     },
-    "node_modules/promise": {
-      "version": "7.3.1",
+    "node_modules/react-native-macos/node_modules/@react-native/normalize-colors": {
+      "version": "0.73.2",
       "license": "MIT",
-      "dependencies": {
-        "asap": "~2.0.3"
-      }
-    },
-    "node_modules/promise-inflight": {
-      "version": "1.0.1",
-      "license": "ISC"
+      "peer": true
     },
-    "node_modules/promise-retry": {
-      "version": "2.0.1",
-      "dev": true,
+    "node_modules/react-native-macos/node_modules/@types/yargs": {
+      "version": "15.0.19",
       "license": "MIT",
+      "peer": true,
       "dependencies": {
-        "err-code": "^2.0.2",
-        "retry": "^0.12.0"
-      },
-      "engines": {
-        "node": ">=10"
+        "@types/yargs-parser": "*"
       }
     },
-    "node_modules/promise-retry/node_modules/retry": {
-      "version": "0.12.0",
-      "dev": true,
+    "node_modules/react-native-macos/node_modules/ansi-regex": {
+      "version": "5.0.1",
       "license": "MIT",
+      "peer": true,
       "engines": {
-        "node": ">= 4"
+        "node": ">=8"
       }
     },
-    "node_modules/prompts": {
-      "version": "2.4.2",
+    "node_modules/react-native-macos/node_modules/ansi-styles": {
+      "version": "4.3.0",
       "license": "MIT",
+      "peer": true,
       "dependencies": {
-        "kleur": "^3.0.3",
-        "sisteransi": "^1.0.5"
+        "color-convert": "^2.0.1"
       },
       "engines": {
-        "node": ">= 6"
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
       }
     },
-    "node_modules/prop-types": {
-      "version": "15.8.1",
+    "node_modules/react-native-macos/node_modules/chalk": {
+      "version": "4.1.2",
       "license": "MIT",
+      "peer": true,
       "dependencies": {
-        "loose-envify": "^1.4.0",
-        "object-assign": "^4.1.1",
-        "react-is": "^16.13.1"
-      }
-    },
-    "node_modules/propagate": {
-      "version": "2.0.1",
-      "license": "MIT",
+        "ansi-styles": "^4.1.0",
+        "supports-color": "^7.1.0"
+      },
       "engines": {
-        "node": ">= 8"
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/chalk?sponsor=1"
       }
     },
-    "node_modules/protocol-buffers-schema": {
-      "version": "3.6.0",
-      "license": "MIT"
-    },
-    "node_modules/proxy-addr": {
-      "version": "2.0.7",
+    "node_modules/react-native-macos/node_modules/color-convert": {
+      "version": "2.0.1",
       "license": "MIT",
+      "peer": true,
       "dependencies": {
-        "forwarded": "0.2.0",
-        "ipaddr.js": "1.9.1"
+        "color-name": "~1.1.4"
       },
       "engines": {
-        "node": ">= 0.10"
+        "node": ">=7.0.0"
       }
     },
-    "node_modules/prr": {
-      "version": "1.0.1",
-      "license": "MIT"
-    },
-    "node_modules/psl": {
-      "version": "1.9.0",
-      "license": "MIT"
-    },
-    "node_modules/public-encrypt": {
-      "version": "4.0.3",
+    "node_modules/react-native-macos/node_modules/color-name": {
+      "version": "1.1.4",
       "license": "MIT",
-      "dependencies": {
-        "bn.js": "^4.1.0",
-        "browserify-rsa": "^4.0.0",
-        "create-hash": "^1.1.0",
-        "parse-asn1": "^5.0.0",
-        "randombytes": "^2.0.1",
-        "safe-buffer": "^5.1.2"
-      }
-    },
-    "node_modules/public-encrypt/node_modules/bn.js": {
-      "version": "4.12.0",
-      "license": "MIT"
+      "peer": true
     },
-    "node_modules/pump": {
-      "version": "3.0.0",
+    "node_modules/react-native-macos/node_modules/commander": {
+      "version": "9.5.0",
       "license": "MIT",
-      "dependencies": {
-        "end-of-stream": "^1.1.0",
-        "once": "^1.3.1"
+      "peer": true,
+      "engines": {
+        "node": "^12.20.0 || >=14"
       }
     },
-    "node_modules/pumpify": {
-      "version": "1.5.1",
+    "node_modules/react-native-macos/node_modules/cosmiconfig": {
+      "version": "5.2.1",
       "license": "MIT",
+      "peer": true,
       "dependencies": {
-        "duplexify": "^3.6.0",
-        "inherits": "^2.0.3",
-        "pump": "^2.0.0"
+        "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/pumpify/node_modules/pump": {
-      "version": "2.0.1",
+    "node_modules/react-native-macos/node_modules/debug": {
+      "version": "2.6.9",
       "license": "MIT",
+      "peer": true,
       "dependencies": {
-        "end-of-stream": "^1.1.0",
-        "once": "^1.3.1"
+        "ms": "2.0.0"
       }
     },
-    "node_modules/punycode": {
-      "version": "2.3.1",
+    "node_modules/react-native-macos/node_modules/deprecated-react-native-prop-types": {
+      "version": "5.0.0",
       "license": "MIT",
+      "peer": true,
+      "dependencies": {
+        "@react-native/normalize-colors": "^0.73.0",
+        "invariant": "^2.2.4",
+        "prop-types": "^15.8.1"
+      },
       "engines": {
-        "node": ">=6"
+        "node": ">=18"
       }
     },
-    "node_modules/pusher-js": {
-      "version": "8.3.0",
+    "node_modules/react-native-macos/node_modules/find-up": {
+      "version": "4.1.0",
       "license": "MIT",
+      "peer": true,
       "dependencies": {
-        "tweetnacl": "^1.0.3"
+        "locate-path": "^5.0.0",
+        "path-exists": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=8"
       }
     },
-    "node_modules/pusher-js-mock": {
-      "version": "0.3.8",
-      "dev": true,
+    "node_modules/react-native-macos/node_modules/flow-parser": {
+      "version": "0.206.0",
       "license": "MIT",
+      "peer": true,
       "engines": {
-        "node": ">=4.2.4"
+        "node": ">=0.4.0"
       }
     },
-    "node_modules/qrcode": {
-      "version": "1.5.3",
+    "node_modules/react-native-macos/node_modules/fs-extra": {
+      "version": "8.1.0",
       "license": "MIT",
+      "peer": true,
       "dependencies": {
-        "dijkstrajs": "^1.0.1",
-        "encode-utf8": "^1.0.3",
-        "pngjs": "^5.0.0",
-        "yargs": "^15.3.1"
-      },
-      "bin": {
-        "qrcode": "bin/qrcode"
+        "graceful-fs": "^4.2.0",
+        "jsonfile": "^4.0.0",
+        "universalify": "^0.1.0"
       },
       "engines": {
-        "node": ">=10.13.0"
-      }
-    },
-    "node_modules/qrcode-terminal": {
-      "version": "0.11.0",
-      "bin": {
-        "qrcode-terminal": "bin/qrcode-terminal.js"
+        "node": ">=6 <7 || >=8"
       }
     },
-    "node_modules/qrcode/node_modules/ansi-styles": {
-      "version": "4.3.0",
+    "node_modules/react-native-macos/node_modules/has-flag": {
+      "version": "4.0.0",
       "license": "MIT",
-      "dependencies": {
-        "color-convert": "^2.0.1"
-      },
+      "peer": true,
       "engines": {
         "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
       }
     },
-    "node_modules/qrcode/node_modules/camelcase": {
-      "version": "5.3.1",
+    "node_modules/react-native-macos/node_modules/hermes-estree": {
+      "version": "0.15.0",
       "license": "MIT",
-      "engines": {
-        "node": ">=6"
-      }
+      "peer": true
     },
-    "node_modules/qrcode/node_modules/cliui": {
-      "version": "6.0.0",
-      "license": "ISC",
-      "dependencies": {
-        "string-width": "^4.2.0",
-        "strip-ansi": "^6.0.0",
-        "wrap-ansi": "^6.2.0"
+    "node_modules/react-native-macos/node_modules/hermes-parser": {
+      "version": "0.15.0",
+      "license": "MIT",
+      "peer": true,
+      "dependencies": {
+        "hermes-estree": "0.15.0"
       }
     },
-    "node_modules/qrcode/node_modules/color-convert": {
-      "version": "2.0.1",
+    "node_modules/react-native-macos/node_modules/import-fresh": {
+      "version": "2.0.0",
       "license": "MIT",
+      "peer": true,
       "dependencies": {
-        "color-name": "~1.1.4"
+        "caller-path": "^2.0.0",
+        "resolve-from": "^3.0.0"
       },
       "engines": {
-        "node": ">=7.0.0"
+        "node": ">=4"
       }
     },
-    "node_modules/qrcode/node_modules/color-name": {
-      "version": "1.1.4",
-      "license": "MIT"
+    "node_modules/react-native-macos/node_modules/jsonfile": {
+      "version": "4.0.0",
+      "license": "MIT",
+      "peer": true,
+      "optionalDependencies": {
+        "graceful-fs": "^4.1.6"
+      }
     },
-    "node_modules/qrcode/node_modules/find-up": {
-      "version": "4.1.0",
+    "node_modules/react-native-macos/node_modules/locate-path": {
+      "version": "5.0.0",
       "license": "MIT",
+      "peer": true,
       "dependencies": {
-        "locate-path": "^5.0.0",
-        "path-exists": "^4.0.0"
+        "p-locate": "^4.1.0"
       },
       "engines": {
         "node": ">=8"
       }
     },
-    "node_modules/qrcode/node_modules/locate-path": {
-      "version": "5.0.0",
+    "node_modules/react-native-macos/node_modules/mkdirp": {
+      "version": "0.5.6",
       "license": "MIT",
+      "peer": true,
       "dependencies": {
-        "p-locate": "^4.1.0"
+        "minimist": "^1.2.6"
+      },
+      "bin": {
+        "mkdirp": "bin/cmd.js"
+      }
+    },
+    "node_modules/react-native-macos/node_modules/ms": {
+      "version": "2.0.0",
+      "license": "MIT",
+      "peer": true
+    },
+    "node_modules/react-native-macos/node_modules/open": {
+      "version": "7.4.2",
+      "license": "MIT",
+      "peer": true,
+      "dependencies": {
+        "is-docker": "^2.0.0",
+        "is-wsl": "^2.1.1"
       },
       "engines": {
         "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/qrcode/node_modules/p-limit": {
+    "node_modules/react-native-macos/node_modules/p-limit": {
       "version": "2.3.0",
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "p-try": "^2.0.0"
       },
@@ -30634,9 +38039,10 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/qrcode/node_modules/p-locate": {
+    "node_modules/react-native-macos/node_modules/p-locate": {
       "version": "4.1.0",
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "p-limit": "^2.2.0"
       },
@@ -30644,486 +38050,532 @@
         "node": ">=8"
       }
     },
-    "node_modules/qrcode/node_modules/path-exists": {
+    "node_modules/react-native-macos/node_modules/parse-json": {
       "version": "4.0.0",
       "license": "MIT",
+      "peer": true,
+      "dependencies": {
+        "error-ex": "^1.3.1",
+        "json-parse-better-errors": "^1.0.1"
+      },
       "engines": {
-        "node": ">=8"
+        "node": ">=4"
       }
     },
-    "node_modules/qrcode/node_modules/wrap-ansi": {
-      "version": "6.2.0",
+    "node_modules/react-native-macos/node_modules/path-exists": {
+      "version": "4.0.0",
       "license": "MIT",
-      "dependencies": {
-        "ansi-styles": "^4.0.0",
-        "string-width": "^4.1.0",
-        "strip-ansi": "^6.0.0"
-      },
+      "peer": true,
       "engines": {
         "node": ">=8"
       }
     },
-    "node_modules/qrcode/node_modules/yargs": {
-      "version": "15.4.1",
+    "node_modules/react-native-macos/node_modules/pretty-format": {
+      "version": "26.6.2",
       "license": "MIT",
+      "peer": true,
       "dependencies": {
-        "cliui": "^6.0.0",
-        "decamelize": "^1.2.0",
-        "find-up": "^4.1.0",
-        "get-caller-file": "^2.0.1",
-        "require-directory": "^2.1.1",
-        "require-main-filename": "^2.0.0",
-        "set-blocking": "^2.0.0",
-        "string-width": "^4.2.0",
-        "which-module": "^2.0.0",
-        "y18n": "^4.0.0",
-        "yargs-parser": "^18.1.2"
+        "@jest/types": "^26.6.2",
+        "ansi-regex": "^5.0.0",
+        "ansi-styles": "^4.0.0",
+        "react-is": "^17.0.1"
       },
       "engines": {
-        "node": ">=8"
+        "node": ">= 10"
       }
     },
-    "node_modules/qrcode/node_modules/yargs-parser": {
-      "version": "18.1.3",
-      "license": "ISC",
+    "node_modules/react-native-macos/node_modules/promise": {
+      "version": "8.3.0",
+      "license": "MIT",
+      "peer": true,
       "dependencies": {
-        "camelcase": "^5.0.0",
-        "decamelize": "^1.2.0"
-      },
-      "engines": {
-        "node": ">=6"
+        "asap": "~2.0.6"
       }
     },
-    "node_modules/qs": {
-      "version": "6.10.3",
-      "license": "BSD-3-Clause",
+    "node_modules/react-native-macos/node_modules/react-devtools-core": {
+      "version": "4.28.5",
+      "license": "MIT",
+      "peer": true,
       "dependencies": {
-        "side-channel": "^1.0.4"
-      },
+        "shell-quote": "^1.6.1",
+        "ws": "^7"
+      }
+    },
+    "node_modules/react-native-macos/node_modules/react-devtools-core/node_modules/ws": {
+      "version": "7.5.9",
+      "license": "MIT",
+      "peer": true,
       "engines": {
-        "node": ">=0.6"
+        "node": ">=8.3.0"
       },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
+      "peerDependencies": {
+        "bufferutil": "^4.0.1",
+        "utf-8-validate": "^5.0.2"
+      },
+      "peerDependenciesMeta": {
+        "bufferutil": {
+          "optional": true
+        },
+        "utf-8-validate": {
+          "optional": true
+        }
       }
     },
-    "node_modules/query-string": {
-      "version": "7.1.3",
+    "node_modules/react-native-macos/node_modules/react-is": {
+      "version": "17.0.2",
+      "license": "MIT",
+      "peer": true
+    },
+    "node_modules/react-native-macos/node_modules/resolve-from": {
+      "version": "3.0.0",
+      "license": "MIT",
+      "peer": true,
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/react-native-macos/node_modules/strip-ansi": {
+      "version": "5.2.0",
       "license": "MIT",
+      "peer": true,
       "dependencies": {
-        "decode-uri-component": "^0.2.2",
-        "filter-obj": "^1.1.0",
-        "split-on-first": "^1.0.0",
-        "strict-uri-encode": "^2.0.0"
+        "ansi-regex": "^4.1.0"
       },
       "engines": {
         "node": ">=6"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/querystring": {
-      "version": "0.2.0",
+    "node_modules/react-native-macos/node_modules/strip-ansi/node_modules/ansi-regex": {
+      "version": "4.1.1",
+      "license": "MIT",
+      "peer": true,
       "engines": {
-        "node": ">=0.4.x"
+        "node": ">=6"
       }
     },
-    "node_modules/querystring-es3": {
-      "version": "0.2.1",
+    "node_modules/react-native-macos/node_modules/supports-color": {
+      "version": "7.2.0",
+      "license": "MIT",
+      "peer": true,
+      "dependencies": {
+        "has-flag": "^4.0.0"
+      },
       "engines": {
-        "node": ">=0.4.x"
+        "node": ">=8"
       }
     },
-    "node_modules/querystringify": {
-      "version": "2.2.0",
-      "license": "MIT"
+    "node_modules/react-native-macos/node_modules/universalify": {
+      "version": "0.1.2",
+      "license": "MIT",
+      "peer": true,
+      "engines": {
+        "node": ">= 4.0.0"
+      }
     },
-    "node_modules/queue": {
-      "version": "6.0.2",
+    "node_modules/react-native-macos/node_modules/ws": {
+      "version": "6.2.2",
       "license": "MIT",
+      "peer": true,
       "dependencies": {
-        "inherits": "~2.0.3"
+        "async-limiter": "~1.0.0"
       }
     },
-    "node_modules/queue-microtask": {
-      "version": "1.2.3",
-      "funding": [
-        {
-          "type": "github",
-          "url": "https://github.com/sponsors/feross"
-        },
-        {
-          "type": "patreon",
-          "url": "https://www.patreon.com/feross"
-        },
-        {
-          "type": "consulting",
-          "url": "https://feross.org/support"
-        }
-      ],
-      "license": "MIT"
-    },
-    "node_modules/quick-lru": {
-      "version": "5.1.1",
-      "dev": true,
+    "node_modules/react-native-modal": {
+      "version": "13.0.1",
       "license": "MIT",
-      "engines": {
-        "node": ">=10"
+      "dependencies": {
+        "prop-types": "^15.6.2",
+        "react-native-animatable": "1.3.3"
       },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
+      "peerDependencies": {
+        "react": "*",
+        "react-native": ">=0.65.0"
       }
     },
-    "node_modules/quickselect": {
-      "version": "2.0.0",
-      "license": "ISC"
-    },
-    "node_modules/quill-delta": {
-      "version": "5.1.0",
-      "dev": true,
-      "license": "MIT",
-      "peer": true,
+    "node_modules/react-native-onyx": {
+      "version": "2.0.66",
+      "resolved": "https://registry.npmjs.org/react-native-onyx/-/react-native-onyx-2.0.66.tgz",
+      "integrity": "sha512-Ns9WzcAjarAUl9g/bftf2EUJYdgcb6BAraxwqBWVeGWk3dGBR1hVEvZ7p/3rpKjidJQqiM3LWBaM6DkNHoYd1g==",
       "dependencies": {
-        "fast-diff": "^1.3.0",
-        "lodash.clonedeep": "^4.5.0",
-        "lodash.isequal": "^4.5.0"
+        "ascii-table": "0.0.9",
+        "fast-equals": "^4.0.3",
+        "underscore": "^1.13.6"
       },
       "engines": {
-        "node": ">= 12.0.0"
+        "node": ">=20.15.1",
+        "npm": ">=10.7.0"
+      },
+      "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": "^5.1.0",
+        "react-native-quick-sqlite": "^8.0.0-beta.2"
+      },
+      "peerDependenciesMeta": {
+        "idb-keyval": {
+          "optional": true
+        },
+        "react-native-device-info": {
+          "optional": true
+        },
+        "react-native-performance": {
+          "optional": true
+        },
+        "react-native-quick-sqlite": {
+          "optional": true
+        }
       }
     },
-    "node_modules/raf-schd": {
-      "version": "4.0.3",
-      "license": "MIT"
-    },
-    "node_modules/ramda": {
-      "version": "0.29.0",
-      "resolved": "https://registry.npmjs.org/ramda/-/ramda-0.29.0.tgz",
-      "integrity": "sha512-BBea6L67bYLtdbOqfp8f58fPMqEwx0doL+pAi8TZyp2YWz8R9G8z9x75CZI8W+ftqhFHCpEX2cRnUUXK130iKA==",
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/ramda"
+    "node_modules/react-native-pager-view": {
+      "version": "6.3.4",
+      "resolved": "https://registry.npmjs.org/react-native-pager-view/-/react-native-pager-view-6.3.4.tgz",
+      "integrity": "sha512-4PEQd52EOwWcfiFJZ4VGSlY+GZfumvUzNbAozsMEgJaLvOHOMMl+Arfsc0txgtGdS49uEiHFLLZthZQzxx/Mog==",
+      "peerDependencies": {
+        "react": "*",
+        "react-native": "*"
       }
     },
-    "node_modules/randombytes": {
-      "version": "2.1.0",
+    "node_modules/react-native-pdf": {
+      "version": "6.7.3",
       "license": "MIT",
       "dependencies": {
-        "safe-buffer": "^5.1.0"
+        "crypto-js": "4.2.0",
+        "deprecated-react-native-prop-types": "^2.3.0"
+      },
+      "peerDependencies": {
+        "react": "*",
+        "react-native": "*",
+        "react-native-blob-util": ">=0.13.7"
       }
     },
-    "node_modules/randomfill": {
-      "version": "1.0.4",
+    "node_modules/react-native-performance": {
+      "version": "5.1.0",
       "license": "MIT",
-      "dependencies": {
-        "randombytes": "^2.0.5",
-        "safe-buffer": "^5.1.0"
+      "peerDependencies": {
+        "react-native": "*"
       }
     },
-    "node_modules/range-parser": {
-      "version": "1.2.1",
+    "node_modules/react-native-permissions": {
+      "version": "3.10.1",
       "license": "MIT",
-      "engines": {
-        "node": ">= 0.6"
+      "peerDependencies": {
+        "react": ">=16.13.1",
+        "react-native": ">=0.63.3",
+        "react-native-windows": ">=0.62.0"
+      },
+      "peerDependenciesMeta": {
+        "react-native-windows": {
+          "optional": true
+        }
       }
     },
-    "node_modules/raw-body": {
-      "version": "2.5.1",
-      "license": "MIT",
+    "node_modules/react-native-picker-select": {
+      "version": "8.1.0",
+      "resolved": "git+ssh://git@github.com/Expensify/react-native-picker-select.git#da50d2c5c54e268499047f9cc98b8df4196c1ddf",
+      "integrity": "sha512-iASqj8cXSQY+P3ZhfW1eoVcK0UB+TRTddrNSQ3lmIH0a4lYO3m4XJC+cnoCjjPl/sTzUaShpOnpBfqMueR6UMA==",
       "dependencies": {
-        "bytes": "3.1.2",
-        "http-errors": "2.0.0",
-        "iconv-lite": "0.4.24",
-        "unpipe": "1.0.0"
+        "lodash.isequal": "^4.5.0"
       },
-      "engines": {
-        "node": ">= 0.8"
+      "peerDependencies": {
+        "@react-native-picker/picker": ">=2.1.0"
       }
     },
-    "node_modules/raw-body/node_modules/bytes": {
-      "version": "3.1.2",
+    "node_modules/react-native-plaid-link-sdk": {
+      "version": "11.11.0",
       "license": "MIT",
-      "engines": {
-        "node": ">= 0.8"
+      "peerDependencies": {
+        "react": "*",
+        "react-native": "*"
       }
     },
-    "node_modules/raw-body/node_modules/iconv-lite": {
-      "version": "0.4.24",
-      "license": "MIT",
+    "node_modules/react-native-qrcode-svg": {
+      "version": "6.3.0",
+      "resolved": "git+ssh://git@github.com/Expensify/react-native-qrcode-svg-old.git#295f87d45c0f10d9b50838ad28fa70e47d054c3b",
       "dependencies": {
-        "safer-buffer": ">= 2.1.2 < 3"
+        "prop-types": "^15.8.0",
+        "qrcode": "^1.5.1"
       },
-      "engines": {
-        "node": ">=0.10.0"
+      "peerDependencies": {
+        "react": "*",
+        "react-native": ">=0.63.4",
+        "react-native-svg": ">=13.2.0"
       }
     },
-    "node_modules/rbush": {
-      "version": "3.0.1",
+    "node_modules/react-native-quick-sqlite": {
+      "version": "8.0.6",
+      "resolved": "git+ssh://git@github.com/margelo/react-native-quick-sqlite.git#abc91857d4b3efb2020ec43abd2a508563b64316",
+      "integrity": "sha512-/tBM6Oh8ye3d+hIhURRA9hlBausKqQmscgyt4ZcKluPjBti0bgLb0cyL8Gyd0cbCakaVgym25VyGjaeicV/01A==",
+      "peerDependencies": {
+        "react": "*",
+        "react-native": "*"
+      }
+    },
+    "node_modules/react-native-reanimated": {
+      "version": "3.13.0",
       "license": "MIT",
       "dependencies": {
-        "quickselect": "^2.0.0"
+        "@babel/plugin-transform-arrow-functions": "^7.0.0-0",
+        "@babel/plugin-transform-nullish-coalescing-operator": "^7.0.0-0",
+        "@babel/plugin-transform-optional-chaining": "^7.0.0-0",
+        "@babel/plugin-transform-shorthand-properties": "^7.0.0-0",
+        "@babel/plugin-transform-template-literals": "^7.0.0-0",
+        "@babel/preset-typescript": "^7.16.7",
+        "convert-source-map": "^2.0.0",
+        "invariant": "^2.2.4"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0",
+        "react": "*",
+        "react-native": "*"
       }
     },
-    "node_modules/rc": {
-      "version": "1.2.8",
-      "license": "(BSD-2-Clause OR MIT OR Apache-2.0)",
+    "node_modules/react-native-release-profiler": {
+      "version": "0.2.1",
+      "license": "MIT",
+      "workspaces": [
+        "example"
+      ],
       "dependencies": {
-        "deep-extend": "^0.6.0",
-        "ini": "~1.3.0",
-        "minimist": "^1.2.0",
-        "strip-json-comments": "~2.0.1"
+        "commander": "^11.1.0",
+        "hermes-profile-transformer": "^0.0.9"
       },
       "bin": {
-        "rc": "cli.js"
+        "react-native-release-profiler": "lib/commonjs/cli.js"
+      },
+      "engines": {
+        "node": ">= 18.0.0"
+      },
+      "peerDependencies": {
+        "react": "*",
+        "react-native": "*"
       }
     },
-    "node_modules/rc/node_modules/strip-json-comments": {
-      "version": "2.0.1",
+    "node_modules/react-native-release-profiler/node_modules/commander": {
+      "version": "11.1.0",
       "license": "MIT",
       "engines": {
-        "node": ">=0.10.0"
+        "node": ">=16"
       }
     },
-    "node_modules/react": {
-      "version": "18.2.0",
+    "node_modules/react-native-release-profiler/node_modules/hermes-profile-transformer": {
+      "version": "0.0.9",
       "license": "MIT",
       "dependencies": {
-        "loose-envify": "^1.1.0"
+        "source-map": "^0.7.3"
       },
       "engines": {
-        "node": ">=0.10.0"
+        "node": ">=8"
       }
     },
-    "node_modules/react-beautiful-dnd": {
-      "version": "13.1.1",
-      "license": "Apache-2.0",
+    "node_modules/react-native-render-html": {
+      "version": "6.3.1",
+      "license": "BSD-2-Clause",
       "dependencies": {
-        "@babel/runtime": "^7.9.2",
-        "css-box-model": "^1.2.0",
-        "memoize-one": "^5.1.1",
-        "raf-schd": "^4.0.2",
-        "react-redux": "^7.2.0",
-        "redux": "^4.0.4",
-        "use-memo-one": "^1.1.1"
+        "@jsamr/counter-style": "^2.0.1",
+        "@jsamr/react-native-li": "^2.3.0",
+        "@native-html/transient-render-engine": "11.2.2",
+        "@types/ramda": "^0.27.40",
+        "@types/urijs": "^1.19.15",
+        "prop-types": "^15.5.7",
+        "ramda": "^0.27.1",
+        "stringify-entities": "^3.1.0",
+        "urijs": "^1.19.6"
       },
       "peerDependencies": {
-        "react": "^16.8.5 || ^17.0.0 || ^18.0.0",
-        "react-dom": "^16.8.5 || ^17.0.0 || ^18.0.0"
+        "react": "*",
+        "react-native": "*"
       }
     },
-    "node_modules/react-collapse": {
-      "version": "5.1.1",
+    "node_modules/react-native-render-html/node_modules/@native-html/transient-render-engine": {
+      "version": "11.2.2",
       "license": "MIT",
+      "dependencies": {
+        "@native-html/css-processor": "1.11.0",
+        "@types/ramda": "^0.27.44",
+        "csstype": "^3.0.9",
+        "domelementtype": "^2.2.0",
+        "domhandler": "^4.2.2",
+        "domutils": "^2.8.0",
+        "htmlparser2": "^7.1.2",
+        "ramda": "^0.27.1"
+      },
       "peerDependencies": {
-        "react": ">=16.3.0"
+        "@types/react-native": "*",
+        "react-native": "^*"
       }
     },
-    "node_modules/react-colorful": {
-      "version": "5.6.1",
-      "resolved": "https://registry.npmjs.org/react-colorful/-/react-colorful-5.6.1.tgz",
-      "integrity": "sha512-1exovf0uGTGyq5mXQT0zgQ80uvj2PCwvF8zY1RN9/vbJVSjSo3fsB/4L3ObbF7u70NduSiK4xu4Y6q1MHoUGEw==",
-      "peerDependencies": {
-        "react": ">=16.8.0",
-        "react-dom": ">=16.8.0"
-      }
+    "node_modules/react-native-render-html/node_modules/ramda": {
+      "version": "0.27.2",
+      "license": "MIT"
     },
-    "node_modules/react-content-loader": {
-      "version": "7.0.0",
-      "resolved": "https://registry.npmjs.org/react-content-loader/-/react-content-loader-7.0.0.tgz",
-      "integrity": "sha512-xaBwpO7eiJyEc4ndym+g6wcruV9W2y3DKqbw4U48QFBsv0IeAVZO+aCUb8GptlDLWM8n5zi2HcFSGlj5r+53Tg==",
-      "engines": {
-        "node": ">=10"
-      },
+    "node_modules/react-native-safe-area-context": {
+      "version": "4.10.9",
+      "license": "MIT",
       "peerDependencies": {
-        "react": ">=16.0.0"
+        "react": "*",
+        "react-native": "*"
       }
     },
-    "node_modules/react-devtools-core": {
-      "version": "4.27.8",
+    "node_modules/react-native-screens": {
+      "version": "3.34.0",
       "license": "MIT",
       "dependencies": {
-        "shell-quote": "^1.6.1",
-        "ws": "^7"
+        "react-freeze": "^1.0.0",
+        "warn-once": "^0.1.0"
+      },
+      "peerDependencies": {
+        "react": "*",
+        "react-native": "*"
       }
     },
-    "node_modules/react-devtools-core/node_modules/ws": {
-      "version": "7.5.9",
+    "node_modules/react-native-share": {
+      "version": "10.0.2",
       "license": "MIT",
       "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": ">=16"
       }
     },
-    "node_modules/react-docgen": {
-      "version": "7.0.3",
-      "resolved": "https://registry.npmjs.org/react-docgen/-/react-docgen-7.0.3.tgz",
-      "integrity": "sha512-i8aF1nyKInZnANZ4uZrH49qn1paRgBZ7wZiCNBMnenlPzEv0mRl+ShpTVEI6wZNl8sSc79xZkivtgLKQArcanQ==",
-      "dev": true,
-      "dependencies": {
-        "@babel/core": "^7.18.9",
-        "@babel/traverse": "^7.18.9",
-        "@babel/types": "^7.18.9",
-        "@types/babel__core": "^7.18.0",
-        "@types/babel__traverse": "^7.18.0",
-        "@types/doctrine": "^0.0.9",
-        "@types/resolve": "^1.20.2",
-        "doctrine": "^3.0.0",
-        "resolve": "^1.22.1",
-        "strip-indent": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=16.14.0"
+    "node_modules/react-native-sound": {
+      "version": "0.11.2",
+      "license": "MIT",
+      "peerDependencies": {
+        "react-native": ">=0.8.0"
       }
     },
-    "node_modules/react-docgen-typescript": {
-      "version": "2.2.2",
-      "resolved": "https://registry.npmjs.org/react-docgen-typescript/-/react-docgen-typescript-2.2.2.tgz",
-      "integrity": "sha512-tvg2ZtOpOi6QDwsb3GZhOjDkkX0h8Z2gipvTg6OVMUyoYoURhEiRNePT8NZItTVCDh39JJHnLdfCOkzoLbFnTg==",
-      "dev": true,
+    "node_modules/react-native-svg": {
+      "version": "15.4.0",
+      "license": "MIT",
+      "dependencies": {
+        "css-select": "^5.1.0",
+        "css-tree": "^1.1.3",
+        "warn-once": "0.1.1"
+      },
       "peerDependencies": {
-        "typescript": ">= 4.3.x"
+        "react": "*",
+        "react-native": "*"
       }
     },
-    "node_modules/react-docgen/node_modules/@types/doctrine": {
-      "version": "0.0.9",
-      "resolved": "https://registry.npmjs.org/@types/doctrine/-/doctrine-0.0.9.tgz",
-      "integrity": "sha512-eOIHzCUSH7SMfonMG1LsC2f8vxBFtho6NGBznK41R84YzPuvSBzrhEps33IsQiOW9+VL6NQ9DbjQJznk/S4uRA==",
-      "dev": true
-    },
-    "node_modules/react-docgen/node_modules/strip-indent": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/strip-indent/-/strip-indent-4.0.0.tgz",
-      "integrity": "sha512-mnVSV2l+Zv6BLpSD/8V87CW/y9EmmbYzGCIavsnsI6/nwn26DwffM/yztm30Z/I2DY9wdS3vXVCMnHDgZaVNoA==",
-      "dev": true,
+    "node_modules/react-native-tab-view": {
+      "version": "3.5.2",
+      "license": "MIT",
       "dependencies": {
-        "min-indent": "^1.0.1"
-      },
-      "engines": {
-        "node": ">=12"
+        "use-latest-callback": "^0.1.5"
       },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
+      "peerDependencies": {
+        "react": "*",
+        "react-native": "*",
+        "react-native-pager-view": "*"
       }
     },
-    "node_modules/react-dom": {
-      "version": "18.1.0",
+    "node_modules/react-native-url-polyfill": {
+      "version": "2.0.0",
       "license": "MIT",
       "dependencies": {
-        "loose-envify": "^1.1.0",
-        "scheduler": "^0.22.0"
+        "whatwg-url-without-unicode": "8.0.0-3"
       },
       "peerDependencies": {
-        "react": "^18.1.0"
+        "react-native": "*"
       }
     },
-    "node_modules/react-element-to-jsx-string": {
-      "version": "15.0.0",
-      "resolved": "https://registry.npmjs.org/react-element-to-jsx-string/-/react-element-to-jsx-string-15.0.0.tgz",
-      "integrity": "sha512-UDg4lXB6BzlobN60P8fHWVPX3Kyw8ORrTeBtClmIlGdkOOE+GYQSFvmEU5iLLpwp/6v42DINwNcwOhOLfQ//FQ==",
+    "node_modules/react-native-view-shot": {
+      "version": "3.8.0",
+      "license": "MIT",
       "dependencies": {
-        "@base2/pretty-print-object": "1.0.1",
-        "is-plain-object": "5.0.0",
-        "react-is": "18.1.0"
+        "html2canvas": "^1.4.1"
       },
       "peerDependencies": {
-        "react": "^0.14.8 || ^15.0.1 || ^16.0.0 || ^17.0.1 || ^18.0.0",
-        "react-dom": "^0.14.8 || ^15.0.1 || ^16.0.0 || ^17.0.1 || ^18.0.0"
+        "react": "*",
+        "react-native": "*"
       }
     },
-    "node_modules/react-element-to-jsx-string/node_modules/react-is": {
-      "version": "18.1.0",
-      "resolved": "https://registry.npmjs.org/react-is/-/react-is-18.1.0.tgz",
-      "integrity": "sha512-Fl7FuabXsJnV5Q1qIOQwx/sagGF18kogb4gpfcG4gjLBWO0WDiiz1ko/ExayuxE7InyQkBLkxRFG5oxY6Uu3Kg=="
+    "node_modules/react-native-vision-camera": {
+      "version": "4.0.0-beta.13",
+      "license": "MIT",
+      "peerDependencies": {
+        "react": "*",
+        "react-native": "*",
+        "react-native-worklets-core": "*"
+      },
+      "peerDependenciesMeta": {
+        "react-native-worklets-core": {
+          "optional": true
+        }
+      }
     },
-    "node_modules/react-error-boundary": {
-      "version": "4.0.11",
+    "node_modules/react-native-web": {
+      "version": "0.19.12",
       "license": "MIT",
       "dependencies": {
-        "@babel/runtime": "^7.12.5"
+        "@babel/runtime": "^7.18.6",
+        "@react-native/normalize-colors": "^0.74.1",
+        "fbjs": "^3.0.4",
+        "inline-style-prefixer": "^6.0.1",
+        "memoize-one": "^6.0.0",
+        "nullthrows": "^1.1.1",
+        "postcss-value-parser": "^4.2.0",
+        "styleq": "^0.1.3"
       },
       "peerDependencies": {
-        "react": ">=16.13.1"
+        "react": "^18.0.0",
+        "react-dom": "^18.0.0"
       }
     },
-    "node_modules/react-fast-pdf": {
-      "version": "1.0.12",
-      "resolved": "https://registry.npmjs.org/react-fast-pdf/-/react-fast-pdf-1.0.12.tgz",
-      "integrity": "sha512-RSIYTwQVKWFqZKtmtzd4JU/FnsqdGPBtHu/N6xl7TsauAFnEouUJNjmC7Rg/pd010OX1UvyraQKdBIZ5Pf2q0A==",
-      "dependencies": {
-        "react-pdf": "^7.7.0",
-        "react-window": "^1.8.10"
-      },
-      "engines": {
-        "node": "20.10.0",
-        "npm": "10.2.3"
-      },
+    "node_modules/react-native-web-linear-gradient": {
+      "version": "1.1.2",
+      "license": "MIT",
       "peerDependencies": {
-        "lodash": "4.x",
-        "prop-types": "15.x",
-        "react": "18.x",
-        "react-dom": "18.x"
+        "react-native-web": "*"
       }
     },
-    "node_modules/react-freeze": {
-      "version": "1.0.3",
+    "node_modules/react-native-web-sound": {
+      "version": "0.1.3",
       "license": "MIT",
-      "engines": {
-        "node": ">=10"
+      "dependencies": {
+        "howler": "^2.2.1"
       },
       "peerDependencies": {
-        "react": ">=17.0.0"
+        "react-native-web": "*"
       }
     },
-    "node_modules/react-is": {
-      "version": "16.13.1",
+    "node_modules/react-native-web/node_modules/memoize-one": {
+      "version": "6.0.0",
       "license": "MIT"
     },
-    "node_modules/react-map-gl": {
-      "version": "7.1.3",
+    "node_modules/react-native-webview": {
+      "version": "13.8.6",
       "license": "MIT",
       "dependencies": {
-        "@maplibre/maplibre-gl-style-spec": "^19.2.1",
-        "@types/mapbox-gl": ">=1.0.0"
+        "escape-string-regexp": "2.0.0",
+        "invariant": "2.2.4"
       },
       "peerDependencies": {
-        "mapbox-gl": ">=1.13.0",
-        "maplibre-gl": ">=1.13.0",
-        "react": ">=16.3.0",
-        "react-dom": ">=16.3.0"
-      },
-      "peerDependenciesMeta": {
-        "mapbox-gl": {
-          "optional": true
-        },
-        "maplibre-gl": {
-          "optional": true
-        }
+        "react": "*",
+        "react-native": "*"
       }
     },
-    "node_modules/react-native": {
-      "version": "0.73.4",
-      "resolved": "https://registry.npmjs.org/react-native/-/react-native-0.73.4.tgz",
-      "integrity": "sha512-VtS+Yr6OOTIuJGDECIYWzNU8QpJjASQYvMtfa/Hvm/2/h5GdB6W9H9TOmh13x07Lj4AOhNMx3XSsz6TdrO4jIg==",
+    "node_modules/react-native-webview/node_modules/escape-string-regexp": {
+      "version": "2.0.0",
+      "license": "MIT",
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/react-native-windows": {
+      "version": "0.73.11",
+      "license": "MIT",
+      "peer": true,
       "dependencies": {
+        "@babel/runtime": "^7.0.0",
         "@jest/create-cache-key-function": "^29.6.3",
-        "@react-native-community/cli": "12.3.2",
-        "@react-native-community/cli-platform-android": "12.3.2",
-        "@react-native-community/cli-platform-ios": "12.3.2",
+        "@react-native-community/cli": "12.3.6",
+        "@react-native-community/cli-platform-android": "12.3.6",
+        "@react-native-community/cli-platform-ios": "12.3.6",
+        "@react-native-windows/cli": "0.73.2",
         "@react-native/assets-registry": "0.73.1",
         "@react-native/codegen": "0.73.3",
-        "@react-native/community-cli-plugin": "0.73.16",
+        "@react-native/community-cli-plugin": "0.73.17",
         "@react-native/gradle-plugin": "0.73.4",
         "@react-native/js-polyfills": "0.73.1",
         "@react-native/normalize-colors": "0.73.2",
@@ -31151,651 +38603,732 @@
         "react-shallow-renderer": "^16.15.0",
         "regenerator-runtime": "^0.13.2",
         "scheduler": "0.24.0-canary-efb381bbf-20230505",
+        "source-map-support": "^0.5.19",
         "stacktrace-parser": "^0.1.10",
         "whatwg-fetch": "^3.0.0",
         "ws": "^6.2.2",
         "yargs": "^17.6.2"
       },
-      "bin": {
-        "react-native": "cli.js"
-      },
       "engines": {
-        "node": ">=18"
+        "node": ">= 18"
       },
       "peerDependencies": {
-        "react": "18.2.0"
+        "react": "18.2.0",
+        "react-native": "^0.73.0"
       }
     },
-    "node_modules/react-native-android-location-enabler": {
-      "version": "2.0.1",
+    "node_modules/react-native-windows/node_modules/@jest/types": {
+      "version": "26.6.2",
       "license": "MIT",
-      "engines": {
-        "node": ">= 16.0.0"
+      "peer": true,
+      "dependencies": {
+        "@types/istanbul-lib-coverage": "^2.0.0",
+        "@types/istanbul-reports": "^3.0.0",
+        "@types/node": "*",
+        "@types/yargs": "^15.0.0",
+        "chalk": "^4.0.0"
       },
-      "peerDependencies": {
-        "react": ">= 18.2.0",
-        "react-native": ">= 0.71.0"
+      "engines": {
+        "node": ">= 10.14.2"
       }
     },
-    "node_modules/react-native-animatable": {
-      "version": "1.3.3",
+    "node_modules/react-native-windows/node_modules/@react-native-community/cli": {
+      "version": "12.3.6",
       "license": "MIT",
+      "peer": true,
       "dependencies": {
-        "prop-types": "^15.7.2"
+        "@react-native-community/cli-clean": "12.3.6",
+        "@react-native-community/cli-config": "12.3.6",
+        "@react-native-community/cli-debugger-ui": "12.3.6",
+        "@react-native-community/cli-doctor": "12.3.6",
+        "@react-native-community/cli-hermes": "12.3.6",
+        "@react-native-community/cli-plugin-metro": "12.3.6",
+        "@react-native-community/cli-server-api": "12.3.6",
+        "@react-native-community/cli-tools": "12.3.6",
+        "@react-native-community/cli-types": "12.3.6",
+        "chalk": "^4.1.2",
+        "commander": "^9.4.1",
+        "deepmerge": "^4.3.0",
+        "execa": "^5.0.0",
+        "find-up": "^4.1.0",
+        "fs-extra": "^8.1.0",
+        "graceful-fs": "^4.1.3",
+        "prompts": "^2.4.2",
+        "semver": "^7.5.2"
+      },
+      "bin": {
+        "react-native": "build/bin.js"
+      },
+      "engines": {
+        "node": ">=18"
       }
     },
-    "node_modules/react-native-blob-util": {
-      "version": "0.19.4",
+    "node_modules/react-native-windows/node_modules/@react-native-community/cli-clean": {
+      "version": "12.3.6",
       "license": "MIT",
+      "peer": true,
       "dependencies": {
-        "base-64": "0.1.0",
-        "glob": "^7.2.3"
-      },
-      "peerDependencies": {
-        "react": "*",
-        "react-native": "*"
+        "@react-native-community/cli-tools": "12.3.6",
+        "chalk": "^4.1.2",
+        "execa": "^5.0.0"
       }
     },
-    "node_modules/react-native-blob-util/node_modules/glob": {
-      "version": "7.2.3",
-      "license": "ISC",
+    "node_modules/react-native-windows/node_modules/@react-native-community/cli-config": {
+      "version": "12.3.6",
+      "license": "MIT",
+      "peer": true,
       "dependencies": {
-        "fs.realpath": "^1.0.0",
-        "inflight": "^1.0.4",
-        "inherits": "2",
-        "minimatch": "^3.1.1",
-        "once": "^1.3.0",
-        "path-is-absolute": "^1.0.0"
-      },
-      "engines": {
-        "node": "*"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/isaacs"
+        "@react-native-community/cli-tools": "12.3.6",
+        "chalk": "^4.1.2",
+        "cosmiconfig": "^5.1.0",
+        "deepmerge": "^4.3.0",
+        "glob": "^7.1.3",
+        "joi": "^17.2.1"
       }
     },
-    "node_modules/react-native-clean-project": {
-      "version": "4.0.1",
-      "dev": true,
+    "node_modules/react-native-windows/node_modules/@react-native-community/cli-doctor": {
+      "version": "12.3.6",
       "license": "MIT",
-      "bin": {
-        "react-native-clean-project": "source/index.js"
-      },
-      "engines": {
-        "node": ">=10.0.0"
+      "peer": true,
+      "dependencies": {
+        "@react-native-community/cli-config": "12.3.6",
+        "@react-native-community/cli-platform-android": "12.3.6",
+        "@react-native-community/cli-platform-ios": "12.3.6",
+        "@react-native-community/cli-tools": "12.3.6",
+        "chalk": "^4.1.2",
+        "command-exists": "^1.2.8",
+        "deepmerge": "^4.3.0",
+        "envinfo": "^7.10.0",
+        "execa": "^5.0.0",
+        "hermes-profile-transformer": "^0.0.6",
+        "node-stream-zip": "^1.9.1",
+        "ora": "^5.4.1",
+        "semver": "^7.5.2",
+        "strip-ansi": "^5.2.0",
+        "wcwidth": "^1.0.1",
+        "yaml": "^2.2.1"
       }
     },
-    "node_modules/react-native-collapsible": {
-      "version": "1.6.1",
+    "node_modules/react-native-windows/node_modules/@react-native-community/cli-hermes": {
+      "version": "12.3.6",
       "license": "MIT",
-      "peerDependencies": {
-        "react": "*",
-        "react-native": "*"
+      "peer": true,
+      "dependencies": {
+        "@react-native-community/cli-platform-android": "12.3.6",
+        "@react-native-community/cli-tools": "12.3.6",
+        "chalk": "^4.1.2",
+        "hermes-profile-transformer": "^0.0.6"
       }
     },
-    "node_modules/react-native-config": {
-      "version": "1.5.0",
-      "resolved": "https://registry.npmjs.org/react-native-config/-/react-native-config-1.5.0.tgz",
-      "integrity": "sha512-slecooA/0tCwhb+RuWEbwLqtKirGh9vWPRpgDfH7uPAraCciqHNH2XjS9ylW+Spn4FUrHg5KWTqUGs9BdBADHg==",
-      "peerDependencies": {
-        "react-native-windows": ">=0.61"
-      },
-      "peerDependenciesMeta": {
-        "react-native-windows": {
-          "optional": true
-        }
+    "node_modules/react-native-windows/node_modules/@react-native-community/cli-platform-android": {
+      "version": "12.3.6",
+      "license": "MIT",
+      "peer": true,
+      "dependencies": {
+        "@react-native-community/cli-tools": "12.3.6",
+        "chalk": "^4.1.2",
+        "execa": "^5.0.0",
+        "fast-xml-parser": "^4.2.4",
+        "glob": "^7.1.3",
+        "logkitty": "^0.7.1"
       }
     },
-    "node_modules/react-native-device-info": {
-      "version": "10.3.1",
-      "resolved": "https://registry.npmjs.org/react-native-device-info/-/react-native-device-info-10.3.1.tgz",
-      "integrity": "sha512-KZU1luB7UrpRT8vYdWOoGJA0e2uAvF5J1Da90QMfLrtYBm1U0tbrlYO99qLCBRq7nQvBISlhqpqikzaS0vDYYw==",
-      "peerDependencies": {
-        "react-native": "*"
+    "node_modules/react-native-windows/node_modules/@react-native-community/cli-platform-ios": {
+      "version": "12.3.6",
+      "license": "MIT",
+      "peer": true,
+      "dependencies": {
+        "@react-native-community/cli-tools": "12.3.6",
+        "chalk": "^4.1.2",
+        "execa": "^5.0.0",
+        "fast-xml-parser": "^4.0.12",
+        "glob": "^7.1.3",
+        "ora": "^5.4.1"
       }
     },
-    "node_modules/react-native-document-picker": {
-      "version": "9.1.1",
+    "node_modules/react-native-windows/node_modules/@react-native-community/cli-types": {
+      "version": "12.3.6",
       "license": "MIT",
+      "peer": true,
       "dependencies": {
-        "invariant": "^2.2.4"
-      },
-      "peerDependencies": {
-        "react": "*",
-        "react-native": "*",
-        "react-native-windows": "*"
-      },
-      "peerDependenciesMeta": {
-        "react-native-windows": {
-          "optional": true
-        }
+        "joi": "^17.2.1"
       }
     },
-    "node_modules/react-native-draggable-flatlist": {
-      "version": "4.0.1",
+    "node_modules/react-native-windows/node_modules/@react-native/assets-registry": {
+      "version": "0.73.1",
+      "license": "MIT",
+      "peer": true,
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/react-native-windows/node_modules/@react-native/babel-plugin-codegen": {
+      "version": "0.73.4",
       "license": "MIT",
+      "peer": true,
       "dependencies": {
-        "@babel/preset-typescript": "^7.17.12"
+        "@react-native/codegen": "0.73.3"
       },
-      "peerDependencies": {
-        "react-native": ">=0.64.0",
-        "react-native-gesture-handler": ">=2.0.0",
-        "react-native-reanimated": ">=2.8.0"
+      "engines": {
+        "node": ">=18"
       }
     },
-    "node_modules/react-native-fs": {
-      "version": "2.20.0",
+    "node_modules/react-native-windows/node_modules/@react-native/babel-preset": {
+      "version": "0.73.21",
       "license": "MIT",
+      "peer": true,
       "dependencies": {
-        "base-64": "^0.1.0",
-        "utf8": "^3.0.0"
+        "@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-private-methods": "^7.22.5",
+        "@babel/plugin-transform-private-property-in-object": "^7.22.11",
+        "@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",
+        "@react-native/babel-plugin-codegen": "0.73.4",
+        "babel-plugin-transform-flow-enums": "^0.0.2",
+        "react-refresh": "^0.14.0"
       },
-      "peerDependencies": {
-        "react-native": "*",
-        "react-native-windows": "*"
+      "engines": {
+        "node": ">=18"
       },
-      "peerDependenciesMeta": {
-        "react-native-windows": {
-          "optional": true
-        }
+      "peerDependencies": {
+        "@babel/core": "*"
       }
     },
-    "node_modules/react-native-gesture-handler": {
-      "version": "2.14.1",
+    "node_modules/react-native-windows/node_modules/@react-native/codegen": {
+      "version": "0.73.3",
       "license": "MIT",
+      "peer": true,
       "dependencies": {
-        "@egjs/hammerjs": "^2.0.17",
-        "hoist-non-react-statics": "^3.3.0",
+        "@babel/parser": "^7.20.0",
+        "flow-parser": "^0.206.0",
+        "glob": "^7.1.1",
         "invariant": "^2.2.4",
-        "lodash": "^4.17.21",
-        "prop-types": "^15.7.2"
+        "jscodeshift": "^0.14.0",
+        "mkdirp": "^0.5.1",
+        "nullthrows": "^1.1.1"
+      },
+      "engines": {
+        "node": ">=18"
       },
       "peerDependencies": {
-        "react": "*",
-        "react-native": "*"
+        "@babel/preset-env": "^7.1.6"
       }
     },
-    "node_modules/react-native-google-places-autocomplete": {
-      "version": "2.5.6",
+    "node_modules/react-native-windows/node_modules/@react-native/community-cli-plugin": {
+      "version": "0.73.17",
       "license": "MIT",
+      "peer": true,
       "dependencies": {
-        "lodash.debounce": "^4.0.8",
-        "prop-types": "^15.7.2",
-        "qs": "~6.9.1"
+        "@react-native-community/cli-server-api": "12.3.6",
+        "@react-native-community/cli-tools": "12.3.6",
+        "@react-native/dev-middleware": "0.73.8",
+        "@react-native/metro-babel-transformer": "0.73.15",
+        "chalk": "^4.0.0",
+        "execa": "^5.1.1",
+        "metro": "^0.80.3",
+        "metro-config": "^0.80.3",
+        "metro-core": "^0.80.3",
+        "node-fetch": "^2.2.0",
+        "readline": "^1.3.0"
       },
-      "peerDependencies": {
-        "react-native": ">= 0.59"
+      "engines": {
+        "node": ">=18"
       }
     },
-    "node_modules/react-native-google-places-autocomplete/node_modules/qs": {
-      "version": "6.9.7",
+    "node_modules/react-native-windows/node_modules/@react-native/debugger-frontend": {
+      "version": "0.73.3",
       "license": "BSD-3-Clause",
+      "peer": true,
       "engines": {
-        "node": ">=0.6"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
+        "node": ">=18"
       }
     },
-    "node_modules/react-native-haptic-feedback": {
-      "version": "2.2.0",
+    "node_modules/react-native-windows/node_modules/@react-native/dev-middleware": {
+      "version": "0.73.8",
       "license": "MIT",
-      "peerDependencies": {
-        "react-native": ">=0.60.0"
+      "peer": true,
+      "dependencies": {
+        "@isaacs/ttlcache": "^1.4.1",
+        "@react-native/debugger-frontend": "0.73.3",
+        "chrome-launcher": "^0.15.2",
+        "chromium-edge-launcher": "^1.0.0",
+        "connect": "^3.6.5",
+        "debug": "^2.2.0",
+        "node-fetch": "^2.2.0",
+        "open": "^7.0.3",
+        "serve-static": "^1.13.1",
+        "temp-dir": "^2.0.0",
+        "ws": "^6.2.2"
+      },
+      "engines": {
+        "node": ">=18"
       }
     },
-    "node_modules/react-native-image-picker": {
-      "version": "7.0.3",
+    "node_modules/react-native-windows/node_modules/@react-native/gradle-plugin": {
+      "version": "0.73.4",
       "license": "MIT",
-      "peerDependencies": {
-        "react": "*",
-        "react-native": "*"
+      "peer": true,
+      "engines": {
+        "node": ">=18"
       }
     },
-    "node_modules/react-native-image-size": {
-      "version": "1.1.3",
-      "resolved": "git+ssh://git@github.com/Expensify/react-native-image-size.git#bf3ad41a61c4f6f80ed4d497599ef5247a2dd002",
-      "license": "MIT"
+    "node_modules/react-native-windows/node_modules/@react-native/js-polyfills": {
+      "version": "0.73.1",
+      "license": "MIT",
+      "peer": true,
+      "engines": {
+        "node": ">=18"
+      }
     },
-    "node_modules/react-native-key-command": {
-      "version": "1.0.8",
-      "resolved": "https://registry.npmjs.org/react-native-key-command/-/react-native-key-command-1.0.8.tgz",
-      "integrity": "sha512-9iih5hio+4RIYCYP2ZKoJb7w+eGo6E506okTBi+7oenu2oGwhTifBC30GU51Ea+h4SJgUufoQARbUvgjyLbI3w==",
+    "node_modules/react-native-windows/node_modules/@react-native/metro-babel-transformer": {
+      "version": "0.73.15",
+      "license": "MIT",
+      "peer": true,
       "dependencies": {
-        "eventemitter3": "^5.0.1",
-        "underscore": "^1.13.4"
+        "@babel/core": "^7.20.0",
+        "@react-native/babel-preset": "0.73.21",
+        "hermes-parser": "0.15.0",
+        "nullthrows": "^1.1.1"
+      },
+      "engines": {
+        "node": ">=18"
       },
       "peerDependencies": {
-        "react": "^18.1.0",
-        "react-dom": "18.1.0",
-        "react-native": "^0.70.4",
-        "react-native-web": "^0.19.7"
+        "@babel/core": "*"
       }
     },
-    "node_modules/react-native-key-command/node_modules/eventemitter3": {
-      "version": "5.0.1",
-      "license": "MIT"
+    "node_modules/react-native-windows/node_modules/@react-native/normalize-colors": {
+      "version": "0.73.2",
+      "license": "MIT",
+      "peer": true
     },
-    "node_modules/react-native-launch-arguments": {
-      "version": "4.0.2",
+    "node_modules/react-native-windows/node_modules/@react-native/virtualized-lists": {
+      "version": "0.73.4",
       "license": "MIT",
+      "peer": true,
+      "dependencies": {
+        "invariant": "^2.2.4",
+        "nullthrows": "^1.1.1"
+      },
+      "engines": {
+        "node": ">=18"
+      },
       "peerDependencies": {
-        "react": ">=16.8.1",
-        "react-native": ">=0.60.0-rc.0 <1.0.x"
+        "react-native": "*"
       }
     },
-    "node_modules/react-native-linear-gradient": {
-      "version": "2.8.1",
+    "node_modules/react-native-windows/node_modules/@types/yargs": {
+      "version": "15.0.19",
       "license": "MIT",
-      "peerDependencies": {
-        "react": "*",
-        "react-native": "*"
+      "peer": true,
+      "dependencies": {
+        "@types/yargs-parser": "*"
+      }
+    },
+    "node_modules/react-native-windows/node_modules/ansi-regex": {
+      "version": "5.0.1",
+      "license": "MIT",
+      "peer": true,
+      "engines": {
+        "node": ">=8"
       }
     },
-    "node_modules/react-native-localize": {
-      "version": "2.2.6",
+    "node_modules/react-native-windows/node_modules/ansi-styles": {
+      "version": "4.3.0",
       "license": "MIT",
-      "peerDependencies": {
-        "react": ">=16.8.6",
-        "react-native": ">=0.60.0",
-        "react-native-macos": ">=0.64.0",
-        "react-native-windows": ">=0.62.0"
+      "peer": true,
+      "dependencies": {
+        "color-convert": "^2.0.1"
       },
-      "peerDependenciesMeta": {
-        "react-native-macos": {
-          "optional": true
-        },
-        "react-native-windows": {
-          "optional": true
-        }
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
       }
     },
-    "node_modules/react-native-modal": {
-      "version": "13.0.1",
+    "node_modules/react-native-windows/node_modules/chalk": {
+      "version": "4.1.2",
       "license": "MIT",
+      "peer": true,
       "dependencies": {
-        "prop-types": "^15.6.2",
-        "react-native-animatable": "1.3.3"
+        "ansi-styles": "^4.1.0",
+        "supports-color": "^7.1.0"
       },
-      "peerDependencies": {
-        "react": "*",
-        "react-native": ">=0.65.0"
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/chalk?sponsor=1"
       }
     },
-    "node_modules/react-native-onyx": {
-      "version": "2.0.32",
-      "resolved": "https://registry.npmjs.org/react-native-onyx/-/react-native-onyx-2.0.32.tgz",
-      "integrity": "sha512-tB9wqMJGTLOYfrfplRP+9aq5JdD8w/hV/OZsMAVH+ewbE1zLY8OymUsAsIFdF1v+cB8HhehP569JVLZmhm6bsg==",
+    "node_modules/react-native-windows/node_modules/color-convert": {
+      "version": "2.0.1",
+      "license": "MIT",
+      "peer": true,
       "dependencies": {
-        "ascii-table": "0.0.9",
-        "fast-equals": "^4.0.3",
-        "underscore": "^1.13.6"
+        "color-name": "~1.1.4"
       },
       "engines": {
-        "node": ">=20.10.0",
-        "npm": ">=10.2.3"
-      },
-      "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": "^5.1.0",
-        "react-native-quick-sqlite": "^8.0.0-beta.2"
-      },
-      "peerDependenciesMeta": {
-        "idb-keyval": {
-          "optional": true
-        },
-        "react-native-device-info": {
-          "optional": true
-        },
-        "react-native-performance": {
-          "optional": true
-        },
-        "react-native-quick-sqlite": {
-          "optional": true
-        }
+        "node": ">=7.0.0"
       }
     },
-    "node_modules/react-native-pager-view": {
-      "version": "6.2.3",
-      "resolved": "https://registry.npmjs.org/react-native-pager-view/-/react-native-pager-view-6.2.3.tgz",
-      "integrity": "sha512-dqVpXWFtPNfD3D2QQQr8BP+ullS5MhjRJuF8Z/qml4QTILcrWaW8F5iAxKkQR3Jl0ikcEryG/+SQlNcwlo0Ggg==",
-      "peerDependencies": {
-        "react": "*",
-        "react-native": "*"
+    "node_modules/react-native-windows/node_modules/color-name": {
+      "version": "1.1.4",
+      "license": "MIT",
+      "peer": true
+    },
+    "node_modules/react-native-windows/node_modules/commander": {
+      "version": "9.5.0",
+      "license": "MIT",
+      "peer": true,
+      "engines": {
+        "node": "^12.20.0 || >=14"
       }
     },
-    "node_modules/react-native-pdf": {
-      "version": "6.7.3",
+    "node_modules/react-native-windows/node_modules/cosmiconfig": {
+      "version": "5.2.1",
       "license": "MIT",
+      "peer": true,
       "dependencies": {
-        "crypto-js": "4.2.0",
-        "deprecated-react-native-prop-types": "^2.3.0"
+        "import-fresh": "^2.0.0",
+        "is-directory": "^0.3.1",
+        "js-yaml": "^3.13.1",
+        "parse-json": "^4.0.0"
       },
-      "peerDependencies": {
-        "react": "*",
-        "react-native": "*",
-        "react-native-blob-util": ">=0.13.7"
+      "engines": {
+        "node": ">=4"
       }
     },
-    "node_modules/react-native-performance": {
-      "version": "5.1.0",
+    "node_modules/react-native-windows/node_modules/debug": {
+      "version": "2.6.9",
       "license": "MIT",
-      "peerDependencies": {
-        "react-native": "*"
+      "peer": true,
+      "dependencies": {
+        "ms": "2.0.0"
       }
     },
-    "node_modules/react-native-permissions": {
-      "version": "3.9.3",
+    "node_modules/react-native-windows/node_modules/deprecated-react-native-prop-types": {
+      "version": "5.0.0",
       "license": "MIT",
-      "peerDependencies": {
-        "react": ">=16.13.1",
-        "react-native": ">=0.63.3",
-        "react-native-windows": ">=0.62.0"
+      "peer": true,
+      "dependencies": {
+        "@react-native/normalize-colors": "^0.73.0",
+        "invariant": "^2.2.4",
+        "prop-types": "^15.8.1"
       },
-      "peerDependenciesMeta": {
-        "react-native-windows": {
-          "optional": true
-        }
+      "engines": {
+        "node": ">=18"
       }
     },
-    "node_modules/react-native-picker-select": {
-      "version": "8.1.0",
-      "resolved": "git+ssh://git@github.com/Expensify/react-native-picker-select.git#da50d2c5c54e268499047f9cc98b8df4196c1ddf",
-      "integrity": "sha512-iASqj8cXSQY+P3ZhfW1eoVcK0UB+TRTddrNSQ3lmIH0a4lYO3m4XJC+cnoCjjPl/sTzUaShpOnpBfqMueR6UMA==",
+    "node_modules/react-native-windows/node_modules/find-up": {
+      "version": "4.1.0",
       "license": "MIT",
+      "peer": true,
       "dependencies": {
-        "lodash.isequal": "^4.5.0"
+        "locate-path": "^5.0.0",
+        "path-exists": "^4.0.0"
       },
-      "peerDependencies": {
-        "@react-native-picker/picker": ">=2.1.0"
+      "engines": {
+        "node": ">=8"
       }
     },
-    "node_modules/react-native-plaid-link-sdk": {
-      "version": "11.5.0",
-      "resolved": "https://registry.npmjs.org/react-native-plaid-link-sdk/-/react-native-plaid-link-sdk-11.5.0.tgz",
-      "integrity": "sha512-B3fwujxBS9nZwadXFcseU3nrYG7Ptob6p9eG/gXde65cqwErMaq2k1rVv3R17s/rpKnmU5Cx5pKOMmkxPUn08w==",
-      "peerDependencies": {
-        "react": "*",
-        "react-native": "*"
+    "node_modules/react-native-windows/node_modules/flow-parser": {
+      "version": "0.206.0",
+      "license": "MIT",
+      "peer": true,
+      "engines": {
+        "node": ">=0.4.0"
       }
     },
-    "node_modules/react-native-qrcode-svg": {
-      "version": "6.2.0",
+    "node_modules/react-native-windows/node_modules/fs-extra": {
+      "version": "8.1.0",
       "license": "MIT",
+      "peer": true,
       "dependencies": {
-        "prop-types": "^15.8.0",
-        "qrcode": "^1.5.1"
+        "graceful-fs": "^4.2.0",
+        "jsonfile": "^4.0.0",
+        "universalify": "^0.1.0"
       },
-      "peerDependencies": {
-        "react": "*",
-        "react-native": ">=0.63.4",
-        "react-native-svg": "^13.2.0"
+      "engines": {
+        "node": ">=6 <7 || >=8"
       }
     },
-    "node_modules/react-native-quick-sqlite": {
-      "version": "8.0.6",
-      "resolved": "git+ssh://git@github.com/margelo/react-native-quick-sqlite.git#abc91857d4b3efb2020ec43abd2a508563b64316",
-      "integrity": "sha512-/tBM6Oh8ye3d+hIhURRA9hlBausKqQmscgyt4ZcKluPjBti0bgLb0cyL8Gyd0cbCakaVgym25VyGjaeicV/01A==",
+    "node_modules/react-native-windows/node_modules/has-flag": {
+      "version": "4.0.0",
       "license": "MIT",
-      "peerDependencies": {
-        "react": "*",
-        "react-native": "*"
+      "peer": true,
+      "engines": {
+        "node": ">=8"
       }
     },
-    "node_modules/react-native-reanimated": {
-      "version": "3.7.2",
+    "node_modules/react-native-windows/node_modules/hermes-estree": {
+      "version": "0.15.0",
+      "license": "MIT",
+      "peer": true
+    },
+    "node_modules/react-native-windows/node_modules/hermes-parser": {
+      "version": "0.15.0",
       "license": "MIT",
+      "peer": true,
       "dependencies": {
-        "@babel/plugin-transform-object-assign": "^7.16.7",
-        "@babel/preset-typescript": "^7.16.7",
-        "convert-source-map": "^2.0.0",
-        "invariant": "^2.2.4"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0",
-        "@babel/plugin-proposal-nullish-coalescing-operator": "^7.0.0-0",
-        "@babel/plugin-proposal-optional-chaining": "^7.0.0-0",
-        "@babel/plugin-transform-arrow-functions": "^7.0.0-0",
-        "@babel/plugin-transform-shorthand-properties": "^7.0.0-0",
-        "@babel/plugin-transform-template-literals": "^7.0.0-0",
-        "react": "*",
-        "react-native": "*"
+        "hermes-estree": "0.15.0"
       }
     },
-    "node_modules/react-native-reanimated/node_modules/convert-source-map": {
+    "node_modules/react-native-windows/node_modules/import-fresh": {
       "version": "2.0.0",
-      "license": "MIT"
-    },
-    "node_modules/react-native-release-profiler": {
-      "version": "0.1.6",
       "license": "MIT",
-      "workspaces": [
-        "example"
-      ],
+      "peer": true,
       "dependencies": {
-        "@react-native-community/cli": "^12.2.1",
-        "commander": "^11.1.0"
-      },
-      "bin": {
-        "react-native-release-profiler": "lib/commonjs/cli.js"
+        "caller-path": "^2.0.0",
+        "resolve-from": "^3.0.0"
       },
       "engines": {
-        "node": ">= 18.0.0"
-      },
-      "peerDependencies": {
-        "react": "*",
-        "react-native": "*"
+        "node": ">=4"
       }
     },
-    "node_modules/react-native-release-profiler/node_modules/commander": {
-      "version": "11.1.0",
+    "node_modules/react-native-windows/node_modules/jsonfile": {
+      "version": "4.0.0",
       "license": "MIT",
-      "engines": {
-        "node": ">=16"
+      "peer": true,
+      "optionalDependencies": {
+        "graceful-fs": "^4.1.6"
       }
     },
-    "node_modules/react-native-render-html": {
-      "version": "6.3.1",
-      "license": "BSD-2-Clause",
+    "node_modules/react-native-windows/node_modules/locate-path": {
+      "version": "5.0.0",
+      "license": "MIT",
+      "peer": true,
       "dependencies": {
-        "@jsamr/counter-style": "^2.0.1",
-        "@jsamr/react-native-li": "^2.3.0",
-        "@native-html/transient-render-engine": "11.2.2",
-        "@types/ramda": "^0.27.40",
-        "@types/urijs": "^1.19.15",
-        "prop-types": "^15.5.7",
-        "ramda": "^0.27.1",
-        "stringify-entities": "^3.1.0",
-        "urijs": "^1.19.6"
+        "p-locate": "^4.1.0"
       },
-      "peerDependencies": {
-        "react": "*",
-        "react-native": "*"
+      "engines": {
+        "node": ">=8"
       }
     },
-    "node_modules/react-native-render-html/node_modules/@native-html/transient-render-engine": {
-      "version": "11.2.2",
+    "node_modules/react-native-windows/node_modules/mkdirp": {
+      "version": "0.5.6",
       "license": "MIT",
+      "peer": true,
       "dependencies": {
-        "@native-html/css-processor": "1.11.0",
-        "@types/ramda": "^0.27.44",
-        "csstype": "^3.0.9",
-        "domelementtype": "^2.2.0",
-        "domhandler": "^4.2.2",
-        "domutils": "^2.8.0",
-        "htmlparser2": "^7.1.2",
-        "ramda": "^0.27.1"
+        "minimist": "^1.2.6"
       },
-      "peerDependencies": {
-        "@types/react-native": "*",
-        "react-native": "^*"
+      "bin": {
+        "mkdirp": "bin/cmd.js"
       }
     },
-    "node_modules/react-native-render-html/node_modules/ramda": {
-      "version": "0.27.2",
-      "license": "MIT"
-    },
-    "node_modules/react-native-safe-area-context": {
-      "version": "4.8.2",
+    "node_modules/react-native-windows/node_modules/ms": {
+      "version": "2.0.0",
       "license": "MIT",
-      "peerDependencies": {
-        "react": "*",
-        "react-native": "*"
-      }
+      "peer": true
     },
-    "node_modules/react-native-screens": {
-      "version": "3.30.1",
-      "resolved": "https://registry.npmjs.org/react-native-screens/-/react-native-screens-3.30.1.tgz",
-      "integrity": "sha512-/muEvjocCtFb+j5J3YmLvB25+f4rIU8hnnxgGTkXcAf2omPBY8uhPjJaaFUlvj64VEoEzJcRpugbXWsjfPPIFg==",
+    "node_modules/react-native-windows/node_modules/open": {
+      "version": "7.4.2",
+      "license": "MIT",
+      "peer": true,
       "dependencies": {
-        "react-freeze": "^1.0.0",
-        "warn-once": "^0.1.0"
+        "is-docker": "^2.0.0",
+        "is-wsl": "^2.1.1"
       },
-      "peerDependencies": {
-        "react": "*",
-        "react-native": "*"
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/react-native-share": {
-      "version": "10.0.2",
+    "node_modules/react-native-windows/node_modules/p-limit": {
+      "version": "2.3.0",
       "license": "MIT",
+      "peer": true,
+      "dependencies": {
+        "p-try": "^2.0.0"
+      },
       "engines": {
-        "node": ">=16"
+        "node": ">=6"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/react-native-sound": {
-      "version": "0.11.2",
+    "node_modules/react-native-windows/node_modules/p-locate": {
+      "version": "4.1.0",
       "license": "MIT",
-      "peerDependencies": {
-        "react-native": ">=0.8.0"
+      "peer": true,
+      "dependencies": {
+        "p-limit": "^2.2.0"
+      },
+      "engines": {
+        "node": ">=8"
       }
     },
-    "node_modules/react-native-svg": {
-      "version": "14.1.0",
+    "node_modules/react-native-windows/node_modules/parse-json": {
+      "version": "4.0.0",
       "license": "MIT",
+      "peer": true,
       "dependencies": {
-        "css-select": "^5.1.0",
-        "css-tree": "^1.1.3"
+        "error-ex": "^1.3.1",
+        "json-parse-better-errors": "^1.0.1"
       },
-      "peerDependencies": {
-        "react": "*",
-        "react-native": "*"
+      "engines": {
+        "node": ">=4"
       }
     },
-    "node_modules/react-native-tab-view": {
-      "version": "3.5.2",
+    "node_modules/react-native-windows/node_modules/path-exists": {
+      "version": "4.0.0",
       "license": "MIT",
+      "peer": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/react-native-windows/node_modules/pretty-format": {
+      "version": "26.6.2",
+      "license": "MIT",
+      "peer": true,
       "dependencies": {
-        "use-latest-callback": "^0.1.5"
+        "@jest/types": "^26.6.2",
+        "ansi-regex": "^5.0.0",
+        "ansi-styles": "^4.0.0",
+        "react-is": "^17.0.1"
       },
-      "peerDependencies": {
-        "react": "*",
-        "react-native": "*",
-        "react-native-pager-view": "*"
+      "engines": {
+        "node": ">= 10"
       }
     },
-    "node_modules/react-native-url-polyfill": {
-      "version": "2.0.0",
+    "node_modules/react-native-windows/node_modules/promise": {
+      "version": "8.3.0",
       "license": "MIT",
+      "peer": true,
       "dependencies": {
-        "whatwg-url-without-unicode": "8.0.0-3"
-      },
-      "peerDependencies": {
-        "react-native": "*"
+        "asap": "~2.0.6"
       }
     },
-    "node_modules/react-native-view-shot": {
-      "version": "3.8.0",
+    "node_modules/react-native-windows/node_modules/react-devtools-core": {
+      "version": "4.28.5",
       "license": "MIT",
+      "peer": true,
       "dependencies": {
-        "html2canvas": "^1.4.1"
-      },
-      "peerDependencies": {
-        "react": "*",
-        "react-native": "*"
+        "shell-quote": "^1.6.1",
+        "ws": "^7"
       }
     },
-    "node_modules/react-native-vision-camera": {
-      "version": "4.0.0-beta.13",
-      "resolved": "https://registry.npmjs.org/react-native-vision-camera/-/react-native-vision-camera-4.0.0-beta.13.tgz",
-      "integrity": "sha512-a5ypYsr9XsERfx2UCmL1oSMC/Irra6X0Ixv0/hCgM/2ndt/aK94A6FwONr1kA/GRyU67ekOhk8HwUfxx+hi6dQ==",
+    "node_modules/react-native-windows/node_modules/react-devtools-core/node_modules/ws": {
+      "version": "7.5.9",
+      "license": "MIT",
+      "peer": true,
+      "engines": {
+        "node": ">=8.3.0"
+      },
       "peerDependencies": {
-        "react": "*",
-        "react-native": "*",
-        "react-native-worklets-core": "*"
+        "bufferutil": "^4.0.1",
+        "utf-8-validate": "^5.0.2"
       },
       "peerDependenciesMeta": {
-        "react-native-worklets-core": {
+        "bufferutil": {
+          "optional": true
+        },
+        "utf-8-validate": {
           "optional": true
         }
       }
     },
-    "node_modules/react-native-web": {
-      "version": "0.19.9",
+    "node_modules/react-native-windows/node_modules/react-is": {
+      "version": "17.0.2",
       "license": "MIT",
-      "dependencies": {
-        "@babel/runtime": "^7.18.6",
-        "@react-native/normalize-color": "^2.1.0",
-        "fbjs": "^3.0.4",
-        "inline-style-prefixer": "^6.0.1",
-        "memoize-one": "^6.0.0",
-        "nullthrows": "^1.1.1",
-        "postcss-value-parser": "^4.2.0",
-        "styleq": "^0.1.3"
-      },
-      "peerDependencies": {
-        "react": "^18.0.0",
-        "react-dom": "^18.0.0"
-      }
+      "peer": true
     },
-    "node_modules/react-native-web-linear-gradient": {
-      "version": "1.1.2",
+    "node_modules/react-native-windows/node_modules/resolve-from": {
+      "version": "3.0.0",
       "license": "MIT",
-      "peerDependencies": {
-        "react-native-web": "*"
+      "peer": true,
+      "engines": {
+        "node": ">=4"
       }
     },
-    "node_modules/react-native-web-sound": {
-      "version": "0.1.3",
+    "node_modules/react-native-windows/node_modules/strip-ansi": {
+      "version": "5.2.0",
       "license": "MIT",
+      "peer": true,
       "dependencies": {
-        "howler": "^2.2.1"
+        "ansi-regex": "^4.1.0"
       },
-      "peerDependencies": {
-        "react-native-web": "*"
+      "engines": {
+        "node": ">=6"
       }
     },
-    "node_modules/react-native-web/node_modules/memoize-one": {
-      "version": "6.0.0",
-      "license": "MIT"
+    "node_modules/react-native-windows/node_modules/strip-ansi/node_modules/ansi-regex": {
+      "version": "4.1.1",
+      "license": "MIT",
+      "peer": true,
+      "engines": {
+        "node": ">=6"
+      }
     },
-    "node_modules/react-native-webview": {
-      "version": "13.6.4",
-      "resolved": "https://registry.npmjs.org/react-native-webview/-/react-native-webview-13.6.4.tgz",
-      "integrity": "sha512-AdgmaMBHPcyERTvng9eSGgHX6AleyUlSusWAxngSOSdiYGgHW81T6C5A8j/ImJAF9oZg0bQDxp43Hu56tzENZQ==",
+    "node_modules/react-native-windows/node_modules/supports-color": {
+      "version": "7.2.0",
+      "license": "MIT",
+      "peer": true,
       "dependencies": {
-        "escape-string-regexp": "2.0.0",
-        "invariant": "2.2.4"
+        "has-flag": "^4.0.0"
       },
-      "peerDependencies": {
-        "react": "*",
-        "react-native": "*"
+      "engines": {
+        "node": ">=8"
       }
     },
-    "node_modules/react-native-webview/node_modules/escape-string-regexp": {
-      "version": "2.0.0",
+    "node_modules/react-native-windows/node_modules/universalify": {
+      "version": "0.1.2",
       "license": "MIT",
+      "peer": true,
       "engines": {
-        "node": ">=8"
+        "node": ">= 4.0.0"
+      }
+    },
+    "node_modules/react-native-windows/node_modules/ws": {
+      "version": "6.2.2",
+      "license": "MIT",
+      "peer": true,
+      "dependencies": {
+        "async-limiter": "~1.0.0"
       }
     },
     "node_modules/react-native/node_modules/@jest/types": {
       "version": "26.6.2",
-      "resolved": "https://registry.npmjs.org/@jest/types/-/types-26.6.2.tgz",
-      "integrity": "sha512-fC6QCp7Sc5sX6g8Tvbmj4XUTbyrik0akgRy03yjXbQaBWWNWGE7SGtJk98m0N8nzegD/7SggrUlivxo5ax4KWQ==",
+      "license": "MIT",
       "dependencies": {
         "@types/istanbul-lib-coverage": "^2.0.0",
         "@types/istanbul-reports": "^3.0.0",
@@ -31807,10 +39340,14 @@
         "node": ">= 10.14.2"
       }
     },
+    "node_modules/react-native/node_modules/@react-native/normalize-colors": {
+      "version": "0.75.2",
+      "resolved": "https://registry.npmjs.org/@react-native/normalize-colors/-/normalize-colors-0.75.2.tgz",
+      "integrity": "sha512-nPwWJFtsqNFS/qSG9yDOiSJ64mjG7RCP4X/HXFfyWzCM1jq49h/DYBdr+c3e7AvTKGIdy0gGT3vgaRUHZFVdUQ=="
+    },
     "node_modules/react-native/node_modules/@types/yargs": {
       "version": "15.0.19",
-      "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-15.0.19.tgz",
-      "integrity": "sha512-2XUaGVmyQjgyAZldf0D0c14vvo/yv0MhQBSTJcejMMaitsn3nxCB6TmH4G0ZQf+uxROOa9mpanoSm8h6SG/1ZA==",
+      "license": "MIT",
       "dependencies": {
         "@types/yargs-parser": "*"
       }
@@ -31837,8 +39374,7 @@
     },
     "node_modules/react-native/node_modules/chalk": {
       "version": "4.1.2",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
-      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
+      "license": "MIT",
       "dependencies": {
         "ansi-styles": "^4.1.0",
         "supports-color": "^7.1.0"
@@ -31864,22 +39400,9 @@
       "version": "1.1.4",
       "license": "MIT"
     },
-    "node_modules/react-native/node_modules/deprecated-react-native-prop-types": {
-      "version": "5.0.0",
-      "license": "MIT",
-      "dependencies": {
-        "@react-native/normalize-colors": "^0.73.0",
-        "invariant": "^2.2.4",
-        "prop-types": "^15.8.1"
-      },
-      "engines": {
-        "node": ">=18"
-      }
-    },
     "node_modules/react-native/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==",
+      "license": "MIT",
       "engines": {
         "node": ">=8"
       }
@@ -31914,28 +39437,40 @@
         "asap": "~2.0.6"
       }
     },
-    "node_modules/react-native/node_modules/react-is": {
-      "version": "17.0.2",
-      "license": "MIT"
-    },
-    "node_modules/react-native/node_modules/react-refresh": {
-      "version": "0.14.0",
+    "node_modules/react-native/node_modules/react-devtools-core": {
+      "version": "5.3.1",
       "license": "MIT",
-      "engines": {
-        "node": ">=0.10.0"
+      "dependencies": {
+        "shell-quote": "^1.6.1",
+        "ws": "^7"
       }
     },
-    "node_modules/react-native/node_modules/scheduler": {
-      "version": "0.24.0-canary-efb381bbf-20230505",
+    "node_modules/react-native/node_modules/react-devtools-core/node_modules/ws": {
+      "version": "7.5.10",
       "license": "MIT",
-      "dependencies": {
-        "loose-envify": "^1.1.0"
+      "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/node_modules/react-is": {
+      "version": "17.0.2",
+      "license": "MIT"
+    },
     "node_modules/react-native/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==",
+      "license": "MIT",
       "dependencies": {
         "has-flag": "^4.0.0"
       },
@@ -31951,9 +39486,8 @@
       }
     },
     "node_modules/react-pdf": {
-      "version": "7.7.1",
-      "resolved": "https://registry.npmjs.org/react-pdf/-/react-pdf-7.7.1.tgz",
-      "integrity": "sha512-cbbf/PuRtGcPPw+HLhMI1f6NSka8OJgg+j/yPWTe95Owf0fK6gmVY7OXpTxMeh92O3T3K3EzfE0ML0eXPGwR5g==",
+      "version": "7.7.3",
+      "license": "MIT",
       "dependencies": {
         "clsx": "^2.0.0",
         "dequal": "^2.0.3",
@@ -32018,6 +39552,58 @@
       "version": "17.0.2",
       "license": "MIT"
     },
+    "node_modules/react-refresh": {
+      "version": "0.14.2",
+      "license": "MIT",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/react-remove-scroll": {
+      "version": "2.5.7",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "react-remove-scroll-bar": "^2.3.4",
+        "react-style-singleton": "^2.2.1",
+        "tslib": "^2.1.0",
+        "use-callback-ref": "^1.3.0",
+        "use-sidecar": "^1.1.2"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "peerDependencies": {
+        "@types/react": "^16.8.0 || ^17.0.0 || ^18.0.0",
+        "react": "^16.8.0 || ^17.0.0 || ^18.0.0"
+      },
+      "peerDependenciesMeta": {
+        "@types/react": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/react-remove-scroll-bar": {
+      "version": "2.3.6",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "react-style-singleton": "^2.2.1",
+        "tslib": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "peerDependencies": {
+        "@types/react": "^16.8.0 || ^17.0.0 || ^18.0.0",
+        "react": "^16.8.0 || ^17.0.0 || ^18.0.0"
+      },
+      "peerDependenciesMeta": {
+        "@types/react": {
+          "optional": true
+        }
+      }
+    },
     "node_modules/react-script-hook": {
       "version": "1.7.2",
       "license": "MIT",
@@ -32037,24 +39623,44 @@
         "react": "^16.0.0 || ^17.0.0 || ^18.0.0"
       }
     },
+    "node_modules/react-style-singleton": {
+      "version": "2.2.1",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "get-nonce": "^1.0.0",
+        "invariant": "^2.2.4",
+        "tslib": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "peerDependencies": {
+        "@types/react": "^16.8.0 || ^17.0.0 || ^18.0.0",
+        "react": "^16.8.0 || ^17.0.0 || ^18.0.0"
+      },
+      "peerDependenciesMeta": {
+        "@types/react": {
+          "optional": true
+        }
+      }
+    },
     "node_modules/react-test-renderer": {
-      "version": "18.2.0",
+      "version": "18.3.1",
+      "dev": true,
       "license": "MIT",
       "dependencies": {
-        "react-is": "^18.2.0",
+        "react-is": "^18.3.1",
         "react-shallow-renderer": "^16.15.0",
-        "scheduler": "^0.23.0"
+        "scheduler": "^0.23.2"
       },
       "peerDependencies": {
-        "react": "^18.2.0"
+        "react": "^18.3.1"
       }
     },
-    "node_modules/react-test-renderer/node_modules/react-is": {
-      "version": "18.2.0",
-      "license": "MIT"
-    },
     "node_modules/react-test-renderer/node_modules/scheduler": {
-      "version": "0.23.0",
+      "version": "0.23.2",
+      "dev": true,
       "license": "MIT",
       "dependencies": {
         "loose-envify": "^1.1.0"
@@ -32467,8 +40073,7 @@
     },
     "node_modules/react-window": {
       "version": "1.8.10",
-      "resolved": "https://registry.npmjs.org/react-window/-/react-window-1.8.10.tgz",
-      "integrity": "sha512-Y0Cx+dnU6NLa5/EvoHukUD0BklJ8qITCtVEPY1C/nL8wwoZ0b5aEw8Ff1dOVHw7fCzMt55XfJDd8S8W8LCaUCg==",
+      "license": "MIT",
       "dependencies": {
         "@babel/runtime": "^7.0.0",
         "memoize-one": ">=3.1.1 <6"
@@ -32481,6 +40086,17 @@
         "react-dom": "^15.0.0 || ^16.0.0 || ^17.0.0 || ^18.0.0"
       }
     },
+    "node_modules/read-binary-file-arch": {
+      "version": "1.0.6",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "debug": "^4.3.4"
+      },
+      "bin": {
+        "read-binary-file-arch": "cli.js"
+      }
+    },
     "node_modules/read-cmd-shim": {
       "version": "4.0.0",
       "license": "ISC",
@@ -32489,16 +40105,16 @@
       }
     },
     "node_modules/read-config-file": {
-      "version": "6.3.2",
+      "version": "6.4.0",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "config-file-ts": "^0.2.4",
-        "dotenv": "^9.0.2",
-        "dotenv-expand": "^5.1.0",
+        "config-file-ts": "0.2.8-rc1",
+        "dotenv": "^16.4.5",
+        "dotenv-expand": "^11.0.6",
         "js-yaml": "^4.1.0",
-        "json5": "^2.2.0",
-        "lazy-val": "^1.0.4"
+        "json5": "^2.2.3",
+        "lazy-val": "^1.0.5"
       },
       "engines": {
         "node": ">=12.0.0"
@@ -32509,14 +40125,6 @@
       "dev": true,
       "license": "Python-2.0"
     },
-    "node_modules/read-config-file/node_modules/dotenv": {
-      "version": "9.0.2",
-      "dev": true,
-      "license": "BSD-2-Clause",
-      "engines": {
-        "node": ">=10"
-      }
-    },
     "node_modules/read-config-file/node_modules/js-yaml": {
       "version": "4.1.0",
       "dev": true,
@@ -32528,23 +40136,10 @@
         "js-yaml": "bin/js-yaml.js"
       }
     },
-    "node_modules/read-pkg": {
-      "version": "4.0.1",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "normalize-package-data": "^2.3.2",
-        "parse-json": "^4.0.0",
-        "pify": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=6"
-      }
-    },
     "node_modules/read-pkg-up": {
       "version": "7.0.1",
-      "resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-7.0.1.tgz",
-      "integrity": "sha512-zK0TB7Xd6JpCLmlLmufqykGE+/TlOePD6qKClNW7hHDKFh/J7/7gCWGR7joEQEW1bKq3a3yUZSObOoWLFQ4ohg==",
+      "dev": true,
+      "license": "MIT",
       "dependencies": {
         "find-up": "^4.1.0",
         "read-pkg": "^5.2.0",
@@ -32559,8 +40154,8 @@
     },
     "node_modules/read-pkg-up/node_modules/find-up": {
       "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz",
-      "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==",
+      "dev": true,
+      "license": "MIT",
       "dependencies": {
         "locate-path": "^5.0.0",
         "path-exists": "^4.0.0"
@@ -32571,8 +40166,8 @@
     },
     "node_modules/read-pkg-up/node_modules/locate-path": {
       "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz",
-      "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==",
+      "dev": true,
+      "license": "MIT",
       "dependencies": {
         "p-locate": "^4.1.0"
       },
@@ -32582,8 +40177,8 @@
     },
     "node_modules/read-pkg-up/node_modules/p-limit": {
       "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz",
-      "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==",
+      "dev": true,
+      "license": "MIT",
       "dependencies": {
         "p-try": "^2.0.0"
       },
@@ -32596,8 +40191,8 @@
     },
     "node_modules/read-pkg-up/node_modules/p-locate": {
       "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz",
-      "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==",
+      "dev": true,
+      "license": "MIT",
       "dependencies": {
         "p-limit": "^2.2.0"
       },
@@ -32607,16 +40202,16 @@
     },
     "node_modules/read-pkg-up/node_modules/path-exists": {
       "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz",
-      "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==",
+      "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=8"
       }
     },
     "node_modules/read-pkg-up/node_modules/read-pkg": {
       "version": "5.2.0",
-      "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-5.2.0.tgz",
-      "integrity": "sha512-Ug69mNOpfvKDAc2Q8DRpMjjzdtrnv9HcSMX+4VsZxD1aZ6ZzrIE7rlzXBtWTyhULSMKg076AW6WR5iZpD0JiOg==",
+      "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@types/normalize-package-data": "^2.4.0",
         "normalize-package-data": "^2.5.0",
@@ -32629,38 +40224,18 @@
     },
     "node_modules/read-pkg-up/node_modules/read-pkg/node_modules/type-fest": {
       "version": "0.6.0",
-      "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.6.0.tgz",
-      "integrity": "sha512-q+MB8nYR1KDLrgr4G5yemftpMC7/QLqVndBmEEdqzmNj5dcFOO4Oo8qlwZE3ULT3+Zim1F8Kq4cBnikNhlCMlg==",
+      "dev": true,
+      "license": "(MIT OR CC0-1.0)",
       "engines": {
         "node": ">=8"
       }
     },
     "node_modules/read-pkg-up/node_modules/type-fest": {
       "version": "0.8.1",
-      "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.8.1.tgz",
-      "integrity": "sha512-4dbzIzqvjtgiM5rw1k5rEHtBANKmdudhGyBEajN01fEyhaAIhsoKNy6y7+IN93IfpFtwY9iqi7kD+xwKhQsNJA==",
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/read-pkg/node_modules/parse-json": {
-      "version": "4.0.0",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "error-ex": "^1.3.1",
-        "json-parse-better-errors": "^1.0.1"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/read-pkg/node_modules/pify": {
-      "version": "3.0.0",
       "dev": true,
-      "license": "MIT",
+      "license": "(MIT OR CC0-1.0)",
       "engines": {
-        "node": ">=4"
+        "node": ">=8"
       }
     },
     "node_modules/readable-stream": {
@@ -32712,6 +40287,7 @@
     },
     "node_modules/readdirp": {
       "version": "3.6.0",
+      "devOptional": true,
       "license": "MIT",
       "dependencies": {
         "picomatch": "^2.2.1"
@@ -32722,23 +40298,26 @@
     },
     "node_modules/readline": {
       "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/readline/-/readline-1.3.0.tgz",
-      "integrity": "sha512-k2d6ACCkiNYz222Fs/iNze30rRJ1iIicW7JuX/7/cozvih6YCkFZH+J6mAFDVgv0dRBaAyr4jDqC95R2y4IADg=="
+      "license": "BSD"
     },
     "node_modules/reassure": {
-      "version": "0.10.1",
+      "version": "1.0.0-rc.4",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@callstack/reassure-cli": "0.10.0",
-        "@callstack/reassure-danger": "0.1.1",
-        "@callstack/reassure-measure": "0.6.0"
+        "@callstack/reassure-cli": "1.0.0-rc.4",
+        "@callstack/reassure-compare": "1.0.0-rc.4",
+        "@callstack/reassure-danger": "1.0.0-rc.4",
+        "@callstack/reassure-measure": "1.0.0-rc.4",
+        "import-local": "^3.1.0"
+      },
+      "bin": {
+        "reassure": "lib/commonjs/bin/reassure.js"
       }
     },
     "node_modules/recast": {
       "version": "0.21.5",
-      "resolved": "https://registry.npmjs.org/recast/-/recast-0.21.5.tgz",
-      "integrity": "sha512-hjMmLaUXAm1hIuTqOdeYObMslq/q+Xff6QE3Y2P+uoHAg2nmVlLBps2hzh1UJDdMtDTMXOFewK6ky51JQIeECg==",
+      "license": "MIT",
       "dependencies": {
         "ast-types": "0.15.2",
         "esprima": "~4.0.0",
@@ -32751,8 +40330,7 @@
     },
     "node_modules/recast/node_modules/ast-types": {
       "version": "0.15.2",
-      "resolved": "https://registry.npmjs.org/ast-types/-/ast-types-0.15.2.tgz",
-      "integrity": "sha512-c27loCv9QkZinsa5ProX751khO9DJl/AcB5c2KNtA6NRvHKS0PgLfcftz72KVq504vB0Gku5s2kUZzDBvQWvHg==",
+      "license": "MIT",
       "dependencies": {
         "tslib": "^2.0.1"
       },
@@ -32760,11 +40338,17 @@
         "node": ">=4"
       }
     },
+    "node_modules/recast/node_modules/source-map": {
+      "version": "0.6.1",
+      "license": "BSD-3-Clause",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
     "node_modules/rechoir": {
       "version": "0.8.0",
-      "resolved": "https://registry.npmjs.org/rechoir/-/rechoir-0.8.0.tgz",
-      "integrity": "sha512-/vxpCXddiX8NGfGO/mTafwjq4aFa/71pvamip0++IQk3zG8cbCj0fifNPrjjF1XMXUne91jL9OoxmdykoEtifQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "resolve": "^1.20.0"
       },
@@ -32830,8 +40414,7 @@
     },
     "node_modules/regenerator-transform": {
       "version": "0.15.2",
-      "resolved": "https://registry.npmjs.org/regenerator-transform/-/regenerator-transform-0.15.2.tgz",
-      "integrity": "sha512-hfMp2BoF0qOk3uc5V20ALGDS2ddjQaLrdl7xrGXvAIow7qeWRM2VA2HuCHkUKk9slq3VwEwLNK3DFBqDfPGYtg==",
+      "license": "MIT",
       "dependencies": {
         "@babel/runtime": "^7.8.4"
       }
@@ -32849,13 +40432,13 @@
       }
     },
     "node_modules/regexp.prototype.flags": {
-      "version": "1.5.0",
-      "dev": true,
+      "version": "1.5.2",
       "license": "MIT",
       "dependencies": {
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.2.0",
-        "functions-have-names": "^1.2.3"
+        "call-bind": "^1.0.6",
+        "define-properties": "^1.2.1",
+        "es-errors": "^1.3.0",
+        "set-function-name": "^2.0.1"
       },
       "engines": {
         "node": ">= 0.4"
@@ -32908,8 +40491,8 @@
     },
     "node_modules/rehype-external-links": {
       "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/rehype-external-links/-/rehype-external-links-3.0.0.tgz",
-      "integrity": "sha512-yp+e5N9V3C6bwBeAC4n796kc86M4gJCdlVhiMTxIrJG5UHDMh+PJANf9heqORJbt1nrCbDwIlAZKjANIaVBbvw==",
+      "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@types/hast": "^3.0.0",
         "@ungap/structured-clone": "^1.0.0",
@@ -32925,8 +40508,8 @@
     },
     "node_modules/rehype-slug": {
       "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/rehype-slug/-/rehype-slug-6.0.0.tgz",
-      "integrity": "sha512-lWyvf/jwu+oS5+hL5eClVd3hNdmwM1kAC0BUvEGD19pajQMIzcNUd/k9GsfQ+FfECvX+JE+e9/btsKH0EjJT6A==",
+      "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@types/hast": "^3.0.0",
         "github-slugger": "^2.0.0",
@@ -33026,6 +40609,19 @@
         "node": ">=0.10.0"
       }
     },
+    "node_modules/require-in-the-middle": {
+      "version": "7.3.0",
+      "license": "MIT",
+      "peer": true,
+      "dependencies": {
+        "debug": "^4.1.1",
+        "module-details-from-path": "^1.0.3",
+        "resolve": "^1.22.1"
+      },
+      "engines": {
+        "node": ">=8.6.0"
+      }
+    },
     "node_modules/require-main-filename": {
       "version": "2.0.0",
       "license": "ISC"
@@ -33041,10 +40637,6 @@
         "node": ">= 4.0.0"
       }
     },
-    "node_modules/requireg/node_modules/nested-error-stacks": {
-      "version": "2.0.1",
-      "license": "MIT"
-    },
     "node_modules/requireg/node_modules/resolve": {
       "version": "1.7.1",
       "license": "MIT",
@@ -33064,6 +40656,18 @@
       "version": "1.0.0",
       "license": "MIT"
     },
+    "node_modules/resedit": {
+      "version": "1.7.0",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "pe-library": "^0.4.0"
+      },
+      "engines": {
+        "node": ">=12",
+        "npm": ">=6"
+      }
+    },
     "node_modules/reselect": {
       "version": "4.1.7",
       "dev": true,
@@ -33071,8 +40675,7 @@
     },
     "node_modules/resolve": {
       "version": "1.22.8",
-      "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.8.tgz",
-      "integrity": "sha512-oKWePCxqpd6FlLvGV1VU0x7bkPmmCNolxzjMf4NczoDnQcIWrAF+cPtZn5i6n+RfD2d9i0tzpKnG6Yk168yIyw==",
+      "license": "MIT",
       "dependencies": {
         "is-core-module": "^2.13.0",
         "path-parse": "^1.0.7",
@@ -33139,8 +40742,7 @@
     },
     "node_modules/restore-cursor": {
       "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/restore-cursor/-/restore-cursor-3.1.0.tgz",
-      "integrity": "sha512-l+sSefzHpj5qimhFSE5a8nufZYAM3sBSVMAPtYkmC+4EH2anSGaEMXSD0izRQbu9nfyQ9y5JrVmp7E8oZrUjvA==",
+      "license": "MIT",
       "dependencies": {
         "onetime": "^5.1.0",
         "signal-exit": "^3.0.2"
@@ -33159,9 +40761,8 @@
     },
     "node_modules/retry": {
       "version": "0.13.1",
-      "resolved": "https://registry.npmjs.org/retry/-/retry-0.13.1.tgz",
-      "integrity": "sha512-XQBQ3I8W1Cge0Seh+6gjj03LbmRFWuoszgK9ooCpwYIrhhoO80pfq4cUkU5DkknwfOfFteRwlZ56PYOGYyFWdg==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">= 4"
       }
@@ -33228,9 +40829,8 @@
     },
     "node_modules/run-applescript": {
       "version": "7.0.0",
-      "resolved": "https://registry.npmjs.org/run-applescript/-/run-applescript-7.0.0.tgz",
-      "integrity": "sha512-9by4Ij99JUr/MCFBUkDKLWK3G9HVXmabKz9U5MlIAIuvuzkiOicRYs8XJLxX+xahD+mLiiCYDqF9dKAgtzKP1A==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=18"
       },
@@ -33238,17 +40838,6 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/run-node": {
-      "version": "1.0.0",
-      "dev": true,
-      "license": "MIT",
-      "bin": {
-        "run-node": "run-node"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
     "node_modules/run-parallel": {
       "version": "1.2.0",
       "funding": [
@@ -33276,20 +40865,18 @@
     },
     "node_modules/rxjs": {
       "version": "7.8.1",
-      "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-7.8.1.tgz",
-      "integrity": "sha512-AA3TVj+0A2iuIoQkWEK/tqFjBq2j+6PO6Y0zJcvzLAFhEFIO3HL0vls9hWLncZbAAbK0mar7oZ4V079I/qPMxg==",
       "dev": true,
+      "license": "Apache-2.0",
       "dependencies": {
         "tslib": "^2.1.0"
       }
     },
     "node_modules/safe-array-concat": {
-      "version": "1.0.0",
-      "dev": true,
+      "version": "1.1.2",
       "license": "MIT",
       "dependencies": {
-        "call-bind": "^1.0.2",
-        "get-intrinsic": "^1.2.0",
+        "call-bind": "^1.0.7",
+        "get-intrinsic": "^1.2.4",
         "has-symbols": "^1.0.3",
         "isarray": "^2.0.5"
       },
@@ -33318,14 +40905,16 @@
       }
     },
     "node_modules/safe-regex-test": {
-      "version": "1.0.0",
-      "dev": true,
+      "version": "1.0.3",
       "license": "MIT",
       "dependencies": {
-        "call-bind": "^1.0.2",
-        "get-intrinsic": "^1.1.3",
+        "call-bind": "^1.0.6",
+        "es-errors": "^1.3.0",
         "is-regex": "^1.1.4"
       },
+      "engines": {
+        "node": ">= 0.4"
+      },
       "funding": {
         "url": "https://github.com/sponsors/ljharb"
       }
@@ -33357,7 +40946,7 @@
       }
     },
     "node_modules/scheduler": {
-      "version": "0.22.0",
+      "version": "0.24.0-canary-efb381bbf-20230505",
       "license": "MIT",
       "dependencies": {
         "loose-envify": "^1.1.0"
@@ -33404,6 +40993,11 @@
       "version": "0.4.1",
       "license": "MIT"
     },
+    "node_modules/secure-compare": {
+      "version": "3.0.1",
+      "dev": true,
+      "license": "MIT"
+    },
     "node_modules/seedrandom": {
       "version": "3.0.5",
       "dev": true,
@@ -33411,8 +41005,7 @@
     },
     "node_modules/select": {
       "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/select/-/select-1.1.2.tgz",
-      "integrity": "sha512-OwpTSOfy6xSs1+pwcNrv0RBMOzI39Lp3qQKUTPVVPRjCdNa5JH/oPRiqsesIskK8TVgmRiHwO4KXlV2Li9dANA=="
+      "license": "MIT"
     },
     "node_modules/select-hose": {
       "version": "2.0.0",
@@ -33421,9 +41014,7 @@
     },
     "node_modules/selfsigned": {
       "version": "2.4.1",
-      "resolved": "https://registry.npmjs.org/selfsigned/-/selfsigned-2.4.1.tgz",
-      "integrity": "sha512-th5B4L2U+eGLq1TVh7zNRGBapioSORUeymIydxgFpwww9d2qyKvtuPU2jJuHvYAwwqi2Y596QBL3eEqcPEYL8Q==",
-      "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@types/node-forge": "^1.3.0",
         "node-forge": "^1"
@@ -33433,11 +41024,9 @@
       }
     },
     "node_modules/semver": {
-      "version": "7.6.0",
-      "license": "ISC",
-      "dependencies": {
-        "lru-cache": "^6.0.0"
-      },
+      "version": "7.6.3",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-7.6.3.tgz",
+      "integrity": "sha512-oVekP1cKtI+CTDvHWYFUcMtsK/00wmAEfyqKfNdARm8u1wNVhSgaX7A8d4UuIlUI5e84iEwOhs7ZPYRmzU9U6A==",
       "bin": {
         "semver": "bin/semver.js"
       },
@@ -33524,8 +41113,7 @@
     },
     "node_modules/serialize-javascript": {
       "version": "6.0.2",
-      "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-6.0.2.tgz",
-      "integrity": "sha512-Saa1xPByTTq2gdeFZYLLo+RFE35NHZkAbqZeWNd3BpzppeVisAqpDjcp8dyf6uIvEqJRd46jemmyA4iFIeVk8g==",
+      "license": "BSD-3-Clause",
       "dependencies": {
         "randombytes": "^2.1.0"
       }
@@ -33617,6 +41205,34 @@
       "version": "2.0.0",
       "license": "ISC"
     },
+    "node_modules/set-function-length": {
+      "version": "1.2.2",
+      "license": "MIT",
+      "dependencies": {
+        "define-data-property": "^1.1.4",
+        "es-errors": "^1.3.0",
+        "function-bind": "^1.1.2",
+        "get-intrinsic": "^1.2.4",
+        "gopd": "^1.0.1",
+        "has-property-descriptors": "^1.0.2"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
+    "node_modules/set-function-name": {
+      "version": "2.0.2",
+      "license": "MIT",
+      "dependencies": {
+        "define-data-property": "^1.1.4",
+        "es-errors": "^1.3.0",
+        "functions-have-names": "^1.2.3",
+        "has-property-descriptors": "^1.0.2"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
     "node_modules/set-value": {
       "version": "2.0.1",
       "license": "MIT",
@@ -33724,9 +41340,44 @@
         "shellcheck": "shellcheck-stable/shellcheck"
       }
     },
-    "node_modules/shim-keyboard-event-key": {
-      "version": "1.0.3",
-      "license": "MIT"
+    "node_modules/shelljs": {
+      "version": "0.8.5",
+      "license": "BSD-3-Clause",
+      "peer": true,
+      "dependencies": {
+        "glob": "^7.0.0",
+        "interpret": "^1.0.0",
+        "rechoir": "^0.6.2"
+      },
+      "bin": {
+        "shjs": "bin/shjs"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/shelljs/node_modules/interpret": {
+      "version": "1.4.0",
+      "license": "MIT",
+      "peer": true,
+      "engines": {
+        "node": ">= 0.10"
+      }
+    },
+    "node_modules/shelljs/node_modules/rechoir": {
+      "version": "0.6.2",
+      "peer": true,
+      "dependencies": {
+        "resolve": "^1.1.6"
+      },
+      "engines": {
+        "node": ">= 0.10"
+      }
+    },
+    "node_modules/shimmer": {
+      "version": "1.2.1",
+      "license": "BSD-2-Clause",
+      "peer": true
     },
     "node_modules/side-channel": {
       "version": "1.0.4",
@@ -33796,7 +41447,7 @@
       }
     },
     "node_modules/simple-git": {
-      "version": "3.19.0",
+      "version": "3.24.0",
       "license": "MIT",
       "dependencies": {
         "@kwsites/file-exists": "^1.1.1",
@@ -33939,7 +41590,6 @@
       "version": "4.2.0",
       "dev": true,
       "license": "MIT",
-      "optional": true,
       "engines": {
         "node": ">= 6.0.0",
         "npm": ">= 3.0.0"
@@ -33998,11 +41648,6 @@
         "node": ">=0.10.0"
       }
     },
-    "node_modules/snapdragon-util/node_modules/is-buffer": {
-      "version": "1.1.6",
-      "license": "MIT",
-      "optional": true
-    },
     "node_modules/snapdragon-util/node_modules/kind-of": {
       "version": "3.2.2",
       "license": "MIT",
@@ -34066,11 +41711,6 @@
         "node": ">=0.10.0"
       }
     },
-    "node_modules/snapdragon/node_modules/is-buffer": {
-      "version": "1.1.6",
-      "license": "MIT",
-      "optional": true
-    },
     "node_modules/snapdragon/node_modules/is-data-descriptor": {
       "version": "0.1.4",
       "license": "MIT",
@@ -34145,6 +41785,32 @@
         "websocket-driver": "^0.7.4"
       }
     },
+    "node_modules/socks": {
+      "version": "2.8.3",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "ip-address": "^9.0.5",
+        "smart-buffer": "^4.2.0"
+      },
+      "engines": {
+        "node": ">= 10.0.0",
+        "npm": ">= 3.0.0"
+      }
+    },
+    "node_modules/socks-proxy-agent": {
+      "version": "7.0.0",
+      "dev": true,
+      "license": "MIT",
+      "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",
       "license": "MIT",
@@ -34186,14 +41852,22 @@
       "license": "MIT"
     },
     "node_modules/source-map": {
-      "version": "0.6.1",
+      "version": "0.7.4",
       "license": "BSD-3-Clause",
       "engines": {
-        "node": ">=0.10.0"
+        "node": ">= 8"
+      }
+    },
+    "node_modules/source-map-generator": {
+      "version": "0.8.0",
+      "dev": true,
+      "license": "BSD-3-Clause",
+      "engines": {
+        "node": ">= 10"
       }
     },
     "node_modules/source-map-js": {
-      "version": "1.0.2",
+      "version": "1.2.0",
       "license": "BSD-3-Clause",
       "engines": {
         "node": ">=0.10.0"
@@ -34219,6 +41893,13 @@
         "source-map": "^0.6.0"
       }
     },
+    "node_modules/source-map-support/node_modules/source-map": {
+      "version": "0.6.1",
+      "license": "BSD-3-Clause",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
     "node_modules/source-map-url": {
       "version": "0.4.1",
       "license": "MIT",
@@ -34226,8 +41907,8 @@
     },
     "node_modules/space-separated-tokens": {
       "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/space-separated-tokens/-/space-separated-tokens-2.0.2.tgz",
-      "integrity": "sha512-PEGlAwrG8yXGXRjW32fGbg66JAlOAwbObuqVoJpv/mRgoWDQfgH1wDPvtzWyUSNAXBGSk8h755YDbbcEy3SH2Q==",
+      "dev": true,
+      "license": "MIT",
       "funding": {
         "type": "github",
         "url": "https://github.com/sponsors/wooorm"
@@ -34235,8 +41916,6 @@
     },
     "node_modules/spawn-command": {
       "version": "0.0.2",
-      "resolved": "https://registry.npmjs.org/spawn-command/-/spawn-command-0.0.2.tgz",
-      "integrity": "sha512-zC8zGoGkmc8J9ndvml8Xksr1Amk9qBujgbF0JAIWO7kXr43w0h/0GJNM/Vustixu+YE8N/MTrQ7N31FvHUACxQ==",
       "dev": true
     },
     "node_modules/spdx-correct": {
@@ -34336,13 +42015,20 @@
       "license": "BSD-3-Clause"
     },
     "node_modules/ssri": {
-      "version": "8.0.1",
+      "version": "10.0.6",
       "license": "ISC",
       "dependencies": {
-        "minipass": "^3.1.1"
+        "minipass": "^7.0.3"
       },
       "engines": {
-        "node": ">= 8"
+        "node": "^14.17.0 || ^16.13.0 || >=18.0.0"
+      }
+    },
+    "node_modules/ssri/node_modules/minipass": {
+      "version": "7.1.2",
+      "license": "ISC",
+      "engines": {
+        "node": ">=16 || 14 >=14.17"
       }
     },
     "node_modules/stable": {
@@ -34350,6 +42036,11 @@
       "dev": true,
       "license": "MIT"
     },
+    "node_modules/stack-chain": {
+      "version": "1.3.7",
+      "license": "MIT",
+      "peer": true
+    },
     "node_modules/stack-generator": {
       "version": "2.0.10",
       "license": "MIT",
@@ -34472,11 +42163,6 @@
         "node": ">=0.10.0"
       }
     },
-    "node_modules/static-extend/node_modules/is-buffer": {
-      "version": "1.1.6",
-      "license": "MIT",
-      "optional": true
-    },
     "node_modules/static-extend/node_modules/is-data-descriptor": {
       "version": "0.1.4",
       "license": "MIT",
@@ -34529,16 +42215,15 @@
     },
     "node_modules/store2": {
       "version": "2.14.3",
-      "resolved": "https://registry.npmjs.org/store2/-/store2-2.14.3.tgz",
-      "integrity": "sha512-4QcZ+yx7nzEFiV4BMLnr/pRa5HYzNITX2ri0Zh6sT9EyQHbBHacC6YigllUPU9X3D0f/22QCgfokpKs52YRrUg=="
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/storybook": {
-      "version": "8.0.6",
-      "resolved": "https://registry.npmjs.org/storybook/-/storybook-8.0.6.tgz",
-      "integrity": "sha512-QcQl8Sj77scGl0s9pw+cSPFmXK9DPogEkOceG12B2PqdS23oGkaBt24292Y3W5TTMVNyHtRTRB/FqPwK3FOdmA==",
+      "version": "8.1.10",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "@storybook/cli": "8.0.6"
+        "@storybook/cli": "8.1.10"
       },
       "bin": {
         "sb": "index.js",
@@ -34576,7 +42261,8 @@
       }
     },
     "node_modules/stream-shift": {
-      "version": "1.0.1",
+      "version": "1.0.3",
+      "dev": true,
       "license": "MIT"
     },
     "node_modules/strict-uri-encode": {
@@ -34604,6 +42290,11 @@
         "node": ">=10"
       }
     },
+    "node_modules/string-natural-compare": {
+      "version": "3.0.1",
+      "dev": true,
+      "license": "MIT"
+    },
     "node_modules/string-width": {
       "version": "4.2.3",
       "license": "MIT",
@@ -34648,13 +42339,13 @@
       }
     },
     "node_modules/string.prototype.trim": {
-      "version": "1.2.7",
-      "dev": true,
+      "version": "1.2.9",
       "license": "MIT",
       "dependencies": {
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.1.4",
-        "es-abstract": "^1.20.4"
+        "call-bind": "^1.0.7",
+        "define-properties": "^1.2.1",
+        "es-abstract": "^1.23.0",
+        "es-object-atoms": "^1.0.0"
       },
       "engines": {
         "node": ">= 0.4"
@@ -34664,26 +42355,27 @@
       }
     },
     "node_modules/string.prototype.trimend": {
-      "version": "1.0.6",
-      "dev": true,
+      "version": "1.0.8",
       "license": "MIT",
       "dependencies": {
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.1.4",
-        "es-abstract": "^1.20.4"
+        "call-bind": "^1.0.7",
+        "define-properties": "^1.2.1",
+        "es-object-atoms": "^1.0.0"
       },
       "funding": {
         "url": "https://github.com/sponsors/ljharb"
       }
     },
     "node_modules/string.prototype.trimstart": {
-      "version": "1.0.6",
-      "dev": true,
+      "version": "1.0.8",
       "license": "MIT",
       "dependencies": {
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.1.4",
-        "es-abstract": "^1.20.4"
+        "call-bind": "^1.0.7",
+        "define-properties": "^1.2.1",
+        "es-object-atoms": "^1.0.0"
+      },
+      "engines": {
+        "node": ">= 0.4"
       },
       "funding": {
         "url": "https://github.com/sponsors/ljharb"
@@ -34781,8 +42473,7 @@
     },
     "node_modules/strnum": {
       "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/strnum/-/strnum-1.0.5.tgz",
-      "integrity": "sha512-J8bbNyKKXl5qYcR36TIO8W3mVGVHrmmxsd5PAItGkmyzwJvybiw2IVq5nqd0i4LSNSkB/sx9VHllbfFdr9k1JA=="
+      "license": "MIT"
     },
     "node_modules/structured-headers": {
       "version": "0.4.1",
@@ -34852,8 +42543,7 @@
     },
     "node_modules/sudo-prompt": {
       "version": "9.2.1",
-      "resolved": "https://registry.npmjs.org/sudo-prompt/-/sudo-prompt-9.2.1.tgz",
-      "integrity": "sha512-Mu7R0g4ig9TUuGSxJavny5Rv0egCEtpZRNMrZaYS1vxkiIxGiGUwoezU3LazIQ+KE04hTrTfNPgxU5gzi7F5Pw=="
+      "license": "MIT"
     },
     "node_modules/sumchecker": {
       "version": "3.0.1",
@@ -35040,79 +42730,20 @@
       "version": "3.2.4",
       "license": "MIT"
     },
-    "node_modules/table": {
-      "version": "6.8.1",
-      "dev": true,
-      "license": "BSD-3-Clause",
-      "dependencies": {
-        "ajv": "^8.0.1",
-        "lodash.truncate": "^4.4.2",
-        "slice-ansi": "^4.0.0",
-        "string-width": "^4.2.3",
-        "strip-ansi": "^6.0.1"
-      },
-      "engines": {
-        "node": ">=10.0.0"
-      }
-    },
-    "node_modules/table/node_modules/ansi-styles": {
-      "version": "4.3.0",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "color-convert": "^2.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
-      }
-    },
-    "node_modules/table/node_modules/color-convert": {
-      "version": "2.0.1",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "color-name": "~1.1.4"
-      },
-      "engines": {
-        "node": ">=7.0.0"
-      }
-    },
-    "node_modules/table/node_modules/color-name": {
-      "version": "1.1.4",
-      "dev": true,
+    "node_modules/tabbable": {
+      "version": "6.2.0",
       "license": "MIT"
     },
-    "node_modules/table/node_modules/slice-ansi": {
-      "version": "4.0.0",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "ansi-styles": "^4.0.0",
-        "astral-regex": "^2.0.0",
-        "is-fullwidth-code-point": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/slice-ansi?sponsor=1"
-      }
-    },
     "node_modules/tapable": {
       "version": "2.2.1",
-      "resolved": "https://registry.npmjs.org/tapable/-/tapable-2.2.1.tgz",
-      "integrity": "sha512-GNzQvQTOIP6RyTfE2Qxb8ZVlNmw0n88vp1szwWRimP02mnTsx3Wtn5qRdqY9w2XduFNUgvOwhNnQsjwCp+kqaQ==",
+      "license": "MIT",
       "engines": {
         "node": ">=6"
       }
     },
     "node_modules/tar": {
       "version": "6.2.1",
-      "resolved": "https://registry.npmjs.org/tar/-/tar-6.2.1.tgz",
-      "integrity": "sha512-DZ4yORTwrbTj/7MZYq2w+/ZFdI6OZ/f9SFHR+71gIVUZhOQPHzVCLpvRnPgyaMpfWxxk/4ONva3GQSyNIKRv6A==",
+      "license": "ISC",
       "dependencies": {
         "chownr": "^2.0.0",
         "fs-minipass": "^2.0.0",
@@ -35127,8 +42758,8 @@
     },
     "node_modules/tar-fs": {
       "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/tar-fs/-/tar-fs-2.1.1.tgz",
-      "integrity": "sha512-V0r2Y9scmbDRLCNex/+hYzvp/zyYjvFbHPNgVTKfQvVrb6guiE/fxP+XblDNR011utopbkex2nM4dHNV6GDsng==",
+      "dev": true,
+      "license": "MIT",
       "dependencies": {
         "chownr": "^1.1.1",
         "mkdirp-classic": "^0.5.2",
@@ -35138,11 +42769,12 @@
     },
     "node_modules/tar-fs/node_modules/chownr": {
       "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/chownr/-/chownr-1.1.4.tgz",
-      "integrity": "sha512-jJ0bqzaylmJtVnNgzTeSOs8DPavpbYgEr/b0YL8/2GO3xJEhInFmhKMUnEJQjZumK7KXGFhUy89PrsJWlakBVg=="
+      "dev": true,
+      "license": "ISC"
     },
     "node_modules/tar-stream": {
       "version": "2.2.0",
+      "dev": true,
       "license": "MIT",
       "dependencies": {
         "bl": "^4.0.3",
@@ -35157,6 +42789,7 @@
     },
     "node_modules/tar-stream/node_modules/readable-stream": {
       "version": "3.6.2",
+      "dev": true,
       "license": "MIT",
       "dependencies": {
         "inherits": "^2.0.3",
@@ -35176,16 +42809,15 @@
     },
     "node_modules/telejson": {
       "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/telejson/-/telejson-7.2.0.tgz",
-      "integrity": "sha512-1QTEcJkJEhc8OnStBx/ILRu5J2p0GjvWsBx56bmZRqnrkdBMUe+nX92jxV+p3dB4CP6PZCdJMQJwCggkNBMzkQ==",
+      "dev": true,
+      "license": "MIT",
       "dependencies": {
         "memoizerific": "^1.11.3"
       }
     },
     "node_modules/temp": {
       "version": "0.8.4",
-      "resolved": "https://registry.npmjs.org/temp/-/temp-0.8.4.tgz",
-      "integrity": "sha512-s0ZZzd0BzYv5tLSptZooSjK8oj6C+c19p7Vqta9+6NPOf7r+fxq0cJe6/oN4LTC79sy5NY8ucOJNgwsKCSbfqg==",
+      "license": "MIT",
       "dependencies": {
         "rimraf": "~2.6.2"
       },
@@ -35224,8 +42856,7 @@
     },
     "node_modules/temp/node_modules/rimraf": {
       "version": "2.6.3",
-      "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.6.3.tgz",
-      "integrity": "sha512-mwqeW5XsA2qAejG46gYdENaxXjx9onRNCfn7L0duuP4hCuTIi/QO7PDK07KJfp1d+izWPrzEJDcSqBa0OZQriA==",
+      "license": "ISC",
       "dependencies": {
         "glob": "^7.1.3"
       },
@@ -35303,8 +42934,7 @@
     },
     "node_modules/terser": {
       "version": "5.30.3",
-      "resolved": "https://registry.npmjs.org/terser/-/terser-5.30.3.tgz",
-      "integrity": "sha512-STdUgOUx8rLbMGO9IOwHLpCqolkDITFFQSMYYwKE1N2lY6MVSaeoi10z/EhWxRc6ybqoVmKSkhKYH/XUpl7vSA==",
+      "license": "BSD-2-Clause",
       "dependencies": {
         "@jridgewell/source-map": "^0.3.3",
         "acorn": "^8.8.2",
@@ -35320,8 +42950,7 @@
     },
     "node_modules/terser-webpack-plugin": {
       "version": "5.3.10",
-      "resolved": "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-5.3.10.tgz",
-      "integrity": "sha512-BKFPWlPDndPs+NGGCr1U59t0XScL5317Y0UReNrHaw9/FwhPENlq6bfgs+4yPfyP51vqC1bQ4rp1EfXW5ZSH9w==",
+      "license": "MIT",
       "dependencies": {
         "@jridgewell/trace-mapping": "^0.3.20",
         "jest-worker": "^27.4.5",
@@ -35434,9 +43063,8 @@
     },
     "node_modules/thunky": {
       "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/thunky/-/thunky-1.1.0.tgz",
-      "integrity": "sha512-eHY7nBftgThBqOyHGVN+l8gF0BucP09fMo0oO/Lb0w1OF80dJv+lDVpXG60WMQvkcxAkNybKsrEIE3ZtKGmPrA==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/time-analytics-webpack-plugin": {
       "version": "0.1.17",
@@ -35539,8 +43167,7 @@
     },
     "node_modules/tiny-invariant": {
       "version": "1.3.3",
-      "resolved": "https://registry.npmjs.org/tiny-invariant/-/tiny-invariant-1.3.3.tgz",
-      "integrity": "sha512-+FbBPE1o9QAYvviau/qC5SE3caw21q3xkvWKBtja5vgqOWIHHJ3ioaq1VPfn/Szqctz2bU/oYeKd9/z5BL+PVg=="
+      "license": "MIT"
     },
     "node_modules/tinycolor2": {
       "version": "1.6.0",
@@ -35593,11 +43220,6 @@
         "node": ">=0.10.0"
       }
     },
-    "node_modules/to-object-path/node_modules/is-buffer": {
-      "version": "1.1.6",
-      "license": "MIT",
-      "optional": true
-    },
     "node_modules/to-object-path/node_modules/kind-of": {
       "version": "3.2.2",
       "license": "MIT",
@@ -35634,9 +43256,9 @@
       }
     },
     "node_modules/tocbot": {
-      "version": "4.25.0",
-      "resolved": "https://registry.npmjs.org/tocbot/-/tocbot-4.25.0.tgz",
-      "integrity": "sha512-kE5wyCQJ40hqUaRVkyQ4z5+4juzYsv/eK+aqD97N62YH0TxFhzJvo22RUQQZdO3YnXAk42ZOfOpjVdy+Z0YokA=="
+      "version": "4.28.2",
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/toidentifier": {
       "version": "1.0.1",
@@ -35674,8 +43296,13 @@
       }
     },
     "node_modules/traverse": {
-      "version": "0.6.8",
+      "version": "0.6.9",
       "license": "MIT",
+      "dependencies": {
+        "gopd": "^1.0.1",
+        "typedarray.prototype.slice": "^1.0.3",
+        "which-typed-array": "^1.1.15"
+      },
       "engines": {
         "node": ">= 0.4"
       },
@@ -35691,6 +43318,14 @@
         "tree-kill": "cli.js"
       }
     },
+    "node_modules/trim-right": {
+      "version": "1.0.1",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
     "node_modules/truncate-utf8-bytes": {
       "version": "1.0.2",
       "dev": true,
@@ -35700,11 +43335,11 @@
       }
     },
     "node_modules/ts-api-utils": {
-      "version": "1.0.1",
+      "version": "1.3.0",
       "dev": true,
       "license": "MIT",
       "engines": {
-        "node": ">=16.13.0"
+        "node": ">=16"
       },
       "peerDependencies": {
         "typescript": ">=4.2.0"
@@ -35712,6 +43347,7 @@
     },
     "node_modules/ts-dedent": {
       "version": "2.2.0",
+      "dev": true,
       "license": "MIT",
       "engines": {
         "node": ">=6.10"
@@ -35723,9 +43359,8 @@
     },
     "node_modules/ts-jest": {
       "version": "29.1.2",
-      "resolved": "https://registry.npmjs.org/ts-jest/-/ts-jest-29.1.2.tgz",
-      "integrity": "sha512-br6GJoH/WUX4pu7FbZXuWGKGNDuU7b8Uj77g/Sp7puZV6EXzuByl6JrECvm0MzVzSTkSHWTihsXt+5XYER5b+g==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "bs-logger": "0.x",
         "fast-json-stable-stringify": "2.x",
@@ -35766,9 +43401,8 @@
     },
     "node_modules/ts-jest/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,
+      "license": "ISC",
       "engines": {
         "node": ">=12"
       }
@@ -35838,30 +43472,29 @@
       "version": "0.0.5",
       "license": "ISC"
     },
+    "node_modules/ts-regex-builder": {
+      "version": "1.7.1",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">= 18.0.0"
+      }
+    },
     "node_modules/ts-toolbelt": {
       "version": "6.15.5",
       "license": "Apache-2.0"
     },
     "node_modules/tsconfig-paths": {
-      "version": "3.15.0",
+      "version": "4.2.0",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@types/json5": "^0.0.29",
-        "json5": "^1.0.2",
+        "json5": "^2.2.2",
         "minimist": "^1.2.6",
         "strip-bom": "^3.0.0"
-      }
-    },
-    "node_modules/tsconfig-paths/node_modules/json5": {
-      "version": "1.0.2",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "minimist": "^1.2.0"
       },
-      "bin": {
-        "json5": "lib/cli.js"
+      "engines": {
+        "node": ">=6"
       }
     },
     "node_modules/tsconfig-paths/node_modules/strip-bom": {
@@ -35930,7 +43563,7 @@
       }
     },
     "node_modules/type-fest": {
-      "version": "4.10.3",
+      "version": "4.20.0",
       "dev": true,
       "license": "(MIT OR CC0-1.0)",
       "engines": {
@@ -35952,27 +43585,26 @@
       }
     },
     "node_modules/typed-array-buffer": {
-      "version": "1.0.0",
-      "dev": true,
+      "version": "1.0.2",
       "license": "MIT",
       "dependencies": {
-        "call-bind": "^1.0.2",
-        "get-intrinsic": "^1.2.1",
-        "is-typed-array": "^1.1.10"
+        "call-bind": "^1.0.7",
+        "es-errors": "^1.3.0",
+        "is-typed-array": "^1.1.13"
       },
       "engines": {
         "node": ">= 0.4"
       }
     },
     "node_modules/typed-array-byte-length": {
-      "version": "1.0.0",
-      "dev": true,
+      "version": "1.0.1",
       "license": "MIT",
       "dependencies": {
-        "call-bind": "^1.0.2",
+        "call-bind": "^1.0.7",
         "for-each": "^0.3.3",
-        "has-proto": "^1.0.1",
-        "is-typed-array": "^1.1.10"
+        "gopd": "^1.0.1",
+        "has-proto": "^1.0.3",
+        "is-typed-array": "^1.1.13"
       },
       "engines": {
         "node": ">= 0.4"
@@ -35982,15 +43614,15 @@
       }
     },
     "node_modules/typed-array-byte-offset": {
-      "version": "1.0.0",
-      "dev": true,
+      "version": "1.0.2",
       "license": "MIT",
       "dependencies": {
-        "available-typed-arrays": "^1.0.5",
-        "call-bind": "^1.0.2",
+        "available-typed-arrays": "^1.0.7",
+        "call-bind": "^1.0.7",
         "for-each": "^0.3.3",
-        "has-proto": "^1.0.1",
-        "is-typed-array": "^1.1.10"
+        "gopd": "^1.0.1",
+        "has-proto": "^1.0.3",
+        "is-typed-array": "^1.1.13"
       },
       "engines": {
         "node": ">= 0.4"
@@ -36000,28 +43632,51 @@
       }
     },
     "node_modules/typed-array-length": {
-      "version": "1.0.4",
-      "dev": true,
+      "version": "1.0.6",
       "license": "MIT",
       "dependencies": {
-        "call-bind": "^1.0.2",
+        "call-bind": "^1.0.7",
         "for-each": "^0.3.3",
-        "is-typed-array": "^1.1.9"
+        "gopd": "^1.0.1",
+        "has-proto": "^1.0.3",
+        "is-typed-array": "^1.1.13",
+        "possible-typed-array-names": "^1.0.0"
+      },
+      "engines": {
+        "node": ">= 0.4"
       },
       "funding": {
         "url": "https://github.com/sponsors/ljharb"
       }
     },
     "node_modules/typed-function": {
-      "version": "4.1.1",
+      "version": "4.2.1",
       "dev": true,
       "license": "MIT",
       "engines": {
-        "node": ">= 14"
+        "node": ">= 18"
+      }
+    },
+    "node_modules/typedarray.prototype.slice": {
+      "version": "1.0.3",
+      "license": "MIT",
+      "dependencies": {
+        "call-bind": "^1.0.7",
+        "define-properties": "^1.2.1",
+        "es-abstract": "^1.23.0",
+        "es-errors": "^1.3.0",
+        "typed-array-buffer": "^1.0.2",
+        "typed-array-byte-offset": "^1.0.2"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
       }
     },
     "node_modules/typescript": {
-      "version": "5.3.3",
+      "version": "5.4.5",
       "devOptional": true,
       "license": "Apache-2.0",
       "bin": {
@@ -36062,13 +43717,13 @@
     },
     "node_modules/ufo": {
       "version": "1.5.3",
-      "resolved": "https://registry.npmjs.org/ufo/-/ufo-1.5.3.tgz",
-      "integrity": "sha512-Y7HYmWaFwPUmkoQCUIAYpKqkOf+SbVj/2fJJZ4RJMCfZp0rTGwRbzQD+HghfnhKOjL9E01okqz+ncJskGYfBNw=="
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/uglify-js": {
       "version": "3.17.4",
-      "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.17.4.tgz",
-      "integrity": "sha512-T9q82TJI9e/C1TAxYvfb16xO120tMVFZrGA3f9/P4424DNu6ypK103y0GPFVa17yotwSyZW5iYXgjYHkGrJW/g==",
+      "dev": true,
+      "license": "BSD-2-Clause",
       "optional": true,
       "bin": {
         "uglifyjs": "bin/uglifyjs"
@@ -36084,7 +43739,6 @@
     },
     "node_modules/unbox-primitive": {
       "version": "1.0.2",
-      "dev": true,
       "license": "MIT",
       "dependencies": {
         "call-bind": "^1.0.2",
@@ -36136,6 +43790,27 @@
         "node": ">=4"
       }
     },
+    "node_modules/unicorn-magic": {
+      "version": "0.1.0",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=18"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/union": {
+      "version": "0.5.0",
+      "dev": true,
+      "dependencies": {
+        "qs": "^6.4.0"
+      },
+      "engines": {
+        "node": ">= 0.8.0"
+      }
+    },
     "node_modules/union-value": {
       "version": "1.0.1",
       "license": "MIT",
@@ -36157,17 +43832,23 @@
       }
     },
     "node_modules/unique-filename": {
-      "version": "1.1.1",
+      "version": "3.0.0",
       "license": "ISC",
       "dependencies": {
-        "unique-slug": "^2.0.0"
+        "unique-slug": "^4.0.0"
+      },
+      "engines": {
+        "node": "^14.17.0 || ^16.13.0 || >=18.0.0"
       }
     },
     "node_modules/unique-slug": {
-      "version": "2.0.2",
+      "version": "4.0.0",
       "license": "ISC",
       "dependencies": {
         "imurmurhash": "^0.1.4"
+      },
+      "engines": {
+        "node": "^14.17.0 || ^16.13.0 || >=18.0.0"
       }
     },
     "node_modules/unique-string": {
@@ -36182,8 +43863,8 @@
     },
     "node_modules/unist-util-is": {
       "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/unist-util-is/-/unist-util-is-6.0.0.tgz",
-      "integrity": "sha512-2qCTHimwdxLfz+YzdGfkqNlH0tLi9xjTnHddPmJwtIG9MGsdbutfTc4P+haPD7l7Cjxf/WZj+we5qfVPvvxfYw==",
+      "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@types/unist": "^3.0.0"
       },
@@ -36194,8 +43875,8 @@
     },
     "node_modules/unist-util-visit": {
       "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/unist-util-visit/-/unist-util-visit-5.0.0.tgz",
-      "integrity": "sha512-MR04uvD+07cwl/yhVuVWAtw+3GOR/knlL55Nd/wAdblk27GCVt3lqpTivy/tkJcZoNPzTwS1Y+KMojlLDhoTzg==",
+      "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@types/unist": "^3.0.0",
         "unist-util-is": "^6.0.0",
@@ -36208,8 +43889,8 @@
     },
     "node_modules/unist-util-visit-parents": {
       "version": "6.0.1",
-      "resolved": "https://registry.npmjs.org/unist-util-visit-parents/-/unist-util-visit-parents-6.0.1.tgz",
-      "integrity": "sha512-L/PqWzfTP9lzzEa6CKs0k2nARxTdZduw3zyh8d2NVBnsyvHjSX4TWse388YrrQKbvI8w20fGjGlhgT96WwKykw==",
+      "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@types/unist": "^3.0.0",
         "unist-util-is": "^6.0.0"
@@ -36240,8 +43921,8 @@
     },
     "node_modules/unplugin": {
       "version": "1.10.1",
-      "resolved": "https://registry.npmjs.org/unplugin/-/unplugin-1.10.1.tgz",
-      "integrity": "sha512-d6Mhq8RJeGA8UfKCu54Um4lFA0eSaRa3XxdAJg8tIdxbu1ubW0hBCZUL7yI2uGyYCRndvbK8FLHzqy2XKfeMsg==",
+      "dev": true,
+      "license": "MIT",
       "dependencies": {
         "acorn": "^8.11.3",
         "chokidar": "^3.6.0",
@@ -36253,9 +43934,9 @@
       }
     },
     "node_modules/unplugin/node_modules/acorn": {
-      "version": "8.11.3",
-      "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.11.3.tgz",
-      "integrity": "sha512-Y9rRfJG5jcKOE0CLisYbojUjIrIEE7AGMzA/Sm4BslANhbS+cDMpgBdcPT91oJ7OuJ9hYJBx59RjbhxVnrF8Xg==",
+      "version": "8.12.0",
+      "dev": true,
+      "license": "MIT",
       "bin": {
         "acorn": "bin/acorn"
       },
@@ -36265,16 +43946,16 @@
     },
     "node_modules/unplugin/node_modules/webpack-sources": {
       "version": "3.2.3",
-      "resolved": "https://registry.npmjs.org/webpack-sources/-/webpack-sources-3.2.3.tgz",
-      "integrity": "sha512-/DyMEOrDgLKKIG0fmvtz+4dUX/3Ghozwgm6iPp8KRhvn+eQf9+Q7GWxVNMk3+uCPWfdXYC4ExGBckIXdFEfH1w==",
+      "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=10.13.0"
       }
     },
     "node_modules/unplugin/node_modules/webpack-virtual-modules": {
-      "version": "0.6.1",
-      "resolved": "https://registry.npmjs.org/webpack-virtual-modules/-/webpack-virtual-modules-0.6.1.tgz",
-      "integrity": "sha512-poXpCylU7ExuvZK8z+On3kX+S8o/2dQ/SVYueKA0D4WEMXROXgY8Ez50/bQEUmvoSMMrWcrJqCHuhAbsiwg7Dg=="
+      "version": "0.6.2",
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/unset-value": {
       "version": "1.0.0",
@@ -36327,8 +44008,8 @@
     },
     "node_modules/untildify": {
       "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/untildify/-/untildify-4.0.0.tgz",
-      "integrity": "sha512-KK8xQ1mkzZeg9inewmFVDNkg3l5LUhoq9kN6iWYB/CC9YMG8HA+c1Q8HwDe6dEX7kErrEVNVBO3fWsVq5iDgtw==",
+      "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=8"
       }
@@ -36344,8 +44025,6 @@
     },
     "node_modules/update-browserslist-db": {
       "version": "1.0.13",
-      "resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.0.13.tgz",
-      "integrity": "sha512-xebP81SNcPuNpPP3uzeW1NYXxI3rxyJzF3pD6sH4jE7o/IX+WtSpwnVU+qIsDPyk0d3hmFQ7mjqc6AtV604hbg==",
       "funding": [
         {
           "type": "opencollective",
@@ -36360,6 +44039,7 @@
           "url": "https://github.com/sponsors/ai"
         }
       ],
+      "license": "MIT",
       "dependencies": {
         "escalade": "^3.1.1",
         "picocolors": "^1.0.0"
@@ -36419,6 +44099,26 @@
         "node": ">=0.10.0"
       }
     },
+    "node_modules/use-callback-ref": {
+      "version": "1.3.2",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "tslib": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "peerDependencies": {
+        "@types/react": "^16.8.0 || ^17.0.0 || ^18.0.0",
+        "react": "^16.8.0 || ^17.0.0 || ^18.0.0"
+      },
+      "peerDependenciesMeta": {
+        "@types/react": {
+          "optional": true
+        }
+      }
+    },
     "node_modules/use-latest-callback": {
       "version": "0.1.9",
       "license": "MIT",
@@ -36433,14 +44133,155 @@
         "react": "^16.8.0 || ^17.0.0 || ^18.0.0"
       }
     },
+    "node_modules/use-sidecar": {
+      "version": "1.1.2",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "detect-node-es": "^1.1.0",
+        "tslib": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "peerDependencies": {
+        "@types/react": "^16.9.0 || ^17.0.0 || ^18.0.0",
+        "react": "^16.8.0 || ^17.0.0 || ^18.0.0"
+      },
+      "peerDependenciesMeta": {
+        "@types/react": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/username": {
+      "version": "5.1.0",
+      "license": "MIT",
+      "peer": true,
+      "dependencies": {
+        "execa": "^1.0.0",
+        "mem": "^4.3.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/username/node_modules/cross-spawn": {
+      "version": "6.0.5",
+      "license": "MIT",
+      "peer": true,
+      "dependencies": {
+        "nice-try": "^1.0.4",
+        "path-key": "^2.0.1",
+        "semver": "^5.5.0",
+        "shebang-command": "^1.2.0",
+        "which": "^1.2.9"
+      },
+      "engines": {
+        "node": ">=4.8"
+      }
+    },
+    "node_modules/username/node_modules/execa": {
+      "version": "1.0.0",
+      "license": "MIT",
+      "peer": true,
+      "dependencies": {
+        "cross-spawn": "^6.0.0",
+        "get-stream": "^4.0.0",
+        "is-stream": "^1.1.0",
+        "npm-run-path": "^2.0.0",
+        "p-finally": "^1.0.0",
+        "signal-exit": "^3.0.0",
+        "strip-eof": "^1.0.0"
+      },
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/username/node_modules/get-stream": {
+      "version": "4.1.0",
+      "license": "MIT",
+      "peer": true,
+      "dependencies": {
+        "pump": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/username/node_modules/is-stream": {
+      "version": "1.1.0",
+      "license": "MIT",
+      "peer": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/username/node_modules/npm-run-path": {
+      "version": "2.0.2",
+      "license": "MIT",
+      "peer": true,
+      "dependencies": {
+        "path-key": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/username/node_modules/path-key": {
+      "version": "2.0.1",
+      "license": "MIT",
+      "peer": true,
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/username/node_modules/semver": {
+      "version": "5.7.2",
+      "license": "ISC",
+      "peer": true,
+      "bin": {
+        "semver": "bin/semver"
+      }
+    },
+    "node_modules/username/node_modules/shebang-command": {
+      "version": "1.2.0",
+      "license": "MIT",
+      "peer": true,
+      "dependencies": {
+        "shebang-regex": "^1.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/username/node_modules/shebang-regex": {
+      "version": "1.0.0",
+      "license": "MIT",
+      "peer": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/username/node_modules/which": {
+      "version": "1.3.1",
+      "license": "ISC",
+      "peer": true,
+      "dependencies": {
+        "isexe": "^2.0.0"
+      },
+      "bin": {
+        "which": "bin/which"
+      }
+    },
     "node_modules/utf8": {
       "version": "3.0.0",
       "license": "MIT"
     },
     "node_modules/utf8-byte-length": {
-      "version": "1.0.4",
+      "version": "1.0.5",
       "dev": true,
-      "license": "WTFPL"
+      "license": "(WTFPL OR MIT)"
     },
     "node_modules/util": {
       "version": "0.11.1",
@@ -36482,23 +44323,18 @@
         "uuid": "dist/bin/uuid"
       }
     },
-    "node_modules/v8-compile-cache": {
-      "version": "2.3.0",
-      "dev": true,
-      "license": "MIT"
-    },
     "node_modules/v8-compile-cache-lib": {
       "version": "3.0.1",
       "devOptional": true,
       "license": "MIT"
     },
     "node_modules/v8-to-istanbul": {
-      "version": "9.0.1",
+      "version": "9.2.0",
       "license": "ISC",
       "dependencies": {
         "@jridgewell/trace-mapping": "^0.3.12",
         "@types/istanbul-lib-coverage": "^2.0.1",
-        "convert-source-map": "^1.6.0"
+        "convert-source-map": "^2.0.0"
       },
       "engines": {
         "node": ">=10.12.0"
@@ -36594,8 +44430,7 @@
     },
     "node_modules/warning": {
       "version": "4.0.3",
-      "resolved": "https://registry.npmjs.org/warning/-/warning-4.0.3.tgz",
-      "integrity": "sha512-rpJyN222KWIvHJ/F53XSZv0Zl/accqHR8et1kpaMTD/fLCRxtV8iX8czMzY7sVZupTI3zcUTg8eycS2kNF9l6w==",
+      "license": "MIT",
       "dependencies": {
         "loose-envify": "^1.0.0"
       }
@@ -36771,11 +44606,6 @@
         "node": ">=0.10.0"
       }
     },
-    "node_modules/watchpack-chokidar2/node_modules/is-buffer": {
-      "version": "1.1.6",
-      "license": "MIT",
-      "optional": true
-    },
     "node_modules/watchpack-chokidar2/node_modules/is-extendable": {
       "version": "0.1.1",
       "license": "MIT",
@@ -36869,6 +44699,14 @@
         "defaults": "^1.0.3"
       }
     },
+    "node_modules/web-streams-polyfill": {
+      "version": "3.3.3",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">= 8"
+      }
+    },
     "node_modules/webidl-conversions": {
       "version": "7.0.0",
       "license": "BSD-2-Clause",
@@ -37056,9 +44894,8 @@
     },
     "node_modules/webpack-cli": {
       "version": "5.1.4",
-      "resolved": "https://registry.npmjs.org/webpack-cli/-/webpack-cli-5.1.4.tgz",
-      "integrity": "sha512-pIDJHIEI9LR0yxHXQ+Qh95k2EvXpWzZ5l+d+jIo+RdSm9MiHfzazIxwwni/p7+x4eJZuvG1AJwgC4TNQ7NRgsg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@discoveryjs/json-ext": "^0.5.0",
         "@webpack-cli/configtest": "^2.1.1",
@@ -37106,18 +44943,16 @@
     },
     "node_modules/webpack-cli/node_modules/commander": {
       "version": "10.0.1",
-      "resolved": "https://registry.npmjs.org/commander/-/commander-10.0.1.tgz",
-      "integrity": "sha512-y4Mg2tXshplEbSGzx7amzPwKKOCGuoSRP/CjEdwwk0FOGlUbq6lKuoyDZTNZkmxHdJtp54hdfY/JUrdL7Xfdug==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=14"
       }
     },
     "node_modules/webpack-dev-middleware": {
       "version": "6.1.3",
-      "resolved": "https://registry.npmjs.org/webpack-dev-middleware/-/webpack-dev-middleware-6.1.3.tgz",
-      "integrity": "sha512-A4ChP0Qj8oGociTs6UdlRUGANIGrCDL3y+pmQMc+dSsraXHCatFpmMey4mYELA+juqwUqwQsUgJJISXl1KWmiw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "colorette": "^2.0.10",
         "memfs": "^3.4.12",
@@ -37143,9 +44978,8 @@
     },
     "node_modules/webpack-dev-middleware/node_modules/ajv-keywords": {
       "version": "5.1.0",
-      "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-5.1.0.tgz",
-      "integrity": "sha512-YCS/JNFAUyr5vAuhk1DWm1CBxRHW9LbJ2ozWeemrIqpbsqKjHVxYPyi5GC0rjZIT5JxJ3virVTS8wk4i/Z+krw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "fast-deep-equal": "^3.1.3"
       },
@@ -37155,15 +44989,13 @@
     },
     "node_modules/webpack-dev-middleware/node_modules/colorette": {
       "version": "2.0.20",
-      "resolved": "https://registry.npmjs.org/colorette/-/colorette-2.0.20.tgz",
-      "integrity": "sha512-IfEDxwoWIjkeXL1eXcDiow4UbKjhLdq6/EuSVR9GMN7KVH3r9gQ83e73hsz1Nd1T3ijd5xv1wcWRYO+D6kCI2w==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/webpack-dev-middleware/node_modules/memfs": {
       "version": "3.5.3",
-      "resolved": "https://registry.npmjs.org/memfs/-/memfs-3.5.3.tgz",
-      "integrity": "sha512-UERzLsxzllchadvbPs5aolHh65ISpKpM+ccLbOJ8/vvpBKmAWf+la7dXFy7Mr0ySHbdHrFv5kGFCUHHe6GFEmw==",
       "dev": true,
+      "license": "Unlicense",
       "dependencies": {
         "fs-monkey": "^1.0.4"
       },
@@ -37173,9 +45005,8 @@
     },
     "node_modules/webpack-dev-middleware/node_modules/schema-utils": {
       "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-4.2.0.tgz",
-      "integrity": "sha512-L0jRsrPpjdckP3oPug3/VxNKt2trR8TcabrM6FOAAlvC/9Phcmm+cuAgTlxBqdBR1WJx7Naj9WHw+aOmheSVbw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@types/json-schema": "^7.0.9",
         "ajv": "^8.9.0",
@@ -37192,9 +45023,8 @@
     },
     "node_modules/webpack-dev-server": {
       "version": "5.0.4",
-      "resolved": "https://registry.npmjs.org/webpack-dev-server/-/webpack-dev-server-5.0.4.tgz",
-      "integrity": "sha512-dljXhUgx3HqKP2d8J/fUMvhxGhzjeNVarDLcbO/EWMSgRizDkxHQDZQaLFL5VJY9tRBj2Gz+rvCEYYvhbqPHNA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@types/bonjour": "^3.5.13",
         "@types/connect-history-api-fallback": "^1.5.4",
@@ -37251,9 +45081,8 @@
     },
     "node_modules/webpack-dev-server/node_modules/ajv-keywords": {
       "version": "5.1.0",
-      "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-5.1.0.tgz",
-      "integrity": "sha512-YCS/JNFAUyr5vAuhk1DWm1CBxRHW9LbJ2ozWeemrIqpbsqKjHVxYPyi5GC0rjZIT5JxJ3virVTS8wk4i/Z+krw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "fast-deep-equal": "^3.1.3"
       },
@@ -37263,24 +45092,21 @@
     },
     "node_modules/webpack-dev-server/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,
+      "license": "MIT",
       "dependencies": {
         "balanced-match": "^1.0.0"
       }
     },
     "node_modules/webpack-dev-server/node_modules/colorette": {
       "version": "2.0.20",
-      "resolved": "https://registry.npmjs.org/colorette/-/colorette-2.0.20.tgz",
-      "integrity": "sha512-IfEDxwoWIjkeXL1eXcDiow4UbKjhLdq6/EuSVR9GMN7KVH3r9gQ83e73hsz1Nd1T3ijd5xv1wcWRYO+D6kCI2w==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/webpack-dev-server/node_modules/define-lazy-prop": {
       "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/define-lazy-prop/-/define-lazy-prop-3.0.0.tgz",
-      "integrity": "sha512-N+MeXYoqr3pOgn8xfyRPREN7gHakLYjhsHhWGT3fWAiL4IkAt0iDw14QiiEm2bE30c5XX5q0FtAA3CK5f9/BUg==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=12"
       },
@@ -37290,9 +45116,8 @@
     },
     "node_modules/webpack-dev-server/node_modules/glob": {
       "version": "10.3.12",
-      "resolved": "https://registry.npmjs.org/glob/-/glob-10.3.12.tgz",
-      "integrity": "sha512-TCNv8vJ+xz4QiqTpfOJA7HvYv+tNIRHKfUWw/q+v2jdgN4ebz+KY9tGx5J4rHP0o84mNP+ApH66HRX8us3Khqg==",
       "dev": true,
+      "license": "ISC",
       "dependencies": {
         "foreground-child": "^3.1.0",
         "jackspeak": "^2.3.6",
@@ -37320,9 +45145,8 @@
     },
     "node_modules/webpack-dev-server/node_modules/is-wsl": {
       "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/is-wsl/-/is-wsl-3.1.0.tgz",
-      "integrity": "sha512-UcVfVfaK4Sc4m7X3dUSoHoozQGBEFeDC+zVo06t98xe8CzHSZZBekNXH+tu0NalHolcJ/QAGqS46Hef7QXBIMw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "is-inside-container": "^1.0.0"
       },
@@ -37335,9 +45159,8 @@
     },
     "node_modules/webpack-dev-server/node_modules/minimatch": {
       "version": "9.0.4",
-      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.4.tgz",
-      "integrity": "sha512-KqWh+VchfxcMNRAJjj2tnsSJdNbHsVgnkBhTNrW7AjVo6OvLtxw8zfT9oLw1JSohlFzJ8jCoTgaoXvJ+kHt6fw==",
       "dev": true,
+      "license": "ISC",
       "dependencies": {
         "brace-expansion": "^2.0.1"
       },
@@ -37350,18 +45173,16 @@
     },
     "node_modules/webpack-dev-server/node_modules/minipass": {
       "version": "7.0.4",
-      "resolved": "https://registry.npmjs.org/minipass/-/minipass-7.0.4.tgz",
-      "integrity": "sha512-jYofLM5Dam9279rdkWzqHozUo4ybjdZmCsDHePy5V/PbBcVMiSZR97gmAy45aqi8CK1lG2ECd356FU86avfwUQ==",
       "dev": true,
+      "license": "ISC",
       "engines": {
         "node": ">=16 || 14 >=14.17"
       }
     },
     "node_modules/webpack-dev-server/node_modules/open": {
       "version": "10.1.0",
-      "resolved": "https://registry.npmjs.org/open/-/open-10.1.0.tgz",
-      "integrity": "sha512-mnkeQ1qP5Ue2wd+aivTD3NHd/lZ96Lu0jgf0pwktLPtx6cTZiH7tyeGRRHs0zX0rbrahXPnXlUnbeXyaBBuIaw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "default-browser": "^5.2.1",
         "define-lazy-prop": "^3.0.0",
@@ -37377,9 +45198,8 @@
     },
     "node_modules/webpack-dev-server/node_modules/rimraf": {
       "version": "5.0.5",
-      "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-5.0.5.tgz",
-      "integrity": "sha512-CqDakW+hMe/Bz202FPEymy68P+G50RfMQK+Qo5YUqc9SPipvbGjCGKd0RSKEelbsfQuw3g5NZDSrlZZAJurH1A==",
       "dev": true,
+      "license": "ISC",
       "dependencies": {
         "glob": "^10.3.7"
       },
@@ -37395,9 +45215,8 @@
     },
     "node_modules/webpack-dev-server/node_modules/schema-utils": {
       "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-4.2.0.tgz",
-      "integrity": "sha512-L0jRsrPpjdckP3oPug3/VxNKt2trR8TcabrM6FOAAlvC/9Phcmm+cuAgTlxBqdBR1WJx7Naj9WHw+aOmheSVbw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@types/json-schema": "^7.0.9",
         "ajv": "^8.9.0",
@@ -37414,9 +45233,8 @@
     },
     "node_modules/webpack-dev-server/node_modules/webpack-dev-middleware": {
       "version": "7.2.1",
-      "resolved": "https://registry.npmjs.org/webpack-dev-middleware/-/webpack-dev-middleware-7.2.1.tgz",
-      "integrity": "sha512-hRLz+jPQXo999Nx9fXVdKlg/aehsw1ajA9skAneGmT03xwmyuhvF93p6HUKKbWhXdcERtGTzUCtIQr+2IQegrA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "colorette": "^2.0.10",
         "memfs": "^4.6.0",
@@ -37443,9 +45261,8 @@
     },
     "node_modules/webpack-hot-middleware": {
       "version": "2.26.1",
-      "resolved": "https://registry.npmjs.org/webpack-hot-middleware/-/webpack-hot-middleware-2.26.1.tgz",
-      "integrity": "sha512-khZGfAeJx6I8K9zKohEWWYN6KDlVw2DHownoe+6Vtwj1LP9WFgegXnVMSkZ/dBEBtXFwrkkydsaPFlB7f8wU2A==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "ansi-html-community": "0.0.8",
         "html-entities": "^2.1.0",
@@ -37472,11 +45289,17 @@
         "source-map": "~0.6.1"
       }
     },
+    "node_modules/webpack-sources/node_modules/source-map": {
+      "version": "0.6.1",
+      "license": "BSD-3-Clause",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
     "node_modules/webpack-virtual-modules": {
       "version": "0.5.0",
-      "resolved": "https://registry.npmjs.org/webpack-virtual-modules/-/webpack-virtual-modules-0.5.0.tgz",
-      "integrity": "sha512-kyDivFZ7ZM0BVOUteVbDFhlRt7Ah/CSPwJdi8hBpkK7QLumUqdLtVfm/PX/hkcnrvr0i77fO5+TjZ94Pe+C9iw==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/webpack/node_modules/@types/estree": {
       "version": "1.0.1",
@@ -37546,6 +45369,16 @@
         "node": ">=0.8.0"
       }
     },
+    "node_modules/whatwg-encoding": {
+      "version": "2.0.0",
+      "license": "MIT",
+      "dependencies": {
+        "iconv-lite": "0.6.3"
+      },
+      "engines": {
+        "node": ">=12"
+      }
+    },
     "node_modules/whatwg-fetch": {
       "version": "3.6.2",
       "license": "MIT"
@@ -37584,7 +45417,6 @@
     },
     "node_modules/which-boxed-primitive": {
       "version": "1.0.2",
-      "dev": true,
       "license": "MIT",
       "dependencies": {
         "is-bigint": "^1.0.1",
@@ -37641,14 +45473,14 @@
       "license": "ISC"
     },
     "node_modules/which-typed-array": {
-      "version": "1.1.11",
+      "version": "1.1.15",
       "license": "MIT",
       "dependencies": {
-        "available-typed-arrays": "^1.0.5",
-        "call-bind": "^1.0.2",
+        "available-typed-arrays": "^1.0.7",
+        "call-bind": "^1.0.7",
         "for-each": "^0.3.3",
         "gopd": "^1.0.1",
-        "has-tostringtag": "^1.0.0"
+        "has-tostringtag": "^1.0.2"
       },
       "engines": {
         "node": ">= 0.4"
@@ -37659,8 +45491,8 @@
     },
     "node_modules/wide-align": {
       "version": "1.1.5",
+      "devOptional": true,
       "license": "ISC",
-      "optional": true,
       "dependencies": {
         "string-width": "^1.0.2 || 2 || 3 || 4"
       }
@@ -37680,10 +45512,18 @@
       "version": "4.0.15",
       "license": "MIT"
     },
+    "node_modules/word-wrap": {
+      "version": "1.2.5",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
     "node_modules/wordwrap": {
       "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-1.0.0.tgz",
-      "integrity": "sha512-gvVzJFlPycKc5dZN4yPkP8w7Dc37BtP1yczEneOb4uq34pXZcvrtRTmWV8W+Ume+XCxKgbjM+nevkyFPMybd4Q=="
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/wrap-ansi": {
       "version": "7.0.0",
@@ -37820,6 +45660,46 @@
         "uuid": "dist/bin/uuid"
       }
     },
+    "node_modules/xml-formatter": {
+      "version": "2.6.1",
+      "license": "MIT",
+      "peer": true,
+      "dependencies": {
+        "xml-parser-xo": "^3.2.0"
+      },
+      "engines": {
+        "node": ">= 10"
+      }
+    },
+    "node_modules/xml-parser": {
+      "version": "1.2.1",
+      "license": "MIT",
+      "peer": true,
+      "dependencies": {
+        "debug": "^2.2.0"
+      }
+    },
+    "node_modules/xml-parser-xo": {
+      "version": "3.2.0",
+      "license": "MIT",
+      "peer": true,
+      "engines": {
+        "node": ">= 10"
+      }
+    },
+    "node_modules/xml-parser/node_modules/debug": {
+      "version": "2.6.9",
+      "license": "MIT",
+      "peer": true,
+      "dependencies": {
+        "ms": "2.0.0"
+      }
+    },
+    "node_modules/xml-parser/node_modules/ms": {
+      "version": "2.0.0",
+      "license": "MIT",
+      "peer": true
+    },
     "node_modules/xml2js": {
       "version": "0.6.0",
       "license": "MIT",
@@ -37849,6 +45729,14 @@
       "version": "2.2.0",
       "license": "MIT"
     },
+    "node_modules/xpath": {
+      "version": "0.0.27",
+      "license": "MIT",
+      "peer": true,
+      "engines": {
+        "node": ">=0.6.0"
+      }
+    },
     "node_modules/xtend": {
       "version": "4.0.2",
       "license": "MIT",
@@ -37873,8 +45761,7 @@
     },
     "node_modules/yargs": {
       "version": "17.7.2",
-      "resolved": "https://registry.npmjs.org/yargs/-/yargs-17.7.2.tgz",
-      "integrity": "sha512-7dSzzRQ++CKnNI/krKnYRV7JKKPUXMEh61soaHKg9mrWEhzFWhFnxPxGl+69cD1Ou63C13NUPCnmIcrvqCuM6w==",
+      "license": "MIT",
       "dependencies": {
         "cliui": "^8.0.1",
         "escalade": "^3.1.1",
@@ -37888,18 +45775,24 @@
         "node": ">=12"
       }
     },
+    "node_modules/yargs-parser": {
+      "version": "20.2.9",
+      "license": "ISC",
+      "peer": true,
+      "engines": {
+        "node": ">=10"
+      }
+    },
     "node_modules/yargs/node_modules/y18n": {
       "version": "5.0.8",
-      "resolved": "https://registry.npmjs.org/y18n/-/y18n-5.0.8.tgz",
-      "integrity": "sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA==",
+      "license": "ISC",
       "engines": {
         "node": ">=10"
       }
     },
     "node_modules/yargs/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==",
+      "license": "ISC",
       "engines": {
         "node": ">=12"
       }
@@ -38001,12 +45894,23 @@
       }
     },
     "node_modules/zod": {
-      "version": "3.22.4",
+      "version": "3.23.8",
       "dev": true,
       "license": "MIT",
       "funding": {
         "url": "https://github.com/sponsors/colinhacks"
       }
+    },
+    "node_modules/zod-validation-error": {
+      "version": "3.3.0",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=18.0.0"
+      },
+      "peerDependencies": {
+        "zod": "^3.18.0"
+      }
     }
   }
 }
diff --git a/package.json b/package.json
index cd23eeb5c3a1..b07c65ba6ccc 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "new.expensify",
-  "version": "1.4.70-2",
+  "version": "9.0.26-1",
   "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.",
@@ -14,16 +14,16 @@
     "clean": "npx react-native clean-project-auto",
     "android": "scripts/set-pusher-suffix.sh && npx react-native run-android --mode=developmentDebug --appId=com.expensify.chat.dev --active-arch-only",
     "ios": "scripts/set-pusher-suffix.sh && npx react-native run-ios --list-devices --mode=\"DebugDevelopment\" --scheme=\"New Expensify Dev\"",
-    "pod-install": "cd ios && bundle exec pod install",
+    "pod-install": "scripts/pod-install.sh",
     "ipad": "concurrently \"npx react-native run-ios --simulator=\\\"iPad Pro (12.9-inch) (6th generation)\\\" --mode=\\\"DebugDevelopment\\\" --scheme=\\\"New Expensify Dev\\\"\"",
     "ipad-sm": "concurrently \"npx react-native run-ios --simulator=\\\"iPad Pro (11-inch) (4th generation)\\\" --mode=\\\"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": "ts-node web/proxy.ts",
     "web-server": "webpack-dev-server --open --config config/webpack/webpack.dev.ts",
-    "build": "webpack --config config/webpack/webpack.common.ts --env file=.env.production",
-    "build-staging": "webpack --config config/webpack/webpack.common.ts --env file=.env.staging",
-    "build-adhoc": "webpack --config config/webpack/webpack.common.ts --env file=.env.adhoc",
+    "build": "webpack --config config/webpack/webpack.common.ts --env file=.env.production && ts-node scripts/combine-web-sourcemaps.ts",
+    "build-staging": "webpack --config config/webpack/webpack.common.ts --env file=.env.staging && ts-node scripts/combine-web-sourcemaps.ts",
+    "build-adhoc": "webpack --config config/webpack/webpack.common.ts --env file=.env.adhoc && ts-node scripts/combine-web-sourcemaps.ts",
     "desktop": "scripts/set-pusher-suffix.sh && ts-node desktop/start.ts",
     "desktop-build": "scripts/build-desktop.sh production",
     "desktop-build-staging": "scripts/build-desktop.sh staging",
@@ -34,9 +34,9 @@
     "android-build": "fastlane android build",
     "android-build-e2e": "bundle exec fastlane android build_e2e",
     "android-build-e2edelta": "bundle exec fastlane android build_e2edelta",
-    "test": "TZ=utc jest",
+    "test": "TZ=utc NODE_OPTIONS=--experimental-vm-modules jest",
     "typecheck": "tsc",
-    "lint": "eslint . --max-warnings=0 --cache --cache-location=node_modules/.cache/eslint",
+    "lint": "NODE_OPTIONS=--max_old_space_size=8192 eslint . --max-warnings=0 --cache --cache-location=node_modules/.cache/eslint",
     "lint-changed": "eslint --fix $(git diff --diff-filter=AM --name-only main -- \"*.js\" \"*.ts\" \"*.tsx\")",
     "lint-watch": "npx eslint-watch --watch --changed",
     "shellcheck": "./scripts/shellCheck.sh",
@@ -53,52 +53,57 @@
     "symbolicate:ios": "npx metro-symbolicate main.jsbundle.map",
     "symbolicate-release:ios": "scripts/release-profile.ts --platform=ios",
     "symbolicate-release:android": "scripts/release-profile.ts --platform=android",
+    "symbolicate-release:web": "scripts/release-profile.ts --platform=web",
+    "symbolicate-profile": "scripts/symbolicate-profile.ts",
+    "combine-web-sourcemaps": "scripts/combine-web-sourcemaps.ts",
     "test:e2e": "ts-node tests/e2e/testRunner.ts --config ./config.local.ts",
     "test:e2e:dev": "ts-node tests/e2e/testRunner.ts --config ./config.dev.ts",
     "gh-actions-unused-styles": "./.github/scripts/findUnusedKeys.sh",
-    "workflow-test": "./workflow_tests/scripts/runWorkflowTests.sh",
-    "workflow-test:generate": "ts-node workflow_tests/utils/preGenerateTest.ts",
     "setup-https": "mkcert -install && mkcert -cert-file config/webpack/certificate.pem -key-file config/webpack/key.pem dev.new.expensify.com localhost 127.0.0.1",
-    "e2e-test-runner-build": "ncc build tests/e2e/testRunner.ts -o tests/e2e/dist/"
+    "e2e-test-runner-build": "node --max-old-space-size=8192 node_modules/.bin/ncc build tests/e2e/testRunner.ts -o tests/e2e/dist/",
+    "react-compiler-healthcheck": "react-compiler-healthcheck --verbose",
+    "react-compiler-healthcheck-test": "react-compiler-healthcheck --verbose &> react-compiler-output.txt",
+    "generate-search-parser": "peggy --format es -o src/libs/SearchParser/searchParser.js src/libs/SearchParser/searchParser.peggy ",
+    "web:prod": "http-server ./dist --cors"
   },
   "dependencies": {
     "@babel/plugin-proposal-private-methods": "^7.18.6",
     "@babel/plugin-proposal-private-property-in-object": "^7.21.11",
     "@dotlottie/react-player": "^1.6.3",
-    "@expensify/react-native-live-markdown": "0.1.69",
+    "@expensify/react-native-live-markdown": "0.1.117",
     "@expo/metro-runtime": "~3.1.1",
     "@formatjs/intl-datetimeformat": "^6.10.0",
     "@formatjs/intl-listformat": "^7.2.2",
     "@formatjs/intl-locale": "^3.3.0",
     "@formatjs/intl-numberformat": "^8.5.0",
     "@formatjs/intl-pluralrules": "^5.2.2",
+    "@fullstory/babel-plugin-annotate-react": "github:fullstorydev/fullstory-babel-plugin-annotate-react#ryanwang/react-native-web-demo",
+    "@fullstory/babel-plugin-react-native": "^1.2.1",
+    "@fullstory/browser": "^2.0.3",
+    "@fullstory/react-native": "^1.4.2",
     "@gorhom/portal": "^1.0.14",
     "@invertase/react-native-apple-authentication": "^2.2.2",
-    "@kie/act-js": "^2.6.0",
-    "@kie/mock-github": "^1.0.0",
+    "@kie/act-js": "^2.6.2",
+    "@kie/mock-github": "2.0.1",
     "@onfido/react-native-sdk": "10.6.0",
     "@react-native-camera-roll/camera-roll": "7.4.0",
     "@react-native-clipboard/clipboard": "^1.13.2",
-    "@react-native-community/geolocation": "3.2.1",
+    "@react-native-community/geolocation": "3.3.0",
     "@react-native-community/netinfo": "11.2.1",
     "@react-native-firebase/analytics": "^12.3.0",
     "@react-native-firebase/app": "^12.3.0",
     "@react-native-firebase/crashlytics": "^12.3.0",
     "@react-native-firebase/perf": "^12.3.0",
     "@react-native-google-signin/google-signin": "^10.0.1",
-    "@react-native-picker/picker": "2.6.1",
+    "@react-native-picker/picker": "2.7.6",
     "@react-navigation/material-top-tabs": "^6.6.3",
     "@react-navigation/native": "6.1.12",
     "@react-navigation/stack": "6.3.29",
     "@react-ng/bounds-observer": "^0.2.1",
-    "@rnmapbox/maps": "10.1.12",
+    "@rnmapbox/maps": "10.1.26",
     "@shopify/flash-list": "1.6.3",
-    "@storybook/addon-a11y": "^8.0.6",
-    "@storybook/addon-essentials": "^8.0.6",
-    "@storybook/cli": "^8.0.6",
-    "@storybook/react": "^8.0.6",
-    "@storybook/theming": "^8.0.6",
-    "@ua/react-native-airship": "17.2.1",
+    "@types/mime-db": "^1.43.5",
+    "@ua/react-native-airship": "19.2.1",
     "@vue/preload-webpack-plugin": "^2.0.0",
     "awesome-phonenumber": "^5.4.0",
     "babel-polyfill": "^6.26.0",
@@ -108,81 +113,83 @@
     "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#9a68635cdcef4c81593c0f816a007bc9c707d46a",
-    "expo": "^50.0.3",
-    "expo-av": "~13.10.4",
-    "expo-image": "1.11.0",
-    "expo-image-manipulator": "11.8.0",
+    "expensify-common": "2.0.77",
+    "expo": "51.0.17",
+    "expo-av": "14.0.6",
+    "expo-image": "1.12.12",
+    "expo-image-manipulator": "12.0.5",
+    "fast-equals": "^4.0.3",
+    "focus-trap-react": "^10.2.3",
     "htmlparser2": "^7.2.0",
     "idb-keyval": "^6.2.1",
-    "jest-expo": "50.0.1",
+    "jest-expo": "51.0.3",
     "jest-when": "^3.5.2",
     "lodash": "4.17.21",
     "lottie-react-native": "6.5.1",
     "mapbox-gl": "^2.15.0",
     "onfido-sdk-ui": "14.15.0",
     "process": "^0.11.10",
-    "prop-types": "^15.7.2",
     "pusher-js": "8.3.0",
-    "react": "18.2.0",
+    "react": "18.3.1",
     "react-beautiful-dnd": "^13.1.1",
     "react-collapse": "^5.1.0",
+    "react-compiler-runtime": "file:./lib/react-compiler-runtime",
     "react-content-loader": "^7.0.0",
-    "react-dom": "18.1.0",
+    "react-dom": "18.3.1",
     "react-error-boundary": "^4.0.11",
-    "react-fast-pdf": "^1.0.12",
+    "react-fast-pdf": "1.0.14",
     "react-map-gl": "^7.1.3",
-    "react-native": "0.73.4",
+    "react-native": "0.75.2",
     "react-native-android-location-enabler": "^2.0.1",
     "react-native-blob-util": "0.19.4",
-    "react-native-collapsible": "^1.6.1",
+    "react-native-collapsible": "^1.6.2",
     "react-native-config": "1.5.0",
     "react-native-device-info": "10.3.1",
     "react-native-document-picker": "^9.1.1",
     "react-native-draggable-flatlist": "^4.0.1",
     "react-native-fs": "^2.20.0",
-    "react-native-gesture-handler": "2.14.1",
+    "react-native-gesture-handler": "2.18.0",
     "react-native-google-places-autocomplete": "2.5.6",
     "react-native-haptic-feedback": "^2.2.0",
     "react-native-image-picker": "^7.0.3",
-    "react-native-image-size": "git+https://github.com/Expensify/react-native-image-size#bf3ad41a61c4f6f80ed4d497599ef5247a2dd002",
+    "react-native-image-size": "git+https://github.com/Expensify/react-native-image-size#93399c6410de32966eb57085936ef6951398c2c3",
     "react-native-key-command": "^1.0.8",
+    "react-native-keyboard-controller": "^1.12.2",
     "react-native-launch-arguments": "^4.0.2",
     "react-native-linear-gradient": "^2.8.1",
     "react-native-localize": "^2.2.6",
     "react-native-modal": "^13.0.0",
-    "react-native-onyx": "2.0.32",
-    "react-native-pager-view": "6.2.3",
+    "react-native-onyx": "2.0.66",
+    "react-native-pager-view": "6.3.4",
     "react-native-pdf": "6.7.3",
     "react-native-performance": "^5.1.0",
-    "react-native-permissions": "^3.9.3",
+    "react-native-permissions": "^3.10.0",
     "react-native-picker-select": "git+https://github.com/Expensify/react-native-picker-select.git#da50d2c5c54e268499047f9cc98b8df4196c1ddf",
-    "react-native-plaid-link-sdk": "11.5.0",
-    "react-native-qrcode-svg": "^6.2.0",
+    "react-native-plaid-link-sdk": "11.11.0",
+    "react-native-qrcode-svg": "git+https://github.com/Expensify/react-native-qrcode-svg-old",
     "react-native-quick-sqlite": "git+https://github.com/margelo/react-native-quick-sqlite#abc91857d4b3efb2020ec43abd2a508563b64316",
-    "react-native-reanimated": "^3.7.2",
-    "react-native-release-profiler": "^0.1.6",
+    "react-native-reanimated": "3.13.0",
+    "react-native-release-profiler": "^0.2.1",
     "react-native-render-html": "6.3.1",
-    "react-native-safe-area-context": "4.8.2",
-    "react-native-screens": "3.30.1",
+    "react-native-safe-area-context": "4.10.9",
+    "react-native-screens": "3.34.0",
     "react-native-share": "^10.0.2",
     "react-native-sound": "^0.11.2",
-    "react-native-svg": "14.1.0",
+    "react-native-svg": "15.4.0",
     "react-native-tab-view": "^3.5.2",
     "react-native-url-polyfill": "^2.0.0",
     "react-native-view-shot": "3.8.0",
-    "react-native-vision-camera": "^4.0.0-beta.13",
-    "react-native-web": "^0.19.9",
+    "react-native-vision-camera": "4.0.0-beta.13",
+    "react-native-web": "^0.19.12",
     "react-native-web-linear-gradient": "^1.1.2",
     "react-native-web-sound": "^0.1.3",
-    "react-native-webview": "13.6.4",
-    "react-pdf": "^7.7.0",
+    "react-native-webview": "13.8.6",
+    "react-pdf": "^7.7.3",
     "react-plaid-link": "3.3.2",
     "react-web-config": "^1.0.0",
     "react-webcam": "^7.1.1",
     "react-window": "^1.8.9",
-    "semver": "^7.5.2",
-    "shim-keyboard-event-key": "^1.0.3"
+    "semver": "^7.5.2"
   },
   "devDependencies": {
     "@actions/core": "1.10.0",
@@ -198,23 +205,34 @@
     "@babel/runtime": "^7.20.0",
     "@babel/traverse": "^7.22.20",
     "@babel/types": "^7.22.19",
-    "@dword-design/eslint-plugin-import-alias": "^4.0.8",
+    "@callstack/reassure-compare": "^1.0.0-rc.4",
+    "@dword-design/eslint-plugin-import-alias": "^5.0.0",
     "@electron/notarize": "^2.1.0",
     "@jest/globals": "^29.5.0",
     "@ngneat/falso": "^7.1.1",
     "@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/babel-preset": "^0.73.21",
-    "@react-native/metro-config": "^0.73.5",
+    "@octokit/webhooks-types": "^7.5.1",
+    "@perf-profiler/profiler": "^0.10.10",
+    "@perf-profiler/reporter": "^0.9.0",
+    "@perf-profiler/types": "^0.8.0",
+    "@react-native-community/eslint-config": "3.2.0",
+    "@react-native/babel-preset": "0.75.2",
+    "@react-native/metro-config": "0.75.2",
     "@react-navigation/devtools": "^6.0.10",
+    "@storybook/addon-a11y": "^8.1.10",
+    "@storybook/addon-essentials": "^8.1.10",
     "@storybook/addon-webpack5-compiler-babel": "^3.0.3",
-    "@storybook/react-webpack5": "^8.0.6",
+    "@storybook/cli": "^8.1.10",
+    "@storybook/react": "^8.1.10",
+    "@storybook/react-webpack5": "^8.1.6",
+    "@storybook/theming": "^8.1.10",
     "@svgr/webpack": "^6.0.0",
     "@testing-library/jest-native": "5.4.1",
     "@testing-library/react-native": "11.5.1",
     "@trivago/prettier-plugin-sort-imports": "^4.2.0",
+    "@types/base-64": "^1.0.2",
     "@types/canvas-size": "^1.2.2",
     "@types/concurrently": "^7.0.0",
     "@types/jest": "^29.5.2",
@@ -224,24 +242,26 @@
     "@types/mapbox-gl": "^2.7.13",
     "@types/node": "^20.11.5",
     "@types/pusher-js": "^5.1.0",
-    "@types/react": "18.2.45",
+    "@types/react": "^18.2.6",
     "@types/react-beautiful-dnd": "^13.1.4",
     "@types/react-collapse": "^5.0.1",
     "@types/react-dom": "^18.2.4",
+    "@types/react-is": "^18.3.0",
+    "@types/react-native-web": "^0.0.0",
     "@types/react-test-renderer": "^18.0.0",
     "@types/semver": "^7.5.4",
     "@types/setimmediate": "^1.0.2",
     "@types/webpack": "^5.28.5",
     "@types/webpack-bundle-analyzer": "^4.7.0",
-    "@typescript-eslint/eslint-plugin": "^6.13.2",
-    "@typescript-eslint/parser": "^6.13.2",
+    "@typescript-eslint/eslint-plugin": "^7.13.1",
+    "@typescript-eslint/parser": "^7.13.1",
     "@vercel/ncc": "0.38.1",
     "@welldone-software/why-did-you-render": "7.0.1",
     "ajv-cli": "^5.0.0",
-    "babel-eslint": "^10.1.0",
     "babel-jest": "29.4.1",
     "babel-loader": "^9.1.3",
     "babel-plugin-module-resolver": "^5.0.0",
+    "babel-plugin-react-compiler": "0.0.0-experimental-334f00b-20240725",
     "babel-plugin-react-native-web": "^0.18.7",
     "babel-plugin-transform-class-properties": "^6.24.1",
     "babel-plugin-transform-remove-console": "^6.9.4",
@@ -252,44 +272,51 @@
     "csv-parse": "^5.5.5",
     "diff-so-fancy": "^1.3.0",
     "dotenv": "^16.0.3",
-    "electron": "^29.2.0",
-    "electron-builder": "24.13.2",
-    "eslint": "^7.6.0",
-    "eslint-config-airbnb-typescript": "^17.1.0",
-    "eslint-config-expensify": "^2.0.47",
-    "eslint-config-prettier": "^8.8.0",
-    "eslint-plugin-import": "^2.29.1",
-    "eslint-plugin-jest": "^24.1.0",
+    "electron": "^29.4.6",
+    "electron-builder": "25.0.0",
+    "eslint": "^8.57.0",
+    "eslint-config-airbnb-typescript": "^18.0.0",
+    "eslint-config-expensify": "^2.0.58",
+    "eslint-config-prettier": "^9.1.0",
+    "eslint-plugin-jest": "^28.6.0",
     "eslint-plugin-jsdoc": "^46.2.6",
-    "eslint-plugin-jsx-a11y": "^6.6.1",
+    "eslint-plugin-react-compiler": "0.0.0-experimental-9ed098e-20240725",
     "eslint-plugin-react-native-a11y": "^3.3.0",
     "eslint-plugin-storybook": "^0.8.0",
     "eslint-plugin-testing-library": "^6.2.2",
-    "eslint-plugin-you-dont-need-lodash-underscore": "^6.12.0",
+    "eslint-plugin-you-dont-need-lodash-underscore": "^6.14.0",
     "html-webpack-plugin": "^5.5.0",
+    "http-server": "^14.1.1",
     "jest": "29.4.1",
     "jest-circus": "29.4.1",
     "jest-cli": "29.4.1",
     "jest-environment-jsdom": "^29.4.1",
     "jest-transformer-svg": "^2.0.1",
+    "link": "^2.1.1",
     "memfs": "^4.6.0",
     "onchange": "^7.1.0",
+    "openai": "^4.47.2",
     "patch-package": "^8.0.0",
+    "peggy": "^4.0.3",
     "portfinder": "^1.0.28",
     "prettier": "^2.8.8",
     "pusher-js-mock": "^0.3.3",
+    "react-compiler-healthcheck": "^0.0.0-experimental-ab3118d-20240725",
+    "react-is": "^18.3.1",
     "react-native-clean-project": "^4.0.0-alpha4.0",
-    "react-test-renderer": "18.2.0",
-    "reassure": "^0.10.1",
+    "react-test-renderer": "18.3.1",
+    "reassure": "^1.0.0-rc.4",
     "setimmediate": "^1.0.5",
     "shellcheck": "^1.1.0",
-    "storybook": "^8.0.6",
+    "source-map": "^0.7.4",
+    "storybook": "^8.1.10",
     "style-loader": "^2.0.0",
     "time-analytics-webpack-plugin": "^0.1.17",
     "ts-jest": "^29.1.2",
     "ts-node": "^10.9.2",
-    "type-fest": "^4.10.2",
-    "typescript": "^5.3.2",
+    "tsconfig-paths": "^4.2.0",
+    "type-fest": "4.20.0",
+    "typescript": "^5.4.5",
     "wait-port": "^0.2.9",
     "webpack": "^5.76.0",
     "webpack-bundle-analyzer": "^4.5.0",
@@ -299,9 +326,11 @@
     "yaml": "^2.2.1"
   },
   "overrides": {
-    "react-native": "0.73.4",
-    "expo": "$expo",
-    "react-native-svg": "$react-native-svg"
+    "expo": "51.0.17",
+    "react-native": "0.75.2",
+    "react-native-svg": "$react-native-svg",
+    "react": "18.3.1",
+    "react-dom": "18.3.1"
   },
   "expo": {
     "autolinking": {
@@ -326,7 +355,7 @@
     ]
   },
   "engines": {
-    "node": "20.10.0",
-    "npm": "10.2.3"
+    "node": "20.15.1",
+    "npm": "10.7.0"
   }
 }
diff --git a/patches/@expensify+react-native-live-markdown+0.1.117+001+intial.patch b/patches/@expensify+react-native-live-markdown+0.1.117+001+intial.patch
new file mode 100644
index 000000000000..4e59d206268e
--- /dev/null
+++ b/patches/@expensify+react-native-live-markdown+0.1.117+001+intial.patch
@@ -0,0 +1,48 @@
+diff --git a/node_modules/@expensify/react-native-live-markdown/android/src/main/java/com/expensify/livemarkdown/LiveMarkdownModule.java b/node_modules/@expensify/react-native-live-markdown/android/src/main/java/com/expensify/livemarkdown/LiveMarkdownModule.java
+index ed1428b..80641ce 100644
+--- a/node_modules/@expensify/react-native-live-markdown/android/src/main/java/com/expensify/livemarkdown/LiveMarkdownModule.java
++++ b/node_modules/@expensify/react-native-live-markdown/android/src/main/java/com/expensify/livemarkdown/LiveMarkdownModule.java
+@@ -1,7 +1,6 @@
+ package com.expensify.livemarkdown;
+ 
+ import com.facebook.react.bridge.ReactApplicationContext;
+-import com.facebook.react.bridge.UIManager;
+ import com.facebook.react.fabric.FabricUIManager;
+ import com.facebook.react.uimanager.UIManagerHelper;
+ import com.facebook.react.uimanager.common.UIManagerType;
+diff --git a/node_modules/@expensify/react-native-live-markdown/android/src/main/java/com/expensify/livemarkdown/MarkdownUtils.java b/node_modules/@expensify/react-native-live-markdown/android/src/main/java/com/expensify/livemarkdown/MarkdownUtils.java
+index 7711d8b..0000caa 100644
+--- a/node_modules/@expensify/react-native-live-markdown/android/src/main/java/com/expensify/livemarkdown/MarkdownUtils.java
++++ b/node_modules/@expensify/react-native-live-markdown/android/src/main/java/com/expensify/livemarkdown/MarkdownUtils.java
+@@ -1,6 +1,5 @@
+ package com.expensify.livemarkdown;
+ 
+-import static com.facebook.infer.annotation.ThreadConfined.UI;
+ 
+ import android.content.res.AssetManager;
+ import android.text.SpannableStringBuilder;
+@@ -8,10 +7,7 @@ import android.text.Spanned;
+ 
+ import androidx.annotation.NonNull;
+ 
+-import com.facebook.infer.annotation.Assertions;
+-import com.facebook.infer.annotation.ThreadConfined;
+-import com.facebook.react.bridge.UiThreadUtil;
+-import com.facebook.react.views.text.CustomLineHeightSpan;
++import com.facebook.react.views.text.internal.span.CustomLineHeightSpan;
+ import com.facebook.soloader.SoLoader;
+ 
+ import org.json.JSONArray;
+diff --git a/node_modules/@expensify/react-native-live-markdown/android/src/main/new_arch/CMakeLists.txt b/node_modules/@expensify/react-native-live-markdown/android/src/main/new_arch/CMakeLists.txt
+index f5dfedf..1609c60 100644
+--- a/node_modules/@expensify/react-native-live-markdown/android/src/main/new_arch/CMakeLists.txt
++++ b/node_modules/@expensify/react-native-live-markdown/android/src/main/new_arch/CMakeLists.txt
+@@ -42,6 +42,8 @@ target_link_libraries(
+   ReactAndroid::rrc_textinput
+   ReactAndroid::react_render_textlayoutmanager
+   ReactAndroid::react_render_imagemanager
++  ReactAndroid::reactnativejni
++  ReactAndroid::mapbufferjni
+   fabricjni
+   fbjni
+   folly_runtime
diff --git a/patches/@expensify+react-native-live-markdown+0.1.117+002+text-layout-manager.patch b/patches/@expensify+react-native-live-markdown+0.1.117+002+text-layout-manager.patch
new file mode 100644
index 000000000000..24f327649253
--- /dev/null
+++ b/patches/@expensify+react-native-live-markdown+0.1.117+002+text-layout-manager.patch
@@ -0,0 +1,102 @@
+diff --git a/node_modules/@expensify/react-native-live-markdown/android/src/main/java/com/expensify/livemarkdown/CustomMountingManager.java b/node_modules/@expensify/react-native-live-markdown/android/src/main/java/com/expensify/livemarkdown/CustomMountingManager.java
+index 1b4381b..7e3aebe 100644
+--- a/node_modules/@expensify/react-native-live-markdown/android/src/main/java/com/expensify/livemarkdown/CustomMountingManager.java
++++ b/node_modules/@expensify/react-native-live-markdown/android/src/main/java/com/expensify/livemarkdown/CustomMountingManager.java
+@@ -13,7 +13,6 @@ import android.text.TextPaint;
+ import androidx.annotation.NonNull;
+ import androidx.annotation.Nullable;
+ 
+-import com.facebook.common.logging.FLog;
+ import com.facebook.react.bridge.ReactContext;
+ import com.facebook.react.bridge.ReadableMap;
+ import com.facebook.react.common.mapbuffer.MapBuffer;
+@@ -21,8 +20,8 @@ import com.facebook.react.fabric.mounting.MountingManager;
+ import com.facebook.react.uimanager.PixelUtil;
+ import com.facebook.react.uimanager.ViewManagerRegistry;
+ import com.facebook.react.views.text.TextAttributeProps;
+-import com.facebook.react.views.text.TextInlineViewPlaceholderSpan;
+-import com.facebook.react.views.text.TextLayoutManagerMapBuffer;
++import com.facebook.react.views.text.internal.span.TextInlineViewPlaceholderSpan;
++import com.facebook.react.views.text.TextLayoutManager;
+ import com.facebook.yoga.YogaMeasureMode;
+ import com.facebook.yoga.YogaMeasureOutput;
+ 
+@@ -63,7 +62,7 @@ public class CustomMountingManager extends MountingManager {
+       @Nullable float[] attachmentsPositions) {
+ 
+     Spannable text =
+-      TextLayoutManagerMapBuffer.getOrCreateSpannableForText(context, attributedString, null);
++      TextLayoutManager.getOrCreateSpannableForText(context, attributedString, null);
+ 
+     if (text == null) {
+       return 0;
+@@ -71,14 +70,14 @@ public class CustomMountingManager extends MountingManager {
+ 
+     int textBreakStrategy =
+       TextAttributeProps.getTextBreakStrategy(
+-        paragraphAttributes.getString(TextLayoutManagerMapBuffer.PA_KEY_TEXT_BREAK_STRATEGY));
++        paragraphAttributes.getString(TextLayoutManager.PA_KEY_TEXT_BREAK_STRATEGY));
+     boolean includeFontPadding =
+-      paragraphAttributes.contains(TextLayoutManagerMapBuffer.PA_KEY_INCLUDE_FONT_PADDING)
+-        ? paragraphAttributes.getBoolean(TextLayoutManagerMapBuffer.PA_KEY_INCLUDE_FONT_PADDING)
++      paragraphAttributes.contains(TextLayoutManager.PA_KEY_INCLUDE_FONT_PADDING)
++        ? paragraphAttributes.getBoolean(TextLayoutManager.PA_KEY_INCLUDE_FONT_PADDING)
+         : DEFAULT_INCLUDE_FONT_PADDING;
+     int hyphenationFrequency =
+       TextAttributeProps.getHyphenationFrequency(
+-        paragraphAttributes.getString(TextLayoutManagerMapBuffer.PA_KEY_HYPHENATION_FREQUENCY));
++        paragraphAttributes.getString(TextLayoutManager.PA_KEY_HYPHENATION_FREQUENCY));
+ 
+     // StaticLayout returns wrong metrics for the last line if it's empty, add something to the
+     // last line so it's measured correctly
+@@ -89,13 +88,15 @@ public class CustomMountingManager extends MountingManager {
+       text = sb;
+     }
+ 
++    Layout.Alignment alignment = TextLayoutManager.getTextAlignment(attributedString, text);
++
+     markdownUtils.applyMarkdownFormatting((SpannableStringBuilder)text);
+ 
+     BoringLayout.Metrics boring = BoringLayout.isBoring(text, sTextPaintInstance);
+ 
+-    Class<TextLayoutManagerMapBuffer> mapBufferClass = TextLayoutManagerMapBuffer.class;
++    Class<TextLayoutManager> mapBufferClass = TextLayoutManager.class;
+     try {
+-      Method createLayoutMethod = mapBufferClass.getDeclaredMethod("createLayout", Spannable.class, BoringLayout.Metrics.class, float.class, YogaMeasureMode.class, boolean.class, int.class, int.class);
++      Method createLayoutMethod = mapBufferClass.getDeclaredMethod("createLayout", Spannable.class, BoringLayout.Metrics.class, float.class, YogaMeasureMode.class, boolean.class, int.class, int.class, Layout.Alignment.class);
+       createLayoutMethod.setAccessible(true);
+ 
+       Layout layout = (Layout)createLayoutMethod.invoke(
+@@ -106,11 +107,12 @@ public class CustomMountingManager extends MountingManager {
+         widthYogaMeasureMode,
+         includeFontPadding,
+         textBreakStrategy,
+-        hyphenationFrequency);
++        hyphenationFrequency,
++        alignment);
+ 
+       int maximumNumberOfLines =
+-        paragraphAttributes.contains(TextLayoutManagerMapBuffer.PA_KEY_MAX_NUMBER_OF_LINES)
+-          ? paragraphAttributes.getInt(TextLayoutManagerMapBuffer.PA_KEY_MAX_NUMBER_OF_LINES)
++        paragraphAttributes.contains(TextLayoutManager.PA_KEY_MAX_NUMBER_OF_LINES)
++          ? paragraphAttributes.getInt(TextLayoutManager.PA_KEY_MAX_NUMBER_OF_LINES)
+           : UNSET;
+ 
+       int calculatedLineCount =
+diff --git a/node_modules/@expensify/react-native-live-markdown/android/src/main/new_arch/CMakeLists.txt b/node_modules/@expensify/react-native-live-markdown/android/src/main/new_arch/CMakeLists.txt
+index 1609c60..1888eea 100644
+--- a/node_modules/@expensify/react-native-live-markdown/android/src/main/new_arch/CMakeLists.txt
++++ b/node_modules/@expensify/react-native-live-markdown/android/src/main/new_arch/CMakeLists.txt
+@@ -65,6 +65,12 @@ target_link_libraries(
+   yoga
+   android
+   log
++  mapbufferjni
++  reactnativejni
++  react_render_consistency
++  react_performance_timeline
++  react_render_observers_events
++  react_featureflags
+ )
+ 
+ target_compile_options(
diff --git a/patches/@expensify+react-native-live-markdown+0.1.117+003+shadow-node.patch b/patches/@expensify+react-native-live-markdown+0.1.117+003+shadow-node.patch
new file mode 100644
index 000000000000..d3ff41b29249
--- /dev/null
+++ b/patches/@expensify+react-native-live-markdown+0.1.117+003+shadow-node.patch
@@ -0,0 +1,72 @@
+diff --git a/node_modules/@expensify/react-native-live-markdown/cpp/react/renderer/components/RNLiveMarkdownSpec/MarkdownTextInputDecoratorShadowNode.cpp b/node_modules/@expensify/react-native-live-markdown/cpp/react/renderer/components/RNLiveMarkdownSpec/MarkdownTextInputDecoratorShadowNode.cpp
+index 104363d..9240e9e 100644
+--- a/node_modules/@expensify/react-native-live-markdown/cpp/react/renderer/components/RNLiveMarkdownSpec/MarkdownTextInputDecoratorShadowNode.cpp
++++ b/node_modules/@expensify/react-native-live-markdown/cpp/react/renderer/components/RNLiveMarkdownSpec/MarkdownTextInputDecoratorShadowNode.cpp
+@@ -11,7 +11,7 @@ namespace react {
+ extern const char MarkdownTextInputDecoratorViewComponentName[] =
+     "MarkdownTextInputDecoratorView";
+ 
+-const ShadowNodeFragment::Value
++const OwningShadowNodeFragment
+ MarkdownTextInputDecoratorShadowNode::updateFragmentState(
+     ShadowNodeFragment const &fragment,
+     ShadowNodeFamily::Shared const &family) {
+@@ -24,12 +24,12 @@ MarkdownTextInputDecoratorShadowNode::updateFragmentState(
+   // propagated on every clone we need it to clear the reference in the registry
+   // when the view is removed from window it cannot be done in the destructor,
+   // as multiple shadow nodes for the same family may be created
+-  return ShadowNodeFragment::Value({
++  return OwningShadowNodeFragment{
+       .props = fragment.props,
+       .children = fragment.children,
+       .state =
+           std::make_shared<const ConcreteState>(newStateData, *fragment.state),
+-  });
++  };
+ }
+ 
+ } // namespace react
+diff --git a/node_modules/@expensify/react-native-live-markdown/cpp/react/renderer/components/RNLiveMarkdownSpec/MarkdownTextInputDecoratorShadowNode.h b/node_modules/@expensify/react-native-live-markdown/cpp/react/renderer/components/RNLiveMarkdownSpec/MarkdownTextInputDecoratorShadowNode.h
+index 294e0d3..597752c 100644
+--- a/node_modules/@expensify/react-native-live-markdown/cpp/react/renderer/components/RNLiveMarkdownSpec/MarkdownTextInputDecoratorShadowNode.h
++++ b/node_modules/@expensify/react-native-live-markdown/cpp/react/renderer/components/RNLiveMarkdownSpec/MarkdownTextInputDecoratorShadowNode.h
+@@ -11,6 +11,20 @@
+ namespace facebook {
+ namespace react {
+ 
++struct OwningShadowNodeFragment {
++  Props::Shared props;
++  ShadowNode::SharedListOfShared children;
++  State::Shared state;
++  
++  operator ShadowNodeFragment() const {
++    return ShadowNodeFragment {
++      .props = props,
++      .children = children,
++      .state = state
++    };
++  }
++};
++
+ JSI_EXPORT extern const char MarkdownTextInputDecoratorViewComponentName[];
+ 
+ class JSI_EXPORT MarkdownTextInputDecoratorShadowNode final
+@@ -22,8 +36,7 @@ public:
+   MarkdownTextInputDecoratorShadowNode(ShadowNodeFragment const &fragment,
+                                        ShadowNodeFamily::Shared const &family,
+                                        ShadowNodeTraits traits)
+-      : ConcreteViewShadowNode(static_cast<ShadowNodeFragment>(
+-                                   updateFragmentState(fragment, family)),
++      : ConcreteViewShadowNode(updateFragmentState(fragment, family),
+                                family, traits) {}
+ 
+   MarkdownTextInputDecoratorShadowNode(ShadowNode const &sourceShadowNode,
+@@ -37,7 +50,7 @@ public:
+   }
+ 
+ private:
+-  static const ShadowNodeFragment::Value
++  static const OwningShadowNodeFragment
+   updateFragmentState(ShadowNodeFragment const &fragment,
+                       ShadowNodeFamily::Shared const &family);
+ };
diff --git a/patches/@expensify+react-native-live-markdown+0.1.117+004+hybrid-app.patch b/patches/@expensify+react-native-live-markdown+0.1.117+004+hybrid-app.patch
new file mode 100644
index 000000000000..00f87066c9fa
--- /dev/null
+++ b/patches/@expensify+react-native-live-markdown+0.1.117+004+hybrid-app.patch
@@ -0,0 +1,18 @@
+diff --git a/node_modules/@expensify/react-native-live-markdown/RNLiveMarkdown.podspec b/node_modules/@expensify/react-native-live-markdown/RNLiveMarkdown.podspec
+index b1620ad..b3ea39c 100644
+--- a/node_modules/@expensify/react-native-live-markdown/RNLiveMarkdown.podspec
++++ b/node_modules/@expensify/react-native-live-markdown/RNLiveMarkdown.podspec
+@@ -23,10 +23,10 @@ Pod::Spec.new do |s|
+   install_modules_dependencies(s)
+ 
+   if ENV['USE_FRAMEWORKS'] && ENV['RCT_NEW_ARCH_ENABLED']
+-    add_dependency(s, "React-Fabric", :additional_framework_paths => [
++    add_dependency(s, "React-FabricComponents", :additional_framework_paths => [
+       "react/renderer/textlayoutmanager/platform/ios",
+-      "react/renderer/components/textinput/iostextinput",
+-    ])
++      "react/renderer/components/textinput/platform/ios",
++    ]);
+   end
+ 
+   s.subspec "common" do |ss|
diff --git a/patches/@expo+cli+0.18.21+001+rn-75-fixes.patch b/patches/@expo+cli+0.18.21+001+rn-75-fixes.patch
new file mode 100644
index 000000000000..fcffe9939f2f
--- /dev/null
+++ b/patches/@expo+cli+0.18.21+001+rn-75-fixes.patch
@@ -0,0 +1,12 @@
+diff --git a/node_modules/@expo/cli/build/src/export/embed/index.js b/node_modules/@expo/cli/build/src/export/embed/index.js
+index eed477f..00e1787 100644
+--- a/node_modules/@expo/cli/build/src/export/embed/index.js
++++ b/node_modules/@expo/cli/build/src/export/embed/index.js
+@@ -80,6 +80,7 @@ const expoExportEmbed = async (argv)=>{
+         "--assets-dest": String,
+         "--asset-catalog-dest": String,
+         "--unstable-transform-profile": String,
++        '--config-cmd': String,
+         "--config": String,
+         // This is here for compatibility with the `npx react-native bundle` command.
+         // devs should use `DEBUG=expo:*` instead.
diff --git a/patches/@onfido+react-native-sdk+10.6.0.patch b/patches/@onfido+react-native-sdk+10.6.0.patch
index 225bbf3b9e46..201e9ab92c22 100644
--- a/patches/@onfido+react-native-sdk+10.6.0.patch
+++ b/patches/@onfido+react-native-sdk+10.6.0.patch
@@ -1181,7 +1181,7 @@ index 0000000..c48f86e
 +++ b/node_modules/@onfido/react-native-sdk/js/NativeOnfidoModule.ts
 @@ -0,0 +1,13 @@
 +import { TurboModuleRegistry, TurboModule } from "react-native";
-+import { Int32 } from 'react-native/Libraries/Types/CodegenTypes';
++import { Double } from 'react-native/Libraries/Types/CodegenTypes';
 +
 +export interface Spec extends TurboModule {
 +  start(config: Object): Promise<Object>;
@@ -1189,7 +1189,7 @@ index 0000000..c48f86e
 +
 +  // those two are here for event emitter methods
 +  addListener(eventName: string): void;
-+  removeListeners(count: Int32): void;
++  removeListeners(count: Double): void;
 +}
 +
 +export default TurboModuleRegistry.getEnforcing<Spec>("RNOnfidoSdk");
@@ -1317,4 +1317,4 @@ index 49f9d4c..1b9f304 100755
 +    sed -i '' -e "s/_pluginVersion = @\"[0-9]*\.[0-9]*\.[0-9]*\"/_pluginVersion = @\"$2\"/g" $1
  }
  
- update_manifest ${MANIFEST_FILE} $PACKAGE_VERSION
+ update_manifest ${MANIFEST_FILE} $PACKAGE_VERSION
\ No newline at end of file
diff --git a/patches/@perf-profiler+android+0.13.0+001+pid-changed.patch b/patches/@perf-profiler+android+0.13.0+001+pid-changed.patch
new file mode 100644
index 000000000000..d607b1460d79
--- /dev/null
+++ b/patches/@perf-profiler+android+0.13.0+001+pid-changed.patch
@@ -0,0 +1,45 @@
+diff --git a/node_modules/@perf-profiler/android/dist/src/commands/platforms/UnixProfiler.js b/node_modules/@perf-profiler/android/dist/src/commands/platforms/UnixProfiler.js
+index 657c3b0..c97e363 100644
+--- a/node_modules/@perf-profiler/android/dist/src/commands/platforms/UnixProfiler.js
++++ b/node_modules/@perf-profiler/android/dist/src/commands/platforms/UnixProfiler.js
+@@ -113,7 +113,7 @@ class UnixProfiler {
+     }
+     pollPerformanceMeasures(bundleId, { onMeasure, onStartMeasuring = () => {
+         // noop by default
+-    }, }) {
++    }, onPidChanged = () => {}}) {
+         let initialTime = null;
+         let previousTime = null;
+         let cpuMeasuresAggregator = new CpuMeasureAggregator_1.CpuMeasureAggregator(this.getCpuClockTick());
+@@ -170,6 +170,7 @@ class UnixProfiler {
+             previousTime = timestamp;
+         }, () => {
+             logger_1.Logger.warn("Process id has changed, ignoring measures until now");
++            onPidChanged();
+             reset();
+         });
+     }
+diff --git a/node_modules/@perf-profiler/android/src/commands/platforms/UnixProfiler.ts b/node_modules/@perf-profiler/android/src/commands/platforms/UnixProfiler.ts
+index be26fe6..0473f78 100644
+--- a/node_modules/@perf-profiler/android/src/commands/platforms/UnixProfiler.ts
++++ b/node_modules/@perf-profiler/android/src/commands/platforms/UnixProfiler.ts
+@@ -105,9 +105,11 @@ export abstract class UnixProfiler implements Profiler {
+       onStartMeasuring = () => {
+         // noop by default
+       },
++      onPidChanged = () => {},
+     }: {
+       onMeasure: (measure: Measure) => void;
+       onStartMeasuring?: () => void;
++      onPidChanged?: () => void;
+     }
+   ) {
+     let initialTime: number | null = null;
+@@ -187,6 +189,7 @@ export abstract class UnixProfiler implements Profiler {
+       },
+       () => {
+         Logger.warn("Process id has changed, ignoring measures until now");
++        onPidChanged();
+         reset();
+       }
+     );
diff --git a/patches/@perf-profiler+types+0.8.0+001+pid-changed.patch b/patches/@perf-profiler+types+0.8.0+001+pid-changed.patch
new file mode 100644
index 000000000000..bb24b9e880cf
--- /dev/null
+++ b/patches/@perf-profiler+types+0.8.0+001+pid-changed.patch
@@ -0,0 +1,12 @@
+diff --git a/node_modules/@perf-profiler/types/dist/index.d.ts b/node_modules/@perf-profiler/types/dist/index.d.ts
+index 0d0f55f..ef7f864 100644
+--- a/node_modules/@perf-profiler/types/dist/index.d.ts
++++ b/node_modules/@perf-profiler/types/dist/index.d.ts
+@@ -80,6 +80,7 @@ export interface ScreenRecorder {
+ export interface ProfilerPollingOptions {
+     onMeasure: (measure: Measure) => void;
+     onStartMeasuring?: () => void;
++    onPidChanged?: () => void;
+ }
+ export interface Profiler {
+     pollPerformanceMeasures: (bundleId: string, options: ProfilerPollingOptions) => {
diff --git a/patches/@react-native+assets-registry+0.73.1.patch b/patches/@react-native+assets-registry+0.75.2.patch
similarity index 100%
rename from patches/@react-native+assets-registry+0.73.1.patch
rename to patches/@react-native+assets-registry+0.75.2.patch
diff --git a/patches/@react-native+gradle-plugin+0.73.4.patch b/patches/@react-native+gradle-plugin+0.73.4.patch
deleted file mode 100644
index 680de81743e7..000000000000
--- a/patches/@react-native+gradle-plugin+0.73.4.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff --git a/node_modules/@react-native/gradle-plugin/src/main/kotlin/com/facebook/react/tasks/internal/PreparePrefabHeadersTask.kt b/node_modules/@react-native/gradle-plugin/src/main/kotlin/com/facebook/react/tasks/internal/PreparePrefabHeadersTask.kt
-index f3b55e0..5ca7316 100644
---- a/node_modules/@react-native/gradle-plugin/src/main/kotlin/com/facebook/react/tasks/internal/PreparePrefabHeadersTask.kt
-+++ b/node_modules/@react-native/gradle-plugin/src/main/kotlin/com/facebook/react/tasks/internal/PreparePrefabHeadersTask.kt
-@@ -45,15 +45,9 @@ abstract class PreparePrefabHeadersTask : DefaultTask() {
-         fs.copy {
-           it.from(headerPath)
-           it.include("**/*.h")
-+          it.include("**/*.hpp")
-           it.exclude("**/*.cpp")
-           it.exclude("**/*.txt")
--          // We don't want to copy all the boost headers as they are 250Mb+
--          it.include("boost/config.hpp")
--          it.include("boost/config/**/*.hpp")
--          it.include("boost/core/*.hpp")
--          it.include("boost/detail/workaround.hpp")
--          it.include("boost/operators.hpp")
--          it.include("boost/preprocessor/**/*.hpp")
-           it.into(File(outputFolder.asFile, headerPrefix))
-         }
-       }
diff --git a/patches/@react-native+gradle-plugin+0.75.2.patch b/patches/@react-native+gradle-plugin+0.75.2.patch
new file mode 100644
index 000000000000..e476b9039285
--- /dev/null
+++ b/patches/@react-native+gradle-plugin+0.75.2.patch
@@ -0,0 +1,21 @@
+diff --git a/node_modules/@react-native/gradle-plugin/react-native-gradle-plugin/src/main/kotlin/com/facebook/react/tasks/internal/PreparePrefabHeadersTask.kt b/node_modules/@react-native/gradle-plugin/react-native-gradle-plugin/src/main/kotlin/com/facebook/react/tasks/internal/PreparePrefabHeadersTask.kt
+index f30392d..ed87f85 100644
+--- a/node_modules/@react-native/gradle-plugin/react-native-gradle-plugin/src/main/kotlin/com/facebook/react/tasks/internal/PreparePrefabHeadersTask.kt
++++ b/node_modules/@react-native/gradle-plugin/react-native-gradle-plugin/src/main/kotlin/com/facebook/react/tasks/internal/PreparePrefabHeadersTask.kt
+@@ -45,15 +45,9 @@ abstract class PreparePrefabHeadersTask : DefaultTask() {
+         fs.copy {
+           it.from(headerPath)
+           it.include("**/*.h")
++          it.include("**/*.hpp")
+           it.exclude("**/*.cpp")
+           it.exclude("**/*.txt")
+-          // We don't want to copy all the boost headers as they are 250Mb+
+-          it.include("boost/config.hpp")
+-          it.include("boost/config/**/*.hpp")
+-          it.include("boost/core/*.hpp")
+-          it.include("boost/detail/workaround.hpp")
+-          it.include("boost/operators.hpp")
+-          it.include("boost/preprocessor/**/*.hpp")
+           // Headers needed for exposing rrc_text and rrc_textinput
+           it.include("boost/container_hash/**/*.hpp")
+           it.include("boost/detail/**/*.hpp")
diff --git a/patches/@react-native+virtualized-lists+0.73.4+002+osr-improvement.patch b/patches/@react-native+virtualized-lists+0.73.4+002+osr-improvement.patch
deleted file mode 100644
index dc45a6758d5c..000000000000
--- a/patches/@react-native+virtualized-lists+0.73.4+002+osr-improvement.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-diff --git a/node_modules/@react-native/virtualized-lists/Lists/VirtualizedList.js b/node_modules/@react-native/virtualized-lists/Lists/VirtualizedList.js
-index e338d90..70a59bf 100644
---- a/node_modules/@react-native/virtualized-lists/Lists/VirtualizedList.js
-+++ b/node_modules/@react-native/virtualized-lists/Lists/VirtualizedList.js
-@@ -1219,7 +1219,7 @@ class VirtualizedList extends StateSafePureComponent<Props, State> {
-     zoomScale: 1,
-   };
-   _scrollRef: ?React.ElementRef<any> = null;
--  _sentStartForContentLength = 0;
-+  _sentStartForFirstVisibleItemKey: ?string = null;
-   _sentEndForContentLength = 0;
-   _updateCellsToRenderBatcher: Batchinator;
-   _viewabilityTuples: Array<ViewabilityHelperCallbackTuple> = [];
-@@ -1550,16 +1550,16 @@ class VirtualizedList extends StateSafePureComponent<Props, State> {
-       onStartReached != null &&
-       this.state.cellsAroundViewport.first === 0 &&
-       isWithinStartThreshold &&
--      this._listMetrics.getContentLength() !== this._sentStartForContentLength
-+      this.state.firstVisibleItemKey !== this._sentStartForFirstVisibleItemKey
-     ) {
--      this._sentStartForContentLength = this._listMetrics.getContentLength();
-+      this._sentStartForFirstVisibleItemKey = this.state.firstVisibleItemKey;
-       onStartReached({distanceFromStart});
-     }
- 
-     // If the user scrolls away from the start or end and back again,
-     // cause onStartReached or onEndReached to be triggered again
-     if (!isWithinStartThreshold) {
--      this._sentStartForContentLength = 0;
-+      this._sentStartForFirstVisibleItemKey = null;
-     }
-     if (!isWithinEndThreshold) {
-       this._sentEndForContentLength = 0;
diff --git a/patches/@react-native+virtualized-lists+0.73.4+001+onStartReched.patch b/patches/@react-native+virtualized-lists+0.75.2+001+onStartReched.patch
similarity index 100%
rename from patches/@react-native+virtualized-lists+0.73.4+001+onStartReched.patch
rename to patches/@react-native+virtualized-lists+0.75.2+001+onStartReched.patch
diff --git a/patches/@react-native+virtualized-lists+0.75.2+002+osr-improvement.patch b/patches/@react-native+virtualized-lists+0.75.2+002+osr-improvement.patch
new file mode 100644
index 000000000000..38871a2e7764
--- /dev/null
+++ b/patches/@react-native+virtualized-lists+0.75.2+002+osr-improvement.patch
@@ -0,0 +1,112 @@
+diff --git a/node_modules/@react-native/virtualized-lists/Lists/VirtualizedList.js b/node_modules/@react-native/virtualized-lists/Lists/VirtualizedList.js
+index e338d90..238989f 100644
+--- a/node_modules/@react-native/virtualized-lists/Lists/VirtualizedList.js
++++ b/node_modules/@react-native/virtualized-lists/Lists/VirtualizedList.js
+@@ -89,6 +89,7 @@ type State = {
+   firstVisibleItemKey: ?string,
+   // When > 0 the scroll position available in JS is considered stale and should not be used.
+   pendingScrollUpdateCount: number,
++  lastItemCount: number,
+ };
+ 
+ function getScrollingThreshold(threshold: number, visibleLength: number) {
+@@ -404,12 +405,13 @@ class VirtualizedList extends StateSafePureComponent<Props, State> {
+ 
+     const minIndexForVisible =
+       this.props.maintainVisibleContentPosition?.minIndexForVisible ?? 0;
++    const itemCount = this.props.getItemCount(this.props.data);
+ 
+     this.state = {
+       cellsAroundViewport: initialRenderRegion,
+       renderMask: VirtualizedList._createRenderMask(props, initialRenderRegion),
+       firstVisibleItemKey:
+-        this.props.getItemCount(this.props.data) > minIndexForVisible
++        itemCount > minIndexForVisible
+           ? VirtualizedList._getItemKey(this.props, minIndexForVisible)
+           : null,
+       // When we have a non-zero initialScrollIndex, we will receive a
+@@ -420,6 +422,7 @@ class VirtualizedList extends StateSafePureComponent<Props, State> {
+         this.props.initialScrollIndex > 0
+           ? 1
+           : 0,
++      lastItemCount: itemCount,
+     };
+   }
+ 
+@@ -701,16 +704,15 @@ class VirtualizedList extends StateSafePureComponent<Props, State> {
+     // first and last could be stale (e.g. if a new, shorter items props is passed in), so we make
+     // sure we're rendering a reasonable range here.
+     const itemCount = newProps.getItemCount(newProps.data);
+-    if (itemCount === prevState.renderMask.numCells()) {
++    if (itemCount === prevState.renderMask.numCells() && itemCount === prevState.lastItemCount) {
+       return prevState;
+     }
+-
+     let maintainVisibleContentPositionAdjustment: ?number = null;
+     const prevFirstVisibleItemKey = prevState.firstVisibleItemKey;
+     const minIndexForVisible =
+       newProps.maintainVisibleContentPosition?.minIndexForVisible ?? 0;
+     const newFirstVisibleItemKey =
+-      newProps.getItemCount(newProps.data) > minIndexForVisible
++      itemCount > minIndexForVisible
+         ? VirtualizedList._getItemKey(newProps, minIndexForVisible)
+         : null;
+     if (
+@@ -758,6 +760,7 @@ class VirtualizedList extends StateSafePureComponent<Props, State> {
+         maintainVisibleContentPositionAdjustment != null
+           ? prevState.pendingScrollUpdateCount + 1
+           : prevState.pendingScrollUpdateCount,
++      lastItemCount: itemCount,
+     };
+   }
+ 
+@@ -1159,7 +1162,7 @@ class VirtualizedList extends StateSafePureComponent<Props, State> {
+     }
+   }
+ 
+-  componentDidUpdate(prevProps: Props) {
++  componentDidUpdate(prevProps: Props, prevState: State) {
+     const {data, extraData} = this.props;
+     if (data !== prevProps.data || extraData !== prevProps.extraData) {
+       // clear the viewableIndices cache to also trigger
+@@ -1181,6 +1184,11 @@ class VirtualizedList extends StateSafePureComponent<Props, State> {
+     if (hiPriInProgress) {
+       this._hiPriInProgress = false;
+     }
++
++    if (this.state.cellsAroundViewport.first !== prevState.cellsAroundViewport.first ||
++        this.state.cellsAroundViewport.last !== prevState.cellsAroundViewport.last) {
++      this._maybeCallOnEdgeReached();
++    }
+   }
+ 
+   _cellRefs: {[string]: null | CellRenderer<any>} = {};
+@@ -1219,7 +1227,7 @@ class VirtualizedList extends StateSafePureComponent<Props, State> {
+     zoomScale: 1,
+   };
+   _scrollRef: ?React.ElementRef<any> = null;
+-  _sentStartForContentLength = 0;
++  _sentStartForFirstVisibleItemKey: ?string = null;
+   _sentEndForContentLength = 0;
+   _updateCellsToRenderBatcher: Batchinator;
+   _viewabilityTuples: Array<ViewabilityHelperCallbackTuple> = [];
+@@ -1550,16 +1558,16 @@ class VirtualizedList extends StateSafePureComponent<Props, State> {
+       onStartReached != null &&
+       this.state.cellsAroundViewport.first === 0 &&
+       isWithinStartThreshold &&
+-      this._listMetrics.getContentLength() !== this._sentStartForContentLength
++      this.state.firstVisibleItemKey !== this._sentStartForFirstVisibleItemKey
+     ) {
+-      this._sentStartForContentLength = this._listMetrics.getContentLength();
++      this._sentStartForFirstVisibleItemKey = this.state.firstVisibleItemKey;
+       onStartReached({distanceFromStart});
+     }
+ 
+     // If the user scrolls away from the start or end and back again,
+     // cause onStartReached or onEndReached to be triggered again
+     if (!isWithinStartThreshold) {
+-      this._sentStartForContentLength = 0;
++      this._sentStartForFirstVisibleItemKey = null;
+     }
+     if (!isWithinEndThreshold) {
+       this._sentEndForContentLength = 0;
diff --git a/patches/@react-native-camera-roll+camera-roll+7.4.0+001+hybrid-app.patch b/patches/@react-native-camera-roll+camera-roll+7.4.0+001+hybrid-app.patch
new file mode 100644
index 000000000000..9d848520a943
--- /dev/null
+++ b/patches/@react-native-camera-roll+camera-roll+7.4.0+001+hybrid-app.patch
@@ -0,0 +1,15 @@
+diff --git a/node_modules/@react-native-camera-roll/camera-roll/android/build.gradle b/node_modules/@react-native-camera-roll/camera-roll/android/build.gradle
+index 6891fa3..8397f95 100644
+--- a/node_modules/@react-native-camera-roll/camera-roll/android/build.gradle
++++ b/node_modules/@react-native-camera-roll/camera-roll/android/build.gradle
+@@ -81,7 +81,9 @@ def findNodeModulePath(baseDir, packageName) {
+ }
+ 
+ def resolveReactNativeDirectory() {
+-    def reactNative = file("${findNodeModulePath(rootProject.projectDir, "react-native")}")
++    def projectDir = this.hasProperty('reactNativeProject') ? this.reactNativeProject : rootProject.projectDir
++    def modulePath = file(projectDir);
++    def reactNative = file("${findNodeModulePath(modulePath, 'react-native')}")
+     if (reactNative.exists()) {
+         return reactNative
+     }
diff --git a/patches/@react-native-camera-roll+camera-roll+7.4.0+002+asset.patch b/patches/@react-native-camera-roll+camera-roll+7.4.0+002+asset.patch
new file mode 100644
index 000000000000..48905880f641
--- /dev/null
+++ b/patches/@react-native-camera-roll+camera-roll+7.4.0+002+asset.patch
@@ -0,0 +1,19 @@
+diff --git a/node_modules/@react-native-camera-roll/camera-roll/ios/RNCCameraRoll.mm b/node_modules/@react-native-camera-roll/camera-roll/ios/RNCCameraRoll.mm
+index 4769d28..ef88a07 100644
+--- a/node_modules/@react-native-camera-roll/camera-roll/ios/RNCCameraRoll.mm
++++ b/node_modules/@react-native-camera-roll/camera-roll/ios/RNCCameraRoll.mm
+@@ -207,6 +207,14 @@ static void requestPhotoLibraryAccess(RCTPromiseRejectBlock reject, PhotosAuthor
+         options.fetchLimit = 1;
+         PHFetchResult<PHAsset *> *createdAsset = [PHAsset fetchAssetsWithLocalIdentifiers:@[placeholder.localIdentifier]
+                                                                                   options:options];
++
++        if (![createdAsset isKindOfClass:[PHAsset class]]) {
++          resolve(@{
++            @"node": [NSNull null]
++          });
++          return;
++        }
++
+         if (createdAsset.count < 1) {
+           reject(kErrorUnableToSave, nil, nil);
+           return;
diff --git a/patches/@react-native-camera-roll+camera-roll+7.4.0.patch b/patches/@react-native-camera-roll+camera-roll+7.4.0.patch
deleted file mode 100644
index 59fdaf904c8e..000000000000
--- a/patches/@react-native-camera-roll+camera-roll+7.4.0.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-diff --git a/node_modules/@react-native-camera-roll/camera-roll/android/build.gradle b/node_modules/@react-native-camera-roll/camera-roll/android/build.gradle
-index 6891fa3..8397f95 100644
---- a/node_modules/@react-native-camera-roll/camera-roll/android/build.gradle
-+++ b/node_modules/@react-native-camera-roll/camera-roll/android/build.gradle
-@@ -81,7 +81,9 @@ def findNodeModulePath(baseDir, packageName) {
- }
- 
- def resolveReactNativeDirectory() {
--    def reactNative = file("${findNodeModulePath(rootProject.projectDir, "react-native")}")
-+    def projectDir = this.hasProperty('reactNativeProject') ? this.reactNativeProject : rootProject.projectDir
-+    def modulePath = file(projectDir);
-+    def reactNative = file("${findNodeModulePath(modulePath, 'react-native')}")
-     if (reactNative.exists()) {
-         return reactNative
-     }
-diff --git a/node_modules/@react-native-camera-roll/camera-roll/ios/RNCCameraRoll.mm b/node_modules/@react-native-camera-roll/camera-roll/ios/RNCCameraRoll.mm
-index 4769d28..ef88a07 100644
---- a/node_modules/@react-native-camera-roll/camera-roll/ios/RNCCameraRoll.mm
-+++ b/node_modules/@react-native-camera-roll/camera-roll/ios/RNCCameraRoll.mm
-@@ -207,6 +207,14 @@ static void requestPhotoLibraryAccess(RCTPromiseRejectBlock reject, PhotosAuthor
-         options.fetchLimit = 1;
-         PHFetchResult<PHAsset *> *createdAsset = [PHAsset fetchAssetsWithLocalIdentifiers:@[placeholder.localIdentifier]
-                                                                                   options:options];
-+
-+        if (![createdAsset isKindOfClass:[PHAsset class]]) {
-+          resolve(@{
-+            @"node": [NSNull null]
-+          });
-+          return;
-+        }
-+
-         if (createdAsset.count < 1) {
-           reject(kErrorUnableToSave, nil, nil);
-           return;
diff --git a/patches/@react-native-community+cli-platform-android+12.3.2.patch b/patches/@react-native-community+cli-platform-android+12.3.2.patch
deleted file mode 100644
index d94baf0f9c6e..000000000000
--- a/patches/@react-native-community+cli-platform-android+12.3.2.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-diff --git a/node_modules/@react-native-community/cli-platform-android/native_modules.gradle b/node_modules/@react-native-community/cli-platform-android/native_modules.gradle
-index bbfa7f7..ed53872 100644
---- a/node_modules/@react-native-community/cli-platform-android/native_modules.gradle
-+++ b/node_modules/@react-native-community/cli-platform-android/native_modules.gradle
-@@ -140,6 +140,7 @@ class ReactNativeModules {
-   private Logger logger
-   private String packageName
-   private File root
-+  private File rnRoot
-   private ArrayList<HashMap<String, String>> reactNativeModules
-   private ArrayList<String> unstable_reactLegacyComponentNames
-   private HashMap<String, ArrayList> reactNativeModulesBuildVariants
-@@ -147,9 +148,10 @@ class ReactNativeModules {
- 
-   private static String LOG_PREFIX = ":ReactNative:"
- 
--  ReactNativeModules(Logger logger, File root) {
-+  ReactNativeModules(Logger logger, File root, File rnRoot) {
-     this.logger = logger
-     this.root = root
-+    this.rnRoot = rnRoot
- 
-     def (nativeModules, reactNativeModulesBuildVariants, androidProject, reactNativeVersion) = this.getReactNativeConfig()
-     this.reactNativeModules = nativeModules
-@@ -416,10 +418,10 @@ class ReactNativeModules {
-      */
-     def cliResolveScript = "try {console.log(require('@react-native-community/cli').bin);} catch (e) {console.log(require('react-native/cli').bin);}"
-     String[] nodeCommand = ["node", "-e", cliResolveScript]
--    def cliPath = this.getCommandOutput(nodeCommand, this.root)
-+    def cliPath = this.getCommandOutput(nodeCommand, this.rnRoot)
- 
-     String[] reactNativeConfigCommand = ["node", cliPath, "config"]
--    def reactNativeConfigOutput = this.getCommandOutput(reactNativeConfigCommand, this.root)
-+    def reactNativeConfigOutput = this.getCommandOutput(reactNativeConfigCommand, this.rnRoot)
- 
-     def json
-     try {
-@@ -486,7 +488,13 @@ class ReactNativeModules {
-  */
- def projectRoot = rootProject.projectDir
- 
--def autoModules = new ReactNativeModules(logger, projectRoot)
-+def autoModules
-+
-+if(this.hasProperty('reactNativeProject')){
-+    autoModules = new ReactNativeModules(logger, projectRoot, new File(projectRoot, reactNativeProject))
-+} else {
-+    autoModules = new ReactNativeModules(logger, projectRoot, projectRoot)
-+}
- 
- def reactNativeVersionRequireNewArchEnabled(autoModules) {
-     def rnVersion = autoModules.reactNativeVersion
diff --git a/patches/@react-native-community+cli-platform-android+14.0.0+001+hybrid-app.patch b/patches/@react-native-community+cli-platform-android+14.0.0+001+hybrid-app.patch
new file mode 100644
index 000000000000..7f64391efe4c
--- /dev/null
+++ b/patches/@react-native-community+cli-platform-android+14.0.0+001+hybrid-app.patch
@@ -0,0 +1,52 @@
+diff --git a/node_modules/@react-native-community/cli-platform-android/native_modules.gradle b/node_modules/@react-native-community/cli-platform-android/native_modules.gradle
+index 43296c6..0d91033 100644
+--- a/node_modules/@react-native-community/cli-platform-android/native_modules.gradle
++++ b/node_modules/@react-native-community/cli-platform-android/native_modules.gradle
+@@ -149,16 +149,18 @@ class ReactNativeModules {
+   private ProviderFactory providers
+   private String packageName
+   private File root
++  private File rnRoot
+   private ArrayList<HashMap<String, String>> reactNativeModules
+   private HashMap<String, ArrayList> reactNativeModulesBuildVariants
+   private String reactNativeVersion
+ 
+   private static String LOG_PREFIX = ":ReactNative:"
+ 
+-  ReactNativeModules(Logger logger, ProviderFactory providers, File root) {
++  ReactNativeModules(Logger logger, ProviderFactory providers, File root, File rnRoot) {
+     this.logger = logger
+     this.providers = providers
+     this.root = root
++    this.rnRoot = rnRoot
+ 
+     def (nativeModules, reactNativeModulesBuildVariants, androidProject, reactNativeVersion) = this.getReactNativeConfig()
+     this.reactNativeModules = nativeModules
+@@ -440,10 +442,10 @@ class ReactNativeModules {
+      */
+     def cliResolveScript = "try {console.log(require('@react-native-community/cli').bin);} catch (e) {console.log(require('react-native/cli').bin);}"
+     String[] nodeCommand = ["node", "-e", cliResolveScript]
+-    def cliPath = this.getCommandOutput(nodeCommand, this.root)
++    def cliPath = this.getCommandOutput(nodeCommand, this.rnRoot)
+ 
+     String[] reactNativeConfigCommand = ["node", cliPath, "config", "--platform", "android"]
+-    def reactNativeConfigOutput = this.getCommandOutput(reactNativeConfigCommand, this.root)
++    def reactNativeConfigOutput = this.getCommandOutput(reactNativeConfigCommand, this.rnRoot)
+ 
+     def json
+     try {
+@@ -513,7 +515,13 @@ class ReactNativeModules {
+  */
+ def projectRoot = rootProject.projectDir
+ 
+-def autoModules = new ReactNativeModules(logger, providers, projectRoot)
++def autoModules 
++
++if(this.hasProperty('reactNativeProject')){
++    autoModules = new ReactNativeModules(logger, providers, projectRoot, new File(projectRoot, reactNativeProject))
++} else {
++    autoModules = new ReactNativeModules(logger, providers, projectRoot, projectRoot)
++}
+ 
+ def reactNativeVersionRequireNewArchEnabled(autoModules) {
+     def rnVersion = autoModules.reactNativeVersion
diff --git a/patches/@react-native-community+cli-platform-ios+12.3.2.patch b/patches/@react-native-community+cli-platform-ios+14.0.0+001+hybrid-app.patch
similarity index 100%
rename from patches/@react-native-community+cli-platform-ios+12.3.2.patch
rename to patches/@react-native-community+cli-platform-ios+14.0.0+001+hybrid-app.patch
diff --git a/patches/@react-native-community+netinfo+11.2.1+002+turbomodule.patch b/patches/@react-native-community+netinfo+11.2.1+002+turbomodule.patch
index f8e171008e14..6e70b7bb88c7 100644
--- a/patches/@react-native-community+netinfo+11.2.1+002+turbomodule.patch
+++ b/patches/@react-native-community+netinfo+11.2.1+002+turbomodule.patch
@@ -1,5 +1,5 @@
 diff --git a/node_modules/@react-native-community/netinfo/android/build.gradle b/node_modules/@react-native-community/netinfo/android/build.gradle
-index 0d617ed..e93d64a 100644
+index 0d617ed..97439e6 100644
 --- a/node_modules/@react-native-community/netinfo/android/build.gradle
 +++ b/node_modules/@react-native-community/netinfo/android/build.gradle
 @@ -3,9 +3,10 @@ buildscript {
@@ -105,9 +105,8 @@ index 0d617ed..e93d64a 100644
 +    implementation 'com.facebook.react:react-native:+'
 +  }
  }
-\ No newline at end of file
 diff --git a/node_modules/@react-native-community/netinfo/android/src/main/java/com/reactnativecommunity/netinfo/NetInfoModuleImpl.java b/node_modules/@react-native-community/netinfo/android/src/main/java/com/reactnativecommunity/netinfo/NetInfoModuleImpl.java
-index 2c3280b..296bbfd 100644
+index 2c3280b..52ea692 100644
 --- a/node_modules/@react-native-community/netinfo/android/src/main/java/com/reactnativecommunity/netinfo/NetInfoModuleImpl.java
 +++ b/node_modules/@react-native-community/netinfo/android/src/main/java/com/reactnativecommunity/netinfo/NetInfoModuleImpl.java
 @@ -9,13 +9,11 @@ package com.reactnativecommunity.netinfo;
@@ -147,7 +146,8 @@ index 2c3280b..296bbfd 100644
      }
  
 -    @Override
-     public void onCatalystInstanceDestroy() {
+-    public void onCatalystInstanceDestroy() {
++    public void invalidate() {
          mAmazonConnectivityChecker.unregister();
          mConnectivityReceiver.unregister();
 -        mConnectivityReceiver.hasListener = false;
@@ -255,7 +255,7 @@ index fcd4a5e..1bf0b62 100644
  }
 diff --git a/node_modules/@react-native-community/netinfo/android/src/newarch/com/reactnativecommunity/netinfo/NetInfoModule.java b/node_modules/@react-native-community/netinfo/android/src/newarch/com/reactnativecommunity/netinfo/NetInfoModule.java
 new file mode 100644
-index 0000000..61e44c4
+index 0000000..26c83b6
 --- /dev/null
 +++ b/node_modules/@react-native-community/netinfo/android/src/newarch/com/reactnativecommunity/netinfo/NetInfoModule.java
 @@ -0,0 +1,51 @@
@@ -301,8 +301,8 @@ index 0000000..61e44c4
 +    }
 +    
 +    @Override
-+    public void onCatalystInstanceDestroy() {
-+        implementation.onCatalystInstanceDestroy();
++    public void invalidate() {
++        implementation.invalidate();
 +    }
 +
 +    @Override
@@ -312,7 +312,7 @@ index 0000000..61e44c4
 +}
 diff --git a/node_modules/@react-native-community/netinfo/android/src/oldarch/com/reactnativecommunity/netinfo/NetInfoModule.java b/node_modules/@react-native-community/netinfo/android/src/oldarch/com/reactnativecommunity/netinfo/NetInfoModule.java
 new file mode 100644
-index 0000000..4738d63
+index 0000000..c61a84d
 --- /dev/null
 +++ b/node_modules/@react-native-community/netinfo/android/src/oldarch/com/reactnativecommunity/netinfo/NetInfoModule.java
 @@ -0,0 +1,59 @@
@@ -350,8 +350,8 @@ index 0000000..4738d63
 +    }
 +
 +    @Override
-+    public void onCatalystInstanceDestroy() {
-+        implementation.onCatalystInstanceDestroy();
++    public void invalidate() {
++        implementation.invalidate();
 +    }
 +
 +
@@ -1609,10 +1609,10 @@ index 095dd3b..596ace1 100644
 +{"version":3,"names":["NetInfoStateType","exports","NetInfoCellularGeneration"],"sources":["types.ts"],"sourcesContent":["/**\n * Copyright (c) Facebook, Inc. and its affiliates.\n *\n * This source code is licensed under the MIT license found in the\n * LICENSE file in the root directory of this source tree.\n *\n * @format\n */\n\nexport enum NetInfoStateType {\n  unknown = 'unknown',\n  none = 'none',\n  cellular = 'cellular',\n  wifi = 'wifi',\n  bluetooth = 'bluetooth',\n  ethernet = 'ethernet',\n  wimax = 'wimax',\n  vpn = 'vpn',\n  other = 'other',\n}\n\nexport type NetInfoMethodType = 'HEAD' | 'GET';\n\nexport enum NetInfoCellularGeneration {\n  '2g' = '2g',\n  '3g' = '3g',\n  '4g' = '4g',\n  '5g' = '5g',\n}\n\nexport interface NetInfoConnectedDetails {\n  isConnectionExpensive: boolean;\n}\n\ninterface NetInfoConnectedState<\n  T extends NetInfoStateType,\n  D extends Record<string, unknown> = Record<string, unknown>,\n> {\n  type: T;\n  isConnected: true;\n  isInternetReachable: boolean | null;\n  details: D & NetInfoConnectedDetails;\n  isWifiEnabled?: boolean;\n}\n\ninterface NetInfoDisconnectedState<T extends NetInfoStateType> {\n  type: T;\n  isConnected: false;\n  isInternetReachable: false;\n  details: null;\n  isWifiEnabled?: boolean;\n}\n\nexport interface NetInfoUnknownState {\n  type: NetInfoStateType.unknown;\n  isConnected: boolean | null;\n  isInternetReachable: null;\n  details: null;\n  isWifiEnabled?: boolean;\n}\n\nexport type NetInfoNoConnectionState =\n  NetInfoDisconnectedState<NetInfoStateType.none>;\nexport type NetInfoDisconnectedStates =\n  | NetInfoUnknownState\n  | NetInfoNoConnectionState;\n\nexport type NetInfoCellularState = NetInfoConnectedState<\n  NetInfoStateType.cellular,\n  {\n    cellularGeneration: NetInfoCellularGeneration | null;\n    carrier: string | null;\n  }\n>;\nexport type NetInfoWifiState = NetInfoConnectedState<\n  NetInfoStateType.wifi,\n  {\n    ssid: string | null;\n    bssid: string | null;\n    strength: number | null;\n    ipAddress: string | null;\n    subnet: string | null;\n    frequency: number | null;\n    linkSpeed: number | null;\n    rxLinkSpeed: number | null;\n    txLinkSpeed: number | null;\n  }\n>;\nexport type NetInfoBluetoothState =\n  NetInfoConnectedState<NetInfoStateType.bluetooth>;\nexport type NetInfoEthernetState = NetInfoConnectedState<\n  NetInfoStateType.ethernet,\n  {\n    ipAddress: string | null;\n    subnet: string | null;\n  }\n>;\nexport type NetInfoWimaxState = NetInfoConnectedState<NetInfoStateType.wimax>;\nexport type NetInfoVpnState = NetInfoConnectedState<NetInfoStateType.vpn>;\nexport type NetInfoOtherState = NetInfoConnectedState<NetInfoStateType.other>;\nexport type NetInfoConnectedStates =\n  | NetInfoCellularState\n  | NetInfoWifiState\n  | NetInfoBluetoothState\n  | NetInfoEthernetState\n  | NetInfoWimaxState\n  | NetInfoVpnState\n  | NetInfoOtherState;\n\nexport type NetInfoState = NetInfoDisconnectedStates | NetInfoConnectedStates;\n\nexport type NetInfoChangeHandler = (state: NetInfoState) => void;\nexport type NetInfoSubscription = () => void;\n\nexport interface NetInfoConfiguration {\n  reachabilityUrl: string;\n  reachabilityMethod?: NetInfoMethodType;\n  reachabilityHeaders?: Record<string, string>;\n  reachabilityTest: (response: Response) => Promise<boolean>;\n  reachabilityLongTimeout: number;\n  reachabilityShortTimeout: number;\n  reachabilityRequestTimeout: number;\n  reachabilityShouldRun: () => boolean;\n  shouldFetchWiFiSSID: boolean;\n  useNativeReachability: boolean;\n}\n"],"mappings":";;;;;;AAAA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AAPA,IASYA,gBAAgB,GAAAC,OAAA,CAAAD,gBAAA,0BAAhBA,gBAAgB;EAAhBA,gBAAgB;EAAhBA,gBAAgB;EAAhBA,gBAAgB;EAAhBA,gBAAgB;EAAhBA,gBAAgB;EAAhBA,gBAAgB;EAAhBA,gBAAgB;EAAhBA,gBAAgB;EAAhBA,gBAAgB;EAAA,OAAhBA,gBAAgB;AAAA;AAAA,IAchBE,yBAAyB,GAAAD,OAAA,CAAAC,yBAAA,0BAAzBA,yBAAyB;EAAzBA,yBAAyB;EAAzBA,yBAAyB;EAAzBA,yBAAyB;EAAzBA,yBAAyB;EAAA,OAAzBA,yBAAyB;AAAA"}
 \ No newline at end of file
 diff --git a/node_modules/@react-native-community/netinfo/lib/module/index.js b/node_modules/@react-native-community/netinfo/lib/module/index.js
-index 147c72e..02aa0db 100644
+index 147c72e..5de4e7c 100644
 --- a/node_modules/@react-native-community/netinfo/lib/module/index.js
 +++ b/node_modules/@react-native-community/netinfo/lib/module/index.js
-@@ -6,20 +6,23 @@
+@@ -6,20 +6,26 @@
   *
   * @format
   */
@@ -1635,11 +1635,14 @@ index 147c72e..02aa0db 100644
  const createState = () => {
    return new State(_configuration);
  };
++
++// Track ongoing requests
++let isRequestInProgress = false;
 +
  /**
   * Configures the library with the given configuration. Note that calling this will stop all
   * previously added listeners from being called again. It is best to call this right when your
-@@ -27,23 +30,20 @@ const createState = () => {
+@@ -27,23 +33,20 @@ const createState = () => {
   *
   * @param configuration The new configuration to set.
   */
@@ -1666,7 +1669,7 @@ index 147c72e..02aa0db 100644
  /**
   * Returns a `Promise` that resolves to a `NetInfoState` object.
   * This function operates on the global singleton instance configured using `configure()`
-@@ -52,27 +52,25 @@ export function configure(configuration) {
+@@ -52,27 +55,33 @@ export function configure(configuration) {
   *
   * @returns A Promise which contains the current connection state.
   */
@@ -1689,14 +1692,22 @@ index 147c72e..02aa0db 100644
    if (!_state) {
      _state = createState();
    }
--
-   return _state._fetchCurrentState();
+ 
+-  return _state._fetchCurrentState();
++  if (isRequestInProgress) {
++    return _state.latest(); // Return the latest state if a request is already in progress
++  }
++
++  isRequestInProgress = true;
++  return _state._fetchCurrentState().finally(() => {
++    isRequestInProgress = false;
++  });
  }
 +
  /**
   * Subscribe to the global singleton's connection information. The callback is called with a parameter of type
   * [`NetInfoState`](README.md#netinfostate) whenever the connection state changes. Your listener
-@@ -84,18 +82,16 @@ export function refresh() {
+@@ -84,18 +93,16 @@ export function refresh() {
   *
   * @returns A function which can be called to unsubscribe.
   */
@@ -1716,7 +1727,7 @@ index 147c72e..02aa0db 100644
  /**
   * A React Hook into this library's singleton which updates when the connection state changes.
   *
-@@ -103,12 +99,10 @@ export function addEventListener(listener) {
+@@ -103,12 +110,10 @@ export function addEventListener(listener) {
   *
   * @returns The connection state.
   */
@@ -1729,7 +1740,7 @@ index 147c72e..02aa0db 100644
    const [netInfo, setNetInfo] = useState({
      type: Types.NetInfoStateType.unknown,
      isConnected: null,
-@@ -120,6 +114,7 @@ export function useNetInfo(configuration) {
+@@ -120,6 +125,7 @@ export function useNetInfo(configuration) {
    }, []);
    return netInfo;
  }
@@ -1737,7 +1748,7 @@ index 147c72e..02aa0db 100644
  /**
   * A React Hook which manages an isolated instance of the network info manager.
   * This is not a hook into a singleton shared state. NetInfo.configure, NetInfo.addEventListener,
-@@ -129,7 +124,6 @@ export function useNetInfo(configuration) {
+@@ -129,7 +135,6 @@ export function useNetInfo(configuration) {
   *
   * @returns the netInfo state and a refresh function
   */
@@ -1745,7 +1756,7 @@ index 147c72e..02aa0db 100644
  export function useNetInfoInstance(isPaused = false, configuration) {
    const [networkInfoManager, setNetworkInfoManager] = useState();
    const [netInfo, setNetInfo] = useState({
-@@ -142,8 +136,8 @@ export function useNetInfoInstance(isPaused = false, configuration) {
+@@ -142,8 +147,8 @@ export function useNetInfoInstance(isPaused = false, configuration) {
      if (isPaused) {
        return;
      }
@@ -2610,22 +2621,13 @@ index 6982220..b515270 100644
  };
  export default _default;
 diff --git a/node_modules/@react-native-community/netinfo/package.json b/node_modules/@react-native-community/netinfo/package.json
-index 3c80db2..61e6564 100644
+index 3c80db2..15d214d 100644
 --- a/node_modules/@react-native-community/netinfo/package.json
 +++ b/node_modules/@react-native-community/netinfo/package.json
-@@ -48,6 +48,7 @@
-     "network info"
-   ],
-   "peerDependencies": {
-+    "react": "*",
-     "react-native": ">=0.59"
+@@ -97,6 +97,14 @@
+     "webpack-cli": "^3.3.10",
+     "webpack-dev-server": "^3.11.3"
    },
-   "dependencies": {},
-@@ -121,5 +122,13 @@
-       "yarn eslint --fix",
-       "git add"
-     ]
-+  },
 +  "codegenConfig": {
 +    "name": "RNCNetInfoSpec",
 +    "type": "modules",
@@ -2633,8 +2635,10 @@ index 3c80db2..61e6564 100644
 +    "android": {
 +      "javaPackageName": "com.reactnativecommunity.netinfo"
 +    }
-   }
- }
++  },
+   "repository": {
+     "type": "git",
+     "url": "https://github.com/react-native-netinfo/react-native-netinfo.git"
 diff --git a/node_modules/@react-native-community/netinfo/react-native-netinfo.podspec b/node_modules/@react-native-community/netinfo/react-native-netinfo.podspec
 index e34e728..9090eb1 100644
 --- a/node_modules/@react-native-community/netinfo/react-native-netinfo.podspec
@@ -3062,4 +3066,4 @@ index 878f7ba..0000000
 -
 -#Files generated by the VS build
 -**/Generated Files/**
--
+-
\ No newline at end of file
diff --git a/patches/@react-native-firebase+analytics+12.9.3.patch b/patches/@react-native-firebase+analytics+12.9.3+001+hybrid-app.patch
similarity index 100%
rename from patches/@react-native-firebase+analytics+12.9.3.patch
rename to patches/@react-native-firebase+analytics+12.9.3+001+hybrid-app.patch
diff --git a/patches/@react-native-firebase+app+12.9.3.patch b/patches/@react-native-firebase+app+12.9.3+001+hybrid-app.patch
similarity index 100%
rename from patches/@react-native-firebase+app+12.9.3.patch
rename to patches/@react-native-firebase+app+12.9.3+001+hybrid-app.patch
diff --git a/patches/@react-native-firebase+crashlytics+12.9.3.patch b/patches/@react-native-firebase+crashlytics+12.9.3+001+hybrid-app.patch
similarity index 100%
rename from patches/@react-native-firebase+crashlytics+12.9.3.patch
rename to patches/@react-native-firebase+crashlytics+12.9.3+001+hybrid-app.patch
diff --git a/patches/@react-native-firebase+perf+12.9.3.patch b/patches/@react-native-firebase+perf+12.9.3+001+hybrid-app.patch
similarity index 100%
rename from patches/@react-native-firebase+perf+12.9.3.patch
rename to patches/@react-native-firebase+perf+12.9.3+001+hybrid-app.patch
diff --git a/patches/@react-navigation+core+6.4.11+001+fix-react-strictmode.patch b/patches/@react-navigation+core+6.4.11+001+fix-react-strictmode.patch
new file mode 100644
index 000000000000..f68cd6fe9ca4
--- /dev/null
+++ b/patches/@react-navigation+core+6.4.11+001+fix-react-strictmode.patch
@@ -0,0 +1,89 @@
+diff --git a/node_modules/@react-navigation/core/lib/module/useNavigationBuilder.js b/node_modules/@react-navigation/core/lib/module/useNavigationBuilder.js
+index 051520b..6fb49e0 100644
+--- a/node_modules/@react-navigation/core/lib/module/useNavigationBuilder.js
++++ b/node_modules/@react-navigation/core/lib/module/useNavigationBuilder.js
+@@ -174,10 +174,6 @@ export default function useNavigationBuilder(createRouter, options) {
+     getIsInitial
+   } = React.useContext(NavigationStateContext);
+   const stateCleanedUp = React.useRef(false);
+-  const cleanUpState = React.useCallback(() => {
+-    setCurrentState(undefined);
+-    stateCleanedUp.current = true;
+-  }, [setCurrentState]);
+   const setState = React.useCallback(state => {
+     if (stateCleanedUp.current) {
+       // State might have been already cleaned up due to unmount
+@@ -291,6 +287,9 @@ export default function useNavigationBuilder(createRouter, options) {
+   // So we override the state object we return to use the latest state as soon as possible
+   state = nextState;
+   React.useEffect(() => {
++    // In strict mode, React will double-invoke effects.
++    // So we need to reset the flag if component was not unmounted
++    stateCleanedUp.current = false;
+     setKey(navigatorKey);
+     if (!getIsInitial()) {
+       // If it's not initial render, we need to update the state
+@@ -300,14 +299,10 @@ export default function useNavigationBuilder(createRouter, options) {
+     }
+     return () => {
+       // We need to clean up state for this navigator on unmount
+-      // We do it in a timeout because we need to detect if another navigator mounted in the meantime
+-      // For example, if another navigator has started rendering, we should skip cleanup
+-      // Otherwise, our cleanup step will cleanup state for the other navigator and re-initialize it
+-      setTimeout(() => {
+-        if (getCurrentState() !== undefined && getKey() === navigatorKey) {
+-          cleanUpState();
+-        }
+-      }, 0);
++      if (getCurrentState() !== undefined && getKey() === navigatorKey) {
++        setCurrentState(undefined);
++        stateCleanedUp.current = true;
++      }
+     };
+     // eslint-disable-next-line react-hooks/exhaustive-deps
+   }, []);
+diff --git a/node_modules/@react-navigation/core/src/useNavigationBuilder.tsx b/node_modules/@react-navigation/core/src/useNavigationBuilder.tsx
+index b1971ba..7d550e0 100644
+--- a/node_modules/@react-navigation/core/src/useNavigationBuilder.tsx
++++ b/node_modules/@react-navigation/core/src/useNavigationBuilder.tsx
+@@ -362,11 +362,6 @@ export default function useNavigationBuilder<
+ 
+   const stateCleanedUp = React.useRef(false);
+ 
+-  const cleanUpState = React.useCallback(() => {
+-    setCurrentState(undefined);
+-    stateCleanedUp.current = true;
+-  }, [setCurrentState]);
+-
+   const setState = React.useCallback(
+     (state: NavigationState | PartialState<NavigationState> | undefined) => {
+       if (stateCleanedUp.current) {
+@@ -540,6 +535,9 @@ export default function useNavigationBuilder<
+   state = nextState;
+ 
+   React.useEffect(() => {
++    // In strict mode, React will double-invoke effects.
++    // So we need to reset the flag if component was not unmounted
++    stateCleanedUp.current = false;
+     setKey(navigatorKey);
+ 
+     if (!getIsInitial()) {
+@@ -551,14 +549,10 @@ export default function useNavigationBuilder<
+ 
+     return () => {
+       // We need to clean up state for this navigator on unmount
+-      // We do it in a timeout because we need to detect if another navigator mounted in the meantime
+-      // For example, if another navigator has started rendering, we should skip cleanup
+-      // Otherwise, our cleanup step will cleanup state for the other navigator and re-initialize it
+-      setTimeout(() => {
+-        if (getCurrentState() !== undefined && getKey() === navigatorKey) {
+-          cleanUpState();
+-        }
+-      }, 0);
++      if (getCurrentState() !== undefined && getKey() === navigatorKey) {
++        setCurrentState(undefined);
++        stateCleanedUp.current = true;
++      }
+     };
+     // eslint-disable-next-line react-hooks/exhaustive-deps
+   }, []);
diff --git a/patches/@react-navigation+native+6.1.12.patch b/patches/@react-navigation+native+6.1.12.patch
index d451d89d687c..0ac57a865dfd 100644
--- a/patches/@react-navigation+native+6.1.12.patch
+++ b/patches/@react-navigation+native+6.1.12.patch
@@ -1,5 +1,5 @@
 diff --git a/node_modules/@react-navigation/native/lib/module/createMemoryHistory.js b/node_modules/@react-navigation/native/lib/module/createMemoryHistory.js
-index 16fdbef..bc2c96a 100644
+index 16fdbef..231a520 100644
 --- a/node_modules/@react-navigation/native/lib/module/createMemoryHistory.js
 +++ b/node_modules/@react-navigation/native/lib/module/createMemoryHistory.js
 @@ -1,8 +1,23 @@
@@ -63,6 +63,15 @@ index 16fdbef..bc2c96a 100644
      replace(_ref3) {
        var _window$history$state2;
        let {
+@@ -80,7 +101,7 @@ export default function createMemoryHistory() {
+ 
+       // Need to keep the hash part of the path if there was no previous history entry
+       // or the previous history entry had the same path
+-      let pathWithHash = path;
++      let pathWithHash = path.replace(/(\/{2,})/g, '/');
+       if (!items.length || items.findIndex(item => item.id === id) < 0) {
+         // There are two scenarios for creating an array with only one history record:
+         // - When loaded id not found in the items array, this function by default will replace
 @@ -108,7 +129,9 @@ export default function createMemoryHistory() {
        window.history.replaceState({
          id
diff --git a/patches/@rnmapbox+maps+10.1.12.patch b/patches/@rnmapbox+maps+10.1.12.patch
deleted file mode 100644
index c8135280056c..000000000000
--- a/patches/@rnmapbox+maps+10.1.12.patch
+++ /dev/null
@@ -1,127 +0,0 @@
-diff --git a/node_modules/@rnmapbox/maps/android/src/main/java/com/rnmapbox/rnmbx/components/camera/RNMBXCamera.kt b/node_modules/@rnmapbox/maps/android/src/main/java/com/rnmapbox/rnmbx/components/camera/RNMBXCamera.kt
-index 0d876a7..cceed39 100644
---- a/node_modules/@rnmapbox/maps/android/src/main/java/com/rnmapbox/rnmbx/components/camera/RNMBXCamera.kt
-+++ b/node_modules/@rnmapbox/maps/android/src/main/java/com/rnmapbox/rnmbx/components/camera/RNMBXCamera.kt
-@@ -188,7 +188,7 @@ class RNMBXCamera(private val mContext: Context, private val mManager: RNMBXCame
- 
-     private fun setInitialCamera() {
-         mDefaultStop?.let {
--            val mapView = mMapView!!
-+            val mapView = mMapView ?: return
-             val map = mapView.getMapboxMap()
- 
-             it.setDuration(0)
-diff --git a/node_modules/@rnmapbox/maps/ios/RNMBX/Offline/RNMBXOfflineModule.m b/node_modules/@rnmapbox/maps/ios/RNMBX/Offline/RNMBXOfflineModule.m
-index 1808393..ec00542 100644
---- a/node_modules/@rnmapbox/maps/ios/RNMBX/Offline/RNMBXOfflineModule.m
-+++ b/node_modules/@rnmapbox/maps/ios/RNMBX/Offline/RNMBXOfflineModule.m
-@@ -1,4 +1,4 @@
--#import "React/RCTBridgeModule.h"
-+#import <React/RCTBridgeModule.h>
- #import <React/RCTEventEmitter.h>
- 
- @interface RCT_EXTERN_MODULE(RNMBXOfflineModule, RCTEventEmitter<RCTBridgeModule>)
-diff --git a/node_modules/@rnmapbox/maps/ios/RNMBX/Offline/RNMBXOfflineModuleLegacy.m b/node_modules/@rnmapbox/maps/ios/RNMBX/Offline/RNMBXOfflineModuleLegacy.m
-index 550f67b..76da02d 100644
---- a/node_modules/@rnmapbox/maps/ios/RNMBX/Offline/RNMBXOfflineModuleLegacy.m
-+++ b/node_modules/@rnmapbox/maps/ios/RNMBX/Offline/RNMBXOfflineModuleLegacy.m
-@@ -1,4 +1,4 @@
--#import "React/RCTBridgeModule.h"
-+#import <React/RCTBridgeModule.h>
- #import <React/RCTEventEmitter.h>
- 
- @interface RCT_EXTERN_MODULE(RNMBXOfflineModuleLegacy, RCTEventEmitter<RCTBridgeModule>)
-diff --git a/node_modules/@rnmapbox/maps/ios/RNMBX/Offline/RNMBXTileStoreModule.m b/node_modules/@rnmapbox/maps/ios/RNMBX/Offline/RNMBXTileStoreModule.m
-index a98e102..e43be8f 100644
---- a/node_modules/@rnmapbox/maps/ios/RNMBX/Offline/RNMBXTileStoreModule.m
-+++ b/node_modules/@rnmapbox/maps/ios/RNMBX/Offline/RNMBXTileStoreModule.m
-@@ -1,4 +1,4 @@
--#import "React/RCTBridgeModule.h"
-+#import <React/RCTBridgeModule.h>
- #import <React/RCTEventEmitter.h>
- 
- @interface RCT_EXTERN_MODULE(RNMBXTileStoreModule, NSObject)
-diff --git a/node_modules/@rnmapbox/maps/ios/RNMBX/RNMBXCalloutViewManager.m b/node_modules/@rnmapbox/maps/ios/RNMBX/RNMBXCalloutViewManager.m
-index 62205d5..1db2ac4 100644
---- a/node_modules/@rnmapbox/maps/ios/RNMBX/RNMBXCalloutViewManager.m
-+++ b/node_modules/@rnmapbox/maps/ios/RNMBX/RNMBXCalloutViewManager.m
-@@ -1,4 +1,4 @@
--#import "React/RCTBridgeModule.h"
-+#import <React/RCTBridgeModule.h>
- #import <React/RCTViewManager.h>
- #import <Foundation/Foundation.h>
- 
-diff --git a/node_modules/@rnmapbox/maps/ios/RNMBX/RNMBXCameraViewManager.m b/node_modules/@rnmapbox/maps/ios/RNMBX/RNMBXCameraViewManager.m
-index e23b10c..6a023fa 100644
---- a/node_modules/@rnmapbox/maps/ios/RNMBX/RNMBXCameraViewManager.m
-+++ b/node_modules/@rnmapbox/maps/ios/RNMBX/RNMBXCameraViewManager.m
-@@ -1,4 +1,4 @@
--#import "React/RCTBridgeModule.h"
-+#import <React/RCTBridgeModule.h>
- #import <React/RCTViewManager.h>
- #import <Foundation/Foundation.h>
- 
-diff --git a/node_modules/@rnmapbox/maps/ios/RNMBX/RNMBXLocationModule.m b/node_modules/@rnmapbox/maps/ios/RNMBX/RNMBXLocationModule.m
-index 8b89774..9f85c35 100644
---- a/node_modules/@rnmapbox/maps/ios/RNMBX/RNMBXLocationModule.m
-+++ b/node_modules/@rnmapbox/maps/ios/RNMBX/RNMBXLocationModule.m
-@@ -1,4 +1,4 @@
--#import "React/RCTBridgeModule.h"
-+#import <React/RCTBridgeModule.h>
- #import <React/RCTEventEmitter.h>
- 
- @class RNMBXLocation;
-diff --git a/node_modules/@rnmapbox/maps/ios/RNMBX/RNMBXLogging.m b/node_modules/@rnmapbox/maps/ios/RNMBX/RNMBXLogging.m
-index d7c05de..f680b86 100644
---- a/node_modules/@rnmapbox/maps/ios/RNMBX/RNMBXLogging.m
-+++ b/node_modules/@rnmapbox/maps/ios/RNMBX/RNMBXLogging.m
-@@ -1,4 +1,4 @@
--#import "React/RCTBridgeModule.h"
-+#import <React/RCTBridgeModule.h>
- 
- @interface RCT_EXTERN_MODULE(RNMBXLogging, NSObject)
- 
-diff --git a/node_modules/@rnmapbox/maps/ios/RNMBX/RNMBXMarkerViewContentManager.m b/node_modules/@rnmapbox/maps/ios/RNMBX/RNMBXMarkerViewContentManager.m
-index 72f9928..f4f5fe2 100644
---- a/node_modules/@rnmapbox/maps/ios/RNMBX/RNMBXMarkerViewContentManager.m
-+++ b/node_modules/@rnmapbox/maps/ios/RNMBX/RNMBXMarkerViewContentManager.m
-@@ -1,4 +1,4 @@
--#import "React/RCTBridgeModule.h"
-+#import <React/RCTBridgeModule.h>
- #import <React/RCTViewManager.h>
- #import <Foundation/Foundation.h>
- 
-diff --git a/node_modules/@rnmapbox/maps/ios/RNMBX/RNMBXMarkerViewManager.m b/node_modules/@rnmapbox/maps/ios/RNMBX/RNMBXMarkerViewManager.m
-index c0ab14d..6177811 100644
---- a/node_modules/@rnmapbox/maps/ios/RNMBX/RNMBXMarkerViewManager.m
-+++ b/node_modules/@rnmapbox/maps/ios/RNMBX/RNMBXMarkerViewManager.m
-@@ -1,4 +1,4 @@
--#import "React/RCTBridgeModule.h"
-+#import <React/RCTBridgeModule.h>
- #import <React/RCTViewManager.h>
- #import <Foundation/Foundation.h>
- 
-diff --git a/node_modules/@rnmapbox/maps/ios/RNMBX/RNMBXModule.m b/node_modules/@rnmapbox/maps/ios/RNMBX/RNMBXModule.m
-index 3b0af79..e00b508 100644
---- a/node_modules/@rnmapbox/maps/ios/RNMBX/RNMBXModule.m
-+++ b/node_modules/@rnmapbox/maps/ios/RNMBX/RNMBXModule.m
-@@ -1,4 +1,4 @@
--#import "React/RCTBridgeModule.h"
-+#import <React/RCTBridgeModule.h>
- 
- @interface RCT_EXTERN_MODULE(RNMBXModule, NSObject)
- 
-diff --git a/node_modules/@rnmapbox/maps/ios/RNMBX/RNMBXPointAnnotationViewManager.m b/node_modules/@rnmapbox/maps/ios/RNMBX/RNMBXPointAnnotationViewManager.m
-index 6fa19e5..54d0ff9 100644
---- a/node_modules/@rnmapbox/maps/ios/RNMBX/RNMBXPointAnnotationViewManager.m
-+++ b/node_modules/@rnmapbox/maps/ios/RNMBX/RNMBXPointAnnotationViewManager.m
-@@ -1,4 +1,4 @@
--#import "React/RCTBridgeModule.h"
-+#import <React/RCTBridgeModule.h>
- #import <React/RCTViewManager.h>
- #import <Foundation/Foundation.h>
- 
-diff --git a/node_modules/@rnmapbox/maps/ios/RNMBX/ShapeAnimators/RNMBXMovePointShapeAnimatorModule.m b/node_modules/@rnmapbox/maps/ios/RNMBX/ShapeAnimators/RNMBXMovePointShapeAnimatorModule.mm
-similarity index 100%
-rename from node_modules/@rnmapbox/maps/ios/RNMBX/ShapeAnimators/RNMBXMovePointShapeAnimatorModule.m
-rename to node_modules/@rnmapbox/maps/ios/RNMBX/ShapeAnimators/RNMBXMovePointShapeAnimatorModule.mm
diff --git a/patches/@rnmapbox+maps+10.1.26+001+rn-75-fixes.patch b/patches/@rnmapbox+maps+10.1.26+001+rn-75-fixes.patch
new file mode 100644
index 000000000000..c8e3719e80d8
--- /dev/null
+++ b/patches/@rnmapbox+maps+10.1.26+001+rn-75-fixes.patch
@@ -0,0 +1,188 @@
+diff --git a/node_modules/@rnmapbox/maps/android/src/main/java/com/rnmapbox/rnmbx/components/camera/RNMBXCamera.kt b/node_modules/@rnmapbox/maps/android/src/main/java/com/rnmapbox/rnmbx/components/camera/RNMBXCamera.kt
+index bf149f9..2d3441b 100644
+--- a/node_modules/@rnmapbox/maps/android/src/main/java/com/rnmapbox/rnmbx/components/camera/RNMBXCamera.kt
++++ b/node_modules/@rnmapbox/maps/android/src/main/java/com/rnmapbox/rnmbx/components/camera/RNMBXCamera.kt
+@@ -190,7 +190,7 @@ class RNMBXCamera(private val mContext: Context, private val mManager: RNMBXCame
+ 
+     private fun setInitialCamera() {
+         mDefaultStop?.let {
+-            val mapView = mMapView!!
++            val mapView = mMapView ?: return
+             val map = mapView.getMapboxMap()
+ 
+             it.setDuration(0)
+diff --git a/node_modules/@rnmapbox/maps/android/src/main/java/com/rnmapbox/rnmbx/components/images/RNMBXImagesManager.kt b/node_modules/@rnmapbox/maps/android/src/main/java/com/rnmapbox/rnmbx/components/images/RNMBXImagesManager.kt
+index 67c8656..248011f 100644
+--- a/node_modules/@rnmapbox/maps/android/src/main/java/com/rnmapbox/rnmbx/components/images/RNMBXImagesManager.kt
++++ b/node_modules/@rnmapbox/maps/android/src/main/java/com/rnmapbox/rnmbx/components/images/RNMBXImagesManager.kt
+@@ -210,7 +210,7 @@ class RNMBXImagesManager(private val mContext: ReactApplicationContext) :
+ 
+     // region RNMBXImage children
+ 
+-    override fun addView(parent: RNMBXImages?, childView: View?, childPosition: Int) {
++    override fun addView(parent: RNMBXImages, childView: View, childPosition: Int) {
+         if (parent == null || childView == null) {
+             Logger.e("RNMBXImages", "addView: parent or childView is null")
+             return
+@@ -225,7 +225,7 @@ class RNMBXImagesManager(private val mContext: ReactApplicationContext) :
+         childView.nativeImageUpdater = parent
+     }
+ 
+-    override fun removeView(parent: RNMBXImages?, view: View?) {
++    override fun removeView(parent: RNMBXImages, view: View) {
+         if (parent == null || view == null) {
+             Logger.e("RNMBXImages", "removeView: parent or view is null")
+             return
+@@ -234,7 +234,7 @@ class RNMBXImagesManager(private val mContext: ReactApplicationContext) :
+         parent.mImageViews.remove(view)
+     }
+ 
+-    override fun removeAllViews(parent: RNMBXImages?) {
++    override fun removeAllViews(parent: RNMBXImages) {
+         if (parent == null) {
+             Logger.e("RNMBXImages", "removeAllViews parent is null")
+             return
+diff --git a/node_modules/@rnmapbox/maps/android/src/main/java/com/rnmapbox/rnmbx/components/mapview/NativeMapViewModule.kt b/node_modules/@rnmapbox/maps/android/src/main/java/com/rnmapbox/rnmbx/components/mapview/NativeMapViewModule.kt
+index ef529ef..4115802 100644
+--- a/node_modules/@rnmapbox/maps/android/src/main/java/com/rnmapbox/rnmbx/components/mapview/NativeMapViewModule.kt
++++ b/node_modules/@rnmapbox/maps/android/src/main/java/com/rnmapbox/rnmbx/components/mapview/NativeMapViewModule.kt
+@@ -152,14 +152,6 @@ class NativeMapViewModule(context: ReactApplicationContext, val viewTagResolver:
+         }
+     }
+ 
+-    public fun setHandledMapChangedEvents(
+-        viewRef: Double?,
+-        events: ReadableArray,
+-        promise: Promise
+-    ) {
+-        setHandledMapChangedEvents(viewRef?.toInt(), events, promise)
+-    }
+-
+     override fun clearData(viewRef: ViewRefTag?, promise: Promise) {
+         withMapViewOnUIThread(viewRef, promise) {
+             it.clearData(createCommandResponse(promise))
+diff --git a/node_modules/@rnmapbox/maps/android/src/main/java/com/rnmapbox/rnmbx/components/mapview/RNMBXMapViewManager.kt b/node_modules/@rnmapbox/maps/android/src/main/java/com/rnmapbox/rnmbx/components/mapview/RNMBXMapViewManager.kt
+index 98febe7..8601286 100644
+--- a/node_modules/@rnmapbox/maps/android/src/main/java/com/rnmapbox/rnmbx/components/mapview/RNMBXMapViewManager.kt
++++ b/node_modules/@rnmapbox/maps/android/src/main/java/com/rnmapbox/rnmbx/components/mapview/RNMBXMapViewManager.kt
+@@ -86,19 +86,19 @@ open class RNMBXMapViewManager(context: ReactApplicationContext, val viewTagReso
+         }
+     }
+ 
+-    override fun addView(mapView: RNMBXMapView?, childView: View?, childPosition: Int) {
++    override fun addView(mapView: RNMBXMapView, childView: View, childPosition: Int) {
+         mapView!!.addFeature(childView, childPosition)
+     }
+ 
+-    override fun getChildCount(mapView: RNMBXMapView?): Int {
++    override fun getChildCount(mapView: RNMBXMapView): Int {
+         return mapView!!.featureCount
+     }
+ 
+-    override fun getChildAt(mapView: RNMBXMapView?, index: Int): View? {
++    override fun getChildAt(mapView: RNMBXMapView, index: Int): View? {
+         return mapView!!.getFeatureAt(index)
+     }
+ 
+-    override fun removeViewAt(mapView: RNMBXMapView?, index: Int) {
++    override fun removeViewAt(mapView: RNMBXMapView, index: Int) {
+         mapView!!.removeFeatureAt(index)
+     }
+ 
+diff --git a/node_modules/@rnmapbox/maps/android/src/main/java/com/rnmapbox/rnmbx/components/styles/sources/RNMBXImageSource.kt b/node_modules/@rnmapbox/maps/android/src/main/java/com/rnmapbox/rnmbx/components/styles/sources/RNMBXImageSource.kt
+index be22072..602ca6d 100644
+--- a/node_modules/@rnmapbox/maps/android/src/main/java/com/rnmapbox/rnmbx/components/styles/sources/RNMBXImageSource.kt
++++ b/node_modules/@rnmapbox/maps/android/src/main/java/com/rnmapbox/rnmbx/components/styles/sources/RNMBXImageSource.kt
+@@ -37,7 +37,7 @@ class RNMBXImageSource(context: Context?) : RNMBXSource<ImageSource?>(context) {
+             val uri = Uri.parse(url)
+             if (uri.scheme == null) {
+                 mResourceId =
+-                    ResourceDrawableIdHelper.getInstance().getResourceDrawableId(this.context, url)
++                    ResourceDrawableIdHelper.instance.getResourceDrawableId(this.context, url)
+                 if (mSource != null) {
+                     throw RuntimeException("ImageSource Resource id not supported in v10")
+                 }
+diff --git a/node_modules/@rnmapbox/maps/android/src/main/java/com/rnmapbox/rnmbx/components/styles/sources/RNMBXRasterDemSourceManager.kt b/node_modules/@rnmapbox/maps/android/src/main/java/com/rnmapbox/rnmbx/components/styles/sources/RNMBXRasterDemSourceManager.kt
+index c843d11..70a2c47 100644
+--- a/node_modules/@rnmapbox/maps/android/src/main/java/com/rnmapbox/rnmbx/components/styles/sources/RNMBXRasterDemSourceManager.kt
++++ b/node_modules/@rnmapbox/maps/android/src/main/java/com/rnmapbox/rnmbx/components/styles/sources/RNMBXRasterDemSourceManager.kt
+@@ -11,10 +11,10 @@ import com.rnmapbox.rnmbx.utils.Logger
+ // import com.rnmapbox.rnmbx.components.annotation.RNMBXCallout;
+ // import com.rnmapbox.rnmbx.utils.ResourceUtils;
+ class RNMBXRasterDemSourceManager(private val mContext: ReactApplicationContext) :
+-    RNMBXTileSourceManager<RNMBXRasterDemSource?>(
++    RNMBXTileSourceManager<RNMBXRasterDemSource>(
+         mContext
+     ), RNMBXRasterDemSourceManagerInterface<RNMBXRasterDemSource> {
+-    override fun customEvents(): Map<String, String>? {
++    override fun customEvents(): Map<String, String> {
+         return MapBuilder.builder<String, String>()
+             .build()
+     }
+diff --git a/node_modules/@rnmapbox/maps/android/src/main/java/com/rnmapbox/rnmbx/components/styles/sources/RNMBXRasterSourceManager.kt b/node_modules/@rnmapbox/maps/android/src/main/java/com/rnmapbox/rnmbx/components/styles/sources/RNMBXRasterSourceManager.kt
+index 5bebc1b..893d757 100644
+--- a/node_modules/@rnmapbox/maps/android/src/main/java/com/rnmapbox/rnmbx/components/styles/sources/RNMBXRasterSourceManager.kt
++++ b/node_modules/@rnmapbox/maps/android/src/main/java/com/rnmapbox/rnmbx/components/styles/sources/RNMBXRasterSourceManager.kt
+@@ -8,7 +8,7 @@ import com.facebook.react.viewmanagers.RNMBXRasterSourceManagerInterface
+ import javax.annotation.Nonnull
+ 
+ class RNMBXRasterSourceManager(reactApplicationContext: ReactApplicationContext) :
+-    RNMBXTileSourceManager<RNMBXRasterSource?>(reactApplicationContext),
++    RNMBXTileSourceManager<RNMBXRasterSource>(reactApplicationContext),
+     RNMBXRasterSourceManagerInterface<RNMBXRasterSource> {
+     @Nonnull
+     override fun getName(): String {
+diff --git a/node_modules/@rnmapbox/maps/android/src/main/java/com/rnmapbox/rnmbx/components/styles/sources/RNMBXShapeSourceModule.kt b/node_modules/@rnmapbox/maps/android/src/main/java/com/rnmapbox/rnmbx/components/styles/sources/RNMBXShapeSourceModule.kt
+index 6398497..03c1829 100644
+--- a/node_modules/@rnmapbox/maps/android/src/main/java/com/rnmapbox/rnmbx/components/styles/sources/RNMBXShapeSourceModule.kt
++++ b/node_modules/@rnmapbox/maps/android/src/main/java/com/rnmapbox/rnmbx/components/styles/sources/RNMBXShapeSourceModule.kt
+@@ -44,8 +44,8 @@ class RNMBXShapeSourceModule(reactContext: ReactApplicationContext?, private val
+     override fun getClusterLeaves(
+         viewRef: ViewRefTag?,
+         featureJSON: String,
+-        number: Int,
+-        offset: Int,
++        number: Double,
++        offset: Double,
+         promise: Promise
+     ) {
+         withShapeSourceOnUIThread(viewRef, promise) {
+diff --git a/node_modules/@rnmapbox/maps/android/src/main/java/com/rnmapbox/rnmbx/components/styles/sources/RNMBXTileSourceManager.kt b/node_modules/@rnmapbox/maps/android/src/main/java/com/rnmapbox/rnmbx/components/styles/sources/RNMBXTileSourceManager.kt
+index 767d27b..5ebe505 100644
+--- a/node_modules/@rnmapbox/maps/android/src/main/java/com/rnmapbox/rnmbx/components/styles/sources/RNMBXTileSourceManager.kt
++++ b/node_modules/@rnmapbox/maps/android/src/main/java/com/rnmapbox/rnmbx/components/styles/sources/RNMBXTileSourceManager.kt
+@@ -7,7 +7,7 @@ import com.facebook.react.bridge.ReadableType
+ import com.facebook.react.uimanager.annotations.ReactProp
+ import com.rnmapbox.rnmbx.components.AbstractEventEmitter
+ 
+-abstract class RNMBXTileSourceManager<T : RNMBXTileSource<*>?> internal constructor(
++abstract class RNMBXTileSourceManager<T : RNMBXTileSource<*>> internal constructor(
+     reactApplicationContext: ReactApplicationContext
+ ) : AbstractEventEmitter<T>(reactApplicationContext) {
+     override fun getChildAt(source: T, childPosition: Int): View {
+diff --git a/node_modules/@rnmapbox/maps/android/src/main/java/com/rnmapbox/rnmbx/components/styles/sources/RNMBXVectorSourceManager.kt b/node_modules/@rnmapbox/maps/android/src/main/java/com/rnmapbox/rnmbx/components/styles/sources/RNMBXVectorSourceManager.kt
+index 63b1cfb..b0d3e88 100644
+--- a/node_modules/@rnmapbox/maps/android/src/main/java/com/rnmapbox/rnmbx/components/styles/sources/RNMBXVectorSourceManager.kt
++++ b/node_modules/@rnmapbox/maps/android/src/main/java/com/rnmapbox/rnmbx/components/styles/sources/RNMBXVectorSourceManager.kt
+@@ -11,7 +11,7 @@ import com.rnmapbox.rnmbx.events.constants.eventMapOf
+ import javax.annotation.Nonnull
+ 
+ class RNMBXVectorSourceManager(reactApplicationContext: ReactApplicationContext) :
+-    RNMBXTileSourceManager<RNMBXVectorSource?>(reactApplicationContext),
++    RNMBXTileSourceManager<RNMBXVectorSource>(reactApplicationContext),
+     RNMBXVectorSourceManagerInterface<RNMBXVectorSource> {
+     @Nonnull
+     override fun getName(): String {
+diff --git a/node_modules/@rnmapbox/maps/android/src/main/java/com/rnmapbox/rnmbx/utils/ViewTagResolver.kt b/node_modules/@rnmapbox/maps/android/src/main/java/com/rnmapbox/rnmbx/utils/ViewTagResolver.kt
+index 07bac4d..f45cc25 100644
+--- a/node_modules/@rnmapbox/maps/android/src/main/java/com/rnmapbox/rnmbx/utils/ViewTagResolver.kt
++++ b/node_modules/@rnmapbox/maps/android/src/main/java/com/rnmapbox/rnmbx/utils/ViewTagResolver.kt
+@@ -16,7 +16,7 @@ data class ViewTagWaiter<V>(
+ 
+ const val LOG_TAG = "ViewTagResolver"
+ 
+-typealias ViewRefTag = Int
++typealias ViewRefTag = Double
+ // see https://github.com/rnmapbox/maps/pull/3074
+ open class ViewTagResolver(val context: ReactApplicationContext) {
+     private val createdViews: HashSet<Int> = hashSetOf<Int>()
diff --git a/patches/@shopify+flash-list+1.6.3.patch b/patches/@shopify+flash-list+1.6.3.patch
index ab347fbb4e9c..e3d690055ff8 100644
--- a/patches/@shopify+flash-list+1.6.3.patch
+++ b/patches/@shopify+flash-list+1.6.3.patch
@@ -867,7 +867,7 @@ index 023b94a..0000000
 -{"program":{"fileNames":["../node_modules/typescript/lib/lib.es5.d.ts","../node_modules/typescript/lib/lib.es2015.d.ts","../node_modules/typescript/lib/lib.es2016.d.ts","../node_modules/typescript/lib/lib.es2017.d.ts","../node_modules/typescript/lib/lib.es2018.d.ts","../node_modules/typescript/lib/lib.es2019.d.ts","../node_modules/typescript/lib/lib.es2020.d.ts","../node_modules/typescript/lib/lib.dom.d.ts","../node_modules/typescript/lib/lib.dom.iterable.d.ts","../node_modules/typescript/lib/lib.es2015.core.d.ts","../node_modules/typescript/lib/lib.es2015.collection.d.ts","../node_modules/typescript/lib/lib.es2015.generator.d.ts","../node_modules/typescript/lib/lib.es2015.iterable.d.ts","../node_modules/typescript/lib/lib.es2015.promise.d.ts","../node_modules/typescript/lib/lib.es2015.proxy.d.ts","../node_modules/typescript/lib/lib.es2015.reflect.d.ts","../node_modules/typescript/lib/lib.es2015.symbol.d.ts","../node_modules/typescript/lib/lib.es2015.symbol.wellknown.d.ts","../node_modules/typescript/lib/lib.es2016.array.include.d.ts","../node_modules/typescript/lib/lib.es2017.object.d.ts","../node_modules/typescript/lib/lib.es2017.sharedmemory.d.ts","../node_modules/typescript/lib/lib.es2017.string.d.ts","../node_modules/typescript/lib/lib.es2017.intl.d.ts","../node_modules/typescript/lib/lib.es2017.typedarrays.d.ts","../node_modules/typescript/lib/lib.es2018.asyncgenerator.d.ts","../node_modules/typescript/lib/lib.es2018.asynciterable.d.ts","../node_modules/typescript/lib/lib.es2018.intl.d.ts","../node_modules/typescript/lib/lib.es2018.promise.d.ts","../node_modules/typescript/lib/lib.es2018.regexp.d.ts","../node_modules/typescript/lib/lib.es2019.array.d.ts","../node_modules/typescript/lib/lib.es2019.object.d.ts","../node_modules/typescript/lib/lib.es2019.string.d.ts","../node_modules/typescript/lib/lib.es2019.symbol.d.ts","../node_modules/typescript/lib/lib.es2020.bigint.d.ts","../node_modules/typescript/lib/lib.es2020.date.d.ts","../node_modules/typescript/lib/lib.es2020.promise.d.ts","../node_modules/typescript/lib/lib.es2020.sharedmemory.d.ts","../node_modules/typescript/lib/lib.es2020.string.d.ts","../node_modules/typescript/lib/lib.es2020.symbol.wellknown.d.ts","../node_modules/typescript/lib/lib.es2020.intl.d.ts","../node_modules/typescript/lib/lib.es2020.number.d.ts","../node_modules/typescript/lib/lib.esnext.intl.d.ts","../node_modules/tslib/tslib.d.ts","../node_modules/@types/react-native/modules/BatchedBridge.d.ts","../node_modules/@types/react-native/modules/Codegen.d.ts","../node_modules/@types/react-native/modules/Devtools.d.ts","../node_modules/@types/react-native/modules/globals.d.ts","../node_modules/@types/react-native/modules/LaunchScreen.d.ts","../node_modules/@types/react/global.d.ts","../node_modules/csstype/index.d.ts","../node_modules/@types/prop-types/index.d.ts","../node_modules/@types/scheduler/tracing.d.ts","../node_modules/@types/react/index.d.ts","../node_modules/@types/react-native/private/Utilities.d.ts","../node_modules/@types/react-native/public/Insets.d.ts","../node_modules/@types/react-native/Libraries/ReactNative/RendererProxy.d.ts","../node_modules/@types/react-native/public/ReactNativeTypes.d.ts","../node_modules/@types/react-native/Libraries/Types/CoreEventTypes.d.ts","../node_modules/@types/react-native/public/ReactNativeRenderer.d.ts","../node_modules/@types/react-native/Libraries/Components/Touchable/Touchable.d.ts","../node_modules/@types/react-native/Libraries/Components/View/ViewAccessibility.d.ts","../node_modules/@types/react-native/Libraries/Components/View/ViewPropTypes.d.ts","../node_modules/@types/react-native/Libraries/Components/RefreshControl/RefreshControl.d.ts","../node_modules/@types/react-native/Libraries/Components/ScrollView/ScrollView.d.ts","../node_modules/@types/react-native/Libraries/Components/View/View.d.ts","../node_modules/@types/react-native/Libraries/Image/ImageResizeMode.d.ts","../node_modules/@types/react-native/Libraries/Image/ImageSource.d.ts","../node_modules/@types/react-native/Libraries/Image/Image.d.ts","../node_modules/@react-native/virtualized-lists/Lists/VirtualizedList.d.ts","../node_modules/@react-native/virtualized-lists/index.d.ts","../node_modules/@types/react-native/Libraries/Lists/FlatList.d.ts","../node_modules/@types/react-native/Libraries/Lists/SectionList.d.ts","../node_modules/@types/react-native/Libraries/Text/Text.d.ts","../node_modules/@types/react-native/Libraries/Animated/Animated.d.ts","../node_modules/@types/react-native/Libraries/StyleSheet/StyleSheetTypes.d.ts","../node_modules/@types/react-native/Libraries/StyleSheet/StyleSheet.d.ts","../node_modules/@types/react-native/Libraries/StyleSheet/processColor.d.ts","../node_modules/@types/react-native/Libraries/ActionSheetIOS/ActionSheetIOS.d.ts","../node_modules/@types/react-native/Libraries/Alert/Alert.d.ts","../node_modules/@types/react-native/Libraries/Animated/Easing.d.ts","../node_modules/@types/react-native/Libraries/Animated/useAnimatedValue.d.ts","../node_modules/@types/react-native/Libraries/vendor/emitter/EventEmitter.d.ts","../node_modules/@types/react-native/Libraries/EventEmitter/RCTDeviceEventEmitter.d.ts","../node_modules/@types/react-native/Libraries/EventEmitter/RCTNativeAppEventEmitter.d.ts","../node_modules/@types/react-native/Libraries/AppState/AppState.d.ts","../node_modules/@types/react-native/Libraries/BatchedBridge/NativeModules.d.ts","../node_modules/@types/react-native/Libraries/Components/AccessibilityInfo/AccessibilityInfo.d.ts","../node_modules/@types/react-native/Libraries/Components/ActivityIndicator/ActivityIndicator.d.ts","../node_modules/@types/react-native/Libraries/Components/Clipboard/Clipboard.d.ts","../node_modules/@types/react-native/Libraries/Components/DrawerAndroid/DrawerLayoutAndroid.d.ts","../node_modules/@types/react-native/Libraries/EventEmitter/NativeEventEmitter.d.ts","../node_modules/@types/react-native/Libraries/Components/Keyboard/Keyboard.d.ts","../node_modules/@types/react-native/private/TimerMixin.d.ts","../node_modules/@types/react-native/Libraries/Components/Keyboard/KeyboardAvoidingView.d.ts","../node_modules/@types/react-native/Libraries/Components/Pressable/Pressable.d.ts","../node_modules/@types/react-native/Libraries/Components/ProgressBarAndroid/ProgressBarAndroid.d.ts","../node_modules/@types/react-native/Libraries/Components/SafeAreaView/SafeAreaView.d.ts","../node_modules/@types/react-native/Libraries/Components/StatusBar/StatusBar.d.ts","../node_modules/@types/react-native/Libraries/Components/Switch/Switch.d.ts","../node_modules/@types/react-native/Libraries/Components/TextInput/InputAccessoryView.d.ts","../node_modules/@types/react-native/Libraries/Components/TextInput/TextInput.d.ts","../node_modules/@types/react-native/Libraries/Components/ToastAndroid/ToastAndroid.d.ts","../node_modules/@types/react-native/Libraries/Components/Touchable/TouchableWithoutFeedback.d.ts","../node_modules/@types/react-native/Libraries/Components/Touchable/TouchableHighlight.d.ts","../node_modules/@types/react-native/Libraries/Components/Touchable/TouchableOpacity.d.ts","../node_modules/@types/react-native/Libraries/Components/Touchable/TouchableNativeFeedback.d.ts","../node_modules/@types/react-native/Libraries/Components/Button.d.ts","../node_modules/@types/react-native/Libraries/DevToolsSettings/DevToolsSettingsManager.d.ts","../node_modules/@types/react-native/Libraries/Interaction/InteractionManager.d.ts","../node_modules/@types/react-native/Libraries/Interaction/PanResponder.d.ts","../node_modules/@types/react-native/Libraries/LayoutAnimation/LayoutAnimation.d.ts","../node_modules/@types/react-native/Libraries/Linking/Linking.d.ts","../node_modules/@types/react-native/Libraries/LogBox/LogBox.d.ts","../node_modules/@types/react-native/Libraries/Modal/Modal.d.ts","../node_modules/@types/react-native/Libraries/Performance/Systrace.d.ts","../node_modules/@types/react-native/Libraries/PermissionsAndroid/PermissionsAndroid.d.ts","../node_modules/@types/react-native/Libraries/PushNotificationIOS/PushNotificationIOS.d.ts","../node_modules/@types/react-native/Libraries/Utilities/IPerformanceLogger.d.ts","../node_modules/@types/react-native/Libraries/ReactNative/AppRegistry.d.ts","../node_modules/@types/react-native/Libraries/ReactNative/I18nManager.d.ts","../node_modules/@types/react-native/Libraries/ReactNative/RootTag.d.ts","../node_modules/@types/react-native/Libraries/ReactNative/UIManager.d.ts","../node_modules/@types/react-native/Libraries/ReactNative/requireNativeComponent.d.ts","../node_modules/@types/react-native/Libraries/Settings/Settings.d.ts","../node_modules/@types/react-native/Libraries/Share/Share.d.ts","../node_modules/@types/react-native/Libraries/StyleSheet/PlatformColorValueTypesIOS.d.ts","../node_modules/@types/react-native/Libraries/StyleSheet/PlatformColorValueTypes.d.ts","../node_modules/@types/react-native/Libraries/TurboModule/RCTExport.d.ts","../node_modules/@types/react-native/Libraries/TurboModule/TurboModuleRegistry.d.ts","../node_modules/@types/react-native/Libraries/Utilities/Appearance.d.ts","../node_modules/@types/react-native/Libraries/Utilities/BackHandler.d.ts","../node_modules/@types/react-native/Libraries/Utilities/DevSettings.d.ts","../node_modules/@types/react-native/Libraries/Utilities/Dimensions.d.ts","../node_modules/@types/react-native/Libraries/Utilities/PixelRatio.d.ts","../node_modules/@types/react-native/Libraries/Utilities/Platform.d.ts","../node_modules/@types/react-native/Libraries/Vibration/Vibration.d.ts","../node_modules/@types/react-native/Libraries/YellowBox/YellowBoxDeprecated.d.ts","../node_modules/@types/react-native/Libraries/vendor/core/ErrorUtils.d.ts","../node_modules/@types/react-native/public/DeprecatedPropertiesAlias.d.ts","../node_modules/@types/react-native/index.d.ts","../node_modules/recyclerlistview/dist/reactnative/core/dependencies/ContextProvider.d.ts","../node_modules/recyclerlistview/dist/reactnative/core/dependencies/DataProvider.d.ts","../node_modules/recyclerlistview/dist/reactnative/core/layoutmanager/LayoutManager.d.ts","../node_modules/recyclerlistview/dist/reactnative/core/dependencies/LayoutProvider.d.ts","../node_modules/recyclerlistview/dist/reactnative/core/dependencies/GridLayoutProvider.d.ts","../node_modules/recyclerlistview/dist/reactnative/core/scrollcomponent/BaseScrollView.d.ts","../node_modules/recyclerlistview/dist/reactnative/core/ViewabilityTracker.d.ts","../node_modules/recyclerlistview/dist/reactnative/core/VirtualRenderer.d.ts","../node_modules/recyclerlistview/dist/reactnative/core/ItemAnimator.d.ts","../node_modules/recyclerlistview/dist/reactnative/utils/ComponentCompat.d.ts","../node_modules/recyclerlistview/dist/reactnative/core/RecyclerListView.d.ts","../node_modules/recyclerlistview/dist/reactnative/utils/AutoScroll.d.ts","../node_modules/recyclerlistview/dist/reactnative/core/layoutmanager/GridLayoutManager.d.ts","../node_modules/recyclerlistview/dist/reactnative/core/ProgressiveListView.d.ts","../node_modules/recyclerlistview/dist/reactnative/core/devutils/debughandlers/resize/ResizeDebugHandler.d.ts","../node_modules/recyclerlistview/dist/reactnative/core/devutils/debughandlers/DebugHandlers.d.ts","../node_modules/recyclerlistview/dist/reactnative/index.d.ts","../node_modules/recyclerlistview/dist/reactnative/core/StickyContainer.d.ts","../node_modules/recyclerlistview/sticky/index.d.ts","../src/native/auto-layout/AutoLayoutViewNativeComponentProps.ts","../src/native/auto-layout/AutoLayoutViewNativeComponent.ts","../src/native/auto-layout/AutoLayoutView.tsx","../src/native/cell-container/CellContainer.tsx","../src/PureComponentWrapper.tsx","../src/viewability/ViewToken.ts","../src/FlashListProps.ts","../src/utils/AverageWindow.ts","../src/utils/ContentContainerUtils.ts","../src/GridLayoutProviderWithProps.ts","../src/errors/CustomError.ts","../src/errors/ExceptionList.ts","../src/errors/Warnings.ts","../src/viewability/ViewabilityHelper.ts","../src/viewability/ViewabilityManager.ts","../node_modules/recyclerlistview/dist/reactnative/platform/reactnative/itemanimators/defaultjsanimator/DefaultJSItemAnimator.d.ts","../src/native/config/PlatformHelper.ts","../src/FlashList.tsx","../src/AnimatedFlashList.ts","../src/MasonryFlashList.tsx","../src/benchmark/AutoScrollHelper.ts","../src/benchmark/roundToDecimalPlaces.ts","../src/benchmark/JSFPSMonitor.ts","../src/benchmark/useBlankAreaTracker.ts","../src/benchmark/useBenchmark.ts","../src/benchmark/useDataMultiplier.ts","../src/benchmark/useFlatListBenchmark.ts","../src/index.ts","../src/__tests__/AverageWindow.test.ts","../src/__tests__/ContentContainerUtils.test.ts","../node_modules/@quilted/react-testing/build/typescript/types.d.ts","../node_modules/@quilted/react-testing/build/typescript/matchers/index.d.ts","../node_modules/@quilted/react-testing/build/typescript/environment.d.ts","../node_modules/@quilted/react-testing/build/typescript/implementations/test-renderer.d.ts","../node_modules/@quilted/react-testing/build/typescript/index.d.ts","../src/__tests__/helpers/mountFlashList.tsx","../src/__tests__/FlashList.test.tsx","../src/__tests__/GridLayoutProviderWithProps.test.ts","../src/__tests__/helpers/mountMasonryFlashList.tsx","../src/__tests__/MasonryFlashList.test.ts","../src/native/config/PlatformHelper.web.ts","../src/__tests__/PlatformHelper.web.test.ts","../src/__tests__/ViewabilityHelper.test.ts","../src/__tests__/useBlankAreaTracker.test.tsx","../src/native/auto-layout/AutoLayoutViewNativeComponent.android.ts","../src/native/auto-layout/AutoLayoutViewNativeComponent.ios.ts","../src/native/cell-container/CellContainer.android.ts","../src/native/cell-container/CellContainer.ios.ts","../src/native/cell-container/CellContainer.web.tsx","../src/native/config/PlatformHelper.android.ts","../src/native/config/PlatformHelper.ios.ts","../node_modules/@babel/types/lib/index.d.ts","../node_modules/@types/babel__generator/index.d.ts","../node_modules/@babel/parser/typings/babel-parser.d.ts","../node_modules/@types/babel__template/index.d.ts","../node_modules/@types/babel__traverse/index.d.ts","../node_modules/@types/babel__core/index.d.ts","../node_modules/@types/node/assert.d.ts","../node_modules/@types/node/assert/strict.d.ts","../node_modules/@types/node/globals.d.ts","../node_modules/@types/node/async_hooks.d.ts","../node_modules/@types/node/buffer.d.ts","../node_modules/@types/node/child_process.d.ts","../node_modules/@types/node/cluster.d.ts","../node_modules/@types/node/console.d.ts","../node_modules/@types/node/constants.d.ts","../node_modules/@types/node/crypto.d.ts","../node_modules/@types/node/dgram.d.ts","../node_modules/@types/node/diagnostics_channel.d.ts","../node_modules/@types/node/dns.d.ts","../node_modules/@types/node/dns/promises.d.ts","../node_modules/@types/node/domain.d.ts","../node_modules/@types/node/events.d.ts","../node_modules/@types/node/fs.d.ts","../node_modules/@types/node/fs/promises.d.ts","../node_modules/@types/node/http.d.ts","../node_modules/@types/node/http2.d.ts","../node_modules/@types/node/https.d.ts","../node_modules/@types/node/inspector.d.ts","../node_modules/@types/node/module.d.ts","../node_modules/@types/node/net.d.ts","../node_modules/@types/node/os.d.ts","../node_modules/@types/node/path.d.ts","../node_modules/@types/node/perf_hooks.d.ts","../node_modules/@types/node/process.d.ts","../node_modules/@types/node/punycode.d.ts","../node_modules/@types/node/querystring.d.ts","../node_modules/@types/node/readline.d.ts","../node_modules/@types/node/repl.d.ts","../node_modules/@types/node/stream.d.ts","../node_modules/@types/node/stream/promises.d.ts","../node_modules/@types/node/stream/consumers.d.ts","../node_modules/@types/node/stream/web.d.ts","../node_modules/@types/node/string_decoder.d.ts","../node_modules/@types/node/timers.d.ts","../node_modules/@types/node/timers/promises.d.ts","../node_modules/@types/node/tls.d.ts","../node_modules/@types/node/trace_events.d.ts","../node_modules/@types/node/tty.d.ts","../node_modules/@types/node/url.d.ts","../node_modules/@types/node/util.d.ts","../node_modules/@types/node/v8.d.ts","../node_modules/@types/node/vm.d.ts","../node_modules/@types/node/wasi.d.ts","../node_modules/@types/node/worker_threads.d.ts","../node_modules/@types/node/zlib.d.ts","../node_modules/@types/node/globals.global.d.ts","../node_modules/@types/node/index.d.ts","../node_modules/@types/graceful-fs/index.d.ts","../node_modules/@types/istanbul-lib-coverage/index.d.ts","../node_modules/@types/istanbul-lib-report/index.d.ts","../node_modules/@types/istanbul-reports/index.d.ts","../node_modules/chalk/index.d.ts","../node_modules/@sinclair/typebox/typebox.d.ts","../node_modules/@jest/schemas/build/index.d.ts","../node_modules/pretty-format/build/index.d.ts","../node_modules/jest-diff/build/index.d.ts","../node_modules/jest-matcher-utils/build/index.d.ts","../node_modules/@types/jest/index.d.ts","../node_modules/@types/json-schema/index.d.ts","../node_modules/@types/json5/index.d.ts","../node_modules/@types/parse-json/index.d.ts","../node_modules/@types/prettier/index.d.ts","../node_modules/@types/react-test-renderer/index.d.ts","../node_modules/@types/scheduler/index.d.ts","../node_modules/@types/stack-utils/index.d.ts","../node_modules/@types/websocket/index.d.ts","../node_modules/@types/yargs-parser/index.d.ts","../node_modules/@types/yargs/index.d.ts"],"fileInfos":[{"version":"f5c28122bee592cfaf5c72ed7bcc47f453b79778ffa6e301f45d21a0970719d4","affectsGlobalScope":true},"dc47c4fa66b9b9890cf076304de2a9c5201e94b740cffdf09f87296d877d71f6","7a387c58583dfca701b6c85e0adaf43fb17d590fb16d5b2dc0a2fbd89f35c467","8a12173c586e95f4433e0c6dc446bc88346be73ffe9ca6eec7aa63c8f3dca7f9","5f4e733ced4e129482ae2186aae29fde948ab7182844c3a5a51dd346182c7b06","e6b724280c694a9f588847f754198fb96c43d805f065c3a5b28bbc9594541c84","1fc5ab7a764205c68fa10d381b08417795fc73111d6dd16b5b1ed36badb743d9",{"version":"3f149f903dd20dfeb7c80e228b659f0e436532de772469980dbd00702cc05cc1","affectsGlobalScope":true},{"version":"1272277fe7daa738e555eb6cc45ded42cc2d0f76c07294142283145d49e96186","affectsGlobalScope":true},{"version":"adb996790133eb33b33aadb9c09f15c2c575e71fb57a62de8bf74dbf59ec7dfb","affectsGlobalScope":true},{"version":"43fb1d932e4966a39a41b464a12a81899d9ae5f2c829063f5571b6b87e6d2f9c","affectsGlobalScope":true},{"version":"cdccba9a388c2ee3fd6ad4018c640a471a6c060e96f1232062223063b0a5ac6a","affectsGlobalScope":true},{"version":"c5c05907c02476e4bde6b7e76a79ffcd948aedd14b6a8f56e4674221b0417398","affectsGlobalScope":true},{"version":"0d5f52b3174bee6edb81260ebcd792692c32c81fd55499d69531496f3f2b25e7","affectsGlobalScope":true},{"version":"810627a82ac06fb5166da5ada4159c4ec11978dfbb0805fe804c86406dab8357","affectsGlobalScope":true},{"version":"181f1784c6c10b751631b24ce60c7f78b20665db4550b335be179217bacc0d5f","affectsGlobalScope":true},{"version":"3013574108c36fd3aaca79764002b3717da09725a36a6fc02eac386593110f93","affectsGlobalScope":true},{"version":"75ec0bdd727d887f1b79ed6619412ea72ba3c81d92d0787ccb64bab18d261f14","affectsGlobalScope":true},{"version":"3be5a1453daa63e031d266bf342f3943603873d890ab8b9ada95e22389389006","affectsGlobalScope":true},{"version":"17bb1fc99591b00515502d264fa55dc8370c45c5298f4a5c2083557dccba5a2a","affectsGlobalScope":true},{"version":"7ce9f0bde3307ca1f944119f6365f2d776d281a393b576a18a2f2893a2d75c98","affectsGlobalScope":true},{"version":"6a6b173e739a6a99629a8594bfb294cc7329bfb7b227f12e1f7c11bc163b8577","affectsGlobalScope":true},{"version":"12a310447c5d23c7d0d5ca2af606e3bd08afda69100166730ab92c62999ebb9d","affectsGlobalScope":true},{"version":"b0124885ef82641903d232172577f2ceb5d3e60aed4da1153bab4221e1f6dd4e","affectsGlobalScope":true},{"version":"0eb85d6c590b0d577919a79e0084fa1744c1beba6fd0d4e951432fa1ede5510a","affectsGlobalScope":true},{"version":"da233fc1c8a377ba9e0bed690a73c290d843c2c3d23a7bd7ec5cd3d7d73ba1e0","affectsGlobalScope":true},{"version":"d154ea5bb7f7f9001ed9153e876b2d5b8f5c2bb9ec02b3ae0d239ec769f1f2ae","affectsGlobalScope":true},{"version":"bb2d3fb05a1d2ffbca947cc7cbc95d23e1d053d6595391bd325deb265a18d36c","affectsGlobalScope":true},{"version":"c80df75850fea5caa2afe43b9949338ce4e2de086f91713e9af1a06f973872b8","affectsGlobalScope":true},{"version":"9d57b2b5d15838ed094aa9ff1299eecef40b190722eb619bac4616657a05f951","affectsGlobalScope":true},{"version":"6c51b5dd26a2c31dbf37f00cfc32b2aa6a92e19c995aefb5b97a3a64f1ac99de","affectsGlobalScope":true},{"version":"6e7997ef61de3132e4d4b2250e75343f487903ddf5370e7ce33cf1b9db9a63ed","affectsGlobalScope":true},{"version":"2ad234885a4240522efccd77de6c7d99eecf9b4de0914adb9a35c0c22433f993","affectsGlobalScope":true},{"version":"09aa50414b80c023553090e2f53827f007a301bc34b0495bfb2c3c08ab9ad1eb","affectsGlobalScope":true},{"version":"d7f680a43f8cd12a6b6122c07c54ba40952b0c8aa140dcfcf32eb9e6cb028596","affectsGlobalScope":true},{"version":"3787b83e297de7c315d55d4a7c546ae28e5f6c0a361b7a1dcec1f1f50a54ef11","affectsGlobalScope":true},{"version":"e7e8e1d368290e9295ef18ca23f405cf40d5456fa9f20db6373a61ca45f75f40","affectsGlobalScope":true},{"version":"faf0221ae0465363c842ce6aa8a0cbda5d9296940a8e26c86e04cc4081eea21e","affectsGlobalScope":true},{"version":"06393d13ea207a1bfe08ec8d7be562549c5e2da8983f2ee074e00002629d1871","affectsGlobalScope":true},{"version":"cd483c056da900716879771893a3c9772b66c3c88f8943b4205aec738a94b1d0","affectsGlobalScope":true},{"version":"b248e32ca52e8f5571390a4142558ae4f203ae2f94d5bac38a3084d529ef4e58","affectsGlobalScope":true},{"version":"c37f8a49593a0030eecb51bbfa270e709bec9d79a6cc3bb851ef348d4e6b26f8","affectsGlobalScope":true},"14a84fbe4ec531dcbaf5d2594fd95df107258e60ae6c6a076404f13c3f66f28e",{"version":"1c0e04c54479b57b49fec4e93556974b3d071b65d0b750897e07b3b7d2145fc5","affectsGlobalScope":true},"bc1852215dc1488e6747ca43ae0605041de22ab9a6eeef39542d29837919c414","ae6da60c852e7bacc4a49ff14a42dc1a3fdbb44e11bd9b4acb1bf3d58866ee71",{"version":"0dab023e564abb43c817779fff766e125017e606db344f9633fdba330c970532","affectsGlobalScope":true},"4cbd76eafece5844dc0a32807e68047aecbdd8d863edba651f34c050624f18df",{"version":"ecf78e637f710f340ec08d5d92b3f31b134a46a4fcf2e758690d8c46ce62cba6","affectsGlobalScope":true},"ea0aa24a32c073b8639aa1f3130ba0add0f0f2f76b314d9ba988a5cb91d7e3c4","f7b46d22a307739c145e5fddf537818038fdfffd580d79ed717f4d4d37249380","f5a8b384f182b3851cec3596ccc96cb7464f8d3469f48c74bf2befb782a19de5",{"version":"29b8a3a533884705024eab54e56465614ad167f5dd87fdc2567d8e451f747224","affectsGlobalScope":true},"4f2490e3f420ea6345cade9aee5eada76888848e053726956aaf2af8705477ea","b3ac03d0c853c0ac076a10cfef4dc21d810f54dac5899ade2b1c628c35263533","d17a689ac1bd689f37d6f0d3d9a21afac349e60633844044f7a7b7b9d6f7fd83","019650941b03d4978f62d21ae874788a665c02b54e3268ef2029b02d3b4f7561","ae591c8a4d5c7f7fa44b6965016391457d9c1fd763475f68340599a2a2987a24","fbdef0c642b82cc1713b965f07b4da8005bbbb2c026039bfdc15ca2d20769e38","c2c004e7f1a150541d06bc4a408b96e45ac1f08e0b1b35dfd07fc0f678205f95","1f2081eb2cbeb0828f9baa1dd12cf6d207f8104ae0b085ab9975d11adc7f7e6f","cda9069fc4c312ff484c1373455e4297a02d38ae3bd7d0959aad772a2809623c","c028d20108bcaa3b1fdf3514956a8a90ccf680f18672fa3c92ce5acf81d7ab23","1054f6e8774a75aaf17e7cfea4899344f69590b2db1e06da21048ed1e063c693","9533301b8f75664e1b40a8484a4fd9c77efc04aef526409c2447aab7d12ddc63","b78b5b3fdb4e30976c4263c66c0ad38fb81edcc8075a4160a39d99c6dedd35be","032b51d656feaece529823992f5a39fe9e24d44dfa21b3a149982f7787fc7bdf","5bbfdfb694b019cb2a2022fba361a7a857efc1fc2b77a892c92ebc1349b7e984","46bc25e3501d321a70d0878e82a1d47b16ab77bdf017c8fecc76343f50806a0d","42bacb33cddecbcfe3e043ee1117ba848801749e44f947626765b3e0aec74b1c","49dba0d7a37268e6ae2026e84ad4362eac7e776d816756abf649be7fa177dcd5","5f2b5ab209daae571eb9acc1fd2067ccc94e2a13644579a245875bc4f02b562f","f072acf9547f89b814b9fdb3e72f4ebb1649191591cec99db43d35383906f87f","42450dba65ba1307f27c914a8e45e0b602c6f8f78773c052e42b0b87562f081e","f5870d0ca7b0dfb7e2b9ba9abad3a2e2bffe5c711b53dab2e6e76ca2df58302b","aeb20169389e9f508b1a4eb2a30371b64d64bb7c8543120bc39a3c6b78adfcc9","2a3d3acbab8567057a943f9f56113c0144f5fc561623749fbd6bb5c2b33bf738","9cf21fdcd1beb5142a514887133fa59057e06275bb3070713f3b6d51e830ffa0","0ad4f0b67db47064b404df89c50f99552ce12d6c4bb6154255be61eb6beed094","f8a464b9999126fe1095968c266c0d9c6174612cf256379a1ed1993a87bccdc6","49f981ca657ac160b5de5919ee5602d48bc8f8aac0805107c2ce4fd41dc9a2a1","56e4e08d95a3a7886266a2b4f66b67065c340480d9f1beb73ed7578aa83c639a","eb4360d3818dcd879ee965ae2f4b3fdfdc4149db921b6be338cb7dc7c2bd6710","1c1275f325f13af001aa5873418cb497a26b4b8271f9ad20a45e33f61ea3f9d9","b33e8426136c4f9b349b02c940d23310d350179f790899733aa097ed76457061","05aab001669a230a88820be09a54031c45d9af2488b27d53d4a9c8880ce73e8f","d93a066d4b8b33335dfff910fb25abb8979f8814f8ba45ea902a1360907da1f6","41e97e42d182b4d5f0733ebaad69294faaa507d95e595f317168b8f2325da9ca","debc734fc99b6e1684ed565946bad008913c769d4d2e400d8722c0c23d079c06","5a9f7e087aacb01fa0cdbc36b703a60367239f62beed2507a507199e4c417549","c7c23798fbf564983ed69c1ced3371970d986aaed4801a6e0fb41862550dc034","921f5bce372610ae8948ade7d82decbd2cf56d263de578976189585edd0abac0","ac11f8b13beef593e2f097450a7e214b23dca0d428babd570a2f39582f10e9ab","2499beb5d3e2b4c606977bcc2e08b6ef77b2ecda70e78e0622f5af3bed95c9ba","a11057410396907b84051cbdb8b0cd7f7049d72b58d2b6ac1c14ac2608191a52","bb630c26d487cc45ed107f4f2d3c2a95434716f6367f059de734c40d288c31eb","67cbce0ccdfa96b25de478a93cc493266c152e256c3c96b3d16d1f811e3d881f","19905c928bc4c016d05d915625bb08568447266c4661232faf89f7ddc4417ccc","26204eb4c326e8c975f1b789cbf345c6820205bded6d72e57246a83918d3bc84","618f25b2d41a99216e71817a3bc578991eee86c858c3f0f62a9e70707f4d279d","4cd2947878536ec078e4115b7d53cdcd4dcecd3a8288760caa79098db4f8f61f","2129e984399e94c82b77a32b975f3371ca5ee96341ab9f123474f1a5a1a9921f","798120aaa4952d68cd4b43d6625524c62a135c2f5a3eb705caee98de2355230d","6047365397173788c34bd71fea2bf07a9036d981212efd059b33e52d2c405e97","d7e25d7c03ccf8b10972c2a3a57e29a8d9024e6dbc4ac223baf633a6e8c7145c","6c2e2dead2d80007ee44c429b925d0a7b86f8f3d4c237b2197f7db9f39545dc6","38fbc8f9610fbf4bf619854b26e28c4fbbab16dc1944c4317a4af9bf1ac08d8e","1bd0470a72e6869c330e6e978f15ef32ba2c245249aca097b410448152e8a06b","dd05d7970a92b789f7df3b2252574b2e60f1b9a3758e2839e167b498b8f77159","7092be1889127b2f319efd5d9bdcc0b5cf6fe0740e47247ed039446045518898","0a3d5dbf7c2091017e697ebf9af0a727571f5d99cb4c19e6856212a745c6c355","d05f9c767924db6fb89f6075acb64c042cebdb12779bbd1aaca12c850b772d49","d032678e20ff0f4b8ef6f1e4823b6ae37931b776e8381676dc9141999909b3d7","3e4ab0e8e96e968ac84a2484104892c881ded1757acd81b5e969b6229851f54c","d43a36641f5812794a3b4a941e3dfb5fa070f9fff64cfd6daf5291cb962c8b05","32468df81188116040636844517fbe4f67fc37af4fe565c7592353df8e11d2f3","c12b5f9bf412c891cad443ef00a378ad2d3f1301f140943414308665a7d90af8","cf1b65c20036885ed99ce1c18aa0a0ed66f42acd6d415e99b48a8fa4105c23ed","173aec8be1be982c8244df6f94880d77a9b766c8c1ec3eb0af662c8dc6da7f2e","08188020373062e07955835a996fda1aff97a89e57d469edc6b9210bd9c8926f","cad5c2c0085a3e3b74f58aa199944b25ed8d24f93f51c99ebe2463e4f1694785","3e2d93a797c41ab081fbcd80e959b7c30d5d1c358f091c22a6ebe416ef7c5e19","c440df5735a3305e7db118bf821efb597c8318910861f735372846db9f7b506b","d6d8de719a75e5d2ed9dd9d6a99296d1337259e1c96166579db50797edd72ede","32b4c732e183bf5d123f88d526ac21b71a681089c18d2d761be342df31179d94","212d16020e7dce1b5509f3b9813de73612de57c6a3d74536714eb88787b96dc3","1a63d5212341783aa49cf78d667bf2a6cd03208ea09620b2fc3e647ae07f4e0d","84ea58841272970e6e3247cba4dbb326cf22764c2f4bbcb03f1c634315bbbcb5","86f9fbecdd848d02c90f861cc9839d8f3449c518a77e77ea65362f6a4126c63b","ecdaf317a4a1e7e3540e2f1b6aae38acd78dd99d564b52f98eea7358ac74416d","c30430960f1a0552b3cdaf1ef8164fdd4f289c782a8912df5180d57bc9ddfc03","a348081c01502c9f87d39d9e4b5dd58e1111b34c62686d6e569c595a0417bb35","eff69aee13c76502a16b756cde9c451fb4b5c4234052f3b3bee9dbfe92e1b1d5","9943f44400939f4ff008a882ff71162f70ba0c2f735c9743fd4645ef5c925fc4","b7836eba6c5173a1683aee8aa1771ff339e795cb9c21411590edb910274febe4","6fe447aa7e6fabc4f6c536f2997e3b1116b7f73dbe5bf3fc8d958bad434e4a84","15d3908d453d14be4dae760122ed5d74ad789a19f1fec2edd4034e57217436e9","ef00bc701f382da70870ab7721ed8f6552a38e332e60370b93cf340b6470845c","18891a02fa046e57b43a543dddc7212086fcb04ae6c8e8f28f8605dd3ccf57ed",{"version":"5980a888624dce1b0937a0d21c623f97056501bb61a8da29cbe07f1a0be2c9a8","affectsGlobalScope":true},"590a41ccab332c66a6aa62746612b03ceb2e92cc1da58c140e90fb7ff6e8c851","dc1d2996f23fe7f0da0b2c843e05c0ac170a36b51da11e58de089d344de93c3b","78ff01b50e7e9761f239527ec70b96171bccc28a08d909243e193db03b6f6983","ed18472ee2247563a26d754dd4c8bd66383013df13ce7c2927b03cab1a27b7e8","28ac9ac1fa163e5f2321fafa49b9931908c0076216ed3c82646d79abdf79775e","07dd4bed8ddab685f82a2125bf3aa41b42e36f28c16a5aec7357b727649076fb","fc15a2216f29b825747c0c3a54d6989518dd0f4aa0b580520e5526b4a47bec8f","c656d5baf3d4a8f358fc083db04b0fda8cb8503a613a9ba42327ecbd7909773c","397c2c81eaeae1388f7459699d7606feecfc304b212eb9113407c1315746a578","c2d923e9adc26a3efe5186f3a4a72413d24c80f03b306c68c30fa146690fb101","d34782833b7d5f72486a5fb926d3d96198706ed76aeaf1d435c748ebcf9169fc","b093e56054755189dd891ea832dec40d729d110a0a3f432fff5ea5ab1078cdde","98affe620e6230a3888b445c32376e4edbf6b1b376a71f2bf9c07bee11fcdd65","1e05491bef32ff48393d605d557152735899da3d9b111ba3588a1800f2927f4a","1ff7813974b1b9a0524c1e5a99aa52a05e79fc7df7749ada75ded8c53fe1b7e0","cd8c517f54d4ff3475755b290d741c8799df3265ce73d454d8fafe423f8ff749","bf431147b104ae92d61de6b43e9f25d27e8d3eaeaffd612e0c0d3bb8e2423926","f0f21604ae8f880c0ab529f00303806fdeadc943e32a25ca063fc8fea0fa063c","8dc4f45212fba9381e1674e8bd934a588730efbb8a6681b661cad8cd09b081c5",{"version":"52bf774bd30177ebb3e450c808d8d46f67896848a942e6203ae78b65b33d0106","signature":"688c437017a53e69ff66aac2036a0d7f6263082f676a408c9998cbd87ea2ec73"},{"version":"8b6ee36fd764378c62dca37041c5a12fd5a77b9e853c78908b7ed1c90dc149e4","signature":"03846acca031c757d910dbc017d846c87574faf90bde82316fb9b8537896d5ee"},{"version":"0d089d33f31b56697d142aa7395738c0323cf761b4c79fd6bf65a54ab1ddf02f","signature":"027c87e1cb049497d4f185bc9b922ce91cad59832da8faf3411e6b298b9deb78"},{"version":"ec0982b9e7d6c1b6c80e2829c5909eefb9ecee687e60621e0bb937e8ad5d1d43","signature":"8478b617a5be940f1b4b4d19d2fc6149c21ac69c4a7e00c8a7db2c2c21aa2274"},{"version":"84c5fc9d0d22f4566791b88d5fc2c24f56508b50c9ce894ac549ebaa158b1fca","signature":"677ea66c6fa02f1cebf82df19f416a8302c7a7d10e2de265b162760fcd865eef"},{"version":"8455135ea42310a73404fa2513e212d170af1191584061f583ec1e0f6b75dd91","signature":"83e4298f0b6834e955ee6a76569d3e5b3192065d47f1daf4535bb9edb16e88cb"},{"version":"73529962207605bdc5285d5e745919b8d57b776daa0f22a14b75cd8a92d63af9","signature":"422fcd2a7fd87f05efdfaa6eab382ca607d5d54e1f175ba2efccd4aacd5433ef"},{"version":"ebe927d8a9739c9d32ef4df28c1c36cf82daa9abba7cdf3f79e320c5e99e99d8","signature":"2421f9c6b1ecedd50818719090a77e9d2748c2339c33f3d4817beebf7a39d211"},{"version":"165c56632fea46c85e2a62f1b4eae600b846ea0deacd3c137fde9bacb845c30e","signature":"79bf9e3846b43e706d181c00f3c1c50ae8fc60e587c97a16e521adc150317624"},{"version":"866e1d2cf16a41851b056a2cc0cdc5f0f00df0435376cc2c723a8c609f61fbd0","signature":"5f5bbca60f0bfed6ff714163c4e962a5e260e59db754c89ee2063403accd03e3"},{"version":"ecfa1b63e3829b310ac968b2cc1cc7016ba76ffb8532439aebecbcbc57173b99","signature":"2f1dda63ade2bd085704674523b56ede942bc8c2c37fe8ed9b9b0fdfd69b1262"},{"version":"51d2f746d7e599a5549f5a946565934b4556bb9155be1eed2c474e25f1474872","signature":"c15585fe8935ed5cfedec39b7d41ec49990973f40faaba4b3e14278861643d79"},{"version":"b1d1378906c54a2f4d230ad69d212beedd2552afe3f7ad171b7eacb4cecc26d7","signature":"f9e60e8f79a7f606f19e02e2d39a24995719767dbe587f564f970bb24e3ca29d"},{"version":"f5a156e5b3783ea0399ac0326b7ab31a00e8874c5fa9b5e26fac217da8b5adfd","signature":"cfa7179e0306fc04d93f062c96e7ae8bad58d0cc4a7aa0dd4494ff9d262b101c"},{"version":"3c9fefca9303bcfd5712de11a3cbda20b3d6e85f29019bc75cab24690fb0f90d","signature":"306683152ff5a6038cf05b03ddff85a15b1bc8e18ef268aad26b02fd8e0e8b9d"},"a11c3e55d22d6379fe0949793e2638a6b43aa6e9def4f7452c3e352a296ef8da",{"version":"2770956c9437d7d66650084891c559ff6bb94200b7e2820940fd5d5dd0efa489","signature":"2faaf4f254008bf5be0e145be10dba35dccfac7116e9083f9d697a476a8e7076"},{"version":"ceee917fd557b841b93f7e13103dfdad79d38fe9962408f538f27db03dc9368d","signature":"15003ff6ed10d259dca775c7e5f7a64b272a9c370b6085db2d42a2d4a1d81579"},{"version":"a1691ae6d70af82f3e26d9e2e021dc5063021bd9c335bfdb40dc97d3574d1b3f","signature":"cd1c566b611a70ff987a79d0465da67649a8ed7e7668feddfcdf6dceb01c09a8"},{"version":"a105417dd540f1a400f0665c877e5d7e48e2efe08f01c2e5c7272256e644faa5","signature":"b3a6ee392811d6cddb38378ebaa373d4a39aa7dc4ecac73497c6b33627e6430b"},{"version":"581b44cf6122e3ad267d6bda2428c214fef3d38b6d7249df9fa6bc240a880a78","signature":"0ca09d92d6469d906a3d1c7192a6294c7f65b75f4f7eb8072bbd1b68c7f021e1"},{"version":"2e6426c1a1ff8561aa5f01d9398426bf06e55307f688464939de3196f0d4c143","signature":"5357bd09c9816a9765e617f86a9b49f85133d0bc0f9c5e29e834f2f8e6d52acb"},{"version":"508279c48de5627ae6c30a0aee01f4391bf32450335d7f09d5dd82acbc4d13c5","signature":"11d546a505f70f9c5f8092916027d8045c280a817b709fcaf2c4e63fa026c89c"},{"version":"557f2e0a4e5ac8a59b7c3068b2b30162fb963d72d50152482ab8c414e81caf37","signature":"008eaae28119118f1c589a1e29ea7fd17277f2280d2d3bfddeacd71fd1671bb5"},{"version":"f45c172ca54fb28d64b2dd04e495f17038034e20f37bd286a9f3eeb286cf1388","signature":"75a8761564c8fc5581b062dd339ea698921baf60e52eae055c8177dfa89eba90"},{"version":"ea696a0517ad69afea472e47eb1f904aba1667f54d4557eb98b8c766469d56a2","signature":"7e125d9abc19f62d1480f6c04a45d7bb2c89153316245ae8b8e5a0234b078c4e"},{"version":"902937c505f88d8b5b32829b4c14243eb740013fd0e2f58e6485324bbfe197a6","signature":"dc7de7650e5a64fc010387db18e84d48fe8f562dbd9caac01e54f83681ac976b"},{"version":"842accda78bb1b6f494f264aae307b84d933486d607e91f6e1d3a4d2e4851783","signature":"430d9683c8e5aaab71f0e3b271c4240cd5120a91191f953722985499af51d7e6"},{"version":"45b1a895868587c78a2ddff937967669b4e1968ea72c01e1c2b6dd5993f53b36","signature":"8e609bb71c20b858c77f0e9f90bb1319db8477b13f9f965f1a1e18524bf50881"},{"version":"99cab9373415bac71e9d2c84279782c0a361b59551d0ca8dfaee8d4c08ed3247","signature":"8e609bb71c20b858c77f0e9f90bb1319db8477b13f9f965f1a1e18524bf50881"},"ba1fed463e8a21ffddb67a53df3f0d818b351991723736e167d065e2de1c7183",{"version":"22e311fec88bcc49b2b1fb3c9a7c082cd84b3388c9bcc7b9ef08253f6fa74e26","affectsGlobalScope":true},"c186097fd9b86681981cdeba08c0b6bbfcd8b562ab490c25656d85fef8f10c79","0b0c483e991e81c3f26e5f2da53ff26a15994c98c8b89cda1e4156dfc2428111","3340eb7b30bdee5f0349107d4068fd6f2f4712e11a2ba68e203b2f2489350317",{"version":"2000d60bd5195730ffff0d4ce9389003917928502c455ed2a9e296d3bf1a4b42","signature":"56335d3c9b867cc8654c05e633c508dd8de0038157f9958eb8794b7c123bb90e"},{"version":"dfceb5b9355a4a9002a7c291b1c3315511977c73cb23d9c123a72567783a18c0","signature":"b1802850887a3ea11a06df1fc1c65c6579332eefba1e63b3967a73dc937a2574"},{"version":"384fc0e3fa5966f524c96f1782b9d7a005346ba1621c43d0d1d819bf39077fbc","signature":"8e609bb71c20b858c77f0e9f90bb1319db8477b13f9f965f1a1e18524bf50881"},{"version":"7fde517b3f03bb21ec3a46ba5f85c6797f8abf27deacb862183126e2f072788e","signature":"8b310edcfec83da25bc4f3adb20a7583bc5dae56d7d06c5b1431b76d390c1b72"},{"version":"894d93831d2afcd26f7362347e4960dd6d53f4153dad08813f3670e1327e387c","signature":"b1802850887a3ea11a06df1fc1c65c6579332eefba1e63b3967a73dc937a2574"},{"version":"8f9eac2c3ae305c25d4ffeff800b9811c8d3ec6a11b142fe96d08a2bc40f6440","signature":"08d6a2d1b004bbcac4249cd5baf6e9c662adc6139939c266b42e0422ef0c68b3"},{"version":"ac8980bdd810c30c444b59cca584c9b61d5ab274fa9474d778970537f3090240","signature":"8e609bb71c20b858c77f0e9f90bb1319db8477b13f9f965f1a1e18524bf50881"},{"version":"1c024431c672cf9c6dcdb4d30c5b625435d81a5423b9d45e8de0082e969af8a8","signature":"8e609bb71c20b858c77f0e9f90bb1319db8477b13f9f965f1a1e18524bf50881"},{"version":"eee1b57475023853cd09dd79b8d0d6639b6b82c3baee5863c2f2022b710f4102","signature":"8e609bb71c20b858c77f0e9f90bb1319db8477b13f9f965f1a1e18524bf50881"},{"version":"377ba49d29102653a4b0c72b3870f9c599575df7db3a3fae7a21be5327ff84e2","signature":"c47f5db4df0a5031ed84bc6ee192c412b9e2d4d5e94681af77ccdcc25c851839"},{"version":"377ba49d29102653a4b0c72b3870f9c599575df7db3a3fae7a21be5327ff84e2","signature":"c47f5db4df0a5031ed84bc6ee192c412b9e2d4d5e94681af77ccdcc25c851839"},{"version":"39833acf7547216b2f31b2279dcfec3ed1359dec8adc9d1cb87c695ebf9bff94","signature":"7292d4dc9dac6d815dc30245a4a4a4959845d3a2b84ba0166857e4b23f2d033f"},{"version":"39833acf7547216b2f31b2279dcfec3ed1359dec8adc9d1cb87c695ebf9bff94","signature":"7292d4dc9dac6d815dc30245a4a4a4959845d3a2b84ba0166857e4b23f2d033f"},{"version":"529dd364d169ab3dbbb177ccdc4987c4a6f69187f553f3d36460ab65879ad998","signature":"3919e9d5911da2254732c31942e2cdc0057056ebfc2a16d34041c76a9b58d447"},{"version":"ebea587ca6477b9db29baf75d359924c55ab490fecdc38d7c0f16e589f0d27f9","signature":"0688c25f38e78e052338305d23046c7841074b3da5709a8f9e598ed705b9932b"},{"version":"de411013305dbe5c7a1ac13d2ea16dc36e52e6efd255b4e912fe53862058c649","signature":"2faaf4f254008bf5be0e145be10dba35dccfac7116e9083f9d697a476a8e7076"},"e432b56911b58550616fc4d54c1606f65fe98c74875b81d74601f5f965767c60","cc957354aa3c94c9961ebf46282cfde1e81d107fc5785a61f62c67f1dd3ac2eb","a46a2e69d12afe63876ec1e58d70e5dbee6d3e74132f4468f570c3d69f809f1c","93de1c6dab503f053efe8d304cb522bb3a89feab8c98f307a674a4fae04773e9","3b043cf9a81854a72963fdb57d1884fc4da1cf5be69b5e0a4c5b751e58cb6d88","dd5647a9ccccb2b074dca8a02b00948ac293091ebe73fdf2e6e98f718819f669","0cba3a5d7b81356222594442753cf90dd2892e5ccfe1d262aaca6896ba6c1380","a69c09dbea52352f479d3e7ac949fde3d17b195abe90b045d619f747b38d6d1a",{"version":"c2ab70bbc7a24c42a790890739dd8a0ba9d2e15038b40dff8163a97a5d148c00","affectsGlobalScope":true},"422dbb183fdced59425ca072c8bd09efaa77ce4e2ab928ec0d8a1ce062d2a45a",{"version":"712ba0d43b44d144dfd01593f61af6e2e21cfae83e834d297643e7973e55ed61","affectsGlobalScope":true},"1dab5ab6bcf11de47ab9db295df8c4f1d92ffa750e8f095e88c71ce4c3299628","f71f46ccd5a90566f0a37b25b23bc4684381ab2180bdf6733f4e6624474e1894",{"version":"54e65985a3ee3cec182e6a555e20974ea936fc8b8d1738c14e8ed8a42bd921d4","affectsGlobalScope":true},"82408ed3e959ddc60d3e9904481b5a8dc16469928257af22a3f7d1a3bc7fd8c4","98a3ebfa494b46265634a73459050befba5da8fdc6ca0ef9b7269421780f4ff3","34e5de87d983bc6aefef8b17658556e3157003e8d9555d3cb098c6bef0b5fbc8","cc0b61316c4f37393f1f9595e93b673f4184e9d07f4c127165a490ec4a928668","f27371653aded82b2b160f7a7033fb4a5b1534b6f6081ef7be1468f0f15327d3","c762cd6754b13a461c54b59d0ae0ab7aeef3c292c6cf889873f786ee4d8e75c9","f4ea7d5df644785bd9fbf419930cbaec118f0d8b4160037d2339b8e23c059e79",{"version":"bfea28e6162ed21a0aeed181b623dcf250aa79abf49e24a6b7e012655af36d81","affectsGlobalScope":true},"7a5459efa09ea82088234e6533a203d528c594b01787fb90fba148885a36e8b6","ae97e20f2e10dbeec193d6a2f9cd9a367a1e293e7d6b33b68bacea166afd7792","10d4796a130577d57003a77b95d8723530bbec84718e364aa2129fa8ffba0378","ad41bb744149e92adb06eb953da195115620a3f2ad48e7d3ae04d10762dae197","bf73c576885408d4a176f44a9035d798827cc5020d58284cb18d7573430d9022","7ae078ca42a670445ae0c6a97c029cb83d143d62abd1730efb33f68f0b2c0e82",{"version":"e8b18c6385ff784228a6f369694fcf1a6b475355ba89090a88de13587a9391d5","affectsGlobalScope":true},"5d0a9ea09d990b5788f867f1c79d4878f86f7384cb7dab38eecbf22f9efd063d","12eea70b5e11e924bb0543aea5eadc16ced318aa26001b453b0d561c2fd0bd1e","08777cd9318d294646b121838574e1dd7acbb22c21a03df84e1f2c87b1ad47f2","08a90bcdc717df3d50a2ce178d966a8c353fd23e5c392fd3594a6e39d9bb6304",{"version":"4cd4cff679c9b3d9239fd7bf70293ca4594583767526916af8e5d5a47d0219c7","affectsGlobalScope":true},"2a12d2da5ac4c4979401a3f6eaafa874747a37c365e4bc18aa2b171ae134d21b","002b837927b53f3714308ecd96f72ee8a053b8aeb28213d8ec6de23ed1608b66","1dc9c847473bb47279e398b22c740c83ea37a5c88bf66629666e3cf4c5b9f99c","a9e4a5a24bf2c44de4c98274975a1a705a0abbaad04df3557c2d3cd8b1727949","00fa7ce8bc8acc560dc341bbfdf37840a8c59e6a67c9bfa3fa5f36254df35db2","1b952304137851e45bc009785de89ada562d9376177c97e37702e39e60c2f1ff",{"version":"806ef4cac3b3d9fa4a48d849c8e084d7c72fcd7b16d76e06049a9ed742ff79c0","affectsGlobalScope":true},"44b8b584a338b190a59f4f6929d072431950c7bd92ec2694821c11bce180c8a5","5f0ed51db151c2cdc4fa3bb0f44ce6066912ad001b607a34e65a96c52eb76248",{"version":"3345c276cab0e76dda86c0fb79104ff915a4580ba0f3e440870e183b1baec476","affectsGlobalScope":true},"664d8f2d59164f2e08c543981453893bc7e003e4dfd29651ce09db13e9457980","e383ff72aabf294913f8c346f5da1445ae6ad525836d28efd52cbadc01a361a6","f52fbf64c7e480271a9096763c4882d356b05cab05bf56a64e68a95313cd2ce2","59bdb65f28d7ce52ccfc906e9aaf422f8b8534b2d21c32a27d7819be5ad81df7",{"version":"3a2da34079a2567161c1359316a32e712404b56566c45332ac9dcee015ecce9f","affectsGlobalScope":true},"28a2e7383fd898c386ffdcacedf0ec0845e5d1a86b5a43f25b86bc315f556b79","3aff9c8c36192e46a84afe7b926136d520487155154ab9ba982a8b544ea8fc95","a880cf8d85af2e4189c709b0fea613741649c0e40fffb4360ec70762563d5de0","85bbf436a15bbeda4db888be3062d47f99c66fd05d7c50f0f6473a9151b6a070","9f9c49c95ecd25e0cb2587751925976cf64fd184714cb11e213749c80cf0f927","f0c75c08a71f9212c93a719a25fb0320d53f2e50ca89a812640e08f8ad8c408c",{"version":"ab9b9a36e5284fd8d3bf2f7d5fcbc60052f25f27e4d20954782099282c60d23e","affectsGlobalScope":true},"9cafe917bf667f1027b2bb62e2de454ecd2119c80873ad76fc41d941089753b8","3ebae8c00411116a66fca65b08228ea0cf0b72724701f9b854442100aab55aba","8b06ac3faeacb8484d84ddb44571d8f410697f98d7bfa86c0fda60373a9f5215","7eb06594824ada538b1d8b48c3925a83e7db792f47a081a62cf3e5c4e23cf0ee","f5638f7c2f12a9a1a57b5c41b3c1ea7db3876c003bab68e6a57afd6bcc169af0","0d14fa22c41fdc7277e6f71473b20ebc07f40f00e38875142335d5b63cdfc9d2","7980bf9d2972585cdf76b5a72105f7817be0723ccb2256090f6335f45b462abe","301d7466eb591139c7d456958f732153b3400f3243f68d3321956b43a64769e9","22f13de9e2fe5f0f4724797abd3d34a1cdd6e47ef81fc4933fea3b8bf4ad524b","e3ba509d3dce019b3190ceb2f3fc88e2610ab717122dabd91a9efaa37804040d","cda0cb09b995489b7f4c57f168cd31b83dcbaa7aad49612734fb3c9c73f6e4f2",{"version":"2abad7477cf6761b55c18bea4c21b5a5dcf319748c13696df3736b35f8ac149e","affectsGlobalScope":true},"d38e588a10943bbab1d4ce03d94759bf065ff802a9a72fc57aa75a72f1725b71","96d14f21b7652903852eef49379d04dbda28c16ed36468f8c9fa08f7c14c9538","2b8264b2fefd7367e0f20e2c04eed5d3038831fe00f5efbc110ff0131aab899b","6209c901f30cc321f4b86800d11fad3d67e73a3308f19946b1bc642af0280298","60aaac5fb1858fbd4c4eb40e01706eb227eed9eca5c665564bd146971280dbd3","74b0245c42990ed8a849df955db3f4362c81b13f799ebc981b7bec2d5b414a57","b0d10e46cfe3f6c476b69af02eaa38e4ccc7430221ce3109ae84bb9fb8282298","4266ccd2cf1d6a281efd9c7ddf9efd7daecf76575364148bd233e18919cac3ed","70e9a18da08294f75bf23e46c7d69e67634c0765d355887b9b41f0d959e1426e","105b9a2234dcb06ae922f2cd8297201136d416503ff7d16c72bfc8791e9895c1"],"options":{"composite":true,"declaration":true,"declarationMap":true,"downlevelIteration":true,"esModuleInterop":true,"experimentalDecorators":true,"importHelpers":true,"jsx":2,"noEmitOnError":false,"noImplicitAny":true,"noUnusedLocals":true,"outDir":"./","rootDir":"../src","skipLibCheck":true,"sourceMap":true,"strictNullChecks":true,"target":1,"tsBuildInfoFile":"./tsconfig.tsbuildinfo"},"fileIdsList":[[211,260],[260],[260,273],[53,190,260],[192,194,260],[190,192,193,260],[53,260],[53,140,260],[69,260],[211,212,213,214,215,260],[211,213,260],[233,260,267],[260,269],[260,270],[260,275,277],[217,260],[220,260],[221,226,260],[222,232,233,240,249,259,260],[222,223,232,240,260],[224,260],[225,226,233,241,260],[226,249,256,260],[227,229,232,240,260],[228,260],[229,230,260],[231,232,260],[232,260],[232,233,234,249,259,260],[232,233,234,249,260],[235,240,249,259,260],[232,233,235,236,240,249,256,259,260],[235,237,249,256,259,260],[217,218,219,220,221,222,223,224,225,226,227,228,229,230,231,232,233,234,235,236,237,238,239,240,241,242,243,244,245,246,247,248,249,250,251,252,253,254,255,256,257,258,259,260,261,262,263,264,265,266],[232,238,260],[239,259,260],[229,232,240,249,260],[241,260],[242,260],[220,243,260],[244,258,260,264],[245,260],[246,260],[232,247,260],[247,248,260,262],[232,249,250,251,260],[249,251,260],[249,250,260],[252,260],[253,260],[232,254,255,260],[254,255,260],[226,240,249,256,260],[257,260],[240,258,260],[221,235,246,259,260],[226,260],[249,260,261],[260,262],[260,263],[221,226,232,234,243,249,259,260,262,264],[249,260,265],[76,77,260],[53,58,64,65,68,71,72,73,76,260],[74,260],[84,260],[53,57,82,260],[53,54,57,58,62,75,76,260],[53,76,105,106,260],[53,54,57,58,62,76,260],[82,91,260],[53,54,62,75,76,93,260],[53,55,58,61,62,65,75,76,260],[53,54,57,62,76,260],[53,54,57,62,260],[53,54,55,58,60,62,63,75,76,260],[53,76,260],[53,75,76,260],[53,54,57,58,61,62,75,76,82,93,260],[53,55,58,260],[53,54,57,60,75,76,93,103,260],[53,54,60,76,103,105,260],[53,54,57,60,62,93,103,260],[53,54,55,58,60,61,75,76,93,260],[58,260],[53,55,58,59,60,61,75,76,260],[82,260],[83,260],[53,54,55,57,58,61,66,67,75,76,260],[58,59,260],[53,64,65,70,75,76,260],[53,56,64,70,75,76,260],[53,58,62,260],[53,118,260],[53,57,260],[57,260],[76,260],[75,260],[66,74,76,260],[53,54,57,58,61,75,76,260],[128,260],[53,56,57,260],[91,260],[44,45,46,47,48,55,56,57,58,59,60,61,62,63,64,65,66,67,68,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,119,120,121,122,123,124,125,126,127,128,129,130,131,132,133,134,135,136,137,138,139,260],[140,260],[46,260],[49,50,51,52,260],[232,235,237,240,259,260,267],[260,287],[260,275],[260,272,276],[260,274],[151,260],[53,141,142,143,144,146,147,148,149,150,157,260],[53,140,147,150,151,260],[143,144,260],[142,143,144,147,260],[143,260],[155,260],[157,260],[144,260],[53,144,260],[141,142,143,144,145,146,147,149,150,151,152,153,154,156,260],[149,260],[158,260],[43,140,166,177,260],[43,53,140,157,159,162,163,164,166,168,169,170,171,172,174,176,260],[43,53,140,162,165,260],[43,157,166,167,168,260],[43,53,140,165,166,168,170,171,177,260],[43,53,260],[43,167,260],[43,168,260],[43,53,140,157,162,163,166,172,191,195,260],[43,140,157,177,195,260],[43,53,140,157,177,179,191,198,260],[43,200,260],[43,157,170,171,173,260],[43,53,140,166,177,191,194,260],[43,53,140,166,179,191,194,260],[43,53,177,183,194,195,260],[43,260],[43,181,260],[43,53,177,180,181,182,183,260],[43,53,157,162,177,260],[43,53,140,180,182,184,260],[43,162,163,165,166,177,178,179,180,182,183,184,185,186,260],[43,53,140,160,161,260],[43,140,160,260],[43,140,260],[43,53,140,260],[43,157,260],[43,157,175,260],[43,53,140,157,175,260],[43,140,157,166,260],[43,140,157,170,171,260],[43,140,165,173,177,260],[53,140,166],[53,157,166,169],[53,140,162,165],[157,166],[53,140,166,177],[53],[191],[53,166,177,191,194],[53,166,179,191,194],[53,177,182,183,187],[53,162,177],[140,184],[162,163,165,166,177,178,179,180,182,183,184,185,186],[53,140],[140,160],[140],[157],[53,157],[140,157,166],[140,157],[177]],"referencedMap":[[213,1],[211,2],[274,3],[192,4],[193,5],[194,6],[191,4],[190,7],[69,8],[70,9],[273,2],[216,10],[212,1],[214,11],[215,1],[268,12],[269,2],[270,13],[271,14],[278,15],[279,2],[280,2],[217,16],[218,16],[220,17],[221,18],[222,19],[223,20],[224,21],[225,22],[226,23],[227,24],[228,25],[229,26],[230,26],[231,27],[232,28],[233,29],[234,30],[219,2],[266,2],[235,31],[236,32],[237,33],[267,34],[238,35],[239,36],[240,37],[241,38],[242,39],[243,40],[244,41],[245,42],[246,43],[247,44],[248,45],[249,46],[251,47],[250,48],[252,49],[253,50],[254,51],[255,52],[256,53],[257,54],[258,55],[259,56],[260,57],[261,58],[262,59],[263,60],[264,61],[265,62],[281,2],[282,2],[51,2],[78,63],[79,2],[74,64],[80,2],[81,65],[85,66],[86,2],[87,67],[88,68],[107,69],[89,2],[90,70],[92,71],[94,72],[95,73],[96,74],[63,74],[97,75],[64,76],[98,77],[99,68],[100,78],[101,79],[102,2],[60,80],[104,81],[106,82],[105,83],[103,84],[65,75],[61,85],[62,86],[108,2],[91,87],[83,87],[84,88],[68,89],[66,2],[67,2],[109,87],[110,90],[111,2],[112,71],[71,91],[72,92],[113,2],[114,93],[115,2],[116,2],[117,2],[119,94],[120,2],[56,7],[121,7],[122,95],[123,96],[124,2],[125,97],[127,97],[126,97],[76,98],[75,99],[77,97],[73,100],[128,2],[129,101],[58,102],[130,66],[131,66],[132,103],[133,87],[118,2],[134,2],[135,2],[136,2],[137,7],[138,2],[82,2],[140,104],[44,2],[45,105],[46,106],[48,2],[47,2],[93,2],[54,2],[139,105],[55,2],[59,85],[57,7],[283,7],[49,2],[53,107],[284,2],[52,2],[285,2],[286,108],[287,2],[288,109],[272,2],[50,2],[276,110],[277,111],[275,112],[149,2],[154,113],[151,114],[158,115],[147,116],[148,117],[141,2],[142,2],[145,116],[144,118],[156,119],[155,120],[153,116],[143,121],[146,122],[157,123],[175,124],[152,2],[150,7],[159,125],[43,2],[8,2],[9,2],[11,2],[10,2],[2,2],[12,2],[13,2],[14,2],[15,2],[16,2],[17,2],[18,2],[19,2],[3,2],[4,2],[23,2],[20,2],[21,2],[22,2],[24,2],[25,2],[26,2],[5,2],[27,2],[28,2],[29,2],[30,2],[6,2],[31,2],[32,2],[33,2],[34,2],[7,2],[35,2],[40,2],[41,2],[36,2],[37,2],[38,2],[39,2],[1,2],[42,2],[178,126],[177,127],[166,128],[169,129],[179,130],[164,131],[188,132],[189,133],[196,134],[197,135],[199,136],[201,137],[202,138],[195,139],[198,140],[203,141],[180,142],[182,143],[181,142],[184,144],[183,145],[185,142],[186,146],[170,142],[171,142],[172,142],[187,147],[162,148],[204,149],[205,149],[161,149],[160,131],[206,150],[207,150],[163,151],[208,131],[209,152],[210,152],[176,153],[200,154],[167,142],[168,155],[165,142],[173,156],[174,157]],"exportedModulesMap":[[213,1],[211,2],[274,3],[192,4],[193,5],[194,6],[191,4],[190,7],[69,8],[70,9],[273,2],[216,10],[212,1],[214,11],[215,1],[268,12],[269,2],[270,13],[271,14],[278,15],[279,2],[280,2],[217,16],[218,16],[220,17],[221,18],[222,19],[223,20],[224,21],[225,22],[226,23],[227,24],[228,25],[229,26],[230,26],[231,27],[232,28],[233,29],[234,30],[219,2],[266,2],[235,31],[236,32],[237,33],[267,34],[238,35],[239,36],[240,37],[241,38],[242,39],[243,40],[244,41],[245,42],[246,43],[247,44],[248,45],[249,46],[251,47],[250,48],[252,49],[253,50],[254,51],[255,52],[256,53],[257,54],[258,55],[259,56],[260,57],[261,58],[262,59],[263,60],[264,61],[265,62],[281,2],[282,2],[51,2],[78,63],[79,2],[74,64],[80,2],[81,65],[85,66],[86,2],[87,67],[88,68],[107,69],[89,2],[90,70],[92,71],[94,72],[95,73],[96,74],[63,74],[97,75],[64,76],[98,77],[99,68],[100,78],[101,79],[102,2],[60,80],[104,81],[106,82],[105,83],[103,84],[65,75],[61,85],[62,86],[108,2],[91,87],[83,87],[84,88],[68,89],[66,2],[67,2],[109,87],[110,90],[111,2],[112,71],[71,91],[72,92],[113,2],[114,93],[115,2],[116,2],[117,2],[119,94],[120,2],[56,7],[121,7],[122,95],[123,96],[124,2],[125,97],[127,97],[126,97],[76,98],[75,99],[77,97],[73,100],[128,2],[129,101],[58,102],[130,66],[131,66],[132,103],[133,87],[118,2],[134,2],[135,2],[136,2],[137,7],[138,2],[82,2],[140,104],[44,2],[45,105],[46,106],[48,2],[47,2],[93,2],[54,2],[139,105],[55,2],[59,85],[57,7],[283,7],[49,2],[53,107],[284,2],[52,2],[285,2],[286,108],[287,2],[288,109],[272,2],[50,2],[276,110],[277,111],[275,112],[149,2],[154,113],[151,114],[158,115],[147,116],[148,117],[141,2],[142,2],[145,116],[144,118],[156,119],[155,120],[153,116],[143,121],[146,122],[157,123],[175,124],[152,2],[150,7],[159,125],[43,2],[8,2],[9,2],[11,2],[10,2],[2,2],[12,2],[13,2],[14,2],[15,2],[16,2],[17,2],[18,2],[19,2],[3,2],[4,2],[23,2],[20,2],[21,2],[22,2],[24,2],[25,2],[26,2],[5,2],[27,2],[28,2],[29,2],[30,2],[6,2],[31,2],[32,2],[33,2],[34,2],[7,2],[35,2],[40,2],[41,2],[36,2],[37,2],[38,2],[39,2],[1,2],[42,2],[178,158],[177,159],[166,160],[169,161],[179,162],[164,163],[196,164],[199,164],[195,165],[198,166],[184,167],[183,168],[186,169],[187,170],[162,171],[204,172],[205,172],[161,172],[160,163],[206,173],[207,173],[163,171],[208,163],[209,174],[210,174],[176,174],[200,175],[168,176],[173,177],[174,178]],"semanticDiagnosticsPerFile":[213,211,274,192,193,194,191,190,69,70,273,216,212,214,215,268,269,270,271,278,279,280,217,218,220,221,222,223,224,225,226,227,228,229,230,231,232,233,234,219,266,235,236,237,267,238,239,240,241,242,243,244,245,246,247,248,249,251,250,252,253,254,255,256,257,258,259,260,261,262,263,264,265,281,282,51,78,79,74,80,81,85,86,87,88,107,89,90,92,94,95,96,63,97,64,98,99,100,101,102,60,104,106,105,103,65,61,62,108,91,83,84,68,66,67,109,110,111,112,71,72,113,114,115,116,117,119,120,56,121,122,123,124,125,127,126,76,75,77,73,128,129,58,130,131,132,133,118,134,135,136,137,138,82,140,44,45,46,48,47,93,54,139,55,59,57,283,49,53,284,52,285,286,287,288,272,50,276,277,275,149,154,151,158,147,148,141,142,145,144,156,155,153,143,146,157,175,152,150,159,43,8,9,11,10,2,12,13,14,15,16,17,18,19,3,4,23,20,21,22,24,25,26,5,27,28,29,30,6,31,32,33,34,7,35,40,41,36,37,38,39,1,42,178,177,166,169,179,164,188,189,196,197,199,201,202,195,198,203,180,182,181,184,183,185,186,170,171,172,187,162,204,205,161,160,206,207,163,208,209,210,176,200,167,168,165,173,174]},"version":"4.7.4"}
 \ No newline at end of file
 diff --git a/node_modules/@shopify/flash-list/ios/Sources/AutoLayoutView.swift b/node_modules/@shopify/flash-list/ios/Sources/AutoLayoutView.swift
-index f18e92c..71b63dc 100644
+index f18e92c..f166553 100644
 --- a/node_modules/@shopify/flash-list/ios/Sources/AutoLayoutView.swift
 +++ b/node_modules/@shopify/flash-list/ios/Sources/AutoLayoutView.swift
 @@ -4,31 +4,35 @@ import UIKit
@@ -973,7 +973,7 @@ index f18e92c..71b63dc 100644
                  } else {
                      assertionFailure("CellRendererComponent outer view should always be CellContainer. Learn more here: https://shopify.github.io/flash-list/docs/usage#cellrenderercomponent.")
                      return nil
-@@ -106,7 +128,7 @@ import UIKit
+@@ -106,12 +128,16 @@ import UIKit
  
      /// Checks for overlaps or gaps between adjacent items and then applies a correction.
      /// Performance: RecyclerListView renders very small number of views and this is not going to trigger multiple layouts on the iOS side.
@@ -982,7 +982,16 @@ index f18e92c..71b63dc 100644
          var maxBound: CGFloat = 0
          var minBound: CGFloat = CGFloat(Int.max)
          var maxBoundNextCell: CGFloat = 0
-@@ -192,7 +214,7 @@ import UIKit
+         let correctedScrollOffset = scrollOffset - (horizontal ? frame.minX : frame.minY)
+         lastMaxBoundOverall = 0
++        if cellContainers.count == 1 {
++            let firstCellContainer = cellContainers[0]
++            lastMaxBoundOverall = horizontal ? firstCellContainer.frame.maxX : firstCellContainer.frame.maxY
++        }
+         cellContainers.indices.dropLast().forEach { index in
+             let cellContainer = cellContainers[index]
+             let cellTop = cellContainer.frame.minY
+@@ -192,7 +218,7 @@ import UIKit
          lastMinBound = minBound
      }
  
@@ -991,7 +1000,7 @@ index f18e92c..71b63dc 100644
          lastMaxBoundOverall = max(lastMaxBoundOverall, horizontal ? currentCell.frame.maxX : currentCell.frame.maxY, horizontal ? nextCell.frame.maxX : nextCell.frame.maxY)
      }
  
-@@ -217,7 +239,7 @@ import UIKit
+@@ -217,7 +243,7 @@ import UIKit
  
      /// It's important to avoid correcting views outside the render window. An item that isn't being recycled might still remain in the view tree. If views outside get considered then gaps between unused items will cause algorithm to fail.
      func isWithinBounds(
@@ -1000,21 +1009,18 @@ index f18e92c..71b63dc 100644
          scrollOffset: CGFloat,
          renderAheadOffset: CGFloat,
          windowSize: CGFloat,
-@@ -260,10 +282,10 @@ import UIKit
+@@ -260,17 +286,18 @@ import UIKit
      }
  
      private func footerDiff() -> CGFloat {
 -        if subviews.count == 0 {
-+        if viewsToLayout.count == 0 {
-             lastMaxBoundOverall = 0
+-            lastMaxBoundOverall = 0
 -        } else if subviews.count == 1 {
 -            let firstChild = subviews[0]
-+        } else if viewsToLayout.count == 1 {
-+            let firstChild = viewsToLayout[0]
-             lastMaxBoundOverall = horizontal ? firstChild.frame.maxX : firstChild.frame.maxY
-         }
+-            lastMaxBoundOverall = horizontal ? firstChild.frame.maxX : firstChild.frame.maxY
+-        }
          let autoLayoutEnd = horizontal ? frame.width : frame.height
-@@ -271,6 +293,13 @@ import UIKit
+         return lastMaxBoundOverall - autoLayoutEnd
      }
  
      private func footer() -> UIView? {
diff --git a/patches/expo+50.0.4.patch b/patches/expo+50.0.4.patch
deleted file mode 100644
index 95157e1d73c6..000000000000
--- a/patches/expo+50.0.4.patch
+++ /dev/null
@@ -1,10 +0,0 @@
-diff --git a/node_modules/expo/scripts/autolinking.gradle b/node_modules/expo/scripts/autolinking.gradle
-index 60d6ef8..3ed90a4 100644
---- a/node_modules/expo/scripts/autolinking.gradle
-+++ b/node_modules/expo/scripts/autolinking.gradle
-@@ -1,4 +1,4 @@
- // Resolve `expo` > `expo-modules-autolinking` dependency chain
- def autolinkingPath = ["node", "--print", "require.resolve('expo-modules-autolinking/package.json', { paths: [require.resolve('expo/package.json')] })"].execute(null, rootDir).text.trim()
--apply from: new File(autolinkingPath, "../scripts/android/autolinking_implementation.gradle");
- 
-+apply from: hasProperty("reactNativeProject") ? file('../../expo-modules-autolinking/scripts/android/autolinking_implementation.gradle') : new File(autolinkingPath, "../scripts/android/autolinking_implementation.gradle");
diff --git a/patches/expo+51.0.17+001+hybrid-app.patch b/patches/expo+51.0.17+001+hybrid-app.patch
new file mode 100644
index 000000000000..44048857fc1b
--- /dev/null
+++ b/patches/expo+51.0.17+001+hybrid-app.patch
@@ -0,0 +1,12 @@
+diff --git a/node_modules/expo/scripts/autolinking.gradle b/node_modules/expo/scripts/autolinking.gradle
+index 929b7f0..c948ebb 100644
+--- a/node_modules/expo/scripts/autolinking.gradle
++++ b/node_modules/expo/scripts/autolinking.gradle
+@@ -1,6 +1,6 @@
+ // Resolve `expo` > `expo-modules-autolinking` dependency chain
+ def autolinkingPath = ["node", "--print", "require.resolve('expo-modules-autolinking/package.json', { paths: [require.resolve('expo/package.json')] })"]
+-apply from: new File(
++apply from: hasProperty("reactNativeProject") ? file('../../expo-modules-autolinking/scripts/android/autolinking_implementation.gradle') : new File(
+   providers.exec {
+     workingDir(rootDir)
+     commandLine(autolinkingPath)
diff --git a/patches/expo+51.0.17+002+rn-75-fixes.patch b/patches/expo+51.0.17+002+rn-75-fixes.patch
new file mode 100644
index 000000000000..77848c5369c4
--- /dev/null
+++ b/patches/expo+51.0.17+002+rn-75-fixes.patch
@@ -0,0 +1,40 @@
+diff --git a/node_modules/expo/android/src/main/java/expo/modules/ExpoReactHostFactory.kt b/node_modules/expo/android/src/main/java/expo/modules/ExpoReactHostFactory.kt
+index ed65d12..09bd068 100644
+--- a/node_modules/expo/android/src/main/java/expo/modules/ExpoReactHostFactory.kt
++++ b/node_modules/expo/android/src/main/java/expo/modules/ExpoReactHostFactory.kt
+@@ -92,7 +92,6 @@ object ExpoReactHostFactory {
+     if (reactHost == null) {
+       val useDeveloperSupport = reactNativeHost.useDeveloperSupport
+       val reactHostDelegate = ExpoReactHostDelegate(WeakReference(context), reactNativeHost)
+-      val reactJsExceptionHandler = ReactJsExceptionHandler { _ -> }
+       val componentFactory = ComponentFactory()
+       DefaultComponentsRegistry.register(componentFactory)
+ 
+@@ -106,7 +105,6 @@ object ExpoReactHostFactory {
+           reactHostDelegate,
+           componentFactory,
+           true,
+-          reactJsExceptionHandler,
+           useDeveloperSupport
+         )
+           .apply {
+diff --git a/node_modules/expo/android/src/main/java/expo/modules/ReactNativeHostWrapperBase.kt b/node_modules/expo/android/src/main/java/expo/modules/ReactNativeHostWrapperBase.kt
+index d6b2180..cb006ce 100644
+--- a/node_modules/expo/android/src/main/java/expo/modules/ReactNativeHostWrapperBase.kt
++++ b/node_modules/expo/android/src/main/java/expo/modules/ReactNativeHostWrapperBase.kt
+@@ -8,13 +8,13 @@ import com.facebook.react.ReactNativeHost
+ import com.facebook.react.ReactPackage
+ import com.facebook.react.bridge.JavaScriptExecutorFactory
+ import com.facebook.react.bridge.ReactContext
++import com.facebook.react.defaults.DefaultReactNativeHost
+ import java.lang.reflect.Method
+ 
+ open class ReactNativeHostWrapperBase(
+   application: Application,
+   protected val host: ReactNativeHost
+-) : ReactNativeHost(application) {
+-  // TODO: Inherit from DefaultReactNativeHost when we drop SDK 49 support
++) : DefaultReactNativeHost(application) {
+ 
+   internal val reactNativeHostHandlers = ExpoModulesPackage.packageList
+     .flatMap { it.createReactNativeHostHandlers(application) }
diff --git a/patches/expo-asset+10.0.10.patch b/patches/expo-asset+10.0.10.patch
new file mode 100644
index 000000000000..c9505e69e230
--- /dev/null
+++ b/patches/expo-asset+10.0.10.patch
@@ -0,0 +1,25 @@
+diff --git a/node_modules/expo-asset/build/PlatformUtils.web.js b/node_modules/expo-asset/build/PlatformUtils.web.js
+index c013cd0..03662e1 100644
+--- a/node_modules/expo-asset/build/PlatformUtils.web.js
++++ b/node_modules/expo-asset/build/PlatformUtils.web.js
+@@ -1,4 +1,19 @@
+-export const IS_ENV_WITH_LOCAL_ASSETS = false;
++import {requireOptionalNativeModule} from 'expo-modules-core';
++import Constants, {AppOwnership} from 'expo-constants';
++
++const ExpoUpdates = requireOptionalNativeModule('ExpoUpdates');
++const isRunningInExpoGo = Constants.appOwnership === AppOwnership.Expo;
++// expo-updates (and Expo Go expo-updates override) manages assets from updates and exposes
++// the ExpoUpdates.localAssets constant containing information about the assets.
++const expoUpdatesIsInstalledAndEnabled = !!ExpoUpdates?.isEnabled;
++const expoUpdatesIsUsingEmbeddedAssets = ExpoUpdates?.isUsingEmbeddedAssets;
++// if expo-updates is installed but we're running directly from the embedded bundle, we don't want
++// to override the AssetSourceResolver.
++const shouldUseUpdatesAssetResolution = expoUpdatesIsInstalledAndEnabled && !expoUpdatesIsUsingEmbeddedAssets;
++// Expo Go always uses the updates module for asset resolution (local assets) since it
++// overrides the expo-updates module.
++export const IS_ENV_WITH_LOCAL_ASSETS = isRunningInExpoGo || shouldUseUpdatesAssetResolution;
++
+ export function getLocalAssets() {
+     return {};
+ }
diff --git a/patches/expo-av+13.10.4.patch b/patches/expo-av+13.10.4.patch
deleted file mode 100644
index c7b1626e233a..000000000000
--- a/patches/expo-av+13.10.4.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-diff --git a/node_modules/expo-av/android/build.gradle b/node_modules/expo-av/android/build.gradle
-index 2d68ca6..c3fa3c5 100644
---- a/node_modules/expo-av/android/build.gradle
-+++ b/node_modules/expo-av/android/build.gradle
-@@ -7,10 +7,11 @@ apply plugin: 'maven-publish'
- group = 'host.exp.exponent'
- version = '13.10.4'
- 
-+def REACT_NATIVE_PATH = this.hasProperty('reactNativeProject') ? this.reactNativeProject + '/node_modules/react-native/package.json' : 'react-native/package.json'
- def REACT_NATIVE_BUILD_FROM_SOURCE = findProject(":ReactAndroid") != null
- def REACT_NATIVE_DIR = REACT_NATIVE_BUILD_FROM_SOURCE
-   ? findProject(":ReactAndroid").getProjectDir().parent
--  : new File(["node", "--print", "require.resolve('react-native/package.json')"].execute(null, rootDir).text.trim()).parent
-+  : new File(["node", "--print", "require.resolve('${REACT_NATIVE_PATH}')"].execute(null, rootDir).text.trim()).parent
- 
- def reactNativeArchitectures() {
-     def value = project.getProperties().get("reactNativeArchitectures")
diff --git a/patches/expo-av+14.0.6+001+hybrid-app.patch b/patches/expo-av+14.0.6+001+hybrid-app.patch
new file mode 100644
index 000000000000..d26b966bbfd4
--- /dev/null
+++ b/patches/expo-av+14.0.6+001+hybrid-app.patch
@@ -0,0 +1,19 @@
+diff --git a/node_modules/expo-av/android/build.gradle b/node_modules/expo-av/android/build.gradle
+index 2cd43df..bf748bc 100644
+--- a/node_modules/expo-av/android/build.gradle
++++ b/node_modules/expo-av/android/build.gradle
+@@ -3,12 +3,13 @@ apply plugin: 'com.android.library'
+ group = 'host.exp.exponent'
+ version = '14.0.6'
+
++def REACT_NATIVE_PATH = this.hasProperty('reactNativeProject') ? this.reactNativeProject + '/node_modules/react-native/package.json' : 'react-native/package.json'
+ def REACT_NATIVE_BUILD_FROM_SOURCE = findProject(":ReactAndroid") != null
+ def REACT_NATIVE_DIR = REACT_NATIVE_BUILD_FROM_SOURCE
+   ? findProject(":ReactAndroid").getProjectDir().parent
+   : file(providers.exec {
+       workingDir(rootDir)
+-      commandLine("node", "--print", "require.resolve('react-native/package.json')")
++      commandLine("node", "--print", "require.resolve('${REACT_NATIVE_PATH}')")
+     }.standardOutput.asText.get().trim()).parent
+
+ def reactNativeArchitectures() {
diff --git a/patches/expo-av+14.0.6+002+rn-75-fixes.patch b/patches/expo-av+14.0.6+002+rn-75-fixes.patch
new file mode 100644
index 000000000000..6f0a1db1535b
--- /dev/null
+++ b/patches/expo-av+14.0.6+002+rn-75-fixes.patch
@@ -0,0 +1,14 @@
+diff --git a/node_modules/expo-av/ios/EXAV.podspec b/node_modules/expo-av/ios/EXAV.podspec
+index 20a258b..8add1ba 100644
+--- a/node_modules/expo-av/ios/EXAV.podspec
++++ b/node_modules/expo-av/ios/EXAV.podspec
+@@ -20,7 +20,8 @@ Pod::Spec.new do |s|
+   # Swift/Objective-C compatibility
+   s.pod_target_xcconfig = {
+     'DEFINES_MODULE' => 'YES',
+-    'SWIFT_COMPILATION_MODE' => 'wholemodule'
++    'SWIFT_COMPILATION_MODE' => 'wholemodule',
++    'CLANG_CXX_LANGUAGE_STANDARD' => 'c++20'
+   }
+ 
+   if !$ExpoUseSources&.include?(package['name']) && ENV['EXPO_USE_SOURCE'].to_i == 0 && File.exist?("#{s.name}.xcframework") && Gem::Version.new(Pod::VERSION) >= Gem::Version.new('1.10.0')
diff --git a/patches/expo-image+1.12.12+001+rn-75-fixes.patch b/patches/expo-image+1.12.12+001+rn-75-fixes.patch
new file mode 100644
index 000000000000..4ef48d01da76
--- /dev/null
+++ b/patches/expo-image+1.12.12+001+rn-75-fixes.patch
@@ -0,0 +1,52 @@
+\ No newline at end of file
+diff --git a/node_modules/expo-image/android/build/tmp/kapt3/stubs/debug/expo/modules/image/thumbhash/ThumbhashModule.kapt_metadata b/node_modules/expo-image/android/build/tmp/kapt3/stubs/debug/expo/modules/image/thumbhash/ThumbhashModule.kapt_metadata
+new file mode 100644
+index 0000000..f469e9e
+Binary files /dev/null and b/node_modules/expo-image/android/build/tmp/kapt3/stubs/debug/expo/modules/image/thumbhash/ThumbhashModule.kapt_metadata differ
+diff --git a/node_modules/expo-image/android/src/main/java/expo/modules/image/ExpoImageView.kt b/node_modules/expo-image/android/src/main/java/expo/modules/image/ExpoImageView.kt
+index 64619c6..3d94142 100644
+--- a/node_modules/expo-image/android/src/main/java/expo/modules/image/ExpoImageView.kt
++++ b/node_modules/expo-image/android/src/main/java/expo/modules/image/ExpoImageView.kt
+@@ -211,14 +211,14 @@ class ExpoImageView(
+     super.onDraw(canvas)
+     // Draw borders on top of the background and image
+     if (borderDrawableLazyHolder.isInitialized()) {
+-      val layoutDirection = if (I18nUtil.getInstance().isRTL(context)) {
++      val layoutDirection = if (I18nUtil.instance.isRTL(context)) {
+         LAYOUT_DIRECTION_RTL
+       } else {
+         LAYOUT_DIRECTION_LTR
+       }
+ 
+       borderDrawable.apply {
+-        resolvedLayoutDirection = layoutDirection
++        setLayoutDirectionOverride(layoutDirection)
+         setBounds(0, 0, width, height)
+         draw(canvas)
+       }
+diff --git a/node_modules/expo-image/android/src/main/java/expo/modules/image/ResourceIdHelper.kt b/node_modules/expo-image/android/src/main/java/expo/modules/image/ResourceIdHelper.kt
+index aabe829..aac94db 100644
+--- a/node_modules/expo-image/android/src/main/java/expo/modules/image/ResourceIdHelper.kt
++++ b/node_modules/expo-image/android/src/main/java/expo/modules/image/ResourceIdHelper.kt
+@@ -32,7 +32,7 @@ object ResourceIdHelper {
+   }
+ 
+   fun getResourceUri(context: Context, name: String): Uri? {
+-    val drawableUri = ResourceDrawableIdHelper.getInstance().getResourceDrawableUri(context, name)
++    val drawableUri = ResourceDrawableIdHelper.instance.getResourceDrawableUri(context, name)
+     if (drawableUri != Uri.EMPTY) {
+       return drawableUri
+     }
+diff --git a/node_modules/expo-image/android/src/main/java/expo/modules/image/drawing/OutlineProvider.kt b/node_modules/expo-image/android/src/main/java/expo/modules/image/drawing/OutlineProvider.kt
+index 72b7289..5178d03 100644
+--- a/node_modules/expo-image/android/src/main/java/expo/modules/image/drawing/OutlineProvider.kt
++++ b/node_modules/expo-image/android/src/main/java/expo/modules/image/drawing/OutlineProvider.kt
+@@ -52,7 +52,7 @@ class OutlineProvider(private val mContext: Context) : ViewOutlineProvider() {
+     }
+ 
+     val isRTL = mLayoutDirection == View.LAYOUT_DIRECTION_RTL
+-    val isRTLSwap = I18nUtil.getInstance().doLeftAndRightSwapInRTL(mContext)
++    val isRTLSwap = I18nUtil.instance.doLeftAndRightSwapInRTL(mContext)
+     updateCornerRadius(
+       CornerRadius.TOP_LEFT,
+       BorderRadiusConfig.TOP_LEFT,
diff --git a/patches/expo-image-manipulator+12.0.5.patch b/patches/expo-image-manipulator+12.0.5.patch
new file mode 100644
index 000000000000..672b7c99bdac
--- /dev/null
+++ b/patches/expo-image-manipulator+12.0.5.patch
@@ -0,0 +1,71 @@
+diff --git a/node_modules/expo-image-manipulator/build/ExpoImageManipulator.web.js b/node_modules/expo-image-manipulator/build/ExpoImageManipulator.web.js
+index 5b77ad6..a3ecdb0 100644
+--- a/node_modules/expo-image-manipulator/build/ExpoImageManipulator.web.js
++++ b/node_modules/expo-image-manipulator/build/ExpoImageManipulator.web.js
+@@ -1,5 +1,13 @@
+ import { crop, extent, flip, resize, rotate } from './actions/index.web';
+ import { getContext } from './utils/getContext.web';
++
++const SAFARI_MOBILE_CANVAS_LIMIT = 4096; 
++
++const isMobileIOS = () => {
++    const userAgent = navigator.userAgent;
++    return /iP(ad|od|hone)/i.test(userAgent) && /(WebKit|CriOS|FxiOS|OPiOS|mercury)/i.test(userAgent);
++};
++
+ function getResults(canvas, options) {
+     let uri;
+     if (options) {
+@@ -21,16 +29,49 @@ function getResults(canvas, options) {
+         base64: uri.replace(/^data:image\/\w+;base64,/, ''),
+     };
+ }
++
++function getAdjustedCanvasSize(originalWidth, originalHeight) {
++    if(!isMobileIOS()) return { width: originalWidth, height: originalHeight };
++
++    const aspectRatio = originalWidth / originalHeight;
++    let newWidth;
++    let newHeight;
++
++    if (originalWidth <= SAFARI_MOBILE_CANVAS_LIMIT && originalHeight <= SAFARI_MOBILE_CANVAS_LIMIT) {
++        return { width: originalWidth, height: originalHeight };
++    }
++
++    if (aspectRatio > 1) {
++        newWidth = SAFARI_MOBILE_CANVAS_LIMIT;
++        newHeight = Math.round(newWidth / aspectRatio);
++    } else {
++        newHeight = SAFARI_MOBILE_CANVAS_LIMIT;
++        newWidth = Math.round(newHeight * aspectRatio);
++    }
++
++    if (newWidth > SAFARI_MOBILE_CANVAS_LIMIT) {
++        newWidth = SAFARI_MOBILE_CANVAS_LIMIT;
++        newHeight = Math.round(newWidth / aspectRatio);
++    } else if (newHeight > SAFARI_MOBILE_CANVAS_LIMIT) {
++        newHeight = SAFARI_MOBILE_CANVAS_LIMIT;
++        newWidth = Math.round(newHeight * aspectRatio);
++    }
++
++    return { width: newWidth, height: newHeight };
++}
++
+ function loadImageAsync(uri) {
+     return new Promise((resolve, reject) => {
+         const imageSource = new Image();
+         imageSource.crossOrigin = 'anonymous';
+         const canvas = document.createElement('canvas');
+         imageSource.onload = () => {
+-            canvas.width = imageSource.naturalWidth;
+-            canvas.height = imageSource.naturalHeight;
++            const adjudstedCanvasSize = getAdjustedCanvasSize(imageSource.naturalWidth, imageSource.naturalHeight);
++
++            canvas.width = adjudstedCanvasSize.width;
++            canvas.height = adjudstedCanvasSize.height;
+             const context = getContext(canvas);
+-            context.drawImage(imageSource, 0, 0, imageSource.naturalWidth, imageSource.naturalHeight);
++            context.drawImage(imageSource, 0, 0, adjudstedCanvasSize.width, adjudstedCanvasSize.height);
+             resolve(canvas);
+         };
+         imageSource.onerror = () => reject(canvas);
diff --git a/patches/expo-modules-autolinking+1.10.2.patch b/patches/expo-modules-autolinking+1.10.2.patch
deleted file mode 100644
index 4b68007ba125..000000000000
--- a/patches/expo-modules-autolinking+1.10.2.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-diff --git a/node_modules/expo-modules-autolinking/scripts/android/autolinking_implementation.gradle b/node_modules/expo-modules-autolinking/scripts/android/autolinking_implementation.gradle
-index 92f1fd6..ada01ad 100644
---- a/node_modules/expo-modules-autolinking/scripts/android/autolinking_implementation.gradle
-+++ b/node_modules/expo-modules-autolinking/scripts/android/autolinking_implementation.gradle
-@@ -149,12 +149,13 @@ class ExpoAutolinkingManager {
-   }
- 
-   static private String[] convertOptionsToCommandArgs(String command, Map options) {
-+    def expoPath = options.searchPaths ?  "../react-native/node_modules/expo" : "expo"
-     String[] args = [
-       'node',
-       '--no-warnings',
-       '--eval',
-       // Resolve the `expo` > `expo-modules-autolinking` chain from the project root
--      'require(require.resolve(\'expo-modules-autolinking\', { paths: [require.resolve(\'expo\')] }))(process.argv.slice(1))',
-+      "require(require.resolve(\'expo-modules-autolinking\', { paths: [require.resolve(\'${expoPath}\')] }))(process.argv.slice(1))",
-       '--',
-       command,
-       '--platform',
-diff --git a/node_modules/expo-modules-autolinking/scripts/ios/project_integrator.rb b/node_modules/expo-modules-autolinking/scripts/ios/project_integrator.rb
-index 5d46f1e..3db7b89 100644
---- a/node_modules/expo-modules-autolinking/scripts/ios/project_integrator.rb
-+++ b/node_modules/expo-modules-autolinking/scripts/ios/project_integrator.rb
-@@ -215,6 +215,7 @@ module Expo
-       args = autolinking_manager.base_command_args.map { |arg| "\"#{arg}\"" }
-       platform = autolinking_manager.platform_name.downcase
-       package_names = autolinking_manager.packages_to_generate.map { |package| "\"#{package.name}\"" }
-+      expo_path = ENV['REACT_NATIVE_DIR'] ? "#{ENV['REACT_NATIVE_DIR']}/node_modules/expo" : "expo"
- 
-       <<~SUPPORT_SCRIPT
-       #!/usr/bin/env bash
-@@ -262,7 +263,7 @@ module Expo
- 
-       with_node \\
-         --no-warnings \\
--        --eval "require(require.resolve(\'expo-modules-autolinking\', { paths: [require.resolve(\'expo/package.json\')] }))(process.argv.slice(1))" \\
-+        --eval "require(require.resolve(\'expo-modules-autolinking\', { paths: [require.resolve(\'#{expo_path}/package.json\')] }))(process.argv.slice(1))" \\
-         generate-modules-provider #{args.join(' ')} \\
-         --target "#{modules_provider_path}" \\
-         --platform "apple" \\
diff --git a/patches/expo-modules-autolinking+1.11.1+001+hybrid-app.patch b/patches/expo-modules-autolinking+1.11.1+001+hybrid-app.patch
new file mode 100644
index 000000000000..a345f84b8f20
--- /dev/null
+++ b/patches/expo-modules-autolinking+1.11.1+001+hybrid-app.patch
@@ -0,0 +1,40 @@
+diff --git a/node_modules/expo-modules-autolinking/scripts/android/autolinking_implementation.gradle b/node_modules/expo-modules-autolinking/scripts/android/autolinking_implementation.gradle
+index f085818..fcb9594 100644
+--- a/node_modules/expo-modules-autolinking/scripts/android/autolinking_implementation.gradle
++++ b/node_modules/expo-modules-autolinking/scripts/android/autolinking_implementation.gradle
+@@ -152,12 +152,13 @@ class ExpoAutolinkingManager {
+   }
+
+   static private String[] convertOptionsToCommandArgs(String command, Map options) {
++    def expoPath = options.searchPaths ?  "../react-native/node_modules/expo" : "expo"
+     String[] args = [
+       'node',
+       '--no-warnings',
+       '--eval',
+       // Resolve the `expo` > `expo-modules-autolinking` chain from the project root
+-      'require(require.resolve(\'expo-modules-autolinking\', { paths: [require.resolve(\'expo\')] }))(process.argv.slice(1))',
++      "require(require.resolve(\'expo-modules-autolinking\', { paths: [require.resolve(\'${expoPath}\')] }))(process.argv.slice(1))",
+       '--',
+       command,
+       '--platform',
+diff --git a/node_modules/expo-modules-autolinking/scripts/ios/project_integrator.rb b/node_modules/expo-modules-autolinking/scripts/ios/project_integrator.rb
+index 5d46f1e..fec4f34 100644
+--- a/node_modules/expo-modules-autolinking/scripts/ios/project_integrator.rb
++++ b/node_modules/expo-modules-autolinking/scripts/ios/project_integrator.rb
+@@ -215,6 +215,7 @@ module Expo
+       args = autolinking_manager.base_command_args.map { |arg| "\"#{arg}\"" }
+       platform = autolinking_manager.platform_name.downcase
+       package_names = autolinking_manager.packages_to_generate.map { |package| "\"#{package.name}\"" }
++      expo_path = ENV['REACT_NATIVE_DIR'] ? "#{ENV['REACT_NATIVE_DIR']}/node_modules/expo" : "expo"
+
+       <<~SUPPORT_SCRIPT
+       #!/usr/bin/env bash
+@@ -262,7 +263,7 @@ module Expo
+
+       with_node \\
+         --no-warnings \\
+-        --eval "require(require.resolve(\'expo-modules-autolinking\', { paths: [require.resolve(\'expo/package.json\')] }))(process.argv.slice(1))" \\
++        --eval "require(require.resolve(\'expo-modules-autolinking\', { paths: [require.resolve(\'#{expo_path}/package.json\')] }))(process.argv.slice(1))" \\
+         generate-modules-provider #{args.join(' ')} \\
+         --target "#{modules_provider_path}" \\
+         --platform "apple" \\
diff --git a/patches/expo-modules-core+1.11.8+001+initial.patch b/patches/expo-modules-core+1.11.8+001+initial.patch
deleted file mode 100644
index fe8c5ed7b9cc..000000000000
--- a/patches/expo-modules-core+1.11.8+001+initial.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-diff --git a/node_modules/expo-modules-core/android/build.gradle b/node_modules/expo-modules-core/android/build.gradle
-index 3603ffd..1599a69 100644
---- a/node_modules/expo-modules-core/android/build.gradle
-+++ b/node_modules/expo-modules-core/android/build.gradle
-@@ -53,9 +53,10 @@ def isExpoModulesCoreTests = {
- }.call()
- 
- def REACT_NATIVE_BUILD_FROM_SOURCE = findProject(":packages:react-native:ReactAndroid") != null
-+def FALLBACK_REACT_NATIVE_DIR = hasProperty("reactNativeProject") ? file('../../react-native') : new File(["node", "--print", "require.resolve('react-native/package.json')"].execute(null, rootDir).text.trim()).parent
- def REACT_NATIVE_DIR = REACT_NATIVE_BUILD_FROM_SOURCE
-   ? findProject(":packages:react-native:ReactAndroid").getProjectDir().parent
--  : new File(["node", "--print", "require.resolve('react-native/package.json')"].execute(null, rootDir).text.trim()).parent
-+  : FALLBACK_REACT_NATIVE_DIR
- 
- def reactProperties = new Properties()
- file("$REACT_NATIVE_DIR/ReactAndroid/gradle.properties").withInputStream { reactProperties.load(it) }
diff --git a/patches/expo-modules-core+1.11.8+002+disableViewRecycling.patch b/patches/expo-modules-core+1.11.8+002+disableViewRecycling.patch
deleted file mode 100644
index 4546e6cd6244..000000000000
--- a/patches/expo-modules-core+1.11.8+002+disableViewRecycling.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-diff --git a/node_modules/expo-modules-core/ios/Fabric/ExpoFabricViewObjC.mm b/node_modules/expo-modules-core/ios/Fabric/ExpoFabricViewObjC.mm
-index 96bba7d..6e0b439 100644
---- a/node_modules/expo-modules-core/ios/Fabric/ExpoFabricViewObjC.mm
-+++ b/node_modules/expo-modules-core/ios/Fabric/ExpoFabricViewObjC.mm
-@@ -155,6 +155,11 @@ - (void)updateProps:(const facebook::react::Props::Shared &)props oldProps:(cons
-   [self viewDidUpdateProps];
- }
- 
-++ (BOOL)shouldBeRecycled
-+{
-+    return NO;
-+}
-+
- - (void)updateEventEmitter:(const react::EventEmitter::Shared &)eventEmitter
- {
-   [super updateEventEmitter:eventEmitter];
diff --git a/patches/expo-modules-core+1.12.18+001+disableViewRecycling.patch b/patches/expo-modules-core+1.12.18+001+disableViewRecycling.patch
new file mode 100644
index 000000000000..9753df816197
--- /dev/null
+++ b/patches/expo-modules-core+1.12.18+001+disableViewRecycling.patch
@@ -0,0 +1,16 @@
+diff --git a/node_modules/expo-modules-core/ios/Fabric/ExpoFabricViewObjC.mm b/node_modules/expo-modules-core/ios/Fabric/ExpoFabricViewObjC.mm
+index d34259d..a7f3639 100644
+--- a/node_modules/expo-modules-core/ios/Fabric/ExpoFabricViewObjC.mm
++++ b/node_modules/expo-modules-core/ios/Fabric/ExpoFabricViewObjC.mm
+@@ -141,6 +141,11 @@ - (void)updateProps:(const facebook::react::Props::Shared &)props oldProps:(cons
+   [self viewDidUpdateProps];
+ }
+ 
+++ (BOOL)shouldBeRecycled
++{
++    return NO;
++}
++
+ - (void)updateEventEmitter:(const react::EventEmitter::Shared &)eventEmitter
+ {
+   [super updateEventEmitter:eventEmitter];
diff --git a/patches/expo-modules-core+1.12.18+002+rn75-fixes.patch b/patches/expo-modules-core+1.12.18+002+rn75-fixes.patch
new file mode 100644
index 000000000000..9377edf8e10f
--- /dev/null
+++ b/patches/expo-modules-core+1.12.18+002+rn75-fixes.patch
@@ -0,0 +1,63 @@
+diff --git a/node_modules/expo-modules-core/android/src/main/java/expo/modules/adapters/react/ModuleRegistryReadyNotifier.java b/node_modules/expo-modules-core/android/src/main/java/expo/modules/adapters/react/ModuleRegistryReadyNotifier.java
+index c873ec0..98628e6 100644
+--- a/node_modules/expo-modules-core/android/src/main/java/expo/modules/adapters/react/ModuleRegistryReadyNotifier.java
++++ b/node_modules/expo-modules-core/android/src/main/java/expo/modules/adapters/react/ModuleRegistryReadyNotifier.java
+@@ -20,7 +20,7 @@ public class ModuleRegistryReadyNotifier extends BaseJavaModule {
+ 
+   @Override
+   public String getName() {
+-    return null;
++    return "ModuleRegistryReadyNotifier";
+   }
+ 
+   @Override
+diff --git a/node_modules/expo-modules-core/android/src/main/java/expo/modules/kotlin/AppContext.kt b/node_modules/expo-modules-core/android/src/main/java/expo/modules/kotlin/AppContext.kt
+index 7f1b5e6..bc127ff 100644
+--- a/node_modules/expo-modules-core/android/src/main/java/expo/modules/kotlin/AppContext.kt
++++ b/node_modules/expo-modules-core/android/src/main/java/expo/modules/kotlin/AppContext.kt
+@@ -170,7 +170,7 @@ class AppContext(
+             this,
+             jsRuntimePointer,
+             jniDeallocator,
+-            reactContext.runtimeExecutor!!
++            reactContext.catalystInstance.runtimeExecutor!!
+           )
+         } else {
+           jsiInterop.installJSI(
+diff --git a/node_modules/expo-modules-core/android/src/main/java/expo/modules/kotlin/defaultmodules/CoreModule.kt b/node_modules/expo-modules-core/android/src/main/java/expo/modules/kotlin/defaultmodules/CoreModule.kt
+index 71725db..62da68a 100644
+--- a/node_modules/expo-modules-core/android/src/main/java/expo/modules/kotlin/defaultmodules/CoreModule.kt
++++ b/node_modules/expo-modules-core/android/src/main/java/expo/modules/kotlin/defaultmodules/CoreModule.kt
+@@ -4,7 +4,7 @@ import com.facebook.react.ReactActivity
+ import com.facebook.react.ReactDelegate
+ import com.facebook.react.bridge.UiThreadUtil
+ import com.facebook.react.config.ReactFeatureFlags
+-import com.facebook.react.devsupport.DisabledDevSupportManager
++import com.facebook.react.devsupport.ReleaseDevSupportManager
+ import expo.modules.kotlin.events.normalizeEventName
+ import expo.modules.kotlin.modules.Module
+ import expo.modules.kotlin.modules.ModuleDefinition
+@@ -70,7 +70,7 @@ class CoreModule : Module() {
+         ?: return@AsyncFunction
+       if (!ReactFeatureFlags.enableBridgelessArchitecture) {
+         val reactInstanceManager = reactDelegate.reactInstanceManager
+-        if (reactInstanceManager.devSupportManager is DisabledDevSupportManager) {
++        if (reactInstanceManager.devSupportManager is ReleaseDevSupportManager) {
+           UiThreadUtil.runOnUiThread {
+             reactInstanceManager.recreateReactContextInBackground()
+           }
+diff --git a/node_modules/expo-modules-core/android/src/main/java/expo/modules/kotlin/views/FilteredReadableMap.kt b/node_modules/expo-modules-core/android/src/main/java/expo/modules/kotlin/views/FilteredReadableMap.kt
+index 0ff2a51..a6ff1f8 100644
+--- a/node_modules/expo-modules-core/android/src/main/java/expo/modules/kotlin/views/FilteredReadableMap.kt
++++ b/node_modules/expo-modules-core/android/src/main/java/expo/modules/kotlin/views/FilteredReadableMap.kt
+@@ -41,8 +41,8 @@ class FilteredReadableMap(
+   private val backingMap: ReadableMap,
+   private val filteredKeys: List<String>
+ ) : ReadableMap by backingMap {
+-  override fun getEntryIterator(): Iterator<Map.Entry<String, Any>> =
+-    FilteredIterator(backingMap.entryIterator) {
++  override val entryIterator: Iterator<Map.Entry<String, Any>>
++    get() = FilteredIterator(backingMap.entryIterator) {
+       !filteredKeys.contains(it.key)
+     }
+ 
diff --git a/patches/expo-modules-core+1.12.18+003+hybrid-app.patch b/patches/expo-modules-core+1.12.18+003+hybrid-app.patch
new file mode 100644
index 000000000000..b32830615aaa
--- /dev/null
+++ b/patches/expo-modules-core+1.12.18+003+hybrid-app.patch
@@ -0,0 +1,21 @@
+diff --git a/node_modules/expo-modules-core/android/build.gradle b/node_modules/expo-modules-core/android/build.gradle
+index f22a3c3..4884cea 100644
+--- a/node_modules/expo-modules-core/android/build.gradle
++++ b/node_modules/expo-modules-core/android/build.gradle
+@@ -20,12 +20,13 @@ def isExpoModulesCoreTests = {
+ }.call()
+ 
+ def REACT_NATIVE_BUILD_FROM_SOURCE = findProject(":packages:react-native:ReactAndroid") != null
+-def REACT_NATIVE_DIR = REACT_NATIVE_BUILD_FROM_SOURCE
+-  ? findProject(":packages:react-native:ReactAndroid").getProjectDir().parent
+-  : file(providers.exec {
++def FALLBACK_REACT_NATIVE_DIR = hasProperty("reactNativeProject") ? file('../../react-native') : file(providers.exec {
+       workingDir(rootDir)
+       commandLine("node", "--print", "require.resolve('react-native/package.json')")
+     }.standardOutput.asText.get().trim()).parent
++def REACT_NATIVE_DIR = REACT_NATIVE_BUILD_FROM_SOURCE
++  ? findProject(":packages:react-native:ReactAndroid").getProjectDir().parent
++  : FALLBACK_REACT_NATIVE_DIR
+ 
+ def reactProperties = new Properties()
+ file("$REACT_NATIVE_DIR/ReactAndroid/gradle.properties").withInputStream { reactProperties.load(it) }
diff --git a/patches/focus-trap+7.5.4.patch b/patches/focus-trap+7.5.4.patch
new file mode 100644
index 000000000000..c7b2aef2b51f
--- /dev/null
+++ b/patches/focus-trap+7.5.4.patch
@@ -0,0 +1,106 @@
+diff --git a/node_modules/focus-trap/dist/focus-trap.esm.js b/node_modules/focus-trap/dist/focus-trap.esm.js
+index 10d56db..a6d76d8 100644
+--- a/node_modules/focus-trap/dist/focus-trap.esm.js
++++ b/node_modules/focus-trap/dist/focus-trap.esm.js
+@@ -100,8 +100,8 @@ var isKeyForward = function isKeyForward(e) {
+ var isKeyBackward = function isKeyBackward(e) {
+   return isTabEvent(e) && e.shiftKey;
+ };
+-var delay = function delay(fn) {
+-  return setTimeout(fn, 0);
++var delay = function delay(fn, delayTime = 0) {
++  return setTimeout(() => setTimeout(fn, delayTime), 0);
+ };
+ 
+ // Array.find/findIndex() are not supported on IE; this replicates enough
+@@ -283,7 +283,7 @@ var createFocusTrap = function createFocusTrap(elements, userOptions) {
+     return node;
+   };
+   var getInitialFocusNode = function getInitialFocusNode() {
+-    var node = getNodeForOption('initialFocus');
++    var node = getNodeForOption('initialFocus', state.containers);
+ 
+     // false explicitly indicates we want no initialFocus at all
+     if (node === false) {
+@@ -744,7 +744,7 @@ var createFocusTrap = function createFocusTrap(elements, userOptions) {
+     // that caused the focus trap activation.
+     state.delayInitialFocusTimer = config.delayInitialFocus ? delay(function () {
+       tryFocus(getInitialFocusNode());
+-    }) : tryFocus(getInitialFocusNode());
++    }, typeof config.delayInitialFocus === 'number' ? config.delayInitialFocus : undefined) : tryFocus(getInitialFocusNode());
+     doc.addEventListener('focusin', checkFocusIn, true);
+     doc.addEventListener('mousedown', checkPointerDown, {
+       capture: true,
+@@ -880,7 +880,7 @@ var createFocusTrap = function createFocusTrap(elements, userOptions) {
+             tryFocus(getReturnFocusNode(state.nodeFocusedBeforeActivation));
+           }
+           onPostDeactivate === null || onPostDeactivate === void 0 || onPostDeactivate();
+-        });
++        }, typeof config.delayInitialFocus === 'number' ? config.delayInitialFocus : undefined);
+       };
+       if (returnFocus && checkCanReturnFocus) {
+         checkCanReturnFocus(getReturnFocusNode(state.nodeFocusedBeforeActivation)).then(finishDeactivation, finishDeactivation);
+diff --git a/node_modules/focus-trap/index.d.ts b/node_modules/focus-trap/index.d.ts
+index 400db1b..69f4b94 100644
+--- a/node_modules/focus-trap/index.d.ts
++++ b/node_modules/focus-trap/index.d.ts
+@@ -16,7 +16,7 @@ declare module 'focus-trap' {
+    * `document.querySelector()` to find the DOM node), `false` to explicitly indicate
+    * an opt-out, or a function that returns a DOM node or `false`.
+    */
+-  export type FocusTargetOrFalse = FocusTargetValueOrFalse | (() => FocusTargetValueOrFalse);
++  export type FocusTargetOrFalse = FocusTargetValueOrFalse | ((containers?: HTMLElement[]) => FocusTargetValueOrFalse | undefined);
+ 
+   type MouseEventToBoolean = (event: MouseEvent | TouchEvent) => boolean;
+   type KeyboardEventToBoolean = (event: KeyboardEvent) => boolean;
+@@ -185,7 +185,7 @@ declare module 'focus-trap' {
+      * This prevents elements within the focusable element from capturing
+      * the event that triggered the focus trap activation.
+      */
+-    delayInitialFocus?: boolean;
++    delayInitialFocus?: boolean | number;
+     /**
+      * Default: `window.document`. Document where the focus trap will be active.
+      * This allows to use FocusTrap in an iFrame context.
+diff --git a/node_modules/focus-trap/index.js b/node_modules/focus-trap/index.js
+index de8e46a..bfc8b63 100644
+--- a/node_modules/focus-trap/index.js
++++ b/node_modules/focus-trap/index.js
+@@ -63,8 +63,8 @@ const isKeyBackward = function (e) {
+   return isTabEvent(e) && e.shiftKey;
+ };
+ 
+-const delay = function (fn) {
+-  return setTimeout(fn, 0);
++const delay = function (fn, delayTime = 0) {
++  return setTimeout(() => setTimeout(fn, delayTime), 0);
+ };
+ 
+ // Array.find/findIndex() are not supported on IE; this replicates enough
+@@ -267,7 +267,7 @@ const createFocusTrap = function (elements, userOptions) {
+   };
+ 
+   const getInitialFocusNode = function () {
+-    let node = getNodeForOption('initialFocus');
++    let node = getNodeForOption('initialFocus', state.containers);
+ 
+     // false explicitly indicates we want no initialFocus at all
+     if (node === false) {
+@@ -817,7 +817,7 @@ const createFocusTrap = function (elements, userOptions) {
+     state.delayInitialFocusTimer = config.delayInitialFocus
+       ? delay(function () {
+           tryFocus(getInitialFocusNode());
+-        })
++        }, typeof config.delayInitialFocus === 'number' ? config.delayInitialFocus : undefined)
+       : tryFocus(getInitialFocusNode());
+ 
+     doc.addEventListener('focusin', checkFocusIn, true);
+@@ -989,7 +989,7 @@ const createFocusTrap = function (elements, userOptions) {
+             tryFocus(getReturnFocusNode(state.nodeFocusedBeforeActivation));
+           }
+           onPostDeactivate?.();
+-        });
++        }, typeof config.delayInitialFocus === 'number' ? config.delayInitialFocus : undefined);
+       };
+ 
+       if (returnFocus && checkCanReturnFocus) {
diff --git a/patches/http-server+14.1.1.patch b/patches/http-server+14.1.1.patch
new file mode 100644
index 000000000000..4f294f930630
--- /dev/null
+++ b/patches/http-server+14.1.1.patch
@@ -0,0 +1,13 @@
+diff --git a/node_modules/http-server/lib/http-server.js b/node_modules/http-server/lib/http-server.js
+index dfe4c47..b1c3089 100644
+--- a/node_modules/http-server/lib/http-server.js
++++ b/node_modules/http-server/lib/http-server.js
+@@ -98,6 +98,8 @@ function HttpServer(options) {
+     });
+   }
+ 
++  this.headers['Document-Policy'] = 'js-profiling';
++
+   if (options.cors) {
+     this.headers['Access-Control-Allow-Origin'] = '*';
+     this.headers['Access-Control-Allow-Headers'] = 'Origin, X-Requested-With, Content-Type, Accept, Range';
diff --git a/patches/link+2.1.1.patch b/patches/link+2.1.1.patch
new file mode 100644
index 000000000000..ae5abc87400a
--- /dev/null
+++ b/patches/link+2.1.1.patch
@@ -0,0 +1,4513 @@
+diff --git a/node_modules/link/README.md b/node_modules/link/README.md
+index d7ff505..bc868c4 100644
+--- a/node_modules/link/README.md
++++ b/node_modules/link/README.md
+@@ -1,4 +1,11 @@
+-# npx link
++<p align="center">
++	<img width="180" src=".github/logo.webp">
++</p>
++<h1 align="center">
++	<sup>npx link</sup>
++	<br>
++	<a href="https://npm.im/link"><img src="https://badgen.net/npm/v/link"></a> <a href="https://npm.im/link"><img src="https://badgen.net/npm/dm/link"></a>
++</h1>
+ 
+ A safer and enhanced version of [`npm link`](https://docs.npmjs.com/cli/v8/commands/npm-link).
+ 
+@@ -13,14 +20,10 @@ Why is `npm link` unsafe? Read the [blog post](https://hirok.io/posts/avoid-npm-
+ <br>
+ 
+ <p align="center">
+-	<a href="https://privatenumber-sponsors.vercel.app/api/sponsor?tier=platinum">
+-		<picture>
+-			<source width="830" media="(prefers-color-scheme: dark)" srcset="https://privatenumber-sponsors.vercel.app/api/sponsor?tier=platinum&image=dark">
+-			<source width="830" media="(prefers-color-scheme: light)" srcset="https://privatenumber-sponsors.vercel.app/api/sponsor?tier=platinum&image">
+-			<img width="830" src="https://privatenumber-sponsors.vercel.app/api/sponsor?tier=platinum&image" alt="Premium sponsor banner">
+-		</picture>
+-	</a>
++	<a href="https://github.com/sponsors/privatenumber/sponsorships?tier_id=398771"><img width="412" src="https://raw.githubusercontent.com/privatenumber/sponsors/master/banners/assets/donate.webp"></a>
++	<a href="https://github.com/sponsors/privatenumber/sponsorships?tier_id=397608"><img width="412" src="https://raw.githubusercontent.com/privatenumber/sponsors/master/banners/assets/sponsor.webp"></a>
+ </p>
++<p align="center"><sup><i>Already a sponsor?</i> Join the discussion in the <a href="https://github.com/pvtnbr/link">Development repo</a>!</sup></p>
+ 
+ ## Terminology
+ 
+@@ -120,6 +123,37 @@ _Publish mode_ helps replicate the production environment in your development se
+ 
+ 	> **Note:** If the _Dependency package_ emits new files, you'll need to re-run `npx link publish <dependency-package-path>` to create new hard links.
+ 
++#### Watch mode
++
++To automatically re-link a package in publish mode whenever a change is made, use the `--watch` flag:
++
++```sh
++npx link publish --watch <dependency-package-path>
++```
++
++Hard links do not support directories, so files must be individually linked. _Watch mode_ addresses this limitation by automatically linking new files added to the _Dependency package_ so they appear in the _Consuming package_.
++
++##### Watch mode caveats
++
++A fundamental limitation of _watch mode_ is that it doesn't have a reliable way to know when the rebuild of your local _Dependency package_ is complete.
++
++The **recommended** way to address this limitation is using the `--litmus` flag. This flag specifies a filepath relative to the _Dependency package_ that `link` can check to see if a build is completed.
++For example, you might create an empty file in your local dependency called `.build_complete`, and augment it's build system to delete that file at the start of builds, and re-create it at the end of builds. Then pass `npx link --watch --litmus '.build_complete'`
++
++```
++"build:watch": "nodemon --watch src --ext .ts,.tsx,.css --exec \"rm -f .build_complete && yarn prepare && yarn pack && touch .build_complete\"",
++```
++
++If for some reason you can't do that, you'll have to fall back on some heuristics:
++
++| Flag | Description                                                                                                                              | Default |
++|------|------------------------------------------------------------------------------------------------------------------------------------------|---------|
++| `--delay` or `-d`       | The amount of time (in ms) after a change is observed to refresh the packlist for your _Dependency package_                              | 2000    |
++| `--interval` or `-i`    | The amount of time (in ms) to poll the _Dependency package_ to see if all expected files are present (i.e: build is complete)            | 500 |
++| `--maxBuildTime` or `-m` | The maximum amount of time (in ms) to poll the _Dependency package_ to see if all expected files are present (i.e: build is complete)    | 30000 |
++
++Note that there is an edge case with _watch mode_ that may not work as expected if you don't use the `--litmus` flag; if you intentionally delete a file in the _Dependency package_, you may have to wait `--maxBuildTime` before the links are refreshed.
++
+ ### Configuration file
+ 
+ Create a `link.config.json` (or `link.config.js`) configuration file at the root of the _Consuming package_ to automatically setup links to multiple _Dependency packages_.
+@@ -166,18 +200,6 @@ Enable with the `--deep` flag or `deepLink` property in `link.config.json`.
+ npx link --deep
+ ```
+ 
+-<br>
+-
+-<p align="center">
+-	<a href="https://privatenumber-sponsors.vercel.app/api/sponsor?tier=gold">
+-		<picture>
+-			<source width="830" media="(prefers-color-scheme: dark)" srcset="https://privatenumber-sponsors.vercel.app/api/sponsor?tier=gold&image=dark">
+-			<source width="830" media="(prefers-color-scheme: light)" srcset="https://privatenumber-sponsors.vercel.app/api/sponsor?tier=gold&image">
+-			<img width="830" src="https://privatenumber-sponsors.vercel.app/api/sponsor?tier=gold&image" alt="Premium sponsor banner">
+-		</picture>
+-	</a>
+-</p>
+-
+ ## FAQ
+ 
+ ### Why should I use `npx link` over `npm link`?
+@@ -213,23 +235,6 @@ $ npx link
+ 
+ ## Sponsors
+ 
+-<p align="center">
+-	<a href="https://privatenumber-sponsors.vercel.app/api/sponsor?tier=silver1">
+-		<picture>
+-			<source width="410" media="(prefers-color-scheme: dark)" srcset="https://privatenumber-sponsors.vercel.app/api/sponsor?tier=silver1&image=dark">
+-			<source width="410" media="(prefers-color-scheme: light)" srcset="https://privatenumber-sponsors.vercel.app/api/sponsor?tier=silver1&image">
+-			<img width="410" src="https://privatenumber-sponsors.vercel.app/api/sponsor?tier=silver1&image" alt="Premium sponsor banner">
+-		</picture>
+-	</a>
+-	<a href="https://privatenumber-sponsors.vercel.app/api/sponsor?tier=silver2">
+-		<picture>
+-			<source width="410" media="(prefers-color-scheme: dark)" srcset="https://privatenumber-sponsors.vercel.app/api/sponsor?tier=silver2&image=dark">
+-			<source width="410" media="(prefers-color-scheme: light)" srcset="https://privatenumber-sponsors.vercel.app/api/sponsor?tier=silver2&image">
+-			<img width="410" src="https://privatenumber-sponsors.vercel.app/api/sponsor?tier=silver2&image" alt="Premium sponsor banner">
+-		</picture>
+-	</a>
+-</p>
+-
+ <p align="center">
+ 	<a href="https://github.com/sponsors/privatenumber">
+ 		<img src="https://cdn.jsdelivr.net/gh/privatenumber/sponsors/sponsorkit/sponsors.svg">
+diff --git a/node_modules/link/dist/cli.js b/node_modules/link/dist/cli.js
+index ae69549..5687188 100755
+--- a/node_modules/link/dist/cli.js
++++ b/node_modules/link/dist/cli.js
+@@ -1,111 +1,4284 @@
+ #!/usr/bin/env node
+-"use strict";var O=require("fs/promises"),Ot=require("tty"),A=require("path"),fi=require("module"),ru=require("fs"),kt=require("events"),Fi=typeof document<"u"?document.currentScript:null;const jt="known-flag",xt="unknown-flag",Tt="argument",{stringify:ne}=JSON,Rt=/\B([A-Z])/g,Pt=u=>u.replace(Rt,"-$1").toLowerCase(),{hasOwnProperty:Lt}=Object.prototype,ie=(u,e)=>Lt.call(u,e),Mt=u=>Array.isArray(u),ou=u=>typeof u=="function"?[u,!1]:Mt(u)?[u[0],!0]:ou(u.type),Nt=(u,e)=>u===Boolean?e!=="false":e,It=(u,e)=>typeof e=="boolean"?e:u===Number&&e===""?Number.NaN:u(e),_t=/[\s.:=]/,Wt=u=>{const e=`Flag name ${ne(u)}`;if(u.length===0)throw new Error(`${e} cannot be empty`);if(u.length===1)throw new Error(`${e} must be longer than a character`);const t=u.match(_t);if(t)throw new Error(`${e} cannot contain ${ne(t?.[0])}`)},Gt=u=>{const e={},t=(D,n)=>{if(ie(e,D))throw new Error(`Duplicate flags named ${ne(D)}`);e[D]=n};for(const D in u){if(!ie(u,D))continue;Wt(D);const n=u[D],i=[[],...ou(n),n];t(D,i);const s=Pt(D);if(D!==s&&t(s,i),"alias"in n&&typeof n.alias=="string"){const{alias:o}=n,a=`Flag alias ${ne(o)} for flag ${ne(D)}`;if(o.length===0)throw new Error(`${a} cannot be empty`);if(o.length>1)throw new Error(`${a} must be a single character`);t(o,i)}}return e},qt=(u,e)=>{const t={};for(const D in u){if(!ie(u,D))continue;const[n,,i,s]=e[D];if(n.length===0&&"default"in s){let{default:o}=s;typeof o=="function"&&(o=o()),t[D]=o}else t[D]=i?n:n.pop()}return t},ge="--",zt=/[.:=]/,Jt=/^-{1,2}\w/,Vt=u=>{if(!Jt.test(u))return;const e=!u.startsWith(ge);let t=u.slice(e?1:2),D;const n=t.match(zt);if(n){const{index:i}=n;D=t.slice(i+1),t=t.slice(0,i)}return[t,D,e]},Ut=(u,{onFlag:e,onArgument:t})=>{let D;const n=(i,s)=>{if(typeof D!="function")return!0;D(i,s),D=void 0};for(let i=0;i<u.length;i+=1){const s=u[i];if(s===ge){n();const a=u.slice(i+1);t?.(a,[i],!0);break}const o=Vt(s);if(o){if(n(),!e)continue;const[a,h,f]=o;if(f)for(let g=0;g<a.length;g+=1){n();const F=g===a.length-1;D=e(a[g],F?h:void 0,[i,g+1,F])}else D=e(a,h,[i])}else n(s,[i])&&t?.([s],[i])}n()},Zt=(u,e)=>{for(const[t,D,n]of e.reverse()){if(D){const i=u[t];let s=i.slice(0,D);if(n||(s+=i.slice(D+1)),s!=="-"){u[t]=s;continue}}u.splice(t,1)}},Ht=(u,e=process.argv.slice(2),{ignore:t}={})=>{const D=[],n=Gt(u),i={},s=[];return s[ge]=[],Ut(e,{onFlag(o,a,h){const f=ie(n,o);if(!t?.(f?jt:xt,o,a)){if(f){const[g,F]=n[o],d=Nt(F,a),m=(w,S)=>{D.push(h),S&&D.push(S),g.push(It(F,w||""))};return d===void 0?m:m(d)}ie(i,o)||(i[o]=[]),i[o].push(a===void 0?!0:a),D.push(h)}},onArgument(o,a,h){t?.(Tt,e[a[0]])||(s.push(...o),h?(s[ge]=o,e.splice(a[0])):D.push(a))}}),Zt(e,D),{flags:qt(u,n),unknownFlags:i,_:s}};var Xt=Object.create,me=Object.defineProperty,Yt=Object.defineProperties,Kt=Object.getOwnPropertyDescriptor,Qt=Object.getOwnPropertyDescriptors,eD=Object.getOwnPropertyNames,au=Object.getOwnPropertySymbols,uD=Object.getPrototypeOf,lu=Object.prototype.hasOwnProperty,tD=Object.prototype.propertyIsEnumerable,cu=(u,e,t)=>e in u?me(u,e,{enumerable:!0,configurable:!0,writable:!0,value:t}):u[e]=t,Be=(u,e)=>{for(var t in e||(e={}))lu.call(e,t)&&cu(u,t,e[t]);if(au)for(var t of au(e))tD.call(e,t)&&cu(u,t,e[t]);return u},Re=(u,e)=>Yt(u,Qt(e)),DD=u=>me(u,"__esModule",{value:!0}),nD=(u,e)=>()=>(u&&(e=u(u=0)),e),iD=(u,e)=>()=>(e||u((e={exports:{}}).exports,e),e.exports),sD=(u,e,t,D)=>{if(e&&typeof e=="object"||typeof e=="function")for(let n of eD(e))!lu.call(u,n)&&n!=="default"&&me(u,n,{get:()=>e[n],enumerable:!(D=Kt(e,n))||D.enumerable});return u},rD=(u,e)=>sD(DD(me(u!=null?Xt(uD(u)):{},"default",{value:u,enumerable:!0})),u),x=nD(()=>{}),oD=iD((u,e)=>{x(),e.exports=function(){return/\uD83C\uDFF4\uDB40\uDC67\uDB40\uDC62(?:\uDB40\uDC77\uDB40\uDC6C\uDB40\uDC73|\uDB40\uDC73\uDB40\uDC63\uDB40\uDC74|\uDB40\uDC65\uDB40\uDC6E\uDB40\uDC67)\uDB40\uDC7F|(?:\uD83E\uDDD1\uD83C\uDFFF\u200D\u2764\uFE0F\u200D(?:\uD83D\uDC8B\u200D)?\uD83E\uDDD1|\uD83D\uDC69\uD83C\uDFFF\u200D\uD83E\uDD1D\u200D(?:\uD83D[\uDC68\uDC69]))(?:\uD83C[\uDFFB-\uDFFE])|(?:\uD83E\uDDD1\uD83C\uDFFE\u200D\u2764\uFE0F\u200D(?:\uD83D\uDC8B\u200D)?\uD83E\uDDD1|\uD83D\uDC69\uD83C\uDFFE\u200D\uD83E\uDD1D\u200D(?:\uD83D[\uDC68\uDC69]))(?:\uD83C[\uDFFB-\uDFFD\uDFFF])|(?:\uD83E\uDDD1\uD83C\uDFFD\u200D\u2764\uFE0F\u200D(?:\uD83D\uDC8B\u200D)?\uD83E\uDDD1|\uD83D\uDC69\uD83C\uDFFD\u200D\uD83E\uDD1D\u200D(?:\uD83D[\uDC68\uDC69]))(?:\uD83C[\uDFFB\uDFFC\uDFFE\uDFFF])|(?:\uD83E\uDDD1\uD83C\uDFFC\u200D\u2764\uFE0F\u200D(?:\uD83D\uDC8B\u200D)?\uD83E\uDDD1|\uD83D\uDC69\uD83C\uDFFC\u200D\uD83E\uDD1D\u200D(?:\uD83D[\uDC68\uDC69]))(?:\uD83C[\uDFFB\uDFFD-\uDFFF])|(?:\uD83E\uDDD1\uD83C\uDFFB\u200D\u2764\uFE0F\u200D(?:\uD83D\uDC8B\u200D)?\uD83E\uDDD1|\uD83D\uDC69\uD83C\uDFFB\u200D\uD83E\uDD1D\u200D(?:\uD83D[\uDC68\uDC69]))(?:\uD83C[\uDFFC-\uDFFF])|\uD83D\uDC68(?:\uD83C\uDFFB(?:\u200D(?:\u2764\uFE0F\u200D(?:\uD83D\uDC8B\u200D\uD83D\uDC68(?:\uD83C[\uDFFB-\uDFFF])|\uD83D\uDC68(?:\uD83C[\uDFFB-\uDFFF]))|\uD83E\uDD1D\u200D\uD83D\uDC68(?:\uD83C[\uDFFC-\uDFFF])|[\u2695\u2696\u2708]\uFE0F|\uD83C[\uDF3E\uDF73\uDF7C\uDF93\uDFA4\uDFA8\uDFEB\uDFED]|\uD83D[\uDCBB\uDCBC\uDD27\uDD2C\uDE80\uDE92]|\uD83E[\uDDAF-\uDDB3\uDDBC\uDDBD]))?|(?:\uD83C[\uDFFC-\uDFFF])\u200D\u2764\uFE0F\u200D(?:\uD83D\uDC8B\u200D\uD83D\uDC68(?:\uD83C[\uDFFB-\uDFFF])|\uD83D\uDC68(?:\uD83C[\uDFFB-\uDFFF]))|\u200D(?:\u2764\uFE0F\u200D(?:\uD83D\uDC8B\u200D)?\uD83D\uDC68|(?:\uD83D[\uDC68\uDC69])\u200D(?:\uD83D\uDC66\u200D\uD83D\uDC66|\uD83D\uDC67\u200D(?:\uD83D[\uDC66\uDC67]))|\uD83D\uDC66\u200D\uD83D\uDC66|\uD83D\uDC67\u200D(?:\uD83D[\uDC66\uDC67])|\uD83C[\uDF3E\uDF73\uDF7C\uDF93\uDFA4\uDFA8\uDFEB\uDFED]|\uD83D[\uDCBB\uDCBC\uDD27\uDD2C\uDE80\uDE92]|\uD83E[\uDDAF-\uDDB3\uDDBC\uDDBD])|\uD83C\uDFFF\u200D(?:\uD83E\uDD1D\u200D\uD83D\uDC68(?:\uD83C[\uDFFB-\uDFFE])|\uD83C[\uDF3E\uDF73\uDF7C\uDF93\uDFA4\uDFA8\uDFEB\uDFED]|\uD83D[\uDCBB\uDCBC\uDD27\uDD2C\uDE80\uDE92]|\uD83E[\uDDAF-\uDDB3\uDDBC\uDDBD])|\uD83C\uDFFE\u200D(?:\uD83E\uDD1D\u200D\uD83D\uDC68(?:\uD83C[\uDFFB-\uDFFD\uDFFF])|\uD83C[\uDF3E\uDF73\uDF7C\uDF93\uDFA4\uDFA8\uDFEB\uDFED]|\uD83D[\uDCBB\uDCBC\uDD27\uDD2C\uDE80\uDE92]|\uD83E[\uDDAF-\uDDB3\uDDBC\uDDBD])|\uD83C\uDFFD\u200D(?:\uD83E\uDD1D\u200D\uD83D\uDC68(?:\uD83C[\uDFFB\uDFFC\uDFFE\uDFFF])|\uD83C[\uDF3E\uDF73\uDF7C\uDF93\uDFA4\uDFA8\uDFEB\uDFED]|\uD83D[\uDCBB\uDCBC\uDD27\uDD2C\uDE80\uDE92]|\uD83E[\uDDAF-\uDDB3\uDDBC\uDDBD])|\uD83C\uDFFC\u200D(?:\uD83E\uDD1D\u200D\uD83D\uDC68(?:\uD83C[\uDFFB\uDFFD-\uDFFF])|\uD83C[\uDF3E\uDF73\uDF7C\uDF93\uDFA4\uDFA8\uDFEB\uDFED]|\uD83D[\uDCBB\uDCBC\uDD27\uDD2C\uDE80\uDE92]|\uD83E[\uDDAF-\uDDB3\uDDBC\uDDBD])|(?:\uD83C\uDFFF\u200D[\u2695\u2696\u2708]|\uD83C\uDFFE\u200D[\u2695\u2696\u2708]|\uD83C\uDFFD\u200D[\u2695\u2696\u2708]|\uD83C\uDFFC\u200D[\u2695\u2696\u2708]|\u200D[\u2695\u2696\u2708])\uFE0F|\u200D(?:(?:\uD83D[\uDC68\uDC69])\u200D(?:\uD83D[\uDC66\uDC67])|\uD83D[\uDC66\uDC67])|\uD83C\uDFFF|\uD83C\uDFFE|\uD83C\uDFFD|\uD83C\uDFFC)?|(?:\uD83D\uDC69(?:\uD83C\uDFFB\u200D\u2764\uFE0F\u200D(?:\uD83D\uDC8B\u200D(?:\uD83D[\uDC68\uDC69])|\uD83D[\uDC68\uDC69])|(?:\uD83C[\uDFFC-\uDFFF])\u200D\u2764\uFE0F\u200D(?:\uD83D\uDC8B\u200D(?:\uD83D[\uDC68\uDC69])|\uD83D[\uDC68\uDC69]))|\uD83E\uDDD1(?:\uD83C[\uDFFB-\uDFFF])\u200D\uD83E\uDD1D\u200D\uD83E\uDDD1)(?:\uD83C[\uDFFB-\uDFFF])|\uD83D\uDC69\u200D\uD83D\uDC69\u200D(?:\uD83D\uDC66\u200D\uD83D\uDC66|\uD83D\uDC67\u200D(?:\uD83D[\uDC66\uDC67]))|\uD83D\uDC69(?:\u200D(?:\u2764\uFE0F\u200D(?:\uD83D\uDC8B\u200D(?:\uD83D[\uDC68\uDC69])|\uD83D[\uDC68\uDC69])|\uD83C[\uDF3E\uDF73\uDF7C\uDF93\uDFA4\uDFA8\uDFEB\uDFED]|\uD83D[\uDCBB\uDCBC\uDD27\uDD2C\uDE80\uDE92]|\uD83E[\uDDAF-\uDDB3\uDDBC\uDDBD])|\uD83C\uDFFF\u200D(?:\uD83C[\uDF3E\uDF73\uDF7C\uDF93\uDFA4\uDFA8\uDFEB\uDFED]|\uD83D[\uDCBB\uDCBC\uDD27\uDD2C\uDE80\uDE92]|\uD83E[\uDDAF-\uDDB3\uDDBC\uDDBD])|\uD83C\uDFFE\u200D(?:\uD83C[\uDF3E\uDF73\uDF7C\uDF93\uDFA4\uDFA8\uDFEB\uDFED]|\uD83D[\uDCBB\uDCBC\uDD27\uDD2C\uDE80\uDE92]|\uD83E[\uDDAF-\uDDB3\uDDBC\uDDBD])|\uD83C\uDFFD\u200D(?:\uD83C[\uDF3E\uDF73\uDF7C\uDF93\uDFA4\uDFA8\uDFEB\uDFED]|\uD83D[\uDCBB\uDCBC\uDD27\uDD2C\uDE80\uDE92]|\uD83E[\uDDAF-\uDDB3\uDDBC\uDDBD])|\uD83C\uDFFC\u200D(?:\uD83C[\uDF3E\uDF73\uDF7C\uDF93\uDFA4\uDFA8\uDFEB\uDFED]|\uD83D[\uDCBB\uDCBC\uDD27\uDD2C\uDE80\uDE92]|\uD83E[\uDDAF-\uDDB3\uDDBC\uDDBD])|\uD83C\uDFFB\u200D(?:\uD83C[\uDF3E\uDF73\uDF7C\uDF93\uDFA4\uDFA8\uDFEB\uDFED]|\uD83D[\uDCBB\uDCBC\uDD27\uDD2C\uDE80\uDE92]|\uD83E[\uDDAF-\uDDB3\uDDBC\uDDBD]))|\uD83E\uDDD1(?:\u200D(?:\uD83E\uDD1D\u200D\uD83E\uDDD1|\uD83C[\uDF3E\uDF73\uDF7C\uDF84\uDF93\uDFA4\uDFA8\uDFEB\uDFED]|\uD83D[\uDCBB\uDCBC\uDD27\uDD2C\uDE80\uDE92]|\uD83E[\uDDAF-\uDDB3\uDDBC\uDDBD])|\uD83C\uDFFF\u200D(?:\uD83C[\uDF3E\uDF73\uDF7C\uDF84\uDF93\uDFA4\uDFA8\uDFEB\uDFED]|\uD83D[\uDCBB\uDCBC\uDD27\uDD2C\uDE80\uDE92]|\uD83E[\uDDAF-\uDDB3\uDDBC\uDDBD])|\uD83C\uDFFE\u200D(?:\uD83C[\uDF3E\uDF73\uDF7C\uDF84\uDF93\uDFA4\uDFA8\uDFEB\uDFED]|\uD83D[\uDCBB\uDCBC\uDD27\uDD2C\uDE80\uDE92]|\uD83E[\uDDAF-\uDDB3\uDDBC\uDDBD])|\uD83C\uDFFD\u200D(?:\uD83C[\uDF3E\uDF73\uDF7C\uDF84\uDF93\uDFA4\uDFA8\uDFEB\uDFED]|\uD83D[\uDCBB\uDCBC\uDD27\uDD2C\uDE80\uDE92]|\uD83E[\uDDAF-\uDDB3\uDDBC\uDDBD])|\uD83C\uDFFC\u200D(?:\uD83C[\uDF3E\uDF73\uDF7C\uDF84\uDF93\uDFA4\uDFA8\uDFEB\uDFED]|\uD83D[\uDCBB\uDCBC\uDD27\uDD2C\uDE80\uDE92]|\uD83E[\uDDAF-\uDDB3\uDDBC\uDDBD])|\uD83C\uDFFB\u200D(?:\uD83C[\uDF3E\uDF73\uDF7C\uDF84\uDF93\uDFA4\uDFA8\uDFEB\uDFED]|\uD83D[\uDCBB\uDCBC\uDD27\uDD2C\uDE80\uDE92]|\uD83E[\uDDAF-\uDDB3\uDDBC\uDDBD]))|\uD83D\uDC69\u200D\uD83D\uDC66\u200D\uD83D\uDC66|\uD83D\uDC69\u200D\uD83D\uDC69\u200D(?:\uD83D[\uDC66\uDC67])|\uD83D\uDC69\u200D\uD83D\uDC67\u200D(?:\uD83D[\uDC66\uDC67])|(?:\uD83D\uDC41\uFE0F\u200D\uD83D\uDDE8|\uD83E\uDDD1(?:\uD83C\uDFFF\u200D[\u2695\u2696\u2708]|\uD83C\uDFFE\u200D[\u2695\u2696\u2708]|\uD83C\uDFFD\u200D[\u2695\u2696\u2708]|\uD83C\uDFFC\u200D[\u2695\u2696\u2708]|\uD83C\uDFFB\u200D[\u2695\u2696\u2708]|\u200D[\u2695\u2696\u2708])|\uD83D\uDC69(?:\uD83C\uDFFF\u200D[\u2695\u2696\u2708]|\uD83C\uDFFE\u200D[\u2695\u2696\u2708]|\uD83C\uDFFD\u200D[\u2695\u2696\u2708]|\uD83C\uDFFC\u200D[\u2695\u2696\u2708]|\uD83C\uDFFB\u200D[\u2695\u2696\u2708]|\u200D[\u2695\u2696\u2708])|\uD83D\uDE36\u200D\uD83C\uDF2B|\uD83C\uDFF3\uFE0F\u200D\u26A7|\uD83D\uDC3B\u200D\u2744|(?:(?:\uD83C[\uDFC3\uDFC4\uDFCA]|\uD83D[\uDC6E\uDC70\uDC71\uDC73\uDC77\uDC81\uDC82\uDC86\uDC87\uDE45-\uDE47\uDE4B\uDE4D\uDE4E\uDEA3\uDEB4-\uDEB6]|\uD83E[\uDD26\uDD35\uDD37-\uDD39\uDD3D\uDD3E\uDDB8\uDDB9\uDDCD-\uDDCF\uDDD4\uDDD6-\uDDDD])(?:\uD83C[\uDFFB-\uDFFF])|\uD83D\uDC6F|\uD83E[\uDD3C\uDDDE\uDDDF])\u200D[\u2640\u2642]|(?:\u26F9|\uD83C[\uDFCB\uDFCC]|\uD83D\uDD75)(?:\uFE0F|\uD83C[\uDFFB-\uDFFF])\u200D[\u2640\u2642]|\uD83C\uDFF4\u200D\u2620|(?:\uD83C[\uDFC3\uDFC4\uDFCA]|\uD83D[\uDC6E\uDC70\uDC71\uDC73\uDC77\uDC81\uDC82\uDC86\uDC87\uDE45-\uDE47\uDE4B\uDE4D\uDE4E\uDEA3\uDEB4-\uDEB6]|\uD83E[\uDD26\uDD35\uDD37-\uDD39\uDD3D\uDD3E\uDDB8\uDDB9\uDDCD-\uDDCF\uDDD4\uDDD6-\uDDDD])\u200D[\u2640\u2642]|[\xA9\xAE\u203C\u2049\u2122\u2139\u2194-\u2199\u21A9\u21AA\u2328\u23CF\u23ED-\u23EF\u23F1\u23F2\u23F8-\u23FA\u24C2\u25AA\u25AB\u25B6\u25C0\u25FB\u25FC\u2600-\u2604\u260E\u2611\u2618\u2620\u2622\u2623\u2626\u262A\u262E\u262F\u2638-\u263A\u2640\u2642\u265F\u2660\u2663\u2665\u2666\u2668\u267B\u267E\u2692\u2694-\u2697\u2699\u269B\u269C\u26A0\u26A7\u26B0\u26B1\u26C8\u26CF\u26D1\u26D3\u26E9\u26F0\u26F1\u26F4\u26F7\u26F8\u2702\u2708\u2709\u270F\u2712\u2714\u2716\u271D\u2721\u2733\u2734\u2744\u2747\u2763\u27A1\u2934\u2935\u2B05-\u2B07\u3030\u303D\u3297\u3299]|\uD83C[\uDD70\uDD71\uDD7E\uDD7F\uDE02\uDE37\uDF21\uDF24-\uDF2C\uDF36\uDF7D\uDF96\uDF97\uDF99-\uDF9B\uDF9E\uDF9F\uDFCD\uDFCE\uDFD4-\uDFDF\uDFF5\uDFF7]|\uD83D[\uDC3F\uDCFD\uDD49\uDD4A\uDD6F\uDD70\uDD73\uDD76-\uDD79\uDD87\uDD8A-\uDD8D\uDDA5\uDDA8\uDDB1\uDDB2\uDDBC\uDDC2-\uDDC4\uDDD1-\uDDD3\uDDDC-\uDDDE\uDDE1\uDDE3\uDDE8\uDDEF\uDDF3\uDDFA\uDECB\uDECD-\uDECF\uDEE0-\uDEE5\uDEE9\uDEF0\uDEF3])\uFE0F|\uD83C\uDFF3\uFE0F\u200D\uD83C\uDF08|\uD83D\uDC69\u200D\uD83D\uDC67|\uD83D\uDC69\u200D\uD83D\uDC66|\uD83D\uDE35\u200D\uD83D\uDCAB|\uD83D\uDE2E\u200D\uD83D\uDCA8|\uD83D\uDC15\u200D\uD83E\uDDBA|\uD83E\uDDD1(?:\uD83C\uDFFF|\uD83C\uDFFE|\uD83C\uDFFD|\uD83C\uDFFC|\uD83C\uDFFB)?|\uD83D\uDC69(?:\uD83C\uDFFF|\uD83C\uDFFE|\uD83C\uDFFD|\uD83C\uDFFC|\uD83C\uDFFB)?|\uD83C\uDDFD\uD83C\uDDF0|\uD83C\uDDF6\uD83C\uDDE6|\uD83C\uDDF4\uD83C\uDDF2|\uD83D\uDC08\u200D\u2B1B|\u2764\uFE0F\u200D(?:\uD83D\uDD25|\uD83E\uDE79)|\uD83D\uDC41\uFE0F|\uD83C\uDFF3\uFE0F|\uD83C\uDDFF(?:\uD83C[\uDDE6\uDDF2\uDDFC])|\uD83C\uDDFE(?:\uD83C[\uDDEA\uDDF9])|\uD83C\uDDFC(?:\uD83C[\uDDEB\uDDF8])|\uD83C\uDDFB(?:\uD83C[\uDDE6\uDDE8\uDDEA\uDDEC\uDDEE\uDDF3\uDDFA])|\uD83C\uDDFA(?:\uD83C[\uDDE6\uDDEC\uDDF2\uDDF3\uDDF8\uDDFE\uDDFF])|\uD83C\uDDF9(?:\uD83C[\uDDE6\uDDE8\uDDE9\uDDEB-\uDDED\uDDEF-\uDDF4\uDDF7\uDDF9\uDDFB\uDDFC\uDDFF])|\uD83C\uDDF8(?:\uD83C[\uDDE6-\uDDEA\uDDEC-\uDDF4\uDDF7-\uDDF9\uDDFB\uDDFD-\uDDFF])|\uD83C\uDDF7(?:\uD83C[\uDDEA\uDDF4\uDDF8\uDDFA\uDDFC])|\uD83C\uDDF5(?:\uD83C[\uDDE6\uDDEA-\uDDED\uDDF0-\uDDF3\uDDF7-\uDDF9\uDDFC\uDDFE])|\uD83C\uDDF3(?:\uD83C[\uDDE6\uDDE8\uDDEA-\uDDEC\uDDEE\uDDF1\uDDF4\uDDF5\uDDF7\uDDFA\uDDFF])|\uD83C\uDDF2(?:\uD83C[\uDDE6\uDDE8-\uDDED\uDDF0-\uDDFF])|\uD83C\uDDF1(?:\uD83C[\uDDE6-\uDDE8\uDDEE\uDDF0\uDDF7-\uDDFB\uDDFE])|\uD83C\uDDF0(?:\uD83C[\uDDEA\uDDEC-\uDDEE\uDDF2\uDDF3\uDDF5\uDDF7\uDDFC\uDDFE\uDDFF])|\uD83C\uDDEF(?:\uD83C[\uDDEA\uDDF2\uDDF4\uDDF5])|\uD83C\uDDEE(?:\uD83C[\uDDE8-\uDDEA\uDDF1-\uDDF4\uDDF6-\uDDF9])|\uD83C\uDDED(?:\uD83C[\uDDF0\uDDF2\uDDF3\uDDF7\uDDF9\uDDFA])|\uD83C\uDDEC(?:\uD83C[\uDDE6\uDDE7\uDDE9-\uDDEE\uDDF1-\uDDF3\uDDF5-\uDDFA\uDDFC\uDDFE])|\uD83C\uDDEB(?:\uD83C[\uDDEE-\uDDF0\uDDF2\uDDF4\uDDF7])|\uD83C\uDDEA(?:\uD83C[\uDDE6\uDDE8\uDDEA\uDDEC\uDDED\uDDF7-\uDDFA])|\uD83C\uDDE9(?:\uD83C[\uDDEA\uDDEC\uDDEF\uDDF0\uDDF2\uDDF4\uDDFF])|\uD83C\uDDE8(?:\uD83C[\uDDE6\uDDE8\uDDE9\uDDEB-\uDDEE\uDDF0-\uDDF5\uDDF7\uDDFA-\uDDFF])|\uD83C\uDDE7(?:\uD83C[\uDDE6\uDDE7\uDDE9-\uDDEF\uDDF1-\uDDF4\uDDF6-\uDDF9\uDDFB\uDDFC\uDDFE\uDDFF])|\uD83C\uDDE6(?:\uD83C[\uDDE8-\uDDEC\uDDEE\uDDF1\uDDF2\uDDF4\uDDF6-\uDDFA\uDDFC\uDDFD\uDDFF])|[#\*0-9]\uFE0F\u20E3|\u2764\uFE0F|(?:\uD83C[\uDFC3\uDFC4\uDFCA]|\uD83D[\uDC6E\uDC70\uDC71\uDC73\uDC77\uDC81\uDC82\uDC86\uDC87\uDE45-\uDE47\uDE4B\uDE4D\uDE4E\uDEA3\uDEB4-\uDEB6]|\uD83E[\uDD26\uDD35\uDD37-\uDD39\uDD3D\uDD3E\uDDB8\uDDB9\uDDCD-\uDDCF\uDDD4\uDDD6-\uDDDD])(?:\uD83C[\uDFFB-\uDFFF])|(?:\u26F9|\uD83C[\uDFCB\uDFCC]|\uD83D\uDD75)(?:\uFE0F|\uD83C[\uDFFB-\uDFFF])|\uD83C\uDFF4|(?:[\u270A\u270B]|\uD83C[\uDF85\uDFC2\uDFC7]|\uD83D[\uDC42\uDC43\uDC46-\uDC50\uDC66\uDC67\uDC6B-\uDC6D\uDC72\uDC74-\uDC76\uDC78\uDC7C\uDC83\uDC85\uDC8F\uDC91\uDCAA\uDD7A\uDD95\uDD96\uDE4C\uDE4F\uDEC0\uDECC]|\uD83E[\uDD0C\uDD0F\uDD18-\uDD1C\uDD1E\uDD1F\uDD30-\uDD34\uDD36\uDD77\uDDB5\uDDB6\uDDBB\uDDD2\uDDD3\uDDD5])(?:\uD83C[\uDFFB-\uDFFF])|(?:[\u261D\u270C\u270D]|\uD83D[\uDD74\uDD90])(?:\uFE0F|\uD83C[\uDFFB-\uDFFF])|[\u270A\u270B]|\uD83C[\uDF85\uDFC2\uDFC7]|\uD83D[\uDC08\uDC15\uDC3B\uDC42\uDC43\uDC46-\uDC50\uDC66\uDC67\uDC6B-\uDC6D\uDC72\uDC74-\uDC76\uDC78\uDC7C\uDC83\uDC85\uDC8F\uDC91\uDCAA\uDD7A\uDD95\uDD96\uDE2E\uDE35\uDE36\uDE4C\uDE4F\uDEC0\uDECC]|\uD83E[\uDD0C\uDD0F\uDD18-\uDD1C\uDD1E\uDD1F\uDD30-\uDD34\uDD36\uDD77\uDDB5\uDDB6\uDDBB\uDDD2\uDDD3\uDDD5]|\uD83C[\uDFC3\uDFC4\uDFCA]|\uD83D[\uDC6E\uDC70\uDC71\uDC73\uDC77\uDC81\uDC82\uDC86\uDC87\uDE45-\uDE47\uDE4B\uDE4D\uDE4E\uDEA3\uDEB4-\uDEB6]|\uD83E[\uDD26\uDD35\uDD37-\uDD39\uDD3D\uDD3E\uDDB8\uDDB9\uDDCD-\uDDCF\uDDD4\uDDD6-\uDDDD]|\uD83D\uDC6F|\uD83E[\uDD3C\uDDDE\uDDDF]|[\u231A\u231B\u23E9-\u23EC\u23F0\u23F3\u25FD\u25FE\u2614\u2615\u2648-\u2653\u267F\u2693\u26A1\u26AA\u26AB\u26BD\u26BE\u26C4\u26C5\u26CE\u26D4\u26EA\u26F2\u26F3\u26F5\u26FA\u26FD\u2705\u2728\u274C\u274E\u2753-\u2755\u2757\u2795-\u2797\u27B0\u27BF\u2B1B\u2B1C\u2B50\u2B55]|\uD83C[\uDC04\uDCCF\uDD8E\uDD91-\uDD9A\uDE01\uDE1A\uDE2F\uDE32-\uDE36\uDE38-\uDE3A\uDE50\uDE51\uDF00-\uDF20\uDF2D-\uDF35\uDF37-\uDF7C\uDF7E-\uDF84\uDF86-\uDF93\uDFA0-\uDFC1\uDFC5\uDFC6\uDFC8\uDFC9\uDFCF-\uDFD3\uDFE0-\uDFF0\uDFF8-\uDFFF]|\uD83D[\uDC00-\uDC07\uDC09-\uDC14\uDC16-\uDC3A\uDC3C-\uDC3E\uDC40\uDC44\uDC45\uDC51-\uDC65\uDC6A\uDC79-\uDC7B\uDC7D-\uDC80\uDC84\uDC88-\uDC8E\uDC90\uDC92-\uDCA9\uDCAB-\uDCFC\uDCFF-\uDD3D\uDD4B-\uDD4E\uDD50-\uDD67\uDDA4\uDDFB-\uDE2D\uDE2F-\uDE34\uDE37-\uDE44\uDE48-\uDE4A\uDE80-\uDEA2\uDEA4-\uDEB3\uDEB7-\uDEBF\uDEC1-\uDEC5\uDED0-\uDED2\uDED5-\uDED7\uDEEB\uDEEC\uDEF4-\uDEFC\uDFE0-\uDFEB]|\uD83E[\uDD0D\uDD0E\uDD10-\uDD17\uDD1D\uDD20-\uDD25\uDD27-\uDD2F\uDD3A\uDD3F-\uDD45\uDD47-\uDD76\uDD78\uDD7A-\uDDB4\uDDB7\uDDBA\uDDBC-\uDDCB\uDDD0\uDDE0-\uDDFF\uDE70-\uDE74\uDE78-\uDE7A\uDE80-\uDE86\uDE90-\uDEA8\uDEB0-\uDEB6\uDEC0-\uDEC2\uDED0-\uDED6]|(?:[\u231A\u231B\u23E9-\u23EC\u23F0\u23F3\u25FD\u25FE\u2614\u2615\u2648-\u2653\u267F\u2693\u26A1\u26AA\u26AB\u26BD\u26BE\u26C4\u26C5\u26CE\u26D4\u26EA\u26F2\u26F3\u26F5\u26FA\u26FD\u2705\u270A\u270B\u2728\u274C\u274E\u2753-\u2755\u2757\u2795-\u2797\u27B0\u27BF\u2B1B\u2B1C\u2B50\u2B55]|\uD83C[\uDC04\uDCCF\uDD8E\uDD91-\uDD9A\uDDE6-\uDDFF\uDE01\uDE1A\uDE2F\uDE32-\uDE36\uDE38-\uDE3A\uDE50\uDE51\uDF00-\uDF20\uDF2D-\uDF35\uDF37-\uDF7C\uDF7E-\uDF93\uDFA0-\uDFCA\uDFCF-\uDFD3\uDFE0-\uDFF0\uDFF4\uDFF8-\uDFFF]|\uD83D[\uDC00-\uDC3E\uDC40\uDC42-\uDCFC\uDCFF-\uDD3D\uDD4B-\uDD4E\uDD50-\uDD67\uDD7A\uDD95\uDD96\uDDA4\uDDFB-\uDE4F\uDE80-\uDEC5\uDECC\uDED0-\uDED2\uDED5-\uDED7\uDEEB\uDEEC\uDEF4-\uDEFC\uDFE0-\uDFEB]|\uD83E[\uDD0C-\uDD3A\uDD3C-\uDD45\uDD47-\uDD78\uDD7A-\uDDCB\uDDCD-\uDDFF\uDE70-\uDE74\uDE78-\uDE7A\uDE80-\uDE86\uDE90-\uDEA8\uDEB0-\uDEB6\uDEC0-\uDEC2\uDED0-\uDED6])|(?:[#\*0-9\xA9\xAE\u203C\u2049\u2122\u2139\u2194-\u2199\u21A9\u21AA\u231A\u231B\u2328\u23CF\u23E9-\u23F3\u23F8-\u23FA\u24C2\u25AA\u25AB\u25B6\u25C0\u25FB-\u25FE\u2600-\u2604\u260E\u2611\u2614\u2615\u2618\u261D\u2620\u2622\u2623\u2626\u262A\u262E\u262F\u2638-\u263A\u2640\u2642\u2648-\u2653\u265F\u2660\u2663\u2665\u2666\u2668\u267B\u267E\u267F\u2692-\u2697\u2699\u269B\u269C\u26A0\u26A1\u26A7\u26AA\u26AB\u26B0\u26B1\u26BD\u26BE\u26C4\u26C5\u26C8\u26CE\u26CF\u26D1\u26D3\u26D4\u26E9\u26EA\u26F0-\u26F5\u26F7-\u26FA\u26FD\u2702\u2705\u2708-\u270D\u270F\u2712\u2714\u2716\u271D\u2721\u2728\u2733\u2734\u2744\u2747\u274C\u274E\u2753-\u2755\u2757\u2763\u2764\u2795-\u2797\u27A1\u27B0\u27BF\u2934\u2935\u2B05-\u2B07\u2B1B\u2B1C\u2B50\u2B55\u3030\u303D\u3297\u3299]|\uD83C[\uDC04\uDCCF\uDD70\uDD71\uDD7E\uDD7F\uDD8E\uDD91-\uDD9A\uDDE6-\uDDFF\uDE01\uDE02\uDE1A\uDE2F\uDE32-\uDE3A\uDE50\uDE51\uDF00-\uDF21\uDF24-\uDF93\uDF96\uDF97\uDF99-\uDF9B\uDF9E-\uDFF0\uDFF3-\uDFF5\uDFF7-\uDFFF]|\uD83D[\uDC00-\uDCFD\uDCFF-\uDD3D\uDD49-\uDD4E\uDD50-\uDD67\uDD6F\uDD70\uDD73-\uDD7A\uDD87\uDD8A-\uDD8D\uDD90\uDD95\uDD96\uDDA4\uDDA5\uDDA8\uDDB1\uDDB2\uDDBC\uDDC2-\uDDC4\uDDD1-\uDDD3\uDDDC-\uDDDE\uDDE1\uDDE3\uDDE8\uDDEF\uDDF3\uDDFA-\uDE4F\uDE80-\uDEC5\uDECB-\uDED2\uDED5-\uDED7\uDEE0-\uDEE5\uDEE9\uDEEB\uDEEC\uDEF0\uDEF3-\uDEFC\uDFE0-\uDFEB]|\uD83E[\uDD0C-\uDD3A\uDD3C-\uDD45\uDD47-\uDD78\uDD7A-\uDDCB\uDDCD-\uDDFF\uDE70-\uDE74\uDE78-\uDE7A\uDE80-\uDE86\uDE90-\uDEA8\uDEB0-\uDEB6\uDEC0-\uDEC2\uDED0-\uDED6])\uFE0F|(?:[\u261D\u26F9\u270A-\u270D]|\uD83C[\uDF85\uDFC2-\uDFC4\uDFC7\uDFCA-\uDFCC]|\uD83D[\uDC42\uDC43\uDC46-\uDC50\uDC66-\uDC78\uDC7C\uDC81-\uDC83\uDC85-\uDC87\uDC8F\uDC91\uDCAA\uDD74\uDD75\uDD7A\uDD90\uDD95\uDD96\uDE45-\uDE47\uDE4B-\uDE4F\uDEA3\uDEB4-\uDEB6\uDEC0\uDECC]|\uD83E[\uDD0C\uDD0F\uDD18-\uDD1F\uDD26\uDD30-\uDD39\uDD3C-\uDD3E\uDD77\uDDB5\uDDB6\uDDB8\uDDB9\uDDBB\uDDCD-\uDDCF\uDDD1-\uDDDD])/g}});x(),x(),x();var aD=u=>{var e,t,D;let n=(e=process.stdout.columns)!=null?e:Number.POSITIVE_INFINITY;return typeof u=="function"&&(u=u(n)),u||(u={}),Array.isArray(u)?{columns:u,stdoutColumns:n}:{columns:(t=u.columns)!=null?t:[],stdoutColumns:(D=u.stdoutColumns)!=null?D:n}};x(),x(),x(),x(),x();function lD({onlyFirst:u=!1}={}){let e=["[\\u001B\\u009B][[\\]()#;?]*(?:(?:(?:(?:;[-a-zA-Z\\d\\/#&.:=?%@~_]+)*|[a-zA-Z\\d]+(?:;[-a-zA-Z\\d\\/#&.:=?%@~_]*)*)?\\u0007)","(?:(?:\\d{1,4}(?:;\\d{0,4})*)?[\\dA-PR-TZcf-ntqry=><~]))"].join("|");return new RegExp(e,u?void 0:"g")}function hu(u){if(typeof u!="string")throw new TypeError(`Expected a \`string\`, got \`${typeof u}\``);return u.replace(lD(),"")}x();function cD(u){return Number.isInteger(u)?u>=4352&&(u<=4447||u===9001||u===9002||11904<=u&&u<=12871&&u!==12351||12880<=u&&u<=19903||19968<=u&&u<=42182||43360<=u&&u<=43388||44032<=u&&u<=55203||63744<=u&&u<=64255||65040<=u&&u<=65049||65072<=u&&u<=65131||65281<=u&&u<=65376||65504<=u&&u<=65510||110592<=u&&u<=110593||127488<=u&&u<=127569||131072<=u&&u<=262141):!1}var hD=rD(oD());function V(u){if(typeof u!="string"||u.length===0||(u=hu(u),u.length===0))return 0;u=u.replace((0,hD.default)(),"  ");let e=0;for(let t=0;t<u.length;t++){let D=u.codePointAt(t);D<=31||D>=127&&D<=159||D>=768&&D<=879||(D>65535&&t++,e+=cD(D)?2:1)}return e}var pu=u=>Math.max(...u.split(`
+-`).map(V)),pD=u=>{let e=[];for(let t of u){let{length:D}=t,n=D-e.length;for(let i=0;i<n;i+=1)e.push(0);for(let i=0;i<D;i+=1){let s=pu(t[i]);s>e[i]&&(e[i]=s)}}return e};x();var fu=/^\d+%$/,Fu={width:"auto",align:"left",contentWidth:0,paddingLeft:0,paddingRight:0,paddingTop:0,paddingBottom:0,horizontalPadding:0,paddingLeftString:"",paddingRightString:""},fD=(u,e)=>{var t;let D=[];for(let n=0;n<u.length;n+=1){let i=(t=e[n])!=null?t:"auto";if(typeof i=="number"||i==="auto"||i==="content-width"||typeof i=="string"&&fu.test(i)){D.push(Re(Be({},Fu),{width:i,contentWidth:u[n]}));continue}if(i&&typeof i=="object"){let s=Re(Be(Be({},Fu),i),{contentWidth:u[n]});s.horizontalPadding=s.paddingLeft+s.paddingRight,D.push(s);continue}throw new Error(`Invalid column width: ${JSON.stringify(i)}`)}return D};function FD(u,e){for(let t of u){let{width:D}=t;if(D==="content-width"&&(t.width=t.contentWidth),D==="auto"){let a=Math.min(20,t.contentWidth);t.width=a,t.autoOverflow=t.contentWidth-a}if(typeof D=="string"&&fu.test(D)){let a=Number.parseFloat(D.slice(0,-1))/100;t.width=Math.floor(e*a)-(t.paddingLeft+t.paddingRight)}let{horizontalPadding:n}=t,i=1,s=i+n;if(s>=e){let a=s-e,h=Math.ceil(t.paddingLeft/n*a),f=a-h;t.paddingLeft-=h,t.paddingRight-=f,t.horizontalPadding=t.paddingLeft+t.paddingRight}t.paddingLeftString=t.paddingLeft?" ".repeat(t.paddingLeft):"",t.paddingRightString=t.paddingRight?" ".repeat(t.paddingRight):"";let o=e-t.horizontalPadding;t.width=Math.max(Math.min(t.width,o),i)}}var du=()=>Object.assign([],{columns:0});function dD(u,e){let t=[du()],[D]=t;for(let n of u){let i=n.width+n.horizontalPadding;D.columns+i>e&&(D=du(),t.push(D)),D.push(n),D.columns+=i}for(let n of t){let i=n.reduce((F,d)=>F+d.width+d.horizontalPadding,0),s=e-i;if(s===0)continue;let o=n.filter(F=>"autoOverflow"in F),a=o.filter(F=>F.autoOverflow>0),h=a.reduce((F,d)=>F+d.autoOverflow,0),f=Math.min(h,s);for(let F of a){let d=Math.floor(F.autoOverflow/h*f);F.width+=d,s-=d}let g=Math.floor(s/o.length);for(let F=0;F<o.length;F+=1){let d=o[F];F===o.length-1?d.width+=s:d.width+=g,s-=g}}return t}function CD(u,e,t){let D=fD(t,e);return FD(D,u),dD(D,u)}x(),x(),x();var Pe=10,Cu=(u=0)=>e=>`\x1B[${e+u}m`,Eu=(u=0)=>e=>`\x1B[${38+u};5;${e}m`,gu=(u=0)=>(e,t,D)=>`\x1B[${38+u};2;${e};${t};${D}m`;function ED(){let u=new Map,e={modifier:{reset:[0,0],bold:[1,22],dim:[2,22],italic:[3,23],underline:[4,24],overline:[53,55],inverse:[7,27],hidden:[8,28],strikethrough:[9,29]},color:{black:[30,39],red:[31,39],green:[32,39],yellow:[33,39],blue:[34,39],magenta:[35,39],cyan:[36,39],white:[37,39],blackBright:[90,39],redBright:[91,39],greenBright:[92,39],yellowBright:[93,39],blueBright:[94,39],magentaBright:[95,39],cyanBright:[96,39],whiteBright:[97,39]},bgColor:{bgBlack:[40,49],bgRed:[41,49],bgGreen:[42,49],bgYellow:[43,49],bgBlue:[44,49],bgMagenta:[45,49],bgCyan:[46,49],bgWhite:[47,49],bgBlackBright:[100,49],bgRedBright:[101,49],bgGreenBright:[102,49],bgYellowBright:[103,49],bgBlueBright:[104,49],bgMagentaBright:[105,49],bgCyanBright:[106,49],bgWhiteBright:[107,49]}};e.color.gray=e.color.blackBright,e.bgColor.bgGray=e.bgColor.bgBlackBright,e.color.grey=e.color.blackBright,e.bgColor.bgGrey=e.bgColor.bgBlackBright;for(let[t,D]of Object.entries(e)){for(let[n,i]of Object.entries(D))e[n]={open:`\x1B[${i[0]}m`,close:`\x1B[${i[1]}m`},D[n]=e[n],u.set(i[0],i[1]);Object.defineProperty(e,t,{value:D,enumerable:!1})}return Object.defineProperty(e,"codes",{value:u,enumerable:!1}),e.color.close="\x1B[39m",e.bgColor.close="\x1B[49m",e.color.ansi=Cu(),e.color.ansi256=Eu(),e.color.ansi16m=gu(),e.bgColor.ansi=Cu(Pe),e.bgColor.ansi256=Eu(Pe),e.bgColor.ansi16m=gu(Pe),Object.defineProperties(e,{rgbToAnsi256:{value:(t,D,n)=>t===D&&D===n?t<8?16:t>248?231:Math.round((t-8)/247*24)+232:16+36*Math.round(t/255*5)+6*Math.round(D/255*5)+Math.round(n/255*5),enumerable:!1},hexToRgb:{value:t=>{let D=/(?<colorString>[a-f\d]{6}|[a-f\d]{3})/i.exec(t.toString(16));if(!D)return[0,0,0];let{colorString:n}=D.groups;n.length===3&&(n=n.split("").map(s=>s+s).join(""));let i=Number.parseInt(n,16);return[i>>16&255,i>>8&255,i&255]},enumerable:!1},hexToAnsi256:{value:t=>e.rgbToAnsi256(...e.hexToRgb(t)),enumerable:!1},ansi256ToAnsi:{value:t=>{if(t<8)return 30+t;if(t<16)return 90+(t-8);let D,n,i;if(t>=232)D=((t-232)*10+8)/255,n=D,i=D;else{t-=16;let a=t%36;D=Math.floor(t/36)/5,n=Math.floor(a/6)/5,i=a%6/5}let s=Math.max(D,n,i)*2;if(s===0)return 30;let o=30+(Math.round(i)<<2|Math.round(n)<<1|Math.round(D));return s===2&&(o+=60),o},enumerable:!1},rgbToAnsi:{value:(t,D,n)=>e.ansi256ToAnsi(e.rgbToAnsi256(t,D,n)),enumerable:!1},hexToAnsi:{value:t=>e.ansi256ToAnsi(e.hexToAnsi256(t)),enumerable:!1}}),e}var gD=ED(),mD=gD,we=new Set(["\x1B","\x9B"]),BD=39,Le="\x07",mu="[",wD="]",Bu="m",Me=`${wD}8;;`,wu=u=>`${we.values().next().value}${mu}${u}${Bu}`,yu=u=>`${we.values().next().value}${Me}${u}${Le}`,yD=u=>u.split(" ").map(e=>V(e)),Ne=(u,e,t)=>{let D=[...e],n=!1,i=!1,s=V(hu(u[u.length-1]));for(let[o,a]of D.entries()){let h=V(a);if(s+h<=t?u[u.length-1]+=a:(u.push(a),s=0),we.has(a)&&(n=!0,i=D.slice(o+1).join("").startsWith(Me)),n){i?a===Le&&(n=!1,i=!1):a===Bu&&(n=!1);continue}s+=h,s===t&&o<D.length-1&&(u.push(""),s=0)}!s&&u[u.length-1].length>0&&u.length>1&&(u[u.length-2]+=u.pop())},$D=u=>{let e=u.split(" "),t=e.length;for(;t>0&&!(V(e[t-1])>0);)t--;return t===e.length?u:e.slice(0,t).join(" ")+e.slice(t).join("")},AD=(u,e,t={})=>{if(t.trim!==!1&&u.trim()==="")return"";let D="",n,i,s=yD(u),o=[""];for(let[h,f]of u.split(" ").entries()){t.trim!==!1&&(o[o.length-1]=o[o.length-1].trimStart());let g=V(o[o.length-1]);if(h!==0&&(g>=e&&(t.wordWrap===!1||t.trim===!1)&&(o.push(""),g=0),(g>0||t.trim===!1)&&(o[o.length-1]+=" ",g++)),t.hard&&s[h]>e){let F=e-g,d=1+Math.floor((s[h]-F-1)/e);Math.floor((s[h]-1)/e)<d&&o.push(""),Ne(o,f,e);continue}if(g+s[h]>e&&g>0&&s[h]>0){if(t.wordWrap===!1&&g<e){Ne(o,f,e);continue}o.push("")}if(g+s[h]>e&&t.wordWrap===!1){Ne(o,f,e);continue}o[o.length-1]+=f}t.trim!==!1&&(o=o.map(h=>$D(h)));let a=[...o.join(`
+-`)];for(let[h,f]of a.entries()){if(D+=f,we.has(f)){let{groups:F}=new RegExp(`(?:\\${mu}(?<code>\\d+)m|\\${Me}(?<uri>.*)${Le})`).exec(a.slice(h).join(""))||{groups:{}};if(F.code!==void 0){let d=Number.parseFloat(F.code);n=d===BD?void 0:d}else F.uri!==void 0&&(i=F.uri.length===0?void 0:F.uri)}let g=mD.codes.get(Number(n));a[h+1]===`
+-`?(i&&(D+=yu("")),n&&g&&(D+=wu(g))):f===`
+-`&&(n&&g&&(D+=wu(n)),i&&(D+=yu(i)))}return D};function bD(u,e,t){return String(u).normalize().replace(/\r\n/g,`
++'use strict';
++
++var fs$1 = require('fs/promises');
++var N$1 = require('tty');
++var path$1 = require('path');
++var module$1 = require('module');
++var path$2 = require('node:path');
++var fs$2 = require('node:fs/promises');
++var require$$0 = require('fs');
++var require$$2 = require('events');
++
++var _documentCurrentScript = typeof document !== 'undefined' ? document.currentScript : null;
++const V$2="known-flag",k$2="unknown-flag",C$1="argument",{stringify:h}=JSON,O$1=/\B([A-Z])/g,v$1=t=>t.replace(O$1,"-$1").toLowerCase(),{hasOwnProperty:D$1}=Object.prototype,w$2=(t,n)=>D$1.call(t,n),L$2=t=>Array.isArray(t),b$2=t=>typeof t=="function"?[t,!1]:L$2(t)?[t[0],!0]:b$2(t.type),d$2=(t,n)=>t===Boolean?n!=="false":n,m$1=(t,n)=>typeof n=="boolean"?n:t===Number&&n===""?Number.NaN:t(n),R$2=/[\s.:=]/,B=t=>{const n=`Flag name ${h(t)}`;if(t.length===0)throw new Error(`${n} cannot be empty`);if(t.length===1)throw new Error(`${n} must be longer than a character`);const r=t.match(R$2);if(r)throw new Error(`${n} cannot contain ${h(r?.[0])}`)},K$1=t=>{const n={},r=(e,o)=>{if(w$2(n,e))throw new Error(`Duplicate flags named ${h(e)}`);n[e]=o;};for(const e in t){if(!w$2(t,e))continue;B(e);const o=t[e],s=[[],...b$2(o),o];r(e,s);const i=v$1(e);if(e!==i&&r(i,s),"alias"in o&&typeof o.alias=="string"){const{alias:a}=o,l=`Flag alias ${h(a)} for flag ${h(e)}`;if(a.length===0)throw new Error(`${l} cannot be empty`);if(a.length>1)throw new Error(`${l} must be a single character`);r(a,s);}}return n},_$2=(t,n)=>{const r={};for(const e in t){if(!w$2(t,e))continue;const[o,,s,i]=n[e];if(o.length===0&&"default"in i){let{default:a}=i;typeof a=="function"&&(a=a()),r[e]=a;}else r[e]=s?o:o.pop();}return r},F$1="--",G$2=/[.:=]/,T$2=/^-{1,2}\w/,N=t=>{if(!T$2.test(t))return;const n=!t.startsWith(F$1);let r=t.slice(n?1:2),e;const o=r.match(G$2);if(o){const{index:s}=o;e=r.slice(s+1),r=r.slice(0,s);}return [r,e,n]},$$1=(t,{onFlag:n,onArgument:r})=>{let e;const o=(s,i)=>{if(typeof e!="function")return !0;e(s,i),e=void 0;};for(let s=0;s<t.length;s+=1){const i=t[s];if(i===F$1){o();const l=t.slice(s+1);r?.(l,[s],!0);break}const a=N(i);if(a){if(o(),!n)continue;const[l,f,g]=a;if(g)for(let c=0;c<l.length;c+=1){o();const u=c===l.length-1;e=n(l[c],u?f:void 0,[s,c+1,u]);}else e=n(l,f,[s]);}else o(i,[s])&&r?.([i],[s]);}o();},E=(t,n)=>{for(const[r,e,o]of n.reverse()){if(e){const s=t[r];let i=s.slice(0,e);if(o||(i+=s.slice(e+1)),i!=="-"){t[r]=i;continue}}t.splice(r,1);}},U$2=(t,n=process.argv.slice(2),{ignore:r}={})=>{const e=[],o=K$1(t),s={},i=[];return i[F$1]=[],$$1(n,{onFlag(a,l,f){const g=w$2(o,a);if(!r?.(g?V$2:k$2,a,l)){if(g){const[c,u]=o[a],y=d$2(u,l),p=(P,A)=>{e.push(f),A&&e.push(A),c.push(m$1(u,P||""));};return y===void 0?p:p(y)}w$2(s,a)||(s[a]=[]),s[a].push(l===void 0?!0:l),e.push(f);}},onArgument(a,l,f){r?.(C$1,n[l[0]])||(i.push(...a),f?(i[F$1]=a,n.splice(l[0])):e.push(l));}}),E(n,e),{flags:_$2(t,o),unknownFlags:s,_:i}};
++
++var DD=Object.create;var m=Object.defineProperty,uD=Object.defineProperties,FD=Object.getOwnPropertyDescriptor,CD=Object.getOwnPropertyDescriptors,tD=Object.getOwnPropertyNames,I$1=Object.getOwnPropertySymbols,ED=Object.getPrototypeOf,L$1=Object.prototype.hasOwnProperty,eD=Object.prototype.propertyIsEnumerable;var W$1=(D,F,u)=>F in D?m(D,F,{enumerable:!0,configurable:!0,writable:!0,value:u}):D[F]=u,p=(D,F)=>{for(var u in F||(F={}))L$1.call(F,u)&&W$1(D,u,F[u]);if(I$1)for(var u of I$1(F))eD.call(F,u)&&W$1(D,u,F[u]);return D},c=(D,F)=>uD(D,CD(F)),nD=D=>m(D,"__esModule",{value:!0});var rD=(D,F)=>()=>(D&&(F=D(D=0)),F);var iD=(D,F)=>()=>(F||D((F={exports:{}}).exports,F),F.exports);var oD=(D,F,u,C)=>{if(F&&typeof F=="object"||typeof F=="function")for(let t of tD(F))!L$1.call(D,t)&&(t!=="default")&&m(D,t,{get:()=>F[t],enumerable:!(C=FD(F,t))||C.enumerable});return D},BD=(D,F)=>oD(nD(m(D!=null?DD(ED(D)):{},"default",{value:D,enumerable:!0})),D);var i=rD(()=>{});var $=iD((LD,N)=>{i();N.exports=function(){return /\uD83C\uDFF4\uDB40\uDC67\uDB40\uDC62(?:\uDB40\uDC77\uDB40\uDC6C\uDB40\uDC73|\uDB40\uDC73\uDB40\uDC63\uDB40\uDC74|\uDB40\uDC65\uDB40\uDC6E\uDB40\uDC67)\uDB40\uDC7F|(?:\uD83E\uDDD1\uD83C\uDFFF\u200D\u2764\uFE0F\u200D(?:\uD83D\uDC8B\u200D)?\uD83E\uDDD1|\uD83D\uDC69\uD83C\uDFFF\u200D\uD83E\uDD1D\u200D(?:\uD83D[\uDC68\uDC69]))(?:\uD83C[\uDFFB-\uDFFE])|(?:\uD83E\uDDD1\uD83C\uDFFE\u200D\u2764\uFE0F\u200D(?:\uD83D\uDC8B\u200D)?\uD83E\uDDD1|\uD83D\uDC69\uD83C\uDFFE\u200D\uD83E\uDD1D\u200D(?:\uD83D[\uDC68\uDC69]))(?:\uD83C[\uDFFB-\uDFFD\uDFFF])|(?:\uD83E\uDDD1\uD83C\uDFFD\u200D\u2764\uFE0F\u200D(?:\uD83D\uDC8B\u200D)?\uD83E\uDDD1|\uD83D\uDC69\uD83C\uDFFD\u200D\uD83E\uDD1D\u200D(?:\uD83D[\uDC68\uDC69]))(?:\uD83C[\uDFFB\uDFFC\uDFFE\uDFFF])|(?:\uD83E\uDDD1\uD83C\uDFFC\u200D\u2764\uFE0F\u200D(?:\uD83D\uDC8B\u200D)?\uD83E\uDDD1|\uD83D\uDC69\uD83C\uDFFC\u200D\uD83E\uDD1D\u200D(?:\uD83D[\uDC68\uDC69]))(?:\uD83C[\uDFFB\uDFFD-\uDFFF])|(?:\uD83E\uDDD1\uD83C\uDFFB\u200D\u2764\uFE0F\u200D(?:\uD83D\uDC8B\u200D)?\uD83E\uDDD1|\uD83D\uDC69\uD83C\uDFFB\u200D\uD83E\uDD1D\u200D(?:\uD83D[\uDC68\uDC69]))(?:\uD83C[\uDFFC-\uDFFF])|\uD83D\uDC68(?:\uD83C\uDFFB(?:\u200D(?:\u2764\uFE0F\u200D(?:\uD83D\uDC8B\u200D\uD83D\uDC68(?:\uD83C[\uDFFB-\uDFFF])|\uD83D\uDC68(?:\uD83C[\uDFFB-\uDFFF]))|\uD83E\uDD1D\u200D\uD83D\uDC68(?:\uD83C[\uDFFC-\uDFFF])|[\u2695\u2696\u2708]\uFE0F|\uD83C[\uDF3E\uDF73\uDF7C\uDF93\uDFA4\uDFA8\uDFEB\uDFED]|\uD83D[\uDCBB\uDCBC\uDD27\uDD2C\uDE80\uDE92]|\uD83E[\uDDAF-\uDDB3\uDDBC\uDDBD]))?|(?:\uD83C[\uDFFC-\uDFFF])\u200D\u2764\uFE0F\u200D(?:\uD83D\uDC8B\u200D\uD83D\uDC68(?:\uD83C[\uDFFB-\uDFFF])|\uD83D\uDC68(?:\uD83C[\uDFFB-\uDFFF]))|\u200D(?:\u2764\uFE0F\u200D(?:\uD83D\uDC8B\u200D)?\uD83D\uDC68|(?:\uD83D[\uDC68\uDC69])\u200D(?:\uD83D\uDC66\u200D\uD83D\uDC66|\uD83D\uDC67\u200D(?:\uD83D[\uDC66\uDC67]))|\uD83D\uDC66\u200D\uD83D\uDC66|\uD83D\uDC67\u200D(?:\uD83D[\uDC66\uDC67])|\uD83C[\uDF3E\uDF73\uDF7C\uDF93\uDFA4\uDFA8\uDFEB\uDFED]|\uD83D[\uDCBB\uDCBC\uDD27\uDD2C\uDE80\uDE92]|\uD83E[\uDDAF-\uDDB3\uDDBC\uDDBD])|\uD83C\uDFFF\u200D(?:\uD83E\uDD1D\u200D\uD83D\uDC68(?:\uD83C[\uDFFB-\uDFFE])|\uD83C[\uDF3E\uDF73\uDF7C\uDF93\uDFA4\uDFA8\uDFEB\uDFED]|\uD83D[\uDCBB\uDCBC\uDD27\uDD2C\uDE80\uDE92]|\uD83E[\uDDAF-\uDDB3\uDDBC\uDDBD])|\uD83C\uDFFE\u200D(?:\uD83E\uDD1D\u200D\uD83D\uDC68(?:\uD83C[\uDFFB-\uDFFD\uDFFF])|\uD83C[\uDF3E\uDF73\uDF7C\uDF93\uDFA4\uDFA8\uDFEB\uDFED]|\uD83D[\uDCBB\uDCBC\uDD27\uDD2C\uDE80\uDE92]|\uD83E[\uDDAF-\uDDB3\uDDBC\uDDBD])|\uD83C\uDFFD\u200D(?:\uD83E\uDD1D\u200D\uD83D\uDC68(?:\uD83C[\uDFFB\uDFFC\uDFFE\uDFFF])|\uD83C[\uDF3E\uDF73\uDF7C\uDF93\uDFA4\uDFA8\uDFEB\uDFED]|\uD83D[\uDCBB\uDCBC\uDD27\uDD2C\uDE80\uDE92]|\uD83E[\uDDAF-\uDDB3\uDDBC\uDDBD])|\uD83C\uDFFC\u200D(?:\uD83E\uDD1D\u200D\uD83D\uDC68(?:\uD83C[\uDFFB\uDFFD-\uDFFF])|\uD83C[\uDF3E\uDF73\uDF7C\uDF93\uDFA4\uDFA8\uDFEB\uDFED]|\uD83D[\uDCBB\uDCBC\uDD27\uDD2C\uDE80\uDE92]|\uD83E[\uDDAF-\uDDB3\uDDBC\uDDBD])|(?:\uD83C\uDFFF\u200D[\u2695\u2696\u2708]|\uD83C\uDFFE\u200D[\u2695\u2696\u2708]|\uD83C\uDFFD\u200D[\u2695\u2696\u2708]|\uD83C\uDFFC\u200D[\u2695\u2696\u2708]|\u200D[\u2695\u2696\u2708])\uFE0F|\u200D(?:(?:\uD83D[\uDC68\uDC69])\u200D(?:\uD83D[\uDC66\uDC67])|\uD83D[\uDC66\uDC67])|\uD83C\uDFFF|\uD83C\uDFFE|\uD83C\uDFFD|\uD83C\uDFFC)?|(?:\uD83D\uDC69(?:\uD83C\uDFFB\u200D\u2764\uFE0F\u200D(?:\uD83D\uDC8B\u200D(?:\uD83D[\uDC68\uDC69])|\uD83D[\uDC68\uDC69])|(?:\uD83C[\uDFFC-\uDFFF])\u200D\u2764\uFE0F\u200D(?:\uD83D\uDC8B\u200D(?:\uD83D[\uDC68\uDC69])|\uD83D[\uDC68\uDC69]))|\uD83E\uDDD1(?:\uD83C[\uDFFB-\uDFFF])\u200D\uD83E\uDD1D\u200D\uD83E\uDDD1)(?:\uD83C[\uDFFB-\uDFFF])|\uD83D\uDC69\u200D\uD83D\uDC69\u200D(?:\uD83D\uDC66\u200D\uD83D\uDC66|\uD83D\uDC67\u200D(?:\uD83D[\uDC66\uDC67]))|\uD83D\uDC69(?:\u200D(?:\u2764\uFE0F\u200D(?:\uD83D\uDC8B\u200D(?:\uD83D[\uDC68\uDC69])|\uD83D[\uDC68\uDC69])|\uD83C[\uDF3E\uDF73\uDF7C\uDF93\uDFA4\uDFA8\uDFEB\uDFED]|\uD83D[\uDCBB\uDCBC\uDD27\uDD2C\uDE80\uDE92]|\uD83E[\uDDAF-\uDDB3\uDDBC\uDDBD])|\uD83C\uDFFF\u200D(?:\uD83C[\uDF3E\uDF73\uDF7C\uDF93\uDFA4\uDFA8\uDFEB\uDFED]|\uD83D[\uDCBB\uDCBC\uDD27\uDD2C\uDE80\uDE92]|\uD83E[\uDDAF-\uDDB3\uDDBC\uDDBD])|\uD83C\uDFFE\u200D(?:\uD83C[\uDF3E\uDF73\uDF7C\uDF93\uDFA4\uDFA8\uDFEB\uDFED]|\uD83D[\uDCBB\uDCBC\uDD27\uDD2C\uDE80\uDE92]|\uD83E[\uDDAF-\uDDB3\uDDBC\uDDBD])|\uD83C\uDFFD\u200D(?:\uD83C[\uDF3E\uDF73\uDF7C\uDF93\uDFA4\uDFA8\uDFEB\uDFED]|\uD83D[\uDCBB\uDCBC\uDD27\uDD2C\uDE80\uDE92]|\uD83E[\uDDAF-\uDDB3\uDDBC\uDDBD])|\uD83C\uDFFC\u200D(?:\uD83C[\uDF3E\uDF73\uDF7C\uDF93\uDFA4\uDFA8\uDFEB\uDFED]|\uD83D[\uDCBB\uDCBC\uDD27\uDD2C\uDE80\uDE92]|\uD83E[\uDDAF-\uDDB3\uDDBC\uDDBD])|\uD83C\uDFFB\u200D(?:\uD83C[\uDF3E\uDF73\uDF7C\uDF93\uDFA4\uDFA8\uDFEB\uDFED]|\uD83D[\uDCBB\uDCBC\uDD27\uDD2C\uDE80\uDE92]|\uD83E[\uDDAF-\uDDB3\uDDBC\uDDBD]))|\uD83E\uDDD1(?:\u200D(?:\uD83E\uDD1D\u200D\uD83E\uDDD1|\uD83C[\uDF3E\uDF73\uDF7C\uDF84\uDF93\uDFA4\uDFA8\uDFEB\uDFED]|\uD83D[\uDCBB\uDCBC\uDD27\uDD2C\uDE80\uDE92]|\uD83E[\uDDAF-\uDDB3\uDDBC\uDDBD])|\uD83C\uDFFF\u200D(?:\uD83C[\uDF3E\uDF73\uDF7C\uDF84\uDF93\uDFA4\uDFA8\uDFEB\uDFED]|\uD83D[\uDCBB\uDCBC\uDD27\uDD2C\uDE80\uDE92]|\uD83E[\uDDAF-\uDDB3\uDDBC\uDDBD])|\uD83C\uDFFE\u200D(?:\uD83C[\uDF3E\uDF73\uDF7C\uDF84\uDF93\uDFA4\uDFA8\uDFEB\uDFED]|\uD83D[\uDCBB\uDCBC\uDD27\uDD2C\uDE80\uDE92]|\uD83E[\uDDAF-\uDDB3\uDDBC\uDDBD])|\uD83C\uDFFD\u200D(?:\uD83C[\uDF3E\uDF73\uDF7C\uDF84\uDF93\uDFA4\uDFA8\uDFEB\uDFED]|\uD83D[\uDCBB\uDCBC\uDD27\uDD2C\uDE80\uDE92]|\uD83E[\uDDAF-\uDDB3\uDDBC\uDDBD])|\uD83C\uDFFC\u200D(?:\uD83C[\uDF3E\uDF73\uDF7C\uDF84\uDF93\uDFA4\uDFA8\uDFEB\uDFED]|\uD83D[\uDCBB\uDCBC\uDD27\uDD2C\uDE80\uDE92]|\uD83E[\uDDAF-\uDDB3\uDDBC\uDDBD])|\uD83C\uDFFB\u200D(?:\uD83C[\uDF3E\uDF73\uDF7C\uDF84\uDF93\uDFA4\uDFA8\uDFEB\uDFED]|\uD83D[\uDCBB\uDCBC\uDD27\uDD2C\uDE80\uDE92]|\uD83E[\uDDAF-\uDDB3\uDDBC\uDDBD]))|\uD83D\uDC69\u200D\uD83D\uDC66\u200D\uD83D\uDC66|\uD83D\uDC69\u200D\uD83D\uDC69\u200D(?:\uD83D[\uDC66\uDC67])|\uD83D\uDC69\u200D\uD83D\uDC67\u200D(?:\uD83D[\uDC66\uDC67])|(?:\uD83D\uDC41\uFE0F\u200D\uD83D\uDDE8|\uD83E\uDDD1(?:\uD83C\uDFFF\u200D[\u2695\u2696\u2708]|\uD83C\uDFFE\u200D[\u2695\u2696\u2708]|\uD83C\uDFFD\u200D[\u2695\u2696\u2708]|\uD83C\uDFFC\u200D[\u2695\u2696\u2708]|\uD83C\uDFFB\u200D[\u2695\u2696\u2708]|\u200D[\u2695\u2696\u2708])|\uD83D\uDC69(?:\uD83C\uDFFF\u200D[\u2695\u2696\u2708]|\uD83C\uDFFE\u200D[\u2695\u2696\u2708]|\uD83C\uDFFD\u200D[\u2695\u2696\u2708]|\uD83C\uDFFC\u200D[\u2695\u2696\u2708]|\uD83C\uDFFB\u200D[\u2695\u2696\u2708]|\u200D[\u2695\u2696\u2708])|\uD83D\uDE36\u200D\uD83C\uDF2B|\uD83C\uDFF3\uFE0F\u200D\u26A7|\uD83D\uDC3B\u200D\u2744|(?:(?:\uD83C[\uDFC3\uDFC4\uDFCA]|\uD83D[\uDC6E\uDC70\uDC71\uDC73\uDC77\uDC81\uDC82\uDC86\uDC87\uDE45-\uDE47\uDE4B\uDE4D\uDE4E\uDEA3\uDEB4-\uDEB6]|\uD83E[\uDD26\uDD35\uDD37-\uDD39\uDD3D\uDD3E\uDDB8\uDDB9\uDDCD-\uDDCF\uDDD4\uDDD6-\uDDDD])(?:\uD83C[\uDFFB-\uDFFF])|\uD83D\uDC6F|\uD83E[\uDD3C\uDDDE\uDDDF])\u200D[\u2640\u2642]|(?:\u26F9|\uD83C[\uDFCB\uDFCC]|\uD83D\uDD75)(?:\uFE0F|\uD83C[\uDFFB-\uDFFF])\u200D[\u2640\u2642]|\uD83C\uDFF4\u200D\u2620|(?:\uD83C[\uDFC3\uDFC4\uDFCA]|\uD83D[\uDC6E\uDC70\uDC71\uDC73\uDC77\uDC81\uDC82\uDC86\uDC87\uDE45-\uDE47\uDE4B\uDE4D\uDE4E\uDEA3\uDEB4-\uDEB6]|\uD83E[\uDD26\uDD35\uDD37-\uDD39\uDD3D\uDD3E\uDDB8\uDDB9\uDDCD-\uDDCF\uDDD4\uDDD6-\uDDDD])\u200D[\u2640\u2642]|[\xA9\xAE\u203C\u2049\u2122\u2139\u2194-\u2199\u21A9\u21AA\u2328\u23CF\u23ED-\u23EF\u23F1\u23F2\u23F8-\u23FA\u24C2\u25AA\u25AB\u25B6\u25C0\u25FB\u25FC\u2600-\u2604\u260E\u2611\u2618\u2620\u2622\u2623\u2626\u262A\u262E\u262F\u2638-\u263A\u2640\u2642\u265F\u2660\u2663\u2665\u2666\u2668\u267B\u267E\u2692\u2694-\u2697\u2699\u269B\u269C\u26A0\u26A7\u26B0\u26B1\u26C8\u26CF\u26D1\u26D3\u26E9\u26F0\u26F1\u26F4\u26F7\u26F8\u2702\u2708\u2709\u270F\u2712\u2714\u2716\u271D\u2721\u2733\u2734\u2744\u2747\u2763\u27A1\u2934\u2935\u2B05-\u2B07\u3030\u303D\u3297\u3299]|\uD83C[\uDD70\uDD71\uDD7E\uDD7F\uDE02\uDE37\uDF21\uDF24-\uDF2C\uDF36\uDF7D\uDF96\uDF97\uDF99-\uDF9B\uDF9E\uDF9F\uDFCD\uDFCE\uDFD4-\uDFDF\uDFF5\uDFF7]|\uD83D[\uDC3F\uDCFD\uDD49\uDD4A\uDD6F\uDD70\uDD73\uDD76-\uDD79\uDD87\uDD8A-\uDD8D\uDDA5\uDDA8\uDDB1\uDDB2\uDDBC\uDDC2-\uDDC4\uDDD1-\uDDD3\uDDDC-\uDDDE\uDDE1\uDDE3\uDDE8\uDDEF\uDDF3\uDDFA\uDECB\uDECD-\uDECF\uDEE0-\uDEE5\uDEE9\uDEF0\uDEF3])\uFE0F|\uD83C\uDFF3\uFE0F\u200D\uD83C\uDF08|\uD83D\uDC69\u200D\uD83D\uDC67|\uD83D\uDC69\u200D\uD83D\uDC66|\uD83D\uDE35\u200D\uD83D\uDCAB|\uD83D\uDE2E\u200D\uD83D\uDCA8|\uD83D\uDC15\u200D\uD83E\uDDBA|\uD83E\uDDD1(?:\uD83C\uDFFF|\uD83C\uDFFE|\uD83C\uDFFD|\uD83C\uDFFC|\uD83C\uDFFB)?|\uD83D\uDC69(?:\uD83C\uDFFF|\uD83C\uDFFE|\uD83C\uDFFD|\uD83C\uDFFC|\uD83C\uDFFB)?|\uD83C\uDDFD\uD83C\uDDF0|\uD83C\uDDF6\uD83C\uDDE6|\uD83C\uDDF4\uD83C\uDDF2|\uD83D\uDC08\u200D\u2B1B|\u2764\uFE0F\u200D(?:\uD83D\uDD25|\uD83E\uDE79)|\uD83D\uDC41\uFE0F|\uD83C\uDFF3\uFE0F|\uD83C\uDDFF(?:\uD83C[\uDDE6\uDDF2\uDDFC])|\uD83C\uDDFE(?:\uD83C[\uDDEA\uDDF9])|\uD83C\uDDFC(?:\uD83C[\uDDEB\uDDF8])|\uD83C\uDDFB(?:\uD83C[\uDDE6\uDDE8\uDDEA\uDDEC\uDDEE\uDDF3\uDDFA])|\uD83C\uDDFA(?:\uD83C[\uDDE6\uDDEC\uDDF2\uDDF3\uDDF8\uDDFE\uDDFF])|\uD83C\uDDF9(?:\uD83C[\uDDE6\uDDE8\uDDE9\uDDEB-\uDDED\uDDEF-\uDDF4\uDDF7\uDDF9\uDDFB\uDDFC\uDDFF])|\uD83C\uDDF8(?:\uD83C[\uDDE6-\uDDEA\uDDEC-\uDDF4\uDDF7-\uDDF9\uDDFB\uDDFD-\uDDFF])|\uD83C\uDDF7(?:\uD83C[\uDDEA\uDDF4\uDDF8\uDDFA\uDDFC])|\uD83C\uDDF5(?:\uD83C[\uDDE6\uDDEA-\uDDED\uDDF0-\uDDF3\uDDF7-\uDDF9\uDDFC\uDDFE])|\uD83C\uDDF3(?:\uD83C[\uDDE6\uDDE8\uDDEA-\uDDEC\uDDEE\uDDF1\uDDF4\uDDF5\uDDF7\uDDFA\uDDFF])|\uD83C\uDDF2(?:\uD83C[\uDDE6\uDDE8-\uDDED\uDDF0-\uDDFF])|\uD83C\uDDF1(?:\uD83C[\uDDE6-\uDDE8\uDDEE\uDDF0\uDDF7-\uDDFB\uDDFE])|\uD83C\uDDF0(?:\uD83C[\uDDEA\uDDEC-\uDDEE\uDDF2\uDDF3\uDDF5\uDDF7\uDDFC\uDDFE\uDDFF])|\uD83C\uDDEF(?:\uD83C[\uDDEA\uDDF2\uDDF4\uDDF5])|\uD83C\uDDEE(?:\uD83C[\uDDE8-\uDDEA\uDDF1-\uDDF4\uDDF6-\uDDF9])|\uD83C\uDDED(?:\uD83C[\uDDF0\uDDF2\uDDF3\uDDF7\uDDF9\uDDFA])|\uD83C\uDDEC(?:\uD83C[\uDDE6\uDDE7\uDDE9-\uDDEE\uDDF1-\uDDF3\uDDF5-\uDDFA\uDDFC\uDDFE])|\uD83C\uDDEB(?:\uD83C[\uDDEE-\uDDF0\uDDF2\uDDF4\uDDF7])|\uD83C\uDDEA(?:\uD83C[\uDDE6\uDDE8\uDDEA\uDDEC\uDDED\uDDF7-\uDDFA])|\uD83C\uDDE9(?:\uD83C[\uDDEA\uDDEC\uDDEF\uDDF0\uDDF2\uDDF4\uDDFF])|\uD83C\uDDE8(?:\uD83C[\uDDE6\uDDE8\uDDE9\uDDEB-\uDDEE\uDDF0-\uDDF5\uDDF7\uDDFA-\uDDFF])|\uD83C\uDDE7(?:\uD83C[\uDDE6\uDDE7\uDDE9-\uDDEF\uDDF1-\uDDF4\uDDF6-\uDDF9\uDDFB\uDDFC\uDDFE\uDDFF])|\uD83C\uDDE6(?:\uD83C[\uDDE8-\uDDEC\uDDEE\uDDF1\uDDF2\uDDF4\uDDF6-\uDDFA\uDDFC\uDDFD\uDDFF])|[#\*0-9]\uFE0F\u20E3|\u2764\uFE0F|(?:\uD83C[\uDFC3\uDFC4\uDFCA]|\uD83D[\uDC6E\uDC70\uDC71\uDC73\uDC77\uDC81\uDC82\uDC86\uDC87\uDE45-\uDE47\uDE4B\uDE4D\uDE4E\uDEA3\uDEB4-\uDEB6]|\uD83E[\uDD26\uDD35\uDD37-\uDD39\uDD3D\uDD3E\uDDB8\uDDB9\uDDCD-\uDDCF\uDDD4\uDDD6-\uDDDD])(?:\uD83C[\uDFFB-\uDFFF])|(?:\u26F9|\uD83C[\uDFCB\uDFCC]|\uD83D\uDD75)(?:\uFE0F|\uD83C[\uDFFB-\uDFFF])|\uD83C\uDFF4|(?:[\u270A\u270B]|\uD83C[\uDF85\uDFC2\uDFC7]|\uD83D[\uDC42\uDC43\uDC46-\uDC50\uDC66\uDC67\uDC6B-\uDC6D\uDC72\uDC74-\uDC76\uDC78\uDC7C\uDC83\uDC85\uDC8F\uDC91\uDCAA\uDD7A\uDD95\uDD96\uDE4C\uDE4F\uDEC0\uDECC]|\uD83E[\uDD0C\uDD0F\uDD18-\uDD1C\uDD1E\uDD1F\uDD30-\uDD34\uDD36\uDD77\uDDB5\uDDB6\uDDBB\uDDD2\uDDD3\uDDD5])(?:\uD83C[\uDFFB-\uDFFF])|(?:[\u261D\u270C\u270D]|\uD83D[\uDD74\uDD90])(?:\uFE0F|\uD83C[\uDFFB-\uDFFF])|[\u270A\u270B]|\uD83C[\uDF85\uDFC2\uDFC7]|\uD83D[\uDC08\uDC15\uDC3B\uDC42\uDC43\uDC46-\uDC50\uDC66\uDC67\uDC6B-\uDC6D\uDC72\uDC74-\uDC76\uDC78\uDC7C\uDC83\uDC85\uDC8F\uDC91\uDCAA\uDD7A\uDD95\uDD96\uDE2E\uDE35\uDE36\uDE4C\uDE4F\uDEC0\uDECC]|\uD83E[\uDD0C\uDD0F\uDD18-\uDD1C\uDD1E\uDD1F\uDD30-\uDD34\uDD36\uDD77\uDDB5\uDDB6\uDDBB\uDDD2\uDDD3\uDDD5]|\uD83C[\uDFC3\uDFC4\uDFCA]|\uD83D[\uDC6E\uDC70\uDC71\uDC73\uDC77\uDC81\uDC82\uDC86\uDC87\uDE45-\uDE47\uDE4B\uDE4D\uDE4E\uDEA3\uDEB4-\uDEB6]|\uD83E[\uDD26\uDD35\uDD37-\uDD39\uDD3D\uDD3E\uDDB8\uDDB9\uDDCD-\uDDCF\uDDD4\uDDD6-\uDDDD]|\uD83D\uDC6F|\uD83E[\uDD3C\uDDDE\uDDDF]|[\u231A\u231B\u23E9-\u23EC\u23F0\u23F3\u25FD\u25FE\u2614\u2615\u2648-\u2653\u267F\u2693\u26A1\u26AA\u26AB\u26BD\u26BE\u26C4\u26C5\u26CE\u26D4\u26EA\u26F2\u26F3\u26F5\u26FA\u26FD\u2705\u2728\u274C\u274E\u2753-\u2755\u2757\u2795-\u2797\u27B0\u27BF\u2B1B\u2B1C\u2B50\u2B55]|\uD83C[\uDC04\uDCCF\uDD8E\uDD91-\uDD9A\uDE01\uDE1A\uDE2F\uDE32-\uDE36\uDE38-\uDE3A\uDE50\uDE51\uDF00-\uDF20\uDF2D-\uDF35\uDF37-\uDF7C\uDF7E-\uDF84\uDF86-\uDF93\uDFA0-\uDFC1\uDFC5\uDFC6\uDFC8\uDFC9\uDFCF-\uDFD3\uDFE0-\uDFF0\uDFF8-\uDFFF]|\uD83D[\uDC00-\uDC07\uDC09-\uDC14\uDC16-\uDC3A\uDC3C-\uDC3E\uDC40\uDC44\uDC45\uDC51-\uDC65\uDC6A\uDC79-\uDC7B\uDC7D-\uDC80\uDC84\uDC88-\uDC8E\uDC90\uDC92-\uDCA9\uDCAB-\uDCFC\uDCFF-\uDD3D\uDD4B-\uDD4E\uDD50-\uDD67\uDDA4\uDDFB-\uDE2D\uDE2F-\uDE34\uDE37-\uDE44\uDE48-\uDE4A\uDE80-\uDEA2\uDEA4-\uDEB3\uDEB7-\uDEBF\uDEC1-\uDEC5\uDED0-\uDED2\uDED5-\uDED7\uDEEB\uDEEC\uDEF4-\uDEFC\uDFE0-\uDFEB]|\uD83E[\uDD0D\uDD0E\uDD10-\uDD17\uDD1D\uDD20-\uDD25\uDD27-\uDD2F\uDD3A\uDD3F-\uDD45\uDD47-\uDD76\uDD78\uDD7A-\uDDB4\uDDB7\uDDBA\uDDBC-\uDDCB\uDDD0\uDDE0-\uDDFF\uDE70-\uDE74\uDE78-\uDE7A\uDE80-\uDE86\uDE90-\uDEA8\uDEB0-\uDEB6\uDEC0-\uDEC2\uDED0-\uDED6]|(?:[\u231A\u231B\u23E9-\u23EC\u23F0\u23F3\u25FD\u25FE\u2614\u2615\u2648-\u2653\u267F\u2693\u26A1\u26AA\u26AB\u26BD\u26BE\u26C4\u26C5\u26CE\u26D4\u26EA\u26F2\u26F3\u26F5\u26FA\u26FD\u2705\u270A\u270B\u2728\u274C\u274E\u2753-\u2755\u2757\u2795-\u2797\u27B0\u27BF\u2B1B\u2B1C\u2B50\u2B55]|\uD83C[\uDC04\uDCCF\uDD8E\uDD91-\uDD9A\uDDE6-\uDDFF\uDE01\uDE1A\uDE2F\uDE32-\uDE36\uDE38-\uDE3A\uDE50\uDE51\uDF00-\uDF20\uDF2D-\uDF35\uDF37-\uDF7C\uDF7E-\uDF93\uDFA0-\uDFCA\uDFCF-\uDFD3\uDFE0-\uDFF0\uDFF4\uDFF8-\uDFFF]|\uD83D[\uDC00-\uDC3E\uDC40\uDC42-\uDCFC\uDCFF-\uDD3D\uDD4B-\uDD4E\uDD50-\uDD67\uDD7A\uDD95\uDD96\uDDA4\uDDFB-\uDE4F\uDE80-\uDEC5\uDECC\uDED0-\uDED2\uDED5-\uDED7\uDEEB\uDEEC\uDEF4-\uDEFC\uDFE0-\uDFEB]|\uD83E[\uDD0C-\uDD3A\uDD3C-\uDD45\uDD47-\uDD78\uDD7A-\uDDCB\uDDCD-\uDDFF\uDE70-\uDE74\uDE78-\uDE7A\uDE80-\uDE86\uDE90-\uDEA8\uDEB0-\uDEB6\uDEC0-\uDEC2\uDED0-\uDED6])|(?:[#\*0-9\xA9\xAE\u203C\u2049\u2122\u2139\u2194-\u2199\u21A9\u21AA\u231A\u231B\u2328\u23CF\u23E9-\u23F3\u23F8-\u23FA\u24C2\u25AA\u25AB\u25B6\u25C0\u25FB-\u25FE\u2600-\u2604\u260E\u2611\u2614\u2615\u2618\u261D\u2620\u2622\u2623\u2626\u262A\u262E\u262F\u2638-\u263A\u2640\u2642\u2648-\u2653\u265F\u2660\u2663\u2665\u2666\u2668\u267B\u267E\u267F\u2692-\u2697\u2699\u269B\u269C\u26A0\u26A1\u26A7\u26AA\u26AB\u26B0\u26B1\u26BD\u26BE\u26C4\u26C5\u26C8\u26CE\u26CF\u26D1\u26D3\u26D4\u26E9\u26EA\u26F0-\u26F5\u26F7-\u26FA\u26FD\u2702\u2705\u2708-\u270D\u270F\u2712\u2714\u2716\u271D\u2721\u2728\u2733\u2734\u2744\u2747\u274C\u274E\u2753-\u2755\u2757\u2763\u2764\u2795-\u2797\u27A1\u27B0\u27BF\u2934\u2935\u2B05-\u2B07\u2B1B\u2B1C\u2B50\u2B55\u3030\u303D\u3297\u3299]|\uD83C[\uDC04\uDCCF\uDD70\uDD71\uDD7E\uDD7F\uDD8E\uDD91-\uDD9A\uDDE6-\uDDFF\uDE01\uDE02\uDE1A\uDE2F\uDE32-\uDE3A\uDE50\uDE51\uDF00-\uDF21\uDF24-\uDF93\uDF96\uDF97\uDF99-\uDF9B\uDF9E-\uDFF0\uDFF3-\uDFF5\uDFF7-\uDFFF]|\uD83D[\uDC00-\uDCFD\uDCFF-\uDD3D\uDD49-\uDD4E\uDD50-\uDD67\uDD6F\uDD70\uDD73-\uDD7A\uDD87\uDD8A-\uDD8D\uDD90\uDD95\uDD96\uDDA4\uDDA5\uDDA8\uDDB1\uDDB2\uDDBC\uDDC2-\uDDC4\uDDD1-\uDDD3\uDDDC-\uDDDE\uDDE1\uDDE3\uDDE8\uDDEF\uDDF3\uDDFA-\uDE4F\uDE80-\uDEC5\uDECB-\uDED2\uDED5-\uDED7\uDEE0-\uDEE5\uDEE9\uDEEB\uDEEC\uDEF0\uDEF3-\uDEFC\uDFE0-\uDFEB]|\uD83E[\uDD0C-\uDD3A\uDD3C-\uDD45\uDD47-\uDD78\uDD7A-\uDDCB\uDDCD-\uDDFF\uDE70-\uDE74\uDE78-\uDE7A\uDE80-\uDE86\uDE90-\uDEA8\uDEB0-\uDEB6\uDEC0-\uDEC2\uDED0-\uDED6])\uFE0F|(?:[\u261D\u26F9\u270A-\u270D]|\uD83C[\uDF85\uDFC2-\uDFC4\uDFC7\uDFCA-\uDFCC]|\uD83D[\uDC42\uDC43\uDC46-\uDC50\uDC66-\uDC78\uDC7C\uDC81-\uDC83\uDC85-\uDC87\uDC8F\uDC91\uDCAA\uDD74\uDD75\uDD7A\uDD90\uDD95\uDD96\uDE45-\uDE47\uDE4B-\uDE4F\uDEA3\uDEB4-\uDEB6\uDEC0\uDECC]|\uD83E[\uDD0C\uDD0F\uDD18-\uDD1F\uDD26\uDD30-\uDD39\uDD3C-\uDD3E\uDD77\uDDB5\uDDB6\uDDB8\uDDB9\uDDBB\uDDCD-\uDDCF\uDDD1-\uDDDD])/g};});i();i();i();var v=D=>{var u,C,t;let F=(u=process.stdout.columns)!=null?u:Number.POSITIVE_INFINITY;return typeof D=="function"&&(D=D(F)),D||(D={}),Array.isArray(D)?{columns:D,stdoutColumns:F}:{columns:(C=D.columns)!=null?C:[],stdoutColumns:(t=D.stdoutColumns)!=null?t:F}};i();i();i();i();i();function w$1({onlyFirst:D=!1}={}){let F=["[\\u001B\\u009B][[\\]()#;?]*(?:(?:(?:(?:;[-a-zA-Z\\d\\/#&.:=?%@~_]+)*|[a-zA-Z\\d]+(?:;[-a-zA-Z\\d\\/#&.:=?%@~_]*)*)?\\u0007)","(?:(?:\\d{1,4}(?:;\\d{0,4})*)?[\\dA-PR-TZcf-ntqry=><~]))"].join("|");return new RegExp(F,D?void 0:"g")}function d$1(D){if(typeof D!="string")throw new TypeError(`Expected a \`string\`, got \`${typeof D}\``);return D.replace(w$1(),"")}i();function y$1(D){return Number.isInteger(D)?D>=4352&&(D<=4447||D===9001||D===9002||11904<=D&&D<=12871&&D!==12351||12880<=D&&D<=19903||19968<=D&&D<=42182||43360<=D&&D<=43388||44032<=D&&D<=55203||63744<=D&&D<=64255||65040<=D&&D<=65049||65072<=D&&D<=65131||65281<=D&&D<=65376||65504<=D&&D<=65510||110592<=D&&D<=110593||127488<=D&&D<=127569||131072<=D&&D<=262141):!1}var j=BD($());function g(D){if(typeof D!="string"||D.length===0||(D=d$1(D),D.length===0))return 0;D=D.replace((0, j.default)(),"  ");let F=0;for(let u=0;u<D.length;u++){let C=D.codePointAt(u);C<=31||C>=127&&C<=159||C>=768&&C<=879||(C>65535&&u++,F+=y$1(C)?2:1);}return F}var b$1=D=>Math.max(...D.split(`
++`).map(g));var k$1=D=>{let F=[];for(let u of D){let{length:C}=u,t=C-F.length;for(let E=0;E<t;E+=1)F.push(0);for(let E=0;E<C;E+=1){let e=b$1(u[E]);e>F[E]&&(F[E]=e);}}return F};i();var _$1=/^\d+%$/,z$1={width:"auto",align:"left",contentWidth:0,paddingLeft:0,paddingRight:0,paddingTop:0,paddingBottom:0,horizontalPadding:0,paddingLeftString:"",paddingRightString:""},sD=(D,F)=>{var C;let u=[];for(let t=0;t<D.length;t+=1){let E=(C=F[t])!=null?C:"auto";if(typeof E=="number"||E==="auto"||E==="content-width"||typeof E=="string"&&_$1.test(E)){u.push(c(p({},z$1),{width:E,contentWidth:D[t]}));continue}if(E&&typeof E=="object"){let e=c(p(p({},z$1),E),{contentWidth:D[t]});e.horizontalPadding=e.paddingLeft+e.paddingRight,u.push(e);continue}throw new Error(`Invalid column width: ${JSON.stringify(E)}`)}return u};function aD(D,F){for(let u of D){let{width:C}=u;if(C==="content-width"&&(u.width=u.contentWidth),C==="auto"){let n=Math.min(20,u.contentWidth);u.width=n,u.autoOverflow=u.contentWidth-n;}if(typeof C=="string"&&_$1.test(C)){let n=Number.parseFloat(C.slice(0,-1))/100;u.width=Math.floor(F*n)-(u.paddingLeft+u.paddingRight);}let{horizontalPadding:t}=u,E=1,e=E+t;if(e>=F){let n=e-F,o=Math.ceil(u.paddingLeft/t*n),B=n-o;u.paddingLeft-=o,u.paddingRight-=B,u.horizontalPadding=u.paddingLeft+u.paddingRight;}u.paddingLeftString=u.paddingLeft?" ".repeat(u.paddingLeft):"",u.paddingRightString=u.paddingRight?" ".repeat(u.paddingRight):"";let r=F-u.horizontalPadding;u.width=Math.max(Math.min(u.width,r),E);}}var G$1=()=>Object.assign([],{columns:0});function lD(D,F){let u=[G$1()],[C]=u;for(let t of D){let E=t.width+t.horizontalPadding;C.columns+E>F&&(C=G$1(),u.push(C)),C.push(t),C.columns+=E;}for(let t of u){let E=t.reduce((s,l)=>s+l.width+l.horizontalPadding,0),e=F-E;if(e===0)continue;let r=t.filter(s=>"autoOverflow"in s),n=r.filter(s=>s.autoOverflow>0),o=n.reduce((s,l)=>s+l.autoOverflow,0),B=Math.min(o,e);for(let s of n){let l=Math.floor(s.autoOverflow/o*B);s.width+=l,e-=l;}let a=Math.floor(e/r.length);for(let s=0;s<r.length;s+=1){let l=r[s];s===r.length-1?l.width+=e:l.width+=a,e-=a;}}return u}function Z$1(D,F,u){let C=sD(u,F);return aD(C,D),lD(C,D)}i();i();i();var O=10,U$1=(D=0)=>F=>`[${F+D}m`,V$1=(D=0)=>F=>`[${38+D};5;${F}m`,Y=(D=0)=>(F,u,C)=>`[${38+D};2;${F};${u};${C}m`;function AD(){let D=new Map,F={modifier:{reset:[0,0],bold:[1,22],dim:[2,22],italic:[3,23],underline:[4,24],overline:[53,55],inverse:[7,27],hidden:[8,28],strikethrough:[9,29]},color:{black:[30,39],red:[31,39],green:[32,39],yellow:[33,39],blue:[34,39],magenta:[35,39],cyan:[36,39],white:[37,39],blackBright:[90,39],redBright:[91,39],greenBright:[92,39],yellowBright:[93,39],blueBright:[94,39],magentaBright:[95,39],cyanBright:[96,39],whiteBright:[97,39]},bgColor:{bgBlack:[40,49],bgRed:[41,49],bgGreen:[42,49],bgYellow:[43,49],bgBlue:[44,49],bgMagenta:[45,49],bgCyan:[46,49],bgWhite:[47,49],bgBlackBright:[100,49],bgRedBright:[101,49],bgGreenBright:[102,49],bgYellowBright:[103,49],bgBlueBright:[104,49],bgMagentaBright:[105,49],bgCyanBright:[106,49],bgWhiteBright:[107,49]}};F.color.gray=F.color.blackBright,F.bgColor.bgGray=F.bgColor.bgBlackBright,F.color.grey=F.color.blackBright,F.bgColor.bgGrey=F.bgColor.bgBlackBright;for(let[u,C]of Object.entries(F)){for(let[t,E]of Object.entries(C))F[t]={open:`[${E[0]}m`,close:`[${E[1]}m`},C[t]=F[t],D.set(E[0],E[1]);Object.defineProperty(F,u,{value:C,enumerable:!1});}return Object.defineProperty(F,"codes",{value:D,enumerable:!1}),F.color.close="",F.bgColor.close="",F.color.ansi=U$1(),F.color.ansi256=V$1(),F.color.ansi16m=Y(),F.bgColor.ansi=U$1(O),F.bgColor.ansi256=V$1(O),F.bgColor.ansi16m=Y(O),Object.defineProperties(F,{rgbToAnsi256:{value:(u,C,t)=>u===C&&C===t?u<8?16:u>248?231:Math.round((u-8)/247*24)+232:16+36*Math.round(u/255*5)+6*Math.round(C/255*5)+Math.round(t/255*5),enumerable:!1},hexToRgb:{value:u=>{let C=/(?<colorString>[a-f\d]{6}|[a-f\d]{3})/i.exec(u.toString(16));if(!C)return [0,0,0];let{colorString:t}=C.groups;t.length===3&&(t=t.split("").map(e=>e+e).join(""));let E=Number.parseInt(t,16);return [E>>16&255,E>>8&255,E&255]},enumerable:!1},hexToAnsi256:{value:u=>F.rgbToAnsi256(...F.hexToRgb(u)),enumerable:!1},ansi256ToAnsi:{value:u=>{if(u<8)return 30+u;if(u<16)return 90+(u-8);let C,t,E;if(u>=232)C=((u-232)*10+8)/255,t=C,E=C;else {u-=16;let n=u%36;C=Math.floor(u/36)/5,t=Math.floor(n/6)/5,E=n%6/5;}let e=Math.max(C,t,E)*2;if(e===0)return 30;let r=30+(Math.round(E)<<2|Math.round(t)<<1|Math.round(C));return e===2&&(r+=60),r},enumerable:!1},rgbToAnsi:{value:(u,C,t)=>F.ansi256ToAnsi(F.rgbToAnsi256(u,C,t)),enumerable:!1},hexToAnsi:{value:u=>F.ansi256ToAnsi(F.hexToAnsi256(u)),enumerable:!1}}),F}var fD=AD(),K=fD;var x$1=new Set(["","\x9B"]),gD=39,R$1="\x07",q$1="[",pD="]",H$1="m",M$1=`${pD}8;;`,J$1=D=>`${x$1.values().next().value}${q$1}${D}${H$1}`,Q=D=>`${x$1.values().next().value}${M$1}${D}${R$1}`,hD=D=>D.split(" ").map(F=>g(F)),S$1=(D,F,u)=>{let C=[...F],t=!1,E=!1,e=g(d$1(D[D.length-1]));for(let[r,n]of C.entries()){let o=g(n);if(e+o<=u?D[D.length-1]+=n:(D.push(n),e=0),x$1.has(n)&&(t=!0,E=C.slice(r+1).join("").startsWith(M$1)),t){E?n===R$1&&(t=!1,E=!1):n===H$1&&(t=!1);continue}e+=o,e===u&&r<C.length-1&&(D.push(""),e=0);}!e&&D[D.length-1].length>0&&D.length>1&&(D[D.length-2]+=D.pop());},cD=D=>{let F=D.split(" "),u=F.length;for(;u>0&&!(g(F[u-1])>0);)u--;return u===F.length?D:F.slice(0,u).join(" ")+F.slice(u).join("")},dD=(D,F,u={})=>{if(u.trim!==!1&&D.trim()==="")return "";let C="",t,E,e=hD(D),r=[""];for(let[o,B]of D.split(" ").entries()){u.trim!==!1&&(r[r.length-1]=r[r.length-1].trimStart());let a=g(r[r.length-1]);if(o!==0&&(a>=F&&(u.wordWrap===!1||u.trim===!1)&&(r.push(""),a=0),(a>0||u.trim===!1)&&(r[r.length-1]+=" ",a++)),u.hard&&e[o]>F){let s=F-a,l=1+Math.floor((e[o]-s-1)/F);Math.floor((e[o]-1)/F)<l&&r.push(""),S$1(r,B,F);continue}if(a+e[o]>F&&a>0&&e[o]>0){if(u.wordWrap===!1&&a<F){S$1(r,B,F);continue}r.push("");}if(a+e[o]>F&&u.wordWrap===!1){S$1(r,B,F);continue}r[r.length-1]+=B;}u.trim!==!1&&(r=r.map(o=>cD(o)));let n=[...r.join(`
++`)];for(let[o,B]of n.entries()){if(C+=B,x$1.has(B)){let{groups:s}=new RegExp(`(?:\\${q$1}(?<code>\\d+)m|\\${M$1}(?<uri>.*)${R$1})`).exec(n.slice(o).join(""))||{groups:{}};if(s.code!==void 0){let l=Number.parseFloat(s.code);t=l===gD?void 0:l;}else s.uri!==void 0&&(E=s.uri.length===0?void 0:s.uri);}let a=K.codes.get(Number(t));n[o+1]===`
++`?(E&&(C+=Q("")),t&&a&&(C+=J$1(a))):B===`
++`&&(t&&a&&(C+=J$1(t)),E&&(C+=Q(E)));}return C};function T$1(D,F,u){return String(D).normalize().replace(/\r\n/g,`
+ `).split(`
+-`).map(D=>AD(D,e,t)).join(`
+-`)}var $u=u=>Array.from({length:u}).fill("");function vD(u,e){let t=[],D=0;for(let n of u){let i=0,s=n.map(a=>{var h;let f=(h=e[D])!=null?h:"";D+=1,a.preprocess&&(f=a.preprocess(f)),pu(f)>a.width&&(f=bD(f,a.width,{hard:!0}));let g=f.split(`
+-`);if(a.postprocess){let{postprocess:F}=a;g=g.map((d,m)=>F.call(a,d,m))}return a.paddingTop&&g.unshift(...$u(a.paddingTop)),a.paddingBottom&&g.push(...$u(a.paddingBottom)),g.length>i&&(i=g.length),Re(Be({},a),{lines:g})}),o=[];for(let a=0;a<i;a+=1){let h=s.map(f=>{var g;let F=(g=f.lines[a])!=null?g:"",d=Number.isFinite(f.width)?" ".repeat(f.width-V(F)):"",m=f.paddingLeftString;return f.align==="right"&&(m+=d),m+=F,f.align==="left"&&(m+=d),m+f.paddingRightString}).join("");o.push(h)}t.push(o.join(`
+-`))}return t.join(`
+-`)}function SD(u,e){if(!u||u.length===0)return"";let t=pD(u),D=t.length;if(D===0)return"";let{stdoutColumns:n,columns:i}=aD(e);if(i.length>D)throw new Error(`${i.length} columns defined, but only ${D} columns found`);let s=CD(n,i,t);return u.map(o=>vD(s,o)).join(`
+-`)}x();var OD=["<",">","=",">=","<="];function kD(u){if(!OD.includes(u))throw new TypeError(`Invalid breakpoint operator: ${u}`)}function jD(u){let e=Object.keys(u).map(t=>{let[D,n]=t.split(" ");kD(D);let i=Number.parseInt(n,10);if(Number.isNaN(i))throw new TypeError(`Invalid breakpoint value: ${n}`);let s=u[t];return{operator:D,breakpoint:i,value:s}}).sort((t,D)=>D.breakpoint-t.breakpoint);return t=>{var D;return(D=e.find(({operator:n,breakpoint:i})=>n==="="&&t===i||n===">"&&t>i||n==="<"&&t<i||n===">="&&t>=i||n==="<="&&t<=i))==null?void 0:D.value}}const xD=u=>u.replace(/[\W_]([a-z\d])?/gi,(e,t)=>t?t.toUpperCase():""),TD=u=>u.replace(/\B([A-Z])/g,"-$1").toLowerCase(),RD={"> 80":[{width:"content-width",paddingLeft:2,paddingRight:8},{width:"auto"}],"> 40":[{width:"auto",paddingLeft:2,paddingRight:8,preprocess:u=>u.trim()},{width:"100%",paddingLeft:2,paddingBottom:1}],"> 0":{stdoutColumns:1e3,columns:[{width:"content-width",paddingLeft:2,paddingRight:8},{width:"content-width"}]}};function PD(u){let e=!1;return{type:"table",data:{tableData:Object.keys(u).sort((t,D)=>t.localeCompare(D)).map(t=>{const D=u[t],n="alias"in D;return n&&(e=!0),{name:t,flag:D,flagFormatted:`--${TD(t)}`,aliasesEnabled:e,aliasFormatted:n?`-${D.alias}`:void 0}}).map(t=>(t.aliasesEnabled=e,[{type:"flagName",data:t},{type:"flagDescription",data:t}])),tableBreakpoints:RD}}}const Au=u=>!u||(u.version??(u.help?u.help.version:void 0)),bu=u=>{const e="parent"in u&&u.parent?.name;return(e?`${e} `:"")+u.name};function LD(u){const e=[];u.name&&e.push(bu(u));const t=Au(u)??("parent"in u&&Au(u.parent));if(t&&e.push(`v${t}`),e.length!==0)return{id:"name",type:"text",data:`${e.join(" ")}
+-`}}function MD(u){const{help:e}=u;if(!(!e||!e.description))return{id:"description",type:"text",data:`${e.description}
+-`}}function ND(u){const e=u.help||{};if("usage"in e)return e.usage?{id:"usage",type:"section",data:{title:"Usage:",body:Array.isArray(e.usage)?e.usage.join(`
+-`):e.usage}}:void 0;if(u.name){const t=[],D=[bu(u)];if(u.flags&&Object.keys(u.flags).length>0&&D.push("[flags...]"),u.parameters&&u.parameters.length>0){const{parameters:n}=u,i=n.indexOf("--"),s=i>-1&&n.slice(i+1).some(o=>o.startsWith("<"));D.push(n.map(o=>o!=="--"?o:s?"--":"[--]").join(" "))}if(D.length>1&&t.push(D.join(" ")),"commands"in u&&u.commands?.length&&t.push(`${u.name} <command>`),t.length>0)return{id:"usage",type:"section",data:{title:"Usage:",body:t.join(`
+-`)}}}}function ID(u){return!("commands"in u)||!u.commands?.length?void 0:{id:"commands",type:"section",data:{title:"Commands:",body:{type:"table",data:{tableData:u.commands.map(e=>[e.options.name,e.options.help?e.options.help.description:""]),tableOptions:[{width:"content-width",paddingLeft:2,paddingRight:8}]}},indentBody:0}}}function _D(u){if(!(!u.flags||Object.keys(u.flags).length===0))return{id:"flags",type:"section",data:{title:"Flags:",body:PD(u.flags),indentBody:0}}}function WD(u){const{help:e}=u;if(!e||!e.examples||e.examples.length===0)return;let{examples:t}=e;if(Array.isArray(t)&&(t=t.join(`
+-`)),t)return{id:"examples",type:"section",data:{title:"Examples:",body:t}}}function GD(u){if(!("alias"in u)||!u.alias)return;const{alias:e}=u;return{id:"aliases",type:"section",data:{title:"Aliases:",body:Array.isArray(e)?e.join(", "):e}}}const qD=u=>[LD,MD,ND,ID,_D,WD,GD].map(e=>e(u)).filter(Boolean),zD=Ot.WriteStream.prototype.hasColors();class JD{text(e){return e}bold(e){return zD?`\x1B[1m${e}\x1B[22m`:e.toLocaleUpperCase()}indentText({text:e,spaces:t}){return e.replace(/^/gm," ".repeat(t))}heading(e){return this.bold(e)}section({title:e,body:t,indentBody:D=2}){return`${(e?`${this.heading(e)}
+-`:"")+(t?this.indentText({text:this.render(t),spaces:D}):"")}
+-`}table({tableData:e,tableOptions:t,tableBreakpoints:D}){return SD(e.map(n=>n.map(i=>this.render(i))),D?jD(D):t)}flagParameter(e){return e===Boolean?"":e===String?"<string>":e===Number?"<number>":Array.isArray(e)?this.flagParameter(e[0]):"<value>"}flagOperator(e){return" "}flagName(e){const{flag:t,flagFormatted:D,aliasesEnabled:n,aliasFormatted:i}=e;let s="";if(i?s+=`${i}, `:n&&(s+="    "),s+=D,"placeholder"in t&&typeof t.placeholder=="string")s+=`${this.flagOperator(e)}${t.placeholder}`;else{const o=this.flagParameter("type"in t?t.type:t);o&&(s+=`${this.flagOperator(e)}${o}`)}return s}flagDefault(e){return JSON.stringify(e)}flagDescription({flag:e}){let t="description"in e?e.description??"":"";if("default"in e){let{default:D}=e;typeof D=="function"&&(D=D()),D&&(t+=` (default: ${this.flagDefault(D)})`)}return t}render(e){if(typeof e=="string")return e;if(Array.isArray(e))return e.map(t=>this.render(t)).join(`
+-`);if("type"in e&&this[e.type]){const t=this[e.type];if(typeof t=="function")return t.call(this,e.data)}throw new Error(`Invalid node type: ${JSON.stringify(e)}`)}}const Ie=/^[\w.-]+$/,{stringify:I}=JSON,VD=/[|\\{}()[\]^$+*?.]/;function _e(u){const e=[];let t,D;for(const n of u){if(D)throw new Error(`Invalid parameter: Spread parameter ${I(D)} must be last`);const i=n[0],s=n[n.length-1];let o;if(i==="<"&&s===">"&&(o=!0,t))throw new Error(`Invalid parameter: Required parameter ${I(n)} cannot come after optional parameter ${I(t)}`);if(i==="["&&s==="]"&&(o=!1,t=n),o===void 0)throw new Error(`Invalid parameter: ${I(n)}. Must be wrapped in <> (required parameter) or [] (optional parameter)`);let a=n.slice(1,-1);const h=a.slice(-3)==="...";h&&(D=n,a=a.slice(0,-3));const f=a.match(VD);if(f)throw new Error(`Invalid parameter: ${I(n)}. Invalid character found ${I(f[0])}`);e.push({name:a,required:o,spread:h})}return e}function We(u,e,t,D){for(let n=0;n<e.length;n+=1){const{name:i,required:s,spread:o}=e[n],a=xD(i);if(a in u)throw new Error(`Invalid parameter: ${I(i)} is used more than once.`);const h=o?t.slice(n):t[n];if(o&&(n=e.length),s&&(!h||o&&h.length===0))return console.error(`Error: Missing required parameter ${I(i)}
+-`),D(),process.exit(1);u[a]=h}}function UD(u){return u===void 0||u!==!1}function vu(u,e,t,D){const n={...e.flags},i=e.version;i&&(n.version={type:Boolean,description:"Show version"});const{help:s}=e,o=UD(s);o&&!("help"in n)&&(n.help={type:Boolean,alias:"h",description:"Show help"});const a=Ht(n,D,{ignore:e.ignoreArgv}),h=()=>{console.log(e.version)};if(i&&a.flags.version===!0)return h(),process.exit(0);const f=new JD,g=o&&s?.render?s.render:m=>f.render(m),F=m=>{const w=qD({...e,...m?{help:m}:{},flags:n});console.log(g(w,f))};if(o&&a.flags.help===!0)return F(),process.exit(0);if(e.parameters){let{parameters:m}=e,w=a._;const S=m.indexOf("--"),R=m.slice(S+1),M=Object.create(null);if(S>-1&&R.length>0){m=m.slice(0,S);const G=a._["--"];w=w.slice(0,-G.length||void 0),We(M,_e(m),w,F),We(M,_e(R),G,F)}else We(M,_e(m),w,F);Object.assign(a._,M)}const d={...a,showVersion:h,showHelp:F};return typeof t=="function"&&t(d),{command:u,...d}}function ZD(u,e){const t=new Map;for(const D of e){const n=[D.options.name],{alias:i}=D.options;i&&(Array.isArray(i)?n.push(...i):n.push(i));for(const s of n){if(t.has(s))throw new Error(`Duplicate command name found: ${I(s)}`);t.set(s,D)}}return t.get(u)}function HD(u,e,t=process.argv.slice(2)){if(!u)throw new Error("Options is required");if("name"in u&&(!u.name||!Ie.test(u.name)))throw new Error(`Invalid script name: ${I(u.name)}`);const D=t[0];if(u.commands&&Ie.test(D)){const n=ZD(D,u.commands);if(n)return vu(n.options.name,{...n.options,parent:u},n.callback,t.slice(1))}return vu(void 0,u,e,t)}function XD(u,e){if(!u)throw new Error("Command options are required");const{name:t}=u;if(u.name===void 0)throw new Error("Command name is required");if(!Ie.test(t))throw new Error(`Invalid command name ${JSON.stringify(t)}. Command names must be one word.`);return{options:u,callback:e}}function ye(){}function Su(){return typeof WeakMap<"u"?new WeakMap:YD()}function YD(){return{add:ye,delete:ye,get:ye,set:ye,has:function(u){return!1}}}var KD=Object.prototype.hasOwnProperty,Ge=function(u,e){return KD.call(u,e)};function qe(u,e){for(var t in e)Ge(e,t)&&(u[t]=e[t]);return u}var QD=/^[ \t]*(?:\r\n|\r|\n)/,en=/(?:\r\n|\r|\n)[ \t]*$/,un=/^(?:[\r\n]|$)/,tn=/(?:\r\n|\r|\n)([ \t]*)(?:[^ \t\r\n]|$)/,Dn=/^[ \t]*[\r\n][ \t\r\n]*$/;function Ou(u,e,t){var D=0,n=u[0].match(tn);n&&(D=n[1].length);var i="(\\r\\n|\\r|\\n).{0,"+D+"}",s=new RegExp(i,"g");e&&(u=u.slice(1));var o=t.newline,a=t.trimLeadingNewline,h=t.trimTrailingNewline,f=typeof o=="string",g=u.length,F=u.map(function(d,m){return d=d.replace(s,"$1"),m===0&&a&&(d=d.replace(QD,"")),m===g-1&&h&&(d=d.replace(en,"")),f&&(d=d.replace(/\r\n|\n|\r/g,function(w){return o})),d});return F}function nn(u,e){for(var t="",D=0,n=u.length;D<n;D++)t+=u[D],D<n-1&&(t+=e[D]);return t}function sn(u){return Ge(u,"raw")&&Ge(u,"length")}function ku(u){var e=Su(),t=Su();function D(i){for(var s=[],o=1;o<arguments.length;o++)s[o-1]=arguments[o];if(sn(i)){var a=i,h=(s[0]===D||s[0]===W)&&Dn.test(a[0])&&un.test(a[1]),f=h?t:e,g=f.get(a);if(g||(g=Ou(a,h,u),f.set(a,g)),s.length===0)return g[0];var F=nn(g,h?s.slice(1):s);return F}else return ku(qe(qe({},u),i||{}))}var n=qe(D,{string:function(i){return Ou([i],!1,u)[0]}});return n}var W=ku({trimLeadingNewline:!0,trimTrailingNewline:!0});if(typeof module<"u")try{module.exports=W,Object.defineProperty(W,"__esModule",{value:!0}),W.default=W,W.outdent=W}catch{}let U=!0;const H=typeof self<"u"?self:typeof window<"u"?window:typeof global<"u"?global:{};let se=0;if(H.process&&H.process.env&&H.process.stdout){const{FORCE_COLOR:u,NODE_DISABLE_COLORS:e,NO_COLOR:t,TERM:D,COLORTERM:n}=H.process.env;e||t||u==="0"?U=!1:u==="1"||u==="2"||u==="3"?U=!0:D==="dumb"?U=!1:"CI"in H.process.env&&["TRAVIS","CIRCLECI","APPVEYOR","GITLAB_CI","GITHUB_ACTIONS","BUILDKITE","DRONE"].some(i=>i in H.process.env)?U=!0:U=process.stdout.isTTY,U&&(process.platform==="win32"||n&&(n==="truecolor"||n==="24bit")?se=3:D&&(D.endsWith("-256color")||D.endsWith("256"))?se=2:se=1)}let ju={enabled:U,supportLevel:se};function X(u,e,t=1){const D=`\x1B[${u}m`,n=`\x1B[${e}m`,i=new RegExp(`\\x1b\\[${e}m`,"g");return s=>ju.enabled&&ju.supportLevel>=t?D+(""+s).replace(i,D)+n:""+s}const rn=X(1,22),ze=X(2,22),xu=X(31,39),Tu=X(32,39),Je=X(35,39),re=X(36,39),oe=u=>O.access(u).then(()=>!0,()=>!1);var on=require;const Ru=async u=>{const e=await O.readFile(u,"utf8");return JSON.parse(e)},an="link.config.json",Pu="link.config.js",Lu=async u=>{const e=A.join(u,an);if(await oe(e))try{return Ru(e)}catch(D){throw new Error(`Failed to parse config JSON ${e}: ${D.message}`)}const t=A.join(u,Pu);if(await oe(t))try{return on(t)}catch(D){throw new Error(`Failed to load config file ${Pu}: ${D.message}`)}};var Mu=typeof globalThis<"u"?globalThis:typeof window<"u"?window:typeof global<"u"?global:typeof self<"u"?self:{};function Nu(u){return u&&u.__esModule&&Object.prototype.hasOwnProperty.call(u,"default")?u.default:u}var $e={};$e.replaceDollarWithPercentPair=_u,$e.convertToSetCommand=Iu,$e.convertToSetCommands=cn;function Iu(u,e){var t="";return u=u||"",u=u.trim(),e=e||"",e=e.trim(),u&&e&&e.length>0&&(t="@SET "+u+"="+_u(e)+`\r
+-`),t}function ln(u){var e={};return u.map(function(t){var D=t.split("=");e[D[0]]=D[1]}),e}function cn(u){var e=ln(u.split(" ")),t="";return Object.keys(e).forEach(function(D){t+=Iu(D,e[D])}),t}function _u(u){var e=/\$\{?([^$@#?\- \t{}:]+)\}?/g,t="",D=0;do{var n=e.exec(u);if(n){var i=u.substring(D,n.index)||"";t+=i+"%"+n[1]+"%",D=e.lastIndex}}while(e.lastIndex>0);return t+=u.slice(D),t}const{chmod:Ve,mkdir:hn,readFile:pn,stat:Wu,unlink:fn,writeFile:Ue}=O,{dirname:Gu,relative:Fn}=A,dn=$e,Cn=/^#!\s*(?:\/usr\/bin\/env\s+(?:-S\s+)?((?:[^ \t=]+=[^ \t=]+\s+)*))?([^ \t]+)(.*)$/,En=(u,e)=>Wu(u).then(()=>He(u,e),()=>{}),Ze=u=>fn(u).catch(()=>{}),He=(u,e)=>Wu(u).then(()=>gn(u,e)),gn=(u,e)=>Promise.all([Ze(e),Ze(e+".cmd"),Ze(e+".ps1")]).then(()=>mn(u,e)),mn=(u,e)=>hn(Gu(e),{recursive:!0}).then(()=>pn(u,"utf8")).then(t=>{const n=t.trim().split(/\r*\n/)[0].match(Cn);if(!n)return Xe(u,e);const i=n[1]||"",s=n[2],o=n[3]||"";return Xe(u,e,s,o,i)},t=>Xe(u,e)),Xe=(u,e,t,D,n)=>{let i=Fn(Gu(e),u),s=i.split("/").join("\\"),o,a=t&&t.split("\\").join("/"),h,f=a&&`"${a}$exe"`,g;i=i.split("\\").join("/"),D=D||"",n=n||"",t?(o=`"%dp0%\\${t}.exe"`,h=`"$basedir/${t}"`,g=`"$basedir/${t}$exe"`,s=`"%dp0%\\${s}"`,i=`"$basedir/${i}"`):(t=`"%dp0%\\${s}"`,a=`"$basedir/${i}"`,f=a,D="",s="",i="");const F=`@ECHO off\r
+-GOTO start\r
+-:find_dp0\r
+-SET dp0=%~dp0\r
+-EXIT /b\r
+-:start\r
+-SETLOCAL\r
+-CALL :find_dp0\r
+-`;let d;if(o){h=h.trim(),D=D.trim();const S=dn.convertToSetCommands(n);d=F+S+`\r
+-IF EXIST ${o} (\r
+-  SET "_prog=${o.replace(/(^")|("$)/g,"")}"\r
+-) ELSE (\r
+-  SET "_prog=${t.replace(/(^")|("$)/g,"")}"\r
+-  SET PATHEXT=%PATHEXT:;.JS;=;%\r
+-)\r
+-\r
+-endLocal & goto #_undefined_# 2>NUL || title %COMSPEC% & "%_prog%" ${D} ${s} %*\r
+-`}else d=`${F}${t} ${D} ${s} %*\r
+-`;let m=`#!/bin/sh
+-`;m=m+`basedir=$(dirname "$(echo "$0" | sed -e 's,\\\\,/,g')")
+-
+-case \`uname\` in
+-    *CYGWIN*|*MINGW*|*MSYS*) basedir=\`cygpath -w "$basedir"\`;;
+-esac
+-
+-`,h?m=m+`if [ -x ${h} ]; then
+-  exec ${n}${h} ${D} ${i} "$@"
+-else 
+-  exec ${n}${a} ${D} ${i} "$@"
+-fi
+-`:m=m+`exec ${a} ${D} ${i} "$@"
+-`;let w=`#!/usr/bin/env pwsh
+-$basedir=Split-Path $MyInvocation.MyCommand.Definition -Parent
+-
+-$exe=""
+-if ($PSVersionTable.PSVersion -lt "6.0" -or $IsWindows) {
+-  # Fix case when both the Windows and Linux builds of Node
+-  # are installed in the same directory
+-  $exe=".exe"
+-}
+-`;return h?w=w+`$ret=0
+-if (Test-Path ${g}) {
+-  # Support pipeline input
+-  if ($MyInvocation.ExpectingInput) {
+-    $input | & ${g} ${D} ${i} $args
++`).map(C=>dD(C,F,u)).join(`
++`)}var X=D=>Array.from({length:D}).fill("");function P(D,F){let u=[],C=0;for(let t of D){let E=0,e=t.map(n=>{var a;let o=(a=F[C])!=null?a:"";C+=1,n.preprocess&&(o=n.preprocess(o)),b$1(o)>n.width&&(o=T$1(o,n.width,{hard:!0}));let B=o.split(`
++`);if(n.postprocess){let{postprocess:s}=n;B=B.map((l,h)=>s.call(n,l,h));}return n.paddingTop&&B.unshift(...X(n.paddingTop)),n.paddingBottom&&B.push(...X(n.paddingBottom)),B.length>E&&(E=B.length),c(p({},n),{lines:B})}),r=[];for(let n=0;n<E;n+=1){let o=e.map(B=>{var h;let a=(h=B.lines[n])!=null?h:"",s=Number.isFinite(B.width)?" ".repeat(B.width-g(a)):"",l=B.paddingLeftString;return B.align==="right"&&(l+=s),l+=a,B.align==="left"&&(l+=s),l+B.paddingRightString}).join("");r.push(o);}u.push(r.join(`
++`));}return u.join(`
++`)}function mD(D,F){if(!D||D.length===0)return "";let u=k$1(D),C=u.length;if(C===0)return "";let{stdoutColumns:t,columns:E}=v(F);if(E.length>C)throw new Error(`${E.length} columns defined, but only ${C} columns found`);let e=Z$1(t,E,u);return D.map(r=>P(e,r)).join(`
++`)}i();var bD=["<",">","=",">=","<="];function xD(D){if(!bD.includes(D))throw new TypeError(`Invalid breakpoint operator: ${D}`)}function wD(D){let F=Object.keys(D).map(u=>{let[C,t]=u.split(" ");xD(C);let E=Number.parseInt(t,10);if(Number.isNaN(E))throw new TypeError(`Invalid breakpoint value: ${t}`);let e=D[u];return {operator:C,breakpoint:E,value:e}}).sort((u,C)=>C.breakpoint-u.breakpoint);return u=>{var C;return (C=F.find(({operator:t,breakpoint:E})=>t==="="&&u===E||t===">"&&u>E||t==="<"&&u<E||t===">="&&u>=E||t==="<="&&u<=E))==null?void 0:C.value}}
++
++const S=t=>t.replace(/[\W_]([a-z\d])?/gi,(e,r)=>r?r.toUpperCase():""),q=t=>t.replace(/\B([A-Z])/g,"-$1").toLowerCase(),I={"> 80":[{width:"content-width",paddingLeft:2,paddingRight:8},{width:"auto"}],"> 40":[{width:"auto",paddingLeft:2,paddingRight:8,preprocess:t=>t.trim()},{width:"100%",paddingLeft:2,paddingBottom:1}],"> 0":{stdoutColumns:1e3,columns:[{width:"content-width",paddingLeft:2,paddingRight:8},{width:"content-width"}]}};function D(t){let e=!1;return {type:"table",data:{tableData:Object.keys(t).sort((a,i)=>a.localeCompare(i)).map(a=>{const i=t[a],s="alias"in i;return s&&(e=!0),{name:a,flag:i,flagFormatted:`--${q(a)}`,aliasesEnabled:e,aliasFormatted:s?`-${i.alias}`:void 0}}).map(a=>(a.aliasesEnabled=e,[{type:"flagName",data:a},{type:"flagDescription",data:a}])),tableBreakpoints:I}}}const A=t=>!t||(t.version??(t.help?t.help.version:void 0)),C=t=>{const e="parent"in t&&t.parent?.name;return (e?`${e} `:"")+t.name};function R(t){const e=[];t.name&&e.push(C(t));const r=A(t)??("parent"in t&&A(t.parent));if(r&&e.push(`v${r}`),e.length!==0)return {id:"name",type:"text",data:`${e.join(" ")}
++`}}function L(t){const{help:e}=t;if(!(!e||!e.description))return {id:"description",type:"text",data:`${e.description}
++`}}function T(t){const e=t.help||{};if("usage"in e)return e.usage?{id:"usage",type:"section",data:{title:"Usage:",body:Array.isArray(e.usage)?e.usage.join(`
++`):e.usage}}:void 0;if(t.name){const r=[],n=[C(t)];if(t.flags&&Object.keys(t.flags).length>0&&n.push("[flags...]"),t.parameters&&t.parameters.length>0){const{parameters:a}=t,i=a.indexOf("--"),s=i>-1&&a.slice(i+1).some(o=>o.startsWith("<"));n.push(a.map(o=>o!=="--"?o:s?"--":"[--]").join(" "));}if(n.length>1&&r.push(n.join(" ")),"commands"in t&&t.commands?.length&&r.push(`${t.name} <command>`),r.length>0)return {id:"usage",type:"section",data:{title:"Usage:",body:r.join(`
++`)}}}}function _(t){return !("commands"in t)||!t.commands?.length?void 0:{id:"commands",type:"section",data:{title:"Commands:",body:{type:"table",data:{tableData:t.commands.map(n=>[n.options.name,n.options.help?n.options.help.description:""]),tableOptions:[{width:"content-width",paddingLeft:2,paddingRight:8}]}},indentBody:0}}}function k(t){if(!(!t.flags||Object.keys(t.flags).length===0))return {id:"flags",type:"section",data:{title:"Flags:",body:D(t.flags),indentBody:0}}}function F(t){const{help:e}=t;if(!e||!e.examples||e.examples.length===0)return;let{examples:r}=e;if(Array.isArray(r)&&(r=r.join(`
++`)),r)return {id:"examples",type:"section",data:{title:"Examples:",body:r}}}function H(t){if(!("alias"in t)||!t.alias)return;const{alias:e}=t;return {id:"aliases",type:"section",data:{title:"Aliases:",body:Array.isArray(e)?e.join(", "):e}}}const U=t=>[R,L,T,_,k,F,H].map(e=>e(t)).filter(Boolean),J=N$1.WriteStream.prototype.hasColors();class M{text(e){return e}bold(e){return J?`\x1B[1m${e}\x1B[22m`:e.toLocaleUpperCase()}indentText({text:e,spaces:r}){return e.replace(/^/gm," ".repeat(r))}heading(e){return this.bold(e)}section({title:e,body:r,indentBody:n=2}){return `${(e?`${this.heading(e)}
++`:"")+(r?this.indentText({text:this.render(r),spaces:n}):"")}
++`}table({tableData:e,tableOptions:r,tableBreakpoints:n}){return mD(e.map(a=>a.map(i=>this.render(i))),n?wD(n):r)}flagParameter(e){return e===Boolean?"":e===String?"<string>":e===Number?"<number>":Array.isArray(e)?this.flagParameter(e[0]):"<value>"}flagOperator(e){return " "}flagName(e){const{flag:r,flagFormatted:n,aliasesEnabled:a,aliasFormatted:i}=e;let s="";if(i?s+=`${i}, `:a&&(s+="    "),s+=n,"placeholder"in r&&typeof r.placeholder=="string")s+=`${this.flagOperator(e)}${r.placeholder}`;else {const o=this.flagParameter("type"in r?r.type:r);o&&(s+=`${this.flagOperator(e)}${o}`);}return s}flagDefault(e){return JSON.stringify(e)}flagDescription({flag:e}){let r="description"in e?e.description??"":"";if("default"in e){let{default:n}=e;typeof n=="function"&&(n=n()),n&&(r+=` (default: ${this.flagDefault(n)})`);}return r}render(e){if(typeof e=="string")return e;if(Array.isArray(e))return e.map(r=>this.render(r)).join(`
++`);if("type"in e&&this[e.type]){const r=this[e.type];if(typeof r=="function")return r.call(this,e.data)}throw new Error(`Invalid node type: ${JSON.stringify(e)}`)}}const y=/^[\w.-]+$/,{stringify:d}=JSON,V=/[|\\{}()[\]^$+*?.]/;function w(t){const e=[];let r,n;for(const a of t){if(n)throw new Error(`Invalid parameter: Spread parameter ${d(n)} must be last`);const i=a[0],s=a[a.length-1];let o;if(i==="<"&&s===">"&&(o=!0,r))throw new Error(`Invalid parameter: Required parameter ${d(a)} cannot come after optional parameter ${d(r)}`);if(i==="["&&s==="]"&&(o=!1,r=a),o===void 0)throw new Error(`Invalid parameter: ${d(a)}. Must be wrapped in <> (required parameter) or [] (optional parameter)`);let l=a.slice(1,-1);const f=l.slice(-3)==="...";f&&(n=a,l=l.slice(0,-3));const p=l.match(V);if(p)throw new Error(`Invalid parameter: ${d(a)}. Invalid character found ${d(p[0])}`);e.push({name:l,required:o,spread:f});}return e}function b(t,e,r,n){for(let a=0;a<e.length;a+=1){const{name:i,required:s,spread:o}=e[a],l=S(i);if(l in t)throw new Error(`Invalid parameter: ${d(i)} is used more than once.`);const f=o?r.slice(a):r[a];if(o&&(a=e.length),s&&(!f||o&&f.length===0))return console.error(`Error: Missing required parameter ${d(i)}
++`),n(),process.exit(1);t[l]=f;}}function W(t){return t===void 0||t!==!1}function x(t,e,r,n){const a={...e.flags},i=e.version;i&&(a.version={type:Boolean,description:"Show version"});const{help:s}=e,o=W(s);o&&!("help"in a)&&(a.help={type:Boolean,alias:"h",description:"Show help"});const l=U$2(a,n,{ignore:e.ignoreArgv}),f=()=>{console.log(e.version);};if(i&&l.flags.version===!0)return f(),process.exit(0);const p=new M,O=o&&s?.render?s.render:c=>p.render(c),u=c=>{const m=U({...e,...c?{help:c}:{},flags:a});console.log(O(m,p));};if(o&&l.flags.help===!0)return u(),process.exit(0);if(e.parameters){let{parameters:c}=e,m=l._;const g=c.indexOf("--"),v=c.slice(g+1),h=Object.create(null);if(g>-1&&v.length>0){c=c.slice(0,g);const E=l._["--"];m=m.slice(0,-E.length||void 0),b(h,w(c),m,u),b(h,w(v),E,u);}else b(h,w(c),m,u);Object.assign(l._,h);}const $={...l,showVersion:f,showHelp:u};return typeof r=="function"&&r($),{command:t,...$}}function z(t,e){const r=new Map;for(const n of e){const a=[n.options.name],{alias:i}=n.options;i&&(Array.isArray(i)?a.push(...i):a.push(i));for(const s of a){if(r.has(s))throw new Error(`Duplicate command name found: ${d(s)}`);r.set(s,n);}}return r.get(t)}function Z(t,e,r=process.argv.slice(2)){if(!t)throw new Error("Options is required");if("name"in t&&(!t.name||!y.test(t.name)))throw new Error(`Invalid script name: ${d(t.name)}`);const n=r[0];if(t.commands&&y.test(n)){const a=z(n,t.commands);if(a)return x(a.options.name,{...a.options,parent:t},a.callback,r.slice(1))}return x(void 0,t,e,r)}function G(t,e){if(!t)throw new Error("Command options are required");const{name:r}=t;if(t.name===void 0)throw new Error("Command name is required");if(!y.test(r))throw new Error(`Invalid command name ${JSON.stringify(r)}. Command names must be one word.`);return {options:t,callback:e}}
++
++// In the absence of a WeakSet or WeakMap implementation, don't break, but don't cache either.
++function noop() {
++}
++function createWeakMap() {
++    if (typeof WeakMap !== "undefined") {
++        return new WeakMap();
++    }
++    else {
++        return fakeSetOrMap();
++    }
++}
++/**
++ * Creates and returns a no-op implementation of a WeakMap / WeakSet that never stores anything.
++ */
++function fakeSetOrMap() {
++    return {
++        add: noop,
++        delete: noop,
++        get: noop,
++        set: noop,
++        has: function (k) {
++            return false;
++        },
++    };
++}
++// Safe hasOwnProperty
++var hop = Object.prototype.hasOwnProperty;
++var has = function (obj, prop) {
++    return hop.call(obj, prop);
++};
++// Copy all own enumerable properties from source to target
++function extend(target, source) {
++    for (var prop in source) {
++        if (has(source, prop)) {
++            target[prop] = source[prop];
++        }
++    }
++    return target;
++}
++var reLeadingNewline = /^[ \t]*(?:\r\n|\r|\n)/;
++var reTrailingNewline = /(?:\r\n|\r|\n)[ \t]*$/;
++var reStartsWithNewlineOrIsEmpty = /^(?:[\r\n]|$)/;
++var reDetectIndentation = /(?:\r\n|\r|\n)([ \t]*)(?:[^ \t\r\n]|$)/;
++var reOnlyWhitespaceWithAtLeastOneNewline = /^[ \t]*[\r\n][ \t\r\n]*$/;
++function _outdentArray(strings, firstInterpolatedValueSetsIndentationLevel, options) {
++    // If first interpolated value is a reference to outdent,
++    // determine indentation level from the indentation of the interpolated value.
++    var indentationLevel = 0;
++    var match = strings[0].match(reDetectIndentation);
++    if (match) {
++        indentationLevel = match[1].length;
++    }
++    var reSource = "(\\r\\n|\\r|\\n).{0," + indentationLevel + "}";
++    var reMatchIndent = new RegExp(reSource, "g");
++    if (firstInterpolatedValueSetsIndentationLevel) {
++        strings = strings.slice(1);
++    }
++    var newline = options.newline, trimLeadingNewline = options.trimLeadingNewline, trimTrailingNewline = options.trimTrailingNewline;
++    var normalizeNewlines = typeof newline === "string";
++    var l = strings.length;
++    var outdentedStrings = strings.map(function (v, i) {
++        // Remove leading indentation from all lines
++        v = v.replace(reMatchIndent, "$1");
++        // Trim a leading newline from the first string
++        if (i === 0 && trimLeadingNewline) {
++            v = v.replace(reLeadingNewline, "");
++        }
++        // Trim a trailing newline from the last string
++        if (i === l - 1 && trimTrailingNewline) {
++            v = v.replace(reTrailingNewline, "");
++        }
++        // Normalize newlines
++        if (normalizeNewlines) {
++            v = v.replace(/\r\n|\n|\r/g, function (_) { return newline; });
++        }
++        return v;
++    });
++    return outdentedStrings;
++}
++function concatStringsAndValues(strings, values) {
++    var ret = "";
++    for (var i = 0, l = strings.length; i < l; i++) {
++        ret += strings[i];
++        if (i < l - 1) {
++            ret += values[i];
++        }
++    }
++    return ret;
++}
++function isTemplateStringsArray(v) {
++    return has(v, "raw") && has(v, "length");
++}
++/**
++ * It is assumed that opts will not change.  If this is a problem, clone your options object and pass the clone to
++ * makeInstance
++ * @param options
++ * @return {outdent}
++ */
++function createInstance(options) {
++    /** Cache of pre-processed template literal arrays */
++    var arrayAutoIndentCache = createWeakMap();
++    /**
++       * Cache of pre-processed template literal arrays, where first interpolated value is a reference to outdent,
++       * before interpolated values are injected.
++       */
++    var arrayFirstInterpSetsIndentCache = createWeakMap();
++    function outdent(stringsOrOptions) {
++        var values = [];
++        for (var _i = 1; _i < arguments.length; _i++) {
++            values[_i - 1] = arguments[_i];
++        }
++        /* tslint:enable:no-shadowed-variable */
++        if (isTemplateStringsArray(stringsOrOptions)) {
++            var strings = stringsOrOptions;
++            // Is first interpolated value a reference to outdent, alone on its own line, without any preceding non-whitespace?
++            var firstInterpolatedValueSetsIndentationLevel = (values[0] === outdent || values[0] === defaultOutdent) &&
++                reOnlyWhitespaceWithAtLeastOneNewline.test(strings[0]) &&
++                reStartsWithNewlineOrIsEmpty.test(strings[1]);
++            // Perform outdentation
++            var cache = firstInterpolatedValueSetsIndentationLevel
++                ? arrayFirstInterpSetsIndentCache
++                : arrayAutoIndentCache;
++            var renderedArray = cache.get(strings);
++            if (!renderedArray) {
++                renderedArray = _outdentArray(strings, firstInterpolatedValueSetsIndentationLevel, options);
++                cache.set(strings, renderedArray);
++            }
++            /** If no interpolated values, skip concatenation step */
++            if (values.length === 0) {
++                return renderedArray[0];
++            }
++            /** Concatenate string literals with interpolated values */
++            var rendered = concatStringsAndValues(renderedArray, firstInterpolatedValueSetsIndentationLevel ? values.slice(1) : values);
++            return rendered;
++        }
++        else {
++            // Create and return a new instance of outdent with the given options
++            return createInstance(extend(extend({}, options), stringsOrOptions || {}));
++        }
++    }
++    var fullOutdent = extend(outdent, {
++        string: function (str) {
++            return _outdentArray([str], false, options)[0];
++        },
++    });
++    return fullOutdent;
++}
++var defaultOutdent = createInstance({
++    trimLeadingNewline: true,
++    trimTrailingNewline: true,
++});
++if (typeof module !== "undefined") {
++    // In webpack harmony-modules environments, module.exports is read-only,
++    // so we fail gracefully.
++    try {
++        module.exports = defaultOutdent;
++        Object.defineProperty(defaultOutdent, "__esModule", { value: true });
++        defaultOutdent.default = defaultOutdent;
++        defaultOutdent.outdent = defaultOutdent;
++    }
++    catch (e) { }
++}
++
++let enabled = true;
++// Support both browser and node environments
++const globalVar = typeof self !== 'undefined'
++    ? self
++    : typeof window !== 'undefined'
++        ? window
++        : typeof global !== 'undefined'
++            ? global
++            : {};
++/**
++ * Detect how much colors the current terminal supports
++ */
++let supportLevel = 0 /* none */;
++if (globalVar.process && globalVar.process.env && globalVar.process.stdout) {
++    const { FORCE_COLOR, NODE_DISABLE_COLORS, NO_COLOR, TERM, COLORTERM } = globalVar.process.env;
++    if (NODE_DISABLE_COLORS || NO_COLOR || FORCE_COLOR === '0') {
++        enabled = false;
++    }
++    else if (FORCE_COLOR === '1' ||
++        FORCE_COLOR === '2' ||
++        FORCE_COLOR === '3') {
++        enabled = true;
++    }
++    else if (TERM === 'dumb') {
++        enabled = false;
++    }
++    else if ('CI' in globalVar.process.env &&
++        [
++            'TRAVIS',
++            'CIRCLECI',
++            'APPVEYOR',
++            'GITLAB_CI',
++            'GITHUB_ACTIONS',
++            'BUILDKITE',
++            'DRONE',
++        ].some(vendor => vendor in globalVar.process.env)) {
++        enabled = true;
++    }
++    else {
++        enabled = process.stdout.isTTY;
++    }
++    if (enabled) {
++        // Windows supports 24bit True Colors since Windows 10 revision #14931,
++        // see https://devblogs.microsoft.com/commandline/24-bit-color-in-the-windows-console/
++        if (process.platform === 'win32') {
++            supportLevel = 3 /* trueColor */;
++        }
++        else {
++            if (COLORTERM && (COLORTERM === 'truecolor' || COLORTERM === '24bit')) {
++                supportLevel = 3 /* trueColor */;
++            }
++            else if (TERM && (TERM.endsWith('-256color') || TERM.endsWith('256'))) {
++                supportLevel = 2 /* ansi256 */;
++            }
++            else {
++                supportLevel = 1 /* ansi */;
++            }
++        }
++    }
++}
++let options = {
++    enabled,
++    supportLevel,
++};
++function kolorist(start, end, level = 1 /* ansi */) {
++    const open = `\x1b[${start}m`;
++    const close = `\x1b[${end}m`;
++    const regex = new RegExp(`\\x1b\\[${end}m`, 'g');
++    return (str) => {
++        return options.enabled && options.supportLevel >= level
++            ? open + ('' + str).replace(regex, open) + close
++            : '' + str;
++    };
++}
++const bold = kolorist(1, 22);
++const dim = kolorist(2, 22);
++const red = kolorist(31, 39);
++const green = kolorist(32, 39);
++const yellow = kolorist(33, 39);
++const magenta = kolorist(35, 39);
++const cyan = kolorist(36, 39);
++
++const fsExists = (path) => fs$1.access(path).then(
++  () => true,
++  () => false
++);
++
++var require$1 = (
++			false
++				? /* @__PURE__ */ module$1.createRequire((typeof document === 'undefined' ? require('u' + 'rl').pathToFileURL(__filename).href : (_documentCurrentScript && _documentCurrentScript.src || new URL('cli.js', document.baseURI).href)))
++				: require
++		);
++
++const readJsonFile = async (filePath) => {
++  const jsonString = await fs$1.readFile(filePath, "utf8");
++  return JSON.parse(jsonString);
++};
++
++const configJsonFile = "link.config.json";
++const configJsFile = "link.config.js";
++const loadConfig = async (packageDirectory) => {
++  const configJsonPath = path$1.join(packageDirectory, configJsonFile);
++  if (await fsExists(configJsonPath)) {
++    try {
++      return readJsonFile(configJsonPath);
++    } catch (error) {
++      throw new Error(`Failed to parse config JSON ${configJsonPath}: ${error.message}`);
++    }
++  }
++  const configJsPath = path$1.join(packageDirectory, configJsFile);
++  if (await fsExists(configJsPath)) {
++    try {
++      return require$1(configJsPath);
++    } catch (error) {
++      throw new Error(`Failed to load config file ${configJsFile}: ${error.message}`);
++    }
++  }
++};
++
++var commonjsGlobal = typeof globalThis !== 'undefined' ? globalThis : typeof window !== 'undefined' ? window : typeof global !== 'undefined' ? global : typeof self !== 'undefined' ? self : {};
++
++function getDefaultExportFromCjs (x) {
++	return x && x.__esModule && Object.prototype.hasOwnProperty.call(x, 'default') ? x['default'] : x;
++}
++
++var toBatchSyntax$1 = {};
++
++toBatchSyntax$1.replaceDollarWithPercentPair = replaceDollarWithPercentPair;
++toBatchSyntax$1.convertToSetCommand = convertToSetCommand;
++toBatchSyntax$1.convertToSetCommands = convertToSetCommands;
++
++function convertToSetCommand (key, value) {
++  var line = '';
++  key = key || '';
++  key = key.trim();
++  value = value || '';
++  value = value.trim();
++  if (key && value && value.length > 0) {
++    line = '@SET ' + key + '=' + replaceDollarWithPercentPair(value) + '\r\n';
++  }
++  return line
++}
++
++function extractVariableValuePairs (declarations) {
++  var pairs = {};
++  declarations.map(function (declaration) {
++    var split = declaration.split('=');
++    pairs[split[0]] = split[1];
++  });
++  return pairs
++}
++
++function convertToSetCommands (variableString) {
++  var variableValuePairs = extractVariableValuePairs(variableString.split(' '));
++  var variableDeclarationsAsBatch = '';
++  Object.keys(variableValuePairs).forEach(function (key) {
++    variableDeclarationsAsBatch += convertToSetCommand(key, variableValuePairs[key]);
++  });
++  return variableDeclarationsAsBatch
++}
++
++function replaceDollarWithPercentPair (value) {
++  var dollarExpressions = /\$\{?([^$@#?\- \t{}:]+)\}?/g;
++  var result = '';
++  var startIndex = 0;
++  do {
++    var match = dollarExpressions.exec(value);
++    if (match) {
++      var betweenMatches = value.substring(startIndex, match.index) || '';
++      result += betweenMatches + '%' + match[1] + '%';
++      startIndex = dollarExpressions.lastIndex;
++    }
++  } while (dollarExpressions.lastIndex > 0)
++  result += value.slice(startIndex);
++  return result
++}
++
++// On windows, create a .cmd file.
++// Read the #! in the file to see what it uses.  The vast majority
++// of the time, this will be either:
++// "#!/usr/bin/env <prog> <args...>"
++// or:
++// "#!<prog> <args...>"
++//
++// Write a binroot/pkg.bin + ".cmd" file that has this line in it:
++// @<prog> <args...> %dp0%<target> %*
++
++const {
++  chmod,
++  mkdir,
++  readFile: readFile$1,
++  stat,
++  unlink,
++  writeFile,
++} = fs$1;
++
++const { dirname: dirname$1, relative: relative$1 } = path$1;
++const toBatchSyntax = toBatchSyntax$1;
++// linting disabled because this regex is really long
++// eslint-disable-next-line max-len
++const shebangExpr = /^#!\s*(?:\/usr\/bin\/env\s+(?:-S\s+)?((?:[^ \t=]+=[^ \t=]+\s+)*))?([^ \t]+)(.*)$/;
++
++const cmdShimIfExists = (from, to) =>
++  stat(from).then(() => cmdShim(from, to), () => {});
++
++// Try to unlink, but ignore errors.
++// Any problems will surface later.
++const rm = path => unlink(path).catch(() => {});
++
++const cmdShim = (from, to) =>
++  stat(from).then(() => cmdShim_(from, to));
++
++const cmdShim_ = (from, to) => Promise.all([
++  rm(to),
++  rm(to + '.cmd'),
++  rm(to + '.ps1'),
++]).then(() => writeShim(from, to));
++
++const writeShim = (from, to) =>
++  // make a cmd file and a sh script
++  // First, check if the bin is a #! of some sort.
++  // If not, then assume it's something that'll be compiled, or some other
++  // sort of script, and just call it directly.
++  mkdir(dirname$1(to), { recursive: true })
++    .then(() => readFile$1(from, 'utf8'))
++    .then(data => {
++      const firstLine = data.trim().split(/\r*\n/)[0];
++      const shebang = firstLine.match(shebangExpr);
++      if (!shebang) {
++        return writeShim_(from, to)
++      }
++      const vars = shebang[1] || '';
++      const prog = shebang[2];
++      const args = shebang[3] || '';
++      return writeShim_(from, to, prog, args, vars)
++    }, () => writeShim_(from, to));
++
++const writeShim_ = (from, to, prog, args, variables) => {
++  let shTarget = relative$1(dirname$1(to), from);
++  let target = shTarget.split('/').join('\\');
++  let longProg;
++  let shProg = prog && prog.split('\\').join('/');
++  let shLongProg;
++  let pwshProg = shProg && `"${shProg}$exe"`;
++  let pwshLongProg;
++  shTarget = shTarget.split('\\').join('/');
++  args = args || '';
++  variables = variables || '';
++  if (!prog) {
++    prog = `"%dp0%\\${target}"`;
++    shProg = `"$basedir/${shTarget}"`;
++    pwshProg = shProg;
++    args = '';
++    target = '';
++    shTarget = '';
+   } else {
+-    & ${g} ${D} ${i} $args
++    longProg = `"%dp0%\\${prog}.exe"`;
++    shLongProg = `"$basedir/${prog}"`;
++    pwshLongProg = `"$basedir/${prog}$exe"`;
++    target = `"%dp0%\\${target}"`;
++    shTarget = `"$basedir/${shTarget}"`;
++  }
++
++  // Subroutine trick to fix https://github.com/npm/cmd-shim/issues/10
++  // and https://github.com/npm/cli/issues/969
++  const head = '@ECHO off\r\n' +
++    'GOTO start\r\n' +
++    ':find_dp0\r\n' +
++    'SET dp0=%~dp0\r\n' +
++    'EXIT /b\r\n' +
++    ':start\r\n' +
++    'SETLOCAL\r\n' +
++    'CALL :find_dp0\r\n';
++
++  let cmd;
++  if (longProg) {
++    shLongProg = shLongProg.trim();
++    args = args.trim();
++    const variablesBatch = toBatchSyntax.convertToSetCommands(variables);
++    cmd = head
++        + variablesBatch
++        + '\r\n'
++        + `IF EXIST ${longProg} (\r\n`
++        + `  SET "_prog=${longProg.replace(/(^")|("$)/g, '')}"\r\n`
++        + ') ELSE (\r\n'
++        + `  SET "_prog=${prog.replace(/(^")|("$)/g, '')}"\r\n`
++        + '  SET PATHEXT=%PATHEXT:;.JS;=;%\r\n'
++        + ')\r\n'
++        + '\r\n'
++        // prevent "Terminate Batch Job? (Y/n)" message
++        // https://github.com/npm/cli/issues/969#issuecomment-737496588
++        + 'endLocal & goto #_undefined_# 2>NUL || title %COMSPEC% & '
++        + `"%_prog%" ${args} ${target} %*\r\n`;
++  } else {
++    cmd = `${head}${prog} ${args} ${target} %*\r\n`;
++  }
++
++  // #!/bin/sh
++  // basedir=`dirname "$0"`
++  //
++  // case `uname` in
++  //     *CYGWIN*|*MINGW*|*MSYS*)
++  //       if command -v cygpath > /dev/null 2>&1; then
++  //           basedir=`cygpath -w "$basedir"`
++  //       fi
++  //     ;;
++  // esac
++  //
++  // if [ -x "$basedir/node.exe" ]; then
++  //   exec "$basedir/node.exe" "$basedir/node_modules/npm/bin/npm-cli.js" "$@"
++  // else
++  //   exec node "$basedir/node_modules/npm/bin/npm-cli.js" "$@"
++  // fi
++
++  let sh = '#!/bin/sh\n';
++
++  sh = sh
++      + `basedir=$(dirname "$(echo "$0" | sed -e 's,\\\\,/,g')")\n`
++      + '\n'
++      + 'case `uname` in\n'
++      + '    *CYGWIN*|*MINGW*|*MSYS*)\n'
++      + '        if command -v cygpath > /dev/null 2>&1; then\n'
++      + '            basedir=`cygpath -w "$basedir"`\n'
++      + '        fi\n'
++      + '    ;;\n'
++      + 'esac\n'
++      + '\n';
++
++  if (shLongProg) {
++    sh = sh
++       + `if [ -x ${shLongProg} ]; then\n`
++       + `  exec ${variables}${shLongProg} ${args} ${shTarget} "$@"\n`
++       + 'else \n'
++       + `  exec ${variables}${shProg} ${args} ${shTarget} "$@"\n`
++       + 'fi\n';
++  } else {
++    sh = sh
++       + `exec ${shProg} ${args} ${shTarget} "$@"\n`;
++  }
++
++  // #!/usr/bin/env pwsh
++  // $basedir=Split-Path $MyInvocation.MyCommand.Definition -Parent
++  //
++  // $ret=0
++  // $exe = ""
++  // if ($PSVersionTable.PSVersion -lt "6.0" -or $IsWindows) {
++  //   # Fix case when both the Windows and Linux builds of Node
++  //   # are installed in the same directory
++  //   $exe = ".exe"
++  // }
++  // if (Test-Path "$basedir/node") {
++  //   # Suport pipeline input
++  //   if ($MyInvocation.ExpectingInput) {
++  //     input | & "$basedir/node$exe" "$basedir/node_modules/npm/bin/npm-cli.js" $args
++  //   } else {
++  //     & "$basedir/node$exe" "$basedir/node_modules/npm/bin/npm-cli.js" $args
++  //   }
++  //   $ret=$LASTEXITCODE
++  // } else {
++  //   # Support pipeline input
++  //   if ($MyInvocation.ExpectingInput) {
++  //     $input | & "node$exe" "$basedir/node_modules/npm/bin/npm-cli.js" $args
++  //   } else {
++  //     & "node$exe" "$basedir/node_modules/npm/bin/npm-cli.js" $args
++  //   }
++  //   $ret=$LASTEXITCODE
++  // }
++  // exit $ret
++  let pwsh = '#!/usr/bin/env pwsh\n'
++           + '$basedir=Split-Path $MyInvocation.MyCommand.Definition -Parent\n'
++           + '\n'
++           + '$exe=""\n'
++           + 'if ($PSVersionTable.PSVersion -lt "6.0" -or $IsWindows) {\n'
++           + '  # Fix case when both the Windows and Linux builds of Node\n'
++           + '  # are installed in the same directory\n'
++           + '  $exe=".exe"\n'
++           + '}\n';
++  if (shLongProg) {
++    pwsh = pwsh
++         + '$ret=0\n'
++         + `if (Test-Path ${pwshLongProg}) {\n`
++         + '  # Support pipeline input\n'
++         + '  if ($MyInvocation.ExpectingInput) {\n'
++         + `    $input | & ${pwshLongProg} ${args} ${shTarget} $args\n`
++         + '  } else {\n'
++         + `    & ${pwshLongProg} ${args} ${shTarget} $args\n`
++         + '  }\n'
++         + '  $ret=$LASTEXITCODE\n'
++         + '} else {\n'
++         + '  # Support pipeline input\n'
++         + '  if ($MyInvocation.ExpectingInput) {\n'
++         + `    $input | & ${pwshProg} ${args} ${shTarget} $args\n`
++         + '  } else {\n'
++         + `    & ${pwshProg} ${args} ${shTarget} $args\n`
++         + '  }\n'
++         + '  $ret=$LASTEXITCODE\n'
++         + '}\n'
++         + 'exit $ret\n';
++  } else {
++    pwsh = pwsh
++         + '# Support pipeline input\n'
++         + 'if ($MyInvocation.ExpectingInput) {\n'
++         + `  $input | & ${pwshProg} ${args} ${shTarget} $args\n`
++         + '} else {\n'
++         + `  & ${pwshProg} ${args} ${shTarget} $args\n`
++         + '}\n'
++         + 'exit $LASTEXITCODE\n';
++  }
++
++  return Promise.all([
++    writeFile(to + '.ps1', pwsh, 'utf8'),
++    writeFile(to + '.cmd', cmd, 'utf8'),
++    writeFile(to, sh, 'utf8'),
++  ]).then(() => chmodShim(to))
++};
++
++const chmodShim = to => Promise.all([
++  chmod(to, 0o755),
++  chmod(to + '.cmd', 0o755),
++  chmod(to + '.ps1', 0o755),
++]);
++
++var lib$2 = cmdShim;
++cmdShim.ifExists = cmdShimIfExists;
++
++var cmdShim$1 = /*@__PURE__*/getDefaultExportFromCjs(lib$2);
++
++const readPackageJson = async (packagePath) => {
++  const packageJsonPath = path$1.join(packagePath, "package.json");
++  const packageJsonExists = await fsExists(packageJsonPath);
++  if (!packageJsonExists) {
++    throw new Error(`package.json not found in ${packagePath}`);
++  }
++  const packageJson = await readJsonFile(packageJsonPath);
++  if (!packageJson.name) {
++    throw new Error(`package.json must contain a name: ${packageJsonPath}`);
++  }
++  return packageJson;
++};
++
++const symlink = async (targetPath, symlinkPath, type) => {
++  const stats = await fs$1.lstat(symlinkPath).catch(() => null);
++  if (stats) {
++    if (stats.isSymbolicLink()) {
++      const symlinkRealpath = await fs$1.realpath(symlinkPath).catch(() => null);
++      if (targetPath === symlinkRealpath) {
++        return;
++      }
++    }
++    await fs$1.rm(symlinkPath, {
++      recursive: true
++    });
++  }
++  await fs$1.symlink(
++    targetPath,
++    symlinkPath,
++    type
++  );
++};
++const symlinkBinary = async (binaryPath, linkPath) => {
++  await symlink(binaryPath, linkPath);
++  await fs$1.chmod(linkPath, 493);
++};
++const hardlink = async (sourcePath, hardlinkPath) => {
++  if (await fsExists(hardlinkPath)) {
++    const [
++      existingStat,
++      sourceStat
++    ] = await Promise.all([
++      fs$1.stat(hardlinkPath),
++      fs$1.stat(sourcePath)
++    ]);
++    if (existingStat.ino === sourceStat.ino) {
++      return;
++    }
++    await fs$1.rm(hardlinkPath, {
++      recursive: true
++    });
++  }
++  await fs$1.link(sourcePath, hardlinkPath);
++};
++
++const linkBinaries = async (linkPackagePath, nodeModulesPath, {
++  name,
++  bin
++}, linkFunction) => {
++  if (!bin) {
++    return [];
++  }
++  if (name?.startsWith("@")) {
++    [, name] = name.split("/");
++  }
++  const binDirectoryPath = path$1.join(nodeModulesPath, ".bin");
++  await fs$1.mkdir(binDirectoryPath, {
++    recursive: true
++  });
++  if (typeof bin === "string") {
++    await linkFunction(
++      path$1.resolve(linkPackagePath, bin),
++      path$1.join(binDirectoryPath, name)
++    );
++    return;
++  }
++  await Promise.all(
++    Object.entries(bin).map(
++      async ([binaryName, binaryPath]) => await linkFunction(
++        path$1.resolve(linkPackagePath, binaryPath),
++        path$1.join(binDirectoryPath, binaryName)
++      )
++    )
++  );
++};
++
++const nodeModulesDirectory = "node_modules";
++const symlinkPackage = async (basePackagePath, linkPackagePath) => {
++  const absoluteLinkPackagePath = path$1.resolve(basePackagePath, linkPackagePath);
++  const packageJson = await readPackageJson(absoluteLinkPackagePath);
++  const nodeModulesPath = path$1.join(basePackagePath, nodeModulesDirectory);
++  const symlinkPath = path$1.join(nodeModulesPath, packageJson.name);
++  const symlinkDirectory = path$1.dirname(symlinkPath);
++  await fs$1.mkdir(symlinkDirectory, {
++    recursive: true
++  });
++  const targetPath = path$1.relative(symlinkDirectory, absoluteLinkPackagePath);
++  await symlink(
++    targetPath,
++    symlinkPath,
++    /**
++     * On Windows, 'dir' requires admin privileges so use 'junction' instead
++     *
++     * npm also uses junction:
++     * https://github.com/npm/cli/blob/v9.9.3/workspaces/arborist/lib/arborist/reify.js#L738
++     */
++    "junction"
++  );
++  await linkBinaries(
++    absoluteLinkPackagePath,
++    nodeModulesPath,
++    packageJson,
++    process.platform === "win32" ? cmdShim$1 : symlinkBinary
++  );
++  return {
++    name: packageJson.name,
++    path: symlinkPath,
++    target: targetPath
++  };
++};
++
++const linkPackage = async (basePackagePath, linkPackagePath, options) => {
++  const absoluteLinkPackagePath = path$1.resolve(basePackagePath, linkPackagePath);
++  const pathExists = await fsExists(absoluteLinkPackagePath);
++  if (!pathExists) {
++    console.warn(red("\u2716"), `Package path does not exist: ${linkPackagePath}`);
++    process.exitCode = 1;
++    return;
++  }
++  try {
++    const link = await symlinkPackage(
++      basePackagePath,
++      linkPackagePath
++    );
++    console.log(green("\u2714"), `Symlinked ${magenta(link.name)}:`, cyan(link.path), "\u2192", cyan(link.target));
++  } catch (error) {
++    console.warn(red("\u2716"), "Failed to symlink", cyan(linkPackagePath), "with error:", error.message);
++    process.exitCode = 1;
++    return;
++  }
++  if (options.deep) {
++    const config = await loadConfig(absoluteLinkPackagePath);
++    if (config) {
++      await linkFromConfig(
++        absoluteLinkPackagePath,
++        config,
++        options
++      );
++    }
++  }
++};
++const linkFromConfig = async (basePackagePath, config, options) => {
++  if (!config.packages) {
++    return;
++  }
++  const newOptions = {
++    deep: options.deep ?? config.deepLink ?? false
++  };
++  await Promise.all(
++    config.packages.map(
++      async (linkPackagePath) => await linkPackage(
++        basePackagePath,
++        linkPackagePath,
++        newOptions
++      )
++    )
++  );
++};
++
++var debounce$2 = {exports: {}};
++
++function debounce(function_, wait = 100, options = {}) {
++	if (typeof function_ !== 'function') {
++		throw new TypeError(`Expected the first parameter to be a function, got \`${typeof function_}\`.`);
++	}
++
++	if (wait < 0) {
++		throw new RangeError('`wait` must not be negative.');
++	}
++
++	// TODO: Deprecate the boolean parameter at some point.
++	const {immediate} = typeof options === 'boolean' ? {immediate: options} : options;
++
++	let storedContext;
++	let storedArguments;
++	let timeoutId;
++	let timestamp;
++	let result;
++
++	function run() {
++		const callContext = storedContext;
++		const callArguments = storedArguments;
++		storedContext = undefined;
++		storedArguments = undefined;
++		result = function_.apply(callContext, callArguments);
++		return result;
++	}
++
++	function later() {
++		const last = Date.now() - timestamp;
++
++		if (last < wait && last >= 0) {
++			timeoutId = setTimeout(later, wait - last);
++		} else {
++			timeoutId = undefined;
++
++			if (!immediate) {
++				result = run();
++			}
++		}
++	}
++
++	const debounced = function (...arguments_) {
++		if (storedContext && this !== storedContext) {
++			throw new Error('Debounced method called with different contexts.');
++		}
++
++		storedContext = this; // eslint-disable-line unicorn/no-this-assignment
++		storedArguments = arguments_;
++		timestamp = Date.now();
++
++		const callNow = immediate && !timeoutId;
++
++		if (!timeoutId) {
++			timeoutId = setTimeout(later, wait);
++		}
++
++		if (callNow) {
++			result = run();
++		}
++
++		return result;
++	};
++
++	debounced.clear = () => {
++		if (!timeoutId) {
++			return;
++		}
++
++		clearTimeout(timeoutId);
++		timeoutId = undefined;
++	};
++
++	debounced.flush = () => {
++		if (!timeoutId) {
++			return;
++		}
++
++		debounced.trigger();
++	};
++
++	debounced.trigger = () => {
++		result = run();
++
++		debounced.clear();
++	};
++
++	return debounced;
++}
++
++// Adds compatibility for ES modules
++debounce$2.exports.debounce = debounce;
++
++debounce$2.exports = debounce;
++
++var debounceExports = debounce$2.exports;
++var debounce$1 = /*@__PURE__*/getDefaultExportFromCjs(debounceExports);
++
++const pDebounce = (fn, wait, options = {}) => {
++	if (!Number.isFinite(wait)) {
++		throw new TypeError('Expected `wait` to be a finite number');
++	}
++
++	let leadingValue;
++	let timeout;
++	let resolveList = [];
++
++	return function (...arguments_) {
++		return new Promise(resolve => {
++			const shouldCallNow = options.before && !timeout;
++
++			clearTimeout(timeout);
++
++			timeout = setTimeout(() => {
++				timeout = null;
++
++				const result = options.before ? leadingValue : fn.apply(this, arguments_);
++
++				for (resolve of resolveList) {
++					resolve(result);
++				}
++
++				resolveList = [];
++			}, wait);
++
++			if (shouldCallNow) {
++				leadingValue = fn.apply(this, arguments_);
++				resolve(leadingValue);
++			} else {
++				resolveList.push(resolve);
++			}
++		});
++	};
++};
++
++pDebounce.promise = function_ => {
++	let currentPromise;
++
++	return async function (...arguments_) {
++		if (currentPromise) {
++			return currentPromise;
++		}
++
++		try {
++			currentPromise = function_.apply(this, arguments_);
++			return await currentPromise;
++		} finally {
++			currentPromise = undefined;
++		}
++	};
++};
++
++var globToRegexp = function (glob, opts) {
++  if (typeof glob !== 'string') {
++    throw new TypeError('Expected a string');
++  }
++
++  var str = String(glob);
++
++  // The regexp we are building, as a string.
++  var reStr = "";
++
++  // Whether we are matching so called "extended" globs (like bash) and should
++  // support single character matching, matching ranges of characters, group
++  // matching, etc.
++  var extended = opts ? !!opts.extended : false;
++
++  // When globstar is _false_ (default), '/foo/*' is translated a regexp like
++  // '^\/foo\/.*$' which will match any string beginning with '/foo/'
++  // When globstar is _true_, '/foo/*' is translated to regexp like
++  // '^\/foo\/[^/]*$' which will match any string beginning with '/foo/' BUT
++  // which does not have a '/' to the right of it.
++  // E.g. with '/foo/*' these will match: '/foo/bar', '/foo/bar.txt' but
++  // these will not '/foo/bar/baz', '/foo/bar/baz.txt'
++  // Lastely, when globstar is _true_, '/foo/**' is equivelant to '/foo/*' when
++  // globstar is _false_
++  var globstar = opts ? !!opts.globstar : false;
++
++  // If we are doing extended matching, this boolean is true when we are inside
++  // a group (eg {*.html,*.js}), and false otherwise.
++  var inGroup = false;
++
++  // RegExp flags (eg "i" ) to pass in to RegExp constructor.
++  var flags = opts && typeof( opts.flags ) === "string" ? opts.flags : "";
++
++  var c;
++  for (var i = 0, len = str.length; i < len; i++) {
++    c = str[i];
++
++    switch (c) {
++    case "/":
++    case "$":
++    case "^":
++    case "+":
++    case ".":
++    case "(":
++    case ")":
++    case "=":
++    case "!":
++    case "|":
++      reStr += "\\" + c;
++      break;
++
++    case "?":
++      if (extended) {
++        reStr += ".";
++	    break;
++      }
++
++    case "[":
++    case "]":
++      if (extended) {
++        reStr += c;
++	    break;
++      }
++
++    case "{":
++      if (extended) {
++        inGroup = true;
++	    reStr += "(";
++	    break;
++      }
++
++    case "}":
++      if (extended) {
++        inGroup = false;
++	    reStr += ")";
++	    break;
++      }
++
++    case ",":
++      if (inGroup) {
++        reStr += "|";
++	    break;
++      }
++      reStr += "\\" + c;
++      break;
++
++    case "*":
++      // Move over all consecutive "*"'s.
++      // Also store the previous and next characters
++      var prevChar = str[i - 1];
++      var starCount = 1;
++      while(str[i + 1] === "*") {
++        starCount++;
++        i++;
++      }
++      var nextChar = str[i + 1];
++
++      if (!globstar) {
++        // globstar is disabled, so treat any number of "*" as one
++        reStr += ".*";
++      } else {
++        // globstar is enabled, so determine if this is a globstar segment
++        var isGlobstar = starCount > 1                      // multiple "*"'s
++          && (prevChar === "/" || prevChar === undefined)   // from the start of the segment
++          && (nextChar === "/" || nextChar === undefined);   // to the end of the segment
++
++        if (isGlobstar) {
++          // it's a globstar, so match zero or more path segments
++          reStr += "((?:[^/]*(?:\/|$))*)";
++          i++; // move over the "/"
++        } else {
++          // it's not a globstar, so only match one path segment
++          reStr += "([^/]*)";
++        }
++      }
++      break;
++
++    default:
++      reStr += c;
++    }
+   }
+-  $ret=$LASTEXITCODE
+-} else {
+-  # Support pipeline input
+-  if ($MyInvocation.ExpectingInput) {
+-    $input | & ${f} ${D} ${i} $args
++
++  // When regexp 'g' flag is specified don't
++  // constrain the regular expression with ^ & $
++  if (!flags || !~flags.indexOf('g')) {
++    reStr = "^" + reStr + "$";
++  }
++
++  return new RegExp(reStr, flags);
++};
++
++var globToRegexp$1 = /*@__PURE__*/getDefaultExportFromCjs(globToRegexp);
++
++var commonjs = {};
++
++var balancedMatch = balanced$1;
++function balanced$1(a, b, str) {
++  if (a instanceof RegExp) a = maybeMatch(a, str);
++  if (b instanceof RegExp) b = maybeMatch(b, str);
++
++  var r = range(a, b, str);
++
++  return r && {
++    start: r[0],
++    end: r[1],
++    pre: str.slice(0, r[0]),
++    body: str.slice(r[0] + a.length, r[1]),
++    post: str.slice(r[1] + b.length)
++  };
++}
++
++function maybeMatch(reg, str) {
++  var m = str.match(reg);
++  return m ? m[0] : null;
++}
++
++balanced$1.range = range;
++function range(a, b, str) {
++  var begs, beg, left, right, result;
++  var ai = str.indexOf(a);
++  var bi = str.indexOf(b, ai + 1);
++  var i = ai;
++
++  if (ai >= 0 && bi > 0) {
++    if(a===b) {
++      return [ai, bi];
++    }
++    begs = [];
++    left = str.length;
++
++    while (i >= 0 && !result) {
++      if (i == ai) {
++        begs.push(i);
++        ai = str.indexOf(a, i + 1);
++      } else if (begs.length == 1) {
++        result = [ begs.pop(), bi ];
++      } else {
++        beg = begs.pop();
++        if (beg < left) {
++          left = beg;
++          right = bi;
++        }
++
++        bi = str.indexOf(b, i + 1);
++      }
++
++      i = ai < bi && ai >= 0 ? ai : bi;
++    }
++
++    if (begs.length) {
++      result = [ left, right ];
++    }
++  }
++
++  return result;
++}
++
++var balanced = balancedMatch;
++
++var braceExpansion = expandTop;
++
++var escSlash = '\0SLASH'+Math.random()+'\0';
++var escOpen = '\0OPEN'+Math.random()+'\0';
++var escClose = '\0CLOSE'+Math.random()+'\0';
++var escComma = '\0COMMA'+Math.random()+'\0';
++var escPeriod = '\0PERIOD'+Math.random()+'\0';
++
++function numeric(str) {
++  return parseInt(str, 10) == str
++    ? parseInt(str, 10)
++    : str.charCodeAt(0);
++}
++
++function escapeBraces(str) {
++  return str.split('\\\\').join(escSlash)
++            .split('\\{').join(escOpen)
++            .split('\\}').join(escClose)
++            .split('\\,').join(escComma)
++            .split('\\.').join(escPeriod);
++}
++
++function unescapeBraces(str) {
++  return str.split(escSlash).join('\\')
++            .split(escOpen).join('{')
++            .split(escClose).join('}')
++            .split(escComma).join(',')
++            .split(escPeriod).join('.');
++}
++
++
++// Basically just str.split(","), but handling cases
++// where we have nested braced sections, which should be
++// treated as individual members, like {a,{b,c},d}
++function parseCommaParts(str) {
++  if (!str)
++    return [''];
++
++  var parts = [];
++  var m = balanced('{', '}', str);
++
++  if (!m)
++    return str.split(',');
++
++  var pre = m.pre;
++  var body = m.body;
++  var post = m.post;
++  var p = pre.split(',');
++
++  p[p.length-1] += '{' + body + '}';
++  var postParts = parseCommaParts(post);
++  if (post.length) {
++    p[p.length-1] += postParts.shift();
++    p.push.apply(p, postParts);
++  }
++
++  parts.push.apply(parts, p);
++
++  return parts;
++}
++
++function expandTop(str) {
++  if (!str)
++    return [];
++
++  // I don't know why Bash 4.3 does this, but it does.
++  // Anything starting with {} will have the first two bytes preserved
++  // but *only* at the top level, so {},a}b will not expand to anything,
++  // but a{},b}c will be expanded to [a}c,abc].
++  // One could argue that this is a bug in Bash, but since the goal of
++  // this module is to match Bash's rules, we escape a leading {}
++  if (str.substr(0, 2) === '{}') {
++    str = '\\{\\}' + str.substr(2);
++  }
++
++  return expand(escapeBraces(str), true).map(unescapeBraces);
++}
++
++function embrace(str) {
++  return '{' + str + '}';
++}
++function isPadded(el) {
++  return /^-?0\d/.test(el);
++}
++
++function lte(i, y) {
++  return i <= y;
++}
++function gte(i, y) {
++  return i >= y;
++}
++
++function expand(str, isTop) {
++  var expansions = [];
++
++  var m = balanced('{', '}', str);
++  if (!m) return [str];
++
++  // no need to expand pre, since it is guaranteed to be free of brace-sets
++  var pre = m.pre;
++  var post = m.post.length
++    ? expand(m.post, false)
++    : [''];
++
++  if (/\$$/.test(m.pre)) {    
++    for (var k = 0; k < post.length; k++) {
++      var expansion = pre+ '{' + m.body + '}' + post[k];
++      expansions.push(expansion);
++    }
+   } else {
+-    & ${f} ${D} ${i} $args
+-  }
+-  $ret=$LASTEXITCODE
+-}
+-exit $ret
+-`:w=w+`# Support pipeline input
+-if ($MyInvocation.ExpectingInput) {
+-  $input | & ${f} ${D} ${i} $args
+-} else {
+-  & ${f} ${D} ${i} $args
+-}
+-exit $LASTEXITCODE
+-`,Promise.all([Ue(e+".ps1",w,"utf8"),Ue(e+".cmd",d,"utf8"),Ue(e,m,"utf8")]).then(()=>Bn(e))},Bn=u=>Promise.all([Ve(u,493),Ve(u+".cmd",493),Ve(u+".ps1",493)]);var wn=He;He.ifExists=En;var yn=Nu(wn);const qu=async u=>{const e=A.join(u,"package.json");if(!await oe(e))throw new Error(`package.json not found in ${u}`);const D=await Ru(e);if(!D.name)throw new Error(`package.json must contain a name: ${e}`);return D},zu=async(u,e,t)=>{const D=await O.lstat(e).catch(()=>null);if(D){if(D.isSymbolicLink()){const n=await O.realpath(e).catch(()=>null);if(u===n)return}await O.rm(e,{recursive:!0})}await O.symlink(u,e,t)},$n=async(u,e)=>{await zu(u,e),await O.chmod(e,493)},An=async(u,e)=>{await oe(e)&&await O.rm(e,{recursive:!0}),await O.link(u,e)},bn=async(u,e,{name:t,bin:D},n)=>{if(!D)return[];t?.startsWith("@")&&([,t]=t.split("/"));const i=A.join(e,".bin");if(await O.mkdir(i,{recursive:!0}),typeof D=="string"){await n(A.resolve(u,D),A.join(i,t));return}await Promise.all(Object.entries(D).map(async([s,o])=>await n(A.resolve(u,o),A.join(i,s))))},vn="node_modules",Sn=async(u,e)=>{const t=A.resolve(u,e),D=await qu(t),n=A.join(u,vn),i=A.join(n,D.name),s=A.dirname(i);await O.mkdir(s,{recursive:!0});const o=A.relative(s,t);return await zu(o,i,"junction"),await bn(t,n,D,process.platform==="win32"?yn:$n),{name:D.name,path:i,target:o}},Ju=async(u,e,t)=>{const D=A.resolve(u,e);if(!await oe(D)){console.warn(xu("\u2716"),`Package path does not exist: ${e}`),process.exitCode=1;return}try{const i=await Sn(u,e);console.log(Tu("\u2714"),`Symlinked ${Je(i.name)}:`,re(i.path),"\u2192",re(i.target))}catch(i){console.warn(xu("\u2716"),"Failed to symlink",re(e),"with error:",i.message),process.exitCode=1;return}if(t.deep){const i=await Lu(D);i&&await Vu(D,i,t)}},Vu=async(u,e,t)=>{if(!e.packages)return;const D={deep:t.deep??e.deepLink??!1};await Promise.all(e.packages.map(async n=>await Ju(u,n,D)))};var Uu={},On=Zu;function Zu(u,e,t){u instanceof RegExp&&(u=Hu(u,t)),e instanceof RegExp&&(e=Hu(e,t));var D=Xu(u,e,t);return D&&{start:D[0],end:D[1],pre:t.slice(0,D[0]),body:t.slice(D[0]+u.length,D[1]),post:t.slice(D[1]+e.length)}}function Hu(u,e){var t=e.match(u);return t?t[0]:null}Zu.range=Xu;function Xu(u,e,t){var D,n,i,s,o,a=t.indexOf(u),h=t.indexOf(e,a+1),f=a;if(a>=0&&h>0){if(u===e)return[a,h];for(D=[],i=t.length;f>=0&&!o;)f==a?(D.push(f),a=t.indexOf(u,f+1)):D.length==1?o=[D.pop(),h]:(n=D.pop(),n<i&&(i=n,s=h),h=t.indexOf(e,f+1)),f=a<h&&a>=0?a:h;D.length&&(o=[i,s])}return o}var Yu=On,kn=Tn,Ku="\0SLASH"+Math.random()+"\0",Qu="\0OPEN"+Math.random()+"\0",Ye="\0CLOSE"+Math.random()+"\0",et="\0COMMA"+Math.random()+"\0",ut="\0PERIOD"+Math.random()+"\0";function Ke(u){return parseInt(u,10)==u?parseInt(u,10):u.charCodeAt(0)}function jn(u){return u.split("\\\\").join(Ku).split("\\{").join(Qu).split("\\}").join(Ye).split("\\,").join(et).split("\\.").join(ut)}function xn(u){return u.split(Ku).join("\\").split(Qu).join("{").split(Ye).join("}").split(et).join(",").split(ut).join(".")}function tt(u){if(!u)return[""];var e=[],t=Yu("{","}",u);if(!t)return u.split(",");var D=t.pre,n=t.body,i=t.post,s=D.split(",");s[s.length-1]+="{"+n+"}";var o=tt(i);return i.length&&(s[s.length-1]+=o.shift(),s.push.apply(s,o)),e.push.apply(e,s),e}function Tn(u){return u?(u.substr(0,2)==="{}"&&(u="\\{\\}"+u.substr(2)),ae(jn(u),!0).map(xn)):[]}function Rn(u){return"{"+u+"}"}function Pn(u){return/^-?0\d/.test(u)}function Ln(u,e){return u<=e}function Mn(u,e){return u>=e}function ae(u,e){var t=[],D=Yu("{","}",u);if(!D)return[u];var n=D.pre,i=D.post.length?ae(D.post,!1):[""];if(/\$$/.test(D.pre))for(var s=0;s<i.length;s++){var o=n+"{"+D.body+"}"+i[s];t.push(o)}else{var a=/^-?\d+\.\.-?\d+(?:\.\.-?\d+)?$/.test(D.body),h=/^[a-zA-Z]\.\.[a-zA-Z](?:\.\.-?\d+)?$/.test(D.body),f=a||h,g=D.body.indexOf(",")>=0;if(!f&&!g)return D.post.match(/,.*\}/)?(u=D.pre+"{"+D.body+Ye+D.post,ae(u)):[u];var F;if(f)F=D.body.split(/\.\./);else if(F=tt(D.body),F.length===1&&(F=ae(F[0],!1).map(Rn),F.length===1))return i.map(function(Ee){return D.pre+F[0]+Ee});var d;if(f){var m=Ke(F[0]),w=Ke(F[1]),S=Math.max(F[0].length,F[1].length),R=F.length==3?Math.abs(Ke(F[2])):1,M=Ln,G=w<m;G&&(R*=-1,M=Mn);var Te=F.some(Pn);d=[];for(var J=m;M(J,w);J+=R){var P;if(h)P=String.fromCharCode(J),P==="\\"&&(P="");else if(P=String(J),Te){var de=S-P.length;if(de>0){var Ce=new Array(de+1).join("0");J<0?P="-"+Ce+P.slice(1):P=Ce+P}}d.push(P)}}else{d=[];for(var _=0;_<F.length;_++)d.push.apply(d,ae(F[_],!1))}for(var _=0;_<d.length;_++)for(var s=0;s<i.length;s++){var o=n+d[_]+i[s];(!e||f||o)&&t.push(o)}}return t}var Ae={};Object.defineProperty(Ae,"__esModule",{value:!0}),Ae.assertValidPattern=void 0;const Nn=1024*64,In=u=>{if(typeof u!="string")throw new TypeError("invalid pattern");if(u.length>Nn)throw new TypeError("pattern is too long")};Ae.assertValidPattern=In;var le={},be={};Object.defineProperty(be,"__esModule",{value:!0}),be.parseClass=void 0;const _n={"[:alnum:]":["\\p{L}\\p{Nl}\\p{Nd}",!0],"[:alpha:]":["\\p{L}\\p{Nl}",!0],"[:ascii:]":["\\x00-\\x7f",!1],"[:blank:]":["\\p{Zs}\\t",!0],"[:cntrl:]":["\\p{Cc}",!0],"[:digit:]":["\\p{Nd}",!0],"[:graph:]":["\\p{Z}\\p{C}",!0,!0],"[:lower:]":["\\p{Ll}",!0],"[:print:]":["\\p{C}",!0],"[:punct:]":["\\p{P}",!0],"[:space:]":["\\p{Z}\\t\\r\\n\\v\\f",!0],"[:upper:]":["\\p{Lu}",!0],"[:word:]":["\\p{L}\\p{Nl}\\p{Nd}\\p{Pc}",!0],"[:xdigit:]":["A-Fa-f0-9",!1]},ce=u=>u.replace(/[[\]\\-]/g,"\\$&"),Wn=u=>u.replace(/[-[\]{}()*+?.,\\^$|#\s]/g,"\\$&"),Dt=u=>u.join(""),Gn=(u,e)=>{const t=e;if(u.charAt(t)!=="[")throw new Error("not in a brace expression");const D=[],n=[];let i=t+1,s=!1,o=!1,a=!1,h=!1,f=t,g="";e:for(;i<u.length;){const w=u.charAt(i);if((w==="!"||w==="^")&&i===t+1){h=!0,i++;continue}if(w==="]"&&s&&!a){f=i+1;break}if(s=!0,w==="\\"&&!a){a=!0,i++;continue}if(w==="["&&!a){for(const[S,[R,M,G]]of Object.entries(_n))if(u.startsWith(S,i)){if(g)return["$.",!1,u.length-t,!0];i+=S.length,G?n.push(R):D.push(R),o=o||M;continue e}}if(a=!1,g){w>g?D.push(ce(g)+"-"+ce(w)):w===g&&D.push(ce(w)),g="",i++;continue}if(u.startsWith("-]",i+1)){D.push(ce(w+"-")),i+=2;continue}if(u.startsWith("-",i+1)){g=w,i+=2;continue}D.push(ce(w)),i++}if(f<i)return["",!1,0,!1];if(!D.length&&!n.length)return["$.",!1,u.length-t,!0];if(n.length===0&&D.length===1&&/^\\?.$/.test(D[0])&&!h){const w=D[0].length===2?D[0].slice(-1):D[0];return[Wn(w),!1,f-t,!1]}const F="["+(h?"^":"")+Dt(D)+"]",d="["+(h?"":"^")+Dt(n)+"]";return[D.length&&n.length?"("+F+"|"+d+")":D.length?F:d,o,f-t,!0]};be.parseClass=Gn;var Y={};Object.defineProperty(Y,"__esModule",{value:!0}),Y.unescape=void 0;const qn=(u,{windowsPathsNoEscape:e=!1}={})=>e?u.replace(/\[([^\/\\])\]/g,"$1"):u.replace(/((?!\\).|^)\[([^\/\\])\]/g,"$1$2").replace(/\\([^\/])/g,"$1");Y.unescape=qn,Object.defineProperty(le,"__esModule",{value:!0}),le.AST=void 0;const zn=be,ve=Y,Jn=new Set(["!","?","+","*","@"]),nt=u=>Jn.has(u),Vn="(?!(?:^|/)\\.\\.?(?:$|/))",Se="(?!\\.)",Un=new Set(["[","."]),Zn=new Set(["..","."]),Hn=new Set("().*{}+?[]^$\\!"),Xn=u=>u.replace(/[-[\]{}()*+?.,\\^$|#\s]/g,"\\$&"),Qe="[^/]",it=Qe+"*?",st=Qe+"+?";class T{type;#t;#D;#n=!1;#e=[];#u;#s;#o;#r=!1;#i;#a;#c=!1;constructor(e,t,D={}){this.type=e,e&&(this.#D=!0),this.#u=t,this.#t=this.#u?this.#u.#t:this,this.#i=this.#t===this?D:this.#t.#i,this.#o=this.#t===this?[]:this.#t.#o,e==="!"&&!this.#t.#r&&this.#o.push(this),this.#s=this.#u?this.#u.#e.length:0}get hasMagic(){if(this.#D!==void 0)return this.#D;for(const e of this.#e)if(typeof e!="string"&&(e.type||e.hasMagic))return this.#D=!0;return this.#D}toString(){return this.#a!==void 0?this.#a:this.type?this.#a=this.type+"("+this.#e.map(e=>String(e)).join("|")+")":this.#a=this.#e.map(e=>String(e)).join("")}#p(){if(this!==this.#t)throw new Error("should only call on root");if(this.#r)return this;this.toString(),this.#r=!0;let e;for(;e=this.#o.pop();){if(e.type!=="!")continue;let t=e,D=t.#u;for(;D;){for(let n=t.#s+1;!D.type&&n<D.#e.length;n++)for(const i of e.#e){if(typeof i=="string")throw new Error("string part in extglob AST??");i.copyIn(D.#e[n])}t=D,D=t.#u}}return this}push(...e){for(const t of e)if(t!==""){if(typeof t!="string"&&!(t instanceof T&&t.#u===this))throw new Error("invalid part: "+t);this.#e.push(t)}}toJSON(){const e=this.type===null?this.#e.slice().map(t=>typeof t=="string"?t:t.toJSON()):[this.type,...this.#e.map(t=>t.toJSON())];return this.isStart()&&!this.type&&e.unshift([]),this.isEnd()&&(this===this.#t||this.#t.#r&&this.#u?.type==="!")&&e.push({}),e}isStart(){if(this.#t===this)return!0;if(!this.#u?.isStart())return!1;if(this.#s===0)return!0;const e=this.#u;for(let t=0;t<this.#s;t++){const D=e.#e[t];if(!(D instanceof T&&D.type==="!"))return!1}return!0}isEnd(){if(this.#t===this||this.#u?.type==="!")return!0;if(!this.#u?.isEnd())return!1;if(!this.type)return this.#u?.isEnd();const e=this.#u?this.#u.#e.length:0;return this.#s===e-1}copyIn(e){typeof e=="string"?this.push(e):this.push(e.clone(this))}clone(e){const t=new T(this.type,e);for(const D of this.#e)t.copyIn(D);return t}static#l(e,t,D,n){let i=!1,s=!1,o=-1,a=!1;if(t.type===null){let d=D,m="";for(;d<e.length;){const w=e.charAt(d++);if(i||w==="\\"){i=!i,m+=w;continue}if(s){d===o+1?(w==="^"||w==="!")&&(a=!0):w==="]"&&!(d===o+2&&a)&&(s=!1),m+=w;continue}else if(w==="["){s=!0,o=d,a=!1,m+=w;continue}if(!n.noext&&nt(w)&&e.charAt(d)==="("){t.push(m),m="";const S=new T(w,t);d=T.#l(e,S,d,n),t.push(S);continue}m+=w}return t.push(m),d}let h=D+1,f=new T(null,t);const g=[];let F="";for(;h<e.length;){const d=e.charAt(h++);if(i||d==="\\"){i=!i,F+=d;continue}if(s){h===o+1?(d==="^"||d==="!")&&(a=!0):d==="]"&&!(h===o+2&&a)&&(s=!1),F+=d;continue}else if(d==="["){s=!0,o=h,a=!1,F+=d;continue}if(nt(d)&&e.charAt(h)==="("){f.push(F),F="";const m=new T(d,f);f.push(m),h=T.#l(e,m,h,n);continue}if(d==="|"){f.push(F),F="",g.push(f),f=new T(null,t);continue}if(d===")")return F===""&&t.#e.length===0&&(t.#c=!0),f.push(F),F="",t.push(...g,f),h;F+=d}return t.type=null,t.#D=void 0,t.#e=[e.substring(D-1)],h}static fromGlob(e,t={}){const D=new T(null,void 0,t);return T.#l(e,D,0,t),D}toMMPattern(){if(this!==this.#t)return this.#t.toMMPattern();const e=this.toString(),[t,D,n,i]=this.toRegExpSource();if(!(n||this.#D||this.#i.nocase&&!this.#i.nocaseMagicOnly&&e.toUpperCase()!==e.toLowerCase()))return D;const o=(this.#i.nocase?"i":"")+(i?"u":"");return Object.assign(new RegExp(`^${t}$`,o),{_src:t,_glob:e})}toRegExpSource(e){const t=e??!!this.#i.dot;if(this.#t===this&&this.#p(),!this.type){const a=this.isStart()&&this.isEnd(),h=this.#e.map(d=>{const[m,w,S,R]=typeof d=="string"?T.#f(d,this.#D,a):d.toRegExpSource(e);return this.#D=this.#D||S,this.#n=this.#n||R,m}).join("");let f="";if(this.isStart()&&typeof this.#e[0]=="string"&&!(this.#e.length===1&&Zn.has(this.#e[0]))){const m=Un,w=t&&m.has(h.charAt(0))||h.startsWith("\\.")&&m.has(h.charAt(2))||h.startsWith("\\.\\.")&&m.has(h.charAt(4)),S=!t&&!e&&m.has(h.charAt(0));f=w?Vn:S?Se:""}let g="";return this.isEnd()&&this.#t.#r&&this.#u?.type==="!"&&(g="(?:$|\\/)"),[f+h+g,(0,ve.unescape)(h),this.#D=!!this.#D,this.#n]}const D=this.type==="*"||this.type==="+",n=this.type==="!"?"(?:(?!(?:":"(?:";let i=this.#h(t);if(this.isStart()&&this.isEnd()&&!i&&this.type!=="!"){const a=this.toString();return this.#e=[a],this.type=null,this.#D=void 0,[a,(0,ve.unescape)(this.toString()),!1,!1]}let s=!D||e||t||!Se?"":this.#h(!0);s===i&&(s=""),s&&(i=`(?:${i})(?:${s})*?`);let o="";if(this.type==="!"&&this.#c)o=(this.isStart()&&!t?Se:"")+st;else{const a=this.type==="!"?"))"+(this.isStart()&&!t&&!e?Se:"")+it+")":this.type==="@"?")":this.type==="?"?")?":this.type==="+"&&s?")":this.type==="*"&&s?")?":`)${this.type}`;o=n+i+a}return[o,(0,ve.unescape)(i),this.#D=!!this.#D,this.#n]}#h(e){return this.#e.map(t=>{if(typeof t=="string")throw new Error("string type in extglob ast??");const[D,n,i,s]=t.toRegExpSource(e);return this.#n=this.#n||s,D}).filter(t=>!(this.isStart()&&this.isEnd())||!!t).join("|")}static#f(e,t,D=!1){let n=!1,i="",s=!1;for(let o=0;o<e.length;o++){const a=e.charAt(o);if(n){n=!1,i+=(Hn.has(a)?"\\":"")+a;continue}if(a==="\\"){o===e.length-1?i+="\\\\":n=!0;continue}if(a==="["){const[h,f,g,F]=(0,zn.parseClass)(e,o);if(g){i+=h,s=s||f,o+=g-1,t=t||F;continue}}if(a==="*"){D&&e==="*"?i+=st:i+=it,t=!0;continue}if(a==="?"){i+=Qe,t=!0;continue}i+=Xn(a)}return[i,(0,ve.unescape)(e),!!t,s]}}le.AST=T;var he={};Object.defineProperty(he,"__esModule",{value:!0}),he.escape=void 0;const Yn=(u,{windowsPathsNoEscape:e=!1}={})=>e?u.replace(/[?*()[\]]/g,"[$&]"):u.replace(/[?*()[\]\\]/g,"\\$&");he.escape=Yn,function(u){var e=Mu&&Mu.__importDefault||function(C){return C&&C.__esModule?C:{default:C}};Object.defineProperty(u,"__esModule",{value:!0}),u.unescape=u.escape=u.AST=u.Minimatch=u.match=u.makeRe=u.braceExpand=u.defaults=u.filter=u.GLOBSTAR=u.sep=u.minimatch=void 0;const t=e(kn),D=Ae,n=le,i=he,s=Y,o=(C,r,l={})=>((0,D.assertValidPattern)(r),!l.nocomment&&r.charAt(0)==="#"?!1:new ue(r,l).match(C));u.minimatch=o;const a=/^\*+([^+@!?\*\[\(]*)$/,h=C=>r=>!r.startsWith(".")&&r.endsWith(C),f=C=>r=>r.endsWith(C),g=C=>(C=C.toLowerCase(),r=>!r.startsWith(".")&&r.toLowerCase().endsWith(C)),F=C=>(C=C.toLowerCase(),r=>r.toLowerCase().endsWith(C)),d=/^\*+\.\*+$/,m=C=>!C.startsWith(".")&&C.includes("."),w=C=>C!=="."&&C!==".."&&C.includes("."),S=/^\.\*+$/,R=C=>C!=="."&&C!==".."&&C.startsWith("."),M=/^\*+$/,G=C=>C.length!==0&&!C.startsWith("."),Te=C=>C.length!==0&&C!=="."&&C!=="..",J=/^\?+([^+@!?\*\[\(]*)?$/,P=([C,r=""])=>{const l=Ee([C]);return r?(r=r.toLowerCase(),c=>l(c)&&c.toLowerCase().endsWith(r)):l},de=([C,r=""])=>{const l=uu([C]);return r?(r=r.toLowerCase(),c=>l(c)&&c.toLowerCase().endsWith(r)):l},Ce=([C,r=""])=>{const l=uu([C]);return r?c=>l(c)&&c.endsWith(r):l},_=([C,r=""])=>{const l=Ee([C]);return r?c=>l(c)&&c.endsWith(r):l},Ee=([C])=>{const r=C.length;return l=>l.length===r&&!l.startsWith(".")},uu=([C])=>{const r=C.length;return l=>l.length===r&&l!=="."&&l!==".."},tu=typeof process=="object"&&process?typeof process.env=="object"&&process.env&&process.env.__MINIMATCH_TESTING_PLATFORM__||process.platform:"posix",Du={win32:{sep:"\\"},posix:{sep:"/"}};u.sep=tu==="win32"?Du.win32.sep:Du.posix.sep,u.minimatch.sep=u.sep,u.GLOBSTAR=Symbol("globstar **"),u.minimatch.GLOBSTAR=u.GLOBSTAR;const ft="[^/]"+"*?",Ft="(?:(?!(?:\\/|^)(?:\\.{1,2})($|\\/)).)*?",dt="(?:(?!(?:\\/|^)\\.).)*?",Ct=(C,r={})=>l=>(0,u.minimatch)(l,C,r);u.filter=Ct,u.minimatch.filter=u.filter;const L=(C,r={})=>Object.assign({},C,r),Et=C=>{if(!C||typeof C!="object"||!Object.keys(C).length)return u.minimatch;const r=u.minimatch;return Object.assign((c,p,E={})=>r(c,p,L(C,E)),{Minimatch:class extends r.Minimatch{constructor(p,E={}){super(p,L(C,E))}static defaults(p){return r.defaults(L(C,p)).Minimatch}},AST:class extends r.AST{constructor(p,E,B={}){super(p,E,L(C,B))}static fromGlob(p,E={}){return r.AST.fromGlob(p,L(C,E))}},unescape:(c,p={})=>r.unescape(c,L(C,p)),escape:(c,p={})=>r.escape(c,L(C,p)),filter:(c,p={})=>r.filter(c,L(C,p)),defaults:c=>r.defaults(L(C,c)),makeRe:(c,p={})=>r.makeRe(c,L(C,p)),braceExpand:(c,p={})=>r.braceExpand(c,L(C,p)),match:(c,p,E={})=>r.match(c,p,L(C,E)),sep:r.sep,GLOBSTAR:u.GLOBSTAR})};u.defaults=Et,u.minimatch.defaults=u.defaults;const gt=(C,r={})=>((0,D.assertValidPattern)(C),r.nobrace||!/\{(?:(?!\{).)*\}/.test(C)?[C]:(0,t.default)(C));u.braceExpand=gt,u.minimatch.braceExpand=u.braceExpand;const mt=(C,r={})=>new ue(C,r).makeRe();u.makeRe=mt,u.minimatch.makeRe=u.makeRe;const Bt=(C,r,l={})=>{const c=new ue(r,l);return C=C.filter(p=>c.match(p)),c.options.nonull&&!C.length&&C.push(r),C};u.match=Bt,u.minimatch.match=u.match;const nu=/[?*]|[+@!]\(.*?\)|\[|\]/,wt=C=>C.replace(/[-[\]{}()*+?.,\\^$|#\s]/g,"\\$&");class ue{options;set;pattern;windowsPathsNoEscape;nonegate;negate;comment;empty;preserveMultipleSlashes;partial;globSet;globParts;nocase;isWindows;platform;windowsNoMagicRoot;regexp;constructor(r,l={}){(0,D.assertValidPattern)(r),l=l||{},this.options=l,this.pattern=r,this.platform=l.platform||tu,this.isWindows=this.platform==="win32",this.windowsPathsNoEscape=!!l.windowsPathsNoEscape||l.allowWindowsEscape===!1,this.windowsPathsNoEscape&&(this.pattern=this.pattern.replace(/\\/g,"/")),this.preserveMultipleSlashes=!!l.preserveMultipleSlashes,this.regexp=null,this.negate=!1,this.nonegate=!!l.nonegate,this.comment=!1,this.empty=!1,this.partial=!!l.partial,this.nocase=!!this.options.nocase,this.windowsNoMagicRoot=l.windowsNoMagicRoot!==void 0?l.windowsNoMagicRoot:!!(this.isWindows&&this.nocase),this.globSet=[],this.globParts=[],this.set=[],this.make()}hasMagic(){if(this.options.magicalBraces&&this.set.length>1)return!0;for(const r of this.set)for(const l of r)if(typeof l!="string")return!0;return!1}debug(...r){}make(){const r=this.pattern,l=this.options;if(!l.nocomment&&r.charAt(0)==="#"){this.comment=!0;return}if(!r){this.empty=!0;return}this.parseNegate(),this.globSet=[...new Set(this.braceExpand())],l.debug&&(this.debug=(...E)=>console.error(...E)),this.debug(this.pattern,this.globSet);const c=this.globSet.map(E=>this.slashSplit(E));this.globParts=this.preprocess(c),this.debug(this.pattern,this.globParts);let p=this.globParts.map((E,B,y)=>{if(this.isWindows&&this.windowsNoMagicRoot){const b=E[0]===""&&E[1]===""&&(E[2]==="?"||!nu.test(E[2]))&&!nu.test(E[3]),v=/^[a-z]:/i.test(E[0]);if(b)return[...E.slice(0,4),...E.slice(4).map($=>this.parse($))];if(v)return[E[0],...E.slice(1).map($=>this.parse($))]}return E.map(b=>this.parse(b))});if(this.debug(this.pattern,p),this.set=p.filter(E=>E.indexOf(!1)===-1),this.isWindows)for(let E=0;E<this.set.length;E++){const B=this.set[E];B[0]===""&&B[1]===""&&this.globParts[E][2]==="?"&&typeof B[3]=="string"&&/^[a-z]:$/i.test(B[3])&&(B[2]="?")}this.debug(this.pattern,this.set)}preprocess(r){if(this.options.noglobstar)for(let c=0;c<r.length;c++)for(let p=0;p<r[c].length;p++)r[c][p]==="**"&&(r[c][p]="*");const{optimizationLevel:l=1}=this.options;return l>=2?(r=this.firstPhasePreProcess(r),r=this.secondPhasePreProcess(r)):l>=1?r=this.levelOneOptimize(r):r=this.adjascentGlobstarOptimize(r),r}adjascentGlobstarOptimize(r){return r.map(l=>{let c=-1;for(;(c=l.indexOf("**",c+1))!==-1;){let p=c;for(;l[p+1]==="**";)p++;p!==c&&l.splice(c,p-c)}return l})}levelOneOptimize(r){return r.map(l=>(l=l.reduce((c,p)=>{const E=c[c.length-1];return p==="**"&&E==="**"?c:p===".."&&E&&E!==".."&&E!=="."&&E!=="**"?(c.pop(),c):(c.push(p),c)},[]),l.length===0?[""]:l))}levelTwoFileOptimize(r){Array.isArray(r)||(r=this.slashSplit(r));let l=!1;do{if(l=!1,!this.preserveMultipleSlashes){for(let p=1;p<r.length-1;p++){const E=r[p];p===1&&E===""&&r[0]===""||(E==="."||E==="")&&(l=!0,r.splice(p,1),p--)}r[0]==="."&&r.length===2&&(r[1]==="."||r[1]==="")&&(l=!0,r.pop())}let c=0;for(;(c=r.indexOf("..",c+1))!==-1;){const p=r[c-1];p&&p!=="."&&p!==".."&&p!=="**"&&(l=!0,r.splice(c-1,2),c-=2)}}while(l);return r.length===0?[""]:r}firstPhasePreProcess(r){let l=!1;do{l=!1;for(let c of r){let p=-1;for(;(p=c.indexOf("**",p+1))!==-1;){let B=p;for(;c[B+1]==="**";)B++;B>p&&c.splice(p+1,B-p);let y=c[p+1];const b=c[p+2],v=c[p+3];if(y!==".."||!b||b==="."||b===".."||!v||v==="."||v==="..")continue;l=!0,c.splice(p,1);const $=c.slice(0);$[p]="**",r.push($),p--}if(!this.preserveMultipleSlashes){for(let B=1;B<c.length-1;B++){const y=c[B];B===1&&y===""&&c[0]===""||(y==="."||y==="")&&(l=!0,c.splice(B,1),B--)}c[0]==="."&&c.length===2&&(c[1]==="."||c[1]==="")&&(l=!0,c.pop())}let E=0;for(;(E=c.indexOf("..",E+1))!==-1;){const B=c[E-1];if(B&&B!=="."&&B!==".."&&B!=="**"){l=!0;const b=E===1&&c[E+1]==="**"?["."]:[];c.splice(E-1,2,...b),c.length===0&&c.push(""),E-=2}}}}while(l);return r}secondPhasePreProcess(r){for(let l=0;l<r.length-1;l++)for(let c=l+1;c<r.length;c++){const p=this.partsMatch(r[l],r[c],!this.preserveMultipleSlashes);p&&(r[l]=p,r[c]=[])}return r.filter(l=>l.length)}partsMatch(r,l,c=!1){let p=0,E=0,B=[],y="";for(;p<r.length&&E<l.length;)if(r[p]===l[E])B.push(y==="b"?l[E]:r[p]),p++,E++;else if(c&&r[p]==="**"&&l[E]===r[p+1])B.push(r[p]),p++;else if(c&&l[E]==="**"&&r[p]===l[E+1])B.push(l[E]),E++;else if(r[p]==="*"&&l[E]&&(this.options.dot||!l[E].startsWith("."))&&l[E]!=="**"){if(y==="b")return!1;y="a",B.push(r[p]),p++,E++}else if(l[E]==="*"&&r[p]&&(this.options.dot||!r[p].startsWith("."))&&r[p]!=="**"){if(y==="a")return!1;y="b",B.push(l[E]),p++,E++}else return!1;return r.length===l.length&&B}parseNegate(){if(this.nonegate)return;const r=this.pattern;let l=!1,c=0;for(let p=0;p<r.length&&r.charAt(p)==="!";p++)l=!l,c++;c&&(this.pattern=r.slice(c)),this.negate=l}matchOne(r,l,c=!1){const p=this.options;if(this.isWindows){const q=typeof r[0]=="string"&&/^[a-z]:$/i.test(r[0]),bt=!q&&r[0]===""&&r[1]===""&&r[2]==="?"&&/^[a-z]:$/i.test(r[3]),iu=typeof l[0]=="string"&&/^[a-z]:$/i.test(l[0]),vt=!iu&&l[0]===""&&l[1]===""&&l[2]==="?"&&typeof l[3]=="string"&&/^[a-z]:$/i.test(l[3]),De=bt?3:q?0:void 0,Z=vt?3:iu?0:void 0;if(typeof De=="number"&&typeof Z=="number"){const[su,St]=[r[De],l[Z]];su.toLowerCase()===St.toLowerCase()&&(l[Z]=su,Z>De?l=l.slice(Z):De>Z&&(r=r.slice(De)))}}const{optimizationLevel:E=1}=this.options;E>=2&&(r=this.levelTwoFileOptimize(r)),this.debug("matchOne",this,{file:r,pattern:l}),this.debug("matchOne",r.length,l.length);for(var B=0,y=0,b=r.length,v=l.length;B<b&&y<v;B++,y++){this.debug("matchOne loop");var $=l[y],k=r[B];if(this.debug(l,$,k),$===!1)return!1;if($===u.GLOBSTAR){this.debug("GLOBSTAR",[l,$,k]);var j=B,N=y+1;if(N===v){for(this.debug("** at the end");B<b;B++)if(r[B]==="."||r[B]===".."||!p.dot&&r[B].charAt(0)===".")return!1;return!0}for(;j<b;){var te=r[j];if(this.debug(`
+-globstar while`,r,j,l,N,te),this.matchOne(r.slice(j),l.slice(N),c))return this.debug("globstar found match!",j,b,te),!0;if(te==="."||te===".."||!p.dot&&te.charAt(0)==="."){this.debug("dot detected!",r,j,l,N);break}this.debug("globstar swallow a segment, and continue"),j++}return!!(c&&(this.debug(`
+->>> no match, partial?`,r,j,l,N),j===b))}let q;if(typeof $=="string"?(q=k===$,this.debug("string match",$,k,q)):(q=$.test(k),this.debug("pattern match",$,k,q)),!q)return!1}if(B===b&&y===v)return!0;if(B===b)return c;if(y===v)return B===b-1&&r[B]==="";throw new Error("wtf?")}braceExpand(){return(0,u.braceExpand)(this.pattern,this.options)}parse(r){(0,D.assertValidPattern)(r);const l=this.options;if(r==="**")return u.GLOBSTAR;if(r==="")return"";let c,p=null;(c=r.match(M))?p=l.dot?Te:G:(c=r.match(a))?p=(l.nocase?l.dot?F:g:l.dot?f:h)(c[1]):(c=r.match(J))?p=(l.nocase?l.dot?de:P:l.dot?Ce:_)(c):(c=r.match(d))?p=l.dot?w:m:(c=r.match(S))&&(p=R);const E=n.AST.fromGlob(r,this.options).toMMPattern();return p?Object.assign(E,{test:p}):E}makeRe(){if(this.regexp||this.regexp===!1)return this.regexp;const r=this.set;if(!r.length)return this.regexp=!1,this.regexp;const l=this.options,c=l.noglobstar?ft:l.dot?Ft:dt,p=new Set(l.nocase?["i"]:[]);let E=r.map(b=>{const v=b.map($=>{if($ instanceof RegExp)for(const k of $.flags.split(""))p.add(k);return typeof $=="string"?wt($):$===u.GLOBSTAR?u.GLOBSTAR:$._src});return v.forEach(($,k)=>{const j=v[k+1],N=v[k-1];$!==u.GLOBSTAR||N===u.GLOBSTAR||(N===void 0?j!==void 0&&j!==u.GLOBSTAR?v[k+1]="(?:\\/|"+c+"\\/)?"+j:v[k]=c:j===void 0?v[k-1]=N+"(?:\\/|"+c+")?":j!==u.GLOBSTAR&&(v[k-1]=N+"(?:\\/|\\/"+c+"\\/)"+j,v[k+1]=u.GLOBSTAR))}),v.filter($=>$!==u.GLOBSTAR).join("/")}).join("|");const[B,y]=r.length>1?["(?:",")"]:["",""];E="^"+B+E+y+"$",this.negate&&(E="^(?!"+E+").+$");try{this.regexp=new RegExp(E,[...p].join(""))}catch{this.regexp=!1}return this.regexp}slashSplit(r){return this.preserveMultipleSlashes?r.split("/"):this.isWindows&&/^\/\/[^\/]+/.test(r)?["",...r.split(/\/+/)]:r.split(/\/+/)}match(r,l=this.partial){if(this.debug("match",r,this.pattern),this.comment)return!1;if(this.empty)return r==="";if(r==="/"&&l)return!0;const c=this.options;this.isWindows&&(r=r.split("\\").join("/"));const p=this.slashSplit(r);this.debug(this.pattern,"split",p);const E=this.set;this.debug(this.pattern,"set",E);let B=p[p.length-1];if(!B)for(let y=p.length-2;!B&&y>=0;y--)B=p[y];for(let y=0;y<E.length;y++){const b=E[y];let v=p;if(c.matchBase&&b.length===1&&(v=[B]),this.matchOne(v,b,l))return c.flipNegate?!0:!this.negate}return c.flipNegate?!1:this.negate}static defaults(r){return u.minimatch.defaults(r).Minimatch}}u.Minimatch=ue;var yt=le;Object.defineProperty(u,"AST",{enumerable:!0,get:function(){return yt.AST}});var $t=he;Object.defineProperty(u,"escape",{enumerable:!0,get:function(){return $t.escape}});var At=Y;Object.defineProperty(u,"unescape",{enumerable:!0,get:function(){return At.unescape}}),u.minimatch.AST=n.AST,u.minimatch.Minimatch=ue,u.minimatch.escape=i.escape,u.minimatch.unescape=s.unescape}(Uu);const z=ru,eu=A,Kn=kt.EventEmitter,Qn=Uu.Minimatch;class fe extends Kn{constructor(e){e=e||{},super(e),this.isSymbolicLink=e.isSymbolicLink,this.path=e.path||process.cwd(),this.basename=eu.basename(this.path),this.ignoreFiles=e.ignoreFiles||[".ignore"],this.ignoreRules={},this.parent=e.parent||null,this.includeEmpty=!!e.includeEmpty,this.root=this.parent?this.parent.root:this.path,this.follow=!!e.follow,this.result=this.parent?this.parent.result:new Set,this.entries=null,this.sawError=!1}sort(e,t){return e.localeCompare(t,"en")}emit(e,t){let D=!1;return this.sawError&&e==="error"||(e==="error"?this.sawError=!0:e==="done"&&!this.parent&&(t=Array.from(t).map(n=>/^@/.test(n)?`./${n}`:n).sort(this.sort),this.result=t),e==="error"&&this.parent?D=this.parent.emit("error",t):D=super.emit(e,t)),D}start(){return z.readdir(this.path,(e,t)=>e?this.emit("error",e):this.onReaddir(t)),this}isIgnoreFile(e){return e!=="."&&e!==".."&&this.ignoreFiles.indexOf(e)!==-1}onReaddir(e){this.entries=e,e.length===0?(this.includeEmpty&&this.result.add(this.path.slice(this.root.length+1)),this.emit("done",this.result)):this.entries.some(D=>this.isIgnoreFile(D))?this.addIgnoreFiles():this.filterEntries()}addIgnoreFiles(){const e=this.entries.filter(n=>this.isIgnoreFile(n));let t=e.length;const D=n=>{--t===0&&this.filterEntries()};e.forEach(n=>this.addIgnoreFile(n,D))}addIgnoreFile(e,t){const D=eu.resolve(this.path,e);z.readFile(D,"utf8",(n,i)=>n?this.emit("error",n):this.onReadIgnoreFile(e,i,t))}onReadIgnoreFile(e,t,D){const n={matchBase:!0,dot:!0,flipNegate:!0,nocase:!0},i=t.split(/\r?\n/).filter(s=>!/^#|^$/.test(s.trim())).map(s=>new Qn(s.trim(),n));this.ignoreRules[e]=i,D()}filterEntries(){const e=this.entries.map(D=>{const n=this.filterEntry(D),i=this.filterEntry(D,!0);return n||i?[D,n,i]:!1}).filter(D=>D);let t=e.length;if(t===0)this.emit("done",this.result);else{const D=n=>{--t===0&&this.emit("done",this.result)};e.forEach(n=>{const i=n[0],s=n[1],o=n[2];this.stat({entry:i,file:s,dir:o},D)})}}onstat({st:e,entry:t,file:D,dir:n,isSymbolicLink:i},s){const o=this.path+"/"+t;e.isDirectory()?n?this.walker(t,{isSymbolicLink:i},s):s():(D&&this.result.add(o.slice(this.root.length+1)),s())}stat({entry:e,file:t,dir:D},n){const i=this.path+"/"+e;z.lstat(i,(s,o)=>{if(s)this.emit("error",s);else{const a=o.isSymbolicLink();this.follow&&a?z.stat(i,(h,f)=>{h?this.emit("error",h):this.onstat({st:f,entry:e,file:t,dir:D,isSymbolicLink:a},n)}):this.onstat({st:o,entry:e,file:t,dir:D,isSymbolicLink:a},n)}})}walkerOpt(e,t){return{path:this.path+"/"+e,parent:this,ignoreFiles:this.ignoreFiles,follow:this.follow,includeEmpty:this.includeEmpty,...t}}walker(e,t,D){new fe(this.walkerOpt(e,t)).on("done",D).start()}filterEntry(e,t){let D=!0;if(this.parent&&this.parent.filterEntry){var n=this.basename+"/"+e;D=this.parent.filterEntry(n,t)}return this.ignoreFiles.forEach(i=>{this.ignoreRules[i]&&this.ignoreRules[i].forEach(s=>{s.negate!==D&&(s.match("/"+e)||s.match(e)||t&&(s.match("/"+e+"/")||s.match(e+"/"))||t&&s.negate&&(s.match("/"+e,!0)||s.match(e,!0)))&&(D=s.negate)})}),D}}class xe extends fe{start(){return this.onReaddir(z.readdirSync(this.path)),this}addIgnoreFile(e,t){const D=eu.resolve(this.path,e);this.onReadIgnoreFile(e,z.readFileSync(D,"utf8"),t)}stat({entry:e,file:t,dir:D},n){const i=this.path+"/"+e;let s=z.lstatSync(i);const o=s.isSymbolicLink();this.follow&&o&&(s=z.statSync(i)),this.onstat({st:s,entry:e,file:t,dir:D,isSymbolicLink:o},n)}walker(e,t,D){new xe(this.walkerOpt(e,t)).start(),D()}}const Oe=(u,e)=>{const t=new Promise((D,n)=>{new fe(u).on("done",D).on("error",n).start()});return e?t.then(D=>e(null,D),e):t},ei=u=>new xe(u).start().result;var ui=Oe;Oe.sync=ei,Oe.Walker=fe,Oe.WalkerSync=xe;const{Walker:ti}=ui,{lstatSync:Di,readFileSync:ni}=ru,{basename:rt,dirname:ii,extname:ot,join:K,relative:Q,resolve:si,sep:ri}=A,pe=Symbol("npm-packlist.rules.default"),ee=Symbol("npm-packlist.rules.strict"),oi=u=>/\*/.test(u),ai=[".npmignore",".gitignore","**/.git","**/.svn","**/.hg","**/CVS","**/.git/**","**/.svn/**","**/.hg/**","**/CVS/**","/.lock-wscript","/.wafpickle-*","/build/config.gypi","npm-debug.log","**/.npmrc",".*.swp",".DS_Store","**/.DS_Store/**","._*","**/._*/**","*.orig","/archived-packages/**"],at=["/.git"],ke=["!/readme{,.*[^~$]}","!/copying{,.*[^~$]}","!/license{,.*[^~$]}","!/licence{,.*[^~$]}"],li=[/^!.*readme/i,/^!.*copying/i,/^!.*licen[sc]e/i],je=u=>u.split("\\").join("/"),lt=(u,e,t=[])=>{for(const s of[".npmignore",".gitignore"])try{const o=ni(K(u,s),{encoding:"utf8"});t.push(o);break}catch(o){if(o.code!=="ENOENT")throw o}if(!e)return t;const D=e.split(ri,1)[0],n=K(u,D),i=Q(n,K(u,e));return lt(n,i,t)};class Fe extends ti{constructor(e,t){const D={...t,includeEmpty:!1,follow:!1,path:si(t?.path||e.path).replace(/\\/g,"/"),ignoreFiles:t?.ignoreFiles||[pe,"package.json",".npmignore",".gitignore",ee]};super(D),this.isPackage=D.isPackage,this.seen=D.seen||new Set,this.tree=e,this.requiredFiles=D.requiredFiles||[];const n=[];if(D.prefix&&D.workspaces){const i=je(D.path),s=je(D.prefix),o=D.workspaces.map(a=>je(a));if(i!==s&&o.includes(i)){const a=Q(D.prefix,ii(D.path));n.push(...lt(D.prefix,a))}else i===s&&n.push(...o.map(a=>je(Q(D.path,a))))}this.injectRules(pe,[...ai,...n]),this.isPackage||this.injectRules(ee,[...at,...ke,...this.requiredFiles.map(i=>`!${i}`)])}addIgnoreFile(e,t){return e!=="package.json"||!this.isPackage?super.addIgnoreFile(e,t):this.processPackage(t)}emit(e,t){return e!=="done"||!this.isPackage?super.emit(e,t):(this.gatherBundles().then(()=>{super.emit("done",this.result)}),!0)}filterEntries(){return this.ignoreRules["package.json"]?(this.ignoreRules[".npmignore"]=null,this.ignoreRules[".gitignore"]=null):this.ignoreRules[".npmignore"]&&(this.ignoreRules[".gitignore"]=null),super.filterEntries()}onstat(e,t){return!e.st.isFile()&&!e.st.isDirectory()?t():super.onstat(e,t)}stat(e,t){return oi(e.entry)?t():super.stat(e,t)}walkerOpt(e,t){let D=null;if(this.tree.workspaces){const n=[...this.tree.workspaces.values()].map(s=>s.replace(/\\/g,"/")),i=K(this.path,e).replace(/\\/g,"/");n.includes(i)&&(D=[pe,"package.json",".npmignore",".gitignore",ee])}else D=[pe,".npmignore",".gitignore",ee];return{...super.walkerOpt(e,t),ignoreFiles:D,requiredFiles:this.requiredFiles.map(n=>Q(n,e)===".."?Q(e,n).replace(/\\/g,"/"):!1).filter(Boolean)}}walker(e,t,D){new Fe(this.tree,this.walkerOpt(e,t)).on("done",D).start()}sort(e,t){const D=ot(e).toLowerCase(),n=ot(t).toLowerCase(),i=rt(e).toLowerCase(),s=rt(t).toLowerCase();return D.localeCompare(n,"en")||i.localeCompare(s,"en")||e.localeCompare(t,"en")}injectRules(e,t,D=()=>{}){this.onReadIgnoreFile(e,`${t.join(`
+-`)}
+-`,D)}processPackage(e){const{bin:t,browser:D,files:n,main:i}=this.tree.package,s=[],o=[...at,...ke,"!/package.json","/.git","/node_modules","/package-lock.json","/yarn.lock","/pnpm-lock.yaml"];if(n){for(let a of n){a.startsWith("/")?a=a.slice(1):a.startsWith("./")?a=a.slice(2):a.endsWith("/*")&&(a=a.slice(0,-2));const h=`!${a}`;this.excludeNonRoot(a);try{const f=Di(K(this.path,a.replace(/^!+/,"")).replace(/\\/g,"/"));f.isFile()?(o.unshift(h),this.requiredFiles.push(a)):f.isDirectory()&&(s.push(h),s.push(`${h}/**`))}catch{s.push(h)}}this.injectRules("package.json",["*",...s])}if(D&&o.push(`!/${D}`),i&&o.push(`!/${i}`),t)for(const a in t)o.push(`!/${t[a]}`);this.injectRules(ee,o,e)}excludeNonRoot(e){const t=li.find(D=>D.test(e));if(t){const D=ke.findIndex(n=>t.test(n));ke.splice(D,1)}}async gatherBundles(){if(this.seen.has(this.tree))return;this.seen.add(this.tree);let e;if(this.tree.isProjectRoot){const{bundleDependencies:t}=this.tree.package;e=t||[]}else{const{dependencies:t,optionalDependencies:D}=this.tree.package;e=Object.keys(t||{}).concat(Object.keys(D||{}))}for(const t of e){const D=this.tree.edgesOut.get(t);if(!D||D.peer||D.dev)continue;const n=this.tree.edgesOut.get(t).to;if(!n)continue;const i=n.path,s=n.target,o={path:i,isPackage:!0,ignoreFiles:[],seen:this.seen};n.isLink&&o.ignoreFiles.push(pe),o.ignoreFiles.push("package.json"),n.isLink&&(o.ignoreFiles.push(".npmignore"),o.ignoreFiles.push(".gitignore")),o.ignoreFiles.push(ee);const a=new Fe(s,o),h=await new Promise((g,F)=>{a.on("error",F),a.on("done",g),a.start()}),f=Q(this.root,a.path);for(const g of h)this.result.add(K(f,g).replace(/\\/g,"/"))}}}const ct=(u,e,t)=>{typeof e=="function"&&(t=e,e={});const D=new Promise((n,i)=>{new Fe(u,{...e,isPackage:!0}).on("done",n).on("error",i).start()});return t?D.then(n=>t(null,n),t):D};var ci=ct;ct.Walker=Fe;var ht=Nu(ci);const hi=async(u,e)=>{const t=A.resolve(u,e),D=await qu(t),n=A.join(u,"node_modules/"),i=A.join(n,D.name);if((await O.stat(i).catch(()=>null))?.isDirectory()){const o=await O.realpath(i);if(o.startsWith(n)){const a=new Map,[h,f]=await Promise.all([ht({path:o,package:D,edgesOut:a}),ht({path:t,package:D,edgesOut:a})]);console.log(`Symlinking ${Je(D.name)}:`),await Promise.all(f.map(async g=>{const F=A.join(t,g),d=A.join(i,g);await O.mkdir(A.dirname(d),{recursive:!0}),await An(F,d);const m=h.indexOf(g);m>-1&&h.splice(m,1),console.log(`  ${Tu("\u2714")}`,re(A.relative(u,d)),"\u2192",re(A.relative(u,F)))})),await Promise.all(h.map(async g=>{const F=A.join(i,g);await O.rm(F)}));return}}console.error(W`
+-		Error: Package ${Je(D.name)} is not set up
+-
+-		${rn("Setup instructions")}
+-		1. In the Dependency package, create a tarball:
+-		  ${ze("$ npm pack")}
+-
+-		2. In the Consuming package, install the tarball and link the Dependency:
+-		  ${ze("$ npm install --no-save <dependency-tarball>")}
+-		  ${ze("$ npx link publish <dependency-path>")}
+-
+-		3. Start developing!
+-
+-		Learn more: https://npmjs.com/link
+-		`)};var pt={command:XD({name:"publish",parameters:["<package paths...>"],flags:{},help:{description:"Link a package to simulate an environment similar to `npm install`"}}),handler:async(u,e)=>{e.length>0&&await Promise.all(e.map(t=>hi(u,t)))}};(async()=>{const u=HD({name:"link",parameters:["[package paths...]"],flags:{deep:{type:Boolean,alias:"d",description:"Run `npx link` on dependencies if they have a link.config.json"}},help:{description:"A better `npm link` -- symlink local dependencies to the current project",render:(t,D)=>(t[0].data=`npx link
+-`,t.splice(2,0,{type:"section",data:{title:"Website",body:"https://www.npmjs.com/package/link"}}),D.render(t))},commands:[pt.command]}),e=await O.realpath(process.cwd());if(u.command)u.command==="publish"&&await pt.handler(e,u._);else{const{packagePaths:t}=u._;if(t.length>0){await Promise.all(t.map(n=>Ju(e,n,u.flags)));return}const D=await Lu(e);if(!D){console.warn(W`
++    var isNumericSequence = /^-?\d+\.\.-?\d+(?:\.\.-?\d+)?$/.test(m.body);
++    var isAlphaSequence = /^[a-zA-Z]\.\.[a-zA-Z](?:\.\.-?\d+)?$/.test(m.body);
++    var isSequence = isNumericSequence || isAlphaSequence;
++    var isOptions = m.body.indexOf(',') >= 0;
++    if (!isSequence && !isOptions) {
++      // {a},b}
++      if (m.post.match(/,.*\}/)) {
++        str = m.pre + '{' + m.body + escClose + m.post;
++        return expand(str);
++      }
++      return [str];
++    }
++
++    var n;
++    if (isSequence) {
++      n = m.body.split(/\.\./);
++    } else {
++      n = parseCommaParts(m.body);
++      if (n.length === 1) {
++        // x{{a,b}}y ==> x{a}y x{b}y
++        n = expand(n[0], false).map(embrace);
++        if (n.length === 1) {
++          return post.map(function(p) {
++            return m.pre + n[0] + p;
++          });
++        }
++      }
++    }
++
++    // at this point, n is the parts, and we know it's not a comma set
++    // with a single entry.
++    var N;
++
++    if (isSequence) {
++      var x = numeric(n[0]);
++      var y = numeric(n[1]);
++      var width = Math.max(n[0].length, n[1].length);
++      var incr = n.length == 3
++        ? Math.abs(numeric(n[2]))
++        : 1;
++      var test = lte;
++      var reverse = y < x;
++      if (reverse) {
++        incr *= -1;
++        test = gte;
++      }
++      var pad = n.some(isPadded);
++
++      N = [];
++
++      for (var i = x; test(i, y); i += incr) {
++        var c;
++        if (isAlphaSequence) {
++          c = String.fromCharCode(i);
++          if (c === '\\')
++            c = '';
++        } else {
++          c = String(i);
++          if (pad) {
++            var need = width - c.length;
++            if (need > 0) {
++              var z = new Array(need + 1).join('0');
++              if (i < 0)
++                c = '-' + z + c.slice(1);
++              else
++                c = z + c;
++            }
++          }
++        }
++        N.push(c);
++      }
++    } else {
++      N = [];
++
++      for (var j = 0; j < n.length; j++) {
++        N.push.apply(N, expand(n[j], false));
++      }
++    }
++
++    for (var j = 0; j < N.length; j++) {
++      for (var k = 0; k < post.length; k++) {
++        var expansion = pre + N[j] + post[k];
++        if (!isTop || isSequence || expansion)
++          expansions.push(expansion);
++      }
++    }
++  }
++
++  return expansions;
++}
++
++var assertValidPattern$1 = {};
++
++Object.defineProperty(assertValidPattern$1, "__esModule", { value: true });
++assertValidPattern$1.assertValidPattern = void 0;
++const MAX_PATTERN_LENGTH = 1024 * 64;
++const assertValidPattern = (pattern) => {
++    if (typeof pattern !== 'string') {
++        throw new TypeError('invalid pattern');
++    }
++    if (pattern.length > MAX_PATTERN_LENGTH) {
++        throw new TypeError('pattern is too long');
++    }
++};
++assertValidPattern$1.assertValidPattern = assertValidPattern;
++
++var ast = {};
++
++var braceExpressions = {};
++
++// translate the various posix character classes into unicode properties
++// this works across all unicode locales
++Object.defineProperty(braceExpressions, "__esModule", { value: true });
++braceExpressions.parseClass = void 0;
++// { <posix class>: [<translation>, /u flag required, negated]
++const posixClasses = {
++    '[:alnum:]': ['\\p{L}\\p{Nl}\\p{Nd}', true],
++    '[:alpha:]': ['\\p{L}\\p{Nl}', true],
++    '[:ascii:]': ['\\x' + '00-\\x' + '7f', false],
++    '[:blank:]': ['\\p{Zs}\\t', true],
++    '[:cntrl:]': ['\\p{Cc}', true],
++    '[:digit:]': ['\\p{Nd}', true],
++    '[:graph:]': ['\\p{Z}\\p{C}', true, true],
++    '[:lower:]': ['\\p{Ll}', true],
++    '[:print:]': ['\\p{C}', true],
++    '[:punct:]': ['\\p{P}', true],
++    '[:space:]': ['\\p{Z}\\t\\r\\n\\v\\f', true],
++    '[:upper:]': ['\\p{Lu}', true],
++    '[:word:]': ['\\p{L}\\p{Nl}\\p{Nd}\\p{Pc}', true],
++    '[:xdigit:]': ['A-Fa-f0-9', false],
++};
++// only need to escape a few things inside of brace expressions
++// escapes: [ \ ] -
++const braceEscape = (s) => s.replace(/[[\]\\-]/g, '\\$&');
++// escape all regexp magic characters
++const regexpEscape = (s) => s.replace(/[-[\]{}()*+?.,\\^$|#\s]/g, '\\$&');
++// everything has already been escaped, we just have to join
++const rangesToString = (ranges) => ranges.join('');
++// takes a glob string at a posix brace expression, and returns
++// an equivalent regular expression source, and boolean indicating
++// whether the /u flag needs to be applied, and the number of chars
++// consumed to parse the character class.
++// This also removes out of order ranges, and returns ($.) if the
++// entire class just no good.
++const parseClass = (glob, position) => {
++    const pos = position;
++    /* c8 ignore start */
++    if (glob.charAt(pos) !== '[') {
++        throw new Error('not in a brace expression');
++    }
++    /* c8 ignore stop */
++    const ranges = [];
++    const negs = [];
++    let i = pos + 1;
++    let sawStart = false;
++    let uflag = false;
++    let escaping = false;
++    let negate = false;
++    let endPos = pos;
++    let rangeStart = '';
++    WHILE: while (i < glob.length) {
++        const c = glob.charAt(i);
++        if ((c === '!' || c === '^') && i === pos + 1) {
++            negate = true;
++            i++;
++            continue;
++        }
++        if (c === ']' && sawStart && !escaping) {
++            endPos = i + 1;
++            break;
++        }
++        sawStart = true;
++        if (c === '\\') {
++            if (!escaping) {
++                escaping = true;
++                i++;
++                continue;
++            }
++            // escaped \ char, fall through and treat like normal char
++        }
++        if (c === '[' && !escaping) {
++            // either a posix class, a collation equivalent, or just a [
++            for (const [cls, [unip, u, neg]] of Object.entries(posixClasses)) {
++                if (glob.startsWith(cls, i)) {
++                    // invalid, [a-[] is fine, but not [a-[:alpha]]
++                    if (rangeStart) {
++                        return ['$.', false, glob.length - pos, true];
++                    }
++                    i += cls.length;
++                    if (neg)
++                        negs.push(unip);
++                    else
++                        ranges.push(unip);
++                    uflag = uflag || u;
++                    continue WHILE;
++                }
++            }
++        }
++        // now it's just a normal character, effectively
++        escaping = false;
++        if (rangeStart) {
++            // throw this range away if it's not valid, but others
++            // can still match.
++            if (c > rangeStart) {
++                ranges.push(braceEscape(rangeStart) + '-' + braceEscape(c));
++            }
++            else if (c === rangeStart) {
++                ranges.push(braceEscape(c));
++            }
++            rangeStart = '';
++            i++;
++            continue;
++        }
++        // now might be the start of a range.
++        // can be either c-d or c-] or c<more...>] or c] at this point
++        if (glob.startsWith('-]', i + 1)) {
++            ranges.push(braceEscape(c + '-'));
++            i += 2;
++            continue;
++        }
++        if (glob.startsWith('-', i + 1)) {
++            rangeStart = c;
++            i += 2;
++            continue;
++        }
++        // not the start of a range, just a single character
++        ranges.push(braceEscape(c));
++        i++;
++    }
++    if (endPos < i) {
++        // didn't see the end of the class, not a valid class,
++        // but might still be valid as a literal match.
++        return ['', false, 0, false];
++    }
++    // if we got no ranges and no negates, then we have a range that
++    // cannot possibly match anything, and that poisons the whole glob
++    if (!ranges.length && !negs.length) {
++        return ['$.', false, glob.length - pos, true];
++    }
++    // if we got one positive range, and it's a single character, then that's
++    // not actually a magic pattern, it's just that one literal character.
++    // we should not treat that as "magic", we should just return the literal
++    // character. [_] is a perfectly valid way to escape glob magic chars.
++    if (negs.length === 0 &&
++        ranges.length === 1 &&
++        /^\\?.$/.test(ranges[0]) &&
++        !negate) {
++        const r = ranges[0].length === 2 ? ranges[0].slice(-1) : ranges[0];
++        return [regexpEscape(r), false, endPos - pos, false];
++    }
++    const sranges = '[' + (negate ? '^' : '') + rangesToString(ranges) + ']';
++    const snegs = '[' + (negate ? '' : '^') + rangesToString(negs) + ']';
++    const comb = ranges.length && negs.length
++        ? '(' + sranges + '|' + snegs + ')'
++        : ranges.length
++            ? sranges
++            : snegs;
++    return [comb, uflag, endPos - pos, true];
++};
++braceExpressions.parseClass = parseClass;
++
++var _unescape = {};
++
++Object.defineProperty(_unescape, "__esModule", { value: true });
++_unescape.unescape = void 0;
++/**
++ * Un-escape a string that has been escaped with {@link escape}.
++ *
++ * If the {@link windowsPathsNoEscape} option is used, then square-brace
++ * escapes are removed, but not backslash escapes.  For example, it will turn
++ * the string `'[*]'` into `*`, but it will not turn `'\\*'` into `'*'`,
++ * becuase `\` is a path separator in `windowsPathsNoEscape` mode.
++ *
++ * When `windowsPathsNoEscape` is not set, then both brace escapes and
++ * backslash escapes are removed.
++ *
++ * Slashes (and backslashes in `windowsPathsNoEscape` mode) cannot be escaped
++ * or unescaped.
++ */
++const unescape = (s, { windowsPathsNoEscape = false, } = {}) => {
++    return windowsPathsNoEscape
++        ? s.replace(/\[([^\/\\])\]/g, '$1')
++        : s.replace(/((?!\\).|^)\[([^\/\\])\]/g, '$1$2').replace(/\\([^\/])/g, '$1');
++};
++_unescape.unescape = unescape;
++
++// parse a single path portion
++Object.defineProperty(ast, "__esModule", { value: true });
++ast.AST = void 0;
++const brace_expressions_js_1 = braceExpressions;
++const unescape_js_1 = _unescape;
++const types = new Set(['!', '?', '+', '*', '@']);
++const isExtglobType = (c) => types.has(c);
++// Patterns that get prepended to bind to the start of either the
++// entire string, or just a single path portion, to prevent dots
++// and/or traversal patterns, when needed.
++// Exts don't need the ^ or / bit, because the root binds that already.
++const startNoTraversal = '(?!(?:^|/)\\.\\.?(?:$|/))';
++const startNoDot = '(?!\\.)';
++// characters that indicate a start of pattern needs the "no dots" bit,
++// because a dot *might* be matched. ( is not in the list, because in
++// the case of a child extglob, it will handle the prevention itself.
++const addPatternStart = new Set(['[', '.']);
++// cases where traversal is A-OK, no dot prevention needed
++const justDots = new Set(['..', '.']);
++const reSpecials = new Set('().*{}+?[]^$\\!');
++const regExpEscape = (s) => s.replace(/[-[\]{}()*+?.,\\^$|#\s]/g, '\\$&');
++// any single thing other than /
++const qmark = '[^/]';
++// * => any number of characters
++const star = qmark + '*?';
++// use + when we need to ensure that *something* matches, because the * is
++// the only thing in the path portion.
++const starNoEmpty = qmark + '+?';
++// remove the \ chars that we added if we end up doing a nonmagic compare
++// const deslash = (s: string) => s.replace(/\\(.)/g, '$1')
++class AST {
++    type;
++    #root;
++    #hasMagic;
++    #uflag = false;
++    #parts = [];
++    #parent;
++    #parentIndex;
++    #negs;
++    #filledNegs = false;
++    #options;
++    #toString;
++    // set to true if it's an extglob with no children
++    // (which really means one child of '')
++    #emptyExt = false;
++    constructor(type, parent, options = {}) {
++        this.type = type;
++        // extglobs are inherently magical
++        if (type)
++            this.#hasMagic = true;
++        this.#parent = parent;
++        this.#root = this.#parent ? this.#parent.#root : this;
++        this.#options = this.#root === this ? options : this.#root.#options;
++        this.#negs = this.#root === this ? [] : this.#root.#negs;
++        if (type === '!' && !this.#root.#filledNegs)
++            this.#negs.push(this);
++        this.#parentIndex = this.#parent ? this.#parent.#parts.length : 0;
++    }
++    get hasMagic() {
++        /* c8 ignore start */
++        if (this.#hasMagic !== undefined)
++            return this.#hasMagic;
++        /* c8 ignore stop */
++        for (const p of this.#parts) {
++            if (typeof p === 'string')
++                continue;
++            if (p.type || p.hasMagic)
++                return (this.#hasMagic = true);
++        }
++        // note: will be undefined until we generate the regexp src and find out
++        return this.#hasMagic;
++    }
++    // reconstructs the pattern
++    toString() {
++        if (this.#toString !== undefined)
++            return this.#toString;
++        if (!this.type) {
++            return (this.#toString = this.#parts.map(p => String(p)).join(''));
++        }
++        else {
++            return (this.#toString =
++                this.type + '(' + this.#parts.map(p => String(p)).join('|') + ')');
++        }
++    }
++    #fillNegs() {
++        /* c8 ignore start */
++        if (this !== this.#root)
++            throw new Error('should only call on root');
++        if (this.#filledNegs)
++            return this;
++        /* c8 ignore stop */
++        // call toString() once to fill this out
++        this.toString();
++        this.#filledNegs = true;
++        let n;
++        while ((n = this.#negs.pop())) {
++            if (n.type !== '!')
++                continue;
++            // walk up the tree, appending everthing that comes AFTER parentIndex
++            let p = n;
++            let pp = p.#parent;
++            while (pp) {
++                for (let i = p.#parentIndex + 1; !pp.type && i < pp.#parts.length; i++) {
++                    for (const part of n.#parts) {
++                        /* c8 ignore start */
++                        if (typeof part === 'string') {
++                            throw new Error('string part in extglob AST??');
++                        }
++                        /* c8 ignore stop */
++                        part.copyIn(pp.#parts[i]);
++                    }
++                }
++                p = pp;
++                pp = p.#parent;
++            }
++        }
++        return this;
++    }
++    push(...parts) {
++        for (const p of parts) {
++            if (p === '')
++                continue;
++            /* c8 ignore start */
++            if (typeof p !== 'string' && !(p instanceof AST && p.#parent === this)) {
++                throw new Error('invalid part: ' + p);
++            }
++            /* c8 ignore stop */
++            this.#parts.push(p);
++        }
++    }
++    toJSON() {
++        const ret = this.type === null
++            ? this.#parts.slice().map(p => (typeof p === 'string' ? p : p.toJSON()))
++            : [this.type, ...this.#parts.map(p => p.toJSON())];
++        if (this.isStart() && !this.type)
++            ret.unshift([]);
++        if (this.isEnd() &&
++            (this === this.#root ||
++                (this.#root.#filledNegs && this.#parent?.type === '!'))) {
++            ret.push({});
++        }
++        return ret;
++    }
++    isStart() {
++        if (this.#root === this)
++            return true;
++        // if (this.type) return !!this.#parent?.isStart()
++        if (!this.#parent?.isStart())
++            return false;
++        if (this.#parentIndex === 0)
++            return true;
++        // if everything AHEAD of this is a negation, then it's still the "start"
++        const p = this.#parent;
++        for (let i = 0; i < this.#parentIndex; i++) {
++            const pp = p.#parts[i];
++            if (!(pp instanceof AST && pp.type === '!')) {
++                return false;
++            }
++        }
++        return true;
++    }
++    isEnd() {
++        if (this.#root === this)
++            return true;
++        if (this.#parent?.type === '!')
++            return true;
++        if (!this.#parent?.isEnd())
++            return false;
++        if (!this.type)
++            return this.#parent?.isEnd();
++        // if not root, it'll always have a parent
++        /* c8 ignore start */
++        const pl = this.#parent ? this.#parent.#parts.length : 0;
++        /* c8 ignore stop */
++        return this.#parentIndex === pl - 1;
++    }
++    copyIn(part) {
++        if (typeof part === 'string')
++            this.push(part);
++        else
++            this.push(part.clone(this));
++    }
++    clone(parent) {
++        const c = new AST(this.type, parent);
++        for (const p of this.#parts) {
++            c.copyIn(p);
++        }
++        return c;
++    }
++    static #parseAST(str, ast, pos, opt) {
++        let escaping = false;
++        let inBrace = false;
++        let braceStart = -1;
++        let braceNeg = false;
++        if (ast.type === null) {
++            // outside of a extglob, append until we find a start
++            let i = pos;
++            let acc = '';
++            while (i < str.length) {
++                const c = str.charAt(i++);
++                // still accumulate escapes at this point, but we do ignore
++                // starts that are escaped
++                if (escaping || c === '\\') {
++                    escaping = !escaping;
++                    acc += c;
++                    continue;
++                }
++                if (inBrace) {
++                    if (i === braceStart + 1) {
++                        if (c === '^' || c === '!') {
++                            braceNeg = true;
++                        }
++                    }
++                    else if (c === ']' && !(i === braceStart + 2 && braceNeg)) {
++                        inBrace = false;
++                    }
++                    acc += c;
++                    continue;
++                }
++                else if (c === '[') {
++                    inBrace = true;
++                    braceStart = i;
++                    braceNeg = false;
++                    acc += c;
++                    continue;
++                }
++                if (!opt.noext && isExtglobType(c) && str.charAt(i) === '(') {
++                    ast.push(acc);
++                    acc = '';
++                    const ext = new AST(c, ast);
++                    i = AST.#parseAST(str, ext, i, opt);
++                    ast.push(ext);
++                    continue;
++                }
++                acc += c;
++            }
++            ast.push(acc);
++            return i;
++        }
++        // some kind of extglob, pos is at the (
++        // find the next | or )
++        let i = pos + 1;
++        let part = new AST(null, ast);
++        const parts = [];
++        let acc = '';
++        while (i < str.length) {
++            const c = str.charAt(i++);
++            // still accumulate escapes at this point, but we do ignore
++            // starts that are escaped
++            if (escaping || c === '\\') {
++                escaping = !escaping;
++                acc += c;
++                continue;
++            }
++            if (inBrace) {
++                if (i === braceStart + 1) {
++                    if (c === '^' || c === '!') {
++                        braceNeg = true;
++                    }
++                }
++                else if (c === ']' && !(i === braceStart + 2 && braceNeg)) {
++                    inBrace = false;
++                }
++                acc += c;
++                continue;
++            }
++            else if (c === '[') {
++                inBrace = true;
++                braceStart = i;
++                braceNeg = false;
++                acc += c;
++                continue;
++            }
++            if (isExtglobType(c) && str.charAt(i) === '(') {
++                part.push(acc);
++                acc = '';
++                const ext = new AST(c, part);
++                part.push(ext);
++                i = AST.#parseAST(str, ext, i, opt);
++                continue;
++            }
++            if (c === '|') {
++                part.push(acc);
++                acc = '';
++                parts.push(part);
++                part = new AST(null, ast);
++                continue;
++            }
++            if (c === ')') {
++                if (acc === '' && ast.#parts.length === 0) {
++                    ast.#emptyExt = true;
++                }
++                part.push(acc);
++                acc = '';
++                ast.push(...parts, part);
++                return i;
++            }
++            acc += c;
++        }
++        // unfinished extglob
++        // if we got here, it was a malformed extglob! not an extglob, but
++        // maybe something else in there.
++        ast.type = null;
++        ast.#hasMagic = undefined;
++        ast.#parts = [str.substring(pos - 1)];
++        return i;
++    }
++    static fromGlob(pattern, options = {}) {
++        const ast = new AST(null, undefined, options);
++        AST.#parseAST(pattern, ast, 0, options);
++        return ast;
++    }
++    // returns the regular expression if there's magic, or the unescaped
++    // string if not.
++    toMMPattern() {
++        // should only be called on root
++        /* c8 ignore start */
++        if (this !== this.#root)
++            return this.#root.toMMPattern();
++        /* c8 ignore stop */
++        const glob = this.toString();
++        const [re, body, hasMagic, uflag] = this.toRegExpSource();
++        // if we're in nocase mode, and not nocaseMagicOnly, then we do
++        // still need a regular expression if we have to case-insensitively
++        // match capital/lowercase characters.
++        const anyMagic = hasMagic ||
++            this.#hasMagic ||
++            (this.#options.nocase &&
++                !this.#options.nocaseMagicOnly &&
++                glob.toUpperCase() !== glob.toLowerCase());
++        if (!anyMagic) {
++            return body;
++        }
++        const flags = (this.#options.nocase ? 'i' : '') + (uflag ? 'u' : '');
++        return Object.assign(new RegExp(`^${re}$`, flags), {
++            _src: re,
++            _glob: glob,
++        });
++    }
++    get options() {
++        return this.#options;
++    }
++    // returns the string match, the regexp source, whether there's magic
++    // in the regexp (so a regular expression is required) and whether or
++    // not the uflag is needed for the regular expression (for posix classes)
++    // TODO: instead of injecting the start/end at this point, just return
++    // the BODY of the regexp, along with the start/end portions suitable
++    // for binding the start/end in either a joined full-path makeRe context
++    // (where we bind to (^|/), or a standalone matchPart context (where
++    // we bind to ^, and not /).  Otherwise slashes get duped!
++    //
++    // In part-matching mode, the start is:
++    // - if not isStart: nothing
++    // - if traversal possible, but not allowed: ^(?!\.\.?$)
++    // - if dots allowed or not possible: ^
++    // - if dots possible and not allowed: ^(?!\.)
++    // end is:
++    // - if not isEnd(): nothing
++    // - else: $
++    //
++    // In full-path matching mode, we put the slash at the START of the
++    // pattern, so start is:
++    // - if first pattern: same as part-matching mode
++    // - if not isStart(): nothing
++    // - if traversal possible, but not allowed: /(?!\.\.?(?:$|/))
++    // - if dots allowed or not possible: /
++    // - if dots possible and not allowed: /(?!\.)
++    // end is:
++    // - if last pattern, same as part-matching mode
++    // - else nothing
++    //
++    // Always put the (?:$|/) on negated tails, though, because that has to be
++    // there to bind the end of the negated pattern portion, and it's easier to
++    // just stick it in now rather than try to inject it later in the middle of
++    // the pattern.
++    //
++    // We can just always return the same end, and leave it up to the caller
++    // to know whether it's going to be used joined or in parts.
++    // And, if the start is adjusted slightly, can do the same there:
++    // - if not isStart: nothing
++    // - if traversal possible, but not allowed: (?:/|^)(?!\.\.?$)
++    // - if dots allowed or not possible: (?:/|^)
++    // - if dots possible and not allowed: (?:/|^)(?!\.)
++    //
++    // But it's better to have a simpler binding without a conditional, for
++    // performance, so probably better to return both start options.
++    //
++    // Then the caller just ignores the end if it's not the first pattern,
++    // and the start always gets applied.
++    //
++    // But that's always going to be $ if it's the ending pattern, or nothing,
++    // so the caller can just attach $ at the end of the pattern when building.
++    //
++    // So the todo is:
++    // - better detect what kind of start is needed
++    // - return both flavors of starting pattern
++    // - attach $ at the end of the pattern when creating the actual RegExp
++    //
++    // Ah, but wait, no, that all only applies to the root when the first pattern
++    // is not an extglob. If the first pattern IS an extglob, then we need all
++    // that dot prevention biz to live in the extglob portions, because eg
++    // +(*|.x*) can match .xy but not .yx.
++    //
++    // So, return the two flavors if it's #root and the first child is not an
++    // AST, otherwise leave it to the child AST to handle it, and there,
++    // use the (?:^|/) style of start binding.
++    //
++    // Even simplified further:
++    // - Since the start for a join is eg /(?!\.) and the start for a part
++    // is ^(?!\.), we can just prepend (?!\.) to the pattern (either root
++    // or start or whatever) and prepend ^ or / at the Regexp construction.
++    toRegExpSource(allowDot) {
++        const dot = allowDot ?? !!this.#options.dot;
++        if (this.#root === this)
++            this.#fillNegs();
++        if (!this.type) {
++            const noEmpty = this.isStart() && this.isEnd();
++            const src = this.#parts
++                .map(p => {
++                const [re, _, hasMagic, uflag] = typeof p === 'string'
++                    ? AST.#parseGlob(p, this.#hasMagic, noEmpty)
++                    : p.toRegExpSource(allowDot);
++                this.#hasMagic = this.#hasMagic || hasMagic;
++                this.#uflag = this.#uflag || uflag;
++                return re;
++            })
++                .join('');
++            let start = '';
++            if (this.isStart()) {
++                if (typeof this.#parts[0] === 'string') {
++                    // this is the string that will match the start of the pattern,
++                    // so we need to protect against dots and such.
++                    // '.' and '..' cannot match unless the pattern is that exactly,
++                    // even if it starts with . or dot:true is set.
++                    const dotTravAllowed = this.#parts.length === 1 && justDots.has(this.#parts[0]);
++                    if (!dotTravAllowed) {
++                        const aps = addPatternStart;
++                        // check if we have a possibility of matching . or ..,
++                        // and prevent that.
++                        const needNoTrav = 
++                        // dots are allowed, and the pattern starts with [ or .
++                        (dot && aps.has(src.charAt(0))) ||
++                            // the pattern starts with \., and then [ or .
++                            (src.startsWith('\\.') && aps.has(src.charAt(2))) ||
++                            // the pattern starts with \.\., and then [ or .
++                            (src.startsWith('\\.\\.') && aps.has(src.charAt(4)));
++                        // no need to prevent dots if it can't match a dot, or if a
++                        // sub-pattern will be preventing it anyway.
++                        const needNoDot = !dot && !allowDot && aps.has(src.charAt(0));
++                        start = needNoTrav ? startNoTraversal : needNoDot ? startNoDot : '';
++                    }
++                }
++            }
++            // append the "end of path portion" pattern to negation tails
++            let end = '';
++            if (this.isEnd() &&
++                this.#root.#filledNegs &&
++                this.#parent?.type === '!') {
++                end = '(?:$|\\/)';
++            }
++            const final = start + src + end;
++            return [
++                final,
++                (0, unescape_js_1.unescape)(src),
++                (this.#hasMagic = !!this.#hasMagic),
++                this.#uflag,
++            ];
++        }
++        // We need to calculate the body *twice* if it's a repeat pattern
++        // at the start, once in nodot mode, then again in dot mode, so a
++        // pattern like *(?) can match 'x.y'
++        const repeated = this.type === '*' || this.type === '+';
++        // some kind of extglob
++        const start = this.type === '!' ? '(?:(?!(?:' : '(?:';
++        let body = this.#partsToRegExp(dot);
++        if (this.isStart() && this.isEnd() && !body && this.type !== '!') {
++            // invalid extglob, has to at least be *something* present, if it's
++            // the entire path portion.
++            const s = this.toString();
++            this.#parts = [s];
++            this.type = null;
++            this.#hasMagic = undefined;
++            return [s, (0, unescape_js_1.unescape)(this.toString()), false, false];
++        }
++        // XXX abstract out this map method
++        let bodyDotAllowed = !repeated || allowDot || dot || !startNoDot
++            ? ''
++            : this.#partsToRegExp(true);
++        if (bodyDotAllowed === body) {
++            bodyDotAllowed = '';
++        }
++        if (bodyDotAllowed) {
++            body = `(?:${body})(?:${bodyDotAllowed})*?`;
++        }
++        // an empty !() is exactly equivalent to a starNoEmpty
++        let final = '';
++        if (this.type === '!' && this.#emptyExt) {
++            final = (this.isStart() && !dot ? startNoDot : '') + starNoEmpty;
++        }
++        else {
++            const close = this.type === '!'
++                ? // !() must match something,but !(x) can match ''
++                    '))' +
++                        (this.isStart() && !dot && !allowDot ? startNoDot : '') +
++                        star +
++                        ')'
++                : this.type === '@'
++                    ? ')'
++                    : this.type === '?'
++                        ? ')?'
++                        : this.type === '+' && bodyDotAllowed
++                            ? ')'
++                            : this.type === '*' && bodyDotAllowed
++                                ? `)?`
++                                : `)${this.type}`;
++            final = start + body + close;
++        }
++        return [
++            final,
++            (0, unescape_js_1.unescape)(body),
++            (this.#hasMagic = !!this.#hasMagic),
++            this.#uflag,
++        ];
++    }
++    #partsToRegExp(dot) {
++        return this.#parts
++            .map(p => {
++            // extglob ASTs should only contain parent ASTs
++            /* c8 ignore start */
++            if (typeof p === 'string') {
++                throw new Error('string type in extglob ast??');
++            }
++            /* c8 ignore stop */
++            // can ignore hasMagic, because extglobs are already always magic
++            const [re, _, _hasMagic, uflag] = p.toRegExpSource(dot);
++            this.#uflag = this.#uflag || uflag;
++            return re;
++        })
++            .filter(p => !(this.isStart() && this.isEnd()) || !!p)
++            .join('|');
++    }
++    static #parseGlob(glob, hasMagic, noEmpty = false) {
++        let escaping = false;
++        let re = '';
++        let uflag = false;
++        for (let i = 0; i < glob.length; i++) {
++            const c = glob.charAt(i);
++            if (escaping) {
++                escaping = false;
++                re += (reSpecials.has(c) ? '\\' : '') + c;
++                continue;
++            }
++            if (c === '\\') {
++                if (i === glob.length - 1) {
++                    re += '\\\\';
++                }
++                else {
++                    escaping = true;
++                }
++                continue;
++            }
++            if (c === '[') {
++                const [src, needUflag, consumed, magic] = (0, brace_expressions_js_1.parseClass)(glob, i);
++                if (consumed) {
++                    re += src;
++                    uflag = uflag || needUflag;
++                    i += consumed - 1;
++                    hasMagic = hasMagic || magic;
++                    continue;
++                }
++            }
++            if (c === '*') {
++                if (noEmpty && glob === '*')
++                    re += starNoEmpty;
++                else
++                    re += star;
++                hasMagic = true;
++                continue;
++            }
++            if (c === '?') {
++                re += qmark;
++                hasMagic = true;
++                continue;
++            }
++            re += regExpEscape(c);
++        }
++        return [re, (0, unescape_js_1.unescape)(glob), !!hasMagic, uflag];
++    }
++}
++ast.AST = AST;
++
++var _escape = {};
++
++Object.defineProperty(_escape, "__esModule", { value: true });
++_escape.escape = void 0;
++/**
++ * Escape all magic characters in a glob pattern.
++ *
++ * If the {@link windowsPathsNoEscape | GlobOptions.windowsPathsNoEscape}
++ * option is used, then characters are escaped by wrapping in `[]`, because
++ * a magic character wrapped in a character class can only be satisfied by
++ * that exact character.  In this mode, `\` is _not_ escaped, because it is
++ * not interpreted as a magic character, but instead as a path separator.
++ */
++const escape = (s, { windowsPathsNoEscape = false, } = {}) => {
++    // don't need to escape +@! because we escape the parens
++    // that make those magic, and escaping ! as [!] isn't valid,
++    // because [!]] is a valid glob class meaning not ']'.
++    return windowsPathsNoEscape
++        ? s.replace(/[?*()[\]]/g, '[$&]')
++        : s.replace(/[?*()[\]\\]/g, '\\$&');
++};
++_escape.escape = escape;
++
++(function (exports) {
++	var __importDefault = (commonjsGlobal && commonjsGlobal.__importDefault) || function (mod) {
++	    return (mod && mod.__esModule) ? mod : { "default": mod };
++	};
++	Object.defineProperty(exports, "__esModule", { value: true });
++	exports.unescape = exports.escape = exports.AST = exports.Minimatch = exports.match = exports.makeRe = exports.braceExpand = exports.defaults = exports.filter = exports.GLOBSTAR = exports.sep = exports.minimatch = void 0;
++	const brace_expansion_1 = __importDefault(braceExpansion);
++	const assert_valid_pattern_js_1 = assertValidPattern$1;
++	const ast_js_1 = ast;
++	const escape_js_1 = _escape;
++	const unescape_js_1 = _unescape;
++	const minimatch = (p, pattern, options = {}) => {
++	    (0, assert_valid_pattern_js_1.assertValidPattern)(pattern);
++	    // shortcut: comments match nothing.
++	    if (!options.nocomment && pattern.charAt(0) === '#') {
++	        return false;
++	    }
++	    return new Minimatch(pattern, options).match(p);
++	};
++	exports.minimatch = minimatch;
++	// Optimized checking for the most common glob patterns.
++	const starDotExtRE = /^\*+([^+@!?\*\[\(]*)$/;
++	const starDotExtTest = (ext) => (f) => !f.startsWith('.') && f.endsWith(ext);
++	const starDotExtTestDot = (ext) => (f) => f.endsWith(ext);
++	const starDotExtTestNocase = (ext) => {
++	    ext = ext.toLowerCase();
++	    return (f) => !f.startsWith('.') && f.toLowerCase().endsWith(ext);
++	};
++	const starDotExtTestNocaseDot = (ext) => {
++	    ext = ext.toLowerCase();
++	    return (f) => f.toLowerCase().endsWith(ext);
++	};
++	const starDotStarRE = /^\*+\.\*+$/;
++	const starDotStarTest = (f) => !f.startsWith('.') && f.includes('.');
++	const starDotStarTestDot = (f) => f !== '.' && f !== '..' && f.includes('.');
++	const dotStarRE = /^\.\*+$/;
++	const dotStarTest = (f) => f !== '.' && f !== '..' && f.startsWith('.');
++	const starRE = /^\*+$/;
++	const starTest = (f) => f.length !== 0 && !f.startsWith('.');
++	const starTestDot = (f) => f.length !== 0 && f !== '.' && f !== '..';
++	const qmarksRE = /^\?+([^+@!?\*\[\(]*)?$/;
++	const qmarksTestNocase = ([$0, ext = '']) => {
++	    const noext = qmarksTestNoExt([$0]);
++	    if (!ext)
++	        return noext;
++	    ext = ext.toLowerCase();
++	    return (f) => noext(f) && f.toLowerCase().endsWith(ext);
++	};
++	const qmarksTestNocaseDot = ([$0, ext = '']) => {
++	    const noext = qmarksTestNoExtDot([$0]);
++	    if (!ext)
++	        return noext;
++	    ext = ext.toLowerCase();
++	    return (f) => noext(f) && f.toLowerCase().endsWith(ext);
++	};
++	const qmarksTestDot = ([$0, ext = '']) => {
++	    const noext = qmarksTestNoExtDot([$0]);
++	    return !ext ? noext : (f) => noext(f) && f.endsWith(ext);
++	};
++	const qmarksTest = ([$0, ext = '']) => {
++	    const noext = qmarksTestNoExt([$0]);
++	    return !ext ? noext : (f) => noext(f) && f.endsWith(ext);
++	};
++	const qmarksTestNoExt = ([$0]) => {
++	    const len = $0.length;
++	    return (f) => f.length === len && !f.startsWith('.');
++	};
++	const qmarksTestNoExtDot = ([$0]) => {
++	    const len = $0.length;
++	    return (f) => f.length === len && f !== '.' && f !== '..';
++	};
++	/* c8 ignore start */
++	const defaultPlatform = (typeof process === 'object' && process
++	    ? (typeof process.env === 'object' &&
++	        process.env &&
++	        process.env.__MINIMATCH_TESTING_PLATFORM__) ||
++	        process.platform
++	    : 'posix');
++	const path = {
++	    win32: { sep: '\\' },
++	    posix: { sep: '/' },
++	};
++	/* c8 ignore stop */
++	exports.sep = defaultPlatform === 'win32' ? path.win32.sep : path.posix.sep;
++	exports.minimatch.sep = exports.sep;
++	exports.GLOBSTAR = Symbol('globstar **');
++	exports.minimatch.GLOBSTAR = exports.GLOBSTAR;
++	// any single thing other than /
++	// don't need to escape / when using new RegExp()
++	const qmark = '[^/]';
++	// * => any number of characters
++	const star = qmark + '*?';
++	// ** when dots are allowed.  Anything goes, except .. and .
++	// not (^ or / followed by one or two dots followed by $ or /),
++	// followed by anything, any number of times.
++	const twoStarDot = '(?:(?!(?:\\/|^)(?:\\.{1,2})($|\\/)).)*?';
++	// not a ^ or / followed by a dot,
++	// followed by anything, any number of times.
++	const twoStarNoDot = '(?:(?!(?:\\/|^)\\.).)*?';
++	const filter = (pattern, options = {}) => (p) => (0, exports.minimatch)(p, pattern, options);
++	exports.filter = filter;
++	exports.minimatch.filter = exports.filter;
++	const ext = (a, b = {}) => Object.assign({}, a, b);
++	const defaults = (def) => {
++	    if (!def || typeof def !== 'object' || !Object.keys(def).length) {
++	        return exports.minimatch;
++	    }
++	    const orig = exports.minimatch;
++	    const m = (p, pattern, options = {}) => orig(p, pattern, ext(def, options));
++	    return Object.assign(m, {
++	        Minimatch: class Minimatch extends orig.Minimatch {
++	            constructor(pattern, options = {}) {
++	                super(pattern, ext(def, options));
++	            }
++	            static defaults(options) {
++	                return orig.defaults(ext(def, options)).Minimatch;
++	            }
++	        },
++	        AST: class AST extends orig.AST {
++	            /* c8 ignore start */
++	            constructor(type, parent, options = {}) {
++	                super(type, parent, ext(def, options));
++	            }
++	            /* c8 ignore stop */
++	            static fromGlob(pattern, options = {}) {
++	                return orig.AST.fromGlob(pattern, ext(def, options));
++	            }
++	        },
++	        unescape: (s, options = {}) => orig.unescape(s, ext(def, options)),
++	        escape: (s, options = {}) => orig.escape(s, ext(def, options)),
++	        filter: (pattern, options = {}) => orig.filter(pattern, ext(def, options)),
++	        defaults: (options) => orig.defaults(ext(def, options)),
++	        makeRe: (pattern, options = {}) => orig.makeRe(pattern, ext(def, options)),
++	        braceExpand: (pattern, options = {}) => orig.braceExpand(pattern, ext(def, options)),
++	        match: (list, pattern, options = {}) => orig.match(list, pattern, ext(def, options)),
++	        sep: orig.sep,
++	        GLOBSTAR: exports.GLOBSTAR,
++	    });
++	};
++	exports.defaults = defaults;
++	exports.minimatch.defaults = exports.defaults;
++	// Brace expansion:
++	// a{b,c}d -> abd acd
++	// a{b,}c -> abc ac
++	// a{0..3}d -> a0d a1d a2d a3d
++	// a{b,c{d,e}f}g -> abg acdfg acefg
++	// a{b,c}d{e,f}g -> abdeg acdeg abdeg abdfg
++	//
++	// Invalid sets are not expanded.
++	// a{2..}b -> a{2..}b
++	// a{b}c -> a{b}c
++	const braceExpand = (pattern, options = {}) => {
++	    (0, assert_valid_pattern_js_1.assertValidPattern)(pattern);
++	    // Thanks to Yeting Li <https://github.com/yetingli> for
++	    // improving this regexp to avoid a ReDOS vulnerability.
++	    if (options.nobrace || !/\{(?:(?!\{).)*\}/.test(pattern)) {
++	        // shortcut. no need to expand.
++	        return [pattern];
++	    }
++	    return (0, brace_expansion_1.default)(pattern);
++	};
++	exports.braceExpand = braceExpand;
++	exports.minimatch.braceExpand = exports.braceExpand;
++	// parse a component of the expanded set.
++	// At this point, no pattern may contain "/" in it
++	// so we're going to return a 2d array, where each entry is the full
++	// pattern, split on '/', and then turned into a regular expression.
++	// A regexp is made at the end which joins each array with an
++	// escaped /, and another full one which joins each regexp with |.
++	//
++	// Following the lead of Bash 4.1, note that "**" only has special meaning
++	// when it is the *only* thing in a path portion.  Otherwise, any series
++	// of * is equivalent to a single *.  Globstar behavior is enabled by
++	// default, and can be disabled by setting options.noglobstar.
++	const makeRe = (pattern, options = {}) => new Minimatch(pattern, options).makeRe();
++	exports.makeRe = makeRe;
++	exports.minimatch.makeRe = exports.makeRe;
++	const match = (list, pattern, options = {}) => {
++	    const mm = new Minimatch(pattern, options);
++	    list = list.filter(f => mm.match(f));
++	    if (mm.options.nonull && !list.length) {
++	        list.push(pattern);
++	    }
++	    return list;
++	};
++	exports.match = match;
++	exports.minimatch.match = exports.match;
++	// replace stuff like \* with *
++	const globMagic = /[?*]|[+@!]\(.*?\)|\[|\]/;
++	const regExpEscape = (s) => s.replace(/[-[\]{}()*+?.,\\^$|#\s]/g, '\\$&');
++	class Minimatch {
++	    options;
++	    set;
++	    pattern;
++	    windowsPathsNoEscape;
++	    nonegate;
++	    negate;
++	    comment;
++	    empty;
++	    preserveMultipleSlashes;
++	    partial;
++	    globSet;
++	    globParts;
++	    nocase;
++	    isWindows;
++	    platform;
++	    windowsNoMagicRoot;
++	    regexp;
++	    constructor(pattern, options = {}) {
++	        (0, assert_valid_pattern_js_1.assertValidPattern)(pattern);
++	        options = options || {};
++	        this.options = options;
++	        this.pattern = pattern;
++	        this.platform = options.platform || defaultPlatform;
++	        this.isWindows = this.platform === 'win32';
++	        this.windowsPathsNoEscape =
++	            !!options.windowsPathsNoEscape || options.allowWindowsEscape === false;
++	        if (this.windowsPathsNoEscape) {
++	            this.pattern = this.pattern.replace(/\\/g, '/');
++	        }
++	        this.preserveMultipleSlashes = !!options.preserveMultipleSlashes;
++	        this.regexp = null;
++	        this.negate = false;
++	        this.nonegate = !!options.nonegate;
++	        this.comment = false;
++	        this.empty = false;
++	        this.partial = !!options.partial;
++	        this.nocase = !!this.options.nocase;
++	        this.windowsNoMagicRoot =
++	            options.windowsNoMagicRoot !== undefined
++	                ? options.windowsNoMagicRoot
++	                : !!(this.isWindows && this.nocase);
++	        this.globSet = [];
++	        this.globParts = [];
++	        this.set = [];
++	        // make the set of regexps etc.
++	        this.make();
++	    }
++	    hasMagic() {
++	        if (this.options.magicalBraces && this.set.length > 1) {
++	            return true;
++	        }
++	        for (const pattern of this.set) {
++	            for (const part of pattern) {
++	                if (typeof part !== 'string')
++	                    return true;
++	            }
++	        }
++	        return false;
++	    }
++	    debug(..._) { }
++	    make() {
++	        const pattern = this.pattern;
++	        const options = this.options;
++	        // empty patterns and comments match nothing.
++	        if (!options.nocomment && pattern.charAt(0) === '#') {
++	            this.comment = true;
++	            return;
++	        }
++	        if (!pattern) {
++	            this.empty = true;
++	            return;
++	        }
++	        // step 1: figure out negation, etc.
++	        this.parseNegate();
++	        // step 2: expand braces
++	        this.globSet = [...new Set(this.braceExpand())];
++	        if (options.debug) {
++	            this.debug = (...args) => console.error(...args);
++	        }
++	        this.debug(this.pattern, this.globSet);
++	        // step 3: now we have a set, so turn each one into a series of
++	        // path-portion matching patterns.
++	        // These will be regexps, except in the case of "**", which is
++	        // set to the GLOBSTAR object for globstar behavior,
++	        // and will not contain any / characters
++	        //
++	        // First, we preprocess to make the glob pattern sets a bit simpler
++	        // and deduped.  There are some perf-killing patterns that can cause
++	        // problems with a glob walk, but we can simplify them down a bit.
++	        const rawGlobParts = this.globSet.map(s => this.slashSplit(s));
++	        this.globParts = this.preprocess(rawGlobParts);
++	        this.debug(this.pattern, this.globParts);
++	        // glob --> regexps
++	        let set = this.globParts.map((s, _, __) => {
++	            if (this.isWindows && this.windowsNoMagicRoot) {
++	                // check if it's a drive or unc path.
++	                const isUNC = s[0] === '' &&
++	                    s[1] === '' &&
++	                    (s[2] === '?' || !globMagic.test(s[2])) &&
++	                    !globMagic.test(s[3]);
++	                const isDrive = /^[a-z]:/i.test(s[0]);
++	                if (isUNC) {
++	                    return [...s.slice(0, 4), ...s.slice(4).map(ss => this.parse(ss))];
++	                }
++	                else if (isDrive) {
++	                    return [s[0], ...s.slice(1).map(ss => this.parse(ss))];
++	                }
++	            }
++	            return s.map(ss => this.parse(ss));
++	        });
++	        this.debug(this.pattern, set);
++	        // filter out everything that didn't compile properly.
++	        this.set = set.filter(s => s.indexOf(false) === -1);
++	        // do not treat the ? in UNC paths as magic
++	        if (this.isWindows) {
++	            for (let i = 0; i < this.set.length; i++) {
++	                const p = this.set[i];
++	                if (p[0] === '' &&
++	                    p[1] === '' &&
++	                    this.globParts[i][2] === '?' &&
++	                    typeof p[3] === 'string' &&
++	                    /^[a-z]:$/i.test(p[3])) {
++	                    p[2] = '?';
++	                }
++	            }
++	        }
++	        this.debug(this.pattern, this.set);
++	    }
++	    // various transforms to equivalent pattern sets that are
++	    // faster to process in a filesystem walk.  The goal is to
++	    // eliminate what we can, and push all ** patterns as far
++	    // to the right as possible, even if it increases the number
++	    // of patterns that we have to process.
++	    preprocess(globParts) {
++	        // if we're not in globstar mode, then turn all ** into *
++	        if (this.options.noglobstar) {
++	            for (let i = 0; i < globParts.length; i++) {
++	                for (let j = 0; j < globParts[i].length; j++) {
++	                    if (globParts[i][j] === '**') {
++	                        globParts[i][j] = '*';
++	                    }
++	                }
++	            }
++	        }
++	        const { optimizationLevel = 1 } = this.options;
++	        if (optimizationLevel >= 2) {
++	            // aggressive optimization for the purpose of fs walking
++	            globParts = this.firstPhasePreProcess(globParts);
++	            globParts = this.secondPhasePreProcess(globParts);
++	        }
++	        else if (optimizationLevel >= 1) {
++	            // just basic optimizations to remove some .. parts
++	            globParts = this.levelOneOptimize(globParts);
++	        }
++	        else {
++	            // just collapse multiple ** portions into one
++	            globParts = this.adjascentGlobstarOptimize(globParts);
++	        }
++	        return globParts;
++	    }
++	    // just get rid of adjascent ** portions
++	    adjascentGlobstarOptimize(globParts) {
++	        return globParts.map(parts => {
++	            let gs = -1;
++	            while (-1 !== (gs = parts.indexOf('**', gs + 1))) {
++	                let i = gs;
++	                while (parts[i + 1] === '**') {
++	                    i++;
++	                }
++	                if (i !== gs) {
++	                    parts.splice(gs, i - gs);
++	                }
++	            }
++	            return parts;
++	        });
++	    }
++	    // get rid of adjascent ** and resolve .. portions
++	    levelOneOptimize(globParts) {
++	        return globParts.map(parts => {
++	            parts = parts.reduce((set, part) => {
++	                const prev = set[set.length - 1];
++	                if (part === '**' && prev === '**') {
++	                    return set;
++	                }
++	                if (part === '..') {
++	                    if (prev && prev !== '..' && prev !== '.' && prev !== '**') {
++	                        set.pop();
++	                        return set;
++	                    }
++	                }
++	                set.push(part);
++	                return set;
++	            }, []);
++	            return parts.length === 0 ? [''] : parts;
++	        });
++	    }
++	    levelTwoFileOptimize(parts) {
++	        if (!Array.isArray(parts)) {
++	            parts = this.slashSplit(parts);
++	        }
++	        let didSomething = false;
++	        do {
++	            didSomething = false;
++	            // <pre>/<e>/<rest> -> <pre>/<rest>
++	            if (!this.preserveMultipleSlashes) {
++	                for (let i = 1; i < parts.length - 1; i++) {
++	                    const p = parts[i];
++	                    // don't squeeze out UNC patterns
++	                    if (i === 1 && p === '' && parts[0] === '')
++	                        continue;
++	                    if (p === '.' || p === '') {
++	                        didSomething = true;
++	                        parts.splice(i, 1);
++	                        i--;
++	                    }
++	                }
++	                if (parts[0] === '.' &&
++	                    parts.length === 2 &&
++	                    (parts[1] === '.' || parts[1] === '')) {
++	                    didSomething = true;
++	                    parts.pop();
++	                }
++	            }
++	            // <pre>/<p>/../<rest> -> <pre>/<rest>
++	            let dd = 0;
++	            while (-1 !== (dd = parts.indexOf('..', dd + 1))) {
++	                const p = parts[dd - 1];
++	                if (p && p !== '.' && p !== '..' && p !== '**') {
++	                    didSomething = true;
++	                    parts.splice(dd - 1, 2);
++	                    dd -= 2;
++	                }
++	            }
++	        } while (didSomething);
++	        return parts.length === 0 ? [''] : parts;
++	    }
++	    // First phase: single-pattern processing
++	    // <pre> is 1 or more portions
++	    // <rest> is 1 or more portions
++	    // <p> is any portion other than ., .., '', or **
++	    // <e> is . or ''
++	    //
++	    // **/.. is *brutal* for filesystem walking performance, because
++	    // it effectively resets the recursive walk each time it occurs,
++	    // and ** cannot be reduced out by a .. pattern part like a regexp
++	    // or most strings (other than .., ., and '') can be.
++	    //
++	    // <pre>/**/../<p>/<p>/<rest> -> {<pre>/../<p>/<p>/<rest>,<pre>/**/<p>/<p>/<rest>}
++	    // <pre>/<e>/<rest> -> <pre>/<rest>
++	    // <pre>/<p>/../<rest> -> <pre>/<rest>
++	    // **/**/<rest> -> **/<rest>
++	    //
++	    // **/*/<rest> -> */**/<rest> <== not valid because ** doesn't follow
++	    // this WOULD be allowed if ** did follow symlinks, or * didn't
++	    firstPhasePreProcess(globParts) {
++	        let didSomething = false;
++	        do {
++	            didSomething = false;
++	            // <pre>/**/../<p>/<p>/<rest> -> {<pre>/../<p>/<p>/<rest>,<pre>/**/<p>/<p>/<rest>}
++	            for (let parts of globParts) {
++	                let gs = -1;
++	                while (-1 !== (gs = parts.indexOf('**', gs + 1))) {
++	                    let gss = gs;
++	                    while (parts[gss + 1] === '**') {
++	                        // <pre>/**/**/<rest> -> <pre>/**/<rest>
++	                        gss++;
++	                    }
++	                    // eg, if gs is 2 and gss is 4, that means we have 3 **
++	                    // parts, and can remove 2 of them.
++	                    if (gss > gs) {
++	                        parts.splice(gs + 1, gss - gs);
++	                    }
++	                    let next = parts[gs + 1];
++	                    const p = parts[gs + 2];
++	                    const p2 = parts[gs + 3];
++	                    if (next !== '..')
++	                        continue;
++	                    if (!p ||
++	                        p === '.' ||
++	                        p === '..' ||
++	                        !p2 ||
++	                        p2 === '.' ||
++	                        p2 === '..') {
++	                        continue;
++	                    }
++	                    didSomething = true;
++	                    // edit parts in place, and push the new one
++	                    parts.splice(gs, 1);
++	                    const other = parts.slice(0);
++	                    other[gs] = '**';
++	                    globParts.push(other);
++	                    gs--;
++	                }
++	                // <pre>/<e>/<rest> -> <pre>/<rest>
++	                if (!this.preserveMultipleSlashes) {
++	                    for (let i = 1; i < parts.length - 1; i++) {
++	                        const p = parts[i];
++	                        // don't squeeze out UNC patterns
++	                        if (i === 1 && p === '' && parts[0] === '')
++	                            continue;
++	                        if (p === '.' || p === '') {
++	                            didSomething = true;
++	                            parts.splice(i, 1);
++	                            i--;
++	                        }
++	                    }
++	                    if (parts[0] === '.' &&
++	                        parts.length === 2 &&
++	                        (parts[1] === '.' || parts[1] === '')) {
++	                        didSomething = true;
++	                        parts.pop();
++	                    }
++	                }
++	                // <pre>/<p>/../<rest> -> <pre>/<rest>
++	                let dd = 0;
++	                while (-1 !== (dd = parts.indexOf('..', dd + 1))) {
++	                    const p = parts[dd - 1];
++	                    if (p && p !== '.' && p !== '..' && p !== '**') {
++	                        didSomething = true;
++	                        const needDot = dd === 1 && parts[dd + 1] === '**';
++	                        const splin = needDot ? ['.'] : [];
++	                        parts.splice(dd - 1, 2, ...splin);
++	                        if (parts.length === 0)
++	                            parts.push('');
++	                        dd -= 2;
++	                    }
++	                }
++	            }
++	        } while (didSomething);
++	        return globParts;
++	    }
++	    // second phase: multi-pattern dedupes
++	    // {<pre>/*/<rest>,<pre>/<p>/<rest>} -> <pre>/*/<rest>
++	    // {<pre>/<rest>,<pre>/<rest>} -> <pre>/<rest>
++	    // {<pre>/**/<rest>,<pre>/<rest>} -> <pre>/**/<rest>
++	    //
++	    // {<pre>/**/<rest>,<pre>/**/<p>/<rest>} -> <pre>/**/<rest>
++	    // ^-- not valid because ** doens't follow symlinks
++	    secondPhasePreProcess(globParts) {
++	        for (let i = 0; i < globParts.length - 1; i++) {
++	            for (let j = i + 1; j < globParts.length; j++) {
++	                const matched = this.partsMatch(globParts[i], globParts[j], !this.preserveMultipleSlashes);
++	                if (matched) {
++	                    globParts[i] = [];
++	                    globParts[j] = matched;
++	                    break;
++	                }
++	            }
++	        }
++	        return globParts.filter(gs => gs.length);
++	    }
++	    partsMatch(a, b, emptyGSMatch = false) {
++	        let ai = 0;
++	        let bi = 0;
++	        let result = [];
++	        let which = '';
++	        while (ai < a.length && bi < b.length) {
++	            if (a[ai] === b[bi]) {
++	                result.push(which === 'b' ? b[bi] : a[ai]);
++	                ai++;
++	                bi++;
++	            }
++	            else if (emptyGSMatch && a[ai] === '**' && b[bi] === a[ai + 1]) {
++	                result.push(a[ai]);
++	                ai++;
++	            }
++	            else if (emptyGSMatch && b[bi] === '**' && a[ai] === b[bi + 1]) {
++	                result.push(b[bi]);
++	                bi++;
++	            }
++	            else if (a[ai] === '*' &&
++	                b[bi] &&
++	                (this.options.dot || !b[bi].startsWith('.')) &&
++	                b[bi] !== '**') {
++	                if (which === 'b')
++	                    return false;
++	                which = 'a';
++	                result.push(a[ai]);
++	                ai++;
++	                bi++;
++	            }
++	            else if (b[bi] === '*' &&
++	                a[ai] &&
++	                (this.options.dot || !a[ai].startsWith('.')) &&
++	                a[ai] !== '**') {
++	                if (which === 'a')
++	                    return false;
++	                which = 'b';
++	                result.push(b[bi]);
++	                ai++;
++	                bi++;
++	            }
++	            else {
++	                return false;
++	            }
++	        }
++	        // if we fall out of the loop, it means they two are identical
++	        // as long as their lengths match
++	        return a.length === b.length && result;
++	    }
++	    parseNegate() {
++	        if (this.nonegate)
++	            return;
++	        const pattern = this.pattern;
++	        let negate = false;
++	        let negateOffset = 0;
++	        for (let i = 0; i < pattern.length && pattern.charAt(i) === '!'; i++) {
++	            negate = !negate;
++	            negateOffset++;
++	        }
++	        if (negateOffset)
++	            this.pattern = pattern.slice(negateOffset);
++	        this.negate = negate;
++	    }
++	    // set partial to true to test if, for example,
++	    // "/a/b" matches the start of "/*/b/*/d"
++	    // Partial means, if you run out of file before you run
++	    // out of pattern, then that's fine, as long as all
++	    // the parts match.
++	    matchOne(file, pattern, partial = false) {
++	        const options = this.options;
++	        // UNC paths like //?/X:/... can match X:/... and vice versa
++	        // Drive letters in absolute drive or unc paths are always compared
++	        // case-insensitively.
++	        if (this.isWindows) {
++	            const fileDrive = typeof file[0] === 'string' && /^[a-z]:$/i.test(file[0]);
++	            const fileUNC = !fileDrive &&
++	                file[0] === '' &&
++	                file[1] === '' &&
++	                file[2] === '?' &&
++	                /^[a-z]:$/i.test(file[3]);
++	            const patternDrive = typeof pattern[0] === 'string' && /^[a-z]:$/i.test(pattern[0]);
++	            const patternUNC = !patternDrive &&
++	                pattern[0] === '' &&
++	                pattern[1] === '' &&
++	                pattern[2] === '?' &&
++	                typeof pattern[3] === 'string' &&
++	                /^[a-z]:$/i.test(pattern[3]);
++	            const fdi = fileUNC ? 3 : fileDrive ? 0 : undefined;
++	            const pdi = patternUNC ? 3 : patternDrive ? 0 : undefined;
++	            if (typeof fdi === 'number' && typeof pdi === 'number') {
++	                const [fd, pd] = [file[fdi], pattern[pdi]];
++	                if (fd.toLowerCase() === pd.toLowerCase()) {
++	                    pattern[pdi] = fd;
++	                    if (pdi > fdi) {
++	                        pattern = pattern.slice(pdi);
++	                    }
++	                    else if (fdi > pdi) {
++	                        file = file.slice(fdi);
++	                    }
++	                }
++	            }
++	        }
++	        // resolve and reduce . and .. portions in the file as well.
++	        // dont' need to do the second phase, because it's only one string[]
++	        const { optimizationLevel = 1 } = this.options;
++	        if (optimizationLevel >= 2) {
++	            file = this.levelTwoFileOptimize(file);
++	        }
++	        this.debug('matchOne', this, { file, pattern });
++	        this.debug('matchOne', file.length, pattern.length);
++	        for (var fi = 0, pi = 0, fl = file.length, pl = pattern.length; fi < fl && pi < pl; fi++, pi++) {
++	            this.debug('matchOne loop');
++	            var p = pattern[pi];
++	            var f = file[fi];
++	            this.debug(pattern, p, f);
++	            // should be impossible.
++	            // some invalid regexp stuff in the set.
++	            /* c8 ignore start */
++	            if (p === false) {
++	                return false;
++	            }
++	            /* c8 ignore stop */
++	            if (p === exports.GLOBSTAR) {
++	                this.debug('GLOBSTAR', [pattern, p, f]);
++	                // "**"
++	                // a/**/b/**/c would match the following:
++	                // a/b/x/y/z/c
++	                // a/x/y/z/b/c
++	                // a/b/x/b/x/c
++	                // a/b/c
++	                // To do this, take the rest of the pattern after
++	                // the **, and see if it would match the file remainder.
++	                // If so, return success.
++	                // If not, the ** "swallows" a segment, and try again.
++	                // This is recursively awful.
++	                //
++	                // a/**/b/**/c matching a/b/x/y/z/c
++	                // - a matches a
++	                // - doublestar
++	                //   - matchOne(b/x/y/z/c, b/**/c)
++	                //     - b matches b
++	                //     - doublestar
++	                //       - matchOne(x/y/z/c, c) -> no
++	                //       - matchOne(y/z/c, c) -> no
++	                //       - matchOne(z/c, c) -> no
++	                //       - matchOne(c, c) yes, hit
++	                var fr = fi;
++	                var pr = pi + 1;
++	                if (pr === pl) {
++	                    this.debug('** at the end');
++	                    // a ** at the end will just swallow the rest.
++	                    // We have found a match.
++	                    // however, it will not swallow /.x, unless
++	                    // options.dot is set.
++	                    // . and .. are *never* matched by **, for explosively
++	                    // exponential reasons.
++	                    for (; fi < fl; fi++) {
++	                        if (file[fi] === '.' ||
++	                            file[fi] === '..' ||
++	                            (!options.dot && file[fi].charAt(0) === '.'))
++	                            return false;
++	                    }
++	                    return true;
++	                }
++	                // ok, let's see if we can swallow whatever we can.
++	                while (fr < fl) {
++	                    var swallowee = file[fr];
++	                    this.debug('\nglobstar while', file, fr, pattern, pr, swallowee);
++	                    // XXX remove this slice.  Just pass the start index.
++	                    if (this.matchOne(file.slice(fr), pattern.slice(pr), partial)) {
++	                        this.debug('globstar found match!', fr, fl, swallowee);
++	                        // found a match.
++	                        return true;
++	                    }
++	                    else {
++	                        // can't swallow "." or ".." ever.
++	                        // can only swallow ".foo" when explicitly asked.
++	                        if (swallowee === '.' ||
++	                            swallowee === '..' ||
++	                            (!options.dot && swallowee.charAt(0) === '.')) {
++	                            this.debug('dot detected!', file, fr, pattern, pr);
++	                            break;
++	                        }
++	                        // ** swallows a segment, and continue.
++	                        this.debug('globstar swallow a segment, and continue');
++	                        fr++;
++	                    }
++	                }
++	                // no match was found.
++	                // However, in partial mode, we can't say this is necessarily over.
++	                /* c8 ignore start */
++	                if (partial) {
++	                    // ran out of file
++	                    this.debug('\n>>> no match, partial?', file, fr, pattern, pr);
++	                    if (fr === fl) {
++	                        return true;
++	                    }
++	                }
++	                /* c8 ignore stop */
++	                return false;
++	            }
++	            // something other than **
++	            // non-magic patterns just have to match exactly
++	            // patterns with magic have been turned into regexps.
++	            let hit;
++	            if (typeof p === 'string') {
++	                hit = f === p;
++	                this.debug('string match', p, f, hit);
++	            }
++	            else {
++	                hit = p.test(f);
++	                this.debug('pattern match', p, f, hit);
++	            }
++	            if (!hit)
++	                return false;
++	        }
++	        // Note: ending in / means that we'll get a final ""
++	        // at the end of the pattern.  This can only match a
++	        // corresponding "" at the end of the file.
++	        // If the file ends in /, then it can only match a
++	        // a pattern that ends in /, unless the pattern just
++	        // doesn't have any more for it. But, a/b/ should *not*
++	        // match "a/b/*", even though "" matches against the
++	        // [^/]*? pattern, except in partial mode, where it might
++	        // simply not be reached yet.
++	        // However, a/b/ should still satisfy a/*
++	        // now either we fell off the end of the pattern, or we're done.
++	        if (fi === fl && pi === pl) {
++	            // ran out of pattern and filename at the same time.
++	            // an exact hit!
++	            return true;
++	        }
++	        else if (fi === fl) {
++	            // ran out of file, but still had pattern left.
++	            // this is ok if we're doing the match as part of
++	            // a glob fs traversal.
++	            return partial;
++	        }
++	        else if (pi === pl) {
++	            // ran out of pattern, still have file left.
++	            // this is only acceptable if we're on the very last
++	            // empty segment of a file with a trailing slash.
++	            // a/* should match a/b/
++	            return fi === fl - 1 && file[fi] === '';
++	            /* c8 ignore start */
++	        }
++	        else {
++	            // should be unreachable.
++	            throw new Error('wtf?');
++	        }
++	        /* c8 ignore stop */
++	    }
++	    braceExpand() {
++	        return (0, exports.braceExpand)(this.pattern, this.options);
++	    }
++	    parse(pattern) {
++	        (0, assert_valid_pattern_js_1.assertValidPattern)(pattern);
++	        const options = this.options;
++	        // shortcuts
++	        if (pattern === '**')
++	            return exports.GLOBSTAR;
++	        if (pattern === '')
++	            return '';
++	        // far and away, the most common glob pattern parts are
++	        // *, *.*, and *.<ext>  Add a fast check method for those.
++	        let m;
++	        let fastTest = null;
++	        if ((m = pattern.match(starRE))) {
++	            fastTest = options.dot ? starTestDot : starTest;
++	        }
++	        else if ((m = pattern.match(starDotExtRE))) {
++	            fastTest = (options.nocase
++	                ? options.dot
++	                    ? starDotExtTestNocaseDot
++	                    : starDotExtTestNocase
++	                : options.dot
++	                    ? starDotExtTestDot
++	                    : starDotExtTest)(m[1]);
++	        }
++	        else if ((m = pattern.match(qmarksRE))) {
++	            fastTest = (options.nocase
++	                ? options.dot
++	                    ? qmarksTestNocaseDot
++	                    : qmarksTestNocase
++	                : options.dot
++	                    ? qmarksTestDot
++	                    : qmarksTest)(m);
++	        }
++	        else if ((m = pattern.match(starDotStarRE))) {
++	            fastTest = options.dot ? starDotStarTestDot : starDotStarTest;
++	        }
++	        else if ((m = pattern.match(dotStarRE))) {
++	            fastTest = dotStarTest;
++	        }
++	        const re = ast_js_1.AST.fromGlob(pattern, this.options).toMMPattern();
++	        if (fastTest && typeof re === 'object') {
++	            // Avoids overriding in frozen environments
++	            Reflect.defineProperty(re, 'test', { value: fastTest });
++	        }
++	        return re;
++	    }
++	    makeRe() {
++	        if (this.regexp || this.regexp === false)
++	            return this.regexp;
++	        // at this point, this.set is a 2d array of partial
++	        // pattern strings, or "**".
++	        //
++	        // It's better to use .match().  This function shouldn't
++	        // be used, really, but it's pretty convenient sometimes,
++	        // when you just want to work with a regex.
++	        const set = this.set;
++	        if (!set.length) {
++	            this.regexp = false;
++	            return this.regexp;
++	        }
++	        const options = this.options;
++	        const twoStar = options.noglobstar
++	            ? star
++	            : options.dot
++	                ? twoStarDot
++	                : twoStarNoDot;
++	        const flags = new Set(options.nocase ? ['i'] : []);
++	        // regexpify non-globstar patterns
++	        // if ** is only item, then we just do one twoStar
++	        // if ** is first, and there are more, prepend (\/|twoStar\/)? to next
++	        // if ** is last, append (\/twoStar|) to previous
++	        // if ** is in the middle, append (\/|\/twoStar\/) to previous
++	        // then filter out GLOBSTAR symbols
++	        let re = set
++	            .map(pattern => {
++	            const pp = pattern.map(p => {
++	                if (p instanceof RegExp) {
++	                    for (const f of p.flags.split(''))
++	                        flags.add(f);
++	                }
++	                return typeof p === 'string'
++	                    ? regExpEscape(p)
++	                    : p === exports.GLOBSTAR
++	                        ? exports.GLOBSTAR
++	                        : p._src;
++	            });
++	            pp.forEach((p, i) => {
++	                const next = pp[i + 1];
++	                const prev = pp[i - 1];
++	                if (p !== exports.GLOBSTAR || prev === exports.GLOBSTAR) {
++	                    return;
++	                }
++	                if (prev === undefined) {
++	                    if (next !== undefined && next !== exports.GLOBSTAR) {
++	                        pp[i + 1] = '(?:\\/|' + twoStar + '\\/)?' + next;
++	                    }
++	                    else {
++	                        pp[i] = twoStar;
++	                    }
++	                }
++	                else if (next === undefined) {
++	                    pp[i - 1] = prev + '(?:\\/|' + twoStar + ')?';
++	                }
++	                else if (next !== exports.GLOBSTAR) {
++	                    pp[i - 1] = prev + '(?:\\/|\\/' + twoStar + '\\/)' + next;
++	                    pp[i + 1] = exports.GLOBSTAR;
++	                }
++	            });
++	            return pp.filter(p => p !== exports.GLOBSTAR).join('/');
++	        })
++	            .join('|');
++	        // need to wrap in parens if we had more than one thing with |,
++	        // otherwise only the first will be anchored to ^ and the last to $
++	        const [open, close] = set.length > 1 ? ['(?:', ')'] : ['', ''];
++	        // must match entire pattern
++	        // ending in a * or ** will make it less strict.
++	        re = '^' + open + re + close + '$';
++	        // can match anything, as long as it's not this.
++	        if (this.negate)
++	            re = '^(?!' + re + ').+$';
++	        try {
++	            this.regexp = new RegExp(re, [...flags].join(''));
++	            /* c8 ignore start */
++	        }
++	        catch (ex) {
++	            // should be impossible
++	            this.regexp = false;
++	        }
++	        /* c8 ignore stop */
++	        return this.regexp;
++	    }
++	    slashSplit(p) {
++	        // if p starts with // on windows, we preserve that
++	        // so that UNC paths aren't broken.  Otherwise, any number of
++	        // / characters are coalesced into one, unless
++	        // preserveMultipleSlashes is set to true.
++	        if (this.preserveMultipleSlashes) {
++	            return p.split('/');
++	        }
++	        else if (this.isWindows && /^\/\/[^\/]+/.test(p)) {
++	            // add an extra '' for the one we lose
++	            return ['', ...p.split(/\/+/)];
++	        }
++	        else {
++	            return p.split(/\/+/);
++	        }
++	    }
++	    match(f, partial = this.partial) {
++	        this.debug('match', f, this.pattern);
++	        // short-circuit in the case of busted things.
++	        // comments, etc.
++	        if (this.comment) {
++	            return false;
++	        }
++	        if (this.empty) {
++	            return f === '';
++	        }
++	        if (f === '/' && partial) {
++	            return true;
++	        }
++	        const options = this.options;
++	        // windows: need to use /, not \
++	        if (this.isWindows) {
++	            f = f.split('\\').join('/');
++	        }
++	        // treat the test path as a set of pathparts.
++	        const ff = this.slashSplit(f);
++	        this.debug(this.pattern, 'split', ff);
++	        // just ONE of the pattern sets in this.set needs to match
++	        // in order for it to be valid.  If negating, then just one
++	        // match means that we have failed.
++	        // Either way, return on the first hit.
++	        const set = this.set;
++	        this.debug(this.pattern, 'set', set);
++	        // Find the basename of the path by looking for the last non-empty segment
++	        let filename = ff[ff.length - 1];
++	        if (!filename) {
++	            for (let i = ff.length - 2; !filename && i >= 0; i--) {
++	                filename = ff[i];
++	            }
++	        }
++	        for (let i = 0; i < set.length; i++) {
++	            const pattern = set[i];
++	            let file = ff;
++	            if (options.matchBase && pattern.length === 1) {
++	                file = [filename];
++	            }
++	            const hit = this.matchOne(file, pattern, partial);
++	            if (hit) {
++	                if (options.flipNegate) {
++	                    return true;
++	                }
++	                return !this.negate;
++	            }
++	        }
++	        // didn't get any hits.  this is success if it's a negative
++	        // pattern, failure otherwise.
++	        if (options.flipNegate) {
++	            return false;
++	        }
++	        return this.negate;
++	    }
++	    static defaults(def) {
++	        return exports.minimatch.defaults(def).Minimatch;
++	    }
++	}
++	exports.Minimatch = Minimatch;
++	/* c8 ignore start */
++	var ast_js_2 = ast;
++	Object.defineProperty(exports, "AST", { enumerable: true, get: function () { return ast_js_2.AST; } });
++	var escape_js_2 = _escape;
++	Object.defineProperty(exports, "escape", { enumerable: true, get: function () { return escape_js_2.escape; } });
++	var unescape_js_2 = _unescape;
++	Object.defineProperty(exports, "unescape", { enumerable: true, get: function () { return unescape_js_2.unescape; } });
++	/* c8 ignore stop */
++	exports.minimatch.AST = ast_js_1.AST;
++	exports.minimatch.Minimatch = Minimatch;
++	exports.minimatch.escape = escape_js_1.escape;
++	exports.minimatch.unescape = unescape_js_1.unescape;
++	
++} (commonjs));
++
++const fs = require$$0;
++const path = path$1;
++const EE = require$$2.EventEmitter;
++const Minimatch = commonjs.Minimatch;
++
++class Walker extends EE {
++  constructor (opts) {
++    opts = opts || {};
++    super(opts);
++    // set to true if this.path is a symlink, whether follow is true or not
++    this.isSymbolicLink = opts.isSymbolicLink;
++    this.path = opts.path || process.cwd();
++    this.basename = path.basename(this.path);
++    this.ignoreFiles = opts.ignoreFiles || ['.ignore'];
++    this.ignoreRules = {};
++    this.parent = opts.parent || null;
++    this.includeEmpty = !!opts.includeEmpty;
++    this.root = this.parent ? this.parent.root : this.path;
++    this.follow = !!opts.follow;
++    this.result = this.parent ? this.parent.result : new Set();
++    this.entries = null;
++    this.sawError = false;
++    this.exact = opts.exact;
++  }
++
++  sort (a, b) {
++    return a.localeCompare(b, 'en')
++  }
++
++  emit (ev, data) {
++    let ret = false;
++    if (!(this.sawError && ev === 'error')) {
++      if (ev === 'error') {
++        this.sawError = true;
++      } else if (ev === 'done' && !this.parent) {
++        data = Array.from(data)
++          .map(e => /^@/.test(e) ? `./${e}` : e).sort(this.sort);
++        this.result = data;
++      }
++
++      if (ev === 'error' && this.parent) {
++        ret = this.parent.emit('error', data);
++      } else {
++        ret = super.emit(ev, data);
++      }
++    }
++    return ret
++  }
++
++  start () {
++    fs.readdir(this.path, (er, entries) =>
++      er ? this.emit('error', er) : this.onReaddir(entries));
++    return this
++  }
++
++  isIgnoreFile (e) {
++    return e !== '.' &&
++      e !== '..' &&
++      this.ignoreFiles.indexOf(e) !== -1
++  }
++
++  onReaddir (entries) {
++    this.entries = entries;
++    if (entries.length === 0) {
++      if (this.includeEmpty) {
++        this.result.add(this.path.slice(this.root.length + 1));
++      }
++      this.emit('done', this.result);
++    } else {
++      const hasIg = this.entries.some(e =>
++        this.isIgnoreFile(e));
++
++      if (hasIg) {
++        this.addIgnoreFiles();
++      } else {
++        this.filterEntries();
++      }
++    }
++  }
++
++  addIgnoreFiles () {
++    const newIg = this.entries
++      .filter(e => this.isIgnoreFile(e));
++
++    let igCount = newIg.length;
++    const then = () => {
++      if (--igCount === 0) {
++        this.filterEntries();
++      }
++    };
++
++    newIg.forEach(e => this.addIgnoreFile(e, then));
++  }
++
++  addIgnoreFile (file, then) {
++    const ig = path.resolve(this.path, file);
++    fs.readFile(ig, 'utf8', (er, data) =>
++      er ? this.emit('error', er) : this.onReadIgnoreFile(file, data, then));
++  }
++
++  onReadIgnoreFile (file, data, then) {
++    const mmopt = {
++      matchBase: true,
++      dot: true,
++      flipNegate: true,
++      nocase: true,
++    };
++    const rules = data.split(/\r?\n/)
++      .filter(line => !/^#|^$/.test(line.trim()))
++      .map(rule => {
++        return new Minimatch(rule.trim(), mmopt)
++      });
++
++    this.ignoreRules[file] = rules;
++
++    then();
++  }
++
++  filterEntries () {
++    // at this point we either have ignore rules, or just inheriting
++    // this exclusion is at the point where we know the list of
++    // entries in the dir, but don't know what they are.  since
++    // some of them *might* be directories, we have to run the
++    // match in dir-mode as well, so that we'll pick up partials
++    // of files that will be included later.  Anything included
++    // at this point will be checked again later once we know
++    // what it is.
++    const filtered = this.entries.map(entry => {
++      // at this point, we don't know if it's a dir or not.
++      const passFile = this.filterEntry(entry);
++      const passDir = this.filterEntry(entry, true);
++      return (passFile || passDir) ? [entry, passFile, passDir] : false
++    }).filter(e => e);
++
++    // now we stat them all
++    // if it's a dir, and passes as a dir, then recurse
++    // if it's not a dir, but passes as a file, add to set
++    let entryCount = filtered.length;
++    if (entryCount === 0) {
++      this.emit('done', this.result);
++    } else {
++      const then = () => {
++        if (--entryCount === 0) {
++          this.emit('done', this.result);
++        }
++      };
++      filtered.forEach(filt => {
++        const entry = filt[0];
++        const file = filt[1];
++        const dir = filt[2];
++        this.stat({ entry, file, dir }, then);
++      });
++    }
++  }
++
++  onstat ({ st, entry, file, dir, isSymbolicLink }, then) {
++    const abs = this.path + '/' + entry;
++    if (!st.isDirectory()) {
++      if (file) {
++        this.result.add(abs.slice(this.root.length + 1));
++      }
++      then();
++    } else {
++      // is a directory
++      if (dir) {
++        this.walker(entry, { isSymbolicLink, exact: file || this.filterEntry(entry + '/') }, then);
++      } else {
++        then();
++      }
++    }
++  }
++
++  stat ({ entry, file, dir }, then) {
++    const abs = this.path + '/' + entry;
++    fs.lstat(abs, (lstatErr, lstatResult) => {
++      if (lstatErr) {
++        this.emit('error', lstatErr);
++      } else {
++        const isSymbolicLink = lstatResult.isSymbolicLink();
++        if (this.follow && isSymbolicLink) {
++          fs.stat(abs, (statErr, statResult) => {
++            if (statErr) {
++              this.emit('error', statErr);
++            } else {
++              this.onstat({ st: statResult, entry, file, dir, isSymbolicLink }, then);
++            }
++          });
++        } else {
++          this.onstat({ st: lstatResult, entry, file, dir, isSymbolicLink }, then);
++        }
++      }
++    });
++  }
++
++  walkerOpt (entry, opts) {
++    return {
++      path: this.path + '/' + entry,
++      parent: this,
++      ignoreFiles: this.ignoreFiles,
++      follow: this.follow,
++      includeEmpty: this.includeEmpty,
++      ...opts,
++    }
++  }
++
++  walker (entry, opts, then) {
++    new Walker(this.walkerOpt(entry, opts)).on('done', then).start();
++  }
++
++  filterEntry (entry, partial, entryBasename) {
++    let included = true;
++
++    // this = /a/b/c
++    // entry = d
++    // parent /a/b sees c/d
++    if (this.parent && this.parent.filterEntry) {
++      const parentEntry = this.basename + '/' + entry;
++      const parentBasename = entryBasename || entry;
++      included = this.parent.filterEntry(parentEntry, partial, parentBasename);
++      if (!included && !this.exact) {
++        return false
++      }
++    }
++
++    this.ignoreFiles.forEach(f => {
++      if (this.ignoreRules[f]) {
++        this.ignoreRules[f].forEach(rule => {
++          // negation means inclusion
++          // so if it's negated, and already included, no need to check
++          // likewise if it's neither negated nor included
++          if (rule.negate !== included) {
++            const isRelativeRule = entryBasename && rule.globParts.some(part =>
++              part.length <= (part.slice(-1)[0] ? 1 : 2)
++            );
++
++            // first, match against /foo/bar
++            // then, against foo/bar
++            // then, in the case of partials, match with a /
++            //   then, if also the rule is relative, match against basename
++            const match = rule.match('/' + entry) ||
++              rule.match(entry) ||
++              !!partial && (
++                rule.match('/' + entry + '/') ||
++                rule.match(entry + '/') ||
++                rule.negate && (
++                  rule.match('/' + entry, true) ||
++                  rule.match(entry, true)) ||
++                isRelativeRule && (
++                  rule.match('/' + entryBasename + '/') ||
++                  rule.match(entryBasename + '/') ||
++                  rule.negate && (
++                    rule.match('/' + entryBasename, true) ||
++                    rule.match(entryBasename, true))));
++
++            if (match) {
++              included = rule.negate;
++            }
++          }
++        });
++      }
++    });
++
++    return included
++  }
++}
++
++class WalkerSync extends Walker {
++  start () {
++    this.onReaddir(fs.readdirSync(this.path));
++    return this
++  }
++
++  addIgnoreFile (file, then) {
++    const ig = path.resolve(this.path, file);
++    this.onReadIgnoreFile(file, fs.readFileSync(ig, 'utf8'), then);
++  }
++
++  stat ({ entry, file, dir }, then) {
++    const abs = this.path + '/' + entry;
++    let st = fs.lstatSync(abs);
++    const isSymbolicLink = st.isSymbolicLink();
++    if (this.follow && isSymbolicLink) {
++      st = fs.statSync(abs);
++    }
++
++    // console.error('STAT SYNC', {st, entry, file, dir, isSymbolicLink, then})
++    this.onstat({ st, entry, file, dir, isSymbolicLink }, then);
++  }
++
++  walker (entry, opts, then) {
++    new WalkerSync(this.walkerOpt(entry, opts)).start();
++    then();
++  }
++}
++
++const walk$1 = (opts, callback) => {
++  const p = new Promise((resolve, reject) => {
++    new Walker(opts).on('done', resolve).on('error', reject).start();
++  });
++  return callback ? p.then(res => callback(null, res), callback) : p
++};
++
++const walkSync = opts => new WalkerSync(opts).start().result;
++
++var lib$1 = walk$1;
++walk$1.sync = walkSync;
++walk$1.Walker = Walker;
++walk$1.WalkerSync = WalkerSync;
++
++const { Walker: IgnoreWalker } = lib$1;
++const { lstatSync: lstat, readFileSync: readFile } = require$$0;
++const { basename, dirname, extname, join, relative, resolve, sep } = path$1;
++
++// symbols used to represent synthetic rule sets
++const defaultRules = Symbol('npm-packlist.rules.default');
++const strictRules = Symbol('npm-packlist.rules.strict');
++
++// There may be others, but :?|<> are handled by node-tar
++const nameIsBadForWindows = file => /\*/.test(file);
++
++// these are the default rules that are applied to everything except for non-link bundled deps
++const defaults = [
++  '.npmignore',
++  '.gitignore',
++  '**/.git',
++  '**/.svn',
++  '**/.hg',
++  '**/CVS',
++  '**/.git/**',
++  '**/.svn/**',
++  '**/.hg/**',
++  '**/CVS/**',
++  '/.lock-wscript',
++  '/.wafpickle-*',
++  '/build/config.gypi',
++  'npm-debug.log',
++  '**/.npmrc',
++  '.*.swp',
++  '.DS_Store',
++  '**/.DS_Store/**',
++  '._*',
++  '**/._*/**',
++  '*.orig',
++  '/archived-packages/**',
++];
++
++const strictDefaults = [
++  // these are forcibly excluded
++  '/.git',
++];
++
++const normalizePath = (path) => path.split('\\').join('/');
++
++const readOutOfTreeIgnoreFiles = (root, rel, result = []) => {
++  for (const file of ['.npmignore', '.gitignore']) {
++    try {
++      const ignoreContent = readFile(join(root, file), { encoding: 'utf8' });
++      result.push(ignoreContent);
++      // break the loop immediately after reading, this allows us to prioritize
++      // the .npmignore and discard the .gitignore if one is present
++      break
++    } catch (err) {
++      // we ignore ENOENT errors completely because we don't care if the file doesn't exist
++      // but we throw everything else because failing to read a file that does exist is
++      // something that the user likely wants to know about
++      // istanbul ignore next -- we do not need to test a thrown error
++      if (err.code !== 'ENOENT') {
++        throw err
++      }
++    }
++  }
++
++  if (!rel) {
++    return result
++  }
++
++  const firstRel = rel.split(sep, 1)[0];
++  const newRoot = join(root, firstRel);
++  const newRel = relative(newRoot, join(root, rel));
++
++  return readOutOfTreeIgnoreFiles(newRoot, newRel, result)
++};
++
++class PackWalker extends IgnoreWalker {
++  constructor (tree, opts) {
++    const options = {
++      ...opts,
++      includeEmpty: false,
++      follow: false,
++      // we path.resolve() here because ignore-walk doesn't do it and we want full paths
++      path: resolve(opts?.path || tree.path).replace(/\\/g, '/'),
++      ignoreFiles: opts?.ignoreFiles || [
++        defaultRules,
++        'package.json',
++        '.npmignore',
++        '.gitignore',
++        strictRules,
++      ],
++    };
++
++    super(options);
++    this.isPackage = options.isPackage;
++    this.seen = options.seen || new Set();
++    this.tree = tree;
++    this.requiredFiles = options.requiredFiles || [];
++
++    const additionalDefaults = [];
++    if (options.prefix && options.workspaces) {
++      const path = normalizePath(options.path);
++      const prefix = normalizePath(options.prefix);
++      const workspaces = options.workspaces.map((ws) => normalizePath(ws));
++
++      // istanbul ignore else - this does nothing unless we need it to
++      if (path !== prefix && workspaces.includes(path)) {
++        // if path and prefix are not the same directory, and workspaces has path in it
++        // then we know path is a workspace directory. in order to not drop ignore rules
++        // from directories between the workspaces root (prefix) and the workspace itself
++        // (path) we need to find and read those now
++        const relpath = relative(options.prefix, dirname(options.path));
++        additionalDefaults.push(...readOutOfTreeIgnoreFiles(options.prefix, relpath));
++      } else if (path === prefix) {
++        // on the other hand, if the path and prefix are the same, then we ignore workspaces
++        // so that we don't pack a workspace as part of the root project. append them as
++        // normalized relative paths from the root
++        additionalDefaults.push(...workspaces.map((w) => normalizePath(relative(options.path, w))));
++      }
++    }
++
++    // go ahead and inject the default rules now
++    this.injectRules(defaultRules, [...defaults, ...additionalDefaults]);
++
++    if (!this.isPackage) {
++      // if this instance is not a package, then place some strict default rules, and append
++      // known required files for this directory
++      this.injectRules(strictRules, [
++        ...strictDefaults,
++        ...this.requiredFiles.map((file) => `!${file}`),
++      ]);
++    }
++  }
++
++  // overridden method: we intercept the reading of the package.json file here so that we can
++  // process it into both the package.json file rules as well as the strictRules synthetic rule set
++  addIgnoreFile (file, callback) {
++    // if we're adding anything other than package.json, then let ignore-walk handle it
++    if (file !== 'package.json' || !this.isPackage) {
++      return super.addIgnoreFile(file, callback)
++    }
++
++    return this.processPackage(callback)
++  }
++
++  // overridden method: if we're done, but we're a package, then we also need to evaluate bundles
++  // before we actually emit our done event
++  emit (ev, data) {
++    if (ev !== 'done' || !this.isPackage) {
++      return super.emit(ev, data)
++    }
++
++    // we intentionally delay the done event while keeping the function sync here
++    // eslint-disable-next-line promise/catch-or-return, promise/always-return
++    this.gatherBundles().then(() => {
++      super.emit('done', this.result);
++    });
++    return true
++  }
++
++  // overridden method: before actually filtering, we make sure that we've removed the rules for
++  // files that should no longer take effect due to our order of precedence
++  filterEntries () {
++    if (this.ignoreRules['package.json']) {
++      // package.json means no .npmignore or .gitignore
++      this.ignoreRules['.npmignore'] = null;
++      this.ignoreRules['.gitignore'] = null;
++    } else if (this.ignoreRules['.npmignore']) {
++      // .npmignore means no .gitignore
++      this.ignoreRules['.gitignore'] = null;
++    }
++
++    return super.filterEntries()
++  }
++
++  // overridden method: we never want to include anything that isn't a file or directory
++  onstat (opts, callback) {
++    if (!opts.st.isFile() && !opts.st.isDirectory()) {
++      return callback()
++    }
++
++    return super.onstat(opts, callback)
++  }
++
++  // overridden method: we want to refuse to pack files that are invalid, node-tar protects us from
++  // a lot of them but not all
++  stat (opts, callback) {
++    if (nameIsBadForWindows(opts.entry)) {
++      return callback()
++    }
++
++    return super.stat(opts, callback)
++  }
++
++  // overridden method: this is called to create options for a child walker when we step
++  // in to a normal child directory (this will never be a bundle). the default method here
++  // copies the root's `ignoreFiles` value, but we don't want to respect package.json for
++  // subdirectories, so we override it with a list that intentionally omits package.json
++  walkerOpt (entry, opts) {
++    let ignoreFiles = null;
++
++    // however, if we have a tree, and we have workspaces, and the directory we're about
++    // to step into is a workspace, then we _do_ want to respect its package.json
++    if (this.tree.workspaces) {
++      const workspaceDirs = [...this.tree.workspaces.values()]
++        .map((dir) => dir.replace(/\\/g, '/'));
++
++      const entryPath = join(this.path, entry).replace(/\\/g, '/');
++      if (workspaceDirs.includes(entryPath)) {
++        ignoreFiles = [
++          defaultRules,
++          'package.json',
++          '.npmignore',
++          '.gitignore',
++          strictRules,
++        ];
++      }
++    } else {
++      ignoreFiles = [
++        defaultRules,
++        '.npmignore',
++        '.gitignore',
++        strictRules,
++      ];
++    }
++
++    return {
++      ...super.walkerOpt(entry, opts),
++      ignoreFiles,
++      // we map over our own requiredFiles and pass ones that are within this entry
++      requiredFiles: this.requiredFiles
++        .map((file) => {
++          if (relative(file, entry) === '..') {
++            return relative(entry, file).replace(/\\/g, '/')
++          }
++          return false
++        })
++        .filter(Boolean),
++    }
++  }
++
++  // overridden method: we want child walkers to be instances of this class, not ignore-walk
++  walker (entry, opts, callback) {
++    new PackWalker(this.tree, this.walkerOpt(entry, opts)).on('done', callback).start();
++  }
++
++  // overridden method: we use a custom sort method to help compressibility
++  sort (a, b) {
++    // optimize for compressibility
++    // extname, then basename, then locale alphabetically
++    // https://twitter.com/isntitvacant/status/1131094910923231232
++    const exta = extname(a).toLowerCase();
++    const extb = extname(b).toLowerCase();
++    const basea = basename(a).toLowerCase();
++    const baseb = basename(b).toLowerCase();
++
++    return exta.localeCompare(extb, 'en') ||
++      basea.localeCompare(baseb, 'en') ||
++      a.localeCompare(b, 'en')
++  }
++
++  // convenience method: this joins the given rules with newlines, appends a trailing newline,
++  // and calls the internal onReadIgnoreFile method
++  injectRules (filename, rules, callback = () => {}) {
++    this.onReadIgnoreFile(filename, `${rules.join('\n')}\n`, callback);
++  }
++
++  // custom method: this is called by addIgnoreFile when we find a package.json, it uses the
++  // arborist tree to pull both default rules and strict rules for the package
++  processPackage (callback) {
++    const {
++      bin,
++      browser,
++      files,
++      main,
++    } = this.tree.package;
++
++    // rules in these arrays are inverted since they are patterns we want to _not_ ignore
++    const ignores = [];
++    const strict = [
++      ...strictDefaults,
++      '!/package.json',
++      '!/readme{,.*[^~$]}',
++      '!/copying{,.*[^~$]}',
++      '!/license{,.*[^~$]}',
++      '!/licence{,.*[^~$]}',
++      '/.git',
++      '/node_modules',
++      '.npmrc',
++      '/package-lock.json',
++      '/yarn.lock',
++      '/pnpm-lock.yaml',
++    ];
++
++    // if we have a files array in our package, we need to pull rules from it
++    if (files) {
++      for (let file of files) {
++        // invert the rule because these are things we want to include
++        if (file.startsWith('./')) {
++          file = file.slice(1);
++        }
++        if (file.endsWith('/*')) {
++          file += '*';
++        }
++        const inverse = `!${file}`;
++        try {
++          // if an entry in the files array is a specific file, then we need to include it as a
++          // strict requirement for this package. if it's a directory or a pattern, it's a default
++          // pattern instead. this is ugly, but we have to stat to find out if it's a file
++          const stat = lstat(join(this.path, file.replace(/^!+/, '')).replace(/\\/g, '/'));
++          // if we have a file and we know that, it's strictly required
++          if (stat.isFile()) {
++            strict.unshift(inverse);
++            this.requiredFiles.push(file.startsWith('/') ? file.slice(1) : file);
++          } else if (stat.isDirectory()) {
++            // otherwise, it's a default ignore, and since we got here we know it's not a pattern
++            // so we include the directory contents
++            ignores.push(inverse);
++            ignores.push(`${inverse}/**`);
++          }
++          // if the thing exists, but is neither a file or a directory, we don't want it at all
++        } catch (err) {
++          // if lstat throws, then we assume we're looking at a pattern and treat it as a default
++          ignores.push(inverse);
++        }
++      }
++
++      // we prepend a '*' to exclude everything, followed by our inverted file rules
++      // which now mean to include those
++      this.injectRules('package.json', ['*', ...ignores]);
++    }
++
++    // browser is required
++    if (browser) {
++      strict.push(`!/${browser}`);
++    }
++
++    // main is required
++    if (main) {
++      strict.push(`!/${main}`);
++    }
++
++    // each bin is required
++    if (bin) {
++      for (const key in bin) {
++        strict.push(`!/${bin[key]}`);
++      }
++    }
++
++    // and now we add all of the strict rules to our synthetic file
++    this.injectRules(strictRules, strict, callback);
++  }
++
++  // custom method: after we've finished gathering the files for the root package, we call this
++  // before emitting the 'done' event in order to gather all of the files for bundled deps
++  async gatherBundles () {
++    if (this.seen.has(this.tree)) {
++      return
++    }
++
++    // add this node to our seen tracker
++    this.seen.add(this.tree);
++
++    // if we're the project root, then we look at our bundleDependencies, otherwise we got here
++    // because we're a bundled dependency of the root, which means we need to include all prod
++    // and optional dependencies in the bundle
++    let toBundle;
++    if (this.tree.isProjectRoot) {
++      const { bundleDependencies } = this.tree.package;
++      toBundle = bundleDependencies || [];
++    } else {
++      const { dependencies, optionalDependencies } = this.tree.package;
++      toBundle = Object.keys(dependencies || {}).concat(Object.keys(optionalDependencies || {}));
++    }
++
++    for (const dep of toBundle) {
++      const edge = this.tree.edgesOut.get(dep);
++      // no edgeOut = missing node, so skip it. we can't pack it if it's not here
++      // we also refuse to pack peer dependencies and dev dependencies
++      if (!edge || edge.peer || edge.dev) {
++        continue
++      }
++
++      // get a reference to the node we're bundling
++      const node = this.tree.edgesOut.get(dep).to;
++      // if there's no node, this is most likely an optional dependency that hasn't been
++      // installed. just skip it.
++      if (!node) {
++        continue
++      }
++      // we use node.path for the path because we want the location the node was linked to,
++      // not where it actually lives on disk
++      const path = node.path;
++      // but link nodes don't have edgesOut, so we need to pass in the target of the node
++      // in order to make sure we correctly traverse its dependencies
++      const tree = node.target;
++
++      // and start building options to be passed to the walker for this package
++      const walkerOpts = {
++        path,
++        isPackage: true,
++        ignoreFiles: [],
++        seen: this.seen, // pass through seen so we can prevent infinite circular loops
++      };
++
++      // if our node is a link, we apply defaultRules. we don't do this for regular bundled
++      // deps because their .npmignore and .gitignore files are excluded by default and may
++      // override defaults
++      if (node.isLink) {
++        walkerOpts.ignoreFiles.push(defaultRules);
++      }
++
++      // _all_ nodes will follow package.json rules from their package root
++      walkerOpts.ignoreFiles.push('package.json');
++
++      // only link nodes will obey .npmignore or .gitignore
++      if (node.isLink) {
++        walkerOpts.ignoreFiles.push('.npmignore');
++        walkerOpts.ignoreFiles.push('.gitignore');
++      }
++
++      // _all_ nodes follow strict rules
++      walkerOpts.ignoreFiles.push(strictRules);
++
++      // create a walker for this dependency and gather its results
++      const walker = new PackWalker(tree, walkerOpts);
++      const bundled = await new Promise((pResolve, pReject) => {
++        walker.on('error', pReject);
++        walker.on('done', pResolve);
++        walker.start();
++      });
++
++      // now we make sure we have our paths correct from the root, and accumulate everything into
++      // our own result set to deduplicate
++      const relativeFrom = relative(this.root, walker.path);
++      for (const file of bundled) {
++        this.result.add(join(relativeFrom, file).replace(/\\/g, '/'));
++      }
++    }
++  }
++}
++
++const walk = (tree, options, callback) => {
++  if (typeof options === 'function') {
++    callback = options;
++    options = {};
++  }
++  const p = new Promise((pResolve, pReject) => {
++    new PackWalker(tree, { ...options, isPackage: true })
++      .on('done', pResolve).on('error', pReject).start();
++  });
++  return callback ? p.then(res => callback(null, res), callback) : p
++};
++
++var lib = walk;
++walk.Walker = PackWalker;
++
++var packlist = /*@__PURE__*/getDefaultExportFromCjs(lib);
++
++const edgesOut = /* @__PURE__ */ new Map();
++const getNpmPacklist = (absoluteLinkPackagePath, packageJson) => packlist({
++  path: absoluteLinkPackagePath,
++  package: packageJson,
++  // @ts-expect-error outdated types
++  edgesOut
++});
++
++const cwd = process.cwd();
++const cwdPath = (filePath) => path$2.relative(cwd, filePath);
++
++const getPrettyTime = () => (/* @__PURE__ */ new Date()).toLocaleTimeString(
++  void 0,
++  {
++    hour: "numeric",
++    minute: "numeric",
++    second: "numeric",
++    hour12: true
++  }
++);
++
++const waitFor = (test, interval, maxTimeout, errorMessage) => new Promise(async (resolve, reject) => {
++  const startTime = Date.now();
++  let attempts = 0;
++  const maxAttempts = Math.floor(maxTimeout / interval);
++  const attempt = async () => {
++    attempts++;
++    try {
++      const result = await test();
++      if (result) {
++        return resolve();
++      }
++      throw new Error();
++    } catch (error) {
++      const numAttemptsRemaining = maxAttempts - attempts;
++      console.error(red(`  \u{1F615} Error: ${errorMessage}`), " retrying in", yellow(`${interval}ms`), ".", yellow(`${numAttemptsRemaining} attempts remaining`));
++    }
++    if (Date.now() - startTime >= maxTimeout) {
++      console.error(red(`  \u{1F635} Error: ${errorMessage}. Giving up after ${maxAttempts} attempts`));
++      return reject();
++    }
++    setTimeout(attempt, interval);
++  };
++  await attempt();
++});
++
++const hardlinkPackage = async (linkPath, absoluteLinkPackagePath, packageJson, publishFilesPromise = getNpmPacklist(
++  absoluteLinkPackagePath,
++  packageJson
++), interval = 500, maxBuildTime = 3e4) => {
++  const [oldPublishFiles, publishFiles] = await Promise.all([
++    getNpmPacklist(
++      linkPath,
++      /**
++       * This is evaluated in the context of the new package.json since that
++       * defines which files belong to the package.
++       */
++      packageJson
++    ),
++    publishFilesPromise
++  ]);
++  console.log(`Linking ${magenta(packageJson.name)} in publish mode:`);
++  await Promise.all(publishFiles.map(async (file) => {
++    const sourcePath = path$2.join(absoluteLinkPackagePath, file);
++    await waitFor(
++      async () => await fsExists(sourcePath),
++      interval,
++      maxBuildTime,
++      ""
++    );
++  }));
++  await Promise.all(
++    publishFiles.map(async (file) => {
++      const sourcePath = path$2.join(absoluteLinkPackagePath, file);
++      const targetPath = path$2.join(linkPath, file);
++      await fs$2.mkdir(
++        path$2.dirname(targetPath),
++        { recursive: true }
++      );
++      try {
++        await hardlink(sourcePath, targetPath);
++      } catch (error) {
++        console.warn(
++          `  ${red("\u2716 Failed to link")}`,
++          cyan(cwdPath(targetPath)),
++          "\u2192",
++          cyan(cwdPath(sourcePath)),
++          error.message ?? error
++        );
++        return;
++      }
++      const fileIndex = oldPublishFiles.indexOf(file);
++      if (fileIndex > -1) {
++        oldPublishFiles.splice(fileIndex, 1);
++      }
++      console.log(
++        `  ${green("\u2714")}`,
++        cyan(cwdPath(targetPath)),
++        "\u2192",
++        cyan(cwdPath(sourcePath))
++      );
++    })
++  );
++  await Promise.all(
++    oldPublishFiles.map(async (file) => {
++      console.log(cyan(`  \u{1F6AE} ${file} no longer in publish list, deleting it. If you did not intend to do this, something probably went wrong. See https://github.com/privatenumber/link?tab=readme-ov-file#publish-mode`));
++      await fs$2.rm(path$2.join(linkPath, file), {
++        force: true
++      });
++    })
++  );
++};
++
++const sleep = (ms) => new Promise((resolve) => setTimeout(resolve, ms));
++
++const isValidSetup = async (linkPath, expectedPrefix) => {
++  const linkPathStat = await fs$2.stat(linkPath).catch(() => null);
++  if (!linkPathStat?.isDirectory()) {
++    return false;
++  }
++  const linkPathReal = await fs$2.realpath(linkPath);
++  return linkPathReal.startsWith(expectedPrefix);
++};
++const linkPublishMode = async (basePackagePath, linkPackagePath, watchMode, litmus, delay = 2e3, interval = 500, maxBuildTime = 3e4) => {
++  const absoluteLinkPackagePath = path$2.resolve(basePackagePath, linkPackagePath);
++  const packageJson = await readPackageJson(absoluteLinkPackagePath);
++  const expectedPrefix = path$2.join(basePackagePath, "node_modules/");
++  const linkPath = path$2.join(expectedPrefix, packageJson.name);
++  if (!await isValidSetup(linkPath, expectedPrefix)) {
++    console.error(
++      defaultOutdent`
++			Error: Package ${magenta(packageJson.name)} is not set up
++	
++			${bold("Setup instructions")}
++			1. In the Dependency package, create a tarball:
++			  ${dim("$ npm pack")}
++	
++			2. In the Consuming package, install the tarball and link the Dependency:
++			  ${dim("$ npm install --no-save <dependency-tarball>")}
++			  ${dim("$ npx link publish <dependency-path>")}
++	
++			3. Start developing!
++	
++			Learn more: https://npmjs.com/link
++			`
++    );
++    return;
++  }
++  const debouncedSleepForDelay = pDebounce(sleep, delay);
++  const debouncedHardlinkPackage = debounce$1(hardlinkPackage, delay);
++  await hardlinkPackage(
++    linkPath,
++    absoluteLinkPackagePath,
++    packageJson
++  );
++  if (watchMode) {
++    const globOptions = {
++      globstar: true,
++      extended: true
++    };
++    const ignoreFiles = [
++      // Files
++      "**/{npm-debug.log,*.orig,package-lock.json,yarn.lock,pnpm-lock.yaml}",
++      // Folders
++      "**/node_modules/**",
++      // Hidden files
++      "**/.{_*,*.swp,DS_Store,gitignore,npmrc,npmignore,lock-wscript,.wafpickle-*}",
++      // Hidden folders
++      "**/.{_*,git,svn,hg,CVS}/**"
++    ].map((glob) => globToRegexp$1(glob, globOptions));
++    const watcher = fs$2.watch(
++      absoluteLinkPackagePath,
++      { recursive: true }
++    );
++    for await (const { eventType, filename } of watcher) {
++      if (!filename) {
++        continue;
++      }
++      const shouldIgnore = ignoreFiles.some((ignoreFile) => ignoreFile.test(filename));
++      if (shouldIgnore) {
++        continue;
++      }
++      await debouncedSleepForDelay(delay);
++      if (litmus) {
++        await waitFor(
++          async () => fsExists(path$2.join(absoluteLinkPackagePath, litmus)),
++          interval,
++          maxBuildTime,
++          ""
++        );
++      }
++      const publishFiles = await getNpmPacklist(
++        absoluteLinkPackagePath,
++        packageJson
++      );
++      if (!publishFiles.includes(filename)) {
++        continue;
++      }
++      console.log(`
++${dim(getPrettyTime())}`, "Detected", yellow(eventType), "in", `${cyan(cwdPath(path$2.join(absoluteLinkPackagePath, filename)))}
++`);
++      await debouncedHardlinkPackage(
++        linkPath,
++        absoluteLinkPackagePath,
++        packageJson,
++        publishFiles
++      );
++    }
++  }
++};
++
++const publishCommand = G({
++  name: "publish",
++  parameters: ["<package paths...>"],
++  flags: {
++    watch: {
++      type: Boolean,
++      alias: "w",
++      description: "Watch for changes in the package and automatically relink"
++    },
++    litmus: {
++      type: String,
++      alias: "l",
++      description: "If using the --watch flag, look for this file in the linked package to see if it's ready to re-link"
++    },
++    delay: {
++      type: Number,
++      alias: "d",
++      description: "If using the --watch flag without the litmus flag, wait this amount of time (in ms) after detecting changes before refreshing the packlist and re-linking",
++      default: 2e3
++    },
++    interval: {
++      type: Number,
++      alias: "i",
++      description: "If using the --watch flag, poll for completed builds at this frequency (in ms)",
++      default: 500
++    },
++    maxBuildTime: {
++      type: Number,
++      alias: "m",
++      description: "If using the --watch flag, the maximum amount of time to wait for all expected files to appear before re-linking",
++      default: 3e4
++    }
++  },
++  help: {
++    description: "Link a package to simulate an environment similar to `npm install`"
++  }
++});
++const publishHandler = async (cwdProjectPath, packagePaths, flags) => {
++  if (packagePaths.length > 0) {
++    await Promise.all(
++      packagePaths.map(
++        (linkPackagePath) => linkPublishMode(
++          cwdProjectPath,
++          linkPackagePath,
++          flags.watch,
++          flags.litmus,
++          flags.delay,
++          flags.interval,
++          flags.maxBuildTime
++        )
++      )
++    );
++  }
++};
++
++(async () => {
++  const argv = Z({
++    name: "link",
++    parameters: ["[package paths...]"],
++    flags: {
++      deep: {
++        type: Boolean,
++        alias: "d",
++        description: "Run `npx link` on dependencies if they have a link.config.json"
++      }
++    },
++    help: {
++      description: "A better `npm link` -- symlink local dependencies to the current project",
++      render: (nodes, renderers) => {
++        nodes[0].data = "npx link\n";
++        nodes.splice(2, 0, {
++          type: "section",
++          data: {
++            title: "Website",
++            body: "https://www.npmjs.com/package/link"
++          }
++        });
++        return renderers.render(nodes);
++      }
++    },
++    commands: [
++      publishCommand
++    ]
++  });
++  const cwdProjectPath = await fs$1.realpath(process.cwd());
++  if (!argv.command) {
++    const { packagePaths } = argv._;
++    if (packagePaths.length > 0) {
++      await Promise.all(
++        packagePaths.map(
++          (linkPackagePath) => linkPackage(
++            cwdProjectPath,
++            linkPackagePath,
++            argv.flags
++          )
++        )
++      );
++      return;
++    }
++    const config = await loadConfig(cwdProjectPath);
++    if (!config) {
++      console.warn(
++        defaultOutdent`
+ 				Warning: Config file "link.config.json" not found in current directory.
+ 							Read the documentation to learn more: https://www.npmjs.com/package/link
+-				`),u.showHelp();return}await Vu(e,D,{deep:u.flags.deep})}})().catch(u=>{console.error("Error:",u.message),process.exit(1)});
++				`
++      );
++      argv.showHelp();
++      return;
++    }
++    await linkFromConfig(
++      cwdProjectPath,
++      config,
++      {
++        deep: argv.flags.deep
++      }
++    );
++  } else if (argv.command === "publish") {
++    await publishHandler(
++      cwdProjectPath,
++      argv._,
++      argv.flags
++    );
++  }
++})().catch((error) => {
++  console.error("Error:", error.message);
++  process.exit(1);
++});
+diff --git a/node_modules/link/dist/libs/fsevents.node b/node_modules/link/dist/libs/fsevents.node
+new file mode 100755
+index 0000000..1cc3345
+Binary files /dev/null and b/node_modules/link/dist/libs/fsevents.node differ
diff --git a/patches/react-compiler-healthcheck+0.0.0-experimental-b130d5f-20240625+001+initial.patch b/patches/react-compiler-healthcheck+0.0.0-experimental-b130d5f-20240625+001+initial.patch
new file mode 100644
index 000000000000..d7c02701a636
--- /dev/null
+++ b/patches/react-compiler-healthcheck+0.0.0-experimental-b130d5f-20240625+001+initial.patch
@@ -0,0 +1,90 @@
+diff --git a/node_modules/react-compiler-healthcheck/dist/index.js b/node_modules/react-compiler-healthcheck/dist/index.js
+index b427385..4bf23db 100755
+--- a/node_modules/react-compiler-healthcheck/dist/index.js
++++ b/node_modules/react-compiler-healthcheck/dist/index.js
+@@ -69154,7 +69154,7 @@ var reactCompilerCheck = {
+       compile(source, path);
+     }
+   },
+-  report() {
++  report(verbose) {
+     const totalComponents =
+       SucessfulCompilation.length +
+       countUniqueLocInEvents(OtherFailures) +
+@@ -69164,6 +69164,50 @@ var reactCompilerCheck = {
+         `Successfully compiled ${SucessfulCompilation.length} out of ${totalComponents} components.`
+       )
+     );
++    
++    if (verbose) {
++      for (const compilation of [...SucessfulCompilation, ...ActionableFailures, ...OtherFailures]) {
++        const filename = compilation.fnLoc?.filename;
++
++        if (compilation.kind === "CompileSuccess") {
++          const name = compilation.fnName;
++          const isHook = name?.startsWith('use');
++
++          if (name) {
++            console.log(
++              chalk.green(
++                `Successfully compiled ${isHook ? "hook" : "component" } [${name}](${filename})`
++              )
++            );
++          } else {
++            console.log(chalk.green(`Successfully compiled ${compilation.fnLoc?.filename}`));
++          }
++        }
++
++        if (compilation.kind === "CompileError") {
++          const { reason, severity, loc } = compilation.detail;
++
++            const lnNo = loc.start?.line;
++            const colNo = loc.start?.column;
++
++            const isTodo = severity === ErrorSeverity.Todo;
++
++            console.log(
++              chalk[isTodo ? 'yellow' : 'red'](
++                `Failed to compile ${
++                  filename
++                }${
++                  lnNo !== undefined ? `:${lnNo}${
++                    colNo !== undefined ? `:${colNo}` : ""
++                  }.` : ""
++                }`
++              ),
++              chalk[isTodo ? 'yellow' : 'red'](reason? `Reason: ${reason}` : "")
++            );
++            console.log("\n");
++        }
++      }
++    }
+   },
+ };
+ const JsFileExtensionRE = /(js|ts|jsx|tsx)$/;
+@@ -69200,9 +69244,16 @@ function main() {
+         type: "string",
+         default: "**/+(*.{js,mjs,jsx,ts,tsx}|package.json)",
+       })
++      .option('verbose', {
++        description: 'run with verbose logging',
++        type: 'boolean',
++        default: false,
++        alias: 'v',
++      })
+       .parseSync();
+     const spinner = ora("Checking").start();
+     let src = argv.src;
++    let verbose = argv.verbose;
+     const globOptions = {
+       onlyFiles: true,
+       ignore: [
+@@ -69222,7 +69273,7 @@ function main() {
+       libraryCompatCheck.run(source, path);
+     }
+     spinner.stop();
+-    reactCompilerCheck.report();
++    reactCompilerCheck.report(verbose);
+     strictModeCheck.report();
+     libraryCompatCheck.report();
+   });
diff --git a/patches/react-compiler-healthcheck+0.0.0-experimental-b130d5f-20240625+002+enable-ref-identifiers.patch b/patches/react-compiler-healthcheck+0.0.0-experimental-b130d5f-20240625+002+enable-ref-identifiers.patch
new file mode 100644
index 000000000000..6caa4ad4c373
--- /dev/null
+++ b/patches/react-compiler-healthcheck+0.0.0-experimental-b130d5f-20240625+002+enable-ref-identifiers.patch
@@ -0,0 +1,28 @@
+diff --git a/node_modules/react-compiler-healthcheck/dist/index.js b/node_modules/react-compiler-healthcheck/dist/index.js
+index 4bf23db..fa2ab22 100755
+--- a/node_modules/react-compiler-healthcheck/dist/index.js
++++ b/node_modules/react-compiler-healthcheck/dist/index.js
+@@ -69088,6 +69088,9 @@ const COMPILER_OPTIONS = {
+   compilationMode: "infer",
+   panicThreshold: "critical_errors",
+   logger: logger,
++  environment: {
++    enableTreatRefLikeIdentifiersAsRefs: true,
++  },
+ };
+ function isActionableDiagnostic(detail) {
+   switch (detail.severity) {
+diff --git a/node_modules/react-compiler-healthcheck/src/checks/reactCompiler.ts b/node_modules/react-compiler-healthcheck/src/checks/reactCompiler.ts
+index 09c9b9b..d2418e0 100644
+--- a/node_modules/react-compiler-healthcheck/src/checks/reactCompiler.ts
++++ b/node_modules/react-compiler-healthcheck/src/checks/reactCompiler.ts
+@@ -51,6 +51,9 @@ const COMPILER_OPTIONS: Partial<PluginOptions> = {
+   compilationMode: "infer",
+   panicThreshold: "critical_errors",
+   logger,
++  environment: {
++    enableTreatRefLikeIdentifiersAsRefs: true,
++  },
+ };
+ 
+ function isActionableDiagnostic(detail: CompilerErrorDetailOptions) {
diff --git a/patches/react-compiler-healthcheck+0.0.0-experimental-b130d5f-20240625+003+json.patch b/patches/react-compiler-healthcheck+0.0.0-experimental-b130d5f-20240625+003+json.patch
new file mode 100644
index 000000000000..a3de7a365889
--- /dev/null
+++ b/patches/react-compiler-healthcheck+0.0.0-experimental-b130d5f-20240625+003+json.patch
@@ -0,0 +1,73 @@
+diff --git a/node_modules/react-compiler-healthcheck/dist/index.js b/node_modules/react-compiler-healthcheck/dist/index.js
+index fa2ab22..93be1fb 100755
+--- a/node_modules/react-compiler-healthcheck/dist/index.js
++++ b/node_modules/react-compiler-healthcheck/dist/index.js
+@@ -69157,16 +69157,28 @@ var reactCompilerCheck = {
+       compile(source, path);
+     }
+   },
+-  report(verbose) {
++  report(verbose, json) {
+     const totalComponents =
+       SucessfulCompilation.length +
+       countUniqueLocInEvents(OtherFailures) +
+       countUniqueLocInEvents(ActionableFailures);
+-    console.log(
+-      chalk.green(
+-        `Successfully compiled ${SucessfulCompilation.length} out of ${totalComponents} components.`
+-      )
+-    );
++    if (!json) {
++      console.log(
++        chalk.green(
++          `Successfully compiled ${SucessfulCompilation.length} out of ${totalComponents} components.`
++        )
++      );
++    }
++    
++    if (json) {
++      const extractFileName = (output) => output.fnLoc.filename;
++      const successfulFiles = SucessfulCompilation.map(extractFileName);
++      const unsuccessfulFiles = [...new Set([...OtherFailures, ...ActionableFailures].map(extractFileName))];
++      console.log(JSON.stringify({
++        success: successfulFiles,
++        failure: unsuccessfulFiles,
++      }));
++    }
+     
+     if (verbose) {
+       for (const compilation of [...SucessfulCompilation, ...ActionableFailures, ...OtherFailures]) {
+@@ -69253,10 +69265,17 @@ function main() {
+         default: false,
+         alias: 'v',
+       })
++      .option('json', {
++        description: 'print a list of compiled/not-compiled files as JSON',
++        type: 'boolean',
++        default: false,
++        alias: 'j',
++      })
+       .parseSync();
+     const spinner = ora("Checking").start();
+     let src = argv.src;
+     let verbose = argv.verbose;
++    let json = argv.json;
+     const globOptions = {
+       onlyFiles: true,
+       ignore: [
+@@ -69276,9 +69295,12 @@ function main() {
+       libraryCompatCheck.run(source, path);
+     }
+     spinner.stop();
+-    reactCompilerCheck.report(verbose);
+-    strictModeCheck.report();
+-    libraryCompatCheck.report();
++    reactCompilerCheck.report(verbose, json);
++    // using json option we only want to get list of files
++    if (!json) {
++      strictModeCheck.report();
++      libraryCompatCheck.report();
++    }
+   });
+ }
+ main();
diff --git a/patches/react-native+0.73.4+002+SuspenseFix.patch b/patches/react-native+0.73.4+002+SuspenseFix.patch
deleted file mode 100644
index 75fc57929a00..000000000000
--- a/patches/react-native+0.73.4+002+SuspenseFix.patch
+++ /dev/null
@@ -1,74 +0,0 @@
-diff --git a/node_modules/react-native/Libraries/Renderer/implementations/ReactFabric-dev.js b/node_modules/react-native/Libraries/Renderer/implementations/ReactFabric-dev.js
-index 1c5266e..d072621 100644
---- a/node_modules/react-native/Libraries/Renderer/implementations/ReactFabric-dev.js
-+++ b/node_modules/react-native/Libraries/Renderer/implementations/ReactFabric-dev.js
-@@ -20554,20 +20554,20 @@ function finishConcurrentRender(root, exitStatus, lanes) {
- 
-         var _msUntilTimeout = jnd(timeElapsedMs) - timeElapsedMs; // Don't bother with a very short suspense time.
- 
--        if (_msUntilTimeout > 10) {
--          // Instead of committing the fallback immediately, wait for more data
--          // to arrive.
--          root.timeoutHandle = scheduleTimeout(
--            commitRoot.bind(
--              null,
--              root,
--              workInProgressRootRecoverableErrors,
--              workInProgressTransitions
--            ),
--            _msUntilTimeout
--          );
--          break;
--        }
-+        // if (_msUntilTimeout > 10) {
-+        //   // Instead of committing the fallback immediately, wait for more data
-+        //   // to arrive.
-+        //   root.timeoutHandle = scheduleTimeout(
-+        //     commitRoot.bind(
-+        //       null,
-+        //       root,
-+        //       workInProgressRootRecoverableErrors,
-+        //       workInProgressTransitions
-+        //     ),
-+        //     _msUntilTimeout
-+        //   );
-+        //   break;
-+        // }
-       } // Commit the placeholder.
- 
-       commitRoot(
-diff --git a/node_modules/react-native/Libraries/Renderer/implementations/ReactFabric-prod.js b/node_modules/react-native/Libraries/Renderer/implementations/ReactFabric-prod.js
-index b85648d..8adba02 100644
---- a/node_modules/react-native/Libraries/Renderer/implementations/ReactFabric-prod.js
-+++ b/node_modules/react-native/Libraries/Renderer/implementations/ReactFabric-prod.js
-@@ -6702,18 +6702,18 @@ function performConcurrentWorkOnRoot(root, didTimeout) {
-               : 4320 > lanes
-               ? 4320
-               : 1960 * ceil(lanes / 1960)) - lanes;
--          if (10 < lanes) {
--            root.timeoutHandle = scheduleTimeout(
--              commitRoot.bind(
--                null,
--                root,
--                workInProgressRootRecoverableErrors,
--                workInProgressTransitions
--              ),
--              lanes
--            );
--            break;
--          }
-+          // if (10 < lanes) {
-+          //   root.timeoutHandle = scheduleTimeout(
-+          //     commitRoot.bind(
-+          //       null,
-+          //       root,
-+          //       workInProgressRootRecoverableErrors,
-+          //       workInProgressTransitions
-+          //     ),
-+          //     lanes
-+          //   );
-+          //   break;
-+          // }
-           commitRoot(
-             root,
-             workInProgressRootRecoverableErrors,
diff --git a/patches/react-native+0.73.4+003+iOSFontResolution.patch b/patches/react-native+0.73.4+003+iOSFontResolution.patch
deleted file mode 100644
index 99abb9481d20..000000000000
--- a/patches/react-native+0.73.4+003+iOSFontResolution.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-diff --git a/node_modules/react-native/ReactCommon/react/renderer/textlayoutmanager/platform/ios/react/renderer/textlayoutmanager/RCTFontUtils.mm b/node_modules/react-native/ReactCommon/react/renderer/textlayoutmanager/platform/ios/react/renderer/textlayoutmanager/RCTFontUtils.mm
-index 4f8d5aa..18171a6 100644
---- a/node_modules/react-native/ReactCommon/react/renderer/textlayoutmanager/platform/ios/react/renderer/textlayoutmanager/RCTFontUtils.mm
-+++ b/node_modules/react-native/ReactCommon/react/renderer/textlayoutmanager/platform/ios/react/renderer/textlayoutmanager/RCTFontUtils.mm
-@@ -35,9 +35,6 @@ static RCTFontProperties RCTResolveFontProperties(
- {
-   fontProperties.family = fontProperties.family.length ? fontProperties.family : baseFontProperties.family;
-   fontProperties.size = !isnan(fontProperties.size) ? fontProperties.size : baseFontProperties.size;
--  fontProperties.weight = !isnan(fontProperties.weight) ? fontProperties.weight : baseFontProperties.weight;
--  fontProperties.style =
--      fontProperties.style != RCTFontStyleUndefined ? fontProperties.style : baseFontProperties.style;
-   fontProperties.variant =
-       fontProperties.variant != RCTFontVariantUndefined ? fontProperties.variant : baseFontProperties.variant;
-   return fontProperties;
-@@ -116,9 +113,14 @@ static RCTFontStyle RCTGetFontStyle(UIFont *font)
-   if ([fontProperties.family isEqualToString:defaultFontProperties.family]) {
-     // Handle system font as special case. This ensures that we preserve
-     // the specific metrics of the standard system font as closely as possible.
-+    fontProperties.weight = !isnan(fontProperties.weight) ? fontProperties.weight : defaultFontProperties.weight;
-+    fontProperties.style =
-+        fontProperties.style != RCTFontStyleUndefined ? fontProperties.style : defaultFontProperties.style;
-     font = RCTDefaultFontWithFontProperties(fontProperties);
-   } else {
-     NSArray<NSString *> *fontNames = [UIFont fontNamesForFamilyName:fontProperties.family];
-+    UIFontWeight fontWeight = fontProperties.weight;
-+    RCTFontStyle fontStyle = fontProperties.style;
- 
-     if (fontNames.count == 0) {
-       // Gracefully handle being given a font name rather than font family, for
-@@ -129,18 +131,24 @@ static RCTFontStyle RCTGetFontStyle(UIFont *font)
-         // Failback to system font.
-         font = [UIFont systemFontOfSize:effectiveFontSize weight:fontProperties.weight];
-       }
--    } else {
-+      
-+      fontNames = [UIFont fontNamesForFamilyName:font.familyName];
-+      fontWeight = isnan(fontWeight) ? RCTGetFontWeight(font) : fontWeight;
-+      fontStyle = fontStyle == RCTFontStyleUndefined ? RCTGetFontStyle(font) : fontStyle;
-+    }
-+        
-+    if (fontNames.count != 0) {
-       // Get the closest font that matches the given weight for the fontFamily
-       CGFloat closestWeight = INFINITY;
-       for (NSString *name in fontNames) {
-         UIFont *fontMatch = [UIFont fontWithName:name size:effectiveFontSize];
- 
--        if (RCTGetFontStyle(fontMatch) != fontProperties.style) {
-+        if (RCTGetFontStyle(fontMatch) != fontStyle) {
-           continue;
-         }
- 
-         CGFloat testWeight = RCTGetFontWeight(fontMatch);
--        if (ABS(testWeight - fontProperties.weight) < ABS(closestWeight - fontProperties.weight)) {
-+        if (ABS(testWeight - fontWeight) < ABS(closestWeight - fontWeight)) {
-           font = fontMatch;
-           closestWeight = testWeight;
-         }
diff --git a/patches/react-native+0.73.4+004+AndroidModalSize.patch b/patches/react-native+0.73.4+004+AndroidModalSize.patch
deleted file mode 100644
index d7adf15f790d..000000000000
--- a/patches/react-native+0.73.4+004+AndroidModalSize.patch
+++ /dev/null
@@ -1,142 +0,0 @@
-diff --git a/node_modules/react-native/ReactAndroid/src/main/java/com/facebook/react/views/modal/ModalHostHelper.java b/node_modules/react-native/ReactAndroid/src/main/java/com/facebook/react/views/modal/ModalHostHelper.java
-deleted file mode 100644
-index 3a226c0..0000000
---- a/node_modules/react-native/ReactAndroid/src/main/java/com/facebook/react/views/modal/ModalHostHelper.java
-+++ /dev/null
-@@ -1,63 +0,0 @@
--/*
-- * Copyright (c) Meta Platforms, Inc. and affiliates.
-- *
-- * This source code is licensed under the MIT license found in the
-- * LICENSE file in the root directory of this source tree.
-- */
--
--package com.facebook.react.views.modal;
--
--import android.content.Context;
--import android.content.res.Resources;
--import android.content.res.TypedArray;
--import android.graphics.Point;
--import android.view.Display;
--import android.view.WindowManager;
--import com.facebook.infer.annotation.Assertions;
--
--/** Helper class for Modals. */
--/*package*/ class ModalHostHelper {
--
--  private static final Point MIN_POINT = new Point();
--  private static final Point MAX_POINT = new Point();
--  private static final Point SIZE_POINT = new Point();
--
--  /**
--   * To get the size of the screen, we use information from the WindowManager and default Display.
--   * We don't use DisplayMetricsHolder, or Display#getSize() because they return values that include
--   * the status bar. We only want the values of what will actually be shown on screen. We use
--   * Display#getSize() to determine if the screen is in portrait or landscape. We don't use
--   * getRotation because the 'natural' rotation will be portrait on phones and landscape on tablets.
--   * This should only be called on the native modules/shadow nodes thread.
--   */
--  public static Point getModalHostSize(Context context) {
--    WindowManager wm = (WindowManager) context.getSystemService(Context.WINDOW_SERVICE);
--    Display display = Assertions.assertNotNull(wm).getDefaultDisplay();
--    // getCurrentSizeRange will return the min and max width and height that the window can be
--    display.getCurrentSizeRange(MIN_POINT, MAX_POINT);
--    // getSize will return the dimensions of the screen in its current orientation
--    display.getSize(SIZE_POINT);
--
--    int[] attrs = {android.R.attr.windowFullscreen};
--    Resources.Theme theme = context.getTheme();
--    TypedArray ta = theme.obtainStyledAttributes(attrs);
--    boolean windowFullscreen = ta.getBoolean(0, false);
--
--    // We need to add the status bar height to the height if we have a fullscreen window,
--    // because Display.getCurrentSizeRange doesn't include it.
--    Resources resources = context.getResources();
--    int statusBarId = resources.getIdentifier("status_bar_height", "dimen", "android");
--    int statusBarHeight = 0;
--    if (windowFullscreen && statusBarId > 0) {
--      statusBarHeight = (int) resources.getDimension(statusBarId);
--    }
--
--    if (SIZE_POINT.x < SIZE_POINT.y) {
--      // If we are vertical the width value comes from min width and height comes from max height
--      return new Point(MIN_POINT.x, MAX_POINT.y + statusBarHeight);
--    } else {
--      // If we are horizontal the width value comes from max width and height comes from min height
--      return new Point(MAX_POINT.x, MIN_POINT.y + statusBarHeight);
--    }
--  }
--}
-diff --git a/node_modules/react-native/ReactAndroid/src/main/java/com/facebook/react/views/modal/ModalHostShadowNode.java b/node_modules/react-native/ReactAndroid/src/main/java/com/facebook/react/views/modal/ModalHostShadowNode.java
-deleted file mode 100644
-index 7288fe0..0000000
---- a/node_modules/react-native/ReactAndroid/src/main/java/com/facebook/react/views/modal/ModalHostShadowNode.java
-+++ /dev/null
-@@ -1,37 +0,0 @@
--/*
-- * Copyright (c) Meta Platforms, Inc. and affiliates.
-- *
-- * This source code is licensed under the MIT license found in the
-- * LICENSE file in the root directory of this source tree.
-- */
--
--package com.facebook.react.views.modal;
--
--import android.graphics.Point;
--import com.facebook.react.uimanager.LayoutShadowNode;
--import com.facebook.react.uimanager.ReactShadowNodeImpl;
--
--/**
-- * We implement the Modal by using an Android Dialog. That will fill the entire window of the
-- * application. To get layout to work properly, we need to layout all the elements within the
-- * Modal's inner content view as if they can fill the entire window. To do that, we need to
-- * explicitly set the styleWidth and styleHeight on the LayoutShadowNode of the child of this node
-- * to be the window size. This will then cause the children of the Modal to layout as if they can
-- * fill the window.
-- */
--class ModalHostShadowNode extends LayoutShadowNode {
--
--  public ModalHostShadowNode() {}
--
--  /**
--   * We need to set the styleWidth and styleHeight of the one child (represented by the <View/>
--   * within the <RCTModalHostView/> in Modal.js. This needs to fill the entire window.
--   */
--  @Override
--  public void addChildAt(ReactShadowNodeImpl child, int i) {
--    super.addChildAt(child, i);
--    Point modalSize = ModalHostHelper.getModalHostSize(getThemedContext());
--    child.setStyleWidth(modalSize.x);
--    child.setStyleHeight(modalSize.y);
--  }
--}
-diff --git a/node_modules/react-native/ReactAndroid/src/main/java/com/facebook/react/views/modal/ReactModalHostManager.java b/node_modules/react-native/ReactAndroid/src/main/java/com/facebook/react/views/modal/ReactModalHostManager.java
-index 74c6b8e..0d447e5 100644
---- a/node_modules/react-native/ReactAndroid/src/main/java/com/facebook/react/views/modal/ReactModalHostManager.java
-+++ b/node_modules/react-native/ReactAndroid/src/main/java/com/facebook/react/views/modal/ReactModalHostManager.java
-@@ -50,16 +50,6 @@ public class ReactModalHostManager extends ViewGroupManager<ReactModalHostView>
-     return new ReactModalHostView(reactContext);
-   }
- 
--  @Override
--  public LayoutShadowNode createShadowNodeInstance() {
--    return new ModalHostShadowNode();
--  }
--
--  @Override
--  public Class<? extends LayoutShadowNode> getShadowNodeClass() {
--    return ModalHostShadowNode.class;
--  }
--
-   @Override
-   public void onDropViewInstance(ReactModalHostView view) {
-     super.onDropViewInstance(view);
-@@ -168,8 +158,6 @@ public class ReactModalHostManager extends ViewGroupManager<ReactModalHostView>
-   public Object updateState(
-       ReactModalHostView view, ReactStylesDiffMap props, StateWrapper stateWrapper) {
-     view.setStateWrapper(stateWrapper);
--    Point modalSize = ModalHostHelper.getModalHostSize(view.getContext());
--    view.updateState(modalSize.x, modalSize.y);
-     return null;
-   }
- 
diff --git a/patches/react-native+0.73.4+005+TextInputs.patch b/patches/react-native+0.73.4+005+TextInputs.patch
deleted file mode 100644
index a7ba5ae3b9dd..000000000000
--- a/patches/react-native+0.73.4+005+TextInputs.patch
+++ /dev/null
@@ -1,61 +0,0 @@
-diff --git a/node_modules/react-native/React/Fabric/Mounting/ComponentViews/TextInput/RCTTextInputComponentView.mm b/node_modules/react-native/React/Fabric/Mounting/ComponentViews/TextInput/RCTTextInputComponentView.mm
-index e7b69bf..9f691c9 100644
---- a/node_modules/react-native/React/Fabric/Mounting/ComponentViews/TextInput/RCTTextInputComponentView.mm
-+++ b/node_modules/react-native/React/Fabric/Mounting/ComponentViews/TextInput/RCTTextInputComponentView.mm
-@@ -115,6 +115,10 @@ - (void)updateProps:(const Props::Shared &)props oldProps:(const Props::Shared &
-     [self _setMultiline:newTextInputProps.traits.multiline];
-   }
- 
-+  if (newTextInputProps.traits.showSoftInputOnFocus != oldTextInputProps.traits.showSoftInputOnFocus) {
-+    [self _setShowSoftInputOnFocus:newTextInputProps.traits.showSoftInputOnFocus];
-+  }
-+
-   if (newTextInputProps.traits.autocapitalizationType != oldTextInputProps.traits.autocapitalizationType) {
-     _backedTextInputView.autocapitalizationType =
-         RCTUITextAutocapitalizationTypeFromAutocapitalizationType(newTextInputProps.traits.autocapitalizationType);
-@@ -618,6 +622,25 @@ - (void)_setMultiline:(BOOL)multiline
-   RCTCopyBackedTextInput(_backedTextInputView, backedTextInputView);
-   _backedTextInputView = backedTextInputView;
-   [self addSubview:_backedTextInputView];
-+
-+  auto const &currentTextInputProps = *std::static_pointer_cast<TextInputProps const>(_props);
-+  [self _setShowSoftInputOnFocus:currentTextInputProps.traits.showSoftInputOnFocus];
-+}
-+
-+- (void)_setShowSoftInputOnFocus:(BOOL)showSoftInputOnFocus
-+{
-+    if (showSoftInputOnFocus) {
-+      // Resets to default keyboard.
-+      _backedTextInputView.inputView = nil;
-+
-+      // Without the call to reloadInputViews, the keyboard will not change until the textInput field (the first      // responder) loses and regains focus.
-+      if (_backedTextInputView.isFirstResponder) {
-+        [_backedTextInputView reloadInputViews];
-+      }
-+    } else {
-+      // Hides keyboard, but keeps blinking cursor.
-+      _backedTextInputView.inputView = [UIView new];
-+  }
- }
- 
- - (BOOL)_textOf:(NSAttributedString *)newText equals:(NSAttributedString *)oldText
-diff --git a/node_modules/react-native/ReactCommon/react/renderer/components/textinput/androidtextinput/react/renderer/components/androidtextinput/AndroidTextInputShadowNode.cpp b/node_modules/react-native/ReactCommon/react/renderer/components/textinput/androidtextinput/react/renderer/components/androidtextinput/AndroidTextInputShadowNode.cpp
-index 0c9cc69..fee423f 100644
---- a/node_modules/react-native/ReactCommon/react/renderer/components/textinput/androidtextinput/react/renderer/components/androidtextinput/AndroidTextInputShadowNode.cpp
-+++ b/node_modules/react-native/ReactCommon/react/renderer/components/textinput/androidtextinput/react/renderer/components/androidtextinput/AndroidTextInputShadowNode.cpp
-@@ -159,15 +159,6 @@ void AndroidTextInputShadowNode::updateStateIfNeeded() {
- Size AndroidTextInputShadowNode::measureContent(
-     const LayoutContext& /*layoutContext*/,
-     const LayoutConstraints& layoutConstraints) const {
--  if (getStateData().cachedAttributedStringId != 0) {
--    return textLayoutManager_
--        ->measureCachedSpannableById(
--            getStateData().cachedAttributedStringId,
--            getConcreteProps().paragraphAttributes,
--            layoutConstraints)
--        .size;
--  }
--
-   // Layout is called right after measure.
-   // Measure is marked as `const`, and `layout` is not; so State can be updated
-   // during layout, but not during `measure`. If State is out-of-date in layout,
diff --git a/patches/react-native+0.73.4+006+Codegen.patch b/patches/react-native+0.73.4+006+Codegen.patch
deleted file mode 100644
index 076faa497825..000000000000
--- a/patches/react-native+0.73.4+006+Codegen.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff --git a/node_modules/react-native/scripts/cocoapods/new_architecture.rb b/node_modules/react-native/scripts/cocoapods/new_architecture.rb
-index ba75b01..e5eaee8 100644
---- a/node_modules/react-native/scripts/cocoapods/new_architecture.rb
-+++ b/node_modules/react-native/scripts/cocoapods/new_architecture.rb
-@@ -103,6 +103,7 @@ class NewArchitectureHelper
-         compiler_flags = hash["compiler_flags"] ? hash["compiler_flags"] : ""
-         current_config = hash["pod_target_xcconfig"] != nil ? hash["pod_target_xcconfig"] : {}
-         current_headers = current_config["HEADER_SEARCH_PATHS"] != nil ? current_config["HEADER_SEARCH_PATHS"] : ""
-+        current_cpp_flags = current_config["OTHER_CPLUSPLUSFLAGS"] != nil ? current_config["OTHER_CPLUSPLUSFLAGS"] : ""
- 
-         header_search_paths = ["\"$(PODS_ROOT)/boost\" \"$(PODS_ROOT)/Headers/Private/Yoga\""]
-         if ENV['USE_FRAMEWORKS']
-@@ -135,7 +136,7 @@ class NewArchitectureHelper
-         spec.dependency "glog"
- 
-         if new_arch_enabled
--            current_config["OTHER_CPLUSPLUSFLAGS"] = @@new_arch_cpp_flags
-+            current_config["OTHER_CPLUSPLUSFLAGS"] = current_cpp_flags.empty? ? @@new_arch_cpp_flags : "#{current_cpp_flags} #{@@new_arch_cpp_flags}"
-             spec.dependency "React-RCTFabric" # This is for Fabric Component
-             spec.dependency "React-Codegen"
- 
diff --git a/patches/react-native+0.73.4+008+checkForHashMap.patch b/patches/react-native+0.73.4+008+checkForHashMap.patch
deleted file mode 100644
index e0a73c6325f1..000000000000
--- a/patches/react-native+0.73.4+008+checkForHashMap.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-diff --git a/node_modules/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/UIManagerModuleConstantsHelper.java b/node_modules/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/UIManagerModuleConstantsHelper.java
-index 6d07704..88dd74e 100644
---- a/node_modules/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/UIManagerModuleConstantsHelper.java
-+++ b/node_modules/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/UIManagerModuleConstantsHelper.java
-@@ -204,6 +204,11 @@ import java.util.Set;
-         }
-       }
-     }
-+    // When providing one event in Kotlin, it will create a SingletonMap by default
-+    // which will throw on trying to add new element to it
-+    if (!(events instanceof HashMap)) {
-+      events = new HashMap(events);
-+    }
-     for (String oldKey : keysToNormalize) {
-       Object value = events.get(oldKey);
-       String baseKey = "";
diff --git a/patches/react-native+0.73.4+009+properEventDispatchOrder.patch b/patches/react-native+0.73.4+009+properEventDispatchOrder.patch
deleted file mode 100644
index 894aa416bc71..000000000000
--- a/patches/react-native+0.73.4+009+properEventDispatchOrder.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-diff --git a/node_modules/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/events/FabricEventDispatcher.java b/node_modules/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/events/FabricEventDispatcher.java
-index 4c3387b..284720f 100644
---- a/node_modules/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/events/FabricEventDispatcher.java
-+++ b/node_modules/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/events/FabricEventDispatcher.java
-@@ -38,10 +38,10 @@ public class FabricEventDispatcher implements EventDispatcher, LifecycleEventLis
- 
-   @Override
-   public void dispatchEvent(Event event) {
--    event.dispatchModern(mReactEventEmitter);
-     for (EventDispatcherListener listener : mListeners) {
-       listener.onEventDispatch(event);
-     }
-+    event.dispatchModern(mReactEventEmitter);
- 
-     event.dispose();
-     maybePostFrameCallbackFromNonUI();
diff --git a/patches/react-native+0.73.4+011+optionalViewRecycling.patch b/patches/react-native+0.73.4+011+optionalViewRecycling.patch
deleted file mode 100644
index 14a20de2ae1c..000000000000
--- a/patches/react-native+0.73.4+011+optionalViewRecycling.patch
+++ /dev/null
@@ -1,62 +0,0 @@
-diff --git a/node_modules/react-native/React/Fabric/Mounting/RCTComponentViewClassDescriptor.h b/node_modules/react-native/React/Fabric/Mounting/RCTComponentViewClassDescriptor.h
-index b03a464..a2788a9 100644
---- a/node_modules/react-native/React/Fabric/Mounting/RCTComponentViewClassDescriptor.h
-+++ b/node_modules/react-native/React/Fabric/Mounting/RCTComponentViewClassDescriptor.h
-@@ -27,6 +27,11 @@ class RCTComponentViewClassDescriptor final {
-    */
-   bool observesMountingTransactionWillMount{false};
-   bool observesMountingTransactionDidMount{false};
-+    
-+  /*
-+   * Whether the component can be recycled or not
-+   */
-+  bool shouldBeRecycled{true};
- };
- 
- NS_ASSUME_NONNULL_END
-diff --git a/node_modules/react-native/React/Fabric/Mounting/RCTComponentViewDescriptor.h b/node_modules/react-native/React/Fabric/Mounting/RCTComponentViewDescriptor.h
-index 3ca65d1..fd1c4b9 100644
---- a/node_modules/react-native/React/Fabric/Mounting/RCTComponentViewDescriptor.h
-+++ b/node_modules/react-native/React/Fabric/Mounting/RCTComponentViewDescriptor.h
-@@ -29,6 +29,7 @@ class RCTComponentViewDescriptor final {
-    */
-   bool observesMountingTransactionWillMount{false};
-   bool observesMountingTransactionDidMount{false};
-+  bool shouldBeRecycled{true};
- };
- 
- inline bool operator==(const RCTComponentViewDescriptor &lhs, const RCTComponentViewDescriptor &rhs)
-diff --git a/node_modules/react-native/React/Fabric/Mounting/RCTComponentViewFactory.mm b/node_modules/react-native/React/Fabric/Mounting/RCTComponentViewFactory.mm
-index 0b15d71..9bf4f2d 100644
---- a/node_modules/react-native/React/Fabric/Mounting/RCTComponentViewFactory.mm
-+++ b/node_modules/react-native/React/Fabric/Mounting/RCTComponentViewFactory.mm
-@@ -95,6 +95,8 @@ - (RCTComponentViewClassDescriptor)_componentViewClassDescriptorFromClass:(Class
-         (bool)class_respondsToSelector(viewClass, @selector(mountingTransactionWillMount:withSurfaceTelemetry:)),
-     .observesMountingTransactionDidMount =
-         (bool)class_respondsToSelector(viewClass, @selector(mountingTransactionDidMount:withSurfaceTelemetry:)),
-+    .shouldBeRecycled =
-+        [viewClass respondsToSelector:@selector(shouldBeRecycled)] ? (bool)[viewClass performSelector:@selector(shouldBeRecycled)] : true,
-   };
- #pragma clang diagnostic pop
- }
-@@ -210,6 +212,7 @@ - (RCTComponentViewDescriptor)createComponentViewWithComponentHandle:(facebook::
-       .view = [viewClass new],
-       .observesMountingTransactionWillMount = componentViewClassDescriptor.observesMountingTransactionWillMount,
-       .observesMountingTransactionDidMount = componentViewClassDescriptor.observesMountingTransactionDidMount,
-+      .shouldBeRecycled = componentViewClassDescriptor.shouldBeRecycled,
-   };
- }
- 
-diff --git a/node_modules/react-native/React/Fabric/Mounting/RCTComponentViewRegistry.mm b/node_modules/react-native/React/Fabric/Mounting/RCTComponentViewRegistry.mm
-index e78e8ae..74ebc31 100644
---- a/node_modules/react-native/React/Fabric/Mounting/RCTComponentViewRegistry.mm
-+++ b/node_modules/react-native/React/Fabric/Mounting/RCTComponentViewRegistry.mm
-@@ -107,7 +107,7 @@ - (void)_enqueueComponentViewWithComponentHandle:(ComponentHandle)componentHandl
-   RCTAssertMainQueue();
-   auto &recycledViews = _recyclePool[componentHandle];
- 
--  if (recycledViews.size() > RCTComponentViewRegistryRecyclePoolMaxSize) {
-+  if (recycledViews.size() > RCTComponentViewRegistryRecyclePoolMaxSize || !componentViewDescriptor.shouldBeRecycled) {
-     return;
-   }
- 
diff --git a/patches/react-native+0.73.4+013+exposePrefabs.patch b/patches/react-native+0.73.4+013+exposePrefabs.patch
deleted file mode 100644
index 001a2dec9894..000000000000
--- a/patches/react-native+0.73.4+013+exposePrefabs.patch
+++ /dev/null
@@ -1,95 +0,0 @@
-diff --git a/node_modules/react-native/ReactAndroid/build.gradle b/node_modules/react-native/ReactAndroid/build.gradle
-index 78c57eb..ec147fd 100644
---- a/node_modules/react-native/ReactAndroid/build.gradle
-+++ b/node_modules/react-native/ReactAndroid/build.gradle
-@@ -125,6 +125,19 @@ final def preparePrefab = tasks.register("preparePrefab", PreparePrefabHeadersTa
-                 "rrc_root",
-                 new Pair("../ReactCommon/react/renderer/components/root/", "react/renderer/components/root/")
-             ),
-+            new PrefabPreprocessingEntry(
-+                "rrc_text",
-+                [
-+                    new Pair("../ReactCommon/react/renderer/components/text/", "react/renderer/components/text/"),
-+                    new Pair("../ReactCommon/react/renderer/attributedstring", "react/renderer/attributedstring"),
-+                ]
-+            ),
-+            new PrefabPreprocessingEntry(
-+                "rrc_textinput",
-+                [
-+                    new Pair("../ReactCommon/react/renderer/components/textinput/androidtextinput", ""),
-+                ]
-+            ),
-             new PrefabPreprocessingEntry(
-                 "rrc_view",
-                 [
-@@ -132,6 +145,13 @@ final def preparePrefab = tasks.register("preparePrefab", PreparePrefabHeadersTa
-                     new Pair("../ReactCommon/react/renderer/components/view/platform/android/", ""),
-                 ]
-             ),
-+            new PrefabPreprocessingEntry(
-+                "react_render_textlayoutmanager",
-+                [
-+                    new Pair("../ReactCommon/react/renderer/textlayoutmanager/", "react/renderer/textlayoutmanager/"),
-+                    new Pair("../ReactCommon/react/renderer/textlayoutmanager/platform/android/", ""),
-+                ]
-+            ),
-             new PrefabPreprocessingEntry(
-                 "rrc_legacyviewmanagerinterop",
-                 new Pair("../ReactCommon/react/renderer/components/legacyviewmanagerinterop/", "react/renderer/components/legacyviewmanagerinterop/")
-@@ -559,6 +579,9 @@ android {
-                     "glog",
-                     "fabricjni",
-                     "react_render_mapbuffer",
-+                    "react_render_textlayoutmanager",
-+                    "rrc_textinput",
-+                    "rrc_text",
-                     "yoga",
-                     "folly_runtime",
-                     "react_nativemodule_core",
-@@ -683,6 +706,15 @@ android {
-         rrc_root {
-             headers(new File(prefabHeadersDir, "rrc_root").absolutePath)
-         }
-+        rrc_text {
-+            headers(new File(prefabHeadersDir, "rrc_text").absolutePath)
-+        }
-+        rrc_textinput {
-+            headers(new File(prefabHeadersDir, "rrc_textinput").absolutePath)
-+        }
-+        react_render_textlayoutmanager {
-+            headers(new File(prefabHeadersDir, "react_render_textlayoutmanager").absolutePath)
-+        }
-         rrc_view {
-             headers(new File(prefabHeadersDir, "rrc_view").absolutePath)
-         }
-diff --git a/node_modules/react-native/ReactAndroid/cmake-utils/ReactNative-application.cmake b/node_modules/react-native/ReactAndroid/cmake-utils/ReactNative-application.cmake
-index d49fa9e..3607c69 100644
---- a/node_modules/react-native/ReactAndroid/cmake-utils/ReactNative-application.cmake
-+++ b/node_modules/react-native/ReactAndroid/cmake-utils/ReactNative-application.cmake
-@@ -78,11 +78,14 @@ add_library(jsi ALIAS ReactAndroid::jsi)
- add_library(glog ALIAS ReactAndroid::glog)
- add_library(fabricjni ALIAS ReactAndroid::fabricjni)
- add_library(react_render_mapbuffer ALIAS ReactAndroid::react_render_mapbuffer)
-+add_library(react_render_textlayoutmanager ALIAS ReactAndroid::react_render_textlayoutmanager)
- add_library(yoga ALIAS ReactAndroid::yoga)
- add_library(folly_runtime ALIAS ReactAndroid::folly_runtime)
- add_library(react_nativemodule_core ALIAS ReactAndroid::react_nativemodule_core)
- add_library(react_render_imagemanager ALIAS ReactAndroid::react_render_imagemanager)
- add_library(rrc_image ALIAS ReactAndroid::rrc_image)
-+add_library(rrc_text ALIAS ReactAndroid::rrc_text)
-+add_library(rrc_textinput ALIAS ReactAndroid::rrc_textinput)
- add_library(rrc_legacyviewmanagerinterop ALIAS ReactAndroid::rrc_legacyviewmanagerinterop)
- 
- find_package(fbjni REQUIRED CONFIG)
-@@ -105,8 +108,11 @@ target_link_libraries(${CMAKE_PROJECT_NAME}
-         react_render_graphics               # prefab ready
-         react_render_imagemanager           # prefab ready
-         react_render_mapbuffer              # prefab ready
-+        react_render_textlayoutmanager      # prefab ready
-         rrc_image                           # prefab ready
-         rrc_view                            # prefab ready
-+        rrc_text                            # prefab ready
-+        rrc_textinput                       # prefab ready
-         rrc_legacyviewmanagerinterop        # prefab ready
-         runtimeexecutor                     # prefab ready
-         turbomodulejsijni                   # prefab ready
diff --git a/patches/react-native+0.73.4+014+fix-inverted-flatlist.patch b/patches/react-native+0.73.4+014+fix-inverted-flatlist.patch
deleted file mode 100644
index 7bed06d01913..000000000000
--- a/patches/react-native+0.73.4+014+fix-inverted-flatlist.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-diff --git a/node_modules/react-native/ReactCommon/react/renderer/components/scrollview/ScrollViewShadowNode.cpp b/node_modules/react-native/ReactCommon/react/renderer/components/scrollview/ScrollViewShadowNode.cpp
-index a8ecce5..6ad790e 100644
---- a/node_modules/react-native/ReactCommon/react/renderer/components/scrollview/ScrollViewShadowNode.cpp
-+++ b/node_modules/react-native/ReactCommon/react/renderer/components/scrollview/ScrollViewShadowNode.cpp
-@@ -66,7 +66,17 @@ void ScrollViewShadowNode::layout(LayoutContext layoutContext) {
- Point ScrollViewShadowNode::getContentOriginOffset() const {
-   auto stateData = getStateData();
-   auto contentOffset = stateData.contentOffset;
--  return {-contentOffset.x, -contentOffset.y + stateData.scrollAwayPaddingTop};
-+  auto props = getConcreteProps();
-+
-+  float productX = 1.0f;
-+  float productY = 1.0f;
-+
-+  for (const auto& operation : props.transform.operations) {
-+    productX *= operation.x;
-+    productY *= operation.y;
-+  }
-+
-+  return {-contentOffset.x * productX, (-contentOffset.y + stateData.scrollAwayPaddingTop) * productY};
- }
- 
- } // namespace facebook::react
diff --git a/patches/react-native+0.73.4+014+fixPath.patch b/patches/react-native+0.73.4+014+fixPath.patch
deleted file mode 100644
index ac49cca8621c..000000000000
--- a/patches/react-native+0.73.4+014+fixPath.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/node_modules/react-native/scripts/codegen/generate-artifacts-executor.js b/node_modules/react-native/scripts/codegen/generate-artifacts-executor.js
-index 025f80c..d276c69 100644
---- a/node_modules/react-native/scripts/codegen/generate-artifacts-executor.js
-+++ b/node_modules/react-native/scripts/codegen/generate-artifacts-executor.js
-@@ -454,7 +454,7 @@ function findCodegenEnabledLibraries(
-   codegenConfigFilename,
-   codegenConfigKey,
- ) {
--  const pkgJson = readPackageJSON(appRootDir);
-+  const pkgJson = readPackageJSON(path.join(appRootDir, process.env.REACT_NATIVE_DIR ? 'react-native' : ''));
-   const dependencies = {...pkgJson.dependencies, ...pkgJson.devDependencies};
-   const libraries = [];
- 
diff --git a/patches/react-native+0.73.4+014+iOSCoreAnimationBorderRendering.patch b/patches/react-native+0.73.4+014+iOSCoreAnimationBorderRendering.patch
deleted file mode 100644
index b59729e79622..000000000000
--- a/patches/react-native+0.73.4+014+iOSCoreAnimationBorderRendering.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-diff --git a/node_modules/react-native/React/Fabric/Mounting/RCTMountingManager.mm b/node_modules/react-native/React/Fabric/Mounting/RCTMountingManager.mm
-index b4cfb3d..7aa00e5 100644
---- a/node_modules/react-native/React/Fabric/Mounting/RCTMountingManager.mm
-+++ b/node_modules/react-native/React/Fabric/Mounting/RCTMountingManager.mm
-@@ -49,6 +49,9 @@ static void RCTPerformMountInstructions(
- {
-   SystraceSection s("RCTPerformMountInstructions");
- 
-+  [CATransaction begin];
-+  [CATransaction setValue:(id)kCFBooleanTrue forKey:kCATransactionDisableActions];
-+
-   for (const auto &mutation : mutations) {
-     switch (mutation.type) {
-       case ShadowViewMutation::Create: {
-@@ -147,6 +150,7 @@ static void RCTPerformMountInstructions(
-       }
-     }
-   }
-+  [CATransaction commit];
- }
- 
- @implementation RCTMountingManager {
diff --git a/patches/react-native+0.73.4+015+fixIOSWebViewCrash.patch b/patches/react-native+0.73.4+015+fixIOSWebViewCrash.patch
deleted file mode 100644
index 7c4244f3a811..000000000000
--- a/patches/react-native+0.73.4+015+fixIOSWebViewCrash.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff --git a/node_modules/react-native/scripts/cocoapods/new_architecture.rb b/node_modules/react-native/scripts/cocoapods/new_architecture.rb
-index ba75b019a9b9b2..c9999beb82b7ea 100644
---- a/node_modules/react-native/scripts/cocoapods/new_architecture.rb
-+++ b/node_modules/react-native/scripts/cocoapods/new_architecture.rb
-@@ -105,6 +105,10 @@ def self.install_modules_dependencies(spec, new_arch_enabled, folly_version)
-         current_headers = current_config["HEADER_SEARCH_PATHS"] != nil ? current_config["HEADER_SEARCH_PATHS"] : ""
-         current_cpp_flags = current_config["OTHER_CPLUSPLUSFLAGS"] != nil ? current_config["OTHER_CPLUSPLUSFLAGS"] : ""
- 
-+        flags_to_add = new_arch_enabled ?
-+            "#{@@folly_compiler_flags} -DRCT_NEW_ARCH_ENABLED=1" :
-+            "#{@@folly_compiler_flags}"
-+
-         header_search_paths = ["\"$(PODS_ROOT)/boost\" \"$(PODS_ROOT)/Headers/Private/Yoga\""]
-         if ENV['USE_FRAMEWORKS']
-             header_search_paths << "\"$(PODS_ROOT)/DoubleConversion\""
-@@ -124,7 +128,7 @@ def self.install_modules_dependencies(spec, new_arch_enabled, folly_version)
-                 }
-         end
-         header_search_paths_string = header_search_paths.join(" ")
--        spec.compiler_flags = compiler_flags.empty? ? @@folly_compiler_flags : "#{compiler_flags} #{@@folly_compiler_flags}"
-+        spec.compiler_flags = compiler_flags.empty? ? "$(inherited) #{flags_to_add}" : "$(inherited) #{compiler_flags} #{flags_to_add}"
-         current_config["HEADER_SEARCH_PATHS"] = current_headers.empty? ?
-             header_search_paths_string :
-             "#{current_headers} #{header_search_paths_string}"
diff --git a/patches/react-native+0.75.2+001+fixMVCPAndroid.patch b/patches/react-native+0.75.2+001+fixMVCPAndroid.patch
new file mode 100644
index 000000000000..251469419f1f
--- /dev/null
+++ b/patches/react-native+0.75.2+001+fixMVCPAndroid.patch
@@ -0,0 +1,175 @@
+diff --git a/node_modules/react-native/ReactAndroid/src/main/java/com/facebook/react/views/scroll/MaintainVisibleScrollPositionHelper.java b/node_modules/react-native/ReactAndroid/src/main/java/com/facebook/react/views/scroll/MaintainVisibleScrollPositionHelper.java
+index 26c9aeb..b2cff8b 100644
+--- a/node_modules/react-native/ReactAndroid/src/main/java/com/facebook/react/views/scroll/MaintainVisibleScrollPositionHelper.java
++++ b/node_modules/react-native/ReactAndroid/src/main/java/com/facebook/react/views/scroll/MaintainVisibleScrollPositionHelper.java
+@@ -86,6 +86,7 @@ class MaintainVisibleScrollPositionHelper<ScrollViewT extends ViewGroup & HasSmo
+       return;
+     }
+     mListening = false;
++    mFirstVisibleView = null;
+     getUIManagerModule().removeUIManagerEventListener(this);
+   }
+ 
+@@ -93,20 +94,19 @@ class MaintainVisibleScrollPositionHelper<ScrollViewT extends ViewGroup & HasSmo
+    * Update the scroll position of the managed ScrollView. This should be called after layout has
+    * been updated.
+    */
+-  public void updateScrollPosition() {
++  public void onLayout() {
+     // On Fabric this will be called internally in `didMountItems`.
+-    if (ViewUtil.getUIManagerType(mScrollView.getId()) == UIManagerType.FABRIC) {
+-      return;
++    if (ViewUtil.getUIManagerType(mScrollView.getId()) != UIManagerType.FABRIC) {
++      didMountItemsInternal();
+     }
+-    updateScrollPositionInternal();
+   }
+ 
+-  private void updateScrollPositionInternal() {
+-    if (mConfig == null || mFirstVisibleView == null || mPrevFirstVisibleFrame == null) {
++  private void didMountItemsInternal() {
++    if (mConfig == null || mPrevFirstVisibleFrame == null) {
+       return;
+     }
+ 
+-    View firstVisibleView = mFirstVisibleView.get();
++    View firstVisibleView = getFirstVisibleView();
+     if (firstVisibleView == null) {
+       return;
+     }
+@@ -150,7 +150,7 @@ class MaintainVisibleScrollPositionHelper<ScrollViewT extends ViewGroup & HasSmo
+             ViewUtil.getUIManagerType(mScrollView.getId())));
+   }
+ 
+-  private void computeTargetView() {
++  public void onScroll() {
+     if (mConfig == null) {
+       return;
+     }
+@@ -160,6 +160,12 @@ class MaintainVisibleScrollPositionHelper<ScrollViewT extends ViewGroup & HasSmo
+     }
+ 
+     int currentScroll = mHorizontal ? mScrollView.getScrollX() : mScrollView.getScrollY();
++    View firstVisibleView = null;
++    // We cannot assume that the views will be in position order because of things like z-index
++    // which will change the order of views in their parent. This means we need to iterate through
++    // the full children array and find the view with the smallest position that is bigger than
++    // the scroll position.
++    float firstVisibleViewPosition = Float.MAX_VALUE;
+     for (int i = mConfig.minIndexForVisible; i < contentView.getChildCount(); i++) {
+       View child = contentView.getChildAt(i);
+ 
+@@ -168,14 +174,36 @@ class MaintainVisibleScrollPositionHelper<ScrollViewT extends ViewGroup & HasSmo
+           mHorizontal ? child.getX() + child.getWidth() : child.getY() + child.getHeight();
+ 
+       // If the child is partially visible or this is the last child, select it as the anchor.
+-      if (position > currentScroll || i == contentView.getChildCount() - 1) {
+-        mFirstVisibleView = new WeakReference<>(child);
+-        Rect frame = new Rect();
+-        child.getHitRect(frame);
+-        mPrevFirstVisibleFrame = frame;
+-        break;
++      if ((position > currentScroll && position < firstVisibleViewPosition) ||
++              (firstVisibleView == null && i == contentView.getChildCount() - 1)) {
++        firstVisibleView = child;
++        firstVisibleViewPosition = position;
++      }
++    }
++    mFirstVisibleView = new WeakReference<>(firstVisibleView);
++  }
++
++  private View getFirstVisibleView() {
++    return mFirstVisibleView != null ? mFirstVisibleView.get() : null;
++  }
++
++  private void willMountItemsInternal() {
++    View firstVisibleView = getFirstVisibleView();
++
++    // If we don't have a first visible view because no scroll happened call onScroll
++    // to update it.
++    if (firstVisibleView == null) {
++      onScroll();
++      firstVisibleView = getFirstVisibleView();
++
++      // There are cases where it is possible for this to still be null so just bail out.
++      if (firstVisibleView == null) {
++        return;
+       }
+     }
++    Rect frame = new Rect();
++    firstVisibleView.getHitRect(frame);
++    mPrevFirstVisibleFrame = frame;
+   }
+ 
+   // UIManagerListener
+@@ -186,19 +214,19 @@ class MaintainVisibleScrollPositionHelper<ScrollViewT extends ViewGroup & HasSmo
+         new Runnable() {
+           @Override
+           public void run() {
+-            computeTargetView();
++            willMountItemsInternal();
+           }
+         });
+   }
+ 
+   @Override
+   public void willMountItems(UIManager uiManager) {
+-    computeTargetView();
++    willMountItemsInternal();
+   }
+ 
+   @Override
+   public void didMountItems(UIManager uiManager) {
+-    updateScrollPositionInternal();
++    didMountItemsInternal();
+   }
+ 
+   @Override
+diff --git a/node_modules/react-native/ReactAndroid/src/main/java/com/facebook/react/views/scroll/ReactHorizontalScrollView.java b/node_modules/react-native/ReactAndroid/src/main/java/com/facebook/react/views/scroll/ReactHorizontalScrollView.java
+index 7d8853b..341ff28 100644
+--- a/node_modules/react-native/ReactAndroid/src/main/java/com/facebook/react/views/scroll/ReactHorizontalScrollView.java
++++ b/node_modules/react-native/ReactAndroid/src/main/java/com/facebook/react/views/scroll/ReactHorizontalScrollView.java
+@@ -476,6 +476,10 @@ public class ReactHorizontalScrollView extends HorizontalScrollView
+           mOnScrollDispatchHelper.getYFlingVelocity(),
+           mEnableSyncOnScroll);
+       mPreventReentry = false;
++
++      if (mMaintainVisibleContentPositionHelper != null) {
++        mMaintainVisibleContentPositionHelper.onScroll();
++      }
+     }
+   }
+ 
+@@ -1390,7 +1394,7 @@ public class ReactHorizontalScrollView extends HorizontalScrollView
+     if (layoutDirection == LAYOUT_DIRECTION_RTL) {
+       adjustPositionForContentChangeRTL(left, right, oldLeft, oldRight);
+     } else if (mMaintainVisibleContentPositionHelper != null) {
+-      mMaintainVisibleContentPositionHelper.updateScrollPosition();
++      mMaintainVisibleContentPositionHelper.onLayout();
+     }
+   }
+ 
+diff --git a/node_modules/react-native/ReactAndroid/src/main/java/com/facebook/react/views/scroll/ReactScrollView.java b/node_modules/react-native/ReactAndroid/src/main/java/com/facebook/react/views/scroll/ReactScrollView.java
+index 56f486a..21f5158 100644
+--- a/node_modules/react-native/ReactAndroid/src/main/java/com/facebook/react/views/scroll/ReactScrollView.java
++++ b/node_modules/react-native/ReactAndroid/src/main/java/com/facebook/react/views/scroll/ReactScrollView.java
+@@ -406,6 +406,10 @@ public class ReactScrollView extends ScrollView
+           mOnScrollDispatchHelper.getYFlingVelocity(),
+           mEnableSyncOnScroll);
+       mPreventReentry = false;
++
++      if (mMaintainVisibleContentPositionHelper != null) {
++        mMaintainVisibleContentPositionHelper.onScroll();
++      }
+     }
+   }
+ 
+@@ -1195,7 +1199,7 @@ public class ReactScrollView extends ScrollView
+     }
+ 
+     if (mMaintainVisibleContentPositionHelper != null) {
+-      mMaintainVisibleContentPositionHelper.updateScrollPosition();
++      mMaintainVisibleContentPositionHelper.onLayout();
+     }
+ 
+     if (isShown() && isContentReady()) {
diff --git a/patches/react-native+0.73.4+001+initial.patch b/patches/react-native+0.75.2+001+initial.patch
similarity index 100%
rename from patches/react-native+0.73.4+001+initial.patch
rename to patches/react-native+0.75.2+001+initial.patch
diff --git a/patches/react-native+0.75.2+002+iOSFontResolution.patch b/patches/react-native+0.75.2+002+iOSFontResolution.patch
new file mode 100644
index 000000000000..5257fe75392d
--- /dev/null
+++ b/patches/react-native+0.75.2+002+iOSFontResolution.patch
@@ -0,0 +1,58 @@
+diff --git a/node_modules/react-native/ReactCommon/react/renderer/textlayoutmanager/platform/ios/react/renderer/textlayoutmanager/RCTFontUtils.mm b/node_modules/react-native/ReactCommon/react/renderer/textlayoutmanager/platform/ios/react/renderer/textlayoutmanager/RCTFontUtils.mm
+index 1ff8c1f..921b495 100644
+--- a/node_modules/react-native/ReactCommon/react/renderer/textlayoutmanager/platform/ios/react/renderer/textlayoutmanager/RCTFontUtils.mm
++++ b/node_modules/react-native/ReactCommon/react/renderer/textlayoutmanager/platform/ios/react/renderer/textlayoutmanager/RCTFontUtils.mm
+@@ -37,9 +37,6 @@ static RCTFontProperties RCTResolveFontProperties(
+ {
+   fontProperties.family = fontProperties.family.length ? fontProperties.family : baseFontProperties.family;
+   fontProperties.size = !isnan(fontProperties.size) ? fontProperties.size : baseFontProperties.size;
+-  fontProperties.weight = !isnan(fontProperties.weight) ? fontProperties.weight : baseFontProperties.weight;
+-  fontProperties.style =
+-      fontProperties.style != RCTFontStyleUndefined ? fontProperties.style : baseFontProperties.style;
+   fontProperties.variant =
+       fontProperties.variant != RCTFontVariantUndefined ? fontProperties.variant : baseFontProperties.variant;
+   return fontProperties;
+@@ -161,10 +158,14 @@ static RCTFontStyle RCTGetFontStyle(UIFont *font)
+   if ([fontProperties.family isEqualToString:defaultFontProperties.family]) {
+     // Handle system font as special case. This ensures that we preserve
+     // the specific metrics of the standard system font as closely as possible.
++    fontProperties.weight = !isnan(fontProperties.weight) ? fontProperties.weight : defaultFontProperties.weight;
++    fontProperties.style =
++        fontProperties.style != RCTFontStyleUndefined ? fontProperties.style : defaultFontProperties.style;
+     font = RCTDefaultFontWithFontProperties(fontProperties);
+   } else {
+     NSArray<NSString *> *fontNames = [UIFont fontNamesForFamilyName:fontProperties.family];
+-
++    UIFontWeight fontWeight = fontProperties.weight;
++    RCTFontStyle fontStyle = fontProperties.style;
+     if (fontNames.count == 0) {
+       // Gracefully handle being given a font name rather than font family, for
+       // example: "Helvetica Light Oblique" rather than just "Helvetica".
+@@ -174,18 +175,24 @@ static RCTFontStyle RCTGetFontStyle(UIFont *font)
+         // Failback to system font.
+         font = [UIFont systemFontOfSize:effectiveFontSize weight:fontProperties.weight];
+       }
+-    } else {
++      
++      fontNames = [UIFont fontNamesForFamilyName:font.familyName];
++      fontWeight = isnan(fontWeight) ? RCTGetFontWeight(font) : fontWeight;
++      fontStyle = fontStyle == RCTFontStyleUndefined ? RCTGetFontStyle(font) : fontStyle;
++    }
++        
++    if (fontNames.count != 0) {
+       // Get the closest font that matches the given weight for the fontFamily
+       CGFloat closestWeight = INFINITY;
+       for (NSString *name in fontNames) {
+         UIFont *fontMatch = [UIFont fontWithName:name size:effectiveFontSize];
+ 
+-        if (RCTGetFontStyle(fontMatch) != fontProperties.style) {
++        if (RCTGetFontStyle(fontMatch) != fontStyle) {
+           continue;
+         }
+ 
+         CGFloat testWeight = RCTGetFontWeight(fontMatch);
+-        if (ABS(testWeight - fontProperties.weight) < ABS(closestWeight - fontProperties.weight)) {
++        if (ABS(testWeight - fontWeight) < ABS(closestWeight - fontWeight)) {
+           font = fontMatch;
+           closestWeight = testWeight;
+         }
diff --git a/patches/react-native+0.75.2+003+AndroidModalSize.patch b/patches/react-native+0.75.2+003+AndroidModalSize.patch
new file mode 100644
index 000000000000..432d57bb9b69
--- /dev/null
+++ b/patches/react-native+0.75.2+003+AndroidModalSize.patch
@@ -0,0 +1,141 @@
+diff --git a/node_modules/react-native/ReactAndroid/src/main/java/com/facebook/react/views/modal/ModalHostHelper.kt b/node_modules/react-native/ReactAndroid/src/main/java/com/facebook/react/views/modal/ModalHostHelper.kt
+deleted file mode 100644
+index f1698ae..0000000
+--- a/node_modules/react-native/ReactAndroid/src/main/java/com/facebook/react/views/modal/ModalHostHelper.kt
++++ /dev/null
+@@ -1,62 +0,0 @@
+-/*
+- * Copyright (c) Meta Platforms, Inc. and affiliates.
+- *
+- * This source code is licensed under the MIT license found in the
+- * LICENSE file in the root directory of this source tree.
+- */
+-
+-package com.facebook.react.views.modal
+-
+-import android.annotation.SuppressLint
+-import android.content.Context
+-import android.graphics.Point
+-import android.view.WindowManager
+-
+-/** Helper class for Modals. */
+-internal object ModalHostHelper {
+-  private val MIN_POINT = Point()
+-  private val MAX_POINT = Point()
+-  private val SIZE_POINT = Point()
+-
+-  /**
+-   * To get the size of the screen, we use information from the WindowManager and default Display.
+-   * We don't use DisplayMetricsHolder, or Display#getSize() because they return values that include
+-   * the status bar. We only want the values of what will actually be shown on screen. We use
+-   * Display#getSize() to determine if the screen is in portrait or landscape. We don't use
+-   * getRotation because the 'natural' rotation will be portrait on phones and landscape on tablets.
+-   * This should only be called on the native modules/shadow nodes thread.
+-   */
+-  @Suppress("DEPRECATION")
+-  @JvmStatic
+-  fun getModalHostSize(context: Context): Point {
+-    val wm = context.getSystemService(Context.WINDOW_SERVICE) as WindowManager
+-    val display = wm.defaultDisplay
+-    // getCurrentSizeRange will return the min and max width and height that the window can be
+-    display.getCurrentSizeRange(MIN_POINT, MAX_POINT)
+-    // getSize will return the dimensions of the screen in its current orientation
+-    display.getSize(SIZE_POINT)
+-
+-    val attrs = intArrayOf(android.R.attr.windowFullscreen)
+-    val theme = context.theme
+-    val ta = theme.obtainStyledAttributes(attrs)
+-    val windowFullscreen = ta.getBoolean(0, false)
+-
+-    // We need to add the status bar height to the height if we have a fullscreen window,
+-    // because Display.getCurrentSizeRange doesn't include it.
+-    val resources = context.resources
+-    @SuppressLint("DiscouragedApi", "InternalInsetResource")
+-    val statusBarId = resources.getIdentifier("status_bar_height", "dimen", "android")
+-    var statusBarHeight = 0
+-    if (windowFullscreen && statusBarId > 0) {
+-      statusBarHeight = resources.getDimension(statusBarId).toInt()
+-    }
+-
+-    return if (SIZE_POINT.x < SIZE_POINT.y) {
+-      // If we are vertical the width value comes from min width and height comes from max height
+-      Point(MIN_POINT.x, MAX_POINT.y + statusBarHeight)
+-    } else {
+-      // If we are horizontal the width value comes from max width and height comes from min height
+-      Point(MAX_POINT.x, MIN_POINT.y + statusBarHeight)
+-    }
+-  }
+-}
+diff --git a/node_modules/react-native/ReactAndroid/src/main/java/com/facebook/react/views/modal/ModalHostShadowNode.kt b/node_modules/react-native/ReactAndroid/src/main/java/com/facebook/react/views/modal/ModalHostShadowNode.kt
+deleted file mode 100644
+index 4c52f3a..0000000
+--- a/node_modules/react-native/ReactAndroid/src/main/java/com/facebook/react/views/modal/ModalHostShadowNode.kt
++++ /dev/null
+@@ -1,34 +0,0 @@
+-/*
+- * Copyright (c) Meta Platforms, Inc. and affiliates.
+- *
+- * This source code is licensed under the MIT license found in the
+- * LICENSE file in the root directory of this source tree.
+- */
+-
+-package com.facebook.react.views.modal
+-
+-import com.facebook.react.uimanager.LayoutShadowNode
+-import com.facebook.react.uimanager.ReactShadowNodeImpl
+-import com.facebook.react.views.modal.ModalHostHelper.getModalHostSize
+-
+-/**
+- * We implement the Modal by using an Android Dialog. That will fill the entire window of the
+- * application. To get layout to work properly, we need to layout all the elements within the
+- * Modal's inner content view as if they can fill the entire window. To do that, we need to
+- * explicitly set the styleWidth and styleHeight on the LayoutShadowNode of the child of this node
+- * to be the window size. This will then cause the children of the Modal to layout as if they can
+- * fill the window.
+- */
+-internal class ModalHostShadowNode : LayoutShadowNode() {
+-  /**
+-   * We need to set the styleWidth and styleHeight of the one child (represented by the
+-   * <View></View> within the <RCTModalHostView></RCTModalHostView> in Modal.js. This needs to fill
+-   * the entire window.
+-   */
+-  override fun addChildAt(child: ReactShadowNodeImpl, i: Int) {
+-    super.addChildAt(child, i)
+-    val modalSize = getModalHostSize(themedContext)
+-    child.setStyleWidth(modalSize.x.toFloat())
+-    child.setStyleHeight(modalSize.y.toFloat())
+-  }
+-}
+diff --git a/node_modules/react-native/ReactAndroid/src/main/java/com/facebook/react/views/modal/ReactModalHostManager.kt b/node_modules/react-native/ReactAndroid/src/main/java/com/facebook/react/views/modal/ReactModalHostManager.kt
+index 7bb4bc2..d5e053c 100644
+--- a/node_modules/react-native/ReactAndroid/src/main/java/com/facebook/react/views/modal/ReactModalHostManager.kt
++++ b/node_modules/react-native/ReactAndroid/src/main/java/com/facebook/react/views/modal/ReactModalHostManager.kt
+@@ -21,7 +21,6 @@ import com.facebook.react.uimanager.ViewManagerDelegate
+ import com.facebook.react.uimanager.annotations.ReactProp
+ import com.facebook.react.viewmanagers.ModalHostViewManagerDelegate
+ import com.facebook.react.viewmanagers.ModalHostViewManagerInterface
+-import com.facebook.react.views.modal.ModalHostHelper.getModalHostSize
+ import com.facebook.react.views.modal.ReactModalHostView.OnRequestCloseListener
+ 
+ /** View manager for [ReactModalHostView] components. */
+@@ -35,11 +34,6 @@ public class ReactModalHostManager :
+   protected override fun createViewInstance(reactContext: ThemedReactContext): ReactModalHostView =
+       ReactModalHostView(reactContext)
+ 
+-  public override fun createShadowNodeInstance(): LayoutShadowNode = ModalHostShadowNode()
+-
+-  public override fun getShadowNodeClass(): Class<out LayoutShadowNode> =
+-      ModalHostShadowNode::class.java
+-
+   public override fun onDropViewInstance(view: ReactModalHostView) {
+     super.onDropViewInstance(view)
+     view.onDropInstance()
+@@ -136,8 +130,6 @@ public class ReactModalHostManager :
+       stateWrapper: StateWrapper
+   ): Any? {
+     view.stateWrapper = stateWrapper
+-    val modalSize = getModalHostSize(view.context)
+-    view.updateState(modalSize.x, modalSize.y)
+     return null
+   }
+ 
\ No newline at end of file
diff --git a/patches/react-native+0.73.4+007+disableTextInputRecycling.patch b/patches/react-native+0.75.2+004+disableTextInputRecycling.patch
similarity index 100%
rename from patches/react-native+0.73.4+007+disableTextInputRecycling.patch
rename to patches/react-native+0.75.2+004+disableTextInputRecycling.patch
diff --git a/patches/react-native+0.73.4+010+resetAutoresizingOnView.patch b/patches/react-native+0.75.2+005+resetAutoresizingOnView.patch
similarity index 100%
rename from patches/react-native+0.73.4+010+resetAutoresizingOnView.patch
rename to patches/react-native+0.75.2+005+resetAutoresizingOnView.patch
diff --git a/patches/react-native+0.73.4+012+disableNonTranslucentStatusBar.patch b/patches/react-native+0.75.2+006+disableNonTranslucentStatusBar.patch
similarity index 100%
rename from patches/react-native+0.73.4+012+disableNonTranslucentStatusBar.patch
rename to patches/react-native+0.75.2+006+disableNonTranslucentStatusBar.patch
diff --git a/patches/react-native+0.75.2+007+TextInput.patch b/patches/react-native+0.75.2+007+TextInput.patch
new file mode 100644
index 000000000000..c12cb3fdc33e
--- /dev/null
+++ b/patches/react-native+0.75.2+007+TextInput.patch
@@ -0,0 +1,60 @@
+diff --git a/node_modules/react-native/React/Fabric/Mounting/ComponentViews/TextInput/RCTTextInputComponentView.mm b/node_modules/react-native/React/Fabric/Mounting/ComponentViews/TextInput/RCTTextInputComponentView.mm
+index a206779..7e868f9 100644
+--- a/node_modules/react-native/React/Fabric/Mounting/ComponentViews/TextInput/RCTTextInputComponentView.mm
++++ b/node_modules/react-native/React/Fabric/Mounting/ComponentViews/TextInput/RCTTextInputComponentView.mm
+@@ -125,6 +125,10 @@ - (void)updateProps:(const Props::Shared &)props oldProps:(const Props::Shared &
+     [self _setMultiline:newTextInputProps.traits.multiline];
+   }
+ 
++  if (newTextInputProps.traits.showSoftInputOnFocus != oldTextInputProps.traits.showSoftInputOnFocus) {
++    [self _setShowSoftInputOnFocus:newTextInputProps.traits.showSoftInputOnFocus];
++  }
++
+   if (newTextInputProps.traits.autocapitalizationType != oldTextInputProps.traits.autocapitalizationType) {
+     _backedTextInputView.autocapitalizationType =
+         RCTUITextAutocapitalizationTypeFromAutocapitalizationType(newTextInputProps.traits.autocapitalizationType);
+@@ -661,6 +665,25 @@ - (void)_setMultiline:(BOOL)multiline
+   RCTCopyBackedTextInput(_backedTextInputView, backedTextInputView);
+   _backedTextInputView = backedTextInputView;
+   [self addSubview:_backedTextInputView];
++  
++  auto const &currentTextInputProps = *std::static_pointer_cast<TextInputProps const>(_props);
++  [self _setShowSoftInputOnFocus:currentTextInputProps.traits.showSoftInputOnFocus];
++}
++
++- (void)_setShowSoftInputOnFocus:(BOOL)showSoftInputOnFocus
++{
++    if (showSoftInputOnFocus) {
++      // Resets to default keyboard.
++      _backedTextInputView.inputView = nil;
++
++      // Without the call to reloadInputViews, the keyboard will not change until the textInput field (the first      // responder) loses and regains focus.
++      if (_backedTextInputView.isFirstResponder) {
++        [_backedTextInputView reloadInputViews];
++      }
++    } else {
++      // Hides keyboard, but keeps blinking cursor.
++      _backedTextInputView.inputView = [UIView new];
++  }
+ }
+ 
+ - (BOOL)_textOf:(NSAttributedString *)newText equals:(NSAttributedString *)oldText
+diff --git a/node_modules/react-native/ReactCommon/react/renderer/components/textinput/platform/android/react/renderer/components/androidtextinput/AndroidTextInputShadowNode.cpp b/node_modules/react-native/ReactCommon/react/renderer/components/textinput/platform/android/react/renderer/components/androidtextinput/AndroidTextInputShadowNode.cpp
+index d15c7b3..2543fc5 100644
+--- a/node_modules/react-native/ReactCommon/react/renderer/components/textinput/platform/android/react/renderer/components/androidtextinput/AndroidTextInputShadowNode.cpp
++++ b/node_modules/react-native/ReactCommon/react/renderer/components/textinput/platform/android/react/renderer/components/androidtextinput/AndroidTextInputShadowNode.cpp
+@@ -179,14 +179,6 @@ void AndroidTextInputShadowNode::updateStateIfNeeded() {
+ Size AndroidTextInputShadowNode::measureContent(
+     const LayoutContext& layoutContext,
+     const LayoutConstraints& layoutConstraints) const {
+-  if (getStateData().cachedAttributedStringId != 0) {
+-    return textLayoutManager_
+-        ->measureCachedSpannableById(
+-            getStateData().cachedAttributedStringId,
+-            getConcreteProps().paragraphAttributes,
+-            layoutConstraints)
+-        .size;
+-  }
+ 
+   // Layout is called right after measure.
+   // Measure is marked as `const`, and `layout` is not; so State can be updated
diff --git a/patches/react-native+0.75.2+008+iOSCoreAnimationBorderRendering.patch b/patches/react-native+0.75.2+008+iOSCoreAnimationBorderRendering.patch
new file mode 100644
index 000000000000..478e282e387d
--- /dev/null
+++ b/patches/react-native+0.75.2+008+iOSCoreAnimationBorderRendering.patch
@@ -0,0 +1,23 @@
+diff --git a/node_modules/react-native/React/Fabric/Mounting/RCTMountingManager.mm b/node_modules/react-native/React/Fabric/Mounting/RCTMountingManager.mm
+index b4cfb3d..fdfae56 100644
+--- a/node_modules/react-native/React/Fabric/Mounting/RCTMountingManager.mm
++++ b/node_modules/react-native/React/Fabric/Mounting/RCTMountingManager.mm
+@@ -265,6 +265,9 @@ static void RCTPerformMountInstructions(
+ 
+   auto surfaceId = mountingCoordinator.getSurfaceId();
+   
++  [CATransaction begin];
++  [CATransaction setValue:(id)kCFBooleanTrue forKey:kCATransactionDisableActions];
++
+   mountingCoordinator.getTelemetryController().pullTransaction(
+       [&](const MountingTransaction &transaction, const SurfaceTelemetry &surfaceTelemetry) {
+         [self.delegate mountingManager:self willMountComponentsWithRootTag:surfaceId];
+@@ -278,6 +281,8 @@ static void RCTPerformMountInstructions(
+         _observerCoordinator.notifyObserversMountingTransactionDidMount(transaction, surfaceTelemetry);
+         [self.delegate mountingManager:self didMountComponentsWithRootTag:surfaceId];
+       });
++  
++  [CATransaction commit];
+ }
+ 
+ - (void)setIsJSResponder:(BOOL)isJSResponder
diff --git a/patches/react-native+0.75.2+009+copyStateOnClone.patch b/patches/react-native+0.75.2+009+copyStateOnClone.patch
new file mode 100644
index 000000000000..982a7aeaa52a
--- /dev/null
+++ b/patches/react-native+0.75.2+009+copyStateOnClone.patch
@@ -0,0 +1,12 @@
+diff --git a/node_modules/react-native/ReactCommon/react/renderer/core/ShadowNode.cpp b/node_modules/react-native/ReactCommon/react/renderer/core/ShadowNode.cpp
+index 68da528..04ec622 100644
+--- a/node_modules/react-native/ReactCommon/react/renderer/core/ShadowNode.cpp
++++ b/node_modules/react-native/ReactCommon/react/renderer/core/ShadowNode.cpp
+@@ -370,6 +370,7 @@ ShadowNode::Unshared ShadowNode::cloneTree(
+ 
+     childNode = parentNode.clone(
+         {.children = std::make_shared<ShadowNode::ListOfShared>(children),
++         .state = parentNode.getState(),
+          .traits = traits});
+   }
+ 
\ No newline at end of file
diff --git a/patches/react-native+0.75.2+010+fixClippedEmojis.patch b/patches/react-native+0.75.2+010+fixClippedEmojis.patch
new file mode 100644
index 000000000000..fc14627441a5
--- /dev/null
+++ b/patches/react-native+0.75.2+010+fixClippedEmojis.patch
@@ -0,0 +1,46 @@
+diff --git a/node_modules/react-native/ReactCommon/react/renderer/textlayoutmanager/platform/ios/react/renderer/textlayoutmanager/RCTAttributedTextUtils.h b/node_modules/react-native/ReactCommon/react/renderer/textlayoutmanager/platform/ios/react/renderer/textlayoutmanager/RCTAttributedTextUtils.h
+index 49a4353..c0158f3 100644
+--- a/node_modules/react-native/ReactCommon/react/renderer/textlayoutmanager/platform/ios/react/renderer/textlayoutmanager/RCTAttributedTextUtils.h
++++ b/node_modules/react-native/ReactCommon/react/renderer/textlayoutmanager/platform/ios/react/renderer/textlayoutmanager/RCTAttributedTextUtils.h
+@@ -39,6 +39,8 @@ facebook::react::AttributedStringBox RCTAttributedStringBoxFromNSAttributedStrin
+ 
+ NSString *RCTNSStringFromStringApplyingTextTransform(NSString *string, facebook::react::TextTransform textTransform);
+ 
++void RCTApplyBaselineOffset(NSMutableAttributedString *attributedText);
++
+ @interface RCTWeakEventEmitterWrapper : NSObject
+ @property (nonatomic, assign) facebook::react::SharedEventEmitter eventEmitter;
+ @end
+diff --git a/node_modules/react-native/ReactCommon/react/renderer/textlayoutmanager/platform/ios/react/renderer/textlayoutmanager/RCTAttributedTextUtils.mm b/node_modules/react-native/ReactCommon/react/renderer/textlayoutmanager/platform/ios/react/renderer/textlayoutmanager/RCTAttributedTextUtils.mm
+index 74f5b65..5bdeac3 100644
+--- a/node_modules/react-native/ReactCommon/react/renderer/textlayoutmanager/platform/ios/react/renderer/textlayoutmanager/RCTAttributedTextUtils.mm
++++ b/node_modules/react-native/ReactCommon/react/renderer/textlayoutmanager/platform/ios/react/renderer/textlayoutmanager/RCTAttributedTextUtils.mm
+@@ -300,7 +300,7 @@ inline static CGFloat RCTEffectiveFontSizeMultiplierFromTextAttributes(const Tex
+   return [attributes copy];
+ }
+ 
+-static void RCTApplyBaselineOffset(NSMutableAttributedString *attributedText)
++void RCTApplyBaselineOffset(NSMutableAttributedString *attributedText)
+ {
+   __block CGFloat maximumLineHeight = 0;
+ 
+@@ -411,7 +411,6 @@ static void RCTApplyBaselineOffset(NSMutableAttributedString *attributedText)
+ 
+     [nsAttributedString appendAttributedString:nsAttributedStringFragment];
+   }
+-  RCTApplyBaselineOffset(nsAttributedString);
+   [nsAttributedString endEditing];
+ 
+   return nsAttributedString;
+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 b171246..b4a7033 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
+@@ -185,6 +185,7 @@ - (NSTextStorage *)_textStorageAndLayoutManagerWithAttributesString:(NSAttribute
+ 
+   NSTextStorage *textStorage = [[NSTextStorage alloc] initWithAttributedString:attributedString];
+ 
++  RCTApplyBaselineOffset(textStorage);
+   [textStorage addLayoutManager:layoutManager];
+ 
+   if (paragraphAttributes.adjustsFontSizeToFit) {
diff --git a/patches/react-native+0.75.2+011+textinput-clear-command.patch b/patches/react-native+0.75.2+011+textinput-clear-command.patch
new file mode 100644
index 000000000000..773dde04ef44
--- /dev/null
+++ b/patches/react-native+0.75.2+011+textinput-clear-command.patch
@@ -0,0 +1,266 @@
+diff --git a/node_modules/react-native/Libraries/Components/TextInput/RCTTextInputViewConfig.js b/node_modules/react-native/Libraries/Components/TextInput/RCTTextInputViewConfig.js
+index 0aa8965..3bfe22c 100644
+--- a/node_modules/react-native/Libraries/Components/TextInput/RCTTextInputViewConfig.js
++++ b/node_modules/react-native/Libraries/Components/TextInput/RCTTextInputViewConfig.js
+@@ -85,6 +85,9 @@ const RCTTextInputViewConfig = {
+     topContentSizeChange: {
+       registrationName: 'onContentSizeChange',
+     },
++    topClear: {
++      registrationName: 'onClear',
++    },
+   },
+   validAttributes: {
+     fontSize: 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 0aa50fe..edf9078 100644
+--- a/node_modules/react-native/Libraries/Components/TextInput/TextInput.d.ts
++++ b/node_modules/react-native/Libraries/Components/TextInput/TextInput.d.ts
+@@ -708,6 +708,12 @@ export interface TextInputProps
+   onBlur?:
+     | ((e: NativeSyntheticEvent<TextInputFocusEventData>) => void)
+     | undefined;
++    /**
++     * Callback that is called when the text input was cleared using the native clear command.
++     */
++  onClear?:
++    | ((e: NativeSyntheticEvent<TextInputChangeEventData>) => void)
++    | undefined;
+ 
+   /**
+    * Callback that is called when the text input's text changes.
+diff --git a/node_modules/react-native/Libraries/Components/TextInput/TextInput.js b/node_modules/react-native/Libraries/Components/TextInput/TextInput.js
+index 8b827ae..a94fb19 100644
+--- a/node_modules/react-native/Libraries/Components/TextInput/TextInput.js
++++ b/node_modules/react-native/Libraries/Components/TextInput/TextInput.js
+@@ -1288,6 +1288,10 @@ function InternalTextInput(props: Props): React.Node {
+       mostRecentEventCount,
+     });
+   };
++  const _onClear = (event: ChangeEvent) => {
++    setMostRecentEventCount(event.nativeEvent.eventCount);
++    props.onClear && props.onClear(event);
++  };
+ 
+   const _onFocus = (event: FocusEvent) => {
+     TextInputState.focusInput(inputRef.current);
+@@ -1437,6 +1441,7 @@ function InternalTextInput(props: Props): React.Node {
+         mostRecentEventCount={mostRecentEventCount}
+         nativeID={id ?? props.nativeID}
+         onBlur={_onBlur}
++        onClear={_onClear}
+         onChange={_onChange}
+         onContentSizeChange={props.onContentSizeChange}
+         onFocus={_onFocus}
+@@ -1503,6 +1508,7 @@ function InternalTextInput(props: Props): React.Node {
+         nativeID={id ?? props.nativeID}
+         numberOfLines={props.rows ?? props.numberOfLines}
+         onBlur={_onBlur}
++        onClear={_onClear}
+         onChange={_onChange}
+         onFocus={_onFocus}
+         /* $FlowFixMe[prop-missing] the types for AndroidTextInput don't match
+diff --git a/node_modules/react-native/Libraries/Text/TextInput/RCTBaseTextInputViewManager.mm b/node_modules/react-native/Libraries/Text/TextInput/RCTBaseTextInputViewManager.mm
+index 20749a6..f58f147 100644
+--- a/node_modules/react-native/Libraries/Text/TextInput/RCTBaseTextInputViewManager.mm
++++ b/node_modules/react-native/Libraries/Text/TextInput/RCTBaseTextInputViewManager.mm
+@@ -62,6 +62,7 @@ @implementation RCTBaseTextInputViewManager {
+ 
+ RCT_EXPORT_VIEW_PROPERTY(onChange, RCTBubblingEventBlock)
+ RCT_EXPORT_VIEW_PROPERTY(onKeyPressSync, RCTDirectEventBlock)
++RCT_EXPORT_VIEW_PROPERTY(onClear, RCTDirectEventBlock)
+ RCT_EXPORT_VIEW_PROPERTY(onChangeSync, RCTDirectEventBlock)
+ RCT_EXPORT_VIEW_PROPERTY(onSelectionChange, RCTDirectEventBlock)
+ RCT_EXPORT_VIEW_PROPERTY(onScroll, RCTDirectEventBlock)
+diff --git a/node_modules/react-native/React/Fabric/Mounting/ComponentViews/TextInput/RCTTextInputComponentView.mm b/node_modules/react-native/React/Fabric/Mounting/ComponentViews/TextInput/RCTTextInputComponentView.mm
+index 7e868f9..29f733a 100644
+--- a/node_modules/react-native/React/Fabric/Mounting/ComponentViews/TextInput/RCTTextInputComponentView.mm
++++ b/node_modules/react-native/React/Fabric/Mounting/ComponentViews/TextInput/RCTTextInputComponentView.mm
+@@ -447,6 +447,19 @@ - (void)blur
+   [_backedTextInputView resignFirstResponder];
+ }
+ 
++- (void)clear
++{
++    auto metrics = [self _textInputMetrics];
++    [self setTextAndSelection:_mostRecentEventCount value:@"" start:0 end:0];
++    
++    _mostRecentEventCount++;
++    metrics.eventCount = _mostRecentEventCount;
++    
++    // Notify JS that the event counter has changed
++    const auto &textInputEventEmitter = static_cast<const TextInputEventEmitter &>(*_eventEmitter);
++    textInputEventEmitter.onClear(metrics);
++}
++
+ - (void)setTextAndSelection:(NSInteger)eventCount
+                       value:(NSString *__nullable)value
+                       start:(NSInteger)start
+diff --git a/node_modules/react-native/React/Fabric/Mounting/ComponentViews/TextInput/RCTTextInputNativeCommands.h b/node_modules/react-native/React/Fabric/Mounting/ComponentViews/TextInput/RCTTextInputNativeCommands.h
+index fe3376a..6889eed 100644
+--- a/node_modules/react-native/React/Fabric/Mounting/ComponentViews/TextInput/RCTTextInputNativeCommands.h
++++ b/node_modules/react-native/React/Fabric/Mounting/ComponentViews/TextInput/RCTTextInputNativeCommands.h
+@@ -14,6 +14,7 @@ NS_ASSUME_NONNULL_BEGIN
+ @protocol RCTTextInputViewProtocol <NSObject>
+ - (void)focus;
+ - (void)blur;
++- (void)clear;
+ - (void)setTextAndSelection:(NSInteger)eventCount
+                       value:(NSString *__nullable)value
+                       start:(NSInteger)start
+@@ -49,6 +50,19 @@ RCTTextInputHandleCommand(id<RCTTextInputViewProtocol> componentView, const NSSt
+     return;
+   }
+ 
++  if ([commandName isEqualToString:@"clear"]) {
++#if RCT_DEBUG
++    if ([args count] != 0) {
++      RCTLogError(
++          @"%@ command %@ received %d arguments, expected %d.", @"TextInput", commandName, (int)[args count], 0);
++      return;
++    }
++#endif
++
++    [componentView clear];
++    return;
++  }
++
+   if ([commandName isEqualToString:@"setTextAndSelection"]) {
+ #if RCT_DEBUG
+     if ([args count] != 4) {
+diff --git a/node_modules/react-native/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactTextClearEvent.java b/node_modules/react-native/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactTextClearEvent.java
+new file mode 100644
+index 0000000..0c142a0
+--- /dev/null
++++ b/node_modules/react-native/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactTextClearEvent.java
+@@ -0,0 +1,53 @@
++/*
++ * Copyright (c) Meta Platforms, Inc. and affiliates.
++ *
++ * This source code is licensed under the MIT license found in the
++ * LICENSE file in the root directory of this source tree.
++ */
++
++package com.facebook.react.views.textinput;
++
++import androidx.annotation.Nullable;
++
++import com.facebook.react.bridge.Arguments;
++import com.facebook.react.bridge.WritableMap;
++import com.facebook.react.uimanager.common.ViewUtil;
++import com.facebook.react.uimanager.events.Event;
++
++/**
++ * Event emitted by EditText native view when text changes. VisibleForTesting from {@link
++ * TextInputEventsTestCase}.
++ */
++public class ReactTextClearEvent extends Event<ReactTextClearEvent> {
++
++  public static final String EVENT_NAME = "topClear";
++
++  private String mText;
++  private int mEventCount;
++
++  @Deprecated
++  public ReactTextClearEvent(int viewId, String text, int eventCount) {
++    this(ViewUtil.NO_SURFACE_ID, viewId, text, eventCount);
++  }
++
++  public ReactTextClearEvent(int surfaceId, int viewId, String text, int eventCount) {
++    super(surfaceId, viewId);
++    mText = text;
++    mEventCount = eventCount;
++  }
++
++  @Override
++  public String getEventName() {
++    return EVENT_NAME;
++  }
++
++  @Nullable
++  @Override
++  protected WritableMap getEventData() {
++    WritableMap eventData = Arguments.createMap();
++    eventData.putString("text", mText);
++    eventData.putInt("eventCount", mEventCount);
++    eventData.putInt("target", getViewTag());
++    return eventData;
++  }
++}
+diff --git a/node_modules/react-native/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactTextInputManager.java b/node_modules/react-native/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactTextInputManager.java
+index 2c225da..a8c5d94 100644
+--- a/node_modules/react-native/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactTextInputManager.java
++++ b/node_modules/react-native/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactTextInputManager.java
+@@ -8,6 +8,7 @@
+ package com.facebook.react.views.textinput;
+ 
+ import static com.facebook.react.uimanager.UIManagerHelper.getReactContext;
++import static com.facebook.react.uimanager.UIManagerHelper.getSurfaceId;
+ 
+ import android.content.Context;
+ import android.content.res.ColorStateList;
+@@ -261,6 +262,9 @@ public class ReactTextInputManager extends BaseViewManager<ReactEditText, Layout
+             .put(
+                 ScrollEventType.getJSEventName(ScrollEventType.SCROLL),
+                 MapBuilder.of("registrationName", "onScroll"))
++            .put(
++                ReactTextClearEvent.EVENT_NAME,
++                MapBuilder.of("registrationName", "onClear"))
+             .build());
+     return eventTypeConstants;
+   }
+@@ -318,6 +322,27 @@ public class ReactTextInputManager extends BaseViewManager<ReactEditText, Layout
+           reactEditText.maybeSetTextFromJS(getReactTextUpdate(text, mostRecentEventCount));
+         }
+         reactEditText.maybeSetSelection(mostRecentEventCount, start, end);
++        break;
++      case "clear":
++        // Capture the current text
++        Editable text = reactEditText.getText();
++
++        // Reset the edit text
++        ReactTextUpdate textUpdate = getReactTextUpdate("", reactEditText.incrementAndGetEventCounter());
++        reactEditText.maybeSetTextFromJS(textUpdate);
++        reactEditText.maybeSetSelection(reactEditText.incrementAndGetEventCounter(), 0, 0);
++
++        // Dispatch the clear event
++        EventDispatcher eventDispatcher = getEventDispatcher(getReactContext(reactEditText), reactEditText);
++        eventDispatcher.dispatchEvent(
++                new ReactTextClearEvent(
++                        getSurfaceId(reactEditText),
++                        reactEditText.getId(),
++                        text.toString(),
++                        reactEditText.incrementAndGetEventCounter()
++                )
++        );
++
+         break;
+     }
+   }
+diff --git a/node_modules/react-native/ReactCommon/react/renderer/components/textinput/platform/ios/react/renderer/components/iostextinput/TextInputEventEmitter.cpp b/node_modules/react-native/ReactCommon/react/renderer/components/textinput/platform/ios/react/renderer/components/iostextinput/TextInputEventEmitter.cpp
+index c2262b0..a7294ad 100644
+--- a/node_modules/react-native/ReactCommon/react/renderer/components/textinput/platform/ios/react/renderer/components/iostextinput/TextInputEventEmitter.cpp
++++ b/node_modules/react-native/ReactCommon/react/renderer/components/textinput/platform/ios/react/renderer/components/iostextinput/TextInputEventEmitter.cpp
+@@ -134,6 +134,10 @@ void TextInputEventEmitter::onBlur(const Metrics& textInputMetrics) const {
+   dispatchTextInputEvent("blur", textInputMetrics);
+ }
+ 
++void TextInputEventEmitter::onClear(const Metrics& textInputMetrics) const {
++  dispatchTextInputEvent("clear", textInputMetrics);
++}
++
+ void TextInputEventEmitter::onChange(const Metrics& textInputMetrics) const {
+   dispatchTextInputEvent("change", textInputMetrics);
+ }
+diff --git a/node_modules/react-native/ReactCommon/react/renderer/components/textinput/platform/ios/react/renderer/components/iostextinput/TextInputEventEmitter.h b/node_modules/react-native/ReactCommon/react/renderer/components/textinput/platform/ios/react/renderer/components/iostextinput/TextInputEventEmitter.h
+index 9182dd3..465d303 100644
+--- a/node_modules/react-native/ReactCommon/react/renderer/components/textinput/platform/ios/react/renderer/components/iostextinput/TextInputEventEmitter.h
++++ b/node_modules/react-native/ReactCommon/react/renderer/components/textinput/platform/ios/react/renderer/components/iostextinput/TextInputEventEmitter.h
+@@ -36,6 +36,7 @@ class TextInputEventEmitter : public ViewEventEmitter {
+ 
+   void onFocus(const Metrics& textInputMetrics) const;
+   void onBlur(const Metrics& textInputMetrics) const;
++  void onClear(const Metrics& textInputMetrics) const;
+   void onChange(const Metrics& textInputMetrics) const;
+   void onContentSizeChange(const Metrics& textInputMetrics) const;
+   void onSelectionChange(const Metrics& textInputMetrics) const;
diff --git a/patches/react-native+0.75.2+012+Add-onPaste-to-TextInput.patch b/patches/react-native+0.75.2+012+Add-onPaste-to-TextInput.patch
new file mode 100644
index 000000000000..f406a36239c6
--- /dev/null
+++ b/patches/react-native+0.75.2+012+Add-onPaste-to-TextInput.patch
@@ -0,0 +1,690 @@
+diff --git a/node_modules/react-native/Libraries/Components/TextInput/AndroidTextInputNativeComponent.js b/node_modules/react-native/Libraries/Components/TextInput/AndroidTextInputNativeComponent.js
+index a77e5b4..5e58ec4 100644
+--- a/node_modules/react-native/Libraries/Components/TextInput/AndroidTextInputNativeComponent.js
++++ b/node_modules/react-native/Libraries/Components/TextInput/AndroidTextInputNativeComponent.js
+@@ -455,6 +455,21 @@ export type NativeProps = $ReadOnly<{|
+     |}>,
+   >,
+ 
++  /**
++   * Invoked when the user performs the paste action.
++   */
++  onPaste?: ?DirectEventHandler<
++    $ReadOnly<{|
++      target: Int32,
++      items: $ReadOnlyArray<
++        $ReadOnly<{|
++          type: string,
++          data: string,
++        |}>,
++      >,
++    |}>,
++  >,
++
+   /**
+    * The string that will be rendered before text input has been entered.
+    */
+@@ -658,6 +673,9 @@ export const __INTERNAL_VIEW_CONFIG: PartialViewConfig = {
+     topScroll: {
+       registrationName: 'onScroll',
+     },
++    topPaste: {
++      registrationName: 'onPaste',
++    },
+   },
+   validAttributes: {
+     maxFontSizeMultiplier: true,
+@@ -711,6 +729,7 @@ export const __INTERNAL_VIEW_CONFIG: PartialViewConfig = {
+     secureTextEntry: true,
+     textBreakStrategy: true,
+     onScroll: true,
++    onPaste: true,
+     onContentSizeChange: true,
+     disableFullscreenUI: true,
+     includeFontPadding: true,
+diff --git a/node_modules/react-native/Libraries/Components/TextInput/RCTTextInputViewConfig.js b/node_modules/react-native/Libraries/Components/TextInput/RCTTextInputViewConfig.js
+index 3bfe22c..1cb122f 100644
+--- a/node_modules/react-native/Libraries/Components/TextInput/RCTTextInputViewConfig.js
++++ b/node_modules/react-native/Libraries/Components/TextInput/RCTTextInputViewConfig.js
+@@ -88,6 +88,9 @@ const RCTTextInputViewConfig = {
+     topClear: {
+       registrationName: 'onClear',
+     },
++    topPaste: {
++      registrationName: 'onPaste',
++    },
+   },
+   validAttributes: {
+     fontSize: true,
+@@ -153,6 +156,7 @@ const RCTTextInputViewConfig = {
+       onSelectionChange: true,
+       onContentSizeChange: true,
+       onScroll: true,
++      onPaste: 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 edf9078..20501f7 100644
+--- a/node_modules/react-native/Libraries/Components/TextInput/TextInput.d.ts
++++ b/node_modules/react-native/Libraries/Components/TextInput/TextInput.d.ts
+@@ -485,6 +485,16 @@ export interface TextInputSubmitEditingEventData {
+   text: string;
+ }
+ 
++/**
++ * @see TextInputProps.onPaste
++ */
++export interface TextInputPasteEventData extends TargetedEvent {
++  items: Array<{
++    type: string;
++    data: string;
++  }>;
++}
++
+ /**
+  * @see https://reactnative.dev/docs/textinput#props
+  */
+@@ -807,6 +817,13 @@ export interface TextInputProps
+     | ((e: NativeSyntheticEvent<TextInputKeyPressEventData>) => void)
+     | undefined;
+ 
++  /**
++   * Invoked when the user performs the paste action.
++   */
++  onPaste?:
++    | ((e: NativeSyntheticEvent<TextInputPasteEventData>) => void)
++    | undefined;
++
+   /**
+    * The string that will be rendered before text input has been entered
+    */
+diff --git a/node_modules/react-native/Libraries/Components/TextInput/TextInput.flow.js b/node_modules/react-native/Libraries/Components/TextInput/TextInput.flow.js
+index 638acd7..2f35731 100644
+--- a/node_modules/react-native/Libraries/Components/TextInput/TextInput.flow.js
++++ b/node_modules/react-native/Libraries/Components/TextInput/TextInput.flow.js
+@@ -94,6 +94,18 @@ export type EditingEvent = SyntheticEvent<
+   |}>,
+ >;
+ 
++export type PasteEvent = SyntheticEvent<
++  $ReadOnly<{|
++    target: number,
++    items: $ReadOnlyArray<
++      $ReadOnly<{|
++        type: string,
++        data: string,
++      |}>,
++    >,
++  |}>,
++>;
++
+ type DataDetectorTypesType =
+   | 'phoneNumber'
+   | 'link'
+@@ -812,6 +824,11 @@ export type Props = $ReadOnly<{|
+    */
+   onScroll?: ?(e: ScrollEvent) => mixed,
+ 
++  /**
++   * Invoked when the user performs the paste action.
++   */
++  onPaste?: ?(e: PasteEvent) => mixed,
++
+   /**
+    * The string that will be rendered before text input has been entered.
+    */
+diff --git a/node_modules/react-native/Libraries/Components/TextInput/TextInput.js b/node_modules/react-native/Libraries/Components/TextInput/TextInput.js
+index a94fb19..8cfde15 100644
+--- a/node_modules/react-native/Libraries/Components/TextInput/TextInput.js
++++ b/node_modules/react-native/Libraries/Components/TextInput/TextInput.js
+@@ -132,6 +132,18 @@ export type EditingEvent = SyntheticEvent<
+   |}>,
+ >;
+ 
++export type PasteEvent = SyntheticEvent<
++  $ReadOnly<{|
++    target: number,
++    items: $ReadOnlyArray<
++      $ReadOnly<{|
++        type: string,
++        data: string,
++      |}>,
++    >,
++  |}>,
++>;
++
+ type DataDetectorTypesType =
+   | 'phoneNumber'
+   | 'link'
+@@ -810,6 +822,11 @@ export type Props = $ReadOnly<{|
+    */
+   onScroll?: ?(e: ScrollEvent) => mixed,
+ 
++  /**
++   * Invoked when the user performs the paste action.
++   */
++  onPaste?: ?(e: PasteEvent) => mixed,
++
+   /**
+    * The string that will be rendered before text input has been entered.
+    */
+diff --git a/node_modules/react-native/Libraries/Text/TextInput/Multiline/RCTUITextView.mm b/node_modules/react-native/Libraries/Text/TextInput/Multiline/RCTUITextView.mm
+index d5e2e22..a11679a 100644
+--- a/node_modules/react-native/Libraries/Text/TextInput/Multiline/RCTUITextView.mm
++++ b/node_modules/react-native/Libraries/Text/TextInput/Multiline/RCTUITextView.mm
+@@ -13,6 +13,10 @@
+ #import <React/RCTBackedTextInputDelegateAdapter.h>
+ #import <React/RCTTextAttributes.h>
+ 
++#import <MobileCoreServices/MobileCoreServices.h>
++#import <MobileCoreServices/UTType.h>
++#import <UIKit/UIKit.h>
++
+ @implementation RCTUITextView {
+   UILabel *_placeholderView;
+   UITextView *_detachedTextView;
+@@ -172,7 +176,32 @@ - (void)scrollRangeToVisible:(NSRange)range
+ - (void)paste:(id)sender
+ {
+   _textWasPasted = YES;
+-  [super paste:sender];
++  UIPasteboard *clipboard = [UIPasteboard generalPasteboard];
++  if (clipboard.hasImages) {
++    for (NSItemProvider *itemProvider in clipboard.itemProviders) {
++      if ([itemProvider hasItemConformingToTypeIdentifier:(NSString *)kUTTypeImage]) {
++        for (NSString *identifier in itemProvider.registeredTypeIdentifiers) {
++          if (UTTypeConformsTo((__bridge CFStringRef)identifier, kUTTypeImage)) {
++            NSString *MIMEType = (__bridge_transfer NSString *)UTTypeCopyPreferredTagWithClass((__bridge CFStringRef)identifier, kUTTagClassMIMEType);
++            NSString *fileExtension = (__bridge_transfer NSString *)UTTypeCopyPreferredTagWithClass((__bridge CFStringRef)identifier, kUTTagClassFilenameExtension);
++            NSString *fileName = [NSString stringWithFormat:@"%@.%@", [[NSUUID UUID] UUIDString], fileExtension];
++            NSString *filePath = [NSTemporaryDirectory() stringByAppendingPathComponent:fileName];
++            NSURL *fileURL = [NSURL fileURLWithPath:filePath];
++            NSData *fileData = [clipboard dataForPasteboardType:identifier];
++            [fileData writeToFile:filePath atomically:YES];
++            [_textInputDelegateAdapter didPaste:MIMEType withData:[fileURL absoluteString]];
++            break;
++          }
++        }
++        break;
++      }
++    }
++  } else {
++    if (clipboard.hasStrings) {
++      [_textInputDelegateAdapter didPaste:@"text/plain" withData:clipboard.string];
++    }
++    [super paste:sender];
++  }
+ }
+ 
+ // Turn off scroll animation to fix flaky scrolling.
+@@ -264,6 +293,10 @@ - (BOOL)canPerformAction:(SEL)action withSender:(id)sender
+     return NO;
+   }
+ 
++  if (action == @selector(paste:) && [UIPasteboard generalPasteboard].hasImages) {
++    return YES;
++  }
++
+   return [super canPerformAction:action withSender:sender];
+ }
+ 
+diff --git a/node_modules/react-native/Libraries/Text/TextInput/RCTBackedTextInputDelegate.h b/node_modules/react-native/Libraries/Text/TextInput/RCTBackedTextInputDelegate.h
+index 7187177..da00893 100644
+--- a/node_modules/react-native/Libraries/Text/TextInput/RCTBackedTextInputDelegate.h
++++ b/node_modules/react-native/Libraries/Text/TextInput/RCTBackedTextInputDelegate.h
+@@ -37,6 +37,8 @@ NS_ASSUME_NONNULL_BEGIN
+ 
+ - (void)textInputDidChangeSelection;
+ 
++- (void)textInputDidPaste:(NSString *)type withData:(NSString *)data;
++
+ @optional
+ 
+ - (void)scrollViewDidScroll:(UIScrollView *)scrollView;
+diff --git a/node_modules/react-native/Libraries/Text/TextInput/RCTBackedTextInputDelegateAdapter.h b/node_modules/react-native/Libraries/Text/TextInput/RCTBackedTextInputDelegateAdapter.h
+index f1c32e6..0ce9dfe 100644
+--- a/node_modules/react-native/Libraries/Text/TextInput/RCTBackedTextInputDelegateAdapter.h
++++ b/node_modules/react-native/Libraries/Text/TextInput/RCTBackedTextInputDelegateAdapter.h
+@@ -20,6 +20,7 @@ NS_ASSUME_NONNULL_BEGIN
+ 
+ - (void)skipNextTextInputDidChangeSelectionEventWithTextRange:(UITextRange *)textRange;
+ - (void)selectedTextRangeWasSet;
++- (void)didPaste:(NSString *)type withData:(NSString *)data;
+ 
+ @end
+ 
+@@ -30,6 +31,7 @@ NS_ASSUME_NONNULL_BEGIN
+ - (instancetype)initWithTextView:(UITextView<RCTBackedTextInputViewProtocol> *)backedTextInputView;
+ 
+ - (void)skipNextTextInputDidChangeSelectionEventWithTextRange:(UITextRange *)textRange;
++- (void)didPaste:(NSString *)type withData:(NSString *)data;
+ 
+ @end
+ 
+diff --git a/node_modules/react-native/Libraries/Text/TextInput/RCTBackedTextInputDelegateAdapter.mm b/node_modules/react-native/Libraries/Text/TextInput/RCTBackedTextInputDelegateAdapter.mm
+index 9dca6a5..b2c6b53 100644
+--- a/node_modules/react-native/Libraries/Text/TextInput/RCTBackedTextInputDelegateAdapter.mm
++++ b/node_modules/react-native/Libraries/Text/TextInput/RCTBackedTextInputDelegateAdapter.mm
+@@ -147,6 +147,11 @@ - (void)selectedTextRangeWasSet
+   [self textFieldProbablyDidChangeSelection];
+ }
+ 
++- (void)didPaste:(NSString *)type withData:(NSString *)data
++{
++  [_backedTextInputView.textInputDelegate textInputDidPaste:type withData:data];
++}
++
+ #pragma mark - Generalization
+ 
+ - (void)textFieldProbablyDidChangeSelection
+@@ -290,6 +295,11 @@ - (void)skipNextTextInputDidChangeSelectionEventWithTextRange:(UITextRange *)tex
+   _previousSelectedTextRange = textRange;
+ }
+ 
++- (void)didPaste:(NSString *)type withData:(NSString *)data
++{
++  [_backedTextInputView.textInputDelegate textInputDidPaste:type withData:data];
++}
++
+ #pragma mark - Generalization
+ 
+ - (void)textViewProbablyDidChangeSelection
+diff --git a/node_modules/react-native/Libraries/Text/TextInput/RCTBaseTextInputView.h b/node_modules/react-native/Libraries/Text/TextInput/RCTBaseTextInputView.h
+index 9a02b82..06442b4 100644
+--- a/node_modules/react-native/Libraries/Text/TextInput/RCTBaseTextInputView.h
++++ b/node_modules/react-native/Libraries/Text/TextInput/RCTBaseTextInputView.h
+@@ -37,6 +37,7 @@ NS_ASSUME_NONNULL_BEGIN
+ @property (nonatomic, copy, nullable) RCTDirectEventBlock onChange;
+ @property (nonatomic, copy, nullable) RCTDirectEventBlock onChangeSync;
+ @property (nonatomic, copy, nullable) RCTDirectEventBlock onScroll;
++@property (nonatomic, copy, nullable) RCTDirectEventBlock onPaste;
+ 
+ @property (nonatomic, assign) NSInteger mostRecentEventCount;
+ @property (nonatomic, assign, readonly) NSInteger nativeEventCount;
+diff --git a/node_modules/react-native/Libraries/Text/TextInput/RCTBaseTextInputView.mm b/node_modules/react-native/Libraries/Text/TextInput/RCTBaseTextInputView.mm
+index 826ff3a..04ea28f 100644
+--- a/node_modules/react-native/Libraries/Text/TextInput/RCTBaseTextInputView.mm
++++ b/node_modules/react-native/Libraries/Text/TextInput/RCTBaseTextInputView.mm
+@@ -551,6 +551,26 @@ - (void)textInputDidChangeSelection
+   });
+ }
+ 
++- (void)textInputDidPaste:(NSString *)type withData:(NSString *)data
++{
++  if (!_onPaste) {
++    return;
++  }
++
++  NSMutableArray *items = [NSMutableArray new];
++  [items addObject:@{
++    @"type" : type,
++    @"data" : data,
++  }];
++
++  NSDictionary *payload = @{
++    @"target" : self.reactTag,
++    @"items" : items,
++  };
++
++  _onPaste(payload);
++}
++
+ - (void)updateLocalData
+ {
+   [self enforceTextAttributesIfNeeded];
+diff --git a/node_modules/react-native/Libraries/Text/TextInput/RCTBaseTextInputViewManager.mm b/node_modules/react-native/Libraries/Text/TextInput/RCTBaseTextInputViewManager.mm
+index f58f147..e367394 100644
+--- a/node_modules/react-native/Libraries/Text/TextInput/RCTBaseTextInputViewManager.mm
++++ b/node_modules/react-native/Libraries/Text/TextInput/RCTBaseTextInputViewManager.mm
+@@ -66,6 +66,7 @@ @implementation RCTBaseTextInputViewManager {
+ RCT_EXPORT_VIEW_PROPERTY(onChangeSync, RCTDirectEventBlock)
+ RCT_EXPORT_VIEW_PROPERTY(onSelectionChange, RCTDirectEventBlock)
+ RCT_EXPORT_VIEW_PROPERTY(onScroll, RCTDirectEventBlock)
++RCT_EXPORT_VIEW_PROPERTY(onPaste, RCTDirectEventBlock)
+ 
+ RCT_EXPORT_VIEW_PROPERTY(mostRecentEventCount, NSInteger)
+ 
+diff --git a/node_modules/react-native/Libraries/Text/TextInput/Singleline/RCTUITextField.mm b/node_modules/react-native/Libraries/Text/TextInput/Singleline/RCTUITextField.mm
+index 0318671..bb165d7 100644
+--- a/node_modules/react-native/Libraries/Text/TextInput/Singleline/RCTUITextField.mm
++++ b/node_modules/react-native/Libraries/Text/TextInput/Singleline/RCTUITextField.mm
+@@ -12,6 +12,10 @@
+ #import <React/RCTUtils.h>
+ #import <React/UIView+React.h>
+ 
++#import <MobileCoreServices/MobileCoreServices.h>
++#import <MobileCoreServices/UTType.h>
++#import <UIKit/UIKit.h>
++
+ @implementation RCTUITextField {
+   RCTBackedTextFieldDelegateAdapter *_textInputDelegateAdapter;
+   NSDictionary<NSAttributedStringKey, id> *_defaultTextAttributes;
+@@ -139,6 +143,10 @@ - (BOOL)canPerformAction:(SEL)action withSender:(id)sender
+     return NO;
+   }
+ 
++  if (action == @selector(paste:) && [UIPasteboard generalPasteboard].hasImages) {
++    return YES;
++  }
++
+   return [super canPerformAction:action withSender:sender];
+ }
+ 
+@@ -222,7 +230,32 @@ - (void)scrollRangeToVisible:(NSRange)range
+ - (void)paste:(id)sender
+ {
+   _textWasPasted = YES;
+-  [super paste:sender];
++  UIPasteboard *clipboard = [UIPasteboard generalPasteboard];
++  if (clipboard.hasImages) {
++    for (NSItemProvider *itemProvider in clipboard.itemProviders) {
++      if ([itemProvider hasItemConformingToTypeIdentifier:(NSString *)kUTTypeImage]) {
++        for (NSString *identifier in itemProvider.registeredTypeIdentifiers) {
++          if (UTTypeConformsTo((__bridge CFStringRef)identifier, kUTTypeImage)) {
++            NSString *MIMEType = (__bridge_transfer NSString *)UTTypeCopyPreferredTagWithClass((__bridge CFStringRef)identifier, kUTTagClassMIMEType);
++            NSString *fileExtension = (__bridge_transfer NSString *)UTTypeCopyPreferredTagWithClass((__bridge CFStringRef)identifier, kUTTagClassFilenameExtension);
++            NSString *fileName = [NSString stringWithFormat:@"%@.%@", [[NSUUID UUID] UUIDString], fileExtension];
++            NSString *filePath = [NSTemporaryDirectory() stringByAppendingPathComponent:fileName];
++            NSURL *fileURL = [NSURL fileURLWithPath:filePath];
++            NSData *fileData = [clipboard dataForPasteboardType:identifier];
++            [fileData writeToFile:filePath atomically:YES];
++            [_textInputDelegateAdapter didPaste:MIMEType withData:[fileURL absoluteString]];
++            break;
++          }
++        }
++        break;
++      }
++    }
++  } else {
++    if (clipboard.hasStrings) {
++      [_textInputDelegateAdapter didPaste:@"text/plain" withData:clipboard.string];
++    }
++    [super paste:sender];
++  }
+ }
+ 
+ #pragma mark - Layout
+diff --git a/node_modules/react-native/React/Fabric/Mounting/ComponentViews/TextInput/RCTTextInputComponentView.mm b/node_modules/react-native/React/Fabric/Mounting/ComponentViews/TextInput/RCTTextInputComponentView.mm
+index 29f733a..79bd345 100644
+--- a/node_modules/react-native/React/Fabric/Mounting/ComponentViews/TextInput/RCTTextInputComponentView.mm
++++ b/node_modules/react-native/React/Fabric/Mounting/ComponentViews/TextInput/RCTTextInputComponentView.mm
+@@ -421,6 +421,13 @@ - (void)textInputDidChangeSelection
+   }
+ }
+ 
++- (void)textInputDidPaste:(NSString *)type withData:(NSString *)data
++{
++  if (_eventEmitter) {
++    static_cast<const TextInputEventEmitter &>(*_eventEmitter).onPaste(std::string([type UTF8String]), std::string([data UTF8String]));
++  }
++}
++
+ #pragma mark - RCTBackedTextInputDelegate (UIScrollViewDelegate)
+ 
+ - (void)scrollViewDidScroll:(UIScrollView *)scrollView
+diff --git a/node_modules/react-native/ReactAndroid/src/main/java/com/facebook/react/views/textinput/PasteWatcher.java b/node_modules/react-native/ReactAndroid/src/main/java/com/facebook/react/views/textinput/PasteWatcher.java
+new file mode 100644
+index 0000000..bfb5819
+--- /dev/null
++++ b/node_modules/react-native/ReactAndroid/src/main/java/com/facebook/react/views/textinput/PasteWatcher.java
+@@ -0,0 +1,17 @@
++/*
++ * Copyright (c) Meta Platforms, Inc. and affiliates.
++ *
++ * This source code is licensed under the MIT license found in the
++ * LICENSE file in the root directory of this source tree.
++ */
++
++package com.facebook.react.views.textinput;
++
++/**
++ * Implement this interface to be informed of paste event in the
++ * ReactTextEdit This is used by the ReactTextInputManager to forward events
++ * from the EditText to JS
++ */
++interface PasteWatcher {
++  public void onPaste(String type, String data);
++}
+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 014e0b4..119219b 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
+@@ -9,6 +9,10 @@ package com.facebook.react.views.textinput;
+ 
+ import static com.facebook.react.uimanager.UIManagerHelper.getReactContext;
+ 
++import android.content.ClipboardManager;
++import android.content.ClipData;
++import android.content.ClipDescription;
++import android.content.ContentResolver;
+ import android.content.Context;
+ import android.graphics.Canvas;
+ import android.graphics.Color;
+@@ -16,6 +20,7 @@ import android.graphics.Paint;
+ import android.graphics.Rect;
+ import android.graphics.Typeface;
+ import android.graphics.drawable.Drawable;
++import android.net.Uri;
+ import android.os.Build;
+ import android.os.Bundle;
+ import android.text.Editable;
+@@ -109,6 +114,7 @@ public class ReactEditText extends AppCompatEditText {
+   private @Nullable SelectionWatcher mSelectionWatcher;
+   private @Nullable ContentSizeWatcher mContentSizeWatcher;
+   private @Nullable ScrollWatcher mScrollWatcher;
++  private @Nullable PasteWatcher mPasteWatcher;
+   private InternalKeyListener mKeyListener;
+   private boolean mDetectScrollMovement = false;
+   private boolean mOnKeyPress = false;
+@@ -152,6 +158,7 @@ public class ReactEditText extends AppCompatEditText {
+       mKeyListener = new InternalKeyListener();
+     }
+     mScrollWatcher = null;
++    mPasteWatcher = null;
+     mTextAttributes = new TextAttributes();
+ 
+     applyTextAttributes();
+@@ -310,8 +317,29 @@ public class ReactEditText extends AppCompatEditText {
+    */
+   @Override
+   public boolean onTextContextMenuItem(int id) {
+-    if (id == android.R.id.paste) {
++    if (id == android.R.id.paste || id == android.R.id.pasteAsPlainText) {
+       id = android.R.id.pasteAsPlainText;
++      if (mPasteWatcher != null) {
++        ClipboardManager clipboardManager =
++            (ClipboardManager) getContext().getSystemService(Context.CLIPBOARD_SERVICE);
++        ClipData clipData = clipboardManager.getPrimaryClip();
++        String type = null;
++        String data = null;
++        if (clipData.getDescription().hasMimeType(ClipDescription.MIMETYPE_TEXT_PLAIN)) {
++          type = ClipDescription.MIMETYPE_TEXT_PLAIN;
++          data = clipData.getItemAt(0).getText().toString();
++        } else {
++          Uri itemUri = clipData.getItemAt(0).getUri();
++          if (itemUri != null) {
++            ContentResolver cr = getReactContext(this).getContentResolver();
++            type = cr.getType(itemUri);
++            data = itemUri.toString();
++          }
++        }
++        if (type != null && data != null) {
++          mPasteWatcher.onPaste(type, data);
++        }
++      }
+     }
+     return super.onTextContextMenuItem(id);
+   }
+@@ -373,6 +401,10 @@ public class ReactEditText extends AppCompatEditText {
+     mScrollWatcher = scrollWatcher;
+   }
+ 
++  public void setPasteWatcher(@Nullable PasteWatcher pasteWatcher) {
++    mPasteWatcher = pasteWatcher;
++  }
++
+   /**
+    * Attempt to set a selection or fail silently. Intentionally meant to handle bad inputs.
+    * EventCounter is the same one used as with text.
+diff --git a/node_modules/react-native/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactTextInputManager.java b/node_modules/react-native/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactTextInputManager.java
+index a8c5d94..dd7969f 100644
+--- a/node_modules/react-native/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactTextInputManager.java
++++ b/node_modules/react-native/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactTextInputManager.java
+@@ -246,6 +246,9 @@ public class ReactTextInputManager extends BaseViewManager<ReactEditText, Layout
+                 MapBuilder.of(
+                     "phasedRegistrationNames",
+                     MapBuilder.of("bubbled", "onKeyPress", "captured", "onKeyPressCapture")))
++            .put(
++                "topPaste",
++                MapBuilder.of("registrationName", "onPaste"))
+             .build());
+     return eventTypeConstants;
+   }
+@@ -502,6 +505,15 @@ public class ReactTextInputManager extends BaseViewManager<ReactEditText, Layout
+     }
+   }
+ 
++  @ReactProp(name = "onPaste", defaultBoolean = false)
++  public void setOnPaste(final ReactEditText view, boolean onPaste) {
++    if (onPaste) {
++      view.setPasteWatcher(new ReactPasteWatcher(view));
++    } else {
++      view.setPasteWatcher(null);
++    }
++  }
++
+   @ReactProp(name = "onKeyPress", defaultBoolean = false)
+   public void setOnKeyPress(final ReactEditText view, boolean onKeyPress) {
+     view.setOnKeyPress(onKeyPress);
+@@ -1352,6 +1364,25 @@ public class ReactTextInputManager extends BaseViewManager<ReactEditText, Layout
+     }
+   }
+ 
++  private static class ReactPasteWatcher implements PasteWatcher {
++    private final ReactEditText mReactEditText;
++    private final EventDispatcher mEventDispatcher;
++    private final int mSurfaceId;
++
++    public ReactPasteWatcher(ReactEditText editText) {
++      mReactEditText = editText;
++      ReactContext reactContext = getReactContext(editText);
++      mEventDispatcher = getEventDispatcher(reactContext, editText);
++      mSurfaceId = UIManagerHelper.getSurfaceId(reactContext);
++    }
++
++    @Override
++    public void onPaste(String type, String data) {
++      mEventDispatcher.dispatchEvent(
++          new ReactTextInputPasteEvent(mSurfaceId, mReactEditText.getId(), type, data));
++    }
++  }
++
+   @Override
+   public @Nullable Map<String, Object> getExportedViewConstants() {
+     return MapBuilder.of(
+diff --git a/node_modules/react-native/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactTextInputPasteEvent.java b/node_modules/react-native/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactTextInputPasteEvent.java
+new file mode 100644
+index 0000000..78b14b7
+--- /dev/null
++++ b/node_modules/react-native/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactTextInputPasteEvent.java
+@@ -0,0 +1,63 @@
++/*
++ * Copyright (c) Meta Platforms, Inc. and affiliates.
++ *
++ * This source code is licensed under the MIT license found in the
++ * LICENSE file in the root directory of this source tree.
++ */
++
++package com.facebook.react.views.textinput;
++
++import androidx.annotation.Nullable;
++import com.facebook.react.bridge.Arguments;
++import com.facebook.react.bridge.WritableMap;
++import com.facebook.react.bridge.WritableArray;
++import com.facebook.react.uimanager.common.ViewUtil;
++import com.facebook.react.uimanager.events.Event;
++
++/**
++ * Event emitted by EditText native view when clipboard content is pasted
++ */
++class ReactTextInputPasteEvent extends Event<ReactTextInputPasteEvent> {
++
++  private static final String EVENT_NAME = "topPaste";
++
++  private String mType;
++  private String mData;
++
++  @Deprecated
++  public ReactTextInputPasteEvent(int viewId, String type, String data) {
++    this(ViewUtil.NO_SURFACE_ID, viewId, type, data);
++  }
++
++  public ReactTextInputPasteEvent(int surfaceId, int viewId, String type, String data) {
++    super(surfaceId, viewId);
++    mType = type;
++    mData = data;
++  }
++
++  @Override
++  public String getEventName() {
++    return EVENT_NAME;
++  }
++
++  @Override
++  public boolean canCoalesce() {
++    return false;
++  }
++
++  @Nullable
++  @Override
++  protected WritableMap getEventData() {
++    WritableMap eventData = Arguments.createMap();
++
++    WritableArray items = Arguments.createArray();
++    WritableMap item = Arguments.createMap();
++    item.putString("type", mType);
++    item.putString("data", mData);
++    items.pushMap(item);
++
++    eventData.putArray("items", items);
++
++    return eventData;
++  }
++}
+diff --git a/node_modules/react-native/ReactCommon/react/renderer/components/textinput/platform/ios/react/renderer/components/iostextinput/TextInputEventEmitter.cpp b/node_modules/react-native/ReactCommon/react/renderer/components/textinput/platform/ios/react/renderer/components/iostextinput/TextInputEventEmitter.cpp
+index a7294ad..e7427a5 100644
+--- a/node_modules/react-native/ReactCommon/react/renderer/components/textinput/platform/ios/react/renderer/components/iostextinput/TextInputEventEmitter.cpp
++++ b/node_modules/react-native/ReactCommon/react/renderer/components/textinput/platform/ios/react/renderer/components/iostextinput/TextInputEventEmitter.cpp
+@@ -176,6 +176,19 @@ void TextInputEventEmitter::onScroll(const Metrics& textInputMetrics) const {
+   });
+ }
+ 
++void TextInputEventEmitter::onPaste(const std::string& type, const std::string& data) const {
++  dispatchEvent("onPaste", [type, data](jsi::Runtime& runtime) {
++    auto payload = jsi::Object(runtime);
++    auto items = jsi::Array(runtime, 1);
++    auto item = jsi::Object(runtime);
++    item.setProperty(runtime, "type", type);
++    item.setProperty(runtime, "data", data);
++    items.setValueAtIndex(runtime, 0, item);
++    payload.setProperty(runtime, "items", items);
++    return payload;
++  });
++}
++
+ void TextInputEventEmitter::dispatchTextInputEvent(
+     const std::string& name,
+     const Metrics& textInputMetrics) const {
+diff --git a/node_modules/react-native/ReactCommon/react/renderer/components/textinput/platform/ios/react/renderer/components/iostextinput/TextInputEventEmitter.h b/node_modules/react-native/ReactCommon/react/renderer/components/textinput/platform/ios/react/renderer/components/iostextinput/TextInputEventEmitter.h
+index 465d303..09bb48b 100644
+--- a/node_modules/react-native/ReactCommon/react/renderer/components/textinput/platform/ios/react/renderer/components/iostextinput/TextInputEventEmitter.h
++++ b/node_modules/react-native/ReactCommon/react/renderer/components/textinput/platform/ios/react/renderer/components/iostextinput/TextInputEventEmitter.h
+@@ -44,6 +44,7 @@ class TextInputEventEmitter : public ViewEventEmitter {
+   void onSubmitEditing(const Metrics& textInputMetrics) const;
+   void onKeyPress(const KeyPressMetrics& keyPressMetrics) const;
+   void onScroll(const Metrics& textInputMetrics) const;
++  void onPaste(const std::string& type, const std::string& data) const;
+ 
+  private:
+   void dispatchTextInputEvent(
diff --git a/patches/react-native+0.75.2+013+alert-style.patch b/patches/react-native+0.75.2+013+alert-style.patch
new file mode 100644
index 000000000000..09ed726f7b73
--- /dev/null
+++ b/patches/react-native+0.75.2+013+alert-style.patch
@@ -0,0 +1,18 @@
+diff --git a/node_modules/react-native/ReactAndroid/src/main/java/com/facebook/react/modules/dialog/AlertFragment.java b/node_modules/react-native/ReactAndroid/src/main/java/com/facebook/react/modules/dialog/AlertFragment.java
+index b5e48ae..70a7512 100644
+--- a/node_modules/react-native/ReactAndroid/src/main/java/com/facebook/react/modules/dialog/AlertFragment.java
++++ b/node_modules/react-native/ReactAndroid/src/main/java/com/facebook/react/modules/dialog/AlertFragment.java
+@@ -9,12 +9,12 @@ package com.facebook.react.modules.dialog;
+ 
+ import android.annotation.SuppressLint;
+ import android.app.Dialog;
++import android.app.AlertDialog;
+ import android.content.Context;
+ import android.content.DialogInterface;
+ import android.content.res.TypedArray;
+ import android.os.Bundle;
+ import androidx.annotation.Nullable;
+-import androidx.appcompat.app.AlertDialog;
+ import androidx.fragment.app.DialogFragment;
+ import com.facebook.infer.annotation.Nullsafe;
+ 
diff --git a/patches/react-native+0.75.2+014+fixNavigationAnimations.patch b/patches/react-native+0.75.2+014+fixNavigationAnimations.patch
new file mode 100644
index 000000000000..23783e0e35a7
--- /dev/null
+++ b/patches/react-native+0.75.2+014+fixNavigationAnimations.patch
@@ -0,0 +1,39 @@
+diff --git a/node_modules/react-native/Libraries/Animated/nodes/AnimatedProps.js b/node_modules/react-native/Libraries/Animated/nodes/AnimatedProps.js
+index d6c3462..582892b 100644
+--- a/node_modules/react-native/Libraries/Animated/nodes/AnimatedProps.js
++++ b/node_modules/react-native/Libraries/Animated/nodes/AnimatedProps.js
+@@ -46,6 +46,7 @@ export default class AnimatedProps extends AnimatedNode {
+     super();
+     this._props = createAnimatedProps(props);
+     this._callback = callback;
++    this._connectedToView = false;
+   }
+ 
+   __getValue(): Object {
+@@ -120,6 +121,8 @@ export default class AnimatedProps extends AnimatedNode {
+       if (this._animatedView) {
+         this.__connectAnimatedView();
+       }
++    } else if (!this._connectedToView && this._animatedView) {
++      this.__connectAnimatedView();
+     }
+   }
+ 
+@@ -140,6 +143,8 @@ export default class AnimatedProps extends AnimatedNode {
+       nativeViewTag != null,
+       'Unable to locate attached view in the native tree',
+     );
++
++    this._connectedToView = true;
+     NativeAnimatedHelper.API.connectAnimatedNodeToView(
+       this.__getNativeTag(),
+       nativeViewTag,
+@@ -153,6 +158,8 @@ export default class AnimatedProps extends AnimatedNode {
+       nativeViewTag != null,
+       'Unable to locate attached view in the native tree',
+     );
++
++    this._connectedToView = false;
+     NativeAnimatedHelper.API.disconnectAnimatedNodeFromView(
+       this.__getNativeTag(),
+       nativeViewTag,
diff --git a/patches/react-native+0.75.2+015+fixScrollViewState.patch b/patches/react-native+0.75.2+015+fixScrollViewState.patch
new file mode 100644
index 000000000000..39217faef404
--- /dev/null
+++ b/patches/react-native+0.75.2+015+fixScrollViewState.patch
@@ -0,0 +1,13 @@
+diff --git a/node_modules/react-native/ReactAndroid/src/main/java/com/facebook/react/views/scroll/ReactScrollViewHelper.kt b/node_modules/react-native/ReactAndroid/src/main/java/com/facebook/react/views/scroll/ReactScrollViewHelper.kt
+index fabeec1..603c47c 100644
+--- a/node_modules/react-native/ReactAndroid/src/main/java/com/facebook/react/views/scroll/ReactScrollViewHelper.kt
++++ b/node_modules/react-native/ReactAndroid/src/main/java/com/facebook/react/views/scroll/ReactScrollViewHelper.kt
+@@ -503,7 +503,7 @@ public object ReactScrollViewHelper {
+     /** Get the padding on the top for nav bar */
+     public var scrollAwayPaddingTop: Int = 0
+     /** Get the Fabric state of last scroll position */
+-    public val lastStateUpdateScroll: Point = Point(-1, -1)
++    public val lastStateUpdateScroll: Point = Point(0, 0)
+     /** Get true if the previous animation was canceled */
+     public var isCanceled: Boolean = false
+     /** Get true if previous animation was finished */
diff --git a/patches/react-native+0.75.2+016+hybrid-app.patch b/patches/react-native+0.75.2+016+hybrid-app.patch
new file mode 100644
index 000000000000..43c432191ebe
--- /dev/null
+++ b/patches/react-native+0.75.2+016+hybrid-app.patch
@@ -0,0 +1,19 @@
+diff --git a/node_modules/react-native/third-party-podspecs/boost.podspec b/node_modules/react-native/third-party-podspecs/boost.podspec
+index d130fb0..9f8397e 100644
+--- a/node_modules/react-native/third-party-podspecs/boost.podspec
++++ b/node_modules/react-native/third-party-podspecs/boost.podspec
+@@ -16,12 +16,12 @@ Pod::Spec.new do |spec|
+   # Pinning to the same version as React.podspec.
+   spec.platforms = min_supported_versions
+   spec.requires_arc = false
+-  spec.source_files = 'boost/**/*.{hpp,cpp}'
++  # spec.source_files = 'boost/**/*.{hpp,cpp}'
+ 
+   spec.module_name = 'boost'
+   spec.header_dir = 'boost'
+   spec.preserve_path = 'boost'
+-  spec.header_mappings_dir = 'boost/boost'
++  # spec.header_mappings_dir = 'boost/boost'
+ 
+   spec.resource_bundles = {'boost_privacy' => 'boost/PrivacyInfo.xcprivacy'}
+ end
diff --git a/patches/react-native-animatable+1.3.3+001+initial.patch b/patches/react-native-animatable+1.3.3+001+initial.patch
new file mode 100644
index 000000000000..ebb4398342c1
--- /dev/null
+++ b/patches/react-native-animatable+1.3.3+001+initial.patch
@@ -0,0 +1,23 @@
+diff --git a/node_modules/react-native-animatable/createAnimatableComponent.js b/node_modules/react-native-animatable/createAnimatableComponent.js
+index 2847e12..331d44f 100644
+--- a/node_modules/react-native-animatable/createAnimatableComponent.js
++++ b/node_modules/react-native-animatable/createAnimatableComponent.js
+@@ -465,7 +465,9 @@ export default function createAnimatableComponent(WrappedComponent) {
+         const needsZeroClamping =
+           ZERO_CLAMPED_STYLE_PROPERTIES.indexOf(property) !== -1;
+         if (needsInterpolation) {
+-          transitionValue.setValue(0);
++          transitionValue = new Animated.Value(0);
++          transitionValues[property] = transitionValue;
++
+           transitionStyle[property] = transitionValue.interpolate({
+             inputRange: [0, 1],
+             outputRange: [fromValue, toValue],
+@@ -546,7 +548,6 @@ export default function createAnimatableComponent(WrappedComponent) {
+           transitions.to[property] = toValue;
+         }
+       });
+-
+       if (Object.keys(transitions.from).length) {
+         this.transition(transitions.from, transitions.to, duration, easing);
+       }
diff --git a/patches/react-native-animatable+1.3.3+002+fixAnimationFlicker.patch b/patches/react-native-animatable+1.3.3+002+fixAnimationFlicker.patch
new file mode 100644
index 000000000000..8649793b4ca7
--- /dev/null
+++ b/patches/react-native-animatable+1.3.3+002+fixAnimationFlicker.patch
@@ -0,0 +1,49 @@
+diff --git a/node_modules/react-native-animatable/createAnimatableComponent.js b/node_modules/react-native-animatable/createAnimatableComponent.js
+index 331d44f..fd92b8e 100644
+--- a/node_modules/react-native-animatable/createAnimatableComponent.js
++++ b/node_modules/react-native-animatable/createAnimatableComponent.js
+@@ -362,14 +362,17 @@ export default function createAnimatableComponent(WrappedComponent) {
+ 
+     setAnimation(animation, callback) {
+       const compiledAnimation = getCompiledAnimation(animation);
++      const animationValue = new Animated.Value(0);
++
+       this.setState(
+-        state => ({
++        {
+           animationStyle: makeInterpolatedStyle(
+             compiledAnimation,
+-            state.animationValue,
++            animationValue,
+           ),
+           compiledAnimation,
+-        }),
++          animationValue,
++        },
+         callback,
+       );
+     }
+@@ -401,7 +404,6 @@ export default function createAnimatableComponent(WrappedComponent) {
+       let currentIteration = iteration || 0;
+       const fromValue = getAnimationOrigin(currentIteration, direction);
+       const toValue = getAnimationTarget(currentIteration, direction);
+-      animationValue.setValue(fromValue);
+ 
+       if (typeof easing === 'string') {
+         easing = EASING_FUNCTIONS[easing];
+@@ -422,7 +424,6 @@ export default function createAnimatableComponent(WrappedComponent) {
+         useNativeDriver,
+         delay: iterationDelay || 0,
+       };
+-
+       Animated.timing(animationValue, config).start(endState => {
+         currentIteration += 1;
+         if (
+@@ -467,7 +468,6 @@ export default function createAnimatableComponent(WrappedComponent) {
+         if (needsInterpolation) {
+           transitionValue = new Animated.Value(0);
+           transitionValues[property] = transitionValue;
+-
+           transitionStyle[property] = transitionValue.interpolate({
+             inputRange: [0, 1],
+             outputRange: [fromValue, toValue],
diff --git a/patches/react-native-device-info+10.3.1+002+turbomodule.patch b/patches/react-native-device-info+10.3.1+002+turbomodule.patch
index 90b2f7d675f8..4b62c30947c2 100644
--- a/patches/react-native-device-info+10.3.1+002+turbomodule.patch
+++ b/patches/react-native-device-info+10.3.1+002+turbomodule.patch
@@ -298,7 +298,7 @@ index 0000000..e91e5a2
 +
 +}
 diff --git a/node_modules/react-native-device-info/android/src/main/java/com/learnium/RNDeviceInfo/RNDeviceModule.java b/node_modules/react-native-device-info/android/src/main/java/com/learnium/RNDeviceInfo/RNDeviceModule.java
-index b01e9d2..9ac1628 100644
+index b01e9d2..d954717 100644
 --- a/node_modules/react-native-device-info/android/src/main/java/com/learnium/RNDeviceInfo/RNDeviceModule.java
 +++ b/node_modules/react-native-device-info/android/src/main/java/com/learnium/RNDeviceInfo/RNDeviceModule.java
 @@ -20,8 +20,6 @@ import android.os.Environment;
@@ -327,6 +327,15 @@ index b01e9d2..9ac1628 100644
    public static final String NAME = "RNDeviceInfo";
    private final DeviceTypeResolver deviceTypeResolver;
    private final DeviceIdResolver deviceIdResolver;
+@@ -152,7 +149,7 @@ public class RNDeviceModule extends ReactContextBaseJavaModule {
+ 
+ 
+   @Override
+-  public void onCatalystInstanceDestroy() {
++  public void invalidate() {
+     getReactApplicationContext().unregisterReceiver(receiver);
+     getReactApplicationContext().unregisterReceiver(headphoneConnectionReceiver);
+   }
 @@ -177,39 +174,13 @@ public class RNDeviceModule extends ReactContextBaseJavaModule {
      return null;
    }
diff --git a/patches/react-native-document-picker+9.1.1.patch b/patches/react-native-document-picker+9.1.1.patch
new file mode 100644
index 000000000000..8a35e9a5df38
--- /dev/null
+++ b/patches/react-native-document-picker+9.1.1.patch
@@ -0,0 +1,43 @@
+diff --git a/node_modules/react-native-document-picker/android/src/main/java/com/reactnativedocumentpicker/RNDocumentPickerModule.java b/node_modules/react-native-document-picker/android/src/main/java/com/reactnativedocumentpicker/RNDocumentPickerModule.java
+index dd67216..5001525 100644
+--- a/node_modules/react-native-document-picker/android/src/main/java/com/reactnativedocumentpicker/RNDocumentPickerModule.java
++++ b/node_modules/react-native-document-picker/android/src/main/java/com/reactnativedocumentpicker/RNDocumentPickerModule.java
+@@ -103,9 +103,9 @@ public class RNDocumentPickerModule extends NativeDocumentPickerSpec {
+   }
+ 
+   @Override
+-  public void onCatalystInstanceDestroy() {
++  public void invalidate() {
+     getReactApplicationContext().removeActivityEventListener(activityEventListener);
+-    super.onCatalystInstanceDestroy();
++    super.invalidate();
+   }
+ 
+   @NonNull
+diff --git a/node_modules/react-native-document-picker/react-native-document-picker.podspec b/node_modules/react-native-document-picker/react-native-document-picker.podspec
+index b2ca68c..dcaba40 100644
+--- a/node_modules/react-native-document-picker/react-native-document-picker.podspec
++++ b/node_modules/react-native-document-picker/react-native-document-picker.podspec
+@@ -17,21 +17,6 @@ Pod::Spec.new do |s|
+ 
+   s.source_files = "ios/**/*.{h,m,mm}"
+ 
+-  s.dependency "React-Core"
+-  
+-  # This guard prevent to install the dependencies when we run `pod install` in the old architecture.
+-  if ENV['RCT_NEW_ARCH_ENABLED'] == '1' then
+-      s.compiler_flags = folly_compiler_flags + " -DRCT_NEW_ARCH_ENABLED=1"
+-      s.pod_target_xcconfig    = {
+-          "HEADER_SEARCH_PATHS" => "\"$(PODS_ROOT)/boost\"",
+-          "CLANG_CXX_LANGUAGE_STANDARD" => "c++17"
+-      }
+-
+-      s.dependency "React-Codegen"
+-      s.dependency "RCT-Folly"
+-      s.dependency "RCTRequired"
+-      s.dependency "RCTTypeSafety"
+-      s.dependency "ReactCommon/turbomodule/core"
+-  end
++  install_modules_dependencies(s)
+ 
+ end
diff --git a/patches/react-native-gesture-handler+2.18.0+001+fixTests.patch b/patches/react-native-gesture-handler+2.18.0+001+fixTests.patch
new file mode 100644
index 000000000000..c2172f476968
--- /dev/null
+++ b/patches/react-native-gesture-handler+2.18.0+001+fixTests.patch
@@ -0,0 +1,21 @@
+diff --git a/node_modules/react-native-gesture-handler/lib/commonjs/handlers/gestures/GestureDetector/useAnimatedGesture.js b/node_modules/react-native-gesture-handler/lib/commonjs/handlers/gestures/GestureDetector/useAnimatedGesture.js
+index d426c7c..260ba1e 100644
+--- a/node_modules/react-native-gesture-handler/lib/commonjs/handlers/gestures/GestureDetector/useAnimatedGesture.js
++++ b/node_modules/react-native-gesture-handler/lib/commonjs/handlers/gestures/GestureDetector/useAnimatedGesture.js
+@@ -100,7 +100,7 @@ function isTouchEvent(event) {
+ }
+ 
+ function useAnimatedGesture(preparedGesture, needsRebuild) {
+-  if (!_reanimatedWrapper.Reanimated) {
++  if (!_reanimatedWrapper.Reanimated || (0, _utils.isJestEnv)()) {
+     return;
+   } // Hooks are called conditionally, but the condition is whether the
+   // react-native-reanimated is installed, which shouldn't change while running
+@@ -171,7 +171,6 @@ function useAnimatedGesture(preparedGesture, needsRebuild) {
+     }
+   }; // eslint-disable-next-line react-hooks/rules-of-hooks
+ 
+-
+   const event = _reanimatedWrapper.Reanimated.useEvent(callback, ['onGestureHandlerStateChange', 'onGestureHandlerEvent'], needsRebuild);
+ 
+   preparedGesture.animatedEventHandler = event;
diff --git a/patches/react-native-gesture-handler+2.18.0+002+fixTypeExport.patch b/patches/react-native-gesture-handler+2.18.0+002+fixTypeExport.patch
new file mode 100644
index 000000000000..23a369f89f93
--- /dev/null
+++ b/patches/react-native-gesture-handler+2.18.0+002+fixTypeExport.patch
@@ -0,0 +1,43 @@
+diff --git a/node_modules/react-native-gesture-handler/lib/commonjs/components/Pressable/index.js b/node_modules/react-native-gesture-handler/lib/commonjs/components/Pressable/index.js
+index 291cd9a..7fa58c2 100644
+--- a/node_modules/react-native-gesture-handler/lib/commonjs/components/Pressable/index.js
++++ b/node_modules/react-native-gesture-handler/lib/commonjs/components/Pressable/index.js
+@@ -3,12 +3,6 @@
+ Object.defineProperty(exports, "__esModule", {
+   value: true
+ });
+-Object.defineProperty(exports, "PressableProps", {
+-  enumerable: true,
+-  get: function () {
+-    return _PressableProps.PressableProps;
+-  }
+-});
+ Object.defineProperty(exports, "default", {
+   enumerable: true,
+   get: function () {
+@@ -16,8 +10,6 @@ Object.defineProperty(exports, "default", {
+   }
+ });
+ 
+-var _PressableProps = require("./PressableProps");
+-
+ var _Pressable = _interopRequireDefault(require("./Pressable"));
+ 
+ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+diff --git a/node_modules/react-native-gesture-handler/lib/module/components/Pressable/index.js b/node_modules/react-native-gesture-handler/lib/module/components/Pressable/index.js
+index c80bb64..8b2c550 100644
+--- a/node_modules/react-native-gesture-handler/lib/module/components/Pressable/index.js
++++ b/node_modules/react-native-gesture-handler/lib/module/components/Pressable/index.js
+@@ -1,3 +1,2 @@
+-export { PressableProps } from './PressableProps';
+ export { default } from './Pressable';
+ //# sourceMappingURL=index.js.map
+\ No newline at end of file
+diff --git a/node_modules/react-native-gesture-handler/src/components/Pressable/index.ts b/node_modules/react-native-gesture-handler/src/components/Pressable/index.ts
+index 740b7e1..fad8448 100644
+--- a/node_modules/react-native-gesture-handler/src/components/Pressable/index.ts
++++ b/node_modules/react-native-gesture-handler/src/components/Pressable/index.ts
+@@ -1,2 +1,2 @@
+ export { PressableProps } from './PressableProps';
+-export { default } from './Pressable';
++export type { default } from './Pressable';
diff --git a/patches/react-native-haptic-feedback+2.2.0.patch b/patches/react-native-haptic-feedback+2.2.0.patch
new file mode 100644
index 000000000000..4fb61b430869
--- /dev/null
+++ b/patches/react-native-haptic-feedback+2.2.0.patch
@@ -0,0 +1,30 @@
+diff --git a/node_modules/react-native-haptic-feedback/RNReactNativeHapticFeedback.podspec b/node_modules/react-native-haptic-feedback/RNReactNativeHapticFeedback.podspec
+index e692f2d..9dedd9b 100644
+--- a/node_modules/react-native-haptic-feedback/RNReactNativeHapticFeedback.podspec
++++ b/node_modules/react-native-haptic-feedback/RNReactNativeHapticFeedback.podspec
+@@ -17,24 +17,7 @@ Pod::Spec.new do |s|
+   s.source_files  = "ios/**/*.{h,m,mm}"
+   s.requires_arc = true
+ 
+-  s.dependency 'React-Core'
+-
+-  # This guard prevent to install the dependencies when we run `pod install` in the old architecture.
+-  if ENV['RCT_NEW_ARCH_ENABLED'] == '1' then
+-    folly_compiler_flags = '-DFOLLY_NO_CONFIG -DFOLLY_MOBILE=1 -DFOLLY_USE_LIBCPP=1 -Wno-comma -Wno-shorten-64-to-32'
+-
+-    s.compiler_flags = folly_compiler_flags + " -DRCT_NEW_ARCH_ENABLED=1"
+-    s.pod_target_xcconfig    = {
+-        "HEADER_SEARCH_PATHS" => "\"$(PODS_ROOT)/boost\"",
+-        "CLANG_CXX_LANGUAGE_STANDARD" => "c++17"
+-    }
+-
+-    s.dependency "React-Codegen"
+-    s.dependency "RCT-Folly"
+-    s.dependency "RCTRequired"
+-    s.dependency "RCTTypeSafety"
+-    s.dependency "ReactCommon/turbomodule/core"
+-  end
++  install_modules_dependencies(s)
+ end
+ 
+ 
diff --git a/patches/react-native-image-picker+7.0.3+001+allowedMimeTypes.patch b/patches/react-native-image-picker+7.0.3+001+allowedMimeTypes.patch
index 0defc430e669..0a01f97af53a 100644
--- a/patches/react-native-image-picker+7.0.3+001+allowedMimeTypes.patch
+++ b/patches/react-native-image-picker+7.0.3+001+allowedMimeTypes.patch
@@ -1,11 +1,24 @@
+diff --git a/node_modules/react-native-image-picker/android/build.gradle b/node_modules/react-native-image-picker/android/build.gradle
+index ab6f320..5c7b28f 100644
+--- a/node_modules/react-native-image-picker/android/build.gradle
++++ b/node_modules/react-native-image-picker/android/build.gradle
+@@ -25,7 +25,7 @@ android {
+     }
+ 
+     defaultConfig {
+-        minSdkVersion 21
++        minSdkVersion 23
+         targetSdkVersion 33
+         versionCode 1
+         versionName "1.0"
 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
+index afe4b3e..0f35bc2 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 {
+@@ -31,6 +31,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'.
@@ -121,10 +134,10 @@ index 89b69a8..d86ab1e 100644
 +    };
 +
      private Uri fileUri;
-
+ 
      private ReactApplicationContext reactContext;
-@@ -148,6 +262,7 @@ public class ImagePickerModuleImpl implements ActivityEventListener {
-
+@@ -150,6 +264,7 @@ public class ImagePickerModuleImpl implements ActivityEventListener {
+ 
          if (isPhoto) {
              libraryIntent.setType("image/*");
 +            libraryIntent.putExtra(Intent.EXTRA_MIME_TYPES, this.ALLOWED_IMAGE_MIME_TYPES);
diff --git a/patches/react-native-keyboard-controller+1.12.2+001+initial.patch b/patches/react-native-keyboard-controller+1.12.2+001+initial.patch
new file mode 100644
index 000000000000..0ea97d3731a1
--- /dev/null
+++ b/patches/react-native-keyboard-controller+1.12.2+001+initial.patch
@@ -0,0 +1,39 @@
+diff --git a/node_modules/react-native-keyboard-controller/android/src/main/java/com/reactnativekeyboardcontroller/views/EdgeToEdgeReactViewGroup.kt b/node_modules/react-native-keyboard-controller/android/src/main/java/com/reactnativekeyboardcontroller/views/EdgeToEdgeReactViewGroup.kt
+index 83884d8..5d9e989 100644
+--- a/node_modules/react-native-keyboard-controller/android/src/main/java/com/reactnativekeyboardcontroller/views/EdgeToEdgeReactViewGroup.kt
++++ b/node_modules/react-native-keyboard-controller/android/src/main/java/com/reactnativekeyboardcontroller/views/EdgeToEdgeReactViewGroup.kt
+@@ -99,12 +99,12 @@ class EdgeToEdgeReactViewGroup(private val reactContext: ThemedReactContext) : R
+   }
+ 
+   private fun goToEdgeToEdge(edgeToEdge: Boolean) {
+-    reactContext.currentActivity?.let {
+-      WindowCompat.setDecorFitsSystemWindows(
+-        it.window,
+-        !edgeToEdge,
+-      )
+-    }
++  // reactContext.currentActivity?.let {
++  //  WindowCompat.setDecorFitsSystemWindows(
++  //    it.window,
++  //    !edgeToEdge,
++  //  )
++  // }
+   }
+ 
+   private fun setupKeyboardCallbacks() {
+@@ -158,13 +158,13 @@ class EdgeToEdgeReactViewGroup(private val reactContext: ThemedReactContext) : R
+   // region State managers
+   private fun enable() {
+     this.goToEdgeToEdge(true)
+-    this.setupWindowInsets()
++    // this.setupWindowInsets()
+     this.setupKeyboardCallbacks()
+   }
+ 
+   private fun disable() {
+     this.goToEdgeToEdge(false)
+-    this.setupWindowInsets()
++    // this.setupWindowInsets()
+     this.removeKeyboardCallbacks()
+   }
+   // endregion
diff --git a/patches/react-native-keyboard-controller+1.12.2+002+rn-75-fixes.patch b/patches/react-native-keyboard-controller+1.12.2+002+rn-75-fixes.patch
new file mode 100644
index 000000000000..f7ab542a2a2b
--- /dev/null
+++ b/patches/react-native-keyboard-controller+1.12.2+002+rn-75-fixes.patch
@@ -0,0 +1,13 @@
+diff --git a/node_modules/react-native-keyboard-controller/android/src/main/java/com/reactnativekeyboardcontroller/extensions/ThemedReactContext.kt b/node_modules/react-native-keyboard-controller/android/src/main/java/com/reactnativekeyboardcontroller/extensions/ThemedReactContext.kt
+index 50252f0..28a70d6 100644
+--- a/node_modules/react-native-keyboard-controller/android/src/main/java/com/reactnativekeyboardcontroller/extensions/ThemedReactContext.kt
++++ b/node_modules/react-native-keyboard-controller/android/src/main/java/com/reactnativekeyboardcontroller/extensions/ThemedReactContext.kt
+@@ -13,7 +13,7 @@ val ThemedReactContext.rootView: View?
+ 
+ fun ThemedReactContext?.dispatchEvent(viewId: Int, event: Event<*>) {
+   val eventDispatcher: EventDispatcher? =
+-    UIManagerHelper.getEventDispatcherForReactTag(this, viewId)
++    UIManagerHelper.getEventDispatcherForReactTag(this!!, viewId)
+   eventDispatcher?.dispatchEvent(event)
+ }
+ 
diff --git a/patches/react-native-modal+13.0.1.patch b/patches/react-native-modal+13.0.1.patch
index 5bfb2cc5f0b0..cc9c8531e3a3 100644
--- a/patches/react-native-modal+13.0.1.patch
+++ b/patches/react-native-modal+13.0.1.patch
@@ -11,7 +11,7 @@ index b63bcfc..bd6419e 100644
      buildPanResponder: () => void;
      getAccDistancePerDirection: (gestureState: PanResponderGestureState) => number;
 diff --git a/node_modules/react-native-modal/dist/modal.js b/node_modules/react-native-modal/dist/modal.js
-index 80f4e75..3ba8b8c 100644
+index 80f4e75..5a58eae 100644
 --- a/node_modules/react-native-modal/dist/modal.js
 +++ b/node_modules/react-native-modal/dist/modal.js
 @@ -75,6 +75,13 @@ export class ReactNativeModal extends React.Component {
@@ -48,7 +48,17 @@ index 80f4e75..3ba8b8c 100644
          if (this.didUpdateDimensionsEmitter) {
              this.didUpdateDimensionsEmitter.remove();
          }
-@@ -525,7 +540,7 @@ export class ReactNativeModal extends React.Component {
+@@ -464,6 +479,9 @@ export class ReactNativeModal extends React.Component {
+             InteractionManager.clearInteractionHandle(this.interactionHandle);
+             this.interactionHandle = null;
+         }
++        if (this.state.isVisible) {
++            this.props.onModalHide();
++        }
+     }
+     componentDidUpdate(prevProps) {
+         // If the animations have been changed then rebuild them to make sure we're
+@@ -525,7 +543,7 @@ export class ReactNativeModal extends React.Component {
          }
          return (React.createElement(Modal, Object.assign({ transparent: true, animationType: 'none', visible: this.state.isVisible, onRequestClose: onBackButtonPress }, otherProps),
              this.makeBackdrop(),
diff --git a/patches/react-native-pager-view+6.3.4+001+add-view.patch b/patches/react-native-pager-view+6.3.4+001+add-view.patch
new file mode 100644
index 000000000000..9d3b645700f9
--- /dev/null
+++ b/patches/react-native-pager-view+6.3.4+001+add-view.patch
@@ -0,0 +1,13 @@
+diff --git a/node_modules/react-native-pager-view/android/src/fabric/java/com/reactnativepagerview/PagerViewViewManager.kt b/node_modules/react-native-pager-view/android/src/fabric/java/com/reactnativepagerview/PagerViewViewManager.kt
+index aa974a6..e9c4a52 100644
+--- a/node_modules/react-native-pager-view/android/src/fabric/java/com/reactnativepagerview/PagerViewViewManager.kt
++++ b/node_modules/react-native-pager-view/android/src/fabric/java/com/reactnativepagerview/PagerViewViewManager.kt
+@@ -88,7 +88,7 @@ class PagerViewViewManager : ViewGroupManager<NestedScrollableHost>(), RNCViewPa
+         return host
+     }
+ 
+-    override fun addView(host: NestedScrollableHost, child: View?, index: Int) {
++    override fun addView(host: NestedScrollableHost, child: View, index: Int) {
+         PagerViewViewManagerImpl.addView(host, child, index)
+     }
+ 
diff --git a/patches/react-native-pager-view+6.3.4+002+rn-75-fixes.patch b/patches/react-native-pager-view+6.3.4+002+rn-75-fixes.patch
new file mode 100644
index 000000000000..694da9da1049
--- /dev/null
+++ b/patches/react-native-pager-view+6.3.4+002+rn-75-fixes.patch
@@ -0,0 +1,22 @@
+diff --git a/node_modules/react-native-pager-view/src/PagerView.tsx b/node_modules/react-native-pager-view/src/PagerView.tsx
+index 62faa74..e3fb020 100644
+--- a/node_modules/react-native-pager-view/src/PagerView.tsx
++++ b/node_modules/react-native-pager-view/src/PagerView.tsx
+@@ -20,17 +20,6 @@ import LEGACY_PagerViewNativeComponent, {
+   Commands as LEGACY_PagerViewNativeCommands,
+ } from './specs/LEGACY_PagerViewNativeComponent';
+ 
+-// The Fabric component for PagerView uses a work around present also in ScrollView:
+-// https://github.com/callstack/react-native-pager-view/blob/master/ios/Fabric/RNCPagerViewComponentView.mm#L362-L368
+-// That workaround works only if we add these lines in to make sure that the RCTEventEmitter is registered properly
+-// in the JS callable modules.
+-// NOTE: This is a workaround as we would like to get rid of these lines below. But for the time being, as the cut date for
+-// 0.74 approaches, we need to keep these lines.
+-// As soon as we figure out how to move forward, we will provide guidance and/or submit a PR to fix this.
+-if (Platform.OS === 'ios') {
+-  require('react-native/Libraries/Renderer/shims/ReactNative'); // Force side effects to prevent T55744311
+-}
+-
+ /**
+  * Container that allows to flip left and right between child views. Each
+  * child view of the `PagerView` will be treated as a separate page
diff --git a/patches/react-native-pager-view+6.3.4+003+position-absolute.patch b/patches/react-native-pager-view+6.3.4+003+position-absolute.patch
new file mode 100644
index 000000000000..466e040f0816
--- /dev/null
+++ b/patches/react-native-pager-view+6.3.4+003+position-absolute.patch
@@ -0,0 +1,19 @@
+diff --git a/node_modules/react-native-pager-view/src/utils.tsx b/node_modules/react-native-pager-view/src/utils.tsx
+index 0d7d265..2f022a4 100644
+--- a/node_modules/react-native-pager-view/src/utils.tsx
++++ b/node_modules/react-native-pager-view/src/utils.tsx
+@@ -1,5 +1,5 @@
+ import React, { Children, ReactNode } from 'react';
+-import { StyleSheet, View } from 'react-native';
++import { Platform, StyleSheet, View } from 'react-native';
+ 
+ export const LEGACY_childrenWithOverriddenStyle = (children?: ReactNode) => {
+   return Children.map(children, (child) => {
+@@ -29,6 +29,7 @@ export const childrenWithOverriddenStyle = (
+           height: '100%',
+           width: '100%',
+           paddingHorizontal: pageMargin / 2,
++          position: Platform.OS === 'android' ? 'absolute' : undefined,
+         }}
+         collapsable={false}
+       >
diff --git a/patches/react-native-pager-view+6.3.4+004+hybrid-app.patch b/patches/react-native-pager-view+6.3.4+004+hybrid-app.patch
new file mode 100644
index 000000000000..4b8f45e87f38
--- /dev/null
+++ b/patches/react-native-pager-view+6.3.4+004+hybrid-app.patch
@@ -0,0 +1,13 @@
+diff --git a/node_modules/react-native-pager-view/ios/Fabric/RNCPagerViewComponentView.mm b/node_modules/react-native-pager-view/ios/Fabric/RNCPagerViewComponentView.mm
+index 83fa497..a8f792a 100644
+--- a/node_modules/react-native-pager-view/ios/Fabric/RNCPagerViewComponentView.mm
++++ b/node_modules/react-native-pager-view/ios/Fabric/RNCPagerViewComponentView.mm
+@@ -2,7 +2,7 @@
+ 
+ #import <Foundation/Foundation.h>
+ #import "RNCPagerViewComponentView.h"
+-#import <RNCViewPager/RNCViewPagerComponentDescriptor.h>
++#import <react/renderer/components/RNCViewPager/RNCViewPagerComponentDescriptor.h>
+ #import <react/renderer/components/pagerview/EventEmitters.h>
+ #import <react/renderer/components/pagerview/Props.h>
+ #import <react/renderer/components/pagerview/RCTComponentViewHelpers.h>
diff --git a/patches/react-native-plaid-link-sdk+11.11.0.patch b/patches/react-native-plaid-link-sdk+11.11.0.patch
new file mode 100644
index 000000000000..28e492f6999f
--- /dev/null
+++ b/patches/react-native-plaid-link-sdk+11.11.0.patch
@@ -0,0 +1,35 @@
+diff --git a/node_modules/react-native-plaid-link-sdk/ios/PLKFabricHelpers.h b/node_modules/react-native-plaid-link-sdk/ios/PLKFabricHelpers.h
+index cf70d5e..4e34cd2 100644
+--- a/node_modules/react-native-plaid-link-sdk/ios/PLKFabricHelpers.h
++++ b/node_modules/react-native-plaid-link-sdk/ios/PLKFabricHelpers.h
+@@ -5,8 +5,12 @@
+ #if __has_include(<rnplaidlink/react_native_plaid_link_sdk-Swift.h>)
+ #import <rnplaidlink/react_native_plaid_link_sdk-Swift.h>
+ #else
++#ifdef USE_FRAMEWORKS
++#import <react_native_plaid_link_sdk/react_native_plaid_link_sdk-Swift.h>
++#else
+ #import <react_native_plaid_link_sdk-Swift.h>
+ #endif
++#endif
+ 
+ // copied from RCTFollyConvert
+ folly::dynamic PLKConvertIdToFollyDynamic(id json)
+diff --git a/node_modules/react-native-plaid-link-sdk/react-native-plaid-link-sdk.podspec b/node_modules/react-native-plaid-link-sdk/react-native-plaid-link-sdk.podspec
+index 7c60081..4a13a3c 100644
+--- a/node_modules/react-native-plaid-link-sdk/react-native-plaid-link-sdk.podspec
++++ b/node_modules/react-native-plaid-link-sdk/react-native-plaid-link-sdk.podspec
+@@ -21,6 +21,13 @@ Pod::Spec.new do |s|
+   # we don't want this to be seen by Swift
+   s.private_header_files = 'ios/PLKFabricHelpers.h'
+   
++  if ENV['USE_FRAMEWORKS'] == '1'
++    s.pod_target_xcconfig = {
++      "OTHER_CFLAGS" => "$(inherited) -DUSE_FRAMEWORKS",
++      "OTHER_CPLUSPLUSFLAGS" => "$(inherited) -DUSE_FRAMEWORKS",
++    }
++  end
++
+   if fabric_enabled
+     install_modules_dependencies(s)
+   else
diff --git a/patches/react-native-plaid-link-sdk+11.5.0+001+initial.patch b/patches/react-native-plaid-link-sdk+11.5.0+001+initial.patch
deleted file mode 100644
index 6035477256b7..000000000000
--- a/patches/react-native-plaid-link-sdk+11.5.0+001+initial.patch
+++ /dev/null
@@ -1,4 +0,0 @@
-diff --git a/node_modules/react-native-plaid-link-sdk/ios/RNLinksdk.m b/node_modules/react-native-plaid-link-sdk/ios/RNLinksdk.mm
-similarity index 100%
-rename from node_modules/react-native-plaid-link-sdk/ios/RNLinksdk.m
-rename to node_modules/react-native-plaid-link-sdk/ios/RNLinksdk.mm
diff --git a/patches/react-native-plaid-link-sdk+11.5.0+002+turbomodule.patch b/patches/react-native-plaid-link-sdk+11.5.0+002+turbomodule.patch
deleted file mode 100644
index 7d5aab6c84cf..000000000000
--- a/patches/react-native-plaid-link-sdk+11.5.0+002+turbomodule.patch
+++ /dev/null
@@ -1,3287 +0,0 @@
-diff --git a/node_modules/react-native-plaid-link-sdk/README.md b/node_modules/react-native-plaid-link-sdk/README.md
-index 93ebca6..7bea608 100644
---- a/node_modules/react-native-plaid-link-sdk/README.md
-+++ b/node_modules/react-native-plaid-link-sdk/README.md
-@@ -49,7 +49,6 @@ cd ios && bundle install && bundle exec pod install
- 
- AutoLinking should handle all of the Android setup.
- 
--
- ### React Native Setup
- 
- - To initialize `PlaidLink`, you will need to first create a `link_token` at [/link/token/create](https://plaid.com/docs/#create-link-token). Check out our [QuickStart guide](https://plaid.com/docs/quickstart/#introduction) for additional API information.
-@@ -58,7 +57,13 @@ AutoLinking should handle all of the Android setup.
- 
- ```javascript
- import { Text } from 'react-native';
--import { PlaidLink, LinkSuccess, LinkExit, LinkLogLevel, LinkIOSPresentationStyle } from 'react-native-plaid-link-sdk';
-+import {
-+  PlaidLink,
-+  LinkSuccess,
-+  LinkExit,
-+  LinkLogLevel,
-+  LinkIOSPresentationStyle,
-+} from 'react-native-plaid-link-sdk';
- 
- const MyPlaidComponent = () => {
-   return (
-@@ -77,7 +82,7 @@ const MyPlaidComponent = () => {
-         // UI is always presented in full screen on Android.
-         iOSPresentationStyle={LinkIOSPresentationStyle.MODAL}
-     >
--        <Text>Add Account</Text>
-+      <Text>Add Account</Text>
-     </PlaidLink>
-   );
- };
-@@ -92,6 +97,7 @@ const MyPlaidComponent = () => {
- ##### Android OAuth Requirements
- 
- ###### Register your app package name
-+
- 1. Log into your [Plaid Dashboard](https://dashboard.plaid.com/developers/api) and navigate to the API page under the Developers tab.
- 2. Next to Allowed Android package names click "Configure" then "Add New Android Package Name".
- 3. Enter your package name, for example `com.plaid.example`.
-@@ -100,17 +106,16 @@ const MyPlaidComponent = () => {
- ##### iOS OAuth Requirements
- 
- For iOS OAuth to work, specific requirements must be met.
-+
- 1. Redirect URIs must be [registered](https://plaid.com/docs/link/ios/#register-your-redirect-uri), and set up as [universal links](https://developer.apple.com/documentation/xcode/supporting-associated-domains).
- 2. Your native iOS application, must be configured with your associated domain. See your iOS [set up universal links](https://plaid.com/docs/link/ios/#set-up-universal-links) for more information.
- 
--
- ##### Link Token OAuth Requirements
- 
- - On iOS you must configure your `link_token` with a [redirect_uri](https://plaid.com/docs/api/tokens/#link-token-create-request-redirect-uri) to support OAuth. When creating a `link_token` for initializing Link on Android, `android_package_name` must be specified and `redirect_uri` must be left blank.
- 
- - On Android you must configure your `link_token` with an [android_package_name](https://plaid.com/docs/api/tokens/#link-token-create-request-android-package-name) to support OAuth. When creating a `link_token` for initializing Link on iOS, `android_package_name` must be left blank and `redirect_uri` should be used instead.
- 
--
- #### To receive onEvent callbacks:
- 
- The React Native Plaid module emits `onEvent` events throughout the account linking process — see [details here](https://plaid.com/docs/link/react-native/#onevent). To receive these events in your React Native app, wrap the `PlaidLink` react component with the following in order to listen for those events:
-@@ -139,9 +144,9 @@ class PlaidEventContainer extends React.Component {
- You can also use the `usePlaidEmitter` hook in react functional components:
- 
- ```javascript
--  usePlaidEmitter((event: LinkEvent) => {
--    console.log(event)
--  })
-+usePlaidEmitter((event: LinkEvent) => {
-+  console.log(event);
-+});
- ```
- 
- ## Upgrading
-@@ -165,6 +170,8 @@ While these older versions are expected to continue to work without disruption,
- | 11.0.2            | *                        | [4.0.0+]    | 21                  | 33                     | >=5.0.0 |  14.0           | Active, supports Xcode 15.0.1 |
- | 11.0.1            | *                        | [4.0.0+]    | 21                  | 33                     | >=5.0.0 |  14.0           | Active, supports Xcode 15.0.1 |
- | 11.0.0            | *                        | [4.0.0+]    | 21                  | 33                     | >=5.0.0 |  14.0           | Active, supports Xcode 15.0.1 |
-+| 10.13.0           | >= 0.66.0                | [3.14.3+]   | 21                  | 33                     | >=4.7.2 |  11.0           | Active, supports Xcode 14     |
-+| 10.12.0           | >= 0.66.0                | [3.14.3+]   | 21                  | 33                     | >=4.7.1 |  11.0           | Active, supports Xcode 14     |
- | 10.11.0           | >= 0.66.0                | [3.14.1+]   | 21                  | 33                     | >=4.7.1 |  11.0           | Active, supports Xcode 14     |
- | ~10.10.0~         | >= 0.66.0                | [3.14.2+]   | 21                  | 33                     | >=4.7.1 |  11.0           | **Deprecated**                |
- | 10.9.1            | >= 0.66.0                | [3.14.1+]   | 21                  | 33                     | >=4.7.0 |  11.0           | Active, supports Xcode 14     |
-diff --git a/node_modules/react-native-plaid-link-sdk/android/.gradle/7.4.2/checksums/checksums.lock b/node_modules/react-native-plaid-link-sdk/android/.gradle/7.4.2/checksums/checksums.lock
-deleted file mode 100644
-index b5da584..0000000
-Binary files a/node_modules/react-native-plaid-link-sdk/android/.gradle/7.4.2/checksums/checksums.lock and /dev/null differ
-diff --git a/node_modules/react-native-plaid-link-sdk/android/.gradle/7.4.2/checksums/md5-checksums.bin b/node_modules/react-native-plaid-link-sdk/android/.gradle/7.4.2/checksums/md5-checksums.bin
-deleted file mode 100644
-index ef608b4..0000000
-Binary files a/node_modules/react-native-plaid-link-sdk/android/.gradle/7.4.2/checksums/md5-checksums.bin and /dev/null differ
-diff --git a/node_modules/react-native-plaid-link-sdk/android/.gradle/7.4.2/checksums/sha1-checksums.bin b/node_modules/react-native-plaid-link-sdk/android/.gradle/7.4.2/checksums/sha1-checksums.bin
-deleted file mode 100644
-index 0856ae4..0000000
-Binary files a/node_modules/react-native-plaid-link-sdk/android/.gradle/7.4.2/checksums/sha1-checksums.bin and /dev/null differ
-diff --git a/node_modules/react-native-plaid-link-sdk/android/.gradle/7.4.2/dependencies-accessors/dependencies-accessors.lock b/node_modules/react-native-plaid-link-sdk/android/.gradle/7.4.2/dependencies-accessors/dependencies-accessors.lock
-deleted file mode 100644
-index 12aea68..0000000
-Binary files a/node_modules/react-native-plaid-link-sdk/android/.gradle/7.4.2/dependencies-accessors/dependencies-accessors.lock and /dev/null differ
-diff --git a/node_modules/react-native-plaid-link-sdk/android/.gradle/7.4.2/dependencies-accessors/gc.properties b/node_modules/react-native-plaid-link-sdk/android/.gradle/7.4.2/dependencies-accessors/gc.properties
-deleted file mode 100644
-index e69de29..0000000
-diff --git a/node_modules/react-native-plaid-link-sdk/android/.gradle/7.4.2/fileChanges/last-build.bin b/node_modules/react-native-plaid-link-sdk/android/.gradle/7.4.2/fileChanges/last-build.bin
-deleted file mode 100644
-index f76dd23..0000000
-Binary files a/node_modules/react-native-plaid-link-sdk/android/.gradle/7.4.2/fileChanges/last-build.bin and /dev/null differ
-diff --git a/node_modules/react-native-plaid-link-sdk/android/.gradle/7.4.2/fileHashes/fileHashes.lock b/node_modules/react-native-plaid-link-sdk/android/.gradle/7.4.2/fileHashes/fileHashes.lock
-deleted file mode 100644
-index 752a252..0000000
-Binary files a/node_modules/react-native-plaid-link-sdk/android/.gradle/7.4.2/fileHashes/fileHashes.lock and /dev/null differ
-diff --git a/node_modules/react-native-plaid-link-sdk/android/.gradle/7.4.2/gc.properties b/node_modules/react-native-plaid-link-sdk/android/.gradle/7.4.2/gc.properties
-deleted file mode 100644
-index e69de29..0000000
-diff --git a/node_modules/react-native-plaid-link-sdk/android/.gradle/buildOutputCleanup/buildOutputCleanup.lock b/node_modules/react-native-plaid-link-sdk/android/.gradle/buildOutputCleanup/buildOutputCleanup.lock
-deleted file mode 100644
-index 470ca89..0000000
-Binary files a/node_modules/react-native-plaid-link-sdk/android/.gradle/buildOutputCleanup/buildOutputCleanup.lock and /dev/null differ
-diff --git a/node_modules/react-native-plaid-link-sdk/android/.gradle/buildOutputCleanup/cache.properties b/node_modules/react-native-plaid-link-sdk/android/.gradle/buildOutputCleanup/cache.properties
-deleted file mode 100644
-index 1439672..0000000
---- a/node_modules/react-native-plaid-link-sdk/android/.gradle/buildOutputCleanup/cache.properties
-+++ /dev/null
-@@ -1,2 +0,0 @@
--#Thu Nov 09 09:41:17 PST 2023
--gradle.version=7.4.2
-diff --git a/node_modules/react-native-plaid-link-sdk/android/.gradle/checksums/checksums.lock b/node_modules/react-native-plaid-link-sdk/android/.gradle/checksums/checksums.lock
-deleted file mode 100644
-index 34602e1..0000000
-Binary files a/node_modules/react-native-plaid-link-sdk/android/.gradle/checksums/checksums.lock and /dev/null differ
-diff --git a/node_modules/react-native-plaid-link-sdk/android/.gradle/checksums/md5-checksums.bin b/node_modules/react-native-plaid-link-sdk/android/.gradle/checksums/md5-checksums.bin
-deleted file mode 100644
-index 2420123..0000000
-Binary files a/node_modules/react-native-plaid-link-sdk/android/.gradle/checksums/md5-checksums.bin and /dev/null differ
-diff --git a/node_modules/react-native-plaid-link-sdk/android/.gradle/checksums/sha1-checksums.bin b/node_modules/react-native-plaid-link-sdk/android/.gradle/checksums/sha1-checksums.bin
-deleted file mode 100644
-index 1081852..0000000
-Binary files a/node_modules/react-native-plaid-link-sdk/android/.gradle/checksums/sha1-checksums.bin and /dev/null differ
-diff --git a/node_modules/react-native-plaid-link-sdk/android/.gradle/vcs-1/gc.properties b/node_modules/react-native-plaid-link-sdk/android/.gradle/vcs-1/gc.properties
-deleted file mode 100644
-index e69de29..0000000
-diff --git a/node_modules/react-native-plaid-link-sdk/android/.idea/gradle.xml b/node_modules/react-native-plaid-link-sdk/android/.idea/gradle.xml
-deleted file mode 100644
-index 0364d75..0000000
---- a/node_modules/react-native-plaid-link-sdk/android/.idea/gradle.xml
-+++ /dev/null
-@@ -1,14 +0,0 @@
--<?xml version="1.0" encoding="UTF-8"?>
--<project version="4">
--  <component name="GradleMigrationSettings" migrationVersion="1" />
--  <component name="GradleSettings">
--    <option name="linkedExternalProjectsSettings">
--      <GradleProjectSettings>
--        <option name="testRunner" value="GRADLE" />
--        <option name="distributionType" value="DEFAULT_WRAPPED" />
--        <option name="externalProjectPath" value="$PROJECT_DIR$" />
--        <option name="gradleJvm" value="jbr-17" />
--      </GradleProjectSettings>
--    </option>
--  </component>
--</project>
-\ No newline at end of file
-diff --git a/node_modules/react-native-plaid-link-sdk/android/.idea/misc.xml b/node_modules/react-native-plaid-link-sdk/android/.idea/misc.xml
-deleted file mode 100644
-index a318cae..0000000
---- a/node_modules/react-native-plaid-link-sdk/android/.idea/misc.xml
-+++ /dev/null
-@@ -1,9 +0,0 @@
--<project version="4">
--  <component name="ExternalStorageConfigurationManager" enabled="true" />
--  <component name="ProjectRootManager" version="2" project-jdk-name="jbr-17" project-jdk-type="JavaSDK">
--    <output url="file://$PROJECT_DIR$/build/classes" />
--  </component>
--  <component name="ProjectType">
--    <option name="id" value="Android" />
--  </component>
--</project>
-\ No newline at end of file
-diff --git a/node_modules/react-native-plaid-link-sdk/android/.idea/vcs.xml b/node_modules/react-native-plaid-link-sdk/android/.idea/vcs.xml
-deleted file mode 100644
-index 6c0b863..0000000
---- a/node_modules/react-native-plaid-link-sdk/android/.idea/vcs.xml
-+++ /dev/null
-@@ -1,6 +0,0 @@
--<?xml version="1.0" encoding="UTF-8"?>
--<project version="4">
--  <component name="VcsDirectoryMappings">
--    <mapping directory="$PROJECT_DIR$/.." vcs="Git" />
--  </component>
--</project>
-\ No newline at end of file
-diff --git a/node_modules/react-native-plaid-link-sdk/android/build.gradle b/node_modules/react-native-plaid-link-sdk/android/build.gradle
-index 2d9e2ce..e88208b 100644
---- a/node_modules/react-native-plaid-link-sdk/android/build.gradle
-+++ b/node_modules/react-native-plaid-link-sdk/android/build.gradle
-@@ -12,7 +12,12 @@ allprojects {
- 
- 
- buildscript {
--    ext.kotlin_version = '1.8.22'
-+    ext {
-+        kotlin_version = '1.8.22'
-+    }
-+    ext.safeExtGet = {prop, fallback ->
-+        rootProject.ext.has(prop) ? rootProject.ext.get(prop) : fallback
-+    }
-     repositories {
-         google()
-         mavenCentral()
-@@ -25,10 +30,32 @@ buildscript {
-     }
- }
- 
-+def isNewArchitectureEnabled() {
-+    // To opt-in for the New Architecture, you can either:
-+    // - Set `newArchEnabled` to true inside the `gradle.properties` file
-+    // - Invoke gradle with `-newArchEnabled=true`
-+    // - Set an environment variable `ORG_GRADLE_PROJECT_newArchEnabled=true`
-+    return project.hasProperty("newArchEnabled") && project.newArchEnabled == "true"
-+}
-+
-+if (isNewArchitectureEnabled()) {
-+    apply plugin: "com.facebook.react"
-+}
-+
- apply plugin: 'com.android.library'
- apply plugin: "kotlin-android"
- 
- android {
-+
-+    // Used to override the NDK path/version on internal CI or by allowing
-+    // users to customize the NDK path/version from their root project (e.g. for M1 support)
-+    if (rootProject.hasProperty("ndkPath")) {
-+        ndkPath rootProject.ext.ndkPath
-+    }
-+    if (rootProject.hasProperty("ndkVersion")) {
-+        ndkVersion rootProject.ext.ndkVersion
-+    }
-+
-     def agpVersion = com.android.Version.ANDROID_GRADLE_PLUGIN_VERSION.tokenize('.')[0].toInteger()
-     if (agpVersion >= 7) {
-       namespace 'com.plaid'
-@@ -52,6 +79,14 @@ android {
-       }
-     }
- 
-+    sourceSets.main {
-+        java {
-+            if (!isNewArchitectureEnabled()) {
-+                    srcDirs += 'src/paper/java'
-+                }
-+            }
-+    }
-+
-     buildTypes {
-         release {
-             debuggable = false
-diff --git a/node_modules/react-native-plaid-link-sdk/android/local.properties b/node_modules/react-native-plaid-link-sdk/android/local.properties
-deleted file mode 100644
-index 0b4e321..0000000
---- a/node_modules/react-native-plaid-link-sdk/android/local.properties
-+++ /dev/null
-@@ -1,8 +0,0 @@
--## This file must *NOT* be checked into Version Control Systems,
--# as it contains information specific to your local configuration.
--#
--# Location of the SDK. This is only used by Gradle.
--# For customization when using a Version Control System, please read the
--# header note.
--#Fri Aug 11 13:58:32 PDT 2023
--sdk.dir=/Users/dtroupe/Library/Android/sdk
-diff --git a/node_modules/react-native-plaid-link-sdk/android/src/main/java/com/plaid/PLKEmbeddedViewManager.kt b/node_modules/react-native-plaid-link-sdk/android/src/main/java/com/plaid/PLKEmbeddedViewManager.kt
-index c73011f..66fd266 100644
---- a/node_modules/react-native-plaid-link-sdk/android/src/main/java/com/plaid/PLKEmbeddedViewManager.kt
-+++ b/node_modules/react-native-plaid-link-sdk/android/src/main/java/com/plaid/PLKEmbeddedViewManager.kt
-@@ -19,9 +19,9 @@ class PLKEmbeddedViewManager : SimpleViewManager<PLKEmbeddedView>() {
-   }
- 
-   override fun getExportedCustomBubblingEventTypeConstants(): Map<String, Any> {
--    return mapOf(
--      EVENT_NAME to mapOf(
--        "phasedRegistrationNames" to mapOf(
-+    return mutableMapOf(
-+      EVENT_NAME to mutableMapOf(
-+        "phasedRegistrationNames" to mutableMapOf(
-           "bubbled" to EVENT_NAME
-         )
-     ))
-diff --git a/node_modules/react-native-plaid-link-sdk/android/src/main/java/com/plaid/PlaidModule.kt b/node_modules/react-native-plaid-link-sdk/android/src/main/java/com/plaid/PlaidModule.kt
-index 293374a..b79352e 100644
---- a/node_modules/react-native-plaid-link-sdk/android/src/main/java/com/plaid/PlaidModule.kt
-+++ b/node_modules/react-native-plaid-link-sdk/android/src/main/java/com/plaid/PlaidModule.kt
-@@ -24,9 +24,9 @@ import org.json.JSONException
- import org.json.JSONObject
- import java.util.ArrayList
- 
--@ReactModule(name = PlaidModule.TAG)
-+@ReactModule(name = PlaidModule.NAME)
- class PlaidModule internal constructor(reactContext: ReactApplicationContext) :
--  ReactContextBaseJavaModule(reactContext), ActivityEventListener {
-+  NativePlaidLinkModuleAndroidSpec(reactContext), ActivityEventListener {
- 
-   val mActivityResultManager by lazy { ActivityResultManager() }
- 
-@@ -38,11 +38,11 @@ class PlaidModule internal constructor(reactContext: ReactApplicationContext) :
-   companion object {
-     private const val LINK_TOKEN_PREFIX = "link"
- 
--    const val TAG = "PlaidAndroid"
-+    const val NAME = "PlaidAndroid"
-   }
- 
-   override fun getName(): String {
--    return PlaidModule.TAG
-+    return NAME
-   }
- 
-   override fun initialize() {
-@@ -78,7 +78,7 @@ class PlaidModule internal constructor(reactContext: ReactApplicationContext) :
- 
-   @ReactMethod
-   @Suppress("unused")
--  fun startLinkActivityForResult(
-+  override fun startLinkActivityForResult(
-     token: String,
-     noLoadingState: Boolean,
-     logLevel: String,
-@@ -113,6 +113,10 @@ class PlaidModule internal constructor(reactContext: ReactApplicationContext) :
-     }
-   }
- 
-+  override fun addListener(eventName: String?) = Unit
-+
-+  override fun removeListeners(count: Double) = Unit
-+
-   private fun maybeGetStringField(obj: JSONObject, fieldName: String): String? {
-     if (obj.has(fieldName) && !TextUtils.isEmpty(obj.getString(fieldName))) {
-       return obj.getString(fieldName)
-diff --git a/node_modules/react-native-plaid-link-sdk/android/src/main/java/com/plaid/PlaidPackage.java b/node_modules/react-native-plaid-link-sdk/android/src/main/java/com/plaid/PlaidPackage.java
-index c59299e..d6b310e 100644
---- a/node_modules/react-native-plaid-link-sdk/android/src/main/java/com/plaid/PlaidPackage.java
-+++ b/node_modules/react-native-plaid-link-sdk/android/src/main/java/com/plaid/PlaidPackage.java
-@@ -6,19 +6,54 @@ import java.util.List;
- import java.util.Map;
- 
- import com.facebook.react.TurboReactPackage;
-+import com.facebook.react.ViewManagerOnDemandReactPackage;
-+import com.facebook.react.bridge.ModuleSpec;
- import com.facebook.react.bridge.NativeModule;
- import com.facebook.react.bridge.ReactApplicationContext;
-+import com.facebook.react.module.annotations.ReactModule;
-+import com.facebook.react.module.annotations.ReactModuleList;
- import com.facebook.react.module.model.ReactModuleInfo;
- import com.facebook.react.module.model.ReactModuleInfoProvider;
-+import com.facebook.react.turbomodule.core.interfaces.TurboModule;
- import com.facebook.react.uimanager.ViewManager;
- 
--@SuppressWarnings("unused")
--public class PlaidPackage extends TurboReactPackage {
-+import javax.annotation.Nonnull;
-+import javax.annotation.Nullable;
- 
-+@ReactModuleList(nativeModules = {PlaidModule.class})
-+public class PlaidPackage extends TurboReactPackage implements ViewManagerOnDemandReactPackage {
-+
-+  /**
-+   * {@inheritDoc}
-+   */
-+  @Override
-+  public List<String> getViewManagerNames(ReactApplicationContext reactContext) {
-+    return null;
-+  }
-+
-+  @Override
-+  protected List<ModuleSpec> getViewManagers(ReactApplicationContext reactContext) {
-+    return null;
-+  }
-+
-+  /**
-+   * {@inheritDoc}
-+   */
-   @Override
--  public NativeModule getModule(
--      String name, ReactApplicationContext reactContext) {
--    return new PlaidModule(reactContext);
-+  public @Nullable
-+  ViewManager createViewManager(
-+          ReactApplicationContext reactContext, String viewManagerName) {
-+    return null;
-+  }
-+
-+  @Override
-+  public NativeModule getModule(String name, @Nonnull ReactApplicationContext reactContext) {
-+    switch (name) {
-+      case PlaidModule.NAME:
-+        return new PlaidModule(reactContext);
-+      default:
-+        return null;
-+    }
-   }
- 
-   @Override
-@@ -28,19 +63,44 @@ public class PlaidPackage extends TurboReactPackage {
- 
-   @Override
-   public ReactModuleInfoProvider getReactModuleInfoProvider() {
--    return () -> {
--      Map<String, ReactModuleInfo> map = new HashMap<>();
--      map.put(
--          "PlaidAndroid",
--          new ReactModuleInfo(
--              "PlaidAndroid",
--              "com.reactlibrary.PlaidModule",
--              false,
--              false,
--              true,
--              false,
--              false));
--      return map;
--    };
-+    try {
-+      Class<?> reactModuleInfoProviderClass =
-+              Class.forName("com.plaid.PlaidPackage$$ReactModuleInfoProvider");
-+      return (ReactModuleInfoProvider) reactModuleInfoProviderClass.newInstance();
-+    } catch (ClassNotFoundException e) {
-+      // ReactModuleSpecProcessor does not run at build-time. Create this ReactModuleInfoProvider by
-+      // hand.
-+      return new ReactModuleInfoProvider() {
-+        @Override
-+        public Map<String, ReactModuleInfo> getReactModuleInfos() {
-+          final Map<String, ReactModuleInfo> reactModuleInfoMap = new HashMap<>();
-+
-+          Class<? extends NativeModule>[] moduleList =
-+                  new Class[]{
-+                          PlaidModule.class,
-+                  };
-+
-+          for (Class<? extends NativeModule> moduleClass : moduleList) {
-+            ReactModule reactModule = moduleClass.getAnnotation(ReactModule.class);
-+
-+            reactModuleInfoMap.put(
-+                    reactModule.name(),
-+                    new ReactModuleInfo(
-+                            reactModule.name(),
-+                            moduleClass.getName(),
-+                            reactModule.canOverrideExistingModule(),
-+                            reactModule.needsEagerInit(),
-+                            reactModule.hasConstants(),
-+                            reactModule.isCxxModule(),
-+                            TurboModule.class.isAssignableFrom(moduleClass)));
-+          }
-+
-+          return reactModuleInfoMap;
-+        }
-+      };
-+    } catch (InstantiationException | IllegalAccessException e) {
-+      throw new RuntimeException(
-+              "No ReactModuleInfoProvider for com.plaid.PlaidPackage$$ReactModuleInfoProvider", e);
-+    }
-   }
- }
-diff --git a/node_modules/react-native-plaid-link-sdk/android/src/paper/java/com/plaid/NativePlaidLinkModuleAndroidSpec.java b/node_modules/react-native-plaid-link-sdk/android/src/paper/java/com/plaid/NativePlaidLinkModuleAndroidSpec.java
-new file mode 100644
-index 0000000..fee5a11
---- /dev/null
-+++ b/node_modules/react-native-plaid-link-sdk/android/src/paper/java/com/plaid/NativePlaidLinkModuleAndroidSpec.java
-@@ -0,0 +1,46 @@
-+
-+/**
-+ * This code was generated by [react-native-codegen](https://www.npmjs.com/package/react-native-codegen).
-+ *
-+ * Do not edit this file as changes may cause incorrect behavior and will be lost
-+ * once the code is regenerated.
-+ *
-+ * @generated by codegen project: GenerateModuleJavaSpec.js
-+ *
-+ * @nolint
-+ */
-+
-+package com.plaid;
-+
-+import com.facebook.proguard.annotations.DoNotStrip;
-+import com.facebook.react.bridge.Callback;
-+import com.facebook.react.bridge.ReactApplicationContext;
-+import com.facebook.react.bridge.ReactContextBaseJavaModule;
-+import com.facebook.react.bridge.ReactMethod;
-+import com.facebook.react.turbomodule.core.interfaces.TurboModule;
-+import javax.annotation.Nonnull;
-+
-+public abstract class NativePlaidLinkModuleAndroidSpec extends ReactContextBaseJavaModule implements TurboModule {
-+  public static final String NAME = "PlaidAndroid";
-+
-+  public NativePlaidLinkModuleAndroidSpec(ReactApplicationContext reactContext) {
-+    super(reactContext);
-+  }
-+
-+  @Override
-+  public @Nonnull String getName() {
-+    return NAME;
-+  }
-+
-+  @ReactMethod
-+  @DoNotStrip
-+  public abstract void startLinkActivityForResult(String token, boolean noLoadingState, String logLevel, Callback onSuccessCallback, Callback onExitCallback);
-+
-+  @ReactMethod
-+  @DoNotStrip
-+  public abstract void addListener(String eventName);
-+
-+  @ReactMethod
-+  @DoNotStrip
-+  public abstract void removeListeners(double count);
-+}
-diff --git a/node_modules/react-native-plaid-link-sdk/dist/EmbeddedLink/EmbeddedLinkView.js b/node_modules/react-native-plaid-link-sdk/dist/EmbeddedLink/EmbeddedLinkView.js
-index c7b1e96..c429da7 100644
---- a/node_modules/react-native-plaid-link-sdk/dist/EmbeddedLink/EmbeddedLinkView.js
-+++ b/node_modules/react-native-plaid-link-sdk/dist/EmbeddedLink/EmbeddedLinkView.js
-@@ -1,55 +1,69 @@
- import React from 'react';
- import NativeEmbeddedLinkView from './NativeEmbeddedLinkView';
- class EmbeddedEvent {
--    constructor(event) {
--        this.eventName = event.eventName;
--        this.metadata = event.metadata;
--    }
-+  constructor(event) {
-+    this.eventName = event.eventName;
-+    this.metadata = event.metadata;
-+  }
- }
- class EmbeddedExit {
--    constructor(event) {
--        this.error = event.error;
--        this.metadata = event.metadata;
--    }
-+  constructor(event) {
-+    this.error = event.error;
-+    this.metadata = event.metadata;
-+  }
- }
- class EmbeddedSuccess {
--    constructor(event) {
--        this.publicToken = event.publicToken;
--        this.metadata = event.metadata;
--    }
-+  constructor(event) {
-+    this.publicToken = event.publicToken;
-+    this.metadata = event.metadata;
-+  }
- }
--export const EmbeddedLinkView = (props) => {
--    const { token, iOSPresentationStyle, onEvent, onSuccess, onExit, style } = props;
--    const onEmbeddedEvent = (event) => {
--        switch (event.nativeEvent.embeddedEventName) {
--            case 'onSuccess': {
--                if (!onSuccess) {
--                    return;
--                }
--                const embeddedSuccess = new EmbeddedSuccess(event.nativeEvent);
--                onSuccess(embeddedSuccess);
--                break;
--            }
--            case 'onExit': {
--                if (!onExit) {
--                    return;
--                }
--                const embeddedExit = new EmbeddedExit(event.nativeEvent);
--                onExit(embeddedExit);
--                break;
--            }
--            case 'onEvent': {
--                if (!onEvent) {
--                    return;
--                }
--                const embeddedEvent = new EmbeddedEvent(event.nativeEvent);
--                onEvent(embeddedEvent);
--                break;
--            }
--            default: {
--                return;
--            }
-+export const EmbeddedLinkView = props => {
-+  const {
-+    token,
-+    iOSPresentationStyle,
-+    onEvent,
-+    onSuccess,
-+    onExit,
-+    style,
-+  } = props;
-+  const onEmbeddedEvent = event => {
-+    switch (event.nativeEvent.embeddedEventName) {
-+      case 'onSuccess': {
-+        if (!onSuccess) {
-+          return;
-         }
--    };
--    return <NativeEmbeddedLinkView token={token} iOSPresentationStyle={iOSPresentationStyle.toString()} onEmbeddedEvent={onEmbeddedEvent} style={style}/>;
-+        const embeddedSuccess = new EmbeddedSuccess(event.nativeEvent);
-+        onSuccess(embeddedSuccess);
-+        break;
-+      }
-+      case 'onExit': {
-+        if (!onExit) {
-+          return;
-+        }
-+        const embeddedExit = new EmbeddedExit(event.nativeEvent);
-+        onExit(embeddedExit);
-+        break;
-+      }
-+      case 'onEvent': {
-+        if (!onEvent) {
-+          return;
-+        }
-+        const embeddedEvent = new EmbeddedEvent(event.nativeEvent);
-+        onEvent(embeddedEvent);
-+        break;
-+      }
-+      default: {
-+        return;
-+      }
-+    }
-+  };
-+  return (
-+    <NativeEmbeddedLinkView
-+      token={token}
-+      iOSPresentationStyle={iOSPresentationStyle.toString()}
-+      onEmbeddedEvent={onEmbeddedEvent}
-+      style={style}
-+    />
-+  );
- };
-diff --git a/node_modules/react-native-plaid-link-sdk/dist/PlaidLink.d.ts b/node_modules/react-native-plaid-link-sdk/dist/PlaidLink.d.ts
-index a48b319..43205dd 100644
---- a/node_modules/react-native-plaid-link-sdk/dist/PlaidLink.d.ts
-+++ b/node_modules/react-native-plaid-link-sdk/dist/PlaidLink.d.ts
-@@ -4,9 +4,9 @@ import { LinkEventListener, PlaidLinkComponentProps, PlaidLinkProps } from './Ty
-  * A hook that registers a listener on the Plaid emitter for the 'onEvent' type.
-  * The listener is cleaned up when this view is unmounted
-  *
-- * @param LinkEventListener the listener to call
-+ * @param linkEventListener the listener to call
-  */
--export declare const usePlaidEmitter: (LinkEventListener: LinkEventListener) => void;
-+export declare const usePlaidEmitter: (linkEventListener: LinkEventListener) => void;
- export declare const openLink: (props: PlaidLinkProps) => Promise<void>;
- export declare const dismissLink: () => void;
- export declare const PlaidLink: (props: PlaidLinkComponentProps) => React.JSX.Element;
-diff --git a/node_modules/react-native-plaid-link-sdk/dist/PlaidLink.js b/node_modules/react-native-plaid-link-sdk/dist/PlaidLink.js
-index 21da2bc..6c43633 100644
---- a/node_modules/react-native-plaid-link-sdk/dist/PlaidLink.js
-+++ b/node_modules/react-native-plaid-link-sdk/dist/PlaidLink.js
-@@ -1,83 +1,146 @@
--var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
--    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
--    return new (P || (P = Promise))(function (resolve, reject) {
--        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
--        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
--        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
--        step((generator = generator.apply(thisArg, _arguments || [])).next());
-+var __awaiter =
-+  (this && this.__awaiter) ||
-+  function(thisArg, _arguments, P, generator) {
-+    function adopt(value) {
-+      return value instanceof P
-+        ? value
-+        : new P(function(resolve) {
-+            resolve(value);
-+          });
-+    }
-+    return new (P || (P = Promise))(function(resolve, reject) {
-+      function fulfilled(value) {
-+        try {
-+          step(generator.next(value));
-+        } catch (e) {
-+          reject(e);
-+        }
-+      }
-+      function rejected(value) {
-+        try {
-+          step(generator['throw'](value));
-+        } catch (e) {
-+          reject(e);
-+        }
-+      }
-+      function step(result) {
-+        result.done
-+          ? resolve(result.value)
-+          : adopt(result.value).then(fulfilled, rejected);
-+      }
-+      step((generator = generator.apply(thisArg, _arguments || [])).next());
-     });
--};
-+  };
-+var _a;
- import React, { useEffect } from 'react';
--import { NativeEventEmitter, NativeModules, Platform, TouchableOpacity, } from 'react-native';
--import { LinkIOSPresentationStyle, LinkLogLevel, } from './Types';
-+import { NativeEventEmitter, Platform, TouchableOpacity } from 'react-native';
-+import { LinkIOSPresentationStyle, LinkLogLevel } from './Types';
-+import RNLinksdkAndroid from './fabric/NativePlaidLinkModuleAndroid';
-+import RNLinksdkiOS from './fabric/NativePlaidLinkModuleiOS';
-+const RNLinksdk =
-+  (_a = Platform.OS === 'android' ? RNLinksdkAndroid : RNLinksdkiOS) !== null &&
-+  _a !== void 0
-+    ? _a
-+    : undefined;
- /**
-  * A hook that registers a listener on the Plaid emitter for the 'onEvent' type.
-  * The listener is cleaned up when this view is unmounted
-  *
-- * @param LinkEventListener the listener to call
-+ * @param linkEventListener the listener to call
-  */
--export const usePlaidEmitter = (LinkEventListener) => {
--    useEffect(() => {
--        const emitter = new NativeEventEmitter(Platform.OS === 'ios'
--            ? NativeModules.RNLinksdk
--            : NativeModules.PlaidAndroid);
--        const listener = emitter.addListener('onEvent', LinkEventListener);
--        // Clean up after this effect:
--        return function cleanup() {
--            listener.remove();
--        };
--    }, []);
-+export const usePlaidEmitter = linkEventListener => {
-+  useEffect(() => {
-+    const emitter = new NativeEventEmitter(RNLinksdk);
-+    const listener = emitter.addListener('onEvent', linkEventListener);
-+    // Clean up after this effect:
-+    return function cleanup() {
-+      listener.remove();
-+    };
-+  }, []);
- };
--export const openLink = (props) => __awaiter(void 0, void 0, void 0, function* () {
--    var _a, _b;
-+export const openLink = props =>
-+  __awaiter(void 0, void 0, void 0, function*() {
-+    var _b, _c;
-     let config = props.tokenConfig;
--    let noLoadingState = (_a = config.noLoadingState) !== null && _a !== void 0 ? _a : false;
-+    let noLoadingState =
-+      (_b = config.noLoadingState) !== null && _b !== void 0 ? _b : false;
-     if (Platform.OS === 'android') {
--        NativeModules.PlaidAndroid.startLinkActivityForResult(config.token, noLoadingState, (_b = config.logLevel) !== null && _b !== void 0 ? _b : LinkLogLevel.ERROR, (result) => {
--            if (props.onSuccess != null) {
--                props.onSuccess(result);
--            }
--        }, (result) => {
--            if (props.onExit != null) {
--                if (result.error != null && result.error.displayMessage != null) {
--                    //TODO(RNSDK-118): Remove errorDisplayMessage field in next major update.
--                    result.error.errorDisplayMessage = result.error.displayMessage;
--                }
--                props.onExit(result);
-+      if (RNLinksdkAndroid === null) {
-+        throw new Error(
-+          '[react-native-plaid-link-sdk] RNLinksdkAndroid is not defined',
-+        );
-+      }
-+      RNLinksdkAndroid.startLinkActivityForResult(
-+        config.token,
-+        noLoadingState,
-+        (_c = config.logLevel) !== null && _c !== void 0
-+          ? _c
-+          : LinkLogLevel.ERROR,
-+        // @ts-ignore we use Object type in the spec file as it maps to NSDictionary and ReadableMap
-+        result => {
-+          if (props.onSuccess != null) {
-+            props.onSuccess(result);
-+          }
-+        },
-+        result => {
-+          if (props.onExit != null) {
-+            if (result.error != null && result.error.displayMessage != null) {
-+              //TODO(RNSDK-118): Remove errorDisplayMessage field in next major update.
-+              result.error.errorDisplayMessage = result.error.displayMessage;
-             }
--        });
--    }
--    else {
--        NativeModules.RNLinksdk.create(config.token, noLoadingState);
--        let presentFullScreen = props.iOSPresentationStyle == LinkIOSPresentationStyle.FULL_SCREEN;
--        NativeModules.RNLinksdk.open(presentFullScreen, (result) => {
--            if (props.onSuccess != null) {
--                props.onSuccess(result);
--            }
--        }, (error, result) => {
--            if (props.onExit != null) {
--                if (error) {
--                    var data = result || {};
--                    data.error = error;
--                    props.onExit(data);
--                }
--                else {
--                    props.onExit(result);
--                }
-+            props.onExit(result);
-+          }
-+        },
-+      );
-+    } else {
-+      if (RNLinksdkiOS === null) {
-+        throw new Error(
-+          '[react-native-plaid-link-sdk] RNLinksdkiOS is not defined',
-+        );
-+      }
-+      RNLinksdkiOS.create(config.token, noLoadingState);
-+      let presentFullScreen =
-+        props.iOSPresentationStyle == LinkIOSPresentationStyle.FULL_SCREEN;
-+      RNLinksdkiOS.open(
-+        presentFullScreen,
-+        // @ts-ignore we use Object type in the spec file as it maps to NSDictionary and ReadableMap
-+        result => {
-+          if (props.onSuccess != null) {
-+            props.onSuccess(result);
-+          }
-+        },
-+        (error, result) => {
-+          if (props.onExit != null) {
-+            if (error) {
-+              var data = result || {};
-+              data.error = error;
-+              props.onExit(data);
-+            } else {
-+              props.onExit(result);
-             }
--        });
-+          }
-+        },
-+      );
-     }
--});
-+  });
- export const dismissLink = () => {
--    if (Platform.OS === 'ios') {
--        NativeModules.RNLinksdk.dismiss();
-+  if (Platform.OS === 'ios') {
-+    if (RNLinksdkiOS === null) {
-+      throw new Error(
-+        '[react-native-plaid-link-sdk] RNLinksdkiOS is not defined',
-+      );
-     }
-+    RNLinksdkiOS.dismiss();
-+  }
- };
--export const PlaidLink = (props) => {
--    function onPress() {
--        var _a;
--        (_a = props.onPress) === null || _a === void 0 ? void 0 : _a.call(props);
--        openLink(props);
--    }
--    return <TouchableOpacity onPress={onPress}>{props.children}</TouchableOpacity>;
-+export const PlaidLink = props => {
-+  function onPress() {
-+    var _a;
-+    (_a = props.onPress) === null || _a === void 0 ? void 0 : _a.call(props);
-+    openLink(props);
-+  }
-+  return (
-+    // @ts-ignore some types directories misconfiguration
-+    <TouchableOpacity onPress={onPress}>{props.children}</TouchableOpacity>
-+  );
- };
-diff --git a/node_modules/react-native-plaid-link-sdk/dist/Types.js b/node_modules/react-native-plaid-link-sdk/dist/Types.js
-index 184adad..11b34e3 100644
---- a/node_modules/react-native-plaid-link-sdk/dist/Types.js
-+++ b/node_modules/react-native-plaid-link-sdk/dist/Types.js
-@@ -1,430 +1,681 @@
- export var LinkLogLevel;
--(function (LinkLogLevel) {
--    LinkLogLevel["DEBUG"] = "debug";
--    LinkLogLevel["INFO"] = "info";
--    LinkLogLevel["WARN"] = "warn";
--    LinkLogLevel["ERROR"] = "error";
-+(function(LinkLogLevel) {
-+  LinkLogLevel['DEBUG'] = 'debug';
-+  LinkLogLevel['INFO'] = 'info';
-+  LinkLogLevel['WARN'] = 'warn';
-+  LinkLogLevel['ERROR'] = 'error';
- })(LinkLogLevel || (LinkLogLevel = {}));
- export var PlaidEnvironment;
--(function (PlaidEnvironment) {
--    PlaidEnvironment["PRODUCTION"] = "production";
--    PlaidEnvironment["DEVELOPMENT"] = "development";
--    PlaidEnvironment["SANDBOX"] = "sandbox";
-+(function(PlaidEnvironment) {
-+  PlaidEnvironment['PRODUCTION'] = 'production';
-+  PlaidEnvironment['DEVELOPMENT'] = 'development';
-+  PlaidEnvironment['SANDBOX'] = 'sandbox';
- })(PlaidEnvironment || (PlaidEnvironment = {}));
- export var PlaidProduct;
--(function (PlaidProduct) {
--    PlaidProduct["ASSETS"] = "assets";
--    PlaidProduct["AUTH"] = "auth";
--    PlaidProduct["DEPOSIT_SWITCH"] = "deposit_switch";
--    PlaidProduct["IDENTITY"] = "identity";
--    PlaidProduct["INCOME"] = "income";
--    PlaidProduct["INVESTMENTS"] = "investments";
--    PlaidProduct["LIABILITIES"] = "liabilities";
--    PlaidProduct["LIABILITIES_REPORT"] = "liabilities_report";
--    PlaidProduct["PAYMENT_INITIATION"] = "payment_initiation";
--    PlaidProduct["TRANSACTIONS"] = "transactions";
-+(function(PlaidProduct) {
-+  PlaidProduct['ASSETS'] = 'assets';
-+  PlaidProduct['AUTH'] = 'auth';
-+  PlaidProduct['DEPOSIT_SWITCH'] = 'deposit_switch';
-+  PlaidProduct['IDENTITY'] = 'identity';
-+  PlaidProduct['INCOME'] = 'income';
-+  PlaidProduct['INVESTMENTS'] = 'investments';
-+  PlaidProduct['LIABILITIES'] = 'liabilities';
-+  PlaidProduct['LIABILITIES_REPORT'] = 'liabilities_report';
-+  PlaidProduct['PAYMENT_INITIATION'] = 'payment_initiation';
-+  PlaidProduct['TRANSACTIONS'] = 'transactions';
- })(PlaidProduct || (PlaidProduct = {}));
- export var LinkAccountType;
--(function (LinkAccountType) {
--    LinkAccountType["CREDIT"] = "credit";
--    LinkAccountType["DEPOSITORY"] = "depository";
--    LinkAccountType["INVESTMENT"] = "investment";
--    LinkAccountType["LOAN"] = "loan";
--    LinkAccountType["OTHER"] = "other";
-+(function(LinkAccountType) {
-+  LinkAccountType['CREDIT'] = 'credit';
-+  LinkAccountType['DEPOSITORY'] = 'depository';
-+  LinkAccountType['INVESTMENT'] = 'investment';
-+  LinkAccountType['LOAN'] = 'loan';
-+  LinkAccountType['OTHER'] = 'other';
- })(LinkAccountType || (LinkAccountType = {}));
- export var LinkAccountSubtypes;
--(function (LinkAccountSubtypes) {
--    LinkAccountSubtypes["ALL"] = "all";
--    LinkAccountSubtypes["CREDIT_CARD"] = "credit card";
--    LinkAccountSubtypes["PAYPAL"] = "paypal";
--    LinkAccountSubtypes["AUTO"] = "auto";
--    LinkAccountSubtypes["BUSINESS"] = "business";
--    LinkAccountSubtypes["COMMERCIAL"] = "commercial";
--    LinkAccountSubtypes["CONSTRUCTION"] = "construction";
--    LinkAccountSubtypes["CONSUMER"] = "consumer";
--    LinkAccountSubtypes["HOME_EQUITY"] = "home equity";
--    LinkAccountSubtypes["LINE_OF_CREDIT"] = "line of credit";
--    LinkAccountSubtypes["LOAN"] = "loan";
--    LinkAccountSubtypes["MORTGAGE"] = "mortgage";
--    LinkAccountSubtypes["OVERDRAFT"] = "overdraft";
--    LinkAccountSubtypes["STUDENT"] = "student";
--    LinkAccountSubtypes["CASH_MANAGEMENT"] = "cash management";
--    LinkAccountSubtypes["CD"] = "cd";
--    LinkAccountSubtypes["CHECKING"] = "checking";
--    LinkAccountSubtypes["EBT"] = "ebt";
--    LinkAccountSubtypes["HSA"] = "hsa";
--    LinkAccountSubtypes["MONEY_MARKET"] = "money market";
--    LinkAccountSubtypes["PREPAID"] = "prepaid";
--    LinkAccountSubtypes["SAVINGS"] = "savings";
--    LinkAccountSubtypes["FOUR_0_1_A"] = "401a";
--    LinkAccountSubtypes["FOUR_0_1_K"] = "401k";
--    LinkAccountSubtypes["FOUR_0_3_B"] = "403B";
--    LinkAccountSubtypes["FOUR_5_7_B"] = "457b";
--    LinkAccountSubtypes["FIVE_2_9"] = "529";
--    LinkAccountSubtypes["BROKERAGE"] = "brokerage";
--    LinkAccountSubtypes["CASH_ISA"] = "cash isa";
--    LinkAccountSubtypes["EDUCATION_SAVINGS_ACCOUNT"] = "education savings account";
--    LinkAccountSubtypes["FIXED_ANNUNITY"] = "fixed annuity";
--    LinkAccountSubtypes["GIC"] = "gic";
--    LinkAccountSubtypes["HEALTH_REIMBURSEMENT_ARRANGEMENT"] = "health reimbursement arrangement";
--    LinkAccountSubtypes["IRA"] = "ira";
--    LinkAccountSubtypes["ISA"] = "isa";
--    LinkAccountSubtypes["KEOGH"] = "keogh";
--    LinkAccountSubtypes["LIF"] = "lif";
--    LinkAccountSubtypes["LIRA"] = "lira";
--    LinkAccountSubtypes["LRIF"] = "lrif";
--    LinkAccountSubtypes["LRSP"] = "lrsp";
--    LinkAccountSubtypes["MUTUAL_FUND"] = "mutual fund";
--    LinkAccountSubtypes["NON_TAXABLE_BROKERAGE_ACCOUNT"] = "non-taxable brokerage account";
--    LinkAccountSubtypes["PENSION"] = "pension";
--    LinkAccountSubtypes["PLAN"] = "plan";
--    LinkAccountSubtypes["PRIF"] = "prif";
--    LinkAccountSubtypes["PROFIT_SHARING_PLAN"] = "profit sharing plan";
--    LinkAccountSubtypes["RDSP"] = "rdsp";
--    LinkAccountSubtypes["RESP"] = "resp";
--    LinkAccountSubtypes["RETIREMENT"] = "retirement";
--    LinkAccountSubtypes["RLIF"] = "rlif";
--    LinkAccountSubtypes["ROTH_401K"] = "roth 401k";
--    LinkAccountSubtypes["ROTH"] = "roth";
--    LinkAccountSubtypes["RRIF"] = "rrif";
--    LinkAccountSubtypes["RRSP"] = "rrsp";
--    LinkAccountSubtypes["SARSEP"] = "sarsep";
--    LinkAccountSubtypes["SEP_IRA"] = "sep ira";
--    LinkAccountSubtypes["SIMPLE_IRA"] = "simple ira";
--    LinkAccountSubtypes["SIPP"] = "sipp";
--    LinkAccountSubtypes["STOCK_PLAN"] = "stock plan";
--    LinkAccountSubtypes["TFSA"] = "tfsa";
--    LinkAccountSubtypes["THRIFT_SAVINGS_PLAN"] = "thrift savings plan";
--    LinkAccountSubtypes["TRUST"] = "trust";
--    LinkAccountSubtypes["UGMA"] = "ugma";
--    LinkAccountSubtypes["UTMA"] = "utma";
--    LinkAccountSubtypes["VARIABLE_ANNUITY"] = "variable annuity";
-+(function(LinkAccountSubtypes) {
-+  LinkAccountSubtypes['ALL'] = 'all';
-+  LinkAccountSubtypes['CREDIT_CARD'] = 'credit card';
-+  LinkAccountSubtypes['PAYPAL'] = 'paypal';
-+  LinkAccountSubtypes['AUTO'] = 'auto';
-+  LinkAccountSubtypes['BUSINESS'] = 'business';
-+  LinkAccountSubtypes['COMMERCIAL'] = 'commercial';
-+  LinkAccountSubtypes['CONSTRUCTION'] = 'construction';
-+  LinkAccountSubtypes['CONSUMER'] = 'consumer';
-+  LinkAccountSubtypes['HOME_EQUITY'] = 'home equity';
-+  LinkAccountSubtypes['LINE_OF_CREDIT'] = 'line of credit';
-+  LinkAccountSubtypes['LOAN'] = 'loan';
-+  LinkAccountSubtypes['MORTGAGE'] = 'mortgage';
-+  LinkAccountSubtypes['OVERDRAFT'] = 'overdraft';
-+  LinkAccountSubtypes['STUDENT'] = 'student';
-+  LinkAccountSubtypes['CASH_MANAGEMENT'] = 'cash management';
-+  LinkAccountSubtypes['CD'] = 'cd';
-+  LinkAccountSubtypes['CHECKING'] = 'checking';
-+  LinkAccountSubtypes['EBT'] = 'ebt';
-+  LinkAccountSubtypes['HSA'] = 'hsa';
-+  LinkAccountSubtypes['MONEY_MARKET'] = 'money market';
-+  LinkAccountSubtypes['PREPAID'] = 'prepaid';
-+  LinkAccountSubtypes['SAVINGS'] = 'savings';
-+  LinkAccountSubtypes['FOUR_0_1_A'] = '401a';
-+  LinkAccountSubtypes['FOUR_0_1_K'] = '401k';
-+  LinkAccountSubtypes['FOUR_0_3_B'] = '403B';
-+  LinkAccountSubtypes['FOUR_5_7_B'] = '457b';
-+  LinkAccountSubtypes['FIVE_2_9'] = '529';
-+  LinkAccountSubtypes['BROKERAGE'] = 'brokerage';
-+  LinkAccountSubtypes['CASH_ISA'] = 'cash isa';
-+  LinkAccountSubtypes['EDUCATION_SAVINGS_ACCOUNT'] =
-+    'education savings account';
-+  LinkAccountSubtypes['FIXED_ANNUNITY'] = 'fixed annuity';
-+  LinkAccountSubtypes['GIC'] = 'gic';
-+  LinkAccountSubtypes['HEALTH_REIMBURSEMENT_ARRANGEMENT'] =
-+    'health reimbursement arrangement';
-+  LinkAccountSubtypes['IRA'] = 'ira';
-+  LinkAccountSubtypes['ISA'] = 'isa';
-+  LinkAccountSubtypes['KEOGH'] = 'keogh';
-+  LinkAccountSubtypes['LIF'] = 'lif';
-+  LinkAccountSubtypes['LIRA'] = 'lira';
-+  LinkAccountSubtypes['LRIF'] = 'lrif';
-+  LinkAccountSubtypes['LRSP'] = 'lrsp';
-+  LinkAccountSubtypes['MUTUAL_FUND'] = 'mutual fund';
-+  LinkAccountSubtypes['NON_TAXABLE_BROKERAGE_ACCOUNT'] =
-+    'non-taxable brokerage account';
-+  LinkAccountSubtypes['PENSION'] = 'pension';
-+  LinkAccountSubtypes['PLAN'] = 'plan';
-+  LinkAccountSubtypes['PRIF'] = 'prif';
-+  LinkAccountSubtypes['PROFIT_SHARING_PLAN'] = 'profit sharing plan';
-+  LinkAccountSubtypes['RDSP'] = 'rdsp';
-+  LinkAccountSubtypes['RESP'] = 'resp';
-+  LinkAccountSubtypes['RETIREMENT'] = 'retirement';
-+  LinkAccountSubtypes['RLIF'] = 'rlif';
-+  LinkAccountSubtypes['ROTH_401K'] = 'roth 401k';
-+  LinkAccountSubtypes['ROTH'] = 'roth';
-+  LinkAccountSubtypes['RRIF'] = 'rrif';
-+  LinkAccountSubtypes['RRSP'] = 'rrsp';
-+  LinkAccountSubtypes['SARSEP'] = 'sarsep';
-+  LinkAccountSubtypes['SEP_IRA'] = 'sep ira';
-+  LinkAccountSubtypes['SIMPLE_IRA'] = 'simple ira';
-+  LinkAccountSubtypes['SIPP'] = 'sipp';
-+  LinkAccountSubtypes['STOCK_PLAN'] = 'stock plan';
-+  LinkAccountSubtypes['TFSA'] = 'tfsa';
-+  LinkAccountSubtypes['THRIFT_SAVINGS_PLAN'] = 'thrift savings plan';
-+  LinkAccountSubtypes['TRUST'] = 'trust';
-+  LinkAccountSubtypes['UGMA'] = 'ugma';
-+  LinkAccountSubtypes['UTMA'] = 'utma';
-+  LinkAccountSubtypes['VARIABLE_ANNUITY'] = 'variable annuity';
- })(LinkAccountSubtypes || (LinkAccountSubtypes = {}));
- export class LinkAccountSubtypeCredit {
--    constructor(type, subtype) {
--        this.type = type;
--        this.subtype = subtype;
--    }
-+  constructor(type, subtype) {
-+    this.type = type;
-+    this.subtype = subtype;
-+  }
- }
--LinkAccountSubtypeCredit.ALL = new LinkAccountSubtypeCredit(LinkAccountType.CREDIT, LinkAccountSubtypes.ALL);
--LinkAccountSubtypeCredit.CREDIT_CARD = new LinkAccountSubtypeCredit(LinkAccountType.CREDIT, LinkAccountSubtypes.CREDIT_CARD);
--LinkAccountSubtypeCredit.PAYPAL = new LinkAccountSubtypeCredit(LinkAccountType.CREDIT, LinkAccountSubtypes.PAYPAL);
-+LinkAccountSubtypeCredit.ALL = new LinkAccountSubtypeCredit(
-+  LinkAccountType.CREDIT,
-+  LinkAccountSubtypes.ALL,
-+);
-+LinkAccountSubtypeCredit.CREDIT_CARD = new LinkAccountSubtypeCredit(
-+  LinkAccountType.CREDIT,
-+  LinkAccountSubtypes.CREDIT_CARD,
-+);
-+LinkAccountSubtypeCredit.PAYPAL = new LinkAccountSubtypeCredit(
-+  LinkAccountType.CREDIT,
-+  LinkAccountSubtypes.PAYPAL,
-+);
- export class LinkAccountSubtypeDepository {
--    constructor(type, subtype) {
--        this.type = type;
--        this.subtype = subtype;
--    }
-+  constructor(type, subtype) {
-+    this.type = type;
-+    this.subtype = subtype;
-+  }
- }
--LinkAccountSubtypeDepository.ALL = new LinkAccountSubtypeDepository(LinkAccountType.DEPOSITORY, LinkAccountSubtypes.ALL);
--LinkAccountSubtypeDepository.CASH_MANAGEMENT = new LinkAccountSubtypeDepository(LinkAccountType.DEPOSITORY, LinkAccountSubtypes.CASH_MANAGEMENT);
--LinkAccountSubtypeDepository.CD = new LinkAccountSubtypeDepository(LinkAccountType.DEPOSITORY, LinkAccountSubtypes.CD);
--LinkAccountSubtypeDepository.CHECKING = new LinkAccountSubtypeDepository(LinkAccountType.DEPOSITORY, LinkAccountSubtypes.CHECKING);
--LinkAccountSubtypeDepository.EBT = new LinkAccountSubtypeDepository(LinkAccountType.DEPOSITORY, LinkAccountSubtypes.EBT);
--LinkAccountSubtypeDepository.HSA = new LinkAccountSubtypeDepository(LinkAccountType.DEPOSITORY, LinkAccountSubtypes.HSA);
--LinkAccountSubtypeDepository.MONEY_MARKET = new LinkAccountSubtypeDepository(LinkAccountType.DEPOSITORY, LinkAccountSubtypes.MONEY_MARKET);
--LinkAccountSubtypeDepository.PAYPAL = new LinkAccountSubtypeDepository(LinkAccountType.DEPOSITORY, LinkAccountSubtypes.PAYPAL);
--LinkAccountSubtypeDepository.PREPAID = new LinkAccountSubtypeDepository(LinkAccountType.DEPOSITORY, LinkAccountSubtypes.PREPAID);
--LinkAccountSubtypeDepository.SAVINGS = new LinkAccountSubtypeDepository(LinkAccountType.DEPOSITORY, LinkAccountSubtypes.SAVINGS);
-+LinkAccountSubtypeDepository.ALL = new LinkAccountSubtypeDepository(
-+  LinkAccountType.DEPOSITORY,
-+  LinkAccountSubtypes.ALL,
-+);
-+LinkAccountSubtypeDepository.CASH_MANAGEMENT = new LinkAccountSubtypeDepository(
-+  LinkAccountType.DEPOSITORY,
-+  LinkAccountSubtypes.CASH_MANAGEMENT,
-+);
-+LinkAccountSubtypeDepository.CD = new LinkAccountSubtypeDepository(
-+  LinkAccountType.DEPOSITORY,
-+  LinkAccountSubtypes.CD,
-+);
-+LinkAccountSubtypeDepository.CHECKING = new LinkAccountSubtypeDepository(
-+  LinkAccountType.DEPOSITORY,
-+  LinkAccountSubtypes.CHECKING,
-+);
-+LinkAccountSubtypeDepository.EBT = new LinkAccountSubtypeDepository(
-+  LinkAccountType.DEPOSITORY,
-+  LinkAccountSubtypes.EBT,
-+);
-+LinkAccountSubtypeDepository.HSA = new LinkAccountSubtypeDepository(
-+  LinkAccountType.DEPOSITORY,
-+  LinkAccountSubtypes.HSA,
-+);
-+LinkAccountSubtypeDepository.MONEY_MARKET = new LinkAccountSubtypeDepository(
-+  LinkAccountType.DEPOSITORY,
-+  LinkAccountSubtypes.MONEY_MARKET,
-+);
-+LinkAccountSubtypeDepository.PAYPAL = new LinkAccountSubtypeDepository(
-+  LinkAccountType.DEPOSITORY,
-+  LinkAccountSubtypes.PAYPAL,
-+);
-+LinkAccountSubtypeDepository.PREPAID = new LinkAccountSubtypeDepository(
-+  LinkAccountType.DEPOSITORY,
-+  LinkAccountSubtypes.PREPAID,
-+);
-+LinkAccountSubtypeDepository.SAVINGS = new LinkAccountSubtypeDepository(
-+  LinkAccountType.DEPOSITORY,
-+  LinkAccountSubtypes.SAVINGS,
-+);
- export class LinkAccountSubtypeInvestment {
--    constructor(type, subtype) {
--        this.type = type;
--        this.subtype = subtype;
--    }
-+  constructor(type, subtype) {
-+    this.type = type;
-+    this.subtype = subtype;
-+  }
- }
--LinkAccountSubtypeInvestment.ALL = new LinkAccountSubtypeInvestment(LinkAccountType.INVESTMENT, LinkAccountSubtypes.ALL);
--LinkAccountSubtypeInvestment.BROKERAGE = new LinkAccountSubtypeInvestment(LinkAccountType.INVESTMENT, LinkAccountSubtypes.BROKERAGE);
--LinkAccountSubtypeInvestment.CASH_ISA = new LinkAccountSubtypeInvestment(LinkAccountType.INVESTMENT, LinkAccountSubtypes.CASH_ISA);
--LinkAccountSubtypeInvestment.EDUCATION_SAVINGS_ACCOUNT = new LinkAccountSubtypeInvestment(LinkAccountType.INVESTMENT, LinkAccountSubtypes.EDUCATION_SAVINGS_ACCOUNT);
--LinkAccountSubtypeInvestment.FIXED_ANNUNITY = new LinkAccountSubtypeInvestment(LinkAccountType.INVESTMENT, LinkAccountSubtypes.FIXED_ANNUNITY);
--LinkAccountSubtypeInvestment.GIC = new LinkAccountSubtypeInvestment(LinkAccountType.INVESTMENT, LinkAccountSubtypes.GIC);
--LinkAccountSubtypeInvestment.HEALTH_REIMBURSEMENT_ARRANGEMENT = new LinkAccountSubtypeInvestment(LinkAccountType.INVESTMENT, LinkAccountSubtypes.HEALTH_REIMBURSEMENT_ARRANGEMENT);
--LinkAccountSubtypeInvestment.HSA = new LinkAccountSubtypeInvestment(LinkAccountType.INVESTMENT, LinkAccountSubtypes.HSA);
--LinkAccountSubtypeInvestment.INVESTMENT_401A = new LinkAccountSubtypeInvestment(LinkAccountType.INVESTMENT, LinkAccountSubtypes.FOUR_0_1_A);
--LinkAccountSubtypeInvestment.INVESTMENT_401K = new LinkAccountSubtypeInvestment(LinkAccountType.INVESTMENT, LinkAccountSubtypes.FOUR_0_1_K);
--LinkAccountSubtypeInvestment.INVESTMENT_403B = new LinkAccountSubtypeInvestment(LinkAccountType.INVESTMENT, LinkAccountSubtypes.FOUR_0_3_B);
--LinkAccountSubtypeInvestment.INVESTMENT_457B = new LinkAccountSubtypeInvestment(LinkAccountType.INVESTMENT, LinkAccountSubtypes.FOUR_5_7_B);
--LinkAccountSubtypeInvestment.INVESTMENT_529 = new LinkAccountSubtypeInvestment(LinkAccountType.INVESTMENT, LinkAccountSubtypes.FIVE_2_9);
--LinkAccountSubtypeInvestment.IRA = new LinkAccountSubtypeInvestment(LinkAccountType.INVESTMENT, LinkAccountSubtypes.IRA);
--LinkAccountSubtypeInvestment.ISA = new LinkAccountSubtypeInvestment(LinkAccountType.INVESTMENT, LinkAccountSubtypes.ISA);
--LinkAccountSubtypeInvestment.KEOGH = new LinkAccountSubtypeInvestment(LinkAccountType.INVESTMENT, LinkAccountSubtypes.KEOGH);
--LinkAccountSubtypeInvestment.LIF = new LinkAccountSubtypeInvestment(LinkAccountType.INVESTMENT, LinkAccountSubtypes.LIF);
--LinkAccountSubtypeInvestment.LIRA = new LinkAccountSubtypeInvestment(LinkAccountType.INVESTMENT, LinkAccountSubtypes.LIRA);
--LinkAccountSubtypeInvestment.LRIF = new LinkAccountSubtypeInvestment(LinkAccountType.INVESTMENT, LinkAccountSubtypes.LRIF);
--LinkAccountSubtypeInvestment.LRSP = new LinkAccountSubtypeInvestment(LinkAccountType.INVESTMENT, LinkAccountSubtypes.LRSP);
--LinkAccountSubtypeInvestment.MUTUAL_FUND = new LinkAccountSubtypeInvestment(LinkAccountType.INVESTMENT, LinkAccountSubtypes.MUTUAL_FUND);
--LinkAccountSubtypeInvestment.NON_TAXABLE_BROKERAGE_ACCOUNT = new LinkAccountSubtypeInvestment(LinkAccountType.INVESTMENT, LinkAccountSubtypes.NON_TAXABLE_BROKERAGE_ACCOUNT);
--LinkAccountSubtypeInvestment.PENSION = new LinkAccountSubtypeInvestment(LinkAccountType.INVESTMENT, LinkAccountSubtypes.PENSION);
--LinkAccountSubtypeInvestment.PLAN = new LinkAccountSubtypeInvestment(LinkAccountType.INVESTMENT, LinkAccountSubtypes.PLAN);
--LinkAccountSubtypeInvestment.PRIF = new LinkAccountSubtypeInvestment(LinkAccountType.INVESTMENT, LinkAccountSubtypes.PRIF);
--LinkAccountSubtypeInvestment.PROFIT_SHARING_PLAN = new LinkAccountSubtypeInvestment(LinkAccountType.INVESTMENT, LinkAccountSubtypes.PROFIT_SHARING_PLAN);
--LinkAccountSubtypeInvestment.RDSP = new LinkAccountSubtypeInvestment(LinkAccountType.INVESTMENT, LinkAccountSubtypes.RDSP);
--LinkAccountSubtypeInvestment.RESP = new LinkAccountSubtypeInvestment(LinkAccountType.INVESTMENT, LinkAccountSubtypes.RESP);
--LinkAccountSubtypeInvestment.RETIREMENT = new LinkAccountSubtypeInvestment(LinkAccountType.INVESTMENT, LinkAccountSubtypes.RETIREMENT);
--LinkAccountSubtypeInvestment.RLIF = new LinkAccountSubtypeInvestment(LinkAccountType.INVESTMENT, LinkAccountSubtypes.RLIF);
--LinkAccountSubtypeInvestment.ROTH = new LinkAccountSubtypeInvestment(LinkAccountType.INVESTMENT, LinkAccountSubtypes.ROTH);
--LinkAccountSubtypeInvestment.ROTH_401K = new LinkAccountSubtypeInvestment(LinkAccountType.INVESTMENT, LinkAccountSubtypes.ROTH_401K);
--LinkAccountSubtypeInvestment.RRIF = new LinkAccountSubtypeInvestment(LinkAccountType.INVESTMENT, LinkAccountSubtypes.RRIF);
--LinkAccountSubtypeInvestment.RRSP = new LinkAccountSubtypeInvestment(LinkAccountType.INVESTMENT, LinkAccountSubtypes.RRSP);
--LinkAccountSubtypeInvestment.SARSEP = new LinkAccountSubtypeInvestment(LinkAccountType.INVESTMENT, LinkAccountSubtypes.SARSEP);
--LinkAccountSubtypeInvestment.SEP_IRA = new LinkAccountSubtypeInvestment(LinkAccountType.INVESTMENT, LinkAccountSubtypes.SEP_IRA);
--LinkAccountSubtypeInvestment.SIMPLE_IRA = new LinkAccountSubtypeInvestment(LinkAccountType.INVESTMENT, LinkAccountSubtypes.SIMPLE_IRA);
--LinkAccountSubtypeInvestment.SIIP = new LinkAccountSubtypeInvestment(LinkAccountType.INVESTMENT, LinkAccountSubtypes.SIPP);
--LinkAccountSubtypeInvestment.STOCK_PLAN = new LinkAccountSubtypeInvestment(LinkAccountType.INVESTMENT, LinkAccountSubtypes.STOCK_PLAN);
--LinkAccountSubtypeInvestment.TFSA = new LinkAccountSubtypeInvestment(LinkAccountType.INVESTMENT, LinkAccountSubtypes.TFSA);
--LinkAccountSubtypeInvestment.THRIFT_SAVINGS_PLAN = new LinkAccountSubtypeInvestment(LinkAccountType.INVESTMENT, LinkAccountSubtypes.THRIFT_SAVINGS_PLAN);
--LinkAccountSubtypeInvestment.TRUST = new LinkAccountSubtypeInvestment(LinkAccountType.INVESTMENT, LinkAccountSubtypes.TRUST);
--LinkAccountSubtypeInvestment.UGMA = new LinkAccountSubtypeInvestment(LinkAccountType.INVESTMENT, LinkAccountSubtypes.UGMA);
--LinkAccountSubtypeInvestment.UTMA = new LinkAccountSubtypeInvestment(LinkAccountType.INVESTMENT, LinkAccountSubtypes.UTMA);
--LinkAccountSubtypeInvestment.VARIABLE_ANNUITY = new LinkAccountSubtypeInvestment(LinkAccountType.INVESTMENT, LinkAccountSubtypes.VARIABLE_ANNUITY);
-+LinkAccountSubtypeInvestment.ALL = new LinkAccountSubtypeInvestment(
-+  LinkAccountType.INVESTMENT,
-+  LinkAccountSubtypes.ALL,
-+);
-+LinkAccountSubtypeInvestment.BROKERAGE = new LinkAccountSubtypeInvestment(
-+  LinkAccountType.INVESTMENT,
-+  LinkAccountSubtypes.BROKERAGE,
-+);
-+LinkAccountSubtypeInvestment.CASH_ISA = new LinkAccountSubtypeInvestment(
-+  LinkAccountType.INVESTMENT,
-+  LinkAccountSubtypes.CASH_ISA,
-+);
-+LinkAccountSubtypeInvestment.EDUCATION_SAVINGS_ACCOUNT = new LinkAccountSubtypeInvestment(
-+  LinkAccountType.INVESTMENT,
-+  LinkAccountSubtypes.EDUCATION_SAVINGS_ACCOUNT,
-+);
-+LinkAccountSubtypeInvestment.FIXED_ANNUNITY = new LinkAccountSubtypeInvestment(
-+  LinkAccountType.INVESTMENT,
-+  LinkAccountSubtypes.FIXED_ANNUNITY,
-+);
-+LinkAccountSubtypeInvestment.GIC = new LinkAccountSubtypeInvestment(
-+  LinkAccountType.INVESTMENT,
-+  LinkAccountSubtypes.GIC,
-+);
-+LinkAccountSubtypeInvestment.HEALTH_REIMBURSEMENT_ARRANGEMENT = new LinkAccountSubtypeInvestment(
-+  LinkAccountType.INVESTMENT,
-+  LinkAccountSubtypes.HEALTH_REIMBURSEMENT_ARRANGEMENT,
-+);
-+LinkAccountSubtypeInvestment.HSA = new LinkAccountSubtypeInvestment(
-+  LinkAccountType.INVESTMENT,
-+  LinkAccountSubtypes.HSA,
-+);
-+LinkAccountSubtypeInvestment.INVESTMENT_401A = new LinkAccountSubtypeInvestment(
-+  LinkAccountType.INVESTMENT,
-+  LinkAccountSubtypes.FOUR_0_1_A,
-+);
-+LinkAccountSubtypeInvestment.INVESTMENT_401K = new LinkAccountSubtypeInvestment(
-+  LinkAccountType.INVESTMENT,
-+  LinkAccountSubtypes.FOUR_0_1_K,
-+);
-+LinkAccountSubtypeInvestment.INVESTMENT_403B = new LinkAccountSubtypeInvestment(
-+  LinkAccountType.INVESTMENT,
-+  LinkAccountSubtypes.FOUR_0_3_B,
-+);
-+LinkAccountSubtypeInvestment.INVESTMENT_457B = new LinkAccountSubtypeInvestment(
-+  LinkAccountType.INVESTMENT,
-+  LinkAccountSubtypes.FOUR_5_7_B,
-+);
-+LinkAccountSubtypeInvestment.INVESTMENT_529 = new LinkAccountSubtypeInvestment(
-+  LinkAccountType.INVESTMENT,
-+  LinkAccountSubtypes.FIVE_2_9,
-+);
-+LinkAccountSubtypeInvestment.IRA = new LinkAccountSubtypeInvestment(
-+  LinkAccountType.INVESTMENT,
-+  LinkAccountSubtypes.IRA,
-+);
-+LinkAccountSubtypeInvestment.ISA = new LinkAccountSubtypeInvestment(
-+  LinkAccountType.INVESTMENT,
-+  LinkAccountSubtypes.ISA,
-+);
-+LinkAccountSubtypeInvestment.KEOGH = new LinkAccountSubtypeInvestment(
-+  LinkAccountType.INVESTMENT,
-+  LinkAccountSubtypes.KEOGH,
-+);
-+LinkAccountSubtypeInvestment.LIF = new LinkAccountSubtypeInvestment(
-+  LinkAccountType.INVESTMENT,
-+  LinkAccountSubtypes.LIF,
-+);
-+LinkAccountSubtypeInvestment.LIRA = new LinkAccountSubtypeInvestment(
-+  LinkAccountType.INVESTMENT,
-+  LinkAccountSubtypes.LIRA,
-+);
-+LinkAccountSubtypeInvestment.LRIF = new LinkAccountSubtypeInvestment(
-+  LinkAccountType.INVESTMENT,
-+  LinkAccountSubtypes.LRIF,
-+);
-+LinkAccountSubtypeInvestment.LRSP = new LinkAccountSubtypeInvestment(
-+  LinkAccountType.INVESTMENT,
-+  LinkAccountSubtypes.LRSP,
-+);
-+LinkAccountSubtypeInvestment.MUTUAL_FUND = new LinkAccountSubtypeInvestment(
-+  LinkAccountType.INVESTMENT,
-+  LinkAccountSubtypes.MUTUAL_FUND,
-+);
-+LinkAccountSubtypeInvestment.NON_TAXABLE_BROKERAGE_ACCOUNT = new LinkAccountSubtypeInvestment(
-+  LinkAccountType.INVESTMENT,
-+  LinkAccountSubtypes.NON_TAXABLE_BROKERAGE_ACCOUNT,
-+);
-+LinkAccountSubtypeInvestment.PENSION = new LinkAccountSubtypeInvestment(
-+  LinkAccountType.INVESTMENT,
-+  LinkAccountSubtypes.PENSION,
-+);
-+LinkAccountSubtypeInvestment.PLAN = new LinkAccountSubtypeInvestment(
-+  LinkAccountType.INVESTMENT,
-+  LinkAccountSubtypes.PLAN,
-+);
-+LinkAccountSubtypeInvestment.PRIF = new LinkAccountSubtypeInvestment(
-+  LinkAccountType.INVESTMENT,
-+  LinkAccountSubtypes.PRIF,
-+);
-+LinkAccountSubtypeInvestment.PROFIT_SHARING_PLAN = new LinkAccountSubtypeInvestment(
-+  LinkAccountType.INVESTMENT,
-+  LinkAccountSubtypes.PROFIT_SHARING_PLAN,
-+);
-+LinkAccountSubtypeInvestment.RDSP = new LinkAccountSubtypeInvestment(
-+  LinkAccountType.INVESTMENT,
-+  LinkAccountSubtypes.RDSP,
-+);
-+LinkAccountSubtypeInvestment.RESP = new LinkAccountSubtypeInvestment(
-+  LinkAccountType.INVESTMENT,
-+  LinkAccountSubtypes.RESP,
-+);
-+LinkAccountSubtypeInvestment.RETIREMENT = new LinkAccountSubtypeInvestment(
-+  LinkAccountType.INVESTMENT,
-+  LinkAccountSubtypes.RETIREMENT,
-+);
-+LinkAccountSubtypeInvestment.RLIF = new LinkAccountSubtypeInvestment(
-+  LinkAccountType.INVESTMENT,
-+  LinkAccountSubtypes.RLIF,
-+);
-+LinkAccountSubtypeInvestment.ROTH = new LinkAccountSubtypeInvestment(
-+  LinkAccountType.INVESTMENT,
-+  LinkAccountSubtypes.ROTH,
-+);
-+LinkAccountSubtypeInvestment.ROTH_401K = new LinkAccountSubtypeInvestment(
-+  LinkAccountType.INVESTMENT,
-+  LinkAccountSubtypes.ROTH_401K,
-+);
-+LinkAccountSubtypeInvestment.RRIF = new LinkAccountSubtypeInvestment(
-+  LinkAccountType.INVESTMENT,
-+  LinkAccountSubtypes.RRIF,
-+);
-+LinkAccountSubtypeInvestment.RRSP = new LinkAccountSubtypeInvestment(
-+  LinkAccountType.INVESTMENT,
-+  LinkAccountSubtypes.RRSP,
-+);
-+LinkAccountSubtypeInvestment.SARSEP = new LinkAccountSubtypeInvestment(
-+  LinkAccountType.INVESTMENT,
-+  LinkAccountSubtypes.SARSEP,
-+);
-+LinkAccountSubtypeInvestment.SEP_IRA = new LinkAccountSubtypeInvestment(
-+  LinkAccountType.INVESTMENT,
-+  LinkAccountSubtypes.SEP_IRA,
-+);
-+LinkAccountSubtypeInvestment.SIMPLE_IRA = new LinkAccountSubtypeInvestment(
-+  LinkAccountType.INVESTMENT,
-+  LinkAccountSubtypes.SIMPLE_IRA,
-+);
-+LinkAccountSubtypeInvestment.SIIP = new LinkAccountSubtypeInvestment(
-+  LinkAccountType.INVESTMENT,
-+  LinkAccountSubtypes.SIPP,
-+);
-+LinkAccountSubtypeInvestment.STOCK_PLAN = new LinkAccountSubtypeInvestment(
-+  LinkAccountType.INVESTMENT,
-+  LinkAccountSubtypes.STOCK_PLAN,
-+);
-+LinkAccountSubtypeInvestment.TFSA = new LinkAccountSubtypeInvestment(
-+  LinkAccountType.INVESTMENT,
-+  LinkAccountSubtypes.TFSA,
-+);
-+LinkAccountSubtypeInvestment.THRIFT_SAVINGS_PLAN = new LinkAccountSubtypeInvestment(
-+  LinkAccountType.INVESTMENT,
-+  LinkAccountSubtypes.THRIFT_SAVINGS_PLAN,
-+);
-+LinkAccountSubtypeInvestment.TRUST = new LinkAccountSubtypeInvestment(
-+  LinkAccountType.INVESTMENT,
-+  LinkAccountSubtypes.TRUST,
-+);
-+LinkAccountSubtypeInvestment.UGMA = new LinkAccountSubtypeInvestment(
-+  LinkAccountType.INVESTMENT,
-+  LinkAccountSubtypes.UGMA,
-+);
-+LinkAccountSubtypeInvestment.UTMA = new LinkAccountSubtypeInvestment(
-+  LinkAccountType.INVESTMENT,
-+  LinkAccountSubtypes.UTMA,
-+);
-+LinkAccountSubtypeInvestment.VARIABLE_ANNUITY = new LinkAccountSubtypeInvestment(
-+  LinkAccountType.INVESTMENT,
-+  LinkAccountSubtypes.VARIABLE_ANNUITY,
-+);
- export class LinkAccountSubtypeLoan {
--    constructor(type, subtype) {
--        this.type = type;
--        this.subtype = subtype;
--    }
-+  constructor(type, subtype) {
-+    this.type = type;
-+    this.subtype = subtype;
-+  }
- }
--LinkAccountSubtypeLoan.ALL = new LinkAccountSubtypeLoan(LinkAccountType.CREDIT, LinkAccountSubtypes.ALL);
--LinkAccountSubtypeLoan.AUTO = new LinkAccountSubtypeLoan(LinkAccountType.CREDIT, LinkAccountSubtypes.AUTO);
--LinkAccountSubtypeLoan.BUSINESS = new LinkAccountSubtypeLoan(LinkAccountType.CREDIT, LinkAccountSubtypes.BUSINESS);
--LinkAccountSubtypeLoan.COMMERCIAL = new LinkAccountSubtypeLoan(LinkAccountType.CREDIT, LinkAccountSubtypes.COMMERCIAL);
--LinkAccountSubtypeLoan.CONSTRUCTION = new LinkAccountSubtypeLoan(LinkAccountType.CREDIT, LinkAccountSubtypes.CONSTRUCTION);
--LinkAccountSubtypeLoan.CONSUMER = new LinkAccountSubtypeLoan(LinkAccountType.CREDIT, LinkAccountSubtypes.CONSUMER);
--LinkAccountSubtypeLoan.HOME_EQUITY = new LinkAccountSubtypeLoan(LinkAccountType.CREDIT, LinkAccountSubtypes.HOME_EQUITY);
--LinkAccountSubtypeLoan.LINE_OF_CREDIT = new LinkAccountSubtypeLoan(LinkAccountType.CREDIT, LinkAccountSubtypes.LINE_OF_CREDIT);
--LinkAccountSubtypeLoan.LOAN = new LinkAccountSubtypeLoan(LinkAccountType.CREDIT, LinkAccountSubtypes.LOAN);
--LinkAccountSubtypeLoan.MORTGAGE = new LinkAccountSubtypeLoan(LinkAccountType.CREDIT, LinkAccountSubtypes.MORTGAGE);
--LinkAccountSubtypeLoan.OVERDRAFT = new LinkAccountSubtypeLoan(LinkAccountType.CREDIT, LinkAccountSubtypes.OVERDRAFT);
--LinkAccountSubtypeLoan.STUDENT = new LinkAccountSubtypeLoan(LinkAccountType.CREDIT, LinkAccountSubtypes.STUDENT);
-+LinkAccountSubtypeLoan.ALL = new LinkAccountSubtypeLoan(
-+  LinkAccountType.CREDIT,
-+  LinkAccountSubtypes.ALL,
-+);
-+LinkAccountSubtypeLoan.AUTO = new LinkAccountSubtypeLoan(
-+  LinkAccountType.CREDIT,
-+  LinkAccountSubtypes.AUTO,
-+);
-+LinkAccountSubtypeLoan.BUSINESS = new LinkAccountSubtypeLoan(
-+  LinkAccountType.CREDIT,
-+  LinkAccountSubtypes.BUSINESS,
-+);
-+LinkAccountSubtypeLoan.COMMERCIAL = new LinkAccountSubtypeLoan(
-+  LinkAccountType.CREDIT,
-+  LinkAccountSubtypes.COMMERCIAL,
-+);
-+LinkAccountSubtypeLoan.CONSTRUCTION = new LinkAccountSubtypeLoan(
-+  LinkAccountType.CREDIT,
-+  LinkAccountSubtypes.CONSTRUCTION,
-+);
-+LinkAccountSubtypeLoan.CONSUMER = new LinkAccountSubtypeLoan(
-+  LinkAccountType.CREDIT,
-+  LinkAccountSubtypes.CONSUMER,
-+);
-+LinkAccountSubtypeLoan.HOME_EQUITY = new LinkAccountSubtypeLoan(
-+  LinkAccountType.CREDIT,
-+  LinkAccountSubtypes.HOME_EQUITY,
-+);
-+LinkAccountSubtypeLoan.LINE_OF_CREDIT = new LinkAccountSubtypeLoan(
-+  LinkAccountType.CREDIT,
-+  LinkAccountSubtypes.LINE_OF_CREDIT,
-+);
-+LinkAccountSubtypeLoan.LOAN = new LinkAccountSubtypeLoan(
-+  LinkAccountType.CREDIT,
-+  LinkAccountSubtypes.LOAN,
-+);
-+LinkAccountSubtypeLoan.MORTGAGE = new LinkAccountSubtypeLoan(
-+  LinkAccountType.CREDIT,
-+  LinkAccountSubtypes.MORTGAGE,
-+);
-+LinkAccountSubtypeLoan.OVERDRAFT = new LinkAccountSubtypeLoan(
-+  LinkAccountType.CREDIT,
-+  LinkAccountSubtypes.OVERDRAFT,
-+);
-+LinkAccountSubtypeLoan.STUDENT = new LinkAccountSubtypeLoan(
-+  LinkAccountType.CREDIT,
-+  LinkAccountSubtypes.STUDENT,
-+);
- export class LinkAccountSubtypeUnknown {
--    constructor(type, subtype) {
--        this.type = type;
--        this.subtype = subtype;
--    }
-+  constructor(type, subtype) {
-+    this.type = type;
-+    this.subtype = subtype;
-+  }
- }
- export var LinkAccountVerificationStatus;
--(function (LinkAccountVerificationStatus) {
--    LinkAccountVerificationStatus["PENDING_AUTOMATIC_VERIFICATION"] = "pending_automatic_verification";
--    LinkAccountVerificationStatus["PENDING_MANUAL_VERIFICATION"] = "pending_manual_verification";
--    LinkAccountVerificationStatus["MANUALLY_VERIFIED"] = "manually_verified";
-+(function(LinkAccountVerificationStatus) {
-+  LinkAccountVerificationStatus['PENDING_AUTOMATIC_VERIFICATION'] =
-+    'pending_automatic_verification';
-+  LinkAccountVerificationStatus['PENDING_MANUAL_VERIFICATION'] =
-+    'pending_manual_verification';
-+  LinkAccountVerificationStatus['MANUALLY_VERIFIED'] = 'manually_verified';
- })(LinkAccountVerificationStatus || (LinkAccountVerificationStatus = {}));
- export var LinkExitMetadataStatus;
--(function (LinkExitMetadataStatus) {
--    LinkExitMetadataStatus["CONNECTED"] = "connected";
--    LinkExitMetadataStatus["CHOOSE_DEVICE"] = "choose_device";
--    LinkExitMetadataStatus["REQUIRES_ACCOUNT_SELECTION"] = "requires_account_selection";
--    LinkExitMetadataStatus["REQUIRES_CODE"] = "requires_code";
--    LinkExitMetadataStatus["REQUIRES_CREDENTIALS"] = "requires_credentials";
--    LinkExitMetadataStatus["REQUIRES_EXTERNAL_ACTION"] = "requires_external_action";
--    LinkExitMetadataStatus["REQUIRES_OAUTH"] = "requires_oauth";
--    LinkExitMetadataStatus["REQUIRES_QUESTIONS"] = "requires_questions";
--    LinkExitMetadataStatus["REQUIRES_RECAPTCHA"] = "requires_recaptcha";
--    LinkExitMetadataStatus["REQUIRES_SELECTIONS"] = "requires_selections";
--    LinkExitMetadataStatus["REQUIRES_DEPOSIT_SWITCH_ALLOCATION_CONFIGURATION"] = "requires_deposit_switch_allocation_configuration";
--    LinkExitMetadataStatus["REQUIRES_DEPOSIT_SWITCH_ALLOCATION_SELECTION"] = "requires_deposit_switch_allocation_selection";
-+(function(LinkExitMetadataStatus) {
-+  LinkExitMetadataStatus['CONNECTED'] = 'connected';
-+  LinkExitMetadataStatus['CHOOSE_DEVICE'] = 'choose_device';
-+  LinkExitMetadataStatus['REQUIRES_ACCOUNT_SELECTION'] =
-+    'requires_account_selection';
-+  LinkExitMetadataStatus['REQUIRES_CODE'] = 'requires_code';
-+  LinkExitMetadataStatus['REQUIRES_CREDENTIALS'] = 'requires_credentials';
-+  LinkExitMetadataStatus['REQUIRES_EXTERNAL_ACTION'] =
-+    'requires_external_action';
-+  LinkExitMetadataStatus['REQUIRES_OAUTH'] = 'requires_oauth';
-+  LinkExitMetadataStatus['REQUIRES_QUESTIONS'] = 'requires_questions';
-+  LinkExitMetadataStatus['REQUIRES_RECAPTCHA'] = 'requires_recaptcha';
-+  LinkExitMetadataStatus['REQUIRES_SELECTIONS'] = 'requires_selections';
-+  LinkExitMetadataStatus['REQUIRES_DEPOSIT_SWITCH_ALLOCATION_CONFIGURATION'] =
-+    'requires_deposit_switch_allocation_configuration';
-+  LinkExitMetadataStatus['REQUIRES_DEPOSIT_SWITCH_ALLOCATION_SELECTION'] =
-+    'requires_deposit_switch_allocation_selection';
- })(LinkExitMetadataStatus || (LinkExitMetadataStatus = {}));
- export var LinkErrorCode;
--(function (LinkErrorCode) {
--    // ITEM_ERROR
--    LinkErrorCode["INVALID_CREDENTIALS"] = "INVALID_CREDENTIALS";
--    LinkErrorCode["INVALID_MFA"] = "INVALID_MFA";
--    LinkErrorCode["ITEM_LOGIN_REQUIRED"] = "ITEM_LOGIN_REQUIRED";
--    LinkErrorCode["INSUFFICIENT_CREDENTIALS"] = "INSUFFICIENT_CREDENTIALS";
--    LinkErrorCode["ITEM_LOCKED"] = "ITEM_LOCKED";
--    LinkErrorCode["USER_SETUP_REQUIRED"] = "USER_SETUP_REQUIRED";
--    LinkErrorCode["MFA_NOT_SUPPORTED"] = "MFA_NOT_SUPPORTED";
--    LinkErrorCode["INVALID_SEND_METHOD"] = "INVALID_SEND_METHOD";
--    LinkErrorCode["NO_ACCOUNTS"] = "NO_ACCOUNTS";
--    LinkErrorCode["ITEM_NOT_SUPPORTED"] = "ITEM_NOT_SUPPORTED";
--    LinkErrorCode["TOO_MANY_VERIFICATION_ATTEMPTS"] = "TOO_MANY_VERIFICATION_ATTEMPTS";
--    LinkErrorCode["INVALD_UPDATED_USERNAME"] = "INVALD_UPDATED_USERNAME";
--    LinkErrorCode["INVALID_UPDATED_USERNAME"] = "INVALID_UPDATED_USERNAME";
--    LinkErrorCode["ITEM_NO_ERROR"] = "ITEM_NO_ERROR";
--    LinkErrorCode["item_no_error"] = "item-no-error";
--    LinkErrorCode["NO_AUTH_ACCOUNTS"] = "NO_AUTH_ACCOUNTS";
--    LinkErrorCode["NO_INVESTMENT_ACCOUNTS"] = "NO_INVESTMENT_ACCOUNTS";
--    LinkErrorCode["NO_INVESTMENT_AUTH_ACCOUNTS"] = "NO_INVESTMENT_AUTH_ACCOUNTS";
--    LinkErrorCode["NO_LIABILITY_ACCOUNTS"] = "NO_LIABILITY_ACCOUNTS";
--    LinkErrorCode["PRODUCTS_NOT_SUPPORTED"] = "PRODUCTS_NOT_SUPPORTED";
--    LinkErrorCode["ITEM_NOT_FOUND"] = "ITEM_NOT_FOUND";
--    LinkErrorCode["ITEM_PRODUCT_NOT_READY"] = "ITEM_PRODUCT_NOT_READY";
--    // INSTITUTION_ERROR
--    LinkErrorCode["INSTITUTION_DOWN"] = "INSTITUTION_DOWN";
--    LinkErrorCode["INSTITUTION_NOT_RESPONDING"] = "INSTITUTION_NOT_RESPONDING";
--    LinkErrorCode["INSTITUTION_NOT_AVAILABLE"] = "INSTITUTION_NOT_AVAILABLE";
--    LinkErrorCode["INSTITUTION_NO_LONGER_SUPPORTED"] = "INSTITUTION_NO_LONGER_SUPPORTED";
--    // API_ERROR
--    LinkErrorCode["INTERNAL_SERVER_ERROR"] = "INTERNAL_SERVER_ERROR";
--    LinkErrorCode["PLANNED_MAINTENANCE"] = "PLANNED_MAINTENANCE";
--    // ASSET_REPORT_ERROR
--    LinkErrorCode["PRODUCT_NOT_ENABLED"] = "PRODUCT_NOT_ENABLED";
--    LinkErrorCode["DATA_UNAVAILABLE"] = "DATA_UNAVAILABLE";
--    LinkErrorCode["ASSET_PRODUCT_NOT_READY"] = "ASSET_PRODUCT_NOT_READY";
--    LinkErrorCode["ASSET_REPORT_GENERATION_FAILED"] = "ASSET_REPORT_GENERATION_FAILED";
--    LinkErrorCode["INVALID_PARENT"] = "INVALID_PARENT";
--    LinkErrorCode["INSIGHTS_NOT_ENABLED"] = "INSIGHTS_NOT_ENABLED";
--    LinkErrorCode["INSIGHTS_PREVIOUSLY_NOT_ENABLED"] = "INSIGHTS_PREVIOUSLY_NOT_ENABLED";
--    // BANK_TRANSFER_ERROR
--    LinkErrorCode["BANK_TRANSFER_LIMIT_EXCEEDED"] = "BANK_TRANSFER_LIMIT_EXCEEDED";
--    LinkErrorCode["BANK_TRANSFER_MISSING_ORIGINATION_ACCOUNT"] = "BANK_TRANSFER_MISSING_ORIGINATION_ACCOUNT";
--    LinkErrorCode["BANK_TRANSFER_INVALID_ORIGINATION_ACCOUNT"] = "BANK_TRANSFER_INVALID_ORIGINATION_ACCOUNT";
--    LinkErrorCode["BANK_TRANSFER_ACCOUNT_BLOCKED"] = "BANK_TRANSFER_ACCOUNT_BLOCKED";
--    LinkErrorCode["BANK_TRANSFER_INSUFFICIENT_FUNDS"] = "BANK_TRANSFER_INSUFFICIENT_FUNDS";
--    LinkErrorCode["BANK_TRANSFER_NOT_CANCELLABLE"] = "BANK_TRANSFER_NOT_CANCELLABLE";
--    LinkErrorCode["BANK_TRANSFER_UNSUPPORTED_ACCOUNT_TYPE"] = "BANK_TRANSFER_UNSUPPORTED_ACCOUNT_TYPE";
--    LinkErrorCode["BANK_TRANSFER_UNSUPPORTED_ENVIRONMENT"] = "BANK_TRANSFER_UNSUPPORTED_ENVIRONMENT";
--    // SANDBOX_ERROR
--    LinkErrorCode["SANDBOX_PRODUCT_NOT_ENABLED"] = "SANDBOX_PRODUCT_NOT_ENABLED";
--    LinkErrorCode["SANDBOX_WEBHOOK_INVALID"] = "SANDBOX_WEBHOOK_INVALID";
--    LinkErrorCode["SANDBOX_BANK_TRANSFER_EVENT_TRANSITION_INVALID"] = "SANDBOX_BANK_TRANSFER_EVENT_TRANSITION_INVALID";
--    // INVALID_REQUEST
--    LinkErrorCode["MISSING_FIELDS"] = "MISSING_FIELDS";
--    LinkErrorCode["UNKNOWN_FIELDS"] = "UNKNOWN_FIELDS";
--    LinkErrorCode["INVALID_FIELD"] = "INVALID_FIELD";
--    LinkErrorCode["INCOMPATIBLE_API_VERSION"] = "INCOMPATIBLE_API_VERSION";
--    LinkErrorCode["INVALID_BODY"] = "INVALID_BODY";
--    LinkErrorCode["INVALID_HEADERS"] = "INVALID_HEADERS";
--    LinkErrorCode["NOT_FOUND"] = "NOT_FOUND";
--    LinkErrorCode["NO_LONGER_AVAILABLE"] = "NO_LONGER_AVAILABLE";
--    LinkErrorCode["SANDBOX_ONLY"] = "SANDBOX_ONLY";
--    LinkErrorCode["INVALID_ACCOUNT_NUMBER"] = "INVALID_ACCOUNT_NUMBER";
--    // INVALID_INPUT
--    // From above ITEM_LOGIN_REQUIRED = "INVALID_CREDENTIALS",
--    LinkErrorCode["INCORRECT_DEPOSIT_AMOUNTS"] = "INCORRECT_DEPOSIT_AMOUNTS";
--    LinkErrorCode["UNAUTHORIZED_ENVIRONMENT"] = "UNAUTHORIZED_ENVIRONMENT";
--    LinkErrorCode["INVALID_PRODUCT"] = "INVALID_PRODUCT";
--    LinkErrorCode["UNAUTHORIZED_ROUTE_ACCESS"] = "UNAUTHORIZED_ROUTE_ACCESS";
--    LinkErrorCode["DIRECT_INTEGRATION_NOT_ENABLED"] = "DIRECT_INTEGRATION_NOT_ENABLED";
--    LinkErrorCode["INVALID_API_KEYS"] = "INVALID_API_KEYS";
--    LinkErrorCode["INVALID_ACCESS_TOKEN"] = "INVALID_ACCESS_TOKEN";
--    LinkErrorCode["INVALID_PUBLIC_TOKEN"] = "INVALID_PUBLIC_TOKEN";
--    LinkErrorCode["INVALID_LINK_TOKEN"] = "INVALID_LINK_TOKEN";
--    LinkErrorCode["INVALID_PROCESSOR_TOKEN"] = "INVALID_PROCESSOR_TOKEN";
--    LinkErrorCode["INVALID_AUDIT_COPY_TOKEN"] = "INVALID_AUDIT_COPY_TOKEN";
--    LinkErrorCode["INVALID_ACCOUNT_ID"] = "INVALID_ACCOUNT_ID";
--    LinkErrorCode["MICRODEPOSITS_ALREADY_VERIFIED"] = "MICRODEPOSITS_ALREADY_VERIFIED";
--    // INVALID_RESULT
--    LinkErrorCode["PLAID_DIRECT_ITEM_IMPORT_RETURNED_INVALID_MFA"] = "PLAID_DIRECT_ITEM_IMPORT_RETURNED_INVALID_MFA";
--    // RATE_LIMIT_EXCEEDED
--    LinkErrorCode["ACCOUNTS_LIMIT"] = "ACCOUNTS_LIMIT";
--    LinkErrorCode["ADDITION_LIMIT"] = "ADDITION_LIMIT";
--    LinkErrorCode["AUTH_LIMIT"] = "AUTH_LIMIT";
--    LinkErrorCode["BALANCE_LIMIT"] = "BALANCE_LIMIT";
--    LinkErrorCode["IDENTITY_LIMIT"] = "IDENTITY_LIMIT";
--    LinkErrorCode["ITEM_GET_LIMIT"] = "ITEM_GET_LIMIT";
--    LinkErrorCode["RATE_LIMIT"] = "RATE_LIMIT";
--    LinkErrorCode["TRANSACTIONS_LIMIT"] = "TRANSACTIONS_LIMIT";
--    // RECAPTCHA_ERROR
--    LinkErrorCode["RECAPTCHA_REQUIRED"] = "RECAPTCHA_REQUIRED";
--    LinkErrorCode["RECAPTCHA_BAD"] = "RECAPTCHA_BAD";
--    // OAUTH_ERROR
--    LinkErrorCode["INCORRECT_OAUTH_NONCE"] = "INCORRECT_OAUTH_NONCE";
--    LinkErrorCode["OAUTH_STATE_ID_ALREADY_PROCESSED"] = "OAUTH_STATE_ID_ALREADY_PROCESSED";
-+(function(LinkErrorCode) {
-+  // ITEM_ERROR
-+  LinkErrorCode['INVALID_CREDENTIALS'] = 'INVALID_CREDENTIALS';
-+  LinkErrorCode['INVALID_MFA'] = 'INVALID_MFA';
-+  LinkErrorCode['ITEM_LOGIN_REQUIRED'] = 'ITEM_LOGIN_REQUIRED';
-+  LinkErrorCode['INSUFFICIENT_CREDENTIALS'] = 'INSUFFICIENT_CREDENTIALS';
-+  LinkErrorCode['ITEM_LOCKED'] = 'ITEM_LOCKED';
-+  LinkErrorCode['USER_SETUP_REQUIRED'] = 'USER_SETUP_REQUIRED';
-+  LinkErrorCode['MFA_NOT_SUPPORTED'] = 'MFA_NOT_SUPPORTED';
-+  LinkErrorCode['INVALID_SEND_METHOD'] = 'INVALID_SEND_METHOD';
-+  LinkErrorCode['NO_ACCOUNTS'] = 'NO_ACCOUNTS';
-+  LinkErrorCode['ITEM_NOT_SUPPORTED'] = 'ITEM_NOT_SUPPORTED';
-+  LinkErrorCode['TOO_MANY_VERIFICATION_ATTEMPTS'] =
-+    'TOO_MANY_VERIFICATION_ATTEMPTS';
-+  LinkErrorCode['INVALD_UPDATED_USERNAME'] = 'INVALD_UPDATED_USERNAME';
-+  LinkErrorCode['INVALID_UPDATED_USERNAME'] = 'INVALID_UPDATED_USERNAME';
-+  LinkErrorCode['ITEM_NO_ERROR'] = 'ITEM_NO_ERROR';
-+  LinkErrorCode['item_no_error'] = 'item-no-error';
-+  LinkErrorCode['NO_AUTH_ACCOUNTS'] = 'NO_AUTH_ACCOUNTS';
-+  LinkErrorCode['NO_INVESTMENT_ACCOUNTS'] = 'NO_INVESTMENT_ACCOUNTS';
-+  LinkErrorCode['NO_INVESTMENT_AUTH_ACCOUNTS'] = 'NO_INVESTMENT_AUTH_ACCOUNTS';
-+  LinkErrorCode['NO_LIABILITY_ACCOUNTS'] = 'NO_LIABILITY_ACCOUNTS';
-+  LinkErrorCode['PRODUCTS_NOT_SUPPORTED'] = 'PRODUCTS_NOT_SUPPORTED';
-+  LinkErrorCode['ITEM_NOT_FOUND'] = 'ITEM_NOT_FOUND';
-+  LinkErrorCode['ITEM_PRODUCT_NOT_READY'] = 'ITEM_PRODUCT_NOT_READY';
-+  // INSTITUTION_ERROR
-+  LinkErrorCode['INSTITUTION_DOWN'] = 'INSTITUTION_DOWN';
-+  LinkErrorCode['INSTITUTION_NOT_RESPONDING'] = 'INSTITUTION_NOT_RESPONDING';
-+  LinkErrorCode['INSTITUTION_NOT_AVAILABLE'] = 'INSTITUTION_NOT_AVAILABLE';
-+  LinkErrorCode['INSTITUTION_NO_LONGER_SUPPORTED'] =
-+    'INSTITUTION_NO_LONGER_SUPPORTED';
-+  // API_ERROR
-+  LinkErrorCode['INTERNAL_SERVER_ERROR'] = 'INTERNAL_SERVER_ERROR';
-+  LinkErrorCode['PLANNED_MAINTENANCE'] = 'PLANNED_MAINTENANCE';
-+  // ASSET_REPORT_ERROR
-+  LinkErrorCode['PRODUCT_NOT_ENABLED'] = 'PRODUCT_NOT_ENABLED';
-+  LinkErrorCode['DATA_UNAVAILABLE'] = 'DATA_UNAVAILABLE';
-+  LinkErrorCode['ASSET_PRODUCT_NOT_READY'] = 'ASSET_PRODUCT_NOT_READY';
-+  LinkErrorCode['ASSET_REPORT_GENERATION_FAILED'] =
-+    'ASSET_REPORT_GENERATION_FAILED';
-+  LinkErrorCode['INVALID_PARENT'] = 'INVALID_PARENT';
-+  LinkErrorCode['INSIGHTS_NOT_ENABLED'] = 'INSIGHTS_NOT_ENABLED';
-+  LinkErrorCode['INSIGHTS_PREVIOUSLY_NOT_ENABLED'] =
-+    'INSIGHTS_PREVIOUSLY_NOT_ENABLED';
-+  // BANK_TRANSFER_ERROR
-+  LinkErrorCode['BANK_TRANSFER_LIMIT_EXCEEDED'] =
-+    'BANK_TRANSFER_LIMIT_EXCEEDED';
-+  LinkErrorCode['BANK_TRANSFER_MISSING_ORIGINATION_ACCOUNT'] =
-+    'BANK_TRANSFER_MISSING_ORIGINATION_ACCOUNT';
-+  LinkErrorCode['BANK_TRANSFER_INVALID_ORIGINATION_ACCOUNT'] =
-+    'BANK_TRANSFER_INVALID_ORIGINATION_ACCOUNT';
-+  LinkErrorCode['BANK_TRANSFER_ACCOUNT_BLOCKED'] =
-+    'BANK_TRANSFER_ACCOUNT_BLOCKED';
-+  LinkErrorCode['BANK_TRANSFER_INSUFFICIENT_FUNDS'] =
-+    'BANK_TRANSFER_INSUFFICIENT_FUNDS';
-+  LinkErrorCode['BANK_TRANSFER_NOT_CANCELLABLE'] =
-+    'BANK_TRANSFER_NOT_CANCELLABLE';
-+  LinkErrorCode['BANK_TRANSFER_UNSUPPORTED_ACCOUNT_TYPE'] =
-+    'BANK_TRANSFER_UNSUPPORTED_ACCOUNT_TYPE';
-+  LinkErrorCode['BANK_TRANSFER_UNSUPPORTED_ENVIRONMENT'] =
-+    'BANK_TRANSFER_UNSUPPORTED_ENVIRONMENT';
-+  // SANDBOX_ERROR
-+  LinkErrorCode['SANDBOX_PRODUCT_NOT_ENABLED'] = 'SANDBOX_PRODUCT_NOT_ENABLED';
-+  LinkErrorCode['SANDBOX_WEBHOOK_INVALID'] = 'SANDBOX_WEBHOOK_INVALID';
-+  LinkErrorCode['SANDBOX_BANK_TRANSFER_EVENT_TRANSITION_INVALID'] =
-+    'SANDBOX_BANK_TRANSFER_EVENT_TRANSITION_INVALID';
-+  // INVALID_REQUEST
-+  LinkErrorCode['MISSING_FIELDS'] = 'MISSING_FIELDS';
-+  LinkErrorCode['UNKNOWN_FIELDS'] = 'UNKNOWN_FIELDS';
-+  LinkErrorCode['INVALID_FIELD'] = 'INVALID_FIELD';
-+  LinkErrorCode['INCOMPATIBLE_API_VERSION'] = 'INCOMPATIBLE_API_VERSION';
-+  LinkErrorCode['INVALID_BODY'] = 'INVALID_BODY';
-+  LinkErrorCode['INVALID_HEADERS'] = 'INVALID_HEADERS';
-+  LinkErrorCode['NOT_FOUND'] = 'NOT_FOUND';
-+  LinkErrorCode['NO_LONGER_AVAILABLE'] = 'NO_LONGER_AVAILABLE';
-+  LinkErrorCode['SANDBOX_ONLY'] = 'SANDBOX_ONLY';
-+  LinkErrorCode['INVALID_ACCOUNT_NUMBER'] = 'INVALID_ACCOUNT_NUMBER';
-+  // INVALID_INPUT
-+  // From above ITEM_LOGIN_REQUIRED = "INVALID_CREDENTIALS",
-+  LinkErrorCode['INCORRECT_DEPOSIT_AMOUNTS'] = 'INCORRECT_DEPOSIT_AMOUNTS';
-+  LinkErrorCode['UNAUTHORIZED_ENVIRONMENT'] = 'UNAUTHORIZED_ENVIRONMENT';
-+  LinkErrorCode['INVALID_PRODUCT'] = 'INVALID_PRODUCT';
-+  LinkErrorCode['UNAUTHORIZED_ROUTE_ACCESS'] = 'UNAUTHORIZED_ROUTE_ACCESS';
-+  LinkErrorCode['DIRECT_INTEGRATION_NOT_ENABLED'] =
-+    'DIRECT_INTEGRATION_NOT_ENABLED';
-+  LinkErrorCode['INVALID_API_KEYS'] = 'INVALID_API_KEYS';
-+  LinkErrorCode['INVALID_ACCESS_TOKEN'] = 'INVALID_ACCESS_TOKEN';
-+  LinkErrorCode['INVALID_PUBLIC_TOKEN'] = 'INVALID_PUBLIC_TOKEN';
-+  LinkErrorCode['INVALID_LINK_TOKEN'] = 'INVALID_LINK_TOKEN';
-+  LinkErrorCode['INVALID_PROCESSOR_TOKEN'] = 'INVALID_PROCESSOR_TOKEN';
-+  LinkErrorCode['INVALID_AUDIT_COPY_TOKEN'] = 'INVALID_AUDIT_COPY_TOKEN';
-+  LinkErrorCode['INVALID_ACCOUNT_ID'] = 'INVALID_ACCOUNT_ID';
-+  LinkErrorCode['MICRODEPOSITS_ALREADY_VERIFIED'] =
-+    'MICRODEPOSITS_ALREADY_VERIFIED';
-+  // INVALID_RESULT
-+  LinkErrorCode['PLAID_DIRECT_ITEM_IMPORT_RETURNED_INVALID_MFA'] =
-+    'PLAID_DIRECT_ITEM_IMPORT_RETURNED_INVALID_MFA';
-+  // RATE_LIMIT_EXCEEDED
-+  LinkErrorCode['ACCOUNTS_LIMIT'] = 'ACCOUNTS_LIMIT';
-+  LinkErrorCode['ADDITION_LIMIT'] = 'ADDITION_LIMIT';
-+  LinkErrorCode['AUTH_LIMIT'] = 'AUTH_LIMIT';
-+  LinkErrorCode['BALANCE_LIMIT'] = 'BALANCE_LIMIT';
-+  LinkErrorCode['IDENTITY_LIMIT'] = 'IDENTITY_LIMIT';
-+  LinkErrorCode['ITEM_GET_LIMIT'] = 'ITEM_GET_LIMIT';
-+  LinkErrorCode['RATE_LIMIT'] = 'RATE_LIMIT';
-+  LinkErrorCode['TRANSACTIONS_LIMIT'] = 'TRANSACTIONS_LIMIT';
-+  // RECAPTCHA_ERROR
-+  LinkErrorCode['RECAPTCHA_REQUIRED'] = 'RECAPTCHA_REQUIRED';
-+  LinkErrorCode['RECAPTCHA_BAD'] = 'RECAPTCHA_BAD';
-+  // OAUTH_ERROR
-+  LinkErrorCode['INCORRECT_OAUTH_NONCE'] = 'INCORRECT_OAUTH_NONCE';
-+  LinkErrorCode['OAUTH_STATE_ID_ALREADY_PROCESSED'] =
-+    'OAUTH_STATE_ID_ALREADY_PROCESSED';
- })(LinkErrorCode || (LinkErrorCode = {}));
- export var LinkErrorType;
--(function (LinkErrorType) {
--    LinkErrorType["BANK_TRANSFER"] = "BANK_TRANSFER_ERROR";
--    LinkErrorType["INVALID_REQUEST"] = "INVALID_REQUEST";
--    LinkErrorType["INVALID_RESULT"] = "INVALID_RESULT";
--    LinkErrorType["INVALID_INPUT"] = "INVALID_INPUT";
--    LinkErrorType["INSTITUTION_ERROR"] = "INSTITUTION_ERROR";
--    LinkErrorType["RATE_LIMIT_EXCEEDED"] = "RATE_LIMIT_EXCEEDED";
--    LinkErrorType["API_ERROR"] = "API_ERROR";
--    LinkErrorType["ITEM_ERROR"] = "ITEM_ERROR";
--    LinkErrorType["AUTH_ERROR"] = "AUTH_ERROR";
--    LinkErrorType["ASSET_REPORT_ERROR"] = "ASSET_REPORT_ERROR";
--    LinkErrorType["SANDBOX_ERROR"] = "SANDBOX_ERROR";
--    LinkErrorType["RECAPTCHA_ERROR"] = "RECAPTCHA_ERROR";
--    LinkErrorType["OAUTH_ERROR"] = "OAUTH_ERROR";
-+(function(LinkErrorType) {
-+  LinkErrorType['BANK_TRANSFER'] = 'BANK_TRANSFER_ERROR';
-+  LinkErrorType['INVALID_REQUEST'] = 'INVALID_REQUEST';
-+  LinkErrorType['INVALID_RESULT'] = 'INVALID_RESULT';
-+  LinkErrorType['INVALID_INPUT'] = 'INVALID_INPUT';
-+  LinkErrorType['INSTITUTION_ERROR'] = 'INSTITUTION_ERROR';
-+  LinkErrorType['RATE_LIMIT_EXCEEDED'] = 'RATE_LIMIT_EXCEEDED';
-+  LinkErrorType['API_ERROR'] = 'API_ERROR';
-+  LinkErrorType['ITEM_ERROR'] = 'ITEM_ERROR';
-+  LinkErrorType['AUTH_ERROR'] = 'AUTH_ERROR';
-+  LinkErrorType['ASSET_REPORT_ERROR'] = 'ASSET_REPORT_ERROR';
-+  LinkErrorType['SANDBOX_ERROR'] = 'SANDBOX_ERROR';
-+  LinkErrorType['RECAPTCHA_ERROR'] = 'RECAPTCHA_ERROR';
-+  LinkErrorType['OAUTH_ERROR'] = 'OAUTH_ERROR';
- })(LinkErrorType || (LinkErrorType = {}));
- export var LinkEventName;
--(function (LinkEventName) {
--    LinkEventName["BANK_INCOME_INSIGHTS_COMPLETED"] = "BANK_INCOME_INSIGHTS_COMPLETED";
--    LinkEventName["CLOSE_OAUTH"] = "CLOSE_OAUTH";
--    LinkEventName["ERROR"] = "ERROR";
--    LinkEventName["EXIT"] = "EXIT";
--    LinkEventName["FAIL_OAUTH"] = "FAIL_OAUTH";
--    LinkEventName["HANDOFF"] = "HANDOFF";
--    LinkEventName["IDENTITY_VERIFICATION_START_STEP"] = "IDENTITY_VERIFICATION_START_STEP";
--    LinkEventName["IDENTITY_VERIFICATION_PASS_STEP"] = "IDENTITY_VERIFICATION_PASS_STEP";
--    LinkEventName["IDENTITY_VERIFICATION_FAIL_STEP"] = "IDENTITY_VERIFICATION_FAIL_STEP";
--    LinkEventName["IDENTITY_VERIFICATION_PENDING_REVIEW_STEP"] = "IDENTITY_VERIFICATION_PENDING_REVIEW_STEP";
--    LinkEventName["IDENTITY_VERIFICATION_PENDING_REVIEW_SESSION"] = "IDENTITY_VERIFICATION_PENDING_REVIEW_SESSION";
--    LinkEventName["IDENTITY_VERIFICATION_CREATE_SESSION"] = "IDENTITY_VERIFICATION_CREATE_SESSION";
--    LinkEventName["IDENTITY_VERIFICATION_RESUME_SESSION"] = "IDENTITY_VERIFICATION_RESUME_SESSION";
--    LinkEventName["IDENTITY_VERIFICATION_PASS_SESSION"] = "IDENTITY_VERIFICATION_PASS_SESSION";
--    LinkEventName["IDENTITY_VERIFICATION_FAIL_SESSION"] = "IDENTITY_VERIFICATION_FAIL_SESSION";
--    LinkEventName["IDENTITY_VERIFICATION_OPEN_UI"] = "IDENTITY_VERIFICATION_OPEN_UI";
--    LinkEventName["IDENTITY_VERIFICATION_RESUME_UI"] = "IDENTITY_VERIFICATION_RESUME_UI";
--    LinkEventName["IDENTITY_VERIFICATION_CLOSE_UI"] = "IDENTITY_VERIFICATION_CLOSE_UI";
--    LinkEventName["MATCHED_CONSENT"] = "MATCHED_CONSENT";
--    LinkEventName["MATCHED_SELECT_INSTITUTION"] = "MATCHED_SELECT_INSTITUTION";
--    LinkEventName["MATCHED_SELECT_VERIFY_METHOD"] = "MATCHED_SELECT_VERIFY_METHOD";
--    LinkEventName["OPEN"] = "OPEN";
--    LinkEventName["OPEN_MY_PLAID"] = "OPEN_MY_PLAID";
--    LinkEventName["OPEN_OAUTH"] = "OPEN_OAUTH";
--    LinkEventName["SEARCH_INSTITUTION"] = "SEARCH_INSTITUTION";
--    LinkEventName["SELECT_DEGRADED_INSTITUTION"] = "SELECT_DEGRADED_INSTITUTION";
--    LinkEventName["SELECT_DOWN_INSTITUTION"] = "SELECT_DOWN_INSTITUTION";
--    LinkEventName["SELECT_FILTERED_INSTITUTION"] = "SELECT_FILTERED_INSTITUTION";
--    LinkEventName["SELECT_INSTITUTION"] = "SELECT_INSTITUTION";
--    LinkEventName["SELECT_BRAND"] = "SELECT_BRAND";
--    LinkEventName["SELECT_AUTH_TYPE"] = "SELECT_AUTH_TYPE";
--    LinkEventName["SUBMIT_ACCOUNT_NUMBER"] = "SUBMIT_ACCOUNT_NUMBER";
--    LinkEventName["SUBMIT_DOCUMENTS"] = "SUBMIT_DOCUMENTS";
--    LinkEventName["SUBMIT_DOCUMENTS_SUCCESS"] = "SUBMIT_DOCUMENTS_SUCCESS";
--    LinkEventName["SUBMIT_DOCUMENTS_ERROR"] = "SUBMIT_DOCUMENTS_ERROR";
--    LinkEventName["SUBMIT_ROUTING_NUMBER"] = "SUBMIT_ROUTING_NUMBER";
--    LinkEventName["VIEW_DATA_TYPES"] = "VIEW_DATA_TYPES";
--    LinkEventName["SUBMIT_PHONE"] = "SUBMIT_PHONE";
--    LinkEventName["SKIP_SUBMIT_PHONE"] = "SKIP_SUBMIT_PHONE";
--    LinkEventName["VERIFY_PHONE"] = "VERIFY_PHONE";
--    LinkEventName["SUBMIT_CREDENTIALS"] = "SUBMIT_CREDENTIALS";
--    LinkEventName["SUBMIT_MFA"] = "SUBMIT_MFA";
--    LinkEventName["TRANSITION_VIEW"] = "TRANSITION_VIEW";
--    LinkEventName["CONNECT_NEW_INSTITUTION"] = "CONNECT_NEW_INSTITUTION";
-+(function(LinkEventName) {
-+  LinkEventName['BANK_INCOME_INSIGHTS_COMPLETED'] =
-+    'BANK_INCOME_INSIGHTS_COMPLETED';
-+  LinkEventName['CLOSE_OAUTH'] = 'CLOSE_OAUTH';
-+  LinkEventName['ERROR'] = 'ERROR';
-+  LinkEventName['EXIT'] = 'EXIT';
-+  LinkEventName['FAIL_OAUTH'] = 'FAIL_OAUTH';
-+  LinkEventName['HANDOFF'] = 'HANDOFF';
-+  LinkEventName['IDENTITY_VERIFICATION_START_STEP'] =
-+    'IDENTITY_VERIFICATION_START_STEP';
-+  LinkEventName['IDENTITY_VERIFICATION_PASS_STEP'] =
-+    'IDENTITY_VERIFICATION_PASS_STEP';
-+  LinkEventName['IDENTITY_VERIFICATION_FAIL_STEP'] =
-+    'IDENTITY_VERIFICATION_FAIL_STEP';
-+  LinkEventName['IDENTITY_VERIFICATION_PENDING_REVIEW_STEP'] =
-+    'IDENTITY_VERIFICATION_PENDING_REVIEW_STEP';
-+  LinkEventName['IDENTITY_VERIFICATION_PENDING_REVIEW_SESSION'] =
-+    'IDENTITY_VERIFICATION_PENDING_REVIEW_SESSION';
-+  LinkEventName['IDENTITY_VERIFICATION_CREATE_SESSION'] =
-+    'IDENTITY_VERIFICATION_CREATE_SESSION';
-+  LinkEventName['IDENTITY_VERIFICATION_RESUME_SESSION'] =
-+    'IDENTITY_VERIFICATION_RESUME_SESSION';
-+  LinkEventName['IDENTITY_VERIFICATION_PASS_SESSION'] =
-+    'IDENTITY_VERIFICATION_PASS_SESSION';
-+  LinkEventName['IDENTITY_VERIFICATION_FAIL_SESSION'] =
-+    'IDENTITY_VERIFICATION_FAIL_SESSION';
-+  LinkEventName['IDENTITY_VERIFICATION_OPEN_UI'] =
-+    'IDENTITY_VERIFICATION_OPEN_UI';
-+  LinkEventName['IDENTITY_VERIFICATION_RESUME_UI'] =
-+    'IDENTITY_VERIFICATION_RESUME_UI';
-+  LinkEventName['IDENTITY_VERIFICATION_CLOSE_UI'] =
-+    'IDENTITY_VERIFICATION_CLOSE_UI';
-+  LinkEventName['MATCHED_CONSENT'] = 'MATCHED_CONSENT';
-+  LinkEventName['MATCHED_SELECT_INSTITUTION'] = 'MATCHED_SELECT_INSTITUTION';
-+  LinkEventName['MATCHED_SELECT_VERIFY_METHOD'] =
-+    'MATCHED_SELECT_VERIFY_METHOD';
-+  LinkEventName['OPEN'] = 'OPEN';
-+  LinkEventName['OPEN_MY_PLAID'] = 'OPEN_MY_PLAID';
-+  LinkEventName['OPEN_OAUTH'] = 'OPEN_OAUTH';
-+  LinkEventName['SEARCH_INSTITUTION'] = 'SEARCH_INSTITUTION';
-+  LinkEventName['SELECT_DEGRADED_INSTITUTION'] = 'SELECT_DEGRADED_INSTITUTION';
-+  LinkEventName['SELECT_DOWN_INSTITUTION'] = 'SELECT_DOWN_INSTITUTION';
-+  LinkEventName['SELECT_FILTERED_INSTITUTION'] = 'SELECT_FILTERED_INSTITUTION';
-+  LinkEventName['SELECT_INSTITUTION'] = 'SELECT_INSTITUTION';
-+  LinkEventName['SELECT_BRAND'] = 'SELECT_BRAND';
-+  LinkEventName['SELECT_AUTH_TYPE'] = 'SELECT_AUTH_TYPE';
-+  LinkEventName['SUBMIT_ACCOUNT_NUMBER'] = 'SUBMIT_ACCOUNT_NUMBER';
-+  LinkEventName['SUBMIT_DOCUMENTS'] = 'SUBMIT_DOCUMENTS';
-+  LinkEventName['SUBMIT_DOCUMENTS_SUCCESS'] = 'SUBMIT_DOCUMENTS_SUCCESS';
-+  LinkEventName['SUBMIT_DOCUMENTS_ERROR'] = 'SUBMIT_DOCUMENTS_ERROR';
-+  LinkEventName['SUBMIT_ROUTING_NUMBER'] = 'SUBMIT_ROUTING_NUMBER';
-+  LinkEventName['VIEW_DATA_TYPES'] = 'VIEW_DATA_TYPES';
-+  LinkEventName['SUBMIT_PHONE'] = 'SUBMIT_PHONE';
-+  LinkEventName['SKIP_SUBMIT_PHONE'] = 'SKIP_SUBMIT_PHONE';
-+  LinkEventName['VERIFY_PHONE'] = 'VERIFY_PHONE';
-+  LinkEventName['SUBMIT_CREDENTIALS'] = 'SUBMIT_CREDENTIALS';
-+  LinkEventName['SUBMIT_MFA'] = 'SUBMIT_MFA';
-+  LinkEventName['TRANSITION_VIEW'] = 'TRANSITION_VIEW';
-+  LinkEventName['CONNECT_NEW_INSTITUTION'] = 'CONNECT_NEW_INSTITUTION';
- })(LinkEventName || (LinkEventName = {}));
- export var LinkEventViewName;
--(function (LinkEventViewName) {
--    LinkEventViewName["ACCEPT_TOS"] = "ACCEPT_TOS";
--    LinkEventViewName["CONNECTED"] = "CONNECTED";
--    LinkEventViewName["CONSENT"] = "CONSENT";
--    LinkEventViewName["CREDENTIAL"] = "CREDENTIAL";
--    LinkEventViewName["DATA_TRANSPARENCY"] = "DATA_TRANSPARENCY";
--    LinkEventViewName["DATA_TRANSPARENCY_CONSENT"] = "DATA_TRANSPARENCY_CONSENT";
--    LinkEventViewName["DOCUMENTARY_VERIFICATION"] = "DOCUMENTARY_VERIFICATION";
--    LinkEventViewName["ERROR"] = "ERROR";
--    LinkEventViewName["EXIT"] = "EXIT";
--    LinkEventViewName["KYC_CHECK"] = "KYC_CHECK";
--    LinkEventViewName["SELFIE_CHECK"] = "SELFIE_CHECK";
--    LinkEventViewName["LOADING"] = "LOADING";
--    LinkEventViewName["MATCHED_CONSENT"] = "MATCHED_CONSENT";
--    LinkEventViewName["MATCHED_CREDENTIAL"] = "MATCHED_CREDENTIAL";
--    LinkEventViewName["MATCHED_MFA"] = "MATCHED_MFA";
--    LinkEventViewName["MFA"] = "MFA";
--    LinkEventViewName["NUMBERS"] = "NUMBERS";
--    LinkEventViewName["NUMBERS_SELECT_INSTITUTION"] = "NUMBERS_SELECT_INSTITUTION";
--    LinkEventViewName["OAUTH"] = "OAUTH";
--    LinkEventViewName["RECAPTCHA"] = "RECAPTCHA";
--    LinkEventViewName["RISK_CHECK"] = "RISK_CHECK";
--    LinkEventViewName["SCREENING"] = "SCREENING";
--    LinkEventViewName["SELECT_ACCOUNT"] = "SELECT_ACCOUNT";
--    LinkEventViewName["SELECT_AUTH_TYPE"] = "SELECT_AUTH_TYPE";
--    LinkEventViewName["SUBMIT_PHONE"] = "SUBMIT_PHONE";
--    LinkEventViewName["VERIFY_PHONE"] = "VERIFY_PHONE";
--    LinkEventViewName["SELECT_SAVED_INSTITUTION"] = "SELECT_SAVED_INSTITUTION";
--    LinkEventViewName["SELECT_SAVED_ACCOUNT"] = "SELECT_SAVED_ACCOUNT";
--    LinkEventViewName["SELECT_BRAND"] = "SELECT_BRAND";
--    LinkEventViewName["SELECT_INSTITUTION"] = "SELECT_INSTITUTION";
--    LinkEventViewName["SUBMIT_DOCUMENTS"] = "SUBMIT_DOCUMENTS";
--    LinkEventViewName["SUBMIT_DOCUMENTS_SUCCESS"] = "SUBMIT_DOCUMENTS_SUCCESS";
--    LinkEventViewName["SUBMIT_DOCUMENTS_ERROR"] = "SUBMIT_DOCUMENTS_ERROR";
--    LinkEventViewName["UPLOAD_DOCUMENTS"] = "UPLOAD_DOCUMENTS";
--    LinkEventViewName["VERIFY_SMS"] = "VERIFY_SMS";
-+(function(LinkEventViewName) {
-+  LinkEventViewName['ACCEPT_TOS'] = 'ACCEPT_TOS';
-+  LinkEventViewName['CONNECTED'] = 'CONNECTED';
-+  LinkEventViewName['CONSENT'] = 'CONSENT';
-+  LinkEventViewName['CREDENTIAL'] = 'CREDENTIAL';
-+  LinkEventViewName['DATA_TRANSPARENCY'] = 'DATA_TRANSPARENCY';
-+  LinkEventViewName['DATA_TRANSPARENCY_CONSENT'] = 'DATA_TRANSPARENCY_CONSENT';
-+  LinkEventViewName['DOCUMENTARY_VERIFICATION'] = 'DOCUMENTARY_VERIFICATION';
-+  LinkEventViewName['ERROR'] = 'ERROR';
-+  LinkEventViewName['EXIT'] = 'EXIT';
-+  LinkEventViewName['KYC_CHECK'] = 'KYC_CHECK';
-+  LinkEventViewName['SELFIE_CHECK'] = 'SELFIE_CHECK';
-+  LinkEventViewName['LOADING'] = 'LOADING';
-+  LinkEventViewName['MATCHED_CONSENT'] = 'MATCHED_CONSENT';
-+  LinkEventViewName['MATCHED_CREDENTIAL'] = 'MATCHED_CREDENTIAL';
-+  LinkEventViewName['MATCHED_MFA'] = 'MATCHED_MFA';
-+  LinkEventViewName['MFA'] = 'MFA';
-+  LinkEventViewName['NUMBERS'] = 'NUMBERS';
-+  LinkEventViewName['NUMBERS_SELECT_INSTITUTION'] =
-+    'NUMBERS_SELECT_INSTITUTION';
-+  LinkEventViewName['OAUTH'] = 'OAUTH';
-+  LinkEventViewName['RECAPTCHA'] = 'RECAPTCHA';
-+  LinkEventViewName['RISK_CHECK'] = 'RISK_CHECK';
-+  LinkEventViewName['SCREENING'] = 'SCREENING';
-+  LinkEventViewName['SELECT_ACCOUNT'] = 'SELECT_ACCOUNT';
-+  LinkEventViewName['SELECT_AUTH_TYPE'] = 'SELECT_AUTH_TYPE';
-+  LinkEventViewName['SUBMIT_PHONE'] = 'SUBMIT_PHONE';
-+  LinkEventViewName['VERIFY_PHONE'] = 'VERIFY_PHONE';
-+  LinkEventViewName['SELECT_SAVED_INSTITUTION'] = 'SELECT_SAVED_INSTITUTION';
-+  LinkEventViewName['SELECT_SAVED_ACCOUNT'] = 'SELECT_SAVED_ACCOUNT';
-+  LinkEventViewName['SELECT_BRAND'] = 'SELECT_BRAND';
-+  LinkEventViewName['SELECT_INSTITUTION'] = 'SELECT_INSTITUTION';
-+  LinkEventViewName['SUBMIT_DOCUMENTS'] = 'SUBMIT_DOCUMENTS';
-+  LinkEventViewName['SUBMIT_DOCUMENTS_SUCCESS'] = 'SUBMIT_DOCUMENTS_SUCCESS';
-+  LinkEventViewName['SUBMIT_DOCUMENTS_ERROR'] = 'SUBMIT_DOCUMENTS_ERROR';
-+  LinkEventViewName['UPLOAD_DOCUMENTS'] = 'UPLOAD_DOCUMENTS';
-+  LinkEventViewName['VERIFY_SMS'] = 'VERIFY_SMS';
- })(LinkEventViewName || (LinkEventViewName = {}));
- /// Methods to present Link on iOS.
- /// FULL_SCREEN is the converts to UIModalPresentationOverFullScreen on the native side.
- /// MODAL will use the default presentation style for iOS which is UIModalPresentationAutomatic.
- export var LinkIOSPresentationStyle;
--(function (LinkIOSPresentationStyle) {
--    LinkIOSPresentationStyle["FULL_SCREEN"] = "FULL_SCREEN";
--    LinkIOSPresentationStyle["MODAL"] = "MODAL";
-+(function(LinkIOSPresentationStyle) {
-+  LinkIOSPresentationStyle['FULL_SCREEN'] = 'FULL_SCREEN';
-+  LinkIOSPresentationStyle['MODAL'] = 'MODAL';
- })(LinkIOSPresentationStyle || (LinkIOSPresentationStyle = {}));
-diff --git a/node_modules/react-native-plaid-link-sdk/dist/__tests__/Types.tests.d.ts b/node_modules/react-native-plaid-link-sdk/dist/__tests__/Types.tests.d.ts
-index cd4ccde..cb0ff5c 100644
---- a/node_modules/react-native-plaid-link-sdk/dist/__tests__/Types.tests.d.ts
-+++ b/node_modules/react-native-plaid-link-sdk/dist/__tests__/Types.tests.d.ts
-@@ -1 +1 @@
--declare const Types: any;
-+export {};
-diff --git a/node_modules/react-native-plaid-link-sdk/dist/__tests__/Types.tests.js b/node_modules/react-native-plaid-link-sdk/dist/__tests__/Types.tests.js
-index 831866b..f38aff8 100644
---- a/node_modules/react-native-plaid-link-sdk/dist/__tests__/Types.tests.js
-+++ b/node_modules/react-native-plaid-link-sdk/dist/__tests__/Types.tests.js
-@@ -1,14 +1,14 @@
--"use strict";
- const Types = require('./../Types');
- test('test token configuration', () => {
--    const linkTokenConfiguration = {
--        token: "test-token",
--        noLoadingState: false,
--        logLevel: Types.LinkLogLevel.DEBUG,
--        extras: null,
--    };
--    expect(linkTokenConfiguration.noLoadingState).toBe(false);
--    expect(linkTokenConfiguration.token).toBe("test-token");
--    expect(linkTokenConfiguration.logLevel).toBe(Types.LinkLogLevel.DEBUG);
--    expect(linkTokenConfiguration.extras).toBe(null);
-+  const linkTokenConfiguration = {
-+    token: 'test-token',
-+    noLoadingState: false,
-+    logLevel: Types.LinkLogLevel.DEBUG,
-+    extras: null,
-+  };
-+  expect(linkTokenConfiguration.noLoadingState).toBe(false);
-+  expect(linkTokenConfiguration.token).toBe('test-token');
-+  expect(linkTokenConfiguration.logLevel).toBe(Types.LinkLogLevel.DEBUG);
-+  expect(linkTokenConfiguration.extras).toBe(null);
- });
-+export {};
-diff --git a/node_modules/react-native-plaid-link-sdk/dist/check_version_hook.d.ts b/node_modules/react-native-plaid-link-sdk/dist/check_version_hook.d.ts
-new file mode 100644
-index 0000000..cb0ff5c
---- /dev/null
-+++ b/node_modules/react-native-plaid-link-sdk/dist/check_version_hook.d.ts
-@@ -0,0 +1 @@
-+export {};
-diff --git a/node_modules/react-native-plaid-link-sdk/dist/check_version_hook.js b/node_modules/react-native-plaid-link-sdk/dist/check_version_hook.js
-new file mode 100644
-index 0000000..34a47d4
---- /dev/null
-+++ b/node_modules/react-native-plaid-link-sdk/dist/check_version_hook.js
-@@ -0,0 +1,15 @@
-+'use strict';
-+const fs = require('fs');
-+const rn_version = JSON.parse(fs.readFileSync('package.json', 'utf-8'))[
-+  'version'
-+];
-+const android_version = fs
-+  .readFileSync('android/src/main/AndroidManifest.xml', 'utf-8')
-+  .match(/(?<=value=").*(?=")/)[0];
-+if (rn_version != android_version) {
-+  console.error('Commit failed SDK version mismatch');
-+  console.error(
-+    'Please ensure package.json and android/src/main/AndroidManifest.xml have the same version',
-+  );
-+  process.exit(-1);
-+}
-diff --git a/node_modules/react-native-plaid-link-sdk/dist/fabric/NativePlaidLinkModule.d.ts b/node_modules/react-native-plaid-link-sdk/dist/fabric/NativePlaidLinkModule.d.ts
-new file mode 100644
-index 0000000..1de3019
---- /dev/null
-+++ b/node_modules/react-native-plaid-link-sdk/dist/fabric/NativePlaidLinkModule.d.ts
-@@ -0,0 +1,14 @@
-+import { TurboModule } from 'react-native';
-+import { Int32 } from 'react-native/Libraries/Types/CodegenTypes';
-+import { LinkSuccess as UnsafeObject, LinkExit as Double, LinkError as Float } from '../Types';
-+export interface Spec extends TurboModule {
-+    continueFromRedirectUriString(redirectUriString: string): void;
-+    create(configuration: Object): void;
-+    open(onSuccess: (success: UnsafeObject) => void, onExit: (error: Float, result: Double) => void): void;
-+    dismiss(): void;
-+    startLinkActivityForResult(data: string, onSuccessCallback: (result: UnsafeObject) => void, onExitCallback: (result: Double) => void): void;
-+    addListener(eventName: string): void;
-+    removeListeners(count: Int32): void;
-+}
-+declare const _default: Spec;
-+export default _default;
-diff --git a/node_modules/react-native-plaid-link-sdk/dist/fabric/NativePlaidLinkModule.js b/node_modules/react-native-plaid-link-sdk/dist/fabric/NativePlaidLinkModule.js
-new file mode 100644
-index 0000000..310a9c5
---- /dev/null
-+++ b/node_modules/react-native-plaid-link-sdk/dist/fabric/NativePlaidLinkModule.js
-@@ -0,0 +1,4 @@
-+// we use Object type because methods on the native side use NSDictionary and ReadableMap
-+// and we want to stay compatible with those
-+import { TurboModuleRegistry } from 'react-native';
-+export default TurboModuleRegistry.getEnforcing('RNLinksdk');
-diff --git a/node_modules/react-native-plaid-link-sdk/dist/fabric/NativePlaidLinkModuleAndroid.d.ts b/node_modules/react-native-plaid-link-sdk/dist/fabric/NativePlaidLinkModuleAndroid.d.ts
-new file mode 100644
-index 0000000..82f29a1
---- /dev/null
-+++ b/node_modules/react-native-plaid-link-sdk/dist/fabric/NativePlaidLinkModuleAndroid.d.ts
-@@ -0,0 +1,9 @@
-+import { TurboModule } from 'react-native';
-+import { Int32, UnsafeObject } from 'react-native/Libraries/Types/CodegenTypes';
-+export interface Spec extends TurboModule {
-+    startLinkActivityForResult(token: string, noLoadingState: boolean, logLevel: string, onSuccessCallback: (result: UnsafeObject) => void, onExitCallback: (result: UnsafeObject) => void): void;
-+    addListener(eventName: string): void;
-+    removeListeners(count: Int32): void;
-+}
-+declare const _default: Spec | null;
-+export default _default;
-diff --git a/node_modules/react-native-plaid-link-sdk/dist/fabric/NativePlaidLinkModuleAndroid.js b/node_modules/react-native-plaid-link-sdk/dist/fabric/NativePlaidLinkModuleAndroid.js
-new file mode 100644
-index 0000000..d0ea456
---- /dev/null
-+++ b/node_modules/react-native-plaid-link-sdk/dist/fabric/NativePlaidLinkModuleAndroid.js
-@@ -0,0 +1,4 @@
-+// we use Object type because methods on the native side use NSDictionary and ReadableMap
-+// and we want to stay compatible with those
-+import { TurboModuleRegistry } from 'react-native';
-+export default TurboModuleRegistry.get('PlaidAndroid');
-diff --git a/node_modules/react-native-plaid-link-sdk/dist/fabric/NativePlaidLinkModuleiOS.d.ts b/node_modules/react-native-plaid-link-sdk/dist/fabric/NativePlaidLinkModuleiOS.d.ts
-new file mode 100644
-index 0000000..aefee8c
---- /dev/null
-+++ b/node_modules/react-native-plaid-link-sdk/dist/fabric/NativePlaidLinkModuleiOS.d.ts
-@@ -0,0 +1,11 @@
-+import { TurboModule } from 'react-native';
-+import { Int32, UnsafeObject } from 'react-native/Libraries/Types/CodegenTypes';
-+export interface Spec extends TurboModule {
-+    create(token: string, noLoadingState: boolean): void;
-+    open(fullScreen: boolean, onSuccess: (success: UnsafeObject) => void, onExit: (error: UnsafeObject, result: UnsafeObject) => void): void;
-+    dismiss(): void;
-+    addListener(eventName: string): void;
-+    removeListeners(count: Int32): void;
-+}
-+declare const _default: Spec | null;
-+export default _default;
-diff --git a/node_modules/react-native-plaid-link-sdk/dist/fabric/NativePlaidLinkModuleiOS.js b/node_modules/react-native-plaid-link-sdk/dist/fabric/NativePlaidLinkModuleiOS.js
-new file mode 100644
-index 0000000..99845a1
---- /dev/null
-+++ b/node_modules/react-native-plaid-link-sdk/dist/fabric/NativePlaidLinkModuleiOS.js
-@@ -0,0 +1,4 @@
-+// we use Object type because methods on the native side use NSDictionary and ReadableMap
-+// and we want to stay compatible with those
-+import { TurboModuleRegistry } from 'react-native';
-+export default TurboModuleRegistry.get('RNLinksdk');
-diff --git a/node_modules/react-native-plaid-link-sdk/dist/index.js b/node_modules/react-native-plaid-link-sdk/dist/index.js
-index 68c2d4b..acad079 100644
---- a/node_modules/react-native-plaid-link-sdk/dist/index.js
-+++ b/node_modules/react-native-plaid-link-sdk/dist/index.js
-@@ -1,6 +1,6 @@
--import { openLink, dismissLink, usePlaidEmitter, PlaidLink, } from './PlaidLink';
-+import { openLink, dismissLink, usePlaidEmitter, PlaidLink } from './PlaidLink';
- export * from './Types';
- export default PlaidLink;
--export { PlaidLink, openLink, dismissLink, usePlaidEmitter, };
-+export { PlaidLink, openLink, dismissLink, usePlaidEmitter };
- // Components
- export { EmbeddedLinkView } from './EmbeddedLink/EmbeddedLinkView';
-diff --git a/node_modules/react-native-plaid-link-sdk/ios/RNLinksdk.h b/node_modules/react-native-plaid-link-sdk/ios/RNLinksdk.h
-index 8a1c350..035b91c 100644
---- a/node_modules/react-native-plaid-link-sdk/ios/RNLinksdk.h
-+++ b/node_modules/react-native-plaid-link-sdk/ios/RNLinksdk.h
-@@ -1,15 +1,17 @@
--
--#if __has_include(<React/RCTBridgeModule.h>)
--#import <React/RCTBridgeModule.h>
--#import <React/RCTEventEmitter.h>
--#else
--#import "RCTBridgeModule.h"
--#import "RCTEventEmitter.h"
-+#ifdef RCT_NEW_ARCH_ENABLED
-+#import <rnplaidlink/rnplaidlink.h>
- #endif
-+#import <React/RCTBridge.h>
-+#import "RCTEventEmitter.h"
- 
- #import <LinkKit/LinkKit.h>
- 
--@interface RNLinksdk : RCTEventEmitter <RCTBridgeModule>
-+@interface RNLinksdk : RCTEventEmitter
-+#ifdef RCT_NEW_ARCH_ENABLED
-+                                   <NativePlaidLinkModuleiOSSpec>
-+#else
-+                                   <RCTBridgeModule>
-+#endif
- 
- + (NSDictionary *)dictionaryFromSuccess:(PLKLinkSuccess *)success;
- + (NSDictionary *)dictionaryFromEvent:(PLKLinkEvent *)event;
-diff --git a/node_modules/react-native-plaid-link-sdk/ios/RNLinksdk.mm b/node_modules/react-native-plaid-link-sdk/ios/RNLinksdk.mm
-index ef3fe85..b3b92d6 100644
---- a/node_modules/react-native-plaid-link-sdk/ios/RNLinksdk.mm
-+++ b/node_modules/react-native-plaid-link-sdk/ios/RNLinksdk.mm
-@@ -1,4 +1,5 @@
- #import "RNLinksdk.h"
-+#import "RNPlaidHelper.h"
- 
- #import <Foundation/Foundation.h>
- #import <LinkKit/LinkKit.h>
-@@ -66,11 +67,11 @@ - (void)stopObserving {
-     self.hasObservers = NO;
- }
- 
--RCT_EXPORT_METHOD(create:(NSString*)token :(BOOL)noLoadingState) {
--    __weak typeof(self) weakSelf = self;
-+RCT_EXPORT_METHOD(create:(NSString*)token noLoadingState:(BOOL)noLoadingState) {
-+    __weak RNLinksdk *weakSelf = self;
- 
-     void (^onSuccess)(PLKLinkSuccess *) = ^(PLKLinkSuccess *success) {
--        __typeof(weakSelf) strongSelf = weakSelf;
-+        RNLinksdk *strongSelf = weakSelf;
- 
-         if (strongSelf.successCallback) {
-             NSDictionary<NSString*, id> *jsMetadata = [RNLinksdk dictionaryFromSuccess:success];
-@@ -80,7 +81,7 @@ - (void)stopObserving {
-     };
- 
-     void (^onExit)(PLKLinkExit *) = ^(PLKLinkExit *exit) {
--        __typeof(weakSelf) strongSelf = weakSelf;
-+        RNLinksdk *strongSelf = weakSelf;
- 
-         if (strongSelf.exitCallback) {
-             NSDictionary *exitMetadata = [RNLinksdk dictionaryFromExit:exit];
-@@ -94,7 +95,7 @@ - (void)stopObserving {
-     };
- 
-     void (^onEvent)(PLKLinkEvent *) = ^(PLKLinkEvent *event) {
--        __typeof(weakSelf) strongSelf = weakSelf;
-+        RNLinksdk *strongSelf = weakSelf;
-         if (strongSelf.hasObservers) {
-             NSDictionary *eventDictionary = [RNLinksdk dictionaryFromEvent:event];
-             [strongSelf sendEventWithName:kRNLinkKitOnEventEvent
-@@ -108,11 +109,11 @@ - (void)stopObserving {
-     config.noLoadingState = noLoadingState;
- 
-     NSError *creationError = nil;
--    self.linkHandler = [PLKPlaid createWithLinkTokenConfiguration:config error:&creationError];
-+    self.linkHandler = [RNPlaidHelper createWithLinkTokenConfiguration:config error:&creationError];
-     self.creationError = creationError;
- }
- 
--RCT_EXPORT_METHOD(open: (BOOL)fullScreen :(RCTResponseSenderBlock)onSuccess :(RCTResponseSenderBlock)onExit) {
-+RCT_EXPORT_METHOD(open:(BOOL)fullScreen onSuccess:(RCTResponseSenderBlock)onSuccess onExit:(RCTResponseSenderBlock)onExit) {
-     if (self.linkHandler) {
-         self.successCallback = onSuccess;
-         self.exitCallback = onExit;
-@@ -122,7 +123,7 @@ - (void)stopObserving {
-         // unnecessarily invoked.
-         __block bool didPresent = NO;
- 
--        __weak typeof(self) weakSelf = self;
-+        __weak RNLinksdk *weakSelf = self;
-         void(^presentationHandler)(UIViewController *) = ^(UIViewController *linkViewController) {
- 
-             if (fullScreen) {
-@@ -619,4 +620,12 @@ + (NSDictionary *)dictionaryFromExit:(PLKLinkExit *)exit {
-     };
- }
- 
-+#if RCT_NEW_ARCH_ENABLED
-+- (std::shared_ptr<facebook::react::TurboModule>)getTurboModule:
-+    (const facebook::react::ObjCTurboModule::InitParams &)params
-+{
-+  return std::make_shared<facebook::react::NativePlaidLinkModuleiOSSpecJSI>(params);
-+}
-+#endif
-+
- @end
-diff --git a/node_modules/react-native-plaid-link-sdk/ios/RNLinksdk.xcodeproj/project.xcworkspace/contents.xcworkspacedata b/node_modules/react-native-plaid-link-sdk/ios/RNLinksdk.xcodeproj/project.xcworkspace/contents.xcworkspacedata
-deleted file mode 100644
-index 919434a..0000000
---- a/node_modules/react-native-plaid-link-sdk/ios/RNLinksdk.xcodeproj/project.xcworkspace/contents.xcworkspacedata
-+++ /dev/null
-@@ -1,7 +0,0 @@
--<?xml version="1.0" encoding="UTF-8"?>
--<Workspace
--   version = "1.0">
--   <FileRef
--      location = "self:">
--   </FileRef>
--</Workspace>
-diff --git a/node_modules/react-native-plaid-link-sdk/ios/RNLinksdk.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/node_modules/react-native-plaid-link-sdk/ios/RNLinksdk.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist
-deleted file mode 100644
-index 18d9810..0000000
---- a/node_modules/react-native-plaid-link-sdk/ios/RNLinksdk.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist
-+++ /dev/null
-@@ -1,8 +0,0 @@
--<?xml version="1.0" encoding="UTF-8"?>
--<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
--<plist version="1.0">
--<dict>
--	<key>IDEDidComputeMac32BitWarning</key>
--	<true/>
--</dict>
--</plist>
-diff --git a/node_modules/react-native-plaid-link-sdk/ios/RNLinksdk.xcodeproj/project.xcworkspace/xcuserdata/dtroupe.xcuserdatad/UserInterfaceState.xcuserstate b/node_modules/react-native-plaid-link-sdk/ios/RNLinksdk.xcodeproj/project.xcworkspace/xcuserdata/dtroupe.xcuserdatad/UserInterfaceState.xcuserstate
-deleted file mode 100644
-index 47e9cc2..0000000
-Binary files a/node_modules/react-native-plaid-link-sdk/ios/RNLinksdk.xcodeproj/project.xcworkspace/xcuserdata/dtroupe.xcuserdatad/UserInterfaceState.xcuserstate and /dev/null differ
-diff --git a/node_modules/react-native-plaid-link-sdk/ios/RNLinksdk.xcodeproj/xcuserdata/dtroupe.xcuserdatad/xcschemes/xcschememanagement.plist b/node_modules/react-native-plaid-link-sdk/ios/RNLinksdk.xcodeproj/xcuserdata/dtroupe.xcuserdatad/xcschemes/xcschememanagement.plist
-deleted file mode 100644
-index 5b4fa70..0000000
---- a/node_modules/react-native-plaid-link-sdk/ios/RNLinksdk.xcodeproj/xcuserdata/dtroupe.xcuserdatad/xcschemes/xcschememanagement.plist
-+++ /dev/null
-@@ -1,19 +0,0 @@
--<?xml version="1.0" encoding="UTF-8"?>
--<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
--<plist version="1.0">
--<dict>
--	<key>SchemeUserState</key>
--	<dict>
--		<key>RNLinksdk.xcscheme_^#shared#^_</key>
--		<dict>
--			<key>orderHint</key>
--			<integer>0</integer>
--		</dict>
--		<key>RNLinksdkUnitTests.xcscheme_^#shared#^_</key>
--		<dict>
--			<key>orderHint</key>
--			<integer>1</integer>
--		</dict>
--	</dict>
--</dict>
--</plist>
-diff --git a/node_modules/react-native-plaid-link-sdk/ios/RNLinksdk.xcworkspace/xcuserdata/dtroupe.xcuserdatad/UserInterfaceState.xcuserstate b/node_modules/react-native-plaid-link-sdk/ios/RNLinksdk.xcworkspace/xcuserdata/dtroupe.xcuserdatad/UserInterfaceState.xcuserstate
-deleted file mode 100644
-index 824773d..0000000
-Binary files a/node_modules/react-native-plaid-link-sdk/ios/RNLinksdk.xcworkspace/xcuserdata/dtroupe.xcuserdatad/UserInterfaceState.xcuserstate and /dev/null differ
-diff --git a/node_modules/react-native-plaid-link-sdk/ios/RNPlaidHelper.h b/node_modules/react-native-plaid-link-sdk/ios/RNPlaidHelper.h
-new file mode 100644
-index 0000000..535d333
---- /dev/null
-+++ b/node_modules/react-native-plaid-link-sdk/ios/RNPlaidHelper.h
-@@ -0,0 +1,7 @@
-+#import <LinkKit/LinkKit.h>
-+
-+@interface RNPlaidHelper : NSObject
-+
-++ (id <PLKHandler> _Nullable)createWithLinkTokenConfiguration:(PLKLinkTokenConfiguration * _Nonnull)linkTokenConfiguration error:(NSError * _Nullable * _Nullable)error;
-+
-+@end
-diff --git a/node_modules/react-native-plaid-link-sdk/ios/RNPlaidHelper.m b/node_modules/react-native-plaid-link-sdk/ios/RNPlaidHelper.m
-new file mode 100644
-index 0000000..2288299
---- /dev/null
-+++ b/node_modules/react-native-plaid-link-sdk/ios/RNPlaidHelper.m
-@@ -0,0 +1,10 @@
-+#import "RNPlaidHelper.h"
-+
-+@implementation RNPlaidHelper
-+
-++ (id <PLKHandler> _Nullable)createWithLinkTokenConfiguration:(PLKLinkTokenConfiguration * _Nonnull)linkTokenConfiguration error:(NSError * _Nullable * _Nullable)error
-+{
-+    return [PLKPlaid createWithLinkTokenConfiguration:linkTokenConfiguration error:error];
-+}
-+
-+@end
-diff --git a/node_modules/react-native-plaid-link-sdk/package.json b/node_modules/react-native-plaid-link-sdk/package.json
-index 22c7d2c..3d1b85c 100644
---- a/node_modules/react-native-plaid-link-sdk/package.json
-+++ b/node_modules/react-native-plaid-link-sdk/package.json
-@@ -4,11 +4,13 @@
-   "description": "React Native Plaid Link SDK",
-   "main": "dist/index.js",
-   "types": "dist/index.d.ts",
-+  "react-native": "src/index.ts",
-   "files": [
-     "dist/**/*",
-     "android/**/*",
--    "ios",
--    "react-native-plaid-link-sdk.podspec"
-+    "ios/**/*",
-+    "react-native-plaid-link-sdk.podspec",
-+    "src/**/*"
-   ],
-   "scripts": {
-     "lint": "eslint \"./**/*.{js,jsx}\" --fix",
-@@ -47,7 +49,7 @@
-     "@react-native-community/eslint-plugin": "^1.1.0",
-     "@types/jest": "^26.0.14",
-     "@types/react": "^16.14.20",
--    "@types/react-native": "^0.66.0",
-+    "@types/react-native": "^0.71.3",
-     "@types/react-test-renderer": "^16.9.3",
-     "@typescript-eslint/eslint-plugin": "^4.33.0",
-     "@typescript-eslint/parser": "^4.33.0",
-@@ -62,5 +64,16 @@
-     "react": "18.0.0",
-     "react-native": "0.69.9",
-     "typescript": "^4.9.5"
-+  },
-+  "dependencies": {
-+    "react-native-plaid-link-sdk": "^10.4.0"
-+  },
-+  "codegenConfig": {
-+    "name": "rnplaidlink",
-+    "type": "modules",
-+    "jsSrcsDir": "./src/fabric",
-+    "android": {
-+      "javaPackageName": "com.plaid"
-+    }
-   }
- }
-diff --git a/node_modules/react-native-plaid-link-sdk/react-native-plaid-link-sdk.podspec b/node_modules/react-native-plaid-link-sdk/react-native-plaid-link-sdk.podspec
-index ee59a19..40ac7df 100644
---- a/node_modules/react-native-plaid-link-sdk/react-native-plaid-link-sdk.podspec
-+++ b/node_modules/react-native-plaid-link-sdk/react-native-plaid-link-sdk.podspec
-@@ -2,6 +2,8 @@ require 'json'
- 
- package = JSON.parse(File.read(File.join(__dir__, 'package.json')))
- 
-+fabric_enabled = ENV['RCT_NEW_ARCH_ENABLED'] == '1'
-+
- Pod::Spec.new do |s|
-   s.name         = package['name']
-   s.version      = package['version']
-@@ -13,8 +15,13 @@ Pod::Spec.new do |s|
-   s.platform     = :ios, "14.0"
- 
-   s.source       = { :git => "https://github.com/plaid/react-native-plaid-link-sdk.git", :tag => "v#{s.version}" }
--  s.source_files  = "ios/*.{h,m,swift}"
-+  s.source_files  = "ios/**/*.{h,m,mm,swift}"
-+
-+  if fabric_enabled
-+    install_modules_dependencies(s)
-+  else
-+    s.dependency "React-Core"
-+  end
- 
--  s.dependency 'React-Core'
-   s.dependency 'Plaid', '~> 5.2.0'
- end
-diff --git a/node_modules/react-native-plaid-link-sdk/src/EmbeddedLink/EmbeddedLinkView.tsx b/node_modules/react-native-plaid-link-sdk/src/EmbeddedLink/EmbeddedLinkView.tsx
-new file mode 100644
-index 0000000..0243de2
---- /dev/null
-+++ b/node_modules/react-native-plaid-link-sdk/src/EmbeddedLink/EmbeddedLinkView.tsx
-@@ -0,0 +1,95 @@
-+import React from 'react';
-+import { StyleProp, ViewStyle } from 'react-native';
-+import NativeEmbeddedLinkView from './NativeEmbeddedLinkView';
-+import { 
-+    LinkSuccessListener,
-+    LinkSuccess,
-+    LinkExitListener, 
-+    LinkExit, 
-+    LinkIOSPresentationStyle, 
-+    LinkOnEventListener,
-+    LinkEvent,
-+    LinkEventName,
-+    LinkEventMetadata,
-+    LinkError,
-+    LinkExitMetadata,
-+    LinkSuccessMetadata, 
-+} from '../Types';
-+
-+type EmbeddedLinkProps = {
-+    token: String,
-+    iOSPresentationStyle: LinkIOSPresentationStyle,
-+    onEvent: LinkOnEventListener | undefined,
-+    onSuccess: LinkSuccessListener,
-+    onExit: LinkExitListener | undefined,
-+    style: StyleProp<ViewStyle> | undefined,
-+}
-+
-+class EmbeddedEvent implements LinkEvent {
-+    eventName: LinkEventName;
-+    metadata: LinkEventMetadata;
-+
-+    constructor(event: any) {
-+        this.eventName = event.eventName
-+        this.metadata = event.metadata
-+    }
-+}
-+
-+class EmbeddedExit implements LinkExit {
-+    error: LinkError | undefined;
-+    metadata: LinkExitMetadata;
-+
-+    constructor(event: any) {
-+        this.error = event.error;
-+        this.metadata = event.metadata;
-+    }
-+}
-+
-+class EmbeddedSuccess implements LinkSuccess {
-+    publicToken: string;
-+    metadata: LinkSuccessMetadata;
-+
-+    constructor(event: any) {
-+        this.publicToken = event.publicToken;
-+        this.metadata = event.metadata;
-+    }
-+}
-+
-+export const EmbeddedLinkView: React.FC<EmbeddedLinkProps> = (props) => {
-+
-+    const {token, iOSPresentationStyle, onEvent, onSuccess, onExit, style} = props;
-+
-+    const onEmbeddedEvent = (event: any) => {
-+        
-+        switch (event.nativeEvent.embeddedEventName) {
-+            case 'onSuccess': {
-+                if (!onSuccess) { return; }
-+                const embeddedSuccess = new EmbeddedSuccess(event.nativeEvent);
-+                onSuccess(embeddedSuccess);
-+                break;
-+            }
-+            case 'onExit': {
-+                if (!onExit) {return; }
-+                const embeddedExit = new EmbeddedExit(event.nativeEvent);
-+                onExit(embeddedExit);
-+                break;
-+            }
-+            case 'onEvent': {
-+                if (!onEvent) { return; }
-+                const embeddedEvent = new EmbeddedEvent(event.nativeEvent);
-+                onEvent(embeddedEvent);
-+                break;
-+            }
-+            default: {
-+                return;
-+            }
-+        }
-+    }
-+
-+    return <NativeEmbeddedLinkView
-+                token={token}
-+                iOSPresentationStyle={iOSPresentationStyle.toString()}
-+                onEmbeddedEvent={onEmbeddedEvent}
-+                style={style}
-+            />
-+};
-\ No newline at end of file
-diff --git a/node_modules/react-native-plaid-link-sdk/src/EmbeddedLink/EmbeddedLinkView.web.tsx b/node_modules/react-native-plaid-link-sdk/src/EmbeddedLink/EmbeddedLinkView.web.tsx
-new file mode 100644
-index 0000000..7a71609
---- /dev/null
-+++ b/node_modules/react-native-plaid-link-sdk/src/EmbeddedLink/EmbeddedLinkView.web.tsx
-@@ -0,0 +1,5 @@
-+// EmbeddedLinkView.web.tsx is a shim file which causes web bundlers to ignore the EmbeddedLinkView.tsx file 
-+// which imports requireNativeComponent (causing a runtime error with react-native-web). 
-+// Ref - https://github.com/plaid/react-native-plaid-link-sdk/issues/564
-+import React from 'react';
-+export const EmbeddedLinkView = () => null;
-diff --git a/node_modules/react-native-plaid-link-sdk/src/EmbeddedLink/NativeEmbeddedLinkView.tsx b/node_modules/react-native-plaid-link-sdk/src/EmbeddedLink/NativeEmbeddedLinkView.tsx
-new file mode 100644
-index 0000000..da05fb1
---- /dev/null
-+++ b/node_modules/react-native-plaid-link-sdk/src/EmbeddedLink/NativeEmbeddedLinkView.tsx
-@@ -0,0 +1,9 @@
-+import { requireNativeComponent } from 'react-native';
-+
-+// Error "Tried to register two views with the same name PLKEmbeddedView"
-+// will be thrown during hot reload when any change is made to the
-+// file that is calling this requireNativeComponent('PLKEmbeddedView') call.
-+// Leaving this in its own file resolves this issue.
-+const NativeEmbeddedLinkView = requireNativeComponent<any>('PLKEmbeddedView');
-+
-+export default NativeEmbeddedLinkView;
-\ No newline at end of file
-diff --git a/node_modules/react-native-plaid-link-sdk/src/PlaidLink.tsx b/node_modules/react-native-plaid-link-sdk/src/PlaidLink.tsx
-new file mode 100644
-index 0000000..b35c06f
---- /dev/null
-+++ b/node_modules/react-native-plaid-link-sdk/src/PlaidLink.tsx
-@@ -0,0 +1,117 @@
-+import React, { useEffect } from 'react';
-+import { NativeEventEmitter, Platform, TouchableOpacity } from 'react-native';
-+import {
-+  LinkError,
-+  LinkEventListener,
-+  LinkExit,
-+  LinkIOSPresentationStyle,
-+  LinkLogLevel,
-+  LinkSuccess,
-+  PlaidLinkComponentProps,
-+  PlaidLinkProps,
-+} from './Types';
-+import RNLinksdkAndroid from './fabric/NativePlaidLinkModuleAndroid';
-+import RNLinksdkiOS from './fabric/NativePlaidLinkModuleiOS';
-+
-+const RNLinksdk = (Platform.OS === 'android' ? RNLinksdkAndroid : RNLinksdkiOS) ?? undefined;
-+
-+/**
-+ * A hook that registers a listener on the Plaid emitter for the 'onEvent' type.
-+ * The listener is cleaned up when this view is unmounted
-+ *
-+ * @param linkEventListener the listener to call
-+ */
-+export const usePlaidEmitter = (linkEventListener: LinkEventListener) => {
-+  useEffect(() => {
-+    const emitter = new NativeEventEmitter(RNLinksdk);
-+    const listener = emitter.addListener('onEvent', linkEventListener);
-+    // Clean up after this effect:
-+    return function cleanup() {
-+      listener.remove();
-+    };
-+  }, []);
-+};
-+
-+export const openLink = async (props: PlaidLinkProps) => {
-+  let config = props.tokenConfig;
-+  let noLoadingState = config.noLoadingState ?? false;
-+
-+  if (Platform.OS === 'android') {
-+    if (RNLinksdkAndroid === null) {
-+      throw new Error('[react-native-plaid-link-sdk] RNLinksdkAndroid is not defined');
-+    }
-+
-+    RNLinksdkAndroid.startLinkActivityForResult(
-+      config.token,
-+      noLoadingState,
-+      config.logLevel ?? LinkLogLevel.ERROR,
-+      // @ts-ignore we use Object type in the spec file as it maps to NSDictionary and ReadableMap
-+      (result: LinkSuccess) => {
-+        if (props.onSuccess != null) {
-+          props.onSuccess(result);
-+        }
-+      },
-+      (result: LinkExit) => {
-+        if (props.onExit != null) {
-+          if (result.error != null && result.error.displayMessage != null) {
-+            //TODO(RNSDK-118): Remove errorDisplayMessage field in next major update.
-+            result.error.errorDisplayMessage = result.error.displayMessage;
-+          }
-+          props.onExit(result);
-+        }
-+      },
-+    );
-+  } else {
-+    if (RNLinksdkiOS === null) {
-+      throw new Error('[react-native-plaid-link-sdk] RNLinksdkiOS is not defined');
-+    }
-+
-+    RNLinksdkiOS.create(config.token, noLoadingState);
-+
-+    let presentFullScreen =
-+      props.iOSPresentationStyle == LinkIOSPresentationStyle.FULL_SCREEN;
-+
-+    RNLinksdkiOS.open(
-+      presentFullScreen,
-+      // @ts-ignore we use Object type in the spec file as it maps to NSDictionary and ReadableMap
-+      (result: LinkSuccess) => {
-+        if (props.onSuccess != null) {
-+          props.onSuccess(result);
-+        }
-+      },
-+      (error: LinkError, result: LinkExit) => {
-+        if (props.onExit != null) {
-+          if (error) {
-+            var data = result || {};
-+            data.error = error;
-+            props.onExit(data);
-+          } else {
-+            props.onExit(result);
-+          }
-+        }
-+      },
-+    );
-+  }
-+};
-+
-+export const dismissLink = () => {
-+  if (Platform.OS === 'ios') {
-+    if (RNLinksdkiOS === null) {
-+      throw new Error('[react-native-plaid-link-sdk] RNLinksdkiOS is not defined');
-+    }
-+
-+    RNLinksdkiOS.dismiss();
-+  }
-+};
-+
-+export const PlaidLink = (props: PlaidLinkComponentProps) => {
-+  function onPress() {
-+    props.onPress?.();
-+    openLink(props);
-+  }
-+
-+  return (
-+    // @ts-ignore some types directories misconfiguration
-+    <TouchableOpacity onPress={onPress}>{props.children}</TouchableOpacity>
-+  );
-+};
-diff --git a/node_modules/react-native-plaid-link-sdk/src/Types.ts b/node_modules/react-native-plaid-link-sdk/src/Types.ts
-new file mode 100644
-index 0000000..a7d30c6
---- /dev/null
-+++ b/node_modules/react-native-plaid-link-sdk/src/Types.ts
-@@ -0,0 +1,550 @@
-+interface CommonPlaidLinkOptions {
-+    logLevel?: LinkLogLevel;
-+    extras?: Record<string, any>;
-+}
-+
-+export type LinkTokenConfiguration = (CommonPlaidLinkOptions & {
-+    token: string;
-+    // A `Bool` indicating that Link should skip displaying a loading animation until the Link UI is fully loaded.
-+    // This can be used to display custom loading UI while Link content is loading (and will skip any initial loading UI in Link).
-+    // Note: Dismiss custom loading UI on the OPEN & EXIT events.
-+    //
-+    // Note: This should be set to `true` when setting the `eu_config.headless` field in /link/token/create requests to `true`.
-+    // For reference, see https://plaid.com/docs/api/tokens/#link-token-create-request-eu-config-headless
-+    noLoadingState?: boolean;
-+});
-+
-+export enum LinkLogLevel {
-+    DEBUG="debug",
-+    INFO="info",
-+    WARN="warn",
-+    ERROR="error",
-+}
-+
-+export enum PlaidEnvironment {
-+    PRODUCTION = 'production',
-+    DEVELOPMENT = 'development',
-+    SANDBOX = 'sandbox',
-+}
-+
-+export enum PlaidProduct {
-+    ASSETS="assets",
-+    AUTH="auth",
-+    DEPOSIT_SWITCH="deposit_switch",
-+    IDENTITY="identity",
-+    INCOME="income",
-+    INVESTMENTS="investments",
-+    LIABILITIES="liabilities",
-+    LIABILITIES_REPORT="liabilities_report",
-+    PAYMENT_INITIATION="payment_initiation",
-+    TRANSACTIONS="transactions",
-+}
-+
-+export enum LinkAccountType {
-+    CREDIT = 'credit',
-+    DEPOSITORY = 'depository',
-+    INVESTMENT = 'investment',
-+    LOAN = 'loan',
-+    OTHER = 'other',
-+}
-+
-+export enum LinkAccountSubtypes {
-+    ALL = 'all',
-+    CREDIT_CARD = 'credit card',
-+    PAYPAL = 'paypal',
-+    AUTO = 'auto',
-+    BUSINESS = 'business',
-+    COMMERCIAL = 'commercial',
-+    CONSTRUCTION = 'construction',
-+    CONSUMER = 'consumer',
-+    HOME_EQUITY = 'home equity',
-+    LINE_OF_CREDIT = 'line of credit',
-+    LOAN = 'loan',
-+    MORTGAGE = 'mortgage',
-+    OVERDRAFT = 'overdraft',
-+    STUDENT = 'student',
-+    CASH_MANAGEMENT = 'cash management',
-+    CD = 'cd',
-+    CHECKING = 'checking',
-+    EBT = 'ebt',
-+    HSA = 'hsa',
-+    MONEY_MARKET = 'money market',
-+    PREPAID = 'prepaid',
-+    SAVINGS = 'savings',
-+    FOUR_0_1_A = '401a',
-+    FOUR_0_1_K = '401k',
-+    FOUR_0_3_B = '403B',
-+    FOUR_5_7_B = '457b',
-+    FIVE_2_9 = '529',
-+    BROKERAGE = 'brokerage',
-+    CASH_ISA = 'cash isa',
-+    EDUCATION_SAVINGS_ACCOUNT = 'education savings account',
-+    FIXED_ANNUNITY = 'fixed annuity',
-+    GIC = 'gic',
-+    HEALTH_REIMBURSEMENT_ARRANGEMENT = 'health reimbursement arrangement',
-+    IRA = 'ira',
-+    ISA = 'isa',
-+    KEOGH = 'keogh',
-+    LIF = 'lif',
-+    LIRA = 'lira',
-+    LRIF = 'lrif',
-+    LRSP = 'lrsp',
-+    MUTUAL_FUND = 'mutual fund',
-+    NON_TAXABLE_BROKERAGE_ACCOUNT = 'non-taxable brokerage account',
-+    PENSION = 'pension',
-+    PLAN = 'plan',
-+    PRIF = 'prif',
-+    PROFIT_SHARING_PLAN = 'profit sharing plan',
-+    RDSP = 'rdsp',
-+    RESP = 'resp',
-+    RETIREMENT = 'retirement',
-+    RLIF = 'rlif',
-+    ROTH_401K = 'roth 401k',
-+    ROTH = 'roth',
-+    RRIF = 'rrif',
-+    RRSP = 'rrsp',
-+    SARSEP = 'sarsep',
-+    SEP_IRA = 'sep ira',
-+    SIMPLE_IRA = 'simple ira',
-+    SIPP = 'sipp',
-+    STOCK_PLAN = 'stock plan',
-+    TFSA = 'tfsa',
-+    THRIFT_SAVINGS_PLAN = 'thrift savings plan',
-+    TRUST = 'trust',
-+    UGMA = 'ugma',
-+    UTMA = 'utma',
-+    VARIABLE_ANNUITY = 'variable annuity'
-+}
-+
-+export interface LinkAccountSubtype {
-+}
-+
-+export class LinkAccountSubtypeCredit implements LinkAccountSubtype {
-+    public static readonly ALL = new LinkAccountSubtypeCredit(LinkAccountType.CREDIT, LinkAccountSubtypes.ALL);
-+    public static readonly CREDIT_CARD = new LinkAccountSubtypeCredit(LinkAccountType.CREDIT, LinkAccountSubtypes.CREDIT_CARD);
-+    public static readonly PAYPAL = new LinkAccountSubtypeCredit(LinkAccountType.CREDIT, LinkAccountSubtypes.PAYPAL);
-+  
-+    private constructor(public readonly type: LinkAccountType, public readonly subtype: LinkAccountSubtype) { }
-+}
-+
-+export class LinkAccountSubtypeDepository implements LinkAccountSubtype {
-+    public static readonly ALL = new LinkAccountSubtypeDepository(LinkAccountType.DEPOSITORY, LinkAccountSubtypes.ALL);
-+    public static readonly CASH_MANAGEMENT = new LinkAccountSubtypeDepository(LinkAccountType.DEPOSITORY, LinkAccountSubtypes.CASH_MANAGEMENT);
-+    public static readonly CD = new LinkAccountSubtypeDepository(LinkAccountType.DEPOSITORY, LinkAccountSubtypes.CD);
-+    public static readonly CHECKING = new LinkAccountSubtypeDepository(LinkAccountType.DEPOSITORY, LinkAccountSubtypes.CHECKING);
-+    public static readonly EBT = new LinkAccountSubtypeDepository(LinkAccountType.DEPOSITORY, LinkAccountSubtypes.EBT);
-+    public static readonly HSA = new LinkAccountSubtypeDepository(LinkAccountType.DEPOSITORY, LinkAccountSubtypes.HSA);
-+    public static readonly MONEY_MARKET = new LinkAccountSubtypeDepository(LinkAccountType.DEPOSITORY, LinkAccountSubtypes.MONEY_MARKET);
-+    public static readonly PAYPAL = new LinkAccountSubtypeDepository(LinkAccountType.DEPOSITORY, LinkAccountSubtypes.PAYPAL);
-+    public static readonly PREPAID = new LinkAccountSubtypeDepository(LinkAccountType.DEPOSITORY, LinkAccountSubtypes.PREPAID);
-+    public static readonly SAVINGS = new LinkAccountSubtypeDepository(LinkAccountType.DEPOSITORY, LinkAccountSubtypes.SAVINGS);
-+  
-+    private constructor(public readonly type: LinkAccountType, public readonly subtype: LinkAccountSubtype) { }
-+}
-+
-+export class LinkAccountSubtypeInvestment implements LinkAccountSubtype {
-+    public static readonly ALL = new LinkAccountSubtypeInvestment(LinkAccountType.INVESTMENT, LinkAccountSubtypes.ALL);
-+    public static readonly BROKERAGE = new LinkAccountSubtypeInvestment(LinkAccountType.INVESTMENT, LinkAccountSubtypes.BROKERAGE);
-+    public static readonly CASH_ISA = new LinkAccountSubtypeInvestment(LinkAccountType.INVESTMENT, LinkAccountSubtypes.CASH_ISA);
-+    public static readonly EDUCATION_SAVINGS_ACCOUNT = new LinkAccountSubtypeInvestment(LinkAccountType.INVESTMENT, LinkAccountSubtypes.EDUCATION_SAVINGS_ACCOUNT);
-+    public static readonly FIXED_ANNUNITY = new LinkAccountSubtypeInvestment(LinkAccountType.INVESTMENT, LinkAccountSubtypes.FIXED_ANNUNITY);
-+    public static readonly GIC = new LinkAccountSubtypeInvestment(LinkAccountType.INVESTMENT, LinkAccountSubtypes.GIC);
-+    public static readonly HEALTH_REIMBURSEMENT_ARRANGEMENT = new LinkAccountSubtypeInvestment(LinkAccountType.INVESTMENT, LinkAccountSubtypes.HEALTH_REIMBURSEMENT_ARRANGEMENT);
-+    public static readonly HSA = new LinkAccountSubtypeInvestment(LinkAccountType.INVESTMENT, LinkAccountSubtypes.HSA);
-+    public static readonly INVESTMENT_401A = new LinkAccountSubtypeInvestment(LinkAccountType.INVESTMENT, LinkAccountSubtypes.FOUR_0_1_A);
-+    public static readonly INVESTMENT_401K = new LinkAccountSubtypeInvestment(LinkAccountType.INVESTMENT, LinkAccountSubtypes.FOUR_0_1_K);
-+    public static readonly INVESTMENT_403B = new LinkAccountSubtypeInvestment(LinkAccountType.INVESTMENT, LinkAccountSubtypes.FOUR_0_3_B);
-+    public static readonly  INVESTMENT_457B = new LinkAccountSubtypeInvestment(LinkAccountType.INVESTMENT, LinkAccountSubtypes.FOUR_5_7_B);
-+    public static readonly INVESTMENT_529 = new LinkAccountSubtypeInvestment(LinkAccountType.INVESTMENT, LinkAccountSubtypes.FIVE_2_9);
-+    public static readonly IRA = new LinkAccountSubtypeInvestment(LinkAccountType.INVESTMENT, LinkAccountSubtypes.IRA);
-+    public static readonly ISA = new LinkAccountSubtypeInvestment(LinkAccountType.INVESTMENT, LinkAccountSubtypes.ISA);
-+    public static readonly KEOGH = new LinkAccountSubtypeInvestment(LinkAccountType.INVESTMENT, LinkAccountSubtypes.KEOGH);
-+    public static readonly LIF = new LinkAccountSubtypeInvestment(LinkAccountType.INVESTMENT, LinkAccountSubtypes.LIF);
-+    public static readonly LIRA = new LinkAccountSubtypeInvestment(LinkAccountType.INVESTMENT, LinkAccountSubtypes.LIRA);
-+    public static readonly LRIF = new LinkAccountSubtypeInvestment(LinkAccountType.INVESTMENT, LinkAccountSubtypes.LRIF);
-+    public static readonly LRSP = new LinkAccountSubtypeInvestment(LinkAccountType.INVESTMENT, LinkAccountSubtypes.LRSP);
-+    public static readonly MUTUAL_FUND = new LinkAccountSubtypeInvestment(LinkAccountType.INVESTMENT, LinkAccountSubtypes.MUTUAL_FUND);
-+    public static readonly NON_TAXABLE_BROKERAGE_ACCOUNT = new LinkAccountSubtypeInvestment(LinkAccountType.INVESTMENT, LinkAccountSubtypes.NON_TAXABLE_BROKERAGE_ACCOUNT);
-+    public static readonly PENSION = new LinkAccountSubtypeInvestment(LinkAccountType.INVESTMENT, LinkAccountSubtypes.PENSION);
-+    public static readonly PLAN = new LinkAccountSubtypeInvestment(LinkAccountType.INVESTMENT, LinkAccountSubtypes.PLAN);
-+    public static readonly PRIF = new LinkAccountSubtypeInvestment(LinkAccountType.INVESTMENT, LinkAccountSubtypes.PRIF);
-+    public static readonly PROFIT_SHARING_PLAN = new LinkAccountSubtypeInvestment(LinkAccountType.INVESTMENT, LinkAccountSubtypes.PROFIT_SHARING_PLAN);
-+    public static readonly RDSP = new LinkAccountSubtypeInvestment(LinkAccountType.INVESTMENT, LinkAccountSubtypes.RDSP);
-+    public static readonly RESP = new LinkAccountSubtypeInvestment(LinkAccountType.INVESTMENT, LinkAccountSubtypes.RESP);
-+    public static readonly RETIREMENT = new LinkAccountSubtypeInvestment(LinkAccountType.INVESTMENT, LinkAccountSubtypes.RETIREMENT);
-+    public static readonly RLIF = new LinkAccountSubtypeInvestment(LinkAccountType.INVESTMENT, LinkAccountSubtypes.RLIF);
-+    public static readonly ROTH = new LinkAccountSubtypeInvestment(LinkAccountType.INVESTMENT, LinkAccountSubtypes.ROTH);
-+    public static readonly ROTH_401K = new LinkAccountSubtypeInvestment(LinkAccountType.INVESTMENT, LinkAccountSubtypes.ROTH_401K);
-+    public static readonly RRIF = new LinkAccountSubtypeInvestment(LinkAccountType.INVESTMENT, LinkAccountSubtypes.RRIF);
-+    public static readonly RRSP = new LinkAccountSubtypeInvestment(LinkAccountType.INVESTMENT, LinkAccountSubtypes.RRSP);
-+    public static readonly SARSEP = new LinkAccountSubtypeInvestment(LinkAccountType.INVESTMENT, LinkAccountSubtypes.SARSEP);
-+    public static readonly SEP_IRA = new LinkAccountSubtypeInvestment(LinkAccountType.INVESTMENT, LinkAccountSubtypes.SEP_IRA);
-+    public static readonly SIMPLE_IRA = new LinkAccountSubtypeInvestment(LinkAccountType.INVESTMENT, LinkAccountSubtypes.SIMPLE_IRA);
-+    public static readonly SIIP = new LinkAccountSubtypeInvestment(LinkAccountType.INVESTMENT, LinkAccountSubtypes.SIPP);
-+    public static readonly STOCK_PLAN = new LinkAccountSubtypeInvestment(LinkAccountType.INVESTMENT, LinkAccountSubtypes.STOCK_PLAN);
-+    public static readonly TFSA = new LinkAccountSubtypeInvestment(LinkAccountType.INVESTMENT, LinkAccountSubtypes.TFSA);
-+    public static readonly THRIFT_SAVINGS_PLAN = new LinkAccountSubtypeInvestment(LinkAccountType.INVESTMENT, LinkAccountSubtypes.THRIFT_SAVINGS_PLAN);
-+    public static readonly TRUST = new LinkAccountSubtypeInvestment(LinkAccountType.INVESTMENT, LinkAccountSubtypes.TRUST);
-+    public static readonly UGMA = new LinkAccountSubtypeInvestment(LinkAccountType.INVESTMENT, LinkAccountSubtypes.UGMA);
-+    public static readonly UTMA = new LinkAccountSubtypeInvestment(LinkAccountType.INVESTMENT, LinkAccountSubtypes.UTMA);
-+    public static readonly VARIABLE_ANNUITY = new LinkAccountSubtypeInvestment(LinkAccountType.INVESTMENT, LinkAccountSubtypes.VARIABLE_ANNUITY);
-+  
-+    private constructor(public readonly type: LinkAccountType, public readonly subtype: LinkAccountSubtype) { }
-+}
-+
-+export class LinkAccountSubtypeLoan implements LinkAccountSubtype {
-+    public static readonly ALL = new LinkAccountSubtypeLoan(LinkAccountType.CREDIT, LinkAccountSubtypes.ALL);
-+    public static readonly AUTO = new LinkAccountSubtypeLoan(LinkAccountType.CREDIT, LinkAccountSubtypes.AUTO);
-+    public static readonly BUSINESS = new LinkAccountSubtypeLoan(LinkAccountType.CREDIT, LinkAccountSubtypes.BUSINESS);
-+    public static readonly COMMERCIAL = new LinkAccountSubtypeLoan(LinkAccountType.CREDIT, LinkAccountSubtypes.COMMERCIAL);
-+    public static readonly CONSTRUCTION = new LinkAccountSubtypeLoan(LinkAccountType.CREDIT, LinkAccountSubtypes.CONSTRUCTION);
-+    public static readonly CONSUMER = new LinkAccountSubtypeLoan(LinkAccountType.CREDIT, LinkAccountSubtypes.CONSUMER);
-+    public static readonly HOME_EQUITY = new LinkAccountSubtypeLoan(LinkAccountType.CREDIT, LinkAccountSubtypes.HOME_EQUITY);
-+    public static readonly LINE_OF_CREDIT = new LinkAccountSubtypeLoan(LinkAccountType.CREDIT, LinkAccountSubtypes.LINE_OF_CREDIT);
-+    public static readonly LOAN = new LinkAccountSubtypeLoan(LinkAccountType.CREDIT, LinkAccountSubtypes.LOAN);
-+    public static readonly MORTGAGE = new LinkAccountSubtypeLoan(LinkAccountType.CREDIT, LinkAccountSubtypes.MORTGAGE);
-+    public static readonly OVERDRAFT = new LinkAccountSubtypeLoan(LinkAccountType.CREDIT, LinkAccountSubtypes.OVERDRAFT);
-+    public static readonly STUDENT = new LinkAccountSubtypeLoan(LinkAccountType.CREDIT, LinkAccountSubtypes.STUDENT);
-+  
-+    private constructor(public readonly type: LinkAccountType, public readonly subtype: LinkAccountSubtype) { }
-+}
-+
-+export class LinkAccountSubtypeUnknown implements LinkAccountSubtype {
-+    constructor(public readonly type: string, public readonly subtype: string) { }
-+}
-+
-+export interface LinkSuccess {
-+    publicToken: string;
-+    metadata: LinkSuccessMetadata;
-+}
-+
-+export interface LinkSuccessMetadata {
-+    institution?: LinkInstitution;
-+    accounts: LinkAccount[];
-+    linkSessionId: string;
-+    metadataJson?: string;
-+}
-+
-+export interface LinkAccount {
-+    id: string;
-+    name?: string;
-+    mask?: string;
-+    type: LinkAccountType;
-+    subtype: LinkAccountSubtype;
-+    verificationStatus?: LinkAccountVerificationStatus;
-+}
-+
-+export enum LinkAccountVerificationStatus {
-+    PENDING_AUTOMATIC_VERIFICATION = 'pending_automatic_verification',
-+    PENDING_MANUAL_VERIFICATION = 'pending_manual_verification',
-+    MANUALLY_VERIFIED = 'manually_verified',
-+}
-+
-+export interface LinkInstitution {
-+    id: string;
-+    name: string;
-+}
-+
-+export interface LinkExit {
-+    error?: LinkError;
-+    metadata: LinkExitMetadata;
-+}
-+
-+export interface LinkExitMetadata {
-+    status?: LinkExitMetadataStatus;
-+    institution?: LinkInstitution;
-+    linkSessionId: string;
-+    requestId: string;
-+    metadataJson?: string;
-+}
-+
-+export enum LinkExitMetadataStatus {
-+    CONNECTED = 'connected',
-+    CHOOSE_DEVICE = 'choose_device',
-+    REQUIRES_ACCOUNT_SELECTION = 'requires_account_selection',
-+    REQUIRES_CODE = 'requires_code',
-+    REQUIRES_CREDENTIALS = 'requires_credentials',
-+    REQUIRES_EXTERNAL_ACTION = 'requires_external_action',
-+    REQUIRES_OAUTH = 'requires_oauth',
-+    REQUIRES_QUESTIONS = 'requires_questions',
-+    REQUIRES_RECAPTCHA = 'requires_recaptcha',
-+    REQUIRES_SELECTIONS = 'requires_selections',
-+    REQUIRES_DEPOSIT_SWITCH_ALLOCATION_CONFIGURATION = 'requires_deposit_switch_allocation_configuration',
-+    REQUIRES_DEPOSIT_SWITCH_ALLOCATION_SELECTION = 'requires_deposit_switch_allocation_selection',
-+}
-+
-+export interface LinkError {
-+    errorCode: LinkErrorCode;
-+    errorType: LinkErrorType;
-+    errorMessage: string;
-+    /** @deprecated DO NOT USE, data not guaranteed. Use `displayMessage` instead */
-+    errorDisplayMessage?: string;
-+    displayMessage?: string;
-+    errorJson?: string;
-+}
-+
-+export enum LinkErrorCode {
-+    // ITEM_ERROR
-+    INVALID_CREDENTIALS = "INVALID_CREDENTIALS",
-+    INVALID_MFA = "INVALID_MFA",
-+    ITEM_LOGIN_REQUIRED = "ITEM_LOGIN_REQUIRED",
-+    INSUFFICIENT_CREDENTIALS = "INSUFFICIENT_CREDENTIALS",
-+    ITEM_LOCKED = "ITEM_LOCKED",
-+    USER_SETUP_REQUIRED = "USER_SETUP_REQUIRED",
-+    MFA_NOT_SUPPORTED = "MFA_NOT_SUPPORTED",
-+    INVALID_SEND_METHOD = "INVALID_SEND_METHOD",
-+    NO_ACCOUNTS = "NO_ACCOUNTS",
-+    ITEM_NOT_SUPPORTED = "ITEM_NOT_SUPPORTED",
-+    TOO_MANY_VERIFICATION_ATTEMPTS = "TOO_MANY_VERIFICATION_ATTEMPTS",
-+
-+    INVALD_UPDATED_USERNAME = "INVALD_UPDATED_USERNAME",
-+    INVALID_UPDATED_USERNAME = "INVALID_UPDATED_USERNAME",
-+
-+    ITEM_NO_ERROR = "ITEM_NO_ERROR",
-+    item_no_error = "item-no-error",
-+    NO_AUTH_ACCOUNTS = "NO_AUTH_ACCOUNTS",
-+    NO_INVESTMENT_ACCOUNTS = "NO_INVESTMENT_ACCOUNTS",
-+    NO_INVESTMENT_AUTH_ACCOUNTS = "NO_INVESTMENT_AUTH_ACCOUNTS",
-+    NO_LIABILITY_ACCOUNTS = "NO_LIABILITY_ACCOUNTS",
-+    PRODUCTS_NOT_SUPPORTED = "PRODUCTS_NOT_SUPPORTED",
-+    ITEM_NOT_FOUND = "ITEM_NOT_FOUND",
-+    ITEM_PRODUCT_NOT_READY = "ITEM_PRODUCT_NOT_READY",
-+
-+    // INSTITUTION_ERROR
-+    INSTITUTION_DOWN = "INSTITUTION_DOWN",
-+    INSTITUTION_NOT_RESPONDING = "INSTITUTION_NOT_RESPONDING",
-+    INSTITUTION_NOT_AVAILABLE = "INSTITUTION_NOT_AVAILABLE",
-+    INSTITUTION_NO_LONGER_SUPPORTED = "INSTITUTION_NO_LONGER_SUPPORTED",
-+
-+    // API_ERROR
-+    INTERNAL_SERVER_ERROR = "INTERNAL_SERVER_ERROR",
-+    PLANNED_MAINTENANCE = "PLANNED_MAINTENANCE",
-+
-+    // ASSET_REPORT_ERROR
-+    PRODUCT_NOT_ENABLED = "PRODUCT_NOT_ENABLED",
-+    DATA_UNAVAILABLE = "DATA_UNAVAILABLE",
-+    ASSET_PRODUCT_NOT_READY = "ASSET_PRODUCT_NOT_READY",
-+    ASSET_REPORT_GENERATION_FAILED = "ASSET_REPORT_GENERATION_FAILED",
-+    INVALID_PARENT = "INVALID_PARENT",
-+    INSIGHTS_NOT_ENABLED = "INSIGHTS_NOT_ENABLED",
-+    INSIGHTS_PREVIOUSLY_NOT_ENABLED = "INSIGHTS_PREVIOUSLY_NOT_ENABLED",
-+
-+    // BANK_TRANSFER_ERROR
-+    BANK_TRANSFER_LIMIT_EXCEEDED = "BANK_TRANSFER_LIMIT_EXCEEDED",
-+    BANK_TRANSFER_MISSING_ORIGINATION_ACCOUNT = "BANK_TRANSFER_MISSING_ORIGINATION_ACCOUNT",
-+    BANK_TRANSFER_INVALID_ORIGINATION_ACCOUNT = "BANK_TRANSFER_INVALID_ORIGINATION_ACCOUNT",
-+    BANK_TRANSFER_ACCOUNT_BLOCKED = "BANK_TRANSFER_ACCOUNT_BLOCKED",
-+    BANK_TRANSFER_INSUFFICIENT_FUNDS = "BANK_TRANSFER_INSUFFICIENT_FUNDS",
-+    BANK_TRANSFER_NOT_CANCELLABLE = "BANK_TRANSFER_NOT_CANCELLABLE",
-+    BANK_TRANSFER_UNSUPPORTED_ACCOUNT_TYPE = "BANK_TRANSFER_UNSUPPORTED_ACCOUNT_TYPE",
-+    BANK_TRANSFER_UNSUPPORTED_ENVIRONMENT = "BANK_TRANSFER_UNSUPPORTED_ENVIRONMENT",
-+
-+    // SANDBOX_ERROR
-+    SANDBOX_PRODUCT_NOT_ENABLED = "SANDBOX_PRODUCT_NOT_ENABLED",
-+    SANDBOX_WEBHOOK_INVALID = "SANDBOX_WEBHOOK_INVALID",
-+    SANDBOX_BANK_TRANSFER_EVENT_TRANSITION_INVALID = "SANDBOX_BANK_TRANSFER_EVENT_TRANSITION_INVALID",
-+
-+    // INVALID_REQUEST
-+    MISSING_FIELDS = "MISSING_FIELDS",
-+    UNKNOWN_FIELDS = "UNKNOWN_FIELDS",
-+    INVALID_FIELD = "INVALID_FIELD",
-+    INCOMPATIBLE_API_VERSION = "INCOMPATIBLE_API_VERSION",
-+    INVALID_BODY = "INVALID_BODY",
-+    INVALID_HEADERS = "INVALID_HEADERS",
-+    NOT_FOUND = "NOT_FOUND",
-+    NO_LONGER_AVAILABLE = "NO_LONGER_AVAILABLE",
-+    SANDBOX_ONLY = "SANDBOX_ONLY",
-+    INVALID_ACCOUNT_NUMBER = "INVALID_ACCOUNT_NUMBER",
-+
-+    // INVALID_INPUT
-+    // From above ITEM_LOGIN_REQUIRED = "INVALID_CREDENTIALS",
-+    INCORRECT_DEPOSIT_AMOUNTS = "INCORRECT_DEPOSIT_AMOUNTS",
-+    UNAUTHORIZED_ENVIRONMENT = "UNAUTHORIZED_ENVIRONMENT",
-+    INVALID_PRODUCT = "INVALID_PRODUCT",
-+    UNAUTHORIZED_ROUTE_ACCESS = "UNAUTHORIZED_ROUTE_ACCESS",
-+    DIRECT_INTEGRATION_NOT_ENABLED = "DIRECT_INTEGRATION_NOT_ENABLED",
-+    INVALID_API_KEYS = "INVALID_API_KEYS",
-+    INVALID_ACCESS_TOKEN = "INVALID_ACCESS_TOKEN",
-+    INVALID_PUBLIC_TOKEN = "INVALID_PUBLIC_TOKEN",
-+    INVALID_LINK_TOKEN = "INVALID_LINK_TOKEN",
-+    INVALID_PROCESSOR_TOKEN = "INVALID_PROCESSOR_TOKEN",
-+    INVALID_AUDIT_COPY_TOKEN = "INVALID_AUDIT_COPY_TOKEN",
-+    INVALID_ACCOUNT_ID = "INVALID_ACCOUNT_ID",
-+    MICRODEPOSITS_ALREADY_VERIFIED = "MICRODEPOSITS_ALREADY_VERIFIED",
-+
-+    // INVALID_RESULT
-+    PLAID_DIRECT_ITEM_IMPORT_RETURNED_INVALID_MFA = "PLAID_DIRECT_ITEM_IMPORT_RETURNED_INVALID_MFA",
-+
-+    // RATE_LIMIT_EXCEEDED
-+    ACCOUNTS_LIMIT = "ACCOUNTS_LIMIT",
-+    ADDITION_LIMIT = "ADDITION_LIMIT",
-+    AUTH_LIMIT = "AUTH_LIMIT",
-+    BALANCE_LIMIT = "BALANCE_LIMIT",
-+    IDENTITY_LIMIT = "IDENTITY_LIMIT",
-+    ITEM_GET_LIMIT = "ITEM_GET_LIMIT",
-+    RATE_LIMIT = "RATE_LIMIT",
-+    TRANSACTIONS_LIMIT = "TRANSACTIONS_LIMIT",
-+
-+    // RECAPTCHA_ERROR
-+    RECAPTCHA_REQUIRED = "RECAPTCHA_REQUIRED",
-+    RECAPTCHA_BAD = "RECAPTCHA_BAD",
-+
-+    // OAUTH_ERROR
-+    INCORRECT_OAUTH_NONCE = "INCORRECT_OAUTH_NONCE",
-+    OAUTH_STATE_ID_ALREADY_PROCESSED = "OAUTH_STATE_ID_ALREADY_PROCESSED",
-+}
-+
-+export enum LinkErrorType {
-+    BANK_TRANSFER = 'BANK_TRANSFER_ERROR',
-+    INVALID_REQUEST = 'INVALID_REQUEST',
-+    INVALID_RESULT = 'INVALID_RESULT',
-+    INVALID_INPUT = 'INVALID_INPUT',
-+    INSTITUTION_ERROR = 'INSTITUTION_ERROR',
-+    RATE_LIMIT_EXCEEDED = 'RATE_LIMIT_EXCEEDED',
-+    API_ERROR = 'API_ERROR',
-+    ITEM_ERROR = 'ITEM_ERROR',
-+    AUTH_ERROR = 'AUTH_ERROR',
-+    ASSET_REPORT_ERROR = 'ASSET_REPORT_ERROR',
-+    SANDBOX_ERROR = 'SANDBOX_ERROR',
-+    RECAPTCHA_ERROR = 'RECAPTCHA_ERROR',
-+    OAUTH_ERROR = 'OAUTH_ERROR',
-+}
-+
-+export type LinkEventListener = (linkEvent: LinkEvent) => void
-+
-+export interface LinkEvent {
-+    eventName: LinkEventName;
-+    metadata: LinkEventMetadata;
-+}
-+
-+export interface LinkEventMetadata {
-+    accountNumberMask?: string;
-+    linkSessionId: string;
-+    mfaType?: string;
-+    requestId?: string;
-+    viewName: LinkEventViewName;
-+    errorCode?: string;
-+    errorMessage?: string;
-+    errorType?: string;
-+    exitStatus?: string;
-+    institutionId?: string;
-+    institutionName?: string;
-+    institutionSearchQuery?: string;
-+    isUpdateMode?: string;
-+    matchReason?: string;
-+  // see possible values for selection at https://plaid.com/docs/link/web/#link-web-onevent-selection
-+    selection?: null | string;
-+    timestamp: string;
-+}
-+
-+export enum LinkEventName {
-+    BANK_INCOME_INSIGHTS_COMPLETED = "BANK_INCOME_INSIGHTS_COMPLETED",
-+    CLOSE_OAUTH = 'CLOSE_OAUTH',
-+    ERROR = 'ERROR',
-+    EXIT = 'EXIT',
-+    FAIL_OAUTH = 'FAIL_OAUTH',
-+    HANDOFF = 'HANDOFF',
-+    IDENTITY_VERIFICATION_START_STEP = 'IDENTITY_VERIFICATION_START_STEP',
-+    IDENTITY_VERIFICATION_PASS_STEP = 'IDENTITY_VERIFICATION_PASS_STEP',
-+    IDENTITY_VERIFICATION_FAIL_STEP = 'IDENTITY_VERIFICATION_FAIL_STEP',
-+    IDENTITY_VERIFICATION_PENDING_REVIEW_STEP = 'IDENTITY_VERIFICATION_PENDING_REVIEW_STEP',
-+    IDENTITY_VERIFICATION_PENDING_REVIEW_SESSION = 'IDENTITY_VERIFICATION_PENDING_REVIEW_SESSION',
-+    IDENTITY_VERIFICATION_CREATE_SESSION = 'IDENTITY_VERIFICATION_CREATE_SESSION',
-+    IDENTITY_VERIFICATION_RESUME_SESSION = 'IDENTITY_VERIFICATION_RESUME_SESSION',
-+    IDENTITY_VERIFICATION_PASS_SESSION = 'IDENTITY_VERIFICATION_PASS_SESSION',
-+    IDENTITY_VERIFICATION_FAIL_SESSION = 'IDENTITY_VERIFICATION_FAIL_SESSION',
-+    IDENTITY_VERIFICATION_OPEN_UI = 'IDENTITY_VERIFICATION_OPEN_UI',
-+    IDENTITY_VERIFICATION_RESUME_UI = 'IDENTITY_VERIFICATION_RESUME_UI',
-+    IDENTITY_VERIFICATION_CLOSE_UI = 'IDENTITY_VERIFICATION_CLOSE_UI',
-+    MATCHED_CONSENT = 'MATCHED_CONSENT',
-+    MATCHED_SELECT_INSTITUTION = 'MATCHED_SELECT_INSTITUTION',
-+    MATCHED_SELECT_VERIFY_METHOD = 'MATCHED_SELECT_VERIFY_METHOD',
-+    OPEN = 'OPEN',
-+    OPEN_MY_PLAID = 'OPEN_MY_PLAID',
-+    OPEN_OAUTH = 'OPEN_OAUTH',
-+    SEARCH_INSTITUTION = 'SEARCH_INSTITUTION',
-+    SELECT_DEGRADED_INSTITUTION = 'SELECT_DEGRADED_INSTITUTION',
-+    SELECT_DOWN_INSTITUTION = 'SELECT_DOWN_INSTITUTION',
-+    SELECT_FILTERED_INSTITUTION = 'SELECT_FILTERED_INSTITUTION',
-+    SELECT_INSTITUTION = 'SELECT_INSTITUTION',
-+    SELECT_BRAND = 'SELECT_BRAND',
-+    SELECT_AUTH_TYPE = 'SELECT_AUTH_TYPE',
-+    SUBMIT_ACCOUNT_NUMBER = 'SUBMIT_ACCOUNT_NUMBER',
-+    SUBMIT_DOCUMENTS = 'SUBMIT_DOCUMENTS',
-+    SUBMIT_DOCUMENTS_SUCCESS = 'SUBMIT_DOCUMENTS_SUCCESS',
-+    SUBMIT_DOCUMENTS_ERROR = 'SUBMIT_DOCUMENTS_ERROR',
-+    SUBMIT_ROUTING_NUMBER = 'SUBMIT_ROUTING_NUMBER',
-+    VIEW_DATA_TYPES = 'VIEW_DATA_TYPES',
-+    SUBMIT_PHONE = 'SUBMIT_PHONE',
-+    SKIP_SUBMIT_PHONE = 'SKIP_SUBMIT_PHONE',
-+    VERIFY_PHONE = 'VERIFY_PHONE',
-+    SUBMIT_CREDENTIALS = 'SUBMIT_CREDENTIALS',
-+    SUBMIT_MFA = 'SUBMIT_MFA',
-+    TRANSITION_VIEW = 'TRANSITION_VIEW',
-+    CONNECT_NEW_INSTITUTION = 'CONNECT_NEW_INSTITUTION',
-+}
-+
-+export enum LinkEventViewName {
-+    ACCEPT_TOS = 'ACCEPT_TOS',
-+    CONNECTED = 'CONNECTED',
-+    CONSENT = 'CONSENT',
-+    CREDENTIAL = 'CREDENTIAL',
-+    DATA_TRANSPARENCY = 'DATA_TRANSPARENCY',
-+    DATA_TRANSPARENCY_CONSENT = 'DATA_TRANSPARENCY_CONSENT',
-+    DOCUMENTARY_VERIFICATION = 'DOCUMENTARY_VERIFICATION',
-+    ERROR = 'ERROR',
-+    EXIT = 'EXIT',
-+    KYC_CHECK = 'KYC_CHECK',
-+    SELFIE_CHECK = 'SELFIE_CHECK',
-+    LOADING = 'LOADING',
-+    MATCHED_CONSENT = 'MATCHED_CONSENT',
-+    MATCHED_CREDENTIAL = 'MATCHED_CREDENTIAL',
-+    MATCHED_MFA = 'MATCHED_MFA',
-+    MFA = 'MFA',
-+    NUMBERS = 'NUMBERS',
-+    NUMBERS_SELECT_INSTITUTION = 'NUMBERS_SELECT_INSTITUTION',
-+    OAUTH = 'OAUTH',
-+    RECAPTCHA = 'RECAPTCHA',
-+    RISK_CHECK = 'RISK_CHECK',
-+    SCREENING = 'SCREENING',
-+    SELECT_ACCOUNT = 'SELECT_ACCOUNT',
-+    SELECT_AUTH_TYPE = 'SELECT_AUTH_TYPE',
-+    SUBMIT_PHONE = 'SUBMIT_PHONE',
-+    VERIFY_PHONE = 'VERIFY_PHONE',
-+    SELECT_SAVED_INSTITUTION = 'SELECT_SAVED_INSTITUTION',
-+    SELECT_SAVED_ACCOUNT = 'SELECT_SAVED_ACCOUNT',
-+    SELECT_BRAND = 'SELECT_BRAND',
-+    SELECT_INSTITUTION = 'SELECT_INSTITUTION',
-+    SUBMIT_DOCUMENTS = 'SUBMIT_DOCUMENTS',
-+    SUBMIT_DOCUMENTS_SUCCESS = 'SUBMIT_DOCUMENTS_SUCCESS',
-+    SUBMIT_DOCUMENTS_ERROR = 'SUBMIT_DOCUMENTS_ERROR',
-+    UPLOAD_DOCUMENTS = 'UPLOAD_DOCUMENTS',
-+    VERIFY_SMS = 'VERIFY_SMS',
-+}
-+
-+/// Methods to present Link on iOS.
-+/// FULL_SCREEN is the converts to UIModalPresentationOverFullScreen on the native side.
-+/// MODAL will use the default presentation style for iOS which is UIModalPresentationAutomatic.
-+export enum LinkIOSPresentationStyle {
-+    FULL_SCREEN = 'FULL_SCREEN',
-+    MODAL = 'MODAL'
-+}
-+
-+export type LinkSuccessListener = (LinkSuccess: LinkSuccess) => void
-+
-+export type LinkExitListener = (LinkExit: LinkExit) => void
-+
-+export type LinkOnEventListener = (LinkEvent: LinkEvent) => void
-+
-+export interface PlaidLinkProps {
-+    tokenConfig: LinkTokenConfiguration
-+    onSuccess: LinkSuccessListener
-+    onExit?: LinkExitListener
-+    iOSPresentationStyle?: LinkIOSPresentationStyle
-+    logLevel?: LinkLogLevel
-+    onPress?(): any
-+}
-+
-+export type PlaidLinkComponentProps = (PlaidLinkProps & {
-+    children: React.ReactNode
-+});
-diff --git a/node_modules/react-native-plaid-link-sdk/src/__tests__/Types.tests.ts b/node_modules/react-native-plaid-link-sdk/src/__tests__/Types.tests.ts
-new file mode 100644
-index 0000000..2dd7a54
---- /dev/null
-+++ b/node_modules/react-native-plaid-link-sdk/src/__tests__/Types.tests.ts
-@@ -0,0 +1,15 @@
-+const Types = require('./../Types');
-+
-+test('test token configuration', () => {
-+    const linkTokenConfiguration = {
-+        token: "test-token",
-+        noLoadingState: false,
-+        logLevel: Types.LinkLogLevel.DEBUG,
-+        extras: null,
-+    };
-+
-+    expect(linkTokenConfiguration.noLoadingState).toBe(false);
-+    expect(linkTokenConfiguration.token).toBe("test-token");
-+    expect(linkTokenConfiguration.logLevel).toBe(Types.LinkLogLevel.DEBUG);
-+    expect(linkTokenConfiguration.extras).toBe(null);
-+});
-\ No newline at end of file
-diff --git a/node_modules/react-native-plaid-link-sdk/src/fabric/NativePlaidLinkModuleAndroid.ts b/node_modules/react-native-plaid-link-sdk/src/fabric/NativePlaidLinkModuleAndroid.ts
-new file mode 100644
-index 0000000..d1e4062
---- /dev/null
-+++ b/node_modules/react-native-plaid-link-sdk/src/fabric/NativePlaidLinkModuleAndroid.ts
-@@ -0,0 +1,20 @@
-+// we use Object type because methods on the native side use NSDictionary and ReadableMap
-+// and we want to stay compatible with those
-+import {TurboModuleRegistry, TurboModule} from 'react-native';
-+import { Int32, UnsafeObject } from 'react-native/Libraries/Types/CodegenTypes';
-+
-+export interface Spec extends TurboModule {
-+    startLinkActivityForResult(
-+        token: string,
-+        noLoadingState: boolean,
-+        logLevel: string,
-+        onSuccessCallback: (result: UnsafeObject) => void,
-+        onExitCallback: (result: UnsafeObject) => void
-+    ): void;
-+
-+    // those two are here for event emitter methods
-+    addListener(eventName: string): void;
-+    removeListeners(count: Int32): void;
-+}
-+
-+export default TurboModuleRegistry.get<Spec>('PlaidAndroid');
-diff --git a/node_modules/react-native-plaid-link-sdk/src/fabric/NativePlaidLinkModuleiOS.ts b/node_modules/react-native-plaid-link-sdk/src/fabric/NativePlaidLinkModuleiOS.ts
-new file mode 100644
-index 0000000..d1b3565
---- /dev/null
-+++ b/node_modules/react-native-plaid-link-sdk/src/fabric/NativePlaidLinkModuleiOS.ts
-@@ -0,0 +1,19 @@
-+// we use Object type because methods on the native side use NSDictionary and ReadableMap
-+// and we want to stay compatible with those
-+import {TurboModuleRegistry, TurboModule} from 'react-native';
-+import { Int32, UnsafeObject } from 'react-native/Libraries/Types/CodegenTypes';
-+
-+export interface Spec extends TurboModule {
-+    create(token: string, noLoadingState: boolean): void;
-+    open(
-+        fullScreen: boolean,
-+        onSuccess: (success: UnsafeObject) => void,
-+        onExit: (error: UnsafeObject, result: UnsafeObject) => void,
-+      ): void;
-+    dismiss(): void;
-+    // those two are here for event emitter methods
-+    addListener(eventName: string): void;
-+    removeListeners(count: Int32): void;
-+}
-+
-+export default TurboModuleRegistry.get<Spec>('RNLinksdk');
-diff --git a/node_modules/react-native-plaid-link-sdk/src/index.ts b/node_modules/react-native-plaid-link-sdk/src/index.ts
-new file mode 100644
-index 0000000..23ef946
---- /dev/null
-+++ b/node_modules/react-native-plaid-link-sdk/src/index.ts
-@@ -0,0 +1,21 @@
-+import {
-+    openLink,
-+    dismissLink,
-+    usePlaidEmitter,
-+    PlaidLink,
-+} from './PlaidLink';
-+
-+export * from './Types';
-+
-+export default PlaidLink;
-+
-+export {
-+    PlaidLink,
-+    openLink,
-+    dismissLink,
-+    usePlaidEmitter,
-+};
-+
-+// Components
-+
-+export { EmbeddedLinkView } from './EmbeddedLink/EmbeddedLinkView';
-\ No newline at end of file
diff --git a/patches/react-native-quick-sqlite+8.0.6.patch b/patches/react-native-quick-sqlite+8.0.6.patch
new file mode 100644
index 000000000000..5d4dcfad8e35
--- /dev/null
+++ b/patches/react-native-quick-sqlite+8.0.6.patch
@@ -0,0 +1,13 @@
+diff --git a/node_modules/react-native-quick-sqlite/android/build.gradle b/node_modules/react-native-quick-sqlite/android/build.gradle
+index afcda02..3faaf76 100644
+--- a/node_modules/react-native-quick-sqlite/android/build.gradle
++++ b/node_modules/react-native-quick-sqlite/android/build.gradle
+@@ -63,7 +63,7 @@ android {
+   }
+ 
+   defaultConfig {
+-    minSdkVersion 21 
++    minSdkVersion 23 
+     targetSdkVersion safeExtGet('targetSdkVersion', 28)
+     versionCode 1
+     versionName "1.0"
diff --git a/patches/react-native-reanimated+3.7.2.patch b/patches/react-native-reanimated+3.13.0+001+hybrid-app.patch
similarity index 100%
rename from patches/react-native-reanimated+3.7.2.patch
rename to patches/react-native-reanimated+3.13.0+001+hybrid-app.patch
diff --git a/patches/react-native-reanimated+3.13.0+002+rn-75-fixes.patch b/patches/react-native-reanimated+3.13.0+002+rn-75-fixes.patch
new file mode 100644
index 000000000000..68b45d4658a7
--- /dev/null
+++ b/patches/react-native-reanimated+3.13.0+002+rn-75-fixes.patch
@@ -0,0 +1,142 @@
+diff --git a/node_modules/react-native-reanimated/android/src/main/java/com/swmansion/reanimated/ReactNativeUtils.java b/node_modules/react-native-reanimated/android/src/main/java/com/swmansion/reanimated/ReactNativeUtils.java
+index 3667652..2c2d9e1 100644
+--- a/node_modules/react-native-reanimated/android/src/main/java/com/swmansion/reanimated/ReactNativeUtils.java
++++ b/node_modules/react-native-reanimated/android/src/main/java/com/swmansion/reanimated/ReactNativeUtils.java
+@@ -2,6 +2,9 @@ package com.swmansion.reanimated;
+ 
+ import android.graphics.drawable.Drawable;
+ import android.view.View;
++import com.facebook.react.uimanager.drawable.CSSBackgroundDrawable;
++import com.facebook.react.uimanager.style.BorderRadiusProp;
++import com.facebook.react.uimanager.style.ComputedBorderRadius;
+ import com.facebook.react.views.image.ReactImageView;
+ import com.facebook.react.views.view.ReactViewBackgroundDrawable;
+ import java.lang.reflect.Field;
+@@ -29,15 +32,15 @@ public class ReactNativeUtils {
+   public static BorderRadii getBorderRadii(View view) {
+     if (view.getBackground() != null) {
+       Drawable background = view.getBackground();
+-      if (background instanceof ReactViewBackgroundDrawable) {
+-        ReactViewBackgroundDrawable drawable = (ReactViewBackgroundDrawable) background;
++      if (background instanceof CSSBackgroundDrawable drawable) {
++        ComputedBorderRadius computedBorderRadius = drawable.getComputedBorderRadius();
+         return new BorderRadii(
+-            drawable.getFullBorderRadius(),
+-            drawable.getBorderRadius(ReactViewBackgroundDrawable.BorderRadiusLocation.TOP_LEFT),
+-            drawable.getBorderRadius(ReactViewBackgroundDrawable.BorderRadiusLocation.TOP_RIGHT),
+-            drawable.getBorderRadius(ReactViewBackgroundDrawable.BorderRadiusLocation.BOTTOM_LEFT),
+-            drawable.getBorderRadius(
+-                ReactViewBackgroundDrawable.BorderRadiusLocation.BOTTOM_RIGHT));
++                // TODO: get full border radius
++                computedBorderRadius.getTopLeft(),
++                computedBorderRadius.getTopLeft(),
++                computedBorderRadius.getTopRight(),
++                computedBorderRadius.getBottomLeft(),
++                computedBorderRadius.getBottomRight());
+       }
+     } else if (view instanceof ReactImageView) {
+       try {
+diff --git a/node_modules/react-native-reanimated/android/src/reactNativeVersionPatch/ReactFeatureFlagsWrapper/latest/com/swmansion/reanimated/ReactFeatureFlagsWrapper.java b/node_modules/react-native-reanimated/android/src/reactNativeVersionPatch/ReactFeatureFlagsWrapper/latest/com/swmansion/reanimated/ReactFeatureFlagsWrapper.java
+deleted file mode 100644
+index a6a2c16..0000000
+--- a/node_modules/react-native-reanimated/android/src/reactNativeVersionPatch/ReactFeatureFlagsWrapper/latest/com/swmansion/reanimated/ReactFeatureFlagsWrapper.java
++++ /dev/null
+@@ -1,11 +0,0 @@
+-package com.swmansion.reanimated;
+-
+-import com.facebook.react.config.ReactFeatureFlags;
+-
+-public class ReactFeatureFlagsWrapper {
+-
+-  public static void enableMountHooks() {
+-    ReactFeatureFlags.enableMountHooks = true;
+-  }
+-
+-}
+diff --git a/node_modules/react-native-reanimated/android/src/reactNativeVersionPatch/ReanimatedUIManager/latest/com/swmansion/reanimated/layoutReanimation/ReanimatedUIManager.java b/node_modules/react-native-reanimated/android/src/reactNativeVersionPatch/ReanimatedUIManager/latest/com/swmansion/reanimated/layoutReanimation/ReanimatedUIManager.java
+index 256906f..9c84f87 100644
+--- a/node_modules/react-native-reanimated/android/src/reactNativeVersionPatch/ReanimatedUIManager/latest/com/swmansion/reanimated/layoutReanimation/ReanimatedUIManager.java
++++ b/node_modules/react-native-reanimated/android/src/reactNativeVersionPatch/ReanimatedUIManager/latest/com/swmansion/reanimated/layoutReanimation/ReanimatedUIManager.java
+@@ -125,22 +125,6 @@ public class ReanimatedUIManager extends UIManagerModule {
+     super.measureLayout(tag, ancestorTag, errorCallback, successCallback);
+   }
+ 
+-  /**
+-   * Like {@link #measure} and {@link #measureLayout} but measures relative to the immediate parent.
+-   *
+-   * <p>NB: Unlike {@link #measure}, this will measure relative to the view layout, not the visible
+-   * window which can cause unexpected results when measuring relative to things like ScrollViews
+-   * that can have offset content on the screen.
+-   *
+-   * @deprecated this method will not be available in FabricUIManager class.
+-   */
+-  @ReactMethod
+-  @Deprecated
+-  public void measureLayoutRelativeToParent(
+-      int tag, Callback errorCallback, Callback successCallback) {
+-    super.measureLayoutRelativeToParent(tag, errorCallback, successCallback);
+-  }
+-
+   /**
+    * Find the touch target child native view in the supplied root view hierarchy, given a react
+    * target location.
+@@ -186,26 +170,6 @@ public class ReanimatedUIManager extends UIManagerModule {
+     super.dispatchViewManagerCommand(reactTag, commandId, commandArgs);
+   }
+ 
+-  /**
+-   * Show a PopupMenu.
+-   *
+-   * @param reactTag the tag of the anchor view (the PopupMenu is displayed next to this view); this
+-   *     needs to be the tag of a native view (shadow views can not be anchors)
+-   * @param items the menu items as an array of strings
+-   * @param error will be called if there is an error displaying the menu
+-   * @param success will be called with the position of the selected item as the first argument, or
+-   *     no arguments if the menu is dismissed
+-   */
+-  @ReactMethod
+-  public void showPopupMenu(int reactTag, ReadableArray items, Callback error, Callback success) {
+-    super.showPopupMenu(reactTag, items, error, success);
+-  }
+-
+-  @ReactMethod
+-  public void dismissPopupMenu() {
+-    super.dismissPopupMenu();
+-  }
+-
+   /**
+    * LayoutAnimation API on Android is currently experimental. Therefore, it needs to be enabled
+    * explicitly in order to avoid regression in existing application written for iOS using this API.
+diff --git a/node_modules/react-native-reanimated/android/src/reactNativeVersionPatch/RuntimeExecutor/latest/com/swmansion/reanimated/NativeProxy.java b/node_modules/react-native-reanimated/android/src/reactNativeVersionPatch/RuntimeExecutor/latest/com/swmansion/reanimated/NativeProxy.java
+index 3902e82..673b2bb 100644
+--- a/node_modules/react-native-reanimated/android/src/reactNativeVersionPatch/RuntimeExecutor/latest/com/swmansion/reanimated/NativeProxy.java
++++ b/node_modules/react-native-reanimated/android/src/reactNativeVersionPatch/RuntimeExecutor/latest/com/swmansion/reanimated/NativeProxy.java
+@@ -26,7 +26,6 @@ public class NativeProxy extends NativeProxyCommon {
+ 
+     public @OptIn(markerClass = FrameworkAPI.class) NativeProxy(ReactApplicationContext context, String valueUnpackerCode) {
+         super(context);
+-        ReactFeatureFlagsWrapper.enableMountHooks();
+ 
+         FabricUIManager fabricUIManager =
+                 (FabricUIManager) UIManagerHelper.getUIManager(context, UIManagerType.FABRIC);
+@@ -37,7 +36,7 @@ public class NativeProxy extends NativeProxyCommon {
+ 
+ 
+         if (context.isBridgeless()) {
+-            RuntimeExecutor runtimeExecutor = context.getRuntimeExecutor();
++            RuntimeExecutor runtimeExecutor = context.getCatalystInstance().getRuntimeExecutor();
+             mHybridData = initHybridBridgeless(
+               Objects.requireNonNull(context.getJavaScriptContextHolder()).get(),
+               runtimeExecutor,
+diff --git a/node_modules/react-native-reanimated/Common/cpp/LayoutAnimations/LayoutAnimationsProxy.cpp b/node_modules/react-native-reanimated/Common/cpp/LayoutAnimations/LayoutAnimationsProxy.cpp
+index f219e5d..dd714dc 100644
+--- a/node_modules/react-native-reanimated/Common/cpp/LayoutAnimations/LayoutAnimationsProxy.cpp
++++ b/node_modules/react-native-reanimated/Common/cpp/LayoutAnimations/LayoutAnimationsProxy.cpp
+@@ -697,6 +697,7 @@ void LayoutAnimationsProxy::transferConfigFromNativeID(
+     auto nativeId = stoi(nativeIdString);
+     layoutAnimationsManager_->transferConfigFromNativeID(nativeId, tag);
+   } catch (std::invalid_argument) {
++  } catch (std::out_of_range) {
+   }
+ }
+ 
diff --git a/patches/react-native-reanimated+3.13.0+003+dontWhitelistTextProp.patch b/patches/react-native-reanimated+3.13.0+003+dontWhitelistTextProp.patch
new file mode 100644
index 000000000000..4ba96ac8659f
--- /dev/null
+++ b/patches/react-native-reanimated+3.13.0+003+dontWhitelistTextProp.patch
@@ -0,0 +1,12 @@
+diff --git a/node_modules/react-native-reanimated/src/component/PerformanceMonitor.tsx b/node_modules/react-native-reanimated/src/component/PerformanceMonitor.tsx
+index 9e66803..3620fe9 100644
+--- a/node_modules/react-native-reanimated/src/component/PerformanceMonitor.tsx
++++ b/node_modules/react-native-reanimated/src/component/PerformanceMonitor.tsx
+@@ -47,7 +47,6 @@ function createCircularDoublesBuffer(size: number) {
+ }
+ 
+ const DEFAULT_BUFFER_SIZE = 60;
+-addWhitelistedNativeProps({ text: true });
+ const AnimatedTextInput = createAnimatedComponent(TextInput);
+ 
+ function loopAnimationFrame(fn: (lastTime: number, time: number) => void) {
diff --git a/patches/react-native-reanimated+3.13.0+004+fixNullViewTag.patch b/patches/react-native-reanimated+3.13.0+004+fixNullViewTag.patch
new file mode 100644
index 000000000000..ca982c6f8036
--- /dev/null
+++ b/patches/react-native-reanimated+3.13.0+004+fixNullViewTag.patch
@@ -0,0 +1,15 @@
+diff --git a/node_modules/react-native-reanimated/src/createAnimatedComponent/createAnimatedComponent.tsx b/node_modules/react-native-reanimated/src/createAnimatedComponent/createAnimatedComponent.tsx
+index 577b4a7..c60f0f8 100644
+--- a/node_modules/react-native-reanimated/src/createAnimatedComponent/createAnimatedComponent.tsx
++++ b/node_modules/react-native-reanimated/src/createAnimatedComponent/createAnimatedComponent.tsx
+@@ -481,7 +481,9 @@ export function createAnimatedComponent(
+           ? (ref as HTMLElement)
+           : findNodeHandle(ref as Component);
+ 
+-        this._componentViewTag = tag as number;
++        if (tag !== null) {
++          this._componentViewTag = tag as number;
++        }
+ 
+         const { layout, entering, exiting, sharedTransitionTag } = this.props;
+         if (
diff --git a/patches/react-native-reanimated+3.13.0+005+proper-navigator-types.patch b/patches/react-native-reanimated+3.13.0+005+proper-navigator-types.patch
new file mode 100644
index 000000000000..59e577444d3e
--- /dev/null
+++ b/patches/react-native-reanimated+3.13.0+005+proper-navigator-types.patch
@@ -0,0 +1,29 @@
+diff --git a/node_modules/react-native-reanimated/lib/typescript/js-reanimated/JSReanimated.d.ts b/node_modules/react-native-reanimated/lib/typescript/js-reanimated/JSReanimated.d.ts
+index 5c34476..df9a9b7 100644
+--- a/node_modules/react-native-reanimated/lib/typescript/js-reanimated/JSReanimated.d.ts
++++ b/node_modules/react-native-reanimated/lib/typescript/js-reanimated/JSReanimated.d.ts
+@@ -36,8 +36,8 @@ declare enum Platform {
+ }
+ declare global {
+     interface Navigator {
+-        userAgent?: string;
+-        vendor?: string;
++        userAgent: string;
++        vendor: string;
+     }
+ }
+ export {};
+diff --git a/node_modules/react-native-reanimated/src/js-reanimated/JSReanimated.ts b/node_modules/react-native-reanimated/src/js-reanimated/JSReanimated.ts
+index 29cda27..28ec9d2 100644
+--- a/node_modules/react-native-reanimated/src/js-reanimated/JSReanimated.ts
++++ b/node_modules/react-native-reanimated/src/js-reanimated/JSReanimated.ts
+@@ -311,7 +311,7 @@ enum Platform {
+ 
+ declare global {
+   interface Navigator {
+-    userAgent?: string;
+-    vendor?: string;
++    userAgent: string;
++    vendor: string;
+   }
+ }
diff --git a/patches/react-native-reanimated+3.13.0+006+fixNoExportedMember.patch b/patches/react-native-reanimated+3.13.0+006+fixNoExportedMember.patch
new file mode 100644
index 000000000000..22827fa1f96d
--- /dev/null
+++ b/patches/react-native-reanimated+3.13.0+006+fixNoExportedMember.patch
@@ -0,0 +1,24 @@
+diff --git a/node_modules/react-native-reanimated/lib/module/platform-specific/RNRenderer.web.js b/node_modules/react-native-reanimated/lib/module/platform-specific/RNRenderer.web.js
+index a9b2299..6a97aea 100644
+--- a/node_modules/react-native-reanimated/lib/module/platform-specific/RNRenderer.web.js
++++ b/node_modules/react-native-reanimated/lib/module/platform-specific/RNRenderer.web.js
+@@ -1,5 +1,6 @@
+ 'use strict';
+ 
+ // RNRender is not used for web. An export is still defined to eliminate warnings from bundlers such as esbuild.
+-export {};
++const RNRenderer = {};
++export { RNRenderer };
+ //# sourceMappingURL=RNRenderer.web.js.map
+\ No newline at end of file
+diff --git a/node_modules/react-native-reanimated/src/platform-specific/RNRenderer.web.ts b/node_modules/react-native-reanimated/src/platform-specific/RNRenderer.web.ts
+index f9eb5e3..b51ae1d 100644
+--- a/node_modules/react-native-reanimated/src/platform-specific/RNRenderer.web.ts
++++ b/node_modules/react-native-reanimated/src/platform-specific/RNRenderer.web.ts
+@@ -1,3 +1,4 @@
+ 'use strict';
+ // RNRender is not used for web. An export is still defined to eliminate warnings from bundlers such as esbuild.
+-export {};
++const RNRenderer = {};
++export { RNRenderer };
+\ No newline at end of file
diff --git a/patches/react-native-reanimated+3.7.2+001+fix-boost-dependency.patch b/patches/react-native-reanimated+3.7.2+001+fix-boost-dependency.patch
deleted file mode 100644
index 08d1784a6a83..000000000000
--- a/patches/react-native-reanimated+3.7.2+001+fix-boost-dependency.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/node_modules/react-native-reanimated/android/build.gradle b/node_modules/react-native-reanimated/android/build.gradle
-index 3de90e5..2969d8c 100644
---- a/node_modules/react-native-reanimated/android/build.gradle
-+++ b/node_modules/react-native-reanimated/android/build.gradle
-@@ -567,7 +567,7 @@ if (REACT_NATIVE_MINOR_VERSION < 71) {
-     task downloadBoost(dependsOn: resolveBoost, type: Download) {
-         def transformedVersion = BOOST_VERSION.replace("_", ".")
-         def artifactLocalName = "boost_${BOOST_VERSION}.tar.gz"
--        def srcUrl = "https://boostorg.jfrog.io/artifactory/main/release/${transformedVersion}/source/${artifactLocalName}"
-+        def srcUrl = "https://archives.boost.io/release/${transformedVersion}/source/${artifactLocalName}"
-         if (REACT_NATIVE_MINOR_VERSION < 69) {
-             srcUrl = "https://github.com/react-native-community/boost-for-react-native/releases/download/v${transformedVersion}-0/${artifactLocalName}"
-         }
diff --git a/patches/react-native-reanimated+3.7.2+002+copy-state.patch b/patches/react-native-reanimated+3.7.2+002+copy-state.patch
deleted file mode 100644
index bd5899977ea9..000000000000
--- a/patches/react-native-reanimated+3.7.2+002+copy-state.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/node_modules/react-native-reanimated/Common/cpp/Fabric/ShadowTreeCloner.cpp b/node_modules/react-native-reanimated/Common/cpp/Fabric/ShadowTreeCloner.cpp
-index f913ceb..3f58247 100644
---- a/node_modules/react-native-reanimated/Common/cpp/Fabric/ShadowTreeCloner.cpp
-+++ b/node_modules/react-native-reanimated/Common/cpp/Fabric/ShadowTreeCloner.cpp
-@@ -51,6 +51,7 @@ ShadowNode::Unshared cloneShadowTreeWithNewProps(
-     newChildNode = parentNode.clone({
-         ShadowNodeFragment::propsPlaceholder(),
-         std::make_shared<ShadowNode::ListOfShared>(children),
-+        parentNode.getState()
-     });
-   }
- 
diff --git a/patches/react-native-render-html+6.3.1.patch b/patches/react-native-render-html+6.3.1.patch
new file mode 100644
index 000000000000..6958556d5a96
--- /dev/null
+++ b/patches/react-native-render-html+6.3.1.patch
@@ -0,0 +1,25 @@
+diff --git a/node_modules/react-native-render-html/react-native-render-html.podspec b/node_modules/react-native-render-html/react-native-render-html.podspec
+deleted file mode 100644
+index 6ac80d8..0000000
+--- a/node_modules/react-native-render-html/react-native-render-html.podspec
++++ /dev/null
+@@ -1,19 +0,0 @@
+-require 'json'
+-
+-package = JSON.parse(File.read(File.join(__dir__, 'package.json')))
+-
+-Pod::Spec.new do |s|
+-  s.name         = package['name']
+-  s.version      = package['version']
+-  s.summary      = package['description']
+-  s.license      = package['license']
+-
+-  s.authors      = package['author']
+-  s.homepage     = package['homepage']
+-  s.platform     = :ios, "9.0"
+-
+-  s.source       = { :git => "https://github.com/meliorence/react-native-render-html.git", :tag => "v#{s.version}" }
+-  s.source_files  = "ios/**/*.{h,m}"
+-
+-  s.dependency 'React-Core'
+-end
diff --git a/patches/react-native-screens+3.30.1+001+fix-screen-type.patch b/patches/react-native-screens+3.30.1+001+fix-screen-type.patch
deleted file mode 100644
index f282ec58b07b..000000000000
--- a/patches/react-native-screens+3.30.1+001+fix-screen-type.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/node_modules/react-native-screens/src/components/Screen.tsx b/node_modules/react-native-screens/src/components/Screen.tsx
-index 3f9a1cb..45767f7 100644
---- a/node_modules/react-native-screens/src/components/Screen.tsx
-+++ b/node_modules/react-native-screens/src/components/Screen.tsx
-@@ -79,6 +79,7 @@ export class InnerScreen extends React.Component<ScreenProps> {
-       // Due to how Yoga resolves layout, we need to have different components for modal nad non-modal screens
-       const AnimatedScreen =
-         Platform.OS === 'android' ||
-+        stackPresentation === undefined ||
-         stackPresentation === 'push' ||
-         stackPresentation === 'containedModal' ||
-         stackPresentation === 'containedTransparentModal'
diff --git a/patches/react-native-screens+3.34.0+001+hybrid-app.patch b/patches/react-native-screens+3.34.0+001+hybrid-app.patch
new file mode 100644
index 000000000000..f578863809b8
--- /dev/null
+++ b/patches/react-native-screens+3.34.0+001+hybrid-app.patch
@@ -0,0 +1,16 @@
+diff --git a/node_modules/react-native-screens/common/cpp/react/renderer/components/rnscreens/RNSScreenComponentDescriptor.h b/node_modules/react-native-screens/common/cpp/react/renderer/components/rnscreens/RNSScreenComponentDescriptor.h
+index 37aac4e..ff04f0a 100644
+--- a/node_modules/react-native-screens/common/cpp/react/renderer/components/rnscreens/RNSScreenComponentDescriptor.h
++++ b/node_modules/react-native-screens/common/cpp/react/renderer/components/rnscreens/RNSScreenComponentDescriptor.h
+@@ -7,7 +7,11 @@
+ #include <react/renderer/components/rnscreens/Props.h>
+ #include <react/renderer/core/ConcreteComponentDescriptor.h>
+ #include "RNSScreenShadowNode.h"
++#ifdef ANDROID
+ #include "utils/RectUtil.h"
++#else
++#include "RectUtil.h"
++#endif
+ 
+ namespace facebook {
+ namespace react {
diff --git a/patches/react-native-share+10.0.2+001+hybrid-app.patch b/patches/react-native-share+10.0.2+001+hybrid-app.patch
new file mode 100644
index 000000000000..13dcc1e8438b
--- /dev/null
+++ b/patches/react-native-share+10.0.2+001+hybrid-app.patch
@@ -0,0 +1,26 @@
+diff --git a/node_modules/react-native-share/RNShare.podspec b/node_modules/react-native-share/RNShare.podspec
+index 124a721..636a1f7 100644
+--- a/node_modules/react-native-share/RNShare.podspec
++++ b/node_modules/react-native-share/RNShare.podspec
+@@ -20,20 +20,6 @@ Pod::Spec.new do |s|
+ 
+   s.ios.weak_framework = 'LinkPresentation'
+ 
+-  if ENV["RCT_NEW_ARCH_ENABLED"] == "1"
+-    s.compiler_flags = folly_compiler_flags + " -DRCT_NEW_ARCH_ENABLED=1"
+-    s.pod_target_xcconfig    = {
+-      "HEADER_SEARCH_PATHS" => "\"$(PODS_ROOT)/boost\"",
+-      "OTHER_CPLUSPLUSFLAGS" => "-DFOLLY_NO_CONFIG -DFOLLY_MOBILE=1 -DFOLLY_USE_LIBCPP=1",
+-      "CLANG_CXX_LANGUAGE_STANDARD" => "c++17"
+-    }
+-
+-    s.dependency "React-Codegen"
+-    s.dependency "React-RCTFabric"
+-    s.dependency "RCT-Folly"
+-    s.dependency "RCTRequired"
+-    s.dependency "RCTTypeSafety"
+-    s.dependency "ReactCommon/turbomodule/core"
+-  end
++  install_modules_dependencies(s)
+ 
+ end
diff --git a/patches/react-native-svg+15.4.0+001+rn75-delegate.patch b/patches/react-native-svg+15.4.0+001+rn75-delegate.patch
new file mode 100644
index 000000000000..7b4bd64bef04
--- /dev/null
+++ b/patches/react-native-svg+15.4.0+001+rn75-delegate.patch
@@ -0,0 +1,45 @@
+diff --git a/node_modules/react-native-svg/apple/Elements/RNSVGImage.mm b/node_modules/react-native-svg/apple/Elements/RNSVGImage.mm
+index 62b961f..4898760 100644
+--- a/node_modules/react-native-svg/apple/Elements/RNSVGImage.mm
++++ b/node_modules/react-native-svg/apple/Elements/RNSVGImage.mm
+@@ -151,6 +151,23 @@ - (void)didReceiveImage:(UIImage *)image metadata:(id)metadata fromObserver:(voi
+   });
+ }
+ 
++- (void)didReceiveFailure:(nonnull NSError *)error fromObserver:(nonnull const void *)observer
++{
++  if (_image) {
++    CGImageRelease(_image);
++  }
++  _image = nil;
++}
++
++- (void)didReceiveProgress:(float)progress
++                    loaded:(int64_t)loaded
++                     total:(int64_t)total
++              fromObserver:(nonnull const void *)observer
++{
++}
++
++#pragma mark - RCTImageResponseDelegate - < RN 0.75
++
+ - (void)didReceiveProgress:(float)progress fromObserver:(void const *)observer
+ {
+ }
+@@ -183,6 +200,7 @@ - (void)prepareForRecycle
+   _imageSize = CGSizeZero;
+   _reloadImageCancellationBlock = nil;
+ }
++
+ #endif // RCT_NEW_ARCH_ENABLED
+ 
+ - (void)setSrc:(RCTImageSource *)src
+@@ -218,7 +236,7 @@ - (void)setSrc:(RCTImageSource *)src
+ #if TARGET_OS_OSX // [macOS]
+                            sourceLoaded = [src imageSourceWithSize:image.size scale:1];
+ #else
+-                            sourceLoaded = [src imageSourceWithSize:image.size scale:image.scale];
++                sourceLoaded = [src imageSourceWithSize:image.size scale:image.scale];
+ #endif
+                            NSDictionary *dict = @{
+                              @"uri" : sourceLoaded.request.URL.absoluteString,
diff --git a/patches/react-native-vision-camera+4.0.0-beta.13.patch b/patches/react-native-vision-camera+4.0.0-beta.13.patch
index ecb635b7c195..4e0961ec536a 100644
--- a/patches/react-native-vision-camera+4.0.0-beta.13.patch
+++ b/patches/react-native-vision-camera+4.0.0-beta.13.patch
@@ -1,5 +1,5 @@
 diff --git a/node_modules/react-native-vision-camera/VisionCamera.podspec b/node_modules/react-native-vision-camera/VisionCamera.podspec
-index 3a0e313..e983153 100644
+index 3a0e313..83ab343 100644
 --- a/node_modules/react-native-vision-camera/VisionCamera.podspec
 +++ b/node_modules/react-native-vision-camera/VisionCamera.podspec
 @@ -2,7 +2,13 @@ require "json"
@@ -63,7 +63,7 @@ index 3a0e313..e983153 100644
 @@ -66,9 +74,12 @@ Pod::Spec.new do |s|
      "ios/**/*.h"
    ]
-   
+ 
 -  s.dependency "React"
 -  s.dependency "React-Core"
 -  s.dependency "React-callinvoker"
@@ -962,6 +962,25 @@ index f2b284c..e348e5c 100644
 +    // ios only
 +  }
  }
+diff --git a/node_modules/react-native-vision-camera/android/src/main/java/com/mrousavy/camera/frameprocessor/VisionCameraProxy.kt b/node_modules/react-native-vision-camera/android/src/main/java/com/mrousavy/camera/frameprocessor/VisionCameraProxy.kt
+index b9d3f67..cb70963 100644
+--- a/node_modules/react-native-vision-camera/android/src/main/java/com/mrousavy/camera/frameprocessor/VisionCameraProxy.kt
++++ b/node_modules/react-native-vision-camera/android/src/main/java/com/mrousavy/camera/frameprocessor/VisionCameraProxy.kt
+@@ -7,12 +7,14 @@ import com.facebook.jni.HybridData
+ import com.facebook.proguard.annotations.DoNotStrip
+ import com.facebook.react.bridge.ReactApplicationContext
+ import com.facebook.react.bridge.UiThreadUtil
++import com.facebook.react.common.annotations.FrameworkAPI
+ import com.facebook.react.turbomodule.core.CallInvokerHolderImpl
+ import com.facebook.react.uimanager.UIManagerHelper
+ import com.mrousavy.camera.CameraView
+ import com.mrousavy.camera.core.ViewNotFoundError
+ import java.lang.ref.WeakReference
+ 
++@OptIn(FrameworkAPI::class)
+ @Suppress("KotlinJniMissingFunction") // we use fbjni.
+ class VisionCameraProxy(private val reactContext: ReactApplicationContext) {
+   companion object {
 diff --git a/node_modules/react-native-vision-camera/ios/.swift-version b/node_modules/react-native-vision-camera/ios/.swift-version
 new file mode 100644
 index 0000000..ef425ca
diff --git a/patches/react-native-web+0.19.12+001+initial.patch b/patches/react-native-web+0.19.12+001+initial.patch
new file mode 100644
index 000000000000..c77cfc7829ed
--- /dev/null
+++ b/patches/react-native-web+0.19.12+001+initial.patch
@@ -0,0 +1,648 @@
+diff --git a/node_modules/react-native-web/dist/vendor/react-native/VirtualizedList/index.js b/node_modules/react-native-web/dist/vendor/react-native/VirtualizedList/index.js
+index e137def..c3e5054 100644
+--- a/node_modules/react-native-web/dist/vendor/react-native/VirtualizedList/index.js
++++ b/node_modules/react-native-web/dist/vendor/react-native/VirtualizedList/index.js
+@@ -285,7 +285,7 @@ class VirtualizedList extends StateSafePureComponent {
+   // REACT-NATIVE-WEB patch to preserve during future RN merges: Support inverted wheel scroller.
+ 
+   constructor(_props) {
+-    var _this$props$updateCel;
++    var _this$props$updateCel, _this$props$maintainV, _this$props$maintainV2;
+     super(_props);
+     this._getScrollMetrics = () => {
+       return this._scrollMetrics;
+@@ -520,6 +520,11 @@ class VirtualizedList extends StateSafePureComponent {
+         visibleLength,
+         zoomScale
+       };
++      if (this.state.pendingScrollUpdateCount > 0) {
++        this.setState(state => ({
++          pendingScrollUpdateCount: state.pendingScrollUpdateCount - 1
++        }));
++      }
+       this._updateViewableItems(this.props, this.state.cellsAroundViewport);
+       if (!this.props) {
+         return;
+@@ -569,7 +574,7 @@ class VirtualizedList extends StateSafePureComponent {
+     this._updateCellsToRender = () => {
+       this._updateViewableItems(this.props, this.state.cellsAroundViewport);
+       this.setState((state, props) => {
+-        var cellsAroundViewport = this._adjustCellsAroundViewport(props, state.cellsAroundViewport);
++        var cellsAroundViewport = this._adjustCellsAroundViewport(props, state.cellsAroundViewport, state.pendingScrollUpdateCount);
+         var renderMask = VirtualizedList._createRenderMask(props, cellsAroundViewport, this._getNonViewportRenderRegions(props));
+         if (cellsAroundViewport.first === state.cellsAroundViewport.first && cellsAroundViewport.last === state.cellsAroundViewport.last && renderMask.equals(state.renderMask)) {
+           return null;
+@@ -589,7 +594,7 @@ class VirtualizedList extends StateSafePureComponent {
+       return {
+         index,
+         item,
+-        key: this._keyExtractor(item, index, props),
++        key: VirtualizedList._keyExtractor(item, index, props),
+         isViewable
+       };
+     };
+@@ -621,12 +626,10 @@ class VirtualizedList extends StateSafePureComponent {
+     };
+     this._getFrameMetrics = (index, props) => {
+       var data = props.data,
+-        getItem = props.getItem,
+         getItemCount = props.getItemCount,
+         getItemLayout = props.getItemLayout;
+       invariant(index >= 0 && index < getItemCount(data), 'Tried to get frame for out of range index ' + index);
+-      var item = getItem(data, index);
+-      var frame = this._frames[this._keyExtractor(item, index, props)];
++      var frame = this._frames[VirtualizedList._getItemKey(props, index)];
+       if (!frame || frame.index !== index) {
+         if (getItemLayout) {
+           /* $FlowFixMe[prop-missing] (>=0.63.0 site=react_native_fb) This comment
+@@ -650,7 +653,7 @@ class VirtualizedList extends StateSafePureComponent {
+ 
+       // The last cell we rendered may be at a new index. Bail if we don't know
+       // where it is.
+-      if (focusedCellIndex >= itemCount || this._keyExtractor(props.getItem(props.data, focusedCellIndex), focusedCellIndex, props) !== this._lastFocusedCellKey) {
++      if (focusedCellIndex >= itemCount || VirtualizedList._getItemKey(props, focusedCellIndex) !== this._lastFocusedCellKey) {
+         return [];
+       }
+       var first = focusedCellIndex;
+@@ -690,9 +693,15 @@ class VirtualizedList extends StateSafePureComponent {
+       }
+     }
+     var initialRenderRegion = VirtualizedList._initialRenderRegion(_props);
++    var minIndexForVisible = (_this$props$maintainV = (_this$props$maintainV2 = this.props.maintainVisibleContentPosition) == null ? void 0 : _this$props$maintainV2.minIndexForVisible) !== null && _this$props$maintainV !== void 0 ? _this$props$maintainV : 0;
+     this.state = {
+       cellsAroundViewport: initialRenderRegion,
+-      renderMask: VirtualizedList._createRenderMask(_props, initialRenderRegion)
++      renderMask: VirtualizedList._createRenderMask(_props, initialRenderRegion),
++      firstVisibleItemKey: this.props.getItemCount(this.props.data) > minIndexForVisible ? VirtualizedList._getItemKey(this.props, minIndexForVisible) : null,
++      // When we have a non-zero initialScrollIndex, we will receive a
++      // scroll event later so this will prevent the window from updating
++      // until we get a valid offset.
++      pendingScrollUpdateCount: this.props.initialScrollIndex != null && this.props.initialScrollIndex > 0 ? 1 : 0
+     };
+ 
+     // REACT-NATIVE-WEB patch to preserve during future RN merges: Support inverted wheel scroller.
+@@ -748,6 +757,26 @@ class VirtualizedList extends StateSafePureComponent {
+       }
+     }
+   }
++  static _findItemIndexWithKey(props, key, hint) {
++    var itemCount = props.getItemCount(props.data);
++    if (hint != null && hint >= 0 && hint < itemCount) {
++      var curKey = VirtualizedList._getItemKey(props, hint);
++      if (curKey === key) {
++        return hint;
++      }
++    }
++    for (var ii = 0; ii < itemCount; ii++) {
++      var _curKey = VirtualizedList._getItemKey(props, ii);
++      if (_curKey === key) {
++        return ii;
++      }
++    }
++    return null;
++  }
++  static _getItemKey(props, index) {
++    var item = props.getItem(props.data, index);
++    return VirtualizedList._keyExtractor(item, index, props);
++  }
+   static _createRenderMask(props, cellsAroundViewport, additionalRegions) {
+     var itemCount = props.getItemCount(props.data);
+     invariant(cellsAroundViewport.first >= 0 && cellsAroundViewport.last >= cellsAroundViewport.first - 1 && cellsAroundViewport.last < itemCount, "Invalid cells around viewport \"[" + cellsAroundViewport.first + ", " + cellsAroundViewport.last + "]\" was passed to VirtualizedList._createRenderMask");
+@@ -796,7 +825,7 @@ class VirtualizedList extends StateSafePureComponent {
+       }
+     }
+   }
+-  _adjustCellsAroundViewport(props, cellsAroundViewport) {
++  _adjustCellsAroundViewport(props, cellsAroundViewport, pendingScrollUpdateCount) {
+     var data = props.data,
+       getItemCount = props.getItemCount;
+     var onEndReachedThreshold = onEndReachedThresholdOrDefault(props.onEndReachedThreshold);
+@@ -819,17 +848,9 @@ class VirtualizedList extends StateSafePureComponent {
+         last: Math.min(cellsAroundViewport.last + renderAhead, getItemCount(data) - 1)
+       };
+     } else {
+-      // If we have a non-zero initialScrollIndex and run this before we've scrolled,
+-      // we'll wipe out the initialNumToRender rendered elements starting at initialScrollIndex.
+-      // So let's wait until we've scrolled the view to the right place. And until then,
+-      // we will trust the initialScrollIndex suggestion.
+-
+-      // Thus, we want to recalculate the windowed render limits if any of the following hold:
+-      // - initialScrollIndex is undefined or is 0
+-      // - initialScrollIndex > 0 AND scrolling is complete
+-      // - initialScrollIndex > 0 AND the end of the list is visible (this handles the case
+-      //   where the list is shorter than the visible area)
+-      if (props.initialScrollIndex && !this._scrollMetrics.offset && Math.abs(distanceFromEnd) >= Number.EPSILON) {
++      // If we have a pending scroll update, we should not adjust the render window as it
++      // might override the correct window.
++      if (pendingScrollUpdateCount > 0) {
+         return cellsAroundViewport.last >= getItemCount(data) ? VirtualizedList._constrainToItemCount(cellsAroundViewport, props) : cellsAroundViewport;
+       }
+       newCellsAroundViewport = computeWindowedRenderLimits(props, maxToRenderPerBatchOrDefault(props.maxToRenderPerBatch), windowSizeOrDefault(props.windowSize), cellsAroundViewport, this.__getFrameMetricsApprox, this._scrollMetrics);
+@@ -902,16 +923,36 @@ class VirtualizedList extends StateSafePureComponent {
+     }
+   }
+   static getDerivedStateFromProps(newProps, prevState) {
++    var _newProps$maintainVis, _newProps$maintainVis2;
+     // first and last could be stale (e.g. if a new, shorter items props is passed in), so we make
+     // sure we're rendering a reasonable range here.
+     var itemCount = newProps.getItemCount(newProps.data);
+     if (itemCount === prevState.renderMask.numCells()) {
+       return prevState;
+     }
+-    var constrainedCells = VirtualizedList._constrainToItemCount(prevState.cellsAroundViewport, newProps);
++    var maintainVisibleContentPositionAdjustment = null;
++    var prevFirstVisibleItemKey = prevState.firstVisibleItemKey;
++    var minIndexForVisible = (_newProps$maintainVis = (_newProps$maintainVis2 = newProps.maintainVisibleContentPosition) == null ? void 0 : _newProps$maintainVis2.minIndexForVisible) !== null && _newProps$maintainVis !== void 0 ? _newProps$maintainVis : 0;
++    var newFirstVisibleItemKey = newProps.getItemCount(newProps.data) > minIndexForVisible ? VirtualizedList._getItemKey(newProps, minIndexForVisible) : null;
++    if (newProps.maintainVisibleContentPosition != null && prevFirstVisibleItemKey != null && newFirstVisibleItemKey != null) {
++      if (newFirstVisibleItemKey !== prevFirstVisibleItemKey) {
++        // Fast path if items were added at the start of the list.
++        var hint = itemCount - prevState.renderMask.numCells() + minIndexForVisible;
++        var firstVisibleItemIndex = VirtualizedList._findItemIndexWithKey(newProps, prevFirstVisibleItemKey, hint);
++        maintainVisibleContentPositionAdjustment = firstVisibleItemIndex != null ? firstVisibleItemIndex - minIndexForVisible : null;
++      } else {
++        maintainVisibleContentPositionAdjustment = null;
++      }
++    }
++    var constrainedCells = VirtualizedList._constrainToItemCount(maintainVisibleContentPositionAdjustment != null ? {
++      first: prevState.cellsAroundViewport.first + maintainVisibleContentPositionAdjustment,
++      last: prevState.cellsAroundViewport.last + maintainVisibleContentPositionAdjustment
++    } : prevState.cellsAroundViewport, newProps);
+     return {
+       cellsAroundViewport: constrainedCells,
+-      renderMask: VirtualizedList._createRenderMask(newProps, constrainedCells)
++      renderMask: VirtualizedList._createRenderMask(newProps, constrainedCells),
++      firstVisibleItemKey: newFirstVisibleItemKey,
++      pendingScrollUpdateCount: maintainVisibleContentPositionAdjustment != null ? prevState.pendingScrollUpdateCount + 1 : prevState.pendingScrollUpdateCount
+     };
+   }
+   _pushCells(cells, stickyHeaderIndices, stickyIndicesFromProps, first, last, inversionStyle) {
+@@ -934,7 +975,7 @@ class VirtualizedList extends StateSafePureComponent {
+     last = Math.min(end, last);
+     var _loop = function _loop() {
+       var item = getItem(data, ii);
+-      var key = _this._keyExtractor(item, ii, _this.props);
++      var key = VirtualizedList._keyExtractor(item, ii, _this.props);
+       _this._indicesToKeys.set(ii, key);
+       if (stickyIndicesFromProps.has(ii + stickyOffset)) {
+         stickyHeaderIndices.push(cells.length);
+@@ -969,20 +1010,23 @@ class VirtualizedList extends StateSafePureComponent {
+   }
+   static _constrainToItemCount(cells, props) {
+     var itemCount = props.getItemCount(props.data);
+-    var last = Math.min(itemCount - 1, cells.last);
++    var lastPossibleCellIndex = itemCount - 1;
++
++    // Constraining `last` may significantly shrink the window. Adjust `first`
++    // to expand the window if the new `last` results in a new window smaller
++    // than the number of cells rendered per batch.
+     var maxToRenderPerBatch = maxToRenderPerBatchOrDefault(props.maxToRenderPerBatch);
++    var maxFirst = Math.max(0, lastPossibleCellIndex - maxToRenderPerBatch);
+     return {
+-      first: clamp(0, itemCount - 1 - maxToRenderPerBatch, cells.first),
+-      last
++      first: clamp(0, cells.first, maxFirst),
++      last: Math.min(lastPossibleCellIndex, cells.last)
+     };
+   }
+   _isNestedWithSameOrientation() {
+     var nestedContext = this.context;
+     return !!(nestedContext && !!nestedContext.horizontal === horizontalOrDefault(this.props.horizontal));
+   }
+-  _keyExtractor(item, index, props
+-  // $FlowFixMe[missing-local-annot]
+-  ) {
++  static _keyExtractor(item, index, props) {
+     if (props.keyExtractor != null) {
+       return props.keyExtractor(item, index);
+     }
+@@ -1022,7 +1066,12 @@ class VirtualizedList extends StateSafePureComponent {
+       cells.push( /*#__PURE__*/React.createElement(VirtualizedListCellContextProvider, {
+         cellKey: this._getCellKey() + '-header',
+         key: "$header"
+-      }, /*#__PURE__*/React.createElement(View, {
++      }, /*#__PURE__*/React.createElement(View
++      // We expect that header component will be a single native view so make it
++      // not collapsable to avoid this view being flattened and make this assumption
++      // no longer true.
++      , {
++        collapsable: false,
+         onLayout: this._onLayoutHeader,
+         style: [inversionStyle, this.props.ListHeaderComponentStyle]
+       },
+@@ -1124,7 +1173,11 @@ class VirtualizedList extends StateSafePureComponent {
+       // TODO: Android support
+       invertStickyHeaders: this.props.invertStickyHeaders !== undefined ? this.props.invertStickyHeaders : this.props.inverted,
+       stickyHeaderIndices,
+-      style: inversionStyle ? [inversionStyle, this.props.style] : this.props.style
++      style: inversionStyle ? [inversionStyle, this.props.style] : this.props.style,
++      maintainVisibleContentPosition: this.props.maintainVisibleContentPosition != null ? _objectSpread(_objectSpread({}, this.props.maintainVisibleContentPosition), {}, {
++        // Adjust index to account for ListHeaderComponent.
++        minIndexForVisible: this.props.maintainVisibleContentPosition.minIndexForVisible + (this.props.ListHeaderComponent ? 1 : 0)
++      }) : undefined
+     });
+     this._hasMore = this.state.cellsAroundViewport.last < itemCount - 1;
+     var innerRet = /*#__PURE__*/React.createElement(VirtualizedListContextProvider, {
+@@ -1317,8 +1370,12 @@ class VirtualizedList extends StateSafePureComponent {
+       onStartReached = _this$props8.onStartReached,
+       onStartReachedThreshold = _this$props8.onStartReachedThreshold,
+       onEndReached = _this$props8.onEndReached,
+-      onEndReachedThreshold = _this$props8.onEndReachedThreshold,
+-      initialScrollIndex = _this$props8.initialScrollIndex;
++      onEndReachedThreshold = _this$props8.onEndReachedThreshold;
++    // If we have any pending scroll updates it means that the scroll metrics
++    // are out of date and we should not call any of the edge reached callbacks.
++    if (this.state.pendingScrollUpdateCount > 0) {
++      return;
++    }
+     var _this$_scrollMetrics2 = this._scrollMetrics,
+       contentLength = _this$_scrollMetrics2.contentLength,
+       visibleLength = _this$_scrollMetrics2.visibleLength,
+@@ -1358,16 +1415,10 @@ class VirtualizedList extends StateSafePureComponent {
+     // and call onStartReached only once for a given content length,
+     // and only if onEndReached is not being executed
+     else if (onStartReached != null && this.state.cellsAroundViewport.first === 0 && isWithinStartThreshold && this._scrollMetrics.contentLength !== this._sentStartForContentLength) {
+-      // On initial mount when using initialScrollIndex the offset will be 0 initially
+-      // and will trigger an unexpected onStartReached. To avoid this we can use
+-      // timestamp to differentiate between the initial scroll metrics and when we actually
+-      // received the first scroll event.
+-      if (!initialScrollIndex || this._scrollMetrics.timestamp !== 0) {
+-        this._sentStartForContentLength = this._scrollMetrics.contentLength;
+-        onStartReached({
+-          distanceFromStart
+-        });
+-      }
++      this._sentStartForContentLength = this._scrollMetrics.contentLength;
++      onStartReached({
++        distanceFromStart
++      });
+     }
+ 
+     // If the user scrolls away from the start or end and back again,
+@@ -1433,6 +1484,11 @@ class VirtualizedList extends StateSafePureComponent {
+    */
+ 
+   _updateViewableItems(props, cellsAroundViewport) {
++    // If we have any pending scroll updates it means that the scroll metrics
++    // are out of date and we should not call any of the visibility callbacks.
++    if (this.state.pendingScrollUpdateCount > 0) {
++      return;
++    }
+     this._viewabilityTuples.forEach(tuple => {
+       tuple.viewabilityHelper.onUpdate(props, this._scrollMetrics.offset, this._scrollMetrics.visibleLength, this._getFrameMetrics, this._createViewToken, tuple.onViewableItemsChanged, cellsAroundViewport);
+     });
+diff --git a/node_modules/react-native-web/src/vendor/react-native/VirtualizedList/index.js b/node_modules/react-native-web/src/vendor/react-native/VirtualizedList/index.js
+index c7d68bb..459f017 100644
+--- a/node_modules/react-native-web/src/vendor/react-native/VirtualizedList/index.js
++++ b/node_modules/react-native-web/src/vendor/react-native/VirtualizedList/index.js
+@@ -75,6 +75,10 @@ type ViewabilityHelperCallbackTuple = {
+ type State = {
+   renderMask: CellRenderMask,
+   cellsAroundViewport: {first: number, last: number},
++  // Used to track items added at the start of the list for maintainVisibleContentPosition.
++  firstVisibleItemKey: ?string,
++  // When > 0 the scroll position available in JS is considered stale and should not be used.
++  pendingScrollUpdateCount: number,
+ };
+ 
+ /**
+@@ -447,9 +451,24 @@ class VirtualizedList extends StateSafePureComponent<Props, State> {
+ 
+     const initialRenderRegion = VirtualizedList._initialRenderRegion(props);
+ 
++    const minIndexForVisible =
++      this.props.maintainVisibleContentPosition?.minIndexForVisible ?? 0;
++
+     this.state = {
+       cellsAroundViewport: initialRenderRegion,
+       renderMask: VirtualizedList._createRenderMask(props, initialRenderRegion),
++      firstVisibleItemKey:
++        this.props.getItemCount(this.props.data) > minIndexForVisible
++          ? VirtualizedList._getItemKey(this.props, minIndexForVisible)
++          : null,
++      // When we have a non-zero initialScrollIndex, we will receive a
++      // scroll event later so this will prevent the window from updating
++      // until we get a valid offset.
++      pendingScrollUpdateCount:
++        this.props.initialScrollIndex != null &&
++        this.props.initialScrollIndex > 0
++          ? 1
++          : 0,
+     };
+ 
+       // REACT-NATIVE-WEB patch to preserve during future RN merges: Support inverted wheel scroller.
+@@ -534,6 +553,40 @@ class VirtualizedList extends StateSafePureComponent<Props, State> {
+     }
+   }
+ 
++  static _findItemIndexWithKey(
++    props: Props,
++    key: string,
++    hint: ?number,
++  ): ?number {
++    const itemCount = props.getItemCount(props.data);
++    if (hint != null && hint >= 0 && hint < itemCount) {
++      const curKey = VirtualizedList._getItemKey(props, hint);
++      if (curKey === key) {
++        return hint;
++      }
++    }
++    for (let ii = 0; ii < itemCount; ii++) {
++      const curKey = VirtualizedList._getItemKey(props, ii);
++      if (curKey === key) {
++        return ii;
++      }
++    }
++    return null;
++  }
++
++  static _getItemKey(
++    props: {
++      data: Props['data'],
++      getItem: Props['getItem'],
++      keyExtractor: Props['keyExtractor'],
++      ...
++    },
++    index: number,
++  ): string {
++    const item = props.getItem(props.data, index);
++    return VirtualizedList._keyExtractor(item, index, props);
++  }
++
+   static _createRenderMask(
+     props: Props,
+     cellsAroundViewport: {first: number, last: number},
+@@ -617,6 +670,7 @@ class VirtualizedList extends StateSafePureComponent<Props, State> {
+   _adjustCellsAroundViewport(
+     props: Props,
+     cellsAroundViewport: {first: number, last: number},
++    pendingScrollUpdateCount: number,
+   ): {first: number, last: number} {
+     const {data, getItemCount} = props;
+     const onEndReachedThreshold = onEndReachedThresholdOrDefault(
+@@ -648,21 +702,9 @@ class VirtualizedList extends StateSafePureComponent<Props, State> {
+         ),
+       };
+     } else {
+-      // If we have a non-zero initialScrollIndex and run this before we've scrolled,
+-      // we'll wipe out the initialNumToRender rendered elements starting at initialScrollIndex.
+-      // So let's wait until we've scrolled the view to the right place. And until then,
+-      // we will trust the initialScrollIndex suggestion.
+-
+-      // Thus, we want to recalculate the windowed render limits if any of the following hold:
+-      // - initialScrollIndex is undefined or is 0
+-      // - initialScrollIndex > 0 AND scrolling is complete
+-      // - initialScrollIndex > 0 AND the end of the list is visible (this handles the case
+-      //   where the list is shorter than the visible area)
+-      if (
+-        props.initialScrollIndex &&
+-        !this._scrollMetrics.offset &&
+-        Math.abs(distanceFromEnd) >= Number.EPSILON
+-      ) {
++      // If we have a pending scroll update, we should not adjust the render window as it
++      // might override the correct window.
++      if (pendingScrollUpdateCount > 0) {
+         return cellsAroundViewport.last >= getItemCount(data)
+           ? VirtualizedList._constrainToItemCount(cellsAroundViewport, props)
+           : cellsAroundViewport;
+@@ -771,14 +813,59 @@ class VirtualizedList extends StateSafePureComponent<Props, State> {
+       return prevState;
+     }
+ 
++    let maintainVisibleContentPositionAdjustment: ?number = null;
++    const prevFirstVisibleItemKey = prevState.firstVisibleItemKey;
++    const minIndexForVisible =
++      newProps.maintainVisibleContentPosition?.minIndexForVisible ?? 0;
++    const newFirstVisibleItemKey =
++      newProps.getItemCount(newProps.data) > minIndexForVisible
++        ? VirtualizedList._getItemKey(newProps, minIndexForVisible)
++        : null;
++    if (
++      newProps.maintainVisibleContentPosition != null &&
++      prevFirstVisibleItemKey != null &&
++      newFirstVisibleItemKey != null
++    ) {
++      if (newFirstVisibleItemKey !== prevFirstVisibleItemKey) {
++        // Fast path if items were added at the start of the list.
++        const hint =
++          itemCount - prevState.renderMask.numCells() + minIndexForVisible;
++        const firstVisibleItemIndex = VirtualizedList._findItemIndexWithKey(
++          newProps,
++          prevFirstVisibleItemKey,
++          hint,
++        );
++        maintainVisibleContentPositionAdjustment =
++          firstVisibleItemIndex != null
++            ? firstVisibleItemIndex - minIndexForVisible
++            : null;
++      } else {
++        maintainVisibleContentPositionAdjustment = null;
++      }
++    }
++
+     const constrainedCells = VirtualizedList._constrainToItemCount(
+-      prevState.cellsAroundViewport,
++      maintainVisibleContentPositionAdjustment != null
++        ? {
++            first:
++              prevState.cellsAroundViewport.first +
++              maintainVisibleContentPositionAdjustment,
++            last:
++              prevState.cellsAroundViewport.last +
++              maintainVisibleContentPositionAdjustment,
++          }
++        : prevState.cellsAroundViewport,
+       newProps,
+     );
+ 
+     return {
+       cellsAroundViewport: constrainedCells,
+       renderMask: VirtualizedList._createRenderMask(newProps, constrainedCells),
++      firstVisibleItemKey: newFirstVisibleItemKey,
++      pendingScrollUpdateCount:
++        maintainVisibleContentPositionAdjustment != null
++          ? prevState.pendingScrollUpdateCount + 1
++          : prevState.pendingScrollUpdateCount,
+     };
+   }
+ 
+@@ -810,7 +897,7 @@ class VirtualizedList extends StateSafePureComponent<Props, State> {
+ 
+     for (let ii = first; ii <= last; ii++) {
+       const item = getItem(data, ii);
+-      const key = this._keyExtractor(item, ii, this.props);
++      const key = VirtualizedList._keyExtractor(item, ii, this.props);
+ 
+       this._indicesToKeys.set(ii, key);
+       if (stickyIndicesFromProps.has(ii + stickyOffset)) {
+@@ -853,15 +940,19 @@ class VirtualizedList extends StateSafePureComponent<Props, State> {
+     props: Props,
+   ): {first: number, last: number} {
+     const itemCount = props.getItemCount(props.data);
+-    const last = Math.min(itemCount - 1, cells.last);
++    const lastPossibleCellIndex = itemCount - 1;
+ 
++    // Constraining `last` may significantly shrink the window. Adjust `first`
++    // to expand the window if the new `last` results in a new window smaller
++    // than the number of cells rendered per batch.
+     const maxToRenderPerBatch = maxToRenderPerBatchOrDefault(
+       props.maxToRenderPerBatch,
+     );
++    const maxFirst = Math.max(0, lastPossibleCellIndex - maxToRenderPerBatch);
+ 
+     return {
+-      first: clamp(0, itemCount - 1 - maxToRenderPerBatch, cells.first),
+-      last,
++      first: clamp(0, cells.first, maxFirst),
++      last: Math.min(lastPossibleCellIndex, cells.last),
+     };
+   }
+ 
+@@ -883,15 +974,14 @@ class VirtualizedList extends StateSafePureComponent<Props, State> {
+   _getSpacerKey = (isVertical: boolean): string =>
+     isVertical ? 'height' : 'width';
+ 
+-  _keyExtractor(
++  static _keyExtractor(
+     item: Item,
+     index: number,
+     props: {
+       keyExtractor?: ?(item: Item, index: number) => string,
+       ...
+     },
+-    // $FlowFixMe[missing-local-annot]
+-  ) {
++  ): string {
+     if (props.keyExtractor != null) {
+       return props.keyExtractor(item, index);
+     }
+@@ -937,6 +1027,10 @@ class VirtualizedList extends StateSafePureComponent<Props, State> {
+           cellKey={this._getCellKey() + '-header'}
+           key="$header">
+           <View
++            // We expect that header component will be a single native view so make it
++            // not collapsable to avoid this view being flattened and make this assumption
++            // no longer true.
++            collapsable={false}
+             onLayout={this._onLayoutHeader}
+             style={[
+               inversionStyle,
+@@ -1094,6 +1188,16 @@ class VirtualizedList extends StateSafePureComponent<Props, State> {
+       style: inversionStyle
+         ? [inversionStyle, this.props.style]
+         : this.props.style,
++      maintainVisibleContentPosition:
++        this.props.maintainVisibleContentPosition != null
++          ? {
++              ...this.props.maintainVisibleContentPosition,
++              // Adjust index to account for ListHeaderComponent.
++              minIndexForVisible:
++                this.props.maintainVisibleContentPosition.minIndexForVisible +
++                (this.props.ListHeaderComponent ? 1 : 0),
++            }
++          : undefined,
+     };
+ 
+     this._hasMore = this.state.cellsAroundViewport.last < itemCount - 1;
+@@ -1516,8 +1620,12 @@ class VirtualizedList extends StateSafePureComponent<Props, State> {
+       onStartReachedThreshold,
+       onEndReached,
+       onEndReachedThreshold,
+-      initialScrollIndex,
+     } = this.props;
++    // If we have any pending scroll updates it means that the scroll metrics
++    // are out of date and we should not call any of the edge reached callbacks.
++    if (this.state.pendingScrollUpdateCount > 0) {
++      return;
++    }
+     const {contentLength, visibleLength, offset} = this._scrollMetrics;
+     let distanceFromStart = offset;
+     let distanceFromEnd = contentLength - visibleLength - offset;
+@@ -1569,14 +1677,8 @@ class VirtualizedList extends StateSafePureComponent<Props, State> {
+       isWithinStartThreshold &&
+       this._scrollMetrics.contentLength !== this._sentStartForContentLength
+     ) {
+-      // On initial mount when using initialScrollIndex the offset will be 0 initially
+-      // and will trigger an unexpected onStartReached. To avoid this we can use
+-      // timestamp to differentiate between the initial scroll metrics and when we actually
+-      // received the first scroll event.
+-      if (!initialScrollIndex || this._scrollMetrics.timestamp !== 0) {
+-        this._sentStartForContentLength = this._scrollMetrics.contentLength;
+-        onStartReached({distanceFromStart});
+-      }
++      this._sentStartForContentLength = this._scrollMetrics.contentLength;
++      onStartReached({distanceFromStart});
+     }
+ 
+     // If the user scrolls away from the start or end and back again,
+@@ -1703,6 +1805,11 @@ class VirtualizedList extends StateSafePureComponent<Props, State> {
+       visibleLength,
+       zoomScale,
+     };
++    if (this.state.pendingScrollUpdateCount > 0) {
++      this.setState(state => ({
++        pendingScrollUpdateCount: state.pendingScrollUpdateCount - 1,
++      }));
++    }
+     this._updateViewableItems(this.props, this.state.cellsAroundViewport);
+     if (!this.props) {
+       return;
+@@ -1818,6 +1925,7 @@ class VirtualizedList extends StateSafePureComponent<Props, State> {
+       const cellsAroundViewport = this._adjustCellsAroundViewport(
+         props,
+         state.cellsAroundViewport,
++        state.pendingScrollUpdateCount,
+       );
+       const renderMask = VirtualizedList._createRenderMask(
+         props,
+@@ -1848,7 +1956,7 @@ class VirtualizedList extends StateSafePureComponent<Props, State> {
+     return {
+       index,
+       item,
+-      key: this._keyExtractor(item, index, props),
++      key: VirtualizedList._keyExtractor(item, index, props),
+       isViewable,
+     };
+   };
+@@ -1909,13 +2017,12 @@ class VirtualizedList extends StateSafePureComponent<Props, State> {
+     inLayout?: boolean,
+     ...
+   } => {
+-    const {data, getItem, getItemCount, getItemLayout} = props;
++    const {data, getItemCount, getItemLayout} = props;
+     invariant(
+       index >= 0 && index < getItemCount(data),
+       'Tried to get frame for out of range index ' + index,
+     );
+-    const item = getItem(data, index);
+-    const frame = this._frames[this._keyExtractor(item, index, props)];
++    const frame = this._frames[VirtualizedList._getItemKey(props, index)];
+     if (!frame || frame.index !== index) {
+       if (getItemLayout) {
+         /* $FlowFixMe[prop-missing] (>=0.63.0 site=react_native_fb) This comment
+@@ -1950,11 +2057,8 @@ class VirtualizedList extends StateSafePureComponent<Props, State> {
+     // where it is.
+     if (
+       focusedCellIndex >= itemCount ||
+-      this._keyExtractor(
+-        props.getItem(props.data, focusedCellIndex),
+-        focusedCellIndex,
+-        props,
+-      ) !== this._lastFocusedCellKey
++      VirtualizedList._getItemKey(props, focusedCellIndex) !==
++        this._lastFocusedCellKey
+     ) {
+       return [];
+     }
+@@ -1995,6 +2099,11 @@ class VirtualizedList extends StateSafePureComponent<Props, State> {
+     props: FrameMetricProps,
+     cellsAroundViewport: {first: number, last: number},
+   ) {
++    // If we have any pending scroll updates it means that the scroll metrics
++    // are out of date and we should not call any of the visibility callbacks.
++    if (this.state.pendingScrollUpdateCount > 0) {
++      return;
++    }
+     this._viewabilityTuples.forEach(tuple => {
+       tuple.viewabilityHelper.onUpdate(
+         props,
diff --git a/patches/react-native-web+0.19.9+004+fixLastSpacer.patch b/patches/react-native-web+0.19.12+002+fixLastSpacer.patch
similarity index 100%
rename from patches/react-native-web+0.19.9+004+fixLastSpacer.patch
rename to patches/react-native-web+0.19.12+002+fixLastSpacer.patch
diff --git a/patches/react-native-web+0.19.12+003+image-header-support.patch b/patches/react-native-web+0.19.12+003+image-header-support.patch
new file mode 100644
index 000000000000..d0a490a4ed70
--- /dev/null
+++ b/patches/react-native-web+0.19.12+003+image-header-support.patch
@@ -0,0 +1,201 @@
+diff --git a/node_modules/react-native-web/dist/exports/Image/index.js b/node_modules/react-native-web/dist/exports/Image/index.js
+index 9649d27..66ef95c 100644
+--- a/node_modules/react-native-web/dist/exports/Image/index.js
++++ b/node_modules/react-native-web/dist/exports/Image/index.js
+@@ -135,7 +135,22 @@ function resolveAssetUri(source) {
+   }
+   return uri;
+ }
+-var Image = /*#__PURE__*/React.forwardRef((props, ref) => {
++function raiseOnErrorEvent(uri, _ref) {
++  var onError = _ref.onError,
++    onLoadEnd = _ref.onLoadEnd;
++  if (onError) {
++    onError({
++      nativeEvent: {
++        error: "Failed to load resource " + uri + " (404)"
++      }
++    });
++  }
++  if (onLoadEnd) onLoadEnd();
++}
++function hasSourceDiff(a, b) {
++  return a.uri !== b.uri || JSON.stringify(a.headers) !== JSON.stringify(b.headers);
++}
++var BaseImage = /*#__PURE__*/React.forwardRef((props, ref) => {
+   var _ariaLabel = props['aria-label'],
+     accessibilityLabel = props.accessibilityLabel,
+     blurRadius = props.blurRadius,
+@@ -238,16 +253,10 @@ var Image = /*#__PURE__*/React.forwardRef((props, ref) => {
+         }
+       }, function error() {
+         updateState(ERRORED);
+-        if (onError) {
+-          onError({
+-            nativeEvent: {
+-              error: "Failed to load resource " + uri + " (404)"
+-            }
+-          });
+-        }
+-        if (onLoadEnd) {
+-          onLoadEnd();
+-        }
++        raiseOnErrorEvent(uri, {
++          onError,
++          onLoadEnd
++        });
+       });
+     }
+     function abortPendingRequest() {
+@@ -279,10 +288,79 @@ var Image = /*#__PURE__*/React.forwardRef((props, ref) => {
+     suppressHydrationWarning: true
+   }), hiddenImage, createTintColorSVG(tintColor, filterRef.current));
+ });
+-Image.displayName = 'Image';
++BaseImage.displayName = 'Image';
++
++/**
++ * This component handles specifically loading an image source with headers
++ * default source is never loaded using headers
++ */
++var ImageWithHeaders = /*#__PURE__*/React.forwardRef((props, ref) => {
++  // $FlowIgnore: This component would only be rendered when `source` matches `ImageSource`
++  var nextSource = props.source;
++  var _React$useState3 = React.useState(''),
++    blobUri = _React$useState3[0],
++    setBlobUri = _React$useState3[1];
++  var request = React.useRef(null);
++  var onError = props.onError,
++    onLoadStart = props.onLoadStart,
++    onLoadEnd = props.onLoadEnd;
++  React.useEffect(() => {
++    if (request.current !== null && !hasSourceDiff(nextSource, request.current.source)) {
++      return;
++    }
++
++    // When source changes we want to clean up any old/running requests
++    if (request.current !== null) {
++      request.current.cancel();
++    }
++
++    if (onLoadStart) {
++      onLoadStart();
++    }
++
++    // Store a ref for the current load request so we know what's the last loaded source,
++    // and so we can cancel it if a different source is passed through props
++    request.current = ImageLoader.loadWithHeaders(nextSource);
++    request.current.promise.then(uri => setBlobUri(uri)).catch(() => raiseOnErrorEvent(request.current.source.uri, {
++      onError,
++      onLoadEnd
++    }));
++  }, [nextSource, onLoadStart, onError, onLoadEnd]);
++
++  // Cancel any request on unmount
++  React.useEffect(() => () => {
++    if (request.current !== null) {
++      request.current.cancel();
++      request.current = null;
++    }
++  }, []);
++  var propsToPass = _objectSpread(_objectSpread({}, props), {}, {
++    // `onLoadStart` is called from the current component
++    // We skip passing it down to prevent BaseImage raising it a 2nd time
++    onLoadStart: undefined,
++    // Until the current component resolves the request (using headers)
++    // we skip forwarding the source so the base component doesn't attempt
++    // to load the original source
++    source: blobUri ? _objectSpread(_objectSpread({}, nextSource), {}, {
++      uri: blobUri
++    }) : undefined
++  });
++  return /*#__PURE__*/React.createElement(BaseImage, _extends({
++    ref: ref
++  }, propsToPass));
++});
+ 
+ // $FlowIgnore: This is the correct type, but casting makes it unhappy since the variables aren't defined yet
+-var ImageWithStatics = Image;
++var ImageWithStatics = /*#__PURE__*/React.forwardRef((props, ref) => {
++  if (props.source && props.source.headers) {
++    return /*#__PURE__*/React.createElement(ImageWithHeaders, _extends({
++      ref: ref
++    }, props));
++  }
++  return /*#__PURE__*/React.createElement(BaseImage, _extends({
++    ref: ref
++  }, props));
++});
+ ImageWithStatics.getSize = function (uri, success, failure) {
+   ImageLoader.getSize(uri, success, failure);
+ };
+diff --git a/node_modules/react-native-web/dist/modules/ImageLoader/index.js b/node_modules/react-native-web/dist/modules/ImageLoader/index.js
+index bc06a87..5a22819 100644
+--- a/node_modules/react-native-web/dist/modules/ImageLoader/index.js
++++ b/node_modules/react-native-web/dist/modules/ImageLoader/index.js
+@@ -76,7 +76,7 @@ var ImageLoader = {
+       var image = requests["" + requestId];
+       if (image) {
+         var naturalHeight = image.naturalHeight,
+-          naturalWidth = image.naturalWidth;
++            naturalWidth = image.naturalWidth;
+         if (naturalHeight && naturalWidth) {
+           success(naturalWidth, naturalHeight);
+           complete = true;
+@@ -102,11 +102,19 @@ var ImageLoader = {
+     id += 1;
+     var image = new window.Image();
+     image.onerror = onError;
+-    image.onload = e => {
++    image.onload = nativeEvent => {
+       // avoid blocking the main thread
+-      var onDecode = () => onLoad({
+-        nativeEvent: e
+-      });
++      var onDecode = () => {
++        // Append `source` to match RN's ImageLoadEvent interface
++        nativeEvent.source = {
++          uri: image.src,
++          width: image.naturalWidth,
++          height: image.naturalHeight
++        };
++        onLoad({
++          nativeEvent
++        });
++      };
+       if (typeof image.decode === 'function') {
+         // Safari currently throws exceptions when decoding svgs.
+         // We want to catch that error and allow the load handler
+@@ -120,6 +128,32 @@ var ImageLoader = {
+     requests["" + id] = image;
+     return id;
+   },
++  loadWithHeaders(source) {
++    var uri;
++    var abortController = new AbortController();
++    var request = new Request(source.uri, {
++      headers: source.headers,
++      signal: abortController.signal
++    });
++    request.headers.append('accept', 'image/*');
++    var promise = fetch(request).then(response => response.blob()).then(blob => {
++      uri = URL.createObjectURL(blob);
++      return uri;
++    }).catch(error => {
++      if (error.name === 'AbortError') {
++        return '';
++      }
++      throw error;
++    });
++    return {
++      promise,
++      source,
++      cancel: () => {
++        abortController.abort();
++        URL.revokeObjectURL(uri);
++      }
++    };
++  },
+   prefetch(uri) {
+     return new Promise((resolve, reject) => {
+       ImageLoader.load(uri, () => {
diff --git a/patches/react-native-web+0.19.9+006+fixPointerEventDown.patch b/patches/react-native-web+0.19.12+004+fixPointerEventDown.patch
similarity index 100%
rename from patches/react-native-web+0.19.9+006+fixPointerEventDown.patch
rename to patches/react-native-web+0.19.12+004+fixPointerEventDown.patch
diff --git a/patches/react-native-web+0.19.12+005+osr-improvement.patch b/patches/react-native-web+0.19.12+005+osr-improvement.patch
new file mode 100644
index 000000000000..b1afa699e7a2
--- /dev/null
+++ b/patches/react-native-web+0.19.12+005+osr-improvement.patch
@@ -0,0 +1,208 @@
+diff --git a/node_modules/react-native-web/dist/vendor/react-native/VirtualizedList/index.js b/node_modules/react-native-web/dist/vendor/react-native/VirtualizedList/index.js
+index bede95b..2aef4c6 100644
+--- a/node_modules/react-native-web/dist/vendor/react-native/VirtualizedList/index.js
++++ b/node_modules/react-native-web/dist/vendor/react-native/VirtualizedList/index.js
+@@ -332,7 +332,7 @@ class VirtualizedList extends StateSafePureComponent {
+       zoomScale: 1
+     };
+     this._scrollRef = null;
+-    this._sentStartForContentLength = 0;
++    this._sentStartForFirstVisibleItemKey = null;
+     this._sentEndForContentLength = 0;
+     this._totalCellLength = 0;
+     this._totalCellsMeasured = 0;
+@@ -684,16 +684,18 @@ class VirtualizedList extends StateSafePureComponent {
+         });
+       }
+     }
++    var itemCount = this.props.getItemCount(this.props.data);
+     var initialRenderRegion = VirtualizedList._initialRenderRegion(_props);
+     var minIndexForVisible = (_this$props$maintainV = (_this$props$maintainV2 = this.props.maintainVisibleContentPosition) == null ? void 0 : _this$props$maintainV2.minIndexForVisible) !== null && _this$props$maintainV !== void 0 ? _this$props$maintainV : 0;
+     this.state = {
+       cellsAroundViewport: initialRenderRegion,
+       renderMask: VirtualizedList._createRenderMask(_props, initialRenderRegion),
+-      firstVisibleItemKey: this.props.getItemCount(this.props.data) > minIndexForVisible ? VirtualizedList._getItemKey(this.props, minIndexForVisible) : null,
++      firstVisibleItemKey: itemCount > minIndexForVisible ? VirtualizedList._getItemKey(this.props, minIndexForVisible) : null,
+       // When we have a non-zero initialScrollIndex, we will receive a
+       // scroll event later so this will prevent the window from updating
+       // until we get a valid offset.
+-      pendingScrollUpdateCount: this.props.initialScrollIndex != null && this.props.initialScrollIndex > 0 ? 1 : 0
++      pendingScrollUpdateCount: this.props.initialScrollIndex != null && this.props.initialScrollIndex > 0 ? 1 : 0,
++      lastItemCount: itemCount
+     };
+ 
+     // REACT-NATIVE-WEB patch to preserve during future RN merges: Support inverted wheel scroller.
+@@ -919,13 +921,13 @@ class VirtualizedList extends StateSafePureComponent {
+     // first and last could be stale (e.g. if a new, shorter items props is passed in), so we make
+     // sure we're rendering a reasonable range here.
+     var itemCount = newProps.getItemCount(newProps.data);
+-    if (itemCount === prevState.renderMask.numCells()) {
++    if (itemCount === prevState.renderMask.numCells() && itemCount === prevState.lastItemCount) {
+       return prevState;
+     }
+     var maintainVisibleContentPositionAdjustment = null;
+     var prevFirstVisibleItemKey = prevState.firstVisibleItemKey;
+     var minIndexForVisible = (_newProps$maintainVis = (_newProps$maintainVis2 = newProps.maintainVisibleContentPosition) == null ? void 0 : _newProps$maintainVis2.minIndexForVisible) !== null && _newProps$maintainVis !== void 0 ? _newProps$maintainVis : 0;
+-    var newFirstVisibleItemKey = newProps.getItemCount(newProps.data) > minIndexForVisible ? VirtualizedList._getItemKey(newProps, minIndexForVisible) : null;
++    var newFirstVisibleItemKey = itemCount > minIndexForVisible ? VirtualizedList._getItemKey(newProps, minIndexForVisible) : null;
+     if (newProps.maintainVisibleContentPosition != null && prevFirstVisibleItemKey != null && newFirstVisibleItemKey != null) {
+       if (newFirstVisibleItemKey !== prevFirstVisibleItemKey) {
+         // Fast path if items were added at the start of the list.
+@@ -944,7 +946,8 @@ class VirtualizedList extends StateSafePureComponent {
+       cellsAroundViewport: constrainedCells,
+       renderMask: VirtualizedList._createRenderMask(newProps, constrainedCells),
+       firstVisibleItemKey: newFirstVisibleItemKey,
+-      pendingScrollUpdateCount: maintainVisibleContentPositionAdjustment != null ? prevState.pendingScrollUpdateCount + 1 : prevState.pendingScrollUpdateCount
++      pendingScrollUpdateCount: maintainVisibleContentPositionAdjustment != null ? prevState.pendingScrollUpdateCount + 1 : prevState.pendingScrollUpdateCount,
++      lastItemCount: itemCount
+     };
+   }
+   _pushCells(cells, stickyHeaderIndices, stickyIndicesFromProps, first, last, inversionStyle) {
+@@ -1220,7 +1223,7 @@ class VirtualizedList extends StateSafePureComponent {
+       return ret;
+     }
+   }
+-  componentDidUpdate(prevProps) {
++  componentDidUpdate(prevProps, prevState) {
+     var _this$props7 = this.props,
+       data = _this$props7.data,
+       extraData = _this$props7.extraData;
+@@ -1244,6 +1247,11 @@ class VirtualizedList extends StateSafePureComponent {
+     if (hiPriInProgress) {
+       this._hiPriInProgress = false;
+     }
++
++    if (this.state.cellsAroundViewport.first !== prevState.cellsAroundViewport.first ||
++        this.state.cellsAroundViewport.last !== prevState.cellsAroundViewport.last) {
++      this._maybeCallOnEdgeReached();
++    }
+   }
+ 
+   // Used for preventing scrollToIndex from being called multiple times for initialScrollIndex
+@@ -1407,8 +1415,8 @@ class VirtualizedList extends StateSafePureComponent {
+     // Next check if the user just scrolled within the start threshold
+     // and call onStartReached only once for a given content length,
+     // and only if onEndReached is not being executed
+-    else if (onStartReached != null && this.state.cellsAroundViewport.first === 0 && isWithinStartThreshold && this._scrollMetrics.contentLength !== this._sentStartForContentLength) {
+-      this._sentStartForContentLength = this._scrollMetrics.contentLength;
++    else if (onStartReached != null && this.state.cellsAroundViewport.first === 0 && isWithinStartThreshold && this.state.firstVisibleItemKey !== this._sentStartForFirstVisibleItemKey) {
++      this._sentStartForFirstVisibleItemKey = this.state.firstVisibleItemKey;
+       onStartReached({
+         distanceFromStart
+       });
+@@ -1417,7 +1425,7 @@ class VirtualizedList extends StateSafePureComponent {
+     // If the user scrolls away from the start or end and back again,
+     // cause onStartReached or onEndReached to be triggered again
+     else {
+-      this._sentStartForContentLength = isWithinStartThreshold ? this._sentStartForContentLength : 0;
++      this._sentStartForFirstVisibleItemKey = isWithinStartThreshold ? this._sentStartForFirstVisibleItemKey : null;
+       this._sentEndForContentLength = isWithinEndThreshold ? this._sentEndForContentLength : 0;
+     }
+   }
+diff --git a/node_modules/react-native-web/src/vendor/react-native/VirtualizedList/index.js b/node_modules/react-native-web/src/vendor/react-native/VirtualizedList/index.js
+index 459f017..d20115c 100644
+--- a/node_modules/react-native-web/src/vendor/react-native/VirtualizedList/index.js
++++ b/node_modules/react-native-web/src/vendor/react-native/VirtualizedList/index.js
+@@ -79,6 +79,7 @@ type State = {
+   firstVisibleItemKey: ?string,
+   // When > 0 the scroll position available in JS is considered stale and should not be used.
+   pendingScrollUpdateCount: number,
++  lastItemCount: number,
+ };
+ 
+ /**
+@@ -453,12 +454,13 @@ class VirtualizedList extends StateSafePureComponent<Props, State> {
+ 
+     const minIndexForVisible =
+       this.props.maintainVisibleContentPosition?.minIndexForVisible ?? 0;
++    const itemCount = this.props.getItemCount(this.props.data);
+ 
+     this.state = {
+       cellsAroundViewport: initialRenderRegion,
+       renderMask: VirtualizedList._createRenderMask(props, initialRenderRegion),
+       firstVisibleItemKey:
+-        this.props.getItemCount(this.props.data) > minIndexForVisible
++        itemCount > minIndexForVisible
+           ? VirtualizedList._getItemKey(this.props, minIndexForVisible)
+           : null,
+       // When we have a non-zero initialScrollIndex, we will receive a
+@@ -469,6 +471,7 @@ class VirtualizedList extends StateSafePureComponent<Props, State> {
+         this.props.initialScrollIndex > 0
+           ? 1
+           : 0,
++      lastItemCount: itemCount,
+     };
+ 
+       // REACT-NATIVE-WEB patch to preserve during future RN merges: Support inverted wheel scroller.
+@@ -809,16 +812,15 @@ class VirtualizedList extends StateSafePureComponent<Props, State> {
+     // first and last could be stale (e.g. if a new, shorter items props is passed in), so we make
+     // sure we're rendering a reasonable range here.
+     const itemCount = newProps.getItemCount(newProps.data);
+-    if (itemCount === prevState.renderMask.numCells()) {
++    if (itemCount === prevState.renderMask.numCells() && itemCount === prevState.lastItemCount) {
+       return prevState;
+     }
+-
+     let maintainVisibleContentPositionAdjustment: ?number = null;
+     const prevFirstVisibleItemKey = prevState.firstVisibleItemKey;
+     const minIndexForVisible =
+       newProps.maintainVisibleContentPosition?.minIndexForVisible ?? 0;
+     const newFirstVisibleItemKey =
+-      newProps.getItemCount(newProps.data) > minIndexForVisible
++      itemCount > minIndexForVisible
+         ? VirtualizedList._getItemKey(newProps, minIndexForVisible)
+         : null;
+     if (
+@@ -866,6 +868,7 @@ class VirtualizedList extends StateSafePureComponent<Props, State> {
+         maintainVisibleContentPositionAdjustment != null
+           ? prevState.pendingScrollUpdateCount + 1
+           : prevState.pendingScrollUpdateCount,
++      lastItemCount: itemCount,
+     };
+   }
+ 
+@@ -1285,6 +1288,11 @@ class VirtualizedList extends StateSafePureComponent<Props, State> {
+     if (hiPriInProgress) {
+       this._hiPriInProgress = false;
+     }
++
++    if (this.state.cellsAroundViewport.first !== prevState.cellsAroundViewport.first ||
++        this.state.cellsAroundViewport.last !== prevState.cellsAroundViewport.last) {
++      this._maybeCallOnEdgeReached();
++    }
+   }
+ 
+   _averageCellLength = 0;
+@@ -1325,7 +1333,7 @@ class VirtualizedList extends StateSafePureComponent<Props, State> {
+     zoomScale: 1,
+   };
+   _scrollRef: ?React.ElementRef<any> = null;
+-  _sentStartForContentLength = 0;
++  _sentStartForFirstVisibleItemKey: ?string = null;
+   _sentEndForContentLength = 0;
+   _totalCellLength = 0;
+   _totalCellsMeasured = 0;
+@@ -1675,18 +1683,18 @@ class VirtualizedList extends StateSafePureComponent<Props, State> {
+       onStartReached != null &&
+       this.state.cellsAroundViewport.first === 0 &&
+       isWithinStartThreshold &&
+-      this._scrollMetrics.contentLength !== this._sentStartForContentLength
++      this.state.firstVisibleItemKey !== this._sentStartForFirstVisibleItemKey
+     ) {
+-      this._sentStartForContentLength = this._scrollMetrics.contentLength;
++      this._sentStartForFirstVisibleItemKey = this.state.firstVisibleItemKey;
+       onStartReached({distanceFromStart});
+     }
+ 
+     // If the user scrolls away from the start or end and back again,
+     // cause onStartReached or onEndReached to be triggered again
+     else {
+-      this._sentStartForContentLength = isWithinStartThreshold
+-        ? this._sentStartForContentLength
+-        : 0;
++      this._sentStartForFirstVisibleItemKey = isWithinStartThreshold
++        ? this._sentStartForFirstVisibleItemKey
++        : null;
+       this._sentEndForContentLength = isWithinEndThreshold
+         ? this._sentEndForContentLength
+         : 0;
diff --git a/patches/react-native-web+0.19.12+006+remove focus trap from modal.patch b/patches/react-native-web+0.19.12+006+remove focus trap from modal.patch
new file mode 100644
index 000000000000..14dbc88b0b1c
--- /dev/null
+++ b/patches/react-native-web+0.19.12+006+remove focus trap from modal.patch	
@@ -0,0 +1,20 @@
+diff --git a/node_modules/react-native-web/dist/exports/Modal/index.js b/node_modules/react-native-web/dist/exports/Modal/index.js
+index d5df021..e2c46cf 100644
+--- a/node_modules/react-native-web/dist/exports/Modal/index.js
++++ b/node_modules/react-native-web/dist/exports/Modal/index.js
+@@ -86,13 +86,11 @@ var Modal = /*#__PURE__*/React.forwardRef((props, forwardedRef) => {
+     onDismiss: onDismissCallback,
+     onShow: onShowCallback,
+     visible: visible
+-  }, /*#__PURE__*/React.createElement(ModalFocusTrap, {
+-    active: isActive
+   }, /*#__PURE__*/React.createElement(ModalContent, _extends({}, rest, {
+     active: isActive,
+     onRequestClose: onRequestClose,
+     ref: forwardedRef,
+     transparent: transparent
+-  }), children))));
++  }), children)));
+ });
+ export default Modal;
+\ No newline at end of file
diff --git a/patches/react-native-web+0.19.12+007+fix-scrollable-overflown-text.patch b/patches/react-native-web+0.19.12+007+fix-scrollable-overflown-text.patch
new file mode 100644
index 000000000000..11b85afcf86c
--- /dev/null
+++ b/patches/react-native-web+0.19.12+007+fix-scrollable-overflown-text.patch
@@ -0,0 +1,26 @@
+diff --git a/node_modules/react-native-web/dist/exports/Text/index.js b/node_modules/react-native-web/dist/exports/Text/index.js
+index 8c5f79b..4a47f80 100644
+--- a/node_modules/react-native-web/dist/exports/Text/index.js
++++ b/node_modules/react-native-web/dist/exports/Text/index.js
+@@ -166,7 +166,7 @@ var styles = StyleSheet.create({
+   textMultiLine: {
+     display: '-webkit-box',
+     maxWidth: '100%',
+-    overflow: 'hidden',
++    overflow: 'clip',
+     textOverflow: 'ellipsis',
+     WebkitBoxOrient: 'vertical'
+   },
+diff --git a/node_modules/react-native-web/src/exports/Text/index.js b/node_modules/react-native-web/src/exports/Text/index.js
+index 071ae10..e43042c 100644
+--- a/node_modules/react-native-web/src/exports/Text/index.js
++++ b/node_modules/react-native-web/src/exports/Text/index.js
+@@ -219,7 +219,7 @@ const styles = StyleSheet.create({
+   textMultiLine: {
+     display: '-webkit-box',
+     maxWidth: '100%',
+-    overflow: 'hidden',
++    overflow: 'clip',
+     textOverflow: 'ellipsis',
+     WebkitBoxOrient: 'vertical'
+   },
diff --git a/patches/react-native-web+0.19.9+001+initial.patch b/patches/react-native-web+0.19.9+001+initial.patch
deleted file mode 100644
index 91ba6bfd59c0..000000000000
--- a/patches/react-native-web+0.19.9+001+initial.patch
+++ /dev/null
@@ -1,648 +0,0 @@
-diff --git a/node_modules/react-native-web/dist/vendor/react-native/VirtualizedList/index.js b/node_modules/react-native-web/dist/vendor/react-native/VirtualizedList/index.js
-index c879838..0c9dfcb 100644
---- a/node_modules/react-native-web/dist/vendor/react-native/VirtualizedList/index.js
-+++ b/node_modules/react-native-web/dist/vendor/react-native/VirtualizedList/index.js
-@@ -285,7 +285,7 @@ class VirtualizedList extends StateSafePureComponent {
-   // $FlowFixMe[missing-local-annot]
- 
-   constructor(_props) {
--    var _this$props$updateCel;
-+    var _this$props$updateCel, _this$props$maintainV, _this$props$maintainV2;
-     super(_props);
-     this._getScrollMetrics = () => {
-       return this._scrollMetrics;
-@@ -520,6 +520,11 @@ class VirtualizedList extends StateSafePureComponent {
-         visibleLength,
-         zoomScale
-       };
-+      if (this.state.pendingScrollUpdateCount > 0) {
-+        this.setState(state => ({
-+          pendingScrollUpdateCount: state.pendingScrollUpdateCount - 1
-+        }));
-+      }
-       this._updateViewableItems(this.props, this.state.cellsAroundViewport);
-       if (!this.props) {
-         return;
-@@ -569,7 +574,7 @@ class VirtualizedList extends StateSafePureComponent {
-     this._updateCellsToRender = () => {
-       this._updateViewableItems(this.props, this.state.cellsAroundViewport);
-       this.setState((state, props) => {
--        var cellsAroundViewport = this._adjustCellsAroundViewport(props, state.cellsAroundViewport);
-+        var cellsAroundViewport = this._adjustCellsAroundViewport(props, state.cellsAroundViewport, state.pendingScrollUpdateCount);
-         var renderMask = VirtualizedList._createRenderMask(props, cellsAroundViewport, this._getNonViewportRenderRegions(props));
-         if (cellsAroundViewport.first === state.cellsAroundViewport.first && cellsAroundViewport.last === state.cellsAroundViewport.last && renderMask.equals(state.renderMask)) {
-           return null;
-@@ -589,7 +594,7 @@ class VirtualizedList extends StateSafePureComponent {
-       return {
-         index,
-         item,
--        key: this._keyExtractor(item, index, props),
-+        key: VirtualizedList._keyExtractor(item, index, props),
-         isViewable
-       };
-     };
-@@ -621,12 +626,10 @@ class VirtualizedList extends StateSafePureComponent {
-     };
-     this._getFrameMetrics = (index, props) => {
-       var data = props.data,
--        getItem = props.getItem,
-         getItemCount = props.getItemCount,
-         getItemLayout = props.getItemLayout;
-       invariant(index >= 0 && index < getItemCount(data), 'Tried to get frame for out of range index ' + index);
--      var item = getItem(data, index);
--      var frame = this._frames[this._keyExtractor(item, index, props)];
-+      var frame = this._frames[VirtualizedList._getItemKey(props, index)];
-       if (!frame || frame.index !== index) {
-         if (getItemLayout) {
-           /* $FlowFixMe[prop-missing] (>=0.63.0 site=react_native_fb) This comment
-@@ -650,7 +653,7 @@ class VirtualizedList extends StateSafePureComponent {
- 
-       // The last cell we rendered may be at a new index. Bail if we don't know
-       // where it is.
--      if (focusedCellIndex >= itemCount || this._keyExtractor(props.getItem(props.data, focusedCellIndex), focusedCellIndex, props) !== this._lastFocusedCellKey) {
-+      if (focusedCellIndex >= itemCount || VirtualizedList._getItemKey(props, focusedCellIndex) !== this._lastFocusedCellKey) {
-         return [];
-       }
-       var first = focusedCellIndex;
-@@ -690,9 +693,15 @@ class VirtualizedList extends StateSafePureComponent {
-       }
-     }
-     var initialRenderRegion = VirtualizedList._initialRenderRegion(_props);
-+    var minIndexForVisible = (_this$props$maintainV = (_this$props$maintainV2 = this.props.maintainVisibleContentPosition) == null ? void 0 : _this$props$maintainV2.minIndexForVisible) !== null && _this$props$maintainV !== void 0 ? _this$props$maintainV : 0;
-     this.state = {
-       cellsAroundViewport: initialRenderRegion,
--      renderMask: VirtualizedList._createRenderMask(_props, initialRenderRegion)
-+      renderMask: VirtualizedList._createRenderMask(_props, initialRenderRegion),
-+      firstVisibleItemKey: this.props.getItemCount(this.props.data) > minIndexForVisible ? VirtualizedList._getItemKey(this.props, minIndexForVisible) : null,
-+      // When we have a non-zero initialScrollIndex, we will receive a
-+      // scroll event later so this will prevent the window from updating
-+      // until we get a valid offset.
-+      pendingScrollUpdateCount: this.props.initialScrollIndex != null && this.props.initialScrollIndex > 0 ? 1 : 0
-     };
- 
-     // REACT-NATIVE-WEB patch to preserve during future RN merges: Support inverted wheel scroller.
-@@ -748,6 +757,26 @@ class VirtualizedList extends StateSafePureComponent {
-       }
-     }
-   }
-+  static _findItemIndexWithKey(props, key, hint) {
-+    var itemCount = props.getItemCount(props.data);
-+    if (hint != null && hint >= 0 && hint < itemCount) {
-+      var curKey = VirtualizedList._getItemKey(props, hint);
-+      if (curKey === key) {
-+        return hint;
-+      }
-+    }
-+    for (var ii = 0; ii < itemCount; ii++) {
-+      var _curKey = VirtualizedList._getItemKey(props, ii);
-+      if (_curKey === key) {
-+        return ii;
-+      }
-+    }
-+    return null;
-+  }
-+  static _getItemKey(props, index) {
-+    var item = props.getItem(props.data, index);
-+    return VirtualizedList._keyExtractor(item, index, props);
-+  }
-   static _createRenderMask(props, cellsAroundViewport, additionalRegions) {
-     var itemCount = props.getItemCount(props.data);
-     invariant(cellsAroundViewport.first >= 0 && cellsAroundViewport.last >= cellsAroundViewport.first - 1 && cellsAroundViewport.last < itemCount, "Invalid cells around viewport \"[" + cellsAroundViewport.first + ", " + cellsAroundViewport.last + "]\" was passed to VirtualizedList._createRenderMask");
-@@ -796,7 +825,7 @@ class VirtualizedList extends StateSafePureComponent {
-       }
-     }
-   }
--  _adjustCellsAroundViewport(props, cellsAroundViewport) {
-+  _adjustCellsAroundViewport(props, cellsAroundViewport, pendingScrollUpdateCount) {
-     var data = props.data,
-       getItemCount = props.getItemCount;
-     var onEndReachedThreshold = onEndReachedThresholdOrDefault(props.onEndReachedThreshold);
-@@ -819,17 +848,9 @@ class VirtualizedList extends StateSafePureComponent {
-         last: Math.min(cellsAroundViewport.last + renderAhead, getItemCount(data) - 1)
-       };
-     } else {
--      // If we have a non-zero initialScrollIndex and run this before we've scrolled,
--      // we'll wipe out the initialNumToRender rendered elements starting at initialScrollIndex.
--      // So let's wait until we've scrolled the view to the right place. And until then,
--      // we will trust the initialScrollIndex suggestion.
--
--      // Thus, we want to recalculate the windowed render limits if any of the following hold:
--      // - initialScrollIndex is undefined or is 0
--      // - initialScrollIndex > 0 AND scrolling is complete
--      // - initialScrollIndex > 0 AND the end of the list is visible (this handles the case
--      //   where the list is shorter than the visible area)
--      if (props.initialScrollIndex && !this._scrollMetrics.offset && Math.abs(distanceFromEnd) >= Number.EPSILON) {
-+      // If we have a pending scroll update, we should not adjust the render window as it
-+      // might override the correct window.
-+      if (pendingScrollUpdateCount > 0) {
-         return cellsAroundViewport.last >= getItemCount(data) ? VirtualizedList._constrainToItemCount(cellsAroundViewport, props) : cellsAroundViewport;
-       }
-       newCellsAroundViewport = computeWindowedRenderLimits(props, maxToRenderPerBatchOrDefault(props.maxToRenderPerBatch), windowSizeOrDefault(props.windowSize), cellsAroundViewport, this.__getFrameMetricsApprox, this._scrollMetrics);
-@@ -902,16 +923,36 @@ class VirtualizedList extends StateSafePureComponent {
-     }
-   }
-   static getDerivedStateFromProps(newProps, prevState) {
-+    var _newProps$maintainVis, _newProps$maintainVis2;
-     // first and last could be stale (e.g. if a new, shorter items props is passed in), so we make
-     // sure we're rendering a reasonable range here.
-     var itemCount = newProps.getItemCount(newProps.data);
-     if (itemCount === prevState.renderMask.numCells()) {
-       return prevState;
-     }
--    var constrainedCells = VirtualizedList._constrainToItemCount(prevState.cellsAroundViewport, newProps);
-+    var maintainVisibleContentPositionAdjustment = null;
-+    var prevFirstVisibleItemKey = prevState.firstVisibleItemKey;
-+    var minIndexForVisible = (_newProps$maintainVis = (_newProps$maintainVis2 = newProps.maintainVisibleContentPosition) == null ? void 0 : _newProps$maintainVis2.minIndexForVisible) !== null && _newProps$maintainVis !== void 0 ? _newProps$maintainVis : 0;
-+    var newFirstVisibleItemKey = newProps.getItemCount(newProps.data) > minIndexForVisible ? VirtualizedList._getItemKey(newProps, minIndexForVisible) : null;
-+    if (newProps.maintainVisibleContentPosition != null && prevFirstVisibleItemKey != null && newFirstVisibleItemKey != null) {
-+      if (newFirstVisibleItemKey !== prevFirstVisibleItemKey) {
-+        // Fast path if items were added at the start of the list.
-+        var hint = itemCount - prevState.renderMask.numCells() + minIndexForVisible;
-+        var firstVisibleItemIndex = VirtualizedList._findItemIndexWithKey(newProps, prevFirstVisibleItemKey, hint);
-+        maintainVisibleContentPositionAdjustment = firstVisibleItemIndex != null ? firstVisibleItemIndex - minIndexForVisible : null;
-+      } else {
-+        maintainVisibleContentPositionAdjustment = null;
-+      }
-+    }
-+    var constrainedCells = VirtualizedList._constrainToItemCount(maintainVisibleContentPositionAdjustment != null ? {
-+      first: prevState.cellsAroundViewport.first + maintainVisibleContentPositionAdjustment,
-+      last: prevState.cellsAroundViewport.last + maintainVisibleContentPositionAdjustment
-+    } : prevState.cellsAroundViewport, newProps);
-     return {
-       cellsAroundViewport: constrainedCells,
--      renderMask: VirtualizedList._createRenderMask(newProps, constrainedCells)
-+      renderMask: VirtualizedList._createRenderMask(newProps, constrainedCells),
-+      firstVisibleItemKey: newFirstVisibleItemKey,
-+      pendingScrollUpdateCount: maintainVisibleContentPositionAdjustment != null ? prevState.pendingScrollUpdateCount + 1 : prevState.pendingScrollUpdateCount
-     };
-   }
-   _pushCells(cells, stickyHeaderIndices, stickyIndicesFromProps, first, last, inversionStyle) {
-@@ -934,7 +975,7 @@ class VirtualizedList extends StateSafePureComponent {
-     last = Math.min(end, last);
-     var _loop = function _loop() {
-       var item = getItem(data, ii);
--      var key = _this._keyExtractor(item, ii, _this.props);
-+      var key = VirtualizedList._keyExtractor(item, ii, _this.props);
-       _this._indicesToKeys.set(ii, key);
-       if (stickyIndicesFromProps.has(ii + stickyOffset)) {
-         stickyHeaderIndices.push(cells.length);
-@@ -969,20 +1010,23 @@ class VirtualizedList extends StateSafePureComponent {
-   }
-   static _constrainToItemCount(cells, props) {
-     var itemCount = props.getItemCount(props.data);
--    var last = Math.min(itemCount - 1, cells.last);
-+    var lastPossibleCellIndex = itemCount - 1;
-+
-+    // Constraining `last` may significantly shrink the window. Adjust `first`
-+    // to expand the window if the new `last` results in a new window smaller
-+    // than the number of cells rendered per batch.
-     var maxToRenderPerBatch = maxToRenderPerBatchOrDefault(props.maxToRenderPerBatch);
-+    var maxFirst = Math.max(0, lastPossibleCellIndex - maxToRenderPerBatch);
-     return {
--      first: clamp(0, itemCount - 1 - maxToRenderPerBatch, cells.first),
--      last
-+      first: clamp(0, cells.first, maxFirst),
-+      last: Math.min(lastPossibleCellIndex, cells.last)
-     };
-   }
-   _isNestedWithSameOrientation() {
-     var nestedContext = this.context;
-     return !!(nestedContext && !!nestedContext.horizontal === horizontalOrDefault(this.props.horizontal));
-   }
--  _keyExtractor(item, index, props
--  // $FlowFixMe[missing-local-annot]
--  ) {
-+  static _keyExtractor(item, index, props) {
-     if (props.keyExtractor != null) {
-       return props.keyExtractor(item, index);
-     }
-@@ -1022,7 +1066,12 @@ class VirtualizedList extends StateSafePureComponent {
-       cells.push( /*#__PURE__*/React.createElement(VirtualizedListCellContextProvider, {
-         cellKey: this._getCellKey() + '-header',
-         key: "$header"
--      }, /*#__PURE__*/React.createElement(View, {
-+      }, /*#__PURE__*/React.createElement(View
-+      // We expect that header component will be a single native view so make it
-+      // not collapsable to avoid this view being flattened and make this assumption
-+      // no longer true.
-+      , {
-+        collapsable: false,
-         onLayout: this._onLayoutHeader,
-         style: [inversionStyle, this.props.ListHeaderComponentStyle]
-       },
-@@ -1124,7 +1173,11 @@ class VirtualizedList extends StateSafePureComponent {
-       // TODO: Android support
-       invertStickyHeaders: this.props.invertStickyHeaders !== undefined ? this.props.invertStickyHeaders : this.props.inverted,
-       stickyHeaderIndices,
--      style: inversionStyle ? [inversionStyle, this.props.style] : this.props.style
-+      style: inversionStyle ? [inversionStyle, this.props.style] : this.props.style,
-+      maintainVisibleContentPosition: this.props.maintainVisibleContentPosition != null ? _objectSpread(_objectSpread({}, this.props.maintainVisibleContentPosition), {}, {
-+        // Adjust index to account for ListHeaderComponent.
-+        minIndexForVisible: this.props.maintainVisibleContentPosition.minIndexForVisible + (this.props.ListHeaderComponent ? 1 : 0)
-+      }) : undefined
-     });
-     this._hasMore = this.state.cellsAroundViewport.last < itemCount - 1;
-     var innerRet = /*#__PURE__*/React.createElement(VirtualizedListContextProvider, {
-@@ -1307,8 +1360,12 @@ class VirtualizedList extends StateSafePureComponent {
-       onStartReached = _this$props8.onStartReached,
-       onStartReachedThreshold = _this$props8.onStartReachedThreshold,
-       onEndReached = _this$props8.onEndReached,
--      onEndReachedThreshold = _this$props8.onEndReachedThreshold,
--      initialScrollIndex = _this$props8.initialScrollIndex;
-+      onEndReachedThreshold = _this$props8.onEndReachedThreshold;
-+    // If we have any pending scroll updates it means that the scroll metrics
-+    // are out of date and we should not call any of the edge reached callbacks.
-+    if (this.state.pendingScrollUpdateCount > 0) {
-+      return;
-+    }
-     var _this$_scrollMetrics2 = this._scrollMetrics,
-       contentLength = _this$_scrollMetrics2.contentLength,
-       visibleLength = _this$_scrollMetrics2.visibleLength,
-@@ -1348,16 +1405,10 @@ class VirtualizedList extends StateSafePureComponent {
-     // and call onStartReached only once for a given content length,
-     // and only if onEndReached is not being executed
-     else if (onStartReached != null && this.state.cellsAroundViewport.first === 0 && isWithinStartThreshold && this._scrollMetrics.contentLength !== this._sentStartForContentLength) {
--      // On initial mount when using initialScrollIndex the offset will be 0 initially
--      // and will trigger an unexpected onStartReached. To avoid this we can use
--      // timestamp to differentiate between the initial scroll metrics and when we actually
--      // received the first scroll event.
--      if (!initialScrollIndex || this._scrollMetrics.timestamp !== 0) {
--        this._sentStartForContentLength = this._scrollMetrics.contentLength;
--        onStartReached({
--          distanceFromStart
--        });
--      }
-+      this._sentStartForContentLength = this._scrollMetrics.contentLength;
-+      onStartReached({
-+        distanceFromStart
-+      });
-     }
- 
-     // If the user scrolls away from the start or end and back again,
-@@ -1412,6 +1463,11 @@ class VirtualizedList extends StateSafePureComponent {
-     }
-   }
-   _updateViewableItems(props, cellsAroundViewport) {
-+    // If we have any pending scroll updates it means that the scroll metrics
-+    // are out of date and we should not call any of the visibility callbacks.
-+    if (this.state.pendingScrollUpdateCount > 0) {
-+      return;
-+    }
-     this._viewabilityTuples.forEach(tuple => {
-       tuple.viewabilityHelper.onUpdate(props, this._scrollMetrics.offset, this._scrollMetrics.visibleLength, this._getFrameMetrics, this._createViewToken, tuple.onViewableItemsChanged, cellsAroundViewport);
-     });
-diff --git a/node_modules/react-native-web/src/vendor/react-native/VirtualizedList/index.js b/node_modules/react-native-web/src/vendor/react-native/VirtualizedList/index.js
-index c7d68bb..43f9653 100644
---- a/node_modules/react-native-web/src/vendor/react-native/VirtualizedList/index.js
-+++ b/node_modules/react-native-web/src/vendor/react-native/VirtualizedList/index.js
-@@ -75,6 +75,10 @@ type ViewabilityHelperCallbackTuple = {
- type State = {
-   renderMask: CellRenderMask,
-   cellsAroundViewport: {first: number, last: number},
-+  // Used to track items added at the start of the list for maintainVisibleContentPosition.
-+  firstVisibleItemKey: ?string,
-+  // When > 0 the scroll position available in JS is considered stale and should not be used.
-+  pendingScrollUpdateCount: number,
- };
- 
- /**
-@@ -447,9 +451,24 @@ class VirtualizedList extends StateSafePureComponent<Props, State> {
- 
-     const initialRenderRegion = VirtualizedList._initialRenderRegion(props);
- 
-+    const minIndexForVisible =
-+      this.props.maintainVisibleContentPosition?.minIndexForVisible ?? 0;
-+
-     this.state = {
-       cellsAroundViewport: initialRenderRegion,
-       renderMask: VirtualizedList._createRenderMask(props, initialRenderRegion),
-+      firstVisibleItemKey:
-+        this.props.getItemCount(this.props.data) > minIndexForVisible
-+          ? VirtualizedList._getItemKey(this.props, minIndexForVisible)
-+          : null,
-+      // When we have a non-zero initialScrollIndex, we will receive a
-+      // scroll event later so this will prevent the window from updating
-+      // until we get a valid offset.
-+      pendingScrollUpdateCount:
-+        this.props.initialScrollIndex != null &&
-+        this.props.initialScrollIndex > 0
-+          ? 1
-+          : 0,
-     };
- 
-       // REACT-NATIVE-WEB patch to preserve during future RN merges: Support inverted wheel scroller.
-@@ -534,6 +553,40 @@ class VirtualizedList extends StateSafePureComponent<Props, State> {
-     }
-   }
- 
-+  static _findItemIndexWithKey(
-+    props: Props,
-+    key: string,
-+    hint: ?number,
-+  ): ?number {
-+    const itemCount = props.getItemCount(props.data);
-+    if (hint != null && hint >= 0 && hint < itemCount) {
-+      const curKey = VirtualizedList._getItemKey(props, hint);
-+      if (curKey === key) {
-+        return hint;
-+      }
-+    }
-+    for (let ii = 0; ii < itemCount; ii++) {
-+      const curKey = VirtualizedList._getItemKey(props, ii);
-+      if (curKey === key) {
-+        return ii;
-+      }
-+    }
-+    return null;
-+  }
-+
-+  static _getItemKey(
-+    props: {
-+      data: Props['data'],
-+      getItem: Props['getItem'],
-+      keyExtractor: Props['keyExtractor'],
-+      ...
-+    },
-+    index: number,
-+  ): string {
-+    const item = props.getItem(props.data, index);
-+    return VirtualizedList._keyExtractor(item, index, props);
-+  }
-+
-   static _createRenderMask(
-     props: Props,
-     cellsAroundViewport: {first: number, last: number},
-@@ -617,6 +670,7 @@ class VirtualizedList extends StateSafePureComponent<Props, State> {
-   _adjustCellsAroundViewport(
-     props: Props,
-     cellsAroundViewport: {first: number, last: number},
-+    pendingScrollUpdateCount: number,
-   ): {first: number, last: number} {
-     const {data, getItemCount} = props;
-     const onEndReachedThreshold = onEndReachedThresholdOrDefault(
-@@ -648,21 +702,9 @@ class VirtualizedList extends StateSafePureComponent<Props, State> {
-         ),
-       };
-     } else {
--      // If we have a non-zero initialScrollIndex and run this before we've scrolled,
--      // we'll wipe out the initialNumToRender rendered elements starting at initialScrollIndex.
--      // So let's wait until we've scrolled the view to the right place. And until then,
--      // we will trust the initialScrollIndex suggestion.
--
--      // Thus, we want to recalculate the windowed render limits if any of the following hold:
--      // - initialScrollIndex is undefined or is 0
--      // - initialScrollIndex > 0 AND scrolling is complete
--      // - initialScrollIndex > 0 AND the end of the list is visible (this handles the case
--      //   where the list is shorter than the visible area)
--      if (
--        props.initialScrollIndex &&
--        !this._scrollMetrics.offset &&
--        Math.abs(distanceFromEnd) >= Number.EPSILON
--      ) {
-+      // If we have a pending scroll update, we should not adjust the render window as it
-+      // might override the correct window.
-+      if (pendingScrollUpdateCount > 0) {
-         return cellsAroundViewport.last >= getItemCount(data)
-           ? VirtualizedList._constrainToItemCount(cellsAroundViewport, props)
-           : cellsAroundViewport;
-@@ -771,14 +813,59 @@ class VirtualizedList extends StateSafePureComponent<Props, State> {
-       return prevState;
-     }
- 
-+    let maintainVisibleContentPositionAdjustment: ?number = null;
-+    const prevFirstVisibleItemKey = prevState.firstVisibleItemKey;
-+    const minIndexForVisible =
-+      newProps.maintainVisibleContentPosition?.minIndexForVisible ?? 0;
-+    const newFirstVisibleItemKey =
-+      newProps.getItemCount(newProps.data) > minIndexForVisible
-+        ? VirtualizedList._getItemKey(newProps, minIndexForVisible)
-+        : null;
-+    if (
-+      newProps.maintainVisibleContentPosition != null &&
-+      prevFirstVisibleItemKey != null &&
-+      newFirstVisibleItemKey != null
-+    ) {
-+      if (newFirstVisibleItemKey !== prevFirstVisibleItemKey) {
-+        // Fast path if items were added at the start of the list.
-+        const hint =
-+          itemCount - prevState.renderMask.numCells() + minIndexForVisible;
-+        const firstVisibleItemIndex = VirtualizedList._findItemIndexWithKey(
-+          newProps,
-+          prevFirstVisibleItemKey,
-+          hint,
-+        );
-+        maintainVisibleContentPositionAdjustment =
-+          firstVisibleItemIndex != null
-+            ? firstVisibleItemIndex - minIndexForVisible
-+            : null;
-+      } else {
-+        maintainVisibleContentPositionAdjustment = null;
-+      }
-+    }
-+
-     const constrainedCells = VirtualizedList._constrainToItemCount(
--      prevState.cellsAroundViewport,
-+      maintainVisibleContentPositionAdjustment != null
-+        ? {
-+            first:
-+              prevState.cellsAroundViewport.first +
-+              maintainVisibleContentPositionAdjustment,
-+            last:
-+              prevState.cellsAroundViewport.last +
-+              maintainVisibleContentPositionAdjustment,
-+          }
-+        : prevState.cellsAroundViewport,
-       newProps,
-     );
- 
-     return {
-       cellsAroundViewport: constrainedCells,
-       renderMask: VirtualizedList._createRenderMask(newProps, constrainedCells),
-+      firstVisibleItemKey: newFirstVisibleItemKey,
-+      pendingScrollUpdateCount:
-+        maintainVisibleContentPositionAdjustment != null
-+          ? prevState.pendingScrollUpdateCount + 1
-+          : prevState.pendingScrollUpdateCount,
-     };
-   }
- 
-@@ -810,7 +897,7 @@ class VirtualizedList extends StateSafePureComponent<Props, State> {
- 
-     for (let ii = first; ii <= last; ii++) {
-       const item = getItem(data, ii);
--      const key = this._keyExtractor(item, ii, this.props);
-+      const key = VirtualizedList._keyExtractor(item, ii, this.props);
- 
-       this._indicesToKeys.set(ii, key);
-       if (stickyIndicesFromProps.has(ii + stickyOffset)) {
-@@ -853,15 +940,19 @@ class VirtualizedList extends StateSafePureComponent<Props, State> {
-     props: Props,
-   ): {first: number, last: number} {
-     const itemCount = props.getItemCount(props.data);
--    const last = Math.min(itemCount - 1, cells.last);
-+    const lastPossibleCellIndex = itemCount - 1;
- 
-+    // Constraining `last` may significantly shrink the window. Adjust `first`
-+    // to expand the window if the new `last` results in a new window smaller
-+    // than the number of cells rendered per batch.
-     const maxToRenderPerBatch = maxToRenderPerBatchOrDefault(
-       props.maxToRenderPerBatch,
-     );
-+    const maxFirst = Math.max(0, lastPossibleCellIndex - maxToRenderPerBatch);
- 
-     return {
--      first: clamp(0, itemCount - 1 - maxToRenderPerBatch, cells.first),
--      last,
-+      first: clamp(0, cells.first, maxFirst),
-+      last: Math.min(lastPossibleCellIndex, cells.last),
-     };
-   }
- 
-@@ -883,15 +974,14 @@ class VirtualizedList extends StateSafePureComponent<Props, State> {
-   _getSpacerKey = (isVertical: boolean): string =>
-     isVertical ? 'height' : 'width';
- 
--  _keyExtractor(
-+  static _keyExtractor(
-     item: Item,
-     index: number,
-     props: {
-       keyExtractor?: ?(item: Item, index: number) => string,
-       ...
-     },
--    // $FlowFixMe[missing-local-annot]
--  ) {
-+  ): string {
-     if (props.keyExtractor != null) {
-       return props.keyExtractor(item, index);
-     }
-@@ -937,6 +1027,10 @@ class VirtualizedList extends StateSafePureComponent<Props, State> {
-           cellKey={this._getCellKey() + '-header'}
-           key="$header">
-           <View
-+            // We expect that header component will be a single native view so make it
-+            // not collapsable to avoid this view being flattened and make this assumption
-+            // no longer true.
-+            collapsable={false}
-             onLayout={this._onLayoutHeader}
-             style={[
-               inversionStyle,
-@@ -1094,6 +1188,16 @@ class VirtualizedList extends StateSafePureComponent<Props, State> {
-       style: inversionStyle
-         ? [inversionStyle, this.props.style]
-         : this.props.style,
-+      maintainVisibleContentPosition:
-+        this.props.maintainVisibleContentPosition != null
-+          ? {
-+              ...this.props.maintainVisibleContentPosition,
-+              // Adjust index to account for ListHeaderComponent.
-+              minIndexForVisible:
-+                this.props.maintainVisibleContentPosition.minIndexForVisible +
-+                (this.props.ListHeaderComponent ? 1 : 0),
-+            }
-+          : undefined,
-     };
- 
-     this._hasMore = this.state.cellsAroundViewport.last < itemCount - 1;
-@@ -1516,8 +1620,12 @@ class VirtualizedList extends StateSafePureComponent<Props, State> {
-       onStartReachedThreshold,
-       onEndReached,
-       onEndReachedThreshold,
--      initialScrollIndex,
-     } = this.props;
-+    // If we have any pending scroll updates it means that the scroll metrics
-+    // are out of date and we should not call any of the edge reached callbacks.
-+    if (this.state.pendingScrollUpdateCount > 0) {
-+      return;
-+    }
-     const {contentLength, visibleLength, offset} = this._scrollMetrics;
-     let distanceFromStart = offset;
-     let distanceFromEnd = contentLength - visibleLength - offset;
-@@ -1569,14 +1677,8 @@ class VirtualizedList extends StateSafePureComponent<Props, State> {
-       isWithinStartThreshold &&
-       this._scrollMetrics.contentLength !== this._sentStartForContentLength
-     ) {
--      // On initial mount when using initialScrollIndex the offset will be 0 initially
--      // and will trigger an unexpected onStartReached. To avoid this we can use
--      // timestamp to differentiate between the initial scroll metrics and when we actually
--      // received the first scroll event.
--      if (!initialScrollIndex || this._scrollMetrics.timestamp !== 0) {
--        this._sentStartForContentLength = this._scrollMetrics.contentLength;
--        onStartReached({distanceFromStart});
--      }
-+      this._sentStartForContentLength = this._scrollMetrics.contentLength;
-+      onStartReached({distanceFromStart});
-     }
- 
-     // If the user scrolls away from the start or end and back again,
-@@ -1703,6 +1805,11 @@ class VirtualizedList extends StateSafePureComponent<Props, State> {
-       visibleLength,
-       zoomScale,
-     };
-+    if (this.state.pendingScrollUpdateCount > 0) {
-+      this.setState(state => ({
-+        pendingScrollUpdateCount: state.pendingScrollUpdateCount - 1,
-+      }));
-+    }
-     this._updateViewableItems(this.props, this.state.cellsAroundViewport);
-     if (!this.props) {
-       return;
-@@ -1818,6 +1925,7 @@ class VirtualizedList extends StateSafePureComponent<Props, State> {
-       const cellsAroundViewport = this._adjustCellsAroundViewport(
-         props,
-         state.cellsAroundViewport,
-+        state.pendingScrollUpdateCount,
-       );
-       const renderMask = VirtualizedList._createRenderMask(
-         props,
-@@ -1848,7 +1956,7 @@ class VirtualizedList extends StateSafePureComponent<Props, State> {
-     return {
-       index,
-       item,
--      key: this._keyExtractor(item, index, props),
-+      key: VirtualizedList._keyExtractor(item, index, props),
-       isViewable,
-     };
-   };
-@@ -1909,13 +2017,12 @@ class VirtualizedList extends StateSafePureComponent<Props, State> {
-     inLayout?: boolean,
-     ...
-   } => {
--    const {data, getItem, getItemCount, getItemLayout} = props;
-+    const {data, getItemCount, getItemLayout} = props;
-     invariant(
-       index >= 0 && index < getItemCount(data),
-       'Tried to get frame for out of range index ' + index,
-     );
--    const item = getItem(data, index);
--    const frame = this._frames[this._keyExtractor(item, index, props)];
-+    const frame = this._frames[VirtualizedList._getItemKey(props, index)];
-     if (!frame || frame.index !== index) {
-       if (getItemLayout) {
-         /* $FlowFixMe[prop-missing] (>=0.63.0 site=react_native_fb) This comment
-@@ -1950,11 +2057,8 @@ class VirtualizedList extends StateSafePureComponent<Props, State> {
-     // where it is.
-     if (
-       focusedCellIndex >= itemCount ||
--      this._keyExtractor(
--        props.getItem(props.data, focusedCellIndex),
--        focusedCellIndex,
--        props,
--      ) !== this._lastFocusedCellKey
-+      VirtualizedList._getItemKey(props, focusedCellIndex) !==
-+        this._lastFocusedCellKey
-     ) {
-       return [];
-     }
-@@ -1995,6 +2099,11 @@ class VirtualizedList extends StateSafePureComponent<Props, State> {
-     props: FrameMetricProps,
-     cellsAroundViewport: {first: number, last: number},
-   ) {
-+    // If we have any pending scroll updates it means that the scroll metrics
-+    // are out of date and we should not call any of the visibility callbacks.
-+    if (this.state.pendingScrollUpdateCount > 0) {
-+      return;
-+    }
-     this._viewabilityTuples.forEach(tuple => {
-       tuple.viewabilityHelper.onUpdate(
-         props,
diff --git a/patches/react-native-web+0.19.9+002+measureInWindow.patch b/patches/react-native-web+0.19.9+002+measureInWindow.patch
deleted file mode 100644
index f41b4b3b48cb..000000000000
--- a/patches/react-native-web+0.19.9+002+measureInWindow.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/node_modules/react-native-web/dist/exports/UIManager/index.js b/node_modules/react-native-web/dist/exports/UIManager/index.js
-index 15b71d5..46b9e01 100644
---- a/node_modules/react-native-web/dist/exports/UIManager/index.js
-+++ b/node_modules/react-native-web/dist/exports/UIManager/index.js
-@@ -77,7 +77,7 @@ var UIManager = {
-   measureInWindow(node, callback) {
-     if (node) {
-       setTimeout(() => {
--        var _getRect2 = getRect(node),
-+        var _getRect2 = node.getBoundingClientRect(),
-           height = _getRect2.height,
-           left = _getRect2.left,
-           top = _getRect2.top,
diff --git a/patches/react-native-web+0.19.9+005+image-header-support.patch b/patches/react-native-web+0.19.9+005+image-header-support.patch
deleted file mode 100644
index 4652e22662f0..000000000000
--- a/patches/react-native-web+0.19.9+005+image-header-support.patch
+++ /dev/null
@@ -1,200 +0,0 @@
-diff --git a/node_modules/react-native-web/dist/exports/Image/index.js b/node_modules/react-native-web/dist/exports/Image/index.js
-index 95355d5..19109fc 100644
---- a/node_modules/react-native-web/dist/exports/Image/index.js
-+++ b/node_modules/react-native-web/dist/exports/Image/index.js
-@@ -135,7 +135,22 @@ function resolveAssetUri(source) {
-   }
-   return uri;
- }
--var Image = /*#__PURE__*/React.forwardRef((props, ref) => {
-+function raiseOnErrorEvent(uri, _ref) {
-+  var onError = _ref.onError,
-+    onLoadEnd = _ref.onLoadEnd;
-+  if (onError) {
-+    onError({
-+      nativeEvent: {
-+        error: "Failed to load resource " + uri + " (404)"
-+      }
-+    });
-+  }
-+  if (onLoadEnd) onLoadEnd();
-+}
-+function hasSourceDiff(a, b) {
-+  return a.uri !== b.uri || JSON.stringify(a.headers) !== JSON.stringify(b.headers);
-+}
-+var BaseImage = /*#__PURE__*/React.forwardRef((props, ref) => {
-   var ariaLabel = props['aria-label'],
-     blurRadius = props.blurRadius,
-     defaultSource = props.defaultSource,
-@@ -236,16 +251,10 @@ var Image = /*#__PURE__*/React.forwardRef((props, ref) => {
-         }
-       }, function error() {
-         updateState(ERRORED);
--        if (onError) {
--          onError({
--            nativeEvent: {
--              error: "Failed to load resource " + uri + " (404)"
--            }
--          });
--        }
--        if (onLoadEnd) {
--          onLoadEnd();
--        }
-+        raiseOnErrorEvent(uri, {
-+          onError,
-+          onLoadEnd
-+        });
-       });
-     }
-     function abortPendingRequest() {
-@@ -277,10 +286,78 @@ var Image = /*#__PURE__*/React.forwardRef((props, ref) => {
-     suppressHydrationWarning: true
-   }), hiddenImage, createTintColorSVG(tintColor, filterRef.current));
- });
--Image.displayName = 'Image';
-+BaseImage.displayName = 'Image';
-+
-+/**
-+ * This component handles specifically loading an image source with headers
-+ * default source is never loaded using headers
-+ */
-+var ImageWithHeaders = /*#__PURE__*/React.forwardRef((props, ref) => {
-+  // $FlowIgnore: This component would only be rendered when `source` matches `ImageSource`
-+  var nextSource = props.source;
-+  var _React$useState3 = React.useState(''),
-+    blobUri = _React$useState3[0],
-+    setBlobUri = _React$useState3[1];
-+  var request = React.useRef({
-+    cancel: () => {},
-+    source: {
-+      uri: '',
-+      headers: {}
-+    },
-+    promise: Promise.resolve('')
-+  });
-+  var onError = props.onError,
-+    onLoadStart = props.onLoadStart,
-+    onLoadEnd = props.onLoadEnd;
-+  React.useEffect(() => {
-+    if (!hasSourceDiff(nextSource, request.current.source)) {
-+      return;
-+    }
-+
-+    // When source changes we want to clean up any old/running requests
-+    request.current.cancel();
-+    if (onLoadStart) {
-+      onLoadStart();
-+    }
-+
-+    // Store a ref for the current load request so we know what's the last loaded source,
-+    // and so we can cancel it if a different source is passed through props
-+    request.current = ImageLoader.loadWithHeaders(nextSource);
-+    request.current.promise.then(uri => setBlobUri(uri)).catch(() => raiseOnErrorEvent(request.current.source.uri, {
-+      onError,
-+      onLoadEnd
-+    }));
-+  }, [nextSource, onLoadStart, onError, onLoadEnd]);
-+
-+  // Cancel any request on unmount
-+  React.useEffect(() => request.current.cancel, []);
-+  var propsToPass = _objectSpread(_objectSpread({}, props), {}, {
-+    // `onLoadStart` is called from the current component
-+    // We skip passing it down to prevent BaseImage raising it a 2nd time
-+    onLoadStart: undefined,
-+    // Until the current component resolves the request (using headers)
-+    // we skip forwarding the source so the base component doesn't attempt
-+    // to load the original source
-+    source: blobUri ? _objectSpread(_objectSpread({}, nextSource), {}, {
-+      uri: blobUri
-+    }) : undefined
-+  });
-+  return /*#__PURE__*/React.createElement(BaseImage, _extends({
-+    ref: ref
-+  }, propsToPass));
-+});
- 
- // $FlowIgnore: This is the correct type, but casting makes it unhappy since the variables aren't defined yet
--var ImageWithStatics = Image;
-+var ImageWithStatics = /*#__PURE__*/React.forwardRef((props, ref) => {
-+  if (props.source && props.source.headers) {
-+    return /*#__PURE__*/React.createElement(ImageWithHeaders, _extends({
-+      ref: ref
-+    }, props));
-+  }
-+  return /*#__PURE__*/React.createElement(BaseImage, _extends({
-+    ref: ref
-+  }, props));
-+});
- ImageWithStatics.getSize = function (uri, success, failure) {
-   ImageLoader.getSize(uri, success, failure);
- };
-diff --git a/node_modules/react-native-web/dist/modules/ImageLoader/index.js b/node_modules/react-native-web/dist/modules/ImageLoader/index.js
-index bc06a87..e309394 100644
---- a/node_modules/react-native-web/dist/modules/ImageLoader/index.js
-+++ b/node_modules/react-native-web/dist/modules/ImageLoader/index.js
-@@ -76,7 +76,7 @@ var ImageLoader = {
-       var image = requests["" + requestId];
-       if (image) {
-         var naturalHeight = image.naturalHeight,
--          naturalWidth = image.naturalWidth;
-+            naturalWidth = image.naturalWidth;
-         if (naturalHeight && naturalWidth) {
-           success(naturalWidth, naturalHeight);
-           complete = true;
-@@ -102,11 +102,19 @@ var ImageLoader = {
-     id += 1;
-     var image = new window.Image();
-     image.onerror = onError;
--    image.onload = e => {
-+    image.onload = nativeEvent => {
-       // avoid blocking the main thread
--      var onDecode = () => onLoad({
--        nativeEvent: e
--      });
-+      var onDecode = () => {
-+        // Append `source` to match RN's ImageLoadEvent interface
-+        nativeEvent.source = {
-+          uri: image.src,
-+          width: image.naturalWidth,
-+          height: image.naturalHeight
-+        };
-+        onLoad({
-+          nativeEvent
-+        });
-+      };
-       if (typeof image.decode === 'function') {
-         // Safari currently throws exceptions when decoding svgs.
-         // We want to catch that error and allow the load handler
-@@ -120,6 +128,32 @@ var ImageLoader = {
-     requests["" + id] = image;
-     return id;
-   },
-+  loadWithHeaders(source) {
-+    var uri;
-+    var abortController = new AbortController();
-+    var request = new Request(source.uri, {
-+      headers: source.headers,
-+      signal: abortController.signal
-+    });
-+    request.headers.append('accept', 'image/*');
-+    var promise = fetch(request).then(response => response.blob()).then(blob => {
-+      uri = URL.createObjectURL(blob);
-+      return uri;
-+    }).catch(error => {
-+      if (error.name === 'AbortError') {
-+        return '';
-+      }
-+      throw error;
-+    });
-+    return {
-+      promise,
-+      source,
-+      cancel: () => {
-+        abortController.abort();
-+        URL.revokeObjectURL(uri);
-+      }
-+    };
-+  },
-   prefetch(uri) {
-     return new Promise((resolve, reject) => {
-       ImageLoader.load(uri, () => {
diff --git a/patches/react-native-web+0.19.9+007+osr-improvement.patch b/patches/react-native-web+0.19.9+007+osr-improvement.patch
deleted file mode 100644
index 074cac3d0e6f..000000000000
--- a/patches/react-native-web+0.19.9+007+osr-improvement.patch
+++ /dev/null
@@ -1,70 +0,0 @@
-diff --git a/node_modules/react-native-web/dist/vendor/react-native/VirtualizedList/index.js b/node_modules/react-native-web/dist/vendor/react-native/VirtualizedList/index.js
-index b05da08..80aea85 100644
---- a/node_modules/react-native-web/dist/vendor/react-native/VirtualizedList/index.js
-+++ b/node_modules/react-native-web/dist/vendor/react-native/VirtualizedList/index.js
-@@ -332,7 +332,7 @@ class VirtualizedList extends StateSafePureComponent {
-       zoomScale: 1
-     };
-     this._scrollRef = null;
--    this._sentStartForContentLength = 0;
-+    this._sentStartForFirstVisibleItemKey = null;
-     this._sentEndForContentLength = 0;
-     this._totalCellLength = 0;
-     this._totalCellsMeasured = 0;
-@@ -1397,8 +1397,8 @@ class VirtualizedList extends StateSafePureComponent {
-     // Next check if the user just scrolled within the start threshold
-     // and call onStartReached only once for a given content length,
-     // and only if onEndReached is not being executed
--    else if (onStartReached != null && this.state.cellsAroundViewport.first === 0 && isWithinStartThreshold && this._scrollMetrics.contentLength !== this._sentStartForContentLength) {
--      this._sentStartForContentLength = this._scrollMetrics.contentLength;
-+    else if (onStartReached != null && this.state.cellsAroundViewport.first === 0 && isWithinStartThreshold && this.state.firstVisibleItemKey !== this._sentStartForFirstVisibleItemKey) {
-+      this._sentStartForFirstVisibleItemKey = this.state.firstVisibleItemKey;
-       onStartReached({
-         distanceFromStart
-       });
-@@ -1407,7 +1407,7 @@ class VirtualizedList extends StateSafePureComponent {
-     // If the user scrolls away from the start or end and back again,
-     // cause onStartReached or onEndReached to be triggered again
-     else {
--      this._sentStartForContentLength = isWithinStartThreshold ? this._sentStartForContentLength : 0;
-+      this._sentStartForFirstVisibleItemKey = isWithinStartThreshold ? this._sentStartForFirstVisibleItemKey : null;
-       this._sentEndForContentLength = isWithinEndThreshold ? this._sentEndForContentLength : 0;
-     }
-   }
-diff --git a/node_modules/react-native-web/src/vendor/react-native/VirtualizedList/index.js b/node_modules/react-native-web/src/vendor/react-native/VirtualizedList/index.js
-index 459f017..799a6ee 100644
---- a/node_modules/react-native-web/src/vendor/react-native/VirtualizedList/index.js
-+++ b/node_modules/react-native-web/src/vendor/react-native/VirtualizedList/index.js
-@@ -1325,7 +1325,7 @@ class VirtualizedList extends StateSafePureComponent<Props, State> {
-     zoomScale: 1,
-   };
-   _scrollRef: ?React.ElementRef<any> = null;
--  _sentStartForContentLength = 0;
-+  _sentStartForFirstVisibleItemKey: ?string = null;
-   _sentEndForContentLength = 0;
-   _totalCellLength = 0;
-   _totalCellsMeasured = 0;
-@@ -1675,18 +1675,18 @@ class VirtualizedList extends StateSafePureComponent<Props, State> {
-       onStartReached != null &&
-       this.state.cellsAroundViewport.first === 0 &&
-       isWithinStartThreshold &&
--      this._scrollMetrics.contentLength !== this._sentStartForContentLength
-+      this.state.firstVisibleItemKey !== this._sentStartForFirstVisibleItemKey
-     ) {
--      this._sentStartForContentLength = this._scrollMetrics.contentLength;
-+      this._sentStartForFirstVisibleItemKey = this.state.firstVisibleItemKey;
-       onStartReached({distanceFromStart});
-     }
- 
-     // If the user scrolls away from the start or end and back again,
-     // cause onStartReached or onEndReached to be triggered again
-     else {
--      this._sentStartForContentLength = isWithinStartThreshold
--        ? this._sentStartForContentLength
--        : 0;
-+      this._sentStartForFirstVisibleItemKey = isWithinStartThreshold
-+        ? this._sentStartForFirstVisibleItemKey
-+        : null;
-       this._sentEndForContentLength = isWithinEndThreshold
-         ? this._sentEndForContentLength
-         : 0;
diff --git a/patches/react-native-webview+13.6.4.patch b/patches/react-native-webview+13.6.4.patch
deleted file mode 100644
index ce035fd01852..000000000000
--- a/patches/react-native-webview+13.6.4.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-diff --git a/node_modules/react-native-webview/apple/RNCWebView.mm b/node_modules/react-native-webview/apple/RNCWebView.mm
-index 70d5ee4..6c3467d 100644
---- a/node_modules/react-native-webview/apple/RNCWebView.mm
-+++ b/node_modules/react-native-webview/apple/RNCWebView.mm
-@@ -313,24 +313,28 @@ - (void)updateProps:(Props::Shared const &)props oldProps:(Props::Shared const &
-     
-     if (oldViewProps.dataDetectorTypes != newViewProps.dataDetectorTypes) {
-         WKDataDetectorTypes dataDetectorTypes = WKDataDetectorTypeNone;
--            if (dataDetectorTypes & RNCWebViewDataDetectorTypes::Address) {
-+        for (const auto& type : newViewProps.dataDetectorTypes) {
-+            if (type == "address") {
-                 dataDetectorTypes |= WKDataDetectorTypeAddress;
--            } else if (dataDetectorTypes & RNCWebViewDataDetectorTypes::Link) {
-+            } else if (type == "link") {
-                 dataDetectorTypes |= WKDataDetectorTypeLink;
--            } else if (dataDetectorTypes & RNCWebViewDataDetectorTypes::CalendarEvent) {
-+            } else if (type == "calendarEvent") {
-                 dataDetectorTypes |= WKDataDetectorTypeCalendarEvent;
--            } else if (dataDetectorTypes & RNCWebViewDataDetectorTypes::TrackingNumber) {
-+            } else if (type == "trackingNumber") {
-                 dataDetectorTypes |= WKDataDetectorTypeTrackingNumber;
--            } else if (dataDetectorTypes & RNCWebViewDataDetectorTypes::FlightNumber) {
-+            } else if (type == "flightNumber") {
-                 dataDetectorTypes |= WKDataDetectorTypeFlightNumber;
--            } else if (dataDetectorTypes & RNCWebViewDataDetectorTypes::LookupSuggestion) {
-+            } else if (type == "lookupSuggestion") {
-                 dataDetectorTypes |= WKDataDetectorTypeLookupSuggestion;
--            } else if (dataDetectorTypes & RNCWebViewDataDetectorTypes::PhoneNumber) {
-+            } else if (type == "phoneNumber") {
-                 dataDetectorTypes |= WKDataDetectorTypePhoneNumber;
--            } else if (dataDetectorTypes & RNCWebViewDataDetectorTypes::All) {
-+            } else if (type == "all") {
-                 dataDetectorTypes |= WKDataDetectorTypeAll;
--            } else if (dataDetectorTypes & RNCWebViewDataDetectorTypes::None) {
-+                break;
-+            } else if (type == "none") {
-                 dataDetectorTypes = WKDataDetectorTypeNone;
-+                break;
-+            }
-         }
-         [_view setDataDetectorTypes:dataDetectorTypes];
-     }
-diff --git a/node_modules/react-native-webview/src/RNCWebViewNativeComponent.ts b/node_modules/react-native-webview/src/RNCWebViewNativeComponent.ts
-index ae52bc8..d035207 100644
---- a/node_modules/react-native-webview/src/RNCWebViewNativeComponent.ts
-+++ b/node_modules/react-native-webview/src/RNCWebViewNativeComponent.ts
-@@ -187,7 +187,7 @@ export interface NativeProps extends ViewProps {
-   contentMode?: WithDefault<'recommended' | 'mobile' | 'desktop', 'recommended'>;
-   dataDetectorTypes?: WithDefault<
-     // eslint-disable-next-line @typescript-eslint/array-type
--    ReadonlyArray<'address' | 'link' | 'calendarEvent' | 'trackingNumber' | 'flightNumber' | 'lookupSuggestion' | 'phoneNumber' | 'all' | 'none'>,
-+    ReadonlyArray<string>,
-     'phoneNumber'
-   >;
-   decelerationRate?: Double;
diff --git a/patches/react-native-webview+13.8.6.patch b/patches/react-native-webview+13.8.6.patch
new file mode 100644
index 000000000000..35b0a160b3a2
--- /dev/null
+++ b/patches/react-native-webview+13.8.6.patch
@@ -0,0 +1,65 @@
+diff --git a/node_modules/react-native-webview/apple/RNCWebView.mm b/node_modules/react-native-webview/apple/RNCWebView.mm
+index ec75032..9685c81 100644
+--- a/node_modules/react-native-webview/apple/RNCWebView.mm
++++ b/node_modules/react-native-webview/apple/RNCWebView.mm
+@@ -318,24 +318,28 @@ - (void)updateProps:(Props::Shared const &)props oldProps:(Props::Shared const &
+ #if !TARGET_OS_OSX
+     if (oldViewProps.dataDetectorTypes != newViewProps.dataDetectorTypes) {
+         WKDataDetectorTypes dataDetectorTypes = WKDataDetectorTypeNone;
+-            if (dataDetectorTypes & RNCWebViewDataDetectorTypes::Address) {
++            for (const auto& type : newViewProps.dataDetectorTypes) {
++                if (type == "address") {
+                 dataDetectorTypes |= WKDataDetectorTypeAddress;
+-            } else if (dataDetectorTypes & RNCWebViewDataDetectorTypes::Link) {
++            } else if (type == "link") {
+                 dataDetectorTypes |= WKDataDetectorTypeLink;
+-            } else if (dataDetectorTypes & RNCWebViewDataDetectorTypes::CalendarEvent) {
++            } else if (type == "calendarEvent") {
+                 dataDetectorTypes |= WKDataDetectorTypeCalendarEvent;
+-            } else if (dataDetectorTypes & RNCWebViewDataDetectorTypes::TrackingNumber) {
++            } else if (type == "trackingNumber") {
+                 dataDetectorTypes |= WKDataDetectorTypeTrackingNumber;
+-            } else if (dataDetectorTypes & RNCWebViewDataDetectorTypes::FlightNumber) {
++            } else if (type == "flightNumber") {
+                 dataDetectorTypes |= WKDataDetectorTypeFlightNumber;
+-            } else if (dataDetectorTypes & RNCWebViewDataDetectorTypes::LookupSuggestion) {
++            } else if (type == "lookupSuggestion") {
+                 dataDetectorTypes |= WKDataDetectorTypeLookupSuggestion;
+-            } else if (dataDetectorTypes & RNCWebViewDataDetectorTypes::PhoneNumber) {
++            } else if (type == "phoneNumber") {
+                 dataDetectorTypes |= WKDataDetectorTypePhoneNumber;
+-            } else if (dataDetectorTypes & RNCWebViewDataDetectorTypes::All) {
++            } else if (type == "all") {
+                 dataDetectorTypes |= WKDataDetectorTypeAll;
+-            } else if (dataDetectorTypes & RNCWebViewDataDetectorTypes::None) {
++                break;
++            } else if (type == "none") {
+                 dataDetectorTypes = WKDataDetectorTypeNone;
++                break;
++            }
+         }
+         [_view setDataDetectorTypes:dataDetectorTypes];
+     }
+diff --git a/node_modules/react-native-webview/src/RNCWebViewNativeComponent.ts b/node_modules/react-native-webview/src/RNCWebViewNativeComponent.ts
+index 682ab39..09e2bce 100644
+--- a/node_modules/react-native-webview/src/RNCWebViewNativeComponent.ts
++++ b/node_modules/react-native-webview/src/RNCWebViewNativeComponent.ts
+@@ -202,17 +202,7 @@ export interface NativeProps extends ViewProps {
+     'recommended'
+   >;
+   dataDetectorTypes?: WithDefault<
+-    ReadonlyArray<
+-      | 'address'
+-      | 'link'
+-      | 'calendarEvent'
+-      | 'trackingNumber'
+-      | 'flightNumber'
+-      | 'lookupSuggestion'
+-      | 'phoneNumber'
+-      | 'all'
+-      | 'none'
+-    >,
++    ReadonlyArray<string>,
+     'phoneNumber'
+   >;
+   decelerationRate?: Double;
diff --git a/patches/react-pdf+7.7.1.patch b/patches/react-pdf+7.7.1.patch
deleted file mode 100644
index f6ec8d8c1685..000000000000
--- a/patches/react-pdf+7.7.1.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/node_modules/react-pdf/dist/esm/Document.js b/node_modules/react-pdf/dist/esm/Document.js
-index 493ff15..8d5e734 100644
---- a/node_modules/react-pdf/dist/esm/Document.js
-+++ b/node_modules/react-pdf/dist/esm/Document.js
-@@ -261,6 +261,7 @@ const Document = forwardRef(function Document(_a, ref) {
-             pdfDispatch({ type: 'REJECT', error });
-         });
-         return () => {
-+            loadingTask._worker.destroy();
-             loadingTask.destroy();
-         };
-     }
diff --git a/patches/react-pdf+7.7.3.patch b/patches/react-pdf+7.7.3.patch
new file mode 100644
index 000000000000..0f9a2f47d3c7
--- /dev/null
+++ b/patches/react-pdf+7.7.3.patch
@@ -0,0 +1,24 @@
+diff --git a/node_modules/react-pdf/dist/cjs/Document.js b/node_modules/react-pdf/dist/cjs/Document.js
+index 9bb0398..032d898 100644
+--- a/node_modules/react-pdf/dist/cjs/Document.js
++++ b/node_modules/react-pdf/dist/cjs/Document.js
+@@ -289,6 +289,7 @@ const Document = (0, react_1.forwardRef)(function Document(_a, ref) {
+             pdfDispatch({ type: 'REJECT', error });
+         });
+         return () => {
++            loadingTask._worker.destroy();
+             loadingTask.destroy();
+         };
+     }
+diff --git a/node_modules/react-pdf/dist/esm/Document.js b/node_modules/react-pdf/dist/esm/Document.js
+index b1c5a81..569769e 100644
+--- a/node_modules/react-pdf/dist/esm/Document.js
++++ b/node_modules/react-pdf/dist/esm/Document.js
+@@ -261,6 +261,7 @@ const Document = forwardRef(function Document(_a, ref) {
+             pdfDispatch({ type: 'REJECT', error });
+         });
+         return () => {
++            loadingTask._worker.destroy();
+             loadingTask.destroy();
+         };
+     }
diff --git a/scripts/.eslintrc.js b/scripts/.eslintrc.js
new file mode 100644
index 000000000000..d6d39822b737
--- /dev/null
+++ b/scripts/.eslintrc.js
@@ -0,0 +1,10 @@
+module.exports = {
+    rules: {
+        // For all these Node.js scripts, we do not want to disable `console` statements
+        'no-console': 'off',
+
+        '@lwc/lwc/no-async-await': 'off',
+        'no-await-in-loop': 'off',
+        'no-restricted-syntax': ['error', 'ForInStatement', 'LabeledStatement', 'WithStatement'],
+    },
+};
diff --git a/scripts/applyPatches.sh b/scripts/applyPatches.sh
new file mode 100755
index 000000000000..4ce023755258
--- /dev/null
+++ b/scripts/applyPatches.sh
@@ -0,0 +1,49 @@
+#!/bin/bash
+
+# This script is a simple wrapper around patch-package that fails if any errors or warnings are detected.
+# This is useful because patch-package does not fail on errors or warnings by default,
+# which means that broken patches are easy to miss, and leads to developer frustration and wasted time.
+
+SCRIPTS_DIR=$(dirname "${BASH_SOURCE[0]}")
+source "$SCRIPTS_DIR/shellUtils.sh"
+
+# Wrapper to run patch-package.
+function patchPackage {
+  OS="$(uname)"
+  if [[ "$OS" == "Darwin" || "$OS" == "Linux" ]]; then
+    npx patch-package --error-on-fail --color=always
+  else
+    error "Unsupported OS: $OS"
+    exit 1
+  fi
+}
+
+# Run patch-package and capture its output and exit code, while still displaying the original output to the terminal
+TEMP_OUTPUT="$(mktemp)"
+patchPackage 2>&1 | tee "$TEMP_OUTPUT"
+EXIT_CODE=${PIPESTATUS[0]}
+OUTPUT="$(cat "$TEMP_OUTPUT")"
+rm -f "$TEMP_OUTPUT"
+
+# Check if the output contains a warning message
+echo "$OUTPUT" | grep -q "Warning:"
+WARNING_FOUND=$?
+
+printf "\n"
+
+# Determine the final exit code
+if [ "$EXIT_CODE" -eq 0 ]; then
+  if [ $WARNING_FOUND -eq 0 ]; then
+    # patch-package succeeded but warning was found
+    error "It looks like you upgraded a dependency without upgrading the patch. Please review the patch, determine if it's still needed, and port it to the new version of the dependency."
+    exit 1
+  else
+    # patch-package succeeded and no warning was found
+    success "patch-package succeeded without errors or warnings"
+    exit 0
+  fi
+else
+  # patch-package failed
+  error "patch-package failed to apply a patch"
+  exit "$EXIT_CODE"
+fi
diff --git a/scripts/build-desktop.sh b/scripts/build-desktop.sh
index 791f59d73330..55cb416c1112 100755
--- a/scripts/build-desktop.sh
+++ b/scripts/build-desktop.sh
@@ -32,6 +32,10 @@ info " • ENV file: $ENV_FILE"
 info ""
 npx webpack --config config/webpack/webpack.desktop.ts --env file=$ENV_FILE
 
+title "Combining web sourcemaps"
+info ""
+ts-node scripts/combine-web-sourcemaps.ts --path="desktop/dist/www"
+
 title "Building Desktop App Archive Using Electron"
 info ""
 shift 1
diff --git a/scripts/combine-web-sourcemaps.ts b/scripts/combine-web-sourcemaps.ts
new file mode 100755
index 000000000000..4a5972ed79c5
--- /dev/null
+++ b/scripts/combine-web-sourcemaps.ts
@@ -0,0 +1,62 @@
+/* eslint-disable @typescript-eslint/await-thenable */
+import fs from 'fs';
+import path from 'path';
+import type {RawSourceMap} from 'source-map';
+import {SourceMapConsumer, SourceMapGenerator} from 'source-map';
+import parseCommandLineArguments from './utils/parseCommandLineArguments';
+
+const argsMap = parseCommandLineArguments();
+
+const distDir = path.resolve(__dirname, '..', argsMap.path ?? 'dist');
+const outputFile = path.join(distDir, 'merged-source-map.js.map');
+
+async function mergeSourceMaps() {
+    // Read all .map files in the dist directory
+    const sourceMapFiles = fs
+        .readdirSync(distDir)
+        .filter((file) => file.endsWith('.map'))
+        .map((file) => path.join(distDir, file));
+
+    const mergedGenerator = new SourceMapGenerator();
+
+    for (const file of sourceMapFiles) {
+        const sourceMapContent = JSON.parse(fs.readFileSync(file, 'utf8')) as RawSourceMap;
+        const consumer = await new SourceMapConsumer(sourceMapContent);
+
+        consumer.eachMapping((mapping) => {
+            if (!mapping.source) {
+                return;
+            }
+
+            mergedGenerator.addMapping({
+                generated: {
+                    line: mapping.generatedLine,
+                    column: mapping.generatedColumn,
+                },
+                original: {
+                    line: mapping.originalLine,
+                    column: mapping.originalColumn,
+                },
+                source: mapping.source,
+                name: mapping.name,
+            });
+        });
+
+        // Add the sources content
+        consumer.sources.forEach((sourceFile: string) => {
+            const content = consumer.sourceContentFor(sourceFile);
+            if (content) {
+                mergedGenerator.setSourceContent(sourceFile, content);
+            }
+        });
+
+        consumer.destroy();
+    }
+
+    // Write the merged source map to a file
+    fs.writeFileSync(outputFile, mergedGenerator.toString());
+
+    console.log(`Merged source map written to ${outputFile}`);
+}
+
+mergeSourceMaps().catch(console.error);
diff --git a/scripts/pod-install.sh b/scripts/pod-install.sh
new file mode 100755
index 000000000000..cb2976d64587
--- /dev/null
+++ b/scripts/pod-install.sh
@@ -0,0 +1,89 @@
+#!/bin/bash
+
+# This script ensures pod installs respect Podfile.lock as the source of truth.
+# Specifically, the podspecs for pods listed under the 'EXTERNAL SOURCES' key in the Podfile.lock are cached in the `ios/Pods/Local Podspecs` directory.
+# While caching results in significantly faster installs, if a cached podspec doesn't match the version in Podfile.lock, pod install will fail.
+# To prevent this, this script will find and delete any mismatched cached podspecs before running pod install
+
+# Exit immediately if any command exits with a non-zero status
+set -e
+
+# Go to project root
+START_DIR="$(pwd)"
+ROOT_DIR="$(dirname "$(cd -- "$(dirname -- "${BASH_SOURCE[0]}")" &> /dev/null && pwd)")"
+cd "$ROOT_DIR" || exit 1
+
+# Cleanup and exit
+# param - status code
+function cleanupAndExit {
+  cd "$START_DIR" || exit 1
+  exit "$1"
+}
+
+source scripts/shellUtils.sh
+
+# Check if bundle is installed
+if ! bundle --version > /dev/null 2>&1; then
+  error 'bundle is not installed. Please install bundle and try again'
+  cleanupAndExit 1
+fi
+
+# Check if jq is installed
+if ! jq --version > /dev/null 2>&1; then
+  error 'jq is not installed. Please install jq and try again'
+  cleanupAndExit 1
+fi
+
+# Check if yq is installed
+if ! yq --version > /dev/null 2>&1; then
+  error 'yq is not installed. Please install yq and try again'
+  cleanupAndExit 1
+fi
+
+CACHED_PODSPEC_DIR='ios/Pods/Local Podspecs'
+if [ -d "$CACHED_PODSPEC_DIR" ]; then
+  info "Verifying pods from Podfile.lock match local podspecs..."
+
+  # Convert podfile.lock to json since yq is missing some features of jq (namely, if/else)
+  PODFILE_LOCK_AS_JSON="$(yq -o=json ios/Podfile.lock)"
+
+  # Retrieve a list of pods and their versions from Podfile.lock
+  declare PODS_FROM_LOCKFILE
+  if ! read_lines_into_array PODS_FROM_LOCKFILE < <(jq -r '.PODS | map (if (.|type) == "object" then keys[0] else . end) | .[]' < <(echo "$PODFILE_LOCK_AS_JSON")); then
+    error "Error: Could not parse pod versions from Podfile.lock"
+    cleanupAndExit 1
+  fi
+
+  for CACHED_PODSPEC_PATH in "$CACHED_PODSPEC_DIR"/*; do
+    if [ -f "$CACHED_PODSPEC_PATH" ]; then
+      # The next two lines use bash parameter expansion to get just the pod name from the path
+      # i.e: `ios/Pods/Local Podspecs/hermes-engine.podspec.json` to just `hermes-engine`
+      # It extracts the part of the string between the last `/` and the first `.`
+      CACHED_POD_NAME="${CACHED_PODSPEC_PATH##*/}"
+      CACHED_POD_NAME="${CACHED_POD_NAME%%.*}"
+
+      info "🫛 Verifying local pod $CACHED_POD_NAME"
+      CACHED_POD_VERSION="$(jq -r '.version' < <(cat "$CACHED_PODSPEC_PATH"))"
+      for POD_FROM_LOCKFILE in "${PODS_FROM_LOCKFILE[@]}"; do
+        # Extract the pod name and version that was parsed from the lockfile. POD_FROM_LOCKFILE looks like `PodName (version)`
+        IFS=' ' read -r POD_NAME_FROM_LOCKFILE POD_VERSION_FROM_LOCKFILE <<< "$POD_FROM_LOCKFILE"
+        if [[ "$CACHED_POD_NAME" == "$POD_NAME_FROM_LOCKFILE" ]]; then
+          if [[ "$POD_VERSION_FROM_LOCKFILE" != "($CACHED_POD_VERSION)" ]]; then
+            clear_last_line
+            info "⚠️  found mismatched pod: $CACHED_POD_NAME, removing local podspec $CACHED_PODSPEC_PATH"
+            rm "$CACHED_PODSPEC_PATH"
+            echo -e "\n"
+          fi
+          break
+        fi
+      done
+      clear_last_line
+    fi
+  done
+fi
+
+cd ios || cleanupAndExit 1
+bundle exec pod install
+
+# Go back to where we started
+cleanupAndExit 0
diff --git a/scripts/postInstall.sh b/scripts/postInstall.sh
index 339fdf25cb10..782c8ef5822c 100755
--- a/scripts/postInstall.sh
+++ b/scripts/postInstall.sh
@@ -1,11 +1,14 @@
 #!/bin/bash
 
+# Exit immediately if any command exits with a non-zero status
+set -e
+
 # Go to project root
 ROOT_DIR=$(dirname "$(cd -- "$(dirname -- "${BASH_SOURCE[0]}")" &> /dev/null && pwd)")
 cd "$ROOT_DIR" || exit 1
 
-# Run patch-package
-npx patch-package
+# Apply packages using patch-package
+scripts/applyPatches.sh
 
 # Install node_modules in subpackages, unless we're in a CI/CD environment,
 # where the node_modules for subpackages are cached separately.
diff --git a/scripts/release-profile.ts b/scripts/release-profile.ts
index 8ec0979f9f9e..a83fb55fa5ff 100755
--- a/scripts/release-profile.ts
+++ b/scripts/release-profile.ts
@@ -3,21 +3,7 @@
 /* eslint-disable no-console */
 import {execSync} from 'child_process';
 import fs from 'fs';
-
-type ArgsMap = Record<string, string>;
-
-// Function to parse command-line arguments into a key-value object
-function parseCommandLineArguments(): ArgsMap {
-    const args = process.argv.slice(2); // Skip node and script paths
-    const argsMap: ArgsMap = {};
-    args.forEach((arg) => {
-        const [key, value] = arg.split('=');
-        if (key.startsWith('--')) {
-            argsMap[key.substring(2)] = value;
-        }
-    });
-    return argsMap;
-}
+import parseCommandLineArguments from './utils/parseCommandLineArguments';
 
 // Function to find .cpuprofile files in the current directory
 function findCpuProfileFiles() {
@@ -33,6 +19,8 @@ if (argsMap.platform === 'ios') {
     sourcemapPath = 'main.jsbundle.map';
 } else if (argsMap.platform === 'android') {
     sourcemapPath = 'android/app/build/generated/sourcemaps/react/productionRelease/index.android.bundle.map';
+} else if (argsMap.platform === 'web') {
+    sourcemapPath = 'dist/merged-source-map.js.map';
 } else {
     console.error('Please specify the platform using --platform=ios or --platform=android');
     process.exit(1);
@@ -49,7 +37,7 @@ if (cpuProfiles.length === 0) {
 } else {
     // Construct the command
     const cpuprofileName = cpuProfiles[0];
-    const command = `npx react-native-release-profiler --local ${cpuprofileName} --sourcemap-path ${sourcemapPath}`;
+    const command = `npx react-native-release-profiler --local "${cpuprofileName}" --sourcemap-path "${sourcemapPath}"`;
 
     console.log(`Executing: ${command}`);
 
diff --git a/scripts/shellUtils.sh b/scripts/shellUtils.sh
index 848e6d238254..c1ceace09d0a 100644
--- a/scripts/shellUtils.sh
+++ b/scripts/shellUtils.sh
@@ -41,6 +41,11 @@ function title {
   printf "\n%s%s%s\n" "$TITLE" "$1" "$RESET"
 }
 
+# Function to clear the last printed line
+clear_last_line() {
+  echo -ne "\033[1A\033[K"
+}
+
 function assert_equal {
   if [[ "$1" != "$2" ]]; then
     error "Assertion failed: $1 is not equal to $2"
@@ -102,4 +107,18 @@ get_abs_path() {
     abs_path=${abs_path/#\/\//\/}
 
     echo "$abs_path"
-}
\ No newline at end of file
+}
+
+# Function to read lines from standard input into an array using a temporary file.
+# This is a bash 3 polyfill for readarray.
+# Arguments:
+#   $1: Name of the array variable to store the lines
+# Usage:
+#   read_lines_into_array array_name
+read_lines_into_array() {
+  local array_name="$1"
+  local line
+  while IFS= read -r line || [ -n "$line" ]; do
+    eval "$array_name+=(\"$line\")"
+  done
+}
diff --git a/scripts/symbolicate-profile.ts b/scripts/symbolicate-profile.ts
new file mode 100755
index 000000000000..a58c2894edb6
--- /dev/null
+++ b/scripts/symbolicate-profile.ts
@@ -0,0 +1,174 @@
+#!/usr/bin/env ts-node
+
+/* eslint-disable @typescript-eslint/naming-convention */
+
+/**
+ * This script helps to symbolicate a .cpuprofile file that was obtained from a specific (staging) app version (usually provided by a user using the app).
+ *
+ * @abstract
+ *
+ * 1. When creating a new deployment in our github actions, we upload the source map for android and iOS as artifacts.
+ * 2. The profiles created by the app on the user's device have the app version encoded in the filename.
+ * 3. This script takes in a .cpuprofile file, reads the app version from the filename, and downloads the corresponding source map from the artifacts using github's API.
+ * 4. It then uses the source map to symbolicate the .cpuprofile file using the `react-native-release-profiler` cli.
+ *
+ * @note For downloading an artifact a github token is required.
+ */
+import {execSync} from 'child_process';
+import fs from 'fs';
+import https from 'https';
+import path from 'path';
+import GithubUtils from '@github/libs/GithubUtils';
+import * as Logger from './utils/Logger';
+import parseCommandLineArguments from './utils/parseCommandLineArguments';
+
+const argsMap = parseCommandLineArguments();
+
+/* ============== INPUT VALIDATION ============== */
+
+if (Object.keys(argsMap).length === 0 || argsMap.help !== undefined) {
+    Logger.log('Symbolicates a .cpuprofile file obtained from a specific app version by downloading the source map from the github action runs.');
+    Logger.log('Usage: npm run symbolicate-profile -- --profile=<filename> --platform=<ios|android>');
+    Logger.log('Options:');
+    Logger.log('  --profile=<filename>          The .cpuprofile file to symbolicate');
+    Logger.log('  --platform=<ios|android>      The platform for which the source map was uploaded');
+    Logger.log('  --ghToken                     Token to use for requests send to the GitHub API. By default tries to pick up from the environment variable GITHUB_TOKEN');
+    Logger.log('  --help                        Display this help message');
+    process.exit(0);
+}
+
+if (argsMap.profile === undefined) {
+    Logger.error('Please specify the .cpuprofile file to symbolicate using --profile=<filename>');
+    process.exit(1);
+}
+if (!fs.existsSync(argsMap.profile)) {
+    Logger.error(`File ${argsMap.profile} does not exist.`);
+    process.exit(1);
+}
+
+if (argsMap.platform === undefined) {
+    Logger.error('Please specify the platform using --platform=ios or --platform=android');
+    process.exit(1);
+}
+
+const githubToken = argsMap.ghToken ?? process.env.GITHUB_TOKEN;
+if (githubToken === undefined) {
+    Logger.error('No GitHub token provided. Either set a GITHUB_TOKEN environment variable or pass it using --ghToken');
+    process.exit(1);
+}
+
+GithubUtils.initOctokitWithToken(githubToken);
+
+/* ============= EXTRACT APP VERSION ============= */
+
+// Formatted as "Profile_trace_for_1.4.81-9.cpuprofile"
+const appVersionRegex = /\d+\.\d+\.\d+(-\d+)?/;
+const appVersion = argsMap.profile.match(appVersionRegex)?.[0];
+if (appVersion === undefined) {
+    Logger.error('Could not extract the app version from the profile filename.');
+    process.exit(1);
+}
+Logger.info(`Found app version ${appVersion} in the profile filename`);
+
+/* ============== UTILITY FUNCTIONS ============== */
+
+async function getWorkflowRunArtifact() {
+    const artifactName = `${argsMap.platform}-sourcemap-${appVersion}`;
+    Logger.info(`Fetching sourcemap artifact with name "${artifactName}"`);
+    const artifact = await GithubUtils.getArtifactByName(artifactName);
+    if (artifact === undefined) {
+        throw new Error(`Could not find the artifact ${artifactName}! Are you sure the deploy step succeeded?`);
+    }
+    return artifact.id;
+}
+
+const sourcemapDir = path.resolve(__dirname, '../.sourcemaps');
+
+function downloadFile(url: string) {
+    Logger.log(`Downloading file from URL: ${url}`);
+    if (!fs.existsSync(sourcemapDir)) {
+        Logger.info(`Creating download directory ${sourcemapDir}`);
+        fs.mkdirSync(sourcemapDir);
+    }
+
+    const destination = path.join(sourcemapDir, `${argsMap.platform}-sourcemap-${appVersion}.zip`);
+    const file = fs.createWriteStream(destination);
+    return new Promise<string>((resolve, reject) => {
+        https
+            .get(url, (response) => {
+                response.pipe(file);
+                file.on('finish', () => {
+                    file.close();
+                    Logger.success(`Downloaded file to ${destination}`);
+                    resolve(destination);
+                });
+            })
+            .on('error', (error) => {
+                fs.unlink(destination, () => {
+                    reject(error);
+                });
+            });
+    });
+}
+
+function unpackZipFile(zipPath: string) {
+    Logger.info(`Unpacking file ${zipPath}`);
+    const command = `unzip -o ${zipPath} -d ${sourcemapDir}`;
+    execSync(command, {stdio: 'inherit'});
+    Logger.info(`Deleting zip file ${zipPath}`);
+    return new Promise<void>((resolve, reject) => {
+        fs.unlink(zipPath, (error) => (error ? reject(error) : resolve()));
+    });
+}
+
+const localSourceMapPath = path.join(sourcemapDir, `${appVersion}-${argsMap.platform}.map`);
+function renameDownloadedSourcemapFile() {
+    const androidName = 'index.android.bundle.map';
+    const iosName = 'main.jsbundle.map';
+    const downloadSourcemapPath = path.join(sourcemapDir, argsMap.platform === 'ios' ? iosName : androidName);
+
+    if (!fs.existsSync(downloadSourcemapPath)) {
+        Logger.error(`Could not find the sourcemap file ${downloadSourcemapPath}`);
+        process.exit(1);
+    }
+
+    Logger.info(`Renaming sourcemap file to ${localSourceMapPath}`);
+    fs.renameSync(downloadSourcemapPath, localSourceMapPath);
+}
+
+// Symbolicate using the downloaded source map
+function symbolicateProfile() {
+    const command = `npx react-native-release-profiler --local ${argsMap.profile} --sourcemap-path ${localSourceMapPath}`;
+    execSync(command, {stdio: 'inherit'});
+}
+
+async function fetchAndProcessArtifact() {
+    const artifactId = await getWorkflowRunArtifact();
+    const downloadUrl = await GithubUtils.getArtifactDownloadURL(artifactId);
+    const zipPath = await downloadFile(downloadUrl);
+    await unpackZipFile(zipPath);
+    renameDownloadedSourcemapFile();
+}
+
+/* ============== MAIN SCRIPT ============== */
+
+async function runAsyncScript() {
+    // Step: check if source map locally already exists (if so we can skip the download)
+    if (fs.existsSync(localSourceMapPath)) {
+        Logger.success(`Found local source map at ${localSourceMapPath}`);
+        Logger.info('Skipping download step');
+    } else {
+        // Step: Download the source map for the app version and then symbolicate the profile:
+        try {
+            await fetchAndProcessArtifact();
+        } catch (error) {
+            Logger.error(error);
+            process.exit(1);
+        }
+    }
+
+    // Finally, symbolicate the profile
+    symbolicateProfile();
+}
+
+runAsyncScript();
diff --git a/scripts/tsconfig.json b/scripts/tsconfig.json
new file mode 100644
index 000000000000..2d548a3aa2ce
--- /dev/null
+++ b/scripts/tsconfig.json
@@ -0,0 +1,6 @@
+{
+    "extends": "../tsconfig.json",
+    "ts-node": {
+        "require": ["tsconfig-paths/register"]
+    }
+}
diff --git a/scripts/utils/Logger.ts b/scripts/utils/Logger.ts
new file mode 100644
index 000000000000..a851f11ff74f
--- /dev/null
+++ b/scripts/utils/Logger.ts
@@ -0,0 +1,37 @@
+const COLOR_DIM = '\x1b[2m';
+const COLOR_RESET = '\x1b[0m';
+const COLOR_YELLOW = '\x1b[33m';
+const COLOR_RED = '\x1b[31m';
+const COLOR_GREEN = '\x1b[32m';
+
+const log = (...args: unknown[]) => {
+    console.debug(...args);
+};
+
+const info = (...args: unknown[]) => {
+    log('▶️', ...args);
+};
+
+const success = (...args: unknown[]) => {
+    const lines = ['✅', COLOR_GREEN, ...args, COLOR_RESET];
+    log(...lines);
+};
+
+const warn = (...args: unknown[]) => {
+    const lines = ['⚠️', COLOR_YELLOW, ...args, COLOR_RESET];
+    log(...lines);
+};
+
+const note = (...args: unknown[]) => {
+    const lines = [COLOR_DIM, ...args, COLOR_RESET];
+    log(...lines);
+};
+
+const error = (...args: unknown[]) => {
+    const lines = ['🔴', COLOR_RED, ...args, COLOR_RESET];
+    log(...lines);
+};
+
+const formatLink = (name: string | number, url: string) => `\x1b]8;;${url}\x1b\\${name}\x1b]8;;\x1b\\`;
+
+export {log, info, warn, note, error, success, formatLink};
diff --git a/scripts/utils/parseCommandLineArguments.ts b/scripts/utils/parseCommandLineArguments.ts
new file mode 100644
index 000000000000..9bb1d340335e
--- /dev/null
+++ b/scripts/utils/parseCommandLineArguments.ts
@@ -0,0 +1,19 @@
+type ArgsMap = Record<string, string | undefined>;
+
+// Function to parse command-line arguments into a key-value object
+export default function parseCommandLineArguments(): ArgsMap {
+    const args = process.argv.slice(2); // Skip node and script paths
+    const argsMap: ArgsMap = {};
+    args.forEach((arg) => {
+        const [key, value] = arg.split('=');
+        if (key.startsWith('--')) {
+            const name = key.substring(2);
+            argsMap[name] = value;
+            // User may provide a help arg without any value
+            if (name.toLowerCase() === 'help' && !value) {
+                argsMap[name] = 'true';
+            }
+        }
+    });
+    return argsMap;
+}
diff --git a/src/App.tsx b/src/App.tsx
index 6316fa80fba1..98b5d4afeb1d 100644
--- a/src/App.tsx
+++ b/src/App.tsx
@@ -2,11 +2,12 @@ import {PortalProvider} from '@gorhom/portal';
 import React from 'react';
 import {LogBox} from 'react-native';
 import {GestureHandlerRootView} from 'react-native-gesture-handler';
+import {KeyboardProvider} from 'react-native-keyboard-controller';
 import {PickerStateProvider} from 'react-native-picker-select';
 import {SafeAreaProvider} from 'react-native-safe-area-context';
 import '../wdyr';
 import ActiveElementRoleProvider from './components/ActiveElementRoleProvider';
-import ActiveWorkspaceContextProvider from './components/ActiveWorkspace/ActiveWorkspaceProvider';
+import ActiveWorkspaceContextProvider from './components/ActiveWorkspaceProvider';
 import ColorSchemeWrapper from './components/ColorSchemeWrapper';
 import ComposeProviders from './components/ComposeProviders';
 import CustomStatusBarAndBackground from './components/CustomStatusBarAndBackground';
@@ -19,6 +20,7 @@ import OnyxProvider from './components/OnyxProvider';
 import PopoverContextProvider from './components/PopoverProvider';
 import SafeArea from './components/SafeArea';
 import ScrollOffsetContextProvider from './components/ScrollOffsetContextProvider';
+import {SearchContextProvider} from './components/Search/SearchContext';
 import ThemeIllustrationsProvider from './components/ThemeIllustrationsProvider';
 import ThemeProvider from './components/ThemeProvider';
 import ThemeStylesProvider from './components/ThemeStylesProvider';
@@ -30,6 +32,7 @@ import {CurrentReportIDContextProvider} from './components/withCurrentReportID';
 import {EnvironmentProvider} from './components/withEnvironment';
 import {KeyboardStateProvider} from './components/withKeyboardState';
 import {WindowDimensionsProvider} from './components/withWindowDimensions';
+import CONFIG from './CONFIG';
 import Expensify from './Expensify';
 import useDefaultDragAndDrop from './hooks/useDefaultDragAndDrop';
 import {ReportIDsContextProvider} from './hooks/useReportIDs';
@@ -51,50 +54,57 @@ LogBox.ignoreLogs([
 
 const fill = {flex: 1};
 
+const StrictModeWrapper = CONFIG.USE_REACT_STRICT_MODE ? React.StrictMode : ({children}: {children: React.ReactElement}) => children;
+
 function App({url}: AppProps) {
     useDefaultDragAndDrop();
     OnyxUpdateManager();
+
     return (
-        <InitialURLContextProvider url={url}>
-            <GestureHandlerRootView style={fill}>
-                <ComposeProviders
-                    components={[
-                        OnyxProvider,
-                        ThemeProvider,
-                        ThemeStylesProvider,
-                        ThemeIllustrationsProvider,
-                        SafeAreaProvider,
-                        PortalProvider,
-                        SafeArea,
-                        LocaleContextProvider,
-                        HTMLEngineProvider,
-                        WindowDimensionsProvider,
-                        KeyboardStateProvider,
-                        PopoverContextProvider,
-                        CurrentReportIDContextProvider,
-                        ScrollOffsetContextProvider,
-                        ReportAttachmentsProvider,
-                        PickerStateProvider,
-                        EnvironmentProvider,
-                        CustomStatusBarAndBackgroundContextProvider,
-                        ActiveElementRoleProvider,
-                        ActiveWorkspaceContextProvider,
-                        ReportIDsContextProvider,
-                        PlaybackContextProvider,
-                        FullScreenContextProvider,
-                        VolumeContextProvider,
-                        VideoPopoverMenuContextProvider,
-                    ]}
-                >
-                    <CustomStatusBarAndBackground />
-                    <ErrorBoundary errorMessage="NewExpensify crash caught by error boundary">
-                        <ColorSchemeWrapper>
-                            <Expensify />
-                        </ColorSchemeWrapper>
-                    </ErrorBoundary>
-                </ComposeProviders>
-            </GestureHandlerRootView>
-        </InitialURLContextProvider>
+        <StrictModeWrapper>
+            <InitialURLContextProvider url={url}>
+                <GestureHandlerRootView style={fill}>
+                    <ComposeProviders
+                        components={[
+                            OnyxProvider,
+                            ThemeProvider,
+                            ThemeStylesProvider,
+                            ThemeIllustrationsProvider,
+                            SafeAreaProvider,
+                            PortalProvider,
+                            SafeArea,
+                            LocaleContextProvider,
+                            HTMLEngineProvider,
+                            WindowDimensionsProvider,
+                            KeyboardStateProvider,
+                            PopoverContextProvider,
+                            CurrentReportIDContextProvider,
+                            ScrollOffsetContextProvider,
+                            ReportAttachmentsProvider,
+                            PickerStateProvider,
+                            EnvironmentProvider,
+                            CustomStatusBarAndBackgroundContextProvider,
+                            ActiveElementRoleProvider,
+                            ActiveWorkspaceContextProvider,
+                            ReportIDsContextProvider,
+                            PlaybackContextProvider,
+                            FullScreenContextProvider,
+                            VolumeContextProvider,
+                            VideoPopoverMenuContextProvider,
+                            KeyboardProvider,
+                            SearchContextProvider,
+                        ]}
+                    >
+                        <CustomStatusBarAndBackground />
+                        <ErrorBoundary errorMessage="NewExpensify crash caught by error boundary">
+                            <ColorSchemeWrapper>
+                                <Expensify />
+                            </ColorSchemeWrapper>
+                        </ErrorBoundary>
+                    </ComposeProviders>
+                </GestureHandlerRootView>
+            </InitialURLContextProvider>
+        </StrictModeWrapper>
     );
 }
 
diff --git a/src/CONFIG.ts b/src/CONFIG.ts
index 9ed4242d7604..8800cc907588 100644
--- a/src/CONFIG.ts
+++ b/src/CONFIG.ts
@@ -96,4 +96,5 @@ export default {
         IOS_CLIENT_ID: '921154746561-s3uqn2oe4m85tufi6mqflbfbuajrm2i3.apps.googleusercontent.com',
     },
     GCP_GEOLOCATION_API_KEY: googleGeolocationAPIKey,
+    USE_REACT_STRICT_MODE: true,
 } as const;
diff --git a/src/CONST.ts b/src/CONST.ts
index 566d5179f86a..be14ba241404 100755
--- a/src/CONST.ts
+++ b/src/CONST.ts
@@ -13,6 +13,7 @@ import type {Unit} from './types/onyx/Policy';
 type RateAndUnit = {
     unit: Unit;
     rate: number;
+    currency: string;
 };
 type CurrencyDefaultMileageRate = Record<string, RateAndUnit>;
 
@@ -50,6 +51,7 @@ const KEYBOARD_SHORTCUT_NAVIGATION_TYPE = 'NAVIGATION_SHORTCUT';
 const chatTypes = {
     POLICY_ANNOUNCE: 'policyAnnounce',
     POLICY_ADMINS: 'policyAdmins',
+    TRIP_ROOM: 'tripRoom',
     GROUP: 'group',
     DOMAIN_ALL: 'domainAll',
     POLICY_ROOM: 'policyRoom',
@@ -73,14 +75,33 @@ const onboardingChoices = {
 type OnboardingPurposeType = ValueOf<typeof onboardingChoices>;
 
 const CONST = {
-    MERGED_ACCOUNT_PREFIX: 'MERGED_',
+    HEIC_SIGNATURES: [
+        '6674797068656963', // 'ftypheic' - Indicates standard HEIC file
+        '6674797068656978', // 'ftypheix' - Indicates a variation of HEIC
+        '6674797068657631', // 'ftyphevc' - Typically for HEVC encoded media (common in HEIF)
+        '667479706d696631', // 'ftypmif1' - Multi-Image Format part of HEIF, broader usage
+    ],
+    RECENT_WAYPOINTS_NUMBER: 20,
+    DEFAULT_DB_NAME: 'OnyxDB',
+    DEFAULT_TABLE_NAME: 'keyvaluepairs',
+    DEFAULT_ONYX_DUMP_FILE_NAME: 'onyx-state.txt',
     DEFAULT_POLICY_ROOM_CHAT_TYPES: [chatTypes.POLICY_ADMINS, chatTypes.POLICY_ANNOUNCE, chatTypes.DOMAIN_ALL],
+    DISABLED_MAX_EXPENSE_VALUE: 10000000000,
+    POLICY_BILLABLE_MODES: {
+        BILLABLE: 'billable',
+        NON_BILLABLE: 'nonBillable',
+    },
 
     // Note: Group and Self-DM excluded as these are not tied to a Workspace
     WORKSPACE_ROOM_TYPES: [chatTypes.POLICY_ADMINS, chatTypes.POLICY_ANNOUNCE, chatTypes.DOMAIN_ALL, chatTypes.POLICY_ROOM, chatTypes.POLICY_EXPENSE_CHAT],
     ANDROID_PACKAGE_NAME,
-    ANIMATED_HIGHLIGHT_DELAY: 500,
-    ANIMATED_HIGHLIGHT_DURATION: 500,
+    WORKSPACE_ENABLE_FEATURE_REDIRECT_DELAY: 100,
+    ANIMATED_HIGHLIGHT_ENTRY_DELAY: 50,
+    ANIMATED_HIGHLIGHT_ENTRY_DURATION: 300,
+    ANIMATED_HIGHLIGHT_START_DELAY: 10,
+    ANIMATED_HIGHLIGHT_START_DURATION: 300,
+    ANIMATED_HIGHLIGHT_END_DELAY: 800,
+    ANIMATED_HIGHLIGHT_END_DURATION: 2000,
     ANIMATED_TRANSITION: 300,
     ANIMATED_TRANSITION_FROM_VALUE: 100,
     ANIMATION_IN_TIMING: 100,
@@ -91,7 +112,9 @@ const CONST = {
     // Multiplier for gyroscope animation in order to make it a bit more subtle
     ANIMATION_GYROSCOPE_VALUE: 0.4,
     BACKGROUND_IMAGE_TRANSITION_DURATION: 1000,
+    SCREEN_TRANSITION_END_TIMEOUT: 1000,
     ARROW_HIDE_DELAY: 3000,
+    MAX_IMAGE_CANVAS_AREA: 16777216,
 
     API_ATTACHMENT_VALIDATIONS: {
         // 24 megabytes in bytes, this is limit set on servers, do not update without wider internal discussion
@@ -133,6 +156,8 @@ const CONST = {
 
     LOGO_MAX_SCALE: 1.5,
 
+    MAX_IMAGE_DIMENSION: 2400,
+
     BREADCRUMB_TYPE: {
         ROOT: 'root',
         STRONG: 'strong',
@@ -146,6 +171,15 @@ const CONST = {
     DISPLAY_NAME: {
         MAX_LENGTH: 50,
         RESERVED_NAMES: ['Expensify', 'Concierge'],
+        EXPENSIFY_CONCIERGE: 'Expensify Concierge',
+    },
+
+    GPS: {
+        // It's OK to get a cached location that is up to an hour old because the only accuracy needed is the country the user is in
+        MAX_AGE: 3600000,
+
+        // 15 seconds, don't wait too long because the server can always fall back to using the IP address
+        TIMEOUT: 15000,
     },
 
     LEGAL_NAME: {
@@ -153,13 +187,18 @@ const CONST = {
     },
 
     REPORT_DESCRIPTION: {
-        MAX_LENGTH: 500,
+        MAX_LENGTH: 1000,
     },
 
     PULL_REQUEST_NUMBER,
 
+    // Regex to get link in href prop inside of <a/> component
+    REGEX_LINK_IN_ANCHOR: /<a\s+(?:[^>]*?\s+)?href="([^"]*)"/gi,
+
     MERCHANT_NAME_MAX_LENGTH: 255,
 
+    MASKED_PAN_PREFIX: 'XXXXXXXXXXXX',
+
     REQUEST_PREVIEW: {
         MAX_LENGTH: 83,
     },
@@ -192,27 +231,12 @@ const CONST = {
     // Sizes needed for report empty state background image handling
     EMPTY_STATE_BACKGROUND: {
         ASPECT_RATIO: 3.72,
+        OVERLAP: 60,
         SMALL_SCREEN: {
             IMAGE_HEIGHT: 300,
-            CONTAINER_MINHEIGHT: 200,
-            VIEW_HEIGHT: 240,
         },
         WIDE_SCREEN: {
             IMAGE_HEIGHT: 450,
-            CONTAINER_MINHEIGHT: 500,
-            VIEW_HEIGHT: 390,
-        },
-        MONEY_OR_TASK_REPORT: {
-            SMALL_SCREEN: {
-                IMAGE_HEIGHT: 300,
-                CONTAINER_MINHEIGHT: 280,
-                VIEW_HEIGHT: 240,
-            },
-            WIDE_SCREEN: {
-                IMAGE_HEIGHT: 450,
-                CONTAINER_MINHEIGHT: 280,
-                VIEW_HEIGHT: 390,
-            },
         },
     },
 
@@ -221,6 +245,8 @@ const CONST = {
         ANDROID: `https://play.google.com/store/apps/details?id=${ANDROID_PACKAGE_NAME}`,
         IOS: 'https://apps.apple.com/us/app/expensify-cash/id1530278510',
         DESKTOP: `${ACTIVE_EXPENSIFY_URL}NewExpensify.dmg`,
+        OLD_DOT_ANDROID: 'https://play.google.com/store/apps/details?id=org.me.mobiexpensifyg&hl=en_US&pli=1',
+        OLD_DOT_IOS: 'https://apps.apple.com/us/app/expensify-expense-tracker/id471713959',
     },
     DATE: {
         SQL_DATE_TIME: 'YYYY-MM-DD HH:mm:ss',
@@ -328,10 +354,13 @@ const CONST = {
         VERIFICATION_MAX_ATTEMPTS: 7,
         STATE: {
             VERIFYING: 'VERIFYING',
+            VALIDATING: 'VALIDATING',
+            SETUP: 'SETUP',
             PENDING: 'PENDING',
             OPEN: 'OPEN',
         },
         MAX_LENGTH: {
+            FULL_SSN: 9,
             SSN: 4,
             ZIP_CODE: 10,
         },
@@ -350,16 +379,17 @@ const CONST = {
     },
     BETAS: {
         ALL: 'all',
-        CHRONOS_IN_CASH: 'chronosInCash',
         DEFAULT_ROOMS: 'defaultRooms',
-        VIOLATIONS: 'violations',
-        REPORT_FIELDS: 'reportFields',
-        TRACK_EXPENSE: 'trackExpense',
+        DUPE_DETECTION: 'dupeDetection',
         P2P_DISTANCE_REQUESTS: 'p2pDistanceRequests',
-        WORKFLOWS_DELAYED_SUBMISSION: 'workflowsDelayedSubmission',
+        WORKFLOWS_ADVANCED_APPROVAL: 'workflowsAdvancedApproval',
         SPOTNANA_TRAVEL: 'spotnanaTravel',
-        ACCOUNTING_ON_NEW_EXPENSIFY: 'accountingOnNewExpensify',
-        XERO_ON_NEW_EXPENSIFY: 'xeroOnNewExpensify',
+        REPORT_FIELDS_FEATURE: 'reportFieldsFeature',
+        WORKSPACE_FEEDS: 'workspaceFeeds',
+        NETSUITE_USA_TAX: 'netsuiteUsaTax',
+        NEW_DOT_COPILOT: 'newDotCopilot',
+        WORKSPACE_RULES: 'workspaceRules',
+        COMBINED_TRACK_SUBMIT: 'combinedTrackSubmit',
     },
     BUTTON_STATES: {
         DEFAULT: 'default',
@@ -521,6 +551,16 @@ const CONST = {
             shortcutKey: 'Tab',
             modifiers: [],
         },
+        DEBUG: {
+            descriptionKey: 'openDebug',
+            shortcutKey: 'D',
+            modifiers: ['CTRL'],
+            trigger: {
+                DEFAULT: {input: 'd', modifierFlags: keyModifierControl},
+                [PLATFORM_OS_MACOS]: {input: 'd', modifierFlags: keyModifierCommand},
+                [PLATFORM_IOS]: {input: 'd', modifierFlags: keyModifierCommand},
+            },
+        },
     },
     KEYBOARD_SHORTCUTS_TYPES: {
         NAVIGATION_SHORTCUT: KEYBOARD_SHORTCUT_NAVIGATION_TYPE,
@@ -559,18 +599,21 @@ const CONST = {
     CONCIERGE_ICON_URL: `${CLOUDFRONT_URL}/images/icons/concierge_2022.png`,
     UPWORK_URL: 'https://github.com/Expensify/App/issues?q=is%3Aopen+is%3Aissue+label%3A%22Help+Wanted%22',
     DEEP_DIVE_EXPENSIFY_CARD: 'https://community.expensify.com/discussion/4848/deep-dive-expensify-card-and-quickbooks-online-auto-reconciliation-how-it-works',
+    DEEP_DIVE_ERECEIPTS: 'https://community.expensify.com/discussion/5542/deep-dive-what-are-ereceipts/',
     GITHUB_URL: 'https://github.com/Expensify/App',
     TERMS_URL: `${USE_EXPENSIFY_URL}/terms`,
     PRIVACY_URL: `${USE_EXPENSIFY_URL}/privacy`,
     LICENSES_URL: `${USE_EXPENSIFY_URL}/licenses`,
     ACH_TERMS_URL: `${USE_EXPENSIFY_URL}/achterms`,
     WALLET_AGREEMENT_URL: `${USE_EXPENSIFY_URL}/walletagreement`,
+    BANCORP_WALLET_AGREEMENT_URL: `${USE_EXPENSIFY_URL}/bancorp-bank-wallet-terms-of-service`,
     HELP_LINK_URL: `${USE_EXPENSIFY_URL}/usa-patriot-act`,
     ELECTRONIC_DISCLOSURES_URL: `${USE_EXPENSIFY_URL}/esignagreement`,
     GITHUB_RELEASE_URL: 'https://api.github.com/repos/expensify/app/releases/latest',
     ADD_SECONDARY_LOGIN_URL: encodeURI('settings?param={"section":"account","openModal":"secondaryLogin"}'),
     MANAGE_CARDS_URL: 'domain_companycards',
     FEES_URL: `${USE_EXPENSIFY_URL}/fees`,
+    SAVE_WITH_EXPENSIFY_URL: `${USE_EXPENSIFY_URL}/savings-calculator`,
     CFPB_PREPAID_URL: 'https://cfpb.gov/prepaid',
     STAGING_NEW_EXPENSIFY_URL: 'https://staging.new.expensify.com',
     NEWHELP_URL: 'https://help.expensify.com',
@@ -585,6 +628,11 @@ const CONST = {
     ONFIDO_TERMS_OF_SERVICE_URL: 'https://onfido.com/terms-of-service/',
     LIST_OF_RESTRICTED_BUSINESSES: 'https://community.expensify.com/discussion/6191/list-of-restricted-businesses',
     TRAVEL_TERMS_URL: `${USE_EXPENSIFY_URL}/travelterms`,
+    EXPENSIFY_PACKAGE_FOR_SAGE_INTACCT: 'https://www.expensify.com/tools/integrations/downloadPackage',
+    EXPENSIFY_PACKAGE_FOR_SAGE_INTACCT_FILE_NAME: 'ExpensifyPackageForSageIntacct',
+    SAGE_INTACCT_INSTRUCTIONS: 'https://help.expensify.com/articles/expensify-classic/integrations/accounting-integrations/Sage-Intacct',
+    HOW_TO_CONNECT_TO_SAGE_INTACCT: 'https://help.expensify.com/articles/expensify-classic/integrations/accounting-integrations/Sage-Intacct#how-to-connect-to-sage-intacct',
+    PRICING: `https://www.expensify.com/pricing`,
 
     // Use Environment.getEnvironmentURL to get the complete URL with port number
     DEV_NEW_EXPENSIFY_URL: 'https://dev.new.expensify.com:',
@@ -592,11 +640,15 @@ const CONST = {
         ADMIN_POLICIES_URL: 'admin_policies',
         ADMIN_DOMAINS_URL: 'admin_domains',
         INBOX: 'inbox',
-        DISMMISSED_REASON: '?dismissedReason=missingFeatures',
     },
 
+    EXPENSIFY_POLICY_DOMAIN: 'expensify-policy',
+    EXPENSIFY_POLICY_DOMAIN_EXTENSION: '.exfy',
+
     SIGN_IN_FORM_WIDTH: 300,
 
+    REQUEST_CODE_DELAY: 30,
+
     DEEPLINK_PROMPT_DENYLIST: [SCREENS.HOME, SCREENS.SIGN_IN_WITH_APPLE_DESKTOP, SCREENS.SIGN_IN_WITH_GOOGLE_DESKTOP],
 
     SIGN_IN_METHOD: {
@@ -637,16 +689,22 @@ const CONST = {
             MEMBER: 'member',
         },
         MAX_COUNT_BEFORE_FOCUS_UPDATE: 30,
+        MIN_INITIAL_REPORT_ACTION_COUNT: 15,
         SPLIT_REPORTID: '-2',
         ACTIONS: {
             LIMIT: 50,
             // OldDot Actions render getMessage from Web-Expensify/lib/Report/Action PHP files via getMessageOfOldDotReportAction in ReportActionsUtils.ts
             TYPE: {
+                ACTIONABLE_ADD_PAYMENT_CARD: 'ACTIONABLEADDPAYMENTCARD',
                 ACTIONABLE_JOIN_REQUEST: 'ACTIONABLEJOINREQUEST',
                 ACTIONABLE_MENTION_WHISPER: 'ACTIONABLEMENTIONWHISPER',
+                ACTIONABLE_REPORT_MENTION_WHISPER: 'ACTIONABLEREPORTMENTIONWHISPER',
                 ACTIONABLE_TRACK_EXPENSE_WHISPER: 'ACTIONABLETRACKEXPENSEWHISPER',
                 ADD_COMMENT: 'ADDCOMMENT',
                 APPROVED: 'APPROVED',
+                CARD_MISSING_ADDRESS: 'CARDMISSINGADDRESS',
+                CARD_ISSUED: 'CARDISSUED',
+                CARD_ISSUED_VIRTUAL: 'CARDISSUEDVIRTUAL',
                 CHANGE_FIELD: 'CHANGEFIELD', // OldDot Action
                 CHANGE_POLICY: 'CHANGEPOLICY', // OldDot Action
                 CHANGE_TYPE: 'CHANGETYPE', // OldDot Action
@@ -654,15 +712,16 @@ const CONST = {
                 CLOSED: 'CLOSED',
                 CREATED: 'CREATED',
                 DELEGATE_SUBMIT: 'DELEGATESUBMIT', // OldDot Action
-                DELETED_ACCOUNT: 'DELETEDACCOUNT', // OldDot Action
+                DELETED_ACCOUNT: 'DELETEDACCOUNT', // Deprecated OldDot Action
                 DISMISSED_VIOLATION: 'DISMISSEDVIOLATION',
-                DONATION: 'DONATION', // OldDot Action
-                EXPORTED_TO_CSV: 'EXPORTEDTOCSV', // OldDot Action
-                EXPORTED_TO_INTEGRATION: 'EXPORTEDTOINTEGRATION', // OldDot Action
-                EXPORTED_TO_QUICK_BOOKS: 'EXPORTEDTOQUICKBOOKS', // OldDot Action
+                DONATION: 'DONATION', // Deprecated OldDot Action
+                EXPORTED_TO_CSV: 'EXPORTCSV', // OldDot Action
+                EXPORTED_TO_INTEGRATION: 'EXPORTINTEGRATION', // OldDot Action
+                EXPORTED_TO_QUICK_BOOKS: 'EXPORTED', // Deprecated OldDot Action
                 FORWARDED: 'FORWARDED', // OldDot Action
                 HOLD: 'HOLD',
                 HOLD_COMMENT: 'HOLDCOMMENT',
+                INTEGRATION_SYNC_FAILED: 'INTEGRATIONSYNCFAILED',
                 IOU: 'IOU',
                 INTEGRATIONS_MESSAGE: 'INTEGRATIONSMESSAGE', // OldDot Action
                 MANAGER_ATTACH_RECEIPT: 'MANAGERATTACHRECEIPT', // OldDot Action
@@ -679,8 +738,9 @@ const CONST = {
                 REIMBURSEMENT_DELAYED: 'REIMBURSEMENTDELAYED', // OldDot Action
                 REIMBURSEMENT_QUEUED: 'REIMBURSEMENTQUEUED',
                 REIMBURSEMENT_DEQUEUED: 'REIMBURSEMENTDEQUEUED',
-                REIMBURSEMENT_REQUESTED: 'REIMBURSEMENTREQUESTED', // OldDot Action
-                REIMBURSEMENT_SETUP: 'REIMBURSEMENTSETUP', // OldDot Action
+                REIMBURSEMENT_REQUESTED: 'REIMBURSEMENTREQUESTED', // Deprecated OldDot Action
+                REIMBURSEMENT_SETUP: 'REIMBURSEMENTSETUP', // Deprecated OldDot Action
+                REIMBURSEMENT_SETUP_REQUESTED: 'REIMBURSEMENTSETUPREQUESTED', // Deprecated OldDot Action
                 RENAMED: 'RENAMED',
                 REPORT_PREVIEW: 'REPORTPREVIEW',
                 SELECTED_FOR_RANDOM_AUDIT: 'SELECTEDFORRANDOMAUDIT', // OldDot Action
@@ -692,7 +752,8 @@ const CONST = {
                 TASK_COMPLETED: 'TASKCOMPLETED',
                 TASK_EDITED: 'TASKEDITED',
                 TASK_REOPENED: 'TASKREOPENED',
-                UNAPPROVED: 'UNAPPROVED', // OldDot Action
+                TRIPPREVIEW: 'TRIPPREVIEW',
+                UNAPPROVED: 'UNAPPROVED',
                 UNHOLD: 'UNHOLD',
                 UNSHARE: 'UNSHARE', // OldDot Action
                 UPDATE_GROUP_CHAT_MEMBER_ROLE: 'UPDATEGROUPCHATMEMBERROLE',
@@ -763,6 +824,7 @@ const CONST = {
                     UPDATE_TIME_ENABLED: 'POLICYCHANGELOG_UPDATE_TIME_ENABLED',
                     UPDATE_TIME_RATE: 'POLICYCHANGELOG_UPDATE_TIME_RATE',
                     LEAVE_POLICY: 'POLICYCHANGELOG_LEAVE_POLICY',
+                    CORPORATE_UPGRADE: 'POLICYCHANGELOG_CORPORATE_UPGRADE',
                 },
                 ROOM_CHANGE_LOG: {
                     INVITE_TO_ROOM: 'INVITETOROOM',
@@ -783,6 +845,10 @@ const CONST = {
         ACTIONABLE_TRACK_EXPENSE_WHISPER_RESOLUTION: {
             NOTHING: 'nothing',
         },
+        ACTIONABLE_REPORT_MENTION_WHISPER_RESOLUTION: {
+            CREATE: 'created',
+            NOTHING: 'nothing',
+        },
         ACTIONABLE_MENTION_JOIN_WORKSPACE_RESOLUTION: {
             ACCEPT: 'accept',
             DECLINE: 'decline',
@@ -793,6 +859,7 @@ const CONST = {
             ACCOUNT_MERGED: 'accountMerged',
             REMOVED_FROM_POLICY: 'removedFromPolicy',
             POLICY_DELETED: 'policyDeleted',
+            BOOKING_END_DATE_HAS_PASSED: 'bookingEndDateHasPassed',
         },
         MESSAGE: {
             TYPE: {
@@ -807,6 +874,10 @@ const CONST = {
             TASK: 'task',
             INVOICE: 'invoice',
         },
+        UNSUPPORTED_TYPE: {
+            PAYCHECK: 'paycheck',
+            BILL: 'bill',
+        },
         CHAT_TYPE: chatTypes,
         WORKSPACE_CHAT_ROOMS: {
             ANNOUNCE: '#announce',
@@ -854,14 +925,23 @@ const CONST = {
             WRITE: 'write',
             SHARE: 'share',
             OWN: 'own',
+            AUDITOR: 'auditor',
         },
         INVOICE_RECEIVER_TYPE: {
             INDIVIDUAL: 'individual',
             BUSINESS: 'policy',
         },
+        EXPORT_OPTIONS: {
+            EXPORT_TO_INTEGRATION: 'exportToIntegration',
+            MARK_AS_EXPORTED: 'markAsExported',
+        },
     },
     NEXT_STEP: {
-        FINISHED: 'Finished!',
+        ICONS: {
+            HOURGLASS: 'hourglass',
+            CHECKMARK: 'checkmark',
+            STOPWATCH: 'stopwatch',
+        },
     },
     COMPOSER: {
         MAX_LINES: 16,
@@ -906,8 +986,11 @@ const CONST = {
         HOMEPAGE_INITIAL_RENDER: 'homepage_initial_render',
         REPORT_INITIAL_RENDER: 'report_initial_render',
         SWITCH_REPORT: 'switch_report',
+        OPEN_REPORT_FROM_PREVIEW: 'open_report_from_preview',
+        OPEN_REPORT_THREAD: 'open_report_thread',
         SIDEBAR_LOADED: 'sidebar_loaded',
         LOAD_SEARCH_OPTIONS: 'load_search_options',
+        MESSAGE_SENT: 'message_sent',
         COLD: 'cold',
         WARM: 'warm',
         REPORT_ACTION_ITEM_LAYOUT_DEBOUNCE_TIME: 1500,
@@ -918,15 +1001,9 @@ const CONST = {
         COMMENT_LENGTH_DEBOUNCE_TIME: 500,
         SEARCH_OPTION_LIST_DEBOUNCE_TIME: 300,
         RESIZE_DEBOUNCE_TIME: 100,
-    },
-    SEARCH_TABLE_COLUMNS: {
-        DATE: 'date',
-        MERCHANT: 'merchant',
-        FROM: 'from',
-        TO: 'to',
-        TOTAL: 'total',
-        TYPE: 'type',
-        ACTION: 'action',
+        UNREAD_UPDATE_DEBOUNCE_TIME: 300,
+        SEARCH_FILTER_OPTIONS: 'search_filter_options',
+        USE_DEBOUNCED_STATE_DELAY: 300,
     },
     PRIORITY_MODE: {
         GSD: 'gsd',
@@ -948,7 +1025,7 @@ const CONST = {
         DARK_CONTENT: 'dark-content',
     },
     TRANSACTION: {
-        DEFAULT_MERCHANT: 'Request',
+        DEFAULT_MERCHANT: 'Expense',
         UNKNOWN_MERCHANT: 'Unknown Merchant',
         PARTIAL_TRANSACTION_MERCHANT: '(none)',
         TYPE: {
@@ -1032,6 +1109,7 @@ const CONST = {
         MAX_RETRY_WAIT_TIME_MS: 10 * 1000,
         PROCESS_REQUEST_DELAY_MS: 1000,
         MAX_PENDING_TIME_MS: 10 * 1000,
+        RECHECK_INTERVAL_MS: 60 * 1000,
         MAX_REQUEST_RETRIES: 10,
         NETWORK_STATUS: {
             ONLINE: 'online',
@@ -1071,6 +1149,11 @@ const CONST = {
     // It's copied here so that the same regex pattern can be used in form validations to be consistent with the server.
     VALIDATE_FOR_HTML_TAG_REGEX: /<([^>\s]+)(?:[^>]*?)>/g,
 
+    // The regex below is used to remove dots only from the local part of the user email (local-part@domain)
+    // so when we are using search, we can match emails that have dots without explicitly writing the dots (e.g: fistlast@domain will match first.last@domain)
+    // More info https://github.com/Expensify/App/issues/8007
+    EMAIL_SEARCH_REGEX: /\.(?=[^\s@]*@)/g,
+
     VALIDATE_FOR_LEADINGSPACES_HTML_TAG_REGEX: /<([\s]+.+[\s]*)>/g,
 
     WHITELISTED_TAGS: [/<>/, /< >/, /<->/, /<-->/, /<br>/, /<br\/>/],
@@ -1096,8 +1179,6 @@ const CONST = {
     // around each header.
     EMOJI_NUM_PER_ROW: 8,
 
-    EMOJI_FREQUENT_ROW_COUNT: 3,
-
     EMOJI_DEFAULT_SKIN_TONE: -1,
 
     // Amount of emojis to render ahead at the end of the update cycle
@@ -1123,6 +1204,7 @@ const CONST = {
         VISIBLE_PASSWORD: 'visible-password',
         ASCII_CAPABLE: 'ascii-capable',
         NUMBER_PAD: 'number-pad',
+        DECIMAL_PAD: 'decimal-pad',
     },
 
     INPUT_MODE: {
@@ -1136,12 +1218,16 @@ const CONST = {
         URL: 'url',
     },
 
+    INPUT_AUTOGROW_DIRECTION: {
+        LEFT: 'left',
+        RIGHT: 'right',
+    },
+
     YOUR_LOCATION_TEXT: 'Your Location',
 
     ATTACHMENT_MESSAGE_TEXT: '[Attachment]',
-    // This is a placeholder for attachment which is uploading
-    ATTACHMENT_UPLOADING_MESSAGE_HTML: 'Uploading attachment...',
     ATTACHMENT_SOURCE_ATTRIBUTE: 'data-expensify-source',
+    ATTACHMENT_OPTIMISTIC_SOURCE_ATTRIBUTE: 'data-optimistic-src',
     ATTACHMENT_PREVIEW_ATTRIBUTE: 'src',
     ATTACHMENT_ORIGINAL_FILENAME_ATTRIBUTE: 'data-name',
     ATTACHMENT_LOCAL_URL_PREFIX: ['blob:', 'file:'],
@@ -1166,6 +1252,12 @@ const CONST = {
         WEBP: 'image/webp',
         JPEG: 'image/jpeg',
     },
+    ATTACHMENT_TYPE: {
+        REPORT: 'r',
+        NOTE: 'n',
+    },
+
+    IMAGE_HIGH_RESOLUTION_THRESHOLD: 7000,
 
     IMAGE_OBJECT_POSITION: {
         TOP: 'top',
@@ -1209,6 +1301,8 @@ const CONST = {
         MAX_AMOUNT_OF_SUGGESTIONS: 20,
         MAX_AMOUNT_OF_VISIBLE_SUGGESTIONS_IN_CONTAINER: 5,
         HERE_TEXT: '@here',
+        SUGGESTION_BOX_MAX_SAFE_DISTANCE: 10,
+        BIG_SCREEN_SUGGESTION_WIDTH: 300,
     },
     COMPOSER_MAX_HEIGHT: 125,
     CHAT_FOOTER_SECONDARY_ROW_HEIGHT: 15,
@@ -1225,6 +1319,7 @@ const CONST = {
     },
     CENTRAL_PANE_ANIMATION_HEIGHT: 200,
     LHN_SKELETON_VIEW_ITEM_HEIGHT: 64,
+    SEARCH_SKELETON_VIEW_ITEM_HEIGHT: 108,
     EXPENSIFY_PARTNER_NAME: 'expensify.com',
     EMAIL: {
         ACCOUNTING: 'accounting@expensify.com',
@@ -1247,6 +1342,8 @@ const CONST = {
         EXPENSIFY_EMAIL_DOMAIN: '@expensify.com',
     },
 
+    CONCIERGE_DISPLAY_NAME: 'Concierge',
+
     INTEGRATION_ENTITY_MAP_TYPES: {
         DEFAULT: 'DEFAULT',
         NONE: 'NONE',
@@ -1254,6 +1351,7 @@ const CONST = {
         REPORT_FIELD: 'REPORT_FIELD',
         NOT_IMPORTED: 'NOT_IMPORTED',
         IMPORTED: 'IMPORTED',
+        NETSUITE_DEFAULT: 'NETSUITE_DEFAULT',
     },
     QUICKBOOKS_ONLINE: 'quickbooksOnline',
 
@@ -1280,9 +1378,79 @@ const CONST = {
 
     XERO_CONFIG: {
         AUTO_SYNC: 'autoSync',
+        ENABLED: 'enabled',
+        REIMBURSEMENT_ACCOUNT_ID: 'reimbursementAccountID',
+        INVOICE_COLLECTIONS_ACCOUNT_ID: 'invoiceCollectionsAccountID',
         SYNC: 'sync',
+        SYNC_REIMBURSED_REPORTS: 'syncReimbursedReports',
+        ENABLE_NEW_CATEGORIES: 'enableNewCategories',
+        EXPORT: 'export',
+        EXPORTER: 'exporter',
+        BILL_DATE: 'billDate',
+        BILL_STATUS: 'billStatus',
+        NON_REIMBURSABLE_ACCOUNT: 'nonReimbursableAccount',
+        TENANT_ID: 'tenantID',
         IMPORT_CUSTOMERS: 'importCustomers',
         IMPORT_TAX_RATES: 'importTaxRates',
+        INVOICE_STATUS: {
+            DRAFT: 'DRAFT',
+            AWAITING_APPROVAL: 'AWT_APPROVAL',
+            AWAITING_PAYMENT: 'AWT_PAYMENT',
+        },
+        IMPORT_TRACKING_CATEGORIES: 'importTrackingCategories',
+        MAPPINGS: 'mappings',
+        TRACKING_CATEGORY_PREFIX: 'trackingCategory_',
+        TRACKING_CATEGORY_FIELDS: {
+            COST_CENTERS: 'cost centers',
+            REGION: 'region',
+        },
+        TRACKING_CATEGORY_OPTIONS: {
+            DEFAULT: 'DEFAULT',
+            TAG: 'TAG',
+        },
+    },
+
+    SAGE_INTACCT_MAPPING_VALUE: {
+        NONE: 'NONE',
+        DEFAULT: 'DEFAULT',
+        TAG: 'TAG',
+        REPORT_FIELD: 'REPORT_FIELD',
+    },
+
+    SAGE_INTACCT_CONFIG: {
+        MAPPINGS: {
+            DEPARTMENTS: 'departments',
+            CLASSES: 'classes',
+            LOCATIONS: 'locations',
+            CUSTOMERS: 'customers',
+            PROJECTS: 'projects',
+        },
+        SYNC_ITEMS: 'syncItems',
+        TAX: 'tax',
+        EXPORT: 'export',
+        EXPORT_DATE: 'exportDate',
+        NON_REIMBURSABLE_CREDIT_CARD_VENDOR: 'nonReimbursableCreditCardChargeDefaultVendor',
+        NON_REIMBURSABLE_VENDOR: 'nonReimbursableVendor',
+        REIMBURSABLE_VENDOR: 'reimbursableExpenseReportDefaultVendor',
+        NON_REIMBURSABLE_ACCOUNT: 'nonReimbursableAccount',
+        NON_REIMBURSABLE: 'nonReimbursable',
+        EXPORTER: 'exporter',
+        REIMBURSABLE: 'reimbursable',
+        AUTO_SYNC: 'autoSync',
+        AUTO_SYNC_ENABLED: 'enabled',
+        IMPORT_EMPLOYEES: 'importEmployees',
+        APPROVAL_MODE: 'approvalMode',
+        SYNC: 'sync',
+        SYNC_REIMBURSED_REPORTS: 'syncReimbursedReports',
+        REIMBURSEMENT_ACCOUNT_ID: 'reimbursementAccountID',
+        ENTITY: 'entity',
+        DIMENSION_PREFIX: 'dimension_',
+    },
+
+    SAGE_INTACCT: {
+        APPROVAL_MODE: {
+            APPROVAL_MANUAL: 'APPROVAL_MANUAL',
+        },
     },
 
     QUICKBOOKS_REIMBURSABLE_ACCOUNT_TYPE: {
@@ -1291,6 +1459,263 @@ const CONST = {
         JOURNAL_ENTRY: 'journal_entry',
     },
 
+    SAGE_INTACCT_REIMBURSABLE_EXPENSE_TYPE: {
+        EXPENSE_REPORT: 'EXPENSE_REPORT',
+        VENDOR_BILL: 'VENDOR_BILL',
+    },
+
+    SAGE_INTACCT_NON_REIMBURSABLE_EXPENSE_TYPE: {
+        CREDIT_CARD_CHARGE: 'CREDIT_CARD_CHARGE',
+        VENDOR_BILL: 'VENDOR_BILL',
+    },
+
+    XERO_EXPORT_DATE: {
+        LAST_EXPENSE: 'LAST_EXPENSE',
+        REPORT_EXPORTED: 'REPORT_EXPORTED',
+        REPORT_SUBMITTED: 'REPORT_SUBMITTED',
+    },
+
+    SAGE_INTACCT_EXPORT_DATE: {
+        LAST_EXPENSE: 'LAST_EXPENSE',
+        EXPORTED: 'EXPORTED',
+        SUBMITTED: 'SUBMITTED',
+    },
+
+    NETSUITE_CONFIG: {
+        SUBSIDIARY: 'subsidiary',
+        EXPORTER: 'exporter',
+        EXPORT_DATE: 'exportDate',
+        REIMBURSABLE_EXPENSES_EXPORT_DESTINATION: 'reimbursableExpensesExportDestination',
+        NON_REIMBURSABLE_EXPENSES_EXPORT_DESTINATION: 'nonreimbursableExpensesExportDestination',
+        DEFAULT_VENDOR: 'defaultVendor',
+        REIMBURSABLE_PAYABLE_ACCOUNT: 'reimbursablePayableAccount',
+        PAYABLE_ACCT: 'payableAcct',
+        JOURNAL_POSTING_PREFERENCE: 'journalPostingPreference',
+        RECEIVABLE_ACCOUNT: 'receivableAccount',
+        INVOICE_ITEM_PREFERENCE: 'invoiceItemPreference',
+        INVOICE_ITEM: 'invoiceItem',
+        TAX_POSTING_ACCOUNT: 'taxPostingAccount',
+        PROVINCIAL_TAX_POSTING_ACCOUNT: 'provincialTaxPostingAccount',
+        ALLOW_FOREIGN_CURRENCY: 'allowForeignCurrency',
+        EXPORT_TO_NEXT_OPEN_PERIOD: 'exportToNextOpenPeriod',
+        IMPORT_FIELDS: ['departments', 'classes', 'locations'],
+        AUTO_SYNC: 'autoSync',
+        REIMBURSEMENT_ACCOUNT_ID: 'reimbursementAccountID',
+        COLLECTION_ACCOUNT: 'collectionAccount',
+        AUTO_CREATE_ENTITIES: 'autoCreateEntities',
+        APPROVAL_ACCOUNT: 'approvalAccount',
+        CUSTOM_FORM_ID_OPTIONS: 'customFormIDOptions',
+        TOKEN_INPUT_STEP_NAMES: ['1', '2,', '3', '4', '5'],
+        TOKEN_INPUT_STEP_KEYS: {
+            0: 'installBundle',
+            1: 'enableTokenAuthentication',
+            2: 'enableSoapServices',
+            3: 'createAccessToken',
+            4: 'enterCredentials',
+        },
+        IMPORT_CUSTOM_FIELDS: {
+            CUSTOM_SEGMENTS: 'customSegments',
+            CUSTOM_LISTS: 'customLists',
+        },
+        CUSTOM_SEGMENT_FIELDS: ['segmentName', 'internalID', 'scriptID', 'mapping'],
+        CUSTOM_LIST_FIELDS: ['listName', 'internalID', 'transactionFieldID', 'mapping'],
+        CUSTOM_FORM_ID_TYPE: {
+            REIMBURSABLE: 'reimbursable',
+            NON_REIMBURSABLE: 'nonReimbursable',
+        },
+        SYNC_OPTIONS: {
+            SYNC_REIMBURSED_REPORTS: 'syncReimbursedReports',
+            SYNC_PEOPLE: 'syncPeople',
+            ENABLE_NEW_CATEGORIES: 'enableNewCategories',
+            EXPORT_REPORTS_TO: 'exportReportsTo',
+            EXPORT_VENDOR_BILLS_TO: 'exportVendorBillsTo',
+            EXPORT_JOURNALS_TO: 'exportJournalsTo',
+            SYNC_TAX: 'syncTax',
+            CROSS_SUBSIDIARY_CUSTOMERS: 'crossSubsidiaryCustomers',
+            CUSTOMER_MAPPINGS: {
+                CUSTOMERS: 'customers',
+                JOBS: 'jobs',
+            },
+        },
+        NETSUITE_CUSTOM_LIST_LIMIT: 8,
+        NETSUITE_ADD_CUSTOM_LIST_STEP_NAMES: ['1', '2,', '3', '4'],
+        NETSUITE_ADD_CUSTOM_SEGMENT_STEP_NAMES: ['1', '2,', '3', '4', '5', '6,'],
+    },
+
+    NETSUITE_CUSTOM_FIELD_SUBSTEP_INDEXES: {
+        CUSTOM_LISTS: {
+            CUSTOM_LIST_PICKER: 0,
+            TRANSACTION_FIELD_ID: 1,
+            MAPPING: 2,
+            CONFIRM: 3,
+        },
+        CUSTOM_SEGMENTS: {
+            SEGMENT_TYPE: 0,
+            SEGMENT_NAME: 1,
+            INTERNAL_ID: 2,
+            SCRIPT_ID: 3,
+            MAPPING: 4,
+            CONFIRM: 5,
+        },
+    },
+
+    NETSUITE_CUSTOM_RECORD_TYPES: {
+        CUSTOM_SEGMENT: 'customSegment',
+        CUSTOM_RECORD: 'customRecord',
+    },
+
+    NETSUITE_FORM_STEPS_HEADER_HEIGHT: 40,
+
+    NETSUITE_IMPORT: {
+        HELP_LINKS: {
+            CUSTOM_SEGMENTS: 'https://help.expensify.com/articles/expensify-classic/integrations/accounting-integrations/NetSuite#custom-segments',
+            CUSTOM_LISTS: 'https://help.expensify.com/articles/expensify-classic/integrations/accounting-integrations/NetSuite#custom-lists',
+        },
+    },
+
+    NETSUITE_EXPORT_DATE: {
+        LAST_EXPENSE: 'LAST_EXPENSE',
+        EXPORTED: 'EXPORTED',
+        SUBMITTED: 'SUBMITTED',
+    },
+
+    NETSUITE_EXPORT_DESTINATION: {
+        EXPENSE_REPORT: 'EXPENSE_REPORT',
+        VENDOR_BILL: 'VENDOR_BILL',
+        JOURNAL_ENTRY: 'JOURNAL_ENTRY',
+    },
+
+    NETSUITE_MAP_EXPORT_DESTINATION: {
+        EXPENSE_REPORT: 'expenseReport',
+        VENDOR_BILL: 'vendorBill',
+        JOURNAL_ENTRY: 'journalEntry',
+    },
+
+    NETSUITE_INVOICE_ITEM_PREFERENCE: {
+        CREATE: 'create',
+        SELECT: 'select',
+    },
+
+    NETSUITE_JOURNAL_POSTING_PREFERENCE: {
+        JOURNALS_POSTING_INDIVIDUAL_LINE: 'JOURNALS_POSTING_INDIVIDUAL_LINE',
+        JOURNALS_POSTING_TOTAL_LINE: 'JOURNALS_POSTING_TOTAL_LINE',
+    },
+
+    NETSUITE_EXPENSE_TYPE: {
+        REIMBURSABLE: 'reimbursable',
+        NON_REIMBURSABLE: 'nonreimbursable',
+    },
+
+    NETSUITE_REPORTS_APPROVAL_LEVEL: {
+        REPORTS_APPROVED_NONE: 'REPORTS_APPROVED_NONE',
+        REPORTS_SUPERVISOR_APPROVED: 'REPORTS_SUPERVISOR_APPROVED',
+        REPORTS_ACCOUNTING_APPROVED: 'REPORTS_ACCOUNTING_APPROVED',
+        REPORTS_APPROVED_BOTH: 'REPORTS_APPROVED_BOTH',
+    },
+
+    NETSUITE_VENDOR_BILLS_APPROVAL_LEVEL: {
+        VENDOR_BILLS_APPROVED_NONE: 'VENDOR_BILLS_APPROVED_NONE',
+        VENDOR_BILLS_APPROVAL_PENDING: 'VENDOR_BILLS_APPROVAL_PENDING',
+        VENDOR_BILLS_APPROVED: 'VENDOR_BILLS_APPROVED',
+    },
+
+    NETSUITE_JOURNALS_APPROVAL_LEVEL: {
+        JOURNALS_APPROVED_NONE: 'JOURNALS_APPROVED_NONE',
+        JOURNALS_APPROVAL_PENDING: 'JOURNALS_APPROVAL_PENDING',
+        JOURNALS_APPROVED: 'JOURNALS_APPROVED',
+    },
+
+    NETSUITE_ACCOUNT_TYPE: {
+        ACCOUNTS_PAYABLE: '_accountsPayable',
+        ACCOUNTS_RECEIVABLE: '_accountsReceivable',
+        OTHER_CURRENT_LIABILITY: '_otherCurrentLiability',
+        CREDIT_CARD: '_creditCard',
+        BANK: '_bank',
+        OTHER_CURRENT_ASSET: '_otherCurrentAsset',
+        LONG_TERM_LIABILITY: '_longTermLiability',
+        EXPENSE: '_expense',
+    },
+
+    NETSUITE_APPROVAL_ACCOUNT_DEFAULT: 'APPROVAL_ACCOUNT_DEFAULT',
+
+    /**
+     * Countries where tax setting is permitted (Strings are in the format of Netsuite's Country type/enum)
+     *
+     * Should mirror the list on the OldDot.
+     */
+    NETSUITE_TAX_COUNTRIES: [
+        '_canada',
+        '_unitedKingdomGB',
+        '_unitedKingdom',
+        '_australia',
+        '_southAfrica',
+        '_india',
+        '_france',
+        '_netherlands',
+        '_germany',
+        '_singapore',
+        '_spain',
+        '_ireland',
+        '_denmark',
+        '_brazil',
+        '_japan',
+        '_philippines',
+        '_china',
+        '_argentina',
+        '_newZealand',
+        '_switzerland',
+        '_sweden',
+        '_portugal',
+        '_mexico',
+        '_israel',
+        '_thailand',
+        '_czechRepublic',
+        '_egypt',
+        '_ghana',
+        '_indonesia',
+        '_iranIslamicRepublicOf',
+        '_jordan',
+        '_kenya',
+        '_kuwait',
+        '_lebanon',
+        '_malaysia',
+        '_morocco',
+        '_myanmar',
+        '_nigeria',
+        '_pakistan',
+        '_saudiArabia',
+        '_sriLanka',
+        '_unitedArabEmirates',
+        '_vietnam',
+        '_austria',
+        '_bulgaria',
+        '_greece',
+        '_cyprus',
+        '_norway',
+        '_romania',
+        '_poland',
+        '_hongKong',
+        '_luxembourg',
+        '_lithuania',
+        '_malta',
+        '_finland',
+        '_koreaRepublicOf',
+        '_italy',
+        '_georgia',
+        '_hungary',
+        '_latvia',
+        '_estonia',
+        '_slovenia',
+        '_serbia',
+        '_croatiaHrvatska',
+        '_belgium',
+        '_turkey',
+        '_taiwan',
+        '_azerbaijan',
+        '_slovakRepublic',
+        '_costaRica',
+    ] as string[],
+
     QUICKBOOKS_EXPORT_DATE: {
         LAST_EXPENSE: 'LAST_EXPENSE',
         REPORT_EXPORTED: 'REPORT_EXPORTED',
@@ -1375,6 +1800,7 @@ const CONST = {
         },
         STEP: {
             // In the order they appear in the Wallet flow
+            ADD_BANK_ACCOUNT: 'AddBankAccountStep',
             ADDITIONAL_DETAILS: 'AdditionalDetailsStep',
             ADDITIONAL_DETAILS_KBA: 'AdditionalDetailsKBAStep',
             ONFIDO: 'OnfidoStep',
@@ -1411,6 +1837,7 @@ const CONST = {
             CONCIERGE: 'CONCIERGE_NAVIGATE',
         },
         MTL_WALLET_PROGRAM_ID: '760',
+        BANCORP_WALLET_PROGRAM_ID: '660',
         PROGRAM_ISSUERS: {
             EXPENSIFY_PAYMENTS: 'Expensify Payments LLC',
             BANCORP_BANK: 'The Bancorp Bank',
@@ -1485,6 +1912,7 @@ const CONST = {
     },
 
     IOU: {
+        MAX_RECENT_REPORTS_TO_SHOW: 5,
         // This is the transactionID used when going through the create expense flow so that it mimics a real transaction (like the edit flow)
         OPTIMISTIC_TRANSACTION_ID: '1',
         // Note: These payment types are used when building IOU reportAction message values in the server and should
@@ -1526,7 +1954,7 @@ const CONST = {
             APPROVE: 'approve',
             TRACK: 'track',
         },
-        AMOUNT_MAX_LENGTH: 10,
+        AMOUNT_MAX_LENGTH: 8,
         RECEIPT_STATE: {
             SCANREADY: 'SCANREADY',
             OPEN: 'OPEN',
@@ -1549,6 +1977,9 @@ const CONST = {
                 ACCOUNTANT: 'accountant',
             },
         },
+        ACCESS_VARIANTS: {
+            CREATE: 'create',
+        },
     },
 
     GROWL: {
@@ -1653,29 +2084,23 @@ const CONST = {
             MAKE_MEMBER: 'makeMember',
             MAKE_ADMIN: 'makeAdmin',
         },
+        BULK_ACTION_TYPES: {
+            DELETE: 'delete',
+            DISABLE: 'disable',
+            ENABLE: 'enable',
+        },
         MORE_FEATURES: {
             ARE_CATEGORIES_ENABLED: 'areCategoriesEnabled',
             ARE_TAGS_ENABLED: 'areTagsEnabled',
             ARE_DISTANCE_RATES_ENABLED: 'areDistanceRatesEnabled',
             ARE_WORKFLOWS_ENABLED: 'areWorkflowsEnabled',
-            ARE_REPORTFIELDS_ENABLED: 'areReportFieldsEnabled',
+            ARE_REPORT_FIELDS_ENABLED: 'areReportFieldsEnabled',
             ARE_CONNECTIONS_ENABLED: 'areConnectionsEnabled',
+            ARE_COMPANY_CARDS_ENABLED: 'areCompanyCardsEnabled',
+            ARE_EXPENSIFY_CARDS_ENABLED: 'areExpensifyCardsEnabled',
+            ARE_INVOICES_ENABLED: 'areInvoicesEnabled',
             ARE_TAXES_ENABLED: 'tax',
-        },
-        CATEGORIES_BULK_ACTION_TYPES: {
-            DELETE: 'delete',
-            DISABLE: 'disable',
-            ENABLE: 'enable',
-        },
-        TAGS_BULK_ACTION_TYPES: {
-            DELETE: 'delete',
-            DISABLE: 'disable',
-            ENABLE: 'enable',
-        },
-        DISTANCE_RATES_BULK_ACTION_TYPES: {
-            DELETE: 'delete',
-            DISABLE: 'disable',
-            ENABLE: 'enable',
+            ARE_RULES_ENABLED: 'areRulesEnabled',
         },
         DEFAULT_CATEGORIES: [
             'Advertising',
@@ -1707,11 +2132,6 @@ const CONST = {
             DUPLICATE_SUBSCRIPTION: 'duplicateSubscription',
             FAILED_TO_CLEAR_BALANCE: 'failedToClearBalance',
         },
-        TAX_RATES_BULK_ACTION_TYPES: {
-            DELETE: 'delete',
-            DISABLE: 'disable',
-            ENABLE: 'enable',
-        },
         COLLECTION_KEYS: {
             DESCRIPTION: 'description',
             REIMBURSER: 'reimburser',
@@ -1727,9 +2147,28 @@ const CONST = {
                 // Here we will add other connections names when we add support for them
                 QBO: 'quickbooksOnline',
                 XERO: 'xero',
+                NETSUITE: 'netsuite',
+                SAGE_INTACCT: 'intacct',
+            },
+            ROUTE: {
+                QBO: 'quickbooks-online',
+                XERO: 'xero',
+                NETSUITE: 'netsuite',
+                SAGE_INTACCT: 'sage-intacct',
+            },
+            NAME_USER_FRIENDLY: {
+                netsuite: 'NetSuite',
+                quickbooksOnline: 'Quickbooks Online',
+                quickbooksDesktop: 'Quickbooks Desktop',
+                xero: 'Xero',
+                intacct: 'Sage Intacct',
+                financialForce: 'FinancialForce',
+                billCom: 'Bill.com',
+                zenefits: 'Zenefits',
             },
             SYNC_STAGE_NAME: {
-                STARTING_IMPORT: 'startingImport',
+                STARTING_IMPORT_QBO: 'startingImportQBO',
+                STARTING_IMPORT_XERO: 'startingImportXero',
                 QBO_IMPORT_MAIN: 'quickbooksOnlineImportMain',
                 QBO_IMPORT_CUSTOMERS: 'quickbooksOnlineImportCustomers',
                 QBO_IMPORT_EMPLOYEES: 'quickbooksOnlineImportEmployees',
@@ -1756,19 +2195,50 @@ const CONST = {
                 XERO_SYNC_IMPORT_CUSTOMERS: 'xeroSyncImportCustomers',
                 XERO_SYNC_IMPORT_BANK_ACCOUNTS: 'xeroSyncImportBankAccounts',
                 XERO_SYNC_IMPORT_TAX_RATES: 'xeroSyncImportTaxRates',
+                XERO_CHECK_CONNECTION: 'xeroCheckConnection',
+                XERO_SYNC_TITLE: 'xeroSyncTitle',
+                NETSUITE_SYNC_CONNECTION: 'netSuiteSyncConnection',
+                NETSUITE_SYNC_CUSTOMERS: 'netSuiteSyncCustomers',
+                NETSUITE_SYNC_INIT_DATA: 'netSuiteSyncInitData',
+                NETSUITE_SYNC_IMPORT_TAXES: 'netSuiteSyncImportTaxes',
+                NETSUITE_SYNC_IMPORT_ITEMS: 'netSuiteSyncImportItems',
+                NETSUITE_SYNC_DATA: 'netSuiteSyncData',
+                NETSUITE_SYNC_ACCOUNTS: 'netSuiteSyncAccounts',
+                NETSUITE_SYNC_CURRENCIES: 'netSuiteSyncCurrencies',
+                NETSUITE_SYNC_CATEGORIES: 'netSuiteSyncCategories',
+                NETSUITE_SYNC_IMPORT_CUSTOM_LISTS: 'netSuiteSyncImportCustomLists',
+                NETSUITE_SYNC_IMPORT_EMPLOYEES: 'netSuiteSyncImportEmployees',
+                NETSUITE_SYNC_IMPORT_SUBSIDIARIES: 'netSuiteSyncImportSubsidiaries',
+                NETSUITE_SYNC_IMPORT_VENDORS: 'netSuiteSyncImportVendors',
+                NETSUITE_SYNC_REPORT_FIELDS: 'netSuiteSyncReportFields',
+                NETSUITE_SYNC_TAGS: 'netSuiteSyncTags',
+                NETSUITE_SYNC_UPDATE_DATA: 'netSuiteSyncUpdateConnectionData',
+                NETSUITE_SYNC_NETSUITE_REIMBURSED_REPORTS: 'netSuiteSyncNetSuiteReimbursedReports',
+                NETSUITE_SYNC_EXPENSIFY_REIMBURSED_REPORTS: 'netSuiteSyncExpensifyReimbursedReports',
+                SAGE_INTACCT_SYNC_CHECK_CONNECTION: 'intacctCheckConnection',
+                SAGE_INTACCT_SYNC_IMPORT_TITLE: 'intacctImportTitle',
+                SAGE_INTACCT_SYNC_IMPORT_DATA: 'intacctImportData',
+                SAGE_INTACCT_SYNC_IMPORT_EMPLOYEES: 'intacctImportEmployees',
+                SAGE_INTACCT_SYNC_IMPORT_DIMENSIONS: 'intacctImportDimensions',
+                SAGE_INTACCT_SYNC_IMPORT_SYNC_REIMBURSED_REPORTS: 'intacctImportSyncBillPayments',
             },
+            SYNC_STAGE_TIMEOUT_MINUTES: 20,
         },
         ACCESS_VARIANTS: {
             PAID: 'paid',
             ADMIN: 'admin',
+            CONTROL: 'control',
         },
+        DEFAULT_MAX_EXPENSE_AGE: 90,
+        DEFAULT_MAX_EXPENSE_AMOUNT: 200000,
+        DEFAULT_MAX_AMOUNT_NO_RECEIPT: 2500,
     },
 
     CUSTOM_UNITS: {
         NAME_DISTANCE: 'Distance',
         DISTANCE_UNIT_MILES: 'mi',
         DISTANCE_UNIT_KILOMETERS: 'km',
-        MILEAGE_IRS_RATE: 0.655,
+        MILEAGE_IRS_RATE: 0.67,
         DEFAULT_RATE: 'Default Rate',
         RATE_DECIMALS: 3,
         FAKE_P2P_ID: '_FAKE_P2P_ID_',
@@ -1810,6 +2280,13 @@ const CONST = {
         MENTION_ICON: 'mention-icon',
         SMALL_NORMAL: 'small-normal',
     },
+    COMPANY_CARD: {
+        FEED_BANK_NAME: {
+            MASTER_CARD: 'cdf',
+            VISA: 'vcf',
+            AMEX: 'gl1025',
+        },
+    },
     EXPENSIFY_CARD: {
         BANK: 'Expensify Card',
         FRAUD_TYPES: {
@@ -1831,6 +2308,24 @@ const CONST = {
             MONTHLY: 'monthly',
             FIXED: 'fixed',
         },
+        STEP_NAMES: ['1', '2', '3', '4', '5', '6'],
+        STEP: {
+            ASSIGNEE: 'Assignee',
+            CARD_TYPE: 'CardType',
+            LIMIT_TYPE: 'LimitType',
+            LIMIT: 'Limit',
+            CARD_NAME: 'CardName',
+            CONFIRMATION: 'Confirmation',
+        },
+        CARD_TYPE: {
+            PHYSICAL: 'physical',
+            VIRTUAL: 'virtual',
+        },
+        FREQUENCY_SETTING: {
+            DAILY: 'daily',
+            MONTHLY: 'monthly',
+        },
+        CARD_TITLE_INPUT_LIMIT: 255,
     },
     AVATAR_ROW_SIZE: {
         DEFAULT: 4,
@@ -1840,12 +2335,17 @@ const CONST = {
         COMPACT: 'compact',
         DEFAULT: 'default',
     },
+    SUBSCRIPTION: {
+        TYPE: {
+            ANNUAL: 'yearly2018',
+            PAYPERUSE: 'monthly2018',
+        },
+    },
     REGEX: {
         SPECIAL_CHARS_WITHOUT_NEWLINE: /((?!\n)[()-\s\t])/g,
         DIGITS_AND_PLUS: /^\+?[0-9]*$/,
         ALPHABETIC_AND_LATIN_CHARS: /^[\p{Script=Latin} ]*$/u,
         NON_ALPHABETIC_AND_NON_LATIN_CHARS: /[^\p{Script=Latin}]/gu,
-        ACCENT_LATIN_CHARS: /[\u00C0-\u017F]/g,
         POSITIVE_INTEGER: /^\d+$/,
         PO_BOX: /\b[P|p]?(OST|ost)?\.?\s*[O|o|0]?(ffice|FFICE)?\.?\s*[B|b][O|o|0]?[X|x]?\.?\s+[#]?(\d+)\b/,
         ANY_VALUE: /^.+$/,
@@ -1858,6 +2358,7 @@ const CONST = {
         CARD_SECURITY_CODE: /^[0-9]{3,4}$/,
         CARD_EXPIRATION_DATE: /^(0[1-9]|1[0-2])([^0-9])?([0-9]{4}|([0-9]{2}))$/,
         ROOM_NAME: /^#[\p{Ll}0-9-]{1,100}$/u,
+        DOMAIN_BASE: '^(?:https?:\\/\\/)?(?:www\\.)?([^\\/]+)',
 
         // eslint-disable-next-line max-len, no-misleading-character-class
         EMOJI: /[\p{Extended_Pictographic}\u200d\u{1f1e6}-\u{1f1ff}\u{1f3fb}-\u{1f3ff}\u{e0020}-\u{e007f}\u20E3\uFE0F]|[#*0-9]\uFE0F?\u20E3/gu,
@@ -1873,10 +2374,10 @@ const CONST = {
         // Extract attachment's source from the data's html string
         ATTACHMENT_DATA: /(data-expensify-source|data-name)="([^"]+)"/g,
 
-        EMOJI_NAME: /:[\w+-]+:/g,
-        EMOJI_SUGGESTIONS: /:[a-zA-Z0-9_+-]{1,40}$/,
+        EMOJI_NAME: /:[\p{L}0-9_+-]+:/gu,
+        EMOJI_SUGGESTIONS: /:[\p{L}0-9_+-]{1,40}$/u,
         AFTER_FIRST_LINE_BREAK: /\n.*/g,
-        LINE_BREAK: /\r|\n/g,
+        LINE_BREAK: /\r\n|\r|\n/g,
         CODE_2FA: /^\d{6}$/,
         ATTACHMENT_ID: /chat-attachments\/(\d+)/,
         HAS_COLON_ONLY_AT_THE_BEGINNING: /^:[^:]+$/,
@@ -1925,7 +2426,9 @@ const CONST = {
 
         POLICY_ID_FROM_PATH: /\/w\/([a-zA-Z0-9]+)(\/|$)/,
 
-        SHORT_MENTION: new RegExp(`@[\\w\\-\\+\\'#@]+(?:\\.[\\w\\-\\'\\+]+)*`, 'gim'),
+        SHORT_MENTION: new RegExp(`@[\\w\\-\\+\\'#@]+(?:\\.[\\w\\-\\'\\+]+)*(?![^\`]*\`)`, 'gim'),
+
+        REPORT_ID_FROM_PATH: /\/r\/(\d+)/,
     },
 
     PRONOUNS: {
@@ -1942,9 +2445,13 @@ const CONST = {
         WORKSPACE_INVOICES: 'WorkspaceSendInvoices',
         WORKSPACE_TRAVEL: 'WorkspaceBookTravel',
         WORKSPACE_MEMBERS: 'WorkspaceManageMembers',
+        WORKSPACE_EXPENSIFY_CARD: 'WorkspaceExpensifyCard',
         WORKSPACE_WORKFLOWS: 'WorkspaceWorkflows',
+        WORKSPACE_COMPANY_CARDS: 'WorkspaceCompanyCards',
         WORKSPACE_BANK_ACCOUNT: 'WorkspaceBankAccount',
         WORKSPACE_SETTINGS: 'WorkspaceSettings',
+        WORKSPACE_FEATURES: 'WorkspaceFeatures',
+        WORKSPACE_RULES: 'WorkspaceRules',
     },
     get EXPENSIFY_EMAILS() {
         return [
@@ -1984,7 +2491,7 @@ const CONST = {
             this.ACCOUNT_ID.REWARDS,
             this.ACCOUNT_ID.STUDENT_AMBASSADOR,
             this.ACCOUNT_ID.SVFG,
-        ];
+        ].filter((id) => id !== -1);
     },
 
     // Emails that profile view is prohibited
@@ -2010,9 +2517,10 @@ const CONST = {
     LOGIN_CHARACTER_LIMIT: 254,
     CATEGORY_NAME_LIMIT: 256,
     TAG_NAME_LIMIT: 256,
-    REPORT_NAME_LIMIT: 256,
+    WORKSPACE_REPORT_FIELD_POLICY_MAX_LENGTH: 256,
+    REPORT_NAME_LIMIT: 100,
     TITLE_CHARACTER_LIMIT: 100,
-    DESCRIPTION_LIMIT: 500,
+    DESCRIPTION_LIMIT: 1000,
     WORKSPACE_NAME_CHARACTER_LIMIT: 80,
 
     AVATAR_CROP_MODAL: {
@@ -2042,6 +2550,11 @@ const CONST = {
         SETTINGS: 'settings',
         LEAVE_ROOM: 'leaveRoom',
         PRIVATE_NOTES: 'privateNotes',
+        EXPORT: 'export',
+        DELETE: 'delete',
+        MARK_AS_INCOMPLETE: 'markAsIncomplete',
+        CANCEL_PAYMENT: 'cancelPayment',
+        UNAPPROVE: 'unapprove',
     },
     EDIT_REQUEST_FIELD: {
         AMOUNT: 'amount',
@@ -2052,6 +2565,7 @@ const CONST = {
         CATEGORY: 'category',
         RECEIPT: 'receipt',
         DISTANCE: 'distance',
+        DISTANCE_RATE: 'distanceRate',
         TAG: 'tag',
         TAX_RATE: 'taxRate',
         TAX_AMOUNT: 'taxAmount',
@@ -2112,7 +2626,6 @@ const CONST = {
         PINK: 'Pink',
     },
 
-    MAP_PADDING: 50,
     MAP_MARKER_SIZE: 20,
 
     QUICK_REACTIONS: [
@@ -3239,6 +3752,12 @@ const CONST = {
     },
 
     CONCIERGE_TRAVEL_URL: 'https://community.expensify.com/discussion/7066/introducing-concierge-travel',
+    BOOK_TRAVEL_DEMO_URL: 'https://calendly.com/d/ck2z-xsh-q97/expensify-travel-demo-travel-page',
+    TRAVEL_DOT_URL: 'https://travel.expensify.com',
+    STAGING_TRAVEL_DOT_URL: 'https://staging.travel.expensify.com',
+    TRIP_ID_PATH: (tripID: string) => `trips/${tripID}`,
+    SPOTNANA_TMC_ID: '8e8e7258-1cf3-48c0-9cd1-fe78a6e31eed',
+    STAGING_SPOTNANA_TMC_ID: '7a290c6e-5328-4107-aff6-e48765845b81',
     SCREEN_READER_STATES: {
         ALL: 'all',
         ACTIVE: 'active',
@@ -3269,64 +3788,6 @@ const CONST = {
         EXPENSIFY_LOGO_SIZE_RATIO: 0.22,
         EXPENSIFY_LOGO_MARGIN_RATIO: 0.03,
     },
-    /**
-     * Acceptable values for the `accessibilityRole` prop on react native components.
-     *
-     * **IMPORTANT:** Do not use with the `role` prop as it can cause errors.
-     *
-     * @deprecated ACCESSIBILITY_ROLE is deprecated. Please use CONST.ROLE instead.
-     */
-    ACCESSIBILITY_ROLE: {
-        /**
-         * @deprecated Please stop using the accessibilityRole prop and use the role prop instead.
-         */
-        BUTTON: 'button',
-
-        /**
-         * @deprecated Please stop using the accessibilityRole prop and use the role prop instead.
-         */
-        LINK: 'link',
-
-        /**
-         * @deprecated Please stop using the accessibilityRole prop and use the role prop instead.
-         */
-        MENUITEM: 'menuitem',
-
-        /**
-         * @deprecated Please stop using the accessibilityRole prop and use the role prop instead.
-         */
-        TEXT: 'text',
-
-        /**
-         * @deprecated Please stop using the accessibilityRole prop and use the role prop instead.
-         */
-        RADIO: 'radio',
-
-        /**
-         * @deprecated Please stop using the accessibilityRole prop and use the role prop instead.
-         */
-        IMAGEBUTTON: 'imagebutton',
-
-        /**
-         * @deprecated Please stop using the accessibilityRole prop and use the role prop instead.
-         */
-        CHECKBOX: 'checkbox',
-
-        /**
-         * @deprecated Please stop using the accessibilityRole prop and use the role prop instead.
-         */
-        SWITCH: 'switch',
-
-        /**
-         * @deprecated Please stop using the accessibilityRole prop and use the role prop instead.
-         */
-        ADJUSTABLE: 'adjustable',
-
-        /**
-         * @deprecated Please stop using the accessibilityRole prop and use the role prop instead.
-         */
-        IMAGE: 'image',
-    },
     /**
      * Acceptable values for the `role` attribute on react native components.
      *
@@ -3388,6 +3849,8 @@ const CONST = {
         TIMER: 'timer',
         /** Use for toolbars containing action buttons or components. */
         TOOLBAR: 'toolbar',
+        /** Use for navigation elements */
+        NAVIGATION: 'navigation',
     },
     TRANSLATION_KEYS: {
         ATTACHMENT: 'common.attachment',
@@ -3415,6 +3878,14 @@ const CONST = {
         ENABLED: 'ENABLED',
         DISABLED: 'DISABLED',
     },
+    DELEGATE_ROLE: {
+        SUBMITTER: 'submitter',
+        ALL: 'all',
+    },
+    STRIPE_GBP_AUTH_STATUSES: {
+        SUCCEEDED: 'succeeded',
+        CARD_AUTHENTICATION_REQUIRED: 'authentication_required',
+    },
     TAB: {
         NEW_CHAT_TAB_ID: 'NewChatTab',
         NEW_CHAT: 'chat',
@@ -3427,9 +3898,7 @@ const CONST = {
         SCAN: 'scan',
         DISTANCE: 'distance',
     },
-    TAB_SEARCH: {
-        ALL: 'all',
-    },
+
     STATUS_TEXT_MAX_LENGTH: 100,
 
     DROPDOWN_BUTTON_SIZE: {
@@ -3441,7 +3910,6 @@ const CONST = {
 
     NAVIGATION: {
         TYPE: {
-            FORCED_UP: 'FORCED_UP',
             UP: 'UP',
         },
         ACTION_TYPE: {
@@ -3461,11 +3929,13 @@ const CONST = {
     TAX_RATES_LIST_THRESHOLD: 8,
     COLON: ':',
     MAPBOX: {
-        PADDING: 50,
-        DEFAULT_ZOOM: 10,
+        PADDING: 32,
+        DEFAULT_ZOOM: 15,
         SINGLE_MARKER_ZOOM: 15,
         DEFAULT_COORDINATE: [-122.4021, 37.7911],
         STYLE_URL: 'mapbox://styles/expensify/cllcoiqds00cs01r80kp34tmq',
+        ANIMATION_DURATION_ON_CENTER_ME: 1000,
+        CENTER_BUTTON_FADE_DURATION: 300,
     },
     ONYX_UPDATE_TYPES: {
         HTTPS: 'https',
@@ -3474,6 +3944,7 @@ const CONST = {
     },
     EVENTS: {
         SCROLLING: 'scrolling',
+        ON_RETURN_TO_OLD_DOT: 'onReturnToOldDot',
     },
 
     CHAT_HEADER_LOADER_HEIGHT: 36,
@@ -3518,7 +3989,7 @@ const CONST = {
             TRACK_EXPENSE: 'track-expenses',
         },
         'track-expenses': {
-            VIDEO_URL: `${CLOUDFRONT_URL}/videos/guided-setup-track-business.mp4`,
+            VIDEO_URL: `${CLOUDFRONT_URL}/videos/guided-setup-track-business-v2.mp4`,
             LEARN_MORE_LINK: `${USE_EXPENSIFY_URL}/track-expenses`,
         },
     },
@@ -3534,10 +4005,10 @@ const CONST = {
     BACK_BUTTON_NATIVE_ID: 'backButton',
 
     /**
-     * The maximum count of items per page for OptionsSelector.
+     * The maximum count of items per page for SelectionList.
      * When paginate, it multiplies by page number.
      */
-    MAX_OPTIONS_SELECTOR_PAGE_LENGTH: 500,
+    MAX_SELECTION_LIST_PAGE_LENGTH: 500,
 
     /**
      * Bank account names
@@ -3584,6 +4055,15 @@ const CONST = {
         WARNING: 'warning',
     },
 
+    /**
+     * Constants with different types for the modifiedAmount violation
+     */
+    MODIFIED_AMOUNT_VIOLATION_DATA: {
+        DISTANCE: 'distance',
+        CARD: 'card',
+        SMARTSCAN: 'smartscan',
+    },
+
     /**
      * Constants for types of violation names.
      * Defined here because they need to be referenced by the type system to generate the
@@ -3623,6 +4103,16 @@ const CONST = {
         TAX_OUT_OF_POLICY: 'taxOutOfPolicy',
         TAX_RATE_CHANGED: 'taxRateChanged',
         TAX_REQUIRED: 'taxRequired',
+        HOLD: 'hold',
+    },
+    REVIEW_DUPLICATES_ORDER: ['merchant', 'category', 'tag', 'description', 'taxCode', 'billable', 'reimbursable'],
+
+    REPORT_VIOLATIONS: {
+        FIELD_REQUIRED: 'fieldRequired',
+    },
+
+    REPORT_VIOLATIONS_EXCLUDED_FIELDS: {
+        TEXT_TITLE: 'text_title',
     },
 
     /** Context menu types */
@@ -3633,6 +4123,14 @@ const CONST = {
         REPORT: 'REPORT',
     },
 
+    PROMOTED_ACTIONS: {
+        PIN: 'pin',
+        SHARE: 'share',
+        JOIN: 'join',
+        MESSAGE: 'message',
+        HOLD: 'hold',
+    },
+
     THUMBNAIL_IMAGE: {
         SMALL_SCREEN: {
             SIZE: 250,
@@ -3645,7 +4143,7 @@ const CONST = {
 
     VIDEO_PLAYER: {
         POPOVER_Y_OFFSET: -30,
-        PLAYBACK_SPEEDS: [0.25, 0.5, 1, 1.5, 2],
+        PLAYBACK_SPEEDS: [0.25, 0.5, 0.75, 1, 1.25, 1.5, 1.75, 2],
         HIDE_TIME_TEXT_WIDTH: 250,
         MIN_WIDTH: 170,
         MIN_HEIGHT: 120,
@@ -3685,8 +4183,9 @@ const CONST = {
 
     WELCOME_VIDEO_URL: `${CLOUDFRONT_URL}/videos/intro-1280.mp4`,
 
+    ONBOARDING_INTRODUCTION: 'Let’s get you set up 🔧',
     ONBOARDING_CHOICES: {...onboardingChoices},
-
+    ACTIONABLE_TRACK_EXPENSE_WHISPER_MESSAGE: 'What would you like to do with this expense?',
     ONBOARDING_CONCIERGE: {
         [onboardingChoices.EMPLOYER]:
             '# Expensify is the fastest way to get paid back!\n' +
@@ -3731,7 +4230,7 @@ const CONST = {
         [onboardingChoices.EMPLOYER]: {
             message: 'Getting paid back is as easy as sending a message. Let’s go over the basics.',
             video: {
-                url: `${CLOUDFRONT_URL}/videos/guided-setup-get-paid-back.mp4`,
+                url: `${CLOUDFRONT_URL}/videos/guided-setup-get-paid-back-v2.mp4`,
                 thumbnailUrl: `${CLOUDFRONT_URL}/images/guided-setup-get-paid-back.jpg`,
                 duration: 55,
                 width: 1280,
@@ -3774,7 +4273,7 @@ const CONST = {
         [onboardingChoices.MANAGE_TEAM]: {
             message: 'Here are some important tasks to help get your team’s expenses under control.',
             video: {
-                url: `${CLOUDFRONT_URL}/videos/guided-setup-manage-team.mp4`,
+                url: `${CLOUDFRONT_URL}/videos/guided-setup-manage-team-v2.mp4`,
                 thumbnailUrl: `${CLOUDFRONT_URL}/images/guided-setup-manage-team.jpg`,
                 duration: 55,
                 width: 1280,
@@ -3799,22 +4298,22 @@ const CONST = {
                     type: 'meetGuide',
                     autoCompleted: false,
                     title: 'Meet your setup specialist',
-                    description: ({adminsRoomLink, guideCalendarLink}: {adminsRoomLink: string; guideCalendarLink: string}) =>
+                    description: ({adminsRoomLink}: {adminsRoomLink: string}) =>
                         `Meet your setup specialist, who can answer any questions as you get started with Expensify. Yes, a real human!\n` +
                         '\n' +
-                        `Chat with the specialist in your [#admins room](${adminsRoomLink}) or [schedule a call](${guideCalendarLink}) today.`,
+                        `Chat with the specialist in your [#admins room](${adminsRoomLink}).`,
                 },
                 {
                     type: 'setupCategories',
                     autoCompleted: false,
                     title: 'Set up categories',
-                    description:
+                    description: ({workspaceLink}: {workspaceLink: string}) =>
                         '*Set up categories* so your team can code expenses for easy reporting.\n' +
                         '\n' +
                         'Here’s how to set up categories:\n' +
                         '\n' +
                         '1. Click your profile picture.\n' +
-                        '2. Go to *Workspaces* > [your workspace].\n' +
+                        `2. Go to [*Workspaces* > [your workspace]](${workspaceLink}).\n` +
                         '3. Click *Categories*.\n' +
                         '4. Enable and disable default categories.\n' +
                         '5. Click *Add categories* to make your own.\n' +
@@ -3825,13 +4324,13 @@ const CONST = {
                     type: 'addExpenseApprovals',
                     autoCompleted: false,
                     title: 'Add expense approvals',
-                    description:
+                    description: ({workspaceLink}: {workspaceLink: string}) =>
                         '*Add expense approvals* to review your team’s spend and keep it under control.\n' +
                         '\n' +
                         'Here’s how to add expense approvals:\n' +
                         '\n' +
                         '1. Click your profile picture.\n' +
-                        '2. Go to *Workspaces* > [your workspace].\n' +
+                        `2. Go to [*Workspaces* > [your workspace]](${workspaceLink}).\n` +
                         '3. Click *More features*.\n' +
                         '4. Enable *Workflows*.\n' +
                         '5. In *Workflows*, enable *Add approvals*.\n' +
@@ -3842,13 +4341,13 @@ const CONST = {
                     type: 'inviteTeam',
                     autoCompleted: false,
                     title: 'Invite your team',
-                    description:
+                    description: ({workspaceLink}: {workspaceLink: string}) =>
                         '*Invite your team* to Expensify so they can start tracking expenses today.\n' +
                         '\n' +
                         'Here’s how to invite your team:\n' +
                         '\n' +
                         '1. Click your profile picture.\n' +
-                        '2. Go to *Workspaces* > [your workspace].\n' +
+                        `2. Go to [*Workspaces* > [your workspace]](${workspaceLink}).\n` +
                         '3. Click *Members* > *Invite member*.\n' +
                         '4. Enter emails or phone numbers. \n' +
                         '5. Add an invite message if you want.\n' +
@@ -3860,7 +4359,7 @@ const CONST = {
         [onboardingChoices.PERSONAL_SPEND]: {
             message: 'Here’s how to track your spend in a few clicks.',
             video: {
-                url: `${CLOUDFRONT_URL}/videos/guided-setup-track-personal.mp4`,
+                url: `${CLOUDFRONT_URL}/videos/guided-setup-track-personal-v2.mp4`,
                 thumbnailUrl: `${CLOUDFRONT_URL}/images/guided-setup-track-personal.jpg`,
                 duration: 55,
                 width: 1280,
@@ -3888,7 +4387,7 @@ const CONST = {
         [onboardingChoices.CHAT_SPLIT]: {
             message: 'Splitting bills with friends is as easy as sending a message. Here’s how.',
             video: {
-                url: `${CLOUDFRONT_URL}/videos/guided-setup-chat-split-bills.mp4`,
+                url: `${CLOUDFRONT_URL}/videos/guided-setup-chat-split-bills-v2.mp4`,
                 thumbnailUrl: `${CLOUDFRONT_URL}/images/guided-setup-chat-split-bills.jpg`,
                 duration: 55,
                 width: 1280,
@@ -4124,7 +4623,7 @@ const CONST = {
             "unit": "km"
         },
         "CHF": {
-            "rate": 100,
+            "rate": 70,
             "unit": "km"
         },
         "CLP": {
@@ -4164,7 +4663,7 @@ const CONST = {
             "unit": "km"
         },
         "DKK": {
-            "rate": 673,
+            "rate": 379,
             "unit": "km"
         },
         "DOP": {
@@ -4192,7 +4691,7 @@ const CONST = {
             "unit": "km"
         },
         "EUR": {
-            "rate": 3,
+            "rate": 30,
             "unit": "km"
         },
         "FJD": {
@@ -4260,7 +4759,7 @@ const CONST = {
             "unit": "km"
         },
         "ILS": {
-            "rate": 356,
+            "rate": 540,
             "unit": "km"
         },
         "INR": {
@@ -4408,7 +4907,7 @@ const CONST = {
             "unit": "km"
         },
         "MXN": {
-            "rate": 2219,
+            "rate": 93,
             "unit": "km"
         },
         "MYR": {
@@ -4432,7 +4931,7 @@ const CONST = {
             "unit": "km"
         },
         "NOK": {
-            "rate": 917,
+            "rate": 350,
             "unit": "km"
         },
         "NPR": {
@@ -4440,7 +4939,7 @@ const CONST = {
             "unit": "km"
         },
         "NZD": {
-            "rate": 151,
+            "rate": 95,
             "unit": "km"
         },
         "OMR": {
@@ -4468,7 +4967,7 @@ const CONST = {
             "unit": "km"
         },
         "PLN": {
-            "rate": 415,
+            "rate": 89,
             "unit": "km"
         },
         "PYG": {
@@ -4512,7 +5011,7 @@ const CONST = {
             "unit": "km"
         },
         "SEK": {
-            "rate": 917,
+            "rate": 250,
             "unit": "km"
         },
         "SGD": {
@@ -4656,7 +5155,7 @@ const CONST = {
             "unit": "km"
         },
         "ZAR": {
-            "rate": 1588,
+            "rate": 464,
             "unit": "km"
         },
         "ZMK": {
@@ -4679,6 +5178,14 @@ const CONST = {
 
     SESSION_STORAGE_KEYS: {
         INITIAL_URL: 'INITIAL_URL',
+        ACTIVE_WORKSPACE_ID: 'ACTIVE_WORKSPACE_ID',
+        RETRY_LAZY_REFRESHED: 'RETRY_LAZY_REFRESHED',
+    },
+
+    RESERVATION_TYPE: {
+        CAR: 'car',
+        HOTEL: 'hotel',
+        FLIGHT: 'flight',
     },
 
     DOT_SEPARATOR: '•',
@@ -4704,6 +5211,7 @@ const CONST = {
     MAX_TAX_RATE_DECIMAL_PLACES: 4,
 
     DOWNLOADS_PATH: '/Downloads',
+    DOWNLOADS_TIMEOUT: 5000,
     NEW_EXPENSIFY_PATH: '/New Expensify',
 
     ENVIRONMENT_SUFFIX: {
@@ -4711,10 +5219,256 @@ const CONST = {
         ADHOC: ' AdHoc',
     },
 
-    SEARCH_TRANSACTION_TYPE: {
-        CASH: 'cash',
-        CARD: 'card',
-        DISTANCE: 'distance',
+    SEARCH: {
+        RESULTS_PAGE_SIZE: 50,
+        DATA_TYPES: {
+            EXPENSE: 'expense',
+            INVOICE: 'invoice',
+            TRIP: 'trip',
+        },
+        ACTION_TYPES: {
+            VIEW: 'view',
+            REVIEW: 'review',
+            DONE: 'done',
+            PAID: 'paid',
+        },
+        BULK_ACTION_TYPES: {
+            EXPORT: 'export',
+            HOLD: 'hold',
+            UNHOLD: 'unhold',
+            DELETE: 'delete',
+        },
+        TRANSACTION_TYPE: {
+            CASH: 'cash',
+            CARD: 'card',
+            DISTANCE: 'distance',
+        },
+        SORT_ORDER: {
+            ASC: 'asc',
+            DESC: 'desc',
+        },
+        STATUS: {
+            EXPENSE: {
+                ALL: 'all',
+                DRAFTS: 'drafts',
+                OUTSTANDING: 'outstanding',
+                APPROVED: 'approved',
+                PAID: 'paid',
+            },
+            INVOICE: {
+                ALL: 'all',
+                OUTSTANDING: 'outstanding',
+                PAID: 'paid',
+            },
+            TRIP: {
+                ALL: 'all',
+                DRAFTS: 'drafts',
+                OUTSTANDING: 'outstanding',
+                APPROVED: 'approved',
+                PAID: 'paid',
+            },
+        },
+        TABLE_COLUMNS: {
+            RECEIPT: 'receipt',
+            DATE: 'date',
+            MERCHANT: 'merchant',
+            DESCRIPTION: 'description',
+            FROM: 'from',
+            TO: 'to',
+            CATEGORY: 'category',
+            TAG: 'tag',
+            TOTAL_AMOUNT: 'amount',
+            TYPE: 'type',
+            ACTION: 'action',
+            TAX_AMOUNT: 'taxAmount',
+        },
+        SYNTAX_OPERATORS: {
+            AND: 'and',
+            OR: 'or',
+            EQUAL_TO: 'eq',
+            NOT_EQUAL_TO: 'neq',
+            GREATER_THAN: 'gt',
+            GREATER_THAN_OR_EQUAL_TO: 'gte',
+            LOWER_THAN: 'lt',
+            LOWER_THAN_OR_EQUAL_TO: 'lte',
+        },
+        SYNTAX_ROOT_KEYS: {
+            TYPE: 'type',
+            STATUS: 'status',
+            SORT_BY: 'sortBy',
+            SORT_ORDER: 'sortOrder',
+            POLICY_ID: 'policyID',
+        },
+        SYNTAX_FILTER_KEYS: {
+            DATE: 'date',
+            AMOUNT: 'amount',
+            EXPENSE_TYPE: 'expenseType',
+            CURRENCY: 'currency',
+            MERCHANT: 'merchant',
+            DESCRIPTION: 'description',
+            FROM: 'from',
+            TO: 'to',
+            CATEGORY: 'category',
+            TAG: 'tag',
+            TAX_RATE: 'taxRate',
+            CARD_ID: 'cardID',
+            REPORT_ID: 'reportID',
+            KEYWORD: 'keyword',
+        },
+    },
+
+    REFERRER: {
+        NOTIFICATION: 'notification',
+    },
+
+    SUBSCRIPTION_SIZE_LIMIT: 20000,
+
+    PAGINATION_START_ID: '-1',
+    PAGINATION_END_ID: '-2',
+
+    PAYMENT_CARD_CURRENCY: {
+        USD: 'USD',
+        AUD: 'AUD',
+        GBP: 'GBP',
+        NZD: 'NZD',
+    },
+    GBP_AUTHENTICATION_COMPLETE: '3DS-authentication-complete',
+
+    SUBSCRIPTION_PRICE_FACTOR: 2,
+    FEEDBACK_SURVEY_OPTIONS: {
+        TOO_LIMITED: {
+            ID: 'tooLimited',
+            TRANSLATION_KEY: 'feedbackSurvey.tooLimited',
+        },
+        TOO_EXPENSIVE: {
+            ID: 'tooExpensive',
+            TRANSLATION_KEY: 'feedbackSurvey.tooExpensive',
+        },
+        INADEQUATE_SUPPORT: {
+            ID: 'inadequateSupport',
+            TRANSLATION_KEY: 'feedbackSurvey.inadequateSupport',
+        },
+        BUSINESS_CLOSING: {
+            ID: 'businessClosing',
+            TRANSLATION_KEY: 'feedbackSurvey.businessClosing',
+        },
+    },
+
+    MAX_LENGTH_256: 256,
+    WORKSPACE_CARDS_LIST_LABEL_TYPE: {
+        CURRENT_BALANCE: 'currentBalance',
+        REMAINING_LIMIT: 'remainingLimit',
+        CASH_BACK: 'earnedCashback',
+    },
+
+    EXCLUDE_FROM_LAST_VISITED_PATH: [SCREENS.NOT_FOUND, SCREENS.SAML_SIGN_IN, SCREENS.VALIDATE_LOGIN] as string[],
+
+    CANCELLATION_TYPE: {
+        MANUAL: 'manual',
+        AUTOMATIC: 'automatic',
+        NONE: 'none',
+    },
+    EMPTY_STATE_MEDIA: {
+        ANIMATION: 'animation',
+        ILLUSTRATION: 'illustration',
+        VIDEO: 'video',
+    },
+    get UPGRADE_FEATURE_INTRO_MAPPING() {
+        return {
+            reportFields: {
+                id: 'reportFields' as const,
+                alias: 'report-fields',
+                name: 'Report Fields',
+                title: 'workspace.upgrade.reportFields.title' as const,
+                description: 'workspace.upgrade.reportFields.description' as const,
+                icon: 'Pencil',
+            },
+            [this.POLICY.CONNECTIONS.NAME.NETSUITE]: {
+                id: this.POLICY.CONNECTIONS.NAME.NETSUITE,
+                alias: 'netsuite',
+                name: this.POLICY.CONNECTIONS.NAME_USER_FRIENDLY.netsuite,
+                title: `workspace.upgrade.${this.POLICY.CONNECTIONS.NAME.NETSUITE}.title` as const,
+                description: `workspace.upgrade.${this.POLICY.CONNECTIONS.NAME.NETSUITE}.description` as const,
+                icon: 'NetSuiteSquare',
+            },
+            [this.POLICY.CONNECTIONS.NAME.SAGE_INTACCT]: {
+                id: this.POLICY.CONNECTIONS.NAME.SAGE_INTACCT,
+                alias: 'sage-intacct',
+                name: this.POLICY.CONNECTIONS.NAME_USER_FRIENDLY.intacct,
+                title: `workspace.upgrade.${this.POLICY.CONNECTIONS.NAME.SAGE_INTACCT}.title` as const,
+                description: `workspace.upgrade.${this.POLICY.CONNECTIONS.NAME.SAGE_INTACCT}.description` as const,
+                icon: 'IntacctSquare',
+            },
+            approvals: {
+                id: 'approvals' as const,
+                alias: 'approvals' as const,
+                name: 'Advanced Approvals' as const,
+                title: `workspace.upgrade.approvals.title` as const,
+                description: `workspace.upgrade.approvals.description` as const,
+                icon: 'AdvancedApprovalsSquare',
+            },
+            glCodes: {
+                id: 'glCodes' as const,
+                alias: 'gl-codes',
+                name: 'GL codes',
+                title: 'workspace.upgrade.glCodes.title' as const,
+                description: 'workspace.upgrade.glCodes.description' as const,
+                icon: 'Tag',
+            },
+            glAndPayrollCodes: {
+                id: 'glAndPayrollCodes' as const,
+                alias: 'gl-and-payroll-codes',
+                name: 'GL & Payroll codes',
+                title: 'workspace.upgrade.glAndPayrollCodes.title' as const,
+                description: 'workspace.upgrade.glAndPayrollCodes.description' as const,
+                icon: 'FolderOpen',
+            },
+            taxCodes: {
+                id: 'taxCodes' as const,
+                alias: 'tax-codes',
+                name: 'Tax codes',
+                title: 'workspace.upgrade.taxCodes.title' as const,
+                description: 'workspace.upgrade.taxCodes.description' as const,
+                icon: 'Coins',
+            },
+            companyCards: {
+                id: 'companyCards' as const,
+                alias: 'company-cards',
+                name: 'Company Cards',
+                title: 'workspace.upgrade.companyCards.title' as const,
+                description: 'workspace.upgrade.companyCards.description' as const,
+                icon: 'CompanyCard',
+            },
+            rules: {
+                id: 'rules' as const,
+                alias: 'rules',
+                name: 'Rules',
+                title: 'workspace.upgrade.rules.title' as const,
+                description: 'workspace.upgrade.rules.description' as const,
+                icon: 'Rules',
+            },
+        };
+    },
+    REPORT_FIELD_TYPES: {
+        TEXT: 'text',
+        DATE: 'date',
+        LIST: 'dropdown',
+    },
+
+    NAVIGATION_ACTIONS: {
+        RESET: 'RESET',
+    },
+
+    APPROVAL_WORKFLOW: {
+        ACTION: {
+            CREATE: 'create',
+            EDIT: 'edit',
+        },
+        TYPE: {
+            CREATE: 'create',
+            UPDATE: 'update',
+            REMOVE: 'remove',
+        },
     },
 } as const;
 
@@ -4722,7 +5476,12 @@ type Country = keyof typeof CONST.ALL_COUNTRIES;
 
 type IOUType = ValueOf<typeof CONST.IOU.TYPE>;
 type IOUAction = ValueOf<typeof CONST.IOU.ACTION>;
+type IOURequestType = ValueOf<typeof CONST.IOU.REQUEST_TYPE>;
+type FeedbackSurveyOptionID = ValueOf<Pick<ValueOf<typeof CONST.FEEDBACK_SURVEY_OPTIONS>, 'ID'>>;
+
+type SubscriptionType = ValueOf<typeof CONST.SUBSCRIPTION.TYPE>;
+type CancellationType = ValueOf<typeof CONST.CANCELLATION_TYPE>;
 
-export type {Country, IOUAction, IOUType, RateAndUnit, OnboardingPurposeType};
+export type {Country, IOUAction, IOUType, RateAndUnit, OnboardingPurposeType, IOURequestType, SubscriptionType, FeedbackSurveyOptionID, CancellationType};
 
 export default CONST;
diff --git a/src/Expensify.tsx b/src/Expensify.tsx
index c67f1400fc4b..10389f69a44c 100644
--- a/src/Expensify.tsx
+++ b/src/Expensify.tsx
@@ -1,23 +1,28 @@
+import {Audio} from 'expo-av';
 import React, {useCallback, useEffect, useLayoutEffect, useMemo, useRef, useState} from 'react';
 import type {NativeEventSubscription} from 'react-native';
-import {AppState, Linking} from 'react-native';
+import {AppState, Linking, NativeModules, Platform} from 'react-native';
 import type {OnyxEntry} from 'react-native-onyx';
-import Onyx, {withOnyx} from 'react-native-onyx';
+import Onyx, {useOnyx, withOnyx} from 'react-native-onyx';
 import ConfirmModal from './components/ConfirmModal';
 import DeeplinkWrapper from './components/DeeplinkWrapper';
 import EmojiPicker from './components/EmojiPicker/EmojiPicker';
 import FocusModeNotification from './components/FocusModeNotification';
 import GrowlNotification from './components/GrowlNotification';
+import RequireTwoFactorAuthenticationModal from './components/RequireTwoFactorAuthenticationModal';
 import AppleAuthWrapper from './components/SignInButtons/AppleAuthWrapper';
 import SplashScreenHider from './components/SplashScreenHider';
 import UpdateAppModal from './components/UpdateAppModal';
+import * as CONFIG from './CONFIG';
 import CONST from './CONST';
 import useLocalize from './hooks/useLocalize';
+import {updateLastRoute} from './libs/actions/App';
 import * as EmojiPickerAction from './libs/actions/EmojiPickerAction';
 import * as Report from './libs/actions/Report';
 import * as User from './libs/actions/User';
 import * as ActiveClientManager from './libs/ActiveClientManager';
 import BootSplash from './libs/BootSplash';
+import FS from './libs/Fullstory';
 import * as Growl from './libs/Growl';
 import Log from './libs/Log';
 import migrateOnyx from './libs/migrateOnyx';
@@ -27,6 +32,7 @@ import NetworkConnection from './libs/NetworkConnection';
 import PushNotification from './libs/Notification/PushNotification';
 import './libs/Notification/PushNotification/subscribePushNotification';
 import Performance from './libs/Performance';
+import setCrashlyticsUserId from './libs/setCrashlyticsUserId';
 import StartupTimer from './libs/StartupTimer';
 // This lib needs to be imported, but it has nothing to export since all it contains is an Onyx connection
 import './libs/UnreadIndicatorUpdater';
@@ -35,7 +41,8 @@ import ONYXKEYS from './ONYXKEYS';
 import PopoverReportActionContextMenu from './pages/home/report/ContextMenu/PopoverReportActionContextMenu';
 import * as ReportActionContextMenu from './pages/home/report/ContextMenu/ReportActionContextMenu';
 import type {Route} from './ROUTES';
-import type {ScreenShareRequest, Session} from './types/onyx';
+import ROUTES from './ROUTES';
+import type {ScreenShareRequest} from './types/onyx';
 
 Onyx.registerLogger(({level, message}) => {
     if (level === 'alert') {
@@ -52,9 +59,6 @@ type ExpensifyOnyxProps = {
     /** Whether the app is waiting for the server's response to determine if a room is public */
     isCheckingPublicRoom: OnyxEntry<boolean>;
 
-    /** Session info for the currently logged in user. */
-    session: OnyxEntry<Session>;
-
     /** Whether a new update is available and ready to install. */
     updateAvailable: OnyxEntry<boolean>;
 
@@ -76,11 +80,15 @@ type ExpensifyOnyxProps = {
 
 type ExpensifyProps = ExpensifyOnyxProps;
 
-const SplashScreenHiddenContext = React.createContext({});
+// HybridApp needs access to SetStateAction in order to properly hide SplashScreen when React Native was booted before.
+type SplashScreenHiddenContextType = {isSplashHidden?: boolean; setIsSplashHidden: React.Dispatch<React.SetStateAction<boolean>>};
+
+const SplashScreenHiddenContext = React.createContext<SplashScreenHiddenContextType>({
+    setIsSplashHidden: () => {},
+});
 
 function Expensify({
     isCheckingPublicRoom = true,
-    session,
     updateAvailable,
     isSidebarLoaded = false,
     screenShareRequest,
@@ -94,6 +102,18 @@ function Expensify({
     const [isSplashHidden, setIsSplashHidden] = useState(false);
     const [hasAttemptedToOpenPublicRoom, setAttemptedToOpenPublicRoom] = useState(false);
     const {translate} = useLocalize();
+    const [account] = useOnyx(ONYXKEYS.ACCOUNT);
+    const [session] = useOnyx(ONYXKEYS.SESSION);
+    const [lastRoute] = useOnyx(ONYXKEYS.LAST_ROUTE);
+    const [shouldShowRequire2FAModal, setShouldShowRequire2FAModal] = useState(false);
+
+    useEffect(() => {
+        if (!account?.needsTwoFactorAuthSetup || account.requiresTwoFactorAuth) {
+            return;
+        }
+        setShouldShowRequire2FAModal(true);
+    }, [account?.needsTwoFactorAuthSetup, account?.requiresTwoFactorAuth]);
+
     const [initialUrl, setInitialUrl] = useState<string | null>(null);
 
     useEffect(() => {
@@ -106,13 +126,6 @@ function Expensify({
     const isAuthenticated = useMemo(() => !!(session?.authToken ?? null), [session]);
     const autoAuthState = useMemo(() => session?.autoAuthState ?? '', [session]);
 
-    const contextValue = useMemo(
-        () => ({
-            isSplashHidden,
-        }),
-        [isSplashHidden],
-    );
-
     const shouldInit = isNavigationReady && hasAttemptedToOpenPublicRoom;
     const shouldHideSplash = shouldInit && !isSplashHidden;
 
@@ -136,12 +149,30 @@ function Expensify({
         Performance.markEnd(CONST.TIMING.SIDEBAR_LOADED);
     }, []);
 
+    const contextValue = useMemo(
+        () => ({
+            isSplashHidden,
+            setIsSplashHidden,
+        }),
+        [isSplashHidden, setIsSplashHidden],
+    );
+
     useLayoutEffect(() => {
         // Initialize this client as being an active client
         ActiveClientManager.init();
 
+        // Initialize Fullstory lib
+        FS.init();
+
         // Used for the offline indicator appearing when someone is offline
-        NetworkConnection.subscribeToNetInfo();
+        const unsubscribeNetInfo = NetworkConnection.subscribeToNetInfo();
+
+        return unsubscribeNetInfo;
+    }, []);
+
+    // Log the platform and config to debug .env issues
+    useEffect(() => {
+        Log.info('App launched', false, {Platform, CONFIG});
     }, []);
 
     useEffect(() => {
@@ -199,9 +230,31 @@ function Expensify({
             }
             appStateChangeListener.current.remove();
         };
-        // eslint-disable-next-line react-hooks/exhaustive-deps -- we don't want this effect to run again
+        // eslint-disable-next-line react-compiler/react-compiler, react-hooks/exhaustive-deps -- we don't want this effect to run again
     }, []);
 
+    // This is being done since we want to play sound even when iOS device is on silent mode, to align with other platforms.
+    useEffect(() => {
+        Audio.setAudioModeAsync({playsInSilentModeIOS: true});
+    }, []);
+
+    useLayoutEffect(() => {
+        if (!isNavigationReady || !lastRoute) {
+            return;
+        }
+        updateLastRoute('');
+        Navigation.navigate(lastRoute as Route);
+        // Disabling this rule because we only want it to run on the first render.
+        // eslint-disable-next-line react-compiler/react-compiler, react-hooks/exhaustive-deps
+    }, [isNavigationReady]);
+
+    useEffect(() => {
+        if (!isAuthenticated) {
+            return;
+        }
+        setCrashlyticsUserId(session?.accountID ?? -1);
+    }, [isAuthenticated, session?.accountID]);
+
     // Display a blank page until the onyx migration completes
     if (!isOnyxMigrated) {
         return null;
@@ -215,6 +268,7 @@ function Expensify({
         <DeeplinkWrapper
             isAuthenticated={isAuthenticated}
             autoAuthState={autoAuthState}
+            initialUrl={initialUrl ?? ''}
         >
             {shouldInit && (
                 <>
@@ -235,6 +289,16 @@ function Expensify({
                         />
                     ) : null}
                     {focusModeNotification ? <FocusModeNotification /> : null}
+                    {shouldShowRequire2FAModal ? (
+                        <RequireTwoFactorAuthenticationModal
+                            onSubmit={() => {
+                                setShouldShowRequire2FAModal(false);
+                                Navigation.navigate(ROUTES.SETTINGS_2FA.getRoute(ROUTES.HOME));
+                            }}
+                            isVisible
+                            description={translate('twoFactorAuth.twoFactorAuthIsRequiredForAdminsDescription')}
+                        />
+                    ) : null}
                 </>
             )}
 
@@ -246,23 +310,23 @@ function Expensify({
                         authenticated={isAuthenticated}
                         lastVisitedPath={lastVisitedPath as Route}
                         initialUrl={initialUrl}
+                        shouldShowRequire2FAModal={shouldShowRequire2FAModal}
                     />
                 </SplashScreenHiddenContext.Provider>
             )}
-
-            {shouldHideSplash && <SplashScreenHider onHide={onSplashHide} />}
+            {/* HybridApp has own middleware to hide SplashScreen */}
+            {!NativeModules.HybridAppModule && shouldHideSplash && <SplashScreenHider onHide={onSplashHide} />}
         </DeeplinkWrapper>
     );
 }
 
+Expensify.displayName = 'Expensify';
+
 export default withOnyx<ExpensifyProps, ExpensifyOnyxProps>({
     isCheckingPublicRoom: {
         key: ONYXKEYS.IS_CHECKING_PUBLIC_ROOM,
         initWithStoredValues: false,
     },
-    session: {
-        key: ONYXKEYS.SESSION,
-    },
     updateAvailable: {
         key: ONYXKEYS.UPDATE_AVAILABLE,
         initWithStoredValues: false,
diff --git a/src/NAVIGATORS.ts b/src/NAVIGATORS.ts
index eea357322075..0b4a86c99247 100644
--- a/src/NAVIGATORS.ts
+++ b/src/NAVIGATORS.ts
@@ -10,5 +10,6 @@ export default {
     ONBOARDING_MODAL_NAVIGATOR: 'OnboardingModalNavigator',
     FEATURE_TRANING_MODAL_NAVIGATOR: 'FeatureTrainingModalNavigator',
     WELCOME_VIDEO_MODAL_NAVIGATOR: 'WelcomeVideoModalNavigator',
+    EXPLANATION_MODAL_NAVIGATOR: 'ExplanationModalNavigator',
     FULL_SCREEN_NAVIGATOR: 'FullScreenNavigator',
 } as const;
diff --git a/src/ONYXKEYS.ts b/src/ONYXKEYS.ts
index 88818c3eb7c6..6a1fc8a629ed 100755
--- a/src/ONYXKEYS.ts
+++ b/src/ONYXKEYS.ts
@@ -115,12 +115,18 @@ const ONYXKEYS = {
     /** This NVP contains information about whether the onboarding flow was completed or not */
     NVP_ONBOARDING: 'nvp_onboarding',
 
+    /** This NVP contains data associated with HybridApp */
+    NVP_TRYNEWDOT: 'nvp_tryNewDot',
+
     /** Contains the user preference for the LHN priority mode */
     NVP_PRIORITY_MODE: 'nvp_priorityMode',
 
     /** Contains the users's block expiration (if they have one) */
     NVP_BLOCKED_FROM_CONCIERGE: 'nvp_private_blockedFromConcierge',
 
+    /** Whether the user is blocked from chat */
+    NVP_BLOCKED_FROM_CHAT: 'nvp_private_blockedFromChat',
+
     /** A unique identifier that each user has that's used to send notifications */
     NVP_PRIVATE_PUSH_NOTIFICATION_ID: 'nvp_private_pushNotificationID',
 
@@ -128,10 +134,7 @@ const ONYXKEYS = {
     NVP_LAST_PAYMENT_METHOD: 'nvp_private_lastPaymentMethod',
 
     /** This NVP holds to most recent waypoints that a person has used when creating a distance expense */
-    NVP_RECENT_WAYPOINTS: 'expensify_recentWaypoints',
-
-    /** This NVP will be `true` if the user has ever dismissed the engagement modal on either OldDot or NewDot. If it becomes true it should stay true forever. */
-    NVP_HAS_DISMISSED_IDLE_PANEL: 'nvp_hasDismissedIdlePanel',
+    NVP_RECENT_WAYPOINTS: 'nvp_expensify_recentWaypoints',
 
     /** This NVP contains the choice that the user made on the engagement modal */
     NVP_INTRO_SELECTED: 'nvp_introSelected',
@@ -151,8 +154,26 @@ const ONYXKEYS = {
     /** Whether the user has tried focus mode yet */
     NVP_TRY_FOCUS_MODE: 'nvp_tryFocusMode',
 
-    /** Whether the user has been shown the hold educational interstitial yet */
-    NVP_HOLD_USE_EXPLAINED: 'holdUseExplained',
+    /** Whether the user has dismissed the hold educational interstitial */
+    NVP_DISMISSED_HOLD_USE_EXPLANATION: 'nvp_dismissedHoldUseExplanation',
+
+    /** Whether the user has seen HybridApp explanation modal */
+    NVP_SEEN_NEW_USER_MODAL: 'nvp_seen_new_user_modal',
+
+    /** Store the state of the subscription */
+    NVP_PRIVATE_SUBSCRIPTION: 'nvp_private_subscription',
+
+    /** Store the state of the private tax-exempt */
+    NVP_PRIVATE_TAX_EXEMPT: 'nvp_private_taxExempt',
+
+    /** Store the stripe id status */
+    NVP_PRIVATE_STRIPE_CUSTOMER_ID: 'nvp_private_stripeCustomerID',
+
+    /** Store the billing dispute status */
+    NVP_PRIVATE_BILLING_DISPUTE_PENDING: 'nvp_private_billingDisputePending',
+
+    /** Store the billing status */
+    NVP_PRIVATE_BILLING_STATUS: 'nvp_private_billingStatus',
 
     /** Store preferred skintone for emoji */
     PREFERRED_EMOJI_SKIN_TONE: 'nvp_expensify_preferredEmojiSkinTone',
@@ -166,6 +187,27 @@ const ONYXKEYS = {
     /** The NVP with the last action taken (for the Quick Action Button) */
     NVP_QUICK_ACTION_GLOBAL_CREATE: 'nvp_quickActionGlobalCreate',
 
+    /** The NVP containing all information necessary to connect with Spontana */
+    NVP_TRAVEL_SETTINGS: 'nvp_travelSettings',
+
+    /** The start date (yyyy-MM-dd HH:mm:ss) of the workspace owner’s free trial period. */
+    NVP_FIRST_DAY_FREE_TRIAL: 'nvp_private_firstDayFreeTrial',
+
+    /** The end date (yyyy-MM-dd HH:mm:ss) of the workspace owner’s free trial period. */
+    NVP_LAST_DAY_FREE_TRIAL: 'nvp_private_lastDayFreeTrial',
+
+    /** ID associated with the payment card added by the user. */
+    NVP_BILLING_FUND_ID: 'nvp_expensify_billingFundID',
+
+    /** The amount owed by the workspace’s owner. */
+    NVP_PRIVATE_AMOUNT_OWED: 'nvp_private_amountOwed',
+
+    /** The end date (epoch timestamp) of the workspace owner’s grace period after the free trial ends. */
+    NVP_PRIVATE_OWNER_BILLING_GRACE_PERIOD_END: 'nvp_private_billingGracePeriodEnd',
+
+    /** The NVP containing all information related to educational tooltip in workspace chat */
+    NVP_WORKSPACE_TOOLTIP: 'workspaceTooltip',
+
     /** Does this user have push notifications enabled for this device? */
     PUSH_NOTIFICATIONS_ENABLED: 'pushNotificationsEnabled',
 
@@ -188,6 +230,9 @@ const ONYXKEYS = {
     /** User's Expensify Wallet */
     USER_WALLET: 'userWallet',
 
+    /** User's metadata that will be used to segmentation */
+    USER_METADATA: 'userMetadata',
+
     /** Object containing Onfido SDK Token + applicantID */
     WALLET_ONFIDO: 'walletOnfido',
 
@@ -282,6 +327,12 @@ const ONYXKEYS = {
     /** Onboarding Purpose selected by the user during Onboarding flow */
     ONBOARDING_PURPOSE_SELECTED: 'onboardingPurposeSelected',
 
+    /** Onboarding error message to be displayed to the user */
+    ONBOARDING_ERROR_MESSAGE: 'onboardingErrorMessage',
+
+    /** Onboarding policyID selected by the user during Onboarding flow */
+    ONBOARDING_POLICY_ID: 'onboardingPolicyID',
+
     /** Onboarding Purpose selected by the user during Onboarding flow */
     ONBOARDING_ADMINS_CHAT_REPORT_ID: 'onboardingAdminsChatReportID',
 
@@ -306,15 +357,52 @@ const ONYXKEYS = {
     /** Indicates whether we should store logs or not */
     SHOULD_STORE_LOGS: 'shouldStoreLogs',
 
+    /** Indicates whether we should mask fragile user data while exporting onyx state or not */
+    SHOULD_MASK_ONYX_STATE: 'shouldMaskOnyxState',
+
     /** Stores new group chat draft */
     NEW_GROUP_CHAT_DRAFT: 'newGroupChatDraft',
 
     // Paths of PDF file that has been cached during one session
     CACHED_PDF_PATHS: 'cachedPDFPaths',
 
+    /** Stores iframe link to verify 3DS flow for subscription */
+    VERIFY_3DS_SUBSCRIPTION: 'verify3dsSubscription',
+
     /** Holds the checks used while transferring the ownership of the workspace */
     POLICY_OWNERSHIP_CHANGE_CHECKS: 'policyOwnershipChangeChecks',
 
+    // These statuses below are in separate keys on purpose - it allows us to have different behaviours of the banner based on the status
+
+    /** Indicates whether ClearOutstandingBalance failed */
+    SUBSCRIPTION_RETRY_BILLING_STATUS_FAILED: 'subscriptionRetryBillingStatusFailed',
+
+    /** Indicates whether ClearOutstandingBalance was successful */
+    SUBSCRIPTION_RETRY_BILLING_STATUS_SUCCESSFUL: 'subscriptionRetryBillingStatusSuccessful',
+
+    /** Indicates whether ClearOutstandingBalance is pending */
+    SUBSCRIPTION_RETRY_BILLING_STATUS_PENDING: 'subscriptionRetryBillingStatusPending',
+
+    /** Stores info during review duplicates flow */
+    REVIEW_DUPLICATES: 'reviewDuplicates',
+
+    /** Stores the last export method for policy */
+    LAST_EXPORT_METHOD: 'lastExportMethod',
+
+    /** Stores the information about the state of issuing a new card */
+    ISSUE_NEW_EXPENSIFY_CARD: 'issueNewExpensifyCard',
+
+    /** Stores the information if mobile selection mode is active */
+    MOBILE_SELECTION_MODE: 'mobileSelectionMode',
+
+    NVP_PRIVATE_CANCELLATION_DETAILS: 'nvp_private_cancellationDetails',
+
+    /** Stores the information about currently edited advanced approval workflow */
+    APPROVAL_WORKFLOW: 'approvalWorkflow',
+
+    /** Stores the route to open after changing app permission from settings */
+    LAST_ROUTE: 'lastRoute',
+
     /** Collection Keys */
     COLLECTION: {
         DOWNLOAD: 'download_',
@@ -322,6 +410,7 @@ const ONYXKEYS = {
         POLICY_DRAFTS: 'policyDrafts_',
         POLICY_JOIN_MEMBER: 'policyJoinMember_',
         POLICY_CATEGORIES: 'policyCategories_',
+        POLICY_CATEGORIES_DRAFT: 'policyCategoriesDraft_',
         POLICY_RECENTLY_USED_CATEGORIES: 'policyRecentlyUsedCategories_',
         POLICY_TAGS: 'policyTags_',
         POLICY_RECENTLY_USED_TAGS: 'nvp_recentlyUsedTags_',
@@ -335,17 +424,21 @@ const ONYXKEYS = {
         WORKSPACE_INVITE_MEMBERS_DRAFT: 'workspaceInviteMembersDraft_',
         WORKSPACE_INVITE_MESSAGE_DRAFT: 'workspaceInviteMessageDraft_',
         REPORT: 'report_',
+        REPORT_NAME_VALUE_PAIRS: 'reportNameValuePairs_',
+        REPORT_DRAFT: 'reportDraft_',
         // REPORT_METADATA is a perf optimization used to hold loading states (isLoadingInitialReportActions, isLoadingOlderReportActions, isLoadingNewerReportActions).
         // A lot of components are connected to the Report entity and do not care about the actions. Setting the loading state
         // directly on the report caused a lot of unnecessary re-renders
         REPORT_METADATA: 'reportMetadata_',
         REPORT_ACTIONS: 'reportActions_',
         REPORT_ACTIONS_DRAFTS: 'reportActionsDrafts_',
+        REPORT_ACTIONS_PAGES: 'reportActionsPages_',
         REPORT_ACTIONS_REACTIONS: 'reportActionsReactions_',
         REPORT_DRAFT_COMMENT: 'reportDraftComment_',
         REPORT_IS_COMPOSER_FULL_SIZE: 'reportIsComposerFullSize_',
         REPORT_USER_IS_TYPING: 'reportUserIsTyping_',
         REPORT_USER_IS_LEAVING_ROOM: 'reportUserIsLeavingRoom_',
+        REPORT_VIOLATIONS: 'reportViolations_',
         SECURITY_GROUP: 'securityGroup_',
         TRANSACTION: 'transactions_',
         TRANSACTION_VIOLATIONS: 'transactionViolations_',
@@ -364,12 +457,37 @@ const ONYXKEYS = {
 
         // Search Page related
         SNAPSHOT: 'snapshot_',
+
+        // Shared NVPs
+        /** Collection of objects where each object represents the owner of the workspace that is past due billing AND the user is a member of. */
+        SHARED_NVP_PRIVATE_USER_BILLING_GRACE_PERIOD_END: 'sharedNVP_private_billingGracePeriodEnd_',
+
+        /** The collection of card feeds */
+        SHARED_NVP_PRIVATE_DOMAIN_MEMBER: 'sharedNVP_private_domain_member_',
+
+        /**
+         * Stores the card list for a given fundID and feed in the format: cards_<fundID>_<bankName>
+         * So for example: cards_12345_Expensify Card
+         */
+        WORKSPACE_CARDS_LIST: 'cards_',
+
+        /** Expensify cards settings */
+        PRIVATE_EXPENSIFY_CARD_SETTINGS: 'private_expensifyCardSettings_',
+
+        /** Stores which connection is set up to use Continuous Reconciliation */
+        EXPENSIFY_CARD_CONTINUOUS_RECONCILIATION_CONNECTION: 'expensifyCard_continuousReconciliationConnection_',
+
+        /** The value that indicates whether Continuous Reconciliation should be used on the domain */
+        EXPENSIFY_CARD_USE_CONTINUOUS_RECONCILIATION: 'expensifyCard_useContinuousReconciliation_',
+
+        /** Currently displaying feed */
+        LAST_SELECTED_FEED: 'lastSelectedFeed_',
     },
 
     /** List of Form ids */
     FORMS: {
-        ADD_DEBIT_CARD_FORM: 'addDebitCardForm',
-        ADD_DEBIT_CARD_FORM_DRAFT: 'addDebitCardFormDraft',
+        ADD_PAYMENT_CARD_FORM: 'addPaymentCardForm',
+        ADD_PAYMENT_CARD_FORM_DRAFT: 'addPaymentCardFormDraft',
         WORKSPACE_SETTINGS_FORM: 'workspaceSettingsForm',
         WORKSPACE_CATEGORY_FORM: 'workspaceCategoryForm',
         WORKSPACE_CATEGORY_FORM_DRAFT: 'workspaceCategoryFormDraft',
@@ -382,9 +500,13 @@ const ONYXKEYS = {
         WORKSPACE_RATE_AND_UNIT_FORM_DRAFT: 'workspaceRateAndUnitFormDraft',
         WORKSPACE_TAX_CUSTOM_NAME: 'workspaceTaxCustomName',
         WORKSPACE_TAX_CUSTOM_NAME_DRAFT: 'workspaceTaxCustomNameDraft',
+        WORKSPACE_REPORT_FIELDS_FORM: 'workspaceReportFieldForm',
+        WORKSPACE_REPORT_FIELDS_FORM_DRAFT: 'workspaceReportFieldFormDraft',
         POLICY_CREATE_DISTANCE_RATE_FORM: 'policyCreateDistanceRateForm',
         POLICY_CREATE_DISTANCE_RATE_FORM_DRAFT: 'policyCreateDistanceRateFormDraft',
         POLICY_DISTANCE_RATE_EDIT_FORM: 'policyDistanceRateEditForm',
+        POLICY_DISTANCE_RATE_TAX_RECLAIMABLE_ON_EDIT_FORM: 'policyDistanceRateTaxReclaimableOnEditForm',
+        POLICY_DISTANCE_RATE_TAX_RECLAIMABLE_ON_EDIT_FORM_DRAFT: 'policyDistanceRateTaxReclaimableOnEditFormDraft',
         POLICY_DISTANCE_RATE_EDIT_FORM_DRAFT: 'policyDistanceRateEditFormDraft',
         CLOSE_ACCOUNT_FORM: 'closeAccount',
         CLOSE_ACCOUNT_FORM_DRAFT: 'closeAccountDraft',
@@ -426,6 +548,8 @@ const ONYXKEYS = {
         MONEY_REQUEST_DATE_FORM_DRAFT: 'moneyRequestCreatedFormDraft',
         MONEY_REQUEST_HOLD_FORM: 'moneyHoldReasonForm',
         MONEY_REQUEST_HOLD_FORM_DRAFT: 'moneyHoldReasonFormDraft',
+        MONEY_REQUEST_COMPANY_INFO_FORM: 'moneyRequestCompanyInfoForm',
+        MONEY_REQUEST_COMPANY_INFO_FORM_DRAFT: 'moneyRequestCompanyInfoFormDraft',
         NEW_CONTACT_METHOD_FORM: 'newContactMethodForm',
         NEW_CONTACT_METHOD_FORM_DRAFT: 'newContactMethodFormDraft',
         WAYPOINT_FORM: 'waypointForm',
@@ -436,6 +560,8 @@ const ONYXKEYS = {
         SETTINGS_STATUS_SET_CLEAR_AFTER_FORM_DRAFT: 'settingsStatusSetClearAfterFormDraft',
         SETTINGS_STATUS_CLEAR_DATE_FORM: 'settingsStatusClearDateForm',
         SETTINGS_STATUS_CLEAR_DATE_FORM_DRAFT: 'settingsStatusClearDateFormDraft',
+        CHANGE_BILLING_CURRENCY_FORM: 'billingCurrencyForm',
+        CHANGE_BILLING_CURRENCY_FORM_DRAFT: 'billingCurrencyFormDraft',
         PRIVATE_NOTES_FORM: 'privateNotesForm',
         PRIVATE_NOTES_FORM_DRAFT: 'privateNotesFormDraft',
         I_KNOW_A_TEACHER_FORM: 'iKnowTeacherForm',
@@ -448,12 +574,16 @@ const ONYXKEYS = {
         REPORT_VIRTUAL_CARD_FRAUD_DRAFT: 'reportVirtualCardFraudFormDraft',
         GET_PHYSICAL_CARD_FORM: 'getPhysicalCardForm',
         GET_PHYSICAL_CARD_FORM_DRAFT: 'getPhysicalCardFormDraft',
-        REPORT_FIELD_EDIT_FORM: 'reportFieldEditForm',
-        REPORT_FIELD_EDIT_FORM_DRAFT: 'reportFieldEditFormDraft',
+        REPORT_FIELDS_EDIT_FORM: 'reportFieldsEditForm',
+        REPORT_FIELDS_EDIT_FORM_DRAFT: 'reportFieldsEditFormDraft',
         REIMBURSEMENT_ACCOUNT_FORM: 'reimbursementAccount',
         REIMBURSEMENT_ACCOUNT_FORM_DRAFT: 'reimbursementAccountDraft',
         PERSONAL_BANK_ACCOUNT_FORM: 'personalBankAccount',
         PERSONAL_BANK_ACCOUNT_FORM_DRAFT: 'personalBankAccountDraft',
+        DISABLE_AUTO_RENEW_SURVEY_FORM: 'disableAutoRenewSurveyForm',
+        DISABLE_AUTO_RENEW_SURVEY_FORM_DRAFT: 'disableAutoRenewSurveyFormDraft',
+        REQUEST_EARLY_CANCELLATION_FORM: 'requestEarlyCancellationForm',
+        REQUEST_EARLY_CANCELLATION_FORM_DRAFT: 'requestEarlyCancellationFormDraft',
         EXIT_SURVEY_REASON_FORM: 'exitSurveyReasonForm',
         EXIT_SURVEY_REASON_FORM_DRAFT: 'exitSurveyReasonFormDraft',
         EXIT_SURVEY_RESPONSE_FORM: 'exitSurveyResponseForm',
@@ -465,23 +595,62 @@ const ONYXKEYS = {
         WORKSPACE_NEW_TAX_FORM: 'workspaceNewTaxForm',
         WORKSPACE_NEW_TAX_FORM_DRAFT: 'workspaceNewTaxFormDraft',
         WORKSPACE_TAX_NAME_FORM: 'workspaceTaxNameForm',
+        WORKSPACE_TAX_CODE_FORM: 'workspaceTaxCodeForm',
+        WORKSPACE_TAX_CODE_FORM_DRAFT: 'workspaceTaxCodeFormDraft',
         WORKSPACE_TAX_NAME_FORM_DRAFT: 'workspaceTaxNameFormDraft',
         WORKSPACE_TAX_VALUE_FORM: 'workspaceTaxValueForm',
         WORKSPACE_TAX_VALUE_FORM_DRAFT: 'workspaceTaxValueFormDraft',
+        WORKSPACE_INVOICES_COMPANY_NAME_FORM: 'workspaceInvoicesCompanyNameForm',
+        WORKSPACE_INVOICES_COMPANY_NAME_FORM_DRAFT: 'workspaceInvoicesCompanyNameFormDraft',
+        WORKSPACE_INVOICES_COMPANY_WEBSITE_FORM: 'workspaceInvoicesCompanyWebsiteForm',
+        WORKSPACE_INVOICES_COMPANY_WEBSITE_FORM_DRAFT: 'workspaceInvoicesCompanyWebsiteFormDraft',
         NEW_CHAT_NAME_FORM: 'newChatNameForm',
         NEW_CHAT_NAME_FORM_DRAFT: 'newChatNameFormDraft',
+        SUBSCRIPTION_SIZE_FORM: 'subscriptionSizeForm',
+        SUBSCRIPTION_SIZE_FORM_DRAFT: 'subscriptionSizeFormDraft',
+        ISSUE_NEW_EXPENSIFY_CARD_FORM: 'issueNewExpensifyCard',
+        ISSUE_NEW_EXPENSIFY_CARD_FORM_DRAFT: 'issueNewExpensifyCardDraft',
+        EDIT_EXPENSIFY_CARD_NAME_FORM: 'editExpensifyCardName',
+        EDIT_EXPENSIFY_CARD_NAME_DRAFT_FORM: 'editExpensifyCardNameDraft',
+        EDIT_EXPENSIFY_CARD_LIMIT_FORM: 'editExpensifyCardLimit',
+        EDIT_EXPENSIFY_CARD_LIMIT_DRAFT_FORM: 'editExpensifyCardLimitDraft',
+        SAGE_INTACCT_CREDENTIALS_FORM: 'sageIntacctCredentialsForm',
+        SAGE_INTACCT_CREDENTIALS_FORM_DRAFT: 'sageIntacctCredentialsFormDraft',
+        NETSUITE_CUSTOM_FIELD_FORM: 'netSuiteCustomFieldForm',
+        NETSUITE_CUSTOM_FIELD_FORM_DRAFT: 'netSuiteCustomFieldFormDraft',
+        NETSUITE_CUSTOM_SEGMENT_ADD_FORM: 'netSuiteCustomSegmentAddForm',
+        NETSUITE_CUSTOM_SEGMENT_ADD_FORM_DRAFT: 'netSuiteCustomSegmentAddFormDraft',
+        NETSUITE_CUSTOM_LIST_ADD_FORM: 'netSuiteCustomListAddForm',
+        NETSUITE_CUSTOM_LIST_ADD_FORM_DRAFT: 'netSuiteCustomListAddFormDraft',
+        NETSUITE_TOKEN_INPUT_FORM: 'netsuiteTokenInputForm',
+        NETSUITE_TOKEN_INPUT_FORM_DRAFT: 'netsuiteTokenInputFormDraft',
+        NETSUITE_CUSTOM_FORM_ID_FORM: 'netsuiteCustomFormIDForm',
+        NETSUITE_CUSTOM_FORM_ID_FORM_DRAFT: 'netsuiteCustomFormIDFormDraft',
+        SAGE_INTACCT_DIMENSION_TYPE_FORM: 'sageIntacctDimensionTypeForm',
+        SAGE_INTACCT_DIMENSION_TYPE_FORM_DRAFT: 'sageIntacctDimensionTypeFormDraft',
+        SEARCH_ADVANCED_FILTERS_FORM: 'searchAdvancedFiltersForm',
+        SEARCH_ADVANCED_FILTERS_FORM_DRAFT: 'searchAdvancedFiltersFormDraft',
+        TEXT_PICKER_MODAL_FORM: 'textPickerModalForm',
+        TEXT_PICKER_MODAL_FORM_DRAFT: 'textPickerModalFormDraft',
+        RULES_REQUIRED_RECEIPT_AMOUNT_FORM: 'rulesRequiredReceiptAmountForm',
+        RULES_REQUIRED_RECEIPT_AMOUNT_FORM_DRAFT: 'rulesRequiredReceiptAmountFormDraft',
+        RULES_MAX_EXPENSE_AMOUNT_FORM: 'rulesMaxExpenseAmountForm',
+        RULES_MAX_EXPENSE_AMOUNT_FORM_DRAFT: 'rulesMaxExpenseAmountFormDraft',
+        RULES_MAX_EXPENSE_AGE_FORM: 'rulesMaxExpenseAgeForm',
+        RULES_MAX_EXPENSE_AGE_FORM_DRAFT: 'rulesMaxExpenseAgeFormDraft',
     },
 } as const;
 
 type AllOnyxKeys = DeepValueOf<typeof ONYXKEYS>;
 
 type OnyxFormValuesMapping = {
-    [ONYXKEYS.FORMS.ADD_DEBIT_CARD_FORM]: FormTypes.AddDebitCardForm;
+    [ONYXKEYS.FORMS.ADD_PAYMENT_CARD_FORM]: FormTypes.AddPaymentCardForm;
     [ONYXKEYS.FORMS.WORKSPACE_SETTINGS_FORM]: FormTypes.WorkspaceSettingsForm;
     [ONYXKEYS.FORMS.WORKSPACE_CATEGORY_FORM]: FormTypes.WorkspaceCategoryForm;
     [ONYXKEYS.FORMS.WORKSPACE_TAG_FORM]: FormTypes.WorkspaceTagForm;
     [ONYXKEYS.FORMS.WORKSPACE_RATE_AND_UNIT_FORM]: FormTypes.WorkspaceRateAndUnitForm;
     [ONYXKEYS.FORMS.WORKSPACE_TAX_CUSTOM_NAME]: FormTypes.WorkspaceTaxCustomName;
+    [ONYXKEYS.FORMS.WORKSPACE_REPORT_FIELDS_FORM]: FormTypes.WorkspaceReportFieldForm;
     [ONYXKEYS.FORMS.CLOSE_ACCOUNT_FORM]: FormTypes.CloseAccountForm;
     [ONYXKEYS.FORMS.PROFILE_SETTINGS_FORM]: FormTypes.ProfileSettingsForm;
     [ONYXKEYS.FORMS.DISPLAY_NAME_FORM]: FormTypes.DisplayNameForm;
@@ -497,6 +666,8 @@ type OnyxFormValuesMapping = {
     [ONYXKEYS.FORMS.ROOM_SETTINGS_FORM]: FormTypes.RoomSettingsForm;
     [ONYXKEYS.FORMS.NEW_TASK_FORM]: FormTypes.NewTaskForm;
     [ONYXKEYS.FORMS.EDIT_TASK_FORM]: FormTypes.EditTaskForm;
+    [ONYXKEYS.FORMS.DISABLE_AUTO_RENEW_SURVEY_FORM]: FormTypes.FeedbackSurveyForm;
+    [ONYXKEYS.FORMS.REQUEST_EARLY_CANCELLATION_FORM]: FormTypes.FeedbackSurveyForm;
     [ONYXKEYS.FORMS.EXIT_SURVEY_REASON_FORM]: FormTypes.ExitSurveyReasonForm;
     [ONYXKEYS.FORMS.EXIT_SURVEY_RESPONSE_FORM]: FormTypes.ExitSurveyResponseForm;
     [ONYXKEYS.FORMS.MONEY_REQUEST_DESCRIPTION_FORM]: FormTypes.MoneyRequestDescriptionForm;
@@ -504,10 +675,12 @@ type OnyxFormValuesMapping = {
     [ONYXKEYS.FORMS.MONEY_REQUEST_AMOUNT_FORM]: FormTypes.MoneyRequestAmountForm;
     [ONYXKEYS.FORMS.MONEY_REQUEST_DATE_FORM]: FormTypes.MoneyRequestDateForm;
     [ONYXKEYS.FORMS.MONEY_REQUEST_HOLD_FORM]: FormTypes.MoneyRequestHoldReasonForm;
+    [ONYXKEYS.FORMS.MONEY_REQUEST_COMPANY_INFO_FORM]: FormTypes.MoneyRequestCompanyInfoForm;
     [ONYXKEYS.FORMS.NEW_CONTACT_METHOD_FORM]: FormTypes.NewContactMethodForm;
     [ONYXKEYS.FORMS.WAYPOINT_FORM]: FormTypes.WaypointForm;
     [ONYXKEYS.FORMS.SETTINGS_STATUS_SET_FORM]: FormTypes.SettingsStatusSetForm;
     [ONYXKEYS.FORMS.SETTINGS_STATUS_CLEAR_DATE_FORM]: FormTypes.SettingsStatusClearDateForm;
+    [ONYXKEYS.FORMS.CHANGE_BILLING_CURRENCY_FORM]: FormTypes.ChangeBillingCurrencyForm;
     [ONYXKEYS.FORMS.SETTINGS_STATUS_SET_CLEAR_AFTER_FORM]: FormTypes.SettingsStatusSetClearAfterForm;
     [ONYXKEYS.FORMS.PRIVATE_NOTES_FORM]: FormTypes.PrivateNotesForm;
     [ONYXKEYS.FORMS.I_KNOW_A_TEACHER_FORM]: FormTypes.IKnowTeacherForm;
@@ -515,7 +688,7 @@ type OnyxFormValuesMapping = {
     [ONYXKEYS.FORMS.REPORT_VIRTUAL_CARD_FRAUD]: FormTypes.ReportVirtualCardFraudForm;
     [ONYXKEYS.FORMS.REPORT_PHYSICAL_CARD_FORM]: FormTypes.ReportPhysicalCardForm;
     [ONYXKEYS.FORMS.GET_PHYSICAL_CARD_FORM]: FormTypes.GetPhysicalCardForm;
-    [ONYXKEYS.FORMS.REPORT_FIELD_EDIT_FORM]: FormTypes.ReportFieldEditForm;
+    [ONYXKEYS.FORMS.REPORT_FIELDS_EDIT_FORM]: FormTypes.ReportFieldsEditForm;
     [ONYXKEYS.FORMS.REIMBURSEMENT_ACCOUNT_FORM]: FormTypes.ReimbursementAccountForm;
     [ONYXKEYS.FORMS.PERSONAL_BANK_ACCOUNT_FORM]: FormTypes.PersonalBankAccountForm;
     [ONYXKEYS.FORMS.WORKSPACE_DESCRIPTION_FORM]: FormTypes.WorkspaceDescriptionForm;
@@ -524,9 +697,29 @@ type OnyxFormValuesMapping = {
     [ONYXKEYS.FORMS.WORKSPACE_NEW_TAX_FORM]: FormTypes.WorkspaceNewTaxForm;
     [ONYXKEYS.FORMS.POLICY_CREATE_DISTANCE_RATE_FORM]: FormTypes.PolicyCreateDistanceRateForm;
     [ONYXKEYS.FORMS.POLICY_DISTANCE_RATE_EDIT_FORM]: FormTypes.PolicyDistanceRateEditForm;
+    [ONYXKEYS.FORMS.POLICY_DISTANCE_RATE_TAX_RECLAIMABLE_ON_EDIT_FORM]: FormTypes.PolicyDistanceRateTaxReclaimableOnEditForm;
     [ONYXKEYS.FORMS.WORKSPACE_TAX_NAME_FORM]: FormTypes.WorkspaceTaxNameForm;
+    [ONYXKEYS.FORMS.WORKSPACE_TAX_CODE_FORM]: FormTypes.WorkspaceTaxCodeForm;
     [ONYXKEYS.FORMS.WORKSPACE_TAX_VALUE_FORM]: FormTypes.WorkspaceTaxValueForm;
+    [ONYXKEYS.FORMS.WORKSPACE_INVOICES_COMPANY_NAME_FORM]: FormTypes.WorkspaceInvoicesCompanyNameForm;
+    [ONYXKEYS.FORMS.WORKSPACE_INVOICES_COMPANY_WEBSITE_FORM]: FormTypes.WorkspaceInvoicesCompanyWebsiteForm;
     [ONYXKEYS.FORMS.NEW_CHAT_NAME_FORM]: FormTypes.NewChatNameForm;
+    [ONYXKEYS.FORMS.SUBSCRIPTION_SIZE_FORM]: FormTypes.SubscriptionSizeForm;
+    [ONYXKEYS.FORMS.ISSUE_NEW_EXPENSIFY_CARD_FORM]: FormTypes.IssueNewExpensifyCardForm;
+    [ONYXKEYS.FORMS.EDIT_EXPENSIFY_CARD_NAME_FORM]: FormTypes.EditExpensifyCardNameForm;
+    [ONYXKEYS.FORMS.EDIT_EXPENSIFY_CARD_LIMIT_FORM]: FormTypes.EditExpensifyCardLimitForm;
+    [ONYXKEYS.FORMS.SAGE_INTACCT_CREDENTIALS_FORM]: FormTypes.SageIntactCredentialsForm;
+    [ONYXKEYS.FORMS.NETSUITE_CUSTOM_FIELD_FORM]: FormTypes.NetSuiteCustomFieldForm;
+    [ONYXKEYS.FORMS.NETSUITE_CUSTOM_LIST_ADD_FORM]: FormTypes.NetSuiteCustomFieldForm;
+    [ONYXKEYS.FORMS.NETSUITE_CUSTOM_SEGMENT_ADD_FORM]: FormTypes.NetSuiteCustomFieldForm;
+    [ONYXKEYS.FORMS.NETSUITE_TOKEN_INPUT_FORM]: FormTypes.NetSuiteTokenInputForm;
+    [ONYXKEYS.FORMS.NETSUITE_CUSTOM_FORM_ID_FORM]: FormTypes.NetSuiteCustomFormIDForm;
+    [ONYXKEYS.FORMS.SAGE_INTACCT_DIMENSION_TYPE_FORM]: FormTypes.SageIntacctDimensionForm;
+    [ONYXKEYS.FORMS.SEARCH_ADVANCED_FILTERS_FORM]: FormTypes.SearchAdvancedFiltersForm;
+    [ONYXKEYS.FORMS.TEXT_PICKER_MODAL_FORM]: FormTypes.TextPickerModalForm;
+    [ONYXKEYS.FORMS.RULES_REQUIRED_RECEIPT_AMOUNT_FORM]: FormTypes.RulesRequiredReceiptAmountForm;
+    [ONYXKEYS.FORMS.RULES_MAX_EXPENSE_AMOUNT_FORM]: FormTypes.RulesMaxExpenseAmountForm;
+    [ONYXKEYS.FORMS.RULES_MAX_EXPENSE_AGE_FORM]: FormTypes.RulesMaxExpenseAgeForm;
 };
 
 type OnyxFormDraftValuesMapping = {
@@ -538,21 +731,26 @@ type OnyxCollectionValuesMapping = {
     [ONYXKEYS.COLLECTION.POLICY]: OnyxTypes.Policy;
     [ONYXKEYS.COLLECTION.POLICY_DRAFTS]: OnyxTypes.Policy;
     [ONYXKEYS.COLLECTION.POLICY_CATEGORIES]: OnyxTypes.PolicyCategories;
-    [ONYXKEYS.COLLECTION.POLICY_TAGS]: OnyxTypes.PolicyTagList;
+    [ONYXKEYS.COLLECTION.POLICY_CATEGORIES_DRAFT]: OnyxTypes.PolicyCategories;
+    [ONYXKEYS.COLLECTION.POLICY_TAGS]: OnyxTypes.PolicyTagLists;
     [ONYXKEYS.COLLECTION.POLICY_RECENTLY_USED_CATEGORIES]: OnyxTypes.RecentlyUsedCategories;
     [ONYXKEYS.COLLECTION.POLICY_HAS_CONNECTIONS_DATA_BEEN_FETCHED]: boolean;
     [ONYXKEYS.COLLECTION.DEPRECATED_POLICY_MEMBER_LIST]: OnyxTypes.PolicyEmployeeList;
     [ONYXKEYS.COLLECTION.WORKSPACE_INVITE_MEMBERS_DRAFT]: OnyxTypes.InvitedEmailsToAccountIDs;
     [ONYXKEYS.COLLECTION.WORKSPACE_INVITE_MESSAGE_DRAFT]: string;
     [ONYXKEYS.COLLECTION.REPORT]: OnyxTypes.Report;
+    [ONYXKEYS.COLLECTION.REPORT_NAME_VALUE_PAIRS]: OnyxTypes.ReportNameValuePairs;
+    [ONYXKEYS.COLLECTION.REPORT_DRAFT]: OnyxTypes.Report;
     [ONYXKEYS.COLLECTION.REPORT_METADATA]: OnyxTypes.ReportMetadata;
     [ONYXKEYS.COLLECTION.REPORT_ACTIONS]: OnyxTypes.ReportActions;
     [ONYXKEYS.COLLECTION.REPORT_ACTIONS_DRAFTS]: OnyxTypes.ReportActionsDrafts;
+    [ONYXKEYS.COLLECTION.REPORT_ACTIONS_PAGES]: OnyxTypes.Pages;
     [ONYXKEYS.COLLECTION.REPORT_ACTIONS_REACTIONS]: OnyxTypes.ReportActionReactions;
     [ONYXKEYS.COLLECTION.REPORT_DRAFT_COMMENT]: string;
     [ONYXKEYS.COLLECTION.REPORT_IS_COMPOSER_FULL_SIZE]: boolean;
     [ONYXKEYS.COLLECTION.REPORT_USER_IS_TYPING]: OnyxTypes.ReportUserIsTyping;
     [ONYXKEYS.COLLECTION.REPORT_USER_IS_LEAVING_ROOM]: boolean;
+    [ONYXKEYS.COLLECTION.REPORT_VIOLATIONS]: OnyxTypes.ReportViolations;
     [ONYXKEYS.COLLECTION.SECURITY_GROUP]: OnyxTypes.SecurityGroup;
     [ONYXKEYS.COLLECTION.TRANSACTION]: OnyxTypes.Transaction;
     [ONYXKEYS.COLLECTION.TRANSACTION_DRAFT]: OnyxTypes.Transaction;
@@ -568,13 +766,26 @@ type OnyxCollectionValuesMapping = {
     [ONYXKEYS.COLLECTION.POLICY_JOIN_MEMBER]: OnyxTypes.PolicyJoinMember;
     [ONYXKEYS.COLLECTION.POLICY_CONNECTION_SYNC_PROGRESS]: OnyxTypes.PolicyConnectionSyncProgress;
     [ONYXKEYS.COLLECTION.SNAPSHOT]: OnyxTypes.SearchResults;
+    [ONYXKEYS.COLLECTION.SHARED_NVP_PRIVATE_USER_BILLING_GRACE_PERIOD_END]: OnyxTypes.BillingGraceEndPeriod;
+    [ONYXKEYS.COLLECTION.SHARED_NVP_PRIVATE_DOMAIN_MEMBER]: OnyxTypes.CardFeeds;
+    [ONYXKEYS.COLLECTION.PRIVATE_EXPENSIFY_CARD_SETTINGS]: OnyxTypes.ExpensifyCardSettings;
+    [ONYXKEYS.COLLECTION.WORKSPACE_CARDS_LIST]: OnyxTypes.WorkspaceCardsList;
+    [ONYXKEYS.COLLECTION.EXPENSIFY_CARD_CONTINUOUS_RECONCILIATION_CONNECTION]: OnyxTypes.PolicyConnectionName;
+    [ONYXKEYS.COLLECTION.EXPENSIFY_CARD_USE_CONTINUOUS_RECONCILIATION]: boolean;
+    [ONYXKEYS.COLLECTION.LAST_SELECTED_FEED]: string;
 };
 
 type OnyxValuesMapping = {
     [ONYXKEYS.ACCOUNT]: OnyxTypes.Account;
     [ONYXKEYS.ACCOUNT_MANAGER_REPORT_ID]: string;
     [ONYXKEYS.NVP_IS_FIRST_TIME_NEW_EXPENSIFY_USER]: boolean;
+
+    // NVP_ONBOARDING is an array for old users.
     [ONYXKEYS.NVP_ONBOARDING]: Onboarding | [];
+
+    // ONYXKEYS.NVP_TRYNEWDOT is HybridApp onboarding data
+    [ONYXKEYS.NVP_TRYNEWDOT]: OnyxTypes.TryNewDot;
+
     [ONYXKEYS.ACTIVE_CLIENTS]: string[];
     [ONYXKEYS.DEVICE_ID]: string;
     [ONYXKEYS.IS_SIDEBAR_LOADED]: boolean;
@@ -601,19 +812,24 @@ type OnyxValuesMapping = {
     [ONYXKEYS.USER_LOCATION]: OnyxTypes.UserLocation;
     [ONYXKEYS.LOGIN_LIST]: OnyxTypes.LoginList;
     [ONYXKEYS.SESSION]: OnyxTypes.Session;
+    [ONYXKEYS.USER_METADATA]: OnyxTypes.UserMetadata;
     [ONYXKEYS.STASHED_SESSION]: OnyxTypes.Session;
     [ONYXKEYS.BETAS]: OnyxTypes.Beta[];
     [ONYXKEYS.NVP_PRIORITY_MODE]: ValueOf<typeof CONST.PRIORITY_MODE>;
     [ONYXKEYS.NVP_BLOCKED_FROM_CONCIERGE]: OnyxTypes.BlockedFromConcierge;
+
+    // The value of this nvp is a string representation of the date when the block expires, or an empty string if the user is not blocked
+    [ONYXKEYS.NVP_BLOCKED_FROM_CHAT]: string;
     [ONYXKEYS.NVP_PRIVATE_PUSH_NOTIFICATION_ID]: string;
     [ONYXKEYS.NVP_TRY_FOCUS_MODE]: boolean;
-    [ONYXKEYS.NVP_HOLD_USE_EXPLAINED]: boolean;
+    [ONYXKEYS.NVP_DISMISSED_HOLD_USE_EXPLANATION]: boolean;
     [ONYXKEYS.FOCUS_MODE_NOTIFICATION]: boolean;
     [ONYXKEYS.NVP_LAST_PAYMENT_METHOD]: OnyxTypes.LastPaymentMethod;
+    [ONYXKEYS.LAST_EXPORT_METHOD]: OnyxTypes.LastExportMethod;
     [ONYXKEYS.NVP_RECENT_WAYPOINTS]: OnyxTypes.RecentWaypoint[];
-    [ONYXKEYS.NVP_HAS_DISMISSED_IDLE_PANEL]: boolean;
     [ONYXKEYS.NVP_INTRO_SELECTED]: OnyxTypes.IntroSelected;
     [ONYXKEYS.NVP_LAST_SELECTED_DISTANCE_RATES]: OnyxTypes.LastSelectedDistanceRates;
+    [ONYXKEYS.NVP_SEEN_NEW_USER_MODAL]: boolean;
     [ONYXKEYS.PUSH_NOTIFICATIONS_ENABLED]: boolean;
     [ONYXKEYS.PLAID_DATA]: OnyxTypes.PlaidData;
     [ONYXKEYS.IS_PLAID_DISABLED]: boolean;
@@ -624,6 +840,10 @@ type OnyxValuesMapping = {
     [ONYXKEYS.NVP_ACTIVE_POLICY_ID]: string;
     [ONYXKEYS.NVP_DISMISSED_REFERRAL_BANNERS]: OnyxTypes.DismissedReferralBanners;
     [ONYXKEYS.NVP_HAS_SEEN_TRACK_TRAINING]: boolean;
+    [ONYXKEYS.NVP_PRIVATE_SUBSCRIPTION]: OnyxTypes.PrivateSubscription;
+    [ONYXKEYS.NVP_PRIVATE_STRIPE_CUSTOMER_ID]: OnyxTypes.StripeCustomerID;
+    [ONYXKEYS.NVP_PRIVATE_BILLING_DISPUTE_PENDING]: number;
+    [ONYXKEYS.NVP_PRIVATE_BILLING_STATUS]: OnyxTypes.BillingStatus;
     [ONYXKEYS.USER_WALLET]: OnyxTypes.UserWallet;
     [ONYXKEYS.WALLET_ONFIDO]: OnyxTypes.WalletOnfido;
     [ONYXKEYS.WALLET_ADDITIONAL_DETAILS]: OnyxTypes.WalletAdditionalDetails;
@@ -650,6 +870,7 @@ type OnyxValuesMapping = {
     [ONYXKEYS.IS_CHECKING_PUBLIC_ROOM]: boolean;
     [ONYXKEYS.MY_DOMAIN_SECURITY_GROUPS]: Record<string, string>;
     [ONYXKEYS.LAST_OPENED_PUBLIC_ROOM_ID]: string;
+    [ONYXKEYS.VERIFY_3DS_SUBSCRIPTION]: string;
     [ONYXKEYS.PREFERRED_THEME]: ValueOf<typeof CONST.THEME>;
     [ONYXKEYS.MAPBOX_ACCESS_TOKEN]: OnyxTypes.MapboxAccessToken;
     [ONYXKEYS.ONYX_UPDATES_FROM_SERVER]: OnyxTypes.OnyxUpdatesFromServer;
@@ -658,18 +879,39 @@ type OnyxValuesMapping = {
     [ONYXKEYS.MAX_CANVAS_HEIGHT]: number;
     [ONYXKEYS.MAX_CANVAS_WIDTH]: number;
     [ONYXKEYS.ONBOARDING_PURPOSE_SELECTED]: string;
+    [ONYXKEYS.ONBOARDING_ERROR_MESSAGE]: string;
+    [ONYXKEYS.ONBOARDING_POLICY_ID]: string;
     [ONYXKEYS.ONBOARDING_ADMINS_CHAT_REPORT_ID]: string;
     [ONYXKEYS.IS_SEARCHING_FOR_REPORTS]: boolean;
     [ONYXKEYS.LAST_VISITED_PATH]: string | undefined;
+    [ONYXKEYS.VERIFY_3DS_SUBSCRIPTION]: string;
     [ONYXKEYS.RECENTLY_USED_REPORT_FIELDS]: OnyxTypes.RecentlyUsedReportFields;
     [ONYXKEYS.UPDATE_REQUIRED]: boolean;
     [ONYXKEYS.RESET_REQUIRED]: boolean;
     [ONYXKEYS.PLAID_CURRENT_EVENT]: string;
+    [ONYXKEYS.NVP_PRIVATE_TAX_EXEMPT]: boolean;
     [ONYXKEYS.LOGS]: OnyxTypes.CapturedLogs;
     [ONYXKEYS.SHOULD_STORE_LOGS]: boolean;
+    [ONYXKEYS.SHOULD_MASK_ONYX_STATE]: boolean;
     [ONYXKEYS.CACHED_PDF_PATHS]: Record<string, string>;
     [ONYXKEYS.POLICY_OWNERSHIP_CHANGE_CHECKS]: Record<string, OnyxTypes.PolicyOwnershipChangeChecks>;
     [ONYXKEYS.NVP_QUICK_ACTION_GLOBAL_CREATE]: OnyxTypes.QuickAction;
+    [ONYXKEYS.SUBSCRIPTION_RETRY_BILLING_STATUS_FAILED]: boolean;
+    [ONYXKEYS.SUBSCRIPTION_RETRY_BILLING_STATUS_SUCCESSFUL]: boolean;
+    [ONYXKEYS.SUBSCRIPTION_RETRY_BILLING_STATUS_PENDING]: boolean;
+    [ONYXKEYS.NVP_TRAVEL_SETTINGS]: OnyxTypes.TravelSettings;
+    [ONYXKEYS.REVIEW_DUPLICATES]: OnyxTypes.ReviewDuplicates;
+    [ONYXKEYS.ISSUE_NEW_EXPENSIFY_CARD]: OnyxTypes.IssueNewCard;
+    [ONYXKEYS.MOBILE_SELECTION_MODE]: OnyxTypes.MobileSelectionMode;
+    [ONYXKEYS.NVP_FIRST_DAY_FREE_TRIAL]: string;
+    [ONYXKEYS.NVP_LAST_DAY_FREE_TRIAL]: string;
+    [ONYXKEYS.NVP_BILLING_FUND_ID]: number;
+    [ONYXKEYS.NVP_PRIVATE_AMOUNT_OWED]: number;
+    [ONYXKEYS.NVP_PRIVATE_OWNER_BILLING_GRACE_PERIOD_END]: number;
+    [ONYXKEYS.NVP_WORKSPACE_TOOLTIP]: OnyxTypes.WorkspaceTooltip;
+    [ONYXKEYS.NVP_PRIVATE_CANCELLATION_DETAILS]: OnyxTypes.CancellationDetails[];
+    [ONYXKEYS.APPROVAL_WORKFLOW]: OnyxTypes.ApprovalWorkflowOnyx;
+    [ONYXKEYS.LAST_ROUTE]: string;
 };
 
 type OnyxValues = OnyxValuesMapping & OnyxCollectionValuesMapping & OnyxFormValuesMapping & OnyxFormDraftValuesMapping;
@@ -680,6 +922,7 @@ type OnyxFormDraftKey = keyof OnyxFormDraftValuesMapping;
 type OnyxValueKey = keyof OnyxValuesMapping;
 
 type OnyxKey = OnyxValueKey | OnyxCollectionKey | OnyxFormKey | OnyxFormDraftKey;
+type OnyxPagesKey = typeof ONYXKEYS.COLLECTION.REPORT_ACTIONS_PAGES;
 
 type MissingOnyxKeysError = `Error: Types don't match, OnyxKey type is missing: ${Exclude<AllOnyxKeys, OnyxKey>}`;
 /** If this type errors, it means that the `OnyxKey` type is missing some keys. */
@@ -687,4 +930,4 @@ type MissingOnyxKeysError = `Error: Types don't match, OnyxKey type is missing:
 type AssertOnyxKeys = AssertTypesEqual<AllOnyxKeys, OnyxKey, MissingOnyxKeysError>;
 
 export default ONYXKEYS;
-export type {OnyxCollectionKey, OnyxCollectionValuesMapping, OnyxFormDraftKey, OnyxFormKey, OnyxFormValuesMapping, OnyxKey, OnyxValueKey, OnyxValues};
+export type {OnyxCollectionKey, OnyxCollectionValuesMapping, OnyxFormDraftKey, OnyxFormKey, OnyxFormValuesMapping, OnyxKey, OnyxPagesKey, OnyxValueKey, OnyxValues};
diff --git a/src/ROUTES.ts b/src/ROUTES.ts
index a9fcf8cf9c20..97a86d272530 100644
--- a/src/ROUTES.ts
+++ b/src/ROUTES.ts
@@ -1,7 +1,9 @@
-import type {ValueOf} from 'type-fest';
+import type {TupleToUnion, ValueOf} from 'type-fest';
+import type {SearchQueryString} from './components/Search/types';
 import type CONST from './CONST';
 import type {IOUAction, IOUType} from './CONST';
 import type {IOURequestType} from './libs/actions/IOU';
+import type {ConnectionName, SageIntacctMappingName} from './types/onyx/Policy';
 import type AssertTypesNotEqual from './types/utils/AssertTypesNotEqual';
 
 // This is a file containing constants for all the routes we want to be able to go to
@@ -14,57 +16,76 @@ function getUrlWithBackToParam<TUrl extends string>(url: TUrl, backTo?: string):
     return `${url}${backToParam}` as const;
 }
 
-const ROUTES = {
+const PUBLIC_SCREENS_ROUTES = {
     // If the user opens this route, we'll redirect them to the path saved in the last visited path or to the home page if the last visited path is empty.
     ROOT: '',
+    TRANSITION_BETWEEN_APPS: 'transition',
+    CONNECTION_COMPLETE: 'connection-complete',
+    VALIDATE_LOGIN: 'v/:accountID/:validateCode',
+    UNLINK_LOGIN: 'u/:accountID/:validateCode',
+    APPLE_SIGN_IN: 'sign-in-with-apple',
+    GOOGLE_SIGN_IN: 'sign-in-with-google',
+    SAML_SIGN_IN: 'sign-in-with-saml',
+} as const;
 
+const ROUTES = {
+    ...PUBLIC_SCREENS_ROUTES,
     // This route renders the list of reports.
     HOME: 'home',
 
-    ALL_SETTINGS: 'all-settings',
-
-    SEARCH: {
-        route: '/search/:query',
-        getRoute: (query: string) => `search/${query}` as const,
-    },
+    SEARCH_CENTRAL_PANE: {
+        route: 'search',
+        getRoute: ({query, isCustomQuery = false}: {query: SearchQueryString; isCustomQuery?: boolean}) => `search?q=${query}&isCustomQuery=${isCustomQuery}` as const,
+    },
+    SEARCH_ADVANCED_FILTERS: 'search/filters',
+    SEARCH_ADVANCED_FILTERS_DATE: 'search/filters/date',
+    SEARCH_ADVANCED_FILTERS_CURRENCY: 'search/filters/currency',
+    SEARCH_ADVANCED_FILTERS_MERCHANT: 'search/filters/merchant',
+    SEARCH_ADVANCED_FILTERS_DESCRIPTION: 'search/filters/description',
+    SEARCH_ADVANCED_FILTERS_REPORT_ID: 'search/filters/reportID',
+    SEARCH_ADVANCED_FILTERS_AMOUNT: 'search/filters/amount',
+    SEARCH_ADVANCED_FILTERS_CATEGORY: 'search/filters/category',
+    SEARCH_ADVANCED_FILTERS_KEYWORD: 'search/filters/keyword',
+    SEARCH_ADVANCED_FILTERS_CARD: 'search/filters/card',
+    SEARCH_ADVANCED_FILTERS_TAX_RATE: 'search/filters/taxRate',
+    SEARCH_ADVANCED_FILTERS_EXPENSE_TYPE: 'search/filters/expenseType',
+    SEARCH_ADVANCED_FILTERS_TAG: 'search/filters/tag',
+    SEARCH_ADVANCED_FILTERS_FROM: 'search/filters/from',
+    SEARCH_ADVANCED_FILTERS_TO: 'search/filters/to',
 
     SEARCH_REPORT: {
-        route: '/search/:query/view/:reportID',
-        getRoute: (query: string, reportID: string) => `search/${query}/view/${reportID}` as const,
+        route: 'search/view/:reportID',
+        getRoute: (reportID: string) => `search/view/${reportID}` as const,
     },
+    TRANSACTION_HOLD_REASON_RHP: 'search/hold',
 
     // 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',
+    TRACK_EXPENSE: 'track-expense',
+    SUBMIT_EXPENSE: 'submit-expense',
     FLAG_COMMENT: {
         route: 'flag/:reportID/:reportActionID',
         getRoute: (reportID: string, reportActionID: string) => `flag/${reportID}/${reportActionID}` as const,
     },
     CHAT_FINDER: 'chat-finder',
-    DETAILS: {
-        route: 'details',
-        getRoute: (login: string) => `details?login=${encodeURIComponent(login)}` as const,
-    },
     PROFILE: {
         route: 'a/:accountID',
-        getRoute: (accountID: string | number, backTo?: string) => getUrlWithBackToParam(`a/${accountID}`, backTo),
+        getRoute: (accountID?: string | number, backTo?: string, login?: string) => {
+            const baseRoute = getUrlWithBackToParam(`a/${accountID}`, backTo);
+            const loginParam = login ? `?login=${encodeURIComponent(login)}` : '';
+            return `${baseRoute}${loginParam}` as const;
+        },
     },
     PROFILE_AVATAR: {
         route: 'a/:accountID/avatar',
         getRoute: (accountID: string | number) => `a/${accountID}/avatar` as const,
     },
 
-    TRANSITION_BETWEEN_APPS: 'transition',
-    VALIDATE_LOGIN: 'v/:accountID/:validateCode',
-    CONNECTION_COMPLETE: 'connection-complete',
     GET_ASSISTANCE: {
         route: 'get-assistance/:taskID',
         getRoute: (taskID: string, backTo: string) => getUrlWithBackToParam(`get-assistance/${taskID}`, backTo),
     },
-    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',
-    SAML_SIGN_IN: 'sign-in-with-saml',
 
     // 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.
@@ -82,12 +103,23 @@ const ROUTES = {
     WORKSPACE_SWITCHER: 'workspace-switcher',
     SETTINGS: 'settings',
     SETTINGS_PROFILE: 'settings/profile',
+    SETTINGS_CHANGE_CURRENCY: 'settings/add-payment-card/change-currency',
     SETTINGS_SHARE_CODE: 'settings/shareCode',
     SETTINGS_DISPLAY_NAME: 'settings/profile/display-name',
     SETTINGS_TIMEZONE: 'settings/profile/timezone',
     SETTINGS_TIMEZONE_SELECT: 'settings/profile/timezone/select',
     SETTINGS_PRONOUNS: 'settings/profile/pronouns',
     SETTINGS_PREFERENCES: 'settings/preferences',
+    SETTINGS_SUBSCRIPTION: 'settings/subscription',
+    SETTINGS_SUBSCRIPTION_SIZE: {
+        route: 'settings/subscription/subscription-size',
+        getRoute: (canChangeSize: 0 | 1) => `settings/subscription/subscription-size?canChangeSize=${canChangeSize}` as const,
+    },
+    SETTINGS_SUBSCRIPTION_ADD_PAYMENT_CARD: 'settings/subscription/add-payment-card',
+    SETTINGS_SUBSCRIPTION_CHANGE_BILLING_CURRENCY: 'settings/subscription/change-billing-currency',
+    SETTINGS_SUBSCRIPTION_CHANGE_PAYMENT_CURRENCY: 'settings/subscription/add-payment-card/change-payment-currency',
+    SETTINGS_SUBSCRIPTION_DISABLE_AUTO_RENEW_SURVEY: 'settings/subscription/disable-auto-renew-survey',
+    SETTINGS_SUBSCRIPTION_REQUEST_EARLY_CANCELLATION: 'settings/subscription/request-early-cancellation-survey',
     SETTINGS_PRIORITY_MODE: 'settings/preferences/priority-mode',
     SETTINGS_LANGUAGE: 'settings/preferences/language',
     SETTINGS_THEME: 'settings/preferences/theme',
@@ -123,9 +155,7 @@ const ROUTES = {
     },
     SETTINGS_ADD_DEBIT_CARD: 'settings/wallet/add-debit-card',
     SETTINGS_ADD_BANK_ACCOUNT: 'settings/wallet/add-bank-account',
-    SETTINGS_ADD_BANK_ACCOUNT_REFACTOR: 'settings/wallet/add-bank-account-refactor',
     SETTINGS_ENABLE_PAYMENTS: 'settings/wallet/enable-payments',
-    SETTINGS_ENABLE_PAYMENTS_REFACTOR: 'settings/wallet/enable-payments-refactor',
     SETTINGS_WALLET_CARD_DIGITAL_DETAILS_UPDATE_ADDRESS: {
         route: 'settings/wallet/card/:domain/digital-details/update-address',
         getRoute: (domain: string) => `settings/wallet/card/${domain}/digital-details/update-address` as const,
@@ -163,7 +193,7 @@ const ROUTES = {
     },
     SETTINGS_CONTACT_METHOD_DETAILS: {
         route: 'settings/profile/contact-methods/:contactMethod/details',
-        getRoute: (contactMethod: string) => `settings/profile/contact-methods/${encodeURIComponent(contactMethod)}/details` as const,
+        getRoute: (contactMethod: string, backTo?: string) => getUrlWithBackToParam(`settings/profile/contact-methods/${encodeURIComponent(contactMethod)}/details`, backTo),
     },
     SETTINGS_NEW_CONTACT_METHOD: {
         route: 'settings/profile/contact-methods/new',
@@ -171,7 +201,8 @@ const ROUTES = {
     },
     SETTINGS_2FA: {
         route: 'settings/security/two-factor-auth',
-        getRoute: (backTo?: string) => getUrlWithBackToParam('settings/security/two-factor-auth', backTo),
+        getRoute: (backTo?: string, forwardTo?: string) =>
+            getUrlWithBackToParam(forwardTo ? `settings/security/two-factor-auth?forwardTo=${encodeURIComponent(forwardTo)}` : 'settings/security/two-factor-auth', backTo),
     },
     SETTINGS_STATUS: 'settings/profile/status',
 
@@ -179,7 +210,10 @@ const ROUTES = {
     SETTINGS_STATUS_CLEAR_AFTER_DATE: 'settings/profile/status/clear-after/date',
     SETTINGS_STATUS_CLEAR_AFTER_TIME: 'settings/profile/status/clear-after/time',
     SETTINGS_TROUBLESHOOT: 'settings/troubleshoot',
-    SETTINGS_CONSOLE: 'settings/troubleshoot/console',
+    SETTINGS_CONSOLE: {
+        route: 'settings/troubleshoot/console',
+        getRoute: (backTo?: string) => getUrlWithBackToParam(`settings/troubleshoot/console`, backTo),
+    },
     SETTINGS_SHARE_LOG: {
         route: 'settings/troubleshoot/console/share-log',
         getRoute: (source: string) => `settings/troubleshoot/console/share-log?source=${encodeURI(source)}` as const,
@@ -209,11 +243,20 @@ const ROUTES = {
     REPORT: 'r',
     REPORT_WITH_ID: {
         route: 'r/:reportID?/:reportActionID?',
-        getRoute: (reportID: string, reportActionID?: string) => (reportActionID ? (`r/${reportID}/${reportActionID}` as const) : (`r/${reportID}` as const)),
+        getRoute: (reportID: string, reportActionID?: string, referrer?: string) => {
+            const baseRoute = reportActionID ? (`r/${reportID}/${reportActionID}` as const) : (`r/${reportID}` as const);
+            const referrerParam = referrer ? `?referrer=${encodeURIComponent(referrer)}` : '';
+            return `${baseRoute}${referrerParam}` as const;
+        },
     },
     REPORT_AVATAR: {
         route: 'r/:reportID/avatar',
-        getRoute: (reportID: string) => `r/${reportID}/avatar` as const,
+        getRoute: (reportID: string, policyID?: string) => {
+            if (policyID) {
+                return `r/${reportID}/avatar?policyID=${policyID}` as const;
+            }
+            return `r/${reportID}/avatar` as const;
+        },
     },
     EDIT_CURRENCY_REQUEST: {
         route: 'r/:threadReportID/edit/currency',
@@ -227,9 +270,10 @@ const ROUTES = {
         route: 'r/:reportID/details/shareCode',
         getRoute: (reportID: string) => `r/${reportID}/details/shareCode` as const,
     },
-    REPORT_ATTACHMENTS: {
-        route: 'r/:reportID/attachment',
-        getRoute: (reportID: string, source: string) => `r/${reportID}/attachment?source=${encodeURIComponent(source)}` as const,
+    ATTACHMENTS: {
+        route: 'attachment',
+        getRoute: (reportID: string, type: ValueOf<typeof CONST.ATTACHMENT_TYPE>, url: string, accountID?: number) =>
+            `attachment?source=${encodeURIComponent(url)}&type=${type}${reportID ? `&reportID=${reportID}` : ''}${accountID ? `&accountID=${accountID}` : ''}` as const,
     },
     REPORT_PARTICIPANTS: {
         route: 'r/:reportID/participants',
@@ -251,17 +295,17 @@ const ROUTES = {
         route: 'r/:reportID/details',
         getRoute: (reportID: string, backTo?: string) => getUrlWithBackToParam(`r/${reportID}/details`, backTo),
     },
+    REPORT_WITH_ID_DETAILS_EXPORT: {
+        route: 'r/:reportID/details/export/:connectionName',
+        getRoute: (reportID: string, connectionName: ConnectionName) => `r/${reportID}/details/export/${connectionName}` as const,
+    },
     REPORT_SETTINGS: {
         route: 'r/:reportID/settings',
         getRoute: (reportID: string) => `r/${reportID}/settings` as const,
     },
-    REPORT_SETTINGS_ROOM_NAME: {
-        route: 'r/:reportID/settings/room-name',
-        getRoute: (reportID: string) => `r/${reportID}/settings/room-name` as const,
-    },
-    REPORT_SETTINGS_GROUP_NAME: {
-        route: 'r/:reportID/settings/group-name',
-        getRoute: (reportID: string) => `r/${reportID}/settings/group-name` as const,
+    REPORT_SETTINGS_NAME: {
+        route: 'r/:reportID/settings/name',
+        getRoute: (reportID: string) => `r/${reportID}/settings/name` as const,
     },
     REPORT_SETTINGS_NOTIFICATION_PREFERENCES: {
         route: 'r/:reportID/settings/notification-preferences',
@@ -305,7 +349,7 @@ const ROUTES = {
     },
     ROOM_INVITE: {
         route: 'r/:reportID/invite/:role?',
-        getRoute: (reportID: string, role?: string) => `r/${reportID}/invite/${role}` as const,
+        getRoute: (reportID: string, role?: string) => `r/${reportID}/invite/${role ?? ''}` as const,
     },
     MONEY_REQUEST_HOLD_REASON: {
         route: ':type/edit/reason/:transactionID?',
@@ -321,10 +365,15 @@ const ROUTES = {
         getRoute: (iouType: ValueOf<typeof CONST.IOU.TYPE>, transactionID: string, reportID: string, backTo = '') =>
             getUrlWithBackToParam(`create/${iouType as string}/from/${transactionID}/${reportID}`, backTo),
     },
+    MONEY_REQUEST_STEP_COMPANY_INFO: {
+        route: 'create/:iouType/company-info/:transactionID/:reportID',
+        getRoute: (iouType: ValueOf<typeof CONST.IOU.TYPE>, transactionID: string, reportID: string, backTo = '') =>
+            getUrlWithBackToParam(`create/${iouType as string}/company-info/${transactionID}/${reportID}`, backTo),
+    },
     MONEY_REQUEST_STEP_CONFIRMATION: {
         route: ':action/:iouType/confirmation/:transactionID/:reportID',
-        getRoute: (action: IOUAction, iouType: IOUType, transactionID: string, reportID: string) =>
-            `${action as string}/${iouType as string}/confirmation/${transactionID}/${reportID}` as const,
+        getRoute: (action: IOUAction, iouType: IOUType, transactionID: string, reportID: string, participantsAutoAssigned?: boolean) =>
+            `${action as string}/${iouType as string}/confirmation/${transactionID}/${reportID}${participantsAutoAssigned ? '?participantsAutoAssigned=true' : ''}` as const,
     },
     MONEY_REQUEST_STEP_AMOUNT: {
         route: ':action/:iouType/amount/:transactionID/:reportID',
@@ -346,6 +395,27 @@ const ROUTES = {
         getRoute: (action: IOUAction, iouType: IOUType, transactionID: string, reportID: string, backTo = '', reportActionID?: string) =>
             getUrlWithBackToParam(`${action as string}/${iouType as string}/category/${transactionID}/${reportID}${reportActionID ? `/${reportActionID}` : ''}`, backTo),
     },
+    SETTINGS_CATEGORIES_ROOT: {
+        route: 'settings/:policyID/categories',
+        getRoute: (policyID: string, backTo = '') => getUrlWithBackToParam(`settings/${policyID}/categories`, backTo),
+    },
+    SETTINGS_CATEGORY_SETTINGS: {
+        route: 'settings/:policyID/categories/:categoryName',
+        getRoute: (policyID: string, categoryName: string, backTo = '') => getUrlWithBackToParam(`settings/${policyID}/categories/${encodeURIComponent(categoryName)}`, backTo),
+    },
+    SETTINGS_CATEGORIES_SETTINGS: {
+        route: 'settings/:policyID/categories/settings',
+        getRoute: (policyID: string, backTo = '') => getUrlWithBackToParam(`settings/${policyID}/categories/settings`, backTo),
+    },
+    SETTINGS_CATEGORY_CREATE: {
+        route: 'settings/:policyID/categories/new',
+        getRoute: (policyID: string, backTo = '') => getUrlWithBackToParam(`settings/${policyID}/categories/new`, backTo),
+    },
+    SETTINGS_CATEGORY_EDIT: {
+        route: 'settings/:policyID/categories/:categoryName/edit',
+        getRoute: (policyID: string, categoryName: string, backTo = '') =>
+            getUrlWithBackToParam(`settings/workspaces/${policyID}/categories/${encodeURIComponent(categoryName)}/edit`, backTo),
+    },
     MONEY_REQUEST_STEP_CURRENCY: {
         route: ':action/:iouType/currency/:transactionID/:reportID/:pageIndex?',
         getRoute: (action: IOUAction, iouType: IOUType, transactionID: string, reportID: string, pageIndex = '', currency = '', backTo = '') =>
@@ -458,7 +528,7 @@ const ROUTES = {
     WORKSPACE_NEW_ROOM: 'workspace/new-room',
     WORKSPACE_INITIAL: {
         route: 'settings/workspaces/:policyID',
-        getRoute: (policyID: string) => `settings/workspaces/${policyID}` as const,
+        getRoute: (policyID: string, backTo?: string) => `${getUrlWithBackToParam(`settings/workspaces/${policyID}`, backTo)}` as const,
     },
     WORKSPACE_INVITE: {
         route: 'settings/workspaces/:policyID/invite',
@@ -508,10 +578,6 @@ const ROUTES = {
         route: 'settings/workspaces/:policyID/accounting/quickbooks-online/export/invoice-account-select',
         getRoute: (policyID: string) => `settings/workspaces/${policyID}/accounting/quickbooks-online/export/invoice-account-select` as const,
     },
-    POLICY_ACCOUNTING_QUICKBOOKS_ONLINE_COMPANY_CARD_EXPENSE_ACCOUNT_PAYABLE_SELECT: {
-        route: 'settings/workspaces/:policyID/accounting/quickbooks-online/export/company-card-expense-account/account-payable-select',
-        getRoute: (policyID: string) => `settings/workspaces/${policyID}/accounting/quickbooks-online/export/company-card-expense-account/account-payable-select` as const,
-    },
     POLICY_ACCOUNTING_QUICKBOOKS_ONLINE_PREFERRED_EXPORTER: {
         route: 'settings/workspaces/:policyID/accounting/quickbooks-online/export/preferred-exporter',
         getRoute: (policyID: string) => `settings/workspaces/${policyID}/accounting/quickbooks-online/export/preferred-exporter` as const,
@@ -560,21 +626,34 @@ const ROUTES = {
         route: 'settings/workspaces/:policyID/workflows',
         getRoute: (policyID: string) => `settings/workspaces/${policyID}/workflows` as const,
     },
-    WORKSPACE_WORKFLOWS_PAYER: {
-        route: 'workspace/:policyID/settings/workflows/payer',
-        getRoute: (policyId: string) => `workspace/${policyId}/settings/workflows/payer` as const,
+    WORKSPACE_WORKFLOWS_APPROVALS_NEW: {
+        route: 'settings/workspaces/:policyID/workflows/approvals/new',
+        getRoute: (policyID: string) => `settings/workspaces/${policyID}/workflows/approvals/new` as const,
+    },
+    WORKSPACE_WORKFLOWS_APPROVALS_EDIT: {
+        route: 'settings/workspaces/:policyID/workflows/approvals/:firstApproverEmail/edit',
+        getRoute: (policyID: string, firstApproverEmail: string) => `settings/workspaces/${policyID}/workflows/approvals/${encodeURIComponent(firstApproverEmail)}/edit` as const,
     },
-    WORKSPACE_WORKFLOWS_APPROVER: {
-        route: 'settings/workspaces/:policyID/settings/workflows/approver',
-        getRoute: (policyID: string) => `settings/workspaces/${policyID}/settings/workflows/approver` as const,
+    WORKSPACE_WORKFLOWS_APPROVALS_EXPENSES_FROM: {
+        route: 'settings/workspaces/:policyID/workflows/approvals/expenses-from',
+        getRoute: (policyID: string, backTo?: string) => getUrlWithBackToParam(`settings/workspaces/${policyID}/workflows/approvals/expenses-from` as const, backTo),
+    },
+    WORKSPACE_WORKFLOWS_APPROVALS_APPROVER: {
+        route: 'settings/workspaces/:policyID/workflows/approvals/approver',
+        getRoute: (policyID: string, approverIndex?: number, backTo?: string) =>
+            getUrlWithBackToParam(`settings/workspaces/${policyID}/workflows/approvals/approver${approverIndex !== undefined ? `?approverIndex=${approverIndex}` : ''}` as const, backTo),
+    },
+    WORKSPACE_WORKFLOWS_PAYER: {
+        route: 'settings/workspaces/:policyID/workflows/payer',
+        getRoute: (policyId: string) => `settings/workspaces/${policyId}/workflows/payer` as const,
     },
     WORKSPACE_WORKFLOWS_AUTOREPORTING_FREQUENCY: {
-        route: 'settings/workspaces/:policyID/settings/workflows/auto-reporting-frequency',
-        getRoute: (policyID: string) => `settings/workspaces/${policyID}/settings/workflows/auto-reporting-frequency` as const,
+        route: 'settings/workspaces/:policyID/workflows/auto-reporting-frequency',
+        getRoute: (policyID: string) => `settings/workspaces/${policyID}/workflows/auto-reporting-frequency` as const,
     },
     WORKSPACE_WORKFLOWS_AUTOREPORTING_MONTHLY_OFFSET: {
-        route: 'settings/workspaces/:policyID/settings/workflows/auto-reporting-frequency/monthly-offset',
-        getRoute: (policyID: string) => `settings/workspaces/${policyID}/settings/workflows/auto-reporting-frequency/monthly-offset` as const,
+        route: 'settings/workspaces/:policyID/workflows/auto-reporting-frequency/monthly-offset',
+        getRoute: (policyID: string) => `settings/workspaces/${policyID}/workflows/auto-reporting-frequency/monthly-offset` as const,
     },
     WORKSPACE_CARD: {
         route: 'settings/workspaces/:policyID/card',
@@ -604,6 +683,14 @@ const ROUTES = {
         route: 'settings/workspaces/:policyID/invoices',
         getRoute: (policyID: string) => `settings/workspaces/${policyID}/invoices` as const,
     },
+    WORKSPACE_INVOICES_COMPANY_NAME: {
+        route: 'settings/workspaces/:policyID/invoices/company-name',
+        getRoute: (policyID: string) => `settings/workspaces/${policyID}/invoices/company-name` as const,
+    },
+    WORKSPACE_INVOICES_COMPANY_WEBSITE: {
+        route: 'settings/workspaces/:policyID/invoices/company-website',
+        getRoute: (policyID: string) => `settings/workspaces/${policyID}/invoices/company-website` as const,
+    },
     WORKSPACE_TRAVEL: {
         route: 'settings/workspaces/:policyID/travel',
         getRoute: (policyID: string) => `settings/workspaces/${policyID}/travel` as const,
@@ -628,6 +715,15 @@ const ROUTES = {
         route: 'settings/workspaces/:policyID/accounting/quickbooks-online/invoice-account-selector',
         getRoute: (policyID: string) => `settings/workspaces/${policyID}/accounting/quickbooks-online/invoice-account-selector` as const,
     },
+    WORKSPACE_ACCOUNTING_CARD_RECONCILIATION: {
+        route: 'settings/workspaces/:policyID/accounting/:connection/card-reconciliation',
+        getRoute: (policyID: string, connection?: ValueOf<typeof CONST.POLICY.CONNECTIONS.ROUTE>) => `settings/workspaces/${policyID}/accounting/${connection}/card-reconciliation` as const,
+    },
+    WORKSPACE_ACCOUNTING_RECONCILIATION_ACCOUNT_SETTINGS: {
+        route: 'settings/workspaces/:policyID/accounting/:connection/card-reconciliation/account',
+        getRoute: (policyID: string, connection?: ValueOf<typeof CONST.POLICY.CONNECTIONS.ROUTE>) =>
+            `settings/workspaces/${policyID}/accounting/${connection}/card-reconciliation/account` as const,
+    },
     WORKSPACE_CATEGORIES: {
         route: 'settings/workspaces/:policyID/categories',
         getRoute: (policyID: string) => `settings/workspaces/${policyID}/categories` as const,
@@ -636,14 +732,15 @@ const ROUTES = {
         route: 'settings/workspaces/:policyID/categories/:categoryName',
         getRoute: (policyID: string, categoryName: string) => `settings/workspaces/${policyID}/categories/${encodeURIComponent(categoryName)}` as const,
     },
+    WORKSPACE_UPGRADE: {
+        route: 'settings/workspaces/:policyID/upgrade/:featureName',
+        getRoute: (policyID: string, featureName: string, backTo?: string) =>
+            getUrlWithBackToParam(`settings/workspaces/${policyID}/upgrade/${encodeURIComponent(featureName)}` as const, backTo),
+    },
     WORKSPACE_CATEGORIES_SETTINGS: {
         route: 'settings/workspaces/:policyID/categories/settings',
         getRoute: (policyID: string) => `settings/workspaces/${policyID}/categories/settings` as const,
     },
-    WORKSPACE_MORE_FEATURES: {
-        route: 'settings/workspaces/:policyID/more-features',
-        getRoute: (policyID: string) => `settings/workspaces/${policyID}/more-features` as const,
-    },
     WORKSPACE_CATEGORY_CREATE: {
         route: 'settings/workspaces/:policyID/categories/new',
         getRoute: (policyID: string) => `settings/workspaces/${policyID}/categories/new` as const,
@@ -652,6 +749,18 @@ const ROUTES = {
         route: 'settings/workspaces/:policyID/categories/:categoryName/edit',
         getRoute: (policyID: string, categoryName: string) => `settings/workspaces/${policyID}/categories/${encodeURIComponent(categoryName)}/edit` as const,
     },
+    WORKSPACE_CATEGORY_PAYROLL_CODE: {
+        route: 'settings/workspaces/:policyID/categories/:categoryName/payroll-code',
+        getRoute: (policyID: string, categoryName: string) => `settings/workspaces/${policyID}/categories/${encodeURIComponent(categoryName)}/payroll-code` as const,
+    },
+    WORKSPACE_CATEGORY_GL_CODE: {
+        route: 'settings/workspaces/:policyID/categories/:categoryName/gl-code',
+        getRoute: (policyID: string, categoryName: string) => `settings/workspaces/${policyID}/categories/${encodeURIComponent(categoryName)}/gl-code` as const,
+    },
+    WORKSPACE_MORE_FEATURES: {
+        route: 'settings/workspaces/:policyID/more-features',
+        getRoute: (policyID: string) => `settings/workspaces/${policyID}/more-features` as const,
+    },
     WORKSPACE_TAGS: {
         route: 'settings/workspaces/:policyID/tags',
         getRoute: (policyID: string) => `settings/workspaces/${policyID}/tags` as const,
@@ -665,16 +774,24 @@ const ROUTES = {
         getRoute: (policyID: string) => `settings/workspaces/${policyID}/tags/settings` as const,
     },
     WORKSPACE_EDIT_TAGS: {
-        route: 'settings/workspaces/:policyID/tags/edit',
-        getRoute: (policyID: string) => `settings/workspaces/${policyID}/tags/edit` as const,
+        route: 'settings/workspaces/:policyID/tags/:orderWeight/edit',
+        getRoute: (policyID: string, orderWeight: number) => `settings/workspaces/${policyID}/tags/${orderWeight}/edit` as const,
     },
     WORKSPACE_TAG_EDIT: {
-        route: 'settings/workspace/:policyID/tag/:tagName/edit',
-        getRoute: (policyID: string, tagName: string) => `settings/workspace/${policyID}/tag/${encodeURIComponent(tagName)}/edit` as const,
+        route: 'settings/workspaces/:policyID/tag/:orderWeight/:tagName/edit',
+        getRoute: (policyID: string, orderWeight: number, tagName: string) => `settings/workspaces/${policyID}/tag/${orderWeight}/${encodeURIComponent(tagName)}/edit` as const,
     },
     WORKSPACE_TAG_SETTINGS: {
-        route: 'settings/workspaces/:policyID/tag/:tagName',
-        getRoute: (policyID: string, tagName: string) => `settings/workspaces/${policyID}/tag/${encodeURIComponent(tagName)}` as const,
+        route: 'settings/workspaces/:policyID/tag/:orderWeight/:tagName',
+        getRoute: (policyID: string, orderWeight: number, tagName: string) => `settings/workspaces/${policyID}/tag/${orderWeight}/${encodeURIComponent(tagName)}` as const,
+    },
+    WORKSPACE_TAG_LIST_VIEW: {
+        route: 'settings/workspaces/:policyID/tag-list/:orderWeight',
+        getRoute: (policyID: string, orderWeight: number) => `settings/workspaces/${policyID}/tag-list/${orderWeight}` as const,
+    },
+    WORKSPACE_TAG_GL_CODE: {
+        route: 'settings/workspaces/:policyID/tag/:orderWeight/:tagName/gl-code',
+        getRoute: (policyID: string, orderWeight: number, tagName: string) => `settings/workspaces/${policyID}/tag/${orderWeight}/${encodeURIComponent(tagName)}/gl-code` as const,
     },
     WORKSPACE_TAXES: {
         route: 'settings/workspaces/:policyID/taxes',
@@ -733,6 +850,95 @@ const ROUTES = {
         route: 'settings/workspaces/:policyID/tax/:taxID/value',
         getRoute: (policyID: string, taxID: string) => `settings/workspaces/${policyID}/tax/${encodeURIComponent(taxID)}/value` as const,
     },
+    WORKSPACE_TAX_CODE: {
+        route: 'settings/workspaces/:policyID/tax/:taxID/tax-code',
+        getRoute: (policyID: string, taxID: string) => `settings/workspaces/${policyID}/tax/${encodeURIComponent(taxID)}/tax-code` as const,
+    },
+    WORKSPACE_REPORT_FIELDS: {
+        route: 'settings/workspaces/:policyID/reportFields',
+        getRoute: (policyID: string) => `settings/workspaces/${policyID}/reportFields` as const,
+    },
+    WORKSPACE_CREATE_REPORT_FIELD: {
+        route: 'settings/workspaces/:policyID/reportFields/new',
+        getRoute: (policyID: string) => `settings/workspaces/${policyID}/reportFields/new` as const,
+    },
+    WORKSPACE_REPORT_FIELDS_SETTINGS: {
+        route: 'settings/workspaces/:policyID/reportFields/:reportFieldID/edit',
+        getRoute: (policyID: string, reportFieldID: string) => `settings/workspaces/${policyID}/reportFields/${encodeURIComponent(reportFieldID)}/edit` as const,
+    },
+    WORKSPACE_REPORT_FIELDS_LIST_VALUES: {
+        route: 'settings/workspaces/:policyID/reportFields/listValues/:reportFieldID?',
+        getRoute: (policyID: string, reportFieldID?: string) => `settings/workspaces/${policyID}/reportFields/listValues/${encodeURIComponent(reportFieldID ?? '')}` as const,
+    },
+    WORKSPACE_REPORT_FIELDS_ADD_VALUE: {
+        route: 'settings/workspaces/:policyID/reportFields/addValue/:reportFieldID?',
+        getRoute: (policyID: string, reportFieldID?: string) => `settings/workspaces/${policyID}/reportFields/addValue/${encodeURIComponent(reportFieldID ?? '')}` as const,
+    },
+    WORKSPACE_REPORT_FIELDS_VALUE_SETTINGS: {
+        route: 'settings/workspaces/:policyID/reportFields/:valueIndex/:reportFieldID?',
+        getRoute: (policyID: string, valueIndex: number, reportFieldID?: string) =>
+            `settings/workspaces/${policyID}/reportFields/${valueIndex}/${encodeURIComponent(reportFieldID ?? '')}` as const,
+    },
+    WORKSPACE_REPORT_FIELDS_EDIT_VALUE: {
+        route: 'settings/workspaces/:policyID/reportFields/new/:valueIndex/edit',
+        getRoute: (policyID: string, valueIndex: number) => `settings/workspaces/${policyID}/reportFields/new/${valueIndex}/edit` as const,
+    },
+    WORKSPACE_EDIT_REPORT_FIELDS_INITIAL_VALUE: {
+        route: 'settings/workspaces/:policyID/reportFields/:reportFieldID/edit/initialValue',
+        getRoute: (policyID: string, reportFieldID: string) => `settings/workspaces/${policyID}/reportFields/${encodeURIComponent(reportFieldID)}/edit/initialValue` as const,
+    },
+    WORKSPACE_COMPANY_CARDS_SELECT_FEED: {
+        route: 'settings/workspaces/:policyID/company-cards/select-feed',
+        getRoute: (policyID: string) => `settings/workspaces/${policyID}/company-cards/select-feed` as const,
+    },
+    WORKSPACE_EXPENSIFY_CARD: {
+        route: 'settings/workspaces/:policyID/expensify-card',
+        getRoute: (policyID: string) => `settings/workspaces/${policyID}/expensify-card` as const,
+    },
+    WORKSPACE_EXPENSIFY_CARD_DETAILS: {
+        route: 'settings/workspaces/:policyID/expensify-card/:cardID',
+        getRoute: (policyID: string, cardID: string, backTo?: string) => getUrlWithBackToParam(`settings/workspaces/${policyID}/expensify-card/${cardID}`, backTo),
+    },
+    WORKSPACE_EXPENSIFY_CARD_NAME: {
+        route: 'settings/workspaces/:policyID/expensify-card/:cardID/edit/name',
+        getRoute: (policyID: string, cardID: string) => `settings/workspaces/${policyID}/expensify-card/${cardID}/edit/name` as const,
+    },
+    WORKSPACE_EXPENSIFY_CARD_LIMIT: {
+        route: 'settings/workspaces/:policyID/expensify-card/:cardID/edit/limit',
+        getRoute: (policyID: string, cardID: string) => `settings/workspaces/${policyID}/expensify-card/${cardID}/edit/limit` as const,
+    },
+    WORKSPACE_EXPENSIFY_CARD_LIMIT_TYPE: {
+        route: 'settings/workspaces/:policyID/expensify-card/:cardID/edit/limit-type',
+        getRoute: (policyID: string, cardID: string) => `settings/workspaces/${policyID}/expensify-card/${cardID}/edit/limit-type` as const,
+    },
+    WORKSPACE_EXPENSIFY_CARD_ISSUE_NEW: {
+        route: 'settings/workspaces/:policyID/expensify-card/issue-new',
+        getRoute: (policyID: string) => `settings/workspaces/${policyID}/expensify-card/issue-new` as const,
+    },
+    WORKSPACE_EXPENSIFY_CARD_BANK_ACCOUNT: {
+        route: 'settings/workspaces/:policyID/expensify-card/choose-bank-account',
+        getRoute: (policyID: string) => `settings/workspaces/${policyID}/expensify-card/choose-bank-account` as const,
+    },
+    WORKSPACE_EXPENSIFY_CARD_SETTINGS: {
+        route: 'settings/workspaces/:policyID/expensify-card/settings',
+        getRoute: (policyID: string) => `settings/workspaces/${policyID}/expensify-card/settings` as const,
+    },
+    WORKSPACE_EXPENSIFY_CARD_SETTINGS_ACCOUNT: {
+        route: 'settings/workspaces/:policyID/expensify-card/settings/account',
+        getRoute: (policyID: string) => `settings/workspaces/${policyID}/expensify-card/settings/account` as const,
+    },
+    WORKSPACE_EXPENSIFY_CARD_SETTINGS_FREQUENCY: {
+        route: 'settings/workspaces/:policyID/expensify-card/settings/frequency',
+        getRoute: (policyID: string) => `settings/workspaces/${policyID}/expensify-card/settings/frequency` as const,
+    },
+    WORKSPACE_COMPANY_CARDS: {
+        route: 'settings/workspaces/:policyID/company-cards',
+        getRoute: (policyID: string) => `settings/workspaces/${policyID}/company-cards` as const,
+    },
+    WORKSPACE_RULES: {
+        route: 'settings/workspaces/:policyID/rules',
+        getRoute: (policyID: string) => `settings/workspaces/${policyID}/rules` as const,
+    },
     WORKSPACE_DISTANCE_RATES: {
         route: 'settings/workspaces/:policyID/distance-rates',
         getRoute: (policyID: string) => `settings/workspaces/${policyID}/distance-rates` as const,
@@ -753,6 +959,30 @@ const ROUTES = {
         route: 'settings/workspaces/:policyID/distance-rates/:rateID/edit',
         getRoute: (policyID: string, rateID: string) => `settings/workspaces/${policyID}/distance-rates/${rateID}/edit` as const,
     },
+    WORKSPACE_DISTANCE_RATE_TAX_RECLAIMABLE_ON_EDIT: {
+        route: 'settings/workspaces/:policyID/distance-rates/:rateID/tax-reclaimable/edit',
+        getRoute: (policyID: string, rateID: string) => `settings/workspaces/${policyID}/distance-rates/${rateID}/tax-reclaimable/edit` as const,
+    },
+    WORKSPACE_DISTANCE_RATE_TAX_RATE_EDIT: {
+        route: 'settings/workspaces/:policyID/distance-rates/:rateID/tax-rate/edit',
+        getRoute: (policyID: string, rateID: string) => `settings/workspaces/${policyID}/distance-rates/${rateID}/tax-rate/edit` as const,
+    },
+    RULES_RECEIPT_REQUIRED_AMOUNT: {
+        route: 'settings/workspaces/:policyID/rules/receipt-required-amount',
+        getRoute: (policyID: string) => `settings/workspaces/${policyID}/rules/receipt-required-amount` as const,
+    },
+    RULES_MAX_EXPENSE_AMOUNT: {
+        route: 'settings/workspaces/:policyID/rules/max-expense-amount',
+        getRoute: (policyID: string) => `settings/workspaces/${policyID}/rules/max-expense-amount` as const,
+    },
+    RULES_MAX_EXPENSE_AGE: {
+        route: 'settings/workspaces/:policyID/rules/max-expense-age',
+        getRoute: (policyID: string) => `settings/workspaces/${policyID}/rules/max-expense-age` as const,
+    },
+    RULES_BILLABLE_DEFAULT: {
+        route: 'settings/workspaces/:policyID/rules/billable',
+        getRoute: (policyID: string) => `settings/workspaces/${policyID}/rules/billable` as const,
+    },
     // Referral program promotion
     REFERRAL_DETAILS_MODAL: {
         route: 'referral/:contentType',
@@ -762,36 +992,126 @@ const ROUTES = {
     TRAVEL_MY_TRIPS: 'travel',
     TRAVEL_TCS: 'travel/terms',
     TRACK_TRAINING_MODAL: 'track-training',
-    ONBOARDING_ROOT: 'onboarding',
-    ONBOARDING_PERSONAL_DETAILS: 'onboarding/personal-details',
-    ONBOARDING_WORK: 'onboarding/work',
-    ONBOARDING_PURPOSE: 'onboarding/purpose',
+    ONBOARDING_ROOT: {
+        route: 'onboarding',
+        getRoute: (backTo?: string) => getUrlWithBackToParam(`onboarding`, backTo),
+    },
+    ONBOARDING_PERSONAL_DETAILS: {
+        route: 'onboarding/personal-details',
+        getRoute: (backTo?: string) => getUrlWithBackToParam(`onboarding/personal-details`, backTo),
+    },
+    ONBOARDING_WORK: {
+        route: 'onboarding/work',
+        getRoute: (backTo?: string) => getUrlWithBackToParam(`onboarding/work`, backTo),
+    },
+    ONBOARDING_PURPOSE: {
+        route: 'onboarding/purpose',
+        getRoute: (backTo?: string) => getUrlWithBackToParam(`onboarding/purpose`, backTo),
+    },
     WELCOME_VIDEO_ROOT: 'onboarding/welcome-video',
+    EXPLANATION_MODAL_ROOT: 'onboarding/explanation',
 
     TRANSACTION_RECEIPT: {
         route: 'r/:reportID/transaction/:transactionID/receipt',
-        getRoute: (reportID: string, transactionID: string) => `r/${reportID}/transaction/${transactionID}/receipt` as const,
+        getRoute: (reportID: string, transactionID: string, readonly = false) => `r/${reportID}/transaction/${transactionID}/receipt${readonly ? '?readonly=true' : ''}` as const,
+    },
+    TRANSACTION_DUPLICATE_REVIEW_PAGE: {
+        route: 'r/:threadReportID/duplicates/review',
+        getRoute: (threadReportID: string) => `r/${threadReportID}/duplicates/review` as const,
+    },
+    TRANSACTION_DUPLICATE_REVIEW_MERCHANT_PAGE: {
+        route: 'r/:threadReportID/duplicates/review/merchant',
+        getRoute: (threadReportID: string) => `r/${threadReportID}/duplicates/review/merchant` as const,
+    },
+    TRANSACTION_DUPLICATE_REVIEW_CATEGORY_PAGE: {
+        route: 'r/:threadReportID/duplicates/review/category',
+        getRoute: (threadReportID: string) => `r/${threadReportID}/duplicates/review/category` as const,
+    },
+    TRANSACTION_DUPLICATE_REVIEW_TAG_PAGE: {
+        route: 'r/:threadReportID/duplicates/review/tag',
+        getRoute: (threadReportID: string) => `r/${threadReportID}/duplicates/review/tag` as const,
+    },
+    TRANSACTION_DUPLICATE_REVIEW_TAX_CODE_PAGE: {
+        route: 'r/:threadReportID/duplicates/review/tax-code',
+        getRoute: (threadReportID: string) => `r/${threadReportID}/duplicates/review/tax-code` as const,
+    },
+    TRANSACTION_DUPLICATE_REVIEW_DESCRIPTION_PAGE: {
+        route: 'r/:threadReportID/duplicates/review/description',
+        getRoute: (threadReportID: string) => `r/${threadReportID}/duplicates/review/description` as const,
+    },
+    TRANSACTION_DUPLICATE_REVIEW_REIMBURSABLE_PAGE: {
+        route: 'r/:threadReportID/duplicates/review/reimbursable',
+        getRoute: (threadReportID: string) => `r/${threadReportID}/duplicates/review/reimbursable` as const,
+    },
+    TRANSACTION_DUPLICATE_REVIEW_BILLABLE_PAGE: {
+        route: 'r/:threadReportID/duplicates/review/billable',
+        getRoute: (threadReportID: string) => `r/${threadReportID}/duplicates/review/billable` as const,
+    },
+    TRANSACTION_DUPLICATE_CONFIRMATION_PAGE: {
+        route: 'r/:threadReportID/duplicates/confirm',
+        getRoute: (threadReportID: string) => `r/${threadReportID}/duplicates/confirm` as const,
     },
     POLICY_ACCOUNTING_XERO_IMPORT: {
         route: 'settings/workspaces/:policyID/accounting/xero/import',
         getRoute: (policyID: string) => `settings/workspaces/${policyID}/accounting/xero/import` as const,
     },
+    POLICY_ACCOUNTING_XERO_CHART_OF_ACCOUNTS: {
+        route: 'settings/workspaces/:policyID/accounting/xero/import/accounts',
+        getRoute: (policyID: string) => `settings/workspaces/${policyID}/accounting/xero/import/accounts` as const,
+    },
     POLICY_ACCOUNTING_XERO_ORGANIZATION: {
         route: 'settings/workspaces/:policyID/accounting/xero/organization/:currentOrganizationID',
         getRoute: (policyID: string, currentOrganizationID: string) => `settings/workspaces/${policyID}/accounting/xero/organization/${currentOrganizationID}` as const,
     },
+    POLICY_ACCOUNTING_XERO_TRACKING_CATEGORIES: {
+        route: 'settings/workspaces/:policyID/accounting/xero/import/tracking-categories',
+        getRoute: (policyID: string) => `settings/workspaces/${policyID}/accounting/xero/import/tracking-categories` as const,
+    },
+    POLICY_ACCOUNTING_XERO_TRACKING_CATEGORIES_MAP: {
+        route: 'settings/workspaces/:policyID/accounting/xero/import/tracking-categories/mapping/:categoryId/:categoryName',
+        getRoute: (policyID: string, categoryId: string, categoryName: string) =>
+            `settings/workspaces/${policyID}/accounting/xero/import/tracking-categories/mapping/${categoryId}/${encodeURIComponent(categoryName)}` as const,
+    },
     POLICY_ACCOUNTING_XERO_CUSTOMER: {
-        route: '/settings/workspaces/:policyID/accounting/xero/import/customers',
-        getRoute: (policyID: string) => `/settings/workspaces/${policyID}/accounting/xero/import/customers` as const,
+        route: 'settings/workspaces/:policyID/accounting/xero/import/customers',
+        getRoute: (policyID: string) => `settings/workspaces/${policyID}/accounting/xero/import/customers` as const,
     },
     POLICY_ACCOUNTING_XERO_TAXES: {
         route: 'settings/workspaces/:policyID/accounting/xero/import/taxes',
         getRoute: (policyID: string) => `settings/workspaces/${policyID}/accounting/xero/import/taxes` as const,
     },
+    POLICY_ACCOUNTING_XERO_EXPORT: {
+        route: 'settings/workspaces/:policyID/accounting/xero/export',
+        getRoute: (policyID: string) => `settings/workspaces/${policyID}/accounting/xero/export` as const,
+    },
+    POLICY_ACCOUNTING_XERO_PREFERRED_EXPORTER_SELECT: {
+        route: 'settings/workspaces/:policyID/connections/xero/export/preferred-exporter/select',
+        getRoute: (policyID: string) => `settings/workspaces/${policyID}/connections/xero/export/preferred-exporter/select` as const,
+    },
+    POLICY_ACCOUNTING_XERO_EXPORT_PURCHASE_BILL_DATE_SELECT: {
+        route: 'settings/workspaces/:policyID/accounting/xero/export/purchase-bill-date-select',
+        getRoute: (policyID: string) => `settings/workspaces/${policyID}/accounting/xero/export/purchase-bill-date-select` as const,
+    },
+    POLICY_ACCOUNTING_XERO_EXPORT_BANK_ACCOUNT_SELECT: {
+        route: 'settings/workspaces/:policyID/accounting/xero/export/bank-account-select',
+        getRoute: (policyID: string) => `settings/workspaces/${policyID}/accounting/xero/export/bank-account-select` as const,
+    },
     POLICY_ACCOUNTING_XERO_ADVANCED: {
         route: 'settings/workspaces/:policyID/accounting/xero/advanced',
         getRoute: (policyID: string) => `settings/workspaces/${policyID}/accounting/xero/advanced` as const,
     },
+    POLICY_ACCOUNTING_XERO_BILL_STATUS_SELECTOR: {
+        route: 'settings/workspaces/:policyID/accounting/xero/export/purchase-bill-status-selector',
+        getRoute: (policyID: string) => `settings/workspaces/${policyID}/accounting/xero/export/purchase-bill-status-selector` as const,
+    },
+    POLICY_ACCOUNTING_XERO_INVOICE_SELECTOR: {
+        route: 'settings/workspaces/:policyID/accounting/xero/advanced/invoice-account-selector',
+        getRoute: (policyID: string) => `settings/workspaces/${policyID}/accounting/xero/advanced/invoice-account-selector` as const,
+    },
+    POLICY_ACCOUNTING_XERO_BILL_PAYMENT_ACCOUNT_SELECTOR: {
+        route: 'settings/workspaces/:policyID/accounting/xero/advanced/bill-payment-account-selector',
+        getRoute: (policyID: string) => `settings/workspaces/${policyID}/accounting/xero/advanced/bill-payment-account-selector` as const,
+    },
     POLICY_ACCOUNTING_QUICKBOOKS_ONLINE_IMPORT: {
         route: 'settings/workspaces/:policyID/accounting/quickbooks-online/import',
         getRoute: (policyID: string) => `settings/workspaces/${policyID}/accounting/quickbooks-online/import` as const,
@@ -816,6 +1136,228 @@ const ROUTES = {
         route: 'settings/workspaces/:policyID/accounting/quickbooks-online/import/taxes',
         getRoute: (policyID: string) => `settings/workspaces/${policyID}/accounting/quickbooks-online/import/taxes` as const,
     },
+    RESTRICTED_ACTION: {
+        route: 'restricted-action/workspace/:policyID',
+        getRoute: (policyID: string) => `restricted-action/workspace/${policyID}` as const,
+    },
+    POLICY_ACCOUNTING_NETSUITE_SUBSIDIARY_SELECTOR: {
+        route: 'settings/workspaces/:policyID/accounting/netsuite/subsidiary-selector',
+        getRoute: (policyID: string) => `settings/workspaces/${policyID}/accounting/netsuite/subsidiary-selector` as const,
+    },
+    POLICY_ACCOUNTING_NETSUITE_EXISTING_CONNECTIONS: {
+        route: 'settings/workspaces/:policyID/accounting/netsuite/existing-connections',
+        getRoute: (policyID: string) => `settings/workspaces/${policyID}/accounting/netsuite/existing-connections` as const,
+    },
+    POLICY_ACCOUNTING_NETSUITE_TOKEN_INPUT: {
+        route: 'settings/workspaces/:policyID/accounting/netsuite/token-input',
+        getRoute: (policyID: string) => `settings/workspaces/${policyID}/accounting/netsuite/token-input` as const,
+    },
+    POLICY_ACCOUNTING_NETSUITE_IMPORT: {
+        route: 'settings/workspaces/:policyID/accounting/netsuite/import',
+        getRoute: (policyID: string) => `settings/workspaces/${policyID}/accounting/netsuite/import` as const,
+    },
+    POLICY_ACCOUNTING_NETSUITE_IMPORT_MAPPING: {
+        route: 'settings/workspaces/:policyID/accounting/netsuite/import/mapping/:importField',
+        getRoute: (policyID: string, importField: TupleToUnion<typeof CONST.NETSUITE_CONFIG.IMPORT_FIELDS>) =>
+            `settings/workspaces/${policyID}/accounting/netsuite/import/mapping/${importField}` as const,
+    },
+    POLICY_ACCOUNTING_NETSUITE_IMPORT_CUSTOM_FIELD_MAPPING: {
+        route: 'settings/workspaces/:policyID/accounting/netsuite/import/custom/:importCustomField',
+        getRoute: (policyID: string, importCustomField: ValueOf<typeof CONST.NETSUITE_CONFIG.IMPORT_CUSTOM_FIELDS>) =>
+            `settings/workspaces/${policyID}/accounting/netsuite/import/custom/${importCustomField}` as const,
+    },
+    POLICY_ACCOUNTING_NETSUITE_IMPORT_CUSTOM_FIELD_VIEW: {
+        route: 'settings/workspaces/:policyID/accounting/netsuite/import/custom/:importCustomField/view/:valueIndex',
+        getRoute: (policyID: string, importCustomField: ValueOf<typeof CONST.NETSUITE_CONFIG.IMPORT_CUSTOM_FIELDS>, valueIndex: number) =>
+            `settings/workspaces/${policyID}/accounting/netsuite/import/custom/${importCustomField}/view/${valueIndex}` as const,
+    },
+    POLICY_ACCOUNTING_NETSUITE_IMPORT_CUSTOM_FIELD_EDIT: {
+        route: 'settings/workspaces/:policyID/accounting/netsuite/import/custom/:importCustomField/edit/:valueIndex/:fieldName',
+        getRoute: (policyID: string, importCustomField: ValueOf<typeof CONST.NETSUITE_CONFIG.IMPORT_CUSTOM_FIELDS>, valueIndex: number, fieldName: string) =>
+            `settings/workspaces/${policyID}/accounting/netsuite/import/custom/${importCustomField}/edit/${valueIndex}/${fieldName}` as const,
+    },
+    POLICY_ACCOUNTING_NETSUITE_IMPORT_CUSTOM_LIST_ADD: {
+        route: 'settings/workspaces/:policyID/accounting/netsuite/import/custom-list/new',
+        getRoute: (policyID: string) => `settings/workspaces/${policyID}/accounting/netsuite/import/custom-list/new` as const,
+    },
+    POLICY_ACCOUNTING_NETSUITE_IMPORT_CUSTOM_SEGMENT_ADD: {
+        route: 'settings/workspaces/:policyID/accounting/netsuite/import/custom-segment/new',
+        getRoute: (policyID: string) => `settings/workspaces/${policyID}/accounting/netsuite/import/custom-segment/new` as const,
+    },
+    POLICY_ACCOUNTING_NETSUITE_IMPORT_CUSTOMERS_OR_PROJECTS: {
+        route: 'settings/workspaces/:policyID/accounting/netsuite/import/customer-projects',
+        getRoute: (policyID: string) => `settings/workspaces/${policyID}/accounting/netsuite/import/customer-projects` as const,
+    },
+    POLICY_ACCOUNTING_NETSUITE_IMPORT_CUSTOMERS_OR_PROJECTS_SELECT: {
+        route: 'settings/workspaces/:policyID/accounting/netsuite/import/customer-projects/select',
+        getRoute: (policyID: string) => `settings/workspaces/${policyID}/accounting/netsuite/import/customer-projects/select` as const,
+    },
+    POLICY_ACCOUNTING_NETSUITE_EXPORT: {
+        route: 'settings/workspaces/:policyID/connections/netsuite/export/',
+        getRoute: (policyID: string) => `settings/workspaces/${policyID}/connections/netsuite/export/` as const,
+    },
+    POLICY_ACCOUNTING_NETSUITE_PREFERRED_EXPORTER_SELECT: {
+        route: 'settings/workspaces/:policyID/connections/netsuite/export/preferred-exporter/select',
+        getRoute: (policyID: string) => `settings/workspaces/${policyID}/connections/netsuite/export/preferred-exporter/select` as const,
+    },
+    POLICY_ACCOUNTING_NETSUITE_DATE_SELECT: {
+        route: 'settings/workspaces/:policyID/connections/netsuite/export/date/select',
+        getRoute: (policyID: string) => `settings/workspaces/${policyID}/connections/netsuite/export/date/select` as const,
+    },
+    POLICY_ACCOUNTING_NETSUITE_EXPORT_EXPENSES: {
+        route: 'settings/workspaces/:policyID/connections/netsuite/export/expenses/:expenseType',
+        getRoute: (policyID: string, expenseType: ValueOf<typeof CONST.NETSUITE_EXPENSE_TYPE>) =>
+            `settings/workspaces/${policyID}/connections/netsuite/export/expenses/${expenseType}` as const,
+    },
+    POLICY_ACCOUNTING_NETSUITE_EXPORT_EXPENSES_DESTINATION_SELECT: {
+        route: 'settings/workspaces/:policyID/connections/netsuite/export/expenses/:expenseType/destination/select',
+        getRoute: (policyID: string, expenseType: ValueOf<typeof CONST.NETSUITE_EXPENSE_TYPE>) =>
+            `settings/workspaces/${policyID}/connections/netsuite/export/expenses/${expenseType}/destination/select` as const,
+    },
+    POLICY_ACCOUNTING_NETSUITE_EXPORT_EXPENSES_VENDOR_SELECT: {
+        route: 'settings/workspaces/:policyID/connections/netsuite/export/expenses/:expenseType/vendor/select',
+        getRoute: (policyID: string, expenseType: ValueOf<typeof CONST.NETSUITE_EXPENSE_TYPE>) =>
+            `settings/workspaces/${policyID}/connections/netsuite/export/expenses/${expenseType}/vendor/select` as const,
+    },
+    POLICY_ACCOUNTING_NETSUITE_EXPORT_EXPENSES_PAYABLE_ACCOUNT_SELECT: {
+        route: 'settings/workspaces/:policyID/connections/netsuite/export/expenses/:expenseType/payable-account/select',
+        getRoute: (policyID: string, expenseType: ValueOf<typeof CONST.NETSUITE_EXPENSE_TYPE>) =>
+            `settings/workspaces/${policyID}/connections/netsuite/export/expenses/${expenseType}/payable-account/select` as const,
+    },
+    POLICY_ACCOUNTING_NETSUITE_EXPORT_EXPENSES_JOURNAL_POSTING_PREFERENCE_SELECT: {
+        route: 'settings/workspaces/:policyID/connections/netsuite/export/expenses/:expenseType/journal-posting-preference/select',
+        getRoute: (policyID: string, expenseType: ValueOf<typeof CONST.NETSUITE_EXPENSE_TYPE>) =>
+            `settings/workspaces/${policyID}/connections/netsuite/export/expenses/${expenseType}/journal-posting-preference/select` as const,
+    },
+    POLICY_ACCOUNTING_NETSUITE_RECEIVABLE_ACCOUNT_SELECT: {
+        route: 'settings/workspaces/:policyID/connections/netsuite/export/receivable-account/select',
+        getRoute: (policyID: string) => `settings/workspaces/${policyID}/connections/netsuite/export/receivable-account/select` as const,
+    },
+    POLICY_ACCOUNTING_NETSUITE_INVOICE_ITEM_PREFERENCE_SELECT: {
+        route: 'settings/workspaces/:policyID/connections/netsuite/export/invoice-item-preference/select',
+        getRoute: (policyID: string) => `settings/workspaces/${policyID}/connections/netsuite/export/invoice-item-preference/select` as const,
+    },
+    POLICY_ACCOUNTING_NETSUITE_INVOICE_ITEM_SELECT: {
+        route: 'settings/workspaces/:policyID/connections/netsuite/export/invoice-item-preference/invoice-item/select',
+        getRoute: (policyID: string) => `settings/workspaces/${policyID}/connections/netsuite/export/invoice-item-preference/invoice-item/select` as const,
+    },
+    POLICY_ACCOUNTING_NETSUITE_TAX_POSTING_ACCOUNT_SELECT: {
+        route: 'settings/workspaces/:policyID/connections/netsuite/export/tax-posting-account/select',
+        getRoute: (policyID: string) => `settings/workspaces/${policyID}/connections/netsuite/export/tax-posting-account/select` as const,
+    },
+    POLICY_ACCOUNTING_NETSUITE_PROVINCIAL_TAX_POSTING_ACCOUNT_SELECT: {
+        route: 'settings/workspaces/:policyID/connections/netsuite/export/provincial-tax-posting-account/select',
+        getRoute: (policyID: string) => `settings/workspaces/${policyID}/connections/netsuite/export/provincial-tax-posting-account/select` as const,
+    },
+    POLICY_ACCOUNTING_NETSUITE_ADVANCED: {
+        route: 'settings/workspaces/:policyID/connections/netsuite/advanced/',
+        getRoute: (policyID: string) => `settings/workspaces/${policyID}/connections/netsuite/advanced/` as const,
+    },
+    POLICY_ACCOUNTING_NETSUITE_REIMBURSEMENT_ACCOUNT_SELECT: {
+        route: 'settings/workspaces/:policyID/connections/netsuite/advanced/reimbursement-account/select',
+        getRoute: (policyID: string) => `settings/workspaces/${policyID}/connections/netsuite/advanced/reimbursement-account/select` as const,
+    },
+    POLICY_ACCOUNTING_NETSUITE_COLLECTION_ACCOUNT_SELECT: {
+        route: 'settings/workspaces/:policyID/connections/netsuite/advanced/collection-account/select',
+        getRoute: (policyID: string) => `settings/workspaces/${policyID}/connections/netsuite/advanced/collection-account/select` as const,
+    },
+    POLICY_ACCOUNTING_NETSUITE_EXPENSE_REPORT_APPROVAL_LEVEL_SELECT: {
+        route: 'settings/workspaces/:policyID/connections/netsuite/advanced/expense-report-approval-level/select',
+        getRoute: (policyID: string) => `settings/workspaces/${policyID}/connections/netsuite/advanced/expense-report-approval-level/select` as const,
+    },
+    POLICY_ACCOUNTING_NETSUITE_VENDOR_BILL_APPROVAL_LEVEL_SELECT: {
+        route: 'settings/workspaces/:policyID/connections/netsuite/advanced/vendor-bill-approval-level/select',
+        getRoute: (policyID: string) => `settings/workspaces/${policyID}/connections/netsuite/advanced/vendor-bill-approval-level/select` as const,
+    },
+    POLICY_ACCOUNTING_NETSUITE_JOURNAL_ENTRY_APPROVAL_LEVEL_SELECT: {
+        route: 'settings/workspaces/:policyID/connections/netsuite/advanced/journal-entry-approval-level/select',
+        getRoute: (policyID: string) => `settings/workspaces/${policyID}/connections/netsuite/advanced/journal-entry-approval-level/select` as const,
+    },
+    POLICY_ACCOUNTING_NETSUITE_APPROVAL_ACCOUNT_SELECT: {
+        route: 'settings/workspaces/:policyID/connections/netsuite/advanced/approval-account/select',
+        getRoute: (policyID: string) => `settings/workspaces/${policyID}/connections/netsuite/advanced/approval-account/select` as const,
+    },
+    POLICY_ACCOUNTING_NETSUITE_CUSTOM_FORM_ID: {
+        route: 'settings/workspaces/:policyID/connections/netsuite/advanced/custom-form-id/:expenseType',
+        getRoute: (policyID: string, expenseType: ValueOf<typeof CONST.NETSUITE_EXPENSE_TYPE>) =>
+            `settings/workspaces/${policyID}/connections/netsuite/advanced/custom-form-id/${expenseType}` as const,
+    },
+    POLICY_ACCOUNTING_SAGE_INTACCT_PREREQUISITES: {
+        route: 'settings/workspaces/:policyID/accounting/sage-intacct/prerequisites',
+        getRoute: (policyID: string) => `settings/workspaces/${policyID}/accounting/sage-intacct/prerequisites` as const,
+    },
+    POLICY_ACCOUNTING_SAGE_INTACCT_ENTER_CREDENTIALS: {
+        route: 'settings/workspaces/:policyID/accounting/sage-intacct/enter-credentials',
+        getRoute: (policyID: string) => `settings/workspaces/${policyID}/accounting/sage-intacct/enter-credentials` as const,
+    },
+    POLICY_ACCOUNTING_SAGE_INTACCT_EXISTING_CONNECTIONS: {
+        route: 'settings/workspaces/:policyID/accounting/sage-intacct/existing-connections',
+        getRoute: (policyID: string) => `settings/workspaces/${policyID}/accounting/sage-intacct/existing-connections` as const,
+    },
+    POLICY_ACCOUNTING_SAGE_INTACCT_ENTITY: {
+        route: 'settings/workspaces/:policyID/accounting/sage-intacct/entity',
+        getRoute: (policyID: string) => `settings/workspaces/${policyID}/accounting/sage-intacct/entity` as const,
+    },
+    POLICY_ACCOUNTING_SAGE_INTACCT_IMPORT: {
+        route: 'settings/workspaces/:policyID/accounting/sage-intacct/import',
+        getRoute: (policyID: string) => `settings/workspaces/${policyID}/accounting/sage-intacct/import` as const,
+    },
+    POLICY_ACCOUNTING_SAGE_INTACCT_TOGGLE_MAPPINGS: {
+        route: 'settings/workspaces/:policyID/accounting/sage-intacct/import/toggle-mapping/:mapping',
+        getRoute: (policyID: string, mapping: SageIntacctMappingName) => `settings/workspaces/${policyID}/accounting/sage-intacct/import/toggle-mapping/${mapping}` as const,
+    },
+    POLICY_ACCOUNTING_SAGE_INTACCT_MAPPINGS_TYPE: {
+        route: 'settings/workspaces/:policyID/accounting/sage-intacct/import/mapping-type/:mapping',
+        getRoute: (policyID: string, mapping: string) => `settings/workspaces/${policyID}/accounting/sage-intacct/import/mapping-type/${mapping}` as const,
+    },
+    POLICY_ACCOUNTING_SAGE_INTACCT_USER_DIMENSIONS: {
+        route: 'settings/workspaces/:policyID/accounting/sage-intacct/import/user-dimensions',
+        getRoute: (policyID: string) => `settings/workspaces/${policyID}/accounting/sage-intacct/import/user-dimensions` as const,
+    },
+    POLICY_ACCOUNTING_SAGE_INTACCT_ADD_USER_DIMENSION: {
+        route: 'settings/workspaces/:policyID/accounting/sage-intacct/import/add-user-dimension',
+        getRoute: (policyID: string) => `settings/workspaces/${policyID}/accounting/sage-intacct/import/add-user-dimension` as const,
+    },
+    POLICY_ACCOUNTING_SAGE_INTACCT_EDIT_USER_DIMENSION: {
+        route: 'settings/workspaces/:policyID/accounting/sage-intacct/import/edit-user-dimension/:dimensionName',
+        getRoute: (policyID: string, dimensionName: string) => `settings/workspaces/${policyID}/accounting/sage-intacct/import/edit-user-dimension/${dimensionName}` as const,
+    },
+    POLICY_ACCOUNTING_SAGE_INTACCT_EXPORT: {
+        route: 'settings/workspaces/:policyID/accounting/sage-intacct/export',
+        getRoute: (policyID: string) => `settings/workspaces/${policyID}/accounting/sage-intacct/export` as const,
+    },
+    POLICY_ACCOUNTING_SAGE_INTACCT_PREFERRED_EXPORTER: {
+        route: 'settings/workspaces/:policyID/accounting/sage-intacct/export/preferred-exporter',
+        getRoute: (policyID: string) => `settings/workspaces/${policyID}/accounting/sage-intacct/export/preferred-exporter` as const,
+    },
+    POLICY_ACCOUNTING_SAGE_INTACCT_EXPORT_DATE: {
+        route: 'settings/workspaces/:policyID/accounting/sage-intacct/export/date',
+        getRoute: (policyID: string) => `settings/workspaces/${policyID}/accounting/sage-intacct/export/date` as const,
+    },
+    POLICY_ACCOUNTING_SAGE_INTACCT_REIMBURSABLE_EXPENSES: {
+        route: 'settings/workspaces/:policyID/accounting/sage-intacct/export/reimbursable',
+        getRoute: (policyID: string) => `settings/workspaces/${policyID}/accounting/sage-intacct/export/reimbursable` as const,
+    },
+    POLICY_ACCOUNTING_SAGE_INTACCT_NON_REIMBURSABLE_EXPENSES: {
+        route: 'settings/workspaces/:policyID/accounting/sage-intacct/export/nonreimbursable',
+        getRoute: (policyID: string) => `settings/workspaces/${policyID}/accounting/sage-intacct/export/nonreimbursable` as const,
+    },
+    POLICY_ACCOUNTING_SAGE_INTACCT_DEFAULT_VENDOR: {
+        route: 'settings/workspaces/:policyID/accounting/sage-intacct/export/:reimbursable/default-vendor',
+        getRoute: (policyID: string, reimbursable: string) => `settings/workspaces/${policyID}/accounting/sage-intacct/export/${reimbursable}/default-vendor` as const,
+    },
+    POLICY_ACCOUNTING_SAGE_INTACCT_NON_REIMBURSABLE_CREDIT_CARD_ACCOUNT: {
+        route: 'settings/workspaces/:policyID/accounting/sage-intacct/export/nonreimbursable/credit-card-account',
+        getRoute: (policyID: string) => `settings/workspaces/${policyID}/accounting/sage-intacct/export/nonreimbursable/credit-card-account` as const,
+    },
+    POLICY_ACCOUNTING_SAGE_INTACCT_ADVANCED: {
+        route: 'settings/workspaces/:policyID/accounting/sage-intacct/advanced',
+        getRoute: (policyID: string) => `settings/workspaces/${policyID}/accounting/sage-intacct/advanced` as const,
+    },
+    POLICY_ACCOUNTING_SAGE_INTACCT_PAYMENT_ACCOUNT: {
+        route: 'settings/workspaces/:policyID/accounting/sage-intacct/advanced/payment-account',
+        getRoute: (policyID: string) => `settings/workspaces/${policyID}/accounting/sage-intacct/advanced/payment-account` as const,
+    },
 } as const;
 
 /**
@@ -828,7 +1370,7 @@ const HYBRID_APP_ROUTES = {
     MONEY_REQUEST_SUBMIT_CREATE: '/submit/new/scan',
 } as const;
 
-export {HYBRID_APP_ROUTES, getUrlWithBackToParam};
+export {HYBRID_APP_ROUTES, getUrlWithBackToParam, PUBLIC_SCREENS_ROUTES};
 export default ROUTES;
 
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
diff --git a/src/SCREENS.ts b/src/SCREENS.ts
index 45c9906e8ca3..9634cc1b02ac 100644
--- a/src/SCREENS.ts
+++ b/src/SCREENS.ts
@@ -7,12 +7,13 @@ import type DeepValueOf from './types/utils/DeepValueOf';
 const PROTECTED_SCREENS = {
     HOME: 'Home',
     CONCIERGE: 'Concierge',
-    REPORT_ATTACHMENTS: 'ReportAttachments',
+    ATTACHMENTS: 'Attachments',
+    TRACK_EXPENSE: 'TrackExpense',
+    SUBMIT_EXPENSE: 'SubmitExpense',
 } as const;
 
 const SCREENS = {
     ...PROTECTED_SCREENS,
-    ALL_SETTINGS: 'AllSettings',
     REPORT: 'Report',
     PROFILE_AVATAR: 'ProfileAvatar',
     WORKSPACE_AVATAR: 'WorkspaceAvatar',
@@ -27,10 +28,25 @@ const SCREENS = {
         MY_TRIPS: 'Travel_MyTrips',
         TCS: 'Travel_TCS',
     },
-    WORKSPACES_CENTRAL_PANE: 'WorkspacesCentralPane',
     SEARCH: {
         CENTRAL_PANE: 'Search_Central_Pane',
         REPORT_RHP: 'Search_Report_RHP',
+        ADVANCED_FILTERS_RHP: 'Search_Advanced_Filters_RHP',
+        ADVANCED_FILTERS_DATE_RHP: 'Search_Advanced_Filters_Date_RHP',
+        ADVANCED_FILTERS_CURRENCY_RHP: 'Search_Advanced_Filters_Currency_RHP',
+        ADVANCED_FILTERS_DESCRIPTION_RHP: 'Search_Advanced_Filters_Description_RHP',
+        ADVANCED_FILTERS_MERCHANT_RHP: 'Search_Advanced_Filters_Merchant_RHP',
+        ADVANCED_FILTERS_REPORT_ID_RHP: 'Search_Advanced_Filters_ReportID_RHP',
+        ADVANCED_FILTERS_AMOUNT_RHP: 'Search_Advanced_Filters_Amount_RHP',
+        ADVANCED_FILTERS_CATEGORY_RHP: 'Search_Advanced_Filters_Category_RHP',
+        ADVANCED_FILTERS_KEYWORD_RHP: 'Search_Advanced_Filters_Keyword_RHP',
+        ADVANCED_FILTERS_CARD_RHP: 'Search_Advanced_Filters_Card_RHP',
+        ADVANCED_FILTERS_TAX_RATE_RHP: 'Search_Advanced_Filters_Tax_Rate_RHP',
+        ADVANCED_FILTERS_EXPENSE_TYPE_RHP: 'Search_Advanced_Filters_Expense_Type_RHP',
+        ADVANCED_FILTERS_TAG_RHP: 'Search_Advanced_Filters_Tag_RHP',
+        ADVANCED_FILTERS_FROM_RHP: 'Search_Advanced_Filters_From_RHP',
+        ADVANCED_FILTERS_TO_RHP: 'Search_Advanced_Filters_To_RHP',
+        TRANSACTION_HOLD_REASON_RHP: 'Search_Transaction_Hold_Reason_RHP',
         BOTTOM_TAB: 'Search_Bottom_Tab',
     },
     SETTINGS: {
@@ -42,8 +58,8 @@ const SCREENS = {
         SAVE_THE_WORLD: 'Settings_TeachersUnite',
         APP_DOWNLOAD_LINKS: 'Settings_App_Download_Links',
         ADD_DEBIT_CARD: 'Settings_Add_Debit_Card',
+        ADD_PAYMENT_CARD_CHANGE_CURRENCY: 'Settings_Add_Payment_Card_Change_Currency',
         ADD_BANK_ACCOUNT: 'Settings_Add_Bank_Account',
-        ADD_BANK_ACCOUNT_REFACTOR: 'Settings_Add_Bank_Account_Refactor',
         CLOSE: 'Settings_Close',
         TWO_FACTOR_AUTH: 'Settings_TwoFactorAuth',
         REPORT_CARD_LOST_OR_DAMAGED: 'Settings_ReportCardLostOrDamaged',
@@ -90,7 +106,6 @@ const SCREENS = {
             TRANSFER_BALANCE: 'Settings_Wallet_Transfer_Balance',
             CHOOSE_TRANSFER_ACCOUNT: 'Settings_Wallet_Choose_Transfer_Account',
             ENABLE_PAYMENTS: 'Settings_Wallet_EnablePayments',
-            ENABLE_PAYMENTS_REFACTOR: 'Settings_Wallet_EnablePayments_Refactor',
             CARD_ACTIVATE: 'Settings_Wallet_Card_Activate',
             REPORT_VIRTUAL_CARD_FRAUD: 'Settings_Wallet_ReportVirtualCardFraud',
             CARDS_DIGITAL_DETAILS_UPDATE_ADDRESS: 'Settings_Wallet_Cards_Digital_Details_Update_Address',
@@ -101,6 +116,16 @@ const SCREENS = {
             RESPONSE: 'Settings_ExitSurvey_Response',
             CONFIRM: 'Settings_ExitSurvey_Confirm',
         },
+
+        SUBSCRIPTION: {
+            ROOT: 'Settings_Subscription',
+            SIZE: 'Settings_Subscription_Size',
+            ADD_PAYMENT_CARD: 'Settings_Subscription_Add_Payment_Card',
+            DISABLE_AUTO_RENEW_SURVEY: 'Settings_Subscription_DisableAutoRenewSurvey',
+            CHANGE_BILLING_CURRENCY: 'Settings_Subscription_Change_Billing_Currency',
+            CHANGE_PAYMENT_CURRENCY: 'Settings_Subscription_Change_Payment_Currency',
+            REQUEST_EARLY_CANCELLATION: 'Settings_Subscription_RequestEarlyCancellation',
+        },
     },
     SAVE_THE_WORLD: {
         ROOT: 'SaveTheWorld_Root',
@@ -109,9 +134,6 @@ const SCREENS = {
         CHAT_FINDER: 'ChatFinder',
         WORKSPACE_SWITCHER: 'WorkspaceSwitcher',
     },
-    WORKSPACE_SWITCHER: {
-        ROOT: 'WorkspaceSwitcher_Root',
-    },
     RIGHT_MODAL: {
         SETTINGS: 'Settings',
         NEW_CHAT: 'NewChat',
@@ -137,8 +159,13 @@ const SCREENS = {
         ROOM_INVITE: 'RoomInvite',
         REFERRAL: 'Referral',
         PROCESS_MONEY_REQUEST_HOLD: 'ProcessMoneyRequestHold',
+        TRANSACTION_DUPLICATE: 'TransactionDuplicate',
         TRAVEL: 'Travel',
         SEARCH_REPORT: 'SearchReport',
+        SEARCH_ADVANCED_FILTERS: 'SearchAdvancedFilters',
+        SETTINGS_CATEGORIES: 'SettingsCategories',
+        RESTRICTED_ACTION: 'RestrictedAction',
+        REPORT_EXPORT: 'Report_Export',
     },
     ONBOARDING_MODAL: {
         ONBOARDING: 'Onboarding',
@@ -170,6 +197,7 @@ const SCREENS = {
         STEP_TAX_RATE: 'Money_Request_Step_Tax_Rate',
         STEP_SPLIT_PAYER: 'Money_Request_Step_Split_Payer',
         STEP_SEND_FROM: 'Money_Request_Step_Send_From',
+        STEP_COMPANY_INFO: 'Money_Request_Step_Company_Info',
         CURRENCY: 'Money_Request_Currency',
         WAYPOINT: 'Money_Request_Waypoint',
         EDIT_WAYPOINT: 'Money_Request_Edit_Waypoint',
@@ -177,16 +205,35 @@ const SCREENS = {
         STATE_SELECTOR: 'Money_Request_State_Selector',
     },
 
+    TRANSACTION_DUPLICATE: {
+        REVIEW: 'Transaction_Duplicate_Review',
+        MERCHANT: 'Transaction_Duplicate_Merchant',
+        CATEGORY: 'Transaction_Duplicate_Category',
+        TAG: 'Transaction_Duplicate_Tag',
+        DESCRIPTION: 'Transaction_Duplicate_Description',
+        TAX_CODE: 'Transaction_Duplicate_Tax_Code',
+        REIMBURSABLE: 'Transaction_Duplicate_Reimburable',
+        BILLABLE: 'Transaction_Duplicate_Billable',
+        CONFIRMATION: 'Transaction_Duplicate_Confirmation',
+    },
+
     IOU_SEND: {
         ADD_BANK_ACCOUNT: 'IOU_Send_Add_Bank_Account',
         ADD_DEBIT_CARD: 'IOU_Send_Add_Debit_Card',
         ENABLE_PAYMENTS: 'IOU_Send_Enable_Payments',
     },
 
+    SETTINGS_CATEGORIES: {
+        SETTINGS_CATEGORY_SETTINGS: 'Settings_Category_Settings',
+        SETTINGS_CATEGORIES_SETTINGS: 'Settings_Categories_Settings',
+        SETTINGS_CATEGORY_CREATE: 'Settings_Category_Create',
+        SETTINGS_CATEGORY_EDIT: 'Settings_Category_Edit',
+        SETTINGS_CATEGORIES_ROOT: 'Settings_Categories',
+    },
+
     REPORT_SETTINGS: {
         ROOT: 'Report_Settings_Root',
-        ROOM_NAME: 'Report_Settings_Room_Name',
-        GROUP_NAME: 'Report_Settings_Group_Name',
+        NAME: 'Report_Settings_Name',
         NOTIFICATION_PREFERENCES: 'Report_Settings_Notification_Preferences',
         WRITE_CAPABILITY: 'Report_Settings_Write_Capability',
         VISIBILITY: 'Report_Settings_Visibility',
@@ -214,6 +261,7 @@ const SCREENS = {
     REPORT_DETAILS: {
         ROOT: 'Report_Details_Root',
         SHARE_CODE: 'Report_Details_Share_Code',
+        EXPORT: 'Report_Details_Export',
     },
 
     WORKSPACE: {
@@ -230,7 +278,6 @@ const SCREENS = {
             QUICKBOOKS_ONLINE_EXPORT_INVOICE_ACCOUNT_SELECT: 'Workspace_Accounting_Quickbooks_Online_Export_Invoice_Account_Select',
             QUICKBOOKS_ONLINE_COMPANY_CARD_EXPENSE_ACCOUNT: 'Workspace_Accounting_Quickbooks_Online_Export_Company_Card_Expense',
             QUICKBOOKS_ONLINE_COMPANY_CARD_EXPENSE_ACCOUNT_SELECT: 'Workspace_Accounting_Quickbooks_Online_Export_Company_Card_Expense_Account_Select',
-            QUICKBOOKS_ONLINE_COMPANY_CARD_EXPENSE_ACCOUNT_PAYABLE_SELECT: 'Workspace_Accounting_Quickbooks_Online_Export_Company_Card_Expense_Account_Payable_Select',
             QUICKBOOKS_ONLINE_NON_REIMBURSABLE_DEFAULT_VENDOR_SELECT: 'Workspace_Accounting_Quickbooks_Online_Export_Non_Reimbursable_Default_Vendor_Select',
             QUICKBOOKS_ONLINE_COMPANY_CARD_EXPENSE_ACCOUNT_COMPANY_CARD_SELECT: 'Workspace_Accounting_Quickbooks_Online_Export_Company_Card_Expense_Select',
             QUICKBOOKS_ONLINE_EXPORT_PREFERRED_EXPORTER: 'Workspace_Accounting_Quickbooks_Online_Export_Preferred_Exporter',
@@ -242,9 +289,73 @@ const SCREENS = {
             QUICKBOOKS_ONLINE_INVOICE_ACCOUNT_SELECTOR: 'Policy_Accounting_Quickbooks_Online_Invoice_Account_Selector',
             XERO_IMPORT: 'Policy_Accounting_Xero_Import',
             XERO_ORGANIZATION: 'Policy_Accounting_Xero_Customers',
+            XERO_CHART_OF_ACCOUNTS: 'Policy_Accounting_Xero_Import_Chart_Of_Accounts',
             XERO_CUSTOMER: 'Policy_Acounting_Xero_Import_Customer',
             XERO_TAXES: 'Policy_Accounting_Xero_Taxes',
+            XERO_TRACKING_CATEGORIES: 'Policy_Accounting_Xero_Tracking_Categories',
+            XERO_MAP_TRACKING_CATEGORY: 'Policy_Accounting_Xero_Map_Tracking_Category',
+            XERO_EXPORT: 'Policy_Accounting_Xero_Export',
+            XERO_EXPORT_PURCHASE_BILL_DATE_SELECT: 'Policy_Accounting_Xero_Export_Purchase_Bill_Date_Select',
             XERO_ADVANCED: 'Policy_Accounting_Xero_Advanced',
+            XERO_BILL_STATUS_SELECTOR: 'Policy_Accounting_Xero_Export_Bill_Status_Selector',
+            XERO_INVOICE_ACCOUNT_SELECTOR: 'Policy_Accounting_Xero_Invoice_Account_Selector',
+            XERO_EXPORT_PREFERRED_EXPORTER_SELECT: 'Workspace_Accounting_Xero_Export_Preferred_Exporter_Select',
+            XERO_BILL_PAYMENT_ACCOUNT_SELECTOR: 'Policy_Accounting_Xero_Bill_Payment_Account_Selector',
+            XERO_EXPORT_BANK_ACCOUNT_SELECT: 'Policy_Accounting_Xero_Export_Bank_Account_Select',
+            NETSUITE_IMPORT_MAPPING: 'Policy_Accounting_NetSuite_Import_Mapping',
+            NETSUITE_IMPORT_CUSTOM_FIELD: 'Policy_Accounting_NetSuite_Import_Custom_Field',
+            NETSUITE_IMPORT_CUSTOM_FIELD_VIEW: 'Policy_Accounting_NetSuite_Import_Custom_Field_View',
+            NETSUITE_IMPORT_CUSTOM_FIELD_EDIT: 'Policy_Accounting_NetSuite_Import_Custom_Field_Edit',
+            NETSUITE_IMPORT_CUSTOM_LIST_ADD: 'Policy_Accounting_NetSuite_Import_Custom_List_Add',
+            NETSUITE_IMPORT_CUSTOM_SEGMENT_ADD: 'Policy_Accounting_NetSuite_Import_Custom_Segment_Add',
+            NETSUITE_IMPORT_CUSTOMERS_OR_PROJECTS: 'Policy_Accounting_NetSuite_Import_CustomersOrProjects',
+            NETSUITE_IMPORT_CUSTOMERS_OR_PROJECTS_SELECT: 'Policy_Accounting_NetSuite_Import_CustomersOrProjects_Select',
+            NETSUITE_REUSE_EXISTING_CONNECTIONS: 'Policy_Accounting_NetSuite_Reuse_Existing_Connections',
+            NETSUITE_TOKEN_INPUT: 'Policy_Accounting_NetSuite_Token_Input',
+            NETSUITE_SUBSIDIARY_SELECTOR: 'Policy_Accounting_NetSuite_Subsidiary_Selector',
+            NETSUITE_IMPORT: 'Policy_Accounting_NetSuite_Import',
+            NETSUITE_EXPORT: 'Policy_Accounting_NetSuite_Export',
+            NETSUITE_PREFERRED_EXPORTER_SELECT: 'Policy_Accounting_NetSuite_Preferred_Exporter_Select',
+            NETSUITE_DATE_SELECT: 'Policy_Accounting_NetSuite_Date_Select',
+            NETSUITE_EXPORT_EXPENSES: 'Policy_Accounting_NetSuite_Export_Expenses',
+            NETSUITE_EXPORT_EXPENSES_DESTINATION_SELECT: 'Policy_Accounting_NetSuite_Export_Expenses_Destination_Select',
+            NETSUITE_EXPORT_EXPENSES_VENDOR_SELECT: 'Policy_Accounting_NetSuite_Export_Expenses_Vendor_Select',
+            NETSUITE_EXPORT_EXPENSES_PAYABLE_ACCOUNT_SELECT: 'Policy_Accounting_NetSuite_Export_Expenses_Payable_Account_Select',
+            NETSUITE_EXPORT_EXPENSES_JOURNAL_POSTING_PREFERENCE_SELECT: 'Policy_Accounting_NetSuite_Export_Expenses_Journal_Posting_Preference_Select',
+            NETSUITE_RECEIVABLE_ACCOUNT_SELECT: 'Policy_Accounting_NetSuite_Receivable_Account_Select',
+            NETSUITE_INVOICE_ITEM_PREFERENCE_SELECT: 'Policy_Accounting_NetSuite_Invoice_Item_Preference_Select',
+            NETSUITE_INVOICE_ITEM_SELECT: 'Policy_Accounting_NetSuite_Invoice_Item_Select',
+            NETSUITE_TAX_POSTING_ACCOUNT_SELECT: 'Policy_Accounting_NetSuite_Tax_Posting_Account_Select',
+            NETSUITE_PROVINCIAL_TAX_POSTING_ACCOUNT_SELECT: 'Policy_Accounting_NetSuite_Provincial_Tax_Posting_Account_Select',
+            NETSUITE_ADVANCED: 'Policy_Accounting_NetSuite_Advanced',
+            NETSUITE_REIMBURSEMENT_ACCOUNT_SELECT: 'Policy_Accounting_NetSuite_Reimbursement_Account_Select',
+            NETSUITE_COLLECTION_ACCOUNT_SELECT: 'Policy_Accounting_NetSuite_Collection_Account_Select',
+            NETSUITE_EXPENSE_REPORT_APPROVAL_LEVEL_SELECT: 'Policy_Accounting_NetSuite_Expense_Report_Approval_Level_Select',
+            NETSUITE_VENDOR_BILL_APPROVAL_LEVEL_SELECT: 'Policy_Accounting_NetSuite_Vendor_Bill_Approval_Level_Select',
+            NETSUITE_JOURNAL_ENTRY_APPROVAL_LEVEL_SELECT: 'Policy_Accounting_NetSuite_Journal_Entry_Approval_Level_Select',
+            NETSUITE_APPROVAL_ACCOUNT_SELECT: 'Policy_Accounting_NetSuite_Approval_Account_Select',
+            NETSUITE_CUSTOM_FORM_ID: 'Policy_Accounting_NetSuite_Custom_Form_ID',
+            SAGE_INTACCT_PREREQUISITES: 'Policy_Accounting_Sage_Intacct_Prerequisites',
+            ENTER_SAGE_INTACCT_CREDENTIALS: 'Policy_Enter_Sage_Intacct_Credentials',
+            EXISTING_SAGE_INTACCT_CONNECTIONS: 'Policy_Existing_Sage_Intacct_Connections',
+            SAGE_INTACCT_ENTITY: 'Policy_Sage_Intacct_Entity',
+            SAGE_INTACCT_IMPORT: 'Policy_Accounting_Sage_Intacct_Import',
+            SAGE_INTACCT_TOGGLE_MAPPING: 'Policy_Accounting_Sage_Intacct_Toggle_Mapping',
+            SAGE_INTACCT_MAPPING_TYPE: 'Policy_Accounting_Sage_Intacct_Mapping_Type',
+            SAGE_INTACCT_USER_DIMENSIONS: 'Policy_Accounting_Sage_Intacct_User_Dimensions',
+            SAGE_INTACCT_ADD_USER_DIMENSION: 'Policy_Accounting_Sage_Intacct_Add_User_Dimension',
+            SAGE_INTACCT_EDIT_USER_DIMENSION: 'Policy_Accounting_Sage_Intacct_Edit_User_Dimension',
+            SAGE_INTACCT_EXPORT: 'Policy_Accounting_Sage_Intacct_Export',
+            SAGE_INTACCT_PREFERRED_EXPORTER: 'Policy_Accounting_Sage_Intacct_Preferred_Exporter',
+            SAGE_INTACCT_EXPORT_DATE: 'Policy_Accounting_Sage_Intacct_Export_Date',
+            SAGE_INTACCT_REIMBURSABLE_EXPENSES: 'Policy_Accounting_Sage_Intacct_Reimbursable_Expenses',
+            SAGE_INTACCT_NON_REIMBURSABLE_EXPENSES: 'Policy_Accounting_Sage_Intacct_Non_Reimbursable_Expenses',
+            SAGE_INTACCT_DEFAULT_VENDOR: 'Policy_Accounting_Sage_Intacct_Default_Vendor',
+            SAGE_INTACCT_NON_REIMBURSABLE_CREDIT_CARD_ACCOUNT: 'Policy_Accounting_Sage_Intacct_Non_Reimbursable_Credit_Card_Account',
+            SAGE_INTACCT_ADVANCED: 'Policy_Accounting_Sage_Intacct_Advanced',
+            SAGE_INTACCT_PAYMENT_ACCOUNT: 'Policy_Accounting_Sage_Intacct_Payment_Account',
+            CARD_RECONCILIATION: 'Policy_Accounting_Card_Reconciliation',
+            RECONCILIATION_ACCOUNT_SETTINGS: 'Policy_Accounting_Reconciliation_Account_Settings',
         },
         INITIAL: 'Workspace_Initial',
         PROFILE: 'Workspace_Profile',
@@ -253,8 +364,22 @@ const SCREENS = {
         RATE_AND_UNIT: 'Workspace_RateAndUnit',
         RATE_AND_UNIT_RATE: 'Workspace_RateAndUnit_Rate',
         RATE_AND_UNIT_UNIT: 'Workspace_RateAndUnit_Unit',
+        COMPANY_CARDS: 'Workspace_CompanyCards',
+        COMPANY_CARDS_SELECT_FEED: 'Workspace_CompanyCards_Select_Feed',
+        EXPENSIFY_CARD: 'Workspace_ExpensifyCard',
+        EXPENSIFY_CARD_DETAILS: 'Workspace_ExpensifyCard_Details',
+        EXPENSIFY_CARD_LIMIT: 'Workspace_ExpensifyCard_Limit',
+        EXPENSIFY_CARD_ISSUE_NEW: 'Workspace_ExpensifyCard_New',
+        EXPENSIFY_CARD_NAME: 'Workspace_ExpensifyCard_Name',
+        EXPENSIFY_CARD_LIMIT_TYPE: 'Workspace_ExpensifyCard_LimitType',
+        EXPENSIFY_CARD_BANK_ACCOUNT: 'Workspace_ExpensifyCard_BankAccount',
+        EXPENSIFY_CARD_SETTINGS: 'Workspace_ExpensifyCard_Settings',
+        EXPENSIFY_CARD_SETTINGS_ACCOUNT: 'Workspace_ExpensifyCard_Settings_Account',
+        EXPENSIFY_CARD_SETTINGS_FREQUENCY: 'Workspace_ExpensifyCard_Settings_Frequency',
         BILLS: 'Workspace_Bills',
         INVOICES: 'Workspace_Invoices',
+        INVOICES_COMPANY_NAME: 'Workspace_Invoices_Company_Name',
+        INVOICES_COMPANY_WEBSITE: 'Workspace_Invoices_Company_Website',
         TRAVEL: 'Workspace_Travel',
         MEMBERS: 'Workspace_Members',
         INVITE: 'Workspace_Invite',
@@ -265,9 +390,18 @@ const SCREENS = {
         TAGS_EDIT: 'Tags_Edit',
         TAG_EDIT: 'Tag_Edit',
         TAXES: 'Workspace_Taxes',
+        REPORT_FIELDS: 'Workspace_ReportFields',
+        REPORT_FIELDS_SETTINGS: 'Workspace_ReportFields_Settings',
+        REPORT_FIELDS_CREATE: 'Workspace_ReportFields_Create',
+        REPORT_FIELDS_LIST_VALUES: 'Workspace_ReportFields_ListValues',
+        REPORT_FIELDS_ADD_VALUE: 'Workspace_ReportFields_AddValue',
+        REPORT_FIELDS_VALUE_SETTINGS: 'Workspace_ReportFields_ValueSettings',
+        REPORT_FIELDS_EDIT_VALUE: 'Workspace_ReportFields_EditValue',
+        REPORT_FIELDS_EDIT_INITIAL_VALUE: 'Workspace_ReportFields_EditInitialValue',
         TAX_EDIT: 'Workspace_Tax_Edit',
         TAX_NAME: 'Workspace_Tax_Name',
         TAX_VALUE: 'Workspace_Tax_Value',
+        TAX_CODE: 'Workspace_Tax_Code',
         TAXES_SETTINGS: 'Workspace_Taxes_Settings',
         TAXES_SETTINGS_CUSTOM_TAX_NAME: 'Workspace_Taxes_Settings_CustomTaxName',
         TAXES_SETTINGS_WORKSPACE_CURRENCY_DEFAULT: 'Workspace_Taxes_Settings_WorkspaceCurrency',
@@ -275,11 +409,16 @@ const SCREENS = {
         TAX_CREATE: 'Workspace_Tax_Create',
         TAG_CREATE: 'Tag_Create',
         TAG_SETTINGS: 'Tag_Settings',
+        TAG_LIST_VIEW: 'Tag_List_View',
+        TAG_GL_CODE: 'Tag_GL_Code',
         CURRENCY: 'Workspace_Profile_Currency',
         ADDRESS: 'Workspace_Profile_Address',
         WORKFLOWS: 'Workspace_Workflows',
         WORKFLOWS_PAYER: 'Workspace_Workflows_Payer',
-        WORKFLOWS_APPROVER: 'Workspace_Workflows_Approver',
+        WORKFLOWS_APPROVALS_NEW: 'Workspace_Approvals_New',
+        WORKFLOWS_APPROVALS_EDIT: 'Workspace_Approvals_Edit',
+        WORKFLOWS_APPROVALS_EXPENSES_FROM: 'Workspace_Workflows_Approvals_Expenses_From',
+        WORKFLOWS_APPROVALS_APPROVER: 'Workspace_Workflows_Approvals_Approver',
         WORKFLOWS_AUTO_REPORTING_FREQUENCY: 'Workspace_Workflows_Auto_Reporting_Frequency',
         WORKFLOWS_AUTO_REPORTING_MONTHLY_OFFSET: 'Workspace_Workflows_Auto_Reporting_Monthly_Offset',
         DESCRIPTION: 'Workspace_Profile_Description',
@@ -287,6 +426,8 @@ const SCREENS = {
         NAME: 'Workspace_Profile_Name',
         CATEGORY_CREATE: 'Category_Create',
         CATEGORY_EDIT: 'Category_Edit',
+        CATEGORY_PAYROLL_CODE: 'Category_Payroll_Code',
+        CATEGORY_GL_CODE: 'Category_GL_Code',
         CATEGORY_SETTINGS: 'Category_Settings',
         CATEGORIES_SETTINGS: 'Categories_Settings',
         MORE_FEATURES: 'Workspace_More_Features',
@@ -299,6 +440,14 @@ const SCREENS = {
         DISTANCE_RATES_SETTINGS: 'Distance_Rates_Settings',
         DISTANCE_RATE_DETAILS: 'Distance_Rate_Details',
         DISTANCE_RATE_EDIT: 'Distance_Rate_Edit',
+        DISTANCE_RATE_TAX_RECLAIMABLE_ON_EDIT: 'Distance_Rate_Tax_Reclaimable_On_Edit',
+        DISTANCE_RATE_TAX_RATE_EDIT: 'Distance_Rate_Tax_Rate_Edit',
+        UPGRADE: 'Workspace_Upgrade',
+        RULES: 'Policy_Rules',
+        RULES_RECEIPT_REQUIRED_AMOUNT: 'Rules_Receipt_Required_Amount',
+        RULES_MAX_EXPENSE_AMOUNT: 'Rules_Max_Expense_Amount',
+        RULES_MAX_EXPENSE_AGE: 'Rules_Max_Expense_Age',
+        RULES_BILLABLE_DEFAULT: 'Rules_Billable_Default',
     },
 
     EDIT_REQUEST: {
@@ -330,6 +479,10 @@ const SCREENS = {
         ROOT: 'Welcome_Video_Root',
     },
 
+    EXPLANATION_MODAL: {
+        ROOT: 'Explanation_Modal_Root',
+    },
+
     I_KNOW_A_TEACHER: 'I_Know_A_Teacher',
     INTRO_SCHOOL_PRINCIPAL: 'Intro_School_Principal',
     I_AM_A_TEACHER: 'I_Am_A_Teacher',
@@ -350,7 +503,6 @@ const SCREENS = {
     },
     ROOM_MEMBERS_ROOT: 'RoomMembers_Root',
     ROOM_INVITE_ROOT: 'RoomInvite_Root',
-    CHAT_FINDER_ROOT: 'ChatFinder_Root',
     FLAG_COMMENT_ROOT: 'FlagComment_Root',
     REIMBURSEMENT_ACCOUNT: 'ReimbursementAccount',
     GET_ASSISTANCE: 'GetAssistance',
@@ -358,6 +510,7 @@ const SCREENS = {
     KEYBOARD_SHORTCUTS: 'KeyboardShortcuts',
     TRANSACTION_RECEIPT: 'TransactionReceipt',
     FEATURE_TRAINING_ROOT: 'FeatureTraining_Root',
+    RESTRICTED_ACTION_ROOT: 'RestrictedAction_Root',
 } as const;
 
 type Screen = DeepValueOf<typeof SCREENS>;
diff --git a/src/TIMEZONES.ts b/src/TIMEZONES.ts
index 238563134872..0fb340a2d88d 100644
--- a/src/TIMEZONES.ts
+++ b/src/TIMEZONES.ts
@@ -1,5 +1,7 @@
 /* eslint-disable @typescript-eslint/naming-convention */
 // All timezones were taken from: https://raw.githubusercontent.com/leon-do/Timezones/main/timezone.json
+import type {TupleToUnion} from 'type-fest';
+
 const TIMEZONES = [
     'Africa/Abidjan',
     'Africa/Accra',
@@ -425,7 +427,7 @@ const TIMEZONES = [
  * The timezones supported in browser and on native devices differ, so we must map each timezone to its supported equivalent.
  * Data sourced from https://en.wikipedia.org/wiki/List_of_tz_database_time_zones
  */
-const timezoneBackwardMap: Record<string, (typeof TIMEZONES)[number]> = {
+const timezoneBackwardMap: Record<string, TupleToUnion<typeof TIMEZONES>> = {
     'Africa/Asmera': 'Africa/Nairobi',
     'Africa/Timbuktu': 'Africa/Abidjan',
     'America/Argentina/ComodRivadavia': 'America/Argentina/Catamarca',
@@ -549,6 +551,17 @@ const timezoneBackwardMap: Record<string, (typeof TIMEZONES)[number]> = {
     'US/Pacific': 'America/Los_Angeles',
     'US/Samoa': 'Pacific/Pago_Pago',
     'W-SU': 'Europe/Moscow',
+    CET: 'Europe/Paris',
+    CST6CDT: 'America/Chicago',
+    EET: 'Europe/Sofia',
+    EST: 'America/Cancun',
+    EST5EDT: 'America/New_York',
+    HST: 'Pacific/Honolulu',
+    MET: 'Europe/Paris',
+    MST: 'America/Phoenix',
+    MST7MDT: 'America/Denver',
+    PST8PDT: 'America/Los_Angeles',
+    WET: 'Europe/Lisbon',
 };
 
 export {timezoneBackwardMap};
diff --git a/src/components/AccountSwitcher.tsx b/src/components/AccountSwitcher.tsx
new file mode 100644
index 000000000000..ba30ea0062b9
--- /dev/null
+++ b/src/components/AccountSwitcher.tsx
@@ -0,0 +1,202 @@
+import React, {useRef, useState} from 'react';
+import {View} from 'react-native';
+import {useOnyx} from 'react-native-onyx';
+import useCurrentUserPersonalDetails from '@hooks/useCurrentUserPersonalDetails';
+import useLocalize from '@hooks/useLocalize';
+import useNetwork from '@hooks/useNetwork';
+import usePermissions from '@hooks/usePermissions';
+import useResponsiveLayout from '@hooks/useResponsiveLayout';
+import useTheme from '@hooks/useTheme';
+import useThemeStyles from '@hooks/useThemeStyles';
+import {clearDelegatorErrors, connect, disconnect} from '@libs/actions/Delegate';
+import * as PersonalDetailsUtils from '@libs/PersonalDetailsUtils';
+import variables from '@styles/variables';
+import * as Modal from '@userActions/Modal';
+import CONST from '@src/CONST';
+import type {TranslationPaths} from '@src/languages/types';
+import ONYXKEYS from '@src/ONYXKEYS';
+import type {PersonalDetails} from '@src/types/onyx';
+import Avatar from './Avatar';
+import ConfirmModal from './ConfirmModal';
+import Icon from './Icon';
+import * as Expensicons from './Icon/Expensicons';
+import type {MenuItemProps} from './MenuItem';
+import MenuItemList from './MenuItemList';
+import type {MenuItemWithLink} from './MenuItemList';
+import Popover from './Popover';
+import {PressableWithFeedback} from './Pressable';
+import Text from './Text';
+
+function AccountSwitcher() {
+    const currentUserPersonalDetails = useCurrentUserPersonalDetails();
+    const styles = useThemeStyles();
+    const theme = useTheme();
+    const {translate} = useLocalize();
+    const {isOffline} = useNetwork();
+    const {canUseNewDotCopilot} = usePermissions();
+    const {shouldUseNarrowLayout} = useResponsiveLayout();
+    const [account] = useOnyx(ONYXKEYS.ACCOUNT);
+    const buttonRef = useRef<HTMLDivElement>(null);
+
+    const [shouldShowDelegatorMenu, setShouldShowDelegatorMenu] = useState(false);
+    const [shouldShowOfflineModal, setShouldShowOfflineModal] = useState(false);
+    const delegators = account?.delegatedAccess?.delegators ?? [];
+
+    const isActingAsDelegate = !!account?.delegatedAccess?.delegate ?? false;
+    const canSwitchAccounts = canUseNewDotCopilot && (delegators.length > 0 || isActingAsDelegate);
+
+    const createBaseMenuItem = (personalDetails: PersonalDetails | undefined, error?: TranslationPaths, additionalProps: MenuItemWithLink = {}): MenuItemWithLink => {
+        return {
+            title: personalDetails?.displayName ?? personalDetails?.login,
+            description: personalDetails?.login,
+            avatarID: personalDetails?.accountID ?? -1,
+            icon: personalDetails?.avatar ?? '',
+            iconType: CONST.ICON_TYPE_AVATAR,
+            outerWrapperStyle: shouldUseNarrowLayout ? {} : styles.accountSwitcherPopover,
+            numberOfLinesDescription: 1,
+            errorText: error ? translate(error) : '',
+            shouldShowRedDotIndicator: !!error,
+            errorTextStyle: styles.mt2,
+            ...additionalProps,
+        };
+    };
+
+    const menuItems = (): MenuItemProps[] => {
+        const currentUserMenuItem = createBaseMenuItem(currentUserPersonalDetails, undefined, {
+            wrapperStyle: [styles.buttonDefaultBG],
+            focused: true,
+            shouldShowRightIcon: true,
+            iconRight: Expensicons.Checkmark,
+            success: true,
+            key: `${currentUserPersonalDetails?.login}-current`,
+        });
+
+        if (isActingAsDelegate) {
+            const delegateEmail = account?.delegatedAccess?.delegate ?? '';
+
+            // Avoid duplicating the current user in the list when switching accounts
+            if (delegateEmail === currentUserPersonalDetails.login) {
+                return [currentUserMenuItem];
+            }
+
+            const delegatePersonalDetails = PersonalDetailsUtils.getPersonalDetailByEmail(delegateEmail);
+            const error = account?.delegatedAccess?.error;
+
+            return [
+                createBaseMenuItem(delegatePersonalDetails, error, {
+                    onPress: () => {
+                        if (isOffline) {
+                            Modal.close(() => setShouldShowOfflineModal(true));
+                            return;
+                        }
+                        disconnect();
+                    },
+                    key: `${delegateEmail}-delegate`,
+                }),
+                currentUserMenuItem,
+            ];
+        }
+
+        const delegatorMenuItems: MenuItemProps[] = delegators
+            .filter(({email}) => email !== currentUserPersonalDetails.login)
+            .map(({email, role, error}, index) => {
+                const personalDetails = PersonalDetailsUtils.getPersonalDetailByEmail(email);
+                return createBaseMenuItem(personalDetails, error, {
+                    badgeText: translate('delegate.role', role),
+                    onPress: () => {
+                        if (isOffline) {
+                            Modal.close(() => setShouldShowOfflineModal(true));
+                            return;
+                        }
+                        connect(email);
+                    },
+                    key: `${email}-${index}`,
+                });
+            });
+
+        return [currentUserMenuItem, ...delegatorMenuItems];
+    };
+
+    return (
+        <>
+            <PressableWithFeedback
+                accessible
+                accessibilityLabel={translate('common.profile')}
+                onPress={() => {
+                    setShouldShowDelegatorMenu(!shouldShowDelegatorMenu);
+                }}
+                ref={buttonRef}
+                interactive={canSwitchAccounts}
+                wrapperStyle={[styles.flexGrow1, styles.flex1, styles.mnw0, styles.justifyContentCenter]}
+            >
+                <View style={[styles.flexRow, styles.gap3]}>
+                    <Avatar
+                        type={CONST.ICON_TYPE_AVATAR}
+                        size={CONST.AVATAR_SIZE.MEDIUM}
+                        avatarID={currentUserPersonalDetails?.accountID}
+                        source={currentUserPersonalDetails?.avatar}
+                        fallbackIcon={currentUserPersonalDetails.fallbackIcon}
+                    />
+                    <View style={[styles.flex1, styles.flexShrink1, styles.flexBasis0, styles.justifyContentCenter, styles.gap1]}>
+                        <View style={[styles.flexRow, styles.gap1]}>
+                            <Text
+                                numberOfLines={1}
+                                style={[styles.textBold, styles.textLarge]}
+                            >
+                                {currentUserPersonalDetails?.displayName}
+                            </Text>
+                            {canSwitchAccounts && (
+                                <View style={styles.justifyContentCenter}>
+                                    <Icon
+                                        fill={theme.icon}
+                                        src={Expensicons.CaretUpDown}
+                                        height={variables.iconSizeSmall}
+                                        width={variables.iconSizeSmall}
+                                    />
+                                </View>
+                            )}
+                        </View>
+                        <Text
+                            numberOfLines={1}
+                            style={[styles.colorMuted, styles.fontSizeLabel]}
+                        >
+                            {currentUserPersonalDetails?.login}
+                        </Text>
+                    </View>
+                </View>
+            </PressableWithFeedback>
+            {canSwitchAccounts && (
+                <Popover
+                    isVisible={shouldShowDelegatorMenu}
+                    onClose={() => {
+                        setShouldShowDelegatorMenu(false);
+                        clearDelegatorErrors();
+                    }}
+                    anchorRef={buttonRef}
+                    anchorPosition={styles.accountSwitcherAnchorPosition}
+                >
+                    <View style={styles.pb4}>
+                        <Text style={[styles.createMenuHeaderText, styles.ph5, styles.pb2, styles.pt4]}>{translate('delegate.switchAccount')}</Text>
+                        <MenuItemList
+                            menuItems={menuItems()}
+                            shouldUseSingleExecution
+                        />
+                    </View>
+                </Popover>
+            )}
+            <ConfirmModal
+                title={translate('common.youAppearToBeOffline')}
+                isVisible={shouldShowOfflineModal}
+                onConfirm={() => setShouldShowOfflineModal(false)}
+                onCancel={() => setShouldShowOfflineModal(false)}
+                confirmText={translate('common.buttonConfirm')}
+                prompt={translate('common.offlinePrompt')}
+                shouldShowCancelButton={false}
+            />
+        </>
+    );
+}
+
+AccountSwitcher.displayName = 'AccountSwitcher';
+
+export default AccountSwitcher;
diff --git a/src/components/AccountSwitcherSkeletonView/index.tsx b/src/components/AccountSwitcherSkeletonView/index.tsx
new file mode 100644
index 000000000000..eb01a23e9ade
--- /dev/null
+++ b/src/components/AccountSwitcherSkeletonView/index.tsx
@@ -0,0 +1,58 @@
+import React from 'react';
+import {View} from 'react-native';
+import {Circle, Rect} from 'react-native-svg';
+import type {ValueOf} from 'type-fest';
+import SkeletonViewContentLoader from '@components/SkeletonViewContentLoader';
+import useStyleUtils from '@hooks/useStyleUtils';
+import useTheme from '@hooks/useTheme';
+import useThemeStyles from '@hooks/useThemeStyles';
+import CONST from '@src/CONST';
+
+type AccountSwitcherSkeletonViewProps = {
+    /** Whether to animate the skeleton view */
+    shouldAnimate?: boolean;
+
+    /** The size of the avatar */
+    avatarSize?: ValueOf<typeof CONST.AVATAR_SIZE>;
+};
+
+function AccountSwitcherSkeletonView({shouldAnimate = true, avatarSize = CONST.AVATAR_SIZE.LARGE}: AccountSwitcherSkeletonViewProps) {
+    const theme = useTheme();
+    const styles = useThemeStyles();
+    const StyleUtils = useStyleUtils();
+    const avatarPlaceholderSize = StyleUtils.getAvatarSize(avatarSize);
+    const avatarPlaceholderRadius = avatarPlaceholderSize / 2;
+    const startPositionX = 30;
+
+    return (
+        <View style={styles.avatarSectionWrapperSkeleton}>
+            <SkeletonViewContentLoader
+                animate={shouldAnimate}
+                backgroundColor={theme.skeletonLHNIn}
+                foregroundColor={theme.skeletonLHNOut}
+                height={avatarPlaceholderSize + styles.pb3.paddingBottom}
+            >
+                <Circle
+                    cx={startPositionX}
+                    cy={avatarPlaceholderRadius}
+                    r={avatarPlaceholderRadius}
+                />
+                <Rect
+                    x={startPositionX + avatarPlaceholderRadius + styles.gap3.gap}
+                    y="11"
+                    width="45%"
+                    height="8"
+                />
+                <Rect
+                    x={startPositionX + avatarPlaceholderRadius + styles.gap3.gap}
+                    y="31"
+                    width="55%"
+                    height="8"
+                />
+            </SkeletonViewContentLoader>
+        </View>
+    );
+}
+
+AccountSwitcherSkeletonView.displayName = 'AccountSwitcherSkeletonView';
+export default AccountSwitcherSkeletonView;
diff --git a/src/components/AccountingConnectionConfirmationModal.tsx b/src/components/AccountingConnectionConfirmationModal.tsx
new file mode 100644
index 000000000000..c472f215b6df
--- /dev/null
+++ b/src/components/AccountingConnectionConfirmationModal.tsx
@@ -0,0 +1,30 @@
+import React from 'react';
+import useLocalize from '@hooks/useLocalize';
+import type {ConnectionName} from '@src/types/onyx/Policy';
+import ConfirmModal from './ConfirmModal';
+
+type AccountingConnectionConfirmationModalProps = {
+    integrationToConnect: ConnectionName;
+    onConfirm: () => void;
+    onCancel: () => void;
+};
+
+function AccountingConnectionConfirmationModal({integrationToConnect, onCancel, onConfirm}: AccountingConnectionConfirmationModalProps) {
+    const {translate} = useLocalize();
+
+    return (
+        <ConfirmModal
+            title={translate('workspace.accounting.connectTitle', integrationToConnect)}
+            isVisible
+            onConfirm={onConfirm}
+            onCancel={onCancel}
+            prompt={translate('workspace.accounting.connectPrompt', integrationToConnect)}
+            confirmText={translate('workspace.accounting.setup')}
+            cancelText={translate('common.cancel')}
+            success
+        />
+    );
+}
+
+AccountingConnectionConfirmationModal.displayName = 'AccountingConnectionConfirmationModal';
+export default AccountingConnectionConfirmationModal;
diff --git a/src/components/AccountingListSkeletonView.tsx b/src/components/AccountingListSkeletonView.tsx
new file mode 100644
index 000000000000..dbe8ada6c4b7
--- /dev/null
+++ b/src/components/AccountingListSkeletonView.tsx
@@ -0,0 +1,36 @@
+import React from 'react';
+import {Circle, Rect} from 'react-native-svg';
+import ItemListSkeletonView from './Skeletons/ItemListSkeletonView';
+
+type AccountingListSkeletonViewProps = {
+    shouldAnimate?: boolean;
+    gradientOpacityEnabled?: boolean;
+};
+
+function AccountingListSkeletonView({shouldAnimate = true, gradientOpacityEnabled = false}: AccountingListSkeletonViewProps) {
+    return (
+        <ItemListSkeletonView
+            shouldAnimate={shouldAnimate}
+            gradientOpacityEnabled={gradientOpacityEnabled}
+            renderSkeletonItem={() => (
+                <>
+                    <Circle
+                        cx="20"
+                        cy="32"
+                        r="20"
+                    />
+                    <Rect
+                        x="54"
+                        y="28"
+                        width="40%"
+                        height="8"
+                    />
+                </>
+            )}
+        />
+    );
+}
+
+AccountingListSkeletonView.displayName = 'AccountingListSkeletonView';
+
+export default AccountingListSkeletonView;
diff --git a/src/components/ActiveWorkspace/ActiveWorkspaceProvider.tsx b/src/components/ActiveWorkspace/ActiveWorkspaceProvider.tsx
deleted file mode 100644
index 884b9a2a2d95..000000000000
--- a/src/components/ActiveWorkspace/ActiveWorkspaceProvider.tsx
+++ /dev/null
@@ -1,19 +0,0 @@
-import React, {useMemo, useState} from 'react';
-import type ChildrenProps from '@src/types/utils/ChildrenProps';
-import ActiveWorkspaceContext from './ActiveWorkspaceContext';
-
-function ActiveWorkspaceContextProvider({children}: ChildrenProps) {
-    const [activeWorkspaceID, setActiveWorkspaceID] = useState<string | undefined>(undefined);
-
-    const value = useMemo(
-        () => ({
-            activeWorkspaceID,
-            setActiveWorkspaceID,
-        }),
-        [activeWorkspaceID],
-    );
-
-    return <ActiveWorkspaceContext.Provider value={value}>{children}</ActiveWorkspaceContext.Provider>;
-}
-
-export default ActiveWorkspaceContextProvider;
diff --git a/src/components/ActiveWorkspaceProvider/index.tsx b/src/components/ActiveWorkspaceProvider/index.tsx
new file mode 100644
index 000000000000..bc7260cdf10b
--- /dev/null
+++ b/src/components/ActiveWorkspaceProvider/index.tsx
@@ -0,0 +1,19 @@
+import React, {useMemo, useState} from 'react';
+import ActiveWorkspaceContext from '@components/ActiveWorkspace/ActiveWorkspaceContext';
+import type ChildrenProps from '@src/types/utils/ChildrenProps';
+
+function ActiveWorkspaceContextProvider({children}: ChildrenProps) {
+    const [activeWorkspaceID, setActiveWorkspaceID] = useState<string | undefined>(undefined);
+
+    const value = useMemo(
+        () => ({
+            activeWorkspaceID,
+            setActiveWorkspaceID,
+        }),
+        [activeWorkspaceID, setActiveWorkspaceID],
+    );
+
+    return <ActiveWorkspaceContext.Provider value={value}>{children}</ActiveWorkspaceContext.Provider>;
+}
+
+export default ActiveWorkspaceContextProvider;
diff --git a/src/components/ActiveWorkspaceProvider/index.website.tsx b/src/components/ActiveWorkspaceProvider/index.website.tsx
new file mode 100644
index 000000000000..82e46d70f896
--- /dev/null
+++ b/src/components/ActiveWorkspaceProvider/index.website.tsx
@@ -0,0 +1,29 @@
+import React, {useCallback, useMemo, useState} from 'react';
+import ActiveWorkspaceContext from '@components/ActiveWorkspace/ActiveWorkspaceContext';
+import CONST from '@src/CONST';
+import type ChildrenProps from '@src/types/utils/ChildrenProps';
+
+function ActiveWorkspaceContextProvider({children}: ChildrenProps) {
+    const [activeWorkspaceID, updateActiveWorkspaceID] = useState<string | undefined>(undefined);
+
+    const setActiveWorkspaceID = useCallback((workspaceID: string | undefined) => {
+        updateActiveWorkspaceID(workspaceID);
+        if (workspaceID && sessionStorage) {
+            sessionStorage?.setItem(CONST.SESSION_STORAGE_KEYS.ACTIVE_WORKSPACE_ID, workspaceID);
+        } else {
+            sessionStorage?.removeItem(CONST.SESSION_STORAGE_KEYS.ACTIVE_WORKSPACE_ID);
+        }
+    }, []);
+
+    const value = useMemo(
+        () => ({
+            activeWorkspaceID,
+            setActiveWorkspaceID,
+        }),
+        [activeWorkspaceID, setActiveWorkspaceID],
+    );
+
+    return <ActiveWorkspaceContext.Provider value={value}>{children}</ActiveWorkspaceContext.Provider>;
+}
+
+export default ActiveWorkspaceContextProvider;
diff --git a/src/components/AddPaymentCard/PaymentCardChangeCurrencyForm.tsx b/src/components/AddPaymentCard/PaymentCardChangeCurrencyForm.tsx
new file mode 100644
index 000000000000..f967272ac63c
--- /dev/null
+++ b/src/components/AddPaymentCard/PaymentCardChangeCurrencyForm.tsx
@@ -0,0 +1,142 @@
+import React, {useCallback, useMemo, useState} from 'react';
+import {View} from 'react-native';
+import type {ValueOf} from 'type-fest';
+import FormProvider from '@components/Form/FormProvider';
+import InputWrapper from '@components/Form/InputWrapper';
+import type {FormInputErrors, FormOnyxValues} from '@components/Form/types';
+import MenuItemWithTopDescription from '@components/MenuItemWithTopDescription';
+import SelectionList from '@components/SelectionList';
+import RadioListItem from '@components/SelectionList/RadioListItem';
+import TextInput from '@components/TextInput';
+import useLocalize from '@hooks/useLocalize';
+import useThemeStyles from '@hooks/useThemeStyles';
+import * as ValidationUtils from '@libs/ValidationUtils';
+import CONST from '@src/CONST';
+import ONYXKEYS from '@src/ONYXKEYS';
+import INPUT_IDS from '@src/types/form/ChangeBillingCurrencyForm';
+import PaymentCardCurrencyHeader from './PaymentCardCurrencyHeader';
+import PaymentCardCurrencyModal from './PaymentCardCurrencyModal';
+
+type PaymentCardFormProps = {
+    initialCurrency?: ValueOf<typeof CONST.PAYMENT_CARD_CURRENCY>;
+    isSecurityCodeRequired?: boolean;
+    changeBillingCurrency: (currency?: ValueOf<typeof CONST.PAYMENT_CARD_CURRENCY>, values?: FormOnyxValues<typeof ONYXKEYS.FORMS.CHANGE_BILLING_CURRENCY_FORM>) => void;
+};
+
+const REQUIRED_FIELDS = [INPUT_IDS.SECURITY_CODE];
+
+function PaymentCardChangeCurrencyForm({changeBillingCurrency, isSecurityCodeRequired, initialCurrency}: PaymentCardFormProps) {
+    const styles = useThemeStyles();
+    const {translate} = useLocalize();
+
+    const [isCurrencyModalVisible, setIsCurrencyModalVisible] = useState(false);
+    const [currency, setCurrency] = useState<ValueOf<typeof CONST.PAYMENT_CARD_CURRENCY>>(initialCurrency ?? CONST.PAYMENT_CARD_CURRENCY.USD);
+
+    const validate = (values: FormOnyxValues<typeof ONYXKEYS.FORMS.CHANGE_BILLING_CURRENCY_FORM>): FormInputErrors<typeof ONYXKEYS.FORMS.CHANGE_BILLING_CURRENCY_FORM> => {
+        const errors = ValidationUtils.getFieldRequiredErrors(values, REQUIRED_FIELDS);
+
+        if (values.securityCode && !ValidationUtils.isValidSecurityCode(values.securityCode)) {
+            errors.securityCode = translate('addPaymentCardPage.error.securityCode');
+        }
+
+        return errors;
+    };
+
+    const {sections} = useMemo(
+        () => ({
+            sections: [
+                {
+                    data: (Object.keys(CONST.PAYMENT_CARD_CURRENCY) as Array<ValueOf<typeof CONST.PAYMENT_CARD_CURRENCY>>).map((currencyItem) => ({
+                        text: currencyItem,
+                        value: currencyItem,
+                        keyForList: currencyItem,
+                        isSelected: currencyItem === currency,
+                    })),
+                },
+            ],
+        }),
+        [currency],
+    );
+
+    const showCurrenciesModal = useCallback(() => {
+        setIsCurrencyModalVisible(true);
+    }, []);
+
+    const changeCurrency = useCallback((selectedCurrency: ValueOf<typeof CONST.PAYMENT_CARD_CURRENCY>) => {
+        setCurrency(selectedCurrency);
+        setIsCurrencyModalVisible(false);
+    }, []);
+
+    const selectCurrency = useCallback(
+        (selectedCurrency: ValueOf<typeof CONST.PAYMENT_CARD_CURRENCY>) => {
+            setCurrency(selectedCurrency);
+            changeBillingCurrency(selectedCurrency);
+        },
+        [changeBillingCurrency],
+    );
+
+    if (isSecurityCodeRequired) {
+        return (
+            <FormProvider
+                formID={ONYXKEYS.FORMS.CHANGE_BILLING_CURRENCY_FORM}
+                validate={validate}
+                onSubmit={(values) => changeBillingCurrency(currency, values)}
+                submitButtonText={translate('common.save')}
+                scrollContextEnabled
+                style={[styles.mh5, styles.flexGrow1]}
+            >
+                <PaymentCardCurrencyHeader />
+                <>
+                    <View style={[styles.mt5, styles.mhn5]}>
+                        <MenuItemWithTopDescription
+                            shouldShowRightIcon
+                            title={currency}
+                            descriptionTextStyle={styles.textNormal}
+                            description={translate('common.currency')}
+                            onPress={showCurrenciesModal}
+                        />
+                    </View>
+                    <InputWrapper
+                        InputComponent={TextInput}
+                        inputID={INPUT_IDS.SECURITY_CODE}
+                        label={translate('addDebitCardPage.cvv')}
+                        aria-label={translate('addDebitCardPage.cvv')}
+                        role={CONST.ROLE.PRESENTATION}
+                        maxLength={4}
+                        containerStyles={[styles.mt5]}
+                        inputMode={CONST.INPUT_MODE.NUMERIC}
+                    />
+                </>
+                <PaymentCardCurrencyModal
+                    isVisible={isCurrencyModalVisible}
+                    currencies={Object.keys(CONST.PAYMENT_CARD_CURRENCY) as Array<ValueOf<typeof CONST.PAYMENT_CARD_CURRENCY>>}
+                    currentCurrency={currency}
+                    onCurrencyChange={changeCurrency}
+                    onClose={() => setIsCurrencyModalVisible(false)}
+                />
+            </FormProvider>
+        );
+    }
+
+    return (
+        <View style={[styles.mh5, styles.flexGrow1]}>
+            <SelectionList
+                headerContent={<PaymentCardCurrencyHeader isSectionList />}
+                initiallyFocusedOptionKey={currency}
+                containerStyle={[styles.mhn5]}
+                sections={sections}
+                onSelectRow={(option) => {
+                    selectCurrency(option.value);
+                }}
+                showScrollIndicator
+                shouldStopPropagation
+                shouldUseDynamicMaxToRenderPerBatch
+                ListItem={RadioListItem}
+            />
+        </View>
+    );
+}
+
+PaymentCardChangeCurrencyForm.displayName = 'PaymentCardChangeCurrencyForm';
+
+export default PaymentCardChangeCurrencyForm;
diff --git a/src/components/AddPaymentCard/PaymentCardCurrencyHeader.tsx b/src/components/AddPaymentCard/PaymentCardCurrencyHeader.tsx
new file mode 100644
index 000000000000..e5142aec8efc
--- /dev/null
+++ b/src/components/AddPaymentCard/PaymentCardCurrencyHeader.tsx
@@ -0,0 +1,28 @@
+import React from 'react';
+import {View} from 'react-native';
+import Text from '@components/Text';
+import TextLink from '@components/TextLink';
+import useLocalize from '@hooks/useLocalize';
+import useThemeStyles from '@hooks/useThemeStyles';
+import CONST from '@src/CONST';
+
+function PaymentCardCurrencyHeader({isSectionList}: {isSectionList?: boolean}) {
+    const styles = useThemeStyles();
+    const {translate} = useLocalize();
+    return (
+        <View style={[isSectionList && styles.mh5]}>
+            <Text style={[styles.mt3, isSectionList && styles.mb5]}>
+                {`${translate('billingCurrency.note')}`}{' '}
+                <TextLink
+                    style={styles.link}
+                    href={CONST.PRICING}
+                >{`${translate('billingCurrency.noteLink')}`}</TextLink>{' '}
+                {`${translate('billingCurrency.noteDetails')}`}
+            </Text>
+        </View>
+    );
+}
+
+PaymentCardCurrencyHeader.displayName = 'PaymentCardCurrencyHeader';
+
+export default PaymentCardCurrencyHeader;
diff --git a/src/components/AddPaymentCard/PaymentCardCurrencyModal.tsx b/src/components/AddPaymentCard/PaymentCardCurrencyModal.tsx
new file mode 100644
index 000000000000..c3c38c4aec72
--- /dev/null
+++ b/src/components/AddPaymentCard/PaymentCardCurrencyModal.tsx
@@ -0,0 +1,88 @@
+import React, {useMemo} from 'react';
+import type {ValueOf} from 'type-fest';
+import HeaderWithBackButton from '@components/HeaderWithBackButton';
+import Modal from '@components/Modal';
+import ScreenWrapper from '@components/ScreenWrapper';
+import SelectionList from '@components/SelectionList';
+import RadioListItem from '@components/SelectionList/RadioListItem';
+import useLocalize from '@hooks/useLocalize';
+import useThemeStyles from '@hooks/useThemeStyles';
+import useWindowDimensions from '@hooks/useWindowDimensions';
+import CONST from '@src/CONST';
+
+type PaymentCardCurrencyModalProps = {
+    /** Whether the modal is visible */
+    isVisible: boolean;
+
+    /** The list of currencies to render */
+    currencies: Array<ValueOf<typeof CONST.PAYMENT_CARD_CURRENCY>>;
+
+    /** Currently selected currency */
+    currentCurrency: ValueOf<typeof CONST.PAYMENT_CARD_CURRENCY>;
+
+    /** Function to call when the user selects a currency */
+    onCurrencyChange?: (currency: ValueOf<typeof CONST.PAYMENT_CARD_CURRENCY>) => void;
+
+    /** Function to call when the user closes the currency picker */
+    onClose?: () => void;
+};
+
+function PaymentCardCurrencyModal({isVisible, currencies, currentCurrency = CONST.PAYMENT_CARD_CURRENCY.USD, onCurrencyChange, onClose}: PaymentCardCurrencyModalProps) {
+    const {isSmallScreenWidth} = useWindowDimensions();
+    const styles = useThemeStyles();
+    const {translate} = useLocalize();
+    const {sections} = useMemo(
+        () => ({
+            sections: [
+                {
+                    data: currencies.map((currency) => ({
+                        text: currency,
+                        value: currency,
+                        keyForList: currency,
+                        isSelected: currency === currentCurrency,
+                    })),
+                },
+            ],
+        }),
+        [currencies, currentCurrency],
+    );
+
+    return (
+        <Modal
+            type={CONST.MODAL.MODAL_TYPE.RIGHT_DOCKED}
+            isVisible={isVisible}
+            onClose={() => onClose?.()}
+            onModalHide={onClose}
+            hideModalContentWhileAnimating
+            innerContainerStyle={styles.RHPNavigatorContainer(isSmallScreenWidth)}
+            useNativeDriver
+        >
+            <ScreenWrapper
+                style={styles.pb0}
+                includePaddingTop={false}
+                includeSafeAreaPaddingBottom={false}
+                testID={PaymentCardCurrencyModal.displayName}
+            >
+                <HeaderWithBackButton
+                    title={translate('common.currency')}
+                    onBackButtonPress={onClose}
+                />
+                <SelectionList
+                    sections={sections}
+                    onSelectRow={(option) => {
+                        onCurrencyChange?.(option.value);
+                    }}
+                    initiallyFocusedOptionKey={currentCurrency}
+                    showScrollIndicator
+                    shouldStopPropagation
+                    shouldUseDynamicMaxToRenderPerBatch
+                    ListItem={RadioListItem}
+                />
+            </ScreenWrapper>
+        </Modal>
+    );
+}
+
+PaymentCardCurrencyModal.displayName = 'PaymentCardCurrencyModal';
+
+export default PaymentCardCurrencyModal;
diff --git a/src/components/AddPaymentCard/PaymentCardForm.tsx b/src/components/AddPaymentCard/PaymentCardForm.tsx
new file mode 100644
index 000000000000..f38ea60f1aad
--- /dev/null
+++ b/src/components/AddPaymentCard/PaymentCardForm.tsx
@@ -0,0 +1,325 @@
+import {useRoute} from '@react-navigation/native';
+import React, {useCallback, useRef, useState} from 'react';
+import type {ReactNode} from 'react';
+import {View} from 'react-native';
+import {useOnyx} from 'react-native-onyx';
+import type {ValueOf} from 'type-fest';
+import AddressSearch from '@components/AddressSearch';
+import CheckboxWithLabel from '@components/CheckboxWithLabel';
+import CurrencySelector from '@components/CurrencySelector';
+import FormProvider from '@components/Form/FormProvider';
+import InputWrapper from '@components/Form/InputWrapper';
+import type {FormInputErrors, FormOnyxValues} from '@components/Form/types';
+import type {AnimatedTextInputRef} from '@components/RNTextInput';
+import StateSelector from '@components/StateSelector';
+import Text from '@components/Text';
+import TextInput from '@components/TextInput';
+import TextLink from '@components/TextLink';
+import useLocalize from '@hooks/useLocalize';
+import useThemeStyles from '@hooks/useThemeStyles';
+import * as ValidationUtils from '@libs/ValidationUtils';
+import CONST from '@src/CONST';
+import type {TranslationPaths} from '@src/languages/types';
+import ONYXKEYS from '@src/ONYXKEYS';
+import ROUTES from '@src/ROUTES';
+import SCREENS from '@src/SCREENS';
+import INPUT_IDS from '@src/types/form/AddPaymentCardForm';
+
+type PaymentCardFormProps = {
+    shouldShowPaymentCardForm?: boolean;
+    showAcceptTerms?: boolean;
+    showAddressField?: boolean;
+    showCurrencyField?: boolean;
+    showStateSelector?: boolean;
+    isDebitCard?: boolean;
+    addPaymentCard: (values: FormOnyxValues<typeof ONYXKEYS.FORMS.ADD_PAYMENT_CARD_FORM>, currency?: ValueOf<typeof CONST.PAYMENT_CARD_CURRENCY>) => void;
+    submitButtonText: string;
+    /** Custom content to display in the footer after card form */
+    footerContent?: ReactNode;
+    /** Custom content to display in the header before card form */
+    headerContent?: ReactNode;
+    /** object to get currency route details from */
+    currencySelectorRoute?: typeof ROUTES.SETTINGS_SUBSCRIPTION_CHANGE_PAYMENT_CURRENCY;
+};
+
+function IAcceptTheLabel() {
+    const {translate} = useLocalize();
+
+    return (
+        <Text>
+            {`${translate('common.iAcceptThe')}`}
+            <TextLink href={CONST.TERMS_URL}>{`${translate('common.addCardTermsOfService')}`}</TextLink> {`${translate('common.and')}`}
+            <TextLink href={CONST.PRIVACY_URL}> {` ${translate('common.privacyPolicy')} `}</TextLink>
+        </Text>
+    );
+}
+
+const REQUIRED_FIELDS = [
+    INPUT_IDS.NAME_ON_CARD,
+    INPUT_IDS.CARD_NUMBER,
+    INPUT_IDS.EXPIRATION_DATE,
+    INPUT_IDS.ADDRESS_STREET,
+    INPUT_IDS.SECURITY_CODE,
+    INPUT_IDS.ADDRESS_ZIP_CODE,
+    INPUT_IDS.ADDRESS_STATE,
+    INPUT_IDS.CURRENCY,
+];
+
+const CARD_TYPES = {
+    DEBIT_CARD: 'debit',
+    PAYMENT_CARD: 'payment',
+};
+
+const CARD_TYPE_SECTIONS = {
+    DEFAULTS: 'defaults',
+    ERROR: 'error',
+};
+type CartTypesMap = (typeof CARD_TYPES)[keyof typeof CARD_TYPES];
+type CartTypeSectionsMap = (typeof CARD_TYPE_SECTIONS)[keyof typeof CARD_TYPE_SECTIONS];
+
+type CardLabels = Record<CartTypesMap, Record<CartTypeSectionsMap, Record<string, TranslationPaths>>>;
+
+const CARD_LABELS: CardLabels = {
+    [CARD_TYPES.DEBIT_CARD]: {
+        [CARD_TYPE_SECTIONS.DEFAULTS]: {
+            cardNumber: 'addDebitCardPage.debitCardNumber',
+            nameOnCard: 'addDebitCardPage.nameOnCard',
+            expirationDate: 'addDebitCardPage.expirationDate',
+            expiration: 'addDebitCardPage.expiration',
+            securityCode: 'addDebitCardPage.cvv',
+            billingAddress: 'addDebitCardPage.billingAddress',
+        },
+        [CARD_TYPE_SECTIONS.ERROR]: {
+            nameOnCard: 'addDebitCardPage.error.invalidName',
+            cardNumber: 'addDebitCardPage.error.debitCardNumber',
+            expirationDate: 'addDebitCardPage.error.expirationDate',
+            securityCode: 'addDebitCardPage.error.securityCode',
+            addressStreet: 'addDebitCardPage.error.addressStreet',
+            addressZipCode: 'addDebitCardPage.error.addressZipCode',
+        },
+    },
+    [CARD_TYPES.PAYMENT_CARD]: {
+        defaults: {
+            cardNumber: 'addPaymentCardPage.paymentCardNumber',
+            nameOnCard: 'addPaymentCardPage.nameOnCard',
+            expirationDate: 'addPaymentCardPage.expirationDate',
+            expiration: 'addPaymentCardPage.expiration',
+            securityCode: 'addPaymentCardPage.cvv',
+            billingAddress: 'addPaymentCardPage.billingAddress',
+        },
+        error: {
+            nameOnCard: 'addPaymentCardPage.error.invalidName',
+            cardNumber: 'addPaymentCardPage.error.paymentCardNumber',
+            expirationDate: 'addPaymentCardPage.error.expirationDate',
+            securityCode: 'addPaymentCardPage.error.securityCode',
+            addressStreet: 'addPaymentCardPage.error.addressStreet',
+            addressZipCode: 'addPaymentCardPage.error.addressZipCode',
+        },
+    },
+};
+
+function PaymentCardForm({
+    shouldShowPaymentCardForm,
+    addPaymentCard,
+    showAcceptTerms,
+    showAddressField,
+    showCurrencyField,
+    isDebitCard,
+    submitButtonText,
+    showStateSelector,
+    footerContent,
+    headerContent,
+    currencySelectorRoute,
+}: PaymentCardFormProps) {
+    const styles = useThemeStyles();
+    const [data] = useOnyx(ONYXKEYS.FORMS.ADD_PAYMENT_CARD_FORM);
+
+    const {translate} = useLocalize();
+    const route = useRoute();
+    const label = CARD_LABELS[isDebitCard ? CARD_TYPES.DEBIT_CARD : CARD_TYPES.PAYMENT_CARD];
+
+    const cardNumberRef = useRef<AnimatedTextInputRef>(null);
+
+    const [cardNumber, setCardNumber] = useState('');
+
+    const validate = (values: FormOnyxValues<typeof ONYXKEYS.FORMS.ADD_PAYMENT_CARD_FORM>): FormInputErrors<typeof ONYXKEYS.FORMS.ADD_PAYMENT_CARD_FORM> => {
+        const errors = ValidationUtils.getFieldRequiredErrors(values, REQUIRED_FIELDS);
+
+        if (values.nameOnCard && !ValidationUtils.isValidLegalName(values.nameOnCard)) {
+            errors.nameOnCard = translate(label.error.nameOnCard);
+        }
+
+        if (values.cardNumber && !ValidationUtils.isValidDebitCard(values.cardNumber.replace(/ /g, ''))) {
+            errors.cardNumber = translate(label.error.cardNumber);
+        }
+
+        if (values.expirationDate && !ValidationUtils.isValidExpirationDate(values.expirationDate)) {
+            errors.expirationDate = translate(label.error.expirationDate);
+        }
+
+        if (values.securityCode && !ValidationUtils.isValidSecurityCode(values.securityCode)) {
+            errors.securityCode = translate(label.error.securityCode);
+        }
+
+        if (values.addressStreet && !ValidationUtils.isValidAddress(values.addressStreet)) {
+            errors.addressStreet = translate(label.error.addressStreet);
+        }
+
+        if (values.addressZipCode && !ValidationUtils.isValidZipCode(values.addressZipCode)) {
+            errors.addressZipCode = translate(label.error.addressZipCode);
+        }
+
+        if (!values.acceptTerms) {
+            errors.acceptTerms = translate('common.error.acceptTerms');
+        }
+
+        return errors;
+    };
+
+    const onChangeCardNumber = useCallback((newValue: string) => {
+        // replace all characters that are not spaces or digits
+        let validCardNumber = newValue.replace(/[^\d ]/g, '');
+
+        // gets only the first 16 digits if the inputted number have more digits than that
+        validCardNumber = validCardNumber.match(/(?:\d *){1,16}/)?.[0] ?? '';
+
+        // add the spacing between every 4 digits
+        validCardNumber =
+            validCardNumber
+                .replace(/ /g, '')
+                .match(/.{1,4}/g)
+                ?.join(' ') ?? '';
+
+        setCardNumber(validCardNumber);
+    }, []);
+
+    if (!shouldShowPaymentCardForm) {
+        return null;
+    }
+
+    return (
+        <>
+            {headerContent}
+            <FormProvider
+                formID={ONYXKEYS.FORMS.ADD_PAYMENT_CARD_FORM}
+                validate={validate}
+                onSubmit={addPaymentCard}
+                submitButtonText={submitButtonText}
+                scrollContextEnabled
+                style={[styles.mh5, styles.flexGrow1]}
+            >
+                <InputWrapper
+                    InputComponent={TextInput}
+                    inputID={INPUT_IDS.CARD_NUMBER}
+                    defaultValue={data?.cardNumber}
+                    label={translate(label.defaults.cardNumber)}
+                    aria-label={translate(label.defaults.cardNumber)}
+                    role={CONST.ROLE.PRESENTATION}
+                    ref={cardNumberRef}
+                    inputMode={CONST.INPUT_MODE.NUMERIC}
+                    onChangeText={onChangeCardNumber}
+                    value={cardNumber}
+                />
+                <InputWrapper
+                    InputComponent={TextInput}
+                    inputID={INPUT_IDS.NAME_ON_CARD}
+                    defaultValue={data?.nameOnCard}
+                    label={translate(label.defaults.nameOnCard)}
+                    aria-label={translate(label.defaults.nameOnCard)}
+                    role={CONST.ROLE.PRESENTATION}
+                    containerStyles={[styles.mt5]}
+                    spellCheck={false}
+                />
+                <View style={[styles.flexRow, styles.mt5]}>
+                    <View style={[styles.mr2, styles.flex1]}>
+                        <InputWrapper
+                            defaultValue={data?.expirationDate}
+                            InputComponent={TextInput}
+                            inputID={INPUT_IDS.EXPIRATION_DATE}
+                            label={translate(label.defaults.expiration)}
+                            aria-label={translate(label.defaults.expiration)}
+                            role={CONST.ROLE.PRESENTATION}
+                            placeholder={translate(label.defaults.expirationDate)}
+                            inputMode={CONST.INPUT_MODE.NUMERIC}
+                            maxLength={4}
+                        />
+                    </View>
+                    <View style={styles.flex1}>
+                        <InputWrapper
+                            InputComponent={TextInput}
+                            inputID={INPUT_IDS.SECURITY_CODE}
+                            defaultValue={data?.securityCode}
+                            label={translate(label.defaults.securityCode)}
+                            aria-label={translate(label.defaults.securityCode)}
+                            role={CONST.ROLE.PRESENTATION}
+                            maxLength={4}
+                            inputMode={CONST.INPUT_MODE.NUMERIC}
+                        />
+                    </View>
+                </View>
+                {!!showAddressField && (
+                    <View>
+                        <InputWrapper
+                            defaultValue={data?.addressStreet}
+                            InputComponent={AddressSearch}
+                            inputID={INPUT_IDS.ADDRESS_STREET}
+                            label={translate(label.defaults.billingAddress)}
+                            containerStyles={[styles.mt5]}
+                            maxInputLength={CONST.FORM_CHARACTER_LIMIT}
+                            // Limit the address search only to the USA until we fully can support international debit cards
+                            isLimitedToUSA
+                        />
+                    </View>
+                )}
+                <InputWrapper
+                    InputComponent={TextInput}
+                    defaultValue={data?.addressZipCode}
+                    inputID={INPUT_IDS.ADDRESS_ZIP_CODE}
+                    label={translate('common.zip')}
+                    aria-label={translate('common.zip')}
+                    role={CONST.ROLE.PRESENTATION}
+                    inputMode={CONST.INPUT_MODE.NUMERIC}
+                    maxLength={CONST.BANK_ACCOUNT.MAX_LENGTH.ZIP_CODE}
+                    containerStyles={[styles.mt5]}
+                />
+                {!!showStateSelector && (
+                    <View style={[styles.mt4, styles.mhn5]}>
+                        <InputWrapper
+                            stateSelectorRoute={route.name === SCREENS.IOU_SEND.ADD_DEBIT_CARD ? ROUTES.MONEY_REQUEST_STATE_SELECTOR : undefined}
+                            InputComponent={StateSelector}
+                            inputID={INPUT_IDS.ADDRESS_STATE}
+                        />
+                    </View>
+                )}
+                {!!showCurrencyField && (
+                    <View style={[styles.mt4, styles.mhn5]}>
+                        <InputWrapper
+                            currencySelectorRoute={currencySelectorRoute}
+                            value={data?.currency ?? CONST.PAYMENT_CARD_CURRENCY.USD}
+                            InputComponent={CurrencySelector}
+                            inputID={INPUT_IDS.CURRENCY}
+                        />
+                    </View>
+                )}
+                {!!showAcceptTerms && (
+                    <View style={[styles.mt4, styles.ml1]}>
+                        <InputWrapper
+                            InputComponent={CheckboxWithLabel}
+                            accessibilityLabel={`${translate('common.iAcceptThe')} ${translate('common.addCardTermsOfService')} ${translate('common.and')} ${translate(
+                                'common.privacyPolicy',
+                            )}`}
+                            inputID={INPUT_IDS.ACCEPT_TERMS}
+                            defaultValue={!!data?.acceptTerms}
+                            LabelComponent={IAcceptTheLabel}
+                        />
+                    </View>
+                )}
+                {footerContent}
+            </FormProvider>
+        </>
+    );
+}
+
+PaymentCardForm.displayName = 'PaymentCardForm';
+
+export default PaymentCardForm;
diff --git a/src/components/AddPaymentMethodMenu.tsx b/src/components/AddPaymentMethodMenu.tsx
index ac9657694500..5621c031f959 100644
--- a/src/components/AddPaymentMethodMenu.tsx
+++ b/src/components/AddPaymentMethodMenu.tsx
@@ -1,5 +1,5 @@
 import type {RefObject} from 'react';
-import React from 'react';
+import React, {useEffect, useState} from 'react';
 import type {View} from 'react-native';
 import type {OnyxEntry} from 'react-native-onyx';
 import {withOnyx} from 'react-native-onyx';
@@ -11,9 +11,9 @@ import ONYXKEYS from '@src/ONYXKEYS';
 import type {AnchorPosition} from '@src/styles';
 import type {Report, Session} from '@src/types/onyx';
 import type AnchorAlignment from '@src/types/utils/AnchorAlignment';
-import type {EmptyObject} from '@src/types/utils/EmptyObject';
 import * as Expensicons from './Icon/Expensicons';
 import type {PaymentMethod} from './KYCWall/types';
+import type BaseModalProps from './Modal/types';
 import PopoverMenu from './PopoverMenu';
 
 type AddPaymentMethodMenuOnyxProps = {
@@ -32,7 +32,7 @@ type AddPaymentMethodMenuProps = AddPaymentMethodMenuOnyxProps & {
     onItemSelected: (paymentMethod: PaymentMethod) => void;
 
     /** The IOU/Expense report we are paying */
-    iouReport?: OnyxEntry<Report> | EmptyObject;
+    iouReport?: OnyxEntry<Report>;
 
     /** Anchor position for the AddPaymentMenu. */
     anchorPosition: AnchorPosition;
@@ -62,23 +62,45 @@ function AddPaymentMethodMenu({
     shouldShowPersonalBankAccountOption = false,
 }: AddPaymentMethodMenuProps) {
     const {translate} = useLocalize();
+    const [restoreFocusType, setRestoreFocusType] = useState<BaseModalProps['restoreFocusType']>();
 
     // Users can choose to pay with business bank account in case of Expense reports or in case of P2P IOU report
     // which then starts a bottom up flow and creates a Collect workspace where the payer is an admin and payee is an employee.
-    const isIOUReport = ReportUtils.isIOUReport(iouReport ?? {});
+    const isIOUReport = ReportUtils.isIOUReport(iouReport);
     const canUseBusinessBankAccount =
-        ReportUtils.isExpenseReport(iouReport ?? {}) || (isIOUReport && !ReportActionsUtils.hasRequestFromCurrentAccount(iouReport?.reportID ?? '', session?.accountID ?? 0));
+        ReportUtils.isExpenseReport(iouReport) || (isIOUReport && !ReportActionsUtils.hasRequestFromCurrentAccount(iouReport?.reportID ?? '-1', session?.accountID ?? -1));
 
     const canUsePersonalBankAccount = shouldShowPersonalBankAccountOption || isIOUReport;
 
+    const isPersonalOnlyOption = canUsePersonalBankAccount && !canUseBusinessBankAccount;
+
+    // We temporarily disabled P2P debit cards so we will automatically select the personal bank account option if there is no other option to select.
+    useEffect(() => {
+        if (!isVisible || !isPersonalOnlyOption) {
+            return;
+        }
+
+        onItemSelected(CONST.PAYMENT_METHODS.PERSONAL_BANK_ACCOUNT);
+    }, [isPersonalOnlyOption, isVisible, onItemSelected]);
+
+    if (isPersonalOnlyOption) {
+        return null;
+    }
+
     return (
         <PopoverMenu
             isVisible={isVisible}
-            onClose={onClose}
+            onClose={() => {
+                setRestoreFocusType(undefined);
+                onClose();
+            }}
             anchorPosition={anchorPosition}
             anchorAlignment={anchorAlignment}
             anchorRef={anchorRef}
-            onItemSelected={onClose}
+            onItemSelected={() => {
+                setRestoreFocusType(CONST.MODAL.RESTORE_FOCUS_TYPE.DELETE);
+                onClose();
+            }}
             menuItems={[
                 ...(canUsePersonalBankAccount
                     ? [
@@ -100,15 +122,18 @@ function AddPaymentMethodMenu({
                           },
                       ]
                     : []),
-                ...[
-                    {
-                        text: translate('common.debitCard'),
-                        icon: Expensicons.CreditCard,
-                        onSelected: () => onItemSelected(CONST.PAYMENT_METHODS.DEBIT_CARD),
-                    },
-                ],
+                // Adding a debit card for P2P payments is temporarily disabled
+                // ...[
+                //     {
+                //         text: translate('common.debitCard'),
+                //         icon: Expensicons.CreditCard,
+                //         onSelected: () => onItemSelected(CONST.PAYMENT_METHODS.DEBIT_CARD),
+                //     },
+                // ],
             ]}
             withoutOverlay
+            shouldEnableNewFocusManagement
+            restoreFocusType={restoreFocusType}
         />
     );
 }
diff --git a/src/components/AddPlaidBankAccount.tsx b/src/components/AddPlaidBankAccount.tsx
index 366f14ec9780..4de286183ea8 100644
--- a/src/components/AddPlaidBankAccount.tsx
+++ b/src/components/AddPlaidBankAccount.tsx
@@ -18,7 +18,6 @@ import FullPageOfflineBlockingView from './BlockingViews/FullPageOfflineBlocking
 import FormHelpMessage from './FormHelpMessage';
 import Icon from './Icon';
 import getBankIcon from './Icon/BankIcons';
-import Picker from './Picker';
 import PlaidLink from './PlaidLink';
 import RadioButtons from './RadioButtons';
 import Text from './Text';
@@ -59,9 +58,6 @@ type AddPlaidBankAccountProps = AddPlaidBankAccountOnyxProps & {
     /** Are we adding a withdrawal account? */
     allowDebit?: boolean;
 
-    /** Is displayed in new VBBA */
-    isDisplayedInNewVBBA?: boolean;
-
     /** Is displayed in new enable wallet flow */
     isDisplayedInWalletFlow?: boolean;
 
@@ -84,7 +80,6 @@ function AddPlaidBankAccount({
     bankAccountID = 0,
     allowDebit = false,
     isPlaidDisabled,
-    isDisplayedInNewVBBA = false,
     errorText = '',
     onInputChange = () => {},
     isDisplayedInWalletFlow = false,
@@ -93,7 +88,7 @@ function AddPlaidBankAccount({
     const styles = useThemeStyles();
     const plaidBankAccounts = plaidData?.bankAccounts ?? [];
     const defaultSelectedPlaidAccount = plaidBankAccounts.find((account) => account.plaidAccountID === selectedPlaidAccountID);
-    const defaultSelectedPlaidAccountID = defaultSelectedPlaidAccount?.plaidAccountID ?? '';
+    const defaultSelectedPlaidAccountID = defaultSelectedPlaidAccount?.plaidAccountID ?? '-1';
     const defaultSelectedPlaidAccountMask = plaidBankAccounts.find((account) => account.plaidAccountID === selectedPlaidAccountID)?.mask ?? '';
     const subscribedKeyboardShortcuts = useRef<Array<() => void>>([]);
     const previousNetworkState = useRef<boolean | undefined>();
@@ -158,7 +153,7 @@ function AddPlaidBankAccount({
         return unsubscribeToNavigationShortcuts;
 
         // disabling this rule, as we want this to run only on the first render
-        // eslint-disable-next-line react-hooks/exhaustive-deps
+        // eslint-disable-next-line react-compiler/react-compiler, react-hooks/exhaustive-deps
     }, []);
 
     useEffect(() => {
@@ -177,6 +172,7 @@ function AddPlaidBankAccount({
     }));
     const {icon, iconSize, iconStyles} = getBankIcon({styles});
     const plaidErrors = plaidData?.errors;
+    // eslint-disable-next-line @typescript-eslint/non-nullable-type-assertion-style
     const plaidDataErrorMessage = !isEmptyObject(plaidErrors) ? (Object.values(plaidErrors)[0] as string) : '';
     const bankName = plaidData?.bankName;
 
@@ -259,62 +255,32 @@ function AddPlaidBankAccount({
         return <FullPageOfflineBlockingView>{renderPlaidLink()}</FullPageOfflineBlockingView>;
     }
 
-    if (isDisplayedInNewVBBA || isDisplayedInWalletFlow) {
-        return (
-            <FullPageOfflineBlockingView>
-                <Text style={[styles.mb3, styles.textHeadlineLineHeightXXL]}>{translate(isDisplayedInWalletFlow ? 'walletPage.chooseYourBankAccount' : 'bankAccount.chooseAnAccount')}</Text>
-                {!!text && <Text style={[styles.mb6, styles.textSupporting]}>{text}</Text>}
-                <View style={[styles.flexRow, styles.alignItemsCenter, styles.mb6]}>
-                    <Icon
-                        src={icon}
-                        height={iconSize}
-                        width={iconSize}
-                        additionalStyles={iconStyles}
-                    />
-                    <View>
-                        <Text style={[styles.ml3, styles.textStrong]}>{bankName}</Text>
-                        {selectedPlaidAccountMask.length > 0 && (
-                            <Text style={[styles.ml3, styles.textLabelSupporting]}>{`${translate('bankAccount.accountEnding')} ${selectedPlaidAccountMask}`}</Text>
-                        )}
-                    </View>
-                </View>
-                <Text style={[styles.textLabelSupporting]}>{`${translate('bankAccount.chooseAnAccountBelow')}:`}</Text>
-                <RadioButtons
-                    items={options}
-                    defaultCheckedValue={defaultSelectedPlaidAccountID}
-                    onPress={handleSelectingPlaidAccount}
-                    radioButtonStyle={[styles.mb6]}
-                />
-                <FormHelpMessage message={errorText} />
-            </FullPageOfflineBlockingView>
-        );
-    }
-
-    // Plaid bank accounts view
     return (
         <FullPageOfflineBlockingView>
-            {!!text && <Text style={[styles.mb5]}>{text}</Text>}
-            <View style={[styles.flexRow, styles.alignItemsCenter, styles.mb5]}>
+            <Text style={[styles.mb3, styles.textHeadlineLineHeightXXL]}>{translate(isDisplayedInWalletFlow ? 'walletPage.chooseYourBankAccount' : 'bankAccount.chooseAnAccount')}</Text>
+            {!!text && <Text style={[styles.mb6, styles.textSupporting]}>{text}</Text>}
+            <View style={[styles.flexRow, styles.alignItemsCenter, styles.mb6]}>
                 <Icon
                     src={icon}
                     height={iconSize}
                     width={iconSize}
                     additionalStyles={iconStyles}
                 />
-                <Text style={[styles.ml3, styles.textStrong]}>{bankName}</Text>
-            </View>
-            <View>
-                <Picker
-                    label={translate('addPersonalBankAccountPage.chooseAccountLabel')}
-                    onInputChange={onSelect}
-                    items={options}
-                    placeholder={{
-                        value: '',
-                        label: translate('bankAccount.chooseAnAccount'),
-                    }}
-                    value={selectedPlaidAccountID}
-                />
+                <View>
+                    <Text style={[styles.ml3, styles.textStrong]}>{bankName}</Text>
+                    {selectedPlaidAccountMask.length > 0 && (
+                        <Text style={[styles.ml3, styles.textLabelSupporting]}>{`${translate('bankAccount.accountEnding')} ${selectedPlaidAccountMask}`}</Text>
+                    )}
+                </View>
             </View>
+            <Text style={[styles.textLabelSupporting]}>{`${translate('bankAccount.chooseAnAccountBelow')}:`}</Text>
+            <RadioButtons
+                items={options}
+                defaultCheckedValue={defaultSelectedPlaidAccountID}
+                onPress={handleSelectingPlaidAccount}
+                radioButtonStyle={[styles.mb6]}
+            />
+            <FormHelpMessage message={errorText} />
         </FullPageOfflineBlockingView>
     );
 }
diff --git a/src/components/AddressForm.tsx b/src/components/AddressForm.tsx
index 9ad4643e834a..7ca4cc3273ca 100644
--- a/src/components/AddressForm.tsx
+++ b/src/components/AddressForm.tsx
@@ -3,8 +3,6 @@ import {View} from 'react-native';
 import useLocalize from '@hooks/useLocalize';
 import useThemeStyles from '@hooks/useThemeStyles';
 import * as ErrorUtils from '@libs/ErrorUtils';
-import type {MaybePhraseKey} from '@libs/Localize';
-import Navigation from '@libs/Navigation/Navigation';
 import * as ValidationUtils from '@libs/ValidationUtils';
 import CONST from '@src/CONST';
 import type {Country} from '@src/CONST';
@@ -77,7 +75,7 @@ function AddressForm({
 
     const zipSampleFormat = (country && (CONST.COUNTRY_ZIP_REGEX_DATA[country] as CountryZipRegex)?.samples) ?? '';
 
-    const zipFormat: MaybePhraseKey = ['common.zipCodeExampleFormat', {zipSampleFormat}];
+    const zipFormat = translate('common.zipCodeExampleFormat', {zipSampleFormat});
 
     const isUSAForm = country === CONST.COUNTRY.US;
 
@@ -88,50 +86,53 @@ function AddressForm({
      * @returns - An object containing the errors for each inputID
      */
 
-    const validator = useCallback((values: FormOnyxValues<typeof ONYXKEYS.FORMS.GET_PHYSICAL_CARD_FORM | typeof ONYXKEYS.FORMS.HOME_ADDRESS_FORM>): Errors => {
-        const errors: Errors & {
-            zipPostCode?: string | string[];
-        } = {};
-        const requiredFields = ['addressLine1', 'city', 'country', 'state'] as const;
-
-        // Check "State" dropdown is a valid state if selected Country is USA
-        if (values.country === CONST.COUNTRY.US && !values.state) {
-            errors.state = 'common.error.fieldRequired';
-        }
-
-        // Add "Field required" errors if any required field is empty
-        requiredFields.forEach((fieldKey) => {
-            const fieldValue = values[fieldKey] ?? '';
-            if (ValidationUtils.isRequiredFulfilled(fieldValue)) {
-                return;
+    const validator = useCallback(
+        (values: FormOnyxValues<typeof ONYXKEYS.FORMS.GET_PHYSICAL_CARD_FORM | typeof ONYXKEYS.FORMS.HOME_ADDRESS_FORM>): Errors => {
+            const errors: Errors & {
+                zipPostCode?: string | string[];
+            } = {};
+            const requiredFields = ['addressLine1', 'city', 'country', 'state'] as const;
+
+            // Check "State" dropdown is a valid state if selected Country is USA
+            if (values.country === CONST.COUNTRY.US && !values.state) {
+                errors.state = translate('common.error.fieldRequired');
             }
 
-            errors[fieldKey] = 'common.error.fieldRequired';
-        });
+            // Add "Field required" errors if any required field is empty
+            requiredFields.forEach((fieldKey) => {
+                const fieldValue = values[fieldKey] ?? '';
+                if (ValidationUtils.isRequiredFulfilled(fieldValue)) {
+                    return;
+                }
+
+                errors[fieldKey] = translate('common.error.fieldRequired');
+            });
 
-        // If no country is selected, default value is an empty string and there's no related regex data so we default to an empty object
-        const countryRegexDetails = (values.country ? CONST.COUNTRY_ZIP_REGEX_DATA?.[values.country] : {}) as CountryZipRegex;
+            // If no country is selected, default value is an empty string and there's no related regex data so we default to an empty object
+            const countryRegexDetails = (values.country ? CONST.COUNTRY_ZIP_REGEX_DATA?.[values.country] : {}) as CountryZipRegex;
 
-        // The postal code system might not exist for a country, so no regex either for them.
-        const countrySpecificZipRegex = countryRegexDetails?.regex;
-        const countryZipFormat = countryRegexDetails?.samples ?? '';
+            // The postal code system might not exist for a country, so no regex either for them.
+            const countrySpecificZipRegex = countryRegexDetails?.regex;
+            const countryZipFormat = countryRegexDetails?.samples ?? '';
 
-        ErrorUtils.addErrorMessage(errors, 'firstName', 'bankAccount.error.firstName');
+            ErrorUtils.addErrorMessage(errors, 'firstName', translate('bankAccount.error.firstName'));
 
-        if (countrySpecificZipRegex) {
-            if (!countrySpecificZipRegex.test(values.zipPostCode?.trim().toUpperCase())) {
-                if (ValidationUtils.isRequiredFulfilled(values.zipPostCode?.trim())) {
-                    errors.zipPostCode = ['privatePersonalDetails.error.incorrectZipFormat', countryZipFormat];
-                } else {
-                    errors.zipPostCode = 'common.error.fieldRequired';
+            if (countrySpecificZipRegex) {
+                if (!countrySpecificZipRegex.test(values.zipPostCode?.trim().toUpperCase())) {
+                    if (ValidationUtils.isRequiredFulfilled(values.zipPostCode?.trim())) {
+                        errors.zipPostCode = translate('privatePersonalDetails.error.incorrectZipFormat', countryZipFormat);
+                    } else {
+                        errors.zipPostCode = translate('common.error.fieldRequired');
+                    }
                 }
+            } else if (!CONST.GENERIC_ZIP_CODE_REGEX.test(values?.zipPostCode?.trim()?.toUpperCase() ?? '')) {
+                errors.zipPostCode = translate('privatePersonalDetails.error.incorrectZipFormat');
             }
-        } else if (!CONST.GENERIC_ZIP_CODE_REGEX.test(values?.zipPostCode?.trim()?.toUpperCase() ?? '')) {
-            errors.zipPostCode = 'privatePersonalDetails.error.incorrectZipFormat';
-        }
 
-        return errors;
-    }, []);
+            return errors;
+        },
+        [translate],
+    );
 
     return (
         <FormProvider
@@ -149,8 +150,6 @@ function AddressForm({
                     label={translate('common.addressLine', {lineNumber: 1})}
                     onValueChange={(data: unknown, key: unknown) => {
                         onAddressChanged(data, key);
-                        // This enforces the country selector to use the country from address instead of the country from URL
-                        Navigation.setParams({country: undefined});
                     }}
                     defaultValue={street1}
                     renamedInputKeys={{
@@ -183,6 +182,7 @@ function AddressForm({
                     InputComponent={CountrySelector}
                     inputID={INPUT_IDS.COUNTRY}
                     value={country}
+                    onValueChange={onAddressChanged}
                     shouldSaveDraft={shouldSaveDraft}
                 />
             </View>
diff --git a/src/components/AddressSearch/index.tsx b/src/components/AddressSearch/index.tsx
index 31ccfc954513..c7753dccadd7 100644
--- a/src/components/AddressSearch/index.tsx
+++ b/src/components/AddressSearch/index.tsx
@@ -14,6 +14,7 @@ import useNetwork from '@hooks/useNetwork';
 import useStyleUtils from '@hooks/useStyleUtils';
 import useTheme from '@hooks/useTheme';
 import useThemeStyles from '@hooks/useThemeStyles';
+import * as UserLocation from '@libs/actions/UserLocation';
 import * as ApiUtils from '@libs/ApiUtils';
 import getCurrentPosition from '@libs/getCurrentPosition';
 import type {GeolocationErrorCodeType} from '@libs/getCurrentPosition/getCurrentPosition.types';
@@ -23,7 +24,24 @@ import CONST from '@src/CONST';
 import type {Address} from '@src/types/onyx/PrivatePersonalDetails';
 import CurrentLocationButton from './CurrentLocationButton';
 import isCurrentTargetInsideContainer from './isCurrentTargetInsideContainer';
-import type {AddressSearchProps} from './types';
+import type {AddressSearchProps, PredefinedPlace} from './types';
+
+/**
+ * Check if the place matches the search by the place name or description.
+ * @param search The search string for a place
+ * @param place The place to check for a match on the search
+ * @returns true if search is related to place, otherwise it returns false.
+ */
+function isPlaceMatchForSearch(search: string, place: PredefinedPlace): boolean {
+    if (!search) {
+        return true;
+    }
+    if (!place) {
+        return false;
+    }
+    const fullSearchSentence = `${place.name ?? ''} ${place.description}`;
+    return search.split(' ').every((searchTerm) => !searchTerm || fullSearchSentence.toLocaleLowerCase().includes(searchTerm.toLocaleLowerCase()));
+}
 
 // The error that's being thrown below will be ignored until we fork the
 // react-native-google-places-autocomplete repo and replace the
@@ -41,6 +59,7 @@ function AddressSearch(
         isLimitedToUSA = false,
         label,
         maxInputLength,
+        onFocus,
         onBlur,
         onInputChange,
         onPress,
@@ -71,7 +90,7 @@ function AddressSearch(
     const [isTyping, setIsTyping] = useState(false);
     const [isFocused, setIsFocused] = useState(false);
     // eslint-disable-next-line @typescript-eslint/prefer-nullish-coalescing
-    const [searchValue, setSearchValue] = useState(value || defaultValue || '');
+    const [searchValue, setSearchValue] = useState('');
     const [locationErrorCode, setLocationErrorCode] = useState<GeolocationErrorCodeType>(null);
     const [isFetchingCurrentLocation, setIsFetchingCurrentLocation] = useState(false);
     const shouldTriggerGeolocationCallbacks = useRef(true);
@@ -214,7 +233,7 @@ function AddressSearch(
 
         if (inputID) {
             Object.entries(values).forEach(([key, inputValue]) => {
-                const inputKey = renamedInputKeys?.[key as keyof Address] ?? key;
+                const inputKey = renamedInputKeys?.[key as keyof Omit<Address, 'current'>] ?? key;
                 if (!inputKey) {
                     return;
                 }
@@ -249,12 +268,17 @@ function AddressSearch(
                 setIsFetchingCurrentLocation(false);
                 setLocationErrorCode(null);
 
+                const {latitude, longitude} = successData.coords;
+
                 const location = {
-                    lat: successData.coords.latitude,
-                    lng: successData.coords.longitude,
+                    lat: latitude,
+                    lng: longitude,
                     address: CONST.YOUR_LOCATION_TEXT,
                     name: CONST.YOUR_LOCATION_TEXT,
                 };
+
+                // Update the current user location
+                UserLocation.setUserLocation({longitude, latitude});
                 onPress?.(location);
             },
             (errorData) => {
@@ -263,7 +287,7 @@ function AddressSearch(
                 }
 
                 setIsFetchingCurrentLocation(false);
-                setLocationErrorCode(errorData.code);
+                setLocationErrorCode(errorData?.code ?? null);
             },
             {
                 maximumAge: 0, // No cache, always get fresh location info
@@ -276,7 +300,7 @@ function AddressSearch(
         // eslint-disable-next-line react/jsx-no-useless-fragment
         <>
             {(predefinedPlaces?.length ?? 0) > 0 && (
-                <>
+                <View style={styles.overflowAuto}>
                     {/* This will show current location button in list if there are some recent destinations */}
                     {shouldShowCurrentLocationButton && (
                         <CurrentLocationButton
@@ -285,7 +309,7 @@ function AddressSearch(
                         />
                     )}
                     {!value && <Text style={[styles.textLabel, styles.colorMuted, styles.pv2, styles.ph3, styles.overflowAuto]}>{translate('common.recentDestinations')}</Text>}
-                </>
+                </View>
             )}
         </>
     );
@@ -298,10 +322,16 @@ function AddressSearch(
         };
     }, []);
 
+    const filteredPredefinedPlaces = useMemo(() => {
+        if (!searchValue) {
+            return predefinedPlaces ?? [];
+        }
+        return predefinedPlaces?.filter((predefinedPlace) => isPlaceMatchForSearch(searchValue, predefinedPlace)) ?? [];
+    }, [predefinedPlaces, searchValue]);
+
     const listEmptyComponent = useCallback(
-        () =>
-            !!isOffline || !isTyping ? null : <Text style={[styles.textLabel, styles.colorMuted, styles.pv4, styles.ph3, styles.overflowAuto]}>{translate('common.noResultsFound')}</Text>,
-        [isOffline, isTyping, styles, translate],
+        () => (!isTyping ? null : <Text style={[styles.textLabel, styles.colorMuted, styles.pv4, styles.ph3, styles.overflowAuto]}>{translate('common.noResultsFound')}</Text>),
+        [isTyping, styles, translate],
     );
 
     const listLoader = useCallback(
@@ -342,7 +372,7 @@ function AddressSearch(
                         fetchDetails
                         suppressDefaultStyles
                         enablePoweredByContainer={false}
-                        predefinedPlaces={predefinedPlaces ?? undefined}
+                        predefinedPlaces={filteredPredefinedPlaces}
                         listEmptyComponent={listEmptyComponent}
                         listLoaderComponent={listLoader}
                         renderHeaderComponent={renderHeaderComponent}
@@ -351,7 +381,7 @@ function AddressSearch(
                             const subtitle = data.isPredefinedPlace ? data.description : data.structured_formatting.secondary_text;
                             return (
                                 <View>
-                                    {!!title && <Text style={[styles.googleSearchText]}>{title}</Text>}
+                                    {!!title && <Text style={styles.googleSearchText}>{title}</Text>}
                                     <Text style={[title ? styles.textLabelSupporting : styles.googleSearchText]}>{subtitle}</Text>
                                 </View>
                             );
@@ -385,6 +415,7 @@ function AddressSearch(
                             shouldSaveDraft,
                             onFocus: () => {
                                 setIsFocused(true);
+                                onFocus?.();
                             },
                             onBlur: (event) => {
                                 if (!isCurrentTargetInsideContainer(event, containerRef)) {
@@ -414,10 +445,11 @@ function AddressSearch(
                         }}
                         styles={{
                             textInputContainer: [styles.flexColumn],
-                            listView: [StyleUtils.getGoogleListViewStyle(displayListViewBorder), styles.overflowAuto, styles.borderLeft, styles.borderRight, !isFocused && {height: 0}],
+                            listView: [StyleUtils.getGoogleListViewStyle(displayListViewBorder), styles.borderLeft, styles.borderRight, !isFocused && styles.h0],
                             row: [styles.pv4, styles.ph3, styles.overflowAuto],
                             description: [styles.googleSearchText],
-                            separator: [styles.googleSearchSeparator],
+                            separator: [styles.googleSearchSeparator, styles.overflowAuto],
+                            container: [styles.mh100],
                         }}
                         numberOfLines={2}
                         isRowScrollable={false}
@@ -441,11 +473,13 @@ function AddressSearch(
                             )
                         }
                         placeholder=""
-                    />
-                    <LocationErrorMessage
-                        onClose={() => setLocationErrorCode(null)}
-                        locationErrorCode={locationErrorCode}
-                    />
+                        listViewDisplayed
+                    >
+                        <LocationErrorMessage
+                            onClose={() => setLocationErrorCode(null)}
+                            locationErrorCode={locationErrorCode}
+                        />
+                    </GooglePlacesAutocomplete>
                 </View>
             </ScrollView>
             {isFetchingCurrentLocation && <FullScreenLoadingIndicator />}
diff --git a/src/components/AddressSearch/types.ts b/src/components/AddressSearch/types.ts
index bc7acf3f7e40..b654fcad99da 100644
--- a/src/components/AddressSearch/types.ts
+++ b/src/components/AddressSearch/types.ts
@@ -1,7 +1,6 @@
 import type {RefObject} from 'react';
 import type {NativeSyntheticEvent, StyleProp, TextInputFocusEventData, View, ViewStyle} from 'react-native';
 import type {Place} from 'react-native-google-places-autocomplete';
-import type {MaybePhraseKey} from '@libs/Localize';
 import type Locale from '@src/types/onyx/Locale';
 import type {Address} from '@src/types/onyx/PrivatePersonalDetails';
 
@@ -24,6 +23,10 @@ type StreetValue = {
     street: string;
 };
 
+type PredefinedPlace = Place & {
+    name?: string;
+};
+
 type AddressSearchProps = {
     /** The ID used to uniquely identify the input in a Form */
     inputID?: string;
@@ -31,11 +34,14 @@ type AddressSearchProps = {
     /** Saves a draft of the input value when used in a form */
     shouldSaveDraft?: boolean;
 
+    /** Callback that is called when the text input is focused */
+    onFocus?: () => void;
+
     /** Callback that is called when the text input is blurred */
     onBlur?: () => void;
 
     /** Error text to display */
-    errorText?: MaybePhraseKey;
+    errorText?: string;
 
     /** Hint text to display */
     hint?: string;
@@ -65,7 +71,7 @@ type AddressSearchProps = {
     canUseCurrentLocation?: boolean;
 
     /** A list of predefined places that can be shown when the user isn't searching for something */
-    predefinedPlaces?: Place[] | null;
+    predefinedPlaces?: PredefinedPlace[] | null;
 
     /** A map of inputID key names */
     renamedInputKeys?: Address;
@@ -85,4 +91,4 @@ type AddressSearchProps = {
 
 type IsCurrentTargetInsideContainerType = (event: FocusEvent | NativeSyntheticEvent<TextInputFocusEventData>, containerRef: RefObject<View | HTMLElement>) => boolean;
 
-export type {CurrentLocationButtonProps, AddressSearchProps, IsCurrentTargetInsideContainerType, StreetValue};
+export type {CurrentLocationButtonProps, AddressSearchProps, IsCurrentTargetInsideContainerType, StreetValue, PredefinedPlace};
diff --git a/src/components/AmountForm.tsx b/src/components/AmountForm.tsx
index a102b715d526..8ad01d4437ae 100644
--- a/src/components/AmountForm.tsx
+++ b/src/components/AmountForm.tsx
@@ -1,7 +1,7 @@
 import type {ForwardedRef} from 'react';
 import React, {forwardRef, useCallback, useEffect, useMemo, useRef, useState} from 'react';
-import {View} from 'react-native';
 import type {NativeSyntheticEvent, TextInputSelectionChangeEventData} from 'react-native';
+import {View} from 'react-native';
 import useLocalize from '@hooks/useLocalize';
 import useThemeStyles from '@hooks/useThemeStyles';
 import * as Browser from '@libs/Browser';
@@ -12,6 +12,8 @@ import * as MoneyRequestUtils from '@libs/MoneyRequestUtils';
 import CONST from '@src/CONST';
 import BigNumberPad from './BigNumberPad';
 import FormHelpMessage from './FormHelpMessage';
+import TextInput from './TextInput';
+import isTextInputFocused from './TextInput/BaseTextInput/isTextInputFocused';
 import type {BaseTextInputProps, BaseTextInputRef} from './TextInput/BaseTextInput/types';
 import TextInputWithCurrencySymbol from './TextInputWithCurrencySymbol';
 import type TextInputWithCurrencySymbolProps from './TextInputWithCurrencySymbol/types';
@@ -40,6 +42,10 @@ type AmountFormProps = {
 
     /** Custom max amount length. It defaults to CONST.IOU.AMOUNT_MAX_LENGTH */
     amountMaxLength?: number;
+
+    label?: string;
+
+    displayAsTextInput?: boolean;
 } & Pick<TextInputWithCurrencySymbolProps, 'hideCurrencySymbol' | 'extraSymbol'> &
     Pick<BaseTextInputProps, 'autoFocus'>;
 
@@ -56,7 +62,19 @@ const NUM_PAD_CONTAINER_VIEW_ID = 'numPadContainerView';
 const NUM_PAD_VIEW_ID = 'numPadView';
 
 function AmountForm(
-    {value: amount, currency = CONST.CURRENCY.USD, extraDecimals = 0, amountMaxLength, errorText, onInputChange, onCurrencyButtonPress, isCurrencyPressable = true, ...rest}: AmountFormProps,
+    {
+        value: amount,
+        currency = CONST.CURRENCY.USD,
+        extraDecimals = 0,
+        amountMaxLength,
+        errorText,
+        onInputChange,
+        onCurrencyButtonPress,
+        displayAsTextInput = false,
+        isCurrencyPressable = true,
+        label,
+        ...rest
+    }: AmountFormProps,
     forwardedRef: ForwardedRef<BaseTextInputRef>,
 ) {
     const styles = useThemeStyles();
@@ -94,7 +112,7 @@ function AmountForm(
         if (!textInput.current) {
             return;
         }
-        if (!textInput.current.isFocused()) {
+        if (!isTextInputFocused(textInput)) {
             textInput.current.focus();
         }
     };
@@ -123,6 +141,29 @@ function AmountForm(
         [amountMaxLength, currentAmount, decimals, onInputChange, selection],
     );
 
+    /**
+     * Set a new amount value properly formatted
+     *
+     * @param text - Changed text from user input
+     */
+    const setFormattedAmount = (text: string) => {
+        // Remove spaces from the newAmount value because Safari on iOS adds spaces when pasting a copied value
+        // More info: https://github.com/Expensify/App/issues/16974
+        const newAmountWithoutSpaces = MoneyRequestUtils.stripSpacesFromAmount(text);
+        const replacedCommasAmount = MoneyRequestUtils.replaceCommasWithPeriod(newAmountWithoutSpaces);
+        const withLeadingZero = MoneyRequestUtils.addLeadingZero(replacedCommasAmount);
+
+        if (!MoneyRequestUtils.validateAmount(withLeadingZero, decimals, amountMaxLength)) {
+            setSelection((prevSelection) => ({...prevSelection}));
+            return;
+        }
+
+        const strippedAmount = MoneyRequestUtils.stripCommaFromAmount(withLeadingZero);
+        const isForwardDelete = currentAmount.length > strippedAmount.length && forwardDeletePressedRef.current;
+        setSelection(getNewSelection(selection, isForwardDelete ? strippedAmount.length : currentAmount.length, strippedAmount.length));
+        onInputChange?.(strippedAmount);
+    };
+
     // Modifies the amount to match the decimals for changed currency.
     useEffect(() => {
         // If the changed currency supports decimals, we can return
@@ -134,7 +175,7 @@ function AmountForm(
         setNewAmount(MoneyRequestUtils.stripDecimalsFromAmount(currentAmount));
 
         // we want to update only when decimals change (setNewAmount also changes when decimals change).
-        // eslint-disable-next-line react-hooks/exhaustive-deps
+        // eslint-disable-next-line react-compiler/react-compiler, react-hooks/exhaustive-deps
     }, [decimals]);
 
     /**
@@ -143,7 +184,7 @@ function AmountForm(
      */
     const updateAmountNumberPad = useCallback(
         (key: string) => {
-            if (shouldUpdateSelection && !textInput.current?.isFocused()) {
+            if (shouldUpdateSelection && !isTextInputFocused(textInput)) {
                 textInput.current?.focus();
             }
             // Backspace button is pressed
@@ -168,7 +209,7 @@ function AmountForm(
      */
     const updateLongPressHandlerState = useCallback((value: boolean) => {
         setShouldUpdateSelection(!value);
-        if (!value && !textInput.current?.isFocused()) {
+        if (!value && !isTextInputFocused(textInput)) {
             textInput.current?.focus();
         }
     }, []);
@@ -194,6 +235,31 @@ function AmountForm(
     const formattedAmount = MoneyRequestUtils.replaceAllDigits(currentAmount, toLocaleDigit);
     const canUseTouchScreen = DeviceCapabilities.canUseTouchScreen();
 
+    if (displayAsTextInput) {
+        return (
+            <TextInput
+                label={label}
+                value={formattedAmount}
+                onChangeText={setFormattedAmount}
+                ref={(ref: BaseTextInputRef) => {
+                    if (typeof forwardedRef === 'function') {
+                        forwardedRef(ref);
+                    } else if (forwardedRef && 'current' in forwardedRef) {
+                        // eslint-disable-next-line no-param-reassign
+                        forwardedRef.current = ref;
+                    }
+                    textInput.current = ref;
+                }}
+                prefixCharacter={currency}
+                prefixStyle={styles.colorMuted}
+                keyboardType={CONST.KEYBOARD_TYPE.DECIMAL_PAD}
+                inputMode={CONST.INPUT_MODE.DECIMAL}
+                // eslint-disable-next-line react/jsx-props-no-spreading
+                {...rest}
+            />
+        );
+    }
+
     return (
         <>
             <View
diff --git a/src/components/AmountPicker/index.tsx b/src/components/AmountPicker/index.tsx
index 45e511f24748..b84ec19e2ffd 100644
--- a/src/components/AmountPicker/index.tsx
+++ b/src/components/AmountPicker/index.tsx
@@ -1,18 +1,13 @@
 import React, {forwardRef, useState} from 'react';
 import type {ForwardedRef} from 'react';
 import {View} from 'react-native';
-import FormHelpMessage from '@components/FormHelpMessage';
 import MenuItemWithTopDescription from '@components/MenuItemWithTopDescription';
-import useStyleUtils from '@hooks/useStyleUtils';
-import useThemeStyles from '@hooks/useThemeStyles';
-import variables from '@styles/variables';
+import CONST from '@src/CONST';
 import callOrReturn from '@src/types/utils/callOrReturn';
 import AmountSelectorModal from './AmountSelectorModal';
 import type {AmountPickerProps} from './types';
 
 function AmountPicker({value, description, title, errorText = '', onInputChange, furtherDetails, rightLabel, ...rest}: AmountPickerProps, forwardedRef: ForwardedRef<View>) {
-    const styles = useThemeStyles();
-    const StyleUtils = useStyleUtils();
     const [isPickerVisible, setIsPickerVisible] = useState(false);
 
     const showPickerModal = () => {
@@ -31,23 +26,19 @@ function AmountPicker({value, description, title, errorText = '', onInputChange,
         hidePickerModal();
     };
 
-    const descStyle = !value || value.length === 0 ? StyleUtils.getFontSizeStyle(variables.fontSizeLabel) : null;
-
     return (
         <View>
             <MenuItemWithTopDescription
                 ref={forwardedRef}
                 shouldShowRightIcon
                 title={callOrReturn(title, value)}
-                descriptionTextStyle={descStyle}
                 description={description}
                 onPress={showPickerModal}
                 furtherDetails={furtherDetails}
+                brickRoadIndicator={errorText ? CONST.BRICK_ROAD_INDICATOR_STATUS.ERROR : undefined}
                 rightLabel={rightLabel}
+                errorText={errorText}
             />
-            <View style={styles.ml5}>
-                <FormHelpMessage message={errorText} />
-            </View>
             <AmountSelectorModal
                 // eslint-disable-next-line react/jsx-props-no-spreading
                 {...rest}
diff --git a/src/components/AmountPicker/types.ts b/src/components/AmountPicker/types.ts
index f7025685d840..5069893f8186 100644
--- a/src/components/AmountPicker/types.ts
+++ b/src/components/AmountPicker/types.ts
@@ -1,6 +1,5 @@
 import type {AmountFormProps} from '@components/AmountForm';
 import type {MenuItemBaseProps} from '@components/MenuItem';
-import type {MaybePhraseKey} from '@libs/Localize';
 
 type AmountSelectorModalProps = {
     /** Whether the modal is visible */
@@ -24,7 +23,7 @@ type AmountPickerProps = {
     title?: string | ((value?: string) => string);
 
     /** Form Error description */
-    errorText?: MaybePhraseKey;
+    errorText?: string;
 
     /** Callback to call when the input changes */
     onInputChange?: (value: string | undefined) => void;
diff --git a/src/components/AmountTextInput.tsx b/src/components/AmountTextInput.tsx
index e0a494ec6fb1..52c32ce1f584 100644
--- a/src/components/AmountTextInput.tsx
+++ b/src/components/AmountTextInput.tsx
@@ -28,30 +28,49 @@ type AmountTextInputProps = {
     /** Style for the container */
     touchableInputWrapperStyle?: StyleProp<ViewStyle>;
 
+    /** Whether to disable keyboard */
+    disableKeyboard?: boolean;
+
     /** Function to call to handle key presses in the text input */
     onKeyPress?: (event: NativeSyntheticEvent<KeyboardEvent>) => void;
 
     /** Style for the TextInput container */
     containerStyle?: StyleProp<ViewStyle>;
+
+    /** Hide the focus styles on TextInput */
+    hideFocusedState?: boolean;
 } & Pick<BaseTextInputProps, 'autoFocus'>;
 
 function AmountTextInput(
-    {formattedAmount, onChangeAmount, placeholder, selection, onSelectionChange, style, touchableInputWrapperStyle, onKeyPress, containerStyle, ...rest}: AmountTextInputProps,
+    {
+        formattedAmount,
+        onChangeAmount,
+        placeholder,
+        selection,
+        onSelectionChange,
+        style,
+        touchableInputWrapperStyle,
+        onKeyPress,
+        containerStyle,
+        disableKeyboard = true,
+        hideFocusedState = true,
+        ...rest
+    }: AmountTextInputProps,
     ref: ForwardedRef<BaseTextInputRef>,
 ) {
     return (
         <TextInput
-            disableKeyboard
             autoGrow
-            hideFocusedState
+            hideFocusedState={hideFocusedState}
             shouldInterceptSwipe
+            disableKeyboard={disableKeyboard}
             inputStyle={style}
             textInputContainerStyles={containerStyle}
             onChangeText={onChangeAmount}
             ref={ref}
             value={formattedAmount}
             placeholder={placeholder}
-            inputMode={CONST.INPUT_MODE.NUMERIC}
+            inputMode={CONST.INPUT_MODE.DECIMAL}
             blurOnSubmit={false}
             selection={selection}
             onSelectionChange={onSelectionChange}
diff --git a/src/components/AmountWithoutCurrencyForm.tsx b/src/components/AmountWithoutCurrencyForm.tsx
new file mode 100644
index 000000000000..78b7c84ecb54
--- /dev/null
+++ b/src/components/AmountWithoutCurrencyForm.tsx
@@ -0,0 +1,66 @@
+import React, {useCallback, useMemo} from 'react';
+import type {ForwardedRef} from 'react';
+import useLocalize from '@hooks/useLocalize';
+import {addLeadingZero, replaceAllDigits, replaceCommasWithPeriod, stripSpacesFromAmount, validateAmount} from '@libs/MoneyRequestUtils';
+import CONST from '@src/CONST';
+import TextInput from './TextInput';
+import type {BaseTextInputProps, BaseTextInputRef} from './TextInput/BaseTextInput/types';
+
+type AmountFormProps = {
+    /** Amount supplied by the FormProvider */
+    value?: string;
+
+    /** Callback to update the amount in the FormProvider */
+    onInputChange?: (value: string) => void;
+} & Partial<BaseTextInputProps>;
+
+function AmountWithoutCurrencyForm(
+    {value: amount, onInputChange, inputID, name, defaultValue, accessibilityLabel, role, label, ...rest}: AmountFormProps,
+    ref: ForwardedRef<BaseTextInputRef>,
+) {
+    const {toLocaleDigit} = useLocalize();
+
+    const currentAmount = useMemo(() => (typeof amount === 'string' ? amount : ''), [amount]);
+
+    /**
+     * Sets the selection and the amount accordingly to the value passed to the input
+     * @param newAmount - Changed amount from user input
+     */
+    const setNewAmount = useCallback(
+        (newAmount: string) => {
+            // Remove spaces from the newAmount value because Safari on iOS adds spaces when pasting a copied value
+            // More info: https://github.com/Expensify/App/issues/16974
+            const newAmountWithoutSpaces = stripSpacesFromAmount(newAmount);
+            const replacedCommasAmount = replaceCommasWithPeriod(newAmountWithoutSpaces);
+            const withLeadingZero = addLeadingZero(replacedCommasAmount);
+            if (!validateAmount(withLeadingZero, 2)) {
+                return;
+            }
+            onInputChange?.(withLeadingZero);
+        },
+        [onInputChange],
+    );
+
+    const formattedAmount = replaceAllDigits(currentAmount, toLocaleDigit);
+
+    return (
+        <TextInput
+            value={formattedAmount}
+            onChangeText={setNewAmount}
+            inputID={inputID}
+            name={name}
+            label={label}
+            defaultValue={defaultValue}
+            accessibilityLabel={accessibilityLabel}
+            role={role}
+            ref={ref}
+            keyboardType={CONST.KEYBOARD_TYPE.DECIMAL_PAD}
+            // eslint-disable-next-line react/jsx-props-no-spreading
+            {...rest}
+        />
+    );
+}
+
+AmountWithoutCurrencyForm.displayName = 'AmountWithoutCurrencyForm';
+
+export default React.forwardRef(AmountWithoutCurrencyForm);
diff --git a/src/components/AnchorForAttachmentsOnly/BaseAnchorForAttachmentsOnly.tsx b/src/components/AnchorForAttachmentsOnly/BaseAnchorForAttachmentsOnly.tsx
index da8e3694a7d2..1d273e847d26 100644
--- a/src/components/AnchorForAttachmentsOnly/BaseAnchorForAttachmentsOnly.tsx
+++ b/src/components/AnchorForAttachmentsOnly/BaseAnchorForAttachmentsOnly.tsx
@@ -7,6 +7,7 @@ import {ShowContextMenuContext, showContextMenuForReport} from '@components/Show
 import useNetwork from '@hooks/useNetwork';
 import useThemeStyles from '@hooks/useThemeStyles';
 import addEncryptedAuthTokenToURL from '@libs/addEncryptedAuthTokenToURL';
+import * as Browser from '@libs/Browser';
 import fileDownload from '@libs/fileDownload';
 import * as ReportUtils from '@libs/ReportUtils';
 import * as Download from '@userActions/Download';
@@ -40,20 +41,21 @@ function BaseAnchorForAttachmentsOnly({style, source = '', displayName = '', dow
 
     return (
         <ShowContextMenuContext.Consumer>
-            {({anchor, report, action, checkIfContextMenuActive}) => (
+            {({anchor, report, reportNameValuePairs, action, checkIfContextMenuActive}) => (
                 <PressableWithoutFeedback
                     style={[style, isOffline && styles.cursorDefault]}
                     onPress={() => {
-                        if (isDownloading || isOffline) {
+                        if (isDownloading || isOffline || !sourceID) {
                             return;
                         }
                         Download.setDownload(sourceID, true);
-                        fileDownload(sourceURLWithAuth, displayName).then(() => Download.setDownload(sourceID, false));
+                        fileDownload(sourceURLWithAuth, displayName, '', Browser.isMobileSafari()).then(() => Download.setDownload(sourceID, false));
                     }}
                     onPressIn={onPressIn}
                     onPressOut={onPressOut}
-                    // @ts-expect-error TODO: Remove this once ShowContextMenuContext (https://github.com/Expensify/App/issues/24980) is migrated to TypeScript.
-                    onLongPress={(event) => showContextMenuForReport(event, anchor, report.reportID, action, checkIfContextMenuActive, ReportUtils.isArchivedRoom(report))}
+                    onLongPress={(event) =>
+                        showContextMenuForReport(event, anchor, report?.reportID ?? '-1', action, checkIfContextMenuActive, ReportUtils.isArchivedRoom(report, reportNameValuePairs))
+                    }
                     shouldUseHapticsOnLongPress
                     accessibilityLabel={displayName}
                     role={CONST.ROLE.BUTTON}
@@ -61,8 +63,9 @@ function BaseAnchorForAttachmentsOnly({style, source = '', displayName = '', dow
                     <AttachmentView
                         source={sourceURLWithAuth}
                         file={{name: displayName}}
-                        shouldShowDownloadIcon={!isOffline}
+                        shouldShowDownloadIcon={!!sourceID && !isOffline}
                         shouldShowLoadingSpinnerIcon={isDownloading}
+                        isUsedAsChatAttachment
                     />
                 </PressableWithoutFeedback>
             )}
diff --git a/src/components/AnchorForCommentsOnly/BaseAnchorForCommentsOnly.tsx b/src/components/AnchorForCommentsOnly/BaseAnchorForCommentsOnly.tsx
index 99a0ee3bf683..4c470858292c 100644
--- a/src/components/AnchorForCommentsOnly/BaseAnchorForCommentsOnly.tsx
+++ b/src/components/AnchorForCommentsOnly/BaseAnchorForCommentsOnly.tsx
@@ -1,4 +1,4 @@
-import Str from 'expensify-common/lib/str';
+import {Str} from 'expensify-common';
 import React, {useEffect, useRef} from 'react';
 // eslint-disable-next-line no-restricted-imports
 import type {Text as RNText} from 'react-native';
@@ -6,9 +6,9 @@ import {StyleSheet} from 'react-native';
 import PressableWithSecondaryInteraction from '@components/PressableWithSecondaryInteraction';
 import Text from '@components/Text';
 import Tooltip from '@components/Tooltip';
+import useResponsiveLayout from '@hooks/useResponsiveLayout';
 import useStyleUtils from '@hooks/useStyleUtils';
 import useThemeStyles from '@hooks/useThemeStyles';
-import useWindowDimensions from '@hooks/useWindowDimensions';
 import * as DeviceCapabilities from '@libs/DeviceCapabilities';
 import * as ReportActionContextMenu from '@pages/home/report/ContextMenu/ReportActionContextMenu';
 import CONST from '@src/CONST';
@@ -30,7 +30,7 @@ function BaseAnchorForCommentsOnly({onPressIn, onPressOut, href = '', rel = '',
         [],
     );
 
-    const {isSmallScreenWidth} = useWindowDimensions();
+    const {shouldUseNarrowLayout} = useResponsiveLayout();
 
     const linkProps: LinkProps = {};
     if (onPress) {
@@ -38,7 +38,7 @@ function BaseAnchorForCommentsOnly({onPressIn, onPressOut, href = '', rel = '',
     } else {
         linkProps.href = href;
     }
-    const defaultTextStyle = DeviceCapabilities.canUseTouchScreen() || isSmallScreenWidth ? {} : {...styles.userSelectText, ...styles.cursorPointer};
+    const defaultTextStyle = DeviceCapabilities.canUseTouchScreen() || shouldUseNarrowLayout ? {} : {...styles.userSelectText, ...styles.cursorPointer};
     const isEmail = Str.isValidEmail(href.replace(/mailto:/i, ''));
 
     return (
diff --git a/src/components/AnimatedStep/index.tsx b/src/components/AnimatedStep/index.tsx
index 2fb3e3167ff8..6de7d0c2b013 100644
--- a/src/components/AnimatedStep/index.tsx
+++ b/src/components/AnimatedStep/index.tsx
@@ -37,6 +37,7 @@ function AnimatedStep({onAnimationEnd, direction = CONST.ANIMATION_DIRECTION.IN,
             }}
             duration={CONST.ANIMATED_TRANSITION}
             animation={animationStyle}
+            // eslint-disable-next-line react-compiler/react-compiler
             useNativeDriver={useNativeDriver}
             style={style}
         >
diff --git a/src/components/ApprovalWorkflowSection.tsx b/src/components/ApprovalWorkflowSection.tsx
new file mode 100644
index 000000000000..615f039cf533
--- /dev/null
+++ b/src/components/ApprovalWorkflowSection.tsx
@@ -0,0 +1,113 @@
+import React, {useCallback, useMemo} from 'react';
+import {View} from 'react-native';
+import useLocalize from '@hooks/useLocalize';
+import useTheme from '@hooks/useTheme';
+import useThemeStyles from '@hooks/useThemeStyles';
+import useWindowDimensions from '@hooks/useWindowDimensions';
+import * as OptionsListUtils from '@libs/OptionsListUtils';
+import type ApprovalWorkflow from '@src/types/onyx/ApprovalWorkflow';
+import Icon from './Icon';
+import * as Expensicons from './Icon/Expensicons';
+import MenuItem from './MenuItem';
+import PressableWithoutFeedback from './Pressable/PressableWithoutFeedback';
+import Text from './Text';
+
+type ApprovalWorkflowSectionProps = {
+    /** Single workflow displayed in this component */
+    approvalWorkflow: ApprovalWorkflow;
+
+    /** A function that is called when the section is pressed */
+    onPress: () => void;
+};
+
+function ApprovalWorkflowSection({approvalWorkflow, onPress}: ApprovalWorkflowSectionProps) {
+    const styles = useThemeStyles();
+    const theme = useTheme();
+    const {translate, toLocaleOrdinal} = useLocalize();
+    const {isSmallScreenWidth} = useWindowDimensions();
+
+    const approverTitle = useCallback(
+        (index: number) =>
+            approvalWorkflow.approvers.length > 1 ? `${toLocaleOrdinal(index + 1, true)} ${translate('workflowsPage.approver').toLowerCase()}` : `${translate('workflowsPage.approver')}`,
+        [approvalWorkflow.approvers.length, toLocaleOrdinal, translate],
+    );
+
+    const members = useMemo(() => {
+        if (approvalWorkflow.isDefault) {
+            return translate('workspace.common.everyone');
+        }
+
+        return OptionsListUtils.sortAlphabetically(approvalWorkflow.members, 'displayName')
+            .map((m) => m.displayName)
+            .join(', ');
+    }, [approvalWorkflow.isDefault, approvalWorkflow.members, translate]);
+
+    return (
+        <PressableWithoutFeedback
+            accessibilityRole="button"
+            style={[styles.border, isSmallScreenWidth ? styles.p3 : styles.p4, styles.flexRow, styles.justifyContentBetween, styles.mt6, styles.mbn3]}
+            onPress={onPress}
+            accessibilityLabel={translate('workflowsPage.addApprovalsTitle')}
+        >
+            <View style={[styles.flex1]}>
+                {approvalWorkflow.isDefault && (
+                    <View style={[styles.flexRow, styles.mb4, styles.alignItemsCenter, styles.pb1, styles.pt1]}>
+                        <Icon
+                            src={Expensicons.Lightbulb}
+                            fill={theme.icon}
+                            additionalStyles={styles.mr2}
+                            small
+                        />
+                        <Text
+                            style={[styles.textLabelSupportingNormal]}
+                            suppressHighlighting
+                        >
+                            {translate('workflowsPage.addApprovalTip')}
+                        </Text>
+                    </View>
+                )}
+                <MenuItem
+                    title={translate('workflowsExpensesFromPage.title')}
+                    style={styles.p0}
+                    titleStyle={styles.textLabelSupportingNormal}
+                    descriptionTextStyle={styles.textNormalThemeText}
+                    description={members}
+                    numberOfLinesDescription={4}
+                    icon={Expensicons.Users}
+                    iconHeight={20}
+                    iconWidth={20}
+                    iconFill={theme.icon}
+                    onPress={onPress}
+                    shouldRemoveBackground
+                />
+
+                {approvalWorkflow.approvers.map((approver, index) => (
+                    // eslint-disable-next-line react/no-array-index-key
+                    <View key={`approver-${approver.email}-${index}`}>
+                        <View style={styles.workflowApprovalVerticalLine} />
+                        <MenuItem
+                            title={approverTitle(index)}
+                            style={styles.p0}
+                            titleStyle={styles.textLabelSupportingNormal}
+                            descriptionTextStyle={styles.textNormalThemeText}
+                            description={approver.displayName}
+                            icon={Expensicons.UserCheck}
+                            iconHeight={20}
+                            iconWidth={20}
+                            iconFill={theme.icon}
+                            onPress={onPress}
+                            shouldRemoveBackground
+                        />
+                    </View>
+                ))}
+            </View>
+            <Icon
+                src={Expensicons.ArrowRight}
+                fill={theme.icon}
+                additionalStyles={[styles.alignSelfCenter]}
+            />
+        </PressableWithoutFeedback>
+    );
+}
+
+export default ApprovalWorkflowSection;
diff --git a/src/components/ArchivedReportFooter.tsx b/src/components/ArchivedReportFooter.tsx
index 9713e40136a2..859d59278cdd 100644
--- a/src/components/ArchivedReportFooter.tsx
+++ b/src/components/ArchivedReportFooter.tsx
@@ -30,20 +30,20 @@ function ArchivedReportFooter({report, reportClosedAction, personalDetails = {}}
     const styles = useThemeStyles();
     const {translate} = useLocalize();
 
-    const originalMessage = reportClosedAction?.actionName === CONST.REPORT.ACTIONS.TYPE.CLOSED ? reportClosedAction.originalMessage : null;
+    const originalMessage = ReportActionsUtils.isClosedAction(reportClosedAction) ? ReportActionsUtils.getOriginalMessage(reportClosedAction) : null;
     const archiveReason = originalMessage?.reason ?? CONST.REPORT.ARCHIVE_REASON.DEFAULT;
-    const actorPersonalDetails = personalDetails?.[reportClosedAction?.actorAccountID ?? 0];
+    const actorPersonalDetails = personalDetails?.[reportClosedAction?.actorAccountID ?? -1];
     let displayName = PersonalDetailsUtils.getDisplayNameOrDefault(actorPersonalDetails);
 
     let oldDisplayName: string | undefined;
     if (archiveReason === CONST.REPORT.ARCHIVE_REASON.ACCOUNT_MERGED) {
         const newAccountID = originalMessage?.newAccountID;
         const oldAccountID = originalMessage?.oldAccountID;
-        displayName = PersonalDetailsUtils.getDisplayNameOrDefault(personalDetails?.[newAccountID ?? 0]);
-        oldDisplayName = PersonalDetailsUtils.getDisplayNameOrDefault(personalDetails?.[oldAccountID ?? 0]);
+        displayName = PersonalDetailsUtils.getDisplayNameOrDefault(personalDetails?.[newAccountID ?? -1]);
+        oldDisplayName = PersonalDetailsUtils.getDisplayNameOrDefault(personalDetails?.[oldAccountID ?? -1]);
     }
 
-    const shouldRenderHTML = archiveReason !== CONST.REPORT.ARCHIVE_REASON.DEFAULT;
+    const shouldRenderHTML = archiveReason !== CONST.REPORT.ARCHIVE_REASON.DEFAULT && archiveReason !== CONST.REPORT.ARCHIVE_REASON.BOOKING_END_DATE_HAS_PASSED;
 
     let policyName = ReportUtils.getPolicyName(report);
 
@@ -64,7 +64,7 @@ function ArchivedReportFooter({report, reportClosedAction, personalDetails = {}}
 
     return (
         <Banner
-            containerStyles={[styles.archivedReportFooter]}
+            containerStyles={[styles.chatFooterBanner]}
             text={text}
             shouldRenderHTML={shouldRenderHTML}
             shouldShowIcon
diff --git a/src/components/ArrowKeyFocusManager.js b/src/components/ArrowKeyFocusManager.js
deleted file mode 100644
index 2532e52156df..000000000000
--- a/src/components/ArrowKeyFocusManager.js
+++ /dev/null
@@ -1,142 +0,0 @@
-import {useIsFocused} from '@react-navigation/native';
-import PropTypes from 'prop-types';
-import React, {Component} from 'react';
-import KeyboardShortcut from '@libs/KeyboardShortcut';
-import CONST from '@src/CONST';
-
-const propTypes = {
-    /** Children to render. */
-    children: PropTypes.oneOfType([PropTypes.func, PropTypes.node]).isRequired,
-
-    /** Array of disabled indexes. */
-    disabledIndexes: PropTypes.arrayOf(PropTypes.number),
-
-    /** The current focused index. */
-    focusedIndex: PropTypes.number.isRequired,
-
-    /** The maximum index – provided so that the focus can be sent back to the beginning of the list when the end is reached. */
-    maxIndex: PropTypes.number.isRequired,
-
-    /** Whether navigation is focused */
-    isFocused: PropTypes.bool.isRequired,
-
-    /** A callback executed when the focused input changes. */
-    onFocusedIndexChanged: PropTypes.func.isRequired,
-
-    /** If this value is true, then we exclude TextArea Node. */
-    shouldExcludeTextAreaNodes: PropTypes.bool,
-
-    /** If this value is true, then the arrow down callback would be triggered when the max index is exceeded */
-    shouldResetIndexOnEndReached: PropTypes.bool,
-};
-
-const defaultProps = {
-    disabledIndexes: [],
-    shouldExcludeTextAreaNodes: true,
-    shouldResetIndexOnEndReached: true,
-};
-
-class BaseArrowKeyFocusManager extends Component {
-    componentDidMount() {
-        const arrowUpConfig = CONST.KEYBOARD_SHORTCUTS.ARROW_UP;
-        const arrowDownConfig = CONST.KEYBOARD_SHORTCUTS.ARROW_DOWN;
-
-        this.onArrowUpKey = this.onArrowUpKey.bind(this);
-        this.onArrowDownKey = this.onArrowDownKey.bind(this);
-
-        this.unsubscribeArrowUpKey = KeyboardShortcut.subscribe(arrowUpConfig.shortcutKey, this.onArrowUpKey, arrowUpConfig.descriptionKey, arrowUpConfig.modifiers, true, false, 0, true, [
-            this.props.shouldExcludeTextAreaNodes && 'TEXTAREA',
-        ]);
-
-        this.unsubscribeArrowDownKey = KeyboardShortcut.subscribe(
-            arrowDownConfig.shortcutKey,
-            this.onArrowDownKey,
-            arrowDownConfig.descriptionKey,
-            arrowDownConfig.modifiers,
-            true,
-            false,
-            0,
-            true,
-            [this.props.shouldExcludeTextAreaNodes && 'TEXTAREA'],
-        );
-    }
-
-    componentDidUpdate(prevProps) {
-        if (prevProps.maxIndex === this.props.maxIndex) {
-            return;
-        }
-        if (this.props.focusedIndex > this.props.maxIndex && this.props.shouldResetIndexOnEndReached) {
-            this.onArrowDownKey();
-        }
-    }
-
-    componentWillUnmount() {
-        if (this.unsubscribeArrowUpKey) {
-            this.unsubscribeArrowUpKey();
-        }
-
-        if (this.unsubscribeArrowDownKey) {
-            this.unsubscribeArrowDownKey();
-        }
-    }
-
-    onArrowUpKey() {
-        if (this.props.maxIndex < 0 || !this.props.isFocused) {
-            return;
-        }
-
-        const currentFocusedIndex = this.props.focusedIndex > 0 ? this.props.focusedIndex - 1 : this.props.maxIndex;
-        let newFocusedIndex = currentFocusedIndex;
-
-        while (this.props.disabledIndexes.includes(newFocusedIndex)) {
-            newFocusedIndex = newFocusedIndex > 0 ? newFocusedIndex - 1 : this.props.maxIndex;
-            if (newFocusedIndex === currentFocusedIndex) {
-                // all indexes are disabled
-                return; // no-op
-            }
-        }
-
-        this.props.onFocusedIndexChanged(newFocusedIndex);
-    }
-
-    onArrowDownKey() {
-        if (this.props.maxIndex < 0 || !this.props.isFocused) {
-            return;
-        }
-
-        const currentFocusedIndex = this.props.focusedIndex < this.props.maxIndex ? this.props.focusedIndex + 1 : 0;
-        let newFocusedIndex = currentFocusedIndex;
-
-        while (this.props.disabledIndexes.includes(newFocusedIndex)) {
-            newFocusedIndex = newFocusedIndex < this.props.maxIndex ? newFocusedIndex + 1 : 0;
-            if (newFocusedIndex === currentFocusedIndex) {
-                // all indexes are disabled
-                return; // no-op
-            }
-        }
-
-        this.props.onFocusedIndexChanged(newFocusedIndex);
-    }
-
-    render() {
-        return this.props.children;
-    }
-}
-
-function ArrowKeyFocusManager(props) {
-    const isFocused = useIsFocused();
-
-    return (
-        <BaseArrowKeyFocusManager
-            // eslint-disable-next-line react/jsx-props-no-spreading
-            {...props}
-            isFocused={isFocused}
-        />
-    );
-}
-
-BaseArrowKeyFocusManager.propTypes = propTypes;
-BaseArrowKeyFocusManager.defaultProps = defaultProps;
-ArrowKeyFocusManager.displayName = 'ArrowKeyFocusManager';
-
-export default ArrowKeyFocusManager;
diff --git a/src/components/AttachmentContext.ts b/src/components/AttachmentContext.ts
new file mode 100644
index 000000000000..4ed6bdc9084f
--- /dev/null
+++ b/src/components/AttachmentContext.ts
@@ -0,0 +1,22 @@
+import {createContext} from 'react';
+import type {ValueOf} from 'type-fest';
+import type CONST from '@src/CONST';
+
+type AttachmentContextProps = {
+    type?: ValueOf<typeof CONST.ATTACHMENT_TYPE>;
+    reportID?: string;
+    accountID?: number;
+};
+
+const AttachmentContext = createContext<AttachmentContextProps>({
+    type: undefined,
+    reportID: undefined,
+    accountID: undefined,
+});
+
+AttachmentContext.displayName = 'AttachmentContext';
+
+export {
+    // eslint-disable-next-line import/prefer-default-export
+    AttachmentContext,
+};
diff --git a/src/components/AttachmentModal.tsx b/src/components/AttachmentModal.tsx
index ab322aa1bd91..d57eed225580 100644
--- a/src/components/AttachmentModal.tsx
+++ b/src/components/AttachmentModal.tsx
@@ -1,12 +1,14 @@
-import Str from 'expensify-common/lib/str';
-import React, {memo, useCallback, useEffect, useMemo, useState} from 'react';
+import {Str} from 'expensify-common';
+import React, {memo, useCallback, useEffect, useMemo, useRef, useState} from 'react';
 import {Animated, Keyboard, View} from 'react-native';
 import {GestureHandlerRootView} from 'react-native-gesture-handler';
 import {withOnyx} from 'react-native-onyx';
 import type {OnyxEntry} from 'react-native-onyx';
 import {useSharedValue} from 'react-native-reanimated';
+import type {ValueOf} from 'type-fest';
 import useLocalize from '@hooks/useLocalize';
 import useNetwork from '@hooks/useNetwork';
+import useResponsiveLayout from '@hooks/useResponsiveLayout';
 import useStyleUtils from '@hooks/useStyleUtils';
 import useThemeStyles from '@hooks/useThemeStyles';
 import useWindowDimensions from '@hooks/useWindowDimensions';
@@ -16,7 +18,6 @@ import * as FileUtils from '@libs/fileDownload/FileUtils';
 import Navigation from '@libs/Navigation/Navigation';
 import * as ReportActionsUtils from '@libs/ReportActionsUtils';
 import * as TransactionUtils from '@libs/TransactionUtils';
-import useNativeDriver from '@libs/useNativeDriver';
 import type {AvatarSource} from '@libs/UserUtils';
 import variables from '@styles/variables';
 import * as IOU from '@userActions/IOU';
@@ -25,9 +26,9 @@ import type {TranslationPaths} from '@src/languages/types';
 import ONYXKEYS from '@src/ONYXKEYS';
 import ROUTES from '@src/ROUTES';
 import type * as OnyxTypes from '@src/types/onyx';
-import type {EmptyObject} from '@src/types/utils/EmptyObject';
 import {isEmptyObject} from '@src/types/utils/EmptyObject';
 import type ModalType from '@src/types/utils/ModalType';
+import viewRef from '@src/types/utils/viewRef';
 import AttachmentCarousel from './Attachments/AttachmentCarousel';
 import AttachmentCarouselPagerContext from './Attachments/AttachmentCarousel/Pager/AttachmentCarouselPagerContext';
 import AttachmentView from './Attachments/AttachmentView';
@@ -51,15 +52,6 @@ import SafeAreaConsumer from './SafeAreaConsumer';
 type AttachmentModalOnyxProps = {
     /** The transaction associated with the receipt attachment, if any */
     transaction: OnyxEntry<OnyxTypes.Transaction>;
-
-    /** The report associated with the receipt attachment, if any */
-    parentReport: OnyxEntry<OnyxTypes.Report>;
-
-    /** The policy associated with the receipt attachment, if any */
-    policy: OnyxEntry<OnyxTypes.Policy>;
-
-    /** The list of report actions associated with the receipt attachment, if any */
-    parentReportActions: OnyxEntry<OnyxTypes.ReportActions>;
 };
 
 type ImagePickerResponse = {
@@ -107,7 +99,13 @@ type AttachmentModalProps = AttachmentModalOnyxProps & {
     headerTitle?: string;
 
     /** The report that has this attachment */
-    report?: OnyxEntry<OnyxTypes.Report> | EmptyObject;
+    report?: OnyxEntry<OnyxTypes.Report>;
+
+    /** The type of the attachment */
+    type?: ValueOf<typeof CONST.ATTACHMENT_TYPE>;
+
+    /** If the attachment originates from a note, the accountID will represent the author of that note. */
+    accountID?: number;
 
     /** Optional callback to fire when we want to do something after modal show. */
     onModalShow?: () => void;
@@ -157,16 +155,15 @@ function AttachmentModal({
     isWorkspaceAvatar = false,
     maybeIcon = false,
     transaction,
-    parentReport,
-    parentReportActions,
     headerTitle,
-    policy,
     children,
     fallbackSource,
     canEditReceipt = false,
     onModalClose = () => {},
     isLoading = false,
     shouldShowNotFoundPage = false,
+    type = undefined,
+    accountID = undefined,
 }: AttachmentModalProps) {
     const styles = useThemeStyles();
     const StyleUtils = useStyleUtils();
@@ -182,8 +179,10 @@ function AttachmentModal({
     const [isConfirmButtonDisabled, setIsConfirmButtonDisabled] = useState(false);
     const [confirmButtonFadeAnimation] = useState(() => new Animated.Value(1));
     const [isDownloadButtonReadyToBeShown, setIsDownloadButtonReadyToBeShown] = React.useState(true);
+    const isPDFLoadError = useRef(false);
+    const {windowWidth} = useWindowDimensions();
+    const {shouldUseNarrowLayout} = useResponsiveLayout();
     const nope = useSharedValue(false);
-    const {windowWidth, isSmallScreenWidth} = useWindowDimensions();
     const isOverlayModalVisible = (isReceiptAttachment && isDeleteReceiptConfirmModalVisible) || (!isReceiptAttachment && isAttachmentInvalid);
     const iouType = useMemo(() => (isTrackExpenseAction ? CONST.IOU.TYPE.TRACK : CONST.IOU.TYPE.SUBMIT), [isTrackExpenseAction]);
 
@@ -197,6 +196,8 @@ function AttachmentModal({
     const {translate} = useLocalize();
     const {isOffline} = useNetwork();
 
+    const isLocalSource = typeof sourceState === 'string' && /^file:|^blob:/.test(sourceState);
+
     useEffect(() => {
         setFile(originalFileName ? {name: originalFileName} : undefined);
     }, [originalFileName]);
@@ -268,7 +269,7 @@ function AttachmentModal({
         }
 
         setIsModalOpen(false);
-        // eslint-disable-next-line react-hooks/exhaustive-deps
+        // eslint-disable-next-line react-compiler/react-compiler, react-hooks/exhaustive-deps
     }, [isModalOpen, isConfirmButtonDisabled, onConfirm, file, sourceState]);
 
     /**
@@ -283,31 +284,42 @@ function AttachmentModal({
      * Detach the receipt and close the modal.
      */
     const deleteAndCloseModal = useCallback(() => {
-        IOU.detachReceipt(transaction?.transactionID ?? '');
+        IOU.detachReceipt(transaction?.transactionID ?? '-1');
         setIsDeleteReceiptConfirmModalVisible(false);
-        Navigation.goBack(ROUTES.REPORT_WITH_ID_DETAILS.getRoute(report?.reportID ?? ''));
+        Navigation.goBack(ROUTES.REPORT_WITH_ID_DETAILS.getRoute(report?.reportID ?? '-1'));
     }, [transaction, report]);
 
-    const isValidFile = useCallback((fileObject: FileObject) => {
-        if (fileObject.size && fileObject.size > CONST.API_ATTACHMENT_VALIDATIONS.MAX_SIZE) {
-            setIsAttachmentInvalid(true);
-            setAttachmentInvalidReasonTitle('attachmentPicker.attachmentTooLarge');
-            setAttachmentInvalidReason('attachmentPicker.sizeExceeded');
-            return false;
-        }
-
-        if (fileObject.size && fileObject.size < CONST.API_ATTACHMENT_VALIDATIONS.MIN_SIZE) {
-            setIsAttachmentInvalid(true);
-            setAttachmentInvalidReasonTitle('attachmentPicker.attachmentTooSmall');
-            setAttachmentInvalidReason('attachmentPicker.sizeNotMet');
-            return false;
-        }
-
-        return true;
-    }, []);
+    const isValidFile = useCallback(
+        (fileObject: FileObject) =>
+            FileUtils.validateImageForCorruption(fileObject)
+                .then(() => {
+                    if (fileObject.size && fileObject.size > CONST.API_ATTACHMENT_VALIDATIONS.MAX_SIZE) {
+                        setIsAttachmentInvalid(true);
+                        setAttachmentInvalidReasonTitle('attachmentPicker.attachmentTooLarge');
+                        setAttachmentInvalidReason('attachmentPicker.sizeExceeded');
+                        return false;
+                    }
+
+                    if (fileObject.size && fileObject.size < CONST.API_ATTACHMENT_VALIDATIONS.MIN_SIZE) {
+                        setIsAttachmentInvalid(true);
+                        setAttachmentInvalidReasonTitle('attachmentPicker.attachmentTooSmall');
+                        setAttachmentInvalidReason('attachmentPicker.sizeNotMet');
+                        return false;
+                    }
+
+                    return true;
+                })
+                .catch(() => {
+                    setIsAttachmentInvalid(true);
+                    setAttachmentInvalidReasonTitle('attachmentPicker.attachmentError');
+                    setAttachmentInvalidReason('attachmentPicker.errorWhileSelectingCorruptedAttachment');
+                    return false;
+                }),
+        [],
+    );
 
     const isDirectoryCheck = useCallback((data: FileObject) => {
-        if ('webkitGetAsEntry' in data && typeof data.webkitGetAsEntry === 'function' && data.webkitGetAsEntry().isDirectory) {
+        if ('webkitGetAsEntry' in data && (data as DataTransferItem).webkitGetAsEntry()?.isDirectory) {
             setIsAttachmentInvalid(true);
             setAttachmentInvalidReasonTitle('attachmentPicker.attachmentError');
             setAttachmentInvalidReason('attachmentPicker.folderNotAllowedMessage');
@@ -323,65 +335,45 @@ function AttachmentModal({
             }
             let fileObject = data;
             if ('getAsFile' in data && typeof data.getAsFile === 'function') {
-                fileObject = data.getAsFile();
+                fileObject = data.getAsFile() as FileObject;
             }
             if (!fileObject) {
                 return;
             }
 
-            if (!isValidFile(fileObject)) {
-                return;
-            }
-
-            if (fileObject instanceof File) {
-                /**
-                 * Cleaning file name, done here so that it covers all cases:
-                 * upload, drag and drop, copy-paste
-                 */
-                let updatedFile = fileObject;
-                const cleanName = FileUtils.cleanFileName(updatedFile.name);
-                if (updatedFile.name !== cleanName) {
-                    updatedFile = new File([updatedFile], cleanName, {type: updatedFile.type});
+            isValidFile(fileObject).then((isValid) => {
+                if (!isValid) {
+                    return;
                 }
-                const inputSource = URL.createObjectURL(updatedFile);
-                const inputModalType = getModalType(inputSource, updatedFile);
-                setIsModalOpen(true);
-                setSourceState(inputSource);
-                setFile(updatedFile);
-                setModalType(inputModalType);
-            } else if (fileObject.uri) {
-                const inputModalType = getModalType(fileObject.uri, fileObject);
-                setIsModalOpen(true);
-                setSourceState(fileObject.uri);
-                setFile(fileObject);
-                setModalType(inputModalType);
-            }
+                if (fileObject instanceof File) {
+                    /**
+                     * Cleaning file name, done here so that it covers all cases:
+                     * upload, drag and drop, copy-paste
+                     */
+                    let updatedFile = fileObject;
+                    const cleanName = FileUtils.cleanFileName(updatedFile.name);
+                    if (updatedFile.name !== cleanName) {
+                        updatedFile = new File([updatedFile], cleanName, {type: updatedFile.type});
+                    }
+                    const inputSource = URL.createObjectURL(updatedFile);
+                    updatedFile.uri = inputSource;
+                    const inputModalType = getModalType(inputSource, updatedFile);
+                    setIsModalOpen(true);
+                    setSourceState(inputSource);
+                    setFile(updatedFile);
+                    setModalType(inputModalType);
+                } else if (fileObject.uri) {
+                    const inputModalType = getModalType(fileObject.uri, fileObject);
+                    setIsModalOpen(true);
+                    setSourceState(fileObject.uri);
+                    setFile(fileObject);
+                    setModalType(inputModalType);
+                }
+            });
         },
         [isValidFile, getModalType, isDirectoryCheck],
     );
 
-    /**
-     * In order to gracefully hide/show the confirm button when the keyboard
-     * opens/closes, apply an animation to fade the confirm button out/in. And since
-     * we're only updating the opacity of the confirm button, we must also conditionally
-     * disable it.
-     *
-     * @param shouldFadeOut If true, fade out confirm button. Otherwise fade in.
-     */
-    const updateConfirmButtonVisibility = useCallback(
-        (shouldFadeOut: boolean) => {
-            setIsConfirmButtonDisabled(shouldFadeOut);
-            const toValue = shouldFadeOut ? 0 : 1;
-
-            Animated.timing(confirmButtonFadeAnimation, {
-                toValue,
-                duration: 100,
-                useNativeDriver,
-            }).start();
-        },
-        [confirmButtonFadeAnimation],
-    );
-
     /**
      * close the modal
      */
@@ -392,7 +384,7 @@ function AttachmentModal({
             onModalClose();
         }
 
-        // eslint-disable-next-line react-hooks/exhaustive-deps
+        // eslint-disable-next-line react-compiler/react-compiler, react-hooks/exhaustive-deps
     }, [onModalClose]);
 
     /**
@@ -413,7 +405,7 @@ function AttachmentModal({
     const sourceForAttachmentView = sourceState || source;
 
     const threeDotsMenuItems = useMemo(() => {
-        if (!isReceiptAttachment || !parentReport || !parentReportActions) {
+        if (!isReceiptAttachment) {
             return [];
         }
 
@@ -428,22 +420,28 @@ function AttachmentModal({
                         ROUTES.MONEY_REQUEST_STEP_SCAN.getRoute(
                             CONST.IOU.ACTION.EDIT,
                             iouType,
-                            transaction?.transactionID ?? '',
-                            report?.reportID ?? '',
+                            transaction?.transactionID ?? '-1',
+                            report?.reportID ?? '-1',
                             Navigation.getActiveRouteWithoutParams(),
                         ),
                     );
                 },
             });
         }
-        if (!isOffline && allowDownload) {
+        if (!isOffline && allowDownload && !isLocalSource) {
             menuItems.push({
                 icon: Expensicons.Download,
                 text: translate('common.download'),
                 onSelected: () => downloadAttachment(),
             });
         }
-        if (TransactionUtils.hasReceipt(transaction) && !TransactionUtils.isReceiptBeingScanned(transaction) && canEditReceipt && !TransactionUtils.hasMissingSmartscanFields(transaction)) {
+        if (
+            !TransactionUtils.hasEReceipt(transaction) &&
+            TransactionUtils.hasReceipt(transaction) &&
+            !TransactionUtils.isReceiptBeingScanned(transaction) &&
+            canEditReceipt &&
+            !TransactionUtils.hasMissingSmartscanFields(transaction)
+        ) {
             menuItems.push({
                 icon: Expensicons.Trashcan,
                 text: translate('receipt.deleteReceipt'),
@@ -453,8 +451,8 @@ function AttachmentModal({
             });
         }
         return menuItems;
-        // eslint-disable-next-line react-hooks/exhaustive-deps
-    }, [isReceiptAttachment, parentReport, parentReportActions, policy, transaction, file, sourceState, iouType]);
+        // eslint-disable-next-line react-compiler/react-compiler, react-hooks/exhaustive-deps
+    }, [isReceiptAttachment, transaction, file, sourceState, iouType]);
 
     // There are a few things that shouldn't be set until we absolutely know if the file is a receipt or an attachment.
     // props.isReceiptAttachment will be null until its certain what the file is, in which case it will then be true|false.
@@ -463,12 +461,12 @@ function AttachmentModal({
     let shouldShowThreeDotsButton = false;
     if (!isEmptyObject(report)) {
         headerTitleNew = translate(isReceiptAttachment ? 'common.receipt' : 'common.attachment');
-        shouldShowDownloadButton = allowDownload && isDownloadButtonReadyToBeShown && !isReceiptAttachment && !isOffline;
+        shouldShowDownloadButton = allowDownload && isDownloadButtonReadyToBeShown && !shouldShowNotFoundPage && !isReceiptAttachment && !isOffline && !isLocalSource;
         shouldShowThreeDotsButton = isReceiptAttachment && isModalOpen && threeDotsMenuItems.length !== 0;
     }
     const context = useMemo(
         () => ({
-            pagerItems: [],
+            pagerItems: [{source: sourceForAttachmentView, index: 0, isActive: true}],
             activePage: 0,
             pagerRef: undefined,
             isPagerScrolling: nope,
@@ -477,9 +475,11 @@ function AttachmentModal({
             onScaleChanged: () => {},
             onSwipeDown: closeModal,
         }),
-        [closeModal, nope],
+        [closeModal, nope, sourceForAttachmentView],
     );
 
+    const submitRef = useRef<View | HTMLElement>(null);
+
     return (
         <>
             <Modal
@@ -494,18 +494,30 @@ function AttachmentModal({
                 onModalHide={() => {
                     onModalHide();
                     setShouldLoadAttachment(false);
+                    if (isPDFLoadError.current) {
+                        isPDFLoadError.current = false;
+                        setIsAttachmentInvalid(true);
+                        setAttachmentInvalidReasonTitle('attachmentPicker.attachmentError');
+                        setAttachmentInvalidReason('attachmentPicker.errorWhileSelectingCorruptedAttachment');
+                    }
                 }}
                 propagateSwipe
+                initialFocus={() => {
+                    if (!submitRef.current) {
+                        return false;
+                    }
+                    return submitRef.current;
+                }}
             >
                 <GestureHandlerRootView style={styles.flex1}>
-                    {isSmallScreenWidth && <HeaderGap />}
+                    {shouldUseNarrowLayout && <HeaderGap />}
                     <HeaderWithBackButton
                         title={headerTitleNew}
                         shouldShowBorderBottom
                         shouldShowDownloadButton={shouldShowDownloadButton}
                         onDownloadButtonPress={() => downloadAttachment()}
-                        shouldShowCloseButton={!isSmallScreenWidth}
-                        shouldShowBackButton={isSmallScreenWidth}
+                        shouldShowCloseButton={!shouldUseNarrowLayout}
+                        shouldShowBackButton={shouldUseNarrowLayout}
                         onBackButtonPress={closeModal}
                         onCloseButtonPress={closeModal}
                         shouldShowThreeDotsButton={shouldShowThreeDotsButton}
@@ -527,45 +539,53 @@ function AttachmentModal({
                                 onLinkPress={() => Navigation.dismissModal()}
                             />
                         )}
-                        {!isEmptyObject(report) && !isReceiptAttachment ? (
-                            <AttachmentCarousel
-                                report={report}
-                                onNavigate={onNavigate}
-                                onClose={closeModal}
-                                source={source}
-                                setDownloadButtonVisibility={setDownloadButtonVisibility}
-                            />
-                        ) : (
-                            !!sourceForAttachmentView &&
-                            shouldLoadAttachment &&
-                            !isLoading &&
-                            !shouldShowNotFoundPage && (
-                                <AttachmentCarouselPagerContext.Provider value={context}>
-                                    <AttachmentView
-                                        containerStyles={[styles.mh5]}
-                                        source={sourceForAttachmentView}
-                                        isAuthTokenRequired={isAuthTokenRequiredState}
-                                        file={file}
-                                        onToggleKeyboard={updateConfirmButtonVisibility}
-                                        isWorkspaceAvatar={isWorkspaceAvatar}
-                                        maybeIcon={maybeIcon}
-                                        fallbackSource={fallbackSource}
-                                        isUsedInAttachmentModal
-                                        transactionID={transaction?.transactionID}
-                                    />
-                                </AttachmentCarouselPagerContext.Provider>
-                            )
-                        )}
+                        {!shouldShowNotFoundPage &&
+                            (!isEmptyObject(report) && !isReceiptAttachment ? (
+                                <AttachmentCarousel
+                                    accountID={accountID}
+                                    type={type}
+                                    report={report}
+                                    onNavigate={onNavigate}
+                                    onClose={closeModal}
+                                    source={source}
+                                    setDownloadButtonVisibility={setDownloadButtonVisibility}
+                                />
+                            ) : (
+                                !!sourceForAttachmentView &&
+                                shouldLoadAttachment &&
+                                !isLoading && (
+                                    <AttachmentCarouselPagerContext.Provider value={context}>
+                                        <AttachmentView
+                                            containerStyles={[styles.mh5]}
+                                            source={sourceForAttachmentView}
+                                            isAuthTokenRequired={isAuthTokenRequiredState}
+                                            file={file}
+                                            onToggleKeyboard={setIsConfirmButtonDisabled}
+                                            onPDFLoadError={() => {
+                                                isPDFLoadError.current = true;
+                                                setIsModalOpen(false);
+                                            }}
+                                            isWorkspaceAvatar={isWorkspaceAvatar}
+                                            maybeIcon={maybeIcon}
+                                            fallbackSource={fallbackSource}
+                                            isUsedInAttachmentModal
+                                            transactionID={transaction?.transactionID}
+                                            isUploaded={!isEmptyObject(report)}
+                                        />
+                                    </AttachmentCarouselPagerContext.Provider>
+                                )
+                            ))}
                     </View>
                     {/* If we have an onConfirm method show a confirmation button */}
-                    {!!onConfirm && (
+                    {!!onConfirm && !isConfirmButtonDisabled && (
                         <SafeAreaConsumer>
                             {({safeAreaPaddingBottomStyle}) => (
                                 <Animated.View style={[StyleUtils.fade(confirmButtonFadeAnimation), safeAreaPaddingBottomStyle]}>
                                     <Button
+                                        ref={viewRef(submitRef)}
                                         success
                                         large
-                                        style={[styles.buttonConfirm, isSmallScreenWidth ? {} : styles.attachmentButtonBigScreen]}
+                                        style={[styles.buttonConfirm, shouldUseNarrowLayout ? {} : styles.attachmentButtonBigScreen]}
                                         textStyles={[styles.buttonConfirmText]}
                                         text={translate('common.send')}
                                         onPress={submitAndClose}
@@ -615,21 +635,10 @@ AttachmentModal.displayName = 'AttachmentModal';
 export default withOnyx<AttachmentModalProps, AttachmentModalOnyxProps>({
     transaction: {
         key: ({report}) => {
-            const parentReportAction = ReportActionsUtils.getReportAction(report?.parentReportID ?? '', report?.parentReportActionID ?? '');
-            const transactionID = parentReportAction?.actionName === CONST.REPORT.ACTIONS.TYPE.IOU ? parentReportAction?.originalMessage.IOUTransactionID ?? '0' : '0';
+            const parentReportAction = ReportActionsUtils.getReportAction(report?.parentReportID ?? '-1', report?.parentReportActionID ?? '-1');
+            const transactionID = ReportActionsUtils.isMoneyRequestAction(parentReportAction) ? ReportActionsUtils.getOriginalMessage(parentReportAction)?.IOUTransactionID ?? '-1' : '-1';
             return `${ONYXKEYS.COLLECTION.TRANSACTION}${transactionID}`;
         },
-        initWithStoredValues: false,
-    },
-    parentReport: {
-        key: ({report}) => `${ONYXKEYS.COLLECTION.REPORT}${report ? report.parentReportID : '0'}`,
-    },
-    policy: {
-        key: ({report}) => `${ONYXKEYS.COLLECTION.POLICY}${report ? report.policyID : '0'}`,
-    },
-    parentReportActions: {
-        key: ({report}) => `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${report ? report.parentReportID : '0'}`,
-        canEvict: false,
     },
 })(memo(AttachmentModal));
 
diff --git a/src/components/AttachmentOfflineIndicator.tsx b/src/components/AttachmentOfflineIndicator.tsx
new file mode 100644
index 000000000000..d425e6f18e0e
--- /dev/null
+++ b/src/components/AttachmentOfflineIndicator.tsx
@@ -0,0 +1,57 @@
+import React, {useEffect, useState} from 'react';
+import {View} from 'react-native';
+import useLocalize from '@hooks/useLocalize';
+import useNetwork from '@hooks/useNetwork';
+import useTheme from '@hooks/useTheme';
+import useThemeStyles from '@hooks/useThemeStyles';
+import variables from '@styles/variables';
+import Icon from './Icon';
+import * as Expensicons from './Icon/Expensicons';
+import Text from './Text';
+
+type AttachmentOfflineIndicatorProps = {
+    /** Whether the offline indicator is displayed for the attachment preview. */
+    isPreview?: boolean;
+};
+
+function AttachmentOfflineIndicator({isPreview = false}: AttachmentOfflineIndicatorProps) {
+    const theme = useTheme();
+    const styles = useThemeStyles();
+    const {isOffline} = useNetwork();
+    const {translate} = useLocalize();
+
+    // We don't want to show the offline indicator when the attachment is a cached one, so
+    // we delay the display by 200 ms to ensure it is not a cached one.
+    const [onCacheDelay, setOnCacheDelay] = useState(true);
+
+    useEffect(() => {
+        const timeout = setTimeout(() => setOnCacheDelay(false), 200);
+
+        return () => clearTimeout(timeout);
+    }, []);
+
+    if (!isOffline || onCacheDelay) {
+        return null;
+    }
+
+    return (
+        <View style={[styles.flexColumn, styles.alignItemsCenter, styles.justifyContentCenter, styles.pAbsolute, styles.h100, styles.w100, isPreview && styles.hoveredComponentBG]}>
+            <Icon
+                fill={theme.border}
+                src={Expensicons.OfflineCloud}
+                width={variables.iconSizeSuperLarge}
+                height={variables.iconSizeSuperLarge}
+            />
+            {!isPreview && (
+                <View>
+                    <Text style={[styles.notFoundTextHeader]}>{translate('common.youAppearToBeOffline')}</Text>
+                    <Text>{translate('common.attachementWillBeAvailableOnceBackOnline')}</Text>
+                </View>
+            )}
+        </View>
+    );
+}
+
+AttachmentOfflineIndicator.displayName = 'AttachmentOfflineIndicator';
+
+export default AttachmentOfflineIndicator;
diff --git a/src/components/AttachmentPicker/index.native.tsx b/src/components/AttachmentPicker/index.native.tsx
index ad4cf023c096..edcdabed9101 100644
--- a/src/components/AttachmentPicker/index.native.tsx
+++ b/src/components/AttachmentPicker/index.native.tsx
@@ -1,11 +1,12 @@
-import Str from 'expensify-common/lib/str';
+import {Str} from 'expensify-common';
+import {manipulateAsync, SaveFormat} from 'expo-image-manipulator';
 import React, {useCallback, useMemo, useRef, useState} from 'react';
 import {Alert, View} from 'react-native';
 import RNFetchBlob from 'react-native-blob-util';
 import RNDocumentPicker from 'react-native-document-picker';
 import type {DocumentPickerOptions, DocumentPickerResponse} from 'react-native-document-picker';
 import {launchImageLibrary} from 'react-native-image-picker';
-import type {Asset, Callback, CameraOptions, ImagePickerResponse} from 'react-native-image-picker';
+import type {Asset, Callback, CameraOptions, ImageLibraryOptions, ImagePickerResponse} from 'react-native-image-picker';
 import ImageSize from 'react-native-image-size';
 import type {FileObject, ImagePickerResponse as FileResponse} from '@components/AttachmentModal';
 import * as Expensicons from '@components/Icon/Expensicons';
@@ -14,8 +15,8 @@ import Popover from '@components/Popover';
 import useArrowKeyFocusManager from '@hooks/useArrowKeyFocusManager';
 import useKeyboardShortcut from '@hooks/useKeyboardShortcut';
 import useLocalize from '@hooks/useLocalize';
+import useResponsiveLayout from '@hooks/useResponsiveLayout';
 import useThemeStyles from '@hooks/useThemeStyles';
-import useWindowDimensions from '@hooks/useWindowDimensions';
 import * as FileUtils from '@libs/fileDownload/FileUtils';
 import CONST from '@src/CONST';
 import type {TranslationPaths} from '@src/languages/types';
@@ -41,11 +42,12 @@ type Item = {
  * See https://github.com/react-native-image-picker/react-native-image-picker/#options
  * for ImagePicker configuration options
  */
-const imagePickerOptions = {
+const imagePickerOptions: Partial<CameraOptions | ImageLibraryOptions> = {
     includeBase64: false,
     saveToPhotos: false,
     selectionLimit: 1,
     includeExtra: false,
+    assetRepresentationMode: 'current',
 };
 
 /**
@@ -120,7 +122,7 @@ function AttachmentPicker({type = CONST.ATTACHMENT_PICKER_TYPE.FILE, children, s
     const popoverRef = useRef(null);
 
     const {translate} = useLocalize();
-    const {isSmallScreenWidth} = useWindowDimensions();
+    const {shouldUseNarrowLayout} = useResponsiveLayout();
 
     /**
      * A generic handling when we don't know the exact reason for an error
@@ -158,12 +160,44 @@ function AttachmentPicker({type = CONST.ATTACHMENT_PICKER_TYPE.FILE, children, s
                         return reject(new Error(`Error during attachment selection: ${response.errorMessage}`));
                     }
 
-                    return resolve(response.assets);
+                    const targetAsset = response.assets?.[0];
+                    const targetAssetUri = targetAsset?.uri;
+
+                    if (!targetAssetUri) {
+                        return resolve();
+                    }
+
+                    if (targetAsset?.type?.startsWith('image')) {
+                        FileUtils.verifyFileFormat({fileUri: targetAssetUri, formatSignatures: CONST.HEIC_SIGNATURES})
+                            .then((isHEIC) => {
+                                // react-native-image-picker incorrectly changes file extension without transcoding the HEIC file, so we are doing it manually if we detect HEIC signature
+                                if (isHEIC && targetAssetUri) {
+                                    manipulateAsync(targetAssetUri, [], {format: SaveFormat.JPEG})
+                                        .then((manipResult) => {
+                                            const uri = manipResult.uri;
+                                            const convertedAsset = {
+                                                uri,
+                                                name: uri.substring(uri.lastIndexOf('/') + 1).split('?')[0],
+                                                type: 'image/jpeg',
+                                                width: manipResult.width,
+                                                height: manipResult.height,
+                                            };
+
+                                            return resolve([convertedAsset]);
+                                        })
+                                        .catch((err) => reject(err));
+                                } else {
+                                    return resolve(response.assets);
+                                }
+                            })
+                            .catch((err) => reject(err));
+                    } else {
+                        return resolve(response.assets);
+                    }
                 });
             }),
         [showGeneralAlert, type],
     );
-
     /**
      * Launch the DocumentPicker. Results are in the same format as ImagePicker
      *
@@ -171,7 +205,7 @@ function AttachmentPicker({type = CONST.ATTACHMENT_PICKER_TYPE.FILE, children, s
      */
     const showDocumentPicker = useCallback(
         (): Promise<DocumentPickerResponse[] | void> =>
-            RNDocumentPicker.pick(getDocumentPickerOptions(type)).catch((error) => {
+            RNDocumentPicker.pick(getDocumentPickerOptions(type)).catch((error: Error) => {
                 if (RNDocumentPicker.isCancel(error)) {
                     return;
                 }
@@ -212,7 +246,7 @@ function AttachmentPicker({type = CONST.ATTACHMENT_PICKER_TYPE.FILE, children, s
      * An attachment error dialog when user selected malformed images
      */
     const showImageCorruptionAlert = useCallback(() => {
-        Alert.alert(translate('attachmentPicker.attachmentError'), translate('attachmentPicker.errorWhileSelectingCorruptedImage'));
+        Alert.alert(translate('attachmentPicker.attachmentError'), translate('attachmentPicker.errorWhileSelectingCorruptedAttachment'));
     }, [translate]);
 
     /**
@@ -222,6 +256,7 @@ function AttachmentPicker({type = CONST.ATTACHMENT_PICKER_TYPE.FILE, children, s
      * @param onCanceledHandler A callback that will be called without a selected attachment
      */
     const open = (onPickedHandler: (file: FileObject) => void, onCanceledHandler: () => void = () => {}) => {
+        // eslint-disable-next-line react-compiler/react-compiler
         completeAttachmentSelection.current = onPickedHandler;
         onCanceled.current = onCanceledHandler;
         setIsVisible(true);
@@ -247,7 +282,7 @@ function AttachmentPicker({type = CONST.ATTACHMENT_PICKER_TYPE.FILE, children, s
                 .then((result) => {
                     completeAttachmentSelection.current(result);
                 })
-                .catch((error) => {
+                .catch((error: Error) => {
                     showGeneralAlert(error.message);
                     throw error;
                 });
@@ -355,7 +390,7 @@ function AttachmentPicker({type = CONST.ATTACHMENT_PICKER_TYPE.FILE, children, s
                 anchorRef={popoverRef}
                 onModalHide={onModalHide.current}
             >
-                <View style={!isSmallScreenWidth && styles.createMenuContainer}>
+                <View style={!shouldUseNarrowLayout && styles.createMenuContainer}>
                     {menuItemData.map((item, menuIndex) => (
                         <MenuItem
                             key={item.textTranslationKey}
diff --git a/src/components/AttachmentPicker/index.tsx b/src/components/AttachmentPicker/index.tsx
index a6ff9cb8d27a..26d117697888 100644
--- a/src/components/AttachmentPicker/index.tsx
+++ b/src/components/AttachmentPicker/index.tsx
@@ -1,4 +1,5 @@
 import React, {useRef} from 'react';
+import type {ValueOf} from 'type-fest';
 import Visibility from '@libs/Visibility';
 import CONST from '@src/CONST';
 import type AttachmentPickerProps from './types';
@@ -14,6 +15,25 @@ function getAcceptableFileTypes(type: string): string | undefined {
     return 'image/*';
 }
 
+function getAcceptableFileTypesFromAList(fileTypes: Array<ValueOf<typeof CONST.API_ATTACHMENT_VALIDATIONS.ALLOWED_RECEIPT_EXTENSIONS>>): string {
+    const acceptValue = fileTypes
+        .map((type) => {
+            switch (type) {
+                case 'msword':
+                    return 'application/msword';
+                case 'text':
+                    return 'text/plain';
+                case 'message':
+                    return 'message/rfc822';
+                default:
+                    // eslint-disable-next-line @typescript-eslint/restrict-template-expressions
+                    return `.${type}`;
+            }
+        })
+        .join(',');
+    return acceptValue;
+}
+
 /**
  * This component renders a function as a child and
  * returns a "show attachment picker" method that takes
@@ -21,7 +41,7 @@ function getAcceptableFileTypes(type: string): string | undefined {
  * on a Browser we must append a hidden input to the DOM
  * and listen to onChange event.
  */
-function AttachmentPicker({children, type = CONST.ATTACHMENT_PICKER_TYPE.FILE}: AttachmentPickerProps): React.JSX.Element {
+function AttachmentPicker({children, type = CONST.ATTACHMENT_PICKER_TYPE.FILE, acceptedFileTypes}: AttachmentPickerProps): React.JSX.Element {
     const fileInput = useRef<HTMLInputElement>(null);
     const onPicked = useRef<(file: File) => void>(() => {});
     const onCanceled = useRef<() => void>(() => {});
@@ -46,6 +66,7 @@ function AttachmentPicker({children, type = CONST.ATTACHMENT_PICKER_TYPE.FILE}:
 
                     // Cleanup after selecting a file to start from a fresh state
                     if (fileInput.current) {
+                        // eslint-disable-next-line react-compiler/react-compiler
                         fileInput.current.value = '';
                     }
                 }}
@@ -74,7 +95,7 @@ function AttachmentPicker({children, type = CONST.ATTACHMENT_PICKER_TYPE.FILE}:
                         {once: true},
                     );
                 }}
-                accept={getAcceptableFileTypes(type)}
+                accept={acceptedFileTypes ? getAcceptableFileTypesFromAList(acceptedFileTypes) : getAcceptableFileTypes(type)}
             />
             {children({
                 openPicker: ({onPicked: newOnPicked, onCanceled: newOnCanceled = () => {}}) => {
diff --git a/src/components/AttachmentPicker/launchCamera/launchCamera.android.ts b/src/components/AttachmentPicker/launchCamera/launchCamera.android.ts
index c4359b06d619..0f551d07019b 100644
--- a/src/components/AttachmentPicker/launchCamera/launchCamera.android.ts
+++ b/src/components/AttachmentPicker/launchCamera/launchCamera.android.ts
@@ -19,7 +19,7 @@ const launchCamera: LaunchCamera = (options, callback) => {
 
             launchCameraImagePicker(options, callback);
         })
-        .catch((error) => {
+        .catch((error: ErrorLaunchCamera) => {
             /* Intercept the permission error as well as any other errors and call the callback
              * follow the same pattern expected for image picker results */
             callback({
diff --git a/src/components/AttachmentPicker/launchCamera/launchCamera.ios.ts b/src/components/AttachmentPicker/launchCamera/launchCamera.ios.ts
index 7015d4d9ed13..c4983285b6c6 100644
--- a/src/components/AttachmentPicker/launchCamera/launchCamera.ios.ts
+++ b/src/components/AttachmentPicker/launchCamera/launchCamera.ios.ts
@@ -19,7 +19,7 @@ const launchCamera: LaunchCamera = (options, callback) => {
 
             launchCameraImagePicker(options, callback);
         })
-        .catch((error) => {
+        .catch((error: ErrorLaunchCamera) => {
             /* Intercept the permission error as well as any other errors and call the callback
              * follow the same pattern expected for image picker results */
             callback({
diff --git a/src/components/AttachmentPicker/types.ts b/src/components/AttachmentPicker/types.ts
index 445d79bce07a..057ec72de27e 100644
--- a/src/components/AttachmentPicker/types.ts
+++ b/src/components/AttachmentPicker/types.ts
@@ -40,6 +40,8 @@ type AttachmentPickerProps = {
 
     /** The types of files that can be selected with this picker. */
     type?: ValueOf<typeof CONST.ATTACHMENT_PICKER_TYPE>;
+
+    acceptedFileTypes?: Array<ValueOf<typeof CONST.API_ATTACHMENT_VALIDATIONS.ALLOWED_RECEIPT_EXTENSIONS>>;
 };
 
 export default AttachmentPickerProps;
diff --git a/src/components/Attachments/AttachmentCarousel/AttachmentCarouselCellRenderer.tsx b/src/components/Attachments/AttachmentCarousel/AttachmentCarouselCellRenderer.tsx
deleted file mode 100644
index 839e05c419df..000000000000
--- a/src/components/Attachments/AttachmentCarousel/AttachmentCarouselCellRenderer.tsx
+++ /dev/null
@@ -1,29 +0,0 @@
-import React from 'react';
-import type {StyleProp, ViewStyle} from 'react-native';
-import {PixelRatio, View} from 'react-native';
-import useThemeStyles from '@hooks/useThemeStyles';
-import useWindowDimensions from '@hooks/useWindowDimensions';
-
-type AttachmentCarouselCellRendererProps = {
-    /** Cell Container styles */
-    style?: StyleProp<ViewStyle>;
-};
-
-function AttachmentCarouselCellRenderer(props: AttachmentCarouselCellRendererProps) {
-    const styles = useThemeStyles();
-    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.displayName = 'AttachmentCarouselCellRenderer';
-
-export default React.memo(AttachmentCarouselCellRenderer);
diff --git a/src/components/Attachments/AttachmentCarousel/CarouselButtons.tsx b/src/components/Attachments/AttachmentCarousel/CarouselButtons.tsx
index 2037ebdab086..e452cddb4128 100644
--- a/src/components/Attachments/AttachmentCarousel/CarouselButtons.tsx
+++ b/src/components/Attachments/AttachmentCarousel/CarouselButtons.tsx
@@ -5,9 +5,9 @@ import Button from '@components/Button';
 import * as Expensicons from '@components/Icon/Expensicons';
 import Tooltip from '@components/Tooltip';
 import useLocalize from '@hooks/useLocalize';
+import useResponsiveLayout from '@hooks/useResponsiveLayout';
 import useTheme from '@hooks/useTheme';
 import useThemeStyles from '@hooks/useThemeStyles';
-import useWindowDimensions from '@hooks/useWindowDimensions';
 
 type CarouselButtonsProps = {
     /** Where the arrows should be visible */
@@ -38,13 +38,13 @@ function CarouselButtons({page, attachments, shouldShowArrows, onBack, onForward
     const isBackDisabled = page === 0;
     const isForwardDisabled = page === attachments.length - 1;
     const {translate} = useLocalize();
-    const {isSmallScreenWidth} = useWindowDimensions();
+    const {shouldUseNarrowLayout} = useResponsiveLayout();
 
     return shouldShowArrows ? (
         <>
             {!isBackDisabled && (
                 <Tooltip text={translate('common.previous')}>
-                    <View style={[styles.attachmentArrow, isSmallScreenWidth ? styles.l2 : styles.l8]}>
+                    <View style={[styles.attachmentArrow, shouldUseNarrowLayout ? styles.l2 : styles.l8]}>
                         <Button
                             small
                             innerStyles={[styles.arrowIcon]}
@@ -59,7 +59,7 @@ function CarouselButtons({page, attachments, shouldShowArrows, onBack, onForward
             )}
             {!isForwardDisabled && (
                 <Tooltip text={translate('common.next')}>
-                    <View style={[styles.attachmentArrow, isSmallScreenWidth ? styles.r2 : styles.r8]}>
+                    <View style={[styles.attachmentArrow, shouldUseNarrowLayout ? styles.r2 : styles.r8]}>
                         <Button
                             small
                             innerStyles={[styles.arrowIcon]}
diff --git a/src/components/Attachments/AttachmentCarousel/CarouselItem.tsx b/src/components/Attachments/AttachmentCarousel/CarouselItem.tsx
index ec2687d634bb..103abb2df1bb 100644
--- a/src/components/Attachments/AttachmentCarousel/CarouselItem.tsx
+++ b/src/components/Attachments/AttachmentCarousel/CarouselItem.tsx
@@ -58,7 +58,7 @@ function CarouselItem({item, onPress, isFocused, isModalHovered}: CarouselItemPr
             <PressableWithoutFeedback
                 style={[styles.attachmentRevealButtonContainer]}
                 onPress={onPress}
-                accessibilityRole={CONST.ACCESSIBILITY_ROLE.IMAGEBUTTON}
+                accessibilityRole={CONST.ROLE.BUTTON}
                 // eslint-disable-next-line @typescript-eslint/prefer-nullish-coalescing
                 accessibilityLabel={item.file?.name || translate('attachmentView.unknownFilename')}
             >
@@ -71,9 +71,10 @@ function CarouselItem({item, onPress, isFocused, isModalHovered}: CarouselItemPr
 
     return (
         <View style={[styles.flex1]}>
-            <View style={[styles.flex1]}>
+            <View style={[styles.imageModalImageCenterContainer]}>
                 <AttachmentView
                     source={item.source}
+                    previewSource={item.previewSource}
                     file={item.file}
                     isAuthTokenRequired={item.isAuthTokenRequired}
                     onPress={onPress}
@@ -82,7 +83,6 @@ function CarouselItem({item, onPress, isFocused, isModalHovered}: CarouselItemPr
                     isHovered={isModalHovered}
                     isFocused={isFocused}
                     duration={item.duration}
-                    isUsedInCarousel
                 />
             </View>
 
diff --git a/src/components/Attachments/AttachmentCarousel/Pager/AttachmentCarouselPagerContext.ts b/src/components/Attachments/AttachmentCarousel/Pager/AttachmentCarouselPagerContext.ts
index 87a9108d5f2e..af7953eab5be 100644
--- a/src/components/Attachments/AttachmentCarousel/Pager/AttachmentCarouselPagerContext.ts
+++ b/src/components/Attachments/AttachmentCarousel/Pager/AttachmentCarouselPagerContext.ts
@@ -1,5 +1,6 @@
 import type {ForwardedRef} from 'react';
 import {createContext} from 'react';
+import type {GestureType} from 'react-native-gesture-handler';
 import type PagerView from 'react-native-pager-view';
 import type {SharedValue} from 'react-native-reanimated';
 import type {AttachmentSource} from '@components/Attachments/types';
@@ -9,6 +10,9 @@ type AttachmentCarouselPagerItems = {
     /** The source of the image is used to identify each attachment/page in the pager */
     source: AttachmentSource;
 
+    /** URL to preview-sized attachment that is also used for the thumbnail */
+    previewSource?: AttachmentSource;
+
     /** The index of the pager item determines the order of the images in the pager */
     index: number;
 
@@ -17,16 +21,28 @@ type AttachmentCarouselPagerItems = {
 };
 
 type AttachmentCarouselPagerContextValue = {
-    /** The list of items that are shown in the pager */
+    /** List of attachments displayed in the pager */
     pagerItems: AttachmentCarouselPagerItems[];
 
-    /** The index of the active page */
+    /** Index of the currently active page */
     activePage: number;
-    pagerRef?: ForwardedRef<PagerView>;
+
+    /** Ref to the active attachment */
+    pagerRef?: ForwardedRef<PagerView | GestureType>;
+
+    /** Indicates if the pager is currently scrolling */
     isPagerScrolling: SharedValue<boolean>;
+
+    /** Indicates if scrolling is enabled for the attachment */
     isScrollEnabled: SharedValue<boolean>;
+
+    /** Function to call after a tap event */
     onTap: () => void;
+
+    /** Function to call when the scale changes */
     onScaleChanged: (scale: number) => void;
+
+    /** Function to call after a swipe down event */
     onSwipeDown: () => void;
 };
 
diff --git a/src/components/Attachments/AttachmentCarousel/Pager/index.tsx b/src/components/Attachments/AttachmentCarousel/Pager/index.tsx
index b7ef9309eb10..6fe32050b6d5 100644
--- a/src/components/Attachments/AttachmentCarousel/Pager/index.tsx
+++ b/src/components/Attachments/AttachmentCarousel/Pager/index.tsx
@@ -1,4 +1,4 @@
-import type {ForwardedRef} from 'react';
+import type {ForwardedRef, SetStateAction} from 'react';
 import React, {useCallback, useEffect, useImperativeHandle, useMemo, useRef, useState} from 'react';
 import type {NativeSyntheticEvent} from 'react-native';
 import {View} from 'react-native';
@@ -8,13 +8,19 @@ import type {PagerViewProps} from 'react-native-pager-view';
 import PagerView from 'react-native-pager-view';
 import Animated, {useAnimatedProps, useSharedValue} from 'react-native-reanimated';
 import CarouselItem from '@components/Attachments/AttachmentCarousel/CarouselItem';
+import useCarouselContextEvents from '@components/Attachments/AttachmentCarousel/useCarouselContextEvents';
 import type {Attachment, AttachmentSource} from '@components/Attachments/types';
 import useThemeStyles from '@hooks/useThemeStyles';
+import shouldUseNewPager from '@libs/shouldUseNewPager';
 import AttachmentCarouselPagerContext from './AttachmentCarouselPagerContext';
 import usePageScrollHandler from './usePageScrollHandler';
 
 const WrappedPagerView = createNativeWrapper(PagerView) as React.ForwardRefExoticComponent<
-    PagerViewProps & NativeViewGestureHandlerProps & React.RefAttributes<React.Component<PagerViewProps>>
+    PagerViewProps &
+        NativeViewGestureHandlerProps &
+        React.RefAttributes<React.Component<PagerViewProps>> & {
+            useNext: boolean;
+        }
 >;
 const AnimatedPagerView = Animated.createAnimatedComponent(WrappedPagerView);
 
@@ -41,26 +47,22 @@ type AttachmentCarouselPagerProps = {
         >,
     ) => void;
 
-    /**
-     * A callback that can be used to toggle the attachment carousel arrows, when the scale of the image changes.
-     * @param showArrows If set, it will show/hide the arrows. If not set, it will toggle the arrows.
-     */
-    onRequestToggleArrows: (showArrows?: boolean) => void;
-
     /** A callback that is called when swipe-down-to-close gesture happens */
     onClose: () => void;
+
+    /** Sets the visibility of the arrows. */
+    setShouldShowArrows: (show?: SetStateAction<boolean>) => void;
 };
 
 function AttachmentCarouselPager(
-    {items, activeSource, initialPage, onPageSelected, onRequestToggleArrows, onClose}: AttachmentCarouselPagerProps,
+    {items, activeSource, initialPage, setShouldShowArrows, onPageSelected, onClose}: AttachmentCarouselPagerProps,
     ref: ForwardedRef<AttachmentCarouselPagerHandle>,
 ) {
+    const {handleTap, handleScaleChange, isScrollEnabled} = useCarouselContextEvents(setShouldShowArrows);
     const styles = useThemeStyles();
     const pagerRef = useRef<PagerView>(null);
 
-    const scale = useRef(1);
     const isPagerScrolling = useSharedValue(false);
-    const isScrollEnabled = useSharedValue(true);
 
     const activePage = useSharedValue(initialPage);
     const [activePageIndex, setActivePageIndex] = useState(initialPage);
@@ -68,6 +70,7 @@ function AttachmentCarouselPager(
     const pageScrollHandler = usePageScrollHandler((e) => {
         'worklet';
 
+        // eslint-disable-next-line react-compiler/react-compiler
         activePage.value = e.position;
         isPagerScrolling.value = e.offset !== 0;
     }, []);
@@ -78,44 +81,11 @@ function AttachmentCarouselPager(
     }, [activePage, initialPage]);
 
     /** The `pagerItems` object that passed down to the context. Later used to detect current page, whether it's a single image gallery etc. */
-    const pagerItems = useMemo(() => items.map((item, index) => ({source: item.source, index, isActive: index === activePageIndex})), [activePageIndex, items]);
-
-    /**
-     * This callback is passed to the MultiGestureCanvas/Lightbox through the AttachmentCarouselPagerContext.
-     * It is used to react to zooming/pinching and (mostly) enabling/disabling scrolling on the pager,
-     * as well as enabling/disabling the carousel buttons.
-     */
-    const handleScaleChange = useCallback(
-        (newScale: number) => {
-            if (newScale === scale.current) {
-                return;
-            }
-
-            scale.current = newScale;
-
-            const newIsScrollEnabled = newScale === 1;
-            if (isScrollEnabled.value === newIsScrollEnabled) {
-                return;
-            }
-
-            isScrollEnabled.value = newIsScrollEnabled;
-            onRequestToggleArrows(newIsScrollEnabled);
-        },
-        [isScrollEnabled, onRequestToggleArrows],
+    const pagerItems = useMemo(
+        () => items.map((item, index) => ({source: item.source, previewSource: item.previewSource, index, isActive: index === activePageIndex})),
+        [activePageIndex, items],
     );
 
-    /**
-     * This callback is passed to the MultiGestureCanvas/Lightbox through the AttachmentCarouselPagerContext.
-     * It is used to trigger touch events on the pager when the user taps on the MultiGestureCanvas/Lightbox.
-     */
-    const handleTap = useCallback(() => {
-        if (!isScrollEnabled.value) {
-            return;
-        }
-
-        onRequestToggleArrows();
-    }, [isScrollEnabled.value, onRequestToggleArrows]);
-
     const extractItemKey = useCallback(
         (item: Attachment, index: number) =>
             typeof item.source === 'string' || typeof item.source === 'number' ? `source-${item.source}` : `reportActionID-${item.reportActionID}` ?? `index-${index}`,
@@ -175,6 +145,7 @@ function AttachmentCarouselPager(
                 onPageSelected={onPageSelected}
                 style={styles.flex1}
                 initialPage={initialPage}
+                useNext={shouldUseNewPager()}
                 animatedProps={animatedProps}
                 ref={pagerRef}
             >
diff --git a/src/components/Attachments/AttachmentCarousel/extractAttachments.ts b/src/components/Attachments/AttachmentCarousel/extractAttachments.ts
new file mode 100644
index 000000000000..81ee6d08934b
--- /dev/null
+++ b/src/components/Attachments/AttachmentCarousel/extractAttachments.ts
@@ -0,0 +1,112 @@
+import {Parser as HtmlParser} from 'htmlparser2';
+import type {OnyxEntry} from 'react-native-onyx';
+import type {ValueOf} from 'type-fest';
+import type {Attachment} from '@components/Attachments/types';
+import * as FileUtils from '@libs/fileDownload/FileUtils';
+import * as ReportActionsUtils from '@libs/ReportActionsUtils';
+import tryResolveUrlFromApiRoot from '@libs/tryResolveUrlFromApiRoot';
+import CONST from '@src/CONST';
+import type {ReportAction, ReportActions} from '@src/types/onyx';
+import type {Note} from '@src/types/onyx/Report';
+
+/**
+ * Constructs the initial component state from report actions
+ */
+function extractAttachments(
+    type: ValueOf<typeof CONST.ATTACHMENT_TYPE>,
+    {
+        privateNotes,
+        accountID,
+        parentReportAction,
+        reportActions,
+    }: {privateNotes?: Record<number, Note>; accountID?: number; parentReportAction?: OnyxEntry<ReportAction>; reportActions?: OnyxEntry<ReportActions>},
+) {
+    const targetNote = privateNotes?.[Number(accountID)]?.note ?? '';
+    const attachments: Attachment[] = [];
+
+    // We handle duplicate image sources by considering the first instance as original. Selecting any duplicate
+    // and navigating back (<) shows the image preceding the first instance, not the selected duplicate's position.
+    const uniqueSources = new Set();
+
+    const htmlParser = new HtmlParser({
+        onopentag: (name, attribs) => {
+            if (name === 'video') {
+                const source = tryResolveUrlFromApiRoot(attribs[CONST.ATTACHMENT_SOURCE_ATTRIBUTE]);
+                if (uniqueSources.has(source)) {
+                    return;
+                }
+
+                uniqueSources.add(source);
+                const fileName = attribs[CONST.ATTACHMENT_ORIGINAL_FILENAME_ATTRIBUTE] || FileUtils.getFileName(`${source}`);
+                attachments.unshift({
+                    source: tryResolveUrlFromApiRoot(attribs[CONST.ATTACHMENT_SOURCE_ATTRIBUTE]),
+                    isAuthTokenRequired: !!attribs[CONST.ATTACHMENT_SOURCE_ATTRIBUTE],
+                    file: {name: fileName},
+                    duration: Number(attribs[CONST.ATTACHMENT_DURATION_ATTRIBUTE]),
+                    isReceipt: false,
+                    hasBeenFlagged: false,
+                });
+                return;
+            }
+
+            if (name === 'img' && attribs.src) {
+                const expensifySource = attribs[CONST.ATTACHMENT_SOURCE_ATTRIBUTE];
+                const source = tryResolveUrlFromApiRoot(expensifySource || attribs.src);
+                const previewSource = tryResolveUrlFromApiRoot(attribs.src);
+                if (uniqueSources.has(source)) {
+                    return;
+                }
+
+                uniqueSources.add(source);
+                let fileName = attribs[CONST.ATTACHMENT_ORIGINAL_FILENAME_ATTRIBUTE] || FileUtils.getFileName(`${source}`);
+
+                const width = (attribs['data-expensify-width'] && parseInt(attribs['data-expensify-width'], 10)) || undefined;
+                const height = (attribs['data-expensify-height'] && parseInt(attribs['data-expensify-height'], 10)) || undefined;
+
+                // Public image URLs might lack a file extension in the source URL, without an extension our
+                // AttachmentView fails to recognize them as images and renders fallback content instead.
+                // We apply this small hack to add an image extension and ensure AttachmentView renders the image.
+                const fileInfo = FileUtils.splitExtensionFromFileName(fileName);
+                if (!fileInfo.fileExtension) {
+                    fileName = `${fileInfo.fileName || 'image'}.jpg`;
+                }
+
+                // 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,
+                    previewSource,
+                    isAuthTokenRequired: !!expensifySource,
+                    file: {name: fileName, width, height},
+                    isReceipt: false,
+                    hasBeenFlagged: attribs['data-flagged'] === 'true',
+                });
+            }
+        },
+    });
+
+    if (type === CONST.ATTACHMENT_TYPE.NOTE) {
+        htmlParser.write(targetNote);
+        htmlParser.end();
+
+        return attachments.reverse();
+    }
+
+    const actions = [...(parentReportAction ? [parentReportAction] : []), ...ReportActionsUtils.getSortedReportActions(Object.values(reportActions ?? {}))];
+    actions.forEach((action, key) => {
+        if (!ReportActionsUtils.shouldReportActionBeVisible(action, key) || ReportActionsUtils.isMoneyRequestAction(action)) {
+            return;
+        }
+
+        const decision = ReportActionsUtils.getReportActionMessage(action)?.moderationDecision?.decision;
+        const hasBeenFlagged = decision === CONST.MODERATION.MODERATOR_DECISION_PENDING_HIDE || decision === CONST.MODERATION.MODERATOR_DECISION_HIDDEN;
+        const html = ReportActionsUtils.getReportActionHtml(action).replace('/>', `data-flagged="${hasBeenFlagged}" data-id="${action.reportActionID}"/>`);
+        htmlParser.write(html);
+    });
+    htmlParser.end();
+
+    return attachments.reverse();
+}
+
+export default extractAttachments;
diff --git a/src/components/Attachments/AttachmentCarousel/extractAttachmentsFromReport.ts b/src/components/Attachments/AttachmentCarousel/extractAttachmentsFromReport.ts
deleted file mode 100644
index d1185f88ccd5..000000000000
--- a/src/components/Attachments/AttachmentCarousel/extractAttachmentsFromReport.ts
+++ /dev/null
@@ -1,89 +0,0 @@
-import {Parser as HtmlParser} from 'htmlparser2';
-import type {OnyxEntry} from 'react-native-onyx';
-import type {Attachment} from '@components/Attachments/types';
-import * as FileUtils from '@libs/fileDownload/FileUtils';
-import * as ReportActionsUtils from '@libs/ReportActionsUtils';
-import tryResolveUrlFromApiRoot from '@libs/tryResolveUrlFromApiRoot';
-import CONST from '@src/CONST';
-import type {ReportAction, ReportActions} from '@src/types/onyx';
-
-/**
- * Constructs the initial component state from report actions
- */
-function extractAttachmentsFromReport(parentReportAction?: OnyxEntry<ReportAction>, reportActions?: OnyxEntry<ReportActions>) {
-    const actions = [...(parentReportAction ? [parentReportAction] : []), ...ReportActionsUtils.getSortedReportActions(Object.values(reportActions ?? {}))];
-    const attachments: Attachment[] = [];
-
-    // We handle duplicate image sources by considering the first instance as original. Selecting any duplicate
-    // and navigating back (<) shows the image preceding the first instance, not the selected duplicate's position.
-    const uniqueSources = new Set();
-
-    const htmlParser = new HtmlParser({
-        onopentag: (name, attribs) => {
-            if (name === 'video') {
-                const source = tryResolveUrlFromApiRoot(attribs[CONST.ATTACHMENT_SOURCE_ATTRIBUTE]);
-                if (uniqueSources.has(source)) {
-                    return;
-                }
-
-                uniqueSources.add(source);
-                const splittedUrl = attribs[CONST.ATTACHMENT_SOURCE_ATTRIBUTE].split('/');
-                attachments.unshift({
-                    source: tryResolveUrlFromApiRoot(attribs[CONST.ATTACHMENT_SOURCE_ATTRIBUTE]),
-                    isAuthTokenRequired: Boolean(attribs[CONST.ATTACHMENT_SOURCE_ATTRIBUTE]),
-                    file: {name: splittedUrl[splittedUrl.length - 1]},
-                    duration: Number(attribs[CONST.ATTACHMENT_DURATION_ATTRIBUTE]),
-                    isReceipt: false,
-                    hasBeenFlagged: false,
-                });
-                return;
-            }
-
-            if (name === 'img' && attribs.src) {
-                const expensifySource = attribs[CONST.ATTACHMENT_SOURCE_ATTRIBUTE];
-                const source = tryResolveUrlFromApiRoot(expensifySource || attribs.src);
-                if (uniqueSources.has(source)) {
-                    return;
-                }
-
-                uniqueSources.add(source);
-                let fileName = attribs[CONST.ATTACHMENT_ORIGINAL_FILENAME_ATTRIBUTE] || FileUtils.getFileName(`${source}`);
-
-                // Public image URLs might lack a file extension in the source URL, without an extension our
-                // AttachmentView fails to recognize them as images and renders fallback content instead.
-                // We apply this small hack to add an image extension and ensure AttachmentView renders the image.
-                const fileInfo = FileUtils.splitExtensionFromFileName(fileName);
-                if (!fileInfo.fileExtension) {
-                    fileName = `${fileInfo.fileName || 'image'}.jpg`;
-                }
-
-                // 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,
-                    isAuthTokenRequired: Boolean(expensifySource),
-                    file: {name: fileName},
-                    isReceipt: false,
-                    hasBeenFlagged: attribs['data-flagged'] === 'true',
-                });
-            }
-        },
-    });
-
-    actions.forEach((action, key) => {
-        if (!ReportActionsUtils.shouldReportActionBeVisible(action, key) || ReportActionsUtils.isMoneyRequestAction(action)) {
-            return;
-        }
-
-        const decision = action?.message?.[0]?.moderationDecision?.decision;
-        const hasBeenFlagged = decision === CONST.MODERATION.MODERATOR_DECISION_PENDING_HIDE || decision === CONST.MODERATION.MODERATOR_DECISION_HIDDEN;
-        const html = (action?.message?.[0]?.html ?? '').replace('/>', `data-flagged="${hasBeenFlagged}" data-id="${action.reportActionID}"/>`);
-        htmlParser.write(html);
-    });
-    htmlParser.end();
-
-    return attachments.reverse();
-}
-
-export default extractAttachmentsFromReport;
diff --git a/src/components/Attachments/AttachmentCarousel/index.native.tsx b/src/components/Attachments/AttachmentCarousel/index.native.tsx
index f6d63fc9307d..e0f7571af8c7 100644
--- a/src/components/Attachments/AttachmentCarousel/index.native.tsx
+++ b/src/components/Attachments/AttachmentCarousel/index.native.tsx
@@ -9,15 +9,16 @@ import useLocalize from '@hooks/useLocalize';
 import useThemeStyles from '@hooks/useThemeStyles';
 import Navigation from '@libs/Navigation/Navigation';
 import variables from '@styles/variables';
+import CONST from '@src/CONST';
 import ONYXKEYS from '@src/ONYXKEYS';
 import CarouselButtons from './CarouselButtons';
-import extractAttachmentsFromReport from './extractAttachmentsFromReport';
+import extractAttachments from './extractAttachments';
 import type {AttachmentCarouselPagerHandle} from './Pager';
 import AttachmentCarouselPager from './Pager';
 import type {AttachmentCaraouselOnyxProps, AttachmentCarouselProps} from './types';
 import useCarouselArrows from './useCarouselArrows';
 
-function AttachmentCarousel({report, reportActions, parentReportActions, source, onNavigate, setDownloadButtonVisibility, onClose}: AttachmentCarouselProps) {
+function AttachmentCarousel({report, reportActions, parentReportActions, source, onNavigate, setDownloadButtonVisibility, onClose, type, accountID}: AttachmentCarouselProps) {
     const styles = useThemeStyles();
     const {translate} = useLocalize();
     const pagerRef = useRef<AttachmentCarouselPagerHandle>(null);
@@ -30,16 +31,21 @@ function AttachmentCarousel({report, reportActions, parentReportActions, source,
 
     useEffect(() => {
         const parentReportAction = report.parentReportActionID && parentReportActions ? parentReportActions[report.parentReportActionID] : undefined;
-        const attachmentsFromReport = extractAttachmentsFromReport(parentReportAction, reportActions);
+        let targetAttachments: Attachment[] = [];
+        if (type === CONST.ATTACHMENT_TYPE.NOTE && accountID) {
+            targetAttachments = extractAttachments(CONST.ATTACHMENT_TYPE.NOTE, {privateNotes: report.privateNotes, accountID});
+        } else {
+            targetAttachments = extractAttachments(CONST.ATTACHMENT_TYPE.REPORT, {parentReportAction, reportActions});
+        }
 
-        const initialPage = attachmentsFromReport.findIndex(compareImage);
+        const initialPage = targetAttachments.findIndex(compareImage);
 
         // Dismiss the modal when deleting an attachment during its display in preview.
         if (initialPage === -1 && attachments.find(compareImage)) {
             Navigation.dismissModal();
         } else {
             setPage(initialPage);
-            setAttachments(attachmentsFromReport);
+            setAttachments(targetAttachments);
 
             // Update the download button visibility in the parent modal
             if (setDownloadButtonVisibility) {
@@ -47,11 +53,11 @@ function AttachmentCarousel({report, reportActions, parentReportActions, source,
             }
 
             // Update the parent modal's state with the source and name from the mapped attachments
-            if (attachmentsFromReport[initialPage] !== undefined && onNavigate) {
-                onNavigate(attachmentsFromReport[initialPage]);
+            if (targetAttachments[initialPage] !== undefined && onNavigate) {
+                onNavigate(targetAttachments[initialPage]);
             }
         }
-        // eslint-disable-next-line react-hooks/exhaustive-deps
+        // eslint-disable-next-line react-compiler/react-compiler, react-hooks/exhaustive-deps
     }, [reportActions, compareImage]);
 
     /** Updates the page state when the user navigates between attachments */
@@ -90,22 +96,6 @@ function AttachmentCarousel({report, reportActions, parentReportActions, source,
         [autoHideArrows, page, updatePage],
     );
 
-    /**
-     * Toggles the arrows visibility
-     * @param {Boolean} showArrows if showArrows is passed, it will set the visibility to the passed value
-     */
-    const toggleArrows = useCallback(
-        (showArrows?: boolean) => {
-            if (showArrows === undefined) {
-                setShouldShowArrows((prevShouldShowArrows) => !prevShouldShowArrows);
-                return;
-            }
-
-            setShouldShowArrows(showArrows);
-        },
-        [setShouldShowArrows],
-    );
-
     const containerStyles = [styles.flex1, styles.attachmentCarouselContainer];
 
     if (page == null) {
@@ -141,7 +131,7 @@ function AttachmentCarousel({report, reportActions, parentReportActions, source,
                         items={attachments}
                         initialPage={page}
                         activeSource={activeSource}
-                        onRequestToggleArrows={toggleArrows}
+                        setShouldShowArrows={setShouldShowArrows}
                         onPageSelected={({nativeEvent: {position: newPage}}) => updatePage(newPage)}
                         onClose={onClose}
                         ref={pagerRef}
diff --git a/src/components/Attachments/AttachmentCarousel/index.tsx b/src/components/Attachments/AttachmentCarousel/index.tsx
index 3a7e0f19c4cd..f7ef2c6529ce 100644
--- a/src/components/Attachments/AttachmentCarousel/index.tsx
+++ b/src/components/Attachments/AttachmentCarousel/index.tsx
@@ -1,8 +1,12 @@
 import isEqual from 'lodash/isEqual';
-import React, {useCallback, useEffect, useRef, useState} from 'react';
+import type {MutableRefObject} from 'react';
+import React, {useCallback, useEffect, useMemo, useRef, useState} from 'react';
 import type {ListRenderItemInfo} from 'react-native';
-import {FlatList, Keyboard, PixelRatio, View} from 'react-native';
+import {Keyboard, PixelRatio, View} from 'react-native';
+import type {GestureType} from 'react-native-gesture-handler';
+import {Gesture, GestureDetector} from 'react-native-gesture-handler';
 import {withOnyx} from 'react-native-onyx';
+import Animated, {scrollTo, useAnimatedRef, useSharedValue} from 'react-native-reanimated';
 import type {Attachment, AttachmentSource} from '@components/Attachments/types';
 import BlockingView from '@components/BlockingViews/BlockingView';
 import * as Illustrations from '@components/Icon/Illustrations';
@@ -10,18 +14,20 @@ import {useFullScreenContext} from '@components/VideoPlayerContexts/FullScreenCo
 import useLocalize from '@hooks/useLocalize';
 import useTheme from '@hooks/useTheme';
 import useThemeStyles from '@hooks/useThemeStyles';
+import useWindowDimensions from '@hooks/useWindowDimensions';
 import * as DeviceCapabilities from '@libs/DeviceCapabilities';
 import Navigation from '@libs/Navigation/Navigation';
 import variables from '@styles/variables';
 import CONST from '@src/CONST';
 import ONYXKEYS from '@src/ONYXKEYS';
-import AttachmentCarouselCellRenderer from './AttachmentCarouselCellRenderer';
 import CarouselActions from './CarouselActions';
 import CarouselButtons from './CarouselButtons';
 import CarouselItem from './CarouselItem';
-import extractAttachmentsFromReport from './extractAttachmentsFromReport';
+import extractAttachments from './extractAttachments';
+import AttachmentCarouselPagerContext from './Pager/AttachmentCarouselPagerContext';
 import type {AttachmentCaraouselOnyxProps, AttachmentCarouselProps, UpdatePageProps} from './types';
 import useCarouselArrows from './useCarouselArrows';
+import useCarouselContextEvents from './useCarouselContextEvents';
 
 const viewabilityConfig = {
     // To facilitate paging through the attachments, we want to consider an item "viewable" when it is
@@ -29,39 +35,65 @@ const viewabilityConfig = {
     itemVisiblePercentThreshold: 95,
 };
 
-function AttachmentCarousel({report, reportActions, parentReportActions, source, onNavigate, setDownloadButtonVisibility}: AttachmentCarouselProps) {
+const MIN_FLING_VELOCITY = 500;
+
+function AttachmentCarousel({report, reportActions, parentReportActions, source, onNavigate, setDownloadButtonVisibility, type, accountID, onClose}: AttachmentCarouselProps) {
     const theme = useTheme();
     const {translate} = useLocalize();
+    const {isSmallScreenWidth, windowWidth} = useWindowDimensions();
     const styles = useThemeStyles();
     const {isFullScreenRef} = useFullScreenContext();
-    const scrollRef = useRef<FlatList>(null);
+    const scrollRef = useAnimatedRef<Animated.FlatList<ListRenderItemInfo<Attachment>>>();
+    const nope = useSharedValue(false);
+    const pagerRef = useRef<GestureType>(null);
 
     const canUseTouchScreen = DeviceCapabilities.canUseTouchScreen();
 
-    const [containerWidth, setContainerWidth] = useState(0);
+    const modalStyles = styles.centeredModalStyles(isSmallScreenWidth, true);
+    const cellWidth = useMemo(
+        () => PixelRatio.roundToNearestPixel(windowWidth - (modalStyles.marginHorizontal + modalStyles.borderWidth) * 2),
+        [modalStyles.borderWidth, modalStyles.marginHorizontal, windowWidth],
+    );
     const [page, setPage] = useState(0);
     const [attachments, setAttachments] = useState<Attachment[]>([]);
     const [activeSource, setActiveSource] = useState<AttachmentSource | null>(source);
     const {shouldShowArrows, setShouldShowArrows, autoHideArrows, cancelAutoHideArrows} = useCarouselArrows();
+    const {handleTap, handleScaleChange, scale} = useCarouselContextEvents(setShouldShowArrows);
+
+    useEffect(() => {
+        if (!canUseTouchScreen) {
+            return;
+        }
+        setShouldShowArrows(true);
+    }, [canUseTouchScreen, page, setShouldShowArrows]);
 
     const compareImage = useCallback((attachment: Attachment) => attachment.source === source, [source]);
 
     useEffect(() => {
         const parentReportAction = report.parentReportActionID && parentReportActions ? parentReportActions[report.parentReportActionID] : undefined;
-        const attachmentsFromReport = extractAttachmentsFromReport(parentReportAction, reportActions ?? undefined);
+        let targetAttachments: Attachment[] = [];
+        if (type === CONST.ATTACHMENT_TYPE.NOTE && accountID) {
+            targetAttachments = extractAttachments(CONST.ATTACHMENT_TYPE.NOTE, {privateNotes: report.privateNotes, accountID});
+        } else {
+            targetAttachments = extractAttachments(CONST.ATTACHMENT_TYPE.REPORT, {parentReportAction, reportActions: reportActions ?? undefined});
+        }
 
-        if (isEqual(attachments, attachmentsFromReport)) {
+        if (isEqual(attachments, targetAttachments)) {
+            if (attachments.length === 0) {
+                setPage(-1);
+                setDownloadButtonVisibility?.(false);
+            }
             return;
         }
 
-        const initialPage = attachmentsFromReport.findIndex(compareImage);
+        const initialPage = targetAttachments.findIndex(compareImage);
 
         // Dismiss the modal when deleting an attachment during its display in preview.
         if (initialPage === -1 && attachments.find(compareImage)) {
             Navigation.dismissModal();
         } else {
             setPage(initialPage);
-            setAttachments(attachmentsFromReport);
+            setAttachments(targetAttachments);
 
             // Update the download button visibility in the parent modal
             if (setDownloadButtonVisibility) {
@@ -69,11 +101,22 @@ function AttachmentCarousel({report, reportActions, parentReportActions, source,
             }
 
             // Update the parent modal's state with the source and name from the mapped attachments
-            if (attachmentsFromReport[initialPage] !== undefined && onNavigate) {
-                onNavigate(attachmentsFromReport[initialPage]);
+            if (targetAttachments[initialPage] !== undefined && onNavigate) {
+                onNavigate(targetAttachments[initialPage]);
             }
         }
-    }, [reportActions, parentReportActions, compareImage, report.parentReportActionID, attachments, setDownloadButtonVisibility, onNavigate]);
+    }, [report.privateNotes, reportActions, parentReportActions, compareImage, report.parentReportActionID, attachments, setDownloadButtonVisibility, onNavigate, accountID, type]);
+
+    // Scroll position is affected when window width is resized, so we readjust it on width changes
+    useEffect(() => {
+        if (attachments.length === 0 || scrollRef.current == null) {
+            return;
+        }
+
+        scrollRef.current.scrollToIndex({index: page, animated: false});
+        // The hook is not supposed to run on page change, so we keep the page out of the dependencies
+        // eslint-disable-next-line react-compiler/react-compiler, react-hooks/exhaustive-deps
+    }, [cellWidth]);
 
     /** Updates the page state when the user navigates between attachments */
     const updatePage = useCallback(
@@ -92,13 +135,14 @@ function AttachmentCarousel({report, reportActions, parentReportActions, source,
                 return;
             }
 
+            const item = entry.item as Attachment;
             if (entry.index !== null) {
                 setPage(entry.index);
-                setActiveSource(entry.item.source);
+                setActiveSource(item.source);
             }
 
             if (onNavigate) {
-                onNavigate(entry.item);
+                onNavigate(item);
             }
         },
         [isFullScreenRef, onNavigate],
@@ -120,7 +164,7 @@ function AttachmentCarousel({report, reportActions, parentReportActions, source,
 
             scrollRef.current.scrollToIndex({index: nextIndex, animated: canUseTouchScreen});
         },
-        [attachments, canUseTouchScreen, isFullScreenRef, page],
+        [attachments, canUseTouchScreen, isFullScreenRef, page, scrollRef],
     );
 
     const extractItemKey = useCallback(
@@ -132,35 +176,80 @@ function AttachmentCarousel({report, reportActions, parentReportActions, source,
     /** Calculate items layout information to optimize scrolling performance */
     const getItemLayout = useCallback(
         (data: ArrayLike<Attachment> | null | undefined, index: number) => ({
-            length: containerWidth,
-            offset: containerWidth * index,
+            length: cellWidth,
+            offset: cellWidth * index,
             index,
         }),
-        [containerWidth],
+        [cellWidth],
+    );
+
+    const context = useMemo(
+        () => ({
+            pagerItems: [{source, index: 0, isActive: true}],
+            activePage: 0,
+            pagerRef,
+            isPagerScrolling: nope,
+            isScrollEnabled: nope,
+            onTap: handleTap,
+            onScaleChanged: handleScaleChange,
+            onSwipeDown: onClose,
+        }),
+        [source, nope, handleTap, handleScaleChange, onClose],
     );
 
     /** Defines how a single attachment should be rendered */
     const renderItem = useCallback(
         ({item}: ListRenderItemInfo<Attachment>) => (
-            <CarouselItem
-                item={item}
-                isFocused={activeSource === item.source}
-                onPress={canUseTouchScreen ? () => setShouldShowArrows((oldState: boolean) => !oldState) : undefined}
-                isModalHovered={shouldShowArrows}
-            />
+            <View style={[styles.h100, {width: cellWidth}]}>
+                <CarouselItem
+                    item={item}
+                    isFocused={activeSource === item.source}
+                    onPress={canUseTouchScreen ? handleTap : undefined}
+                    isModalHovered={shouldShowArrows}
+                />
+            </View>
         ),
-        [activeSource, canUseTouchScreen, setShouldShowArrows, shouldShowArrows],
+        [activeSource, canUseTouchScreen, cellWidth, handleTap, shouldShowArrows, styles.h100],
+    );
+    /** Pan gesture handing swiping through attachments on touch screen devices */
+    const pan = useMemo(
+        () =>
+            Gesture.Pan()
+                .enabled(canUseTouchScreen)
+                .onUpdate(({translationX}) => {
+                    if (scale.current !== 1) {
+                        return;
+                    }
+
+                    scrollTo(scrollRef, page * cellWidth - translationX, 0, false);
+                })
+                .onEnd(({translationX, velocityX}) => {
+                    if (scale.current !== 1) {
+                        return;
+                    }
+
+                    let newIndex;
+                    if (velocityX > MIN_FLING_VELOCITY) {
+                        // User flung to the right
+                        newIndex = Math.max(0, page - 1);
+                    } else if (velocityX < -MIN_FLING_VELOCITY) {
+                        // User flung to the left
+                        newIndex = Math.min(attachments.length - 1, page + 1);
+                    } else {
+                        // snap scroll position to the nearest cell (making sure it's within the bounds of the list)
+                        const delta = Math.round(-translationX / cellWidth);
+                        newIndex = Math.min(attachments.length - 1, Math.max(0, page + delta));
+                    }
+
+                    scrollTo(scrollRef, newIndex * cellWidth, 0, true);
+                })
+                .withRef(pagerRef as MutableRefObject<GestureType | undefined>),
+        [attachments.length, canUseTouchScreen, cellWidth, page, scale, scrollRef],
     );
 
     return (
         <View
             style={[styles.flex1, styles.attachmentCarouselContainer]}
-            onLayout={({nativeEvent}) => {
-                if (isFullScreenRef.current) {
-                    return;
-                }
-                setContainerWidth(PixelRatio.roundToNearestPixel(nativeEvent.layout.width));
-            }}
             onMouseEnter={() => !canUseTouchScreen && setShouldShowArrows(true)}
             onMouseLeave={() => !canUseTouchScreen && setShouldShowArrows(false)}
         >
@@ -183,37 +272,28 @@ function AttachmentCarousel({report, reportActions, parentReportActions, source,
                         autoHideArrow={autoHideArrows}
                         cancelAutoHideArrow={cancelAutoHideArrows}
                     />
-
-                    {containerWidth > 0 && (
-                        <FlatList
-                            keyboardShouldPersistTaps="handled"
-                            horizontal
-                            decelerationRate="fast"
-                            showsHorizontalScrollIndicator={false}
-                            bounces={false}
-                            // Scroll only one image at a time no matter how fast the user swipes
-                            disableIntervalMomentum
-                            pagingEnabled
-                            snapToAlignment="start"
-                            snapToInterval={containerWidth}
-                            // Enable scrolling by swiping on mobile (touch) devices only
-                            // disable scroll for desktop/browsers because they add their scrollbars
-                            // Enable scrolling FlatList only when PDF is not in a zoomed state
-                            scrollEnabled={canUseTouchScreen}
-                            ref={scrollRef}
-                            initialScrollIndex={page}
-                            initialNumToRender={3}
-                            windowSize={5}
-                            maxToRenderPerBatch={CONST.MAX_TO_RENDER_PER_BATCH.CAROUSEL}
-                            data={attachments}
-                            CellRendererComponent={AttachmentCarouselCellRenderer}
-                            renderItem={renderItem}
-                            getItemLayout={getItemLayout}
-                            keyExtractor={extractItemKey}
-                            viewabilityConfig={viewabilityConfig}
-                            onViewableItemsChanged={updatePage}
-                        />
-                    )}
+                    <AttachmentCarouselPagerContext.Provider value={context}>
+                        <GestureDetector gesture={pan}>
+                            <Animated.FlatList
+                                keyboardShouldPersistTaps="handled"
+                                horizontal
+                                showsHorizontalScrollIndicator={false}
+                                // scrolling is controlled by the pan gesture
+                                scrollEnabled={false}
+                                ref={scrollRef}
+                                initialScrollIndex={page}
+                                initialNumToRender={3}
+                                windowSize={5}
+                                maxToRenderPerBatch={CONST.MAX_TO_RENDER_PER_BATCH.CAROUSEL}
+                                data={attachments}
+                                renderItem={renderItem}
+                                getItemLayout={getItemLayout}
+                                keyExtractor={extractItemKey}
+                                viewabilityConfig={viewabilityConfig}
+                                onViewableItemsChanged={updatePage}
+                            />
+                        </GestureDetector>
+                    </AttachmentCarouselPagerContext.Provider>
 
                     <CarouselActions onCycleThroughAttachments={cycleThroughAttachments} />
                 </>
diff --git a/src/components/Attachments/AttachmentCarousel/types.ts b/src/components/Attachments/AttachmentCarousel/types.ts
index 8ba3489a5fcf..d31ebbd328cd 100644
--- a/src/components/Attachments/AttachmentCarousel/types.ts
+++ b/src/components/Attachments/AttachmentCarousel/types.ts
@@ -1,6 +1,8 @@
 import type {ViewToken} from 'react-native';
 import type {OnyxEntry} from 'react-native-onyx';
+import type {ValueOf} from 'type-fest';
 import type {Attachment, AttachmentSource} from '@components/Attachments/types';
+import type CONST from '@src/CONST';
 import type {Report, ReportActions} from '@src/types/onyx';
 
 type UpdatePageProps = {
@@ -28,6 +30,12 @@ type AttachmentCarouselProps = AttachmentCaraouselOnyxProps & {
     /** The report currently being looked at */
     report: Report;
 
+    /** The type of the attachment */
+    type?: ValueOf<typeof CONST.ATTACHMENT_TYPE>;
+
+    /** If the attachment originates from a note, the accountID will represent the author of that note. */
+    accountID?: number;
+
     /** A callback that is called when swipe-down-to-close gesture happens */
     onClose: () => void;
 };
diff --git a/src/components/Attachments/AttachmentCarousel/useCarouselArrows.ts b/src/components/Attachments/AttachmentCarousel/useCarouselArrows.ts
index 12ca3db4e2ff..ed195fd943f1 100644
--- a/src/components/Attachments/AttachmentCarousel/useCarouselArrows.ts
+++ b/src/components/Attachments/AttachmentCarousel/useCarouselArrows.ts
@@ -32,6 +32,9 @@ function useCarouselArrows() {
         }, CONST.ARROW_HIDE_DELAY);
     }, [canUseTouchScreen, cancelAutoHideArrows]);
 
+    /**
+     * Sets the visibility of the arrows.
+     */
     const setShouldShowArrows = useCallback(
         (show: SetStateAction<boolean> = true) => {
             setShouldShowArrowsInternal(show);
@@ -42,7 +45,7 @@ function useCarouselArrows() {
 
     useEffect(() => {
         autoHideArrows();
-        // eslint-disable-next-line react-hooks/exhaustive-deps
+        // eslint-disable-next-line react-compiler/react-compiler, react-hooks/exhaustive-deps
     }, []);
 
     return {shouldShowArrows, setShouldShowArrows, autoHideArrows, cancelAutoHideArrows};
diff --git a/src/components/Attachments/AttachmentCarousel/useCarouselContextEvents.ts b/src/components/Attachments/AttachmentCarousel/useCarouselContextEvents.ts
new file mode 100644
index 000000000000..1c54d7841347
--- /dev/null
+++ b/src/components/Attachments/AttachmentCarousel/useCarouselContextEvents.ts
@@ -0,0 +1,64 @@
+import {useCallback, useRef} from 'react';
+import type {SetStateAction} from 'react';
+import {useSharedValue} from 'react-native-reanimated';
+
+function useCarouselContextEvents(setShouldShowArrows: (show?: SetStateAction<boolean>) => void) {
+    const scale = useRef(1);
+    const isScrollEnabled = useSharedValue(true);
+
+    /**
+     * Toggles the arrows visibility
+     */
+    const onRequestToggleArrows = useCallback(
+        (showArrows?: boolean) => {
+            if (showArrows === undefined) {
+                setShouldShowArrows((prevShouldShowArrows) => !prevShouldShowArrows);
+                return;
+            }
+
+            setShouldShowArrows(showArrows);
+        },
+        [setShouldShowArrows],
+    );
+
+    /**
+     * This callback is passed to the MultiGestureCanvas/Lightbox through the AttachmentCarouselPagerContext.
+     * It is used to react to zooming/pinching and (mostly) enabling/disabling scrolling on the pager,
+     * as well as enabling/disabling the carousel buttons.
+     */
+    const handleScaleChange = useCallback(
+        (newScale: number) => {
+            if (newScale === scale.current) {
+                return;
+            }
+
+            scale.current = newScale;
+
+            const newIsScrollEnabled = newScale === 1;
+            if (isScrollEnabled.value === newIsScrollEnabled) {
+                return;
+            }
+
+            // eslint-disable-next-line react-compiler/react-compiler
+            isScrollEnabled.value = newIsScrollEnabled;
+            onRequestToggleArrows(newIsScrollEnabled);
+        },
+        [isScrollEnabled, onRequestToggleArrows],
+    );
+
+    /**
+     * This callback is passed to the MultiGestureCanvas/Lightbox through the AttachmentCarouselPagerContext.
+     * It is used to trigger touch events on the pager when the user taps on the MultiGestureCanvas/Lightbox.
+     */
+    const handleTap = useCallback(() => {
+        if (!isScrollEnabled.value) {
+            return;
+        }
+
+        onRequestToggleArrows();
+    }, [isScrollEnabled.value, onRequestToggleArrows]);
+
+    return {handleTap, handleScaleChange, scale, isScrollEnabled};
+}
+
+export default useCarouselContextEvents;
diff --git a/src/components/Attachments/AttachmentView/AttachmentViewImage/index.tsx b/src/components/Attachments/AttachmentView/AttachmentViewImage/index.tsx
index c195c1e34554..0ec2bb5ef0b5 100644
--- a/src/components/Attachments/AttachmentView/AttachmentViewImage/index.tsx
+++ b/src/components/Attachments/AttachmentView/AttachmentViewImage/index.tsx
@@ -34,7 +34,7 @@ function AttachmentViewImage({url, file, isAuthTokenRequired, loadComplete, onPr
             onPress={onPress}
             disabled={loadComplete}
             style={[styles.flex1, styles.flexRow, styles.alignSelfStretch]}
-            accessibilityRole={CONST.ACCESSIBILITY_ROLE.IMAGEBUTTON}
+            accessibilityRole={CONST.ROLE.BUTTON}
             // eslint-disable-next-line @typescript-eslint/prefer-nullish-coalescing
             accessibilityLabel={file?.name || translate('attachmentView.unknownFilename')}
         >
diff --git a/src/components/Attachments/AttachmentView/AttachmentViewPdf/BaseAttachmentViewPdf.tsx b/src/components/Attachments/AttachmentView/AttachmentViewPdf/BaseAttachmentViewPdf.tsx
index fe20f7590f33..7c1d350fc307 100644
--- a/src/components/Attachments/AttachmentView/AttachmentViewPdf/BaseAttachmentViewPdf.tsx
+++ b/src/components/Attachments/AttachmentView/AttachmentViewPdf/BaseAttachmentViewPdf.tsx
@@ -8,13 +8,13 @@ function BaseAttachmentViewPdf({
     file,
     encryptedSourceUrl,
     isFocused,
-    isUsedInCarousel,
     onPress: onPressProp,
     onScaleChanged: onScaleChangedProp,
     onToggleKeyboard,
     onLoadComplete,
-    errorLabelStyles,
     style,
+    isUsedAsChatAttachment,
+    onLoadError,
 }: AttachmentViewPdfProps) {
     const attachmentCarouselPagerContext = useContext(AttachmentCarouselPagerContext);
     const isScrollEnabled = attachmentCarouselPagerContext === null ? undefined : attachmentCarouselPagerContext.isScrollEnabled;
@@ -24,7 +24,7 @@ function BaseAttachmentViewPdf({
             return;
         }
         attachmentCarouselPagerContext.onScaleChanged(1);
-        // eslint-disable-next-line react-hooks/exhaustive-deps -- we just want to call this function when component is mounted
+        // eslint-disable-next-line react-compiler/react-compiler, react-hooks/exhaustive-deps -- we just want to call this function when component is mounted
     }, []);
 
     /**
@@ -39,11 +39,11 @@ function BaseAttachmentViewPdf({
             }
 
             // When a pdf is shown in a carousel, we want to disable the pager scroll when the pdf is zoomed in
-            if (isUsedInCarousel && attachmentCarouselPagerContext) {
+            if (attachmentCarouselPagerContext?.pagerRef) {
                 attachmentCarouselPagerContext.onScaleChanged(newScale);
             }
         },
-        [attachmentCarouselPagerContext, isUsedInCarousel, onScaleChangedProp],
+        [attachmentCarouselPagerContext, onScaleChangedProp],
     );
 
     /**
@@ -75,7 +75,8 @@ function BaseAttachmentViewPdf({
             onToggleKeyboard={onToggleKeyboard}
             onScaleChanged={onScaleChanged}
             onLoadComplete={onLoadComplete}
-            errorLabelStyles={errorLabelStyles}
+            isUsedAsChatAttachment={isUsedAsChatAttachment}
+            onLoadError={onLoadError}
         />
     );
 }
diff --git a/src/components/Attachments/AttachmentView/AttachmentViewPdf/index.android.tsx b/src/components/Attachments/AttachmentView/AttachmentViewPdf/index.android.tsx
index 9f74b5c7bfe8..8c4af3275bd8 100644
--- a/src/components/Attachments/AttachmentView/AttachmentViewPdf/index.android.tsx
+++ b/src/components/Attachments/AttachmentView/AttachmentViewPdf/index.android.tsx
@@ -41,6 +41,7 @@ function AttachmentViewPdf(props: AttachmentViewPdfProps) {
                 // enable  the pager scroll so that the user
                 // can swipe to the next attachment otherwise disable it.
                 if (translateX > translateY && translateX > SCROLL_THRESHOLD && scale.value === 1 && allowEnablingScroll) {
+                    // eslint-disable-next-line react-compiler/react-compiler
                     isScrollEnabled.value = true;
                 } else if (translateY > SCROLL_THRESHOLD) {
                     isScrollEnabled.value = false;
diff --git a/src/components/Attachments/AttachmentView/AttachmentViewPdf/index.tsx b/src/components/Attachments/AttachmentView/AttachmentViewPdf/index.tsx
index e16a81702f66..e8f6568f98c0 100644
--- a/src/components/Attachments/AttachmentView/AttachmentViewPdf/index.tsx
+++ b/src/components/Attachments/AttachmentView/AttachmentViewPdf/index.tsx
@@ -2,7 +2,7 @@ import React, {memo} from 'react';
 import PDFView from '@components/PDFView';
 import type AttachmentViewPdfProps from './types';
 
-function AttachmentViewPdf({file, encryptedSourceUrl, isFocused, onPress, onToggleKeyboard, onLoadComplete, errorLabelStyles, style}: AttachmentViewPdfProps) {
+function AttachmentViewPdf({file, encryptedSourceUrl, isFocused, onPress, onToggleKeyboard, onLoadComplete, style, isUsedAsChatAttachment, onLoadError}: AttachmentViewPdfProps) {
     return (
         <PDFView
             onPress={onPress}
@@ -12,7 +12,8 @@ function AttachmentViewPdf({file, encryptedSourceUrl, isFocused, onPress, onTogg
             style={style}
             onToggleKeyboard={onToggleKeyboard}
             onLoadComplete={onLoadComplete}
-            errorLabelStyles={errorLabelStyles}
+            isUsedAsChatAttachment={isUsedAsChatAttachment}
+            onLoadError={onLoadError}
         />
     );
 }
diff --git a/src/components/Attachments/AttachmentView/AttachmentViewPdf/types.ts b/src/components/Attachments/AttachmentView/AttachmentViewPdf/types.ts
index 605be3b25ec4..dd5bae6e9e7b 100644
--- a/src/components/Attachments/AttachmentView/AttachmentViewPdf/types.ts
+++ b/src/components/Attachments/AttachmentView/AttachmentViewPdf/types.ts
@@ -1,18 +1,21 @@
-import type {StyleProp, TextStyle, ViewStyle} from 'react-native';
+import type {StyleProp, ViewStyle} from 'react-native';
 import type {AttachmentViewProps} from '..';
 
-type AttachmentViewPdfProps = Pick<AttachmentViewProps, 'file' | 'onPress' | 'isUsedInCarousel' | 'isFocused' | 'onToggleKeyboard'> & {
+type AttachmentViewPdfProps = Pick<AttachmentViewProps, 'file' | 'onPress' | 'isFocused' | 'onToggleKeyboard'> & {
     encryptedSourceUrl: string;
     onLoadComplete: (path: string) => void;
 
     /** Additional style props */
     style?: StyleProp<ViewStyle>;
 
-    /** Styles for the error label */
-    errorLabelStyles?: StyleProp<TextStyle>;
-
     /** Triggered when the PDF's onScaleChanged event is triggered */
     onScaleChanged?: (scale: number) => void;
+
+    /** Triggered when the PDF fails to load */
+    onLoadError?: () => void;
+
+    /** Whether the PDF is used as a chat attachment */
+    isUsedAsChatAttachment?: boolean;
 };
 
 export default AttachmentViewPdfProps;
diff --git a/src/components/Attachments/AttachmentView/AttachmentViewVideo/index.tsx b/src/components/Attachments/AttachmentView/AttachmentViewVideo/index.tsx
index 9e91bfd64fed..4db93266fe0a 100644
--- a/src/components/Attachments/AttachmentView/AttachmentViewVideo/index.tsx
+++ b/src/components/Attachments/AttachmentView/AttachmentViewVideo/index.tsx
@@ -1,7 +1,7 @@
 import React from 'react';
 import VideoPlayer from '@components/VideoPlayer';
+import useResponsiveLayout from '@hooks/useResponsiveLayout';
 import useThemeStyles from '@hooks/useThemeStyles';
-import useWindowDimensions from '@hooks/useWindowDimensions';
 import type {AttachmentViewProps} from '..';
 
 type AttachmentViewVideoProps = Pick<AttachmentViewProps, 'duration' | 'isHovered'> & {
@@ -12,13 +12,13 @@ type AttachmentViewVideoProps = Pick<AttachmentViewProps, 'duration' | 'isHovere
 };
 
 function AttachmentViewVideo({source, isHovered = false, shouldUseSharedVideoElement = false, duration = 0}: AttachmentViewVideoProps) {
-    const {isSmallScreenWidth} = useWindowDimensions();
+    const {shouldUseNarrowLayout} = useResponsiveLayout();
     const styles = useThemeStyles();
 
     return (
         <VideoPlayer
             url={source}
-            shouldUseSharedVideoElement={shouldUseSharedVideoElement && !isSmallScreenWidth}
+            shouldUseSharedVideoElement={shouldUseSharedVideoElement && !shouldUseNarrowLayout}
             isVideoHovered={isHovered}
             videoDuration={duration}
             style={[styles.w100, styles.h100]}
diff --git a/src/components/Attachments/AttachmentView/DefaultAttachmentView/index.tsx b/src/components/Attachments/AttachmentView/DefaultAttachmentView/index.tsx
new file mode 100644
index 000000000000..ee594f66aabc
--- /dev/null
+++ b/src/components/Attachments/AttachmentView/DefaultAttachmentView/index.tsx
@@ -0,0 +1,70 @@
+import React from 'react';
+import type {StyleProp, ViewStyle} from 'react-native';
+import {ActivityIndicator, View} from 'react-native';
+import Icon from '@components/Icon';
+import * as Expensicons from '@components/Icon/Expensicons';
+import Text from '@components/Text';
+import Tooltip from '@components/Tooltip';
+import useLocalize from '@hooks/useLocalize';
+import useTheme from '@hooks/useTheme';
+import useThemeStyles from '@hooks/useThemeStyles';
+import type IconAsset from '@src/types/utils/IconAsset';
+
+type DefaultAttachmentViewProps = {
+    /** The name of the file */
+    fileName?: string;
+
+    /** Should show the download icon */
+    shouldShowDownloadIcon?: boolean;
+
+    /** Should show the loading spinner icon */
+    shouldShowLoadingSpinnerIcon?: boolean;
+
+    /** Additional styles for the container */
+    containerStyles?: StyleProp<ViewStyle>;
+
+    icon?: IconAsset;
+};
+
+function DefaultAttachmentView({fileName = '', shouldShowLoadingSpinnerIcon = false, shouldShowDownloadIcon, containerStyles, icon}: DefaultAttachmentViewProps) {
+    const theme = useTheme();
+    const styles = useThemeStyles();
+    const {translate} = useLocalize();
+
+    return (
+        <View style={[styles.defaultAttachmentView, containerStyles]}>
+            <View style={styles.mr2}>
+                <Icon
+                    fill={theme.icon}
+                    src={icon ?? Expensicons.Paperclip}
+                />
+            </View>
+
+            <Text style={[styles.textStrong, styles.flexShrink1, styles.breakAll, styles.flexWrap, styles.mw100]}>{fileName}</Text>
+            {!shouldShowLoadingSpinnerIcon && shouldShowDownloadIcon && (
+                <Tooltip text={translate('common.download')}>
+                    <View style={styles.ml2}>
+                        <Icon
+                            fill={theme.icon}
+                            src={Expensicons.Download}
+                        />
+                    </View>
+                </Tooltip>
+            )}
+            {shouldShowLoadingSpinnerIcon && (
+                <View style={styles.ml2}>
+                    <Tooltip text={translate('common.downloading')}>
+                        <ActivityIndicator
+                            size="small"
+                            color={theme.textSupporting}
+                        />
+                    </Tooltip>
+                </View>
+            )}
+        </View>
+    );
+}
+
+DefaultAttachmentView.displayName = 'DefaultAttachmentView';
+
+export default DefaultAttachmentView;
diff --git a/src/components/Attachments/AttachmentView/HighResolutionInfo.tsx b/src/components/Attachments/AttachmentView/HighResolutionInfo.tsx
new file mode 100644
index 000000000000..7ea3c83aa96f
--- /dev/null
+++ b/src/components/Attachments/AttachmentView/HighResolutionInfo.tsx
@@ -0,0 +1,32 @@
+import React from 'react';
+import {View} from 'react-native';
+import Icon from '@components/Icon';
+import * as Expensicons from '@components/Icon/Expensicons';
+import Text from '@components/Text';
+import useLocalize from '@hooks/useLocalize';
+import useStyleUtils from '@hooks/useStyleUtils';
+import useTheme from '@hooks/useTheme';
+import useThemeStyles from '@hooks/useThemeStyles';
+import variables from '@styles/variables';
+
+function HighResolutionInfo({isUploaded}: {isUploaded: boolean}) {
+    const theme = useTheme();
+    const styles = useThemeStyles();
+    const stylesUtils = useStyleUtils();
+    const {translate} = useLocalize();
+
+    return (
+        <View style={[styles.flexRow, styles.alignItemsCenter, styles.gap2, styles.justifyContentCenter, stylesUtils.getHighResolutionInfoWrapperStyle(isUploaded)]}>
+            <Icon
+                src={Expensicons.Info}
+                height={variables.iconSizeExtraSmall}
+                width={variables.iconSizeExtraSmall}
+                fill={theme.icon}
+                additionalStyles={styles.p1}
+            />
+            <Text style={[styles.textLabelSupporting]}>{isUploaded ? translate('attachmentPicker.attachmentImageResized') : translate('attachmentPicker.attachmentImageTooLarge')}</Text>
+        </View>
+    );
+}
+
+export default HighResolutionInfo;
diff --git a/src/components/Attachments/AttachmentView/index.tsx b/src/components/Attachments/AttachmentView/index.tsx
index 2685a5cef407..e9406db118e7 100644
--- a/src/components/Attachments/AttachmentView/index.tsx
+++ b/src/components/Attachments/AttachmentView/index.tsx
@@ -1,17 +1,16 @@
-import Str from 'expensify-common/lib/str';
-import React, {memo, useEffect, useState} from 'react';
+import {Str} from 'expensify-common';
+import React, {memo, useContext, useEffect, useState} from 'react';
 import type {GestureResponderEvent, StyleProp, ViewStyle} from 'react-native';
-import {ActivityIndicator, View} from 'react-native';
+import {View} from 'react-native';
 import type {OnyxEntry} from 'react-native-onyx';
 import {withOnyx} from 'react-native-onyx';
+import AttachmentCarouselPagerContext from '@components/Attachments/AttachmentCarousel/Pager/AttachmentCarouselPagerContext';
 import type {Attachment, AttachmentSource} from '@components/Attachments/types';
 import DistanceEReceipt from '@components/DistanceEReceipt';
 import EReceipt from '@components/EReceipt';
 import Icon from '@components/Icon';
 import * as Expensicons from '@components/Icon/Expensicons';
 import ScrollView from '@components/ScrollView';
-import Text from '@components/Text';
-import Tooltip from '@components/Tooltip';
 import {usePlaybackContext} from '@components/VideoPlayerContexts/PlaybackContext';
 import useLocalize from '@hooks/useLocalize';
 import useNetwork from '@hooks/useNetwork';
@@ -20,6 +19,7 @@ import useTheme from '@hooks/useTheme';
 import useThemeStyles from '@hooks/useThemeStyles';
 import * as CachedPDFPaths from '@libs/actions/CachedPDFPaths';
 import addEncryptedAuthTokenToURL from '@libs/addEncryptedAuthTokenToURL';
+import * as FileUtils from '@libs/fileDownload/FileUtils';
 import * as TransactionUtils from '@libs/TransactionUtils';
 import type {ColorValue} from '@styles/utils/types';
 import variables from '@styles/variables';
@@ -28,6 +28,8 @@ import type {Transaction} from '@src/types/onyx';
 import AttachmentViewImage from './AttachmentViewImage';
 import AttachmentViewPdf from './AttachmentViewPdf';
 import AttachmentViewVideo from './AttachmentViewVideo';
+import DefaultAttachmentView from './DefaultAttachmentView';
+import HighResolutionInfo from './HighResolutionInfo';
 
 type AttachmentViewOnyxProps = {
     transaction: OnyxEntry<Transaction>;
@@ -41,9 +43,6 @@ type AttachmentViewProps = AttachmentViewOnyxProps &
         /** Function for handle on press */
         onPress?: (e?: GestureResponderEvent | KeyboardEvent) => void;
 
-        /** Whether this AttachmentView is shown as part of a AttachmentCarousel */
-        isUsedInCarousel?: boolean;
-
         isUsedInAttachmentModal?: boolean;
 
         /** Flag to show/hide download icon */
@@ -55,6 +54,9 @@ type AttachmentViewProps = AttachmentViewOnyxProps &
         /** Notify parent that the UI should be modified to accommodate keyboard */
         onToggleKeyboard?: (shouldFadeOut: boolean) => void;
 
+        /** A callback when the PDF fails to load */
+        onPDFLoadError?: () => void;
+
         /** Extra styles to pass to View wrapper */
         containerStyles?: StyleProp<ViewStyle>;
 
@@ -64,13 +66,22 @@ type AttachmentViewProps = AttachmentViewOnyxProps &
         /** Denotes whether it is an icon (ex: SVG) */
         maybeIcon?: boolean;
 
+        /** Fallback source to use in case of error */
         fallbackSource?: AttachmentSource;
 
+        /* Whether it is hovered or not */
         isHovered?: boolean;
+
+        /** Whether the attachment is used as a chat attachment */
+        isUsedAsChatAttachment?: boolean;
+
+        /* Flag indicating whether the attachment has been uploaded. */
+        isUploaded?: boolean;
     };
 
 function AttachmentView({
     source,
+    previewSource,
     file,
     isAuthTokenRequired,
     onPress,
@@ -78,8 +89,8 @@ function AttachmentView({
     shouldShowDownloadIcon,
     containerStyles,
     onToggleKeyboard,
+    onPDFLoadError: onPDFLoadErrorProp = () => {},
     isFocused,
-    isUsedInCarousel,
     isUsedInAttachmentModal,
     isWorkspaceAvatar,
     maybeIcon,
@@ -88,14 +99,20 @@ function AttachmentView({
     reportActionID,
     isHovered,
     duration,
+    isUsedAsChatAttachment,
+    isUploaded = true,
 }: AttachmentViewProps) {
     const {translate} = useLocalize();
     const {updateCurrentlyPlayingURL} = usePlaybackContext();
+    const attachmentCarouselPagerContext = useContext(AttachmentCarouselPagerContext);
     const theme = useTheme();
     const styles = useThemeStyles();
     const StyleUtils = useStyleUtils();
     const [loadComplete, setLoadComplete] = useState(false);
+    const [isHighResolution, setIsHighResolution] = useState<boolean>(false);
+    const [hasPDFFailedToLoad, setHasPDFFailedToLoad] = useState(false);
     const isVideo = (typeof source === 'string' && Str.isVideo(source)) || (file?.name && Str.isVideo(file.name));
+    const isUsedInCarousel = !!attachmentCarouselPagerContext?.pagerRef;
 
     useEffect(() => {
         if (!isFocused && !(file && isUsedInAttachmentModal)) {
@@ -108,6 +125,12 @@ function AttachmentView({
 
     useNetwork({onReconnect: () => setImageError(false)});
 
+    useEffect(() => {
+        FileUtils.getFileResolution(file).then((resolution) => {
+            setIsHighResolution(FileUtils.isHighResolutionImage(resolution));
+        });
+    }, [file]);
+
     // Handles case where source is a component (ex: SVG) or a number
     // Number may represent a SVG or an image
     if (typeof source === 'function' || (maybeIcon && typeof source === 'number')) {
@@ -145,7 +168,9 @@ function AttachmentView({
 
     // Check both source and file.name since PDFs dragged into the text field
     // will appear with a source that is a blob
-    if ((typeof source === 'string' && Str.isPDF(source)) || (file && Str.isPDF(file.name ?? translate('attachmentView.unknownFilename')))) {
+    const isSourcePDF = typeof source === 'string' && Str.isPDF(source);
+    const isFilePDF = file && Str.isPDF(file.name ?? translate('attachmentView.unknownFilename'));
+    if (!hasPDFFailedToLoad && (isSourcePDF || isFilePDF)) {
         const encryptedSourceUrl = isAuthTokenRequired ? addEncryptedAuthTokenToURL(source as string) : (source as string);
 
         const onPDFLoadComplete = (path: string) => {
@@ -158,6 +183,11 @@ function AttachmentView({
             }
         };
 
+        const onPDFLoadError = () => {
+            setHasPDFFailedToLoad(true);
+            onPDFLoadErrorProp();
+        };
+
         // We need the following View component on android native
         // So that the event will propagate properly and
         // the Password protected preview will be shown for pdf attachement we are about to send.
@@ -170,8 +200,9 @@ function AttachmentView({
                     onPress={onPress}
                     onToggleKeyboard={onToggleKeyboard}
                     onLoadComplete={onPDFLoadComplete}
-                    errorLabelStyles={isUsedInAttachmentModal ? [styles.textLabel, styles.textLarge] : [styles.cursorAuto]}
                     style={isUsedInAttachmentModal ? styles.imageModalPDF : styles.flex1}
+                    isUsedAsChatAttachment={isUsedAsChatAttachment}
+                    onLoadError={onPDFLoadError}
                 />
             </View>
         );
@@ -184,35 +215,61 @@ function AttachmentView({
     // For this check we use both source and file.name since temporary file source is a blob
     // both PDFs and images will appear as images when pasted into the text field.
     // We also check for numeric source since this is how static images (used for preview) are represented in RN.
-    const isImage = typeof source === 'number' || (typeof source === 'string' && Str.isImage(source));
-    if (isImage || (file?.name && Str.isImage(file.name))) {
-        if (imageError) {
-            // AttachmentViewImage can't handle icon fallbacks, so we need to handle it here
-            if (typeof fallbackSource === 'number' || typeof fallbackSource === 'function') {
+    const isSourceImage = typeof source === 'number' || (typeof source === 'string' && Str.isImage(source));
+    const isFileNameImage = file?.name && Str.isImage(file.name);
+    const isFileImage = isSourceImage || isFileNameImage;
+
+    if (isFileImage) {
+        if (imageError && (typeof fallbackSource === 'number' || typeof fallbackSource === 'function')) {
+            return (
+                <Icon
+                    src={fallbackSource}
+                    height={variables.defaultAvatarPreviewSize}
+                    width={variables.defaultAvatarPreviewSize}
+                    additionalStyles={[styles.alignItemsCenter, styles.justifyContentCenter, styles.flex1]}
+                    fill={theme.border}
+                />
+            );
+        }
+        let imageSource = imageError && fallbackSource ? (fallbackSource as string) : (source as string);
+
+        if (isHighResolution) {
+            if (!isUploaded) {
                 return (
-                    <Icon
-                        src={fallbackSource}
-                        height={variables.defaultAvatarPreviewSize}
-                        width={variables.defaultAvatarPreviewSize}
-                        additionalStyles={[styles.alignItemsCenter, styles.justifyContentCenter, styles.flex1]}
-                        fill={theme.border}
-                    />
+                    <>
+                        <View style={styles.imageModalImageCenterContainer}>
+                            <DefaultAttachmentView
+                                icon={Expensicons.Gallery}
+                                fileName={file?.name}
+                                shouldShowDownloadIcon={shouldShowDownloadIcon}
+                                shouldShowLoadingSpinnerIcon={shouldShowLoadingSpinnerIcon}
+                                containerStyles={containerStyles}
+                            />
+                        </View>
+                        <HighResolutionInfo isUploaded={isUploaded} />
+                    </>
                 );
             }
+            imageSource = previewSource?.toString() ?? imageSource;
         }
 
         return (
-            <AttachmentViewImage
-                url={imageError && fallbackSource ? (fallbackSource as string) : (source as string)}
-                file={file}
-                isAuthTokenRequired={isAuthTokenRequired}
-                loadComplete={loadComplete}
-                isImage={isImage}
-                onPress={onPress}
-                onError={() => {
-                    setImageError(true);
-                }}
-            />
+            <>
+                <View style={styles.imageModalImageCenterContainer}>
+                    <AttachmentViewImage
+                        url={imageSource}
+                        file={file}
+                        isAuthTokenRequired={isAuthTokenRequired}
+                        loadComplete={loadComplete}
+                        isImage={isFileImage}
+                        onPress={onPress}
+                        onError={() => {
+                            setImageError(true);
+                        }}
+                    />
+                </View>
+                {isHighResolution && <HighResolutionInfo isUploaded={isUploaded} />}
+            </>
         );
     }
 
@@ -228,36 +285,12 @@ function AttachmentView({
     }
 
     return (
-        <View style={[styles.defaultAttachmentView, containerStyles]}>
-            <View style={styles.mr2}>
-                <Icon
-                    fill={theme.icon}
-                    src={Expensicons.Paperclip}
-                />
-            </View>
-
-            <Text style={[styles.textStrong, styles.flexShrink1, styles.breakAll, styles.flexWrap, styles.mw100]}>{file?.name}</Text>
-            {!shouldShowLoadingSpinnerIcon && shouldShowDownloadIcon && (
-                <Tooltip text={translate('common.download')}>
-                    <View style={styles.ml2}>
-                        <Icon
-                            fill={theme.icon}
-                            src={Expensicons.Download}
-                        />
-                    </View>
-                </Tooltip>
-            )}
-            {shouldShowLoadingSpinnerIcon && (
-                <View style={styles.ml2}>
-                    <Tooltip text={translate('common.downloading')}>
-                        <ActivityIndicator
-                            size="small"
-                            color={theme.textSupporting}
-                        />
-                    </Tooltip>
-                </View>
-            )}
-        </View>
+        <DefaultAttachmentView
+            fileName={file?.name}
+            shouldShowDownloadIcon={shouldShowDownloadIcon}
+            shouldShowLoadingSpinnerIcon={shouldShowLoadingSpinnerIcon}
+            containerStyles={containerStyles}
+        />
     );
 }
 
diff --git a/src/components/Attachments/types.ts b/src/components/Attachments/types.ts
index 835482ca99d9..8bac4cc53af6 100644
--- a/src/components/Attachments/types.ts
+++ b/src/components/Attachments/types.ts
@@ -13,6 +13,9 @@ type Attachment = {
     /** URL to full-sized attachment, SVG function, or numeric static image on native platforms */
     source: AttachmentSource;
 
+    /** URL to preview-sized attachment that is also used for the thumbnail */
+    previewSource?: AttachmentSource;
+
     /** File object can be an instance of File or Object */
     file?: FileObject;
 
diff --git a/src/components/AutoCompleteSuggestions/AutoCompleteSuggestionsPortal/TransparentOverlay/TransparentOverlay.tsx b/src/components/AutoCompleteSuggestions/AutoCompleteSuggestionsPortal/TransparentOverlay/TransparentOverlay.tsx
new file mode 100644
index 000000000000..c2081fa33bd1
--- /dev/null
+++ b/src/components/AutoCompleteSuggestions/AutoCompleteSuggestionsPortal/TransparentOverlay/TransparentOverlay.tsx
@@ -0,0 +1,47 @@
+import React, {useCallback} from 'react';
+import {View} from 'react-native';
+import type {PointerEvent} from 'react-native';
+import type PressableProps from '@components/Pressable/GenericPressable/types';
+import PressableWithoutFeedback from '@components/Pressable/PressableWithoutFeedback';
+import useLocalize from '@hooks/useLocalize';
+import useThemeStyles from '@hooks/useThemeStyles';
+import CONST from '@src/CONST';
+
+type TransparentOverlayProps = {
+    onPress: () => void;
+};
+
+type OnPressHandler = PressableProps['onPress'];
+
+function TransparentOverlay({onPress: onPressProp}: TransparentOverlayProps) {
+    const {translate} = useLocalize();
+    const styles = useThemeStyles();
+
+    const onPress = useCallback<NonNullable<OnPressHandler>>(
+        (event) => {
+            event?.preventDefault();
+            onPressProp();
+        },
+        [onPressProp],
+    );
+
+    const handlePointerDown = useCallback((e: PointerEvent) => {
+        e?.preventDefault();
+    }, []);
+
+    return (
+        <View
+            onPointerDown={handlePointerDown}
+            style={styles.fullScreen}
+        >
+            <PressableWithoutFeedback
+                onPress={onPress}
+                style={[styles.flex1, styles.cursorDefault]}
+                accessibilityLabel={translate('common.close')}
+                role={CONST.ROLE.BUTTON}
+            />
+        </View>
+    );
+}
+
+export default TransparentOverlay;
diff --git a/src/components/AutoCompleteSuggestions/AutoCompleteSuggestionsPortal/getBottomSuggestionPadding/index.ios.ts b/src/components/AutoCompleteSuggestions/AutoCompleteSuggestionsPortal/getBottomSuggestionPadding/index.ios.ts
new file mode 100644
index 000000000000..5bb671c5edac
--- /dev/null
+++ b/src/components/AutoCompleteSuggestions/AutoCompleteSuggestionsPortal/getBottomSuggestionPadding/index.ios.ts
@@ -0,0 +1,5 @@
+function getBottomSuggestionPadding(): number {
+    return 16;
+}
+
+export default getBottomSuggestionPadding;
diff --git a/src/components/AutoCompleteSuggestions/AutoCompleteSuggestionsPortal/getBottomSuggestionPadding/index.ts b/src/components/AutoCompleteSuggestions/AutoCompleteSuggestionsPortal/getBottomSuggestionPadding/index.ts
new file mode 100644
index 000000000000..acdc643b6b70
--- /dev/null
+++ b/src/components/AutoCompleteSuggestions/AutoCompleteSuggestionsPortal/getBottomSuggestionPadding/index.ts
@@ -0,0 +1,5 @@
+function getBottomSuggestionPadding(): number {
+    return 6;
+}
+
+export default getBottomSuggestionPadding;
diff --git a/src/components/AutoCompleteSuggestions/AutoCompleteSuggestionsPortal/index.native.tsx b/src/components/AutoCompleteSuggestions/AutoCompleteSuggestionsPortal/index.native.tsx
new file mode 100644
index 000000000000..d4f6f0eb28d4
--- /dev/null
+++ b/src/components/AutoCompleteSuggestions/AutoCompleteSuggestionsPortal/index.native.tsx
@@ -0,0 +1,35 @@
+import {Portal} from '@gorhom/portal';
+import React, {useMemo} from 'react';
+import {View} from 'react-native';
+import BaseAutoCompleteSuggestions from '@components/AutoCompleteSuggestions/BaseAutoCompleteSuggestions';
+import useStyleUtils from '@hooks/useStyleUtils';
+import getBottomSuggestionPadding from './getBottomSuggestionPadding';
+import TransparentOverlay from './TransparentOverlay/TransparentOverlay';
+import type {AutoCompleteSuggestionsPortalProps} from './types';
+
+function AutoCompleteSuggestionsPortal<TSuggestion>({left = 0, width = 0, bottom = 0, resetSuggestions = () => {}, ...props}: AutoCompleteSuggestionsPortalProps<TSuggestion>) {
+    const StyleUtils = useStyleUtils();
+    const styles = useMemo(() => StyleUtils.getBaseAutoCompleteSuggestionContainerStyle({left, width, bottom: bottom + getBottomSuggestionPadding()}), [StyleUtils, left, width, bottom]);
+
+    if (!width) {
+        return null;
+    }
+
+    return (
+        <Portal hostName="suggestions">
+            <TransparentOverlay onPress={resetSuggestions} />
+            <View style={styles}>
+                {/* eslint-disable-next-line react/jsx-props-no-spreading */}
+                <BaseAutoCompleteSuggestions<TSuggestion>
+                    width={width}
+                    // eslint-disable-next-line react/jsx-props-no-spreading
+                    {...props}
+                />
+            </View>
+        </Portal>
+    );
+}
+
+AutoCompleteSuggestionsPortal.displayName = 'AutoCompleteSuggestionsPortal';
+
+export default AutoCompleteSuggestionsPortal;
diff --git a/src/components/AutoCompleteSuggestions/AutoCompleteSuggestionsPortal/index.tsx b/src/components/AutoCompleteSuggestions/AutoCompleteSuggestionsPortal/index.tsx
new file mode 100644
index 000000000000..4d322fe15c4e
--- /dev/null
+++ b/src/components/AutoCompleteSuggestions/AutoCompleteSuggestionsPortal/index.tsx
@@ -0,0 +1,53 @@
+import React from 'react';
+import type {ReactElement} from 'react';
+import ReactDOM from 'react-dom';
+import {View} from 'react-native';
+import BaseAutoCompleteSuggestions from '@components/AutoCompleteSuggestions/BaseAutoCompleteSuggestions';
+import useStyleUtils from '@hooks/useStyleUtils';
+import getBottomSuggestionPadding from './getBottomSuggestionPadding';
+import TransparentOverlay from './TransparentOverlay/TransparentOverlay';
+import type {AutoCompleteSuggestionsPortalProps} from './types';
+
+/**
+ * On the mobile-web platform, when long-pressing on auto-complete suggestions,
+ * we need to prevent focus shifting to avoid blurring the main input (which makes the suggestions picker close and fires the onSelect callback).
+ * The desired pattern for all platforms is to do nothing on long-press.
+ * On the native platform, tapping on auto-complete suggestions will not blur the main input.
+ */
+
+function AutoCompleteSuggestionsPortal<TSuggestion>({
+    left = 0,
+    width = 0,
+    bottom = 0,
+    resetSuggestions = () => {},
+    ...props
+}: AutoCompleteSuggestionsPortalProps<TSuggestion>): ReactElement | null | false {
+    const StyleUtils = useStyleUtils();
+
+    const bodyElement = document.querySelector('body');
+
+    const componentToRender = (
+        <BaseAutoCompleteSuggestions<TSuggestion>
+            width={width}
+            // eslint-disable-next-line react/jsx-props-no-spreading
+            {...props}
+        />
+    );
+
+    return (
+        !!width &&
+        bodyElement &&
+        ReactDOM.createPortal(
+            <>
+                <TransparentOverlay onPress={resetSuggestions} />
+                <View style={StyleUtils.getBaseAutoCompleteSuggestionContainerStyle({left, width, bottom: bottom - getBottomSuggestionPadding()})}>{componentToRender}</View>
+            </>,
+            bodyElement,
+        )
+    );
+}
+
+AutoCompleteSuggestionsPortal.displayName = 'AutoCompleteSuggestionsPortal';
+
+export default AutoCompleteSuggestionsPortal;
+export type {AutoCompleteSuggestionsPortalProps};
diff --git a/src/components/AutoCompleteSuggestions/AutoCompleteSuggestionsPortal/types.ts b/src/components/AutoCompleteSuggestions/AutoCompleteSuggestionsPortal/types.ts
new file mode 100644
index 000000000000..61fa3e8dcd48
--- /dev/null
+++ b/src/components/AutoCompleteSuggestions/AutoCompleteSuggestionsPortal/types.ts
@@ -0,0 +1,13 @@
+import type {AutoCompleteSuggestionsProps} from '@components/AutoCompleteSuggestions/types';
+
+type ExternalProps<TSuggestion> = Omit<AutoCompleteSuggestionsProps<TSuggestion>, 'measureParentContainerAndReportCursor'>;
+
+type AutoCompleteSuggestionsPortalProps<TSuggestion> = ExternalProps<TSuggestion> & {
+    left: number;
+    width: number;
+    bottom: number;
+    measuredHeightOfSuggestionRows: number;
+};
+
+// eslint-disable-next-line import/prefer-default-export
+export type {AutoCompleteSuggestionsPortalProps};
diff --git a/src/components/AutoCompleteSuggestions/BaseAutoCompleteSuggestions.tsx b/src/components/AutoCompleteSuggestions/BaseAutoCompleteSuggestions.tsx
index ccd0f21626a0..2d22a2560bb0 100644
--- a/src/components/AutoCompleteSuggestions/BaseAutoCompleteSuggestions.tsx
+++ b/src/components/AutoCompleteSuggestions/BaseAutoCompleteSuggestions.tsx
@@ -1,52 +1,33 @@
-import {FlashList} from '@shopify/flash-list';
-import type {ForwardedRef, ReactElement} from 'react';
-import React, {forwardRef, useCallback, useEffect, useMemo, useRef} from 'react';
-import type {View} from 'react-native';
-// We take ScrollView from this package to properly handle the scrolling of AutoCompleteSuggestions in chats since one scroll is nested inside another
-import {ScrollView} from 'react-native-gesture-handler';
-import Animated, {Easing, FadeOutDown, useAnimatedStyle, useSharedValue, withTiming} from 'react-native-reanimated';
+import type {ReactElement} from 'react';
+import React, {useCallback, useEffect, useRef} from 'react';
+import {FlatList} from 'react-native-gesture-handler';
+import Animated, {Easing, useAnimatedStyle, useSharedValue, withTiming} from 'react-native-reanimated';
 import ColorSchemeWrapper from '@components/ColorSchemeWrapper';
 import PressableWithFeedback from '@components/Pressable/PressableWithFeedback';
 import useStyleUtils from '@hooks/useStyleUtils';
 import useThemeStyles from '@hooks/useThemeStyles';
-import useWindowDimensions from '@hooks/useWindowDimensions';
-import variables from '@styles/variables';
+import * as DeviceCapabilities from '@libs/DeviceCapabilities';
 import CONST from '@src/CONST';
-import viewForwardedRef from '@src/types/utils/viewForwardedRef';
-import type {AutoCompleteSuggestionsProps, RenderSuggestionMenuItemProps} from './types';
+import type {AutoCompleteSuggestionsPortalProps} from './AutoCompleteSuggestionsPortal';
+import type {RenderSuggestionMenuItemProps} from './types';
 
-const measureHeightOfSuggestionRows = (numRows: number, isSuggestionPickerLarge: boolean): number => {
-    if (isSuggestionPickerLarge) {
-        if (numRows > CONST.AUTO_COMPLETE_SUGGESTER.MAX_AMOUNT_OF_VISIBLE_SUGGESTIONS_IN_CONTAINER) {
-            // On large screens, if there are more than 5 suggestions, we display a scrollable window with a height of 5 items, indicating that there are more items available
-            return CONST.AUTO_COMPLETE_SUGGESTER.MAX_AMOUNT_OF_VISIBLE_SUGGESTIONS_IN_CONTAINER * CONST.AUTO_COMPLETE_SUGGESTER.SUGGESTION_ROW_HEIGHT;
-        }
-        return numRows * CONST.AUTO_COMPLETE_SUGGESTER.SUGGESTION_ROW_HEIGHT;
-    }
-    if (numRows > 2) {
-        // On small screens, we display a scrollable window with a height of 2.5 items, indicating that there are more items available beyond what is currently visible
-        return CONST.AUTO_COMPLETE_SUGGESTER.SMALL_CONTAINER_HEIGHT_FACTOR * CONST.AUTO_COMPLETE_SUGGESTER.SUGGESTION_ROW_HEIGHT;
-    }
-    return numRows * CONST.AUTO_COMPLETE_SUGGESTER.SUGGESTION_ROW_HEIGHT;
-};
+type ExternalProps<TSuggestion> = Omit<AutoCompleteSuggestionsPortalProps<TSuggestion>, 'left' | 'bottom'>;
 
-function BaseAutoCompleteSuggestions<TSuggestion>(
-    {
-        highlightedSuggestionIndex,
-        onSelect,
-        accessibilityLabelExtractor,
-        renderSuggestionMenuItem,
-        suggestions,
-        isSuggestionPickerLarge,
-        keyExtractor,
-    }: AutoCompleteSuggestionsProps<TSuggestion>,
-    ref: ForwardedRef<View | HTMLDivElement>,
-) {
-    const {windowWidth, isLargeScreenWidth} = useWindowDimensions();
+function BaseAutoCompleteSuggestions<TSuggestion>({
+    highlightedSuggestionIndex = 0,
+    onSelect,
+    accessibilityLabelExtractor,
+    renderSuggestionMenuItem,
+    suggestions,
+    keyExtractor,
+    measuredHeightOfSuggestionRows,
+}: ExternalProps<TSuggestion>) {
     const styles = useThemeStyles();
     const StyleUtils = useStyleUtils();
     const rowHeight = useSharedValue(0);
-    const scrollRef = useRef<FlashList<TSuggestion>>(null);
+    const prevRowHeightRef = useRef<number>(measuredHeightOfSuggestionRows);
+    const fadeInOpacity = useSharedValue(0);
+    const scrollRef = useRef<FlatList<TSuggestion>>(null);
     /**
      * Render a suggestion menu item component.
      */
@@ -58,7 +39,6 @@ function BaseAutoCompleteSuggestions<TSuggestion>(
                 onMouseDown={(e) => e.preventDefault()}
                 onPress={() => onSelect(index)}
                 onLongPress={() => {}}
-                shouldUseHapticsOnLongPress={false}
                 accessibilityLabel={accessibilityLabelExtractor(item, index)}
             >
                 {renderSuggestionMenuItem(item, index)}
@@ -68,43 +48,59 @@ function BaseAutoCompleteSuggestions<TSuggestion>(
     );
 
     const innerHeight = CONST.AUTO_COMPLETE_SUGGESTER.SUGGESTION_ROW_HEIGHT * suggestions.length;
-    const animatedStyles = useAnimatedStyle(() => StyleUtils.getAutoCompleteSuggestionContainerStyle(rowHeight.value));
-    const estimatedListSize = useMemo(
-        () => ({
-            height: CONST.AUTO_COMPLETE_SUGGESTER.SUGGESTION_ROW_HEIGHT * suggestions.length,
-            width: (isLargeScreenWidth ? windowWidth - variables.sideBarWidth : windowWidth) - CONST.CHAT_FOOTER_HORIZONTAL_PADDING,
-        }),
-        [isLargeScreenWidth, suggestions.length, windowWidth],
-    );
+
+    const animatedStyles = useAnimatedStyle(() => ({
+        opacity: fadeInOpacity.value,
+        ...StyleUtils.getAutoCompleteSuggestionContainerStyle(rowHeight.value),
+    }));
+
     useEffect(() => {
-        rowHeight.value = withTiming(measureHeightOfSuggestionRows(suggestions.length, isSuggestionPickerLarge), {
-            duration: 100,
-            easing: Easing.inOut(Easing.ease),
-        });
-    }, [suggestions.length, isSuggestionPickerLarge, rowHeight]);
+        if (measuredHeightOfSuggestionRows === prevRowHeightRef.current) {
+            // eslint-disable-next-line react-compiler/react-compiler
+            fadeInOpacity.value = withTiming(1, {
+                duration: 70,
+                easing: Easing.inOut(Easing.ease),
+            });
+            rowHeight.value = measuredHeightOfSuggestionRows;
+        } else {
+            fadeInOpacity.value = 1;
+            rowHeight.value = withTiming(measuredHeightOfSuggestionRows, {
+                duration: 100,
+                easing: Easing.bezier(0.25, 0.1, 0.25, 1),
+            });
+        }
+
+        prevRowHeightRef.current = measuredHeightOfSuggestionRows;
+    }, [suggestions.length, rowHeight, measuredHeightOfSuggestionRows, prevRowHeightRef, fadeInOpacity]);
 
     useEffect(() => {
         if (!scrollRef.current) {
             return;
         }
-        scrollRef.current.scrollToIndex({index: highlightedSuggestionIndex, animated: true});
+        // When using cursor control (moving the cursor with the space bar on the keyboard) on Android, moving the cursor too fast may cause an error.
+        try {
+            scrollRef.current.scrollToIndex({index: highlightedSuggestionIndex, animated: true});
+        } catch (e) {
+            // eslint-disable-next-line no-console
+        }
     }, [highlightedSuggestionIndex]);
 
     return (
         <Animated.View
-            ref={viewForwardedRef(ref)}
             style={[styles.autoCompleteSuggestionsContainer, animatedStyles]}
-            exiting={FadeOutDown.duration(100).easing(Easing.inOut(Easing.ease))}
+            onPointerDown={(e) => {
+                if (DeviceCapabilities.hasHoverSupport()) {
+                    return;
+                }
+                e.preventDefault();
+            }}
         >
             <ColorSchemeWrapper>
-                <FlashList
-                    estimatedItemSize={CONST.AUTO_COMPLETE_SUGGESTER.SUGGESTION_ROW_HEIGHT}
-                    estimatedListSize={estimatedListSize}
+                <FlatList
                     ref={scrollRef}
                     keyboardShouldPersistTaps="handled"
                     data={suggestions}
                     renderItem={renderItem}
-                    renderScrollComponent={ScrollView}
                     keyExtractor={keyExtractor}
                     removeClippedSubviews={false}
                     showsVerticalScrollIndicator={innerHeight > rowHeight.value}
@@ -117,4 +113,4 @@ function BaseAutoCompleteSuggestions<TSuggestion>(
 
 BaseAutoCompleteSuggestions.displayName = 'BaseAutoCompleteSuggestions';
 
-export default forwardRef(BaseAutoCompleteSuggestions);
+export default BaseAutoCompleteSuggestions;
diff --git a/src/components/AutoCompleteSuggestions/index.native.tsx b/src/components/AutoCompleteSuggestions/index.native.tsx
deleted file mode 100644
index fbfa7d953581..000000000000
--- a/src/components/AutoCompleteSuggestions/index.native.tsx
+++ /dev/null
@@ -1,17 +0,0 @@
-import {Portal} from '@gorhom/portal';
-import React from 'react';
-import BaseAutoCompleteSuggestions from './BaseAutoCompleteSuggestions';
-import type {AutoCompleteSuggestionsProps} from './types';
-
-function AutoCompleteSuggestions<TSuggestion>({measureParentContainer, ...props}: AutoCompleteSuggestionsProps<TSuggestion>) {
-    return (
-        <Portal hostName="suggestions">
-            {/* eslint-disable-next-line react/jsx-props-no-spreading */}
-            <BaseAutoCompleteSuggestions<TSuggestion> {...props} />
-        </Portal>
-    );
-}
-
-AutoCompleteSuggestions.displayName = 'AutoCompleteSuggestions';
-
-export default AutoCompleteSuggestions;
diff --git a/src/components/AutoCompleteSuggestions/index.tsx b/src/components/AutoCompleteSuggestions/index.tsx
index baca4011a177..41a01fa27c46 100644
--- a/src/components/AutoCompleteSuggestions/index.tsx
+++ b/src/components/AutoCompleteSuggestions/index.tsx
@@ -1,11 +1,45 @@
-import React from 'react';
-import ReactDOM from 'react-dom';
-import {View} from 'react-native';
+import React, {useEffect} from 'react';
+import useKeyboardState from '@hooks/useKeyboardState';
+import useSafeAreaInsets from '@hooks/useSafeAreaInsets';
 import useStyleUtils from '@hooks/useStyleUtils';
 import useWindowDimensions from '@hooks/useWindowDimensions';
 import * as DeviceCapabilities from '@libs/DeviceCapabilities';
-import BaseAutoCompleteSuggestions from './BaseAutoCompleteSuggestions';
-import type {AutoCompleteSuggestionsProps} from './types';
+import CONST from '@src/CONST';
+import AutoCompleteSuggestionsPortal from './AutoCompleteSuggestionsPortal';
+import type {AutoCompleteSuggestionsProps, MeasureParentContainerAndCursor} from './types';
+
+const measureHeightOfSuggestionRows = (numRows: number, canBeBig: boolean): number => {
+    if (canBeBig) {
+        if (numRows > CONST.AUTO_COMPLETE_SUGGESTER.MAX_AMOUNT_OF_VISIBLE_SUGGESTIONS_IN_CONTAINER) {
+            // On large screens, if there are more than 5 suggestions, we display a scrollable window with a height of 5 items, indicating that there are more items available
+            return CONST.AUTO_COMPLETE_SUGGESTER.MAX_AMOUNT_OF_VISIBLE_SUGGESTIONS_IN_CONTAINER * CONST.AUTO_COMPLETE_SUGGESTER.SUGGESTION_ROW_HEIGHT;
+        }
+        return numRows * CONST.AUTO_COMPLETE_SUGGESTER.SUGGESTION_ROW_HEIGHT;
+    }
+    if (numRows > 2) {
+        // On small screens, we display a scrollable window with a height of 2.5 items, indicating that there are more items available beyond what is currently visible
+        return CONST.AUTO_COMPLETE_SUGGESTER.SMALL_CONTAINER_HEIGHT_FACTOR * CONST.AUTO_COMPLETE_SUGGESTER.SUGGESTION_ROW_HEIGHT;
+    }
+    return numRows * CONST.AUTO_COMPLETE_SUGGESTER.SUGGESTION_ROW_HEIGHT;
+};
+function isSuggestionMenuRenderedAbove(isEnoughSpaceAboveForBigMenu: boolean, isEnoughSpaceAboveForSmallMenu: boolean): boolean {
+    return isEnoughSpaceAboveForBigMenu || isEnoughSpaceAboveForSmallMenu;
+}
+
+type IsEnoughSpaceToRenderMenuAboveCursor = Pick<MeasureParentContainerAndCursor, 'y' | 'cursorCoordinates' | 'scrollValue'> & {
+    contentHeight: number;
+    topInset: number;
+};
+function isEnoughSpaceToRenderMenuAboveCursor({y, cursorCoordinates, scrollValue, contentHeight, topInset}: IsEnoughSpaceToRenderMenuAboveCursor): boolean {
+    return y + (cursorCoordinates.y - scrollValue) > contentHeight + topInset + CONST.AUTO_COMPLETE_SUGGESTER.SUGGESTION_BOX_MAX_SAFE_DISTANCE;
+}
+
+const initialContainerState = {
+    width: 0,
+    left: 0,
+    bottom: 0,
+    cursorCoordinates: {x: 0, y: 0},
+};
 
 /**
  * On the mobile-web platform, when long-pressing on auto-complete suggestions,
@@ -13,17 +47,21 @@ import type {AutoCompleteSuggestionsProps} from './types';
  * The desired pattern for all platforms is to do nothing on long-press.
  * On the native platform, tapping on auto-complete suggestions will not blur the main input.
  */
-
-function AutoCompleteSuggestions<TSuggestion>({measureParentContainer = () => {}, ...props}: AutoCompleteSuggestionsProps<TSuggestion>) {
-    const StyleUtils = useStyleUtils();
+function AutoCompleteSuggestions<TSuggestion>({measureParentContainerAndReportCursor = () => {}, ...props}: AutoCompleteSuggestionsProps<TSuggestion>) {
     const containerRef = React.useRef<HTMLDivElement>(null);
-    const {windowHeight, windowWidth} = useWindowDimensions();
-    const [{width, left, bottom}, setContainerState] = React.useState({
-        width: 0,
-        left: 0,
-        bottom: 0,
-    });
-    React.useEffect(() => {
+    const isInitialRender = React.useRef<boolean>(true);
+    const isSuggestionMenuAboveRef = React.useRef<boolean>(false);
+    const leftValue = React.useRef<number>(0);
+    const prevLeftValue = React.useRef<number>(0);
+    const {windowHeight, windowWidth, isSmallScreenWidth} = useWindowDimensions();
+    const [suggestionHeight, setSuggestionHeight] = React.useState(0);
+    const [containerState, setContainerState] = React.useState(initialContainerState);
+    const StyleUtils = useStyleUtils();
+    const insets = useSafeAreaInsets();
+    const {keyboardHeight} = useKeyboardState();
+    const {paddingBottom: bottomInset, paddingTop: topInset} = StyleUtils.getSafeAreaPadding(insets ?? undefined);
+
+    useEffect(() => {
         const container = containerRef.current;
         if (!container) {
             return () => {};
@@ -37,25 +75,76 @@ function AutoCompleteSuggestions<TSuggestion>({measureParentContainer = () => {}
         return () => (container.onpointerdown = null);
     }, []);
 
-    React.useEffect(() => {
-        if (!measureParentContainer) {
+    const suggestionsLength = props.suggestions.length;
+
+    useEffect(() => {
+        if (!measureParentContainerAndReportCursor) {
             return;
         }
-        measureParentContainer((x, y, w) => setContainerState({left: x, bottom: windowHeight - y, width: w}));
-    }, [measureParentContainer, windowHeight, windowWidth]);
 
-    const componentToRender = (
-        <BaseAutoCompleteSuggestions<TSuggestion>
-            // eslint-disable-next-line react/jsx-props-no-spreading
-            {...props}
-            ref={containerRef}
-        />
-    );
+        if (!windowHeight || !windowWidth || !suggestionsLength) {
+            setContainerState(initialContainerState);
+            return;
+        }
+
+        measureParentContainerAndReportCursor(({x, y, width, scrollValue, cursorCoordinates}: MeasureParentContainerAndCursor) => {
+            const xCoordinatesOfCursor = x + cursorCoordinates.x;
+            const bigScreenLeftOffset =
+                xCoordinatesOfCursor + CONST.AUTO_COMPLETE_SUGGESTER.BIG_SCREEN_SUGGESTION_WIDTH > windowWidth
+                    ? windowWidth - CONST.AUTO_COMPLETE_SUGGESTER.BIG_SCREEN_SUGGESTION_WIDTH
+                    : xCoordinatesOfCursor;
+            const contentMaxHeight = measureHeightOfSuggestionRows(suggestionsLength, true);
+            const contentMinHeight = measureHeightOfSuggestionRows(suggestionsLength, false);
+            let bottomValue = windowHeight - (cursorCoordinates.y - scrollValue + y) - keyboardHeight;
+            const widthValue = isSmallScreenWidth ? width : CONST.AUTO_COMPLETE_SUGGESTER.BIG_SCREEN_SUGGESTION_WIDTH;
+
+            const isEnoughSpaceToRenderMenuAboveForBig = isEnoughSpaceToRenderMenuAboveCursor({y, cursorCoordinates, scrollValue, contentHeight: contentMaxHeight, topInset});
+            const isEnoughSpaceToRenderMenuAboveForSmall = isEnoughSpaceToRenderMenuAboveCursor({y, cursorCoordinates, scrollValue, contentHeight: contentMinHeight, topInset});
 
-    const bodyElement = document.querySelector('body');
+            const newLeftOffset = isSmallScreenWidth ? x : bigScreenLeftOffset;
+            // If the suggested word is longer than 150 (approximately half the width of the suggestion popup), then adjust a new position of popup
+            const isAdjustmentNeeded = Math.abs(prevLeftValue.current - bigScreenLeftOffset) > 150;
+            if (isInitialRender.current || isAdjustmentNeeded) {
+                isSuggestionMenuAboveRef.current = isSuggestionMenuRenderedAbove(isEnoughSpaceToRenderMenuAboveForBig, isEnoughSpaceToRenderMenuAboveForSmall);
+                leftValue.current = newLeftOffset;
+                isInitialRender.current = false;
+                prevLeftValue.current = newLeftOffset;
+            }
+
+            let measuredHeight = 0;
+            if (isSuggestionMenuAboveRef.current && isEnoughSpaceToRenderMenuAboveForBig) {
+                // calculation for big suggestion box above the cursor
+                measuredHeight = measureHeightOfSuggestionRows(suggestionsLength, true);
+            } else if (isSuggestionMenuAboveRef.current && isEnoughSpaceToRenderMenuAboveForSmall) {
+                // calculation for small suggestion box above the cursor
+                measuredHeight = measureHeightOfSuggestionRows(suggestionsLength, false);
+            } else {
+                // calculation for big suggestion box below the cursor
+                measuredHeight = measureHeightOfSuggestionRows(suggestionsLength, true);
+                bottomValue = windowHeight - y - cursorCoordinates.y + scrollValue - measuredHeight - CONST.AUTO_COMPLETE_SUGGESTER.SUGGESTION_ROW_HEIGHT - keyboardHeight;
+            }
+            setSuggestionHeight(measuredHeight);
+            setContainerState({
+                left: leftValue.current,
+                bottom: bottomValue,
+                width: widthValue,
+                cursorCoordinates,
+            });
+        });
+    }, [measureParentContainerAndReportCursor, windowHeight, windowWidth, keyboardHeight, isSmallScreenWidth, suggestionsLength, bottomInset, topInset]);
 
+    if ((containerState.width === 0 && containerState.left === 0 && containerState.bottom === 0) || (containerState.cursorCoordinates.x === 0 && containerState.cursorCoordinates.y === 0)) {
+        return null;
+    }
     return (
-        !!width && bodyElement && ReactDOM.createPortal(<View style={StyleUtils.getBaseAutoCompleteSuggestionContainerStyle({left, width, bottom})}>{componentToRender}</View>, bodyElement)
+        <AutoCompleteSuggestionsPortal
+            // eslint-disable-next-line react/jsx-props-no-spreading
+            {...props}
+            left={containerState.left}
+            width={containerState.width}
+            bottom={containerState.bottom}
+            measuredHeightOfSuggestionRows={suggestionHeight}
+        />
     );
 }
 
diff --git a/src/components/AutoCompleteSuggestions/types.ts b/src/components/AutoCompleteSuggestions/types.ts
index 61d614dcf2e4..57347cd65abe 100644
--- a/src/components/AutoCompleteSuggestions/types.ts
+++ b/src/components/AutoCompleteSuggestions/types.ts
@@ -1,6 +1,15 @@
 import type {ReactElement} from 'react';
 
-type MeasureParentContainerCallback = (x: number, y: number, width: number) => void;
+type MeasureParentContainerAndCursor = {
+    x: number;
+    y: number;
+    width: number;
+    height: number;
+    scrollValue: number;
+    cursorCoordinates: {x: number; y: number};
+};
+
+type MeasureParentContainerAndCursorCallback = (props: MeasureParentContainerAndCursor) => void;
 
 type RenderSuggestionMenuItemProps<TSuggestion> = {
     item: TSuggestion;
@@ -31,8 +40,11 @@ type AutoCompleteSuggestionsProps<TSuggestion> = {
     /** create accessibility label for each item */
     accessibilityLabelExtractor: (item: TSuggestion, index: number) => string;
 
-    /** Meaures the parent container's position and dimensions. */
-    measureParentContainer?: (callback: MeasureParentContainerCallback) => void;
+    /** Measures the parent container's position and dimensions. Also add a cursor coordinates */
+    measureParentContainerAndReportCursor?: (props: MeasureParentContainerAndCursorCallback) => void;
+
+    /** Reset the emoji suggestions */
+    resetSuggestions?: () => void;
 };
 
-export type {AutoCompleteSuggestionsProps, RenderSuggestionMenuItemProps};
+export type {AutoCompleteSuggestionsProps, RenderSuggestionMenuItemProps, MeasureParentContainerAndCursorCallback, MeasureParentContainerAndCursor};
diff --git a/src/components/AutoEmailLink.tsx b/src/components/AutoEmailLink.tsx
index e1a9bdd2794b..d64c665a020f 100644
--- a/src/components/AutoEmailLink.tsx
+++ b/src/components/AutoEmailLink.tsx
@@ -1,4 +1,4 @@
-import {CONST} from 'expensify-common/lib/CONST';
+import {CONST as COMMON_CONST} from 'expensify-common';
 import React from 'react';
 import type {StyleProp, TextStyle} from 'react-native';
 import useThemeStyles from '@hooks/useThemeStyles';
@@ -20,8 +20,8 @@ function AutoEmailLink({text, style}: AutoEmailLinkProps) {
     const styles = useThemeStyles();
     return (
         <Text style={style}>
-            {text.split(CONST.REG_EXP.EXTRACT_EMAIL).map((str, index) => {
-                if (CONST.REG_EXP.EMAIL.test(str)) {
+            {text.split(COMMON_CONST.REG_EXP.EXTRACT_EMAIL).map((str, index) => {
+                if (COMMON_CONST.REG_EXP.EMAIL.test(str)) {
                     return (
                         <TextLink
                             // eslint-disable-next-line react/no-array-index-key
diff --git a/src/components/Avatar.tsx b/src/components/Avatar.tsx
index 4acf197ba178..2fbe69a120a0 100644
--- a/src/components/Avatar.tsx
+++ b/src/components/Avatar.tsx
@@ -45,14 +45,14 @@ type AvatarProps = {
     /** Used to locate fallback icon in end-to-end tests. */
     fallbackIconTestID?: string;
 
-    /** Denotes whether it is an avatar or a workspace avatar */
-    type?: AvatarType;
-
     /** Owner of the avatar. If user, displayName. If workspace, policy name */
     name?: string;
 
+    /** Denotes whether it is an avatar or a workspace avatar */
+    type: AvatarType;
+
     /** Optional account id if it's user avatar or policy id if it's workspace avatar */
-    accountID?: number | string;
+    avatarID?: number | string;
 };
 
 function Avatar({
@@ -64,9 +64,9 @@ function Avatar({
     fill,
     fallbackIcon = Expensicons.FallbackAvatar,
     fallbackIconTestID = '',
-    type = CONST.ICON_TYPE_AVATAR,
+    type,
     name = '',
-    accountID,
+    avatarID,
 }: AvatarProps) {
     const theme = useTheme();
     const styles = useThemeStyles();
@@ -80,21 +80,22 @@ function Avatar({
     }, [originalSource]);
 
     const isWorkspace = type === CONST.ICON_TYPE_WORKSPACE;
-    const iconSize = StyleUtils.getAvatarSize(size);
-
-    const imageStyle: StyleProp<ImageStyle> = [StyleUtils.getAvatarStyle(size), imageStyles, styles.noBorderRadius];
-    const iconStyle = imageStyles ? [StyleUtils.getAvatarStyle(size), styles.bgTransparent, imageStyles] : undefined;
+    const userAccountID = isWorkspace ? undefined : (avatarID as number);
 
-    // We pass the color styles down to the SVG for the workspace and fallback avatar.
-    const source = isWorkspace ? originalSource : UserUtils.getAvatar(originalSource, Number(accountID));
+    const source = isWorkspace ? originalSource : UserUtils.getAvatar(originalSource, userAccountID);
     const useFallBackAvatar = imageError || !source || source === Expensicons.FallbackAvatar;
     const fallbackAvatar = isWorkspace ? ReportUtils.getDefaultWorkspaceAvatar(name) : fallbackIcon || Expensicons.FallbackAvatar;
     const fallbackAvatarTestID = isWorkspace ? ReportUtils.getDefaultWorkspaceAvatarTestID(name) : fallbackIconTestID || 'SvgFallbackAvatar Icon';
     const avatarSource = useFallBackAvatar ? fallbackAvatar : source;
 
+    // We pass the color styles down to the SVG for the workspace and fallback avatar.
+    const iconSize = StyleUtils.getAvatarSize(size);
+    const imageStyle: StyleProp<ImageStyle> = [StyleUtils.getAvatarStyle(size), imageStyles, styles.noBorderRadius];
+    const iconStyle = imageStyles ? [StyleUtils.getAvatarStyle(size), styles.bgTransparent, imageStyles] : undefined;
+
     let iconColors;
     if (isWorkspace) {
-        iconColors = StyleUtils.getDefaultWorkspaceAvatarColor(accountID?.toString() ?? '');
+        iconColors = StyleUtils.getDefaultWorkspaceAvatarColor(avatarID?.toString() ?? '');
     } else if (useFallBackAvatar) {
         iconColors = StyleUtils.getBackgroundColorAndFill(theme.buttonHoveredBG, theme.icon);
     } else {
diff --git a/src/components/AvatarCropModal/AvatarCropModal.tsx b/src/components/AvatarCropModal/AvatarCropModal.tsx
index dcec2e14a9e7..1a606b35f6d2 100644
--- a/src/components/AvatarCropModal/AvatarCropModal.tsx
+++ b/src/components/AvatarCropModal/AvatarCropModal.tsx
@@ -16,10 +16,10 @@ import ScreenWrapper from '@components/ScreenWrapper';
 import Text from '@components/Text';
 import Tooltip from '@components/Tooltip';
 import useLocalize from '@hooks/useLocalize';
+import useResponsiveLayout from '@hooks/useResponsiveLayout';
 import useStyleUtils from '@hooks/useStyleUtils';
 import useTheme from '@hooks/useTheme';
 import useThemeStyles from '@hooks/useThemeStyles';
-import useWindowDimensions from '@hooks/useWindowDimensions';
 import cropOrRotateImage from '@libs/cropOrRotateImage';
 import type {CustomRNImageManipulatorResult} from '@libs/cropOrRotateImage/types';
 import CONST from '@src/CONST';
@@ -65,7 +65,7 @@ function AvatarCropModal({imageUri = '', imageName = '', imageType = '', onClose
     const isPressableEnabled = useSharedValue(true);
 
     const {translate} = useLocalize();
-    const {isSmallScreenWidth} = useWindowDimensions();
+    const {shouldUseNarrowLayout} = useResponsiveLayout();
 
     // Check if image cropping, saving or uploading is in progress
     const isLoading = useSharedValue(false);
@@ -119,10 +119,18 @@ function AvatarCropModal({imageUri = '', imageName = '', imageType = '', onClose
         if (!imageUri) {
             return;
         }
-        ImageSize.getSize(imageUri).then(({width, height}) => {
-            // We need to have image sizes in shared values to properly calculate position/size/animation
-            originalImageHeight.value = height;
-            originalImageWidth.value = width;
+        // We need to have image sizes in shared values to properly calculate position/size/animation
+        ImageSize.getSize(imageUri).then(({width, height, rotation: orginalRotation}) => {
+            // On Android devices ImageSize library returns also rotation parameter.
+            if (orginalRotation === 90 || orginalRotation === 270) {
+                // eslint-disable-next-line react-compiler/react-compiler
+                originalImageHeight.value = width;
+                originalImageWidth.value = height;
+            } else {
+                originalImageHeight.value = height;
+                originalImageWidth.value = width;
+            }
+
             setIsImageInitialized(true);
 
             // Because the reanimated library has some internal optimizations,
@@ -350,7 +358,7 @@ function AvatarCropModal({imageUri = '', imageName = '', imageType = '', onClose
                 includeSafeAreaPaddingBottom={false}
                 testID={AvatarCropModal.displayName}
             >
-                {isSmallScreenWidth && <HeaderGap />}
+                {shouldUseNarrowLayout && <HeaderGap />}
                 <HeaderWithBackButton
                     title={translate('avatarCropModal.title')}
                     onBackButtonPress={onClose}
diff --git a/src/components/AvatarCropModal/ImageCropView.tsx b/src/components/AvatarCropModal/ImageCropView.tsx
index b7f2a64090d6..5bfb0d5f6557 100644
--- a/src/components/AvatarCropModal/ImageCropView.tsx
+++ b/src/components/AvatarCropModal/ImageCropView.tsx
@@ -57,6 +57,8 @@ function ImageCropView({imageUri = '', containerSize = 0, panGesture = Gesture.P
 
     // A reanimated memoized style, which updates when the image's size or scale changes.
     const imageStyle = useAnimatedStyle(() => {
+        'worklet';
+
         const height = originalImageHeight.value;
         const width = originalImageWidth.value;
         const aspectRatio = height > width ? height / width : width / height;
diff --git a/src/components/AvatarCropModal/Slider.tsx b/src/components/AvatarCropModal/Slider.tsx
index 9a9da65befa0..bac581da25e6 100644
--- a/src/components/AvatarCropModal/Slider.tsx
+++ b/src/components/AvatarCropModal/Slider.tsx
@@ -7,6 +7,7 @@ import type {SharedValue} from 'react-native-reanimated';
 import Tooltip from '@components/Tooltip';
 import useLocalize from '@hooks/useLocalize';
 import useThemeStyles from '@hooks/useThemeStyles';
+import * as Browser from '@libs/Browser';
 import ControlSelection from '@libs/ControlSelection';
 
 type SliderProps = {
@@ -29,9 +30,13 @@ function Slider({sliderValue, gestureCallbacks}: SliderProps) {
 
     // A reanimated memoized style, which tracks
     // a translateX shared value and updates the slider position.
-    const rSliderStyle = useAnimatedStyle(() => ({
-        transform: [{translateX: sliderValue.value}],
-    }));
+    const rSliderStyle = useAnimatedStyle(() => {
+        'worklet';
+
+        return {
+            transform: [{translateX: sliderValue.value}],
+        };
+    });
 
     const panGesture = Gesture.Pan()
         .minDistance(5)
@@ -62,7 +67,7 @@ function Slider({sliderValue, gestureCallbacks}: SliderProps) {
                             shiftVertical={-2}
                         >
                             {/* pointerEventsNone is a workaround to make sure the pan gesture works correctly on mobile safari */}
-                            <View style={[styles.sliderKnobTooltipView, styles.pointerEventsNone]} />
+                            <View style={[styles.sliderKnobTooltipView, Browser.isMobileSafari() && styles.pointerEventsNone]} />
                         </Tooltip>
                     )}
                 </Animated.View>
diff --git a/src/components/AvatarWithDisplayName.tsx b/src/components/AvatarWithDisplayName.tsx
index 8942bf97a7dd..2ccdd47c3205 100644
--- a/src/components/AvatarWithDisplayName.tsx
+++ b/src/components/AvatarWithDisplayName.tsx
@@ -1,7 +1,7 @@
 import React, {useCallback, useEffect, useRef} from 'react';
 import {View} from 'react-native';
-import type {OnyxCollection, OnyxEntry} from 'react-native-onyx';
-import {withOnyx} from 'react-native-onyx';
+import type {OnyxEntry} from 'react-native-onyx';
+import {useOnyx, withOnyx} from 'react-native-onyx';
 import type {ValueOf} from 'type-fest';
 import useStyleUtils from '@hooks/useStyleUtils';
 import useTheme from '@hooks/useTheme';
@@ -12,7 +12,8 @@ import * as ReportUtils from '@libs/ReportUtils';
 import CONST from '@src/CONST';
 import ONYXKEYS from '@src/ONYXKEYS';
 import ROUTES from '@src/ROUTES';
-import type {PersonalDetails, Policy, Report, ReportActions} from '@src/types/onyx';
+import type {PersonalDetails, PersonalDetailsList, Policy, Report, ReportActions} from '@src/types/onyx';
+import CaretWrapper from './CaretWrapper';
 import DisplayNames from './DisplayNames';
 import MultipleAvatars from './MultipleAvatars';
 import ParentNavigationSubtitle from './ParentNavigationSubtitle';
@@ -25,7 +26,7 @@ type AvatarWithDisplayNamePropsWithOnyx = {
     parentReportActions: OnyxEntry<ReportActions>;
 
     /** Personal details of all users */
-    personalDetails: OnyxCollection<PersonalDetails>;
+    personalDetails: OnyxEntry<PersonalDetailsList>;
 };
 
 type AvatarWithDisplayNameProps = AvatarWithDisplayNamePropsWithOnyx & {
@@ -57,12 +58,16 @@ function AvatarWithDisplayName({
     const theme = useTheme();
     const styles = useThemeStyles();
     const StyleUtils = useStyleUtils();
-    const title = ReportUtils.getReportName(report);
+    const [parentReport] = useOnyx(`${ONYXKEYS.COLLECTION.REPORT}${report?.parentReportID}`);
+    const [invoiceReceiverPolicy] = useOnyx(
+        `${ONYXKEYS.COLLECTION.POLICY}${parentReport?.invoiceReceiver && 'policyID' in parentReport.invoiceReceiver ? parentReport.invoiceReceiver.policyID : -1}`,
+    );
+    const title = ReportUtils.getReportName(report, undefined, undefined, undefined, invoiceReceiverPolicy);
     const subtitle = ReportUtils.getChatRoomSubtitle(report);
     const parentNavigationSubtitleData = ReportUtils.getParentNavigationSubtitle(report);
     const isMoneyRequestOrReport =
         ReportUtils.isMoneyRequestReport(report) || ReportUtils.isMoneyRequest(report) || ReportUtils.isTrackExpenseReport(report) || ReportUtils.isInvoiceReport(report);
-    const icons = ReportUtils.getIcons(report, personalDetails, null, '', -1, policy);
+    const icons = ReportUtils.getIcons(report, personalDetails, null, '', -1, policy, invoiceReceiverPolicy);
     const ownerPersonalDetails = OptionsListUtils.getPersonalDetailsForAccountIDs(report?.ownerAccountID ? [report.ownerAccountID] : [], personalDetails);
     const displayNamesWithTooltips = ReportUtils.getDisplayNamesWithTooltips(Object.values(ownerPersonalDetails) as PersonalDetails[], false);
     const shouldShowSubscriptAvatar = ReportUtils.shouldReportShowSubscript(report);
@@ -70,7 +75,7 @@ function AvatarWithDisplayName({
 
     const actorAccountID = useRef<number | null>(null);
     useEffect(() => {
-        const parentReportAction = parentReportActions?.[report?.parentReportActionID ?? ''];
+        const parentReportAction = parentReportActions?.[report?.parentReportActionID ?? '-1'];
         actorAccountID.current = parentReportAction?.actorAccountID ?? -1;
     }, [parentReportActions, report]);
 
@@ -129,14 +134,16 @@ function AvatarWithDisplayName({
                         )}
                     </PressableWithoutFeedback>
                     <View style={[styles.flex1, styles.flexColumn]}>
-                        <DisplayNames
-                            fullTitle={title}
-                            displayNamesWithTooltips={displayNamesWithTooltips}
-                            tooltipEnabled
-                            numberOfLines={1}
-                            textStyles={[isAnonymous ? styles.headerAnonymousFooter : styles.headerText, styles.pre]}
-                            shouldUseFullTitle={isMoneyRequestOrReport || isAnonymous}
-                        />
+                        <CaretWrapper>
+                            <DisplayNames
+                                fullTitle={title}
+                                displayNamesWithTooltips={displayNamesWithTooltips}
+                                tooltipEnabled
+                                numberOfLines={1}
+                                textStyles={[isAnonymous ? styles.headerAnonymousFooter : styles.headerText, styles.pre]}
+                                shouldUseFullTitle={isMoneyRequestOrReport || isAnonymous}
+                            />
+                        </CaretWrapper>
                         {Object.keys(parentNavigationSubtitleData).length > 0 && (
                             <ParentNavigationSubtitle
                                 parentNavigationSubtitleData={parentNavigationSubtitleData}
@@ -179,7 +186,7 @@ AvatarWithDisplayName.displayName = 'AvatarWithDisplayName';
 
 export default withOnyx<AvatarWithDisplayNameProps, AvatarWithDisplayNamePropsWithOnyx>({
     parentReportActions: {
-        key: ({report}) => `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${report ? report.parentReportID : '0'}`,
+        key: ({report}) => `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${report ? report.parentReportID : '-1'}`,
         canEvict: false,
     },
     personalDetails: {
diff --git a/src/components/AvatarWithImagePicker.tsx b/src/components/AvatarWithImagePicker.tsx
index 5fa17e726c6f..337bbaf98ca1 100644
--- a/src/components/AvatarWithImagePicker.tsx
+++ b/src/components/AvatarWithImagePicker.tsx
@@ -1,4 +1,4 @@
-import React, {useEffect, useRef, useState} from 'react';
+import React, {useCallback, useEffect, useRef, useState} from 'react';
 import {StyleSheet, View} from 'react-native';
 import type {ImageStyle, StyleProp, ViewStyle} from 'react-native';
 import useLocalize from '@hooks/useLocalize';
@@ -11,6 +11,7 @@ import * as FileUtils from '@libs/fileDownload/FileUtils';
 import getImageResolution from '@libs/fileDownload/getImageResolution';
 import type {AvatarSource} from '@libs/UserUtils';
 import variables from '@styles/variables';
+import * as Modal from '@userActions/Modal';
 import CONST from '@src/CONST';
 import type {TranslationPaths} from '@src/languages/types';
 import type * as OnyxCommon from '@src/types/onyx/OnyxCommon';
@@ -49,6 +50,9 @@ type AvatarWithImagePickerProps = {
     /** Avatar source to display */
     source?: AvatarSource;
 
+    /** Account id of user for which avatar is displayed  */
+    avatarID?: number | string;
+
     /** Additional style props */
     style?: StyleProp<ViewStyle>;
 
@@ -123,6 +127,9 @@ type AvatarWithImagePickerProps = {
 
     /** Optionally override the default "Edit" icon */
     editIcon?: IconAsset;
+
+    /** Determines if a style utility function should be used for calculating the PopoverMenu anchor position. */
+    shouldUseStyleUtilityForAnchorPosition?: boolean;
 };
 
 function AvatarWithImagePicker({
@@ -136,6 +143,7 @@ function AvatarWithImagePicker({
     errorRowStyles,
     onErrorClose = () => {},
     source = '',
+    avatarID,
     fallbackIcon = Expensicons.FallbackAvatar,
     size = CONST.AVATAR_SIZE.DEFAULT,
     type = CONST.ICON_TYPE_AVATAR,
@@ -152,6 +160,7 @@ function AvatarWithImagePicker({
     enablePreview = false,
     shouldDisableViewPhoto = false,
     editIcon = Expensicons.Pencil,
+    shouldUseStyleUtilityForAnchorPosition = false,
 }: AvatarWithImagePickerProps) {
     const theme = useTheme();
     const styles = useThemeStyles();
@@ -187,15 +196,15 @@ function AvatarWithImagePicker({
     /**
      * Check if the attachment extension is allowed.
      */
-    const isValidExtension = (image: FileObject): boolean => {
+    const isValidExtension = useCallback((image: FileObject): boolean => {
         const {fileExtension} = FileUtils.splitExtensionFromFileName(image?.name ?? '');
         return CONST.AVATAR_ALLOWED_EXTENSIONS.some((extension) => extension === fileExtension.toLowerCase());
-    };
+    }, []);
 
     /**
      * Check if the attachment size is less than allowed size.
      */
-    const isValidSize = (image: FileObject): boolean => (image?.size ?? 0) < CONST.AVATAR_MAX_ATTACHMENT_SIZE;
+    const isValidSize = useCallback((image: FileObject): boolean => (image?.size ?? 0) < CONST.AVATAR_MAX_ATTACHMENT_SIZE, []);
 
     /**
      * Check if the attachment resolution matches constraints.
@@ -208,37 +217,40 @@ function AvatarWithImagePicker({
     /**
      * Validates if an image has a valid resolution and opens an avatar crop modal
      */
-    const showAvatarCropModal = (image: FileObject) => {
-        if (!isValidExtension(image)) {
-            setError('avatarWithImagePicker.notAllowedExtension', {allowedExtensions: CONST.AVATAR_ALLOWED_EXTENSIONS});
-            return;
-        }
-        if (!isValidSize(image)) {
-            setError('avatarWithImagePicker.sizeExceeded', {maxUploadSizeInMB: CONST.AVATAR_MAX_ATTACHMENT_SIZE / (1024 * 1024)});
-            return;
-        }
-
-        isValidResolution(image).then((isValid) => {
-            if (!isValid) {
-                setError('avatarWithImagePicker.resolutionConstraints', {
-                    minHeightInPx: CONST.AVATAR_MIN_HEIGHT_PX,
-                    minWidthInPx: CONST.AVATAR_MIN_WIDTH_PX,
-                    maxHeightInPx: CONST.AVATAR_MAX_HEIGHT_PX,
-                    maxWidthInPx: CONST.AVATAR_MAX_WIDTH_PX,
-                });
+    const showAvatarCropModal = useCallback(
+        (image: FileObject) => {
+            if (!isValidExtension(image)) {
+                setError('avatarWithImagePicker.notAllowedExtension', {allowedExtensions: CONST.AVATAR_ALLOWED_EXTENSIONS});
+                return;
+            }
+            if (!isValidSize(image)) {
+                setError('avatarWithImagePicker.sizeExceeded', {maxUploadSizeInMB: CONST.AVATAR_MAX_ATTACHMENT_SIZE / (1024 * 1024)});
                 return;
             }
 
-            setIsAvatarCropModalOpen(true);
-            setError(null, {});
-            setIsMenuVisible(false);
-            setImageData({
-                uri: image.uri ?? '',
-                name: image.name ?? '',
-                type: image.type ?? '',
+            isValidResolution(image).then((isValid) => {
+                if (!isValid) {
+                    setError('avatarWithImagePicker.resolutionConstraints', {
+                        minHeightInPx: CONST.AVATAR_MIN_HEIGHT_PX,
+                        minWidthInPx: CONST.AVATAR_MIN_WIDTH_PX,
+                        maxHeightInPx: CONST.AVATAR_MAX_HEIGHT_PX,
+                        maxWidthInPx: CONST.AVATAR_MAX_WIDTH_PX,
+                    });
+                    return;
+                }
+
+                setIsAvatarCropModalOpen(true);
+                setError(null, {});
+                setIsMenuVisible(false);
+                setImageData({
+                    uri: image.uri ?? '',
+                    name: image.name ?? '',
+                    type: image.type ?? '',
+                });
             });
-        });
-    };
+        },
+        [isValidExtension, isValidSize],
+    );
 
     const hideAvatarCropModal = () => {
         setIsAvatarCropModalOpen(false);
@@ -252,14 +264,15 @@ function AvatarWithImagePicker({
             {
                 icon: Expensicons.Upload,
                 text: translate('avatarWithImagePicker.uploadPhoto'),
-                onSelected: () => {
-                    if (Browser.isSafari()) {
-                        return;
-                    }
-                    openPicker({
-                        onPicked: showAvatarCropModal,
-                    });
-                },
+                onSelected: () =>
+                    Modal.close(() => {
+                        if (Browser.isSafari()) {
+                            return;
+                        }
+                        openPicker({
+                            onPicked: showAvatarCropModal,
+                        });
+                    }),
             },
         ];
 
@@ -294,62 +307,26 @@ function AvatarWithImagePicker({
         });
     }, [isMenuVisible, windowWidth]);
 
+    const onPressAvatar = useCallback(
+        (openPicker: OpenPicker) => {
+            if (disabled && enablePreview && onViewPhotoPress) {
+                onViewPhotoPress();
+                return;
+            }
+            if (isUsingDefaultAvatar) {
+                openPicker({
+                    onPicked: showAvatarCropModal,
+                });
+                return;
+            }
+            setIsMenuVisible((prev) => !prev);
+        },
+        [disabled, enablePreview, isUsingDefaultAvatar, onViewPhotoPress, showAvatarCropModal],
+    );
+
     return (
-        <View style={StyleSheet.flatten([styles.alignItemsCenter, style])}>
+        <View style={style}>
             <View style={styles.w100}>
-                <OfflineWithFeedback
-                    pendingAction={pendingAction}
-                    errors={errors}
-                    errorRowStyles={errorRowStyles}
-                    style={type === CONST.ICON_TYPE_AVATAR && styles.alignItemsCenter}
-                    onClose={onErrorClose}
-                >
-                    <Tooltip
-                        shouldRender={!disabled}
-                        text={translate('avatarWithImagePicker.editImage')}
-                    >
-                        <PressableWithoutFeedback
-                            onPress={() => {
-                                if (disabled && enablePreview && onViewPhotoPress) {
-                                    onViewPhotoPress();
-                                    return;
-                                }
-                                setIsMenuVisible((prev) => !prev);
-                            }}
-                            accessibilityRole={CONST.ACCESSIBILITY_ROLE.IMAGEBUTTON}
-                            accessibilityLabel={translate('avatarWithImagePicker.editImage')}
-                            disabled={isAvatarCropModalOpen || (disabled && !enablePreview)}
-                            disabledStyle={disabledStyle}
-                            style={[styles.pRelative, avatarStyle]}
-                            ref={anchorRef}
-                        >
-                            <View>
-                                {source ? (
-                                    <Avatar
-                                        containerStyles={avatarStyle}
-                                        imageStyles={[avatarStyle, styles.alignSelfCenter]}
-                                        source={source}
-                                        fallbackIcon={fallbackIcon}
-                                        size={size}
-                                        type={type}
-                                    />
-                                ) : (
-                                    <DefaultAvatar />
-                                )}
-                            </View>
-                            {!disabled && (
-                                <View style={StyleSheet.flatten([styles.smallEditIcon, styles.smallAvatarEditIcon, editIconStyle])}>
-                                    <Icon
-                                        src={editIcon}
-                                        width={variables.iconSizeSmall}
-                                        height={variables.iconSizeSmall}
-                                        fill={theme.icon}
-                                    />
-                                </View>
-                            )}
-                        </PressableWithoutFeedback>
-                    </Tooltip>
-                </OfflineWithFeedback>
                 <AttachmentModal
                     headerTitle={headerTitle}
                     source={previewSource}
@@ -367,37 +344,86 @@ function AvatarWithImagePicker({
                                     menuItems.push({
                                         icon: Expensicons.Eye,
                                         text: translate('avatarWithImagePicker.viewPhoto'),
-                                        onSelected: () => {
-                                            if (typeof onViewPhotoPress !== 'function') {
-                                                show();
-                                                return;
-                                            }
-                                            onViewPhotoPress();
-                                        },
+                                        onSelected: () =>
+                                            Modal.close(() => {
+                                                if (typeof onViewPhotoPress !== 'function') {
+                                                    show();
+                                                    return;
+                                                }
+                                                onViewPhotoPress();
+                                            }),
                                     });
                                 }
 
                                 return (
-                                    <PopoverMenu
-                                        isVisible={isMenuVisible}
-                                        onClose={() => setIsMenuVisible(false)}
-                                        onItemSelected={(item, index) => {
-                                            setIsMenuVisible(false);
-                                            // In order for the file picker to open dynamically, the click
-                                            // function must be called from within an event handler that was initiated
-                                            // by the user on Safari.
-                                            if (index === 0 && Browser.isSafari()) {
-                                                openPicker({
-                                                    onPicked: showAvatarCropModal,
-                                                });
-                                            }
-                                        }}
-                                        menuItems={menuItems}
-                                        anchorPosition={popoverPosition}
-                                        anchorAlignment={{horizontal: CONST.MODAL.ANCHOR_ORIGIN_HORIZONTAL.LEFT, vertical: CONST.MODAL.ANCHOR_ORIGIN_VERTICAL.TOP}}
-                                        withoutOverlay
-                                        anchorRef={anchorRef}
-                                    />
+                                    <>
+                                        <OfflineWithFeedback
+                                            errors={errors}
+                                            errorRowStyles={errorRowStyles}
+                                            onClose={onErrorClose}
+                                        >
+                                            <Tooltip
+                                                shouldRender={!disabled}
+                                                text={translate('avatarWithImagePicker.editImage')}
+                                            >
+                                                <PressableWithoutFeedback
+                                                    onPress={() => onPressAvatar(openPicker)}
+                                                    accessibilityRole={CONST.ROLE.BUTTON}
+                                                    accessibilityLabel={translate('avatarWithImagePicker.editImage')}
+                                                    disabled={isAvatarCropModalOpen || (disabled && !enablePreview)}
+                                                    disabledStyle={disabledStyle}
+                                                    style={[styles.pRelative, avatarStyle, type === CONST.ICON_TYPE_AVATAR && styles.alignSelfCenter]}
+                                                    ref={anchorRef}
+                                                >
+                                                    <OfflineWithFeedback pendingAction={pendingAction}>
+                                                        {source ? (
+                                                            <Avatar
+                                                                containerStyles={avatarStyle}
+                                                                imageStyles={[avatarStyle, styles.alignSelfCenter]}
+                                                                source={source}
+                                                                avatarID={avatarID}
+                                                                fallbackIcon={fallbackIcon}
+                                                                size={size}
+                                                                type={type}
+                                                            />
+                                                        ) : (
+                                                            <DefaultAvatar />
+                                                        )}
+                                                    </OfflineWithFeedback>
+                                                    {!disabled && (
+                                                        <View style={StyleSheet.flatten([styles.smallEditIcon, styles.smallAvatarEditIcon, editIconStyle])}>
+                                                            <Icon
+                                                                src={editIcon}
+                                                                width={variables.iconSizeSmall}
+                                                                height={variables.iconSizeSmall}
+                                                                fill={theme.icon}
+                                                            />
+                                                        </View>
+                                                    )}
+                                                </PressableWithoutFeedback>
+                                            </Tooltip>
+                                        </OfflineWithFeedback>
+                                        <PopoverMenu
+                                            isVisible={isMenuVisible}
+                                            onClose={() => setIsMenuVisible(false)}
+                                            onItemSelected={(item, index) => {
+                                                setIsMenuVisible(false);
+                                                // In order for the file picker to open dynamically, the click
+                                                // function must be called from within an event handler that was initiated
+                                                // by the user on Safari.
+                                                if (index === 0 && Browser.isSafari()) {
+                                                    openPicker({
+                                                        onPicked: showAvatarCropModal,
+                                                    });
+                                                }
+                                            }}
+                                            menuItems={menuItems}
+                                            anchorPosition={shouldUseStyleUtilityForAnchorPosition ? styles.popoverMenuOffset(windowWidth) : popoverPosition}
+                                            anchorAlignment={{horizontal: CONST.MODAL.ANCHOR_ORIGIN_HORIZONTAL.LEFT, vertical: CONST.MODAL.ANCHOR_ORIGIN_VERTICAL.TOP}}
+                                            withoutOverlay
+                                            anchorRef={anchorRef}
+                                        />
+                                    </>
                                 );
                             }}
                         </AttachmentPicker>
diff --git a/src/components/AvatarWithIndicator.tsx b/src/components/AvatarWithIndicator.tsx
index 42b91b3d2d71..bf8fe93b8b21 100644
--- a/src/components/AvatarWithIndicator.tsx
+++ b/src/components/AvatarWithIndicator.tsx
@@ -11,7 +11,10 @@ import Tooltip from './Tooltip';
 
 type AvatarWithIndicatorProps = {
     /** URL for the avatar */
-    source: UserUtils.AvatarSource;
+    source?: UserUtils.AvatarSource;
+
+    /** Account id if it's user avatar */
+    accountID?: number;
 
     /** To show a tooltip on hover */
     tooltipText?: string;
@@ -23,7 +26,7 @@ type AvatarWithIndicatorProps = {
     isLoading?: boolean;
 };
 
-function AvatarWithIndicator({source, tooltipText = '', fallbackIcon = Expensicons.FallbackAvatar, isLoading = true}: AvatarWithIndicatorProps) {
+function AvatarWithIndicator({source, accountID, tooltipText = '', fallbackIcon = Expensicons.FallbackAvatar, isLoading = true}: AvatarWithIndicatorProps) {
     const styles = useThemeStyles();
 
     return (
@@ -35,8 +38,10 @@ function AvatarWithIndicator({source, tooltipText = '', fallbackIcon = Expensico
                     <>
                         <Avatar
                             size={CONST.AVATAR_SIZE.SMALL}
-                            source={UserUtils.getSmallSizeAvatar(source)}
+                            source={UserUtils.getSmallSizeAvatar(source, accountID)}
                             fallbackIcon={fallbackIcon}
+                            avatarID={accountID}
+                            type={CONST.ICON_TYPE_AVATAR}
                         />
                         <Indicator />
                     </>
diff --git a/src/components/Banner.tsx b/src/components/Banner.tsx
index 72dc53cceb39..404a92093119 100644
--- a/src/components/Banner.tsx
+++ b/src/components/Banner.tsx
@@ -82,7 +82,7 @@ function Banner({
                             containerStyles,
                         ]}
                     >
-                        <View style={[styles.flexRow, styles.flexGrow1, styles.mw100, styles.alignItemsCenter]}>
+                        <View style={[styles.flexRow, styles.flex1, styles.mw100, styles.alignItemsCenter]}>
                             {shouldShowIcon && icon && (
                                 <View style={[styles.mr3]}>
                                     <Icon
@@ -93,17 +93,18 @@ function Banner({
                             )}
                             {content && content}
 
-                            {shouldRenderHTML && text ? (
-                                <RenderHTML html={text} />
-                            ) : (
-                                <Text
-                                    style={textStyles}
-                                    onPress={onPress}
-                                    suppressHighlighting
-                                >
-                                    {text}
-                                </Text>
-                            )}
+                            {text &&
+                                (shouldRenderHTML ? (
+                                    <RenderHTML html={text} />
+                                ) : (
+                                    <Text
+                                        style={[styles.flex1, styles.flexWrap, textStyles]}
+                                        onPress={onPress}
+                                        suppressHighlighting
+                                    >
+                                        {text}
+                                    </Text>
+                                ))}
                         </View>
                         {shouldShowCloseButton && !!onClose && (
                             <Tooltip text={translate('common.close')}>
diff --git a/src/components/BigNumberPad.tsx b/src/components/BigNumberPad.tsx
index 4704ca6c6eec..57cde72a016c 100644
--- a/src/components/BigNumberPad.tsx
+++ b/src/components/BigNumberPad.tsx
@@ -1,8 +1,8 @@
 import React, {useEffect, useRef, useState} from 'react';
 import {View} from 'react-native';
 import useLocalize from '@hooks/useLocalize';
+import useResponsiveLayout from '@hooks/useResponsiveLayout';
 import useThemeStyles from '@hooks/useThemeStyles';
-import useWindowDimensions from '@hooks/useWindowDimensions';
 import ControlSelection from '@libs/ControlSelection';
 import Button from './Button';
 
@@ -32,7 +32,7 @@ function BigNumberPad({numberPressed, longPressHandlerStateChanged = () => {}, i
 
     const styles = useThemeStyles();
     const [timer, setTimer] = useState<NodeJS.Timeout | null>(null);
-    const {isExtraSmallScreenHeight} = useWindowDimensions();
+    const {isExtraSmallScreenHeight} = useResponsiveLayout();
     const numberPressedRef = useRef(numberPressed);
 
     useEffect(() => {
diff --git a/src/components/BlockedReportFooter.tsx b/src/components/BlockedReportFooter.tsx
new file mode 100644
index 000000000000..f8251c99b33d
--- /dev/null
+++ b/src/components/BlockedReportFooter.tsx
@@ -0,0 +1,24 @@
+import React from 'react';
+import useLocalize from '@hooks/useLocalize';
+import useThemeStyles from '@hooks/useThemeStyles';
+import Banner from './Banner';
+
+function BlockedReportFooter() {
+    const styles = useThemeStyles();
+    const {translate} = useLocalize();
+
+    const text = translate('youHaveBeenBanned');
+
+    return (
+        <Banner
+            containerStyles={[styles.chatFooterBanner]}
+            text={text}
+            shouldShowIcon
+            shouldRenderHTML
+        />
+    );
+}
+
+BlockedReportFooter.displayName = 'ArchivedReportFooter';
+
+export default BlockedReportFooter;
diff --git a/src/components/BlockingViews/BlockingView.tsx b/src/components/BlockingViews/BlockingView.tsx
index 363342778fc0..f4e1b992437f 100644
--- a/src/components/BlockingViews/BlockingView.tsx
+++ b/src/components/BlockingViews/BlockingView.tsx
@@ -1,7 +1,9 @@
+import type {ImageContentFit} from 'expo-image';
 import React, {useMemo} from 'react';
-import type {ImageSourcePropType, StyleProp, ViewStyle, WebStyle} from 'react-native';
+import type {ImageSourcePropType, StyleProp, TextStyle, ViewStyle} from 'react-native';
 import {View} from 'react-native';
 import type {SvgProps} from 'react-native-svg';
+import type {WebStyle} from 'react-native-web';
 import type {MergeExclusive} from 'type-fest';
 import AutoEmailLink from '@components/AutoEmailLink';
 import Icon from '@components/Icon';
@@ -22,6 +24,9 @@ type BaseBlockingViewProps = {
     /** Subtitle message below the title */
     subtitle?: string;
 
+    /** The style of the subtitle message */
+    subtitleStyle?: StyleProp<TextStyle>;
+
     /** Link message below the subtitle */
     linkKey?: TranslationPaths;
 
@@ -36,6 +41,12 @@ type BaseBlockingViewProps = {
 
     /** Render custom subtitle */
     CustomSubtitle?: React.ReactElement;
+
+    /** Determines how the image should be resized to fit its container */
+    contentFitImage?: ImageContentFit;
+
+    /** Additional styles to apply to the container */
+    containerStyle?: StyleProp<ViewStyle>;
 };
 
 type BlockingViewIconProps = {
@@ -72,6 +83,7 @@ function BlockingView({
     iconColor,
     title,
     subtitle = '',
+    subtitleStyle,
     linkKey = 'notFound.goBackHome',
     shouldShowLink = false,
     iconWidth = variables.iconSizeSuperLarge,
@@ -81,6 +93,8 @@ function BlockingView({
     animationStyles = [],
     animationWebStyle = {},
     CustomSubtitle,
+    contentFitImage,
+    containerStyle,
 }: BlockingViewProps) {
     const styles = useThemeStyles();
     const {translate} = useLocalize();
@@ -88,10 +102,12 @@ function BlockingView({
     const subtitleText = useMemo(
         () => (
             <>
-                <AutoEmailLink
-                    style={[styles.textAlignCenter]}
-                    text={subtitle}
-                />
+                {subtitle && (
+                    <AutoEmailLink
+                        style={[styles.textAlignCenter, subtitleStyle]}
+                        text={subtitle}
+                    />
+                )}
                 {shouldShowLink ? (
                     <TextLink
                         onPress={onLinkPress}
@@ -102,7 +118,7 @@ function BlockingView({
                 ) : null}
             </>
         ),
-        [styles, subtitle, shouldShowLink, linkKey, onLinkPress, translate],
+        [styles, subtitle, shouldShowLink, linkKey, onLinkPress, translate, subtitleStyle],
     );
 
     const subtitleContent = useMemo(() => {
@@ -117,7 +133,7 @@ function BlockingView({
     }, [styles, subtitleText, shouldEmbedLinkWithSubtitle, CustomSubtitle]);
 
     return (
-        <View style={[styles.flex1, styles.alignItemsCenter, styles.justifyContentCenter, styles.ph10]}>
+        <View style={[styles.flex1, styles.alignItemsCenter, styles.justifyContentCenter, styles.ph10, containerStyle]}>
             {animation && (
                 <Lottie
                     source={animation}
@@ -133,6 +149,7 @@ function BlockingView({
                     fill={iconColor}
                     width={iconWidth}
                     height={iconHeight}
+                    contentFit={contentFitImage}
                 />
             )}
             <View>
diff --git a/src/components/BlockingViews/FullPageNotFoundView.tsx b/src/components/BlockingViews/FullPageNotFoundView.tsx
index e1cd5c94d4c9..029b79b432cf 100644
--- a/src/components/BlockingViews/FullPageNotFoundView.tsx
+++ b/src/components/BlockingViews/FullPageNotFoundView.tsx
@@ -20,8 +20,8 @@ type FullPageNotFoundViewProps = {
     /** The key in the translations file to use for the title */
     titleKey?: TranslationPaths;
 
-    /** The key in the translations file to use for the subtitle */
-    subtitleKey?: TranslationPaths;
+    /** The key in the translations file to use for the subtitle. Pass an empty key to not show the subtitle. */
+    subtitleKey?: TranslationPaths | '';
 
     /** Whether we should show a link to navigate elsewhere */
     shouldShowLink?: boolean;
@@ -71,7 +71,7 @@ function FullPageNotFoundView({
                         iconWidth={variables.modalTopIconWidth}
                         iconHeight={variables.modalTopIconHeight}
                         title={translate(titleKey)}
-                        subtitle={translate(subtitleKey)}
+                        subtitle={subtitleKey && translate(subtitleKey)}
                         linkKey={linkKey}
                         shouldShowLink={shouldShowLink}
                         onLinkPress={onLinkPress}
diff --git a/src/components/Breadcrumbs.tsx b/src/components/Breadcrumbs.tsx
index e5eb09691eba..4cbf85cb0014 100644
--- a/src/components/Breadcrumbs.tsx
+++ b/src/components/Breadcrumbs.tsx
@@ -36,10 +36,11 @@ function Breadcrumbs({breadcrumbs, style}: BreadcrumbsProps) {
     const theme = useTheme();
     const styles = useThemeStyles();
     const [primaryBreadcrumb, secondaryBreadcrumb] = breadcrumbs;
+    const isRootBreadcrumb = primaryBreadcrumb.type === CONST.BREADCRUMB_TYPE.ROOT;
     const fontScale = PixelRatio.getFontScale() > CONST.LOGO_MAX_SCALE ? CONST.LOGO_MAX_SCALE : PixelRatio.getFontScale();
     return (
         <View style={[styles.flexRow, styles.alignItemsCenter, styles.gap1, styles.w100, styles.breadcrumsContainer, style]}>
-            {primaryBreadcrumb.type === CONST.BREADCRUMB_TYPE.ROOT ? (
+            {isRootBreadcrumb ? (
                 <View style={styles.breadcrumbLogo}>
                     <Header
                         title={
@@ -68,7 +69,7 @@ function Breadcrumbs({breadcrumbs, style}: BreadcrumbsProps) {
                     <Text style={[styles.breadcrumbSeparator]}>/</Text>
                     <Text
                         numberOfLines={1}
-                        style={[styles.mw75, styles.flexShrink0, styles.breadcrumb]}
+                        style={[styles.mw75, styles.breadcrumb, isRootBreadcrumb ? styles.flex1 : styles.flexShrink0]}
                     >
                         {secondaryBreadcrumb.text}
                     </Text>
diff --git a/src/components/Button/index.tsx b/src/components/Button/index.tsx
index b6e20164348b..c6d93f93ee23 100644
--- a/src/components/Button/index.tsx
+++ b/src/components/Button/index.tsx
@@ -1,6 +1,6 @@
 import {useIsFocused} from '@react-navigation/native';
 import type {ForwardedRef} from 'react';
-import React, {useCallback, useMemo} from 'react';
+import React, {useCallback, useMemo, useState} from 'react';
 import type {GestureResponderEvent, StyleProp, TextStyle, ViewStyle} from 'react-native';
 import {ActivityIndicator, View} from 'react-native';
 import Icon from '@components/Icon';
@@ -29,6 +29,9 @@ type ButtonProps = Partial<ChildrenProps> & {
     /** The fill color to pass into the icon. */
     iconFill?: string;
 
+    /** The fill color to pass into the icon when the button is hovered. */
+    iconHoverFill?: string;
+
     /** Any additional styles to pass to the left icon container. */
     iconStyles?: StyleProp<ViewStyle>;
 
@@ -80,15 +83,24 @@ type ButtonProps = Partial<ChildrenProps> & {
     /** Additional text styles */
     textStyles?: StyleProp<TextStyle>;
 
+    /** Additional text styles when the button is hovered */
+    textHoverStyles?: StyleProp<TextStyle>;
+
     /** Whether we should use the default hover style */
     shouldUseDefaultHover?: boolean;
 
+    /** Additional hover styles */
+    hoverStyles?: StyleProp<ViewStyle>;
+
     /** Whether we should use the success theme color */
     success?: boolean;
 
     /** Whether we should use the danger theme color */
     danger?: boolean;
 
+    /** Whether we should display the button as a link */
+    link?: boolean;
+
     /** Should we remove the right border radius top + bottom? */
     shouldRemoveRightBorderRadius?: boolean;
 
@@ -118,17 +130,20 @@ type ButtonProps = Partial<ChildrenProps> & {
 
     /** Whether the button should use split style or not */
     isSplitButton?: boolean;
+
+    /** Whether button's content should be centered */
+    isContentCentered?: boolean;
 };
 
 type KeyboardShortcutComponentProps = Pick<ButtonProps, 'isDisabled' | 'isLoading' | 'onPress' | 'pressOnEnter' | 'allowBubble' | 'enterKeyEventListenerPriority'>;
 
-const accessibilityRoles: string[] = Object.values(CONST.ACCESSIBILITY_ROLE);
+const accessibilityRoles: string[] = Object.values(CONST.ROLE);
 
 function KeyboardShortcutComponent({isDisabled = false, isLoading = false, onPress = () => {}, pressOnEnter, allowBubble, enterKeyEventListenerPriority}: KeyboardShortcutComponentProps) {
     const isFocused = useIsFocused();
     const activeElementRole = useActiveElementRole();
 
-    const shouldDisableEnterShortcut = useMemo(() => accessibilityRoles.includes(activeElementRole ?? '') && activeElementRole !== CONST.ACCESSIBILITY_ROLE.TEXT, [activeElementRole]);
+    const shouldDisableEnterShortcut = useMemo(() => accessibilityRoles.includes(activeElementRole ?? '') && activeElementRole !== CONST.ROLE.PRESENTATION, [activeElementRole]);
 
     const keyboardShortcutCallback = useCallback(
         (event?: GestureResponderEvent | KeyboardEvent) => {
@@ -147,7 +162,7 @@ function KeyboardShortcutComponent({isDisabled = false, isLoading = false, onPre
             priority: enterKeyEventListenerPriority,
             shouldPreventDefault: false,
         }),
-        // eslint-disable-next-line react-hooks/exhaustive-deps
+        // eslint-disable-next-line react-compiler/react-compiler, react-hooks/exhaustive-deps
         [shouldDisableEnterShortcut, isFocused],
     );
 
@@ -164,6 +179,7 @@ function Button(
 
         iconRight = Expensicons.ArrowRight,
         iconFill,
+        iconHoverFill,
         icon = null,
         iconStyles = [],
         iconRightStyles = [],
@@ -188,8 +204,10 @@ function Button(
         style = [],
         innerStyles = [],
         textStyles = [],
+        textHoverStyles = [],
 
         shouldUseDefaultHover = true,
+        hoverStyles = undefined,
         success = false,
         danger = false,
 
@@ -202,13 +220,16 @@ function Button(
         id = '',
         accessibilityLabel = '',
         isSplitButton = false,
+        link = false,
+        isContentCentered = false,
         ...rest
     }: ButtonProps,
-    ref: ForwardedRef<View | HTMLDivElement>,
+    ref: ForwardedRef<View>,
 ) {
     const theme = useTheme();
     const styles = useThemeStyles();
     const StyleUtils = useStyleUtils();
+    const [isHovered, setIsHovered] = useState(false);
 
     const renderContent = () => {
         if ('children' in rest) {
@@ -227,8 +248,13 @@ function Button(
                     large && styles.buttonLargeText,
                     success && styles.buttonSuccessText,
                     danger && styles.buttonDangerText,
-                    Boolean(icon) && styles.textAlignLeft,
+                    !!icon && styles.textAlignLeft,
                     textStyles,
+                    isHovered && textHoverStyles,
+                    link && styles.link,
+                    link && isHovered && StyleUtils.getColorStyle(theme.linkHover),
+                    link && styles.fontWeightNormal,
+                    link && styles.fontSizeLabel,
                 ]}
                 dataSet={{[CONST.SELECTION_SCRAPER_HIDDEN_ELEMENT]: true}}
             >
@@ -236,38 +262,40 @@ function Button(
             </Text>
         );
 
+        const defaultFill = success || danger ? theme.textLight : theme.icon;
+
         // eslint-disable-next-line @typescript-eslint/prefer-nullish-coalescing
         if (icon || shouldShowRightIcon) {
             return (
-                <View style={[styles.justifyContentBetween, styles.flexRow]}>
+                <View style={[isContentCentered ? styles.justifyContentCenter : styles.justifyContentBetween, styles.flexRow]}>
                     <View style={[styles.alignItemsCenter, styles.flexRow, styles.flexShrink1]}>
                         {icon && (
                             <View style={[large ? styles.mr2 : styles.mr1, !text && styles.mr0, iconStyles]}>
                                 <Icon
                                     src={icon}
                                     hasText={!!text}
-                                    fill={iconFill ?? (success || danger ? theme.textLight : theme.icon)}
+                                    fill={isHovered ? iconHoverFill ?? defaultFill : iconFill ?? defaultFill}
                                     small={small}
                                     medium={medium}
                                     large={large}
                                 />
                             </View>
                         )}
-                        {textComponent}
+                        {!!text && textComponent}
                     </View>
                     {shouldShowRightIcon && (
                         <View style={[styles.justifyContentCenter, large ? styles.ml2 : styles.ml1, iconRightStyles]}>
                             {!isSplitButton ? (
                                 <Icon
                                     src={iconRight}
-                                    fill={iconFill ?? (success || danger ? theme.textLight : theme.icon)}
+                                    fill={isHovered ? iconHoverFill ?? defaultFill : iconFill ?? defaultFill}
                                     small={medium}
                                     medium={large}
                                 />
                             ) : (
                                 <Icon
                                     src={iconRight}
-                                    fill={iconFill ?? (success || danger ? theme.textLight : theme.icon)}
+                                    fill={isHovered ? iconHoverFill ?? defaultFill : iconFill ?? defaultFill}
                                     small={small}
                                     medium={medium}
                                     large={large}
@@ -302,10 +330,6 @@ function Button(
                         currentTarget?.blur();
                     }
 
-                    if (event?.type === 'keyup') {
-                        return;
-                    }
-
                     if (shouldEnableHapticFeedback) {
                         HapticFeedback.press();
                     }
@@ -333,7 +357,7 @@ function Button(
                 ]}
                 style={[
                     styles.button,
-                    StyleUtils.getButtonStyleWithIcon(styles, small, medium, large, Boolean(icon), Boolean(text?.length > 0), shouldShowRightIcon),
+                    StyleUtils.getButtonStyleWithIcon(styles, small, medium, large, !!icon, !!(text?.length > 0), shouldShowRightIcon),
                     success ? styles.buttonSuccess : undefined,
                     danger ? styles.buttonDanger : undefined,
                     isDisabled ? styles.buttonOpacityDisabled : undefined,
@@ -343,16 +367,20 @@ function Button(
                     // eslint-disable-next-line @typescript-eslint/prefer-nullish-coalescing
                     text && shouldShowRightIcon ? styles.alignItemsStretch : undefined,
                     innerStyles,
+                    link && styles.bgTransparent,
                 ]}
                 hoverStyle={[
                     shouldUseDefaultHover && !isDisabled ? styles.buttonDefaultHovered : undefined,
                     success && !isDisabled ? styles.buttonSuccessHovered : undefined,
                     danger && !isDisabled ? styles.buttonDangerHovered : undefined,
+                    hoverStyles,
                 ]}
                 id={id}
                 accessibilityLabel={accessibilityLabel}
                 role={CONST.ROLE.BUTTON}
                 hoverDimmingValue={1}
+                onHoverIn={() => setIsHovered(true)}
+                onHoverOut={() => setIsHovered(false)}
             >
                 {renderContent()}
                 {isLoading && (
diff --git a/src/components/ButtonWithDropdownMenu/index.tsx b/src/components/ButtonWithDropdownMenu/index.tsx
index a28b7ebf0864..943d6dbb5c16 100644
--- a/src/components/ButtonWithDropdownMenu/index.tsx
+++ b/src/components/ButtonWithDropdownMenu/index.tsx
@@ -1,13 +1,17 @@
+import type {MutableRefObject} from 'react';
 import React, {useEffect, useRef, useState} from 'react';
 import {View} from 'react-native';
 import Button from '@components/Button';
 import Icon from '@components/Icon';
 import * as Expensicons from '@components/Icon/Expensicons';
 import PopoverMenu from '@components/PopoverMenu';
+import useKeyboardShortcut from '@hooks/useKeyboardShortcut';
 import useStyleUtils from '@hooks/useStyleUtils';
 import useTheme from '@hooks/useTheme';
 import useThemeStyles from '@hooks/useThemeStyles';
 import useWindowDimensions from '@hooks/useWindowDimensions';
+import mergeRefs from '@libs/mergeRefs';
+import * as Modal from '@userActions/Modal';
 import CONST from '@src/CONST';
 import type {AnchorPosition} from '@src/styles';
 import type {ButtonWithDropdownMenuProps} from './types';
@@ -31,8 +35,11 @@ function ButtonWithDropdownMenu<IValueType>({
     onPress,
     options,
     onOptionSelected,
+    onOptionsMenuShow,
+    onOptionsMenuHide,
     enterKeyEventListenerPriority = 0,
     wrapperStyle,
+    useKeyboardShortcuts = false,
 }: ButtonWithDropdownMenuProps<IValueType>) {
     const theme = useTheme();
     const styles = useThemeStyles();
@@ -41,20 +48,22 @@ function ButtonWithDropdownMenu<IValueType>({
     const [isMenuVisible, setIsMenuVisible] = useState(false);
     const [popoverAnchorPosition, setPopoverAnchorPosition] = useState<AnchorPosition | null>(null);
     const {windowWidth, windowHeight} = useWindowDimensions();
-    const caretButton = useRef<View | HTMLDivElement | null>(null);
+    const dropdownAnchor = useRef<View | null>(null);
+    const dropdownButtonRef = isSplitButton ? buttonRef : mergeRefs(buttonRef, dropdownAnchor);
     const selectedItem = options[selectedItemIndex] || options[0];
     const innerStyleDropButton = StyleUtils.getDropDownButtonHeight(buttonSize);
     const isButtonSizeLarge = buttonSize === CONST.DROPDOWN_BUTTON_SIZE.LARGE;
+    const nullCheckRef = (ref: MutableRefObject<View | null>) => ref ?? null;
 
     useEffect(() => {
-        if (!caretButton.current) {
+        if (!dropdownAnchor.current) {
             return;
         }
         if (!isMenuVisible) {
             return;
         }
-        if ('measureInWindow' in caretButton.current) {
-            caretButton.current.measureInWindow((x, y, w, h) => {
+        if ('measureInWindow' in dropdownAnchor.current) {
+            dropdownAnchor.current.measureInWindow((x, y, w, h) => {
                 setPopoverAnchorPosition({
                     horizontal: x + w,
                     vertical:
@@ -65,6 +74,27 @@ function ButtonWithDropdownMenu<IValueType>({
             });
         }
     }, [windowWidth, windowHeight, isMenuVisible, anchorAlignment.vertical]);
+
+    useKeyboardShortcut(
+        CONST.KEYBOARD_SHORTCUTS.CTRL_ENTER,
+        (e) => {
+            if (shouldAlwaysShowDropdownMenu || options.length) {
+                if (!isSplitButton) {
+                    setIsMenuVisible(!isMenuVisible);
+                    return;
+                }
+                onPress(e, selectedItem?.value);
+            } else {
+                onPress(e, options[0]?.value);
+            }
+        },
+        {
+            captureOnInputs: true,
+            shouldBubble: false,
+            isActive: useKeyboardShortcuts,
+        },
+    );
+
     return (
         <View style={wrapperStyle}>
             {shouldAlwaysShowDropdownMenu || options.length > 1 ? (
@@ -72,12 +102,10 @@ function ButtonWithDropdownMenu<IValueType>({
                     <Button
                         success={success}
                         pressOnEnter={pressOnEnter}
-                        ref={(ref) => {
-                            caretButton.current = ref;
-                        }}
+                        ref={dropdownButtonRef}
                         onPress={(event) => (!isSplitButton ? setIsMenuVisible(!isMenuVisible) : onPress(event, selectedItem.value))}
                         text={customText ?? selectedItem.text}
-                        isDisabled={isDisabled || !!selectedItem.disabled}
+                        isDisabled={isDisabled || !!selectedItem?.disabled}
                         isLoading={isLoading}
                         shouldRemoveRightBorderRadius
                         style={[styles.flex1, styles.pr0]}
@@ -92,7 +120,7 @@ function ButtonWithDropdownMenu<IValueType>({
 
                     {isSplitButton && (
                         <Button
-                            ref={caretButton}
+                            ref={dropdownAnchor}
                             success={success}
                             isDisabled={isDisabled}
                             style={[styles.pl0]}
@@ -136,21 +164,25 @@ function ButtonWithDropdownMenu<IValueType>({
             {(shouldAlwaysShowDropdownMenu || options.length > 1) && popoverAnchorPosition && (
                 <PopoverMenu
                     isVisible={isMenuVisible}
-                    onClose={() => setIsMenuVisible(false)}
+                    onClose={() => {
+                        setIsMenuVisible(false);
+                        onOptionsMenuHide?.();
+                    }}
+                    onModalShow={onOptionsMenuShow}
                     onItemSelected={() => setIsMenuVisible(false)}
                     anchorPosition={popoverAnchorPosition}
-                    anchorRef={caretButton}
+                    anchorRef={nullCheckRef(dropdownAnchor)}
                     withoutOverlay
                     anchorAlignment={anchorAlignment}
                     headerText={menuHeaderText}
                     menuItems={options.map((item, index) => ({
                         ...item,
-                        onSelected:
-                            item.onSelected ??
-                            (() => {
-                                onOptionSelected?.(item);
-                                setSelectedItemIndex(index);
-                            }),
+                        onSelected: item.onSelected
+                            ? () => Modal.close(() => item.onSelected?.())
+                            : () => {
+                                  onOptionSelected?.(item);
+                                  setSelectedItemIndex(index);
+                              },
                     }))}
                 />
             )}
diff --git a/src/components/ButtonWithDropdownMenu/types.ts b/src/components/ButtonWithDropdownMenu/types.ts
index 1ad2ccb0d717..e4b81da94942 100644
--- a/src/components/ButtonWithDropdownMenu/types.ts
+++ b/src/components/ButtonWithDropdownMenu/types.ts
@@ -10,9 +10,11 @@ type PaymentType = DeepValueOf<typeof CONST.IOU.PAYMENT_TYPE | typeof CONST.IOU.
 
 type WorkspaceMemberBulkActionType = DeepValueOf<typeof CONST.POLICY.MEMBERS_BULK_ACTION_TYPES>;
 
-type WorkspaceDistanceRatesBulkActionType = DeepValueOf<typeof CONST.POLICY.DISTANCE_RATES_BULK_ACTION_TYPES>;
+type WorkspaceDistanceRatesBulkActionType = DeepValueOf<typeof CONST.POLICY.BULK_ACTION_TYPES>;
 
-type WorkspaceTaxRatesBulkActionType = DeepValueOf<typeof CONST.POLICY.TAX_RATES_BULK_ACTION_TYPES>;
+type WorkspaceTaxRatesBulkActionType = DeepValueOf<typeof CONST.POLICY.BULK_ACTION_TYPES>;
+
+type ReportExportType = DeepValueOf<typeof CONST.REPORT.EXPORT_OPTIONS>;
 
 type DropdownOption<TValueType> = {
     value: TValueType;
@@ -23,6 +25,11 @@ type DropdownOption<TValueType> = {
     iconDescription?: string;
     onSelected?: () => void;
     disabled?: boolean;
+    iconFill?: string;
+    interactive?: boolean;
+    numberOfLinesTitle?: number;
+    titleStyle?: ViewStyle;
+    shouldCloseModalOnSelect?: boolean;
 };
 
 type ButtonWithDropdownMenuProps<TValueType> = {
@@ -38,6 +45,12 @@ type ButtonWithDropdownMenuProps<TValueType> = {
     /** Callback to execute when a dropdown option is selected */
     onOptionSelected?: (option: DropdownOption<TValueType>) => void;
 
+    /** Callback when the options popover is shown */
+    onOptionsMenuShow?: () => void;
+
+    /** Callback when the options popover is shown */
+    onOptionsMenuHide?: () => void;
+
     /** Call the onPress function on main button when Enter key is pressed */
     pressOnEnter?: boolean;
 
@@ -77,6 +90,17 @@ type ButtonWithDropdownMenuProps<TValueType> = {
 
     /** Whether the button should use split style or not */
     isSplitButton?: boolean;
+
+    /** Whether to use keyboard shortcuts for confirmation or not */
+    useKeyboardShortcuts?: boolean;
 };
 
-export type {PaymentType, WorkspaceMemberBulkActionType, WorkspaceDistanceRatesBulkActionType, DropdownOption, ButtonWithDropdownMenuProps, WorkspaceTaxRatesBulkActionType};
+export type {
+    PaymentType,
+    WorkspaceMemberBulkActionType,
+    WorkspaceDistanceRatesBulkActionType,
+    DropdownOption,
+    ButtonWithDropdownMenuProps,
+    WorkspaceTaxRatesBulkActionType,
+    ReportExportType,
+};
diff --git a/src/components/CaretWrapper.tsx b/src/components/CaretWrapper.tsx
new file mode 100644
index 000000000000..d34b17397670
--- /dev/null
+++ b/src/components/CaretWrapper.tsx
@@ -0,0 +1,29 @@
+import React from 'react';
+import {View} from 'react-native';
+import useTheme from '@hooks/useTheme';
+import useThemeStyles from '@hooks/useThemeStyles';
+import variables from '@styles/variables';
+import type ChildrenProps from '@src/types/utils/ChildrenProps';
+import Icon from './Icon';
+import * as Expensicons from './Icon/Expensicons';
+
+type CaretWrapperProps = ChildrenProps;
+
+function CaretWrapper({children}: CaretWrapperProps) {
+    const theme = useTheme();
+    const styles = useThemeStyles();
+
+    return (
+        <View style={[styles.flexRow, styles.gap1, styles.alignItemsCenter]}>
+            {children}
+            <Icon
+                src={Expensicons.DownArrow}
+                fill={theme.icon}
+                width={variables.iconSizeExtraSmall}
+                height={variables.iconSizeExtraSmall}
+            />
+        </View>
+    );
+}
+
+export default CaretWrapper;
diff --git a/src/components/CategoryPicker.tsx b/src/components/CategoryPicker.tsx
index f26d7c25c7e2..e5c85a8f5f6d 100644
--- a/src/components/CategoryPicker.tsx
+++ b/src/components/CategoryPicker.tsx
@@ -14,6 +14,7 @@ import type {ListItem} from './SelectionList/types';
 
 type CategoryPickerOnyxProps = {
     policyCategories: OnyxEntry<OnyxTypes.PolicyCategories>;
+    policyCategoriesDraft: OnyxEntry<OnyxTypes.PolicyCategories>;
     policyRecentlyUsedCategories: OnyxEntry<OnyxTypes.RecentlyUsedCategories>;
 };
 
@@ -25,7 +26,7 @@ type CategoryPickerProps = CategoryPickerOnyxProps & {
     onSubmit: (item: ListItem) => void;
 };
 
-function CategoryPicker({selectedCategory, policyCategories, policyRecentlyUsedCategories, onSubmit}: CategoryPickerProps) {
+function CategoryPicker({selectedCategory, policyCategories, policyRecentlyUsedCategories, policyCategoriesDraft, onSubmit}: CategoryPickerProps) {
     const {translate} = useLocalize();
     const [searchValue, debouncedSearchValue, setSearchValue] = useDebouncedState('');
 
@@ -37,7 +38,6 @@ function CategoryPicker({selectedCategory, policyCategories, policyRecentlyUsedC
         return [
             {
                 name: selectedCategory,
-                enabled: true,
                 accountID: undefined,
                 isSelected: true,
             },
@@ -45,7 +45,8 @@ function CategoryPicker({selectedCategory, policyCategories, policyRecentlyUsedC
     }, [selectedCategory]);
 
     const [sections, headerMessage, shouldShowTextInput] = useMemo(() => {
-        const validPolicyRecentlyUsedCategories = policyRecentlyUsedCategories?.filter((p) => !isEmptyObject(p));
+        const categories = policyCategories ?? policyCategoriesDraft ?? {};
+        const validPolicyRecentlyUsedCategories = policyRecentlyUsedCategories?.filter?.((p) => !isEmptyObject(p));
         const {categoryOptions} = OptionsListUtils.getFilteredOptions(
             [],
             [],
@@ -56,19 +57,19 @@ function CategoryPicker({selectedCategory, policyCategories, policyRecentlyUsedC
             false,
             false,
             true,
-            policyCategories ?? {},
+            categories,
             validPolicyRecentlyUsedCategories,
             false,
         );
 
         const categoryData = categoryOptions?.[0]?.data ?? [];
         const header = OptionsListUtils.getHeaderMessageForNonUserList(categoryData.length > 0, debouncedSearchValue);
-        const policiesCount = OptionsListUtils.getEnabledCategoriesCount(policyCategories ?? {});
-        const isCategoriesCountBelowThreshold = policiesCount < CONST.CATEGORY_LIST_THRESHOLD;
+        const categoriesCount = OptionsListUtils.getEnabledCategoriesCount(categories);
+        const isCategoriesCountBelowThreshold = categoriesCount < CONST.CATEGORY_LIST_THRESHOLD;
         const showInput = !isCategoriesCountBelowThreshold;
 
         return [categoryOptions, header, showInput];
-    }, [policyRecentlyUsedCategories, debouncedSearchValue, selectedOptions, policyCategories]);
+    }, [policyRecentlyUsedCategories, debouncedSearchValue, selectedOptions, policyCategories, policyCategoriesDraft]);
 
     const selectedOptionKey = useMemo(() => (sections?.[0]?.data ?? []).filter((category) => category.searchText === selectedCategory)[0]?.keyForList, [sections, selectedCategory]);
 
@@ -93,6 +94,9 @@ export default withOnyx<CategoryPickerProps, CategoryPickerOnyxProps>({
     policyCategories: {
         key: ({policyID}) => `${ONYXKEYS.COLLECTION.POLICY_CATEGORIES}${policyID}`,
     },
+    policyCategoriesDraft: {
+        key: ({policyID}) => `${ONYXKEYS.COLLECTION.POLICY_CATEGORIES_DRAFT}${policyID}`,
+    },
     policyRecentlyUsedCategories: {
         key: ({policyID}) => `${ONYXKEYS.COLLECTION.POLICY_RECENTLY_USED_CATEGORIES}${policyID}`,
     },
diff --git a/src/components/ChatDetailsQuickActionsBar.tsx b/src/components/ChatDetailsQuickActionsBar.tsx
deleted file mode 100644
index d289587ce953..000000000000
--- a/src/components/ChatDetailsQuickActionsBar.tsx
+++ /dev/null
@@ -1,46 +0,0 @@
-import React from 'react';
-import {View} from 'react-native';
-import useLocalize from '@hooks/useLocalize';
-import useThemeStyles from '@hooks/useThemeStyles';
-import Navigation from '@libs/Navigation/Navigation';
-import * as Report from '@userActions/Report';
-import ROUTES from '@src/ROUTES';
-import type {Report as OnyxReportType} from '@src/types/onyx';
-import Button from './Button';
-import * as Expensicons from './Icon/Expensicons';
-
-type ChatDetailsQuickActionsBarProps = {
-    report: OnyxReportType;
-};
-
-function ChatDetailsQuickActionsBar({report}: ChatDetailsQuickActionsBarProps) {
-    const styles = useThemeStyles();
-    const {translate} = useLocalize();
-    const isPinned = !!report.isPinned;
-    return (
-        <View style={[styles.flexRow, styles.ph5, styles.mb5]}>
-            <View style={[styles.flex1, styles.pr3]}>
-                <Button
-                    onPress={() => Report.togglePinnedState(report.reportID, isPinned)}
-                    icon={Expensicons.Pin}
-                    style={styles.flex1}
-                    text={isPinned ? translate('common.unPin') : translate('common.pin')}
-                />
-            </View>
-            <View style={[styles.flex1]}>
-                <Button
-                    onPress={() => {
-                        Navigation.navigate(ROUTES.REPORT_WITH_ID_DETAILS_SHARE_CODE.getRoute(report?.reportID ?? ''));
-                    }}
-                    icon={Expensicons.QrCode}
-                    style={styles.flex1}
-                    text={translate('common.share')}
-                />
-            </View>
-        </View>
-    );
-}
-
-ChatDetailsQuickActionsBar.displayName = 'ChatDetailsQuickActionsBar';
-
-export default ChatDetailsQuickActionsBar;
diff --git a/src/components/Checkbox.tsx b/src/components/Checkbox.tsx
index 5445816f067b..6da170da3a67 100644
--- a/src/components/Checkbox.tsx
+++ b/src/components/Checkbox.tsx
@@ -44,6 +44,9 @@ type CheckboxProps = Partial<ChildrenProps> & {
 
     /** An accessibility label for the checkbox */
     accessibilityLabel: string;
+
+    /** stop propagation of the mouse down event */
+    shouldStopMouseDownPropagation?: boolean;
 };
 
 function Checkbox(
@@ -60,6 +63,7 @@ function Checkbox(
         caretSize = 14,
         onPress,
         accessibilityLabel,
+        shouldStopMouseDownPropagation,
     }: CheckboxProps,
     ref: ForwardedRef<View>,
 ) {
@@ -89,7 +93,12 @@ function Checkbox(
         <PressableWithFeedback
             disabled={disabled}
             onPress={firePressHandlerOnClick}
-            onMouseDown={onMouseDown}
+            onMouseDown={(e) => {
+                if (shouldStopMouseDownPropagation) {
+                    e.stopPropagation();
+                }
+                onMouseDown?.(e);
+            }}
             ref={ref}
             style={[StyleUtils.getCheckboxPressableStyle(containerBorderRadius + 2), style]} // to align outline on focus, border-radius of pressable should be 2px more than Checkbox
             onKeyDown={handleSpaceKey}
diff --git a/src/components/CheckboxWithLabel.tsx b/src/components/CheckboxWithLabel.tsx
index dd169576186e..db62aa9e1441 100644
--- a/src/components/CheckboxWithLabel.tsx
+++ b/src/components/CheckboxWithLabel.tsx
@@ -3,7 +3,6 @@ import React, {useState} from 'react';
 import type {StyleProp, ViewStyle} from 'react-native';
 import {View} from 'react-native';
 import useThemeStyles from '@hooks/useThemeStyles';
-import type {MaybePhraseKey} from '@libs/Localize';
 import variables from '@styles/variables';
 import Checkbox from './Checkbox';
 import FormHelpMessage from './FormHelpMessage';
@@ -41,7 +40,7 @@ type CheckboxWithLabelProps = RequiredLabelProps & {
     style?: StyleProp<ViewStyle>;
 
     /** Error text to display */
-    errorText?: MaybePhraseKey;
+    errorText?: string;
 
     /** Value for checkbox. This prop is intended to be set by FormProvider only */
     value?: boolean;
diff --git a/src/components/ClientSideLoggingToolMenu/BaseClientSideLoggingToolMenu.tsx b/src/components/ClientSideLoggingToolMenu/BaseClientSideLoggingToolMenu.tsx
index 7c4c669e2154..379668e4850b 100644
--- a/src/components/ClientSideLoggingToolMenu/BaseClientSideLoggingToolMenu.tsx
+++ b/src/components/ClientSideLoggingToolMenu/BaseClientSideLoggingToolMenu.tsx
@@ -21,9 +21,14 @@ type BaseClientSideLoggingToolMenuOnyxProps = {
     shouldStoreLogs: OnyxEntry<boolean>;
 };
 
+type File = {
+    path: string;
+    newFileName: string;
+    size: number;
+};
 type BaseClientSideLoggingToolProps = {
     /** Locally created file */
-    file?: {path: string; newFileName: string; size: number};
+    file?: File;
     /** Action to run when pressing Share button */
     onShareLogs?: () => void;
     /** Action to run when disabling the switch */
@@ -96,3 +101,4 @@ export default withOnyx<BaseClientSideLoggingToolProps, BaseClientSideLoggingToo
         key: ONYXKEYS.SHOULD_STORE_LOGS,
     },
 })(BaseClientSideLoggingToolMenu);
+export type {File};
diff --git a/src/components/ClientSideLoggingToolMenu/index.tsx b/src/components/ClientSideLoggingToolMenu/index.tsx
index 182c3bf99b74..4e9164f68fcf 100644
--- a/src/components/ClientSideLoggingToolMenu/index.tsx
+++ b/src/components/ClientSideLoggingToolMenu/index.tsx
@@ -1,14 +1,38 @@
-import React from 'react';
+import React, {useState} from 'react';
 import type {Log} from '@libs/Console';
 import localFileDownload from '@libs/localFileDownload';
+import type {File} from './BaseClientSideLoggingToolMenu';
 import BaseClientSideLoggingToolMenu from './BaseClientSideLoggingToolMenu';
 
 function ClientSideLoggingToolMenu() {
+    const [localLogs, setLocalLogs] = useState<Log[]>([]);
+    const [file, setFile] = useState<File | undefined>(undefined);
     const downloadFile = (logs: Log[]) => {
-        localFileDownload('logs', JSON.stringify(logs, null, 2));
+        const data = JSON.stringify(logs, null, 2);
+        setFile({
+            path: './logs',
+            newFileName: 'logs',
+            size: data.length,
+        });
+        setLocalLogs(logs);
+        localFileDownload('logs', data);
+    };
+    const hideShareButton = () => {
+        setFile(undefined);
+    };
+    const shareLogs = () => {
+        downloadFile(localLogs);
     };
 
-    return <BaseClientSideLoggingToolMenu onDisableLogging={downloadFile} />;
+    return (
+        <BaseClientSideLoggingToolMenu
+            file={file}
+            onDisableLogging={downloadFile}
+            onEnableLogging={hideShareButton}
+            onShareLogs={shareLogs}
+            displayPath={file?.path}
+        />
+    );
 }
 
 ClientSideLoggingToolMenu.displayName = 'ClientSideLoggingToolMenu';
diff --git a/src/components/CollapsibleSection/index.tsx b/src/components/CollapsibleSection/index.tsx
index f984906595c2..d339f005e3d3 100644
--- a/src/components/CollapsibleSection/index.tsx
+++ b/src/components/CollapsibleSection/index.tsx
@@ -18,6 +18,9 @@ type CollapsibleSectionProps = ChildrenProps & {
     /** Style of title of the collapsible section */
     titleStyle?: StyleProp<TextStyle>;
 
+    /** Style for the text */
+    textStyle?: StyleProp<TextStyle>;
+
     /** Style for the wrapper view */
     wrapperStyle?: StyleProp<ViewStyle>;
 
@@ -25,7 +28,7 @@ type CollapsibleSectionProps = ChildrenProps & {
     shouldShowSectionBorder?: boolean;
 };
 
-function CollapsibleSection({title, children, titleStyle, wrapperStyle, shouldShowSectionBorder}: CollapsibleSectionProps) {
+function CollapsibleSection({title, children, titleStyle, textStyle, wrapperStyle, shouldShowSectionBorder}: CollapsibleSectionProps) {
     const theme = useTheme();
     const styles = useThemeStyles();
     const [isExpanded, setIsExpanded] = useState(false);
@@ -50,7 +53,7 @@ function CollapsibleSection({title, children, titleStyle, wrapperStyle, shouldSh
                 pressDimmingValue={0.2}
             >
                 <Text
-                    style={[styles.flex1, styles.textStrong, styles.userSelectNone, titleStyle]}
+                    style={textStyle ?? [styles.flex1, styles.textStrong, styles.userSelectNone, titleStyle]}
                     dataSet={{[CONST.SELECTION_SCRAPER_HIDDEN_ELEMENT]: true}}
                 >
                     {title}
diff --git a/src/components/Composer/index.native.tsx b/src/components/Composer/index.native.tsx
index 4d135cdd88e2..9b886aa49c1d 100644
--- a/src/components/Composer/index.native.tsx
+++ b/src/components/Composer/index.native.tsx
@@ -1,21 +1,30 @@
+import type {MarkdownStyle} from '@expensify/react-native-live-markdown';
+import mimeDb from 'mime-db';
 import type {ForwardedRef} from 'react';
 import React, {useCallback, useEffect, useMemo, useRef} from 'react';
-import type {TextInput} from 'react-native';
+import type {NativeSyntheticEvent, TextInput, TextInputChangeEventData, TextInputPasteEventData} from 'react-native';
 import {StyleSheet} from 'react-native';
+import type {FileObject} from '@components/AttachmentModal';
 import type {AnimatedMarkdownTextInputRef} from '@components/RNMarkdownTextInput';
 import RNMarkdownTextInput from '@components/RNMarkdownTextInput';
+import useAutoFocusInput from '@hooks/useAutoFocusInput';
 import useMarkdownStyle from '@hooks/useMarkdownStyle';
 import useResetComposerFocus from '@hooks/useResetComposerFocus';
 import useStyleUtils from '@hooks/useStyleUtils';
 import useTheme from '@hooks/useTheme';
 import useThemeStyles from '@hooks/useThemeStyles';
 import updateIsFullComposerAvailable from '@libs/ComposerUtils/updateIsFullComposerAvailable';
+import * as EmojiUtils from '@libs/EmojiUtils';
+import * as FileUtils from '@libs/fileDownload/FileUtils';
 import type {ComposerProps} from './types';
 
+const excludeNoStyles: Array<keyof MarkdownStyle> = [];
+const excludeReportMentionStyle: Array<keyof MarkdownStyle> = ['mentionReport'];
+
 function Composer(
     {
-        shouldClear = false,
-        onClear = () => {},
+        onClear: onClearProp = () => {},
+        onPasteFile = () => {},
         isDisabled = false,
         maxLines,
         isComposerFullSize = false,
@@ -27,45 +36,78 @@ function Composer(
         // On Android the selection prop is required on the TextInput but this prop has issues on IOS
         selection,
         value,
+        isGroupPolicyReport = false,
         ...props
     }: ComposerProps,
     ref: ForwardedRef<TextInput>,
 ) {
     const textInput = useRef<AnimatedMarkdownTextInputRef | null>(null);
-    const {isFocused, shouldResetFocus} = useResetComposerFocus(textInput);
+    const {isFocused, shouldResetFocusRef} = useResetComposerFocus(textInput);
+    const textContainsOnlyEmojis = useMemo(() => EmojiUtils.containsOnlyEmojis(value ?? ''), [value]);
     const theme = useTheme();
-    const markdownStyle = useMarkdownStyle(value);
+    const markdownStyle = useMarkdownStyle(value, !isGroupPolicyReport ? excludeReportMentionStyle : excludeNoStyles);
     const styles = useThemeStyles();
     const StyleUtils = useStyleUtils();
 
+    const {inputCallbackRef, inputRef: autoFocusInputRef} = useAutoFocusInput();
+
+    useEffect(() => {
+        if (autoFocus === !!autoFocusInputRef.current) {
+            return;
+        }
+        inputCallbackRef(autoFocus ? textInput.current : null);
+    }, [autoFocus, inputCallbackRef, autoFocusInputRef]);
+
     /**
      * Set the TextInput Ref
      * @param {Element} el
      */
     const setTextInputRef = useCallback((el: AnimatedMarkdownTextInputRef) => {
+        // eslint-disable-next-line react-compiler/react-compiler
         textInput.current = el;
         if (typeof ref !== 'function' || textInput.current === null) {
             return;
         }
 
+        if (autoFocus) {
+            inputCallbackRef(el);
+        }
+
         // This callback prop is used by the parent component using the constructor to
         // get a ref to the inner textInput element e.g. if we do
         // <constructor ref={el => this.textInput = el} /> this will not
         // return a ref to the component, but rather the HTML element by default
         ref(textInput.current);
-        // eslint-disable-next-line react-hooks/exhaustive-deps
+        // eslint-disable-next-line react-compiler/react-compiler, react-hooks/exhaustive-deps
     }, []);
 
-    useEffect(() => {
-        if (!shouldClear) {
-            return;
-        }
-        textInput.current?.clear();
-        onClear();
-    }, [shouldClear, onClear]);
+    const onClear = useCallback(
+        ({nativeEvent}: NativeSyntheticEvent<TextInputChangeEventData>) => {
+            onClearProp(nativeEvent.text);
+        },
+        [onClearProp],
+    );
+
+    const pasteFile = useCallback(
+        (e: NativeSyntheticEvent<TextInputPasteEventData>) => {
+            const clipboardContent = e.nativeEvent.items[0];
+            if (clipboardContent.type === 'text/plain') {
+                return;
+            }
+            const mimeType = clipboardContent.type;
+            const fileURI = clipboardContent.data;
+            const baseFileName = fileURI.split('/').pop() ?? 'file';
+            const {fileName: stem, fileExtension: originalFileExtension} = FileUtils.splitExtensionFromFileName(baseFileName);
+            const fileExtension = originalFileExtension || (mimeDb[mimeType].extensions?.[0] ?? 'bin');
+            const fileName = `${stem}.${fileExtension}`;
+            const file: FileObject = {uri: fileURI, name: fileName, type: mimeType};
+            onPasteFile(file);
+        },
+        [onPasteFile],
+    );
 
     const maxHeightStyle = useMemo(() => StyleUtils.getComposerMaxHeightStyle(maxLines, isComposerFullSize), [StyleUtils, isComposerFullSize, maxLines]);
-    const composerStyle = useMemo(() => StyleSheet.flatten(style), [style]);
+    const composerStyle = useMemo(() => StyleSheet.flatten([style, textContainsOnlyEmojis ? styles.onlyEmojisTextLineHeight : {}]), [style, textContainsOnlyEmojis, styles]);
 
     return (
         <RNMarkdownTextInput
@@ -84,12 +126,15 @@ function Composer(
             /* eslint-disable-next-line react/jsx-props-no-spreading */
             {...props}
             readOnly={isDisabled}
+            onPaste={pasteFile}
             onBlur={(e) => {
                 if (!isFocused) {
-                    shouldResetFocus.current = true; // detect the input is blurred when the page is hidden
+                    // eslint-disable-next-line react-compiler/react-compiler
+                    shouldResetFocusRef.current = true; // detect the input is blurred when the page is hidden
                 }
                 props?.onBlur?.(e);
             }}
+            onClear={onClear}
         />
     );
 }
diff --git a/src/components/Composer/index.tsx b/src/components/Composer/index.tsx
index 4bc54d13b056..7a4512ad5aea 100755
--- a/src/components/Composer/index.tsx
+++ b/src/components/Composer/index.tsx
@@ -1,10 +1,11 @@
+import type {MarkdownStyle} from '@expensify/react-native-live-markdown';
 import lodashDebounce from 'lodash/debounce';
 import type {BaseSyntheticEvent, ForwardedRef} from 'react';
-import React, {useCallback, useEffect, useMemo, useRef, useState} from 'react';
+import React, {useCallback, useEffect, useImperativeHandle, useMemo, useRef, useState} from 'react';
 import {flushSync} from 'react-dom';
 // eslint-disable-next-line no-restricted-imports
-import type {DimensionValue, NativeSyntheticEvent, Text as RNText, TextInput, TextInputKeyPressEventData, TextInputSelectionChangeEventData, TextStyle} from 'react-native';
-import {StyleSheet, View} from 'react-native';
+import type {NativeSyntheticEvent, Text as RNText, TextInput, TextInputKeyPressEventData, TextInputSelectionChangeEventData, ViewStyle} from 'react-native';
+import {DeviceEventEmitter, StyleSheet, View} from 'react-native';
 import type {AnimatedMarkdownTextInputRef} from '@components/RNMarkdownTextInput';
 import RNMarkdownTextInput from '@components/RNMarkdownTextInput';
 import Text from '@components/Text';
@@ -16,7 +17,9 @@ import useTheme from '@hooks/useTheme';
 import useThemeStyles from '@hooks/useThemeStyles';
 import * as Browser from '@libs/Browser';
 import updateIsFullComposerAvailable from '@libs/ComposerUtils/updateIsFullComposerAvailable';
+import * as EmojiUtils from '@libs/EmojiUtils';
 import * as FileUtils from '@libs/fileDownload/FileUtils';
+import focusComposerWithDelay from '@libs/focusComposerWithDelay';
 import isEnterWhileComposition from '@libs/KeyboardShortcut/isEnterWhileComposition';
 import ReportActionComposeFocusManager from '@libs/ReportActionComposeFocusManager';
 import CONST from '@src/CONST';
@@ -45,6 +48,9 @@ const getNextChars = (inputString: string, cursorPosition: number): string => {
     return subString.substring(0, spaceIndex);
 };
 
+const excludeNoStyles: Array<keyof MarkdownStyle> = [];
+const excludeReportMentionStyle: Array<keyof MarkdownStyle> = ['mentionReport'];
+
 // Enable Markdown parsing.
 // On web we like to have the Text Input field always focused so the user can easily type a new chat
 function Composer(
@@ -54,7 +60,6 @@ function Composer(
         maxLines = -1,
         onKeyPress = () => {},
         style,
-        shouldClear = false,
         autoFocus = false,
         shouldCalculateCaretPosition = false,
         isDisabled = false,
@@ -69,14 +74,16 @@ function Composer(
         },
         isReportActionCompose = false,
         isComposerFullSize = false,
-        shouldContainScroll = false,
+        shouldContainScroll = true,
+        isGroupPolicyReport = false,
         ...props
     }: ComposerProps,
     ref: ForwardedRef<TextInput | HTMLInputElement>,
 ) {
+    const textContainsOnlyEmojis = useMemo(() => EmojiUtils.containsOnlyEmojis(value ?? ''), [value]);
     const theme = useTheme();
     const styles = useThemeStyles();
-    const markdownStyle = useMarkdownStyle(value);
+    const markdownStyle = useMarkdownStyle(value, !isGroupPolicyReport ? excludeReportMentionStyle : excludeNoStyles);
     const StyleUtils = useStyleUtils();
     const textRef = useRef<HTMLElement & RNText>(null);
     const textInput = useRef<AnimatedMarkdownTextInputRef | null>(null);
@@ -84,6 +91,8 @@ function Composer(
         | {
               start: number;
               end?: number;
+              positionX?: number;
+              positionY?: number;
           }
         | undefined
     >({
@@ -92,26 +101,18 @@ function Composer(
     });
     const [caretContent, setCaretContent] = useState('');
     const [valueBeforeCaret, setValueBeforeCaret] = useState('');
-    const [textInputWidth, setTextInputWidth] = useState('');
+    const [textInputWidth, setTextInputWidth] = useState<ViewStyle['width']>('');
     const [isRendered, setIsRendered] = useState(false);
     const isScrollBarVisible = useIsScrollBarVisible(textInput, value ?? '');
     const [prevScroll, setPrevScroll] = useState<number | undefined>();
+    const isReportFlatListScrolling = useRef(false);
 
     useEffect(() => {
-        if (!shouldClear) {
+        if (!!selection && selectionProp.start === selection.start && selectionProp.end === selection.end) {
             return;
         }
-        textInput.current?.clear();
-        onClear();
-    }, [shouldClear, onClear]);
-
-    useEffect(() => {
-        setSelection((prevSelection) => {
-            if (!!prevSelection && selectionProp.start === prevSelection.start && selectionProp.end === prevSelection.end) {
-                return;
-            }
-            return selectionProp;
-        });
+        setSelection(selectionProp);
+        // eslint-disable-next-line react-compiler/react-compiler, react-hooks/exhaustive-deps
     }, [selectionProp]);
 
     /**
@@ -122,7 +123,7 @@ function Composer(
         if (shouldCalculateCaretPosition && isRendered) {
             // we do flushSync to make sure that the valueBeforeCaret is updated before we calculate the caret position to receive a proper position otherwise we will calculate position for the previous state
             flushSync(() => {
-                setValueBeforeCaret(webEvent.target.value.slice(0, webEvent.nativeEvent.selection.start));
+                setValueBeforeCaret((webEvent.target as HTMLInputElement).value.slice(0, webEvent.nativeEvent.selection.start));
                 setCaretContent(getNextChars(value ?? '', webEvent.nativeEvent.selection.start));
             });
             const selectionValue = {
@@ -162,7 +163,6 @@ function Composer(
 
             if (textInput.current !== event.target && !(isContenteditableDivFocused && !event.clipboardData?.files.length)) {
                 const eventTarget = event.target as HTMLInputElement | HTMLTextAreaElement | null;
-
                 // To make sure the composer does not capture paste events from other inputs, we check where the event originated
                 // If it did originate in another input, we return early to prevent the composer from handling the paste
                 const isTargetInput = eventTarget?.nodeName === 'INPUT' || eventTarget?.nodeName === 'TEXTAREA' || eventTarget?.contentEditable === 'true';
@@ -241,20 +241,41 @@ function Composer(
         };
     }, []);
 
+    useEffect(() => {
+        const scrollingListener = DeviceEventEmitter.addListener(CONST.EVENTS.SCROLLING, (scrolling: boolean) => {
+            isReportFlatListScrolling.current = scrolling;
+        });
+
+        return () => scrollingListener.remove();
+    }, []);
+
+    useEffect(() => {
+        const handleWheel = (e: MouseEvent) => {
+            if (isReportFlatListScrolling.current) {
+                e.preventDefault();
+                return;
+            }
+            e.stopPropagation();
+        };
+        textInput.current?.addEventListener('wheel', handleWheel, {passive: false});
+
+        return () => {
+            textInput.current?.removeEventListener('wheel', handleWheel);
+        };
+    }, []);
+
     useEffect(() => {
         if (!textInput.current || prevScroll === undefined) {
             return;
         }
+        // eslint-disable-next-line react-compiler/react-compiler
         textInput.current.scrollTop = prevScroll;
-        // eslint-disable-next-line react-hooks/exhaustive-deps
+        // eslint-disable-next-line react-compiler/react-compiler, react-hooks/exhaustive-deps
     }, [isComposerFullSize]);
 
     useHtmlPaste(textInput, handlePaste, true);
 
     useEffect(() => {
-        if (typeof ref === 'function') {
-            ref(textInput.current);
-        }
         setIsRendered(true);
 
         return () => {
@@ -263,9 +284,55 @@ function Composer(
             }
             ReportActionComposeFocusManager.clear();
         };
-        // eslint-disable-next-line react-hooks/exhaustive-deps
+        // eslint-disable-next-line react-compiler/react-compiler, react-hooks/exhaustive-deps
     }, []);
 
+    const clear = useCallback(() => {
+        if (!textInput.current) {
+            return;
+        }
+
+        const currentText = textInput.current.value;
+        textInput.current.clear();
+
+        // We need to reset the selection to 0,0 manually after clearing the text input on web
+        const selectionEvent = {
+            nativeEvent: {
+                selection: {
+                    start: 0,
+                    end: 0,
+                },
+            },
+        } as NativeSyntheticEvent<TextInputSelectionChangeEventData>;
+        onSelectionChange(selectionEvent);
+        setSelection({start: 0, end: 0});
+
+        onClear(currentText);
+    }, [onClear, onSelectionChange]);
+
+    useImperativeHandle(
+        ref,
+        () => {
+            const textInputRef = textInput.current;
+            if (!textInputRef) {
+                throw new Error('textInputRef is not available. This should never happen and indicates a developer error.');
+            }
+
+            return {
+                ...textInputRef,
+                // Overwrite clear with our custom implementation, which mimics how the native TextInput's clear method works
+                clear,
+                // We have to redefine these methods as they are inherited by prototype chain and are not accessible directly
+                blur: () => textInputRef.blur(),
+                focus: () => textInputRef.focus(),
+                get scrollTop() {
+                    return textInputRef.scrollTop;
+                },
+            };
+        },
+        [clear],
+    );
+
     const handleKeyPress = useCallback(
         (e: NativeSyntheticEvent<TextInputKeyPressEventData>) => {
             // Prevent onKeyPress from being triggered if the Enter key is pressed while text is being composed
@@ -286,7 +353,7 @@ function Composer(
                 opacity: 0,
             }}
         >
-            <Text style={[StyleSheet.flatten([style, styles.noSelect]), StyleUtils.getComposerMaxHeightStyle(maxLines, isComposerFullSize), {maxWidth: textInputWidth as DimensionValue}]}>
+            <Text style={[StyleSheet.flatten([style, styles.noSelect]), StyleUtils.getComposerMaxHeightStyle(maxLines, isComposerFullSize), {maxWidth: textInputWidth}]}>
                 {`${valueBeforeCaret} `}
                 <Text
                     numberOfLines={1}
@@ -312,10 +379,11 @@ function Composer(
             Browser.isMobileSafari() || Browser.isSafari() ? styles.rtlTextRenderForSafari : {},
             scrollStyleMemo,
             StyleUtils.getComposerMaxHeightStyle(maxLines, isComposerFullSize),
-            isComposerFullSize ? ({height: '100%', maxHeight: 'none' as DimensionValue} as TextStyle) : undefined,
+            isComposerFullSize ? {height: '100%', maxHeight: 'none'} : undefined,
+            textContainsOnlyEmojis ? styles.onlyEmojisTextLineHeight : {},
         ],
 
-        [style, styles.rtlTextRenderForSafari, scrollStyleMemo, StyleUtils, maxLines, isComposerFullSize],
+        [style, styles.rtlTextRenderForSafari, styles.onlyEmojisTextLineHeight, scrollStyleMemo, StyleUtils, maxLines, isComposerFullSize, textContainsOnlyEmojis],
     );
 
     return (
@@ -346,7 +414,7 @@ function Composer(
                             return;
                         }
 
-                        textInput.current.focus();
+                        focusComposerWithDelay(textInput.current)(true);
                     });
 
                     props.onFocus?.(e);
diff --git a/src/components/Composer/types.ts b/src/components/Composer/types.ts
index 531bcd03f8bf..8287e2de3f2d 100644
--- a/src/components/Composer/types.ts
+++ b/src/components/Composer/types.ts
@@ -1,11 +1,18 @@
 import type {NativeSyntheticEvent, StyleProp, TextInputProps, TextInputSelectionChangeEventData, TextStyle} from 'react-native';
+import type {FileObject} from '@components/AttachmentModal';
 
 type TextSelection = {
     start: number;
     end?: number;
+    positionX?: number;
+    positionY?: number;
+};
+type CustomSelectionChangeEvent = NativeSyntheticEvent<TextInputSelectionChangeEventData> & {
+    positionX?: number;
+    positionY?: number;
 };
 
-type ComposerProps = TextInputProps & {
+type ComposerProps = Omit<TextInputProps, 'onClear'> & {
     /** identify id in the text input */
     id?: string;
 
@@ -21,22 +28,22 @@ type ComposerProps = TextInputProps & {
     /** The value of the comment box */
     value?: string;
 
+    /**
+     * Callback when the input was cleared using the .clear ref method.
+     * The text parameter will be the value of the text that was cleared.
+     */
+    onClear?: (text: string) => void;
+
     /** Callback method handle when the input is changed  */
     onChangeText?: (numberOfLines: string) => void;
 
     /** Callback method to handle pasting a file */
-    onPasteFile?: (file: File) => void;
+    onPasteFile?: (file: FileObject) => void;
 
     /** General styles to apply to the text input */
     // eslint-disable-next-line react/forbid-prop-types
     style?: StyleProp<TextStyle>;
 
-    /** If the input should clear, it actually gets intercepted instead of .clear() */
-    shouldClear?: boolean;
-
-    /** When the input has cleared whoever owns this input should know about it */
-    onClear?: () => void;
-
     /** Whether or not this TextInput is disabled. */
     isDisabled?: boolean;
 
@@ -45,7 +52,7 @@ type ComposerProps = TextInputProps & {
     autoFocus?: boolean;
 
     /** Update selection position on change */
-    onSelectionChange?: (event: NativeSyntheticEvent<TextInputSelectionChangeEventData>) => void;
+    onSelectionChange?: (event: CustomSelectionChangeEvent) => void;
 
     /** Selection Object */
     selection?: TextSelection;
@@ -70,6 +77,9 @@ type ComposerProps = TextInputProps & {
 
     /** Should make the input only scroll inside the element avoid scroll out to parent */
     shouldContainScroll?: boolean;
+
+    /** Indicates whether the composer is in a group policy report. Used for disabling report mentioning style in markdown input */
+    isGroupPolicyReport?: boolean;
 };
 
-export type {TextSelection, ComposerProps};
+export type {TextSelection, ComposerProps, CustomSelectionChangeEvent};
diff --git a/src/components/ConfirmContent.tsx b/src/components/ConfirmContent.tsx
index 26331f92401c..36f24c2a3477 100644
--- a/src/components/ConfirmContent.tsx
+++ b/src/components/ConfirmContent.tsx
@@ -14,8 +14,11 @@ import type IconAsset from '@src/types/utils/IconAsset';
 import Button from './Button';
 import Header from './Header';
 import Icon from './Icon';
+import {Close} from './Icon/Expensicons';
 import ImageSVG from './ImageSVG';
+import {PressableWithoutFeedback} from './Pressable';
 import Text from './Text';
+import Tooltip from './Tooltip';
 
 type ConfirmContentProps = {
     /** Title of the modal */
@@ -51,15 +54,36 @@ type ConfirmContentProps = {
     /** Icon to display above the title */
     iconSource?: IconAsset;
 
+    /** Fill color for the Icon */
+    iconFill?: string | false;
+
+    /** Icon width */
+    iconWidth?: number;
+
+    /** Icon height */
+    iconHeight?: number;
+
+    /** Should the icon be centered? */
+    shouldCenterIcon?: boolean;
+
     /** Whether to center the icon / text content */
     shouldCenterContent?: boolean;
 
+    /** Whether to show the dismiss icon */
+    shouldShowDismissIcon?: boolean;
+
     /** Whether to stack the buttons */
     shouldStackButtons?: boolean;
 
+    /** Whether to reverse the order of the stacked buttons */
+    shouldReverseStackedButtons?: boolean;
+
     /** Styles for title */
     titleStyles?: StyleProp<TextStyle>;
 
+    /** Styles for title container */
+    titleContainerStyles?: StyleProp<ViewStyle>;
+
     /** Styles for prompt */
     promptStyles?: StyleProp<TextStyle>;
 
@@ -85,13 +109,20 @@ function ConfirmContent({
     shouldDisableConfirmButtonWhenOffline = false,
     shouldShowCancelButton = false,
     iconSource,
+    iconFill,
     shouldCenterContent = false,
     shouldStackButtons = true,
     titleStyles,
     promptStyles,
     contentStyles,
     iconAdditionalStyles,
+    iconWidth = variables.appModalAppIconSize,
+    iconHeight = variables.appModalAppIconSize,
+    shouldCenterIcon = false,
+    shouldShowDismissIcon = false,
     image,
+    titleContainerStyles,
+    shouldReverseStackedButtons = false,
 }: ConfirmContentProps) {
     const styles = useThemeStyles();
     const {translate} = useLocalize();
@@ -116,19 +147,35 @@ function ConfirmContent({
             )}
 
             <View style={[styles.m5, contentStyles]}>
+                {shouldShowDismissIcon && (
+                    <View style={styles.alignItemsEnd}>
+                        <Tooltip text={translate('common.close')}>
+                            <PressableWithoutFeedback
+                                onPress={onCancel}
+                                role={CONST.ROLE.BUTTON}
+                                accessibilityLabel={translate('common.close')}
+                            >
+                                <Icon
+                                    fill={theme.icon}
+                                    src={Close}
+                                />
+                            </PressableWithoutFeedback>
+                        </Tooltip>
+                    </View>
+                )}
                 <View style={isCentered ? [styles.alignItemsCenter, styles.mb6] : []}>
-                    {typeof iconSource === 'function' && (
-                        <View style={[styles.flexRow, styles.mb3]}>
+                    {iconSource && (
+                        <View style={[shouldCenterIcon ? styles.justifyContentCenter : null, styles.flexRow, styles.mb3]}>
                             <Icon
                                 src={iconSource}
-                                fill={theme.icon}
-                                width={variables.appModalAppIconSize}
-                                height={variables.appModalAppIconSize}
+                                fill={iconFill === false ? undefined : iconFill ?? theme.icon}
+                                width={iconWidth}
+                                height={iconHeight}
                                 additionalStyles={iconAdditionalStyles}
                             />
                         </View>
                     )}
-                    <View style={[styles.flexRow, isCentered ? {} : styles.mb4]}>
+                    <View style={[styles.flexRow, isCentered ? {} : styles.mb4, titleContainerStyles]}>
                         <Header
                             title={title}
                             textStyles={titleStyles}
@@ -139,17 +186,25 @@ function ConfirmContent({
 
                 {shouldStackButtons ? (
                     <>
+                        {shouldShowCancelButton && shouldReverseStackedButtons && (
+                            <Button
+                                style={[styles.mt4, styles.noSelect]}
+                                onPress={onCancel}
+                                large
+                                text={cancelText || translate('common.no')}
+                            />
+                        )}
                         <Button
                             success={success}
                             danger={danger}
-                            style={[styles.mt4]}
+                            style={shouldReverseStackedButtons ? styles.mt3 : styles.mt4}
                             onPress={onConfirm}
                             pressOnEnter
                             large
                             text={confirmText || translate('common.yes')}
                             isDisabled={isOffline && shouldDisableConfirmButtonWhenOffline}
                         />
-                        {shouldShowCancelButton && (
+                        {shouldShowCancelButton && !shouldReverseStackedButtons && (
                             <Button
                                 style={[styles.mt3, styles.noSelect]}
                                 onPress={onCancel}
diff --git a/src/components/ConfirmModal.tsx b/src/components/ConfirmModal.tsx
index 6a875e1fbce8..487d637b2ea2 100755
--- a/src/components/ConfirmModal.tsx
+++ b/src/components/ConfirmModal.tsx
@@ -1,12 +1,13 @@
 import type {ReactNode} from 'react';
 import React from 'react';
 import type {StyleProp, TextStyle, ViewStyle} from 'react-native';
+import useResponsiveLayout from '@hooks/useResponsiveLayout';
 import useThemeStyles from '@hooks/useThemeStyles';
-import useWindowDimensions from '@hooks/useWindowDimensions';
 import CONST from '@src/CONST';
 import type IconAsset from '@src/types/utils/IconAsset';
 import ConfirmContent from './ConfirmContent';
 import Modal from './Modal';
+import type BaseModalProps from './Modal/types';
 
 type ConfirmModalProps = {
     /** Title of the modal */
@@ -51,6 +52,24 @@ type ConfirmModalProps = {
     /** Icon to display above the title */
     iconSource?: IconAsset;
 
+    /** Fill color for the Icon */
+    iconFill?: string | false;
+
+    /** Icon width */
+    iconWidth?: number;
+
+    /** Icon height */
+    iconHeight?: number;
+
+    /** Should the icon be centered */
+    shouldCenterIcon?: boolean;
+
+    /** Whether to show the dismiss icon */
+    shouldShowDismissIcon?: boolean;
+
+    /** Styles for title container */
+    titleContainerStyles?: StyleProp<ViewStyle>;
+
     /** Styles for title */
     titleStyles?: StyleProp<TextStyle>;
 
@@ -66,8 +85,20 @@ type ConfirmModalProps = {
     /** Whether to stack the buttons */
     shouldStackButtons?: boolean;
 
+    /** Whether to reverse the order of the stacked buttons */
+    shouldReverseStackedButtons?: boolean;
+
     /** Image to display with content */
     image?: IconAsset;
+
+    /**
+     * Whether the modal should enable the new focus manager.
+     * We are attempting to migrate to a new refocus manager, adding this property for gradual migration.
+     * */
+    shouldEnableNewFocusManagement?: boolean;
+
+    /** How to re-focus after the modal is dismissed */
+    restoreFocusType?: BaseModalProps['restoreFocusType'];
 };
 
 function ConfirmModal({
@@ -91,8 +122,17 @@ function ConfirmModal({
     isVisible,
     onConfirm,
     image,
+    iconWidth,
+    iconHeight,
+    iconFill,
+    shouldCenterIcon,
+    shouldShowDismissIcon,
+    titleContainerStyles,
+    shouldReverseStackedButtons,
+    shouldEnableNewFocusManagement,
+    restoreFocusType,
 }: ConfirmModalProps) {
-    const {isSmallScreenWidth} = useWindowDimensions();
+    const {isSmallScreenWidth} = useResponsiveLayout();
     const styles = useThemeStyles();
 
     return (
@@ -104,6 +144,8 @@ function ConfirmModal({
             onModalHide={onModalHide}
             type={isSmallScreenWidth ? CONST.MODAL.MODAL_TYPE.BOTTOM_DOCKED : CONST.MODAL.MODAL_TYPE.CONFIRM}
             innerContainerStyle={image ? styles.pt0 : {}}
+            shouldEnableNewFocusManagement={shouldEnableNewFocusManagement}
+            restoreFocusType={restoreFocusType}
         >
             <ConfirmContent
                 title={title}
@@ -120,10 +162,18 @@ function ConfirmModal({
                 shouldShowCancelButton={shouldShowCancelButton}
                 shouldCenterContent={shouldCenterContent}
                 iconSource={iconSource}
+                contentStyles={isSmallScreenWidth && shouldShowDismissIcon ? styles.mt2 : undefined}
+                iconFill={iconFill}
+                iconHeight={iconHeight}
+                iconWidth={iconWidth}
+                shouldCenterIcon={shouldCenterIcon}
+                shouldShowDismissIcon={shouldShowDismissIcon}
+                titleContainerStyles={titleContainerStyles}
                 iconAdditionalStyles={iconAdditionalStyles}
                 titleStyles={titleStyles}
                 promptStyles={promptStyles}
                 shouldStackButtons={shouldStackButtons}
+                shouldReverseStackedButtons={shouldReverseStackedButtons}
                 image={image}
             />
         </Modal>
diff --git a/src/components/ConfirmationPage.tsx b/src/components/ConfirmationPage.tsx
index d1a73b7933fe..a95cf9bf87d2 100644
--- a/src/components/ConfirmationPage.tsx
+++ b/src/components/ConfirmationPage.tsx
@@ -1,9 +1,12 @@
 import React from 'react';
-import type {TextStyle} from 'react-native';
+import type {TextStyle, ViewStyle} from 'react-native';
 import {View} from 'react-native';
 import useThemeStyles from '@hooks/useThemeStyles';
+import isIllustrationLottieAnimation from '@libs/isIllustrationLottieAnimation';
+import type IconAsset from '@src/types/utils/IconAsset';
 import Button from './Button';
 import FixedFooter from './FixedFooter';
+import ImageSVG from './ImageSVG';
 import Lottie from './Lottie';
 import LottieAnimations from './LottieAnimations';
 import type DotLottieAnimation from './LottieAnimations/types';
@@ -11,13 +14,13 @@ import Text from './Text';
 
 type ConfirmationPageProps = {
     /** The asset to render */
-    animation?: DotLottieAnimation;
+    illustration?: DotLottieAnimation | IconAsset;
 
     /** Heading of the confirmation page */
     heading: string;
 
     /** Description of the confirmation page */
-    description: string;
+    description: React.ReactNode;
 
     /** The text for the button label */
     buttonText?: string;
@@ -31,31 +34,45 @@ type ConfirmationPageProps = {
     /** Additional style for the heading */
     headingStyle?: TextStyle;
 
+    /** Additional style for the animation */
+    illustrationStyle?: ViewStyle;
+
     /** Additional style for the description */
     descriptionStyle?: TextStyle;
 };
 
 function ConfirmationPage({
-    animation = LottieAnimations.Fireworks,
+    illustration = LottieAnimations.Fireworks,
     heading,
     description,
     buttonText = '',
     onButtonPress = () => {},
     shouldShowButton = false,
     headingStyle,
+    illustrationStyle,
     descriptionStyle,
 }: ConfirmationPageProps) {
     const styles = useThemeStyles();
+    const isLottie = isIllustrationLottieAnimation(illustration);
 
     return (
         <>
             <View style={[styles.screenCenteredContainer, styles.alignItemsCenter]}>
-                <Lottie
-                    source={animation}
-                    autoPlay
-                    loop
-                    style={styles.confirmationAnimation}
-                />
+                {isLottie ? (
+                    <Lottie
+                        source={illustration}
+                        autoPlay
+                        loop
+                        style={[styles.confirmationAnimation, illustrationStyle]}
+                    />
+                ) : (
+                    <View style={[styles.confirmationAnimation, illustrationStyle]}>
+                        <ImageSVG
+                            src={illustration}
+                            contentFit="contain"
+                        />
+                    </View>
+                )}
                 <Text style={[styles.textHeadline, styles.textAlignCenter, styles.mv2, headingStyle]}>{heading}</Text>
                 <Text style={[styles.textAlignCenter, descriptionStyle]}>{description}</Text>
             </View>
diff --git a/src/components/ConfirmedRoute.tsx b/src/components/ConfirmedRoute.tsx
index d9cbbc8f248f..4940a276cbf8 100644
--- a/src/components/ConfirmedRoute.tsx
+++ b/src/components/ConfirmedRoute.tsx
@@ -3,6 +3,7 @@ import type {ReactNode} from 'react';
 import {withOnyx} from 'react-native-onyx';
 import type {OnyxEntry} from 'react-native-onyx';
 import useNetwork from '@hooks/useNetwork';
+import useStyleUtils from '@hooks/useStyleUtils';
 import useTheme from '@hooks/useTheme';
 import useThemeStyles from '@hooks/useThemeStyles';
 import * as TransactionUtils from '@libs/TransactionUtils';
@@ -27,17 +28,28 @@ type ConfirmedRouteProps = ConfirmedRoutePropsOnyxProps & {
     /** Transaction that stores the distance expense data */
     transaction: OnyxEntry<Transaction>;
 
+    /** Whether the size of the route pending icon is smaller. */
+    isSmallerIcon?: boolean;
+
+    /** Whether it should have border radius */
+    shouldHaveBorderRadius?: boolean;
+
+    /** Whether it should display the Mapbox map only when the route/coordinates exist otherwise
+     * it will display pending map icon */
+    requireRouteToDisplayMap?: boolean;
+
     /** Whether the map is interactable or not */
     interactive?: boolean;
 };
 
-function ConfirmedRoute({mapboxAccessToken, transaction, interactive}: ConfirmedRouteProps) {
+function ConfirmedRoute({mapboxAccessToken, transaction, isSmallerIcon, shouldHaveBorderRadius = true, requireRouteToDisplayMap = false, interactive}: ConfirmedRouteProps) {
     const {isOffline} = useNetwork();
     const {route0: route} = transaction?.routes ?? {};
     const waypoints = transaction?.comment?.waypoints ?? {};
     const coordinates = route?.geometry?.coordinates ?? [];
     const theme = useTheme();
     const styles = useThemeStyles();
+    const StyleUtils = useStyleUtils();
 
     const getMarkerComponent = useCallback(
         (icon: IconAsset): ReactNode => (
@@ -90,23 +102,29 @@ function ConfirmedRoute({mapboxAccessToken, transaction, interactive}: Confirmed
         return MapboxToken.stop;
     }, []);
 
-    return !isOffline && Boolean(mapboxAccessToken?.token) ? (
+    const shouldDisplayMap = !requireRouteToDisplayMap || !!coordinates.length;
+
+    return !isOffline && !!mapboxAccessToken?.token && shouldDisplayMap ? (
         <DistanceMapView
             interactive={interactive}
             accessToken={mapboxAccessToken?.token ?? ''}
-            mapPadding={CONST.MAP_PADDING}
+            mapPadding={CONST.MAPBOX.PADDING}
             pitchEnabled={false}
             initialState={{
                 zoom: CONST.MAPBOX.DEFAULT_ZOOM,
                 location: waypointMarkers?.[0]?.coordinate ?? (CONST.MAPBOX.DEFAULT_COORDINATE as [number, number]),
             }}
             directionCoordinates={coordinates as Array<[number, number]>}
-            style={[styles.mapView, styles.br4]}
+            style={[styles.mapView, shouldHaveBorderRadius && styles.br4]}
             waypoints={waypointMarkers}
             styleURL={CONST.MAPBOX.STYLE_URL}
+            requireRouteToDisplayMap={requireRouteToDisplayMap}
         />
     ) : (
-        <PendingMapView />
+        <PendingMapView
+            isSmallerIcon={isSmallerIcon}
+            style={!shouldHaveBorderRadius && StyleUtils.getBorderRadiusStyle(0)}
+        />
     );
 }
 
diff --git a/src/components/ConnectToNetSuiteButton/index.tsx b/src/components/ConnectToNetSuiteButton/index.tsx
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/src/components/ConnectToNetSuiteFlow/index.tsx b/src/components/ConnectToNetSuiteFlow/index.tsx
new file mode 100644
index 000000000000..ec38da13bef0
--- /dev/null
+++ b/src/components/ConnectToNetSuiteFlow/index.tsx
@@ -0,0 +1,86 @@
+import React, {useEffect, useState} from 'react';
+import * as Expensicons from '@components/Icon/Expensicons';
+import PopoverMenu from '@components/PopoverMenu';
+import useLocalize from '@hooks/useLocalize';
+import useWindowDimensions from '@hooks/useWindowDimensions';
+import {getAdminPoliciesConnectedToNetSuite} from '@libs/actions/Policy/Policy';
+import Navigation from '@libs/Navigation/Navigation';
+import {useAccountingContext} from '@pages/workspace/accounting/AccountingContext';
+import type {AnchorPosition} from '@styles/index';
+import CONST from '@src/CONST';
+import ROUTES from '@src/ROUTES';
+import type {ConnectToNetSuiteFlowProps} from './types';
+
+function ConnectToNetSuiteFlow({policyID}: ConnectToNetSuiteFlowProps) {
+    const {translate} = useLocalize();
+
+    const hasPoliciesConnectedToNetSuite = !!getAdminPoliciesConnectedToNetSuite()?.length;
+    const {isSmallScreenWidth} = useWindowDimensions();
+    const [isReuseConnectionsPopoverOpen, setIsReuseConnectionsPopoverOpen] = useState(false);
+    const [reuseConnectionPopoverPosition, setReuseConnectionPopoverPosition] = useState<AnchorPosition>({horizontal: 0, vertical: 0});
+    const {popoverAnchorRefs} = useAccountingContext();
+
+    const threeDotsMenuContainerRef = popoverAnchorRefs?.current?.[CONST.POLICY.CONNECTIONS.NAME.NETSUITE];
+
+    const connectionOptions = [
+        {
+            icon: Expensicons.LinkCopy,
+            text: translate('workspace.common.createNewConnection'),
+            onSelected: () => {
+                Navigation.navigate(ROUTES.POLICY_ACCOUNTING_NETSUITE_TOKEN_INPUT.getRoute(policyID));
+                setIsReuseConnectionsPopoverOpen(false);
+            },
+        },
+        {
+            icon: Expensicons.Copy,
+            text: translate('workspace.common.reuseExistingConnection'),
+            onSelected: () => {
+                Navigation.navigate(ROUTES.POLICY_ACCOUNTING_NETSUITE_EXISTING_CONNECTIONS.getRoute(policyID));
+                setIsReuseConnectionsPopoverOpen(false);
+            },
+        },
+    ];
+
+    useEffect(() => {
+        if (!hasPoliciesConnectedToNetSuite) {
+            Navigation.navigate(ROUTES.POLICY_ACCOUNTING_NETSUITE_TOKEN_INPUT.getRoute(policyID));
+            return;
+        }
+        setIsReuseConnectionsPopoverOpen(true);
+        // eslint-disable-next-line react-compiler/react-compiler
+        // eslint-disable-next-line react-hooks/exhaustive-deps
+    }, []);
+
+    if (threeDotsMenuContainerRef) {
+        if (!isSmallScreenWidth) {
+            threeDotsMenuContainerRef.current?.measureInWindow((x, y, width, height) => {
+                setReuseConnectionPopoverPosition({
+                    horizontal: x + width,
+                    vertical: y + height,
+                });
+            });
+        }
+
+        return (
+            <PopoverMenu
+                isVisible={isReuseConnectionsPopoverOpen}
+                onClose={() => {
+                    setIsReuseConnectionsPopoverOpen(false);
+                }}
+                withoutOverlay
+                menuItems={connectionOptions}
+                onItemSelected={(item) => {
+                    if (!item?.onSelected) {
+                        return;
+                    }
+                    item.onSelected();
+                }}
+                anchorPosition={reuseConnectionPopoverPosition}
+                anchorAlignment={{horizontal: CONST.MODAL.ANCHOR_ORIGIN_HORIZONTAL.RIGHT, vertical: CONST.MODAL.ANCHOR_ORIGIN_VERTICAL.TOP}}
+                anchorRef={threeDotsMenuContainerRef}
+            />
+        );
+    }
+}
+
+export default ConnectToNetSuiteFlow;
diff --git a/src/components/ConnectToNetSuiteFlow/types.ts b/src/components/ConnectToNetSuiteFlow/types.ts
new file mode 100644
index 000000000000..f45191d43f87
--- /dev/null
+++ b/src/components/ConnectToNetSuiteFlow/types.ts
@@ -0,0 +1,10 @@
+import type {PolicyConnectionName} from '@src/types/onyx/Policy';
+
+type ConnectToNetSuiteFlowProps = {
+    policyID: string;
+    shouldDisconnectIntegrationBeforeConnecting?: boolean;
+    integrationToDisconnect?: PolicyConnectionName;
+};
+
+// eslint-disable-next-line import/prefer-default-export
+export type {ConnectToNetSuiteFlowProps};
diff --git a/src/components/ConnectToQuickbooksOnlineButton/index.native.tsx b/src/components/ConnectToQuickbooksOnlineButton/index.native.tsx
index 3a5e545cce88..e69de29bb2d1 100644
--- a/src/components/ConnectToQuickbooksOnlineButton/index.native.tsx
+++ b/src/components/ConnectToQuickbooksOnlineButton/index.native.tsx
@@ -1,106 +0,0 @@
-import React, {useRef, useState} from 'react';
-import type {OnyxEntry} from 'react-native-onyx';
-import {withOnyx} from 'react-native-onyx';
-import {WebView} from 'react-native-webview';
-import FullPageOfflineBlockingView from '@components/BlockingViews/FullPageOfflineBlockingView';
-import Button from '@components/Button';
-import ConfirmModal from '@components/ConfirmModal';
-import FullScreenLoadingIndicator from '@components/FullscreenLoadingIndicator';
-import HeaderWithBackButton from '@components/HeaderWithBackButton';
-import Modal from '@components/Modal';
-import useLocalize from '@hooks/useLocalize';
-import {removePolicyConnection} from '@libs/actions/connections';
-import {getQuickBooksOnlineSetupLink} from '@libs/actions/connections/QuickBooksOnline';
-import CONST from '@src/CONST';
-import ONYXKEYS from '@src/ONYXKEYS';
-import type {Session} from '@src/types/onyx';
-import type {ConnectToQuickbooksOnlineButtonProps} from './types';
-
-type ConnectToQuickbooksOnlineButtonOnyxProps = {
-    /** Session info for the currently logged in user. */
-    session: OnyxEntry<Session>;
-};
-
-const renderLoading = () => <FullScreenLoadingIndicator />;
-
-function ConnectToQuickbooksOnlineButton({
-    policyID,
-    session,
-    shouldDisconnectIntegrationBeforeConnecting,
-    integrationToDisconnect,
-}: ConnectToQuickbooksOnlineButtonProps & ConnectToQuickbooksOnlineButtonOnyxProps) {
-    const {translate} = useLocalize();
-    const webViewRef = useRef<WebView>(null);
-    const [isWebViewOpen, setWebViewOpen] = useState(false);
-
-    const authToken = session?.authToken ?? null;
-
-    const [isDisconnectModalOpen, setIsDisconnectModalOpen] = useState(false);
-
-    return (
-        <>
-            <Button
-                onPress={() => {
-                    if (shouldDisconnectIntegrationBeforeConnecting && integrationToDisconnect) {
-                        setIsDisconnectModalOpen(true);
-                        return;
-                    }
-                    setWebViewOpen(true);
-                }}
-                text={translate('workspace.accounting.setup')}
-                small
-            />
-            {shouldDisconnectIntegrationBeforeConnecting && integrationToDisconnect && isDisconnectModalOpen && (
-                <ConfirmModal
-                    title={translate('workspace.accounting.disconnectTitle', CONST.POLICY.CONNECTIONS.NAME.XERO)}
-                    onConfirm={() => {
-                        removePolicyConnection(policyID, integrationToDisconnect);
-                        setIsDisconnectModalOpen(false);
-                        setWebViewOpen(true);
-                    }}
-                    isVisible
-                    onCancel={() => setIsDisconnectModalOpen(false)}
-                    prompt={translate('workspace.accounting.disconnectPrompt', CONST.POLICY.CONNECTIONS.NAME.QBO)}
-                    confirmText={translate('workspace.accounting.disconnect')}
-                    cancelText={translate('common.cancel')}
-                    danger
-                />
-            )}
-            {isWebViewOpen && (
-                <Modal
-                    onClose={() => setWebViewOpen(false)}
-                    fullscreen
-                    isVisible
-                    type={CONST.MODAL.MODAL_TYPE.CENTERED}
-                >
-                    <HeaderWithBackButton
-                        title={translate('workspace.accounting.title')}
-                        onBackButtonPress={() => setWebViewOpen(false)}
-                    />
-                    <FullPageOfflineBlockingView>
-                        <WebView
-                            ref={webViewRef}
-                            source={{
-                                uri: getQuickBooksOnlineSetupLink(policyID),
-                                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}
-                        />
-                    </FullPageOfflineBlockingView>
-                </Modal>
-            )}
-        </>
-    );
-}
-
-ConnectToQuickbooksOnlineButton.displayName = 'ConnectToQuickbooksOnlineButton';
-
-export default withOnyx<ConnectToQuickbooksOnlineButtonProps & ConnectToQuickbooksOnlineButtonOnyxProps, ConnectToQuickbooksOnlineButtonOnyxProps>({
-    session: {
-        key: ONYXKEYS.SESSION,
-    },
-})(ConnectToQuickbooksOnlineButton);
diff --git a/src/components/ConnectToQuickbooksOnlineButton/index.tsx b/src/components/ConnectToQuickbooksOnlineButton/index.tsx
index 7de2ba55fb84..e69de29bb2d1 100644
--- a/src/components/ConnectToQuickbooksOnlineButton/index.tsx
+++ b/src/components/ConnectToQuickbooksOnlineButton/index.tsx
@@ -1,56 +0,0 @@
-import React, {useState} from 'react';
-import Button from '@components/Button';
-import ConfirmModal from '@components/ConfirmModal';
-import useEnvironment from '@hooks/useEnvironment';
-import useLocalize from '@hooks/useLocalize';
-import useThemeStyles from '@hooks/useThemeStyles';
-import {removePolicyConnection} from '@libs/actions/connections';
-import {getQuickBooksOnlineSetupLink} from '@libs/actions/connections/QuickBooksOnline';
-import * as Link from '@userActions/Link';
-import CONST from '@src/CONST';
-import type {ConnectToQuickbooksOnlineButtonProps} from './types';
-
-function ConnectToQuickbooksOnlineButton({policyID, shouldDisconnectIntegrationBeforeConnecting, integrationToDisconnect}: ConnectToQuickbooksOnlineButtonProps) {
-    const styles = useThemeStyles();
-    const {translate} = useLocalize();
-    const {environmentURL} = useEnvironment();
-
-    const [isDisconnectModalOpen, setIsDisconnectModalOpen] = useState(false);
-
-    return (
-        <>
-            <Button
-                onPress={() => {
-                    if (shouldDisconnectIntegrationBeforeConnecting && integrationToDisconnect) {
-                        setIsDisconnectModalOpen(true);
-                        return;
-                    }
-                    Link.openLink(getQuickBooksOnlineSetupLink(policyID), environmentURL);
-                }}
-                text={translate('workspace.accounting.setup')}
-                style={styles.justifyContentCenter}
-                small
-            />
-            {shouldDisconnectIntegrationBeforeConnecting && integrationToDisconnect && isDisconnectModalOpen && (
-                <ConfirmModal
-                    title={translate('workspace.accounting.disconnectTitle', CONST.POLICY.CONNECTIONS.NAME.XERO)}
-                    isVisible={isDisconnectModalOpen}
-                    onConfirm={() => {
-                        removePolicyConnection(policyID, integrationToDisconnect);
-                        Link.openLink(getQuickBooksOnlineSetupLink(policyID), environmentURL);
-                        setIsDisconnectModalOpen(false);
-                    }}
-                    onCancel={() => setIsDisconnectModalOpen(false)}
-                    prompt={translate('workspace.accounting.disconnectPrompt', CONST.POLICY.CONNECTIONS.NAME.QBO)}
-                    confirmText={translate('workspace.accounting.disconnect')}
-                    cancelText={translate('common.cancel')}
-                    danger
-                />
-            )}
-        </>
-    );
-}
-
-ConnectToQuickbooksOnlineButton.displayName = 'ConnectToQuickbooksOnlineButton';
-
-export default ConnectToQuickbooksOnlineButton;
diff --git a/src/components/ConnectToQuickbooksOnlineButton/types.ts b/src/components/ConnectToQuickbooksOnlineButton/types.ts
deleted file mode 100644
index 418db90701ef..000000000000
--- a/src/components/ConnectToQuickbooksOnlineButton/types.ts
+++ /dev/null
@@ -1,10 +0,0 @@
-import type {PolicyConnectionName} from '@src/types/onyx/Policy';
-
-type ConnectToQuickbooksOnlineButtonProps = {
-    policyID: string;
-    shouldDisconnectIntegrationBeforeConnecting?: boolean;
-    integrationToDisconnect?: PolicyConnectionName;
-};
-
-// eslint-disable-next-line import/prefer-default-export
-export type {ConnectToQuickbooksOnlineButtonProps};
diff --git a/src/components/ConnectToQuickbooksOnlineFlow/index.native.tsx b/src/components/ConnectToQuickbooksOnlineFlow/index.native.tsx
new file mode 100644
index 000000000000..a6659338451e
--- /dev/null
+++ b/src/components/ConnectToQuickbooksOnlineFlow/index.native.tsx
@@ -0,0 +1,76 @@
+import React, {useEffect, useRef, useState} from 'react';
+import type {OnyxEntry} from 'react-native-onyx';
+import {withOnyx} from 'react-native-onyx';
+import {WebView} from 'react-native-webview';
+import FullPageOfflineBlockingView from '@components/BlockingViews/FullPageOfflineBlockingView';
+import FullScreenLoadingIndicator from '@components/FullscreenLoadingIndicator';
+import HeaderWithBackButton from '@components/HeaderWithBackButton';
+import Modal from '@components/Modal';
+import useLocalize from '@hooks/useLocalize';
+import {getQuickbooksOnlineSetupLink} from '@libs/actions/connections/QuickbooksOnline';
+import * as PolicyAction from '@userActions/Policy/Policy';
+import CONST from '@src/CONST';
+import ONYXKEYS from '@src/ONYXKEYS';
+import type {Session} from '@src/types/onyx';
+import type {ConnectToQuickbooksOnlineFlowProps} from './types';
+
+type ConnectToQuickbooksOnlineFlowOnyxProps = {
+    /** Session info for the currently logged in user. */
+    session: OnyxEntry<Session>;
+};
+
+const renderLoading = () => <FullScreenLoadingIndicator />;
+
+function ConnectToQuickbooksOnlineFlow({policyID, session}: ConnectToQuickbooksOnlineFlowProps & ConnectToQuickbooksOnlineFlowOnyxProps) {
+    const {translate} = useLocalize();
+    const webViewRef = useRef<WebView>(null);
+    const [isWebViewOpen, setWebViewOpen] = useState(false);
+
+    const authToken = session?.authToken ?? null;
+
+    useEffect(() => {
+        // Since QBO doesn't support Taxes, we should disable them from the LHN when connecting to QBO
+        PolicyAction.enablePolicyTaxes(policyID, false);
+        setWebViewOpen(true);
+        // eslint-disable-next-line react-compiler/react-compiler
+        // eslint-disable-next-line react-hooks/exhaustive-deps
+    }, []);
+
+    if (isWebViewOpen) {
+        return (
+            <Modal
+                onClose={() => setWebViewOpen(false)}
+                fullscreen
+                isVisible
+                type={CONST.MODAL.MODAL_TYPE.CENTERED_UNSWIPEABLE}
+            >
+                <HeaderWithBackButton
+                    title={translate('workspace.accounting.title')}
+                    onBackButtonPress={() => setWebViewOpen(false)}
+                />
+                <FullPageOfflineBlockingView>
+                    <WebView
+                        ref={webViewRef}
+                        source={{
+                            uri: getQuickbooksOnlineSetupLink(policyID),
+                            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}
+                    />
+                </FullPageOfflineBlockingView>
+            </Modal>
+        );
+    }
+}
+
+ConnectToQuickbooksOnlineFlow.displayName = 'ConnectToQuickbooksOnlineFlow';
+
+export default withOnyx<ConnectToQuickbooksOnlineFlowProps & ConnectToQuickbooksOnlineFlowOnyxProps, ConnectToQuickbooksOnlineFlowOnyxProps>({
+    session: {
+        key: ONYXKEYS.SESSION,
+    },
+})(ConnectToQuickbooksOnlineFlow);
diff --git a/src/components/ConnectToQuickbooksOnlineFlow/index.tsx b/src/components/ConnectToQuickbooksOnlineFlow/index.tsx
new file mode 100644
index 000000000000..6b825240ba6d
--- /dev/null
+++ b/src/components/ConnectToQuickbooksOnlineFlow/index.tsx
@@ -0,0 +1,24 @@
+import {useEffect} from 'react';
+import useEnvironment from '@hooks/useEnvironment';
+import {getQuickbooksOnlineSetupLink} from '@libs/actions/connections/QuickbooksOnline';
+import * as Link from '@userActions/Link';
+import * as PolicyAction from '@userActions/Policy/Policy';
+import type {ConnectToQuickbooksOnlineFlowProps} from './types';
+
+function ConnectToQuickbooksOnlineFlow({policyID}: ConnectToQuickbooksOnlineFlowProps) {
+    const {environmentURL} = useEnvironment();
+
+    useEffect(() => {
+        // Since QBO doesn't support Taxes, we should disable them from the LHN when connecting to QBO
+        PolicyAction.enablePolicyTaxes(policyID, false);
+        Link.openLink(getQuickbooksOnlineSetupLink(policyID), environmentURL);
+        // eslint-disable-next-line react-compiler/react-compiler
+        // eslint-disable-next-line react-hooks/exhaustive-deps
+    }, []);
+
+    return null;
+}
+
+ConnectToQuickbooksOnlineFlow.displayName = 'ConnectToQuickbooksOnlineFlow';
+
+export default ConnectToQuickbooksOnlineFlow;
diff --git a/src/components/ConnectToQuickbooksOnlineFlow/types.ts b/src/components/ConnectToQuickbooksOnlineFlow/types.ts
new file mode 100644
index 000000000000..0705a3501ed0
--- /dev/null
+++ b/src/components/ConnectToQuickbooksOnlineFlow/types.ts
@@ -0,0 +1,10 @@
+import type {PolicyConnectionName} from '@src/types/onyx/Policy';
+
+type ConnectToQuickbooksOnlineFlowProps = {
+    policyID: string;
+    shouldDisconnectIntegrationBeforeConnecting?: boolean;
+    integrationToDisconnect?: PolicyConnectionName;
+};
+
+// eslint-disable-next-line import/prefer-default-export
+export type {ConnectToQuickbooksOnlineFlowProps};
diff --git a/src/components/ConnectToSageIntacctButton/index.tsx b/src/components/ConnectToSageIntacctButton/index.tsx
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/src/components/ConnectToSageIntacctFlow/index.tsx b/src/components/ConnectToSageIntacctFlow/index.tsx
new file mode 100644
index 000000000000..5d7b36eb0bbb
--- /dev/null
+++ b/src/components/ConnectToSageIntacctFlow/index.tsx
@@ -0,0 +1,88 @@
+import React, {useEffect, useState} from 'react';
+import * as Expensicons from '@components/Icon/Expensicons';
+import PopoverMenu from '@components/PopoverMenu';
+import useLocalize from '@hooks/useLocalize';
+import useWindowDimensions from '@hooks/useWindowDimensions';
+import {getAdminPoliciesConnectedToSageIntacct} from '@libs/actions/Policy/Policy';
+import Navigation from '@libs/Navigation/Navigation';
+import {useAccountingContext} from '@pages/workspace/accounting/AccountingContext';
+import type {AnchorPosition} from '@styles/index';
+import CONST from '@src/CONST';
+import ROUTES from '@src/ROUTES';
+
+type ConnectToSageIntacctFlowProps = {
+    policyID: string;
+};
+
+function ConnectToSageIntacctFlow({policyID}: ConnectToSageIntacctFlowProps) {
+    const {translate} = useLocalize();
+
+    const hasPoliciesConnectedToSageIntacct = !!getAdminPoliciesConnectedToSageIntacct().length;
+    const {isSmallScreenWidth} = useWindowDimensions();
+    const [isReuseConnectionsPopoverOpen, setIsReuseConnectionsPopoverOpen] = useState(false);
+    const [reuseConnectionPopoverPosition, setReuseConnectionPopoverPosition] = useState<AnchorPosition>({horizontal: 0, vertical: 0});
+    const {popoverAnchorRefs} = useAccountingContext();
+    const threeDotsMenuContainerRef = popoverAnchorRefs?.current?.[CONST.POLICY.CONNECTIONS.NAME.SAGE_INTACCT];
+
+    const connectionOptions = [
+        {
+            icon: Expensicons.LinkCopy,
+            text: translate('workspace.common.createNewConnection'),
+            onSelected: () => {
+                Navigation.navigate(ROUTES.POLICY_ACCOUNTING_SAGE_INTACCT_PREREQUISITES.getRoute(policyID));
+                setIsReuseConnectionsPopoverOpen(false);
+            },
+        },
+        {
+            icon: Expensicons.Copy,
+            text: translate('workspace.common.reuseExistingConnection'),
+            onSelected: () => {
+                Navigation.navigate(ROUTES.POLICY_ACCOUNTING_SAGE_INTACCT_EXISTING_CONNECTIONS.getRoute(policyID));
+                setIsReuseConnectionsPopoverOpen(false);
+            },
+        },
+    ];
+
+    useEffect(() => {
+        if (!hasPoliciesConnectedToSageIntacct) {
+            Navigation.navigate(ROUTES.POLICY_ACCOUNTING_SAGE_INTACCT_PREREQUISITES.getRoute(policyID));
+            return;
+        }
+        setIsReuseConnectionsPopoverOpen(true);
+        // eslint-disable-next-line react-compiler/react-compiler
+        // eslint-disable-next-line react-hooks/exhaustive-deps
+    }, []);
+
+    if (threeDotsMenuContainerRef) {
+        if (!isSmallScreenWidth) {
+            threeDotsMenuContainerRef.current?.measureInWindow((x, y, width, height) => {
+                setReuseConnectionPopoverPosition({
+                    horizontal: x + width,
+                    vertical: y + height,
+                });
+            });
+        }
+
+        return (
+            <PopoverMenu
+                isVisible={isReuseConnectionsPopoverOpen}
+                onClose={() => {
+                    setIsReuseConnectionsPopoverOpen(false);
+                }}
+                withoutOverlay
+                menuItems={connectionOptions}
+                onItemSelected={(item) => {
+                    if (!item?.onSelected) {
+                        return;
+                    }
+                    item.onSelected();
+                }}
+                anchorPosition={reuseConnectionPopoverPosition}
+                anchorAlignment={{horizontal: CONST.MODAL.ANCHOR_ORIGIN_HORIZONTAL.RIGHT, vertical: CONST.MODAL.ANCHOR_ORIGIN_VERTICAL.TOP}}
+                anchorRef={threeDotsMenuContainerRef}
+            />
+        );
+    }
+}
+
+export default ConnectToSageIntacctFlow;
diff --git a/src/components/ConnectToXeroButton/index.native.tsx b/src/components/ConnectToXeroButton/index.native.tsx
deleted file mode 100644
index 36c5af4a0575..000000000000
--- a/src/components/ConnectToXeroButton/index.native.tsx
+++ /dev/null
@@ -1,101 +0,0 @@
-import React, {useRef, useState} from 'react';
-import type {OnyxEntry} from 'react-native-onyx';
-import {withOnyx} from 'react-native-onyx';
-import {WebView} from 'react-native-webview';
-import FullPageOfflineBlockingView from '@components/BlockingViews/FullPageOfflineBlockingView';
-import Button from '@components/Button';
-import ConfirmModal from '@components/ConfirmModal';
-import FullScreenLoadingIndicator from '@components/FullscreenLoadingIndicator';
-import HeaderWithBackButton from '@components/HeaderWithBackButton';
-import Modal from '@components/Modal';
-import useLocalize from '@hooks/useLocalize';
-import useThemeStyles from '@hooks/useThemeStyles';
-import {removePolicyConnection} from '@libs/actions/connections';
-import getXeroSetupLink from '@libs/actions/connections/ConnectToXero';
-import CONST from '@src/CONST';
-import ONYXKEYS from '@src/ONYXKEYS';
-import type {Session} from '@src/types/onyx';
-import type {ConnectToXeroButtonProps} from './types';
-
-type ConnectToXeroButtonOnyxProps = {
-    /** Session info for the currently logged in user. */
-    session: OnyxEntry<Session>;
-};
-
-function ConnectToXeroButton({policyID, session, shouldDisconnectIntegrationBeforeConnecting, integrationToDisconnect}: ConnectToXeroButtonProps & ConnectToXeroButtonOnyxProps) {
-    const styles = useThemeStyles();
-    const {translate} = useLocalize();
-    const webViewRef = useRef<WebView>(null);
-    const [isWebViewOpen, setWebViewOpen] = useState(false);
-
-    const authToken = session?.authToken ?? null;
-
-    const renderLoading = () => <FullScreenLoadingIndicator />;
-    const [isDisconnectModalOpen, setIsDisconnectModalOpen] = useState(false);
-
-    return (
-        <>
-            <Button
-                onPress={() => {
-                    if (shouldDisconnectIntegrationBeforeConnecting && integrationToDisconnect) {
-                        setIsDisconnectModalOpen(true);
-                        return;
-                    }
-                    setWebViewOpen(true);
-                }}
-                text={translate('workspace.accounting.setup')}
-                style={styles.justifyContentCenter}
-                small
-            />
-            {shouldDisconnectIntegrationBeforeConnecting && isDisconnectModalOpen && integrationToDisconnect && (
-                <ConfirmModal
-                    title={translate('workspace.accounting.disconnectTitle', CONST.POLICY.CONNECTIONS.NAME.QBO)}
-                    onConfirm={() => {
-                        removePolicyConnection(policyID, integrationToDisconnect);
-                        setIsDisconnectModalOpen(false);
-                        setWebViewOpen(true);
-                    }}
-                    isVisible
-                    onCancel={() => setIsDisconnectModalOpen(false)}
-                    prompt={translate('workspace.accounting.disconnectPrompt', CONST.POLICY.CONNECTIONS.NAME.XERO)}
-                    confirmText={translate('workspace.accounting.disconnect')}
-                    cancelText={translate('common.cancel')}
-                    danger
-                />
-            )}
-            <Modal
-                onClose={() => setWebViewOpen(false)}
-                fullscreen
-                isVisible={isWebViewOpen}
-                type={CONST.MODAL.MODAL_TYPE.CENTERED}
-            >
-                <HeaderWithBackButton
-                    title={translate('workspace.accounting.title')}
-                    onBackButtonPress={() => setWebViewOpen(false)}
-                />
-                <FullPageOfflineBlockingView>
-                    <WebView
-                        ref={webViewRef}
-                        source={{
-                            uri: getXeroSetupLink(policyID),
-                            headers: {
-                                Cookie: `authToken=${authToken}`,
-                            },
-                        }}
-                        incognito
-                        startInLoadingState
-                        renderLoading={renderLoading}
-                    />
-                </FullPageOfflineBlockingView>
-            </Modal>
-        </>
-    );
-}
-
-ConnectToXeroButton.displayName = 'ConnectToXeroButton';
-
-export default withOnyx<ConnectToXeroButtonProps & ConnectToXeroButtonOnyxProps, ConnectToXeroButtonOnyxProps>({
-    session: {
-        key: ONYXKEYS.SESSION,
-    },
-})(ConnectToXeroButton);
diff --git a/src/components/ConnectToXeroButton/index.tsx b/src/components/ConnectToXeroButton/index.tsx
deleted file mode 100644
index 8fad63e1a965..000000000000
--- a/src/components/ConnectToXeroButton/index.tsx
+++ /dev/null
@@ -1,54 +0,0 @@
-import React, {useState} from 'react';
-import Button from '@components/Button';
-import ConfirmModal from '@components/ConfirmModal';
-import useEnvironment from '@hooks/useEnvironment';
-import useLocalize from '@hooks/useLocalize';
-import useThemeStyles from '@hooks/useThemeStyles';
-import {removePolicyConnection} from '@libs/actions/connections';
-import getXeroSetupLink from '@libs/actions/connections/ConnectToXero';
-import * as Link from '@userActions/Link';
-import CONST from '@src/CONST';
-import type {ConnectToXeroButtonProps} from './types';
-
-function ConnectToXeroButton({policyID, shouldDisconnectIntegrationBeforeConnecting, integrationToDisconnect}: ConnectToXeroButtonProps) {
-    const styles = useThemeStyles();
-    const {translate} = useLocalize();
-    const {environmentURL} = useEnvironment();
-
-    const [isDisconnectModalOpen, setIsDisconnectModalOpen] = useState(false);
-
-    return (
-        <>
-            <Button
-                onPress={() => {
-                    if (shouldDisconnectIntegrationBeforeConnecting && integrationToDisconnect) {
-                        setIsDisconnectModalOpen(true);
-                        return;
-                    }
-                    Link.openLink(getXeroSetupLink(policyID), environmentURL);
-                }}
-                text={translate('workspace.accounting.setup')}
-                style={styles.justifyContentCenter}
-                small
-            />
-            {shouldDisconnectIntegrationBeforeConnecting && isDisconnectModalOpen && integrationToDisconnect && (
-                <ConfirmModal
-                    title={translate('workspace.accounting.disconnectTitle', CONST.POLICY.CONNECTIONS.NAME.QBO)}
-                    isVisible
-                    onConfirm={() => {
-                        removePolicyConnection(policyID, integrationToDisconnect);
-                        Link.openLink(getXeroSetupLink(policyID), environmentURL);
-                        setIsDisconnectModalOpen(false);
-                    }}
-                    onCancel={() => setIsDisconnectModalOpen(false)}
-                    prompt={translate('workspace.accounting.disconnectPrompt', CONST.POLICY.CONNECTIONS.NAME.XERO)}
-                    confirmText={translate('workspace.accounting.disconnect')}
-                    cancelText={translate('common.cancel')}
-                    danger
-                />
-            )}
-        </>
-    );
-}
-
-export default ConnectToXeroButton;
diff --git a/src/components/ConnectToXeroButton/types.ts b/src/components/ConnectToXeroButton/types.ts
deleted file mode 100644
index e3ed629536cf..000000000000
--- a/src/components/ConnectToXeroButton/types.ts
+++ /dev/null
@@ -1,10 +0,0 @@
-import type {PolicyConnectionName} from '@src/types/onyx/Policy';
-
-type ConnectToXeroButtonProps = {
-    policyID: string;
-    shouldDisconnectIntegrationBeforeConnecting?: boolean;
-    integrationToDisconnect?: PolicyConnectionName;
-};
-
-// eslint-disable-next-line import/prefer-default-export
-export type {ConnectToXeroButtonProps};
diff --git a/src/components/ConnectToXeroFlow/index.native.tsx b/src/components/ConnectToXeroFlow/index.native.tsx
new file mode 100644
index 000000000000..735c4bf131a3
--- /dev/null
+++ b/src/components/ConnectToXeroFlow/index.native.tsx
@@ -0,0 +1,98 @@
+import React, {useEffect, useRef, useState} from 'react';
+import type {OnyxEntry} from 'react-native-onyx';
+import {useOnyx, withOnyx} from 'react-native-onyx';
+import {WebView} from 'react-native-webview';
+import FullPageOfflineBlockingView from '@components/BlockingViews/FullPageOfflineBlockingView';
+import FullScreenLoadingIndicator from '@components/FullscreenLoadingIndicator';
+import HeaderWithBackButton from '@components/HeaderWithBackButton';
+import Modal from '@components/Modal';
+import RequireTwoFactorAuthenticationModal from '@components/RequireTwoFactorAuthenticationModal';
+import useLocalize from '@hooks/useLocalize';
+import {getXeroSetupLink} from '@libs/actions/connections/Xero';
+import getUAForWebView from '@libs/getUAForWebView';
+import Navigation from '@libs/Navigation/Navigation';
+import CONST from '@src/CONST';
+import ONYXKEYS from '@src/ONYXKEYS';
+import ROUTES from '@src/ROUTES';
+import type {Session} from '@src/types/onyx';
+import type {ConnectToXeroFlowProps} from './types';
+
+type ConnectToXeroFlowOnyxProps = {
+    /** Session info for the currently logged in user. */
+    session: OnyxEntry<Session>;
+};
+
+function ConnectToXeroFlow({policyID, session}: ConnectToXeroFlowProps & ConnectToXeroFlowOnyxProps) {
+    const {translate} = useLocalize();
+    const webViewRef = useRef<WebView>(null);
+    const [isWebViewOpen, setWebViewOpen] = useState(false);
+
+    const authToken = session?.authToken ?? null;
+
+    const [account] = useOnyx(ONYXKEYS.ACCOUNT);
+    const is2FAEnabled = account?.requiresTwoFactorAuth ?? false;
+
+    const renderLoading = () => <FullScreenLoadingIndicator />;
+    const [isRequire2FAModalOpen, setIsRequire2FAModalOpen] = useState(false);
+
+    useEffect(() => {
+        if (!is2FAEnabled) {
+            setIsRequire2FAModalOpen(true);
+            return;
+        }
+        setWebViewOpen(true);
+        // eslint-disable-next-line react-compiler/react-compiler
+        // eslint-disable-next-line react-hooks/exhaustive-deps
+    }, []);
+
+    return (
+        <>
+            {isRequire2FAModalOpen && (
+                <RequireTwoFactorAuthenticationModal
+                    onSubmit={() => {
+                        setIsRequire2FAModalOpen(false);
+                        Navigation.dismissModal();
+                        Navigation.navigate(ROUTES.SETTINGS_2FA.getRoute(ROUTES.POLICY_ACCOUNTING.getRoute(policyID), getXeroSetupLink(policyID)));
+                    }}
+                    onCancel={() => setIsRequire2FAModalOpen(false)}
+                    isVisible
+                    description={translate('twoFactorAuth.twoFactorAuthIsRequiredDescription')}
+                />
+            )}
+            <Modal
+                onClose={() => setWebViewOpen(false)}
+                fullscreen
+                isVisible={isWebViewOpen}
+                type={CONST.MODAL.MODAL_TYPE.CENTERED_UNSWIPEABLE}
+            >
+                <HeaderWithBackButton
+                    title={translate('workspace.accounting.title')}
+                    onBackButtonPress={() => setWebViewOpen(false)}
+                />
+                <FullPageOfflineBlockingView>
+                    <WebView
+                        ref={webViewRef}
+                        source={{
+                            uri: getXeroSetupLink(policyID),
+                            headers: {
+                                Cookie: `authToken=${authToken}`,
+                            },
+                        }}
+                        userAgent={getUAForWebView()}
+                        incognito
+                        startInLoadingState
+                        renderLoading={renderLoading}
+                    />
+                </FullPageOfflineBlockingView>
+            </Modal>
+        </>
+    );
+}
+
+ConnectToXeroFlow.displayName = 'ConnectToXeroFlow';
+
+export default withOnyx<ConnectToXeroFlowProps & ConnectToXeroFlowOnyxProps, ConnectToXeroFlowOnyxProps>({
+    session: {
+        key: ONYXKEYS.SESSION,
+    },
+})(ConnectToXeroFlow);
diff --git a/src/components/ConnectToXeroFlow/index.tsx b/src/components/ConnectToXeroFlow/index.tsx
new file mode 100644
index 000000000000..0a3403be78ec
--- /dev/null
+++ b/src/components/ConnectToXeroFlow/index.tsx
@@ -0,0 +1,50 @@
+import React, {useEffect, useState} from 'react';
+import {useOnyx} from 'react-native-onyx';
+import RequireTwoFactorAuthenticationModal from '@components/RequireTwoFactorAuthenticationModal';
+import useEnvironment from '@hooks/useEnvironment';
+import useLocalize from '@hooks/useLocalize';
+import {getXeroSetupLink} from '@libs/actions/connections/Xero';
+import Navigation from '@libs/Navigation/Navigation';
+import * as Link from '@userActions/Link';
+import ONYXKEYS from '@src/ONYXKEYS';
+import ROUTES from '@src/ROUTES';
+import type {ConnectToXeroFlowProps} from './types';
+
+function ConnectToXeroFlow({policyID}: ConnectToXeroFlowProps) {
+    const {translate} = useLocalize();
+    const {environmentURL} = useEnvironment();
+
+    const [account] = useOnyx(ONYXKEYS.ACCOUNT);
+    const is2FAEnabled = account?.requiresTwoFactorAuth;
+
+    const [isRequire2FAModalOpen, setIsRequire2FAModalOpen] = useState(false);
+
+    useEffect(() => {
+        if (!is2FAEnabled) {
+            setIsRequire2FAModalOpen(true);
+            return;
+        }
+        Link.openLink(getXeroSetupLink(policyID), environmentURL);
+        // eslint-disable-next-line react-compiler/react-compiler
+        // eslint-disable-next-line react-hooks/exhaustive-deps
+    }, []);
+
+    if (isRequire2FAModalOpen) {
+        return (
+            <RequireTwoFactorAuthenticationModal
+                onSubmit={() => {
+                    setIsRequire2FAModalOpen(false);
+                    Navigation.dismissModal();
+                    Navigation.navigate(ROUTES.SETTINGS_2FA.getRoute(ROUTES.POLICY_ACCOUNTING.getRoute(policyID), getXeroSetupLink(policyID)));
+                }}
+                onCancel={() => {
+                    setIsRequire2FAModalOpen(false);
+                }}
+                isVisible
+                description={translate('twoFactorAuth.twoFactorAuthIsRequiredDescription')}
+            />
+        );
+    }
+}
+
+export default ConnectToXeroFlow;
diff --git a/src/components/ConnectToXeroFlow/types.ts b/src/components/ConnectToXeroFlow/types.ts
new file mode 100644
index 000000000000..01f4bca61551
--- /dev/null
+++ b/src/components/ConnectToXeroFlow/types.ts
@@ -0,0 +1,10 @@
+import type {PolicyConnectionName} from '@src/types/onyx/Policy';
+
+type ConnectToXeroFlowProps = {
+    policyID: string;
+    shouldDisconnectIntegrationBeforeConnecting?: boolean;
+    integrationToDisconnect?: PolicyConnectionName;
+};
+
+// eslint-disable-next-line import/prefer-default-export
+export type {ConnectToXeroFlowProps};
diff --git a/src/components/ConnectionLayout.tsx b/src/components/ConnectionLayout.tsx
index b3f76aa21d47..3809b4f4f110 100644
--- a/src/components/ConnectionLayout.tsx
+++ b/src/components/ConnectionLayout.tsx
@@ -1,12 +1,15 @@
-import React from 'react';
+import {isEmpty} from 'lodash';
+import React, {useMemo} from 'react';
 import type {StyleProp, TextStyle, ViewStyle} from 'react-native';
+import {View} from 'react-native';
 import useLocalize from '@hooks/useLocalize';
 import useThemeStyles from '@hooks/useThemeStyles';
 import Navigation from '@libs/Navigation/Navigation';
-import type {PolicyAccessVariant} from '@pages/workspace/AccessOrNotFoundWrapper';
+import * as PolicyUtils from '@libs/PolicyUtils';
+import type {AccessVariant} from '@pages/workspace/AccessOrNotFoundWrapper';
 import AccessOrNotFoundWrapper from '@pages/workspace/AccessOrNotFoundWrapper';
 import type {TranslationPaths} from '@src/languages/types';
-import type {PolicyFeatureName} from '@src/types/onyx/Policy';
+import type {ConnectionName, PolicyFeatureName} from '@src/types/onyx/Policy';
 import HeaderWithBackButton from './HeaderWithBackButton';
 import ScreenWrapper from './ScreenWrapper';
 import ScrollView from './ScrollView';
@@ -16,23 +19,23 @@ type ConnectionLayoutProps = {
     /** Used to set the testID for tests */
     displayName: string;
 
-    /** Header title for the connection */
-    headerTitle: TranslationPaths;
+    /** Header title to be translated for the connection component */
+    headerTitle?: TranslationPaths;
+
+    /** The subtitle to show in the header */
+    headerSubtitle?: string;
 
     /** React nodes that will be shown */
     children?: React.ReactNode;
 
-    /** Title of the connection component */
+    /** Title to be translated for the connection component */
     title?: TranslationPaths;
 
-    /** Subtitle of the connection */
-    subtitle?: TranslationPaths;
-
     /** The current policyID */
     policyID: string;
 
     /** Defines which types of access should be verified */
-    accessVariants?: PolicyAccessVariant[];
+    accessVariants?: AccessVariant[];
 
     /** The current feature name that the user tries to get access to */
     featureName?: PolicyFeatureName;
@@ -43,46 +46,106 @@ type ConnectionLayoutProps = {
     /** Style of the title text */
     titleStyle?: StyleProp<TextStyle> | undefined;
 
-    /** Style of the subtitle text */
-    subTitleStyle?: StyleProp<TextStyle> | undefined;
+    /** Whether to include safe area padding bottom or not */
+    shouldIncludeSafeAreaPaddingBottom?: boolean;
+
+    /** Whether to use ScrollView or not */
+    shouldUseScrollView?: boolean;
+
+    /** Used for dynamic header title translation with parameters */
+    headerTitleAlreadyTranslated?: string;
+
+    /** Used for dynamic title translation with parameters */
+    titleAlreadyTranslated?: string;
+
+    /** Name of the current connection */
+    connectionName: ConnectionName;
+
+    /** Whether the screen should load for an empty connection */
+    shouldLoadForEmptyConnection?: boolean;
+
+    /** Handler for back button press */
+    onBackButtonPress?: () => void;
+
+    /** Whether or not to block user from accessing the page */
+    shouldBeBlocked?: boolean;
 };
 
+type ConnectionLayoutContentProps = Pick<ConnectionLayoutProps, 'title' | 'titleStyle' | 'children' | 'titleAlreadyTranslated'>;
+
+function ConnectionLayoutContent({title, titleStyle, children, titleAlreadyTranslated}: ConnectionLayoutContentProps) {
+    const {translate} = useLocalize();
+    const styles = useThemeStyles();
+    return (
+        <>
+            {title && <Text style={[styles.pb5, titleStyle]}>{titleAlreadyTranslated ?? translate(title)}</Text>}
+            {children}
+        </>
+    );
+}
+
 function ConnectionLayout({
     displayName,
     headerTitle,
     children,
     title,
-    subtitle,
+    headerSubtitle,
     policyID,
     accessVariants,
     featureName,
     contentContainerStyle,
     titleStyle,
-    subTitleStyle,
+    shouldIncludeSafeAreaPaddingBottom,
+    connectionName,
+    shouldUseScrollView = true,
+    headerTitleAlreadyTranslated,
+    titleAlreadyTranslated,
+    shouldLoadForEmptyConnection = false,
+    onBackButtonPress = () => Navigation.goBack(),
+    shouldBeBlocked = false,
 }: ConnectionLayoutProps) {
-    const styles = useThemeStyles();
     const {translate} = useLocalize();
 
+    const policy = PolicyUtils.getPolicy(policyID);
+    const isConnectionEmpty = isEmpty(policy?.connections?.[connectionName]);
+
+    const renderSelectionContent = useMemo(
+        () => (
+            <ConnectionLayoutContent
+                title={title}
+                titleStyle={titleStyle}
+                titleAlreadyTranslated={titleAlreadyTranslated}
+            >
+                {children}
+            </ConnectionLayoutContent>
+        ),
+        [title, titleStyle, children, titleAlreadyTranslated],
+    );
+
+    const shouldBlockByConnection = shouldLoadForEmptyConnection ? !isConnectionEmpty : isConnectionEmpty;
+
     return (
         <AccessOrNotFoundWrapper
             policyID={policyID}
             accessVariants={accessVariants}
             featureName={featureName}
+            shouldBeBlocked={!!shouldBeBlocked || shouldBlockByConnection}
         >
             <ScreenWrapper
-                includeSafeAreaPaddingBottom={false}
+                includeSafeAreaPaddingBottom={!!shouldIncludeSafeAreaPaddingBottom}
                 shouldEnableMaxHeight
                 testID={displayName}
             >
                 <HeaderWithBackButton
-                    title={translate(headerTitle)}
-                    onBackButtonPress={() => Navigation.goBack()}
+                    title={headerTitleAlreadyTranslated ?? (headerTitle ? translate(headerTitle) : '')}
+                    subtitle={headerSubtitle}
+                    onBackButtonPress={onBackButtonPress}
                 />
-                <ScrollView contentContainerStyle={contentContainerStyle}>
-                    {title && <Text style={[styles.pb5, titleStyle]}>{translate(title)}</Text>}
-                    {subtitle && <Text style={[styles.textLabelSupporting, subTitleStyle]}>{translate(subtitle)}</Text>}
-                    {children}
-                </ScrollView>
+                {shouldUseScrollView ? (
+                    <ScrollView contentContainerStyle={contentContainerStyle}>{renderSelectionContent}</ScrollView>
+                ) : (
+                    <View style={contentContainerStyle}>{renderSelectionContent}</View>
+                )}
             </ScreenWrapper>
         </AccessOrNotFoundWrapper>
     );
diff --git a/src/components/ContextMenuItem.tsx b/src/components/ContextMenuItem.tsx
index f252cc5b734f..fe7be45e1b57 100644
--- a/src/components/ContextMenuItem.tsx
+++ b/src/components/ContextMenuItem.tsx
@@ -52,6 +52,15 @@ type ContextMenuItemProps = {
 
     /** Handles what to do when the item is focused */
     onFocus?: () => void;
+
+    /** Handles what to do when the item loose focus */
+    onBlur?: () => void;
+
+    /** Whether the menu item is disabled or not */
+    disabled?: boolean;
+
+    /** Whether the menu item should show loading icon */
+    shouldShowLoadingSpinnerIcon?: boolean;
 };
 
 type ContextMenuItemHandle = {
@@ -74,6 +83,9 @@ function ContextMenuItem(
         shouldPreventDefaultFocusOnPress = true,
         buttonRef = {current: null},
         onFocus = () => {},
+        onBlur = () => {},
+        disabled = false,
+        shouldShowLoadingSpinnerIcon = false,
     }: ContextMenuItemProps,
     ref: ForwardedRef<ContextMenuItemHandle>,
 ) {
@@ -130,6 +142,9 @@ function ContextMenuItem(
             focused={isFocused}
             interactive={isThrottledButtonActive}
             onFocus={onFocus}
+            onBlur={onBlur}
+            disabled={disabled}
+            shouldShowLoadingSpinnerIcon={shouldShowLoadingSpinnerIcon}
         />
     );
 }
diff --git a/src/components/CountrySelector.tsx b/src/components/CountrySelector.tsx
index dc0201747da2..9ff04874c6da 100644
--- a/src/components/CountrySelector.tsx
+++ b/src/components/CountrySelector.tsx
@@ -1,19 +1,19 @@
 import {useIsFocused} from '@react-navigation/native';
 import React, {forwardRef, useEffect, useRef} from 'react';
 import type {ForwardedRef} from 'react';
-import {View} from 'react-native';
+import type {View} from 'react-native';
+import useGeographicalStateAndCountryFromRoute from '@hooks/useGeographicalStateAndCountryFromRoute';
 import useLocalize from '@hooks/useLocalize';
 import useThemeStyles from '@hooks/useThemeStyles';
-import type {MaybePhraseKey} from '@libs/Localize';
 import Navigation from '@libs/Navigation/Navigation';
+import CONST from '@src/CONST';
 import type {Country} from '@src/CONST';
 import ROUTES from '@src/ROUTES';
-import FormHelpMessage from './FormHelpMessage';
 import MenuItemWithTopDescription from './MenuItemWithTopDescription';
 
 type CountrySelectorProps = {
     /** Form error text. e.g when no country is selected */
-    errorText?: MaybePhraseKey;
+    errorText?: string;
 
     /** Callback called when the country changes. */
     onInputChange?: (value?: string) => void;
@@ -32,6 +32,7 @@ type CountrySelectorProps = {
 function CountrySelector({errorText = '', value: countryCode, onInputChange = () => {}, onBlur}: CountrySelectorProps, ref: ForwardedRef<View>) {
     const styles = useThemeStyles();
     const {translate} = useLocalize();
+    const {country: countryFromUrl} = useGeographicalStateAndCountryFromRoute();
 
     const title = countryCode ? translate(`allCountries.${countryCode}`) : '';
     const countryTitleDescStyle = title.length === 0 ? styles.textNormal : null;
@@ -39,37 +40,46 @@ function CountrySelector({errorText = '', value: countryCode, onInputChange = ()
     const didOpenContrySelector = useRef(false);
     const isFocused = useIsFocused();
     useEffect(() => {
-        if (!isFocused || !didOpenContrySelector.current) {
+        // Check if the country selector was opened and no value was selected, triggering onBlur to display an error
+        if (isFocused && didOpenContrySelector.current) {
+            didOpenContrySelector.current = false;
+            if (!countryFromUrl) {
+                onBlur?.();
+            }
+        }
+
+        // If no country is selected from the URL, exit the effect early to avoid further processing.
+        if (!countryFromUrl) {
             return;
         }
-        didOpenContrySelector.current = false;
-        onBlur?.();
-    }, [isFocused, onBlur]);
 
-    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]);
+        // If a country is selected, invoke `onInputChange` to update the form and clear any validation errors related to the country selection.
+        if (onInputChange) {
+            onInputChange(countryFromUrl);
+        }
+
+        // Clears the `country` parameter from the URL to ensure the component country is driven by the parent component rather than URL parameters.
+        // This helps prevent issues where the component might not update correctly if the country is controlled by both the parent and the URL.
+        Navigation.setParams({country: undefined});
+
+        // eslint-disable-next-line react-compiler/react-compiler, react-hooks/exhaustive-deps
+    }, [countryFromUrl, isFocused, onBlur]);
 
     return (
-        <View>
-            <MenuItemWithTopDescription
-                shouldShowRightIcon
-                title={title}
-                ref={ref}
-                descriptionTextStyle={countryTitleDescStyle}
-                description={translate('common.country')}
-                onPress={() => {
-                    const activeRoute = Navigation.getActiveRouteWithoutParams();
-                    didOpenContrySelector.current = true;
-                    Navigation.navigate(ROUTES.SETTINGS_ADDRESS_COUNTRY.getRoute(countryCode ?? '', activeRoute));
-                }}
-            />
-            <View style={styles.ml5}>
-                <FormHelpMessage message={errorText} />
-            </View>
-        </View>
+        <MenuItemWithTopDescription
+            shouldShowRightIcon
+            title={title}
+            ref={ref}
+            descriptionTextStyle={countryTitleDescStyle}
+            brickRoadIndicator={errorText ? CONST.BRICK_ROAD_INDICATOR_STATUS.ERROR : undefined}
+            description={translate('common.country')}
+            errorText={errorText}
+            onPress={() => {
+                const activeRoute = Navigation.getActiveRouteWithoutParams();
+                didOpenContrySelector.current = true;
+                Navigation.navigate(ROUTES.SETTINGS_ADDRESS_COUNTRY.getRoute(countryCode ?? '', activeRoute));
+            }}
+        />
     );
 }
 
diff --git a/src/components/CurrencySelectionList/index.tsx b/src/components/CurrencySelectionList/index.tsx
index 361d82140326..9cb0ba270aec 100644
--- a/src/components/CurrencySelectionList/index.tsx
+++ b/src/components/CurrencySelectionList/index.tsx
@@ -1,56 +1,64 @@
-import Str from 'expensify-common/lib/str';
+import {Str} from 'expensify-common';
 import React, {useMemo, useState} from 'react';
 import {withOnyx} from 'react-native-onyx';
 import SelectionList from '@components/SelectionList';
 import RadioListItem from '@components/SelectionList/RadioListItem';
+import SelectableListItem from '@components/SelectionList/SelectableListItem';
 import useLocalize from '@hooks/useLocalize';
 import * as CurrencyUtils from '@libs/CurrencyUtils';
 import ONYXKEYS from '@src/ONYXKEYS';
 import type {CurrencyListItem, CurrencySelectionListOnyxProps, CurrencySelectionListProps} from './types';
 
-function CurrencySelectionList({searchInputLabel, initiallySelectedCurrencyCode, onSelect, currencyList}: CurrencySelectionListProps) {
+function CurrencySelectionList({searchInputLabel, initiallySelectedCurrencyCode, onSelect, currencyList, selectedCurrencies = [], canSelectMultiple = false}: CurrencySelectionListProps) {
     const [searchValue, setSearchValue] = useState('');
     const {translate} = useLocalize();
 
     const {sections, headerMessage} = useMemo(() => {
-        const currencyOptions: CurrencyListItem[] = Object.entries(currencyList ?? {}).map(([currencyCode, currencyInfo]) => {
-            const isSelectedCurrency = currencyCode === initiallySelectedCurrencyCode;
-            return {
-                currencyName: currencyInfo?.name ?? '',
-                text: `${currencyCode} - ${CurrencyUtils.getCurrencySymbol(currencyCode)}`,
-                currencyCode,
-                keyForList: currencyCode,
-                isSelected: isSelectedCurrency,
-            };
-        });
+        const currencyOptions: CurrencyListItem[] = Object.entries(currencyList ?? {}).reduce((acc, [currencyCode, currencyInfo]) => {
+            const isSelectedCurrency = currencyCode === initiallySelectedCurrencyCode || selectedCurrencies.includes(currencyCode);
+            if (isSelectedCurrency || !currencyInfo?.retired) {
+                acc.push({
+                    currencyName: currencyInfo?.name ?? '',
+                    text: `${currencyCode} - ${CurrencyUtils.getCurrencySymbol(currencyCode)}`,
+                    currencyCode,
+                    keyForList: currencyCode,
+                    isSelected: isSelectedCurrency,
+                });
+            }
+            return acc;
+        }, [] as CurrencyListItem[]);
 
         const searchRegex = new RegExp(Str.escapeForRegExp(searchValue.trim()), 'i');
         const filteredCurrencies = currencyOptions.filter((currencyOption) => searchRegex.test(currencyOption.text ?? '') || searchRegex.test(currencyOption.currencyName));
         const isEmpty = searchValue.trim() && !filteredCurrencies.length;
 
+        let computedSections: Array<{data: CurrencyListItem[]}> = [];
+
+        if (!isEmpty) {
+            computedSections = canSelectMultiple
+                ? [{data: filteredCurrencies.filter((currency) => currency.isSelected)}, {data: filteredCurrencies.filter((currency) => !currency.isSelected)}]
+                : [{data: filteredCurrencies}];
+        }
+
         return {
-            sections: isEmpty
-                ? []
-                : [
-                      {
-                          data: filteredCurrencies,
-                      },
-                  ],
+            sections: computedSections,
             headerMessage: isEmpty ? translate('common.noResultsFound') : '',
         };
-    }, [currencyList, searchValue, translate, initiallySelectedCurrencyCode]);
+    }, [currencyList, searchValue, canSelectMultiple, translate, initiallySelectedCurrencyCode, selectedCurrencies]);
 
     return (
         <SelectionList
             sections={sections}
-            ListItem={RadioListItem}
+            ListItem={canSelectMultiple ? SelectableListItem : RadioListItem}
             textInputLabel={searchInputLabel}
             textInputValue={searchValue}
             onChangeText={setSearchValue}
             onSelectRow={onSelect}
+            shouldSingleExecuteRowSelect
             headerMessage={headerMessage}
             initiallyFocusedOptionKey={initiallySelectedCurrencyCode}
             showScrollIndicator
+            canSelectMultiple={canSelectMultiple}
         />
     );
 }
diff --git a/src/components/CurrencySelectionList/types.ts b/src/components/CurrencySelectionList/types.ts
index eb7cf72d4e1e..9bfc31e10886 100644
--- a/src/components/CurrencySelectionList/types.ts
+++ b/src/components/CurrencySelectionList/types.ts
@@ -21,6 +21,12 @@ type CurrencySelectionListProps = CurrencySelectionListOnyxProps & {
 
     /** Callback to fire when a currency is selected */
     onSelect: (item: CurrencyListItem) => void;
+
+    /** The array of selected currencies. This prop should be used when multiple currencies can be selected */
+    selectedCurrencies?: string[];
+
+    /** Whether this is a multi-select list */
+    canSelectMultiple?: boolean;
 };
 
 export type {CurrencyListItem, CurrencySelectionListProps, CurrencySelectionListOnyxProps};
diff --git a/src/components/CurrencySelector.tsx b/src/components/CurrencySelector.tsx
new file mode 100644
index 000000000000..173df982c749
--- /dev/null
+++ b/src/components/CurrencySelector.tsx
@@ -0,0 +1,78 @@
+import {useIsFocused} from '@react-navigation/native';
+import React, {forwardRef, useEffect, useRef} from 'react';
+import type {ForwardedRef} from 'react';
+import type {View} from 'react-native';
+import type {ValueOf} from 'type-fest';
+import useLocalize from '@hooks/useLocalize';
+import useThemeStyles from '@hooks/useThemeStyles';
+import Navigation from '@libs/Navigation/Navigation';
+import CONST from '@src/CONST';
+import ROUTES from '@src/ROUTES';
+import MenuItemWithTopDescription from './MenuItemWithTopDescription';
+
+type CurrencySelectorProps = {
+    /** Form error text. e.g when no currency is selected */
+    errorText?: string;
+
+    /** Callback called when the currency changes. */
+    onInputChange?: (value?: string) => void;
+
+    /** Current selected currency  */
+    value?: ValueOf<typeof CONST.CURRENCY>;
+
+    /** inputID used by the Form component */
+    // eslint-disable-next-line react/no-unused-prop-types
+    inputID: string;
+
+    /** Callback to call when the picker modal is dismissed */
+    onBlur?: () => void;
+
+    /** object to get route details from */
+    currencySelectorRoute?: typeof ROUTES.SETTINGS_SUBSCRIPTION_CHANGE_PAYMENT_CURRENCY | typeof ROUTES.SETTINGS_CHANGE_CURRENCY;
+};
+
+function CurrencySelector(
+    {errorText = '', value: currency, onInputChange = () => {}, onBlur, currencySelectorRoute = ROUTES.SETTINGS_CHANGE_CURRENCY}: CurrencySelectorProps,
+    ref: ForwardedRef<View>,
+) {
+    const styles = useThemeStyles();
+    const {translate} = useLocalize();
+
+    const currencyTitleDescStyle = currency ? styles.textNormal : null;
+
+    const didOpenCurrencySelector = useRef(false);
+    const isFocused = useIsFocused();
+    useEffect(() => {
+        if (!isFocused || !didOpenCurrencySelector.current) {
+            return;
+        }
+        didOpenCurrencySelector.current = false;
+        onBlur?.();
+    }, [isFocused, onBlur]);
+
+    useEffect(() => {
+        // This will cause the form to revalidate and remove any error related to currency
+        onInputChange(currency);
+        // eslint-disable-next-line react-compiler/react-compiler, react-hooks/exhaustive-deps
+    }, [currency]);
+
+    return (
+        <MenuItemWithTopDescription
+            shouldShowRightIcon
+            title={currency}
+            ref={ref}
+            descriptionTextStyle={currencyTitleDescStyle}
+            brickRoadIndicator={errorText ? CONST.BRICK_ROAD_INDICATOR_STATUS.ERROR : undefined}
+            description={translate('common.currency')}
+            errorText={errorText}
+            onPress={() => {
+                didOpenCurrencySelector.current = true;
+                Navigation.navigate(currencySelectorRoute);
+            }}
+        />
+    );
+}
+
+CurrencySelector.displayName = 'CurrencySelector';
+
+export default forwardRef(CurrencySelector);
diff --git a/src/components/CurrentUserPersonalDetailsSkeletonView/index.tsx b/src/components/CurrentUserPersonalDetailsSkeletonView/index.tsx
deleted file mode 100644
index 367e54e8be64..000000000000
--- a/src/components/CurrentUserPersonalDetailsSkeletonView/index.tsx
+++ /dev/null
@@ -1,67 +0,0 @@
-import React from 'react';
-import {View} from 'react-native';
-import {Circle, Rect} from 'react-native-svg';
-import type {ValueOf} from 'type-fest';
-import SkeletonViewContentLoader from '@components/SkeletonViewContentLoader';
-import useStyleUtils from '@hooks/useStyleUtils';
-import useTheme from '@hooks/useTheme';
-import useThemeStyles from '@hooks/useThemeStyles';
-import variables from '@styles/variables';
-import CONST from '@src/CONST';
-
-type CurrentUserPersonalDetailsSkeletonViewProps = {
-    /** Whether to animate the skeleton view */
-    shouldAnimate?: boolean;
-
-    /** The size of the avatar */
-    avatarSize?: ValueOf<typeof CONST.AVATAR_SIZE>;
-
-    /** Background color of the skeleton view */
-    backgroundColor?: string;
-
-    /** Foreground color of the skeleton view */
-    foregroundColor?: string;
-};
-
-function CurrentUserPersonalDetailsSkeletonView({shouldAnimate = true, avatarSize = CONST.AVATAR_SIZE.LARGE, backgroundColor, foregroundColor}: CurrentUserPersonalDetailsSkeletonViewProps) {
-    const theme = useTheme();
-    const styles = useThemeStyles();
-    const StyleUtils = useStyleUtils();
-    const avatarPlaceholderSize = StyleUtils.getAvatarSize(avatarSize);
-    const avatarPlaceholderRadius = avatarPlaceholderSize / 2;
-    const spaceBetweenAvatarAndHeadline = styles.mb3.marginBottom + styles.mt1.marginTop + (variables.lineHeightXXLarge - variables.fontSizeXLarge) / 2;
-    const headlineSize = variables.fontSizeXLarge;
-    const spaceBetweenHeadlineAndLabel = styles.mt1.marginTop + (variables.lineHeightXXLarge - variables.fontSizeXLarge) / 2;
-    const labelSize = variables.fontSizeLabel;
-    return (
-        <View style={styles.avatarSectionWrapperSkeleton}>
-            <SkeletonViewContentLoader
-                animate={shouldAnimate}
-                backgroundColor={backgroundColor ?? theme.highlightBG}
-                foregroundColor={foregroundColor ?? theme.border}
-                height={avatarPlaceholderSize + spaceBetweenAvatarAndHeadline + headlineSize + spaceBetweenHeadlineAndLabel + labelSize}
-            >
-                <Circle
-                    cx="50%"
-                    cy={avatarPlaceholderRadius}
-                    r={avatarPlaceholderRadius}
-                />
-                <Rect
-                    x="20%"
-                    y={avatarPlaceholderSize + spaceBetweenAvatarAndHeadline}
-                    width="60%"
-                    height={headlineSize}
-                />
-                <Rect
-                    x="15%"
-                    y={avatarPlaceholderSize + spaceBetweenAvatarAndHeadline + headlineSize + spaceBetweenHeadlineAndLabel}
-                    width="70%"
-                    height={labelSize}
-                />
-            </SkeletonViewContentLoader>
-        </View>
-    );
-}
-
-CurrentUserPersonalDetailsSkeletonView.displayName = 'CurrentUserPersonalDetailsSkeletonView';
-export default CurrentUserPersonalDetailsSkeletonView;
diff --git a/src/components/CustomStatusBarAndBackground/CustomStatusBarAndBackgroundContext.tsx b/src/components/CustomStatusBarAndBackground/CustomStatusBarAndBackgroundContext.tsx
index 58a116789bbe..b82fd55dc038 100644
--- a/src/components/CustomStatusBarAndBackground/CustomStatusBarAndBackgroundContext.tsx
+++ b/src/components/CustomStatusBarAndBackground/CustomStatusBarAndBackgroundContext.tsx
@@ -5,7 +5,7 @@ type CustomStatusBarAndBackgroundContextType = {
     setRootStatusBarEnabled: (isEnabled: boolean) => void;
 };
 
-// Signin page has its seperate Statusbar and ThemeProvider, so when user is on the SignInPage we need to disable the root statusbar so there is no double status bar in component stack, first in Root and other in SignInPage
+// Signin page has its separate Statusbar and ThemeProvider, so when user is on the SignInPage we need to disable the root statusbar so there is no double status bar in component stack, first in Root and other in SignInPage
 const CustomStatusBarAndBackgroundContext = createContext<CustomStatusBarAndBackgroundContextType>({isRootStatusBarEnabled: true, setRootStatusBarEnabled: () => undefined});
 
 export default CustomStatusBarAndBackgroundContext;
diff --git a/src/components/CustomStatusBarAndBackground/index.tsx b/src/components/CustomStatusBarAndBackground/index.tsx
index 524c8a3903e0..ec52f07d211c 100644
--- a/src/components/CustomStatusBarAndBackground/index.tsx
+++ b/src/components/CustomStatusBarAndBackground/index.tsx
@@ -39,8 +39,8 @@ function CustomStatusBarAndBackground({isNested = false}: CustomStatusBarAndBack
     const didForceUpdateStatusBarRef = useRef(false);
     const prevIsRootStatusBarEnabled = usePrevious(isRootStatusBarEnabled);
     // The prev and current status bar background color refs are initialized with the splash screen background color so the status bar color is changed from the splash screen color to the expected color atleast once on first render - https://github.com/Expensify/App/issues/34154
-    const prevStatusBarBackgroundColor = useRef(theme.splashBG);
-    const statusBarBackgroundColor = useRef(theme.splashBG);
+    const prevStatusBarBackgroundColor = useSharedValue(theme.splashBG);
+    const statusBarBackgroundColor = useSharedValue(theme.splashBG);
     const statusBarAnimation = useSharedValue(0);
 
     useAnimatedReaction(
@@ -51,7 +51,7 @@ function CustomStatusBarAndBackground({isNested = false}: CustomStatusBarAndBack
             if (previous === null || current === null || current <= previous) {
                 return;
             }
-            const backgroundColor = interpolateColor(statusBarAnimation.value, [0, 1], [prevStatusBarBackgroundColor.current, statusBarBackgroundColor.current]);
+            const backgroundColor = interpolateColor(statusBarAnimation.value, [0, 1], [prevStatusBarBackgroundColor.value, statusBarBackgroundColor.value]);
             runOnJS(updateStatusBarAppearance)({backgroundColor});
         },
     );
@@ -92,33 +92,52 @@ function CustomStatusBarAndBackground({isNested = false}: CustomStatusBarAndBack
                 currentScreenBackgroundColor = backgroundColorFromRoute || pageTheme.backgroundColor;
             }
 
-            prevStatusBarBackgroundColor.current = statusBarBackgroundColor.current;
-            statusBarBackgroundColor.current = currentScreenBackgroundColor;
+            prevStatusBarBackgroundColor.value = statusBarBackgroundColor.value;
+            statusBarBackgroundColor.value = currentScreenBackgroundColor;
 
-            if (currentScreenBackgroundColor !== theme.appBG || prevStatusBarBackgroundColor.current !== theme.appBG) {
+            const callUpdateStatusBarAppearance = () => {
+                updateStatusBarAppearance({statusBarStyle: newStatusBarStyle});
+                setStatusBarStyle(newStatusBarStyle);
+            };
+
+            const callUpdateStatusBarBackgroundColor = () => {
                 statusBarAnimation.value = 0;
                 statusBarAnimation.value = withDelay(300, withTiming(1));
-            }
+            };
 
             // Don't update the status bar style if it's the same as the current one, to prevent flashing.
             // Force update if the root status bar is back on active or it won't overwirte the nested status bar style
-            if ((!didForceUpdateStatusBarRef.current && !prevIsRootStatusBarEnabled && isRootStatusBarEnabled) || newStatusBarStyle !== statusBarStyle) {
-                updateStatusBarAppearance({statusBarStyle: newStatusBarStyle});
-                setStatusBarStyle(newStatusBarStyle);
+            if (!didForceUpdateStatusBarRef.current && !prevIsRootStatusBarEnabled && isRootStatusBarEnabled) {
+                callUpdateStatusBarAppearance();
+                callUpdateStatusBarBackgroundColor();
 
                 if (!prevIsRootStatusBarEnabled && isRootStatusBarEnabled) {
                     didForceUpdateStatusBarRef.current = true;
                 }
+                return;
+            }
+
+            if (newStatusBarStyle !== statusBarStyle) {
+                callUpdateStatusBarAppearance();
+            }
+
+            if (currentScreenBackgroundColor !== theme.appBG || prevStatusBarBackgroundColor.value !== theme.appBG) {
+                callUpdateStatusBarBackgroundColor();
             }
         },
-        [prevIsRootStatusBarEnabled, isRootStatusBarEnabled, statusBarAnimation, statusBarStyle, theme.PAGE_THEMES, theme.appBG, theme.statusBarStyle],
+        [
+            theme.statusBarStyle,
+            theme.appBG,
+            theme.PAGE_THEMES,
+            prevStatusBarBackgroundColor,
+            statusBarBackgroundColor,
+            prevIsRootStatusBarEnabled,
+            isRootStatusBarEnabled,
+            statusBarStyle,
+            statusBarAnimation,
+        ],
     );
 
-    useEffect(() => {
-        updateStatusBarAppearance({backgroundColor: theme.appBG});
-        // eslint-disable-next-line react-hooks/exhaustive-deps -- we only want this to run on first render
-    }, []);
-
     useEffect(() => {
         didForceUpdateStatusBarRef.current = false;
     }, [isRootStatusBarEnabled]);
diff --git a/src/components/CustomStylesForChildrenProvider.tsx b/src/components/CustomStylesForChildrenProvider.tsx
new file mode 100644
index 000000000000..6fc7efa81ed8
--- /dev/null
+++ b/src/components/CustomStylesForChildrenProvider.tsx
@@ -0,0 +1,21 @@
+import React, {useMemo} from 'react';
+import type {StyleProp, TextStyle, ViewStyle} from 'react-native';
+
+type CustomStylesForChildrenContextType = StyleProp<ViewStyle & TextStyle> | null;
+
+const CustomStylesForChildrenContext = React.createContext<CustomStylesForChildrenContextType>(null);
+
+type CustomStylesForChildrenProviderProps = React.PropsWithChildren & {
+    style: StyleProp<ViewStyle & TextStyle> | null;
+};
+
+function CustomStylesForChildrenProvider({children, style}: CustomStylesForChildrenProviderProps) {
+    const value = useMemo(() => style, [style]);
+
+    return <CustomStylesForChildrenContext.Provider value={value}>{children}</CustomStylesForChildrenContext.Provider>;
+}
+
+CustomStylesForChildrenProvider.displayName = 'CustomStylesForChildrenProvider';
+
+export default CustomStylesForChildrenProvider;
+export {CustomStylesForChildrenContext};
diff --git a/src/components/DatePicker/CalendarPicker/index.tsx b/src/components/DatePicker/CalendarPicker/index.tsx
index 1b290aacd30d..533586d4bdbf 100644
--- a/src/components/DatePicker/CalendarPicker/index.tsx
+++ b/src/components/DatePicker/CalendarPicker/index.tsx
@@ -1,5 +1,5 @@
 import {addMonths, endOfDay, endOfMonth, format, getYear, isSameDay, parseISO, setDate, setYear, startOfDay, startOfMonth, subMonths} from 'date-fns';
-import Str from 'expensify-common/lib/str';
+import {Str} from 'expensify-common';
 import React, {useState} from 'react';
 import {View} from 'react-native';
 import PressableWithFeedback from '@components/Pressable/PressableWithFeedback';
@@ -235,7 +235,7 @@ function CalendarPicker({
                                 style={themeStyles.calendarDayRoot}
                                 accessibilityLabel={day?.toString() ?? ''}
                                 tabIndex={day ? 0 : -1}
-                                accessible={Boolean(day)}
+                                accessible={!!day}
                                 dataSet={{[CONST.SELECTION_SCRAPER_HIDDEN_ELEMENT]: true}}
                             >
                                 {({hovered, pressed}) => (
diff --git a/src/components/DatePicker/index.tsx b/src/components/DatePicker/index.tsx
index 3ca60c8a6edb..eba54a58ae69 100644
--- a/src/components/DatePicker/index.tsx
+++ b/src/components/DatePicker/index.tsx
@@ -6,8 +6,8 @@ import * as Expensicons from '@components/Icon/Expensicons';
 import TextInput from '@components/TextInput';
 import type {BaseTextInputProps, BaseTextInputRef} from '@components/TextInput/BaseTextInput/types';
 import useLocalize from '@hooks/useLocalize';
+import useResponsiveLayout from '@hooks/useResponsiveLayout';
 import useThemeStyles from '@hooks/useThemeStyles';
-import useWindowDimensions from '@hooks/useWindowDimensions';
 import * as FormActions from '@userActions/FormActions';
 import CONST from '@src/CONST';
 import type {OnyxFormValuesMapping} from '@src/ONYXKEYS';
@@ -70,7 +70,7 @@ function DatePicker(
     const {translate} = useLocalize();
     // eslint-disable-next-line @typescript-eslint/prefer-nullish-coalescing
     const [selectedDate, setSelectedDate] = useState(value || defaultValue || undefined);
-    const {isSmallScreenWidth} = useWindowDimensions();
+    const {shouldUseNarrowLayout} = useResponsiveLayout();
 
     const onSelected = (newValue: string) => {
         onTouched?.();
@@ -93,7 +93,7 @@ function DatePicker(
 
     return (
         <View style={styles.datePickerRoot}>
-            <View style={[isSmallScreenWidth ? styles.flex2 : {}, styles.pointerEventsNone]}>
+            <View style={[shouldUseNarrowLayout ? styles.flex2 : {}, styles.pointerEventsNone]}>
                 <TextInput
                     ref={ref}
                     inputID={inputID}
diff --git a/src/components/DecisionModal.tsx b/src/components/DecisionModal.tsx
index fde188fc70f2..a9bd0b204d79 100644
--- a/src/components/DecisionModal.tsx
+++ b/src/components/DecisionModal.tsx
@@ -1,17 +1,11 @@
 import React from 'react';
 import {View} from 'react-native';
-import useLocalize from '@hooks/useLocalize';
-import useTheme from '@hooks/useTheme';
 import useThemeStyles from '@hooks/useThemeStyles';
 import CONST from '@src/CONST';
 import Button from './Button';
 import Header from './Header';
-import Icon from './Icon';
-import * as Expensicons from './Icon/Expensicons';
 import Modal from './Modal';
-import PressableWithoutFeedback from './Pressable/PressableWithoutFeedback';
 import Text from './Text';
-import Tooltip from './Tooltip';
 
 type DecisionModalProps = {
     /** Title describing purpose of modal */
@@ -27,7 +21,7 @@ type DecisionModalProps = {
     secondOptionText: string;
 
     /** onSubmit callback fired after clicking on first button */
-    onFirstOptionSubmit: () => void;
+    onFirstOptionSubmit?: () => void;
 
     /** onSubmit callback fired after clicking on second button */
     onSecondOptionSubmit: () => void;
@@ -43,8 +37,6 @@ type DecisionModalProps = {
 };
 
 function DecisionModal({title, prompt = '', firstOptionText, secondOptionText, onFirstOptionSubmit, onSecondOptionSubmit, isSmallScreenWidth, onClose, isVisible}: DecisionModalProps) {
-    const {translate} = useLocalize();
-    const theme = useTheme();
     const styles = useThemeStyles();
 
     return (
@@ -60,21 +52,7 @@ function DecisionModal({title, prompt = '', firstOptionText, secondOptionText, o
                             title={title}
                             containerStyles={[styles.alignItemsCenter]}
                         />
-                        <Tooltip text={translate('common.close')}>
-                            <PressableWithoutFeedback
-                                onPress={onClose}
-                                style={[styles.touchableButtonImage]}
-                                accessibilityRole={CONST.ACCESSIBILITY_ROLE.BUTTON}
-                                accessibilityLabel={translate('common.close')}
-                            >
-                                <Icon
-                                    src={Expensicons.Close}
-                                    fill={theme.icon}
-                                />
-                            </PressableWithoutFeedback>
-                        </Tooltip>
                     </View>
-
                     <Text>{prompt}</Text>
                 </View>
                 {firstOptionText && (
diff --git a/src/components/DeeplinkWrapper/index.website.tsx b/src/components/DeeplinkWrapper/index.website.tsx
index 765fbab03876..b395eb12c5fe 100644
--- a/src/components/DeeplinkWrapper/index.website.tsx
+++ b/src/components/DeeplinkWrapper/index.website.tsx
@@ -1,10 +1,11 @@
-import Str from 'expensify-common/lib/str';
+import {Str} from 'expensify-common';
 import {useEffect, useRef, useState} from 'react';
 import * as Browser from '@libs/Browser';
 import Navigation from '@libs/Navigation/Navigation';
 import navigationRef from '@libs/Navigation/navigationRef';
 import shouldPreventDeeplinkPrompt from '@libs/Navigation/shouldPreventDeeplinkPrompt';
 import * as App from '@userActions/App';
+import * as Link from '@userActions/Link';
 import * as Session from '@userActions/Session';
 import CONFIG from '@src/CONFIG';
 import CONST from '@src/CONST';
@@ -15,7 +16,7 @@ function isMacOSWeb(): boolean {
     return !Browser.isMobile() && typeof navigator === 'object' && typeof navigator.userAgent === 'string' && /Mac/i.test(navigator.userAgent) && !/Electron/i.test(navigator.userAgent);
 }
 
-function promptToOpenInDesktopApp() {
+function promptToOpenInDesktopApp(initialUrl = '') {
     // If the current url path is /transition..., meaning it was opened from oldDot, during this transition period:
     // 1. The user session may not exist, because sign-in has not been completed yet.
     // 2. There may be non-idempotent operations (e.g. create a new workspace), which obviously should not be executed again in the desktop app.
@@ -26,11 +27,11 @@ function promptToOpenInDesktopApp() {
         // Match any magic link (/v/<account id>/<6 digit code>)
         const isMagicLink = CONST.REGEX.ROUTES.VALIDATE_LOGIN.test(window.location.pathname);
 
-        App.beginDeepLinkRedirect(!isMagicLink);
+        App.beginDeepLinkRedirect(!isMagicLink, Link.getInternalNewExpensifyPath(initialUrl));
     }
 }
 
-function DeeplinkWrapper({children, isAuthenticated, autoAuthState}: DeeplinkWrapperProps) {
+function DeeplinkWrapper({children, isAuthenticated, autoAuthState, initialUrl}: DeeplinkWrapperProps) {
     const [currentScreen, setCurrentScreen] = useState<string | undefined>();
     const [hasShownPrompt, setHasShownPrompt] = useState(false);
     const removeListener = useRef<() => void>();
@@ -77,7 +78,7 @@ function DeeplinkWrapper({children, isAuthenticated, autoAuthState}: DeeplinkWra
         // Otherwise, we want to wait until the navigation state is set up
         // and we know the user is on a screen that supports deeplinks.
         if (isAuthenticated) {
-            promptToOpenInDesktopApp();
+            promptToOpenInDesktopApp(initialUrl);
             setHasShownPrompt(true);
         } else {
             // Navigation state is not set up yet, we're unsure if we should show the deep link prompt or not
@@ -93,7 +94,7 @@ function DeeplinkWrapper({children, isAuthenticated, autoAuthState}: DeeplinkWra
             promptToOpenInDesktopApp();
             setHasShownPrompt(true);
         }
-    }, [currentScreen, hasShownPrompt, isAuthenticated, autoAuthState]);
+    }, [currentScreen, hasShownPrompt, isAuthenticated, autoAuthState, initialUrl]);
 
     return children;
 }
diff --git a/src/components/DeeplinkWrapper/types.ts b/src/components/DeeplinkWrapper/types.ts
index db61e5b01c24..23e096d6a093 100644
--- a/src/components/DeeplinkWrapper/types.ts
+++ b/src/components/DeeplinkWrapper/types.ts
@@ -6,6 +6,8 @@ type DeeplinkWrapperProps = ChildrenProps & {
 
     /** The auto authentication status */
     autoAuthState?: string;
+
+    initialUrl?: string;
 };
 
 export default DeeplinkWrapperProps;
diff --git a/src/components/DisplayNames/DisplayNamesTooltipItem.tsx b/src/components/DisplayNames/DisplayNamesTooltipItem.tsx
index 430c00cf8804..b206d4bcf51d 100644
--- a/src/components/DisplayNames/DisplayNamesTooltipItem.tsx
+++ b/src/components/DisplayNames/DisplayNamesTooltipItem.tsx
@@ -64,7 +64,7 @@ function DisplayNamesTooltipItem({
                     if (!childRefs.current?.[index] || !el) {
                         return;
                     }
-                    // eslint-disable-next-line no-param-reassign
+                    // eslint-disable-next-line react-compiler/react-compiler, no-param-reassign
                     childRefs.current[index] = el;
                 }}
                 style={[textStyles, styles.pre]}
diff --git a/src/components/DisplayNames/DisplayNamesWithTooltip.tsx b/src/components/DisplayNames/DisplayNamesWithTooltip.tsx
index 91b8b0fc4483..0b0c3ddf27ca 100644
--- a/src/components/DisplayNames/DisplayNamesWithTooltip.tsx
+++ b/src/components/DisplayNames/DisplayNamesWithTooltip.tsx
@@ -74,7 +74,7 @@ function DisplayNamesWithToolTip({shouldUseFullTitle, fullTitle, displayNamesWit
                       </Fragment>
                   ))}
             {renderAdditionalText?.()}
-            {Boolean(isEllipsisActive) && (
+            {!!isEllipsisActive && (
                 <View style={styles.displayNameTooltipEllipsis}>
                     <Tooltip text={fullTitle}>
                         {/* There is some Gap for real ellipsis so we are adding 4 `.` to cover */}
diff --git a/src/components/DistanceMapView/index.android.tsx b/src/components/DistanceMapView/index.android.tsx
index 168a480c6100..930b08cad2d5 100644
--- a/src/components/DistanceMapView/index.android.tsx
+++ b/src/components/DistanceMapView/index.android.tsx
@@ -3,16 +3,21 @@ import {View} from 'react-native';
 import BlockingView from '@components/BlockingViews/BlockingView';
 import * as Expensicons from '@components/Icon/Expensicons';
 import MapView from '@components/MapView';
+import PendingMapView from '@components/MapView/PendingMapView';
 import useLocalize from '@hooks/useLocalize';
 import useNetwork from '@hooks/useNetwork';
+import useStyleUtils from '@hooks/useStyleUtils';
+import useTheme from '@hooks/useTheme';
 import useThemeStyles from '@hooks/useThemeStyles';
 import type DistanceMapViewProps from './types';
 
-function DistanceMapView({overlayStyle, ...rest}: DistanceMapViewProps) {
+function DistanceMapView({overlayStyle, requireRouteToDisplayMap, ...rest}: DistanceMapViewProps) {
     const styles = useThemeStyles();
     const [isMapReady, setIsMapReady] = useState(false);
     const {isOffline} = useNetwork();
     const {translate} = useLocalize();
+    const theme = useTheme();
+    const StyleUtils = useStyleUtils();
 
     return (
         <>
@@ -27,13 +32,22 @@ function DistanceMapView({overlayStyle, ...rest}: DistanceMapViewProps) {
                 }}
             />
             {!isMapReady && (
-                <View style={[styles.mapViewOverlay, overlayStyle]}>
-                    <BlockingView
-                        icon={Expensicons.EmptyStateRoutePending}
-                        title={translate('distance.mapPending.title')}
-                        subtitle={isOffline ? translate('distance.mapPending.subtitle') : translate('distance.mapPending.onlineSubtitle')}
-                        shouldShowLink={false}
-                    />
+                <View style={[styles.mapViewOverlay, overlayStyle, requireRouteToDisplayMap && StyleUtils.getBorderRadiusStyle(0)]}>
+                    {/* The "map pending" text should only be shown in the IOU create flow. In the created IOU preview, only the icon should be shown. */}
+                    {!requireRouteToDisplayMap ? (
+                        <BlockingView
+                            icon={Expensicons.EmptyStateRoutePending}
+                            title={translate('distance.mapPending.title')}
+                            subtitle={isOffline ? translate('distance.mapPending.subtitle') : translate('distance.mapPending.onlineSubtitle')}
+                            shouldShowLink={false}
+                            iconColor={theme.border}
+                        />
+                    ) : (
+                        <PendingMapView
+                            isSmallerIcon
+                            style={StyleUtils.getBorderRadiusStyle(0)}
+                        />
+                    )}
                 </View>
             )}
         </>
diff --git a/src/components/DistanceMapView/types.ts b/src/components/DistanceMapView/types.ts
index 18213235445f..1621870d70ed 100644
--- a/src/components/DistanceMapView/types.ts
+++ b/src/components/DistanceMapView/types.ts
@@ -3,6 +3,10 @@ import type {MapViewProps} from '@components/MapView/MapViewTypes';
 
 type DistanceMapViewProps = MapViewProps & {
     overlayStyle?: StyleProp<ViewStyle>;
+
+    /** Whether it should display the Mapbox map only when the route/coordinates exist otherwise
+     * it will display pending map icon */
+    requireRouteToDisplayMap?: boolean;
 };
 
 export default DistanceMapViewProps;
diff --git a/src/components/DistanceRequest/DistanceRequestFooter.tsx b/src/components/DistanceRequest/DistanceRequestFooter.tsx
index e21bdc1c9e56..43dd88f6e36c 100644
--- a/src/components/DistanceRequest/DistanceRequestFooter.tsx
+++ b/src/components/DistanceRequest/DistanceRequestFooter.tsx
@@ -43,7 +43,7 @@ function DistanceRequestFooter({waypoints, transaction, mapboxAccessToken, navig
     const {translate} = useLocalize();
 
     const numberOfWaypoints = Object.keys(waypoints ?? {}).length;
-    const numberOfFilledWaypoints = Object.values(waypoints ?? {}).filter((waypoint) => Object.keys(waypoint).length).length;
+    const numberOfFilledWaypoints = Object.values(waypoints ?? {}).filter((waypoint) => waypoint?.address).length;
     const lastWaypointIndex = numberOfWaypoints - 1;
 
     const getMarkerComponent = useCallback(
diff --git a/src/components/DotIndicatorMessage.tsx b/src/components/DotIndicatorMessage.tsx
index 3f72bbf429aa..564d2eeb8c75 100644
--- a/src/components/DotIndicatorMessage.tsx
+++ b/src/components/DotIndicatorMessage.tsx
@@ -7,7 +7,6 @@ import useTheme from '@hooks/useTheme';
 import useThemeStyles from '@hooks/useThemeStyles';
 import {isReceiptError} from '@libs/ErrorUtils';
 import fileDownload from '@libs/fileDownload';
-import type {MaybePhraseKey} from '@libs/Localize';
 import * as Localize from '@libs/Localize';
 import type {ReceiptError} from '@src/types/onyx/Transaction';
 import Icon from './Icon';
@@ -23,7 +22,7 @@ type DotIndicatorMessageProps = {
      *      timestamp: 'message',
      *  }
      */
-    messages: Record<string, Localize.MaybePhraseKey | ReceiptError>;
+    messages: Record<string, string | ReceiptError | null>;
 
     /** The type of message, 'error' shows a red dot, 'success' shows a green dot */
     type: 'error' | 'success';
@@ -45,12 +44,12 @@ function DotIndicatorMessage({messages = {}, style, type, textStyles}: DotIndica
     }
 
     // Fetch the keys, sort them, and map through each key to get the corresponding message
-    const sortedMessages: Array<MaybePhraseKey | ReceiptError> = Object.keys(messages)
+    const sortedMessages: Array<string | ReceiptError> = Object.keys(messages)
         .sort()
-        .map((key) => messages[key]);
-
+        .map((key) => messages[key])
+        .filter((message): message is string | ReceiptError => message !== null);
     // Removing duplicates using Set and transforming the result into an array
-    const uniqueMessages: Array<ReceiptError | string> = [...new Set(sortedMessages)].map((message) => (isReceiptError(message) ? message : Localize.translateIfPhraseKey(message)));
+    const uniqueMessages: Array<ReceiptError | string> = [...new Set(sortedMessages)].map((message) => message);
 
     const isErrorMessage = type === 'error';
 
diff --git a/src/components/DragAndDrop/NoDropZone/index.tsx b/src/components/DragAndDrop/NoDropZone/index.tsx
index 4760a16fd20b..3438bfff7c05 100644
--- a/src/components/DragAndDrop/NoDropZone/index.tsx
+++ b/src/components/DragAndDrop/NoDropZone/index.tsx
@@ -2,20 +2,22 @@ import React, {useRef} from 'react';
 import {View} from 'react-native';
 import useDragAndDrop from '@hooks/useDragAndDrop';
 import useThemeStyles from '@hooks/useThemeStyles';
+import htmlDivElementRef from '@src/types/utils/htmlDivElementRef';
+import viewRef from '@src/types/utils/viewRef';
 import type NoDropZoneProps from './types';
 
 function NoDropZone({children}: NoDropZoneProps) {
     const styles = useThemeStyles();
-    const noDropZone = useRef<View>(null);
+    const noDropZone = useRef<View | HTMLDivElement>(null);
 
     useDragAndDrop({
-        dropZone: noDropZone,
+        dropZone: htmlDivElementRef(noDropZone),
         shouldAllowDrop: false,
     });
 
     return (
         <View
-            ref={noDropZone}
+            ref={viewRef(noDropZone)}
             style={[styles.fullScreen]}
         >
             {children}
diff --git a/src/components/DragAndDrop/Provider/index.tsx b/src/components/DragAndDrop/Provider/index.tsx
index a5da9cc45a36..1011fa161312 100644
--- a/src/components/DragAndDrop/Provider/index.tsx
+++ b/src/components/DragAndDrop/Provider/index.tsx
@@ -1,9 +1,11 @@
 import {PortalHost} from '@gorhom/portal';
-import Str from 'expensify-common/lib/str';
+import {Str} from 'expensify-common';
 import React, {useCallback, useEffect, useMemo, useRef} from 'react';
 import {View} from 'react-native';
 import useDragAndDrop from '@hooks/useDragAndDrop';
 import useThemeStyles from '@hooks/useThemeStyles';
+import htmlDivElementRef from '@src/types/utils/htmlDivElementRef';
+import viewRef from '@src/types/utils/viewRef';
 import type {DragAndDropContextParams, DragAndDropProviderProps, SetOnDropHandlerCallback} from './types';
 
 const DragAndDropContext = React.createContext<DragAndDropContextParams>({});
@@ -14,7 +16,7 @@ function shouldAcceptDrop(event: DragEvent): boolean {
 
 function DragAndDropProvider({children, isDisabled = false, setIsDraggingOver = () => {}}: DragAndDropProviderProps) {
     const styles = useThemeStyles();
-    const dropZone = useRef<View>(null);
+    const dropZone = useRef<HTMLDivElement | View>(null);
     const dropZoneID = useRef(Str.guid('drag-n-drop'));
 
     const onDropHandler = useRef<SetOnDropHandlerCallback>(() => {});
@@ -23,7 +25,7 @@ function DragAndDropProvider({children, isDisabled = false, setIsDraggingOver =
     }, []);
 
     const {isDraggingOver} = useDragAndDrop({
-        dropZone,
+        dropZone: htmlDivElementRef(dropZone),
         onDrop: onDropHandler.current,
         shouldAcceptDrop,
         isDisabled,
@@ -38,7 +40,7 @@ function DragAndDropProvider({children, isDisabled = false, setIsDraggingOver =
     return (
         <DragAndDropContext.Provider value={contextValue}>
             <View
-                ref={dropZone}
+                ref={viewRef(dropZone)}
                 style={[styles.flex1, styles.w100, styles.h100]}
             >
                 {isDraggingOver && (
diff --git a/src/components/DraggableList/index.android.tsx b/src/components/DraggableList/index.android.tsx
new file mode 100644
index 000000000000..cc1a7b1910d4
--- /dev/null
+++ b/src/components/DraggableList/index.android.tsx
@@ -0,0 +1,27 @@
+import React from 'react';
+import {View} from 'react-native';
+import {NestableDraggableFlatList, NestableScrollContainer} from 'react-native-draggable-flatlist';
+import type {ScrollView} from 'react-native-gesture-handler';
+import useThemeStyles from '@hooks/useThemeStyles';
+import type {DraggableListProps} from './types';
+
+function DraggableList<T>({renderClone, shouldUsePortal, ListFooterComponent, ...viewProps}: DraggableListProps<T>, ref: React.ForwardedRef<ScrollView>) {
+    const styles = useThemeStyles();
+    return (
+        <NestableScrollContainer
+            ref={ref}
+            contentContainerStyle={styles.flexGrow1}
+        >
+            <NestableDraggableFlatList
+                contentContainerStyle={styles.flex1}
+                // eslint-disable-next-line react/jsx-props-no-spreading
+                {...viewProps}
+            />
+            {React.isValidElement(ListFooterComponent) && <View style={styles.flexGrow1}>{ListFooterComponent}</View>}
+        </NestableScrollContainer>
+    );
+}
+
+DraggableList.displayName = 'DraggableList';
+
+export default React.forwardRef(DraggableList);
diff --git a/src/components/DraggableList/index.native.tsx b/src/components/DraggableList/index.ios.tsx
similarity index 100%
rename from src/components/DraggableList/index.native.tsx
rename to src/components/DraggableList/index.ios.tsx
diff --git a/src/components/EReceipt.tsx b/src/components/EReceipt.tsx
index 40f5d242d005..bfb59dc748ab 100644
--- a/src/components/EReceipt.tsx
+++ b/src/components/EReceipt.tsx
@@ -36,13 +36,13 @@ function EReceipt({transaction, transactionID}: EReceiptProps) {
 
     const {
         amount: transactionAmount,
-        currency: transactionCurrency = '',
+        currency: transactionCurrency,
         merchant: transactionMerchant,
         created: transactionDate,
         cardID: transactionCardID,
     } = ReportUtils.getTransactionDetails(transaction, CONST.DATE.MONTH_DAY_YEAR_FORMAT) ?? {};
     const formattedAmount = CurrencyUtils.convertToDisplayString(transactionAmount, transactionCurrency);
-    const currency = CurrencyUtils.getCurrencySymbol(transactionCurrency);
+    const currency = CurrencyUtils.getCurrencySymbol(transactionCurrency ?? '');
     const amount = currency ? formattedAmount.replace(currency, '') : formattedAmount;
     const cardDescription = transactionCardID ? CardUtils.getCardDescription(transactionCardID) : '';
 
diff --git a/src/components/EReceiptThumbnail.tsx b/src/components/EReceiptThumbnail.tsx
index 63889f76e67c..8e0f589cc34d 100644
--- a/src/components/EReceiptThumbnail.tsx
+++ b/src/components/EReceiptThumbnail.tsx
@@ -5,6 +5,7 @@ import {withOnyx} from 'react-native-onyx';
 import useStyleUtils from '@hooks/useStyleUtils';
 import useThemeStyles from '@hooks/useThemeStyles';
 import * as ReportUtils from '@libs/ReportUtils';
+import * as TripReservationUtils from '@libs/TripReservationUtils';
 import colors from '@styles/theme/colors';
 import variables from '@styles/variables';
 import CONST from '@src/CONST';
@@ -21,7 +22,7 @@ type EReceiptThumbnailOnyxProps = {
     transaction: OnyxEntry<Transaction>;
 };
 
-type IconSize = 'small' | 'medium' | 'large';
+type IconSize = 'x-small' | 'small' | 'medium' | 'large';
 
 type EReceiptThumbnailProps = EReceiptThumbnailOnyxProps & {
     /** TransactionID of the transaction this EReceipt corresponds to. It's used by withOnyx HOC */
@@ -40,7 +41,7 @@ type EReceiptThumbnailProps = EReceiptThumbnailOnyxProps & {
     /** Center the eReceipt Icon vertically */
     centerIconV?: boolean;
 
-    /** Size of the eReceipt icon. Possible values 'small', 'medium' or 'large' */
+    /** Size of the eReceipt icon. Possible values 'x-small', 'small', 'medium' or 'large' */
     iconSize?: IconSize;
 };
 
@@ -66,14 +67,23 @@ function EReceiptThumbnail({transaction, borderRadius, fileExtension, isReceiptT
     const transactionDetails = ReportUtils.getTransactionDetails(transaction);
     const transactionMCCGroup = transactionDetails?.mccGroup;
     const MCCIcon = transactionMCCGroup ? MCCIcons[`${transactionMCCGroup}`] : undefined;
+    const tripIcon = TripReservationUtils.getTripEReceiptIcon(transaction);
 
     let receiptIconWidth: number = variables.eReceiptIconWidth;
     let receiptIconHeight: number = variables.eReceiptIconHeight;
     let receiptMCCSize: number = variables.eReceiptMCCHeightWidth;
     let labelFontSize: number = variables.fontSizeNormal;
     let labelLineHeight: number = variables.lineHeightLarge;
+    let backgroundImageMinWidth: number = variables.eReceiptBackgroundImageMinWidth;
 
-    if (iconSize === 'small') {
+    if (iconSize === 'x-small') {
+        receiptIconWidth = variables.eReceiptIconWidthXSmall;
+        receiptIconHeight = variables.eReceiptIconHeightXSmall;
+        receiptMCCSize = variables.iconSizeXSmall;
+        labelFontSize = variables.fontSizeExtraSmall;
+        labelLineHeight = variables.lineHeightXSmall;
+        backgroundImageMinWidth = variables.w80;
+    } else if (iconSize === 'small') {
         receiptIconWidth = variables.eReceiptIconWidthSmall;
         receiptIconHeight = variables.eReceiptIconHeightSmall;
         receiptMCCSize = variables.eReceiptMCCHeightWidthSmall;
@@ -100,7 +110,7 @@ function EReceiptThumbnail({transaction, borderRadius, fileExtension, isReceiptT
         >
             <Image
                 source={backgroundImage}
-                style={styles.eReceiptBackgroundThumbnail}
+                style={[styles.eReceiptBackgroundThumbnail, StyleUtils.getMinimumWidth(backgroundImageMinWidth)]}
                 resizeMode="cover"
             />
             <View style={[styles.alignItemsCenter, styles.ph8, styles.pt8, styles.pb8]}>
@@ -133,6 +143,14 @@ function EReceiptThumbnail({transaction, borderRadius, fileExtension, isReceiptT
                             fill={primaryColor}
                         />
                     ) : null}
+                    {!MCCIcon && tripIcon ? (
+                        <Icon
+                            src={tripIcon}
+                            height={receiptMCCSize}
+                            width={receiptMCCSize}
+                            fill={primaryColor}
+                        />
+                    ) : null}
                 </View>
             </View>
         </View>
diff --git a/src/components/EmojiPicker/EmojiPicker.tsx b/src/components/EmojiPicker/EmojiPicker.tsx
index 8c7b4df3264f..aa6c3e8dfdfb 100644
--- a/src/components/EmojiPicker/EmojiPicker.tsx
+++ b/src/components/EmojiPicker/EmojiPicker.tsx
@@ -1,17 +1,19 @@
 import React, {forwardRef, useCallback, useEffect, useImperativeHandle, useRef, useState} from 'react';
 import type {ForwardedRef, RefObject} from 'react';
-import {Dimensions} from 'react-native';
-import type {View} from 'react-native';
+import {Dimensions, View} from 'react-native';
 import type {Emoji} from '@assets/emojis/types';
+import FocusTrapForModal from '@components/FocusTrap/FocusTrapForModal';
 import PopoverWithMeasuredContent from '@components/PopoverWithMeasuredContent';
 import type {BaseTextInputRef} from '@components/TextInput/BaseTextInput/types';
 import withViewportOffsetTop from '@components/withViewportOffsetTop';
+import useResponsiveLayout from '@hooks/useResponsiveLayout';
 import useStyleUtils from '@hooks/useStyleUtils';
 import useThemeStyles from '@hooks/useThemeStyles';
 import useWindowDimensions from '@hooks/useWindowDimensions';
 import type {AnchorOrigin, EmojiPickerRef, EmojiPopoverAnchor, OnEmojiSelected, OnModalHideValue, OnWillShowPicker} from '@libs/actions/EmojiPickerAction';
 import * as Browser from '@libs/Browser';
 import calculateAnchorPosition from '@libs/calculateAnchorPosition';
+import * as Modal from '@userActions/Modal';
 import CONST from '@src/CONST';
 import EmojiPickerMenu from './EmojiPickerMenu';
 
@@ -39,11 +41,12 @@ function EmojiPicker({viewportOffsetTop}: EmojiPickerProps, ref: ForwardedRef<Em
         width: 0,
         height: 0,
     });
-    const onModalHide = useRef(() => {});
+    const onModalHide = useRef<OnModalHideValue>(() => {});
     const onEmojiSelected = useRef<OnEmojiSelected>(() => {});
     const activeEmoji = useRef<string | undefined>();
     const emojiSearchInput = useRef<BaseTextInputRef | null>();
-    const {isSmallScreenWidth, windowHeight} = useWindowDimensions();
+    const {windowHeight} = useWindowDimensions();
+    const {shouldUseNarrowLayout} = useResponsiveLayout();
 
     /**
      * Get the popover anchor ref
@@ -85,19 +88,23 @@ function EmojiPicker({viewportOffsetTop}: EmojiPickerProps, ref: ForwardedRef<Em
 
         const anchorOriginValue = anchorOrigin ?? DEFAULT_ANCHOR_ORIGIN;
 
+        // It's possible that the anchor is inside an active modal (e.g., add emoji reaction in report context menu).
+        // So, we need to get the anchor position first before closing the active modal which will also destroy the anchor.
         calculateAnchorPosition(emojiPopoverAnchor?.current, anchorOriginValue).then((value) => {
-            onWillShow?.();
-            setIsEmojiPickerVisible(true);
-            setEmojiPopoverAnchorPosition({
-                horizontal: value.horizontal,
-                vertical: value.vertical,
+            Modal.close(() => {
+                onWillShow?.();
+                setIsEmojiPickerVisible(true);
+                setEmojiPopoverAnchorPosition({
+                    horizontal: value.horizontal,
+                    vertical: value.vertical,
+                });
+                emojiAnchorDimension.current = {
+                    width: value.width,
+                    height: value.height,
+                };
+                setEmojiPopoverAnchorOrigin(anchorOriginValue);
+                setActiveID(id);
             });
-            emojiAnchorDimension.current = {
-                width: value.width,
-                height: value.height,
-            };
-            setEmojiPopoverAnchorOrigin(anchorOriginValue);
-            setActiveID(id);
         });
     };
 
@@ -105,14 +112,12 @@ function EmojiPicker({viewportOffsetTop}: EmojiPickerProps, ref: ForwardedRef<Em
      * Hide the emoji picker menu.
      */
     const hideEmojiPicker = (isNavigating?: boolean) => {
-        if (isNavigating) {
-            onModalHide.current = () => {};
-        }
         const currOnModalHide = onModalHide.current;
         onModalHide.current = () => {
             if (currOnModalHide) {
-                currOnModalHide();
+                currOnModalHide(!!isNavigating);
             }
+            // eslint-disable-next-line react-compiler/react-compiler
             emojiPopoverAnchorRef.current = null;
         };
         setIsEmojiPickerVisible(false);
@@ -160,7 +165,7 @@ function EmojiPicker({viewportOffsetTop}: EmojiPickerProps, ref: ForwardedRef<Em
             const emojiPopoverAnchor = getEmojiPopoverAnchor();
             if (!emojiPopoverAnchor?.current) {
                 // In small screen width, the window size change might be due to keyboard open/hide, we should avoid hide EmojiPicker in those cases
-                if (isEmojiPickerVisible && !isSmallScreenWidth) {
+                if (isEmojiPickerVisible && !shouldUseNarrowLayout) {
                     hideEmojiPicker();
                 }
                 return;
@@ -182,7 +187,7 @@ function EmojiPicker({viewportOffsetTop}: EmojiPickerProps, ref: ForwardedRef<Em
             }
             emojiPopoverDimensionListener.remove();
         };
-    }, [isEmojiPickerVisible, isSmallScreenWidth, emojiPopoverAnchorOrigin, getEmojiPopoverAnchor]);
+    }, [isEmojiPickerVisible, shouldUseNarrowLayout, emojiPopoverAnchorOrigin, getEmojiPopoverAnchor]);
 
     // There is no way to disable animations, and they are really laggy, because there are so many
     // emojis. The best alternative is to set it to 1ms so it just "pops" in and out
@@ -216,11 +221,15 @@ function EmojiPicker({viewportOffsetTop}: EmojiPickerProps, ref: ForwardedRef<Em
             shouldEnableNewFocusManagement
             restoreFocusType={CONST.MODAL.RESTORE_FOCUS_TYPE.DELETE}
         >
-            <EmojiPickerMenu
-                onEmojiSelected={selectEmoji}
-                activeEmoji={activeEmoji.current}
-                ref={(el) => (emojiSearchInput.current = el)}
-            />
+            <FocusTrapForModal active={isEmojiPickerVisible}>
+                <View>
+                    <EmojiPickerMenu
+                        onEmojiSelected={selectEmoji}
+                        activeEmoji={activeEmoji.current}
+                        ref={(el) => (emojiSearchInput.current = el)}
+                    />
+                </View>
+            </FocusTrapForModal>
         </PopoverWithMeasuredContent>
     );
 }
diff --git a/src/components/EmojiPicker/EmojiPickerMenu/BaseEmojiPickerMenu.tsx b/src/components/EmojiPicker/EmojiPickerMenu/BaseEmojiPickerMenu.tsx
index 8e1112e7844c..00e379b4471a 100644
--- a/src/components/EmojiPicker/EmojiPickerMenu/BaseEmojiPickerMenu.tsx
+++ b/src/components/EmojiPicker/EmojiPickerMenu/BaseEmojiPickerMenu.tsx
@@ -9,6 +9,7 @@ import CategoryShortcutBar from '@components/EmojiPicker/CategoryShortcutBar';
 import EmojiSkinToneList from '@components/EmojiPicker/EmojiSkinToneList';
 import Text from '@components/Text';
 import useLocalize from '@hooks/useLocalize';
+import useResponsiveLayout from '@hooks/useResponsiveLayout';
 import useThemeStyles from '@hooks/useThemeStyles';
 import useWindowDimensions from '@hooks/useWindowDimensions';
 import type {EmojiPickerList, EmojiPickerListItem, HeaderIndice} from '@libs/EmojiUtils';
@@ -83,11 +84,12 @@ function BaseEmojiPickerMenu(
     ref: ForwardedRef<FlashList<EmojiPickerListItem>>,
 ) {
     const styles = useThemeStyles();
-    const {windowWidth, isSmallScreenWidth} = useWindowDimensions();
+    const {windowWidth} = useWindowDimensions();
+    const {shouldUseNarrowLayout} = useResponsiveLayout();
 
     // Estimated list size should be a whole integer to avoid floating point precision errors
     // More info: https://github.com/Expensify/App/issues/34522
-    const listWidth = isSmallScreenWidth ? Math.floor(windowWidth) : CONST.EMOJI_PICKER_SIZE.WIDTH;
+    const listWidth = shouldUseNarrowLayout ? Math.floor(windowWidth) : CONST.EMOJI_PICKER_SIZE.WIDTH;
 
     const flattenListWrapperStyle = useMemo(() => StyleSheet.flatten(listWrapperStyle), [listWrapperStyle]);
 
diff --git a/src/components/EmojiPicker/EmojiPickerMenu/index.native.tsx b/src/components/EmojiPicker/EmojiPickerMenu/index.native.tsx
index 5b7dda1c7ab1..b5b4c2d7e71c 100644
--- a/src/components/EmojiPicker/EmojiPickerMenu/index.native.tsx
+++ b/src/components/EmojiPicker/EmojiPickerMenu/index.native.tsx
@@ -9,6 +9,7 @@ import Text from '@components/Text';
 import TextInput from '@components/TextInput';
 import type {BaseTextInputRef} from '@components/TextInput/BaseTextInput/types';
 import useLocalize from '@hooks/useLocalize';
+import useResponsiveLayout from '@hooks/useResponsiveLayout';
 import useSingleExecution from '@hooks/useSingleExecution';
 import useStyleUtils from '@hooks/useStyleUtils';
 import useThemeStyles from '@hooks/useThemeStyles';
@@ -23,7 +24,8 @@ import useEmojiPickerMenu from './useEmojiPickerMenu';
 // eslint-disable-next-line @typescript-eslint/no-unused-vars
 function EmojiPickerMenu({onEmojiSelected, activeEmoji}: EmojiPickerMenuProps, ref: ForwardedRef<BaseTextInputRef>) {
     const styles = useThemeStyles();
-    const {windowWidth, isSmallScreenWidth} = useWindowDimensions();
+    const {windowWidth} = useWindowDimensions();
+    const {shouldUseNarrowLayout} = useResponsiveLayout();
     const {translate} = useLocalize();
     const {singleExecution} = useSingleExecution();
     const {
@@ -114,7 +116,7 @@ function EmojiPickerMenu({onEmojiSelected, activeEmoji}: EmojiPickerMenuProps, r
     );
 
     return (
-        <View style={[styles.emojiPickerContainer, StyleUtils.getEmojiPickerStyle(isSmallScreenWidth)]}>
+        <View style={[styles.emojiPickerContainer, StyleUtils.getEmojiPickerStyle(shouldUseNarrowLayout)]}>
             <View style={[styles.ph4, styles.pb1, styles.pt2]}>
                 <TextInput
                     label={translate('common.search')}
diff --git a/src/components/EmojiPicker/EmojiPickerMenu/index.tsx b/src/components/EmojiPicker/EmojiPickerMenu/index.tsx
index b8c31a61ecbf..92c35d7c7685 100755
--- a/src/components/EmojiPicker/EmojiPickerMenu/index.tsx
+++ b/src/components/EmojiPicker/EmojiPickerMenu/index.tsx
@@ -7,9 +7,12 @@ import {scrollTo} from 'react-native-reanimated';
 import EmojiPickerMenuItem from '@components/EmojiPicker/EmojiPickerMenuItem';
 import Text from '@components/Text';
 import TextInput from '@components/TextInput';
+import isTextInputFocused from '@components/TextInput/BaseTextInput/isTextInputFocused';
 import type {BaseTextInputRef} from '@components/TextInput/BaseTextInput/types';
 import useArrowKeyFocusManager from '@hooks/useArrowKeyFocusManager';
+import useKeyboardShortcut from '@hooks/useKeyboardShortcut';
 import useLocalize from '@hooks/useLocalize';
+import useResponsiveLayout from '@hooks/useResponsiveLayout';
 import useSingleExecution from '@hooks/useSingleExecution';
 import useStyleUtils from '@hooks/useStyleUtils';
 import useThemeStyles from '@hooks/useThemeStyles';
@@ -30,7 +33,8 @@ const throttleTime = Browser.isMobile() ? 200 : 50;
 function EmojiPickerMenu({onEmojiSelected, activeEmoji}: EmojiPickerMenuProps, ref: ForwardedRef<BaseTextInputRef>) {
     const styles = useThemeStyles();
     const StyleUtils = useStyleUtils();
-    const {isSmallScreenWidth, windowWidth} = useWindowDimensions();
+    const {windowWidth} = useWindowDimensions();
+    const {shouldUseNarrowLayout} = useResponsiveLayout();
     const {translate} = useLocalize();
     const {singleExecution} = useSingleExecution();
     const {
@@ -84,7 +88,7 @@ function EmojiPickerMenu({onEmojiSelected, activeEmoji}: EmojiPickerMenuProps, r
             }
 
             // If the input is not focused and the new index is out of range, focus the input
-            if (newIndex < 0 && !searchInputRef.current?.isFocused() && shouldFocusInputOnScreenFocus) {
+            if (newIndex < 0 && !isTextInputFocused(searchInputRef) && shouldFocusInputOnScreenFocus) {
                 searchInputRef.current?.focus();
             }
         },
@@ -138,21 +142,7 @@ function EmojiPickerMenu({onEmojiSelected, activeEmoji}: EmojiPickerMenuProps, r
                 return;
             }
 
-            // Select the currently highlighted emoji if enter is pressed
             if (!isEnterWhileComposition(keyBoardEvent) && keyBoardEvent.key === CONST.KEYBOARD_SHORTCUTS.ENTER.shortcutKey) {
-                let indexToSelect = focusedIndex;
-                if (highlightFirstEmoji) {
-                    indexToSelect = 0;
-                }
-
-                const item = filteredEmojis[indexToSelect];
-                if (!item) {
-                    return;
-                }
-                if ('types' in item || 'name' in item) {
-                    const emoji = typeof preferredSkinTone === 'number' && item?.types?.[preferredSkinTone] ? item?.types?.[preferredSkinTone] : item.code;
-                    onEmojiSelected(emoji, item);
-                }
                 // On web, avoid this Enter default input action; otherwise, it will add a new line in the subsequently focused composer.
                 keyBoardEvent.preventDefault();
                 // On mWeb, avoid propagating this Enter keystroke to Pressable child component; otherwise, it will trigger the onEmojiSelected callback again.
@@ -163,16 +153,41 @@ function EmojiPickerMenu({onEmojiSelected, activeEmoji}: EmojiPickerMenuProps, r
             // Enable keyboard movement if tab or enter is pressed or if shift is pressed while the input
             // is not focused, so that the navigation and tab cycling can be done using the keyboard without
             // interfering with the input behaviour.
-            if (keyBoardEvent.key === 'Tab' || keyBoardEvent.key === 'Enter' || (keyBoardEvent.key === 'Shift' && searchInputRef.current && !searchInputRef.current.isFocused())) {
+            if (keyBoardEvent.key === 'Tab' || keyBoardEvent.key === 'Enter' || (keyBoardEvent.key === 'Shift' && searchInputRef.current && !isTextInputFocused(searchInputRef))) {
                 setIsUsingKeyboardMovement(true);
             }
 
             // We allow typing in the search box if any key is pressed apart from Arrow keys.
-            if (searchInputRef.current && !searchInputRef.current.isFocused() && ReportUtils.shouldAutoFocusOnKeyPress(keyBoardEvent)) {
+            if (searchInputRef.current && !isTextInputFocused(searchInputRef) && ReportUtils.shouldAutoFocusOnKeyPress(keyBoardEvent)) {
                 searchInputRef.current.focus();
             }
         },
-        [filteredEmojis, focusedIndex, highlightFirstEmoji, isFocused, onEmojiSelected, preferredSkinTone],
+        [isFocused],
+    );
+
+    useKeyboardShortcut(
+        CONST.KEYBOARD_SHORTCUTS.ENTER,
+        (keyBoardEvent) => {
+            if (!(keyBoardEvent instanceof KeyboardEvent) || isEnterWhileComposition(keyBoardEvent) || keyBoardEvent.key !== CONST.KEYBOARD_SHORTCUTS.ENTER.shortcutKey) {
+                return;
+            }
+
+            // Select the currently highlighted emoji if enter is pressed
+            let indexToSelect = focusedIndex;
+            if (highlightFirstEmoji) {
+                indexToSelect = 0;
+            }
+
+            const item = filteredEmojis[indexToSelect];
+            if (!item) {
+                return;
+            }
+            if ('types' in item || 'name' in item) {
+                const emoji = typeof preferredSkinTone === 'number' && item?.types?.[preferredSkinTone] ? item?.types?.[preferredSkinTone] : item.code;
+                onEmojiSelected(emoji, item);
+            }
+        },
+        {shouldPreventDefault: true, shouldStopPropagation: true},
     );
 
     /**
@@ -248,7 +263,7 @@ function EmojiPickerMenu({onEmojiSelected, activeEmoji}: EmojiPickerMenuProps, r
 
             if ('header' in item && item.header) {
                 return (
-                    <View style={[styles.emojiHeaderContainer, target === 'StickyHeader' ? styles.stickyHeaderEmoji(isSmallScreenWidth, windowWidth) : undefined]}>
+                    <View style={[styles.emojiHeaderContainer, target === 'StickyHeader' ? styles.stickyHeaderEmoji(shouldUseNarrowLayout, windowWidth) : undefined]}>
                         <Text style={styles.textLabelSupporting}>{translate(`emojiPicker.headers.${code}` as TranslationPaths)}</Text>
                     </View>
                 );
@@ -292,7 +307,7 @@ function EmojiPickerMenu({onEmojiSelected, activeEmoji}: EmojiPickerMenuProps, r
             highlightFirstEmoji,
             singleExecution,
             styles,
-            isSmallScreenWidth,
+            shouldUseNarrowLayout,
             windowWidth,
             translate,
             onEmojiSelected,
@@ -305,7 +320,7 @@ function EmojiPickerMenu({onEmojiSelected, activeEmoji}: EmojiPickerMenuProps, r
         <View
             style={[
                 styles.emojiPickerContainer,
-                StyleUtils.getEmojiPickerStyle(isSmallScreenWidth),
+                StyleUtils.getEmojiPickerStyle(shouldUseNarrowLayout),
                 // Disable pointer events so that onHover doesn't get triggered when the items move while we're scrolling
                 arePointerEventsDisabled ? styles.pointerEventsNone : styles.pointerEventsAuto,
             ]}
diff --git a/src/components/EmojiPicker/EmojiPickerMenu/useEmojiPickerMenu.ts b/src/components/EmojiPicker/EmojiPickerMenu/useEmojiPickerMenu.ts
index 7cbfc4f1e2bc..9b60d15b3833 100644
--- a/src/components/EmojiPicker/EmojiPickerMenu/useEmojiPickerMenu.ts
+++ b/src/components/EmojiPicker/EmojiPickerMenu/useEmojiPickerMenu.ts
@@ -12,7 +12,7 @@ import * as EmojiUtils from '@libs/EmojiUtils';
 const useEmojiPickerMenu = () => {
     const emojiListRef = useAnimatedRef<FlashList<EmojiUtils.EmojiPickerListItem>>();
     const frequentlyUsedEmojis = useFrequentlyUsedEmojis();
-    // eslint-disable-next-line react-hooks/exhaustive-deps
+    // eslint-disable-next-line react-compiler/react-compiler, react-hooks/exhaustive-deps
     const allEmojis = useMemo(() => EmojiUtils.mergeEmojisWithFrequentlyUsedEmojis(emojis), [frequentlyUsedEmojis]);
     const headerEmojis = useMemo(() => EmojiUtils.getHeaderEmojis(allEmojis), [allEmojis]);
     const headerRowIndices = useMemo(() => headerEmojis.map((headerEmoji) => headerEmoji.index), [headerEmojis]);
diff --git a/src/components/EmojiPicker/EmojiPickerMenuItem/index.native.tsx b/src/components/EmojiPicker/EmojiPickerMenuItem/index.native.tsx
index 1336654cdf2f..0a7adabe009f 100644
--- a/src/components/EmojiPicker/EmojiPickerMenuItem/index.native.tsx
+++ b/src/components/EmojiPicker/EmojiPickerMenuItem/index.native.tsx
@@ -1,4 +1,5 @@
 import React, {useEffect, useRef} from 'react';
+import type {View} from 'react-native';
 import PressableWithoutFeedback from '@components/Pressable/PressableWithoutFeedback';
 import Text from '@components/Text';
 import useStyleUtils from '@hooks/useStyleUtils';
@@ -18,7 +19,7 @@ function EmojiPickerMenuItem({
     isHighlighted = false,
     isUsingKeyboardMovement = false,
 }: EmojiPickerMenuItemProps) {
-    const ref = useRef<HTMLDivElement | null>(null);
+    const ref = useRef<View>(null);
     const StyleUtils = useStyleUtils();
     const themeStyles = useThemeStyles();
 
diff --git a/src/components/EmojiPicker/EmojiSkinToneList.tsx b/src/components/EmojiPicker/EmojiSkinToneList.tsx
index fb798f1c02c4..3a1832ac40a7 100644
--- a/src/components/EmojiPicker/EmojiSkinToneList.tsx
+++ b/src/components/EmojiPicker/EmojiSkinToneList.tsx
@@ -38,7 +38,7 @@ function EmojiSkinToneList() {
             return;
         }
         toggleIsSkinToneListVisible();
-        // eslint-disable-next-line react-hooks/exhaustive-deps -- only run when preferredSkinTone updates
+        // eslint-disable-next-line react-compiler/react-compiler, react-hooks/exhaustive-deps -- only run when preferredSkinTone updates
     }, [preferredSkinTone]);
 
     const currentSkinTone = getSkinToneEmojiFromIndex(preferredSkinTone);
diff --git a/src/components/EmojiSuggestions.tsx b/src/components/EmojiSuggestions.tsx
index 1c0306741048..a2996482be6a 100644
--- a/src/components/EmojiSuggestions.tsx
+++ b/src/components/EmojiSuggestions.tsx
@@ -7,10 +7,9 @@ import useThemeStyles from '@hooks/useThemeStyles';
 import * as EmojiUtils from '@libs/EmojiUtils';
 import getStyledTextArray from '@libs/GetStyledTextArray';
 import AutoCompleteSuggestions from './AutoCompleteSuggestions';
+import type {MeasureParentContainerAndCursorCallback} from './AutoCompleteSuggestions/types';
 import Text from './Text';
 
-type MeasureParentContainerCallback = (x: number, y: number, width: number) => void;
-
 type EmojiSuggestionsProps = {
     /** The index of the highlighted emoji */
     highlightedEmojiIndex?: number;
@@ -33,8 +32,11 @@ type EmojiSuggestionsProps = {
     /** Stores user's preferred skin tone */
     preferredSkinToneIndex: number;
 
-    /** Meaures the parent container's position and dimensions. */
-    measureParentContainer: (callback: MeasureParentContainerCallback) => void;
+    /** Measures the parent container's position and dimensions. Also add cursor coordinates */
+    measureParentContainerAndReportCursor: (callback: MeasureParentContainerAndCursorCallback) => void;
+
+    /** Reset the emoji suggestions */
+    resetSuggestions: () => void;
 };
 
 /**
@@ -42,7 +44,16 @@ type EmojiSuggestionsProps = {
  */
 const keyExtractor = (item: Emoji, index: number): string => `${item.name}+${index}}`;
 
-function EmojiSuggestions({emojis, onSelect, prefix, isEmojiPickerLarge, preferredSkinToneIndex, highlightedEmojiIndex = 0, measureParentContainer = () => {}}: EmojiSuggestionsProps) {
+function EmojiSuggestions({
+    emojis,
+    onSelect,
+    prefix,
+    isEmojiPickerLarge,
+    preferredSkinToneIndex,
+    highlightedEmojiIndex = 0,
+    measureParentContainerAndReportCursor = () => {},
+    resetSuggestions,
+}: EmojiSuggestionsProps) {
     const styles = useThemeStyles();
     const StyleUtils = useStyleUtils();
     /**
@@ -85,7 +96,8 @@ function EmojiSuggestions({emojis, onSelect, prefix, isEmojiPickerLarge, preferr
             onSelect={onSelect}
             isSuggestionPickerLarge={isEmojiPickerLarge}
             accessibilityLabelExtractor={keyExtractor}
-            measureParentContainer={measureParentContainer}
+            measureParentContainerAndReportCursor={measureParentContainerAndReportCursor}
+            resetSuggestions={resetSuggestions}
         />
     );
 }
diff --git a/src/components/EmptySelectionListContent.tsx b/src/components/EmptySelectionListContent.tsx
new file mode 100644
index 000000000000..a5ac2c84eb2b
--- /dev/null
+++ b/src/components/EmptySelectionListContent.tsx
@@ -0,0 +1,58 @@
+import React from 'react';
+import {View} from 'react-native';
+import type {TupleToUnion} from 'type-fest';
+import useLocalize from '@hooks/useLocalize';
+import useThemeStyles from '@hooks/useThemeStyles';
+import variables from '@styles/variables';
+import CONST from '@src/CONST';
+import BlockingView from './BlockingViews/BlockingView';
+import * as Illustrations from './Icon/Illustrations';
+import Text from './Text';
+import TextLink from './TextLink';
+
+type EmptySelectionListContentProps = {
+    /** Type of selection list */
+    contentType: string;
+};
+
+const CONTENT_TYPES = [CONST.IOU.TYPE.SUBMIT, CONST.IOU.TYPE.SPLIT, CONST.IOU.TYPE.PAY];
+type ContentType = TupleToUnion<typeof CONTENT_TYPES>;
+
+function isContentType(contentType: unknown): contentType is ContentType {
+    return CONTENT_TYPES.includes(contentType as ContentType);
+}
+
+function EmptySelectionListContent({contentType}: EmptySelectionListContentProps) {
+    const styles = useThemeStyles();
+    const {translate} = useLocalize();
+
+    if (!isContentType(contentType)) {
+        return null;
+    }
+
+    const EmptySubtitle = (
+        <Text style={[styles.textAlignCenter]}>
+            {translate(`emptyList.${contentType}.subtitleText1`)}
+            <TextLink href={CONST.REFERRAL_PROGRAM.LEARN_MORE_LINK}>{translate(`emptyList.${contentType}.subtitleText2`)}</TextLink>
+            {translate(`emptyList.${contentType}.subtitleText3`)}
+        </Text>
+    );
+
+    return (
+        <View style={[styles.flex1, styles.overflowHidden, styles.minHeight65]}>
+            <BlockingView
+                icon={Illustrations.ToddWithPhones}
+                iconWidth={variables.emptySelectionListIconWidth}
+                iconHeight={variables.emptySelectionListIconHeight}
+                title={translate(`emptyList.${contentType}.title`)}
+                shouldShowLink={false}
+                CustomSubtitle={EmptySubtitle}
+                containerStyle={[styles.mb8, styles.ph15]}
+            />
+        </View>
+    );
+}
+
+EmptySelectionListContent.displayName = 'EmptySelectionListContent';
+
+export default EmptySelectionListContent;
diff --git a/src/components/EmptyStateComponent/index.tsx b/src/components/EmptyStateComponent/index.tsx
new file mode 100644
index 000000000000..6fcee2290d2b
--- /dev/null
+++ b/src/components/EmptyStateComponent/index.tsx
@@ -0,0 +1,110 @@
+import type {VideoReadyForDisplayEvent} from 'expo-av';
+import React, {useMemo, useState} from 'react';
+import {View} from 'react-native';
+import Button from '@components/Button';
+import ImageSVG from '@components/ImageSVG';
+import Lottie from '@components/Lottie';
+import ScrollView from '@components/ScrollView';
+import Text from '@components/Text';
+import VideoPlayer from '@components/VideoPlayer';
+import useThemeStyles from '@hooks/useThemeStyles';
+import CONST from '@src/CONST';
+import type {EmptyStateComponentProps, VideoLoadedEventType} from './types';
+
+const VIDEO_ASPECT_RATIO = 400 / 225;
+
+function EmptyStateComponent({
+    SkeletonComponent,
+    headerMediaType,
+    headerMedia,
+    buttonText,
+    buttonAction,
+    title,
+    subtitle,
+    headerStyles,
+    headerContentStyles,
+    minModalHeight = 400,
+}: EmptyStateComponentProps) {
+    const styles = useThemeStyles();
+    const [videoAspectRatio, setVideoAspectRatio] = useState(VIDEO_ASPECT_RATIO);
+
+    const setAspectRatio = (event: VideoReadyForDisplayEvent | VideoLoadedEventType | undefined) => {
+        if (!event) {
+            return;
+        }
+
+        if ('naturalSize' in event) {
+            setVideoAspectRatio(event.naturalSize.width / event.naturalSize.height);
+        } else {
+            setVideoAspectRatio(event.srcElement.videoWidth / event.srcElement.videoHeight);
+        }
+    };
+
+    const HeaderComponent = useMemo(() => {
+        switch (headerMediaType) {
+            case CONST.EMPTY_STATE_MEDIA.VIDEO:
+                return (
+                    <VideoPlayer
+                        url={headerMedia}
+                        videoPlayerStyle={[headerContentStyles, {aspectRatio: videoAspectRatio}]}
+                        videoStyle={styles.emptyStateVideo}
+                        onVideoLoaded={setAspectRatio}
+                        controlsStatus={CONST.VIDEO_PLAYER.CONTROLS_STATUS.SHOW}
+                        shouldUseControlsBottomMargin={false}
+                        shouldPlay
+                        isLooping
+                    />
+                );
+            case CONST.EMPTY_STATE_MEDIA.ANIMATION:
+                return (
+                    <Lottie
+                        source={headerMedia}
+                        autoPlay
+                        loop
+                        style={headerContentStyles}
+                    />
+                );
+            case CONST.EMPTY_STATE_MEDIA.ILLUSTRATION:
+                return (
+                    <ImageSVG
+                        style={headerContentStyles}
+                        src={headerMedia}
+                    />
+                );
+            default:
+                return null;
+        }
+    }, [headerMedia, headerMediaType, headerContentStyles, videoAspectRatio, styles.emptyStateVideo]);
+
+    return (
+        <ScrollView contentContainerStyle={[styles.emptyStateScrollView, {minHeight: minModalHeight}]}>
+            <View style={styles.skeletonBackground}>
+                <SkeletonComponent
+                    gradientOpacityEnabled
+                    shouldAnimate={false}
+                />
+            </View>
+            <View style={styles.emptyStateForeground}>
+                <View style={styles.emptyStateContent}>
+                    <View style={[styles.emptyStateHeader(headerMediaType === CONST.EMPTY_STATE_MEDIA.ILLUSTRATION), headerStyles]}>{HeaderComponent}</View>
+                    <View style={styles.p8}>
+                        <Text style={[styles.textAlignCenter, styles.textHeadlineH1, styles.mb2]}>{title}</Text>
+                        <Text style={[styles.textAlignCenter, styles.textSupporting, styles.textNormal]}>{subtitle}</Text>
+                        {!!buttonText && !!buttonAction && (
+                            <Button
+                                success
+                                onPress={buttonAction}
+                                text={buttonText}
+                                style={[styles.mt5]}
+                                large
+                            />
+                        )}
+                    </View>
+                </View>
+            </View>
+        </ScrollView>
+    );
+}
+
+EmptyStateComponent.displayName = 'EmptyStateComponent';
+export default EmptyStateComponent;
diff --git a/src/components/EmptyStateComponent/types.ts b/src/components/EmptyStateComponent/types.ts
new file mode 100644
index 000000000000..80fac980864f
--- /dev/null
+++ b/src/components/EmptyStateComponent/types.ts
@@ -0,0 +1,42 @@
+import type {ImageStyle} from 'expo-image';
+import type {StyleProp, ViewStyle} from 'react-native';
+import type {ValueOf} from 'type-fest';
+import type DotLottieAnimation from '@components/LottieAnimations/types';
+import type SearchRowSkeleton from '@components/Skeletons/SearchRowSkeleton';
+import type TableRowSkeleton from '@components/Skeletons/TableRowSkeleton';
+import type CONST from '@src/CONST';
+import type IconAsset from '@src/types/utils/IconAsset';
+
+type ValidSkeletons = typeof SearchRowSkeleton | typeof TableRowSkeleton;
+type MediaTypes = ValueOf<typeof CONST.EMPTY_STATE_MEDIA>;
+
+type SharedProps<T> = {
+    SkeletonComponent: ValidSkeletons;
+    title: string;
+    subtitle: string;
+    buttonText?: string;
+    buttonAction?: () => void;
+    headerStyles?: StyleProp<ViewStyle>;
+    headerMediaType: T;
+    headerContentStyles?: StyleProp<ViewStyle & ImageStyle>;
+    minModalHeight?: number;
+};
+
+type MediaType<HeaderMedia, T extends MediaTypes> = SharedProps<T> & {
+    headerMedia: HeaderMedia;
+};
+
+type VideoProps = MediaType<string, 'video'>;
+type IllustrationProps = MediaType<IconAsset, 'illustration'>;
+type AnimationProps = MediaType<DotLottieAnimation, 'animation'>;
+
+type EmptyStateComponentProps = VideoProps | IllustrationProps | AnimationProps;
+
+type VideoLoadedEventType = {
+    srcElement: {
+        videoWidth: number;
+        videoHeight: number;
+    };
+};
+
+export type {EmptyStateComponentProps, VideoLoadedEventType};
diff --git a/src/components/EnvironmentBadge.tsx b/src/components/EnvironmentBadge.tsx
index 5122b7f461b0..272aad734eec 100644
--- a/src/components/EnvironmentBadge.tsx
+++ b/src/components/EnvironmentBadge.tsx
@@ -38,7 +38,7 @@ function EnvironmentBadge() {
             error={error}
             text={text}
             badgeStyles={[styles.alignSelfStart, styles.headerEnvBadge, styles.environmentBadge, badgeEnviromentStyle]}
-            textStyles={[styles.headerEnvBadgeText, {fontWeight: '700'}]}
+            textStyles={styles.headerEnvBadgeText}
             environment={environment}
             pressable
         />
diff --git a/src/components/ErrorBoundary/index.tsx b/src/components/ErrorBoundary/index.tsx
index 890cf5f4e587..6787adeed44d 100644
--- a/src/components/ErrorBoundary/index.tsx
+++ b/src/components/ErrorBoundary/index.tsx
@@ -1,4 +1,4 @@
-import React from 'react';
+import React, {useEffect} from 'react';
 import Log from '@libs//Log';
 import BaseErrorBoundary from './BaseErrorBoundary';
 import type {BaseErrorBoundaryProps, LogError} from './types';
@@ -8,7 +8,26 @@ const logError: LogError = (errorMessage, error, errorInfo) => {
     Log.alert(`${errorMessage} - ${error.message}`, {errorInfo}, false);
 };
 
+const onUnhandledRejection = (event: PromiseRejectionEvent) => {
+    let rejection: unknown = event.reason;
+    if (event.reason instanceof Error) {
+        Log.alert(`Unhandled Promise Rejection: ${event.reason.message}\nStack: ${event.reason.stack}`, {}, false);
+        return;
+    }
+
+    if (typeof event.reason === 'object' && event.reason !== null) {
+        rejection = JSON.stringify(event.reason);
+    }
+    Log.alert(`Unhandled Promise Rejection: ${String(rejection)}`, {}, false);
+};
+
 function ErrorBoundary({errorMessage, children}: Omit<BaseErrorBoundaryProps, 'logError'>) {
+    // Log unhandled promise rejections to the server
+    useEffect(() => {
+        window.addEventListener('unhandledrejection', onUnhandledRejection);
+        return () => window.removeEventListener('unhandledrejection', onUnhandledRejection);
+    }, []);
+
     return (
         <BaseErrorBoundary
             errorMessage={errorMessage}
diff --git a/src/components/ErrorMessageRow.tsx b/src/components/ErrorMessageRow.tsx
new file mode 100644
index 000000000000..2e6e41449274
--- /dev/null
+++ b/src/components/ErrorMessageRow.tsx
@@ -0,0 +1,43 @@
+import {mapValues} from 'lodash';
+import React from 'react';
+import type {StyleProp, ViewStyle} from 'react-native';
+import type * as OnyxCommon from '@src/types/onyx/OnyxCommon';
+import type {ReceiptError, ReceiptErrors} from '@src/types/onyx/Transaction';
+import {isEmptyObject} from '@src/types/utils/EmptyObject';
+import MessagesRow from './MessagesRow';
+
+type ErrorMessageRowProps = {
+    /** The errors to display  */
+    errors?: OnyxCommon.Errors | ReceiptErrors | null;
+
+    /** Additional style object for the error row */
+    errorRowStyles?: StyleProp<ViewStyle>;
+
+    /** A function to run when the X button next to the error is clicked */
+    onClose?: () => void;
+
+    /** Whether we can dismiss the error message */
+    canDismissError?: boolean;
+};
+
+function ErrorMessageRow({errors, errorRowStyles, onClose, canDismissError = true}: ErrorMessageRowProps) {
+    // Some errors have a null message. This is used to apply opacity only and to avoid showing redundant messages.
+    const errorEntries = Object.entries(errors ?? {});
+    const filteredErrorEntries = errorEntries.filter((errorEntry): errorEntry is [string, string | ReceiptError] => errorEntry[1] !== null);
+    const errorMessages = mapValues(Object.fromEntries(filteredErrorEntries), (error) => error);
+    const hasErrorMessages = !isEmptyObject(errorMessages);
+
+    return hasErrorMessages ? (
+        <MessagesRow
+            messages={errorMessages}
+            type="error"
+            onClose={onClose}
+            containerStyles={errorRowStyles}
+            canDismiss={canDismissError}
+        />
+    ) : null;
+}
+
+ErrorMessageRow.displayName = 'ErrorMessageRow';
+
+export default ErrorMessageRow;
diff --git a/src/components/ExplanationModal.tsx b/src/components/ExplanationModal.tsx
new file mode 100644
index 000000000000..c6294f600993
--- /dev/null
+++ b/src/components/ExplanationModal.tsx
@@ -0,0 +1,41 @@
+import React, {useCallback} from 'react';
+import useLocalize from '@hooks/useLocalize';
+import Navigation from '@libs/Navigation/Navigation';
+import variables from '@styles/variables';
+import * as Welcome from '@userActions/Welcome';
+import CONST from '@src/CONST';
+import ROUTES from '@src/ROUTES';
+import FeatureTrainingModal from './FeatureTrainingModal';
+
+function ExplanationModal() {
+    const {translate} = useLocalize();
+
+    const onClose = useCallback(() => {
+        Welcome.completeHybridAppOnboarding();
+
+        // We need to check if standard NewDot onboarding is completed.
+        Welcome.isOnboardingFlowCompleted({
+            onNotCompleted: () => {
+                setTimeout(() => {
+                    Navigation.isNavigationReady().then(() => {
+                        Navigation.navigate(ROUTES.ONBOARDING_ROOT.route);
+                    });
+                }, variables.welcomeVideoDelay);
+            },
+        });
+    }, []);
+
+    return (
+        <FeatureTrainingModal
+            title={translate('onboarding.explanationModal.title')}
+            description={translate('onboarding.explanationModal.description')}
+            secondaryDescription={translate('onboarding.explanationModal.secondaryDescription')}
+            confirmText={translate('footer.getStarted')}
+            videoURL={CONST.WELCOME_VIDEO_URL}
+            onClose={onClose}
+        />
+    );
+}
+
+ExplanationModal.displayName = 'ExplanationModal';
+export default ExplanationModal;
diff --git a/src/components/FeatureList.tsx b/src/components/FeatureList.tsx
index 5e4ab89cf150..88dfed67d0c6 100644
--- a/src/components/FeatureList.tsx
+++ b/src/components/FeatureList.tsx
@@ -7,6 +7,7 @@ import variables from '@styles/variables';
 import type {TranslationPaths} from '@src/languages/types';
 import type IconAsset from '@src/types/utils/IconAsset';
 import Button from './Button';
+import DotIndicatorMessage from './DotIndicatorMessage';
 import type DotLottieAnimation from './LottieAnimations/types';
 import MenuItem from './MenuItem';
 import Section from './Section';
@@ -32,11 +33,20 @@ type FeatureListProps = {
     /** Action to call on cta button press */
     onCtaPress?: () => void;
 
+    /** Text of the secondary button button */
+    secondaryButtonText?: string;
+
+    /** Accessibility label for the secondary button */
+    secondaryButtonAccessibilityLabel?: string;
+
+    /** Action to call on secondary button press */
+    onSecondaryButtonPress?: () => void;
+
     /** A list of menuItems representing the feature list. */
     menuItems: FeatureListItem[];
 
-    /** The illustration to display in the header. Can be a JSON object representing a Lottie animation. */
-    illustration: DotLottieAnimation;
+    /** The illustration to display in the header. Can be an image or a JSON object representing a Lottie animation. */
+    illustration: DotLottieAnimation | IconAsset;
 
     /** The style passed to the illustration */
     illustrationStyle?: StyleProp<ViewStyle>;
@@ -47,6 +57,9 @@ type FeatureListProps = {
     /** The style used for the title */
     titleStyles?: StyleProp<TextStyle>;
 
+    /** The error message to display for the CTA button */
+    ctaErrorMessage?: string;
+
     /** Padding for content on large screens */
     contentPaddingOnLargeScreens?: {padding: number};
 };
@@ -56,7 +69,11 @@ function FeatureList({
     subtitle = '',
     ctaText = '',
     ctaAccessibilityLabel = '',
-    onCtaPress,
+    onCtaPress = () => {},
+    secondaryButtonText = '',
+    secondaryButtonAccessibilityLabel = '',
+    onSecondaryButtonPress = () => {},
+    ctaErrorMessage,
     menuItems,
     illustration,
     illustrationStyle,
@@ -95,10 +112,26 @@ function FeatureList({
                                 displayInDefaultIconColor
                                 wrapperStyle={[styles.p0, styles.cursorAuto]}
                                 containerStyle={[styles.m0, styles.wAuto]}
+                                numberOfLinesTitle={0}
                             />
                         </View>
                     ))}
                 </View>
+                {!!secondaryButtonText && (
+                    <Button
+                        text={secondaryButtonText}
+                        onPress={onSecondaryButtonPress}
+                        accessibilityLabel={secondaryButtonAccessibilityLabel}
+                        style={[styles.w100, styles.mb3]}
+                        large
+                    />
+                )}
+                {ctaErrorMessage && (
+                    <DotIndicatorMessage
+                        messages={{error: ctaErrorMessage}}
+                        type="error"
+                    />
+                )}
                 <Button
                     text={ctaText}
                     onPress={onCtaPress}
diff --git a/src/components/FeatureTrainingModal.tsx b/src/components/FeatureTrainingModal.tsx
index 88099b6d078b..a2ff1c2824f3 100644
--- a/src/components/FeatureTrainingModal.tsx
+++ b/src/components/FeatureTrainingModal.tsx
@@ -5,8 +5,8 @@ import {GestureHandlerRootView} from 'react-native-gesture-handler';
 import useLocalize from '@hooks/useLocalize';
 import useNetwork from '@hooks/useNetwork';
 import useOnboardingLayout from '@hooks/useOnboardingLayout';
+import useResponsiveLayout from '@hooks/useResponsiveLayout';
 import useThemeStyles from '@hooks/useThemeStyles';
-import useWindowDimensions from '@hooks/useWindowDimensions';
 import Navigation from '@libs/Navigation/Navigation';
 import variables from '@styles/variables';
 import * as User from '@userActions/User';
@@ -51,6 +51,9 @@ type FeatureTrainingModalProps = {
     /** Describe what is showing */
     description?: string;
 
+    /** Secondary description rendered with additional space */
+    secondaryDescription?: string;
+
     /** Whether to show `Don't show me this again` option */
     shouldShowDismissModalOption?: boolean;
 
@@ -60,6 +63,9 @@ type FeatureTrainingModalProps = {
     /** A callback to call when user confirms the tutorial */
     onConfirm?: () => void;
 
+    /** A callback to call when modal closes */
+    onClose?: () => void;
+
     /** Text to show on secondary button */
     helpText?: string;
 
@@ -73,21 +79,23 @@ function FeatureTrainingModal({
     videoAspectRatio: videoAspectRatioProp,
     title = '',
     description = '',
+    secondaryDescription = '',
     shouldShowDismissModalOption = false,
     confirmText = '',
     onConfirm = () => {},
+    onClose = () => {},
     helpText = '',
     onHelp = () => {},
 }: FeatureTrainingModalProps) {
     const styles = useThemeStyles();
     const {translate} = useLocalize();
-    const {shouldUseNarrowLayout} = useOnboardingLayout();
+    const {isMediumOrLargerScreenWidth} = useOnboardingLayout();
     const [isModalVisible, setIsModalVisible] = useState(true);
     const [willShowAgain, setWillShowAgain] = useState(true);
     const [videoStatus, setVideoStatus] = useState<VideoStatus>('video');
     const [isVideoStatusLocked, setIsVideoStatusLocked] = useState(false);
     const [videoAspectRatio, setVideoAspectRatio] = useState(videoAspectRatioProp ?? VIDEO_ASPECT_RATIO);
-    const {isSmallScreenWidth} = useWindowDimensions();
+    const {shouldUseNarrowLayout} = useResponsiveLayout();
     const {isOffline} = useNetwork();
 
     useEffect(() => {
@@ -130,21 +138,23 @@ function FeatureTrainingModal({
                 ]}
             >
                 {videoStatus === 'video' ? (
-                    <VideoPlayer
-                        url={videoURL}
-                        videoPlayerStyle={[styles.onboardingVideoPlayer, {aspectRatio}]}
-                        onVideoLoaded={setAspectRatio}
-                        controlsStatus={CONST.VIDEO_PLAYER.CONTROLS_STATUS.SHOW}
-                        shouldUseControlsBottomMargin={false}
-                        shouldPlay
-                        isLooping
-                    />
+                    <GestureHandlerRootView>
+                        <VideoPlayer
+                            url={videoURL}
+                            videoPlayerStyle={[styles.onboardingVideoPlayer, {aspectRatio}]}
+                            onVideoLoaded={setAspectRatio}
+                            controlsStatus={CONST.VIDEO_PLAYER.CONTROLS_STATUS.HIDE}
+                            shouldUseControlsBottomMargin={false}
+                            shouldPlay
+                            isLooping
+                        />
+                    </GestureHandlerRootView>
                 ) : (
                     <View style={[styles.flex1, styles.alignItemsCenter, {aspectRatio}]}>
                         <Lottie
                             source={animation ?? LottieAnimations.Hands}
                             style={styles.h100}
-                            webStyle={isSmallScreenWidth ? styles.h100 : undefined}
+                            webStyle={shouldUseNarrowLayout ? styles.h100 : undefined}
                             autoPlay
                             loop
                         />
@@ -152,7 +162,7 @@ function FeatureTrainingModal({
                 )}
             </View>
         );
-    }, [animation, videoURL, videoAspectRatio, videoStatus, isSmallScreenWidth, styles]);
+    }, [animation, videoURL, videoAspectRatio, videoStatus, shouldUseNarrowLayout, styles]);
 
     const toggleWillShowAgain = useCallback(() => setWillShowAgain((prevWillShowAgain) => !prevWillShowAgain), []);
 
@@ -162,7 +172,8 @@ function FeatureTrainingModal({
         }
         setIsModalVisible(false);
         Navigation.goBack();
-    }, [willShowAgain]);
+        onClose?.();
+    }, [onClose, willShowAgain]);
 
     const closeAndConfirmModal = useCallback(() => {
         closeModal();
@@ -174,14 +185,14 @@ function FeatureTrainingModal({
             {({safeAreaPaddingBottomStyle}) => (
                 <Modal
                     isVisible={isModalVisible}
-                    type={shouldUseNarrowLayout ? CONST.MODAL.MODAL_TYPE.CENTERED_UNSWIPEABLE : CONST.MODAL.MODAL_TYPE.BOTTOM_DOCKED}
+                    type={isMediumOrLargerScreenWidth ? CONST.MODAL.MODAL_TYPE.CENTERED_UNSWIPEABLE : CONST.MODAL.MODAL_TYPE.BOTTOM_DOCKED}
                     onClose={closeModal}
                     innerContainerStyle={{
                         boxShadow: 'none',
                         borderRadius: 16,
                         paddingBottom: 20,
-                        paddingTop: shouldUseNarrowLayout ? undefined : MODAL_PADDING,
-                        ...(shouldUseNarrowLayout
+                        paddingTop: isMediumOrLargerScreenWidth ? undefined : MODAL_PADDING,
+                        ...(isMediumOrLargerScreenWidth
                             ? // Override styles defined by MODAL.MODAL_TYPE.CENTERED_UNSWIPEABLE
                               // To make it take as little space as possible.
                               {
@@ -191,43 +202,42 @@ function FeatureTrainingModal({
                             : {}),
                     }}
                 >
-                    <GestureHandlerRootView>
-                        <View style={[styles.mh100, shouldUseNarrowLayout && styles.welcomeVideoNarrowLayout, safeAreaPaddingBottomStyle]}>
-                            <View style={shouldUseNarrowLayout ? {padding: MODAL_PADDING} : {paddingHorizontal: MODAL_PADDING}}>{renderIllustration()}</View>
-                            <View style={[styles.mt5, styles.mh5]}>
-                                {title && description && (
-                                    <View style={[shouldUseNarrowLayout ? [styles.gap1, styles.mb8] : [styles.mb10]]}>
-                                        <Text style={[styles.textHeadlineH1]}>{title}</Text>
-                                        <Text style={styles.textSupporting}>{description}</Text>
-                                    </View>
-                                )}
-                                {shouldShowDismissModalOption && (
-                                    <CheckboxWithLabel
-                                        label={translate('featureTraining.doNotShowAgain')}
-                                        accessibilityLabel={translate('featureTraining.doNotShowAgain')}
-                                        style={[styles.mb5]}
-                                        isChecked={!willShowAgain}
-                                        onInputChange={toggleWillShowAgain}
-                                    />
-                                )}
-                                {helpText && (
-                                    <Button
-                                        large
-                                        style={[styles.mb3]}
-                                        onPress={onHelp}
-                                        text={helpText}
-                                    />
-                                )}
+                    <View style={[styles.mh100, isMediumOrLargerScreenWidth && styles.welcomeVideoNarrowLayout, safeAreaPaddingBottomStyle]}>
+                        <View style={isMediumOrLargerScreenWidth ? {padding: MODAL_PADDING} : {paddingHorizontal: MODAL_PADDING}}>{renderIllustration()}</View>
+                        <View style={[styles.mt5, styles.mh5]}>
+                            {!!title && !!description && (
+                                <View style={[isMediumOrLargerScreenWidth ? [styles.gap1, styles.mb8] : [styles.mb10]]}>
+                                    <Text style={[styles.textHeadlineH1]}>{title}</Text>
+                                    <Text style={styles.textSupporting}>{description}</Text>
+                                    {secondaryDescription.length > 0 && <Text style={[styles.textSupporting, styles.mt4]}>{secondaryDescription}</Text>}
+                                </View>
+                            )}
+                            {shouldShowDismissModalOption && (
+                                <CheckboxWithLabel
+                                    label={translate('featureTraining.doNotShowAgain')}
+                                    accessibilityLabel={translate('featureTraining.doNotShowAgain')}
+                                    style={[styles.mb5]}
+                                    isChecked={!willShowAgain}
+                                    onInputChange={toggleWillShowAgain}
+                                />
+                            )}
+                            {!!helpText && (
                                 <Button
                                     large
-                                    success
-                                    pressOnEnter
-                                    onPress={closeAndConfirmModal}
-                                    text={confirmText}
+                                    style={[styles.mb3]}
+                                    onPress={onHelp}
+                                    text={helpText}
                                 />
-                            </View>
+                            )}
+                            <Button
+                                large
+                                success
+                                pressOnEnter
+                                onPress={closeAndConfirmModal}
+                                text={confirmText}
+                            />
                         </View>
-                    </GestureHandlerRootView>
+                    </View>
                 </Modal>
             )}
         </SafeAreaConsumer>
diff --git a/src/components/FeedbackSurvey.tsx b/src/components/FeedbackSurvey.tsx
new file mode 100644
index 000000000000..3c677a7b0f6d
--- /dev/null
+++ b/src/components/FeedbackSurvey.tsx
@@ -0,0 +1,155 @@
+import React, {useEffect, useMemo, useState} from 'react';
+import type {StyleProp, ViewStyle} from 'react-native';
+import {View} from 'react-native';
+import {useOnyx} from 'react-native-onyx';
+import useLocalize from '@hooks/useLocalize';
+import useThemeStyles from '@hooks/useThemeStyles';
+import * as FormActions from '@libs/actions/FormActions';
+import CONST from '@src/CONST';
+import type {FeedbackSurveyOptionID} from '@src/CONST';
+import type ONYXKEYS from '@src/ONYXKEYS';
+import INPUT_IDS from '@src/types/form/FeedbackSurveyForm';
+import isLoadingOnyxValue from '@src/types/utils/isLoadingOnyxValue';
+import FixedFooter from './FixedFooter';
+import FormProvider from './Form/FormProvider';
+import InputWrapper from './Form/InputWrapper';
+import FormAlertWithSubmitButton from './FormAlertWithSubmitButton';
+import RadioButtons from './RadioButtons';
+import type {Choice} from './RadioButtons';
+import Text from './Text';
+import TextInput from './TextInput';
+
+type FeedbackSurveyProps = {
+    /** A unique Onyx key identifying the form */
+    formID: typeof ONYXKEYS.FORMS.DISABLE_AUTO_RENEW_SURVEY_FORM | typeof ONYXKEYS.FORMS.REQUEST_EARLY_CANCELLATION_FORM;
+
+    /** Title of the survey */
+    title: string;
+
+    /** Description of the survey */
+    description: string;
+
+    /** Callback to be called when the survey is submitted */
+    onSubmit: (reason: FeedbackSurveyOptionID, note?: string) => void;
+
+    /** Styles for the option row element */
+    optionRowStyles?: StyleProp<ViewStyle>;
+
+    /** Optional text to render over the submit button */
+    footerText?: React.ReactNode;
+
+    /** Indicates whether note field is required  */
+    isNoteRequired?: boolean;
+
+    /** Indicates whether a loading indicator should be shown */
+    isLoading?: boolean;
+
+    /** Should the submit button be enabled when offline */
+    enabledWhenOffline?: boolean;
+};
+
+function FeedbackSurvey({title, description, onSubmit, optionRowStyles, footerText, isNoteRequired, isLoading, formID, enabledWhenOffline = true}: FeedbackSurveyProps) {
+    const {translate} = useLocalize();
+    const styles = useThemeStyles();
+    const [draft, draftResults] = useOnyx(`${formID}Draft`);
+    const [reason, setReason] = useState<string | undefined>(draft?.reason);
+    const [shouldShowReasonError, setShouldShowReasonError] = useState(false);
+
+    const isLoadingDraft = isLoadingOnyxValue(draftResults);
+
+    const options = useMemo<Choice[]>(
+        () => [
+            {value: CONST.FEEDBACK_SURVEY_OPTIONS.TOO_LIMITED.ID, label: translate(CONST.FEEDBACK_SURVEY_OPTIONS.TOO_LIMITED.TRANSLATION_KEY)},
+            {value: CONST.FEEDBACK_SURVEY_OPTIONS.TOO_EXPENSIVE.ID, label: translate(CONST.FEEDBACK_SURVEY_OPTIONS.TOO_EXPENSIVE.TRANSLATION_KEY)},
+            {value: CONST.FEEDBACK_SURVEY_OPTIONS.INADEQUATE_SUPPORT.ID, label: translate(CONST.FEEDBACK_SURVEY_OPTIONS.INADEQUATE_SUPPORT.TRANSLATION_KEY)},
+            {value: CONST.FEEDBACK_SURVEY_OPTIONS.BUSINESS_CLOSING.ID, label: translate(CONST.FEEDBACK_SURVEY_OPTIONS.BUSINESS_CLOSING.TRANSLATION_KEY)},
+        ],
+        [translate],
+    );
+
+    useEffect(() => {
+        if (!draft?.reason || isLoadingDraft) {
+            return;
+        }
+
+        setReason(draft.reason);
+        // eslint-disable-next-line react-compiler/react-compiler, react-hooks/exhaustive-deps -- only sync with draft data when it is loaded
+    }, [isLoadingDraft]);
+
+    const handleOptionSelect = (value: string) => {
+        setReason(value);
+        setShouldShowReasonError(false);
+    };
+
+    const handleSubmit = () => {
+        if (!draft?.reason || (isNoteRequired && !draft.note?.trim())) {
+            setShouldShowReasonError(true);
+            return;
+        }
+
+        onSubmit(draft.reason, draft.note?.trim());
+        FormActions.clearDraftValues(formID);
+    };
+
+    const handleSetNote = () => {
+        if (!isNoteRequired || !shouldShowReasonError) {
+            return;
+        }
+
+        setShouldShowReasonError(false);
+    };
+
+    return (
+        <FormProvider
+            formID={formID}
+            style={[styles.flexGrow1, styles.justifyContentBetween]}
+            onSubmit={handleSubmit}
+            submitButtonText={translate('common.submit')}
+            isSubmitButtonVisible={false}
+            enabledWhenOffline={enabledWhenOffline}
+        >
+            <View style={styles.mh5}>
+                <Text style={styles.textHeadline}>{title}</Text>
+                <Text style={[styles.mt1, styles.mb3, styles.textNormalThemeText]}>{description}</Text>
+                <InputWrapper
+                    InputComponent={RadioButtons}
+                    inputID={INPUT_IDS.REASON}
+                    items={options}
+                    radioButtonStyle={[styles.mb7, optionRowStyles]}
+                    onPress={handleOptionSelect}
+                    shouldSaveDraft
+                />
+                {!!reason && (
+                    <>
+                        <Text style={[styles.textNormalThemeText, styles.mb3]}>{translate('feedbackSurvey.additionalInfoTitle')}</Text>
+                        <InputWrapper
+                            InputComponent={TextInput}
+                            inputID={INPUT_IDS.NOTE}
+                            label={translate('feedbackSurvey.additionalInfoInputLabel')}
+                            accessibilityLabel={translate('feedbackSurvey.additionalInfoInputLabel')}
+                            role={CONST.ROLE.PRESENTATION}
+                            onChangeText={handleSetNote}
+                            shouldSaveDraft
+                        />
+                    </>
+                )}
+            </View>
+            <FixedFooter>
+                {!!footerText && footerText}
+                <FormAlertWithSubmitButton
+                    isAlertVisible={shouldShowReasonError}
+                    onSubmit={handleSubmit}
+                    message={translate('common.error.pleaseCompleteForm')}
+                    buttonText={translate('common.submit')}
+                    enabledWhenOffline={enabledWhenOffline}
+                    containerStyles={styles.mt3}
+                    isLoading={isLoading}
+                />
+            </FixedFooter>
+        </FormProvider>
+    );
+}
+
+FeedbackSurvey.displayName = 'FeedbackSurvey';
+
+export default FeedbackSurvey;
diff --git a/src/components/FixedFooter.tsx b/src/components/FixedFooter.tsx
index 2f09b27f3067..c9d60f3ced46 100644
--- a/src/components/FixedFooter.tsx
+++ b/src/components/FixedFooter.tsx
@@ -2,7 +2,6 @@ import type {ReactNode} from 'react';
 import React from 'react';
 import type {StyleProp, ViewStyle} from 'react-native';
 import {View} from 'react-native';
-import useKeyboardState from '@hooks/useKeyboardState';
 import useSafeAreaInsets from '@hooks/useSafeAreaInsets';
 import useThemeStyles from '@hooks/useThemeStyles';
 
@@ -15,7 +14,6 @@ type FixedFooterProps = {
 };
 
 function FixedFooter({style, children}: FixedFooterProps) {
-    const {isKeyboardShown} = useKeyboardState();
     const insets = useSafeAreaInsets();
     const styles = useThemeStyles();
 
@@ -23,7 +21,7 @@ function FixedFooter({style, children}: FixedFooterProps) {
         return null;
     }
 
-    const shouldAddBottomPadding = isKeyboardShown || !insets.bottom;
+    const shouldAddBottomPadding = !insets.bottom;
 
     return <View style={[styles.ph5, shouldAddBottomPadding && styles.pb5, styles.flexShrink0, style]}>{children}</View>;
 }
diff --git a/src/components/FlatList/index.android.tsx b/src/components/FlatList/index.android.tsx
index 1246367d29e8..261d10488098 100644
--- a/src/components/FlatList/index.android.tsx
+++ b/src/components/FlatList/index.android.tsx
@@ -1,29 +1,30 @@
 import {useFocusEffect} from '@react-navigation/native';
 import type {ForwardedRef} from 'react';
-import React, {forwardRef, useCallback, useContext} from 'react';
+import React, {forwardRef, useCallback, useRef} from 'react';
 import type {FlatListProps, NativeScrollEvent, NativeSyntheticEvent} from 'react-native';
 import {FlatList} from 'react-native';
-import {ActionListContext} from '@pages/home/ReportScreenContext';
 
 // FlatList wrapped with the freeze component will lose its scroll state when frozen (only for Android).
 // CustomFlatList saves the offset and use it for scrollToOffset() when unfrozen.
 function CustomFlatList<T>(props: FlatListProps<T>, ref: ForwardedRef<FlatList>) {
-    const {scrollPosition, setScrollPosition} = useContext(ActionListContext);
+    const lastScrollOffsetRef = useRef(0);
 
     const onScreenFocus = useCallback(() => {
         if (typeof ref === 'function') {
             return;
         }
-        if (!ref?.current || !scrollPosition?.offset) {
+        if (!ref?.current || !lastScrollOffsetRef.current) {
             return;
         }
-        if (ref.current && scrollPosition.offset) {
-            ref.current.scrollToOffset({offset: scrollPosition.offset, animated: false});
+        if (ref.current && lastScrollOffsetRef.current) {
+            ref.current.scrollToOffset({offset: lastScrollOffsetRef.current, animated: false});
         }
-    }, [scrollPosition?.offset, ref]);
+    }, [ref]);
 
-    // eslint-disable-next-line react-hooks/exhaustive-deps
-    const onMomentumScrollEnd = useCallback((event: NativeSyntheticEvent<NativeScrollEvent>) => setScrollPosition({offset: event.nativeEvent.contentOffset.y}), []);
+    // eslint-disable-next-line react-compiler/react-compiler, react-hooks/exhaustive-deps
+    const onMomentumScrollEnd = useCallback((event: NativeSyntheticEvent<NativeScrollEvent>) => {
+        lastScrollOffsetRef.current = event.nativeEvent.contentOffset.y;
+    }, []);
 
     useFocusEffect(
         useCallback(() => {
diff --git a/src/components/FlatList/index.tsx b/src/components/FlatList/index.tsx
index 9f42e9597c79..75b5c54cb5d7 100644
--- a/src/components/FlatList/index.tsx
+++ b/src/components/FlatList/index.tsx
@@ -44,6 +44,8 @@ function MVCPFlatList<TItem>({maintainVisibleContentPosition, horizontal = false
     const mutationObserverRef = useRef<MutationObserver | null>(null);
     const lastScrollOffsetRef = useRef(0);
     const isListRenderedRef = useRef(false);
+    const mvcpAutoscrollToTopThresholdRef = useRef(mvcpAutoscrollToTopThreshold);
+    mvcpAutoscrollToTopThresholdRef.current = mvcpAutoscrollToTopThreshold;
 
     const getScrollOffset = useCallback((): number => {
         if (!scrollRef.current) {
@@ -52,7 +54,6 @@ function MVCPFlatList<TItem>({maintainVisibleContentPosition, horizontal = false
         return horizontal ? getScrollableNode(scrollRef.current)?.scrollLeft ?? 0 : getScrollableNode(scrollRef.current)?.scrollTop ?? 0;
     }, [horizontal]);
 
-    // eslint-disable-next-line @typescript-eslint/no-unsafe-return
     const getContentView = useCallback(() => getScrollableNode(scrollRef.current)?.childNodes[0], []);
 
     const scrollToOffset = useCallback(
@@ -105,11 +106,11 @@ function MVCPFlatList<TItem>({maintainVisibleContentPosition, horizontal = false
             const scrollOffset = getScrollOffset();
             prevFirstVisibleOffsetRef.current = firstVisibleViewOffset;
             scrollToOffset(scrollOffset + delta, false);
-            if (mvcpAutoscrollToTopThreshold != null && scrollOffset <= mvcpAutoscrollToTopThreshold) {
+            if (mvcpAutoscrollToTopThresholdRef.current != null && scrollOffset <= mvcpAutoscrollToTopThresholdRef.current) {
                 scrollToOffset(0, true);
             }
         }
-    }, [getScrollOffset, scrollToOffset, mvcpMinIndexForVisible, mvcpAutoscrollToTopThreshold, horizontal]);
+    }, [getScrollOffset, scrollToOffset, mvcpMinIndexForVisible, horizontal]);
 
     const setupMutationObserver = useCallback(() => {
         const contentView = getContentView();
@@ -120,6 +121,12 @@ function MVCPFlatList<TItem>({maintainVisibleContentPosition, horizontal = false
         mutationObserverRef.current?.disconnect();
 
         const mutationObserver = new MutationObserver(() => {
+            // When the list is hidden, the size will be 0.
+            // Ignore the callback if the list is hidden because scrollOffset will always be 0.
+            if (!getScrollableNode(scrollRef.current)?.clientHeight) {
+                return;
+            }
+
             // This needs to execute after scroll events are dispatched, but
             // in the same tick to avoid flickering. rAF provides the right timing.
             requestAnimationFrame(() => {
@@ -149,10 +156,13 @@ function MVCPFlatList<TItem>({maintainVisibleContentPosition, horizontal = false
         if (!isListRenderedRef.current) {
             return;
         }
-        requestAnimationFrame(() => {
+        const animationFrame = requestAnimationFrame(() => {
             prepareForMaintainVisibleContentPosition();
             setupMutationObserver();
         });
+        return () => {
+            cancelAnimationFrame(animationFrame);
+        };
     }, [prepareForMaintainVisibleContentPosition, setupMutationObserver]);
 
     const setMergedRef = useMergeRefs(scrollRef, ref);
@@ -175,6 +185,7 @@ function MVCPFlatList<TItem>({maintainVisibleContentPosition, horizontal = false
         const mutationObserver = mutationObserverRef.current;
         return () => {
             mutationObserver?.disconnect();
+            mutationObserverRef.current = null;
         };
     }, []);
 
@@ -198,6 +209,10 @@ function MVCPFlatList<TItem>({maintainVisibleContentPosition, horizontal = false
             ref={onRef}
             onLayout={(e) => {
                 isListRenderedRef.current = true;
+                if (!mutationObserverRef.current) {
+                    prepareForMaintainVisibleContentPosition();
+                    setupMutationObserver();
+                }
                 props.onLayout?.(e);
             }}
         />
diff --git a/src/components/FloatingActionButton.tsx b/src/components/FloatingActionButton.tsx
index 93ffa52bc80b..7c2f5579332a 100644
--- a/src/components/FloatingActionButton.tsx
+++ b/src/components/FloatingActionButton.tsx
@@ -63,6 +63,7 @@ function FloatingActionButton({onPress, isActive, accessibilityLabel, role}: Flo
     const buttonRef = ref;
 
     useEffect(() => {
+        // eslint-disable-next-line react-compiler/react-compiler
         sharedValue.value = withTiming(isActive ? 1 : 0, {
             duration: 340,
             easing: Easing.inOut(Easing.ease),
diff --git a/src/components/FocusTrap/BOTTOM_TAB_SCREENS.ts b/src/components/FocusTrap/BOTTOM_TAB_SCREENS.ts
new file mode 100644
index 000000000000..b472b80e5cbd
--- /dev/null
+++ b/src/components/FocusTrap/BOTTOM_TAB_SCREENS.ts
@@ -0,0 +1,6 @@
+import NAVIGATORS from '@src/NAVIGATORS';
+import SCREENS from '@src/SCREENS';
+
+const BOTTOM_TAB_SCREENS = [SCREENS.HOME, SCREENS.SETTINGS.ROOT, NAVIGATORS.BOTTOM_TAB_NAVIGATOR];
+
+export default BOTTOM_TAB_SCREENS;
diff --git a/src/components/FocusTrap/FocusTrapContainerElement/FocusTrapContainerElementProps.ts b/src/components/FocusTrap/FocusTrapContainerElement/FocusTrapContainerElementProps.ts
new file mode 100644
index 000000000000..004e8bd6dbc4
--- /dev/null
+++ b/src/components/FocusTrap/FocusTrapContainerElement/FocusTrapContainerElementProps.ts
@@ -0,0 +1,8 @@
+import type {ViewProps} from 'react-native';
+
+type FocusTrapContainerElementProps = ViewProps & {
+    /** Callback to register focus trap container element */
+    onContainerElementChanged?: (element: HTMLElement | null) => void;
+};
+
+export default FocusTrapContainerElementProps;
diff --git a/src/components/FocusTrap/FocusTrapContainerElement/index.tsx b/src/components/FocusTrap/FocusTrapContainerElement/index.tsx
new file mode 100644
index 000000000000..39da870cbf3a
--- /dev/null
+++ b/src/components/FocusTrap/FocusTrapContainerElement/index.tsx
@@ -0,0 +1,9 @@
+import type FocusTrapContainerElementProps from './FocusTrapContainerElementProps';
+
+function FocusTrapContainerElement({children}: FocusTrapContainerElementProps) {
+    return children;
+}
+
+FocusTrapContainerElement.displayName = 'FocusTrapContainerElement';
+
+export default FocusTrapContainerElement;
diff --git a/src/components/FocusTrap/FocusTrapContainerElement/index.web.tsx b/src/components/FocusTrap/FocusTrapContainerElement/index.web.tsx
new file mode 100644
index 000000000000..15307ee23604
--- /dev/null
+++ b/src/components/FocusTrap/FocusTrapContainerElement/index.web.tsx
@@ -0,0 +1,29 @@
+/**
+ * A wrapper View component allowing us to register a container element for a FocusTrap
+ */
+import type {ForwardedRef} from 'react';
+import React from 'react';
+import {View} from 'react-native';
+import type FocusTrapContainerElementProps from './FocusTrapContainerElementProps';
+
+function FocusTrapContainerElement({onContainerElementChanged, ...props}: FocusTrapContainerElementProps, ref?: ForwardedRef<View>) {
+    return (
+        <View
+            ref={(node) => {
+                const r = ref;
+                if (typeof r === 'function') {
+                    r(node);
+                } else if (r) {
+                    r.current = node;
+                }
+                onContainerElementChanged?.(node as unknown as HTMLElement | null);
+            }}
+            // eslint-disable-next-line react/jsx-props-no-spreading
+            {...props}
+        />
+    );
+}
+
+FocusTrapContainerElement.displayName = 'FocusTrapContainerElement';
+
+export default React.forwardRef(FocusTrapContainerElement);
diff --git a/src/components/FocusTrap/FocusTrapForModal/FocusTrapForModalProps.ts b/src/components/FocusTrap/FocusTrapForModal/FocusTrapForModalProps.ts
new file mode 100644
index 000000000000..5793885dacd1
--- /dev/null
+++ b/src/components/FocusTrap/FocusTrapForModal/FocusTrapForModalProps.ts
@@ -0,0 +1,11 @@
+import type FocusTrap from 'focus-trap-react';
+
+type FocusTrapOptions = Exclude<FocusTrap.Props['focusTrapOptions'], undefined>;
+
+type FocusTrapForModalProps = {
+    children: React.ReactNode;
+    active: boolean;
+    initialFocus?: FocusTrapOptions['initialFocus'];
+};
+
+export default FocusTrapForModalProps;
diff --git a/src/components/FocusTrap/FocusTrapForModal/index.tsx b/src/components/FocusTrap/FocusTrapForModal/index.tsx
new file mode 100644
index 000000000000..01632998b079
--- /dev/null
+++ b/src/components/FocusTrap/FocusTrapForModal/index.tsx
@@ -0,0 +1,9 @@
+import type FocusTrapForModalProps from './FocusTrapForModalProps';
+
+function FocusTrapForModal({children}: FocusTrapForModalProps) {
+    return children;
+}
+
+FocusTrapForModal.displayName = 'FocusTrapForModal';
+
+export default FocusTrapForModal;
diff --git a/src/components/FocusTrap/FocusTrapForModal/index.web.tsx b/src/components/FocusTrap/FocusTrapForModal/index.web.tsx
new file mode 100644
index 000000000000..2608c58a4d23
--- /dev/null
+++ b/src/components/FocusTrap/FocusTrapForModal/index.web.tsx
@@ -0,0 +1,31 @@
+import FocusTrap from 'focus-trap-react';
+import React from 'react';
+import sharedTrapStack from '@components/FocusTrap/sharedTrapStack';
+import ReportActionComposeFocusManager from '@libs/ReportActionComposeFocusManager';
+import type FocusTrapForModalProps from './FocusTrapForModalProps';
+
+function FocusTrapForModal({children, active, initialFocus = false}: FocusTrapForModalProps) {
+    return (
+        <FocusTrap
+            active={active}
+            focusTrapOptions={{
+                trapStack: sharedTrapStack,
+                clickOutsideDeactivates: true,
+                initialFocus,
+                fallbackFocus: document.body,
+                setReturnFocus: (element) => {
+                    if (ReportActionComposeFocusManager.isFocused()) {
+                        return false;
+                    }
+                    return element;
+                },
+            }}
+        >
+            {children}
+        </FocusTrap>
+    );
+}
+
+FocusTrapForModal.displayName = 'FocusTrapForModal';
+
+export default FocusTrapForModal;
diff --git a/src/components/FocusTrap/FocusTrapForScreen/FocusTrapProps.ts b/src/components/FocusTrap/FocusTrapForScreen/FocusTrapProps.ts
new file mode 100644
index 000000000000..aa063a10271a
--- /dev/null
+++ b/src/components/FocusTrap/FocusTrapForScreen/FocusTrapProps.ts
@@ -0,0 +1,10 @@
+import type FocusTrap from 'focus-trap-react';
+
+type FocusTrapForScreenProps = {
+    children: React.ReactNode;
+
+    /** Overrides the focus trap settings */
+    focusTrapSettings?: Pick<FocusTrap.Props, 'containerElements' | 'focusTrapOptions' | 'active'>;
+};
+
+export default FocusTrapForScreenProps;
diff --git a/src/components/FocusTrap/FocusTrapForScreen/index.tsx b/src/components/FocusTrap/FocusTrapForScreen/index.tsx
new file mode 100644
index 000000000000..ae7ece116d1e
--- /dev/null
+++ b/src/components/FocusTrap/FocusTrapForScreen/index.tsx
@@ -0,0 +1,9 @@
+import type FocusTrapProps from './FocusTrapProps';
+
+function FocusTrapForScreen({children}: FocusTrapProps) {
+    return children;
+}
+
+FocusTrapForScreen.displayName = 'FocusTrapForScreen';
+
+export default FocusTrapForScreen;
diff --git a/src/components/FocusTrap/FocusTrapForScreen/index.web.tsx b/src/components/FocusTrap/FocusTrapForScreen/index.web.tsx
new file mode 100644
index 000000000000..c2a45d39f3f3
--- /dev/null
+++ b/src/components/FocusTrap/FocusTrapForScreen/index.web.tsx
@@ -0,0 +1,76 @@
+import {useIsFocused, useRoute} from '@react-navigation/native';
+import FocusTrap from 'focus-trap-react';
+import React, {useMemo} from 'react';
+import BOTTOM_TAB_SCREENS from '@components/FocusTrap/BOTTOM_TAB_SCREENS';
+import sharedTrapStack from '@components/FocusTrap/sharedTrapStack';
+import TOP_TAB_SCREENS from '@components/FocusTrap/TOP_TAB_SCREENS';
+import WIDE_LAYOUT_INACTIVE_SCREENS from '@components/FocusTrap/WIDE_LAYOUT_INACTIVE_SCREENS';
+import useWindowDimensions from '@hooks/useWindowDimensions';
+import canFocusInputOnScreenFocus from '@libs/canFocusInputOnScreenFocus';
+import CONST from '@src/CONST';
+import type FocusTrapProps from './FocusTrapProps';
+
+function FocusTrapForScreen({children, focusTrapSettings}: FocusTrapProps) {
+    const isFocused = useIsFocused();
+    const route = useRoute();
+    const {isSmallScreenWidth} = useWindowDimensions();
+
+    const isActive = useMemo(() => {
+        if (typeof focusTrapSettings?.active !== 'undefined') {
+            return focusTrapSettings.active;
+        }
+        // Focus trap can't be active on bottom tab screens because it would block access to the tab bar.
+        if (BOTTOM_TAB_SCREENS.find((screen) => screen === route.name)) {
+            return false;
+        }
+
+        // in top tabs only focus trap for currently shown tab should be active
+        if (TOP_TAB_SCREENS.find((screen) => screen === route.name)) {
+            return isFocused;
+        }
+
+        // Focus trap can't be active on these screens if the layout is wide because they may be displayed side by side.
+        if (WIDE_LAYOUT_INACTIVE_SCREENS.includes(route.name) && !isSmallScreenWidth) {
+            return false;
+        }
+        return true;
+    }, [isFocused, isSmallScreenWidth, route.name, focusTrapSettings?.active]);
+
+    return (
+        <FocusTrap
+            active={isActive}
+            paused={!isFocused}
+            containerElements={focusTrapSettings?.containerElements?.length ? focusTrapSettings.containerElements : undefined}
+            focusTrapOptions={{
+                trapStack: sharedTrapStack,
+                allowOutsideClick: true,
+                fallbackFocus: document.body,
+                delayInitialFocus: CONST.ANIMATED_TRANSITION,
+                initialFocus: (focusTrapContainers) => {
+                    if (!canFocusInputOnScreenFocus()) {
+                        return false;
+                    }
+
+                    const isFocusedElementInsideContainer = focusTrapContainers?.some((container) => container.contains(document.activeElement));
+                    if (isFocusedElementInsideContainer) {
+                        return false;
+                    }
+                    return undefined;
+                },
+                setReturnFocus: (element) => {
+                    if (document.activeElement && document.activeElement !== document.body) {
+                        return false;
+                    }
+                    return element;
+                },
+                ...(focusTrapSettings?.focusTrapOptions ?? {}),
+            }}
+        >
+            {children}
+        </FocusTrap>
+    );
+}
+
+FocusTrapForScreen.displayName = 'FocusTrapForScreen';
+
+export default FocusTrapForScreen;
diff --git a/src/components/FocusTrap/TOP_TAB_SCREENS.ts b/src/components/FocusTrap/TOP_TAB_SCREENS.ts
new file mode 100644
index 000000000000..6bee36b86883
--- /dev/null
+++ b/src/components/FocusTrap/TOP_TAB_SCREENS.ts
@@ -0,0 +1,5 @@
+import CONST from '@src/CONST';
+
+const TOP_TAB_SCREENS: string[] = [CONST.TAB.NEW_CHAT, CONST.TAB.NEW_ROOM, CONST.TAB_REQUEST.DISTANCE, CONST.TAB_REQUEST.MANUAL, CONST.TAB_REQUEST.SCAN];
+
+export default TOP_TAB_SCREENS;
diff --git a/src/components/FocusTrap/WIDE_LAYOUT_INACTIVE_SCREENS.ts b/src/components/FocusTrap/WIDE_LAYOUT_INACTIVE_SCREENS.ts
new file mode 100644
index 000000000000..686c318a99dc
--- /dev/null
+++ b/src/components/FocusTrap/WIDE_LAYOUT_INACTIVE_SCREENS.ts
@@ -0,0 +1,43 @@
+import NAVIGATORS from '@src/NAVIGATORS';
+import SCREENS from '@src/SCREENS';
+
+/**
+ * Screens displayed in the BottomTab and CentralPane displayed side by side that should not have active
+ * focus trap when rendered on a wide screen to allow navigation between them using the keyboard
+ */
+const WIDE_LAYOUT_INACTIVE_SCREENS: string[] = [
+    NAVIGATORS.BOTTOM_TAB_NAVIGATOR,
+    SCREENS.HOME,
+    SCREENS.SETTINGS.ROOT,
+    SCREENS.REPORT,
+    SCREENS.SETTINGS.PROFILE.ROOT,
+    SCREENS.SETTINGS.PREFERENCES.ROOT,
+    SCREENS.SETTINGS.SECURITY,
+    SCREENS.SETTINGS.WALLET.ROOT,
+    SCREENS.SETTINGS.ABOUT,
+    SCREENS.SETTINGS.WORKSPACES,
+    SCREENS.SETTINGS.SUBSCRIPTION.ROOT,
+    SCREENS.WORKSPACE.ACCOUNTING.ROOT,
+    SCREENS.WORKSPACE.INITIAL,
+    SCREENS.WORKSPACE.PROFILE,
+    SCREENS.WORKSPACE.CARD,
+    SCREENS.WORKSPACE.WORKFLOWS,
+    SCREENS.WORKSPACE.REIMBURSE,
+    SCREENS.WORKSPACE.BILLS,
+    SCREENS.WORKSPACE.INVOICES,
+    SCREENS.WORKSPACE.TRAVEL,
+    SCREENS.WORKSPACE.MEMBERS,
+    SCREENS.WORKSPACE.CATEGORIES,
+    SCREENS.WORKSPACE.MORE_FEATURES,
+    SCREENS.WORKSPACE.TAGS,
+    SCREENS.WORKSPACE.TAXES,
+    SCREENS.WORKSPACE.REPORT_FIELDS,
+    SCREENS.WORKSPACE.EXPENSIFY_CARD,
+    SCREENS.WORKSPACE.COMPANY_CARDS,
+    SCREENS.WORKSPACE.DISTANCE_RATES,
+    SCREENS.SEARCH.CENTRAL_PANE,
+    SCREENS.SETTINGS.TROUBLESHOOT,
+    SCREENS.SETTINGS.SAVE_THE_WORLD,
+];
+
+export default WIDE_LAYOUT_INACTIVE_SCREENS;
diff --git a/src/components/FocusTrap/sharedTrapStack.ts b/src/components/FocusTrap/sharedTrapStack.ts
new file mode 100644
index 000000000000..d0fa12f3fe93
--- /dev/null
+++ b/src/components/FocusTrap/sharedTrapStack.ts
@@ -0,0 +1,6 @@
+import type {FocusTrap as FocusTrapHandler} from 'focus-trap';
+
+// focus-trap is capable of managing many traps. It's necessary for RHP and modals
+const trapStack: FocusTrapHandler[] = [];
+
+export default trapStack;
diff --git a/src/components/FocusableMenuItem.tsx b/src/components/FocusableMenuItem.tsx
index e3ec8394dfa0..fc873196231d 100644
--- a/src/components/FocusableMenuItem.tsx
+++ b/src/components/FocusableMenuItem.tsx
@@ -5,10 +5,10 @@ import type {MenuItemProps} from './MenuItem';
 import MenuItem from './MenuItem';
 
 function FocusableMenuItem(props: MenuItemProps) {
-    const ref = useRef<HTMLDivElement | View>(null);
+    const ref = useRef<View>(null);
 
     // Sync focus on an item
-    useSyncFocus(ref, Boolean(props.focused));
+    useSyncFocus(ref, !!props.focused);
 
     return (
         <MenuItem
diff --git a/src/components/Form/FormProvider.tsx b/src/components/Form/FormProvider.tsx
index 3d20f910dca0..793154d95b02 100644
--- a/src/components/Form/FormProvider.tsx
+++ b/src/components/Form/FormProvider.tsx
@@ -9,7 +9,6 @@ import * as ValidationUtils from '@libs/ValidationUtils';
 import Visibility from '@libs/Visibility';
 import * as FormActions from '@userActions/FormActions';
 import CONST from '@src/CONST';
-import type {TranslationPaths} from '@src/languages/types';
 import type {OnyxFormKey} from '@src/ONYXKEYS';
 import ONYXKEYS from '@src/ONYXKEYS';
 import type {Form} from '@src/types/form';
@@ -25,7 +24,7 @@ import type {FormInputErrors, FormOnyxValues, FormProps, FormRef, InputComponent
 // More details: https://github.com/Expensify/App/pull/16444#issuecomment-1482983426
 const VALIDATE_DELAY = 200;
 
-type GenericFormInputErrors = Partial<Record<string, TranslationPaths>>;
+type GenericFormInputErrors = Partial<Record<string, string>>;
 type InitialDefaultValue = false | Date | '';
 
 function getInitialValueByType(valueType?: ValueTypeKey): InitialDefaultValue {
@@ -74,6 +73,9 @@ type FormProviderProps<TFormID extends OnyxFormKey = OnyxFormKey> = FormProvider
 
         /** Whether to apply flex to the submit button */
         submitFlexEnabled?: boolean;
+
+        /** Whether button is disabled */
+        isSubmitDisabled?: boolean;
     };
 
 function FormProvider(
@@ -93,7 +95,7 @@ function FormProvider(
     }: FormProviderProps,
     forwardedRef: ForwardedRef<FormRef>,
 ) {
-    const {preferredLocale} = useLocalize();
+    const {preferredLocale, translate} = useLocalize();
     const inputRefs = useRef<InputRefs>({});
     const touchedInputs = useRef<Record<string, boolean>>({});
     const [inputValues, setInputValues] = useState<Form>(() => ({...draftValues}));
@@ -143,7 +145,7 @@ function FormProvider(
                 }
 
                 // Add a validation error here because it is a string value that contains HTML characters
-                validateErrors[inputID] = 'common.error.invalidCharacter';
+                validateErrors[inputID] = translate('common.error.invalidCharacter');
             });
 
             if (typeof validateErrors !== 'object') {
@@ -158,7 +160,7 @@ function FormProvider(
 
             return touchedInputErrors;
         },
-        [errors, formID, validate, shouldTrimValues],
+        [shouldTrimValues, formID, validate, errors, translate],
     );
 
     // When locales change from another session of the same account,
@@ -177,7 +179,7 @@ function FormProvider(
         onValidate(trimmedStringValues, !hasServerError);
 
         // Only run when locales change
-        // eslint-disable-next-line react-hooks/exhaustive-deps
+        // eslint-disable-next-line react-compiler/react-compiler, react-hooks/exhaustive-deps
     }, [preferredLocale]);
 
     /** @param inputID - The inputID of the input being touched */
@@ -240,6 +242,7 @@ function FormProvider(
                 inputRefs.current[inputID] = newRef;
             }
             if (inputProps.value !== undefined) {
+                // eslint-disable-next-line react-compiler/react-compiler
                 inputValues[inputID] = inputProps.value;
             } else if (inputProps.shouldSaveDraft && draftValues?.[inputID] !== undefined && inputValues[inputID] === undefined) {
                 inputValues[inputID] = draftValues[inputID];
@@ -253,10 +256,10 @@ function FormProvider(
 
             const errorFields = formState?.errorFields?.[inputID] ?? {};
             const fieldErrorMessage =
-                (Object.keys(errorFields)
+                Object.keys(errorFields)
                     .sort()
                     .map((key) => errorFields[key])
-                    .at(-1) as string) ?? '';
+                    .at(-1) ?? '';
 
             const inputRef = inputProps.ref;
 
@@ -351,7 +354,7 @@ function FormProvider(
                     });
 
                     if (inputProps.shouldSaveDraft && !formID.includes('Draft')) {
-                        FormActions.setDraftValues(formID as OnyxFormKey, {[inputKey]: value});
+                        FormActions.setDraftValues(formID, {[inputKey]: value});
                     }
                     inputProps.onValueChange?.(value, inputKey);
                 },
diff --git a/src/components/Form/FormWrapper.tsx b/src/components/Form/FormWrapper.tsx
index 1ba633e5c9fe..e9f14315486d 100644
--- a/src/components/Form/FormWrapper.tsx
+++ b/src/components/Form/FormWrapper.tsx
@@ -38,6 +38,9 @@ type FormWrapperProps = ChildrenProps &
         /** Assuming refs are React refs */
         inputRefs: RefObject<InputRefs>;
 
+        /** Whether the submit button is disabled */
+        isSubmitDisabled?: boolean;
+
         /** Callback to submit the form */
         onSubmit: () => void;
     };
@@ -57,9 +60,11 @@ function FormWrapper({
     enabledWhenOffline,
     isSubmitActionDangerous = false,
     formID,
+    shouldUseScrollView = true,
     scrollContextEnabled = false,
     shouldHideFixErrorsAlert = false,
-    disablePressOnEnter = true,
+    disablePressOnEnter = false,
+    isSubmitDisabled = false,
 }: FormWrapperProps) {
     const styles = useThemeStyles();
     const formRef = useRef<RNScrollView>(null);
@@ -108,6 +113,7 @@ function FormWrapper({
                 {isSubmitButtonVisible && (
                     <FormAlertWithSubmitButton
                         buttonText={submitButtonText}
+                        isDisabled={isSubmitDisabled}
                         isAlertVisible={((!isEmptyObject(errors) || !isEmptyObject(formState?.errorFields)) && !shouldHideFixErrorsAlert) || !!errorMessage}
                         isLoading={!!formState?.isLoading}
                         message={isEmptyObject(formState?.errorFields) ? errorMessage : undefined}
@@ -118,6 +124,7 @@ function FormWrapper({
                         enabledWhenOffline={enabledWhenOffline}
                         isSubmitActionDangerous={isSubmitActionDangerous}
                         disablePressOnEnter={disablePressOnEnter}
+                        enterKeyEventListenerPriority={1}
                     />
                 )}
             </FormElement>
@@ -132,6 +139,7 @@ function FormWrapper({
             children,
             isSubmitButtonVisible,
             submitButtonText,
+            isSubmitDisabled,
             errors,
             formState?.errorFields,
             formState?.isLoading,
@@ -148,6 +156,10 @@ function FormWrapper({
         ],
     );
 
+    if (!shouldUseScrollView) {
+        return scrollViewContent({});
+    }
+
     return (
         <SafeAreaConsumer>
             {({safeAreaPaddingBottomStyle}) =>
diff --git a/src/components/Form/InputWrapper.tsx b/src/components/Form/InputWrapper.tsx
index b5535a2fe6c1..c966dd4456e9 100644
--- a/src/components/Form/InputWrapper.tsx
+++ b/src/components/Form/InputWrapper.tsx
@@ -54,7 +54,7 @@ function computeComponentSpecificRegistrationParams({
         shouldSetTouchedOnBlurOnly: false,
         // Forward the originally provided value
         blurOnSubmit,
-        shouldSubmitForm: false,
+        shouldSubmitForm: !!shouldSubmitForm,
     };
 }
 
diff --git a/src/components/Form/SafariFormWrapper.tsx b/src/components/Form/SafariFormWrapper.tsx
new file mode 100644
index 000000000000..8ad411e547be
--- /dev/null
+++ b/src/components/Form/SafariFormWrapper.tsx
@@ -0,0 +1,18 @@
+import React from 'react';
+import {isSafari} from '@libs/Browser';
+import type ChildrenProps from '@src/types/utils/ChildrenProps';
+
+type SafariFormWrapperProps = ChildrenProps;
+
+/**
+ * If we used any <input> without <form> wrapper, Safari 11+ would show the auto-fill suggestion popup.
+ */
+function SafariFormWrapper({children}: SafariFormWrapperProps) {
+    if (isSafari()) {
+        return <form>{children}</form>;
+    }
+
+    return children;
+}
+
+export default SafariFormWrapper;
diff --git a/src/components/Form/types.ts b/src/components/Form/types.ts
index 331f1c943b30..5f56bbeceea6 100644
--- a/src/components/Form/types.ts
+++ b/src/components/Form/types.ts
@@ -8,6 +8,7 @@ import type AmountPicker from '@components/AmountPicker';
 import type AmountTextInput from '@components/AmountTextInput';
 import type CheckboxWithLabel from '@components/CheckboxWithLabel';
 import type CountrySelector from '@components/CountrySelector';
+import type CurrencySelector from '@components/CurrencySelector';
 import type DatePicker from '@components/DatePicker';
 import type EmojiPickerButtonDropdown from '@components/EmojiPicker/EmojiPickerButtonDropdown';
 import type Picker from '@components/Picker';
@@ -18,8 +19,11 @@ import type StateSelector from '@components/StateSelector';
 import type TextInput from '@components/TextInput';
 import type TextPicker from '@components/TextPicker';
 import type ValuePicker from '@components/ValuePicker';
-import type {MaybePhraseKey} from '@libs/Localize';
 import type BusinessTypePicker from '@pages/ReimbursementAccount/BusinessInfo/substeps/TypeBusiness/BusinessTypePicker';
+import type DimensionTypeSelector from '@pages/workspace/accounting/intacct/import/DimensionTypeSelector';
+import type NetSuiteCustomFieldMappingPicker from '@pages/workspace/accounting/netsuite/import/NetSuiteImportCustomFieldNew/NetSuiteCustomFieldMappingPicker';
+import type NetSuiteCustomListPicker from '@pages/workspace/accounting/netsuite/import/NetSuiteImportCustomFieldNew/NetSuiteCustomListPicker';
+import type NetSuiteMenuWithTopDescriptionForm from '@pages/workspace/accounting/netsuite/import/NetSuiteImportCustomFieldNew/NetSuiteMenuWithTopDescriptionForm';
 import type {Country} from '@src/CONST';
 import type {OnyxFormKey, OnyxValues} from '@src/ONYXKEYS';
 import type {BaseForm} from '@src/types/form/Form';
@@ -36,8 +40,10 @@ type ValidInputs =
     | typeof Picker
     | typeof AddressSearch
     | typeof CountrySelector
+    | typeof CurrencySelector
     | typeof AmountForm
     | typeof BusinessTypePicker
+    | typeof DimensionTypeSelector
     | typeof StateSelector
     | typeof RoomNameInput
     | typeof ValuePicker
@@ -46,14 +52,19 @@ type ValidInputs =
     | typeof AmountPicker
     | typeof TextPicker
     | typeof AddPlaidBankAccount
-    | typeof EmojiPickerButtonDropdown;
+    | typeof EmojiPickerButtonDropdown
+    | typeof NetSuiteCustomListPicker
+    | typeof NetSuiteCustomFieldMappingPicker
+    | typeof NetSuiteMenuWithTopDescriptionForm;
 
-type ValueTypeKey = 'string' | 'boolean' | 'date' | 'country';
+type ValueTypeKey = 'string' | 'boolean' | 'date' | 'country' | 'reportFields' | 'disabledListValues';
 type ValueTypeMap = {
     string: string;
     boolean: boolean;
     date: Date;
     country: Country | '';
+    reportFields: string[];
+    disabledListValues: boolean[];
 };
 type FormValue = ValueOf<ValueTypeMap>;
 
@@ -123,6 +134,9 @@ type FormProps<TFormID extends OnyxFormKey = OnyxFormKey> = {
     /** Whether ScrollWithContext should be used instead of regular ScrollView. Set to true when there's a nested Picker component in Form. */
     scrollContextEnabled?: boolean;
 
+    /** Whether to use ScrollView */
+    shouldUseScrollView?: boolean;
+
     /** Container styles */
     style?: StyleProp<ViewStyle>;
 
@@ -139,7 +153,7 @@ type FormRef<TFormID extends OnyxFormKey = OnyxFormKey> = {
 
 type InputRefs = Record<string, MutableRefObject<InputComponentBaseProps>>;
 
-type FormInputErrors<TFormID extends OnyxFormKey = OnyxFormKey> = Partial<Record<FormOnyxKeys<TFormID>, MaybePhraseKey>>;
+type FormInputErrors<TFormID extends OnyxFormKey = OnyxFormKey> = Partial<Record<FormOnyxKeys<TFormID>, string | undefined>>;
 
 export type {
     FormProps,
diff --git a/src/components/FormAlertWithSubmitButton.tsx b/src/components/FormAlertWithSubmitButton.tsx
index a4c8842b3113..205bea93f84a 100644
--- a/src/components/FormAlertWithSubmitButton.tsx
+++ b/src/components/FormAlertWithSubmitButton.tsx
@@ -1,14 +1,17 @@
+import type {Ref} from 'react';
 import React from 'react';
 import type {StyleProp, ViewStyle} from 'react-native';
 import {View} from 'react-native';
+import useSafePaddingBottomStyle from '@hooks/useSafePaddingBottomStyle';
 import useThemeStyles from '@hooks/useThemeStyles';
-import type {MaybePhraseKey} from '@libs/Localize';
+import getPlatform from '@libs/getPlatform';
+import CONST from '@src/CONST';
 import Button from './Button';
 import FormAlertWrapper from './FormAlertWrapper';
 
 type FormAlertWithSubmitButtonProps = {
     /** Error message to display above button */
-    message?: MaybePhraseKey;
+    message?: string;
 
     /** Whether the button is disabled */
     isDisabled?: boolean;
@@ -46,6 +49,9 @@ type FormAlertWithSubmitButtonProps = {
     /** Whether to show the alert text */
     isAlertVisible?: boolean;
 
+    /** React ref being forwarded to the submit button */
+    buttonRef?: Ref<View>;
+
     /** Text for the button */
     buttonText: string;
 
@@ -54,6 +60,9 @@ type FormAlertWithSubmitButtonProps = {
 
     /** Style for the error message for submit button */
     errorMessageStyle?: StyleProp<ViewStyle>;
+
+    /** The priority to assign the enter key event listener to buttons. 0 is the highest priority. */
+    enterKeyEventListenerPriority?: number;
 };
 
 function FormAlertWithSubmitButton({
@@ -67,19 +76,28 @@ function FormAlertWithSubmitButton({
     disablePressOnEnter = false,
     isSubmitActionDangerous = false,
     footerContent,
+    buttonRef,
     buttonStyles,
     buttonText,
     isAlertVisible = false,
     onSubmit,
     useSmallerSubmitButtonSize = false,
     errorMessageStyle,
+    enterKeyEventListenerPriority = 0,
 }: FormAlertWithSubmitButtonProps) {
     const styles = useThemeStyles();
     const style = [!footerContent ? {} : styles.mb3, buttonStyles];
+    const safePaddingBottomStyle = useSafePaddingBottomStyle();
+
+    // Disable pressOnEnter for Android Native to avoid issues with the Samsung keyboard,
+    // where pressing Enter saves the form instead of adding a new line in multiline input.
+    // More details: https://github.com/Expensify/App/issues/46644
+    const isAndroidNative = getPlatform() === CONST.PLATFORM.ANDROID;
+    const pressOnEnter = isAndroidNative ? false : !disablePressOnEnter;
 
     return (
         <FormAlertWrapper
-            containerStyles={[styles.justifyContentEnd, containerStyles]}
+            containerStyles={[styles.justifyContentEnd, safePaddingBottomStyle, containerStyles]}
             isAlertVisible={isAlertVisible}
             isMessageHtml={isMessageHtml}
             message={message}
@@ -100,8 +118,10 @@ function FormAlertWithSubmitButton({
                         />
                     ) : (
                         <Button
+                            ref={buttonRef}
                             success
-                            pressOnEnter={!disablePressOnEnter}
+                            pressOnEnter={pressOnEnter}
+                            enterKeyEventListenerPriority={enterKeyEventListenerPriority}
                             text={buttonText}
                             style={style}
                             onPress={onSubmit}
diff --git a/src/components/FormAlertWrapper.tsx b/src/components/FormAlertWrapper.tsx
index d8b379208a29..525182070095 100644
--- a/src/components/FormAlertWrapper.tsx
+++ b/src/components/FormAlertWrapper.tsx
@@ -4,7 +4,6 @@ import type {StyleProp, ViewStyle} from 'react-native';
 import {View} from 'react-native';
 import useLocalize from '@hooks/useLocalize';
 import useThemeStyles from '@hooks/useThemeStyles';
-import type {MaybePhraseKey} from '@libs/Localize';
 import type Network from '@src/types/onyx/Network';
 import FormHelpMessage from './FormHelpMessage';
 import {withNetwork} from './OnyxProvider';
@@ -29,7 +28,7 @@ type FormAlertWrapperProps = {
     isMessageHtml?: boolean;
 
     /** Error message to display above button */
-    message?: MaybePhraseKey;
+    message?: string;
 
     /** Props to detect online status */
     network: Network;
diff --git a/src/components/FormHelpMessage.tsx b/src/components/FormHelpMessage.tsx
index 4f1d784788bf..ab74a7d74b94 100644
--- a/src/components/FormHelpMessage.tsx
+++ b/src/components/FormHelpMessage.tsx
@@ -1,17 +1,18 @@
 import isEmpty from 'lodash/isEmpty';
-import React from 'react';
+import React, {useMemo} from 'react';
 import type {StyleProp, ViewStyle} from 'react-native';
 import {View} from 'react-native';
 import useTheme from '@hooks/useTheme';
 import useThemeStyles from '@hooks/useThemeStyles';
-import * as Localize from '@libs/Localize';
+import Parser from '@libs/Parser';
 import Icon from './Icon';
 import * as Expensicons from './Icon/Expensicons';
+import RenderHTML from './RenderHTML';
 import Text from './Text';
 
 type FormHelpMessageProps = {
     /** Error or hint text. Ignored when children is not empty */
-    message?: Localize.MaybePhraseKey;
+    message?: string | React.ReactNode;
 
     /** Children to render next to dot indicator */
     children?: React.ReactNode;
@@ -24,17 +25,33 @@ type FormHelpMessageProps = {
 
     /** Whether to show dot indicator */
     shouldShowRedDotIndicator?: boolean;
+
+    /** Whether should render error text as HTML or as Text */
+    shouldRenderMessageAsHTML?: boolean;
 };
 
-function FormHelpMessage({message = '', children, isError = true, style, shouldShowRedDotIndicator = true}: FormHelpMessageProps) {
+function FormHelpMessage({message = '', children, isError = true, style, shouldShowRedDotIndicator = true, shouldRenderMessageAsHTML = false}: FormHelpMessageProps) {
     const theme = useTheme();
     const styles = useThemeStyles();
+
+    const HTMLMessage = useMemo(() => {
+        if (typeof message !== 'string' || !shouldRenderMessageAsHTML) {
+            return '';
+        }
+
+        const replacedText = Parser.replace(message, {shouldEscapeText: false});
+
+        if (isError) {
+            return `<alert-text>${replacedText}</alert-text>`;
+        }
+
+        return `<muted-text-label>${replacedText}</muted-text-label>`;
+    }, [isError, message, shouldRenderMessageAsHTML]);
+
     if (isEmpty(message) && isEmpty(children)) {
         return null;
     }
 
-    const translatedMessage = Localize.translateIfPhraseKey(message);
-
     return (
         <View style={[styles.flexRow, styles.alignItemsCenter, styles.mt2, styles.mb1, style]}>
             {isError && shouldShowRedDotIndicator && (
@@ -44,7 +61,7 @@ function FormHelpMessage({message = '', children, isError = true, style, shouldS
                 />
             )}
             <View style={[styles.flex1, isError && shouldShowRedDotIndicator ? styles.ml2 : {}]}>
-                {children ?? <Text style={[isError ? styles.formError : styles.formHelp, styles.mb0]}>{translatedMessage}</Text>}
+                {children ?? (shouldRenderMessageAsHTML ? <RenderHTML html={HTMLMessage} /> : <Text style={[isError ? styles.formError : styles.formHelp, styles.mb0]}>{message}</Text>)}
             </View>
         </View>
     );
diff --git a/src/components/FullstoryNative.tsx b/src/components/FullstoryNative.tsx
new file mode 100644
index 000000000000..63e6217a464e
--- /dev/null
+++ b/src/components/FullstoryNative.tsx
@@ -0,0 +1,3 @@
+import FS from '@fullstory/react-native';
+
+export default FS;
diff --git a/src/components/GrowlNotification/GrowlNotificationContainer/index.tsx b/src/components/GrowlNotification/GrowlNotificationContainer/index.tsx
index 3bbd0303906d..78d80bbb36b6 100644
--- a/src/components/GrowlNotification/GrowlNotificationContainer/index.tsx
+++ b/src/components/GrowlNotification/GrowlNotificationContainer/index.tsx
@@ -1,16 +1,16 @@
 import React from 'react';
 import {Animated} from 'react-native';
+import useResponsiveLayout from '@hooks/useResponsiveLayout';
 import useThemeStyles from '@hooks/useThemeStyles';
-import useWindowDimensions from '@hooks/useWindowDimensions';
 import type GrowlNotificationContainerProps from './types';
 
 function GrowlNotificationContainer({children, translateY}: GrowlNotificationContainerProps) {
     const styles = useThemeStyles();
-    const {isSmallScreenWidth} = useWindowDimensions();
+    const {shouldUseNarrowLayout} = useResponsiveLayout();
 
     return (
         <Animated.View
-            style={[styles.growlNotificationContainer, styles.growlNotificationDesktopContainer, styles.growlNotificationTranslateY(translateY), isSmallScreenWidth && styles.mwn]}
+            style={[styles.growlNotificationContainer, styles.growlNotificationDesktopContainer, styles.growlNotificationTranslateY(translateY), shouldUseNarrowLayout && styles.mwn]}
         >
             {children}
         </Animated.View>
diff --git a/src/components/HTMLEngineProvider/BaseHTMLEngineProvider.tsx b/src/components/HTMLEngineProvider/BaseHTMLEngineProvider.tsx
index 51f9981f1524..97be05049e3c 100755
--- a/src/components/HTMLEngineProvider/BaseHTMLEngineProvider.tsx
+++ b/src/components/HTMLEngineProvider/BaseHTMLEngineProvider.tsx
@@ -42,6 +42,11 @@ function BaseHTMLEngineProvider({textSelectable = false, children, enableExperim
                 mixedUAStyles: {...styles.colorMuted, ...styles.mb0},
                 contentModel: HTMLContentModel.block,
             }),
+            'muted-text-label': HTMLElementModel.fromCustomModel({
+                tagName: 'muted-text-label',
+                mixedUAStyles: {...styles.mutedNormalTextLabel, ...styles.mb0},
+                contentModel: HTMLContentModel.block,
+            }),
             comment: HTMLElementModel.fromCustomModel({
                 tagName: 'comment',
                 mixedUAStyles: {whiteSpace: 'pre'},
@@ -78,7 +83,7 @@ function BaseHTMLEngineProvider({textSelectable = false, children, enableExperim
                 contentModel: HTMLContentModel.textual,
             }),
         }),
-        [styles.formError, styles.mb0, styles.colorMuted, styles.textLabelSupporting, styles.lh16, styles.textSupporting, styles.textLineThrough],
+        [styles.formError, styles.mb0, styles.colorMuted, styles.textLabelSupporting, styles.lh16, styles.textSupporting, styles.textLineThrough, styles.mutedNormalTextLabel],
     );
     /* eslint-enable @typescript-eslint/naming-convention */
 
@@ -91,7 +96,7 @@ function BaseHTMLEngineProvider({textSelectable = false, children, enableExperim
             baseStyle={styles.webViewStyles.baseFontStyle}
             tagsStyles={styles.webViewStyles.tagStyles}
             enableCSSInlineProcessing={false}
-            systemFonts={Object.values(FontUtils.fontFamily.single)}
+            systemFonts={Object.values(FontUtils.fontFamily.single).map((font) => font.fontFamily)}
             htmlParserOptions={{
                 recognizeSelfClosing: true,
             }}
diff --git a/src/components/HTMLEngineProvider/HTMLRenderers/AnchorRenderer.tsx b/src/components/HTMLEngineProvider/HTMLRenderers/AnchorRenderer.tsx
index d918007e5750..7892d8624699 100644
--- a/src/components/HTMLEngineProvider/HTMLRenderers/AnchorRenderer.tsx
+++ b/src/components/HTMLEngineProvider/HTMLRenderers/AnchorRenderer.tsx
@@ -1,4 +1,4 @@
-import Str from 'expensify-common/lib/str';
+import {Str} from 'expensify-common';
 import React from 'react';
 import {TNodeChildrenRenderer} from 'react-native-render-html';
 import type {CustomRendererProps, TBlock} from 'react-native-render-html';
@@ -22,7 +22,7 @@ function AnchorRenderer({tnode, style, key}: AnchorRendererProps) {
     const htmlAttribs = tnode.attributes;
     const {environmentURL} = useEnvironment();
     // An auth token is needed to download Expensify chat attachments
-    const isAttachment = Boolean(htmlAttribs[CONST.ATTACHMENT_SOURCE_ATTRIBUTE]);
+    const isAttachment = !!htmlAttribs[CONST.ATTACHMENT_SOURCE_ATTRIBUTE];
     const tNodeChild = tnode?.domNode?.children?.[0];
     const displayName = tNodeChild && 'data' in tNodeChild && typeof tNodeChild.data === 'string' ? tNodeChild.data : '';
     const parentStyle = tnode.parent?.styles?.nativeTextRet ?? {};
diff --git a/src/components/HTMLEngineProvider/HTMLRenderers/CodeRenderer.tsx b/src/components/HTMLEngineProvider/HTMLRenderers/CodeRenderer.tsx
index 788db4ea4de2..a319507bc3ad 100644
--- a/src/components/HTMLEngineProvider/HTMLRenderers/CodeRenderer.tsx
+++ b/src/components/HTMLEngineProvider/HTMLRenderers/CodeRenderer.tsx
@@ -4,6 +4,7 @@ import type {CustomRendererProps, TPhrasing, TText} from 'react-native-render-ht
 import * as HTMLEngineUtils from '@components/HTMLEngineProvider/htmlEngineUtils';
 import InlineCodeBlock from '@components/InlineCodeBlock';
 import useStyleUtils from '@hooks/useStyleUtils';
+import FontUtils from '@styles/utils/FontUtils';
 
 type CodeRendererProps = CustomRendererProps<TText | TPhrasing> & {
     /** Key of the element */
@@ -17,10 +18,7 @@ function CodeRenderer({TDefaultRenderer, key, style, ...defaultRendererProps}: C
     const {boxModelStyle, otherStyle: textStyle} = splitBoxModelStyle(style ?? {});
 
     /** Get the default fontFamily variant */
-    const font = StyleUtils.getFontFamilyMonospace({
-        fontStyle: undefined,
-        fontWeight: undefined,
-    });
+    const font = FontUtils.fontFamily.platform.MONOSPACE.fontFamily;
 
     // Determine the font size for the code based on whether it's inside an H1 element.
     const isInsideH1 = HTMLEngineUtils.isChildOfH1(defaultRendererProps.tnode);
diff --git a/src/components/HTMLEngineProvider/HTMLRenderers/EditedRenderer.tsx b/src/components/HTMLEngineProvider/HTMLRenderers/EditedRenderer.tsx
index 03f7a5dbedf7..88e5c1f42555 100644
--- a/src/components/HTMLEngineProvider/HTMLRenderers/EditedRenderer.tsx
+++ b/src/components/HTMLEngineProvider/HTMLRenderers/EditedRenderer.tsx
@@ -11,11 +11,13 @@ function EditedRenderer({tnode, TDefaultRenderer, style, ...defaultRendererProps
     const theme = useTheme();
     const styles = useThemeStyles();
     const {translate} = useLocalize();
-    const isPendingDelete = Boolean(tnode.attributes.deleted !== undefined);
+    const isPendingDelete = !!(tnode.attributes.deleted !== undefined);
+    const isLarge = !!(tnode.attributes.islarge !== undefined);
     return (
-        <Text>
+        <Text style={isLarge && styles.onlyEmojisTextLineHeight}>
             <Text
                 style={styles.userSelectNone}
+                fontSize={variables.fontSizeSmall}
                 dataSet={{[CONST.SELECTION_SCRAPER_HIDDEN_ELEMENT]: true}}
             >
                 {' '}
diff --git a/src/components/HTMLEngineProvider/HTMLRenderers/ImageRenderer.tsx b/src/components/HTMLEngineProvider/HTMLRenderers/ImageRenderer.tsx
index 79eaa30ee922..771d2631379e 100644
--- a/src/components/HTMLEngineProvider/HTMLRenderers/ImageRenderer.tsx
+++ b/src/components/HTMLEngineProvider/HTMLRenderers/ImageRenderer.tsx
@@ -2,6 +2,7 @@ import React, {memo} from 'react';
 import {withOnyx} from 'react-native-onyx';
 import type {OnyxEntry} from 'react-native-onyx';
 import type {CustomRendererProps, TBlock} from 'react-native-render-html';
+import {AttachmentContext} from '@components/AttachmentContext';
 import * as Expensicons from '@components/Icon/Expensicons';
 import PressableWithoutFocus from '@components/Pressable/PressableWithoutFocus';
 import {ShowContextMenuContext, showContextMenuForReport} from '@components/ShowContextMenuContext';
@@ -50,12 +51,13 @@ function ImageRenderer({tnode}: ImageRendererProps) {
     //           control and thus require no authToken to verify access.
     //
     const attachmentSourceAttribute = htmlAttribs[CONST.ATTACHMENT_SOURCE_ATTRIBUTE];
-    const isAttachmentOrReceipt = Boolean(attachmentSourceAttribute);
+    const isAttachmentOrReceipt = !!attachmentSourceAttribute;
 
     // Files created/uploaded/hosted by App should resolve from API ROOT. Other URLs aren't modified
     const previewSource = tryResolveUrlFromApiRoot(htmlAttribs.src);
     const source = tryResolveUrlFromApiRoot(isAttachmentOrReceipt ? attachmentSourceAttribute : htmlAttribs.src);
 
+    const alt = htmlAttribs.alt;
     const imageWidth = (htmlAttribs['data-expensify-width'] && parseInt(htmlAttribs['data-expensify-width'], 10)) || undefined;
     const imageHeight = (htmlAttribs['data-expensify-height'] && parseInt(htmlAttribs['data-expensify-height'], 10)) || undefined;
     const imagePreviewModalDisabled = htmlAttribs['data-expensify-preview-modal-disabled'] === 'true';
@@ -70,6 +72,7 @@ function ImageRenderer({tnode}: ImageRendererProps) {
             fallbackIcon={fallbackIcon}
             imageWidth={imageWidth}
             imageHeight={imageHeight}
+            altText={alt}
         />
     );
 
@@ -77,20 +80,32 @@ function ImageRenderer({tnode}: ImageRendererProps) {
         thumbnailImageComponent
     ) : (
         <ShowContextMenuContext.Consumer>
-            {({anchor, report, action, checkIfContextMenuActive}) => (
-                <PressableWithoutFocus
-                    style={[styles.noOutline]}
-                    onPress={() => {
-                        const route = ROUTES.REPORT_ATTACHMENTS.getRoute(report?.reportID ?? '', source);
-                        Navigation.navigate(route);
-                    }}
-                    onLongPress={(event) => showContextMenuForReport(event, anchor, report?.reportID ?? '', action, checkIfContextMenuActive, ReportUtils.isArchivedRoom(report))}
-                    shouldUseHapticsOnLongPress
-                    accessibilityRole={CONST.ACCESSIBILITY_ROLE.IMAGEBUTTON}
-                    accessibilityLabel={translate('accessibilityHints.viewAttachment')}
-                >
-                    {thumbnailImageComponent}
-                </PressableWithoutFocus>
+            {({anchor, report, reportNameValuePairs, action, checkIfContextMenuActive}) => (
+                <AttachmentContext.Consumer>
+                    {({reportID, accountID, type}) => (
+                        <PressableWithoutFocus
+                            style={[styles.noOutline]}
+                            onPress={() => {
+                                if (!source || !type) {
+                                    return;
+                                }
+
+                                if (reportID) {
+                                    const route = ROUTES.ATTACHMENTS?.getRoute(reportID, type, source, accountID);
+                                    Navigation.navigate(route);
+                                }
+                            }}
+                            onLongPress={(event) =>
+                                showContextMenuForReport(event, anchor, report?.reportID ?? '-1', action, checkIfContextMenuActive, ReportUtils.isArchivedRoom(report, reportNameValuePairs))
+                            }
+                            shouldUseHapticsOnLongPress
+                            accessibilityRole={CONST.ROLE.BUTTON}
+                            accessibilityLabel={translate('accessibilityHints.viewAttachment')}
+                        >
+                            {thumbnailImageComponent}
+                        </PressableWithoutFocus>
+                    )}
+                </AttachmentContext.Consumer>
             )}
         </ShowContextMenuContext.Consumer>
     );
diff --git a/src/components/HTMLEngineProvider/HTMLRenderers/MentionReportRenderer.tsx b/src/components/HTMLEngineProvider/HTMLRenderers/MentionReportRenderer.tsx
index 345bd338f365..66e297e50734 100644
--- a/src/components/HTMLEngineProvider/HTMLRenderers/MentionReportRenderer.tsx
+++ b/src/components/HTMLEngineProvider/HTMLRenderers/MentionReportRenderer.tsx
@@ -3,20 +3,18 @@ import React, {useMemo} from 'react';
 import type {TextStyle} from 'react-native';
 import {StyleSheet} from 'react-native';
 import type {OnyxCollection, OnyxEntry} from 'react-native-onyx';
-import {withOnyx} from 'react-native-onyx';
+import {useOnyx, withOnyx} from 'react-native-onyx';
 import type {CustomRendererProps, TPhrasing, TText} from 'react-native-render-html';
 import {ShowContextMenuContext} from '@components/ShowContextMenuContext';
 import Text from '@components/Text';
 import useCurrentReportID from '@hooks/useCurrentReportID';
 import useStyleUtils from '@hooks/useStyleUtils';
 import useThemeStyles from '@hooks/useThemeStyles';
-import {getReport} from '@libs/ReportUtils';
 import Navigation from '@navigation/Navigation';
 import CONST from '@src/CONST';
 import ONYXKEYS from '@src/ONYXKEYS';
 import ROUTES from '@src/ROUTES';
 import type {Report} from '@src/types/onyx';
-import type {EmptyObject} from '@src/types/utils/EmptyObject';
 import {isEmptyObject} from '@src/types/utils/EmptyObject';
 
 type MentionReportOnyxProps = {
@@ -28,14 +26,13 @@ type MentionReportRendererProps = MentionReportOnyxProps & CustomRendererProps<T
 
 const removeLeadingLTRAndHash = (value: string) => value.replace(CONST.UNICODE.LTR, '').replace('#', '');
 
-const getMentionDetails = (htmlAttributeReportID: string, currentReport: OnyxEntry<Report> | EmptyObject, reports: OnyxCollection<Report>, tnode: TText | TPhrasing) => {
+const getMentionDetails = (htmlAttributeReportID: string, currentReport: OnyxEntry<Report>, reports: OnyxCollection<Report>, tnode: TText | TPhrasing) => {
     let reportID: string | undefined;
     let mentionDisplayText: string;
 
     // Get mention details based on reportID from tag attribute
     if (!isEmpty(htmlAttributeReportID)) {
-        const report = getReport(htmlAttributeReportID);
-
+        const report = reports?.[`${ONYXKEYS.COLLECTION.REPORT}${htmlAttributeReportID}`];
         reportID = report?.reportID ?? htmlAttributeReportID;
         mentionDisplayText = removeLeadingLTRAndHash(report?.reportName ?? report?.displayName ?? htmlAttributeReportID);
         // Get mention details from name inside tnode
@@ -61,7 +58,8 @@ function MentionReportRenderer({style, tnode, TDefaultRenderer, reports, ...defa
     const htmlAttributeReportID = tnode.attributes.reportid;
 
     const currentReportID = useCurrentReportID();
-    const currentReport = getReport(currentReportID?.currentReportID);
+    // eslint-disable-next-line @typescript-eslint/prefer-nullish-coalescing
+    const [currentReport] = useOnyx(`${ONYXKEYS.COLLECTION.REPORT}${currentReportID?.currentReportID || -1}`);
 
     // When we invite someone to a room they don't have the policy object, but we still want them to be able to see and click on report mentions, so we only check if the policyID in the report is from a workspace
     const isGroupPolicyReport = useMemo(() => currentReport && !isEmptyObject(currentReport) && !!currentReport.policyID && currentReport.policyID !== CONST.POLICY.ID_FAKE, [currentReport]);
diff --git a/src/components/HTMLEngineProvider/HTMLRenderers/MentionUserRenderer.tsx b/src/components/HTMLEngineProvider/HTMLRenderers/MentionUserRenderer.tsx
index 0c7c82534bbb..ffab2434c83c 100644
--- a/src/components/HTMLEngineProvider/HTMLRenderers/MentionUserRenderer.tsx
+++ b/src/components/HTMLEngineProvider/HTMLRenderers/MentionUserRenderer.tsx
@@ -1,4 +1,4 @@
-import Str from 'expensify-common/lib/str';
+import {Str} from 'expensify-common';
 import cloneDeep from 'lodash/cloneDeep';
 import isEmpty from 'lodash/isEmpty';
 import React from 'react';
@@ -69,7 +69,7 @@ function MentionUserRenderer({style, tnode, TDefaultRenderer, currentUserPersona
         asMutable(tnodeClone).data = tnodeClone.data.replace(mentionDisplayText, Str.removeSMSDomain(getShortMentionIfFound(mentionDisplayText, htmlAttributeAccountID)));
 
         accountID = PersonalDetailsUtils.getAccountIDsByLogins([mentionDisplayText])?.[0];
-        navigationRoute = ROUTES.DETAILS.getRoute(mentionDisplayText);
+        navigationRoute = ROUTES.PROFILE.getRoute(accountID, undefined, mentionDisplayText);
         mentionDisplayText = Str.removeSMSDomain(mentionDisplayText);
     } else {
         // If neither an account ID or email is provided, don't render anything
@@ -83,10 +83,12 @@ function MentionUserRenderer({style, tnode, TDefaultRenderer, currentUserPersona
 
     return (
         <ShowContextMenuContext.Consumer>
-            {({anchor, report, action, checkIfContextMenuActive}) => (
+            {({anchor, report, reportNameValuePairs, action, checkIfContextMenuActive}) => (
                 <Text
                     suppressHighlighting
-                    onLongPress={(event) => showContextMenuForReport(event, anchor, report?.reportID ?? '', action, checkIfContextMenuActive, ReportUtils.isArchivedRoom(report))}
+                    onLongPress={(event) =>
+                        showContextMenuForReport(event, anchor, report?.reportID ?? '-1', action, checkIfContextMenuActive, ReportUtils.isArchivedRoom(report, reportNameValuePairs))
+                    }
                     onPress={(event) => {
                         event.preventDefault();
                         Navigation.navigate(navigationRoute);
@@ -105,7 +107,7 @@ function MentionUserRenderer({style, tnode, TDefaultRenderer, currentUserPersona
                             {...defaultRendererProps}
                             style={[styles.link, styleWithoutColor, StyleUtils.getMentionStyle(isOurMention), {color: StyleUtils.getMentionTextColor(isOurMention)}]}
                             role={CONST.ROLE.LINK}
-                            testID="span"
+                            testID="mention-user"
                             href={`/${navigationRoute}`}
                         >
                             {htmlAttribAccountID ? `@${mentionDisplayText}` : <TNodeChildrenRenderer tnode={tnodeClone} />}
diff --git a/src/components/HTMLEngineProvider/HTMLRenderers/PreRenderer.tsx b/src/components/HTMLEngineProvider/HTMLRenderers/PreRenderer.tsx
index 39a1993c2334..14666798e8c7 100644
--- a/src/components/HTMLEngineProvider/HTMLRenderers/PreRenderer.tsx
+++ b/src/components/HTMLEngineProvider/HTMLRenderers/PreRenderer.tsx
@@ -34,12 +34,14 @@ function PreRenderer({TDefaultRenderer, onPressIn, onPressOut, onLongPress, ...d
     return (
         <View style={isLast ? styles.mt2 : styles.mv2}>
             <ShowContextMenuContext.Consumer>
-                {({anchor, report, action, checkIfContextMenuActive}) => (
+                {({anchor, report, reportNameValuePairs, action, checkIfContextMenuActive}) => (
                     <PressableWithoutFeedback
                         onPress={onPressIn ?? (() => {})}
                         onPressIn={onPressIn}
                         onPressOut={onPressOut}
-                        onLongPress={(event) => showContextMenuForReport(event, anchor, report?.reportID ?? '', action, checkIfContextMenuActive, ReportUtils.isArchivedRoom(report))}
+                        onLongPress={(event) =>
+                            showContextMenuForReport(event, anchor, report?.reportID ?? '-1', action, checkIfContextMenuActive, ReportUtils.isArchivedRoom(report, reportNameValuePairs))
+                        }
                         shouldUseHapticsOnLongPress
                         role={CONST.ROLE.PRESENTATION}
                         accessibilityLabel={translate('accessibilityHints.prestyledText')}
diff --git a/src/components/HTMLEngineProvider/HTMLRenderers/VideoRenderer.tsx b/src/components/HTMLEngineProvider/HTMLRenderers/VideoRenderer.tsx
index 6802a4518ba1..e0df7e7081c5 100644
--- a/src/components/HTMLEngineProvider/HTMLRenderers/VideoRenderer.tsx
+++ b/src/components/HTMLEngineProvider/HTMLRenderers/VideoRenderer.tsx
@@ -2,6 +2,7 @@ import React from 'react';
 import type {CustomRendererProps, TBlock} from 'react-native-render-html';
 import {ShowContextMenuContext} from '@components/ShowContextMenuContext';
 import VideoPlayerPreview from '@components/VideoPlayerPreview';
+import useCurrentReportID from '@hooks/useCurrentReportID';
 import * as FileUtils from '@libs/fileDownload/FileUtils';
 import tryResolveUrlFromApiRoot from '@libs/tryResolveUrlFromApiRoot';
 import Navigation from '@navigation/Navigation';
@@ -15,13 +16,14 @@ type VideoRendererProps = CustomRendererProps<TBlock> & {
 
 function VideoRenderer({tnode, key}: VideoRendererProps) {
     const htmlAttribs = tnode.attributes;
-    const attrHref = htmlAttribs.href || htmlAttribs[CONST.ATTACHMENT_SOURCE_ATTRIBUTE] || '';
+    const attrHref = htmlAttribs[CONST.ATTACHMENT_SOURCE_ATTRIBUTE] || htmlAttribs.src || htmlAttribs.href || '';
     const sourceURL = tryResolveUrlFromApiRoot(attrHref);
     const fileName = FileUtils.getFileName(`${sourceURL}`);
-    const thumbnailUrl = htmlAttribs[CONST.ATTACHMENT_THUMBNAIL_URL_ATTRIBUTE];
+    const thumbnailUrl = tryResolveUrlFromApiRoot(htmlAttribs[CONST.ATTACHMENT_THUMBNAIL_URL_ATTRIBUTE]);
     const width = Number(htmlAttribs[CONST.ATTACHMENT_THUMBNAIL_WIDTH_ATTRIBUTE]);
     const height = Number(htmlAttribs[CONST.ATTACHMENT_THUMBNAIL_HEIGHT_ATTRIBUTE]);
     const duration = Number(htmlAttribs[CONST.ATTACHMENT_DURATION_ATTRIBUTE]);
+    const currentReportIDValue = useCurrentReportID();
 
     return (
         <ShowContextMenuContext.Consumer>
@@ -29,13 +31,13 @@ function VideoRenderer({tnode, key}: VideoRendererProps) {
                 <VideoPlayerPreview
                     key={key}
                     videoUrl={sourceURL}
-                    reportID={report?.reportID ?? ''}
+                    reportID={currentReportIDValue?.currentReportID ?? '-1'}
                     fileName={fileName}
                     thumbnailUrl={thumbnailUrl}
                     videoDimensions={{width, height}}
                     videoDuration={duration}
                     onShowModalPress={() => {
-                        const route = ROUTES.REPORT_ATTACHMENTS.getRoute(report?.reportID ?? '', sourceURL);
+                        const route = ROUTES.ATTACHMENTS.getRoute(report?.reportID ?? '-1', CONST.ATTACHMENT_TYPE.REPORT, sourceURL);
                         Navigation.navigate(route);
                     }}
                 />
diff --git a/src/components/HTMLEngineProvider/index.tsx b/src/components/HTMLEngineProvider/index.tsx
index 9addb549d13a..d50e4a071dc7 100755
--- a/src/components/HTMLEngineProvider/index.tsx
+++ b/src/components/HTMLEngineProvider/index.tsx
@@ -1,13 +1,13 @@
 import React from 'react';
-import useWindowDimensions from '@hooks/useWindowDimensions';
+import useResponsiveLayout from '@hooks/useResponsiveLayout';
 import * as DeviceCapabilities from '@libs/DeviceCapabilities';
 import type ChildrenProps from '@src/types/utils/ChildrenProps';
 import BaseHTMLEngineProvider from './BaseHTMLEngineProvider';
 
 function HTMLEngineProvider({children}: ChildrenProps) {
-    const {isSmallScreenWidth} = useWindowDimensions();
+    const {shouldUseNarrowLayout} = useResponsiveLayout();
 
-    return <BaseHTMLEngineProvider textSelectable={!DeviceCapabilities.canUseTouchScreen() || !isSmallScreenWidth}>{children}</BaseHTMLEngineProvider>;
+    return <BaseHTMLEngineProvider textSelectable={!DeviceCapabilities.canUseTouchScreen() || !shouldUseNarrowLayout}>{children}</BaseHTMLEngineProvider>;
 }
 
 HTMLEngineProvider.displayName = 'HTMLEngineProvider';
diff --git a/src/components/Header.tsx b/src/components/Header.tsx
index bf97346940a5..86a7a9cabcb6 100644
--- a/src/components/Header.tsx
+++ b/src/components/Header.tsx
@@ -30,7 +30,7 @@ function Header({title = '', subtitle = '', textStyles = [], containerStyles = [
             <>
                 {/* If there's no subtitle then display a fragment to avoid an empty space which moves the main title */}
                 {typeof subtitle === 'string'
-                    ? Boolean(subtitle) && (
+                    ? !!subtitle && (
                           <Text
                               style={[styles.mutedTextLabel, styles.pre]}
                               numberOfLines={1}
@@ -47,7 +47,7 @@ function Header({title = '', subtitle = '', textStyles = [], containerStyles = [
         <View style={[styles.flex1, styles.flexRow, containerStyles]}>
             <View style={styles.mw100}>
                 {typeof title === 'string'
-                    ? Boolean(title) && (
+                    ? !!title && (
                           <Text
                               numberOfLines={2}
                               style={[styles.headerText, styles.textLarge, textStyles]}
diff --git a/src/components/HeaderPageLayout.tsx b/src/components/HeaderPageLayout.tsx
index 86bd6ee11655..e7f5e2de7386 100644
--- a/src/components/HeaderPageLayout.tsx
+++ b/src/components/HeaderPageLayout.tsx
@@ -3,6 +3,7 @@ import type {ReactNode} from 'react';
 import {View} from 'react-native';
 import type {StyleProp, ViewStyle} from 'react-native';
 import useNetwork from '@hooks/useNetwork';
+import useResponsiveLayout from '@hooks/useResponsiveLayout';
 import useStyleUtils from '@hooks/useStyleUtils';
 import useTheme from '@hooks/useTheme';
 import useThemeStyles from '@hooks/useThemeStyles';
@@ -60,7 +61,8 @@ function HeaderPageLayout({
     const theme = useTheme();
     const styles = useThemeStyles();
     const StyleUtils = useStyleUtils();
-    const {windowHeight, isSmallScreenWidth} = useWindowDimensions();
+    const {windowHeight} = useWindowDimensions();
+    const {shouldUseNarrowLayout} = useResponsiveLayout();
     const {isOffline} = useNetwork();
     const appBGColor = StyleUtils.getBackgroundColorStyle(theme.appBG);
     const {titleColor, iconFill} = useMemo(() => {
@@ -93,7 +95,7 @@ function HeaderPageLayout({
                         {Browser.isSafari() && (
                             <View style={styles.dualColorOverscrollSpacer}>
                                 <View style={[styles.flex1, StyleUtils.getBackgroundColorStyle(backgroundColor ?? theme.appBG)]} />
-                                <View style={[isSmallScreenWidth ? styles.flex1 : styles.flex3, appBGColor]} />
+                                <View style={[shouldUseNarrowLayout ? styles.flex1 : styles.flex3, appBGColor]} />
                             </View>
                         )}
                         <ScrollView contentContainerStyle={[safeAreaPaddingBottomStyle, style, scrollViewContainerStyles]}>
diff --git a/src/components/HeaderWithBackButton/index.tsx b/src/components/HeaderWithBackButton/index.tsx
index 70f1b97c04b1..f1e715bface8 100755
--- a/src/components/HeaderWithBackButton/index.tsx
+++ b/src/components/HeaderWithBackButton/index.tsx
@@ -30,7 +30,7 @@ function HeaderWithBackButton({
     onCloseButtonPress = () => Navigation.dismissModal(),
     onDownloadButtonPress = () => {},
     onThreeDotsButtonPress = () => {},
-    report = null,
+    report,
     policy,
     policyAvatar,
     shouldShowReportAvatarWithDisplay = false,
@@ -53,6 +53,8 @@ function HeaderWithBackButton({
         horizontal: 0,
     },
     threeDotsMenuItems = [],
+    threeDotsMenuIcon,
+    threeDotsMenuIconFill,
     shouldEnableDetailPageNavigation = false,
     children = null,
     shouldOverlayDots = false,
@@ -158,7 +160,7 @@ function HeaderWithBackButton({
                                 }
                             }}
                             style={[styles.touchableButtonImage]}
-                            role="button"
+                            role={CONST.ROLE.BUTTON}
                             accessibilityLabel={translate('common.back')}
                             id={CONST.BACK_BUTTON_NATIVE_ID}
                         >
@@ -182,7 +184,7 @@ function HeaderWithBackButton({
                         containerStyles={[StyleUtils.getWidthAndHeightStyle(StyleUtils.getAvatarSize(CONST.AVATAR_SIZE.DEFAULT)), styles.mr3]}
                         source={policyAvatar?.source}
                         name={policyAvatar?.name}
-                        accountID={policyAvatar?.id}
+                        avatarID={policyAvatar?.id}
                         type={policyAvatar?.type}
                     />
                 )}
@@ -234,6 +236,8 @@ function HeaderWithBackButton({
                     {shouldShowPinButton && !!report && <PinButton report={report} />}
                     {shouldShowThreeDotsButton && (
                         <ThreeDotsMenu
+                            icon={threeDotsMenuIcon}
+                            iconFill={threeDotsMenuIconFill}
                             disabled={shouldDisableThreeDotsButton}
                             menuItems={threeDotsMenuItems}
                             onIconPress={onThreeDotsButtonPress}
diff --git a/src/components/HeaderWithBackButton/types.ts b/src/components/HeaderWithBackButton/types.ts
index 6b08dd74dc8b..c55a7bddc80c 100644
--- a/src/components/HeaderWithBackButton/types.ts
+++ b/src/components/HeaderWithBackButton/types.ts
@@ -80,6 +80,12 @@ type HeaderWithBackButtonProps = Partial<ChildrenProps> & {
     /** The anchor position of the menu */
     threeDotsAnchorPosition?: AnchorPosition;
 
+    /** Icon displayed on the right of the title */
+    threeDotsMenuIcon?: IconAsset;
+
+    /** The fill color to pass into the icon. */
+    threeDotsMenuIconFill?: string;
+
     /** Whether we should show a close button */
     shouldShowCloseButton?: boolean;
 
diff --git a/src/components/HoldBanner.tsx b/src/components/HoldBanner.tsx
index d760d4efbe96..b3288c4a66f8 100644
--- a/src/components/HoldBanner.tsx
+++ b/src/components/HoldBanner.tsx
@@ -11,7 +11,7 @@ function HoldBanner() {
 
     return (
         <View style={[styles.dFlex, styles.flexRow, styles.alignItemsCenter, styles.pb3, styles.ph5, styles.borderBottom]}>
-            <TextPill>{translate('iou.hold')}</TextPill>
+            <TextPill>{translate('violations.hold')}</TextPill>
             <Text style={[styles.textLabel, styles.pl3, styles.mw100, styles.flexShrink1]}>{translate('iou.expenseOnHold')}</Text>
         </View>
     );
diff --git a/src/components/Hoverable/ActiveHoverable.tsx b/src/components/Hoverable/ActiveHoverable.tsx
index 4bc56d35af45..fd3d4f3d19e8 100644
--- a/src/components/Hoverable/ActiveHoverable.tsx
+++ b/src/components/Hoverable/ActiveHoverable.tsx
@@ -8,7 +8,11 @@ import type HoverableProps from './types';
 
 type ActiveHoverableProps = Omit<HoverableProps, 'disabled'>;
 
-function ActiveHoverable({onHoverIn, onHoverOut, shouldHandleScroll, children}: ActiveHoverableProps, outerRef: Ref<HTMLElement>) {
+type MouseEvents = 'onMouseEnter' | 'onMouseLeave' | 'onMouseMove' | 'onBlur';
+
+type OnMouseEvents = Record<MouseEvents, (e: MouseEvent) => void>;
+
+function ActiveHoverable({onHoverIn, onHoverOut, shouldHandleScroll, shouldFreezeCapture, children}: ActiveHoverableProps, outerRef: Ref<HTMLElement>) {
     const [isHovered, setIsHovered] = useState(false);
 
     const elementRef = useRef<HTMLElement | null>(null);
@@ -19,12 +23,16 @@ function ActiveHoverable({onHoverIn, onHoverOut, shouldHandleScroll, children}:
     const updateIsHovered = useCallback(
         (hovered: boolean) => {
             isHoveredRef.current = hovered;
-            if (shouldHandleScroll && isScrollingRef.current) {
+            // Nullish coalescing operator (`??`) wouldn't be appropriate here because
+            // it's not a matter of providing a default when encountering `null` or `undefined`
+            // but rather making a decision based on the truthy nature of the complete expressions.
+            // eslint-disable-next-line @typescript-eslint/prefer-nullish-coalescing
+            if ((shouldHandleScroll && isScrollingRef.current) || shouldFreezeCapture) {
                 return;
             }
             setIsHovered(hovered);
         },
-        [shouldHandleScroll],
+        [shouldHandleScroll, shouldFreezeCapture],
     );
 
     useEffect(() => {
@@ -40,7 +48,7 @@ function ActiveHoverable({onHoverIn, onHoverOut, shouldHandleScroll, children}:
             return;
         }
 
-        const scrollingListener = DeviceEventEmitter.addListener(CONST.EVENTS.SCROLLING, (scrolling) => {
+        const scrollingListener = DeviceEventEmitter.addListener(CONST.EVENTS.SCROLLING, (scrolling: boolean) => {
             isScrollingRef.current = scrolling;
             if (!isScrollingRef.current) {
                 setIsHovered(isHoveredRef.current);
@@ -63,7 +71,9 @@ function ActiveHoverable({onHoverIn, onHoverOut, shouldHandleScroll, children}:
          * @param event The hover event object.
          */
         const unsetHoveredIfOutside = (event: MouseEvent) => {
-            if (!elementRef.current || elementRef.current.contains(event.target as Node)) {
+            // We're also returning early if shouldFreezeCapture is true in order
+            // to not update the hover state but keep it frozen.
+            if (!elementRef.current || elementRef.current.contains(event.target as Node) || shouldFreezeCapture) {
                 return;
             }
 
@@ -73,7 +83,7 @@ function ActiveHoverable({onHoverIn, onHoverOut, shouldHandleScroll, children}:
         document.addEventListener('mouseover', unsetHoveredIfOutside);
 
         return () => document.removeEventListener('mouseover', unsetHoveredIfOutside);
-    }, [isHovered, elementRef]);
+    }, [isHovered, elementRef, shouldFreezeCapture]);
 
     useEffect(() => {
         const unsetHoveredWhenDocumentIsHidden = () => {
@@ -92,25 +102,23 @@ function ActiveHoverable({onHoverIn, onHoverOut, shouldHandleScroll, children}:
 
     const child = useMemo(() => getReturnValue(children, !isScrollingRef.current && isHovered), [children, isHovered]);
 
-    const childOnMouseEnter = child.props.onMouseEnter;
-    const childOnMouseLeave = child.props.onMouseLeave;
-    const childOnMouseMove = child.props.onMouseMove;
+    const {onMouseEnter, onMouseLeave, onMouseMove, onBlur} = child.props as OnMouseEvents;
 
     const hoverAndForwardOnMouseEnter = useCallback(
         (e: MouseEvent) => {
             isVisibiltyHidden.current = false;
             updateIsHovered(true);
-            childOnMouseEnter?.(e);
+            onMouseEnter?.(e);
         },
-        [updateIsHovered, childOnMouseEnter],
+        [updateIsHovered, onMouseEnter],
     );
 
     const unhoverAndForwardOnMouseLeave = useCallback(
         (e: MouseEvent) => {
             updateIsHovered(false);
-            childOnMouseLeave?.(e);
+            onMouseLeave?.(e);
         },
-        [updateIsHovered, childOnMouseLeave],
+        [updateIsHovered, onMouseLeave],
     );
 
     const unhoverAndForwardOnBlur = useCallback(
@@ -121,18 +129,18 @@ function ActiveHoverable({onHoverIn, onHoverOut, shouldHandleScroll, children}:
                 setIsHovered(false);
             }
 
-            child.props.onBlur?.(event);
+            onBlur?.(event);
         },
-        [child.props],
+        [onBlur],
     );
 
     const handleAndForwardOnMouseMove = useCallback(
         (e: MouseEvent) => {
             isVisibiltyHidden.current = false;
             updateIsHovered(true);
-            childOnMouseMove?.(e);
+            onMouseMove?.(e);
         },
-        [updateIsHovered, childOnMouseMove],
+        [updateIsHovered, onMouseMove],
     );
 
     return cloneElement(child, {
diff --git a/src/components/Hoverable/types.ts b/src/components/Hoverable/types.ts
index 6963e3b5178c..72aa759dc16d 100644
--- a/src/components/Hoverable/types.ts
+++ b/src/components/Hoverable/types.ts
@@ -18,6 +18,9 @@ type HoverableProps = {
 
     /** Decides whether to handle the scroll behaviour to show hover once the scroll ends */
     shouldHandleScroll?: boolean;
+
+    /** Decides whether to freeze the capture of the hover event */
+    shouldFreezeCapture?: boolean;
 };
 
 export default HoverableProps;
diff --git a/src/components/HybridAppMiddleware/index.ios.tsx b/src/components/HybridAppMiddleware/index.ios.tsx
new file mode 100644
index 000000000000..aee837e02dea
--- /dev/null
+++ b/src/components/HybridAppMiddleware/index.ios.tsx
@@ -0,0 +1,176 @@
+import type React from 'react';
+import {useContext, useEffect, useRef, useState} from 'react';
+import {NativeEventEmitter, NativeModules} from 'react-native';
+import type {NativeModule} from 'react-native';
+import {useOnyx} from 'react-native-onyx';
+import type {OnyxEntry} from 'react-native-onyx';
+import {InitialURLContext} from '@components/InitialURLContextProvider';
+import useExitTo from '@hooks/useExitTo';
+import useSplashScreen from '@hooks/useSplashScreen';
+import BootSplash from '@libs/BootSplash';
+import Log from '@libs/Log';
+import Navigation from '@libs/Navigation/Navigation';
+import * as SessionUtils from '@libs/SessionUtils';
+import * as Welcome from '@userActions/Welcome';
+import CONST from '@src/CONST';
+import ONYXKEYS from '@src/ONYXKEYS';
+import type {HybridAppRoute, Route} from '@src/ROUTES';
+import ROUTES from '@src/ROUTES';
+import type {TryNewDot} from '@src/types/onyx';
+
+type HybridAppMiddlewareProps = {
+    authenticated: boolean;
+    children: React.ReactNode;
+};
+
+const onboardingStatusSelector = (tryNewDot: OnyxEntry<TryNewDot>) => {
+    let completedHybridAppOnboarding = tryNewDot?.classicRedirect?.completedHybridAppOnboarding;
+
+    if (typeof completedHybridAppOnboarding === 'string') {
+        completedHybridAppOnboarding = completedHybridAppOnboarding === 'true';
+    }
+
+    return completedHybridAppOnboarding;
+};
+
+/*
+ * HybridAppMiddleware is responsible for handling BootSplash visibility correctly.
+ * It is crucial to make transitions between OldDot and NewDot look smooth.
+ * The middleware assumes that the entry point for HybridApp is the /transition route.
+ */
+function HybridAppMiddleware({children, authenticated}: HybridAppMiddlewareProps) {
+    const {isSplashHidden, setIsSplashHidden} = useSplashScreen();
+    const [startedTransition, setStartedTransition] = useState(false);
+    const [finishedTransition, setFinishedTransition] = useState(false);
+
+    const initialURL = useContext(InitialURLContext);
+    const exitToParam = useExitTo();
+    const [exitTo, setExitTo] = useState<Route | HybridAppRoute | undefined>();
+
+    const [isAccountLoading] = useOnyx(ONYXKEYS.ACCOUNT, {selector: (account) => account?.isLoading ?? false});
+    const [sessionEmail] = useOnyx(ONYXKEYS.SESSION, {selector: (session) => session?.email});
+    const [completedHybridAppOnboarding] = useOnyx(ONYXKEYS.NVP_TRYNEWDOT, {selector: onboardingStatusSelector});
+
+    const maxTimeoutRef = useRef<NodeJS.Timeout | null>(null);
+
+    // We need to ensure that the BootSplash is always hidden after a certain period.
+    useEffect(() => {
+        if (!NativeModules.HybridAppModule) {
+            return;
+        }
+
+        maxTimeoutRef.current = setTimeout(() => {
+            Log.info('[HybridApp] Forcing transition due to unknown problem', true);
+            setStartedTransition(true);
+            setExitTo(ROUTES.HOME);
+        }, 3000);
+    }, []);
+    /**
+     * This useEffect tracks changes of `nvp_tryNewDot` value.
+     * We propagate it from OldDot to NewDot with native method due to limitations of old app.
+     */
+    useEffect(() => {
+        if (completedHybridAppOnboarding === undefined) {
+            return;
+        }
+
+        if (!NativeModules.HybridAppModule) {
+            Log.hmmm(`[HybridApp] Onboarding status has changed, but the HybridAppModule is not defined`);
+            return;
+        }
+
+        Log.info(`[HybridApp] Onboarding status has changed. Propagating new value to OldDot`, true, {completedHybridAppOnboarding});
+        NativeModules.HybridAppModule.completeOnboarding(completedHybridAppOnboarding);
+    }, [completedHybridAppOnboarding]);
+
+    // In iOS, the HybridApp defines the `onReturnToOldDot` event.
+    // If we frequently transition from OldDot to NewDot during a single app lifecycle,
+    // we need to artificially display the bootsplash since the app is booted only once.
+    // Therefore, isSplashHidden needs to be updated at the appropriate time.
+    useEffect(() => {
+        if (!NativeModules.HybridAppModule) {
+            return;
+        }
+        const HybridAppEvents = new NativeEventEmitter(NativeModules.HybridAppModule as unknown as NativeModule);
+        const listener = HybridAppEvents.addListener(CONST.EVENTS.ON_RETURN_TO_OLD_DOT, () => {
+            Log.info('[HybridApp] `onReturnToOldDot` event received. Resetting state of HybridAppMiddleware', true);
+            setIsSplashHidden(false);
+            setStartedTransition(false);
+            setFinishedTransition(false);
+            setExitTo(undefined);
+        });
+
+        return () => {
+            listener.remove();
+        };
+    }, [setIsSplashHidden]);
+
+    // Save `exitTo` when we reach /transition route.
+    // `exitTo` should always exist during OldDot -> NewDot transitions.
+    useEffect(() => {
+        if (!NativeModules.HybridAppModule || !exitToParam || exitTo) {
+            return;
+        }
+
+        Log.info('[HybridApp] Saving `exitTo` for later', true, {exitTo: exitToParam});
+        setExitTo(exitToParam);
+
+        Log.info(`[HybridApp] Started transition`, true);
+        setStartedTransition(true);
+    }, [exitTo, exitToParam]);
+
+    useEffect(() => {
+        if (!startedTransition || finishedTransition) {
+            return;
+        }
+
+        const transitionURL = NativeModules.HybridAppModule ? `${CONST.DEEPLINK_BASE_URL}${initialURL ?? ''}` : initialURL;
+        const isLoggingInAsNewUser = SessionUtils.isLoggingInAsNewUser(transitionURL ?? undefined, sessionEmail);
+
+        // We need to wait with navigating to exitTo until all login-related actions are complete.
+        if (!authenticated || isLoggingInAsNewUser || isAccountLoading) {
+            return;
+        }
+
+        if (exitTo) {
+            Navigation.isNavigationReady().then(() => {
+                // We need to remove /transition from route history.
+                // `useExitTo` returns undefined for routes other than /transition.
+                if (exitToParam) {
+                    Log.info('[HybridApp] Removing /transition route from history', true);
+                    Navigation.goBack();
+                }
+
+                Log.info('[HybridApp] Navigating to `exitTo` route', true, {exitTo});
+                Navigation.navigate(Navigation.parseHybridAppUrl(exitTo));
+                setExitTo(undefined);
+
+                setTimeout(() => {
+                    Log.info('[HybridApp] Setting `finishedTransition` to true', true);
+                    setFinishedTransition(true);
+                }, CONST.SCREEN_TRANSITION_END_TIMEOUT);
+            });
+        }
+    }, [authenticated, exitTo, exitToParam, finishedTransition, initialURL, isAccountLoading, sessionEmail, startedTransition]);
+
+    useEffect(() => {
+        if (!finishedTransition || isSplashHidden) {
+            return;
+        }
+
+        Log.info('[HybridApp] Finished transition, hiding BootSplash', true);
+        BootSplash.hide().then(() => {
+            setIsSplashHidden(true);
+            if (authenticated) {
+                Log.info('[HybridApp] Handling onboarding flow', true);
+                Welcome.handleHybridAppOnboarding();
+            }
+        });
+    }, [authenticated, finishedTransition, isSplashHidden, setIsSplashHidden]);
+
+    return children;
+}
+
+HybridAppMiddleware.displayName = 'HybridAppMiddleware';
+
+export default HybridAppMiddleware;
diff --git a/src/components/HybridAppMiddleware/index.tsx b/src/components/HybridAppMiddleware/index.tsx
new file mode 100644
index 000000000000..bb5d7803e52e
--- /dev/null
+++ b/src/components/HybridAppMiddleware/index.tsx
@@ -0,0 +1,150 @@
+import type React from 'react';
+import {useContext, useEffect, useRef, useState} from 'react';
+import {NativeModules} from 'react-native';
+import {useOnyx} from 'react-native-onyx';
+import type {OnyxEntry} from 'react-native-onyx';
+import {InitialURLContext} from '@components/InitialURLContextProvider';
+import useExitTo from '@hooks/useExitTo';
+import useSplashScreen from '@hooks/useSplashScreen';
+import BootSplash from '@libs/BootSplash';
+import Log from '@libs/Log';
+import Navigation from '@libs/Navigation/Navigation';
+import * as SessionUtils from '@libs/SessionUtils';
+import * as Welcome from '@userActions/Welcome';
+import CONST from '@src/CONST';
+import ONYXKEYS from '@src/ONYXKEYS';
+import type {HybridAppRoute, Route} from '@src/ROUTES';
+import ROUTES from '@src/ROUTES';
+import type {TryNewDot} from '@src/types/onyx';
+
+type HybridAppMiddlewareProps = {
+    authenticated: boolean;
+    children: React.ReactNode;
+};
+
+const onboardingStatusSelector = (tryNewDot: OnyxEntry<TryNewDot>) => {
+    let completedHybridAppOnboarding = tryNewDot?.classicRedirect?.completedHybridAppOnboarding;
+
+    if (typeof completedHybridAppOnboarding === 'string') {
+        completedHybridAppOnboarding = completedHybridAppOnboarding === 'true';
+    }
+
+    return completedHybridAppOnboarding;
+};
+
+/*
+ * HybridAppMiddleware is responsible for handling BootSplash visibility correctly.
+ * It is crucial to make transitions between OldDot and NewDot look smooth.
+ * The middleware assumes that the entry point for HybridApp is the /transition route.
+ */
+function HybridAppMiddleware({children, authenticated}: HybridAppMiddlewareProps) {
+    const {isSplashHidden, setIsSplashHidden} = useSplashScreen();
+    const [startedTransition, setStartedTransition] = useState(false);
+    const [finishedTransition, setFinishedTransition] = useState(false);
+
+    const initialURL = useContext(InitialURLContext);
+    const exitToParam = useExitTo();
+    const [exitTo, setExitTo] = useState<Route | HybridAppRoute | undefined>();
+
+    const [isAccountLoading] = useOnyx(ONYXKEYS.ACCOUNT, {selector: (account) => account?.isLoading ?? false});
+    const [sessionEmail] = useOnyx(ONYXKEYS.SESSION, {selector: (session) => session?.email});
+    const [completedHybridAppOnboarding] = useOnyx(ONYXKEYS.NVP_TRYNEWDOT, {selector: onboardingStatusSelector});
+
+    const maxTimeoutRef = useRef<NodeJS.Timeout | null>(null);
+
+    // We need to ensure that the BootSplash is always hidden after a certain period.
+    useEffect(() => {
+        if (!NativeModules.HybridAppModule) {
+            return;
+        }
+
+        maxTimeoutRef.current = setTimeout(() => {
+            Log.info('[HybridApp] Forcing transition due to unknown problem', true);
+            setStartedTransition(true);
+            setExitTo(ROUTES.HOME);
+        }, 3000);
+    }, []);
+    /**
+     * This useEffect tracks changes of `nvp_tryNewDot` value.
+     * We propagate it from OldDot to NewDot with native method due to limitations of old app.
+     */
+    useEffect(() => {
+        if (completedHybridAppOnboarding === undefined || !NativeModules.HybridAppModule) {
+            return;
+        }
+
+        Log.info(`[HybridApp] Onboarding status has changed. Propagating new value to OldDot`, true, {completedHybridAppOnboarding});
+        NativeModules.HybridAppModule.completeOnboarding(completedHybridAppOnboarding);
+    }, [completedHybridAppOnboarding]);
+
+    // Save `exitTo` when we reach /transition route.
+    // `exitTo` should always exist during OldDot -> NewDot transitions.
+    useEffect(() => {
+        if (!NativeModules.HybridAppModule || !exitToParam || exitTo) {
+            return;
+        }
+
+        Log.info('[HybridApp] Saving `exitTo` for later', true, {exitTo: exitToParam});
+        setExitTo(exitToParam);
+
+        Log.info(`[HybridApp] Started transition`, true);
+        setStartedTransition(true);
+    }, [exitTo, exitToParam]);
+
+    useEffect(() => {
+        if (!startedTransition || finishedTransition) {
+            return;
+        }
+
+        const transitionURL = NativeModules.HybridAppModule ? `${CONST.DEEPLINK_BASE_URL}${initialURL ?? ''}` : initialURL;
+        const isLoggingInAsNewUser = SessionUtils.isLoggingInAsNewUser(transitionURL ?? undefined, sessionEmail);
+
+        // We need to wait with navigating to exitTo until all login-related actions are complete.
+        if (!authenticated || isLoggingInAsNewUser || isAccountLoading) {
+            return;
+        }
+
+        if (exitTo) {
+            Navigation.isNavigationReady().then(() => {
+                // We need to remove /transition from route history.
+                // `useExitTo` returns undefined for routes other than /transition.
+                if (exitToParam && Navigation.getActiveRoute().includes(ROUTES.TRANSITION_BETWEEN_APPS)) {
+                    Log.info('[HybridApp] Removing /transition route from history', true);
+                    Navigation.goBack();
+                }
+
+                if (exitTo !== ROUTES.HOME) {
+                    Log.info('[HybridApp] Navigating to `exitTo` route', true, {exitTo});
+                    Navigation.navigate(Navigation.parseHybridAppUrl(exitTo));
+                }
+                setExitTo(undefined);
+
+                setTimeout(() => {
+                    Log.info('[HybridApp] Setting `finishedTransition` to true', true);
+                    setFinishedTransition(true);
+                }, CONST.SCREEN_TRANSITION_END_TIMEOUT);
+            });
+        }
+    }, [authenticated, exitTo, exitToParam, finishedTransition, initialURL, isAccountLoading, sessionEmail, startedTransition]);
+
+    useEffect(() => {
+        if (!finishedTransition || isSplashHidden) {
+            return;
+        }
+
+        Log.info('[HybridApp] Finished transition, hiding BootSplash', true);
+        BootSplash.hide().then(() => {
+            setIsSplashHidden(true);
+            if (authenticated) {
+                Log.info('[HybridApp] Handling onboarding flow', true);
+                Welcome.handleHybridAppOnboarding();
+            }
+        });
+    }, [authenticated, finishedTransition, isSplashHidden, setIsSplashHidden]);
+
+    return children;
+}
+
+HybridAppMiddleware.displayName = 'HybridAppMiddleware';
+
+export default HybridAppMiddleware;
diff --git a/src/components/IFrame.tsx b/src/components/IFrame.tsx
index 05da3a1edb9c..f492df0f3866 100644
--- a/src/components/IFrame.tsx
+++ b/src/components/IFrame.tsx
@@ -17,7 +17,7 @@ function getNewDotURL(url: string): string {
 
     let params: Record<string, string>;
     try {
-        params = JSON.parse(paramString);
+        params = JSON.parse(paramString) as Record<string, string>;
     } catch {
         params = {};
     }
diff --git a/src/components/Icon/Expensicons.ts b/src/components/Icon/Expensicons.ts
index 74dbf8622a24..9d59accb498d 100644
--- a/src/components/Icon/Expensicons.ts
+++ b/src/components/Icon/Expensicons.ts
@@ -2,8 +2,10 @@ import AddReaction from '@assets/images/add-reaction.svg';
 import All from '@assets/images/all.svg';
 import Android from '@assets/images/android.svg';
 import Apple from '@assets/images/apple.svg';
+import ArrowDownLong from '@assets/images/arrow-down-long.svg';
 import ArrowRightLong from '@assets/images/arrow-right-long.svg';
 import ArrowRight from '@assets/images/arrow-right.svg';
+import ArrowUpLong from '@assets/images/arrow-up-long.svg';
 import UpArrow from '@assets/images/arrow-up.svg';
 import ArrowsUpDown from '@assets/images/arrows-updown.svg';
 import AdminRoomAvatar from '@assets/images/avatars/admin-room.svg';
@@ -17,17 +19,21 @@ import NotificationsAvatar from '@assets/images/avatars/notifications-avatar.svg
 import ActiveRoomAvatar from '@assets/images/avatars/room.svg';
 import BackArrow from '@assets/images/back-left.svg';
 import Bank from '@assets/images/bank.svg';
+import Bed from '@assets/images/bed.svg';
 import Bell from '@assets/images/bell.svg';
 import BellSlash from '@assets/images/bellSlash.svg';
 import Bill from '@assets/images/bill.svg';
 import Bolt from '@assets/images/bolt.svg';
+import Box from '@assets/images/box.svg';
 import Briefcase from '@assets/images/briefcase.svg';
 import Bug from '@assets/images/bug.svg';
 import Building from '@assets/images/building.svg';
+import CalendarSolid from '@assets/images/calendar-solid.svg';
 import Calendar from '@assets/images/calendar.svg';
 import Camera from '@assets/images/camera.svg';
+import CarWithKey from '@assets/images/car-with-key.svg';
 import Car from '@assets/images/car.svg';
-import CardsAndDomains from '@assets/images/cards-and-domains.svg';
+import CaretUpDown from '@assets/images/caret-up-down.svg';
 import Cash from '@assets/images/cash.svg';
 import Chair from '@assets/images/chair.svg';
 import ChatBubbleAdd from '@assets/images/chatbubble-add.svg';
@@ -35,16 +41,23 @@ import ChatBubbleReply from '@assets/images/chatbubble-reply.svg';
 import ChatBubbleUnread from '@assets/images/chatbubble-unread.svg';
 import ChatBubble from '@assets/images/chatbubble.svg';
 import ChatBubbles from '@assets/images/chatbubbles.svg';
+import CheckCircle from '@assets/images/check-circle.svg';
+import CheckmarkCircle from '@assets/images/checkmark-circle.svg';
 import Checkmark from '@assets/images/checkmark.svg';
+import CircularArrowBackwards from '@assets/images/circular-arrow-backwards.svg';
 import Close from '@assets/images/close.svg';
 import ClosedSign from '@assets/images/closed-sign.svg';
 import Coins from '@assets/images/coins.svg';
 import Collapse from '@assets/images/collapse.svg';
+import CommentBubbles from '@assets/images/comment-bubbles.svg';
 import Concierge from '@assets/images/concierge.svg';
 import Connect from '@assets/images/connect.svg';
 import ConnectionComplete from '@assets/images/connection-complete.svg';
 import Copy from '@assets/images/copy.svg';
+import CreditCardExclamation from '@assets/images/credit-card-exclamation.svg';
+import CreditCardHourglass from '@assets/images/credit-card-hourglass.svg';
 import CreditCard from '@assets/images/creditcard.svg';
+import Crosshair from '@assets/images/crosshair.svg';
 import DocumentPlus from '@assets/images/document-plus.svg';
 import DocumentSlash from '@assets/images/document-slash.svg';
 import Document from '@assets/images/document.svg';
@@ -70,6 +83,9 @@ import ExpensifyLogoNew from '@assets/images/expensify-logo-new.svg';
 import ExpensifyWordmark from '@assets/images/expensify-wordmark.svg';
 import EyeDisabled from '@assets/images/eye-disabled.svg';
 import Eye from '@assets/images/eye.svg';
+import Feed from '@assets/images/feed.svg';
+import Filter from '@assets/images/filter.svg';
+import Filters from '@assets/images/filters.svg';
 import Flag from '@assets/images/flag.svg';
 import FlagLevelOne from '@assets/images/flag_level_01.svg';
 import FlagLevelTwo from '@assets/images/flag_level_02.svg';
@@ -86,8 +102,13 @@ import Home from '@assets/images/home.svg';
 import Hourglass from '@assets/images/hourglass.svg';
 import ImageCropCircleMask from '@assets/images/image-crop-circle-mask.svg';
 import ImageCropSquareMask from '@assets/images/image-crop-square-mask.svg';
+import Inbox from '@assets/images/inbox.svg';
 import Info from '@assets/images/info.svg';
+import NetSuiteSquare from '@assets/images/integrationicons/netsuite-icon-square.svg';
+import QBOCircle from '@assets/images/integrationicons/qbo-icon-circle.svg';
 import QBOSquare from '@assets/images/integrationicons/qbo-icon-square.svg';
+import SageIntacctSquare from '@assets/images/integrationicons/sage-intacct-icon-square.svg';
+import XeroCircle from '@assets/images/integrationicons/xero-icon-circle.svg';
 import XeroSquare from '@assets/images/integrationicons/xero-icon-square.svg';
 import InvoiceGeneric from '@assets/images/invoice-generic.svg';
 import Invoice from '@assets/images/invoice.svg';
@@ -106,6 +127,7 @@ import Menu from '@assets/images/menu.svg';
 import Meter from '@assets/images/meter.svg';
 import MoneyBag from '@assets/images/money-bag.svg';
 import MoneyCircle from '@assets/images/money-circle.svg';
+import MoneySearch from '@assets/images/money-search.svg';
 import MoneyWaving from '@assets/images/money-waving.svg';
 import Monitor from '@assets/images/monitor.svg';
 import Mute from '@assets/images/mute.svg';
@@ -120,14 +142,17 @@ import Paycheck from '@assets/images/paycheck.svg';
 import Pencil from '@assets/images/pencil.svg';
 import Phone from '@assets/images/phone.svg';
 import Pin from '@assets/images/pin.svg';
+import Plane from '@assets/images/plane.svg';
 import Play from '@assets/images/play.svg';
 import Plus from '@assets/images/plus.svg';
 import Printer from '@assets/images/printer.svg';
 import Profile from '@assets/images/profile.svg';
 import QrCode from '@assets/images/qrcode.svg';
 import QuestionMark from '@assets/images/question-mark-circle.svg';
+import ReceiptPlus from '@assets/images/receipt-plus.svg';
 import ReceiptScan from '@assets/images/receipt-scan.svg';
 import ReceiptSearch from '@assets/images/receipt-search.svg';
+import ReceiptSlash from '@assets/images/receipt-slash.svg';
 import Receipt from '@assets/images/receipt.svg';
 import RemoveMembers from '@assets/images/remove-members.svg';
 import Rotate from '@assets/images/rotate-image.svg';
@@ -137,6 +162,7 @@ import Send from '@assets/images/send.svg';
 import Shield from '@assets/images/shield.svg';
 import AppleLogo from '@assets/images/signIn/apple-logo.svg';
 import GoogleLogo from '@assets/images/signIn/google-logo.svg';
+import AdvancedApprovalsSquare from '@assets/images/simple-illustrations/advanced-approvals-icon-square.svg';
 import Facebook from '@assets/images/social-facebook.svg';
 import Instagram from '@assets/images/social-instagram.svg';
 import Linkedin from '@assets/images/social-linkedin.svg';
@@ -156,6 +182,7 @@ import Trashcan from '@assets/images/trashcan.svg';
 import Unlock from '@assets/images/unlock.svg';
 import UploadAlt from '@assets/images/upload-alt.svg';
 import Upload from '@assets/images/upload.svg';
+import UserCheck from '@assets/images/user-check.svg';
 import User from '@assets/images/user.svg';
 import Users from '@assets/images/users.svg';
 import VolumeHigh from '@assets/images/volume-high.svg';
@@ -179,20 +206,23 @@ export {
     ArrowRight,
     ArrowRightLong,
     ArrowsUpDown,
+    ArrowUpLong,
+    ArrowDownLong,
     Wrench,
     BackArrow,
     Bank,
+    CircularArrowBackwards,
     Bill,
     Bell,
     BellSlash,
     Bolt,
+    Box,
     Briefcase,
     Bug,
     Building,
     Calendar,
     Camera,
     Car,
-    CardsAndDomains,
     Cash,
     ChatBubble,
     ChatBubbles,
@@ -201,12 +231,16 @@ export {
     Close,
     ClosedSign,
     Collapse,
+    CommentBubbles,
     Concierge,
     ConciergeAvatar,
     Connect,
+    Crosshair,
     ConnectionComplete,
     Copy,
     CreditCard,
+    CreditCardHourglass,
+    CreditCardExclamation,
     DeletedRoomAvatar,
     Document,
     DocumentSlash,
@@ -251,6 +285,7 @@ export {
     History,
     Home,
     Hourglass,
+    Inbox,
     ImageCropCircleMask,
     ImageCropSquareMask,
     Info,
@@ -271,6 +306,7 @@ export {
     Megaphone,
     MoneyBag,
     MoneyCircle,
+    MoneySearch,
     MoneyWaving,
     Monitor,
     Mute,
@@ -295,7 +331,9 @@ export {
     QrCode,
     QuestionMark,
     Receipt,
+    ReceiptPlus,
     ReceiptScan,
+    ReceiptSlash,
     RemoveMembers,
     ReceiptSearch,
     Rotate,
@@ -316,6 +354,7 @@ export {
     Upload,
     UploadAlt,
     User,
+    UserCheck,
     Users,
     VolumeHigh,
     VolumeLow,
@@ -323,6 +362,8 @@ export {
     Workflows,
     Workspace,
     XeroSquare,
+    SageIntacctSquare as IntacctSquare,
+    AdvancedApprovalsSquare,
     Zoom,
     Twitter,
     Youtube,
@@ -334,6 +375,19 @@ export {
     ChatBubbleUnread,
     ChatBubbleReply,
     Lightbulb,
+    Plane,
+    Bed,
+    CarWithKey,
     DocumentPlus,
     Clear,
+    CheckCircle,
+    CheckmarkCircle,
+    NetSuiteSquare,
+    XeroCircle,
+    QBOCircle,
+    Filters,
+    CalendarSolid,
+    Filter,
+    CaretUpDown,
+    Feed,
 };
diff --git a/src/components/Icon/Illustrations.ts b/src/components/Icon/Illustrations.ts
index 8d3f53be9396..060f31647b7c 100644
--- a/src/components/Icon/Illustrations.ts
+++ b/src/components/Icon/Illustrations.ts
@@ -1,3 +1,9 @@
+import AmexCompanyCards from '@assets/images/companyCards/amex.svg';
+import MasterCardCompanyCards from '@assets/images/companyCards/mastercard.svg';
+import VisaCompanyCards from '@assets/images/companyCards/visa.svg';
+import EmptyCardState from '@assets/images/emptystate__expensifycard.svg';
+import ExpensifyCardIllustration from '@assets/images/expensifyCard/cardIllustration.svg';
+import LaptopwithSecondScreenandHourglass from '@assets/images/LaptopwithSecondScreenandHourglass.svg';
 import Abracadabra from '@assets/images/product-illustrations/abracadabra.svg';
 import BankArrowPink from '@assets/images/product-illustrations/bank-arrow--pink.svg';
 import BankMouseGreen from '@assets/images/product-illustrations/bank-mouse--green.svg';
@@ -6,6 +12,8 @@ import ConciergeBlue from '@assets/images/product-illustrations/concierge--blue.
 import ConciergeExclamation from '@assets/images/product-illustrations/concierge--exclamation.svg';
 import CreditCardsBlue from '@assets/images/product-illustrations/credit-cards--blue.svg';
 import EmptyStateExpenses from '@assets/images/product-illustrations/emptystate__expenses.svg';
+import EmptyStateTravel from '@assets/images/product-illustrations/emptystate__travel.svg';
+import FolderWithPapers from '@assets/images/product-illustrations/folder-with-papers.svg';
 import GpsTrackOrange from '@assets/images/product-illustrations/gps-track--orange.svg';
 import Hands from '@assets/images/product-illustrations/home-illustration-hands.svg';
 import InvoiceOrange from '@assets/images/product-illustrations/invoice--orange.svg';
@@ -29,6 +37,8 @@ import TadaYellow from '@assets/images/product-illustrations/tada--yellow.svg';
 import TeleScope from '@assets/images/product-illustrations/telescope.svg';
 import ThreeLeggedLaptopWoman from '@assets/images/product-illustrations/three_legged_laptop_woman.svg';
 import ToddBehindCloud from '@assets/images/product-illustrations/todd-behind-cloud.svg';
+import ToddWithPhones from '@assets/images/product-illustrations/todd-with-phones.svg';
+import BigVault from '@assets/images/simple-illustrations/emptystate__big-vault.svg';
 import Abacus from '@assets/images/simple-illustrations/simple-illustration__abacus.svg';
 import Accounting from '@assets/images/simple-illustrations/simple-illustration__accounting.svg';
 import Alert from '@assets/images/simple-illustrations/simple-illustration__alert.svg';
@@ -40,14 +50,18 @@ import Binoculars from '@assets/images/simple-illustrations/simple-illustration_
 import CarIce from '@assets/images/simple-illustrations/simple-illustration__car-ice.svg';
 import Car from '@assets/images/simple-illustrations/simple-illustration__car.svg';
 import ChatBubbles from '@assets/images/simple-illustrations/simple-illustration__chatbubbles.svg';
+import CheckmarkCircle from '@assets/images/simple-illustrations/simple-illustration__checkmarkcircle.svg';
 import CoffeeMug from '@assets/images/simple-illustrations/simple-illustration__coffeemug.svg';
 import Coins from '@assets/images/simple-illustrations/simple-illustration__coins.svg';
 import CommentBubbles from '@assets/images/simple-illustrations/simple-illustration__commentbubbles.svg';
-import CompanyCard from '@assets/images/simple-illustrations/simple-illustration__company-card.svg';
 import ConciergeBubble from '@assets/images/simple-illustrations/simple-illustration__concierge-bubble.svg';
 import ConciergeNew from '@assets/images/simple-illustrations/simple-illustration__concierge.svg';
 import CreditCardsNew from '@assets/images/simple-illustrations/simple-illustration__credit-cards.svg';
+import CreditCardEyes from '@assets/images/simple-illustrations/simple-illustration__creditcardeyes.svg';
 import EmailAddress from '@assets/images/simple-illustrations/simple-illustration__email-address.svg';
+import EmptyState from '@assets/images/simple-illustrations/simple-illustration__empty-state.svg';
+import EnvelopeReceipt from '@assets/images/simple-illustrations/simple-illustration__envelopereceipt.svg';
+import Filters from '@assets/images/simple-illustrations/simple-illustration__filters.svg';
 import FolderOpen from '@assets/images/simple-illustrations/simple-illustration__folder-open.svg';
 import Gears from '@assets/images/simple-illustrations/simple-illustration__gears.svg';
 import HandCard from '@assets/images/simple-illustrations/simple-illustration__handcard.svg';
@@ -58,6 +72,7 @@ import House from '@assets/images/simple-illustrations/simple-illustration__hous
 import InvoiceBlue from '@assets/images/simple-illustrations/simple-illustration__invoice.svg';
 import Lightbulb from '@assets/images/simple-illustrations/simple-illustration__lightbulb.svg';
 import LockClosed from '@assets/images/simple-illustrations/simple-illustration__lockclosed.svg';
+import LockClosedOrange from '@assets/images/simple-illustrations/simple-illustration__lockclosed_orange.svg';
 import LockOpen from '@assets/images/simple-illustrations/simple-illustration__lockopen.svg';
 import Luggage from '@assets/images/simple-illustrations/simple-illustration__luggage.svg';
 import Mailbox from '@assets/images/simple-illustrations/simple-illustration__mailbox.svg';
@@ -72,20 +87,30 @@ import PiggyBank from '@assets/images/simple-illustrations/simple-illustration__
 import Profile from '@assets/images/simple-illustrations/simple-illustration__profile.svg';
 import QRCode from '@assets/images/simple-illustrations/simple-illustration__qr-code.svg';
 import ReceiptEnvelope from '@assets/images/simple-illustrations/simple-illustration__receipt-envelope.svg';
+import ReceiptLocationMarker from '@assets/images/simple-illustrations/simple-illustration__receipt-location-marker.svg';
 import ReceiptWrangler from '@assets/images/simple-illustrations/simple-illustration__receipt-wrangler.svg';
 import ReceiptUpload from '@assets/images/simple-illustrations/simple-illustration__receiptupload.svg';
+import Rules from '@assets/images/simple-illustrations/simple-illustration__rules.svg';
 import SanFrancisco from '@assets/images/simple-illustrations/simple-illustration__sanfrancisco.svg';
+import SendMoney from '@assets/images/simple-illustrations/simple-illustration__sendmoney.svg';
 import ShieldYellow from '@assets/images/simple-illustrations/simple-illustration__shield.svg';
 import SmallRocket from '@assets/images/simple-illustrations/simple-illustration__smallrocket.svg';
 import SplitBill from '@assets/images/simple-illustrations/simple-illustration__splitbill.svg';
+import SubscriptionAnnual from '@assets/images/simple-illustrations/simple-illustration__subscription-annual.svg';
+import SubscriptionPPU from '@assets/images/simple-illustrations/simple-illustration__subscription-ppu.svg';
 import Tag from '@assets/images/simple-illustrations/simple-illustration__tag.svg';
 import TeachersUnite from '@assets/images/simple-illustrations/simple-illustration__teachers-unite.svg';
 import ThumbsUpStars from '@assets/images/simple-illustrations/simple-illustration__thumbsupstars.svg';
+import Tire from '@assets/images/simple-illustrations/simple-illustration__tire.svg';
 import TrackShoe from '@assets/images/simple-illustrations/simple-illustration__track-shoe.svg';
 import TrashCan from '@assets/images/simple-illustrations/simple-illustration__trashcan.svg';
 import TreasureChest from '@assets/images/simple-illustrations/simple-illustration__treasurechest.svg';
+import CompanyCard from '@assets/images/simple-illustrations/simple-illustration__twocards-horizontal.svg';
+import VirtualCard from '@assets/images/simple-illustrations/simple-illustration__virtualcard.svg';
 import WalletAlt from '@assets/images/simple-illustrations/simple-illustration__wallet-alt.svg';
 import Workflows from '@assets/images/simple-illustrations/simple-illustration__workflows.svg';
+import ExpensifyApprovedLogoLight from '@assets/images/subscription-details__approvedlogo--light.svg';
+import ExpensifyApprovedLogo from '@assets/images/subscription-details__approvedlogo.svg';
 
 export {
     Abracadabra,
@@ -99,7 +124,9 @@ export {
     ConciergeExclamation,
     CreditCardsBlue,
     EmailAddress,
+    EmptyCardState,
     EmptyStateExpenses,
+    EnvelopeReceipt,
     FolderOpen,
     HandCard,
     HotDogStand,
@@ -125,12 +152,14 @@ export {
     TadaYellow,
     TadaBlue,
     ToddBehindCloud,
+    ToddWithPhones,
     GpsTrackOrange,
     ShieldYellow,
     MoneyReceipts,
     PinkBill,
     CreditCardsNew,
     InvoiceBlue,
+    LaptopwithSecondScreenandHourglass,
     LockOpen,
     Luggage,
     MoneyIntoWallet,
@@ -167,6 +196,7 @@ export {
     Binoculars,
     CompanyCard,
     ReceiptUpload,
+    ExpensifyCardIllustration,
     SplitBill,
     PiggyBank,
     Accounting,
@@ -175,5 +205,25 @@ export {
     Pencil,
     Tag,
     CarIce,
+    ReceiptLocationMarker,
     Lightbulb,
+    EmptyStateTravel,
+    SubscriptionAnnual,
+    SubscriptionPPU,
+    ExpensifyApprovedLogo,
+    ExpensifyApprovedLogoLight,
+    SendMoney,
+    CheckmarkCircle,
+    CreditCardEyes,
+    LockClosedOrange,
+    EmptyState,
+    FolderWithPapers,
+    VirtualCard,
+    Tire,
+    BigVault,
+    Filters,
+    Rules,
+    AmexCompanyCards,
+    MasterCardCompanyCards,
+    VisaCompanyCards,
 };
diff --git a/src/components/Icon/__mocks__/Expensicons.ts b/src/components/Icon/__mocks__/Expensicons.ts
index 78ad86210bf0..b808271cd39c 100644
--- a/src/components/Icon/__mocks__/Expensicons.ts
+++ b/src/components/Icon/__mocks__/Expensicons.ts
@@ -1,9 +1,13 @@
-const Expensicons = jest.requireActual('../Expensicons');
+// eslint-disable-next-line import/no-import-module-exports
+import type {SvgProps} from 'react-native-svg';
 
-module.exports = Object.keys(Expensicons).reduce((prev, curr) => {
+const Expensicons = jest.requireActual<Record<string, React.FC<SvgProps>>>('../Expensicons');
+
+module.exports = Object.keys(Expensicons).reduce((acc: Record<string, () => void>, curr) => {
     // We set the name of the anonymous mock function here so we can dynamically build the list of mocks and access the
     // "name" property to use in accessibility hints for element querying
     const fn = () => '';
     Object.defineProperty(fn, 'name', {value: curr});
-    return {...prev, [curr]: fn};
+    acc[curr] = fn;
+    return acc;
 }, {});
diff --git a/src/components/Image/ImageBehaviorContextProvider.tsx b/src/components/Image/ImageBehaviorContextProvider.tsx
new file mode 100644
index 000000000000..cfff212c16f6
--- /dev/null
+++ b/src/components/Image/ImageBehaviorContextProvider.tsx
@@ -0,0 +1,18 @@
+import React, {createContext} from 'react';
+
+type ImageBehaviorContextValue = {
+    /**
+     * Determine whether or not to set the aspect ratio of the container div based on the image's aspect ratio.
+     */
+    shouldSetAspectRatioInStyle: boolean;
+};
+
+const ImageBehaviorContext = createContext<ImageBehaviorContextValue>({
+    shouldSetAspectRatioInStyle: true,
+});
+
+function ImageBehaviorContextProvider({children, ...value}: {children: React.ReactNode} & ImageBehaviorContextValue) {
+    return <ImageBehaviorContext.Provider value={value}>{children}</ImageBehaviorContext.Provider>;
+}
+
+export {ImageBehaviorContext, ImageBehaviorContextProvider};
diff --git a/src/components/Image/index.tsx b/src/components/Image/index.tsx
index e6cecdc0d5ec..5fe1ba306400 100644
--- a/src/components/Image/index.tsx
+++ b/src/components/Image/index.tsx
@@ -1,14 +1,17 @@
-import React, {useCallback, useMemo, useState} from 'react';
+import React, {useCallback, useContext, useMemo, useState} from 'react';
 import {withOnyx} from 'react-native-onyx';
 import CONST from '@src/CONST';
 import ONYXKEYS from '@src/ONYXKEYS';
 import BaseImage from './BaseImage';
+import {ImageBehaviorContext} from './ImageBehaviorContextProvider';
 import type {ImageOnLoadEvent, ImageOnyxProps, ImageOwnProps, ImageProps} from './types';
 
 function Image({source: propsSource, isAuthTokenRequired = false, session, onLoad, objectPosition = CONST.IMAGE_OBJECT_POSITION.INITIAL, style, ...forwardedProps}: ImageProps) {
     const [aspectRatio, setAspectRatio] = useState<string | number | null>(null);
     const isObjectPositionTop = objectPosition === CONST.IMAGE_OBJECT_POSITION.TOP;
 
+    const {shouldSetAspectRatioInStyle} = useContext(ImageBehaviorContext);
+
     const updateAspectRatio = useCallback(
         (width: number, height: number) => {
             if (!isObjectPositionTop) {
@@ -30,7 +33,6 @@ function Image({source: propsSource, isAuthTokenRequired = false, session, onLoa
             const {width, height} = event.nativeEvent;
 
             onLoad?.(event);
-
             updateAspectRatio(width, height);
         },
         [onLoad, updateAspectRatio],
@@ -56,15 +58,20 @@ function Image({source: propsSource, isAuthTokenRequired = false, session, onLoa
         }
         return propsSource;
         // The session prop is not required, as it causes the image to reload whenever the session changes. For more information, please refer to issue #26034.
-        // eslint-disable-next-line react-hooks/exhaustive-deps
+        // eslint-disable-next-line react-compiler/react-compiler, react-hooks/exhaustive-deps
     }, [propsSource, isAuthTokenRequired]);
 
+    /**
+     * If the image fails to load and the object position is top, we should hide the image by setting the opacity to 0.
+     */
+    const shouldOpacityBeZero = isObjectPositionTop && !aspectRatio;
+
     return (
         <BaseImage
             // eslint-disable-next-line react/jsx-props-no-spreading
             {...forwardedProps}
             onLoad={handleLoad}
-            style={[style, aspectRatio ? {aspectRatio, height: 'auto'} : {}, isObjectPositionTop && !aspectRatio && {opacity: 0}]}
+            style={[style, shouldSetAspectRatioInStyle && aspectRatio ? {aspectRatio, height: 'auto'} : {}, shouldOpacityBeZero && {opacity: 0}]}
             source={source}
         />
     );
diff --git a/src/components/Image/sourcePropTypes/index.js b/src/components/Image/sourcePropTypes/index.js
deleted file mode 100644
index c5102b240cb1..000000000000
--- a/src/components/Image/sourcePropTypes/index.js
+++ /dev/null
@@ -1,13 +0,0 @@
-import PropTypes from 'prop-types';
-
-export default PropTypes.oneOfType([
-    PropTypes.func,
-    PropTypes.elementType,
-    PropTypes.number,
-    PropTypes.shape({
-        uri: PropTypes.string,
-        // 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
deleted file mode 100644
index ade254718879..000000000000
--- a/src/components/Image/sourcePropTypes/index.native.js
+++ /dev/null
@@ -1,12 +0,0 @@
-import PropTypes from 'prop-types';
-
-export default PropTypes.oneOfType([
-    PropTypes.func,
-    PropTypes.elementType,
-    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.tsx b/src/components/ImageView/index.tsx
index 5d09e7abf41d..e12be53d01ae 100644
--- a/src/components/ImageView/index.tsx
+++ b/src/components/ImageView/index.tsx
@@ -2,14 +2,18 @@ import type {SyntheticEvent} from 'react';
 import React, {useCallback, useEffect, useRef, useState} from 'react';
 import type {GestureResponderEvent, LayoutChangeEvent} from 'react-native';
 import {View} from 'react-native';
+import AttachmentOfflineIndicator from '@components/AttachmentOfflineIndicator';
 import FullscreenLoadingIndicator from '@components/FullscreenLoadingIndicator';
 import Image from '@components/Image';
 import RESIZE_MODES from '@components/Image/resizeModes';
 import type {ImageOnLoadEvent} from '@components/Image/types';
+import Lightbox from '@components/Lightbox';
 import PressableWithoutFeedback from '@components/Pressable/PressableWithoutFeedback';
+import useNetwork from '@hooks/useNetwork';
 import useStyleUtils from '@hooks/useStyleUtils';
 import useThemeStyles from '@hooks/useThemeStyles';
 import * as DeviceCapabilities from '@libs/DeviceCapabilities';
+import * as FileUtils from '@libs/fileDownload/FileUtils';
 import CONST from '@src/CONST';
 import viewRef from '@src/types/utils/viewRef';
 import type ImageViewProps from './types';
@@ -33,6 +37,7 @@ function ImageView({isAuthTokenRequired = false, url, fileName, onError}: ImageV
     const [imgHeight, setImgHeight] = useState(0);
     const [zoomScale, setZoomScale] = useState(0);
     const [zoomDelta, setZoomDelta] = useState<ZoomDelta>();
+    const {isOffline} = useNetwork();
 
     const scrollableRef = useRef<HTMLDivElement>(null);
     const canUseTouchScreen = DeviceCapabilities.canUseTouchScreen();
@@ -192,26 +197,15 @@ function ImageView({isAuthTokenRequired = false, url, fileName, onError}: ImageV
         };
     }, [canUseTouchScreen, trackMovement, trackPointerPosition]);
 
+    const isLocalFile = FileUtils.isLocalFile(url);
+
     if (canUseTouchScreen) {
         return (
-            <View
-                style={[styles.imageViewContainer, styles.overflowHidden]}
-                onLayout={onContainerLayoutChanged}
-            >
-                <Image
-                    source={{uri: url}}
-                    isAuthTokenRequired={isAuthTokenRequired}
-                    // Hide image until finished loading to prevent showing preview with wrong dimensions.
-                    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 ? RESIZE_MODES.center : RESIZE_MODES.contain}
-                    onLoadStart={imageLoadingStart}
-                    onLoad={imageLoad}
-                    onError={onError}
-                />
-                {(isLoading || zoomScale === 0) && <FullscreenLoadingIndicator style={[styles.opacity1, styles.bgTransparent]} />}
-            </View>
+            <Lightbox
+                uri={url}
+                isAuthTokenRequired={isAuthTokenRequired}
+                onError={onError}
+            />
         );
     }
     return (
@@ -243,7 +237,8 @@ function ImageView({isAuthTokenRequired = false, url, fileName, onError}: ImageV
                 />
             </PressableWithoutFeedback>
 
-            {isLoading && <FullscreenLoadingIndicator style={[styles.opacity1, styles.bgTransparent]} />}
+            {isLoading && (!isOffline || isLocalFile) && <FullscreenLoadingIndicator style={[styles.opacity1, styles.bgTransparent]} />}
+            {isLoading && !isLocalFile && <AttachmentOfflineIndicator />}
         </View>
     );
 }
diff --git a/src/components/ImageWithSizeCalculation.tsx b/src/components/ImageWithSizeCalculation.tsx
index eac5c676370b..ebea1a90efca 100644
--- a/src/components/ImageWithSizeCalculation.tsx
+++ b/src/components/ImageWithSizeCalculation.tsx
@@ -6,6 +6,7 @@ import useNetwork from '@hooks/useNetwork';
 import useThemeStyles from '@hooks/useThemeStyles';
 import Log from '@libs/Log';
 import CONST from '@src/CONST';
+import AttachmentOfflineIndicator from './AttachmentOfflineIndicator';
 import FullscreenLoadingIndicator from './FullscreenLoadingIndicator';
 import Image from './Image';
 import RESIZE_MODES from './Image/resizeModes';
@@ -24,6 +25,9 @@ type ImageWithSizeCalculationProps = {
     /** Url for image to display */
     url: string | ImageSourcePropType;
 
+    /** alt text for the image */
+    altText?: string;
+
     /** Any additional styles to apply */
     style?: StyleProp<ViewStyle>;
 
@@ -45,7 +49,7 @@ type ImageWithSizeCalculationProps = {
  * performing some calculation on a network image after fetching dimensions so
  * it can be appropriately resized.
  */
-function ImageWithSizeCalculation({url, style, onMeasure, onLoadFailure, isAuthTokenRequired, objectPosition = CONST.IMAGE_OBJECT_POSITION.INITIAL}: ImageWithSizeCalculationProps) {
+function ImageWithSizeCalculation({url, altText, style, onMeasure, onLoadFailure, isAuthTokenRequired, objectPosition = CONST.IMAGE_OBJECT_POSITION.INITIAL}: ImageWithSizeCalculationProps) {
     const styles = useThemeStyles();
     const isLoadedRef = useRef<boolean | null>(null);
     const [isImageCached, setIsImageCached] = useState(true);
@@ -96,6 +100,7 @@ function ImageWithSizeCalculation({url, style, onMeasure, onLoadFailure, isAuthT
             <Image
                 style={[styles.w100, styles.h100]}
                 source={source}
+                aria-label={altText}
                 isAuthTokenRequired={isAuthTokenRequired}
                 resizeMode={RESIZE_MODES.cover}
                 onLoadStart={() => {
@@ -108,7 +113,8 @@ function ImageWithSizeCalculation({url, style, onMeasure, onLoadFailure, isAuthT
                 onLoad={imageLoadedSuccessfully}
                 objectPosition={objectPosition}
             />
-            {isLoading && !isImageCached && <FullscreenLoadingIndicator style={[styles.opacity1, styles.bgTransparent]} />}
+            {isLoading && !isImageCached && !isOffline && <FullscreenLoadingIndicator style={[styles.opacity1, styles.bgTransparent]} />}
+            {isLoading && !isImageCached && <AttachmentOfflineIndicator isPreview />}
         </View>
     );
 }
diff --git a/src/components/Indicator.tsx b/src/components/Indicator.tsx
index 8830681bc55f..5ae227d1de70 100644
--- a/src/components/Indicator.tsx
+++ b/src/components/Indicator.tsx
@@ -5,6 +5,7 @@ import {withOnyx} from 'react-native-onyx';
 import useTheme from '@hooks/useTheme';
 import useThemeStyles from '@hooks/useThemeStyles';
 import * as PolicyUtils from '@libs/PolicyUtils';
+import * as SubscriptionUtils from '@libs/SubscriptionUtils';
 import * as UserUtils from '@libs/UserUtils';
 import * as PaymentMethods from '@userActions/PaymentMethods';
 import ONYXKEYS from '@src/ONYXKEYS';
@@ -54,13 +55,15 @@ function Indicator({reimbursementAccount, policies, bankAccountList, fundList, u
         () => Object.values(cleanPolicies).some(PolicyUtils.hasPolicyError),
         () => Object.values(cleanPolicies).some(PolicyUtils.hasCustomUnitsError),
         () => Object.values(cleanPolicies).some(PolicyUtils.hasEmployeeListError),
+        () => Object.values(cleanPolicies).some(PolicyUtils.hasSyncError),
+        () => SubscriptionUtils.hasSubscriptionRedDotError(),
         () => Object.keys(reimbursementAccount?.errors ?? {}).length > 0,
         () => !!loginList && UserUtils.hasLoginListError(loginList),
 
         // Wallet term errors that are not caused by an IOU (we show the red brick indicator for those in the LHN instead)
         () => Object.keys(walletTerms?.errors ?? {}).length > 0 && !walletTerms?.chatReportID,
     ];
-    const infoCheckingMethods: CheckingMethod[] = [() => !!loginList && UserUtils.hasLoginListInfo(loginList)];
+    const infoCheckingMethods: CheckingMethod[] = [() => !!loginList && UserUtils.hasLoginListInfo(loginList), () => SubscriptionUtils.hasSubscriptionGreenDotInfo()];
     const shouldShowErrorIndicator = errorCheckingMethods.some((errorCheckingMethod) => errorCheckingMethod());
     const shouldShowInfoIndicator = !shouldShowErrorIndicator && infoCheckingMethods.some((infoCheckingMethod) => infoCheckingMethod());
 
diff --git a/src/components/InitialURLContextProvider.tsx b/src/components/InitialURLContextProvider.tsx
index a3df93844ca9..4aa76edd3e62 100644
--- a/src/components/InitialURLContextProvider.tsx
+++ b/src/components/InitialURLContextProvider.tsx
@@ -17,13 +17,14 @@ type InitialURLContextProviderProps = {
 function InitialURLContextProvider({children, url}: InitialURLContextProviderProps) {
     const [initialURL, setInitialURL] = useState(url);
     useEffect(() => {
-        if (initialURL) {
+        if (url) {
+            setInitialURL(url);
             return;
         }
         Linking.getInitialURL().then((initURL) => {
             setInitialURL(initURL as Route);
         });
-    }, [initialURL]);
+    }, [url]);
     return <InitialURLContext.Provider value={initialURL}>{children}</InitialURLContext.Provider>;
 }
 
diff --git a/src/components/InteractiveStepSubHeader.tsx b/src/components/InteractiveStepSubHeader.tsx
index 20b3f6bc79a4..d8899a317df5 100644
--- a/src/components/InteractiveStepSubHeader.tsx
+++ b/src/components/InteractiveStepSubHeader.tsx
@@ -25,6 +25,9 @@ type InteractiveStepSubHeaderProps = {
 type InteractiveStepSubHeaderHandle = {
     /** Move to the next step */
     moveNext: () => void;
+
+    /** Move to the previous step */
+    movePrevious: () => void;
 };
 
 const MIN_AMOUNT_FOR_EXPANDING = 3;
@@ -45,6 +48,9 @@ function InteractiveStepSubHeader({stepNames, startStepIndex = 0, onStepSelected
             moveNext: () => {
                 setCurrentStep((actualStep) => actualStep + 1);
             },
+            movePrevious: () => {
+                setCurrentStep((actualStep) => actualStep - 1);
+            },
         }),
         [],
     );
diff --git a/src/components/InvertedFlatList/BaseInvertedFlatList/index.e2e.tsx b/src/components/InvertedFlatList/BaseInvertedFlatList/index.e2e.tsx
index 5df39ec02c89..4481b22f17b5 100644
--- a/src/components/InvertedFlatList/BaseInvertedFlatList/index.e2e.tsx
+++ b/src/components/InvertedFlatList/BaseInvertedFlatList/index.e2e.tsx
@@ -1,6 +1,6 @@
 import React, {forwardRef, useMemo} from 'react';
 import type {FlatListProps, ScrollViewProps, ViewToken} from 'react-native';
-import {FlatList} from 'react-native';
+import {DeviceEventEmitter, FlatList} from 'react-native';
 import type {ReportAction} from '@src/types/onyx';
 
 type BaseInvertedFlatListProps = FlatListProps<ReportAction> & {
@@ -9,16 +9,13 @@ type BaseInvertedFlatListProps = FlatListProps<ReportAction> & {
 
 const AUTOSCROLL_TO_TOP_THRESHOLD = 128;
 
-let localViewableItems: ViewToken[];
-const getViewableItems = () => localViewableItems;
-
 function BaseInvertedFlatListE2e(props: BaseInvertedFlatListProps, ref: React.ForwardedRef<FlatList<ReportAction>>) {
     const {shouldEnableAutoScrollToTopThreshold, ...rest} = props;
 
     const handleViewableItemsChanged = useMemo(
         () =>
             ({viewableItems}: {viewableItems: ViewToken[]}) => {
-                localViewableItems = viewableItems;
+                DeviceEventEmitter.emit('onViewableItemsChanged', viewableItems);
             },
         [],
     );
@@ -51,4 +48,3 @@ function BaseInvertedFlatListE2e(props: BaseInvertedFlatListProps, ref: React.Fo
 BaseInvertedFlatListE2e.displayName = 'BaseInvertedFlatListE2e';
 
 export default forwardRef(BaseInvertedFlatListE2e);
-export {getViewableItems};
diff --git a/src/components/InvertedFlatList/BaseInvertedFlatList/index.tsx b/src/components/InvertedFlatList/BaseInvertedFlatList/index.tsx
index 54f6748986f4..5c48652f8cc5 100644
--- a/src/components/InvertedFlatList/BaseInvertedFlatList/index.tsx
+++ b/src/components/InvertedFlatList/BaseInvertedFlatList/index.tsx
@@ -7,7 +7,7 @@ type BaseInvertedFlatListProps<T> = FlatListProps<T> & {
     shouldEnableAutoScrollToTopThreshold?: boolean;
 };
 
-const AUTOSCROLL_TO_TOP_THRESHOLD = 128;
+const AUTOSCROLL_TO_TOP_THRESHOLD = 250;
 
 function BaseInvertedFlatList<T>(props: BaseInvertedFlatListProps<T>, ref: ForwardedRef<RNFlatList>) {
     const {shouldEnableAutoScrollToTopThreshold, ...rest} = props;
diff --git a/src/components/InvertedFlatList/CellRendererComponent.tsx b/src/components/InvertedFlatList/CellRendererComponent.tsx
index 1199fb2a594c..f0631811fa14 100644
--- a/src/components/InvertedFlatList/CellRendererComponent.tsx
+++ b/src/components/InvertedFlatList/CellRendererComponent.tsx
@@ -21,7 +21,7 @@ function CellRendererComponent(props: CellRendererComponentProps) {
                  * list items. Consequently, lower list items can overflow the upper list items.
                  * See: https://github.com/Expensify/App/issues/20451
                  */
-                {zIndex: -props.index},
+                {zIndex: -props.index, position: 'relative'},
             ]}
         />
     );
diff --git a/src/components/KYCWall/BaseKYCWall.tsx b/src/components/KYCWall/BaseKYCWall.tsx
index 7d2f99f49593..fd681546c470 100644
--- a/src/components/KYCWall/BaseKYCWall.tsx
+++ b/src/components/KYCWall/BaseKYCWall.tsx
@@ -11,7 +11,7 @@ import Navigation from '@libs/Navigation/Navigation';
 import * as PaymentUtils from '@libs/PaymentUtils';
 import * as ReportUtils from '@libs/ReportUtils';
 import * as PaymentMethods from '@userActions/PaymentMethods';
-import * as Policy from '@userActions/Policy';
+import * as Policy from '@userActions/Policy/Policy';
 import * as Wallet from '@userActions/Wallet';
 import CONST from '@src/CONST';
 import ONYXKEYS from '@src/ONYXKEYS';
@@ -69,7 +69,7 @@ function KYCWall({
     walletTerms,
     shouldShowPersonalBankAccountOption = false,
 }: BaseKYCWallProps) {
-    const anchorRef = useRef<HTMLDivElement | View | null>(null);
+    const anchorRef = useRef<HTMLDivElement | View>(null);
     const transferBalanceButtonRef = useRef<HTMLDivElement | View | null>(null);
 
     const [shouldShowAddPaymentMenu, setShouldShowAddPaymentMenu] = useState(false);
@@ -127,7 +127,10 @@ function KYCWall({
                 Navigation.navigate(addDebitCardRoute);
             } else if (paymentMethod === CONST.PAYMENT_METHODS.BUSINESS_BANK_ACCOUNT) {
                 if (iouReport && ReportUtils.isIOUReport(iouReport)) {
-                    const policyID = Policy.createWorkspaceFromIOUPayment(iouReport);
+                    const {policyID, workspaceChatReportID, reportPreviewReportActionID} = Policy.createWorkspaceFromIOUPayment(iouReport) ?? {};
+                    if (workspaceChatReportID) {
+                        Navigation.navigate(ROUTES.REPORT_WITH_ID.getRoute(workspaceChatReportID, reportPreviewReportActionID));
+                    }
 
                     // Navigate to the bank account set up flow for this specific policy
                     Navigation.navigate(ROUTES.BANK_ACCOUNT_WITH_STEP_TO_OPEN.getRoute('', policyID));
@@ -166,7 +169,7 @@ function KYCWall({
 
             transferBalanceButtonRef.current = targetElement;
 
-            const isExpenseReport = ReportUtils.isExpenseReport(iouReport ?? null);
+            const isExpenseReport = ReportUtils.isExpenseReport(iouReport);
             const paymentCardList = fundList ?? {};
 
             // Check to see if user has a valid payment method on file and display the add payment popover if they don't
diff --git a/src/components/KYCWall/types.ts b/src/components/KYCWall/types.ts
index 53ed00e04143..568f2a15903f 100644
--- a/src/components/KYCWall/types.ts
+++ b/src/components/KYCWall/types.ts
@@ -7,7 +7,6 @@ import type {Route} from '@src/ROUTES';
 import type {Report} from '@src/types/onyx';
 import type {PaymentMethodType} from '@src/types/onyx/OriginalMessage';
 import type AnchorAlignment from '@src/types/utils/AnchorAlignment';
-import type {EmptyObject} from '@src/types/utils/EmptyObject';
 
 type Source = ValueOf<typeof CONST.KYC_WALL_SOURCE>;
 
@@ -45,7 +44,7 @@ type KYCWallProps = {
     chatReportID?: string;
 
     /** The IOU/Expense report we are paying */
-    iouReport?: OnyxEntry<Report> | EmptyObject;
+    iouReport?: OnyxEntry<Report>;
 
     /** Where the popover should be positioned relative to the anchor points. */
     anchorAlignment?: AnchorAlignment;
diff --git a/src/components/KeyboardAvoidingView/index.ios.tsx b/src/components/KeyboardAvoidingView/index.ios.tsx
index a7cd767377ef..171210eab7ac 100644
--- a/src/components/KeyboardAvoidingView/index.ios.tsx
+++ b/src/components/KeyboardAvoidingView/index.ios.tsx
@@ -3,7 +3,7 @@
  */
 import React from 'react';
 import {KeyboardAvoidingView as KeyboardAvoidingViewComponent} from 'react-native';
-import type KeyboardAvoidingViewProps from './types';
+import type {KeyboardAvoidingViewProps} from './types';
 
 function KeyboardAvoidingView(props: KeyboardAvoidingViewProps) {
     // eslint-disable-next-line react/jsx-props-no-spreading
diff --git a/src/components/KeyboardAvoidingView/index.tsx b/src/components/KeyboardAvoidingView/index.tsx
index 09ec21e5b219..c0882ae1e9cc 100644
--- a/src/components/KeyboardAvoidingView/index.tsx
+++ b/src/components/KeyboardAvoidingView/index.tsx
@@ -3,7 +3,7 @@
  */
 import React from 'react';
 import {View} from 'react-native';
-import type KeyboardAvoidingViewProps from './types';
+import type {KeyboardAvoidingViewProps} from './types';
 
 function KeyboardAvoidingView(props: KeyboardAvoidingViewProps) {
     const {behavior, contentContainerStyle, enabled, keyboardVerticalOffset, ...rest} = props;
diff --git a/src/components/KeyboardAvoidingView/types.ts b/src/components/KeyboardAvoidingView/types.ts
index 48d354e8b53f..2c1ef64ced8f 100644
--- a/src/components/KeyboardAvoidingView/types.ts
+++ b/src/components/KeyboardAvoidingView/types.ts
@@ -1,3 +1,4 @@
-import {KeyboardAvoidingViewProps} from 'react-native';
+import type {KeyboardAvoidingViewProps} from 'react-native';
 
-export default KeyboardAvoidingViewProps;
+// eslint-disable-next-line import/prefer-default-export
+export type {KeyboardAvoidingViewProps};
diff --git a/src/components/LHNOptionsList/LHNOptionsList.tsx b/src/components/LHNOptionsList/LHNOptionsList.tsx
index 8c43ae542932..a734890a1f38 100644
--- a/src/components/LHNOptionsList/LHNOptionsList.tsx
+++ b/src/components/LHNOptionsList/LHNOptionsList.tsx
@@ -4,56 +4,47 @@ import {FlashList} from '@shopify/flash-list';
 import type {ReactElement} from 'react';
 import React, {memo, useCallback, useContext, useEffect, useMemo, useRef} from 'react';
 import {StyleSheet, View} from 'react-native';
-import {withOnyx} from 'react-native-onyx';
+import {useOnyx} from 'react-native-onyx';
 import BlockingView from '@components/BlockingViews/BlockingView';
 import Icon from '@components/Icon';
 import * as Expensicons from '@components/Icon/Expensicons';
 import LottieAnimations from '@components/LottieAnimations';
 import {ScrollOffsetContext} from '@components/ScrollOffsetContextProvider';
-import Text from '@components/Text';
+import TextBlock from '@components/TextBlock';
 import useLocalize from '@hooks/useLocalize';
-import usePermissions from '@hooks/usePermissions';
 import usePrevious from '@hooks/usePrevious';
+import useResponsiveLayout from '@hooks/useResponsiveLayout';
 import useTheme from '@hooks/useTheme';
 import useThemeStyles from '@hooks/useThemeStyles';
-import useWindowDimensions from '@hooks/useWindowDimensions';
 import * as DraftCommentUtils from '@libs/DraftCommentUtils';
+import * as OptionsListUtils from '@libs/OptionsListUtils';
 import * as ReportActionsUtils from '@libs/ReportActionsUtils';
 import variables from '@styles/variables';
 import CONST from '@src/CONST';
 import ONYXKEYS from '@src/ONYXKEYS';
 import OptionRowLHNData from './OptionRowLHNData';
-import type {LHNOptionsListOnyxProps, LHNOptionsListProps, RenderItemProps} from './types';
+import type {LHNOptionsListProps, RenderItemProps} from './types';
 
 const keyExtractor = (item: string) => `report_${item}`;
 
-function LHNOptionsList({
-    style,
-    contentContainerStyles,
-    data,
-    onSelectRow,
-    optionMode,
-    shouldDisableFocusOptions = false,
-    reports = {},
-    reportActions = {},
-    policy = {},
-    preferredLocale = CONST.LOCALES.DEFAULT,
-    personalDetails = {},
-    transactions = {},
-    draftComments = {},
-    transactionViolations = {},
-    onFirstItemRendered = () => {},
-}: LHNOptionsListProps) {
+function LHNOptionsList({style, contentContainerStyles, data, onSelectRow, optionMode, shouldDisableFocusOptions = false, onFirstItemRendered = () => {}}: LHNOptionsListProps) {
     const {saveScrollOffset, getScrollOffset} = useContext(ScrollOffsetContext);
     const flashListRef = useRef<FlashList<string>>(null);
     const route = useRoute();
 
+    const [reports] = useOnyx(ONYXKEYS.COLLECTION.REPORT);
+    const [reportActions] = useOnyx(ONYXKEYS.COLLECTION.REPORT_ACTIONS);
+    const [policy] = useOnyx(ONYXKEYS.COLLECTION.POLICY);
+    const [personalDetails] = useOnyx(ONYXKEYS.PERSONAL_DETAILS_LIST);
+    const [transactions] = useOnyx(ONYXKEYS.COLLECTION.TRANSACTION);
+    const [draftComments] = useOnyx(ONYXKEYS.COLLECTION.REPORT_DRAFT_COMMENT);
+    const [transactionViolations] = useOnyx(ONYXKEYS.COLLECTION.TRANSACTION_VIOLATIONS);
+
     const theme = useTheme();
     const styles = useThemeStyles();
-    const {canUseViolations} = usePermissions();
-    const {translate} = useLocalize();
-    const {isSmallScreenWidth} = useWindowDimensions();
-    const shouldShowEmptyLHN = isSmallScreenWidth && data.length === 0;
+    const {translate, preferredLocale} = useLocalize();
+    const {shouldUseNarrowLayout} = useResponsiveLayout();
+    const shouldShowEmptyLHN = shouldUseNarrowLayout && data.length === 0;
 
     // When the first item renders we want to call the onFirstItemRendered callback.
     // At this point in time we know that the list is actually displaying items.
@@ -69,36 +60,52 @@ function LHNOptionsList({
 
     const emptyLHNSubtitle = useMemo(
         () => (
-            <View>
-                <Text
-                    color={theme.placeholderText}
-                    style={[styles.textAlignCenter]}
-                >
-                    {translate('common.emptyLHN.subtitleText1')}
-                    <Icon
-                        src={Expensicons.MagnifyingGlass}
-                        width={variables.emptyLHNIconWidth}
-                        height={variables.emptyLHNIconHeight}
-                        small
-                        inline
-                        fill={theme.icon}
-                        additionalStyles={styles.alignItemsCenter}
-                    />
-                    {translate('common.emptyLHN.subtitleText2')}
-                    <Icon
-                        src={Expensicons.Plus}
-                        width={variables.emptyLHNIconWidth}
-                        height={variables.emptyLHNIconHeight}
-                        small
-                        inline
-                        fill={theme.icon}
-                        additionalStyles={styles.alignItemsCenter}
-                    />
-                    {translate('common.emptyLHN.subtitleText3')}
-                </Text>
+            <View style={[styles.alignItemsCenter, styles.flexRow, styles.justifyContentCenter, styles.flexWrap, styles.textAlignCenter]}>
+                <TextBlock
+                    color={theme.textSupporting}
+                    textStyles={[styles.textAlignCenter, styles.textNormal]}
+                    text={translate('common.emptyLHN.subtitleText1')}
+                />
+                <Icon
+                    src={Expensicons.MagnifyingGlass}
+                    width={variables.emptyLHNIconWidth}
+                    height={variables.emptyLHNIconHeight}
+                    fill={theme.icon}
+                    small
+                    additionalStyles={styles.mh1}
+                />
+                <TextBlock
+                    color={theme.textSupporting}
+                    textStyles={[styles.textAlignCenter, styles.textNormal]}
+                    text={translate('common.emptyLHN.subtitleText2')}
+                />
+                <Icon
+                    src={Expensicons.Plus}
+                    width={variables.emptyLHNIconWidth}
+                    height={variables.emptyLHNIconHeight}
+                    fill={theme.icon}
+                    small
+                    additionalStyles={styles.mh1}
+                />
+                <TextBlock
+                    color={theme.textSupporting}
+                    textStyles={[styles.textAlignCenter, styles.textNormal]}
+                    text={translate('common.emptyLHN.subtitleText3')}
+                />
             </View>
         ),
-        [theme, styles.alignItemsCenter, styles.textAlignCenter, translate],
+        [
+            styles.alignItemsCenter,
+            styles.flexRow,
+            styles.justifyContentCenter,
+            styles.flexWrap,
+            styles.textAlignCenter,
+            styles.mh1,
+            theme.icon,
+            theme.textSupporting,
+            styles.textNormal,
+            translate,
+        ],
     );
 
     /**
@@ -106,13 +113,29 @@ function LHNOptionsList({
      */
     const renderItem = useCallback(
         ({item: reportID}: RenderItemProps): ReactElement => {
-            const itemFullReport = reports?.[`${ONYXKEYS.COLLECTION.REPORT}${reportID}`] ?? null;
-            const itemReportActions = reportActions?.[`${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${reportID}`] ?? null;
-            const itemParentReportActions = reportActions?.[`${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${itemFullReport?.parentReportID}`] ?? null;
-            const itemParentReportAction = itemParentReportActions?.[itemFullReport?.parentReportActionID ?? ''] ?? null;
-            const itemPolicy = policy?.[`${ONYXKEYS.COLLECTION.POLICY}${itemFullReport?.policyID}`] ?? null;
-            const transactionID = itemParentReportAction?.actionName === CONST.REPORT.ACTIONS.TYPE.IOU ? itemParentReportAction.originalMessage.IOUTransactionID ?? '' : '';
-            const itemTransaction = transactions?.[`${ONYXKEYS.COLLECTION.TRANSACTION}${transactionID}`] ?? null;
+            const itemFullReport = reports?.[`${ONYXKEYS.COLLECTION.REPORT}${reportID}`];
+            const itemParentReport = reports?.[`${ONYXKEYS.COLLECTION.REPORT}${itemFullReport?.parentReportID ?? '-1'}`];
+            const itemReportActions = reportActions?.[`${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${reportID}`];
+            const itemParentReportActions = reportActions?.[`${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${itemFullReport?.parentReportID}`];
+            const itemParentReportAction = itemParentReportActions?.[itemFullReport?.parentReportActionID ?? '-1'];
+
+            let invoiceReceiverPolicyID = '-1';
+            if (itemFullReport?.invoiceReceiver && 'policyID' in itemFullReport.invoiceReceiver) {
+                invoiceReceiverPolicyID = itemFullReport.invoiceReceiver.policyID;
+            }
+            if (itemParentReport?.invoiceReceiver && 'policyID' in itemParentReport.invoiceReceiver) {
+                invoiceReceiverPolicyID = itemParentReport.invoiceReceiver.policyID;
+            }
+            const itemInvoiceReceiverPolicy = policy?.[`${ONYXKEYS.COLLECTION.POLICY}${invoiceReceiverPolicyID}`];
+
+            const iouReportIDOfLastAction = OptionsListUtils.getIOUReportIDOfLastAction(itemFullReport);
+            const itemIouReportReportActions = iouReportIDOfLastAction ? reportActions?.[`${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${iouReportIDOfLastAction}`] : undefined;
+
+            const itemPolicy = policy?.[`${ONYXKEYS.COLLECTION.POLICY}${itemFullReport?.policyID}`];
+            const transactionID = ReportActionsUtils.isMoneyRequestAction(itemParentReportAction)
+                ? ReportActionsUtils.getOriginalMessage(itemParentReportAction)?.IOUTransactionID ?? '-1'
+                : '-1';
+            const itemTransaction = transactions?.[`${ONYXKEYS.COLLECTION.TRANSACTION}${transactionID}`];
             const hasDraftComment = DraftCommentUtils.isValidDraftComment(draftComments?.[`${ONYXKEYS.COLLECTION.REPORT_DRAFT_COMMENT}${reportID}`]);
             const sortedReportActions = ReportActionsUtils.getSortedReportActionsForDisplay(itemReportActions);
             const lastReportAction = sortedReportActions[0];
@@ -120,10 +143,10 @@ function LHNOptionsList({
             // Get the transaction for the last report action
             let lastReportActionTransactionID = '';
 
-            if (lastReportAction?.actionName === CONST.REPORT.ACTIONS.TYPE.IOU) {
-                lastReportActionTransactionID = lastReportAction.originalMessage?.IOUTransactionID ?? '';
+            if (ReportActionsUtils.isMoneyRequestAction(lastReportAction)) {
+                lastReportActionTransactionID = ReportActionsUtils.getOriginalMessage(lastReportAction)?.IOUTransactionID ?? '-1';
             }
-            const lastReportActionTransaction = transactions?.[`${ONYXKEYS.COLLECTION.TRANSACTION}${lastReportActionTransactionID}`] ?? {};
+            const lastReportActionTransaction = transactions?.[`${ONYXKEYS.COLLECTION.TRANSACTION}${lastReportActionTransactionID}`];
 
             return (
                 <OptionRowLHNData
@@ -131,7 +154,9 @@ function LHNOptionsList({
                     fullReport={itemFullReport}
                     reportActions={itemReportActions}
                     parentReportAction={itemParentReportAction}
+                    iouReportReportActions={itemIouReportReportActions}
                     policy={itemPolicy}
+                    invoiceReceiverPolicy={itemInvoiceReceiverPolicy}
                     personalDetails={personalDetails ?? {}}
                     transaction={itemTransaction}
                     lastReportActionTransaction={lastReportActionTransaction}
@@ -142,7 +167,6 @@ function LHNOptionsList({
                     preferredLocale={preferredLocale}
                     hasDraftComment={hasDraftComment}
                     transactionViolations={transactionViolations}
-                    canUseViolations={canUseViolations}
                     onLayout={onLayoutItem}
                 />
             );
@@ -159,14 +183,13 @@ function LHNOptionsList({
             shouldDisableFocusOptions,
             transactions,
             transactionViolations,
-            canUseViolations,
             onLayoutItem,
         ],
     );
 
     const extraData = useMemo(
-        () => [reportActions, reports, policy, personalDetails, data.length, draftComments],
-        [reportActions, reports, policy, personalDetails, data.length, draftComments],
+        () => [reportActions, reports, transactionViolations, policy, personalDetails, data.length, draftComments, optionMode, preferredLocale],
+        [reportActions, reports, transactionViolations, policy, personalDetails, data.length, draftComments, optionMode, preferredLocale],
     );
 
     const previousOptionMode = usePrevious(optionMode);
@@ -246,31 +269,6 @@ function LHNOptionsList({
 
 LHNOptionsList.displayName = 'LHNOptionsList';
 
-export default withOnyx<LHNOptionsListProps, LHNOptionsListOnyxProps>({
-    reports: {
-        key: ONYXKEYS.COLLECTION.REPORT,
-    },
-    reportActions: {
-        key: ONYXKEYS.COLLECTION.REPORT_ACTIONS,
-    },
-    policy: {
-        key: ONYXKEYS.COLLECTION.POLICY,
-    },
-    preferredLocale: {
-        key: ONYXKEYS.NVP_PREFERRED_LOCALE,
-    },
-    personalDetails: {
-        key: ONYXKEYS.PERSONAL_DETAILS_LIST,
-    },
-    transactions: {
-        key: ONYXKEYS.COLLECTION.TRANSACTION,
-    },
-    draftComments: {
-        key: ONYXKEYS.COLLECTION.REPORT_DRAFT_COMMENT,
-    },
-    transactionViolations: {
-        key: ONYXKEYS.COLLECTION.TRANSACTION_VIOLATIONS,
-    },
-})(memo(LHNOptionsList));
+export default memo(LHNOptionsList);
 
 export type {LHNOptionsListProps};
diff --git a/src/components/LHNOptionsList/OptionRowLHN.tsx b/src/components/LHNOptionsList/OptionRowLHN.tsx
index b9bc46f56ae5..cee949133eb2 100644
--- a/src/components/LHNOptionsList/OptionRowLHN.tsx
+++ b/src/components/LHNOptionsList/OptionRowLHN.tsx
@@ -1,8 +1,9 @@
 import {useFocusEffect} from '@react-navigation/native';
-import ExpensiMark from 'expensify-common/lib/ExpensiMark';
 import React, {useCallback, useRef, useState} from 'react';
 import type {GestureResponderEvent, ViewStyle} from 'react-native';
 import {StyleSheet, View} from 'react-native';
+import {useOnyx} from 'react-native-onyx';
+import Badge from '@components/Badge';
 import DisplayNames from '@components/DisplayNames';
 import Hoverable from '@components/Hoverable';
 import Icon from '@components/Icon';
@@ -14,30 +15,34 @@ import SubscriptAvatar from '@components/SubscriptAvatar';
 import Text from '@components/Text';
 import Tooltip from '@components/Tooltip';
 import useLocalize from '@hooks/useLocalize';
+import useResponsiveLayout from '@hooks/useResponsiveLayout';
 import useStyleUtils from '@hooks/useStyleUtils';
 import useTheme from '@hooks/useTheme';
 import useThemeStyles from '@hooks/useThemeStyles';
-import useWindowDimensions from '@hooks/useWindowDimensions';
 import DateUtils from '@libs/DateUtils';
 import DomUtils from '@libs/DomUtils';
 import * as OptionsListUtils from '@libs/OptionsListUtils';
+import Parser from '@libs/Parser';
 import Performance from '@libs/Performance';
 import ReportActionComposeFocusManager from '@libs/ReportActionComposeFocusManager';
 import * as ReportUtils from '@libs/ReportUtils';
+import * as SubscriptionUtils from '@libs/SubscriptionUtils';
 import * as ReportActionContextMenu from '@pages/home/report/ContextMenu/ReportActionContextMenu';
 import CONST from '@src/CONST';
+import ONYXKEYS from '@src/ONYXKEYS';
 import {isEmptyObject} from '@src/types/utils/EmptyObject';
 import type {OptionRowLHNProps} from './types';
 
-const parser = new ExpensiMark();
-
 function OptionRowLHN({reportID, isFocused = false, onSelectRow = () => {}, optionItem, viewMode = 'default', style, onLayout = () => {}, hasDraftComment}: OptionRowLHNProps) {
     const theme = useTheme();
     const styles = useThemeStyles();
     const popoverAnchor = useRef<View>(null);
     const StyleUtils = useStyleUtils();
     const isFocusedRef = useRef(true);
-    const {isSmallScreenWidth} = useWindowDimensions();
+    const {shouldUseNarrowLayout} = useResponsiveLayout();
+
+    // eslint-disable-next-line @typescript-eslint/prefer-nullish-coalescing
+    const [report] = useOnyx(`${ONYXKEYS.COLLECTION.REPORT}${optionItem?.reportID || -1}`);
 
     const {translate} = useLocalize();
     const [isContextMenuActive, setIsContextMenuActive] = useState(false);
@@ -51,26 +56,41 @@ function OptionRowLHN({reportID, isFocused = false, onSelectRow = () => {}, opti
         }, []),
     );
 
+    const isInFocusMode = viewMode === CONST.OPTION_MODE.COMPACT;
+    const sidebarInnerRowStyle = StyleSheet.flatten<ViewStyle>(
+        isInFocusMode
+            ? [styles.chatLinkRowPressable, styles.flexGrow1, styles.optionItemAvatarNameWrapper, styles.optionRowCompact, styles.justifyContentCenter]
+            : [styles.chatLinkRowPressable, styles.flexGrow1, styles.optionItemAvatarNameWrapper, styles.optionRow, styles.justifyContentCenter],
+    );
+
+    if (!optionItem && !isFocused) {
+        // rendering null as a render item causes the FlashList to render all
+        // its children and consume signficant memory on the first render. We can avoid this by
+        // rendering a placeholder view instead. This behaviour is only observed when we
+        // first sign in to the App.
+        // We can fix this by checking if the optionItem is null and the component is not focused.
+        // Which means that the currentReportID is not the same as the reportID. The currentReportID
+        // in this case is empty and hence the component is not focused.
+        return <View style={sidebarInnerRowStyle} />;
+    }
+
     if (!optionItem) {
+        // This is the case when the component is focused and the optionItem is null.
+        // For example, when you submit an expense in offline mode and click on the
+        // generated expense report, we would only see the Report Details but no item in LHN.
         return null;
     }
 
     const hasBrickError = optionItem.brickRoadIndicator === CONST.BRICK_ROAD_INDICATOR_STATUS.ERROR;
     const shouldShowGreenDotIndicator = !hasBrickError && ReportUtils.requiresAttentionFromCurrentUser(optionItem, optionItem.parentReportAction);
-    const isInFocusMode = viewMode === CONST.OPTION_MODE.COMPACT;
     const textStyle = isFocused ? styles.sidebarLinkActiveText : styles.sidebarLinkText;
-    const textUnreadStyle = optionItem?.isUnread && optionItem.notificationPreference !== CONST.REPORT.NOTIFICATION_PREFERENCE.MUTE ? [textStyle, styles.sidebarLinkTextBold] : [textStyle];
+    const textUnreadStyle = OptionsListUtils.shouldUseBoldText(optionItem) ? [textStyle, styles.sidebarLinkTextBold] : [textStyle];
     const displayNameStyle = [styles.optionDisplayName, styles.optionDisplayNameCompact, styles.pre, textUnreadStyle, style];
     const alternateTextStyle = isInFocusMode
-        ? [textStyle, styles.optionAlternateText, styles.textLabelSupporting, styles.optionAlternateTextCompact, styles.ml2, style]
+        ? [textStyle, styles.textLabelSupporting, styles.optionAlternateTextCompact, styles.ml2, style]
         : [textStyle, styles.optionAlternateText, styles.textLabelSupporting, style];
 
     const contentContainerStyles = isInFocusMode ? [styles.flex1, styles.flexRow, styles.overflowHidden, StyleUtils.getCompactContentContainerStyles()] : [styles.flex1];
-    const sidebarInnerRowStyle = StyleSheet.flatten<ViewStyle>(
-        isInFocusMode
-            ? [styles.chatLinkRowPressable, styles.flexGrow1, styles.optionItemAvatarNameWrapper, styles.optionRowCompact, styles.justifyContentCenter]
-            : [styles.chatLinkRowPressable, styles.flexGrow1, styles.optionItemAvatarNameWrapper, styles.optionRow, styles.justifyContentCenter],
-    );
     const hoveredBackgroundColor = !!styles.sidebarLinkHover && 'backgroundColor' in styles.sidebarLinkHover ? styles.sidebarLinkHover.backgroundColor : theme.sidebar;
     const focusedBackgroundColor = styles.sidebarLinkActive.backgroundColor;
 
@@ -80,7 +100,7 @@ function OptionRowLHN({reportID, isFocused = false, onSelectRow = () => {}, opti
      * @param [event] - A press event.
      */
     const showPopover = (event: MouseEvent | GestureResponderEvent) => {
-        if (!isFocusedRef.current && isSmallScreenWidth) {
+        if (!isFocusedRef.current && shouldUseNarrowLayout) {
             return;
         }
         setIsContextMenuActive(true);
@@ -90,7 +110,7 @@ function OptionRowLHN({reportID, isFocused = false, onSelectRow = () => {}, opti
             '',
             popoverAnchor.current,
             reportID,
-            '0',
+            '-1',
             reportID,
             undefined,
             () => {},
@@ -107,12 +127,11 @@ function OptionRowLHN({reportID, isFocused = false, onSelectRow = () => {}, opti
     const statusClearAfterDate = optionItem.status?.clearAfter ?? '';
     const formattedDate = DateUtils.getStatusUntilDate(statusClearAfterDate);
     const statusContent = formattedDate ? `${statusText ? `${statusText} ` : ''}(${formattedDate})` : statusText;
-    const report = ReportUtils.getReport(optionItem.reportID ?? '');
-    const isStatusVisible = !!emojiCode && ReportUtils.isOneOnOneChat(!isEmptyObject(report) ? report : null);
+    const isStatusVisible = !!emojiCode && ReportUtils.isOneOnOneChat(!isEmptyObject(report) ? report : undefined);
 
     const isGroupChat = ReportUtils.isGroupChat(optionItem) || ReportUtils.isDeprecatedGroupDM(optionItem);
 
-    const fullTitle = isGroupChat ? ReportUtils.getGroupChatName(undefined, false, optionItem.reportID ?? '') : optionItem.text;
+    const fullTitle = isGroupChat ? ReportUtils.getGroupChatName(undefined, false, report) : optionItem.text;
     const subscriptAvatarBorderColor = isFocused ? focusedBackgroundColor : theme.sidebar;
     return (
         <OfflineWithFeedback
@@ -169,17 +188,17 @@ function OptionRowLHN({reportID, isFocused = false, onSelectRow = () => {}, opti
                     >
                         <View style={sidebarInnerRowStyle}>
                             <View style={[styles.flexRow, styles.alignItemsCenter]}>
-                                {(optionItem.icons?.length ?? 0) > 0 &&
+                                {!!optionItem.icons?.length &&
                                     (optionItem.shouldShowSubscript ? (
                                         <SubscriptAvatar
                                             backgroundColor={hovered && !isFocused ? hoveredBackgroundColor : subscriptAvatarBorderColor}
-                                            mainAvatar={optionItem.icons?.[0]}
-                                            secondaryAvatar={optionItem.icons?.[1]}
+                                            mainAvatar={optionItem.icons[0]}
+                                            secondaryAvatar={optionItem.icons[1]}
                                             size={isInFocusMode ? CONST.AVATAR_SIZE.SMALL : CONST.AVATAR_SIZE.DEFAULT}
                                         />
                                     ) : (
                                         <MultipleAvatars
-                                            icons={optionItem.icons ?? []}
+                                            icons={optionItem.icons}
                                             isFocusMode={isInFocusMode}
                                             size={isInFocusMode ? CONST.AVATAR_SIZE.SMALL : CONST.AVATAR_SIZE.DEFAULT}
                                             secondAvatarStyle={[
@@ -206,9 +225,17 @@ function OptionRowLHN({reportID, isFocused = false, onSelectRow = () => {}, opti
                                                 !!optionItem.isThread ||
                                                 !!optionItem.isMoneyRequestReport ||
                                                 !!optionItem.isInvoiceReport ||
-                                                ReportUtils.isGroupChat(report)
+                                                ReportUtils.isGroupChat(report) ||
+                                                ReportUtils.isSystemChat(report)
                                             }
                                         />
+                                        {ReportUtils.isChatUsedForOnboarding(report) && SubscriptionUtils.isUserOnFreeTrial() && (
+                                            <Badge
+                                                success
+                                                text={translate('subscription.badge.freeTrial', {numOfDays: SubscriptionUtils.calculateRemainingFreeTrialDays()})}
+                                                badgeStyles={[styles.mnh0, styles.pl2, styles.pr2, styles.ml1]}
+                                            />
+                                        )}
                                         {isStatusVisible && (
                                             <Tooltip
                                                 text={statusContent}
@@ -224,7 +251,7 @@ function OptionRowLHN({reportID, isFocused = false, onSelectRow = () => {}, opti
                                             numberOfLines={1}
                                             accessibilityLabel={translate('accessibilityHints.lastChatMessagePreview')}
                                         >
-                                            {parser.htmlToText(optionItem.alternateText)}
+                                            {Parser.htmlToText(optionItem.alternateText)}
                                         </Text>
                                     ) : null}
                                 </View>
diff --git a/src/components/LHNOptionsList/OptionRowLHNData.tsx b/src/components/LHNOptionsList/OptionRowLHNData.tsx
index c80017c39a3d..8179aed9de0c 100644
--- a/src/components/LHNOptionsList/OptionRowLHNData.tsx
+++ b/src/components/LHNOptionsList/OptionRowLHNData.tsx
@@ -21,12 +21,13 @@ function OptionRowLHNData({
     personalDetails = {},
     preferredLocale = CONST.LOCALES.DEFAULT,
     policy,
+    invoiceReceiverPolicy,
     receiptTransactions,
     parentReportAction,
+    iouReportReportActions,
     transaction,
-    lastReportActionTransaction = {},
+    lastReportActionTransaction,
     transactionViolations,
-    canUseViolations,
     ...propsToForward
 }: OptionRowLHNDataProps) {
     const reportID = propsToForward.reportID;
@@ -35,7 +36,8 @@ function OptionRowLHNData({
 
     const optionItemRef = useRef<OptionData>();
 
-    const shouldDisplayViolations = canUseViolations && ReportUtils.shouldDisplayTransactionThreadViolations(fullReport, transactionViolations, parentReportAction ?? null);
+    const shouldDisplayViolations = ReportUtils.shouldDisplayTransactionThreadViolations(fullReport, transactionViolations, parentReportAction);
+    const shouldDisplayReportViolations = ReportUtils.isReportOwner(fullReport) && ReportUtils.hasReportViolations(reportID);
 
     const optionItem = useMemo(() => {
         // Note: ideally we'd have this as a dependent selector in onyx!
@@ -46,7 +48,9 @@ function OptionRowLHNData({
             preferredLocale: preferredLocale ?? CONST.LOCALES.DEFAULT,
             policy,
             parentReportAction,
-            hasViolations: !!shouldDisplayViolations,
+            hasViolations: !!shouldDisplayViolations || shouldDisplayReportViolations,
+            transactionViolations,
+            invoiceReceiverPolicy,
         });
         if (deepEqual(item, optionItemRef.current)) {
             return optionItemRef.current;
@@ -57,7 +61,7 @@ function OptionRowLHNData({
         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
+        // eslint-disable-next-line react-compiler/react-compiler, react-hooks/exhaustive-deps
     }, [
         fullReport,
         lastReportActionTransaction,
@@ -66,10 +70,12 @@ function OptionRowLHNData({
         preferredLocale,
         policy,
         parentReportAction,
+        iouReportReportActions,
         transaction,
         transactionViolations,
-        canUseViolations,
         receiptTransactions,
+        invoiceReceiverPolicy,
+        shouldDisplayReportViolations,
     ]);
 
     return (
diff --git a/src/components/LHNOptionsList/types.ts b/src/components/LHNOptionsList/types.ts
index 0f0c921747b4..f914b001aba6 100644
--- a/src/components/LHNOptionsList/types.ts
+++ b/src/components/LHNOptionsList/types.ts
@@ -6,36 +6,9 @@ import type {ValueOf} from 'type-fest';
 import type CONST from '@src/CONST';
 import type {OptionData} from '@src/libs/ReportUtils';
 import type {Locale, PersonalDetailsList, Policy, Report, ReportAction, ReportActions, Transaction, TransactionViolation} from '@src/types/onyx';
-import type {EmptyObject} from '@src/types/utils/EmptyObject';
 
 type OptionMode = ValueOf<typeof CONST.OPTION_MODE>;
 
-type LHNOptionsListOnyxProps = {
-    /** The policy which the user has access to and which the report could be tied to */
-    policy: OnyxCollection<Policy>;
-
-    /** All reports shared with the user */
-    reports: OnyxCollection<Report>;
-
-    /** Array of report actions for this report */
-    reportActions: OnyxCollection<ReportActions>;
-
-    /** Indicates which locale the user currently has selected */
-    preferredLocale: OnyxEntry<Locale>;
-
-    /** List of users' personal details */
-    personalDetails: OnyxEntry<PersonalDetailsList>;
-
-    /** The transaction from the parent report action */
-    transactions: OnyxCollection<Transaction>;
-
-    /** List of draft comments */
-    draftComments: OnyxCollection<string>;
-
-    /** The list of transaction violations */
-    transactionViolations: OnyxCollection<TransactionViolation[]>;
-};
-
 type CustomLHNOptionsListProps = {
     /** Wrapper style for the section list */
     style?: StyleProp<ViewStyle>;
@@ -59,7 +32,7 @@ type CustomLHNOptionsListProps = {
     onFirstItemRendered: () => void;
 };
 
-type LHNOptionsListProps = CustomLHNOptionsListProps & LHNOptionsListOnyxProps;
+type LHNOptionsListProps = CustomLHNOptionsListProps;
 
 type OptionRowLHNDataProps = {
     /** Whether row should be focused */
@@ -77,6 +50,9 @@ type OptionRowLHNDataProps = {
     /** The policy which the user has access to and which the report could be tied to */
     policy?: OnyxEntry<Policy>;
 
+    /** Invoice receiver policy */
+    invoiceReceiverPolicy?: OnyxEntry<Policy>;
+
     /** The action from the parent report */
     parentReportAction?: OnyxEntry<ReportAction>;
 
@@ -84,7 +60,7 @@ type OptionRowLHNDataProps = {
     transaction: OnyxEntry<Transaction>;
 
     /** The transaction linked to the report's last action */
-    lastReportActionTransaction?: OnyxEntry<Transaction | EmptyObject>;
+    lastReportActionTransaction?: OnyxEntry<Transaction>;
 
     /** Whether a report contains a draft */
     hasDraftComment: boolean;
@@ -98,12 +74,17 @@ type OptionRowLHNDataProps = {
     /** Array of report actions for this report */
     reportActions: OnyxEntry<ReportActions>;
 
+    /**
+     * Array of report actions for the IOU report related to the last action of this report.
+     * If the last action is a report action preview, the last message of the report depends on
+     * the report actions of the IOU report linked to the report action preview.
+     * Changes in the IOU report report actions will affect the last message of this report.
+     */
+    iouReportReportActions: OnyxEntry<ReportActions>;
+
     /** List of transaction violation */
     transactionViolations: OnyxCollection<TransactionViolation[]>;
 
-    /** Whether the user can use violations */
-    canUseViolations: boolean | undefined;
-
     /** Toggle between compact and default view */
     viewMode?: OptionMode;
 
@@ -141,4 +122,4 @@ type OptionRowLHNProps = {
 
 type RenderItemProps = {item: string};
 
-export type {LHNOptionsListProps, OptionRowLHNDataProps, OptionRowLHNProps, LHNOptionsListOnyxProps, RenderItemProps};
+export type {LHNOptionsListProps, OptionRowLHNDataProps, OptionRowLHNProps, RenderItemProps};
diff --git a/src/components/Lightbox/index.tsx b/src/components/Lightbox/index.tsx
index 86a52c2baf6c..c5a77f9d5ec4 100644
--- a/src/components/Lightbox/index.tsx
+++ b/src/components/Lightbox/index.tsx
@@ -2,14 +2,17 @@ import React, {useCallback, useContext, useEffect, useMemo, useState} from 'reac
 import type {LayoutChangeEvent, StyleProp, ViewStyle} from 'react-native';
 import {ActivityIndicator, PixelRatio, StyleSheet, View} from 'react-native';
 import {useSharedValue} from 'react-native-reanimated';
+import AttachmentOfflineIndicator from '@components/AttachmentOfflineIndicator';
 import AttachmentCarouselPagerContext from '@components/Attachments/AttachmentCarousel/Pager/AttachmentCarouselPagerContext';
 import Image from '@components/Image';
 import type {ImageOnLoadEvent} from '@components/Image/types';
 import MultiGestureCanvas, {DEFAULT_ZOOM_RANGE} from '@components/MultiGestureCanvas';
 import type {CanvasSize, ContentSize, OnScaleChangedCallback, ZoomRange} from '@components/MultiGestureCanvas/types';
 import {getCanvasFitScale} from '@components/MultiGestureCanvas/utils';
+import useNetwork from '@hooks/useNetwork';
 import useStyleUtils from '@hooks/useStyleUtils';
 import useThemeStyles from '@hooks/useThemeStyles';
+import * as FileUtils from '@libs/fileDownload/FileUtils';
 import NUMBER_OF_CONCURRENT_LIGHTBOXES from './numberOfConcurrentLightboxes';
 
 const cachedImageDimensions = new Map<string, ContentSize | undefined>();
@@ -47,6 +50,7 @@ function Lightbox({isAuthTokenRequired = false, uri, onScaleChanged: onScaleChan
      * we need to create a shared value that can be used in the render function.
      */
     const isPagerScrollingFallback = useSharedValue(false);
+    const {isOffline} = useNetwork();
 
     const attachmentCarouselPagerContext = useContext(AttachmentCarouselPagerContext);
     const {
@@ -74,7 +78,7 @@ function Lightbox({isAuthTokenRequired = false, uri, onScaleChanged: onScaleChan
             };
         }
 
-        const foundPage = attachmentCarouselPagerContext.pagerItems.findIndex((item) => item.source === uri);
+        const foundPage = attachmentCarouselPagerContext.pagerItems.findIndex((item) => item.source === uri || item.previewSource === uri);
         return {
             ...attachmentCarouselPagerContext,
             isUsedInCarousel: !!attachmentCarouselPagerContext.pagerRef,
@@ -194,6 +198,8 @@ function Lightbox({isAuthTokenRequired = false, uri, onScaleChanged: onScaleChan
         [onScaleChangedContext, onScaleChangedProp],
     );
 
+    const isLocalFile = FileUtils.isLocalFile(uri);
+
     return (
         <View
             style={[StyleSheet.absoluteFill, style]}
@@ -219,8 +225,8 @@ function Lightbox({isAuthTokenRequired = false, uri, onScaleChanged: onScaleChan
                                     style={[contentSize ?? styles.invisibleImage]}
                                     isAuthTokenRequired={isAuthTokenRequired}
                                     onError={onError}
-                                    onLoad={updateContentSize}
-                                    onLoadEnd={() => {
+                                    onLoad={(e) => {
+                                        updateContentSize(e);
                                         setLightboxImageLoaded(true);
                                     }}
                                 />
@@ -236,19 +242,22 @@ function Lightbox({isAuthTokenRequired = false, uri, onScaleChanged: onScaleChan
                                 resizeMode="contain"
                                 style={[fallbackSize ?? styles.invisibleImage]}
                                 isAuthTokenRequired={isAuthTokenRequired}
-                                onLoad={updateContentSize}
-                                onLoadEnd={() => setFallbackImageLoaded(true)}
+                                onLoad={(e) => {
+                                    updateContentSize(e);
+                                    setFallbackImageLoaded(true);
+                                }}
                             />
                         </View>
                     )}
 
                     {/* Show activity indicator while the lightbox is still loading the image. */}
-                    {isLoading && (
+                    {isLoading && (!isOffline || isLocalFile) && (
                         <ActivityIndicator
                             size="large"
                             style={StyleSheet.absoluteFill}
                         />
                     )}
+                    {isLoading && !isLocalFile && <AttachmentOfflineIndicator />}
                 </>
             )}
         </View>
diff --git a/src/components/LocaleContextProvider.tsx b/src/components/LocaleContextProvider.tsx
index eb7d9324d2ab..383784a468d7 100644
--- a/src/components/LocaleContextProvider.tsx
+++ b/src/components/LocaleContextProvider.tsx
@@ -2,7 +2,6 @@ import React, {createContext, useMemo} from 'react';
 import type {OnyxEntry} from 'react-native-onyx';
 import {withOnyx} from 'react-native-onyx';
 import type {ValueOf} from 'type-fest';
-import compose from '@libs/compose';
 import DateUtils from '@libs/DateUtils';
 import * as LocaleDigitUtils from '@libs/LocaleDigitUtils';
 import * as LocalePhoneNumber from '@libs/LocalePhoneNumber';
@@ -51,7 +50,7 @@ type LocaleContextProps = {
     toLocaleDigit: (digit: string) => string;
 
     /** Formats a number into its localized ordinal representation */
-    toLocaleOrdinal: (number: number) => string;
+    toLocaleOrdinal: (number: number, returnWords?: boolean) => string;
 
     /** Gets the standard digit corresponding to a locale digit */
     fromLocaleDigit: (digit: string) => string;
@@ -73,7 +72,7 @@ const LocaleContext = createContext<LocaleContextProps>({
     preferredLocale: CONST.LOCALES.DEFAULT,
 });
 
-function LocaleContextProvider({preferredLocale, currentUserPersonalDetails = {}, children}: LocaleContextProviderProps) {
+function LocaleContextProvider({preferredLocale, currentUserPersonalDetails, children}: LocaleContextProviderProps) {
     const locale = preferredLocale ?? CONST.LOCALES.DEFAULT;
 
     const selectedTimezone = useMemo(() => currentUserPersonalDetails?.timezone?.selected, [currentUserPersonalDetails]);
@@ -102,7 +101,12 @@ function LocaleContextProvider({preferredLocale, currentUserPersonalDetails = {}
 
     const toLocaleDigit = useMemo<LocaleContextProps['toLocaleDigit']>(() => (digit) => LocaleDigitUtils.toLocaleDigit(locale, digit), [locale]);
 
-    const toLocaleOrdinal = useMemo<LocaleContextProps['toLocaleOrdinal']>(() => (number) => LocaleDigitUtils.toLocaleOrdinal(locale, number), [locale]);
+    const toLocaleOrdinal = useMemo<LocaleContextProps['toLocaleOrdinal']>(
+        () =>
+            (number, writtenOrdinals = false) =>
+                LocaleDigitUtils.toLocaleOrdinal(locale, number, writtenOrdinals),
+        [locale],
+    );
 
     const fromLocaleDigit = useMemo<LocaleContextProps['fromLocaleDigit']>(() => (localeDigit) => LocaleDigitUtils.fromLocaleDigit(locale, localeDigit), [locale]);
 
@@ -125,18 +129,17 @@ function LocaleContextProvider({preferredLocale, currentUserPersonalDetails = {}
     return <LocaleContext.Provider value={contextValue}>{children}</LocaleContext.Provider>;
 }
 
-const Provider = compose(
+const Provider = withCurrentUserPersonalDetails(
     withOnyx<LocaleContextProviderProps, LocaleContextProviderOnyxProps>({
         preferredLocale: {
             key: ONYXKEYS.NVP_PREFERRED_LOCALE,
             selector: (preferredLocale) => preferredLocale,
         },
-    }),
-    withCurrentUserPersonalDetails,
-)(LocaleContextProvider);
+    })(LocaleContextProvider),
+);
 
 Provider.displayName = 'withOnyx(LocaleContextProvider)';
 
-export {Provider as LocaleContextProvider, LocaleContext};
+export {LocaleContext, Provider as LocaleContextProvider};
 
-export type {LocaleContextProps, Locale};
+export type {Locale, LocaleContextProps};
diff --git a/src/components/LocationPermissionModal/index.android.tsx b/src/components/LocationPermissionModal/index.android.tsx
new file mode 100644
index 000000000000..811537e00e67
--- /dev/null
+++ b/src/components/LocationPermissionModal/index.android.tsx
@@ -0,0 +1,90 @@
+import React, {useEffect, useState} from 'react';
+import {Linking} from 'react-native';
+import {RESULTS} from 'react-native-permissions';
+import ConfirmModal from '@components/ConfirmModal';
+import * as Illustrations from '@components/Icon/Illustrations';
+import useLocalize from '@hooks/useLocalize';
+import useThemeStyles from '@hooks/useThemeStyles';
+import {getLocationPermission, requestLocationPermission} from '@pages/iou/request/step/IOURequestStepScan/LocationPermission';
+import type {LocationPermissionModalProps} from './types';
+
+function LocationPermissionModal({startPermissionFlow, resetPermissionFlow, onDeny, onGrant}: LocationPermissionModalProps) {
+    const [hasError, setHasError] = useState(false);
+    const [showModal, setShowModal] = useState(false);
+
+    const styles = useThemeStyles();
+    const {translate} = useLocalize();
+
+    useEffect(() => {
+        if (!startPermissionFlow) {
+            return;
+        }
+
+        getLocationPermission().then((status) => {
+            if (status === RESULTS.GRANTED || status === RESULTS.LIMITED) {
+                return onGrant();
+            }
+
+            setShowModal(true);
+            setHasError(status === RESULTS.BLOCKED);
+        });
+        // eslint-disable-next-line react-compiler/react-compiler, react-hooks/exhaustive-deps -- We only want to run this effect when startPermissionFlow changes
+    }, [startPermissionFlow]);
+
+    const handledBlockedPermission = (cb: () => void) => () => {
+        if (hasError && Linking.openSettings) {
+            Linking.openSettings();
+            setShowModal(false);
+            setHasError(false);
+            resetPermissionFlow();
+            return;
+        }
+        cb();
+    };
+
+    const grantLocationPermission = handledBlockedPermission(() => {
+        requestLocationPermission().then((status) => {
+            if (status === RESULTS.GRANTED || status === RESULTS.LIMITED) {
+                onGrant();
+            } else if (status === RESULTS.BLOCKED) {
+                setHasError(true);
+                return;
+            } else {
+                onDeny(status);
+            }
+            setShowModal(false);
+            setHasError(false);
+        });
+    });
+
+    const skipLocationPermission = () => {
+        onDeny(RESULTS.DENIED);
+        setShowModal(false);
+        setHasError(false);
+    };
+
+    return (
+        <ConfirmModal
+            isVisible={showModal}
+            onConfirm={grantLocationPermission}
+            onCancel={skipLocationPermission}
+            confirmText={hasError ? translate('common.settings') : translate('common.continue')}
+            cancelText={translate('common.notNow')}
+            prompt={translate(hasError ? 'receipt.locationErrorMessage' : 'receipt.locationAccessMessage')}
+            promptStyles={[styles.textLabelSupportingEmptyValue, styles.mb4]}
+            title={translate(hasError ? 'receipt.locationErrorTitle' : 'receipt.locationAccessTitle')}
+            titleContainerStyles={[styles.mt2, styles.mb0]}
+            titleStyles={[styles.textHeadline]}
+            iconSource={Illustrations.ReceiptLocationMarker}
+            iconFill={false}
+            iconWidth={140}
+            iconHeight={120}
+            shouldCenterIcon
+            shouldReverseStackedButtons
+        />
+    );
+}
+
+LocationPermissionModal.displayName = 'LocationPermissionModal';
+
+export default LocationPermissionModal;
diff --git a/src/components/LocationPermissionModal/index.tsx b/src/components/LocationPermissionModal/index.tsx
new file mode 100644
index 000000000000..53fa6928b90d
--- /dev/null
+++ b/src/components/LocationPermissionModal/index.tsx
@@ -0,0 +1,104 @@
+import React, {useEffect, useState} from 'react';
+import {Linking} from 'react-native';
+import {RESULTS} from 'react-native-permissions';
+import ConfirmModal from '@components/ConfirmModal';
+import * as Illustrations from '@components/Icon/Illustrations';
+import useLocalize from '@hooks/useLocalize';
+import useThemeStyles from '@hooks/useThemeStyles';
+import getPlatform from '@libs/getPlatform';
+import {getLocationPermission, requestLocationPermission} from '@pages/iou/request/step/IOURequestStepScan/LocationPermission';
+import CONST from '@src/CONST';
+import type {LocationPermissionModalProps} from './types';
+
+function LocationPermissionModal({startPermissionFlow, resetPermissionFlow, onDeny, onGrant}: LocationPermissionModalProps) {
+    const [hasError, setHasError] = useState(false);
+    const [showModal, setShowModal] = useState(false);
+
+    const styles = useThemeStyles();
+    const {translate} = useLocalize();
+
+    const isWeb = getPlatform() === CONST.PLATFORM.WEB;
+
+    useEffect(() => {
+        if (!startPermissionFlow) {
+            return;
+        }
+
+        getLocationPermission().then((status) => {
+            if (status === RESULTS.GRANTED || status === RESULTS.LIMITED) {
+                return onGrant();
+            }
+
+            setShowModal(true);
+            setHasError(status === RESULTS.BLOCKED);
+        });
+        // eslint-disable-next-line react-compiler/react-compiler, react-hooks/exhaustive-deps -- We only want to run this effect when startPermissionFlow changes
+    }, [startPermissionFlow]);
+
+    const handledBlockedPermission = (cb: () => void) => () => {
+        if (hasError) {
+            if (Linking.openSettings) {
+                Linking.openSettings();
+            }
+            setShowModal(false);
+            setHasError(false);
+            resetPermissionFlow();
+            return;
+        }
+        cb();
+    };
+
+    const grantLocationPermission = handledBlockedPermission(() => {
+        requestLocationPermission()
+            .then((status) => {
+                if (status === RESULTS.GRANTED || status === RESULTS.LIMITED) {
+                    onGrant();
+                } else {
+                    onDeny(status);
+                }
+            })
+            .finally(() => {
+                setShowModal(false);
+                setHasError(false);
+            });
+    });
+
+    const skipLocationPermission = () => {
+        onDeny(RESULTS.DENIED);
+        setShowModal(false);
+        setHasError(false);
+    };
+
+    const getConfirmText = (): string => {
+        if (!hasError) {
+            return translate('common.continue');
+        }
+
+        return isWeb ? translate('common.buttonConfirm') : translate('common.settings');
+    };
+
+    return (
+        <ConfirmModal
+            isVisible={showModal}
+            onConfirm={grantLocationPermission}
+            onCancel={skipLocationPermission}
+            confirmText={getConfirmText()}
+            cancelText={translate('common.notNow')}
+            prompt={translate(hasError ? 'receipt.locationErrorMessage' : 'receipt.locationAccessMessage')}
+            promptStyles={[styles.textLabelSupportingEmptyValue, styles.mb4]}
+            title={translate(hasError ? 'receipt.locationErrorTitle' : 'receipt.locationAccessTitle')}
+            titleContainerStyles={[styles.mt2, styles.mb0]}
+            titleStyles={[styles.textHeadline]}
+            iconSource={Illustrations.ReceiptLocationMarker}
+            iconFill={false}
+            iconWidth={140}
+            iconHeight={120}
+            shouldCenterIcon
+            shouldReverseStackedButtons
+        />
+    );
+}
+
+LocationPermissionModal.displayName = 'LocationPermissionModal';
+
+export default LocationPermissionModal;
diff --git a/src/components/LocationPermissionModal/types.ts b/src/components/LocationPermissionModal/types.ts
new file mode 100644
index 000000000000..ec603bfdb8c1
--- /dev/null
+++ b/src/components/LocationPermissionModal/types.ts
@@ -0,0 +1,19 @@
+import type {PermissionStatus} from 'react-native-permissions';
+
+type LocationPermissionModalProps = {
+    /** A callback to call when the permission has been granted */
+    onGrant: () => void;
+
+    /** A callback to call when the permission has been denied */
+    onDeny: (permission: PermissionStatus) => void;
+
+    /** Should start the permission flow? */
+    startPermissionFlow: boolean;
+
+    /** Reset the permission flow */
+    resetPermissionFlow: () => void;
+};
+
+export default {};
+
+export type {LocationPermissionModalProps};
diff --git a/src/components/Lottie/index.tsx b/src/components/Lottie/index.tsx
index 6395a715f339..0f3b81554c75 100644
--- a/src/components/Lottie/index.tsx
+++ b/src/components/Lottie/index.tsx
@@ -1,12 +1,15 @@
-import type {LottieViewProps} from 'lottie-react-native';
+import {useNavigation} from '@react-navigation/native';
+import type {AnimationObject, LottieViewProps} from 'lottie-react-native';
 import LottieView from 'lottie-react-native';
 import type {ForwardedRef} from 'react';
-import React, {forwardRef} from 'react';
+import React, {forwardRef, useEffect, useState} from 'react';
 import {View} from 'react-native';
 import type DotLottieAnimation from '@components/LottieAnimations/types';
 import useAppState from '@hooks/useAppState';
 import useNetwork from '@hooks/useNetwork';
+import useSplashScreen from '@hooks/useSplashScreen';
 import useThemeStyles from '@hooks/useThemeStyles';
+import NAVIGATORS from '@src/NAVIGATORS';
 
 type Props = {
     source: DotLottieAnimation;
@@ -14,17 +17,47 @@ type Props = {
 
 function Lottie({source, webStyle, ...props}: Props, ref: ForwardedRef<LottieView>) {
     const appState = useAppState();
+    const {isSplashHidden} = useSplashScreen();
     const styles = useThemeStyles();
     const [isError, setIsError] = React.useState(false);
+    const [isHidden, setIsHidden] = React.useState(false);
+    const navigation = useNavigation();
 
     useNetwork({onReconnect: () => setIsError(false)});
 
+    const [animationFile, setAnimationFile] = useState<string | AnimationObject | {uri: string}>();
+
+    useEffect(() => {
+        setAnimationFile(source.file);
+    }, [setAnimationFile, source.file]);
+
+    useEffect(() => {
+        const unsubscribeNavigationFocus = navigation.addListener('focus', () => {
+            setIsHidden(false);
+        });
+        return unsubscribeNavigationFocus;
+    }, [navigation]);
+
+    // Prevent the animation from running in the background after navigating to other pages.
+    // See https://github.com/Expensify/App/issues/47273
+    useEffect(() => {
+        const unsubscribeNavigationBlur = navigation.addListener('blur', () => {
+            const state = navigation.getState();
+            const targetRouteName = state?.routes?.[state?.index ?? 0]?.name;
+            if (targetRouteName !== NAVIGATORS.RIGHT_MODAL_NAVIGATOR) {
+                setIsHidden(true);
+            }
+        });
+        return unsubscribeNavigationBlur;
+    }, [navigation]);
+
     const aspectRatioStyle = styles.aspectRatioLottie(source);
 
-    // If the image fails to load or app is in background state, we'll just render an empty view
-    // using the fallback in case of a Lottie error or appState.isBackground to prevent
-    // memory leak, see issue: https://github.com/Expensify/App/issues/36645
-    if (isError || appState.isBackground) {
+    // If the image fails to load, app is in background state, animation file isn't ready, or the splash screen isn't hidden yet,
+    // we'll just render an empty view as the fallback to prevent
+    // 1. memory leak, see issue: https://github.com/Expensify/App/issues/36645
+    // 2. heavy rendering, see issue: https://github.com/Expensify/App/issues/34696
+    if (isError || isHidden || appState.isBackground || !animationFile || !isSplashHidden) {
         return <View style={[aspectRatioStyle, props.style]} />;
     }
 
@@ -32,7 +65,7 @@ function Lottie({source, webStyle, ...props}: Props, ref: ForwardedRef<LottieVie
         <LottieView
             // eslint-disable-next-line react/jsx-props-no-spreading
             {...props}
-            source={source.file}
+            source={animationFile}
             ref={ref}
             style={[aspectRatioStyle, props.style]}
             webStyle={{...aspectRatioStyle, ...webStyle}}
diff --git a/src/components/LottieAnimations/index.tsx b/src/components/LottieAnimations/index.tsx
index 598819e19361..afbc9cd56e28 100644
--- a/src/components/LottieAnimations/index.tsx
+++ b/src/components/LottieAnimations/index.tsx
@@ -1,74 +1,81 @@
+import type {LottieViewProps} from 'lottie-react-native';
 import colors from '@styles/theme/colors';
 import variables from '@styles/variables';
 import type DotLottieAnimation from './types';
 
 const DotLottieAnimations = {
+    Abracadabra: {
+        file: require<LottieViewProps['source']>('@assets/animations/Abracadabra.lottie'),
+        w: 375,
+        h: 400,
+    },
     FastMoney: {
-        file: require('@assets/animations/FastMoney.lottie'),
+        file: require<LottieViewProps['source']>('@assets/animations/FastMoney.lottie'),
         w: 375,
         h: 240,
     },
     Fireworks: {
-        file: require('@assets/animations/Fireworks.lottie'),
+        file: require<LottieViewProps['source']>('@assets/animations/Fireworks.lottie'),
         w: 360,
         h: 360,
     },
     Hands: {
-        file: require('@assets/animations/Hands.lottie'),
+        file: require<LottieViewProps['source']>('@assets/animations/Hands.lottie'),
         w: 375,
         h: 375,
     },
     PreferencesDJ: {
-        file: require('@assets/animations/PreferencesDJ.lottie'),
+        file: require<LottieViewProps['source']>('@assets/animations/PreferencesDJ.lottie'),
         w: 375,
         h: 240,
         backgroundColor: colors.blue500,
     },
     ReviewingBankInfo: {
-        file: require('@assets/animations/ReviewingBankInfo.lottie'),
+        file: require<LottieViewProps['source']>('@assets/animations/ReviewingBankInfo.lottie'),
         w: 280,
         h: 280,
     },
     WorkspacePlanet: {
-        file: require('@assets/animations/WorkspacePlanet.lottie'),
+        file: require<LottieViewProps['source']>('@assets/animations/WorkspacePlanet.lottie'),
         w: 375,
         h: 240,
         backgroundColor: colors.pink800,
     },
     SaveTheWorld: {
-        file: require('@assets/animations/SaveTheWorld.lottie'),
+        file: require<LottieViewProps['source']>('@assets/animations/SaveTheWorld.lottie'),
         w: 375,
         h: 240,
     },
     Safe: {
-        file: require('@assets/animations/Safe.lottie'),
+        file: require<LottieViewProps['source']>('@assets/animations/Safe.lottie'),
         w: 625,
         h: 400,
         backgroundColor: colors.ice500,
     },
     Magician: {
-        file: require('@assets/animations/Magician.lottie'),
+        file: require<LottieViewProps['source']>('@assets/animations/Magician.lottie'),
         w: 853,
         h: 480,
     },
     Update: {
-        file: require('@assets/animations/Update.lottie'),
+        file: require<LottieViewProps['source']>('@assets/animations/Update.lottie'),
         w: variables.updateAnimationW,
         h: variables.updateAnimationH,
     },
     Coin: {
-        file: require('@assets/animations/Coin.lottie'),
+        file: require<LottieViewProps['source']>('@assets/animations/Coin.lottie'),
         w: 375,
         h: 240,
         backgroundColor: colors.yellow600,
     },
     Desk: {
-        file: require('@assets/animations/Desk.lottie'),
+        file: require<LottieViewProps['source']>('@assets/animations/Desk.lottie'),
         w: 200,
         h: 120,
+        backgroundColor: colors.blue700,
     },
     Plane: {
-        file: require('@assets/animations/Plane.lottie'),
+        file: require<LottieViewProps['source']>('@assets/animations/Plane.lottie'),
         w: 180,
         h: 200,
     },
diff --git a/src/components/MagicCodeInput.tsx b/src/components/MagicCodeInput.tsx
index deff56a534ee..79c2445f7ae7 100644
--- a/src/components/MagicCodeInput.tsx
+++ b/src/components/MagicCodeInput.tsx
@@ -1,4 +1,4 @@
-import type {ForwardedRef} from 'react';
+import type {ForwardedRef, KeyboardEvent} from 'react';
 import React, {forwardRef, useEffect, useImperativeHandle, useRef, useState} from 'react';
 import type {NativeSyntheticEvent, TextInputFocusEventData, TextInputKeyPressEventData} from 'react-native';
 import {StyleSheet, View} from 'react-native';
@@ -7,7 +7,6 @@ import useNetwork from '@hooks/useNetwork';
 import useStyleUtils from '@hooks/useStyleUtils';
 import useThemeStyles from '@hooks/useThemeStyles';
 import * as Browser from '@libs/Browser';
-import type {MaybePhraseKey} from '@libs/Localize';
 import * as ValidationUtils from '@libs/ValidationUtils';
 import CONST from '@src/CONST';
 import FormHelpMessage from './FormHelpMessage';
@@ -33,7 +32,7 @@ type MagicCodeInputProps = {
     shouldDelayFocus?: boolean;
 
     /** Error text to display */
-    errorText?: MaybePhraseKey;
+    errorText?: string;
 
     /** Specifies autocomplete hints for the system, so it can provide autofill */
     autoComplete: AutoCompleteVariant;
@@ -193,7 +192,7 @@ function MagicCodeInput(
         // We have not added:
         // + the editIndex as the dependency because we don't want to run this logic after focusing on an input to edit it after the user has completed the code.
         // + the onFulfill as the dependency because onFulfill is changed when the preferred locale changed => avoid auto submit form when preferred locale changed.
-        // eslint-disable-next-line react-hooks/exhaustive-deps
+        // eslint-disable-next-line react-compiler/react-compiler, react-hooks/exhaustive-deps
     }, [value, shouldSubmitOnComplete]);
 
     /**
@@ -299,7 +298,7 @@ function MagicCodeInput(
 
             // Fill the array with empty characters if there are no inputs.
             if (focusedIndex === 0 && !hasInputs) {
-                numbers = Array(maxLength).fill(CONST.MAGIC_CODE_EMPTY_CHAR);
+                numbers = Array<string>(maxLength).fill(CONST.MAGIC_CODE_EMPTY_CHAR);
 
                 // Deletes the value of the previous input and focuses on it.
             } else if (focusedIndex && focusedIndex !== 0) {
@@ -333,6 +332,15 @@ function MagicCodeInput(
             }
             setInput(TEXT_INPUT_EMPTY_STATE);
             onFulfill(value);
+        } else if (keyValue === 'Tab' && focusedIndex !== undefined) {
+            const newFocusedIndex = (event as unknown as KeyboardEvent).shiftKey ? focusedIndex - 1 : focusedIndex + 1;
+            if (newFocusedIndex >= 0 && newFocusedIndex < maxLength) {
+                setInputAndIndex(newFocusedIndex);
+                inputRefs.current?.focus();
+                if (event?.preventDefault) {
+                    event.preventDefault();
+                }
+            }
         }
     };
 
@@ -354,7 +362,7 @@ function MagicCodeInput(
 
         // We have not added:
         // + the onChangeText and onKeyPress as the dependencies because we only want to run this when lastPressedDigit changes.
-        // eslint-disable-next-line react-hooks/exhaustive-deps
+        // eslint-disable-next-line react-compiler/react-compiler, react-hooks/exhaustive-deps
     }, [lastPressedDigit, isDisableKeyboard]);
 
     return (
diff --git a/src/components/MapView/MapView.tsx b/src/components/MapView/MapView.tsx
index b1021350435c..0c472bac61a5 100644
--- a/src/components/MapView/MapView.tsx
+++ b/src/components/MapView/MapView.tsx
@@ -1,13 +1,18 @@
 import {useFocusEffect, useNavigation} from '@react-navigation/native';
 import type {MapState} from '@rnmapbox/maps';
 import Mapbox, {MarkerView, setAccessToken} from '@rnmapbox/maps';
-import {forwardRef, memo, useCallback, useEffect, useImperativeHandle, useRef, useState} from 'react';
+import {forwardRef, memo, useCallback, useEffect, useImperativeHandle, useMemo, useRef, useState} from 'react';
 import {View} from 'react-native';
 import {withOnyx} from 'react-native-onyx';
+import Button from '@components/Button';
+import * as Expensicons from '@components/Icon/Expensicons';
+import useTheme from '@hooks/useTheme';
 import useThemeStyles from '@hooks/useThemeStyles';
-import setUserLocation from '@libs/actions/UserLocation';
-import compose from '@libs/compose';
+import * as UserLocation from '@libs/actions/UserLocation';
 import getCurrentPosition from '@libs/getCurrentPosition';
+import type {GeolocationErrorCallback} from '@libs/getCurrentPosition/getCurrentPosition.types';
+import {GeolocationErrorCode} from '@libs/getCurrentPosition/getCurrentPosition.types';
+import colors from '@styles/theme/colors';
 import CONST from '@src/CONST';
 import useLocalize from '@src/hooks/useLocalize';
 import useNetwork from '@src/hooks/useNetwork';
@@ -20,17 +25,19 @@ import type {ComponentProps, MapViewOnyxProps} from './types';
 import utils from './utils';
 
 const MapView = forwardRef<MapViewHandle, ComponentProps>(
-    ({accessToken, style, mapPadding, userLocation: cachedUserLocation, styleURL, pitchEnabled, initialState, waypoints, directionCoordinates, onMapReady, interactive = true}, ref) => {
+    ({accessToken, style, mapPadding, userLocation, styleURL, pitchEnabled, initialState, waypoints, directionCoordinates, onMapReady, interactive = true}, ref) => {
         const navigation = useNavigation();
         const {isOffline} = useNetwork();
         const {translate} = useLocalize();
         const styles = useThemeStyles();
-
+        const theme = useTheme();
         const cameraRef = useRef<Mapbox.Camera>(null);
         const [isIdle, setIsIdle] = useState(false);
-        const [currentPosition, setCurrentPosition] = useState(cachedUserLocation);
+        const initialLocation = useMemo(() => initialState && {longitude: initialState.location[0], latitude: initialState.location[1]}, [initialState]);
+        const currentPosition = userLocation ?? initialLocation;
         const [userInteractedWithMap, setUserInteractedWithMap] = useState(false);
         const shouldInitializeCurrentPosition = useRef(true);
+        const [isAccessTokenSet, setIsAccessTokenSet] = useState(false);
 
         // Determines if map can be panned to user's detected
         // location without bothering the user. It will return
@@ -38,13 +45,15 @@ const MapView = forwardRef<MapViewHandle, ComponentProps>(
         // if there are one or more waypoints present.
         const shouldPanMapToCurrentPosition = useCallback(() => !userInteractedWithMap && (!waypoints || waypoints.length === 0), [userInteractedWithMap, waypoints]);
 
-        const setCurrentPositionToInitialState = useCallback(() => {
-            // eslint-disable-next-line @typescript-eslint/prefer-nullish-coalescing
-            if (cachedUserLocation || !initialState) {
-                return;
-            }
-            setCurrentPosition({longitude: initialState.location[0], latitude: initialState.location[1]});
-        }, [initialState, cachedUserLocation]);
+        const setCurrentPositionToInitialState: GeolocationErrorCallback = useCallback(
+            (error) => {
+                if (error?.code !== GeolocationErrorCode.PERMISSION_DENIED || !initialLocation) {
+                    return;
+                }
+                UserLocation.clearUserLocation();
+            },
+            [initialLocation],
+        );
 
         useFocusEffect(
             useCallback(() => {
@@ -65,8 +74,7 @@ const MapView = forwardRef<MapViewHandle, ComponentProps>(
 
                 getCurrentPosition((params) => {
                     const currentCoords = {longitude: params.coords.longitude, latitude: params.coords.latitude};
-                    setCurrentPosition(currentCoords);
-                    setUserLocation(currentCoords);
+                    UserLocation.setUserLocation(currentCoords);
                 }, setCurrentPositionToInitialState);
             }, [isOffline, shouldPanMapToCurrentPosition, setCurrentPositionToInitialState]),
         );
@@ -131,7 +139,12 @@ const MapView = forwardRef<MapViewHandle, ComponentProps>(
         }, [navigation]);
 
         useEffect(() => {
-            setAccessToken(accessToken);
+            setAccessToken(accessToken).then((token) => {
+                if (!token) {
+                    return;
+                }
+                setIsAccessTokenSet(true);
+            });
         }, [accessToken]);
 
         const setMapIdle = (e: MapState) => {
@@ -143,9 +156,56 @@ const MapView = forwardRef<MapViewHandle, ComponentProps>(
                 onMapReady();
             }
         };
+        const centerMap = useCallback(() => {
+            const waypointCoordinates = waypoints?.map((waypoint) => waypoint.coordinate) ?? [];
+            if (waypointCoordinates.length > 1 || (directionCoordinates ?? []).length > 1) {
+                const {southWest, northEast} = utils.getBounds(waypoints?.map((waypoint) => waypoint.coordinate) ?? [], directionCoordinates);
+                cameraRef.current?.fitBounds(southWest, northEast, mapPadding, CONST.MAPBOX.ANIMATION_DURATION_ON_CENTER_ME);
+                return;
+            }
+            cameraRef?.current?.setCamera({
+                heading: 0,
+                centerCoordinate: [currentPosition?.longitude ?? 0, currentPosition?.latitude ?? 0],
+                animationDuration: CONST.MAPBOX.ANIMATION_DURATION_ON_CENTER_ME,
+                zoomLevel: CONST.MAPBOX.SINGLE_MARKER_ZOOM,
+            });
+        }, [directionCoordinates, currentPosition, mapPadding, waypoints]);
+
+        const centerCoordinate = useMemo(() => (currentPosition ? [currentPosition.longitude, currentPosition.latitude] : initialState?.location), [currentPosition, initialState?.location]);
+
+        const waypointsBounds = useMemo(() => {
+            if (!waypoints) {
+                return undefined;
+            }
+            const {northEast, southWest} = utils.getBounds(
+                waypoints.map((waypoint) => waypoint.coordinate),
+                directionCoordinates,
+            );
+            return {ne: northEast, sw: southWest};
+        }, [waypoints, directionCoordinates]);
+
+        const defaultSettings: Mapbox.CameraStop | undefined = useMemo(() => {
+            if (interactive) {
+                if (!centerCoordinate) {
+                    return undefined;
+                }
+                return {
+                    zoomLevel: initialState?.zoom,
+                    centerCoordinate,
+                };
+            }
+            if (!waypointsBounds) {
+                return undefined;
+            }
+            return {
+                bounds: waypointsBounds,
+            };
+        }, [interactive, centerCoordinate, waypointsBounds, initialState?.zoom]);
 
-        const centerCoordinate = currentPosition ? [currentPosition.longitude, currentPosition.latitude] : initialState?.location;
-        return !isOffline && Boolean(accessToken) && Boolean(currentPosition) ? (
+        const initCenterCoordinate = useMemo(() => (interactive ? centerCoordinate : undefined), [interactive, centerCoordinate]);
+        const initBounds = useMemo(() => (interactive ? undefined : waypointsBounds), [interactive, waypointsBounds]);
+
+        return !isOffline && isAccessTokenSet && !!defaultSettings ? (
             <View style={[style, !interactive ? styles.pointerEventsNone : {}]}>
                 <Mapbox.MapView
                     style={{flex: 1}}
@@ -155,23 +215,55 @@ const MapView = forwardRef<MapViewHandle, ComponentProps>(
                     pitchEnabled={pitchEnabled}
                     attributionPosition={{...styles.r2, ...styles.b2}}
                     scaleBarEnabled={false}
+                    // We use scaleBarPosition with top: -32 to hide the scale bar on iOS because scaleBarEnabled={false} not work on iOS
+                    scaleBarPosition={{...styles.tn8, left: 0}}
+                    compassEnabled
+                    compassPosition={{...styles.l2, ...styles.t5}}
                     logoPosition={{...styles.l2, ...styles.b2}}
                     // eslint-disable-next-line react/jsx-props-no-spreading
                     {...responder.panHandlers}
                 >
                     <Mapbox.Camera
                         ref={cameraRef}
-                        defaultSettings={{
-                            centerCoordinate,
-                            zoomLevel: initialState?.zoom,
-                        }}
+                        defaultSettings={defaultSettings}
                         // Include centerCoordinate here as well to address the issue of incorrect coordinates
                         // displayed after the first render when the app's storage is cleared.
-                        centerCoordinate={centerCoordinate}
+                        centerCoordinate={initCenterCoordinate}
+                        bounds={initBounds}
                     />
+                    {interactive && (
+                        <Mapbox.ShapeSource
+                            id="user-location"
+                            shape={{
+                                type: 'FeatureCollection',
+                                features: [
+                                    {
+                                        type: 'Feature',
+                                        geometry: {
+                                            type: 'Point',
+                                            coordinates: [currentPosition?.longitude ?? 0, currentPosition?.latitude ?? 0],
+                                        },
+                                        properties: {},
+                                    },
+                                ],
+                            }}
+                        >
+                            <Mapbox.CircleLayer
+                                id="user-location-layer"
+                                sourceID="user-location"
+                                style={{
+                                    circleColor: colors.blue400,
+                                    circleRadius: 8,
+                                }}
+                            />
+                        </Mapbox.ShapeSource>
+                    )}
 
                     {waypoints?.map(({coordinate, markerComponent, id}) => {
                         const MarkerComponent = markerComponent;
+                        if (utils.areSameCoordinate([coordinate[0], coordinate[1]], [currentPosition?.longitude ?? 0, currentPosition?.latitude ?? 0]) && interactive) {
+                            return null;
+                        }
                         return (
                             <MarkerView
                                 id={id}
@@ -185,6 +277,17 @@ const MapView = forwardRef<MapViewHandle, ComponentProps>(
 
                     {directionCoordinates && <Direction coordinates={directionCoordinates} />}
                 </Mapbox.MapView>
+                {interactive && (
+                    <View style={[styles.pAbsolute, styles.p5, styles.t0, styles.r0, {zIndex: 1}]}>
+                        <Button
+                            onPress={centerMap}
+                            iconFill={theme.icon}
+                            medium
+                            icon={Expensicons.Crosshair}
+                            accessibilityLabel={translate('common.center')}
+                        />
+                    </View>
+                )}
             </View>
         ) : (
             <PendingMapView
@@ -196,11 +299,8 @@ const MapView = forwardRef<MapViewHandle, ComponentProps>(
     },
 );
 
-export default compose(
-    withOnyx<ComponentProps, MapViewOnyxProps>({
-        userLocation: {
-            key: ONYXKEYS.USER_LOCATION,
-        },
-    }),
-    memo,
-)(MapView);
+export default withOnyx<ComponentProps, MapViewOnyxProps>({
+    userLocation: {
+        key: ONYXKEYS.USER_LOCATION,
+    },
+})(memo(MapView));
diff --git a/src/components/MapView/MapView.website.tsx b/src/components/MapView/MapView.website.tsx
index e16289ee948d..618dd5b24cf5 100644
--- a/src/components/MapView/MapView.website.tsx
+++ b/src/components/MapView/MapView.website.tsx
@@ -5,15 +5,20 @@
 import {useFocusEffect} from '@react-navigation/native';
 import mapboxgl from 'mapbox-gl';
 import 'mapbox-gl/dist/mapbox-gl.css';
-import React, {forwardRef, useCallback, useEffect, useImperativeHandle, useRef, useState} from 'react';
-import type {MapRef} from 'react-map-gl';
+import React, {forwardRef, useCallback, useEffect, useImperativeHandle, useMemo, useRef, useState} from 'react';
+import type {MapRef, ViewState} from 'react-map-gl';
 import Map, {Marker} from 'react-map-gl';
 import {View} from 'react-native';
 import {withOnyx} from 'react-native-onyx';
+import Button from '@components/Button';
+import * as Expensicons from '@components/Icon/Expensicons';
+import usePrevious from '@hooks/usePrevious';
 import useStyleUtils from '@hooks/useStyleUtils';
 import useTheme from '@hooks/useTheme';
 import useThemeStyles from '@hooks/useThemeStyles';
-import setUserLocation from '@userActions/UserLocation';
+import type {GeolocationErrorCallback} from '@libs/getCurrentPosition/getCurrentPosition.types';
+import {GeolocationErrorCode} from '@libs/getCurrentPosition/getCurrentPosition.types';
+import * as UserLocation from '@userActions/UserLocation';
 import CONST from '@src/CONST';
 import useLocalize from '@src/hooks/useLocalize';
 import useNetwork from '@src/hooks/useNetwork';
@@ -35,7 +40,7 @@ const MapView = forwardRef<MapViewHandle, ComponentProps>(
             waypoints,
             mapPadding,
             accessToken,
-            userLocation: cachedUserLocation,
+            userLocation,
             directionCoordinates,
             initialState = {location: CONST.MAPBOX.DEFAULT_COORDINATE, zoom: CONST.MAPBOX.DEFAULT_ZOOM},
             interactive = true,
@@ -50,7 +55,9 @@ const MapView = forwardRef<MapViewHandle, ComponentProps>(
         const StyleUtils = useStyleUtils();
 
         const [mapRef, setMapRef] = useState<MapRef | null>(null);
-        const [currentPosition, setCurrentPosition] = useState(cachedUserLocation);
+        const initialLocation = useMemo(() => ({longitude: initialState.location[0], latitude: initialState.location[1]}), [initialState]);
+        const currentPosition = userLocation ?? initialLocation;
+        const prevUserPosition = usePrevious(currentPosition);
         const [userInteractedWithMap, setUserInteractedWithMap] = useState(false);
         const [shouldResetBoundaries, setShouldResetBoundaries] = useState<boolean>(false);
         const setRef = useCallback((newRef: MapRef | null) => setMapRef(newRef), []);
@@ -62,13 +69,15 @@ const MapView = forwardRef<MapViewHandle, ComponentProps>(
         // if there are one or more waypoints present.
         const shouldPanMapToCurrentPosition = useCallback(() => !userInteractedWithMap && (!waypoints || waypoints.length === 0), [userInteractedWithMap, waypoints]);
 
-        const setCurrentPositionToInitialState = useCallback(() => {
-            // eslint-disable-next-line @typescript-eslint/prefer-nullish-coalescing
-            if (cachedUserLocation || !initialState) {
-                return;
-            }
-            setCurrentPosition({longitude: initialState.location[0], latitude: initialState.location[1]});
-        }, [initialState, cachedUserLocation]);
+        const setCurrentPositionToInitialState: GeolocationErrorCallback = useCallback(
+            (error) => {
+                if (error?.code !== GeolocationErrorCode.PERMISSION_DENIED || !initialLocation) {
+                    return;
+                }
+                UserLocation.clearUserLocation();
+            },
+            [initialLocation],
+        );
 
         useFocusEffect(
             useCallback(() => {
@@ -89,8 +98,7 @@ const MapView = forwardRef<MapViewHandle, ComponentProps>(
 
                 getCurrentPosition((params) => {
                     const currentCoords = {longitude: params.coords.longitude, latitude: params.coords.latitude};
-                    setCurrentPosition(currentCoords);
-                    setUserLocation(currentCoords);
+                    UserLocation.setUserLocation(currentCoords);
                 }, setCurrentPositionToInitialState);
             }, [isOffline, shouldPanMapToCurrentPosition, setCurrentPositionToInitialState]),
         );
@@ -104,11 +112,15 @@ const MapView = forwardRef<MapViewHandle, ComponentProps>(
                 return;
             }
 
+            // Avoid animating the naviagtion to the same location
+            const shouldAnimate = prevUserPosition.longitude !== currentPosition.longitude || prevUserPosition.latitude !== currentPosition.latitude;
+
             mapRef.flyTo({
                 center: [currentPosition.longitude, currentPosition.latitude],
                 zoom: CONST.MAPBOX.DEFAULT_ZOOM,
+                animate: shouldAnimate,
             });
-        }, [currentPosition, userInteractedWithMap, mapRef, shouldPanMapToCurrentPosition]);
+        }, [currentPosition, mapRef, prevUserPosition, shouldPanMapToCurrentPosition]);
 
         const resetBoundaries = useCallback(() => {
             if (!waypoints || waypoints.length === 0) {
@@ -145,7 +157,7 @@ const MapView = forwardRef<MapViewHandle, ComponentProps>(
 
             resetBoundaries();
             setShouldResetBoundaries(false);
-            // eslint-disable-next-line react-hooks/exhaustive-deps -- this effect only needs to run when the boundaries reset is forced
+            // eslint-disable-next-line react-compiler/react-compiler, react-hooks/exhaustive-deps -- this effect only needs to run when the boundaries reset is forced
         }, [shouldResetBoundaries]);
 
         useEffect(() => {
@@ -178,7 +190,49 @@ const MapView = forwardRef<MapViewHandle, ComponentProps>(
             [mapRef],
         );
 
-        return !isOffline && Boolean(accessToken) && Boolean(currentPosition) ? (
+        const centerMap = useCallback(() => {
+            if (!mapRef) {
+                return;
+            }
+            const waypointCoordinates = waypoints?.map((waypoint) => waypoint.coordinate) ?? [];
+            if (waypointCoordinates.length > 1 || (directionCoordinates ?? []).length > 1) {
+                const {northEast, southWest} = utils.getBounds(waypoints?.map((waypoint) => waypoint.coordinate) ?? [], directionCoordinates);
+                const map = mapRef?.getMap();
+                map?.fitBounds([southWest, northEast], {padding: mapPadding, animate: true, duration: CONST.MAPBOX.ANIMATION_DURATION_ON_CENTER_ME});
+                return;
+            }
+
+            mapRef.flyTo({
+                center: [currentPosition?.longitude ?? 0, currentPosition?.latitude ?? 0],
+                zoom: CONST.MAPBOX.SINGLE_MARKER_ZOOM,
+                bearing: 0,
+                animate: true,
+                duration: CONST.MAPBOX.ANIMATION_DURATION_ON_CENTER_ME,
+            });
+        }, [directionCoordinates, currentPosition, mapRef, waypoints, mapPadding]);
+
+        const initialViewState: Partial<ViewState> | undefined = useMemo(() => {
+            if (!interactive) {
+                if (!waypoints) {
+                    return undefined;
+                }
+                const {northEast, southWest} = utils.getBounds(
+                    waypoints.map((waypoint) => waypoint.coordinate),
+                    directionCoordinates,
+                );
+                return {
+                    zoom: initialState.zoom,
+                    bounds: [northEast, southWest],
+                };
+            }
+            return {
+                longitude: currentPosition?.longitude,
+                latitude: currentPosition?.latitude,
+                zoom: initialState.zoom,
+            };
+        }, [waypoints, directionCoordinates, interactive, currentPosition, initialState.zoom]);
+
+        return !isOffline && !!accessToken && !!initialViewState ? (
             <View
                 style={style}
                 // eslint-disable-next-line react/jsx-props-no-spreading
@@ -189,17 +243,25 @@ const MapView = forwardRef<MapViewHandle, ComponentProps>(
                     ref={setRef}
                     mapLib={mapboxgl}
                     mapboxAccessToken={accessToken}
-                    initialViewState={{
-                        longitude: currentPosition?.longitude,
-                        latitude: currentPosition?.latitude,
-                        zoom: initialState.zoom,
-                    }}
+                    initialViewState={initialViewState}
                     style={StyleUtils.getTextColorStyle(theme.mapAttributionText)}
                     mapStyle={styleURL}
                     interactive={interactive}
                 >
+                    {interactive && (
+                        <Marker
+                            key="Current-position"
+                            longitude={currentPosition?.longitude ?? 0}
+                            latitude={currentPosition?.latitude ?? 0}
+                        >
+                            <View style={styles.currentPositionDot} />
+                        </Marker>
+                    )}
                     {waypoints?.map(({coordinate, markerComponent, id}) => {
                         const MarkerComponent = markerComponent;
+                        if (utils.areSameCoordinate([coordinate[0], coordinate[1]], [currentPosition?.longitude ?? 0, currentPosition?.latitude ?? 0]) && interactive) {
+                            return null;
+                        }
                         return (
                             <Marker
                                 key={id}
@@ -212,6 +274,17 @@ const MapView = forwardRef<MapViewHandle, ComponentProps>(
                     })}
                     {directionCoordinates && <Direction coordinates={directionCoordinates} />}
                 </Map>
+                {interactive && (
+                    <View style={[styles.pAbsolute, styles.p5, styles.t0, styles.r0, {zIndex: 1}]}>
+                        <Button
+                            onPress={centerMap}
+                            iconFill={theme.icon}
+                            medium
+                            icon={Expensicons.Crosshair}
+                            accessibilityLabel={translate('common.center')}
+                        />
+                    </View>
+                )}
             </View>
         ) : (
             <PendingMapView
diff --git a/src/components/MapView/MapViewTypes.ts b/src/components/MapView/MapViewTypes.ts
index 40934308b0e1..41170694c9d2 100644
--- a/src/components/MapView/MapViewTypes.ts
+++ b/src/components/MapView/MapViewTypes.ts
@@ -38,6 +38,9 @@ type PendingMapViewProps = {
 
     /** Style applied to PendingMapView */
     style?: StyleProp<ViewStyle>;
+
+    /** Whether the size of the route pending icon is smaller. */
+    isSmallerIcon?: boolean;
 };
 
 // Initial state of the map
diff --git a/src/components/MapView/PendingMapView.tsx b/src/components/MapView/PendingMapView.tsx
index 32bf42a14b10..cc9829517154 100644
--- a/src/components/MapView/PendingMapView.tsx
+++ b/src/components/MapView/PendingMapView.tsx
@@ -4,28 +4,34 @@ import {View} from 'react-native';
 import BlockingView from '@components/BlockingViews/BlockingView';
 import Icon from '@components/Icon';
 import * as Expensicons from '@components/Icon/Expensicons';
+import useTheme from '@hooks/useTheme';
 import useThemeStyles from '@hooks/useThemeStyles';
 import variables from '@styles/variables';
 import type {PendingMapViewProps} from './MapViewTypes';
 
-function PendingMapView({title = '', subtitle = '', style}: PendingMapViewProps) {
+function PendingMapView({title = '', subtitle = '', style, isSmallerIcon = false}: PendingMapViewProps) {
     const hasTextContent = !_.isEmpty(title) || !_.isEmpty(subtitle);
     const styles = useThemeStyles();
+    const theme = useTheme();
+    const iconSize = isSmallerIcon ? variables.iconSizeSuperLarge : variables.iconSizeUltraLarge;
     return (
         <View style={[styles.mapPendingView, style]}>
             {hasTextContent ? (
                 <BlockingView
                     icon={Expensicons.EmptyStateRoutePending}
+                    iconColor={theme.border}
                     title={title}
                     subtitle={subtitle}
+                    subtitleStyle={styles.textSupporting}
                     shouldShowLink={false}
                 />
             ) : (
                 <View style={[styles.flex1, styles.alignItemsCenter, styles.justifyContentCenter, styles.ph10]}>
                     <Icon
                         src={Expensicons.EmptyStateRoutePending}
-                        width={variables.iconSizeUltraLarge}
-                        height={variables.iconSizeUltraLarge}
+                        width={iconSize}
+                        height={iconSize}
+                        fill={theme.border}
                     />
                 </View>
             )}
diff --git a/src/components/MapView/responder/index.android.ts b/src/components/MapView/responder/index.android.ts
new file mode 100644
index 000000000000..9cbcde11ca7b
--- /dev/null
+++ b/src/components/MapView/responder/index.android.ts
@@ -0,0 +1,11 @@
+import {PanResponder} from 'react-native';
+
+const InterceptPanResponderCapture = PanResponder.create({
+    onStartShouldSetPanResponder: () => true,
+    onStartShouldSetPanResponderCapture: () => true,
+    onMoveShouldSetPanResponder: () => true,
+    onMoveShouldSetPanResponderCapture: () => true,
+    onPanResponderTerminationRequest: () => false,
+});
+
+export default InterceptPanResponderCapture;
diff --git a/src/components/MapView/utils.ts b/src/components/MapView/utils.ts
index b2c8fcad787b..04176d715281 100644
--- a/src/components/MapView/utils.ts
+++ b/src/components/MapView/utils.ts
@@ -12,6 +12,32 @@ function getBounds(waypoints: Array<[number, number]>, directionCoordinates: und
     };
 }
 
+/**
+ * Calculates the distance between two points on the Earth's surface given their latitude and longitude coordinates.
+ */
+function haversineDistance(coordinate1: number[], coordinate2: number[]) {
+    // Radius of the Earth in meters
+    const R = 6371e3;
+    const lat1 = (coordinate1[0] * Math.PI) / 180;
+    const lat2 = (coordinate2[0] * Math.PI) / 180;
+    const deltaLat = ((coordinate2[0] - coordinate1[0]) * Math.PI) / 180;
+    const deltaLon = ((coordinate2[1] - coordinate1[1]) * Math.PI) / 180;
+
+    // The square of half the chord length between the points
+    const halfChordLengthSq = Math.sin(deltaLat / 2) * Math.sin(deltaLat / 2) + Math.cos(lat1) * Math.cos(lat2) * Math.sin(deltaLon / 2) * Math.sin(deltaLon / 2);
+
+    // The angular distance in radians
+    const angularDistance = 2 * Math.atan2(Math.sqrt(halfChordLengthSq), Math.sqrt(1 - halfChordLengthSq));
+
+    // Distance in meters
+    return R * angularDistance;
+}
+
+function areSameCoordinate(coordinate1: number[], coordinate2: number[]) {
+    return haversineDistance(coordinate1, coordinate2) < 20;
+}
+
 export default {
     getBounds,
+    areSameCoordinate,
 };
diff --git a/src/components/MentionSuggestions.tsx b/src/components/MentionSuggestions.tsx
index b11ae4f5ecd8..bdc19316d491 100644
--- a/src/components/MentionSuggestions.tsx
+++ b/src/components/MentionSuggestions.tsx
@@ -1,5 +1,4 @@
 import React, {useCallback} from 'react';
-import type {MeasureInWindowOnSuccessCallback} from 'react-native';
 import {View} from 'react-native';
 import useStyleUtils from '@hooks/useStyleUtils';
 import useTheme from '@hooks/useTheme';
@@ -8,6 +7,7 @@ import getStyledTextArray from '@libs/GetStyledTextArray';
 import CONST from '@src/CONST';
 import type {Icon} from '@src/types/onyx/OnyxCommon';
 import AutoCompleteSuggestions from './AutoCompleteSuggestions';
+import type {MeasureParentContainerAndCursorCallback} from './AutoCompleteSuggestions/types';
 import Avatar from './Avatar';
 import Text from './Text';
 
@@ -53,8 +53,11 @@ type MentionSuggestionsProps = {
      * 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: boolean;
 
-    /** Measures the parent container's position and dimensions. */
-    measureParentContainer: (callback: MeasureInWindowOnSuccessCallback) => void;
+    /** Measures the parent container's position and dimensions. Also add cursor coordinates */
+    measureParentContainerAndReportCursor: (callback: MeasureParentContainerAndCursorCallback) => void;
+
+    /** Reset the emoji suggestions */
+    resetSuggestions: () => void;
 };
 
 /**
@@ -62,7 +65,15 @@ type MentionSuggestionsProps = {
  */
 const keyExtractor = (item: Mention) => item.alternateText;
 
-function MentionSuggestions({prefix, mentions, highlightedMentionIndex = 0, onSelect, isMentionPickerLarge, measureParentContainer = () => {}}: MentionSuggestionsProps) {
+function MentionSuggestions({
+    prefix,
+    mentions,
+    highlightedMentionIndex = 0,
+    onSelect,
+    isMentionPickerLarge,
+    measureParentContainerAndReportCursor = () => {},
+    resetSuggestions,
+}: MentionSuggestionsProps) {
     const theme = useTheme();
     const styles = useThemeStyles();
     const StyleUtils = useStyleUtils();
@@ -83,7 +94,7 @@ function MentionSuggestions({prefix, mentions, highlightedMentionIndex = 0, onSe
                                 source={item.icons[0].source}
                                 size={isIcon ? CONST.AVATAR_SIZE.MENTION_ICON : CONST.AVATAR_SIZE.SMALLER}
                                 name={item.icons[0].name}
-                                accountID={item.icons[0].id}
+                                avatarID={item.icons[0].id}
                                 type={item.icons[0].type}
                                 fill={isIcon ? theme.success : undefined}
                                 fallbackIcon={item.icons[0].fallbackIcon}
@@ -110,7 +121,7 @@ function MentionSuggestions({prefix, mentions, highlightedMentionIndex = 0, onSe
                     >
                         {styledHandle?.map(
                             ({text, isColored}, i) =>
-                                Boolean(text) && (
+                                !!text && (
                                     <Text
                                         // eslint-disable-next-line react/no-array-index-key
                                         key={`${text}${i}`}
@@ -148,7 +159,8 @@ function MentionSuggestions({prefix, mentions, highlightedMentionIndex = 0, onSe
             onSelect={onSelect}
             isSuggestionPickerLarge={isMentionPickerLarge}
             accessibilityLabelExtractor={keyExtractor}
-            measureParentContainer={measureParentContainer}
+            measureParentContainerAndReportCursor={measureParentContainerAndReportCursor}
+            resetSuggestions={resetSuggestions}
         />
     );
 }
diff --git a/src/components/MenuItem.tsx b/src/components/MenuItem.tsx
index bf35d65340fc..2c830e8515db 100644
--- a/src/components/MenuItem.tsx
+++ b/src/components/MenuItem.tsx
@@ -1,25 +1,25 @@
-import ExpensiMark from 'expensify-common/lib/ExpensiMark';
 import type {ImageContentFit} from 'expo-image';
-import type {ReactNode} from 'react';
+import type {ReactElement, ReactNode} from 'react';
 import React, {forwardRef, useContext, useMemo} from 'react';
 import type {GestureResponderEvent, StyleProp, TextStyle, ViewStyle} from 'react-native';
-import {View} from 'react-native';
+import {ActivityIndicator, View} from 'react-native';
 import type {AnimatedStyle} from 'react-native-reanimated';
 import type {ValueOf} from 'type-fest';
+import useResponsiveLayout from '@hooks/useResponsiveLayout';
 import useStyleUtils from '@hooks/useStyleUtils';
 import useTheme from '@hooks/useTheme';
 import useThemeStyles from '@hooks/useThemeStyles';
-import useWindowDimensions from '@hooks/useWindowDimensions';
 import ControlSelection from '@libs/ControlSelection';
 import convertToLTR from '@libs/convertToLTR';
 import * as DeviceCapabilities from '@libs/DeviceCapabilities';
 import getButtonState from '@libs/getButtonState';
-import type {MaybePhraseKey} from '@libs/Localize';
+import Parser from '@libs/Parser';
 import type {AvatarSource} from '@libs/UserUtils';
 import variables from '@styles/variables';
 import * as Session from '@userActions/Session';
 import CONST from '@src/CONST';
 import type {Icon as IconType} from '@src/types/onyx/OnyxCommon';
+import type {TooltipAnchorAlignment} from '@src/types/utils/AnchorAlignment';
 import type IconAsset from '@src/types/utils/IconAsset';
 import Avatar from './Avatar';
 import Badge from './Badge';
@@ -38,6 +38,7 @@ import RenderHTML from './RenderHTML';
 import SelectCircle from './SelectCircle';
 import SubscriptAvatar from './SubscriptAvatar';
 import Text from './Text';
+import EducationalTooltip from './Tooltip/EducationalTooltip';
 
 type IconProps = {
     /** Flag to choose between avatar image or an icon */
@@ -105,6 +106,9 @@ type MenuItemBaseProps = {
     /** The fill color to pass into the secondary icon. */
     secondaryIconFill?: string;
 
+    /** Whether the secondary icon should have hover style */
+    isSecondaryIconHoverable?: boolean;
+
     /** Icon Width */
     iconWidth?: number;
 
@@ -141,14 +145,26 @@ type MenuItemBaseProps = {
     /** A description text to show under the title */
     description?: string;
 
+    /** Text to show below menu item. This text is not interactive */
+    helperText?: string;
+
+    /** Any additional styles to pass to helper text. */
+    helperTextStyle?: StyleProp<TextStyle>;
+
     /** Should the description be shown above the title (instead of the other way around) */
     shouldShowDescriptionOnTop?: boolean;
 
-    /** Error to display below the title */
-    error?: string;
-
     /** Error to display at the bottom of the component */
-    errorText?: MaybePhraseKey;
+    errorText?: string;
+
+    /** Any additional styles to pass to error text. */
+    errorTextStyle?: StyleProp<ViewStyle>;
+
+    /** Hint to display at the bottom of the component */
+    hintText?: string | ReactNode;
+
+    /** Should the error text red dot indicator be shown */
+    shouldShowRedDotIndicator?: boolean;
 
     /** A boolean flag that gives the icon a green fill if true */
     success?: boolean;
@@ -162,6 +178,9 @@ type MenuItemBaseProps = {
     /** Text that appears above the title */
     label?: string;
 
+    /** Character limit after which the menu item text will be truncated */
+    characterLimit?: number;
+
     isLabelHoverable?: boolean;
 
     /** Label to be displayed on the right */
@@ -170,6 +189,12 @@ type MenuItemBaseProps = {
     /** Text to display for the item */
     title?: string;
 
+    /** Component to display as the title */
+    titleComponent?: ReactElement;
+
+    /** Any additional styles to apply to the container for title components */
+    titleContainerStyle?: StyleProp<ViewStyle>;
+
     /** A right-aligned subtitle for this menu option */
     subtitle?: string | number;
 
@@ -179,6 +204,9 @@ type MenuItemBaseProps = {
     /** Should we make this selectable with a checkbox */
     shouldShowSelectedState?: boolean;
 
+    /** Should we truncate the title */
+    shouldTruncateTitle?: boolean;
+
     /** Whether this item is selected */
     isSelected?: boolean;
 
@@ -186,7 +214,7 @@ type MenuItemBaseProps = {
     shouldStackHorizontally?: boolean;
 
     /** Prop to represent the size of the avatar images to be shown */
-    avatarSize?: (typeof CONST.AVATAR_SIZE)[keyof typeof CONST.AVATAR_SIZE];
+    avatarSize?: ValueOf<typeof CONST.AVATAR_SIZE>;
 
     /** Avatars to show on the right of the menu item */
     floatRightAvatars?: IconType[];
@@ -221,6 +249,9 @@ type MenuItemBaseProps = {
     /** Should we grey out the menu item when it is disabled? */
     shouldGreyOutWhenDisabled?: boolean;
 
+    /** Should we remove the background color of the menu item */
+    shouldRemoveBackground?: boolean;
+
     /** Should we use default cursor for disabled content */
     shouldUseDefaultCursorWhenDisabled?: boolean;
 
@@ -233,12 +264,24 @@ type MenuItemBaseProps = {
     /** Whether should render title as HTML or as Text */
     shouldParseTitle?: boolean;
 
+    /** Whether should render helper text as HTML or as Text */
+    shouldParseHelperText?: boolean;
+
+    /** Whether should render hint text as HTML or as Text */
+    shouldRenderHintAsHTML?: boolean;
+
+    /** Whether should render error text as HTML or as Text */
+    shouldRenderErrorAsHTML?: boolean;
+
     /** Should check anonymous user in onPress function */
     shouldCheckActionAllowedOnPress?: boolean;
 
     /** Text to display under the main item */
     furtherDetails?: string;
 
+    /** Render custom content under the main item */
+    furtherDetailsComponent?: ReactElement;
+
     /** The function that should be called when this component is LongPressed or right-clicked. */
     onSecondaryInteraction?: (event: GestureResponderEvent | MouseEvent) => void;
 
@@ -259,10 +302,35 @@ type MenuItemBaseProps = {
 
     /** Handles what to do when the item is focused */
     onFocus?: () => void;
+
+    /** Handles what to do when the item loose focus */
+    onBlur?: () => void;
+
+    /** Optional account id if it's user avatar or policy id if it's workspace avatar */
+    avatarID?: number | string;
+
+    /** Whether to show the tooltip */
+    shouldRenderTooltip?: boolean;
+
+    /** Anchor alignment of the tooltip */
+    tooltipAnchorAlignment?: TooltipAnchorAlignment;
+
+    /** Additional styles for tooltip wrapper */
+    tooltipWrapperStyle?: StyleProp<ViewStyle>;
+
+    /** Any additional amount to manually adjust the horizontal position of the tooltip */
+    tooltipShiftHorizontal?: number;
+
+    /** Any additional amount to manually adjust the vertical position of the tooltip */
+    tooltipShiftVertical?: number;
+
+    /** Render custom content inside the tooltip. */
+    renderTooltipContent?: () => ReactNode;
+
+    shouldShowLoadingSpinnerIcon?: boolean;
 };
 
 type MenuItemProps = (IconProps | AvatarProps | NoIcon) & MenuItemBaseProps;
-
 function MenuItem(
     {
         interactive = true,
@@ -285,6 +353,7 @@ function MenuItem(
         secondaryIcon,
         secondaryIconFill,
         iconType = CONST.ICON_TYPE_ICON,
+        isSecondaryIconHoverable = false,
         iconWidth,
         iconHeight,
         iconStyles,
@@ -295,16 +364,25 @@ function MenuItem(
         iconRight = Expensicons.ArrowRight,
         furtherDetailsIcon,
         furtherDetails,
+        furtherDetailsComponent,
         description,
-        error,
+        helperText,
+        helperTextStyle,
         errorText,
+        errorTextStyle,
+        shouldShowRedDotIndicator,
+        hintText,
         success = false,
         focused = false,
         disabled = false,
         title,
+        titleComponent,
+        titleContainerStyle,
         subtitle,
         shouldShowBasicTitle,
         label,
+        shouldTruncateTitle = false,
+        characterLimit = 200,
         isLabelHoverable = true,
         rightLabel,
         shouldShowSelectedState = false,
@@ -322,10 +400,15 @@ function MenuItem(
         shouldRenderAsHTML = false,
         shouldEscapeText = undefined,
         shouldGreyOutWhenDisabled = true,
+        shouldRemoveBackground = false,
         shouldUseDefaultCursorWhenDisabled = false,
+        shouldShowLoadingSpinnerIcon = false,
         isAnonymousAction = false,
         shouldBlockSelection = false,
         shouldParseTitle = false,
+        shouldParseHelperText = false,
+        shouldRenderHintAsHTML = false,
+        shouldRenderErrorAsHTML = false,
         shouldCheckActionAllowedOnPress = true,
         onSecondaryInteraction,
         titleWithTooltips,
@@ -334,14 +417,22 @@ function MenuItem(
         isPaneMenu = false,
         shouldPutLeftPaddingWhenNoIcon = false,
         onFocus,
+        onBlur,
+        avatarID,
+        shouldRenderTooltip = false,
+        tooltipAnchorAlignment,
+        tooltipWrapperStyle = {},
+        tooltipShiftHorizontal = 0,
+        tooltipShiftVertical = 0,
+        renderTooltipContent,
     }: MenuItemProps,
     ref: PressableRef,
 ) {
     const theme = useTheme();
     const styles = useThemeStyles();
     const StyleUtils = useStyleUtils();
-    const combinedStyle = [style, styles.popoverMenuItem];
-    const {isSmallScreenWidth} = useWindowDimensions();
+    const combinedStyle = [styles.popoverMenuItem, style];
+    const {shouldUseNarrowLayout} = useResponsiveLayout();
     const {isExecuting, singleExecution, waitForNavigate} = useContext(MenuItemGroupContext) ?? {};
 
     const isDeleted = style && Array.isArray(style) ? style.includes(styles.offlineFeedback.deleted) : false;
@@ -373,10 +464,16 @@ function MenuItem(
         if (!title || !shouldParseTitle) {
             return '';
         }
-        const parser = new ExpensiMark();
-        return parser.replace(title, {shouldEscapeText});
+        return Parser.replace(title, {shouldEscapeText});
     }, [title, shouldParseTitle, shouldEscapeText]);
 
+    const helperHtml = useMemo(() => {
+        if (!helperText || !shouldParseHelperText) {
+            return '';
+        }
+        return Parser.replace(helperText, {shouldEscapeText});
+    }, [helperText, shouldParseHelperText, shouldEscapeText]);
+
     const processedTitle = useMemo(() => {
         let titleToWrap = '';
         if (shouldRenderAsHTML) {
@@ -387,8 +484,23 @@ function MenuItem(
             titleToWrap = html;
         }
 
+        if (shouldTruncateTitle) {
+            titleToWrap = Parser.truncateHTML(`<comment>${titleToWrap}</comment>`, characterLimit, {ellipsis: '...'});
+            return titleToWrap;
+        }
+
         return titleToWrap ? `<comment>${titleToWrap}</comment>` : '';
-    }, [title, shouldRenderAsHTML, shouldParseTitle, html]);
+    }, [title, shouldRenderAsHTML, shouldParseTitle, characterLimit, shouldTruncateTitle, html]);
+
+    const processedHelperText = useMemo(() => {
+        let textToWrap = '';
+
+        if (shouldParseHelperText) {
+            textToWrap = helperHtml;
+        }
+
+        return textToWrap ? `<comment><muted-text-label>${textToWrap}</muted-text-label></comment>` : '';
+    }, [shouldParseHelperText, helperHtml]);
 
     const hasPressableRightComponent = iconRight || (shouldShowRightComponent && rightComponent);
 
@@ -430,255 +542,313 @@ function MenuItem(
     };
 
     return (
-        <View>
+        <View onBlur={onBlur}>
             {!!label && !isLabelHoverable && (
                 <View style={[styles.ph5, labelStyle]}>
                     <Text style={StyleUtils.combineStyles([styles.sidebarLinkText, styles.optionAlternateText, styles.textLabelSupporting, styles.pre])}>{label}</Text>
                 </View>
             )}
-            <Hoverable>
-                {(isHovered) => (
-                    <PressableWithSecondaryInteraction
-                        onPress={shouldCheckActionAllowedOnPress ? Session.checkIfActionIsAllowed(onPressAction, isAnonymousAction) : onPressAction}
-                        onPressIn={() => shouldBlockSelection && isSmallScreenWidth && DeviceCapabilities.canUseTouchScreen() && ControlSelection.block()}
-                        onPressOut={ControlSelection.unblock}
-                        onSecondaryInteraction={onSecondaryInteraction}
-                        wrapperStyle={outerWrapperStyle}
-                        style={({pressed}) =>
-                            [
-                                containerStyle,
-                                errorText ? styles.pb5 : {},
-                                combinedStyle,
-                                !interactive && styles.cursorDefault,
-                                StyleUtils.getButtonBackgroundColorStyle(getButtonState(focused || isHovered, pressed, success, disabled, interactive), true),
-                                ...(Array.isArray(wrapperStyle) ? wrapperStyle : [wrapperStyle]),
-                                !focused && (isHovered || pressed) && hoverAndPressStyle,
-                                shouldGreyOutWhenDisabled && disabled && styles.buttonOpacityDisabled,
-                            ] as StyleProp<ViewStyle>
-                        }
-                        disabledStyle={shouldUseDefaultCursorWhenDisabled && [styles.cursorDefault]}
-                        disabled={disabled || isExecuting}
-                        ref={ref}
-                        role={CONST.ROLE.MENUITEM}
-                        accessibilityLabel={title ? title.toString() : ''}
-                        accessible
-                        onFocus={onFocus}
-                    >
-                        {({pressed}) => (
-                            <>
-                                <View style={[styles.flexColumn, styles.flex1]}>
-                                    {!!label && isLabelHoverable && (
-                                        <View style={[icon ? styles.mb2 : null, labelStyle]}>
-                                            <Text style={StyleUtils.combineStyles([styles.sidebarLinkText, styles.optionAlternateText, styles.textLabelSupporting, styles.pre])}>
-                                                {label}
-                                            </Text>
-                                        </View>
-                                    )}
-                                    <View style={[styles.flexRow, styles.pointerEventsAuto, disabled && !shouldUseDefaultCursorWhenDisabled && styles.cursorDisabled]}>
-                                        {!!icon && Array.isArray(icon) && (
-                                            <MultipleAvatars
-                                                isHovered={isHovered}
-                                                isPressed={pressed}
-                                                icons={icon as IconType[]}
-                                                size={avatarSize}
-                                                secondAvatarStyle={[
-                                                    StyleUtils.getBackgroundAndBorderStyle(theme.sidebar),
-                                                    pressed && interactive ? StyleUtils.getBackgroundAndBorderStyle(theme.buttonPressedBG) : undefined,
-                                                    isHovered && !pressed && interactive ? StyleUtils.getBackgroundAndBorderStyle(theme.border) : undefined,
-                                                ]}
-                                            />
-                                        )}
-                                        {!icon && shouldPutLeftPaddingWhenNoIcon && <View style={[styles.popoverMenuIcon, iconStyles, StyleUtils.getAvatarWidthStyle(avatarSize)]} />}
-                                        {icon && !Array.isArray(icon) && (
-                                            <View style={[styles.popoverMenuIcon, iconStyles, StyleUtils.getAvatarWidthStyle(avatarSize)]}>
-                                                {typeof icon !== 'string' && iconType === CONST.ICON_TYPE_ICON && (
-                                                    <Icon
-                                                        contentFit={contentFit}
-                                                        hovered={isHovered}
-                                                        pressed={pressed}
-                                                        src={icon}
-                                                        width={iconWidth}
-                                                        height={iconHeight}
-                                                        fill={
-                                                            displayInDefaultIconColor
-                                                                ? undefined
-                                                                : iconFill ??
-                                                                  StyleUtils.getIconFillColor(getButtonState(focused || isHovered, pressed, success, disabled, interactive), true, isPaneMenu)
-                                                        }
-                                                    />
-                                                )}
-                                                {icon && iconType === CONST.ICON_TYPE_WORKSPACE && (
-                                                    <Avatar
-                                                        imageStyles={[styles.alignSelfCenter]}
-                                                        size={CONST.AVATAR_SIZE.DEFAULT}
-                                                        source={icon as AvatarSource}
-                                                        fallbackIcon={fallbackIcon}
-                                                        name={title}
-                                                        type={CONST.ICON_TYPE_WORKSPACE}
-                                                    />
+            <EducationalTooltip
+                shouldRender={shouldRenderTooltip}
+                anchorAlignment={tooltipAnchorAlignment}
+                renderTooltipContent={renderTooltipContent}
+                wrapperStyle={tooltipWrapperStyle}
+                shiftHorizontal={tooltipShiftHorizontal}
+                shiftVertical={tooltipShiftVertical}
+                shouldAutoDismiss
+            >
+                <View>
+                    <Hoverable>
+                        {(isHovered) => (
+                            <PressableWithSecondaryInteraction
+                                onPress={shouldCheckActionAllowedOnPress ? Session.checkIfActionIsAllowed(onPressAction, isAnonymousAction) : onPressAction}
+                                onPressIn={() => shouldBlockSelection && shouldUseNarrowLayout && DeviceCapabilities.canUseTouchScreen() && ControlSelection.block()}
+                                onPressOut={ControlSelection.unblock}
+                                onSecondaryInteraction={onSecondaryInteraction}
+                                wrapperStyle={outerWrapperStyle}
+                                style={({pressed}) =>
+                                    [
+                                        containerStyle,
+                                        combinedStyle,
+                                        !interactive && styles.cursorDefault,
+                                        !shouldRemoveBackground &&
+                                            StyleUtils.getButtonBackgroundColorStyle(getButtonState(focused || isHovered, pressed, success, disabled, interactive), true),
+                                        ...(Array.isArray(wrapperStyle) ? wrapperStyle : [wrapperStyle]),
+                                        !focused && (isHovered || pressed) && hoverAndPressStyle,
+                                        shouldGreyOutWhenDisabled && disabled && styles.buttonOpacityDisabled,
+                                        isHovered && interactive && !focused && !pressed && !shouldRemoveBackground && styles.hoveredComponentBG,
+                                    ] as StyleProp<ViewStyle>
+                                }
+                                disabledStyle={shouldUseDefaultCursorWhenDisabled && [styles.cursorDefault]}
+                                disabled={disabled || isExecuting}
+                                ref={ref}
+                                role={CONST.ROLE.MENUITEM}
+                                accessibilityLabel={title ? title.toString() : ''}
+                                accessible
+                                onFocus={onFocus}
+                            >
+                                {({pressed}) => (
+                                    <View style={[styles.flex1]}>
+                                        <View style={[styles.flexRow]}>
+                                            <View style={[styles.flexColumn, styles.flex1]}>
+                                                {!!label && isLabelHoverable && (
+                                                    <View style={[icon ? styles.mb2 : null, labelStyle]}>
+                                                        <Text style={StyleUtils.combineStyles([styles.sidebarLinkText, styles.optionAlternateText, styles.textLabelSupporting, styles.pre])}>
+                                                            {label}
+                                                        </Text>
+                                                    </View>
                                                 )}
-                                                {iconType === CONST.ICON_TYPE_AVATAR && (
-                                                    <Avatar
-                                                        imageStyles={[styles.alignSelfCenter]}
-                                                        source={icon as AvatarSource}
-                                                        fallbackIcon={fallbackIcon}
-                                                        size={avatarSize}
+                                                <View style={[styles.flexRow, styles.pointerEventsAuto, disabled && !shouldUseDefaultCursorWhenDisabled && styles.cursorDisabled]}>
+                                                    {!!icon && Array.isArray(icon) && (
+                                                        <MultipleAvatars
+                                                            isHovered={isHovered}
+                                                            isPressed={pressed}
+                                                            icons={icon as IconType[]}
+                                                            size={avatarSize}
+                                                            secondAvatarStyle={[
+                                                                StyleUtils.getBackgroundAndBorderStyle(theme.sidebar),
+                                                                pressed && interactive ? StyleUtils.getBackgroundAndBorderStyle(theme.buttonPressedBG) : undefined,
+                                                                isHovered && !pressed && interactive ? StyleUtils.getBackgroundAndBorderStyle(theme.border) : undefined,
+                                                            ]}
+                                                        />
+                                                    )}
+                                                    {!icon && shouldPutLeftPaddingWhenNoIcon && (
+                                                        <View style={[styles.popoverMenuIcon, iconStyles, StyleUtils.getAvatarWidthStyle(avatarSize)]} />
+                                                    )}
+                                                    {icon && !Array.isArray(icon) && (
+                                                        <View style={[styles.popoverMenuIcon, iconStyles, StyleUtils.getAvatarWidthStyle(avatarSize)]}>
+                                                            {typeof icon !== 'string' &&
+                                                                iconType === CONST.ICON_TYPE_ICON &&
+                                                                (!shouldShowLoadingSpinnerIcon ? (
+                                                                    <Icon
+                                                                        contentFit={contentFit}
+                                                                        hovered={isHovered}
+                                                                        pressed={pressed}
+                                                                        src={icon}
+                                                                        width={iconWidth}
+                                                                        height={iconHeight}
+                                                                        fill={
+                                                                            displayInDefaultIconColor
+                                                                                ? undefined
+                                                                                : iconFill ??
+                                                                                  StyleUtils.getIconFillColor(
+                                                                                      getButtonState(focused || isHovered, pressed, success, disabled, interactive),
+                                                                                      true,
+                                                                                      isPaneMenu,
+                                                                                  )
+                                                                        }
+                                                                    />
+                                                                ) : (
+                                                                    <ActivityIndicator
+                                                                        size="small"
+                                                                        color={theme.textSupporting}
+                                                                    />
+                                                                ))}
+                                                            {icon && iconType === CONST.ICON_TYPE_WORKSPACE && (
+                                                                <Avatar
+                                                                    imageStyles={[styles.alignSelfCenter]}
+                                                                    size={CONST.AVATAR_SIZE.DEFAULT}
+                                                                    source={icon}
+                                                                    fallbackIcon={fallbackIcon}
+                                                                    name={title}
+                                                                    avatarID={avatarID}
+                                                                    type={CONST.ICON_TYPE_WORKSPACE}
+                                                                />
+                                                            )}
+                                                            {iconType === CONST.ICON_TYPE_AVATAR && (
+                                                                <Avatar
+                                                                    imageStyles={[styles.alignSelfCenter]}
+                                                                    source={icon}
+                                                                    avatarID={avatarID}
+                                                                    fallbackIcon={fallbackIcon}
+                                                                    size={avatarSize}
+                                                                    type={CONST.ICON_TYPE_AVATAR}
+                                                                />
+                                                            )}
+                                                        </View>
+                                                    )}
+                                                    {secondaryIcon && (
+                                                        <View style={[styles.popoverMenuIcon, iconStyles, isSecondaryIconHoverable && StyleUtils.getBackgroundAndBorderStyle(theme.border)]}>
+                                                            <Icon
+                                                                contentFit={contentFit}
+                                                                src={secondaryIcon}
+                                                                width={iconWidth}
+                                                                height={iconHeight}
+                                                                fill={
+                                                                    secondaryIconFill ??
+                                                                    StyleUtils.getIconFillColor(getButtonState(focused || isHovered, pressed, success, disabled, interactive), true)
+                                                                }
+                                                            />
+                                                        </View>
+                                                    )}
+                                                    <View
+                                                        style={[
+                                                            styles.justifyContentCenter,
+                                                            styles.flex1,
+                                                            StyleUtils.getMenuItemTextContainerStyle(isSmallAvatarSubscriptMenu),
+                                                            titleContainerStyle,
+                                                        ]}
+                                                    >
+                                                        {!!description && shouldShowDescriptionOnTop && (
+                                                            <Text
+                                                                style={descriptionTextStyles}
+                                                                numberOfLines={numberOfLinesDescription}
+                                                            >
+                                                                {description}
+                                                            </Text>
+                                                        )}
+                                                        {(!!title || !!shouldShowTitleIcon) && (
+                                                            <View style={[styles.flexRow, styles.alignItemsCenter, styles.mw100]}>
+                                                                {!!title && (shouldRenderAsHTML || (shouldParseTitle && !!html.length)) && (
+                                                                    <View style={styles.renderHTMLTitle}>
+                                                                        <RenderHTML html={processedTitle} />
+                                                                    </View>
+                                                                )}
+                                                                {!shouldRenderAsHTML && !shouldParseTitle && !!title && (
+                                                                    <Text
+                                                                        style={combinedTitleTextStyle}
+                                                                        numberOfLines={numberOfLinesTitle || undefined}
+                                                                        dataSet={{[CONST.SELECTION_SCRAPER_HIDDEN_ELEMENT]: interactive && disabled}}
+                                                                    >
+                                                                        {renderTitleContent()}
+                                                                    </Text>
+                                                                )}
+                                                                {shouldShowTitleIcon && titleIcon && (
+                                                                    <View style={[styles.ml2]}>
+                                                                        <Icon
+                                                                            src={titleIcon}
+                                                                            fill={theme.iconSuccessFill}
+                                                                        />
+                                                                    </View>
+                                                                )}
+                                                            </View>
+                                                        )}
+                                                        {!!description && !shouldShowDescriptionOnTop && (
+                                                            <Text
+                                                                style={descriptionTextStyles}
+                                                                numberOfLines={numberOfLinesDescription}
+                                                            >
+                                                                {description}
+                                                            </Text>
+                                                        )}
+                                                        {!!furtherDetails && (
+                                                            <View style={[styles.flexRow, styles.mt1, styles.alignItemsCenter]}>
+                                                                {!!furtherDetailsIcon && (
+                                                                    <Icon
+                                                                        src={furtherDetailsIcon}
+                                                                        height={variables.iconSizeNormal}
+                                                                        width={variables.iconSizeNormal}
+                                                                        inline
+                                                                    />
+                                                                )}
+                                                                <Text
+                                                                    style={furtherDetailsIcon ? [styles.furtherDetailsText, styles.ph2, styles.pt1] : styles.textLabelSupporting}
+                                                                    numberOfLines={2}
+                                                                >
+                                                                    {furtherDetails}
+                                                                </Text>
+                                                            </View>
+                                                        )}
+                                                        {!!furtherDetailsComponent && <View style={[styles.flexRow, styles.alignItemsCenter]}>{furtherDetailsComponent}</View>}
+                                                        {titleComponent}
+                                                    </View>
+                                                </View>
+                                            </View>
+                                            <View style={[styles.flexRow, styles.menuItemTextContainer, !hasPressableRightComponent && styles.pointerEventsNone]}>
+                                                {badgeText && (
+                                                    <Badge
+                                                        text={badgeText}
+                                                        badgeStyles={badgeStyle}
                                                     />
                                                 )}
-                                            </View>
-                                        )}
-                                        {secondaryIcon && (
-                                            <View style={[styles.popoverMenuIcon, iconStyles]}>
-                                                <Icon
-                                                    contentFit={contentFit}
-                                                    src={secondaryIcon}
-                                                    width={iconWidth}
-                                                    height={iconHeight}
-                                                    fill={
-                                                        secondaryIconFill ?? StyleUtils.getIconFillColor(getButtonState(focused || isHovered, pressed, success, disabled, interactive), true)
-                                                    }
-                                                />
-                                            </View>
-                                        )}
-                                        <View style={[styles.justifyContentCenter, styles.flex1, StyleUtils.getMenuItemTextContainerStyle(isSmallAvatarSubscriptMenu)]}>
-                                            {!!description && shouldShowDescriptionOnTop && (
-                                                <Text
-                                                    style={descriptionTextStyles}
-                                                    numberOfLines={numberOfLinesDescription}
-                                                >
-                                                    {description}
-                                                </Text>
-                                            )}
-                                            <View style={[styles.flexRow, styles.alignItemsCenter]}>
-                                                {!!title && (shouldRenderAsHTML || (shouldParseTitle && !!html.length)) && (
-                                                    <View style={styles.renderHTMLTitle}>
-                                                        <RenderHTML html={processedTitle} />
+                                                {/* Since subtitle can be of type number, we should allow 0 to be shown */}
+                                                {(subtitle === 0 || subtitle) && (
+                                                    <View style={[styles.justifyContentCenter, styles.mr1]}>
+                                                        <Text style={[styles.textLabelSupporting, ...(combinedStyle as TextStyle[])]}>{subtitle}</Text>
                                                     </View>
                                                 )}
-                                                {!shouldRenderAsHTML && !shouldParseTitle && !!title && (
-                                                    <Text
-                                                        style={combinedTitleTextStyle}
-                                                        numberOfLines={numberOfLinesTitle || undefined}
-                                                        dataSet={{[CONST.SELECTION_SCRAPER_HIDDEN_ELEMENT]: interactive && disabled}}
-                                                    >
-                                                        {renderTitleContent()}
-                                                    </Text>
+                                                {floatRightAvatars?.length > 0 && (
+                                                    <View style={[styles.alignItemsCenter, styles.justifyContentCenter, brickRoadIndicator ? styles.mr2 : styles.mrn2]}>
+                                                        {shouldShowSubscriptRightAvatar ? (
+                                                            <SubscriptAvatar
+                                                                backgroundColor={isHovered ? theme.activeComponentBG : theme.componentBG}
+                                                                mainAvatar={floatRightAvatars[0]}
+                                                                secondaryAvatar={floatRightAvatars[1]}
+                                                                size={floatRightAvatarSize ?? fallbackAvatarSize}
+                                                            />
+                                                        ) : (
+                                                            <MultipleAvatars
+                                                                isHovered={isHovered}
+                                                                isPressed={pressed}
+                                                                icons={floatRightAvatars}
+                                                                size={floatRightAvatarSize ?? fallbackAvatarSize}
+                                                                fallbackIcon={defaultWorkspaceAvatars.WorkspaceBuilding}
+                                                                shouldStackHorizontally={shouldStackHorizontally}
+                                                                isFocusMode
+                                                            />
+                                                        )}
+                                                    </View>
                                                 )}
-                                                {shouldShowTitleIcon && titleIcon && (
-                                                    <View style={[styles.ml2]}>
+                                                {!!brickRoadIndicator && (
+                                                    <View style={[styles.alignItemsCenter, styles.justifyContentCenter, styles.ml1]}>
                                                         <Icon
-                                                            src={titleIcon}
-                                                            fill={theme.iconSuccessFill}
+                                                            src={Expensicons.DotIndicator}
+                                                            fill={brickRoadIndicator === 'error' ? theme.danger : theme.success}
                                                         />
                                                     </View>
                                                 )}
-                                            </View>
-                                            {!!description && !shouldShowDescriptionOnTop && (
-                                                <Text
-                                                    style={descriptionTextStyles}
-                                                    numberOfLines={numberOfLinesDescription}
-                                                >
-                                                    {description}
-                                                </Text>
-                                            )}
-                                            {!!error && (
-                                                <View style={[styles.mt1]}>
-                                                    <Text style={[styles.textLabelError]}>{error}</Text>
-                                                </View>
-                                            )}
-                                            {!!furtherDetails && (
-                                                <View style={[styles.flexRow, styles.mt1, styles.alignItemsCenter]}>
-                                                    {!!furtherDetailsIcon && (
+                                                {!title && !!rightLabel && !errorText && (
+                                                    <View style={styles.justifyContentCenter}>
+                                                        <Text style={styles.rightLabelMenuItem}>{rightLabel}</Text>
+                                                    </View>
+                                                )}
+                                                {shouldShowRightIcon && (
+                                                    <View
+                                                        style={[styles.popoverMenuIcon, styles.pointerEventsAuto, disabled && !shouldUseDefaultCursorWhenDisabled && styles.cursorDisabled]}
+                                                    >
                                                         <Icon
-                                                            src={furtherDetailsIcon}
-                                                            height={variables.iconSizeNormal}
-                                                            width={variables.iconSizeNormal}
-                                                            inline
+                                                            src={iconRight}
+                                                            fill={StyleUtils.getIconFillColor(getButtonState(focused || isHovered, pressed, success, disabled, interactive))}
                                                         />
-                                                    )}
-                                                    <Text
-                                                        style={furtherDetailsIcon ? [styles.furtherDetailsText, styles.ph2, styles.pt1] : styles.textLabelSupporting}
-                                                        numberOfLines={2}
-                                                    >
-                                                        {furtherDetails}
-                                                    </Text>
-                                                </View>
-                                            )}
-                                        </View>
-                                    </View>
-                                </View>
-                                <View style={[styles.flexRow, styles.menuItemTextContainer, !hasPressableRightComponent && styles.pointerEventsNone]}>
-                                    {badgeText && (
-                                        <Badge
-                                            text={badgeText}
-                                            badgeStyles={badgeStyle}
-                                        />
-                                    )}
-                                    {/* Since subtitle can be of type number, we should allow 0 to be shown */}
-                                    {(subtitle === 0 || subtitle) && (
-                                        <View style={[styles.justifyContentCenter, styles.mr1]}>
-                                            <Text style={[styles.textLabelSupporting, ...(combinedStyle as TextStyle[])]}>{subtitle}</Text>
-                                        </View>
-                                    )}
-                                    {floatRightAvatars?.length > 0 && (
-                                        <View style={[styles.alignItemsCenter, styles.justifyContentCenter, brickRoadIndicator ? styles.mr2 : styles.mrn2]}>
-                                            {shouldShowSubscriptRightAvatar ? (
-                                                <SubscriptAvatar
-                                                    backgroundColor={isHovered ? theme.activeComponentBG : theme.componentBG}
-                                                    mainAvatar={floatRightAvatars[0]}
-                                                    secondaryAvatar={floatRightAvatars[1]}
-                                                    size={floatRightAvatarSize ?? fallbackAvatarSize}
-                                                />
-                                            ) : (
-                                                <MultipleAvatars
-                                                    isHovered={isHovered}
-                                                    isPressed={pressed}
-                                                    icons={floatRightAvatars}
-                                                    size={floatRightAvatarSize ?? fallbackAvatarSize}
-                                                    fallbackIcon={defaultWorkspaceAvatars.WorkspaceBuilding}
-                                                    shouldStackHorizontally={shouldStackHorizontally}
-                                                    isFocusMode
-                                                />
-                                            )}
+                                                    </View>
+                                                )}
+                                                {shouldShowRightComponent && rightComponent}
+                                                {shouldShowSelectedState && <SelectCircle isChecked={isSelected} />}
+                                            </View>
                                         </View>
-                                    )}
-                                    {!!brickRoadIndicator && (
-                                        <View style={[styles.alignItemsCenter, styles.justifyContentCenter, styles.ml1, styles.mr2]}>
-                                            <Icon
-                                                src={Expensicons.DotIndicator}
-                                                fill={brickRoadIndicator === 'error' ? theme.danger : theme.success}
+                                        {!!errorText && (
+                                            <FormHelpMessage
+                                                isError
+                                                shouldShowRedDotIndicator={!!shouldShowRedDotIndicator}
+                                                message={errorText}
+                                                style={[styles.menuItemError, errorTextStyle]}
+                                                shouldRenderMessageAsHTML={shouldRenderErrorAsHTML}
                                             />
-                                        </View>
-                                    )}
-                                    {!title && !!rightLabel && (
-                                        <View style={styles.justifyContentCenter}>
-                                            <Text style={styles.rightLabelMenuItem}>{rightLabel}</Text>
-                                        </View>
-                                    )}
-                                    {shouldShowRightIcon && (
-                                        <View style={[styles.popoverMenuIcon, styles.pointerEventsAuto, disabled && !shouldUseDefaultCursorWhenDisabled && styles.cursorDisabled]}>
-                                            <Icon
-                                                src={iconRight}
-                                                fill={StyleUtils.getIconFillColor(getButtonState(focused || isHovered, pressed, success, disabled, interactive))}
+                                        )}
+                                        {!!hintText && (
+                                            <FormHelpMessage
+                                                isError={false}
+                                                shouldShowRedDotIndicator={false}
+                                                message={hintText}
+                                                style={styles.menuItemError}
+                                                shouldRenderMessageAsHTML={shouldRenderHintAsHTML}
                                             />
-                                        </View>
-                                    )}
-                                    {shouldShowRightComponent && rightComponent}
-                                    {shouldShowSelectedState && <SelectCircle isChecked={isSelected} />}
-                                </View>
-                                {!!errorText && (
-                                    <FormHelpMessage
-                                        isError
-                                        shouldShowRedDotIndicator={false}
-                                        message={errorText}
-                                        style={styles.menuItemError}
-                                    />
+                                        )}
+                                    </View>
                                 )}
-                            </>
+                            </PressableWithSecondaryInteraction>
                         )}
-                    </PressableWithSecondaryInteraction>
-                )}
-            </Hoverable>
+                    </Hoverable>
+                    {!!helperText &&
+                        (shouldParseHelperText ? (
+                            <View style={[styles.flexRow, styles.renderHTML, styles.ph5, styles.pb5]}>
+                                <RenderHTML html={processedHelperText} />
+                            </View>
+                        ) : (
+                            <Text style={[styles.mutedNormalTextLabel, styles.ph5, styles.pb5, helperTextStyle]}>{helperText}</Text>
+                        ))}
+                </View>
+            </EducationalTooltip>
         </View>
     );
 }
diff --git a/src/components/MenuItemGroup.tsx b/src/components/MenuItemGroup.tsx
index 8dc8586028d8..ed34778dd941 100644
--- a/src/components/MenuItemGroup.tsx
+++ b/src/components/MenuItemGroup.tsx
@@ -5,7 +5,7 @@ import useWaitForNavigation from '@hooks/useWaitForNavigation';
 
 type MenuItemGroupContextProps = {
     isExecuting: boolean;
-    singleExecution: <T extends unknown[]>(action?: Action<T> | undefined) => (...params: T) => void;
+    singleExecution: <T extends unknown[]>(action: Action<T>) => (...params: T) => void;
     waitForNavigate: ReturnType<typeof useWaitForNavigation>;
 };
 
diff --git a/src/components/MenuItemList.tsx b/src/components/MenuItemList.tsx
index 4ba9260e23ff..c03bd712d74c 100644
--- a/src/components/MenuItemList.tsx
+++ b/src/components/MenuItemList.tsx
@@ -11,6 +11,9 @@ type MenuItemLink = string | (() => Promise<string>);
 type MenuItemWithLink = MenuItemProps & {
     /** The link to open when the menu item is clicked */
     link?: MenuItemLink;
+
+    /** A unique key for the menu item */
+    key?: string;
 };
 
 type MenuItemListProps = {
@@ -43,7 +46,7 @@ function MenuItemList({menuItems = [], shouldUseSingleExecution = false}: MenuIt
         <>
             {menuItems.map((menuItemProps) => (
                 <MenuItem
-                    key={menuItemProps.title}
+                    key={menuItemProps.key ?? menuItemProps.title}
                     onSecondaryInteraction={menuItemProps.link !== undefined ? (e) => secondaryInteraction(menuItemProps.link, e) : undefined}
                     ref={popoverAnchor}
                     shouldBlockSelection={!!menuItemProps.link}
diff --git a/src/components/MessagesRow.tsx b/src/components/MessagesRow.tsx
index 7c764ec94fcd..6a5be5db07bc 100644
--- a/src/components/MessagesRow.tsx
+++ b/src/components/MessagesRow.tsx
@@ -4,7 +4,6 @@ import {View} from 'react-native';
 import useLocalize from '@hooks/useLocalize';
 import useTheme from '@hooks/useTheme';
 import useThemeStyles from '@hooks/useThemeStyles';
-import type * as Localize from '@libs/Localize';
 import CONST from '@src/CONST';
 import type {ReceiptError} from '@src/types/onyx/Transaction';
 import {isEmptyObject} from '@src/types/utils/EmptyObject';
@@ -16,7 +15,7 @@ import Tooltip from './Tooltip';
 
 type MessagesRowProps = {
     /** The messages to display */
-    messages: Record<string, Localize.MaybePhraseKey | ReceiptError>;
+    messages: Record<string, string | ReceiptError>;
 
     /** The type of message, 'error' shows a red dot, 'success' shows a green dot */
     type: 'error' | 'success';
diff --git a/src/components/Modal/BaseModal.tsx b/src/components/Modal/BaseModal.tsx
index 38701389f78b..65678d00911a 100644
--- a/src/components/Modal/BaseModal.tsx
+++ b/src/components/Modal/BaseModal.tsx
@@ -1,7 +1,9 @@
+import {PortalHost} from '@gorhom/portal';
 import React, {forwardRef, useCallback, useEffect, useMemo, useRef} from 'react';
 import {View} from 'react-native';
 import ReactNativeModal from 'react-native-modal';
 import ColorSchemeWrapper from '@components/ColorSchemeWrapper';
+import FocusTrapForModal from '@components/FocusTrap/FocusTrapForModal';
 import useKeyboardState from '@hooks/useKeyboardState';
 import usePrevious from '@hooks/usePrevious';
 import useSafeAreaInsets from '@hooks/useSafeAreaInsets';
@@ -16,6 +18,7 @@ import variables from '@styles/variables';
 import * as Modal from '@userActions/Modal';
 import CONST from '@src/CONST';
 import ModalContent from './ModalContent';
+import ModalContext from './ModalContext';
 import type BaseModalProps from './types';
 
 function BaseModal(
@@ -44,16 +47,18 @@ function BaseModal(
         children,
         shouldUseCustomBackdrop = false,
         onBackdropPress,
+        modalId,
         shouldEnableNewFocusManagement = false,
         restoreFocusType,
         shouldUseModalPaddingStyle = true,
+        initialFocus = false,
     }: BaseModalProps,
     ref: React.ForwardedRef<View>,
 ) {
     const theme = useTheme();
     const styles = useThemeStyles();
     const StyleUtils = useStyleUtils();
-    const {windowWidth, windowHeight, isSmallScreenWidth} = useWindowDimensions();
+    const {isSmallScreenWidth, windowWidth, windowHeight} = useWindowDimensions();
     const keyboardStateContextValue = useKeyboardState();
 
     const safeAreaInsets = useSafeAreaInsets();
@@ -61,13 +66,13 @@ function BaseModal(
     const isVisibleRef = useRef(isVisible);
     const wasVisible = usePrevious(isVisible);
 
-    const modalId = useMemo(() => ComposerFocusManager.getId(), []);
-    const saveFocusState = () => {
+    const uniqueModalId = useMemo(() => modalId ?? ComposerFocusManager.getId(), [modalId]);
+    const saveFocusState = useCallback(() => {
         if (shouldEnableNewFocusManagement) {
-            ComposerFocusManager.saveFocusState(modalId);
+            ComposerFocusManager.saveFocusState(uniqueModalId);
         }
-        ComposerFocusManager.resetReadyToFocus(modalId);
-    };
+        ComposerFocusManager.resetReadyToFocus(uniqueModalId);
+    }, [shouldEnableNewFocusManagement, uniqueModalId]);
 
     /**
      * Hides modal
@@ -75,17 +80,19 @@ function BaseModal(
      */
     const hideModal = useCallback(
         (callHideCallback = true) => {
-            Modal.willAlertModalBecomeVisible(false);
-            if (shouldSetModalVisibility) {
-                Modal.setModalVisibility(false);
+            if (Modal.areAllModalsHidden()) {
+                Modal.willAlertModalBecomeVisible(false);
+                if (shouldSetModalVisibility) {
+                    Modal.setModalVisibility(false);
+                }
             }
             if (callHideCallback) {
                 onModalHide();
             }
             Modal.onModalDidClose();
-            ComposerFocusManager.refocusAfterModalFullyClosed(modalId, restoreFocusType);
+            ComposerFocusManager.refocusAfterModalFullyClosed(uniqueModalId, restoreFocusType);
         },
-        [shouldSetModalVisibility, onModalHide, restoreFocusType, modalId],
+        [shouldSetModalVisibility, onModalHide, restoreFocusType, uniqueModalId],
     );
 
     useEffect(() => {
@@ -113,7 +120,7 @@ function BaseModal(
             }
             hideModal(true);
         },
-        // eslint-disable-next-line react-hooks/exhaustive-deps
+        // eslint-disable-next-line react-compiler/react-compiler, react-hooks/exhaustive-deps
         [],
     );
 
@@ -137,7 +144,7 @@ function BaseModal(
     };
 
     const handleDismissModal = () => {
-        ComposerFocusManager.setReadyToFocus(modalId);
+        ComposerFocusManager.setReadyToFocus(uniqueModalId);
     };
 
     const {
@@ -195,60 +202,80 @@ function BaseModal(
               paddingRight: safeAreaPaddingRight ?? 0,
           };
 
+    const modalContextValue = useMemo(
+        () => ({
+            activeModalType: isVisible ? type : undefined,
+        }),
+        [isVisible, type],
+    );
+
     return (
-        // this is a workaround for modal not being visible on the new arch in some cases
-        // it's necessary to have a non-collapseable view as a parent of the modal to prevent
-        // a conflict between RN core and Reanimated shadow tree operations
-        // position absolute is needed to prevent the view from interfering with flex layout
-        <View
-            collapsable={false}
-            style={[styles.pAbsolute]}
-        >
-            <ReactNativeModal
-                // Prevent the parent element to capture a click. This is useful when the modal component is put inside a pressable.
-                onClick={(e) => e.stopPropagation()}
-                onBackdropPress={handleBackdropPress}
-                // Note: Escape key on web/desktop will trigger onBackButtonPress callback
-                // eslint-disable-next-line react/jsx-props-no-multi-spaces
-                onBackButtonPress={Modal.closeTop}
-                onModalShow={handleShowModal}
-                propagateSwipe={propagateSwipe}
-                onModalHide={hideModal}
-                onModalWillShow={saveFocusState}
-                onDismiss={handleDismissModal}
-                onSwipeComplete={() => onClose?.()}
-                swipeDirection={swipeDirection}
-                isVisible={isVisible}
-                backdropColor={theme.overlay}
-                backdropOpacity={!shouldUseCustomBackdrop && hideBackdrop ? 0 : variables.overlayOpacity}
-                backdropTransitionOutTiming={0}
-                hasBackdrop={fullscreen}
-                coverScreen={fullscreen}
-                style={modalStyle}
-                deviceHeight={windowHeight}
-                deviceWidth={windowWidth}
-                animationIn={animationIn ?? modalStyleAnimationIn}
-                animationOut={animationOut ?? modalStyleAnimationOut}
-                useNativeDriver={useNativeDriverProp && useNativeDriver}
-                useNativeDriverForBackdrop={useNativeDriverForBackdrop && useNativeDriver}
-                hideModalContentWhileAnimating={hideModalContentWhileAnimating}
-                animationInTiming={animationInTiming}
-                animationOutTiming={animationOutTiming}
-                statusBarTranslucent={statusBarTranslucent}
-                onLayout={onLayout}
-                avoidKeyboard={avoidKeyboard}
-                customBackdrop={shouldUseCustomBackdrop ? <Overlay onPress={handleBackdropPress} /> : undefined}
+        <ModalContext.Provider value={modalContextValue}>
+            <View
+                // this is a workaround for modal not being visible on the new arch in some cases
+                // it's necessary to have a non-collapseable view as a parent of the modal to prevent
+                // a conflict between RN core and Reanimated shadow tree operations
+                // position absolute is needed to prevent the view from interfering with flex layout
+                collapsable={false}
+                style={[styles.pAbsolute, {zIndex: 1}]}
             >
-                <ModalContent onDismiss={handleDismissModal}>
-                    <View
-                        style={[styles.defaultModalContainer, modalPaddingStyles, modalContainerStyle, !isVisible && styles.pointerEventsNone]}
-                        ref={ref}
+                <ReactNativeModal
+                    // Prevent the parent element to capture a click. This is useful when the modal component is put inside a pressable.
+                    onClick={(e) => e.stopPropagation()}
+                    onBackdropPress={handleBackdropPress}
+                    // Note: Escape key on web/desktop will trigger onBackButtonPress callback
+                    // eslint-disable-next-line react/jsx-props-no-multi-spaces
+                    onBackButtonPress={Modal.closeTop}
+                    onModalShow={handleShowModal}
+                    propagateSwipe={propagateSwipe}
+                    onModalHide={hideModal}
+                    onModalWillShow={saveFocusState}
+                    onDismiss={handleDismissModal}
+                    onSwipeComplete={() => onClose?.()}
+                    swipeDirection={swipeDirection}
+                    isVisible={isVisible}
+                    backdropColor={theme.overlay}
+                    backdropOpacity={!shouldUseCustomBackdrop && hideBackdrop ? 0 : variables.overlayOpacity}
+                    backdropTransitionOutTiming={0}
+                    hasBackdrop={fullscreen}
+                    coverScreen={fullscreen}
+                    style={modalStyle}
+                    deviceHeight={windowHeight}
+                    deviceWidth={windowWidth}
+                    animationIn={animationIn ?? modalStyleAnimationIn}
+                    animationOut={animationOut ?? modalStyleAnimationOut}
+                    // eslint-disable-next-line react-compiler/react-compiler
+                    useNativeDriver={useNativeDriverProp && useNativeDriver}
+                    // eslint-disable-next-line react-compiler/react-compiler
+                    useNativeDriverForBackdrop={useNativeDriverForBackdrop && useNativeDriver}
+                    hideModalContentWhileAnimating={hideModalContentWhileAnimating}
+                    animationInTiming={animationInTiming}
+                    animationOutTiming={animationOutTiming}
+                    statusBarTranslucent={statusBarTranslucent}
+                    onLayout={onLayout}
+                    avoidKeyboard={avoidKeyboard}
+                    customBackdrop={shouldUseCustomBackdrop ? <Overlay onPress={handleBackdropPress} /> : undefined}
+                >
+                    <ModalContent
+                        onModalWillShow={saveFocusState}
+                        onDismiss={handleDismissModal}
                     >
-                        <ColorSchemeWrapper>{children}</ColorSchemeWrapper>
-                    </View>
-                </ModalContent>
-            </ReactNativeModal>
-        </View>
+                        <PortalHost name="modal" />
+                        <FocusTrapForModal
+                            active={isVisible}
+                            initialFocus={initialFocus}
+                        >
+                            <View
+                                style={[styles.defaultModalContainer, modalPaddingStyles, modalContainerStyle, !isVisible && styles.pointerEventsNone]}
+                                ref={ref}
+                            >
+                                <ColorSchemeWrapper>{children}</ColorSchemeWrapper>
+                            </View>
+                        </FocusTrapForModal>
+                    </ModalContent>
+                </ReactNativeModal>
+            </View>
+        </ModalContext.Provider>
     );
 }
 
diff --git a/src/components/Modal/ModalContent.tsx b/src/components/Modal/ModalContent.tsx
index 49d3b049220f..d143aef46ca6 100644
--- a/src/components/Modal/ModalContent.tsx
+++ b/src/components/Modal/ModalContent.tsx
@@ -11,11 +11,17 @@ type ModalContentProps = {
      * such as closing the attachment modal through the browser's back button.
      * */
     onDismiss: () => void;
+
+    /** Callback method fired after modal content is mounted. */
+    onModalWillShow: () => void;
 };
 
-function ModalContent({children, onDismiss = () => {}}: ModalContentProps) {
-    // eslint-disable-next-line react-hooks/exhaustive-deps
-    React.useEffect(() => () => onDismiss?.(), []);
+function ModalContent({children, onDismiss = () => {}, onModalWillShow = () => {}}: ModalContentProps) {
+    React.useEffect(() => {
+        onModalWillShow();
+        return onDismiss;
+        // eslint-disable-next-line react-compiler/react-compiler, react-hooks/exhaustive-deps
+    }, []);
     return children;
 }
 ModalContent.displayName = 'ModalContent';
diff --git a/src/components/Modal/ModalContext.ts b/src/components/Modal/ModalContext.ts
new file mode 100644
index 000000000000..a5c2eb21ab1d
--- /dev/null
+++ b/src/components/Modal/ModalContext.ts
@@ -0,0 +1,15 @@
+import {createContext} from 'react';
+import type ModalType from '@src/types/utils/ModalType';
+
+type ModalContextType = {
+    // The type of the currently displayed modal, or undefined if there is no currently displayed modal.
+    // Note that React Native can only display one modal at a time.
+    activeModalType?: ModalType;
+};
+
+// This context is meant to inform modal children that they are rendering in a modal (and what type of modal they are rendering in)
+// Note that this is different than ONYXKEYS.MODAL.isVisible data point in that that is a global variable for whether a modal is visible or not,
+// whereas this context is provided by the BaseModal component, and thus is only available to components rendered inside a modal.
+const ModalContext = createContext<ModalContextType>({});
+
+export default ModalContext;
diff --git a/src/components/Modal/index.tsx b/src/components/Modal/index.tsx
index 76f4b251ec83..12da8a894282 100644
--- a/src/components/Modal/index.tsx
+++ b/src/components/Modal/index.tsx
@@ -5,6 +5,7 @@ import StatusBar from '@libs/StatusBar';
 import CONST from '@src/CONST';
 import BaseModal from './BaseModal';
 import type BaseModalProps from './types';
+import type {WindowState} from './types';
 
 function Modal({fullscreen = true, onModalHide = () => {}, type, onModalShow = () => {}, children, shouldHandleNavigationBack, ...rest}: BaseModalProps) {
     const theme = useTheme();
@@ -22,7 +23,7 @@ function Modal({fullscreen = true, onModalHide = () => {}, type, onModalShow = (
     const hideModal = () => {
         setStatusBarColor(previousStatusBarColor);
         onModalHide();
-        if (window.history.state.shouldGoBack) {
+        if ((window.history.state as WindowState)?.shouldGoBack) {
             window.history.back();
         }
     };
diff --git a/src/components/Modal/types.ts b/src/components/Modal/types.ts
index bb17f2b4846f..6ced829e93d6 100644
--- a/src/components/Modal/types.ts
+++ b/src/components/Modal/types.ts
@@ -1,8 +1,11 @@
+import type FocusTrap from 'focus-trap-react';
 import type {ViewStyle} from 'react-native';
 import type {ModalProps} from 'react-native-modal';
 import type {ValueOf} from 'type-fest';
 import type CONST from '@src/CONST';
 
+type FocusTrapOptions = Exclude<FocusTrap.Props['focusTrapOptions'], undefined>;
+
 type PopoverAnchorPosition = {
     top?: number;
     right?: number;
@@ -10,6 +13,10 @@ type PopoverAnchorPosition = {
     left?: number;
 };
 
+type WindowState = {
+    shouldGoBack: boolean;
+};
+
 type BaseModalProps = Partial<ModalProps> & {
     /** Decides whether the modal should cover fullscreen. FullScreen modal has backdrop */
     fullscreen?: boolean;
@@ -69,6 +76,9 @@ type BaseModalProps = Partial<ModalProps> & {
     /** Should we use a custom backdrop for the modal? (This prevents focus issues on desktop) */
     shouldUseCustomBackdrop?: boolean;
 
+    /** unique id for the modal */
+    modalId?: number;
+
     /**
      * Whether the modal should enable the new focus manager.
      * We are attempting to migrate to a new refocus manager, adding this property for gradual migration.
@@ -80,7 +90,10 @@ type BaseModalProps = Partial<ModalProps> & {
 
     /** Should we apply padding style in modal itself. If this value is false, we will handle it in ScreenWrapper */
     shouldUseModalPaddingStyle?: boolean;
+
+    /** Used to set the element that should receive the initial focus */
+    initialFocus?: FocusTrapOptions['initialFocus'];
 };
 
 export default BaseModalProps;
-export type {PopoverAnchorPosition};
+export type {PopoverAnchorPosition, WindowState};
diff --git a/src/components/MoneyReportHeader.tsx b/src/components/MoneyReportHeader.tsx
index 7e0139b147fd..321482f7177c 100644
--- a/src/components/MoneyReportHeader.tsx
+++ b/src/components/MoneyReportHeader.tsx
@@ -1,45 +1,44 @@
-import React, {useCallback, useEffect, useMemo, useState} from 'react';
+import React, {useCallback, useEffect, useMemo, useRef, useState} from 'react';
 import {View} from 'react-native';
 import type {OnyxEntry} from 'react-native-onyx';
-import {withOnyx} from 'react-native-onyx';
+import {useOnyx} from 'react-native-onyx';
 import useLocalize from '@hooks/useLocalize';
+import useNetwork from '@hooks/useNetwork';
+import useTheme from '@hooks/useTheme';
 import useThemeStyles from '@hooks/useThemeStyles';
 import useWindowDimensions from '@hooks/useWindowDimensions';
 import * as CurrencyUtils from '@libs/CurrencyUtils';
-import * as HeaderUtils from '@libs/HeaderUtils';
 import Navigation from '@libs/Navigation/Navigation';
+import * as PolicyUtils from '@libs/PolicyUtils';
 import * as ReportActionsUtils from '@libs/ReportActionsUtils';
 import * as ReportUtils from '@libs/ReportUtils';
+import * as TransactionUtils from '@libs/TransactionUtils';
+import variables from '@styles/variables';
 import * as IOU from '@userActions/IOU';
+import * as TransactionActions from '@userActions/Transaction';
 import CONST from '@src/CONST';
 import ONYXKEYS from '@src/ONYXKEYS';
+import type {Route} from '@src/ROUTES';
 import ROUTES from '@src/ROUTES';
 import type * as OnyxTypes from '@src/types/onyx';
 import type {PaymentMethodType} from '@src/types/onyx/OriginalMessage';
-import {isEmptyObject} from '@src/types/utils/EmptyObject';
+import type IconAsset from '@src/types/utils/IconAsset';
+import isLoadingOnyxValue from '@src/types/utils/isLoadingOnyxValue';
 import Button from './Button';
 import ConfirmModal from './ConfirmModal';
 import HeaderWithBackButton from './HeaderWithBackButton';
+import Icon from './Icon';
 import * as Expensicons from './Icon/Expensicons';
 import MoneyReportHeaderStatusBar from './MoneyReportHeaderStatusBar';
+import type {MoneyRequestHeaderStatusBarProps} from './MoneyRequestHeaderStatusBar';
+import MoneyRequestHeaderStatusBar from './MoneyRequestHeaderStatusBar';
+import type {ActionHandledType} from './ProcessMoneyReportHoldMenu';
 import ProcessMoneyReportHoldMenu from './ProcessMoneyReportHoldMenu';
+import ProcessMoneyRequestHoldMenu from './ProcessMoneyRequestHoldMenu';
+import ExportWithDropdownMenu from './ReportActionItem/ExportWithDropdownMenu';
 import SettlementButton from './SettlementButton';
 
-type MoneyReportHeaderOnyxProps = {
-    /** The chat report this report is linked to */
-    chatReport: OnyxEntry<OnyxTypes.Report>;
-
-    /** The next step for the report */
-    nextStep: OnyxEntry<OnyxTypes.ReportNextStep>;
-
-    /** Session info for the currently logged in user. */
-    session: OnyxEntry<OnyxTypes.Session>;
-
-    /** The transaction thread report associated with the current report, if any */
-    transactionThreadReport: OnyxEntry<OnyxTypes.Report>;
-};
-
-type MoneyReportHeaderProps = MoneyReportHeaderOnyxProps & {
+type MoneyReportHeaderProps = {
     /** The report currently being looked at */
     report: OnyxTypes.Report;
 
@@ -55,89 +54,113 @@ type MoneyReportHeaderProps = MoneyReportHeaderOnyxProps & {
 
     /** Whether we should display the header as in narrow layout */
     shouldUseNarrowLayout?: boolean;
+
+    /** Method to trigger when pressing close button of the header */
+    onBackButtonPress: () => void;
 };
 
-function MoneyReportHeader({
-    session,
-    policy,
-    chatReport,
-    nextStep,
-    report: moneyRequestReport,
-    transactionThreadReport,
-    reportActions,
-    shouldUseNarrowLayout = false,
-}: MoneyReportHeaderProps) {
-    const styles = useThemeStyles();
-    const [isDeleteRequestModalVisible, setIsDeleteRequestModalVisible] = useState(false);
-    const {translate} = useLocalize();
-    const {windowWidth} = useWindowDimensions();
-    const {reimbursableSpend} = ReportUtils.getMoneyRequestSpendBreakdown(moneyRequestReport);
-    const isSettled = ReportUtils.isSettled(moneyRequestReport.reportID);
+function MoneyReportHeader({policy, report: moneyRequestReport, transactionThreadReportID, reportActions, shouldUseNarrowLayout = false, onBackButtonPress}: MoneyReportHeaderProps) {
+    const [chatReport] = useOnyx(`${ONYXKEYS.COLLECTION.REPORT}${moneyRequestReport.chatReportID}`);
+    const [nextStep] = useOnyx(`${ONYXKEYS.COLLECTION.NEXT_STEP}${moneyRequestReport.reportID}`);
+    const [transactionThreadReport] = useOnyx(`${ONYXKEYS.COLLECTION.REPORT}${transactionThreadReportID}`);
+    const [session] = useOnyx(ONYXKEYS.SESSION);
     const requestParentReportAction = useMemo(() => {
         if (!reportActions || !transactionThreadReport?.parentReportActionID) {
             return null;
         }
-        return reportActions.find((action) => action.reportActionID === transactionThreadReport.parentReportActionID);
+        return reportActions.find((action): action is OnyxTypes.ReportAction<typeof CONST.REPORT.ACTIONS.TYPE.IOU> => action.reportActionID === transactionThreadReport.parentReportActionID);
     }, [reportActions, transactionThreadReport?.parentReportActionID]);
-    const isDeletedParentAction = ReportActionsUtils.isDeletedAction(requestParentReportAction as OnyxTypes.ReportAction);
+    const [transactions] = useOnyx(ONYXKEYS.COLLECTION.TRANSACTION);
+    const [dismissedHoldUseExplanation, dismissedHoldUseExplanationResult] = useOnyx(ONYXKEYS.NVP_DISMISSED_HOLD_USE_EXPLANATION, {initialValue: true});
+    const isLoadingHoldUseExplained = isLoadingOnyxValue(dismissedHoldUseExplanationResult);
+    const transaction =
+        transactions?.[
+            `${ONYXKEYS.COLLECTION.TRANSACTION}${
+                ReportActionsUtils.isMoneyRequestAction(requestParentReportAction) ? ReportActionsUtils.getOriginalMessage(requestParentReportAction)?.IOUTransactionID ?? -1 : -1
+            }`
+        ] ?? undefined;
+
+    const styles = useThemeStyles();
+    const theme = useTheme();
+    const [isDeleteRequestModalVisible, setIsDeleteRequestModalVisible] = useState(false);
+    const [shouldShowHoldMenu, setShouldShowHoldMenu] = useState(false);
+    const {translate} = useLocalize();
+    const {isOffline} = useNetwork();
+    const {isSmallScreenWidth} = useWindowDimensions();
+    const {reimbursableSpend} = ReportUtils.getMoneyRequestSpendBreakdown(moneyRequestReport);
+    const isOnHold = TransactionUtils.isOnHold(transaction);
+    const isDeletedParentAction = !!requestParentReportAction && ReportActionsUtils.isDeletedAction(requestParentReportAction);
 
     // Only the requestor can delete the request, admins can only edit it.
     const isActionOwner =
         typeof requestParentReportAction?.actorAccountID === 'number' && typeof session?.accountID === 'number' && requestParentReportAction.actorAccountID === session?.accountID;
-    const canDeleteRequest =
-        isActionOwner && (ReportUtils.canAddOrDeleteTransactions(moneyRequestReport) || ReportUtils.isTrackExpenseReport(transactionThreadReport)) && !isDeletedParentAction;
+    const canDeleteRequest = isActionOwner && ReportUtils.canDeleteTransaction(moneyRequestReport) && !isDeletedParentAction;
     const [isHoldMenuVisible, setIsHoldMenuVisible] = useState(false);
     const [paymentType, setPaymentType] = useState<PaymentMethodType>();
-    const [requestType, setRequestType] = useState<'pay' | 'approve'>();
+    const [requestType, setRequestType] = useState<ActionHandledType>();
+    // eslint-disable-next-line react-compiler/react-compiler, react-hooks/exhaustive-deps
+    const allTransactions = useMemo(() => TransactionUtils.getAllReportTransactions(moneyRequestReport?.reportID), [moneyRequestReport?.reportID, transactions]);
     const canAllowSettlement = ReportUtils.hasUpdatedTotal(moneyRequestReport, policy);
     const policyType = policy?.type;
-    const isPayer = ReportUtils.isPayer(session, moneyRequestReport);
     const isDraft = ReportUtils.isOpenExpenseReport(moneyRequestReport);
-    const [isConfirmModalVisible, setIsConfirmModalVisible] = useState(false);
+    const connectedIntegration = PolicyUtils.getConnectedIntegration(policy);
+    const navigateBackToAfterDelete = useRef<Route>();
+    const hasScanningReceipt = ReportUtils.getTransactionsWithReceipts(moneyRequestReport?.reportID).some((t) => TransactionUtils.isReceiptBeingScanned(t));
+    const hasOnlyPendingTransactions = allTransactions.length > 0 && allTransactions.every((t) => TransactionUtils.isExpensifyCardTransaction(t) && TransactionUtils.isPending(t));
+    const transactionIDs = allTransactions.map((t) => t.transactionID);
+    const hasAllPendingRTERViolations = TransactionUtils.allHavePendingRTERViolation([transaction?.transactionID ?? '-1']);
+    const hasOnlyHeldExpenses = ReportUtils.hasOnlyHeldExpenses(moneyRequestReport.reportID);
+    const isPayAtEndExpense = TransactionUtils.isPayAtEndExpense(transaction);
+    const isArchivedReport = ReportUtils.isArchivedRoomWithID(moneyRequestReport?.reportID);
+    const [archiveReason] = useOnyx(`${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${moneyRequestReport.reportID}`, {selector: ReportUtils.getArchiveReason});
 
-    const cancelPayment = useCallback(() => {
-        if (!chatReport) {
-            return;
-        }
-        IOU.cancelPayment(moneyRequestReport, chatReport);
-        setIsConfirmModalVisible(false);
-    }, [moneyRequestReport, chatReport]);
-
-    const shouldShowPayButton = useMemo(() => IOU.canIOUBePaid(moneyRequestReport, chatReport, policy), [moneyRequestReport, chatReport, policy]);
+    const shouldShowPayButton = useMemo(
+        () => IOU.canIOUBePaid(moneyRequestReport, chatReport, policy, transaction ? [transaction] : undefined),
+        [moneyRequestReport, chatReport, policy, transaction],
+    );
 
-    const shouldShowApproveButton = useMemo(() => IOU.canApproveIOU(moneyRequestReport, chatReport, policy), [moneyRequestReport, chatReport, policy]);
+    const shouldShowApproveButton = useMemo(() => IOU.canApproveIOU(moneyRequestReport, policy), [moneyRequestReport, policy]);
 
     const shouldDisableApproveButton = shouldShowApproveButton && !ReportUtils.isAllowedToApproveExpenseReport(moneyRequestReport);
 
-    const shouldShowSettlementButton = !ReportUtils.isInvoiceReport(moneyRequestReport) && (shouldShowPayButton || shouldShowApproveButton);
+    const shouldShowSubmitButton = isDraft && reimbursableSpend !== 0 && !hasAllPendingRTERViolations;
+
+    const isAdmin = policy?.role === CONST.POLICY.ROLE.ADMIN;
+    const shouldShowExportIntegrationButton = !shouldShowPayButton && !shouldShowSubmitButton && connectedIntegration && isAdmin && ReportUtils.canBeExported(moneyRequestReport);
+
+    const shouldShowSettlementButton = (shouldShowPayButton || shouldShowApproveButton) && !hasAllPendingRTERViolations && !shouldShowExportIntegrationButton;
 
-    const shouldShowSubmitButton = isDraft && reimbursableSpend !== 0;
     const shouldDisableSubmitButton = shouldShowSubmitButton && !ReportUtils.isAllowedToSubmitDraftExpenseReport(moneyRequestReport);
     const isFromPaidPolicy = policyType === CONST.POLICY.TYPE.TEAM || policyType === CONST.POLICY.TYPE.CORPORATE;
-    const shouldShowNextStep = !ReportUtils.isClosedExpenseReportWithNoExpenses(moneyRequestReport) && isFromPaidPolicy && !!nextStep?.message?.length;
-    const shouldShowAnyButton = shouldShowSettlementButton || shouldShowApproveButton || shouldShowSubmitButton || shouldShowNextStep;
+    const shouldShowStatusBar = hasAllPendingRTERViolations || hasOnlyHeldExpenses || hasScanningReceipt || isPayAtEndExpense || hasOnlyPendingTransactions;
+    const shouldShowNextStep = !ReportUtils.isClosedExpenseReportWithNoExpenses(moneyRequestReport) && isFromPaidPolicy && !!nextStep?.message?.length && !shouldShowStatusBar;
+    const shouldShowAnyButton =
+        shouldShowSettlementButton || shouldShowApproveButton || shouldShowSubmitButton || shouldShowNextStep || hasAllPendingRTERViolations || shouldShowExportIntegrationButton;
     const bankAccountRoute = ReportUtils.getBankAccountRoute(chatReport);
     const formattedAmount = CurrencyUtils.convertToDisplayString(reimbursableSpend, moneyRequestReport.currency);
     const [nonHeldAmount, fullAmount] = ReportUtils.getNonHeldAndFullAmount(moneyRequestReport, policy);
-    const displayedAmount = ReportUtils.hasHeldExpenses(moneyRequestReport.reportID) && canAllowSettlement ? nonHeldAmount : formattedAmount;
-    const isMoreContentShown = shouldShowNextStep || (shouldShowAnyButton && shouldUseNarrowLayout);
+    const isAnyTransactionOnHold = ReportUtils.hasHeldExpenses(moneyRequestReport.reportID);
+    const displayedAmount = isAnyTransactionOnHold && canAllowSettlement ? nonHeldAmount : formattedAmount;
+    const isMoreContentShown = shouldShowNextStep || shouldShowStatusBar || (shouldShowAnyButton && shouldUseNarrowLayout);
 
-    const confirmPayment = (type?: PaymentMethodType | undefined) => {
-        if (!type) {
+    const confirmPayment = (type?: PaymentMethodType | undefined, payAsBusiness?: boolean) => {
+        if (!type || !chatReport) {
             return;
         }
         setPaymentType(type);
-        setRequestType('pay');
-        if (ReportUtils.hasHeldExpenses(moneyRequestReport.reportID)) {
+        setRequestType(CONST.IOU.REPORT_ACTION_TYPE.PAY);
+        if (isAnyTransactionOnHold) {
             setIsHoldMenuVisible(true);
-        } else if (chatReport) {
+        } else if (ReportUtils.isInvoiceReport(moneyRequestReport)) {
+            IOU.payInvoice(type, chatReport, moneyRequestReport, payAsBusiness);
+        } else {
             IOU.payMoneyRequest(type, chatReport, moneyRequestReport, true);
         }
     };
 
     const confirmApproval = () => {
-        setRequestType('approve');
-        if (ReportUtils.hasHeldExpenses(moneyRequestReport.reportID)) {
+        setRequestType(CONST.IOU.REPORT_ACTION_TYPE.APPROVE);
+        if (isAnyTransactionOnHold) {
             setIsHoldMenuVisible(true);
         } else {
             IOU.approveMoneyRequest(moneyRequestReport, true);
@@ -146,40 +169,95 @@ function MoneyReportHeader({
 
     const deleteTransaction = useCallback(() => {
         if (requestParentReportAction) {
-            const iouTransactionID = requestParentReportAction.actionName === CONST.REPORT.ACTIONS.TYPE.IOU ? requestParentReportAction.originalMessage?.IOUTransactionID ?? '' : '';
+            const iouTransactionID = ReportActionsUtils.isMoneyRequestAction(requestParentReportAction)
+                ? ReportActionsUtils.getOriginalMessage(requestParentReportAction)?.IOUTransactionID ?? '-1'
+                : '-1';
             if (ReportActionsUtils.isTrackExpenseAction(requestParentReportAction)) {
-                IOU.deleteTrackExpense(moneyRequestReport?.reportID ?? '', iouTransactionID, requestParentReportAction, true);
-                return;
+                navigateBackToAfterDelete.current = IOU.deleteTrackExpense(moneyRequestReport?.reportID ?? '-1', iouTransactionID, requestParentReportAction, true);
+            } else {
+                navigateBackToAfterDelete.current = IOU.deleteMoneyRequest(iouTransactionID, requestParentReportAction, true);
             }
-            IOU.deleteMoneyRequest(iouTransactionID, requestParentReportAction, true);
         }
 
         setIsDeleteRequestModalVisible(false);
     }, [moneyRequestReport?.reportID, requestParentReportAction, setIsDeleteRequestModalVisible]);
 
+    const markAsCash = useCallback(() => {
+        if (!requestParentReportAction) {
+            return;
+        }
+        const iouTransactionID = ReportActionsUtils.isMoneyRequestAction(requestParentReportAction)
+            ? ReportActionsUtils.getOriginalMessage(requestParentReportAction)?.IOUTransactionID ?? '-1'
+            : '-1';
+        const reportID = transactionThreadReport?.reportID ?? '-1';
+
+        TransactionActions.markAsCash(iouTransactionID, reportID);
+    }, [requestParentReportAction, transactionThreadReport?.reportID]);
+
+    const getStatusIcon: (src: IconAsset) => React.ReactNode = (src) => (
+        <Icon
+            src={src}
+            height={variables.iconSizeSmall}
+            width={variables.iconSizeSmall}
+            fill={theme.icon}
+        />
+    );
+
+    const getStatusBarProps: () => MoneyRequestHeaderStatusBarProps | undefined = () => {
+        if (isPayAtEndExpense) {
+            if (!isArchivedReport) {
+                return {icon: getStatusIcon(Expensicons.Hourglass), description: translate('iou.bookingPendingDescription')};
+            }
+            if (isArchivedReport && archiveReason === CONST.REPORT.ARCHIVE_REASON.BOOKING_END_DATE_HAS_PASSED) {
+                return {icon: getStatusIcon(Expensicons.Box), description: translate('iou.bookingArchivedDescription')};
+            }
+        }
+        if (hasOnlyHeldExpenses) {
+            return {icon: getStatusIcon(Expensicons.Stopwatch), description: translate('iou.expensesOnHold')};
+        }
+        if (hasAllPendingRTERViolations) {
+            return {icon: getStatusIcon(Expensicons.Hourglass), description: translate('iou.pendingMatchWithCreditCardDescription')};
+        }
+        if (hasOnlyPendingTransactions) {
+            return {icon: getStatusIcon(Expensicons.CreditCardHourglass), description: translate('iou.transactionPendingDescription')};
+        }
+        if (hasScanningReceipt) {
+            return {icon: getStatusIcon(Expensicons.ReceiptScan), description: translate('iou.receiptScanInProgressDescription')};
+        }
+    };
+
+    const statusBarProps = getStatusBarProps();
+
     // The submit button should be success green colour only if the user is submitter and the policy does not have Scheduled Submit turned on
     const isWaitingForSubmissionFromCurrentUser = useMemo(
         () => chatReport?.isOwnPolicyExpenseChat && !policy?.harvesting?.enabled,
         [chatReport?.isOwnPolicyExpenseChat, policy?.harvesting?.enabled],
     );
 
-    const threeDotsMenuItems = [HeaderUtils.getPinMenuItem(moneyRequestReport)];
-    if (isPayer && isSettled && ReportUtils.isExpenseReport(moneyRequestReport)) {
-        threeDotsMenuItems.push({
-            icon: Expensicons.Trashcan,
-            text: translate('iou.cancelPayment'),
-            onSelected: () => setIsConfirmModalVisible(true),
-        });
-    }
-
-    // If the report supports adding transactions to it, then it also supports deleting transactions from it.
-    if (canDeleteRequest && !isEmptyObject(transactionThreadReport)) {
-        threeDotsMenuItems.push({
-            icon: Expensicons.Trashcan,
-            text: translate('reportActionContextMenu.deleteAction', {action: requestParentReportAction}),
-            onSelected: () => setIsDeleteRequestModalVisible(true),
-        });
-    }
+    useEffect(() => {
+        if (isLoadingHoldUseExplained) {
+            return;
+        }
+        setShouldShowHoldMenu(isOnHold && !dismissedHoldUseExplanation);
+    }, [dismissedHoldUseExplanation, isLoadingHoldUseExplained, isOnHold]);
+
+    useEffect(() => {
+        if (!shouldShowHoldMenu) {
+            return;
+        }
+
+        if (isSmallScreenWidth) {
+            if (Navigation.getActiveRoute().slice(1) === ROUTES.PROCESS_MONEY_REQUEST_HOLD) {
+                Navigation.goBack();
+            }
+        } else {
+            Navigation.navigate(ROUTES.PROCESS_MONEY_REQUEST_HOLD);
+        }
+    }, [isSmallScreenWidth, shouldShowHoldMenu]);
+
+    const handleHoldRequestClose = () => {
+        IOU.dismissHoldUseExplanation();
+    };
 
     useEffect(() => {
         if (canDeleteRequest) {
@@ -198,12 +276,9 @@ function MoneyReportHeader({
                 report={moneyRequestReport}
                 policy={policy}
                 shouldShowBackButton={shouldUseNarrowLayout}
-                onBackButtonPress={() => Navigation.goBack(undefined, false, true)}
-                // Shows border if no buttons or next steps are showing below the header
-                shouldShowBorderBottom={!(shouldShowAnyButton && shouldUseNarrowLayout) && !(shouldShowNextStep && !shouldUseNarrowLayout)}
-                shouldShowThreeDotsButton
-                threeDotsMenuItems={threeDotsMenuItems}
-                threeDotsAnchorPosition={styles.threeDotsPopoverOffsetNoCloseButton(windowWidth)}
+                onBackButtonPress={onBackButtonPress}
+                // Shows border if no buttons or banners are showing below the header
+                shouldShowBorderBottom={!isMoreContentShown}
             >
                 {shouldShowSettlementButton && !shouldUseNarrowLayout && (
                     <View style={styles.pv2}>
@@ -220,8 +295,18 @@ function MoneyReportHeader({
                             shouldShowApproveButton={shouldShowApproveButton}
                             shouldDisableApproveButton={shouldDisableApproveButton}
                             style={[styles.pv2]}
-                            formattedAmount={!ReportUtils.hasOnlyHeldExpenses(moneyRequestReport.reportID) ? displayedAmount : ''}
-                            isDisabled={!canAllowSettlement}
+                            formattedAmount={!hasOnlyHeldExpenses ? displayedAmount : ''}
+                            isDisabled={isOffline && !canAllowSettlement}
+                            isLoading={!isOffline && !canAllowSettlement}
+                        />
+                    </View>
+                )}
+                {shouldShowExportIntegrationButton && !shouldUseNarrowLayout && (
+                    <View style={[styles.pv2]}>
+                        <ExportWithDropdownMenu
+                            policy={policy}
+                            report={moneyRequestReport}
+                            connectionName={connectedIntegration}
                         />
                     </View>
                 )}
@@ -237,10 +322,21 @@ function MoneyReportHeader({
                         />
                     </View>
                 )}
+                {hasAllPendingRTERViolations && !shouldUseNarrowLayout && (
+                    <View style={[styles.pv2]}>
+                        <Button
+                            medium
+                            success
+                            text={translate('iou.markAsCash')}
+                            style={[styles.pv2, styles.pr0]}
+                            onPress={markAsCash}
+                        />
+                    </View>
+                )}
             </HeaderWithBackButton>
-            <View style={isMoreContentShown ? [styles.dFlex, styles.flexColumn, styles.borderBottom] : []}>
-                {shouldShowSettlementButton && shouldUseNarrowLayout && (
-                    <View style={[styles.ph5, styles.pb2]}>
+            {isMoreContentShown && (
+                <View style={[styles.dFlex, styles.flexColumn, styles.gap3, styles.pb3, styles.ph5, styles.borderBottom]}>
+                    {shouldShowSettlementButton && shouldUseNarrowLayout && (
                         <SettlementButton
                             currency={moneyRequestReport.currency}
                             confirmApproval={confirmApproval}
@@ -252,14 +348,20 @@ function MoneyReportHeader({
                             addBankAccountRoute={bankAccountRoute}
                             shouldHidePaymentOptions={!shouldShowPayButton}
                             shouldShowApproveButton={shouldShowApproveButton}
-                            formattedAmount={!ReportUtils.hasOnlyHeldExpenses(moneyRequestReport.reportID) ? displayedAmount : ''}
+                            formattedAmount={!hasOnlyHeldExpenses ? displayedAmount : ''}
                             shouldDisableApproveButton={shouldDisableApproveButton}
-                            isDisabled={!canAllowSettlement}
+                            isDisabled={isOffline && !canAllowSettlement}
+                            isLoading={!isOffline && !canAllowSettlement}
                         />
-                    </View>
-                )}
-                {shouldShowSubmitButton && shouldUseNarrowLayout && (
-                    <View style={[styles.ph5, styles.pb2]}>
+                    )}
+                    {shouldShowExportIntegrationButton && shouldUseNarrowLayout && (
+                        <ExportWithDropdownMenu
+                            policy={policy}
+                            report={moneyRequestReport}
+                            connectionName={connectedIntegration}
+                        />
+                    )}
+                    {shouldShowSubmitButton && shouldUseNarrowLayout && (
                         <Button
                             medium
                             success={isWaitingForSubmissionFromCurrentUser}
@@ -268,64 +370,61 @@ function MoneyReportHeader({
                             onPress={() => IOU.submitReport(moneyRequestReport)}
                             isDisabled={shouldDisableSubmitButton}
                         />
-                    </View>
-                )}
-                {shouldShowNextStep && (
-                    <View style={[styles.ph5, styles.pb3]}>
-                        <MoneyReportHeaderStatusBar nextStep={nextStep} />
-                    </View>
-                )}
-            </View>
+                    )}
+                    {hasAllPendingRTERViolations && shouldUseNarrowLayout && (
+                        <Button
+                            medium
+                            success
+                            text={translate('iou.markAsCash')}
+                            style={[styles.w100, styles.pr0]}
+                            onPress={markAsCash}
+                        />
+                    )}
+                    {shouldShowNextStep && <MoneyReportHeaderStatusBar nextStep={nextStep} />}
+                    {statusBarProps && (
+                        <MoneyRequestHeaderStatusBar
+                            icon={statusBarProps.icon}
+                            description={statusBarProps.description}
+                        />
+                    )}
+                </View>
+            )}
             {isHoldMenuVisible && requestType !== undefined && (
                 <ProcessMoneyReportHoldMenu
-                    nonHeldAmount={!ReportUtils.hasOnlyHeldExpenses(moneyRequestReport.reportID) ? nonHeldAmount : undefined}
+                    nonHeldAmount={!hasOnlyHeldExpenses ? nonHeldAmount : undefined}
                     requestType={requestType}
                     fullAmount={fullAmount}
-                    isSmallScreenWidth={shouldUseNarrowLayout}
                     onClose={() => setIsHoldMenuVisible(false)}
                     isVisible={isHoldMenuVisible}
                     paymentType={paymentType}
                     chatReport={chatReport}
                     moneyRequestReport={moneyRequestReport}
+                    transactionCount={transactionIDs.length}
                 />
             )}
-            <ConfirmModal
-                title={translate('iou.cancelPayment')}
-                isVisible={isConfirmModalVisible}
-                onConfirm={cancelPayment}
-                onCancel={() => setIsConfirmModalVisible(false)}
-                prompt={translate('iou.cancelPaymentConfirmation')}
-                confirmText={translate('iou.cancelPayment')}
-                cancelText={translate('common.dismiss')}
-                danger
-            />
             <ConfirmModal
                 title={translate('iou.deleteExpense')}
                 isVisible={isDeleteRequestModalVisible}
                 onConfirm={deleteTransaction}
                 onCancel={() => setIsDeleteRequestModalVisible(false)}
+                onModalHide={() => ReportUtils.navigateBackAfterDeleteTransaction(navigateBackToAfterDelete.current)}
                 prompt={translate('iou.deleteConfirmation')}
                 confirmText={translate('common.delete')}
                 cancelText={translate('common.cancel')}
                 danger
+                shouldEnableNewFocusManagement
             />
+            {isSmallScreenWidth && shouldShowHoldMenu && (
+                <ProcessMoneyRequestHoldMenu
+                    onClose={handleHoldRequestClose}
+                    onConfirm={handleHoldRequestClose}
+                    isVisible={shouldShowHoldMenu}
+                />
+            )}
         </View>
     );
 }
 
 MoneyReportHeader.displayName = 'MoneyReportHeader';
 
-export default withOnyx<MoneyReportHeaderProps, MoneyReportHeaderOnyxProps>({
-    chatReport: {
-        key: ({report}) => `${ONYXKEYS.COLLECTION.REPORT}${report.chatReportID}`,
-    },
-    nextStep: {
-        key: ({report}) => `${ONYXKEYS.COLLECTION.NEXT_STEP}${report.reportID}`,
-    },
-    transactionThreadReport: {
-        key: ({transactionThreadReportID}) => `${ONYXKEYS.COLLECTION.REPORT}${transactionThreadReportID}`,
-    },
-    session: {
-        key: ONYXKEYS.SESSION,
-    },
-})(MoneyReportHeader);
+export default MoneyReportHeader;
diff --git a/src/components/MoneyReportHeaderStatusBar.tsx b/src/components/MoneyReportHeaderStatusBar.tsx
index 82a82e014697..455f9e443610 100644
--- a/src/components/MoneyReportHeaderStatusBar.tsx
+++ b/src/components/MoneyReportHeaderStatusBar.tsx
@@ -1,11 +1,15 @@
 import React, {useMemo} from 'react';
 import {View} from 'react-native';
-import useLocalize from '@hooks/useLocalize';
+import type {ValueOf} from 'type-fest';
+import useTheme from '@hooks/useTheme';
 import useThemeStyles from '@hooks/useThemeStyles';
 import * as NextStepUtils from '@libs/NextStepUtils';
+import variables from '@styles/variables';
 import CONST from '@src/CONST';
 import type ReportNextStep from '@src/types/onyx/ReportNextStep';
-import Badge from './Badge';
+import type IconAsset from '@src/types/utils/IconAsset';
+import Icon from './Icon';
+import * as Expensicons from './Icon/Expensicons';
 import RenderHTML from './RenderHTML';
 
 type MoneyReportHeaderStatusBarProps = {
@@ -13,21 +17,30 @@ type MoneyReportHeaderStatusBarProps = {
     nextStep: ReportNextStep;
 };
 
+type IconName = ValueOf<typeof CONST.NEXT_STEP.ICONS>;
+type IconMap = Record<IconName, IconAsset>;
+const iconMap: IconMap = {
+    [CONST.NEXT_STEP.ICONS.HOURGLASS]: Expensicons.Hourglass,
+    [CONST.NEXT_STEP.ICONS.CHECKMARK]: Expensicons.Checkmark,
+    [CONST.NEXT_STEP.ICONS.STOPWATCH]: Expensicons.Stopwatch,
+};
+
 function MoneyReportHeaderStatusBar({nextStep}: MoneyReportHeaderStatusBarProps) {
     const styles = useThemeStyles();
-    const {translate} = useLocalize();
-
+    const theme = useTheme();
     const messageContent = useMemo(() => {
         const messageArray = nextStep.message;
         return NextStepUtils.parseMessage(messageArray);
     }, [nextStep.message]);
 
     return (
-        <View style={[styles.dFlex, styles.flexRow, styles.alignItemsCenter, styles.overflowHidden, styles.w100]}>
+        <View style={[styles.dFlex, styles.flexRow, styles.alignItemsCenter, styles.overflowHidden, styles.w100, styles.headerStatusBarContainer]}>
             <View style={[styles.mr3]}>
-                <Badge
-                    text={translate(nextStep.title === CONST.NEXT_STEP.FINISHED ? 'iou.finished' : 'iou.nextStep')}
-                    badgeStyles={styles.ml0}
+                <Icon
+                    src={iconMap[nextStep.icon] || Expensicons.Hourglass}
+                    height={variables.iconSizeSmall}
+                    width={variables.iconSizeSmall}
+                    fill={theme.icon}
                 />
             </View>
             <View style={[styles.dFlex, styles.flexRow, styles.flexShrink1]}>
diff --git a/src/components/MoneyRequestAmountInput.tsx b/src/components/MoneyRequestAmountInput.tsx
index fcc156db4a96..702e6c384b58 100644
--- a/src/components/MoneyRequestAmountInput.tsx
+++ b/src/components/MoneyRequestAmountInput.tsx
@@ -2,11 +2,14 @@ import type {ForwardedRef} from 'react';
 import React, {useCallback, useEffect, useImperativeHandle, useRef, useState} from 'react';
 import type {NativeSyntheticEvent, StyleProp, TextInputSelectionChangeEventData, TextStyle, ViewStyle} from 'react-native';
 import useLocalize from '@hooks/useLocalize';
+import {useMouseContext} from '@hooks/useMouseContext';
 import * as Browser from '@libs/Browser';
 import * as CurrencyUtils from '@libs/CurrencyUtils';
 import getOperatingSystem from '@libs/getOperatingSystem';
 import * as MoneyRequestUtils from '@libs/MoneyRequestUtils';
+import shouldIgnoreSelectionWhenUpdatedManually from '@libs/shouldIgnoreSelectionWhenUpdatedManually';
 import CONST from '@src/CONST';
+import isTextInputFocused from './TextInput/BaseTextInput/isTextInputFocused';
 import type {BaseTextInputRef} from './TextInput/BaseTextInput/types';
 import TextInputWithCurrencySymbol from './TextInputWithCurrencySymbol';
 
@@ -24,6 +27,9 @@ type MoneyRequestAmountInputProps = {
     /** IOU amount saved in Onyx */
     amount?: number;
 
+    /** A callback to format the amount number */
+    onFormatAmount?: (amount: number, currency?: string) => string;
+
     /** Currency chosen by user or saved in Onyx */
     currency?: string;
 
@@ -54,6 +60,9 @@ type MoneyRequestAmountInputProps = {
     /** Whether to hide the currency symbol */
     hideCurrencySymbol?: boolean;
 
+    /** Whether to disable native keyboard on mobile */
+    disableKeyboard?: boolean;
+
     /** Style for the prefix */
     prefixStyle?: StyleProp<TextStyle>;
 
@@ -62,6 +71,26 @@ type MoneyRequestAmountInputProps = {
 
     /** Style for the touchable input wrapper */
     touchableInputWrapperStyle?: StyleProp<ViewStyle>;
+
+    /** Whether we want to format the display amount on blur */
+    formatAmountOnBlur?: boolean;
+
+    /** Max length for the amount input */
+    maxLength?: number;
+
+    /** Hide the focus styles on TextInput */
+    hideFocusedState?: boolean;
+
+    /** Whether the user input should be kept or not */
+    shouldKeepUserInput?: boolean;
+
+    /**
+     * Autogrow input container length based on the entered text.
+     */
+    autoGrow?: boolean;
+
+    /** The width of inner content */
+    contentWidth?: number;
 };
 
 type Selection = {
@@ -77,6 +106,8 @@ const getNewSelection = (oldSelection: Selection, prevLength: number, newLength:
     return {start: cursorPosition, end: cursorPosition};
 };
 
+const defaultOnFormatAmount = (amount: number, currency?: string) => CurrencyUtils.convertToFrontendAmountAsString(amount, currency ?? CONST.CURRENCY.USD);
+
 function MoneyRequestAmountInput(
     {
         amount = 0,
@@ -88,6 +119,14 @@ function MoneyRequestAmountInput(
         hideCurrencySymbol = false,
         shouldUpdateSelection = true,
         moneyRequestAmountInputRef,
+        disableKeyboard = true,
+        onFormatAmount = defaultOnFormatAmount,
+        formatAmountOnBlur,
+        maxLength,
+        hideFocusedState = true,
+        shouldKeepUserInput = false,
+        autoGrow = true,
+        contentWidth,
         ...props
     }: MoneyRequestAmountInputProps,
     forwardedRef: ForwardedRef<BaseTextInputRef>,
@@ -97,7 +136,7 @@ function MoneyRequestAmountInput(
     const textInput = useRef<BaseTextInputRef | null>(null);
 
     const decimals = CurrencyUtils.getCurrencyDecimals(currency);
-    const selectedAmountAsString = amount ? CurrencyUtils.convertToFrontendAmount(amount).toString() : '';
+    const selectedAmountAsString = amount ? onFormatAmount(amount, currency) : '';
 
     const [currentAmount, setCurrentAmount] = useState(selectedAmountAsString);
 
@@ -107,6 +146,8 @@ function MoneyRequestAmountInput(
     });
 
     const forwardDeletePressedRef = useRef(false);
+    // The ref is used to ignore any onSelectionChange event that happens while we are updating the selection manually in setNewAmount
+    const willSelectionBeUpdatedManually = useRef(false);
 
     /**
      * Sets the selection and the amount accordingly to the value passed to the input
@@ -117,22 +158,27 @@ function MoneyRequestAmountInput(
             // Remove spaces from the newAmount value because Safari on iOS adds spaces when pasting a copied value
             // More info: https://github.com/Expensify/App/issues/16974
             const newAmountWithoutSpaces = MoneyRequestUtils.stripSpacesFromAmount(newAmount);
+            const finalAmount = newAmountWithoutSpaces.includes('.')
+                ? MoneyRequestUtils.stripCommaFromAmount(newAmountWithoutSpaces)
+                : MoneyRequestUtils.replaceCommasWithPeriod(newAmountWithoutSpaces);
             // Use a shallow copy of selection to trigger setSelection
             // More info: https://github.com/Expensify/App/issues/16385
-            if (!MoneyRequestUtils.validateAmount(newAmountWithoutSpaces, decimals)) {
+            if (!MoneyRequestUtils.validateAmount(finalAmount, decimals)) {
                 setSelection((prevSelection) => ({...prevSelection}));
                 return;
             }
 
             // setCurrentAmount contains another setState(setSelection) making it error-prone since it is leading to setSelection being called twice for a single setCurrentAmount call. This solution introducing the hasSelectionBeenSet flag was chosen for its simplicity and lower risk of future errors https://github.com/Expensify/App/issues/23300#issuecomment-1766314724.
 
+            willSelectionBeUpdatedManually.current = true;
             let hasSelectionBeenSet = false;
             setCurrentAmount((prevAmount) => {
-                const strippedAmount = MoneyRequestUtils.stripCommaFromAmount(newAmountWithoutSpaces);
+                const strippedAmount = MoneyRequestUtils.stripCommaFromAmount(finalAmount);
                 const isForwardDelete = prevAmount.length > strippedAmount.length && forwardDeletePressedRef.current;
                 if (!hasSelectionBeenSet) {
                     hasSelectionBeenSet = true;
                     setSelection((prevSelection) => getNewSelection(prevSelection, isForwardDelete ? strippedAmount.length : prevAmount.length, strippedAmount.length));
+                    willSelectionBeUpdatedManually.current = false;
                 }
                 onAmountChange?.(strippedAmount);
                 return strippedAmount;
@@ -160,18 +206,24 @@ function MoneyRequestAmountInput(
     }));
 
     useEffect(() => {
-        if (!currency || typeof amount !== 'number') {
+        if ((!currency || typeof amount !== 'number' || (formatAmountOnBlur && isTextInputFocused(textInput))) ?? shouldKeepUserInput) {
             return;
         }
-        const frontendAmount = amount ? CurrencyUtils.convertToFrontendAmount(amount).toString() : '';
+        const frontendAmount = onFormatAmount(amount, currency);
         setCurrentAmount(frontendAmount);
-        setSelection({
-            start: frontendAmount.length,
-            end: frontendAmount.length,
-        });
+
+        // Only update selection if the amount prop was changed from the outside and is not the same as the current amount we just computed
+        // In the line below the currentAmount is not immediately updated, it should still hold the previous value.
+        if (frontendAmount !== currentAmount) {
+            setSelection({
+                start: frontendAmount.length,
+                end: frontendAmount.length,
+            });
+        }
+
         // we want to re-initialize the state only when the amount changes
-        // eslint-disable-next-line react-hooks/exhaustive-deps
-    }, [amount]);
+        // eslint-disable-next-line react-compiler/react-compiler, react-hooks/exhaustive-deps
+    }, [amount, shouldKeepUserInput]);
 
     // Modifies the amount to match the decimals for changed currency.
     useEffect(() => {
@@ -184,7 +236,7 @@ function MoneyRequestAmountInput(
         setNewAmount(MoneyRequestUtils.stripDecimalsFromAmount(currentAmount));
 
         // we want to update only when decimals change (setNewAmount also changes when decimals change).
-        // eslint-disable-next-line react-hooks/exhaustive-deps
+        // eslint-disable-next-line react-compiler/react-compiler, react-hooks/exhaustive-deps
     }, [setNewAmount]);
 
     /**
@@ -204,13 +256,41 @@ function MoneyRequestAmountInput(
         forwardDeletePressedRef.current = key === 'delete' || ((operatingSystem === CONST.OS.MAC_OS || operatingSystem === CONST.OS.IOS) && nativeEvent?.ctrlKey && key === 'd');
     };
 
+    const formatAmount = useCallback(() => {
+        if (!formatAmountOnBlur) {
+            return;
+        }
+        const formattedAmount = onFormatAmount(amount, currency);
+        if (maxLength && formattedAmount.length > maxLength) {
+            return;
+        }
+        setCurrentAmount(formattedAmount);
+        setSelection({
+            start: formattedAmount.length,
+            end: formattedAmount.length,
+        });
+    }, [amount, currency, onFormatAmount, formatAmountOnBlur, maxLength]);
+
     const formattedAmount = MoneyRequestUtils.replaceAllDigits(currentAmount, toLocaleDigit);
 
+    const {setMouseDown, setMouseUp} = useMouseContext();
+    const handleMouseDown = (e: React.MouseEvent<Element, MouseEvent>) => {
+        e.stopPropagation();
+        setMouseDown();
+    };
+    const handleMouseUp = (e: React.MouseEvent<Element, MouseEvent>) => {
+        e.stopPropagation();
+        setMouseUp();
+    };
+
     return (
         <TextInputWithCurrencySymbol
+            autoGrow={autoGrow}
+            disableKeyboard={disableKeyboard}
             formattedAmount={formattedAmount}
             onChangeAmount={setNewAmount}
             onCurrencyButtonPress={onCurrencyButtonPress}
+            onBlur={formatAmount}
             placeholder={numberFormat(0)}
             ref={(ref) => {
                 if (typeof forwardedRef === 'function') {
@@ -219,11 +299,16 @@ function MoneyRequestAmountInput(
                     // eslint-disable-next-line no-param-reassign
                     forwardedRef.current = ref;
                 }
+                // eslint-disable-next-line react-compiler/react-compiler
                 textInput.current = ref;
             }}
             selectedCurrencyCode={currency}
             selection={selection}
             onSelectionChange={(e: NativeSyntheticEvent<TextInputSelectionChangeEventData>) => {
+                if (shouldIgnoreSelectionWhenUpdatedManually && willSelectionBeUpdatedManually.current) {
+                    willSelectionBeUpdatedManually.current = false;
+                    return;
+                }
                 if (!shouldUpdateSelection) {
                     return;
                 }
@@ -241,6 +326,11 @@ function MoneyRequestAmountInput(
             prefixStyle={props.prefixStyle}
             prefixContainerStyle={props.prefixContainerStyle}
             touchableInputWrapperStyle={props.touchableInputWrapperStyle}
+            maxLength={maxLength}
+            hideFocusedState={hideFocusedState}
+            onMouseDown={handleMouseDown}
+            onMouseUp={handleMouseUp}
+            contentWidth={contentWidth}
         />
     );
 }
@@ -248,4 +338,4 @@ function MoneyRequestAmountInput(
 MoneyRequestAmountInput.displayName = 'MoneyRequestAmountInput';
 
 export default React.forwardRef(MoneyRequestAmountInput);
-export type {CurrentMoney, MoneyRequestAmountInputRef};
+export type {CurrentMoney, MoneyRequestAmountInputProps, MoneyRequestAmountInputRef};
diff --git a/src/components/MoneyRequestConfirmationList.tsx b/src/components/MoneyRequestConfirmationList.tsx
index 4c5bb4d45318..f1087071ef9d 100755
--- a/src/components/MoneyRequestConfirmationList.tsx
+++ b/src/components/MoneyRequestConfirmationList.tsx
@@ -1,18 +1,17 @@
-import {useIsFocused} from '@react-navigation/native';
-import {format} from 'date-fns';
-import Str from 'expensify-common/lib/str';
-import React, {useCallback, useEffect, useMemo, useReducer, useState} from 'react';
-import {View} from 'react-native';
-import type {StyleProp, ViewStyle} from 'react-native';
-import {withOnyx} from 'react-native-onyx';
-import type {OnyxCollection, OnyxEntry} from 'react-native-onyx';
+import {useFocusEffect, useIsFocused} from '@react-navigation/native';
+import lodashIsEqual from 'lodash/isEqual';
+import React, {memo, useCallback, useEffect, useMemo, useRef, useState} from 'react';
+import {InteractionManager, View} from 'react-native';
+import {useOnyx, withOnyx} from 'react-native-onyx';
+import type {OnyxEntry} from 'react-native-onyx';
 import useCurrentUserPersonalDetails from '@hooks/useCurrentUserPersonalDetails';
+import useDebouncedState from '@hooks/useDebouncedState';
 import useLocalize from '@hooks/useLocalize';
-import useNetwork from '@hooks/useNetwork';
+import {MouseProvider} from '@hooks/useMouseContext';
 import usePermissions from '@hooks/usePermissions';
 import usePrevious from '@hooks/usePrevious';
-import useTheme from '@hooks/useTheme';
 import useThemeStyles from '@hooks/useThemeStyles';
+import blurActiveElement from '@libs/Accessibility/blurActiveElement';
 import * as CurrencyUtils from '@libs/CurrencyUtils';
 import DistanceRequestUtils from '@libs/DistanceRequestUtils';
 import type {MileageRate} from '@libs/DistanceRequestUtils';
@@ -22,52 +21,50 @@ import * as MoneyRequestUtils from '@libs/MoneyRequestUtils';
 import Navigation from '@libs/Navigation/Navigation';
 import * as OptionsListUtils from '@libs/OptionsListUtils';
 import * as PolicyUtils from '@libs/PolicyUtils';
-import {isTaxTrackingEnabled} from '@libs/PolicyUtils';
-import * as ReceiptUtils from '@libs/ReceiptUtils';
+import {getCustomUnitRate, isTaxTrackingEnabled} from '@libs/PolicyUtils';
 import * as ReportUtils from '@libs/ReportUtils';
-import {getDefaultWorkspaceAvatar} from '@libs/ReportUtils';
 import playSound, {SOUNDS} from '@libs/Sound';
 import * as TransactionUtils from '@libs/TransactionUtils';
-import tryResolveUrlFromApiRoot from '@libs/tryResolveUrlFromApiRoot';
-import * as UserUtils from '@libs/UserUtils';
 import * as IOU from '@userActions/IOU';
+import {hasInvoicingDetails} from '@userActions/Policy/Policy';
 import type {IOUAction, IOUType} from '@src/CONST';
 import CONST from '@src/CONST';
+import type {TranslationPaths} from '@src/languages/types';
 import ONYXKEYS from '@src/ONYXKEYS';
 import ROUTES from '@src/ROUTES';
 import type {Route} from '@src/ROUTES';
 import type * as OnyxTypes from '@src/types/onyx';
 import type {Participant} from '@src/types/onyx/IOU';
 import type {PaymentMethodType} from '@src/types/onyx/OriginalMessage';
+import type {SplitShares} from '@src/types/onyx/Transaction';
+import {isEmptyObject} from '@src/types/utils/EmptyObject';
 import ButtonWithDropdownMenu from './ButtonWithDropdownMenu';
 import type {DropdownOption} from './ButtonWithDropdownMenu/types';
-import ConfirmedRoute from './ConfirmedRoute';
-import ConfirmModal from './ConfirmModal';
 import FormHelpMessage from './FormHelpMessage';
-import MenuItem from './MenuItem';
-import MenuItemWithTopDescription from './MenuItemWithTopDescription';
-import {usePersonalDetails} from './OnyxProvider';
-import OptionsSelector from './OptionsSelector';
-import PDFThumbnail from './PDFThumbnail';
-import ReceiptEmptyState from './ReceiptEmptyState';
-import ReceiptImage from './ReceiptImage';
+import MoneyRequestAmountInput from './MoneyRequestAmountInput';
+import MoneyRequestConfirmationListFooter from './MoneyRequestConfirmationListFooter';
+import {PressableWithFeedback} from './Pressable';
+import SelectionList from './SelectionList';
+import type {SectionListDataType} from './SelectionList/types';
+import UserListItem from './SelectionList/UserListItem';
 import SettlementButton from './SettlementButton';
-import ShowMoreButton from './ShowMoreButton';
-import Switch from './Switch';
 import Text from './Text';
 
 type MoneyRequestConfirmationListOnyxProps = {
     /** Collection of categories attached to a policy */
     policyCategories: OnyxEntry<OnyxTypes.PolicyCategories>;
 
+    /** Collection of draft categories attached to a policy */
+    policyCategoriesDraft: OnyxEntry<OnyxTypes.PolicyCategories>;
+
     /** Collection of tags attached to a policy */
-    policyTags: OnyxEntry<OnyxTypes.PolicyTagList>;
+    policyTags: OnyxEntry<OnyxTypes.PolicyTagLists>;
 
     /** The policy of the report */
     policy: OnyxEntry<OnyxTypes.Policy>;
 
-    /** The session of the logged in user */
-    session: OnyxEntry<OnyxTypes.Session>;
+    /** The draft policy of the report */
+    policyDraft: OnyxEntry<OnyxTypes.Policy>;
 
     /** Unit and rate used for if the expense is a distance expense */
     mileageRates: OnyxEntry<Record<string, MileageRate>>;
@@ -78,8 +75,8 @@ type MoneyRequestConfirmationListOnyxProps = {
     /** Last selected distance rates */
     lastSelectedDistanceRates: OnyxEntry<Record<string, string>>;
 
-    /** The list of all policies */
-    allPolicies: OnyxCollection<OnyxTypes.Policy>;
+    /** List of currencies */
+    currencyList: OnyxEntry<OnyxTypes.CurrencyList>;
 };
 
 type MoneyRequestConfirmationListProps = MoneyRequestConfirmationListOnyxProps & {
@@ -89,12 +86,6 @@ type MoneyRequestConfirmationListProps = MoneyRequestConfirmationListOnyxProps &
     /** Callback to parent modal to pay someone */
     onSendMoney?: (paymentMethod: PaymentMethodType | undefined) => void;
 
-    /** Callback to inform a participant is selected */
-    onSelectParticipant?: (option: Participant) => void;
-
-    /** Should we request a single or multiple participant selection from user */
-    hasMultipleParticipants: boolean;
-
     /** IOU amount */
     iouAmount: number;
 
@@ -126,10 +117,7 @@ type MoneyRequestConfirmationListProps = MoneyRequestConfirmationListOnyxProps &
     selectedParticipants: Participant[];
 
     /** Payee of the expense with login */
-    payeePersonalDetails?: OnyxEntry<OnyxTypes.PersonalDetails>;
-
-    /** Can the participants be modified or not */
-    canModifyParticipants?: boolean;
+    payeePersonalDetails?: OnyxEntry<OnyxTypes.PersonalDetails> | null;
 
     /** Should the list be read only, and not editable? */
     isReadOnly?: boolean;
@@ -149,21 +137,18 @@ type MoneyRequestConfirmationListProps = MoneyRequestConfirmationListOnyxProps &
     /** File name of the receipt */
     receiptFilename?: string;
 
-    /** List styles for OptionsSelector */
-    listStyles?: StyleProp<ViewStyle>;
-
     /** Transaction that represents the expense */
     transaction?: OnyxEntry<OnyxTypes.Transaction>;
 
     /** Whether the expense is a distance expense */
     isDistanceRequest?: boolean;
 
-    /** Whether the expense is a scan expense */
-    isScanRequest?: boolean;
-
     /** Whether we're editing a split expense */
     isEditingSplitBill?: boolean;
 
+    /** Whether we can navigate to receipt page */
+    shouldDisplayReceipt?: boolean;
+
     /** Whether we should show the amount, date, and merchant fields. */
     shouldShowSmartScanFields?: boolean;
 
@@ -178,25 +163,25 @@ type MoneyRequestConfirmationListProps = MoneyRequestConfirmationListOnyxProps &
 
     /** The action to take */
     action?: IOUAction;
-};
 
-const getTaxAmount = (transaction: OnyxEntry<OnyxTypes.Transaction>, defaultTaxValue: string) => {
-    const percentage = (transaction?.taxRate ? transaction?.taxRate?.data?.value : defaultTaxValue) ?? '';
-    return TransactionUtils.calculateTaxAmount(percentage, transaction?.amount ?? 0);
+    /** Should play sound on confirmation */
+    shouldPlaySound?: boolean;
 };
 
+type MoneyRequestConfirmationListItem = Participant | ReportUtils.OptionData;
+
 function MoneyRequestConfirmationList({
-    transaction = null,
+    transaction,
     onSendMoney,
     onConfirm,
-    onSelectParticipant,
     iouType = CONST.IOU.TYPE.SUBMIT,
-    isScanRequest = false,
     iouAmount,
-    policyCategories,
-    mileageRates,
+    policyCategories: policyCategoriesReal,
+    policyCategoriesDraft,
+    mileageRates: mileageRatesReal,
     isDistanceRequest = false,
-    policy,
+    policy: policyReal,
+    policyDraft,
     isPolicyExpenseChat = false,
     iouCategory = '',
     shouldShowSmartScanFields = true,
@@ -204,11 +189,8 @@ function MoneyRequestConfirmationList({
     policyTags,
     iouCurrencyCode,
     iouMerchant,
-    hasMultipleParticipants,
     selectedParticipants: selectedParticipantsProp,
     payeePersonalDetails: payeePersonalDetailsProp,
-    canModifyParticipants: canModifyParticipantsProp = false,
-    session,
     isReadOnly = false,
     bankAccountRoute = '',
     policyID = '',
@@ -216,7 +198,6 @@ function MoneyRequestConfirmationList({
     receiptPath = '',
     iouComment,
     receiptFilename = '',
-    listStyles,
     iouCreated,
     iouIsBillable = false,
     onToggleBillable,
@@ -224,109 +205,104 @@ function MoneyRequestConfirmationList({
     reportActionID,
     defaultMileageRate,
     lastSelectedDistanceRates,
-    allPolicies,
     action = CONST.IOU.ACTION.CREATE,
+    currencyList,
+    shouldDisplayReceipt = false,
+    shouldPlaySound = true,
 }: MoneyRequestConfirmationListProps) {
-    const theme = useTheme();
+    const policy = policyReal ?? policyDraft;
+    const policyCategories = policyCategoriesReal ?? policyCategoriesDraft;
+    const [mileageRatesDraft] = useOnyx(`${ONYXKEYS.COLLECTION.POLICY_DRAFTS}${policyID || '-1'}`, {
+        selector: (selectedPolicy: OnyxEntry<OnyxTypes.Policy>) => DistanceRequestUtils.getMileageRates(selectedPolicy),
+    });
+    const mileageRates = isEmptyObject(mileageRatesReal) ? mileageRatesDraft : mileageRatesReal;
+
     const styles = useThemeStyles();
     const {translate, toLocaleDigit} = useLocalize();
     const currentUserPersonalDetails = useCurrentUserPersonalDetails();
-    const personalDetails = usePersonalDetails();
-    const {canUseP2PDistanceRequests, canUseViolations} = usePermissions(iouType);
-    const {isOffline} = useNetwork();
+    const {canUseP2PDistanceRequests} = usePermissions(iouType);
 
     const isTypeRequest = iouType === CONST.IOU.TYPE.SUBMIT;
     const isTypeSplit = iouType === CONST.IOU.TYPE.SPLIT;
     const isTypeSend = iouType === CONST.IOU.TYPE.PAY;
     const isTypeTrackExpense = iouType === CONST.IOU.TYPE.TRACK;
     const isTypeInvoice = iouType === CONST.IOU.TYPE.INVOICE;
+    const isScanRequest = useMemo(() => TransactionUtils.isScanRequest(transaction), [transaction]);
 
-    const transactionID = transaction?.transactionID ?? '';
-    const customUnitRateID = TransactionUtils.getRateID(transaction) ?? '';
+    const transactionID = transaction?.transactionID ?? '-1';
+    const customUnitRateID = TransactionUtils.getRateID(transaction) ?? '-1';
 
     useEffect(() => {
-        if (customUnitRateID || !canUseP2PDistanceRequests) {
+        if ((customUnitRateID && customUnitRateID !== '-1') || !isDistanceRequest) {
             return;
         }
-        if (!customUnitRateID) {
-            const rateID = lastSelectedDistanceRates?.[policy?.id ?? ''] ?? defaultMileageRate?.customUnitRateID ?? '';
-            IOU.setCustomUnitRateID(transactionID, rateID);
-        }
-    }, [defaultMileageRate, customUnitRateID, lastSelectedDistanceRates, policy?.id, canUseP2PDistanceRequests, transactionID]);
+
+        const defaultRate = defaultMileageRate?.customUnitRateID ?? '';
+        const lastSelectedRate = lastSelectedDistanceRates?.[policy?.id ?? ''] ?? defaultRate;
+        const rateID = canUseP2PDistanceRequests ? lastSelectedRate : defaultRate;
+        IOU.setCustomUnitRateID(transactionID, rateID);
+    }, [defaultMileageRate, customUnitRateID, lastSelectedDistanceRates, policy?.id, canUseP2PDistanceRequests, transactionID, isDistanceRequest]);
 
     const policyCurrency = policy?.outputCurrency ?? PolicyUtils.getPersonalPolicy()?.outputCurrency ?? CONST.CURRENCY.USD;
 
-    const mileageRate = TransactionUtils.isCustomUnitRateIDForP2P(transaction)
-        ? DistanceRequestUtils.getRateForP2P(policyCurrency)
-        : mileageRates?.[customUnitRateID] ?? DistanceRequestUtils.getDefaultMileageRate(policy);
+    const mileageRate = TransactionUtils.isCustomUnitRateIDForP2P(transaction) ? DistanceRequestUtils.getRateForP2P(policyCurrency) : mileageRates?.[customUnitRateID] ?? defaultMileageRate;
 
     const {unit, rate} = mileageRate ?? {};
 
-    const distance = TransactionUtils.getDistance(transaction);
     const prevRate = usePrevious(rate);
-    const prevDistance = usePrevious(distance);
-    const shouldCalculateDistanceAmount = isDistanceRequest && (iouAmount === 0 || prevRate !== rate || prevDistance !== distance);
 
     const currency = (mileageRate as MileageRate)?.currency ?? policyCurrency;
 
-    const taxRates = policy?.taxRates ?? null;
-
     // A flag for showing the categories field
-    const shouldShowCategories = isPolicyExpenseChat && (!!iouCategory || OptionsListUtils.hasEnabledOptions(Object.values(policyCategories ?? {})));
-
-    // A flag and a toggler for showing the rest of the form fields
-    const [shouldExpandFields, toggleShouldExpandFields] = useReducer((state) => !state, false);
+    const shouldShowCategories = (isPolicyExpenseChat || isTypeInvoice) && (!!iouCategory || OptionsListUtils.hasEnabledOptions(Object.values(policyCategories ?? {})));
 
-    // Do not hide fields in case of paying someone
-    const shouldShowAllFields = !!isDistanceRequest || shouldExpandFields || !shouldShowSmartScanFields || isTypeSend || !!isEditingSplitBill;
-
-    // In Send Money and Split Bill with Scan flow, we don't allow the Merchant or Date to be edited. For distance requests, don't show the merchant as there's already another "Distance" menu item
-    const shouldShowDate = (shouldShowSmartScanFields || isDistanceRequest) && !isTypeSend;
     const shouldShowMerchant = shouldShowSmartScanFields && !isDistanceRequest && !isTypeSend;
 
     const policyTagLists = useMemo(() => PolicyUtils.getTagLists(policyTags), [policyTags]);
 
-    const senderWorkspace = useMemo(() => {
-        const senderWorkspaceParticipant = selectedParticipantsProp.find((participant) => participant.isSender);
-        return allPolicies?.[`${ONYXKEYS.COLLECTION.POLICY}${senderWorkspaceParticipant?.policyID}`];
-    }, [allPolicies, selectedParticipantsProp]);
+    const shouldShowTax = isTaxTrackingEnabled(isPolicyExpenseChat, policy, isDistanceRequest);
+
+    const previousTransactionAmount = usePrevious(transaction?.amount);
+    const previousTransactionCurrency = usePrevious(transaction?.currency);
+    const previousTransactionModifiedCurrency = usePrevious(transaction?.modifiedCurrency);
+    const previousCustomUnitRateID = usePrevious(customUnitRateID);
+    useEffect(() => {
+        // previousTransaction is in the condition because if it is falsey, it means this is the first time the useEffect is triggered after we load it, so we should calculate the default
+        // tax even if the other parameters are the same against their previous values.
+        if (
+            !shouldShowTax ||
+            !transaction ||
+            (transaction.taxCode &&
+                previousTransactionModifiedCurrency === transaction.modifiedCurrency &&
+                previousTransactionCurrency === transaction.currency &&
+                previousCustomUnitRateID === customUnitRateID)
+        ) {
+            return;
+        }
+        const defaultTaxCode = TransactionUtils.getDefaultTaxCode(policy, transaction);
+        IOU.setMoneyRequestTaxRate(transactionID, defaultTaxCode ?? '');
+    }, [customUnitRateID, policy, previousCustomUnitRateID, previousTransactionCurrency, previousTransactionModifiedCurrency, shouldShowTax, transaction, transactionID]);
 
-    const canUpdateSenderWorkspace = useMemo(() => PolicyUtils.canSendInvoice(allPolicies) && !!transaction?.isFromGlobalCreate, [allPolicies, transaction?.isFromGlobalCreate]);
+    const isMovingTransactionFromTrackExpense = IOUUtils.isMovingTransactionFromTrackExpense(action);
 
-    // A flag for showing the tags field
-    const shouldShowTags = useMemo(() => isPolicyExpenseChat && OptionsListUtils.hasEnabledTags(policyTagLists), [isPolicyExpenseChat, policyTagLists]);
+    const distance = TransactionUtils.getDistanceInMeters(transaction, unit);
+    const prevDistance = usePrevious(distance);
 
-    // A flag for showing tax rate
-    const shouldShowTax = isTaxTrackingEnabled(isPolicyExpenseChat, policy);
+    const shouldCalculateDistanceAmount = isDistanceRequest && (iouAmount === 0 || prevRate !== rate || prevDistance !== distance);
 
-    // A flag for showing the billable field
-    const shouldShowBillable = policy?.disabledFields?.defaultBillable === false;
-    const isMovingTransactionFromTrackExpense = IOUUtils.isMovingTransactionFromTrackExpense(action);
     const hasRoute = TransactionUtils.hasRoute(transaction, isDistanceRequest);
     const isDistanceRequestWithPendingRoute = isDistanceRequest && (!hasRoute || !rate) && !isMovingTransactionFromTrackExpense;
+    const distanceRequestAmount = DistanceRequestUtils.getDistanceRequestAmount(distance, unit ?? CONST.CUSTOM_UNITS.DISTANCE_UNIT_MILES, rate ?? 0);
     const formattedAmount = isDistanceRequestWithPendingRoute
         ? ''
-        : CurrencyUtils.convertToDisplayString(
-              shouldCalculateDistanceAmount ? DistanceRequestUtils.getDistanceRequestAmount(distance, unit ?? CONST.CUSTOM_UNITS.DISTANCE_UNIT_MILES, rate ?? 0) : iouAmount,
-              isDistanceRequest ? currency : iouCurrencyCode,
-          );
-    const formattedTaxAmount = CurrencyUtils.convertToDisplayString(transaction?.taxAmount, iouCurrencyCode);
-    const taxRateTitle = taxRates && transaction ? TransactionUtils.getDefaultTaxName(taxRates, transaction) : '';
-
-    const previousTransactionAmount = usePrevious(transaction?.amount);
+        : CurrencyUtils.convertToDisplayString(shouldCalculateDistanceAmount ? distanceRequestAmount : iouAmount, isDistanceRequest ? currency : iouCurrencyCode);
 
     const isFocused = useIsFocused();
-    const [formError, setFormError] = useState('');
+    const [formError, debouncedFormError, setFormError] = useDebouncedState<TranslationPaths | ''>('');
 
     const [didConfirm, setDidConfirm] = useState(false);
     const [didConfirmSplit, setDidConfirmSplit] = useState(false);
 
-    const [isAttachmentInvalid, setIsAttachmentInvalid] = useState(false);
-
-    const navigateBack = () => {
-        Navigation.goBack(ROUTES.MONEY_REQUEST_CREATE_TAB_SCAN.getRoute(CONST.IOU.ACTION.CREATE, iouType, transactionID, reportID));
-    };
-
     const shouldDisplayFieldError: boolean = useMemo(() => {
         if (!isEditingSplitBill) {
             return false;
@@ -335,57 +311,109 @@ function MoneyRequestConfirmationList({
         return (!!hasSmartScanFailed && TransactionUtils.hasMissingSmartscanFields(transaction)) || (didConfirmSplit && TransactionUtils.areRequiredFieldsEmpty(transaction));
     }, [isEditingSplitBill, hasSmartScanFailed, transaction, didConfirmSplit]);
 
-    const isMerchantEmpty = !iouMerchant || iouMerchant === CONST.TRANSACTION.PARTIAL_TRANSACTION_MERCHANT;
-    const isMerchantRequired = isPolicyExpenseChat && !isScanRequest && shouldShowMerchant;
+    const isMerchantEmpty = useMemo(() => !iouMerchant || TransactionUtils.isMerchantMissing(transaction), [transaction, iouMerchant]);
+    const isMerchantRequired = isPolicyExpenseChat && (!isScanRequest || isEditingSplitBill) && shouldShowMerchant;
 
-    const shouldDisplayMerchantError = isMerchantRequired && (shouldDisplayFieldError || formError === 'iou.error.invalidMerchant') && isMerchantEmpty;
+    const isCategoryRequired = !!policy?.requiresCategory;
 
-    const isCategoryRequired = canUseViolations && !!policy?.requiresCategory;
+    const shouldDisableParticipant = (participant: Participant): boolean => {
+        if (ReportUtils.isDraftReport(participant.reportID)) {
+            return true;
+        }
 
-    useEffect(() => {
-        if (shouldDisplayFieldError && hasSmartScanFailed) {
-            setFormError('iou.receiptScanningFailed');
-            return;
+        if (!participant.isInvoiceRoom && !participant.isPolicyExpenseChat && !participant.isSelfDM && ReportUtils.isOptimisticPersonalDetail(participant.accountID ?? -1)) {
+            return true;
         }
+
+        return false;
+    };
+
+    useEffect(() => {
         if (shouldDisplayFieldError && didConfirmSplit) {
             setFormError('iou.error.genericSmartscanFailureMessage');
             return;
         }
+        if (shouldDisplayFieldError && hasSmartScanFailed) {
+            setFormError('iou.receiptScanningFailed');
+            return;
+        }
         // reset the form error whenever the screen gains or loses focus
         setFormError('');
+
+        // eslint-disable-next-line react-compiler/react-compiler, react-hooks/exhaustive-deps -- we don't want this effect to run if it's just setFormError that changes
     }, [isFocused, transaction, shouldDisplayFieldError, hasSmartScanFailed, didConfirmSplit]);
 
+    const isFirstUpdatedDistanceAmount = useRef(false);
+
     useEffect(() => {
-        if (!shouldCalculateDistanceAmount) {
+        if (isFirstUpdatedDistanceAmount.current) {
+            return;
+        }
+        if (!isDistanceRequest) {
             return;
         }
-
         const amount = DistanceRequestUtils.getDistanceRequestAmount(distance, unit ?? CONST.CUSTOM_UNITS.DISTANCE_UNIT_MILES, rate ?? 0);
         IOU.setMoneyRequestAmount(transactionID, amount, currency ?? '');
-    }, [shouldCalculateDistanceAmount, distance, rate, unit, transactionID, currency]);
+        isFirstUpdatedDistanceAmount.current = true;
+    }, [distance, rate, unit, transactionID, currency, isDistanceRequest]);
 
-    // Calculate and set tax amount in transaction draft
     useEffect(() => {
-        const taxAmount = getTaxAmount(transaction, taxRates?.defaultValue ?? '').toString();
-        const amountInSmallestCurrencyUnits = CurrencyUtils.convertToBackendAmount(Number.parseFloat(taxAmount));
+        if (!shouldCalculateDistanceAmount) {
+            return;
+        }
 
-        if (transaction?.taxAmount && previousTransactionAmount === transaction?.amount) {
-            return IOU.setMoneyRequestTaxAmount(transaction?.transactionID, transaction?.taxAmount, true);
+        const amount = distanceRequestAmount;
+        IOU.setMoneyRequestAmount(transactionID, amount, currency ?? '');
+
+        // If it's a split request among individuals, set the split shares
+        const participantAccountIDs: number[] = selectedParticipantsProp.map((participant) => participant.accountID ?? -1);
+        if (isTypeSplit && !isPolicyExpenseChat && amount && transaction?.currency) {
+            IOU.setSplitShares(transaction, amount, currency, participantAccountIDs);
         }
+    }, [shouldCalculateDistanceAmount, distanceRequestAmount, transactionID, currency, isTypeSplit, isPolicyExpenseChat, selectedParticipantsProp, transaction]);
 
-        IOU.setMoneyRequestTaxAmount(transactionID, amountInSmallestCurrencyUnits, true);
-    }, [taxRates?.defaultValue, transaction, transactionID, previousTransactionAmount]);
+    const previousTaxCode = usePrevious(transaction?.taxCode);
 
-    /**
-     * Returns the participants with amount
-     */
-    const getParticipantsWithAmount = useCallback(
-        (participantsList: Participant[]) => {
-            const amount = IOUUtils.calculateAmount(participantsList.length, iouAmount, iouCurrencyCode ?? '');
-            return OptionsListUtils.getIOUConfirmationOptionsFromParticipants(participantsList, amount > 0 ? CurrencyUtils.convertToDisplayString(amount, iouCurrencyCode) : '');
-        },
-        [iouAmount, iouCurrencyCode],
-    );
+    // Calculate and set tax amount in transaction draft
+    useEffect(() => {
+        if (
+            !shouldShowTax ||
+            !transaction ||
+            (transaction.taxAmount !== undefined &&
+                previousTransactionAmount === transaction.amount &&
+                previousTransactionCurrency === transaction.currency &&
+                previousCustomUnitRateID === customUnitRateID &&
+                previousTaxCode === transaction.taxCode)
+        ) {
+            return;
+        }
+
+        let taxableAmount: number;
+        let taxCode: string;
+        if (isDistanceRequest) {
+            const customUnitRate = getCustomUnitRate(policy, customUnitRateID);
+            taxCode = customUnitRate?.attributes?.taxRateExternalID ?? '';
+            taxableAmount = DistanceRequestUtils.getTaxableAmount(policy, customUnitRateID, distance);
+        } else {
+            taxableAmount = transaction.amount ?? 0;
+            taxCode = transaction.taxCode ?? TransactionUtils.getDefaultTaxCode(policy, transaction) ?? '';
+        }
+        const taxPercentage = TransactionUtils.getTaxValue(policy, transaction, taxCode) ?? '';
+        const taxAmount = TransactionUtils.calculateTaxAmount(taxPercentage, taxableAmount, transaction.currency);
+        const taxAmountInSmallestCurrencyUnits = CurrencyUtils.convertToBackendAmount(Number.parseFloat(taxAmount.toString()));
+        IOU.setMoneyRequestTaxAmount(transaction.transactionID ?? '', taxAmountInSmallestCurrencyUnits);
+    }, [
+        policy,
+        shouldShowTax,
+        previousTransactionAmount,
+        previousTransactionCurrency,
+        transaction,
+        isDistanceRequest,
+        customUnitRateID,
+        previousCustomUnitRateID,
+        previousTaxCode,
+        distance,
+    ]);
 
     // If completing a split expense fails, set didConfirm to false to allow the user to edit the fields again
     if (isEditingSplitBill && didConfirm) {
@@ -395,7 +423,11 @@ function MoneyRequestConfirmationList({
     const splitOrRequestOptions: Array<DropdownOption<string>> = useMemo(() => {
         let text;
         if (isTypeInvoice) {
-            text = translate('iou.sendInvoice', {amount: formattedAmount});
+            if (hasInvoicingDetails(policy)) {
+                text = translate('iou.sendInvoice', {amount: formattedAmount});
+            } else {
+                text = translate('common.next');
+            }
         } else if (isTypeTrackExpense) {
             text = translate('iou.trackExpense');
         } else if (isTypeSplit && iouAmount === 0) {
@@ -415,89 +447,210 @@ function MoneyRequestConfirmationList({
                 value: iouType,
             },
         ];
-    }, [isTypeTrackExpense, isTypeSplit, iouAmount, receiptPath, isTypeRequest, isDistanceRequestWithPendingRoute, iouType, translate, formattedAmount, isTypeInvoice]);
+    }, [isTypeTrackExpense, isTypeSplit, iouAmount, receiptPath, isTypeRequest, policy, isDistanceRequestWithPendingRoute, iouType, translate, formattedAmount, isTypeInvoice]);
+
+    const onSplitShareChange = useCallback(
+        (accountID: number, value: number) => {
+            if (!transaction?.transactionID) {
+                return;
+            }
+            const amountInCents = CurrencyUtils.convertToBackendAmount(value);
+            IOU.setIndividualShare(transaction?.transactionID, accountID, amountInCents);
+        },
+        [transaction],
+    );
+
+    useEffect(() => {
+        if (!isTypeSplit || !transaction?.splitShares) {
+            return;
+        }
+
+        const splitSharesMap: SplitShares = transaction.splitShares;
+        const shares: number[] = Object.values(splitSharesMap).map((splitShare) => splitShare?.amount ?? 0);
+        const sumOfShares = shares?.reduce((prev, current): number => prev + current, 0);
+        if (sumOfShares !== iouAmount) {
+            setFormError('iou.error.invalidSplit');
+            return;
+        }
+
+        const participantsWithAmount = Object.keys(transaction?.splitShares ?? {})
+            .filter((accountID: string): boolean => (transaction?.splitShares?.[Number(accountID)]?.amount ?? 0) > 0)
+            .map((accountID) => Number(accountID));
+
+        // A split must have at least two participants with amounts bigger than 0
+        if (participantsWithAmount.length === 1) {
+            setFormError('iou.error.invalidSplitParticipants');
+            return;
+        }
+
+        setFormError('');
+    }, [isFocused, transaction, isTypeSplit, transaction?.splitShares, iouAmount, iouCurrencyCode, setFormError, translate]);
+
+    useEffect(() => {
+        if (!isTypeSplit || !transaction?.splitShares) {
+            return;
+        }
+        IOU.adjustRemainingSplitShares(transaction);
+    }, [isTypeSplit, transaction]);
 
     const selectedParticipants = useMemo(() => selectedParticipantsProp.filter((participant) => participant.selected), [selectedParticipantsProp]);
     const payeePersonalDetails = useMemo(() => payeePersonalDetailsProp ?? currentUserPersonalDetails, [payeePersonalDetailsProp, currentUserPersonalDetails]);
-    const payeeTooltipDetails = useMemo(
-        () => ReportUtils.getDisplayNamesWithTooltips(OptionsListUtils.getPersonalDetailsForAccountIDs([payeePersonalDetails.accountID], personalDetails), false),
-        [payeePersonalDetails.accountID, personalDetails],
-    );
-    const payeeIcons = [
-        {
-            source: UserUtils.getAvatar(payeePersonalDetails.avatar, payeePersonalDetails.accountID) ?? '',
-            name: payeePersonalDetails.login ?? '',
-            type: CONST.ICON_TYPE_AVATAR,
-            id: payeePersonalDetails.accountID,
-        },
-    ];
-    const canModifyParticipants = !isReadOnly && canModifyParticipantsProp && hasMultipleParticipants;
-    const shouldDisablePaidBySection = canModifyParticipants;
-    const optionSelectorSections = useMemo(() => {
-        const sections = [];
-        const unselectedParticipants = selectedParticipantsProp.filter((participant) => !participant.selected);
-        if (hasMultipleParticipants) {
-            const formattedSelectedParticipants = getParticipantsWithAmount(selectedParticipants);
-            let formattedParticipantsList = [...new Set([...formattedSelectedParticipants, ...unselectedParticipants])];
-
-            if (!canModifyParticipants) {
-                formattedParticipantsList = formattedParticipantsList.map((participant) => ({
-                    ...participant,
-                    isDisabled: ReportUtils.isOptimisticPersonalDetail(participant.accountID ?? -1),
-                }));
-            }
+    const shouldShowReadOnlySplits = useMemo(() => isPolicyExpenseChat || isReadOnly || isScanRequest, [isPolicyExpenseChat, isReadOnly, isScanRequest]);
 
-            const myIOUAmount = IOUUtils.calculateAmount(selectedParticipants.length, iouAmount, iouCurrencyCode ?? '', true);
+    const splitParticipants = useMemo(() => {
+        if (!isTypeSplit) {
+            return [];
+        }
 
-            const formattedPayeeOption = OptionsListUtils.getIOUConfirmationOptionsFromPayeePersonalDetail(
-                payeePersonalDetails,
-                iouAmount > 0 ? CurrencyUtils.convertToDisplayString(myIOUAmount, iouCurrencyCode) : '',
-            );
+        const payeeOption = OptionsListUtils.getIOUConfirmationOptionsFromPayeePersonalDetail(payeePersonalDetails);
+        if (shouldShowReadOnlySplits) {
+            return [payeeOption, ...selectedParticipants].map((participantOption: Participant) => {
+                const isPayer = participantOption.accountID === payeeOption.accountID;
+                let amount: number | undefined = 0;
+                if (iouAmount > 0) {
+                    amount =
+                        transaction?.comment?.splits?.find((split) => split.accountID === participantOption.accountID)?.amount ??
+                        IOUUtils.calculateAmount(selectedParticipants.length, iouAmount, iouCurrencyCode ?? '', isPayer);
+                }
+                return {
+                    ...participantOption,
+                    isSelected: false,
+                    isInteractive: !shouldDisableParticipant(participantOption),
+                    rightElement: (
+                        <View style={[styles.flexWrap, styles.pl2]}>
+                            <Text style={[styles.textLabel]}>{amount ? CurrencyUtils.convertToDisplayString(amount, iouCurrencyCode) : ''}</Text>
+                        </View>
+                    ),
+                };
+            });
+        }
+
+        const currencySymbol = currencyList?.[iouCurrencyCode ?? '']?.symbol ?? iouCurrencyCode;
+        const formattedTotalAmount = CurrencyUtils.convertToDisplayStringWithoutCurrency(iouAmount, iouCurrencyCode);
+
+        return [payeeOption, ...selectedParticipants]
+            .filter((participantOption) => !PolicyUtils.isExpensifyTeam(participantOption.login))
+            .map((participantOption: Participant) => ({
+                ...participantOption,
+                tabIndex: -1,
+                isSelected: false,
+                isInteractive: !shouldDisableParticipant(participantOption),
+                rightElement: (
+                    <MoneyRequestAmountInput
+                        autoGrow={false}
+                        amount={transaction?.splitShares?.[participantOption.accountID ?? -1]?.amount}
+                        currency={iouCurrencyCode}
+                        prefixCharacter={currencySymbol}
+                        disableKeyboard={false}
+                        isCurrencyPressable={false}
+                        hideFocusedState={false}
+                        hideCurrencySymbol
+                        formatAmountOnBlur
+                        prefixContainerStyle={[styles.pv0]}
+                        inputStyle={[styles.optionRowAmountInput]}
+                        containerStyle={[styles.textInputContainer]}
+                        touchableInputWrapperStyle={[styles.ml3]}
+                        onFormatAmount={CurrencyUtils.convertToDisplayStringWithoutCurrency}
+                        onAmountChange={(value: string) => onSplitShareChange(participantOption.accountID ?? -1, Number(value))}
+                        maxLength={formattedTotalAmount.length}
+                        contentWidth={formattedTotalAmount.length * 8}
+                    />
+                ),
+            }));
+    }, [
+        isTypeSplit,
+        payeePersonalDetails,
+        shouldShowReadOnlySplits,
+        currencyList,
+        iouCurrencyCode,
+        iouAmount,
+        selectedParticipants,
+        styles.flexWrap,
+        styles.pl2,
+        styles.textLabel,
+        styles.pv0,
+        styles.optionRowAmountInput,
+        styles.textInputContainer,
+        styles.ml3,
+        transaction?.comment?.splits,
+        transaction?.splitShares,
+        onSplitShareChange,
+    ]);
+
+    const isSplitModified = useMemo(() => {
+        if (!transaction?.splitShares) {
+            return;
+        }
+        return Object.keys(transaction.splitShares).some((key) => transaction.splitShares?.[Number(key) ?? -1]?.isModified);
+    }, [transaction?.splitShares]);
+
+    const getSplitSectionHeader = useCallback(
+        () => (
+            <View style={[styles.mt2, styles.mb1, styles.flexRow, styles.justifyContentBetween]}>
+                <Text style={[styles.ph5, styles.textLabelSupporting]}>{translate('iou.participants')}</Text>
+                {!shouldShowReadOnlySplits && isSplitModified && (
+                    <PressableWithFeedback
+                        onPress={() => {
+                            IOU.resetSplitShares(transaction);
+                        }}
+                        accessibilityLabel={CONST.ROLE.BUTTON}
+                        role={CONST.ROLE.BUTTON}
+                        shouldUseAutoHitSlop
+                    >
+                        <Text style={[styles.pr5, styles.textLabelSupporting, styles.link]}>{translate('common.reset')}</Text>
+                    </PressableWithFeedback>
+                )}
+            </View>
+        ),
+        [
+            isSplitModified,
+            shouldShowReadOnlySplits,
+            styles.flexRow,
+            styles.justifyContentBetween,
+            styles.link,
+            styles.mb1,
+            styles.mt2,
+            styles.ph5,
+            styles.pr5,
+            styles.textLabelSupporting,
+            transaction,
+            translate,
+        ],
+    );
 
-            sections.push(
-                {
-                    title: translate('moneyRequestConfirmationList.paidBy'),
-                    data: [formattedPayeeOption],
-                    shouldShow: true,
-                    isDisabled: shouldDisablePaidBySection,
-                },
-                {
-                    title: translate('moneyRequestConfirmationList.splitWith'),
-                    data: formattedParticipantsList,
-                    shouldShow: true,
-                },
+    const sections = useMemo(() => {
+        const options: Array<SectionListDataType<MoneyRequestConfirmationListItem>> = [];
+        if (isTypeSplit) {
+            options.push(
+                ...[
+                    {
+                        title: translate('moneyRequestConfirmationList.paidBy'),
+                        data: [OptionsListUtils.getIOUConfirmationOptionsFromPayeePersonalDetail(payeePersonalDetails)],
+                        shouldShow: true,
+                    },
+                    {
+                        CustomSectionHeader: getSplitSectionHeader,
+                        data: splitParticipants,
+                        shouldShow: true,
+                    },
+                ],
             );
+            options.push();
         } else {
             const formattedSelectedParticipants = selectedParticipants.map((participant) => ({
                 ...participant,
-                isDisabled: !participant.isPolicyExpenseChat && !participant.isSelfDM && ReportUtils.isOptimisticPersonalDetail(participant.accountID ?? -1),
+                isSelected: false,
+                isInteractive: !shouldDisableParticipant(participant),
             }));
-            sections.push({
+            options.push({
                 title: translate('common.to'),
                 data: formattedSelectedParticipants,
                 shouldShow: true,
             });
         }
-        return sections;
-    }, [
-        selectedParticipants,
-        selectedParticipantsProp,
-        hasMultipleParticipants,
-        iouAmount,
-        iouCurrencyCode,
-        getParticipantsWithAmount,
-        payeePersonalDetails,
-        translate,
-        shouldDisablePaidBySection,
-        canModifyParticipants,
-    ]);
 
-    const selectedOptions = useMemo(() => {
-        if (!hasMultipleParticipants) {
-            return [];
-        }
-        return [...selectedParticipants, OptionsListUtils.getIOUConfirmationOptionsFromPayeePersonalDetail(payeePersonalDetails)];
-    }, [selectedParticipants, hasMultipleParticipants, payeePersonalDetails]);
+        return options;
+    }, [isTypeSplit, translate, payeePersonalDetails, getSplitSectionHeader, splitParticipants, selectedParticipants]);
 
     useEffect(() => {
         if (!isDistanceRequest || isMovingTransactionFromTrackExpense) {
@@ -537,7 +690,7 @@ function MoneyRequestConfirmationList({
         }
         IOU.setMoneyRequestCategory(transactionID, enabledCategories[0].name);
         // Keep 'transaction' out to ensure that we autoselect the option only once
-        // eslint-disable-next-line react-hooks/exhaustive-deps
+        // eslint-disable-next-line react-compiler/react-compiler, react-hooks/exhaustive-deps
     }, [shouldShowCategories, policyCategories, isCategoryRequired]);
 
     // Auto select the tag if there is only one enabled tag and it is required
@@ -545,7 +698,7 @@ function MoneyRequestConfirmationList({
         let updatedTagsString = TransactionUtils.getTag(transaction);
         policyTagLists.forEach((tagList, index) => {
             const enabledTags = Object.values(tagList.tags).filter((tag) => tag.enabled);
-            const isTagListRequired = tagList.required === undefined ? false : tagList.required && canUseViolations;
+            const isTagListRequired = tagList.required ?? false;
             if (!isTagListRequired || enabledTags.length !== 1 || TransactionUtils.getTag(transaction, index)) {
                 return;
             }
@@ -555,26 +708,13 @@ function MoneyRequestConfirmationList({
             IOU.setMoneyRequestTag(transactionID, updatedTagsString);
         }
         // Keep 'transaction' out to ensure that we autoselect the option only once
-        // eslint-disable-next-line react-hooks/exhaustive-deps
-    }, [policyTagLists, policyTags, canUseViolations]);
-
-    /**
-     */
-    const selectParticipant = useCallback(
-        (option: Participant) => {
-            // Return early if selected option is currently logged in user.
-            if (option.accountID === session?.accountID) {
-                return;
-            }
-            onSelectParticipant?.(option);
-        },
-        [session?.accountID, onSelectParticipant],
-    );
+        // eslint-disable-next-line react-compiler/react-compiler, react-hooks/exhaustive-deps
+    }, [policyTagLists, policyTags]);
 
     /**
      * Navigate to report details or profile of selected user
      */
-    const navigateToReportOrUserDetail = (option: ReportUtils.OptionData) => {
+    const navigateToReportOrUserDetail = (option: MoneyRequestConfirmationListItem) => {
         const activeRoute = Navigation.getActiveRouteWithoutParams();
 
         if (option.isSelfDM) {
@@ -594,10 +734,15 @@ function MoneyRequestConfirmationList({
      */
     const confirm = useCallback(
         (paymentMethod: PaymentMethodType | undefined) => {
+            if (iouType === CONST.IOU.TYPE.INVOICE && !hasInvoicingDetails(policy)) {
+                Navigation.navigate(ROUTES.MONEY_REQUEST_STEP_COMPANY_INFO.getRoute(iouType, transactionID, reportID, Navigation.getActiveRouteWithoutParams()));
+                return;
+            }
+
             if (selectedParticipants.length === 0) {
                 return;
             }
-            if (!isEditingSplitBill && isMerchantRequired && (isMerchantEmpty || (shouldDisplayFieldError && TransactionUtils.isMerchantMissing(transaction ?? null)))) {
+            if (!isEditingSplitBill && isMerchantRequired && (isMerchantEmpty || (shouldDisplayFieldError && TransactionUtils.isMerchantMissing(transaction)))) {
                 setFormError('iou.error.invalidMerchant');
                 return;
             }
@@ -606,16 +751,7 @@ function MoneyRequestConfirmationList({
                 return;
             }
 
-            if (iouType === CONST.IOU.TYPE.PAY) {
-                if (!paymentMethod) {
-                    return;
-                }
-
-                setDidConfirm(true);
-
-                Log.info(`[IOU] Sending money via: ${paymentMethod}`);
-                onSendMoney?.(paymentMethod);
-            } else {
+            if (iouType !== CONST.IOU.TYPE.PAY) {
                 // validate the amount for distance expenses
                 const decimals = CurrencyUtils.getCurrencyDecimals(iouCurrencyCode);
                 if (isDistanceRequest && !isDistanceRequestWithPendingRoute && !MoneyRequestUtils.validateAmount(String(iouAmount), decimals)) {
@@ -623,35 +759,71 @@ function MoneyRequestConfirmationList({
                     return;
                 }
 
-                if (isEditingSplitBill && TransactionUtils.areRequiredFieldsEmpty(transaction ?? null)) {
+                if (isEditingSplitBill && TransactionUtils.areRequiredFieldsEmpty(transaction)) {
                     setDidConfirmSplit(true);
                     setFormError('iou.error.genericSmartscanFailureMessage');
                     return;
                 }
 
-                playSound(SOUNDS.DONE);
+                if (formError) {
+                    return;
+                }
+
+                if (shouldPlaySound) {
+                    playSound(SOUNDS.DONE);
+                }
                 setDidConfirm(true);
                 onConfirm?.(selectedParticipants);
+            } else {
+                if (!paymentMethod) {
+                    return;
+                }
+                if (formError) {
+                    return;
+                }
+
+                setDidConfirm(true);
+
+                Log.info(`[IOU] Sending money via: ${paymentMethod}`);
+                onSendMoney?.(paymentMethod);
             }
         },
         [
             selectedParticipants,
+            isEditingSplitBill,
             isMerchantRequired,
             isMerchantEmpty,
             shouldDisplayFieldError,
             transaction,
+            iouCategory.length,
+            formError,
             iouType,
+            setFormError,
             onSendMoney,
             iouCurrencyCode,
             isDistanceRequest,
-            iouCategory,
             isDistanceRequestWithPendingRoute,
             iouAmount,
-            isEditingSplitBill,
             onConfirm,
+            shouldPlaySound,
+            transactionID,
+            reportID,
+            policy,
         ],
     );
 
+    const focusTimeoutRef = useRef<NodeJS.Timeout | null>(null);
+    useFocusEffect(
+        useCallback(() => {
+            focusTimeoutRef.current = setTimeout(() => {
+                InteractionManager.runAfterInteractions(() => {
+                    blurActiveElement();
+                });
+            }, CONST.ANIMATED_TRANSITION);
+            return () => focusTimeoutRef.current && clearTimeout(focusTimeoutRef.current);
+        }, []),
+    );
+
     const footerContent = useMemo(() => {
         if (isReadOnly) {
             return;
@@ -680,6 +852,7 @@ function MoneyRequestConfirmationList({
                     vertical: CONST.MODAL.ANCHOR_ORIGIN_VERTICAL.BOTTOM,
                 }}
                 enterKeyEventListenerPriority={1}
+                useKeyboardShortcuts
             />
         ) : (
             <ButtonWithDropdownMenu
@@ -690,6 +863,7 @@ function MoneyRequestConfirmationList({
                 options={splitOrRequestOptions}
                 buttonSize={CONST.DROPDOWN_BUTTON_SIZE.LARGE}
                 enterKeyEventListenerPriority={1}
+                useKeyboardShortcuts
             />
         );
 
@@ -699,427 +873,107 @@ function MoneyRequestConfirmationList({
                     <FormHelpMessage
                         style={[styles.ph1, styles.mb2]}
                         isError
-                        message={formError}
+                        message={isTypeSplit && !shouldShowReadOnlySplits ? debouncedFormError && translate(debouncedFormError) : translate(formError)}
                     />
                 )}
 
                 {button}
             </>
         );
-    }, [isReadOnly, iouType, selectedParticipants.length, confirm, bankAccountRoute, iouCurrencyCode, policyID, splitOrRequestOptions, formError, styles.ph1, styles.mb2]);
-
-    // An intermediate structure that helps us classify the fields as "primary" and "supplementary".
-    // The primary fields are always shown to the user, while an extra action is needed to reveal the supplementary ones.
-    const classifiedFields = [
-        {
-            item: (
-                <MenuItemWithTopDescription
-                    key={translate('iou.amount')}
-                    shouldShowRightIcon={!isReadOnly && !isDistanceRequest}
-                    title={formattedAmount}
-                    description={translate('iou.amount')}
-                    interactive={!isReadOnly}
-                    onPress={() => {
-                        if (isDistanceRequest) {
-                            return;
-                        }
-
-                        Navigation.navigate(ROUTES.MONEY_REQUEST_STEP_AMOUNT.getRoute(action, iouType, transactionID, reportID, Navigation.getActiveRouteWithoutParams()));
-                    }}
-                    style={[styles.moneyRequestMenuItem, styles.mt2]}
-                    titleStyle={styles.moneyRequestConfirmationAmount}
-                    disabled={didConfirm}
-                    brickRoadIndicator={shouldDisplayFieldError && TransactionUtils.isAmountMissing(transaction ?? null) ? CONST.BRICK_ROAD_INDICATOR_STATUS.ERROR : undefined}
-                    error={shouldDisplayFieldError && TransactionUtils.isAmountMissing(transaction ?? null) ? translate('common.error.enterAmount') : ''}
-                />
-            ),
-            shouldShow: shouldShowSmartScanFields,
-            isSupplementary: false,
-        },
-        {
-            item: (
-                <MenuItemWithTopDescription
-                    key={translate('common.description')}
-                    shouldShowRightIcon={!isReadOnly}
-                    shouldParseTitle
-                    title={iouComment}
-                    description={translate('common.description')}
-                    onPress={() => {
-                        Navigation.navigate(
-                            ROUTES.MONEY_REQUEST_STEP_DESCRIPTION.getRoute(action, iouType, transactionID, reportID, Navigation.getActiveRouteWithoutParams(), reportActionID),
-                        );
-                    }}
-                    style={[styles.moneyRequestMenuItem]}
-                    titleStyle={styles.flex1}
-                    disabled={didConfirm}
-                    interactive={!isReadOnly}
-                    numberOfLinesTitle={2}
-                />
-            ),
-            shouldShow: true,
-            isSupplementary: false,
-        },
-        {
-            item: (
-                <MenuItemWithTopDescription
-                    key={translate('common.distance')}
-                    shouldShowRightIcon={!isReadOnly && !isMovingTransactionFromTrackExpense}
-                    title={isMerchantEmpty ? '' : iouMerchant}
-                    description={translate('common.distance')}
-                    style={[styles.moneyRequestMenuItem]}
-                    titleStyle={styles.flex1}
-                    onPress={() => Navigation.navigate(ROUTES.MONEY_REQUEST_STEP_DISTANCE.getRoute(action, iouType, transactionID, reportID, Navigation.getActiveRouteWithoutParams()))}
-                    disabled={didConfirm}
-                    // todo: handle edit for transaction while moving from track expense
-                    interactive={!isReadOnly && !isMovingTransactionFromTrackExpense}
-                />
-            ),
-            shouldShow: isDistanceRequest && !canUseP2PDistanceRequests,
-            isSupplementary: false,
-        },
-        {
-            item: (
-                <MenuItemWithTopDescription
-                    key={translate('common.distance')}
-                    shouldShowRightIcon={!isReadOnly}
-                    title={DistanceRequestUtils.getDistanceForDisplay(hasRoute, distance, unit, rate, translate)}
-                    description={translate('common.distance')}
-                    style={[styles.moneyRequestMenuItem]}
-                    titleStyle={styles.flex1}
-                    onPress={() => Navigation.navigate(ROUTES.MONEY_REQUEST_STEP_DISTANCE.getRoute(action, iouType, transactionID, reportID, Navigation.getActiveRouteWithoutParams()))}
-                    disabled={didConfirm}
-                    interactive={!isReadOnly}
-                />
-            ),
-            shouldShow: isDistanceRequest && canUseP2PDistanceRequests,
-            isSupplementary: false,
-        },
-        {
-            item: (
-                <MenuItemWithTopDescription
-                    key={translate('common.rate')}
-                    shouldShowRightIcon={Boolean(rate) && !isReadOnly && isPolicyExpenseChat}
-                    title={DistanceRequestUtils.getRateForDisplay(unit, rate, currency, translate, toLocaleDigit, isOffline)}
-                    description={translate('common.rate')}
-                    style={[styles.moneyRequestMenuItem]}
-                    titleStyle={styles.flex1}
-                    onPress={() => Navigation.navigate(ROUTES.MONEY_REQUEST_STEP_DISTANCE_RATE.getRoute(action, iouType, transactionID, reportID, Navigation.getActiveRouteWithoutParams()))}
-                    disabled={didConfirm}
-                    interactive={Boolean(rate) && !isReadOnly && isPolicyExpenseChat}
-                />
-            ),
-            shouldShow: isDistanceRequest && canUseP2PDistanceRequests,
-            isSupplementary: false,
-        },
-        {
-            item: (
-                <MenuItemWithTopDescription
-                    key={translate('common.merchant')}
-                    shouldShowRightIcon={!isReadOnly}
-                    title={isMerchantEmpty ? '' : iouMerchant}
-                    description={translate('common.merchant')}
-                    style={[styles.moneyRequestMenuItem]}
-                    titleStyle={styles.flex1}
-                    onPress={() => {
-                        Navigation.navigate(ROUTES.MONEY_REQUEST_STEP_MERCHANT.getRoute(action, iouType, transactionID, reportID, Navigation.getActiveRouteWithoutParams()));
-                    }}
-                    disabled={didConfirm}
-                    interactive={!isReadOnly}
-                    brickRoadIndicator={shouldDisplayMerchantError ? CONST.BRICK_ROAD_INDICATOR_STATUS.ERROR : undefined}
-                    error={shouldDisplayMerchantError ? translate('common.error.fieldRequired') : ''}
-                    rightLabel={isMerchantRequired ? translate('common.required') : ''}
-                />
-            ),
-            shouldShow: shouldShowMerchant,
-            isSupplementary: !isMerchantRequired,
-        },
-        {
-            item: (
-                <MenuItemWithTopDescription
-                    key={translate('common.date')}
-                    shouldShowRightIcon={!isReadOnly}
-                    // eslint-disable-next-line @typescript-eslint/prefer-nullish-coalescing
-                    title={iouCreated || format(new Date(), CONST.DATE.FNS_FORMAT_STRING)}
-                    description={translate('common.date')}
-                    style={[styles.moneyRequestMenuItem]}
-                    titleStyle={styles.flex1}
-                    onPress={() => {
-                        Navigation.navigate(ROUTES.MONEY_REQUEST_STEP_DATE.getRoute(action, iouType, transactionID, reportID, Navigation.getActiveRouteWithoutParams(), reportActionID));
-                    }}
-                    disabled={didConfirm}
-                    interactive={!isReadOnly}
-                    brickRoadIndicator={shouldDisplayFieldError && TransactionUtils.isCreatedMissing(transaction) ? CONST.BRICK_ROAD_INDICATOR_STATUS.ERROR : undefined}
-                    error={shouldDisplayFieldError && TransactionUtils.isCreatedMissing(transaction) ? translate('common.error.enterDate') : ''}
-                />
-            ),
-            shouldShow: shouldShowDate,
-            isSupplementary: true,
-        },
-        {
-            item: (
-                <MenuItemWithTopDescription
-                    key={translate('common.category')}
-                    shouldShowRightIcon={!isReadOnly}
-                    title={iouCategory}
-                    description={translate('common.category')}
-                    numberOfLinesTitle={2}
-                    onPress={() =>
-                        Navigation.navigate(ROUTES.MONEY_REQUEST_STEP_CATEGORY.getRoute(action, iouType, transactionID, reportID, Navigation.getActiveRouteWithoutParams(), reportActionID))
-                    }
-                    style={[styles.moneyRequestMenuItem]}
-                    titleStyle={styles.flex1}
-                    disabled={didConfirm}
-                    interactive={!isReadOnly}
-                    rightLabel={isCategoryRequired ? translate('common.required') : ''}
-                />
-            ),
-            shouldShow: shouldShowCategories,
-            isSupplementary: action === CONST.IOU.ACTION.CATEGORIZE ? false : !isCategoryRequired,
-        },
-        ...policyTagLists.map(({name, required}, index) => {
-            const isTagRequired = required === undefined ? false : canUseViolations && required;
-            return {
-                item: (
-                    <MenuItemWithTopDescription
-                        key={name}
-                        shouldShowRightIcon={!isReadOnly}
-                        title={TransactionUtils.getTagForDisplay(transaction, index)}
-                        description={name}
-                        numberOfLinesTitle={2}
-                        onPress={() =>
-                            Navigation.navigate(
-                                ROUTES.MONEY_REQUEST_STEP_TAG.getRoute(action, iouType, index, transactionID, reportID, Navigation.getActiveRouteWithoutParams(), reportActionID),
-                            )
-                        }
-                        style={[styles.moneyRequestMenuItem]}
-                        disabled={didConfirm}
-                        interactive={!isReadOnly}
-                        rightLabel={isTagRequired ? translate('common.required') : ''}
-                    />
-                ),
-                shouldShow: shouldShowTags,
-                isSupplementary: !isTagRequired,
-            };
-        }),
-        {
-            item: (
-                <MenuItemWithTopDescription
-                    key={`${taxRates?.name}${taxRateTitle}`}
-                    shouldShowRightIcon={!isReadOnly}
-                    title={taxRateTitle}
-                    description={taxRates?.name}
-                    style={[styles.moneyRequestMenuItem]}
-                    titleStyle={styles.flex1}
-                    onPress={() => Navigation.navigate(ROUTES.MONEY_REQUEST_STEP_TAX_RATE.getRoute(action, iouType, transactionID, reportID, Navigation.getActiveRouteWithoutParams()))}
-                    disabled={didConfirm}
-                    interactive={!isReadOnly}
-                />
-            ),
-            shouldShow: shouldShowTax,
-            isSupplementary: true,
-        },
-        {
-            item: (
-                <MenuItemWithTopDescription
-                    key={`${taxRates?.name}${formattedTaxAmount}`}
-                    shouldShowRightIcon={!isReadOnly}
-                    title={formattedTaxAmount}
-                    description={translate('iou.taxAmount')}
-                    style={[styles.moneyRequestMenuItem]}
-                    titleStyle={styles.flex1}
-                    onPress={() => Navigation.navigate(ROUTES.MONEY_REQUEST_STEP_TAX_AMOUNT.getRoute(action, iouType, transactionID, reportID, Navigation.getActiveRouteWithoutParams()))}
-                    disabled={didConfirm}
-                    interactive={!isReadOnly}
-                />
-            ),
-            shouldShow: shouldShowTax,
-            isSupplementary: true,
-        },
-        {
-            item: (
-                <View style={[styles.flexRow, styles.justifyContentBetween, styles.alignItemsCenter, styles.ml5, styles.mr8, styles.optionRow]}>
-                    <Text color={!iouIsBillable ? theme.textSupporting : undefined}>{translate('common.billable')}</Text>
-                    <Switch
-                        accessibilityLabel={translate('common.billable')}
-                        isOn={iouIsBillable}
-                        onToggle={(isOn) => onToggleBillable?.(isOn)}
-                    />
-                </View>
-            ),
-            shouldShow: shouldShowBillable,
-            isSupplementary: true,
-        },
-    ];
-
-    const primaryFields = classifiedFields.filter((classifiedField) => classifiedField.shouldShow && !classifiedField.isSupplementary).map((primaryField) => primaryField.item);
-
-    const supplementaryFields = classifiedFields
-        .filter((classifiedField) => classifiedField.shouldShow && classifiedField.isSupplementary)
-        .map((supplementaryField) => supplementaryField.item);
-
-    const {
-        image: receiptImage,
-        thumbnail: receiptThumbnail,
-        isThumbnail,
-        fileExtension,
-        isLocalFile,
-    } = receiptPath && receiptFilename ? ReceiptUtils.getThumbnailAndImageURIs(transaction ?? null, receiptPath, receiptFilename) : ({} as ReceiptUtils.ThumbnailAndImageURI);
-
-    const resolvedThumbnail = isLocalFile ? receiptThumbnail : tryResolveUrlFromApiRoot(receiptThumbnail ?? '');
-    const resolvedReceiptImage = isLocalFile ? receiptImage : tryResolveUrlFromApiRoot(receiptImage ?? '');
+    }, [
+        isReadOnly,
+        isTypeSplit,
+        iouType,
+        selectedParticipants.length,
+        confirm,
+        bankAccountRoute,
+        iouCurrencyCode,
+        policyID,
+        splitOrRequestOptions,
+        formError,
+        styles.ph1,
+        styles.mb2,
+        shouldShowReadOnlySplits,
+        debouncedFormError,
+        translate,
+    ]);
 
-    const receiptThumbnailContent = useMemo(
-        () => (
-            <View style={styles.moneyRequestImage}>
-                {isLocalFile && Str.isPDF(receiptFilename) ? (
-                    <PDFThumbnail
-                        // eslint-disable-next-line @typescript-eslint/non-nullable-type-assertion-style
-                        previewSourceURL={resolvedReceiptImage as string}
-                        // We don't support scaning password protected PDF receipt
-                        enabled={!isAttachmentInvalid}
-                        onPassword={() => setIsAttachmentInvalid(true)}
-                    />
-                ) : (
-                    <ReceiptImage
-                        isThumbnail={isThumbnail}
-                        // eslint-disable-next-line @typescript-eslint/prefer-nullish-coalescing
-                        source={resolvedThumbnail || resolvedReceiptImage || ''}
-                        // AuthToken is required when retrieving the image from the server
-                        // but we don't need it to load the blob:// or file:// image when starting an expense/split
-                        // So if we have a thumbnail, it means we're retrieving the image from the server
-                        isAuthTokenRequired={!!receiptThumbnail && !isLocalFile}
-                        fileExtension={fileExtension}
-                        shouldUseThumbnailImage
-                        shouldUseInitialObjectPosition={isDistanceRequest}
-                    />
-                )}
-            </View>
-        ),
-        [
-            isLocalFile,
-            receiptFilename,
-            resolvedThumbnail,
-            styles.moneyRequestImage,
-            isAttachmentInvalid,
-            isThumbnail,
-            resolvedReceiptImage,
-            receiptThumbnail,
-            fileExtension,
-            isDistanceRequest,
-        ],
+    const listFooterContent = (
+        <MoneyRequestConfirmationListFooter
+            action={action}
+            canUseP2PDistanceRequests={canUseP2PDistanceRequests}
+            currency={currency}
+            didConfirm={didConfirm}
+            distance={distance}
+            formattedAmount={formattedAmount}
+            formError={formError}
+            hasRoute={hasRoute}
+            iouCategory={iouCategory}
+            iouComment={iouComment}
+            iouCreated={iouCreated}
+            iouCurrencyCode={iouCurrencyCode}
+            iouIsBillable={iouIsBillable}
+            iouMerchant={iouMerchant}
+            iouType={iouType}
+            isCategoryRequired={isCategoryRequired}
+            isDistanceRequest={isDistanceRequest}
+            isEditingSplitBill={isEditingSplitBill}
+            isMerchantEmpty={isMerchantEmpty}
+            isMerchantRequired={isMerchantRequired}
+            isMovingTransactionFromTrackExpense={isMovingTransactionFromTrackExpense}
+            isPolicyExpenseChat={isPolicyExpenseChat}
+            isReadOnly={isReadOnly}
+            isTypeInvoice={isTypeInvoice}
+            onToggleBillable={onToggleBillable}
+            policy={policy}
+            policyTags={policyTags}
+            policyTagLists={policyTagLists}
+            rate={rate}
+            receiptFilename={receiptFilename}
+            receiptPath={receiptPath}
+            reportActionID={reportActionID}
+            reportID={reportID}
+            selectedParticipants={selectedParticipantsProp}
+            shouldDisplayFieldError={shouldDisplayFieldError}
+            shouldDisplayReceipt={shouldDisplayReceipt}
+            shouldShowCategories={shouldShowCategories}
+            shouldShowMerchant={shouldShowMerchant}
+            shouldShowSmartScanFields={shouldShowSmartScanFields}
+            shouldShowTax={shouldShowTax}
+            transaction={transaction}
+            transactionID={transactionID}
+            unit={unit}
+        />
     );
 
     return (
-        <>
-            {/** Hide it temporarily, it will back when https://github.com/Expensify/App/pull/40386 is merged */}
-            {isTypeSplit && action === CONST.IOU.ACTION.CREATE && false && (
-                <MenuItem
-                    key={translate('moneyRequestConfirmationList.paidBy')}
-                    label={translate('moneyRequestConfirmationList.paidBy')}
-                    interactive={!isPolicyExpenseChat && !isReadOnly}
-                    description={payeePersonalDetails.login ?? ReportUtils.getDisplayNameForParticipant(payeePersonalDetails.accountID)}
-                    title={payeePersonalDetails.displayName ?? ReportUtils.getDisplayNameForParticipant(payeePersonalDetails.accountID)}
-                    icon={payeeIcons}
-                    onPress={() => {
-                        Navigation.navigate(
-                            ROUTES.MONEY_REQUEST_STEP_SPLIT_PAYER.getRoute(action, iouType, transaction?.transactionID ?? '', reportID, Navigation.getActiveRouteWithoutParams()),
-                        );
-                    }}
-                    shouldShowRightIcon={!isPolicyExpenseChat && !isReadOnly}
-                    titleWithTooltips={payeePersonalDetails?.isOptimisticPersonalDetail ? undefined : payeeTooltipDetails}
-                />
-            )}
-            {/** @ts-expect-error This component is deprecated and will not be migrated to TypeScript (context: https://expensify.slack.com/archives/C01GTK53T8Q/p1709232289899589?thread_ts=1709156803.359359&cid=C01GTK53T8Q) */}
-            <OptionsSelector
-                sections={optionSelectorSections}
-                onSelectRow={canModifyParticipants ? selectParticipant : navigateToReportOrUserDetail}
-                onAddToSelection={selectParticipant}
-                onConfirmSelection={confirm}
-                selectedOptions={selectedOptions}
-                canSelectMultipleOptions={canModifyParticipants}
-                disableArrowKeysActions={!canModifyParticipants}
-                boldStyle
-                showTitleTooltip
-                shouldTextInputAppearBelowOptions
-                shouldShowTextInput={false}
-                shouldUseStyleForChildren={false}
-                optionHoveredStyle={canModifyParticipants ? styles.hoveredComponentBG : {}}
+        <MouseProvider>
+            <SelectionList<MoneyRequestConfirmationListItem>
+                sections={sections}
+                ListItem={UserListItem}
+                onSelectRow={navigateToReportOrUserDetail}
+                shouldSingleExecuteRowSelect
+                canSelectMultiple={false}
+                shouldPreventDefaultFocusOnSelectRow
                 footerContent={footerContent}
-                listStyles={listStyles}
-                shouldAllowScrollingChildren
-            >
-                {isDistanceRequest && (
-                    <View style={styles.confirmationListMapItem}>
-                        <ConfirmedRoute transaction={transaction ?? ({} as OnyxTypes.Transaction)} />
-                    </View>
-                )}
-                {isTypeInvoice && (
-                    <MenuItem
-                        key={translate('workspace.invoices.sendFrom')}
-                        shouldShowRightIcon={!isReadOnly && canUpdateSenderWorkspace}
-                        title={senderWorkspace?.name}
-                        icon={senderWorkspace?.avatarURL ? senderWorkspace?.avatarURL : getDefaultWorkspaceAvatar(senderWorkspace?.name)}
-                        iconType={CONST.ICON_TYPE_WORKSPACE}
-                        description={translate('workspace.common.workspace')}
-                        label={translate('workspace.invoices.sendFrom')}
-                        isLabelHoverable={false}
-                        interactive={!isReadOnly && canUpdateSenderWorkspace}
-                        onPress={() => {
-                            Navigation.navigate(ROUTES.MONEY_REQUEST_STEP_SEND_FROM.getRoute(iouType, transaction?.transactionID ?? '', reportID, Navigation.getActiveRouteWithoutParams()));
-                        }}
-                        style={styles.moneyRequestMenuItem}
-                        labelStyle={styles.mt2}
-                        titleStyle={styles.flex1}
-                        disabled={didConfirm || !canUpdateSenderWorkspace}
-                    />
-                )}
-                {!isDistanceRequest &&
-                    // eslint-disable-next-line @typescript-eslint/prefer-nullish-coalescing
-                    (receiptImage || receiptThumbnail
-                        ? receiptThumbnailContent
-                        : // The empty receipt component should only show for IOU Requests of a paid policy ("Team" or "Corporate")
-                          PolicyUtils.isPaidGroupPolicy(policy) &&
-                          !isDistanceRequest &&
-                          iouType === CONST.IOU.TYPE.SUBMIT && (
-                              <ReceiptEmptyState
-                                  onPress={() =>
-                                      Navigation.navigate(
-                                          ROUTES.MONEY_REQUEST_STEP_SCAN.getRoute(CONST.IOU.ACTION.CREATE, iouType, transactionID, reportID, Navigation.getActiveRouteWithoutParams()),
-                                      )
-                                  }
-                              />
-                          ))}
-                {primaryFields}
-                {!shouldShowAllFields && (
-                    <ShowMoreButton
-                        containerStyle={[styles.mt1, styles.mb2]}
-                        onPress={toggleShouldExpandFields}
-                    />
-                )}
-                {shouldShowAllFields && supplementaryFields}
-                <ConfirmModal
-                    title={translate('attachmentPicker.wrongFileType')}
-                    onConfirm={navigateBack}
-                    onCancel={navigateBack}
-                    isVisible={isAttachmentInvalid}
-                    prompt={translate('attachmentPicker.protectedPDFNotSupported')}
-                    confirmText={translate('common.close')}
-                    shouldShowCancelButton={false}
-                />
-            </OptionsSelector>
-        </>
+                listFooterContent={listFooterContent}
+                containerStyle={[styles.flexBasisAuto]}
+                removeClippedSubviews={false}
+                disableKeyboardShortcuts
+            />
+        </MouseProvider>
     );
 }
 
 MoneyRequestConfirmationList.displayName = 'MoneyRequestConfirmationList';
 
 export default withOnyx<MoneyRequestConfirmationListProps, MoneyRequestConfirmationListOnyxProps>({
-    session: {
-        key: ONYXKEYS.SESSION,
-    },
     policyCategories: {
         key: ({policyID}) => `${ONYXKEYS.COLLECTION.POLICY_CATEGORIES}${policyID}`,
     },
+    policyCategoriesDraft: {
+        key: ({policyID}) => `${ONYXKEYS.COLLECTION.POLICY_CATEGORIES_DRAFT}${policyID}`,
+    },
     policyTags: {
         key: ({policyID}) => `${ONYXKEYS.COLLECTION.POLICY_TAGS}${policyID}`,
     },
@@ -1129,15 +983,54 @@ export default withOnyx<MoneyRequestConfirmationListProps, MoneyRequestConfirmat
     },
     mileageRates: {
         key: ({policyID}) => `${ONYXKEYS.COLLECTION.POLICY}${policyID}`,
-        selector: DistanceRequestUtils.getMileageRates,
+        selector: (policy: OnyxEntry<OnyxTypes.Policy>) => DistanceRequestUtils.getMileageRates(policy),
     },
     policy: {
         key: ({policyID}) => `${ONYXKEYS.COLLECTION.POLICY}${policyID}`,
     },
+    policyDraft: {
+        key: ({policyID}) => `${ONYXKEYS.COLLECTION.POLICY_DRAFTS}${policyID}`,
+    },
     lastSelectedDistanceRates: {
         key: ONYXKEYS.NVP_LAST_SELECTED_DISTANCE_RATES,
     },
-    allPolicies: {
-        key: ONYXKEYS.COLLECTION.POLICY,
+    currencyList: {
+        key: ONYXKEYS.CURRENCY_LIST,
     },
-})(MoneyRequestConfirmationList);
+})(
+    memo(
+        MoneyRequestConfirmationList,
+        (prevProps, nextProps) =>
+            lodashIsEqual(prevProps.transaction, nextProps.transaction) &&
+            prevProps.onSendMoney === nextProps.onSendMoney &&
+            prevProps.onConfirm === nextProps.onConfirm &&
+            prevProps.iouType === nextProps.iouType &&
+            prevProps.iouAmount === nextProps.iouAmount &&
+            prevProps.isDistanceRequest === nextProps.isDistanceRequest &&
+            prevProps.isPolicyExpenseChat === nextProps.isPolicyExpenseChat &&
+            prevProps.iouCategory === nextProps.iouCategory &&
+            prevProps.shouldShowSmartScanFields === nextProps.shouldShowSmartScanFields &&
+            prevProps.isEditingSplitBill === nextProps.isEditingSplitBill &&
+            prevProps.iouCurrencyCode === nextProps.iouCurrencyCode &&
+            prevProps.iouMerchant === nextProps.iouMerchant &&
+            lodashIsEqual(prevProps.selectedParticipants, nextProps.selectedParticipants) &&
+            lodashIsEqual(prevProps.payeePersonalDetails, nextProps.payeePersonalDetails) &&
+            prevProps.isReadOnly === nextProps.isReadOnly &&
+            prevProps.bankAccountRoute === nextProps.bankAccountRoute &&
+            prevProps.policyID === nextProps.policyID &&
+            prevProps.reportID === nextProps.reportID &&
+            prevProps.receiptPath === nextProps.receiptPath &&
+            prevProps.iouComment === nextProps.iouComment &&
+            prevProps.receiptFilename === nextProps.receiptFilename &&
+            prevProps.iouCreated === nextProps.iouCreated &&
+            prevProps.iouIsBillable === nextProps.iouIsBillable &&
+            prevProps.onToggleBillable === nextProps.onToggleBillable &&
+            prevProps.hasSmartScanFailed === nextProps.hasSmartScanFailed &&
+            prevProps.reportActionID === nextProps.reportActionID &&
+            lodashIsEqual(prevProps.defaultMileageRate, nextProps.defaultMileageRate) &&
+            lodashIsEqual(prevProps.lastSelectedDistanceRates, nextProps.lastSelectedDistanceRates) &&
+            lodashIsEqual(prevProps.action, nextProps.action) &&
+            lodashIsEqual(prevProps.currencyList, nextProps.currencyList) &&
+            prevProps.shouldDisplayReceipt === nextProps.shouldDisplayReceipt,
+    ),
+);
diff --git a/src/components/MoneyRequestConfirmationListFooter.tsx b/src/components/MoneyRequestConfirmationListFooter.tsx
new file mode 100644
index 000000000000..623348a4c7a4
--- /dev/null
+++ b/src/components/MoneyRequestConfirmationListFooter.tsx
@@ -0,0 +1,686 @@
+import {format} from 'date-fns';
+import {Str} from 'expensify-common';
+import lodashIsEqual from 'lodash/isEqual';
+import React, {memo, useMemo, useReducer} from 'react';
+import {View} from 'react-native';
+import type {OnyxEntry} from 'react-native-onyx';
+import {useOnyx} from 'react-native-onyx';
+import type {ValueOf} from 'type-fest';
+import useLocalize from '@hooks/useLocalize';
+import useNetwork from '@hooks/useNetwork';
+import useTheme from '@hooks/useTheme';
+import useThemeStyles from '@hooks/useThemeStyles';
+import * as CurrencyUtils from '@libs/CurrencyUtils';
+import DistanceRequestUtils from '@libs/DistanceRequestUtils';
+import Navigation from '@libs/Navigation/Navigation';
+import * as OptionsListUtils from '@libs/OptionsListUtils';
+import * as PolicyUtils from '@libs/PolicyUtils';
+import * as ReceiptUtils from '@libs/ReceiptUtils';
+import {getDefaultWorkspaceAvatar} from '@libs/ReportUtils';
+import * as TransactionUtils from '@libs/TransactionUtils';
+import tryResolveUrlFromApiRoot from '@libs/tryResolveUrlFromApiRoot';
+import ToggleSettingOptionRow from '@pages/workspace/workflows/ToggleSettingsOptionRow';
+import CONST from '@src/CONST';
+import type {IOUAction, IOUType} from '@src/CONST';
+import ONYXKEYS from '@src/ONYXKEYS';
+import ROUTES from '@src/ROUTES';
+import type * as OnyxTypes from '@src/types/onyx';
+import type {Participant} from '@src/types/onyx/IOU';
+import type {Unit} from '@src/types/onyx/Policy';
+import ConfirmedRoute from './ConfirmedRoute';
+import MenuItem from './MenuItem';
+import MenuItemWithTopDescription from './MenuItemWithTopDescription';
+import PDFThumbnail from './PDFThumbnail';
+import PressableWithoutFocus from './Pressable/PressableWithoutFocus';
+import ReceiptEmptyState from './ReceiptEmptyState';
+import ReceiptImage from './ReceiptImage';
+import ShowMoreButton from './ShowMoreButton';
+
+type MoneyRequestConfirmationListFooterProps = {
+    /** The action to perform */
+    action: IOUAction;
+
+    /** Flag indicating if P2P distance requests can be used */
+    canUseP2PDistanceRequests: boolean | undefined;
+
+    /** The currency of the transaction */
+    currency: string;
+
+    /** Flag indicating if the confirmation is done */
+    didConfirm: boolean;
+
+    /** The distance of the transaction */
+    distance: number;
+
+    /** The formatted amount of the transaction */
+    formattedAmount: string;
+
+    /** The error message for the form */
+    formError: string;
+
+    /** Flag indicating if there is a route */
+    hasRoute: boolean;
+
+    /** The category of the IOU */
+    iouCategory: string;
+
+    /** The comment of the IOU */
+    iouComment: string | undefined;
+
+    /** The creation date of the IOU */
+    iouCreated: string | undefined;
+
+    /** The currency code of the IOU */
+    iouCurrencyCode: string | undefined;
+
+    /** Flag indicating if the IOU is billable */
+    iouIsBillable: boolean;
+
+    /** The merchant of the IOU */
+    iouMerchant: string | undefined;
+
+    /** The type of the IOU */
+    iouType: Exclude<IOUType, typeof CONST.IOU.TYPE.REQUEST | typeof CONST.IOU.TYPE.SEND>;
+
+    /** Flag indicating if the category is required */
+    isCategoryRequired: boolean;
+
+    /** Flag indicating if it is a distance request */
+    isDistanceRequest: boolean;
+
+    /** Flag indicating if it is editing a split bill */
+    isEditingSplitBill: boolean | undefined;
+
+    /** Flag indicating if the merchant is empty */
+    isMerchantEmpty: boolean;
+
+    /** Flag indicating if the merchant is required */
+    isMerchantRequired: boolean | undefined;
+
+    /** Flag indicating if the transaction is moved from track expense */
+    isMovingTransactionFromTrackExpense: boolean;
+
+    /** Flag indicating if it is a policy expense chat */
+    isPolicyExpenseChat: boolean;
+
+    /** Flag indicating if it is read-only */
+    isReadOnly: boolean;
+
+    /** Flag indicating if it is an invoice type */
+    isTypeInvoice: boolean;
+
+    /** Function to toggle billable */
+    onToggleBillable?: (isOn: boolean) => void;
+
+    /** The policy */
+    policy: OnyxEntry<OnyxTypes.Policy>;
+
+    /** The policy tag lists */
+    policyTags: OnyxEntry<OnyxTypes.PolicyTagLists>;
+
+    /** The policy tag lists */
+    policyTagLists: Array<ValueOf<OnyxTypes.PolicyTagLists>>;
+
+    /** The rate of the transaction */
+    rate: number | undefined;
+
+    /** The filename of the receipt */
+    receiptFilename: string;
+
+    /** The path of the receipt */
+    receiptPath: string;
+
+    /** The report action ID */
+    reportActionID: string | undefined;
+
+    /** The report ID */
+    reportID: string;
+
+    /** The selected participants */
+    selectedParticipants: Participant[];
+
+    /** Flag indicating if the field error should be displayed */
+    shouldDisplayFieldError: boolean;
+
+    /** Flag indicating if the receipt should be displayed */
+    shouldDisplayReceipt: boolean;
+
+    /** Flag indicating if the categories should be shown */
+    shouldShowCategories: boolean;
+
+    /** Flag indicating if the merchant should be shown */
+    shouldShowMerchant: boolean;
+
+    /** Flag indicating if the smart scan fields should be shown */
+    shouldShowSmartScanFields: boolean;
+
+    /** Flag indicating if the tax should be shown */
+    shouldShowTax: boolean;
+
+    /** The transaction */
+    transaction: OnyxEntry<OnyxTypes.Transaction>;
+
+    /** The transaction ID */
+    transactionID: string;
+
+    /** The unit */
+    unit: Unit | undefined;
+};
+
+function MoneyRequestConfirmationListFooter({
+    action,
+    canUseP2PDistanceRequests,
+    currency,
+    didConfirm,
+    distance,
+    formattedAmount,
+    formError,
+    hasRoute,
+    iouCategory,
+    iouComment,
+    iouCreated,
+    iouCurrencyCode,
+    iouIsBillable,
+    iouMerchant,
+    iouType,
+    isCategoryRequired,
+    isDistanceRequest,
+    isEditingSplitBill,
+    isMerchantEmpty,
+    isMerchantRequired,
+    isMovingTransactionFromTrackExpense,
+    isPolicyExpenseChat,
+    isReadOnly,
+    isTypeInvoice,
+    onToggleBillable,
+    policy,
+    policyTags,
+    policyTagLists,
+    rate,
+    receiptFilename,
+    receiptPath,
+    reportActionID,
+    reportID,
+    selectedParticipants,
+    shouldDisplayFieldError,
+    shouldDisplayReceipt,
+    shouldShowCategories,
+    shouldShowMerchant,
+    shouldShowSmartScanFields,
+    shouldShowTax,
+    transaction,
+    transactionID,
+    unit,
+}: MoneyRequestConfirmationListFooterProps) {
+    const styles = useThemeStyles();
+    const theme = useTheme();
+    const {translate, toLocaleDigit} = useLocalize();
+    const {isOffline} = useNetwork();
+    const [allPolicies] = useOnyx(ONYXKEYS.COLLECTION.POLICY);
+
+    // A flag and a toggler for showing the rest of the form fields
+    const [shouldExpandFields, toggleShouldExpandFields] = useReducer((state) => !state, false);
+
+    const shouldShowTags = useMemo(() => isPolicyExpenseChat && OptionsListUtils.hasEnabledTags(policyTagLists), [isPolicyExpenseChat, policyTagLists]);
+    const isMultilevelTags = useMemo(() => PolicyUtils.isMultiLevelTags(policyTags), [policyTags]);
+
+    const senderWorkspace = useMemo(() => {
+        const senderWorkspaceParticipant = selectedParticipants.find((participant) => participant.isSender);
+        return allPolicies?.[`${ONYXKEYS.COLLECTION.POLICY}${senderWorkspaceParticipant?.policyID}`];
+    }, [allPolicies, selectedParticipants]);
+
+    const canUpdateSenderWorkspace = useMemo(() => {
+        const isInvoiceRoomParticipant = selectedParticipants.some((participant) => participant.isInvoiceRoom);
+
+        return PolicyUtils.canSendInvoice(allPolicies) && !!transaction?.isFromGlobalCreate && !isInvoiceRoomParticipant;
+    }, [allPolicies, selectedParticipants, transaction?.isFromGlobalCreate]);
+
+    const isTypeSend = iouType === CONST.IOU.TYPE.PAY;
+    const taxRates = policy?.taxRates ?? null;
+    // In Send Money and Split Bill with Scan flow, we don't allow the Merchant or Date to be edited. For distance requests, don't show the merchant as there's already another "Distance" menu item
+    const shouldShowDate = (shouldShowSmartScanFields || isDistanceRequest) && !isTypeSend;
+    // Determines whether the tax fields can be modified.
+    // The tax fields can only be modified if the component is not in read-only mode
+    // and it is not a distance request.
+    const canModifyTaxFields = !isReadOnly && !isDistanceRequest;
+    // A flag for showing the billable field
+    const shouldShowBillable = policy?.disabledFields?.defaultBillable === false;
+    // Do not hide fields in case of paying someone
+    const shouldShowAllFields = !!isDistanceRequest || shouldExpandFields || !shouldShowSmartScanFields || isTypeSend || !!isEditingSplitBill;
+    // Calculate the formatted tax amount based on the transaction's tax amount and the IOU currency code
+    const taxAmount = TransactionUtils.getTaxAmount(transaction, false);
+    const formattedTaxAmount = CurrencyUtils.convertToDisplayString(taxAmount, iouCurrencyCode);
+    // Get the tax rate title based on the policy and transaction
+    const taxRateTitle = TransactionUtils.getTaxName(policy, transaction);
+    // Determine if the merchant error should be displayed
+    const shouldDisplayMerchantError = isMerchantRequired && (shouldDisplayFieldError || formError === 'iou.error.invalidMerchant') && isMerchantEmpty;
+    // The empty receipt component should only show for IOU Requests of a paid policy ("Team" or "Corporate")
+    const shouldShowReceiptEmptyState = iouType === CONST.IOU.TYPE.SUBMIT && PolicyUtils.isPaidGroupPolicy(policy);
+    const {
+        image: receiptImage,
+        thumbnail: receiptThumbnail,
+        isThumbnail,
+        fileExtension,
+        isLocalFile,
+    } = receiptPath && receiptFilename ? ReceiptUtils.getThumbnailAndImageURIs(transaction, receiptPath, receiptFilename) : ({} as ReceiptUtils.ThumbnailAndImageURI);
+    const resolvedThumbnail = isLocalFile ? receiptThumbnail : tryResolveUrlFromApiRoot(receiptThumbnail ?? '');
+    const resolvedReceiptImage = isLocalFile ? receiptImage : tryResolveUrlFromApiRoot(receiptImage ?? '');
+
+    // An intermediate structure that helps us classify the fields as "primary" and "supplementary".
+    // The primary fields are always shown to the user, while an extra action is needed to reveal the supplementary ones.
+    const classifiedFields = [
+        {
+            item: (
+                <MenuItemWithTopDescription
+                    key={translate('iou.amount')}
+                    shouldShowRightIcon={!isReadOnly && !isDistanceRequest}
+                    title={formattedAmount}
+                    description={translate('iou.amount')}
+                    interactive={!isReadOnly}
+                    onPress={() => {
+                        if (isDistanceRequest) {
+                            return;
+                        }
+
+                        Navigation.navigate(ROUTES.MONEY_REQUEST_STEP_AMOUNT.getRoute(action, iouType, transactionID, reportID, Navigation.getActiveRouteWithoutParams()));
+                    }}
+                    style={[styles.moneyRequestMenuItem, styles.mt2]}
+                    titleStyle={styles.moneyRequestConfirmationAmount}
+                    disabled={didConfirm}
+                    brickRoadIndicator={shouldDisplayFieldError && TransactionUtils.isAmountMissing(transaction) ? CONST.BRICK_ROAD_INDICATOR_STATUS.ERROR : undefined}
+                    errorText={shouldDisplayFieldError && TransactionUtils.isAmountMissing(transaction) ? translate('common.error.enterAmount') : ''}
+                />
+            ),
+            shouldShow: shouldShowSmartScanFields,
+            isSupplementary: false,
+        },
+        {
+            item: (
+                <MenuItemWithTopDescription
+                    key={translate('common.description')}
+                    shouldShowRightIcon={!isReadOnly}
+                    shouldParseTitle
+                    title={iouComment}
+                    description={translate('common.description')}
+                    onPress={() => {
+                        Navigation.navigate(
+                            ROUTES.MONEY_REQUEST_STEP_DESCRIPTION.getRoute(action, iouType, transactionID, reportID, Navigation.getActiveRouteWithoutParams(), reportActionID),
+                        );
+                    }}
+                    style={[styles.moneyRequestMenuItem]}
+                    titleStyle={styles.flex1}
+                    disabled={didConfirm}
+                    interactive={!isReadOnly}
+                    numberOfLinesTitle={2}
+                />
+            ),
+            shouldShow: true,
+            isSupplementary: false,
+        },
+        {
+            item: (
+                <MenuItemWithTopDescription
+                    key={translate('common.distance')}
+                    shouldShowRightIcon={!isReadOnly && !isMovingTransactionFromTrackExpense}
+                    title={isMerchantEmpty ? '' : iouMerchant}
+                    description={translate('common.distance')}
+                    style={[styles.moneyRequestMenuItem]}
+                    titleStyle={styles.flex1}
+                    onPress={() => Navigation.navigate(ROUTES.MONEY_REQUEST_STEP_DISTANCE.getRoute(action, iouType, transactionID, reportID, Navigation.getActiveRouteWithoutParams()))}
+                    disabled={didConfirm}
+                    // todo: handle edit for transaction while moving from track expense
+                    interactive={!isReadOnly && !isMovingTransactionFromTrackExpense}
+                />
+            ),
+            shouldShow: isDistanceRequest && !canUseP2PDistanceRequests,
+            isSupplementary: false,
+        },
+        {
+            item: (
+                <MenuItemWithTopDescription
+                    key={translate('common.distance')}
+                    shouldShowRightIcon={!isReadOnly}
+                    title={DistanceRequestUtils.getDistanceForDisplay(hasRoute, distance, unit, rate, translate)}
+                    description={translate('common.distance')}
+                    style={[styles.moneyRequestMenuItem]}
+                    titleStyle={styles.flex1}
+                    onPress={() => Navigation.navigate(ROUTES.MONEY_REQUEST_STEP_DISTANCE.getRoute(action, iouType, transactionID, reportID, Navigation.getActiveRouteWithoutParams()))}
+                    disabled={didConfirm}
+                    interactive={!isReadOnly}
+                />
+            ),
+            shouldShow: isDistanceRequest && canUseP2PDistanceRequests,
+            isSupplementary: false,
+        },
+        {
+            item: (
+                <MenuItemWithTopDescription
+                    key={translate('common.rate')}
+                    shouldShowRightIcon={!!rate && !isReadOnly && isPolicyExpenseChat}
+                    title={DistanceRequestUtils.getRateForDisplay(unit, rate, currency, translate, toLocaleDigit, isOffline)}
+                    description={translate('common.rate')}
+                    style={[styles.moneyRequestMenuItem]}
+                    titleStyle={styles.flex1}
+                    onPress={() => Navigation.navigate(ROUTES.MONEY_REQUEST_STEP_DISTANCE_RATE.getRoute(action, iouType, transactionID, reportID, Navigation.getActiveRouteWithoutParams()))}
+                    disabled={didConfirm}
+                    interactive={!!rate && !isReadOnly && isPolicyExpenseChat}
+                />
+            ),
+            shouldShow: isDistanceRequest && canUseP2PDistanceRequests,
+            isSupplementary: false,
+        },
+        {
+            item: (
+                <MenuItemWithTopDescription
+                    key={translate('common.merchant')}
+                    shouldShowRightIcon={!isReadOnly}
+                    title={isMerchantEmpty ? '' : iouMerchant}
+                    description={translate('common.merchant')}
+                    style={[styles.moneyRequestMenuItem]}
+                    titleStyle={styles.flex1}
+                    onPress={() => {
+                        Navigation.navigate(ROUTES.MONEY_REQUEST_STEP_MERCHANT.getRoute(action, iouType, transactionID, reportID, Navigation.getActiveRouteWithoutParams()));
+                    }}
+                    disabled={didConfirm}
+                    interactive={!isReadOnly}
+                    brickRoadIndicator={shouldDisplayMerchantError ? CONST.BRICK_ROAD_INDICATOR_STATUS.ERROR : undefined}
+                    errorText={shouldDisplayMerchantError ? translate('common.error.fieldRequired') : ''}
+                    rightLabel={isMerchantRequired && !shouldDisplayMerchantError ? translate('common.required') : ''}
+                    numberOfLinesTitle={2}
+                />
+            ),
+            shouldShow: shouldShowMerchant,
+            isSupplementary: !isMerchantRequired,
+        },
+        {
+            item: (
+                <MenuItemWithTopDescription
+                    key={translate('common.date')}
+                    shouldShowRightIcon={!isReadOnly}
+                    // eslint-disable-next-line @typescript-eslint/prefer-nullish-coalescing
+                    title={iouCreated || format(new Date(), CONST.DATE.FNS_FORMAT_STRING)}
+                    description={translate('common.date')}
+                    style={[styles.moneyRequestMenuItem]}
+                    titleStyle={styles.flex1}
+                    onPress={() => {
+                        Navigation.navigate(ROUTES.MONEY_REQUEST_STEP_DATE.getRoute(action, iouType, transactionID, reportID, Navigation.getActiveRouteWithoutParams(), reportActionID));
+                    }}
+                    disabled={didConfirm}
+                    interactive={!isReadOnly}
+                    brickRoadIndicator={shouldDisplayFieldError && TransactionUtils.isCreatedMissing(transaction) ? CONST.BRICK_ROAD_INDICATOR_STATUS.ERROR : undefined}
+                    errorText={shouldDisplayFieldError && TransactionUtils.isCreatedMissing(transaction) ? translate('common.error.enterDate') : ''}
+                />
+            ),
+            shouldShow: shouldShowDate,
+            isSupplementary: true,
+        },
+        {
+            item: (
+                <MenuItemWithTopDescription
+                    key={translate('common.category')}
+                    shouldShowRightIcon={!isReadOnly}
+                    title={iouCategory}
+                    description={translate('common.category')}
+                    numberOfLinesTitle={2}
+                    onPress={() =>
+                        Navigation.navigate(ROUTES.MONEY_REQUEST_STEP_CATEGORY.getRoute(action, iouType, transactionID, reportID, Navigation.getActiveRouteWithoutParams(), reportActionID))
+                    }
+                    style={[styles.moneyRequestMenuItem]}
+                    titleStyle={styles.flex1}
+                    disabled={didConfirm}
+                    interactive={!isReadOnly}
+                    rightLabel={isCategoryRequired ? translate('common.required') : ''}
+                />
+            ),
+            shouldShow: shouldShowCategories,
+            isSupplementary: action === CONST.IOU.ACTION.CATEGORIZE ? false : !isCategoryRequired,
+        },
+        ...policyTagLists.map(({name, required, tags}, index) => {
+            const isTagRequired = required ?? false;
+            const shouldShow = shouldShowTags && (!isMultilevelTags || OptionsListUtils.hasEnabledOptions(tags));
+            return {
+                item: (
+                    <MenuItemWithTopDescription
+                        key={name}
+                        shouldShowRightIcon={!isReadOnly}
+                        title={TransactionUtils.getTagForDisplay(transaction, index)}
+                        description={name}
+                        numberOfLinesTitle={2}
+                        onPress={() =>
+                            Navigation.navigate(
+                                ROUTES.MONEY_REQUEST_STEP_TAG.getRoute(action, iouType, index, transactionID, reportID, Navigation.getActiveRouteWithoutParams(), reportActionID),
+                            )
+                        }
+                        style={[styles.moneyRequestMenuItem]}
+                        disabled={didConfirm}
+                        interactive={!isReadOnly}
+                        rightLabel={isTagRequired ? translate('common.required') : ''}
+                    />
+                ),
+                shouldShow,
+                isSupplementary: !isTagRequired,
+            };
+        }),
+        {
+            item: (
+                <MenuItemWithTopDescription
+                    key={`${taxRates?.name}${taxRateTitle}`}
+                    shouldShowRightIcon={canModifyTaxFields}
+                    title={taxRateTitle}
+                    description={taxRates?.name}
+                    style={[styles.moneyRequestMenuItem]}
+                    titleStyle={styles.flex1}
+                    onPress={() => Navigation.navigate(ROUTES.MONEY_REQUEST_STEP_TAX_RATE.getRoute(action, iouType, transactionID, reportID, Navigation.getActiveRouteWithoutParams()))}
+                    disabled={didConfirm}
+                    interactive={canModifyTaxFields}
+                />
+            ),
+            shouldShow: shouldShowTax,
+            isSupplementary: true,
+        },
+        {
+            item: (
+                <MenuItemWithTopDescription
+                    key={`${taxRates?.name}${formattedTaxAmount}`}
+                    shouldShowRightIcon={canModifyTaxFields}
+                    title={formattedTaxAmount}
+                    description={translate('iou.taxAmount')}
+                    style={[styles.moneyRequestMenuItem]}
+                    titleStyle={styles.flex1}
+                    onPress={() => Navigation.navigate(ROUTES.MONEY_REQUEST_STEP_TAX_AMOUNT.getRoute(action, iouType, transactionID, reportID, Navigation.getActiveRouteWithoutParams()))}
+                    disabled={didConfirm}
+                    interactive={canModifyTaxFields}
+                />
+            ),
+            shouldShow: shouldShowTax,
+            isSupplementary: true,
+        },
+        {
+            item: (
+                <View style={[styles.flexRow, styles.justifyContentBetween, styles.alignItemsCenter, styles.ml5, styles.mr8, styles.optionRow]}>
+                    <ToggleSettingOptionRow
+                        switchAccessibilityLabel={translate('common.billable')}
+                        title={translate('common.billable')}
+                        onToggle={(isOn) => onToggleBillable?.(isOn)}
+                        isActive={iouIsBillable}
+                        disabled={isReadOnly}
+                        titleStyle={!iouIsBillable && {color: theme.textSupporting}}
+                        wrapperStyle={styles.flex1}
+                    />
+                </View>
+            ),
+            shouldShow: shouldShowBillable,
+            isSupplementary: true,
+        },
+    ];
+
+    const primaryFields: JSX.Element[] = [];
+    const supplementaryFields: JSX.Element[] = [];
+
+    classifiedFields.forEach((field) => {
+        if (field.shouldShow && !field.isSupplementary) {
+            primaryFields.push(field.item);
+        } else if (field.shouldShow && field.isSupplementary) {
+            supplementaryFields.push(field.item);
+        }
+    });
+
+    const receiptThumbnailContent = useMemo(
+        () => (
+            <View style={styles.moneyRequestImage}>
+                {isLocalFile && Str.isPDF(receiptFilename) ? (
+                    <PressableWithoutFocus
+                        onPress={() => Navigation.navigate(ROUTES.TRANSACTION_RECEIPT.getRoute(reportID ?? '', transactionID ?? ''))}
+                        accessibilityRole={CONST.ROLE.BUTTON}
+                        accessibilityLabel={translate('accessibilityHints.viewAttachment')}
+                        disabled={!shouldDisplayReceipt}
+                        disabledStyle={styles.cursorDefault}
+                    >
+                        <PDFThumbnail
+                            // eslint-disable-next-line @typescript-eslint/non-nullable-type-assertion-style
+                            previewSourceURL={resolvedReceiptImage as string}
+                        />
+                    </PressableWithoutFocus>
+                ) : (
+                    <PressableWithoutFocus
+                        onPress={() => Navigation.navigate(ROUTES.TRANSACTION_RECEIPT.getRoute(reportID ?? '', transactionID ?? ''))}
+                        disabled={!shouldDisplayReceipt || isThumbnail}
+                        accessibilityRole={CONST.ROLE.BUTTON}
+                        accessibilityLabel={translate('accessibilityHints.viewAttachment')}
+                        disabledStyle={styles.cursorDefault}
+                    >
+                        <ReceiptImage
+                            isThumbnail={isThumbnail}
+                            // eslint-disable-next-line @typescript-eslint/prefer-nullish-coalescing
+                            source={resolvedThumbnail || resolvedReceiptImage || ''}
+                            // AuthToken is required when retrieving the image from the server
+                            // but we don't need it to load the blob:// or file:// image when starting an expense/split
+                            // So if we have a thumbnail, it means we're retrieving the image from the server
+                            isAuthTokenRequired={!!receiptThumbnail && !isLocalFile}
+                            fileExtension={fileExtension}
+                            shouldUseThumbnailImage
+                            shouldUseInitialObjectPosition={isDistanceRequest}
+                        />
+                    </PressableWithoutFocus>
+                )}
+            </View>
+        ),
+        [
+            styles.moneyRequestImage,
+            styles.cursorDefault,
+            isLocalFile,
+            receiptFilename,
+            translate,
+            shouldDisplayReceipt,
+            resolvedReceiptImage,
+            isThumbnail,
+            resolvedThumbnail,
+            receiptThumbnail,
+            fileExtension,
+            isDistanceRequest,
+            reportID,
+            transactionID,
+        ],
+    );
+
+    return (
+        <>
+            {isTypeInvoice && (
+                <MenuItem
+                    key={translate('workspace.invoices.sendFrom')}
+                    avatarID={senderWorkspace?.id}
+                    shouldShowRightIcon={!isReadOnly && canUpdateSenderWorkspace}
+                    title={senderWorkspace?.name}
+                    icon={senderWorkspace?.avatarURL ? senderWorkspace?.avatarURL : getDefaultWorkspaceAvatar(senderWorkspace?.name)}
+                    iconType={CONST.ICON_TYPE_WORKSPACE}
+                    description={translate('workspace.common.workspace')}
+                    label={translate('workspace.invoices.sendFrom')}
+                    isLabelHoverable={false}
+                    interactive={!isReadOnly && canUpdateSenderWorkspace}
+                    onPress={() => {
+                        Navigation.navigate(ROUTES.MONEY_REQUEST_STEP_SEND_FROM.getRoute(iouType, transaction?.transactionID ?? '-1', reportID, Navigation.getActiveRouteWithoutParams()));
+                    }}
+                    style={styles.moneyRequestMenuItem}
+                    labelStyle={styles.mt2}
+                    titleStyle={styles.flex1}
+                    disabled={didConfirm}
+                />
+            )}
+            {isDistanceRequest && (
+                <View style={styles.confirmationListMapItem}>
+                    <ConfirmedRoute transaction={transaction ?? ({} as OnyxTypes.Transaction)} />
+                </View>
+            )}
+            {!isDistanceRequest &&
+                // eslint-disable-next-line @typescript-eslint/prefer-nullish-coalescing
+                (receiptImage || receiptThumbnail
+                    ? receiptThumbnailContent
+                    : shouldShowReceiptEmptyState && (
+                          <ReceiptEmptyState
+                              onPress={() =>
+                                  Navigation.navigate(
+                                      ROUTES.MONEY_REQUEST_STEP_SCAN.getRoute(CONST.IOU.ACTION.CREATE, iouType, transactionID, reportID, Navigation.getActiveRouteWithoutParams()),
+                                  )
+                              }
+                          />
+                      ))}
+            {primaryFields}
+            {!shouldShowAllFields && (
+                <ShowMoreButton
+                    containerStyle={[styles.mt1, styles.mb2]}
+                    onPress={toggleShouldExpandFields}
+                />
+            )}
+            <View style={[styles.mb5]}>{shouldShowAllFields && supplementaryFields}</View>
+        </>
+    );
+}
+
+MoneyRequestConfirmationListFooter.displayName = 'MoneyRequestConfirmationListFooter';
+
+export default memo(
+    MoneyRequestConfirmationListFooter,
+    (prevProps, nextProps) =>
+        lodashIsEqual(prevProps.action, nextProps.action) &&
+        prevProps.canUseP2PDistanceRequests === nextProps.canUseP2PDistanceRequests &&
+        prevProps.currency === nextProps.currency &&
+        prevProps.didConfirm === nextProps.didConfirm &&
+        prevProps.distance === nextProps.distance &&
+        prevProps.formattedAmount === nextProps.formattedAmount &&
+        prevProps.formError === nextProps.formError &&
+        prevProps.hasRoute === nextProps.hasRoute &&
+        prevProps.iouCategory === nextProps.iouCategory &&
+        prevProps.iouComment === nextProps.iouComment &&
+        prevProps.iouCreated === nextProps.iouCreated &&
+        prevProps.iouCurrencyCode === nextProps.iouCurrencyCode &&
+        prevProps.iouIsBillable === nextProps.iouIsBillable &&
+        prevProps.iouMerchant === nextProps.iouMerchant &&
+        prevProps.iouType === nextProps.iouType &&
+        prevProps.isCategoryRequired === nextProps.isCategoryRequired &&
+        prevProps.isDistanceRequest === nextProps.isDistanceRequest &&
+        prevProps.isEditingSplitBill === nextProps.isEditingSplitBill &&
+        prevProps.isMerchantEmpty === nextProps.isMerchantEmpty &&
+        prevProps.isMerchantRequired === nextProps.isMerchantRequired &&
+        prevProps.isMovingTransactionFromTrackExpense === nextProps.isMovingTransactionFromTrackExpense &&
+        prevProps.isPolicyExpenseChat === nextProps.isPolicyExpenseChat &&
+        prevProps.isReadOnly === nextProps.isReadOnly &&
+        prevProps.isTypeInvoice === nextProps.isTypeInvoice &&
+        prevProps.onToggleBillable === nextProps.onToggleBillable &&
+        lodashIsEqual(prevProps.policy, nextProps.policy) &&
+        lodashIsEqual(prevProps.policyTagLists, nextProps.policyTagLists) &&
+        prevProps.rate === nextProps.rate &&
+        prevProps.receiptFilename === nextProps.receiptFilename &&
+        prevProps.receiptPath === nextProps.receiptPath &&
+        prevProps.reportActionID === nextProps.reportActionID &&
+        prevProps.reportID === nextProps.reportID &&
+        lodashIsEqual(prevProps.selectedParticipants, nextProps.selectedParticipants) &&
+        prevProps.shouldDisplayFieldError === nextProps.shouldDisplayFieldError &&
+        prevProps.shouldDisplayReceipt === nextProps.shouldDisplayReceipt &&
+        prevProps.shouldShowCategories === nextProps.shouldShowCategories &&
+        prevProps.shouldShowMerchant === nextProps.shouldShowMerchant &&
+        prevProps.shouldShowSmartScanFields === nextProps.shouldShowSmartScanFields &&
+        prevProps.shouldShowTax === nextProps.shouldShowTax &&
+        lodashIsEqual(prevProps.transaction, nextProps.transaction) &&
+        prevProps.transactionID === nextProps.transactionID &&
+        prevProps.unit === nextProps.unit,
+);
diff --git a/src/components/MoneyRequestHeader.tsx b/src/components/MoneyRequestHeader.tsx
index 2f660c9d8fde..d7844a1f5e93 100644
--- a/src/components/MoneyRequestHeader.tsx
+++ b/src/components/MoneyRequestHeader.tsx
@@ -1,46 +1,32 @@
+import type {ReactNode} from 'react';
 import React, {useCallback, useEffect, useState} from 'react';
 import {View} from 'react-native';
-import {withOnyx} from 'react-native-onyx';
 import type {OnyxEntry} from 'react-native-onyx';
+import {useOnyx} from 'react-native-onyx';
 import useLocalize from '@hooks/useLocalize';
+import useTheme from '@hooks/useTheme';
 import useThemeStyles from '@hooks/useThemeStyles';
 import useWindowDimensions from '@hooks/useWindowDimensions';
-import * as HeaderUtils from '@libs/HeaderUtils';
 import Navigation from '@libs/Navigation/Navigation';
 import * as ReportActionsUtils from '@libs/ReportActionsUtils';
-import * as ReportUtils from '@libs/ReportUtils';
 import * as TransactionUtils from '@libs/TransactionUtils';
+import variables from '@styles/variables';
 import * as IOU from '@userActions/IOU';
-import CONST from '@src/CONST';
+import * as TransactionActions from '@userActions/Transaction';
 import ONYXKEYS from '@src/ONYXKEYS';
 import ROUTES from '@src/ROUTES';
-import type {Policy, Report, ReportAction, ReportActions, Session, Transaction} from '@src/types/onyx';
-import type {OriginalMessageIOU} from '@src/types/onyx/OriginalMessage';
-import ConfirmModal from './ConfirmModal';
+import type {Policy, Report, ReportAction} from '@src/types/onyx';
+import type IconAsset from '@src/types/utils/IconAsset';
+import isLoadingOnyxValue from '@src/types/utils/isLoadingOnyxValue';
+import Button from './Button';
 import HeaderWithBackButton from './HeaderWithBackButton';
+import Icon from './Icon';
 import * as Expensicons from './Icon/Expensicons';
+import type {MoneyRequestHeaderStatusBarProps} from './MoneyRequestHeaderStatusBar';
 import MoneyRequestHeaderStatusBar from './MoneyRequestHeaderStatusBar';
 import ProcessMoneyRequestHoldMenu from './ProcessMoneyRequestHoldMenu';
 
-type MoneyRequestHeaderOnyxProps = {
-    /** Session info for the currently logged in user. */
-    session: OnyxEntry<Session>;
-
-    /** The expense report or iou report (only will have a value if this is a transaction thread) */
-    parentReport: OnyxEntry<Report>;
-
-    /** All the data for the transaction */
-    transaction: OnyxEntry<Transaction>;
-
-    /** All report actions */
-    // eslint-disable-next-line react/no-unused-prop-types
-    parentReportActions: OnyxEntry<ReportActions>;
-
-    /** Whether we should show the Hold Interstitial explaining the feature */
-    shownHoldUseExplanation: OnyxEntry<boolean>;
-};
-
-type MoneyRequestHeaderProps = MoneyRequestHeaderOnyxProps & {
+type MoneyRequestHeaderProps = {
     /** The report currently being looked at */
     report: Report;
 
@@ -52,178 +38,160 @@ type MoneyRequestHeaderProps = MoneyRequestHeaderOnyxProps & {
 
     /** Whether we should display the header as in narrow layout */
     shouldUseNarrowLayout?: boolean;
+
+    /** Method to trigger when pressing close button of the header */
+    onBackButtonPress: () => void;
 };
 
-function MoneyRequestHeader({
-    session,
-    parentReport,
-    report,
-    parentReportAction,
-    transaction,
-    shownHoldUseExplanation = false,
-    policy,
-    shouldUseNarrowLayout = false,
-}: MoneyRequestHeaderProps) {
+function MoneyRequestHeader({report, parentReportAction, policy, shouldUseNarrowLayout = false, onBackButtonPress}: MoneyRequestHeaderProps) {
+    const [parentReport] = useOnyx(`${ONYXKEYS.COLLECTION.REPORT}${report.parentReportID}`);
+    const [transaction] = useOnyx(
+        `${ONYXKEYS.COLLECTION.TRANSACTION}${
+            ReportActionsUtils.isMoneyRequestAction(parentReportAction) ? ReportActionsUtils.getOriginalMessage(parentReportAction)?.IOUTransactionID ?? -1 : -1
+        }`,
+    );
+    const [transactionViolations] = useOnyx(ONYXKEYS.COLLECTION.TRANSACTION_VIOLATIONS);
+    const [dismissedHoldUseExplanation, dismissedHoldUseExplanationResult] = useOnyx(ONYXKEYS.NVP_DISMISSED_HOLD_USE_EXPLANATION, {initialValue: true});
+    const isLoadingHoldUseExplained = isLoadingOnyxValue(dismissedHoldUseExplanationResult);
     const styles = useThemeStyles();
+    const theme = useTheme();
     const {translate} = useLocalize();
-    const [isDeleteModalVisible, setIsDeleteModalVisible] = useState(false);
     const [shouldShowHoldMenu, setShouldShowHoldMenu] = useState(false);
-    const moneyRequestReport = parentReport;
-    const isSettled = ReportUtils.isSettled(moneyRequestReport?.reportID);
-    const isApproved = ReportUtils.isReportApproved(moneyRequestReport);
     const isOnHold = TransactionUtils.isOnHold(transaction);
-    const {windowWidth} = useWindowDimensions();
-
-    // Only the requestor can take delete the expense, admins can only edit it.
-    const isActionOwner = typeof parentReportAction?.actorAccountID === 'number' && typeof session?.accountID === 'number' && parentReportAction.actorAccountID === session?.accountID;
-    const isPolicyAdmin = policy?.role === CONST.POLICY.ROLE.ADMIN;
-    const isApprover = ReportUtils.isMoneyRequestReport(moneyRequestReport) && moneyRequestReport?.managerID !== null && session?.accountID === moneyRequestReport?.managerID;
+    const isDuplicate = TransactionUtils.isDuplicate(transaction?.transactionID ?? '');
+    const {isSmallScreenWidth} = useWindowDimensions();
 
-    const deleteTransaction = useCallback(() => {
-        if (parentReportAction) {
-            const iouTransactionID = parentReportAction.actionName === CONST.REPORT.ACTIONS.TYPE.IOU ? parentReportAction.originalMessage?.IOUTransactionID ?? '' : '';
-            if (ReportActionsUtils.isTrackExpenseAction(parentReportAction)) {
-                IOU.deleteTrackExpense(parentReport?.reportID ?? '', iouTransactionID, parentReportAction, true);
-                return;
-            }
-            IOU.deleteMoneyRequest(iouTransactionID, parentReportAction, true);
-        }
+    const hasAllPendingRTERViolations = TransactionUtils.allHavePendingRTERViolation([transaction?.transactionID ?? '-1']);
 
-        setIsDeleteModalVisible(false);
-    }, [parentReport?.reportID, parentReportAction, setIsDeleteModalVisible]);
+    const markAsCash = useCallback(() => {
+        TransactionActions.markAsCash(transaction?.transactionID ?? '-1', report.reportID);
+    }, [report.reportID, transaction?.transactionID]);
 
     const isScanning = TransactionUtils.hasReceipt(transaction) && TransactionUtils.isReceiptBeingScanned(transaction);
-    const isPending = TransactionUtils.isExpensifyCardTransaction(transaction) && TransactionUtils.isPending(transaction);
 
-    const isDeletedParentAction = ReportActionsUtils.isDeletedAction(parentReportAction);
-    const canHoldOrUnholdRequest = !isSettled && !isApproved && !isDeletedParentAction;
-
-    // If the report supports adding transactions to it, then it also supports deleting transactions from it.
-    const canDeleteRequest = isActionOwner && (ReportUtils.canAddOrDeleteTransactions(moneyRequestReport) || ReportUtils.isTrackExpenseReport(report)) && !isDeletedParentAction;
-
-    const changeMoneyRequestStatus = () => {
-        const iouTransactionID = parentReportAction?.actionName === CONST.REPORT.ACTIONS.TYPE.IOU ? parentReportAction.originalMessage?.IOUTransactionID ?? '' : '';
+    const getStatusIcon: (src: IconAsset) => ReactNode = (src) => (
+        <Icon
+            src={src}
+            height={variables.iconSizeSmall}
+            width={variables.iconSizeSmall}
+            fill={theme.icon}
+        />
+    );
 
+    const getStatusBarProps: () => MoneyRequestHeaderStatusBarProps | undefined = () => {
         if (isOnHold) {
-            IOU.unholdRequest(iouTransactionID, report?.reportID);
-        } else {
-            const activeRoute = encodeURIComponent(Navigation.getActiveRouteWithoutParams());
-            Navigation.navigate(ROUTES.MONEY_REQUEST_HOLD_REASON.getRoute(policy?.type ?? CONST.POLICY.TYPE.PERSONAL, iouTransactionID, report?.reportID, activeRoute));
+            return {icon: getStatusIcon(Expensicons.Stopwatch), description: isDuplicate ? translate('iou.expenseDuplicate') : translate('iou.expenseOnHold')};
         }
-    };
 
-    useEffect(() => {
-        if (canDeleteRequest) {
-            return;
+        if (TransactionUtils.isExpensifyCardTransaction(transaction) && TransactionUtils.isPending(transaction)) {
+            return {icon: getStatusIcon(Expensicons.CreditCardHourglass), description: translate('iou.transactionPendingDescription')};
         }
-
-        setIsDeleteModalVisible(false);
-    }, [canDeleteRequest]);
-
-    const threeDotsMenuItems = [HeaderUtils.getPinMenuItem(report)];
-    if (canHoldOrUnholdRequest) {
-        const isRequestIOU = parentReport?.type === 'iou';
-        const isHoldCreator = ReportUtils.isHoldCreator(transaction, report?.reportID) && isRequestIOU;
-        const isTrackExpenseReport = ReportUtils.isTrackExpenseReport(report);
-        const canModifyStatus = !isTrackExpenseReport && (isPolicyAdmin || isActionOwner || isApprover);
-        if (isOnHold && (isHoldCreator || (!isRequestIOU && canModifyStatus))) {
-            threeDotsMenuItems.push({
-                icon: Expensicons.Stopwatch,
-                text: translate('iou.unholdExpense'),
-                onSelected: () => changeMoneyRequestStatus(),
-            });
+        if (TransactionUtils.hasPendingRTERViolation(TransactionUtils.getTransactionViolations(transaction?.transactionID ?? '-1', transactionViolations))) {
+            return {icon: getStatusIcon(Expensicons.Hourglass), description: translate('iou.pendingMatchWithCreditCardDescription')};
         }
-        if (!isOnHold && (isRequestIOU || canModifyStatus) && !isScanning) {
-            threeDotsMenuItems.push({
-                icon: Expensicons.Stopwatch,
-                text: translate('iou.holdExpense'),
-                onSelected: () => changeMoneyRequestStatus(),
-            });
+        if (isScanning) {
+            return {icon: getStatusIcon(Expensicons.ReceiptScan), description: translate('iou.receiptScanInProgressDescription')};
         }
-    }
+    };
+
+    const statusBarProps = getStatusBarProps();
 
     useEffect(() => {
-        setShouldShowHoldMenu(isOnHold && !shownHoldUseExplanation);
-    }, [isOnHold, shownHoldUseExplanation]);
+        if (isLoadingHoldUseExplained) {
+            return;
+        }
+        setShouldShowHoldMenu(isOnHold && !dismissedHoldUseExplanation);
+    }, [dismissedHoldUseExplanation, isLoadingHoldUseExplained, isOnHold]);
 
     useEffect(() => {
         if (!shouldShowHoldMenu) {
             return;
         }
 
-        if (shouldUseNarrowLayout) {
+        if (isSmallScreenWidth) {
             if (Navigation.getActiveRoute().slice(1) === ROUTES.PROCESS_MONEY_REQUEST_HOLD) {
                 Navigation.goBack();
             }
         } else {
             Navigation.navigate(ROUTES.PROCESS_MONEY_REQUEST_HOLD);
         }
-    }, [shouldUseNarrowLayout, shouldShowHoldMenu]);
+    }, [isSmallScreenWidth, shouldShowHoldMenu]);
 
     const handleHoldRequestClose = () => {
-        IOU.setShownHoldUseExplanation();
+        IOU.dismissHoldUseExplanation();
     };
 
-    if (canDeleteRequest) {
-        threeDotsMenuItems.push({
-            icon: Expensicons.Trashcan,
-            text: translate('reportActionContextMenu.deleteAction', {action: parentReportAction}),
-            onSelected: () => setIsDeleteModalVisible(true),
-        });
-    }
-
     return (
         <>
             <View style={[styles.pl0]}>
                 <HeaderWithBackButton
-                    shouldShowBorderBottom={!isScanning && !isPending && !isOnHold}
+                    shouldShowBorderBottom={!statusBarProps && !isOnHold}
                     shouldShowReportAvatarWithDisplay
+                    shouldEnableDetailPageNavigation
                     shouldShowPinButton={false}
-                    shouldShowThreeDotsButton
-                    threeDotsMenuItems={threeDotsMenuItems}
-                    threeDotsAnchorPosition={styles.threeDotsPopoverOffsetNoCloseButton(windowWidth)}
                     report={{
                         ...report,
                         ownerAccountID: parentReport?.ownerAccountID,
                     }}
                     policy={policy}
                     shouldShowBackButton={shouldUseNarrowLayout}
-                    onBackButtonPress={() => Navigation.goBack(undefined, false, true)}
-                />
-                {isPending && (
-                    <MoneyRequestHeaderStatusBar
-                        title={translate('iou.pending')}
-                        description={translate('iou.transactionPendingText')}
-                        shouldShowBorderBottom={!isScanning}
-                    />
+                    onBackButtonPress={onBackButtonPress}
+                >
+                    {hasAllPendingRTERViolations && !shouldUseNarrowLayout && (
+                        <Button
+                            success
+                            medium
+                            text={translate('iou.markAsCash')}
+                            style={[styles.p0]}
+                            onPress={markAsCash}
+                        />
+                    )}
+                    {isDuplicate && !shouldUseNarrowLayout && (
+                        <Button
+                            success
+                            medium
+                            text={translate('iou.reviewDuplicates')}
+                            style={[styles.p0, styles.ml2]}
+                            onPress={() => {
+                                Navigation.navigate(ROUTES.TRANSACTION_DUPLICATE_REVIEW_PAGE.getRoute(report.reportID));
+                            }}
+                        />
+                    )}
+                </HeaderWithBackButton>
+                {hasAllPendingRTERViolations && shouldUseNarrowLayout && (
+                    <View style={[styles.ph5, styles.pb3]}>
+                        <Button
+                            medium
+                            success
+                            text={translate('iou.markAsCash')}
+                            style={[styles.w100, styles.pr0]}
+                            onPress={markAsCash}
+                        />
+                    </View>
                 )}
-                {isScanning && (
-                    <MoneyRequestHeaderStatusBar
-                        title={translate('iou.receiptStatusTitle')}
-                        description={translate('iou.receiptStatusText')}
-                        shouldShowBorderBottom={!isOnHold}
-                    />
+                {isDuplicate && shouldUseNarrowLayout && (
+                    <View style={[styles.ph5, styles.pb3]}>
+                        <Button
+                            success
+                            medium
+                            text={translate('iou.reviewDuplicates')}
+                            style={[styles.w100, styles.pr0]}
+                            onPress={() => {
+                                Navigation.navigate(ROUTES.TRANSACTION_DUPLICATE_REVIEW_PAGE.getRoute(report.reportID));
+                            }}
+                        />
+                    </View>
                 )}
-                {isOnHold && (
-                    <MoneyRequestHeaderStatusBar
-                        title={translate('iou.hold')}
-                        description={translate('iou.expenseOnHold')}
-                        shouldShowBorderBottom
-                        danger
-                    />
+                {statusBarProps && (
+                    <View style={[styles.ph5, styles.pb3, styles.borderBottom]}>
+                        <MoneyRequestHeaderStatusBar
+                            icon={statusBarProps.icon}
+                            description={statusBarProps.description}
+                        />
+                    </View>
                 )}
             </View>
-            <ConfirmModal
-                title={translate('iou.deleteExpense')}
-                isVisible={isDeleteModalVisible}
-                onConfirm={deleteTransaction}
-                onCancel={() => setIsDeleteModalVisible(false)}
-                prompt={translate('iou.deleteConfirmation')}
-                confirmText={translate('common.delete')}
-                cancelText={translate('common.cancel')}
-                danger
-            />
-            {shouldUseNarrowLayout && shouldShowHoldMenu && (
+            {isSmallScreenWidth && shouldShowHoldMenu && (
                 <ProcessMoneyRequestHoldMenu
                     onClose={handleHoldRequestClose}
                     onConfirm={handleHoldRequestClose}
@@ -236,28 +204,4 @@ function MoneyRequestHeader({
 
 MoneyRequestHeader.displayName = 'MoneyRequestHeader';
 
-const MoneyRequestHeaderWithTransaction = withOnyx<MoneyRequestHeaderProps, Pick<MoneyRequestHeaderOnyxProps, 'transaction' | 'shownHoldUseExplanation'>>({
-    transaction: {
-        key: ({report, parentReportActions}) => {
-            const parentReportAction = (report.parentReportActionID && parentReportActions ? parentReportActions[report.parentReportActionID] : {}) as ReportAction & OriginalMessageIOU;
-            return `${ONYXKEYS.COLLECTION.TRANSACTION}${parentReportAction?.originalMessage?.IOUTransactionID ?? 0}`;
-        },
-    },
-    shownHoldUseExplanation: {
-        key: ONYXKEYS.NVP_HOLD_USE_EXPLAINED,
-        initWithStoredValues: true,
-    },
-})(MoneyRequestHeader);
-
-export default withOnyx<Omit<MoneyRequestHeaderProps, 'transaction' | 'shownHoldUseExplanation'>, Omit<MoneyRequestHeaderOnyxProps, 'transaction' | 'shownHoldUseExplanation'>>({
-    session: {
-        key: ONYXKEYS.SESSION,
-    },
-    parentReport: {
-        key: ({report}) => `${ONYXKEYS.COLLECTION.REPORT}${report.parentReportID}`,
-    },
-    parentReportActions: {
-        key: ({report}) => `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${report.parentReportID ?? '0'}`,
-        canEvict: false,
-    },
-})(MoneyRequestHeaderWithTransaction);
+export default MoneyRequestHeader;
diff --git a/src/components/MoneyRequestHeaderStatusBar.tsx b/src/components/MoneyRequestHeaderStatusBar.tsx
index 7f26b239dcc8..e565f810d574 100644
--- a/src/components/MoneyRequestHeaderStatusBar.tsx
+++ b/src/components/MoneyRequestHeaderStatusBar.tsx
@@ -1,35 +1,25 @@
+import type {ReactNode} from 'react';
 import React from 'react';
 import {View} from 'react-native';
 import useThemeStyles from '@hooks/useThemeStyles';
-import Badge from './Badge';
 import Text from './Text';
 
 type MoneyRequestHeaderStatusBarProps = {
-    /** Title displayed in badge */
-    title: string;
+    /** Icon displayed in badge */
+    icon: ReactNode;
 
     /** Banner Description */
     description: string;
 
-    /** Whether we show the border bottom */
-    shouldShowBorderBottom: boolean;
-
-    /** Whether we should use the danger theme color */
-    danger?: boolean;
+    /** Whether we style flex grow */
+    shouldStyleFlexGrow?: boolean;
 };
 
-function MoneyRequestHeaderStatusBar({title, description, shouldShowBorderBottom, danger = false}: MoneyRequestHeaderStatusBarProps) {
+function MoneyRequestHeaderStatusBar({icon, description, shouldStyleFlexGrow = true}: MoneyRequestHeaderStatusBarProps) {
     const styles = useThemeStyles();
-    const borderBottomStyle = shouldShowBorderBottom ? styles.borderBottom : {};
     return (
-        <View style={[styles.dFlex, styles.flexRow, styles.alignItemsCenter, styles.flexGrow1, styles.overflowHidden, styles.ph5, styles.pb3, borderBottomStyle]}>
-            <View style={[styles.mr3]}>
-                <Badge
-                    text={title}
-                    badgeStyles={styles.ml0}
-                    error={danger}
-                />
-            </View>
+        <View style={[styles.dFlex, styles.flexRow, styles.alignItemsCenter, shouldStyleFlexGrow && styles.flexGrow1, styles.overflowHidden, styles.headerStatusBarContainer]}>
+            <View style={styles.mr2}>{icon}</View>
             <View style={[styles.flexShrink1]}>
                 <Text style={[styles.textLabelSupporting]}>{description}</Text>
             </View>
@@ -40,3 +30,5 @@ function MoneyRequestHeaderStatusBar({title, description, shouldShowBorderBottom
 MoneyRequestHeaderStatusBar.displayName = 'MoneyRequestHeaderStatusBar';
 
 export default MoneyRequestHeaderStatusBar;
+
+export type {MoneyRequestHeaderStatusBarProps};
diff --git a/src/components/MultiGestureCanvas/index.tsx b/src/components/MultiGestureCanvas/index.tsx
index 31a1f7a2c3d8..ff9566839d59 100644
--- a/src/components/MultiGestureCanvas/index.tsx
+++ b/src/components/MultiGestureCanvas/index.tsx
@@ -1,6 +1,7 @@
 import type {ForwardedRef} from 'react';
 import React, {useEffect, useMemo, useRef} from 'react';
 import {View} from 'react-native';
+import type {GestureType} from 'react-native-gesture-handler';
 import {Gesture, GestureDetector} from 'react-native-gesture-handler';
 import type {GestureRef} from 'react-native-gesture-handler/lib/typescript/handlers/gestures/gesture';
 import type PagerView from 'react-native-pager-view';
@@ -40,7 +41,7 @@ type MultiGestureCanvasProps = ChildrenProps & {
     shouldDisableTransformationGestures?: SharedValue<boolean>;
 
     /** If there is a pager wrapping the canvas, we need to disable the pan gesture in case the pager is swiping */
-    pagerRef?: ForwardedRef<PagerView>; // TODO: For TS migration: Exclude<GestureRef, number>
+    pagerRef?: ForwardedRef<PagerView | GestureType>; // TODO: For TS migration: Exclude<GestureRef, number>
 
     /** Handles scale changed event */
     onScaleChanged?: OnScaleChangedCallback;
@@ -48,6 +49,7 @@ type MultiGestureCanvasProps = ChildrenProps & {
     /** Handles scale changed event */
     onTap?: OnTapCallback;
 
+    /** Handles swipe down event */
     onSwipeDown?: OnSwipeDownCallback;
 };
 
@@ -119,6 +121,7 @@ function MultiGestureCanvas({
     const reset = useWorkletCallback((animated: boolean, callback?: () => void) => {
         stopAnimation();
 
+        // eslint-disable-next-line react-compiler/react-compiler
         offsetX.value = 0;
         offsetY.value = 0;
         pinchScale.value = 1;
@@ -242,11 +245,12 @@ function MultiGestureCanvas({
             <GestureDetector gesture={Gesture.Simultaneous(pinchGesture, Gesture.Race(singleTapGesture, doubleTapGesture, panGesture))}>
                 <View
                     collapsable={false}
+                    onTouchEnd={(e) => e.preventDefault()}
                     style={StyleUtils.getFullscreenCenteredContentStyles()}
                 >
                     <Animated.View
                         collapsable={false}
-                        style={animatedStyles}
+                        style={[animatedStyles, styles.canvasContainer]}
                     >
                         {children}
                     </Animated.View>
diff --git a/src/components/MultiGestureCanvas/usePanGesture.ts b/src/components/MultiGestureCanvas/usePanGesture.ts
index 903f384dd525..fa27e48eea4c 100644
--- a/src/components/MultiGestureCanvas/usePanGesture.ts
+++ b/src/components/MultiGestureCanvas/usePanGesture.ts
@@ -3,6 +3,7 @@ import {Dimensions} from 'react-native';
 import type {PanGesture} from 'react-native-gesture-handler';
 import {Gesture} from 'react-native-gesture-handler';
 import {runOnJS, useDerivedValue, useSharedValue, useWorkletCallback, withDecay, withSpring} from 'react-native-reanimated';
+import * as Browser from '@libs/Browser';
 import {SPRING_CONFIG} from './constants';
 import type {MultiGestureCanvasVariables} from './types';
 import * as MultiGestureCanvasUtils from './utils';
@@ -57,6 +58,8 @@ const usePanGesture = ({
     const panVelocityX = useSharedValue(0);
     const panVelocityY = useSharedValue(0);
 
+    const isMobileBrowser = Browser.isMobile();
+
     // Disable "swipe down to close" gesture when content is bigger than the canvas
     const enableSwipeDownToClose = useDerivedValue(() => canvasSize.height < zoomedContentHeight.value, [canvasSize.height]);
 
@@ -113,6 +116,7 @@ const usePanGesture = ({
             // If the (absolute) velocity is 0, we don't need to run an animation
             if (Math.abs(panVelocityX.value) !== 0) {
                 // Phase out the pan animation
+                // eslint-disable-next-line react-compiler/react-compiler
                 offsetX.value = withDecay({
                     velocity: panVelocityX.value,
                     clamp: [horizontalBoundaries.min, horizontalBoundaries.max],
@@ -207,7 +211,9 @@ const usePanGesture = ({
             panVelocityY.value = evt.velocityY;
 
             if (!isSwipingDownToClose.value) {
-                panTranslateX.value += evt.changeX;
+                if (!isMobileBrowser || (isMobileBrowser && zoomScale.value !== 1)) {
+                    panTranslateX.value += evt.changeX;
+                }
             }
 
             if (enableSwipeDownToClose.value || isSwipingDownToClose.value) {
diff --git a/src/components/MultiGestureCanvas/usePinchGesture.ts b/src/components/MultiGestureCanvas/usePinchGesture.ts
index 87d3bdada6a2..46a5e28e5732 100644
--- a/src/components/MultiGestureCanvas/usePinchGesture.ts
+++ b/src/components/MultiGestureCanvas/usePinchGesture.ts
@@ -68,6 +68,7 @@ const usePinchGesture = ({
     useAnimatedReaction(
         () => [pinchTranslateX.value, pinchTranslateY.value, pinchBounceTranslateX.value, pinchBounceTranslateY.value],
         ([translateX, translateY, bounceX, bounceY]) => {
+            // eslint-disable-next-line react-compiler/react-compiler
             totalPinchTranslateX.value = translateX + bounceX;
             totalPinchTranslateY.value = translateY + bounceY;
         },
diff --git a/src/components/MultiGestureCanvas/useTapGestures.ts b/src/components/MultiGestureCanvas/useTapGestures.ts
index f550e93d6be2..e4bb02bd5d34 100644
--- a/src/components/MultiGestureCanvas/useTapGestures.ts
+++ b/src/components/MultiGestureCanvas/useTapGestures.ts
@@ -111,6 +111,7 @@ const useTapGestures = ({
                 offsetAfterZooming.y = 0;
             }
 
+            // eslint-disable-next-line react-compiler/react-compiler
             offsetX.value = withSpring(offsetAfterZooming.x, SPRING_CONFIG);
             offsetY.value = withSpring(offsetAfterZooming.y, SPRING_CONFIG);
             zoomScale.value = withSpring(doubleTapScale, SPRING_CONFIG, callback);
diff --git a/src/components/MultiGestureCanvas/utils.ts b/src/components/MultiGestureCanvas/utils.ts
index e5688489c048..10d58b44d04f 100644
--- a/src/components/MultiGestureCanvas/utils.ts
+++ b/src/components/MultiGestureCanvas/utils.ts
@@ -2,16 +2,6 @@ import type {CanvasSize, ContentSize} from './types';
 
 type GetCanvasFitScale = (props: {canvasSize: CanvasSize; contentSize: ContentSize}) => {scaleX: number; scaleY: number; minScale: number; maxScale: number};
 
-const getCanvasFitScale: GetCanvasFitScale = ({canvasSize, contentSize}) => {
-    const scaleX = canvasSize.width / contentSize.width;
-    const scaleY = canvasSize.height / contentSize.height;
-
-    const minScale = Math.min(scaleX, scaleY);
-    const maxScale = Math.max(scaleX, scaleY);
-
-    return {scaleX, scaleY, minScale, maxScale};
-};
-
 /** Clamps a value between a lower and upper bound */
 function clamp(value: number, lowerBound: number, upperBound: number) {
     'worklet';
@@ -19,4 +9,13 @@ function clamp(value: number, lowerBound: number, upperBound: number) {
     return Math.min(Math.max(lowerBound, value), upperBound);
 }
 
+const getCanvasFitScale: GetCanvasFitScale = ({canvasSize, contentSize}) => {
+    const scaleX = clamp(canvasSize.width / contentSize.width, 0, 1);
+    const scaleY = clamp(canvasSize.height / contentSize.height, 0, 1);
+    const minScale = Math.min(scaleX, scaleY);
+    const maxScale = Math.max(scaleX, scaleY);
+
+    return {scaleX, scaleY, minScale, maxScale};
+};
+
 export {getCanvasFitScale, clamp};
diff --git a/src/components/MultipleAvatars.tsx b/src/components/MultipleAvatars.tsx
index d5fcf6607179..601b8f7edfed 100644
--- a/src/components/MultipleAvatars.tsx
+++ b/src/components/MultipleAvatars.tsx
@@ -156,7 +156,7 @@ function MultipleAvatars({
                         size={size}
                         fill={icons[0].fill}
                         name={icons[0].name}
-                        accountID={icons[0].id}
+                        avatarID={icons[0].id}
                         type={icons[0].type}
                         fallbackIcon={icons[0].fallbackIcon}
                     />
@@ -206,7 +206,7 @@ function MultipleAvatars({
                                 source={icon.source ?? fallbackIcon}
                                 size={size}
                                 name={icon.name}
-                                accountID={icon.id}
+                                avatarID={icon.id}
                                 type={icon.type}
                                 fallbackIcon={icon.fallbackIcon}
                             />
@@ -265,7 +265,7 @@ function MultipleAvatars({
                             imageStyles={[singleAvatarStyle]}
                             name={icons[0].name}
                             type={icons[0].type}
-                            accountID={icons[0].id}
+                            avatarID={icons[0].id}
                             fallbackIcon={icons[0].fallbackIcon}
                         />
                     </View>
@@ -285,7 +285,7 @@ function MultipleAvatars({
                                     size={avatarSize}
                                     imageStyles={[singleAvatarStyle]}
                                     name={icons[1].name}
-                                    accountID={icons[1].id}
+                                    avatarID={icons[1].id}
                                     type={icons[1].type}
                                     fallbackIcon={icons[1].fallbackIcon}
                                 />
diff --git a/src/components/OfflineIndicator.tsx b/src/components/OfflineIndicator.tsx
index 1a61b6622783..337e5dd850f7 100644
--- a/src/components/OfflineIndicator.tsx
+++ b/src/components/OfflineIndicator.tsx
@@ -3,9 +3,9 @@ import type {StyleProp, ViewStyle} from 'react-native';
 import {View} from 'react-native';
 import useLocalize from '@hooks/useLocalize';
 import useNetwork from '@hooks/useNetwork';
+import useResponsiveLayout from '@hooks/useResponsiveLayout';
 import useTheme from '@hooks/useTheme';
 import useThemeStyles from '@hooks/useThemeStyles';
-import useWindowDimensions from '@hooks/useWindowDimensions';
 import variables from '@styles/variables';
 import Icon from './Icon';
 import * as Expensicons from './Icon/Expensicons';
@@ -24,15 +24,15 @@ function OfflineIndicator({style, containerStyles}: OfflineIndicatorProps) {
     const styles = useThemeStyles();
     const {translate} = useLocalize();
     const {isOffline} = useNetwork();
-    const {isSmallScreenWidth} = useWindowDimensions();
+    const {shouldUseNarrowLayout} = useResponsiveLayout();
 
     const computedStyles = useMemo((): StyleProp<ViewStyle> => {
         if (containerStyles) {
             return containerStyles;
         }
 
-        return isSmallScreenWidth ? styles.offlineIndicatorMobile : styles.offlineIndicator;
-    }, [containerStyles, isSmallScreenWidth, styles.offlineIndicatorMobile, styles.offlineIndicator]);
+        return shouldUseNarrowLayout ? styles.offlineIndicatorMobile : styles.offlineIndicator;
+    }, [containerStyles, shouldUseNarrowLayout, styles.offlineIndicatorMobile, styles.offlineIndicator]);
 
     if (!isOffline) {
         return null;
diff --git a/src/components/OfflineWithFeedback.tsx b/src/components/OfflineWithFeedback.tsx
index ba9ce9858d03..1f4b56d87f17 100644
--- a/src/components/OfflineWithFeedback.tsx
+++ b/src/components/OfflineWithFeedback.tsx
@@ -1,20 +1,19 @@
-import {mapValues} from 'lodash';
 import React, {useCallback} from 'react';
-import type {ImageStyle, StyleProp, TextStyle, ViewStyle} from 'react-native';
+import type {StyleProp, ViewStyle} from 'react-native';
 import {View} from 'react-native';
 import useNetwork from '@hooks/useNetwork';
 import useStyleUtils from '@hooks/useStyleUtils';
 import useThemeStyles from '@hooks/useThemeStyles';
-import * as ErrorUtils from '@libs/ErrorUtils';
-import type {MaybePhraseKey} from '@libs/Localize';
 import mapChildrenFlat from '@libs/mapChildrenFlat';
 import shouldRenderOffscreen from '@libs/shouldRenderOffscreen';
+import type {AllStyles} from '@styles/utils/types';
 import CONST from '@src/CONST';
 import type * as OnyxCommon from '@src/types/onyx/OnyxCommon';
-import type {ReceiptError, ReceiptErrors} from '@src/types/onyx/Transaction';
+import type {ReceiptErrors} from '@src/types/onyx/Transaction';
 import type ChildrenProps from '@src/types/utils/ChildrenProps';
 import {isEmptyObject} from '@src/types/utils/EmptyObject';
-import MessagesRow from './MessagesRow';
+import CustomStylesForChildrenProvider from './CustomStylesForChildrenProvider';
+import ErrorMessageRow from './ErrorMessageRow';
 
 /**
  * This component should be used when we are using the offline pattern B (offline with feedback).
@@ -60,11 +59,7 @@ type OfflineWithFeedbackProps = ChildrenProps & {
     canDismissError?: boolean;
 };
 
-type StrikethroughProps = Partial<ChildrenProps> & {style: Array<ViewStyle | TextStyle | ImageStyle>};
-
-function isMaybePhraseKeyType(message: unknown): message is MaybePhraseKey {
-    return typeof message === 'string' || Array.isArray(message);
-}
+type StrikethroughProps = Partial<ChildrenProps> & {style: AllStyles[]};
 
 function OfflineWithFeedback({
     pendingAction,
@@ -87,12 +82,6 @@ function OfflineWithFeedback({
 
     const hasErrors = !isEmptyObject(errors ?? {});
 
-    // Some errors have a null message. This is used to apply opacity only and to avoid showing redundant messages.
-    const errorEntries = Object.entries(errors ?? {});
-    const filteredErrorEntries = errorEntries.filter((errorEntry): errorEntry is [string, MaybePhraseKey | ReceiptError] => errorEntry[1] !== null);
-    const errorMessages = mapValues(Object.fromEntries(filteredErrorEntries), (error) => (isMaybePhraseKeyType(error) ? ErrorUtils.getErrorMessageWithTranslationData(error) : error));
-
-    const hasErrorMessages = !isEmptyObject(errorMessages);
     const isOfflinePendingAction = !!isOffline && !!pendingAction;
     const isUpdateOrDeleteError = hasErrors && (pendingAction === CONST.RED_BRICK_ROAD_PENDING_ACTION.DELETE || pendingAction === CONST.RED_BRICK_ROAD_PENDING_ACTION.UPDATE);
     const isAddError = hasErrors && pendingAction === CONST.RED_BRICK_ROAD_PENDING_ACTION.ADD;
@@ -111,12 +100,14 @@ function OfflineWithFeedback({
                     return child;
                 }
 
+                type ChildComponentProps = ChildrenProps & {style?: AllStyles};
+                const childProps = child.props as ChildComponentProps;
                 const props: StrikethroughProps = {
-                    style: StyleUtils.combineStyles(child.props.style, styles.offlineFeedback.deleted, styles.userSelectNone),
+                    style: StyleUtils.combineStyles(childProps.style ?? [], styles.offlineFeedback.deleted, styles.userSelectNone),
                 };
 
-                if (child.props.children) {
-                    props.children = applyStrikeThrough(child.props.children);
+                if (childProps.children) {
+                    props.children = applyStrikeThrough(childProps.children);
                 }
 
                 return React.cloneElement(child, props);
@@ -138,16 +129,15 @@ function OfflineWithFeedback({
                     style={[needsOpacity ? styles.offlineFeedback.pending : {}, contentContainerStyle]}
                     needsOffscreenAlphaCompositing={shouldRenderOffscreen ? needsOpacity && needsOffscreenAlphaCompositing : undefined}
                 >
-                    {children}
+                    <CustomStylesForChildrenProvider style={needsStrikeThrough ? [styles.offlineFeedback.deleted, styles.userSelectNone] : null}>{children}</CustomStylesForChildrenProvider>
                 </View>
             )}
-            {shouldShowErrorMessages && hasErrorMessages && (
-                <MessagesRow
-                    messages={errorMessages}
-                    type="error"
+            {shouldShowErrorMessages && (
+                <ErrorMessageRow
+                    errors={errors}
+                    errorRowStyles={errorRowStyles}
                     onClose={onClose}
-                    containerStyles={errorRowStyles}
-                    canDismiss={canDismissError}
+                    canDismissError={canDismissError}
                 />
             )}
         </View>
diff --git a/src/components/OnboardingWelcomeVideo.tsx b/src/components/OnboardingWelcomeVideo.tsx
index 59bf532cbe86..47444d133166 100644
--- a/src/components/OnboardingWelcomeVideo.tsx
+++ b/src/components/OnboardingWelcomeVideo.tsx
@@ -10,12 +10,11 @@ function OnboardingWelcomeVideo() {
         <FeatureTrainingModal
             title={translate('onboarding.welcomeVideo.title')}
             description={translate('onboarding.welcomeVideo.description')}
-            confirmText={translate('footer.getStarted')}
+            confirmText={translate('onboarding.getStarted')}
             videoURL={CONST.WELCOME_VIDEO_URL}
         />
     );
 }
 
 OnboardingWelcomeVideo.displayName = 'OnboardingWelcomeVideo';
-
 export default OnboardingWelcomeVideo;
diff --git a/src/components/Onfido/BaseOnfidoWeb.tsx b/src/components/Onfido/BaseOnfidoWeb.tsx
index fefe2ab0a6d1..2a2882c155eb 100644
--- a/src/components/Onfido/BaseOnfidoWeb.tsx
+++ b/src/components/Onfido/BaseOnfidoWeb.tsx
@@ -11,7 +11,7 @@ import variables from '@styles/variables';
 import CONST from '@src/CONST';
 import {isEmptyObject} from '@src/types/utils/EmptyObject';
 import './index.css';
-import type {OnfidoElement, OnfidoProps} from './types';
+import type {OnfidoElement, OnfidoError, OnfidoProps} from './types';
 
 type InitializeOnfidoProps = OnfidoProps &
     Pick<LocaleContextProps, 'translate' | 'preferredLocale'> & {
@@ -27,12 +27,14 @@ function initializeOnfido({sdkToken, onSuccess, onError, onUserExit, preferredLo
         token: sdkToken,
         containerId: CONST.ONFIDO.CONTAINER_ID,
         customUI: {
-            fontFamilyTitle: `${FontUtils.fontFamily.platform.EXP_NEUE}, -apple-system, serif`,
-            fontFamilySubtitle: `${FontUtils.fontFamily.platform.EXP_NEUE}, -apple-system, serif`,
-            fontFamilyBody: `${FontUtils.fontFamily.platform.EXP_NEUE}, -apple-system, serif`,
+            // Font styles are commented out until Onfido fixes it on their side, more info here - https://github.com/Expensify/App/issues/44570
+            // For now we will use Onfido default font which is better than random serif font which it started defaulting to
+            // fontFamilyTitle: `${FontUtils.fontFamily.platform.EXP_NEUE.fontFamily}, -apple-system, serif`,
+            // fontFamilySubtitle: `${FontUtils.fontFamily.platform.EXP_NEUE.fontFamily}, -apple-system, serif`,
+            // fontFamilyBody: `${FontUtils.fontFamily.platform.EXP_NEUE.fontFamily}, -apple-system, serif`,
             fontSizeTitle: `${variables.fontSizeLarge}px`,
             fontWeightTitle: Number(FontUtils.fontWeight.bold),
-            fontWeightSubtitle: 400,
+            fontWeightSubtitle: Number(FontUtils.fontWeight.normal),
             fontSizeSubtitle: `${variables.fontSizeNormal}px`,
             colorContentTitle: theme.text,
             colorContentSubtitle: theme.text,
@@ -92,9 +94,9 @@ function initializeOnfido({sdkToken, onSuccess, onError, onUserExit, preferredLo
             }
             onSuccess(data);
         },
-        onError: (error) => {
+        onError: (error: OnfidoError) => {
             const errorType = error.type;
-            const errorMessage = error.message ?? CONST.ERROR.UNKNOWN_ERROR;
+            const errorMessage: string = error.message ?? CONST.ERROR.UNKNOWN_ERROR;
             Log.hmmm('Onfido error', {errorType, errorMessage});
             if (errorType === CONST.WALLET.ERROR.ONFIDO_USER_CONSENT_DENIED) {
                 onUserExit();
@@ -140,7 +142,7 @@ function Onfido({sdkToken, onSuccess, onError, onUserExit}: OnfidoProps, ref: Fo
         window.addEventListener('userAnalyticsEvent', logOnFidoEvent);
         return () => window.removeEventListener('userAnalyticsEvent', logOnFidoEvent);
         // Onfido should be initialized only once on mount
-        // eslint-disable-next-line react-hooks/exhaustive-deps
+        // eslint-disable-next-line react-compiler/react-compiler, react-hooks/exhaustive-deps
     }, []);
 
     return (
diff --git a/src/components/Onfido/index.native.tsx b/src/components/Onfido/index.native.tsx
index a7e7a277fff9..c6eb9c8868ee 100644
--- a/src/components/Onfido/index.native.tsx
+++ b/src/components/Onfido/index.native.tsx
@@ -8,7 +8,7 @@ import getPlatform from '@libs/getPlatform';
 import Log from '@libs/Log';
 import CONST from '@src/CONST';
 import type {TranslationPaths} from '@src/languages/types';
-import type {OnfidoProps} from './types';
+import type {OnfidoError, OnfidoProps} from './types';
 
 function Onfido({sdkToken, onUserExit, onSuccess, onError}: OnfidoProps) {
     const {translate} = useLocalize();
@@ -29,15 +29,15 @@ function Onfido({sdkToken, onUserExit, onSuccess, onError}: OnfidoProps) {
             },
         })
             .then(onSuccess)
-            .catch((error) => {
-                const errorMessage = error.message ?? CONST.ERROR.UNKNOWN_ERROR;
+            .catch((error: OnfidoError) => {
+                const errorMessage: string = error.message ?? CONST.ERROR.UNKNOWN_ERROR;
                 const errorType = error.type;
 
                 Log.hmmm('Onfido error on native', {errorType, errorMessage});
 
                 // If the user cancels the Onfido flow we won't log this error as it's normal. In the React Native SDK the user exiting the flow will trigger this error which we can use as
                 // our "user exited the flow" callback. On web, this event has it's own callback passed as a config so we don't need to bother with this there.
-                if ([CONST.ONFIDO.ERROR.USER_CANCELLED, CONST.ONFIDO.ERROR.USER_TAPPED_BACK, CONST.ONFIDO.ERROR.USER_EXITED].includes(errorMessage)) {
+                if (([CONST.ONFIDO.ERROR.USER_CANCELLED, CONST.ONFIDO.ERROR.USER_TAPPED_BACK, CONST.ONFIDO.ERROR.USER_EXITED] as string[]).includes(errorMessage)) {
                     onUserExit();
                     return;
                 }
@@ -88,7 +88,7 @@ function Onfido({sdkToken, onUserExit, onSuccess, onError}: OnfidoProps) {
                 }
             });
         // Onfido should be initialized only once on mount
-        // eslint-disable-next-line react-hooks/exhaustive-deps
+        // eslint-disable-next-line react-compiler/react-compiler, react-hooks/exhaustive-deps
     }, []);
 
     return <FullscreenLoadingIndicator />;
diff --git a/src/components/Onfido/types.ts b/src/components/Onfido/types.ts
index 4005dc2597cb..3e88ce3b2dda 100644
--- a/src/components/Onfido/types.ts
+++ b/src/components/Onfido/types.ts
@@ -25,4 +25,8 @@ type OnfidoProps = {
     onError: (error?: string) => void;
 };
 
-export type {OnfidoProps, OnfidoElement, OnfidoData, OnfidoDataWithApplicantID};
+type OnfidoError = Error & {
+    type?: string;
+};
+
+export type {OnfidoProps, OnfidoElement, OnfidoData, OnfidoDataWithApplicantID, OnfidoError};
diff --git a/src/components/OnyxProvider.tsx b/src/components/OnyxProvider.tsx
index af16b7300e1a..23ddf2b0c4dd 100644
--- a/src/components/OnyxProvider.tsx
+++ b/src/components/OnyxProvider.tsx
@@ -6,17 +6,15 @@ import createOnyxContext from './createOnyxContext';
 // Set up any providers for individual keys. This should only be used in cases where many components will subscribe to
 // the same key (e.g. FlatList renderItem components)
 const [withNetwork, NetworkProvider, NetworkContext] = createOnyxContext(ONYXKEYS.NETWORK);
-const [withPersonalDetails, PersonalDetailsProvider, , usePersonalDetails] = createOnyxContext(ONYXKEYS.PERSONAL_DETAILS_LIST);
+const [, PersonalDetailsProvider, , usePersonalDetails] = createOnyxContext(ONYXKEYS.PERSONAL_DETAILS_LIST);
 const [withCurrentDate, CurrentDateProvider] = createOnyxContext(ONYXKEYS.CURRENT_DATE);
-const [withReportActionsDrafts, ReportActionsDraftsProvider, , useReportActionsDrafts] = createOnyxContext(ONYXKEYS.COLLECTION.REPORT_ACTIONS_DRAFTS);
-const [withBlockedFromConcierge, BlockedFromConciergeProvider, , useBlockedFromConcierge] = createOnyxContext(ONYXKEYS.NVP_BLOCKED_FROM_CONCIERGE);
-const [withBetas, BetasProvider, BetasContext, useBetas] = createOnyxContext(ONYXKEYS.BETAS);
-const [withReportCommentDrafts, ReportCommentDraftsProvider] = createOnyxContext(ONYXKEYS.COLLECTION.REPORT_DRAFT_COMMENT);
-const [withPreferredTheme, PreferredThemeProvider, PreferredThemeContext] = createOnyxContext(ONYXKEYS.PREFERRED_THEME);
-const [withFrequentlyUsedEmojis, FrequentlyUsedEmojisProvider, , useFrequentlyUsedEmojis] = createOnyxContext(ONYXKEYS.FREQUENTLY_USED_EMOJIS);
-const [withPreferredEmojiSkinTone, PreferredEmojiSkinToneProvider, PreferredEmojiSkinToneContext] = createOnyxContext(ONYXKEYS.PREFERRED_EMOJI_SKIN_TONE);
+const [, BlockedFromConciergeProvider, , useBlockedFromConcierge] = createOnyxContext(ONYXKEYS.NVP_BLOCKED_FROM_CONCIERGE);
+const [, BetasProvider, BetasContext, useBetas] = createOnyxContext(ONYXKEYS.BETAS);
+const [, ReportCommentDraftsProvider] = createOnyxContext(ONYXKEYS.COLLECTION.REPORT_DRAFT_COMMENT);
+const [, PreferredThemeProvider, PreferredThemeContext] = createOnyxContext(ONYXKEYS.PREFERRED_THEME);
+const [, FrequentlyUsedEmojisProvider, , useFrequentlyUsedEmojis] = createOnyxContext(ONYXKEYS.FREQUENTLY_USED_EMOJIS);
+const [, PreferredEmojiSkinToneProvider, PreferredEmojiSkinToneContext] = createOnyxContext(ONYXKEYS.PREFERRED_EMOJI_SKIN_TONE);
 const [, SessionProvider, , useSession] = createOnyxContext(ONYXKEYS.SESSION);
-const [, AccountProvider, , useAccount] = createOnyxContext(ONYXKEYS.ACCOUNT);
 
 type OnyxProviderProps = {
     /** Rendered child component */
@@ -29,7 +27,6 @@ function OnyxProvider(props: OnyxProviderProps) {
             components={[
                 NetworkProvider,
                 PersonalDetailsProvider,
-                ReportActionsDraftsProvider,
                 CurrentDateProvider,
                 BlockedFromConciergeProvider,
                 BetasProvider,
@@ -38,7 +35,6 @@ function OnyxProvider(props: OnyxProviderProps) {
                 FrequentlyUsedEmojisProvider,
                 PreferredEmojiSkinToneProvider,
                 SessionProvider,
-                AccountProvider,
             ]}
         >
             {props.children}
@@ -52,24 +48,14 @@ export default OnyxProvider;
 
 export {
     withNetwork,
-    withPersonalDetails,
     usePersonalDetails,
-    withReportActionsDrafts,
     withCurrentDate,
-    withBlockedFromConcierge,
-    withBetas,
     NetworkContext,
     BetasContext,
-    withReportCommentDrafts,
-    withPreferredTheme,
     PreferredThemeContext,
     useBetas,
-    withFrequentlyUsedEmojis,
     useFrequentlyUsedEmojis,
-    withPreferredEmojiSkinTone,
     PreferredEmojiSkinToneContext,
     useBlockedFromConcierge,
-    useReportActionsDrafts,
     useSession,
-    useAccount,
 };
diff --git a/src/components/OpacityView.tsx b/src/components/OpacityView.tsx
index 41ab148bd7f2..d4a5c05167a0 100644
--- a/src/components/OpacityView.tsx
+++ b/src/components/OpacityView.tsx
@@ -36,6 +36,7 @@ function OpacityView({shouldDim, children, style = [], dimmingValue = variables.
 
     React.useEffect(() => {
         if (shouldDim) {
+            // eslint-disable-next-line react-compiler/react-compiler
             opacity.value = withTiming(dimmingValue, {duration: 50});
         } else {
             opacity.value = withTiming(1, {duration: 50});
diff --git a/src/components/OptionListContextProvider.tsx b/src/components/OptionListContextProvider.tsx
index 4eef9e93f188..f098188de270 100644
--- a/src/components/OptionListContextProvider.tsx
+++ b/src/components/OptionListContextProvider.tsx
@@ -53,63 +53,27 @@ function OptionsListContextProvider({reports, children}: OptionsListProviderProp
 
     const personalDetails = usePersonalDetails() || CONST.EMPTY_OBJECT;
     const prevPersonalDetails = usePrevious(personalDetails);
-    const prevReports = usePrevious(reports);
 
     /**
-     * This effect is used to update the options list when a report is updated.
+     * This effect is used to update the options list when reports change.
      */
     useEffect(() => {
         // there is no need to update the options if the options are not initialized
-        if (!areOptionsInitialized.current) {
-            return;
-        }
-
-        const lastUpdatedReport = ReportUtils.getLastUpdatedReport();
-
-        if (!lastUpdatedReport) {
-            return;
-        }
-
-        const newOption = OptionsListUtils.createOptionFromReport(lastUpdatedReport, personalDetails);
-        const replaceIndex = options.reports.findIndex((option) => option.reportID === lastUpdatedReport.reportID);
-
-        if (replaceIndex === -1) {
-            return;
-        }
-
-        setOptions((prevOptions) => {
-            const newOptions = {...prevOptions};
-            newOptions.reports[replaceIndex] = newOption;
-            return newOptions;
-        });
-        // eslint-disable-next-line react-hooks/exhaustive-deps
-    }, [reports]);
-
-    /**
-     * This effect is used to add a new report option or remove a report option from the list of options when a new report is added to/removed from the collection.
-     */
-    useEffect(() => {
         if (!areOptionsInitialized.current || !reports) {
             return;
         }
-        const missingReportIds = Object.keys(reports).filter((key) => prevReports && !(key in prevReports));
+        // Since reports updates can happen in bulk, and some reports depend on other reports, we need to recreate the whole list from scratch.
+        const newReports = OptionsListUtils.createOptionList(personalDetails, reports).reports;
 
         setOptions((prevOptions) => {
             const newOptions = {
                 ...prevOptions,
-                reports: prevOptions.reports.filter((report) => reports[`${ONYXKEYS.COLLECTION.REPORT}${report.reportID}`] !== null),
+                reports: newReports,
             };
-            missingReportIds.forEach((missingReportId) => {
-                const report = missingReportId ? reports[missingReportId] : null;
-                if (!missingReportId || !report) {
-                    return;
-                }
-                const reportOption = OptionsListUtils.createOptionFromReport(report, personalDetails);
-                newOptions.reports.push(reportOption);
-            });
+
             return newOptions;
         });
-        // eslint-disable-next-line react-hooks/exhaustive-deps
+        // eslint-disable-next-line react-compiler/react-compiler, react-hooks/exhaustive-deps
     }, [reports]);
 
     /**
@@ -126,16 +90,16 @@ function OptionsListContextProvider({reports, children}: OptionsListProviderProp
             newReportOption: OptionsListUtils.SearchOption<Report>;
         }> = [];
 
-        Object.keys(personalDetails).forEach((accoutID) => {
-            const prevPersonalDetail = prevPersonalDetails?.[accoutID];
-            const personalDetail = personalDetails?.[accoutID];
+        Object.keys(personalDetails).forEach((accountID) => {
+            const prevPersonalDetail = prevPersonalDetails?.[accountID];
+            const personalDetail = personalDetails?.[accountID];
 
             if (isEqualPersonalDetail(prevPersonalDetail, personalDetail)) {
                 return;
             }
 
             Object.values(reports ?? {})
-                .filter((report) => Boolean(report?.participantAccountIDs?.includes(Number(accoutID))) || (ReportUtils.isSelfDM(report) && report?.ownerAccountID === Number(accoutID)))
+                .filter((report) => !!Object.keys(report?.participants ?? {}).includes(accountID) || (ReportUtils.isSelfDM(report) && report?.ownerAccountID === Number(accountID)))
                 .forEach((report) => {
                     if (!report) {
                         return;
@@ -160,7 +124,7 @@ function OptionsListContextProvider({reports, children}: OptionsListProviderProp
         });
 
         // This effect is used to update the options list when personal details change so we ignore all dependencies except personalDetails
-        // eslint-disable-next-line react-hooks/exhaustive-deps
+        // eslint-disable-next-line react-compiler/react-compiler, react-hooks/exhaustive-deps
     }, [personalDetails]);
 
     const loadOptions = useCallback(() => {
diff --git a/src/components/OptionRow.tsx b/src/components/OptionRow.tsx
index 4e161d239fe6..029bd57cd876 100644
--- a/src/components/OptionRow.tsx
+++ b/src/components/OptionRow.tsx
@@ -15,6 +15,7 @@ import DisplayNames from './DisplayNames';
 import Hoverable from './Hoverable';
 import Icon from './Icon';
 import * as Expensicons from './Icon/Expensicons';
+import MoneyRequestAmountInput from './MoneyRequestAmountInput';
 import MultipleAvatars from './MultipleAvatars';
 import OfflineWithFeedback from './OfflineWithFeedback';
 import PressableWithFeedback from './Pressable/PressableWithFeedback';
@@ -138,16 +139,16 @@ function OptionRow({
         style,
         (option.alternateTextMaxLines ?? 1) === 1 ? styles.pre : styles.preWrap,
     ];
-    const contentContainerStyles = [styles.flex1];
+    const contentContainerStyles = [styles.flex1, styles.mr3];
     const sidebarInnerRowStyle = StyleSheet.flatten([styles.chatLinkRowPressable, styles.flexGrow1, styles.optionItemAvatarNameWrapper, styles.optionRow, styles.justifyContentCenter]);
     const flattenHoverStyle = StyleSheet.flatten(hoverStyle);
     const hoveredStyle = hoverStyle ? flattenHoverStyle : styles.sidebarLinkHover;
     const hoveredBackgroundColor = hoveredStyle?.backgroundColor ? (hoveredStyle.backgroundColor as string) : backgroundColor;
     const focusedBackgroundColor = styles.sidebarLinkActive.backgroundColor;
-    const isMultipleParticipant = (option.participantsList?.length ?? 0) > 1;
+    const shouldUseShortFormInTooltip = (option.participantsList?.length ?? 0) > 1;
 
     // We only create tooltips for the first 10 users or so since some reports have hundreds of users, causing performance to degrade.
-    const displayNamesWithTooltips = ReportUtils.getDisplayNamesWithTooltips((option.participantsList ?? (option.accountID ? [option] : [])).slice(0, 10), isMultipleParticipant);
+    const displayNamesWithTooltips = ReportUtils.getDisplayNamesWithTooltips((option.participantsList ?? (option.accountID ? [option] : [])).slice(0, 10), shouldUseShortFormInTooltip);
     let subscriptColor = theme.appBG;
     if (optionIsFocused) {
         subscriptColor = focusedBackgroundColor;
@@ -201,6 +202,7 @@ function OptionRow({
                         hoverStyle={!optionIsFocused ? hoverStyle ?? styles.sidebarLinkHover : undefined}
                         needsOffscreenAlphaCompositing={(option.icons?.length ?? 0) >= 2}
                         onMouseDown={shouldPreventDefaultFocusOnSelectRow ? (event) => event.preventDefault() : undefined}
+                        tabIndex={option.tabIndex ?? 0}
                     >
                         <View style={sidebarInnerRowStyle}>
                             <View style={[styles.flexRow, styles.alignItemsCenter]}>
@@ -251,6 +253,27 @@ function OptionRow({
                                         <Text style={[styles.textLabel]}>{option.descriptiveText}</Text>
                                     </View>
                                 ) : null}
+                                {option.shouldShowAmountInput && option.amountInputProps ? (
+                                    <MoneyRequestAmountInput
+                                        amount={option.amountInputProps.amount}
+                                        currency={option.amountInputProps.currency}
+                                        prefixCharacter={option.amountInputProps.prefixCharacter}
+                                        disableKeyboard={false}
+                                        isCurrencyPressable={false}
+                                        hideFocusedState={false}
+                                        hideCurrencySymbol
+                                        formatAmountOnBlur
+                                        prefixContainerStyle={[styles.pv0]}
+                                        containerStyle={[styles.textInputContainer]}
+                                        inputStyle={[
+                                            styles.optionRowAmountInput,
+                                            StyleUtils.getPaddingLeft(StyleUtils.getCharacterPadding(option.amountInputProps.prefixCharacter ?? '') + styles.pl1.paddingLeft) as TextStyle,
+                                            option.amountInputProps.inputStyle,
+                                        ]}
+                                        onAmountChange={option.amountInputProps.onAmountChange}
+                                        maxLength={option.amountInputProps.maxLength}
+                                    />
+                                ) : null}
                                 {!isSelected && option.brickRoadIndicator === CONST.BRICK_ROAD_INDICATOR_STATUS.ERROR && (
                                     <View style={[styles.alignItemsCenter, styles.justifyContentCenter]}>
                                         <Icon
@@ -343,7 +366,9 @@ export default React.memo(
         prevProps.option.ownerAccountID === nextProps.option.ownerAccountID &&
         prevProps.option.subtitle === nextProps.option.subtitle &&
         prevProps.option.pendingAction === nextProps.option.pendingAction &&
-        prevProps.option.customIcon === nextProps.option.customIcon,
+        prevProps.option.customIcon === nextProps.option.customIcon &&
+        prevProps.option.tabIndex === nextProps.option.tabIndex &&
+        lodashIsEqual(prevProps.option.amountInputProps, nextProps.option.amountInputProps),
 );
 
 export type {OptionRowProps};
diff --git a/src/components/OptionsList/BaseOptionsList.tsx b/src/components/OptionsList/BaseOptionsList.tsx
index 7bbd3e344c3f..c08f1d697dad 100644
--- a/src/components/OptionsList/BaseOptionsList.tsx
+++ b/src/components/OptionsList/BaseOptionsList.tsx
@@ -5,6 +5,7 @@ import type {SectionListRenderItem} from 'react-native';
 import {View} from 'react-native';
 import OptionRow from '@components/OptionRow';
 import OptionsListSkeletonView from '@components/OptionsListSkeletonView';
+import {PressableWithFeedback} from '@components/Pressable';
 import SectionList from '@components/SectionList';
 import Text from '@components/Text';
 import usePrevious from '@hooks/usePrevious';
@@ -205,7 +206,7 @@ function BaseOptionsList(
     /**
      * Function which renders a section header component
      */
-    const renderSectionHeader = ({section: {title, shouldShow}}: {section: OptionsListDataWithIndexOffset}) => {
+    const renderSectionHeader = ({section: {title, shouldShow, shouldShowActionButton, onActionButtonPress, actionButtonTitle}}: {section: OptionsListDataWithIndexOffset}) => {
         if (!title && shouldShow && !hideSectionHeaders && sectionHeaderStyle) {
             return <View style={sectionHeaderStyle} />;
         }
@@ -216,8 +217,18 @@ function BaseOptionsList(
                 // We do this so that we can reference the height in `getItemLayout` –
                 // we need to know the heights of all list items up-front in order to synchronously compute the layout of any given list item.
                 // So be aware that if you adjust the content of the section header (for example, change the font size), you may need to adjust this explicit height as well.
-                <View style={[styles.optionsListSectionHeader, styles.justifyContentCenter, sectionHeaderStyle]}>
+                <View style={[styles.optionsListSectionHeader, styles.flexRow, styles.justifyContentBetween, sectionHeaderStyle]}>
                     <Text style={[styles.ph5, styles.textLabelSupporting]}>{title}</Text>
+                    {shouldShowActionButton && (
+                        <PressableWithFeedback
+                            onPress={onActionButtonPress}
+                            accessibilityLabel={CONST.ROLE.BUTTON}
+                            role={CONST.ROLE.BUTTON}
+                            shouldUseAutoHitSlop
+                        >
+                            <Text style={[styles.pr5, styles.textLabelSupporting, styles.link]}>{actionButtonTitle}</Text>
+                        </PressableWithFeedback>
+                    )}
                 </View>
             );
         }
diff --git a/src/components/OptionsList/types.ts b/src/components/OptionsList/types.ts
index 7f23da965f39..c575a82332b6 100644
--- a/src/components/OptionsList/types.ts
+++ b/src/components/OptionsList/types.ts
@@ -18,6 +18,15 @@ type Section = {
 
     /** Whether this section is disabled or not */
     isDisabled?: boolean;
+
+    /** Whether to show an action button in the section header */
+    shouldShowActionButton?: boolean;
+
+    /** Title of the action button */
+    actionButtonTitle?: string;
+
+    /** Callback of the action button */
+    onActionButtonPress?: () => void;
 };
 
 type SectionWithIndexOffset = Section & {
diff --git a/src/components/OptionsListSkeletonView.tsx b/src/components/OptionsListSkeletonView.tsx
index 1f09876b18d3..6dede512f405 100644
--- a/src/components/OptionsListSkeletonView.tsx
+++ b/src/components/OptionsListSkeletonView.tsx
@@ -1,5 +1,6 @@
 import React from 'react';
 import {Circle, Rect} from 'react-native-svg';
+import useThemeStyles from '@hooks/useThemeStyles';
 import ItemListSkeletonView from './Skeletons/ItemListSkeletonView';
 
 function getLinedWidth(index: number): string {
@@ -17,32 +18,38 @@ function getLinedWidth(index: number): string {
 
 type OptionsListSkeletonViewProps = {
     shouldAnimate?: boolean;
+    gradientOpacityEnabled?: boolean;
+    shouldStyleAsTable?: boolean;
 };
 
-function OptionsListSkeletonView({shouldAnimate = true}: OptionsListSkeletonViewProps) {
+function OptionsListSkeletonView({shouldAnimate = true, shouldStyleAsTable = false, gradientOpacityEnabled = false}: OptionsListSkeletonViewProps) {
+    const styles = useThemeStyles();
+
     return (
         <ItemListSkeletonView
             shouldAnimate={shouldAnimate}
+            itemViewStyle={shouldStyleAsTable && [styles.highlightBG, styles.mb3, styles.mh5, styles.br2]}
+            gradientOpacityEnabled={gradientOpacityEnabled}
             renderSkeletonItem={({itemIndex}) => {
                 const lineWidth = getLinedWidth(itemIndex);
 
                 return (
                     <>
                         <Circle
-                            cx="40"
+                            cx={shouldStyleAsTable ? '36' : '40'}
                             cy="32"
                             r="20"
                         />
                         <Rect
-                            x="72"
+                            x={shouldStyleAsTable ? '68' : '72'}
                             y="18"
                             width="20%"
                             height="8"
                         />
                         <Rect
-                            x="72"
+                            x={shouldStyleAsTable ? '68' : '72'}
                             y="38"
-                            width={lineWidth}
+                            width={shouldStyleAsTable ? '10%' : lineWidth}
                             height="8"
                         />
                     </>
diff --git a/src/components/OptionsPicker/OptionItem.tsx b/src/components/OptionsPicker/OptionItem.tsx
new file mode 100644
index 000000000000..a787c20f515c
--- /dev/null
+++ b/src/components/OptionsPicker/OptionItem.tsx
@@ -0,0 +1,78 @@
+import React from 'react';
+import type {StyleProp, ViewStyle} from 'react-native';
+import {View} from 'react-native';
+import Icon from '@components/Icon';
+import {PressableWithFeedback} from '@components/Pressable';
+import SelectCircle from '@components/SelectCircle';
+import Text from '@components/Text';
+import useLocalize from '@hooks/useLocalize';
+import useThemeStyles from '@hooks/useThemeStyles';
+import variables from '@styles/variables';
+import CONST from '@src/CONST';
+import type {TranslationPaths} from '@src/languages/types';
+import type IconAsset from '@src/types/utils/IconAsset';
+
+type OptionItemProps = {
+    /** Text to be rendered */
+    title: TranslationPaths;
+
+    /** Icon to be displayed above the title */
+    icon: IconAsset;
+
+    /** Press handler */
+    onPress?: () => void;
+
+    /** Indicates whether the option is currently selected (active) */
+    isSelected?: boolean;
+
+    /** Indicates whether the option is disabled */
+    isDisabled?: boolean;
+
+    /** Optional style prop */
+    style?: StyleProp<ViewStyle>;
+};
+
+function OptionItem({title, icon, onPress, isSelected = false, isDisabled, style}: OptionItemProps) {
+    const styles = useThemeStyles();
+    const {translate} = useLocalize();
+
+    return (
+        <PressableWithFeedback
+            onPress={onPress}
+            role={CONST.ROLE.BUTTON}
+            accessibilityLabel={translate(title)}
+            disabled={isDisabled}
+            wrapperStyle={[styles.flex1, style]}
+        >
+            <View style={[styles.borderedContentCard, isSelected && styles.borderColorFocus, styles.p5]}>
+                <View>
+                    <View style={[styles.flexRow, styles.justifyContentBetween]}>
+                        <Icon
+                            src={icon}
+                            width={variables.iconHeader}
+                            height={variables.iconHeader}
+                        />
+                        {!isDisabled && (
+                            <View>
+                                <SelectCircle
+                                    isChecked={isSelected}
+                                    selectCircleStyles={styles.sectionSelectCircle}
+                                />
+                            </View>
+                        )}
+                    </View>
+                    <Text
+                        style={[styles.headerText, styles.mt2]}
+                        numberOfLines={1}
+                    >
+                        {translate(title)}
+                    </Text>
+                </View>
+            </View>
+        </PressableWithFeedback>
+    );
+}
+
+OptionItem.displayName = 'OptionItem';
+
+export default OptionItem;
diff --git a/src/components/OptionsPicker/index.tsx b/src/components/OptionsPicker/index.tsx
new file mode 100644
index 000000000000..06df1c0172c3
--- /dev/null
+++ b/src/components/OptionsPicker/index.tsx
@@ -0,0 +1,82 @@
+import React, {Fragment} from 'react';
+import type {StyleProp, ViewStyle} from 'react-native';
+import {View} from 'react-native';
+import useResponsiveLayout from '@hooks/useResponsiveLayout';
+import useThemeStyles from '@hooks/useThemeStyles';
+import type {TranslationPaths} from '@src/languages/types';
+import type IconAsset from '@src/types/utils/IconAsset';
+import OptionItem from './OptionItem';
+
+type OptionsPickerItem<TKey extends string> = {
+    /** A unique identifier for each option */
+    key: TKey;
+
+    /** Text to be displayed */
+    title: TranslationPaths;
+
+    /** Icon to be displayed above the title */
+    icon: IconAsset;
+};
+
+type OptionsPickerProps<TKey extends string> = {
+    /** Options list */
+    options: Array<OptionsPickerItem<TKey>>;
+
+    /** Selected option's identifier */
+    selectedOption: TKey;
+
+    /** Option select handler */
+    onOptionSelected: (option: TKey) => void;
+
+    /** Indicates whether the picker is disabled */
+    isDisabled?: boolean;
+
+    /** Optional style */
+    style?: StyleProp<ViewStyle>;
+};
+
+function OptionsPicker<TKey extends string>({options, selectedOption, onOptionSelected, style, isDisabled}: OptionsPickerProps<TKey>) {
+    const styles = useThemeStyles();
+    const {shouldUseNarrowLayout} = useResponsiveLayout();
+
+    if (shouldUseNarrowLayout) {
+        return (
+            <View style={[styles.flexColumn, styles.flex1, style]}>
+                {options.map((option, index) => (
+                    <Fragment key={option.key}>
+                        <OptionItem
+                            title={option.title}
+                            icon={option.icon}
+                            isSelected={selectedOption === option.key}
+                            isDisabled={isDisabled}
+                            onPress={() => onOptionSelected(option.key)}
+                        />
+                        {index < options.length - 1 && <View style={styles.mb3} />}
+                    </Fragment>
+                ))}
+            </View>
+        );
+    }
+
+    return (
+        <View style={[styles.flexRow, styles.flex1, style]}>
+            {options.map((option, index) => (
+                <Fragment key={option.key}>
+                    <OptionItem
+                        title={option.title}
+                        icon={option.icon}
+                        isSelected={selectedOption === option.key}
+                        isDisabled={isDisabled}
+                        onPress={() => onOptionSelected(option.key)}
+                    />
+                    {index < options.length - 1 && <View style={styles.mr3} />}
+                </Fragment>
+            ))}
+        </View>
+    );
+}
+
+OptionsPicker.displayName = 'OptionsPicker';
+
+export default OptionsPicker;
+export type {OptionsPickerItem};
diff --git a/src/components/OptionsSelector/BaseOptionsSelector.js b/src/components/OptionsSelector/BaseOptionsSelector.js
deleted file mode 100755
index 6515333e4015..000000000000
--- a/src/components/OptionsSelector/BaseOptionsSelector.js
+++ /dev/null
@@ -1,692 +0,0 @@
-import lodashDebounce from 'lodash/debounce';
-import lodashFind from 'lodash/find';
-import lodashFindIndex from 'lodash/findIndex';
-import lodashGet from 'lodash/get';
-import lodashIsEqual from 'lodash/isEqual';
-import lodashMap from 'lodash/map';
-import lodashValues from 'lodash/values';
-import PropTypes from 'prop-types';
-import React, {Component} from 'react';
-import {View} from 'react-native';
-import ArrowKeyFocusManager from '@components/ArrowKeyFocusManager';
-import Button from '@components/Button';
-import FixedFooter from '@components/FixedFooter';
-import FormHelpMessage from '@components/FormHelpMessage';
-import OptionsList from '@components/OptionsList';
-import ReferralProgramCTA from '@components/ReferralProgramCTA';
-import ScrollView from '@components/ScrollView';
-import ShowMoreButton from '@components/ShowMoreButton';
-import TextInput from '@components/TextInput';
-import withLocalize, {withLocalizePropTypes} from '@components/withLocalize';
-import withNavigationFocus from '@components/withNavigationFocus';
-import withTheme, {withThemePropTypes} from '@components/withTheme';
-import withThemeStyles, {withThemeStylesPropTypes} from '@components/withThemeStyles';
-import compose from '@libs/compose';
-import getPlatform from '@libs/getPlatform';
-import KeyboardShortcut from '@libs/KeyboardShortcut';
-import setSelection from '@libs/setSelection';
-import CONST from '@src/CONST';
-import {defaultProps as optionsSelectorDefaultProps, propTypes as optionsSelectorPropTypes} from './optionsSelectorPropTypes';
-
-const propTypes = {
-    /** padding bottom style of safe area */
-    safeAreaPaddingBottomStyle: PropTypes.oneOfType([PropTypes.arrayOf(PropTypes.object), PropTypes.object]),
-
-    /** Content container styles for OptionsList */
-    contentContainerStyles: PropTypes.oneOfType([PropTypes.arrayOf(PropTypes.object), PropTypes.object]),
-
-    /** List container styles for OptionsList */
-    listContainerStyles: PropTypes.oneOfType([PropTypes.arrayOf(PropTypes.object), PropTypes.object]),
-
-    /** List styles for OptionsList */
-    listStyles: PropTypes.oneOfType([PropTypes.arrayOf(PropTypes.object), PropTypes.object]),
-
-    /** Whether navigation is focused */
-    isFocused: PropTypes.bool.isRequired,
-
-    /** Whether referral CTA should be displayed */
-    shouldShowReferralCTA: PropTypes.bool,
-
-    /** Referral content type */
-    referralContentType: PropTypes.string,
-
-    ...optionsSelectorPropTypes,
-    ...withLocalizePropTypes,
-    ...withThemeStylesPropTypes,
-    ...withThemePropTypes,
-};
-
-const defaultProps = {
-    shouldDelayFocus: false,
-    shouldShowReferralCTA: false,
-    referralContentType: CONST.REFERRAL_PROGRAM.CONTENT_TYPES.REFER_FRIEND,
-    safeAreaPaddingBottomStyle: {},
-    contentContainerStyles: [],
-    listContainerStyles: undefined,
-    listStyles: [],
-    ...optionsSelectorDefaultProps,
-};
-
-class BaseOptionsSelector extends Component {
-    constructor(props) {
-        super(props);
-
-        this.updateFocusedIndex = this.updateFocusedIndex.bind(this);
-        this.scrollToIndex = this.scrollToIndex.bind(this);
-        this.selectRow = this.selectRow.bind(this);
-        this.selectFocusedOption = this.selectFocusedOption.bind(this);
-        this.addToSelection = this.addToSelection.bind(this);
-        this.updateSearchValue = this.updateSearchValue.bind(this);
-        this.incrementPage = this.incrementPage.bind(this);
-        this.sliceSections = this.sliceSections.bind(this);
-        this.calculateAllVisibleOptionsCount = this.calculateAllVisibleOptionsCount.bind(this);
-        this.handleFocusIn = this.handleFocusIn.bind(this);
-        this.handleFocusOut = this.handleFocusOut.bind(this);
-        this.debouncedUpdateSearchValue = lodashDebounce(this.updateSearchValue, CONST.TIMING.SEARCH_OPTION_LIST_DEBOUNCE_TIME);
-        this.relatedTarget = null;
-        this.accessibilityRoles = lodashValues(CONST.ROLE);
-        this.isWebOrDesktop = [CONST.PLATFORM.DESKTOP, CONST.PLATFORM.WEB].includes(getPlatform());
-
-        const allOptions = this.flattenSections();
-        const sections = this.sliceSections();
-        const focusedIndex = this.getInitiallyFocusedIndex(allOptions);
-        this.focusedOption = allOptions[focusedIndex];
-
-        this.state = {
-            sections,
-            allOptions,
-            focusedIndex,
-            shouldDisableRowSelection: false,
-            errorMessage: '',
-            paginationPage: 1,
-            disableEnterShortCut: false,
-            value: '',
-        };
-    }
-
-    componentDidMount() {
-        this.subscribeToEnterShortcut();
-        this.subscribeToCtrlEnterShortcut();
-        this.subscribeActiveElement();
-
-        if (this.props.isFocused && this.props.autoFocus && this.textInput) {
-            this.focusTimeout = setTimeout(() => {
-                this.textInput.focus();
-            }, CONST.ANIMATED_TRANSITION);
-        }
-
-        this.scrollToIndex(this.props.selectedOptions.length ? 0 : this.state.focusedIndex, false);
-    }
-
-    componentDidUpdate(prevProps, prevState) {
-        if (prevState.disableEnterShortCut !== this.state.disableEnterShortCut) {
-            // Unregister the shortcut before registering a new one to avoid lingering shortcut listener
-            this.unsubscribeEnter();
-            if (!this.state.disableEnterShortCut) {
-                this.subscribeToEnterShortcut();
-            }
-        }
-
-        if (prevProps.isFocused !== this.props.isFocused) {
-            // Unregister the shortcut before registering a new one to avoid lingering shortcut listener
-            this.unSubscribeFromKeyboardShortcut();
-            if (this.props.isFocused) {
-                this.subscribeActiveElement();
-                this.subscribeToEnterShortcut();
-                this.subscribeToCtrlEnterShortcut();
-            } else {
-                this.unSubscribeActiveElement();
-            }
-        }
-
-        // 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 (this.isWebOrDesktop && !prevProps.isFocused && this.props.isFocused && this.props.autoFocus && this.textInput) {
-            setTimeout(() => {
-                this.textInput.focus();
-            }, CONST.ANIMATED_TRANSITION);
-        }
-
-        if (prevState.paginationPage !== this.state.paginationPage) {
-            const newSections = this.sliceSections();
-
-            this.setState({
-                sections: newSections,
-            });
-        }
-
-        if (prevState.focusedIndex !== this.state.focusedIndex) {
-            this.focusedOption = this.state.allOptions[this.state.focusedIndex];
-        }
-
-        if (lodashIsEqual(this.props.sections, prevProps.sections)) {
-            return;
-        }
-
-        const newSections = this.sliceSections();
-        const newOptions = this.flattenSections();
-
-        if (prevProps.preferredLocale !== this.props.preferredLocale) {
-            this.setState({
-                sections: newSections,
-                allOptions: newOptions,
-            });
-            return;
-        }
-        const newFocusedIndex = this.props.selectedOptions.length;
-        const isNewFocusedIndex = newFocusedIndex !== this.state.focusedIndex;
-        const prevFocusedOption = lodashFind(newOptions, (option) => this.focusedOption && option.keyForList === this.focusedOption.keyForList);
-        const prevFocusedOptionIndex = prevFocusedOption ? lodashFindIndex(newOptions, (option) => this.focusedOption && option.keyForList === this.focusedOption.keyForList) : undefined;
-        // eslint-disable-next-line react/no-did-update-set-state
-        this.setState(
-            {
-                sections: newSections,
-                allOptions: newOptions,
-                focusedIndex: prevFocusedOptionIndex || (typeof this.props.focusedIndex === 'number' ? this.props.focusedIndex : newFocusedIndex),
-            },
-            () => {
-                // If we just toggled an option on a multi-selection page or cleared the search input, scroll to top
-                if (this.props.selectedOptions.length !== prevProps.selectedOptions.length || (!!prevState.value && !this.state.value)) {
-                    this.scrollToIndex(0);
-                    return;
-                }
-
-                // Otherwise, scroll to the focused index (as long as it's in range)
-                if (this.state.allOptions.length <= this.state.focusedIndex || !isNewFocusedIndex) {
-                    return;
-                }
-                this.scrollToIndex(this.state.focusedIndex);
-            },
-        );
-    }
-
-    componentWillUnmount() {
-        if (this.focusTimeout) {
-            clearTimeout(this.focusTimeout);
-        }
-
-        this.unSubscribeFromKeyboardShortcut();
-    }
-
-    handleFocusIn() {
-        const activeElement = document.activeElement;
-        this.setState({
-            disableEnterShortCut: activeElement && this.accessibilityRoles.includes(activeElement.role) && activeElement.role !== CONST.ROLE.PRESENTATION,
-        });
-    }
-
-    handleFocusOut() {
-        this.setState({
-            disableEnterShortCut: false,
-        });
-    }
-
-    /**
-     * @param {Array<Object>} allOptions
-     * @returns {Number}
-     */
-    getInitiallyFocusedIndex(allOptions) {
-        let defaultIndex;
-        if (this.props.shouldTextInputAppearBelowOptions) {
-            defaultIndex = allOptions.length;
-        } else if (this.props.focusedIndex >= 0) {
-            defaultIndex = this.props.focusedIndex;
-        } else {
-            defaultIndex = this.props.selectedOptions.length;
-        }
-        if (this.props.initiallyFocusedOptionKey === undefined) {
-            return defaultIndex;
-        }
-
-        const indexOfInitiallyFocusedOption = lodashFindIndex(allOptions, (option) => option.keyForList === this.props.initiallyFocusedOptionKey);
-
-        return indexOfInitiallyFocusedOption;
-    }
-
-    /**
-     * Maps sections to render only allowed count of them per section.
-     *
-     * @returns {Objects[]}
-     */
-    sliceSections() {
-        return lodashMap(this.props.sections, (section) => {
-            if (section.data.length === 0) {
-                return section;
-            }
-
-            return {
-                ...section,
-                data: section.data.slice(0, CONST.MAX_OPTIONS_SELECTOR_PAGE_LENGTH * lodashGet(this.state, 'paginationPage', 1)),
-            };
-        });
-    }
-
-    /**
-     * Calculates all currently visible options based on the sections that are currently being shown
-     * and the number of items of those sections.
-     *
-     * @returns {Number}
-     */
-    calculateAllVisibleOptionsCount() {
-        let count = 0;
-
-        this.state.sections.forEach((section) => {
-            count += lodashGet(section, 'data.length', 0);
-        });
-
-        return count;
-    }
-
-    updateSearchValue(value) {
-        this.setState({
-            paginationPage: 1,
-            errorMessage: value.length > this.props.maxLength ? ['common.error.characterLimitExceedCounter', {length: value.length, limit: this.props.maxLength}] : '',
-            value,
-        });
-
-        this.props.onChangeText(value);
-    }
-
-    subscribeActiveElement() {
-        if (!this.isWebOrDesktop) {
-            return;
-        }
-        document.addEventListener('focusin', this.handleFocusIn);
-        document.addEventListener('focusout', this.handleFocusOut);
-    }
-
-    // eslint-disable-next-line react/no-unused-class-component-methods
-    unSubscribeActiveElement() {
-        if (!this.isWebOrDesktop) {
-            return;
-        }
-        document.removeEventListener('focusin', this.handleFocusIn);
-        document.removeEventListener('focusout', this.handleFocusOut);
-    }
-
-    subscribeToEnterShortcut() {
-        const enterConfig = CONST.KEYBOARD_SHORTCUTS.ENTER;
-        this.unsubscribeEnter = KeyboardShortcut.subscribe(
-            enterConfig.shortcutKey,
-            this.selectFocusedOption,
-            enterConfig.descriptionKey,
-            enterConfig.modifiers,
-            true,
-            () => !this.state.allOptions[this.state.focusedIndex],
-        );
-    }
-
-    subscribeToCtrlEnterShortcut() {
-        const CTRLEnterConfig = CONST.KEYBOARD_SHORTCUTS.CTRL_ENTER;
-        this.unsubscribeCTRLEnter = KeyboardShortcut.subscribe(
-            CTRLEnterConfig.shortcutKey,
-            () => {
-                if (this.props.canSelectMultipleOptions) {
-                    this.props.onConfirmSelection();
-                    return;
-                }
-
-                const focusedOption = this.state.allOptions[this.state.focusedIndex];
-                if (!focusedOption) {
-                    return;
-                }
-
-                this.selectRow(focusedOption);
-            },
-            CTRLEnterConfig.descriptionKey,
-            CTRLEnterConfig.modifiers,
-            true,
-        );
-    }
-
-    unSubscribeFromKeyboardShortcut() {
-        if (this.unsubscribeEnter) {
-            this.unsubscribeEnter();
-        }
-
-        if (this.unsubscribeCTRLEnter) {
-            this.unsubscribeCTRLEnter();
-        }
-    }
-
-    selectFocusedOption(e) {
-        const focusedItemKey = lodashGet(e, ['target', 'attributes', 'id', 'value']);
-        const focusedOption = focusedItemKey ? lodashFind(this.state.allOptions, (option) => option.keyForList === focusedItemKey) : this.state.allOptions[this.state.focusedIndex];
-
-        if (!focusedOption || !this.props.isFocused) {
-            return;
-        }
-
-        if (this.props.canSelectMultipleOptions) {
-            this.selectRow(focusedOption);
-        } else if (!this.state.shouldDisableRowSelection) {
-            this.setState({shouldDisableRowSelection: true});
-
-            let result = this.selectRow(focusedOption);
-            if (!(result instanceof Promise)) {
-                result = Promise.resolve();
-            }
-
-            setTimeout(() => {
-                result.finally(() => {
-                    this.setState({shouldDisableRowSelection: false});
-                });
-            }, 500);
-        }
-    }
-
-    // eslint-disable-next-line react/no-unused-class-component-methods
-    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:
-     *
-     *   1. A `sectionIndex`, which represents the index of the section it came from
-     *   2. An `index`, which represents the index of the option within the section it came from.
-     *
-     * @returns {Array<Object>}
-     */
-    flattenSections() {
-        const allOptions = [];
-        this.disabledOptionsIndexes = [];
-        let index = 0;
-        this.props.sections.forEach((section, sectionIndex) => {
-            section.data.forEach((option, optionIndex) => {
-                allOptions.push({
-                    ...option,
-                    sectionIndex,
-                    index: optionIndex,
-                });
-                if (section.isDisabled || option.isDisabled) {
-                    this.disabledOptionsIndexes.push(index);
-                }
-                index += 1;
-            });
-        });
-        return allOptions;
-    }
-
-    /**
-     * @param {Number} index
-     */
-    updateFocusedIndex(index) {
-        this.setState({focusedIndex: index}, () => this.scrollToIndex(index));
-    }
-
-    /**
-     * Scrolls to the focused index within the SectionList
-     *
-     * @param {Number} index
-     * @param {Boolean} animated
-     */
-    scrollToIndex(index, animated = true) {
-        const option = this.state.allOptions[index];
-        if (!this.list || !option) {
-            return;
-        }
-
-        const itemIndex = option.index;
-        const sectionIndex = option.sectionIndex;
-
-        if (!lodashGet(this.state.sections, `[${sectionIndex}].data[${itemIndex}]`, null)) {
-            return;
-        }
-
-        this.list.scrollToLocation({sectionIndex, itemIndex, animated});
-    }
-
-    /**
-     * Completes the follow-up actions after a row is selected
-     *
-     * @param {Object} option
-     * @param {Object} ref
-     * @returns {Promise}
-     */
-    selectRow(option, ref) {
-        return new Promise((resolve) => {
-            if (this.props.shouldShowTextInput && this.props.shouldPreventDefaultFocusOnSelectRow) {
-                if (this.relatedTarget && ref === this.relatedTarget) {
-                    this.textInput.focus();
-                    this.relatedTarget = null;
-                }
-                if (this.textInput.isFocused()) {
-                    setSelection(this.textInput, 0, this.state.value.length);
-                }
-            }
-            const selectedOption = this.props.onSelectRow(option);
-            resolve(selectedOption);
-
-            if (!this.props.canSelectMultipleOptions) {
-                return;
-            }
-
-            // Focus the first unselected item from the list (i.e: the best result according to the current search term)
-            this.setState({
-                focusedIndex: this.props.selectedOptions.length,
-            });
-        });
-    }
-
-    /**
-     * Completes the follow-up action after clicking on multiple select button
-     * @param {Object} option
-     */
-    addToSelection(option) {
-        if (this.props.shouldShowTextInput && this.props.shouldPreventDefaultFocusOnSelectRow) {
-            this.textInput.focus();
-            if (this.textInput.isFocused()) {
-                setSelection(this.textInput, 0, this.state.value.length);
-            }
-        }
-        this.props.onAddToSelection(option);
-    }
-
-    /**
-     * Increments a pagination page to show more items
-     */
-    incrementPage() {
-        this.setState((prev) => ({
-            paginationPage: prev.paginationPage + 1,
-        }));
-    }
-
-    render() {
-        const shouldShowShowMoreButton = this.state.allOptions.length > CONST.MAX_OPTIONS_SELECTOR_PAGE_LENGTH * this.state.paginationPage;
-        const shouldShowFooter =
-            !this.props.isReadOnly && (this.props.shouldShowConfirmButton || this.props.footerContent) && !(this.props.canSelectMultipleOptions && this.props.selectedOptions.length === 0);
-        const defaultConfirmButtonText = this.props.confirmButtonText === undefined ? this.props.translate('common.confirm') : this.props.confirmButtonText;
-        const shouldShowDefaultConfirmButton = !this.props.footerContent && defaultConfirmButtonText;
-        const safeAreaPaddingBottomStyle = shouldShowFooter ? undefined : this.props.safeAreaPaddingBottomStyle;
-        const listContainerStyles = this.props.listContainerStyles || [this.props.themeStyles.flex1];
-        const optionHoveredStyle = this.props.optionHoveredStyle || this.props.themeStyles.hoveredComponentBG;
-
-        const textInput = (
-            <TextInput
-                ref={(el) => (this.textInput = el)}
-                label={this.props.textInputLabel}
-                accessibilityLabel={this.props.textInputLabel}
-                role={CONST.ROLE.PRESENTATION}
-                onChangeText={this.debouncedUpdateSearchValue}
-                errorText={this.state.errorMessage}
-                onSubmitEditing={this.selectFocusedOption}
-                placeholder={this.props.placeholderText}
-                maxLength={this.props.maxLength + CONST.ADDITIONAL_ALLOWED_CHARACTERS}
-                keyboardType={this.props.keyboardType}
-                onBlur={(e) => {
-                    if (!this.props.shouldPreventDefaultFocusOnSelectRow) {
-                        return;
-                    }
-                    this.relatedTarget = e.relatedTarget;
-                }}
-                selectTextOnFocus
-                blurOnSubmit={Boolean(this.state.allOptions.length)}
-                spellCheck={false}
-                shouldInterceptSwipe={this.props.shouldTextInputInterceptSwipe}
-                isLoading={this.props.isLoadingNewOptions}
-                iconLeft={this.props.textIconLeft}
-                testID="options-selector-input"
-            />
-        );
-        const optionsList = (
-            <OptionsList
-                ref={(el) => (this.list = el)}
-                optionHoveredStyle={optionHoveredStyle}
-                onSelectRow={this.props.onSelectRow ? this.selectRow : undefined}
-                sections={this.state.sections}
-                focusedIndex={this.state.focusedIndex}
-                disableFocusOptions={this.props.disableFocusOptions}
-                selectedOptions={this.props.selectedOptions}
-                canSelectMultipleOptions={this.props.canSelectMultipleOptions}
-                shouldShowMultipleOptionSelectorAsButton={this.props.shouldShowMultipleOptionSelectorAsButton}
-                multipleOptionSelectorButtonText={this.props.multipleOptionSelectorButtonText}
-                onAddToSelection={this.addToSelection}
-                hideSectionHeaders={this.props.hideSectionHeaders}
-                headerMessage={this.state.errorMessage ? '' : 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);
-                    }
-
-                    if (this.props.onLayout) {
-                        this.props.onLayout();
-                    }
-                }}
-                contentContainerStyles={[safeAreaPaddingBottomStyle, ...this.props.contentContainerStyles]}
-                sectionHeaderStyle={this.props.sectionHeaderStyle}
-                listContainerStyles={listContainerStyles}
-                listStyles={this.props.listStyles}
-                isLoading={!this.props.shouldShowOptions}
-                showScrollIndicator={this.props.showScrollIndicator}
-                isRowMultilineSupported={this.props.isRowMultilineSupported}
-                isLoadingNewOptions={this.props.isLoadingNewOptions}
-                shouldPreventDefaultFocusOnSelectRow={this.props.shouldPreventDefaultFocusOnSelectRow}
-                nestedScrollEnabled={this.props.nestedScrollEnabled}
-                bounces={!this.props.shouldTextInputAppearBelowOptions || !this.props.shouldAllowScrollingChildren}
-                renderFooterContent={
-                    shouldShowShowMoreButton && (
-                        <ShowMoreButton
-                            containerStyle={{...this.props.themeStyles.mt2, ...this.props.themeStyles.mb5}}
-                            currentCount={CONST.MAX_OPTIONS_SELECTOR_PAGE_LENGTH * this.state.paginationPage}
-                            totalCount={this.state.allOptions.length}
-                            onPress={this.incrementPage}
-                        />
-                    )
-                }
-            />
-        );
-
-        const optionsAndInputsBelowThem = (
-            <>
-                <View
-                    style={[
-                        this.props.themeStyles.flexGrow0,
-                        this.props.themeStyles.flexShrink1,
-                        this.props.themeStyles.flexBasisAuto,
-                        this.props.themeStyles.w100,
-                        this.props.themeStyles.flexRow,
-                    ]}
-                >
-                    {optionsList}
-                </View>
-                <View
-                    style={
-                        this.props.shouldUseStyleForChildren
-                            ? [this.props.themeStyles.ph5, this.props.themeStyles.pv5, this.props.themeStyles.flexGrow1, this.props.themeStyles.flexShrink0]
-                            : []
-                    }
-                >
-                    {this.props.children}
-                    {this.props.shouldShowTextInput && textInput}
-                </View>
-            </>
-        );
-
-        return (
-            <ArrowKeyFocusManager
-                disabledIndexes={this.disabledOptionsIndexes}
-                focusedIndex={this.state.focusedIndex}
-                maxIndex={this.calculateAllVisibleOptionsCount() - 1}
-                onFocusedIndexChanged={this.props.disableArrowKeysActions ? () => {} : this.updateFocusedIndex}
-                shouldResetIndexOnEndReached={false}
-            >
-                <View style={[this.props.themeStyles.flexGrow1, this.props.themeStyles.flexShrink1, this.props.themeStyles.flexBasisAuto]}>
-                    {/*
-                     * The OptionsList component uses a SectionList which uses a VirtualizedList internally.
-                     * VirtualizedList cannot be directly nested within ScrollViews of the same orientation.
-                     * To work around this, we wrap the OptionsList component with a horizontal ScrollView.
-                     */}
-                    {this.props.shouldTextInputAppearBelowOptions && this.props.shouldAllowScrollingChildren && (
-                        <ScrollView contentContainerStyle={[this.props.themeStyles.flexGrow1]}>
-                            <ScrollView
-                                horizontal
-                                bounces={false}
-                                contentContainerStyle={[this.props.themeStyles.flex1, this.props.themeStyles.flexColumn]}
-                            >
-                                {optionsAndInputsBelowThem}
-                            </ScrollView>
-                        </ScrollView>
-                    )}
-
-                    {this.props.shouldTextInputAppearBelowOptions && !this.props.shouldAllowScrollingChildren && optionsAndInputsBelowThem}
-
-                    {!this.props.shouldTextInputAppearBelowOptions && (
-                        <>
-                            <View style={this.props.shouldUseStyleForChildren ? [this.props.themeStyles.ph5, this.props.themeStyles.pb3] : []}>
-                                {this.props.children}
-                                {this.props.shouldShowTextInput && textInput}
-                                {Boolean(this.props.textInputAlert) && (
-                                    <FormHelpMessage
-                                        message={this.props.textInputAlert}
-                                        style={[this.props.themeStyles.mb3]}
-                                        isError={false}
-                                    />
-                                )}
-                            </View>
-                            {optionsList}
-                        </>
-                    )}
-                </View>
-                {this.props.shouldShowReferralCTA && (
-                    <View style={[this.props.themeStyles.ph5, this.props.themeStyles.pb5, this.props.themeStyles.flexShrink0]}>
-                        <ReferralProgramCTA referralContentType={this.props.referralContentType} />
-                    </View>
-                )}
-
-                {shouldShowFooter && (
-                    <FixedFooter>
-                        {shouldShowDefaultConfirmButton && (
-                            <Button
-                                success
-                                large
-                                style={[this.props.themeStyles.w100]}
-                                text={defaultConfirmButtonText}
-                                onPress={this.props.onConfirmSelection}
-                                pressOnEnter
-                                enterKeyEventListenerPriority={1}
-                            />
-                        )}
-                        {this.props.footerContent}
-                    </FixedFooter>
-                )}
-            </ArrowKeyFocusManager>
-        );
-    }
-}
-
-BaseOptionsSelector.defaultProps = defaultProps;
-BaseOptionsSelector.propTypes = propTypes;
-
-export default compose(withLocalize, withNavigationFocus, withThemeStyles, withTheme)(BaseOptionsSelector);
diff --git a/src/components/OptionsSelector/index.android.js b/src/components/OptionsSelector/index.android.js
deleted file mode 100644
index 1ed2d56e8742..000000000000
--- a/src/components/OptionsSelector/index.android.js
+++ /dev/null
@@ -1,18 +0,0 @@
-import React, {forwardRef} from 'react';
-import BaseOptionsSelector from './BaseOptionsSelector';
-
-/**
- * @deprecated Please use `SelectionList` instead.
- */
-const OptionsSelector = forwardRef((props, ref) => (
-    <BaseOptionsSelector
-        // eslint-disable-next-line react/jsx-props-no-spreading
-        {...props}
-        ref={ref}
-        shouldDelayFocus
-    />
-));
-
-OptionsSelector.displayName = 'OptionsSelector';
-
-export default OptionsSelector;
diff --git a/src/components/OptionsSelector/index.js b/src/components/OptionsSelector/index.js
deleted file mode 100644
index 1f08a0a7829a..000000000000
--- a/src/components/OptionsSelector/index.js
+++ /dev/null
@@ -1,18 +0,0 @@
-import React, {forwardRef} from 'react';
-import BaseOptionsSelector from './BaseOptionsSelector';
-
-/**
- * @deprecated Please use `SelectionList` instead.
- */
-const OptionsSelector = forwardRef((props, ref) => (
-    <BaseOptionsSelector
-        // eslint-disable-next-line react/jsx-props-no-spreading
-        {...props}
-        ref={ref}
-        shouldTextInputInterceptSwipe
-    />
-));
-
-OptionsSelector.displayName = 'OptionsSelector';
-
-export default OptionsSelector;
diff --git a/src/components/OptionsSelector/optionsSelectorPropTypes.js b/src/components/OptionsSelector/optionsSelectorPropTypes.js
deleted file mode 100644
index b430ce8a4933..000000000000
--- a/src/components/OptionsSelector/optionsSelectorPropTypes.js
+++ /dev/null
@@ -1,185 +0,0 @@
-import PropTypes from 'prop-types';
-import sourcePropTypes from '@components/Image/sourcePropTypes';
-import optionPropTypes from '@components/optionPropTypes';
-import stylePropTypes from '@styles/stylePropTypes';
-import CONST from '@src/CONST';
-
-const propTypes = {
-    /** Callback to fire when a row is tapped */
-    onSelectRow: PropTypes.func,
-
-    /** Sections for the section list */
-    sections: PropTypes.arrayOf(
-        PropTypes.shape({
-            /** Title of the section */
-            title: PropTypes.string,
-
-            /** Array of options */
-            data: PropTypes.arrayOf(optionPropTypes),
-
-            /** Whether this section should show or not */
-            shouldShow: PropTypes.bool,
-
-            /** Whether this section items disabled for selection */
-            isDisabled: PropTypes.bool,
-        }),
-    ).isRequired,
-
-    /** Callback fired when text changes */
-    onChangeText: PropTypes.func,
-
-    /** Limits the maximum number of characters that can be entered in input field */
-    maxLength: PropTypes.number,
-
-    /** Label to display for the text input */
-    textInputLabel: PropTypes.string,
-
-    /** Optional input mode precedence over keyboardType */
-    inputMode: PropTypes.string,
-
-    /** Optional placeholder text for the selector */
-    placeholderText: PropTypes.string,
-
-    /** Options that have already been selected */
-    selectedOptions: PropTypes.arrayOf(optionPropTypes),
-
-    /** Optional header message */
-    headerMessage: PropTypes.string,
-
-    /** 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,
-
-    /** Whether to allow arrow key actions on the list */
-    disableArrowKeysActions: PropTypes.bool,
-
-    /** Whether to disable interactivity of option rows */
-    isDisabled: PropTypes.bool,
-
-    /** Whether to disable focus options of rows */
-    disableFocusOptions: PropTypes.bool,
-
-    /** Display the text of the option in bold font style */
-    boldStyle: PropTypes.bool,
-
-    /** Whether to show the title tooltip */
-    showTitleTooltip: PropTypes.bool,
-
-    /** Whether to prevent default focusing of options and focus the textinput when selecting an option */
-    shouldPreventDefaultFocusOnSelectRow: PropTypes.bool,
-
-    /** Whether to autofocus the search input on mount */
-    autoFocus: PropTypes.bool,
-
-    /** Should a button be shown if a selection is made (only relevant if canSelectMultipleOptions is true) */
-    shouldShowConfirmButton: PropTypes.bool,
-
-    /** Text to show in the confirm button (only visible if multiple options are selected) */
-    confirmButtonText: PropTypes.string,
-
-    /** Function to execute if the confirm button is pressed */
-    onConfirmSelection: PropTypes.func,
-
-    /** If true, the text input will be below the options in the selector, not above. */
-    shouldTextInputAppearBelowOptions: PropTypes.bool,
-
-    /** If false, the text input will not be shown at all. Defaults to true */
-    shouldShowTextInput: PropTypes.bool,
-
-    /** Custom content to display in the footer instead of the default button. */
-    footerContent: PropTypes.oneOfType([PropTypes.func, PropTypes.node]),
-
-    /** Hover style for options in the OptionsList */
-    optionHoveredStyle: PropTypes.oneOfType([PropTypes.arrayOf(PropTypes.object), PropTypes.object]),
-
-    /** Style for section headers */
-    sectionHeaderStyle: stylePropTypes,
-
-    /** Whether to show options list */
-    shouldShowOptions: PropTypes.bool,
-
-    /** Whether to show a line separating options in list */
-    shouldHaveOptionSeparator: PropTypes.bool,
-
-    /** Key of the option that we should focus on when first opening the options list */
-    initiallyFocusedOptionKey: PropTypes.string,
-
-    /** 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,
-
-    /** Index for option to focus on */
-    focusedIndex: PropTypes.number,
-
-    /** Whether the text input should intercept swipes or not */
-    shouldTextInputInterceptSwipe: PropTypes.bool,
-
-    /** Whether we should allow the view wrapping the nested children to be scrollable */
-    shouldAllowScrollingChildren: PropTypes.bool,
-
-    /** Whether nested scroll of options is enabled, true by default */
-    nestedScrollEnabled: PropTypes.bool,
-
-    /** Left icon to display in TextInput */
-    textIconLeft: sourcePropTypes,
-};
-
-const defaultProps = {
-    onSelectRow: undefined,
-    textInputLabel: '',
-    placeholderText: '',
-    inputMode: CONST.INPUT_MODE.TEXT,
-    selectedOptions: [],
-    headerMessage: '',
-    canSelectMultipleOptions: false,
-    shouldShowMultipleOptionSelectorAsButton: false,
-    multipleOptionSelectorButtonText: '',
-    onAddToSelection: () => {},
-    highlightSelectedOptions: false,
-    hideSectionHeaders: false,
-    boldStyle: false,
-    showTitleTooltip: false,
-    shouldPreventDefaultFocusOnSelectRow: false,
-    autoFocus: true,
-    shouldShowConfirmButton: false,
-    confirmButtonText: undefined,
-    onConfirmSelection: () => {},
-    shouldTextInputAppearBelowOptions: false,
-    footerContent: undefined,
-    optionHoveredStyle: undefined,
-    sectionHeaderStyle: undefined,
-    shouldShowOptions: true,
-    disableArrowKeysActions: false,
-    isDisabled: false,
-    disableFocusOptions: false,
-    shouldHaveOptionSeparator: false,
-    initiallyFocusedOptionKey: undefined,
-    maxLength: CONST.SEARCH_MAX_LENGTH,
-    shouldShowTextInput: true,
-    onChangeText: () => {},
-    shouldUseStyleForChildren: true,
-    isRowMultilineSupported: false,
-    focusedIndex: undefined,
-    shouldTextInputInterceptSwipe: false,
-    shouldAllowScrollingChildren: false,
-    nestedScrollEnabled: true,
-    textIconLeft: undefined,
-};
-
-export {propTypes, defaultProps};
diff --git a/src/components/PDFThumbnail/PDFThumbnailError.tsx b/src/components/PDFThumbnail/PDFThumbnailError.tsx
new file mode 100644
index 000000000000..0598a995e030
--- /dev/null
+++ b/src/components/PDFThumbnail/PDFThumbnailError.tsx
@@ -0,0 +1,25 @@
+import React from 'react';
+import {View} from 'react-native';
+import Icon from '@components/Icon';
+import * as Expensicons from '@components/Icon/Expensicons';
+import useTheme from '@hooks/useTheme';
+import useThemeStyles from '@hooks/useThemeStyles';
+import variables from '@styles/variables';
+
+function PDFThumbnailError() {
+    const styles = useThemeStyles();
+    const theme = useTheme();
+
+    return (
+        <View style={[styles.justifyContentCenter, styles.pdfErrorPlaceholder, styles.alignItemsCenter]}>
+            <Icon
+                src={Expensicons.ReceiptSlash}
+                width={variables.receiptPlaceholderIconWidth}
+                height={variables.receiptPlaceholderIconHeight}
+                fill={theme.icon}
+            />
+        </View>
+    );
+}
+
+export default PDFThumbnailError;
diff --git a/src/components/PDFThumbnail/index.native.tsx b/src/components/PDFThumbnail/index.native.tsx
index 0232dba99f05..66a42f6f0830 100644
--- a/src/components/PDFThumbnail/index.native.tsx
+++ b/src/components/PDFThumbnail/index.native.tsx
@@ -1,19 +1,21 @@
-import React from 'react';
+import React, {useState} from 'react';
 import {View} from 'react-native';
 import Pdf from 'react-native-pdf';
 import FullScreenLoadingIndicator from '@components/FullscreenLoadingIndicator';
 import useThemeStyles from '@hooks/useThemeStyles';
 import addEncryptedAuthTokenToURL from '@libs/addEncryptedAuthTokenToURL';
+import PDFThumbnailError from './PDFThumbnailError';
 import type PDFThumbnailProps from './types';
 
-function PDFThumbnail({previewSourceURL, style, isAuthTokenRequired = false, enabled = true, onPassword}: PDFThumbnailProps) {
+function PDFThumbnail({previewSourceURL, style, isAuthTokenRequired = false, enabled = true, onPassword, onLoadError, onLoadSuccess}: PDFThumbnailProps) {
     const styles = useThemeStyles();
     const sizeStyles = [styles.w100, styles.h100];
+    const [failedToLoad, setFailedToLoad] = useState(false);
 
     return (
         <View style={[style, styles.overflowHidden]}>
-            <View style={[sizeStyles, styles.alignItemsCenter, styles.justifyContentCenter]}>
-                {enabled && (
+            <View style={[sizeStyles, !failedToLoad && styles.alignItemsCenter, styles.justifyContentCenter]}>
+                {enabled && !failedToLoad && (
                     <Pdf
                         fitPolicy={0}
                         trustAllCerts={false}
@@ -22,16 +24,24 @@ function PDFThumbnail({previewSourceURL, style, isAuthTokenRequired = false, ena
                         singlePage
                         style={sizeStyles}
                         onError={(error) => {
-                            if (!('message' in error && typeof error.message === 'string' && error.message.match(/password/i))) {
+                            if ('message' in error && typeof error.message === 'string' && error.message.match(/password/i) && onPassword) {
+                                onPassword();
                                 return;
                             }
-                            if (!onPassword) {
+                            if (onLoadError) {
+                                onLoadError();
+                            }
+                            setFailedToLoad(true);
+                        }}
+                        onLoadComplete={() => {
+                            if (!onLoadSuccess) {
                                 return;
                             }
-                            onPassword();
+                            onLoadSuccess();
                         }}
                     />
                 )}
+                {failedToLoad && <PDFThumbnailError />}
             </View>
         </View>
     );
diff --git a/src/components/PDFThumbnail/index.tsx b/src/components/PDFThumbnail/index.tsx
index a5b911deb6ff..f064229f0739 100644
--- a/src/components/PDFThumbnail/index.tsx
+++ b/src/components/PDFThumbnail/index.tsx
@@ -1,19 +1,20 @@
-// @ts-expect-error - This line imports a module from 'pdfjs-dist' package which lacks TypeScript typings.
 import pdfWorkerSource from 'pdfjs-dist/legacy/build/pdf.worker';
-import React, {useMemo} from 'react';
+import React, {useMemo, useState} from 'react';
 import {View} from 'react-native';
 import {Document, pdfjs, Thumbnail} from 'react-pdf';
 import FullScreenLoadingIndicator from '@components/FullscreenLoadingIndicator';
 import useThemeStyles from '@hooks/useThemeStyles';
 import addEncryptedAuthTokenToURL from '@libs/addEncryptedAuthTokenToURL';
+import PDFThumbnailError from './PDFThumbnailError';
 import type PDFThumbnailProps from './types';
 
 if (!pdfjs.GlobalWorkerOptions.workerSrc) {
     pdfjs.GlobalWorkerOptions.workerSrc = URL.createObjectURL(new Blob([pdfWorkerSource], {type: 'text/javascript'}));
 }
 
-function PDFThumbnail({previewSourceURL, style, isAuthTokenRequired = false, enabled = true, onPassword}: PDFThumbnailProps) {
+function PDFThumbnail({previewSourceURL, style, isAuthTokenRequired = false, enabled = true, onPassword, onLoadError, onLoadSuccess}: PDFThumbnailProps) {
     const styles = useThemeStyles();
+    const [failedToLoad, setFailedToLoad] = useState(false);
 
     const thumbnail = useMemo(
         () => (
@@ -26,18 +27,37 @@ function PDFThumbnail({previewSourceURL, style, isAuthTokenRequired = false, ena
                 }}
                 externalLinkTarget="_blank"
                 onPassword={onPassword}
+                onLoad={() => {
+                    setFailedToLoad(false);
+                }}
+                onLoadSuccess={() => {
+                    if (!onLoadSuccess) {
+                        return;
+                    }
+                    onLoadSuccess();
+                }}
+                onLoadError={() => {
+                    if (onLoadError) {
+                        onLoadError();
+                    }
+                    setFailedToLoad(true);
+                }}
+                error={() => null}
             >
                 <View pointerEvents="none">
                     <Thumbnail pageIndex={0} />
                 </View>
             </Document>
         ),
-        [isAuthTokenRequired, previewSourceURL, onPassword],
+        [isAuthTokenRequired, previewSourceURL, onPassword, onLoadError, onLoadSuccess],
     );
 
     return (
-        <View style={[style, styles.overflowHidden]}>
-            <View style={[styles.w100, styles.h100, styles.alignItemsCenter, styles.justifyContentCenter]}>{enabled && thumbnail}</View>
+        <View style={[style, styles.overflowHidden, failedToLoad && styles.h100]}>
+            <View style={[styles.w100, styles.h100, !failedToLoad && {...styles.alignItemsCenter, ...styles.justifyContentCenter}]}>
+                {enabled && !failedToLoad && thumbnail}
+                {failedToLoad && <PDFThumbnailError />}
+            </View>
         </View>
     );
 }
diff --git a/src/components/PDFThumbnail/types.ts b/src/components/PDFThumbnail/types.ts
index 11253e462aca..3d79e7c026d2 100644
--- a/src/components/PDFThumbnail/types.ts
+++ b/src/components/PDFThumbnail/types.ts
@@ -15,6 +15,12 @@ type PDFThumbnailProps = {
 
     /** Callback to call if PDF is password protected */
     onPassword?: () => void;
+
+    /** Callback to call if PDF can't be loaded(corrupted) */
+    onLoadError?: () => void;
+
+    /** Callback to call if PDF is loaded */
+    onLoadSuccess?: () => void;
 };
 
 export default PDFThumbnailProps;
diff --git a/src/components/PDFView/PDFPasswordForm.tsx b/src/components/PDFView/PDFPasswordForm.tsx
index e474108e4c86..4b6491addbef 100644
--- a/src/components/PDFView/PDFPasswordForm.tsx
+++ b/src/components/PDFView/PDFPasswordForm.tsx
@@ -6,8 +6,8 @@ import Text from '@components/Text';
 import TextInput from '@components/TextInput';
 import type {BaseTextInputRef} from '@components/TextInput/BaseTextInput/types';
 import useLocalize from '@hooks/useLocalize';
+import useResponsiveLayout from '@hooks/useResponsiveLayout';
 import useThemeStyles from '@hooks/useThemeStyles';
-import useWindowDimensions from '@hooks/useWindowDimensions';
 import * as Browser from '@libs/Browser';
 import shouldDelayFocus from '@libs/shouldDelayFocus';
 import CONST from '@src/CONST';
@@ -35,7 +35,7 @@ type PDFPasswordFormProps = {
 
 function PDFPasswordForm({isFocused, isPasswordInvalid = false, shouldShowLoadingIndicator = false, onSubmit, onPasswordUpdated, onPasswordFieldFocused}: PDFPasswordFormProps) {
     const styles = useThemeStyles();
-    const {isSmallScreenWidth} = useWindowDimensions();
+    const {shouldUseNarrowLayout} = useResponsiveLayout();
     const {translate} = useLocalize();
 
     const [password, setPassword] = useState('');
@@ -47,13 +47,13 @@ function PDFPasswordForm({isFocused, isPasswordInvalid = false, shouldShowLoadin
 
     const errorText = useMemo(() => {
         if (isPasswordInvalid) {
-            return 'attachmentView.passwordIncorrect';
+            return translate('attachmentView.passwordIncorrect');
         }
         if (validationErrorText) {
             return validationErrorText;
         }
         return '';
-    }, [isPasswordInvalid, validationErrorText]);
+    }, [isPasswordInvalid, validationErrorText, translate]);
 
     useEffect(() => {
         if (!isFocused) {
@@ -90,7 +90,7 @@ function PDFPasswordForm({isFocused, isPasswordInvalid = false, shouldShowLoadin
             return true;
         }
         if (!password) {
-            setValidationErrorText('attachmentView.passwordRequired');
+            setValidationErrorText(translate('attachmentView.passwordRequired'));
         }
         return false;
     };
@@ -105,7 +105,7 @@ function PDFPasswordForm({isFocused, isPasswordInvalid = false, shouldShowLoadin
     return shouldShowForm ? (
         <ScrollView
             keyboardShouldPersistTaps="handled"
-            style={styles.getPDFPasswordFormStyle(isSmallScreenWidth)}
+            style={styles.getPDFPasswordFormStyle(shouldUseNarrowLayout)}
             contentContainerStyle={styles.p5}
         >
             <View style={styles.mb4}>
diff --git a/src/components/PDFView/index.native.tsx b/src/components/PDFView/index.native.tsx
index f0edba5de7d0..44ef894cb994 100644
--- a/src/components/PDFView/index.native.tsx
+++ b/src/components/PDFView/index.native.tsx
@@ -5,9 +5,9 @@ import PDF from 'react-native-pdf';
 import FullScreenLoadingIndicator from '@components/FullscreenLoadingIndicator';
 import KeyboardAvoidingView from '@components/KeyboardAvoidingView';
 import PressableWithoutFeedback from '@components/Pressable/PressableWithoutFeedback';
-import Text from '@components/Text';
 import useKeyboardState from '@hooks/useKeyboardState';
 import useLocalize from '@hooks/useLocalize';
+import useResponsiveLayout from '@hooks/useResponsiveLayout';
 import useStyleUtils from '@hooks/useStyleUtils';
 import useThemeStyles from '@hooks/useThemeStyles';
 import useWindowDimensions from '@hooks/useWindowDimensions';
@@ -29,7 +29,11 @@ import type {PDFViewNativeProps} from './types';
  * so that PDFPasswordForm doesn't bounce when react-native-pdf/PDF
  * is (temporarily) rendered.
  */
-function PDFView({onToggleKeyboard, onLoadComplete, fileName, onPress, isFocused, onScaleChanged, sourceURL, errorLabelStyles}: PDFViewNativeProps) {
+
+const LOADING_THUMBNAIL_HEIGHT = 250;
+const LOADING_THUMBNAIL_WIDTH = 250;
+
+function PDFView({onToggleKeyboard, onLoadComplete, fileName, onPress, isFocused, onScaleChanged, sourceURL, onLoadError, isUsedAsChatAttachment}: PDFViewNativeProps) {
     const [shouldRequestPassword, setShouldRequestPassword] = useState(false);
     const [shouldAttemptPDFLoad, setShouldAttemptPDFLoad] = useState(true);
     const [shouldShowLoadingIndicator, setShouldShowLoadingIndicator] = useState(true);
@@ -37,7 +41,8 @@ function PDFView({onToggleKeyboard, onLoadComplete, fileName, onPress, isFocused
     const [failedToLoadPDF, setFailedToLoadPDF] = useState(false);
     const [successToLoadPDF, setSuccessToLoadPDF] = useState(false);
     const [password, setPassword] = useState('');
-    const {windowWidth, windowHeight, isSmallScreenWidth} = useWindowDimensions();
+    const {windowWidth, windowHeight} = useWindowDimensions();
+    const {shouldUseNarrowLayout} = useResponsiveLayout();
     const {translate} = useLocalize();
     const themeStyles = useThemeStyles();
     const {isKeyboardShown} = useKeyboardState();
@@ -80,6 +85,7 @@ function PDFView({onToggleKeyboard, onLoadComplete, fileName, onPress, isFocused
         setShouldShowLoadingIndicator(false);
         setShouldRequestPassword(false);
         setShouldAttemptPDFLoad(false);
+        onLoadError?.();
         // eslint-disable-next-line @typescript-eslint/ban-types
     }) as (error: object) => void;
 
@@ -112,7 +118,9 @@ function PDFView({onToggleKeyboard, onLoadComplete, fileName, onPress, isFocused
     };
 
     function renderPDFView() {
-        const pdfStyles: StyleProp<ViewStyle> = [themeStyles.imageModalPDF, StyleUtils.getWidthAndHeightStyle(windowWidth, windowHeight)];
+        const pdfWidth = isUsedAsChatAttachment ? LOADING_THUMBNAIL_WIDTH : windowWidth;
+        const pdfHeight = isUsedAsChatAttachment ? LOADING_THUMBNAIL_HEIGHT : windowHeight;
+        const pdfStyles: StyleProp<ViewStyle> = [themeStyles.imageModalPDF, StyleUtils.getWidthAndHeightStyle(pdfWidth, pdfHeight)];
 
         // If we haven't yet successfully validated the password and loaded the PDF,
         // then we need to hide the react-native-pdf/PDF component so that PDFPasswordForm
@@ -121,21 +129,20 @@ function PDFView({onToggleKeyboard, onLoadComplete, fileName, onPress, isFocused
         if (shouldRequestPassword) {
             pdfStyles.push(themeStyles.invisible);
         }
-
-        const containerStyles = shouldRequestPassword && isSmallScreenWidth ? [themeStyles.w100, themeStyles.flex1] : [themeStyles.alignItemsCenter, themeStyles.flex1];
+        const containerStyles =
+            // eslint-disable-next-line @typescript-eslint/prefer-nullish-coalescing
+            isUsedAsChatAttachment || (shouldRequestPassword && shouldUseNarrowLayout) ? [themeStyles.w100, themeStyles.flex1] : [themeStyles.alignItemsCenter, themeStyles.flex1];
+        const loadingIndicatorStyles = isUsedAsChatAttachment
+            ? [themeStyles.chatItemPDFAttachmentLoading, StyleUtils.getWidthAndHeightStyle(LOADING_THUMBNAIL_WIDTH, LOADING_THUMBNAIL_HEIGHT)]
+            : [];
 
         return (
             <View style={containerStyles}>
-                {failedToLoadPDF && (
-                    <View style={[themeStyles.flex1, themeStyles.justifyContentCenter]}>
-                        <Text style={errorLabelStyles}>{translate('attachmentView.failedToLoadPDF')}</Text>
-                    </View>
-                )}
                 {shouldAttemptPDFLoad && (
                     <PDF
                         fitPolicy={0}
                         trustAllCerts={false}
-                        renderActivityIndicator={() => <FullScreenLoadingIndicator />}
+                        renderActivityIndicator={() => <FullScreenLoadingIndicator style={loadingIndicatorStyles} />}
                         source={{uri: sourceURL, cache: true, expiration: 864000}}
                         style={pdfStyles}
                         onError={handleFailureToLoadPDF}
@@ -160,11 +167,12 @@ function PDFView({onToggleKeyboard, onLoadComplete, fileName, onPress, isFocused
         );
     }
 
-    return onPress && !successToLoadPDF ? (
+    return onPress ? (
         <PressableWithoutFeedback
             onPress={onPress}
+            fullDisabled={successToLoadPDF}
             style={[themeStyles.flex1, themeStyles.alignSelfStretch, !failedToLoadPDF && themeStyles.flexRow]}
-            accessibilityRole={CONST.ACCESSIBILITY_ROLE.IMAGEBUTTON}
+            accessibilityRole={CONST.ROLE.BUTTON}
             // eslint-disable-next-line @typescript-eslint/prefer-nullish-coalescing
             accessibilityLabel={fileName || translate('attachmentView.unknownFilename')}
         >
diff --git a/src/components/PDFView/index.tsx b/src/components/PDFView/index.tsx
index 99b5be1c8f53..69d886dc7c37 100644
--- a/src/components/PDFView/index.tsx
+++ b/src/components/PDFView/index.tsx
@@ -7,9 +7,10 @@ import {View} from 'react-native';
 import {withOnyx} from 'react-native-onyx';
 import FullScreenLoadingIndicator from '@components/FullscreenLoadingIndicator';
 import PressableWithoutFeedback from '@components/Pressable/PressableWithoutFeedback';
-import Text from '@components/Text';
 import useLocalize from '@hooks/useLocalize';
 import usePrevious from '@hooks/usePrevious';
+import useResponsiveLayout from '@hooks/useResponsiveLayout';
+import useStyleUtils from '@hooks/useStyleUtils';
 import useThemeStyles from '@hooks/useThemeStyles';
 import useWindowDimensions from '@hooks/useWindowDimensions';
 import variables from '@styles/variables';
@@ -19,10 +20,15 @@ import ONYXKEYS from '@src/ONYXKEYS';
 import PDFPasswordForm from './PDFPasswordForm';
 import type {PDFViewOnyxProps, PDFViewProps} from './types';
 
-function PDFView({onToggleKeyboard, fileName, onPress, isFocused, sourceURL, errorLabelStyles, maxCanvasArea, maxCanvasHeight, maxCanvasWidth, style}: PDFViewProps) {
+const LOADING_THUMBNAIL_HEIGHT = 250;
+const LOADING_THUMBNAIL_WIDTH = 250;
+
+function PDFView({onToggleKeyboard, fileName, onPress, isFocused, sourceURL, maxCanvasArea, maxCanvasHeight, maxCanvasWidth, style, isUsedAsChatAttachment, onLoadError}: PDFViewProps) {
     const [isKeyboardOpen, setIsKeyboardOpen] = useState(false);
     const styles = useThemeStyles();
-    const {windowHeight, isSmallScreenWidth} = useWindowDimensions();
+    const StyleUtils = useStyleUtils();
+    const {windowHeight} = useWindowDimensions();
+    const {shouldUseNarrowLayout} = useResponsiveLayout();
     const prevWindowHeight = usePrevious(windowHeight);
     const {translate} = useLocalize();
 
@@ -33,13 +39,13 @@ function PDFView({onToggleKeyboard, fileName, onPress, isFocused, sourceURL, err
      */
     const toggleKeyboardOnSmallScreens = useCallback(
         (isKBOpen: boolean) => {
-            if (!isSmallScreenWidth) {
+            if (!shouldUseNarrowLayout) {
                 return;
             }
             setIsKeyboardOpen(isKBOpen);
             onToggleKeyboard?.(isKBOpen);
         },
-        [isSmallScreenWidth, onToggleKeyboard],
+        [shouldUseNarrowLayout, onToggleKeyboard],
     );
 
     /**
@@ -62,7 +68,7 @@ function PDFView({onToggleKeyboard, fileName, onPress, isFocused, sourceURL, err
     useEffect(() => {
         retrieveCanvasLimits();
         // This rule needs to be applied so that this effect is executed only when the component is mounted
-        // eslint-disable-next-line react-hooks/exhaustive-deps
+        // eslint-disable-next-line react-compiler/react-compiler, react-hooks/exhaustive-deps
     }, []);
 
     useEffect(() => {
@@ -91,19 +97,29 @@ function PDFView({onToggleKeyboard, fileName, onPress, isFocused, sourceURL, err
                     contentContainerStyle={style as CSSProperties}
                     file={sourceURL}
                     pageMaxWidth={variables.pdfPageMaxWidth}
-                    isSmallScreen={isSmallScreenWidth}
+                    isSmallScreen={shouldUseNarrowLayout}
                     maxCanvasWidth={maxCanvasWidth}
                     maxCanvasHeight={maxCanvasHeight}
                     maxCanvasArea={maxCanvasArea}
-                    LoadingComponent={<FullScreenLoadingIndicator />}
-                    ErrorComponent={<Text style={errorLabelStyles}>{translate('attachmentView.failedToLoadPDF')}</Text>}
+                    LoadingComponent={
+                        <FullScreenLoadingIndicator
+                            style={
+                                isUsedAsChatAttachment && [
+                                    styles.chatItemPDFAttachmentLoading,
+                                    StyleUtils.getWidthAndHeightStyle(LOADING_THUMBNAIL_WIDTH, LOADING_THUMBNAIL_HEIGHT),
+                                    styles.pRelative,
+                                ]
+                            }
+                        />
+                    }
+                    shouldShowErrorComponent={false}
+                    onLoadError={onLoadError}
                     renderPasswordForm={({isPasswordInvalid, onSubmit, onPasswordChange}) => (
                         <PDFPasswordForm
                             isFocused={!!isFocused}
                             isPasswordInvalid={isPasswordInvalid}
                             onSubmit={onSubmit}
                             onPasswordUpdated={onPasswordChange}
-                            onPasswordFieldFocused={toggleKeyboardOnSmallScreens}
                         />
                     )}
                 />
@@ -115,7 +131,7 @@ function PDFView({onToggleKeyboard, fileName, onPress, isFocused, sourceURL, err
         <PressableWithoutFeedback
             onPress={onPress}
             style={[styles.flex1, styles.flexRow, styles.alignSelfStretch]}
-            accessibilityRole={CONST.ACCESSIBILITY_ROLE.IMAGEBUTTON}
+            accessibilityRole={CONST.ROLE.BUTTON}
             // eslint-disable-next-line @typescript-eslint/prefer-nullish-coalescing
             accessibilityLabel={fileName || translate('attachmentView.unknownFilename')}
         >
diff --git a/src/components/PDFView/types.ts b/src/components/PDFView/types.ts
index 5c738fadb1b6..91b35eee4736 100644
--- a/src/components/PDFView/types.ts
+++ b/src/components/PDFView/types.ts
@@ -1,4 +1,4 @@
-import type {GestureResponderEvent, StyleProp, TextStyle, ViewStyle} from 'react-native';
+import type {GestureResponderEvent, StyleProp, ViewStyle} from 'react-native';
 import type {OnyxEntry} from 'react-native-onyx';
 
 type PDFViewBaseProps = {
@@ -26,8 +26,11 @@ type PDFViewBaseProps = {
     /** Should focus to the password input  */
     isFocused?: boolean;
 
-    /** Styles for the error label */
-    errorLabelStyles?: StyleProp<TextStyle>;
+    /** Callback to call when the PDF fails to load */
+    onLoadError?: () => void;
+
+    /** Whether the PDF is used as a chat attachment */
+    isUsedAsChatAttachment?: boolean;
 };
 
 type PDFViewOnyxProps = {
diff --git a/src/components/ParentNavigationSubtitle.tsx b/src/components/ParentNavigationSubtitle.tsx
index f793b4f8a60f..f60b877a5d23 100644
--- a/src/components/ParentNavigationSubtitle.tsx
+++ b/src/components/ParentNavigationSubtitle.tsx
@@ -30,16 +30,21 @@ function ParentNavigationSubtitle({parentNavigationSubtitleData, parentReportAct
     const {isOffline} = useNetwork();
     const {translate} = useLocalize();
 
+    // We should not display the parent navigation subtitle if the user does not have access to the parent chat (the reportName is empty in this case)
+    if (!reportName) {
+        return;
+    }
+
     return (
         <PressableWithoutFeedback
             onPress={() => {
-                const parentAction = ReportActionsUtils.getReportAction(parentReportID, parentReportActionID ?? '');
-                const isVisibleAction = ReportActionsUtils.shouldReportActionBeVisible(parentAction, parentAction?.reportActionID ?? '');
+                const parentAction = ReportActionsUtils.getReportAction(parentReportID, parentReportActionID ?? '-1');
+                const isVisibleAction = ReportActionsUtils.shouldReportActionBeVisible(parentAction, parentAction?.reportActionID ?? '-1');
                 // Pop the thread report screen before navigating to the chat report.
                 Navigation.goBack(ROUTES.REPORT_WITH_ID.getRoute(parentReportID));
                 if (isVisibleAction && !isOffline) {
                     // Pop the chat report screen before navigating to the linked report action.
-                    Navigation.goBack(ROUTES.REPORT_WITH_ID.getRoute(parentReportID, parentReportActionID));
+                    Navigation.goBack(ROUTES.REPORT_WITH_ID.getRoute(parentReportID, parentReportActionID), true);
                 }
             }}
             accessibilityLabel={translate('threads.parentNavigationSummary', {reportName, workspaceName})}
@@ -50,13 +55,13 @@ function ParentNavigationSubtitle({parentNavigationSubtitleData, parentReportAct
                 style={[styles.optionAlternateText]}
                 numberOfLines={1}
             >
-                {Boolean(reportName) && (
+                {!!reportName && (
                     <>
                         <Text style={[styles.optionAlternateText, styles.textLabelSupporting]}>{`${translate('threads.from')} `}</Text>
                         <Text style={[styles.optionAlternateText, styles.textLabelSupporting, styles.link]}>{reportName}</Text>
                     </>
                 )}
-                {Boolean(workspaceName) && <Text style={[styles.optionAlternateText, styles.textLabelSupporting]}>{` ${translate('threads.in')} ${workspaceName}`}</Text>}
+                {!!workspaceName && <Text style={[styles.optionAlternateText, styles.textLabelSupporting]}>{` ${translate('threads.in')} ${workspaceName}`}</Text>}
             </Text>
         </PressableWithoutFeedback>
     );
diff --git a/src/components/Picker/BasePicker.tsx b/src/components/Picker/BasePicker.tsx
index 1c337e024116..ddd6cd544f3e 100644
--- a/src/components/Picker/BasePicker.tsx
+++ b/src/components/Picker/BasePicker.tsx
@@ -61,7 +61,7 @@ function BasePicker<TPickerValue>(
         // so they don't have to spend extra time selecting the only possible value.
         onInputChange(items[0].value, 0);
 
-        // eslint-disable-next-line react-hooks/exhaustive-deps
+        // eslint-disable-next-line react-compiler/react-compiler, react-hooks/exhaustive-deps
     }, [items]);
 
     const context = useScrollContext();
diff --git a/src/components/Picker/types.ts b/src/components/Picker/types.ts
index d935ebe8fdc5..a6a942f41f26 100644
--- a/src/components/Picker/types.ts
+++ b/src/components/Picker/types.ts
@@ -1,6 +1,5 @@
 import type {ChangeEvent, Component, ReactElement} from 'react';
 import type {MeasureLayoutOnSuccessCallback, NativeMethods, StyleProp, ViewStyle} from 'react-native';
-import type {MaybePhraseKey} from '@libs/Localize';
 
 type MeasureLayoutOnFailCallback = () => void;
 
@@ -59,7 +58,7 @@ type BasePickerProps<TPickerValue> = {
     placeholder?: PickerPlaceholder;
 
     /** Error text to display */
-    errorText?: MaybePhraseKey;
+    errorText?: string;
 
     /** Customize the BasePicker container */
     containerStyles?: StyleProp<ViewStyle>;
diff --git a/src/components/PlaidLink/index.native.tsx b/src/components/PlaidLink/index.native.tsx
index 24ab75eb62b7..37b598303c3a 100644
--- a/src/components/PlaidLink/index.native.tsx
+++ b/src/components/PlaidLink/index.native.tsx
@@ -31,7 +31,7 @@ function PlaidLink({token, onSuccess = () => {}, onExit = () => {}, onEvent}: Pl
         };
 
         // We generally do not need to include the token as a dependency here as it is only provided once via props and should not change
-        // eslint-disable-next-line react-hooks/exhaustive-deps
+        // eslint-disable-next-line react-compiler/react-compiler, react-hooks/exhaustive-deps
     }, []);
     return null;
 }
diff --git a/src/components/Popover/index.tsx b/src/components/Popover/index.tsx
index 19fc86c9f936..ebf30d773f09 100644
--- a/src/components/Popover/index.tsx
+++ b/src/components/Popover/index.tsx
@@ -3,7 +3,8 @@ import {createPortal} from 'react-dom';
 import Modal from '@components/Modal';
 import {PopoverContext} from '@components/PopoverProvider';
 import PopoverWithoutOverlay from '@components/PopoverWithoutOverlay';
-import useWindowDimensions from '@hooks/useWindowDimensions';
+import useResponsiveLayout from '@hooks/useResponsiveLayout';
+import TooltipRefManager from '@libs/TooltipRefManager';
 import CONST from '@src/CONST';
 import type {PopoverProps} from './types';
 
@@ -26,32 +27,36 @@ function Popover(props: PopoverProps) {
         anchorRef = () => {},
         animationIn = 'fadeIn',
         animationOut = 'fadeOut',
+        shouldCloseWhenBrowserNavigationChanged = true,
     } = props;
 
-    const {isSmallScreenWidth} = useWindowDimensions();
+    const {isSmallScreenWidth} = useResponsiveLayout();
     const withoutOverlayRef = useRef(null);
     const {close, popover} = React.useContext(PopoverContext);
 
     // Not adding this inside the PopoverProvider
     // because this is an issue on smaller screens as well.
     React.useEffect(() => {
+        if (!shouldCloseWhenBrowserNavigationChanged) {
+            return;
+        }
         const listener = () => {
             if (!isVisible) {
                 return;
             }
-
             onClose();
         };
         window.addEventListener('popstate', listener);
         return () => {
             window.removeEventListener('popstate', listener);
         };
-    }, [onClose, isVisible]);
+    }, [onClose, isVisible, shouldCloseWhenBrowserNavigationChanged]);
 
     const onCloseWithPopoverContext = () => {
         if (popover && 'current' in anchorRef) {
             close(anchorRef);
         }
+        TooltipRefManager.hideTooltip();
         onClose();
     };
 
diff --git a/src/components/Popover/types.ts b/src/components/Popover/types.ts
index 4e2f38293f6e..1db09d0b2f9f 100644
--- a/src/components/Popover/types.ts
+++ b/src/components/Popover/types.ts
@@ -38,8 +38,8 @@ type PopoverProps = BaseModalProps &
         /** Whether we want to show the popover on the right side of the screen */
         fromSidebarMediumScreen?: boolean;
 
-        /** Whether handle navigation back when modal show. */
-        shouldHandleNavigationBack?: boolean;
+        /** Whether we should close when browser navigation change. This doesn't affect native platform */
+        shouldCloseWhenBrowserNavigationChanged?: boolean;
     };
 
 type PopoverWithWindowDimensionsProps = PopoverProps & WindowDimensionsProps;
diff --git a/src/components/PopoverMenu.tsx b/src/components/PopoverMenu.tsx
index 8cd5ef529894..ce022c4f03b4 100644
--- a/src/components/PopoverMenu.tsx
+++ b/src/components/PopoverMenu.tsx
@@ -1,18 +1,22 @@
+import lodashIsEqual from 'lodash/isEqual';
 import type {RefObject} from 'react';
-import React, {useEffect, useRef, useState} from 'react';
-import {View} from 'react-native';
+import React, {useLayoutEffect, useState} from 'react';
+import {StyleSheet, View} from 'react-native';
 import type {ModalProps} from 'react-native-modal';
 import useArrowKeyFocusManager from '@hooks/useArrowKeyFocusManager';
 import useKeyboardShortcut from '@hooks/useKeyboardShortcut';
+import useResponsiveLayout from '@hooks/useResponsiveLayout';
+import useTheme from '@hooks/useTheme';
 import useThemeStyles from '@hooks/useThemeStyles';
-import useWindowDimensions from '@hooks/useWindowDimensions';
 import CONST from '@src/CONST';
 import type {AnchorPosition} from '@src/styles';
 import type AnchorAlignment from '@src/types/utils/AnchorAlignment';
 import FocusableMenuItem from './FocusableMenuItem';
+import FocusTrapForModal from './FocusTrap/FocusTrapForModal';
 import * as Expensicons from './Icon/Expensicons';
 import type {MenuItemProps} from './MenuItem';
 import MenuItem from './MenuItem';
+import type BaseModalProps from './Modal/types';
 import PopoverWithMeasuredContent from './PopoverWithMeasuredContent';
 import Text from './Text';
 
@@ -26,6 +30,9 @@ type PopoverMenuItem = MenuItemProps & {
     /** Sub menu items to be rendered after a menu item is selected */
     subMenuItems?: PopoverMenuItem[];
 
+    /** Back button text to be shown if sub menu items are opened */
+    backButtonText?: string;
+
     /** Determines whether the menu item is disabled or not */
     disabled?: boolean;
 };
@@ -36,6 +43,9 @@ type PopoverMenuProps = Partial<PopoverModalProps> & {
     /** Callback method fired when the user requests to close the modal */
     onClose: () => void;
 
+    /** Callback method fired when the modal is shown */
+    onModalShow?: () => void;
+
     /** State that determines whether to display the modal or not */
     isVisible: boolean;
 
@@ -68,6 +78,15 @@ type PopoverMenuProps = Partial<PopoverModalProps> & {
 
     /** Whether we want to show the popover on the right side of the screen */
     fromSidebarMediumScreen?: boolean;
+
+    /**
+     * Whether the modal should enable the new focus manager.
+     * We are attempting to migrate to a new refocus manager, adding this property for gradual migration.
+     * */
+    shouldEnableNewFocusManagement?: boolean;
+
+    /** How to re-focus after the modal is dismissed */
+    restoreFocusType?: BaseModalProps['restoreFocusType'];
 };
 
 function PopoverMenu({
@@ -77,6 +96,7 @@ function PopoverMenu({
     anchorPosition,
     anchorRef,
     onClose,
+    onModalShow,
     headerText,
     fromSidebarMediumScreen,
     anchorAlignment = {
@@ -89,24 +109,28 @@ function PopoverMenu({
     disableAnimation = true,
     withoutOverlay = false,
     shouldSetModalVisibility = true,
+    shouldEnableNewFocusManagement,
+    restoreFocusType,
 }: PopoverMenuProps) {
     const styles = useThemeStyles();
-    const {isSmallScreenWidth} = useWindowDimensions();
-    const selectedItemIndex = useRef<number | null>(null);
-
+    const theme = useTheme();
+    const {isSmallScreenWidth} = useResponsiveLayout();
     const [currentMenuItems, setCurrentMenuItems] = useState(menuItems);
-    const [enteredSubMenuIndexes, setEnteredSubMenuIndexes] = useState<number[]>([]);
+    const currentMenuItemsFocusedIndex = currentMenuItems?.findIndex((option) => option.isSelected);
+    const [enteredSubMenuIndexes, setEnteredSubMenuIndexes] = useState<readonly number[]>(CONST.EMPTY_ARRAY);
 
-    const [focusedIndex, setFocusedIndex] = useArrowKeyFocusManager({initialFocusedIndex: -1, maxIndex: currentMenuItems.length - 1, isActive: isVisible});
+    const [focusedIndex, setFocusedIndex] = useArrowKeyFocusManager({initialFocusedIndex: currentMenuItemsFocusedIndex, maxIndex: currentMenuItems.length - 1, isActive: isVisible});
 
     const selectItem = (index: number) => {
         const selectedItem = currentMenuItems[index];
         if (selectedItem?.subMenuItems) {
             setCurrentMenuItems([...selectedItem.subMenuItems]);
             setEnteredSubMenuIndexes([...enteredSubMenuIndexes, index]);
+            const selectedSubMenuItemIndex = selectedItem?.subMenuItems.findIndex((option) => option.isSelected);
+            setFocusedIndex(selectedSubMenuItemIndex);
         } else {
-            selectedItemIndex.current = index;
             onItemSelected(selectedItem, index);
+            selectedItem.onSelected?.();
         }
     };
 
@@ -125,23 +149,35 @@ function PopoverMenu({
     const renderBackButtonItem = () => {
         const previousMenuItems = getPreviousSubMenu();
         const previouslySelectedItem = previousMenuItems[enteredSubMenuIndexes[enteredSubMenuIndexes.length - 1]];
+        const hasBackButtonText = !!previouslySelectedItem.backButtonText;
 
         return (
             <MenuItem
                 key={previouslySelectedItem.text}
                 icon={Expensicons.BackArrow}
-                iconFill="gray"
-                title={previouslySelectedItem.text}
+                iconFill={theme.icon}
+                style={hasBackButtonText ? styles.pv0 : undefined}
+                title={hasBackButtonText ? previouslySelectedItem.backButtonText : previouslySelectedItem.text}
+                titleStyle={hasBackButtonText ? styles.createMenuHeaderText : undefined}
+                shouldShowBasicTitle={hasBackButtonText}
                 shouldCheckActionAllowedOnPress={false}
                 description={previouslySelectedItem.description}
                 onPress={() => {
                     setCurrentMenuItems(previousMenuItems);
-                    enteredSubMenuIndexes.splice(-1);
+                    setFocusedIndex(-1);
+                    setEnteredSubMenuIndexes((prevState) => prevState.slice(0, -1));
                 }}
             />
         );
     };
 
+    const renderHeaderText = () => {
+        if (!headerText || enteredSubMenuIndexes.length !== 0) {
+            return;
+        }
+        return <Text style={[styles.createMenuHeaderText, styles.ph5, styles.pv3]}>{headerText}</Text>;
+    };
+
     useKeyboardShortcut(
         CONST.KEYBOARD_SHORTCUTS.ENTER,
         () => {
@@ -156,17 +192,16 @@ function PopoverMenu({
 
     const onModalHide = () => {
         setFocusedIndex(-1);
-        if (selectedItemIndex.current !== null) {
-            currentMenuItems[selectedItemIndex.current].onSelected?.();
-            selectedItemIndex.current = null;
-        }
     };
 
-    useEffect(() => {
+    // When the menu items are changed, we want to reset the sub-menu to make sure
+    // we are not accessing the wrong sub-menu parent or possibly undefined when rendering the back button.
+    // We use useLayoutEffect so the reset happens before the repaint
+    useLayoutEffect(() => {
         if (menuItems.length === 0) {
             return;
         }
-        setEnteredSubMenuIndexes([]);
+        setEnteredSubMenuIndexes(CONST.EMPTY_ARRAY);
         setCurrentMenuItems(menuItems);
     }, [menuItems]);
 
@@ -177,11 +212,12 @@ function PopoverMenu({
             anchorAlignment={anchorAlignment}
             onClose={() => {
                 setCurrentMenuItems(menuItems);
-                setEnteredSubMenuIndexes([]);
+                setEnteredSubMenuIndexes(CONST.EMPTY_ARRAY);
                 onClose();
             }}
             isVisible={isVisible}
             onModalHide={onModalHide}
+            onModalShow={onModalShow}
             animationIn={animationIn}
             animationOut={animationOut}
             animationInTiming={animationInTiming}
@@ -189,45 +225,77 @@ function PopoverMenu({
             fromSidebarMediumScreen={fromSidebarMediumScreen}
             withoutOverlay={withoutOverlay}
             shouldSetModalVisibility={shouldSetModalVisibility}
+            shouldEnableNewFocusManagement={shouldEnableNewFocusManagement}
+            useNativeDriver
+            restoreFocusType={restoreFocusType}
         >
-            <View style={isSmallScreenWidth ? {} : styles.createMenuContainer}>
-                {!!headerText && <Text style={[styles.createMenuHeaderText, styles.ml3]}>{headerText}</Text>}
-                {enteredSubMenuIndexes.length > 0 && renderBackButtonItem()}
-                {currentMenuItems.map((item, menuIndex) => (
-                    <FocusableMenuItem
-                        key={item.text}
-                        icon={item.icon}
-                        iconWidth={item.iconWidth}
-                        iconHeight={item.iconHeight}
-                        iconFill={item.iconFill}
-                        contentFit={item.contentFit}
-                        title={item.text}
-                        shouldCheckActionAllowedOnPress={false}
-                        description={item.description}
-                        numberOfLinesDescription={item.numberOfLinesDescription}
-                        onPress={() => selectItem(menuIndex)}
-                        focused={focusedIndex === menuIndex}
-                        displayInDefaultIconColor={item.displayInDefaultIconColor}
-                        shouldShowRightIcon={item.shouldShowRightIcon}
-                        iconRight={item.iconRight}
-                        shouldPutLeftPaddingWhenNoIcon={item.shouldPutLeftPaddingWhenNoIcon}
-                        label={item.label}
-                        isLabelHoverable={item.isLabelHoverable}
-                        floatRightAvatars={item.floatRightAvatars}
-                        floatRightAvatarSize={item.floatRightAvatarSize}
-                        shouldShowSubscriptRightAvatar={item.shouldShowSubscriptRightAvatar}
-                        disabled={item.disabled}
-                        onFocus={() => setFocusedIndex(menuIndex)}
-                        success={item.success}
-                        containerStyle={item.containerStyle}
-                    />
-                ))}
-            </View>
+            <FocusTrapForModal active={isVisible}>
+                <View style={isSmallScreenWidth ? {} : styles.createMenuContainer}>
+                    {renderHeaderText()}
+                    {enteredSubMenuIndexes.length > 0 && renderBackButtonItem()}
+                    {currentMenuItems.map((item, menuIndex) => (
+                        <FocusableMenuItem
+                            // eslint-disable-next-line react/no-array-index-key
+                            key={`${item.text}_${menuIndex}`}
+                            icon={item.icon}
+                            iconWidth={item.iconWidth}
+                            iconHeight={item.iconHeight}
+                            iconFill={item.iconFill}
+                            contentFit={item.contentFit}
+                            title={item.text}
+                            titleStyle={StyleSheet.flatten([styles.flex1, item.titleStyle])}
+                            shouldCheckActionAllowedOnPress={false}
+                            description={item.description}
+                            numberOfLinesDescription={item.numberOfLinesDescription}
+                            onPress={() => selectItem(menuIndex)}
+                            focused={focusedIndex === menuIndex}
+                            displayInDefaultIconColor={item.displayInDefaultIconColor}
+                            shouldShowRightIcon={item.shouldShowRightIcon}
+                            iconRight={item.iconRight}
+                            shouldPutLeftPaddingWhenNoIcon={item.shouldPutLeftPaddingWhenNoIcon}
+                            label={item.label}
+                            isLabelHoverable={item.isLabelHoverable}
+                            floatRightAvatars={item.floatRightAvatars}
+                            floatRightAvatarSize={item.floatRightAvatarSize}
+                            shouldShowSubscriptRightAvatar={item.shouldShowSubscriptRightAvatar}
+                            disabled={item.disabled}
+                            onFocus={() => setFocusedIndex(menuIndex)}
+                            success={item.success}
+                            containerStyle={item.containerStyle}
+                            shouldRenderTooltip={item.shouldRenderTooltip}
+                            tooltipAnchorAlignment={item.tooltipAnchorAlignment}
+                            tooltipShiftHorizontal={item.tooltipShiftHorizontal}
+                            tooltipShiftVertical={item.tooltipShiftVertical}
+                            tooltipWrapperStyle={item.tooltipWrapperStyle}
+                            renderTooltipContent={item.renderTooltipContent}
+                            numberOfLinesTitle={item.numberOfLinesTitle}
+                            interactive={item.interactive}
+                            badgeText={item.badgeText}
+                        />
+                    ))}
+                </View>
+            </FocusTrapForModal>
         </PopoverWithMeasuredContent>
     );
 }
 
 PopoverMenu.displayName = 'PopoverMenu';
 
-export default React.memo(PopoverMenu);
+export default React.memo(
+    PopoverMenu,
+    (prevProps, nextProps) =>
+        prevProps.menuItems.length === nextProps.menuItems.length &&
+        prevProps.isVisible === nextProps.isVisible &&
+        lodashIsEqual(prevProps.anchorPosition, nextProps.anchorPosition) &&
+        prevProps.anchorRef === nextProps.anchorRef &&
+        prevProps.headerText === nextProps.headerText &&
+        prevProps.fromSidebarMediumScreen === nextProps.fromSidebarMediumScreen &&
+        lodashIsEqual(prevProps.anchorAlignment, nextProps.anchorAlignment) &&
+        prevProps.animationIn === nextProps.animationIn &&
+        prevProps.animationOut === nextProps.animationOut &&
+        prevProps.animationInTiming === nextProps.animationInTiming &&
+        prevProps.disableAnimation === nextProps.disableAnimation &&
+        prevProps.withoutOverlay === nextProps.withoutOverlay &&
+        prevProps.shouldSetModalVisibility === nextProps.shouldSetModalVisibility,
+);
 export type {PopoverMenuItem, PopoverMenuProps};
diff --git a/src/components/PopoverProvider/index.native.tsx b/src/components/PopoverProvider/index.native.tsx
index b13909945bef..d58322fafe63 100644
--- a/src/components/PopoverProvider/index.native.tsx
+++ b/src/components/PopoverProvider/index.native.tsx
@@ -3,7 +3,7 @@ import type {PopoverContextProps, PopoverContextValue} from './types';
 
 const PopoverContext = React.createContext<PopoverContextValue>({
     onOpen: () => {},
-    popover: {},
+    popover: null,
     close: () => {},
     isOpen: false,
 });
@@ -13,7 +13,7 @@ function PopoverContextProvider(props: PopoverContextProps) {
         () => ({
             onOpen: () => {},
             close: () => {},
-            popover: {},
+            popover: null,
             isOpen: false,
         }),
         [],
diff --git a/src/components/PopoverProvider/index.tsx b/src/components/PopoverProvider/index.tsx
index cc6c84477525..82f3c6c7d61a 100644
--- a/src/components/PopoverProvider/index.tsx
+++ b/src/components/PopoverProvider/index.tsx
@@ -6,7 +6,7 @@ import type {AnchorRef, PopoverContextProps, PopoverContextValue} from './types'
 
 const PopoverContext = createContext<PopoverContextValue>({
     onOpen: () => {},
-    popover: {},
+    popover: null,
     close: () => {},
     isOpen: false,
 });
diff --git a/src/components/PopoverProvider/types.ts b/src/components/PopoverProvider/types.ts
index 5022aee0f843..b3d21e9ed5d9 100644
--- a/src/components/PopoverProvider/types.ts
+++ b/src/components/PopoverProvider/types.ts
@@ -8,7 +8,7 @@ type PopoverContextProps = {
 
 type PopoverContextValue = {
     onOpen?: (popoverParams: AnchorRef) => void;
-    popover?: AnchorRef | Record<string, never> | null;
+    popover?: AnchorRef | null;
     close: (anchorRef?: RefObject<View | HTMLDivElement | Text>) => void;
     isOpen: boolean;
 };
diff --git a/src/components/PopoverWithMeasuredContent.tsx b/src/components/PopoverWithMeasuredContent.tsx
index af6f91a64026..32cc589bf0fb 100644
--- a/src/components/PopoverWithMeasuredContent.tsx
+++ b/src/components/PopoverWithMeasuredContent.tsx
@@ -4,6 +4,7 @@ import type {LayoutChangeEvent} from 'react-native';
 import {View} from 'react-native';
 import useThemeStyles from '@hooks/useThemeStyles';
 import useWindowDimensions from '@hooks/useWindowDimensions';
+import ComposerFocusManager from '@libs/ComposerFocusManager';
 import PopoverWithMeasuredContentUtils from '@libs/PopoverWithMeasuredContentUtils';
 import CONST from '@src/CONST';
 import type {AnchorDimensions, AnchorPosition} from '@src/styles';
@@ -57,6 +58,7 @@ function PopoverWithMeasuredContent({
     },
     shoudSwitchPositionIfOverflow = false,
     shouldHandleNavigationBack = false,
+    shouldEnableNewFocusManagement,
     ...props
 }: PopoverWithMeasuredContentProps) {
     const styles = useThemeStyles();
@@ -66,11 +68,16 @@ function PopoverWithMeasuredContent({
     const [isContentMeasured, setIsContentMeasured] = useState(popoverWidth > 0 && popoverHeight > 0);
     const [isPopoverVisible, setIsPopoverVisible] = useState(false);
 
+    const modalId = useMemo(() => ComposerFocusManager.getId(), []);
+
     /**
      * When Popover becomes visible, we need to recalculate the Dimensions.
      * Skip render on Popover until recalculations are done by setting isContentMeasured to false as early as possible.
      */
     if (!isPopoverVisible && isVisible) {
+        if (shouldEnableNewFocusManagement) {
+            ComposerFocusManager.saveFocusState(modalId);
+        }
         // When Popover is shown recalculate
         setIsContentMeasured(popoverDimensions.width > 0 && popoverDimensions.height > 0);
         setIsPopoverVisible(true);
@@ -150,6 +157,8 @@ function PopoverWithMeasuredContent({
             statusBarTranslucent={statusBarTranslucent}
             avoidKeyboard={avoidKeyboard}
             hideModalContentWhileAnimating={hideModalContentWhileAnimating}
+            modalId={modalId}
+            shouldEnableNewFocusManagement={shouldEnableNewFocusManagement}
             // eslint-disable-next-line react/jsx-props-no-spreading
             {...props}
             anchorPosition={shiftedAnchorPosition}
diff --git a/src/components/PopoverWithoutOverlay/index.tsx b/src/components/PopoverWithoutOverlay/index.tsx
index 06478b468e1e..7d58ad6d22be 100644
--- a/src/components/PopoverWithoutOverlay/index.tsx
+++ b/src/components/PopoverWithoutOverlay/index.tsx
@@ -69,7 +69,7 @@ function PopoverWithoutOverlay(
             removeOnClose();
         };
         // We want this effect to run strictly ONLY when isVisible prop changes
-        // eslint-disable-next-line react-hooks/exhaustive-deps
+        // eslint-disable-next-line react-compiler/react-compiler, react-hooks/exhaustive-deps
     }, [isVisible]);
 
     const {
@@ -124,6 +124,7 @@ function PopoverWithoutOverlay(
             ref={viewRef(withoutOverlayRef)}
             // Prevent the parent element to capture a click. This is useful when the modal component is put inside a pressable.
             onClick={(e) => e.stopPropagation()}
+            dataSet={{dragArea: false}}
         >
             <View
                 style={{
diff --git a/src/components/Pressable/GenericPressable/BaseGenericPressable.tsx b/src/components/Pressable/GenericPressable/BaseGenericPressable.tsx
index 9dda35f41e25..5237ff486631 100644
--- a/src/components/Pressable/GenericPressable/BaseGenericPressable.tsx
+++ b/src/components/Pressable/GenericPressable/BaseGenericPressable.tsx
@@ -1,5 +1,5 @@
 import type {ForwardedRef} from 'react';
-import React, {forwardRef, useCallback, useEffect, useMemo} from 'react';
+import React, {forwardRef, useCallback, useEffect, useMemo, useState} from 'react';
 import type {GestureResponderEvent, View} from 'react-native';
 // eslint-disable-next-line no-restricted-imports
 import {Pressable} from 'react-native';
@@ -35,6 +35,8 @@ function GenericPressable(
         onPressIn,
         onPressOut,
         accessible = true,
+        fullDisabled = false,
+        interactive = true,
         ...rest
     }: PressableProps,
     ref: PressableRef,
@@ -44,6 +46,7 @@ function GenericPressable(
     const {isExecuting, singleExecution} = useSingleExecution();
     const isScreenReaderActive = Accessibility.useScreenReaderStatus();
     const [hitSlop, onLayout] = Accessibility.useAutoHitSlop();
+    const [isHovered, setIsHovered] = useState(false);
 
     const isDisabled = useMemo(() => {
         let shouldBeDisabledByScreenReader = false;
@@ -65,6 +68,9 @@ function GenericPressable(
      * Returns the cursor style based on the state of Pressable
      */
     const cursorStyle = useMemo(() => {
+        if (!interactive) {
+            return styles.cursorDefault;
+        }
         if (shouldUseDisabledCursor) {
             return styles.cursorDisabled;
         }
@@ -72,7 +78,7 @@ function GenericPressable(
             return styles.cursorText;
         }
         return styles.cursorPointer;
-    }, [styles, shouldUseDisabledCursor, rest.accessibilityRole, rest.role]);
+    }, [styles, shouldUseDisabledCursor, rest.accessibilityRole, rest.role, interactive]);
 
     const onLongPressHandler = useCallback(
         (event: GestureResponderEvent) => {
@@ -85,19 +91,18 @@ function GenericPressable(
             if (shouldUseHapticsOnLongPress) {
                 HapticFeedback.longPress();
             }
-            if (ref && 'current' in ref) {
+            if (ref && 'current' in ref && nextFocusRef) {
                 ref.current?.blur();
+                Accessibility.moveAccessibilityFocus(nextFocusRef);
             }
             onLongPress(event);
-
-            Accessibility.moveAccessibilityFocus(nextFocusRef);
         },
         [shouldUseHapticsOnLongPress, onLongPress, nextFocusRef, ref, isDisabled],
     );
 
     const onPressHandler = useCallback(
         (event?: GestureResponderEvent | KeyboardEvent) => {
-            if (isDisabled) {
+            if (isDisabled || !interactive) {
                 return;
             }
             if (!onPress) {
@@ -106,14 +111,20 @@ function GenericPressable(
             if (shouldUseHapticsOnPress) {
                 HapticFeedback.press();
             }
-            if (ref && 'current' in ref) {
+            if (ref && 'current' in ref && nextFocusRef) {
                 ref.current?.blur();
+                Accessibility.moveAccessibilityFocus(nextFocusRef);
             }
-            const onPressResult = onPress(event);
-            Accessibility.moveAccessibilityFocus(nextFocusRef);
-            return onPressResult;
+            return onPress(event);
         },
-        [shouldUseHapticsOnPress, onPress, nextFocusRef, ref, isDisabled],
+        [shouldUseHapticsOnPress, onPress, nextFocusRef, ref, isDisabled, interactive],
+    );
+
+    const voidOnPressHandler = useCallback(
+        (...args: Parameters<typeof onPressHandler>) => {
+            onPressHandler(...args);
+        },
+        [onPressHandler],
     );
 
     const onKeyboardShortcutPressHandler = useCallback(
@@ -136,6 +147,7 @@ function GenericPressable(
             hitSlop={shouldUseAutoHitSlop ? hitSlop : undefined}
             onLayout={shouldUseAutoHitSlop ? onLayout : undefined}
             ref={ref as ForwardedRef<View>}
+            disabled={fullDisabled}
             onPress={!isDisabled ? singleExecution(onPressHandler) : undefined}
             onLongPress={!isDisabled && onLongPress ? onLongPressHandler : undefined}
             onKeyDown={!isDisabled ? onKeyDown : undefined}
@@ -146,7 +158,7 @@ function GenericPressable(
                 StyleUtils.parseStyleFromFunction(style, state),
                 isScreenReaderActive && StyleUtils.parseStyleFromFunction(screenReaderActiveStyle, state),
                 state.focused && StyleUtils.parseStyleFromFunction(focusStyle, state),
-                state.hovered && StyleUtils.parseStyleFromFunction(hoverStyle, state),
+                (state.hovered || isHovered) && StyleUtils.parseStyleFromFunction(hoverStyle, state),
                 state.pressed && StyleUtils.parseStyleFromFunction(pressStyle, state),
                 isDisabled && [StyleUtils.parseStyleFromFunction(disabledStyle, state), styles.noSelect],
             ]}
@@ -158,13 +170,28 @@ function GenericPressable(
             aria-disabled={isDisabled}
             aria-keyshortcuts={keyboardShortcut && `${keyboardShortcut.modifiers.join('')}+${keyboardShortcut.shortcutKey}`}
             // ios-only form of inputs
-            onMagicTap={!isDisabled ? onPressHandler : undefined}
-            onAccessibilityTap={!isDisabled ? onPressHandler : undefined}
+            onMagicTap={!isDisabled ? voidOnPressHandler : undefined}
+            onAccessibilityTap={!isDisabled ? voidOnPressHandler : undefined}
             accessible={accessible}
             // eslint-disable-next-line react/jsx-props-no-spreading
             {...rest}
+            onHoverOut={(event) => {
+                if (event?.type === 'pointerenter' || event?.type === 'mouseenter') {
+                    return;
+                }
+                setIsHovered(false);
+                if (rest.onHoverOut) {
+                    rest.onHoverOut(event);
+                }
+            }}
+            onHoverIn={(event) => {
+                setIsHovered(true);
+                if (rest.onHoverIn) {
+                    rest.onHoverIn(event);
+                }
+            }}
         >
-            {(state) => (typeof children === 'function' ? children({...state, isScreenReaderActive, isDisabled}) : children)}
+            {(state) => (typeof children === 'function' ? children({...state, isScreenReaderActive, hovered: state.hovered || isHovered, isDisabled}) : children)}
         </Pressable>
     );
 }
diff --git a/src/components/Pressable/GenericPressable/types.ts b/src/components/Pressable/GenericPressable/types.ts
index 9040a844e5a7..61cb6db8ee76 100644
--- a/src/components/Pressable/GenericPressable/types.ts
+++ b/src/components/Pressable/GenericPressable/types.ts
@@ -137,6 +137,17 @@ type PressableProps = RNPressableProps &
 
         /** Turns off drag area for the component */
         noDragArea?: boolean;
+
+        /**
+         * Specifies if the pressable responder should be disabled
+         */
+        fullDisabled?: boolean;
+
+        /**
+         * Whether the menu item should be interactive at all
+         * e.g., show disabled cursor when disabled
+         */
+        interactive?: boolean;
     };
 
 type PressableRef = ForwardedRef<HTMLDivElement | View | RNText | undefined>;
diff --git a/src/components/Pressable/PressableWithDelayToggle.tsx b/src/components/Pressable/PressableWithDelayToggle.tsx
index 86f6c9d8aff8..617811637525 100644
--- a/src/components/Pressable/PressableWithDelayToggle.tsx
+++ b/src/components/Pressable/PressableWithDelayToggle.tsx
@@ -99,7 +99,7 @@ function PressableWithDelayToggle(
     return (
         <PressableView
             // Using `ref as any` due to variable component (Text or View) based on 'inline' prop; TypeScript workaround.
-            // eslint-disable-next-line @typescript-eslint/no-explicit-any
+            // eslint-disable-next-line @typescript-eslint/no-explicit-any, @typescript-eslint/no-unsafe-assignment
             ref={ref as any}
             onPress={updatePressState}
             accessibilityLabel={tooltipTexts}
diff --git a/src/components/Pressable/PressableWithFeedback.tsx b/src/components/Pressable/PressableWithFeedback.tsx
index 74ea4596046e..d50404873eeb 100644
--- a/src/components/Pressable/PressableWithFeedback.tsx
+++ b/src/components/Pressable/PressableWithFeedback.tsx
@@ -49,7 +49,7 @@ function PressableWithFeedback(
 
     return (
         <OpacityView
-            shouldDim={Boolean(!rest.disabled && (isPressed || isHovered))}
+            shouldDim={!!(!rest.disabled && (isPressed || isHovered))}
             dimmingValue={isPressed ? pressDimmingValue : hoverDimmingValue}
             style={wrapperStyle}
             needsOffscreenAlphaCompositing={needsOffscreenAlphaCompositing}
diff --git a/src/components/ProcessMoneyReportHoldMenu.tsx b/src/components/ProcessMoneyReportHoldMenu.tsx
index 6e81c9d57bc8..4afa7aa4972c 100644
--- a/src/components/ProcessMoneyReportHoldMenu.tsx
+++ b/src/components/ProcessMoneyReportHoldMenu.tsx
@@ -1,14 +1,19 @@
-import React from 'react';
+import React, {useMemo} from 'react';
 import type {OnyxEntry} from 'react-native-onyx';
 import useLocalize from '@hooks/useLocalize';
+import useResponsiveLayout from '@hooks/useResponsiveLayout';
 import Navigation from '@libs/Navigation/Navigation';
 import {isLinkedTransactionHeld} from '@libs/ReportActionsUtils';
 import * as IOU from '@userActions/IOU';
+import CONST from '@src/CONST';
 import ROUTES from '@src/ROUTES';
 import type * as OnyxTypes from '@src/types/onyx';
 import type {PaymentMethodType} from '@src/types/onyx/OriginalMessage';
+import type DeepValueOf from '@src/types/utils/DeepValueOf';
 import DecisionModal from './DecisionModal';
 
+type ActionHandledType = DeepValueOf<typeof CONST.IOU.REPORT_ACTION_TYPE.PAY | typeof CONST.IOU.REPORT_ACTION_TYPE.APPROVE>;
+
 type ProcessMoneyReportHoldMenuProps = {
     /** The chat report this report is linked to */
     chatReport: OnyxEntry<OnyxTypes.Report>;
@@ -16,9 +21,6 @@ type ProcessMoneyReportHoldMenuProps = {
     /** Full amount of expense report to pay */
     fullAmount: string;
 
-    /** Is the window width narrow, like on a mobile device? */
-    isSmallScreenWidth: boolean;
-
     /** Whether modal is visible */
     isVisible: boolean;
 
@@ -35,27 +37,31 @@ type ProcessMoneyReportHoldMenuProps = {
     paymentType?: PaymentMethodType;
 
     /** Type of action handled */
-    requestType?: 'pay' | 'approve';
+    requestType?: ActionHandledType;
+
+    /** Number of transaction of a money request */
+    transactionCount: number;
 };
 
 function ProcessMoneyReportHoldMenu({
     requestType,
     nonHeldAmount,
     fullAmount,
-    isSmallScreenWidth = false,
     onClose,
     isVisible,
     paymentType,
     chatReport,
     moneyRequestReport,
+    transactionCount,
 }: ProcessMoneyReportHoldMenuProps) {
     const {translate} = useLocalize();
-    const isApprove = requestType === 'approve';
+    const isApprove = requestType === CONST.IOU.REPORT_ACTION_TYPE.APPROVE;
+    const {isSmallScreenWidth} = useResponsiveLayout();
 
     const onSubmit = (full: boolean) => {
         if (isApprove) {
             IOU.approveMoneyRequest(moneyRequestReport, full);
-            if (!full && isLinkedTransactionHeld(Navigation.getTopmostReportActionId() ?? '', moneyRequestReport.reportID)) {
+            if (!full && isLinkedTransactionHeld(Navigation.getTopmostReportActionId() ?? '-1', moneyRequestReport.reportID)) {
                 Navigation.goBack(ROUTES.REPORT_WITH_ID.getRoute(moneyRequestReport.reportID));
             }
         } else if (chatReport && paymentType) {
@@ -64,12 +70,19 @@ function ProcessMoneyReportHoldMenu({
         onClose();
     };
 
+    const promptText = useMemo(() => {
+        if (nonHeldAmount) {
+            return translate(isApprove ? 'iou.confirmApprovalAmount' : 'iou.confirmPayAmount');
+        }
+        return translate(isApprove ? 'iou.confirmApprovalAllHoldAmount' : 'iou.confirmPayAllHoldAmount', {transactionCount});
+    }, [nonHeldAmount, transactionCount, translate, isApprove]);
+
     return (
         <DecisionModal
             title={translate(isApprove ? 'iou.confirmApprove' : 'iou.confirmPay')}
             onClose={onClose}
             isVisible={isVisible}
-            prompt={translate(isApprove ? 'iou.confirmApprovalAmount' : 'iou.confirmPayAmount')}
+            prompt={promptText}
             firstOptionText={nonHeldAmount ? `${translate(isApprove ? 'iou.approveOnly' : 'iou.payOnly')} ${nonHeldAmount}` : undefined}
             secondOptionText={`${translate(isApprove ? 'iou.approve' : 'iou.pay')} ${fullAmount}`}
             onFirstOptionSubmit={() => onSubmit(false)}
@@ -82,3 +95,4 @@ function ProcessMoneyReportHoldMenu({
 ProcessMoneyReportHoldMenu.displayName = 'ProcessMoneyReportHoldMenu';
 
 export default ProcessMoneyReportHoldMenu;
+export type {ActionHandledType};
diff --git a/src/components/ProcessMoneyRequestHoldMenu.tsx b/src/components/ProcessMoneyRequestHoldMenu.tsx
index eefab719a103..bb76ea0290f3 100644
--- a/src/components/ProcessMoneyRequestHoldMenu.tsx
+++ b/src/components/ProcessMoneyRequestHoldMenu.tsx
@@ -1,4 +1,5 @@
-import React, {useRef} from 'react';
+import {useNavigation} from '@react-navigation/native';
+import React, {useEffect, useRef} from 'react';
 import {View} from 'react-native';
 import useLocalize from '@hooks/useLocalize';
 import useThemeStyles from '@hooks/useThemeStyles';
@@ -31,6 +32,14 @@ function ProcessMoneyRequestHoldMenu({isVisible, onClose, onConfirm, anchorPosit
     const {translate} = useLocalize();
     const styles = useThemeStyles();
     const popoverRef = useRef(null);
+    const navigation = useNavigation();
+
+    useEffect(() => {
+        const unsub = navigation.addListener('beforeRemove', () => {
+            onClose();
+        });
+        return unsub;
+    }, [navigation, onClose]);
 
     return (
         <Popover
@@ -41,11 +50,12 @@ function ProcessMoneyRequestHoldMenu({isVisible, onClose, onConfirm, anchorPosit
             anchorAlignment={anchorAlignment}
             disableAnimation={false}
             withoutOverlay={false}
+            shouldCloseWhenBrowserNavigationChanged={false}
         >
             <View style={[styles.mh5, styles.mv5]}>
                 <View style={[styles.flexRow, styles.alignItemsCenter, styles.mb5]}>
                     <Text style={[styles.textHeadline, styles.mr2]}>{translate('iou.holdEducationalTitle')}</Text>
-                    <TextPill textStyles={styles.holdRequestInline}>{translate('iou.hold')}</TextPill>
+                    <TextPill textStyles={styles.holdRequestInline}>{translate('violations.hold')}</TextPill>
                 </View>
                 <HoldMenuSectionList />
                 <Button
diff --git a/src/components/ProfilingToolMenu/BaseProfilingToolMenu.tsx b/src/components/ProfilingToolMenu/BaseProfilingToolMenu.tsx
index ff34db881a35..d9e106ec3f52 100644
--- a/src/components/ProfilingToolMenu/BaseProfilingToolMenu.tsx
+++ b/src/components/ProfilingToolMenu/BaseProfilingToolMenu.tsx
@@ -1,10 +1,8 @@
 import React, {useCallback, useEffect, useState} from 'react';
 import DeviceInfo from 'react-native-device-info';
-import RNFS from 'react-native-fs';
 import {withOnyx} from 'react-native-onyx';
 import type {OnyxEntry} from 'react-native-onyx';
 import {startProfiling, stopProfiling} from 'react-native-release-profiler';
-import Share from 'react-native-share';
 import Button from '@components/Button';
 import Switch from '@components/Switch';
 import TestToolRow from '@components/TestToolRow';
@@ -14,10 +12,13 @@ import useThemeStyles from '@hooks/useThemeStyles';
 import toggleProfileTool from '@libs/actions/ProfilingTool';
 import getPlatform from '@libs/getPlatform';
 import Log from '@libs/Log';
+import {Memoize} from '@libs/memoize';
 import CONFIG from '@src/CONFIG';
 import CONST from '@src/CONST';
 import ONYXKEYS from '@src/ONYXKEYS';
 import pkg from '../../../package.json';
+import RNFS from './RNFS';
+import Share from './Share';
 
 type BaseProfilingToolMenuOnyxProps = {
     isProfilingInProgress: OnyxEntry<boolean>;
@@ -28,6 +29,8 @@ type BaseProfilingToolMenuProps = {
     pathToBeUsed: string;
     /** Path used to display location of saved file */
     displayPath: string;
+    /** Whether to show the share button */
+    showShareButton?: boolean;
 } & BaseProfilingToolMenuOnyxProps;
 
 function formatBytes(bytes: number, decimals = 2) {
@@ -44,30 +47,34 @@ function formatBytes(bytes: number, decimals = 2) {
     return `${parseFloat((bytes / k ** i).toFixed(dm))} ${sizes[i]}`;
 }
 
+// WARNING: When changing this name make sure that the "scripts/symbolicate-profile.ts" script is still working!
 const newFileName = `Profile_trace_for_${pkg.version}.cpuprofile`;
 
-function BaseProfilingToolMenu({isProfilingInProgress = false, pathToBeUsed, displayPath}: BaseProfilingToolMenuProps) {
+function BaseProfilingToolMenu({isProfilingInProgress = false, showShareButton = false, pathToBeUsed, displayPath}: BaseProfilingToolMenuProps) {
     const styles = useThemeStyles();
-    const [pathIOS, setPathIOS] = useState('');
+    const [filePath, setFilePath] = useState('');
     const [sharePath, setSharePath] = useState('');
     const [totalMemory, setTotalMemory] = useState(0);
     const [usedMemory, setUsedMemory] = useState(0);
+    const [memoizeStats, setMemoizeStats] = useState<ReturnType<typeof Memoize.stopMonitoring>>();
     const {translate} = useLocalize();
 
     // eslint-disable-next-line @lwc/lwc/no-async-await
     const stop = useCallback(async () => {
-        const path = await stopProfiling(getPlatform() === CONST.PLATFORM.IOS);
-        setPathIOS(path);
+        const path = await stopProfiling(getPlatform() === CONST.PLATFORM.IOS || getPlatform() === CONST.PLATFORM.WEB, newFileName);
+        setFilePath(path);
 
         const amountOfTotalMemory = await DeviceInfo.getTotalMemory();
         const amountOfUsedMemory = await DeviceInfo.getUsedMemory();
         setTotalMemory(amountOfTotalMemory);
         setUsedMemory(amountOfUsedMemory);
+        setMemoizeStats(Memoize.stopMonitoring());
     }, []);
 
     const onToggleProfiling = useCallback(() => {
         const shouldProfiling = !isProfilingInProgress;
         if (shouldProfiling) {
+            Memoize.startMonitoring();
             startProfiling();
         } else {
             stop();
@@ -86,12 +93,13 @@ function BaseProfilingToolMenu({isProfilingInProgress = false, pathToBeUsed, dis
                 platform: getPlatform(),
                 totalMemory: formatBytes(totalMemory, 2),
                 usedMemory: formatBytes(usedMemory, 2),
+                memoizeStats,
             }),
-        [totalMemory, usedMemory],
+        [memoizeStats, totalMemory, usedMemory],
     );
 
     useEffect(() => {
-        if (!pathIOS) {
+        if (!filePath) {
             return;
         }
 
@@ -111,11 +119,11 @@ function BaseProfilingToolMenu({isProfilingInProgress = false, pathToBeUsed, dis
             }
 
             // Copy the file to a new location with the desired filename
-            await RNFS.copyFile(pathIOS, newFilePath)
+            await RNFS.copyFile(filePath, newFilePath)
                 .then(() => {
                     Log.hmmm('[ProfilingToolMenu] file copied successfully');
                 })
-                .catch((error) => {
+                .catch((error: Record<string, unknown>) => {
                     Log.hmmm('[ProfilingToolMenu] error copying file: ', error);
                 });
 
@@ -123,7 +131,7 @@ function BaseProfilingToolMenu({isProfilingInProgress = false, pathToBeUsed, dis
         };
 
         rename();
-    }, [pathIOS, pathToBeUsed]);
+    }, [filePath, pathToBeUsed]);
 
     const onDownloadProfiling = useCallback(() => {
         // eslint-disable-next-line @lwc/lwc/no-async-await
@@ -157,7 +165,7 @@ function BaseProfilingToolMenu({isProfilingInProgress = false, pathToBeUsed, dis
                     onToggle={onToggleProfiling}
                 />
             </TestToolRow>
-            {!!pathIOS && (
+            {!!filePath && showShareButton && (
                 <>
                     <Text style={[styles.textLabelSupporting, styles.mb4]}>{`path: ${displayPath}/${newFileName}`}</Text>
                     <TestToolRow title={translate('initialSettingsPage.troubleshoot.profileTrace')}>
diff --git a/src/components/ProfilingToolMenu/RNFS/index.ts b/src/components/ProfilingToolMenu/RNFS/index.ts
new file mode 100644
index 000000000000..374ef87f13a4
--- /dev/null
+++ b/src/components/ProfilingToolMenu/RNFS/index.ts
@@ -0,0 +1,3 @@
+import RNFS from 'react-native-fs';
+
+export default RNFS;
diff --git a/src/components/ProfilingToolMenu/RNFS/index.web.ts b/src/components/ProfilingToolMenu/RNFS/index.web.ts
new file mode 100644
index 000000000000..93d2d84d6fe7
--- /dev/null
+++ b/src/components/ProfilingToolMenu/RNFS/index.web.ts
@@ -0,0 +1,18 @@
+const RNFS = {
+    exists: () => Promise.resolve(false),
+    unlink: () => Promise.resolve(true),
+    copyFile: () => Promise.resolve(true),
+    DocumentDirectoryPath: '',
+    writeFile: (path: string, data: string, encoding: string) => {
+        const dataStr = `data:text/json;charset=${encoding},${encodeURIComponent(JSON.stringify(data))}`;
+        const downloadAnchorNode = document.createElement('a');
+
+        downloadAnchorNode.setAttribute('href', dataStr);
+        downloadAnchorNode.setAttribute('download', path);
+        document.body.appendChild(downloadAnchorNode); // required for Firefox
+        downloadAnchorNode.click();
+        downloadAnchorNode.remove();
+    },
+};
+
+export default RNFS;
diff --git a/src/components/ProfilingToolMenu/Share/index.ts b/src/components/ProfilingToolMenu/Share/index.ts
new file mode 100644
index 000000000000..e08a046855a5
--- /dev/null
+++ b/src/components/ProfilingToolMenu/Share/index.ts
@@ -0,0 +1,3 @@
+import Share from 'react-native-share';
+
+export default Share;
diff --git a/src/components/ProfilingToolMenu/Share/index.web.ts b/src/components/ProfilingToolMenu/Share/index.web.ts
new file mode 100644
index 000000000000..6572b8a14440
--- /dev/null
+++ b/src/components/ProfilingToolMenu/Share/index.web.ts
@@ -0,0 +1,5 @@
+const Share = {
+    open: () => Promise.resolve(),
+};
+
+export default Share;
diff --git a/src/components/ProfilingToolMenu/index.android.tsx b/src/components/ProfilingToolMenu/index.android.tsx
index 7ca3cc24c9a1..33c7354f199e 100644
--- a/src/components/ProfilingToolMenu/index.android.tsx
+++ b/src/components/ProfilingToolMenu/index.android.tsx
@@ -8,6 +8,7 @@ function ProfilingToolMenu() {
         <BaseProfilingToolMenu
             pathToBeUsed={RNFS.DownloadDirectoryPath}
             displayPath={`${CONST.DOWNLOADS_PATH}`}
+            showShareButton
         />
     );
 }
diff --git a/src/components/ProfilingToolMenu/index.ios.tsx b/src/components/ProfilingToolMenu/index.ios.tsx
index 45400b6a6959..03298eccf034 100644
--- a/src/components/ProfilingToolMenu/index.ios.tsx
+++ b/src/components/ProfilingToolMenu/index.ios.tsx
@@ -12,6 +12,7 @@ function ProfilingToolMenu() {
         <BaseProfilingToolMenu
             pathToBeUsed={RNFS.DocumentDirectoryPath}
             displayPath={`${CONST.NEW_EXPENSIFY_PATH}${getDownloadFolderPathSuffixForIOS(environment)}`}
+            showShareButton
         />
     );
 }
diff --git a/src/components/ProfilingToolMenu/index.tsx b/src/components/ProfilingToolMenu/index.tsx
index ab12fff27ef8..3a94ed7f2b16 100644
--- a/src/components/ProfilingToolMenu/index.tsx
+++ b/src/components/ProfilingToolMenu/index.tsx
@@ -1,5 +1,13 @@
+import React from 'react';
+import BaseProfilingToolMenu from './BaseProfilingToolMenu';
+
 function ProfilingToolMenu() {
-    return null;
+    return (
+        <BaseProfilingToolMenu
+            pathToBeUsed=""
+            displayPath=""
+        />
+    );
 }
 
 ProfilingToolMenu.displayName = 'ProfilingToolMenu';
diff --git a/src/components/PromotedActionsBar.tsx b/src/components/PromotedActionsBar.tsx
new file mode 100644
index 000000000000..b0309d702f9a
--- /dev/null
+++ b/src/components/PromotedActionsBar.tsx
@@ -0,0 +1,135 @@
+import React from 'react';
+import type {StyleProp, ViewStyle} from 'react-native';
+import {View} from 'react-native';
+import useTheme from '@hooks/useTheme';
+import useThemeStyles from '@hooks/useThemeStyles';
+import * as HeaderUtils from '@libs/HeaderUtils';
+import * as Localize from '@libs/Localize';
+import getTopmostCentralPaneRoute from '@libs/Navigation/getTopmostCentralPaneRoute';
+import Navigation, {navigationRef} from '@libs/Navigation/Navigation';
+import type {RootStackParamList, State} from '@libs/Navigation/types';
+import * as ReportUtils from '@libs/ReportUtils';
+import * as ReportActions from '@userActions/Report';
+import * as Session from '@userActions/Session';
+import CONST from '@src/CONST';
+import ROUTES from '@src/ROUTES';
+import SCREENS from '@src/SCREENS';
+import type {ReportAction} from '@src/types/onyx';
+import type OnyxReport from '@src/types/onyx/Report';
+import Button from './Button';
+import type {ThreeDotsMenuItem} from './HeaderWithBackButton/types';
+import * as Expensicons from './Icon/Expensicons';
+
+type PromotedAction = {
+    key: string;
+} & ThreeDotsMenuItem;
+
+type BasePromotedActions = typeof CONST.PROMOTED_ACTIONS.PIN | typeof CONST.PROMOTED_ACTIONS.SHARE | typeof CONST.PROMOTED_ACTIONS.JOIN;
+
+type PromotedActionsType = Record<BasePromotedActions, (report: OnyxReport) => PromotedAction> & {
+    message: (params: {reportID?: string; accountID?: number; login?: string}) => PromotedAction;
+} & {
+    hold: (params: {isTextHold: boolean; reportAction: ReportAction | undefined; reportID?: string}) => PromotedAction;
+};
+
+const PromotedActions = {
+    pin: (report) => ({
+        key: CONST.PROMOTED_ACTIONS.PIN,
+        ...HeaderUtils.getPinMenuItem(report),
+    }),
+    share: (report) => ({
+        key: CONST.PROMOTED_ACTIONS.SHARE,
+        ...HeaderUtils.getShareMenuItem(report),
+    }),
+    join: (report) => ({
+        key: CONST.PROMOTED_ACTIONS.JOIN,
+        icon: Expensicons.ChatBubbles,
+        text: Localize.translateLocal('common.join'),
+        onSelected: Session.checkIfActionIsAllowed(() => {
+            Navigation.dismissModal();
+            ReportActions.joinRoom(report);
+        }),
+    }),
+    message: ({reportID, accountID, login}) => ({
+        key: CONST.PROMOTED_ACTIONS.MESSAGE,
+        icon: Expensicons.CommentBubbles,
+        text: Localize.translateLocal('common.message'),
+        onSelected: () => {
+            if (reportID) {
+                Navigation.dismissModal(reportID);
+                return;
+            }
+
+            // The accountID might be optimistic, so we should use the login if we have it
+            if (login) {
+                ReportActions.navigateToAndOpenReport([login]);
+                return;
+            }
+            if (accountID) {
+                ReportActions.navigateToAndOpenReportWithAccountIDs([accountID]);
+            }
+        },
+    }),
+    hold: ({isTextHold, reportAction, reportID}) => ({
+        key: CONST.PROMOTED_ACTIONS.HOLD,
+        icon: Expensicons.Stopwatch,
+        text: Localize.translateLocal(`iou.${isTextHold ? 'hold' : 'unhold'}`),
+        onSelected: () => {
+            if (!isTextHold) {
+                Navigation.goBack();
+            }
+            const targetedReportID = reportID ?? reportAction?.childReportID ?? '';
+            const topmostCentralPaneRoute = getTopmostCentralPaneRoute(navigationRef.getRootState() as State<RootStackParamList>);
+
+            if (topmostCentralPaneRoute?.name !== SCREENS.SEARCH.CENTRAL_PANE && isTextHold) {
+                ReportUtils.changeMoneyRequestHoldStatus(reportAction, ROUTES.REPORT_WITH_ID.getRoute(targetedReportID));
+                return;
+            }
+
+            ReportUtils.changeMoneyRequestHoldStatus(reportAction, ROUTES.SEARCH_REPORT.getRoute(targetedReportID));
+        },
+    }),
+} satisfies PromotedActionsType;
+
+type PromotedActionsBarProps = {
+    /** The list of actions to show */
+    promotedActions: PromotedAction[];
+
+    /** The style of the container */
+    containerStyle?: StyleProp<ViewStyle>;
+};
+
+function PromotedActionsBar({promotedActions, containerStyle}: PromotedActionsBarProps) {
+    const theme = useTheme();
+    const styles = useThemeStyles();
+
+    if (promotedActions.length === 0) {
+        return null;
+    }
+
+    return (
+        <View style={[styles.flexRow, styles.ph5, styles.mb5, styles.gap2, styles.mw100, styles.w100, styles.justifyContentCenter, containerStyle]}>
+            {promotedActions.map(({key, onSelected, ...props}) => (
+                <View
+                    style={[styles.flex1, styles.mw50]}
+                    key={key}
+                >
+                    <Button
+                        onPress={onSelected}
+                        iconFill={theme.icon}
+                        medium
+                        // eslint-disable-next-line react/jsx-props-no-spreading
+                        {...props}
+                    />
+                </View>
+            ))}
+        </View>
+    );
+}
+
+PromotedActionsBar.displayName = 'PromotedActionsBar';
+
+export default PromotedActionsBar;
+
+export {PromotedActions};
+export type {PromotedAction, PromotedActionsBarProps};
diff --git a/src/components/QRCode.tsx b/src/components/QRCode.tsx
index 3accb19acfaf..e949049cb942 100644
--- a/src/components/QRCode.tsx
+++ b/src/components/QRCode.tsx
@@ -1,7 +1,7 @@
 import React from 'react';
 import type {ImageSourcePropType} from 'react-native';
 import QRCodeLibrary from 'react-native-qrcode-svg';
-import type {Svg} from 'react-native-svg';
+import type {Svg, SvgProps} from 'react-native-svg';
 import useTheme from '@hooks/useTheme';
 import CONST from '@src/CONST';
 
@@ -19,6 +19,22 @@ type QRCodeProps = {
      */
     logo?: ImageSourcePropType;
 
+    /**
+     * If the logo to be displayed in the middle of the QR code is an SVG, then this prop needs to be used
+     * instead of standard `logo`.
+     */
+    svgLogo?: React.FC<SvgProps>;
+
+    /**
+     * Background color to be used for logo.
+     */
+    logoBackgroundColor?: string;
+
+    /**
+     * Fill color to be used for logos of type SVG.
+     */
+    svgLogoFillColor?: string;
+
     /** The size ratio of logo to QR code */
     logoRatio?: QRCodeLogoRatio;
 
@@ -35,21 +51,36 @@ type QRCodeProps = {
     backgroundColor?: string;
 
     /**
-     * Function to retrieve the internal component ref and be able to call it's
+     * Function to retrieve the internal component ref and be able to call its
      * methods
      */
     getRef?: (ref: Svg) => Svg;
 };
 
-function QRCode({url, logo, getRef, size = 120, color, backgroundColor, logoRatio = CONST.QR.DEFAULT_LOGO_SIZE_RATIO, logoMarginRatio = CONST.QR.DEFAULT_LOGO_MARGIN_RATIO}: QRCodeProps) {
+function QRCode({
+    url,
+    logo,
+    svgLogo,
+    svgLogoFillColor,
+    logoBackgroundColor,
+    getRef,
+    size = 120,
+    color,
+    backgroundColor,
+    logoRatio = CONST.QR.DEFAULT_LOGO_SIZE_RATIO,
+    logoMarginRatio = CONST.QR.DEFAULT_LOGO_MARGIN_RATIO,
+}: QRCodeProps) {
     const theme = useTheme();
+
     return (
         <QRCodeLibrary
             getRef={getRef}
             value={url}
             size={size}
             logo={logo}
-            logoBackgroundColor={backgroundColor ?? theme.highlightBG}
+            logoSVG={svgLogo}
+            logoColor={svgLogoFillColor}
+            logoBackgroundColor={logoBackgroundColor ?? theme.highlightBG}
             logoSize={size * logoRatio}
             logoMargin={size * logoMarginRatio}
             logoBorderRadius={size}
diff --git a/src/components/QRShare/index.tsx b/src/components/QRShare/index.tsx
index fcd838871db3..9023773e8635 100644
--- a/src/components/QRShare/index.tsx
+++ b/src/components/QRShare/index.tsx
@@ -7,16 +7,21 @@ import ExpensifyWordmark from '@assets/images/expensify-wordmark.svg';
 import ImageSVG from '@components/ImageSVG';
 import QRCode from '@components/QRCode';
 import Text from '@components/Text';
+import useResponsiveLayout from '@hooks/useResponsiveLayout';
 import useTheme from '@hooks/useTheme';
 import useThemeStyles from '@hooks/useThemeStyles';
+import useWindowDimensions from '@hooks/useWindowDimensions';
 import variables from '@styles/variables';
 import type {QRShareHandle, QRShareProps} from './types';
 
-function QRShare({url, title, subtitle, logo, logoRatio, logoMarginRatio}: QRShareProps, ref: ForwardedRef<QRShareHandle>) {
+function QRShare({url, title, subtitle, logo, svgLogo, svgLogoFillColor, logoBackgroundColor, logoRatio, logoMarginRatio}: QRShareProps, ref: ForwardedRef<QRShareHandle>) {
     const styles = useThemeStyles();
     const theme = useTheme();
+    const {isSmallScreenWidth} = useResponsiveLayout();
+    const {windowWidth} = useWindowDimensions();
+    const qrCodeContainerWidth = isSmallScreenWidth ? windowWidth : variables.sideBarWidth;
 
-    const [qrCodeSize, setQrCodeSize] = useState<number | undefined>();
+    const [qrCodeSize, setQrCodeSize] = useState<number>(qrCodeContainerWidth - styles.ph5.paddingHorizontal * 2 - variables.qrShareHorizontalPadding * 2);
     const svgRef = useRef<Svg>();
 
     useImperativeHandle(
@@ -48,6 +53,9 @@ function QRShare({url, title, subtitle, logo, logoRatio, logoMarginRatio}: QRSha
             <QRCode
                 getRef={(svg) => (svgRef.current = svg)}
                 url={url}
+                svgLogo={svgLogo}
+                svgLogoFillColor={svgLogoFillColor}
+                logoBackgroundColor={logoBackgroundColor}
                 logo={logo}
                 size={qrCodeSize}
                 logoRatio={logoRatio}
diff --git a/src/components/QRShare/types.ts b/src/components/QRShare/types.ts
index db9afdf73c2a..8f086e19a51f 100644
--- a/src/components/QRShare/types.ts
+++ b/src/components/QRShare/types.ts
@@ -1,5 +1,6 @@
+import type React from 'react';
 import type {ImageSourcePropType} from 'react-native';
-import type {Svg} from 'react-native-svg';
+import type {Svg, SvgProps} from 'react-native-svg';
 import type {QRCodeLogoMarginRatio, QRCodeLogoRatio} from '@components/QRCode';
 
 type QRShareProps = {
@@ -18,11 +19,27 @@ type QRShareProps = {
      * */
     subtitle?: string;
 
+    /**
+     * If the logo to be displayed in the middle of the QR code is an SVG, then this prop needs to be used
+     * instead of standard `logo`
+     */
+    svgLogo?: React.FC<SvgProps>;
+
     /**
      * The logo which will be display in the middle of the QR code
      */
     logo?: ImageSourcePropType;
 
+    /**
+     * Background color to be used for logo.
+     */
+    logoBackgroundColor?: string;
+
+    /**
+     * Fill color to be used for logos of type SVG
+     */
+    svgLogoFillColor?: string;
+
     /**
      * The size ratio of logo to QR code
      */
diff --git a/src/components/RadioButtonWithLabel.tsx b/src/components/RadioButtonWithLabel.tsx
index 9b93d7900772..43f44065f5d9 100644
--- a/src/components/RadioButtonWithLabel.tsx
+++ b/src/components/RadioButtonWithLabel.tsx
@@ -3,7 +3,6 @@ import React from 'react';
 import type {StyleProp, ViewStyle} from 'react-native';
 import {View} from 'react-native';
 import useThemeStyles from '@hooks/useThemeStyles';
-import type {MaybePhraseKey} from '@libs/Localize';
 import FormHelpMessage from './FormHelpMessage';
 import * as Pressables from './Pressable';
 import RadioButton from './RadioButton';
@@ -29,7 +28,7 @@ type RadioButtonWithLabelProps = {
     hasError?: boolean;
 
     /** Error text to display */
-    errorText?: MaybePhraseKey;
+    errorText?: string;
 };
 
 const PressableWithFeedback = Pressables.PressableWithFeedback;
@@ -60,7 +59,7 @@ function RadioButtonWithLabel({LabelComponent, style, label = '', hasError = fal
                     hoverDimmingValue={0.8}
                     pressDimmingValue={0.5}
                 >
-                    {Boolean(label) && <Text style={[styles.ml1]}>{label}</Text>}
+                    {!!label && <Text style={[styles.ml1]}>{label}</Text>}
                     {!!LabelComponent && <LabelComponent />}
                 </PressableWithFeedback>
             </View>
diff --git a/src/components/RadioButtons.tsx b/src/components/RadioButtons.tsx
index 2030ce8f0bfd..07e8fe38f772 100644
--- a/src/components/RadioButtons.tsx
+++ b/src/components/RadioButtons.tsx
@@ -3,7 +3,6 @@ import type {ForwardedRef} from 'react';
 import {View} from 'react-native';
 import type {StyleProp, ViewStyle} from 'react-native';
 import useThemeStyles from '@hooks/useThemeStyles';
-import type {MaybePhraseKey} from '@libs/Localize';
 import FormHelpMessage from './FormHelpMessage';
 import RadioButtonWithLabel from './RadioButtonWithLabel';
 
@@ -24,7 +23,7 @@ type RadioButtonsProps = {
     onPress: (value: string) => void;
 
     /** Potential error text provided by a form InputWrapper */
-    errorText?: MaybePhraseKey;
+    errorText?: string;
 
     /** Style for radio button */
     radioButtonStyle?: StyleProp<ViewStyle>;
diff --git a/src/components/Reactions/EmojiReactionBubble.tsx b/src/components/Reactions/EmojiReactionBubble.tsx
index e7885a028a89..6fa4ee8bb6fb 100644
--- a/src/components/Reactions/EmojiReactionBubble.tsx
+++ b/src/components/Reactions/EmojiReactionBubble.tsx
@@ -2,12 +2,11 @@ import React from 'react';
 import type {PressableRef} from '@components/Pressable/GenericPressable/types';
 import PressableWithSecondaryInteraction from '@components/PressableWithSecondaryInteraction';
 import Text from '@components/Text';
+import useResponsiveLayout from '@hooks/useResponsiveLayout';
 import useStyleUtils from '@hooks/useStyleUtils';
 import useThemeStyles from '@hooks/useThemeStyles';
-import useWindowDimensions from '@hooks/useWindowDimensions';
 import type {ReactionListEvent} from '@pages/home/ReportScreenContext';
 import CONST from '@src/CONST';
-import getEmojiReactionBubbleTextOffsetStyle from './getEmojiReactionBubbleTextOffsetStyle';
 
 type EmojiReactionBubbleProps = {
     /**
@@ -49,7 +48,7 @@ function EmojiReactionBubble(
 ) {
     const styles = useThemeStyles();
     const StyleUtils = useStyleUtils();
-    const {isSmallScreenWidth} = useWindowDimensions();
+    const {shouldUseNarrowLayout} = useResponsiveLayout();
 
     return (
         <PressableWithSecondaryInteraction
@@ -68,7 +67,7 @@ function EmojiReactionBubble(
             }}
             onSecondaryInteraction={onReactionListOpen}
             ref={ref}
-            enableLongPressWithHover={isSmallScreenWidth}
+            enableLongPressWithHover={shouldUseNarrowLayout}
             onMouseDown={(event) => {
                 // Allow text input blur when emoji reaction is right clicked
                 if (event?.button === 2) {
@@ -83,7 +82,7 @@ function EmojiReactionBubble(
             accessible
             dataSet={{[CONST.SELECTION_SCRAPER_HIDDEN_ELEMENT]: true}}
         >
-            <Text style={[styles.emojiReactionBubbleText, StyleUtils.getEmojiReactionBubbleTextStyle(isContextMenu), getEmojiReactionBubbleTextOffsetStyle()]}>{emojiCodes.join('')}</Text>
+            <Text style={[styles.emojiReactionBubbleText, StyleUtils.getEmojiReactionBubbleTextStyle(isContextMenu)]}>{emojiCodes.join('')}</Text>
             {count > 0 && <Text style={[styles.reactionCounterText, StyleUtils.getEmojiReactionCounterTextStyle(hasUserReacted)]}>{count}</Text>}
         </PressableWithSecondaryInteraction>
     );
diff --git a/src/components/Reactions/ReactionTooltipContent.tsx b/src/components/Reactions/ReactionTooltipContent.tsx
index 198eba1f969c..8f469b01272c 100644
--- a/src/components/Reactions/ReactionTooltipContent.tsx
+++ b/src/components/Reactions/ReactionTooltipContent.tsx
@@ -23,7 +23,7 @@ type ReactionTooltipContentProps = Pick<WithCurrentUserPersonalDetailsProps, 'cu
     accountIDs: number[];
 };
 
-function ReactionTooltipContent({accountIDs, currentUserPersonalDetails = {}, emojiCodes, emojiName}: ReactionTooltipContentProps) {
+function ReactionTooltipContent({accountIDs, currentUserPersonalDetails, emojiCodes, emojiName}: ReactionTooltipContentProps) {
     const styles = useThemeStyles();
     const {translate} = useLocalize();
     const users = useMemo(() => PersonalDetailsUtils.getPersonalDetailsByIDs(accountIDs, currentUserPersonalDetails.accountID, true), [currentUserPersonalDetails.accountID, accountIDs]);
diff --git a/src/components/Reactions/ReportActionItemEmojiReactions.tsx b/src/components/Reactions/ReportActionItemEmojiReactions.tsx
index c6bf4f9e4016..943158607db4 100644
--- a/src/components/Reactions/ReportActionItemEmojiReactions.tsx
+++ b/src/components/Reactions/ReportActionItemEmojiReactions.tsx
@@ -33,7 +33,7 @@ type ReportActionItemEmojiReactionsProps = WithCurrentUserPersonalDetailsProps &
      * This can also be an emoji the user already reacted with,
      * hence this function asks to toggle the reaction by emoji.
      */
-    toggleReaction: (emoji: Emoji) => void;
+    toggleReaction: (emoji: Emoji, ignoreSkinToneOnCompare?: boolean) => void;
 
     /** We disable reacting with emojis on report actions that have errors */
     shouldBlockReactions?: boolean;
@@ -107,7 +107,7 @@ function ReportActionItemEmojiReactions({
             totalReactionCount += reactionCount;
 
             const onPress = () => {
-                toggleReaction(emoji);
+                toggleReaction(emoji, true);
             };
 
             const onReactionListOpen = (event: ReactionListEvent) => {
diff --git a/src/components/Reactions/getEmojiReactionBubbleTextOffsetStyle/index.ios.ts b/src/components/Reactions/getEmojiReactionBubbleTextOffsetStyle/index.ios.ts
deleted file mode 100644
index 9f7fb248a103..000000000000
--- a/src/components/Reactions/getEmojiReactionBubbleTextOffsetStyle/index.ios.ts
+++ /dev/null
@@ -1,6 +0,0 @@
-function getEmojiReactionBubbleTextOffsetStyle() {
-    // https://github.com/Expensify/App/issues/36739
-    return {transform: [{translateY: 2}]};
-}
-
-export default getEmojiReactionBubbleTextOffsetStyle;
diff --git a/src/components/Reactions/getEmojiReactionBubbleTextOffsetStyle/index.ts b/src/components/Reactions/getEmojiReactionBubbleTextOffsetStyle/index.ts
deleted file mode 100644
index 1e459554789c..000000000000
--- a/src/components/Reactions/getEmojiReactionBubbleTextOffsetStyle/index.ts
+++ /dev/null
@@ -1,5 +0,0 @@
-function getEmojiReactionBubbleTextOffsetStyle() {
-    return {transform: [{translateY: 0}]};
-}
-
-export default getEmojiReactionBubbleTextOffsetStyle;
diff --git a/src/components/ReceiptAudit.tsx b/src/components/ReceiptAudit.tsx
index ac1b36c6bf32..bb704def1836 100644
--- a/src/components/ReceiptAudit.tsx
+++ b/src/components/ReceiptAudit.tsx
@@ -7,17 +7,31 @@ import Icon from './Icon';
 import * as Expensicons from './Icon/Expensicons';
 import Text from './Text';
 
-function ReceiptAuditHeader({notes, shouldShowAuditMessage}: {notes: string[]; shouldShowAuditMessage: boolean}) {
+type ReceiptAuditProps = {
+    /** List of audit notes */
+    notes: string[];
+
+    /** Whether to show audit result or not (e.g.`Verified`, `Issue Found`) */
+    shouldShowAuditResult: boolean;
+};
+
+function ReceiptAudit({notes, shouldShowAuditResult}: ReceiptAuditProps) {
     const styles = useThemeStyles();
     const theme = useTheme();
     const {translate} = useLocalize();
 
-    const auditText = notes.length > 0 ? translate('iou.receiptIssuesFound', notes.length) : translate('common.verified');
+    let auditText = '';
+    if (notes.length > 0 && shouldShowAuditResult) {
+        auditText = translate('iou.receiptIssuesFound', notes.length);
+    } else if (!notes.length && shouldShowAuditResult) {
+        auditText = translate('common.verified');
+    }
+
     return (
         <View style={[styles.ph5, styles.mbn1]}>
             <View style={[styles.flexRow, styles.alignItemsCenter]}>
                 <Text style={[styles.textLabelSupporting]}>{translate('common.receipt')}</Text>
-                {shouldShowAuditMessage && (
+                {!!auditText && (
                     <>
                         <Text style={[styles.textLabelSupporting]}>{` • ${auditText}`}</Text>
                         <Icon
@@ -39,4 +53,5 @@ function ReceiptAuditMessages({notes = []}: {notes?: string[]}) {
     return <View style={[styles.mtn1, styles.mb2, styles.ph5, styles.gap1]}>{notes.length > 0 && notes.map((message) => <Text style={[styles.textLabelError]}>{message}</Text>)}</View>;
 }
 
-export {ReceiptAuditHeader, ReceiptAuditMessages};
+export {ReceiptAuditMessages};
+export default ReceiptAudit;
diff --git a/src/components/ReceiptImage.tsx b/src/components/ReceiptImage.tsx
index f113469b56f0..8c980838b841 100644
--- a/src/components/ReceiptImage.tsx
+++ b/src/components/ReceiptImage.tsx
@@ -73,6 +73,12 @@ type ReceiptImageProps = (
 
     /** The size of the fallback icon */
     fallbackIconSize?: number;
+
+    /** The color of the fallback icon */
+    fallbackIconColor?: string;
+
+    /** The background color of fallback icon */
+    fallbackIconBackground?: string;
 };
 
 function ReceiptImage({
@@ -89,6 +95,8 @@ function ReceiptImage({
     fallbackIcon,
     fallbackIconSize,
     shouldUseInitialObjectPosition = false,
+    fallbackIconColor,
+    fallbackIconBackground,
 }: ReceiptImageProps) {
     const styles = useThemeStyles();
 
@@ -106,7 +114,7 @@ function ReceiptImage({
         return (
             <View style={style ?? [styles.w100, styles.h100]}>
                 <EReceiptThumbnail
-                    transactionID={transactionID ?? ''}
+                    transactionID={transactionID ?? '-1'}
                     iconSize={iconSize}
                     // eslint-disable-next-line react/jsx-props-no-spreading
                     {...props}
@@ -124,6 +132,8 @@ function ReceiptImage({
                 shouldDynamicallyResize={false}
                 fallbackIcon={fallbackIcon}
                 fallbackIconSize={fallbackIconSize}
+                fallbackIconColor={fallbackIconColor}
+                fallbackIconBackground={fallbackIconBackground}
                 objectPosition={shouldUseInitialObjectPosition ? CONST.IMAGE_OBJECT_POSITION.INITIAL : CONST.IMAGE_OBJECT_POSITION.TOP}
             />
         );
diff --git a/src/components/ReferralProgramCTA.tsx b/src/components/ReferralProgramCTA.tsx
index 237fc8f955a3..808df9c4d94d 100644
--- a/src/components/ReferralProgramCTA.tsx
+++ b/src/components/ReferralProgramCTA.tsx
@@ -1,5 +1,5 @@
 import React, {useEffect} from 'react';
-import type {ViewStyle} from 'react-native';
+import type {StyleProp, ViewStyle} from 'react-native';
 import useDismissedReferralBanners from '@hooks/useDismissedReferralBanners';
 import useLocalize from '@hooks/useLocalize';
 import useTheme from '@hooks/useTheme';
@@ -19,7 +19,7 @@ type ReferralProgramCTAProps = {
         | typeof CONST.REFERRAL_PROGRAM.CONTENT_TYPES.START_CHAT
         | typeof CONST.REFERRAL_PROGRAM.CONTENT_TYPES.PAY_SOMEONE
         | typeof CONST.REFERRAL_PROGRAM.CONTENT_TYPES.REFER_FRIEND;
-    style?: ViewStyle;
+    style?: StyleProp<ViewStyle>;
     onDismiss?: () => void;
 };
 
@@ -54,7 +54,7 @@ function ReferralProgramCTA({referralContentType, style, onDismiss}: ReferralPro
             }}
             style={[styles.br2, styles.highlightBG, styles.flexRow, styles.justifyContentBetween, styles.alignItemsCenter, {gap: 10, padding: 10}, styles.pl5, style]}
             accessibilityLabel="referral"
-            role={CONST.ACCESSIBILITY_ROLE.BUTTON}
+            role={CONST.ROLE.BUTTON}
         >
             <Text>
                 {translate(`referralProgram.${referralContentType}.buttonText1`)}
@@ -72,7 +72,7 @@ function ReferralProgramCTA({referralContentType, style, onDismiss}: ReferralPro
                         e.preventDefault();
                     }}
                     style={[styles.touchableButtonImage]}
-                    role={CONST.ACCESSIBILITY_ROLE.BUTTON}
+                    role={CONST.ROLE.BUTTON}
                     accessibilityLabel={translate('common.close')}
                 >
                     <Icon
diff --git a/src/components/ReportActionItem/ChronosOOOListActions.tsx b/src/components/ReportActionItem/ChronosOOOListActions.tsx
index 52e0c52873d6..460104a71d68 100644
--- a/src/components/ReportActionItem/ChronosOOOListActions.tsx
+++ b/src/components/ReportActionItem/ChronosOOOListActions.tsx
@@ -6,16 +6,17 @@ import Text from '@components/Text';
 import useLocalize from '@hooks/useLocalize';
 import useThemeStyles from '@hooks/useThemeStyles';
 import DateUtils from '@libs/DateUtils';
+import * as ReportActionsUtils from '@libs/ReportActionsUtils';
 import * as Chronos from '@userActions/Chronos';
-import type {OriginalMessageChronosOOOList} from '@src/types/onyx/OriginalMessage';
-import type {ReportActionBase} from '@src/types/onyx/ReportAction';
+import type CONST from '@src/CONST';
+import type ReportAction from '@src/types/onyx/ReportAction';
 
 type ChronosOOOListActionsProps = {
     /** The ID of the report */
     reportID: string;
 
     /** All the data of the action */
-    action: ReportActionBase & OriginalMessageChronosOOOList;
+    action: ReportAction<typeof CONST.REPORT.ACTIONS.TYPE.CHRONOS_OOO_LIST>;
 };
 
 function ChronosOOOListActions({reportID, action}: ChronosOOOListActionsProps) {
@@ -23,7 +24,7 @@ function ChronosOOOListActions({reportID, action}: ChronosOOOListActionsProps) {
 
     const {translate, preferredLocale} = useLocalize();
 
-    const events = action.originalMessage?.events ?? [];
+    const events = ReportActionsUtils.getOriginalMessage(action)?.events ?? [];
 
     if (!events.length) {
         return (
diff --git a/src/components/ReportActionItem/ExportIntegration.tsx b/src/components/ReportActionItem/ExportIntegration.tsx
new file mode 100644
index 000000000000..78e6170d3dd7
--- /dev/null
+++ b/src/components/ReportActionItem/ExportIntegration.tsx
@@ -0,0 +1,48 @@
+/* eslint-disable react/no-array-index-key */
+import React from 'react';
+import {View} from 'react-native';
+import type {OnyxEntry} from 'react-native-onyx';
+import Text from '@components/Text';
+import TextLink from '@components/TextLink';
+import useThemeStyles from '@hooks/useThemeStyles';
+import * as ReportActionUtils from '@libs/ReportActionsUtils';
+import type {ReportAction} from '@src/types/onyx';
+
+type ExportIntegrationProps = {
+    action: OnyxEntry<ReportAction>;
+};
+
+function ExportIntegration({action}: ExportIntegrationProps) {
+    const styles = useThemeStyles();
+    const fragments = ReportActionUtils.getExportIntegrationActionFragments(action);
+
+    return (
+        <View style={[styles.flex1, styles.flexRow, styles.alignItemsCenter, styles.flexWrap]}>
+            {fragments.map((fragment, index) => {
+                if (!fragment.url) {
+                    return (
+                        <Text
+                            key={index}
+                            style={[styles.chatItemMessage, styles.colorMuted]}
+                        >
+                            {fragment.text}{' '}
+                        </Text>
+                    );
+                }
+
+                return (
+                    <TextLink
+                        key={index}
+                        href={fragment.url}
+                    >
+                        {fragment.text}{' '}
+                    </TextLink>
+                );
+            })}
+        </View>
+    );
+}
+
+ExportIntegration.displayName = 'ExportIntegration';
+
+export default ExportIntegration;
diff --git a/src/components/ReportActionItem/ExportWithDropdownMenu.tsx b/src/components/ReportActionItem/ExportWithDropdownMenu.tsx
new file mode 100644
index 000000000000..6d73035fd8bb
--- /dev/null
+++ b/src/components/ReportActionItem/ExportWithDropdownMenu.tsx
@@ -0,0 +1,138 @@
+import React, {useCallback, useMemo, useState} from 'react';
+import {useOnyx} from 'react-native-onyx';
+import type {OnyxEntry} from 'react-native-onyx';
+import ButtonWithDropdownMenu from '@components/ButtonWithDropdownMenu';
+import type {DropdownOption, ReportExportType} from '@components/ButtonWithDropdownMenu/types';
+import ConfirmModal from '@components/ConfirmModal';
+import useLocalize from '@hooks/useLocalize';
+import useResponsiveLayout from '@hooks/useResponsiveLayout';
+import useThemeStyles from '@hooks/useThemeStyles';
+import * as PolicyActions from '@libs/actions/Policy/Policy';
+import * as ReportActions from '@libs/actions/Report';
+import * as PolicyUtils from '@libs/PolicyUtils';
+import * as ReportUtils from '@libs/ReportUtils';
+import type {ExportType} from '@pages/home/report/ReportDetailsExportPage';
+import CONST from '@src/CONST';
+import ONYXKEYS from '@src/ONYXKEYS';
+import type {Policy, Report} from '@src/types/onyx';
+import type {ConnectionName} from '@src/types/onyx/Policy';
+import type AnchorAlignment from '@src/types/utils/AnchorAlignment';
+
+type ExportWithDropdownMenuProps = {
+    policy: OnyxEntry<Policy>;
+
+    report: OnyxEntry<Report>;
+
+    connectionName: ConnectionName;
+
+    dropdownAnchorAlignment?: AnchorAlignment;
+};
+
+function ExportWithDropdownMenu({
+    policy,
+    report,
+    connectionName,
+    dropdownAnchorAlignment = {
+        horizontal: CONST.MODAL.ANCHOR_ORIGIN_HORIZONTAL.RIGHT,
+        vertical: CONST.MODAL.ANCHOR_ORIGIN_VERTICAL.TOP,
+    },
+}: ExportWithDropdownMenuProps) {
+    const reportID = report?.reportID;
+    const styles = useThemeStyles();
+    const {translate} = useLocalize();
+    const {isSmallScreenWidth} = useResponsiveLayout();
+    const [modalStatus, setModalStatus] = useState<ExportType | null>(null);
+    const [exportMethods] = useOnyx(ONYXKEYS.LAST_EXPORT_METHOD);
+    const [reportActions] = useOnyx(`${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${reportID}`);
+
+    const iconToDisplay = ReportUtils.getIntegrationIcon(connectionName);
+    const canBeExported = ReportUtils.canBeExported(report);
+    const isExported = ReportUtils.isExported(reportActions);
+    const hasIntegrationAutoSync = PolicyUtils.hasIntegrationAutoSync(policy, connectionName);
+
+    const dropdownOptions: Array<DropdownOption<ReportExportType>> = useMemo(() => {
+        const optionTemplate = {
+            icon: iconToDisplay,
+            disabled: !canBeExported,
+            displayInDefaultIconColor: true,
+        };
+        const options = [
+            {
+                value: CONST.REPORT.EXPORT_OPTIONS.EXPORT_TO_INTEGRATION,
+                text: translate('workspace.common.exportIntegrationSelected', connectionName),
+                ...optionTemplate,
+            },
+            {
+                value: CONST.REPORT.EXPORT_OPTIONS.MARK_AS_EXPORTED,
+                text: translate('workspace.common.markAsExported'),
+                ...optionTemplate,
+            },
+        ];
+        const exportMethod = exportMethods?.[report?.policyID ?? ''] ?? null;
+        if (exportMethod) {
+            options.sort((method) => (method.value === exportMethod ? -1 : 0));
+        }
+        return options;
+        // We do not include exportMethods not to re-render the component when the preffered export method changes
+        // eslint-disable-next-line react-compiler/react-compiler, react-hooks/exhaustive-deps
+    }, [canBeExported, iconToDisplay, connectionName, report?.policyID, translate]);
+
+    const confirmExport = useCallback(() => {
+        setModalStatus(null);
+        if (!reportID) {
+            return;
+        }
+        if (modalStatus === CONST.REPORT.EXPORT_OPTIONS.EXPORT_TO_INTEGRATION) {
+            ReportActions.exportToIntegration(reportID, connectionName);
+        } else if (modalStatus === CONST.REPORT.EXPORT_OPTIONS.MARK_AS_EXPORTED) {
+            ReportActions.markAsManuallyExported(reportID, connectionName);
+        }
+    }, [connectionName, modalStatus, reportID]);
+
+    const savePreferredExportMethod = (value: ReportExportType) => {
+        if (!report?.policyID) {
+            return;
+        }
+        PolicyActions.savePreferredExportMethod(report?.policyID, value);
+    };
+
+    return (
+        <>
+            <ButtonWithDropdownMenu<ReportExportType>
+                success={!hasIntegrationAutoSync}
+                pressOnEnter
+                shouldAlwaysShowDropdownMenu
+                anchorAlignment={dropdownAnchorAlignment}
+                onPress={(_, value) => {
+                    if (isExported) {
+                        setModalStatus(value);
+                        return;
+                    }
+                    if (!reportID) {
+                        return;
+                    }
+                    if (value === CONST.REPORT.EXPORT_OPTIONS.EXPORT_TO_INTEGRATION) {
+                        ReportActions.exportToIntegration(reportID, connectionName);
+                    } else if (value === CONST.REPORT.EXPORT_OPTIONS.MARK_AS_EXPORTED) {
+                        ReportActions.markAsManuallyExported(reportID, connectionName);
+                    }
+                }}
+                onOptionSelected={({value}) => savePreferredExportMethod(value)}
+                options={dropdownOptions}
+                style={[isSmallScreenWidth && styles.flexGrow1]}
+                buttonSize={CONST.DROPDOWN_BUTTON_SIZE.MEDIUM}
+            />
+            <ConfirmModal
+                title={translate('workspace.exportAgainModal.title')}
+                onConfirm={confirmExport}
+                onCancel={() => setModalStatus(null)}
+                prompt={translate('workspace.exportAgainModal.description', report?.reportName ?? '', connectionName)}
+                confirmText={translate('workspace.exportAgainModal.confirmText')}
+                cancelText={translate('workspace.exportAgainModal.cancelText')}
+                isVisible={!!modalStatus}
+            />
+        </>
+    );
+}
+
+export default ExportWithDropdownMenu;
diff --git a/src/components/ReportActionItem/IssueCardMessage.tsx b/src/components/ReportActionItem/IssueCardMessage.tsx
new file mode 100644
index 000000000000..292b010cd851
--- /dev/null
+++ b/src/components/ReportActionItem/IssueCardMessage.tsx
@@ -0,0 +1,66 @@
+import React from 'react';
+import type {OnyxEntry} from 'react-native-onyx';
+import {useOnyx} from 'react-native-onyx';
+import Button from '@components/Button';
+import RenderHTML from '@components/RenderHTML';
+import useCurrentUserPersonalDetails from '@hooks/useCurrentUserPersonalDetails';
+import useEnvironment from '@hooks/useEnvironment';
+import useLocalize from '@hooks/useLocalize';
+import useThemeStyles from '@hooks/useThemeStyles';
+import Navigation from '@libs/Navigation/Navigation';
+import CONST from '@src/CONST';
+import ONYXKEYS from '@src/ONYXKEYS';
+import ROUTES from '@src/ROUTES';
+import type {ReportAction} from '@src/types/onyx';
+import {isEmptyObject} from '@src/types/utils/EmptyObject';
+
+type IssueCardMessageProps = {
+    action: OnyxEntry<ReportAction>;
+};
+
+function IssueCardMessage({action}: IssueCardMessageProps) {
+    const {translate} = useLocalize();
+    const styles = useThemeStyles();
+    const {environmentURL} = useEnvironment();
+    // TODO: now mocking accountID with current user accountID instead of action.message.assigneeAccountID
+    const personalData = useCurrentUserPersonalDetails();
+    const [privatePersonalDetails] = useOnyx(ONYXKEYS.PRIVATE_PERSONAL_DETAILS);
+
+    // TODO: now mocking accountID with current user accountID instead of action.message.assigneeAccountID
+    const assignee = `<mention-user accountID=${personalData.accountID}></mention-user>`;
+    const link = `<a href='${environmentURL}/${ROUTES.SETTINGS_WALLET}'>${translate('cardPage.expensifyCard')}</a>`;
+
+    const noMailingAddress = action?.actionName === CONST.REPORT.ACTIONS.TYPE.CARD_MISSING_ADDRESS && isEmptyObject(privatePersonalDetails?.address);
+
+    const getTranslation = () => {
+        switch (action?.actionName) {
+            case CONST.REPORT.ACTIONS.TYPE.CARD_ISSUED:
+                return translate('workspace.expensifyCard.issuedCard', assignee);
+            case CONST.REPORT.ACTIONS.TYPE.CARD_ISSUED_VIRTUAL:
+                return translate('workspace.expensifyCard.issuedCardVirtual', {assignee, link});
+            case CONST.REPORT.ACTIONS.TYPE.CARD_MISSING_ADDRESS:
+                return translate(`workspace.expensifyCard.${noMailingAddress ? 'issuedCardNoMailingAddress' : 'addedAddress'}`, assignee);
+            default:
+                return '';
+        }
+    };
+
+    return (
+        <>
+            <RenderHTML html={`<muted-text>${getTranslation()}</muted-text>`} />
+            {noMailingAddress && (
+                <Button
+                    onPress={() => Navigation.navigate(ROUTES.SETTINGS_ADDRESS)}
+                    success
+                    medium
+                    style={[styles.alignSelfStart, styles.mt3]}
+                    text={translate('workspace.expensifyCard.addMailingAddress')}
+                />
+            )}
+        </>
+    );
+}
+
+IssueCardMessage.displayName = 'IssueCardMessage';
+
+export default IssueCardMessage;
diff --git a/src/components/ReportActionItem/MoneyReportView.tsx b/src/components/ReportActionItem/MoneyReportView.tsx
index 139b5fde58b2..9b3b02a1abac 100644
--- a/src/components/ReportActionItem/MoneyReportView.tsx
+++ b/src/components/ReportActionItem/MoneyReportView.tsx
@@ -1,24 +1,27 @@
-import Str from 'expensify-common/lib/str';
+import {Str} from 'expensify-common';
 import React, {useMemo} from 'react';
 import type {StyleProp, TextStyle} from 'react-native';
 import {View} from 'react-native';
+import {useOnyx} from 'react-native-onyx';
 import type {OnyxEntry} from 'react-native-onyx';
 import Icon from '@components/Icon';
 import * as Expensicons from '@components/Icon/Expensicons';
 import MenuItemWithTopDescription from '@components/MenuItemWithTopDescription';
 import OfflineWithFeedback from '@components/OfflineWithFeedback';
+import SpacerView from '@components/SpacerView';
 import Text from '@components/Text';
+import UnreadActionIndicator from '@components/UnreadActionIndicator';
 import useLocalize from '@hooks/useLocalize';
 import useStyleUtils from '@hooks/useStyleUtils';
 import useTheme from '@hooks/useTheme';
 import useThemeStyles from '@hooks/useThemeStyles';
-import useWindowDimensions from '@hooks/useWindowDimensions';
 import * as CurrencyUtils from '@libs/CurrencyUtils';
 import Navigation from '@libs/Navigation/Navigation';
 import * as ReportUtils from '@libs/ReportUtils';
 import AnimatedEmptyStateBackground from '@pages/home/report/AnimatedEmptyStateBackground';
 import variables from '@styles/variables';
 import * as reportActions from '@src/libs/actions/Report';
+import ONYXKEYS from '@src/ONYXKEYS';
 import ROUTES from '@src/ROUTES';
 import type {Policy, PolicyReportField, Report} from '@src/types/onyx';
 
@@ -28,24 +31,32 @@ type MoneyReportViewProps = {
 
     /** Policy that the report belongs to */
     policy: OnyxEntry<Policy>;
+
+    /** Indicates whether the iou report is a combine report */
+    isCombinedReport?: boolean;
+
+    /** Indicates whether the total should be shown */
+    shouldShowTotal?: boolean;
+
+    /** Flag to show, hide the thread divider line */
+    shouldHideThreadDividerLine: boolean;
 };
 
-function MoneyReportView({report, policy}: MoneyReportViewProps) {
+function MoneyReportView({report, policy, isCombinedReport = false, shouldShowTotal = true, shouldHideThreadDividerLine}: MoneyReportViewProps) {
     const theme = useTheme();
     const styles = useThemeStyles();
     const StyleUtils = useStyleUtils();
     const {translate} = useLocalize();
-    const {isSmallScreenWidth} = useWindowDimensions();
     const isSettled = ReportUtils.isSettled(report.reportID);
     const isTotalUpdated = ReportUtils.hasUpdatedTotal(report, policy);
 
     const {totalDisplaySpend, nonReimbursableSpend, reimbursableSpend} = ReportUtils.getMoneyRequestSpendBreakdown(report);
 
-    const shouldShowBreakdown = nonReimbursableSpend && reimbursableSpend;
+    const shouldShowBreakdown = nonReimbursableSpend && reimbursableSpend && shouldShowTotal;
     const formattedTotalAmount = CurrencyUtils.convertToDisplayString(totalDisplaySpend, report.currency);
     const formattedOutOfPocketAmount = CurrencyUtils.convertToDisplayString(reimbursableSpend, report.currency);
     const formattedCompanySpendAmount = CurrencyUtils.convertToDisplayString(nonReimbursableSpend, report.currency);
-    const isPartiallyPaid = Boolean(report?.pendingFields?.partial);
+    const isPartiallyPaid = !!report?.pendingFields?.partial;
 
     const subAmountTextStyles: StyleProp<TextStyle> = [
         styles.taskTitleMenuItem,
@@ -54,36 +65,67 @@ function MoneyReportView({report, policy}: MoneyReportViewProps) {
         StyleUtils.getColorStyle(theme.textSupporting),
     ];
 
+    const [violations] = useOnyx(`${ONYXKEYS.COLLECTION.REPORT_VIOLATIONS}${report.reportID}`);
+
     const sortedPolicyReportFields = useMemo<PolicyReportField[]>((): PolicyReportField[] => {
         const fields = ReportUtils.getAvailableReportFields(report, Object.values(policy?.fieldList ?? {}));
-        return fields.sort(({orderWeight: firstOrderWeight}, {orderWeight: secondOrderWeight}) => firstOrderWeight - secondOrderWeight);
+        return fields.filter((field) => field.target === report.type).sort(({orderWeight: firstOrderWeight}, {orderWeight: secondOrderWeight}) => firstOrderWeight - secondOrderWeight);
     }, [policy, report]);
 
+    const enabledReportFields = sortedPolicyReportFields.filter((reportField) => !ReportUtils.isReportFieldDisabled(report, reportField, policy));
+    const isOnlyTitleFieldEnabled = enabledReportFields.length === 1 && ReportUtils.isReportFieldOfTypeTitle(enabledReportFields[0]);
+    const shouldShowReportField =
+        !ReportUtils.isClosedExpenseReportWithNoExpenses(report) && ReportUtils.isPaidGroupPolicyExpenseReport(report) && (!isCombinedReport || !isOnlyTitleFieldEnabled);
+
+    const renderThreadDivider = useMemo(
+        () =>
+            shouldHideThreadDividerLine && !isCombinedReport ? (
+                <UnreadActionIndicator
+                    reportActionID={report.reportID}
+                    shouldHideThreadDividerLine={shouldHideThreadDividerLine}
+                />
+            ) : (
+                <SpacerView
+                    shouldShow={!shouldHideThreadDividerLine}
+                    style={[!shouldHideThreadDividerLine ? styles.reportHorizontalRule : {}]}
+                />
+            ),
+        [shouldHideThreadDividerLine, report.reportID, styles.reportHorizontalRule, isCombinedReport],
+    );
+
     return (
-        <View style={[StyleUtils.getReportWelcomeContainerStyle(isSmallScreenWidth, true), styles.overflowHidden]}>
-            <AnimatedEmptyStateBackground />
-            <View style={[StyleUtils.getReportWelcomeTopMarginStyle(isSmallScreenWidth, true)]}>
+        <>
+            <View style={[styles.pRelative]}>
+                <AnimatedEmptyStateBackground />
                 {!ReportUtils.isClosedExpenseReportWithNoExpenses(report) && (
                     <>
-                        {ReportUtils.reportFieldsEnabled(report) &&
+                        {ReportUtils.isPaidGroupPolicyExpenseReport(report) &&
+                            policy?.areReportFieldsEnabled &&
+                            (!isCombinedReport || !isOnlyTitleFieldEnabled) &&
                             sortedPolicyReportFields.map((reportField) => {
-                                const isTitleField = ReportUtils.isReportFieldOfTypeTitle(reportField);
-                                const fieldValue = isTitleField ? report.reportName : reportField.value ?? reportField.defaultValue;
+                                if (ReportUtils.isReportFieldOfTypeTitle(reportField)) {
+                                    return null;
+                                }
+
+                                const fieldValue = reportField.value ?? reportField.defaultValue;
                                 const isFieldDisabled = ReportUtils.isReportFieldDisabled(report, reportField, policy);
                                 const fieldKey = ReportUtils.getReportFieldKey(reportField.fieldID);
 
+                                const violation = ReportUtils.getFieldViolation(violations, reportField);
+                                const violationTranslation = ReportUtils.getFieldViolationTranslation(reportField, violation);
+
                                 return (
                                     <OfflineWithFeedback
                                         pendingAction={report.pendingFields?.[fieldKey]}
                                         errors={report.errorFields?.[fieldKey]}
                                         errorRowStyles={styles.ph5}
                                         key={`menuItem-${fieldKey}`}
-                                        onClose={() => reportActions.clearReportFieldErrors(report.reportID, reportField)}
+                                        onClose={() => reportActions.clearReportFieldKeyErrors(report.reportID, fieldKey)}
                                     >
                                         <MenuItemWithTopDescription
                                             description={Str.UCFirst(reportField.name)}
                                             title={fieldValue}
-                                            onPress={() => Navigation.navigate(ROUTES.EDIT_REPORT_FIELD_REQUEST.getRoute(report.reportID, report.policyID ?? '', reportField.fieldID))}
+                                            onPress={() => Navigation.navigate(ROUTES.EDIT_REPORT_FIELD_REQUEST.getRoute(report.reportID, report.policyID ?? '-1', reportField.fieldID))}
                                             shouldShowRightIcon
                                             disabled={isFieldDisabled}
                                             wrapperStyle={[styles.pv2, styles.taskDescriptionMenuItem]}
@@ -94,37 +136,42 @@ function MoneyReportView({report, policy}: MoneyReportViewProps) {
                                             onSecondaryInteraction={() => {}}
                                             hoverAndPressStyle={false}
                                             titleWithTooltips={[]}
+                                            brickRoadIndicator={violation ? 'error' : undefined}
+                                            errorText={violationTranslation}
                                         />
                                     </OfflineWithFeedback>
                                 );
                             })}
-                        <View style={[styles.flexRow, styles.pointerEventsNone, styles.containerWithSpaceBetween, styles.ph5, styles.pv2]}>
-                            <View style={[styles.flex1, styles.justifyContentCenter]}>
-                                <Text
-                                    style={[styles.textLabelSupporting]}
-                                    numberOfLines={1}
-                                >
-                                    {translate('common.total')}
-                                </Text>
-                            </View>
-                            <View style={[styles.flexRow, styles.justifyContentCenter]}>
-                                {isSettled && !isPartiallyPaid && (
-                                    <View style={[styles.defaultCheckmarkWrapper, styles.mh2]}>
-                                        <Icon
-                                            src={Expensicons.Checkmark}
-                                            fill={theme.success}
-                                        />
-                                    </View>
-                                )}
-                                <Text
-                                    numberOfLines={1}
-                                    style={[styles.taskTitleMenuItem, styles.alignSelfCenter, !isTotalUpdated && styles.offlineFeedback.pending]}
-                                >
-                                    {formattedTotalAmount}
-                                </Text>
+                        {shouldShowTotal && (
+                            <View style={[styles.flexRow, styles.pointerEventsNone, styles.containerWithSpaceBetween, styles.ph5, styles.pv2]}>
+                                <View style={[styles.flex1, styles.justifyContentCenter]}>
+                                    <Text
+                                        style={[styles.textLabelSupporting]}
+                                        numberOfLines={1}
+                                    >
+                                        {translate('common.total')}
+                                    </Text>
+                                </View>
+                                <View style={[styles.flexRow, styles.justifyContentCenter]}>
+                                    {isSettled && !isPartiallyPaid && (
+                                        <View style={[styles.defaultCheckmarkWrapper, styles.mh2]}>
+                                            <Icon
+                                                src={Expensicons.Checkmark}
+                                                fill={theme.success}
+                                            />
+                                        </View>
+                                    )}
+                                    <Text
+                                        numberOfLines={1}
+                                        style={[styles.taskTitleMenuItem, styles.alignSelfCenter, !isTotalUpdated && styles.offlineFeedback.pending]}
+                                    >
+                                        {formattedTotalAmount}
+                                    </Text>
+                                </View>
                             </View>
-                        </View>
-                        {Boolean(shouldShowBreakdown) && (
+                        )}
+
+                        {!!shouldShowBreakdown && (
                             <>
                                 <View style={[styles.flexRow, styles.pointerEventsNone, styles.containerWithSpaceBetween, styles.ph5, styles.pv1]}>
                                     <View style={[styles.flex1, styles.justifyContentCenter]}>
@@ -167,7 +214,8 @@ function MoneyReportView({report, policy}: MoneyReportViewProps) {
                     </>
                 )}
             </View>
-        </View>
+            {(shouldShowReportField || shouldShowBreakdown || shouldShowTotal) && renderThreadDivider}
+        </>
     );
 }
 
diff --git a/src/components/ReportActionItem/MoneyRequestAction.tsx b/src/components/ReportActionItem/MoneyRequestAction.tsx
index 4f91b2084b45..15f9cee3705c 100644
--- a/src/components/ReportActionItem/MoneyRequestAction.tsx
+++ b/src/components/ReportActionItem/MoneyRequestAction.tsx
@@ -10,7 +10,6 @@ import * as IOUUtils from '@libs/IOUUtils';
 import Navigation from '@libs/Navigation/Navigation';
 import * as ReportActionsUtils from '@libs/ReportActionsUtils';
 import type {ContextMenuAnchor} from '@pages/home/report/ContextMenu/ReportActionContextMenu';
-import * as Report from '@userActions/Report';
 import CONST from '@src/CONST';
 import type {TranslationPaths} from '@src/languages/types';
 import ONYXKEYS from '@src/ONYXKEYS';
@@ -60,6 +59,9 @@ type MoneyRequestActionProps = MoneyRequestActionOnyxProps & {
 
     /** Styles to be assigned to Container */
     style?: StyleProp<ViewStyle>;
+
+    /** Whether  context menu should be shown on press */
+    shouldDisplayContextMenu?: boolean;
 };
 
 function MoneyRequestAction({
@@ -76,23 +78,22 @@ function MoneyRequestAction({
     isHovered = false,
     style,
     isWhisper = false,
+    shouldDisplayContextMenu = true,
 }: MoneyRequestActionProps) {
     const styles = useThemeStyles();
     const {translate} = useLocalize();
     const {isOffline} = useNetwork();
-
     const isSplitBillAction = ReportActionsUtils.isSplitBillAction(action);
     const isTrackExpenseAction = ReportActionsUtils.isTrackExpenseAction(action);
 
     const onMoneyRequestPreviewPressed = () => {
         if (isSplitBillAction) {
-            const reportActionID = action.reportActionID ?? '0';
+            const reportActionID = action.reportActionID ?? '-1';
             Navigation.navigate(ROUTES.SPLIT_BILL_DETAILS.getRoute(chatReportID, reportActionID));
             return;
         }
 
-        const childReportID = action?.childReportID ?? '0';
-        Report.openReport(childReportID);
+        const childReportID = action?.childReportID ?? '-1';
         Navigation.navigate(ROUTES.REPORT_WITH_ID.getRoute(childReportID));
     };
 
@@ -134,6 +135,7 @@ function MoneyRequestAction({
             containerStyles={[styles.cursorPointer, isHovered ? styles.reportPreviewBoxHoverBorder : undefined, style]}
             isHovered={isHovered}
             isWhisper={isWhisper}
+            shouldDisplayContextMenu={shouldDisplayContextMenu}
         />
     );
 }
diff --git a/src/components/ReportActionItem/MoneyRequestPreview/MoneyRequestPreviewContent.tsx b/src/components/ReportActionItem/MoneyRequestPreview/MoneyRequestPreviewContent.tsx
index 7d71560d464c..ac61cb74d229 100644
--- a/src/components/ReportActionItem/MoneyRequestPreview/MoneyRequestPreviewContent.tsx
+++ b/src/components/ReportActionItem/MoneyRequestPreview/MoneyRequestPreviewContent.tsx
@@ -1,11 +1,16 @@
-import {truncate} from 'lodash';
+import type {RouteProp} from '@react-navigation/native';
+import {useRoute} from '@react-navigation/native';
 import lodashSortBy from 'lodash/sortBy';
-import React from 'react';
+import truncate from 'lodash/truncate';
+import React, {useMemo} from 'react';
 import {View} from 'react-native';
 import type {GestureResponderEvent} from 'react-native';
-import ConfirmedRoute from '@components/ConfirmedRoute';
+import {useOnyx} from 'react-native-onyx';
+import type {OnyxEntry} from 'react-native-onyx';
+import Button from '@components/Button';
 import Icon from '@components/Icon';
 import * as Expensicons from '@components/Icon/Expensicons';
+import {ReceiptScan} from '@components/Icon/Expensicons';
 import MoneyRequestSkeletonView from '@components/MoneyRequestSkeletonView';
 import MultipleAvatars from '@components/MultipleAvatars';
 import OfflineWithFeedback from '@components/OfflineWithFeedback';
@@ -14,6 +19,7 @@ import ReportActionItemImages from '@components/ReportActionItem/ReportActionIte
 import {showContextMenuForReport} from '@components/ShowContextMenuContext';
 import Text from '@components/Text';
 import useLocalize from '@hooks/useLocalize';
+import useResponsiveLayout from '@hooks/useResponsiveLayout';
 import useStyleUtils from '@hooks/useStyleUtils';
 import useTheme from '@hooks/useTheme';
 import useThemeStyles from '@hooks/useThemeStyles';
@@ -22,19 +28,27 @@ import ControlSelection from '@libs/ControlSelection';
 import * as CurrencyUtils from '@libs/CurrencyUtils';
 import * as DeviceCapabilities from '@libs/DeviceCapabilities';
 import * as IOUUtils from '@libs/IOUUtils';
+import Navigation from '@libs/Navigation/Navigation';
+import type {TransactionDuplicateNavigatorParamList} from '@libs/Navigation/types';
 import * as OptionsListUtils from '@libs/OptionsListUtils';
 import * as ReceiptUtils from '@libs/ReceiptUtils';
 import * as ReportActionsUtils from '@libs/ReportActionsUtils';
 import * as ReportUtils from '@libs/ReportUtils';
+import type {TransactionDetails} from '@libs/ReportUtils';
+import StringUtils from '@libs/StringUtils';
 import * as TransactionUtils from '@libs/TransactionUtils';
 import ViolationsUtils from '@libs/Violations/ViolationsUtils';
+import variables from '@styles/variables';
 import * as PaymentMethods from '@userActions/PaymentMethods';
 import * as Report from '@userActions/Report';
+import * as Transaction from '@userActions/Transaction';
 import CONST from '@src/CONST';
-import type {IOUMessage} from '@src/types/onyx/OriginalMessage';
-import type {EmptyObject} from '@src/types/utils/EmptyObject';
+import ONYXKEYS from '@src/ONYXKEYS';
+import ROUTES from '@src/ROUTES';
+import SCREENS from '@src/SCREENS';
+import type {OriginalMessageIOU} from '@src/types/onyx/OriginalMessage';
 import {isEmptyObject} from '@src/types/utils/EmptyObject';
-import type {MoneyRequestPreviewProps} from './types';
+import type {MoneyRequestPreviewProps, PendingMessageProps} from './types';
 
 function MoneyRequestPreviewContent({
     iouReport,
@@ -55,19 +69,23 @@ function MoneyRequestPreviewContent({
     isHovered = false,
     isWhisper = false,
     transactionViolations,
+    shouldDisplayContextMenu = true,
 }: MoneyRequestPreviewProps) {
     const theme = useTheme();
     const styles = useThemeStyles();
     const StyleUtils = useStyleUtils();
     const {translate} = useLocalize();
-    const {isSmallScreenWidth, windowWidth} = useWindowDimensions();
+    const {windowWidth} = useWindowDimensions();
+    const route = useRoute<RouteProp<TransactionDuplicateNavigatorParamList, typeof SCREENS.TRANSACTION_DUPLICATE.REVIEW>>();
+    const {shouldUseNarrowLayout} = useResponsiveLayout();
 
     const sessionAccountID = session?.accountID;
     const managerID = iouReport?.managerID ?? -1;
     const ownerAccountID = iouReport?.ownerAccountID ?? -1;
     const isPolicyExpenseChat = ReportUtils.isPolicyExpenseChat(chatReport);
 
-    const participantAccountIDs = action.actionName === CONST.REPORT.ACTIONS.TYPE.IOU && isBillSplit ? action.originalMessage.participantAccountIDs ?? [] : [managerID, ownerAccountID];
+    const participantAccountIDs =
+        ReportActionsUtils.isMoneyRequestAction(action) && isBillSplit ? ReportActionsUtils.getOriginalMessage(action)?.participantAccountIDs ?? [] : [managerID, ownerAccountID];
     const participantAvatars = OptionsListUtils.getAvatarsForAccountIDs(participantAccountIDs, personalDetails ?? {});
     const sortedParticipantAvatars = lodashSortBy(participantAvatars, (avatar) => avatar.id);
     if (isPolicyExpenseChat && isBillSplit) {
@@ -77,25 +95,52 @@ function MoneyRequestPreviewContent({
     // Pay button should only be visible to the manager of the report.
     const isCurrentUserManager = managerID === sessionAccountID;
 
-    const {amount: requestAmount, currency: requestCurrency, comment: requestComment, merchant} = ReportUtils.getTransactionDetails(transaction) ?? {};
-    const description = truncate(requestComment, {length: CONST.REQUEST_PREVIEW.MAX_LENGTH});
+    const {
+        amount: requestAmount,
+        currency: requestCurrency,
+        comment: requestComment,
+        merchant,
+    } = useMemo<Partial<TransactionDetails>>(() => ReportUtils.getTransactionDetails(transaction) ?? {}, [transaction]);
+
+    const description = truncate(StringUtils.lineBreaksToSpaces(requestComment), {length: CONST.REQUEST_PREVIEW.MAX_LENGTH});
     const requestMerchant = truncate(merchant, {length: CONST.REQUEST_PREVIEW.MAX_LENGTH});
     const hasReceipt = TransactionUtils.hasReceipt(transaction);
     const isScanning = hasReceipt && TransactionUtils.isReceiptBeingScanned(transaction);
     const isOnHold = TransactionUtils.isOnHold(transaction);
-    const isSettlementOrApprovalPartial = Boolean(iouReport?.pendingFields?.partial);
+    const isSettlementOrApprovalPartial = !!iouReport?.pendingFields?.partial;
     const isPartialHold = isSettlementOrApprovalPartial && isOnHold;
-    const hasViolations = TransactionUtils.hasViolation(transaction?.transactionID ?? '', transactionViolations);
-    const hasNoticeTypeViolations = TransactionUtils.hasNoticeTypeViolation(transaction?.transactionID ?? '', transactionViolations);
+    const hasViolations = TransactionUtils.hasViolation(transaction?.transactionID ?? '-1', transactionViolations);
+    const hasNoticeTypeViolations = TransactionUtils.hasNoticeTypeViolation(transaction?.transactionID ?? '-1', transactionViolations) && ReportUtils.isPaidGroupPolicy(iouReport);
     const hasFieldErrors = TransactionUtils.hasMissingSmartscanFields(transaction);
     const isDistanceRequest = TransactionUtils.isDistanceRequest(transaction);
     const isFetchingWaypointsFromServer = TransactionUtils.isFetchingWaypointsFromServer(transaction);
     const isCardTransaction = TransactionUtils.isCardTransaction(transaction);
     const isSettled = ReportUtils.isSettled(iouReport?.reportID);
     const isDeleted = action?.pendingAction === CONST.RED_BRICK_ROAD_PENDING_ACTION.DELETE;
+    const isReviewDuplicateTransactionPage = route.name === SCREENS.TRANSACTION_DUPLICATE.REVIEW;
+
     const isFullySettled = isSettled && !isSettlementOrApprovalPartial;
     const isFullyApproved = ReportUtils.isReportApproved(iouReport) && !isSettlementOrApprovalPartial;
-    const shouldShowRBR = hasNoticeTypeViolations || hasViolations || hasFieldErrors || (!isFullySettled && !isFullyApproved && isOnHold);
+
+    // Get transaction violations for given transaction id from onyx, find duplicated transactions violations and get duplicates
+    const duplicates = useMemo(
+        () =>
+            transactionViolations?.[`${ONYXKEYS.COLLECTION.TRANSACTION_VIOLATIONS}${transaction?.transactionID}`]?.find(
+                (violation) => violation.name === CONST.VIOLATIONS.DUPLICATED_TRANSACTION,
+            )?.data?.duplicates ?? [],
+        [transaction?.transactionID, transactionViolations],
+    );
+
+    const hasDuplicates = duplicates.length > 0;
+
+    const shouldShowRBR = hasNoticeTypeViolations || hasViolations || hasFieldErrors || (!isFullySettled && !isFullyApproved && isOnHold) || hasDuplicates;
+    const showCashOrCard = isCardTransaction ? translate('iou.card') : translate('iou.cash');
+    // We don't use isOnHold because it's true for duplicated transaction too and we only want to show hold message if the transaction is truly on hold
+    const shouldShowHoldMessage = !(isSettled && !isSettlementOrApprovalPartial) && !!transaction?.comment?.hold;
+
+    const [report] = useOnyx(`${ONYXKEYS.COLLECTION.REPORT}${route.params?.threadReportID}`);
+    const parentReportAction = ReportActionsUtils.getReportAction(report?.parentReportID ?? '', report?.parentReportActionID ?? '');
+    const reviewingTransactionID = ReportActionsUtils.isMoneyRequestAction(parentReportAction) ? ReportActionsUtils.getOriginalMessage(parentReportAction)?.IOUTransactionID ?? '-1' : '-1';
 
     /*
      Show the merchant for IOUs and expenses only if:
@@ -115,10 +160,7 @@ function MoneyRequestPreviewContent({
         merchantOrDescription = description || '';
     }
 
-    const receiptImages = hasReceipt ? [ReceiptUtils.getThumbnailAndImageURIs(transaction)] : [];
-
-    const hasPendingWaypoints = transaction?.pendingFields?.waypoints;
-    const showMapAsImage = isDistanceRequest && hasPendingWaypoints;
+    const receiptImages = hasReceipt ? [{...ReceiptUtils.getThumbnailAndImageURIs(transaction), transaction}] : [];
 
     const getSettledMessage = (): string => {
         if (isCardTransaction) {
@@ -128,11 +170,14 @@ function MoneyRequestPreviewContent({
     };
 
     const showContextMenu = (event: GestureResponderEvent) => {
+        if (!shouldDisplayContextMenu) {
+            return;
+        }
         showContextMenuForReport(event, contextMenuAnchor, reportID, action, checkIfContextMenuActive);
     };
 
     const getPreviewHeaderText = (): string => {
-        let message = translate('iou.cash');
+        let message = showCashOrCard;
 
         if (isDistanceRequest) {
             message = translate('common.distance');
@@ -142,14 +187,6 @@ function MoneyRequestPreviewContent({
             message = translate('iou.split');
         }
 
-        if (isCardTransaction) {
-            message = translate('iou.card');
-            if (TransactionUtils.isPending(transaction)) {
-                message += ` ${CONST.DOT_SEPARATOR} ${translate('iou.pending')}`;
-                return message;
-            }
-        }
-
         if (isSettled && !iouReport?.isCancelledIOU && !isPartialHold) {
             message += ` ${CONST.DOT_SEPARATOR} ${getSettledMessage()}`;
             return message;
@@ -157,6 +194,9 @@ function MoneyRequestPreviewContent({
 
         if (shouldShowRBR && transaction) {
             const violations = TransactionUtils.getTransactionViolations(transaction.transactionID, transactionViolations);
+            if (shouldShowHoldMessage) {
+                return `${message} ${CONST.DOT_SEPARATOR} ${translate('violations.hold')}`;
+            }
             if (violations?.[0]) {
                 const violationMessage = ViolationsUtils.getViolationTranslation(violations[0], translate);
                 const violationsCount = violations.filter((v) => v.type === CONST.VIOLATION_TYPES.VIOLATION).length;
@@ -165,32 +205,45 @@ function MoneyRequestPreviewContent({
 
                 return `${message} ${CONST.DOT_SEPARATOR} ${isTooLong || hasViolationsAndFieldErrors ? translate('violations.reviewRequired') : violationMessage}`;
             }
-
-            const isMerchantMissing = TransactionUtils.isMerchantMissing(transaction);
-            const isAmountMissing = TransactionUtils.isAmountMissing(transaction);
-            if (isAmountMissing && isMerchantMissing) {
-                message += ` ${CONST.DOT_SEPARATOR} ${translate('violations.reviewRequired')}`;
-            } else if (isAmountMissing) {
-                message += ` ${CONST.DOT_SEPARATOR} ${translate('iou.missingAmount')}`;
-            } else if (isMerchantMissing) {
-                message += ` ${CONST.DOT_SEPARATOR} ${translate('iou.missingMerchant')}`;
-            } else if (!(isSettled && !isSettlementOrApprovalPartial) && isOnHold) {
-                message += ` ${CONST.DOT_SEPARATOR} ${translate('iou.hold')}`;
+            if (hasFieldErrors) {
+                const isMerchantMissing = TransactionUtils.isMerchantMissing(transaction);
+                const isAmountMissing = TransactionUtils.isAmountMissing(transaction);
+                if (isAmountMissing && isMerchantMissing) {
+                    message += ` ${CONST.DOT_SEPARATOR} ${translate('violations.reviewRequired')}`;
+                } else if (isAmountMissing) {
+                    message += ` ${CONST.DOT_SEPARATOR} ${translate('iou.missingAmount')}`;
+                } else if (isMerchantMissing) {
+                    message += ` ${CONST.DOT_SEPARATOR} ${translate('iou.missingMerchant')}`;
+                }
+                return message;
             }
         } else if (hasNoticeTypeViolations && transaction && !ReportUtils.isReportApproved(iouReport) && !ReportUtils.isSettled(iouReport?.reportID)) {
             message += ` • ${translate('violations.reviewRequired')}`;
         } else if (ReportUtils.isPaidGroupPolicyExpenseReport(iouReport) && ReportUtils.isReportApproved(iouReport) && !ReportUtils.isSettled(iouReport?.reportID) && !isPartialHold) {
             message += ` ${CONST.DOT_SEPARATOR} ${translate('iou.approved')}`;
-        } else if (iouReport?.isWaitingOnBankAccount) {
-            message += ` ${CONST.DOT_SEPARATOR} ${translate('iou.pending')}`;
         } else if (iouReport?.isCancelledIOU) {
             message += ` ${CONST.DOT_SEPARATOR} ${translate('iou.canceled')}`;
-        } else if (!(isSettled && !isSettlementOrApprovalPartial) && isOnHold) {
-            message += ` ${CONST.DOT_SEPARATOR} ${translate('iou.hold')}`;
+        } else if (shouldShowHoldMessage) {
+            message += ` ${CONST.DOT_SEPARATOR} ${translate('violations.hold')}`;
         }
         return message;
     };
 
+    const getPendingMessageProps: () => PendingMessageProps = () => {
+        if (isScanning) {
+            return {shouldShow: true, messageIcon: ReceiptScan, messageDescription: translate('iou.receiptScanInProgress')};
+        }
+        if (TransactionUtils.isPending(transaction)) {
+            return {shouldShow: true, messageIcon: Expensicons.CreditCardHourglass, messageDescription: translate('iou.transactionPending')};
+        }
+        if (TransactionUtils.hasPendingUI(transaction, TransactionUtils.getTransactionViolations(transaction?.transactionID ?? '-1', transactionViolations))) {
+            return {shouldShow: true, messageIcon: Expensicons.Hourglass, messageDescription: translate('iou.pendingMatchWithCreditCard')};
+        }
+        return {shouldShow: false};
+    };
+
+    const pendingMessageProps = getPendingMessageProps();
+
     const getDisplayAmountText = (): string => {
         if (isScanning) {
             return translate('iou.receiptScanning');
@@ -204,14 +257,46 @@ function MoneyRequestPreviewContent({
     };
 
     const getDisplayDeleteAmountText = (): string => {
-        const iouOriginalMessage: IOUMessage | EmptyObject = action?.actionName === CONST.REPORT.ACTIONS.TYPE.IOU ? action.originalMessage : {};
-        const {amount = 0, currency = CONST.CURRENCY.USD} = iouOriginalMessage;
-
-        return CurrencyUtils.convertToDisplayString(amount, currency);
+        const iouOriginalMessage: OnyxEntry<OriginalMessageIOU> = ReportActionsUtils.isMoneyRequestAction(action) ? ReportActionsUtils.getOriginalMessage(action) ?? undefined : undefined;
+        return CurrencyUtils.convertToDisplayString(iouOriginalMessage?.amount, iouOriginalMessage?.currency);
     };
 
     const displayAmount = isDeleted ? getDisplayDeleteAmountText() : getDisplayAmountText();
 
+    const shouldShowSplitShare = isBillSplit && !!requestAmount && requestAmount > 0;
+
+    // If available, retrieve the split share from the splits object of the transaction, if not, display an even share.
+    const splitShare = useMemo(
+        () =>
+            shouldShowSplitShare
+                ? transaction?.comment?.splits?.find((split) => split.accountID === sessionAccountID)?.amount ??
+                  IOUUtils.calculateAmount(isPolicyExpenseChat ? 1 : participantAccountIDs.length - 1, requestAmount, requestCurrency ?? '', action.actorAccountID === sessionAccountID)
+                : 0,
+        [shouldShowSplitShare, isPolicyExpenseChat, action.actorAccountID, participantAccountIDs.length, transaction?.comment?.splits, requestAmount, requestCurrency, sessionAccountID],
+    );
+
+    const navigateToReviewFields = () => {
+        const comparisonResult = TransactionUtils.compareDuplicateTransactionFields(reviewingTransactionID);
+        Transaction.setReviewDuplicatesKey({...comparisonResult.keep, duplicates, transactionID: transaction?.transactionID ?? ''});
+        if ('merchant' in comparisonResult.change) {
+            Navigation.navigate(ROUTES.TRANSACTION_DUPLICATE_REVIEW_MERCHANT_PAGE.getRoute(route.params?.threadReportID));
+        } else if ('category' in comparisonResult.change) {
+            Navigation.navigate(ROUTES.TRANSACTION_DUPLICATE_REVIEW_CATEGORY_PAGE.getRoute(route.params?.threadReportID));
+        } else if ('tag' in comparisonResult.change) {
+            Navigation.navigate(ROUTES.TRANSACTION_DUPLICATE_REVIEW_TAG_PAGE.getRoute(route.params?.threadReportID));
+        } else if ('description' in comparisonResult.change) {
+            Navigation.navigate(ROUTES.TRANSACTION_DUPLICATE_REVIEW_DESCRIPTION_PAGE.getRoute(route.params?.threadReportID));
+        } else if ('taxCode' in comparisonResult.change) {
+            Navigation.navigate(ROUTES.TRANSACTION_DUPLICATE_REVIEW_TAX_CODE_PAGE.getRoute(route.params?.threadReportID));
+        } else if ('billable' in comparisonResult.change) {
+            Navigation.navigate(ROUTES.TRANSACTION_DUPLICATE_REVIEW_BILLABLE_PAGE.getRoute(route.params?.threadReportID));
+        } else if ('reimbursable' in comparisonResult.change) {
+            Navigation.navigate(ROUTES.TRANSACTION_DUPLICATE_REVIEW_REIMBURSABLE_PAGE.getRoute(route.params?.threadReportID));
+        } else {
+            Navigation.navigate(ROUTES.TRANSACTION_DUPLICATE_CONFIRMATION_PAGE.getRoute(route.params?.threadReportID));
+        }
+    };
+
     const childContainer = (
         <View>
             <OfflineWithFeedback
@@ -222,6 +307,9 @@ function MoneyRequestPreviewContent({
                 }}
                 errorRowStyles={[styles.mbn1]}
                 needsOffscreenAlphaCompositing
+                pendingAction={action.pendingAction}
+                shouldDisableStrikeThrough={!isDeleted}
+                shouldDisableOpacity={!isDeleted}
             >
                 <View
                     style={[
@@ -229,15 +317,7 @@ function MoneyRequestPreviewContent({
                         !onPreviewPressed ? [styles.moneyRequestPreviewBox, containerStyles] : {},
                     ]}
                 >
-                    {showMapAsImage && (
-                        <View style={styles.reportActionItemImages}>
-                            <ConfirmedRoute
-                                transaction={transaction}
-                                interactive={false}
-                            />
-                        </View>
-                    )}
-                    {!showMapAsImage && hasReceipt && (
+                    {hasReceipt && (
                         <ReportActionItemImages
                             images={receiptImages}
                             isHovered={isHovered || isScanning}
@@ -266,7 +346,12 @@ function MoneyRequestPreviewContent({
                                                     style={[
                                                         styles.textHeadlineH1,
                                                         isBillSplit &&
-                                                            StyleUtils.getAmountFontSizeAndLineHeight(isSmallScreenWidth, windowWidth, displayAmount.length, sortedParticipantAvatars.length),
+                                                            StyleUtils.getAmountFontSizeAndLineHeight(
+                                                                shouldUseNarrowLayout,
+                                                                windowWidth,
+                                                                displayAmount.length,
+                                                                sortedParticipantAvatars.length,
+                                                            ),
                                                         isDeleted && styles.lineThrough,
                                                     ]}
                                                     numberOfLines={1}
@@ -302,17 +387,23 @@ function MoneyRequestPreviewContent({
                                                     <Text style={[styles.textLabelSupporting, styles.textNormal]}>{merchantOrDescription}</Text>
                                                 )}
                                             </View>
-                                            {isBillSplit && participantAccountIDs.length > 0 && !!requestAmount && requestAmount > 0 && (
+                                            {!!splitShare && (
                                                 <Text style={[styles.textLabel, styles.colorMuted, styles.ml1, styles.amountSplitPadding]}>
-                                                    {translate('iou.amountEach', {
-                                                        amount: CurrencyUtils.convertToDisplayString(
-                                                            IOUUtils.calculateAmount(isPolicyExpenseChat ? 1 : participantAccountIDs.length - 1, requestAmount, requestCurrency ?? ''),
-                                                            requestCurrency,
-                                                        ),
-                                                    })}
+                                                    {translate('iou.yourSplit', {amount: CurrencyUtils.convertToDisplayString(splitShare, requestCurrency)})}
                                                 </Text>
                                             )}
                                         </View>
+                                        {pendingMessageProps.shouldShow && (
+                                            <View style={[styles.flexRow, styles.alignItemsCenter, styles.mt2]}>
+                                                <Icon
+                                                    src={pendingMessageProps.messageIcon}
+                                                    height={variables.iconSizeExtraSmall}
+                                                    width={variables.iconSizeExtraSmall}
+                                                    fill={theme.icon}
+                                                />
+                                                <Text style={[styles.textMicroSupporting, styles.ml1, styles.amountSplitPadding]}>{pendingMessageProps.messageDescription}</Text>
+                                            </View>
+                                        )}
                                     </View>
                                 </View>
                             </View>
@@ -336,7 +427,7 @@ function MoneyRequestPreviewContent({
             onPressOut={() => ControlSelection.unblock()}
             onLongPress={showContextMenu}
             shouldUseHapticsOnLongPress
-            accessibilityLabel={isBillSplit ? translate('iou.split') : translate('iou.cash')}
+            accessibilityLabel={isBillSplit ? translate('iou.split') : showCashOrCard}
             accessibilityHint={CurrencyUtils.convertToDisplayString(requestAmount, requestCurrency)}
             style={[
                 styles.moneyRequestPreviewBox,
@@ -346,6 +437,15 @@ function MoneyRequestPreviewContent({
             ]}
         >
             {childContainer}
+            {isReviewDuplicateTransactionPage && (
+                <Button
+                    text={translate('violations.keepThisOne')}
+                    success
+                    medium
+                    style={styles.p4}
+                    onPress={navigateToReviewFields}
+                />
+            )}
         </PressableWithoutFeedback>
     );
 }
diff --git a/src/components/ReportActionItem/MoneyRequestPreview/index.tsx b/src/components/ReportActionItem/MoneyRequestPreview/index.tsx
index b46e052f3420..c01206f83f55 100644
--- a/src/components/ReportActionItem/MoneyRequestPreview/index.tsx
+++ b/src/components/ReportActionItem/MoneyRequestPreview/index.tsx
@@ -31,7 +31,7 @@ export default withOnyx<MoneyRequestPreviewProps, MoneyRequestPreviewOnyxProps>(
     transaction: {
         key: ({action}) => {
             const isMoneyRequestAction = ReportActionsUtils.isMoneyRequestAction(action);
-            const transactionID = isMoneyRequestAction ? action?.originalMessage?.IOUTransactionID : 0;
+            const transactionID = isMoneyRequestAction ? ReportActionsUtils.getOriginalMessage(action)?.IOUTransactionID : 0;
             return `${ONYXKEYS.COLLECTION.TRANSACTION}${transactionID}`;
         },
     },
diff --git a/src/components/ReportActionItem/MoneyRequestPreview/types.ts b/src/components/ReportActionItem/MoneyRequestPreview/types.ts
index 0e3eb37ce6e3..021ae5d188d9 100644
--- a/src/components/ReportActionItem/MoneyRequestPreview/types.ts
+++ b/src/components/ReportActionItem/MoneyRequestPreview/types.ts
@@ -2,6 +2,7 @@ import type {GestureResponderEvent, StyleProp, ViewStyle} from 'react-native';
 import type {OnyxCollection, OnyxEntry} from 'react-native-onyx';
 import type {ContextMenuAnchor} from '@pages/home/report/ContextMenu/ReportActionContextMenu';
 import type * as OnyxTypes from '@src/types/onyx';
+import type IconAsset from '@src/types/utils/IconAsset';
 
 type MoneyRequestPreviewOnyxProps = {
     /** All of the personal details for everyone */
@@ -69,6 +70,24 @@ type MoneyRequestPreviewProps = MoneyRequestPreviewOnyxProps & {
 
     /** Whether a message is a whisper */
     isWhisper?: boolean;
+
+    /** Whether  context menu should be shown on press */
+    shouldDisplayContextMenu?: boolean;
 };
 
-export type {MoneyRequestPreviewProps, MoneyRequestPreviewOnyxProps};
+type NoPendingProps = {shouldShow: false};
+
+type PendingProps = {
+    /** Whether to show the pending message or not */
+    shouldShow: true;
+
+    /** The icon to be displayed if a request is pending */
+    messageIcon: IconAsset;
+
+    /** The description to be displayed if a request is pending */
+    messageDescription: string;
+};
+
+type PendingMessageProps = PendingProps | NoPendingProps;
+
+export type {MoneyRequestPreviewProps, MoneyRequestPreviewOnyxProps, PendingMessageProps};
diff --git a/src/components/ReportActionItem/MoneyRequestView.tsx b/src/components/ReportActionItem/MoneyRequestView.tsx
index 9b7bfb2c2f17..57c5c01da55d 100644
--- a/src/components/ReportActionItem/MoneyRequestView.tsx
+++ b/src/components/ReportActionItem/MoneyRequestView.tsx
@@ -1,13 +1,13 @@
 import React, {useCallback, useMemo} from 'react';
 import {View} from 'react-native';
-import {withOnyx} from 'react-native-onyx';
+import {useOnyx, withOnyx} from 'react-native-onyx';
 import type {OnyxEntry} from 'react-native-onyx';
-import ConfirmedRoute from '@components/ConfirmedRoute';
 import * as Expensicons from '@components/Icon/Expensicons';
+import MenuItem from '@components/MenuItem';
 import MenuItemWithTopDescription from '@components/MenuItemWithTopDescription';
 import OfflineWithFeedback from '@components/OfflineWithFeedback';
 import {useSession} from '@components/OnyxProvider';
-import {ReceiptAuditHeader, ReceiptAuditMessages} from '@components/ReceiptAudit';
+import ReceiptAudit, {ReceiptAuditMessages} from '@components/ReceiptAudit';
 import ReceiptEmptyState from '@components/ReceiptEmptyState';
 import Switch from '@components/Switch';
 import Text from '@components/Text';
@@ -15,29 +15,32 @@ import ViolationMessages from '@components/ViolationMessages';
 import useLocalize from '@hooks/useLocalize';
 import useNetwork from '@hooks/useNetwork';
 import usePermissions from '@hooks/usePermissions';
-import useStyleUtils from '@hooks/useStyleUtils';
 import useTheme from '@hooks/useTheme';
 import useThemeStyles from '@hooks/useThemeStyles';
 import useViolations from '@hooks/useViolations';
 import type {ViolationField} from '@hooks/useViolations';
-import useWindowDimensions from '@hooks/useWindowDimensions';
-import * as CardUtils from '@libs/CardUtils';
 import * as CurrencyUtils from '@libs/CurrencyUtils';
 import type {MileageRate} from '@libs/DistanceRequestUtils';
 import DistanceRequestUtils from '@libs/DistanceRequestUtils';
+import * as ErrorUtils from '@libs/ErrorUtils';
 import * as OptionsListUtils from '@libs/OptionsListUtils';
 import * as PolicyUtils from '@libs/PolicyUtils';
 import {isTaxTrackingEnabled} from '@libs/PolicyUtils';
 import * as ReceiptUtils from '@libs/ReceiptUtils';
+import * as ReportActionsUtils from '@libs/ReportActionsUtils';
 import * as ReportUtils from '@libs/ReportUtils';
+import type {TransactionDetails} from '@libs/ReportUtils';
 import * as TransactionUtils from '@libs/TransactionUtils';
 import ViolationsUtils from '@libs/Violations/ViolationsUtils';
 import Navigation from '@navigation/Navigation';
 import AnimatedEmptyStateBackground from '@pages/home/report/AnimatedEmptyStateBackground';
 import * as IOU from '@userActions/IOU';
+import * as Link from '@userActions/Link';
 import * as Transaction from '@userActions/Transaction';
 import CONST from '@src/CONST';
 import type {TranslationPaths} from '@src/languages/types';
+import * as Report from '@src/libs/actions/Report';
+import * as ReportActions from '@src/libs/actions/ReportActions';
 import ONYXKEYS from '@src/ONYXKEYS';
 import ROUTES from '@src/ROUTES';
 import type * as OnyxTypes from '@src/types/onyx';
@@ -45,9 +48,6 @@ import type {TransactionPendingFieldsKey} from '@src/types/onyx/Transaction';
 import ReportActionItemImage from './ReportActionItemImage';
 
 type MoneyRequestViewTransactionOnyxProps = {
-    /** The transaction associated with the transactionThread */
-    transaction: OnyxEntry<OnyxTypes.Transaction>;
-
     /** Violations detected in this transaction */
     transactionViolations: OnyxEntry<OnyxTypes.TransactionViolations>;
 };
@@ -60,7 +60,7 @@ type MoneyRequestViewOnyxPropsWithoutTransaction = {
     policyCategories: OnyxEntry<OnyxTypes.PolicyCategories>;
 
     /** Collection of tags attached to a policy */
-    policyTagList: OnyxEntry<OnyxTypes.PolicyTagList>;
+    policyTagList: OnyxEntry<OnyxTypes.PolicyTagLists>;
 
     /** The expense report or iou report (only will have a value if this is a transaction thread) */
     parentReport: OnyxEntry<OnyxTypes.Report>;
@@ -74,42 +74,86 @@ type MoneyRequestViewOnyxPropsWithoutTransaction = {
 
 type MoneyRequestViewPropsWithoutTransaction = MoneyRequestViewOnyxPropsWithoutTransaction & {
     /** The report currently being looked at */
-    report: OnyxTypes.Report;
+    report: OnyxEntry<OnyxTypes.Report>;
 
     /** Whether we should display the animated banner above the component */
     shouldShowAnimatedBackground: boolean;
+
+    /** Whether we should show Money Request with disabled all fields */
+    readonly?: boolean;
+
+    /** Updated transaction to show in duplicate transaction flow  */
+    updatedTransaction?: OnyxEntry<OnyxTypes.Transaction>;
 };
 
 type MoneyRequestViewProps = MoneyRequestViewTransactionOnyxProps & MoneyRequestViewPropsWithoutTransaction;
 
+const receiptImageViolationNames: OnyxTypes.ViolationName[] = [
+    CONST.VIOLATIONS.RECEIPT_REQUIRED,
+    CONST.VIOLATIONS.RECEIPT_NOT_SMART_SCANNED,
+    CONST.VIOLATIONS.CASH_EXPENSE_WITH_NO_RECEIPT,
+    CONST.VIOLATIONS.SMARTSCAN_FAILED,
+];
+
+const receiptFieldViolationNames: OnyxTypes.ViolationName[] = [CONST.VIOLATIONS.MODIFIED_AMOUNT, CONST.VIOLATIONS.MODIFIED_DATE];
+
+const deleteTransaction = (parentReport: OnyxEntry<OnyxTypes.Report>, parentReportAction: OnyxEntry<OnyxTypes.ReportAction>) => {
+    if (!parentReportAction) {
+        return;
+    }
+    const iouTransactionID = ReportActionsUtils.isMoneyRequestAction(parentReportAction) ? ReportActionsUtils.getOriginalMessage(parentReportAction)?.IOUTransactionID ?? '-1' : '-1';
+    if (ReportActionsUtils.isTrackExpenseAction(parentReportAction)) {
+        IOU.deleteTrackExpense(parentReport?.reportID ?? '-1', iouTransactionID, parentReportAction, true);
+        return;
+    }
+    IOU.deleteMoneyRequest(iouTransactionID, parentReportAction, true);
+};
+
+const getTransactionID = (report: OnyxEntry<OnyxTypes.Report>, parentReportActions: OnyxEntry<OnyxTypes.ReportActions>) => {
+    const parentReportAction = parentReportActions?.[report?.parentReportActionID ?? '-1'];
+    const originalMessage = parentReportAction && ReportActionsUtils.isMoneyRequestAction(parentReportAction) ? ReportActionsUtils.getOriginalMessage(parentReportAction) : undefined;
+    return originalMessage?.IOUTransactionID ?? -1;
+};
+
 function MoneyRequestView({
     report,
     parentReport,
     parentReportActions,
     policyCategories,
-    transaction,
     policyTagList,
     policy,
     transactionViolations,
     shouldShowAnimatedBackground,
     distanceRates,
+    readonly = false,
+    updatedTransaction,
 }: MoneyRequestViewProps) {
     const theme = useTheme();
     const styles = useThemeStyles();
     const session = useSession();
-    const StyleUtils = useStyleUtils();
     const {isOffline} = useNetwork();
-    const {isSmallScreenWidth} = useWindowDimensions();
     const {translate, toLocaleDigit} = useLocalize();
-    const parentReportAction = parentReportActions?.[report.parentReportActionID ?? ''] ?? null;
+    const [activePolicyID] = useOnyx(ONYXKEYS.NVP_ACTIVE_POLICY_ID);
+    const [chatReport] = useOnyx(`${ONYXKEYS.COLLECTION.REPORT}${parentReport?.parentReportID}`, {
+        selector: (chatReportValue) => chatReportValue && {reportID: chatReportValue.reportID, errorFields: chatReportValue.errorFields},
+    });
+
+    const parentReportAction = parentReportActions?.[report?.parentReportActionID ?? '-1'];
     const isTrackExpense = ReportUtils.isTrackExpenseReport(report);
-    const {canUseViolations, canUseP2PDistanceRequests} = usePermissions(isTrackExpense ? CONST.IOU.TYPE.TRACK : undefined);
+    const {canUseP2PDistanceRequests} = usePermissions(isTrackExpense ? CONST.IOU.TYPE.TRACK : undefined);
     const moneyRequestReport = parentReport;
+    const linkedTransactionID = useMemo(() => {
+        const originalMessage = parentReportAction && ReportActionsUtils.isMoneyRequestAction(parentReportAction) ? ReportActionsUtils.getOriginalMessage(parentReportAction) : undefined;
+        return originalMessage?.IOUTransactionID ?? '-1';
+    }, [parentReportAction]);
+
+    const [transaction] = useOnyx(`${ONYXKEYS.COLLECTION.TRANSACTION}${linkedTransactionID}`);
+    const [transactionBackup] = useOnyx(`${ONYXKEYS.COLLECTION.TRANSACTION_BACKUP}${linkedTransactionID}`);
+
     const {
         created: transactionDate,
         amount: transactionAmount,
         taxAmount: transactionTaxAmount,
-        taxCode: transactionTaxCode,
         currency: transactionCurrency,
         comment: transactionDescription,
         merchant: transactionMerchant,
@@ -118,43 +162,43 @@ function MoneyRequestView({
         tag: transactionTag,
         originalAmount: transactionOriginalAmount,
         originalCurrency: transactionOriginalCurrency,
-        cardID: transactionCardID,
-    } = ReportUtils.getTransactionDetails(transaction) ?? {};
+    } = useMemo<Partial<TransactionDetails>>(() => ReportUtils.getTransactionDetails(transaction) ?? {}, [transaction]);
     const isEmptyMerchant = transactionMerchant === '' || transactionMerchant === CONST.TRANSACTION.PARTIAL_TRANSACTION_MERCHANT;
     const isDistanceRequest = TransactionUtils.isDistanceRequest(transaction);
     const formattedTransactionAmount = transactionAmount ? CurrencyUtils.convertToDisplayString(transactionAmount, transactionCurrency) : '';
-    const hasPendingWaypoints = Boolean(transaction?.pendingFields?.waypoints);
-    const showMapAsImage = isDistanceRequest && hasPendingWaypoints;
     const formattedOriginalAmount = transactionOriginalAmount && transactionOriginalCurrency && CurrencyUtils.convertToDisplayString(transactionOriginalAmount, transactionOriginalCurrency);
     const isCardTransaction = TransactionUtils.isCardTransaction(transaction);
-    const cardProgramName = isCardTransaction && transactionCardID !== undefined ? CardUtils.getCardDescription(transactionCardID) : '';
+    const cardProgramName = TransactionUtils.getCardName(transaction);
+    const shouldShowCard = isCardTransaction && cardProgramName;
     const isApproved = ReportUtils.isReportApproved(moneyRequestReport);
     const isInvoice = ReportUtils.isInvoiceReport(moneyRequestReport);
+    const isPaidReport = ReportActionsUtils.isPayAction(parentReportAction);
     const taxRates = policy?.taxRates;
-    const formattedTaxAmount = CurrencyUtils.convertToDisplayString(transactionTaxAmount, transactionCurrency);
+    const formattedTaxAmount = updatedTransaction?.taxAmount
+        ? CurrencyUtils.convertToDisplayString(Math.abs(updatedTransaction?.taxAmount), transactionCurrency)
+        : CurrencyUtils.convertToDisplayString(Math.abs(transactionTaxAmount ?? 0), transactionCurrency);
 
     const taxRatesDescription = taxRates?.name;
-    const taxRateTitle =
-        taxRates &&
-        (transactionTaxCode === taxRates?.defaultExternalID
-            ? transaction && TransactionUtils.getDefaultTaxName(taxRates, transaction)
-            : transactionTaxCode && TransactionUtils.getTaxName(taxRates?.taxes, transactionTaxCode));
+    const taxRateTitle = updatedTransaction ? TransactionUtils.getTaxName(policy, updatedTransaction) : TransactionUtils.getTaxName(policy, transaction);
 
-    // Flags for allowing or disallowing editing an expense
     const isSettled = ReportUtils.isSettled(moneyRequestReport?.reportID);
-    const isCancelled = moneyRequestReport && moneyRequestReport.isCancelledIOU;
-
-    // Used for non-restricted fields such as: description, category, tag, billable, etc.
-    const canEdit = ReportUtils.canEditMoneyRequest(parentReportAction);
-    const canEditAmount = ReportUtils.canEditFieldOfMoneyRequest(parentReportAction, CONST.EDIT_REQUEST_FIELD.AMOUNT);
-    const canEditMerchant = ReportUtils.canEditFieldOfMoneyRequest(parentReportAction, CONST.EDIT_REQUEST_FIELD.MERCHANT);
-    const canEditDate = ReportUtils.canEditFieldOfMoneyRequest(parentReportAction, CONST.EDIT_REQUEST_FIELD.DATE);
-    const canEditReceipt = ReportUtils.canEditFieldOfMoneyRequest(parentReportAction, CONST.EDIT_REQUEST_FIELD.RECEIPT);
+    const isCancelled = moneyRequestReport && moneyRequestReport?.isCancelledIOU;
+
+    // Flags for allowing or disallowing editing an expense
+    // Used for non-restricted fields such as: description, category, tag, billable, etc...
+    const canUserPerformWriteAction = !!ReportUtils.canUserPerformWriteAction(report) && !readonly;
+    const canEdit = ReportActionsUtils.isMoneyRequestAction(parentReportAction) && ReportUtils.canEditMoneyRequest(parentReportAction, transaction) && canUserPerformWriteAction;
+
+    const canEditTaxFields = canEdit && !isDistanceRequest;
+    const canEditAmount = canUserPerformWriteAction && ReportUtils.canEditFieldOfMoneyRequest(parentReportAction, CONST.EDIT_REQUEST_FIELD.AMOUNT);
+    const canEditMerchant = canUserPerformWriteAction && ReportUtils.canEditFieldOfMoneyRequest(parentReportAction, CONST.EDIT_REQUEST_FIELD.MERCHANT);
+    const canEditDate = canUserPerformWriteAction && ReportUtils.canEditFieldOfMoneyRequest(parentReportAction, CONST.EDIT_REQUEST_FIELD.DATE);
+    const canEditReceipt = canUserPerformWriteAction && ReportUtils.canEditFieldOfMoneyRequest(parentReportAction, CONST.EDIT_REQUEST_FIELD.RECEIPT);
     const hasReceipt = TransactionUtils.hasReceipt(transaction);
     const isReceiptBeingScanned = hasReceipt && TransactionUtils.isReceiptBeingScanned(transaction);
-    const didRceiptScanSucceed = hasReceipt && TransactionUtils.didRceiptScanSucceed(transaction);
-    // TODO: remove the !isTrackExpense from this condition after this fix: https://github.com/Expensify/Expensify/issues/382786
-    const canEditDistance = ReportUtils.canEditFieldOfMoneyRequest(parentReportAction, CONST.EDIT_REQUEST_FIELD.DISTANCE) && !isTrackExpense;
+    const didReceiptScanSucceed = hasReceipt && TransactionUtils.didReceiptScanSucceed(transaction);
+    const canEditDistance = canUserPerformWriteAction && ReportUtils.canEditFieldOfMoneyRequest(parentReportAction, CONST.EDIT_REQUEST_FIELD.DISTANCE);
+    const canEditDistanceRate = canUserPerformWriteAction && ReportUtils.canEditFieldOfMoneyRequest(parentReportAction, CONST.EDIT_REQUEST_FIELD.DISTANCE_RATE);
 
     const isAdmin = policy?.role === 'admin';
     const isApprover = ReportUtils.isMoneyRequestReport(moneyRequestReport) && moneyRequestReport?.managerID !== null && session?.accountID === moneyRequestReport?.managerID;
@@ -173,21 +217,23 @@ function MoneyRequestView({
     // transactionTag can be an empty string
     // eslint-disable-next-line @typescript-eslint/prefer-nullish-coalescing
     const shouldShowTag = isPolicyExpenseChat && (transactionTag || OptionsListUtils.hasEnabledTags(policyTagLists));
-    const shouldShowBillable = isPolicyExpenseChat && (!!transactionBillable || !(policy?.disabledFields?.defaultBillable ?? true));
+    const shouldShowBillable = isPolicyExpenseChat && (!!transactionBillable || !(policy?.disabledFields?.defaultBillable ?? true) || !!updatedTransaction?.billable);
 
-    // A flag for showing tax rate
-    const shouldShowTax = isTaxTrackingEnabled(isPolicyExpenseChat, policy);
+    const shouldShowTax = isTaxTrackingEnabled(isPolicyExpenseChat, policy, isDistanceRequest);
+    const tripID = ReportUtils.getTripIDFromTransactionParentReport(parentReport);
+    const shouldShowViewTripDetails = TransactionUtils.hasReservationList(transaction) && !!tripID;
 
-    const {getViolationsForField} = useViolations(transactionViolations ?? []);
+    const {getViolationsForField} = useViolations(transactionViolations ?? [], isReceiptBeingScanned || !ReportUtils.isPaidGroupPolicy(report));
     const hasViolations = useCallback(
-        (field: ViolationField, data?: OnyxTypes.TransactionViolation['data']): boolean => !!canUseViolations && getViolationsForField(field, data).length > 0,
-        [canUseViolations, getViolationsForField],
+        (field: ViolationField, data?: OnyxTypes.TransactionViolation['data'], policyHasDependentTags = false, tagValue?: string): boolean =>
+            getViolationsForField(field, data, policyHasDependentTags, tagValue).length > 0,
+        [getViolationsForField],
     );
 
     let amountDescription = `${translate('iou.amount')}`;
 
-    const hasRoute = TransactionUtils.hasRoute(transaction, isDistanceRequest);
-    const rateID = transaction?.comment.customUnit?.customUnitRateID ?? '0';
+    const hasRoute = TransactionUtils.hasRoute(transactionBackup ?? transaction, isDistanceRequest);
+    const rateID = TransactionUtils.getRateID(transaction) ?? '-1';
 
     const currency = policy ? policy.outputCurrency : PolicyUtils.getPersonalPolicy()?.outputCurrency ?? CONST.CURRENCY.USD;
 
@@ -195,7 +241,7 @@ function MoneyRequestView({
     const {unit} = mileageRate;
     const rate = transaction?.comment?.customUnit?.defaultP2PRate ?? mileageRate.rate;
 
-    const distance = DistanceRequestUtils.convertToDistanceInMeters(TransactionUtils.getDistance(transaction), unit);
+    const distance = TransactionUtils.getDistanceInMeters(transactionBackup ?? transaction, unit);
     const rateToDisplay = DistanceRequestUtils.getRateForDisplay(unit, rate, currency, translate, toLocaleDigit, isOffline);
     const distanceToDisplay = DistanceRequestUtils.getDistanceForDisplay(hasRoute, distance, unit, rate, translate);
     let merchantTitle = isEmptyMerchant ? '' : transactionMerchant;
@@ -204,15 +250,21 @@ function MoneyRequestView({
         merchantTitle = translate('iou.receiptStatusTitle');
         amountTitle = translate('iou.receiptStatusTitle');
     }
+
+    const updatedTransactionDescription = useMemo(() => {
+        if (!updatedTransaction) {
+            return undefined;
+        }
+        return TransactionUtils.getDescription(updatedTransaction ?? null);
+    }, [updatedTransaction]);
+
     const saveBillable = useCallback(
         (newBillable: boolean) => {
             // If the value hasn't changed, don't request to save changes on the server and just close the modal
             if (newBillable === TransactionUtils.getBillable(transaction)) {
-                Navigation.dismissModal();
                 return;
             }
-            IOU.updateMoneyRequestBillable(transaction?.transactionID ?? '', report?.reportID, newBillable, policy, policyTagList, policyCategories);
-            Navigation.dismissModal();
+            IOU.updateMoneyRequestBillable(transaction?.transactionID ?? '-1', report?.reportID ?? '-1', newBillable, policy, policyTagList, policyCategories);
         },
         [transaction, report, policy, policyTagList, policyCategories],
     );
@@ -221,9 +273,6 @@ function MoneyRequestView({
         if (formattedOriginalAmount) {
             amountDescription += ` ${CONST.DOT_SEPARATOR} ${translate('iou.original')} ${formattedOriginalAmount}`;
         }
-        if (TransactionUtils.isPending(transaction)) {
-            amountDescription += ` ${CONST.DOT_SEPARATOR} ${translate('iou.pending')}`;
-        }
         if (isCancelled) {
             amountDescription += ` ${CONST.DOT_SEPARATOR} ${translate('iou.canceled')}`;
         }
@@ -236,23 +285,20 @@ function MoneyRequestView({
         } else if (isCancelled) {
             amountDescription += ` ${CONST.DOT_SEPARATOR} ${translate('iou.canceled')}`;
         } else if (isSettled) {
-            amountDescription += ` ${CONST.DOT_SEPARATOR} ${translate('iou.settledExpensify')}`;
-        } else if (report.isWaitingOnBankAccount) {
-            amountDescription += ` ${CONST.DOT_SEPARATOR} ${translate('iou.pending')}`;
+            amountDescription += ` • ${translate('iou.settledExpensify')}`;
         }
     }
 
     let receiptURIs;
-    const hasErrors = canEdit && TransactionUtils.hasMissingSmartscanFields(transaction);
+    const hasErrors = TransactionUtils.hasMissingSmartscanFields(transaction);
     if (hasReceipt) {
         receiptURIs = ReceiptUtils.getThumbnailAndImageURIs(transaction);
     }
-
     const pendingAction = transaction?.pendingAction;
     const getPendingFieldAction = (fieldPath: TransactionPendingFieldsKey) => transaction?.pendingFields?.[fieldPath] ?? pendingAction;
 
     const getErrorForField = useCallback(
-        (field: ViolationField, data?: OnyxTypes.TransactionViolation['data']) => {
+        (field: ViolationField, data?: OnyxTypes.TransactionViolation['data'], policyHasDependentTags = false, tagValue?: string) => {
             // Checks applied when creating a new expense
             // NOTE: receipt field can return multiple violations, so we need to handle it separately
             const fieldChecks: Partial<Record<ViolationField, {isError: boolean; translationPath: TranslationPaths}>> = {
@@ -272,20 +318,24 @@ function MoneyRequestView({
 
             const {isError, translationPath} = fieldChecks[field] ?? {};
 
+            if (readonly) {
+                return '';
+            }
+
             // Return form errors if there are any
             if (hasErrors && isError && translationPath) {
                 return translate(translationPath);
             }
 
             // Return violations if there are any
-            if (canUseViolations && hasViolations(field, data)) {
-                const violations = getViolationsForField(field, data);
+            if (hasViolations(field, data, policyHasDependentTags, tagValue)) {
+                const violations = getViolationsForField(field, data, policyHasDependentTags, tagValue);
                 return ViolationsUtils.getViolationTranslation(violations[0], translate);
             }
 
             return '';
         },
-        [transactionAmount, isSettled, isCancelled, isPolicyExpenseChat, isEmptyMerchant, transactionDate, hasErrors, canUseViolations, hasViolations, translate, getViolationsForField],
+        [transactionAmount, isSettled, isCancelled, isPolicyExpenseChat, isEmptyMerchant, transactionDate, readonly, hasErrors, hasViolations, translate, getViolationsForField],
     );
 
     const distanceRequestFields = canUseP2PDistanceRequests ? (
@@ -293,24 +343,25 @@ function MoneyRequestView({
             <OfflineWithFeedback pendingAction={getPendingFieldAction('waypoints')}>
                 <MenuItemWithTopDescription
                     description={translate('common.distance')}
-                    title={getPendingFieldAction('waypoints') ? translate('iou.fieldPending') : distanceToDisplay}
+                    title={distanceToDisplay}
                     interactive={canEditDistance}
                     shouldShowRightIcon={canEditDistance}
                     titleStyle={styles.flex1}
-                    onPress={() => Navigation.navigate(ROUTES.MONEY_REQUEST_STEP_DISTANCE.getRoute(CONST.IOU.ACTION.EDIT, iouType, transaction?.transactionID ?? '', report.reportID))}
+                    onPress={() =>
+                        Navigation.navigate(ROUTES.MONEY_REQUEST_STEP_DISTANCE.getRoute(CONST.IOU.ACTION.EDIT, iouType, transaction?.transactionID ?? '-1', report?.reportID ?? '-1'))
+                    }
                 />
             </OfflineWithFeedback>
-            {/* TODO: correct the pending field action https://github.com/Expensify/App/issues/36987 */}
-            <OfflineWithFeedback pendingAction={getPendingFieldAction('waypoints')}>
+            <OfflineWithFeedback pendingAction={getPendingFieldAction('customUnitRateID')}>
                 <MenuItemWithTopDescription
                     description={translate('common.rate')}
                     title={rateToDisplay}
-                    // TODO: https://github.com/Expensify/App/issues/36987 make it interactive and show right icon when EditRatePage is ready
-                    interactive={false}
-                    shouldShowRightIcon={false}
+                    interactive={canEditDistanceRate}
+                    shouldShowRightIcon={canEditDistanceRate}
                     titleStyle={styles.flex1}
-                    // TODO: https://github.com/Expensify/App/issues/36987 Add route for editing rate
-                    onPress={() => {}}
+                    onPress={() =>
+                        Navigation.navigate(ROUTES.MONEY_REQUEST_STEP_DISTANCE_RATE.getRoute(CONST.IOU.ACTION.EDIT, iouType, transaction?.transactionID ?? '-1', report?.reportID ?? '-1'))
+                    }
                 />
             </OfflineWithFeedback>
         </>
@@ -322,45 +373,122 @@ function MoneyRequestView({
                 interactive={canEditDistance}
                 shouldShowRightIcon={canEditDistance}
                 titleStyle={styles.flex1}
-                onPress={() => Navigation.navigate(ROUTES.MONEY_REQUEST_STEP_DISTANCE.getRoute(CONST.IOU.ACTION.EDIT, iouType, transaction?.transactionID ?? '', report.reportID))}
+                onPress={() => Navigation.navigate(ROUTES.MONEY_REQUEST_STEP_DISTANCE.getRoute(CONST.IOU.ACTION.EDIT, iouType, transaction?.transactionID ?? '-1', report?.reportID ?? '-1'))}
             />
         </OfflineWithFeedback>
     );
 
-    const shouldShowMapOrReceipt = showMapAsImage || hasReceipt;
-    const shouldShowReceiptEmptyState = !hasReceipt && !isInvoice && (canEditReceipt || isAdmin || isApprover);
-    const noticeTypeViolations = transactionViolations?.filter((violation) => violation.type === 'notice').map((v) => ViolationsUtils.getViolationTranslation(v, translate)) ?? [];
-    const shouldShowNotesViolations = !isReceiptBeingScanned && canUseViolations && ReportUtils.isPaidGroupPolicy(report);
+    const isReceiptAllowed = !isPaidReport && !isInvoice;
+    const shouldShowReceiptEmptyState =
+        isReceiptAllowed && !hasReceipt && !isApproved && !isSettled && (canEditReceipt || isAdmin || isApprover) && (canEditReceipt || ReportUtils.isPaidGroupPolicy(report));
+
+    const [receiptImageViolations, receiptViolations] = useMemo(() => {
+        const imageViolations = [];
+        const allViolations = [];
+
+        for (const violation of transactionViolations ?? []) {
+            const isReceiptFieldViolation = receiptFieldViolationNames.includes(violation.name);
+            const isReceiptImageViolation = receiptImageViolationNames.includes(violation.name);
+            if (isReceiptFieldViolation || isReceiptImageViolation) {
+                const violationMessage = ViolationsUtils.getViolationTranslation(violation, translate);
+                allViolations.push(violationMessage);
+                if (isReceiptImageViolation) {
+                    imageViolations.push(violationMessage);
+                }
+            }
+        }
+        return [imageViolations, allViolations];
+    }, [transactionViolations, translate]);
+
+    // Whether to show receipt audit result (e.g.`Verified`, `Issue Found`) and messages (e.g. `Receipt not verified. Please confirm accuracy.`)
+    // `!!(receiptViolations.length || didReceiptScanSucceed)` is for not showing `Verified` when `receiptViolations` is empty and `didReceiptScanSucceed` is false.
+    const shouldShowAuditMessage = !isReceiptBeingScanned && hasReceipt && !!(receiptViolations.length || didReceiptScanSucceed) && ReportUtils.isPaidGroupPolicy(report);
+    const shouldShowReceiptAudit = isReceiptAllowed && (shouldShowReceiptEmptyState || hasReceipt);
+
+    const errors = {
+        ...(transaction?.errorFields?.route ?? transaction?.errors),
+        ...parentReportAction?.errors,
+    };
+
+    const tagList = policyTagLists.map(({name, orderWeight, tags}, index) => {
+        const tagForDisplay = TransactionUtils.getTagForDisplay(updatedTransaction ?? transaction, index);
+        const shouldShow = !!tagForDisplay || OptionsListUtils.hasEnabledOptions(tags);
+        if (!shouldShow) {
+            return null;
+        }
+
+        const tagError = getErrorForField(
+            'tag',
+            {
+                tagListIndex: index,
+                tagListName: name,
+            },
+            PolicyUtils.hasDependentTags(policy, policyTagList),
+            tagForDisplay,
+        );
+        return (
+            <OfflineWithFeedback
+                key={name}
+                pendingAction={getPendingFieldAction('tag')}
+            >
+                <MenuItemWithTopDescription
+                    description={name ?? translate('common.tag')}
+                    title={tagForDisplay}
+                    interactive={canEdit}
+                    shouldShowRightIcon={canEdit}
+                    titleStyle={styles.flex1}
+                    onPress={() =>
+                        Navigation.navigate(ROUTES.MONEY_REQUEST_STEP_TAG.getRoute(CONST.IOU.ACTION.EDIT, iouType, orderWeight, transaction?.transactionID ?? '', report?.reportID ?? '-1'))
+                    }
+                    brickRoadIndicator={tagError ? CONST.BRICK_ROAD_INDICATOR_STATUS.ERROR : undefined}
+                    errorText={tagError}
+                />
+            </OfflineWithFeedback>
+        );
+    });
 
     return (
-        <View style={[StyleUtils.getReportWelcomeContainerStyle(isSmallScreenWidth, true, shouldShowAnimatedBackground)]}>
+        <View style={styles.pRelative}>
             {shouldShowAnimatedBackground && <AnimatedEmptyStateBackground />}
-            <View style={shouldShowAnimatedBackground && [StyleUtils.getReportWelcomeTopMarginStyle(isSmallScreenWidth, true)]}>
-                {!isInvoice && (
-                    <ReceiptAuditHeader
-                        notes={noticeTypeViolations}
-                        shouldShowAuditMessage={Boolean(shouldShowNotesViolations && didRceiptScanSucceed)}
+            <>
+                {shouldShowReceiptAudit && (
+                    <ReceiptAudit
+                        notes={receiptViolations}
+                        shouldShowAuditResult={shouldShowAuditMessage}
                     />
                 )}
-                {shouldShowMapOrReceipt && (
+                {(hasReceipt || errors) && (
                     <OfflineWithFeedback
                         pendingAction={pendingAction}
-                        errors={transaction?.errors}
-                        errorRowStyles={[styles.ml4]}
+                        errors={errors}
+                        errorRowStyles={[styles.mh4]}
                         onClose={() => {
-                            if (!transaction?.transactionID) {
+                            if (!transaction?.transactionID && linkedTransactionID === '-1') {
+                                return;
+                            }
+
+                            const isCreateChatErrored = !!report?.errorFields?.createChat;
+                            if ((isCreateChatErrored || !!report?.isOptimisticReport) && parentReportAction) {
+                                const urlToNavigateBack = IOU.cleanUpMoneyRequest(transaction?.transactionID ?? linkedTransactionID, parentReportAction, true);
+                                Navigation.goBack(urlToNavigateBack);
                                 return;
                             }
-                            Transaction.clearError(transaction.transactionID);
+
+                            if (transaction?.pendingAction === CONST.RED_BRICK_ROAD_PENDING_ACTION.ADD) {
+                                if (chatReport?.reportID && ReportUtils.getAddWorkspaceRoomOrChatReportErrors(chatReport)) {
+                                    Report.navigateToConciergeChatAndDeleteReport(chatReport.reportID, true, true);
+                                    return;
+                                }
+                                if (Object.values(transaction?.errors ?? {})?.find((error) => ErrorUtils.isReceiptError(error))) {
+                                    deleteTransaction(parentReport, parentReportAction);
+                                }
+                            }
+                            Transaction.clearError(transaction?.transactionID ?? linkedTransactionID);
+                            ReportActions.clearAllRelatedReportActionErrors(report?.reportID ?? '-1', parentReportAction);
                         }}
                     >
-                        <View style={styles.moneyRequestViewImage}>
-                            {showMapAsImage ? (
-                                <ConfirmedRoute
-                                    transaction={transaction}
-                                    interactive={false}
-                                />
-                            ) : (
+                        {hasReceipt && (
+                            <View style={styles.moneyRequestViewImage}>
                                 <ReportActionItemImage
                                     thumbnail={receiptURIs?.thumbnail}
                                     fileExtension={receiptURIs?.fileExtension}
@@ -370,9 +498,10 @@ function MoneyRequestView({
                                     filename={receiptURIs?.filename}
                                     transaction={transaction}
                                     enablePreviewModal
+                                    readonly={readonly}
                                 />
-                            )}
-                        </View>
+                            </View>
+                        )}
                     </OfflineWithFeedback>
                 )}
                 {shouldShowReceiptEmptyState && (
@@ -384,18 +513,17 @@ function MoneyRequestView({
                                 ROUTES.MONEY_REQUEST_STEP_SCAN.getRoute(
                                     CONST.IOU.ACTION.EDIT,
                                     iouType,
-                                    transaction?.transactionID ?? '',
-                                    report.reportID,
+                                    transaction?.transactionID ?? '-1',
+                                    report?.reportID ?? '-1',
                                     Navigation.getActiveRouteWithoutParams(),
                                 ),
                             )
                         }
                     />
                 )}
-                {!shouldShowReceiptEmptyState && !shouldShowMapOrReceipt && <View style={{marginVertical: 6}} />}
-                {shouldShowNotesViolations && <ReceiptAuditMessages notes={noticeTypeViolations} />}
-                {canUseViolations && <ViolationMessages violations={getViolationsForField('receipt')} />}
-                <OfflineWithFeedback pendingAction={getPendingFieldAction('amount')}>
+                {!shouldShowReceiptEmptyState && !hasReceipt && <View style={{marginVertical: 6}} />}
+                {shouldShowAuditMessage && <ReceiptAuditMessages notes={receiptImageViolations} />}
+                <OfflineWithFeedback pendingAction={getPendingFieldAction('amount') ?? (amountTitle ? getPendingFieldAction('customUnitRateID') : undefined)}>
                     <MenuItemWithTopDescription
                         title={amountTitle}
                         shouldShowTitleIcon={isSettled}
@@ -404,23 +532,27 @@ function MoneyRequestView({
                         titleStyle={styles.textHeadlineH2}
                         interactive={canEditAmount}
                         shouldShowRightIcon={canEditAmount}
-                        onPress={() => Navigation.navigate(ROUTES.MONEY_REQUEST_STEP_AMOUNT.getRoute(CONST.IOU.ACTION.EDIT, iouType, transaction?.transactionID ?? '', report.reportID))}
+                        onPress={() =>
+                            Navigation.navigate(ROUTES.MONEY_REQUEST_STEP_AMOUNT.getRoute(CONST.IOU.ACTION.EDIT, iouType, transaction?.transactionID ?? '-1', report?.reportID ?? '-1'))
+                        }
                         brickRoadIndicator={getErrorForField('amount') ? CONST.BRICK_ROAD_INDICATOR_STATUS.ERROR : undefined}
-                        error={getErrorForField('amount')}
+                        errorText={getErrorForField('amount')}
                     />
                 </OfflineWithFeedback>
                 <OfflineWithFeedback pendingAction={getPendingFieldAction('comment')}>
                     <MenuItemWithTopDescription
                         description={translate('common.description')}
                         shouldParseTitle
-                        title={transactionDescription}
+                        title={updatedTransactionDescription ?? transactionDescription}
                         interactive={canEdit}
                         shouldShowRightIcon={canEdit}
                         titleStyle={styles.flex1}
-                        onPress={() => Navigation.navigate(ROUTES.MONEY_REQUEST_STEP_DESCRIPTION.getRoute(CONST.IOU.ACTION.EDIT, iouType, transaction?.transactionID ?? '', report.reportID))}
+                        onPress={() =>
+                            Navigation.navigate(ROUTES.MONEY_REQUEST_STEP_DESCRIPTION.getRoute(CONST.IOU.ACTION.EDIT, iouType, transaction?.transactionID ?? '-1', report?.reportID ?? '-1'))
+                        }
                         wrapperStyle={[styles.pv2, styles.taskDescriptionMenuItem]}
                         brickRoadIndicator={getErrorForField('comment') ? CONST.BRICK_ROAD_INDICATOR_STATUS.ERROR : undefined}
-                        error={getErrorForField('comment')}
+                        errorText={getErrorForField('comment')}
                         numberOfLinesTitle={0}
                     />
                 </OfflineWithFeedback>
@@ -430,15 +562,17 @@ function MoneyRequestView({
                     <OfflineWithFeedback pendingAction={getPendingFieldAction('merchant')}>
                         <MenuItemWithTopDescription
                             description={translate('common.merchant')}
-                            title={merchantTitle}
+                            title={updatedTransaction?.modifiedMerchant ?? merchantTitle}
                             interactive={canEditMerchant}
                             shouldShowRightIcon={canEditMerchant}
                             titleStyle={styles.flex1}
                             onPress={() =>
-                                Navigation.navigate(ROUTES.MONEY_REQUEST_STEP_MERCHANT.getRoute(CONST.IOU.ACTION.EDIT, iouType, transaction?.transactionID ?? '', report.reportID))
+                                Navigation.navigate(ROUTES.MONEY_REQUEST_STEP_MERCHANT.getRoute(CONST.IOU.ACTION.EDIT, iouType, transaction?.transactionID ?? '-1', report?.reportID ?? '-1'))
                             }
+                            wrapperStyle={[styles.taskDescriptionMenuItem]}
                             brickRoadIndicator={getErrorForField('merchant') ? CONST.BRICK_ROAD_INDICATOR_STATUS.ERROR : undefined}
-                            error={getErrorForField('merchant')}
+                            errorText={getErrorForField('merchant')}
+                            numberOfLinesTitle={0}
                         />
                     </OfflineWithFeedback>
                 )}
@@ -449,57 +583,31 @@ function MoneyRequestView({
                         interactive={canEditDate}
                         shouldShowRightIcon={canEditDate}
                         titleStyle={styles.flex1}
-                        onPress={() => Navigation.navigate(ROUTES.MONEY_REQUEST_STEP_DATE.getRoute(CONST.IOU.ACTION.EDIT, iouType, transaction?.transactionID ?? '', report.reportID))}
+                        onPress={() =>
+                            Navigation.navigate(ROUTES.MONEY_REQUEST_STEP_DATE.getRoute(CONST.IOU.ACTION.EDIT, iouType, transaction?.transactionID ?? '-1', report?.reportID ?? '-1' ?? '-1'))
+                        }
                         brickRoadIndicator={getErrorForField('date') ? CONST.BRICK_ROAD_INDICATOR_STATUS.ERROR : undefined}
-                        error={getErrorForField('date')}
+                        errorText={getErrorForField('date')}
                     />
                 </OfflineWithFeedback>
                 {shouldShowCategory && (
                     <OfflineWithFeedback pendingAction={getPendingFieldAction('category')}>
                         <MenuItemWithTopDescription
                             description={translate('common.category')}
-                            title={transactionCategory}
+                            title={updatedTransaction?.category ?? transactionCategory}
                             interactive={canEdit}
                             shouldShowRightIcon={canEdit}
                             titleStyle={styles.flex1}
                             onPress={() =>
-                                Navigation.navigate(ROUTES.MONEY_REQUEST_STEP_CATEGORY.getRoute(CONST.IOU.ACTION.EDIT, iouType, transaction?.transactionID ?? '', report.reportID))
+                                Navigation.navigate(ROUTES.MONEY_REQUEST_STEP_CATEGORY.getRoute(CONST.IOU.ACTION.EDIT, iouType, transaction?.transactionID ?? '-1', report?.reportID ?? '-1'))
                             }
                             brickRoadIndicator={getErrorForField('category') ? CONST.BRICK_ROAD_INDICATOR_STATUS.ERROR : undefined}
-                            error={getErrorForField('category')}
+                            errorText={getErrorForField('category')}
                         />
                     </OfflineWithFeedback>
                 )}
-                {shouldShowTag &&
-                    policyTagLists.map(({name, orderWeight}, index) => (
-                        <OfflineWithFeedback
-                            key={name}
-                            pendingAction={getPendingFieldAction('tag')}
-                        >
-                            <MenuItemWithTopDescription
-                                description={name ?? translate('common.tag')}
-                                title={TransactionUtils.getTagForDisplay(transaction, index)}
-                                interactive={canEdit}
-                                shouldShowRightIcon={canEdit}
-                                titleStyle={styles.flex1}
-                                onPress={() =>
-                                    Navigation.navigate(
-                                        ROUTES.MONEY_REQUEST_STEP_TAG.getRoute(CONST.IOU.ACTION.EDIT, iouType, orderWeight, transaction?.transactionID ?? '', report.reportID),
-                                    )
-                                }
-                                brickRoadIndicator={
-                                    getErrorForField('tag', {
-                                        tagListIndex: index,
-                                        tagListName: name,
-                                    })
-                                        ? CONST.BRICK_ROAD_INDICATOR_STATUS.ERROR
-                                        : undefined
-                                }
-                                error={getErrorForField('tag', {tagListIndex: index, tagListName: name})}
-                            />
-                        </OfflineWithFeedback>
-                    ))}
-                {isCardTransaction && (
+                {shouldShowTag && tagList}
+                {shouldShowCard && (
                     <OfflineWithFeedback pendingAction={getPendingFieldAction('cardID')}>
                         <MenuItemWithTopDescription
                             description={translate('iou.card')}
@@ -514,32 +622,44 @@ function MoneyRequestView({
                         <MenuItemWithTopDescription
                             title={taxRateTitle ?? ''}
                             description={taxRatesDescription}
-                            interactive={canEdit}
-                            shouldShowRightIcon={canEdit}
+                            interactive={canEditTaxFields}
+                            shouldShowRightIcon={canEditTaxFields}
                             titleStyle={styles.flex1}
                             onPress={() =>
-                                Navigation.navigate(ROUTES.MONEY_REQUEST_STEP_TAX_RATE.getRoute(CONST.IOU.ACTION.EDIT, iouType, transaction?.transactionID ?? '', report.reportID))
+                                Navigation.navigate(ROUTES.MONEY_REQUEST_STEP_TAX_RATE.getRoute(CONST.IOU.ACTION.EDIT, iouType, transaction?.transactionID ?? '-1', report?.reportID ?? '-1'))
                             }
                             brickRoadIndicator={getErrorForField('tax') ? CONST.BRICK_ROAD_INDICATOR_STATUS.ERROR : undefined}
-                            error={getErrorForField('tax')}
+                            errorText={getErrorForField('tax')}
                         />
                     </OfflineWithFeedback>
                 )}
-
                 {shouldShowTax && (
                     <OfflineWithFeedback pendingAction={getPendingFieldAction('taxAmount')}>
                         <MenuItemWithTopDescription
                             title={formattedTaxAmount ? formattedTaxAmount.toString() : ''}
                             description={translate('iou.taxAmount')}
-                            interactive={canEdit}
-                            shouldShowRightIcon={canEdit}
+                            interactive={canEditTaxFields}
+                            shouldShowRightIcon={canEditTaxFields}
                             titleStyle={styles.flex1}
                             onPress={() =>
-                                Navigation.navigate(ROUTES.MONEY_REQUEST_STEP_TAX_AMOUNT.getRoute(CONST.IOU.ACTION.EDIT, iouType, transaction?.transactionID ?? '', report.reportID))
+                                Navigation.navigate(
+                                    ROUTES.MONEY_REQUEST_STEP_TAX_AMOUNT.getRoute(CONST.IOU.ACTION.EDIT, iouType, transaction?.transactionID ?? '-1', report?.reportID ?? '-1'),
+                                )
                             }
                         />
                     </OfflineWithFeedback>
                 )}
+                {shouldShowViewTripDetails && (
+                    <MenuItem
+                        title={translate('travel.viewTripDetails')}
+                        icon={Expensicons.Suitcase}
+                        iconRight={Expensicons.NewWindow}
+                        shouldShowRightIcon
+                        onPress={() => {
+                            Link.openTravelDotLink(activePolicyID, CONST.TRIP_ID_PATH(tripID));
+                        }}
+                    />
+                )}
                 {shouldShowBillable && (
                     <View style={[styles.flexRow, styles.optionRow, styles.justifyContentBetween, styles.alignItemsCenter, styles.ml5, styles.mr8]}>
                         <View>
@@ -555,13 +675,13 @@ function MoneyRequestView({
                         </View>
                         <Switch
                             accessibilityLabel={translate('common.billable')}
-                            isOn={!!transactionBillable}
+                            isOn={updatedTransaction?.billable ?? !!transactionBillable}
                             onToggle={saveBillable}
                             disabled={!canEdit}
                         />
                     </View>
                 )}
-            </View>
+            </>
         </View>
     );
 }
@@ -569,43 +689,31 @@ function MoneyRequestView({
 MoneyRequestView.displayName = 'MoneyRequestView';
 
 export default withOnyx<MoneyRequestViewPropsWithoutTransaction, MoneyRequestViewOnyxPropsWithoutTransaction>({
+    // Fallback to empty string will fetch the whole collection (e.g., policy_), so we need to fallback to -1 (policy_-1)
     policy: {
-        key: ({report}) => `${ONYXKEYS.COLLECTION.POLICY}${report.policyID}`,
+        key: ({report}) => `${ONYXKEYS.COLLECTION.POLICY}${report?.policyID ?? '-1'}`,
     },
     policyCategories: {
-        key: ({report}) => `${ONYXKEYS.COLLECTION.POLICY_CATEGORIES}${report.policyID}`,
+        key: ({report}) => `${ONYXKEYS.COLLECTION.POLICY_CATEGORIES}${report?.policyID ?? '-1'}`,
     },
     policyTagList: {
-        key: ({report}) => `${ONYXKEYS.COLLECTION.POLICY_TAGS}${report.policyID}`,
+        key: ({report}) => `${ONYXKEYS.COLLECTION.POLICY_TAGS}${report?.policyID ?? '-1'}`,
     },
     parentReport: {
-        key: ({report}) => `${ONYXKEYS.COLLECTION.REPORT}${report.parentReportID}`,
+        key: ({report}) => `${ONYXKEYS.COLLECTION.REPORT}${report?.parentReportID ?? '-1'}`,
     },
     parentReportActions: {
-        key: ({report}) => `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${report ? report.parentReportID : '0'}`,
+        key: ({report}) => `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${report ? report?.parentReportID : '-1'}`,
         canEvict: false,
     },
     distanceRates: {
-        key: ({report}) => `${ONYXKEYS.COLLECTION.POLICY}${report.policyID}`,
-        selector: DistanceRequestUtils.getMileageRates,
+        key: ({report}) => `${ONYXKEYS.COLLECTION.POLICY}${report?.policyID}`,
+        selector: (policy: OnyxEntry<OnyxTypes.Policy>) => DistanceRequestUtils.getMileageRates(policy, true),
     },
 })(
     withOnyx<MoneyRequestViewProps, MoneyRequestViewTransactionOnyxProps>({
-        transaction: {
-            key: ({report, parentReportActions}) => {
-                const parentReportAction = parentReportActions?.[report.parentReportActionID ?? ''];
-                const originalMessage = parentReportAction?.actionName === CONST.REPORT.ACTIONS.TYPE.IOU ? parentReportAction.originalMessage : undefined;
-                const transactionID = originalMessage?.IOUTransactionID ?? 0;
-                return `${ONYXKEYS.COLLECTION.TRANSACTION}${transactionID}`;
-            },
-        },
         transactionViolations: {
-            key: ({report, parentReportActions}) => {
-                const parentReportAction = parentReportActions?.[report.parentReportActionID ?? ''];
-                const originalMessage = parentReportAction?.actionName === CONST.REPORT.ACTIONS.TYPE.IOU ? parentReportAction.originalMessage : undefined;
-                const transactionID = originalMessage?.IOUTransactionID ?? 0;
-                return `${ONYXKEYS.COLLECTION.TRANSACTION_VIOLATIONS}${transactionID}`;
-            },
+            key: ({report, parentReportActions}) => `${ONYXKEYS.COLLECTION.TRANSACTION_VIOLATIONS}${getTransactionID(report, parentReportActions)}`,
         },
     })(MoneyRequestView),
 );
diff --git a/src/components/ReportActionItem/RenameAction.tsx b/src/components/ReportActionItem/RenameAction.tsx
deleted file mode 100644
index b4b2553d652a..000000000000
--- a/src/components/ReportActionItem/RenameAction.tsx
+++ /dev/null
@@ -1,37 +0,0 @@
-import React from 'react';
-import Text from '@components/Text';
-import withCurrentUserPersonalDetails from '@components/withCurrentUserPersonalDetails';
-import type {WithCurrentUserPersonalDetailsProps} from '@components/withCurrentUserPersonalDetails';
-import useLocalize from '@hooks/useLocalize';
-import useThemeStyles from '@hooks/useThemeStyles';
-import CONST from '@src/CONST';
-import type {ReportAction} from '@src/types/onyx';
-
-type RenameActionProps = WithCurrentUserPersonalDetailsProps & {
-    /** All the data of the action */
-    action: ReportAction;
-};
-
-function RenameAction({currentUserPersonalDetails, action}: RenameActionProps) {
-    const styles = useThemeStyles();
-    const {translate} = useLocalize();
-
-    const currentUserAccountID = currentUserPersonalDetails.accountID ?? '';
-    const userDisplayName = action.person?.[0]?.text;
-    const actorAccountID = action.actorAccountID ?? '';
-    const displayName = actorAccountID === currentUserAccountID ? `${translate('common.you')}` : `${userDisplayName}`;
-    const originalMessage = action.actionName === CONST.REPORT.ACTIONS.TYPE.RENAMED ? action.originalMessage : null;
-    const oldName = originalMessage?.oldName ?? '';
-    const newName = originalMessage?.newName ?? '';
-
-    return (
-        <Text style={[styles.pv3, styles.ph5, styles.textAlignCenter, styles.textLabelSupporting]}>
-            <Text style={[styles.textLabelSupporting, styles.textStrong, styles.textAlignCenter]}>{displayName}</Text>
-            {translate('newRoomPage.renamedRoomAction', {oldName, newName})}
-        </Text>
-    );
-}
-
-RenameAction.displayName = 'RenameAction';
-
-export default withCurrentUserPersonalDetails(RenameAction);
diff --git a/src/components/ReportActionItem/ReportActionItemImage.tsx b/src/components/ReportActionItem/ReportActionItemImage.tsx
index 4e7f123a2fb2..718b60828f62 100644
--- a/src/components/ReportActionItem/ReportActionItemImage.tsx
+++ b/src/components/ReportActionItem/ReportActionItemImage.tsx
@@ -1,8 +1,10 @@
 /* eslint-disable react/jsx-props-no-spreading */
-import Str from 'expensify-common/lib/str';
+import {Str} from 'expensify-common';
 import React from 'react';
 import type {ViewStyle} from 'react-native';
+import {View} from 'react-native';
 import type {OnyxEntry} from 'react-native-onyx';
+import ConfirmedRoute from '@components/ConfirmedRoute';
 import type {IconSize} from '@components/EReceiptThumbnail';
 import * as Expensicons from '@components/Icon/Expensicons';
 import PressableWithoutFocus from '@components/Pressable/PressableWithoutFocus';
@@ -18,6 +20,7 @@ import variables from '@styles/variables';
 import CONST from '@src/CONST';
 import ROUTES from '@src/ROUTES';
 import type {Transaction} from '@src/types/onyx';
+import {isEmptyObject} from '@src/types/utils/EmptyObject';
 
 type ReportActionItemImageProps = {
     /** thumbnail URI for the image */
@@ -46,6 +49,12 @@ type ReportActionItemImageProps = {
 
     /** Whether there are other images displayed in the same parent container */
     isSingleImage?: boolean;
+
+    /** Whether the map view should have border radius  */
+    shouldMapHaveBorderRadius?: boolean;
+
+    /** Whether the receipt is not editable */
+    readonly?: boolean;
 };
 
 /**
@@ -64,13 +73,33 @@ function ReportActionItemImage({
     fileExtension,
     filename,
     isSingleImage = true,
+    readonly = false,
+    shouldMapHaveBorderRadius,
 }: ReportActionItemImageProps) {
     const styles = useThemeStyles();
     const {translate} = useLocalize();
+    const isDistanceRequest = !!transaction && TransactionUtils.isDistanceRequest(transaction);
+    const hasPendingWaypoints = transaction && TransactionUtils.isFetchingWaypointsFromServer(transaction);
+    const hasErrors = !isEmptyObject(transaction?.errors) || !isEmptyObject(transaction?.errorFields);
+    const showMapAsImage = isDistanceRequest && (hasErrors || hasPendingWaypoints);
+
+    if (showMapAsImage) {
+        return (
+            <View style={[styles.w100, styles.h100]}>
+                <ConfirmedRoute
+                    transaction={transaction}
+                    isSmallerIcon={!isSingleImage}
+                    shouldHaveBorderRadius={shouldMapHaveBorderRadius}
+                    interactive={false}
+                    requireRouteToDisplayMap
+                />
+            </View>
+        );
+    }
+
     const attachmentModalSource = tryResolveUrlFromApiRoot(image ?? '');
     const thumbnailSource = tryResolveUrlFromApiRoot(thumbnail ?? '');
     const isEReceipt = transaction && TransactionUtils.hasEReceipt(transaction);
-    const isDistanceRequest = Boolean(transaction && TransactionUtils.isDistanceRequest(transaction));
 
     let propsObj: ReceiptImageProps;
 
@@ -105,7 +134,9 @@ function ReportActionItemImage({
                     <PressableWithoutFocus
                         style={[styles.w100, styles.h100, styles.noOutline as ViewStyle]}
                         onPress={() =>
-                            Navigation.navigate(ROUTES.TRANSACTION_RECEIPT.getRoute(transactionThreadReport?.reportID ?? report?.reportID ?? '', transaction?.transactionID ?? ''))
+                            Navigation.navigate(
+                                ROUTES.TRANSACTION_RECEIPT.getRoute(transactionThreadReport?.reportID ?? report?.reportID ?? '-1', transaction?.transactionID ?? '-1', readonly),
+                            )
                         }
                         accessibilityLabel={translate('accessibilityHints.viewAttachment')}
                         accessibilityRole={CONST.ROLE.BUTTON}
diff --git a/src/components/ReportActionItem/ReportActionItemImages.tsx b/src/components/ReportActionItem/ReportActionItemImages.tsx
index e2bcce9b9f1b..f27596556c53 100644
--- a/src/components/ReportActionItem/ReportActionItemImages.tsx
+++ b/src/components/ReportActionItem/ReportActionItemImages.tsx
@@ -2,6 +2,7 @@
 import React from 'react';
 import {View} from 'react-native';
 import {Polygon, Svg} from 'react-native-svg';
+import {ImageBehaviorContextProvider} from '@components/Image/ImageBehaviorContextProvider';
 import Text from '@components/Text';
 import useStyleUtils from '@hooks/useStyleUtils';
 import useTheme from '@hooks/useTheme';
@@ -65,28 +66,31 @@ function ReportActionItemImages({images, size, total, isHovered = false}: Report
     return (
         <View style={styles.reportActionItemImagesContainer}>
             <View style={[styles.reportActionItemImages, hoverStyle, heightStyle]}>
-                {shownImages.map(({thumbnail, isThumbnail, image, transaction, isLocalFile, fileExtension, filename}, index) => {
-                    // Show a border to separate multiple images. Shown to the right for each except the last.
-                    const shouldShowBorder = shownImages.length > 1 && index < shownImages.length - 1;
-                    const borderStyle = shouldShowBorder ? styles.reportActionItemImageBorder : {};
-                    return (
-                        <View
-                            key={`${index}-${image}`}
-                            style={[styles.reportActionItemImage, borderStyle, hoverStyle]}
-                        >
-                            <ReportActionItemImage
-                                thumbnail={thumbnail}
-                                fileExtension={fileExtension}
-                                image={image}
-                                isLocalFile={isLocalFile}
-                                filename={filename}
-                                transaction={transaction}
-                                isThumbnail={isThumbnail}
-                                isSingleImage={numberOfShownImages === 1}
-                            />
-                        </View>
-                    );
-                })}
+                <ImageBehaviorContextProvider shouldSetAspectRatioInStyle={false}>
+                    {shownImages.map(({thumbnail, isThumbnail, image, transaction, isLocalFile, fileExtension, filename}, index) => {
+                        // Show a border to separate multiple images. Shown to the right for each except the last.
+                        const shouldShowBorder = shownImages.length > 1 && index < shownImages.length - 1;
+                        const borderStyle = shouldShowBorder ? styles.reportActionItemImageBorder : {};
+                        return (
+                            <View
+                                key={`${index}-${image}`}
+                                style={[styles.reportActionItemImage, borderStyle, hoverStyle]}
+                            >
+                                <ReportActionItemImage
+                                    thumbnail={thumbnail}
+                                    fileExtension={fileExtension}
+                                    image={image}
+                                    isLocalFile={isLocalFile}
+                                    filename={filename}
+                                    transaction={transaction}
+                                    isThumbnail={isThumbnail}
+                                    isSingleImage={numberOfShownImages === 1}
+                                    shouldMapHaveBorderRadius={false}
+                                />
+                            </View>
+                        );
+                    })}
+                </ImageBehaviorContextProvider>
             </View>
             {remaining > 0 && (
                 <View style={[styles.reportActionItemImagesMoreContainer]}>
diff --git a/src/components/ReportActionItem/ReportPreview.tsx b/src/components/ReportActionItem/ReportPreview.tsx
index 54f9f1aa081f..ad29a8d84141 100644
--- a/src/components/ReportActionItem/ReportPreview.tsx
+++ b/src/components/ReportActionItem/ReportPreview.tsx
@@ -1,36 +1,45 @@
-import React, {useMemo} from 'react';
+import truncate from 'lodash/truncate';
+import React, {useMemo, useState} from 'react';
 import type {StyleProp, ViewStyle} from 'react-native';
 import {View} from 'react-native';
 import type {OnyxCollection, OnyxEntry} from 'react-native-onyx';
-import {withOnyx} from 'react-native-onyx';
+import {useOnyx, withOnyx} from 'react-native-onyx';
 import Button from '@components/Button';
 import Icon from '@components/Icon';
 import * as Expensicons from '@components/Icon/Expensicons';
 import OfflineWithFeedback from '@components/OfflineWithFeedback';
 import PressableWithoutFeedback from '@components/Pressable/PressableWithoutFeedback';
+import ProcessMoneyReportHoldMenu from '@components/ProcessMoneyReportHoldMenu';
+import type {ActionHandledType} from '@components/ProcessMoneyReportHoldMenu';
 import SettlementButton from '@components/SettlementButton';
 import {showContextMenuForReport} from '@components/ShowContextMenuContext';
 import Text from '@components/Text';
 import useLocalize from '@hooks/useLocalize';
-import usePermissions from '@hooks/usePermissions';
+import useNetwork from '@hooks/useNetwork';
 import useTheme from '@hooks/useTheme';
 import useThemeStyles from '@hooks/useThemeStyles';
 import ControlSelection from '@libs/ControlSelection';
 import * as CurrencyUtils from '@libs/CurrencyUtils';
 import * as DeviceCapabilities from '@libs/DeviceCapabilities';
 import Navigation from '@libs/Navigation/Navigation';
+import * as PolicyUtils from '@libs/PolicyUtils';
 import * as ReceiptUtils from '@libs/ReceiptUtils';
-import * as ReportActionUtils from '@libs/ReportActionsUtils';
+import * as ReportActionsUtils from '@libs/ReportActionsUtils';
 import * as ReportUtils from '@libs/ReportUtils';
+import StringUtils from '@libs/StringUtils';
 import * as TransactionUtils from '@libs/TransactionUtils';
 import type {ContextMenuAnchor} from '@pages/home/report/ContextMenu/ReportActionContextMenu';
+import variables from '@styles/variables';
 import * as IOU from '@userActions/IOU';
+import Timing from '@userActions/Timing';
 import CONST from '@src/CONST';
 import type {TranslationPaths} from '@src/languages/types';
 import ONYXKEYS from '@src/ONYXKEYS';
 import ROUTES from '@src/ROUTES';
 import type {Policy, Report, ReportAction, Transaction, TransactionViolations, UserWallet} from '@src/types/onyx';
 import type {PaymentMethodType} from '@src/types/onyx/OriginalMessage';
+import ExportWithDropdownMenu from './ExportWithDropdownMenu';
+import type {PendingMessageProps} from './MoneyRequestPreview/types';
 import ReportActionItemImages from './ReportActionItemImages';
 
 type ReportPreviewOnyxProps = {
@@ -75,6 +84,12 @@ type ReportPreviewProps = ReportPreviewOnyxProps & {
     /** Callback for updating context menu active state, used for showing context menu */
     checkIfContextMenuActive?: () => void;
 
+    /** Callback when the payment options popover is shown */
+    onPaymentOptionsShow?: () => void;
+
+    /** Callback when the payment options popover is closed */
+    onPaymentOptionsHide?: () => void;
+
     /** Whether a message is a whisper */
     isWhisper?: boolean;
 
@@ -97,12 +112,15 @@ function ReportPreview({
     isHovered = false,
     isWhisper = false,
     checkIfContextMenuActive = () => {},
+    onPaymentOptionsShow,
+    onPaymentOptionsHide,
     userWallet,
 }: ReportPreviewProps) {
     const theme = useTheme();
     const styles = useThemeStyles();
     const {translate} = useLocalize();
-    const {canUseViolations} = usePermissions();
+    const {isOffline} = useNetwork();
+    const allTransactions = useMemo(() => TransactionUtils.getAllReportTransactions(iouReportID, transactions), [iouReportID, transactions]);
 
     const {hasMissingSmartscanFields, areAllRequestsBeingSmartScanned, hasOnlyTransactionsWithPendingRoutes, hasNonReimbursableTransactions} = useMemo(
         () => ({
@@ -112,32 +130,50 @@ function ReportPreview({
             hasNonReimbursableTransactions: ReportUtils.hasNonReimbursableTransactions(iouReportID),
         }),
         // When transactions get updated these status may have changed, so that is a case where we also want to run this.
-        // eslint-disable-next-line react-hooks/exhaustive-deps
+        // eslint-disable-next-line react-compiler/react-compiler, react-hooks/exhaustive-deps
         [transactions, iouReportID, action],
     );
 
-    const managerID = iouReport?.managerID ?? 0;
+    const [isHoldMenuVisible, setIsHoldMenuVisible] = useState(false);
+    const [requestType, setRequestType] = useState<ActionHandledType>();
+    const [nonHeldAmount, fullAmount] = ReportUtils.getNonHeldAndFullAmount(iouReport, policy);
+    const hasOnlyHeldExpenses = ReportUtils.hasOnlyHeldExpenses(iouReport?.reportID ?? '');
+    const [paymentType, setPaymentType] = useState<PaymentMethodType>();
+    const [invoiceReceiverPolicy] = useOnyx(
+        `${ONYXKEYS.COLLECTION.POLICY}${chatReport?.invoiceReceiver && 'policyID' in chatReport.invoiceReceiver ? chatReport.invoiceReceiver.policyID : -1}`,
+    );
+
+    const managerID = iouReport?.managerID ?? action.childManagerAccountID ?? 0;
     const {totalDisplaySpend, reimbursableSpend} = ReportUtils.getMoneyRequestSpendBreakdown(iouReport);
 
-    const iouSettled = ReportUtils.isSettled(iouReportID);
-    const numberOfRequests = ReportActionUtils.getNumberOfMoneyRequests(action);
+    const iouSettled = ReportUtils.isSettled(iouReportID) || action?.childStatusNum === CONST.REPORT.STATUS_NUM.REIMBURSED;
+
     const moneyRequestComment = action?.childLastMoneyRequestComment ?? '';
     const isPolicyExpenseChat = ReportUtils.isPolicyExpenseChat(chatReport);
+    const isInvoiceRoom = ReportUtils.isInvoiceRoom(chatReport);
     const isOpenExpenseReport = isPolicyExpenseChat && ReportUtils.isOpenExpenseReport(iouReport);
 
-    const isApproved = ReportUtils.isReportApproved(iouReport);
+    const isApproved = ReportUtils.isReportApproved(iouReport, action);
     const canAllowSettlement = ReportUtils.hasUpdatedTotal(iouReport, policy);
-    const allTransactions = TransactionUtils.getAllReportTransactions(iouReportID);
+    const numberOfRequests = allTransactions.length;
     const transactionsWithReceipts = ReportUtils.getTransactionsWithReceipts(iouReportID);
     const numberOfScanningReceipts = transactionsWithReceipts.filter((transaction) => TransactionUtils.isReceiptBeingScanned(transaction)).length;
     const numberOfPendingRequests = transactionsWithReceipts.filter((transaction) => TransactionUtils.isPending(transaction) && TransactionUtils.isCardTransaction(transaction)).length;
 
     const hasReceipts = transactionsWithReceipts.length > 0;
     const isScanning = hasReceipts && areAllRequestsBeingSmartScanned;
-    // eslint-disable-next-line @typescript-eslint/prefer-nullish-coalescing
-    const hasErrors = hasMissingSmartscanFields || (canUseViolations && ReportUtils.hasViolations(iouReportID, transactionViolations)) || ReportUtils.hasActionsWithErrors(iouReportID);
+    const hasErrors =
+        (hasMissingSmartscanFields && !iouSettled) ||
+        // eslint-disable-next-line @typescript-eslint/prefer-nullish-coalescing
+        ReportUtils.hasViolations(iouReportID, transactionViolations) ||
+        ReportUtils.hasWarningTypeViolations(iouReportID, transactionViolations) ||
+        (ReportUtils.isReportOwner(iouReport) && ReportUtils.hasReportViolations(iouReportID)) ||
+        ReportUtils.hasActionsWithErrors(iouReportID);
     const lastThreeTransactionsWithReceipts = transactionsWithReceipts.slice(-3);
-    const lastThreeReceipts = lastThreeTransactionsWithReceipts.map((transaction) => ReceiptUtils.getThumbnailAndImageURIs(transaction));
+    const lastThreeReceipts = lastThreeTransactionsWithReceipts.map((transaction) => ({...ReceiptUtils.getThumbnailAndImageURIs(transaction), transaction}));
+    const showRTERViolationMessage =
+        numberOfRequests === 1 &&
+        TransactionUtils.hasPendingUI(allTransactions[0], TransactionUtils.getTransactionViolations(allTransactions[0]?.transactionID ?? '-1', transactionViolations));
 
     let formattedMerchant = numberOfRequests === 1 ? TransactionUtils.getMerchant(allTransactions[0]) : null;
     const formattedDescription = numberOfRequests === 1 ? TransactionUtils.getDescription(allTransactions[0]) : null;
@@ -146,7 +182,7 @@ function ReportPreview({
         formattedMerchant = null;
     }
 
-    const shouldShowSubmitButton = isOpenExpenseReport && reimbursableSpend !== 0;
+    const shouldShowSubmitButton = isOpenExpenseReport && reimbursableSpend !== 0 && !showRTERViolationMessage;
     const shouldDisableSubmitButton = shouldShowSubmitButton && !ReportUtils.isAllowedToSubmitDraftExpenseReport(iouReport);
 
     // The submit button should be success green colour only if the user is submitter and the policy does not have Scheduled Submit turned on
@@ -155,6 +191,44 @@ function ReportPreview({
         [chatReport?.isOwnPolicyExpenseChat, policy?.harvesting?.enabled],
     );
 
+    const confirmPayment = (type: PaymentMethodType | undefined, payAsBusiness?: boolean) => {
+        if (!type) {
+            return;
+        }
+        setPaymentType(type);
+        setRequestType(CONST.IOU.REPORT_ACTION_TYPE.PAY);
+        if (ReportUtils.hasHeldExpenses(iouReport?.reportID)) {
+            setIsHoldMenuVisible(true);
+        } else if (chatReport && iouReport) {
+            if (ReportUtils.isInvoiceReport(iouReport)) {
+                IOU.payInvoice(type, chatReport, iouReport, payAsBusiness);
+            } else {
+                IOU.payMoneyRequest(type, chatReport, iouReport);
+            }
+        }
+    };
+
+    const confirmApproval = () => {
+        setRequestType(CONST.IOU.REPORT_ACTION_TYPE.APPROVE);
+        if (ReportUtils.hasHeldExpenses(iouReport?.reportID)) {
+            setIsHoldMenuVisible(true);
+        } else {
+            IOU.approveMoneyRequest(iouReport, true);
+        }
+    };
+
+    const getSettlementAmount = () => {
+        if (hasOnlyHeldExpenses) {
+            return '';
+        }
+
+        if (ReportUtils.hasHeldExpenses(iouReport?.reportID) && canAllowSettlement) {
+            return nonHeldAmount;
+        }
+
+        return CurrencyUtils.convertToDisplayString(reimbursableSpend, iouReport?.currency);
+    };
+
     const getDisplayAmount = (): string => {
         if (totalDisplaySpend) {
             return CurrencyUtils.convertToDisplayString(totalDisplaySpend, iouReport?.currency);
@@ -168,7 +242,7 @@ function ReportPreview({
 
         // If iouReport is not available, get amount from the action message (Ex: "Domain20821's Workspace owes $33.00" or "paid ₫60" or "paid -₫60 elsewhere")
         let displayAmount = '';
-        const actionMessage = action.message?.[0]?.text ?? '';
+        const actionMessage = ReportActionsUtils.getReportActionText(action);
         const splits = actionMessage.split(' ');
 
         splits.forEach((split) => {
@@ -182,11 +256,32 @@ function ReportPreview({
         return displayAmount;
     };
 
+    // We're using this function to check if the parsed result of getDisplayAmount equals
+    // to 0 in order to hide the subtitle (merchant / description) when the expense
+    // is removed from OD report and display amount changes to 0 (any currency)
+    function isDisplayAmountZero(displayAmount: string) {
+        if (!displayAmount || displayAmount === '') {
+            return false;
+        }
+        const numericPart = displayAmount.replace(/[^\d.-]/g, '');
+        const amount = parseFloat(numericPart);
+        return !Number.isNaN(amount) && amount === 0;
+    }
+
     const getPreviewMessage = () => {
         if (isScanning) {
             return translate('common.receipt');
         }
-        let payerOrApproverName = isPolicyExpenseChat ? ReportUtils.getPolicyName(chatReport) : ReportUtils.getDisplayNameForParticipant(managerID, true);
+
+        let payerOrApproverName;
+        if (isPolicyExpenseChat) {
+            payerOrApproverName = ReportUtils.getPolicyName(chatReport);
+        } else if (isInvoiceRoom) {
+            payerOrApproverName = ReportUtils.getInvoicePayerName(chatReport, invoiceReceiverPolicy);
+        } else {
+            payerOrApproverName = ReportUtils.getDisplayNameForParticipant(managerID, true);
+        }
+
         if (isApproved) {
             return translate('iou.managerApproved', {manager: payerOrApproverName});
         }
@@ -202,16 +297,16 @@ function ReportPreview({
 
     const bankAccountRoute = ReportUtils.getBankAccountRoute(chatReport);
 
-    const shouldShowPayButton = useMemo(() => IOU.canIOUBePaid(iouReport, chatReport, policy), [iouReport, chatReport, policy]);
+    const shouldShowPayButton = useMemo(() => IOU.canIOUBePaid(iouReport, chatReport, policy, allTransactions), [iouReport, chatReport, policy, allTransactions]);
 
-    const shouldShowApproveButton = useMemo(() => IOU.canApproveIOU(iouReport, chatReport, policy), [iouReport, chatReport, policy]);
+    const shouldShowApproveButton = useMemo(() => IOU.canApproveIOU(iouReport, policy), [iouReport, policy]);
 
     const shouldDisableApproveButton = shouldShowApproveButton && !ReportUtils.isAllowedToApproveExpenseReport(iouReport);
 
-    const shouldShowSettlementButton = !ReportUtils.isInvoiceReport(iouReport) && (shouldShowPayButton || shouldShowApproveButton);
+    const shouldShowSettlementButton = (shouldShowPayButton || shouldShowApproveButton) && !showRTERViolationMessage;
 
     const shouldPromptUserToAddBankAccount = ReportUtils.hasMissingPaymentMethod(userWallet, iouReportID);
-    const shouldShowRBR = !iouSettled && hasErrors;
+    const shouldShowRBR = hasErrors;
 
     /*
      Show subtitle if at least one of the expenses is not being smart scanned, and either:
@@ -223,24 +318,68 @@ function ReportPreview({
      */
     const shouldShowSingleRequestMerchantOrDescription =
         numberOfRequests === 1 && (!!formattedMerchant || !!formattedDescription) && !(hasOnlyTransactionsWithPendingRoutes && !totalDisplaySpend);
-    const shouldShowSubtitle = !isScanning && (shouldShowSingleRequestMerchantOrDescription || numberOfRequests > 1);
+    const shouldShowSubtitle = !isScanning && (shouldShowSingleRequestMerchantOrDescription || numberOfRequests > 1) && !isDisplayAmountZero(getDisplayAmount());
+    const shouldShowScanningSubtitle = numberOfScanningReceipts === 1 && numberOfRequests === 1;
+    const shouldShowPendingSubtitle = numberOfPendingRequests === 1 && numberOfRequests === 1;
+
+    const isPayAtEndExpense = ReportUtils.isPayAtEndExpenseReport(iouReportID, allTransactions);
+    const isArchivedReport = ReportUtils.isArchivedRoomWithID(iouReportID);
+    const [archiveReason] = useOnyx(`${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${iouReportID}`, {selector: ReportUtils.getArchiveReason});
+
+    const getPendingMessageProps: () => PendingMessageProps = () => {
+        if (isPayAtEndExpense) {
+            if (!isArchivedReport) {
+                return {shouldShow: true, messageIcon: Expensicons.Hourglass, messageDescription: translate('iou.bookingPending')};
+            }
+            if (isArchivedReport && archiveReason === CONST.REPORT.ARCHIVE_REASON.BOOKING_END_DATE_HAS_PASSED) {
+                return {
+                    shouldShow: true,
+                    messageIcon: Expensicons.Box,
+                    messageDescription: translate('iou.bookingArchived'),
+                };
+            }
+        }
+        if (shouldShowScanningSubtitle) {
+            return {shouldShow: true, messageIcon: Expensicons.ReceiptScan, messageDescription: translate('iou.receiptScanInProgress')};
+        }
+        if (shouldShowPendingSubtitle) {
+            return {shouldShow: true, messageIcon: Expensicons.CreditCardHourglass, messageDescription: translate('iou.transactionPending')};
+        }
+        if (showRTERViolationMessage) {
+            return {shouldShow: true, messageIcon: Expensicons.Hourglass, messageDescription: translate('iou.pendingMatchWithCreditCard')};
+        }
+        return {shouldShow: false};
+    };
+
+    const pendingMessageProps = getPendingMessageProps();
 
     const {supportText} = useMemo(() => {
-        if (formattedMerchant) {
-            return {supportText: formattedMerchant};
+        if (formattedMerchant && formattedMerchant !== CONST.TRANSACTION.DEFAULT_MERCHANT && formattedMerchant !== CONST.TRANSACTION.PARTIAL_TRANSACTION_MERCHANT) {
+            return {supportText: truncate(formattedMerchant, {length: CONST.REQUEST_PREVIEW.MAX_LENGTH})};
         }
         if (formattedDescription ?? moneyRequestComment) {
-            return {supportText: formattedDescription ?? moneyRequestComment};
+            return {supportText: truncate(StringUtils.lineBreaksToSpaces(formattedDescription ?? moneyRequestComment), {length: CONST.REQUEST_PREVIEW.MAX_LENGTH})};
+        }
+        if (formattedMerchant === CONST.TRANSACTION.DEFAULT_MERCHANT) {
+            return {supportText: formattedMerchant};
         }
         return {
             supportText: translate('iou.expenseCount', {
-                count: numberOfRequests - numberOfScanningReceipts - numberOfPendingRequests,
+                count: numberOfRequests,
                 scanningReceipts: numberOfScanningReceipts,
                 pendingReceipts: numberOfPendingRequests,
             }),
         };
     }, [formattedMerchant, formattedDescription, moneyRequestComment, translate, numberOfRequests, numberOfScanningReceipts, numberOfPendingRequests]);
 
+    /*
+     * Manual export
+     */
+    const connectedIntegration = PolicyUtils.getConnectedIntegration(policy);
+
+    const isAdmin = policy?.role === CONST.POLICY.ROLE.ADMIN;
+    const shouldShowExportIntegrationButton = !shouldShowPayButton && !shouldShowSubmitButton && connectedIntegration && isAdmin && ReportUtils.canBeExported(iouReport);
+
     return (
         <OfflineWithFeedback
             pendingAction={iouReport?.pendingFields?.preview}
@@ -250,6 +389,7 @@ function ReportPreview({
             <View style={[styles.chatItemMessage, containerStyles]}>
                 <PressableWithoutFeedback
                     onPress={() => {
+                        Timing.start(CONST.TIMING.OPEN_REPORT_FROM_PREVIEW);
                         Navigation.navigate(ROUTES.REPORT_WITH_ID.getRoute(iouReportID));
                     }}
                     onPressIn={() => DeviceCapabilities.canUseTouchScreen() && ControlSelection.block()}
@@ -293,7 +433,7 @@ function ReportPreview({
                                         <View style={styles.flexRow}>
                                             <View style={[styles.flex1, styles.flexRow, styles.alignItemsCenter]}>
                                                 <Text style={styles.textHeadlineH1}>{getDisplayAmount()}</Text>
-                                                {ReportUtils.isSettled(iouReportID) && (
+                                                {iouSettled && (
                                                     <View style={styles.defaultCheckmarkWrapper}>
                                                         <Icon
                                                             src={Expensicons.Checkmark}
@@ -310,15 +450,30 @@ function ReportPreview({
                                                 </View>
                                             </View>
                                         )}
+                                        {pendingMessageProps.shouldShow && (
+                                            <View style={[styles.flex1, styles.flexRow, styles.alignItemsCenter, styles.mt2]}>
+                                                <Icon
+                                                    src={pendingMessageProps.messageIcon}
+                                                    height={variables.iconSizeExtraSmall}
+                                                    width={variables.iconSizeExtraSmall}
+                                                    fill={theme.icon}
+                                                />
+                                                <Text style={[styles.textMicroSupporting, styles.ml1, styles.amountSplitPadding]}>{pendingMessageProps.messageDescription}</Text>
+                                            </View>
+                                        )}
                                     </View>
                                 </View>
                                 {shouldShowSettlementButton && (
                                     <SettlementButton
+                                        formattedAmount={getSettlementAmount() ?? ''}
                                         currency={iouReport?.currency}
                                         policyID={policyID}
                                         chatReportID={chatReportID}
                                         iouReport={iouReport}
-                                        onPress={(paymentType?: PaymentMethodType) => chatReport && iouReport && paymentType && IOU.payMoneyRequest(paymentType, chatReport, iouReport)}
+                                        onPress={confirmPayment}
+                                        onPaymentOptionsShow={onPaymentOptionsShow}
+                                        onPaymentOptionsHide={onPaymentOptionsHide}
+                                        confirmApproval={confirmApproval}
                                         enablePaymentsRoute={ROUTES.ENABLE_PAYMENTS}
                                         addBankAccountRoute={bankAccountRoute}
                                         shouldHidePaymentOptions={!shouldShowPayButton}
@@ -332,7 +487,19 @@ function ReportPreview({
                                             horizontal: CONST.MODAL.ANCHOR_ORIGIN_HORIZONTAL.RIGHT,
                                             vertical: CONST.MODAL.ANCHOR_ORIGIN_VERTICAL.BOTTOM,
                                         }}
-                                        isDisabled={!canAllowSettlement}
+                                        isDisabled={isOffline && !canAllowSettlement}
+                                        isLoading={!isOffline && !canAllowSettlement}
+                                    />
+                                )}
+                                {shouldShowExportIntegrationButton && !shouldShowSettlementButton && (
+                                    <ExportWithDropdownMenu
+                                        policy={policy}
+                                        report={iouReport}
+                                        connectionName={connectedIntegration}
+                                        dropdownAnchorAlignment={{
+                                            horizontal: CONST.MODAL.ANCHOR_ORIGIN_HORIZONTAL.RIGHT,
+                                            vertical: CONST.MODAL.ANCHOR_ORIGIN_VERTICAL.BOTTOM,
+                                        }}
                                     />
                                 )}
                                 {shouldShowSubmitButton && (
@@ -349,6 +516,19 @@ function ReportPreview({
                     </View>
                 </PressableWithoutFeedback>
             </View>
+            {isHoldMenuVisible && iouReport && requestType !== undefined && (
+                <ProcessMoneyReportHoldMenu
+                    nonHeldAmount={!hasOnlyHeldExpenses ? nonHeldAmount : undefined}
+                    requestType={requestType}
+                    fullAmount={fullAmount}
+                    onClose={() => setIsHoldMenuVisible(false)}
+                    isVisible={isHoldMenuVisible}
+                    paymentType={paymentType}
+                    chatReport={chatReport}
+                    moneyRequestReport={iouReport}
+                    transactionCount={numberOfRequests}
+                />
+            )}
         </OfflineWithFeedback>
     );
 }
diff --git a/src/components/ReportActionItem/TaskAction.tsx b/src/components/ReportActionItem/TaskAction.tsx
index e85a2e708feb..a782d3e9e051 100644
--- a/src/components/ReportActionItem/TaskAction.tsx
+++ b/src/components/ReportActionItem/TaskAction.tsx
@@ -18,7 +18,11 @@ function TaskAction({action}: TaskActionProps) {
 
     return (
         <View style={[styles.flex1, styles.flexRow, styles.alignItemsCenter, styles.breakWord, styles.preWrap]}>
-            {message.html ? <RenderHTML html={`<muted-text>${message.html}</muted-text>`} /> : <Text style={[styles.chatItemMessage, styles.colorMuted]}>{message.text}</Text>}
+            {message.html ? (
+                <RenderHTML html={`<comment><muted-text>${message.html}</muted-text></comment>`} />
+            ) : (
+                <Text style={[styles.chatItemMessage, styles.colorMuted]}>{message.text}</Text>
+            )}
         </View>
     );
 }
diff --git a/src/components/ReportActionItem/TaskPreview.tsx b/src/components/ReportActionItem/TaskPreview.tsx
index 8e8b3b930be7..ca1324a31fa7 100644
--- a/src/components/ReportActionItem/TaskPreview.tsx
+++ b/src/components/ReportActionItem/TaskPreview.tsx
@@ -1,4 +1,4 @@
-import Str from 'expensify-common/lib/str';
+import {Str} from 'expensify-common';
 import React from 'react';
 import {View} from 'react-native';
 import {withOnyx} from 'react-native-onyx';
@@ -72,9 +72,9 @@ function TaskPreview({taskReport, taskReportID, action, contextMenuAnchor, chatR
         ? taskReport?.stateNum === CONST.REPORT.STATE_NUM.APPROVED && taskReport.statusNum === CONST.REPORT.STATUS_NUM.APPROVED
         : action?.childStateNum === CONST.REPORT.STATE_NUM.APPROVED && action?.childStatusNum === CONST.REPORT.STATUS_NUM.APPROVED;
     const taskTitle = Str.htmlEncode(TaskUtils.getTaskTitle(taskReportID, action?.childReportName ?? ''));
-    const taskAssigneeAccountID = Task.getTaskAssigneeAccountID(taskReport) ?? action?.childManagerAccountID ?? '';
+    const taskAssigneeAccountID = Task.getTaskAssigneeAccountID(taskReport) ?? action?.childManagerAccountID ?? -1;
     const htmlForTaskPreview =
-        taskAssigneeAccountID !== 0 ? `<comment><mention-user accountid="${taskAssigneeAccountID}"></mention-user> ${taskTitle}</comment>` : `<comment>${taskTitle}</comment>`;
+        taskAssigneeAccountID > 0 ? `<comment><mention-user accountid="${taskAssigneeAccountID}"></mention-user> ${taskTitle}</comment>` : `<comment>${taskTitle}</comment>`;
     const isDeletedParentAction = ReportUtils.isCanceledTaskReport(taskReport, action);
 
     if (isDeletedParentAction) {
@@ -94,20 +94,22 @@ function TaskPreview({taskReport, taskReportID, action, contextMenuAnchor, chatR
                 accessibilityLabel={translate('task.task')}
             >
                 <View style={[styles.flex1, styles.flexRow, styles.alignItemsStart]}>
-                    <Checkbox
-                        style={[styles.mr2]}
-                        containerStyle={[styles.taskCheckbox]}
-                        isChecked={isTaskCompleted}
-                        disabled={!Task.canModifyTask(taskReport, currentUserPersonalDetails.accountID)}
-                        onPress={Session.checkIfActionIsAllowed(() => {
-                            if (isTaskCompleted) {
-                                Task.reopenTask(taskReport);
-                            } else {
-                                Task.completeTask(taskReport);
-                            }
-                        })}
-                        accessibilityLabel={translate('task.task')}
-                    />
+                    <View style={[styles.taskCheckboxWrapper]}>
+                        <Checkbox
+                            style={[styles.mr2]}
+                            containerStyle={[styles.taskCheckbox]}
+                            isChecked={isTaskCompleted}
+                            disabled={!Task.canModifyTask(taskReport, currentUserPersonalDetails.accountID)}
+                            onPress={Session.checkIfActionIsAllowed(() => {
+                                if (isTaskCompleted) {
+                                    Task.reopenTask(taskReport);
+                                } else {
+                                    Task.completeTask(taskReport);
+                                }
+                            })}
+                            accessibilityLabel={translate('task.task')}
+                        />
+                    </View>
                     <RenderHTML html={isTaskCompleted ? `<completed-task>${htmlForTaskPreview}</completed-task>` : htmlForTaskPreview} />
                 </View>
                 <Icon
diff --git a/src/components/ReportActionItem/TaskView.tsx b/src/components/ReportActionItem/TaskView.tsx
index ee3097e051b2..941e7cd5c610 100644
--- a/src/components/ReportActionItem/TaskView.tsx
+++ b/src/components/ReportActionItem/TaskView.tsx
@@ -22,6 +22,7 @@ import getButtonState from '@libs/getButtonState';
 import Navigation from '@libs/Navigation/Navigation';
 import * as OptionsListUtils from '@libs/OptionsListUtils';
 import * as ReportUtils from '@libs/ReportUtils';
+import * as TaskUtils from '@libs/TaskUtils';
 import * as Session from '@userActions/Session';
 import * as Task from '@userActions/Task';
 import CONST from '@src/CONST';
@@ -96,6 +97,10 @@ function TaskView({report, ...props}: TaskViewProps) {
                                     <View style={[styles.flexRow, styles.flex1]}>
                                         <Checkbox
                                             onPress={Session.checkIfActionIsAllowed(() => {
+                                                // If we're already navigating to these task editing pages, early return not to mark as completed, otherwise we would have not found page.
+                                                if (TaskUtils.isActiveTaskEditRoute(report.reportID)) {
+                                                    return;
+                                                }
                                                 if (isCompleted) {
                                                     Task.reopenTask(report);
                                                 } else {
@@ -135,7 +140,7 @@ function TaskView({report, ...props}: TaskViewProps) {
                 </Hoverable>
                 <OfflineWithFeedback pendingAction={report.pendingFields?.description}>
                     <MenuItemWithTopDescription
-                        shouldParseTitle
+                        shouldRenderAsHTML
                         description={translate('task.description')}
                         title={report.description ?? ''}
                         onPress={() => Navigation.navigate(ROUTES.REPORT_DESCRIPTION.getRoute(report.reportID))}
@@ -152,7 +157,7 @@ function TaskView({report, ...props}: TaskViewProps) {
                         <MenuItem
                             label={translate('task.assignee')}
                             title={ReportUtils.getDisplayNameForParticipant(report.managerID)}
-                            icon={OptionsListUtils.getAvatarsForAccountIDs(report.managerID ? [report.managerID] : [], personalDetails)}
+                            icon={OptionsListUtils.getAvatarsForAccountIDs([report.managerID], personalDetails)}
                             iconType={CONST.ICON_TYPE_AVATAR}
                             avatarSize={CONST.AVATAR_SIZE.SMALLER}
                             titleStyle={styles.assigneeTextStyle}
diff --git a/src/components/ReportActionItem/TripDetailsView.tsx b/src/components/ReportActionItem/TripDetailsView.tsx
new file mode 100644
index 000000000000..fe6831f72512
--- /dev/null
+++ b/src/components/ReportActionItem/TripDetailsView.tsx
@@ -0,0 +1,173 @@
+import React, {useMemo} from 'react';
+import {View} from 'react-native';
+import Icon from '@components/Icon';
+import MenuItemWithTopDescription from '@components/MenuItemWithTopDescription';
+import OfflineWithFeedback from '@components/OfflineWithFeedback';
+import SpacerView from '@components/SpacerView';
+import Text from '@components/Text';
+import useLocalize from '@hooks/useLocalize';
+import useResponsiveLayout from '@hooks/useResponsiveLayout';
+import useStyleUtils from '@hooks/useStyleUtils';
+import useTheme from '@hooks/useTheme';
+import useThemeStyles from '@hooks/useThemeStyles';
+import DateUtils from '@libs/DateUtils';
+import variables from '@styles/variables';
+import * as Expensicons from '@src/components/Icon/Expensicons';
+import CONST from '@src/CONST';
+import * as ReportUtils from '@src/libs/ReportUtils';
+import * as TripReservationUtils from '@src/libs/TripReservationUtils';
+import type {Reservation, ReservationTimeDetails} from '@src/types/onyx/Transaction';
+
+type TripDetailsViewProps = {
+    /** The active tripRoomReportID, used for Onyx subscription */
+    tripRoomReportID?: string;
+
+    /** Whether we should display the horizontal rule below the component */
+    shouldShowHorizontalRule: boolean;
+};
+
+type ReservationViewProps = {
+    reservation: Reservation;
+};
+
+function ReservationView({reservation}: ReservationViewProps) {
+    const theme = useTheme();
+    const styles = useThemeStyles();
+    const StyleUtils = useStyleUtils();
+    const {shouldUseNarrowLayout} = useResponsiveLayout();
+
+    const reservationIcon = TripReservationUtils.getTripReservationIcon(reservation.type);
+
+    const formatAirportInfo = (reservationTimeDetails: ReservationTimeDetails) => {
+        const longName = reservationTimeDetails?.longName ? `${reservationTimeDetails?.longName} ` : '';
+        let shortName = reservationTimeDetails?.shortName ? `${reservationTimeDetails?.shortName}` : '';
+
+        shortName = longName && shortName ? `(${shortName})` : shortName;
+
+        return `${longName}${shortName}`;
+    };
+
+    const getFormattedDate = () => {
+        switch (reservation.type) {
+            case CONST.RESERVATION_TYPE.FLIGHT:
+                return DateUtils.getFormattedTransportDate(new Date(reservation.start.date));
+            case CONST.RESERVATION_TYPE.HOTEL:
+            case CONST.RESERVATION_TYPE.CAR:
+                return DateUtils.getFormattedReservationRangeDate(new Date(reservation.start.date), new Date(reservation.end.date));
+            default:
+                return DateUtils.formatToLongDateWithWeekday(new Date(reservation.start.date));
+        }
+    };
+
+    const formattedDate = getFormattedDate();
+
+    const bottomDescription = useMemo(() => {
+        const code = `${reservation.confirmations && reservation.confirmations?.length > 0 ? `${reservation.confirmations[0].value} • ` : ''}`;
+        if (reservation.type === CONST.RESERVATION_TYPE.FLIGHT) {
+            const longName = reservation.company?.longName ? `${reservation.company?.longName} • ` : '';
+            const shortName = reservation?.company?.shortName ? `${reservation?.company?.shortName} ` : '';
+            return `${code}${longName}${shortName}${reservation.route?.number}`;
+        }
+        if (reservation.type === CONST.RESERVATION_TYPE.HOTEL) {
+            return `${code}${reservation.start.address}`;
+        }
+        if (reservation.type === CONST.RESERVATION_TYPE.CAR) {
+            const vendor = reservation.vendor ? `${reservation.vendor} • ` : '';
+            return `${vendor}${reservation.start.location}`;
+        }
+        return reservation.start.address ?? reservation.start.location;
+    }, [reservation]);
+
+    const titleComponent = () => {
+        if (reservation.type === CONST.RESERVATION_TYPE.FLIGHT) {
+            return (
+                <View style={styles.gap1}>
+                    <View style={[styles.flexRow, styles.alignItemsCenter, styles.gap2]}>
+                        <Text style={[styles.textStrong, styles.lh20, shouldUseNarrowLayout && styles.flex1]}>{formatAirportInfo(reservation.start)}</Text>
+                        <Icon
+                            src={Expensicons.ArrowRightLong}
+                            width={variables.iconSizeSmall}
+                            height={variables.iconSizeSmall}
+                            fill={theme.icon}
+                        />
+                        <Text style={[styles.textStrong, styles.lh20, shouldUseNarrowLayout && styles.flex1]}>{formatAirportInfo(reservation.end)}</Text>
+                    </View>
+                    {bottomDescription && <Text style={[styles.textSmall, styles.colorMuted, styles.lh14]}>{bottomDescription}</Text>}
+                </View>
+            );
+        }
+
+        return (
+            <View style={styles.gap1}>
+                <Text
+                    numberOfLines={1}
+                    style={[styles.textStrong, styles.lh20]}
+                >
+                    {reservation.type === CONST.RESERVATION_TYPE.CAR ? reservation.carInfo?.name : reservation.start.longName}
+                </Text>
+                {bottomDescription && <Text style={[styles.textSmall, styles.colorMuted, styles.lh14]}>{bottomDescription}</Text>}
+            </View>
+        );
+    };
+
+    return (
+        <MenuItemWithTopDescription
+            description={formattedDate}
+            descriptionTextStyle={[styles.textLabelSupporting, styles.lh16]}
+            titleComponent={titleComponent()}
+            titleContainerStyle={[styles.justifyContentStart, styles.gap1]}
+            secondaryIcon={reservationIcon}
+            isSecondaryIconHoverable
+            shouldShowRightIcon
+            wrapperStyle={[styles.taskDescriptionMenuItem]}
+            shouldGreyOutWhenDisabled={false}
+            numberOfLinesTitle={0}
+            interactive
+            shouldStackHorizontally={false}
+            onSecondaryInteraction={() => {}}
+            iconHeight={20}
+            iconWidth={20}
+            iconStyles={[StyleUtils.getTripReservationIconContainer(false), styles.mr3]}
+            secondaryIconFill={theme.icon}
+            hoverAndPressStyle={styles.hoveredComponentBG}
+        />
+    );
+}
+
+function TripDetailsView({tripRoomReportID, shouldShowHorizontalRule}: TripDetailsViewProps) {
+    const styles = useThemeStyles();
+    const {translate} = useLocalize();
+
+    const tripTransactions = ReportUtils.getTripTransactions(tripRoomReportID);
+    const reservations: Reservation[] = TripReservationUtils.getReservationsFromTripTransactions(tripTransactions);
+
+    return (
+        <View>
+            <View style={[styles.flexRow, styles.pointerEventsNone, styles.containerWithSpaceBetween, styles.ph5, styles.pv2]}>
+                <View style={[styles.flex1, styles.justifyContentCenter]}>
+                    <Text
+                        style={[styles.textLabelSupporting]}
+                        numberOfLines={1}
+                    >
+                        {translate('travel.tripSummary')}
+                    </Text>
+                </View>
+            </View>
+            <>
+                {reservations.map((reservation) => (
+                    <OfflineWithFeedback>
+                        <ReservationView reservation={reservation} />
+                    </OfflineWithFeedback>
+                ))}
+                <SpacerView
+                    shouldShow={shouldShowHorizontalRule}
+                    style={[shouldShowHorizontalRule && styles.reportHorizontalRule]}
+                />
+            </>
+        </View>
+    );
+}
+
+TripDetailsView.displayName = 'TripDetailsView';
+
+export default TripDetailsView;
diff --git a/src/components/ReportActionItem/TripRoomPreview.tsx b/src/components/ReportActionItem/TripRoomPreview.tsx
new file mode 100644
index 000000000000..53c887f320ef
--- /dev/null
+++ b/src/components/ReportActionItem/TripRoomPreview.tsx
@@ -0,0 +1,201 @@
+import React, {useMemo} from 'react';
+import type {StyleProp, ViewStyle} from 'react-native';
+import {FlatList, View} from 'react-native';
+import {useOnyx} from 'react-native-onyx';
+import Button from '@components/Button';
+import Icon from '@components/Icon';
+import MenuItemWithTopDescription from '@components/MenuItemWithTopDescription';
+import OfflineWithFeedback from '@components/OfflineWithFeedback';
+import {PressableWithoutFeedback} from '@components/Pressable';
+import {showContextMenuForReport} from '@components/ShowContextMenuContext';
+import Text from '@components/Text';
+import useLocalize from '@hooks/useLocalize';
+import useStyleUtils from '@hooks/useStyleUtils';
+import useTheme from '@hooks/useTheme';
+import useThemeStyles from '@hooks/useThemeStyles';
+import ControlSelection from '@libs/ControlSelection';
+import * as CurrencyUtils from '@libs/CurrencyUtils';
+import DateUtils from '@libs/DateUtils';
+import * as DeviceCapabilities from '@libs/DeviceCapabilities';
+import Navigation from '@libs/Navigation/Navigation';
+import {getReportActionText} from '@libs/ReportActionsUtils';
+import * as ReportUtils from '@libs/ReportUtils';
+import * as TripReservationUtils from '@libs/TripReservationUtils';
+import type {ContextMenuAnchor} from '@pages/home/report/ContextMenu/ReportActionContextMenu';
+import variables from '@styles/variables';
+import * as Expensicons from '@src/components/Icon/Expensicons';
+import CONST from '@src/CONST';
+import ONYXKEYS from '@src/ONYXKEYS';
+import ROUTES from '@src/ROUTES';
+import type {ReportAction} from '@src/types/onyx';
+import type {Reservation} from '@src/types/onyx/Transaction';
+
+type TripRoomPreviewProps = {
+    /** All the data of the action */
+    action: ReportAction;
+
+    /** The associated chatReport */
+    chatReportID: string;
+
+    /** Extra styles to pass to View wrapper */
+    containerStyles?: StyleProp<ViewStyle>;
+
+    /** Popover context menu anchor, used for showing context menu */
+    contextMenuAnchor?: ContextMenuAnchor;
+
+    /** Callback for updating context menu active state, used for showing context menu */
+    checkIfContextMenuActive?: () => void;
+
+    /** Whether the corresponding report action item is hovered */
+    isHovered?: boolean;
+};
+
+type ReservationViewProps = {
+    reservation: Reservation;
+};
+
+function ReservationView({reservation}: ReservationViewProps) {
+    const theme = useTheme();
+    const styles = useThemeStyles();
+    const StyleUtils = useStyleUtils();
+    const {translate} = useLocalize();
+
+    const reservationIcon = TripReservationUtils.getTripReservationIcon(reservation.type);
+    const title = reservation.type === CONST.RESERVATION_TYPE.CAR ? reservation.carInfo?.name : reservation.start.longName;
+
+    const titleComponent =
+        reservation.type === CONST.RESERVATION_TYPE.FLIGHT ? (
+            <View style={[styles.flexRow, styles.alignItemsCenter, styles.gap2]}>
+                <Text style={styles.labelStrong}>{reservation.start.shortName}</Text>
+                <Icon
+                    src={Expensicons.ArrowRightLong}
+                    width={variables.iconSizeSmall}
+                    height={variables.iconSizeSmall}
+                    fill={theme.icon}
+                />
+                <Text style={styles.labelStrong}>{reservation.end.shortName}</Text>
+            </View>
+        ) : (
+            <Text
+                numberOfLines={1}
+                style={styles.labelStrong}
+            >
+                {title}
+            </Text>
+        );
+
+    return (
+        <MenuItemWithTopDescription
+            description={translate(`travel.${reservation.type}`)}
+            descriptionTextStyle={styles.textMicro}
+            titleComponent={titleComponent}
+            titleContainerStyle={styles.gap1}
+            secondaryIcon={reservationIcon}
+            secondaryIconFill={theme.icon}
+            wrapperStyle={[styles.taskDescriptionMenuItem, styles.p0]}
+            shouldGreyOutWhenDisabled={false}
+            numberOfLinesTitle={0}
+            interactive={false}
+            iconHeight={variables.iconSizeSmall}
+            iconWidth={variables.iconSizeSmall}
+            iconStyles={[StyleUtils.getTripReservationIconContainer(true), styles.mr3]}
+            isSmallAvatarSubscriptMenu
+        />
+    );
+}
+
+const renderItem = ({item}: {item: Reservation}) => <ReservationView reservation={item} />;
+
+function TripRoomPreview({action, chatReportID, containerStyles, contextMenuAnchor, isHovered = false, checkIfContextMenuActive = () => {}}: TripRoomPreviewProps) {
+    const styles = useThemeStyles();
+    const {translate} = useLocalize();
+    const [chatReport] = useOnyx(`${ONYXKEYS.COLLECTION.REPORT}${chatReportID}`);
+    const [iouReport] = useOnyx(`${ONYXKEYS.COLLECTION.REPORT}${chatReport?.iouReportID}`);
+
+    const tripTransactions = ReportUtils.getTripTransactions(chatReport?.iouReportID, 'reportID');
+    const reservations: Reservation[] = TripReservationUtils.getReservationsFromTripTransactions(tripTransactions);
+    const dateInfo = chatReport?.tripData ? DateUtils.getFormattedDateRange(new Date(chatReport.tripData.startDate), new Date(chatReport.tripData.endDate)) : '';
+    const {totalDisplaySpend} = ReportUtils.getMoneyRequestSpendBreakdown(chatReport);
+
+    const displayAmount = useMemo(() => {
+        if (totalDisplaySpend) {
+            return CurrencyUtils.convertToDisplayString(totalDisplaySpend, iouReport?.currency);
+        }
+
+        // If iouReport is not available, get amount from the action message (Ex: "Domain20821's Workspace owes $33.00" or "paid ₫60" or "paid -₫60 elsewhere")
+        let displayAmountValue = '';
+        const actionMessage = getReportActionText(action) ?? '';
+        const splits = actionMessage.split(' ');
+
+        splits.forEach((split) => {
+            if (!/\d/.test(split)) {
+                return;
+            }
+
+            displayAmountValue = split;
+        });
+
+        return displayAmountValue;
+    }, [action, iouReport?.currency, totalDisplaySpend]);
+
+    return (
+        <OfflineWithFeedback
+            pendingAction={action?.pendingAction}
+            shouldDisableOpacity={!!(action.pendingAction ?? action.isOptimisticAction)}
+            needsOffscreenAlphaCompositing
+        >
+            <View style={[styles.chatItemMessage, containerStyles]}>
+                <PressableWithoutFeedback
+                    onPressIn={() => DeviceCapabilities.canUseTouchScreen() && ControlSelection.block()}
+                    onPressOut={() => ControlSelection.unblock()}
+                    onLongPress={(event) => showContextMenuForReport(event, contextMenuAnchor, chatReportID, action, checkIfContextMenuActive)}
+                    shouldUseHapticsOnLongPress
+                    style={[styles.flexRow, styles.justifyContentBetween, styles.reportPreviewBox, styles.cursorDefault]}
+                    role={CONST.ROLE.BUTTON}
+                    accessibilityLabel={translate('iou.viewDetails')}
+                >
+                    <View style={[styles.moneyRequestPreviewBox, styles.p4, styles.gap5, isHovered ? styles.reportPreviewBoxHoverBorder : undefined]}>
+                        <View style={styles.expenseAndReportPreviewTextContainer}>
+                            <View style={styles.reportPreviewAmountSubtitleContainer}>
+                                <View style={styles.flexRow}>
+                                    <View style={[styles.flex1, styles.flexRow, styles.alignItemsCenter]}>
+                                        <Text style={[styles.textLabelSupporting, styles.lh16]}>
+                                            {translate('travel.trip')} • {dateInfo}
+                                        </Text>
+                                    </View>
+                                </View>
+                            </View>
+                            <View style={styles.reportPreviewAmountSubtitleContainer}>
+                                <View style={styles.flexRow}>
+                                    <View style={[styles.flex1, styles.flexRow, styles.alignItemsCenter]}>
+                                        <Text style={styles.textHeadlineH2}>{displayAmount}</Text>
+                                    </View>
+                                </View>
+                                <View style={styles.flexRow}>
+                                    <View style={[styles.flex1, styles.flexRow, styles.alignItemsCenter]}>
+                                        <Text style={[styles.textLabelSupporting, styles.textNormal, styles.lh20]}>{chatReport?.reportName}</Text>
+                                    </View>
+                                </View>
+                            </View>
+                        </View>
+                        <FlatList
+                            data={reservations}
+                            style={styles.gap3}
+                            renderItem={renderItem}
+                        />
+                        <Button
+                            medium
+                            success
+                            text={translate('travel.viewTrip')}
+                            onPress={() => Navigation.navigate(ROUTES.REPORT_WITH_ID.getRoute(chatReportID))}
+                        />
+                    </View>
+                </PressableWithoutFeedback>
+            </View>
+        </OfflineWithFeedback>
+    );
+}
+
+TripRoomPreview.displayName = 'TripRoomPreview';
+
+export default TripRoomPreview;
diff --git a/src/components/ReportHeaderSkeletonView.tsx b/src/components/ReportHeaderSkeletonView.tsx
index bc4eef675170..ee4510c26c3b 100644
--- a/src/components/ReportHeaderSkeletonView.tsx
+++ b/src/components/ReportHeaderSkeletonView.tsx
@@ -2,9 +2,9 @@ import React from 'react';
 import {View} from 'react-native';
 import {Circle, Rect} from 'react-native-svg';
 import useLocalize from '@hooks/useLocalize';
+import useResponsiveLayout from '@hooks/useResponsiveLayout';
 import useTheme from '@hooks/useTheme';
 import useThemeStyles from '@hooks/useThemeStyles';
-import useWindowDimensions from '@hooks/useWindowDimensions';
 import CONST from '@src/CONST';
 import Icon from './Icon';
 import * as Expensicons from './Icon/Expensicons';
@@ -20,18 +20,18 @@ function ReportHeaderSkeletonView({shouldAnimate = true, onBackButtonPress = ()
     const theme = useTheme();
     const styles = useThemeStyles();
     const {translate} = useLocalize();
-    const {isSmallScreenWidth} = useWindowDimensions();
+    const {shouldUseNarrowLayout} = useResponsiveLayout();
     const smallScreenHeight = styles.appContentHeader.height;
-    const height = !isSmallScreenWidth ? styles.headerBarDesktopHeight.height : smallScreenHeight;
+    const height = !shouldUseNarrowLayout ? styles.headerBarDesktopHeight.height : smallScreenHeight;
     const radius = 20;
     const circleY = height / 2;
     const circleTopY = circleY - radius;
     const circleBottomY = circleY + radius;
 
     return (
-        <View style={[styles.appContentHeader, isSmallScreenWidth && styles.pl2, styles.h100]}>
-            <View style={[styles.appContentHeaderTitle, !isSmallScreenWidth && styles.pl5]}>
-                {isSmallScreenWidth && (
+        <View style={[styles.appContentHeader, shouldUseNarrowLayout && styles.pl2, styles.h100]}>
+            <View style={[styles.appContentHeaderTitle, !shouldUseNarrowLayout && styles.pl5]}>
+                {shouldUseNarrowLayout && (
                     <PressableWithFeedback
                         onPress={onBackButtonPress}
                         style={[styles.touchableButtonImage]}
@@ -48,8 +48,8 @@ function ReportHeaderSkeletonView({shouldAnimate = true, onBackButtonPress = ()
                     animate={shouldAnimate}
                     width={styles.w100.width}
                     height={height}
-                    backgroundColor={theme.highlightBG}
-                    foregroundColor={theme.border}
+                    backgroundColor={theme.skeletonLHNIn}
+                    foregroundColor={theme.skeletonLHNOut}
                 >
                     <Circle
                         cx="20"
diff --git a/src/components/ReportWelcomeText.tsx b/src/components/ReportWelcomeText.tsx
index 5b2ba1720ab0..96f705ea2d52 100644
--- a/src/components/ReportWelcomeText.tsx
+++ b/src/components/ReportWelcomeText.tsx
@@ -3,12 +3,11 @@ import {View} from 'react-native';
 import type {OnyxEntry} from 'react-native-onyx';
 import {withOnyx} from 'react-native-onyx';
 import useLocalize from '@hooks/useLocalize';
-import usePermissions from '@hooks/usePermissions';
 import useThemeStyles from '@hooks/useThemeStyles';
 import Navigation from '@libs/Navigation/Navigation';
 import * as OptionsListUtils from '@libs/OptionsListUtils';
-import * as PolicyUtils from '@libs/PolicyUtils';
 import * as ReportUtils from '@libs/ReportUtils';
+import SidebarUtils from '@libs/SidebarUtils';
 import CONST from '@src/CONST';
 import type {IOUType} from '@src/CONST';
 import ONYXKEYS from '@src/ONYXKEYS';
@@ -35,18 +34,17 @@ type ReportWelcomeTextProps = ReportWelcomeTextOnyxProps & {
 function ReportWelcomeText({report, policy, personalDetails}: ReportWelcomeTextProps) {
     const {translate} = useLocalize();
     const styles = useThemeStyles();
-    const {canUseTrackExpense} = usePermissions();
     const isPolicyExpenseChat = ReportUtils.isPolicyExpenseChat(report);
     const isChatRoom = ReportUtils.isChatRoom(report);
     const isSelfDM = ReportUtils.isSelfDM(report);
     const isInvoiceRoom = ReportUtils.isInvoiceRoom(report);
-    const isDefault = !(isChatRoom || isPolicyExpenseChat || isSelfDM || isInvoiceRoom);
-    const participantAccountIDs = report?.participantAccountIDs ?? [];
+    const isSystemChat = ReportUtils.isSystemChat(report);
+    const isDefault = !(isChatRoom || isPolicyExpenseChat || isSelfDM || isInvoiceRoom || isSystemChat);
+    const participantAccountIDs = ReportUtils.getParticipantsAccountIDsForDisplay(report);
     const isMultipleParticipant = participantAccountIDs.length > 1;
     const displayNamesWithTooltips = ReportUtils.getDisplayNamesWithTooltips(OptionsListUtils.getPersonalDetailsForAccountIDs(participantAccountIDs, personalDetails), isMultipleParticipant);
-    const isUserPolicyAdmin = PolicyUtils.isPolicyAdmin(policy);
-    const roomWelcomeMessage = ReportUtils.getRoomWelcomeMessage(report, isUserPolicyAdmin);
-    const moneyRequestOptions = ReportUtils.temporary_getMoneyRequestOptions(report, policy, participantAccountIDs, canUseTrackExpense);
+    const welcomeMessage = SidebarUtils.getWelcomeMessage(report, policy);
+    const moneyRequestOptions = ReportUtils.temporary_getMoneyRequestOptions(report, policy, participantAccountIDs);
     const additionalText = moneyRequestOptions
         .filter((item): item is Exclude<IOUType, typeof CONST.IOU.TYPE.REQUEST | typeof CONST.IOU.TYPE.SEND | typeof CONST.IOU.TYPE.INVOICE> => item !== CONST.IOU.TYPE.INVOICE)
         .map((item) => translate(`reportActionsView.iouTypes.${item}`))
@@ -75,8 +73,12 @@ function ReportWelcomeText({report, policy, personalDetails}: ReportWelcomeTextP
             return translate('reportActionsView.yourSpace');
         }
 
+        if (isSystemChat) {
+            return reportName;
+        }
+
         return translate('reportActionsView.sayHello');
-    }, [isChatRoom, isInvoiceRoom, isSelfDM, translate, reportName]);
+    }, [isChatRoom, isInvoiceRoom, isSelfDM, isSystemChat, translate, reportName]);
 
     return (
         <>
@@ -85,47 +87,47 @@ function ReportWelcomeText({report, policy, personalDetails}: ReportWelcomeTextP
             </View>
             <View style={[styles.mt3, styles.mw100]}>
                 {isPolicyExpenseChat &&
-                    (policy?.description ? (
+                    (welcomeMessage?.messageHtml ? (
                         <PressableWithoutFeedback
                             onPress={() => {
                                 if (!canEditPolicyDescription) {
                                     return;
                                 }
-                                Navigation.navigate(ROUTES.WORKSPACE_PROFILE_DESCRIPTION.getRoute(policy.id));
+                                Navigation.navigate(ROUTES.WORKSPACE_PROFILE_DESCRIPTION.getRoute(policy?.id ?? '-1'));
                             }}
                             style={[styles.renderHTML, canEditPolicyDescription ? styles.cursorPointer : styles.cursorText]}
                             accessibilityLabel={translate('reportDescriptionPage.roomDescription')}
                         >
-                            <RenderHTML html={policy.description} />
+                            <RenderHTML html={welcomeMessage.messageHtml} />
                         </PressableWithoutFeedback>
                     ) : (
                         <Text>
-                            <Text>{translate('reportActionsView.beginningOfChatHistoryPolicyExpenseChatPartOne')}</Text>
+                            <Text>{welcomeMessage.phrase1}</Text>
                             <Text style={[styles.textStrong]}>{ReportUtils.getDisplayNameForParticipant(report?.ownerAccountID)}</Text>
-                            <Text>{translate('reportActionsView.beginningOfChatHistoryPolicyExpenseChatPartTwo')}</Text>
+                            <Text>{welcomeMessage.phrase2}</Text>
                             <Text style={[styles.textStrong]}>{ReportUtils.getPolicyName(report)}</Text>
-                            <Text>{translate('reportActionsView.beginningOfChatHistoryPolicyExpenseChatPartThree')}</Text>
+                            <Text>{welcomeMessage.phrase3}</Text>
                         </Text>
                     ))}
                 {isChatRoom &&
-                    (report?.description ? (
+                    (welcomeMessage?.messageHtml ? (
                         <PressableWithoutFeedback
                             onPress={() => {
                                 if (ReportUtils.canEditReportDescription(report, policy)) {
-                                    Navigation.navigate(ROUTES.REPORT_DESCRIPTION.getRoute(report.reportID));
+                                    Navigation.navigate(ROUTES.REPORT_DESCRIPTION.getRoute(report?.reportID ?? '-1'));
                                     return;
                                 }
-                                Navigation.navigate(ROUTES.REPORT_WITH_ID_DETAILS.getRoute(report.reportID));
+                                Navigation.navigate(ROUTES.REPORT_WITH_ID_DETAILS.getRoute(report?.reportID ?? '-1'));
                             }}
                             style={styles.renderHTML}
                             accessibilityLabel={translate('reportDescriptionPage.roomDescription')}
                         >
-                            <RenderHTML html={report.description} />
+                            <RenderHTML html={welcomeMessage.messageHtml} />
                         </PressableWithoutFeedback>
                     ) : (
                         <Text>
-                            <Text>{roomWelcomeMessage.phrase1}</Text>
-                            {roomWelcomeMessage.showReportName && (
+                            <Text>{welcomeMessage.phrase1}</Text>
+                            {welcomeMessage.showReportName && (
                                 <Text
                                     style={[styles.textStrong]}
                                     onPress={navigateToReport}
@@ -134,20 +136,25 @@ function ReportWelcomeText({report, policy, personalDetails}: ReportWelcomeTextP
                                     {ReportUtils.getReportName(report)}
                                 </Text>
                             )}
-                            {roomWelcomeMessage.phrase2 !== undefined && <Text>{roomWelcomeMessage.phrase2}</Text>}
+                            {welcomeMessage.phrase2 !== undefined && <Text>{welcomeMessage.phrase2}</Text>}
                         </Text>
                     ))}
                 {isSelfDM && (
                     <Text>
-                        <Text>{translate('reportActionsView.beginningOfChatHistorySelfDM')}</Text>
+                        <Text>{welcomeMessage.phrase1}</Text>
+                    </Text>
+                )}
+                {isSystemChat && (
+                    <Text>
+                        <Text>{welcomeMessage.phrase1}</Text>
                     </Text>
                 )}
                 {isDefault && (
                     <Text>
-                        <Text>{translate('reportActionsView.beginningOfChatHistory')}</Text>
-                        {displayNamesWithTooltips.map(({displayName, pronouns, accountID}, index) => (
+                        <Text>{welcomeMessage.phrase1}</Text>
+                        {displayNamesWithTooltips.map(({displayName, accountID}, index) => (
                             // eslint-disable-next-line react/no-array-index-key
-                            <Text key={`${displayName}${pronouns}${index}`}>
+                            <Text key={`${displayName}${index}`}>
                                 <UserDetailsTooltip accountID={accountID}>
                                     {ReportUtils.isOptimisticPersonalDetail(accountID) ? (
                                         <Text style={[styles.textStrong]}>{displayName}</Text>
@@ -161,7 +168,6 @@ function ReportWelcomeText({report, policy, personalDetails}: ReportWelcomeTextP
                                         </Text>
                                     )}
                                 </UserDetailsTooltip>
-                                {!!pronouns && <Text>{` (${pronouns})`}</Text>}
                                 {index === displayNamesWithTooltips.length - 1 && <Text>.</Text>}
                                 {index === displayNamesWithTooltips.length - 2 && <Text>{` ${translate('common.and')} `}</Text>}
                                 {index < displayNamesWithTooltips.length - 2 && <Text>, </Text>}
diff --git a/src/components/RequireTwoFactorAuthenticationModal.tsx b/src/components/RequireTwoFactorAuthenticationModal.tsx
new file mode 100644
index 000000000000..229231e8ff25
--- /dev/null
+++ b/src/components/RequireTwoFactorAuthenticationModal.tsx
@@ -0,0 +1,91 @@
+import React from 'react';
+import {View} from 'react-native';
+import useLocalize from '@hooks/useLocalize';
+import useResponsiveLayout from '@hooks/useResponsiveLayout';
+import useStyleUtils from '@hooks/useStyleUtils';
+import useThemeStyles from '@hooks/useThemeStyles';
+import CONST from '@src/CONST';
+import Button from './Button';
+import Lottie from './Lottie';
+import LottieAnimations from './LottieAnimations';
+import Modal from './Modal';
+import SafeAreaConsumer from './SafeAreaConsumer';
+import Text from './Text';
+
+type RequireTwoFactorAuthenticationModalProps = {
+    /** A callback to call when the form has been submitted */
+    onSubmit: () => void;
+
+    /** A callback to call when the form has been closed */
+    onCancel?: () => void;
+
+    /** Modal visibility */
+    isVisible: boolean;
+
+    /** Describe what is showing */
+    description: string;
+
+    /**
+     * Whether the modal should enable the new focus manager.
+     * We are attempting to migrate to a new refocus manager, adding this property for gradual migration.
+     * */
+    shouldEnableNewFocusManagement?: boolean;
+};
+
+function RequireTwoFactorAuthenticationModal({onCancel = () => {}, description, isVisible, onSubmit, shouldEnableNewFocusManagement}: RequireTwoFactorAuthenticationModalProps) {
+    const {shouldUseNarrowLayout} = useResponsiveLayout();
+    const styles = useThemeStyles();
+    const {translate} = useLocalize();
+    const StyleUtils = useStyleUtils();
+
+    return (
+        <SafeAreaConsumer>
+            {({safeAreaPaddingBottomStyle}) => (
+                <Modal
+                    onClose={onCancel}
+                    isVisible={isVisible}
+                    type={shouldUseNarrowLayout ? CONST.MODAL.MODAL_TYPE.BOTTOM_DOCKED : CONST.MODAL.MODAL_TYPE.CONFIRM}
+                    innerContainerStyle={{...styles.pb5, ...styles.pt3, ...styles.boxShadowNone}}
+                    shouldEnableNewFocusManagement={shouldEnableNewFocusManagement}
+                >
+                    <View style={safeAreaPaddingBottomStyle}>
+                        <View
+                            style={[
+                                styles.mh3,
+                                styles.br3,
+                                styles.cardSectionIllustration,
+                                styles.alignItemsCenter,
+                                StyleUtils.getBackgroundColorStyle(LottieAnimations.Safe.backgroundColor),
+                            ]}
+                        >
+                            <Lottie
+                                source={LottieAnimations.Safe}
+                                style={styles.h100}
+                                webStyle={styles.h100}
+                                autoPlay
+                                loop
+                            />
+                        </View>
+                        <View style={[styles.mt5, styles.mh5]}>
+                            <View style={[styles.gap2, styles.mb10]}>
+                                <Text style={[styles.textHeadlineH1]}>{translate('twoFactorAuth.pleaseEnableTwoFactorAuth')}</Text>
+                                <Text style={styles.textSupporting}>{description}</Text>
+                            </View>
+                            <Button
+                                large
+                                success
+                                pressOnEnter
+                                onPress={onSubmit}
+                                text={translate('twoFactorAuth.enableTwoFactorAuth')}
+                            />
+                        </View>
+                    </View>
+                </Modal>
+            )}
+        </SafeAreaConsumer>
+    );
+}
+
+RequireTwoFactorAuthenticationModal.displayName = 'RequireTwoFactorAuthenticationModal';
+
+export default RequireTwoFactorAuthenticationModal;
diff --git a/src/components/RoomHeaderAvatars.tsx b/src/components/RoomHeaderAvatars.tsx
index bdb4a0ac78ab..f5c4a5fad051 100644
--- a/src/components/RoomHeaderAvatars.tsx
+++ b/src/components/RoomHeaderAvatars.tsx
@@ -7,6 +7,7 @@ import CONST from '@src/CONST';
 import ROUTES from '@src/ROUTES';
 import type {Icon} from '@src/types/onyx/OnyxCommon';
 import Avatar from './Avatar';
+import * as Expensicons from './Icon/Expensicons';
 import PressableWithoutFocus from './Pressable/PressableWithoutFocus';
 import Text from './Text';
 
@@ -17,8 +18,8 @@ type RoomHeaderAvatarsProps = {
 
 function RoomHeaderAvatars({icons, reportID}: RoomHeaderAvatarsProps) {
     const navigateToAvatarPage = (icon: Icon) => {
-        if (icon.type === CONST.ICON_TYPE_WORKSPACE) {
-            Navigation.navigate(ROUTES.REPORT_AVATAR.getRoute(reportID));
+        if (icon.type === CONST.ICON_TYPE_WORKSPACE && icon.id) {
+            Navigation.navigate(ROUTES.REPORT_AVATAR.getRoute(reportID, icon.id.toString()));
             return;
         }
 
@@ -39,15 +40,16 @@ function RoomHeaderAvatars({icons, reportID}: RoomHeaderAvatarsProps) {
             <PressableWithoutFocus
                 style={styles.noOutline}
                 onPress={() => navigateToAvatarPage(icons[0])}
-                accessibilityRole={CONST.ACCESSIBILITY_ROLE.IMAGEBUTTON}
+                accessibilityRole={CONST.ROLE.BUTTON}
                 accessibilityLabel={icons[0].name ?? ''}
+                disabled={icons[0].source === Expensicons.FallbackAvatar}
             >
                 <Avatar
                     source={icons[0].source}
-                    imageStyles={styles.avatarLarge}
-                    size={CONST.AVATAR_SIZE.LARGE}
+                    imageStyles={styles.avatarXLarge}
+                    size={CONST.AVATAR_SIZE.XLARGE}
                     name={icons[0].name}
-                    accountID={icons[0].id}
+                    avatarID={icons[0].id}
                     type={icons[0].type}
                     fallbackIcon={icons[0].fallbackIcon}
                 />
@@ -75,15 +77,16 @@ function RoomHeaderAvatars({icons, reportID}: RoomHeaderAvatarsProps) {
                         <PressableWithoutFocus
                             style={[styles.mln4, StyleUtils.getAvatarBorderRadius(CONST.AVATAR_SIZE.LARGE_BORDERED, icon.type)]}
                             onPress={() => navigateToAvatarPage(icon)}
-                            accessibilityRole={CONST.ACCESSIBILITY_ROLE.IMAGEBUTTON}
+                            accessibilityRole={CONST.ROLE.BUTTON}
                             accessibilityLabel={icon.name ?? ''}
+                            disabled={icon.source === Expensicons.FallbackAvatar}
                         >
                             <Avatar
                                 source={icon.source}
                                 size={CONST.AVATAR_SIZE.LARGE}
                                 containerStyles={[...iconStyle, StyleUtils.getAvatarBorderRadius(CONST.AVATAR_SIZE.LARGE_BORDERED, icon.type)]}
                                 name={icon.name}
-                                accountID={icon.id}
+                                avatarID={icon.id}
                                 type={icon.type}
                                 fallbackIcon={icon.fallbackIcon}
                             />
diff --git a/src/components/RoomNameInput/types.ts b/src/components/RoomNameInput/types.ts
index 80f08a01e472..763d0f3f2668 100644
--- a/src/components/RoomNameInput/types.ts
+++ b/src/components/RoomNameInput/types.ts
@@ -1,10 +1,9 @@
 import type {NativeSyntheticEvent, ReturnKeyTypeOptions, TextInputFocusEventData, TextInputSubmitEditingEventData} from 'react-native';
-import type {MaybePhraseKey} from '@libs/Localize';
 
 type RoomNameInputProps = {
     value?: string;
     disabled?: boolean;
-    errorText?: MaybePhraseKey;
+    errorText?: string;
     onChangeText?: (value: string) => void;
     onSubmitEditing?: (event: NativeSyntheticEvent<TextInputSubmitEditingEventData>) => void;
     onInputChange?: (value: string) => void;
diff --git a/src/components/SafeAreaConsumer/types.ts b/src/components/SafeAreaConsumer/types.ts
index d7b115983434..2d7c6c57b078 100644
--- a/src/components/SafeAreaConsumer/types.ts
+++ b/src/components/SafeAreaConsumer/types.ts
@@ -1,12 +1,12 @@
-import type {DimensionValue} from 'react-native';
+import type {ViewStyle} from 'react-native';
 import type {EdgeInsets} from 'react-native-safe-area-context';
 
 type SafeAreaChildrenProps = {
-    paddingTop?: DimensionValue;
-    paddingBottom?: DimensionValue;
+    paddingTop?: ViewStyle['paddingTop'];
+    paddingBottom?: ViewStyle['paddingBottom'];
     insets?: EdgeInsets;
     safeAreaPaddingBottomStyle: {
-        paddingBottom?: DimensionValue;
+        paddingBottom?: ViewStyle['paddingBottom'];
     };
 };
 
diff --git a/src/components/ScreenWrapper.tsx b/src/components/ScreenWrapper.tsx
index e53823860ce0..37e2842c0671 100644
--- a/src/components/ScreenWrapper.tsx
+++ b/src/components/ScreenWrapper.tsx
@@ -1,8 +1,8 @@
-import {useNavigation} from '@react-navigation/native';
+import {useIsFocused, useNavigation} from '@react-navigation/native';
 import type {StackNavigationProp} from '@react-navigation/stack';
 import type {ForwardedRef, ReactNode} from 'react';
 import React, {createContext, forwardRef, useEffect, useMemo, useRef, useState} from 'react';
-import type {DimensionValue, StyleProp, ViewStyle} from 'react-native';
+import type {StyleProp, ViewStyle} from 'react-native';
 import {Keyboard, PanResponder, View} from 'react-native';
 import {PickerAvoidingView} from 'react-native-picker-select';
 import type {EdgeInsets} from 'react-native-safe-area-context';
@@ -10,14 +10,17 @@ import useEnvironment from '@hooks/useEnvironment';
 import useInitialDimensions from '@hooks/useInitialWindowDimensions';
 import useKeyboardState from '@hooks/useKeyboardState';
 import useNetwork from '@hooks/useNetwork';
+import useResponsiveLayout from '@hooks/useResponsiveLayout';
 import useTackInputFocus from '@hooks/useTackInputFocus';
 import useThemeStyles from '@hooks/useThemeStyles';
 import useWindowDimensions from '@hooks/useWindowDimensions';
 import * as Browser from '@libs/Browser';
-import type {CentralPaneNavigatorParamList, RootStackParamList} from '@libs/Navigation/types';
+import type {AuthScreensParamList, RootStackParamList} from '@libs/Navigation/types';
 import toggleTestToolsModal from '@userActions/TestTool';
 import CONST from '@src/CONST';
 import CustomDevMenu from './CustomDevMenu';
+import FocusTrapForScreens from './FocusTrap/FocusTrapForScreen';
+import type FocusTrapForScreenProps from './FocusTrap/FocusTrapForScreen/FocusTrapProps';
 import HeaderGap from './HeaderGap';
 import KeyboardAvoidingView from './KeyboardAvoidingView';
 import OfflineIndicator from './OfflineIndicator';
@@ -28,7 +31,7 @@ import withNavigationFallback from './withNavigationFallback';
 type ScreenWrapperChildrenProps = {
     insets: EdgeInsets;
     safeAreaPaddingBottomStyle?: {
-        paddingBottom?: DimensionValue;
+        paddingBottom?: ViewStyle['paddingBottom'];
     };
     didScreenTransitionEnd: boolean;
 };
@@ -93,13 +96,18 @@ type ScreenWrapperProps = {
      *
      * This is required because transitionEnd event doesn't trigger in the testing environment.
      */
-    navigation?: StackNavigationProp<RootStackParamList> | StackNavigationProp<CentralPaneNavigatorParamList>;
+    navigation?: StackNavigationProp<RootStackParamList> | StackNavigationProp<AuthScreensParamList>;
 
     /** Whether to show offline indicator on wide screens */
     shouldShowOfflineIndicatorInWideScreen?: boolean;
+
+    /** Overrides the focus trap default settings */
+    focusTrapSettings?: FocusTrapForScreenProps['focusTrapSettings'];
 };
 
-const ScreenWrapperStatusContext = createContext({didScreenTransitionEnd: false});
+type ScreenWrapperStatusContextType = {didScreenTransitionEnd: boolean};
+
+const ScreenWrapperStatusContext = createContext<ScreenWrapperStatusContextType | undefined>(undefined);
 
 function ScreenWrapper(
     {
@@ -122,19 +130,22 @@ function ScreenWrapper(
         shouldAvoidScrollOnVirtualViewport = true,
         shouldShowOfflineIndicatorInWideScreen = false,
         shouldUseCachedViewportHeight = false,
+        focusTrapSettings,
     }: ScreenWrapperProps,
     ref: ForwardedRef<View>,
 ) {
     /**
      * We are only passing navigation as prop from
-     * ReportScreenWrapper -> ReportScreen -> ScreenWrapper
+     * ReportScreen -> ScreenWrapper
      *
      * so in other places where ScreenWrapper is used, we need to
      * fallback to useNavigation.
      */
     const navigationFallback = useNavigation<StackNavigationProp<RootStackParamList>>();
     const navigation = navigationProp ?? navigationFallback;
-    const {windowHeight, isSmallScreenWidth} = useWindowDimensions(shouldUseCachedViewportHeight);
+    const isFocused = useIsFocused();
+    const {windowHeight} = useWindowDimensions(shouldUseCachedViewportHeight);
+    const {isSmallScreenWidth, shouldUseNarrowLayout} = useResponsiveLayout();
     const {initialHeight} = useInitialDimensions();
     const styles = useThemeStyles();
     const keyboardState = useKeyboardState();
@@ -169,12 +180,18 @@ function ScreenWrapper(
     ).current;
 
     useEffect(() => {
+        // On iOS, the transitionEnd event doesn't trigger some times. As such, we need to set a timeout
+        const timeout = setTimeout(() => {
+            setDidScreenTransitionEnd(true);
+            onEntryTransitionEnd?.();
+        }, CONST.SCREEN_TRANSITION_END_TIMEOUT);
+
         const unsubscribeTransitionEnd = navigation.addListener('transitionEnd', (event) => {
             // Prevent firing the prop callback when user is exiting the page.
             if (event?.data?.closing) {
                 return;
             }
-
+            clearTimeout(timeout);
             setDidScreenTransitionEnd(true);
             onEntryTransitionEnd?.();
         });
@@ -192,6 +209,7 @@ function ScreenWrapper(
             : undefined;
 
         return () => {
+            clearTimeout(timeout);
             unsubscribeTransitionEnd();
 
             if (beforeRemoveSubscription) {
@@ -199,10 +217,10 @@ function ScreenWrapper(
             }
         };
         // Rule disabled because this effect is only for component did mount & will component unmount lifecycle event
-        // eslint-disable-next-line react-hooks/exhaustive-deps
+        // eslint-disable-next-line react-compiler/react-compiler, react-hooks/exhaustive-deps
     }, []);
 
-    const isAvoidingViewportScroll = useTackInputFocus(shouldEnableMaxHeight && shouldAvoidScrollOnVirtualViewport && Browser.isMobileSafari());
+    const isAvoidingViewportScroll = useTackInputFocus(isFocused && shouldEnableMaxHeight && shouldAvoidScrollOnVirtualViewport && Browser.isMobileWebKit());
     const contextValue = useMemo(() => ({didScreenTransitionEnd}), [didScreenTransitionEnd]);
 
     return (
@@ -230,53 +248,56 @@ function ScreenWrapper(
                 }
 
                 return (
-                    <View
-                        ref={ref}
-                        style={[styles.flex1, {minHeight}]}
-                        // eslint-disable-next-line react/jsx-props-no-spreading
-                        {...panResponder.panHandlers}
-                        testID={testID}
-                    >
+                    <FocusTrapForScreens focusTrapSettings={focusTrapSettings}>
                         <View
-                            style={[styles.flex1, paddingStyle, style]}
+                            ref={ref}
+                            style={[styles.flex1, {minHeight}]}
                             // eslint-disable-next-line react/jsx-props-no-spreading
-                            {...keyboardDissmissPanResponder.panHandlers}
+                            {...panResponder.panHandlers}
+                            testID={testID}
                         >
-                            <KeyboardAvoidingView
-                                style={[styles.w100, styles.h100, {maxHeight}, isAvoidingViewportScroll ? [styles.overflowAuto, styles.overscrollBehaviorContain] : {}]}
-                                behavior={keyboardAvoidingViewBehavior}
-                                enabled={shouldEnableKeyboardAvoidingView}
+                            <View
+                                fsClass="fs-unmask"
+                                style={[styles.flex1, paddingStyle, style]}
+                                // eslint-disable-next-line react/jsx-props-no-spreading
+                                {...keyboardDissmissPanResponder.panHandlers}
                             >
-                                <PickerAvoidingView
-                                    style={isAvoidingViewportScroll ? [styles.h100, {marginTop: 1}] : styles.flex1}
-                                    enabled={shouldEnablePickerAvoiding}
+                                <KeyboardAvoidingView
+                                    style={[styles.w100, styles.h100, {maxHeight}, isAvoidingViewportScroll ? [styles.overflowAuto, styles.overscrollBehaviorContain] : {}]}
+                                    behavior={keyboardAvoidingViewBehavior}
+                                    enabled={shouldEnableKeyboardAvoidingView}
                                 >
-                                    <HeaderGap styles={headerGapStyles} />
-                                    <TestToolsModal />
-                                    {isDevelopment && <CustomDevMenu />}
-                                    <ScreenWrapperStatusContext.Provider value={contextValue}>
-                                        {
-                                            // If props.children is a function, call it to provide the insets to the children.
-                                            typeof children === 'function'
-                                                ? children({
-                                                      insets,
-                                                      safeAreaPaddingBottomStyle,
-                                                      didScreenTransitionEnd,
-                                                  })
-                                                : children
-                                        }
-                                    </ScreenWrapperStatusContext.Provider>
-                                    {isSmallScreenWidth && shouldShowOfflineIndicator && <OfflineIndicator style={offlineIndicatorStyle} />}
-                                    {!isSmallScreenWidth && shouldShowOfflineIndicatorInWideScreen && (
-                                        <OfflineIndicator
-                                            containerStyles={[]}
-                                            style={[styles.pl5, styles.offlineIndicatorRow, offlineIndicatorStyle]}
-                                        />
-                                    )}
-                                </PickerAvoidingView>
-                            </KeyboardAvoidingView>
+                                    <PickerAvoidingView
+                                        style={isAvoidingViewportScroll ? [styles.h100, {marginTop: 1}] : styles.flex1}
+                                        enabled={shouldEnablePickerAvoiding}
+                                    >
+                                        <HeaderGap styles={headerGapStyles} />
+                                        <TestToolsModal />
+                                        {isDevelopment && <CustomDevMenu />}
+                                        <ScreenWrapperStatusContext.Provider value={contextValue}>
+                                            {
+                                                // If props.children is a function, call it to provide the insets to the children.
+                                                typeof children === 'function'
+                                                    ? children({
+                                                          insets,
+                                                          safeAreaPaddingBottomStyle,
+                                                          didScreenTransitionEnd,
+                                                      })
+                                                    : children
+                                            }
+                                            {isSmallScreenWidth && shouldShowOfflineIndicator && <OfflineIndicator style={offlineIndicatorStyle} />}
+                                            {!shouldUseNarrowLayout && shouldShowOfflineIndicatorInWideScreen && (
+                                                <OfflineIndicator
+                                                    containerStyles={[]}
+                                                    style={[styles.pl5, styles.offlineIndicatorRow, offlineIndicatorStyle]}
+                                                />
+                                            )}
+                                        </ScreenWrapperStatusContext.Provider>
+                                    </PickerAvoidingView>
+                                </KeyboardAvoidingView>
+                            </View>
                         </View>
-                    </View>
+                    </FocusTrapForScreens>
                 );
             }}
         </SafeAreaConsumer>
diff --git a/src/components/Search.tsx b/src/components/Search.tsx
deleted file mode 100644
index d8d3160a2633..000000000000
--- a/src/components/Search.tsx
+++ /dev/null
@@ -1,80 +0,0 @@
-import React, {useEffect} from 'react';
-import {useOnyx} from 'react-native-onyx';
-import useNetwork from '@hooks/useNetwork';
-import useThemeStyles from '@hooks/useThemeStyles';
-import * as SearchActions from '@libs/actions/Search';
-import * as DeviceCapabilities from '@libs/DeviceCapabilities';
-import * as SearchUtils from '@libs/SearchUtils';
-import Navigation from '@navigation/Navigation';
-import EmptySearchView from '@pages/Search/EmptySearchView';
-import useCustomBackHandler from '@pages/Search/useCustomBackHandler';
-import ONYXKEYS from '@src/ONYXKEYS';
-import ROUTES from '@src/ROUTES';
-import {isEmptyObject} from '@src/types/utils/EmptyObject';
-import isLoadingOnyxValue from '@src/types/utils/isLoadingOnyxValue';
-import SelectionList from './SelectionList';
-import SearchTableHeader from './SelectionList/SearchTableHeader';
-import TableListItemSkeleton from './Skeletons/TableListItemSkeleton';
-
-type SearchProps = {
-    query: string;
-};
-
-function Search({query}: SearchProps) {
-    const {isOffline} = useNetwork();
-    const styles = useThemeStyles();
-    useCustomBackHandler();
-
-    const hash = SearchUtils.getQueryHash(query);
-    const [searchResults, searchResultsMeta] = useOnyx(`${ONYXKEYS.COLLECTION.SNAPSHOT}${hash}`);
-
-    useEffect(() => {
-        if (isOffline) {
-            return;
-        }
-
-        SearchActions.search(query);
-    }, [query, isOffline]);
-
-    const isLoading = (!isOffline && isLoadingOnyxValue(searchResultsMeta)) || searchResults?.data === undefined;
-    const shouldShowEmptyState = !isLoading && isEmptyObject(searchResults?.data);
-
-    if (isLoading) {
-        return <TableListItemSkeleton shouldAnimate />;
-    }
-
-    if (shouldShowEmptyState) {
-        return <EmptySearchView />;
-    }
-
-    const openReport = (reportID?: string) => {
-        if (!reportID) {
-            return;
-        }
-
-        Navigation.navigate(ROUTES.SEARCH_REPORT.getRoute(query, reportID));
-    };
-
-    const ListItem = SearchUtils.getListItem();
-    const data = SearchUtils.getSections(searchResults?.data ?? {});
-    const shouldShowMerchant = SearchUtils.getShouldShowMerchant(searchResults?.data ?? {});
-
-    return (
-        <SelectionList
-            customListHeader={<SearchTableHeader shouldShowMerchant={shouldShowMerchant} />}
-            ListItem={ListItem}
-            sections={[{data, isDisabled: false}]}
-            onSelectRow={(item) => {
-                openReport(item.transactionThreadReportID);
-            }}
-            shouldPreventDefaultFocusOnSelectRow={!DeviceCapabilities.canUseTouchScreen()}
-            listHeaderWrapperStyle={[styles.ph9, styles.pv3, styles.pb5]}
-            containerStyle={[styles.pv0]}
-        />
-    );
-}
-
-Search.displayName = 'Search';
-
-export type {SearchProps};
-export default Search;
diff --git a/src/components/Search/SearchContext.tsx b/src/components/Search/SearchContext.tsx
new file mode 100644
index 000000000000..3408ffbc4803
--- /dev/null
+++ b/src/components/Search/SearchContext.tsx
@@ -0,0 +1,67 @@
+import React, {useCallback, useContext, useMemo, useState} from 'react';
+import type ChildrenProps from '@src/types/utils/ChildrenProps';
+import type {SearchContext, SelectedTransactions} from './types';
+
+const defaultSearchContext = {
+    currentSearchHash: -1,
+    selectedTransactions: {},
+    setCurrentSearchHash: () => {},
+    setSelectedTransactions: () => {},
+    clearSelectedTransactions: () => {},
+};
+
+const Context = React.createContext<SearchContext>(defaultSearchContext);
+
+function SearchContextProvider({children}: ChildrenProps) {
+    const [searchContextData, setSearchContextData] = useState<Pick<SearchContext, 'currentSearchHash' | 'selectedTransactions'>>({
+        currentSearchHash: defaultSearchContext.currentSearchHash,
+        selectedTransactions: defaultSearchContext.selectedTransactions,
+    });
+
+    const setCurrentSearchHash = useCallback((searchHash: number) => {
+        setSearchContextData((prevState) => ({
+            ...prevState,
+            currentSearchHash: searchHash,
+        }));
+    }, []);
+
+    const setSelectedTransactions = useCallback((selectedTransactions: SelectedTransactions) => {
+        setSearchContextData((prevState) => ({
+            ...prevState,
+            selectedTransactions,
+        }));
+    }, []);
+
+    const clearSelectedTransactions = useCallback(
+        (searchHash?: number) => {
+            if (searchHash === searchContextData.currentSearchHash) {
+                return;
+            }
+            setSearchContextData((prevState) => ({
+                ...prevState,
+                selectedTransactions: {},
+            }));
+        },
+        [searchContextData.currentSearchHash],
+    );
+
+    const searchContext = useMemo<SearchContext>(
+        () => ({
+            ...searchContextData,
+            setCurrentSearchHash,
+            setSelectedTransactions,
+            clearSelectedTransactions,
+        }),
+        [searchContextData, setCurrentSearchHash, setSelectedTransactions, clearSelectedTransactions],
+    );
+
+    return <Context.Provider value={searchContext}>{children}</Context.Provider>;
+}
+
+function useSearchContext() {
+    return useContext(Context);
+}
+
+SearchContextProvider.displayName = 'SearchContextProvider';
+
+export {SearchContextProvider, useSearchContext};
diff --git a/src/components/Search/SearchFiltersParticipantsSelector.tsx b/src/components/Search/SearchFiltersParticipantsSelector.tsx
new file mode 100644
index 000000000000..436cdba91af2
--- /dev/null
+++ b/src/components/Search/SearchFiltersParticipantsSelector.tsx
@@ -0,0 +1,233 @@
+import React, {useCallback, useEffect, useMemo, useState} from 'react';
+import {useOnyx} from 'react-native-onyx';
+import Button from '@components/Button';
+import {usePersonalDetails} from '@components/OnyxProvider';
+import {useOptionsList} from '@components/OptionListContextProvider';
+import SelectionList from '@components/SelectionList';
+import InviteMemberListItem from '@components/SelectionList/InviteMemberListItem';
+import useDebouncedState from '@hooks/useDebouncedState';
+import useLocalize from '@hooks/useLocalize';
+import useScreenWrapperTranstionStatus from '@hooks/useScreenWrapperTransitionStatus';
+import * as DeviceCapabilities from '@libs/DeviceCapabilities';
+import * as OptionsListUtils from '@libs/OptionsListUtils';
+import type {Option} from '@libs/OptionsListUtils';
+import type {OptionData} from '@libs/ReportUtils';
+import * as ReportUtils from '@libs/ReportUtils';
+import Navigation from '@navigation/Navigation';
+import * as Report from '@userActions/Report';
+import CONST from '@src/CONST';
+import ONYXKEYS from '@src/ONYXKEYS';
+import ROUTES from '@src/ROUTES';
+
+const defaultListOptions = {
+    userToInvite: null,
+    recentReports: [],
+    personalDetails: [],
+    currentUserOption: null,
+    headerMessage: '',
+    categoryOptions: [],
+    tagOptions: [],
+    taxRatesOptions: [],
+};
+
+function getSelectedOptionData(option: Option): OptionData {
+    return {...option, selected: true, reportID: option.reportID ?? '-1'};
+}
+
+type SearchFiltersParticipantsSelectorProps = {
+    initialAccountIDs: string[];
+    onFiltersUpdate: (accountIDs: string[]) => void;
+};
+
+function SearchFiltersParticipantsSelector({initialAccountIDs, onFiltersUpdate}: SearchFiltersParticipantsSelectorProps) {
+    const {translate} = useLocalize();
+    const personalDetails = usePersonalDetails();
+    const {didScreenTransitionEnd} = useScreenWrapperTranstionStatus();
+    const {options, areOptionsInitialized} = useOptionsList({
+        shouldInitialize: didScreenTransitionEnd,
+    });
+
+    const [isSearchingForReports] = useOnyx(ONYXKEYS.IS_SEARCHING_FOR_REPORTS, {initWithStoredValues: false});
+    const [selectedOptions, setSelectedOptions] = useState<OptionData[]>([]);
+    const [searchTerm, debouncedSearchTerm, setSearchTerm] = useDebouncedState('');
+    const cleanSearchTerm = useMemo(() => searchTerm.trim().toLowerCase(), [searchTerm]);
+
+    const defaultOptions = useMemo(() => {
+        if (!areOptionsInitialized) {
+            return defaultListOptions;
+        }
+
+        return OptionsListUtils.getFilteredOptions(
+            options.reports,
+            options.personalDetails,
+            undefined,
+            '',
+            selectedOptions,
+            CONST.EXPENSIFY_EMAILS,
+            false,
+            true,
+            false,
+            {},
+            [],
+            false,
+            {},
+            [],
+            true,
+            false,
+            false,
+            0,
+            undefined,
+            false,
+        );
+    }, [areOptionsInitialized, options.personalDetails, options.reports, selectedOptions]);
+
+    const chatOptions = useMemo(() => {
+        return OptionsListUtils.filterOptions(defaultOptions, cleanSearchTerm, {
+            selectedOptions,
+            excludeLogins: CONST.EXPENSIFY_EMAILS,
+            maxRecentReportsToShow: CONST.IOU.MAX_RECENT_REPORTS_TO_SHOW,
+        });
+    }, [defaultOptions, cleanSearchTerm, selectedOptions]);
+
+    const {sections, headerMessage} = useMemo(() => {
+        const newSections: OptionsListUtils.CategorySection[] = [];
+        if (!areOptionsInitialized) {
+            return {sections: [], headerMessage: undefined};
+        }
+
+        const formattedResults = OptionsListUtils.formatSectionsFromSearchTerm(
+            cleanSearchTerm,
+            selectedOptions,
+            chatOptions.recentReports,
+            chatOptions.personalDetails,
+            personalDetails,
+            true,
+        );
+
+        const isCurrentUserSelected = selectedOptions.find((option) => option.accountID === chatOptions.currentUserOption?.accountID);
+
+        newSections.push(formattedResults.section);
+
+        if (chatOptions.currentUserOption && !isCurrentUserSelected) {
+            const formattedName = ReportUtils.getDisplayNameForParticipant(chatOptions.currentUserOption.accountID, false, true, true, personalDetails);
+            newSections.push({
+                title: '',
+                data: [{...chatOptions.currentUserOption, text: formattedName}],
+                shouldShow: true,
+            });
+        }
+
+        newSections.push({
+            title: '',
+            data: chatOptions.recentReports,
+            shouldShow: chatOptions.recentReports.length > 0,
+        });
+
+        newSections.push({
+            title: '',
+            data: chatOptions.personalDetails,
+            shouldShow: chatOptions.personalDetails.length > 0,
+        });
+
+        const noResultsFound = chatOptions.personalDetails.length === 0 && chatOptions.recentReports.length === 0 && !chatOptions.currentUserOption;
+        const message = noResultsFound ? translate('common.noResultsFound') : undefined;
+
+        return {
+            sections: newSections,
+            headerMessage: message,
+        };
+    }, [areOptionsInitialized, cleanSearchTerm, selectedOptions, chatOptions.recentReports, chatOptions.personalDetails, chatOptions.currentUserOption, personalDetails, translate]);
+
+    // This effect handles setting initial selectedOptions based on accountIDs saved in onyx form
+    useEffect(() => {
+        if (!initialAccountIDs || initialAccountIDs.length === 0 || !personalDetails) {
+            return;
+        }
+
+        const preSelectedOptions = initialAccountIDs
+            .map((accountID) => {
+                const participant = personalDetails[accountID];
+                if (!participant) {
+                    return;
+                }
+
+                return getSelectedOptionData(participant);
+            })
+            .filter((option): option is NonNullable<OptionData> => {
+                return !!option;
+            });
+
+        setSelectedOptions(preSelectedOptions);
+        // eslint-disable-next-line react-compiler/react-compiler, react-hooks/exhaustive-deps -- this should react only to changes in form data
+    }, [initialAccountIDs, personalDetails]);
+
+    useEffect(() => {
+        Report.searchInServer(debouncedSearchTerm.trim());
+    }, [debouncedSearchTerm]);
+
+    const handleParticipantSelection = useCallback(
+        (option: Option) => {
+            const foundOptionIndex = selectedOptions.findIndex((selectedOption: Option) => {
+                if (selectedOption.accountID && selectedOption.accountID === option?.accountID) {
+                    return true;
+                }
+
+                if (selectedOption.reportID && selectedOption.reportID === option?.reportID) {
+                    return true;
+                }
+
+                return false;
+            });
+
+            if (foundOptionIndex < 0) {
+                setSelectedOptions([...selectedOptions, getSelectedOptionData(option)]);
+            } else {
+                const newSelectedOptions = [...selectedOptions.slice(0, foundOptionIndex), ...selectedOptions.slice(foundOptionIndex + 1)];
+                setSelectedOptions(newSelectedOptions);
+            }
+        },
+        [selectedOptions],
+    );
+
+    const footerContent = (
+        <Button
+            success
+            text={translate('common.save')}
+            pressOnEnter
+            onPress={() => {
+                const selectedAccountIDs = selectedOptions.map((option) => (option.accountID ? option.accountID.toString() : undefined)).filter(Boolean) as string[];
+                onFiltersUpdate(selectedAccountIDs);
+
+                Navigation.goBack(ROUTES.SEARCH_ADVANCED_FILTERS);
+            }}
+            large
+        />
+    );
+
+    const isLoadingNewOptions = !!isSearchingForReports;
+    const showLoadingPlaceholder = !didScreenTransitionEnd || !areOptionsInitialized || !initialAccountIDs || !personalDetails;
+
+    return (
+        <SelectionList
+            canSelectMultiple
+            sections={sections}
+            ListItem={InviteMemberListItem}
+            textInputLabel={translate('selectionList.nameEmailOrPhoneNumber')}
+            headerMessage={headerMessage}
+            textInputValue={searchTerm}
+            footerContent={footerContent}
+            showScrollIndicator
+            shouldPreventDefaultFocusOnSelectRow={!DeviceCapabilities.canUseTouchScreen()}
+            onChangeText={(value) => {
+                setSearchTerm(value);
+            }}
+            onSelectRow={handleParticipantSelection}
+            isLoadingNewOptions={isLoadingNewOptions}
+            showLoadingPlaceholder={showLoadingPlaceholder}
+        />
+    );
+}
+
+SearchFiltersParticipantsSelector.displayName = 'SearchFiltersParticipantsSelector';
+
+export default SearchFiltersParticipantsSelector;
diff --git a/src/components/Search/SearchMultipleSelectionPicker.tsx b/src/components/Search/SearchMultipleSelectionPicker.tsx
new file mode 100644
index 000000000000..57003110fd1a
--- /dev/null
+++ b/src/components/Search/SearchMultipleSelectionPicker.tsx
@@ -0,0 +1,122 @@
+import React, {useCallback, useMemo, useState} from 'react';
+import Button from '@components/Button';
+import SelectionList from '@components/SelectionList';
+import SelectableListItem from '@components/SelectionList/SelectableListItem';
+import useDebouncedState from '@hooks/useDebouncedState';
+import useLocalize from '@hooks/useLocalize';
+import localeCompare from '@libs/LocaleCompare';
+import Navigation from '@libs/Navigation/Navigation';
+import type {OptionData} from '@libs/ReportUtils';
+import ROUTES from '@src/ROUTES';
+
+type SearchMultipleSelectionPickerItem = {
+    name: string;
+    value: string | string[];
+};
+
+type SearchMultipleSelectionPickerProps = {
+    items: SearchMultipleSelectionPickerItem[];
+    initiallySelectedItems: SearchMultipleSelectionPickerItem[] | undefined;
+    pickerTitle?: string;
+    onSaveSelection: (values: string[]) => void;
+    shouldShowTextInput?: boolean;
+};
+
+function SearchMultipleSelectionPicker({items, initiallySelectedItems, pickerTitle, onSaveSelection, shouldShowTextInput = true}: SearchMultipleSelectionPickerProps) {
+    const {translate} = useLocalize();
+
+    const [searchTerm, debouncedSearchTerm, setSearchTerm] = useDebouncedState('');
+    const [selectedItems, setSelectedItems] = useState<SearchMultipleSelectionPickerItem[]>(initiallySelectedItems ?? []);
+
+    const {sections, noResultsFound} = useMemo(() => {
+        const selectedItemsSection = selectedItems
+            .filter((item) => item?.name.toLowerCase().includes(debouncedSearchTerm?.toLowerCase()))
+            .sort((a, b) => localeCompare(a.name, b.name))
+            .map((item) => ({
+                text: item.name,
+                keyForList: item.name,
+                isSelected: true,
+                value: item.value,
+            }));
+        const remainingItemsSection = items
+            .filter((item) => selectedItems.some((selectedItem) => selectedItem.value === item.value) === false && item?.name.toLowerCase().includes(debouncedSearchTerm?.toLowerCase()))
+            .sort((a, b) => localeCompare(a.name, b.name))
+            .map((item) => ({
+                text: item.name,
+                keyForList: item.name,
+                isSelected: false,
+                value: item.value,
+            }));
+        const isEmpty = !selectedItemsSection.length && !remainingItemsSection.length;
+        return {
+            sections: isEmpty
+                ? []
+                : [
+                      {
+                          title: undefined,
+                          data: selectedItemsSection,
+                          shouldShow: selectedItemsSection.length > 0,
+                      },
+                      {
+                          title: pickerTitle,
+                          data: remainingItemsSection,
+                          shouldShow: remainingItemsSection.length > 0,
+                      },
+                  ],
+            noResultsFound: isEmpty,
+        };
+    }, [selectedItems, items, pickerTitle, debouncedSearchTerm]);
+
+    const onSelectItem = useCallback(
+        (item: Partial<OptionData & SearchMultipleSelectionPickerItem>) => {
+            if (!item.text || !item.keyForList || !item.value) {
+                return;
+            }
+            if (item.isSelected) {
+                setSelectedItems(selectedItems?.filter((selectedItem) => selectedItem.name !== item.keyForList));
+            } else {
+                setSelectedItems([...(selectedItems ?? []), {name: item.text, value: item.value}]);
+            }
+        },
+        [selectedItems],
+    );
+
+    const handleConfirmSelection = useCallback(() => {
+        onSaveSelection(selectedItems.map((item) => item.value).flat());
+        Navigation.goBack(ROUTES.SEARCH_ADVANCED_FILTERS);
+    }, [onSaveSelection, selectedItems]);
+
+    const footerContent = useMemo(
+        () => (
+            <Button
+                success
+                text={translate('common.save')}
+                pressOnEnter
+                onPress={handleConfirmSelection}
+                large
+            />
+        ),
+        [translate, handleConfirmSelection],
+    );
+    return (
+        <SelectionList
+            sections={sections}
+            textInputValue={searchTerm}
+            onChangeText={setSearchTerm}
+            textInputLabel={shouldShowTextInput ? translate('common.search') : undefined}
+            onSelectRow={onSelectItem}
+            headerMessage={noResultsFound ? translate('common.noResultsFound') : undefined}
+            footerContent={footerContent}
+            shouldStopPropagation
+            showLoadingPlaceholder={!noResultsFound}
+            shouldShowTooltips
+            canSelectMultiple
+            ListItem={SelectableListItem}
+        />
+    );
+}
+
+SearchMultipleSelectionPicker.displayName = 'SearchMultipleSelectionPicker';
+
+export default SearchMultipleSelectionPicker;
+export type {SearchMultipleSelectionPickerItem};
diff --git a/src/components/Search/SearchPageHeader.tsx b/src/components/Search/SearchPageHeader.tsx
new file mode 100644
index 000000000000..c28eed688aaa
--- /dev/null
+++ b/src/components/Search/SearchPageHeader.tsx
@@ -0,0 +1,327 @@
+import React, {useMemo} from 'react';
+import type {StyleProp, TextStyle} from 'react-native';
+import {View} from 'react-native';
+import {useOnyx} from 'react-native-onyx';
+import Button from '@components/Button';
+import ButtonWithDropdownMenu from '@components/ButtonWithDropdownMenu';
+import type {DropdownOption} from '@components/ButtonWithDropdownMenu/types';
+import Header from '@components/Header';
+import type HeaderWithBackButtonProps from '@components/HeaderWithBackButton/types';
+import Icon from '@components/Icon';
+import * as Expensicons from '@components/Icon/Expensicons';
+import * as Illustrations from '@components/Icon/Illustrations';
+import type {ReportListItemType, TransactionListItemType} from '@components/SelectionList/types';
+import Text from '@components/Text';
+import useActiveWorkspace from '@hooks/useActiveWorkspace';
+import useLocalize from '@hooks/useLocalize';
+import useNetwork from '@hooks/useNetwork';
+import useResponsiveLayout from '@hooks/useResponsiveLayout';
+import useTheme from '@hooks/useTheme';
+import useThemeStyles from '@hooks/useThemeStyles';
+import {turnOffMobileSelectionMode} from '@libs/actions/MobileSelectionMode';
+import * as SearchActions from '@libs/actions/Search';
+import Navigation from '@libs/Navigation/Navigation';
+import * as SearchUtils from '@libs/SearchUtils';
+import SearchSelectedNarrow from '@pages/Search/SearchSelectedNarrow';
+import variables from '@styles/variables';
+import CONST from '@src/CONST';
+import type {TranslationPaths} from '@src/languages/types';
+import ONYXKEYS from '@src/ONYXKEYS';
+import ROUTES from '@src/ROUTES';
+import type {SearchDataTypes, SearchReport} from '@src/types/onyx/SearchResults';
+import type DeepValueOf from '@src/types/utils/DeepValueOf';
+import type IconAsset from '@src/types/utils/IconAsset';
+import {useSearchContext} from './SearchContext';
+import type {SearchQueryJSON} from './types';
+
+type HeaderWrapperProps = Pick<HeaderWithBackButtonProps, 'title' | 'subtitle' | 'icon' | 'children'> & {
+    subtitleStyles?: StyleProp<TextStyle>;
+};
+
+function HeaderWrapper({icon, title, subtitle, children, subtitleStyles = {}}: HeaderWrapperProps) {
+    const styles = useThemeStyles();
+
+    // If the icon is present, the header bar should be taller and use different font.
+    const isCentralPaneSettings = !!icon;
+
+    const middleContent = useMemo(() => {
+        return (
+            <Header
+                title={
+                    <Text
+                        style={[styles.mutedTextLabel, styles.pre]}
+                        numberOfLines={1}
+                    >
+                        {title}
+                    </Text>
+                }
+                subtitle={
+                    <Text
+                        numberOfLines={2}
+                        style={[styles.textLarge, subtitleStyles]}
+                    >
+                        {subtitle}
+                    </Text>
+                }
+            />
+        );
+    }, [styles.mutedTextLabel, styles.pre, styles.textLarge, subtitle, subtitleStyles, title]);
+
+    return (
+        <View
+            dataSet={{dragArea: false}}
+            style={[styles.headerBar, isCentralPaneSettings && styles.headerBarDesktopHeight]}
+        >
+            <View style={[styles.dFlex, styles.flexRow, styles.alignItemsCenter, styles.flexGrow1, styles.justifyContentBetween, styles.overflowHidden]}>
+                {icon && (
+                    <Icon
+                        src={icon}
+                        width={variables.iconHeader}
+                        height={variables.iconHeader}
+                        additionalStyles={[styles.mr2]}
+                    />
+                )}
+
+                {middleContent}
+                <View style={[styles.reportOptions, styles.flexRow, styles.pr5, styles.alignItemsCenter, styles.gap4]}>{children}</View>
+            </View>
+        </View>
+    );
+}
+
+type SearchPageHeaderProps = {
+    queryJSON: SearchQueryJSON;
+    hash: number;
+    onSelectDeleteOption?: (itemsToDelete: string[]) => void;
+    isCustomQuery: boolean;
+    setOfflineModalOpen?: () => void;
+    setDownloadErrorModalOpen?: () => void;
+    data?: TransactionListItemType[] | ReportListItemType[];
+};
+
+type SearchHeaderOptionValue = DeepValueOf<typeof CONST.SEARCH.BULK_ACTION_TYPES> | undefined;
+
+type HeaderContent = {
+    icon: IconAsset;
+    titleText: TranslationPaths;
+};
+
+function getHeaderContent(type: SearchDataTypes): HeaderContent {
+    switch (type) {
+        case CONST.SEARCH.DATA_TYPES.INVOICE:
+            return {icon: Illustrations.EnvelopeReceipt, titleText: 'workspace.common.invoices'};
+        case CONST.SEARCH.DATA_TYPES.TRIP:
+            return {icon: Illustrations.Luggage, titleText: 'travel.trips'};
+        case CONST.SEARCH.DATA_TYPES.EXPENSE:
+        default:
+            return {icon: Illustrations.MoneyReceipts, titleText: 'common.expenses'};
+    }
+}
+
+function SearchPageHeader({queryJSON, hash, onSelectDeleteOption, setOfflineModalOpen, setDownloadErrorModalOpen, isCustomQuery, data}: SearchPageHeaderProps) {
+    const {translate} = useLocalize();
+    const theme = useTheme();
+    const styles = useThemeStyles();
+    const {isOffline} = useNetwork();
+    const {activeWorkspaceID} = useActiveWorkspace();
+    const {isSmallScreenWidth} = useResponsiveLayout();
+    const {selectedTransactions, clearSelectedTransactions} = useSearchContext();
+    const [selectionMode] = useOnyx(ONYXKEYS.MOBILE_SELECTION_MODE);
+
+    const selectedTransactionsKeys = Object.keys(selectedTransactions ?? {});
+
+    const selectedReports: Array<SearchReport['reportID']> = useMemo(
+        () =>
+            (data ?? [])
+                .filter(
+                    (item) =>
+                        !SearchUtils.isTransactionListItemType(item) &&
+                        item.reportID &&
+                        item.transactions.every((transaction: {keyForList: string | number}) => selectedTransactions[transaction.keyForList]?.isSelected),
+                )
+                .map((item) => item.reportID),
+        [data, selectedTransactions],
+    );
+    const {status, type} = queryJSON;
+    const headerSubtitle = isCustomQuery ? SearchUtils.getSearchHeaderTitle(queryJSON) : translate(getHeaderContent(type).titleText);
+    const headerTitle = isCustomQuery ? translate('search.filtersHeader') : '';
+    const headerIcon = isCustomQuery ? Illustrations.Filters : getHeaderContent(type).icon;
+
+    const subtitleStyles = isCustomQuery ? {} : styles.textHeadlineH2;
+
+    const headerButtonsOptions = useMemo(() => {
+        if (selectedTransactionsKeys.length === 0) {
+            return [];
+        }
+
+        const options: Array<DropdownOption<SearchHeaderOptionValue>> = [];
+
+        options.push({
+            icon: Expensicons.Download,
+            text: translate('common.download'),
+            value: CONST.SEARCH.BULK_ACTION_TYPES.EXPORT,
+            shouldCloseModalOnSelect: true,
+            onSelected: () => {
+                if (isOffline) {
+                    setOfflineModalOpen?.();
+                    return;
+                }
+
+                const reportIDList = (selectedReports?.filter((report) => !!report) as string[]) ?? [];
+                SearchActions.exportSearchItemsToCSV(
+                    {query: status, jsonQuery: JSON.stringify(queryJSON), reportIDList, transactionIDList: selectedTransactionsKeys, policyIDs: [activeWorkspaceID ?? '']},
+                    () => {
+                        setDownloadErrorModalOpen?.();
+                    },
+                );
+            },
+        });
+
+        const shouldShowHoldOption = !isOffline && selectedTransactionsKeys.every((id) => selectedTransactions[id].canHold);
+
+        if (shouldShowHoldOption) {
+            options.push({
+                icon: Expensicons.Stopwatch,
+                text: translate('search.bulkActions.hold'),
+                value: CONST.SEARCH.BULK_ACTION_TYPES.HOLD,
+                shouldCloseModalOnSelect: true,
+                onSelected: () => {
+                    if (isOffline) {
+                        setOfflineModalOpen?.();
+                        return;
+                    }
+
+                    if (selectionMode?.isEnabled) {
+                        turnOffMobileSelectionMode();
+                    }
+                    Navigation.navigate(ROUTES.TRANSACTION_HOLD_REASON_RHP);
+                },
+            });
+        }
+
+        const shouldShowUnholdOption = !isOffline && selectedTransactionsKeys.every((id) => selectedTransactions[id].canUnhold);
+
+        if (shouldShowUnholdOption) {
+            options.push({
+                icon: Expensicons.Stopwatch,
+                text: translate('search.bulkActions.unhold'),
+                value: CONST.SEARCH.BULK_ACTION_TYPES.UNHOLD,
+                shouldCloseModalOnSelect: true,
+                onSelected: () => {
+                    if (isOffline) {
+                        setOfflineModalOpen?.();
+                        return;
+                    }
+
+                    clearSelectedTransactions();
+                    if (selectionMode?.isEnabled) {
+                        turnOffMobileSelectionMode();
+                    }
+                    SearchActions.unholdMoneyRequestOnSearch(hash, selectedTransactionsKeys);
+                },
+            });
+        }
+
+        const shouldShowDeleteOption = !isOffline && selectedTransactionsKeys.every((id) => selectedTransactions[id].canDelete);
+
+        if (shouldShowDeleteOption) {
+            options.push({
+                icon: Expensicons.Trashcan,
+                text: translate('search.bulkActions.delete'),
+                value: CONST.SEARCH.BULK_ACTION_TYPES.DELETE,
+                shouldCloseModalOnSelect: true,
+                onSelected: () => {
+                    if (isOffline) {
+                        setOfflineModalOpen?.();
+                        return;
+                    }
+
+                    onSelectDeleteOption?.(selectedTransactionsKeys);
+                },
+            });
+        }
+
+        if (options.length === 0) {
+            const emptyOptionStyle = {
+                interactive: false,
+                iconFill: theme.icon,
+                iconHeight: variables.iconSizeLarge,
+                iconWidth: variables.iconSizeLarge,
+                numberOfLinesTitle: 2,
+                titleStyle: {...styles.colorMuted, ...styles.fontWeightNormal, ...styles.textWrap},
+            };
+
+            options.push({
+                icon: Expensicons.Exclamation,
+                text: translate('search.bulkActions.noOptionsAvailable'),
+                value: undefined,
+                ...emptyOptionStyle,
+            });
+        }
+
+        return options;
+    }, [
+        queryJSON,
+        status,
+        selectedTransactionsKeys,
+        selectedTransactions,
+        translate,
+        onSelectDeleteOption,
+        clearSelectedTransactions,
+        hash,
+        theme.icon,
+        styles.colorMuted,
+        styles.fontWeightNormal,
+        isOffline,
+        setOfflineModalOpen,
+        setDownloadErrorModalOpen,
+        activeWorkspaceID,
+        selectedReports,
+        styles.textWrap,
+        selectionMode?.isEnabled,
+    ]);
+
+    if (isSmallScreenWidth) {
+        if (selectionMode?.isEnabled) {
+            return (
+                <SearchSelectedNarrow
+                    options={headerButtonsOptions}
+                    itemsLength={selectedTransactionsKeys.length}
+                />
+            );
+        }
+        return null;
+    }
+
+    return (
+        <HeaderWrapper
+            title={headerTitle}
+            subtitle={headerSubtitle}
+            icon={headerIcon}
+            subtitleStyles={subtitleStyles}
+        >
+            {headerButtonsOptions.length > 0 && (
+                <ButtonWithDropdownMenu
+                    onPress={() => null}
+                    shouldAlwaysShowDropdownMenu
+                    pressOnEnter
+                    buttonSize={CONST.DROPDOWN_BUTTON_SIZE.MEDIUM}
+                    customText={translate('workspace.common.selected', {selectedNumber: selectedTransactionsKeys.length})}
+                    options={headerButtonsOptions}
+                    isSplitButton={false}
+                />
+            )}
+            <Button
+                text={translate('search.filtersHeader')}
+                icon={Expensicons.Filters}
+                onPress={() => Navigation.navigate(ROUTES.SEARCH_ADVANCED_FILTERS)}
+                medium
+            />
+        </HeaderWrapper>
+    );
+}
+
+SearchPageHeader.displayName = 'SearchPageHeader';
+
+export type {SearchHeaderOptionValue};
+export default SearchPageHeader;
diff --git a/src/components/Search/SearchStatusBar.tsx b/src/components/Search/SearchStatusBar.tsx
new file mode 100644
index 000000000000..7c1ffeff1818
--- /dev/null
+++ b/src/components/Search/SearchStatusBar.tsx
@@ -0,0 +1,166 @@
+import React from 'react';
+import Button from '@components/Button';
+import * as Expensicons from '@components/Icon/Expensicons';
+import ScrollView from '@components/ScrollView';
+import useLocalize from '@hooks/useLocalize';
+import useSingleExecution from '@hooks/useSingleExecution';
+import useStyleUtils from '@hooks/useStyleUtils';
+import useTheme from '@hooks/useTheme';
+import useThemeStyles from '@hooks/useThemeStyles';
+import Navigation from '@libs/Navigation/Navigation';
+import * as SearchUtils from '@libs/SearchUtils';
+import CONST from '@src/CONST';
+import type {TranslationPaths} from '@src/languages/types';
+import type {SearchDataTypes} from '@src/types/onyx/SearchResults';
+import type IconAsset from '@src/types/utils/IconAsset';
+import type {ExpenseSearchStatus, InvoiceSearchStatus, SearchQueryString, SearchStatus, TripSearchStatus} from './types';
+
+type SearchStatusBarProps = {
+    type: SearchDataTypes;
+    status: SearchStatus;
+};
+
+const expenseOptions: Array<{key: ExpenseSearchStatus; icon: IconAsset; text: TranslationPaths; query: SearchQueryString}> = [
+    {
+        key: CONST.SEARCH.STATUS.EXPENSE.ALL,
+        icon: Expensicons.All,
+        text: 'common.all',
+        query: SearchUtils.buildCannedSearchQuery(CONST.SEARCH.DATA_TYPES.EXPENSE, CONST.SEARCH.STATUS.EXPENSE.ALL),
+    },
+    {
+        key: CONST.SEARCH.STATUS.EXPENSE.DRAFTS,
+        icon: Expensicons.Pencil,
+        text: 'common.drafts',
+        query: SearchUtils.buildCannedSearchQuery(CONST.SEARCH.DATA_TYPES.EXPENSE, CONST.SEARCH.STATUS.EXPENSE.DRAFTS),
+    },
+    {
+        key: CONST.SEARCH.STATUS.EXPENSE.OUTSTANDING,
+        icon: Expensicons.Hourglass,
+        text: 'common.outstanding',
+        query: SearchUtils.buildCannedSearchQuery(CONST.SEARCH.DATA_TYPES.EXPENSE, CONST.SEARCH.STATUS.EXPENSE.OUTSTANDING),
+    },
+    {
+        key: CONST.SEARCH.STATUS.EXPENSE.APPROVED,
+        icon: Expensicons.ThumbsUp,
+        text: 'iou.approved',
+        query: SearchUtils.buildCannedSearchQuery(CONST.SEARCH.DATA_TYPES.EXPENSE, CONST.SEARCH.STATUS.EXPENSE.APPROVED),
+    },
+    {
+        key: CONST.SEARCH.STATUS.EXPENSE.PAID,
+        icon: Expensicons.MoneyBag,
+        text: 'iou.settledExpensify',
+        query: SearchUtils.buildCannedSearchQuery(CONST.SEARCH.DATA_TYPES.EXPENSE, CONST.SEARCH.STATUS.EXPENSE.PAID),
+    },
+];
+
+const invoiceOptions: Array<{key: InvoiceSearchStatus; icon: IconAsset; text: TranslationPaths; query: SearchQueryString}> = [
+    {
+        key: CONST.SEARCH.STATUS.INVOICE.ALL,
+        icon: Expensicons.All,
+        text: 'common.all',
+        query: SearchUtils.buildCannedSearchQuery(CONST.SEARCH.DATA_TYPES.INVOICE, CONST.SEARCH.STATUS.INVOICE.ALL),
+    },
+    {
+        key: CONST.SEARCH.STATUS.INVOICE.OUTSTANDING,
+        icon: Expensicons.Hourglass,
+        text: 'common.outstanding',
+        query: SearchUtils.buildCannedSearchQuery(CONST.SEARCH.DATA_TYPES.INVOICE, CONST.SEARCH.STATUS.INVOICE.OUTSTANDING),
+    },
+    {
+        key: CONST.SEARCH.STATUS.INVOICE.PAID,
+        icon: Expensicons.MoneyBag,
+        text: 'iou.settledExpensify',
+        query: SearchUtils.buildCannedSearchQuery(CONST.SEARCH.DATA_TYPES.INVOICE, CONST.SEARCH.STATUS.INVOICE.PAID),
+    },
+];
+
+const tripOptions: Array<{key: TripSearchStatus; icon: IconAsset; text: TranslationPaths; query: SearchQueryString}> = [
+    {
+        key: CONST.SEARCH.STATUS.TRIP.ALL,
+        icon: Expensicons.All,
+        text: 'common.all',
+        query: SearchUtils.buildCannedSearchQuery(CONST.SEARCH.DATA_TYPES.TRIP, CONST.SEARCH.STATUS.TRIP.ALL),
+    },
+    {
+        key: CONST.SEARCH.STATUS.TRIP.DRAFTS,
+        icon: Expensicons.Pencil,
+        text: 'common.drafts',
+        query: SearchUtils.buildCannedSearchQuery(CONST.SEARCH.DATA_TYPES.TRIP, CONST.SEARCH.STATUS.TRIP.DRAFTS),
+    },
+    {
+        key: CONST.SEARCH.STATUS.TRIP.OUTSTANDING,
+        icon: Expensicons.Hourglass,
+        text: 'common.outstanding',
+        query: SearchUtils.buildCannedSearchQuery(CONST.SEARCH.DATA_TYPES.TRIP, CONST.SEARCH.STATUS.TRIP.OUTSTANDING),
+    },
+    {
+        key: CONST.SEARCH.STATUS.TRIP.APPROVED,
+        icon: Expensicons.ThumbsUp,
+        text: 'iou.approved',
+        query: SearchUtils.buildCannedSearchQuery(CONST.SEARCH.DATA_TYPES.TRIP, CONST.SEARCH.STATUS.TRIP.APPROVED),
+    },
+    {
+        key: CONST.SEARCH.STATUS.TRIP.PAID,
+        icon: Expensicons.MoneyBag,
+        text: 'iou.settledExpensify',
+        query: SearchUtils.buildCannedSearchQuery(CONST.SEARCH.DATA_TYPES.TRIP, CONST.SEARCH.STATUS.TRIP.PAID),
+    },
+];
+
+function getOptions(type: SearchDataTypes) {
+    switch (type) {
+        case CONST.SEARCH.DATA_TYPES.INVOICE:
+            return invoiceOptions;
+        case CONST.SEARCH.DATA_TYPES.TRIP:
+            return tripOptions;
+        case CONST.SEARCH.DATA_TYPES.EXPENSE:
+        default:
+            return expenseOptions;
+    }
+}
+
+function SearchStatusBar({type, status}: SearchStatusBarProps) {
+    const {singleExecution} = useSingleExecution();
+    const styles = useThemeStyles();
+    const StyleUtils = useStyleUtils();
+    const theme = useTheme();
+    const {translate} = useLocalize();
+    const options = getOptions(type);
+
+    return (
+        <ScrollView
+            style={[styles.flexRow, styles.mb5, styles.overflowScroll, styles.flexGrow0]}
+            horizontal
+            showsHorizontalScrollIndicator={false}
+        >
+            {options.map((item, index) => {
+                const onPress = singleExecution(() => Navigation.setParams({q: item.query}));
+                const isActive = status === item.key;
+                const isFirstItem = index === 0;
+                const isLastItem = index === options.length - 1;
+
+                return (
+                    <Button
+                        key={item.key}
+                        text={translate(item.text)}
+                        onPress={onPress}
+                        icon={item.icon}
+                        iconFill={isActive ? theme.success : undefined}
+                        iconHoverFill={theme.success}
+                        innerStyles={!isActive && styles.bgTransparent}
+                        hoverStyles={StyleUtils.getBackgroundColorStyle(!isActive ? theme.highlightBG : theme.border)}
+                        textStyles={!isActive && StyleUtils.getTextColorStyle(theme.textSupporting)}
+                        textHoverStyles={StyleUtils.getTextColorStyle(theme.text)}
+                        // We add padding to the first and last items so that they align with the header and table but can overflow outside the screen when scrolled.
+                        style={[isFirstItem && styles.pl5, isLastItem && styles.pr5]}
+                        medium
+                    />
+                );
+            })}
+        </ScrollView>
+    );
+}
+
+SearchStatusBar.displayName = 'SearchStatusBar';
+
+export default SearchStatusBar;
diff --git a/src/components/Search/index.tsx b/src/components/Search/index.tsx
new file mode 100644
index 000000000000..a5d8e48ed546
--- /dev/null
+++ b/src/components/Search/index.tsx
@@ -0,0 +1,415 @@
+import {useNavigation} from '@react-navigation/native';
+import type {StackNavigationProp} from '@react-navigation/stack';
+import React, {useCallback, useEffect, useRef, useState} from 'react';
+import type {OnyxEntry} from 'react-native-onyx';
+import {useOnyx} from 'react-native-onyx';
+import ConfirmModal from '@components/ConfirmModal';
+import DecisionModal from '@components/DecisionModal';
+import SearchTableHeader from '@components/SelectionList/SearchTableHeader';
+import type {ReportListItemType, TransactionListItemType} from '@components/SelectionList/types';
+import SelectionListWithModal from '@components/SelectionListWithModal';
+import SearchRowSkeleton from '@components/Skeletons/SearchRowSkeleton';
+import useLocalize from '@hooks/useLocalize';
+import useNetwork from '@hooks/useNetwork';
+import usePrevious from '@hooks/usePrevious';
+import useThemeStyles from '@hooks/useThemeStyles';
+import useWindowDimensions from '@hooks/useWindowDimensions';
+import {turnOffMobileSelectionMode, turnOnMobileSelectionMode} from '@libs/actions/MobileSelectionMode';
+import * as SearchActions from '@libs/actions/Search';
+import * as DeviceCapabilities from '@libs/DeviceCapabilities';
+import Log from '@libs/Log';
+import memoize from '@libs/memoize';
+import * as ReportUtils from '@libs/ReportUtils';
+import * as SearchUtils from '@libs/SearchUtils';
+import Navigation from '@navigation/Navigation';
+import type {AuthScreensParamList} from '@navigation/types';
+import EmptySearchView from '@pages/Search/EmptySearchView';
+import variables from '@styles/variables';
+import CONST from '@src/CONST';
+import ONYXKEYS from '@src/ONYXKEYS';
+import ROUTES from '@src/ROUTES';
+import type SearchResults from '@src/types/onyx/SearchResults';
+import {useSearchContext} from './SearchContext';
+import SearchPageHeader from './SearchPageHeader';
+import SearchStatusBar from './SearchStatusBar';
+import type {SearchColumnType, SearchQueryJSON, SearchStatus, SelectedTransactionInfo, SelectedTransactions, SortOrder} from './types';
+
+type SearchProps = {
+    queryJSON: SearchQueryJSON;
+    isCustomQuery: boolean;
+};
+
+const transactionItemMobileHeight = 100;
+const reportItemTransactionHeight = 52;
+const listItemPadding = 12; // this is equivalent to 'mb3' on every transaction/report list item
+const searchHeaderHeight = 54;
+const sortableSearchStatuses: SearchStatus[] = [CONST.SEARCH.STATUS.EXPENSE.ALL];
+
+function mapTransactionItemToSelectedEntry(item: TransactionListItemType): [string, SelectedTransactionInfo] {
+    return [item.keyForList, {isSelected: true, canDelete: item.canDelete, canHold: item.canHold, canUnhold: item.canUnhold, action: item.action}];
+}
+
+function mapToTransactionItemWithSelectionInfo(item: TransactionListItemType, selectedTransactions: SelectedTransactions, canSelectMultiple: boolean) {
+    return {...item, isSelected: selectedTransactions[item.keyForList]?.isSelected && canSelectMultiple};
+}
+
+function mapToItemWithSelectionInfo(item: TransactionListItemType | ReportListItemType, selectedTransactions: SelectedTransactions, canSelectMultiple: boolean) {
+    return SearchUtils.isTransactionListItemType(item)
+        ? mapToTransactionItemWithSelectionInfo(item, selectedTransactions, canSelectMultiple)
+        : {
+              ...item,
+              transactions: item.transactions?.map((transaction) => mapToTransactionItemWithSelectionInfo(transaction, selectedTransactions, canSelectMultiple)),
+              isSelected: item.transactions.every((transaction) => selectedTransactions[transaction.keyForList]?.isSelected && canSelectMultiple),
+          };
+}
+
+function prepareTransactionsList(item: TransactionListItemType, selectedTransactions: SelectedTransactions) {
+    if (selectedTransactions[item.keyForList]?.isSelected) {
+        const {[item.keyForList]: omittedTransaction, ...transactions} = selectedTransactions;
+
+        return transactions;
+    }
+
+    return {...selectedTransactions, [item.keyForList]: {isSelected: true, canDelete: item.canDelete, canHold: item.canHold, canUnhold: item.canUnhold, action: item.action}};
+}
+
+function Search({queryJSON, isCustomQuery}: SearchProps) {
+    const {isOffline} = useNetwork();
+    const {translate} = useLocalize();
+    const styles = useThemeStyles();
+    const {isLargeScreenWidth, isSmallScreenWidth} = useWindowDimensions();
+    const navigation = useNavigation<StackNavigationProp<AuthScreensParamList>>();
+    const lastSearchResultsRef = useRef<OnyxEntry<SearchResults>>();
+    const {setCurrentSearchHash, setSelectedTransactions, selectedTransactions, clearSelectedTransactions} = useSearchContext();
+    const [selectionMode] = useOnyx(ONYXKEYS.MOBILE_SELECTION_MODE);
+    const [offset, setOffset] = useState(0);
+    const [offlineModalVisible, setOfflineModalVisible] = useState(false);
+
+    const [selectedTransactionsToDelete, setSelectedTransactionsToDelete] = useState<string[]>([]);
+    const [deleteExpensesConfirmModalVisible, setDeleteExpensesConfirmModalVisible] = useState(false);
+    const [downloadErrorModalVisible, setDownloadErrorModalVisible] = useState(false);
+    const {type, status, sortBy, sortOrder, hash} = queryJSON;
+
+    const [currentSearchResults] = useOnyx(`${ONYXKEYS.COLLECTION.SNAPSHOT}${hash}`);
+
+    const canSelectMultiple = isSmallScreenWidth ? !!selectionMode?.isEnabled : true;
+
+    useEffect(() => {
+        clearSelectedTransactions(hash);
+        setCurrentSearchHash(hash);
+    }, [hash, clearSelectedTransactions, setCurrentSearchHash]);
+
+    useEffect(() => {
+        const selectedKeys = Object.keys(selectedTransactions).filter((key) => selectedTransactions[key]);
+        if (!isSmallScreenWidth) {
+            if (selectedKeys.length === 0) {
+                turnOffMobileSelectionMode();
+            }
+            return;
+        }
+        if (selectedKeys.length > 0 && !selectionMode?.isEnabled) {
+            turnOnMobileSelectionMode();
+        }
+    }, [isSmallScreenWidth, selectedTransactions, selectionMode?.isEnabled]);
+
+    useEffect(() => {
+        if (isOffline) {
+            return;
+        }
+
+        SearchActions.search({queryJSON, offset});
+        // eslint-disable-next-line react-compiler/react-compiler, react-hooks/exhaustive-deps
+    }, [isOffline, offset, queryJSON]);
+
+    const handleOnCancelConfirmModal = () => {
+        setDeleteExpensesConfirmModalVisible(false);
+    };
+
+    const handleDeleteExpenses = () => {
+        if (selectedTransactionsToDelete.length === 0) {
+            return;
+        }
+
+        clearSelectedTransactions();
+        setDeleteExpensesConfirmModalVisible(false);
+        SearchActions.deleteMoneyRequestOnSearch(hash, selectedTransactionsToDelete);
+    };
+
+    const handleOnSelectDeleteOption = (itemsToDelete: string[]) => {
+        setSelectedTransactionsToDelete(itemsToDelete);
+        setDeleteExpensesConfirmModalVisible(true);
+    };
+
+    const getItemHeight = useCallback(
+        (item: TransactionListItemType | ReportListItemType) => {
+            if (SearchUtils.isTransactionListItemType(item)) {
+                return isLargeScreenWidth ? variables.optionRowHeight + listItemPadding : transactionItemMobileHeight + listItemPadding;
+            }
+
+            if (item.transactions.length === 0) {
+                return 0;
+            }
+
+            if (item.transactions.length === 1) {
+                return isLargeScreenWidth ? variables.optionRowHeight + listItemPadding : transactionItemMobileHeight + listItemPadding;
+            }
+
+            const baseReportItemHeight = isLargeScreenWidth ? 72 : 108;
+            return baseReportItemHeight + item.transactions.length * reportItemTransactionHeight + listItemPadding;
+        },
+        [isLargeScreenWidth],
+    );
+
+    const getItemHeightMemoized = memoize((item: TransactionListItemType | ReportListItemType) => getItemHeight(item), {
+        transformKey: ([item]) => {
+            // List items are displayed differently on "L"arge and "N"arrow screens so the height will differ
+            // in addition the same items might be displayed as part of different Search screens ("Expenses", "All", "Finished")
+            const screenSizeHash = isLargeScreenWidth ? 'L' : 'N';
+            return `${hash}-${item.keyForList}-${screenSizeHash}`;
+        },
+    });
+
+    // save last non-empty search results to avoid ugly flash of loading screen when hash changes and onyx returns empty data
+    if (currentSearchResults?.data && currentSearchResults !== lastSearchResultsRef.current) {
+        lastSearchResultsRef.current = currentSearchResults;
+    }
+
+    const searchResults = currentSearchResults?.data ? currentSearchResults : lastSearchResultsRef.current;
+
+    // There's a race condition in Onyx which makes it return data from the previous Search, so in addition to checking that the data is loaded
+    // we also need to check that the searchResults matches the type and status of the current search
+    const isDataLoaded = searchResults?.data !== undefined && searchResults?.search?.type === type && searchResults?.search?.status === status;
+    const shouldShowLoadingState = !isOffline && !isDataLoaded;
+    const shouldShowLoadingMoreItems = !shouldShowLoadingState && searchResults?.search?.isLoading && searchResults?.search?.offset > 0;
+    const isSearchResultsEmpty = !searchResults?.data || SearchUtils.isSearchResultsEmpty(searchResults);
+    const prevIsSearchResultEmpty = usePrevious(isSearchResultsEmpty);
+
+    useEffect(() => {
+        if (!isSearchResultsEmpty || prevIsSearchResultEmpty) {
+            return;
+        }
+        turnOffMobileSelectionMode();
+    }, [isSearchResultsEmpty, prevIsSearchResultEmpty]);
+
+    if (shouldShowLoadingState) {
+        return (
+            <>
+                <SearchPageHeader
+                    isCustomQuery={isCustomQuery}
+                    queryJSON={queryJSON}
+                    hash={hash}
+                />
+                <SearchRowSkeleton shouldAnimate />
+            </>
+        );
+    }
+
+    if (searchResults === undefined) {
+        Log.alert('[Search] Undefined search type');
+        return null;
+    }
+
+    const ListItem = SearchUtils.getListItem(status);
+    const data = SearchUtils.getSections(status, searchResults.data, searchResults.search);
+    const sortedData = SearchUtils.getSortedSections(status, data, sortBy, sortOrder);
+    const sortedSelectedData = sortedData.map((item) => mapToItemWithSelectionInfo(item, selectedTransactions, canSelectMultiple));
+
+    const shouldShowEmptyState = !isDataLoaded || data.length === 0;
+
+    if (shouldShowEmptyState) {
+        return (
+            <>
+                <SearchPageHeader
+                    isCustomQuery={isCustomQuery}
+                    queryJSON={queryJSON}
+                    hash={hash}
+                />
+                <SearchStatusBar
+                    type={type}
+                    status={status}
+                />
+                <EmptySearchView type={type} />
+            </>
+        );
+    }
+
+    const toggleTransaction = (item: TransactionListItemType | ReportListItemType) => {
+        if (SearchUtils.isTransactionListItemType(item)) {
+            if (!item.keyForList) {
+                return;
+            }
+
+            setSelectedTransactions(prepareTransactionsList(item, selectedTransactions));
+            return;
+        }
+
+        if (item.transactions.every((transaction) => selectedTransactions[transaction.keyForList]?.isSelected)) {
+            const reducedSelectedTransactions: SelectedTransactions = {...selectedTransactions};
+
+            item.transactions.forEach((transaction) => {
+                delete reducedSelectedTransactions[transaction.keyForList];
+            });
+
+            setSelectedTransactions(reducedSelectedTransactions);
+            return;
+        }
+
+        setSelectedTransactions({
+            ...selectedTransactions,
+            ...Object.fromEntries(item.transactions.map(mapTransactionItemToSelectedEntry)),
+        });
+    };
+
+    const openReport = (item: TransactionListItemType | ReportListItemType) => {
+        let reportID = SearchUtils.isTransactionListItemType(item) && !item.isFromOneTransactionReport ? item.transactionThreadReportID : item.reportID;
+
+        if (!reportID) {
+            return;
+        }
+
+        // If we're trying to open a legacy transaction without a transaction thread, let's create the thread and navigate the user
+        if (SearchUtils.isTransactionListItemType(item) && reportID === '0' && item.moneyRequestReportActionID) {
+            reportID = ReportUtils.generateReportID();
+            SearchActions.createTransactionThread(hash, item.transactionID, reportID, item.moneyRequestReportActionID);
+        }
+
+        Navigation.navigate(ROUTES.SEARCH_REPORT.getRoute(reportID));
+    };
+
+    const fetchMoreResults = () => {
+        if (!searchResults?.search?.hasMoreResults || shouldShowLoadingState || shouldShowLoadingMoreItems) {
+            return;
+        }
+        setOffset(offset + CONST.SEARCH.RESULTS_PAGE_SIZE);
+    };
+
+    const toggleAllTransactions = () => {
+        const areItemsOfReportType = status !== CONST.SEARCH.STATUS.EXPENSE.ALL;
+        const flattenedItems = areItemsOfReportType ? (data as ReportListItemType[]).flatMap((item) => item.transactions) : data;
+        const isAllSelected = flattenedItems.length === Object.keys(selectedTransactions).length;
+
+        if (isAllSelected) {
+            clearSelectedTransactions();
+            return;
+        }
+
+        if (areItemsOfReportType) {
+            setSelectedTransactions(Object.fromEntries((data as ReportListItemType[]).flatMap((item) => item.transactions.map(mapTransactionItemToSelectedEntry))));
+
+            return;
+        }
+
+        setSelectedTransactions(Object.fromEntries((data as TransactionListItemType[]).map(mapTransactionItemToSelectedEntry)));
+    };
+
+    const onSortPress = (column: SearchColumnType, order: SortOrder) => {
+        const newQuery = SearchUtils.buildSearchQueryString({...queryJSON, sortBy: column, sortOrder: order});
+        navigation.setParams({q: newQuery});
+    };
+
+    const shouldShowYear = SearchUtils.shouldShowYear(searchResults?.data);
+    const shouldShowSorting = sortableSearchStatuses.includes(status);
+
+    return (
+        <>
+            <SearchPageHeader
+                isCustomQuery={isCustomQuery}
+                queryJSON={queryJSON}
+                hash={hash}
+                onSelectDeleteOption={handleOnSelectDeleteOption}
+                data={data}
+                setOfflineModalOpen={() => setOfflineModalVisible(true)}
+                setDownloadErrorModalOpen={() => setDownloadErrorModalVisible(true)}
+            />
+            <SearchStatusBar
+                type={type}
+                status={status}
+            />
+            <SelectionListWithModal<ReportListItemType | TransactionListItemType>
+                sections={[{data: sortedSelectedData, isDisabled: false}]}
+                turnOnSelectionModeOnLongPress
+                onTurnOnSelectionMode={(item) => item && toggleTransaction(item)}
+                onCheckboxPress={toggleTransaction}
+                onSelectAll={toggleAllTransactions}
+                customListHeader={
+                    !isLargeScreenWidth ? null : (
+                        <SearchTableHeader
+                            data={searchResults?.data}
+                            metadata={searchResults?.search}
+                            onSortPress={onSortPress}
+                            sortOrder={sortOrder}
+                            sortBy={sortBy}
+                            shouldShowYear={shouldShowYear}
+                            shouldShowSorting={shouldShowSorting}
+                        />
+                    )
+                }
+                canSelectMultiple={canSelectMultiple}
+                customListHeaderHeight={searchHeaderHeight}
+                // To enhance the smoothness of scrolling and minimize the risk of encountering blank spaces during scrolling,
+                // we have configured a larger windowSize and a longer delay between batch renders.
+                // The windowSize determines the number of items rendered before and after the currently visible items.
+                // A larger windowSize helps pre-render more items, reducing the likelihood of blank spaces appearing.
+                // The updateCellsBatchingPeriod sets the delay (in milliseconds) between rendering batches of cells.
+                // A longer delay allows the UI to handle rendering in smaller increments, which can improve performance and smoothness.
+                // For more information, refer to the React Native documentation:
+                // https://reactnative.dev/docs/0.73/optimizing-flatlist-configuration#windowsize
+                // https://reactnative.dev/docs/0.73/optimizing-flatlist-configuration#updatecellsbatchingperiod
+                windowSize={111}
+                updateCellsBatchingPeriod={200}
+                ListItem={ListItem}
+                onSelectRow={openReport}
+                getItemHeight={getItemHeightMemoized}
+                shouldSingleExecuteRowSelect
+                shouldPreventDefaultFocusOnSelectRow={!DeviceCapabilities.canUseTouchScreen()}
+                listHeaderWrapperStyle={[styles.ph8, styles.pv3, styles.pb5]}
+                containerStyle={[styles.pv0]}
+                showScrollIndicator={false}
+                onEndReachedThreshold={0.75}
+                onEndReached={fetchMoreResults}
+                listFooterContent={
+                    shouldShowLoadingMoreItems ? (
+                        <SearchRowSkeleton
+                            shouldAnimate
+                            fixedNumItems={5}
+                        />
+                    ) : undefined
+                }
+            />
+            <ConfirmModal
+                isVisible={deleteExpensesConfirmModalVisible}
+                onConfirm={handleDeleteExpenses}
+                onCancel={handleOnCancelConfirmModal}
+                onModalHide={() => setSelectedTransactionsToDelete([])}
+                title={translate('iou.deleteExpense', {count: selectedTransactionsToDelete.length})}
+                prompt={translate('iou.deleteConfirmation', {count: selectedTransactionsToDelete.length})}
+                confirmText={translate('common.delete')}
+                cancelText={translate('common.cancel')}
+                danger
+            />
+            <DecisionModal
+                title={translate('common.youAppearToBeOffline')}
+                prompt={translate('common.offlinePrompt')}
+                isSmallScreenWidth={isSmallScreenWidth}
+                onSecondOptionSubmit={() => setOfflineModalVisible(false)}
+                secondOptionText={translate('common.buttonConfirm')}
+                isVisible={offlineModalVisible}
+                onClose={() => setOfflineModalVisible(false)}
+            />
+            <DecisionModal
+                title={translate('common.downloadFailedTitle')}
+                prompt={translate('common.downloadFailedDescription')}
+                isSmallScreenWidth={isSmallScreenWidth}
+                onSecondOptionSubmit={() => setDownloadErrorModalVisible(false)}
+                secondOptionText={translate('common.buttonConfirm')}
+                isVisible={downloadErrorModalVisible}
+                onClose={() => setDownloadErrorModalVisible(false)}
+            />
+        </>
+    );
+}
+
+Search.displayName = 'Search';
+
+export type {SearchProps};
+export default Search;
diff --git a/src/components/Search/types.ts b/src/components/Search/types.ts
new file mode 100644
index 000000000000..9f2aca1ff957
--- /dev/null
+++ b/src/components/Search/types.ts
@@ -0,0 +1,91 @@
+import type {ValueOf} from 'react-native-gesture-handler/lib/typescript/typeUtils';
+import type CONST from '@src/CONST';
+import type {SearchDataTypes} from '@src/types/onyx/SearchResults';
+
+/** Model of the selected transaction */
+type SelectedTransactionInfo = {
+    /** Whether the transaction is selected */
+    isSelected: boolean;
+
+    /** If the transaction can be deleted */
+    canDelete: boolean;
+
+    /** If the transaction can be put on hold */
+    canHold: boolean;
+
+    /** If the transaction can be removed from hold */
+    canUnhold: boolean;
+
+    /** The action that can be performed for the transaction */
+    action: string;
+};
+
+/** Model of selected results */
+type SelectedTransactions = Record<string, SelectedTransactionInfo>;
+
+type SortOrder = ValueOf<typeof CONST.SEARCH.SORT_ORDER>;
+type SearchColumnType = ValueOf<typeof CONST.SEARCH.TABLE_COLUMNS>;
+type ExpenseSearchStatus = ValueOf<typeof CONST.SEARCH.STATUS.EXPENSE>;
+type InvoiceSearchStatus = ValueOf<typeof CONST.SEARCH.STATUS.INVOICE>;
+type TripSearchStatus = ValueOf<typeof CONST.SEARCH.STATUS.TRIP>;
+type SearchStatus = ExpenseSearchStatus | InvoiceSearchStatus | TripSearchStatus;
+
+type SearchContext = {
+    currentSearchHash: number;
+    selectedTransactions: SelectedTransactions;
+    setCurrentSearchHash: (hash: number) => void;
+    setSelectedTransactions: (selectedTransactions: SelectedTransactions) => void;
+    clearSelectedTransactions: (hash?: number) => void;
+};
+
+type ASTNode = {
+    operator: ValueOf<typeof CONST.SEARCH.SYNTAX_OPERATORS>;
+    left: ValueOf<typeof CONST.SEARCH.SYNTAX_FILTER_KEYS> | ASTNode;
+    right: string | ASTNode;
+};
+
+type QueryFilter = {
+    operator: ValueOf<typeof CONST.SEARCH.SYNTAX_OPERATORS>;
+    value: string | number;
+};
+
+type AdvancedFiltersKeys = ValueOf<typeof CONST.SEARCH.SYNTAX_FILTER_KEYS> | typeof CONST.SEARCH.SYNTAX_ROOT_KEYS.TYPE | typeof CONST.SEARCH.SYNTAX_ROOT_KEYS.STATUS;
+
+type QueryFilters = {
+    [K in AdvancedFiltersKeys]?: QueryFilter[];
+};
+
+type SearchQueryString = string;
+
+type SearchQueryAST = {
+    type: SearchDataTypes;
+    status: SearchStatus;
+    sortBy: SearchColumnType;
+    sortOrder: SortOrder;
+    filters: ASTNode;
+    policyID?: string;
+};
+
+type SearchQueryJSON = {
+    inputQuery: SearchQueryString;
+    hash: number;
+} & SearchQueryAST;
+
+export type {
+    SelectedTransactionInfo,
+    SelectedTransactions,
+    SearchColumnType,
+    SearchStatus,
+    SearchQueryAST,
+    SearchQueryJSON,
+    SearchQueryString,
+    SortOrder,
+    SearchContext,
+    ASTNode,
+    QueryFilter,
+    QueryFilters,
+    AdvancedFiltersKeys,
+    ExpenseSearchStatus,
+    InvoiceSearchStatus,
+    TripSearchStatus,
+};
diff --git a/src/components/Section/IconSection.tsx b/src/components/Section/IconSection.tsx
index cc42c6b7ace5..df5392027df4 100644
--- a/src/components/Section/IconSection.tsx
+++ b/src/components/Section/IconSection.tsx
@@ -3,14 +3,20 @@ import type {StyleProp, ViewStyle} from 'react-native';
 import {View} from 'react-native';
 import Icon from '@components/Icon';
 import useThemeStyles from '@hooks/useThemeStyles';
+import variables from '@styles/variables';
 import type IconAsset from '@src/types/utils/IconAsset';
 
 type IconSectionProps = {
     icon?: IconAsset;
     iconContainerStyles?: StyleProp<ViewStyle>;
+    /** The width of the icon. */
+    width?: number;
+
+    /** The height of the icon. */
+    height?: number;
 };
 
-function IconSection({icon, iconContainerStyles}: IconSectionProps) {
+function IconSection({icon, iconContainerStyles, width = variables.menuIconSize, height = variables.menuIconSize}: IconSectionProps) {
     const styles = useThemeStyles();
 
     return (
@@ -18,8 +24,8 @@ function IconSection({icon, iconContainerStyles}: IconSectionProps) {
             {!!icon && (
                 <Icon
                     src={icon}
-                    height={68}
-                    width={68}
+                    height={height}
+                    width={width}
                 />
             )}
         </View>
diff --git a/src/components/Section/index.tsx b/src/components/Section/index.tsx
index 7f7d759c72aa..67ad0c95856d 100644
--- a/src/components/Section/index.tsx
+++ b/src/components/Section/index.tsx
@@ -1,17 +1,19 @@
-import React from 'react';
 import type {ReactNode} from 'react';
+import React from 'react';
 import type {StyleProp, TextStyle, ViewStyle} from 'react-native';
 import {View} from 'react-native';
 import type {ValueOf} from 'type-fest';
+import ImageSVG from '@components/ImageSVG';
 import Lottie from '@components/Lottie';
 import type DotLottieAnimation from '@components/LottieAnimations/types';
 import type {MenuItemWithLink} from '@components/MenuItemList';
 import MenuItemList from '@components/MenuItemList';
 import Text from '@components/Text';
+import useResponsiveLayout from '@hooks/useResponsiveLayout';
 import useStyleUtils from '@hooks/useStyleUtils';
 import useTheme from '@hooks/useTheme';
 import useThemeStyles from '@hooks/useThemeStyles';
-import useWindowDimensions from '@hooks/useWindowDimensions';
+import isIllustrationLottieAnimation from '@libs/isIllustrationLottieAnimation';
 import type ChildrenProps from '@src/types/utils/ChildrenProps';
 import type IconAsset from '@src/types/utils/IconAsset';
 import IconSection from './IconSection';
@@ -22,12 +24,12 @@ const CARD_LAYOUT = {
     ICON_ON_RIGHT: 'iconOnRight',
 } as const;
 
-type SectionProps = ChildrenProps & {
+type SectionProps = Partial<ChildrenProps> & {
     /** An array of props that are passed to individual MenuItem components */
     menuItems?: MenuItemWithLink[];
 
     /** The text to display in the title of the section */
-    title: string;
+    title?: string;
 
     /** The text to display in the subtitle of the section */
     subtitle?: string;
@@ -59,12 +61,15 @@ type SectionProps = ChildrenProps & {
     /** Whether the section is in the central pane of the layout */
     isCentralPane?: boolean;
 
-    /** The illustration to display in the header. Can be a JSON object representing a Lottie animation. */
-    illustration?: DotLottieAnimation;
+    /** The illustration to display in the header. Can be an image or a JSON object representing a Lottie animation. */
+    illustration?: DotLottieAnimation | IconAsset;
 
     /** The background color to apply in the upper half of the screen. */
     illustrationBackgroundColor?: string;
 
+    /** Customize the Illustration container */
+    illustrationContainerStyle?: StyleProp<ViewStyle>;
+
     /** Styles to apply to illustration component */
     illustrationStyle?: StyleProp<ViewStyle>;
 
@@ -76,6 +81,18 @@ type SectionProps = ChildrenProps & {
 
     /** The component to display in the title of the section */
     renderSubtitle?: () => ReactNode;
+
+    /** The component to display custom title */
+    renderTitle?: () => ReactNode;
+
+    /** The width of the icon. */
+    iconWidth?: number;
+
+    /** The height of the icon. */
+    iconHeight?: number;
+
+    /** Banner to display at the top of the section */
+    banner?: ReactNode;
 };
 
 function Section({
@@ -90,57 +107,84 @@ function Section({
     subtitleStyles,
     subtitleMuted = false,
     title,
+    renderTitle,
     titleStyles,
     isCentralPane = false,
     illustration,
     illustrationBackgroundColor,
+    illustrationContainerStyle,
     illustrationStyle,
     contentPaddingOnLargeScreens,
     overlayContent,
+    iconWidth,
+    iconHeight,
     renderSubtitle,
+    banner = null,
 }: SectionProps) {
     const styles = useThemeStyles();
     const theme = useTheme();
     const StyleUtils = useStyleUtils();
-    const {isSmallScreenWidth} = useWindowDimensions();
+    const {shouldUseNarrowLayout} = useResponsiveLayout();
 
-    const illustrationContainerStyle: StyleProp<ViewStyle> = StyleUtils.getBackgroundColorStyle(illustrationBackgroundColor ?? illustration?.backgroundColor ?? theme.appBG);
+    const isLottie = isIllustrationLottieAnimation(illustration);
 
+    const lottieIllustration = isLottie ? illustration : undefined;
     return (
         <View style={[styles.pageWrapper, styles.cardSectionContainer, containerStyles, (isCentralPane || !!illustration) && styles.p0]}>
+            {banner}
             {cardLayout === CARD_LAYOUT.ICON_ON_TOP && (
                 <IconSection
+                    width={iconWidth}
+                    height={iconHeight}
                     icon={icon}
                     iconContainerStyles={[iconContainerStyles, styles.alignSelfStart, styles.mb3]}
                 />
             )}
             {!!illustration && (
-                <View style={[styles.w100, styles.dFlex, styles.alignItemsCenter, styles.justifyContentCenter, illustrationContainerStyle]}>
+                <View
+                    style={[
+                        styles.w100,
+                        styles.dFlex,
+                        styles.alignItemsCenter,
+                        styles.justifyContentCenter,
+                        StyleUtils.getBackgroundColorStyle(illustrationBackgroundColor ?? lottieIllustration?.backgroundColor ?? theme.appBG),
+                        illustrationContainerStyle,
+                    ]}
+                >
                     <View style={[styles.cardSectionIllustration, illustrationStyle]}>
-                        <Lottie
-                            source={illustration}
-                            style={styles.h100}
-                            webStyle={styles.h100}
-                            autoPlay
-                            loop
-                        />
+                        {isLottie ? (
+                            <Lottie
+                                source={illustration}
+                                style={styles.h100}
+                                webStyle={styles.h100}
+                                autoPlay
+                                loop
+                            />
+                        ) : (
+                            <ImageSVG
+                                src={illustration}
+                                contentFit="contain"
+                            />
+                        )}
                     </View>
                     {overlayContent?.()}
                 </View>
             )}
-            <View style={[styles.w100, isCentralPane && (isSmallScreenWidth ? styles.p5 : contentPaddingOnLargeScreens ?? styles.p8)]}>
+            <View style={[styles.w100, isCentralPane && (shouldUseNarrowLayout ? styles.p5 : contentPaddingOnLargeScreens ?? styles.p8)]}>
                 <View style={[styles.flexRow, styles.alignItemsCenter, styles.w100, cardLayout === CARD_LAYOUT.ICON_ON_TOP && styles.mh1]}>
                     {cardLayout === CARD_LAYOUT.ICON_ON_LEFT && (
                         <IconSection
+                            width={iconWidth}
+                            height={iconHeight}
                             icon={icon}
                             iconContainerStyles={[styles.flexGrow0, styles.justifyContentStart, iconContainerStyles]}
                         />
                     )}
-                    <View style={[styles.flexShrink1]}>
-                        <Text style={[styles.textHeadline, styles.cardSectionTitle, titleStyles]}>{title}</Text>
-                    </View>
+                    <View style={[styles.flexShrink1]}>{renderTitle ? renderTitle() : <Text style={[styles.textHeadline, styles.cardSectionTitle, titleStyles]}>{title}</Text>}</View>
                     {cardLayout === CARD_LAYOUT.ICON_ON_RIGHT && (
                         <IconSection
+                            width={iconWidth}
+                            height={iconHeight}
                             icon={icon}
                             iconContainerStyles={iconContainerStyles}
                         />
diff --git a/src/components/SectionList/index.android.tsx b/src/components/SectionList/index.android.tsx
index 04cdd70e9ee2..60c769945b8e 100644
--- a/src/components/SectionList/index.android.tsx
+++ b/src/components/SectionList/index.android.tsx
@@ -11,7 +11,7 @@ function SectionListWithRef<ItemT, SectionT>(props: SectionListProps<ItemT, Sect
             // For Android we want to use removeClippedSubviews since it helps manage memory consumption. When we
             // run out memory images stop loading and appear as grey circles
             // eslint-disable-next-line react/jsx-props-no-multi-spaces
-            removeClippedSubviews
+            removeClippedSubviews={props.removeClippedSubviews ?? true}
         />
     );
 }
diff --git a/src/components/SelectionList/BaseListItem.tsx b/src/components/SelectionList/BaseListItem.tsx
index 2a77d101f6b3..a78944b50112 100644
--- a/src/components/SelectionList/BaseListItem.tsx
+++ b/src/components/SelectionList/BaseListItem.tsx
@@ -5,6 +5,7 @@ import * as Expensicons from '@components/Icon/Expensicons';
 import OfflineWithFeedback from '@components/OfflineWithFeedback';
 import PressableWithFeedback from '@components/Pressable/PressableWithFeedback';
 import useHover from '@hooks/useHover';
+import {useMouseContext} from '@hooks/useMouseContext';
 import useSyncFocus from '@hooks/useSyncFocus';
 import useTheme from '@hooks/useTheme';
 import useThemeStyles from '@hooks/useThemeStyles';
@@ -17,7 +18,6 @@ function BaseListItem<TItem extends ListItem>({
     wrapperStyle,
     containerStyle,
     isDisabled = false,
-    shouldPreventDefaultFocusOnSelectRow = false,
     shouldPreventEnterKeySubmit = false,
     canSelectMultiple = false,
     onSelectRow,
@@ -32,15 +32,21 @@ function BaseListItem<TItem extends ListItem>({
     shouldSyncFocus = true,
     onFocus = () => {},
     hoverStyle,
+    onLongPressRow,
 }: BaseListItemProps<TItem>) {
     const theme = useTheme();
     const styles = useThemeStyles();
     const {hovered, bind} = useHover();
+    const {isMouseDownOnInput, setMouseUp} = useMouseContext();
 
-    const pressableRef = useRef<View | HTMLDivElement>(null);
+    const pressableRef = useRef<View>(null);
 
     // Sync focus on an item
-    useSyncFocus(pressableRef, Boolean(isFocused), shouldSyncFocus);
+    useSyncFocus(pressableRef, !!isFocused, shouldSyncFocus);
+    const handleMouseLeave = (e: React.MouseEvent<Element, MouseEvent>) => {
+        e.stopPropagation();
+        setMouseUp();
+    };
 
     const rightHandSideComponentRender = () => {
         if (canSelectMultiple || !rightHandSideComponent) {
@@ -48,7 +54,7 @@ function BaseListItem<TItem extends ListItem>({
         }
 
         if (typeof rightHandSideComponent === 'function') {
-            return rightHandSideComponent(item);
+            return rightHandSideComponent(item, isFocused);
         }
 
         return rightHandSideComponent;
@@ -66,22 +72,32 @@ function BaseListItem<TItem extends ListItem>({
                 // eslint-disable-next-line react/jsx-props-no-spreading
                 {...bind}
                 ref={pressableRef}
+                onLongPress={() => {
+                    onLongPressRow?.(item);
+                }}
                 onPress={(e) => {
+                    if (isMouseDownOnInput) {
+                        e?.stopPropagation(); // Preventing the click action
+                        return;
+                    }
                     if (shouldPreventEnterKeySubmit && e && 'key' in e && e.key === CONST.KEYBOARD_SHORTCUTS.ENTER.shortcutKey) {
                         return;
                     }
                     onSelectRow(item);
                 }}
-                disabled={isDisabled}
+                disabled={isDisabled && !item.isSelected}
+                interactive={item.isInteractive}
                 accessibilityLabel={item.text ?? ''}
                 role={CONST.ROLE.BUTTON}
                 hoverDimmingValue={1}
                 hoverStyle={[!item.isDisabled && styles.hoveredComponentBG, hoverStyle]}
                 dataSet={{[CONST.SELECTION_SCRAPER_HIDDEN_ELEMENT]: true}}
-                onMouseDown={shouldPreventDefaultFocusOnSelectRow ? (e) => e.preventDefault() : undefined}
+                onMouseDown={(e) => e.preventDefault()}
                 id={keyForList ?? ''}
                 style={pressableStyle}
                 onFocus={onFocus}
+                onMouseLeave={handleMouseLeave}
+                tabIndex={item.tabIndex}
             >
                 <View style={wrapperStyle}>
                     {typeof children === 'function' ? children(hovered) : children}
diff --git a/src/components/SelectionList/BaseSelectionList.tsx b/src/components/SelectionList/BaseSelectionList.tsx
index 76c54d3c37cb..7d8f4c1738c8 100644
--- a/src/components/SelectionList/BaseSelectionList.tsx
+++ b/src/components/SelectionList/BaseSelectionList.tsx
@@ -20,23 +20,31 @@ import useKeyboardShortcut from '@hooks/useKeyboardShortcut';
 import useKeyboardState from '@hooks/useKeyboardState';
 import useLocalize from '@hooks/useLocalize';
 import usePrevious from '@hooks/usePrevious';
+import useSingleExecution from '@hooks/useSingleExecution';
 import useThemeStyles from '@hooks/useThemeStyles';
 import getSectionsWithIndexOffset from '@libs/getSectionsWithIndexOffset';
 import Log from '@libs/Log';
+import * as SearchUtils from '@libs/SearchUtils';
 import variables from '@styles/variables';
 import CONST from '@src/CONST';
 import {isEmptyObject} from '@src/types/utils/EmptyObject';
+import arraysEqual from '@src/utils/arraysEqual';
 import type {BaseSelectionListProps, ButtonOrCheckBoxRoles, FlattenedSectionsReturn, ListItem, SectionListDataType, SectionWithIndexOffset, SelectionListHandle} from './types';
 
+const getDefaultItemHeight = () => variables.optionRowHeight;
+
 function BaseSelectionList<TItem extends ListItem>(
     {
         sections,
         ListItem,
+        shouldUseUserSkeletonView,
         canSelectMultiple = false,
         onSelectRow,
+        shouldSingleExecuteRowSelect = false,
         onCheckboxPress,
         onSelectAll,
         onDismissError,
+        getItemHeight = getDefaultItemHeight,
         textInputLabel = '',
         textInputPlaceholder = '',
         textInputValue = '',
@@ -53,11 +61,13 @@ function BaseSelectionList<TItem extends ListItem>(
         headerContent,
         footerContent,
         listFooterContent,
+        listEmptyContent,
         showScrollIndicator = true,
         showLoadingPlaceholder = false,
         showConfirmButton = false,
         shouldPreventDefaultFocusOnSelectRow = false,
         containerStyle,
+        sectionListStyle,
         disableKeyboardShortcuts = false,
         children,
         shouldStopPropagation = false,
@@ -67,8 +77,10 @@ function BaseSelectionList<TItem extends ListItem>(
         isLoadingNewOptions = false,
         onLayout,
         customListHeader,
+        customListHeaderHeight = 0,
         listHeaderWrapperStyle,
         isRowMultilineSupported = false,
+        isAlternateTextMultilineSupported = false,
         textInputRef,
         headerMessageStyle,
         shouldHideListOnInitialRender = true,
@@ -76,6 +88,16 @@ function BaseSelectionList<TItem extends ListItem>(
         sectionTitleStyles,
         textInputAutoFocus = true,
         shouldTextInputInterceptSwipe = false,
+        listHeaderContent,
+        onEndReached = () => {},
+        onEndReachedThreshold,
+        windowSize = 5,
+        updateCellsBatchingPeriod = 50,
+        removeClippedSubviews = true,
+        shouldDelayFocus = true,
+        shouldUpdateFocusedIndex = false,
+        onLongPressRow,
+        shouldShowListEmptyContent = true,
     }: BaseSelectionListProps<TItem>,
     ref: ForwardedRef<SelectionListHandle>,
 ) {
@@ -95,13 +117,15 @@ function BaseSelectionList<TItem extends ListItem>(
     const itemFocusTimeoutRef = useRef<NodeJS.Timeout | null>(null);
     const [currentPage, setCurrentPage] = useState(1);
     const isTextInputFocusedRef = useRef<boolean>(false);
+    const {singleExecution} = useSingleExecution();
 
     const incrementPage = () => setCurrentPage((prev) => prev + 1);
 
     /**
-     * Iterates through the sections and items inside each section, and builds 3 arrays along the way:
+     * Iterates through the sections and items inside each section, and builds 4 arrays along the way:
      * - `allOptions`: Contains all the items in the list, flattened, regardless of section
-     * - `disabledOptionsIndexes`: Contains the indexes of all the disabled items in the list, to be used by the ArrowKeyFocusManager
+     * - `disabledOptionsIndexes`: Contains the indexes of all the unselectable and disabled items in the list
+     * - `disabledArrowKeyOptionsIndexes`: Contains the indexes of item that is not navigatable by the arrow key. The list is separated from disabledOptionsIndexes because unselectable item is still navigatable by the arrow key.
      * - `itemLayouts`: Contains the layout information for each item, header and footer in the list,
      * so we can calculate the position of any given item when scrolling programmatically
      */
@@ -109,9 +133,11 @@ function BaseSelectionList<TItem extends ListItem>(
         const allOptions: TItem[] = [];
 
         const disabledOptionsIndexes: number[] = [];
+        const disabledArrowKeyOptionsIndexes: number[] = [];
         let disabledIndex = 0;
 
-        let offset = 0;
+        // need to account that the list might have some extra content above it
+        let offset = customListHeader ? customListHeaderHeight : 0;
         const itemLayouts = [{length: 0, offset}];
 
         const selectedOptions: TItem[] = [];
@@ -130,18 +156,22 @@ function BaseSelectionList<TItem extends ListItem>(
                 });
 
                 // If disabled, add to the disabled indexes array
+                const isItemDisabled = !!section.isDisabled || (item.isDisabled && !item.isSelected);
                 // eslint-disable-next-line @typescript-eslint/prefer-nullish-coalescing
-                if (!!section.isDisabled || item.isDisabled || item.isDisabledCheckbox) {
+                if (isItemDisabled || item.isDisabledCheckbox) {
                     disabledOptionsIndexes.push(disabledIndex);
+                    if (isItemDisabled) {
+                        disabledArrowKeyOptionsIndexes.push(disabledIndex);
+                    }
                 }
                 disabledIndex += 1;
 
                 // Account for the height of the item in getItemLayout
-                const fullItemHeight = variables.optionRowHeight;
+                const fullItemHeight = getItemHeight(item);
                 itemLayouts.push({length: fullItemHeight, offset});
                 offset += fullItemHeight;
 
-                if (item.isSelected) {
+                if (item.isSelected && !selectedOptions.find((option) => option.keyForList === item.keyForList)) {
                     selectedOptions.push(item);
                 }
             });
@@ -165,13 +195,14 @@ function BaseSelectionList<TItem extends ListItem>(
             allOptions,
             selectedOptions,
             disabledOptionsIndexes,
+            disabledArrowKeyOptionsIndexes,
             itemLayouts,
             allSelected: selectedOptions.length > 0 && selectedOptions.length === allOptions.length - disabledOptionsIndexes.length,
         };
-    }, [canSelectMultiple, sections]);
+    }, [canSelectMultiple, sections, customListHeader, customListHeaderHeight, getItemHeight]);
 
     const [slicedSections, ShowMoreButtonInstance] = useMemo(() => {
-        let remainingOptionsLimit = CONST.MAX_OPTIONS_SELECTOR_PAGE_LENGTH * currentPage;
+        let remainingOptionsLimit = CONST.MAX_SELECTION_LIST_PAGE_LENGTH * currentPage;
         const processedSections = getSectionsWithIndexOffset(
             sections.map((section) => {
                 const data = !isEmpty(section.data) && remainingOptionsLimit > 0 ? section.data.slice(0, remainingOptionsLimit) : [];
@@ -184,11 +215,11 @@ function BaseSelectionList<TItem extends ListItem>(
             }),
         );
 
-        const shouldShowMoreButton = flattenedSections.allOptions.length > CONST.MAX_OPTIONS_SELECTOR_PAGE_LENGTH * currentPage;
+        const shouldShowMoreButton = flattenedSections.allOptions.length > CONST.MAX_SELECTION_LIST_PAGE_LENGTH * currentPage;
         const showMoreButton = shouldShowMoreButton ? (
             <ShowMoreButton
                 containerStyle={[styles.mt2, styles.mb5]}
-                currentCount={CONST.MAX_OPTIONS_SELECTOR_PAGE_LENGTH * currentPage}
+                currentCount={CONST.MAX_SELECTION_LIST_PAGE_LENGTH * currentPage}
                 totalCount={flattenedSections.allOptions.length}
                 onPress={incrementPage}
             />
@@ -196,7 +227,7 @@ function BaseSelectionList<TItem extends ListItem>(
         return [processedSections, showMoreButton];
         // we don't need to add styles here as they change
         // we don't need to add flattendedSections here as they will change along with sections
-        // eslint-disable-next-line react-hooks/exhaustive-deps
+        // eslint-disable-next-line react-compiler/react-compiler, react-hooks/exhaustive-deps
     }, [sections, currentPage]);
 
     // Disable `Enter` shortcut if the active element is a button or checkbox
@@ -222,28 +253,43 @@ function BaseSelectionList<TItem extends ListItem>(
             listRef.current.scrollToLocation({sectionIndex, itemIndex, animated, viewOffset: variables.contentHeaderHeight});
         },
 
-        // eslint-disable-next-line react-hooks/exhaustive-deps
+        // eslint-disable-next-line react-compiler/react-compiler, react-hooks/exhaustive-deps
         [flattenedSections.allOptions],
     );
 
+    const [disabledArrowKeyIndexes, setDisabledArrowKeyIndexes] = useState(flattenedSections.disabledArrowKeyOptionsIndexes);
+    useEffect(() => {
+        if (arraysEqual(disabledArrowKeyIndexes, flattenedSections.disabledArrowKeyOptionsIndexes)) {
+            return;
+        }
+
+        setDisabledArrowKeyIndexes(flattenedSections.disabledArrowKeyOptionsIndexes);
+        // eslint-disable-next-line react-compiler/react-compiler, react-hooks/exhaustive-deps
+    }, [flattenedSections.disabledArrowKeyOptionsIndexes]);
+
     // If `initiallyFocusedOptionKey` is not passed, we fall back to `-1`, to avoid showing the highlight on the first member
     const [focusedIndex, setFocusedIndex] = useArrowKeyFocusManager({
         initialFocusedIndex: flattenedSections.allOptions.findIndex((option) => option.keyForList === initiallyFocusedOptionKey),
-        maxIndex: Math.min(flattenedSections.allOptions.length - 1, CONST.MAX_OPTIONS_SELECTOR_PAGE_LENGTH * currentPage - 1),
-        disabledIndexes: flattenedSections.disabledOptionsIndexes,
-        isActive: true,
+        maxIndex: Math.min(flattenedSections.allOptions.length - 1, CONST.MAX_SELECTION_LIST_PAGE_LENGTH * currentPage - 1),
+        disabledIndexes: disabledArrowKeyIndexes,
+        isActive: isFocused,
         onFocusedIndexChange: (index: number) => {
             scrollToIndex(index, true);
         },
         isFocused,
     });
 
+    const clearInputAfterSelect = useCallback(() => {
+        onChangeText?.('');
+    }, [onChangeText]);
+
     /**
      * Logic to run when a row is selected, either with click/press or keyboard hotkeys.
      *
      * @param item - the list item
+     * @param indexToFocus - the list item index to focus
      */
-    const selectRow = (item: TItem) => {
+    const selectRow = (item: TItem, indexToFocus?: number) => {
         // 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) {
@@ -257,6 +303,14 @@ function BaseSelectionList<TItem extends ListItem>(
                     scrollToIndex(Math.max(selectedOptionsCount - 1, 0), true);
                 }
             }
+
+            if (shouldShowTextInput) {
+                clearInputAfterSelect();
+            }
+        }
+
+        if (shouldUpdateFocusedIndex && typeof indexToFocus === 'number') {
+            setFocusedIndex(indexToFocus);
         }
 
         onSelectRow(item);
@@ -277,7 +331,7 @@ function BaseSelectionList<TItem extends ListItem>(
     const selectFocusedOption = () => {
         const focusedOption = flattenedSections.allOptions[focusedIndex];
 
-        if (!focusedOption || focusedOption.isDisabled) {
+        if (!focusedOption || (focusedOption.isDisabled && !focusedOption.isSelected)) {
             return;
         }
 
@@ -321,7 +375,7 @@ function BaseSelectionList<TItem extends ListItem>(
             return <section.CustomSectionHeader section={section} />;
         }
 
-        if (!section.title || isEmptyObject(section.data)) {
+        if (!section.title || isEmptyObject(section.data) || listHeaderContent) {
             return null;
         }
 
@@ -331,40 +385,106 @@ function BaseSelectionList<TItem extends ListItem>(
             // we need to know the heights of all list items up-front in order to synchronously compute the layout of any given list item.
             // So be aware that if you adjust the content of the section header (for example, change the font size), you may need to adjust this explicit height as well.
             <View style={[styles.optionsListSectionHeader, styles.justifyContentCenter, sectionTitleStyles]}>
-                <Text style={[styles.ph4, styles.textLabelSupporting]}>{section.title}</Text>
+                <Text style={[styles.ph5, styles.textLabelSupporting]}>{section.title}</Text>
             </View>
         );
     };
 
+    const header = () => (
+        <>
+            {!headerMessage && canSelectMultiple && shouldShowSelectAll && (
+                <View style={[styles.userSelectNone, styles.peopleRow, styles.ph5, styles.pb3, listHeaderWrapperStyle, styles.selectionListStickyHeader]}>
+                    <View style={[styles.flexRow, styles.alignItemsCenter]}>
+                        <Checkbox
+                            accessibilityLabel={translate('workspace.people.selectAll')}
+                            isChecked={flattenedSections.allSelected}
+                            onPress={selectAllRow}
+                            disabled={flattenedSections.allOptions.length === flattenedSections.disabledOptionsIndexes.length}
+                        />
+                        {!customListHeader && (
+                            <PressableWithFeedback
+                                style={[styles.userSelectNone, styles.flexRow, styles.alignItemsCenter]}
+                                onPress={selectAllRow}
+                                accessibilityLabel={translate('workspace.people.selectAll')}
+                                role="button"
+                                accessibilityState={{checked: flattenedSections.allSelected}}
+                                disabled={flattenedSections.allOptions.length === flattenedSections.disabledOptionsIndexes.length}
+                                dataSet={{[CONST.SELECTION_SCRAPER_HIDDEN_ELEMENT]: true}}
+                                onMouseDown={shouldPreventDefaultFocusOnSelectRow ? (e) => e.preventDefault() : undefined}
+                            >
+                                <Text style={[styles.textStrong, styles.ph3]}>{translate('workspace.people.selectAll')}</Text>
+                            </PressableWithFeedback>
+                        )}
+                    </View>
+                    {customListHeader}
+                </View>
+            )}
+            {!headerMessage && !canSelectMultiple && customListHeader}
+        </>
+    );
+
     const renderItem = ({item, index, section}: SectionListRenderItemInfo<TItem, SectionWithIndexOffset<TItem>>) => {
         const normalizedIndex = index + (section?.indexOffset ?? 0);
         const isDisabled = !!section.isDisabled || item.isDisabled;
-        const isItemFocused = !isDisabled && (focusedIndex === normalizedIndex || itemsToHighlight?.has(item.keyForList ?? ''));
+        const isItemFocused = (!isDisabled || item.isSelected) && (focusedIndex === normalizedIndex || itemsToHighlight?.has(item.keyForList ?? ''));
         // We only create tooltips for the first 10 users or so since some reports have hundreds of users, causing performance to degrade.
         const showTooltip = shouldShowTooltips && normalizedIndex < 10;
 
+        const handleOnCheckboxPress = () => {
+            if (SearchUtils.isReportListItemType(item)) {
+                return onCheckboxPress;
+            }
+            return onCheckboxPress ? () => onCheckboxPress(item) : undefined;
+        };
+
         return (
-            <ListItem
-                item={item}
-                isFocused={isItemFocused}
-                isDisabled={isDisabled}
-                showTooltip={showTooltip}
-                canSelectMultiple={canSelectMultiple}
-                onSelectRow={() => selectRow(item)}
-                onCheckboxPress={onCheckboxPress ? () => onCheckboxPress?.(item) : undefined}
-                onDismissError={() => onDismissError?.(item)}
-                shouldPreventDefaultFocusOnSelectRow={shouldPreventDefaultFocusOnSelectRow}
-                // We're already handling the Enter key press in the useKeyboardShortcut hook, so we don't want the list item to submit the form
-                shouldPreventEnterKeySubmit
-                rightHandSideComponent={rightHandSideComponent}
-                keyForList={item.keyForList ?? ''}
-                isMultilineSupported={isRowMultilineSupported}
-                onFocus={() => setFocusedIndex(normalizedIndex)}
-                shouldSyncFocus={!isTextInputFocusedRef.current}
-            />
+            <>
+                <ListItem
+                    item={item}
+                    isFocused={isItemFocused}
+                    isDisabled={isDisabled}
+                    showTooltip={showTooltip}
+                    canSelectMultiple={canSelectMultiple}
+                    onLongPressRow={onLongPressRow}
+                    onSelectRow={() => {
+                        if (shouldSingleExecuteRowSelect) {
+                            singleExecution(() => selectRow(item, index))();
+                        } else {
+                            selectRow(item, index);
+                        }
+                    }}
+                    onCheckboxPress={handleOnCheckboxPress()}
+                    onDismissError={() => onDismissError?.(item)}
+                    shouldPreventDefaultFocusOnSelectRow={shouldPreventDefaultFocusOnSelectRow}
+                    // We're already handling the Enter key press in the useKeyboardShortcut hook, so we don't want the list item to submit the form
+                    shouldPreventEnterKeySubmit
+                    rightHandSideComponent={rightHandSideComponent}
+                    keyForList={item.keyForList ?? ''}
+                    isMultilineSupported={isRowMultilineSupported}
+                    isAlternateTextMultilineSupported={isAlternateTextMultilineSupported}
+                    onFocus={() => {
+                        if (isDisabled) {
+                            return;
+                        }
+                        setFocusedIndex(normalizedIndex);
+                    }}
+                    shouldSyncFocus={!isTextInputFocusedRef.current}
+                />
+                {item.footerContent && item.footerContent}
+            </>
         );
     };
 
+    const renderListEmptyContent = () => {
+        if (showLoadingPlaceholder) {
+            return <OptionsListSkeletonView shouldStyleAsTable={shouldUseUserSkeletonView} />;
+        }
+        if (shouldShowListEmptyContent) {
+            return listEmptyContent;
+        }
+        return null;
+    };
+
     const scrollToFocusedIndexOnFirstRender = useCallback(
         (nativeEvent: LayoutChangeEvent) => {
             if (shouldUseDynamicMaxToRenderPerBatch) {
@@ -398,39 +518,47 @@ function BaseSelectionList<TItem extends ListItem>(
         [scrollToIndex, setFocusedIndex],
     );
 
+    /** Function to focus text input */
+    const focusTextInput = useCallback(() => {
+        if (!innerTextInputRef.current) {
+            return;
+        }
+
+        innerTextInputRef.current.focus();
+    }, []);
+
     /** Focuses the text input when the component comes into focus and after any navigation animations finish. */
     useFocusEffect(
         useCallback(() => {
-            if (!textInputAutoFocus) {
-                return;
-            }
-            if (shouldShowTextInput) {
-                focusTimeoutRef.current = setTimeout(() => {
-                    if (!innerTextInputRef.current) {
-                        return;
-                    }
-                    innerTextInputRef.current.focus();
-                }, CONST.ANIMATED_TRANSITION);
-            }
-            return () => {
-                if (!focusTimeoutRef.current) {
-                    return;
+            if (textInputAutoFocus && shouldShowTextInput) {
+                if (shouldDelayFocus) {
+                    focusTimeoutRef.current = setTimeout(focusTextInput, CONST.ANIMATED_TRANSITION);
+                } else {
+                    focusTextInput();
                 }
-                clearTimeout(focusTimeoutRef.current);
-            };
-        }, [shouldShowTextInput, textInputAutoFocus]),
+            }
+
+            return () => focusTimeoutRef.current && clearTimeout(focusTimeoutRef.current);
+        }, [shouldShowTextInput, textInputAutoFocus, shouldDelayFocus, focusTextInput]),
     );
 
     const prevTextInputValue = usePrevious(textInputValue);
     const prevSelectedOptionsLength = usePrevious(flattenedSections.selectedOptions.length);
+    const prevAllOptionsLength = usePrevious(flattenedSections.allOptions.length);
 
     useEffect(() => {
         // Avoid changing focus if the textInputValue remains unchanged.
-        if ((prevTextInputValue === textInputValue && flattenedSections.selectedOptions.length === prevSelectedOptionsLength) || flattenedSections.allOptions.length === 0) {
+        if (
+            (prevTextInputValue === textInputValue && flattenedSections.selectedOptions.length === prevSelectedOptionsLength) ||
+            flattenedSections.allOptions.length === 0 ||
+            shouldUpdateFocusedIndex
+        ) {
             return;
         }
-        // Remove the focus if the search input is empty or selected options length is changed else focus on the first non disabled item
-        const newSelectedIndex = textInputValue === '' || flattenedSections.selectedOptions.length !== prevSelectedOptionsLength ? -1 : 0;
+        // Remove the focus if the search input is empty or selected options length is changed (and allOptions length remains the same)
+        // else focus on the first non disabled item
+        const newSelectedIndex =
+            textInputValue === '' || (flattenedSections.selectedOptions.length !== prevSelectedOptionsLength && prevAllOptionsLength === flattenedSections.allOptions.length) ? -1 : 0;
 
         // reseting the currrent page to 1 when the user types something
         setCurrentPage(1);
@@ -444,6 +572,8 @@ function BaseSelectionList<TItem extends ListItem>(
         textInputValue,
         updateAndScrollToFocusedIndex,
         prevSelectedOptionsLength,
+        prevAllOptionsLength,
+        shouldUpdateFocusedIndex,
     ]);
 
     useEffect(
@@ -484,7 +614,7 @@ function BaseSelectionList<TItem extends ListItem>(
         [flattenedSections.allOptions, setFocusedIndex, updateAndScrollToFocusedIndex],
     );
 
-    useImperativeHandle(ref, () => ({scrollAndHighlightItem}), [scrollAndHighlightItem]);
+    useImperativeHandle(ref, () => ({scrollAndHighlightItem, clearInputAfterSelect}), [scrollAndHighlightItem, clearInputAfterSelect]);
 
     /** Selects row when pressing Enter */
     useKeyboardShortcut(CONST.KEYBOARD_SHORTCUTS.ENTER, selectFocusedOption, {
@@ -515,9 +645,9 @@ function BaseSelectionList<TItem extends ListItem>(
     return (
         <SafeAreaConsumer>
             {({safeAreaPaddingBottomStyle}) => (
-                <View style={[styles.flex1, !isKeyboardShown && safeAreaPaddingBottomStyle, containerStyle]}>
+                <View style={[styles.flex1, (!isKeyboardShown || !!footerContent || showConfirmButton) && safeAreaPaddingBottomStyle, containerStyle]}>
                     {shouldShowTextInput && (
-                        <View style={[styles.ph4, styles.pb3]}>
+                        <View style={[styles.ph5, styles.pb3]}>
                             <TextInput
                                 ref={(element) => {
                                     innerTextInputRef.current = element as RNTextInput;
@@ -557,49 +687,29 @@ function BaseSelectionList<TItem extends ListItem>(
                     )}
                     {/* If we are loading new options we will avoid showing any header message. This is mostly because one of the header messages says there are no options. */}
                     {/* This is misleading because we might be in the process of loading fresh options from the server. */}
-                    {!isLoadingNewOptions && !!headerMessage && (
-                        <View style={headerMessageStyle ?? [styles.ph5, styles.pb5]}>
-                            <Text style={[styles.textLabel, styles.colorMuted]}>{headerMessage}</Text>
-                        </View>
-                    )}
+                    {(!isLoadingNewOptions || headerMessage !== translate('common.noResultsFound') || (flattenedSections.allOptions.length === 0 && !showLoadingPlaceholder)) &&
+                        !!headerMessage && (
+                            <View style={headerMessageStyle ?? [styles.ph5, styles.pb5]}>
+                                <Text style={[styles.textLabel, styles.colorMuted, styles.minHeight5]}>{headerMessage}</Text>
+                            </View>
+                        )}
                     {!!headerContent && headerContent}
-                    {flattenedSections.allOptions.length === 0 && showLoadingPlaceholder ? (
-                        <OptionsListSkeletonView shouldAnimate />
+                    {flattenedSections.allOptions.length === 0 ? (
+                        renderListEmptyContent()
                     ) : (
                         <>
-                            {!headerMessage && canSelectMultiple && shouldShowSelectAll && (
-                                <View style={[styles.userSelectNone, styles.peopleRow, styles.ph5, styles.pb3, listHeaderWrapperStyle]}>
-                                    <View style={[styles.flexRow, styles.alignItemsCenter]}>
-                                        <Checkbox
-                                            accessibilityLabel={translate('workspace.people.selectAll')}
-                                            isChecked={flattenedSections.allSelected}
-                                            onPress={selectAllRow}
-                                            disabled={flattenedSections.allOptions.length === flattenedSections.disabledOptionsIndexes.length}
-                                        />
-                                        {!customListHeader && (
-                                            <PressableWithFeedback
-                                                style={[styles.userSelectNone, styles.flexRow, styles.alignItemsCenter]}
-                                                onPress={selectAllRow}
-                                                accessibilityLabel={translate('workspace.people.selectAll')}
-                                                role="button"
-                                                accessibilityState={{checked: flattenedSections.allSelected}}
-                                                disabled={flattenedSections.allOptions.length === flattenedSections.disabledOptionsIndexes.length}
-                                                dataSet={{[CONST.SELECTION_SCRAPER_HIDDEN_ELEMENT]: true}}
-                                                onMouseDown={shouldPreventDefaultFocusOnSelectRow ? (e) => e.preventDefault() : undefined}
-                                            >
-                                                <Text style={[styles.textStrong, styles.ph3]}>{translate('workspace.people.selectAll')}</Text>
-                                            </PressableWithFeedback>
-                                        )}
-                                    </View>
-                                    {customListHeader}
-                                </View>
-                            )}
-                            {!headerMessage && !canSelectMultiple && customListHeader}
+                            {!listHeaderContent && header()}
                             <SectionList
+                                removeClippedSubviews={removeClippedSubviews}
                                 ref={listRef}
                                 sections={slicedSections}
                                 stickySectionHeadersEnabled={false}
-                                renderSectionHeader={renderSectionHeader}
+                                renderSectionHeader={(arg) => (
+                                    <>
+                                        {renderSectionHeader(arg)}
+                                        {listHeaderContent && header()}
+                                    </>
+                                )}
                                 renderItem={renderItem}
                                 getItemLayout={getItemLayout}
                                 onScroll={onScroll}
@@ -612,12 +722,16 @@ function BaseSelectionList<TItem extends ListItem>(
                                 showsVerticalScrollIndicator={showScrollIndicator}
                                 initialNumToRender={12}
                                 maxToRenderPerBatch={maxToRenderPerBatch}
-                                windowSize={5}
+                                windowSize={windowSize}
+                                updateCellsBatchingPeriod={updateCellsBatchingPeriod}
                                 viewabilityConfig={{viewAreaCoveragePercentThreshold: 95}}
                                 testID="selection-list"
                                 onLayout={onSectionListLayout}
-                                style={(!maxToRenderPerBatch || (shouldHideListOnInitialRender && isInitialSectionListRender)) && styles.opacity0}
+                                style={[(!maxToRenderPerBatch || (shouldHideListOnInitialRender && isInitialSectionListRender)) && styles.opacity0, sectionListStyle]}
+                                ListHeaderComponent={listHeaderContent}
                                 ListFooterComponent={listFooterContent ?? ShowMoreButtonInstance}
+                                onEndReached={onEndReached}
+                                onEndReachedThreshold={onEndReachedThreshold}
                             />
                             {children}
                         </>
diff --git a/src/components/SelectionList/CardListItem.tsx b/src/components/SelectionList/CardListItem.tsx
new file mode 100644
index 000000000000..2b3baa3d3037
--- /dev/null
+++ b/src/components/SelectionList/CardListItem.tsx
@@ -0,0 +1,112 @@
+import {Str} from 'expensify-common';
+import React, {useCallback} from 'react';
+import {View} from 'react-native';
+import Icon from '@components/Icon';
+import PressableWithFeedback from '@components/Pressable/PressableWithFeedback';
+import SelectCircle from '@components/SelectCircle';
+import TextWithTooltip from '@components/TextWithTooltip';
+import useLocalize from '@hooks/useLocalize';
+import useThemeStyles from '@hooks/useThemeStyles';
+import CONST from '@src/CONST';
+import type {BankIcon} from '@src/types/onyx/Bank';
+import BaseListItem from './BaseListItem';
+import type {BaseListItemProps, ListItem} from './types';
+
+type CardListItemProps<TItem extends ListItem> = BaseListItemProps<TItem & {bankIcon?: BankIcon; lastFourPAN?: string}>;
+
+function CardListItem<TItem extends ListItem>({
+    item,
+    isFocused,
+    showTooltip,
+    isDisabled,
+    canSelectMultiple,
+    onSelectRow,
+    onCheckboxPress,
+    onDismissError,
+    rightHandSideComponent,
+    onFocus,
+    shouldSyncFocus,
+}: CardListItemProps<TItem>) {
+    const styles = useThemeStyles();
+    const {translate} = useLocalize();
+
+    const handleCheckboxPress = useCallback(() => {
+        if (onCheckboxPress) {
+            onCheckboxPress(item);
+        } else {
+            onSelectRow(item);
+        }
+    }, [item, onCheckboxPress, onSelectRow]);
+
+    return (
+        <BaseListItem
+            item={item}
+            wrapperStyle={[styles.flex1, styles.justifyContentBetween, styles.sidebarLinkInner, styles.userSelectNone, styles.peopleRow, isFocused && styles.sidebarLinkActive]}
+            isFocused={isFocused}
+            isDisabled={isDisabled}
+            showTooltip={showTooltip}
+            canSelectMultiple={canSelectMultiple}
+            onSelectRow={onSelectRow}
+            onDismissError={onDismissError}
+            rightHandSideComponent={rightHandSideComponent}
+            errors={item.errors}
+            pendingAction={item.pendingAction}
+            keyForList={item.keyForList}
+            onFocus={onFocus}
+            shouldSyncFocus={shouldSyncFocus}
+        >
+            <>
+                {item.bankIcon && (
+                    <View style={[styles.mr3]}>
+                        <Icon
+                            src={item.bankIcon.icon}
+                            width={item.bankIcon.iconWidth}
+                            height={item.bankIcon.iconHeight}
+                            additionalStyles={item.bankIcon.iconStyles}
+                        />
+                    </View>
+                )}
+                <View style={[styles.flex1, styles.flexColumn, styles.justifyContentCenter, styles.alignItemsStretch, styles.optionRow]}>
+                    <View style={[styles.flex1, styles.flexColumn, styles.justifyContentCenter, styles.alignItemsStretch]}>
+                        <TextWithTooltip
+                            shouldShowTooltip={showTooltip}
+                            text={Str.removeSMSDomain(item.text ?? '')}
+                            style={[
+                                styles.optionDisplayName,
+                                isFocused ? styles.sidebarLinkActiveText : styles.sidebarLinkText,
+                                item.isBold !== false && styles.sidebarLinkTextBold,
+                                styles.pre,
+                                item.alternateText ? styles.mb1 : null,
+                            ]}
+                        />
+                        {!!item.lastFourPAN && (
+                            <TextWithTooltip
+                                shouldShowTooltip={showTooltip}
+                                text={`${translate('paymentMethodList.accountLastFour')} ${item.lastFourPAN}`}
+                                style={[styles.textLabelSupporting, styles.lh16, styles.pre]}
+                            />
+                        )}
+                    </View>
+                </View>
+                {canSelectMultiple && !item.isDisabled && (
+                    <PressableWithFeedback
+                        onPress={handleCheckboxPress}
+                        disabled={isDisabled}
+                        role={CONST.ROLE.BUTTON}
+                        accessibilityLabel={item.text ?? ''}
+                        style={[styles.ml2, styles.optionSelectCircle]}
+                    >
+                        <SelectCircle
+                            isChecked={item.isSelected ?? false}
+                            selectCircleStyles={styles.ml0}
+                        />
+                    </PressableWithFeedback>
+                )}
+            </>
+        </BaseListItem>
+    );
+}
+
+CardListItem.displayName = 'CardListItem';
+
+export default CardListItem;
diff --git a/src/components/SelectionList/InviteMemberListItem.tsx b/src/components/SelectionList/InviteMemberListItem.tsx
index 69774e24b970..2b3c01c04a69 100644
--- a/src/components/SelectionList/InviteMemberListItem.tsx
+++ b/src/components/SelectionList/InviteMemberListItem.tsx
@@ -1,4 +1,4 @@
-import Str from 'expensify-common/lib/str';
+import {Str} from 'expensify-common';
 import React, {useCallback} from 'react';
 import {View} from 'react-native';
 import MultipleAvatars from '@components/MultipleAvatars';
@@ -24,7 +24,6 @@ function InviteMemberListItem<TItem extends ListItem>({
     onSelectRow,
     onCheckboxPress,
     onDismissError,
-    shouldPreventDefaultFocusOnSelectRow,
     rightHandSideComponent,
     onFocus,
     shouldSyncFocus,
@@ -56,7 +55,6 @@ function InviteMemberListItem<TItem extends ListItem>({
             canSelectMultiple={canSelectMultiple}
             onSelectRow={onSelectRow}
             onDismissError={onDismissError}
-            shouldPreventDefaultFocusOnSelectRow={shouldPreventDefaultFocusOnSelectRow}
             rightHandSideComponent={rightHandSideComponent}
             errors={item.errors}
             pendingAction={item.pendingAction}
diff --git a/src/components/SelectionList/ListItemRightCaretWithLabel.tsx b/src/components/SelectionList/ListItemRightCaretWithLabel.tsx
new file mode 100644
index 000000000000..f20c4179f0fe
--- /dev/null
+++ b/src/components/SelectionList/ListItemRightCaretWithLabel.tsx
@@ -0,0 +1,35 @@
+import React from 'react';
+import {View} from 'react-native';
+import Icon from '@components/Icon';
+import * as Expensicons from '@components/Icon/Expensicons';
+import Text from '@components/Text';
+import useTheme from '@hooks/useTheme';
+import useThemeStyles from '@hooks/useThemeStyles';
+
+type ListItemRightCaretWithLabelProps = {
+    labelText?: string;
+    shouldShowCaret?: boolean;
+};
+
+function ListItemRightCaretWithLabel({labelText, shouldShowCaret = true}: ListItemRightCaretWithLabelProps) {
+    const styles = useThemeStyles();
+    const theme = useTheme();
+
+    return (
+        <View style={styles.flexRow}>
+            {!!labelText && <Text style={[styles.alignSelfCenter, styles.textSupporting, styles.pl2, styles.label]}>{labelText}</Text>}
+            {shouldShowCaret && (
+                <View style={[styles.pl2]}>
+                    <Icon
+                        src={Expensicons.ArrowRight}
+                        fill={theme.icon}
+                    />
+                </View>
+            )}
+        </View>
+    );
+}
+
+ListItemRightCaretWithLabel.displayName = 'ListItemRightCaretWithLabel';
+
+export default ListItemRightCaretWithLabel;
diff --git a/src/components/SelectionList/RadioListItem.tsx b/src/components/SelectionList/RadioListItem.tsx
index b595008e4e3b..f2df90592618 100644
--- a/src/components/SelectionList/RadioListItem.tsx
+++ b/src/components/SelectionList/RadioListItem.tsx
@@ -2,6 +2,7 @@ import React from 'react';
 import {View} from 'react-native';
 import TextWithTooltip from '@components/TextWithTooltip';
 import useThemeStyles from '@hooks/useThemeStyles';
+import variables from '@styles/variables';
 import CONST from '@src/CONST';
 import BaseListItem from './BaseListItem';
 import type {ListItem, RadioListItemProps} from './types';
@@ -13,10 +14,10 @@ function RadioListItem<TItem extends ListItem>({
     isDisabled,
     onSelectRow,
     onDismissError,
-    shouldPreventDefaultFocusOnSelectRow,
     shouldPreventEnterKeySubmit,
     rightHandSideComponent,
     isMultilineSupported = false,
+    isAlternateTextMultilineSupported = false,
     onFocus,
     shouldSyncFocus,
 }: RadioListItemProps<TItem>) {
@@ -24,6 +25,7 @@ function RadioListItem<TItem extends ListItem>({
     const fullTitle = isMultilineSupported ? item.text?.trimStart() : item.text;
     const indentsLength = (item.text?.length ?? 0) - (fullTitle?.length ?? 0);
     const paddingLeft = Math.floor(indentsLength / CONST.INDENTS.length) * styles.ml3.marginLeft;
+    const alternateTextMaxWidth = variables.sideBarWidth - styles.ph5.paddingHorizontal * 2 - styles.ml3.marginLeft - variables.iconSizeNormal;
 
     return (
         <BaseListItem
@@ -34,14 +36,15 @@ function RadioListItem<TItem extends ListItem>({
             showTooltip={showTooltip}
             onSelectRow={onSelectRow}
             onDismissError={onDismissError}
-            shouldPreventDefaultFocusOnSelectRow={shouldPreventDefaultFocusOnSelectRow}
             shouldPreventEnterKeySubmit={shouldPreventEnterKeySubmit}
             rightHandSideComponent={rightHandSideComponent}
             keyForList={item.keyForList}
             onFocus={onFocus}
             shouldSyncFocus={shouldSyncFocus}
+            pendingAction={item.pendingAction}
         >
             <>
+                {!!item.leftElement && item.leftElement}
                 <View style={[styles.flex1, styles.alignItemsStart]}>
                     <TextWithTooltip
                         shouldShowTooltip={showTooltip}
@@ -62,7 +65,13 @@ function RadioListItem<TItem extends ListItem>({
                         <TextWithTooltip
                             shouldShowTooltip={showTooltip}
                             text={item.alternateText}
-                            style={[styles.textLabelSupporting, styles.lh16, styles.pre]}
+                            style={[
+                                styles.textLabelSupporting,
+                                styles.lh16,
+                                isAlternateTextMultilineSupported ? styles.preWrap : styles.pre,
+                                isAlternateTextMultilineSupported ? {maxWidth: alternateTextMaxWidth} : null,
+                            ]}
+                            numberOfLines={isAlternateTextMultilineSupported ? 2 : 1}
                         />
                     )}
                 </View>
diff --git a/src/components/SelectionList/RightElementEnabledStatus.tsx b/src/components/SelectionList/RightElementEnabledStatus.tsx
deleted file mode 100644
index 50850a8c4e43..000000000000
--- a/src/components/SelectionList/RightElementEnabledStatus.tsx
+++ /dev/null
@@ -1,36 +0,0 @@
-import React from 'react';
-import {View} from 'react-native';
-import Icon from '@components/Icon';
-import * as Expensicons from '@components/Icon/Expensicons';
-import Text from '@components/Text';
-import useLocalize from '@hooks/useLocalize';
-import useTheme from '@hooks/useTheme';
-import useThemeStyles from '@hooks/useThemeStyles';
-
-type RightElementEnabledStatusProps = {
-    enabled?: boolean;
-};
-
-function RightElementEnabledStatus({enabled}: RightElementEnabledStatusProps) {
-    const styles = useThemeStyles();
-    const theme = useTheme();
-    const {translate} = useLocalize();
-
-    return (
-        <View style={styles.flexRow}>
-            <Text style={[styles.alignSelfCenter, styles.textSupporting, styles.pl2, styles.label]}>
-                {enabled ? translate('workspace.common.enabled') : translate('workspace.common.disabled')}
-            </Text>
-            <View style={[styles.p1, styles.pl2]}>
-                <Icon
-                    src={Expensicons.ArrowRight}
-                    fill={theme.icon}
-                />
-            </View>
-        </View>
-    );
-}
-
-RightElementEnabledStatus.displayName = 'RightElementEnabledStatus';
-
-export default RightElementEnabledStatus;
diff --git a/src/components/SelectionList/Search/ActionCell.tsx b/src/components/SelectionList/Search/ActionCell.tsx
new file mode 100644
index 000000000000..f535c0342e55
--- /dev/null
+++ b/src/components/SelectionList/Search/ActionCell.tsx
@@ -0,0 +1,97 @@
+import React from 'react';
+import {View} from 'react-native';
+import Badge from '@components/Badge';
+import Button from '@components/Button';
+import * as Expensicons from '@components/Icon/Expensicons';
+import useLocalize from '@hooks/useLocalize';
+import useStyleUtils from '@hooks/useStyleUtils';
+import useTheme from '@hooks/useTheme';
+import useThemeStyles from '@hooks/useThemeStyles';
+import variables from '@styles/variables';
+import CONST from '@src/CONST';
+import type {TranslationPaths} from '@src/languages/types';
+import type {SearchTransactionAction} from '@src/types/onyx/SearchResults';
+
+const actionTranslationsMap: Record<SearchTransactionAction, TranslationPaths> = {
+    view: 'common.view',
+    review: 'common.review',
+    done: 'common.done',
+    paid: 'iou.settledExpensify',
+};
+
+type ActionCellProps = {
+    action?: SearchTransactionAction;
+    isLargeScreenWidth?: boolean;
+    isSelected?: boolean;
+    goToItem: () => void;
+    isChildListItem?: boolean;
+    parentAction?: string;
+};
+
+function ActionCell({action = CONST.SEARCH.ACTION_TYPES.VIEW, isLargeScreenWidth = true, isSelected = false, goToItem, isChildListItem = false, parentAction = ''}: ActionCellProps) {
+    const {translate} = useLocalize();
+    const theme = useTheme();
+    const styles = useThemeStyles();
+    const StyleUtils = useStyleUtils();
+
+    const text = translate(actionTranslationsMap[action]);
+
+    const shouldUseViewAction = action === CONST.SEARCH.ACTION_TYPES.VIEW || (parentAction === CONST.SEARCH.ACTION_TYPES.PAID && action === CONST.SEARCH.ACTION_TYPES.PAID);
+
+    if ((parentAction !== CONST.SEARCH.ACTION_TYPES.PAID && action === CONST.SEARCH.ACTION_TYPES.PAID) || action === CONST.SEARCH.ACTION_TYPES.DONE) {
+        return (
+            <View style={[StyleUtils.getHeight(variables.h28), styles.justifyContentCenter]}>
+                <Badge
+                    text={text}
+                    icon={Expensicons.Checkmark}
+                    badgeStyles={[
+                        styles.ml0,
+                        styles.ph2,
+                        styles.gap1,
+                        isLargeScreenWidth ? styles.alignSelfCenter : styles.alignSelfEnd,
+                        StyleUtils.getHeight(variables.h20),
+                        StyleUtils.getMinimumHeight(variables.h20),
+                        isSelected ? StyleUtils.getBorderColorStyle(theme.buttonHoveredBG) : StyleUtils.getBorderColorStyle(theme.border),
+                    ]}
+                    textStyles={StyleUtils.getFontSizeStyle(variables.fontSizeExtraSmall)}
+                    iconStyles={styles.mr0}
+                    success
+                />
+            </View>
+        );
+    }
+
+    const buttonInnerStyles = isSelected ? styles.buttonDefaultHovered : {};
+
+    if (action === CONST.SEARCH.ACTION_TYPES.VIEW || shouldUseViewAction) {
+        return isLargeScreenWidth ? (
+            <Button
+                text={translate(actionTranslationsMap[CONST.SEARCH.ACTION_TYPES.VIEW])}
+                onPress={goToItem}
+                small
+                pressOnEnter
+                style={[styles.w100]}
+                innerStyles={buttonInnerStyles}
+                link={isChildListItem}
+                shouldUseDefaultHover={!isChildListItem}
+            />
+        ) : null;
+    }
+
+    if (action === CONST.SEARCH.ACTION_TYPES.REVIEW) {
+        return (
+            <Button
+                text={text}
+                onPress={goToItem}
+                small
+                pressOnEnter
+                style={[styles.w100]}
+                innerStyles={buttonInnerStyles}
+            />
+        );
+    }
+}
+
+ActionCell.displayName = 'ActionCell';
+
+export default ActionCell;
diff --git a/src/components/SelectionList/Search/ExpenseItemHeaderNarrow.tsx b/src/components/SelectionList/Search/ExpenseItemHeaderNarrow.tsx
new file mode 100644
index 000000000000..a74b6348a9b5
--- /dev/null
+++ b/src/components/SelectionList/Search/ExpenseItemHeaderNarrow.tsx
@@ -0,0 +1,105 @@
+import React, {memo} from 'react';
+import {View} from 'react-native';
+import type {StyleProp, ViewStyle} from 'react-native';
+import Icon from '@components/Icon';
+import * as Expensicons from '@components/Icon/Expensicons';
+import {PressableWithFeedback} from '@components/Pressable';
+import useStyleUtils from '@hooks/useStyleUtils';
+import useTheme from '@hooks/useTheme';
+import useThemeStyles from '@hooks/useThemeStyles';
+import variables from '@styles/variables';
+import CONST from '@src/CONST';
+import type {SearchPersonalDetails, SearchTransactionAction} from '@src/types/onyx/SearchResults';
+import ActionCell from './ActionCell';
+import UserInfoCell from './UserInfoCell';
+
+type ExpenseItemHeaderNarrowProps = {
+    text?: string;
+    participantFrom: SearchPersonalDetails;
+    participantTo: SearchPersonalDetails;
+    participantFromDisplayName: string;
+    participantToDisplayName: string;
+    action?: SearchTransactionAction;
+    containerStyle?: StyleProp<ViewStyle>;
+    onButtonPress: () => void;
+    canSelectMultiple?: boolean;
+    isSelected?: boolean;
+    isDisabled?: boolean | null;
+    isDisabledCheckbox?: boolean;
+    handleCheckboxPress?: () => void;
+};
+
+function ExpenseItemHeaderNarrow({
+    participantFrom,
+    participantFromDisplayName,
+    participantTo,
+    participantToDisplayName,
+    onButtonPress,
+    action,
+    canSelectMultiple,
+    containerStyle,
+    isDisabledCheckbox,
+    isSelected,
+    isDisabled,
+    handleCheckboxPress,
+    text,
+}: ExpenseItemHeaderNarrowProps) {
+    const styles = useThemeStyles();
+    const StyleUtils = useStyleUtils();
+    const theme = useTheme();
+
+    return (
+        <View style={[styles.flex1, styles.flexRow, styles.alignItemsCenter, styles.justifyContentBetween, styles.mb3, styles.gap2, containerStyle]}>
+            <View style={[styles.flexRow, styles.alignItemsCenter, styles.gap2, styles.flex1]}>
+                {canSelectMultiple && (
+                    <PressableWithFeedback
+                        accessibilityLabel={text ?? ''}
+                        role={CONST.ROLE.BUTTON}
+                        disabled={isDisabled}
+                        onPress={() => handleCheckboxPress?.()}
+                        style={[styles.cursorUnset, StyleUtils.getCheckboxPressableStyle(), isDisabledCheckbox && styles.cursorDisabled, styles.mr1]}
+                    >
+                        <View style={[StyleUtils.getCheckboxContainerStyle(20), StyleUtils.getMultiselectListStyles(!!isSelected, !!isDisabled)]}>
+                            {isSelected && (
+                                <Icon
+                                    src={Expensicons.Checkmark}
+                                    fill={theme.textLight}
+                                    height={14}
+                                    width={14}
+                                />
+                            )}
+                        </View>
+                    </PressableWithFeedback>
+                )}
+                <View style={[styles.mw50]}>
+                    <UserInfoCell
+                        participant={participantFrom}
+                        displayName={participantFromDisplayName}
+                    />
+                </View>
+                <Icon
+                    src={Expensicons.ArrowRightLong}
+                    width={variables.iconSizeXXSmall}
+                    height={variables.iconSizeXXSmall}
+                    fill={theme.icon}
+                />
+                <View style={[styles.flex1, styles.mw50]}>
+                    <UserInfoCell
+                        participant={participantTo}
+                        displayName={participantToDisplayName}
+                    />
+                </View>
+            </View>
+            <View style={[StyleUtils.getWidthStyle(variables.w80)]}>
+                <ActionCell
+                    action={action}
+                    goToItem={onButtonPress}
+                    isLargeScreenWidth={false}
+                    isSelected={isSelected}
+                />
+            </View>
+        </View>
+    );
+}
+
+export default memo(ExpenseItemHeaderNarrow);
diff --git a/src/components/SelectionList/Search/ReportListItem.tsx b/src/components/SelectionList/Search/ReportListItem.tsx
new file mode 100644
index 000000000000..983e1415d776
--- /dev/null
+++ b/src/components/SelectionList/Search/ReportListItem.tsx
@@ -0,0 +1,216 @@
+import React from 'react';
+import {View} from 'react-native';
+import Checkbox from '@components/Checkbox';
+import BaseListItem from '@components/SelectionList/BaseListItem';
+import type {ListItem, ReportListItemProps, ReportListItemType, TransactionListItemType} from '@components/SelectionList/types';
+import Text from '@components/Text';
+import TextWithTooltip from '@components/TextWithTooltip';
+import useStyleUtils from '@hooks/useStyleUtils';
+import useThemeStyles from '@hooks/useThemeStyles';
+import useWindowDimensions from '@hooks/useWindowDimensions';
+import * as CurrencyUtils from '@libs/CurrencyUtils';
+import Navigation from '@libs/Navigation/Navigation';
+import CONST from '@src/CONST';
+import ROUTES from '@src/ROUTES';
+import ActionCell from './ActionCell';
+import ExpenseItemHeaderNarrow from './ExpenseItemHeaderNarrow';
+import TransactionListItem from './TransactionListItem';
+import TransactionListItemRow from './TransactionListItemRow';
+
+type CellProps = {
+    // eslint-disable-next-line react/no-unused-prop-types
+    showTooltip: boolean;
+    // eslint-disable-next-line react/no-unused-prop-types
+    isLargeScreenWidth: boolean;
+};
+
+type ReportCellProps = {
+    reportItem: ReportListItemType;
+} & CellProps;
+
+function TotalCell({showTooltip, isLargeScreenWidth, reportItem}: ReportCellProps) {
+    const styles = useThemeStyles();
+
+    let total = reportItem?.total ?? 0;
+
+    // Only invert non-zero values otherwise we'll end up with -0.00
+    if (total) {
+        total *= reportItem?.type === CONST.REPORT.TYPE.EXPENSE ? -1 : 1;
+    }
+
+    return (
+        <TextWithTooltip
+            shouldShowTooltip={showTooltip}
+            text={CurrencyUtils.convertToDisplayString(total, reportItem?.currency)}
+            style={[styles.optionDisplayName, styles.textNormal, styles.pre, styles.justifyContentCenter, isLargeScreenWidth ? undefined : styles.textAlignRight]}
+        />
+    );
+}
+
+function ReportListItem<TItem extends ListItem>({
+    item,
+    isFocused,
+    showTooltip,
+    isDisabled,
+    canSelectMultiple,
+    onCheckboxPress,
+    onSelectRow,
+    onDismissError,
+    onFocus,
+    onLongPressRow,
+    shouldSyncFocus,
+}: ReportListItemProps<TItem>) {
+    const reportItem = item as unknown as ReportListItemType;
+
+    const styles = useThemeStyles();
+    const {isLargeScreenWidth} = useWindowDimensions();
+    const StyleUtils = useStyleUtils();
+
+    if (reportItem.transactions.length === 0) {
+        return;
+    }
+
+    const listItemPressableStyle = [
+        styles.selectionListPressableItemWrapper,
+        styles.pv1half,
+        styles.ph0,
+        styles.overflowHidden,
+        item.isSelected && styles.activeComponentBG,
+        isFocused && styles.sidebarLinkActive,
+    ];
+
+    const handleOnButtonPress = () => {
+        onSelectRow(item);
+    };
+
+    const openReportInRHP = (transactionItem: TransactionListItemType) => {
+        Navigation.navigate(ROUTES.SEARCH_REPORT.getRoute(transactionItem.transactionThreadReportID));
+    };
+
+    if (!reportItem?.reportName && reportItem.transactions.length > 1) {
+        return null;
+    }
+
+    const participantFrom = reportItem.from;
+    const participantTo = reportItem.to;
+
+    // These values should come as part of the item via SearchUtils.getSections() but ReportListItem is not yet 100% handled
+    // This will be simplified in future once sorting of ReportListItem is done
+    const participantFromDisplayName = participantFrom?.displayName ?? participantFrom?.login ?? '';
+    const participantToDisplayName = participantTo?.displayName ?? participantTo?.login ?? '';
+
+    if (reportItem.transactions.length === 1) {
+        const transactionItem = reportItem.transactions[0];
+
+        return (
+            <TransactionListItem
+                item={transactionItem as unknown as TItem}
+                isFocused={isFocused}
+                showTooltip={showTooltip}
+                isDisabled={isDisabled}
+                canSelectMultiple={canSelectMultiple}
+                onCheckboxPress={() => onCheckboxPress?.(transactionItem as unknown as TItem)}
+                onSelectRow={() => openReportInRHP(transactionItem)}
+                onDismissError={onDismissError}
+                onFocus={onFocus}
+                onLongPressRow={onLongPressRow}
+                shouldSyncFocus={shouldSyncFocus}
+            />
+        );
+    }
+
+    return (
+        <BaseListItem
+            item={item}
+            pressableStyle={listItemPressableStyle}
+            wrapperStyle={[styles.flexRow, styles.flex1, styles.justifyContentBetween, styles.userSelectNone, styles.alignItemsCenter]}
+            containerStyle={[styles.mb3]}
+            isFocused={isFocused}
+            isDisabled={isDisabled}
+            showTooltip={showTooltip}
+            canSelectMultiple={canSelectMultiple}
+            onSelectRow={onSelectRow}
+            onLongPressRow={onLongPressRow}
+            onDismissError={onDismissError}
+            errors={item.errors}
+            pendingAction={item.pendingAction}
+            keyForList={item.keyForList}
+            onFocus={onFocus}
+            shouldSyncFocus={shouldSyncFocus}
+            hoverStyle={item.isSelected && styles.activeComponentBG}
+        >
+            <View style={styles.flex1}>
+                {!isLargeScreenWidth && (
+                    <ExpenseItemHeaderNarrow
+                        participantFrom={participantFrom}
+                        participantFromDisplayName={participantFromDisplayName}
+                        participantTo={participantTo}
+                        participantToDisplayName={participantToDisplayName}
+                        action={reportItem.action}
+                        onButtonPress={handleOnButtonPress}
+                        containerStyle={[styles.ph3, styles.pt1half, styles.mb1half]}
+                    />
+                )}
+                <View style={[styles.flex1, styles.flexRow, styles.alignItemsCenter, styles.gap3, styles.ph3, styles.pv1half]}>
+                    <View style={[styles.flexRow, styles.flex1, styles.alignItemsCenter, styles.justifyContentBetween, styles.mnh40]}>
+                        <View style={[styles.flexRow, styles.alignItemsCenter, styles.flex2]}>
+                            {canSelectMultiple && (
+                                <Checkbox
+                                    onPress={() => onCheckboxPress?.(item)}
+                                    isChecked={item.isSelected}
+                                    containerStyle={[StyleUtils.getCheckboxContainerStyle(20), StyleUtils.getMultiselectListStyles(!!item.isSelected, !!item.isDisabled)]}
+                                    disabled={!!isDisabled || item.isDisabledCheckbox}
+                                    accessibilityLabel={item.text ?? ''}
+                                    shouldStopMouseDownPropagation
+                                    style={[styles.cursorUnset, StyleUtils.getCheckboxPressableStyle(), item.isDisabledCheckbox && styles.cursorDisabled, !isLargeScreenWidth && styles.mr3]}
+                                />
+                            )}
+                            <View style={[styles.flexShrink1, isLargeScreenWidth && styles.ph4]}>
+                                <Text style={[styles.reportListItemTitle]}>{reportItem?.reportName}</Text>
+                            </View>
+                        </View>
+                        <View style={[styles.flexRow, styles.flex1, styles.justifyContentEnd]}>
+                            <TotalCell
+                                showTooltip={showTooltip}
+                                isLargeScreenWidth={isLargeScreenWidth}
+                                reportItem={reportItem}
+                            />
+                        </View>
+                    </View>
+                    {isLargeScreenWidth && (
+                        <View style={StyleUtils.getSearchTableColumnStyles(CONST.SEARCH.TABLE_COLUMNS.ACTION)}>
+                            <ActionCell
+                                action={reportItem.action}
+                                goToItem={handleOnButtonPress}
+                                isSelected={item.isSelected}
+                            />
+                        </View>
+                    )}
+                </View>
+                {reportItem.transactions.map((transaction) => (
+                    <TransactionListItemRow
+                        key={transaction.transactionID}
+                        parentAction={reportItem.action}
+                        item={transaction}
+                        showTooltip={showTooltip}
+                        onButtonPress={() => {
+                            openReportInRHP(transaction);
+                        }}
+                        onCheckboxPress={() => onCheckboxPress?.(transaction as unknown as TItem)}
+                        showItemHeaderOnNarrowLayout={false}
+                        containerStyle={[transaction.isSelected && styles.activeComponentBG, styles.ph3, styles.pv1half]}
+                        isChildListItem
+                        isDisabled={!!isDisabled}
+                        canSelectMultiple={!!canSelectMultiple}
+                        isButtonSelected={transaction.isSelected}
+                        shouldShowTransactionCheckbox
+                    />
+                ))}
+            </View>
+        </BaseListItem>
+    );
+}
+
+ReportListItem.displayName = 'ReportListItem';
+
+export default ReportListItem;
diff --git a/src/components/SelectionList/Search/TextWithIconCell.tsx b/src/components/SelectionList/Search/TextWithIconCell.tsx
new file mode 100644
index 000000000000..8cfbe0933d00
--- /dev/null
+++ b/src/components/SelectionList/Search/TextWithIconCell.tsx
@@ -0,0 +1,47 @@
+import React from 'react';
+import {View} from 'react-native';
+import type {StyleProp, TextStyle} from 'react-native';
+import Icon from '@components/Icon';
+import Text from '@components/Text';
+import Tooltip from '@components/Tooltip';
+import useTheme from '@hooks/useTheme';
+import useThemeStyles from '@hooks/useThemeStyles';
+import type IconAsset from '@src/types/utils/IconAsset';
+
+type TextWithIconCellProps = {
+    icon: IconAsset;
+    text?: string;
+    showTooltip: boolean;
+    textStyle?: StyleProp<TextStyle>;
+};
+
+export default function TextWithIconCell({icon, text, showTooltip, textStyle}: TextWithIconCellProps) {
+    const styles = useThemeStyles();
+    const theme = useTheme();
+
+    if (!text) {
+        return null;
+    }
+
+    return (
+        <Tooltip
+            shouldRender={showTooltip}
+            text={text}
+        >
+            <View style={[styles.flexRow, styles.flexShrink1, styles.gap1]}>
+                <Icon
+                    src={icon}
+                    fill={theme.icon}
+                    height={12}
+                    width={12}
+                />
+                <Text
+                    numberOfLines={1}
+                    style={[styles.optionDisplayName, styles.label, styles.pre, styles.justifyContentCenter, styles.textMicro, styles.textSupporting, styles.flexShrink1, textStyle]}
+                >
+                    {text}
+                </Text>
+            </View>
+        </Tooltip>
+    );
+}
diff --git a/src/components/SelectionList/Search/TransactionListItem.tsx b/src/components/SelectionList/Search/TransactionListItem.tsx
new file mode 100644
index 000000000000..a10552ca9ad8
--- /dev/null
+++ b/src/components/SelectionList/Search/TransactionListItem.tsx
@@ -0,0 +1,72 @@
+import React from 'react';
+import BaseListItem from '@components/SelectionList/BaseListItem';
+import type {ListItem, TransactionListItemProps, TransactionListItemType} from '@components/SelectionList/types';
+import useThemeStyles from '@hooks/useThemeStyles';
+import useWindowDimensions from '@hooks/useWindowDimensions';
+import TransactionListItemRow from './TransactionListItemRow';
+
+function TransactionListItem<TItem extends ListItem>({
+    item,
+    isFocused,
+    showTooltip,
+    isDisabled,
+    canSelectMultiple,
+    onSelectRow,
+    onCheckboxPress,
+    onDismissError,
+    onFocus,
+    onLongPressRow,
+    shouldSyncFocus,
+}: TransactionListItemProps<TItem>) {
+    const transactionItem = item as unknown as TransactionListItemType;
+    const styles = useThemeStyles();
+
+    const {isLargeScreenWidth} = useWindowDimensions();
+
+    const listItemPressableStyle = [styles.selectionListPressableItemWrapper, styles.pv3, styles.ph3, item.isSelected && styles.activeComponentBG, isFocused && styles.sidebarLinkActive];
+
+    const listItemWrapperStyle = [
+        styles.flex1,
+        styles.userSelectNone,
+        isLargeScreenWidth ? {...styles.flexRow, ...styles.justifyContentBetween, ...styles.alignItemsCenter} : {...styles.flexColumn, ...styles.alignItemsStretch},
+    ];
+
+    return (
+        <BaseListItem
+            item={item}
+            pressableStyle={listItemPressableStyle}
+            wrapperStyle={listItemWrapperStyle}
+            containerStyle={[styles.mb3]}
+            isFocused={isFocused}
+            isDisabled={isDisabled}
+            showTooltip={showTooltip}
+            canSelectMultiple={canSelectMultiple}
+            onSelectRow={onSelectRow}
+            onDismissError={onDismissError}
+            errors={item.errors}
+            pendingAction={item.pendingAction}
+            keyForList={item.keyForList}
+            onFocus={onFocus}
+            onLongPressRow={onLongPressRow}
+            shouldSyncFocus={shouldSyncFocus}
+            hoverStyle={item.isSelected && styles.activeComponentBG}
+        >
+            <TransactionListItemRow
+                item={transactionItem}
+                showTooltip={showTooltip}
+                onButtonPress={() => {
+                    onSelectRow(item);
+                }}
+                onCheckboxPress={() => onCheckboxPress?.(item)}
+                isDisabled={!!isDisabled}
+                canSelectMultiple={!!canSelectMultiple}
+                isButtonSelected={item.isSelected}
+                shouldShowTransactionCheckbox={false}
+            />
+        </BaseListItem>
+    );
+}
+
+TransactionListItem.displayName = 'TransactionListItem';
+
+export default TransactionListItem;
diff --git a/src/components/SelectionList/Search/TransactionListItemRow.tsx b/src/components/SelectionList/Search/TransactionListItemRow.tsx
new file mode 100644
index 000000000000..64c5f6a768f4
--- /dev/null
+++ b/src/components/SelectionList/Search/TransactionListItemRow.tsx
@@ -0,0 +1,449 @@
+import React from 'react';
+import type {StyleProp, ViewStyle} from 'react-native';
+import {View} from 'react-native';
+import Checkbox from '@components/Checkbox';
+import Icon from '@components/Icon';
+import * as Expensicons from '@components/Icon/Expensicons';
+import {PressableWithFeedback} from '@components/Pressable';
+import ReceiptImage from '@components/ReceiptImage';
+import type {TransactionListItemType} from '@components/SelectionList/types';
+import TextWithTooltip from '@components/TextWithTooltip';
+import useLocalize from '@hooks/useLocalize';
+import useStyleUtils from '@hooks/useStyleUtils';
+import useTheme from '@hooks/useTheme';
+import useThemeStyles from '@hooks/useThemeStyles';
+import useWindowDimensions from '@hooks/useWindowDimensions';
+import * as CurrencyUtils from '@libs/CurrencyUtils';
+import DateUtils from '@libs/DateUtils';
+import Parser from '@libs/Parser';
+import StringUtils from '@libs/StringUtils';
+import * as TransactionUtils from '@libs/TransactionUtils';
+import tryResolveUrlFromApiRoot from '@libs/tryResolveUrlFromApiRoot';
+import variables from '@styles/variables';
+import CONST from '@src/CONST';
+import type {SearchTransactionType} from '@src/types/onyx/SearchResults';
+import ActionCell from './ActionCell';
+import ExpenseItemHeaderNarrow from './ExpenseItemHeaderNarrow';
+import TextWithIconCell from './TextWithIconCell';
+import UserInfoCell from './UserInfoCell';
+
+type CellProps = {
+    // eslint-disable-next-line react/no-unused-prop-types
+    showTooltip: boolean;
+    // eslint-disable-next-line react/no-unused-prop-types
+    isLargeScreenWidth: boolean;
+};
+
+type TransactionCellProps = {
+    transactionItem: TransactionListItemType;
+} & CellProps;
+
+type TotalCellProps = {
+    // eslint-disable-next-line react/no-unused-prop-types
+    isChildListItem: boolean;
+} & TransactionCellProps;
+
+type TransactionListItemRowProps = {
+    item: TransactionListItemType;
+    showTooltip: boolean;
+    onButtonPress: () => void;
+    onCheckboxPress: () => void;
+    showItemHeaderOnNarrowLayout?: boolean;
+    containerStyle?: StyleProp<ViewStyle>;
+    isChildListItem?: boolean;
+    isDisabled: boolean;
+    canSelectMultiple: boolean;
+    isButtonSelected?: boolean;
+    parentAction?: string;
+    shouldShowTransactionCheckbox?: boolean;
+};
+
+const getTypeIcon = (type?: SearchTransactionType) => {
+    switch (type) {
+        case CONST.SEARCH.TRANSACTION_TYPE.CASH:
+            return Expensicons.Cash;
+        case CONST.SEARCH.TRANSACTION_TYPE.CARD:
+            return Expensicons.CreditCard;
+        case CONST.SEARCH.TRANSACTION_TYPE.DISTANCE:
+            return Expensicons.Car;
+        default:
+            return Expensicons.Cash;
+    }
+};
+
+function ReceiptCell({transactionItem}: TransactionCellProps) {
+    const theme = useTheme();
+    const styles = useThemeStyles();
+    const StyleUtils = useStyleUtils();
+
+    const backgroundStyles = transactionItem.isSelected ? StyleUtils.getBackgroundColorStyle(theme.buttonHoveredBG) : StyleUtils.getBackgroundColorStyle(theme.border);
+
+    const isViewAction = transactionItem.action === CONST.SEARCH.ACTION_TYPES.VIEW;
+    const canModifyReceipt = isViewAction && transactionItem.canDelete;
+
+    return (
+        <View
+            style={[
+                StyleUtils.getWidthAndHeightStyle(variables.h36, variables.w40),
+                StyleUtils.getBorderRadiusStyle(variables.componentBorderRadiusSmall),
+                styles.overflowHidden,
+                backgroundStyles,
+            ]}
+        >
+            <ReceiptImage
+                source={tryResolveUrlFromApiRoot(transactionItem?.receipt?.source ?? '')}
+                isEReceipt={transactionItem.hasEReceipt}
+                transactionID={transactionItem.transactionID}
+                shouldUseThumbnailImage={!transactionItem?.receipt?.source}
+                isAuthTokenRequired
+                fallbackIcon={canModifyReceipt ? Expensicons.ReceiptPlus : Expensicons.ReceiptSlash}
+                fallbackIconSize={20}
+                fallbackIconColor={theme.icon}
+                fallbackIconBackground={transactionItem.isSelected ? theme.buttonHoveredBG : undefined}
+                iconSize="x-small"
+            />
+        </View>
+    );
+}
+
+function DateCell({transactionItem, showTooltip, isLargeScreenWidth}: TransactionCellProps) {
+    const styles = useThemeStyles();
+
+    const created = TransactionUtils.getCreated(transactionItem);
+    const date = DateUtils.formatWithUTCTimeZone(created, DateUtils.doesDateBelongToAPastYear(created) ? CONST.DATE.MONTH_DAY_YEAR_ABBR_FORMAT : CONST.DATE.MONTH_DAY_ABBR_FORMAT);
+
+    return (
+        <TextWithTooltip
+            shouldShowTooltip={showTooltip}
+            text={date}
+            style={[styles.lineHeightLarge, styles.pre, styles.justifyContentCenter, isLargeScreenWidth ? undefined : [styles.textMicro, styles.textSupporting]]}
+        />
+    );
+}
+
+function MerchantCell({transactionItem, showTooltip, isLargeScreenWidth}: TransactionCellProps) {
+    const styles = useThemeStyles();
+    const {translate} = useLocalize();
+    const description = TransactionUtils.getDescription(transactionItem);
+    let merchantOrDescriptionToDisplay = transactionItem.formattedMerchant;
+    if (!merchantOrDescriptionToDisplay && !isLargeScreenWidth) {
+        merchantOrDescriptionToDisplay = Parser.htmlToText(Parser.replace(description));
+    }
+    let merchant = transactionItem.shouldShowMerchant ? merchantOrDescriptionToDisplay : Parser.htmlToText(Parser.replace(description));
+
+    if (TransactionUtils.hasReceipt(transactionItem) && TransactionUtils.isReceiptBeingScanned(transactionItem) && transactionItem.shouldShowMerchant) {
+        merchant = translate('iou.receiptStatusTitle');
+    }
+    const merchantToDisplay = StringUtils.getFirstLine(merchant);
+    return (
+        <TextWithTooltip
+            shouldShowTooltip={showTooltip}
+            text={merchantToDisplay}
+            style={[isLargeScreenWidth ? styles.lineHeightLarge : styles.lh20, styles.pre, styles.justifyContentCenter]}
+        />
+    );
+}
+
+function TotalCell({showTooltip, isLargeScreenWidth, transactionItem}: TotalCellProps) {
+    const styles = useThemeStyles();
+    const {translate} = useLocalize();
+    const currency = TransactionUtils.getCurrency(transactionItem);
+    let amount = CurrencyUtils.convertToDisplayString(transactionItem.formattedTotal, currency);
+
+    if (TransactionUtils.hasReceipt(transactionItem) && TransactionUtils.isReceiptBeingScanned(transactionItem)) {
+        amount = translate('iou.receiptStatusTitle');
+    }
+
+    return (
+        <TextWithTooltip
+            shouldShowTooltip={showTooltip}
+            text={amount}
+            style={[styles.optionDisplayName, styles.justifyContentCenter, isLargeScreenWidth ? undefined : styles.textAlignRight]}
+        />
+    );
+}
+
+function TypeCell({transactionItem, isLargeScreenWidth}: TransactionCellProps) {
+    const theme = useTheme();
+    const typeIcon = getTypeIcon(transactionItem.transactionType);
+
+    return (
+        <Icon
+            src={typeIcon}
+            fill={theme.icon}
+            height={isLargeScreenWidth ? 20 : 12}
+            width={isLargeScreenWidth ? 20 : 12}
+        />
+    );
+}
+
+function CategoryCell({isLargeScreenWidth, showTooltip, transactionItem}: TransactionCellProps) {
+    const styles = useThemeStyles();
+    return (
+        <TextWithTooltip
+            shouldShowTooltip={showTooltip}
+            text={transactionItem?.category}
+            style={
+                isLargeScreenWidth
+                    ? [styles.optionDisplayName, styles.lineHeightLarge, styles.pre, styles.justifyContentCenter]
+                    : [
+                          styles.optionDisplayName,
+                          styles.label,
+                          styles.pre,
+                          styles.justifyContentCenter,
+                          styles.textMicro,
+                          styles.textSupporting,
+                          styles.flexShrink1,
+                          styles.textMicro,
+                          styles.mnh0,
+                      ]
+            }
+        />
+    );
+}
+
+function TagCell({isLargeScreenWidth, showTooltip, transactionItem}: TransactionCellProps) {
+    const styles = useThemeStyles();
+    return isLargeScreenWidth ? (
+        <TextWithTooltip
+            shouldShowTooltip={showTooltip}
+            text={TransactionUtils.getTagForDisplay(transactionItem)}
+            style={[styles.optionDisplayName, styles.lineHeightLarge, styles.pre, styles.justifyContentCenter]}
+        />
+    ) : (
+        <TextWithIconCell
+            icon={Expensicons.Tag}
+            showTooltip={showTooltip}
+            text={TransactionUtils.getTagForDisplay(transactionItem)}
+            textStyle={[styles.textMicro, styles.mnh0]}
+        />
+    );
+}
+
+function TaxCell({transactionItem, showTooltip}: TransactionCellProps) {
+    const styles = useThemeStyles();
+
+    const isFromExpenseReport = transactionItem.reportType === CONST.REPORT.TYPE.EXPENSE;
+    const taxAmount = TransactionUtils.getTaxAmount(transactionItem, isFromExpenseReport);
+    const currency = TransactionUtils.getCurrency(transactionItem);
+
+    return (
+        <TextWithTooltip
+            shouldShowTooltip={showTooltip}
+            text={CurrencyUtils.convertToDisplayString(taxAmount, currency)}
+            style={[styles.optionDisplayName, styles.lineHeightLarge, styles.pre, styles.justifyContentCenter, styles.textAlignRight]}
+        />
+    );
+}
+
+function TransactionListItemRow({
+    item,
+    showTooltip,
+    isDisabled,
+    canSelectMultiple,
+    onButtonPress,
+    onCheckboxPress,
+    showItemHeaderOnNarrowLayout = true,
+    containerStyle,
+    isChildListItem = false,
+    isButtonSelected = false,
+    parentAction = '',
+    shouldShowTransactionCheckbox,
+}: TransactionListItemRowProps) {
+    const styles = useThemeStyles();
+    const {isLargeScreenWidth} = useWindowDimensions();
+    const StyleUtils = useStyleUtils();
+    const theme = useTheme();
+
+    if (!isLargeScreenWidth) {
+        return (
+            <View style={containerStyle}>
+                {showItemHeaderOnNarrowLayout && (
+                    <ExpenseItemHeaderNarrow
+                        text={item.text}
+                        participantFrom={item.from}
+                        participantFromDisplayName={item.formattedFrom}
+                        participantTo={item.to}
+                        participantToDisplayName={item.formattedTo}
+                        onButtonPress={onButtonPress}
+                        canSelectMultiple={canSelectMultiple}
+                        action={item.action}
+                        isSelected={item.isSelected}
+                        isDisabled={item.isDisabled}
+                        isDisabledCheckbox={item.isDisabledCheckbox}
+                        handleCheckboxPress={onCheckboxPress}
+                    />
+                )}
+
+                <View style={[styles.flexRow, styles.justifyContentBetween, styles.alignItemsCenter, styles.gap3]}>
+                    {canSelectMultiple && shouldShowTransactionCheckbox && (
+                        <PressableWithFeedback
+                            accessibilityLabel={item.text ?? ''}
+                            role={CONST.ROLE.BUTTON}
+                            disabled={isDisabled}
+                            onPress={onCheckboxPress}
+                            style={[styles.cursorUnset, StyleUtils.getCheckboxPressableStyle(), item.isDisabledCheckbox && styles.cursorDisabled, styles.mr1]}
+                        >
+                            <View style={[StyleUtils.getCheckboxContainerStyle(20), StyleUtils.getMultiselectListStyles(!!item.isSelected, !!isDisabled)]}>
+                                {item.isSelected && (
+                                    <Icon
+                                        src={Expensicons.Checkmark}
+                                        fill={theme.textLight}
+                                        height={14}
+                                        width={14}
+                                    />
+                                )}
+                            </View>
+                        </PressableWithFeedback>
+                    )}
+                    <ReceiptCell
+                        transactionItem={item}
+                        isLargeScreenWidth={false}
+                        showTooltip={false}
+                    />
+                    <View style={[styles.flex2, !item.category && styles.justifyContentCenter, styles.gap1]}>
+                        <MerchantCell
+                            transactionItem={item}
+                            showTooltip={showTooltip}
+                            isLargeScreenWidth={false}
+                        />
+                        {!!item.category && (
+                            <View style={[styles.flexRow, styles.flex1, styles.alignItemsEnd]}>
+                                <CategoryCell
+                                    isLargeScreenWidth={false}
+                                    showTooltip={showTooltip}
+                                    transactionItem={item}
+                                />
+                            </View>
+                        )}
+                    </View>
+                    <View style={[styles.alignItemsEnd, styles.flex1, styles.gap1, styles.justifyContentBetween]}>
+                        <TotalCell
+                            showTooltip={showTooltip}
+                            transactionItem={item}
+                            isLargeScreenWidth={false}
+                            isChildListItem={isChildListItem}
+                        />
+                        <View style={[styles.flexRow, styles.gap1, styles.justifyContentCenter, styles.alignItemsCenter]}>
+                            <TypeCell
+                                transactionItem={item}
+                                isLargeScreenWidth={false}
+                                showTooltip={false}
+                            />
+                            <DateCell
+                                transactionItem={item}
+                                showTooltip={showTooltip}
+                                isLargeScreenWidth={false}
+                            />
+                        </View>
+                    </View>
+                </View>
+            </View>
+        );
+    }
+
+    return (
+        <View style={[styles.flex1, styles.flexRow, styles.alignItemsCenter, containerStyle]}>
+            {canSelectMultiple && (
+                <Checkbox
+                    isChecked={item.isSelected}
+                    onPress={onCheckboxPress}
+                    disabled={!!item.isDisabled || isDisabled}
+                    accessibilityLabel={item.text ?? ''}
+                    style={[styles.cursorUnset, StyleUtils.getCheckboxPressableStyle(), item.isDisabledCheckbox && styles.cursorDisabled]}
+                />
+            )}
+            <View style={[styles.flex1, styles.flexRow, styles.alignItemsCenter, styles.gap3, canSelectMultiple && styles.pl4]}>
+                <View style={[StyleUtils.getSearchTableColumnStyles(CONST.SEARCH.TABLE_COLUMNS.RECEIPT)]}>
+                    <ReceiptCell
+                        transactionItem={item}
+                        isLargeScreenWidth
+                        showTooltip={false}
+                    />
+                </View>
+                <View style={[StyleUtils.getSearchTableColumnStyles(CONST.SEARCH.TABLE_COLUMNS.TYPE)]}>
+                    <TypeCell
+                        transactionItem={item}
+                        isLargeScreenWidth={isLargeScreenWidth}
+                        showTooltip={false}
+                    />
+                </View>
+                <View style={[StyleUtils.getSearchTableColumnStyles(CONST.SEARCH.TABLE_COLUMNS.DATE, item.shouldShowYear)]}>
+                    <DateCell
+                        transactionItem={item}
+                        showTooltip={showTooltip}
+                        isLargeScreenWidth
+                    />
+                </View>
+                <View style={[StyleUtils.getSearchTableColumnStyles(CONST.SEARCH.TABLE_COLUMNS.MERCHANT)]}>
+                    <MerchantCell
+                        transactionItem={item}
+                        showTooltip={showTooltip}
+                        isLargeScreenWidth
+                    />
+                </View>
+                <View style={[StyleUtils.getSearchTableColumnStyles(CONST.SEARCH.TABLE_COLUMNS.FROM)]}>
+                    <UserInfoCell
+                        participant={item.from}
+                        displayName={item.formattedFrom}
+                    />
+                </View>
+                <View style={[StyleUtils.getSearchTableColumnStyles(CONST.SEARCH.TABLE_COLUMNS.FROM)]}>
+                    <UserInfoCell
+                        participant={item.to}
+                        displayName={item.formattedTo}
+                    />
+                </View>
+                {item.shouldShowCategory && (
+                    <View style={[StyleUtils.getSearchTableColumnStyles(CONST.SEARCH.TABLE_COLUMNS.CATEGORY)]}>
+                        <CategoryCell
+                            isLargeScreenWidth
+                            showTooltip={showTooltip}
+                            transactionItem={item}
+                        />
+                    </View>
+                )}
+                {item.shouldShowTag && (
+                    <View style={[StyleUtils.getSearchTableColumnStyles(CONST.SEARCH.TABLE_COLUMNS.TAG)]}>
+                        <TagCell
+                            isLargeScreenWidth
+                            showTooltip={showTooltip}
+                            transactionItem={item}
+                        />
+                    </View>
+                )}
+                {item.shouldShowTax && (
+                    <View style={[StyleUtils.getSearchTableColumnStyles(CONST.SEARCH.TABLE_COLUMNS.TAX_AMOUNT)]}>
+                        <TaxCell
+                            transactionItem={item}
+                            isLargeScreenWidth
+                            showTooltip={showTooltip}
+                        />
+                    </View>
+                )}
+
+                <View style={[StyleUtils.getSearchTableColumnStyles(CONST.SEARCH.TABLE_COLUMNS.TOTAL_AMOUNT)]}>
+                    <TotalCell
+                        showTooltip={showTooltip}
+                        transactionItem={item}
+                        isLargeScreenWidth
+                        isChildListItem={isChildListItem}
+                    />
+                </View>
+                <View style={[StyleUtils.getSearchTableColumnStyles(CONST.SEARCH.TABLE_COLUMNS.ACTION)]}>
+                    <ActionCell
+                        action={item.action}
+                        isSelected={isButtonSelected}
+                        isChildListItem={isChildListItem}
+                        parentAction={parentAction}
+                        goToItem={onButtonPress}
+                    />
+                </View>
+            </View>
+        </View>
+    );
+}
+
+TransactionListItemRow.displayName = 'TransactionListItemRow';
+
+export default TransactionListItemRow;
diff --git a/src/components/SelectionList/Search/UserInfoCell.tsx b/src/components/SelectionList/Search/UserInfoCell.tsx
new file mode 100644
index 000000000000..793c8c94c391
--- /dev/null
+++ b/src/components/SelectionList/Search/UserInfoCell.tsx
@@ -0,0 +1,43 @@
+import React from 'react';
+import {View} from 'react-native';
+import Avatar from '@components/Avatar';
+import Text from '@components/Text';
+import useThemeStyles from '@hooks/useThemeStyles';
+import useWindowDimensions from '@hooks/useWindowDimensions';
+import CONST from '@src/CONST';
+import type {SearchPersonalDetails} from '@src/types/onyx/SearchResults';
+
+type UserInfoCellProps = {
+    participant: SearchPersonalDetails;
+    displayName: string;
+};
+
+function UserInfoCell({participant, displayName}: UserInfoCellProps) {
+    const styles = useThemeStyles();
+    const {isLargeScreenWidth} = useWindowDimensions();
+    const avatarURL = participant?.avatar;
+
+    return (
+        <View style={[styles.flexRow, styles.alignItemsCenter]}>
+            <Avatar
+                imageStyles={[styles.alignSelfCenter]}
+                size={CONST.AVATAR_SIZE.MID_SUBSCRIPT}
+                source={avatarURL}
+                name={displayName}
+                type={CONST.ICON_TYPE_AVATAR}
+                avatarID={participant?.accountID}
+                containerStyles={[styles.pr2]}
+            />
+            <Text
+                numberOfLines={1}
+                style={[isLargeScreenWidth ? styles.themeTextColor : [styles.textMicro, styles.textBold], styles.flexShrink1]}
+            >
+                {displayName}
+            </Text>
+        </View>
+    );
+}
+
+UserInfoCell.displayName = 'UserInfoCell';
+
+export default UserInfoCell;
diff --git a/src/components/SelectionList/SearchTableHeader.tsx b/src/components/SelectionList/SearchTableHeader.tsx
index 02986f22dccc..a5547eb9e710 100644
--- a/src/components/SelectionList/SearchTableHeader.tsx
+++ b/src/components/SelectionList/SearchTableHeader.tsx
@@ -1,18 +1,101 @@
 import React from 'react';
 import {View} from 'react-native';
-import Text from '@components/Text';
+import type {SearchColumnType, SortOrder} from '@components/Search/types';
 import useLocalize from '@hooks/useLocalize';
 import useStyleUtils from '@hooks/useStyleUtils';
 import useThemeStyles from '@hooks/useThemeStyles';
 import useWindowDimensions from '@hooks/useWindowDimensions';
+import * as SearchUtils from '@libs/SearchUtils';
 import CONST from '@src/CONST';
+import type {TranslationPaths} from '@src/languages/types';
+import type * as OnyxTypes from '@src/types/onyx';
+import SortableHeaderText from './SortableHeaderText';
+
+type SearchColumnConfig = {
+    columnName: SearchColumnType;
+    translationKey: TranslationPaths;
+    isColumnSortable?: boolean;
+    shouldShow: (data: OnyxTypes.SearchResults['data'], metadata: OnyxTypes.SearchResults['search']) => boolean;
+};
+
+const expenseHeaders: SearchColumnConfig[] = [
+    {
+        columnName: CONST.SEARCH.TABLE_COLUMNS.RECEIPT,
+        translationKey: 'common.receipt',
+        shouldShow: () => true,
+        isColumnSortable: false,
+    },
+    {
+        columnName: CONST.SEARCH.TABLE_COLUMNS.TYPE,
+        translationKey: 'common.type',
+        shouldShow: () => true,
+        isColumnSortable: false,
+    },
+    {
+        columnName: CONST.SEARCH.TABLE_COLUMNS.DATE,
+        translationKey: 'common.date',
+        shouldShow: () => true,
+    },
+    {
+        columnName: CONST.SEARCH.TABLE_COLUMNS.MERCHANT,
+        translationKey: 'common.merchant',
+        shouldShow: (data: OnyxTypes.SearchResults['data']) => SearchUtils.getShouldShowMerchant(data),
+    },
+    {
+        columnName: CONST.SEARCH.TABLE_COLUMNS.DESCRIPTION,
+        translationKey: 'common.description',
+        shouldShow: (data: OnyxTypes.SearchResults['data']) => !SearchUtils.getShouldShowMerchant(data),
+    },
+    {
+        columnName: CONST.SEARCH.TABLE_COLUMNS.FROM,
+        translationKey: 'common.from',
+        shouldShow: () => true,
+    },
+    {
+        columnName: CONST.SEARCH.TABLE_COLUMNS.TO,
+        translationKey: 'common.to',
+        shouldShow: () => true,
+    },
+    {
+        columnName: CONST.SEARCH.TABLE_COLUMNS.CATEGORY,
+        translationKey: 'common.category',
+        shouldShow: (data, metadata) => metadata?.columnsToShow?.shouldShowCategoryColumn ?? false,
+    },
+    {
+        columnName: CONST.SEARCH.TABLE_COLUMNS.TAG,
+        translationKey: 'common.tag',
+        shouldShow: (data, metadata) => metadata?.columnsToShow?.shouldShowTagColumn ?? false,
+    },
+    {
+        columnName: CONST.SEARCH.TABLE_COLUMNS.TAX_AMOUNT,
+        translationKey: 'common.tax',
+        shouldShow: (data, metadata) => metadata?.columnsToShow?.shouldShowTaxColumn ?? false,
+        isColumnSortable: false,
+    },
+    {
+        columnName: CONST.SEARCH.TABLE_COLUMNS.TOTAL_AMOUNT,
+        translationKey: 'common.total',
+        shouldShow: () => true,
+    },
+    {
+        columnName: CONST.SEARCH.TABLE_COLUMNS.ACTION,
+        translationKey: 'common.action',
+        shouldShow: () => true,
+        isColumnSortable: false,
+    },
+];
 
 type SearchTableHeaderProps = {
-    /** Whether we should show the merchant or description column */
-    shouldShowMerchant: boolean;
+    data: OnyxTypes.SearchResults['data'];
+    metadata: OnyxTypes.SearchResults['search'];
+    sortBy?: SearchColumnType;
+    sortOrder?: SortOrder;
+    onSortPress: (column: SearchColumnType, order: SortOrder) => void;
+    shouldShowYear: boolean;
+    shouldShowSorting: boolean;
 };
 
-function SearchTableHeader({shouldShowMerchant}: SearchTableHeaderProps) {
+function SearchTableHeader({data, metadata, sortBy, sortOrder, onSortPress, shouldShowYear, shouldShowSorting}: SearchTableHeaderProps) {
     const styles = useThemeStyles();
     const StyleUtils = useStyleUtils();
     const {isSmallScreenWidth, isMediumScreenWidth} = useWindowDimensions();
@@ -24,29 +107,30 @@ function SearchTableHeader({shouldShowMerchant}: SearchTableHeaderProps) {
     }
 
     return (
-        <View style={[styles.ph5, styles.pb3]}>
-            <View style={[styles.flex1, styles.flexRow, styles.gap3, styles.ph4]}>
-                <View style={[StyleUtils.getSearchTableColumnStyles(CONST.SEARCH_TABLE_COLUMNS.DATE)]}>
-                    <Text style={[styles.mutedNormalTextLabel]}>{translate('common.date')}</Text>
-                </View>
-                <View style={[StyleUtils.getSearchTableColumnStyles(CONST.SEARCH_TABLE_COLUMNS.MERCHANT)]}>
-                    <Text style={[styles.mutedNormalTextLabel]}>{translate(shouldShowMerchant ? 'common.merchant' : 'common.description')}</Text>
-                </View>
-                <View style={[StyleUtils.getSearchTableColumnStyles(CONST.SEARCH_TABLE_COLUMNS.FROM)]}>
-                    <Text style={[styles.mutedNormalTextLabel]}>{translate('common.from')}</Text>
-                </View>
-                <View style={[StyleUtils.getSearchTableColumnStyles(CONST.SEARCH_TABLE_COLUMNS.TO)]}>
-                    <Text style={[styles.mutedNormalTextLabel]}>{translate('common.to')}</Text>
-                </View>
-                <View style={[StyleUtils.getSearchTableColumnStyles(CONST.SEARCH_TABLE_COLUMNS.TOTAL)]}>
-                    <Text style={[styles.mutedNormalTextLabel]}>{translate('common.total')}</Text>
-                </View>
-                <View style={[StyleUtils.getSearchTableColumnStyles(CONST.SEARCH_TABLE_COLUMNS.TYPE)]}>
-                    <Text style={[styles.mutedNormalTextLabel]}>{translate('common.type')}</Text>
-                </View>
-                <View style={[StyleUtils.getSearchTableColumnStyles(CONST.SEARCH_TABLE_COLUMNS.ACTION)]}>
-                    <Text style={[styles.mutedNormalTextLabel, styles.textAlignCenter]}>{translate('common.action')}</Text>
-                </View>
+        <View style={[styles.flex1]}>
+            <View style={[styles.flex1, styles.flexRow, styles.gap3, styles.pl4]}>
+                {expenseHeaders.map(({columnName, translationKey, shouldShow, isColumnSortable}) => {
+                    if (!shouldShow(data, metadata)) {
+                        return null;
+                    }
+
+                    const isSortable = shouldShowSorting && isColumnSortable;
+                    const isActive = sortBy === columnName;
+                    const textStyle = columnName === CONST.SEARCH.TABLE_COLUMNS.RECEIPT ? StyleUtils.getTextOverflowStyle('clip') : null;
+
+                    return (
+                        <SortableHeaderText
+                            key={translationKey}
+                            text={translate(translationKey)}
+                            textStyle={textStyle}
+                            sortOrder={sortOrder ?? CONST.SEARCH.SORT_ORDER.ASC}
+                            isActive={isActive}
+                            containerStyle={[StyleUtils.getSearchTableColumnStyles(columnName, shouldShowYear)]}
+                            isSortable={isSortable}
+                            onPress={(order: SortOrder) => onSortPress(columnName, order)}
+                        />
+                    );
+                })}
             </View>
         </View>
     );
diff --git a/src/components/SelectionList/SearchTableHeaderColumn.tsx b/src/components/SelectionList/SearchTableHeaderColumn.tsx
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/src/components/SelectionList/SelectableListItem.tsx b/src/components/SelectionList/SelectableListItem.tsx
new file mode 100644
index 000000000000..72920ce8302a
--- /dev/null
+++ b/src/components/SelectionList/SelectableListItem.tsx
@@ -0,0 +1,85 @@
+import React, {useCallback} from 'react';
+import {View} from 'react-native';
+import PressableWithFeedback from '@components/Pressable/PressableWithFeedback';
+import SelectCircle from '@components/SelectCircle';
+import TextWithTooltip from '@components/TextWithTooltip';
+import useThemeStyles from '@hooks/useThemeStyles';
+import CONST from '@src/CONST';
+import BaseListItem from './BaseListItem';
+import type {InviteMemberListItemProps, ListItem} from './types';
+
+function SelectableListItem<TItem extends ListItem>({
+    item,
+    isFocused,
+    showTooltip,
+    isDisabled,
+    canSelectMultiple,
+    onSelectRow,
+    onCheckboxPress,
+    onDismissError,
+    onFocus,
+    shouldSyncFocus,
+}: InviteMemberListItemProps<TItem>) {
+    const styles = useThemeStyles();
+    const handleCheckboxPress = useCallback(() => {
+        if (onCheckboxPress) {
+            onCheckboxPress(item);
+        } else {
+            onSelectRow(item);
+        }
+    }, [item, onCheckboxPress, onSelectRow]);
+
+    return (
+        <BaseListItem
+            item={item}
+            wrapperStyle={[styles.flex1, styles.justifyContentBetween, styles.sidebarLinkInner, isFocused && styles.sidebarLinkActive]}
+            isFocused={isFocused}
+            isDisabled={isDisabled}
+            showTooltip={showTooltip}
+            canSelectMultiple={canSelectMultiple}
+            onSelectRow={onSelectRow}
+            onDismissError={onDismissError}
+            errors={item.errors}
+            pendingAction={item.pendingAction}
+            keyForList={item.keyForList}
+            onFocus={onFocus}
+            shouldSyncFocus={shouldSyncFocus}
+        >
+            <>
+                <View style={[styles.flex1, styles.flexColumn, styles.justifyContentCenter, styles.alignItemsStretch, styles.optionRow]}>
+                    <View style={[styles.flexRow, styles.alignItemsCenter]}>
+                        <TextWithTooltip
+                            shouldShowTooltip={showTooltip}
+                            text={item.text ?? ''}
+                            style={[
+                                styles.optionDisplayName,
+                                isFocused ? styles.sidebarLinkActiveText : styles.sidebarLinkText,
+                                item.isBold !== false && styles.sidebarLinkTextBold,
+                                styles.pre,
+                                item.alternateText ? styles.mb1 : null,
+                            ]}
+                        />
+                    </View>
+                </View>
+                {canSelectMultiple && !item.isDisabled && (
+                    <PressableWithFeedback
+                        onPress={handleCheckboxPress}
+                        disabled={isDisabled}
+                        role={CONST.ROLE.BUTTON}
+                        accessibilityLabel={item.text ?? ''}
+                        style={[styles.ml2, styles.optionSelectCircle]}
+                    >
+                        <SelectCircle
+                            isChecked={item.isSelected ?? false}
+                            selectCircleStyles={styles.ml0}
+                        />
+                    </PressableWithFeedback>
+                )}
+            </>
+        </BaseListItem>
+    );
+}
+
+SelectableListItem.displayName = 'SelectableListItem';
+
+export default SelectableListItem;
diff --git a/src/components/SelectionList/SortableHeaderText.tsx b/src/components/SelectionList/SortableHeaderText.tsx
new file mode 100644
index 000000000000..47a894d79f53
--- /dev/null
+++ b/src/components/SelectionList/SortableHeaderText.tsx
@@ -0,0 +1,76 @@
+import React from 'react';
+import {View} from 'react-native';
+import type {StyleProp, TextStyle, ViewStyle} from 'react-native';
+import Icon from '@components/Icon';
+import * as Expensicons from '@components/Icon/Expensicons';
+import PressableWithFeedback from '@components/Pressable/PressableWithFeedback';
+import type {SortOrder} from '@components/Search/types';
+import Text from '@components/Text';
+import useTheme from '@hooks/useTheme';
+import useThemeStyles from '@hooks/useThemeStyles';
+import CONST from '@src/CONST';
+
+type SearchTableHeaderColumnProps = {
+    text: string;
+    isActive: boolean;
+    sortOrder: SortOrder;
+    isSortable?: boolean;
+    containerStyle?: StyleProp<ViewStyle>;
+    textStyle?: StyleProp<TextStyle>;
+    onPress: (order: SortOrder) => void;
+};
+
+export default function SortableHeaderText({text, sortOrder, isActive, textStyle, containerStyle, isSortable = true, onPress}: SearchTableHeaderColumnProps) {
+    const styles = useThemeStyles();
+    const theme = useTheme();
+
+    if (!isSortable) {
+        return (
+            <View style={containerStyle}>
+                <View style={[styles.flexRow, styles.alignItemsCenter, styles.gap1]}>
+                    <Text
+                        numberOfLines={1}
+                        style={[styles.textMicroSupporting, textStyle]}
+                    >
+                        {text}
+                    </Text>
+                </View>
+            </View>
+        );
+    }
+
+    const icon = sortOrder === CONST.SEARCH.SORT_ORDER.ASC ? Expensicons.ArrowUpLong : Expensicons.ArrowDownLong;
+    const displayIcon = isActive;
+    const activeColumnStyle = isSortable && isActive && styles.searchTableHeaderActive;
+
+    const nextSortOrder = isActive && sortOrder === CONST.SEARCH.SORT_ORDER.DESC ? CONST.SEARCH.SORT_ORDER.ASC : CONST.SEARCH.SORT_ORDER.DESC;
+
+    return (
+        <View style={containerStyle}>
+            <PressableWithFeedback
+                onPress={() => onPress(nextSortOrder)}
+                role={CONST.ROLE.BUTTON}
+                accessibilityLabel={CONST.ROLE.BUTTON}
+                accessible
+                disabled={!isSortable}
+            >
+                <View style={[styles.flexRow, styles.alignItemsCenter, styles.gap1]}>
+                    <Text
+                        numberOfLines={1}
+                        style={[styles.textMicroSupporting, activeColumnStyle, textStyle]}
+                    >
+                        {text}
+                    </Text>
+                    {displayIcon && (
+                        <Icon
+                            src={icon}
+                            fill={theme.icon}
+                            height={12}
+                            width={12}
+                        />
+                    )}
+                </View>
+            </PressableWithFeedback>
+        </View>
+    );
+}
diff --git a/src/components/SelectionList/TableListItem.tsx b/src/components/SelectionList/TableListItem.tsx
index d07d658f6b12..ee1ce4672529 100644
--- a/src/components/SelectionList/TableListItem.tsx
+++ b/src/components/SelectionList/TableListItem.tsx
@@ -21,9 +21,9 @@ function TableListItem<TItem extends ListItem>({
     onSelectRow,
     onCheckboxPress,
     onDismissError,
-    shouldPreventDefaultFocusOnSelectRow,
     rightHandSideComponent,
     onFocus,
+    onLongPressRow,
     shouldSyncFocus,
 }: TableListItemProps<TItem>) {
     const styles = useThemeStyles();
@@ -44,16 +44,16 @@ function TableListItem<TItem extends ListItem>({
     return (
         <BaseListItem
             item={item}
-            pressableStyle={[[styles.selectionListPressableItemWrapper, item.isSelected && styles.activeComponentBG, isFocused && styles.sidebarLinkActive]]}
+            pressableStyle={[[styles.selectionListPressableItemWrapper, item.isSelected && styles.activeComponentBG, isFocused && styles.sidebarLinkActive, item.cursorStyle]]}
             wrapperStyle={[styles.flexRow, styles.flex1, styles.justifyContentBetween, styles.userSelectNone, styles.alignItemsCenter]}
             containerStyle={styles.mb3}
             isFocused={isFocused}
             isDisabled={isDisabled}
             showTooltip={showTooltip}
             canSelectMultiple={canSelectMultiple}
+            onLongPressRow={onLongPressRow}
             onSelectRow={onSelectRow}
             onDismissError={onDismissError}
-            shouldPreventDefaultFocusOnSelectRow={shouldPreventDefaultFocusOnSelectRow}
             rightHandSideComponent={rightHandSideComponent}
             errors={item.errors}
             pendingAction={item.pendingAction}
@@ -71,9 +71,9 @@ function TableListItem<TItem extends ListItem>({
                             // eslint-disable-next-line @typescript-eslint/prefer-nullish-coalescing
                             disabled={isDisabled || item.isDisabledCheckbox}
                             onPress={handleCheckboxPress}
-                            style={[styles.cursorUnset, StyleUtils.getCheckboxPressableStyle(), item.isDisabledCheckbox && styles.cursorDisabled, styles.mr3]}
+                            style={[styles.cursorUnset, StyleUtils.getCheckboxPressableStyle(), item.isDisabledCheckbox && styles.cursorDisabled, styles.mr3, item.cursorStyle]}
                         >
-                            <View style={[StyleUtils.getCheckboxContainerStyle(20), StyleUtils.getMultiselectListStyles(!!item.isSelected, !!item.isDisabled)]}>
+                            <View style={[StyleUtils.getCheckboxContainerStyle(20), StyleUtils.getMultiselectListStyles(!!item.isSelected, !!item.isDisabled), item.cursorStyle]}>
                                 {item.isSelected && (
                                     <Icon
                                         src={Expensicons.Checkmark}
diff --git a/src/components/SelectionList/TransactionListItem.tsx b/src/components/SelectionList/TransactionListItem.tsx
deleted file mode 100644
index 0965ce6dabce..000000000000
--- a/src/components/SelectionList/TransactionListItem.tsx
+++ /dev/null
@@ -1,231 +0,0 @@
-import React from 'react';
-import {View} from 'react-native';
-import type {OnyxEntry} from 'react-native-onyx';
-import Avatar from '@components/Avatar';
-import Button from '@components/Button';
-import Icon from '@components/Icon';
-import * as Expensicons from '@components/Icon/Expensicons';
-import Text from '@components/Text';
-import TextWithTooltip from '@components/TextWithTooltip';
-import useLocalize from '@hooks/useLocalize';
-import useStyleUtils from '@hooks/useStyleUtils';
-import useTheme from '@hooks/useTheme';
-import useThemeStyles from '@hooks/useThemeStyles';
-import useWindowDimensions from '@hooks/useWindowDimensions';
-import * as CurrencyUtils from '@libs/CurrencyUtils';
-import * as TransactionUtils from '@libs/TransactionUtils';
-import variables from '@styles/variables';
-import CONST from '@src/CONST';
-import type {Transaction} from '@src/types/onyx';
-import type {SearchPersonalDetails, SearchPolicyDetails, SearchTransactionType} from '@src/types/onyx/SearchResults';
-import BaseListItem from './BaseListItem';
-import type {ListItem, TransactionListItemProps, TransactionListItemType} from './types';
-
-const getTypeIcon = (type?: SearchTransactionType) => {
-    switch (type) {
-        case CONST.SEARCH_TRANSACTION_TYPE.CASH:
-            return Expensicons.Cash;
-        case CONST.SEARCH_TRANSACTION_TYPE.CARD:
-            return Expensicons.CreditCard;
-        case CONST.SEARCH_TRANSACTION_TYPE.DISTANCE:
-            return Expensicons.Car;
-        default:
-            return Expensicons.Cash;
-    }
-};
-
-function TransactionListItem<TItem extends ListItem>({
-    item,
-    isFocused,
-    showTooltip,
-    isDisabled,
-    canSelectMultiple,
-    onSelectRow,
-    onDismissError,
-    shouldPreventDefaultFocusOnSelectRow,
-    onFocus,
-    shouldSyncFocus,
-}: TransactionListItemProps<TItem>) {
-    const transactionItem = item as unknown as TransactionListItemType;
-    const styles = useThemeStyles();
-    const {translate} = useLocalize();
-    const theme = useTheme();
-    const {isLargeScreenWidth} = useWindowDimensions();
-    const StyleUtils = useStyleUtils();
-
-    function getMerchant() {
-        const merchant = TransactionUtils.getMerchant(transactionItem as OnyxEntry<Transaction>);
-        return merchant === CONST.TRANSACTION.PARTIAL_TRANSACTION_MERCHANT || merchant === CONST.TRANSACTION.DEFAULT_MERCHANT ? '' : merchant;
-    }
-
-    const isFromExpenseReport = transactionItem.reportType === CONST.REPORT.TYPE.EXPENSE;
-    const date = TransactionUtils.getCreated(transactionItem as OnyxEntry<Transaction>, CONST.DATE.MONTH_DAY_ABBR_FORMAT);
-    const amount = TransactionUtils.getAmount(transactionItem as OnyxEntry<Transaction>, isFromExpenseReport);
-    const currency = TransactionUtils.getCurrency(transactionItem as OnyxEntry<Transaction>);
-    const description = TransactionUtils.getDescription(transactionItem as OnyxEntry<Transaction>);
-    const merchant = getMerchant();
-    const typeIcon = getTypeIcon(transactionItem.type);
-
-    const dateCell = (
-        <TextWithTooltip
-            shouldShowTooltip={showTooltip}
-            text={date}
-            style={[styles.label, styles.pre, styles.justifyContentCenter, isLargeScreenWidth ? undefined : [styles.textMicro, styles.textSupporting]]}
-        />
-    );
-
-    const merchantCell = (
-        <TextWithTooltip
-            shouldShowTooltip={showTooltip}
-            text={transactionItem.shouldShowMerchant ? merchant : description}
-            style={[styles.optionDisplayName, styles.label, styles.pre, styles.justifyContentCenter]}
-        />
-    );
-
-    const userCell = (participant: SearchPersonalDetails & SearchPolicyDetails) => {
-        const displayName = participant?.name ?? participant?.displayName ?? participant?.login;
-        const avatarURL = participant?.avatarURL ?? participant?.avatar;
-        const isWorkspace = participant?.avatarURL !== undefined;
-        const iconType = isWorkspace ? CONST.ICON_TYPE_WORKSPACE : CONST.ICON_TYPE_AVATAR;
-
-        return (
-            <View style={[styles.flexRow, styles.gap1, styles.alignItemsCenter]}>
-                <Avatar
-                    imageStyles={[styles.alignSelfCenter]}
-                    size={CONST.AVATAR_SIZE.MID_SUBSCRIPT}
-                    source={avatarURL}
-                    name={displayName}
-                    type={iconType}
-                    accountID={isWorkspace ? participant?.id : participant?.accountID}
-                />
-                <Text
-                    numberOfLines={1}
-                    style={[styles.textMicroBold, styles.flexShrink1]}
-                >
-                    {displayName}
-                </Text>
-            </View>
-        );
-    };
-
-    const totalCell = (
-        <TextWithTooltip
-            shouldShowTooltip={showTooltip}
-            text={CurrencyUtils.convertToDisplayString(amount, currency)}
-            style={[styles.optionDisplayName, styles.textNewKansasNormal, styles.pre, styles.justifyContentCenter, isLargeScreenWidth ? undefined : styles.textAlignRight]}
-        />
-    );
-
-    const typeCell = (
-        <Icon
-            src={typeIcon}
-            fill={theme.icon}
-            height={isLargeScreenWidth ? 20 : 12}
-            width={isLargeScreenWidth ? 20 : 12}
-        />
-    );
-
-    const actionCell = (
-        <Button
-            text={translate('common.view')}
-            onPress={() => {
-                onSelectRow(item);
-            }}
-            small
-            pressOnEnter
-            style={[styles.p0]}
-        />
-    );
-
-    const listItemPressableStyle = [styles.selectionListPressableItemWrapper, styles.pv3, item.isSelected && styles.activeComponentBG, isFocused && styles.sidebarLinkActive];
-
-    if (!isLargeScreenWidth) {
-        return (
-            <BaseListItem
-                item={item}
-                pressableStyle={listItemPressableStyle}
-                wrapperStyle={[styles.flexColumn, styles.flex1, styles.userSelectNone, styles.alignItemsStretch]}
-                containerStyle={[styles.mb3]}
-                isFocused={isFocused}
-                isDisabled={isDisabled}
-                showTooltip={showTooltip}
-                canSelectMultiple={canSelectMultiple}
-                onSelectRow={onSelectRow}
-                onDismissError={onDismissError}
-                shouldPreventDefaultFocusOnSelectRow={shouldPreventDefaultFocusOnSelectRow}
-                errors={item.errors}
-                pendingAction={item.pendingAction}
-                keyForList={item.keyForList}
-                onFocus={onFocus}
-                shouldSyncFocus={shouldSyncFocus}
-                hoverStyle={item.isSelected && styles.activeComponentBG}
-            >
-                {() => (
-                    <>
-                        <View style={[styles.flexRow, styles.alignItemsCenter, styles.justifyContentBetween, styles.mb2, styles.gap2]}>
-                            <View style={[styles.flexRow, styles.alignItemsCenter, styles.gap1, styles.flex1]}>
-                                <View style={[styles.mw50]}>{userCell(transactionItem.from)}</View>
-                                <Icon
-                                    src={Expensicons.ArrowRightLong}
-                                    width={variables.iconSizeXXSmall}
-                                    height={variables.iconSizeXXSmall}
-                                    fill={theme.icon}
-                                />
-                                <View style={[styles.mw50]}>{userCell(transactionItem.to)}</View>
-                            </View>
-                            <View style={[StyleUtils.getWidthStyle(variables.w80)]}>{actionCell}</View>
-                        </View>
-                        <View style={[styles.flexRow, styles.justifyContentBetween, styles.gap1]}>
-                            <View style={[styles.flex1]}>{merchantCell}</View>
-                            <View style={[styles.alignItemsEnd, styles.gap1]}>
-                                {totalCell}
-                                <View style={[styles.flexRow, styles.gap1, styles.justifyContentCenter]}>
-                                    {typeCell}
-                                    {dateCell}
-                                </View>
-                            </View>
-                        </View>
-                    </>
-                )}
-            </BaseListItem>
-        );
-    }
-
-    return (
-        <BaseListItem
-            item={item}
-            pressableStyle={listItemPressableStyle}
-            wrapperStyle={[styles.flexRow, styles.flex1, styles.justifyContentBetween, styles.userSelectNone, styles.alignItemsCenter]}
-            containerStyle={[styles.mb3]}
-            isFocused={isFocused}
-            isDisabled={isDisabled}
-            showTooltip={showTooltip}
-            canSelectMultiple={canSelectMultiple}
-            onSelectRow={onSelectRow}
-            onDismissError={onDismissError}
-            shouldPreventDefaultFocusOnSelectRow={shouldPreventDefaultFocusOnSelectRow}
-            errors={item.errors}
-            pendingAction={item.pendingAction}
-            keyForList={item.keyForList}
-            onFocus={onFocus}
-            shouldSyncFocus={shouldSyncFocus}
-            hoverStyle={item.isSelected && styles.activeComponentBG}
-        >
-            {() => (
-                <View style={[styles.flex1, styles.flexRow, styles.gap3, styles.alignItemsCenter]}>
-                    <View style={[StyleUtils.getSearchTableColumnStyles(CONST.SEARCH_TABLE_COLUMNS.DATE)]}>{dateCell}</View>
-                    <View style={[StyleUtils.getSearchTableColumnStyles(CONST.SEARCH_TABLE_COLUMNS.MERCHANT)]}>{merchantCell}</View>
-                    <View style={[StyleUtils.getSearchTableColumnStyles(CONST.SEARCH_TABLE_COLUMNS.FROM)]}>{userCell(transactionItem.from)}</View>
-                    <View style={[StyleUtils.getSearchTableColumnStyles(CONST.SEARCH_TABLE_COLUMNS.FROM)]}>{userCell(transactionItem.to)}</View>
-                    <View style={[StyleUtils.getSearchTableColumnStyles(CONST.SEARCH_TABLE_COLUMNS.TOTAL)]}>{totalCell}</View>
-                    <View style={[StyleUtils.getSearchTableColumnStyles(CONST.SEARCH_TABLE_COLUMNS.TYPE)]}>{typeCell}</View>
-                    <View style={[StyleUtils.getSearchTableColumnStyles(CONST.SEARCH_TABLE_COLUMNS.ACTION)]}>{actionCell}</View>
-                </View>
-            )}
-        </BaseListItem>
-    );
-}
-
-TransactionListItem.displayName = 'TransactionListItem';
-
-export default TransactionListItem;
diff --git a/src/components/SelectionList/UserListItem.tsx b/src/components/SelectionList/UserListItem.tsx
index a517a9f1ca15..104990cf479c 100644
--- a/src/components/SelectionList/UserListItem.tsx
+++ b/src/components/SelectionList/UserListItem.tsx
@@ -1,4 +1,4 @@
-import Str from 'expensify-common/lib/str';
+import {Str} from 'expensify-common';
 import React, {useCallback} from 'react';
 import {View} from 'react-native';
 import Icon from '@components/Icon';
@@ -25,11 +25,11 @@ function UserListItem<TItem extends ListItem>({
     onSelectRow,
     onCheckboxPress,
     onDismissError,
-    shouldPreventDefaultFocusOnSelectRow,
     shouldPreventEnterKeySubmit,
     rightHandSideComponent,
     onFocus,
     shouldSyncFocus,
+    pressableStyle,
 }: UserListItemProps<TItem>) {
     const styles = useThemeStyles();
     const theme = useTheme();
@@ -58,11 +58,11 @@ function UserListItem<TItem extends ListItem>({
             canSelectMultiple={canSelectMultiple}
             onSelectRow={onSelectRow}
             onDismissError={onDismissError}
-            shouldPreventDefaultFocusOnSelectRow={shouldPreventDefaultFocusOnSelectRow}
             shouldPreventEnterKeySubmit={shouldPreventEnterKeySubmit}
             rightHandSideComponent={rightHandSideComponent}
             errors={item.errors}
             pendingAction={item.pendingAction}
+            pressableStyle={pressableStyle}
             FooterComponent={
                 item.invitedSecondaryLogin ? (
                     <Text style={[styles.ml9, styles.ph5, styles.pb3, styles.textLabelSupporting]}>
diff --git a/src/components/SelectionList/types.ts b/src/components/SelectionList/types.ts
index 8a2a1efdd030..824f5d82a3ce 100644
--- a/src/components/SelectionList/types.ts
+++ b/src/components/SelectionList/types.ts
@@ -1,23 +1,24 @@
 import type {MutableRefObject, ReactElement, ReactNode} from 'react';
 import type {GestureResponderEvent, InputModeOptions, LayoutChangeEvent, SectionListData, StyleProp, TextInput, TextStyle, ViewStyle} from 'react-native';
-import type {ValueOf} from 'type-fest';
-import type {MaybePhraseKey} from '@libs/Localize';
 import type {BrickRoad} from '@libs/WorkspacesSettingsUtils';
+// eslint-disable-next-line no-restricted-imports
+import type CursorStyles from '@styles/utils/cursor/types';
 import type CONST from '@src/CONST';
 import type {Errors, Icon, PendingAction} from '@src/types/onyx/OnyxCommon';
-import type {SearchPersonalDetails, SearchPolicyDetails} from '@src/types/onyx/SearchResults';
+import type {SearchPersonalDetails, SearchReport, SearchTransaction} from '@src/types/onyx/SearchResults';
 import type {ReceiptErrors} from '@src/types/onyx/Transaction';
 import type ChildrenProps from '@src/types/utils/ChildrenProps';
 import type IconAsset from '@src/types/utils/IconAsset';
 import type InviteMemberListItem from './InviteMemberListItem';
 import type RadioListItem from './RadioListItem';
+import type ReportListItem from './Search/ReportListItem';
+import type TransactionListItem from './Search/TransactionListItem';
 import type TableListItem from './TableListItem';
-import type TransactionListItem from './TransactionListItem';
 import type UserListItem from './UserListItem';
 
 type TRightHandSideComponent<TItem extends ListItem> = {
     /** Component to display on the right side */
-    rightHandSideComponent?: ((item: TItem) => ReactElement | null | undefined) | ReactElement | null;
+    rightHandSideComponent?: ((item: TItem, isFocused?: boolean) => ReactElement | null | undefined) | ReactElement | null;
 };
 
 type CommonListItemProps<TItem extends ListItem> = {
@@ -57,8 +58,14 @@ type CommonListItemProps<TItem extends ListItem> = {
     /** Whether to wrap long text up to 2 lines */
     isMultilineSupported?: boolean;
 
+    /** Whether to wrap the alternate text up to 2 lines */
+    isAlternateTextMultilineSupported?: boolean;
+
     /** Handles what to do when the item is focused */
     onFocus?: () => void;
+
+    /** Callback to fire when the item is long pressed */
+    onLongPressRow?: (item: TItem) => void;
 } & TRightHandSideComponent<TItem>;
 
 type ListItem = {
@@ -80,6 +87,9 @@ type ListItem = {
     /** Whether this option is disabled for selection */
     isDisabled?: boolean | null;
 
+    /** Whether this item should be interactive at all */
+    isInteractive?: boolean;
+
     /** List title is bold by default. Use this props to customize it */
     isBold?: boolean;
 
@@ -89,6 +99,9 @@ type ListItem = {
     /** User login */
     login?: string | null;
 
+    /** Element to show on the left side of the item */
+    leftElement?: ReactNode;
+
     /** Element to show on the right side of the item */
     rightElement?: ReactNode;
 
@@ -118,6 +131,9 @@ type ListItem = {
     /** Whether to wrap long text up to 2 lines */
     isMultilineSupported?: boolean;
 
+    /** Whether to wrap the alternate text up to 2 lines */
+    isAlternateTextMultilineSupported?: boolean;
+
     /** The search value from the selection list */
     searchText?: string | null;
 
@@ -126,66 +142,71 @@ type ListItem = {
 
     /** Whether the brick road indicator should be shown */
     brickRoadIndicator?: BrickRoad | '' | null;
-};
 
-type TransactionListItemType = ListItem & {
-    /** The ID of the transaction */
-    transactionID: string;
+    /** Element to render below the ListItem */
+    footerContent?: ReactNode;
 
-    /** The transaction created date */
-    created: string;
+    /** Whether item pressable wrapper should be focusable */
+    tabIndex?: 0 | -1;
 
-    /** The edited transaction created date */
-    modifiedCreated: string;
+    /** The style to override the cursor appearance */
+    cursorStyle?: CursorStyles[keyof CursorStyles];
+};
 
-    /** The transaction amount */
-    amount: number;
+type TransactionListItemType = ListItem &
+    SearchTransaction & {
+        /** The personal details of the user requesting money */
+        from: SearchPersonalDetails;
 
-    /** The edited transaction amount */
-    modifiedAmount: number;
+        /** The personal details of the user paying the request */
+        to: SearchPersonalDetails;
 
-    /** The transaction currency */
-    currency: string;
+        /** final and formatted "from" value used for displaying and sorting */
+        formattedFrom: string;
 
-    /** The edited transaction currency */
-    modifiedCurrency: string;
+        /** final and formatted "to" value used for displaying and sorting */
+        formattedTo: string;
 
-    /** The transaction merchant */
-    merchant: string;
+        /** final and formatted "total" value used for displaying and sorting */
+        formattedTotal: number;
 
-    /** The edited transaction merchant */
-    modifiedMerchant: string;
+        /** final and formatted "merchant" value used for displaying and sorting */
+        formattedMerchant: string;
 
-    /** The receipt object */
-    receipt?: {source?: string};
+        /** final "date" value used for sorting */
+        date: string;
 
-    /** The personal details of the user requesting money */
-    from: SearchPersonalDetails & SearchPolicyDetails;
+        /** Whether we should show the merchant column */
+        shouldShowMerchant: boolean;
 
-    /** The personal details of the user paying the request */
-    to: SearchPersonalDetails & SearchPolicyDetails;
+        /** Whether we should show the category column */
+        shouldShowCategory: boolean;
 
-    /** The transaction tag */
-    tag: string;
+        /** Whether we should show the tag column */
+        shouldShowTag: boolean;
 
-    /** The transaction description */
-    comment: {comment: string};
+        /** Whether we should show the tax column */
+        shouldShowTax: boolean;
 
-    /** The transaction category */
-    category: string;
+        /** Whether we should show the transaction year.
+         * This is true if at least one transaction in the dataset was created in past years
+         */
+        shouldShowYear: boolean;
 
-    /** The type of request */
-    type: ValueOf<typeof CONST.SEARCH_TRANSACTION_TYPE>;
+        /** Key used internally by React */
+        keyForList: string;
+    };
 
-    /** The type of report the transaction is associated with */
-    reportType: string;
+type ReportListItemType = ListItem &
+    SearchReport & {
+        /** The personal details of the user requesting money */
+        from: SearchPersonalDetails;
 
-    /** The ID of the policy the transaction is associated with */
-    policyID: string;
+        /** The personal details of the user paying the request */
+        to: SearchPersonalDetails;
 
-    /** Whether we should show the merchant column */
-    shouldShowMerchant: boolean;
-};
+        transactions: TransactionListItemType[];
+    };
 
 type ListItemProps<TItem extends ListItem> = CommonListItemProps<TItem> & {
     /** The section list item */
@@ -245,7 +266,9 @@ type TableListItemProps<TItem extends ListItem> = ListItemProps<TItem>;
 
 type TransactionListItemProps<TItem extends ListItem> = ListItemProps<TItem>;
 
-type ValidListItem = typeof RadioListItem | typeof UserListItem | typeof TableListItem | typeof InviteMemberListItem | typeof TransactionListItem;
+type ReportListItemProps<TItem extends ListItem> = ListItemProps<TItem>;
+
+type ValidListItem = typeof RadioListItem | typeof UserListItem | typeof TableListItem | typeof InviteMemberListItem | typeof TransactionListItem | typeof ReportListItem;
 
 type Section<TItem extends ListItem> = {
     /** Title of the section */
@@ -266,6 +289,10 @@ type SectionWithIndexOffset<TItem extends ListItem> = Section<TItem> & {
     indexOffset?: number;
 };
 
+type SkeletonViewProps = {
+    shouldAnimate: boolean;
+};
+
 type BaseSelectionListProps<TItem extends ListItem> = Partial<ChildrenProps> & {
     /** Sections for the section list */
     sections: Array<SectionListDataType<TItem>> | typeof CONST.EMPTY_ARRAY;
@@ -273,18 +300,32 @@ type BaseSelectionListProps<TItem extends ListItem> = Partial<ChildrenProps> & {
     /** Default renderer for every item in the list */
     ListItem: ValidListItem;
 
+    shouldUseUserSkeletonView?: boolean;
+
     /** Whether this is a multi-select list */
     canSelectMultiple?: boolean;
 
     /** Callback to fire when a row is pressed */
     onSelectRow: (item: TItem) => void;
 
+    /** Whether to single execution `onRowSelect` - workaround for unintentional multiple navigation calls https://github.com/Expensify/App/issues/44443 */
+    shouldSingleExecuteRowSelect?: boolean;
+
+    /** Whether to update the focused index on a row select */
+    shouldUpdateFocusedIndex?: boolean;
+
     /** Optional callback function triggered upon pressing a checkbox. If undefined and the list displays checkboxes, checkbox interactions are managed by onSelectRow, allowing for pressing anywhere on the list. */
     onCheckboxPress?: (item: TItem) => void;
 
     /** Callback to fire when "Select All" checkbox is pressed. Only use along with `canSelectMultiple` */
     onSelectAll?: () => void;
 
+    /**
+     * Callback that should return height of the specific item
+     * Only use this if we're handling some non-standard items, most of the time the default value is correct
+     */
+    getItemHeight?: (item: TItem) => number;
+
     /** Callback to fire when an error is dismissed */
     onDismissError?: (item: TItem) => void;
 
@@ -295,7 +336,7 @@ type BaseSelectionListProps<TItem extends ListItem> = Partial<ChildrenProps> & {
     textInputPlaceholder?: string;
 
     /** Hint for the text input */
-    textInputHint?: MaybePhraseKey;
+    textInputHint?: string;
 
     /** Value for the text input */
     textInputValue?: string;
@@ -360,12 +401,18 @@ type BaseSelectionListProps<TItem extends ListItem> = Partial<ChildrenProps> & {
     /** Custom content to display in the header */
     headerContent?: ReactNode;
 
+    /** Custom content to display in the header of list component. */
+    listHeaderContent?: React.JSX.Element | null;
+
     /** Custom content to display in the footer */
     footerContent?: ReactNode;
 
     /** Custom content to display in the footer of list component. If present ShowMore button won't be displayed */
     listFooterContent?: React.JSX.Element | null;
 
+    /** Custom content to display when the list is empty after finish loading */
+    listEmptyContent?: React.JSX.Element | null;
+
     /** Whether to use dynamic maxToRenderPerBatch depending on the visible number of elements */
     shouldUseDynamicMaxToRenderPerBatch?: boolean;
 
@@ -375,6 +422,9 @@ type BaseSelectionListProps<TItem extends ListItem> = Partial<ChildrenProps> & {
     /** Styles to apply to SelectionList container */
     containerStyle?: StyleProp<ViewStyle>;
 
+    /** Styles to apply to SectionList component */
+    sectionListStyle?: StyleProp<ViewStyle>;
+
     /** Whether focus event should be delayed */
     shouldDelayFocus?: boolean;
 
@@ -387,27 +437,66 @@ type BaseSelectionListProps<TItem extends ListItem> = Partial<ChildrenProps> & {
     /** Custom header to show right above list */
     customListHeader?: ReactNode;
 
+    /** When customListHeader is provided, this should be its height needed for correct list scrolling */
+    customListHeaderHeight?: number;
+
     /** Styles for the list header wrapper */
     listHeaderWrapperStyle?: StyleProp<ViewStyle>;
 
     /** Whether to wrap long text up to 2 lines */
     isRowMultilineSupported?: boolean;
 
+    /** Whether to wrap the alternate text up to 2 lines */
+    isAlternateTextMultilineSupported?: boolean;
+
     /** Ref for textInput */
     textInputRef?: MutableRefObject<TextInput | null> | ((ref: TextInput | null) => void);
 
     /** Styles for the section title */
     sectionTitleStyles?: StyleProp<ViewStyle>;
 
+    /** This may improve scroll performance for large lists */
+    removeClippedSubviews?: boolean;
+
     /**
      * When true, the list won't be visible until the list layout is measured. This prevents the list from "blinking" as it's scrolled to the bottom which is recommended for large lists.
      * When false, the list will render immediately and scroll to the bottom which works great for small lists.
      */
     shouldHideListOnInitialRender?: boolean;
+
+    /** Called once when the scroll position gets within onEndReachedThreshold of the rendered content. */
+    onEndReached?: () => void;
+
+    /**
+     * How far from the end (in units of visible length of the list) the bottom edge of the
+     * list must be from the end of the content to trigger the `onEndReached` callback.
+     * Thus a value of 0.5 will trigger `onEndReached` when the end of the content is
+     * within half the visible length of the list.
+     */
+    onEndReachedThreshold?: number;
+
+    /**
+     * While maxToRenderPerBatch tells the amount of items rendered per batch, setting updateCellsBatchingPeriod tells your VirtualizedList the delay in milliseconds between batch renders (how frequently your component will be rendering the windowed items).
+     * https://reactnative.dev/docs/optimizing-flatlist-configuration#updatecellsbatchingperiod
+     */
+    updateCellsBatchingPeriod?: number;
+
+    /**
+     * The number passed here is a measurement unit where 1 is equivalent to your viewport height. The default value is 21 (10 viewports above, 10 below, and one in between).
+     * https://reactnative.dev/docs/optimizing-flatlist-configuration#windowsize
+     */
+    windowSize?: number;
+
+    /** Callback to fire when the item is long pressed */
+    onLongPressRow?: (item: TItem) => void;
+
+    /** Whether to show the empty list content */
+    shouldShowListEmptyContent?: boolean;
 } & TRightHandSideComponent<TItem>;
 
 type SelectionListHandle = {
     scrollAndHighlightItem?: (items: string[], timeout: number) => void;
+    clearInputAfterSelect?: () => void;
 };
 
 type ItemLayout = {
@@ -419,6 +508,7 @@ type FlattenedSectionsReturn<TItem extends ListItem> = {
     allOptions: TItem[];
     selectedOptions: TItem[];
     disabledOptionsIndexes: number[];
+    disabledArrowKeyOptionsIndexes: number[];
     itemLayouts: ItemLayout[];
     allSelected: boolean;
 };
@@ -442,13 +532,16 @@ export type {
     ListItem,
     ListItemProps,
     RadioListItemProps,
+    ReportListItemProps,
+    ReportListItemType,
     Section,
+    SkeletonViewProps,
     SectionListDataType,
     SectionWithIndexOffset,
     SelectionListHandle,
     TableListItemProps,
     TransactionListItemProps,
+    TransactionListItemType,
     UserListItemProps,
     ValidListItem,
-    TransactionListItemType,
 };
diff --git a/src/components/SelectionListWithModal/index.tsx b/src/components/SelectionListWithModal/index.tsx
new file mode 100644
index 000000000000..907fd4f740a1
--- /dev/null
+++ b/src/components/SelectionListWithModal/index.tsx
@@ -0,0 +1,92 @@
+import React, {forwardRef, useEffect, useState} from 'react';
+import type {ForwardedRef} from 'react';
+import {useOnyx} from 'react-native-onyx';
+import * as Expensicons from '@components/Icon/Expensicons';
+import MenuItem from '@components/MenuItem';
+import Modal from '@components/Modal';
+import SelectionList from '@components/SelectionList';
+import type {BaseSelectionListProps, ListItem, SelectionListHandle} from '@components/SelectionList/types';
+import useLocalize from '@hooks/useLocalize';
+import useResponsiveLayout from '@hooks/useResponsiveLayout';
+import {turnOffMobileSelectionMode, turnOnMobileSelectionMode} from '@libs/actions/MobileSelectionMode';
+import CONST from '@src/CONST';
+import ONYXKEYS from '@src/ONYXKEYS';
+
+type SelectionListWithModalProps<TItem extends ListItem> = BaseSelectionListProps<TItem> & {
+    turnOnSelectionModeOnLongPress?: boolean;
+    onTurnOnSelectionMode?: (item: TItem | null) => void;
+};
+
+function SelectionListWithModal<TItem extends ListItem>(
+    {turnOnSelectionModeOnLongPress, onTurnOnSelectionMode, onLongPressRow, sections, ...rest}: SelectionListWithModalProps<TItem>,
+    ref: ForwardedRef<SelectionListHandle>,
+) {
+    const [isModalVisible, setIsModalVisible] = useState(false);
+    const [longPressedItem, setLongPressedItem] = useState<TItem | null>(null);
+    const {translate} = useLocalize();
+    const {isSmallScreenWidth} = useResponsiveLayout();
+    const [selectionMode] = useOnyx(ONYXKEYS.MOBILE_SELECTION_MODE);
+
+    useEffect(() => {
+        // We can access 0 index safely as we are not displaying multiple sections in table view
+        const selectedItems = sections[0].data.filter((item) => item.isSelected);
+        if (!isSmallScreenWidth) {
+            if (selectedItems.length === 0) {
+                turnOffMobileSelectionMode();
+            }
+            return;
+        }
+        if (selectedItems.length > 0 && !selectionMode?.isEnabled) {
+            turnOnMobileSelectionMode();
+        }
+    }, [sections, selectionMode, isSmallScreenWidth]);
+
+    const handleLongPressRow = (item: TItem) => {
+        // eslint-disable-next-line @typescript-eslint/prefer-nullish-coalescing
+        if (!turnOnSelectionModeOnLongPress || !isSmallScreenWidth || item?.isDisabled || item?.isDisabledCheckbox) {
+            return;
+        }
+        setLongPressedItem(item);
+        setIsModalVisible(true);
+
+        if (onLongPressRow) {
+            onLongPressRow(item);
+        }
+    };
+
+    const turnOnSelectionMode = () => {
+        turnOnMobileSelectionMode();
+        setIsModalVisible(false);
+
+        if (onTurnOnSelectionMode) {
+            onTurnOnSelectionMode(longPressedItem);
+        }
+    };
+
+    useEffect(() => turnOffMobileSelectionMode(), []);
+
+    return (
+        <>
+            <SelectionList
+                ref={ref}
+                sections={sections}
+                onLongPressRow={handleLongPressRow}
+                // eslint-disable-next-line react/jsx-props-no-spreading
+                {...rest}
+            />
+            <Modal
+                isVisible={isModalVisible}
+                type={CONST.MODAL.MODAL_TYPE.BOTTOM_DOCKED}
+                onClose={() => setIsModalVisible(false)}
+            >
+                <MenuItem
+                    title={translate('common.select')}
+                    icon={Expensicons.Checkmark}
+                    onPress={turnOnSelectionMode}
+                />
+            </Modal>
+        </>
+    );
+}
+
+export default forwardRef(SelectionListWithModal);
diff --git a/src/components/SelectionScreen.tsx b/src/components/SelectionScreen.tsx
new file mode 100644
index 000000000000..8f6ccbf64c81
--- /dev/null
+++ b/src/components/SelectionScreen.tsx
@@ -0,0 +1,177 @@
+import {isEmpty} from 'lodash';
+import React from 'react';
+import type {StyleProp, ViewStyle} from 'react-native';
+import useLocalize from '@hooks/useLocalize';
+import useThemeStyles from '@hooks/useThemeStyles';
+import * as PolicyUtils from '@libs/PolicyUtils';
+import type {AccessVariant} from '@pages/workspace/AccessOrNotFoundWrapper';
+import AccessOrNotFoundWrapper from '@pages/workspace/AccessOrNotFoundWrapper';
+import type {TranslationPaths} from '@src/languages/types';
+import type * as OnyxCommon from '@src/types/onyx/OnyxCommon';
+import type {ConnectionName, PolicyFeatureName} from '@src/types/onyx/Policy';
+import type {ReceiptErrors} from '@src/types/onyx/Transaction';
+import {isEmptyObject} from '@src/types/utils/EmptyObject';
+import ErrorMessageRow from './ErrorMessageRow';
+import HeaderWithBackButton from './HeaderWithBackButton';
+import OfflineWithFeedback from './OfflineWithFeedback';
+import ScreenWrapper from './ScreenWrapper';
+import SelectionList from './SelectionList';
+import type RadioListItem from './SelectionList/RadioListItem';
+import type TableListItem from './SelectionList/TableListItem';
+import type {ListItem, SectionListDataType} from './SelectionList/types';
+import type UserListItem from './SelectionList/UserListItem';
+
+type SelectorType<T = string> = ListItem & {
+    value: T;
+
+    onPress?: () => void;
+};
+
+type SelectionScreenProps<T = string> = {
+    /** Used to set the testID for tests */
+    displayName: string;
+
+    /** Title of the selection component */
+    title?: TranslationPaths;
+
+    /** Custom content to display in the header */
+    headerContent?: React.ReactNode;
+
+    /** Content to display if the list is empty */
+    listEmptyContent?: React.JSX.Element | null;
+
+    /** Custom content to display in the footer of list component. */
+    listFooterContent?: React.JSX.Element | null;
+
+    /** Sections for the section list */
+    sections: Array<SectionListDataType<SelectorType<T>>>;
+
+    /** Default renderer for every item in the list */
+    listItem: typeof RadioListItem | typeof UserListItem | typeof TableListItem;
+
+    /** Item `keyForList` to focus initially */
+    initiallyFocusedOptionKey?: string | null | undefined;
+
+    /** Callback to fire when a row is pressed */
+    onSelectRow: (selection: SelectorType<T>) => void;
+
+    /** Callback to fire when back button is pressed */
+    onBackButtonPress: () => void;
+
+    /** The current policyID */
+    policyID: string;
+
+    /** Defines which types of access should be verified */
+    accessVariants?: AccessVariant[];
+
+    /** The current feature name that the user tries to get access to */
+    featureName?: PolicyFeatureName;
+
+    /** Whether or not to block user from accessing the page */
+    shouldBeBlocked?: boolean;
+
+    /** Name of the current connection */
+    connectionName: ConnectionName;
+
+    /** The type of action that's pending  */
+    pendingAction?: OnyxCommon.PendingAction | null;
+
+    /** The errors to display  */
+    errors?: OnyxCommon.Errors | ReceiptErrors | null;
+
+    /** Additional style object for the error row */
+    errorRowStyles?: StyleProp<ViewStyle>;
+
+    /** A function to run when the X button next to the error is clicked */
+    onClose?: () => void;
+
+    /** Whether to single execute `onRowSelect` - this prevents bugs related to double interactions */
+    shouldSingleExecuteRowSelect?: boolean;
+
+    /** Used for dynamic header title translation with parameters */
+    headerTitleAlreadyTranslated?: string;
+
+    /** Whether to update the focused index on a row select */
+    shouldUpdateFocusedIndex?: boolean;
+};
+
+function SelectionScreen<T = string>({
+    displayName,
+    title,
+    headerContent,
+    listEmptyContent,
+    listFooterContent,
+    sections,
+    listItem,
+    initiallyFocusedOptionKey,
+    onSelectRow,
+    onBackButtonPress,
+    policyID,
+    accessVariants,
+    featureName,
+    shouldBeBlocked,
+    connectionName,
+    pendingAction,
+    errors,
+    errorRowStyles,
+    onClose,
+    shouldSingleExecuteRowSelect,
+    headerTitleAlreadyTranslated,
+    shouldUpdateFocusedIndex = false,
+}: SelectionScreenProps<T>) {
+    const {translate} = useLocalize();
+    const styles = useThemeStyles();
+
+    const policy = PolicyUtils.getPolicy(policyID);
+    const isConnectionEmpty = isEmpty(policy?.connections?.[connectionName]);
+
+    return (
+        <AccessOrNotFoundWrapper
+            policyID={policyID}
+            accessVariants={accessVariants}
+            featureName={featureName}
+            shouldBeBlocked={isConnectionEmpty || shouldBeBlocked}
+        >
+            <ScreenWrapper
+                includeSafeAreaPaddingBottom={!!errors && !isEmptyObject(errors)}
+                testID={displayName}
+            >
+                <HeaderWithBackButton
+                    title={headerTitleAlreadyTranslated ?? (title ? translate(title) : '')}
+                    onBackButtonPress={onBackButtonPress}
+                />
+                {headerContent}
+                <OfflineWithFeedback
+                    pendingAction={pendingAction}
+                    style={[styles.flex1]}
+                    contentContainerStyle={[styles.flex1]}
+                >
+                    <SelectionList
+                        onSelectRow={onSelectRow}
+                        sections={sections}
+                        ListItem={listItem}
+                        showScrollIndicator
+                        shouldShowTooltips={false}
+                        initiallyFocusedOptionKey={initiallyFocusedOptionKey}
+                        listEmptyContent={listEmptyContent}
+                        listFooterContent={listFooterContent}
+                        sectionListStyle={!!sections.length && [styles.flexGrow0]}
+                        shouldSingleExecuteRowSelect={shouldSingleExecuteRowSelect}
+                        shouldUpdateFocusedIndex={shouldUpdateFocusedIndex}
+                    >
+                        <ErrorMessageRow
+                            errors={errors}
+                            errorRowStyles={errorRowStyles}
+                            onClose={onClose}
+                        />
+                    </SelectionList>
+                </OfflineWithFeedback>
+            </ScreenWrapper>
+        </AccessOrNotFoundWrapper>
+    );
+}
+
+export type {SelectorType};
+
+SelectionScreen.displayName = 'SelectionScreen';
+export default SelectionScreen;
diff --git a/src/components/SettlementButton.tsx b/src/components/SettlementButton.tsx
index f56c4dd1a863..efe7aa91de18 100644
--- a/src/components/SettlementButton.tsx
+++ b/src/components/SettlementButton.tsx
@@ -1,14 +1,17 @@
-import React, {useEffect, useMemo} from 'react';
+import React, {useMemo} from 'react';
 import type {GestureResponderEvent, StyleProp, ViewStyle} from 'react-native';
 import type {OnyxEntry} from 'react-native-onyx';
-import {withOnyx} from 'react-native-onyx';
+import {useOnyx, withOnyx} from 'react-native-onyx';
 import useLocalize from '@hooks/useLocalize';
 import useNetwork from '@hooks/useNetwork';
+import Navigation from '@libs/Navigation/Navigation';
+import * as PolicyUtils from '@libs/PolicyUtils';
 import * as ReportUtils from '@libs/ReportUtils';
 import playSound, {SOUNDS} from '@libs/Sound';
+import * as SubscriptionUtils from '@libs/SubscriptionUtils';
 import * as BankAccounts from '@userActions/BankAccounts';
 import * as IOU from '@userActions/IOU';
-import * as PaymentMethods from '@userActions/PaymentMethods';
+import * as PolicyActions from '@userActions/Policy/Policy';
 import CONST from '@src/CONST';
 import ONYXKEYS from '@src/ONYXKEYS';
 import type {Route} from '@src/ROUTES';
@@ -17,7 +20,7 @@ import type {ButtonSizeValue} from '@src/styles/utils/types';
 import type {LastPaymentMethod, Policy, Report} from '@src/types/onyx';
 import type {PaymentMethodType} from '@src/types/onyx/OriginalMessage';
 import type AnchorAlignment from '@src/types/utils/AnchorAlignment';
-import type {EmptyObject} from '@src/types/utils/EmptyObject';
+import {isEmptyObject} from '@src/types/utils/EmptyObject';
 import ButtonWithDropdownMenu from './ButtonWithDropdownMenu';
 import type {PaymentType} from './ButtonWithDropdownMenu/types';
 import * as Expensicons from './Icon/Expensicons';
@@ -40,7 +43,13 @@ type SettlementButtonOnyxProps = {
 
 type SettlementButtonProps = SettlementButtonOnyxProps & {
     /** Callback to execute when this button is pressed. Receives a single payment type argument. */
-    onPress: (paymentType?: PaymentMethodType) => void;
+    onPress: (paymentType?: PaymentMethodType, payAsBusiness?: boolean) => void;
+
+    /** Callback when the payment options popover is shown */
+    onPaymentOptionsShow?: () => void;
+
+    /** Callback when the payment options popover is closed */
+    onPaymentOptionsHide?: () => void;
 
     /** The route to redirect if user does not have a payment method setup */
     enablePaymentsRoute: EnablePaymentsRoute;
@@ -55,7 +64,7 @@ type SettlementButtonProps = SettlementButtonOnyxProps & {
     chatReportID?: string;
 
     /** The IOU/Expense report we are paying */
-    iouReport?: OnyxEntry<Report> | EmptyObject;
+    iouReport?: OnyxEntry<Report>;
 
     /** Should we show the payment options? */
     shouldHidePaymentOptions?: boolean;
@@ -104,6 +113,9 @@ type SettlementButtonProps = SettlementButtonOnyxProps & {
 
     /** Callback to open confirmation modal if any of the transactions is on HOLD */
     confirmApproval?: () => void;
+
+    /** Whether to use keyboard shortcuts for confirmation or not */
+    useKeyboardShortcuts?: boolean;
 };
 
 function SettlementButton({
@@ -121,9 +133,9 @@ function SettlementButton({
     chatReportID = '',
     currency = CONST.CURRENCY.USD,
     enablePaymentsRoute,
-    // The "iouReport" and "nvpLastPaymentMethod" 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
-    iouReport = CONST.EMPTY_OBJECT,
+    iouReport,
+    // The "nvpLastPaymentMethod" object needs to be stable to prevent the "useMemo"
+    // hook from being recreated unnecessarily, hence the use of CONST.EMPTY_OBJECT
     nvpLastPaymentMethod = CONST.EMPTY_OBJECT,
     isDisabled = false,
     isLoading = false,
@@ -139,19 +151,23 @@ function SettlementButton({
     enterKeyEventListenerPriority = 0,
     confirmApproval,
     policy,
+    useKeyboardShortcuts = false,
+    onPaymentOptionsShow,
+    onPaymentOptionsHide,
 }: SettlementButtonProps) {
     const {translate} = useLocalize();
     const {isOffline} = useNetwork();
+    const [activePolicyID] = useOnyx(ONYXKEYS.NVP_ACTIVE_POLICY_ID);
 
-    useEffect(() => {
-        PaymentMethods.openWalletPage();
-    }, []);
+    const primaryPolicy = useMemo(() => PolicyActions.getPrimaryPolicy(activePolicyID), [activePolicyID]);
 
     const session = useSession();
-    const chatReport = ReportUtils.getReport(chatReportID);
+    // The app would crash due to subscribing to the entire report collection if chatReportID is an empty string. So we should have a fallback ID here.
+    const [chatReport] = useOnyx(`${ONYXKEYS.COLLECTION.REPORT}${chatReportID || -1}`);
+    const isInvoiceReport = (!isEmptyObject(iouReport) && ReportUtils.isInvoiceReport(iouReport)) || false;
     const isPaidGroupPolicy = ReportUtils.isPaidGroupPolicyExpenseChat(chatReport);
-    const shouldShowPaywithExpensifyOption = !isPaidGroupPolicy || (!shouldHidePaymentOptions && ReportUtils.isPayer(session, iouReport as OnyxEntry<Report>));
-    const shouldShowPayElsewhereOption = !isPaidGroupPolicy || policy?.reimbursementChoice === CONST.POLICY.REIMBURSEMENT_CHOICES.REIMBURSEMENT_MANUAL;
+    const shouldShowPaywithExpensifyOption = !isPaidGroupPolicy || (!shouldHidePaymentOptions && ReportUtils.isPayer(session, iouReport));
+    const shouldShowPayElsewhereOption = (!isPaidGroupPolicy || policy?.reimbursementChoice === CONST.POLICY.REIMBURSEMENT_CHOICES.REIMBURSEMENT_MANUAL) && !isInvoiceReport;
     const paymentButtonOptions = useMemo(() => {
         const buttonOptions = [];
         const isExpenseReport = ReportUtils.isExpenseReport(iouReport);
@@ -178,7 +194,7 @@ function SettlementButton({
             value: CONST.IOU.REPORT_ACTION_TYPE.APPROVE,
             disabled: !!shouldDisableApproveButton,
         };
-        const canUseWallet = !isExpenseReport && currency === CONST.CURRENCY.USD;
+        const canUseWallet = !isExpenseReport && !isInvoiceReport && currency === CONST.CURRENCY.USD;
 
         // Only show the Approve button if the user cannot pay the expense
         if (shouldHidePaymentOptions && shouldShowApproveButton) {
@@ -188,7 +204,7 @@ function SettlementButton({
         // To achieve the one tap pay experience we need to choose the correct payment type as default.
         // If the user has previously chosen a specific payment option or paid for some expense,
         // let's use the last payment method or use default.
-        const paymentMethod = nvpLastPaymentMethod?.[policyID] ?? '';
+        const paymentMethod = nvpLastPaymentMethod?.[policyID] ?? '-1';
         if (canUseWallet) {
             buttonOptions.push(paymentMethods[CONST.IOU.PAYMENT_TYPE.EXPENSIFY]);
         }
@@ -199,6 +215,42 @@ function SettlementButton({
             buttonOptions.push(paymentMethods[CONST.IOU.PAYMENT_TYPE.ELSEWHERE]);
         }
 
+        if (isInvoiceReport) {
+            if (ReportUtils.isIndividualInvoiceRoom(chatReport)) {
+                buttonOptions.push({
+                    text: translate('iou.settlePersonal', {formattedAmount}),
+                    icon: Expensicons.User,
+                    value: CONST.IOU.PAYMENT_TYPE.ELSEWHERE,
+                    backButtonText: translate('iou.individual'),
+                    subMenuItems: [
+                        {
+                            text: translate('iou.payElsewhere', {formattedAmount: ''}),
+                            icon: Expensicons.Cash,
+                            value: CONST.IOU.PAYMENT_TYPE.ELSEWHERE,
+                            onSelected: () => onPress(CONST.IOU.PAYMENT_TYPE.ELSEWHERE),
+                        },
+                    ],
+                });
+            }
+
+            if (PolicyUtils.isPolicyAdmin(primaryPolicy) && PolicyUtils.isPaidGroupPolicy(primaryPolicy)) {
+                buttonOptions.push({
+                    text: translate('iou.settleBusiness', {formattedAmount}),
+                    icon: Expensicons.Building,
+                    value: CONST.IOU.PAYMENT_TYPE.ELSEWHERE,
+                    backButtonText: translate('iou.business'),
+                    subMenuItems: [
+                        {
+                            text: translate('iou.payElsewhere', {formattedAmount: ''}),
+                            icon: Expensicons.Cash,
+                            value: CONST.IOU.PAYMENT_TYPE.ELSEWHERE,
+                            onSelected: () => onPress(CONST.IOU.PAYMENT_TYPE.ELSEWHERE, true),
+                        },
+                    ],
+                });
+            }
+        }
+
         if (shouldShowApproveButton) {
             buttonOptions.push(approveButtonOption);
         }
@@ -209,9 +261,15 @@ function SettlementButton({
         }
         return buttonOptions;
         // We don't want to reorder the options when the preferred payment method changes while the button is still visible
-        // eslint-disable-next-line react-hooks/exhaustive-deps
-    }, [currency, formattedAmount, iouReport, policyID, translate, shouldHidePaymentOptions, shouldShowApproveButton, shouldDisableApproveButton]);
+        // eslint-disable-next-line react-compiler/react-compiler, react-hooks/exhaustive-deps
+    }, [currency, formattedAmount, iouReport, chatReport, policyID, translate, shouldHidePaymentOptions, shouldShowApproveButton, shouldDisableApproveButton]);
+
     const selectPaymentType = (event: KYCFlowEvent, iouPaymentType: PaymentMethodType, triggerKYCFlow: TriggerKYCFlow) => {
+        if (policy && SubscriptionUtils.shouldRestrictUserBillableActions(policy.id)) {
+            Navigation.navigate(ROUTES.RESTRICTED_ACTION.getRoute(policy.id));
+            return;
+        }
+
         if (iouPaymentType === CONST.IOU.PAYMENT_TYPE.EXPENSIFY || iouPaymentType === CONST.IOU.PAYMENT_TYPE.VBBA) {
             triggerKYCFlow(event, iouPaymentType);
             BankAccounts.setPersonalBankAccountContinueKYCOnSuccess(ROUTES.ENABLE_PAYMENTS);
@@ -222,7 +280,7 @@ function SettlementButton({
             if (confirmApproval) {
                 confirmApproval();
             } else {
-                IOU.approveMoneyRequest(iouReport ?? {});
+                IOU.approveMoneyRequest(iouReport);
             }
             return;
         }
@@ -237,7 +295,7 @@ function SettlementButton({
 
     return (
         <KYCWall
-            onSuccessfulKYC={onPress}
+            onSuccessfulKYC={(paymentType) => onPress(paymentType)}
             enablePaymentsRoute={enablePaymentsRoute}
             addBankAccountRoute={addBankAccountRoute}
             addDebitCardRoute={addDebitCardRoute}
@@ -251,7 +309,13 @@ function SettlementButton({
             {(triggerKYCFlow, buttonRef) => (
                 <ButtonWithDropdownMenu<PaymentType>
                     success
+                    onOptionsMenuShow={onPaymentOptionsShow}
+                    onOptionsMenuHide={onPaymentOptionsHide}
                     buttonRef={buttonRef}
+                    shouldAlwaysShowDropdownMenu={isInvoiceReport}
+                    customText={isInvoiceReport ? translate('iou.settlePayment', {formattedAmount}) : undefined}
+                    menuHeaderText={isInvoiceReport ? translate('workspace.invoices.paymentMethods.chooseInvoiceMethod') : undefined}
+                    isSplitButton={!isInvoiceReport}
                     isDisabled={isDisabled}
                     isLoading={isLoading}
                     onPress={(event, iouPaymentType) => selectPaymentType(event, iouPaymentType, triggerKYCFlow)}
@@ -262,6 +326,7 @@ function SettlementButton({
                     buttonSize={buttonSize}
                     anchorAlignment={paymentMethodDropdownAnchorAlignment}
                     enterKeyEventListenerPriority={enterKeyEventListenerPriority}
+                    useKeyboardShortcuts={useKeyboardShortcuts}
                 />
             )}
         </KYCWall>
diff --git a/src/components/ShowContextMenuContext.ts b/src/components/ShowContextMenuContext.ts
index 3a996a8d2c64..b3050f986be1 100644
--- a/src/components/ShowContextMenuContext.ts
+++ b/src/components/ShowContextMenuContext.ts
@@ -7,21 +7,23 @@ import * as ReportUtils from '@libs/ReportUtils';
 import * as ReportActionContextMenu from '@pages/home/report/ContextMenu/ReportActionContextMenu';
 import type {ContextMenuAnchor} from '@pages/home/report/ContextMenu/ReportActionContextMenu';
 import CONST from '@src/CONST';
-import type {Report, ReportAction} from '@src/types/onyx';
+import type {Report, ReportAction, ReportNameValuePairs} from '@src/types/onyx';
 
 type ShowContextMenuContextProps = {
     anchor: ContextMenuAnchor;
     report: OnyxEntry<Report>;
+    reportNameValuePairs: OnyxEntry<ReportNameValuePairs>;
     action: OnyxEntry<ReportAction>;
-    transactionThreadReport: OnyxEntry<Report>;
+    transactionThreadReport?: OnyxEntry<Report>;
     checkIfContextMenuActive: () => void;
 };
 
 const ShowContextMenuContext = createContext<ShowContextMenuContextProps>({
     anchor: null,
-    report: null,
-    action: null,
-    transactionThreadReport: null,
+    report: undefined,
+    reportNameValuePairs: undefined,
+    action: undefined,
+    transactionThreadReport: undefined,
     checkIfContextMenuActive: () => {},
 });
 
@@ -65,3 +67,4 @@ function showContextMenuForReport(
 }
 
 export {ShowContextMenuContext, showContextMenuForReport};
+export type {ShowContextMenuContextProps};
diff --git a/src/components/SignInButtons/AppleSignIn/index.android.tsx b/src/components/SignInButtons/AppleSignIn/index.android.tsx
index cfd1c48ee8b5..a528fe7c5a10 100644
--- a/src/components/SignInButtons/AppleSignIn/index.android.tsx
+++ b/src/components/SignInButtons/AppleSignIn/index.android.tsx
@@ -5,6 +5,7 @@ import Log from '@libs/Log';
 import * as Session from '@userActions/Session';
 import CONFIG from '@src/CONFIG';
 import CONST from '@src/CONST';
+import type {AppleSignInProps} from '.';
 
 /**
  * Apple Sign In Configuration for Android.
@@ -33,20 +34,23 @@ function appleSignInRequest(): Promise<string | undefined> {
 /**
  * Apple Sign In button for Android.
  */
-function AppleSignIn() {
+function AppleSignIn({onPress = () => {}}: AppleSignInProps) {
     const handleSignIn = () => {
         appleSignInRequest()
             .then((token) => Session.beginAppleSignIn(token))
-            .catch((e) => {
-                if (e.message === appleAuthAndroid.Error.SIGNIN_CANCELLED) {
+            .catch((error: Record<string, unknown>) => {
+                if (error.message === appleAuthAndroid.Error.SIGNIN_CANCELLED) {
                     return null;
                 }
-                Log.alert('[Apple Sign In] Apple authentication failed', e);
+                Log.alert('[Apple Sign In] Apple authentication failed', error);
             });
     };
     return (
         <IconButton
-            onPress={handleSignIn}
+            onPress={() => {
+                onPress();
+                handleSignIn();
+            }}
             provider={CONST.SIGN_IN_METHOD.APPLE}
         />
     );
diff --git a/src/components/SignInButtons/AppleSignIn/index.ios.tsx b/src/components/SignInButtons/AppleSignIn/index.ios.tsx
index 3fb1179d0365..57aae97b9c48 100644
--- a/src/components/SignInButtons/AppleSignIn/index.ios.tsx
+++ b/src/components/SignInButtons/AppleSignIn/index.ios.tsx
@@ -1,9 +1,11 @@
 import appleAuth from '@invertase/react-native-apple-authentication';
+import type {AppleError} from '@invertase/react-native-apple-authentication';
 import React from 'react';
 import IconButton from '@components/SignInButtons/IconButton';
 import Log from '@libs/Log';
 import * as Session from '@userActions/Session';
 import CONST from '@src/CONST';
+import type {AppleSignInProps} from '.';
 
 /**
  * Apple Sign In method for iOS that returns identityToken.
@@ -31,20 +33,23 @@ function appleSignInRequest(): Promise<string | null | undefined> {
 /**
  * Apple Sign In button for iOS.
  */
-function AppleSignIn() {
+function AppleSignIn({onPress = () => {}}: AppleSignInProps) {
     const handleSignIn = () => {
         appleSignInRequest()
             .then((token) => Session.beginAppleSignIn(token))
-            .catch((e) => {
-                if (e.code === appleAuth.Error.CANCELED) {
+            .catch((error: {code: AppleError}) => {
+                if (error.code === appleAuth.Error.CANCELED) {
                     return null;
                 }
-                Log.alert('[Apple Sign In] Apple authentication failed', e);
+                Log.alert('[Apple Sign In] Apple authentication failed', error);
             });
     };
     return (
         <IconButton
-            onPress={handleSignIn}
+            onPress={() => {
+                onPress();
+                handleSignIn();
+            }}
             provider={CONST.SIGN_IN_METHOD.APPLE}
         />
     );
diff --git a/src/components/SignInButtons/AppleSignIn/index.tsx b/src/components/SignInButtons/AppleSignIn/index.tsx
index 9d7322878c98..7ca0261d6c72 100644
--- a/src/components/SignInButtons/AppleSignIn/index.tsx
+++ b/src/components/SignInButtons/AppleSignIn/index.tsx
@@ -24,6 +24,8 @@ type SingletonAppleSignInButtonProps = AppleSignInDivProps & {
 
 type AppleSignInProps = WithNavigationFocusProps & {
     isDesktopFlow?: boolean;
+    // eslint-disable-next-line react/no-unused-prop-types
+    onPress?: () => void;
 };
 
 /**
@@ -139,3 +141,4 @@ function AppleSignIn({isDesktopFlow = false}: AppleSignInProps) {
 
 AppleSignIn.displayName = 'AppleSignIn';
 export default withNavigationFocus(AppleSignIn);
+export type {AppleSignInProps};
diff --git a/src/components/SignInButtons/GoogleSignIn/index.native.tsx b/src/components/SignInButtons/GoogleSignIn/index.native.tsx
index 2744d8958080..4a70a10ef017 100644
--- a/src/components/SignInButtons/GoogleSignIn/index.native.tsx
+++ b/src/components/SignInButtons/GoogleSignIn/index.native.tsx
@@ -5,6 +5,8 @@ import Log from '@libs/Log';
 import * as Session from '@userActions/Session';
 import CONFIG from '@src/CONFIG';
 import CONST from '@src/CONST';
+import type {GoogleSignInProps} from '.';
+import type GoogleError from './types';
 
 /**
  * Google Sign In method for iOS and android that returns identityToken.
@@ -24,10 +26,11 @@ function googleSignInRequest() {
     GoogleSignin.signIn()
         .then((response) => response.idToken)
         .then((token) => Session.beginGoogleSignIn(token))
-        .catch((error) => {
+        .catch((error: GoogleError | undefined) => {
             // Handle unexpected error shape
-            if (error === undefined || error.code === undefined) {
-                Log.alert(`[Google Sign In] Google sign in failed: ${error}`);
+            if (error?.code === undefined) {
+                Log.alert(`[Google Sign In] Google sign in failed: ${JSON.stringify(error)}`);
+                return;
             }
             /** The logged code is useful for debugging any new errors that are not specifically handled. To decode, see:
               - The common status codes documentation: https://developers.google.com/android/reference/com/google/android/gms/common/api/CommonStatusCodes
@@ -44,10 +47,13 @@ function googleSignInRequest() {
 /**
  * Google Sign In button for iOS.
  */
-function GoogleSignIn() {
+function GoogleSignIn({onPress = () => {}}: GoogleSignInProps) {
     return (
         <IconButton
-            onPress={googleSignInRequest}
+            onPress={() => {
+                onPress();
+                googleSignInRequest();
+            }}
             provider={CONST.SIGN_IN_METHOD.GOOGLE}
         />
     );
diff --git a/src/components/SignInButtons/GoogleSignIn/index.tsx b/src/components/SignInButtons/GoogleSignIn/index.tsx
index 3cc4cdebffa6..f12d039209f5 100644
--- a/src/components/SignInButtons/GoogleSignIn/index.tsx
+++ b/src/components/SignInButtons/GoogleSignIn/index.tsx
@@ -9,6 +9,8 @@ import type Response from '@src/types/modules/google';
 
 type GoogleSignInProps = {
     isDesktopFlow?: boolean;
+    // eslint-disable-next-line react/no-unused-prop-types
+    onPress?: () => void;
 };
 
 /** Div IDs for styling the two different Google Sign-In buttons. */
@@ -90,3 +92,4 @@ function GoogleSignIn({isDesktopFlow = false}: GoogleSignInProps) {
 GoogleSignIn.displayName = 'GoogleSignIn';
 
 export default GoogleSignIn;
+export type {GoogleSignInProps};
diff --git a/src/components/SignInButtons/GoogleSignIn/types.ts b/src/components/SignInButtons/GoogleSignIn/types.ts
new file mode 100644
index 000000000000..81694ca06821
--- /dev/null
+++ b/src/components/SignInButtons/GoogleSignIn/types.ts
@@ -0,0 +1,5 @@
+type GoogleError = Error & {
+    code?: string;
+};
+
+export default GoogleError;
diff --git a/src/components/SingleChoiceQuestion.tsx b/src/components/SingleChoiceQuestion.tsx
index 3ff844dd80e9..e52007850475 100644
--- a/src/components/SingleChoiceQuestion.tsx
+++ b/src/components/SingleChoiceQuestion.tsx
@@ -3,14 +3,13 @@ import React, {forwardRef} from 'react';
 // eslint-disable-next-line no-restricted-imports
 import type {Text as RNText} from 'react-native';
 import useThemeStyles from '@hooks/useThemeStyles';
-import type {MaybePhraseKey} from '@libs/Localize';
 import type {Choice} from './RadioButtons';
 import RadioButtons from './RadioButtons';
 import Text from './Text';
 
 type SingleChoiceQuestionProps = {
     prompt: string;
-    errorText?: MaybePhraseKey;
+    errorText?: string;
     possibleAnswers: Choice[];
     currentQuestionIndex: number;
     onInputChange: (value: string) => void;
@@ -23,7 +22,7 @@ function SingleChoiceQuestion({prompt, errorText, possibleAnswers, currentQuesti
         <>
             <Text
                 ref={ref}
-                style={[styles.textStrong, styles.mb5]}
+                style={[styles.mt3]}
             >
                 {prompt}
             </Text>
diff --git a/src/components/SingleOptionSelector.tsx b/src/components/SingleOptionSelector.tsx
index 9832167e3f6a..61059b6dc5cf 100644
--- a/src/components/SingleOptionSelector.tsx
+++ b/src/components/SingleOptionSelector.tsx
@@ -1,4 +1,5 @@
 import React from 'react';
+import type {StyleProp, ViewStyle} from 'react-native';
 import {View} from 'react-native';
 import useLocalize from '@hooks/useLocalize';
 import useThemeStyles from '@hooks/useThemeStyles';
@@ -8,23 +9,29 @@ import PressableWithoutFeedback from './Pressable/PressableWithoutFeedback';
 import SelectCircle from './SelectCircle';
 import Text from './Text';
 
-type Item = {
-    key: string;
+type Item<TKey extends string> = {
+    key: TKey;
     label: TranslationPaths;
 };
 
-type SingleOptionSelectorProps = {
+type SingleOptionSelectorProps<TKey extends string> = {
     /** Array of options for the selector, key is a unique identifier, label is a localize key that will be translated and displayed */
-    options?: Item[];
+    options?: Array<Item<TKey>>;
 
     /** Key of the option that is currently selected */
-    selectedOptionKey?: string;
+    selectedOptionKey?: TKey;
 
     /** Function to be called when an option is selected */
-    onSelectOption?: (item: Item) => void;
+    onSelectOption?: (item: Item<TKey>) => void;
+
+    /** Styles for the option row element */
+    optionRowStyles?: StyleProp<ViewStyle>;
+
+    /** Styles for the select circle */
+    selectCircleStyles?: StyleProp<ViewStyle>;
 };
 
-function SingleOptionSelector({options = [], selectedOptionKey, onSelectOption = () => {}}: SingleOptionSelectorProps) {
+function SingleOptionSelector<TKey extends string>({options = [], selectedOptionKey, onSelectOption = () => {}, optionRowStyles, selectCircleStyles}: SingleOptionSelectorProps<TKey>) {
     const styles = useThemeStyles();
     const {translate} = useLocalize();
     return (
@@ -35,7 +42,7 @@ function SingleOptionSelector({options = [], selectedOptionKey, onSelectOption =
                     key={option.key}
                 >
                     <PressableWithoutFeedback
-                        style={styles.singleOptionSelectorRow}
+                        style={[styles.singleOptionSelectorRow, optionRowStyles]}
                         onPress={() => onSelectOption(option)}
                         role={CONST.ROLE.BUTTON}
                         accessibilityState={{checked: selectedOptionKey === option.key}}
@@ -44,7 +51,7 @@ function SingleOptionSelector({options = [], selectedOptionKey, onSelectOption =
                     >
                         <SelectCircle
                             isChecked={selectedOptionKey ? selectedOptionKey === option.key : false}
-                            selectCircleStyles={[styles.ml0, styles.singleOptionSelectorCircle]}
+                            selectCircleStyles={[styles.ml0, styles.singleOptionSelectorCircle, selectCircleStyles]}
                         />
                         <Text>{translate(option.label)}</Text>
                     </PressableWithoutFeedback>
diff --git a/src/components/Skeletons/CardRowSkeleton.tsx b/src/components/Skeletons/CardRowSkeleton.tsx
new file mode 100644
index 000000000000..38cbf5d15823
--- /dev/null
+++ b/src/components/Skeletons/CardRowSkeleton.tsx
@@ -0,0 +1,81 @@
+import React from 'react';
+import {Circle, Rect} from 'react-native-svg';
+import useThemeStyles from '@hooks/useThemeStyles';
+import useWindowDimensions from '@hooks/useWindowDimensions';
+import variables from '@styles/variables';
+import ItemListSkeletonView from './ItemListSkeletonView';
+
+type CardRowSkeletonProps = {
+    shouldAnimate?: boolean;
+    fixedNumItems?: number;
+    gradientOpacityEnabled?: boolean;
+};
+
+const barHeight = 7;
+const longBarWidth = 120;
+const shortBarWidth = 60;
+const leftPaneWidth = variables.sideBarWidth;
+const gapWidth = 12;
+const rightSideElementWidth = 50;
+const centralPanePadding = 50;
+const rightButtonWidth = 20;
+
+function CardRowSkeleton({shouldAnimate = true, fixedNumItems, gradientOpacityEnabled = false}: CardRowSkeletonProps) {
+    const styles = useThemeStyles();
+    const {windowWidth, isSmallScreenWidth} = useWindowDimensions();
+
+    return (
+        <ItemListSkeletonView
+            shouldAnimate={shouldAnimate}
+            fixedNumItems={fixedNumItems}
+            gradientOpacityEnabled={gradientOpacityEnabled}
+            itemViewStyle={[styles.highlightBG, styles.mb3, styles.br3, styles.mh5]}
+            renderSkeletonItem={() => (
+                <>
+                    <Circle
+                        cx={36}
+                        cy={32}
+                        r={20}
+                    />
+                    <Rect
+                        x={66}
+                        y={22}
+                        width={longBarWidth}
+                        height={barHeight}
+                    />
+
+                    <Rect
+                        x={66}
+                        y={36}
+                        width={shortBarWidth}
+                        height={barHeight}
+                    />
+
+                    {!isSmallScreenWidth && (
+                        <>
+                            <Rect
+                                // We have to calculate this value to make sure the element is aligned to the button on the right side.
+                                x={windowWidth - leftPaneWidth - rightButtonWidth - gapWidth - centralPanePadding - gapWidth - rightSideElementWidth}
+                                y={28}
+                                width={20}
+                                height={barHeight}
+                            />
+
+                            <Rect
+                                // We have to calculate this value to make sure the element is aligned to the right border.
+                                x={windowWidth - leftPaneWidth - rightSideElementWidth - gapWidth - centralPanePadding}
+                                y={28}
+                                width={50}
+                                height={barHeight}
+                            />
+                        </>
+                    )}
+                </>
+            )}
+        />
+    );
+}
+
+CardRowSkeleton.displayName = 'CardRowSkeleton';
+
+export default CardRowSkeleton;
diff --git a/src/components/Skeletons/ItemListSkeletonView.tsx b/src/components/Skeletons/ItemListSkeletonView.tsx
index 00854471f2e3..046cdfffbee5 100644
--- a/src/components/Skeletons/ItemListSkeletonView.tsx
+++ b/src/components/Skeletons/ItemListSkeletonView.tsx
@@ -1,5 +1,6 @@
-import React, {useMemo, useState} from 'react';
-import {View} from 'react-native';
+import React, {useCallback, useMemo, useState} from 'react';
+import type {LayoutChangeEvent, StyleProp, ViewStyle} from 'react-native';
+import {StyleSheet, View} from 'react-native';
 import SkeletonViewContentLoader from '@components/SkeletonViewContentLoader';
 import useTheme from '@hooks/useTheme';
 import useThemeStyles from '@hooks/useThemeStyles';
@@ -8,44 +9,84 @@ import CONST from '@src/CONST';
 type ListItemSkeletonProps = {
     shouldAnimate?: boolean;
     renderSkeletonItem: (args: {itemIndex: number}) => React.ReactNode;
+    fixedNumItems?: number;
+    gradientOpacityEnabled?: boolean;
+    itemViewStyle?: StyleProp<ViewStyle>;
+    itemViewHeight?: number;
 };
 
-function ItemListSkeletonView({shouldAnimate = true, renderSkeletonItem}: ListItemSkeletonProps) {
+const getVerticalMargin = (style: StyleProp<ViewStyle>): number => {
+    if (!style) {
+        return 0;
+    }
+
+    const flattenStyle = StyleSheet.flatten(style);
+    const marginVertical = Number(flattenStyle?.marginVertical ?? 0);
+    const marginTop = Number(flattenStyle?.marginTop ?? 0);
+    const marginBottom = Number(flattenStyle?.marginBottom ?? 0);
+
+    return marginVertical + marginTop + marginBottom;
+};
+
+function ItemListSkeletonView({
+    shouldAnimate = true,
+    renderSkeletonItem,
+    fixedNumItems,
+    gradientOpacityEnabled = false,
+    itemViewStyle = {},
+    itemViewHeight = CONST.LHN_SKELETON_VIEW_ITEM_HEIGHT,
+}: ListItemSkeletonProps) {
     const theme = useTheme();
     const themeStyles = useThemeStyles();
 
-    const [numItems, setNumItems] = useState(0);
+    const [numItems, setNumItems] = useState(fixedNumItems ?? 0);
+
+    const totalItemHeight = itemViewHeight + getVerticalMargin(itemViewStyle);
+
+    const handleLayout = useCallback(
+        (event: LayoutChangeEvent) => {
+            if (fixedNumItems) {
+                return;
+            }
+
+            const totalHeight = event.nativeEvent.layout.height;
+            const newNumItems = Math.ceil(totalHeight / totalItemHeight);
+            if (newNumItems !== numItems) {
+                setNumItems(newNumItems);
+            }
+        },
+        [fixedNumItems, numItems, totalItemHeight],
+    );
+
     const skeletonViewItems = useMemo(() => {
         const items = [];
         for (let i = 0; i < numItems; i++) {
+            const opacity = gradientOpacityEnabled ? 1 - i / (numItems - 1) : 1;
             items.push(
-                <SkeletonViewContentLoader
-                    key={`skeletonViewItems${i}`}
-                    animate={shouldAnimate}
-                    height={CONST.LHN_SKELETON_VIEW_ITEM_HEIGHT}
-                    backgroundColor={theme.skeletonLHNIn}
-                    foregroundColor={theme.skeletonLHNOut}
-                    style={themeStyles.mr5}
+                <View
+                    key={`skeletonContainer${i}`}
+                    style={[themeStyles.mr5, itemViewStyle, {opacity}]}
                 >
-                    {renderSkeletonItem({itemIndex: i})}
-                </SkeletonViewContentLoader>,
+                    <SkeletonViewContentLoader
+                        animate={shouldAnimate}
+                        height={itemViewHeight}
+                        backgroundColor={theme.skeletonLHNIn}
+                        foregroundColor={theme.skeletonLHNOut}
+                    >
+                        {renderSkeletonItem({itemIndex: i})}
+                    </SkeletonViewContentLoader>
+                </View>,
             );
         }
         return items;
-    }, [numItems, shouldAnimate, theme, themeStyles, renderSkeletonItem]);
+    }, [numItems, shouldAnimate, theme, themeStyles, renderSkeletonItem, gradientOpacityEnabled, itemViewHeight, itemViewStyle]);
 
     return (
         <View
             style={[themeStyles.flex1, themeStyles.overflowHidden]}
-            onLayout={(event) => {
-                const newNumItems = Math.ceil(event.nativeEvent.layout.height / CONST.LHN_SKELETON_VIEW_ITEM_HEIGHT);
-                if (newNumItems === numItems) {
-                    return;
-                }
-                setNumItems(newNumItems);
-            }}
+            onLayout={handleLayout}
         >
-            <View>{skeletonViewItems}</View>
+            {skeletonViewItems}
         </View>
     );
 }
diff --git a/src/components/Skeletons/SearchRowSkeleton.tsx b/src/components/Skeletons/SearchRowSkeleton.tsx
new file mode 100644
index 000000000000..8a7df5140e9e
--- /dev/null
+++ b/src/components/Skeletons/SearchRowSkeleton.tsx
@@ -0,0 +1,186 @@
+import React from 'react';
+import {Circle, Rect} from 'react-native-svg';
+import useThemeStyles from '@hooks/useThemeStyles';
+import useWindowDimensions from '@hooks/useWindowDimensions';
+import variables from '@styles/variables';
+import CONST from '@src/CONST';
+import ItemListSkeletonView from './ItemListSkeletonView';
+
+type SearchRowSkeletonProps = {
+    shouldAnimate?: boolean;
+    fixedNumItems?: number;
+    gradientOpacityEnabled?: boolean;
+};
+
+const barHeight = 8;
+const longBarWidth = 120;
+const leftPaneWidth = variables.sideBarWidth;
+
+// 12 is the gap between the element and the right button
+const gapWidth = 12;
+
+// 80 is the width of the element itself
+const rightSideElementWidth = 80;
+
+// 24 is the padding of the central pane summing two sides
+const centralPanePadding = 40;
+
+// 80 is the width of the button on the right side
+const rightButtonWidth = 80;
+
+function SearchRowSkeleton({shouldAnimate = true, fixedNumItems, gradientOpacityEnabled = false}: SearchRowSkeletonProps) {
+    const styles = useThemeStyles();
+    const {windowWidth, isSmallScreenWidth, isLargeScreenWidth} = useWindowDimensions();
+    if (isSmallScreenWidth) {
+        return (
+            <ItemListSkeletonView
+                itemViewHeight={CONST.SEARCH_SKELETON_VIEW_ITEM_HEIGHT}
+                itemViewStyle={[styles.highlightBG, styles.mb3, styles.br3, styles.mh5]}
+                gradientOpacityEnabled={gradientOpacityEnabled}
+                shouldAnimate={shouldAnimate}
+                fixedNumItems={fixedNumItems}
+                renderSkeletonItem={() => (
+                    <>
+                        <Circle
+                            cx={24}
+                            cy={26}
+                            r={8}
+                        />
+
+                        <Rect
+                            x={40}
+                            y={24}
+                            width={40}
+                            height={4}
+                        />
+                        <Circle
+                            cx={96}
+                            cy={26}
+                            r={8}
+                        />
+
+                        <Rect
+                            x={112}
+                            y={24}
+                            width={40}
+                            height={4}
+                        />
+                        <Rect
+                            x={windowWidth - 130}
+                            y={12}
+                            width={80}
+                            height={28}
+                            rx={14}
+                            ry={14}
+                        />
+
+                        <Rect
+                            x={16}
+                            y={56}
+                            width={36}
+                            height={40}
+                            rx={4}
+                            ry={4}
+                        />
+                        <Rect
+                            x={64}
+                            y={65}
+                            width={124}
+                            height={8}
+                        />
+                        <Rect
+                            x={64}
+                            y={79}
+                            width={60}
+                            height={8}
+                        />
+                        <Rect
+                            x={windowWidth - 130}
+                            y={65}
+                            width={80}
+                            height={8}
+                        />
+                        <Rect
+                            x={windowWidth - 110}
+                            y={79}
+                            width={60}
+                            height={8}
+                        />
+                    </>
+                )}
+            />
+        );
+    }
+
+    return (
+        <ItemListSkeletonView
+            shouldAnimate={shouldAnimate}
+            fixedNumItems={fixedNumItems}
+            gradientOpacityEnabled={gradientOpacityEnabled}
+            itemViewStyle={[styles.highlightBG, styles.mb3, styles.br3, styles.mh5]}
+            renderSkeletonItem={() => (
+                <>
+                    <Rect
+                        x={12}
+                        y={12}
+                        rx={5}
+                        ry={5}
+                        width={36}
+                        height={40}
+                    />
+                    <Rect
+                        x={60}
+                        y={28}
+                        width={30}
+                        height={barHeight}
+                    />
+                    <Rect
+                        x={102}
+                        y={28}
+                        width={longBarWidth}
+                        height={barHeight}
+                    />
+                    {isLargeScreenWidth && (
+                        <>
+                            <Rect
+                                x={234}
+                                y={28}
+                                width={longBarWidth}
+                                height={barHeight}
+                            />
+
+                            <Rect
+                                x={366}
+                                y={28}
+                                width={60}
+                                height={barHeight}
+                            />
+                        </>
+                    )}
+
+                    <Rect
+                        // We have to calculate this value to make sure the element is aligned to the button on the right side.
+                        x={windowWidth - leftPaneWidth - rightButtonWidth - gapWidth - centralPanePadding - gapWidth - rightSideElementWidth}
+                        y={28}
+                        width={80}
+                        height={barHeight}
+                    />
+
+                    <Rect
+                        // We have to calculate this value to make sure the element is aligned to the right border.
+                        x={windowWidth - leftPaneWidth - rightSideElementWidth - gapWidth - centralPanePadding}
+                        y={18}
+                        rx={15}
+                        ry={15}
+                        width={80}
+                        height={28}
+                    />
+                </>
+            )}
+        />
+    );
+}
+
+SearchRowSkeleton.displayName = 'SearchRowSkeleton';
+
+export default SearchRowSkeleton;
diff --git a/src/components/Skeletons/TableListItemSkeleton.tsx b/src/components/Skeletons/TableListItemSkeleton.tsx
deleted file mode 100644
index d24268521100..000000000000
--- a/src/components/Skeletons/TableListItemSkeleton.tsx
+++ /dev/null
@@ -1,65 +0,0 @@
-import React from 'react';
-import {Rect} from 'react-native-svg';
-import ItemListSkeletonView from './ItemListSkeletonView';
-
-type TableListItemSkeletonProps = {
-    shouldAnimate?: boolean;
-};
-
-const barHeight = '10';
-const shortBarWidth = '40';
-const longBarWidth = '120';
-
-function TableListItemSkeleton({shouldAnimate = true}: TableListItemSkeletonProps) {
-    return (
-        <ItemListSkeletonView
-            shouldAnimate={shouldAnimate}
-            renderSkeletonItem={() => (
-                <>
-                    <Rect
-                        x="20"
-                        y="10"
-                        rx="5"
-                        ry="5"
-                        width="40"
-                        height="40"
-                    />
-                    <Rect
-                        x="80"
-                        y="25"
-                        width={shortBarWidth}
-                        height={barHeight}
-                    />
-                    <Rect
-                        x="150"
-                        y="25"
-                        width={longBarWidth}
-                        height={barHeight}
-                    />
-                    <Rect
-                        x="320"
-                        y="25"
-                        width={longBarWidth}
-                        height={barHeight}
-                    />
-                    <Rect
-                        x="480"
-                        y="25"
-                        width={longBarWidth}
-                        height={barHeight}
-                    />
-                    <Rect
-                        x="660"
-                        y="25"
-                        width="100%"
-                        height={barHeight}
-                    />
-                </>
-            )}
-        />
-    );
-}
-
-TableListItemSkeleton.displayName = 'TableListItemSkeleton';
-
-export default TableListItemSkeleton;
diff --git a/src/components/Skeletons/TableRowSkeleton.tsx b/src/components/Skeletons/TableRowSkeleton.tsx
new file mode 100644
index 000000000000..a62d66bfc02b
--- /dev/null
+++ b/src/components/Skeletons/TableRowSkeleton.tsx
@@ -0,0 +1,52 @@
+import React from 'react';
+import {Circle, Rect} from 'react-native-svg';
+import useThemeStyles from '@hooks/useThemeStyles';
+import ItemListSkeletonView from './ItemListSkeletonView';
+
+type TableListItemSkeletonProps = {
+    shouldAnimate?: boolean;
+    fixedNumItems?: number;
+    gradientOpacityEnabled?: boolean;
+};
+
+const barHeight = '8';
+const shortBarWidth = '60';
+const longBarWidth = '124';
+
+function TableListItemSkeleton({shouldAnimate = true, fixedNumItems, gradientOpacityEnabled = false}: TableListItemSkeletonProps) {
+    const styles = useThemeStyles();
+
+    return (
+        <ItemListSkeletonView
+            shouldAnimate={shouldAnimate}
+            fixedNumItems={fixedNumItems}
+            gradientOpacityEnabled={gradientOpacityEnabled}
+            itemViewStyle={[styles.highlightBG, styles.mb3, styles.br3, styles.mh5]}
+            renderSkeletonItem={() => (
+                <>
+                    <Circle
+                        cx="40"
+                        cy="32"
+                        r="20"
+                    />
+                    <Rect
+                        x="80"
+                        y="20"
+                        width={longBarWidth}
+                        height={barHeight}
+                    />
+                    <Rect
+                        x="80"
+                        y="36"
+                        width={shortBarWidth}
+                        height={barHeight}
+                    />
+                </>
+            )}
+        />
+    );
+}
+
+TableListItemSkeleton.displayName = 'TableListItemSkeleton';
+
+export default TableListItemSkeleton;
diff --git a/src/components/SpacerView.tsx b/src/components/SpacerView.tsx
index 23c109f7d589..bb762da1226b 100644
--- a/src/components/SpacerView.tsx
+++ b/src/components/SpacerView.tsx
@@ -35,10 +35,11 @@ function SpacerView({shouldShow, style}: SpacerViewProps) {
             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,
         };
+        // eslint-disable-next-line react-compiler/react-compiler
         marginVertical.value = values.marginVertical;
         borderBottomWidth.value = values.borderBottomWidth;
 
-        // eslint-disable-next-line react-hooks/exhaustive-deps -- we only need to trigger when shouldShow prop is changed
+        // eslint-disable-next-line react-compiler/react-compiler, react-hooks/exhaustive-deps -- we only need to trigger when shouldShow prop is changed
     }, [shouldShow, prevShouldShow]);
 
     return <Animated.View style={[animatedStyles, style]} />;
diff --git a/src/components/SplashScreenHider/index.native.tsx b/src/components/SplashScreenHider/index.native.tsx
index e31f391f7376..7c579519c926 100644
--- a/src/components/SplashScreenHider/index.native.tsx
+++ b/src/components/SplashScreenHider/index.native.tsx
@@ -34,6 +34,7 @@ function SplashScreenHider({onHide = () => {}}: SplashScreenHiderProps): SplashS
         hideHasBeenCalled.current = true;
 
         BootSplash.hide().then(() => {
+            // eslint-disable-next-line react-compiler/react-compiler
             scale.value = withTiming(0, {
                 duration: 200,
                 easing: Easing.back(2),
diff --git a/src/components/StateSelector.tsx b/src/components/StateSelector.tsx
index 18e6f45ed9e5..e2be9281d0bb 100644
--- a/src/components/StateSelector.tsx
+++ b/src/components/StateSelector.tsx
@@ -1,15 +1,14 @@
 import {useIsFocused} from '@react-navigation/native';
-import {CONST as COMMON_CONST} from 'expensify-common/lib/CONST';
+import {CONST as COMMON_CONST} from 'expensify-common';
 import React, {useEffect, useRef} from 'react';
 import type {ForwardedRef} from 'react';
-import {View} from 'react-native';
-import useGeographicalStateFromRoute from '@hooks/useGeographicalStateFromRoute';
+import type {View} from 'react-native';
+import useGeographicalStateAndCountryFromRoute from '@hooks/useGeographicalStateAndCountryFromRoute';
 import useLocalize from '@hooks/useLocalize';
 import useThemeStyles from '@hooks/useThemeStyles';
-import type {MaybePhraseKey} from '@libs/Localize';
 import Navigation from '@libs/Navigation/Navigation';
+import CONST from '@src/CONST';
 import ROUTES from '@src/ROUTES';
-import FormHelpMessage from './FormHelpMessage';
 import type {MenuItemProps} from './MenuItem';
 import MenuItemWithTopDescription from './MenuItemWithTopDescription';
 
@@ -17,7 +16,7 @@ type State = keyof typeof COMMON_CONST.STATES;
 
 type StateSelectorProps = {
     /** Form error text. e.g when no state is selected */
-    errorText?: MaybePhraseKey;
+    errorText?: string;
 
     /** Current selected state  */
     value?: State | '';
@@ -44,7 +43,7 @@ function StateSelector(
 ) {
     const styles = useThemeStyles();
     const {translate} = useLocalize();
-    const stateFromUrl = useGeographicalStateFromRoute();
+    const {state: stateFromUrl} = useGeographicalStateAndCountryFromRoute();
 
     const didOpenStateSelector = useRef(false);
     const isFocused = useIsFocused();
@@ -72,33 +71,30 @@ function StateSelector(
         // This helps prevent issues where the component might not update correctly if the state is controlled by both the parent and the URL.
         Navigation.setParams({state: undefined});
 
-        // eslint-disable-next-line react-hooks/exhaustive-deps
+        // eslint-disable-next-line react-compiler/react-compiler, react-hooks/exhaustive-deps
     }, [stateFromUrl, onBlur, isFocused]);
 
     const title = stateCode && Object.keys(COMMON_CONST.STATES).includes(stateCode) ? translate(`allStates.${stateCode}.stateName`) : '';
     const descStyle = title.length === 0 ? styles.textNormal : null;
 
     return (
-        <View>
-            <MenuItemWithTopDescription
-                descriptionTextStyle={descStyle}
-                ref={ref}
-                shouldShowRightIcon
-                title={title}
-                // Label can be an empty string
-                // eslint-disable-next-line @typescript-eslint/prefer-nullish-coalescing
-                description={label || translate('common.state')}
-                onPress={() => {
-                    const activeRoute = Navigation.getActiveRoute();
-                    didOpenStateSelector.current = true;
-                    Navigation.navigate(stateSelectorRoute.getRoute(stateCode, activeRoute, label));
-                }}
-                wrapperStyle={wrapperStyle}
-            />
-            <View style={styles.ml5}>
-                <FormHelpMessage message={errorText} />
-            </View>
-        </View>
+        <MenuItemWithTopDescription
+            descriptionTextStyle={descStyle}
+            ref={ref}
+            shouldShowRightIcon
+            title={title}
+            // Label can be an empty string
+            // eslint-disable-next-line @typescript-eslint/prefer-nullish-coalescing
+            description={label || translate('common.state')}
+            brickRoadIndicator={errorText ? CONST.BRICK_ROAD_INDICATOR_STATUS.ERROR : undefined}
+            errorText={errorText}
+            onPress={() => {
+                const activeRoute = Navigation.getActiveRoute();
+                didOpenStateSelector.current = true;
+                Navigation.navigate(stateSelectorRoute.getRoute(stateCode, activeRoute, label));
+            }}
+            wrapperStyle={wrapperStyle}
+        />
     );
 }
 
diff --git a/src/components/SubscriptAvatar.tsx b/src/components/SubscriptAvatar.tsx
index cc36657826f6..789b4b4957c3 100644
--- a/src/components/SubscriptAvatar.tsx
+++ b/src/components/SubscriptAvatar.tsx
@@ -27,8 +27,8 @@ type SubIcon = {
 };
 
 type SubscriptAvatarProps = {
-    /** Avatar URL or icon */
-    mainAvatar?: IconType;
+    /** Avatar icon */
+    mainAvatar: IconType;
 
     /** Subscript avatar URL or icon */
     secondaryAvatar?: IconType;
@@ -82,7 +82,7 @@ function SubscriptAvatar({
                         source={mainAvatar?.source}
                         size={size}
                         name={mainAvatar?.name}
-                        accountID={mainAvatar?.id}
+                        avatarID={mainAvatar?.id}
                         type={mainAvatar?.type}
                         fallbackIcon={mainAvatar?.fallbackIcon}
                     />
@@ -109,7 +109,7 @@ function SubscriptAvatar({
                             size={isSmall ? CONST.AVATAR_SIZE.SMALL_SUBSCRIPT : CONST.AVATAR_SIZE.SUBSCRIPT}
                             fill={secondaryAvatar.fill}
                             name={secondaryAvatar.name}
-                            accountID={secondaryAvatar.id}
+                            avatarID={secondaryAvatar.id}
                             type={secondaryAvatar.type}
                             fallbackIcon={secondaryAvatar.fallbackIcon}
                         />
diff --git a/src/components/Switch.tsx b/src/components/Switch.tsx
index e6ab9a9f1c1c..1ddc65bbd0fc 100644
--- a/src/components/Switch.tsx
+++ b/src/components/Switch.tsx
@@ -20,6 +20,12 @@ type SwitchProps = {
 
     /** Whether the switch is disabled */
     disabled?: boolean;
+
+    /** Whether to show the lock icon even if the switch is enabled */
+    showLockIcon?: boolean;
+
+    /** Callback to fire when the switch is toggled in disabled state */
+    disabledAction?: () => void;
 };
 
 const OFFSET_X = {
@@ -27,13 +33,17 @@ const OFFSET_X = {
     ON: 20,
 };
 
-function Switch({isOn, onToggle, accessibilityLabel, disabled}: SwitchProps) {
+function Switch({isOn, onToggle, accessibilityLabel, disabled, showLockIcon, disabledAction}: SwitchProps) {
     const styles = useThemeStyles();
     const offsetX = useRef(new Animated.Value(isOn ? OFFSET_X.ON : OFFSET_X.OFF));
     const theme = useTheme();
 
     const handleSwitchPress = () => {
         InteractionManager.runAfterInteractions(() => {
+            if (disabled) {
+                disabledAction?.();
+                return;
+            }
             onToggle(!isOn);
         });
     };
@@ -48,7 +58,7 @@ function Switch({isOn, onToggle, accessibilityLabel, disabled}: SwitchProps) {
 
     return (
         <PressableWithFeedback
-            disabled={disabled}
+            disabled={!disabledAction && disabled}
             style={[styles.switchTrack, !isOn && styles.switchInactive]}
             onPress={handleSwitchPress}
             onLongPress={handleSwitchPress}
@@ -60,7 +70,7 @@ function Switch({isOn, onToggle, accessibilityLabel, disabled}: SwitchProps) {
             pressDimmingValue={0.8}
         >
             <Animated.View style={[styles.switchThumb, styles.switchThumbTransformation(offsetX.current)]}>
-                {disabled && (
+                {(!!disabled || !!showLockIcon) && (
                     <Icon
                         src={Expensicons.Lock}
                         fill={isOn ? theme.text : theme.icon}
diff --git a/src/components/TabSelector/TabSelector.tsx b/src/components/TabSelector/TabSelector.tsx
index 9fe1665f6b19..7fca66b5f8c7 100644
--- a/src/components/TabSelector/TabSelector.tsx
+++ b/src/components/TabSelector/TabSelector.tsx
@@ -2,6 +2,7 @@ import type {MaterialTopTabBarProps} from '@react-navigation/material-top-tabs/l
 import React, {useCallback, useEffect, useMemo, useState} from 'react';
 import type {Animated} from 'react-native';
 import {View} from 'react-native';
+import FocusTrapContainerElement from '@components/FocusTrap/FocusTrapContainerElement';
 import * as Expensicons from '@components/Icon/Expensicons';
 import type {LocaleContextProps} from '@components/LocaleContextProvider';
 import useLocalize from '@hooks/useLocalize';
@@ -14,6 +15,9 @@ import TabSelectorItem from './TabSelectorItem';
 type TabSelectorProps = MaterialTopTabBarProps & {
     /* Callback fired when tab is pressed */
     onTabPress?: (name: string) => void;
+
+    /** Callback to register focus trap container element */
+    onFocusTrapContainerElementChanged?: (element: HTMLElement | null) => void;
 };
 
 type IconAndTitle = {
@@ -53,7 +57,7 @@ function getOpacity(position: Animated.AnimatedInterpolation<number>, routesLeng
     return activeValue;
 }
 
-function TabSelector({state, navigation, onTabPress = () => {}, position}: TabSelectorProps) {
+function TabSelector({state, navigation, onTabPress = () => {}, position, onFocusTrapContainerElementChanged}: TabSelectorProps) {
     const {translate} = useLocalize();
     const theme = useTheme();
     const styles = useThemeStyles();
@@ -68,7 +72,7 @@ function TabSelector({state, navigation, onTabPress = () => {}, position}: TabSe
                 return position.interpolate({
                     inputRange,
                     outputRange: inputRange.map((i) => (affectedTabs.includes(tabIndex) && i === tabIndex ? theme.border : theme.appBG)),
-                });
+                }) as unknown as Animated.AnimatedInterpolation<string>;
             }
             return theme.border;
         },
@@ -83,49 +87,51 @@ function TabSelector({state, navigation, onTabPress = () => {}, position}: TabSe
     }, [defaultAffectedAnimatedTabs, state.index]);
 
     return (
-        <View style={styles.tabSelector}>
-            {state.routes.map((route, index) => {
-                const activeOpacity = getOpacity(position, state.routes.length, index, true, affectedAnimatedTabs);
-                const inactiveOpacity = getOpacity(position, state.routes.length, index, false, affectedAnimatedTabs);
-                const backgroundColor = getBackgroundColor(state.routes.length, index, affectedAnimatedTabs);
-                const isActive = index === state.index;
-                const {icon, title} = getIconAndTitle(route.name, translate);
-
-                const onPress = () => {
-                    if (isActive) {
-                        return;
-                    }
-
-                    setAffectedAnimatedTabs([state.index, index]);
-
-                    const event = navigation.emit({
-                        type: 'tabPress',
-                        target: route.key,
-                        canPreventDefault: true,
-                    });
-
-                    if (!event.defaultPrevented) {
-                        // The `merge: true` option makes sure that the params inside the tab screen are preserved
-                        navigation.navigate({key: route.key, merge: true});
-                    }
-
-                    onTabPress(route.name);
-                };
-
-                return (
-                    <TabSelectorItem
-                        key={route.name}
-                        icon={icon}
-                        title={title}
-                        onPress={onPress}
-                        activeOpacity={activeOpacity}
-                        inactiveOpacity={inactiveOpacity}
-                        backgroundColor={backgroundColor}
-                        isActive={isActive}
-                    />
-                );
-            })}
-        </View>
+        <FocusTrapContainerElement onContainerElementChanged={onFocusTrapContainerElementChanged}>
+            <View style={styles.tabSelector}>
+                {state.routes.map((route, index) => {
+                    const activeOpacity = getOpacity(position, state.routes.length, index, true, affectedAnimatedTabs);
+                    const inactiveOpacity = getOpacity(position, state.routes.length, index, false, affectedAnimatedTabs);
+                    const backgroundColor = getBackgroundColor(state.routes.length, index, affectedAnimatedTabs);
+                    const isActive = index === state.index;
+                    const {icon, title} = getIconAndTitle(route.name, translate);
+
+                    const onPress = () => {
+                        if (isActive) {
+                            return;
+                        }
+
+                        setAffectedAnimatedTabs([state.index, index]);
+
+                        const event = navigation.emit({
+                            type: 'tabPress',
+                            target: route.key,
+                            canPreventDefault: true,
+                        });
+
+                        if (!event.defaultPrevented) {
+                            // The `merge: true` option makes sure that the params inside the tab screen are preserved
+                            navigation.navigate({key: route.key, merge: true});
+                        }
+
+                        onTabPress(route.name);
+                    };
+
+                    return (
+                        <TabSelectorItem
+                            key={route.name}
+                            icon={icon}
+                            title={title}
+                            onPress={onPress}
+                            activeOpacity={activeOpacity}
+                            inactiveOpacity={inactiveOpacity}
+                            backgroundColor={backgroundColor}
+                            isActive={isActive}
+                        />
+                    );
+                })}
+            </View>
+        </FocusTrapContainerElement>
     );
 }
 
diff --git a/src/components/TabSelector/TabSelectorItem.tsx b/src/components/TabSelector/TabSelectorItem.tsx
index d5507c8c83db..4117046d86ef 100644
--- a/src/components/TabSelector/TabSelectorItem.tsx
+++ b/src/components/TabSelector/TabSelectorItem.tsx
@@ -1,11 +1,14 @@
-import React from 'react';
-import {Animated, StyleSheet} from 'react-native';
+import React, {useState} from 'react';
+import {Animated} from 'react-native';
 import PressableWithFeedback from '@components/Pressable/PressableWithFeedback';
 import useThemeStyles from '@hooks/useThemeStyles';
+import CONST from '@src/CONST';
 import type IconAsset from '@src/types/utils/IconAsset';
 import TabIcon from './TabIcon';
 import TabLabel from './TabLabel';
 
+const AnimatedPressableWithFeedback = Animated.createAnimatedComponent(PressableWithFeedback);
+
 type TabSelectorItemProps = {
     /** Function to call when onPress */
     onPress?: () => void;
@@ -31,28 +34,29 @@ type TabSelectorItemProps = {
 
 function TabSelectorItem({icon, title = '', onPress = () => {}, backgroundColor = '', activeOpacity = 0, inactiveOpacity = 1, isActive = false}: TabSelectorItemProps) {
     const styles = useThemeStyles();
+    const [isHovered, setIsHovered] = useState(false);
+
     return (
-        <PressableWithFeedback
+        <AnimatedPressableWithFeedback
             accessibilityLabel={title}
-            style={[styles.tabSelectorButton]}
+            style={[styles.tabSelectorButton, styles.tabBackground(isHovered, isActive, backgroundColor)]}
             wrapperStyle={[styles.flex1]}
             onPress={onPress}
+            onHoverIn={() => setIsHovered(true)}
+            onHoverOut={() => setIsHovered(false)}
+            role={CONST.ROLE.BUTTON}
         >
-            {({hovered}) => (
-                <Animated.View style={[styles.tabSelectorButton, StyleSheet.absoluteFill, styles.tabBackground(hovered, isActive, backgroundColor)]}>
-                    <TabIcon
-                        icon={icon}
-                        activeOpacity={styles.tabOpacity(hovered, isActive, activeOpacity, inactiveOpacity).opacity}
-                        inactiveOpacity={styles.tabOpacity(hovered, isActive, inactiveOpacity, activeOpacity).opacity}
-                    />
-                    <TabLabel
-                        title={title}
-                        activeOpacity={styles.tabOpacity(hovered, isActive, activeOpacity, inactiveOpacity).opacity}
-                        inactiveOpacity={styles.tabOpacity(hovered, isActive, inactiveOpacity, activeOpacity).opacity}
-                    />
-                </Animated.View>
-            )}
-        </PressableWithFeedback>
+            <TabIcon
+                icon={icon}
+                activeOpacity={styles.tabOpacity(isHovered, isActive, activeOpacity, inactiveOpacity).opacity}
+                inactiveOpacity={styles.tabOpacity(isHovered, isActive, inactiveOpacity, activeOpacity).opacity}
+            />
+            <TabLabel
+                title={title}
+                activeOpacity={styles.tabOpacity(isHovered, isActive, activeOpacity, inactiveOpacity).opacity}
+                inactiveOpacity={styles.tabOpacity(isHovered, isActive, inactiveOpacity, activeOpacity).opacity}
+            />
+        </AnimatedPressableWithFeedback>
     );
 }
 
diff --git a/src/components/TagPicker/index.tsx b/src/components/TagPicker/index.tsx
index 97cd9aa5c691..8abcdb25aa60 100644
--- a/src/components/TagPicker/index.tsx
+++ b/src/components/TagPicker/index.tsx
@@ -10,17 +10,20 @@ import * as PolicyUtils from '@libs/PolicyUtils';
 import type * as ReportUtils from '@libs/ReportUtils';
 import CONST from '@src/CONST';
 import ONYXKEYS from '@src/ONYXKEYS';
-import type {PolicyTag, PolicyTagList, PolicyTags, RecentlyUsedTags} from '@src/types/onyx';
+import type {PolicyTag, PolicyTagLists, PolicyTags, RecentlyUsedTags} from '@src/types/onyx';
+import type {PendingAction} from '@src/types/onyx/OnyxCommon';
 
 type SelectedTagOption = {
     name: string;
     enabled: boolean;
+    isSelected?: boolean;
     accountID: number | undefined;
+    pendingAction?: PendingAction;
 };
 
 type TagPickerOnyxProps = {
     /** Collection of tag list on a policy */
-    policyTags: OnyxEntry<PolicyTagList>;
+    policyTags: OnyxEntry<PolicyTagLists>;
 
     /** List of recently used tags */
     policyRecentlyUsedTags: OnyxEntry<RecentlyUsedTags>;
diff --git a/src/components/TaskHeaderActionButton.tsx b/src/components/TaskHeaderActionButton.tsx
index 788734242f7b..5e563ea99763 100644
--- a/src/components/TaskHeaderActionButton.tsx
+++ b/src/components/TaskHeaderActionButton.tsx
@@ -5,6 +5,7 @@ import {withOnyx} from 'react-native-onyx';
 import useLocalize from '@hooks/useLocalize';
 import useThemeStyles from '@hooks/useThemeStyles';
 import * as ReportUtils from '@libs/ReportUtils';
+import * as TaskUtils from '@libs/TaskUtils';
 import * as Session from '@userActions/Session';
 import * as Task from '@userActions/Task';
 import ONYXKEYS from '@src/ONYXKEYS';
@@ -33,10 +34,20 @@ function TaskHeaderActionButton({report, session}: TaskHeaderActionButtonProps)
         <View style={[styles.flexRow, styles.alignItemsCenter, styles.justifyContentEnd]}>
             <Button
                 success
-                isDisabled={!Task.canModifyTask(report, session?.accountID ?? 0)}
+                isDisabled={!Task.canModifyTask(report, session?.accountID ?? -1)}
                 medium
                 text={translate(ReportUtils.isCompletedTaskReport(report) ? 'task.markAsIncomplete' : 'task.markAsComplete')}
-                onPress={Session.checkIfActionIsAllowed(() => (ReportUtils.isCompletedTaskReport(report) ? Task.reopenTask(report) : Task.completeTask(report)))}
+                onPress={Session.checkIfActionIsAllowed(() => {
+                    // If we're already navigating to these task editing pages, early return not to mark as completed, otherwise we would have not found page.
+                    if (TaskUtils.isActiveTaskEditRoute(report.reportID)) {
+                        return;
+                    }
+                    if (ReportUtils.isCompletedTaskReport(report)) {
+                        Task.reopenTask(report);
+                    } else {
+                        Task.completeTask(report);
+                    }
+                })}
                 style={styles.flex1}
             />
         </View>
diff --git a/src/components/TaxPicker.tsx b/src/components/TaxPicker.tsx
index 0aed28681d5c..fb7ab9ce53c1 100644
--- a/src/components/TaxPicker.tsx
+++ b/src/components/TaxPicker.tsx
@@ -1,20 +1,30 @@
-import React, {useMemo, useState} from 'react';
+import React, {useCallback, useMemo, useState} from 'react';
 import {withOnyx} from 'react-native-onyx';
 import type {OnyxEntry} from 'react-native-onyx';
 import type {EdgeInsets} from 'react-native-safe-area-context';
+import type {ValueOf} from 'type-fest';
 import useLocalize from '@hooks/useLocalize';
 import useStyleUtils from '@hooks/useStyleUtils';
+import * as IOUUtils from '@libs/IOUUtils';
 import * as OptionsListUtils from '@libs/OptionsListUtils';
 import * as TransactionUtils from '@libs/TransactionUtils';
 import CONST from '@src/CONST';
+import type {IOUAction} from '@src/CONST';
 import ONYXKEYS from '@src/ONYXKEYS';
-import type {Policy} from '@src/types/onyx';
+import type {Policy, Transaction} from '@src/types/onyx';
+import {isEmptyObject} from '@src/types/utils/EmptyObject';
 import SelectionList from './SelectionList';
 import RadioListItem from './SelectionList/RadioListItem';
 
 type TaxPickerOnyxProps = {
     /** The policy which the user has access to and which the report is tied to */
     policy: OnyxEntry<Policy>;
+
+    /** All the data for the transaction */
+    transaction: OnyxEntry<Transaction>;
+
+    /** The draft transaction that holds data to be persisted on the current split transaction */
+    splitDraftTransaction: OnyxEntry<Transaction>;
 };
 
 type TaxPickerProps = TaxPickerOnyxProps & {
@@ -25,6 +35,10 @@ type TaxPickerProps = TaxPickerOnyxProps & {
     // eslint-disable-next-line react/no-unused-prop-types
     policyID?: string;
 
+    /** ID of the transaction */
+    // eslint-disable-next-line react/no-unused-prop-types
+    transactionID?: string;
+
     /**
      * Safe area insets required for reflecting the portion of the view,
      * that is not covered by navigation bars, tab bars, toolbars, and other ancestor views.
@@ -33,13 +47,26 @@ type TaxPickerProps = TaxPickerOnyxProps & {
 
     /** Callback to fire when a tax is pressed */
     onSubmit: (tax: OptionsListUtils.TaxRatesOption) => void;
+
+    /** The action to take */
+    // eslint-disable-next-line react/no-unused-prop-types
+    action?: IOUAction;
+
+    /** The type of IOU */
+    iouType?: ValueOf<typeof CONST.IOU.TYPE>;
+
+    onDismiss: () => void;
 };
 
-function TaxPicker({selectedTaxRate = '', policy, insets, onSubmit}: TaxPickerProps) {
+function TaxPicker({selectedTaxRate = '', policy, transaction, insets, onSubmit, action, splitDraftTransaction, iouType, onDismiss}: TaxPickerProps) {
     const StyleUtils = useStyleUtils();
     const {translate} = useLocalize();
     const [searchValue, setSearchValue] = useState('');
 
+    const isEditing = action === CONST.IOU.ACTION.EDIT;
+    const isEditingSplitBill = isEditing && iouType === CONST.IOU.TYPE.SPLIT;
+    const currentTransaction = isEditingSplitBill && !isEmptyObject(splitDraftTransaction) ? splitDraftTransaction : transaction;
+
     const taxRates = policy?.taxRates;
     const taxRatesCount = TransactionUtils.getEnabledTaxRateCount(taxRates?.taxes ?? {});
     const isTaxRatesCountBelowThreshold = taxRatesCount < CONST.TAX_RATES_LIST_THRESHOLD;
@@ -53,19 +80,33 @@ function TaxPicker({selectedTaxRate = '', policy, insets, onSubmit}: TaxPickerPr
 
         return [
             {
-                name: selectedTaxRate,
-                enabled: true,
+                modifiedName: selectedTaxRate,
+                isDisabled: false,
                 accountID: null,
             },
         ];
     }, [selectedTaxRate]);
 
-    const sections = useMemo(() => OptionsListUtils.getTaxRatesSection(taxRates, selectedOptions as OptionsListUtils.Category[], searchValue), [taxRates, searchValue, selectedOptions]);
+    const sections = useMemo(
+        () => OptionsListUtils.getTaxRatesSection(policy, selectedOptions as OptionsListUtils.Tax[], searchValue, currentTransaction),
+        [searchValue, selectedOptions, policy, currentTransaction],
+    );
 
     const headerMessage = OptionsListUtils.getHeaderMessageForNonUserList(sections[0].data.length > 0, searchValue);
 
     const selectedOptionKey = useMemo(() => sections?.[0]?.data?.find((taxRate) => taxRate.searchText === selectedTaxRate)?.keyForList, [sections, selectedTaxRate]);
 
+    const handleSelectRow = useCallback(
+        (newSelectedOption: OptionsListUtils.TaxRatesOption) => {
+            if (selectedOptionKey === newSelectedOption.keyForList) {
+                onDismiss();
+                return;
+            }
+            onSubmit(newSelectedOption);
+        },
+        [onSubmit, onDismiss, selectedOptionKey],
+    );
+
     return (
         <SelectionList
             sections={sections}
@@ -73,7 +114,7 @@ function TaxPicker({selectedTaxRate = '', policy, insets, onSubmit}: TaxPickerPr
             textInputValue={searchValue}
             textInputLabel={shouldShowTextInput ? translate('common.search') : undefined}
             onChangeText={setSearchValue}
-            onSelectRow={onSubmit}
+            onSelectRow={handleSelectRow}
             ListItem={RadioListItem}
             initiallyFocusedOptionKey={selectedOptionKey ?? undefined}
             isRowMultilineSupported
@@ -88,4 +129,15 @@ export default withOnyx<TaxPickerProps, TaxPickerOnyxProps>({
     policy: {
         key: ({policyID}) => `${ONYXKEYS.COLLECTION.POLICY}${policyID}`,
     },
+    transaction: {
+        key: ({transactionID, action}) => {
+            if (IOUUtils.shouldUseTransactionDraft(action)) {
+                return `${ONYXKEYS.COLLECTION.TRANSACTION_DRAFT}${transactionID}` as `${typeof ONYXKEYS.COLLECTION.TRANSACTION}${string}`;
+            }
+            return `${ONYXKEYS.COLLECTION.TRANSACTION}${transactionID}`;
+        },
+    },
+    splitDraftTransaction: {
+        key: ({transactionID}) => `${ONYXKEYS.COLLECTION.SPLIT_TRANSACTION_DRAFT}${transactionID}`,
+    },
 })(TaxPicker);
diff --git a/src/components/TestCrash/index.native.tsx b/src/components/TestCrash/index.native.tsx
new file mode 100644
index 000000000000..7cf22f667f4b
--- /dev/null
+++ b/src/components/TestCrash/index.native.tsx
@@ -0,0 +1,34 @@
+import React from 'react';
+import {View} from 'react-native';
+import Button from '@components/Button';
+import TestToolRow from '@components/TestToolRow';
+import useLocalize from '@hooks/useLocalize';
+import testCrash from '@libs/testCrash';
+import firebase from '../../../firebase.json';
+
+/**
+ * Adds a button in native dev builds to test the crashlytics integration with user info.
+ */
+function TestCrash() {
+    const {translate} = useLocalize();
+
+    const isCrashlyticsDebugEnabled = firebase?.['react-native']?.crashlytics_debug_enabled ?? false;
+
+    const toolRowTitle = translate('initialSettingsPage.troubleshoot.testCrash');
+
+    return (
+        <View>
+            {isCrashlyticsDebugEnabled || !__DEV__ ? (
+                <TestToolRow title={toolRowTitle}>
+                    <Button
+                        small
+                        text={toolRowTitle}
+                        onPress={testCrash}
+                    />
+                </TestToolRow>
+            ) : null}
+        </View>
+    );
+}
+
+export default TestCrash;
diff --git a/src/components/TestCrash/index.tsx b/src/components/TestCrash/index.tsx
new file mode 100644
index 000000000000..bcdb4da3d6b6
--- /dev/null
+++ b/src/components/TestCrash/index.tsx
@@ -0,0 +1,8 @@
+import React from 'react';
+import {View} from 'react-native';
+
+function TestCrash() {
+    return <View />;
+}
+
+export default TestCrash;
diff --git a/src/components/TestToolMenu.tsx b/src/components/TestToolMenu.tsx
index e4d33957f7f1..2c553386aff0 100644
--- a/src/components/TestToolMenu.tsx
+++ b/src/components/TestToolMenu.tsx
@@ -4,19 +4,16 @@ import {withOnyx} from 'react-native-onyx';
 import useLocalize from '@hooks/useLocalize';
 import useThemeStyles from '@hooks/useThemeStyles';
 import * as ApiUtils from '@libs/ApiUtils';
-import compose from '@libs/compose';
-import Navigation from '@libs/Navigation/Navigation';
 import * as Network from '@userActions/Network';
 import * as Session from '@userActions/Session';
 import * as User from '@userActions/User';
 import CONFIG from '@src/CONFIG';
-import CONST from '@src/CONST';
 import ONYXKEYS from '@src/ONYXKEYS';
-import ROUTES from '@src/ROUTES';
 import type {Network as NetworkOnyx, User as UserOnyx} from '@src/types/onyx';
 import Button from './Button';
 import {withNetwork} from './OnyxProvider';
 import Switch from './Switch';
+import TestCrash from './TestCrash';
 import TestToolRow from './TestToolRow';
 import Text from './Text';
 
@@ -93,27 +90,17 @@ function TestToolMenu({user = USER_DEFAULT, network}: TestToolMenuProps) {
                 />
             </TestToolRow>
 
-            {/* Navigate to the new Search Page. This button is temporary and should be removed after passing QA tests. */}
-            <TestToolRow title="New Search Page">
-                <Button
-                    small
-                    text="Navigate"
-                    onPress={() => {
-                        Navigation.navigate(ROUTES.SEARCH.getRoute(CONST.TAB_SEARCH.ALL));
-                    }}
-                />
-            </TestToolRow>
+            <TestCrash />
         </>
     );
 }
 
 TestToolMenu.displayName = 'TestToolMenu';
 
-export default compose(
+export default withNetwork()(
     withOnyx<TestToolMenuProps, TestToolMenuOnyxProps>({
         user: {
             key: ONYXKEYS.USER,
         },
-    }),
-    withNetwork(),
-)(TestToolMenu);
+    })(TestToolMenu),
+);
diff --git a/src/components/TestToolsModal.tsx b/src/components/TestToolsModal.tsx
index 026eafc7a13d..5c330bd700e0 100644
--- a/src/components/TestToolsModal.tsx
+++ b/src/components/TestToolsModal.tsx
@@ -7,24 +7,31 @@ import useLocalize from '@hooks/useLocalize';
 import useStyleUtils from '@hooks/useStyleUtils';
 import useThemeStyles from '@hooks/useThemeStyles';
 import useWindowDimensions from '@hooks/useWindowDimensions';
+import Navigation from '@navigation/Navigation';
 import toggleTestToolsModal from '@userActions/TestTool';
 import CONST from '@src/CONST';
 import ONYXKEYS from '@src/ONYXKEYS';
+import ROUTES from '@src/ROUTES';
+import Button from './Button';
 import ClientSideLoggingToolMenu from './ClientSideLoggingToolMenu';
 import Modal from './Modal';
 import ProfilingToolMenu from './ProfilingToolMenu';
 import TestToolMenu from './TestToolMenu';
+import TestToolRow from './TestToolRow';
 import Text from './Text';
 
 type TestToolsModalOnyxProps = {
     /** Whether the test tools modal is open */
     isTestToolsModalOpen: OnyxEntry<boolean>;
+
+    /** Whether or not logs should be stored */
+    shouldStoreLogs: OnyxEntry<boolean>;
 };
 
 type TestToolsModalProps = TestToolsModalOnyxProps;
 
-function TestToolsModal({isTestToolsModalOpen = false}: TestToolsModalProps) {
-    const {isDevelopment} = useEnvironment();
+function TestToolsModal({isTestToolsModalOpen = false, shouldStoreLogs = false}: TestToolsModalProps) {
+    const {isProduction} = useEnvironment();
     const {windowWidth} = useWindowDimensions();
     const StyleUtils = useStyleUtils();
     const styles = useThemeStyles();
@@ -37,7 +44,6 @@ function TestToolsModal({isTestToolsModalOpen = false}: TestToolsModalProps) {
             onClose={toggleTestToolsModal}
         >
             <View style={[StyleUtils.getTestToolsModalStyle(windowWidth)]}>
-                {isDevelopment && <TestToolMenu />}
                 <Text
                     style={[styles.textLabelSupporting, styles.mt4, styles.mb3]}
                     numberOfLines={1}
@@ -46,6 +52,19 @@ function TestToolsModal({isTestToolsModalOpen = false}: TestToolsModalProps) {
                 </Text>
                 <ProfilingToolMenu />
                 <ClientSideLoggingToolMenu />
+                {!!shouldStoreLogs && (
+                    <TestToolRow title={translate('initialSettingsPage.troubleshoot.debugConsole')}>
+                        <Button
+                            small
+                            text={translate('initialSettingsPage.debugConsole.viewConsole')}
+                            onPress={() => {
+                                toggleTestToolsModal();
+                                Navigation.navigate(ROUTES.SETTINGS_CONSOLE.getRoute(Navigation.getActiveRoute()));
+                            }}
+                        />
+                    </TestToolRow>
+                )}
+                {!isProduction && <TestToolMenu />}
             </View>
         </Modal>
     );
@@ -57,4 +76,7 @@ export default withOnyx<TestToolsModalProps, TestToolsModalOnyxProps>({
     isTestToolsModalOpen: {
         key: ONYXKEYS.IS_TEST_TOOLS_MODAL_OPEN,
     },
+    shouldStoreLogs: {
+        key: ONYXKEYS.SHOULD_STORE_LOGS,
+    },
 })(TestToolsModal);
diff --git a/src/components/Text.tsx b/src/components/Text.tsx
index b94530a423f7..16aaf9a708c3 100644
--- a/src/components/Text.tsx
+++ b/src/components/Text.tsx
@@ -1,5 +1,5 @@
 import type {ForwardedRef} from 'react';
-import React from 'react';
+import React, {useContext} from 'react';
 // eslint-disable-next-line no-restricted-imports
 import {Text as RNText, StyleSheet} from 'react-native';
 import type {TextProps as RNTextProps, TextStyle} from 'react-native';
@@ -8,6 +8,7 @@ import type {FontUtilsType} from '@styles/utils/FontUtils';
 import FontUtils from '@styles/utils/FontUtils';
 import variables from '@styles/variables';
 import type ChildrenProps from '@src/types/utils/ChildrenProps';
+import {CustomStylesForChildrenContext} from './CustomStylesForChildrenProvider';
 
 type TextProps = RNTextProps &
     ChildrenProps & {
@@ -29,13 +30,15 @@ type TextProps = RNTextProps &
 
 function Text({color, fontSize = variables.fontSizeNormal, textAlign = 'left', children, family = 'EXP_NEUE', style = {}, ...props}: TextProps, ref: ForwardedRef<RNText>) {
     const theme = useTheme();
+    const customStyle = useContext(CustomStylesForChildrenContext);
 
     const componentStyle: TextStyle = {
         color: color ?? theme.text,
         fontSize,
         textAlign,
-        fontFamily: FontUtils.fontFamily.platform[family],
+        ...FontUtils.fontFamily.platform[family],
         ...StyleSheet.flatten(style),
+        ...StyleSheet.flatten(customStyle),
     };
 
     if (!componentStyle.lineHeight && componentStyle.fontSize === variables.fontSizeNormal) {
diff --git a/src/components/TextBlock.tsx b/src/components/TextBlock.tsx
new file mode 100644
index 000000000000..8b036f42f4cc
--- /dev/null
+++ b/src/components/TextBlock.tsx
@@ -0,0 +1,39 @@
+/**
+ * TextBlock component splits a given text into individual words and displays
+ * each word within a Text component.
+ */
+import React, {memo, useMemo} from 'react';
+import type {StyleProp, TextStyle} from 'react-native';
+import Text from './Text';
+
+type TextBlockProps = {
+    /** The color of the text */
+    color?: string;
+
+    /** Styles to apply to each text word */
+    textStyles?: StyleProp<TextStyle>;
+
+    /** The full text to be split into words */
+    text: string;
+};
+
+function TextBlock({color, textStyles, text}: TextBlockProps) {
+    const words = useMemo(() => text.match(/(\S+\s*)/g) ?? [], [text]);
+
+    return (
+        <>
+            {words.map((word) => (
+                <Text
+                    color={color}
+                    style={textStyles}
+                >
+                    {word}
+                </Text>
+            ))}
+        </>
+    );
+}
+
+TextBlock.displayName = 'TextBlock';
+
+export default memo(TextBlock);
diff --git a/src/components/TextInput/BaseTextInput/index.native.tsx b/src/components/TextInput/BaseTextInput/index.native.tsx
index 4f0c7dd71116..59f205da023f 100644
--- a/src/components/TextInput/BaseTextInput/index.native.tsx
+++ b/src/components/TextInput/BaseTextInput/index.native.tsx
@@ -1,4 +1,4 @@
-import Str from 'expensify-common/lib/str';
+import {Str} from 'expensify-common';
 import type {ForwardedRef} from 'react';
 import React, {forwardRef, useCallback, useEffect, useRef, useState} from 'react';
 import type {GestureResponderEvent, LayoutChangeEvent, NativeSyntheticEvent, StyleProp, TextInput, TextInputFocusEventData, ViewStyle} from 'react-native';
@@ -64,6 +64,7 @@ function BaseTextInput(
         shouldShowClearButton = false,
         prefixContainerStyle = [],
         prefixStyle = [],
+        contentWidth,
         ...props
     }: BaseTextInputProps,
     ref: ForwardedRef<BaseTextInputRef>,
@@ -108,7 +109,7 @@ function BaseTextInput(
         }
         input.current.focus();
         // We only want this to run on mount
-        // eslint-disable-next-line react-hooks/exhaustive-deps
+        // eslint-disable-next-line react-compiler/react-compiler, react-hooks/exhaustive-deps
     }, []);
 
     const animateLabel = useCallback(
@@ -242,7 +243,7 @@ function BaseTextInput(
         setPasswordHidden((prevPasswordHidden) => !prevPasswordHidden);
     }, []);
 
-    const hasLabel = Boolean(label?.length);
+    const hasLabel = !!label?.length;
     const isReadOnly = inputProps.readOnly ?? inputProps.disabled;
     // Disabling this line for safeness as nullish coalescing works only if the value is undefined or null, and errorText can be an empty string
     // eslint-disable-next-line @typescript-eslint/prefer-nullish-coalescing
@@ -251,12 +252,14 @@ function BaseTextInput(
     const newTextInputContainerStyles: StyleProp<ViewStyle> = StyleSheet.flatten([
         styles.textInputContainer,
         textInputContainerStyles,
-        autoGrow && StyleUtils.getWidthStyle(textInputWidth),
+        (autoGrow || !!contentWidth) && StyleUtils.getWidthStyle(textInputWidth),
         !hideFocusedState && isFocused && styles.borderColorFocus,
         (!!hasError || !!errorText) && styles.borderColorDanger,
         autoGrowHeight && {scrollPaddingTop: typeof maxAutoGrowHeight === 'number' ? 2 * maxAutoGrowHeight : undefined},
     ]);
 
+    const inputPaddingLeft = !!prefixCharacter && StyleUtils.getPaddingLeft(StyleUtils.getCharacterPadding(prefixCharacter) + styles.pl1.paddingLeft);
+
     return (
         <>
             <View style={[containerStyles]}>
@@ -341,7 +344,7 @@ function BaseTextInput(
                                     styles.w100,
                                     inputStyle,
                                     (!hasLabel || isMultiline) && styles.pv0,
-                                    !!prefixCharacter && StyleUtils.getPaddingLeft(StyleUtils.getCharacterPadding(prefixCharacter) + styles.pl1.paddingLeft),
+                                    inputPaddingLeft,
                                     inputProps.secureTextEntry && styles.secureInput,
 
                                     !isMultiline && {height, lineHeight: undefined},
@@ -411,6 +414,29 @@ function BaseTextInput(
                     />
                 )}
             </View>
+            {contentWidth && (
+                <View
+                    style={[inputStyle as ViewStyle, styles.hiddenElementOutsideOfWindow, styles.visibilityHidden, styles.wAuto, inputPaddingLeft]}
+                    onLayout={(e) => {
+                        if (e.nativeEvent.layout.width === 0 && e.nativeEvent.layout.height === 0) {
+                            return;
+                        }
+                        setTextInputWidth(e.nativeEvent.layout.width);
+                        setTextInputHeight(e.nativeEvent.layout.height);
+                    }}
+                >
+                    <Text
+                        style={[
+                            inputStyle,
+                            autoGrowHeight && styles.autoGrowHeightHiddenInput(width ?? 0, typeof maxAutoGrowHeight === 'number' ? maxAutoGrowHeight : undefined),
+                            {width: contentWidth},
+                        ]}
+                    >
+                        {/* \u200B added to solve the issue of not expanding the text input enough when the value ends with '\n' (https://github.com/Expensify/App/issues/21271) */}
+                        {value ? `${value}${value.endsWith('\n') ? '\u200B' : ''}` : placeholder}
+                    </Text>
+                </View>
+            )}
             {/*
                  Text input component doesn't support auto grow by default.
                  We're using a hidden text input to achieve that.
diff --git a/src/components/TextInput/BaseTextInput/index.tsx b/src/components/TextInput/BaseTextInput/index.tsx
index bc016617b9e3..3f55ff97ff02 100644
--- a/src/components/TextInput/BaseTextInput/index.tsx
+++ b/src/components/TextInput/BaseTextInput/index.tsx
@@ -1,4 +1,4 @@
-import Str from 'expensify-common/lib/str';
+import {Str} from 'expensify-common';
 import type {ForwardedRef} from 'react';
 import React, {forwardRef, useCallback, useEffect, useMemo, useRef, useState} from 'react';
 import type {GestureResponderEvent, LayoutChangeEvent, NativeSyntheticEvent, StyleProp, TextInputFocusEventData, ViewStyle} from 'react-native';
@@ -61,11 +61,15 @@ function BaseTextInput(
         shouldInterceptSwipe = false,
         autoCorrect = true,
         prefixCharacter = '',
+        suffixCharacter = '',
         inputID,
         isMarkdownEnabled = false,
         shouldShowClearButton = false,
         prefixContainerStyle = [],
         prefixStyle = [],
+        suffixContainerStyle = [],
+        suffixStyle = [],
+        contentWidth,
         ...inputProps
     }: BaseTextInputProps,
     ref: ForwardedRef<BaseTextInputRef>,
@@ -82,7 +86,7 @@ function BaseTextInput(
     // Disabling this line for saftiness as nullish coalescing works only if value is undefined or null
     // eslint-disable-next-line @typescript-eslint/prefer-nullish-coalescing
     const initialValue = value || defaultValue || '';
-    const initialActiveLabel = !!forceActiveLabel || initialValue.length > 0 || !!prefixCharacter;
+    const initialActiveLabel = !!forceActiveLabel || initialValue.length > 0 || !!prefixCharacter || !!suffixCharacter;
 
     const [isFocused, setIsFocused] = useState(false);
     const [passwordHidden, setPasswordHidden] = useState(inputProps.secureTextEntry);
@@ -108,7 +112,7 @@ function BaseTextInput(
         }
         input.current.focus();
         // We only want this to run on mount
-        // eslint-disable-next-line react-hooks/exhaustive-deps
+        // eslint-disable-next-line react-compiler/react-compiler, react-hooks/exhaustive-deps
     }, []);
 
     const animateLabel = useCallback(
@@ -141,13 +145,13 @@ function BaseTextInput(
     const deactivateLabel = useCallback(() => {
         const newValue = value ?? '';
 
-        if (!!forceActiveLabel || newValue.length !== 0 || prefixCharacter) {
+        if (!!forceActiveLabel || newValue.length !== 0 || prefixCharacter || suffixCharacter) {
             return;
         }
 
         animateLabel(styleConst.INACTIVE_LABEL_TRANSLATE_Y, styleConst.INACTIVE_LABEL_SCALE);
         isLabelActive.current = false;
-    }, [animateLabel, forceActiveLabel, prefixCharacter, value]);
+    }, [animateLabel, forceActiveLabel, prefixCharacter, suffixCharacter, value]);
 
     const onFocus = (event: NativeSyntheticEvent<TextInputFocusEventData>) => {
         inputProps.onFocus?.(event);
@@ -239,29 +243,30 @@ function BaseTextInput(
         setPasswordHidden((prevPasswordHidden: boolean | undefined) => !prevPasswordHidden);
     }, []);
 
-    const hasLabel = Boolean(label?.length);
+    const hasLabel = !!label?.length;
     const isReadOnly = inputProps.readOnly ?? inputProps.disabled;
     // Disabling this line for safeness as nullish coalescing works only if the value is undefined or null, and errorText can be an empty string
     // eslint-disable-next-line @typescript-eslint/prefer-nullish-coalescing
     const inputHelpText = errorText || hint;
-    const newPlaceholder = !!prefixCharacter || isFocused || !hasLabel || (hasLabel && forceActiveLabel) ? placeholder : undefined;
+    const newPlaceholder = !!prefixCharacter || !!suffixCharacter || isFocused || !hasLabel || (hasLabel && forceActiveLabel) ? placeholder : undefined;
     const newTextInputContainerStyles: StyleProp<ViewStyle> = StyleSheet.flatten([
         styles.textInputContainer,
         textInputContainerStyles,
-        autoGrow && StyleUtils.getWidthStyle(textInputWidth),
+        (autoGrow || !!contentWidth) && StyleUtils.getWidthStyle(textInputWidth),
         !hideFocusedState && isFocused && styles.borderColorFocus,
         (!!hasError || !!errorText) && styles.borderColorDanger,
         autoGrowHeight && {scrollPaddingTop: typeof maxAutoGrowHeight === 'number' ? 2 * maxAutoGrowHeight : undefined},
     ]);
     const isMultiline = multiline || 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 */
-
+    /**
+     * 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() || Browser.isMobileChrome()) {
             const lineHeightValue = StyleSheet.flatten(inputStyle).lineHeight;
@@ -273,6 +278,9 @@ function BaseTextInput(
         return undefined;
     }, [inputStyle]);
 
+    const inputPaddingLeft = !!prefixCharacter && StyleUtils.getPaddingLeft(StyleUtils.getCharacterPadding(prefixCharacter) + styles.pl1.paddingLeft);
+    const inputPaddingRight = !!suffixCharacter && StyleUtils.getPaddingRight(StyleUtils.getCharacterPadding(suffixCharacter) + styles.pr1.paddingRight);
+
     return (
         <>
             <View
@@ -327,7 +335,7 @@ function BaseTextInput(
                                     />
                                 </View>
                             )}
-                            {Boolean(prefixCharacter) && (
+                            {!!prefixCharacter && (
                                 <View style={[styles.textInputPrefixWrapper, prefixContainerStyle]}>
                                     <Text
                                         tabIndex={-1}
@@ -361,7 +369,8 @@ function BaseTextInput(
                                     styles.w100,
                                     inputStyle,
                                     (!hasLabel || isMultiline) && styles.pv0,
-                                    !!prefixCharacter && StyleUtils.getPaddingLeft(StyleUtils.getCharacterPadding(prefixCharacter) + styles.pl1.paddingLeft),
+                                    inputPaddingLeft,
+                                    inputPaddingRight,
                                     inputProps.secureTextEntry && styles.secureInput,
 
                                     // Explicitly remove `lineHeight` from single line inputs so that long text doesn't disappear
@@ -370,7 +379,9 @@ function BaseTextInput(
 
                                     // Explicitly change boxSizing attribute for mobile chrome in order to apply line-height
                                     // for the issue mentioned here https://github.com/Expensify/App/issues/26735
-                                    !isMultiline && Browser.isMobileChrome() && {boxSizing: 'content-box', height: undefined},
+                                    // Set overflow property to enable the parent flexbox to shrink its size
+                                    // (See https://github.com/Expensify/App/issues/41766)
+                                    !isMultiline && Browser.isMobileChrome() && {boxSizing: 'content-box', height: undefined, ...styles.overflowAuto},
 
                                     // Stop scrollbar flashing when breaking lines with autoGrowHeight enabled.
                                     ...(autoGrowHeight
@@ -396,7 +407,18 @@ function BaseTextInput(
                                 defaultValue={defaultValue}
                                 markdownStyle={markdownStyle}
                             />
-                            {isFocused && !isReadOnly && shouldShowClearButton && value && <TextInputClearButton onPressButton={() => setValue('')} />}
+                            {!!suffixCharacter && (
+                                <View style={[styles.textInputSuffixWrapper, suffixContainerStyle]}>
+                                    <Text
+                                        tabIndex={-1}
+                                        style={[styles.textInputSuffix, !hasLabel && styles.pv0, styles.pointerEventsNone, suffixStyle]}
+                                        dataSet={{[CONST.SELECTION_SCRAPER_HIDDEN_ELEMENT]: true}}
+                                    >
+                                        {suffixCharacter}
+                                    </Text>
+                                </View>
+                            )}
+                            {isFocused && !isReadOnly && shouldShowClearButton && !!value && <TextInputClearButton onPressButton={() => setValue('')} />}
                             {inputProps.isLoading && (
                                 <ActivityIndicator
                                     size="small"
@@ -404,7 +426,7 @@ function BaseTextInput(
                                     style={[styles.mt4, styles.ml1]}
                                 />
                             )}
-                            {Boolean(inputProps.secureTextEntry) && (
+                            {!!inputProps.secureTextEntry && (
                                 <Checkbox
                                     style={[styles.flex1, styles.textInputIconContainer]}
                                     onPress={togglePasswordVisibility}
@@ -419,7 +441,7 @@ function BaseTextInput(
                                     />
                                 </Checkbox>
                             )}
-                            {!inputProps.secureTextEntry && icon && (
+                            {!inputProps.secureTextEntry && !!icon && (
                                 <View style={[styles.textInputIconContainer, !isReadOnly ? styles.cursorPointer : styles.pointerEventsNone]}>
                                     <Icon
                                         src={icon}
@@ -437,6 +459,29 @@ function BaseTextInput(
                     />
                 )}
             </View>
+            {contentWidth && (
+                <View
+                    style={[inputStyle as ViewStyle, styles.hiddenElementOutsideOfWindow, styles.visibilityHidden, styles.wAuto, inputPaddingLeft]}
+                    onLayout={(e) => {
+                        if (e.nativeEvent.layout.width === 0 && e.nativeEvent.layout.height === 0) {
+                            return;
+                        }
+                        setTextInputWidth(e.nativeEvent.layout.width);
+                        setTextInputHeight(e.nativeEvent.layout.height);
+                    }}
+                >
+                    <Text
+                        style={[
+                            inputStyle,
+                            autoGrowHeight && styles.autoGrowHeightHiddenInput(width ?? 0, typeof maxAutoGrowHeight === 'number' ? maxAutoGrowHeight : undefined),
+                            {width: contentWidth},
+                        ]}
+                    >
+                        {/* \u200B added to solve the issue of not expanding the text input enough when the value ends with '\n' (https://github.com/Expensify/App/issues/21271) */}
+                        {value ? `${value}${value.endsWith('\n') ? '\u200B' : ''}` : placeholder}
+                    </Text>
+                </View>
+            )}
             {/*
                  Text input component doesn't support auto grow by default.
                  We're using a hidden text input to achieve that.
diff --git a/src/components/TextInput/BaseTextInput/isTextInputFocused.ts b/src/components/TextInput/BaseTextInput/isTextInputFocused.ts
new file mode 100644
index 000000000000..bf7ae45fa6f4
--- /dev/null
+++ b/src/components/TextInput/BaseTextInput/isTextInputFocused.ts
@@ -0,0 +1,7 @@
+import type {AnimatedTextInputRef} from '@components/RNTextInput';
+import type {BaseTextInputRef} from './types';
+
+/** Checks that text input has the isFocused method and is focused. */
+export default function isTextInputFocused(textInput: React.MutableRefObject<BaseTextInputRef | null>): boolean | null {
+    return textInput.current && 'isFocused' in textInput.current && (textInput.current as AnimatedTextInputRef).isFocused();
+}
diff --git a/src/components/TextInput/BaseTextInput/types.ts b/src/components/TextInput/BaseTextInput/types.ts
index e8e2d5ab352d..5b05d9d8613b 100644
--- a/src/components/TextInput/BaseTextInput/types.ts
+++ b/src/components/TextInput/BaseTextInput/types.ts
@@ -1,6 +1,5 @@
 import type {GestureResponderEvent, StyleProp, TextInputProps, TextStyle, ViewStyle} from 'react-native';
 import type {AnimatedTextInputRef} from '@components/RNTextInput';
-import type {MaybePhraseKey} from '@libs/Localize';
 import type IconAsset from '@src/types/utils/IconAsset';
 
 type CustomBaseTextInputProps = {
@@ -20,7 +19,7 @@ type CustomBaseTextInputProps = {
     placeholder?: string;
 
     /** Error text to display */
-    errorText?: MaybePhraseKey;
+    errorText?: string;
 
     /** Icon to display in right side of text input */
     icon?: IconAsset | null;
@@ -68,11 +67,14 @@ type CustomBaseTextInputProps = {
     hideFocusedState?: boolean;
 
     /** Hint text to display below the TextInput */
-    hint?: MaybePhraseKey;
+    hint?: string;
 
     /** Prefix character */
     prefixCharacter?: string;
 
+    /** Suffix character */
+    suffixCharacter?: string;
+
     /** Whether autoCorrect functionality should enable  */
     autoCorrect?: boolean;
 
@@ -121,6 +123,15 @@ type CustomBaseTextInputProps = {
 
     /** Style for the prefix container */
     prefixContainerStyle?: StyleProp<ViewStyle>;
+
+    /** Style for the suffix */
+    suffixStyle?: StyleProp<TextStyle>;
+
+    /** Style for the suffix container */
+    suffixContainerStyle?: StyleProp<ViewStyle>;
+
+    /** The width of inner content */
+    contentWidth?: number;
 };
 
 type BaseTextInputRef = HTMLFormElement | AnimatedTextInputRef;
diff --git a/src/components/TextInput/TextInputClearButton/index.tsx b/src/components/TextInput/TextInputClearButton/index.tsx
index 71dcd091ed77..106ae4439b8d 100644
--- a/src/components/TextInput/TextInputClearButton/index.tsx
+++ b/src/components/TextInput/TextInputClearButton/index.tsx
@@ -1,5 +1,6 @@
-import {forwardRef} from 'react';
+import React from 'react';
 import Icon from '@components/Icon';
+import * as Expensicons from '@components/Icon/Expensicons';
 import {PressableWithoutFeedback} from '@components/Pressable';
 import Tooltip from '@components/Tooltip';
 import useLocalize from '@hooks/useLocalize';
@@ -39,4 +40,4 @@ function TextInputClearButton({onPressButton}: TextInputClearButtonProps) {
 
 TextInputClearButton.displayName = 'TextInputClearButton';
 
-export default forwardRef(TextInputClearButton);
+export default TextInputClearButton;
diff --git a/src/components/TextInput/TextInputLabel/index.tsx b/src/components/TextInput/TextInputLabel/index.tsx
index 8f6d3efdcd8d..3136a43e8669 100644
--- a/src/components/TextInput/TextInputLabel/index.tsx
+++ b/src/components/TextInput/TextInputLabel/index.tsx
@@ -4,23 +4,24 @@ import type {Text} from 'react-native';
 import {Animated} from 'react-native';
 import useThemeStyles from '@hooks/useThemeStyles';
 import CONST from '@src/CONST';
+import textRef from '@src/types/utils/textRef';
 import type TextInputLabelProps from './types';
 
 function TextInputLabel({for: inputId = '', label, labelTranslateY, labelScale}: TextInputLabelProps) {
     const styles = useThemeStyles();
-    const labelRef = useRef<Text & HTMLFormElement>(null);
+    const labelRef = useRef<Text | HTMLFormElement>(null);
 
     useEffect(() => {
-        if (!inputId || !labelRef.current) {
+        if (!inputId || !labelRef.current || !('setAttribute' in labelRef.current)) {
             return;
         }
         labelRef.current.setAttribute('for', inputId);
-        // eslint-disable-next-line react-hooks/exhaustive-deps
+        // eslint-disable-next-line react-compiler/react-compiler, react-hooks/exhaustive-deps
     }, []);
 
     return (
         <Animated.Text
-            ref={labelRef}
+            ref={textRef(labelRef)}
             role={CONST.ROLE.PRESENTATION}
             style={[styles.textInputLabel, styles.textInputLabelDesktop, styles.textInputLabelTransformation(labelTranslateY, 0, labelScale), styles.pointerEventsNone]}
         >
diff --git a/src/components/TextInput/index.tsx b/src/components/TextInput/index.tsx
index 75c4d52e0f86..4070714c798e 100644
--- a/src/components/TextInput/index.tsx
+++ b/src/components/TextInput/index.tsx
@@ -40,10 +40,10 @@ function TextInput(props: BaseTextInputProps, ref: ForwardedRef<BaseTextInputRef
             }
             removeVisibilityListener();
         };
-        // eslint-disable-next-line react-hooks/exhaustive-deps
+        // eslint-disable-next-line react-compiler/react-compiler, react-hooks/exhaustive-deps
     }, []);
 
-    const isLabeledMultiline = Boolean(props.label?.length) && props.multiline;
+    const isLabeledMultiline = !!props.label?.length && props.multiline;
     const labelAnimationStyle = {
         // eslint-disable-next-line @typescript-eslint/naming-convention
         '--active-label-translate-y': `${styleConst.ACTIVE_LABEL_TRANSLATE_Y}px`,
diff --git a/src/components/TextInputWithCurrencySymbol/types.ts b/src/components/TextInputWithCurrencySymbol/types.ts
index 78d4158cf77f..619ed0fd84e6 100644
--- a/src/components/TextInputWithCurrencySymbol/types.ts
+++ b/src/components/TextInputWithCurrencySymbol/types.ts
@@ -1,4 +1,4 @@
-import type {NativeSyntheticEvent, StyleProp, TextInputSelectionChangeEventData, TextStyle, ViewStyle} from 'react-native';
+import type {NativeSyntheticEvent, StyleProp, TextInputFocusEventData, TextInputSelectionChangeEventData, TextStyle, ViewStyle} from 'react-native';
 import type {TextSelection} from '@components/Composer/types';
 import type {BaseTextInputProps} from '@components/TextInput/BaseTextInput/types';
 
@@ -27,12 +27,30 @@ type TextInputWithCurrencySymbolProps = {
     /** Function to call to handle key presses in the text input */
     onKeyPress?: (event: NativeSyntheticEvent<KeyboardEvent>) => void;
 
+    /**
+     * Callback that is called when the text input is blurred
+     */
+    onBlur?: ((e: NativeSyntheticEvent<TextInputFocusEventData>) => void) | undefined;
+
+    /**
+     * Callback that is called when the text input is pressed down
+     */
+    onMouseDown?: ((e: React.MouseEvent) => void) | undefined;
+
+    /**
+     * Callback that is called when the text input is pressed up
+     */
+    onMouseUp?: ((e: React.MouseEvent) => void) | undefined;
+
     /** Whether the currency symbol is pressable */
     isCurrencyPressable: boolean;
 
     /** Whether to hide the currency symbol */
     hideCurrencySymbol?: boolean;
 
+    /** Whether to disable native keyboard on mobile */
+    disableKeyboard?: boolean;
+
     /** Extra symbol to display */
     extraSymbol?: React.ReactNode;
 
@@ -53,6 +71,12 @@ type TextInputWithCurrencySymbolProps = {
 
     /** Customizes the touchable wrapper of the TextInput component */
     touchableInputWrapperStyle?: StyleProp<ViewStyle>;
-} & Pick<BaseTextInputProps, 'autoFocus'>;
+
+    /** Max length for the amount input */
+    maxLength?: number;
+
+    /** Hide the focus styles on TextInput */
+    hideFocusedState?: boolean;
+} & Pick<BaseTextInputProps, 'autoFocus' | 'autoGrow' | 'contentWidth'>;
 
 export default TextInputWithCurrencySymbolProps;
diff --git a/src/components/TextLink.tsx b/src/components/TextLink.tsx
index b6ffb14753c1..2d390f9811e6 100644
--- a/src/components/TextLink.tsx
+++ b/src/components/TextLink.tsx
@@ -62,7 +62,7 @@ function TextLink({href, onPress, children, style, onMouseDown = (event) => even
     return (
         <Text
             style={[styles.link, style]}
-            role={CONST.ACCESSIBILITY_ROLE.LINK}
+            role={CONST.ROLE.LINK}
             href={href}
             onPress={openLinkOnTap}
             onKeyDown={openLinkOnEnterKey}
diff --git a/src/components/TextPicker/TextSelectorModal.tsx b/src/components/TextPicker/TextSelectorModal.tsx
index 2abbd9abc8e6..ad3561b0ba26 100644
--- a/src/components/TextPicker/TextSelectorModal.tsx
+++ b/src/components/TextPicker/TextSelectorModal.tsx
@@ -1,30 +1,81 @@
-import React, {useState} from 'react';
-import {View} from 'react-native';
-import Button from '@components/Button';
+import {useFocusEffect} from '@react-navigation/native';
+import React, {useCallback, useEffect, useRef, useState} from 'react';
+import type {TextInput as TextInputType} from 'react-native';
+import {Keyboard, View} from 'react-native';
+import FormProvider from '@components/Form/FormProvider';
+import InputWrapper from '@components/Form/InputWrapper';
 import HeaderWithBackButton from '@components/HeaderWithBackButton';
 import Modal from '@components/Modal';
 import ScreenWrapper from '@components/ScreenWrapper';
-import ScrollView from '@components/ScrollView';
+import Text from '@components/Text';
 import TextInput from '@components/TextInput';
+import type {BaseTextInputRef} from '@components/TextInput/BaseTextInput/types';
 import useLocalize from '@hooks/useLocalize';
 import useThemeStyles from '@hooks/useThemeStyles';
 import CONST from '@src/CONST';
+import ONYXKEYS from '@src/ONYXKEYS';
 import type {TextSelectorModalProps} from './types';
 import usePaddingStyle from './usePaddingStyle';
 
-function TextSelectorModal({value, description = '', onValueSelected, isVisible, onClose, ...rest}: TextSelectorModalProps) {
+function TextSelectorModal({value, description = '', subtitle, onValueSelected, isVisible, onClose, shouldClearOnClose, ...rest}: TextSelectorModalProps) {
     const {translate} = useLocalize();
     const styles = useThemeStyles();
 
     const [currentValue, setValue] = useState(value);
     const paddingStyle = usePaddingStyle();
 
+    const inputRef = useRef<BaseTextInputRef | null>(null);
+    const inputValueRef = useRef(value);
+    const focusTimeoutRef = useRef<NodeJS.Timeout | null>(null);
+
+    const inputCallbackRef = (ref: BaseTextInputRef | null) => {
+        inputRef.current = ref;
+    };
+
+    const hide = useCallback(() => {
+        onClose();
+        if (shouldClearOnClose) {
+            setValue('');
+        }
+    }, [onClose, shouldClearOnClose]);
+
+    // In TextPicker, when the modal is hidden, it is not completely unmounted, so when it is shown again, the currentValue is not updated with the value prop.
+    // Therefore, we need to update the currentValue with the value prop when the modal is shown. This is done once when the modal is shown again.
+    useEffect(() => {
+        if (!isVisible) {
+            return;
+        }
+        setValue(value);
+        // eslint-disable-next-line react-compiler/react-compiler, react-hooks/exhaustive-deps
+    }, [isVisible]);
+
+    useEffect(() => {
+        inputValueRef.current = currentValue;
+    }, [currentValue]);
+
+    useFocusEffect(
+        useCallback(() => {
+            focusTimeoutRef.current = setTimeout(() => {
+                if (inputRef.current && isVisible) {
+                    inputRef.current.focus();
+                    (inputRef.current as TextInputType).setSelection?.(inputValueRef.current?.length ?? 0, inputValueRef.current?.length ?? 0);
+                }
+                return () => {
+                    if (!focusTimeoutRef.current || !isVisible) {
+                        return;
+                    }
+                    clearTimeout(focusTimeoutRef.current);
+                };
+            }, CONST.ANIMATED_TRANSITION);
+        }, [isVisible]),
+    );
+
     return (
         <Modal
             type={CONST.MODAL.MODAL_TYPE.RIGHT_DOCKED}
             isVisible={isVisible}
-            onClose={onClose}
-            onModalHide={onClose}
+            onClose={hide}
+            onModalHide={hide}
             hideModalContentWhileAnimating
             useNativeDriver
             shouldUseModalPaddingStyle={false}
@@ -38,25 +89,32 @@ function TextSelectorModal({value, description = '', onValueSelected, isVisible,
             >
                 <HeaderWithBackButton
                     title={description}
-                    onBackButtonPress={onClose}
+                    onBackButtonPress={hide}
                 />
-                <ScrollView contentContainerStyle={[styles.flex1, styles.mh5, styles.mb5]}>
-                    <View style={styles.flex1}>
-                        <TextInput
+                <FormProvider
+                    formID={ONYXKEYS.FORMS.TEXT_PICKER_MODAL_FORM}
+                    onSubmit={(data) => {
+                        Keyboard.dismiss();
+                        onValueSelected?.(data[rest.inputID ?? ''] ?? '');
+                    }}
+                    submitButtonText={translate('common.save')}
+                    style={[styles.mh5, styles.flex1]}
+                    enabledWhenOffline
+                >
+                    <View style={styles.pb4}>{!!subtitle && <Text style={[styles.sidebarLinkText, styles.optionAlternateText]}>{subtitle}</Text>}</View>
+                    {!!rest.inputID && (
+                        <InputWrapper
+                            ref={inputCallbackRef}
+                            InputComponent={TextInput}
+                            maxLength={CONST.CATEGORY_NAME_LIMIT}
+                            value={currentValue}
+                            onValueChange={(changedValue) => setValue(changedValue.toString())}
                             // eslint-disable-next-line react/jsx-props-no-spreading
                             {...rest}
-                            value={currentValue}
-                            onInputChange={setValue}
+                            inputID={rest.inputID}
                         />
-                    </View>
-                    <Button
-                        success
-                        large
-                        pressOnEnter
-                        text={translate('common.save')}
-                        onPress={() => onValueSelected?.(currentValue ?? '')}
-                    />
-                </ScrollView>
+                    )}
+                </FormProvider>
             </ScreenWrapper>
         </Modal>
     );
diff --git a/src/components/TextPicker/index.tsx b/src/components/TextPicker/index.tsx
index 00c22e8b75ee..968338391aaa 100644
--- a/src/components/TextPicker/index.tsx
+++ b/src/components/TextPicker/index.tsx
@@ -1,17 +1,14 @@
 import React, {forwardRef, useState} from 'react';
 import type {ForwardedRef} from 'react';
 import {View} from 'react-native';
-import FormHelpMessage from '@components/FormHelpMessage';
 import MenuItemWithTopDescription from '@components/MenuItemWithTopDescription';
-import useStyleUtils from '@hooks/useStyleUtils';
 import useThemeStyles from '@hooks/useThemeStyles';
-import variables from '@styles/variables';
+import CONST from '@src/CONST';
 import TextSelectorModal from './TextSelectorModal';
 import type {TextPickerProps} from './types';
 
 function TextPicker({value, description, placeholder = '', errorText = '', onInputChange, furtherDetails, rightLabel, ...rest}: TextPickerProps, forwardedRef: ForwardedRef<View>) {
     const styles = useThemeStyles();
-    const StyleUtils = useStyleUtils();
     const [isPickerVisible, setIsPickerVisible] = useState(false);
 
     const showPickerModal = () => {
@@ -29,24 +26,20 @@ function TextPicker({value, description, placeholder = '', errorText = '', onInp
         hidePickerModal();
     };
 
-    const descStyle = !value || value.length === 0 ? StyleUtils.getFontSizeStyle(variables.fontSizeLabel) : null;
-
     return (
         <View>
             <MenuItemWithTopDescription
                 ref={forwardedRef}
                 shouldShowRightIcon
                 title={value ?? placeholder ?? ''}
-                descriptionTextStyle={descStyle}
                 description={description}
                 onPress={showPickerModal}
                 furtherDetails={furtherDetails}
                 rightLabel={rightLabel}
+                brickRoadIndicator={errorText ? CONST.BRICK_ROAD_INDICATOR_STATUS.ERROR : undefined}
+                errorText={errorText}
                 style={[styles.moneyRequestMenuItem]}
             />
-            <View style={styles.ml5}>
-                <FormHelpMessage message={errorText} />
-            </View>
             <TextSelectorModal
                 value={value}
                 isVisible={isPickerVisible}
diff --git a/src/components/TextPicker/types.ts b/src/components/TextPicker/types.ts
index 179d16a07262..e260a478e4c2 100644
--- a/src/components/TextPicker/types.ts
+++ b/src/components/TextPicker/types.ts
@@ -1,6 +1,5 @@
 import type {MenuItemBaseProps} from '@components/MenuItem';
 import type {BaseTextInputProps} from '@components/TextInput/BaseTextInput/types';
-import type {MaybePhraseKey} from '@libs/Localize';
 
 type TextProps = Exclude<BaseTextInputProps, 'value' | 'onInputChange'>;
 
@@ -19,7 +18,10 @@ type TextSelectorModalProps = {
 
     /** Whether to show the tooltip text */
     shouldShowTooltips?: boolean;
-} & Pick<MenuItemBaseProps, 'description'> &
+
+    /** Whether to clear the input value when the modal closes */
+    shouldClearOnClose?: boolean;
+} & Pick<MenuItemBaseProps, 'subtitle' | 'description'> &
     TextProps;
 
 type TextPickerProps = {
@@ -30,7 +32,7 @@ type TextPickerProps = {
     placeholder?: string;
 
     /** Form Error description */
-    errorText?: MaybePhraseKey;
+    errorText?: string;
 
     /** Callback to call when the input changes */
     onInputChange?: (value: string | undefined) => void;
@@ -40,7 +42,7 @@ type TextPickerProps = {
 
     /** Whether to show the tooltip text */
     shouldShowTooltips?: boolean;
-} & Pick<MenuItemBaseProps, 'rightLabel' | 'description'> &
+} & Pick<MenuItemBaseProps, 'rightLabel' | 'subtitle' | 'description'> &
     TextProps;
 
 export type {TextSelectorModalProps, TextPickerProps};
diff --git a/src/components/ThreeDotsMenu/index.tsx b/src/components/ThreeDotsMenu/index.tsx
index f6b1f444a24b..da72135c6035 100644
--- a/src/components/ThreeDotsMenu/index.tsx
+++ b/src/components/ThreeDotsMenu/index.tsx
@@ -41,7 +41,7 @@ function ThreeDotsMenu({
     const theme = useTheme();
     const styles = useThemeStyles();
     const [isPopupMenuVisible, setPopupMenuVisible] = useState(false);
-    const buttonRef = useRef<HTMLDivElement | null>(null);
+    const buttonRef = useRef<View>(null);
     const {translate} = useLocalize();
     const isBehindModal = modal?.willAlertModalBecomeVisible && !modal?.isPopover && !shouldOverlay;
 
@@ -91,7 +91,7 @@ function ThreeDotsMenu({
                     >
                         <Icon
                             src={icon}
-                            fill={iconFill ?? theme.icon}
+                            fill={iconFill ?? isPopupMenuVisible ? theme.success : theme.icon}
                         />
                     </PressableWithoutFeedback>
                 </Tooltip>
@@ -106,6 +106,7 @@ function ThreeDotsMenu({
                 withoutOverlay={!shouldOverlay}
                 shouldSetModalVisibility={shouldSetModalVisibility}
                 anchorRef={buttonRef}
+                shouldEnableNewFocusManagement
             />
         </>
     );
diff --git a/src/components/ThumbnailImage.tsx b/src/components/ThumbnailImage.tsx
index ec55b0ce4446..cea528e4537c 100644
--- a/src/components/ThumbnailImage.tsx
+++ b/src/components/ThumbnailImage.tsx
@@ -2,6 +2,7 @@ import React, {useCallback, useEffect, useState} from 'react';
 import type {ImageSourcePropType, StyleProp, ViewStyle} from 'react-native';
 import {View} from 'react-native';
 import useNetwork from '@hooks/useNetwork';
+import useStyleUtils from '@hooks/useStyleUtils';
 import useTheme from '@hooks/useTheme';
 import useThemeStyles from '@hooks/useThemeStyles';
 import useThumbnailDimensions from '@hooks/useThumbnailDimensions';
@@ -22,6 +23,9 @@ type ThumbnailImageProps = {
     /** Source URL for the preview image */
     previewSourceURL: string | ImageSourcePropType;
 
+    /** alt text for the image */
+    altText?: string;
+
     /** Any additional styles to apply */
     style?: StyleProp<ViewStyle>;
 
@@ -40,6 +44,12 @@ type ThumbnailImageProps = {
     /** The size of the fallback icon */
     fallbackIconSize?: number;
 
+    /** The color of the fallback icon */
+    fallbackIconColor?: string;
+
+    /** The background color of fallback icon */
+    fallbackIconBackground?: string;
+
     /** Should the image be resized on load or just fit container */
     shouldDynamicallyResize?: boolean;
 
@@ -54,6 +64,7 @@ type UpdateImageSizeParams = {
 
 function ThumbnailImage({
     previewSourceURL,
+    altText,
     style,
     isAuthTokenRequired,
     imageWidth = 200,
@@ -61,6 +72,8 @@ function ThumbnailImage({
     shouldDynamicallyResize = true,
     fallbackIcon = Expensicons.Gallery,
     fallbackIconSize = variables.iconSizeSuperLarge,
+    fallbackIconColor,
+    fallbackIconBackground,
     objectPosition = CONST.IMAGE_OBJECT_POSITION.INITIAL,
 }: ThumbnailImageProps) {
     const styles = useThemeStyles();
@@ -70,6 +83,7 @@ function ThumbnailImage({
     const cachedDimensions = shouldDynamicallyResize && typeof previewSourceURL === 'string' ? thumbnailDimensionsCache.get(previewSourceURL) : null;
     const [imageDimensions, setImageDimensions] = useState({width: cachedDimensions?.width ?? imageWidth, height: cachedDimensions?.height ?? imageHeight});
     const {thumbnailDimensionsStyles} = useThumbnailDimensions(imageDimensions.width, imageDimensions.height);
+    const StyleUtils = useStyleUtils();
 
     useEffect(() => {
         setFailedToLoad(false);
@@ -100,15 +114,17 @@ function ThumbnailImage({
 
     const sizeStyles = shouldDynamicallyResize ? [thumbnailDimensionsStyles] : [styles.w100, styles.h100];
 
-    if (failedToLoad) {
+    if (failedToLoad || previewSourceURL === '') {
+        const fallbackColor = StyleUtils.getBackgroundColorStyle(fallbackIconBackground ?? theme.border);
+
         return (
-            <View style={[style, styles.overflowHidden, styles.hoveredComponentBG]}>
+            <View style={[style, styles.overflowHidden, fallbackColor]}>
                 <View style={[...sizeStyles, styles.alignItemsCenter, styles.justifyContentCenter]}>
                     <Icon
                         src={isOffline ? Expensicons.OfflineCloud : fallbackIcon}
                         height={fallbackIconSize}
                         width={fallbackIconSize}
-                        fill={theme.border}
+                        fill={fallbackIconColor ?? theme.border}
                     />
                 </View>
             </View>
@@ -120,6 +136,7 @@ function ThumbnailImage({
             <View style={[...sizeStyles, styles.alignItemsCenter, styles.justifyContentCenter]}>
                 <ImageWithSizeCalculation
                     url={previewSourceURL}
+                    altText={altText}
                     onMeasure={updateImageSize}
                     onLoadFailure={() => setFailedToLoad(true)}
                     isAuthTokenRequired={isAuthTokenRequired}
diff --git a/src/components/TimePicker/TimePicker.tsx b/src/components/TimePicker/TimePicker.tsx
index 6bfdddaeb212..cc1b6a161404 100644
--- a/src/components/TimePicker/TimePicker.tsx
+++ b/src/components/TimePicker/TimePicker.tsx
@@ -11,9 +11,9 @@ import Text from '@components/Text';
 import useAutoFocusInput from '@hooks/useAutoFocusInput';
 import useKeyboardShortcut from '@hooks/useKeyboardShortcut';
 import useLocalize from '@hooks/useLocalize';
+import useResponsiveLayout from '@hooks/useResponsiveLayout';
 import useStyleUtils from '@hooks/useStyleUtils';
 import useThemeStyles from '@hooks/useThemeStyles';
-import useWindowDimensions from '@hooks/useWindowDimensions';
 import DateUtils from '@libs/DateUtils';
 import * as DeviceCapabilities from '@libs/DeviceCapabilities';
 import CONST from '@src/CONST';
@@ -105,7 +105,7 @@ function clearSelectedValue(value: string, selection: {start: number; end: numbe
 
 function TimePicker({defaultValue = '', onSubmit, onInputChange = () => {}}: TimePickerProps, ref: ForwardedRef<MinuteHourRefs>) {
     const {numberFormat, translate} = useLocalize();
-    const {isExtraSmallScreenHeight} = useWindowDimensions();
+    const {isExtraSmallScreenHeight} = useResponsiveLayout();
     const styles = useThemeStyles();
     const StyleUtils = useStyleUtils();
     const value = DateUtils.extractTime12Hour(defaultValue);
@@ -135,15 +135,15 @@ function TimePicker({defaultValue = '', onSubmit, onInputChange = () => {}}: Tim
             const hour = parseInt(hourStr, 10);
             if (hour === 0) {
                 setError(true);
-                setErrorMessage('common.error.invalidTimeRange');
+                setErrorMessage(translate('common.error.invalidTimeRange'));
                 return false;
             }
             const isValid = DateUtils.isTimeAtLeastOneMinuteInFuture({timeString, dateTimeString: defaultValue});
             setError(!isValid);
-            setErrorMessage('common.error.invalidTimeShouldBeFuture');
+            setErrorMessage(translate('common.error.invalidTimeShouldBeFuture'));
             return isValid;
         },
-        [hours, minutes, amPmValue, defaultValue],
+        [hours, minutes, amPmValue, defaultValue, translate],
     );
 
     const resetHours = () => {
@@ -355,7 +355,7 @@ function TimePicker({defaultValue = '', onSubmit, onInputChange = () => {}}: Tim
                 handleMinutesChange(insertAtPosition(minutes, trimmedKey, selectionMinute.start, selectionMinute.end));
             }
         },
-        // eslint-disable-next-line react-hooks/exhaustive-deps
+        // eslint-disable-next-line react-compiler/react-compiler, react-hooks/exhaustive-deps
         [minutes, hours, selectionMinute, selectionHour],
     );
 
@@ -381,7 +381,7 @@ function TimePicker({defaultValue = '', onSubmit, onInputChange = () => {}}: Tim
                 focusHourInputOnLastCharacter();
             }
         },
-        // eslint-disable-next-line react-hooks/exhaustive-deps
+        // eslint-disable-next-line react-compiler/react-compiler, react-hooks/exhaustive-deps
         [selectionHour, selectionMinute],
     );
     const arrowRightCallback = useCallback(
@@ -394,7 +394,7 @@ function TimePicker({defaultValue = '', onSubmit, onInputChange = () => {}}: Tim
                 focusMinuteInputOnFirstCharacter();
             }
         },
-        // eslint-disable-next-line react-hooks/exhaustive-deps
+        // eslint-disable-next-line react-compiler/react-compiler, react-hooks/exhaustive-deps
         [selectionHour, selectionMinute],
     );
 
@@ -409,7 +409,7 @@ function TimePicker({defaultValue = '', onSubmit, onInputChange = () => {}}: Tim
             e.preventDefault();
             focusHourInputOnLastCharacter();
         },
-        // eslint-disable-next-line react-hooks/exhaustive-deps
+        // eslint-disable-next-line react-compiler/react-compiler, react-hooks/exhaustive-deps
         [selectionMinute.start, selectionMinute.end, focusHourInputOnLastCharacter],
     );
 
@@ -430,7 +430,7 @@ function TimePicker({defaultValue = '', onSubmit, onInputChange = () => {}}: Tim
 
     useEffect(() => {
         onInputChange(`${hours}:${minutes} ${amPmValue}`);
-        // eslint-disable-next-line react-hooks/exhaustive-deps
+        // eslint-disable-next-line react-compiler/react-compiler, react-hooks/exhaustive-deps
     }, [hours, minutes, amPmValue]);
 
     const handleSubmit = () => {
@@ -463,6 +463,7 @@ function TimePicker({defaultValue = '', onSubmit, onInputChange = () => {}}: Tim
                                 // eslint-disable-next-line no-param-reassign
                                 ref.current = {hourRef: textInputRef as TextInput | null, minuteRef: minuteInputRef.current};
                             }
+                            // eslint-disable-next-line react-compiler/react-compiler
                             hourInputRef.current = textInputRef as TextInput | null;
                         }}
                         onSelectionChange={(e) => {
diff --git a/src/components/Tooltip/BaseGenericTooltip/index.native.tsx b/src/components/Tooltip/BaseGenericTooltip/index.native.tsx
new file mode 100644
index 000000000000..e42f95874b42
--- /dev/null
+++ b/src/components/Tooltip/BaseGenericTooltip/index.native.tsx
@@ -0,0 +1,137 @@
+import {Portal} from '@gorhom/portal';
+import React, {useMemo, useRef, useState} from 'react';
+import {Animated, InteractionManager, View} from 'react-native';
+// eslint-disable-next-line no-restricted-imports
+import type {View as RNView} from 'react-native';
+import TransparentOverlay from '@components/AutoCompleteSuggestions/AutoCompleteSuggestionsPortal/TransparentOverlay/TransparentOverlay';
+import Text from '@components/Text';
+import useStyleUtils from '@hooks/useStyleUtils';
+import CONST from '@src/CONST';
+import type {BaseGenericTooltipProps} from './types';
+
+// Props will change frequently.
+// On every tooltip hover, we update the position in state which will result in re-rendering.
+// We also update the state on layout changes which will be triggered often.
+// There will be n number of tooltip components in the page.
+// It's good to memoize this one.
+function BaseGenericTooltip({
+    animation,
+    windowWidth,
+    xOffset,
+    yOffset,
+    targetWidth,
+    targetHeight,
+    shiftHorizontal = 0,
+    shiftVertical = 0,
+    text,
+    numberOfLines,
+    maxWidth = 0,
+    renderTooltipContent,
+    shouldForceRenderingBelow = false,
+    anchorAlignment = {
+        horizontal: CONST.MODAL.ANCHOR_ORIGIN_HORIZONTAL.CENTER,
+        vertical: CONST.MODAL.ANCHOR_ORIGIN_VERTICAL.BOTTOM,
+    },
+    wrapperStyle = {},
+    shouldUseOverlay = false,
+    onPressOverlay = () => {},
+}: BaseGenericTooltipProps) {
+    // The width of tooltip's inner content. Has to be undefined in the beginning
+    // as a width of 0 will cause the content to be rendered of a width of 0,
+    // which prevents us from measuring it correctly.
+    const [contentMeasuredWidth, setContentMeasuredWidth] = useState<number>();
+
+    // The height of tooltip's wrapper.
+    const [wrapperMeasuredHeight, setWrapperMeasuredHeight] = useState<number>();
+    const rootWrapper = useRef<RNView>(null);
+
+    const StyleUtils = useStyleUtils();
+
+    const {animationStyle, rootWrapperStyle, textStyle, pointerWrapperStyle, pointerStyle} = useMemo(
+        () =>
+            StyleUtils.getTooltipStyles({
+                tooltip: rootWrapper.current,
+                currentSize: animation,
+                windowWidth,
+                xOffset,
+                yOffset,
+                tooltipTargetWidth: targetWidth,
+                tooltipTargetHeight: targetHeight,
+                maxWidth,
+                tooltipContentWidth: contentMeasuredWidth,
+                tooltipWrapperHeight: wrapperMeasuredHeight,
+                manualShiftHorizontal: shiftHorizontal,
+                manualShiftVertical: shiftVertical,
+                shouldForceRenderingBelow,
+                anchorAlignment,
+                wrapperStyle,
+                shouldAddHorizontalPadding: false,
+            }),
+        [
+            StyleUtils,
+            animation,
+            windowWidth,
+            xOffset,
+            yOffset,
+            targetWidth,
+            targetHeight,
+            maxWidth,
+            contentMeasuredWidth,
+            wrapperMeasuredHeight,
+            shiftHorizontal,
+            shiftVertical,
+            shouldForceRenderingBelow,
+            anchorAlignment,
+            wrapperStyle,
+        ],
+    );
+
+    let content;
+    if (renderTooltipContent) {
+        content = <View>{renderTooltipContent()}</View>;
+    } else {
+        content = (
+            <Text
+                numberOfLines={numberOfLines}
+                style={textStyle}
+            >
+                <Text style={textStyle}>{text}</Text>
+            </Text>
+        );
+    }
+
+    return (
+        <Portal hostName={!shouldUseOverlay ? 'modal' : undefined}>
+            {shouldUseOverlay && <TransparentOverlay onPress={onPressOverlay} />}
+            <Animated.View
+                ref={rootWrapper}
+                style={[rootWrapperStyle, animationStyle]}
+                onLayout={(e) => {
+                    const {height} = e.nativeEvent.layout;
+                    if (height === wrapperMeasuredHeight) {
+                        return;
+                    }
+                    setWrapperMeasuredHeight(height);
+                    // When tooltip is used inside an animated view (e.g. popover), we need to wait for the animation to finish before measuring content.
+                    const target = e.target;
+                    setTimeout(() => {
+                        InteractionManager.runAfterInteractions(() => {
+                            target.measure((x, y, width) => {
+                                setContentMeasuredWidth(width);
+                            });
+                        });
+                    }, CONST.ANIMATED_TRANSITION);
+                }}
+            >
+                {content}
+                <View style={pointerWrapperStyle}>
+                    <View style={pointerStyle} />
+                </View>
+            </Animated.View>
+        </Portal>
+    );
+}
+
+BaseGenericTooltip.displayName = 'BaseGenericTooltip';
+
+export default React.memo(BaseGenericTooltip);
diff --git a/src/components/Tooltip/BaseGenericTooltip/index.tsx b/src/components/Tooltip/BaseGenericTooltip/index.tsx
new file mode 100644
index 000000000000..41f3e97c8087
--- /dev/null
+++ b/src/components/Tooltip/BaseGenericTooltip/index.tsx
@@ -0,0 +1,139 @@
+import React, {useLayoutEffect, useMemo, useRef, useState} from 'react';
+import ReactDOM from 'react-dom';
+import {Animated, View} from 'react-native';
+import TransparentOverlay from '@components/AutoCompleteSuggestions/AutoCompleteSuggestionsPortal/TransparentOverlay/TransparentOverlay';
+import Text from '@components/Text';
+import useStyleUtils from '@hooks/useStyleUtils';
+import CONST from '@src/CONST';
+import textRef from '@src/types/utils/textRef';
+import viewRef from '@src/types/utils/viewRef';
+import type {BaseGenericTooltipProps} from './types';
+
+// Props will change frequently.
+// On every tooltip hover, we update the position in state which will result in re-rendering.
+// We also update the state on layout changes which will be triggered often.
+// There will be n number of tooltip components in the page.
+// It's good to memoize this one.
+function BaseGenericTooltip({
+    animation,
+    windowWidth,
+    xOffset,
+    yOffset,
+    targetWidth,
+    targetHeight,
+    shiftHorizontal = 0,
+    shiftVertical = 0,
+    text,
+    numberOfLines,
+    maxWidth = 0,
+    renderTooltipContent,
+    shouldForceRenderingBelow = false,
+    wrapperStyle = {},
+    anchorAlignment = {
+        horizontal: CONST.MODAL.ANCHOR_ORIGIN_HORIZONTAL.CENTER,
+        vertical: CONST.MODAL.ANCHOR_ORIGIN_VERTICAL.BOTTOM,
+    },
+    shouldUseOverlay = false,
+    onPressOverlay = () => {},
+}: BaseGenericTooltipProps) {
+    // The width of tooltip's inner content. Has to be undefined in the beginning
+    // as a width of 0 will cause the content to be rendered of a width of 0,
+    // which prevents us from measuring it correctly.
+    const [contentMeasuredWidth, setContentMeasuredWidth] = useState<number>();
+    // The height of tooltip's wrapper.
+    const [wrapperMeasuredHeight, setWrapperMeasuredHeight] = useState<number>();
+    const contentRef = useRef<HTMLDivElement>(null);
+    const rootWrapper = useRef<HTMLDivElement>(null);
+
+    const StyleUtils = useStyleUtils();
+
+    useLayoutEffect(() => {
+        // Calculate the tooltip width and height before the browser repaints the screen to prevent flicker
+        // because of the late update of the width and the height from onLayout.
+        setContentMeasuredWidth(contentRef.current?.getBoundingClientRect().width);
+        setWrapperMeasuredHeight(rootWrapper.current?.getBoundingClientRect().height);
+    }, []);
+
+    const {animationStyle, rootWrapperStyle, textStyle, pointerWrapperStyle, pointerStyle} = useMemo(
+        () =>
+            StyleUtils.getTooltipStyles({
+                tooltip: rootWrapper.current,
+                currentSize: animation,
+                windowWidth,
+                xOffset,
+                yOffset,
+                tooltipTargetWidth: targetWidth,
+                tooltipTargetHeight: targetHeight,
+                maxWidth,
+                tooltipContentWidth: contentMeasuredWidth,
+                tooltipWrapperHeight: wrapperMeasuredHeight,
+                manualShiftHorizontal: shiftHorizontal,
+                manualShiftVertical: shiftVertical,
+                shouldForceRenderingBelow,
+                anchorAlignment,
+                wrapperStyle,
+            }),
+        [
+            StyleUtils,
+            animation,
+            windowWidth,
+            xOffset,
+            yOffset,
+            targetWidth,
+            targetHeight,
+            maxWidth,
+            contentMeasuredWidth,
+            wrapperMeasuredHeight,
+            shiftHorizontal,
+            shiftVertical,
+            shouldForceRenderingBelow,
+            anchorAlignment,
+            wrapperStyle,
+        ],
+    );
+
+    let content;
+    if (renderTooltipContent) {
+        content = <View ref={viewRef(contentRef)}>{renderTooltipContent()}</View>;
+    } else {
+        content = (
+            <Text
+                numberOfLines={numberOfLines}
+                style={textStyle}
+            >
+                <Text
+                    style={textStyle}
+                    ref={textRef(contentRef)}
+                >
+                    {text}
+                </Text>
+            </Text>
+        );
+    }
+
+    const body = document.querySelector('body');
+
+    if (!body) {
+        return null;
+    }
+
+    return ReactDOM.createPortal(
+        <>
+            {shouldUseOverlay && <TransparentOverlay onPress={onPressOverlay} />}
+            <Animated.View
+                ref={viewRef(rootWrapper)}
+                style={[rootWrapperStyle, animationStyle]}
+            >
+                {content}
+                <View style={pointerWrapperStyle}>
+                    <View style={pointerStyle} />
+                </View>
+            </Animated.View>
+        </>,
+        body,
+    );
+}
+
+BaseGenericTooltip.displayName = 'BaseGenericTooltip';
+
+export default React.memo(BaseGenericTooltip);
diff --git a/src/components/Tooltip/BaseGenericTooltip/types.ts b/src/components/Tooltip/BaseGenericTooltip/types.ts
new file mode 100644
index 000000000000..41e689618902
--- /dev/null
+++ b/src/components/Tooltip/BaseGenericTooltip/types.ts
@@ -0,0 +1,36 @@
+import type {Animated} from 'react-native';
+import type {SharedTooltipProps} from '@components/Tooltip/types';
+
+type BaseGenericTooltipProps = {
+    /** Window width */
+    windowWidth: number;
+
+    /** Tooltip Animation value */
+    animation: Animated.Value;
+
+    /** The distance between the left side of the wrapper view and the left side of the window */
+    xOffset: number;
+
+    /** The distance between the top of the wrapper view and the top of the window */
+    yOffset: number;
+
+    /** The width of the tooltip's target */
+    targetWidth: number;
+
+    /** The height of the tooltip's target */
+    targetHeight: number;
+
+    /** Any additional amount to manually adjust the horizontal position of the tooltip.
+    A positive value shifts the tooltip to the right, and a negative value shifts it to the left. */
+    shiftHorizontal?: number;
+
+    /** Any additional amount to manually adjust the vertical position of the tooltip.
+    A positive value shifts the tooltip down, and a negative value shifts it up. */
+    shiftVertical?: number;
+} & Pick<
+    SharedTooltipProps,
+    'renderTooltipContent' | 'maxWidth' | 'numberOfLines' | 'text' | 'shouldForceRenderingBelow' | 'wrapperStyle' | 'anchorAlignment' | 'shouldUseOverlay' | 'onPressOverlay'
+>;
+
+// eslint-disable-next-line import/prefer-default-export
+export type {BaseGenericTooltipProps};
diff --git a/src/components/Tooltip/BaseTooltip/index.tsx b/src/components/Tooltip/BaseTooltip/index.tsx
index 5f6c38d19bff..df8d9c9c950d 100644
--- a/src/components/Tooltip/BaseTooltip/index.tsx
+++ b/src/components/Tooltip/BaseTooltip/index.tsx
@@ -1,27 +1,21 @@
 import {BoundsObserver} from '@react-ng/bounds-observer';
 import type {ForwardedRef} from 'react';
-import React, {forwardRef, memo, useCallback, useEffect, useRef, useState} from 'react';
-import {Animated} from 'react-native';
+import React, {forwardRef, memo, useCallback, useRef} from 'react';
+import type {LayoutRectangle} from 'react-native';
 import Hoverable from '@components/Hoverable';
-import TooltipRenderedOnPageBody from '@components/Tooltip/TooltipRenderedOnPageBody';
-import TooltipSense from '@components/Tooltip/TooltipSense';
+import GenericTooltip from '@components/Tooltip/GenericTooltip';
 import type TooltipProps from '@components/Tooltip/types';
-import useLocalize from '@hooks/useLocalize';
-import usePrevious from '@hooks/usePrevious';
-import useWindowDimensions from '@hooks/useWindowDimensions';
 import * as DeviceCapabilities from '@libs/DeviceCapabilities';
-import StringUtils from '@libs/StringUtils';
-import variables from '@styles/variables';
-import CONST from '@src/CONST';
-import callOrReturn from '@src/types/utils/callOrReturn';
+
+type MouseEvents = {
+    onMouseEnter: (e: MouseEvent) => void | undefined;
+};
 
 const hasHoverSupport = DeviceCapabilities.hasHoverSupport();
 
 /**
  * A component used to wrap an element intended for displaying a tooltip. The term "tooltip's target" refers to the
  * wrapped element, which, upon hover, triggers the tooltip to be shown.
- * @param {propTypes} props
- * @returns {ReactNodeLike}
  */
 
 /**
@@ -30,10 +24,10 @@ const hasHoverSupport = DeviceCapabilities.hasHoverSupport();
  * so we need to find the correct part (the one that the user is hovering
  * over) and show the tooltip there.
  *
- * @param {Element} target The DOM element being hovered over.
- * @param {number} clientX The X position from the MouseEvent.
- * @param {number} clientY The Y position from the MouseEvent.
- * @return {DOMRect} The chosen bounding box.
+ * @param target The DOM element being hovered over.
+ * @param clientX The X position from the MouseEvent.
+ * @param clientY The Y position from the MouseEvent.
+ * @return The chosen bounding box.
  */
 
 function chooseBoundingBox(target: HTMLElement, clientX: number, clientY: number): DOMRect {
@@ -56,42 +50,7 @@ function chooseBoundingBox(target: HTMLElement, clientX: number, clientY: number
     return target.getBoundingClientRect();
 }
 
-function Tooltip(
-    {
-        children,
-        numberOfLines = CONST.TOOLTIP_MAX_LINES,
-        maxWidth = variables.sideBarWidth,
-        text = '',
-        renderTooltipContent,
-        renderTooltipContentKey = [],
-        shouldHandleScroll = false,
-        shiftHorizontal = 0,
-        shiftVertical = 0,
-        shouldForceRenderingBelow = false,
-    }: TooltipProps,
-    ref: ForwardedRef<BoundsObserver>,
-) {
-    const {preferredLocale} = useLocalize();
-    const {windowWidth} = useWindowDimensions();
-
-    // Is tooltip already rendered on the page's body? happens once.
-    const [isRendered, setIsRendered] = useState(false);
-    // Is the tooltip currently visible?
-    const [isVisible, setIsVisible] = useState(false);
-    // The distance between the left side of the wrapper view and the left side of the window
-    const [xOffset, setXOffset] = useState(0);
-    // The distance between the top of the wrapper view and the top of the window
-    const [yOffset, setYOffset] = useState(0);
-    // The width and height of the wrapper view
-    const [wrapperWidth, setWrapperWidth] = useState(0);
-    const [wrapperHeight, setWrapperHeight] = useState(0);
-
-    // Whether the tooltip is first tooltip to activate the TooltipSense
-    const isTooltipSenseInitiator = useRef(false);
-    const animation = useRef(new Animated.Value(0));
-    const isAnimationCanceled = useRef(false);
-    const prevText = usePrevious(text);
-
+function Tooltip({children, shouldHandleScroll = false, ...props}: TooltipProps, ref: ForwardedRef<BoundsObserver>) {
     const target = useRef<HTMLElement | null>(null);
     const initialMousePosition = useRef({x: 0, y: 0});
 
@@ -104,134 +63,47 @@ function Tooltip(
     }, []);
 
     /**
-     * Display the tooltip in an animation.
-     */
-    const showTooltip = useCallback(() => {
-        setIsRendered(true);
-        setIsVisible(true);
-
-        animation.current.stopAnimation();
-
-        // When TooltipSense is active, immediately show the tooltip
-        if (TooltipSense.isActive()) {
-            animation.current.setValue(1);
-        } else {
-            isTooltipSenseInitiator.current = true;
-            Animated.timing(animation.current, {
-                toValue: 1,
-                duration: 140,
-                delay: 500,
-                useNativeDriver: false,
-            }).start(({finished}) => {
-                isAnimationCanceled.current = !finished;
-            });
-        }
-        TooltipSense.activate();
-    }, []);
-
-    // eslint-disable-next-line rulesdir/prefer-early-return
-    useEffect(() => {
-        // if the tooltip text changed before the initial animation was finished, then the tooltip won't be shown
-        // we need to show the tooltip again
-        if (isVisible && isAnimationCanceled.current && text && prevText !== text) {
-            isAnimationCanceled.current = false;
-            showTooltip();
-        }
-    }, [isVisible, text, prevText, showTooltip]);
-
-    /**
-     * Update the tooltip bounding rectangle
+     * Get the tooltip bounding rectangle
      */
-    const updateBounds = (bounds: DOMRect) => {
-        if (bounds.width === 0) {
-            setIsRendered(false);
-        }
+    const getBounds = (bounds: DOMRect): LayoutRectangle => {
         if (!target.current) {
-            return;
+            return bounds;
         }
         // Choose a bounding box for the tooltip to target.
         // In the case when the target is a link that has wrapped onto
         // multiple lines, we want to show the tooltip over the part
         // of the link that the user is hovering over.
-        const betterBounds = chooseBoundingBox(target.current, initialMousePosition.current.x, initialMousePosition.current.y);
-        if (!betterBounds) {
-            return;
-        }
-        setWrapperWidth(betterBounds.width);
-        setWrapperHeight(betterBounds.height);
-        setXOffset(betterBounds.x);
-        setYOffset(betterBounds.y);
+        return chooseBoundingBox(target.current, initialMousePosition.current.x, initialMousePosition.current.y);
     };
 
-    /**
-     * Hide the tooltip in an animation.
-     */
-    const hideTooltip = useCallback(() => {
-        animation.current.stopAnimation();
-
-        if (TooltipSense.isActive() && !isTooltipSenseInitiator.current) {
-            animation.current.setValue(0);
-        } else {
-            // Hide the first tooltip which initiated the TooltipSense with animation
-            isTooltipSenseInitiator.current = false;
-            Animated.timing(animation.current, {
-                toValue: 0,
-                duration: 140,
-                useNativeDriver: false,
-            }).start();
-        }
-
-        TooltipSense.deactivate();
-
-        setIsVisible(false);
-    }, []);
-
     const updateTargetPositionOnMouseEnter = useCallback(
         (e: MouseEvent) => {
             updateTargetAndMousePosition(e);
             if (React.isValidElement(children)) {
-                children.props.onMouseEnter?.(e);
+                const onMouseEnter = (children.props as MouseEvents).onMouseEnter;
+                onMouseEnter?.(e);
             }
         },
         [children, updateTargetAndMousePosition],
     );
 
-    // Skip the tooltip and return the children if the text is empty,
-    // we don't have a render function or the device does not support hovering
-    if ((StringUtils.isEmptyString(text) && renderTooltipContent == null) || !hasHoverSupport) {
+    // Skip the tooltip and return the children if the device does not support hovering
+    if (!hasHoverSupport) {
         return children;
     }
 
     return (
-        <>
-            {isRendered && (
-                <TooltipRenderedOnPageBody
-                    animation={animation.current}
-                    windowWidth={windowWidth}
-                    xOffset={xOffset}
-                    yOffset={yOffset}
-                    targetWidth={wrapperWidth}
-                    targetHeight={wrapperHeight}
-                    shiftHorizontal={callOrReturn(shiftHorizontal)}
-                    shiftVertical={callOrReturn(shiftVertical)}
-                    text={text}
-                    maxWidth={maxWidth}
-                    numberOfLines={numberOfLines}
-                    renderTooltipContent={renderTooltipContent}
-                    // We pass a key, so whenever the content changes this component will completely remount with a fresh state.
-                    // This prevents flickering/moving while remaining performant.
-                    key={[text, ...renderTooltipContentKey, preferredLocale].join('-')}
-                    shouldForceRenderingBelow={shouldForceRenderingBelow}
-                />
-            )}
-
-            {
+        // eslint-disable-next-line react/jsx-props-no-spreading
+        <GenericTooltip {...props}>
+            {({isVisible, showTooltip, hideTooltip, updateTargetBounds}) =>
                 // Checks if valid element so we can wrap the BoundsObserver around it
                 // If not, we just return the primitive children
                 React.isValidElement(children) ? (
                     <BoundsObserver
                         enabled={isVisible}
-                        onBoundsChange={updateBounds}
+                        onBoundsChange={(bounds) => {
+                            updateTargetBounds(getBounds(bounds));
+                        }}
                         ref={ref}
                     >
                         <Hoverable
@@ -248,7 +120,7 @@ function Tooltip(
                     children
                 )
             }
-        </>
+        </GenericTooltip>
     );
 }
 
diff --git a/src/components/Tooltip/EducationalTooltip/BaseEducationalTooltip.tsx b/src/components/Tooltip/EducationalTooltip/BaseEducationalTooltip.tsx
new file mode 100644
index 000000000000..9ce1dd813825
--- /dev/null
+++ b/src/components/Tooltip/EducationalTooltip/BaseEducationalTooltip.tsx
@@ -0,0 +1,76 @@
+import React, {memo, useEffect, useRef} from 'react';
+import {InteractionManager} from 'react-native';
+import type {LayoutRectangle, NativeSyntheticEvent} from 'react-native';
+import GenericTooltip from '@components/Tooltip/GenericTooltip';
+import type {EducationalTooltipProps} from '@components/Tooltip/types';
+import CONST from '@src/CONST';
+
+type LayoutChangeEventWithTarget = NativeSyntheticEvent<{layout: LayoutRectangle; target: HTMLElement}>;
+
+/**
+ * A component used to wrap an element intended for displaying a tooltip.
+ * This tooltip would show immediately without user's interaction and hide after 5 seconds.
+ */
+function BaseEducationalTooltip({children, shouldAutoDismiss = false, ...props}: EducationalTooltipProps) {
+    const hideTooltipRef = useRef<() => void>();
+
+    useEffect(
+        () => () => {
+            if (!hideTooltipRef.current) {
+                return;
+            }
+
+            hideTooltipRef.current();
+        },
+        [],
+    );
+
+    // Automatically hide tooltip after 5 seconds
+    useEffect(() => {
+        if (!hideTooltipRef.current || !shouldAutoDismiss) {
+            return;
+        }
+
+        const timerID = setTimeout(hideTooltipRef.current, 5000);
+        return () => {
+            clearTimeout(timerID);
+        };
+    }, [shouldAutoDismiss]);
+
+    return (
+        <GenericTooltip
+            shouldForceAnimate
+            // eslint-disable-next-line react/jsx-props-no-spreading
+            {...props}
+        >
+            {({showTooltip, hideTooltip, updateTargetBounds}) => {
+                // eslint-disable-next-line react-compiler/react-compiler
+                hideTooltipRef.current = hideTooltip;
+                return React.cloneElement(children as React.ReactElement, {
+                    onLayout: (e: LayoutChangeEventWithTarget) => {
+                        // e.target is specific to native, use e.nativeEvent.target on web instead
+                        const target = e.target || e.nativeEvent.target;
+                        // When tooltip is used inside an animated view (e.g. popover), we need to wait for the animation to finish before measuring content.
+                        setTimeout(() => {
+                            InteractionManager.runAfterInteractions(() => {
+                                target?.measure((fx, fy, width, height, px, py) => {
+                                    updateTargetBounds({
+                                        height,
+                                        width,
+                                        x: px,
+                                        y: py,
+                                    });
+                                    showTooltip();
+                                });
+                            });
+                        }, CONST.ANIMATED_TRANSITION);
+                    },
+                });
+            }}
+        </GenericTooltip>
+    );
+}
+
+BaseEducationalTooltip.displayName = 'BaseEducationalTooltip';
+
+export default memo(BaseEducationalTooltip);
diff --git a/src/components/Tooltip/EducationalTooltip/index.tsx b/src/components/Tooltip/EducationalTooltip/index.tsx
new file mode 100644
index 000000000000..d43ff64d7e8e
--- /dev/null
+++ b/src/components/Tooltip/EducationalTooltip/index.tsx
@@ -0,0 +1,22 @@
+import React from 'react';
+import type {TooltipExtendedProps} from '@components/Tooltip/types';
+import BaseEducationalTooltip from './BaseEducationalTooltip';
+
+function EducationalTooltip({shouldRender = true, children, ...props}: TooltipExtendedProps) {
+    if (!shouldRender) {
+        return children;
+    }
+
+    return (
+        <BaseEducationalTooltip
+            // eslint-disable-next-line react/jsx-props-no-spreading
+            {...props}
+        >
+            {children}
+        </BaseEducationalTooltip>
+    );
+}
+
+EducationalTooltip.displayName = 'EducationalTooltip';
+
+export default EducationalTooltip;
diff --git a/src/components/Tooltip/GenericTooltip.tsx b/src/components/Tooltip/GenericTooltip.tsx
new file mode 100644
index 000000000000..c41bc5650f1d
--- /dev/null
+++ b/src/components/Tooltip/GenericTooltip.tsx
@@ -0,0 +1,197 @@
+import React, {memo, useCallback, useEffect, useImperativeHandle, useRef, useState} from 'react';
+import type {LayoutRectangle} from 'react-native';
+import {Animated} from 'react-native';
+import useLocalize from '@hooks/useLocalize';
+import usePrevious from '@hooks/usePrevious';
+import useWindowDimensions from '@hooks/useWindowDimensions';
+import Log from '@libs/Log';
+import StringUtils from '@libs/StringUtils';
+import TooltipRefManager from '@libs/TooltipRefManager';
+import variables from '@styles/variables';
+import CONST from '@src/CONST';
+import callOrReturn from '@src/types/utils/callOrReturn';
+import BaseGenericTooltip from './BaseGenericTooltip';
+import TooltipSense from './TooltipSense';
+import type {GenericTooltipProps} from './types';
+
+/**
+ * The generic tooltip implementation, exposing the tooltip's state
+ * while leaving the tooltip's target bounds computation to its parent.
+ */
+function GenericTooltip({
+    children,
+    numberOfLines = CONST.TOOLTIP_MAX_LINES,
+    maxWidth = variables.sideBarWidth,
+    text = '',
+    renderTooltipContent,
+    renderTooltipContentKey = [],
+    shiftHorizontal = 0,
+    shiftVertical = 0,
+    shouldForceRenderingBelow = false,
+    wrapperStyle = {},
+    anchorAlignment = {
+        horizontal: CONST.MODAL.ANCHOR_ORIGIN_HORIZONTAL.CENTER,
+        vertical: CONST.MODAL.ANCHOR_ORIGIN_VERTICAL.BOTTOM,
+    },
+    shouldForceAnimate = false,
+    shouldUseOverlay: shouldUseOverlayProp = false,
+    onPressOverlay: onPressOverlayProp = () => {},
+}: GenericTooltipProps) {
+    const {preferredLocale} = useLocalize();
+    const {windowWidth} = useWindowDimensions();
+
+    // Is tooltip already rendered on the page's body? happens once.
+    const [isRendered, setIsRendered] = useState(false);
+
+    // Is the tooltip currently visible?
+    const [isVisible, setIsVisible] = useState(false);
+
+    // The distance between the left side of the wrapper view and the left side of the window
+    const [xOffset, setXOffset] = useState(0);
+
+    // The distance between the top of the wrapper view and the top of the window
+    const [yOffset, setYOffset] = useState(0);
+
+    // The width and height of the wrapper view
+    const [wrapperWidth, setWrapperWidth] = useState(0);
+    const [wrapperHeight, setWrapperHeight] = useState(0);
+
+    // Transparent overlay should disappear once user taps it
+    const [shouldUseOverlay, setShouldUseOverlay] = useState(shouldUseOverlayProp);
+
+    // Whether the tooltip is first tooltip to activate the TooltipSense
+    const isTooltipSenseInitiator = useRef(false);
+    const animation = useRef(new Animated.Value(0));
+    const isAnimationCanceled = useRef(false);
+    const prevText = usePrevious(text);
+
+    useEffect(() => {
+        if (!renderTooltipContent || !text) {
+            return;
+        }
+        Log.warn('Developer error: Cannot use both text and renderTooltipContent props at the same time in <TooltipRenderedOnPageBody />!');
+    }, [text, renderTooltipContent]);
+
+    /**
+     * Display the tooltip in an animation.
+     */
+    const showTooltip = useCallback(() => {
+        setIsRendered(true);
+        setIsVisible(true);
+
+        animation.current.stopAnimation();
+
+        // When TooltipSense is active, immediately show the tooltip
+        if (TooltipSense.isActive() && !shouldForceAnimate) {
+            animation.current.setValue(1);
+        } else {
+            isTooltipSenseInitiator.current = true;
+            Animated.timing(animation.current, {
+                toValue: 1,
+                duration: 140,
+                delay: 500,
+                useNativeDriver: false,
+            }).start(({finished}) => {
+                isAnimationCanceled.current = !finished;
+            });
+        }
+        TooltipSense.activate();
+    }, [shouldForceAnimate]);
+
+    // eslint-disable-next-line rulesdir/prefer-early-return
+    useEffect(() => {
+        // if the tooltip text changed before the initial animation was finished, then the tooltip won't be shown
+        // we need to show the tooltip again
+        if (isVisible && isAnimationCanceled.current && text && prevText !== text) {
+            isAnimationCanceled.current = false;
+            showTooltip();
+        }
+    }, [isVisible, text, prevText, showTooltip]);
+
+    /**
+     * Update the tooltip's target bounding rectangle
+     */
+    const updateTargetBounds = (bounds: LayoutRectangle) => {
+        if (bounds.width === 0) {
+            setIsRendered(false);
+        }
+        setWrapperWidth(bounds.width);
+        setWrapperHeight(bounds.height);
+        setXOffset(bounds.x);
+        setYOffset(bounds.y);
+    };
+
+    /**
+     * Hide the tooltip in an animation.
+     */
+    const hideTooltip = useCallback(() => {
+        animation.current.stopAnimation();
+
+        if (TooltipSense.isActive() && !isTooltipSenseInitiator.current) {
+            animation.current.setValue(0);
+        } else {
+            // Hide the first tooltip which initiated the TooltipSense with animation
+            isTooltipSenseInitiator.current = false;
+            Animated.timing(animation.current, {
+                toValue: 0,
+                duration: 140,
+                useNativeDriver: false,
+            }).start();
+        }
+
+        TooltipSense.deactivate();
+
+        setIsVisible(false);
+    }, []);
+
+    const onPressOverlay = useCallback(() => {
+        if (!shouldUseOverlay) {
+            return;
+        }
+        setShouldUseOverlay(false);
+        hideTooltip();
+        onPressOverlayProp();
+    }, [shouldUseOverlay, onPressOverlayProp, hideTooltip]);
+
+    useImperativeHandle(TooltipRefManager.ref, () => ({hideTooltip}), [hideTooltip]);
+
+    // Skip the tooltip and return the children if the text is empty, we don't have a render function.
+    if (StringUtils.isEmptyString(text) && renderTooltipContent == null) {
+        return children({isVisible, showTooltip, hideTooltip, updateTargetBounds});
+    }
+
+    return (
+        <>
+            {isRendered && (
+                <BaseGenericTooltip
+                    animation={animation.current}
+                    windowWidth={windowWidth}
+                    xOffset={xOffset}
+                    yOffset={yOffset}
+                    targetWidth={wrapperWidth}
+                    targetHeight={wrapperHeight}
+                    shiftHorizontal={callOrReturn(shiftHorizontal)}
+                    shiftVertical={callOrReturn(shiftVertical)}
+                    text={text}
+                    maxWidth={maxWidth}
+                    numberOfLines={numberOfLines}
+                    renderTooltipContent={renderTooltipContent}
+                    // We pass a key, so whenever the content changes this component will completely remount with a fresh state.
+                    // This prevents flickering/moving while remaining performant.
+                    key={[text, ...renderTooltipContentKey, preferredLocale].join('-')}
+                    shouldForceRenderingBelow={shouldForceRenderingBelow}
+                    wrapperStyle={wrapperStyle}
+                    anchorAlignment={anchorAlignment}
+                    shouldUseOverlay={shouldUseOverlay}
+                    onPressOverlay={onPressOverlay}
+                />
+            )}
+
+            {children({isVisible, showTooltip, hideTooltip, updateTargetBounds})}
+        </>
+    );
+}
+
+GenericTooltip.displayName = 'GenericTooltip';
+
+export default memo(GenericTooltip);
diff --git a/src/components/Tooltip/PopoverAnchorTooltip.tsx b/src/components/Tooltip/PopoverAnchorTooltip.tsx
index 792977ff7c43..5eb1f45dafcc 100644
--- a/src/components/Tooltip/PopoverAnchorTooltip.tsx
+++ b/src/components/Tooltip/PopoverAnchorTooltip.tsx
@@ -10,8 +10,14 @@ function PopoverAnchorTooltip({shouldRender = true, children, ...props}: Tooltip
 
     const isPopoverRelatedToTooltipOpen = useMemo(() => {
         // eslint-disable-next-line @typescript-eslint/dot-notation
-        const tooltipNode = tooltipRef.current?.['_childNode'] ?? null;
-        if (isOpen && popover?.anchorRef?.current && tooltipNode && (tooltipNode.contains(popover.anchorRef.current) || tooltipNode === popover.anchorRef.current)) {
+        const tooltipNode = (tooltipRef.current?.['_childNode'] as Node | undefined) ?? null;
+
+        if (
+            isOpen &&
+            popover?.anchorRef?.current &&
+            tooltipNode &&
+            ((popover.anchorRef.current instanceof Node && tooltipNode.contains(popover.anchorRef.current)) || tooltipNode === popover.anchorRef.current)
+        ) {
             return true;
         }
 
diff --git a/src/components/Tooltip/TooltipRenderedOnPageBody.tsx b/src/components/Tooltip/TooltipRenderedOnPageBody.tsx
deleted file mode 100644
index 0e97c2463532..000000000000
--- a/src/components/Tooltip/TooltipRenderedOnPageBody.tsx
+++ /dev/null
@@ -1,159 +0,0 @@
-import React, {useEffect, useLayoutEffect, useMemo, useRef, useState} from 'react';
-import ReactDOM from 'react-dom';
-import {Animated, View} from 'react-native';
-import Text from '@components/Text';
-import useStyleUtils from '@hooks/useStyleUtils';
-import Log from '@libs/Log';
-import textRef from '@src/types/utils/textRef';
-import viewRef from '@src/types/utils/viewRef';
-import type TooltipProps from './types';
-
-type TooltipRenderedOnPageBodyProps = {
-    /** Window width */
-    windowWidth: number;
-
-    /** Tooltip Animation value */
-    animation: Animated.Value;
-
-    /** The distance between the left side of the wrapper view and the left side of the window */
-    xOffset: number;
-
-    /** The distance between the top of the wrapper view and the top of the window */
-    yOffset: number;
-
-    /** The width of the tooltip's target */
-    targetWidth: number;
-
-    /** The height of the tooltip's target */
-    targetHeight: number;
-
-    /** Any additional amount to manually adjust the horizontal position of the tooltip.
-    A positive value shifts the tooltip to the right, and a negative value shifts it to the left. */
-    shiftHorizontal?: number;
-
-    /** Any additional amount to manually adjust the vertical position of the tooltip.
-    A positive value shifts the tooltip down, and a negative value shifts it up. */
-    shiftVertical?: number;
-} & Pick<TooltipProps, 'renderTooltipContent' | 'maxWidth' | 'numberOfLines' | 'text' | 'shouldForceRenderingBelow'>;
-
-// Props will change frequently.
-// On every tooltip hover, we update the position in state which will result in re-rendering.
-// We also update the state on layout changes which will be triggered often.
-// There will be n number of tooltip components in the page.
-// It's good to memoize this one.
-function TooltipRenderedOnPageBody({
-    animation,
-    windowWidth,
-    xOffset,
-    yOffset,
-    targetWidth,
-    targetHeight,
-    shiftHorizontal = 0,
-    shiftVertical = 0,
-    text,
-    numberOfLines,
-    maxWidth = 0,
-    renderTooltipContent,
-    shouldForceRenderingBelow = false,
-}: TooltipRenderedOnPageBodyProps) {
-    // The width of tooltip's inner content. Has to be undefined in the beginning
-    // as a width of 0 will cause the content to be rendered of a width of 0,
-    // which prevents us from measuring it correctly.
-    const [contentMeasuredWidth, setContentMeasuredWidth] = useState<number>();
-    // The height of tooltip's wrapper.
-    const [wrapperMeasuredHeight, setWrapperMeasuredHeight] = useState<number>();
-    const contentRef = useRef<HTMLDivElement>(null);
-    const rootWrapper = useRef<HTMLDivElement>(null);
-
-    const StyleUtils = useStyleUtils();
-
-    useEffect(() => {
-        if (!renderTooltipContent || !text) {
-            return;
-        }
-        Log.warn('Developer error: Cannot use both text and renderTooltipContent props at the same time in <TooltipRenderedOnPageBody />!');
-    }, [text, renderTooltipContent]);
-
-    useLayoutEffect(() => {
-        // Calculate the tooltip width and height before the browser repaints the screen to prevent flicker
-        // because of the late update of the width and the height from onLayout.
-        setContentMeasuredWidth(contentRef.current?.getBoundingClientRect().width);
-        setWrapperMeasuredHeight(rootWrapper.current?.getBoundingClientRect().height);
-    }, []);
-
-    const {animationStyle, rootWrapperStyle, textStyle, pointerWrapperStyle, pointerStyle} = useMemo(
-        () =>
-            StyleUtils.getTooltipStyles({
-                tooltip: rootWrapper.current,
-                currentSize: animation,
-                windowWidth,
-                xOffset,
-                yOffset,
-                tooltipTargetWidth: targetWidth,
-                tooltipTargetHeight: targetHeight,
-                maxWidth,
-                tooltipContentWidth: contentMeasuredWidth,
-                tooltipWrapperHeight: wrapperMeasuredHeight,
-                manualShiftHorizontal: shiftHorizontal,
-                manualShiftVertical: shiftVertical,
-                shouldForceRenderingBelow,
-            }),
-        [
-            StyleUtils,
-            animation,
-            windowWidth,
-            xOffset,
-            yOffset,
-            targetWidth,
-            targetHeight,
-            maxWidth,
-            contentMeasuredWidth,
-            wrapperMeasuredHeight,
-            shiftHorizontal,
-            shiftVertical,
-            shouldForceRenderingBelow,
-        ],
-    );
-
-    let content;
-    if (renderTooltipContent) {
-        content = <View ref={viewRef(contentRef)}>{renderTooltipContent()}</View>;
-    } else {
-        content = (
-            <Text
-                numberOfLines={numberOfLines}
-                style={textStyle}
-            >
-                <Text
-                    style={textStyle}
-                    ref={textRef(contentRef)}
-                >
-                    {text}
-                </Text>
-            </Text>
-        );
-    }
-
-    const body = document.querySelector('body');
-
-    if (!body) {
-        return null;
-    }
-
-    return ReactDOM.createPortal(
-        <Animated.View
-            ref={viewRef(rootWrapper)}
-            style={[rootWrapperStyle, animationStyle]}
-        >
-            {content}
-            <View style={pointerWrapperStyle}>
-                <View style={pointerStyle} />
-            </View>
-        </Animated.View>,
-        body,
-    );
-}
-
-TooltipRenderedOnPageBody.displayName = 'TooltipRenderedOnPageBody';
-
-export default React.memo(TooltipRenderedOnPageBody);
diff --git a/src/components/Tooltip/types.ts b/src/components/Tooltip/types.ts
index a949e98018b3..4165b960f322 100644
--- a/src/components/Tooltip/types.ts
+++ b/src/components/Tooltip/types.ts
@@ -1,7 +1,10 @@
 import type {ReactNode} from 'react';
+import type React from 'react';
+import type {LayoutRectangle, StyleProp, ViewStyle} from 'react-native';
+import type {TooltipAnchorAlignment} from '@src/types/utils/AnchorAlignment';
 import type ChildrenProps from '@src/types/utils/ChildrenProps';
 
-type TooltipProps = ChildrenProps & {
+type SharedTooltipProps = {
     /** The text to display in the tooltip. If text is ommitted, only children will be rendered. */
     text?: string;
 
@@ -25,16 +28,59 @@ type TooltipProps = ChildrenProps & {
     /** Unique key of renderTooltipContent to rerender the tooltip when one of the key changes */
     renderTooltipContentKey?: string[];
 
-    /** passes this down to Hoverable component to decide whether to handle the scroll behaviour to show hover once the scroll ends */
-    shouldHandleScroll?: boolean;
+    /** The anchor alignment of the tooltip */
+    anchorAlignment?: TooltipAnchorAlignment;
 
+    /** Whether to display tooltip below the wrapped component */
     shouldForceRenderingBelow?: boolean;
+
+    /** Additional styles for tooltip wrapper view */
+    wrapperStyle?: StyleProp<ViewStyle>;
+
+    /** Should render a fullscreen transparent overlay */
+    shouldUseOverlay?: boolean;
+
+    /** Callback to fire when the transparent overlay is pressed */
+    onPressOverlay?: () => void;
 };
 
-type TooltipExtendedProps = TooltipProps & {
+type GenericTooltipState = {
+    /** Is tooltip visible */
+    isVisible: boolean;
+
+    /** Show tooltip */
+    showTooltip: () => void;
+
+    /** Hide tooltip */
+    hideTooltip: () => void;
+
+    /** Update the tooltip's target bounding rectangle */
+    updateTargetBounds: (rect: LayoutRectangle) => void;
+};
+
+type GenericTooltipProps = SharedTooltipProps & {
+    children: React.FC<GenericTooltipState>;
+
+    /** Whether to ignore TooltipSense activity and always triger animation */
+    shouldForceAnimate?: boolean;
+};
+
+type TooltipProps = ChildrenProps &
+    SharedTooltipProps & {
+        /** passes this down to Hoverable component to decide whether to handle the scroll behaviour to show hover once the scroll ends */
+        shouldHandleScroll?: boolean;
+    };
+
+type EducationalTooltipProps = ChildrenProps &
+    SharedTooltipProps & {
+        /** Whether to automatically dismiss the tooltip after 5 seconds */
+        shouldAutoDismiss?: boolean;
+    };
+
+type TooltipExtendedProps = (EducationalTooltipProps | TooltipProps) & {
     /** Whether the actual Tooltip should be rendered. If false, it's just going to return the children */
     shouldRender?: boolean;
 };
 
 export default TooltipProps;
-export type {TooltipExtendedProps};
+export type {EducationalTooltipProps, GenericTooltipProps, SharedTooltipProps, TooltipExtendedProps};
diff --git a/src/components/UnitPicker.tsx b/src/components/UnitPicker.tsx
index a9202a348e4d..19ee25c98529 100644
--- a/src/components/UnitPicker.tsx
+++ b/src/components/UnitPicker.tsx
@@ -1,4 +1,4 @@
-import Str from 'expensify-common/lib/str';
+import {Str} from 'expensify-common';
 import React, {useMemo} from 'react';
 import useLocalize from '@hooks/useLocalize';
 import {getUnitTranslationKey} from '@libs/WorkspacesSettingsUtils';
@@ -15,7 +15,7 @@ type UnitItemType = {
 };
 
 type UnitPickerProps = {
-    defaultValue: Unit;
+    defaultValue?: Unit;
     onOptionSelected: (unit: UnitItemType) => void;
 };
 
diff --git a/src/components/UserDetailsTooltip/BaseUserDetailsTooltip/index.tsx b/src/components/UserDetailsTooltip/BaseUserDetailsTooltip/index.tsx
index 0f7316062027..c55edd9e6b15 100644
--- a/src/components/UserDetailsTooltip/BaseUserDetailsTooltip/index.tsx
+++ b/src/components/UserDetailsTooltip/BaseUserDetailsTooltip/index.tsx
@@ -1,4 +1,4 @@
-import Str from 'expensify-common/lib/str';
+import {Str} from 'expensify-common';
 import React, {useCallback} from 'react';
 import {View} from 'react-native';
 import {useOnyx} from 'react-native-onyx';
@@ -12,7 +12,6 @@ import useThemeStyles from '@hooks/useThemeStyles';
 import {isAnonymousUser} from '@libs/actions/Session';
 import * as LocalePhoneNumber from '@libs/LocalePhoneNumber';
 import * as ReportUtils from '@libs/ReportUtils';
-import * as UserUtils from '@libs/UserUtils';
 import CONST from '@src/CONST';
 import ONYXKEYS from '@src/ONYXKEYS';
 
@@ -32,7 +31,7 @@ function BaseUserDetailsTooltip({accountID, fallbackUserDetails, icon, delegateA
 
     // We replace the actor's email, name, and avatar with the Copilot manually for now. This will be improved upon when
     // the Copilot feature is implemented.
-    if (delegateAccountID) {
+    if (delegateAccountID && delegateAccountID > 0) {
         const delegateUserDetails = personalDetails?.[delegateAccountID];
         const delegateUserDisplayName = ReportUtils.getUserDetailTooltipText(delegateAccountID);
         userDisplayName = `${delegateUserDisplayName} (${translate('reportAction.asCopilot')} ${userDisplayName})`;
@@ -60,7 +59,8 @@ function BaseUserDetailsTooltip({accountID, fallbackUserDetails, icon, delegateA
                 <View style={styles.emptyAvatar}>
                     <Avatar
                         containerStyles={[styles.actionAvatar]}
-                        source={icon?.source ?? UserUtils.getAvatar(userAvatar, userAccountID)}
+                        source={icon?.source ?? userAvatar}
+                        avatarID={icon?.id ?? userAccountID}
                         type={icon?.type ?? CONST.ICON_TYPE_AVATAR}
                         name={icon?.name ?? userLogin}
                         fallbackIcon={icon?.fallbackIcon}
diff --git a/src/components/ValidateAccountMessage.tsx b/src/components/ValidateAccountMessage.tsx
new file mode 100644
index 000000000000..be43c2985961
--- /dev/null
+++ b/src/components/ValidateAccountMessage.tsx
@@ -0,0 +1,56 @@
+import React from 'react';
+import {View} from 'react-native';
+import {useOnyx} from 'react-native-onyx';
+import useLocalize from '@hooks/useLocalize';
+import useTheme from '@hooks/useTheme';
+import useThemeStyles from '@hooks/useThemeStyles';
+import Navigation from '@libs/Navigation/Navigation';
+import variables from '@styles/variables';
+import * as Session from '@userActions/Session';
+import ONYXKEYS from '@src/ONYXKEYS';
+import ROUTES from '@src/ROUTES';
+import Icon from './Icon';
+import * as Expensicons from './Icon/Expensicons';
+import Text from './Text';
+import TextLink from './TextLink';
+
+type ValidateAccountMessageProps = {backTo?: string | undefined};
+function ValidateAccountMessage({backTo}: ValidateAccountMessageProps) {
+    const theme = useTheme();
+    const styles = useThemeStyles();
+    const {translate} = useLocalize();
+    const [loginList] = useOnyx(ONYXKEYS.LOGIN_LIST);
+    const loginNames = Object.keys(loginList ?? {});
+
+    return (
+        <View style={[styles.flexRow, styles.alignItemsCenter, styles.m4]}>
+            <Icon
+                src={Expensicons.Exclamation}
+                fill={theme.danger}
+            />
+
+            <Text style={[styles.mutedTextLabel, styles.ml4, styles.flex1]}>
+                {translate('bankAccount.validateAccountError.phrase1')}
+                <TextLink
+                    fontSize={variables.fontSizeLabel}
+                    onPress={() => Session.signOutAndRedirectToSignIn()}
+                >
+                    {translate('bankAccount.validateAccountError.phrase2')}
+                </TextLink>
+                {translate('bankAccount.validateAccountError.phrase3')}
+                <TextLink
+                    fontSize={variables.fontSizeLabel}
+                    onPress={() => {
+                        const login = loginList?.[loginNames?.[0]] ?? {};
+                        Navigation.navigate(ROUTES.SETTINGS_CONTACT_METHOD_DETAILS.getRoute(login?.partnerUserID ?? loginNames?.[0], backTo));
+                    }}
+                >
+                    {translate('bankAccount.validateAccountError.phrase4')}
+                </TextLink>
+                .
+            </Text>
+        </View>
+    );
+}
+
+export default ValidateAccountMessage;
diff --git a/src/components/ValidateCode/ExpiredValidateCodeModal.tsx b/src/components/ValidateCode/ExpiredValidateCodeModal.tsx
index e99c481c044b..b390770d78d4 100644
--- a/src/components/ValidateCode/ExpiredValidateCodeModal.tsx
+++ b/src/components/ValidateCode/ExpiredValidateCodeModal.tsx
@@ -1,17 +1,23 @@
 import React from 'react';
 import {View} from 'react-native';
+import {useOnyx} from 'react-native-onyx';
 import Icon from '@components/Icon';
 import * as Expensicons from '@components/Icon/Expensicons';
 import * as Illustrations from '@components/Icon/Illustrations';
 import Text from '@components/Text';
+import TextLink from '@components/TextLink';
 import useLocalize from '@hooks/useLocalize';
 import useTheme from '@hooks/useTheme';
 import useThemeStyles from '@hooks/useThemeStyles';
+import Navigation from '@libs/Navigation/Navigation';
 import variables from '@styles/variables';
+import * as Session from '@userActions/Session';
+import ONYXKEYS from '@src/ONYXKEYS';
 
 function ExpiredValidateCodeModal() {
     const theme = useTheme();
     const styles = useThemeStyles();
+    const [credentials] = useOnyx(ONYXKEYS.CREDENTIALS);
     const {translate} = useLocalize();
     return (
         <View style={styles.deeplinkWrapperContainer}>
@@ -25,7 +31,22 @@ function ExpiredValidateCodeModal() {
                 </View>
                 <Text style={[styles.textHeadline, styles.textXXLarge, styles.textAlignCenter]}>{translate('validateCodeModal.expiredCodeTitle')}</Text>
                 <View style={[styles.mt2, styles.mb2]}>
-                    <Text style={styles.textAlignCenter}>{translate('validateCodeModal.expiredCodeDescription')}</Text>
+                    {credentials?.login ? (
+                        <Text style={styles.textAlignCenter}>
+                            {translate('validateCodeModal.expiredCodeDescription')}
+                            {translate('validateCodeModal.or')}{' '}
+                            <TextLink
+                                onPress={() => {
+                                    Session.beginSignIn(credentials?.login ?? '');
+                                    Navigation.setNavigationActionToMicrotaskQueue(Navigation.goBack);
+                                }}
+                            >
+                                {translate('validateCodeModal.requestOneHere')}
+                            </TextLink>
+                        </Text>
+                    ) : (
+                        <Text style={styles.textAlignCenter}>{translate('validateCodeModal.expiredCodeDescription')}.</Text>
+                    )}
                 </View>
             </View>
             <View style={styles.deeplinkWrapperFooter}>
diff --git a/src/components/ValidateCode/JustSignedInModal.tsx b/src/components/ValidateCode/JustSignedInModal.tsx
index 19e67b0c56fe..527493c778cb 100644
--- a/src/components/ValidateCode/JustSignedInModal.tsx
+++ b/src/components/ValidateCode/JustSignedInModal.tsx
@@ -2,7 +2,8 @@ import React from 'react';
 import {View} from 'react-native';
 import Icon from '@components/Icon';
 import * as Expensicons from '@components/Icon/Expensicons';
-import * as Illustrations from '@components/Icon/Illustrations';
+import Lottie from '@components/Lottie';
+import LottieAnimations from '@components/LottieAnimations';
 import Text from '@components/Text';
 import useLocalize from '@hooks/useLocalize';
 import useTheme from '@hooks/useTheme';
@@ -22,10 +23,12 @@ function JustSignedInModal({is2FARequired}: JustSignedInModalProps) {
         <View style={styles.deeplinkWrapperContainer}>
             <View style={styles.deeplinkWrapperMessage}>
                 <View style={styles.mb2}>
-                    <Icon
-                        width={variables.modalTopIconWidth}
-                        height={is2FARequired ? variables.modalTopIconHeight : variables.modalTopBigIconHeight}
-                        src={is2FARequired ? Illustrations.SafeBlue : Illustrations.Abracadabra}
+                    <Lottie
+                        source={is2FARequired ? LottieAnimations.Safe : LottieAnimations.Abracadabra}
+                        style={styles.justSignedInModalAnimation(is2FARequired)}
+                        webStyle={styles.justSignedInModalAnimation(is2FARequired)}
+                        autoPlay
+                        loop
                     />
                 </View>
                 <Text style={[styles.textHeadline, styles.textXXLarge, styles.textAlignCenter]}>
diff --git a/src/components/ValuePicker/index.tsx b/src/components/ValuePicker/index.tsx
index 4fb5a8b588b3..5b877e139af0 100644
--- a/src/components/ValuePicker/index.tsx
+++ b/src/components/ValuePicker/index.tsx
@@ -1,17 +1,15 @@
 import React, {forwardRef, useState} from 'react';
 import type {ForwardedRef} from 'react';
 import {View} from 'react-native';
-import FormHelpMessage from '@components/FormHelpMessage';
 import MenuItemWithTopDescription from '@components/MenuItemWithTopDescription';
 import useStyleUtils from '@hooks/useStyleUtils';
-import useThemeStyles from '@hooks/useThemeStyles';
 import Navigation from '@libs/Navigation/Navigation';
 import variables from '@styles/variables';
+import CONST from '@src/CONST';
 import type {ValuePickerItem, ValuePickerProps} from './types';
 import ValueSelectorModal from './ValueSelectorModal';
 
 function ValuePicker({value, label, items, placeholder = '', errorText = '', onInputChange, furtherDetails, shouldShowTooltips = true}: ValuePickerProps, forwardedRef: ForwardedRef<View>) {
-    const styles = useThemeStyles();
     const StyleUtils = useStyleUtils();
     const [isPickerVisible, setIsPickerVisible] = useState(false);
 
@@ -44,10 +42,9 @@ function ValuePicker({value, label, items, placeholder = '', errorText = '', onI
                 description={label}
                 onPress={showPickerModal}
                 furtherDetails={furtherDetails}
+                brickRoadIndicator={errorText ? CONST.BRICK_ROAD_INDICATOR_STATUS.ERROR : undefined}
+                errorText={errorText}
             />
-            <View style={styles.ml5}>
-                <FormHelpMessage message={errorText} />
-            </View>
             <ValueSelectorModal
                 isVisible={isPickerVisible}
                 label={label}
diff --git a/src/components/ValuePicker/types.ts b/src/components/ValuePicker/types.ts
index b9c2c89948d9..b57c9d32061a 100644
--- a/src/components/ValuePicker/types.ts
+++ b/src/components/ValuePicker/types.ts
@@ -1,5 +1,4 @@
 import type {ListItem} from '@components/SelectionList/types';
-import type {MaybePhraseKey} from '@libs/Localize';
 
 type ValuePickerListItem = ListItem & {
     value?: string;
@@ -51,7 +50,7 @@ type ValuePickerProps = {
     placeholder?: string;
 
     /** Form Error description */
-    errorText?: MaybePhraseKey;
+    errorText?: string;
 
     /** Callback to call when the input changes */
     onInputChange?: (value: string | undefined) => void;
diff --git a/src/components/VideoPlayer/BaseVideoPlayer.tsx b/src/components/VideoPlayer/BaseVideoPlayer.tsx
index c4cf08cb74ac..1fd0fa4f669a 100644
--- a/src/components/VideoPlayer/BaseVideoPlayer.tsx
+++ b/src/components/VideoPlayer/BaseVideoPlayer.tsx
@@ -1,15 +1,19 @@
 /* eslint-disable no-underscore-dangle */
 import type {AVPlaybackStatus, VideoFullscreenUpdateEvent} from 'expo-av';
 import {ResizeMode, Video, VideoFullscreenUpdate} from 'expo-av';
+import {debounce} from 'lodash';
 import type {MutableRefObject} from 'react';
-import React, {useCallback, useEffect, useLayoutEffect, useRef, useState} from 'react';
+import React, {useCallback, useEffect, useLayoutEffect, useMemo, useRef, useState} from 'react';
 import type {GestureResponderEvent} from 'react-native';
 import {View} from 'react-native';
+import {runOnJS, useAnimatedStyle, useSharedValue, withTiming} from 'react-native-reanimated';
+import AttachmentOfflineIndicator from '@components/AttachmentOfflineIndicator';
 import FullScreenLoadingIndicator from '@components/FullscreenLoadingIndicator';
 import Hoverable from '@components/Hoverable';
 import PressableWithoutFeedback from '@components/Pressable/PressableWithoutFeedback';
 import {useFullScreenContext} from '@components/VideoPlayerContexts/FullScreenContext';
 import {usePlaybackContext} from '@components/VideoPlayerContexts/PlaybackContext';
+import type {PlaybackSpeed} from '@components/VideoPlayerContexts/types';
 import {useVideoPopoverMenuContext} from '@components/VideoPlayerContexts/VideoPopoverMenuContext';
 import {useVolumeContext} from '@components/VideoPlayerContexts/VolumeContext';
 import VideoPopoverMenu from '@components/VideoPopoverMenu';
@@ -45,6 +49,7 @@ function BaseVideoPlayer({
     // user hovers the mouse over the carousel arrows, but this UI bug feels much less troublesome for now.
     // eslint-disable-next-line @typescript-eslint/no-unused-vars
     isVideoHovered = false,
+    isPreview,
 }: VideoPlayerProps) {
     const styles = useThemeStyles();
     const {
@@ -56,7 +61,7 @@ function BaseVideoPlayer({
         shareVideoPlayerElements,
         currentVideoPlayerRef,
         updateCurrentlyPlayingURL,
-        videoResumeTryNumber,
+        videoResumeTryNumberRef,
         setCurrentlyPlayingURL,
     } = usePlaybackContext();
     const {isFullScreenRef} = useFullScreenContext();
@@ -70,6 +75,11 @@ function BaseVideoPlayer({
     const [sourceURL] = useState(VideoUtils.addSkipTimeTagToURL(url.includes('blob:') || url.includes('file:///') ? url : addEncryptedAuthTokenToURL(url), 0.001));
     const [isPopoverVisible, setIsPopoverVisible] = useState(false);
     const [popoverAnchorPosition, setPopoverAnchorPosition] = useState({horizontal: 0, vertical: 0});
+    const [controlStatusState, setControlStatusState] = useState(controlsStatus);
+    const controlsOpacity = useSharedValue(1);
+    const controlsAnimatedStyle = useAnimatedStyle(() => ({
+        opacity: controlsOpacity.value,
+    }));
 
     const videoPlayerRef = useRef<VideoWithOnFullScreenUpdate | null>(null);
     const videoPlayerElementParentRef = useRef<View | HTMLDivElement | null>(null);
@@ -80,10 +90,12 @@ function BaseVideoPlayer({
     const isUploading = CONST.ATTACHMENT_LOCAL_URL_PREFIX.some((prefix) => url.startsWith(prefix));
     const videoStateRef = useRef<AVPlaybackStatus | null>(null);
     const {updateVolume} = useVolumeContext();
-    const {videoPopoverMenuPlayerRef} = useVideoPopoverMenuContext();
+    const {videoPopoverMenuPlayerRef, currentPlaybackSpeed, setCurrentPlaybackSpeed} = useVideoPopoverMenuContext();
+    const {source} = videoPopoverMenuPlayerRef.current?.props ?? {};
+    const shouldUseNewRate = typeof source === 'number' || !source || source.uri !== sourceURL;
 
     const togglePlayCurrentVideo = useCallback(() => {
-        videoResumeTryNumber.current = 0;
+        videoResumeTryNumberRef.current = 0;
         if (!isCurrentlyURLSet) {
             updateCurrentlyPlayingURL(url);
         } else if (isPlaying) {
@@ -91,11 +103,59 @@ function BaseVideoPlayer({
         } else {
             playVideo();
         }
-    }, [isCurrentlyURLSet, isPlaying, pauseVideo, playVideo, updateCurrentlyPlayingURL, url, videoResumeTryNumber]);
+    }, [isCurrentlyURLSet, isPlaying, pauseVideo, playVideo, updateCurrentlyPlayingURL, url, videoResumeTryNumberRef]);
+
+    const hideControl = useCallback(() => {
+        // eslint-disable-next-line react-compiler/react-compiler
+        controlsOpacity.value = withTiming(0, {duration: 500}, () => runOnJS(setControlStatusState)(CONST.VIDEO_PLAYER.CONTROLS_STATUS.HIDE));
+    }, [controlsOpacity]);
+    const debouncedHideControl = useMemo(() => debounce(hideControl, 1500), [hideControl]);
+
+    useEffect(() => {
+        if (canUseTouchScreen) {
+            return;
+        }
+        // If the device cannot use touch screen, always set the control status as 'show'.
+        // Then if user hover over the video, controls is shown.
+        setControlStatusState(CONST.VIDEO_PLAYER.CONTROLS_STATUS.SHOW);
+    }, [canUseTouchScreen]);
+
+    useEffect(() => {
+        // We only auto hide the control if the device can use touch screen.
+        if (!canUseTouchScreen) {
+            return;
+        }
+        if (controlStatusState !== CONST.VIDEO_PLAYER.CONTROLS_STATUS.SHOW) {
+            return;
+        }
+        if (!isPlaying || isPopoverVisible) {
+            debouncedHideControl.cancel();
+            return;
+        }
+
+        debouncedHideControl();
+    }, [isPlaying, debouncedHideControl, controlStatusState, isPopoverVisible, canUseTouchScreen]);
+
+    const toggleControl = useCallback(() => {
+        if (controlStatusState === CONST.VIDEO_PLAYER.CONTROLS_STATUS.SHOW) {
+            hideControl();
+            return;
+        }
+        setControlStatusState(CONST.VIDEO_PLAYER.CONTROLS_STATUS.SHOW);
+        controlsOpacity.value = 1;
+    }, [controlStatusState, controlsOpacity, hideControl]);
 
     const showPopoverMenu = (event?: GestureResponderEvent | KeyboardEvent) => {
-        setIsPopoverVisible(true);
         videoPopoverMenuPlayerRef.current = videoPlayerRef.current;
+        videoPlayerRef.current?.getStatusAsync().then((status) => {
+            if (!('rate' in status && status.rate)) {
+                return;
+            }
+            if (shouldUseNewRate) {
+                setCurrentPlaybackSpeed(status.rate as PlaybackSpeed);
+            }
+            setIsPopoverVisible(true);
+        });
         if (!event || !('nativeEvent' in event)) {
             return;
         }
@@ -109,29 +169,43 @@ function BaseVideoPlayer({
     // fix for iOS mWeb: preventing iOS native player default behavior from pausing the video when exiting fullscreen
     const preventPausingWhenExitingFullscreen = useCallback(
         (isVideoPlaying: boolean) => {
-            if (videoResumeTryNumber.current === 0 || isVideoPlaying) {
+            if (videoResumeTryNumberRef.current === 0 || isVideoPlaying) {
                 return;
             }
-            if (videoResumeTryNumber.current === 1) {
+            if (videoResumeTryNumberRef.current === 1) {
                 playVideo();
             }
-            videoResumeTryNumber.current -= 1;
+            // eslint-disable-next-line react-compiler/react-compiler
+            videoResumeTryNumberRef.current -= 1;
         },
-        [playVideo, videoResumeTryNumber],
+        [playVideo, videoResumeTryNumberRef],
     );
 
+    const prevIsMutedRef = useRef(false);
+    const prevVolumeRef = useRef(0);
+
     const handlePlaybackStatusUpdate = useCallback(
         (status: AVPlaybackStatus) => {
             if (!status.isLoaded) {
                 preventPausingWhenExitingFullscreen(false);
                 setIsPlaying(false);
-                setIsLoading(false); // when video is ready to display duration is not NaN
+                setIsLoading(true); // when video is ready to display duration is not NaN
                 setIsBuffering(false);
                 setDuration(videoDuration * 1000);
                 setPosition(0);
                 onPlaybackStatusUpdate?.(status);
                 return;
             }
+
+            if (prevIsMutedRef.current && prevVolumeRef.current === 0 && !status.isMuted) {
+                updateVolume(0.25);
+            }
+            if (isFullScreenRef.current && prevVolumeRef.current !== 0 && status.volume === 0 && !status.isMuted) {
+                currentVideoPlayerRef.current?.setStatusAsync({isMuted: true});
+            }
+            prevIsMutedRef.current = status.isMuted;
+            prevVolumeRef.current = status.volume;
+
             const isVideoPlaying = status.isPlaying;
             // eslint-disable-next-line @typescript-eslint/prefer-nullish-coalescing
             const currentDuration = status.durationMillis || videoDuration * 1000;
@@ -151,7 +225,7 @@ function BaseVideoPlayer({
             videoStateRef.current = status;
             onPlaybackStatusUpdate?.(status);
         },
-        // eslint-disable-next-line react-hooks/exhaustive-deps -- we don't want to trigger this when isPlaying changes because isPlaying is only used inside shouldReplayVideo
+        // eslint-disable-next-line react-compiler/react-compiler, react-hooks/exhaustive-deps -- we don't want to trigger this when isPlaying changes because isPlaying is only used inside shouldReplayVideo
         [onPlaybackStatusUpdate, preventPausingWhenExitingFullscreen, videoDuration],
     );
 
@@ -176,11 +250,11 @@ function BaseVideoPlayer({
                 if (videoStateRef.current && (!('isPlaying' in videoStateRef.current) || videoStateRef.current.isPlaying)) {
                     pauseVideo();
                     playVideo();
-                    videoResumeTryNumber.current = 3;
+                    videoResumeTryNumberRef.current = 3;
                 }
             }
         },
-        [isFullScreenRef, onFullscreenUpdate, pauseVideo, playVideo, videoResumeTryNumber, updateVolume, currentVideoPlayerRef],
+        [isFullScreenRef, onFullscreenUpdate, pauseVideo, playVideo, videoResumeTryNumberRef, updateVolume, currentVideoPlayerRef],
     );
 
     const bindFunctions = useCallback(() => {
@@ -214,29 +288,32 @@ function BaseVideoPlayer({
             return;
         }
 
-        // If we are uploading a new video, we want to immediately set the video player ref.
+        // If we are uploading a new video, we want to pause previous playing video and immediately set the video player ref.
+        if (currentVideoPlayerRef.current) {
+            pauseVideo();
+        }
         currentVideoPlayerRef.current = videoPlayerRef.current;
-    }, [url, currentVideoPlayerRef, isUploading]);
+    }, [url, currentVideoPlayerRef, isUploading, pauseVideo]);
 
     const isCurrentlyURLSetRef = useRef<boolean>();
     isCurrentlyURLSetRef.current = isCurrentlyURLSet;
 
     useEffect(
         () => () => {
-            if (!isCurrentlyURLSetRef.current) {
+            if (shouldUseSharedVideoElement || !isCurrentlyURLSetRef.current) {
                 return;
             }
 
             setCurrentlyPlayingURL(null);
         },
-        [setCurrentlyPlayingURL],
+        [setCurrentlyPlayingURL, shouldUseSharedVideoElement],
     );
     // update shared video elements
     useEffect(() => {
-        if (shouldUseSharedVideoElement || url !== currentlyPlayingURL || isFullScreenRef.current) {
+        if (shouldUseSharedVideoElement || url !== currentlyPlayingURL) {
             return;
         }
-        shareVideoPlayerElements(videoPlayerRef.current, videoPlayerElementParentRef.current, videoPlayerElementRef.current, isUploading);
+        shareVideoPlayerElements(videoPlayerRef.current, videoPlayerElementParentRef.current, videoPlayerElementRef.current, isUploading || isFullScreenRef.current);
     }, [currentlyPlayingURL, shouldUseSharedVideoElement, shareVideoPlayerElements, url, isUploading, isFullScreenRef]);
 
     // append shared video element to new parent (used for example in attachment modal)
@@ -279,16 +356,19 @@ function BaseVideoPlayer({
         updateCurrentlyPlayingURL(url);
     }, [shouldPlay, updateCurrentlyPlayingURL, url]);
 
+    useEffect(() => {
+        videoPlayerRef.current?.setStatusAsync({volume: 0});
+    }, []);
+
     return (
         <>
             {/* We need to wrap the video component in a component that will catch unhandled pointer events. Otherwise, these
             events will bubble up the tree, and it will cause unexpected press behavior. */}
             <PressableWithoutFeedback
-                accessibilityRole="button"
                 accessible={false}
                 style={[styles.cursorDefault, style]}
             >
-                <Hoverable>
+                <Hoverable shouldFreezeCapture={isPopoverVisible}>
                     {(isHovered) => (
                         <View style={[styles.w100, styles.h100]}>
                             <PressableWithoutFeedback
@@ -298,7 +378,11 @@ function BaseVideoPlayer({
                                     if (isFullScreenRef.current) {
                                         return;
                                     }
-                                    togglePlayCurrentVideo();
+                                    if (!canUseTouchScreen) {
+                                        togglePlayCurrentVideo();
+                                        return;
+                                    }
+                                    toggleControl();
                                 }}
                                 style={[styles.flex1, styles.noSelect]}
                             >
@@ -315,6 +399,7 @@ function BaseVideoPlayer({
                                     </>
                                 ) : (
                                     <View
+                                        fsClass="fs-exclude"
                                         style={styles.flex1}
                                         ref={(el) => {
                                             if (!el) {
@@ -345,6 +430,10 @@ function BaseVideoPlayer({
                                                     playVideo();
                                                 }
                                                 onVideoLoaded?.(e);
+                                                if (shouldUseNewRate) {
+                                                    return;
+                                                }
+                                                videoPlayerRef.current?.setStatusAsync?.({rate: currentPlaybackSpeed});
                                             }}
                                             onPlaybackStatusUpdate={handlePlaybackStatusUpdate}
                                             onFullscreenUpdate={handleFullscreenUpdate}
@@ -352,10 +441,9 @@ function BaseVideoPlayer({
                                     </View>
                                 )}
                             </PressableWithoutFeedback>
-
-                            {(isLoading || isBuffering) && <FullScreenLoadingIndicator style={[styles.opacity1, styles.bgTransparent]} />}
-
-                            {controlsStatus !== CONST.VIDEO_PLAYER.CONTROLS_STATUS.HIDE && !isLoading && (isPopoverVisible || isHovered || canUseTouchScreen) && (
+                            {((isLoading && !isOffline) || isBuffering) && <FullScreenLoadingIndicator style={[styles.opacity1, styles.bgTransparent]} />}
+                            {isLoading && (isOffline || !isBuffering) && <AttachmentOfflineIndicator isPreview={isPreview} />}
+                            {controlStatusState !== CONST.VIDEO_PLAYER.CONTROLS_STATUS.HIDE && !isLoading && (isPopoverVisible || isHovered || canUseTouchScreen) && (
                                 <VideoPlayerControls
                                     duration={duration}
                                     position={position}
@@ -363,9 +451,9 @@ function BaseVideoPlayer({
                                     videoPlayerRef={videoPlayerRef}
                                     isPlaying={isPlaying}
                                     small={shouldUseSmallVideoControls}
-                                    style={videoControlsStyle}
+                                    style={[videoControlsStyle, controlsAnimatedStyle]}
                                     togglePlayCurrentVideo={togglePlayCurrentVideo}
-                                    controlsStatus={controlsStatus}
+                                    controlsStatus={controlStatusState}
                                     showPopoverMenu={showPopoverMenu}
                                 />
                             )}
diff --git a/src/components/VideoPlayer/VideoPlayerControls/ProgressBar/index.tsx b/src/components/VideoPlayer/VideoPlayerControls/ProgressBar/index.tsx
index c9cf2c25d7ad..5d1ea0d85d0b 100644
--- a/src/components/VideoPlayer/VideoPlayerControls/ProgressBar/index.tsx
+++ b/src/components/VideoPlayer/VideoPlayerControls/ProgressBar/index.tsx
@@ -30,6 +30,7 @@ function ProgressBar({duration, position, seekPosition}: ProgressBarProps) {
     const wasVideoPlayingOnCheck = useSharedValue(false);
 
     const onCheckVideoPlaying = (isPlaying: boolean) => {
+        // eslint-disable-next-line react-compiler/react-compiler
         wasVideoPlayingOnCheck.value = isPlaying;
     };
 
diff --git a/src/components/VideoPlayer/VideoPlayerControls/VolumeButton/index.tsx b/src/components/VideoPlayer/VideoPlayerControls/VolumeButton/index.tsx
index 011391ed4c71..751bd1b1df26 100644
--- a/src/components/VideoPlayer/VideoPlayerControls/VolumeButton/index.tsx
+++ b/src/components/VideoPlayer/VideoPlayerControls/VolumeButton/index.tsx
@@ -45,6 +45,7 @@ function VolumeButton({style, small = false}: VolumeButtonProps) {
     const changeVolumeOnPan = useCallback(
         (event: GestureStateChangeEvent<PanGestureHandlerEventPayload> | GestureUpdateEvent<PanGestureHandlerEventPayload & PanGestureChangeEventPayload>) => {
             const val = NumberUtils.roundToTwoDecimalPlaces(1 - event.y / sliderHeight);
+            // eslint-disable-next-line react-compiler/react-compiler
             volume.value = NumberUtils.clamp(val, 0, 1);
         },
         [sliderHeight, volume],
@@ -76,7 +77,7 @@ function VolumeButton({style, small = false}: VolumeButtonProps) {
     return (
         <Hoverable>
             {(isHovered) => (
-                <Animated.View style={[{cursor: isSliderBeingUsed ? 'grabbing' : 'pointer'}, style]}>
+                <Animated.View style={[isSliderBeingUsed ? styles.cursorGrabbing : styles.cursorPointer, style]}>
                     {(isSliderBeingUsed || isHovered) && (
                         <View style={[styles.volumeSliderContainer]}>
                             <GestureDetector gesture={pan}>
diff --git a/src/components/VideoPlayer/VideoPlayerControls/index.tsx b/src/components/VideoPlayer/VideoPlayerControls/index.tsx
index f5461159aa8e..04cb69a96f8b 100644
--- a/src/components/VideoPlayer/VideoPlayerControls/index.tsx
+++ b/src/components/VideoPlayer/VideoPlayerControls/index.tsx
@@ -72,6 +72,7 @@ function VideoPlayerControls({
     };
 
     const enterFullScreenMode = useCallback(() => {
+        // eslint-disable-next-line react-compiler/react-compiler
         isFullScreenRef.current = true;
         updateCurrentlyPlayingURL(url);
         videoPlayerRef.current?.presentFullscreenPlayer();
diff --git a/src/components/VideoPlayer/types.ts b/src/components/VideoPlayer/types.ts
index d27b1dcdbcdd..3dd3884534ec 100644
--- a/src/components/VideoPlayer/types.ts
+++ b/src/components/VideoPlayer/types.ts
@@ -29,6 +29,7 @@ type VideoPlayerProps = {
     shouldUseControlsBottomMargin?: boolean;
     controlsStatus?: ValueOf<typeof CONST.VIDEO_PLAYER.CONTROLS_STATUS>;
     shouldPlay?: boolean;
+    isPreview?: boolean;
 };
 
 export type {VideoPlayerProps, VideoWithOnFullScreenUpdate};
diff --git a/src/components/VideoPlayer/utils.ts b/src/components/VideoPlayer/utils.ts
index 8e5c0a471976..b366d2fd4868 100644
--- a/src/components/VideoPlayer/utils.ts
+++ b/src/components/VideoPlayer/utils.ts
@@ -1,3 +1,5 @@
+import * as Browser from '@libs/Browser';
+
 /**
  * Converts milliseconds to '[hours:]minutes:seconds' format
  */
@@ -14,7 +16,9 @@ function convertMillisecondsToTime(milliseconds: number) {
  * Adds a #t=seconds tag to the end of the URL to skip first seconds of the video
  */
 function addSkipTimeTagToURL(url: string, seconds: number) {
-    if (url.includes('#t=')) {
+    // On iOS: mWeb (WebKit-based browser engines), we don't add the time fragment
+    // because it's not supported and will throw (WebKitBlobResource error 1).
+    if (Browser.isMobileWebKit() || url.includes('#t=')) {
         return url;
     }
     return `${url}#t=${seconds}`;
diff --git a/src/components/VideoPlayerContexts/PlaybackContext.tsx b/src/components/VideoPlayerContexts/PlaybackContext.tsx
index 499dd2b07f67..6a971deacbc1 100644
--- a/src/components/VideoPlayerContexts/PlaybackContext.tsx
+++ b/src/components/VideoPlayerContexts/PlaybackContext.tsx
@@ -1,8 +1,10 @@
-import type {AVPlaybackStatusToSet} from 'expo-av';
+import type {AVPlaybackStatus, AVPlaybackStatusToSet} from 'expo-av';
 import React, {useCallback, useContext, useEffect, useMemo, useRef, useState} from 'react';
 import type {View} from 'react-native';
 import type {VideoWithOnFullScreenUpdate} from '@components/VideoPlayer/types';
 import useCurrentReportID from '@hooks/useCurrentReportID';
+import usePrevious from '@hooks/usePrevious';
+import Visibility from '@libs/Visibility';
 import type ChildrenProps from '@src/types/utils/ChildrenProps';
 import type {PlaybackContext, StatusCallback} from './types';
 
@@ -15,7 +17,10 @@ function PlaybackContextProvider({children}: ChildrenProps) {
     const [originalParent, setOriginalParent] = useState<View | HTMLDivElement | null>(null);
     const currentVideoPlayerRef = useRef<VideoWithOnFullScreenUpdate | null>(null);
     const {currentReportID} = useCurrentReportID() ?? {};
-    const videoResumeTryNumber = useRef<number>(0);
+    const prevCurrentReportID = usePrevious(currentReportID);
+    const videoResumeTryNumberRef = useRef<number>(0);
+    const playVideoPromiseRef = useRef<Promise<AVPlaybackStatus>>();
+    const isPlayPendingRef = useRef(false);
 
     const pauseVideo = useCallback(() => {
         currentVideoPlayerRef.current?.setStatusAsync?.({shouldPlay: false});
@@ -26,12 +31,16 @@ function PlaybackContextProvider({children}: ChildrenProps) {
     }, [currentVideoPlayerRef]);
 
     const playVideo = useCallback(() => {
+        if (!Visibility.isVisible()) {
+            isPlayPendingRef.current = true;
+            return;
+        }
         currentVideoPlayerRef.current?.getStatusAsync?.().then((status) => {
             const newStatus: AVPlaybackStatusToSet = {shouldPlay: true};
             if ('durationMillis' in status && status.durationMillis === status.positionMillis) {
                 newStatus.positionMillis = 0;
             }
-            currentVideoPlayerRef.current?.setStatusAsync(newStatus);
+            playVideoPromiseRef.current = currentVideoPlayerRef.current?.setStatusAsync(newStatus);
         });
     }, [currentVideoPlayerRef]);
 
@@ -51,12 +60,12 @@ function PlaybackContextProvider({children}: ChildrenProps) {
     );
 
     const shareVideoPlayerElements = useCallback(
-        (ref: VideoWithOnFullScreenUpdate | null, parent: View | HTMLDivElement | null, child: View | HTMLDivElement | null, isUploading: boolean) => {
+        (ref: VideoWithOnFullScreenUpdate | null, parent: View | HTMLDivElement | null, child: View | HTMLDivElement | null, shouldNotAutoPlay: boolean) => {
             currentVideoPlayerRef.current = ref;
             setOriginalParent(parent);
             setSharedElement(child);
             // Prevents autoplay when uploading the attachment
-            if (!isUploading) {
+            if (!shouldNotAutoPlay) {
                 playVideo();
             }
         },
@@ -73,21 +82,40 @@ function PlaybackContextProvider({children}: ChildrenProps) {
     );
 
     const resetVideoPlayerData = useCallback(() => {
-        videoResumeTryNumber.current = 0;
-        stopVideo();
-        setCurrentlyPlayingURL(null);
-        setSharedElement(null);
-        setOriginalParent(null);
-        currentVideoPlayerRef.current = null;
-        unloadVideo();
+        // Play video is an async operation and if we call stop video before the promise is completed,
+        // it will throw a console error. So, we'll wait until the promise is resolved before stopping the video.
+        (playVideoPromiseRef.current ?? Promise.resolve()).then(stopVideo).finally(() => {
+            videoResumeTryNumberRef.current = 0;
+            setCurrentlyPlayingURL(null);
+            setSharedElement(null);
+            setOriginalParent(null);
+            currentVideoPlayerRef.current = null;
+            unloadVideo();
+        });
     }, [stopVideo, unloadVideo]);
 
     useEffect(() => {
-        if (!currentReportID) {
+        // This logic ensures that resetVideoPlayerData is only called when currentReportID
+        // changes from one valid value (i.e., not an empty string or '-1') to another valid value.
+        // This prevents the video that plays when the app opens from being interrupted when currentReportID
+        // is initially empty or '-1', or when it changes from empty/'-1' to another value
+        // after the report screen in the central pane is mounted on the large screen.
+        if (!currentReportID || !prevCurrentReportID || currentReportID === '-1' || prevCurrentReportID === '-1' || currentReportID === prevCurrentReportID) {
             return;
         }
         resetVideoPlayerData();
-    }, [currentReportID, resetVideoPlayerData]);
+    }, [currentReportID, prevCurrentReportID, resetVideoPlayerData]);
+
+    useEffect(() => {
+        const unsubscribeVisibilityListener = Visibility.onVisibilityChange(() => {
+            if (!Visibility.isVisible() || !isPlayPendingRef.current) {
+                return;
+            }
+            playVideo();
+            isPlayPendingRef.current = false;
+        });
+        return unsubscribeVisibilityListener;
+    }, [playVideo]);
 
     const contextValue = useMemo(
         () => ({
@@ -102,7 +130,7 @@ function PlaybackContextProvider({children}: ChildrenProps) {
             playVideo,
             pauseVideo,
             checkVideoPlaying,
-            videoResumeTryNumber,
+            videoResumeTryNumberRef,
         }),
         [
             updateCurrentlyPlayingURL,
diff --git a/src/components/VideoPlayerContexts/VideoPopoverMenuContext.tsx b/src/components/VideoPlayerContexts/VideoPopoverMenuContext.tsx
index 29156c438d3d..966f49e45a93 100644
--- a/src/components/VideoPlayerContexts/VideoPopoverMenuContext.tsx
+++ b/src/components/VideoPlayerContexts/VideoPopoverMenuContext.tsx
@@ -4,7 +4,6 @@ import type {PopoverMenuItem} from '@components/PopoverMenu';
 import type {VideoWithOnFullScreenUpdate} from '@components/VideoPlayer/types';
 import useLocalize from '@hooks/useLocalize';
 import useNetwork from '@hooks/useNetwork';
-import addEncryptedAuthTokenToURL from '@libs/addEncryptedAuthTokenToURL';
 import fileDownload from '@libs/fileDownload';
 import CONST from '@src/CONST';
 import type ChildrenProps from '@src/types/utils/ChildrenProps';
@@ -14,9 +13,9 @@ import type {PlaybackSpeed, VideoPopoverMenuContext} from './types';
 const Context = React.createContext<VideoPopoverMenuContext | null>(null);
 
 function VideoPopoverMenuContextProvider({children}: ChildrenProps) {
-    const {currentVideoPlayerRef, currentlyPlayingURL} = usePlaybackContext();
+    const {currentlyPlayingURL} = usePlaybackContext();
     const {translate} = useLocalize();
-    const [currentPlaybackSpeed, setCurrentPlaybackSpeed] = useState<PlaybackSpeed>(CONST.VIDEO_PLAYER.PLAYBACK_SPEEDS[2]);
+    const [currentPlaybackSpeed, setCurrentPlaybackSpeed] = useState<PlaybackSpeed>(CONST.VIDEO_PLAYER.PLAYBACK_SPEEDS[3]);
     const {isOffline} = useNetwork();
     const isLocalFile = currentlyPlayingURL && CONST.ATTACHMENT_LOCAL_URL_PREFIX.some((prefix) => currentlyPlayingURL.startsWith(prefix));
     const videoPopoverMenuPlayerRef = useRef<VideoWithOnFullScreenUpdate | null>(null);
@@ -24,9 +23,9 @@ function VideoPopoverMenuContextProvider({children}: ChildrenProps) {
     const updatePlaybackSpeed = useCallback(
         (speed: PlaybackSpeed) => {
             setCurrentPlaybackSpeed(speed);
-            currentVideoPlayerRef.current?.setStatusAsync?.({rate: speed});
+            videoPopoverMenuPlayerRef.current?.setStatusAsync?.({rate: speed});
         },
-        [currentVideoPlayerRef],
+        [videoPopoverMenuPlayerRef],
     );
 
     const downloadAttachment = useCallback(() => {
@@ -37,8 +36,7 @@ function VideoPopoverMenuContextProvider({children}: ChildrenProps) {
         if (typeof source === 'number' || !source) {
             return;
         }
-        const sourceURI = addEncryptedAuthTokenToURL(source.uri);
-        fileDownload(sourceURI);
+        fileDownload(source.uri);
     }, [videoPopoverMenuPlayerRef]);
 
     const menuItems = useMemo(() => {
@@ -59,17 +57,21 @@ function VideoPopoverMenuContextProvider({children}: ChildrenProps) {
             text: translate('videoPlayer.playbackSpeed'),
             subMenuItems: CONST.VIDEO_PLAYER.PLAYBACK_SPEEDS.map((speed) => ({
                 icon: currentPlaybackSpeed === speed ? Expensicons.Checkmark : undefined,
-                text: speed.toString(),
+                text: speed === 1 ? translate('videoPlayer.normal') : speed.toString(),
                 onSelected: () => {
                     updatePlaybackSpeed(speed);
                 },
                 shouldPutLeftPaddingWhenNoIcon: true,
+                isSelected: currentPlaybackSpeed === speed,
             })),
         });
         return items;
     }, [currentPlaybackSpeed, downloadAttachment, translate, updatePlaybackSpeed, isOffline, isLocalFile]);
 
-    const contextValue = useMemo(() => ({menuItems, videoPopoverMenuPlayerRef, updatePlaybackSpeed}), [menuItems, videoPopoverMenuPlayerRef, updatePlaybackSpeed]);
+    const contextValue = useMemo(
+        () => ({menuItems, videoPopoverMenuPlayerRef, currentPlaybackSpeed, updatePlaybackSpeed, setCurrentPlaybackSpeed}),
+        [menuItems, videoPopoverMenuPlayerRef, currentPlaybackSpeed, updatePlaybackSpeed, setCurrentPlaybackSpeed],
+    );
     return <Context.Provider value={contextValue}>{children}</Context.Provider>;
 }
 
diff --git a/src/components/VideoPlayerContexts/VolumeContext.tsx b/src/components/VideoPlayerContexts/VolumeContext.tsx
index d67b989e5887..f22b524848de 100644
--- a/src/components/VideoPlayerContexts/VolumeContext.tsx
+++ b/src/components/VideoPlayerContexts/VolumeContext.tsx
@@ -16,6 +16,7 @@ function VolumeContextProvider({children}: ChildrenProps) {
                 return;
             }
             currentVideoPlayerRef.current.setStatusAsync({volume: newVolume, isMuted: newVolume === 0});
+            // eslint-disable-next-line react-compiler/react-compiler
             volume.value = newVolume;
         },
         [currentVideoPlayerRef, volume],
diff --git a/src/components/VideoPlayerContexts/types.ts b/src/components/VideoPlayerContexts/types.ts
index ea09281d7676..5778c321bd3b 100644
--- a/src/components/VideoPlayerContexts/types.ts
+++ b/src/components/VideoPlayerContexts/types.ts
@@ -1,6 +1,7 @@
 import type {MutableRefObject} from 'react';
 import type {View} from 'react-native';
 import type {SharedValue} from 'react-native-reanimated';
+import type {TupleToUnion} from 'type-fest';
 import type {PopoverMenuItem} from '@components/PopoverMenu';
 import type {VideoWithOnFullScreenUpdate} from '@components/VideoPlayer/types';
 import type WindowDimensions from '@hooks/useWindowDimensions/types';
@@ -12,7 +13,7 @@ type PlaybackContext = {
     currentlyPlayingURLReportID: string | undefined;
     originalParent: View | HTMLDivElement | null;
     sharedElement: View | HTMLDivElement | null;
-    videoResumeTryNumber: MutableRefObject<number>;
+    videoResumeTryNumberRef: MutableRefObject<number>;
     currentVideoPlayerRef: MutableRefObject<VideoWithOnFullScreenUpdate | null>;
     shareVideoPlayerElements: (ref: VideoWithOnFullScreenUpdate | null, parent: View | HTMLDivElement | null, child: View | HTMLDivElement | null, isUploading: boolean) => void;
     playVideo: () => void;
@@ -29,7 +30,9 @@ type VolumeContext = {
 type VideoPopoverMenuContext = {
     menuItems: PopoverMenuItem[];
     videoPopoverMenuPlayerRef: MutableRefObject<VideoWithOnFullScreenUpdate | null>;
+    currentPlaybackSpeed: PlaybackSpeed;
     updatePlaybackSpeed: (speed: PlaybackSpeed) => void;
+    setCurrentPlaybackSpeed: (speed: PlaybackSpeed) => void;
 };
 
 type FullScreenContext = {
@@ -41,6 +44,6 @@ type FullScreenContext = {
 
 type StatusCallback = (isPlaying: boolean) => void;
 
-type PlaybackSpeed = (typeof CONST.VIDEO_PLAYER.PLAYBACK_SPEEDS)[number];
+type PlaybackSpeed = TupleToUnion<typeof CONST.VIDEO_PLAYER.PLAYBACK_SPEEDS>;
 
 export type {PlaybackContext, VolumeContext, VideoPopoverMenuContext, FullScreenContext, StatusCallback, PlaybackSpeed};
diff --git a/src/components/VideoPlayerPreview/VideoPlayerThumbnail.tsx b/src/components/VideoPlayerPreview/VideoPlayerThumbnail.tsx
index 76efec0879a8..48465e208b70 100644
--- a/src/components/VideoPlayerPreview/VideoPlayerThumbnail.tsx
+++ b/src/components/VideoPlayerPreview/VideoPlayerThumbnail.tsx
@@ -30,7 +30,7 @@ function VideoPlayerThumbnail({thumbnailUrl, onPress, accessibilityLabel}: Video
     return (
         <View style={styles.flex1}>
             {thumbnailUrl && (
-                <View style={styles.flex1}>
+                <View style={[styles.flex1, {borderRadius: variables.componentBorderRadiusNormal}, styles.overflowHidden]}>
                     <Image
                         source={{uri: thumbnailUrl}}
                         style={styles.flex1}
@@ -40,15 +40,17 @@ function VideoPlayerThumbnail({thumbnailUrl, onPress, accessibilityLabel}: Video
                 </View>
             )}
             <ShowContextMenuContext.Consumer>
-                {({anchor, report, action, checkIfContextMenuActive}) => (
+                {({anchor, report, reportNameValuePairs, action, checkIfContextMenuActive}) => (
                     <PressableWithoutFeedback
                         style={[styles.videoThumbnailContainer]}
                         accessibilityLabel={accessibilityLabel}
-                        accessibilityRole={CONST.ACCESSIBILITY_ROLE.BUTTON}
+                        accessibilityRole={CONST.ROLE.BUTTON}
                         onPress={onPress}
                         onPressIn={() => DeviceCapabilities.canUseTouchScreen() && ControlSelection.block()}
                         onPressOut={() => ControlSelection.unblock()}
-                        onLongPress={(event) => showContextMenuForReport(event, anchor, report?.reportID ?? '', action, checkIfContextMenuActive, ReportUtils.isArchivedRoom(report))}
+                        onLongPress={(event) =>
+                            showContextMenuForReport(event, anchor, report?.reportID ?? '-1', action, checkIfContextMenuActive, ReportUtils.isArchivedRoom(report, reportNameValuePairs))
+                        }
                         shouldUseHapticsOnLongPress
                     >
                         <View style={[styles.videoThumbnailPlayButton]}>
diff --git a/src/components/VideoPlayerPreview/index.tsx b/src/components/VideoPlayerPreview/index.tsx
index cf93ca2462c4..2ce65f08fc20 100644
--- a/src/components/VideoPlayerPreview/index.tsx
+++ b/src/components/VideoPlayerPreview/index.tsx
@@ -7,9 +7,9 @@ import VideoPlayer from '@components/VideoPlayer';
 import IconButton from '@components/VideoPlayer/IconButton';
 import {usePlaybackContext} from '@components/VideoPlayerContexts/PlaybackContext';
 import useLocalize from '@hooks/useLocalize';
+import useResponsiveLayout from '@hooks/useResponsiveLayout';
 import useThemeStyles from '@hooks/useThemeStyles';
 import useThumbnailDimensions from '@hooks/useThumbnailDimensions';
-import useWindowDimensions from '@hooks/useWindowDimensions';
 import VideoPlayerThumbnail from './VideoPlayerThumbnail';
 
 type VideoDimensions = {
@@ -44,7 +44,7 @@ function VideoPlayerPreview({videoUrl, thumbnailUrl, reportID, fileName, videoDi
     const styles = useThemeStyles();
     const {translate} = useLocalize();
     const {currentlyPlayingURL, currentlyPlayingURLReportID, updateCurrentlyPlayingURL} = usePlaybackContext();
-    const {isSmallScreenWidth} = useWindowDimensions();
+    const {shouldUseNarrowLayout} = useResponsiveLayout();
     const [isThumbnail, setIsThumbnail] = useState(true);
     const [measuredDimensions, setMeasuredDimensions] = useState(videoDimensions);
     const {thumbnailDimensionsStyles} = useThumbnailDimensions(measuredDimensions.width, measuredDimensions.height);
@@ -57,7 +57,7 @@ function VideoPlayerPreview({videoUrl, thumbnailUrl, reportID, fileName, videoDi
 
     const handleOnPress = () => {
         updateCurrentlyPlayingURL(videoUrl);
-        if (isSmallScreenWidth) {
+        if (shouldUseNarrowLayout) {
             onShowModalPress();
         }
     };
@@ -71,7 +71,7 @@ function VideoPlayerPreview({videoUrl, thumbnailUrl, reportID, fileName, videoDi
 
     return (
         <View style={[styles.webViewStyles.tagStyles.video, thumbnailDimensionsStyles]}>
-            {isSmallScreenWidth || isThumbnail ? (
+            {shouldUseNarrowLayout || isThumbnail ? (
                 <VideoPlayerThumbnail
                     thumbnailUrl={thumbnailUrl}
                     onPress={handleOnPress}
@@ -85,6 +85,7 @@ function VideoPlayerPreview({videoUrl, thumbnailUrl, reportID, fileName, videoDi
                         videoDuration={videoDuration}
                         shouldUseSmallVideoControls
                         style={[styles.w100, styles.h100]}
+                        isPreview
                         videoPlayerStyle={styles.videoPlayerPreview}
                     />
                     <View style={[styles.pAbsolute, styles.w100]}>
diff --git a/src/components/WalletStatementModal/index.tsx b/src/components/WalletStatementModal/index.tsx
index d469eedc9761..e2b854842163 100644
--- a/src/components/WalletStatementModal/index.tsx
+++ b/src/components/WalletStatementModal/index.tsx
@@ -8,7 +8,7 @@ import * as Report from '@userActions/Report';
 import CONST from '@src/CONST';
 import ONYXKEYS from '@src/ONYXKEYS';
 import ROUTES from '@src/ROUTES';
-import type {WalletStatementOnyxProps, WalletStatementProps} from './types';
+import type {WalletStatementMessage, WalletStatementOnyxProps, WalletStatementProps} from './types';
 
 function WalletStatementModal({statementPageURL, session}: WalletStatementProps) {
     const styles = useThemeStyles();
@@ -18,7 +18,7 @@ function WalletStatementModal({statementPageURL, session}: WalletStatementProps)
     /**
      * Handles in-app navigation for iframe links
      */
-    const navigate = (event: MessageEvent) => {
+    const navigate = (event: MessageEvent<WalletStatementMessage>) => {
         if (!event.data?.type || (event.data.type !== CONST.WALLET.WEB_MESSAGE_TYPE.STATEMENT && event.data.type !== CONST.WALLET.WEB_MESSAGE_TYPE.CONCIERGE)) {
             return;
         }
diff --git a/src/components/WalletStatementModal/types.ts b/src/components/WalletStatementModal/types.ts
index 567202730b7d..d9a6d299da65 100644
--- a/src/components/WalletStatementModal/types.ts
+++ b/src/components/WalletStatementModal/types.ts
@@ -11,4 +11,9 @@ type WalletStatementProps = WalletStatementOnyxProps & {
     statementPageURL: string;
 };
 
-export type {WalletStatementProps, WalletStatementOnyxProps};
+type WalletStatementMessage = {
+    url: string;
+    type: string;
+};
+
+export type {WalletStatementProps, WalletStatementOnyxProps, WalletStatementMessage};
diff --git a/src/components/WorkspaceEmptyStateSection.tsx b/src/components/WorkspaceEmptyStateSection.tsx
index 4510310d3418..252197fda96b 100644
--- a/src/components/WorkspaceEmptyStateSection.tsx
+++ b/src/components/WorkspaceEmptyStateSection.tsx
@@ -1,7 +1,8 @@
 import React from 'react';
 import {View} from 'react-native';
+import type {StyleProp, ViewStyle} from 'react-native';
+import useResponsiveLayout from '@hooks/useResponsiveLayout';
 import useThemeStyles from '@hooks/useThemeStyles';
-import useWindowDimensions from '@hooks/useWindowDimensions';
 import type IconAsset from '@src/types/utils/IconAsset';
 import Icon from './Icon';
 import Text from './Text';
@@ -13,16 +14,34 @@ type WorkspaceEmptyStateSectionProps = {
     /** The text to display in the subtitle of the section */
     subtitle?: string;
 
+    /** The component to show in the subtitle of the section */
+    subtitleComponent?: React.ReactNode;
+
     /** The icon to display along with the title */
     icon: IconAsset;
+
+    /** Additional style for container */
+    containerStyle?: StyleProp<ViewStyle>;
+
+    /** Whether to apply card style to container */
+    shouldStyleAsCard?: boolean;
 };
 
-function WorkspaceEmptyStateSection({icon, subtitle, title}: WorkspaceEmptyStateSectionProps) {
+function WorkspaceEmptyStateSection({icon, subtitle, title, containerStyle, shouldStyleAsCard = true, subtitleComponent}: WorkspaceEmptyStateSectionProps) {
     const styles = useThemeStyles();
-    const {isSmallScreenWidth} = useWindowDimensions();
+    const {shouldUseNarrowLayout} = useResponsiveLayout();
 
     return (
-        <View style={[styles.pageWrapper, styles.cardSectionContainer, styles.workspaceSection, styles.ph8, isSmallScreenWidth ? styles.pv10 : styles.pv12]}>
+        <View
+            style={[
+                styles.pageWrapper,
+                shouldStyleAsCard && styles.cardSectionContainer,
+                styles.workspaceSection,
+                styles.ph8,
+                shouldUseNarrowLayout ? styles.pv10 : styles.pv12,
+                containerStyle,
+            ]}
+        >
             <Icon
                 src={icon}
                 width={184}
@@ -34,9 +53,9 @@ function WorkspaceEmptyStateSection({icon, subtitle, title}: WorkspaceEmptyState
                     <Text style={[styles.textHeadline, styles.emptyCardSectionTitle]}>{title}</Text>
                 </View>
 
-                {!!subtitle && (
+                {(!!subtitle || !!subtitleComponent) && (
                     <View style={[styles.flexRow, styles.justifyContentCenter, styles.w100, styles.mt1, styles.mh1]}>
-                        <Text style={[styles.textNormal, styles.emptyCardSectionSubtitle]}>{subtitle}</Text>
+                        {subtitleComponent ?? <Text style={[styles.textNormal, styles.emptyCardSectionSubtitle]}>{subtitle}</Text>}
                     </View>
                 )}
             </View>
diff --git a/src/components/WorkspaceSwitcherButton.tsx b/src/components/WorkspaceSwitcherButton.tsx
index 94577eecf5b2..9ad0ffefafa1 100644
--- a/src/components/WorkspaceSwitcherButton.tsx
+++ b/src/components/WorkspaceSwitcherButton.tsx
@@ -1,4 +1,4 @@
-import React, {useMemo, useRef} from 'react';
+import React, {memo, useMemo, useRef} from 'react';
 import type {View} from 'react-native';
 import type {OnyxEntry} from 'react-native-onyx';
 import useLocalize from '@hooks/useLocalize';
@@ -24,9 +24,9 @@ function WorkspaceSwitcherButton({policy}: WorkspaceSwitcherButtonProps) {
     const {translate} = useLocalize();
     const theme = useTheme();
 
-    const pressableRef = useRef<HTMLDivElement | View | null>(null);
+    const pressableRef = useRef<View>(null);
 
-    const {source, name, type, id} = useMemo(() => {
+    const mainAvatar = useMemo(() => {
         if (!policy) {
             return {source: Expensicons.ExpensifyAppIcon, name: CONST.WORKSPACE_SWITCHER.NAME, type: CONST.ICON_TYPE_AVATAR};
         }
@@ -36,7 +36,7 @@ function WorkspaceSwitcherButton({policy}: WorkspaceSwitcherButtonProps) {
             source: avatar,
             name: policy?.name ?? '',
             type: CONST.ICON_TYPE_WORKSPACE,
-            id: policy?.id ?? '',
+            id: policy?.id ?? '-1',
         };
     }, [policy]);
 
@@ -56,7 +56,7 @@ function WorkspaceSwitcherButton({policy}: WorkspaceSwitcherButtonProps) {
             >
                 {({hovered}) => (
                     <SubscriptAvatar
-                        mainAvatar={{source, name, type, id}}
+                        mainAvatar={mainAvatar}
                         subscriptIcon={{
                             source: Expensicons.DownArrow,
                             width: CONST.WORKSPACE_SWITCHER.SUBSCRIPT_ICON_SIZE,
@@ -75,4 +75,4 @@ function WorkspaceSwitcherButton({policy}: WorkspaceSwitcherButtonProps) {
 
 WorkspaceSwitcherButton.displayName = 'WorkspaceSwitcherButton';
 
-export default WorkspaceSwitcherButton;
+export default memo(WorkspaceSwitcherButton);
diff --git a/src/components/avatarPropTypes.js b/src/components/avatarPropTypes.js
deleted file mode 100644
index 2fcf34aaa8bd..000000000000
--- a/src/components/avatarPropTypes.js
+++ /dev/null
@@ -1,11 +0,0 @@
-import PropTypes from 'prop-types';
-import CONST from '@src/CONST';
-import sourcePropTypes from './Image/sourcePropTypes';
-
-export default PropTypes.shape({
-    source: PropTypes.oneOfType([PropTypes.string, sourcePropTypes]),
-    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.string, sourcePropTypes]),
-});
diff --git a/src/components/categoryPropTypes.js b/src/components/categoryPropTypes.js
deleted file mode 100644
index 90c3ac368d1c..000000000000
--- a/src/components/categoryPropTypes.js
+++ /dev/null
@@ -1,9 +0,0 @@
-import PropTypes from 'prop-types';
-
-export default PropTypes.shape({
-    /** Name of a category */
-    name: PropTypes.string.isRequired,
-
-    /** Flag that determines if a category is active and able to be selected */
-    enabled: PropTypes.bool.isRequired,
-});
diff --git a/src/components/createOnyxContext.tsx b/src/components/createOnyxContext.tsx
index 7cf802c57951..edd7100e57de 100644
--- a/src/components/createOnyxContext.tsx
+++ b/src/components/createOnyxContext.tsx
@@ -1,4 +1,4 @@
-import Str from 'expensify-common/lib/str';
+import {Str} from 'expensify-common';
 import type {ComponentType, ForwardedRef, ForwardRefExoticComponent, PropsWithoutRef, ReactNode, RefAttributes} from 'react';
 import React, {createContext, forwardRef, useContext} from 'react';
 import type {OnyxValue} from 'react-native-onyx';
diff --git a/src/components/optionPropTypes.js b/src/components/optionPropTypes.js
deleted file mode 100644
index 53d8e86b02d6..000000000000
--- a/src/components/optionPropTypes.js
+++ /dev/null
@@ -1,65 +0,0 @@
-import PropTypes from 'prop-types';
-import CONST from '@src/CONST';
-import avatarPropTypes from './avatarPropTypes';
-import participantPropTypes from './participantPropTypes';
-
-export default PropTypes.shape({
-    // Text to display
-    text: PropTypes.string,
-
-    /** Display the text of the option in bold font style */
-    boldStyle: PropTypes.bool,
-
-    // Alternate text to display
-    alternateText: PropTypes.string,
-
-    // Alternate text number of lines
-    alternateTextMaxLines: PropTypes.number,
-
-    // Array of icon information
-    icons: PropTypes.arrayOf(avatarPropTypes),
-
-    // Login (only present when there is a single participant)
-    login: PropTypes.string,
-
-    // reportID (only present when there is a matching report)
-    reportID: PropTypes.string,
-
-    // Key used internally by React
-    keyForList: PropTypes.string,
-
-    // Search text we use to filter options
-    searchText: PropTypes.string,
-
-    // Whether the report is pinned or not
-    isPinned: PropTypes.bool,
-
-    // Whether the report corresponds to a chat room
-    isChatRoom: PropTypes.bool,
-
-    // Custom icon to render on the right side of the option
-    customIcon: PropTypes.shape({
-        // The icon source
-        src: PropTypes.func,
-
-        // The color of the icon
-        color: PropTypes.string,
-    }),
-
-    // List of participants of the report
-    participantsList: PropTypes.arrayOf(participantPropTypes),
-
-    // Descriptive text to be displayed besides selection element
-    descriptiveText: PropTypes.string,
-
-    // The type of option we have e.g. user or report
-    type: PropTypes.string,
-
-    // Text to show for tooltip
-    tooltipText: PropTypes.string,
-
-    /** If we need to show a brick road indicator or not */
-    brickRoadIndicator: PropTypes.oneOf([CONST.BRICK_ROAD_INDICATOR_STATUS.ERROR, '']),
-
-    phoneNumber: PropTypes.string,
-});
diff --git a/src/components/participantPropTypes.js b/src/components/participantPropTypes.js
deleted file mode 100644
index d09eb5c78332..000000000000
--- a/src/components/participantPropTypes.js
+++ /dev/null
@@ -1,28 +0,0 @@
-import PropTypes from 'prop-types';
-import sourcePropTypes from './Image/sourcePropTypes';
-
-export default PropTypes.shape({
-    // Primary login of participant
-    login: PropTypes.string,
-
-    // Account ID of participant
-    accountID: PropTypes.number,
-
-    // Display Name of participant
-    displayName: PropTypes.string,
-
-    // Avatar url of participant
-    avatar: PropTypes.oneOfType([PropTypes.string, sourcePropTypes]),
-
-    /** First Name of the participant */
-    firstName: PropTypes.string,
-
-    /** True if the report is a Policy Expense chat */
-    isPolicyExpenseChat: PropTypes.bool,
-
-    /** True if the policy expense chat is owned by this user */
-    isOwnPolicyExpenseChat: PropTypes.bool,
-
-    /** Whether the participant is selected */
-    selected: PropTypes.bool,
-});
diff --git a/src/components/tagPropTypes.js b/src/components/tagPropTypes.js
deleted file mode 100644
index 2108b65ebbd5..000000000000
--- a/src/components/tagPropTypes.js
+++ /dev/null
@@ -1,20 +0,0 @@
-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/withCurrentReportID.tsx b/src/components/withCurrentReportID.tsx
index a72063913283..b551d321eb6c 100644
--- a/src/components/withCurrentReportID.tsx
+++ b/src/components/withCurrentReportID.tsx
@@ -1,5 +1,4 @@
 import type {NavigationState} from '@react-navigation/native';
-import PropTypes from 'prop-types';
 import type {ComponentType, ForwardedRef, RefAttributes} from 'react';
 import React, {createContext, forwardRef, useCallback, useMemo, useState} from 'react';
 import getComponentDisplayName from '@libs/getComponentDisplayName';
@@ -17,15 +16,6 @@ type CurrentReportIDContextProviderProps = {
 
 const CurrentReportIDContext = createContext<CurrentReportIDContextValue | null>(null);
 
-// TODO: Remove when depended components are migrated to TypeScript.
-const withCurrentReportIDPropTypes = {
-    /** Function to update the state */
-    updateCurrentReportID: PropTypes.func.isRequired,
-
-    /** The top most report id */
-    currentReportID: PropTypes.string,
-};
-
 const withCurrentReportIDDefaultProps = {
     currentReportID: '',
 };
@@ -39,7 +29,7 @@ function CurrentReportIDContextProvider(props: CurrentReportIDContextProviderPro
      */
     const updateCurrentReportID = useCallback(
         (state: NavigationState) => {
-            const reportID = Navigation.getTopmostReportId(state) ?? '';
+            const reportID = Navigation.getTopmostReportId(state) ?? '-1';
 
             /*
              * Make sure we don't make the reportID undefined when switching between the chat list and settings tab.
@@ -95,5 +85,5 @@ export default function withCurrentReportID<TProps extends CurrentReportIDContex
     return forwardRef(WithCurrentReportID);
 }
 
-export {withCurrentReportIDPropTypes, withCurrentReportIDDefaultProps, CurrentReportIDContextProvider, CurrentReportIDContext};
+export {withCurrentReportIDDefaultProps, CurrentReportIDContextProvider, CurrentReportIDContext};
 export type {CurrentReportIDContextValue};
diff --git a/src/components/withCurrentUserPersonalDetails.tsx b/src/components/withCurrentUserPersonalDetails.tsx
index 8bbaf1c9305c..91fd388eabf1 100644
--- a/src/components/withCurrentUserPersonalDetails.tsx
+++ b/src/components/withCurrentUserPersonalDetails.tsx
@@ -4,10 +4,8 @@ import useCurrentUserPersonalDetails from '@hooks/useCurrentUserPersonalDetails'
 import getComponentDisplayName from '@libs/getComponentDisplayName';
 import type {PersonalDetails} from '@src/types/onyx';
 
-type CurrentUserPersonalDetails = PersonalDetails | Record<string, never>;
-
 type HOCProps = {
-    currentUserPersonalDetails: CurrentUserPersonalDetails;
+    currentUserPersonalDetails: PersonalDetails;
 };
 
 type WithCurrentUserPersonalDetailsProps = HOCProps;
@@ -32,4 +30,4 @@ export default function <TProps extends WithCurrentUserPersonalDetailsProps, TRe
     return React.forwardRef(WithCurrentUserPersonalDetails);
 }
 
-export type {WithCurrentUserPersonalDetailsProps, CurrentUserPersonalDetails};
+export type {WithCurrentUserPersonalDetailsProps};
diff --git a/src/components/withKeyboardState.tsx b/src/components/withKeyboardState.tsx
index 560576fdbf5c..72540ebceaa8 100755
--- a/src/components/withKeyboardState.tsx
+++ b/src/components/withKeyboardState.tsx
@@ -1,4 +1,3 @@
-import PropTypes from 'prop-types';
 import type {ComponentType, ForwardedRef, ReactElement, RefAttributes} from 'react';
 import React, {createContext, forwardRef, useEffect, useMemo, useState} from 'react';
 import {Keyboard} from 'react-native';
@@ -13,15 +12,6 @@ type KeyboardStateContextValue = {
     keyboardHeight: number;
 };
 
-// TODO: Remove - left for backwards compatibility with existing components (https://github.com/Expensify/App/issues/25151)
-const keyboardStatePropTypes = {
-    /** Whether the keyboard is open */
-    isKeyboardShown: PropTypes.bool.isRequired,
-
-    /** Height of the keyboard in pixels */
-    keyboardHeight: PropTypes.number.isRequired,
-};
-
 const KeyboardStateContext = createContext<KeyboardStateContextValue>({
     isKeyboardShown: false,
     keyboardHeight: 0,
@@ -76,4 +66,5 @@ export default function withKeyboardState<TProps extends KeyboardStateContextVal
     return forwardRef(WithKeyboardState);
 }
 
-export {KeyboardStateProvider, keyboardStatePropTypes, type KeyboardStateContextValue, KeyboardStateContext};
+export type {KeyboardStateContextValue};
+export {KeyboardStateProvider, KeyboardStateContext};
diff --git a/src/components/withLocalize.tsx b/src/components/withLocalize.tsx
index f198ed9156e1..f6abcf2d9fb0 100755
--- a/src/components/withLocalize.tsx
+++ b/src/components/withLocalize.tsx
@@ -1,37 +1,9 @@
-import PropTypes from 'prop-types';
 import type {ComponentType, ForwardedRef, ReactElement, RefAttributes} from 'react';
 import React, {forwardRef} from 'react';
 import getComponentDisplayName from '@libs/getComponentDisplayName';
 import type {LocaleContextProps} from './LocaleContextProvider';
 import {LocaleContext} from './LocaleContextProvider';
 
-const withLocalizePropTypes = {
-    /** Returns translated string for given locale and phrase */
-    translate: PropTypes.func.isRequired,
-
-    /** Formats number formatted according to locale and options */
-    numberFormat: PropTypes.func.isRequired,
-
-    /** Converts a datetime into a localized string representation that's relative to current moment in time */
-    datetimeToRelative: PropTypes.func.isRequired,
-
-    /** 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,
-
-    /** Gets the standard digit corresponding to a locale digit */
-    fromLocaleDigit: PropTypes.func.isRequired,
-
-    /** Gets the locale digit corresponding to a standard digit */
-    toLocaleDigit: PropTypes.func.isRequired,
-};
-
 type WithLocalizeProps = LocaleContextProps;
 
 export default function withLocalize<TProps extends WithLocalizeProps, TRef>(
@@ -57,5 +29,4 @@ export default function withLocalize<TProps extends WithLocalizeProps, TRef>(
     return forwardRef(WithLocalize);
 }
 
-export {withLocalizePropTypes};
 export type {WithLocalizeProps};
diff --git a/src/components/withNavigationTransitionEnd.tsx b/src/components/withNavigationTransitionEnd.tsx
index 417d8828c1e4..83f14a1d58ef 100644
--- a/src/components/withNavigationTransitionEnd.tsx
+++ b/src/components/withNavigationTransitionEnd.tsx
@@ -18,7 +18,7 @@ export default function <TProps, TRef>(WrappedComponent: ComponentType<TProps &
             });
 
             return unsubscribeTransitionEnd;
-            // eslint-disable-next-line react-hooks/exhaustive-deps
+            // eslint-disable-next-line react-compiler/react-compiler, react-hooks/exhaustive-deps
         }, []);
 
         return (
diff --git a/src/components/withPrepareCentralPaneScreen/index.native.tsx b/src/components/withPrepareCentralPaneScreen/index.native.tsx
new file mode 100644
index 000000000000..84ba31cd63fd
--- /dev/null
+++ b/src/components/withPrepareCentralPaneScreen/index.native.tsx
@@ -0,0 +1,10 @@
+import type React from 'react';
+import freezeScreenWithLazyLoading from '@libs/freezeScreenWithLazyLoading';
+
+/**
+ * This higher-order function is dependent on the platform. On native platforms, screens that aren't already displayed in the navigation stack should be frozen to prevent unnecessary rendering.
+ * It's handled this way only on mobile platforms because on the web, more than one screen is displayed in a wide layout, so these screens shouldn't be frozen.
+ */
+export default function withPrepareCentralPaneScreen(lazyComponent: () => React.ComponentType) {
+    return freezeScreenWithLazyLoading(lazyComponent);
+}
diff --git a/src/components/withPrepareCentralPaneScreen/index.tsx b/src/components/withPrepareCentralPaneScreen/index.tsx
new file mode 100644
index 000000000000..f53368188b3d
--- /dev/null
+++ b/src/components/withPrepareCentralPaneScreen/index.tsx
@@ -0,0 +1,9 @@
+import type React from 'react';
+
+/**
+ * This higher-order function is dependent on the platform. On native platforms, screens that aren't already displayed in the navigation stack should be frozen to prevent unnecessary rendering.
+ * It's handled this way only on mobile platforms because on the web, more than one screen is displayed in a wide layout, so these screens shouldn't be frozen.
+ */
+export default function withPrepareCentralPaneScreen(lazyComponent: () => React.ComponentType) {
+    return lazyComponent;
+}
diff --git a/src/components/withStyleUtils.tsx b/src/components/withStyleUtils.tsx
index 881aa9cbe4ae..82511d0f66de 100644
--- a/src/components/withStyleUtils.tsx
+++ b/src/components/withStyleUtils.tsx
@@ -1,13 +1,9 @@
-import PropTypes from 'prop-types';
 import type {ComponentType, ForwardedRef, ReactElement, RefAttributes} from 'react';
 import React, {forwardRef} from 'react';
 import useStyleUtils from '@hooks/useStyleUtils';
 import getComponentDisplayName from '@libs/getComponentDisplayName';
 import type {StyleUtilsType} from '@styles/utils';
 
-const withStyleUtilsPropTypes = {
-    StyleUtils: PropTypes.object.isRequired,
-};
 type WithStyleUtilsProps = {StyleUtils: StyleUtilsType};
 
 export default function withStyleUtils<TProps extends WithStyleUtilsProps, TRef>(
@@ -30,4 +26,4 @@ export default function withStyleUtils<TProps extends WithStyleUtilsProps, TRef>
     return forwardRef(WithStyleUtils);
 }
 
-export {withStyleUtilsPropTypes, type WithStyleUtilsProps};
+export type {WithStyleUtilsProps};
diff --git a/src/components/withTheme.tsx b/src/components/withTheme.tsx
index b9b81d6daac2..21aaa96fd1c1 100644
--- a/src/components/withTheme.tsx
+++ b/src/components/withTheme.tsx
@@ -1,13 +1,9 @@
-import PropTypes from 'prop-types';
 import type {ComponentType, ForwardedRef, ReactElement, RefAttributes} from 'react';
 import React, {forwardRef} from 'react';
 import useTheme from '@hooks/useTheme';
 import getComponentDisplayName from '@libs/getComponentDisplayName';
 import type {ThemeColors} from '@styles/theme/types';
 
-const withThemePropTypes = {
-    theme: PropTypes.object.isRequired,
-};
 type WithThemeProps = {theme: ThemeColors};
 
 export default function withTheme<TProps extends WithThemeProps, TRef>(
@@ -30,5 +26,4 @@ export default function withTheme<TProps extends WithThemeProps, TRef>(
     return forwardRef(WithTheme);
 }
 
-export {withThemePropTypes};
 export type {WithThemeProps};
diff --git a/src/components/withThemeStyles.tsx b/src/components/withThemeStyles.tsx
index be1f26fd966c..8391a58eaffd 100644
--- a/src/components/withThemeStyles.tsx
+++ b/src/components/withThemeStyles.tsx
@@ -1,13 +1,9 @@
-import PropTypes from 'prop-types';
 import type {ComponentType, ForwardedRef, ReactElement, RefAttributes} from 'react';
 import React, {forwardRef} from 'react';
 import useThemeStyles from '@hooks/useThemeStyles';
 import getComponentDisplayName from '@libs/getComponentDisplayName';
 import type {ThemeStyles} from '@styles/index';
 
-const withThemeStylesPropTypes = {
-    themeStyles: PropTypes.object.isRequired,
-};
 type WithThemeStylesProps = {themeStyles: ThemeStyles};
 
 export default function withThemeStyles<TProps extends WithThemeStylesProps, TRef>(
@@ -30,5 +26,4 @@ export default function withThemeStyles<TProps extends WithThemeStylesProps, TRe
     return forwardRef(WithThemeStyles);
 }
 
-export {withThemeStylesPropTypes};
 export type {WithThemeStylesProps};
diff --git a/src/components/withWindowDimensions/index.native.tsx b/src/components/withWindowDimensions/index.native.tsx
index 073c1f22575b..1cfffeb63d43 100644
--- a/src/components/withWindowDimensions/index.native.tsx
+++ b/src/components/withWindowDimensions/index.native.tsx
@@ -1,4 +1,3 @@
-import PropTypes from 'prop-types';
 import type {ComponentType, ForwardedRef, RefAttributes} from 'react';
 import React, {createContext, useEffect, useMemo, useState} from 'react';
 import {Dimensions} from 'react-native';
@@ -10,25 +9,6 @@ import type ChildrenProps from '@src/types/utils/ChildrenProps';
 import type {NewDimensions, WindowDimensionsContextData, WindowDimensionsProps} from './types';
 
 const WindowDimensionsContext = createContext<WindowDimensionsContextData | null>(null);
-const windowDimensionsPropTypes = {
-    // Width of the window
-    windowWidth: PropTypes.number.isRequired,
-
-    // Height of the window
-    windowHeight: PropTypes.number.isRequired,
-
-    // Is the window width extra narrow, like on a Fold mobile device?
-    isExtraSmallScreenWidth: PropTypes.bool.isRequired,
-
-    // Is the window width narrow, like on a mobile device?
-    isSmallScreenWidth: PropTypes.bool.isRequired,
-
-    // Is the window width medium sized, like on a tablet device?
-    isMediumScreenWidth: PropTypes.bool.isRequired,
-
-    // Is the window width wide, like on a browser or desktop?
-    isLargeScreenWidth: PropTypes.bool.isRequired,
-};
 
 function WindowDimensionsProvider(props: ChildrenProps) {
     const [windowDimension, setWindowDimension] = useState(() => {
@@ -98,4 +78,4 @@ export default function withWindowDimensions<TProps extends WindowDimensionsProp
     return React.forwardRef(WithWindowDimensions);
 }
 
-export {WindowDimensionsProvider, windowDimensionsPropTypes};
+export {WindowDimensionsProvider};
diff --git a/src/components/withWindowDimensions/index.tsx b/src/components/withWindowDimensions/index.tsx
index b2a3a58726bf..cb175fe11e74 100644
--- a/src/components/withWindowDimensions/index.tsx
+++ b/src/components/withWindowDimensions/index.tsx
@@ -1,5 +1,4 @@
 import lodashDebounce from 'lodash/debounce';
-import PropTypes from 'prop-types';
 import type {ComponentType, ForwardedRef, RefAttributes} from 'react';
 import React, {createContext, useEffect, useMemo, useState} from 'react';
 import {Dimensions} from 'react-native';
@@ -11,25 +10,6 @@ import type ChildrenProps from '@src/types/utils/ChildrenProps';
 import type {NewDimensions, WindowDimensionsContextData, WindowDimensionsProps} from './types';
 
 const WindowDimensionsContext = createContext<WindowDimensionsContextData | null>(null);
-const windowDimensionsPropTypes = {
-    // Width of the window
-    windowWidth: PropTypes.number.isRequired,
-
-    // Height of the window
-    windowHeight: PropTypes.number.isRequired,
-
-    // Is the window width extra narrow, like on a Fold mobile device?
-    isExtraSmallScreenWidth: PropTypes.bool.isRequired,
-
-    // Is the window width narrow, like on a mobile device?
-    isSmallScreenWidth: PropTypes.bool.isRequired,
-
-    // Is the window width medium sized, like on a tablet device?
-    isMediumScreenWidth: PropTypes.bool.isRequired,
-
-    // Is the window width wide, like on a browser or desktop?
-    isLargeScreenWidth: PropTypes.bool.isRequired,
-};
 
 function WindowDimensionsProvider(props: ChildrenProps) {
     const [windowDimension, setWindowDimension] = useState(() => {
@@ -104,4 +84,4 @@ export default function withWindowDimensions<TProps extends WindowDimensionsProp
     return React.forwardRef(WithWindowDimensions);
 }
 
-export {WindowDimensionsProvider, windowDimensionsPropTypes};
+export {WindowDimensionsProvider};
diff --git a/src/hooks/__mocks__/usePermissions.ts b/src/hooks/__mocks__/usePermissions.ts
deleted file mode 100644
index a12b1f52d8ab..000000000000
--- a/src/hooks/__mocks__/usePermissions.ts
+++ /dev/null
@@ -1,7 +0,0 @@
-/**
- * @returns A mock of the usePermissions hook.
- */
-const usePermissions = () => ({
-    canUseViolations: true,
-});
-export default usePermissions;
diff --git a/src/hooks/useActiveCentralPaneRoute.ts b/src/hooks/useActiveCentralPaneRoute.ts
new file mode 100644
index 000000000000..05354e810c3d
--- /dev/null
+++ b/src/hooks/useActiveCentralPaneRoute.ts
@@ -0,0 +1,9 @@
+import {useContext} from 'react';
+import ActiveCentralPaneRouteContext from '@libs/Navigation/AppNavigator/Navigators/ActiveCentralPaneRouteContext';
+import type {AuthScreensParamList, NavigationPartialRoute} from '@libs/Navigation/types';
+
+function useActiveCentralPaneRoute(): NavigationPartialRoute<keyof AuthScreensParamList> | undefined {
+    return useContext(ActiveCentralPaneRouteContext);
+}
+
+export default useActiveCentralPaneRoute;
diff --git a/src/hooks/useActiveRoute.ts b/src/hooks/useActiveRoute.ts
deleted file mode 100644
index afccc28f8243..000000000000
--- a/src/hooks/useActiveRoute.ts
+++ /dev/null
@@ -1,9 +0,0 @@
-import {useContext} from 'react';
-import ActiveRouteContext from '@libs/Navigation/AppNavigator/Navigators/ActiveRouteContext';
-import type {CentralPaneNavigatorParamList, NavigationPartialRoute} from '@libs/Navigation/types';
-
-function useActiveRoute(): NavigationPartialRoute<keyof CentralPaneNavigatorParamList> | undefined {
-    return useContext(ActiveRouteContext);
-}
-
-export default useActiveRoute;
diff --git a/src/hooks/useActiveWorkspaceFromNavigationState.ts b/src/hooks/useActiveWorkspaceFromNavigationState.ts
new file mode 100644
index 000000000000..d2851e83ab6c
--- /dev/null
+++ b/src/hooks/useActiveWorkspaceFromNavigationState.ts
@@ -0,0 +1,31 @@
+import {useNavigationState} from '@react-navigation/native';
+import Log from '@libs/Log';
+import type {BottomTabNavigatorParamList} from '@libs/Navigation/types';
+import SCREENS from '@src/SCREENS';
+
+/**
+ *  Get the currently selected policy ID stored in the navigation state. This hook should only be called only from screens in BottomTab.
+ *  Differences between this hook and useActiveWorkspace:
+ *  - useActiveWorkspaceFromNavigationState reads the active workspace id directly from the navigation state, it's a bit slower than useActiveWorkspace and it can be called only from BottomTabScreens.
+ *    It allows to read a value of policyID immediately after the update.
+ *  - useActiveWorkspace allows to read the current policyID anywhere, it's faster because it doesn't require searching in the navigation state.
+ */
+function useActiveWorkspaceFromNavigationState() {
+    // The last policyID value is always stored in the last route in BottomTabNavigator.
+    const activeWorkspaceID = useNavigationState<BottomTabNavigatorParamList, string | undefined>((state) => {
+        // SCREENS.HOME is a screen located in the BottomTabNavigator, if it's not in state.routeNames it means that this hook was called from a screen in another navigator.
+        if (!state.routeNames.includes(SCREENS.HOME)) {
+            Log.warn('useActiveWorkspaceFromNavigationState should be called only from BottomTab screens');
+        }
+
+        const params = state.routes.at(-1)?.params ?? {};
+
+        if ('policyID' in params) {
+            return params?.policyID;
+        }
+    });
+
+    return activeWorkspaceID;
+}
+
+export default useActiveWorkspaceFromNavigationState;
diff --git a/src/hooks/useAnimatedHighlightStyle/config.native.ts b/src/hooks/useAnimatedHighlightStyle/config.native.ts
deleted file mode 100644
index a62d3a33039e..000000000000
--- a/src/hooks/useAnimatedHighlightStyle/config.native.ts
+++ /dev/null
@@ -1,5 +0,0 @@
-const DELAY_FACTOR = 1.85;
-
-export default {};
-
-export {DELAY_FACTOR};
diff --git a/src/hooks/useAnimatedHighlightStyle/config.ts b/src/hooks/useAnimatedHighlightStyle/config.ts
deleted file mode 100644
index 6010c8c33aa7..000000000000
--- a/src/hooks/useAnimatedHighlightStyle/config.ts
+++ /dev/null
@@ -1,8 +0,0 @@
-import {isMobile} from '@libs/Browser';
-
-// It takes varying amount of time to navigate to a new page on mobile and desktop
-// This variable takes that into account
-const DELAY_FACTOR = isMobile() ? 1 : 0.2;
-export default {};
-
-export {DELAY_FACTOR};
diff --git a/src/hooks/useAnimatedHighlightStyle/index.ts b/src/hooks/useAnimatedHighlightStyle/index.ts
index e438bd2473fa..e474a9455d4d 100644
--- a/src/hooks/useAnimatedHighlightStyle/index.ts
+++ b/src/hooks/useAnimatedHighlightStyle/index.ts
@@ -1,9 +1,9 @@
-import React from 'react';
+import React, {useState} from 'react';
 import {InteractionManager} from 'react-native';
 import {Easing, interpolate, interpolateColor, runOnJS, useAnimatedStyle, useSharedValue, withDelay, withSequence, withTiming} from 'react-native-reanimated';
+import useScreenWrapperTranstionStatus from '@hooks/useScreenWrapperTransitionStatus';
 import useTheme from '@hooks/useTheme';
 import CONST from '@src/CONST';
-import {DELAY_FACTOR} from './config';
 
 type Props = {
     /** Border radius of the wrapper */
@@ -12,14 +12,26 @@ type Props = {
     /** Height of the item that is to be faded */
     height: number;
 
-    /** Whether the item should be highlighted */
-    shouldHighlight: boolean;
+    /** Delay before the highlighted item enters */
+    itemEnterDelay?: number;
+
+    /** Duration in which the item enters */
+    itemEnterDuration?: number;
+
+    /** Delay before the item starts to get highlighted */
+    highlightStartDelay?: number;
+
+    /** Duration in which the item gets fully highlighted */
+    highlightStartDuration?: number;
+
+    /** Delay before the item starts to get un-highlighted */
+    highlightEndDelay?: number;
 
-    /** Duration of the highlight animation */
-    highlightDuration?: number;
+    /** Duration in which the item gets fully un-highlighted */
+    highlightEndDuration?: number;
 
-    /** Delay before the highlight animation starts */
-    delay?: number;
+    /** Whether the item should be highlighted */
+    shouldHighlight: boolean;
 };
 
 /**
@@ -28,37 +40,69 @@ type Props = {
 export default function useAnimatedHighlightStyle({
     borderRadius,
     shouldHighlight,
-    highlightDuration = CONST.ANIMATED_HIGHLIGHT_DURATION,
-    delay = CONST.ANIMATED_HIGHLIGHT_DELAY,
+    itemEnterDelay = CONST.ANIMATED_HIGHLIGHT_ENTRY_DELAY,
+    itemEnterDuration = CONST.ANIMATED_HIGHLIGHT_ENTRY_DURATION,
+    highlightStartDelay = CONST.ANIMATED_HIGHLIGHT_START_DELAY,
+    highlightStartDuration = CONST.ANIMATED_HIGHLIGHT_START_DURATION,
+    highlightEndDelay = CONST.ANIMATED_HIGHLIGHT_END_DELAY,
+    highlightEndDuration = CONST.ANIMATED_HIGHLIGHT_END_DURATION,
     height,
 }: Props) {
-    const actualDelay = delay * DELAY_FACTOR;
+    const [startHighlight, setStartHighlight] = useState(false);
     const repeatableProgress = useSharedValue(0);
     const nonRepeatableProgress = useSharedValue(shouldHighlight ? 0 : 1);
+    const {didScreenTransitionEnd} = useScreenWrapperTranstionStatus();
     const theme = useTheme();
 
     const highlightBackgroundStyle = useAnimatedStyle(() => ({
-        backgroundColor: interpolateColor(repeatableProgress.value, [0, 1], ['rgba(0, 0, 0, 0)', theme.border]),
+        backgroundColor: interpolateColor(repeatableProgress.value, [0, 1], [theme.appBG, theme.border]),
         height: interpolate(nonRepeatableProgress.value, [0, 1], [0, height]),
         opacity: interpolate(nonRepeatableProgress.value, [0, 1], [0, 1]),
         borderRadius,
     }));
 
     React.useEffect(() => {
-        if (!shouldHighlight) {
+        if (!shouldHighlight || startHighlight) {
             return;
         }
+        setStartHighlight(true);
+    }, [shouldHighlight, startHighlight]);
 
+    React.useEffect(() => {
+        if (!startHighlight || !didScreenTransitionEnd) {
+            return;
+        }
+        setStartHighlight(false);
         InteractionManager.runAfterInteractions(() => {
             runOnJS(() => {
-                nonRepeatableProgress.value = withDelay(actualDelay, withTiming(1, {duration: highlightDuration, easing: Easing.inOut(Easing.ease)}));
-                repeatableProgress.value = withSequence(
-                    withDelay(actualDelay, withTiming(1, {duration: highlightDuration, easing: Easing.inOut(Easing.ease)})),
-                    withDelay(actualDelay, withTiming(0, {duration: highlightDuration, easing: Easing.inOut(Easing.ease)})),
+                nonRepeatableProgress.value = withDelay(
+                    itemEnterDelay,
+                    withTiming(1, {duration: itemEnterDuration, easing: Easing.inOut(Easing.ease)}, (finished) => {
+                        if (!finished) {
+                            return;
+                        }
+
+                        // eslint-disable-next-line react-compiler/react-compiler
+                        repeatableProgress.value = withSequence(
+                            withDelay(highlightStartDelay, withTiming(1, {duration: highlightStartDuration, easing: Easing.inOut(Easing.ease)})),
+                            withDelay(highlightEndDelay, withTiming(0, {duration: highlightEndDuration, easing: Easing.inOut(Easing.ease)})),
+                        );
+                    }),
                 );
             })();
         });
-    }, [shouldHighlight, highlightDuration, actualDelay, repeatableProgress, nonRepeatableProgress]);
+    }, [
+        didScreenTransitionEnd,
+        startHighlight,
+        itemEnterDelay,
+        itemEnterDuration,
+        highlightStartDelay,
+        highlightStartDuration,
+        highlightEndDelay,
+        highlightEndDuration,
+        repeatableProgress,
+        nonRepeatableProgress,
+    ]);
 
     return highlightBackgroundStyle;
 }
diff --git a/src/hooks/useArrowKeyFocusManager.ts b/src/hooks/useArrowKeyFocusManager.ts
index 28a137656cfa..2de6cc251560 100644
--- a/src/hooks/useArrowKeyFocusManager.ts
+++ b/src/hooks/useArrowKeyFocusManager.ts
@@ -1,6 +1,7 @@
 import {useCallback, useEffect, useMemo, useState} from 'react';
 import CONST from '@src/CONST';
 import useKeyboardShortcut from './useKeyboardShortcut';
+import usePrevious from './usePrevious';
 
 type Config = {
     maxIndex: number;
@@ -51,6 +52,7 @@ export default function useArrowKeyFocusManager({
     isFocused = true,
 }: Config): UseArrowKeyFocusManager {
     const [focusedIndex, setFocusedIndex] = useState(initialFocusedIndex);
+    const prevIsFocusedIndex = usePrevious(focusedIndex);
     const arrowConfig = useMemo(
         () => ({
             excludedNodes: shouldExcludeTextAreaNodes ? ['TEXTAREA'] : [],
@@ -67,8 +69,13 @@ export default function useArrowKeyFocusManager({
         [isActive, shouldExcludeTextAreaNodes, allowHorizontalArrowKeys],
     );
 
-    // eslint-disable-next-line react-hooks/exhaustive-deps
-    useEffect(() => onFocusedIndexChange(focusedIndex), [focusedIndex]);
+    useEffect(() => {
+        if (prevIsFocusedIndex === focusedIndex) {
+            return;
+        }
+        onFocusedIndexChange(focusedIndex);
+        // eslint-disable-next-line react-compiler/react-compiler, react-hooks/exhaustive-deps
+    }, [focusedIndex, prevIsFocusedIndex]);
 
     const arrowUpCallback = useCallback(() => {
         if (maxIndex < 0 || !isFocused) {
diff --git a/src/hooks/useAutoFocusInput.ts b/src/hooks/useAutoFocusInput.ts
index e8e7c1187a63..26f045ebd579 100644
--- a/src/hooks/useAutoFocusInput.ts
+++ b/src/hooks/useAutoFocusInput.ts
@@ -1,5 +1,6 @@
 import {useFocusEffect} from '@react-navigation/native';
 import {useCallback, useContext, useEffect, useRef, useState} from 'react';
+import type {RefObject} from 'react';
 import type {TextInput} from 'react-native';
 import {InteractionManager} from 'react-native';
 import CONST from '@src/CONST';
@@ -7,13 +8,13 @@ import * as Expensify from '@src/Expensify';
 
 type UseAutoFocusInput = {
     inputCallbackRef: (ref: TextInput | null) => void;
+    inputRef: RefObject<TextInput | null>;
 };
 
 export default function useAutoFocusInput(): UseAutoFocusInput {
     const [isInputInitialized, setIsInputInitialized] = useState(false);
     const [isScreenTransitionEnded, setIsScreenTransitionEnded] = useState(false);
 
-    // @ts-expect-error TODO: Remove this when Expensify.js is migrated.
     const {isSplashHidden} = useContext(Expensify.SplashScreenHiddenContext);
 
     const inputRef = useRef<TextInput | null>(null);
@@ -50,8 +51,11 @@ export default function useAutoFocusInput(): UseAutoFocusInput {
 
     const inputCallbackRef = (ref: TextInput | null) => {
         inputRef.current = ref;
+        if (isInputInitialized) {
+            return;
+        }
         setIsInputInitialized(true);
     };
 
-    return {inputCallbackRef};
+    return {inputCallbackRef, inputRef};
 }
diff --git a/src/hooks/useBasePopoverReactionList/index.ts b/src/hooks/useBasePopoverReactionList/index.ts
index 87c9d23c6e35..90fadc85e785 100644
--- a/src/hooks/useBasePopoverReactionList/index.ts
+++ b/src/hooks/useBasePopoverReactionList/index.ts
@@ -22,6 +22,7 @@ export default function useBasePopoverReactionList({emojiName, emojiReactions, a
                 emojiCodes: [],
                 hasUserReacted: false,
                 users: [],
+                isReady: false,
             };
         }
 
@@ -34,6 +35,7 @@ export default function useBasePopoverReactionList({emojiName, emojiReactions, a
             reactionCount,
             hasUserReacted,
             users,
+            isReady: true,
         };
     }
 
diff --git a/src/hooks/useCancelSearchOnModalClose.ts b/src/hooks/useCancelSearchOnModalClose.ts
new file mode 100644
index 000000000000..5f92937cce24
--- /dev/null
+++ b/src/hooks/useCancelSearchOnModalClose.ts
@@ -0,0 +1,17 @@
+import {useNavigation} from '@react-navigation/native';
+import {useEffect} from 'react';
+import {READ_COMMANDS} from '@libs/API/types';
+import HttpUtils from '@libs/HttpUtils';
+
+const useCancelSearchOnModalClose = () => {
+    const navigation = useNavigation();
+    useEffect(() => {
+        const unsubscribe = navigation.addListener('beforeRemove', () => {
+            HttpUtils.cancelPendingRequests(READ_COMMANDS.SEARCH_FOR_REPORTS);
+        });
+
+        return unsubscribe;
+    }, [navigation]);
+};
+
+export default useCancelSearchOnModalClose;
diff --git a/src/hooks/useCancellationType.ts b/src/hooks/useCancellationType.ts
new file mode 100644
index 000000000000..bc34f5feea6f
--- /dev/null
+++ b/src/hooks/useCancellationType.ts
@@ -0,0 +1,43 @@
+import {useEffect, useMemo, useRef, useState} from 'react';
+import {useOnyx} from 'react-native-onyx';
+import type {CancellationType} from '@src/CONST';
+import CONST from '@src/CONST';
+import ONYXKEYS from '@src/ONYXKEYS';
+
+function useCancellationType(): CancellationType | undefined {
+    const [cancellationDetails] = useOnyx(ONYXKEYS.NVP_PRIVATE_CANCELLATION_DETAILS);
+
+    const [cancellationType, setCancellationType] = useState<CancellationType | undefined>();
+
+    // Store initial cancellation details array in a ref for comparison
+    const previousCancellationDetails = useRef(cancellationDetails);
+
+    const memoizedCancellationType = useMemo(() => {
+        const pendingManualCancellation = cancellationDetails?.filter((detail) => detail.cancellationType === CONST.CANCELLATION_TYPE.MANUAL).find((detail) => !detail.cancellationDate);
+
+        // There is a pending manual cancellation - return manual cancellation type
+        if (pendingManualCancellation) {
+            return CONST.CANCELLATION_TYPE.MANUAL;
+        }
+
+        // There are no new items in the cancellation details NVP
+        if (previousCancellationDetails.current?.length === cancellationDetails?.length) {
+            return;
+        }
+
+        // There is a new item in the cancellation details NVP, it has to be an automatic cancellation, as pending manual cancellations are handled above
+        return CONST.CANCELLATION_TYPE.AUTOMATIC;
+    }, [cancellationDetails]);
+
+    useEffect(() => {
+        if (!memoizedCancellationType) {
+            return;
+        }
+
+        setCancellationType(memoizedCancellationType);
+    }, [memoizedCancellationType]);
+
+    return cancellationType;
+}
+
+export default useCancellationType;
diff --git a/src/hooks/useCopySelectionHelper.ts b/src/hooks/useCopySelectionHelper.ts
index be7830dc6170..9bcb9b8b0139 100644
--- a/src/hooks/useCopySelectionHelper.ts
+++ b/src/hooks/useCopySelectionHelper.ts
@@ -1,7 +1,7 @@
-import ExpensiMark from 'expensify-common/lib/ExpensiMark';
 import {useEffect} from 'react';
 import Clipboard from '@libs/Clipboard';
 import KeyboardShortcut from '@libs/KeyboardShortcut';
+import Parser from '@libs/Parser';
 import SelectionScraper from '@libs/SelectionScraper';
 import CONST from '@src/CONST';
 
@@ -10,12 +10,11 @@ function copySelectionToClipboard() {
     if (!selection) {
         return;
     }
-    const parser = new ExpensiMark();
     if (!Clipboard.canSetHtml()) {
-        Clipboard.setString(parser.htmlToMarkdown(selection));
+        Clipboard.setString(Parser.htmlToMarkdown(selection));
         return;
     }
-    Clipboard.setHtml(selection, parser.htmlToText(selection));
+    Clipboard.setHtml(selection, Parser.htmlToText(selection));
 }
 
 export default function useCopySelectionHelper() {
diff --git a/src/hooks/useCurrentUserPersonalDetails.ts b/src/hooks/useCurrentUserPersonalDetails.ts
index da3c2b18bd83..37fbaeab4ccb 100644
--- a/src/hooks/useCurrentUserPersonalDetails.ts
+++ b/src/hooks/useCurrentUserPersonalDetails.ts
@@ -1,19 +1,13 @@
 import {useMemo} from 'react';
 import {usePersonalDetails, useSession} from '@components/OnyxProvider';
-import CONST from '@src/CONST';
 import type {PersonalDetails} from '@src/types/onyx';
 
-type CurrentUserPersonalDetails = PersonalDetails | Record<string, never>;
-
 function useCurrentUserPersonalDetails() {
     const session = useSession();
-    const personalDetails = usePersonalDetails() ?? CONST.EMPTY_OBJECT;
-    const accountID = session?.accountID ?? 0;
+    const personalDetails = usePersonalDetails();
+    const accountID = session?.accountID ?? -1;
     const accountPersonalDetails = personalDetails?.[accountID];
-    const currentUserPersonalDetails: CurrentUserPersonalDetails = useMemo(
-        () => (accountPersonalDetails ? {...accountPersonalDetails, accountID} : {}) as CurrentUserPersonalDetails,
-        [accountPersonalDetails, accountID],
-    );
+    const currentUserPersonalDetails: PersonalDetails = useMemo(() => ({...accountPersonalDetails, accountID}), [accountPersonalDetails, accountID]);
 
     return currentUserPersonalDetails;
 }
diff --git a/src/hooks/useDebouncedState.ts b/src/hooks/useDebouncedState.ts
index 6fda8f7d54d4..8d7d43cb6f9c 100644
--- a/src/hooks/useDebouncedState.ts
+++ b/src/hooks/useDebouncedState.ts
@@ -6,7 +6,7 @@ import CONST from '@src/CONST';
  * A React hook that provides a state and its debounced version.
  *
  * @param initialValue - The initial value of the state.
- * @param delay - The debounce delay in milliseconds. Defaults to SEARCH_OPTION_LIST_DEBOUNCE_TIME = 300ms.
+ * @param delay - The debounce delay in milliseconds. Defaults to USE_DEBOUNCED_STATE_DELAY = 300ms.
  * @returns A tuple containing:
  *          - The current state value.
  *          - The debounced state value.
@@ -17,7 +17,7 @@ import CONST from '@src/CONST';
  * @example
  * const [value, debouncedValue, setValue] = useDebouncedState<string>("", 300);
  */
-function useDebouncedState<T>(initialValue: T, delay: number = CONST.TIMING.SEARCH_OPTION_LIST_DEBOUNCE_TIME): [T, T, (value: T) => void] {
+function useDebouncedState<T>(initialValue: T, delay: number = CONST.TIMING.USE_DEBOUNCED_STATE_DELAY): [T, T, (value: T) => void] {
     const [value, setValue] = useState(initialValue);
     const [debouncedValue, setDebouncedValue] = useState(initialValue);
     const debouncedSetDebouncedValue = useRef(debounce(setDebouncedValue, delay)).current;
diff --git a/src/hooks/useDeepCompareRef.ts b/src/hooks/useDeepCompareRef.ts
new file mode 100644
index 000000000000..7511c1516a1d
--- /dev/null
+++ b/src/hooks/useDeepCompareRef.ts
@@ -0,0 +1,24 @@
+import isEqual from 'lodash/isEqual';
+import {useRef} from 'react';
+
+/**
+ * This hook returns a reference to the provided value,
+ * but only updates that reference if a deep comparison indicates that the value has changed.
+ *
+ * This is useful when working with objects or arrays as dependencies to other hooks like `useEffect` or `useMemo`,
+ * where you want the hook to trigger not just on reference changes, but also when the contents of the object or array change.
+ *
+ * @example
+ * const myArray = // some array
+ * const deepComparedArray = useDeepCompareRef(myArray);
+ * useEffect(() => {
+ *   // This will run not just when myArray is a new array, but also when its contents change.
+ * }, [deepComparedArray]);
+ */
+export default function useDeepCompareRef<T>(value: T): T | undefined {
+    const ref = useRef<T>();
+    if (!isEqual(value, ref.current)) {
+        ref.current = value;
+    }
+    return ref.current;
+}
diff --git a/src/hooks/useDragAndDrop.ts b/src/hooks/useDragAndDrop.ts
deleted file mode 100644
index 7644d7bba5f0..000000000000
--- a/src/hooks/useDragAndDrop.ts
+++ /dev/null
@@ -1,136 +0,0 @@
-import {useIsFocused} from '@react-navigation/native';
-import type React from 'react';
-import {useCallback, useContext, useEffect, useRef, useState} from 'react';
-import type {View} from 'react-native';
-import {PopoverContext} from '@components/PopoverProvider';
-
-const COPY_DROP_EFFECT = 'copy';
-const NONE_DROP_EFFECT = 'none';
-const DRAG_ENTER_EVENT = 'dragenter';
-const DRAG_OVER_EVENT = 'dragover';
-const DRAG_LEAVE_EVENT = 'dragleave';
-const DROP_EVENT = 'drop';
-
-type DragAndDropParams = {
-    dropZone: React.MutableRefObject<HTMLDivElement | View | null>;
-    onDrop?: (event: DragEvent) => void;
-    shouldAllowDrop?: boolean;
-    isDisabled?: boolean;
-    shouldAcceptDrop?: (event: DragEvent) => boolean;
-};
-
-type DragAndDropOptions = {
-    isDraggingOver: boolean;
-};
-
-/**
- * @param dropZone – ref to the dropZone component
- */
-export default function useDragAndDrop({dropZone, onDrop = () => {}, shouldAllowDrop = true, isDisabled = false, shouldAcceptDrop = () => true}: DragAndDropParams): DragAndDropOptions {
-    const isFocused = useIsFocused();
-    const [isDraggingOver, setIsDraggingOver] = useState(false);
-    const {close: closePopover} = useContext(PopoverContext);
-
-    const enterTarget = useRef<EventTarget | null>(null);
-
-    useEffect(() => {
-        if (isFocused && !isDisabled) {
-            return;
-        }
-        setIsDraggingOver(false);
-    }, [isFocused, isDisabled]);
-
-    const handleDragEvent = useCallback(
-        (event: DragEvent) => {
-            const shouldAcceptThisDrop = shouldAllowDrop && shouldAcceptDrop(event);
-
-            if (shouldAcceptThisDrop && event.type === DRAG_ENTER_EVENT) {
-                closePopover();
-            }
-
-            const effect = shouldAcceptThisDrop ? COPY_DROP_EFFECT : NONE_DROP_EFFECT;
-
-            if (event.dataTransfer) {
-                // eslint-disable-next-line no-param-reassign
-                event.dataTransfer.dropEffect = effect;
-                // eslint-disable-next-line no-param-reassign
-                event.dataTransfer.effectAllowed = effect;
-            }
-        },
-        [shouldAllowDrop, shouldAcceptDrop, closePopover],
-    );
-
-    /**
-     * Handles all types of drag-N-drop events on the drop zone associated with composer
-     */
-    const dropZoneDragHandler = useCallback(
-        (event: DragEvent) => {
-            if (!isFocused || isDisabled || !shouldAcceptDrop(event)) {
-                return;
-            }
-
-            event.preventDefault();
-            event.stopPropagation();
-
-            switch (event.type) {
-                case DRAG_OVER_EVENT:
-                    handleDragEvent(event);
-                    break;
-                case DRAG_ENTER_EVENT:
-                    handleDragEvent(event);
-                    enterTarget.current = event.target;
-                    if (isDraggingOver) {
-                        return;
-                    }
-                    setIsDraggingOver(true);
-                    break;
-                case DRAG_LEAVE_EVENT:
-                    if (!isDraggingOver) {
-                        return;
-                    }
-                    // This is necessary because dragging over children will cause dragleave to execute on the parent.
-                    if (enterTarget.current !== event.target) {
-                        return;
-                    }
-
-                    setIsDraggingOver(false);
-                    break;
-                case DROP_EVENT:
-                    setIsDraggingOver(false);
-                    onDrop(event);
-                    break;
-                default:
-                    break;
-            }
-        },
-        [isFocused, isDisabled, shouldAcceptDrop, isDraggingOver, onDrop, handleDragEvent],
-    );
-
-    useEffect(() => {
-        if (!dropZone.current) {
-            return;
-        }
-
-        const dropZoneRef = dropZone.current as HTMLDivElement;
-
-        // Note that the dragover event needs to be called with `event.preventDefault` in order for the drop event to be fired:
-        // https://stackoverflow.com/questions/21339924/drop-event-not-firing-in-chrome
-        dropZoneRef.setAttribute('webkitdirectory', '');
-        dropZoneRef.addEventListener(DRAG_OVER_EVENT, dropZoneDragHandler);
-        dropZoneRef.addEventListener(DRAG_ENTER_EVENT, dropZoneDragHandler);
-        dropZoneRef.addEventListener(DRAG_LEAVE_EVENT, dropZoneDragHandler);
-        dropZoneRef.addEventListener(DROP_EVENT, dropZoneDragHandler);
-        return () => {
-            if (!dropZoneRef) {
-                return;
-            }
-            dropZoneRef.removeAttribute('webkitdirectory');
-            dropZoneRef.removeEventListener(DRAG_OVER_EVENT, dropZoneDragHandler);
-            dropZoneRef.removeEventListener(DRAG_ENTER_EVENT, dropZoneDragHandler);
-            dropZoneRef.removeEventListener(DRAG_LEAVE_EVENT, dropZoneDragHandler);
-            dropZoneRef.removeEventListener(DROP_EVENT, dropZoneDragHandler);
-        };
-    }, [dropZone, dropZoneDragHandler]);
-
-    return {isDraggingOver};
-}
diff --git a/src/hooks/useDragAndDrop/index.native.ts b/src/hooks/useDragAndDrop/index.native.ts
new file mode 100644
index 000000000000..6bdc85bf0723
--- /dev/null
+++ b/src/hooks/useDragAndDrop/index.native.ts
@@ -0,0 +1,5 @@
+import type UseDragAndDrop from './types';
+
+const useDragAndDrop: UseDragAndDrop = () => ({isDraggingOver: false});
+
+export default useDragAndDrop;
diff --git a/src/hooks/useDragAndDrop/index.ts b/src/hooks/useDragAndDrop/index.ts
new file mode 100644
index 000000000000..b278039ee020
--- /dev/null
+++ b/src/hooks/useDragAndDrop/index.ts
@@ -0,0 +1,125 @@
+import {useIsFocused} from '@react-navigation/native';
+import {useCallback, useContext, useEffect, useRef, useState} from 'react';
+import {PopoverContext} from '@components/PopoverProvider';
+import type UseDragAndDrop from './types';
+
+const COPY_DROP_EFFECT = 'copy';
+const NONE_DROP_EFFECT = 'none';
+const DRAG_ENTER_EVENT = 'dragenter';
+const DRAG_OVER_EVENT = 'dragover';
+const DRAG_LEAVE_EVENT = 'dragleave';
+const DROP_EVENT = 'drop';
+
+/**
+ * @param dropZone – ref to the dropZone component
+ */
+const useDragAndDrop: UseDragAndDrop = ({dropZone, onDrop = () => {}, shouldAllowDrop = true, isDisabled = false, shouldAcceptDrop = () => true}) => {
+    const isFocused = useIsFocused();
+    const [isDraggingOver, setIsDraggingOver] = useState(false);
+    const {close: closePopover} = useContext(PopoverContext);
+
+    const enterTarget = useRef<EventTarget | null>(null);
+
+    useEffect(() => {
+        if (isFocused && !isDisabled) {
+            return;
+        }
+        setIsDraggingOver(false);
+    }, [isFocused, isDisabled]);
+
+    const handleDragEvent = useCallback(
+        (event: DragEvent) => {
+            const shouldAcceptThisDrop = shouldAllowDrop && shouldAcceptDrop(event);
+
+            if (shouldAcceptThisDrop && event.type === DRAG_ENTER_EVENT) {
+                closePopover();
+            }
+
+            const effect = shouldAcceptThisDrop ? COPY_DROP_EFFECT : NONE_DROP_EFFECT;
+
+            if (event.dataTransfer) {
+                // eslint-disable-next-line no-param-reassign
+                event.dataTransfer.dropEffect = effect;
+                // eslint-disable-next-line no-param-reassign
+                event.dataTransfer.effectAllowed = effect;
+            }
+        },
+        [shouldAllowDrop, shouldAcceptDrop, closePopover],
+    );
+
+    /**
+     * Handles all types of drag-N-drop events on the drop zone associated with composer
+     */
+    const dropZoneDragHandler = useCallback(
+        (event: DragEvent) => {
+            if (!isFocused || isDisabled || !shouldAcceptDrop(event)) {
+                return;
+            }
+
+            event.preventDefault();
+            event.stopPropagation();
+
+            switch (event.type) {
+                case DRAG_OVER_EVENT:
+                    handleDragEvent(event);
+                    break;
+                case DRAG_ENTER_EVENT:
+                    handleDragEvent(event);
+                    enterTarget.current = event.target;
+                    if (isDraggingOver) {
+                        return;
+                    }
+                    setIsDraggingOver(true);
+                    break;
+                case DRAG_LEAVE_EVENT:
+                    if (!isDraggingOver) {
+                        return;
+                    }
+                    // This is necessary because dragging over children will cause dragleave to execute on the parent.
+                    if (enterTarget.current !== event.target) {
+                        return;
+                    }
+
+                    setIsDraggingOver(false);
+                    break;
+                case DROP_EVENT:
+                    setIsDraggingOver(false);
+                    onDrop(event);
+                    break;
+                default:
+                    break;
+            }
+        },
+        [isFocused, isDisabled, shouldAcceptDrop, isDraggingOver, onDrop, handleDragEvent],
+    );
+
+    useEffect(() => {
+        if (!dropZone.current) {
+            return;
+        }
+
+        const dropZoneRef = dropZone.current;
+
+        // Note that the dragover event needs to be called with `event.preventDefault` in order for the drop event to be fired:
+        // https://stackoverflow.com/questions/21339924/drop-event-not-firing-in-chrome
+        dropZoneRef.setAttribute('webkitdirectory', '');
+        dropZoneRef.addEventListener(DRAG_OVER_EVENT, dropZoneDragHandler);
+        dropZoneRef.addEventListener(DRAG_ENTER_EVENT, dropZoneDragHandler);
+        dropZoneRef.addEventListener(DRAG_LEAVE_EVENT, dropZoneDragHandler);
+        dropZoneRef.addEventListener(DROP_EVENT, dropZoneDragHandler);
+        return () => {
+            if (!dropZoneRef) {
+                return;
+            }
+            dropZoneRef.removeAttribute('webkitdirectory');
+            dropZoneRef.removeEventListener(DRAG_OVER_EVENT, dropZoneDragHandler);
+            dropZoneRef.removeEventListener(DRAG_ENTER_EVENT, dropZoneDragHandler);
+            dropZoneRef.removeEventListener(DRAG_LEAVE_EVENT, dropZoneDragHandler);
+            dropZoneRef.removeEventListener(DROP_EVENT, dropZoneDragHandler);
+        };
+    }, [dropZone, dropZoneDragHandler]);
+
+    return {isDraggingOver};
+};
+
+export default useDragAndDrop;
diff --git a/src/hooks/useDragAndDrop/types.ts b/src/hooks/useDragAndDrop/types.ts
new file mode 100644
index 000000000000..78859783ee36
--- /dev/null
+++ b/src/hooks/useDragAndDrop/types.ts
@@ -0,0 +1,15 @@
+type DragAndDropParams = {
+    dropZone: React.MutableRefObject<HTMLDivElement | null>;
+    onDrop?: (event: DragEvent) => void;
+    shouldAllowDrop?: boolean;
+    isDisabled?: boolean;
+    shouldAcceptDrop?: (event: DragEvent) => boolean;
+};
+
+type DragAndDropResult = {
+    isDraggingOver: boolean;
+};
+
+type UseDragAndDrop = (params: DragAndDropParams) => DragAndDropResult;
+
+export default UseDragAndDrop;
diff --git a/src/hooks/useEmptyViewHeaderHeight/const.ts b/src/hooks/useEmptyViewHeaderHeight/const.ts
new file mode 100644
index 000000000000..83327ad36c8b
--- /dev/null
+++ b/src/hooks/useEmptyViewHeaderHeight/const.ts
@@ -0,0 +1,5 @@
+const HEADER_HEIGHT = 80;
+const BUTTON_HEIGHT = 40;
+const BUTTON_MARGIN = 12;
+
+export {HEADER_HEIGHT, BUTTON_HEIGHT, BUTTON_MARGIN};
diff --git a/src/hooks/useEmptyViewHeaderHeight/index.ios.ts b/src/hooks/useEmptyViewHeaderHeight/index.ios.ts
new file mode 100644
index 000000000000..d59e105574bf
--- /dev/null
+++ b/src/hooks/useEmptyViewHeaderHeight/index.ios.ts
@@ -0,0 +1,10 @@
+import useSafeAreaInsets from '@hooks/useSafeAreaInsets';
+import {BUTTON_HEIGHT, BUTTON_MARGIN, HEADER_HEIGHT} from './const';
+
+function useEmptyViewHeaderHeight(isSmallScreenWidth: boolean): number {
+    const safeAreaInsets = useSafeAreaInsets();
+
+    return isSmallScreenWidth ? HEADER_HEIGHT + BUTTON_HEIGHT + BUTTON_MARGIN + safeAreaInsets.top : HEADER_HEIGHT;
+}
+
+export default useEmptyViewHeaderHeight;
diff --git a/src/hooks/useEmptyViewHeaderHeight/index.ts b/src/hooks/useEmptyViewHeaderHeight/index.ts
new file mode 100644
index 000000000000..d241d95b236f
--- /dev/null
+++ b/src/hooks/useEmptyViewHeaderHeight/index.ts
@@ -0,0 +1,7 @@
+import {BUTTON_HEIGHT, BUTTON_MARGIN, HEADER_HEIGHT} from './const';
+
+function useEmptyViewHeaderHeight(isSmallScreenWidth: boolean): number {
+    return isSmallScreenWidth ? HEADER_HEIGHT + BUTTON_HEIGHT + BUTTON_MARGIN : HEADER_HEIGHT;
+}
+
+export default useEmptyViewHeaderHeight;
diff --git a/src/hooks/useExitTo.ts b/src/hooks/useExitTo.ts
new file mode 100644
index 000000000000..74226453d3f6
--- /dev/null
+++ b/src/hooks/useExitTo.ts
@@ -0,0 +1,17 @@
+import {findFocusedRoute, useNavigationState} from '@react-navigation/native';
+import type {PublicScreensParamList, RootStackParamList} from '@libs/Navigation/types';
+import SCREENS from '@src/SCREENS';
+
+export default function useExitTo() {
+    const activeRouteParams = useNavigationState<RootStackParamList, PublicScreensParamList[typeof SCREENS.TRANSITION_BETWEEN_APPS] | undefined>((state) => {
+        const focusedRoute = findFocusedRoute(state);
+
+        if (focusedRoute?.name !== SCREENS.TRANSITION_BETWEEN_APPS) {
+            return undefined;
+        }
+
+        return focusedRoute?.params as PublicScreensParamList[typeof SCREENS.TRANSITION_BETWEEN_APPS];
+    });
+
+    return activeRouteParams?.exitTo;
+}
diff --git a/src/hooks/useFetchRoute.ts b/src/hooks/useFetchRoute.ts
new file mode 100644
index 000000000000..736e99a31d66
--- /dev/null
+++ b/src/hooks/useFetchRoute.ts
@@ -0,0 +1,34 @@
+import {isEqual} from 'lodash';
+import {useEffect} from 'react';
+import type {OnyxEntry} from 'react-native-onyx';
+import * as IOUUtils from '@libs/IOUUtils';
+import * as TransactionUtils from '@libs/TransactionUtils';
+import * as TransactionAction from '@userActions/Transaction';
+import type {IOUAction} from '@src/CONST';
+import type {Transaction} from '@src/types/onyx';
+import type {WaypointCollection} from '@src/types/onyx/Transaction';
+import useNetwork from './useNetwork';
+import usePrevious from './usePrevious';
+
+export default function useFetchRoute(transaction: OnyxEntry<Transaction>, waypoints: WaypointCollection | undefined, action: IOUAction) {
+    const {isOffline} = useNetwork();
+    const hasRouteError = !!transaction?.errorFields?.route;
+    const hasRoute = TransactionUtils.hasRoute(transaction);
+    const isRouteAbsentWithoutErrors = !hasRoute && !hasRouteError;
+    const isLoadingRoute = transaction?.comment?.isLoading ?? false;
+    const validatedWaypoints = TransactionUtils.getValidWaypoints(waypoints);
+    const previousValidatedWaypoints = usePrevious(validatedWaypoints);
+    const haveValidatedWaypointsChanged = !isEqual(previousValidatedWaypoints, validatedWaypoints);
+    const isDistanceRequest = TransactionUtils.isDistanceRequest(transaction);
+    const shouldFetchRoute = isDistanceRequest && (isRouteAbsentWithoutErrors || haveValidatedWaypointsChanged) && !isLoadingRoute && Object.keys(validatedWaypoints).length > 1;
+
+    useEffect(() => {
+        if (isOffline || !shouldFetchRoute || !transaction?.transactionID) {
+            return;
+        }
+
+        TransactionAction.getRoute(transaction.transactionID, validatedWaypoints, IOUUtils.shouldUseTransactionDraft(action));
+    }, [shouldFetchRoute, transaction?.transactionID, validatedWaypoints, isOffline, action]);
+
+    return {shouldFetchRoute, validatedWaypoints};
+}
diff --git a/src/hooks/useGeographicalStateAndCountryFromRoute.ts b/src/hooks/useGeographicalStateAndCountryFromRoute.ts
new file mode 100644
index 000000000000..b94644bdd287
--- /dev/null
+++ b/src/hooks/useGeographicalStateAndCountryFromRoute.ts
@@ -0,0 +1,27 @@
+import {useRoute} from '@react-navigation/native';
+import {CONST as COMMON_CONST} from 'expensify-common';
+import CONST from '@src/CONST';
+
+type State = keyof typeof COMMON_CONST.STATES;
+type Country = keyof typeof CONST.ALL_COUNTRIES;
+type StateAndCountry = {state?: State; country?: Country};
+
+/**
+ * Extracts the 'state' and 'country' query parameters from the route/ url and validates it against COMMON_CONST.STATES and CONST.ALL_COUNTRIES.
+ * Example 1: Url: https://new.expensify.com/settings/profile/address?state=MO Returns: state=MO
+ * Example 2: Url: https://new.expensify.com/settings/profile/address?state=ASDF Returns: state=undefined
+ * Example 3: Url: https://new.expensify.com/settings/profile/address Returns: state=undefined
+ * Example 4: Url: https://new.expensify.com/settings/profile/address?state=MO-hash-a12341 Returns: state=MO
+ * Similarly for country parameter.
+ */
+export default function useGeographicalStateAndCountryFromRoute(stateParamName = 'state', countryParamName = 'country'): StateAndCountry {
+    const routeParams = useRoute().params as Record<string, string>;
+
+    const stateFromUrlTemp = routeParams?.[stateParamName] as string | undefined;
+    const countryFromUrlTemp = routeParams?.[countryParamName] as string | undefined;
+
+    return {
+        state: COMMON_CONST.STATES[stateFromUrlTemp as State]?.stateISO,
+        country: Object.keys(CONST.ALL_COUNTRIES).find((country) => country === countryFromUrlTemp) as Country,
+    };
+}
diff --git a/src/hooks/useGeographicalStateFromRoute.ts b/src/hooks/useGeographicalStateFromRoute.ts
deleted file mode 100644
index 13936ee78f5b..000000000000
--- a/src/hooks/useGeographicalStateFromRoute.ts
+++ /dev/null
@@ -1,23 +0,0 @@
-import {useRoute} from '@react-navigation/native';
-import type {ParamListBase, RouteProp} from '@react-navigation/native';
-import {CONST as COMMON_CONST} from 'expensify-common/lib/CONST';
-
-type CustomParamList = ParamListBase & Record<string, Record<string, string>>;
-type State = keyof typeof COMMON_CONST.STATES;
-
-/**
- * Extracts the 'state' (default) query parameter from the route/ url and validates it against COMMON_CONST.STATES, returning its ISO code or `undefined`.
- * Example 1: Url: https://new.expensify.com/settings/profile/address?state=MO Returns: MO
- * Example 2: Url: https://new.expensify.com/settings/profile/address?state=ASDF Returns: undefined
- * Example 3: Url: https://new.expensify.com/settings/profile/address Returns: undefined
- * Example 4: Url: https://new.expensify.com/settings/profile/address?state=MO-hash-a12341 Returns: MO
- */
-export default function useGeographicalStateFromRoute(stateParamName = 'state'): State | undefined {
-    const route = useRoute<RouteProp<CustomParamList, string>>();
-    const stateFromUrlTemp = route.params?.[stateParamName] as string | undefined;
-
-    if (!stateFromUrlTemp) {
-        return;
-    }
-    return COMMON_CONST.STATES[stateFromUrlTemp as State]?.stateISO;
-}
diff --git a/src/hooks/useHtmlPaste/index.ts b/src/hooks/useHtmlPaste/index.ts
index 925a3db518ae..6199a36abdca 100644
--- a/src/hooks/useHtmlPaste/index.ts
+++ b/src/hooks/useHtmlPaste/index.ts
@@ -1,6 +1,6 @@
 import {useNavigation} from '@react-navigation/native';
-import ExpensiMark from 'expensify-common/lib/ExpensiMark';
 import {useCallback, useEffect} from 'react';
+import Parser from '@libs/Parser';
 import type UseHtmlPaste from './types';
 
 const insertByCommand = (text: string) => {
@@ -18,11 +18,8 @@ const insertAtCaret = (target: HTMLElement, text: string) => {
         // Move caret to the end of the newly inserted text node.
         range.setStart(node, node.length);
         range.setEnd(node, node.length);
-        selection.removeAllRanges();
-        selection.addRange(range);
+        selection.setBaseAndExtent(range.startContainer, range.startOffset, range.endContainer, range.endOffset);
 
-        // Dispatch paste event to simulate real browser behavior
-        target.dispatchEvent(new Event('paste', {bubbles: true}));
         // Dispatch input event to trigger Markdown Input to parse the new text
         target.dispatchEvent(new Event('input', {bubbles: true}));
     } else {
@@ -47,12 +44,17 @@ const useHtmlPaste: UseHtmlPaste = (textInputRef, preHtmlPasteCallback, removeLi
             }
 
             // Pointer will go out of sight when a large paragraph is pasted on the web. Refocusing the input keeps the cursor in view.
-            textInputRef.current?.blur();
-            textInputRef.current?.focus();
+            // To avoid the keyboard toggle issue in mWeb if using blur() and focus() functions, we just need to dispatch the event to trigger the onFocus handler
+            // We need to trigger the bubbled "focusin" event to make sure the onFocus handler is triggered
+            textInputHTMLElement.dispatchEvent(
+                new FocusEvent('focusin', {
+                    bubbles: true,
+                }),
+            );
             // eslint-disable-next-line no-empty
         } catch (e) {}
         // We only need to set the callback once.
-        // eslint-disable-next-line react-hooks/exhaustive-deps
+        // eslint-disable-next-line react-compiler/react-compiler, react-hooks/exhaustive-deps
     }, []);
 
     /**
@@ -62,8 +64,7 @@ const useHtmlPaste: UseHtmlPaste = (textInputRef, preHtmlPasteCallback, removeLi
      */
     const handlePastedHTML = useCallback(
         (html: string) => {
-            const parser = new ExpensiMark();
-            paste(parser.htmlToMarkdown(html));
+            paste(Parser.htmlToMarkdown(html));
         },
         [paste],
     );
@@ -101,11 +102,10 @@ const useHtmlPaste: UseHtmlPaste = (textInputRef, preHtmlPasteCallback, removeLi
 
             event.preventDefault();
 
-            const types = event.clipboardData?.types;
             const TEXT_HTML = 'text/html';
 
             // If paste contains HTML
-            if (types && types.includes(TEXT_HTML)) {
+            if (event.clipboardData?.types?.includes(TEXT_HTML)) {
                 const pastedHTML = event.clipboardData.getData(TEXT_HTML);
 
                 const domparser = new DOMParser();
@@ -124,7 +124,7 @@ const useHtmlPaste: UseHtmlPaste = (textInputRef, preHtmlPasteCallback, removeLi
             }
             handlePastePlainText(event);
         },
-        // eslint-disable-next-line react-hooks/exhaustive-deps
+        // eslint-disable-next-line react-compiler/react-compiler, react-hooks/exhaustive-deps
         [handlePastedHTML, handlePastePlainText, preHtmlPasteCallback],
     );
 
@@ -135,20 +135,20 @@ const useHtmlPaste: UseHtmlPaste = (textInputRef, preHtmlPasteCallback, removeLi
         let unsubscribeFocus: () => void;
         let unsubscribeBlur: () => void;
         if (removeListenerOnScreenBlur) {
-            unsubscribeFocus = navigation.addListener('focus', () => document.addEventListener('paste', handlePaste));
-            unsubscribeBlur = navigation.addListener('blur', () => document.removeEventListener('paste', handlePaste));
+            unsubscribeFocus = navigation.addListener('focus', () => document.addEventListener('paste', handlePaste, true));
+            unsubscribeBlur = navigation.addListener('blur', () => document.removeEventListener('paste', handlePaste, true));
         }
 
-        document.addEventListener('paste', handlePaste);
+        document.addEventListener('paste', handlePaste, true);
 
         return () => {
             if (removeListenerOnScreenBlur) {
                 unsubscribeFocus();
                 unsubscribeBlur();
             }
-            document.removeEventListener('paste', handlePaste);
+            document.removeEventListener('paste', handlePaste, true);
         };
-        // eslint-disable-next-line react-hooks/exhaustive-deps
+        // eslint-disable-next-line react-compiler/react-compiler, react-hooks/exhaustive-deps
     }, []);
 };
 
diff --git a/src/hooks/useIsReportOpenInRHP.ts b/src/hooks/useIsReportOpenInRHP.ts
deleted file mode 100644
index d452a82615c4..000000000000
--- a/src/hooks/useIsReportOpenInRHP.ts
+++ /dev/null
@@ -1,9 +0,0 @@
-import {useNavigationState} from '@react-navigation/native';
-import getTopmostRouteName from '@libs/Navigation/getTopmostRouteName';
-import SCREENS from '@src/SCREENS';
-
-// This hook checks if the currently open route is ReportScreen in RHP.
-export default function useIsReportOpenInRHP() {
-    const activeRoute = useNavigationState(getTopmostRouteName);
-    return activeRoute === SCREENS.SEARCH.REPORT_RHP;
-}
diff --git a/src/hooks/useIsSplashHidden.ts b/src/hooks/useIsSplashHidden.ts
deleted file mode 100644
index 7563d388416c..000000000000
--- a/src/hooks/useIsSplashHidden.ts
+++ /dev/null
@@ -1,11 +0,0 @@
-import {useContext} from 'react';
-import {SplashScreenHiddenContext} from '@src/Expensify';
-
-type SplashScreenHiddenContextType = {isSplashHidden: boolean};
-
-export default function useIsSplashHidden() {
-    const {isSplashHidden} = useContext(SplashScreenHiddenContext) as SplashScreenHiddenContextType;
-    return isSplashHidden;
-}
-
-export type {SplashScreenHiddenContextType};
diff --git a/src/hooks/useKeyboardShortcut.ts b/src/hooks/useKeyboardShortcut.ts
index 6bf8b2c52bc3..90f43b4520d1 100644
--- a/src/hooks/useKeyboardShortcut.ts
+++ b/src/hooks/useKeyboardShortcut.ts
@@ -26,7 +26,7 @@ type KeyboardShortcutConfig = {
  * Register a keyboard shortcut handler.
  * Recommendation: To ensure stability, wrap the `callback` function with the useCallback hook before using it with this hook.
  */
-export default function useKeyboardShortcut(shortcut: Shortcut, callback: (e?: GestureResponderEvent | KeyboardEvent) => void, config: KeyboardShortcutConfig | Record<string, never> = {}) {
+export default function useKeyboardShortcut(shortcut: Shortcut, callback: (e?: GestureResponderEvent | KeyboardEvent) => void, config: KeyboardShortcutConfig = {}) {
     const {
         captureOnInputs = true,
         shouldBubble = false,
@@ -63,6 +63,6 @@ export default function useKeyboardShortcut(shortcut: Shortcut, callback: (e?: G
         return () => {
             unsubscribe();
         };
-        // eslint-disable-next-line react-hooks/exhaustive-deps
+        // eslint-disable-next-line react-compiler/react-compiler, react-hooks/exhaustive-deps
     }, [isActive, callback, captureOnInputs, excludedNodes, priority, shortcut.descriptionKey, shortcut.modifiers.join(), shortcut.shortcutKey, shouldBubble, shouldPreventDefault]);
 }
diff --git a/src/hooks/useMarkdownStyle.ts b/src/hooks/useMarkdownStyle.ts
index b1f430e232e4..c7e9bf2c0218 100644
--- a/src/hooks/useMarkdownStyle.ts
+++ b/src/hooks/useMarkdownStyle.ts
@@ -5,12 +5,28 @@ import FontUtils from '@styles/utils/FontUtils';
 import variables from '@styles/variables';
 import useTheme from './useTheme';
 
-function useMarkdownStyle(message: string | null = null): MarkdownStyle {
+const defaultEmptyArray: Array<keyof MarkdownStyle> = [];
+
+function useMarkdownStyle(message: string | null = null, excludeStyles: Array<keyof MarkdownStyle> = defaultEmptyArray): MarkdownStyle {
     const theme = useTheme();
-    const emojiFontSize = containsOnlyEmojis(message ?? '') ? variables.fontSizeOnlyEmojis : variables.fontSizeNormal;
+    const hasMessageOnlyEmojis = message != null && message.length > 0 && containsOnlyEmojis(message);
+    const emojiFontSize = hasMessageOnlyEmojis ? variables.fontSizeOnlyEmojis : variables.fontSizeNormal;
 
-    const markdownStyle = useMemo(
+    // this map is used to reset the styles that are not needed - passing undefined value can break the native side
+    const nonStylingDefaultValues: Record<string, string | number> = useMemo(
         () => ({
+            color: theme.text,
+            backgroundColor: 'transparent',
+            marginLeft: 0,
+            paddingLeft: 0,
+            borderColor: 'transparent',
+            borderWidth: 0,
+        }),
+        [theme],
+    );
+
+    const markdownStyle = useMemo(() => {
+        const styling = {
             syntax: {
                 color: theme.syntax,
             },
@@ -28,15 +44,21 @@ function useMarkdownStyle(message: string | null = null): MarkdownStyle {
                 borderWidth: 4,
                 marginLeft: 0,
                 paddingLeft: 6,
+                /**
+                 * since blockquote has `inline-block` display -> padding-right is needed to prevent cursor overlapping
+                 * with last character of the text node.
+                 * As long as paddingRight > cursor.width, cursor will be displayed correctly.
+                 */
+                paddingRight: 1,
             },
             code: {
-                fontFamily: FontUtils.fontFamily.platform.MONOSPACE,
+                ...FontUtils.fontFamily.platform.MONOSPACE,
                 fontSize: 13, // TODO: should be 15 if inside h1, see StyleUtils.getCodeFontSize
                 color: theme.text,
                 backgroundColor: 'transparent',
             },
             pre: {
-                fontFamily: FontUtils.fontFamily.platform.MONOSPACE,
+                ...FontUtils.fontFamily.platform.MONOSPACE,
                 fontSize: 13,
                 color: theme.text,
                 backgroundColor: 'transparent',
@@ -53,9 +75,21 @@ function useMarkdownStyle(message: string | null = null): MarkdownStyle {
                 color: theme.mentionText,
                 backgroundColor: theme.mentionBG,
             },
-        }),
-        [theme, emojiFontSize],
-    );
+        };
+
+        if (excludeStyles.length) {
+            excludeStyles.forEach((key) => {
+                const style: Record<string, unknown> = styling[key];
+                if (style) {
+                    Object.keys(style).forEach((styleKey) => {
+                        style[styleKey] = nonStylingDefaultValues[styleKey] ?? style[styleKey];
+                    });
+                }
+            });
+        }
+
+        return styling;
+    }, [theme, emojiFontSize, excludeStyles, nonStylingDefaultValues]);
 
     return markdownStyle;
 }
diff --git a/src/hooks/useMouseContext.tsx b/src/hooks/useMouseContext.tsx
new file mode 100644
index 000000000000..84889c4b59cd
--- /dev/null
+++ b/src/hooks/useMouseContext.tsx
@@ -0,0 +1,33 @@
+import type {ReactNode} from 'react';
+import React, {createContext, useContext, useMemo, useState} from 'react';
+
+type MouseContextProps = {
+    isMouseDownOnInput: boolean;
+    setMouseDown: () => void;
+    setMouseUp: () => void;
+};
+
+const MouseContext = createContext<MouseContextProps>({
+    isMouseDownOnInput: false,
+    setMouseDown: () => {},
+    setMouseUp: () => {},
+});
+
+type MouseProviderProps = {
+    children: ReactNode;
+};
+
+function MouseProvider({children}: MouseProviderProps) {
+    const [isMouseDownOnInput, setIsMouseDownOnInput] = useState(false);
+
+    const setMouseDown = () => setIsMouseDownOnInput(true);
+    const setMouseUp = () => setIsMouseDownOnInput(false);
+
+    const value = useMemo(() => ({isMouseDownOnInput, setMouseDown, setMouseUp}), [isMouseDownOnInput]);
+
+    return <MouseContext.Provider value={value}>{children}</MouseContext.Provider>;
+}
+
+const useMouseContext = () => useContext(MouseContext);
+
+export {MouseProvider, useMouseContext};
diff --git a/src/hooks/useOnboardingLayout.ts b/src/hooks/useOnboardingLayout.ts
index 512482340bb2..1b66c2fb2b64 100644
--- a/src/hooks/useOnboardingLayout.ts
+++ b/src/hooks/useOnboardingLayout.ts
@@ -3,7 +3,7 @@ import {useWindowDimensions} from 'react-native';
 import variables from '@styles/variables';
 
 type OnboardingLayout = {
-    shouldUseNarrowLayout: boolean;
+    isMediumOrLargerScreenWidth: boolean;
 };
 
 /**
@@ -15,5 +15,5 @@ type OnboardingLayout = {
 export default function useOnboardingLayout(): OnboardingLayout {
     const {width: windowWidth} = useWindowDimensions();
 
-    return {shouldUseNarrowLayout: windowWidth > variables.mobileResponsiveWidthBreakpoint};
+    return {isMediumOrLargerScreenWidth: windowWidth > variables.mobileResponsiveWidthBreakpoint};
 }
diff --git a/src/hooks/usePaginatedReportActions.ts b/src/hooks/usePaginatedReportActions.ts
new file mode 100644
index 000000000000..918831f27545
--- /dev/null
+++ b/src/hooks/usePaginatedReportActions.ts
@@ -0,0 +1,40 @@
+import {useMemo} from 'react';
+import {useOnyx} from 'react-native-onyx';
+import PaginationUtils from '@libs/PaginationUtils';
+import * as ReportActionsUtils from '@libs/ReportActionsUtils';
+import ONYXKEYS from '@src/ONYXKEYS';
+
+/**
+ * Get the longest continuous chunk of reportActions including the linked reportAction. If not linking to a specific action, returns the continuous chunk of newest reportActions.
+ */
+function usePaginatedReportActions(reportID?: string, reportActionID?: string) {
+    // Use `||` instead of `??` to handle empty string.
+    // eslint-disable-next-line @typescript-eslint/prefer-nullish-coalescing
+    const reportIDWithDefault = reportID || '-1';
+
+    const [sortedAllReportActions] = useOnyx(`${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${reportIDWithDefault}`, {
+        canEvict: false,
+        selector: (allReportActions) => ReportActionsUtils.getSortedReportActionsForDisplay(allReportActions, true),
+    });
+    const [reportActionPages] = useOnyx(`${ONYXKEYS.COLLECTION.REPORT_ACTIONS_PAGES}${reportIDWithDefault}`);
+
+    const reportActions = useMemo(() => {
+        if (!sortedAllReportActions?.length) {
+            return [];
+        }
+        return PaginationUtils.getContinuousChain(sortedAllReportActions, reportActionPages ?? [], (reportAction) => reportAction.reportActionID, reportActionID);
+    }, [reportActionID, reportActionPages, sortedAllReportActions]);
+
+    const linkedAction = useMemo(
+        () => sortedAllReportActions?.find((reportAction) => String(reportAction.reportActionID) === String(reportActionID)),
+        [reportActionID, sortedAllReportActions],
+    );
+
+    return {
+        reportActions,
+        linkedAction,
+        sortedAllReportActions,
+    };
+}
+
+export default usePaginatedReportActions;
diff --git a/src/hooks/usePolicy.ts b/src/hooks/usePolicy.ts
new file mode 100644
index 000000000000..f08b1b323022
--- /dev/null
+++ b/src/hooks/usePolicy.ts
@@ -0,0 +1,17 @@
+import {useOnyx} from 'react-native-onyx';
+import CONST from '@src/CONST';
+import ONYXKEYS from '@src/ONYXKEYS';
+
+function getPolicyIDOrDefault(policyID?: string) {
+    if (!policyID || policyID === CONST.POLICY.OWNER_EMAIL_FAKE) {
+        return '-1';
+    }
+    return policyID;
+}
+
+function usePolicy(policyID?: string) {
+    const [policy] = useOnyx(`${ONYXKEYS.COLLECTION.POLICY}${getPolicyIDOrDefault(policyID)}`);
+    return policy;
+}
+
+export default usePolicy;
diff --git a/src/hooks/usePreferredCurrency.ts b/src/hooks/usePreferredCurrency.ts
new file mode 100644
index 000000000000..c801d8007749
--- /dev/null
+++ b/src/hooks/usePreferredCurrency.ts
@@ -0,0 +1,33 @@
+import {useMemo} from 'react';
+import {useOnyx} from 'react-native-onyx';
+import type {ValueOf} from 'type-fest';
+import CONST from '@src/CONST';
+import ONYXKEYS from '@src/ONYXKEYS';
+
+type PreferredCurrency = ValueOf<typeof CONST.PAYMENT_CARD_CURRENCY>;
+
+/**
+ * Get user's preferred currency in the following order:
+ *
+ * 1. Payment card currency
+ * 2. User's local currency (if it's a valid payment card currency)
+ * 3. USD (default currency)
+ *
+ */
+function usePreferredCurrency(): PreferredCurrency {
+    const [personalDetails] = useOnyx(ONYXKEYS.PERSONAL_DETAILS_LIST);
+    const [session] = useOnyx(ONYXKEYS.SESSION);
+    const [fundList] = useOnyx(ONYXKEYS.FUND_LIST);
+
+    const paymentCardCurrency = useMemo(() => Object.values(fundList ?? {}).find((card) => card.accountData?.additionalData?.isBillingCard)?.accountData?.currency, [fundList]);
+
+    if (paymentCardCurrency) {
+        return paymentCardCurrency;
+    }
+
+    const currentUserLocalCurrency = (personalDetails?.[session?.accountID ?? '-1']?.localCurrencyCode ?? CONST.PAYMENT_CARD_CURRENCY.USD) as PreferredCurrency;
+
+    return Object.values(CONST.PAYMENT_CARD_CURRENCY).includes(currentUserLocalCurrency) ? currentUserLocalCurrency : CONST.PAYMENT_CARD_CURRENCY.USD;
+}
+
+export default usePreferredCurrency;
diff --git a/src/hooks/useReportIDs.tsx b/src/hooks/useReportIDs.tsx
index c1503595fa24..b7d84cb25196 100644
--- a/src/hooks/useReportIDs.tsx
+++ b/src/hooks/useReportIDs.tsx
@@ -2,7 +2,7 @@ import React, {createContext, useCallback, useContext, useMemo} from 'react';
 import type {OnyxEntry} from 'react-native-onyx';
 import {useOnyx} from 'react-native-onyx';
 import {getPolicyEmployeeListByIdWithoutCurrentUser} from '@libs/PolicyUtils';
-import * as ReportUtils from '@libs/ReportUtils';
+import * as ReportActionsUtils from '@libs/ReportActionsUtils';
 import SidebarUtils from '@libs/SidebarUtils';
 import CONST from '@src/CONST';
 import ONYXKEYS from '@src/ONYXKEYS';
@@ -11,8 +11,8 @@ import type {Message} from '@src/types/onyx/ReportAction';
 import useActiveWorkspace from './useActiveWorkspace';
 import useCurrentReportID from './useCurrentReportID';
 import useCurrentUserPersonalDetails from './useCurrentUserPersonalDetails';
+import useResponsiveLayout from './useResponsiveLayout';
 
-type ChatReportSelector = OnyxTypes.Report & {isUnreadWithMention: boolean};
 type PolicySelector = Pick<OnyxTypes.Policy, 'type' | 'name' | 'avatarURL' | 'employeeList'>;
 type ReportActionsSelector = Array<Pick<OnyxTypes.ReportAction, 'reportActionID' | 'actionName' | 'errors' | 'message' | 'originalMessage'>>;
 
@@ -24,74 +24,40 @@ type ReportIDsContextProviderProps = {
 type ReportIDsContextValue = {
     orderedReportIDs: string[];
     currentReportID: string;
+    policyMemberAccountIDs: number[];
 };
 
 const ReportIDsContext = createContext<ReportIDsContextValue>({
     orderedReportIDs: [],
     currentReportID: '',
+    policyMemberAccountIDs: [],
 });
 
 /**
  * This function (and the few below it), narrow down the data from Onyx to just the properties that we want to trigger a re-render of the component. This helps minimize re-rendering
  * and makes the entire component more performant because it's not re-rendering when a bunch of properties change which aren't ever used in the UI.
  */
-const chatReportSelector = (report: OnyxEntry<OnyxTypes.Report>): ChatReportSelector =>
-    (report && {
-        reportID: report.reportID,
-        participantAccountIDs: report.participantAccountIDs,
-        isPinned: report.isPinned,
-        isHidden: report.isHidden,
-        notificationPreference: report.notificationPreference,
-        errorFields: {
-            addWorkspaceRoom: report.errorFields?.addWorkspaceRoom,
-        },
-        lastMessageText: report.lastMessageText,
-        lastVisibleActionCreated: report.lastVisibleActionCreated,
-        iouReportID: report.iouReportID,
-        total: report.total,
-        nonReimbursableTotal: report.nonReimbursableTotal,
-        hasOutstandingChildRequest: report.hasOutstandingChildRequest,
-        isWaitingOnBankAccount: report.isWaitingOnBankAccount,
-        statusNum: report.statusNum,
-        stateNum: report.stateNum,
-        chatType: report.chatType,
-        type: report.type,
-        policyID: report.policyID,
-        visibility: report.visibility,
-        lastReadTime: report.lastReadTime,
-        // Needed for name sorting:
-        reportName: report.reportName,
-        policyName: report.policyName,
-        oldPolicyName: report.oldPolicyName,
-        // Other less obvious properites considered for sorting:
-        ownerAccountID: report.ownerAccountID,
-        currency: report.currency,
-        managerID: report.managerID,
-        // Other important less obivous properties for filtering:
-        parentReportActionID: report.parentReportActionID,
-        parentReportID: report.parentReportID,
-        isDeletedParentAction: report.isDeletedParentAction,
-        isUnreadWithMention: ReportUtils.isUnreadWithMention(report),
-    }) as ChatReportSelector;
-
 const reportActionsSelector = (reportActions: OnyxEntry<OnyxTypes.ReportActions>): ReportActionsSelector =>
     (reportActions &&
-        Object.values(reportActions).map((reportAction) => {
-            const {reportActionID, actionName, errors = [], originalMessage} = reportAction;
-            const decision = reportAction.message?.[0]?.moderationDecision?.decision;
-
-            return {
-                reportActionID,
-                actionName,
-                errors,
-                message: [
-                    {
-                        moderationDecision: {decision},
-                    },
-                ] as Message[],
-                originalMessage,
-            };
-        })) as ReportActionsSelector;
+        Object.values(reportActions)
+            .filter(Boolean)
+            .map((reportAction) => {
+                const {reportActionID, actionName, errors = [], originalMessage} = reportAction;
+                const message = ReportActionsUtils.getReportActionMessage(reportAction);
+                const decision = message?.moderationDecision?.decision;
+
+                return {
+                    reportActionID,
+                    actionName,
+                    errors,
+                    message: [
+                        {
+                            moderationDecision: {decision},
+                        },
+                    ] as Message[],
+                    originalMessage,
+                };
+            })) as ReportActionsSelector;
 
 const policySelector = (policy: OnyxEntry<OnyxTypes.Policy>): PolicySelector =>
     (policy && {
@@ -114,19 +80,20 @@ function ReportIDsContextProvider({
     currentReportIDForTests,
 }: ReportIDsContextProviderProps) {
     const [priorityMode] = useOnyx(ONYXKEYS.NVP_PRIORITY_MODE, {initialValue: CONST.PRIORITY_MODE.DEFAULT});
-    const [chatReports] = useOnyx(ONYXKEYS.COLLECTION.REPORT, {selector: chatReportSelector});
+    const [chatReports] = useOnyx(ONYXKEYS.COLLECTION.REPORT);
     const [policies] = useOnyx(ONYXKEYS.COLLECTION.POLICY, {selector: policySelector});
     const [allReportActions] = useOnyx(ONYXKEYS.COLLECTION.REPORT_ACTIONS, {selector: reportActionsSelector});
     const [transactionViolations] = useOnyx(ONYXKEYS.COLLECTION.TRANSACTION_VIOLATIONS);
     const [reportsDrafts] = useOnyx(ONYXKEYS.COLLECTION.REPORT_DRAFT_COMMENT);
     const [betas] = useOnyx(ONYXKEYS.BETAS);
 
+    const {shouldUseNarrowLayout} = useResponsiveLayout();
     const {accountID} = useCurrentUserPersonalDetails();
     const currentReportIDValue = useCurrentReportID();
     const derivedCurrentReportID = currentReportIDForTests ?? currentReportIDValue?.currentReportID;
     const {activeWorkspaceID} = useActiveWorkspace();
 
-    const policyMemberAccountIDs = getPolicyEmployeeListByIdWithoutCurrentUser(policies, activeWorkspaceID, accountID);
+    const policyMemberAccountIDs = useMemo(() => getPolicyEmployeeListByIdWithoutCurrentUser(policies, activeWorkspaceID, accountID), [policies, activeWorkspaceID, accountID]);
 
     const getOrderedReportIDs = useCallback(
         (currentReportID?: string) =>
@@ -142,7 +109,7 @@ function ReportIDsContextProvider({
                 policyMemberAccountIDs,
             ),
         // we need reports draft in deps array for reloading of list when reportsDrafts will change
-        // eslint-disable-next-line react-hooks/exhaustive-deps
+        // eslint-disable-next-line react-compiler/react-compiler, react-hooks/exhaustive-deps
         [chatReports, betas, policies, priorityMode, allReportActions, transactionViolations, activeWorkspaceID, policyMemberAccountIDs, reportsDrafts],
     );
 
@@ -153,15 +120,26 @@ function ReportIDsContextProvider({
         // we first generate the list as if there was no current report, then 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.
-        if (derivedCurrentReportID && !orderedReportIDs.includes(derivedCurrentReportID)) {
-            return {orderedReportIDs: getOrderedReportIDs(derivedCurrentReportID), currentReportID: derivedCurrentReportID ?? ''};
+
+        // We also execute the following logic if `shouldUseNarrowLayout` is false because this is
+        // requirement for web and desktop. Consider a case, where we have report with expenses and we click on
+        // any expense, a new LHN item is added in the list and is visible on web and desktop. But on mobile, we
+        // just navigate to the screen with expense details, so there seems no point to execute this logic on mobile.
+        if (
+            (!shouldUseNarrowLayout || orderedReportIDs.length === 0) &&
+            derivedCurrentReportID &&
+            derivedCurrentReportID !== '-1' &&
+            orderedReportIDs.indexOf(derivedCurrentReportID) === -1
+        ) {
+            return {orderedReportIDs: getOrderedReportIDs(derivedCurrentReportID), currentReportID: derivedCurrentReportID ?? '-1', policyMemberAccountIDs};
         }
 
         return {
             orderedReportIDs,
-            currentReportID: derivedCurrentReportID ?? '',
+            currentReportID: derivedCurrentReportID ?? '-1',
+            policyMemberAccountIDs,
         };
-    }, [getOrderedReportIDs, orderedReportIDs, derivedCurrentReportID]);
+    }, [getOrderedReportIDs, orderedReportIDs, derivedCurrentReportID, policyMemberAccountIDs, shouldUseNarrowLayout]);
 
     return <ReportIDsContext.Provider value={contextValue}>{children}</ReportIDsContext.Provider>;
 }
@@ -171,4 +149,4 @@ function useReportIDs() {
 }
 
 export {ReportIDsContext, ReportIDsContextProvider, policySelector, useReportIDs};
-export type {ChatReportSelector, PolicySelector, ReportActionsSelector};
+export type {PolicySelector, ReportActionsSelector};
diff --git a/src/hooks/useReportScrollManager/index.native.ts b/src/hooks/useReportScrollManager/index.native.ts
index 6666a4ebd0f2..e7cdfa5b45da 100644
--- a/src/hooks/useReportScrollManager/index.native.ts
+++ b/src/hooks/useReportScrollManager/index.native.ts
@@ -8,13 +8,16 @@ function useReportScrollManager(): ReportScrollManagerData {
     /**
      * Scroll to the provided index.
      */
-    const scrollToIndex = (index: number) => {
-        if (!flatListRef?.current) {
-            return;
-        }
-
-        flatListRef.current.scrollToIndex({index});
-    };
+    const scrollToIndex = useCallback(
+        (index: number) => {
+            if (!flatListRef?.current) {
+                return;
+            }
+
+            flatListRef.current.scrollToIndex({index});
+        },
+        [flatListRef],
+    );
 
     /**
      * Scroll to the bottom of the flatlist.
diff --git a/src/hooks/useReportScrollManager/index.ts b/src/hooks/useReportScrollManager/index.ts
index 8b56cd639d08..eb68f52fc760 100644
--- a/src/hooks/useReportScrollManager/index.ts
+++ b/src/hooks/useReportScrollManager/index.ts
@@ -7,15 +7,17 @@ function useReportScrollManager(): ReportScrollManagerData {
 
     /**
      * Scroll to the provided index. On non-native implementations we do not want to scroll when we are scrolling because
-     * we are editing a comment.
      */
-    const scrollToIndex = (index: number, isEditing?: boolean) => {
-        if (!flatListRef?.current || isEditing) {
-            return;
-        }
+    const scrollToIndex = useCallback(
+        (index: number, isEditing?: boolean) => {
+            if (!flatListRef?.current || isEditing) {
+                return;
+            }
 
-        flatListRef.current.scrollToIndex({index, animated: true});
-    };
+            flatListRef.current.scrollToIndex({index, animated: true});
+        },
+        [flatListRef],
+    );
 
     /**
      * Scroll to the bottom of the flatlist.
diff --git a/src/hooks/useResetComposerFocus.ts b/src/hooks/useResetComposerFocus.ts
index e9f88ed93346..25fc578b6706 100644
--- a/src/hooks/useResetComposerFocus.ts
+++ b/src/hooks/useResetComposerFocus.ts
@@ -5,15 +5,15 @@ import type {TextInput} from 'react-native';
 
 export default function useResetComposerFocus(inputRef: MutableRefObject<TextInput | null>) {
     const isFocused = useIsFocused();
-    const shouldResetFocus = useRef(false);
+    const shouldResetFocusRef = useRef(false);
 
     useEffect(() => {
-        if (!isFocused || !shouldResetFocus.current) {
+        if (!isFocused || !shouldResetFocusRef.current) {
             return;
         }
         inputRef.current?.focus(); // focus input again
-        shouldResetFocus.current = false;
+        shouldResetFocusRef.current = false;
     }, [isFocused, inputRef]);
 
-    return {isFocused, shouldResetFocus};
+    return {isFocused, shouldResetFocusRef};
 }
diff --git a/src/hooks/useResponsiveLayout.ts b/src/hooks/useResponsiveLayout.ts
index 3e1ea41357be..a26d50bc56b9 100644
--- a/src/hooks/useResponsiveLayout.ts
+++ b/src/hooks/useResponsiveLayout.ts
@@ -1,27 +1,76 @@
-import {useEffect, useState} from 'react';
-import Navigation from '@libs/Navigation/Navigation';
+import {NavigationContainerRefContext, NavigationContext} from '@react-navigation/native';
+import {useContext, useMemo} from 'react';
+import ModalContext from '@components/Modal/ModalContext';
+import CONST from '@src/CONST';
+import NAVIGATORS from '@src/NAVIGATORS';
 import useWindowDimensions from './useWindowDimensions';
 
 type ResponsiveLayoutResult = {
     shouldUseNarrowLayout: boolean;
     isSmallScreenWidth: boolean;
-    isInModal: boolean;
+    isInNarrowPaneModal: boolean;
+    isExtraSmallScreenHeight: boolean;
+    isMediumScreenWidth: boolean;
+    isLargeScreenWidth: boolean;
+    isExtraSmallScreenWidth: boolean;
+    isSmallScreen: boolean;
 };
 
 /**
- * Hook to determine if we are on mobile devices or in the Modal Navigator
+ * Hook to determine if we are on mobile devices or in the Modal Navigator.
+ * Use "shouldUseNarrowLayout" for "on mobile or in RHP/LHP", "isSmallScreenWidth" for "on mobile", "isInNarrowPaneModal" for "in RHP/LHP".
+ *
+ * There are two kinds of modals in this app:
+ *     1. Modal stack navigators from react-navigation
+ *     2. Modal components that use react-native-modal
+ *
+ * This hook is designed to handle both. `shouldUseNarrowLayout` will return `true` if any of the following are true:
+ *     1. The device screen width is narrow
+ *     2. The consuming component is the child of a "right docked" react-native-modal component
+ *     3. The consuming component is a screen in a modal stack navigator and not a child of a "non-right-docked" react-native-modal component.
+ *
+ * For more details on the various modal types we've defined for this app and implemented using react-native-modal, see `ModalType`.
  */
 export default function useResponsiveLayout(): ResponsiveLayoutResult {
-    const {isSmallScreenWidth} = useWindowDimensions();
+    const {isSmallScreenWidth, isExtraSmallScreenHeight, isExtraSmallScreenWidth, isMediumScreenWidth, isLargeScreenWidth, isSmallScreen} = useWindowDimensions();
 
-    const [isInModal, setIsInModal] = useState(Navigation.isDisplayedInModal());
+    // Note: activeModalType refers to our react-native-modal component wrapper, not react-navigation's modal stack navigators.
+    // This means it will only be defined if the component calling this hook is a child of a modal component. See BaseModal for the provider.
+    const {activeModalType} = useContext(ModalContext);
 
-    useEffect(() => {
-        Navigation.isNavigationReady().then(() => {
-            setIsInModal(Navigation.isDisplayedInModal());
-        });
-    }, []);
+    // We are using these contexts directly instead of useNavigation/useNavigationState, because those will throw an error if used outside a navigator.
+    // This hook can be used within or outside a navigator, so using useNavigationState does not work.
+    // Furthermore, wrapping useNavigationState in a try/catch does not work either, because that breaks the rules of hooks.
+    // Note that these three lines are copied closely from the internal implementation of useNavigation: https://github.com/react-navigation/react-navigation/blob/52a3234b7aaf4d4fcc9c0155f44f3ea2233f0f40/packages/core/src/useNavigation.tsx#L18-L28
+    const navigationContainerRef = useContext(NavigationContainerRefContext);
+    const navigator = useContext(NavigationContext);
+    const currentNavigator = navigator ?? navigationContainerRef;
 
-    const shouldUseNarrowLayout = isSmallScreenWidth || isInModal;
-    return {shouldUseNarrowLayout, isSmallScreenWidth, isInModal};
+    const isDisplayedInNarrowModalNavigator = useMemo(
+        () =>
+            !!currentNavigator?.getParent?.(NAVIGATORS.RIGHT_MODAL_NAVIGATOR as unknown as undefined) ||
+            !!currentNavigator?.getParent?.(NAVIGATORS.LEFT_MODAL_NAVIGATOR as unknown as undefined),
+        [currentNavigator],
+    );
+
+    // The component calling this hook is in a "narrow pane modal" if:
+    const isInNarrowPaneModal =
+        // it's a child of the right-docked modal
+        activeModalType === CONST.MODAL.MODAL_TYPE.RIGHT_DOCKED ||
+        // or there's a "right modal navigator" or "left modal navigator" on the top of the root navigation stack
+        // and the component calling this hook is not the child of another modal type, such as a confirm modal
+        (isDisplayedInNarrowModalNavigator && !activeModalType);
+
+    const shouldUseNarrowLayout = isSmallScreenWidth || isInNarrowPaneModal;
+
+    return {
+        shouldUseNarrowLayout,
+        isSmallScreenWidth,
+        isInNarrowPaneModal,
+        isExtraSmallScreenHeight,
+        isExtraSmallScreenWidth,
+        isMediumScreenWidth,
+        isLargeScreenWidth,
+        isSmallScreen,
+    };
 }
diff --git a/src/hooks/useReviewDuplicatesNavigation.tsx b/src/hooks/useReviewDuplicatesNavigation.tsx
new file mode 100644
index 000000000000..e14731024c17
--- /dev/null
+++ b/src/hooks/useReviewDuplicatesNavigation.tsx
@@ -0,0 +1,52 @@
+import {useEffect, useMemo, useState} from 'react';
+import Navigation from '@libs/Navigation/Navigation';
+import CONST from '@src/CONST';
+import ROUTES from '@src/ROUTES';
+
+type StepName = 'description' | 'merchant' | 'category' | 'billable' | 'tag' | 'taxCode' | 'reimbursable';
+
+function useReviewDuplicatesNavigation(stepNames: string[], currentScreenName: StepName, threadReportID: string) {
+    const [nextScreen, setNextScreen] = useState<StepName>(currentScreenName);
+    const [currentScreenIndex, setCurrentScreenIndex] = useState(0);
+    const intersection = useMemo(() => CONST.REVIEW_DUPLICATES_ORDER.filter((element) => stepNames.includes(element)), [stepNames]);
+
+    useEffect(() => {
+        const currentIndex = intersection.indexOf(currentScreenName);
+        const nextScreenIndex = currentIndex + 1;
+        setCurrentScreenIndex(currentIndex);
+        setNextScreen(intersection[nextScreenIndex] ?? '');
+    }, [currentScreenName, intersection]);
+
+    const navigateToNextScreen = () => {
+        switch (nextScreen) {
+            case 'merchant':
+                Navigation.navigate(ROUTES.TRANSACTION_DUPLICATE_REVIEW_MERCHANT_PAGE.getRoute(threadReportID));
+                break;
+            case 'category':
+                Navigation.navigate(ROUTES.TRANSACTION_DUPLICATE_REVIEW_CATEGORY_PAGE.getRoute(threadReportID));
+                break;
+            case 'tag':
+                Navigation.navigate(ROUTES.TRANSACTION_DUPLICATE_REVIEW_TAG_PAGE.getRoute(threadReportID));
+                break;
+            case 'description':
+                Navigation.navigate(ROUTES.TRANSACTION_DUPLICATE_REVIEW_DESCRIPTION_PAGE.getRoute(threadReportID));
+                break;
+            case 'taxCode':
+                Navigation.navigate(ROUTES.TRANSACTION_DUPLICATE_REVIEW_TAX_CODE_PAGE.getRoute(threadReportID));
+                break;
+            case 'reimbursable':
+                Navigation.navigate(ROUTES.TRANSACTION_DUPLICATE_REVIEW_REIMBURSABLE_PAGE.getRoute(threadReportID));
+                break;
+            case 'billable':
+                Navigation.navigate(ROUTES.TRANSACTION_DUPLICATE_REVIEW_BILLABLE_PAGE.getRoute(threadReportID));
+                break;
+            default:
+                Navigation.navigate(ROUTES.TRANSACTION_DUPLICATE_CONFIRMATION_PAGE.getRoute(threadReportID));
+                break;
+        }
+    };
+
+    return {navigateToNextScreen, currentScreenIndex};
+}
+
+export default useReviewDuplicatesNavigation;
diff --git a/src/hooks/useSafePaddingBottomStyle.ts b/src/hooks/useSafePaddingBottomStyle.ts
new file mode 100644
index 000000000000..b02b36d0f050
--- /dev/null
+++ b/src/hooks/useSafePaddingBottomStyle.ts
@@ -0,0 +1,37 @@
+import {useEffect, useMemo, useState} from 'react';
+import {Keyboard} from 'react-native';
+import useStyledSafeAreaInsets from './useStyledSafeAreaInsets';
+import useThemeStyles from './useThemeStyles';
+
+// This hook is useful for adding extra bottom padding to a component based on the device's safe area
+// If the device's safe area padding bottom is 0, the hook returns 0. Otherwise, it provides a padding bottom of 20.
+// Use this to ensure content visibility and layout consistency across different devices.
+const useSafePaddingBottomStyle = () => {
+    const styles = useThemeStyles();
+    const [willKeyboardShow, setWillKeyboardShow] = useState<boolean>(false);
+    useEffect(() => {
+        const keyboardWillShowListener = Keyboard.addListener('keyboardWillShow', () => {
+            setWillKeyboardShow(true);
+        });
+        const keyboardWillHideListener = Keyboard.addListener('keyboardWillHide', () => {
+            setWillKeyboardShow(false);
+        });
+        return () => {
+            keyboardWillShowListener.remove();
+            keyboardWillHideListener.remove();
+        };
+    }, []);
+
+    const {paddingBottom} = useStyledSafeAreaInsets();
+
+    const extraPaddingBottomStyle = useMemo(() => {
+        // Do not add extra padding at the bottom if the keyboard is open or if there is no safe area bottom padding style.
+        if (willKeyboardShow || !paddingBottom) {
+            return {};
+        }
+        return styles.pb5;
+    }, [willKeyboardShow, paddingBottom, styles.pb5]);
+    return extraPaddingBottomStyle;
+};
+
+export default useSafePaddingBottomStyle;
diff --git a/src/hooks/useSplashScreen.ts b/src/hooks/useSplashScreen.ts
new file mode 100644
index 000000000000..8838ac1289c7
--- /dev/null
+++ b/src/hooks/useSplashScreen.ts
@@ -0,0 +1,11 @@
+import {useContext} from 'react';
+import {SplashScreenHiddenContext} from '@src/Expensify';
+
+type SplashScreenHiddenContextType = {isSplashHidden: boolean; setIsSplashHidden: React.Dispatch<React.SetStateAction<boolean>>};
+
+export default function useSplashScreen() {
+    const {isSplashHidden, setIsSplashHidden} = useContext(SplashScreenHiddenContext) as SplashScreenHiddenContextType;
+    return {isSplashHidden, setIsSplashHidden};
+}
+
+export type {SplashScreenHiddenContextType};
diff --git a/src/hooks/useStepFormSubmit.ts b/src/hooks/useStepFormSubmit.ts
index 0a0503516127..883fe980a338 100644
--- a/src/hooks/useStepFormSubmit.ts
+++ b/src/hooks/useStepFormSubmit.ts
@@ -1,7 +1,9 @@
 import {useCallback} from 'react';
+import type {TupleToUnion} from 'type-fest';
 import type {FormOnyxKeys, FormOnyxValues} from '@components/Form/types';
 import * as FormActions from '@userActions/FormActions';
-import type {OnyxFormKey, OnyxFormValuesMapping} from '@src/ONYXKEYS';
+import type {OnyxFormKey, OnyxFormValuesMapping, OnyxValues} from '@src/ONYXKEYS';
+import type {BaseForm} from '@src/types/form/Form';
 import type {SubStepProps} from './useSubStep/types';
 
 type UseStepFormSubmitParams<T extends keyof OnyxFormValuesMapping> = Pick<SubStepProps, 'onNext'> & {
@@ -22,13 +24,10 @@ export default function useStepFormSubmit<T extends keyof OnyxFormValuesMapping>
     return useCallback(
         (values: FormOnyxValues<T>) => {
             if (shouldSaveDraft) {
-                const stepValues = fieldIds.reduce(
-                    (acc, key) => ({
-                        ...acc,
-                        [key]: values[key],
-                    }),
-                    {},
-                );
+                const stepValues = fieldIds.reduce((acc, key) => {
+                    acc[key] = values[key];
+                    return acc;
+                }, {} as Record<TupleToUnion<typeof fieldIds>, OnyxValues[T][Exclude<keyof OnyxValues[T], keyof BaseForm>]>);
 
                 FormActions.setDraftValues(formId, stepValues);
             }
diff --git a/src/hooks/useSubscriptionPlan.ts b/src/hooks/useSubscriptionPlan.ts
new file mode 100644
index 000000000000..5ac5066ba965
--- /dev/null
+++ b/src/hooks/useSubscriptionPlan.ts
@@ -0,0 +1,32 @@
+import {useMemo} from 'react';
+import {useOnyx} from 'react-native-onyx';
+import {isPolicyOwner} from '@libs/PolicyUtils';
+import CONST from '@src/CONST';
+import ONYXKEYS from '@src/ONYXKEYS';
+import {isEmptyObject} from '@src/types/utils/EmptyObject';
+
+function useSubscriptionPlan() {
+    const [policies] = useOnyx(ONYXKEYS.COLLECTION.POLICY);
+    const [session] = useOnyx(ONYXKEYS.SESSION);
+
+    // Filter workspaces in which user is the owner and the type is either corporate (control) or team (collect)
+    const ownerPolicies = useMemo(
+        () =>
+            Object.values(policies ?? {}).filter(
+                (policy) => isPolicyOwner(policy, session?.accountID ?? -1) && (CONST.POLICY.TYPE.CORPORATE === policy?.type || CONST.POLICY.TYPE.TEAM === policy?.type),
+            ),
+        [policies, session?.accountID],
+    );
+
+    if (isEmptyObject(ownerPolicies)) {
+        return null;
+    }
+
+    // Check if user has corporate (control) workspace
+    const hasControlWorkspace = ownerPolicies.some((policy) => policy?.type === CONST.POLICY.TYPE.CORPORATE);
+
+    // Corporate (control) workspace is supposed to be the higher priority
+    return hasControlWorkspace ? CONST.POLICY.TYPE.CORPORATE : CONST.POLICY.TYPE.TEAM;
+}
+
+export default useSubscriptionPlan;
diff --git a/src/hooks/useSubscriptionPossibleCostSavings.ts b/src/hooks/useSubscriptionPossibleCostSavings.ts
new file mode 100644
index 000000000000..ef92009549fe
--- /dev/null
+++ b/src/hooks/useSubscriptionPossibleCostSavings.ts
@@ -0,0 +1,38 @@
+import {useOnyx} from 'react-native-onyx';
+import CONST from '@src/CONST';
+import ONYXKEYS from '@src/ONYXKEYS';
+import usePreferredCurrency from './usePreferredCurrency';
+import useSubscriptionPlan from './useSubscriptionPlan';
+
+const POSSIBLE_COST_SAVINGS = {
+    [CONST.PAYMENT_CARD_CURRENCY.USD]: {
+        [CONST.POLICY.TYPE.TEAM]: 1000,
+        [CONST.POLICY.TYPE.CORPORATE]: 1800,
+    },
+    [CONST.PAYMENT_CARD_CURRENCY.AUD]: {
+        [CONST.POLICY.TYPE.TEAM]: 1400,
+        [CONST.POLICY.TYPE.CORPORATE]: 3000,
+    },
+    [CONST.PAYMENT_CARD_CURRENCY.GBP]: {
+        [CONST.POLICY.TYPE.TEAM]: 800,
+        [CONST.POLICY.TYPE.CORPORATE]: 1400,
+    },
+    [CONST.PAYMENT_CARD_CURRENCY.NZD]: {
+        [CONST.POLICY.TYPE.TEAM]: 1600,
+        [CONST.POLICY.TYPE.CORPORATE]: 3200,
+    },
+} as const;
+
+function useSubscriptionPossibleCostSavings(): number {
+    const preferredCurrency = usePreferredCurrency();
+    const subscriptionPlan = useSubscriptionPlan();
+    const [privateSubscription] = useOnyx(ONYXKEYS.NVP_PRIVATE_SUBSCRIPTION);
+
+    if (!subscriptionPlan || !privateSubscription?.type) {
+        return 0;
+    }
+
+    return POSSIBLE_COST_SAVINGS[preferredCurrency][subscriptionPlan];
+}
+
+export default useSubscriptionPossibleCostSavings;
diff --git a/src/hooks/useSubscriptionPrice.ts b/src/hooks/useSubscriptionPrice.ts
new file mode 100644
index 000000000000..0b71fe62c7c8
--- /dev/null
+++ b/src/hooks/useSubscriptionPrice.ts
@@ -0,0 +1,62 @@
+import {useOnyx} from 'react-native-onyx';
+import CONST from '@src/CONST';
+import ONYXKEYS from '@src/ONYXKEYS';
+import usePreferredCurrency from './usePreferredCurrency';
+import useSubscriptionPlan from './useSubscriptionPlan';
+
+const SUBSCRIPTION_PRICES = {
+    [CONST.PAYMENT_CARD_CURRENCY.USD]: {
+        [CONST.POLICY.TYPE.CORPORATE]: {
+            [CONST.SUBSCRIPTION.TYPE.ANNUAL]: 900,
+            [CONST.SUBSCRIPTION.TYPE.PAYPERUSE]: 1800,
+        },
+        [CONST.POLICY.TYPE.TEAM]: {
+            [CONST.SUBSCRIPTION.TYPE.ANNUAL]: 500,
+            [CONST.SUBSCRIPTION.TYPE.PAYPERUSE]: 1000,
+        },
+    },
+    [CONST.PAYMENT_CARD_CURRENCY.AUD]: {
+        [CONST.POLICY.TYPE.CORPORATE]: {
+            [CONST.SUBSCRIPTION.TYPE.ANNUAL]: 1500,
+            [CONST.SUBSCRIPTION.TYPE.PAYPERUSE]: 3000,
+        },
+        [CONST.POLICY.TYPE.TEAM]: {
+            [CONST.SUBSCRIPTION.TYPE.ANNUAL]: 700,
+            [CONST.SUBSCRIPTION.TYPE.PAYPERUSE]: 1400,
+        },
+    },
+    [CONST.PAYMENT_CARD_CURRENCY.GBP]: {
+        [CONST.POLICY.TYPE.CORPORATE]: {
+            [CONST.SUBSCRIPTION.TYPE.ANNUAL]: 700,
+            [CONST.SUBSCRIPTION.TYPE.PAYPERUSE]: 1400,
+        },
+        [CONST.POLICY.TYPE.TEAM]: {
+            [CONST.SUBSCRIPTION.TYPE.ANNUAL]: 400,
+            [CONST.SUBSCRIPTION.TYPE.PAYPERUSE]: 800,
+        },
+    },
+    [CONST.PAYMENT_CARD_CURRENCY.NZD]: {
+        [CONST.POLICY.TYPE.CORPORATE]: {
+            [CONST.SUBSCRIPTION.TYPE.ANNUAL]: 1600,
+            [CONST.SUBSCRIPTION.TYPE.PAYPERUSE]: 3200,
+        },
+        [CONST.POLICY.TYPE.TEAM]: {
+            [CONST.SUBSCRIPTION.TYPE.ANNUAL]: 800,
+            [CONST.SUBSCRIPTION.TYPE.PAYPERUSE]: 1600,
+        },
+    },
+} as const;
+
+function useSubscriptionPrice(): number {
+    const preferredCurrency = usePreferredCurrency();
+    const subscriptionPlan = useSubscriptionPlan();
+    const [privateSubscription] = useOnyx(ONYXKEYS.NVP_PRIVATE_SUBSCRIPTION);
+
+    if (!subscriptionPlan || !privateSubscription?.type) {
+        return 0;
+    }
+
+    return SUBSCRIPTION_PRICES[preferredCurrency][subscriptionPlan][privateSubscription.type];
+}
+
+export default useSubscriptionPrice;
diff --git a/src/hooks/useSyncFocus/index.ts b/src/hooks/useSyncFocus/index.ts
index 2dd0fef70cf7..6211b9988a82 100644
--- a/src/hooks/useSyncFocus/index.ts
+++ b/src/hooks/useSyncFocus/index.ts
@@ -1,15 +1,19 @@
-import {useLayoutEffect} from 'react';
+import {useContext, useLayoutEffect} from 'react';
 import type {RefObject} from 'react';
 import type {View} from 'react-native';
-import useScreenWrapperTranstionStatus from '@hooks/useScreenWrapperTransitionStatus';
+import {ScreenWrapperStatusContext} from '@components/ScreenWrapper';
 
 /**
  * Custom React hook created to handle sync of focus on an element when the user navigates through the app with keyboard.
  * When the user navigates through the app using the arrows and then the tab button, the focus on the element and the native focus of the browser differs.
  * To maintain consistency when an element is focused in the app, the focus() method is additionally called on the focused element to eliminate the difference between native browser focus and application focus.
  */
-const useSyncFocus = (ref: RefObject<HTMLDivElement | View>, isFocused: boolean, shouldSyncFocus = true) => {
-    const {didScreenTransitionEnd} = useScreenWrapperTranstionStatus();
+const useSyncFocus = (ref: RefObject<View>, isFocused: boolean, shouldSyncFocus = true) => {
+    // this hook can be used outside ScreenWrapperStatusContext (eg. in Popovers). So we to check if the context is present.
+    // If we are outside context we don't have to look at transition status
+    const contextValue = useContext(ScreenWrapperStatusContext);
+
+    const didScreenTransitionEnd = contextValue ? contextValue.didScreenTransitionEnd : true;
 
     useLayoutEffect(() => {
         if (!isFocused || !shouldSyncFocus || !didScreenTransitionEnd) {
@@ -17,7 +21,7 @@ const useSyncFocus = (ref: RefObject<HTMLDivElement | View>, isFocused: boolean,
         }
 
         ref.current?.focus();
-        // eslint-disable-next-line react-hooks/exhaustive-deps
+        // eslint-disable-next-line react-compiler/react-compiler, react-hooks/exhaustive-deps
     }, [didScreenTransitionEnd, isFocused, ref]);
 };
 
diff --git a/src/hooks/useTabNavigatorFocus/index.ts b/src/hooks/useTabNavigatorFocus/index.ts
index 3fef0e53774f..f85b630a0834 100644
--- a/src/hooks/useTabNavigatorFocus/index.ts
+++ b/src/hooks/useTabNavigatorFocus/index.ts
@@ -40,7 +40,7 @@ function useTabNavigatorFocus({tabIndex}: UseTabNavigatorFocusParams): boolean {
         // Retrieve the animation value from the tab navigator, which ranges from 0 to the total number of pages displayed.
         // Even a minimal scroll towards the camera page (e.g., a value of 0.001 at start) should activate the camera for immediate responsiveness.
         // STOP!!!!!!! This is not a pattern to be followed! We are conditionally rendering this hook becase when used in the edit flow we'll never be inside a tab navigator.
-        // eslint-disable-next-line react-hooks/rules-of-hooks
+        // eslint-disable-next-line react-compiler/react-compiler, react-hooks/rules-of-hooks
         tabPositionAnimation = useTabAnimation();
     } catch (error) {
         tabPositionAnimation = null;
@@ -64,7 +64,6 @@ function useTabNavigatorFocus({tabIndex}: UseTabNavigatorFocusParams): boolean {
         // We need to get the position animation value on component initialization to determine
         // if the tab is focused or not. Since it's an Animated.Value the only synchronous way
         // to retrieve the value is to use a private method.
-        // @ts-expect-error -- __getValue is a private method
         // eslint-disable-next-line no-underscore-dangle
         const initialTabPositionValue = tabPositionAnimation.__getValue();
 
diff --git a/src/hooks/useTackInputFocus/index.ts b/src/hooks/useTackInputFocus/index.ts
index 124f8460127c..e6caa15f9dde 100644
--- a/src/hooks/useTackInputFocus/index.ts
+++ b/src/hooks/useTackInputFocus/index.ts
@@ -1,5 +1,6 @@
 import {useCallback, useEffect} from 'react';
 import useDebouncedState from '@hooks/useDebouncedState';
+import * as Browser from '@libs/Browser';
 
 /**
  * Detects input or text area focus on browsers, to avoid scrolling on virtual viewports
@@ -28,7 +29,13 @@ export default function useTackInputFocus(enable = false): boolean {
     );
 
     const resetScrollPositionOnVisualViewport = useCallback(() => {
-        window.scrollTo({top: 0});
+        if (Browser.isChromeIOS() && window.visualViewport?.offsetTop) {
+            // On Chrome iOS, the visual viewport triggers a scroll event when the keyboard is opened, but some time the scroll position is not correct.
+            // So this change is specific to Chrome iOS, helping to reset the viewport position correctly.
+            window.scrollTo({top: -window.visualViewport.offsetTop});
+        } else {
+            window.scrollTo({top: 0});
+        }
     }, []);
 
     useEffect(() => {
diff --git a/src/hooks/useThumbnailDimensions.ts b/src/hooks/useThumbnailDimensions.ts
index 21e711f64166..85c5703861b4 100644
--- a/src/hooks/useThumbnailDimensions.ts
+++ b/src/hooks/useThumbnailDimensions.ts
@@ -2,7 +2,7 @@ import {useMemo} from 'react';
 import type {StyleProp, ViewStyle} from 'react-native';
 import type {DimensionValue} from 'react-native/Libraries/StyleSheet/StyleSheetTypes';
 import CONST from '@src/CONST';
-import useIsReportOpenInRHP from './useIsReportOpenInRHP';
+import useResponsiveLayout from './useResponsiveLayout';
 import useWindowDimensions from './useWindowDimensions';
 
 type ThumbnailDimensions = {
@@ -14,9 +14,9 @@ type ThumbnailDimensions = {
 };
 
 export default function useThumbnailDimensions(width: number, height: number): ThumbnailDimensions {
-    const isReportOpenInRHP = useIsReportOpenInRHP();
+    const {isInNarrowPaneModal} = useResponsiveLayout();
     const {isSmallScreenWidth} = useWindowDimensions();
-    const shouldUseNarrowLayout = isSmallScreenWidth || isReportOpenInRHP;
+    const shouldUseNarrowLayout = isSmallScreenWidth || isInNarrowPaneModal;
     const fixedDimension = shouldUseNarrowLayout ? CONST.THUMBNAIL_IMAGE.SMALL_SCREEN.SIZE : CONST.THUMBNAIL_IMAGE.WIDE_SCREEN.SIZE;
     const thumbnailDimensionsStyles = useMemo(() => {
         if (!width || !height) {
diff --git a/src/hooks/useViolations.ts b/src/hooks/useViolations.ts
index 7aadb4ce4ca3..44b8e982139e 100644
--- a/src/hooks/useViolations.ts
+++ b/src/hooks/useViolations.ts
@@ -5,7 +5,7 @@ import type {TransactionViolation, ViolationName} from '@src/types/onyx';
 /**
  * Names of Fields where violations can occur.
  */
-type ViolationField = 'amount' | 'billable' | 'category' | 'comment' | 'date' | 'merchant' | 'receipt' | 'tag' | 'tax';
+type ViolationField = 'amount' | 'billable' | 'category' | 'comment' | 'date' | 'merchant' | 'receipt' | 'tag' | 'tax' | 'none';
 
 /**
  * Map from Violation Names to the field where that violation can occur.
@@ -40,17 +40,34 @@ const violationFields: Record<ViolationName, ViolationField> = {
     smartscanFailed: 'receipt',
     someTagLevelsRequired: 'tag',
     tagOutOfPolicy: 'tag',
+    taxRateChanged: 'tax',
     taxAmountChanged: 'tax',
     taxOutOfPolicy: 'tax',
-    taxRateChanged: 'tax',
     taxRequired: 'tax',
+    hold: 'none',
 };
 
 type ViolationsMap = Map<ViolationField, TransactionViolation[]>;
 
-function useViolations(violations: TransactionViolation[]) {
+// We don't want to show these violations on NewDot
+const excludedViolationsName = ['taxAmountChanged', 'taxRateChanged'];
+
+/**
+ * @param violations – List of transaction violations
+ * @param shouldShowOnlyViolations – Whether we should only show violations of type 'violation'
+ */
+function useViolations(violations: TransactionViolation[], shouldShowOnlyViolations: boolean) {
     const violationsByField = useMemo((): ViolationsMap => {
-        const filteredViolations = violations.filter((violation) => violation.type === CONST.VIOLATION_TYPES.VIOLATION);
+        const filteredViolations = violations.filter((violation) => {
+            if (excludedViolationsName.includes(violation.name)) {
+                return false;
+            }
+            if (shouldShowOnlyViolations) {
+                return violation.type === CONST.VIOLATION_TYPES.VIOLATION;
+            }
+            return true;
+        });
+
         const violationGroups = new Map<ViolationField, TransactionViolation[]>();
         for (const violation of filteredViolations) {
             const field = violationFields[violation.name];
@@ -58,15 +75,15 @@ function useViolations(violations: TransactionViolation[]) {
             violationGroups.set(field, [...existingViolations, violation]);
         }
         return violationGroups ?? new Map();
-    }, [violations]);
+    }, [violations, shouldShowOnlyViolations]);
 
     const getViolationsForField = useCallback(
-        (field: ViolationField, data?: TransactionViolation['data']) => {
+        (field: ViolationField, data?: TransactionViolation['data'], policyHasDependentTags = false, tagValue?: string) => {
             const currentViolations = violationsByField.get(field) ?? [];
 
             // someTagLevelsRequired has special logic becase data.errorIndexes is a bit unique in how it denotes the tag list that has the violation
             // tagListIndex can be 0 so we compare with undefined
-            if (currentViolations[0]?.name === 'someTagLevelsRequired' && data?.tagListIndex !== undefined && Array.isArray(currentViolations[0]?.data?.errorIndexes)) {
+            if (currentViolations[0]?.name === CONST.VIOLATIONS.SOME_TAG_LEVELS_REQUIRED && data?.tagListIndex !== undefined && Array.isArray(currentViolations[0]?.data?.errorIndexes)) {
                 return currentViolations
                     .filter((violation) => violation.data?.errorIndexes?.includes(data?.tagListIndex ?? -1))
                     .map((violation) => ({
@@ -78,8 +95,28 @@ function useViolations(violations: TransactionViolation[]) {
                     }));
             }
 
+            // missingTag has special logic for policies with dependent tags, because only one violation is returned for all tags
+            // when no tags are present, so the tag name isn't set in the violation data. That's why we add it here
+            if (policyHasDependentTags && currentViolations[0]?.name === CONST.VIOLATIONS.MISSING_TAG && data?.tagListName) {
+                return [
+                    {
+                        ...currentViolations[0],
+                        data: {
+                            ...currentViolations[0].data,
+                            tagName: data?.tagListName,
+                        },
+                    },
+                ];
+            }
+
             // tagOutOfPolicy has special logic because we have to account for multi-level tags and use tagName to find the right tag to put the violation on
-            if (currentViolations[0]?.name === 'tagOutOfPolicy' && data?.tagListName !== undefined && currentViolations[0]?.data?.tagName) {
+            if (currentViolations[0]?.name === CONST.VIOLATIONS.TAG_OUT_OF_POLICY && data?.tagListName !== undefined && currentViolations[0]?.data?.tagName) {
+                return currentViolations.filter((violation) => violation.data?.tagName === data?.tagListName);
+            }
+
+            // allTagLevelsRequired has special logic because it is returned when one but not all the tags are set,
+            // so we need to return the violation for the tag fields without a tag set
+            if (currentViolations[0]?.name === CONST.VIOLATIONS.ALL_TAG_LEVELS_REQUIRED && tagValue) {
                 return currentViolations.filter((violation) => violation.data?.tagName === data?.tagListName);
             }
 
diff --git a/src/hooks/useWindowDimensions/index.ts b/src/hooks/useWindowDimensions/index.ts
index 25757fda17e5..b391e45a61aa 100644
--- a/src/hooks/useWindowDimensions/index.ts
+++ b/src/hooks/useWindowDimensions/index.ts
@@ -23,7 +23,7 @@ export default function (useCachedViewportHeight = false): WindowDimensions {
         unlockWindowDimensions: () => {},
     };
 
-    const isCachedViewportHeight = useCachedViewportHeight && Browser.isMobileSafari();
+    const isCachedViewportHeight = useCachedViewportHeight && Browser.isMobileWebKit();
     const cachedViewportHeightWithKeyboardRef = useRef(initalViewportHeight);
     const {width: windowWidth, height: windowHeight} = useWindowDimensions();
 
diff --git a/src/languages/en.ts b/src/languages/en.ts
index aadd6ac03f58..4f8ca9065d8a 100755
--- a/src/languages/en.ts
+++ b/src/languages/en.ts
@@ -1,40 +1,51 @@
-import {CONST as COMMON_CONST} from 'expensify-common/lib/CONST';
-import Str from 'expensify-common/lib/str';
+import {CONST as COMMON_CONST, Str} from 'expensify-common';
+import {startCase} from 'lodash';
 import CONST from '@src/CONST';
 import type {Country} from '@src/CONST';
-import type {ConnectionName, PolicyConnectionSyncStage} from '@src/types/onyx/Policy';
+import type {DelegateRole} from '@src/types/onyx/Account';
+import type {ConnectionName, PolicyConnectionSyncStage, SageIntacctMappingName} from '@src/types/onyx/Policy';
 import type {
     AddressLineParams,
     AdminCanceledRequestParams,
     AlreadySignedInParams,
-    AmountEachParams,
+    ApprovalWorkflowErrorParams,
     ApprovedAmountParams,
     BeginningOfChatHistoryAdminRoomPartOneParams,
     BeginningOfChatHistoryAnnounceRoomPartOneParams,
     BeginningOfChatHistoryAnnounceRoomPartTwo,
     BeginningOfChatHistoryDomainRoomPartOneParams,
     CanceledRequestParams,
+    ChangeFieldParams,
+    ChangePolicyParams,
+    ChangeTypeParams,
     CharacterLimitParams,
+    ConfirmHoldExpenseParams,
     ConfirmThatParams,
     DateShouldBeAfterParams,
     DateShouldBeBeforeParams,
+    DelegateSubmitParams,
     DeleteActionParams,
     DeleteConfirmationParams,
+    DeleteExpenseTranslationParams,
     DidSplitAmountMessageParams,
     DistanceRateOperationsParams,
     EditActionParams,
     ElectronicFundsParams,
     EnterMagicCodeParams,
+    ExportedToIntegrationParams,
     FormattedMaxLengthParams,
+    ForwardedAmountParams,
     GoBackMessageParams,
     GoToRoomParams,
     InstantSummaryParams,
+    IssueVirtualCardParams,
     LocalTimeParams,
     LoggedInAsParams,
     LogSizeParams,
     ManagerApprovedAmountParams,
     ManagerApprovedParams,
-    NewFaceEnterMagicCodeParams,
+    MarkedReimbursedParams,
+    MarkReimbursedFromIntegrationParams,
     NoLongerHaveAccessParams,
     NotAllowedExtensionParams,
     NotYouParams,
@@ -52,6 +63,7 @@ import type {
     PaySomeoneParams,
     ReimbursementRateParams,
     RemovedTheRequestParams,
+    RemoveMembersWarningPrompt,
     RenamedRoomActionParams,
     ReportArchiveReasonsClosedParams,
     ReportArchiveReasonsMergedParams,
@@ -67,9 +79,12 @@ import type {
     SetTheRequestParams,
     SettledAfterAddedBankAccountParams,
     SettleExpensifyCardParams,
+    ShareParams,
+    SignUpNewFaceCodeParams,
     SizeExceededParams,
     SplitAmountParams,
     StepCounterParams,
+    StripePaidParams,
     TaskCreatedActionParams,
     TermsParams,
     ThreadRequestReportNameParams,
@@ -77,17 +92,21 @@ import type {
     ToValidateLoginParams,
     TransferParams,
     TranslationBase,
+    UnapprovedParams,
+    UnshareParams,
     UntilTimeParams,
     UpdatedTheDistanceParams,
     UpdatedTheRequestParams,
     UsePlusButtonParams,
     UserIsAlreadyMemberParams,
+    UserSplitParams,
     ViolationsAutoReportedRejectedExpenseParams,
     ViolationsCashExpenseWithNoReceiptParams,
     ViolationsConversionSurchargeParams,
     ViolationsInvoiceMarkupParams,
     ViolationsMaxAgeParams,
     ViolationsMissingTagParams,
+    ViolationsModifiedAmountParams,
     ViolationsOverCategoryLimitParams,
     ViolationsOverLimitParams,
     ViolationsPerDayLimitParams,
@@ -121,10 +140,12 @@ export default {
         yes: 'Yes',
         no: 'No',
         ok: 'OK',
+        notNow: 'Not now',
         learnMore: 'Learn more',
         buttonConfirm: 'Got it',
         name: 'Name',
         attachment: 'Attachment',
+        center: 'Center',
         from: 'From',
         to: 'To',
         optional: 'Optional',
@@ -140,6 +161,7 @@ export default {
         resend: 'Resend',
         save: 'Save',
         select: 'Select',
+        selectMultiple: 'Select multiple',
         saveChanges: 'Save changes',
         submit: 'Submit',
         rotate: 'Rotate',
@@ -148,7 +170,7 @@ export default {
         magicCode: 'Magic code',
         twoFactorCode: 'Two-factor code',
         workspaces: 'Workspaces',
-        chats: 'Chats',
+        inbox: 'Inbox',
         group: 'Group',
         profile: 'Profile',
         referral: 'Referral',
@@ -156,6 +178,7 @@ export default {
         wallet: 'Wallet',
         preferences: 'Preferences',
         view: 'View',
+        review: 'Review',
         not: 'Not',
         signIn: 'Sign in',
         signInWithGoogle: 'Sign in with Google',
@@ -164,6 +187,7 @@ export default {
         continue: 'Continue',
         firstName: 'First name',
         lastName: 'Last name',
+        addCardTermsOfService: 'Expensify Terms of Service',
         phone: 'Phone',
         phoneNumber: 'Phone number',
         phoneNumberPlaceholder: '(xxx) xxx-xxxx',
@@ -171,6 +195,7 @@ export default {
         and: 'and',
         details: 'Details',
         privacy: 'Privacy',
+        privacyPolicy: 'Privacy Policy',
         hidden: 'Hidden',
         visible: 'Visible',
         delete: 'Delete',
@@ -186,7 +211,6 @@ export default {
         saveAndContinue: 'Save & continue',
         settings: 'Settings',
         termsOfService: 'Terms of Service',
-        expensifyTermsOfService: 'Expensify Terms of Service',
         members: 'Members',
         invite: 'Invite',
         here: 'here',
@@ -224,6 +248,7 @@ export default {
         tomorrowAt: 'Tomorrow at',
         yesterdayAt: 'Yesterday at',
         conjunctionAt: 'at',
+        conjunctionTo: 'to',
         genericErrorMessage: 'Oops... something went wrong and your request could not be completed. Please try again later.',
         error: {
             invalidAmount: 'Invalid amount.',
@@ -241,6 +266,8 @@ export default {
             enterAmount: 'Enter an amount.',
             enterDate: 'Enter a date.',
             invalidTimeRange: 'Please enter a time using the 12-hour clock format (e.g., 2:30 PM).',
+            pleaseCompleteForm: 'Please complete the form above to continue.',
+            pleaseSelectOne: 'Please select an option above.',
         },
         comma: 'comma',
         semicolon: 'semicolon',
@@ -270,7 +297,8 @@ export default {
         your: 'your',
         conciergeHelp: 'Please reach out to Concierge for help.',
         youAppearToBeOffline: 'You appear to be offline.',
-        thisFeatureRequiresInternet: 'This feature requires an active internet connection to be used.',
+        thisFeatureRequiresInternet: 'This feature requires an active internet connection.',
+        attachementWillBeAvailableOnceBackOnline: 'Attachment will become available once back online.',
         areYouSure: 'Are you sure?',
         verify: 'Verify',
         yesContinue: 'Yes, continue',
@@ -331,43 +359,65 @@ export default {
         type: 'Type',
         action: 'Action',
         expenses: 'Expenses',
+        tax: 'Tax',
+        shared: 'Shared',
+        drafts: 'Drafts',
+        finished: 'Finished',
+        upgrade: 'Upgrade',
+        companyID: 'Company ID',
+        userID: 'User ID',
+        disable: 'Disable',
+        export: 'Export',
+        initialValue: 'Initial value',
+        currentDate: 'Current date',
+        value: 'Value',
+        downloadFailedTitle: 'Download failed',
+        downloadFailedDescription: "Your download couldn't be completed. Please try again later.",
+        filterLogs: 'Filter Logs',
+        network: 'Network',
+        reportID: 'Report ID',
+        offlinePrompt: "You can't take this action right now.",
+        outstanding: 'Outstanding',
+        days: 'days',
     },
     location: {
         useCurrent: 'Use current location',
-        notFound: 'We were unable to find your location, please try again or enter an address manually.',
-        permissionDenied: 'It looks like you have denied permission to your location.',
+        notFound: 'We were unable to find your location. Please try again or enter an address manually.',
+        permissionDenied: "It looks like you've denied access to your location.",
         please: 'Please',
-        allowPermission: 'allow location permission in settings',
-        tryAgain: 'and then try again.',
+        allowPermission: 'allow location access in settings',
+        tryAgain: 'and try again.',
     },
     anonymousReportFooter: {
         logoTagline: 'Join the discussion.',
     },
     attachmentPicker: {
         cameraPermissionRequired: 'Camera access',
-        expensifyDoesntHaveAccessToCamera: "Expensify can't take photos without access to your camera. Tap Settings to update permissions.",
+        expensifyDoesntHaveAccessToCamera: "Expensify can't take photos without access to your camera. Tap settings to update permissions.",
         attachmentError: 'Attachment error',
-        errorWhileSelectingAttachment: 'An error occurred while selecting an attachment, please try again.',
-        errorWhileSelectingCorruptedImage: 'An error occurred while selecting a corrupted attachment, please try another file.',
+        errorWhileSelectingAttachment: 'An error occurred while selecting an attachment. Please try again.',
+        errorWhileSelectingCorruptedAttachment: 'An error occurred while selecting a corrupted attachment. Please try another file.',
         takePhoto: 'Take photo',
         chooseFromGallery: 'Choose from gallery',
-        chooseDocument: 'Choose document',
-        attachmentTooLarge: 'Attachment too large',
-        sizeExceeded: 'Attachment size is larger than 24 MB limit.',
-        attachmentTooSmall: 'Attachment too small',
-        sizeNotMet: 'Attachment size must be greater than 240 bytes.',
+        chooseDocument: 'Choose file',
+        attachmentTooLarge: 'Attachment is too large',
+        sizeExceeded: 'Attachment size is larger than 24 MB limit',
+        attachmentTooSmall: 'Attachment is too small',
+        sizeNotMet: 'Attachment size must be greater than 240 bytes',
         wrongFileType: 'Invalid file type',
-        notAllowedExtension: 'This file type is not allowed',
-        folderNotAllowedMessage: 'Uploading a folder is not allowed. Try a different file.',
+        notAllowedExtension: 'This file type is not allowed. Please try a different file type.',
+        folderNotAllowedMessage: 'Uploading a folder is not allowed. Please try a different file.',
         protectedPDFNotSupported: 'Password-protected PDF is not supported',
+        attachmentImageResized: 'This image has been resized for previewing. Download for full resolution.',
+        attachmentImageTooLarge: 'This image is too large to preview before uploading.',
     },
     connectionComplete: {
-        title: 'Connection Complete',
+        title: 'Connection complete',
         supportingText: 'You can close this window and head back to the Expensify app.',
     },
     avatarCropModal: {
         title: 'Edit photo',
-        description: 'Drag, zoom, and rotate your image to your preferred specifications',
+        description: 'Drag, zoom, and rotate your image however you like.',
     },
     composer: {
         noExtensionFoundForMimeType: 'No extension found for mime type',
@@ -376,7 +426,7 @@ export default {
     },
     baseUpdateAppModal: {
         updateApp: 'Update app',
-        updatePrompt: 'A new version of this app is available.\nUpdate now or restart the app at a later time to download the latest changes.',
+        updatePrompt: 'A new version of this app is available.\nUpdate now or restart the app later to download the latest changes.',
     },
     deeplinkWrapper: {
         launching: 'Launching Expensify',
@@ -392,44 +442,62 @@ export default {
         continueInWeb: 'continue to the web app',
     },
     validateCodeModal: {
-        successfulSignInTitle: 'Abracadabra,\nyou are signed in!',
+        successfulSignInTitle: "Abracadabra,\nyou're signed in!",
         successfulSignInDescription: 'Head back to your original tab to continue.',
-        title: 'Here is your magic code',
-        description: 'Please enter the code using the device\nwhere it was originally requested',
+        title: "Here's your magic code",
+        description: 'Please enter the code from the device\nwhere it was originally requested',
         or: ', or',
         signInHere: 'just sign in here',
         expiredCodeTitle: 'Magic code expired',
-        expiredCodeDescription: 'Go back to the original device and request a new code.',
+        expiredCodeDescription: 'Go back to the original device and request a new code',
         successfulNewCodeRequest: 'Code requested. Please check your device.',
         tfaRequiredTitle: 'Two-factor authentication\nrequired',
-        tfaRequiredDescription: 'Please enter the two-factor authentication code\nwhere you are trying to sign in.',
+        tfaRequiredDescription: "Please enter the two-factor authentication code\nwhere you're trying to sign in.",
+        requestOneHere: 'request one here.',
     },
     moneyRequestConfirmationList: {
         paidBy: 'Paid by',
-        splitWith: 'Split with',
-        splitAmounts: 'Split amounts',
         whatsItFor: "What's it for?",
     },
-    optionsSelector: {
+    selectionList: {
         nameEmailOrPhoneNumber: 'Name, email, or phone number',
         findMember: 'Find a member',
     },
+    emptyList: {
+        [CONST.IOU.TYPE.SUBMIT]: {
+            title: 'Submit an expense',
+            subtitleText1: 'Submit to someone and ',
+            subtitleText2: `get $${CONST.REFERRAL_PROGRAM.REVENUE}`,
+            subtitleText3: ' when they become a customer.',
+        },
+        [CONST.IOU.TYPE.SPLIT]: {
+            title: 'Split an expense',
+            subtitleText1: 'Split with a friend and ',
+            subtitleText2: `get $${CONST.REFERRAL_PROGRAM.REVENUE}`,
+            subtitleText3: ' when they become a customer.',
+        },
+        [CONST.IOU.TYPE.PAY]: {
+            title: 'Pay someone',
+            subtitleText1: 'Pay anyone and ',
+            subtitleText2: `get $${CONST.REFERRAL_PROGRAM.REVENUE}`,
+            subtitleText3: ' when they become a customer.',
+        },
+    },
     videoChatButtonAndMenu: {
-        tooltip: 'Start a call',
+        tooltip: 'Book a call',
     },
     hello: 'Hello',
     phoneCountryCode: '1',
     welcomeText: {
         getStarted: 'Get started below.',
         anotherLoginPageIsOpen: 'Another login page is open.',
-        anotherLoginPageIsOpenExplanation: "You've opened the login page in a separate tab, please login from that specific tab.",
-        welcomeBack: 'Welcome back!',
+        anotherLoginPageIsOpenExplanation: "You've opened the login page in a separate tab. Please log in from that tab.",
         welcome: 'Welcome!',
+        welcomeWithoutExclamation: 'Welcome',
         phrase2: "Money talks. And now that chat and payments are in one place, it's also easy.",
         phrase3: 'Your payments get to you as fast as you can get your point across.',
         enterPassword: 'Please enter your password',
-        newFaceEnterMagicCode: ({login}: NewFaceEnterMagicCodeParams) =>
-            `It's always great to see a new face around here! Please enter the magic code sent to ${login}. It should arrive within a minute or two.`,
+        welcomeNewFace: ({login}: SignUpNewFaceCodeParams) => `${login}, it's always great to see a new face around here!`,
         welcomeEnterMagicCode: ({login}: WelcomeEnterMagicCodeParams) => `Please enter the magic code sent to ${login}. It should arrive within a minute or two.`,
     },
     login: {
@@ -439,7 +507,7 @@ export default {
         },
     },
     thirdPartySignIn: {
-        alreadySignedIn: ({email}: AlreadySignedInParams) => `You are already signed in as ${email}.`,
+        alreadySignedIn: ({email}: AlreadySignedInParams) => `You're already signed in as ${email}.`,
         goBackMessage: ({provider}: GoBackMessageParams) => `Don't want to sign in with ${provider}?`,
         continueWithMyCurrentSession: 'Continue with my current session',
         redirectToDesktopMessage: "We'll redirect you to the desktop app once you finish signing in.",
@@ -449,7 +517,7 @@ export default {
     },
     samlSignIn: {
         welcomeSAMLEnabled: 'Continue logging in with single sign-on:',
-        orContinueWithMagicCode: 'Or optionally, your company allows signing in with a magic code',
+        orContinueWithMagicCode: 'You can also sign in with a magic code',
         useSingleSignOn: 'Use single sign-on',
         useMagicCode: 'Use magic code',
         launching: 'Launching...',
@@ -477,6 +545,10 @@ export default {
         emoji: 'Emoji',
         collapse: 'Collapse',
         expand: 'Expand',
+        tooltip: {
+            title: 'Get started!',
+            subtitle: ' Submit your first expense',
+        },
     },
     reportActionContextMenu: {
         copyToClipboard: 'Copy to clipboard',
@@ -493,6 +565,7 @@ export default {
         replyInThread: 'Reply in thread',
         joinThread: 'Join thread',
         leaveThread: 'Leave thread',
+        copyOnyxData: 'Copy Onyx data',
         flagAsOffensive: 'Flag as offensive',
         menu: 'Menu',
     },
@@ -507,7 +580,6 @@ export default {
         beginningOfChatHistoryDomainRoomPartTwo: ' to chat with colleagues, share tips, and ask questions.',
         beginningOfChatHistoryAdminRoomPartOne: ({workspaceName}: BeginningOfChatHistoryAdminRoomPartOneParams) => `Collaboration among ${workspaceName} admins starts here! 🎉\nUse `,
         beginningOfChatHistoryAdminRoomPartTwo: ' to chat about topics such as workspace configurations and more.',
-        beginningOfChatHistoryAdminOnlyPostingRoom: 'Only admins can send messages in this room.',
         beginningOfChatHistoryAnnounceRoomPartOne: ({workspaceName}: BeginningOfChatHistoryAnnounceRoomPartOneParams) =>
             `Collaboration between all ${workspaceName} members starts here! 🎉\nUse `,
         beginningOfChatHistoryAnnounceRoomPartTwo: ({workspaceName}: BeginningOfChatHistoryAnnounceRoomPartTwo) => ` to chat about anything ${workspaceName} related.`,
@@ -519,6 +591,7 @@ export default {
         beginningOfChatHistoryPolicyExpenseChatPartTwo: ' and ',
         beginningOfChatHistoryPolicyExpenseChatPartThree: ' starts here! 🎉 This is the place to chat, submit expenses and settle up.',
         beginningOfChatHistorySelfDM: 'This is your personal space. Use it for notes, tasks, drafts, and reminders.',
+        beginningOfChatHistorySystemDM: "Welcome! Let's get you set up.",
         chatWithAccountManager: 'Chat with your account manager here',
         sayHello: 'Say hello!',
         yourSpace: 'Your space',
@@ -532,6 +605,7 @@ export default {
             invoice: 'invoice an expense',
         },
     },
+    adminOnlyCanPost: 'Only admins can send messages in this room.',
     reportAction: {
         asCopilot: 'as copilot for',
     },
@@ -539,6 +613,7 @@ export default {
         hereAlternateText: 'Notify everyone in this conversation',
     },
     newMessages: 'New messages',
+    youHaveBeenBanned: "Note: You've been banned from chatting in this channel.",
     reportTypingIndicator: {
         isTyping: 'is typing...',
         areTyping: 'are typing...',
@@ -555,6 +630,7 @@ export default {
                 : `This chat is no longer active because ${displayName} is no longer a member of the ${policyName} workspace.`,
         [CONST.REPORT.ARCHIVE_REASON.POLICY_DELETED]: ({policyName}: ReportArchiveReasonsPolicyDeletedParams) =>
             `This chat is no longer active because ${policyName} is no longer an active workspace.`,
+        [CONST.REPORT.ARCHIVE_REASON.BOOKING_END_DATE_HAS_PASSED]: 'This booking is archived.',
     },
     writeCapabilityPage: {
         label: 'Who can post',
@@ -575,8 +651,8 @@ export default {
         saveTheWorld: 'Save the world',
     },
     allSettingsScreen: {
-        subscriptions: 'Subscriptions',
-        cardsAndDomains: 'Cards & Domains',
+        subscription: 'Subscription',
+        domains: 'Domains',
     },
     tabSelector: {
         chat: 'Chat',
@@ -593,8 +669,12 @@ export default {
         chooseFile: 'Choose file',
         takePhoto: 'Take a photo',
         cameraAccess: 'Camera access is required to take pictures of receipts.',
-        cameraErrorTitle: 'Camera Error',
-        cameraErrorMessage: 'An error occurred while taking a photo, please try again.',
+        cameraErrorTitle: 'Camera error',
+        cameraErrorMessage: 'An error occurred while taking a photo. Please try again.',
+        locationAccessTitle: 'Allow location access',
+        locationAccessMessage: 'Location access helps us keep your timezone and currency accurate wherever you go.',
+        locationErrorTitle: 'Allow location access',
+        locationErrorMessage: 'Location access helps us keep your timezone and currency accurate wherever you go.',
         dropTitle: 'Let it go',
         dropMessage: 'Drop your file here',
         flash: 'flash',
@@ -611,12 +691,18 @@ export default {
         splitBill: 'Split expense',
         splitScan: 'Split receipt',
         splitDistance: 'Split distance',
-        sendMoney: 'Pay someone',
+        paySomeone: (name: string) => `Pay ${name ?? 'someone'}`,
         assignTask: 'Assign task',
         header: 'Quick action',
         trackManual: 'Track expense',
         trackScan: 'Track receipt',
         trackDistance: 'Track distance',
+        noLongerHaveReportAccess: 'You no longer have access to your previous quick action destination. Pick a new one below.',
+        updateDestination: 'Update destination',
+        tooltip: {
+            title: 'Quick action! ',
+            subtitle: 'Just a tap away.',
+        },
     },
     iou: {
         amount: 'Amount',
@@ -644,37 +730,61 @@ export default {
         canceled: 'Canceled',
         posted: 'Posted',
         deleteReceipt: 'Delete receipt',
+        pendingMatchWithCreditCard: 'Receipt pending match with card transaction',
+        pendingMatchWithCreditCardDescription: 'Receipt pending match with card transaction. Mark as cash to cancel.',
+        markAsCash: 'Mark as cash',
+        routePending: 'Route pending...',
+        receiptScanning: 'Receipt scanning...',
+        receiptScanInProgress: 'Receipt scan in progress',
+        receiptScanInProgressDescription: 'Receipt scan in progress. Check back later or enter the details now.',
         receiptIssuesFound: (count: number) => `${count === 1 ? 'Issue' : 'Issues'} found`,
         fieldPending: 'Pending...',
         defaultRate: 'Default rate',
-        receiptScanning: 'Scan in progress…',
         receiptMissingDetails: 'Receipt missing details',
         missingAmount: 'Missing amount',
         missingMerchant: 'Missing merchant',
         receiptStatusTitle: 'Scanning…',
         receiptStatusText: "Only you can see this receipt when it's scanning. Check back later or enter the details now.",
-        receiptScanningFailed: 'Receipt scanning failed. Enter the details manually.',
-        transactionPendingText: 'It takes a few days from the date the card was used for the transaction to post.',
-        expenseCount: ({count, scanningReceipts = 0, pendingReceipts = 0}: RequestCountParams) =>
-            `${count} ${Str.pluralize('expense', 'expenses', count)}${scanningReceipts > 0 ? `, ${scanningReceipts} scanning` : ''}${
-                pendingReceipts > 0 ? `, ${pendingReceipts} pending` : ''
-            }`,
-        deleteExpense: 'Delete expense',
-        deleteConfirmation: 'Are you sure that you want to delete this expense?',
+        receiptScanningFailed: 'Receipt scanning failed. Please enter the details manually.',
+        transactionPendingDescription: 'Transaction pending. It may take a few days to post.',
+        companyInfo: 'Company info',
+        companyInfoDescription: 'We need a few more details before you can send your first invoice.',
+        yourCompanyName: 'Your company name',
+        yourCompanyWebsite: 'Your company website',
+        yourCompanyWebsiteNote: "If you don't have a website, you can provide your company's LinkedIn or social media profile instead.",
+        invalidDomainError: 'You have entered an invalid domain. To continue, please enter a valid domain.',
+        publicDomainError: 'You have entered a public domain. To continue, please enter a private domain.',
+        expenseCount: ({count, scanningReceipts = 0, pendingReceipts = 0}: RequestCountParams) => {
+            const expenseText = `${count} ${Str.pluralize('expense', 'expenses', count)}`;
+            const statusText = [];
+            if (scanningReceipts > 0) {
+                statusText.push(`${scanningReceipts} scanning`);
+            }
+            if (pendingReceipts > 0) {
+                statusText.push(`${pendingReceipts} pending`);
+            }
+            return statusText.length > 0 ? `${expenseText} (${statusText.join(', ')})` : expenseText;
+        },
+        deleteExpense: ({count}: DeleteExpenseTranslationParams = {count: 1}) => `Delete ${Str.pluralize('expense', 'expenses', count)}`,
+        deleteConfirmation: ({count}: DeleteExpenseTranslationParams = {count: 1}) => `Are you sure that you want to delete ${Str.pluralize('this expense', 'these expenses', count)}?`,
         settledExpensify: 'Paid',
         settledElsewhere: 'Paid elsewhere',
+        individual: 'Individual',
+        business: 'Business',
         settleExpensify: ({formattedAmount}: SettleExpensifyCardParams) => (formattedAmount ? `Pay ${formattedAmount} with Expensify` : `Pay with Expensify`),
+        settlePersonal: ({formattedAmount}: SettleExpensifyCardParams) => (formattedAmount ? `Pay ${formattedAmount} as an individual` : `Pay as an individual`),
+        settlePayment: ({formattedAmount}: SettleExpensifyCardParams) => `Pay ${formattedAmount}`,
+        settleBusiness: ({formattedAmount}: SettleExpensifyCardParams) => (formattedAmount ? `Pay ${formattedAmount} as a business` : `Pay as a business`),
         payElsewhere: ({formattedAmount}: SettleExpensifyCardParams) => (formattedAmount ? `Pay ${formattedAmount} elsewhere` : `Pay elsewhere`),
-        nextStep: 'Next Steps',
+        nextStep: 'Next steps',
         finished: 'Finished',
         sendInvoice: ({amount}: RequestAmountParams) => `Send ${amount} invoice`,
         submitAmount: ({amount}: RequestAmountParams) => `submit ${amount}`,
-        trackAmount: ({amount}: RequestAmountParams) => `track ${amount}`,
         submittedAmount: ({formattedAmount, comment}: RequestedAmountMessageParams) => `submitted ${formattedAmount}${comment ? ` for ${comment}` : ''}`,
         trackedAmount: ({formattedAmount, comment}: RequestedAmountMessageParams) => `tracking ${formattedAmount}${comment ? ` for ${comment}` : ''}`,
         splitAmount: ({amount}: SplitAmountParams) => `split ${amount}`,
         didSplitAmount: ({formattedAmount, comment}: DidSplitAmountMessageParams) => `split ${formattedAmount}${comment ? ` for ${comment}` : ''}`,
-        amountEach: ({amount}: AmountEachParams) => `${amount} each`,
+        yourSplit: ({amount}: UserSplitParams) => `Your split ${amount}`,
         payerOwesAmount: ({payer, amount, comment}: PayerOwesAmountParams) => `${payer} owes ${amount}${comment ? ` for ${comment}` : ''}`,
         payerOwes: ({payer}: PayerOwesParams) => `${payer} owes: `,
         payerPaidAmount: ({payer, amount}: PayerPaidAmountParams): string => `${payer ? `${payer} ` : ''}paid ${amount}`,
@@ -685,14 +795,15 @@ export default {
         managerApprovedAmount: ({manager, amount}: ManagerApprovedAmountParams) => `${manager} approved ${amount}`,
         payerSettled: ({amount}: PayerSettledParams) => `paid ${amount}`,
         approvedAmount: ({amount}: ApprovedAmountParams) => `approved ${amount}`,
-        waitingOnBankAccount: ({submitterDisplayName}: WaitingOnBankAccountParams) => `started settling up, payment is held until ${submitterDisplayName} adds a bank account`,
+        forwardedAmount: ({amount}: ForwardedAmountParams) => `approved ${amount}`,
+        waitingOnBankAccount: ({submitterDisplayName}: WaitingOnBankAccountParams) => `started settling up. Payment is on hold until ${submitterDisplayName} adds a bank account.`,
         adminCanceledRequest: ({manager, amount}: AdminCanceledRequestParams) => `${manager ? `${manager}: ` : ''}cancelled the ${amount} payment.`,
         canceledRequest: ({amount, submitterDisplayName}: CanceledRequestParams) =>
             `canceled the ${amount} payment, because ${submitterDisplayName} did not enable their Expensify Wallet within 30 days`,
         settledAfterAddedBankAccount: ({submitterDisplayName, amount}: SettledAfterAddedBankAccountParams) =>
             `${submitterDisplayName} added a bank account. The ${amount} payment has been made.`,
         paidElsewhereWithAmount: ({payer, amount}: PaidElsewhereWithAmountParams) => `${payer ? `${payer} ` : ''}paid ${amount} elsewhere`,
-        paidWithExpensifyWithAmount: ({payer, amount}: PaidWithExpensifyWithAmountParams) => `${payer ? `${payer} ` : ''}paid ${amount} using Expensify`,
+        paidWithExpensifyWithAmount: ({payer, amount}: PaidWithExpensifyWithAmountParams) => `${payer ? `${payer} ` : ''}paid ${amount} with Expensify`,
         noReimbursableExpenses: 'This report has an invalid amount',
         pendingConversionMessage: "Total will update when you're back online",
         changedTheExpense: 'changed the expense',
@@ -708,29 +819,34 @@ export default {
         tagSelection: 'Select a tag to better organize your spend.',
         categorySelection: 'Select a category to better organize your spend.',
         error: {
-            invalidCategoryLength: 'The length of the category chosen exceeds the maximum allowed (255). Please choose a different or shorten the category name first.',
+            invalidCategoryLength: 'The category name exceeds 255 characters. Please shorten it or choose a different category.',
             invalidAmount: 'Please enter a valid amount before continuing.',
             invalidTaxAmount: ({amount}: RequestAmountParams) => `Maximum tax amount is ${amount}`,
-            invalidSplit: 'Split amounts do not equal total amount.',
-            other: 'Unexpected error, please try again later.',
+            invalidSplit: 'The sum of splits must equal the total amount.',
+            invalidSplitParticipants: 'Please enter an amount greater than zero for at least two participants.',
+            other: 'Unexpected error. Please try again later.',
             genericCreateFailureMessage: 'Unexpected error submitting this expense. Please try again later.',
-            genericCreateInvoiceFailureMessage: 'Unexpected error sending invoice, please try again later.',
-            // eslint-disable-next-line rulesdir/use-periods-for-error-messages
-            receiptFailureMessage: "The receipt didn't upload. ",
+            genericCreateInvoiceFailureMessage: 'Unexpected error sending this invoice. Please try again later.',
+            genericHoldExpenseFailureMessage: 'Unexpected error holding this expense. Please try again later.',
+            genericUnholdExpenseFailureMessage: 'Unexpected error taking this expense off hold. Please try again later.',
+            receiptDeleteFailureError: 'Unexpected error deleting this receipt. Please try again later.',
             // eslint-disable-next-line rulesdir/use-periods-for-error-messages
+            receiptFailureMessage: "The receipt didn't upload.",
             saveFileMessage: 'Download the file ',
+            // eslint-disable-next-line rulesdir/use-periods-for-error-messages
             loseFileMessage: 'or dismiss this error and lose it.',
-            genericDeleteFailureMessage: 'Unexpected error deleting this expense, please try again later.',
-            genericEditFailureMessage: 'Unexpected error editing this expense, please try again later.',
+            genericDeleteFailureMessage: 'Unexpected error deleting this expense. Please try again later.',
+            genericEditFailureMessage: 'Unexpected error editing this expense. Please try again later.',
             genericSmartscanFailureMessage: 'Transaction is missing fields.',
             duplicateWaypointsErrorMessage: 'Please remove duplicate waypoints.',
             atLeastTwoDifferentWaypoints: 'Please enter at least two different addresses.',
             splitExpenseMultipleParticipantsErrorMessage: 'An expense cannot be split between a workspace and other members. Please update your selection.',
             invalidMerchant: 'Please enter a correct merchant.',
         },
-        waitingOnEnabledWallet: ({submitterDisplayName}: WaitingOnBankAccountParams) => `Started settling up, payment is held until ${submitterDisplayName} enables their Wallet`,
-        enableWallet: 'Enable Wallet',
+        waitingOnEnabledWallet: ({submitterDisplayName}: WaitingOnBankAccountParams) => `started settling up. Payment is on hold until ${submitterDisplayName} enables their wallet.`,
+        enableWallet: 'Enable wallet',
         hold: 'Hold',
+        unhold: 'Unhold',
         holdExpense: 'Hold expense',
         unholdExpense: 'Unhold expense',
         heldExpense: 'held this expense',
@@ -738,24 +854,44 @@ export default {
         explainHold: "Explain why you're holding this expense.",
         reason: 'Reason',
         holdReasonRequired: 'A reason is required when holding.',
-        expenseOnHold: 'This expense was put on hold. Review the comments for next steps.',
-        confirmApprove: 'Confirm what to approve',
-        confirmApprovalAmount: 'Approve the entire report total or only the amount not on hold.',
-        confirmPay: 'Confirm what to pay',
-        confirmPayAmount: 'Pay all out-of-pocket spend or only the amount not on hold.',
+        expenseOnHold: 'This expense was put on hold. Please review the comments for next steps.',
+        expensesOnHold: 'All expenses were put on hold. Please review the comments for next steps.',
+        expenseDuplicate: 'This expense has the same details as another one. Please review the duplicates to remove the hold.',
+        reviewDuplicates: 'Review duplicates',
+        keepAll: 'Keep all',
+        confirmApprove: 'Confirm approval amount',
+        confirmApprovalAmount: 'Approve only compliant expenses, or approve the entire report.',
+        confirmApprovalAllHoldAmount: ({transactionCount}: ConfirmHoldExpenseParams) =>
+            `${Str.pluralize('This expense is', 'These expenses are', transactionCount)} on hold. Do you want to approve anyway?`,
+        confirmPay: 'Confirm payment amount',
+        confirmPayAmount: "Pay what's not on hold, or pay the entire report.",
+        confirmPayAllHoldAmount: ({transactionCount}: ConfirmHoldExpenseParams) =>
+            `${Str.pluralize('This expense is', 'These expenses are', transactionCount)} on hold. Do you want to pay anyway?`,
         payOnly: 'Pay only',
         approveOnly: 'Approve only',
         holdEducationalTitle: 'This expense is on',
         whatIsHoldTitle: 'What is hold?',
         whatIsHoldExplain: 'Hold is our way of streamlining financial collaboration. "Reject" is so harsh!',
         holdIsTemporaryTitle: 'Hold is usually temporary',
-        holdIsTemporaryExplain: "Because hold is used to clear up confusion or clarify an important detail before payment, it's not permanent.",
+        holdIsTemporaryExplain: "Hold is used to clear up confusion or clarify an important detail before payment. Don't worry, it's not permanent!",
         deleteHoldTitle: "Delete whatever won't be paid",
-        deleteHoldExplain: "In the rare case where something is put on hold and won't be paid, it's on the person requesting payment to delete it.",
+        deleteHoldExplain: "In the rare case where something's put on hold and won't be paid, it's on the person requesting payment to delete it.",
         set: 'set',
         changed: 'changed',
         removed: 'removed',
+        transactionPending: 'Transaction pending.',
         chooseARate: ({unit}: ReimbursementRateParams) => `Select a workspace reimbursement rate per ${unit}`,
+        unapprove: 'Unapprove',
+        unapproveReport: 'Unapprove report',
+        headsUp: 'Heads up!',
+        unapproveWithIntegrationWarning: (accountingIntegration: string) =>
+            `This report has already been exported to ${accountingIntegration}. Changes to this report in Expensify may lead to data discrepancies and Expensify Card reconciliation issues. Are you sure you want to unapprove this report?`,
+        reimbursable: 'reimbursable',
+        nonReimbursable: 'non-reimbursable',
+        bookingPending: 'This booking is pending',
+        bookingPendingDescription: "This booking is pending because it hasn't been paid yet.",
+        bookingArchived: 'This booking is archived',
+        bookingArchivedDescription: 'This booking is archived because the trip date has passed. Add an expense for the final amount if needed.',
     },
     notificationPreferencesPage: {
         header: 'Notification preferences',
@@ -768,8 +904,8 @@ export default {
         },
     },
     loginField: {
-        numberHasNotBeenValidated: 'The number has not yet been validated. Click the button to resend the validation link via text.',
-        emailHasNotBeenValidated: 'The email has not yet been validated. Click the button to resend the validation link via text.',
+        numberHasNotBeenValidated: "The number hasn't been validated. Click the button to resend the validation link via text.",
+        emailHasNotBeenValidated: "The email hasn't been validated. Click the button to resend the validation link via text.",
     },
     avatarWithImagePicker: {
         uploadPhoto: 'Upload photo',
@@ -777,7 +913,7 @@ export default {
         editImage: 'Edit photo',
         viewPhoto: 'View photo',
         imageUploadFailed: 'Image upload failed',
-        deleteWorkspaceError: 'Sorry, there was an unexpected problem deleting your workspace avatar.',
+        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) =>
             `Please upload an image larger than ${minHeightInPx}x${minWidthInPx} pixels and smaller than ${maxHeightInPx}x${maxWidthInPx} pixels.`,
@@ -792,18 +928,18 @@ export default {
         setMyTimezoneAutomatically: 'Set my timezone automatically',
         timezone: 'Timezone',
         invalidFileMessage: 'Invalid file. Please try a different image.',
-        avatarUploadFailureMessage: 'An error occurred uploading the avatar, please try again.',
+        avatarUploadFailureMessage: 'An error occurred uploading the avatar. Please try again.',
         online: 'Online',
         offline: 'Offline',
         syncing: 'Syncing',
         profileAvatar: 'Profile avatar',
         publicSection: {
             title: 'Public',
-            subtitle: 'These details are displayed on your public profile, available for people to see.',
+            subtitle: 'These details are displayed on your public profile. Anyone can see them.',
         },
         privateSection: {
             title: 'Private',
-            subtitle: 'These details are used for travel and payments. They are never shown on your public profile.',
+            subtitle: "These details are used for travel and payments. They're never shown on your public profile.",
         },
     },
     securityPage: {
@@ -828,10 +964,9 @@ export default {
         getInTouch: "Whenever we need to get in touch with you, we'll use this contact method.",
         enterMagicCode: ({contactMethod}: EnterMagicCodeParams) => `Please enter the magic code sent to ${contactMethod}`,
         setAsDefault: 'Set as default',
-        yourDefaultContactMethod:
-            'This is your current default contact method. You will not be able to delete this contact method until you set an alternative default by selecting another contact method and pressing “Set as default”.',
+        yourDefaultContactMethod: "This is your current default contact method. Before you can delete it, you'll need to choose another contact method and click “Set as default”.",
         removeContactMethod: 'Remove contact method',
-        removeAreYouSure: 'Are you sure you want to remove this contact method? This action cannot be undone.',
+        removeAreYouSure: "Are you sure you want to remove this contact method? This action can't be undone.",
         failedNewContact: 'Failed to add this contact method.',
         genericFailureMessages: {
             requestContactMethodValidateCode: 'Failed to send a new magic code. Please wait a bit and try again.',
@@ -839,7 +974,7 @@ export default {
             deleteContactMethod: 'Failed to delete contact method. Please reach out to Concierge for help.',
             setDefaultContactMethod: 'Failed to set a new default contact method. Please reach out to Concierge for help.',
             addContactMethod: 'Failed to add this contact method. Please reach out to Concierge for help.',
-            enteredMethodIsAlreadySubmited: 'The Entered Contact Method already exists.',
+            enteredMethodIsAlreadySubmited: 'This contact method already exists.',
             passwordRequired: 'password required.',
             contactMethodRequired: 'Contact method is required.',
             invalidContactMethod: 'Invalid contact method',
@@ -875,7 +1010,7 @@ export default {
     timezonePage: {
         timezone: 'Timezone',
         isShownOnProfile: 'Your timezone is shown on your profile.',
-        getLocationAutomatically: 'Automatically determine your location.',
+        getLocationAutomatically: 'Automatically determine your location',
     },
     updateRequiredView: {
         updateRequired: 'Update required',
@@ -885,7 +1020,7 @@ export default {
     initialSettingsPage: {
         about: 'About',
         aboutPage: {
-            description: 'The New Expensify App is built by a community of open source developers from around the world. Help us build the future of Expensify.',
+            description: 'The New Expensify App is built by a community of open-source developers from around the world. Help us build the future of Expensify.',
             appDownloadLinks: 'App download links',
             viewKeyboardShortcuts: 'View keyboard shortcuts',
             viewTheCode: 'View the code',
@@ -925,6 +1060,9 @@ export default {
             deviceCredentials: 'Device credentials',
             invalidate: 'Invalidate',
             destroy: 'Destroy',
+            maskExportOnyxStateData: 'Mask fragile user data while exporting Onyx state',
+            exportOnyxState: 'Export Onyx state',
+            testCrash: 'Test crash',
         },
         debugConsole: {
             saveLog: 'Save log',
@@ -934,11 +1072,12 @@ export default {
             noLogsAvailable: 'No logs available',
             logSizeTooLarge: ({size}: LogSizeParams) => `Log size exceeds the limit of ${size} MB. Please use "Save log" to download the log file instead.`,
             logs: 'Logs',
+            viewConsole: 'View console',
         },
         security: 'Security',
         signOut: 'Sign out',
         restoreStashed: 'Restore stashed login',
-        signOutConfirmationText: "You'll lose any offline changes if you sign-out.",
+        signOutConfirmationText: "You'll lose any offline changes if you sign out.",
         versionLetter: 'v',
         readTheTermsAndPrivacy: {
             phrase1: 'Read the',
@@ -948,7 +1087,7 @@ export default {
         },
         returnToClassic: 'Switch to Expensify Classic',
         help: 'Help',
-        accountSettings: 'Account Settings',
+        accountSettings: 'Account settings',
         account: 'Account',
         general: 'General',
     },
@@ -958,7 +1097,7 @@ export default {
         enterMessageHere: 'Enter message here',
         closeAccountWarning: 'Closing your account cannot be undone.',
         closeAccountPermanentlyDeleteData: 'Are you sure you want to delete your account? This will permanently delete any outstanding expenses.',
-        enterDefaultContactToConfirm: 'Please type your default contact method to confirm you wish to close your account. Your default contact method is:',
+        enterDefaultContactToConfirm: 'Please enter your default contact method to confirm you wish to close your account. Your default contact method is:',
         enterDefaultContact: 'Enter your default contact method',
         defaultContact: 'Default contact method:',
         enterYourDefaultContactMethod: 'Please enter your default contact method to close your account.',
@@ -968,7 +1107,7 @@ export default {
         changingYourPasswordPrompt: 'Changing your password will update your password for both your Expensify.com and New Expensify accounts.',
         currentPassword: 'Current password',
         newPassword: 'New password',
-        newPasswordPrompt: 'New password must be different than your old password, have at least 8 characters, 1 capital letter, 1 lowercase letter, and 1 number.',
+        newPasswordPrompt: 'Your new password must be different from your old password and contain at least 8 characters, 1 capital letter, 1 lowercase letter, and 1 number.',
     },
     twoFactorAuth: {
         headerTitle: 'Two-factor authentication',
@@ -981,18 +1120,22 @@ export default {
         stepCodes: 'Recovery codes',
         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.',
+            "If you lose access to your authenticator app and don’t have these codes, you'll 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',
         addKey: 'Or add this secret key to your authenticator app:',
-        enterCode: 'Then enter the six digit code generated from your authenticator app.',
+        enterCode: 'Then enter the six-digit code generated from your authenticator app.',
         stepSuccess: 'Finished',
         enabled: 'Two-factor authentication is now enabled!',
         congrats: 'Congrats, now you’ve got that extra security.',
         copy: 'Copy',
         disable: 'Disable',
+        enableTwoFactorAuth: 'Enable two-factor authentication',
+        pleaseEnableTwoFactorAuth: 'Please enable two-factor authentication.',
+        twoFactorAuthIsRequiredDescription: 'Two-factor authentication is required for connecting to Xero. Please enable two-factor authentication to continue.',
+        twoFactorAuthIsRequiredForAdminsDescription: 'Two-factor authentication is required for Xero workspace admins. Please enable two-factor authentication to continue.',
     },
     recoveryCodeForm: {
         error: {
@@ -1015,14 +1158,26 @@ export default {
     },
     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.',
+        personalNoteMessage: "Keep notes about this chat here. You're the only person who can add, edit, or view these notes.",
+        sharedNoteMessage: 'Keep notes about this chat here. Expensify employees and other members on the team.expensify.com domain can view these notes.',
         composerLabel: 'Notes',
         myNote: 'My note',
         error: {
             genericFailureMessage: "Private notes couldn't be saved.",
         },
     },
+    billingCurrency: {
+        error: {
+            securityCode: 'Please enter a valid security code.',
+        },
+        securityCode: 'Security code',
+        changeBillingCurrency: 'Change billing currency',
+        changePaymentCurrency: 'Change payment currency',
+        paymentCurrency: 'Payment currency',
+        note: 'Note: Changing your payment currency can impact how much you’ll pay for Expensify. Refer to our',
+        noteLink: 'pricing page',
+        noteDetails: 'for full details.',
+    },
     addDebitCardPage: {
         addADebitCard: 'Add a debit card',
         nameOnCard: 'Name on card',
@@ -1039,23 +1194,47 @@ export default {
             debitCardNumber: 'Please enter a valid debit card number.',
             expirationDate: 'Please select a valid expiration date.',
             securityCode: 'Please enter a valid security code.',
-            addressStreet: 'Please enter a valid billing address that is not a PO Box.',
+            addressStreet: "Please enter a valid billing address that's not a PO box.",
             addressState: 'Please select a state.',
             addressCity: 'Please enter a city.',
-            genericFailureMessage: 'An error occurred while adding your card, please try again.',
+            genericFailureMessage: 'An error occurred while adding your card. Please try again.',
+            password: 'Please enter your Expensify password.',
+        },
+    },
+    addPaymentCardPage: {
+        addAPaymentCard: 'Add payment card',
+        nameOnCard: 'Name on card',
+        paymentCardNumber: 'Card number',
+        expiration: 'Expiration date',
+        expirationDate: 'MMYY',
+        cvv: 'CVV',
+        billingAddress: 'Billing address',
+        growlMessageOnSave: 'Your payment card was successfully added',
+        expensifyPassword: 'Expensify password',
+        error: {
+            invalidName: 'Name can only include letters.',
+            addressZipCode: 'Please enter a valid zip code.',
+            paymentCardNumber: 'Please enter a valid card number.',
+            expirationDate: 'Please select a valid expiration date.',
+            securityCode: 'Please enter a valid security code.',
+            addressStreet: "Please enter a valid billing address that's not a PO box.",
+            addressState: 'Please select a state.',
+            addressCity: 'Please enter a city.',
+            genericFailureMessage: 'An error occurred while adding your card. Please try again.',
             password: 'Please enter your Expensify password.',
         },
     },
     walletPage: {
+        balance: 'Balance',
         paymentMethodsTitle: 'Payment methods',
         setDefaultConfirmation: 'Make default payment method',
         setDefaultSuccess: 'Default payment method set!',
         deleteAccount: 'Delete account',
-        deleteConfirmation: 'Are you sure that you want to delete this account?',
+        deleteConfirmation: 'Are you sure you want to delete this account?',
         error: {
-            notOwnerOfBankAccount: 'There was an error setting this bank account as your default payment method.',
+            notOwnerOfBankAccount: 'An error occurred while setting this bank account as your default payment method.',
             invalidBankAccount: 'This bank account is temporarily suspended.',
-            notOwnerOfFund: 'There was an error setting this card as your default payment method.',
+            notOwnerOfFund: 'An error occurred while setting this card as your default payment method.',
             setDefaultFailure: 'Something went wrong. Please chat with Concierge for further assistance.',
         },
         addBankAccountFailure: 'An unexpected error occurred while trying to add your bank account. Please try again.',
@@ -1065,22 +1244,23 @@ export default {
         secureAccessToYourMoney: 'Secure access to your money',
         receiveMoney: 'Receive money in your local currency',
         expensifyWallet: 'Expensify Wallet',
-        sendAndReceiveMoney: 'Send and receive money from your Expensify Wallet.',
-        enableWalletToSendAndReceiveMoney: 'Enable your Expensify Wallet to start sending and receiving money with friends!',
+        sendAndReceiveMoney: 'Send and receive money with friends',
+        enableWalletToSendAndReceiveMoney: 'Enable your wallet to send and receive money with friends.',
+        walletEnabledToSendAndReceiveMoney: 'Your wallet has been enabled to send and receive money with friends.',
         enableWallet: 'Enable wallet',
         bankAccounts: 'Bank accounts',
-        addBankAccountToSendAndReceive: 'Add a bank account to send and receive payments directly in the app.',
+        addBankAccountToSendAndReceive: 'Adding a bank account allows you to get paid back for expenses you submit to a workspace.',
         addBankAccount: 'Add bank account',
         assignedCards: 'Assigned cards',
-        assignedCardsDescription: 'These are cards assigned by a Workspace admin to manage company spend.',
+        assignedCardsDescription: 'These are cards assigned by a workspace admin to manage company spend.',
         expensifyCard: 'Expensify Card',
-        walletActivationPending: "We're reviewing your information, please check back in a few minutes!",
-        walletActivationFailed: 'Unfortunately your wallet cannot be enabled at this time. Please chat with Concierge for further assistance.',
-        addYourBankAccount: 'Add your bank account.',
+        walletActivationPending: "We're reviewing your information. Please check back in a few minutes!",
+        walletActivationFailed: "Unfortunately, your wallet can't be enabled at this time. Please chat with Concierge for further assistance.",
+        addYourBankAccount: 'Add your bank account',
         addBankAccountBody: "Let's connect your bank account to Expensify so it’s easier than ever to send and receive payments directly in the app.",
-        chooseYourBankAccount: 'Choose your bank account.',
+        chooseYourBankAccount: 'Choose your bank account',
         chooseAccountBody: 'Make sure that you select the right one.',
-        confirmYourBankAccount: 'Confirm your bank account.',
+        confirmYourBankAccount: 'Confirm your bank account',
     },
     cardPage: {
         expensifyCard: 'Expensify Card',
@@ -1103,7 +1283,7 @@ export default {
         reportFraud: 'Report virtual card fraud',
         reviewTransaction: 'Review transaction',
         suspiciousBannerTitle: 'Suspicious transaction',
-        suspiciousBannerDescription: 'We noticed suspicious transaction on your card. Tap below to review.',
+        suspiciousBannerDescription: 'We noticed suspicious transactions on your card. Tap below to review.',
         cardLocked: "Your card is temporarily locked while our team reviews your company's account.",
         cardDetails: {
             cardNumber: 'Virtual card number',
@@ -1120,10 +1300,12 @@ export default {
         workflowTitle: 'Spend',
         workflowDescription: 'Configure a workflow from the moment spend occurs, including approval and payment.',
         delaySubmissionTitle: 'Delay submissions',
-        delaySubmissionDescription: 'Expenses are shared right away for better spend visibility. Set a slower cadence if needed.',
+        delaySubmissionDescription: 'Delay expense submissions based on a custom schedule, or keep this option disabled to maintain realtime spend visibility.',
         submissionFrequency: 'Submission frequency',
         submissionFrequencyDateOfMonth: 'Date of month',
         addApprovalsTitle: 'Add approvals',
+        addApprovalButton: 'Add approval workflow',
+        addApprovalTip: 'This default workflow applies to all members, unless a more specific workflow exists',
         approver: 'Approver',
         connectBankAccount: 'Connect bank account',
         addApprovalsDescription: 'Require additional approval before authorizing a payment.',
@@ -1132,6 +1314,7 @@ export default {
         editor: {
             submissionFrequency: 'Choose how long Expensify should wait before sharing error-free spend.',
         },
+        frequencyDescription: 'Choose how often you’d like expenses to submit automatically, or make it manual',
         frequencies: {
             weekly: 'Weekly',
             monthly: 'Monthly',
@@ -1146,21 +1329,54 @@ export default {
                 two: 'nd',
                 few: 'rd',
                 other: 'th',
+                /* eslint-disable @typescript-eslint/naming-convention */
+                '1': 'First',
+                '2': 'Second',
+                '3': 'Third',
+                '4': 'Fourth',
+                '5': 'Fifth',
+                '6': 'Sixth',
+                '7': 'Seventh',
+                '8': 'Eighth',
+                '9': 'Ninth',
+                '10': 'Tenth',
+                /* eslint-enable @typescript-eslint/naming-convention */
             },
         },
+        approverInMultipleWorkflows: 'This member already belongs to another approval workflow. Any updates here will reflect there too.',
+        approverCircularReference: ({name1, name2}: ApprovalWorkflowErrorParams) =>
+            `<strong>${name1}</strong> already approves reports to <strong>${name2}</strong>. Please choose a different approver to avoid a circular workflow.`,
     },
     workflowsDelayedSubmissionPage: {
-        autoReportingErrorMessage: 'The delayed submission parameter could not be changed. Please try again or contact support.',
-        autoReportingFrequencyErrorMessage: 'The submission frequency could not be changed. Please try again or contact support.',
-        monthlyOffsetErrorMessage: 'The monthly frequency could not be changed. Please try again or contact support.',
+        autoReportingErrorMessage: "Delayed submission couldn't be changed. Please try again or contact support.",
+        autoReportingFrequencyErrorMessage: "Submission frequency couldn't be changed. Please try again or contact support.",
+        monthlyOffsetErrorMessage: "Monthly frequency couldn't be changed. Please try again or contact support.",
+    },
+    workflowsCreateApprovalsPage: {
+        title: 'Confirm',
+        header: 'Add more approvers and confirm.',
+        additionalApprover: 'Additional approver',
+        submitButton: 'Add workflow',
     },
-    workflowsApprovalPage: {
-        genericErrorMessage: 'The approver could not be changed. Please try again or contact support.',
+    workflowsEditApprovalsPage: {
+        title: 'Edit approval workflow',
+        deleteTitle: 'Delete approval workflow',
+        deletePrompt: 'Are you sure you want to delete this approval workflow? All members will subsequently follow the default workflow.',
+    },
+    workflowsExpensesFromPage: {
+        title: 'Expenses from',
+        header: 'When the following members submit expenses:',
+    },
+    workflowsApproverPage: {
+        genericErrorMessage: "The approver couldn't be changed. Please try again or contact support.",
+        header: 'Send to this member for approval:',
     },
     workflowsPayerPage: {
         title: 'Authorized payer',
         genericErrorMessage: 'The authorized payer could not be changed. Please try again.',
         admins: 'Admins',
+        payer: 'Payer',
+        paymentAccount: 'Payment account',
     },
     reportFraudPage: {
         title: 'Report virtual card fraud',
@@ -1221,7 +1437,7 @@ export default {
         addPaymentMethod: 'Add payment method',
         addNewDebitCard: 'Add new debit card',
         addNewBankAccount: 'Add new bank account',
-        accountLastFour: 'Account ending in',
+        accountLastFour: 'Ending in',
         cardLastFour: 'Card ending in',
         addFirstPaymentMethod: 'Add a payment method to send and receive payments directly in the app.',
         defaultPaymentMethod: 'Default',
@@ -1240,7 +1456,7 @@ export default {
     },
     priorityModePage: {
         priorityMode: 'Priority mode',
-        explainerText: 'Choose whether to show all chats by default sorted with most recent with pinned items at the top, or #focus on unread pinned items, sorted alphabetically.',
+        explainerText: 'Choose whether to #focus on unread and pinned chats only, or show everything with the most recent and pinned chats at the top.',
         priorityModes: {
             default: {
                 label: 'Most recent',
@@ -1252,6 +1468,9 @@ export default {
             },
         },
     },
+    reportDetailsPage: {
+        inWorkspace: ({policyName}) => `in ${policyName}`,
+    },
     reportDescriptionPage: {
         roomDescription: 'Room description',
         roomDescriptionOptional: 'Room description (optional)',
@@ -1287,7 +1506,7 @@ export default {
                 label: 'Light',
             },
             system: {
-                label: 'Use Device Settings',
+                label: 'Use device settings',
             },
         },
         chooseThemeBelowOrSync: 'Choose a theme below, or sync with your device settings.',
@@ -1338,20 +1557,29 @@ export default {
         error: {
             invalidFormatEmailLogin: 'The email entered is invalid. Please fix the format and try again.',
         },
-        cannotGetAccountDetails: "Couldn't retrieve account details, please try to sign in again.",
+        cannotGetAccountDetails: "Couldn't retrieve account details. Please try to sign in again.",
         loginForm: 'Login form',
         notYou: ({user}: NotYouParams) => `Not ${user}?`,
     },
     onboarding: {
+        welcome: 'Welcome!',
+        explanationModal: {
+            title: 'Welcome to Expensify',
+            description: 'One app to handle your business and personal spend at the speed of chat. Try it out and let us know what you think. Much more to come!',
+            secondaryDescription: 'To switch back to Expensify Classic, just tap your profile picture > Go to Expensify Classic.',
+        },
         welcomeVideo: {
             title: 'Welcome to Expensify',
             description: 'One app to handle all your business and personal spend in a chat. Built for your business, your team, and your friends.',
         },
+        getStarted: 'Get started',
         whatsYourName: "What's your name?",
         whereYouWork: 'Where do you work?',
         purpose: {
             title: 'What do you want to do today?',
-            error: 'Please make a selection before continuing.',
+            errorSelection: 'Please make a selection to continue.',
+            errorContinue: 'Please press continue to get set up.',
+            errorBackButton: 'Please finish the setup questions to start using the app.',
             [CONST.ONBOARDING_CHOICES.EMPLOYER]: 'Get paid back by my employer',
             [CONST.ONBOARDING_CHOICES.MANAGE_TEAM]: "Manage my team's expenses",
             [CONST.ONBOARDING_CHOICES.PERSONAL_SPEND]: 'Track and budget expenses',
@@ -1369,6 +1597,7 @@ export default {
         error: {
             containsReservedWord: 'Name cannot contain the words Expensify or Concierge.',
             hasInvalidCharacter: 'Name cannot contain a comma or semicolon.',
+            requiredFirstName: 'First name cannot be empty.',
         },
     },
     privatePersonalDetails: {
@@ -1409,6 +1638,9 @@ export default {
         onceTheAbove: 'Once the above steps are completed, please reach out to ',
         toUnblock: ' to unblock your login.',
     },
+    welcomeSignUpForm: {
+        join: 'Join',
+    },
     detailsPage: {
         localTime: 'Local time',
     },
@@ -1493,45 +1725,47 @@ export default {
         connectManually: 'Connect manually',
         desktopConnection: 'Note: To connect with Chase, Wells Fargo, Capital One or Bank of America, please click here to complete this process in a browser.',
         yourDataIsSecure: 'Your data is secure',
-        toGetStarted: 'Add a bank account and issue corporate cards, reimburse expenses, collect invoice payments, and pay bills, all from one place.',
+        toGetStarted: 'Add a bank account to reimburse expenses, issue corporate cards, collect invoice payments, and pay bills all from one place.',
         plaidBodyCopy: 'Give your employees an easier way to pay - and get paid back - for company expenses.',
         checkHelpLine: 'Your routing number and account number can be found on a check for the account.',
         validateAccountError: {
             phrase1: 'Hold up! We need you to validate your account first. To do so, ',
-            phrase2: 'sign back in with a magic code',
+            phrase2: 'sign back in with a magic code ',
+            phrase3: 'or ',
+            phrase4: 'verify your account here',
         },
         hasPhoneLoginError: 'To add a verified bank account please ensure your primary login is a valid email and try again. You can add your phone number as a secondary login.',
-        hasBeenThrottledError: 'There was an error adding your bank account. Please wait a few minutes and try again.',
+        hasBeenThrottledError: 'An error occurred while adding your bank account. Please wait a few minutes and try again.',
         hasCurrencyError: 'Oops! It appears that your workspace currency is set to a different currency than USD. To proceed, please set it to USD and try again.',
         error: {
-            youNeedToSelectAnOption: 'You need to select an option to proceed.',
-            noBankAccountAvailable: 'Sorry, no bank account is available.',
-            noBankAccountSelected: 'Please choose an account.',
-            taxID: 'Please enter a valid tax ID number.',
-            website: 'Please enter a valid website. The website should be in lowercase.',
-            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.',
-            addressStreet: 'Please enter a valid street address that is not a PO box.',
-            addressState: 'Please select a valid state.',
-            incorporationDateFuture: 'Incorporation date cannot be in the future.',
-            incorporationState: 'Please select a valid state.',
-            industryCode: 'Please enter a valid industry classification code. Must be 6 digits.',
-            restrictedBusiness: 'Please confirm company is not on the list of restricted businesses.',
-            routingNumber: 'Please enter a valid routing number.',
-            accountNumber: 'Please enter a valid account number.',
-            routingAndAccountNumberCannotBeSame: 'The routing number and account number cannot be the same.',
-            companyType: 'Please select a valid company type.',
-            tooManyAttempts: 'Due to a high number of login attempts, this option has been temporarily disabled for 24 hours. Please try again later or manually enter details instead.',
-            address: 'Please enter a valid address.',
-            dob: 'Please select a valid date of birth.',
-            age: 'Must be over 18 years old.',
-            ssnLast4: 'Please enter valid last 4 digits of SSN.',
-            firstName: 'Please enter a valid first name.',
-            lastName: 'Please enter a valid last name.',
-            noDefaultDepositAccountOrDebitCardAvailable: 'Please add a default deposit bank account or debit card.',
-            validationAmounts: 'The validation amounts you entered are incorrect. Please double-check your bank statement and try again.',
+            youNeedToSelectAnOption: 'Please select an option to proceed',
+            noBankAccountAvailable: "Sorry, there's no bank account available",
+            noBankAccountSelected: 'Please choose an account',
+            taxID: 'Please enter a valid tax ID number',
+            website: 'Please enter a valid website using lower-case letters',
+            zipCode: `Please enter a valid ZIP code using the format: ${CONST.COUNTRY_ZIP_REGEX_DATA.US.samples}`,
+            phoneNumber: 'Please enter a valid phone number',
+            companyName: 'Please enter a valid business name',
+            addressCity: 'Please enter a valid city',
+            addressStreet: 'Please enter a valid street address',
+            addressState: 'Please select a valid state',
+            incorporationDateFuture: "Incorporation date can't be in the future",
+            incorporationState: 'Please select a valid state',
+            industryCode: 'Please enter a valid industry classification code with six digits',
+            restrictedBusiness: "Please confirm the business isn't on the list of restricted businesses",
+            routingNumber: 'Please enter a valid routing number',
+            accountNumber: 'Please enter a valid account number',
+            routingAndAccountNumberCannotBeSame: "Routing and account numbers can't match",
+            companyType: 'Please select a valid company type',
+            tooManyAttempts: 'Due to a high number of login attempts, this option has been disabled for 24 hours. Please try again later or enter details manually instead.',
+            address: 'Please enter a valid address',
+            dob: 'Please select a valid date of birth',
+            age: 'Must be over 18 years old',
+            ssnLast4: 'Please enter valid last 4 digits of SSN',
+            firstName: 'Please enter a valid first name',
+            lastName: 'Please enter a valid last name',
+            noDefaultDepositAccountOrDebitCardAvailable: 'Please add a default deposit account or debit card',
+            validationAmounts: 'The validation amounts you entered are incorrect. Please double check your bank statement and try again.',
         },
     },
     addPersonalBankAccountPage: {
@@ -1556,16 +1790,18 @@ export default {
         },
     },
     messages: {
-        errorMessageInvalidPhone: `Please enter a valid phone number without brackets or dashes. If you're outside the US please include your country code (e.g. ${CONST.EXAMPLE_PHONE_NUMBER}).`,
+        errorMessageInvalidPhone: `Please enter a valid phone number without brackets or dashes. If you're outside the US, please include your country code (e.g. ${CONST.EXAMPLE_PHONE_NUMBER}).`,
         errorMessageInvalidEmail: 'Invalid email',
         userIsAlreadyMember: ({login, name}: UserIsAlreadyMemberParams) => `${login} is already a member of ${name}`,
     },
     onfidoStep: {
-        acceptTerms: 'By continuing with the request to activate your Expensify wallet, you confirm that you have read, understand and accept ',
+        acceptTerms: 'By continuing with the request to activate your Expensify Wallet, you confirm that you have read, understand, and accept',
         facialScan: 'Onfido’s Facial Scan Policy and Release',
         tryAgain: 'Try again',
         verifyIdentity: 'Verify identity',
-        genericError: 'There was an error while processing this step. Please try again.',
+        letsVerifyIdentity: "Let's verify your identity",
+        butFirst: `But first, the boring stuff. Read up on the legalese in the next step and click "Accept" when you're ready.`,
+        genericError: 'An error occurred while processing this step. Please try again.',
         cameraPermissionsNotGranted: 'Enable camera access',
         cameraRequestMessage: 'We need access to your camera to complete bank account verification. Please enable via Settings > New Expensify.',
         microphonePermissionsNotGranted: 'Enable microphone access',
@@ -1573,28 +1809,29 @@ export default {
         originalDocumentNeeded: 'Please upload an original image of your ID rather than a screenshot or scanned image.',
         documentNeedsBetterQuality: 'Your ID appears to be damaged or has missing security features. Please upload an original image of an undamaged ID that is entirely visible.',
         imageNeedsBetterQuality: "There's an issue with the image quality of your ID. Please upload a new image where your entire ID can be seen clearly.",
-        selfieIssue: "There's an issue with your selfie/video. Please upload a new selfie/video in real time.",
+        selfieIssue: "There's an issue with your selfie/video. Please upload a live selfie/video.",
         selfieNotMatching: "Your selfie/video doesn't match your ID. Please upload a new selfie/video where your face can be clearly seen.",
         selfieNotLive: "Your selfie/video doesn't appear to be a live photo/video. Please upload a live selfie/video.",
     },
     additionalDetailsStep: {
         headerTitle: 'Additional details',
-        helpText: 'We need to confirm the following information before you can send and receive money from your Wallet.',
+        helpText: 'We need to confirm the following information before you can send and receive money from your wallet.',
         helpTextIdologyQuestions: 'We need to ask you just a few more questions to finish validating your identity.',
         helpLink: 'Learn more about why we need this.',
         legalFirstNameLabel: 'Legal first name',
         legalMiddleNameLabel: 'Legal middle name',
         legalLastNameLabel: 'Legal last name',
-        selectAnswer: 'You need to select a response to proceed.',
-        ssnFull9Error: 'Please enter a valid 9 digit SSN.',
-        needSSNFull9: "We're having trouble verifying your SSN. Please enter the full 9 digits of your SSN.",
-        weCouldNotVerify: 'We could not verify',
-        pleaseFixIt: 'Please fix this information before continuing.',
-        failedKYCTextBefore: "We weren't able to successfully verify your identity. Please try again later and reach out to ",
+        selectAnswer: 'Please select a response to proceed.',
+        ssnFull9Error: 'Please enter a valid nine-digit SSN.',
+        needSSNFull9: "We're having trouble verifying your SSN. Please enter the full nine digits of your SSN.",
+        weCouldNotVerify: "We couldn't verify",
+        pleaseFixIt: 'Please fix this information before continuing',
+        failedKYCTextBefore: "We weren't able to verify your identity. Please try again later or reach out to ",
         failedKYCTextAfter: ' if you have any questions.',
     },
     termsStep: {
         headerTitle: 'Terms and fees',
+        headerTitleRefactor: 'Fees and terms',
         haveReadAndAgree: 'I have read and agree to receive ',
         electronicDisclosures: 'electronic disclosures',
         agreeToThe: 'I agree to the',
@@ -1605,6 +1842,9 @@ export default {
         noOverdraftOrCredit: 'No overdraft/credit feature.',
         electronicFundsWithdrawal: 'Electronic funds withdrawal',
         standard: 'Standard',
+        reviewTheFees: 'Please review the fees below.',
+        checkTheBoxes: 'Please check the boxes below.',
+        agreeToTerms: 'Agree to the terms and you’ll be good to go!',
         shortTermsForm: {
             expensifyPaymentsAccount: ({walletProgram}: WalletProgramParams) => `The Expensify Wallet is issued by ${walletProgram}.`,
             perPurchase: 'Per purchase',
@@ -1620,7 +1860,7 @@ export default {
             weChargeOneFee: 'We charge one type of fee.',
             fdicInsurance: 'Your funds are eligible for FDIC insurance.',
             generalInfo: 'For general information about prepaid accounts, visit',
-            conditionsDetails: 'Find details and conditions for all fees and services by visiting',
+            conditionsDetails: 'For details and conditions for all fees and services, visit',
             conditionsPhone: 'or calling +1 833-400-0904.',
             instant: '(instant)',
             electronicFundsInstantFeeMin: ({amount}: TermsParams) => `(min ${amount})`,
@@ -1631,19 +1871,19 @@ export default {
             feeAmountHeader: 'Fee amount',
             moreDetailsHeader: 'More details',
             openingAccountTitle: 'Opening an account',
-            openingAccountDetails: 'There is no fee to open an account.',
-            monthlyFeeDetails: 'There is no monthly fee.',
+            openingAccountDetails: "There's no fee to open an account.",
+            monthlyFeeDetails: "There's no monthly fee.",
             customerServiceTitle: 'Customer service',
             customerServiceDetails: 'There are no customer service fees.',
-            inactivityDetails: 'There is no inactivity fee.',
+            inactivityDetails: "There's no inactivity fee.",
             sendingFundsTitle: 'Sending funds to another account holder',
-            sendingFundsDetails: 'There is no fee to send funds to another account holder using your balance, bank account, or debit card.',
+            sendingFundsDetails: "There's no fee to send funds to another account holder using your balance, bank account, or debit card.",
             electronicFundsStandardDetails:
-                'There is no fee to transfer funds from your Expensify Wallet ' +
+                "There's no fee to transfer funds from your Expensify Wallet " +
                 'to your bank account using the standard option. This transfer usually completes within 1-3 business' +
                 ' days.',
             electronicFundsInstantDetails: ({percentage, amount}: ElectronicFundsParams) =>
-                'There is a fee to transfer funds from your Expensify Wallet to ' +
+                "There's a fee to transfer funds from your Expensify Wallet to " +
                 'your linked debit card using the instant transfer option. This transfer usually completes within ' +
                 `several minutes. The fee is ${percentage}% of the transfer amount (with a minimum fee of ${amount}).`,
             fdicInsuranceBancorp: ({amount}: TermsParams) =>
@@ -1657,7 +1897,7 @@ export default {
             generalInformation2: 'If you have a complaint about a prepaid account, call the Consumer Financial Protection Bureau at 1-855-411-2372 or visit',
             printerFriendlyView: 'View printer-friendly version',
             automated: 'Automated',
-            liveAgent: 'Live Agent',
+            liveAgent: 'Live agent',
             instant: 'Instant',
             electronicFundsInstantFeeMin: ({amount}: TermsParams) => `Min ${amount}`,
         },
@@ -1701,18 +1941,18 @@ export default {
     },
     personalInfoStep: {
         personalInfo: 'Personal info',
-        enterYourLegalFirstAndLast: 'Enter your legal first and last name.',
+        enterYourLegalFirstAndLast: "What's your legal name?",
         legalFirstName: 'Legal first name',
         legalLastName: 'Legal last name',
         legalName: 'Legal name',
-        enterYourDateOfBirth: 'Enter your date of birth.',
-        enterTheLast4: 'Enter the last 4 of your SSN.',
+        enterYourDateOfBirth: "What's your date of birth?",
+        enterTheLast4: 'What are the last four digits of your Social Security Number?',
         dontWorry: "Don't worry, we don't do any personal credit checks!",
-        last4SSN: 'Last 4 Social Security Number',
-        enterYourAddress: 'Enter your address.',
+        last4SSN: 'Last 4 of SSN',
+        enterYourAddress: "What's your address?",
         address: 'Address',
         letsDoubleCheck: "Let's double check that everything looks right.",
-        byAddingThisBankAccount: 'By adding this bank account, you confirm that you have read, understand and accept',
+        byAddingThisBankAccount: "By adding this bank account, you confirm that you've read, understand, and accept",
         whatsYourLegalName: 'What’s your legal name?',
         whatsYourDOB: 'What’s your date of birth?',
         whatsYourAddress: 'What’s your address?',
@@ -1723,17 +1963,17 @@ export default {
         weNeedThisToVerify: 'We need this to verify your wallet.',
     },
     businessInfoStep: {
-        businessInfo: 'Business info',
-        enterTheNameOfYourBusiness: 'Enter the name of your business.',
-        businessName: 'Legal business name',
-        enterYourCompanysTaxIdNumber: 'Enter your company’s Tax ID number.',
+        businessInfo: 'Company info',
+        enterTheNameOfYourBusiness: "What's the name of your company?",
+        businessName: 'Legal company name',
+        enterYourCompanysTaxIdNumber: "What's your company’s Tax ID number?",
         taxIDNumber: 'Tax ID number',
         taxIDNumberPlaceholder: '9 digits',
-        enterYourCompanysWebsite: 'Enter your company’s website.',
+        enterYourCompanysWebsite: "What's your company’s website?",
         companyWebsite: 'Company website',
-        enterYourCompanysPhoneNumber: 'Enter your company’s phone number.',
-        enterYourCompanysAddress: 'Enter your company’s address.',
-        selectYourCompanysType: 'Select your company’s type.',
+        enterYourCompanysPhoneNumber: "What's your company’s phone number?",
+        enterYourCompanysAddress: "What's your company’s address?",
+        selectYourCompanysType: 'What type of company is it?',
         companyType: 'Company type',
         incorporationType: {
             LLC: 'LLC',
@@ -1743,11 +1983,11 @@ export default {
             SOLE_PROPRIETORSHIP: 'Sole proprietorship',
             OTHER: 'Other',
         },
-        selectYourCompanysIncorporationDate: 'Select your company’s incorporation date.',
+        selectYourCompanysIncorporationDate: "What's your company’s incorporation date?",
         incorporationDate: 'Incorporation date',
         incorporationDatePlaceholder: 'Start date (yyyy-mm-dd)',
         incorporationState: 'Incorporation state',
-        pleaseSelectTheStateYourCompanyWasIncorporatedIn: 'Please select the state your company was incorporated in.',
+        pleaseSelectTheStateYourCompanyWasIncorporatedIn: 'Which state was your company incorporated in?',
         letsDoubleCheck: "Let's double check that everything looks right.",
         companyAddress: 'Company address',
         listOfRestrictedBusinesses: 'list of restricted businesses',
@@ -1757,36 +1997,35 @@ export default {
         doYouOwn25percent: 'Do you own 25% or more of',
         doAnyIndividualOwn25percent: 'Do any individuals own 25% or more of',
         areThereMoreIndividualsWhoOwn25percent: 'Are there more individuals who own 25% or more of',
-        regulationRequiresUsToVerifyTheIdentity: 'Regulation requires us to verify the identity of any individual that owns more than 25% of the company.',
-        companyOwner: 'Company owner',
-        enterLegalFirstAndLastName: 'Enter the legal first and last name of the owner.',
+        regulationRequiresUsToVerifyTheIdentity: 'Regulation requires us to verify the identity of any individual who owns more than 25% of the business.',
+        companyOwner: 'Business owner',
+        enterLegalFirstAndLastName: "What's the owner's legal name?",
         legalFirstName: 'Legal first name',
         legalLastName: 'Legal last name',
-        enterTheDateOfBirthOfTheOwner: 'Enter the date of birth of the owner.',
-        enterTheLast4: 'Enter the last 4 of the owner’s SSN.',
-        last4SSN: 'Last 4 Social Security Number',
+        enterTheDateOfBirthOfTheOwner: "What's the owner's date of birth?",
+        enterTheLast4: 'What are the last 4 digits of the owner’s Social Security Number?',
+        last4SSN: 'Last 4 of SSN',
         dontWorry: "Don't worry, we don't do any personal credit checks!",
-        enterTheOwnersAddress: 'Enter the owner’s address.',
+        enterTheOwnersAddress: "What's the owner's address?",
         letsDoubleCheck: 'Let’s double check that everything looks right.',
         legalName: 'Legal name',
         address: 'Address',
-        byAddingThisBankAccount: 'By adding this bank account, you confirm that you have read, understand and accept',
+        byAddingThisBankAccount: "By adding this bank account, you confirm that you've read, understand, and accept",
         owners: 'Owners',
     },
     validationStep: {
-        headerTitle: 'Validate Bank Account',
+        headerTitle: 'Validate bank account',
         buttonText: 'Finish setup',
         maxAttemptsReached: 'Validation for this bank account has been disabled due to too many incorrect attempts.',
-        description: 'A day or two after you add your account to Expensify we send three (3) transactions to your account. They have a merchant line like "Expensify, Inc. Validation".',
+        description: `Within 1-2 business days, we'll send three (3) small transactions to your bank account from a name like "Expensify, Inc. Validation".`,
         descriptionCTA: 'Please enter each transaction amount in the fields below. Example: 1.51.',
         reviewingInfo: "Thanks! We're reviewing your information, and will be in touch shortly. Please check your chat with Concierge ",
         forNextStep: ' for next steps to finish setting up your bank account.',
         letsChatCTA: "Yes, let's chat",
-        letsChatText: 'Thanks for doing that. We need your help verifying a few pieces of information, but we can work this out quickly over chat. Ready?',
+        letsChatText: 'Almost there! We need your help verifying a few last bits of information over chat. Ready?',
         letsChatTitle: "Let's chat!",
-        enable2FATitle: 'Prevent fraud, enable two-factor authentication!',
-        enable2FAText:
-            'We take your security seriously, so please set up two-factor authentication for your account now. That will allow us to dispute Expensify Card digital transactions, and will reduce your risk for fraud.',
+        enable2FATitle: 'Prevent fraud, enable two-factor authentication (2FA)',
+        enable2FAText: 'We take your security seriously. Please set up 2FA now to add an extra layer of protection to your account.',
         secureYourAccount: 'Secure your account',
     },
     beneficialOwnersStep: {
@@ -1808,8 +2047,8 @@ export default {
         completeVerification: 'Complete verification',
         confirmAgreements: 'Please confirm the agreements below.',
         certifyTrueAndAccurate: 'I certify that the information provided is true and accurate',
-        certifyTrueAndAccurateError: 'Must certify information is true and accurate',
-        isAuthorizedToUseBankAccount: 'I am authorized to use my company bank account for business spend',
+        certifyTrueAndAccurateError: 'Please certify that the information is true and accurate',
+        isAuthorizedToUseBankAccount: 'I am authorized to use this business bank account for business spend',
         isAuthorizedToUseBankAccountError: 'You must be a controlling officer with authorization to operate the business bank account.',
         termsAndConditions: 'terms and conditions',
     },
@@ -1820,21 +2059,20 @@ export default {
         validateButtonText: 'Validate',
         validationInputLabel: 'Transaction',
         maxAttemptsReached: 'Validation for this bank account has been disabled due to too many incorrect attempts.',
-        description: 'A day or two after you add your account to Expensify we send three (3) transactions to your account. They have a merchant line like "Expensify, Inc. Validation".',
+        description: `Within 1-2 business days, we'll send three (3) small transactions to your bank account from a name like "Expensify, Inc. Validation".`,
         descriptionCTA: 'Please enter each transaction amount in the fields below. Example: 1.51.',
-        reviewingInfo: "Thanks! We're reviewing your information, and will be in touch shortly. Please check your chat with Concierge ",
+        reviewingInfo: "Thanks! We're reviewing your information and will be in touch shortly. Please check your chat with Concierge ",
         forNextSteps: ' for next steps to finish setting up your bank account.',
         letsChatCTA: "Yes, let's chat",
-        letsChatText: 'Thanks for doing that. We need your help verifying a few pieces of information, but we can work this out quickly over chat. Ready?',
+        letsChatText: 'Almost there! We need your help verifying a few last bits of information over chat. Ready?',
         letsChatTitle: "Let's chat!",
-        enable2FATitle: 'Prevent fraud, enable two-factor authentication!',
-        enable2FAText:
-            'We take your security seriously, so please set up two-factor authentication for your account now. That will allow us to dispute Expensify Card digital transactions, and will reduce your risk for fraud.',
+        enable2FATitle: 'Prevent fraud, enable two-factor authentication (2FA)',
+        enable2FAText: 'We take your security seriously. Please set up 2FA now to add an extra layer of protection to your account.',
         secureYourAccount: 'Secure your account',
     },
     reimbursementAccountLoadingAnimation: {
         oneMoment: 'One moment',
-        explanationLine: 'We’re taking a look at your information. You will be able to continue with next steps shortly.',
+        explanationLine: "We’re taking a look at your information. You'll be able to continue with next steps shortly.",
     },
     session: {
         offlineMessageRetry: "Looks like you're offline. Please check your connection and try again.",
@@ -1848,6 +2086,7 @@ export default {
             alerts: 'Get realtime updates and alerts',
         },
         bookTravel: 'Book travel',
+        bookDemo: 'Book demo',
         termsAndConditions: {
             header: 'Before we continue...',
             title: 'Please read the Terms & Conditions for travel',
@@ -1860,27 +2099,43 @@ export default {
             agree: 'I agree to the travel ',
             error: 'You must accept the Terms & Conditions for travel to continue',
         },
+        flight: 'Flight',
+        hotel: 'Hotel',
+        car: 'Car',
+        viewTrip: 'View trip',
+        viewTripDetails: 'View trip details',
+        trip: 'Trip',
+        trips: 'Trips',
+        tripSummary: 'Trip summary',
+        departs: 'Departs',
+        errorMessage: 'Something went wrong. Please try again later.',
     },
     workspace: {
         common: {
             card: 'Cards',
+            expensifyCard: 'Expensify Card',
             workflows: 'Workflows',
             workspace: 'Workspace',
+            companyCards: 'Company cards',
             edit: 'Edit workspace',
             enabled: 'Enabled',
             disabled: 'Disabled',
+            everyone: 'Everyone',
             delete: 'Delete workspace',
             settings: 'Settings',
             reimburse: 'Reimbursements',
             categories: 'Categories',
             tags: 'Tags',
-            reportFields: 'Report Fields',
+            reportFields: 'Report fields',
+            reportField: 'Report field',
             taxes: 'Taxes',
             bills: 'Bills',
             invoices: 'Invoices',
             travel: 'Travel',
             members: 'Members',
             accounting: 'Accounting',
+            rules: 'Rules',
+            displayedAs: 'Displayed as',
             plan: 'Plan',
             profile: 'Profile',
             bankAccount: 'Bank account',
@@ -1892,45 +2147,62 @@ export default {
             settlementFrequency: 'Settlement frequency',
             deleteConfirmation: 'Are you sure you want to delete this workspace?',
             unavailable: 'Unavailable workspace',
-            memberNotFound: 'Member not found. To invite a new member to the workspace, please use the Invite button above.',
-            notAuthorized: `You do not have access to this page. Are you trying to join the workspace? Please reach out to the owner of this workspace so they can add you as a member! Something else? Reach out to ${CONST.EMAIL.CONCIERGE}`,
+            memberNotFound: 'Member not found. To invite a new member to the workspace, please use the invite button above.',
+            notAuthorized: `You don't have access to this page. If you're trying to join this workspace, just ask the workspace owner to add you as a member. Something else? Reach out to ${CONST.EMAIL.CONCIERGE}.`,
             goToRoom: ({roomName}: GoToRoomParams) => `Go to ${roomName} room`,
             workspaceName: 'Workspace name',
             workspaceOwner: 'Owner',
             workspaceType: 'Workspace type',
             workspaceAvatar: 'Workspace avatar',
-            mustBeOnlineToViewMembers: 'You must be online in order to view members of this workspace.',
+            mustBeOnlineToViewMembers: 'You need to be online in order to view members of this workspace.',
             moreFeatures: 'More features',
             requested: 'Requested',
             distanceRates: 'Distance rates',
             welcomeNote: ({workspaceName}: WelcomeNoteParams) =>
                 `You have been invited to ${workspaceName || 'a workspace'}! Download the Expensify mobile app at use.expensify.com/download to start tracking your expenses.`,
+            subscription: 'Subscription',
+            markAsExported: 'Mark as manually entered',
+            exportIntegrationSelected: (connectionName: ConnectionName) => `Export to ${CONST.POLICY.CONNECTIONS.NAME_USER_FRIENDLY[connectionName]}`,
+            letsDoubleCheck: "Let's double check that everything looks right.",
+            lineItemLevel: 'Line-item level',
+            reportLevel: 'Report level',
+            topLevel: 'Top level',
+            appliedOnExport: 'Not imported into Expensify, applied on export',
+            shareNote: {
+                header: 'Easily share your workspace with other members.',
+                content: {
+                    firstPart:
+                        'Share this QR code or copy the link below to make it easy for members to request access to your workspace. All requests to join the workspace will show up in the',
+                    secondPart: 'room for your review.',
+                },
+            },
+            createNewConnection: 'Create new connection',
+            reuseExistingConnection: 'Reuse existing connection',
+            existingConnections: 'Existing connections',
+            lastSyncDate: (connectionName: string, formattedDate: string) => `${connectionName} - Last synced ${formattedDate}`,
         },
         qbo: {
-            importDescription: 'Choose which coding configurations are imported from QuickBooks Online to Expensify.',
+            importDescription: 'Choose which coding configurations to import from QuickBooks Online to Expensify.',
             classes: 'Classes',
             locations: 'Locations',
-            customers: 'Customers/Projects',
-            displayedAs: 'Displayed as',
-            accountsDescription: 'Chart of Accounts import as categories when connected to an accounting integration, this cannot be disabled.',
-            accountsSwitchTitle: 'Enable newly imported Chart of Accounts.',
-            accountsSwitchDescription: 'New categories imported from QuickBooks Online to Expensify will be either enabled or disabled by default.',
-            classesDescription: 'Choose whether to import classes, and see where classes are displayed.',
-            customersDescription: 'Choose whether to import customers/projects and see where customers/projects are displayed.',
-            locationsDescription: 'Choose whether to import locations, and see where locations are displayed.',
-            taxesDescription: 'Choose whether to import tax rates and tax defaults from your accounting integration.',
+            customers: 'Customers/projects',
+            accountsDescription: 'Your Quickbooks Online chart of accounts will import into Expensify as categories.',
+            accountsSwitchTitle: 'Choose to import new accounts as enabled or disabled categories.',
+            accountsSwitchDescription: 'Enabled categories will be available for members to select when creating their expenses.',
+            classesDescription: 'Choose how to handle QuickBooks Online classes in Expensify.',
+            customersDescription: 'Choose how to handle QuickBooks Online customers/projects in Expensify.',
+            locationsDescription: 'Choose how to handle QuickBooks Online locations in Expensify.',
+            taxesDescription: 'Choose how to handle QuickBooks Online taxes in Expensify.',
             locationsAdditionalDescription:
-                'Locations are imported as Tags. This limits exporting expense reports as Vendor Bills or Checks to QuickBooks Online. To unlock these export options, either disable Locations import or upgrade to the Control Plan to export Locations encoded as a Report Field.',
-            export: 'Export',
-            exportAs: 'Export as',
-            exportDescription: 'Configure how data in Expensify gets exported to QuickBooks Online.',
-            preferredExporter: 'Preferred exporter',
-            date: 'Date',
-            exportExpenses: 'Export out-of-pocket expenses as',
+                'QuickBooks Online doesn’t support locations on vendor bills or checks. As you have locations enabled on your workspace, these export options are unavailable.',
+            outOfPocketLocationEnabledDescription:
+                'QuickBooks Online doesn’t support locations on vendor bills or checks. As you have locations enabled on your workspace, these export options are unavailable.',
+            taxesJournalEntrySwitchNote: "QuickBooks Online doesn't support taxes on journal entries. Please change your export option to vendor bill or check.",
+            exportDescription: 'Configure how Expensify data exports to QuickBooks Online.',
+            date: 'Export date',
             exportInvoices: 'Export invoices to',
-            exportCompany: 'Export company cards as',
             exportExpensifyCard: 'Export Expensify Card transactions as',
-            deepDiveExpensifyCard: 'Expensify Card transactions automatically export to a "Expensify Card Liability Account" created with',
+            deepDiveExpensifyCard: 'Expensify Card transactions will automatically export to an "Expensify Card Liability Account" created with',
             deepDiveExpensifyCardIntegration: 'our integration.',
             exportDate: {
                 label: 'Export date',
@@ -1938,59 +2210,53 @@ export default {
                 values: {
                     [CONST.QUICKBOOKS_EXPORT_DATE.LAST_EXPENSE]: {
                         label: 'Date of last expense',
-                        description: 'The date of the most recent expense on the report',
+                        description: 'Date of the most recent expense on the report.',
                     },
                     [CONST.QUICKBOOKS_EXPORT_DATE.REPORT_EXPORTED]: {
                         label: 'Export date',
-                        description: 'The date the report was exported to QuickBooks Online',
+                        description: 'Date the report was exported to QuickBooks Online.',
                     },
                     [CONST.QUICKBOOKS_EXPORT_DATE.REPORT_SUBMITTED]: {
                         label: 'Submitted date',
-                        description: 'The date the report was submitted for approval',
+                        description: 'Date the report was submitted for approval.',
                     },
                 },
             },
             receivable: 'Accounts receivable', // This is an account name that will come directly from QBO, so I don't know why we need a translation for it. It should take whatever the name of the account is in QBO. Leaving this note for CS.
             archive: 'Accounts receivable archive', // This is an account name that will come directly from QBO, so I don't know why we need a translation for it. It should take whatever the name of the account is in QBO. Leaving this note for CS.
-            exportInvoicesDescription: 'Invoices will be exported to this account in QuickBooks Online.',
+            exportInvoicesDescription: 'Use this account when exporting invoices to QuickBooks Online.',
             exportCompanyCardsDescription: 'Set how company card purchases export to QuickBooks Online.',
             vendor: 'Vendor',
-            defaultVendor: 'Default vendor',
             defaultVendorDescription: 'Set a default vendor that will apply to all credit card transactions upon export.',
-            exportPreferredExporterNote: 'This can be any workspace admin, but must be a Domain Admin if you set different export accounts for individual company cards in Domain Settings.',
-            exportPreferredExporterSubNote: 'Once set, the preferred exporter will see reports for export in their account.',
             exportOutOfPocketExpensesDescription: 'Set how out-of-pocket expenses export to QuickBooks Online.',
+            exportCheckDescription: "We'll create an itemized check for each Expensify report and send it from the bank account below.",
+            exportJournalEntryDescription: "We'll create an itemized journal entry for each Expensify report and post it to the account below.",
             exportVendorBillDescription:
-                "We'll create a single itemized vendor bill for each Expensify report. If the period of the bill is closed, we'll post to the 1st of the next open period. You can add the vendor bill to your A/P account of choice (below).",
-            accountsPayable: 'Accounts payable',
+                "We'll create an itemized vendor bill for each Expensify report and add it to the account below. If this period is closed, we'll post to the 1st of the next open period.",
             account: 'Account',
-            accountsPayableDescription: 'This is your chosen A/P account, against which vendor bills for each report are created.',
-            optionBelow: 'Choose an option below:',
+            accountDescription: 'Choose where to post journal entries.',
+            accountsPayable: 'Accounts payable',
+            accountsPayableDescription: 'Choose where to create vendor bills.',
+            bankAccount: 'Bank account',
+            bankAccountDescription: 'Choose where to send checks from.',
+            creditCardAccount: 'Credit card account',
             companyCardsLocationEnabledDescription:
-                'Note: QuickBooks Online does not support a field for Locations as Tags on Vendor Bills exports. As you import Locations from, this this export option is unavailable.',
+                "QuickBooks Online doesn't support locations on vendor bill exports. As you have locations enabled on your workspace, this export option is unavailable.",
             outOfPocketTaxEnabledDescription:
-                "Note: QuickBooks Online doesn't support a field for tax on Journal Entry exports. Because you have tax tracking enabled on your workspace, this export option is unavailable.",
-            outOfPocketTaxEnabledError: 'Journal entry is not available when taxes enabled. please select a different export option.',
-            outOfPocketLocationEnabledError: 'Vendor Bills are not available when locations are enabled. Please select a different export option.',
-            outOfPocketLocationEnabledDescription:
-                'Note: QuickBooks Online does not support a field for Locations as Tags on Vendor Bills exports. As you import Locations as Tags, this export option is unavailable.',
+                "QuickBooks Online doesn't support taxes on journal entry exports. As you have taxes enabled on your workspace, this export option is unavailable.",
+            outOfPocketTaxEnabledError: 'Journal entries are unavailable when taxes are enabled. Please choose a different export option.',
+            outOfPocketLocationEnabledError: 'Vendor bills are unavailable when locations are enabled. Please choose a different export option.',
             advancedConfig: {
-                advanced: 'Advanced',
-                autoSync: 'Auto-sync',
-                autoSyncDescription: 'Changes made in Quickbooks will automatically be reflected in Expensify.',
+                autoSyncDescription: 'Expensify will automatically sync with QuickBooks Online every day.',
                 inviteEmployees: 'Invite employees',
-                inviteEmployeesDescription: 'Import Quickbooks Online employee records and invite them to this workspace.',
-                createEntities: 'Automatically create entities',
-                createEntitiesDescription:
-                    'Expensify will automatically create a vendor in Quickbooks, if one does not exist. Expensify will also automatically create a customer when exporting invoices.',
-                reimbursedReports: 'Sync reimbursed reports',
-                reimbursedReportsDescription: 'Any time a report is paid using Expensify ACH, the corresponding bill payment will be created in the Quickbooks account below.',
+                inviteEmployeesDescription: 'Import Quickbooks Online employee records and invite employees to this workspace.',
+                createEntities: 'Auto-create entities',
+                createEntitiesDescription: "Expensify will automatically create vendors in QuickBooks Online if they don't exist already, and auto-create customers when exporting invoices.",
+                reimbursedReportsDescription: 'Any time a report is paid using Expensify ACH, the corresponding bill payment will be created in the Quickbooks Online account below.',
                 qboBillPaymentAccount: 'QuickBooks bill payment account',
                 qboInvoiceCollectionAccount: 'QuickBooks invoice collections account',
-                accountSelectDescription:
-                    "As you've enabled sync reimbursed reports, you will need select the bank account your reimbursements are coming out of, and we'll create the payment in QuickBooks.",
-                invoiceAccountSelectDescription:
-                    'If you are exporting invoices from Expensify to Quickbooks Online, this is the account the invoice will appear against once marked as paid.',
+                accountSelectDescription: "Choose where to pay bills from and we'll create the payment in QuickBooks Online.",
+                invoiceAccountSelectorDescription: "Choose where to receive invoice payments and we'll create the payment in QuickBooks Online.",
             },
             accounts: {
                 [CONST.QUICKBOOKS_NON_REIMBURSABLE_EXPORT_ACCOUNT_TYPE.DEBIT_CARD]: 'Debit card',
@@ -2004,35 +2270,478 @@ export default {
                 [`${CONST.QUICKBOOKS_NON_REIMBURSABLE_EXPORT_ACCOUNT_TYPE.CREDIT_CARD}Description`]:
                     "We'll automatically match the merchant name on the credit card transaction to any corresponding vendors in QuickBooks. If no vendors exist, we'll create a 'Credit Card Misc.' vendor for association.",
                 [`${CONST.QUICKBOOKS_REIMBURSABLE_ACCOUNT_TYPE.VENDOR_BILL}Description`]:
-                    "We'll create a single itemized vendor bill for each Expensify report, carrying the date of the last expense on the report. If this period is closed, we'll post to the 1st of the next open period. You can add the vendor bill to your A/P account of choice (below).",
+                    "We'll create an itemized vendor bill for each Expensify report with the date of the last expense, and add it to the account below. If this period is closed, we'll post to the 1st of the next open period.",
 
-                [`${CONST.QUICKBOOKS_NON_REIMBURSABLE_EXPORT_ACCOUNT_TYPE.DEBIT_CARD}AccountDescription`]: 'Debit card transactions will export to the bank account below.”',
-                [`${CONST.QUICKBOOKS_NON_REIMBURSABLE_EXPORT_ACCOUNT_TYPE.CREDIT_CARD}AccountDescription`]: 'Credit card transactions will export to the bank account below.',
-                [`${CONST.QUICKBOOKS_REIMBURSABLE_ACCOUNT_TYPE.VENDOR_BILL}AccountDescription`]: 'Select the vendor applied to all credit card transactions.',
+                [`${CONST.QUICKBOOKS_NON_REIMBURSABLE_EXPORT_ACCOUNT_TYPE.DEBIT_CARD}AccountDescription`]: 'Choose where to export debit card transactions.',
+                [`${CONST.QUICKBOOKS_NON_REIMBURSABLE_EXPORT_ACCOUNT_TYPE.CREDIT_CARD}AccountDescription`]: 'Choose where to export credit card transactions.',
+                [`${CONST.QUICKBOOKS_REIMBURSABLE_ACCOUNT_TYPE.VENDOR_BILL}AccountDescription`]: 'Choose a vendor to apply to all credit card transactions.',
 
-                [`${CONST.QUICKBOOKS_REIMBURSABLE_ACCOUNT_TYPE.VENDOR_BILL}Error`]: 'Vendor Bills are not available when locations are enabled. Please select a different export option.',
-                [`${CONST.QUICKBOOKS_REIMBURSABLE_ACCOUNT_TYPE.CHECK}Error`]: 'Check is not available when locations are enabled. Please select a different export option.',
-                [`${CONST.QUICKBOOKS_REIMBURSABLE_ACCOUNT_TYPE.JOURNAL_ENTRY}Error`]: 'Journal entry is not available when taxes enabled. please select a different export option.',
+                [`${CONST.QUICKBOOKS_REIMBURSABLE_ACCOUNT_TYPE.VENDOR_BILL}Error`]: 'Vendor bills are unavailable when locations are enabled. Please choose a different export option.',
+                [`${CONST.QUICKBOOKS_REIMBURSABLE_ACCOUNT_TYPE.CHECK}Error`]: 'Checks are unavailable when locations are enabled. Please choose a different export option.',
+                [`${CONST.QUICKBOOKS_REIMBURSABLE_ACCOUNT_TYPE.JOURNAL_ENTRY}Error`]: 'Journal entries are unavailable when taxes are enabled. Please choose a different export option.',
             },
+            noAccountsFound: 'No accounts found',
+            noAccountsFoundDescription: 'Add the account in Quickbooks Online and sync the connection again.',
         },
         xero: {
             organization: 'Xero organization',
-            organizationDescription: 'Select the organization in Xero you are importing data from.',
-            importDescription: 'Choose which coding configurations are imported from Xero to Expensify.',
+            organizationDescription: "Choose the Xero organization that you'd like to import data from.",
+            importDescription: 'Choose which coding configurations to import from Xero to Expensify.',
+            accountsDescription: 'Your Xero chart of accounts will import into Expensify as categories.',
+            accountsSwitchTitle: 'Choose to import new accounts as enabled or disabled categories.',
+            accountsSwitchDescription: 'Enabled categories will be available for members to select when creating their expenses.',
             trackingCategories: 'Tracking categories',
+            trackingCategoriesDescription: 'Choose how to handle Xero tracking categories in Expensify.',
+            mapTrackingCategoryTo: ({categoryName}) => `Map Xero ${categoryName} to`,
+            mapTrackingCategoryToDescription: ({categoryName}) => `Choose where to map ${categoryName} when exporting to Xero.`,
             customers: 'Re-bill customers',
-            customersDescription: 'Import customer contacts. Billable expenses need tags for export. Expenses will carry the customer information to Xero for sales invoices.',
-            taxesDescription: 'Choose whether to import tax rates and tax defaults from your accounting integration.',
+            customersDescription: 'Choose whether to re-bill customers in Expensify. Your Xero customer contacts can be tagged to expenses, and will export to Xero as a sales invoice.',
+            taxesDescription: 'Choose how to handle Xero taxes in Expensify.',
             notImported: 'Not imported',
+            notConfigured: 'Not configured',
+            trackingCategoriesOptions: {
+                default: 'Xero contact default',
+                tag: 'Tags',
+            },
+            exportDescription: 'Configure how Expensify data exports to Xero.',
+            purchaseBill: 'Purchase bill',
+            exportDeepDiveCompanyCard: 'Exported expenses will post as bank transactions to the Xero bank account below, and transaction dates will match the dates on your bank statement.',
+            bankTransactions: 'Bank transactions',
+            xeroBankAccount: 'Xero bank account',
+            xeroBankAccountDescription: 'Choose where expenses will post as bank transactions.',
+            exportExpensesDescription: 'Reports will export as a purchase bill with the date and status selected below.',
+            purchaseBillDate: 'Purchase bill date',
+            exportInvoices: 'Export invoices as',
+            salesInvoice: 'Sales invoice',
+            exportInvoicesDescription: 'Sales invoices always display the date on which the invoice was sent.',
             advancedConfig: {
-                advanced: 'Advanced',
-                autoSync: 'Auto-Sync',
-                autoSyncDescription: 'Sync Xero and Expensify automatically every day.',
-                purchaseBillStatusTitle: 'Set purchase bill status (optional)',
-                reimbursedReports: 'Sync reimbursed reports',
+                autoSyncDescription: 'Expensify will automatically sync with Xero every day.',
+                purchaseBillStatusTitle: 'Purchase bill status',
                 reimbursedReportsDescription: 'Any time a report is paid using Expensify ACH, the corresponding bill payment will be created in the Xero account below.',
-                xeroBillPaymentAccount: 'Xero Bill Payment Account',
-                xeroInvoiceCollectionAccount: 'Xero Invoice Collections Account',
+                xeroBillPaymentAccount: 'Xero bill payment account',
+                xeroInvoiceCollectionAccount: 'Xero invoice collections account',
+                xeroBillPaymentAccountDescription: "Choose where to pay bills from and we'll create the payment in Xero.",
+                invoiceAccountSelectorDescription: "Choose where to receive invoice payments and we'll create the payment in Xero.",
+            },
+            exportDate: {
+                label: 'Purchase bill date',
+                description: 'Use this date when exporting reports to Xero.',
+                values: {
+                    [CONST.XERO_EXPORT_DATE.LAST_EXPENSE]: {
+                        label: 'Date of last expense',
+                        description: 'Date of the most recent expense on the report.',
+                    },
+                    [CONST.XERO_EXPORT_DATE.REPORT_EXPORTED]: {
+                        label: 'Export date',
+                        description: 'Date the report was exported to Xero.',
+                    },
+                    [CONST.XERO_EXPORT_DATE.REPORT_SUBMITTED]: {
+                        label: 'Submitted date',
+                        description: 'Date the report was submitted for approval.',
+                    },
+                },
+            },
+            invoiceStatus: {
+                label: 'Purchase bill status',
+                description: 'Use this status when exporting purchase bills to Xero.',
+                values: {
+                    [CONST.XERO_CONFIG.INVOICE_STATUS.DRAFT]: 'Draft',
+                    [CONST.XERO_CONFIG.INVOICE_STATUS.AWAITING_APPROVAL]: 'Awaiting approval',
+                    [CONST.XERO_CONFIG.INVOICE_STATUS.AWAITING_PAYMENT]: 'Awaiting payment',
+                },
+            },
+            noAccountsFound: 'No accounts found',
+            noAccountsFoundDescription: 'Please add the account in Xero and sync the connection again.',
+        },
+        sageIntacct: {
+            preferredExporter: 'Preferred exporter',
+            notConfigured: 'Not configured',
+            exportDate: {
+                label: 'Export date',
+                description: 'Use this date when exporting reports to Sage Intacct.',
+                values: {
+                    [CONST.SAGE_INTACCT_EXPORT_DATE.LAST_EXPENSE]: {
+                        label: 'Date of last expense',
+                        description: 'Date of the most recent expense on the report.',
+                    },
+                    [CONST.SAGE_INTACCT_EXPORT_DATE.EXPORTED]: {
+                        label: 'Export date',
+                        description: 'Date the report was exported to Sage Intacct.',
+                    },
+                    [CONST.SAGE_INTACCT_EXPORT_DATE.SUBMITTED]: {
+                        label: 'Submitted date',
+                        description: 'Date the report was submitted for approval.',
+                    },
+                },
+            },
+            reimbursableExpenses: {
+                description: 'Set how out-of-pocket expenses export to Sage Intacct.',
+                values: {
+                    [CONST.SAGE_INTACCT_REIMBURSABLE_EXPENSE_TYPE.EXPENSE_REPORT]: 'Expense reports',
+                    [CONST.SAGE_INTACCT_REIMBURSABLE_EXPENSE_TYPE.VENDOR_BILL]: 'Vendor bills',
+                },
+            },
+            nonReimbursableExpenses: {
+                description: 'Set how company card purchases export to Sage Intacct.',
+                values: {
+                    [CONST.SAGE_INTACCT_NON_REIMBURSABLE_EXPENSE_TYPE.CREDIT_CARD_CHARGE]: 'Credit cards',
+                    [CONST.SAGE_INTACCT_NON_REIMBURSABLE_EXPENSE_TYPE.VENDOR_BILL]: 'Vendor bills',
+                },
+            },
+            creditCardAccount: 'Credit card account',
+            defaultVendor: 'Default vendor',
+            defaultVendorDescription: (isReimbursable: boolean): string =>
+                `Set a default vendor that will apply to ${isReimbursable ? '' : 'non-'}reimbursable expenses that don't have a matching vendor in Sage Intacct.`,
+            exportDescription: 'Configure how Expensify data exports to Sage Intacct.',
+            exportPreferredExporterNote:
+                'The preferred exporter can be any workspace admin, but must also be a Domain Admin if you set different export accounts for individual company cards in Domain Settings.',
+            exportPreferredExporterSubNote: 'Once set, the preferred exporter will see reports for export in their account.',
+            noAccountsFound: 'No accounts found',
+            noAccountsFoundDescription: `Please add the account in Sage Intacct and sync the connection again.`,
+            autoSync: 'Auto-sync',
+            autoSyncDescription: 'Expensify will automatically sync with Sage Intacct every day.',
+            inviteEmployees: 'Invite employees',
+            inviteEmployeesDescription:
+                'Import Sage Intacct employee records and invite employees to this workspace. Your approval workflow will default to manager approval and can be furthered configured on the Members page.',
+            syncReimbursedReports: 'Sync reimbursed reports',
+            syncReimbursedReportsDescription: 'Any time a report is paid using Expensify ACH, the corresponding bill payment will be created in the Sage Intacct account below.',
+            paymentAccount: 'Sage Intacct payment account',
+        },
+        netsuite: {
+            subsidiary: 'Subsidiary',
+            subsidiarySelectDescription: "Choose the subsidiary in NetSuite that you'd like to import data from.",
+            exportDescription: 'Configure how Expensify data exports to NetSuite.',
+            exportInvoices: 'Export invoices to',
+            journalEntriesTaxPostingAccount: 'Journal entries tax posting account',
+            journalEntriesProvTaxPostingAccount: 'Journal entries provincial tax posting account',
+            foreignCurrencyAmount: 'Export foreign currency amount',
+            exportToNextOpenPeriod: 'Export to next open period',
+            nonReimbursableJournalPostingAccount: 'Non-reimbursable journal posting account',
+            reimbursableJournalPostingAccount: 'Reimbursable journal posting account',
+            journalPostingPreference: {
+                label: 'Journal entries posting preference',
+                values: {
+                    [CONST.NETSUITE_JOURNAL_POSTING_PREFERENCE.JOURNALS_POSTING_INDIVIDUAL_LINE]: 'Single, itemized entry for each report',
+                    [CONST.NETSUITE_JOURNAL_POSTING_PREFERENCE.JOURNALS_POSTING_TOTAL_LINE]: 'Single entry for each expense',
+                },
+            },
+            invoiceItem: {
+                label: 'Invoice item',
+                values: {
+                    [CONST.NETSUITE_INVOICE_ITEM_PREFERENCE.CREATE]: {
+                        label: 'Create one for me',
+                        description: 'We\'ll create an "Expensify invoice line item" for you upon export (if one doesn’t exist already).',
+                    },
+                    [CONST.NETSUITE_INVOICE_ITEM_PREFERENCE.SELECT]: {
+                        label: 'Select existing',
+                        description: "We'll tie invoices from Expensify to the item selected below.",
+                    },
+                },
+            },
+            exportDate: {
+                label: 'Export date',
+                description: 'Use this date when exporting reports to NetSuite.',
+                values: {
+                    [CONST.NETSUITE_EXPORT_DATE.LAST_EXPENSE]: {
+                        label: 'Date of last expense',
+                        description: 'Date of the most recent expense on the report.',
+                    },
+                    [CONST.NETSUITE_EXPORT_DATE.EXPORTED]: {
+                        label: 'Export date',
+                        description: 'Date the report was exported to NetSuite.',
+                    },
+                    [CONST.NETSUITE_EXPORT_DATE.SUBMITTED]: {
+                        label: 'Submitted date',
+                        description: 'Date the report was submitted for approval.',
+                    },
+                },
+            },
+            exportDestination: {
+                values: {
+                    [CONST.NETSUITE_EXPORT_DESTINATION.EXPENSE_REPORT]: {
+                        label: 'Expense reports',
+                        reimbursableDescription: 'Out-of-pocket expenses will export as expense reports to NetSuite.',
+                        nonReimbursableDescription: 'Company card expenses will export as expense reports to NetSuite.',
+                    },
+                    [CONST.NETSUITE_EXPORT_DESTINATION.VENDOR_BILL]: {
+                        label: 'Vendor bills',
+                        reimbursableDescription:
+                            'Out-of-pocket expenses will export as bills payable to the NetSuite vendor specified below.\n' +
+                            '\n' +
+                            'If you’d like to set a specific vendor for each card, go to *Settings > Domains > Company Cards*.',
+                        nonReimbursableDescription:
+                            'Company card expenses will export as bills payable to the NetSuite vendor specified below.\n' +
+                            '\n' +
+                            'If you’d like to set a specific vendor for each card, go to *Settings > Domains > Company Cards*.',
+                    },
+                    [CONST.NETSUITE_EXPORT_DESTINATION.JOURNAL_ENTRY]: {
+                        label: 'Journal entries',
+                        reimbursableDescription:
+                            'Out-of-pocket expenses will export as journal entries to the NetSuite account specified below.\n' +
+                            '\n' +
+                            'If you’d like to set a specific vendor for each card, go to *Settings > Domains > Company Cards*.',
+                        nonReimbursableDescription:
+                            'Company card expenses will export as journal entries to the NetSuite account specified below.\n' +
+                            '\n' +
+                            'If you’d like to set a specific vendor for each card, go to *Settings > Domains > Company Cards*.',
+                    },
+                },
+            },
+            advancedConfig: {
+                autoSyncDescription: 'Expensify will automatically sync with NetSuite every day.',
+                reimbursedReportsDescription: 'Any time a report is paid using Expensify ACH, the corresponding bill payment will be created in the NetSuite account below.',
+                reimbursementsAccount: 'Reimbursements account',
+                reimbursementsAccountDescription: "Choose the bank account you'll use for reimbursements, and we'll create the associated payment in NetSuite.",
+                collectionsAccount: 'Collections account',
+                collectionsAccountDescription: 'Once an invoice is marked as paid in Expensify and exported to NetSuite, it’ll appear against the account below.',
+                approvalAccount: 'A/P approval account',
+                approvalAccountDescription:
+                    'Choose the account that transactions will be approved against in NetSuite. If you’re syncing reimbursed reports, this is also the account that bill payments will be created against.',
+                defaultApprovalAccount: 'NetSuite default',
+                inviteEmployees: 'Invite employees and set approvals',
+                inviteEmployeesDescription:
+                    'Import NetSuite employee records and invite employees to this workspace. Your approval workflow will default to manager approval and can be further configured on the *Members* page.',
+                autoCreateEntities: 'Auto-create employees/vendors',
+                enableCategories: 'Enable newly imported categories',
+                customFormID: 'Custom form ID',
+                customFormIDDescription:
+                    'By default, Expensify will create entries using the preferred transaction form set in NetSuite. Alternatively, you can designate a specific transaction form to be used.',
+                customFormIDReimbursable: 'Out-of-pocket expense',
+                customFormIDNonReimbursable: 'Company card expense',
+                exportReportsTo: {
+                    label: 'Expense report approval level',
+                    description: 'Once an expense report is approved in Expensify and exported to NetSuite, you can set an additional level of approval in NetSuite prior to posting.',
+                    values: {
+                        [CONST.NETSUITE_REPORTS_APPROVAL_LEVEL.REPORTS_APPROVED_NONE]: 'NetSuite default preference',
+                        [CONST.NETSUITE_REPORTS_APPROVAL_LEVEL.REPORTS_SUPERVISOR_APPROVED]: 'Only supervisor approved',
+                        [CONST.NETSUITE_REPORTS_APPROVAL_LEVEL.REPORTS_ACCOUNTING_APPROVED]: 'Only accounting approved',
+                        [CONST.NETSUITE_REPORTS_APPROVAL_LEVEL.REPORTS_APPROVED_BOTH]: 'Supervisor and accounting approved',
+                    },
+                },
+                exportVendorBillsTo: {
+                    label: 'Vendor bill approval level',
+                    description: 'Once a vendor bill is approved in Expensify and exported to NetSuite, you can set an additional level of approval in NetSuite prior to posting.',
+                    values: {
+                        [CONST.NETSUITE_VENDOR_BILLS_APPROVAL_LEVEL.VENDOR_BILLS_APPROVED_NONE]: 'NetSuite default preference',
+                        [CONST.NETSUITE_VENDOR_BILLS_APPROVAL_LEVEL.VENDOR_BILLS_APPROVAL_PENDING]: 'Pending approval',
+                        [CONST.NETSUITE_VENDOR_BILLS_APPROVAL_LEVEL.VENDOR_BILLS_APPROVED]: 'Approved for posting',
+                    },
+                },
+                exportJournalsTo: {
+                    label: 'Journal entry approval level',
+                    description: 'Once a journal entry is approved in Expensify and exported to NetSuite, you can set an additional level of approval in NetSuite prior to posting.',
+                    values: {
+                        [CONST.NETSUITE_JOURNALS_APPROVAL_LEVEL.JOURNALS_APPROVED_NONE]: 'NetSuite default preference',
+                        [CONST.NETSUITE_JOURNALS_APPROVAL_LEVEL.JOURNALS_APPROVAL_PENDING]: 'Pending approval',
+                        [CONST.NETSUITE_JOURNALS_APPROVAL_LEVEL.JOURNALS_APPROVED]: 'Approved for posting',
+                    },
+                },
+                error: {
+                    customFormID: 'Please enter a valid numeric custom form ID.',
+                },
+            },
+            noAccountsFound: 'No accounts found',
+            noAccountsFoundDescription: 'Please add the account in NetSuite and sync the connection again.',
+            noVendorsFound: 'No vendors found',
+            noVendorsFoundDescription: 'Please add vendors in NetSuite and sync the connection again.',
+            noItemsFound: 'No invoice items found',
+            noItemsFoundDescription: 'Please add invoice items in NetSuite and sync the connection again.',
+            noSubsidiariesFound: 'No subsidiaries found',
+            noSubsidiariesFoundDescription: 'Please add a subsidiary in NetSuite and sync the connection again.',
+            tokenInput: {
+                title: 'NetSuite setup',
+                formSteps: {
+                    installBundle: {
+                        title: 'Install the Expensify bundle',
+                        description: 'In NetSuite, go to *Customization > SuiteBundler > Search & Install Bundles* > search for "Expensify" > install the bundle.',
+                    },
+                    enableTokenAuthentication: {
+                        title: 'Enable token-based authentication',
+                        description: 'In NetSuite, go to *Setup > Company > Enable Features > SuiteCloud* > enable *token-based authentication*.',
+                    },
+                    enableSoapServices: {
+                        title: 'Enable SOAP web services',
+                        description: 'In NetSuite, go to *Setup > Company > Enable Features > SuiteCloud* > enable *SOAP Web Services*.',
+                    },
+                    createAccessToken: {
+                        title: 'Create an access token',
+                        description:
+                            'In NetSuite, go to *Setup > Users/Roles > Access Tokens* > create an access token for the "Expensify" app and either the "Expensify Integration" or "Administrator" role.\n\n*Important:* Make sure you save the *Token ID* and *Token Secret* from this step. You\'ll need it for the next step.',
+                    },
+                    enterCredentials: {
+                        title: 'Enter your NetSuite credentials',
+                        formInputs: {
+                            netSuiteAccountID: 'NetSuite Account ID',
+                            netSuiteTokenID: 'Token ID',
+                            netSuiteTokenSecret: 'Token Secret',
+                        },
+                        netSuiteAccountIDDescription: 'In NetSuite, go to *Setup > Integration > SOAP Web Services Preferences*.',
+                    },
+                },
+            },
+            import: {
+                expenseCategories: 'Expense categories',
+                expenseCategoriesDescription: 'Your NetSuite expense categories will import into Expensify as categories.',
+                crossSubsidiaryCustomers: 'Cross-subsidiary customers/projects',
+                importFields: {
+                    departments: {
+                        title: 'Departments',
+                        subtitle: 'Choose how to handle the NetSuite *departments* in Expensify.',
+                    },
+                    classes: {
+                        title: 'Classes',
+                        subtitle: 'Choose how to handle *classes* in Expensify.',
+                    },
+                    locations: {
+                        title: 'Locations',
+                        subtitle: 'Choose how to handle *locations* in Expensify.',
+                    },
+                },
+                customersOrJobs: {
+                    title: 'Customers/projects',
+                    subtitle: 'Choose how to handle NetSuite *customers* and *projects* in Expensify.',
+                    importCustomers: 'Import customers',
+                    importJobs: 'Import projects',
+                    customers: 'customers',
+                    jobs: 'projects',
+                    label: (importFields: string[], importType: string) => `${importFields.join(' and ')}, ${importType}`,
+                },
+                importTaxDescription: 'Import tax groups from NetSuite.',
+                importCustomFields: {
+                    chooseOptionBelow: 'Choose an option below:',
+                    requiredFieldError: (fieldName: string) => `Please enter the ${fieldName}`,
+                    customSegments: {
+                        title: 'Custom segments/records',
+                        addText: 'Add custom segment/record',
+                        recordTitle: 'Custom segment/record',
+                        helpLink: CONST.NETSUITE_IMPORT.HELP_LINKS.CUSTOM_SEGMENTS,
+                        helpLinkText: 'View detailed instructions',
+                        helpText: ' on configuring custom segments/records.',
+                        emptyTitle: 'Add a custom segment or custom record',
+                        fields: {
+                            segmentName: 'Name',
+                            internalID: 'Internal ID',
+                            scriptID: 'Script ID',
+                            customRecordScriptID: 'Transaction column ID',
+                            mapping: 'Displayed as',
+                        },
+                        removeTitle: 'Remove custom segment/record',
+                        removePrompt: 'Are you sure you want to remove this custom segment/record?',
+                        addForm: {
+                            customSegmentName: 'custom segment name',
+                            customRecordName: 'custom record name',
+                            segmentTitle: 'Custom segment',
+                            customSegmentAddTitle: 'Add custom segment',
+                            customRecordAddTitle: 'Add custom record',
+                            recordTitle: 'Custom record',
+                            segmentRecordType: 'Do you want to add a custom segment or a custom record?',
+                            customSegmentNameTitle: "What's the custom segment name?",
+                            customRecordNameTitle: "What's the custom record name?",
+                            customSegmentNameFooter: `You can find custom segment names in NetSuite under *Customizations > Links, Records & Fields > Custom Segments* page.\n\n_For more detailed instructions, [visit our help site](${CONST.NETSUITE_IMPORT.HELP_LINKS.CUSTOM_SEGMENTS})_.`,
+                            customRecordNameFooter: `You can find custom record names in NetSuite by entering the "Transaction Column Field" in global search.\n\n_For more detailed instructions, [visit our help site](${CONST.NETSUITE_IMPORT.HELP_LINKS.CUSTOM_SEGMENTS})_.`,
+                            customSegmentInternalIDTitle: "What's the internal ID?",
+                            customSegmentInternalIDFooter: `First, make sure you've enabled internal IDs in NetSuite under *Home > Set Preferences > Show Internal ID.*\n\nYou can find custom segment internal IDs in NetSuite under:\n\n1. *Customization > Lists, Records, & Fields > Custom Segments*.\n2. Click into a custom segment.\n3. Click the hyperlink next to *Custom Record Type*.\n4. Find the internal ID in the table at the bottom.\n\n_For more detailed instructions, [visit our help site](${CONST.NETSUITE_IMPORT.HELP_LINKS.CUSTOM_LISTS})_.`,
+                            customRecordInternalIDFooter: `You can find custom record internal IDs in NetSuite by following these steps:\n\n1. Enter "Transaction Line Fields" in global search.\n2. Click into a custom record.\n3. Find the internal ID on the left-hand side.\n\n_For more detailed instructions, [visit our help site](${CONST.NETSUITE_IMPORT.HELP_LINKS.CUSTOM_SEGMENTS})_.`,
+                            customSegmentScriptIDTitle: "What's the script ID?",
+                            customSegmentScriptIDFooter: `You can find custom segment script IDs in NetSuite under: \n\n1. *Customization > Lists, Records, & Fields > Custom Segments*.\n2. Click into a custom segment.\n3. Click the *Application and Sourcing* tab near the bottom, then:\n    a. If you want to display the custom segment as a *tag* (at the line-item level) in Expensify, click the *Transaction Columns* sub-tab and use the *Field ID*.\n    b. If you want to display the custom segment as a *report field* (at the report level) in Expensify, click the *Transactions* sub-tab and use the *Field ID*.\n\n_For more detailed instructions, [visit our help site](${CONST.NETSUITE_IMPORT.HELP_LINKS.CUSTOM_LISTS})_.`,
+                            customRecordScriptIDTitle: "What's the transaction column ID?",
+                            customRecordScriptIDFooter: `You can find custom record script IDs in NetSuite under:\n\n1. Enter "Transaction Line Fields" in global search.\n2. Click into a custom record.\n3. Find the script ID on the left-hand side.\n\n_For more detailed instructions, [visit our help site](${CONST.NETSUITE_IMPORT.HELP_LINKS.CUSTOM_SEGMENTS})_.`,
+                            customSegmentMappingTitle: 'How should this custom segment be displayed in Expensify?',
+                            customRecordMappingTitle: 'How should this custom record be displayed in Expensify?',
+                        },
+                        errors: {
+                            uniqueFieldError: (fieldName: string) => `A custom segment/record with this ${fieldName?.toLowerCase()} already exists.`,
+                        },
+                    },
+                    customLists: {
+                        title: 'Custom lists',
+                        addText: 'Add custom list',
+                        recordTitle: 'Custom list',
+                        helpLink: CONST.NETSUITE_IMPORT.HELP_LINKS.CUSTOM_LISTS,
+                        helpLinkText: 'View detailed instructions',
+                        helpText: ' on configuring custom lists.',
+                        emptyTitle: 'Add a custom list',
+                        fields: {
+                            listName: 'Name',
+                            internalID: 'Internal ID',
+                            transactionFieldID: 'Transaction field ID',
+                            mapping: 'Displayed as',
+                        },
+                        removeTitle: 'Remove custom list',
+                        removePrompt: 'Are you sure you want to remove this custom list?',
+                        addForm: {
+                            listNameTitle: 'Choose a custom list',
+                            transactionFieldIDTitle: "What's the transaction field ID?",
+                            transactionFieldIDFooter: `You can find transaction field IDs in NetSuite by following these steps:\n\n1. Enter "Transaction Line Fields" in global search.\n2. Click into a custom list.\n3. Find the transaction field ID on the left-hand side.\n\n_For more detailed instructions, [visit our help site](${CONST.NETSUITE_IMPORT.HELP_LINKS.CUSTOM_LISTS})_.`,
+                            mappingTitle: 'How should this custom list be displayed in Expensify?',
+                        },
+                        errors: {
+                            uniqueTransactionFieldIDError: `A custom list with this transaction field ID already exists.`,
+                        },
+                    },
+                },
+                importTypes: {
+                    [CONST.INTEGRATION_ENTITY_MAP_TYPES.NETSUITE_DEFAULT]: {
+                        label: 'NetSuite employee default',
+                        description: 'Not imported into Expensify, applied on export',
+                        footerContent: (importField: string) =>
+                            `If you use ${importField} in NetSuite, we'll apply the default set on the employee record upon export to Expense Report or Journal Entry.`,
+                    },
+                    [CONST.INTEGRATION_ENTITY_MAP_TYPES.TAG]: {
+                        label: 'Tags',
+                        description: 'Line-item level',
+                        footerContent: (importField: string) => `${startCase(importField)} will be selectable for each individual expense on an employee's report.`,
+                    },
+                    [CONST.INTEGRATION_ENTITY_MAP_TYPES.REPORT_FIELD]: {
+                        label: 'Report fields',
+                        description: 'Report level',
+                        footerContent: (importField: string) => `${startCase(importField)} selection will apply to all expense on an employee's report.`,
+                    },
+                },
+            },
+        },
+        intacct: {
+            sageIntacctSetup: 'Sage Intacct setup',
+            prerequisitesTitle: 'Before you connect...',
+            downloadExpensifyPackage: 'Download the Expensify package for Sage Intacct',
+            followSteps: 'Follow the steps in our How-to: Connect to Sage Intacct instructions',
+            enterCredentials: 'Enter your Sage Intacct credentials',
+            entity: 'Entity',
+            employeeDefault: 'Sage Intacct employee default',
+            employeeDefaultDescription: "The employee's default department will be applied to their expenses in Sage Intacct if one exists.",
+            displayedAsTagDescription: "Department will be selectable for each individual expense on an employee's report.",
+            displayedAsReportFieldDescription: "Department selection will apply to all expenses on an employee's report.",
+            toggleImportTitleFirstPart: 'Choose how to handle Sage Intacct ',
+            toggleImportTitleSecondPart: ' in Expensify.',
+            expenseTypes: 'Expense types',
+            expenseTypesDescription: 'Your Sage Intacct expense types will import into Expensify as categories.',
+            importTaxDescription: 'Import purchase tax rate from Sage Intacct.',
+            userDefinedDimensions: 'User-defined dimensions',
+            addUserDefinedDimension: 'Add user-defined dimension',
+            integrationName: 'Integration name',
+            dimensionExists: 'A dimension with this name already exists.',
+            removeDimension: 'Remove user-defined dimension',
+            removeDimensionPrompt: 'Are you sure you want to remove this user-defined dimension?',
+            userDefinedDimension: 'User-defined dimension',
+            addAUserDefinedDimension: 'Add a user-defined dimension',
+            detailedInstructionsLink: 'View detailed instructions',
+            detailedInstructionsRestOfSentence: ' on adding user-defined dimensions.',
+            userDimensionsAdded: (dimensionsCount: number) => `${dimensionsCount} ${Str.pluralize('UDD', `UDDs`, dimensionsCount)} added`,
+            mappingTitle: (mappingName: SageIntacctMappingName): string => {
+                switch (mappingName) {
+                    case CONST.SAGE_INTACCT_CONFIG.MAPPINGS.DEPARTMENTS:
+                        return 'departments';
+                    case CONST.SAGE_INTACCT_CONFIG.MAPPINGS.CLASSES:
+                        return 'classes';
+                    case CONST.SAGE_INTACCT_CONFIG.MAPPINGS.LOCATIONS:
+                        return 'locations';
+                    case CONST.SAGE_INTACCT_CONFIG.MAPPINGS.CUSTOMERS:
+                        return 'customers';
+                    case CONST.SAGE_INTACCT_CONFIG.MAPPINGS.PROJECTS:
+                        return 'projects (jobs)';
+                    default:
+                        return 'mappings';
+                }
             },
         },
         type: {
@@ -2040,6 +2749,68 @@ export default {
             control: 'Control',
             collect: 'Collect',
         },
+        companyCards: {
+            addCompanyCards: 'Add company cards',
+            selectCardFeed: 'Select card feed',
+        },
+        expensifyCard: {
+            issueAndManageCards: 'Issue and manage your Expensify Cards',
+            getStartedIssuing: 'Get started by issuing your first virtual or physical card.',
+            disclaimer:
+                'The Expensify Visa® Commercial Card is issued by The Bancorp Bank, N.A., Member FDIC, pursuant to a license from Visa U.S.A. Inc. and may not be used at all merchants that accept Visa cards. Apple® and the Apple logo® are trademarks of Apple Inc., registered in the U.S. and other countries. App Store is a service mark of Apple Inc. Google Play and the Google Play logo are trademarks of Google LLC.',
+            issueCard: 'Issue card',
+            newCard: 'New card',
+            name: 'Name',
+            lastFour: 'Last 4',
+            limit: 'Limit',
+            currentBalance: 'Current balance',
+            currentBalanceDescription: 'Current balance is the sum of all posted Expensify Card transactions that have occurred since the last settlement date.',
+            cardLimit: 'Card limit',
+            remainingLimit: 'Remaining limit',
+            requestLimitIncrease: 'Request limit increase',
+            remainingLimitDescription:
+                'We consider a number of factors when calculating your remaining limit: your tenure as a customer, the business-related information you provided during signup, and the available cash in your business bank account. Your remaining limit can fluctuate on a daily basis.',
+            earnedCashback: 'Cash back',
+            earnedCashbackDescription: 'Cash back balance is based on settled monthly Expensify Card spend across your workspace.',
+            issueNewCard: 'Issue new card',
+            finishSetup: 'Finish setup',
+            chooseBankAccount: 'Choose bank account',
+            chooseExistingBank: 'Choose an existing business bank account to pay your Expensify Card balance, or add a new bank account',
+            accountEndingIn: 'Account ending in',
+            addNewBankAccount: 'Add a new bank account',
+            settlementAccount: 'Settlement account',
+            settlementAccountDescription: 'Choose an account to pay your Expensify Card balance.',
+            settlementAccountInfoPt1: 'Make sure this account matches your',
+            settlementAccountInfoPt2: 'so Continuous Reconciliation works properly.',
+            reconciliationAccount: 'Reconciliation account',
+            settlementFrequency: 'Settlement frequency',
+            settlementFrequencyDescription: 'Choose how often you’ll pay your Expensify Card balance.',
+            settlementFrequencyInfo: 'If you’d like to switch to monthly settlement, you’ll need to connect your bank account via Plaid and have a positive 90-day balance history.',
+            frequency: {
+                daily: 'Daily',
+                monthly: 'Monthly',
+            },
+            cardDetails: 'Card details',
+            virtual: 'Virtual',
+            physical: 'Physical',
+            deactivate: 'Deactivate card',
+            changeCardLimit: 'Change card limit',
+            changeLimit: 'Change limit',
+            smartLimitWarning: (limit: string) => `If you change this card’s limit to ${limit}, new transactions will be declined until you approve more expenses on the card.`,
+            monthlyLimitWarning: (limit: string) => `If you change this card’s limit to ${limit}, new transactions will be declined until next month.`,
+            fixedLimitWarning: (limit: string) => `If you change this card’s limit to ${limit}, new transactions will be declined.`,
+            changeCardLimitType: 'Change card limit type',
+            changeLimitType: 'Change limit type',
+            changeCardSmartLimitTypeWarning: (limit: string) =>
+                `If you change this card's limit type to Smart Limit, new transactions will be declined because the ${limit} unapproved limit has already been reached.`,
+            changeCardMonthlyLimitTypeWarning: (limit: string) =>
+                `If you change this card's limit type to Monthly, new transactions will be declined because the ${limit} monthly limit has already been reached.`,
+            addMailingAddress: 'Add mailing address',
+            issuedCard: (assignee: string) => `issued ${assignee} an Expensify Card! The card will arrive in 2-3 business days.`,
+            issuedCardNoMailingAddress: (assignee: string) => `issued ${assignee} an Expensify Card! The card will be shipped once a mailing address is added.`,
+            issuedCardVirtual: ({assignee, link}: IssueVirtualCardParams) => `issued ${assignee} a virtual ${link}! The card can be used right away.`,
+            addedAddress: (assignee: string) => `${assignee} added the address. Expensify Card will arrive in 2-3 business days.`,
+        },
         categories: {
             deleteCategories: 'Delete categories',
             deleteCategoriesPrompt: 'Are you sure you want to delete these categories?',
@@ -2051,8 +2822,8 @@ export default {
             enableCategory: 'Enable category',
             deleteFailureMessage: 'An error occurred while deleting the category, please try again.',
             categoryName: 'Category name',
-            requiresCategory: 'Members must categorize all spend',
-            needCategoryForExportToIntegration: 'A category is required on every expense in order to export to',
+            requiresCategory: 'Members must categorize all expenses',
+            needCategoryForExportToIntegration: 'Require a category on every expense in order to export to',
             subtitle: 'Get a better overview of where money is being spent. Use our default categories or add your own.',
             emptyCategories: {
                 title: "You haven't created any categories",
@@ -2062,15 +2833,28 @@ export default {
             createFailureMessage: 'An error occurred while creating the category, please try again.',
             addCategory: 'Add category',
             editCategory: 'Edit category',
+            editCategories: 'Edit categories',
             categoryRequiredError: 'Category name is required.',
             existingCategoryError: 'A category with this name already exists.',
             invalidCategoryName: 'Invalid category name.',
             importedFromAccountingSoftware: 'The categories below are imported from your',
+            payrollCode: 'Payroll code',
+            updatePayrollCodeFailureMessage: 'An error occurred while updating the payroll code, please try again.',
+            glCode: 'GL code',
+            updateGLCodeFailureMessage: 'An error occurred while updating the GL code, please try again.',
         },
         moreFeatures: {
             spendSection: {
                 title: 'Spend',
-                subtitle: 'Enable optional functionality that helps you scale your team.',
+                subtitle: 'Enable functionality that helps you scale your team.',
+            },
+            manageSection: {
+                title: 'Manage',
+                subtitle: 'Add controls that help keep spend within budget.',
+            },
+            earnSection: {
+                title: 'Earn',
+                subtitle: 'Enable optional functionality to streamline your revenue and get paid faster.',
             },
             organizeSection: {
                 title: 'Organize',
@@ -2082,12 +2866,40 @@ export default {
             },
             distanceRates: {
                 title: 'Distance rates',
-                subtitle: 'Add, update and enforce rates.',
+                subtitle: 'Add, update, and enforce rates.',
+            },
+            expensifyCard: {
+                title: 'Expensify Card',
+                subtitle: 'Gain insights and control over spend',
+                disableCardTitle: 'Disable Expensify Card',
+                disableCardPrompt: 'You can’t disable the Expensify Card because it’s already in use. Reach out to Concierge for next steps.',
+                disableCardButton: 'Chat with Concierge',
+                feed: {
+                    title: 'Get the Expensify Card',
+                    subTitle: 'Streamline your business with the Expensify Card',
+                    features: {
+                        cashBack: 'Up to 2% cash back on every US purchase',
+                        unlimited: 'Issue unlimited virtual cards',
+                        spend: 'Spend controls and custom limits',
+                    },
+                    ctaTitle: 'Issue new card',
+                },
+            },
+            companyCards: {
+                title: 'Company Cards',
+                subtitle: 'Import spend from existing company cards',
+                disableCardTitle: 'Disable Company Cards',
+                disableCardPrompt: 'You can’t disable company cards because this feature is in use. Reach out to the Concierge for next steps.',
+                disableCardButton: 'Chat with Concierge',
             },
             workflows: {
                 title: 'Workflows',
                 subtitle: 'Configure how spend is approved and paid.',
             },
+            invoices: {
+                title: 'Invoices',
+                subtitle: 'Send and receive invoices.',
+            },
             categories: {
                 title: 'Categories',
                 subtitle: 'Track and organize spend.',
@@ -2108,14 +2920,68 @@ export default {
                 title: 'Accounting',
                 subtitle: 'Sync your chart of accounts and more.',
             },
+            connectionsWarningModal: {
+                featureEnabledTitle: 'Not so fast...',
+                featureEnabledText: "To enable or disable this feature, you'll need to change your accounting import settings.",
+                disconnectText: "To disable accounting, you'll need to disconnect your accounting connection from your workspace.",
+                manageSettings: 'Manage settings',
+            },
+            rules: {
+                title: 'Rules',
+                subtitle: 'Configure when receipts are required, flag high spend, and more.',
+            },
         },
         reportFields: {
+            addField: 'Add field',
             delete: 'Delete field',
-            deleteConfirmation: 'Are you sure that you want to delete this field?',
+            deleteFields: 'Delete fields',
+            deleteConfirmation: 'Are you sure you want to delete this report field?',
+            deleteFieldsConfirmation: 'Are you sure you want to delete these report fields?',
+            emptyReportFields: {
+                title: "You haven't created any report fields",
+                subtitle: 'Add a custom field (text, date, or dropdown) that appears on reports.',
+            },
+            subtitle: "Report fields apply to all spend and can be helpful when you'd like to prompt for extra information.",
+            disableReportFields: 'Disable report fields',
+            disableReportFieldsConfirmation: 'Are you sure? Text and date fields will be deleted, and lists will be disabled.',
+            importedFromAccountingSoftware: 'The report fields below are imported from your',
+            textType: 'Text',
+            dateType: 'Date',
+            dropdownType: 'List',
+            textAlternateText: 'Add a field for free text input.',
+            dateAlternateText: 'Add a calendar for date selection.',
+            dropdownAlternateText: 'Add a list of options to choose from.',
+            nameInputSubtitle: 'Choose a name for the report field.',
+            typeInputSubtitle: 'Choose what type of report field to use.',
+            initialValueInputSubtitle: 'Enter a starting value to show in the report field.',
+            listValuesInputSubtitle: 'These values will appear in your report field dropdown. Enabled values can be selected by members.',
+            listInputSubtitle: 'These values will appear in your report field list. Enabled values can be selected by members.',
+            deleteValue: 'Delete value',
+            deleteValues: 'Delete values',
+            disableValue: 'Disable value',
+            disableValues: 'Disable values',
+            enableValue: 'Enable value',
+            enableValues: 'Enable values',
+            emptyReportFieldsValues: {
+                title: "You haven't created any list values",
+                subtitle: 'Add custom values to appear on reports.',
+            },
+            deleteValuePrompt: 'Are you sure you want to delete this list value?',
+            deleteValuesPrompt: 'Are you sure you want to delete these list values?',
+            listValueRequiredError: 'Please enter a list value name',
+            existingListValueError: 'A list value with this name already exists',
+            editValue: 'Edit value',
+            listValues: 'List values',
+            addValue: 'Add value',
+            existingReportFieldNameError: 'A report field with this name already exists',
+            reportFieldNameRequiredError: 'Please enter a report field name',
+            reportFieldTypeRequiredError: 'Please choose a report field type',
+            reportFieldInitialValueRequiredError: 'Please choose a report field initial value',
+            genericFailureMessage: 'An error occurred while updating the report field. Please try again.',
         },
         tags: {
             tagName: 'Tag name',
-            requiresTag: 'Members must tag all spend',
+            requiresTag: 'Members must tag all expenses',
             customTagName: 'Custom tag name',
             enableTag: 'Enable tag',
             enableTags: 'Enable tags',
@@ -2135,8 +3001,11 @@ export default {
             deleteFailureMessage: 'An error occurred while deleting the tag, please try again.',
             tagRequiredError: 'Tag name is required.',
             existingTagError: 'A tag with this name already exists.',
+            invalidTagNameError: 'Tag name cannot be 0. Please choose a different value.',
             genericFailureMessage: 'An error occurred while updating the tag, please try again.',
             importedFromAccountingSoftware: 'The tags below are imported from your',
+            glCode: 'GL code',
+            updateGLCodeFailureMessage: 'An error occurred while updating the GL code, please try again.',
         },
         taxes: {
             subtitle: 'Add tax names, rates, and set defaults.',
@@ -2145,13 +3014,17 @@ export default {
             foreignDefault: 'Foreign currency default',
             customTaxName: 'Custom tax name',
             value: 'Value',
+            taxReclaimableOn: 'Tax reclaimable on',
+            taxRate: 'Tax rate',
             error: {
                 taxRateAlreadyExists: 'This tax name is already in use.',
+                taxCodeAlreadyExists: 'This tax code is already in use.',
                 valuePercentageRange: 'Please enter a valid percentage between 0 and 100.',
                 customNameRequired: 'Custom tax name is required.',
                 deleteFailureMessage: 'An error occurred while deleting the tax rate. Please try again or ask Concierge for help.',
                 updateFailureMessage: 'An error occurred while updating the tax rate. Please try again or ask Concierge for help.',
                 createFailureMessage: 'An error occurred while creating the tax rate. Please try again or ask Concierge for help.',
+                updateTaxClaimableFailureMessage: 'The reclaimable portion must be less than the distance rate amount.',
             },
             deleteTaxConfirmation: 'Are you sure you want to delete this tax?',
             deleteMultipleTaxConfirmation: ({taxAmount}) => `Are you sure you want to delete ${taxAmount} taxes?`,
@@ -2163,6 +3036,9 @@ export default {
                 enable: 'Enable rate',
                 enableMultiple: 'Enable rates',
             },
+            importedFromAccountingSoftware: 'The taxes below are imported from your',
+            taxCode: 'Tax code',
+            updateTaxCodeFailureMessage: 'An error occurred while updating the tax code, please try again.',
         },
         emptyWorkspace: {
             title: 'Create a workspace',
@@ -2188,6 +3064,8 @@ export default {
         people: {
             genericFailureMessage: 'An error occurred removing a user from the workspace, please try again.',
             removeMembersPrompt: 'Are you sure you want to remove these members?',
+            removeMembersWarningPrompt: ({memberName, ownerName}: RemoveMembersWarningPrompt) =>
+                `${memberName} is an approver in this workspace. When you unshare this workspace with them, we’ll replace them in the approval workflow with the workspace owner, ${ownerName}`,
             removeMembersTitle: 'Remove members',
             removeMemberButtonTitle: 'Remove from workspace',
             removeMemberGroupButtonTitle: 'Remove from group',
@@ -2199,25 +3077,60 @@ export default {
             selectAll: 'Select all',
             error: {
                 genericAdd: 'There was a problem adding this workspace member.',
-                cannotRemove: 'You cannot remove yourself or the workspace owner.',
+                cannotRemove: "You can't remove yourself or the workspace owner.",
                 genericRemove: 'There was a problem removing that workspace member.',
             },
-            addedWithPrimary: 'Some users were added with their primary logins.',
+            addedWithPrimary: 'Some members were added with their primary logins.',
             invitedBySecondaryLogin: ({secondaryLogin}) => `Added by secondary login ${secondaryLogin}.`,
             membersListTitle: 'Directory of all workspace members.',
         },
         card: {
             header: 'Unlock free Expensify Cards',
             headerWithEcard: 'Cards are ready!',
-            noVBACopy: 'Connect a bank account to issue Expensify Cards to your workspace members, and access these incredible benefits and more:',
-            VBANoECardCopy: 'Add a work email address to issue unlimited Expensify Cards for your workspace members, as well as all of these incredible benefits:',
+            noVBACopy: 'Connect a bank account to issue Expensify Cards to your workspace members and access exclusive benefits like:',
+            VBANoECardCopy: 'Add a work email to issue unlimited Expensify Cards to your workspace members and enjoy exclusive benefits like:',
             VBAWithECardCopy: 'Access these incredible benefits and more:',
-            benefit1: 'Up to 2% cash back',
-            benefit2: 'Digital and physical cards',
+            benefit1: 'Cash back on every US purchase',
+            benefit2: 'Unlimited virtual and physical cards',
             benefit3: 'No personal liability',
-            benefit4: 'Customizable limits',
+            benefit4: 'Customizable limits and spend controls',
             addWorkEmail: 'Add work email address',
-            checkingDomain: 'Hang tight! We are still working on enabling your Expensify Cards. Check back here in a few minutes.',
+            checkingDomain: "Hang tight! We're still working on enabling your Expensify Cards. Check back here in a few minutes.",
+            issueAndManageCards: 'Issue and manage your Expensify Cards',
+            getStartedIssuing: 'Get started by issuing your first virtual or physical card.',
+            issueCard: 'Issue card',
+            issueNewCard: {
+                whoNeedsCard: 'Who needs a card?',
+                findMember: 'Find member',
+                chooseCardType: 'Choose a card type',
+                physicalCard: 'Physical card',
+                physicalCardDescription: 'Great for the frequent spender',
+                virtualCard: 'Virtual card',
+                virtualCardDescription: 'Instant and flexible',
+                chooseLimitType: 'Choose a limit type',
+                smartLimit: 'Smart Limit',
+                smartLimitDescription: 'Spend up to a certain amount before requiring approval',
+                monthly: 'Monthly',
+                monthlyDescription: 'Spend up to a certain amount per month',
+                fixedAmount: 'Fixed amount',
+                fixedAmountDescription: 'Spend up to a certain amount once',
+                setLimit: 'Set a limit',
+                giveItName: 'Give it a name',
+                giveItNameInstruction: 'Make it unique enough to tell apart from the other. Specific use cases are even better!',
+                cardName: 'Card name',
+                letsDoubleCheck: 'Let’s double check that everything looks right.',
+                willBeReady: 'This card will be ready to use immediately.',
+                cardholder: 'Cardholder',
+                cardType: 'Card type',
+                limit: 'Limit',
+                limitType: 'Limit type',
+                name: 'Name',
+            },
+            deactivateCardModal: {
+                deactivate: 'Deactivate',
+                deactivateCard: 'Deactivate card',
+                deactivateConfirmation: 'Deactivating this card will decline all future transactions and can’t be undone.',
+            },
         },
         reimburse: {
             captureReceipts: 'Capture receipts',
@@ -2231,21 +3144,38 @@ export default {
             trackDistanceChooseUnit: 'Choose a default unit to track.',
             unlockNextDayReimbursements: 'Unlock next-day reimbursements',
             captureNoVBACopyBeforeEmail: 'Ask your workspace members to forward receipts to ',
-            captureNoVBACopyAfterEmail: ' and download the Expensify App to track cash expenses on the go.',
-            unlockNoVBACopy: 'Connect a bank account to reimburse your workspace members online.',
+            captureNoVBACopyAfterEmail: ' and download the Expensify app to track expenses on the go.',
+            unlockNoVBACopy: 'Connect a bank account to reimburse your workspace members quickly and easily.',
             fastReimbursementsVBACopy: "You're all set to reimburse receipts from your bank account!",
-            updateCustomUnitError: "Your changes couldn't be saved. The workspace was modified while you were offline, please try again.",
+            updateCustomUnitError: "Your changes couldn't be saved because the workspace was modified while you were offline. Please try again.",
             invalidRateError: 'Please enter a valid rate.',
             lowRateError: 'Rate must be greater than 0.',
         },
         accounting: {
             settings: 'settings',
             title: 'Connections',
-            subtitle: 'Connect to your accounting system to code transactions with your chart of accounts, auto-match payments and keep your finances in sync.',
+            subtitle: 'Connect to your accounting system to code transactions with your chart of accounts, auto-match payments, and keep your finances in sync.',
             qbo: 'Quickbooks Online',
             xero: 'Xero',
-            setup: 'Set up',
-            lastSync: 'Last synced just now',
+            netsuite: 'NetSuite',
+            intacct: 'Sage Intacct',
+            connectionName: (integration: ConnectionName) => {
+                switch (integration) {
+                    case CONST.POLICY.CONNECTIONS.NAME.QBO:
+                        return 'Quickbooks Online';
+                    case CONST.POLICY.CONNECTIONS.NAME.XERO:
+                        return 'Xero';
+                    case CONST.POLICY.CONNECTIONS.NAME.NETSUITE:
+                        return 'NetSuite';
+                    case CONST.POLICY.CONNECTIONS.NAME.SAGE_INTACCT:
+                        return 'Sage Intacct';
+                    default: {
+                        return '';
+                    }
+                }
+            },
+            setup: 'Connect',
+            lastSync: (relativeDate: string) => `Last synced ${relativeDate}`,
             import: 'Import',
             export: 'Export',
             advanced: 'Advanced',
@@ -2253,13 +3183,21 @@ export default {
             syncNow: 'Sync now',
             disconnect: 'Disconnect',
             disconnectTitle: (integration?: ConnectionName): string => {
+                const integrationName = integration && CONST.POLICY.CONNECTIONS.NAME_USER_FRIENDLY[integration] ? CONST.POLICY.CONNECTIONS.NAME_USER_FRIENDLY[integration] : 'integration';
+                return `Disconnect ${integrationName}`;
+            },
+            connectTitle: (integrationToConnect: ConnectionName): string => `Connect ${CONST.POLICY.CONNECTIONS.NAME_USER_FRIENDLY[integrationToConnect] ?? 'accounting integration'}`,
+
+            syncError: (integration?: ConnectionName): string => {
                 switch (integration) {
                     case CONST.POLICY.CONNECTIONS.NAME.QBO:
-                        return 'Disconnect QuickBooks Online';
+                        return "Can't connect to QuickBooks Online.";
                     case CONST.POLICY.CONNECTIONS.NAME.XERO:
-                        return 'Disconnect Xero';
+                        return "Can't connect to Xero.";
+                    case CONST.POLICY.CONNECTIONS.NAME.NETSUITE:
+                        return "Can't connect to NetSuite.";
                     default: {
-                        return 'Disconnect integration';
+                        return "Can't connect to integration.";
                     }
                 }
             },
@@ -2267,34 +3205,27 @@ export default {
             taxes: 'Taxes',
             imported: 'Imported',
             notImported: 'Not imported',
-            importAsCategory: 'Imported, displayed as categories',
+            importAsCategory: 'Imported as categories',
             importTypes: {
                 [CONST.INTEGRATION_ENTITY_MAP_TYPES.IMPORTED]: 'Imported',
-                [CONST.INTEGRATION_ENTITY_MAP_TYPES.TAG]: 'Imported, displayed as tags',
+                [CONST.INTEGRATION_ENTITY_MAP_TYPES.TAG]: 'Imported as tags',
                 [CONST.INTEGRATION_ENTITY_MAP_TYPES.DEFAULT]: 'Imported',
                 [CONST.INTEGRATION_ENTITY_MAP_TYPES.NOT_IMPORTED]: 'Not imported',
                 [CONST.INTEGRATION_ENTITY_MAP_TYPES.NONE]: 'Not imported',
-                [CONST.INTEGRATION_ENTITY_MAP_TYPES.REPORT_FIELD]: 'Imported, displayed as report fields',
+                [CONST.INTEGRATION_ENTITY_MAP_TYPES.REPORT_FIELD]: 'Imported as report fields',
+                [CONST.INTEGRATION_ENTITY_MAP_TYPES.NETSUITE_DEFAULT]: 'NetSuite employee default',
             },
-            disconnectPrompt: (integrationToConnect?: ConnectionName, currentIntegration?: ConnectionName): string => {
-                switch (integrationToConnect) {
-                    case CONST.POLICY.CONNECTIONS.NAME.QBO:
-                        return 'Are you sure you want to disconnect Xero to set up QuickBooks Online?';
-                    case CONST.POLICY.CONNECTIONS.NAME.XERO:
-                        return 'Are you sure you want to disconnect QuickBooks Online to set up Xero?';
-                    default: {
-                        switch (currentIntegration) {
-                            case CONST.POLICY.CONNECTIONS.NAME.QBO:
-                                return 'Are you sure you want to disconnect QuickBooks Online?';
-                            case CONST.POLICY.CONNECTIONS.NAME.XERO:
-                                return 'Are you sure you want to disconnect Xero?';
-                            default: {
-                                return 'Are you sure you want to disconnect this integration?';
-                            }
-                        }
-                    }
-                }
+            disconnectPrompt: (currentIntegration?: ConnectionName): string => {
+                const integrationName =
+                    currentIntegration && CONST.POLICY.CONNECTIONS.NAME_USER_FRIENDLY[currentIntegration]
+                        ? CONST.POLICY.CONNECTIONS.NAME_USER_FRIENDLY[currentIntegration]
+                        : 'this integration';
+                return `Are you sure you want to disconnect ${integrationName}?`;
             },
+            connectPrompt: (integrationToConnect: ConnectionName): string =>
+                `Are you sure you want to connect ${
+                    CONST.POLICY.CONNECTIONS.NAME_USER_FRIENDLY[integrationToConnect] ?? 'this accounting integration'
+                }? This will remove any existing acounting connections.`,
             enterCredentials: 'Enter your credentials',
             connections: {
                 syncStageName: (stage: PolicyConnectionSyncStage) => {
@@ -2302,6 +3233,8 @@ export default {
                         case 'quickbooksOnlineImportCustomers':
                             return 'Importing customers';
                         case 'quickbooksOnlineImportEmployees':
+                        case 'netSuiteSyncImportEmployees':
+                        case 'intacctImportEmployees':
                             return 'Importing employees';
                         case 'quickbooksOnlineImportAccounts':
                             return 'Importing accounts';
@@ -2312,33 +3245,128 @@ export default {
                         case 'quickbooksOnlineImportProcessing':
                             return 'Processing imported data';
                         case 'quickbooksOnlineSyncBillPayments':
-                            return 'Synchronizing reimbursed reports and bill Payments';
+                        case 'intacctImportSyncBillPayments':
+                            return 'Syncing reimbursed reports and bill payments';
                         case 'quickbooksOnlineSyncTaxCodes':
                             return 'Importing tax codes';
                         case 'quickbooksOnlineCheckConnection':
                             return 'Checking QuickBooks Online connection';
                         case 'quickbooksOnlineImportMain':
-                            return 'Importing your QuickBooks Online data';
-                        case 'startingImport':
-                            return 'Importing your QuickBooks Online data';
+                            return 'Importing QuickBooks Online data';
+                        case 'startingImportXero':
+                            return 'Importing Xero data';
+                        case 'startingImportQBO':
+                            return 'Importing QuickBooks Online data';
                         case 'quickbooksOnlineSyncTitle':
-                            return 'Synchronizing QuickBooks Online data';
+                            return 'Syncing QuickBooks Online data';
                         case 'quickbooksOnlineSyncLoadData':
+                        case 'xeroSyncStep':
+                        case 'intacctImportData':
                             return 'Loading data';
                         case 'quickbooksOnlineSyncApplyCategories':
                             return 'Updating categories';
                         case 'quickbooksOnlineSyncApplyCustomers':
-                            return 'Updating Customers/Projects';
+                            return 'Updating customers/projects';
                         case 'quickbooksOnlineSyncApplyEmployees':
                             return 'Updating people list';
                         case 'quickbooksOnlineSyncApplyClassesLocations':
                             return 'Updating report fields';
+                        case 'jobDone':
+                            return 'Waiting for imported data to load';
+                        case 'xeroSyncImportChartOfAccounts':
+                            return 'Syncing chart of accounts';
+                        case 'xeroSyncImportCategories':
+                            return 'Syncing categories';
+                        case 'xeroSyncImportCustomers':
+                            return 'Syncing customers';
+                        case 'xeroSyncXeroReimbursedReports':
+                            return 'Marking Expensify reports as reimbursed';
+                        case 'xeroSyncExpensifyReimbursedReports':
+                            return 'Marking Xero bills and invoices as paid';
+                        case 'xeroSyncImportTrackingCategories':
+                            return 'Syncing tracking categories';
+                        case 'xeroSyncImportBankAccounts':
+                            return 'Syncing bank accounts';
+                        case 'xeroSyncImportTaxRates':
+                            return 'Syncing tax rates';
+                        case 'xeroCheckConnection':
+                            return 'Checking Xero connection';
+                        case 'xeroSyncTitle':
+                            return 'Syncing Xero data';
+                        case 'netSuiteSyncConnection':
+                            return 'Initializing connection to NetSuite';
+                        case 'netSuiteSyncCustomers':
+                            return 'Importing customers';
+                        case 'netSuiteSyncInitData':
+                            return 'Retrieving data from NetSuite';
+                        case 'netSuiteSyncImportTaxes':
+                            return 'Importing taxes';
+                        case 'netSuiteSyncImportItems':
+                            return 'Importing items';
+                        case 'netSuiteSyncData':
+                            return 'Importing data into Expensify';
+                        case 'netSuiteSyncAccounts':
+                            return 'Syncing accounts';
+                        case 'netSuiteSyncCurrencies':
+                            return 'Syncing currencies';
+                        case 'netSuiteSyncCategories':
+                            return 'Syncing categories';
+                        case 'netSuiteSyncReportFields':
+                            return 'Importing data as Expensify report fields';
+                        case 'netSuiteSyncTags':
+                            return 'Importing data as Expensify tags';
+                        case 'netSuiteSyncUpdateConnectionData':
+                            return 'Updating connection info';
+                        case 'netSuiteSyncNetSuiteReimbursedReports':
+                            return 'Marking Expensify reports as reimbursed';
+                        case 'netSuiteSyncExpensifyReimbursedReports':
+                            return 'Marking NetSuite bills and invoices as paid';
+                        case 'netSuiteSyncImportCustomLists':
+                            return 'Importing custom lists';
+                        case 'netSuiteSyncImportSubsidiaries':
+                            return 'Importing subsidiaries';
+                        case 'netSuiteSyncImportVendors':
+                            return 'Importing vendors';
+                        case 'intacctCheckConnection':
+                            return 'Checking Sage Intacct connection';
+                        case 'intacctImportDimensions':
+                            return 'Importing Sage Intacct dimensions';
+                        case 'intacctImportTitle':
+                            return 'Importing Sage Intacct data';
                         default: {
+                            // eslint-disable-next-line @typescript-eslint/restrict-template-expressions
                             return `Translation missing for stage: ${stage}`;
                         }
                     }
                 },
             },
+            preferredExporter: 'Preferred exporter',
+            exportPreferredExporterNote:
+                'The preferred exporter can be any workspace admin, but must also be a Domain Admin if you set different export accounts for individual company cards in Domain Settings.',
+            exportPreferredExporterSubNote: 'Once set, the preferred exporter will see reports for export in their account.',
+            exportAs: 'Export as',
+            exportOutOfPocket: 'Export out-of-pocket expenses as',
+            exportCompanyCard: 'Export company card expenses as',
+            exportDate: 'Export date',
+            defaultVendor: 'Default vendor',
+            autoSync: 'Auto-sync',
+            reimbursedReports: 'Sync reimbursed reports',
+            cardReconciliation: 'Card reconciliation',
+            reconciliationAccount: 'Reconciliation account',
+            continuousReconciliation: 'Continuous Reconciliation',
+            saveHoursOnReconciliation:
+                'Save hours on reconciliation each accounting period by having Expensify continuously reconcile Expensify Card statements and settlements on your behalf.',
+            enableContinuousReconciliation: 'In order to enable Continuous Reconciliation, please enable ',
+            chooseReconciliationAccount: {
+                chooseBankAccount: 'Choose the bank account that your Expensify Card payments will be reconciled against.',
+                accountMatches: 'Make sure this account matches your ',
+                settlementAccount: 'Expensify Card settlement account ',
+                reconciliationWorks: (lastFourPAN: string) => `(ending in ${lastFourPAN}) so Continuous Reconciliation works properly.`,
+            },
+        },
+        export: {
+            notReadyHeading: 'Not ready to export',
+            notReadyDescription: 'Draft or pending expense reports cannot be exported to the accounting system. Please approve or pay these expenses before exporting them.',
         },
         bills: {
             manageYourBills: 'Manage your bills',
@@ -2352,15 +3380,27 @@ export default {
         },
         invoices: {
             invoiceClientsAndCustomers: 'Invoice clients and customers',
-            invoiceFirstSectionCopy: 'Send beautiful, professional invoices directly to your clients and customers right from within the Expensify app.',
+            invoiceFirstSectionCopy: 'Send beautiful, professional invoices directly to your clients and customers right from the Expensify app.',
             viewAllInvoices: 'View all invoices',
             unlockOnlineInvoiceCollection: 'Unlock online invoice collection',
-            unlockNoVBACopy: 'Connect your bank account to accept online payments for invoices - by ACH or credit card - to be deposited straight into your account.',
+            unlockNoVBACopy: 'Connect your bank account to accept online invoice payments by ACH or credit card.',
             moneyBackInAFlash: 'Money back, in a flash!',
             unlockVBACopy: "You're all set to accept payments by ACH or credit card!",
             viewUnpaidInvoices: 'View unpaid invoices',
             sendInvoice: 'Send invoice',
             sendFrom: 'Send from',
+            invoicingDetails: 'Invoicing details',
+            invoicingDetailsDescription: 'This info will appear on your invoices.',
+            companyName: 'Company name',
+            companyWebsite: 'Company website',
+            paymentMethods: {
+                personal: 'Personal',
+                business: 'Business',
+                chooseInvoiceMethod: 'Choose a payment method below:',
+                addBankAccount: 'Add bank account',
+                payingAsIndividual: 'Paying as an individual',
+                payingAsBusiness: 'Paying as a business',
+            },
         },
         travel: {
             unlockConciergeBookingTravel: 'Unlock Concierge travel booking',
@@ -2373,7 +3413,7 @@ export default {
             member: 'Invite member',
             members: 'Invite members',
             invitePeople: 'Invite new members',
-            genericFailureMessage: 'An error occurred inviting the user to the workspace, please try again.',
+            genericFailureMessage: 'An error occurred while inviting the member to the workspace. Please try again.',
             pleaseEnterValidLogin: `Please ensure the email or phone number is valid (e.g. ${CONST.EXAMPLE_PHONE_NUMBER}).`,
             user: 'user',
             users: 'users',
@@ -2387,22 +3427,25 @@ export default {
             inviteMessageTitle: 'Add message',
             inviteMessagePrompt: 'Make your invitation extra special by adding a message below',
             personalMessagePrompt: 'Message',
-            genericFailureMessage: 'An error occurred inviting the user to the workspace, please try again.',
+            genericFailureMessage: 'An error occurred while inviting the member to the workspace. Please try again.',
             inviteNoMembersError: 'Please select at least one member to invite.',
         },
         distanceRates: {
             oopsNotSoFast: 'Oops! Not so fast...',
             workspaceNeeds: 'A workspace needs at least one enabled distance rate.',
             distance: 'Distance',
-            centrallyManage: 'Centrally manage rates, choose to track in miles or kilometers, and set a default category.',
+            centrallyManage: 'Centrally manage rates, track in miles or kilometers, and set a default category.',
             rate: 'Rate',
             addRate: 'Add rate',
+            trackTax: 'Track tax',
             deleteRates: ({count}: DistanceRateOperationsParams) => `Delete ${Str.pluralize('rate', 'rates', count)}`,
             enableRates: ({count}: DistanceRateOperationsParams) => `Enable ${Str.pluralize('rate', 'rates', count)}`,
             disableRates: ({count}: DistanceRateOperationsParams) => `Disable ${Str.pluralize('rate', 'rates', count)}`,
             enableRate: 'Enable rate',
             status: 'Status',
             unit: 'Unit',
+            taxFeatureNotEnabledMessage: 'Taxes must be enabled on the workspace to use this feature. Head over to ',
+            changePromptMessage: ' to make that change.',
             defaultCategory: 'Default category',
             deleteDistanceRate: 'Delete distance rate',
             areYouSureDelete: ({count}: DistanceRateOperationsParams) => `Are you sure you want to delete ${Str.pluralize('this rate', 'these rates', count)}?`,
@@ -2410,26 +3453,28 @@ export default {
         editor: {
             descriptionInputLabel: 'Description',
             nameInputLabel: 'Name',
-            nameInputHelpText: 'This is the name you will see on your workspace.',
-            nameIsRequiredError: 'You need to define a name for your workspace.',
+            typeInputLabel: 'Type',
+            initialValueInputLabel: 'Initial value',
+            nameInputHelpText: "This is the name you'll see on your workspace.",
+            nameIsRequiredError: "You'll need to give your workspace a name.",
             currencyInputLabel: 'Default currency',
             currencyInputHelpText: 'All expenses on this workspace will be converted to this currency.',
             currencyInputDisabledText: "The default currency can't be changed because this workspace is linked to a USD bank account.",
             save: 'Save',
-            genericFailureMessage: 'An error occurred updating the workspace, please try again.',
-            avatarUploadFailureMessage: 'An error occurred uploading the avatar, please try again.',
+            genericFailureMessage: 'An error occurred while updating the workspace. Please try again.',
+            avatarUploadFailureMessage: 'An error occurred uploading the avatar. Please try again.',
+            addressContext: 'A Workspace Address is required to enable Expensify Travel. Please enter an address associated with your business.',
         },
         bankAccount: {
             continueWithSetup: 'Continue with setup',
-            youreAlmostDone:
-                "You're almost done setting up your bank account, which will let you issue corporate cards, reimburse expenses, collect invoices, and pay bills all from the same bank account.",
+            youreAlmostDone: "You're almost done setting up your bank account, which will let you issue corporate cards, reimburse expenses, collect invoices, and pay bills.",
             streamlinePayments: 'Streamline payments',
             oneMoreThing: 'One more thing!',
             allSet: "You're all set!",
             accountDescriptionNoCards:
-                'This bank account will be used to reimburse expenses, collect invoices, and pay bills all from the same account.\n\nPlease add a work email address as a secondary login to enable the Expensify Card.',
-            accountDescriptionWithCards: 'This bank account will be used to issue corporate cards, reimburse expenses, collect invoices, and pay bills all from the same account.',
-            addWorkEmail: 'Add work email address',
+                'This bank account will be used to reimburse expenses, collect invoices, and pay bills.\n\nPlease add a work email as a secondary login to enable the Expensify Card.',
+            accountDescriptionWithCards: 'This bank account will be used to issue corporate cards, reimburse expenses, collect invoices, and pay bills.',
+            addWorkEmail: 'Add work email',
             letsFinishInChat: "Let's finish in chat!",
             almostDone: 'Almost done!',
             disconnectBankAccount: 'Disconnect bank account',
@@ -2439,10 +3484,10 @@ export default {
             yesStartOver: 'Yes, start over',
             disconnectYour: 'Disconnect your ',
             bankAccountAnyTransactions: ' bank account. Any outstanding transactions for this account will still complete.',
-            clearProgress: 'Starting over will clear the progress you have made so far.',
+            clearProgress: "Starting over will clear the progress you've made so far.",
             areYouSure: 'Are you sure?',
             workspaceCurrency: 'Workspace currency',
-            updateCurrencyPrompt: 'It looks like your Workspace is currently set to a different currency than USD. Please click the button below to update your currency to USD now.',
+            updateCurrencyPrompt: 'It looks like your workspace is currently set to a different currency than USD. Please click the button below to update your currency to USD now.',
             updateToUSD: 'Update to USD',
         },
         changeOwner: {
@@ -2461,7 +3506,7 @@ export default {
             addPaymentCardSecurity: 'security',
             amountOwedTitle: 'Outstanding balance',
             amountOwedButtonText: 'OK',
-            amountOwedText: 'This account has an outstanding balance from a previous month.\n\nDo you want to clear balance and take over billing of this workspace?',
+            amountOwedText: 'This account has an outstanding balance from a previous month.\n\nDo you want to clear the balance and take over billing of this workspace?',
             ownerOwesAmountTitle: 'Outstanding balance',
             ownerOwesAmountButtonText: 'Transfer balance',
             ownerOwesAmountText: ({email, amount}) =>
@@ -2469,7 +3514,7 @@ export default {
             subscriptionTitle: 'Take over annual subscription',
             subscriptionButtonText: 'Transfer subscription',
             subscriptionText: ({usersCount, finalCount}) =>
-                `Taking over this workspace will merge its associated annual subscription with your current subscription. This will increase your subscription size by ${usersCount} users making your new subscription size ${finalCount}. Would you like to continue?`,
+                `Taking over this workspace will merge its annual subscription with your current subscription. This will increase your subscription size by ${usersCount} members making your new subscription size ${finalCount}. Would you like to continue?`,
             duplicateSubscriptionTitle: 'Duplicate subscription alert',
             duplicateSubscriptionButtonText: 'Continue',
             duplicateSubscriptionText: ({email, workspaceName}) =>
@@ -2477,7 +3522,7 @@ export default {
             hasFailedSettlementsTitle: 'Cannot transfer ownership',
             hasFailedSettlementsButtonText: 'Got it',
             hasFailedSettlementsText: ({email}) =>
-                `You cannot take over billing because ${email} has an overdue expensify Expensify Card settlement. Please advise them to reach out to concierge@expensify.com to resolve the issue. Then, you can take over billing for this workspace.`,
+                `You can't take over billing because ${email} has an overdue expensify Expensify Card settlement. Please ask them to reach out to concierge@expensify.com to resolve the issue. Then, you can take over billing for this workspace.`,
             failedToClearBalanceTitle: 'Failed to clear balance',
             failedToClearBalanceButtonText: 'OK',
             failedToClearBalanceText: 'We were unable to clear the balance. Please try again later.',
@@ -2488,6 +3533,117 @@ export default {
             errorDescriptionPartTwo: 'reach out to Concierge',
             errorDescriptionPartThree: 'for help.',
         },
+        exportAgainModal: {
+            title: 'Careful!',
+            description: (reportName: string, connectionName: ConnectionName) =>
+                `The following reports have already been exported to ${CONST.POLICY.CONNECTIONS.NAME_USER_FRIENDLY[connectionName]}:\n\n${reportName}\n\nAre you sure you want to export them again?`,
+            confirmText: 'Yes, export again',
+            cancelText: 'Cancel',
+        },
+        upgrade: {
+            reportFields: {
+                title: 'Report fields',
+                description: `Report fields let you specify header-level details, distinct from tags that pertain to expenses on individual line items. These details can encompass specific project names, business trip information, locations, and more.`,
+                onlyAvailableOnPlan: 'Report fields are only available on the Control plan, starting at ',
+            },
+            [CONST.POLICY.CONNECTIONS.NAME.NETSUITE]: {
+                title: 'NetSuite',
+                description: `Enjoy automated syncing and reduce manual entries with the Expensify + NetSuite integration. Gain in-depth, realtime financial insights with native and custom segment support, including project and customer mapping.`,
+                onlyAvailableOnPlan: 'Our NetSuite integration is only available on the Control plan, starting at ',
+            },
+            [CONST.POLICY.CONNECTIONS.NAME.SAGE_INTACCT]: {
+                title: 'Sage Intacct',
+                description: `Enjoy automated syncing and reduce manual entries with the Expensify + Sage Intacct integration. Gain in-depth, real-time financial insights with user-defined dimensions, as well as expense coding by department, class, location, customer, and project (job).`,
+                onlyAvailableOnPlan: 'Our Sage Intacct integration is only available on the Control plan, starting at ',
+            },
+            [CONST.UPGRADE_FEATURE_INTRO_MAPPING.approvals.id]: {
+                title: 'Advanced Approvals',
+                description: `If you want to add more layers of approval to the mix – or just make sure the largest expenses get another set of eyes – we’ve got you covered. Advanced approvals help you put the right checks in place at every level so you keep your team’s spend under control.`,
+                onlyAvailableOnPlan: 'Advanced approvals are only available on the Control plan, which starts at ',
+            },
+            glCodes: {
+                title: 'GL codes',
+                description: `Add GL codes to your categories and tags for easy export of expenses to your accounting and payroll systems.`,
+                onlyAvailableOnPlan: 'GL codes are only available on the Control plan, starting at ',
+            },
+            glAndPayrollCodes: {
+                title: 'GL & Payroll codes',
+                description: `Add GL & Payroll codes to your categories for easy export of expenses to your accounting and payroll systems.`,
+                onlyAvailableOnPlan: 'GL & Payroll codes are only available on the Control plan, starting at ',
+            },
+            taxCodes: {
+                title: 'Tax codes',
+                description: `Add tax codes to your taxes for easy export of expenses to your accounting and payroll systems.`,
+                onlyAvailableOnPlan: 'Tax codes are only available on the Control plan, starting at ',
+            },
+            companyCards: {
+                title: 'Company Cards',
+                description: `Company cards lets you import spend for existing company cards from all major card issuers. You can assign cards to employees, and automatically import transactions.`,
+                onlyAvailableOnPlan: 'Company cards are only available on the Control plan, starting at ',
+            },
+            rules: {
+                title: 'Rules',
+                description: `Rules run in the background and keep your spend under control so you don't have to sweat the small stuff.\n\nRequire expense details like receipts and descriptions, set limits and defaults, and automate approvals and payments – all in one place.`,
+                onlyAvailableOnPlan: 'Rules are only available on the Control plan, starting at ',
+            },
+            pricing: {
+                amount: '$9 ',
+                perActiveMember: 'per active member per month.',
+            },
+            note: {
+                upgradeWorkspace: 'Upgrade your workspace to access this feature, or',
+                learnMore: 'learn more',
+                aboutOurPlans: 'about our plans and pricing.',
+            },
+            upgradeToUnlock: 'Unlock this feature',
+            completed: {
+                headline: `You've upgraded your workspace!`,
+                successMessage: (policyName: string) => `You've successfully upgraded your ${policyName} workspace to the Control plan!`,
+                viewSubscription: 'View your subscription',
+                moreDetails: 'for more details.',
+                gotIt: 'Got it, thanks',
+            },
+        },
+        restrictedAction: {
+            restricted: 'Restricted',
+            actionsAreCurrentlyRestricted: ({workspaceName}) => `Actions on the ${workspaceName} workspace are currently restricted`,
+            workspaceOwnerWillNeedToAddOrUpdatePaymentCard: ({workspaceOwnerName}) =>
+                `Workspace owner, ${workspaceOwnerName} will need to add or update the payment card on file to unlock new workspace activity.`,
+            youWillNeedToAddOrUpdatePaymentCard: "You'll need to add or update the payment card on file to unlock new workspace activity.",
+            addPaymentCardToUnlock: 'Add a payment card to unlock!',
+            addPaymentCardToContinueUsingWorkspace: 'Add a payment card to continue using this workspace',
+            pleaseReachOutToYourWorkspaceAdmin: 'Please reach out to your workspace admin for any questions.',
+            chatWithYourAdmin: 'Chat with your admin',
+            chatInAdmins: 'Chat in #admins',
+            addPaymentCard: 'Add payment card',
+        },
+        rules: {
+            individualExpenseRules: {
+                title: 'Expenses',
+                subtitle: 'Set spend controls and defaults for individual expenses. You can also create rules for',
+                receiptRequiredAmount: 'Receipt required amount',
+                receiptRequiredAmountDescription: 'Require receipts when spend exceeds this amount, unless overridden by a category rule.',
+                maxExpenseAmount: 'Max expense amount',
+                maxExpenseAmountDescription: 'Flag spend that exceeds this amount, unless overridden by a category rule.',
+                maxAge: 'Max age',
+                maxExpenseAge: 'Max expense age',
+                maxExpenseAgeDescription: 'Flag spend older than a specific number of days.',
+                maxExpenseAgeDays: (age: number) => `${age} ${Str.pluralize('day', 'days', age)}`,
+                billableDefault: 'Billable default',
+                billableDefaultDescription: 'Choose whether cash and credit card expenses should be billable by default. Billable expenses are enabled or disabled in',
+                billable: 'Billable',
+                billableDescription: 'Expenses are most often re-billed to clients',
+                nonBillable: 'Non-billable',
+                nonBillableDescription: 'Expenses are occasionally re-billed to clients',
+                eReceipts: 'eReceipts',
+                eReceiptsHint: 'eReceipts are auto-created',
+                eReceiptsHintLink: 'for most USD credit transactions',
+            },
+            expenseReportRules: {
+                title: 'Expense reports',
+                subtitle: 'Automate expense report compliance, approvals, and payment.',
+            },
+        },
     },
     getAssistancePage: {
         title: 'Get assistance',
@@ -2525,14 +3681,14 @@ export default {
         createRoom: 'Create room',
         roomAlreadyExistsError: 'A room with this name already exists.',
         roomNameReservedError: ({reservedName}: RoomNameReservedErrorParams) => `${reservedName} is a default room on all workspaces. Please choose another name.`,
-        roomNameInvalidError: 'Room names can only include lowercase letters, numbers and hyphens.',
+        roomNameInvalidError: 'Room names can only include lowercase letters, numbers, and hyphens.',
         pleaseEnterRoomName: 'Please enter a room name.',
         pleaseSelectWorkspace: 'Please select a workspace.',
-        renamedRoomAction: ({oldName, newName}: RenamedRoomActionParams) => ` renamed this room from ${oldName} to ${newName}`,
+        renamedRoomAction: ({oldName, newName}: RenamedRoomActionParams) => `renamed this room from ${oldName} to ${newName}`,
         roomRenamedTo: ({newName}: RoomRenamedToParams) => `Room renamed to ${newName}`,
         social: 'social',
         selectAWorkspace: 'Select a workspace',
-        growlMessageOnRenameError: 'Unable to rename policy room, please check your connection and try again.',
+        growlMessageOnRenameError: 'Unable to rename workspace room. Please check your connection and try again.',
         visibilityOptions: {
             restricted: 'Workspace', // the translation for "restricted" visibility is actually workspace. This is so we can display restricted visibility rooms as "workspace" without having to change what's stored.
             private: 'Private',
@@ -2541,10 +3697,16 @@ export default {
             public_announce: 'Public Announce',
         },
     },
+    workspaceActions: {
+        renamedWorkspaceNameAction: ({oldName, newName}) => `updated the name of this workspace from ${oldName} to ${newName}`,
+    },
     roomMembersPage: {
-        memberNotFound: 'Member not found. To invite a new member to the room, please use the Invite button above.',
-        notAuthorized: `You do not have access to this page. Are you trying to join the room? Please reach out to a member of this room so they can add you as a member! Something else? Reach out to ${CONST.EMAIL.CONCIERGE}`,
+        memberNotFound: 'Member not found. To invite a new member to the room, please use the invite button above.',
+        notAuthorized: `You don't have access to this page. If you're trying to join this room, just ask a room member to add you. Something else? Reach out to ${CONST.EMAIL.CONCIERGE}`,
         removeMembersPrompt: 'Are you sure you want to remove the selected members from the room?',
+        error: {
+            genericAdd: 'There was a problem adding this room member.',
+        },
     },
     newTaskPage: {
         assignTask: 'Assign task',
@@ -2552,9 +3714,8 @@ export default {
         confirmTask: 'Confirm task',
         confirmError: 'Please enter a title and select a share destination.',
         descriptionOptional: 'Description (optional)',
-        shareSomewhere: 'Share somewhere',
         pleaseEnterTaskName: 'Please enter a title',
-        pleaseEnterTaskDestination: 'Please select with whom you want to share.',
+        pleaseEnterTaskDestination: 'Please select where you want to share this task.',
     },
     task: {
         task: 'Task',
@@ -2567,18 +3728,18 @@ export default {
             completed: 'marked as complete',
             canceled: 'deleted task',
             reopened: 'marked as incomplete',
-            error: 'You do not have the permission to do the requested action.',
+            error: "You don't have permission to take the requested action.",
         },
         markAsComplete: 'Mark as complete',
         markAsIncomplete: 'Mark as incomplete',
-        assigneeError: 'There was an error assigning this task, please try another assignee.',
-        genericCreateTaskFailureMessage: 'Unexpected error create task, please try again later.',
+        assigneeError: 'An error occurred while assigning this task. Please try another assignee.',
+        genericCreateTaskFailureMessage: 'There was an error creating this task. Please try again later.',
         deleteTask: 'Delete task',
-        deleteConfirmation: 'Are you sure that you want to delete this task?',
+        deleteConfirmation: 'Are you sure you want to delete this task?',
     },
     statementPage: {
         title: (year, monthName) => `${monthName} ${year} statement`,
-        generatingPDF: "We're generating your PDF right now. Please come back later!",
+        generatingPDF: "We're generating your PDF right now. Please check back soon!",
     },
     keyboardShortcutsPage: {
         title: 'Keyboard shortcuts',
@@ -2589,6 +3750,7 @@ export default {
             search: 'Open search dialog',
             newChat: 'New chat screen',
             copy: 'Copy comment',
+            openDebug: 'Open testing preferences dialog',
         },
     },
     guides: {
@@ -2597,17 +3759,47 @@ export default {
     },
     search: {
         resultsAreLimited: 'Search results are limited.',
+        viewResults: 'View results',
         searchResults: {
             emptyResults: {
                 title: 'Nothing to show',
                 subtitle: 'Try creating something using the green + button.',
             },
+            emptyTripResults: {
+                title: 'No trips to display',
+                subtitle: 'Get started by booking your first trip below.',
+                buttonText: 'Book a trip',
+            },
+        },
+        groupedExpenses: 'grouped expenses',
+        bulkActions: {
+            delete: 'Delete',
+            hold: 'Hold',
+            unhold: 'Unhold',
+            noOptionsAvailable: 'No options available for the selected group of expenses.',
+        },
+        filtersHeader: 'Filters',
+        filters: {
+            date: {
+                before: (date?: string) => `Before ${date ?? ''}`,
+                after: (date?: string) => `After ${date ?? ''}`,
+            },
+            status: 'Status',
+            keyword: 'Keyword',
+            hasKeywords: 'Has keywords',
+            currency: 'Currency',
+            amount: {
+                lessThan: (amount?: string) => `Less than ${amount ?? ''}`,
+                greaterThan: (amount?: string) => `Greater than ${amount ?? ''}`,
+                between: (greaterThan: string, lessThan: string) => `Between ${greaterThan} and ${lessThan}`,
+            },
         },
+        expenseType: 'Expense type',
     },
     genericErrorPage: {
         title: 'Uh-oh, something went wrong!',
         body: {
-            helpTextMobile: 'Please try closing and reopening the app or switching to',
+            helpTextMobile: 'Please close and reopen the app, or switch to',
             helpTextWeb: 'web.',
             helpTextConcierge: 'If the problem persists, reach out to',
         },
@@ -2620,12 +3812,12 @@ export default {
             qrMessage: 'Check your photos or downloads folder for a copy of your QR code. Protip: Add it to a presentation for your audience to scan and connect with you directly.',
         },
         generalError: {
-            title: 'Attachment Error',
-            message: 'Attachment cannot be downloaded.',
+            title: 'Attachment error',
+            message: "Attachment can't be downloaded.",
         },
         permissionError: {
             title: 'Storage access',
-            message: "Expensify can't save attachments without storage access. Tap Settings to update permissions.",
+            message: "Expensify can't save attachments without storage access. Tap settings to update permissions.",
         },
     },
     desktopApplicationMenu: {
@@ -2681,27 +3873,65 @@ export default {
     },
     checkForUpdatesModal: {
         available: {
-            title: 'Update Available',
+            title: 'Update available',
             message: ({isSilentUpdating}: {isSilentUpdating: boolean}) =>
                 `The new version will be available shortly.${!isSilentUpdating ? " We'll notify you when we're ready to update." : ''}`,
             soundsGood: 'Sounds good',
         },
         notAvailable: {
-            title: 'Update Not Available',
-            message: 'There is no update available as of now! Check again at a later time.',
+            title: 'Update unavailable',
+            message: "There's no update available right now. Please check back later!",
             okay: 'Okay',
         },
         error: {
-            title: 'Update Check Failed.',
-            message: "We couldn't look for an update. Please check again in a bit!.",
+            title: 'Update check failed.',
+            message: "We couldn't check for an update. Please try again in a bit.",
         },
     },
     report: {
-        genericCreateReportFailureMessage: 'Unexpected error creating this chat, please try again later.',
-        genericAddCommentFailureMessage: 'Unexpected error while posting the comment, please try again later.',
-        genericUpdateReportFieldFailureMessage: 'Unexpected error while updating the field, please try again later.',
-        genericUpdateReporNameEditFailureMessage: 'Unexpected error while renaming the report, please try again later.',
+        genericCreateReportFailureMessage: 'Unexpected error creating this chat. Please try again later.',
+        genericAddCommentFailureMessage: 'Unexpected error posting the comment. Please try again later.',
+        genericUpdateReportFieldFailureMessage: 'Unexpected error updating the field. Please try again later.',
+        genericUpdateReporNameEditFailureMessage: 'Unexpected error renaming the report. Please try again later.',
         noActivityYet: 'No activity yet',
+        actions: {
+            type: {
+                changeField: ({oldValue, newValue, fieldName}: ChangeFieldParams) => `changed ${fieldName} from ${oldValue} to ${newValue}`,
+                changeFieldEmpty: ({newValue, fieldName}: ChangeFieldParams) => `changed ${fieldName} to ${newValue}`,
+                changePolicy: ({fromPolicy, toPolicy}: ChangePolicyParams) => `changed workspace from ${fromPolicy} to ${toPolicy}`,
+                changeType: ({oldType, newType}: ChangeTypeParams) => `changed type from ${oldType} to ${newType}`,
+                delegateSubmit: ({delegateUser, originalManager}: DelegateSubmitParams) => `sent this report to ${delegateUser} since ${originalManager} is on vacation`,
+                exportedToCSV: `exported this report to CSV`,
+                exportedToIntegration: {
+                    automatic: ({label}: ExportedToIntegrationParams) => `exported this report to ${label}.`,
+                    manual: ({label}: ExportedToIntegrationParams) => `marked this report as manually exported to ${label}.`,
+                    reimburseableLink: 'View out-of-pocket expenses.',
+                    nonReimbursableLink: 'View company card expenses.',
+                    pending: ({label}: ExportedToIntegrationParams) => `started exporting this report to ${label}...`,
+                },
+                integrationsMessage: (errorMessage: string, label: string) => `failed to export this report to ${label} ("${errorMessage}").`,
+                managerAttachReceipt: `added a receipt`,
+                managerDetachReceipt: `removed a receipt`,
+                markedReimbursed: ({amount, currency}: MarkedReimbursedParams) => `paid ${currency}${amount} elsewhere`,
+                markedReimbursedFromIntegration: ({amount, currency}: MarkReimbursedFromIntegrationParams) => `paid ${currency}${amount} via integration`,
+                outdatedBankAccount: `couldn’t process the payment due to a problem with the payer’s bank account`,
+                reimbursementACHBounce: `couldn’t process the payment, as the payer doesn’t have sufficient funds`,
+                reimbursementACHCancelled: `canceled the payment`,
+                reimbursementAccountChanged: `couldn’t process the payment, as the payer changed bank accounts`,
+                reimbursementDelayed: `processed the payment but it’s delayed by 1-2 more business days`,
+                selectedForRandomAudit: `randomly selected for review`,
+                selectedForRandomAuditMarkdown: `[randomly selected](https://help.expensify.com/articles/expensify-classic/reports/Set-a-random-report-audit-schedule) for review`,
+                share: ({to}: ShareParams) => `invited member ${to}`,
+                unshare: ({to}: UnshareParams) => `removed user ${to}`,
+                stripePaid: ({amount, currency}: StripePaidParams) => `paid ${currency}${amount}`,
+                takeControl: `took control`,
+                unapproved: ({amount, currency}: UnapprovedParams) => `unapproved ${currency}${amount}`,
+                integrationSyncFailed: (label: string, errorMessage: string) => `failed to sync with ${label} ("${errorMessage}")`,
+                addEmployee: (email: string, role: string) => `added ${email} as ${role === 'user' ? 'member' : 'admin'}`,
+                updateRole: (email: string, currentRole: string, newRole: string) => `updated the role of ${email} from ${currentRole} to ${newRole}`,
+                removeMember: (email: string, role: string) => `removed ${role} ${email}`,
+            },
+        },
     },
     chronos: {
         oooEventSummaryFullDay: ({summary, dayCount, date}: OOOEventSummaryFullDayParams) => `${summary} for ${dayCount} ${dayCount === 1 ? 'day' : 'days'} until ${date}`,
@@ -2809,7 +4039,8 @@ export default {
     },
     teachersUnitePage: {
         teachersUnite: 'Teachers Unite',
-        joinExpensifyOrg: 'Join Expensify.org in eliminating injustice around the world and help teachers split their expenses for classrooms in need!',
+        joinExpensifyOrg:
+            'Join Expensify.org in eliminating injustice around the world. The current "Teachers Unite" campaign supports educators everywhere by splitting the costs of essential school supplies.',
         iKnowATeacher: 'I know a teacher',
         iAmATeacher: 'I am a teacher',
         getInTouch: 'Excellent! Please share their information so we can get in touch with them.',
@@ -2860,8 +4091,8 @@ export default {
         reasonTitle: 'Why do you need a new card?',
         cardDamaged: 'My card was damaged',
         cardLostOrStolen: 'My card was lost or stolen',
-        confirmAddressTitle: "Please confirm the address below is where you'd like us to send your new card.",
-        cardDamagedInfo: 'Your new card will arrive in 2-3 business days, and your existing card will continue to work until you activate your new one.',
+        confirmAddressTitle: 'Please confirm the mailing address for your new card.',
+        cardDamagedInfo: 'Your new card will arrive in 2-3 business days. Your current card will continue to work until you activate your new one.',
         cardLostOrStolenInfo: 'Your current card will be permanently deactivated as soon as your order is placed. Most cards arrive in a few business days.',
         address: 'Address',
         deactivateCardButton: 'Deactivate card',
@@ -2881,7 +4112,7 @@ export default {
             body: `Get paid to talk to your friends! Start a chat with a new Expensify account and get $${CONST.REFERRAL_PROGRAM.REVENUE} when they become a customer.`,
         },
         [CONST.REFERRAL_PROGRAM.CONTENT_TYPES.SUBMIT_EXPENSE]: {
-            buttonText1: 'Submit expense, ',
+            buttonText1: 'Submit an expense, ',
             buttonText2: `get $${CONST.REFERRAL_PROGRAM.REVENUE}.`,
             header: `Submit an expense, get $${CONST.REFERRAL_PROGRAM.REVENUE}`,
             body: `It pays to get paid! Submit an expense to a new Expensify account and get $${CONST.REFERRAL_PROGRAM.REVENUE} when they become a customer.`,
@@ -2923,7 +4154,7 @@ export default {
         categoryOutOfPolicy: 'Category no longer valid',
         conversionSurcharge: ({surcharge}: ViolationsConversionSurchargeParams) => `Applied ${surcharge}% conversion surcharge`,
         customUnitOutOfPolicy: 'Unit no longer valid',
-        duplicatedTransaction: 'Potential duplicate',
+        duplicatedTransaction: 'Duplicate',
         fieldRequired: 'Report fields are required',
         futureDate: 'Future date not allowed',
         invoiceMarkup: ({invoiceMarkup}: ViolationsInvoiceMarkupParams) => `Marked up by ${invoiceMarkup}%`,
@@ -2931,7 +4162,19 @@ export default {
         missingCategory: 'Missing category',
         missingComment: 'Description required for selected category',
         missingTag: ({tagName}: ViolationsMissingTagParams) => `Missing ${tagName ?? 'tag'}`,
-        modifiedAmount: 'Amount greater than scanned receipt',
+        modifiedAmount: ({type, displayPercentVariance}: ViolationsModifiedAmountParams): string => {
+            switch (type) {
+                case 'distance':
+                    return 'Amount differs from calculated distance';
+                case 'card':
+                    return 'Amount greater than card transaction';
+                default:
+                    if (displayPercentVariance) {
+                        return `Amount ${displayPercentVariance}% greater than scanned receipt`;
+                    }
+                    return 'Amount greater than scanned receipt';
+            }
+        },
         modifiedDate: 'Date differs from scanned receipt',
         nonExpensiworksExpense: 'Non-Expensiworks expense',
         overAutoApprovalLimit: ({formattedLimit}: ViolationsOverLimitParams) => `Expense exceeds auto approval limit of ${formattedLimit}`,
@@ -2940,7 +4183,19 @@ export default {
         overLimitAttendee: ({formattedLimit}: ViolationsOverLimitParams) => `Amount over ${formattedLimit}/person limit`,
         perDayLimit: ({formattedLimit}: ViolationsPerDayLimitParams) => `Amount over daily ${formattedLimit}/person category limit`,
         receiptNotSmartScanned: 'Receipt not verified. Please confirm accuracy.',
-        receiptRequired: (params: ViolationsReceiptRequiredParams) => `Receipt required${params ? ` over ${params.formattedLimit}${params.category ? ' category limit' : ''}` : ''}`,
+        receiptRequired: ({formattedLimit, category}: ViolationsReceiptRequiredParams) => {
+            let message = 'Receipt required';
+            if (formattedLimit ?? category) {
+                message += ' over';
+                if (formattedLimit) {
+                    message += ` ${formattedLimit}`;
+                }
+                if (category) {
+                    message += ' category limit';
+                }
+            }
+            return message;
+        },
         reviewRequired: 'Review required',
         rter: ({brokenBankConnection, email, isAdmin, isTransactionOlderThan7Days, member}: ViolationsRterParams) => {
             if (brokenBankConnection) {
@@ -2961,11 +4216,29 @@ export default {
         taxOutOfPolicy: ({taxName}: ViolationsTaxOutOfPolicyParams) => `${taxName ?? 'Tax'} no longer valid`,
         taxRateChanged: 'Tax rate was modified',
         taxRequired: 'Missing tax rate',
+        none: 'None',
+        taxCodeToKeep: 'Choose which tax code to keep',
+        tagToKeep: 'Choose which tag to keep',
+        isTransactionReimbursable: 'Choose if transaction is reimbursable',
+        merchantToKeep: 'Choose which merchant to keep',
+        descriptionToKeep: 'Choose which description to keep',
+        categoryToKeep: 'Choose which category to keep',
+        isTransactionBillable: 'Choose if transaction is billable',
+        keepThisOne: 'Keep this one',
+        confirmDetails: `Confirm the details you're keeping`,
+        confirmDuplicatesInfo: `The duplicate requests you don't keep will be held for the member to delete`,
+        hold: 'Hold',
+    },
+    reportViolations: {
+        [CONST.REPORT_VIOLATIONS.FIELD_REQUIRED]: (fieldName: string) => `${fieldName} is required`,
     },
     violationDismissal: {
         rter: {
             manual: 'marked this receipt as cash.',
         },
+        duplicatedTransaction: {
+            manual: 'resolved the duplicate',
+        },
     },
     videoPlayer: {
         play: 'Play',
@@ -2975,6 +4248,7 @@ export default {
         expand: 'Expand',
         mute: 'Mute',
         unmute: 'Unmute',
+        normal: 'Normal',
     },
     exitSurvey: {
         header: 'Before you go',
@@ -3000,7 +4274,233 @@ export default {
         offline:
             "You appear to be offline. Unfortunately, Expensify Classic doesn't work offline, but New Expensify does. If you prefer to use Expensify Classic, try again when you have an internet connection.",
     },
+    listBoundary: {
+        errorMessage: 'An error occurred while loading more messages.',
+        tryAgain: 'Try again',
+    },
     systemMessage: {
         mergedWithCashTransaction: 'matched a receipt to this transaction.',
     },
+    subscription: {
+        authenticatePaymentCard: 'Authenticate payment card',
+        mobileReducedFunctionalityMessage: 'You can’t make changes to your subscription in the mobile app.',
+        badge: {
+            freeTrial: ({numOfDays}) => `Free trial: ${numOfDays} ${numOfDays === 1 ? 'day' : 'days'} left`,
+        },
+        billingBanner: {
+            policyOwnerAmountOwed: {
+                title: 'Your payment info is outdated',
+                subtitle: ({date}) => `Update your payment card by ${date} to continue using all of your favorite features.`,
+            },
+            policyOwnerAmountOwedOverdue: {
+                title: 'Your payment info is outdated',
+                subtitle: 'Please update your payment information.',
+            },
+            policyOwnerUnderInvoicing: {
+                title: 'Your payment info is outdated',
+                subtitle: ({date}) => `Your payment is past due. Please pay your invoice by ${date} to avoid service interruption.`,
+            },
+            policyOwnerUnderInvoicingOverdue: {
+                title: 'Your payment info is outdated',
+                subtitle: 'Your payment is past due. Please pay your invoice.',
+            },
+            billingDisputePending: {
+                title: 'Your card couldn’t be charged',
+                subtitle: ({amountOwed, cardEnding}) =>
+                    `You disputed the ${amountOwed} charge on the card ending in ${cardEnding}. Your account will be locked until the dispute is resolved with your bank.`,
+            },
+            cardAuthenticationRequired: {
+                title: 'Your card couldn’t be charged',
+                subtitle: ({cardEnding}) =>
+                    `Your payment card hasn’t been fully authenticated. Please complete the authentication process to activate your payment card ending in ${cardEnding}.`,
+            },
+            insufficientFunds: {
+                title: 'Your card couldn’t be charged',
+                subtitle: ({amountOwed}) =>
+                    `Your payment card was declined due to insufficient funds. Please retry or add a new payment card to clear your ${amountOwed} outstanding balance.`,
+            },
+            cardExpired: {
+                title: 'Your card couldn’t be charged',
+                subtitle: ({amountOwed}) => `Your payment card expired. Please add a new payment card to clear your ${amountOwed} outstanding balance.`,
+            },
+            cardExpireSoon: {
+                title: 'Your card is expiring soon',
+                subtitle: 'Your payment card will expire at the end of this month. Click the three-dot menu below to update it and continue using all your favorite features.',
+            },
+            retryBillingSuccess: {
+                title: 'Success!',
+                subtitle: 'Your card has been billed successfully.',
+            },
+            retryBillingError: {
+                title: 'Your card couldn’t be charged',
+                subtitle: 'Before retrying, please call your bank directly to authorize Expensify charges and remove any holds. Otherwise, try adding a different payment card.',
+            },
+            cardOnDispute: ({amountOwed, cardEnding}) =>
+                `You disputed the ${amountOwed} charge on the card ending in ${cardEnding}. Your account will be locked until the dispute is resolved with your bank.`,
+            preTrial: {
+                title: 'Start a free trial',
+                subtitleStart: 'As a next step, ',
+                subtitleLink: 'complete your setup checklist ',
+                subtitleEnd: 'so your team can start expensing.',
+            },
+            trialStarted: {
+                title: ({numOfDays}) => `Free trial: ${numOfDays} ${numOfDays === 1 ? 'day' : 'days'} left!`,
+                subtitle: 'Add a payment card to continue using all of your favorite features.',
+            },
+            trialEnded: {
+                title: 'Your free trial has ended',
+                subtitle: 'Add a payment card to continue using all of your favorite features.',
+            },
+        },
+        cardSection: {
+            title: 'Payment',
+            subtitle: 'Add a card to pay for your Expensify subscription.',
+            addCardButton: 'Add payment card',
+            cardNextPayment: ({nextPaymentDate}) => `Your next payment date is ${nextPaymentDate}.`,
+            cardEnding: ({cardNumber}) => `Card ending in ${cardNumber}`,
+            cardInfo: ({name, expiration, currency}) => `Name: ${name}, Expiration: ${expiration}, Currency: ${currency}`,
+            changeCard: 'Change payment card',
+            changeCurrency: 'Change payment currency',
+            cardNotFound: 'No payment card added',
+            retryPaymentButton: 'Retry payment',
+            authenticatePayment: 'Authenticate payment',
+            requestRefund: 'Request refund',
+            requestRefundModal: {
+                phrase1: 'Getting a refund is easy, just downgrade your account before your next billing date and you’ll receive a refund.',
+                phrase2:
+                    'Heads up: Downgrading your account means your workspace(s) will be deleted. This action can’t be undone, but you can always create a new workspace if you change your mind.',
+                confirm: 'Delete workspace(s) and downgrade',
+            },
+            viewPaymentHistory: 'View payment history',
+        },
+        yourPlan: {
+            title: 'Your plan',
+            collect: {
+                title: 'Collect',
+                priceAnnual: ({lower, upper}) => `From ${lower}/active member with the Expensify Card, ${upper}/active member without the Expensify Card.`,
+                pricePayPerUse: ({lower, upper}) => `From ${lower}/active member with the Expensify Card, ${upper}/active member without the Expensify Card.`,
+                benefit1: 'Unlimited SmartScans and distance tracking',
+                benefit2: 'Expensify Cards with Smart Limits',
+                benefit3: 'Bill pay and invoicing',
+                benefit4: 'Expense approvals',
+                benefit5: 'ACH reimbursement',
+                benefit6: 'QuickBooks and Xero integrations',
+                benefit7: 'Custom insights and reporting',
+            },
+            control: {
+                title: 'Control',
+                priceAnnual: ({lower, upper}) => `From ${lower}/active member with the Expensify Card, ${upper}/active member without the Expensify Card.`,
+                pricePayPerUse: ({lower, upper}) => `From ${lower}/active member with the Expensify Card, ${upper}/active member without the Expensify Card.`,
+                benefit1: 'Everything in Collect, plus:',
+                benefit2: 'NetSuite and Sage Intacct integrations',
+                benefit3: 'Certinia and Workday sync',
+                benefit4: 'Multiple expense approvers',
+                benefit5: 'SAML/SSO',
+                benefit6: 'Budgeting',
+            },
+            saveWithExpensifyTitle: 'Save with the Expensify Card',
+            saveWithExpensifyDescription: 'Use our savings calculator to see how cash back from the Expensify Card can reduce your Expensify bill.',
+            saveWithExpensifyButton: 'Learn more',
+        },
+        details: {
+            title: 'Subscription details',
+            annual: 'Annual subscription',
+            taxExempt: 'Request tax exempt status',
+            taxExemptEnabled: 'Tax exempt',
+            payPerUse: 'Pay-per-use',
+            subscriptionSize: 'Subscription size',
+            headsUp:
+                "Heads up: If you don’t set your subscription size now, we’ll set it automatically to your first month's active member count. You’ll then be committed to paying for at least this number of members for the next 12 months. You can increase your subscription size at any time, but you can’t decrease it until your subscription is over.",
+            zeroCommitment: 'Zero commitment at the discounted annual subscription rate',
+        },
+        subscriptionSize: {
+            title: 'Subscription size',
+            yourSize: 'Your subscription size is the number of open seats that can be filled by any active member in a given month.',
+            eachMonth:
+                'Each month, your subscription covers up to the number of active members set above. Any time you increase your subscription size, you’ll start a new 12-month subscription at that new size.',
+            note: 'Note: An active member is anyone who has created, edited, submitted, approved, reimbursed, or exported expense data tied to your company workspace.',
+            confirmDetails: 'Confirm your new annual subscription details:',
+            subscriptionSize: 'Subscription size',
+            activeMembers: ({size}) => `${size} active members/month`,
+            subscriptionRenews: 'Subscription renews',
+            youCantDowngrade: 'You can’t downgrade during your annual subscription.',
+            youAlreadyCommitted: ({size, date}) =>
+                `You already committed to an annual subscription size of ${size} active members per month until ${date}. You can switch to a pay-per-use subscription on ${date} by disabling auto-renew.`,
+            error: {
+                size: 'Please enter a valid subscription size.',
+                sameSize: 'Please enter a number different than your current subscription size.',
+            },
+        },
+        paymentCard: {
+            addPaymentCard: 'Add payment card',
+            enterPaymentCardDetails: 'Enter your payment card details',
+            security: 'Expensify is PCI-DSS compliant, uses bank-level encryption, and utilizes redundant infrastructure to protect your data.',
+            learnMoreAboutSecurity: 'Learn more about our security.',
+        },
+        subscriptionSettings: {
+            title: 'Subscription settings',
+            autoRenew: 'Auto-renew',
+            autoIncrease: 'Auto-increase annual seats',
+            saveUpTo: ({amountWithCurrency}) => `Save up to ${amountWithCurrency}/month per active member`,
+            automaticallyIncrease:
+                'Automatically increase your annual seats to accommodate for active members that exceed your subscription size. Note: This will extend your annual subscription end date.',
+            disableAutoRenew: 'Disable auto-renew',
+            helpUsImprove: 'Help us improve Expensify',
+            whatsMainReason: "What's the main reason you're disabling auto-renew?",
+            renewsOn: ({date}) => `Renews on ${date}.`,
+        },
+        requestEarlyCancellation: {
+            title: 'Request early cancellation',
+            subtitle: 'What’s the main reason you’re requesting early cancellation?',
+            subscriptionCanceled: {
+                title: 'Subscription canceled',
+                subtitle: 'Your annual subscription has been canceled.',
+                info: 'If you want to keep using your workspace(s) on a pay-per-use basis, you’re all set.',
+                preventFutureActivity: {
+                    part1: 'If you’d like to prevent future activity and charges, you must ',
+                    link: 'delete your workspace(s)',
+                    part2: '. Note that when you delete your workspace(s), you’ll be charged for any outstanding activity that was incurred during the current calendar month.',
+                },
+            },
+            requestSubmitted: {
+                title: 'Request submitted',
+                subtitle: {
+                    part1: 'Thanks for letting us know you’re interested in canceling your subscription. We’re reviewing your request and will be in touch soon via your chat with ',
+                    link: 'Concierge',
+                    part2: '.',
+                },
+            },
+            acknowledgement: {
+                part1: 'By requesting early cancellation, I acknowledge and agree that Expensify has no obligation to grant such request under the Expensify ',
+                link: 'Terms of Service',
+                part2: ' or other applicable services agreement between me and Expensify and that Expensify retains sole discretion with regard to granting any such request.',
+            },
+        },
+    },
+    feedbackSurvey: {
+        tooLimited: 'Functionality needs improvement',
+        tooExpensive: 'Too expensive',
+        inadequateSupport: 'Inadequate customer support',
+        businessClosing: 'Company closing, downsizing, or acquired',
+        additionalInfoTitle: 'What software are you moving to and why?',
+        additionalInfoInputLabel: 'Your response',
+    },
+    roomChangeLog: {
+        updateRoomDescription: 'set the room description to:',
+        clearRoomDescription: 'cleared the room description',
+    },
+    delegate: {
+        switchAccount: 'Switch accounts:',
+        role: (role: DelegateRole): string => {
+            switch (role) {
+                case CONST.DELEGATE_ROLE.ALL:
+                    return 'Full';
+                case CONST.DELEGATE_ROLE.SUBMITTER:
+                    return 'Limited';
+                default:
+                    return '';
+            }
+        },
+        genericError: 'Oops, something went wrong. Please try again.',
+    },
 } satisfies TranslationBase;
diff --git a/src/languages/es.ts b/src/languages/es.ts
index d4efe11a51b0..37f569dad09a 100644
--- a/src/languages/es.ts
+++ b/src/languages/es.ts
@@ -1,39 +1,50 @@
-import Str from 'expensify-common/lib/str';
+import {Str} from 'expensify-common';
 import CONST from '@src/CONST';
-import type {ConnectionName, PolicyConnectionSyncStage} from '@src/types/onyx/Policy';
+import type {DelegateRole} from '@src/types/onyx/Account';
+import type {ConnectionName, PolicyConnectionSyncStage, SageIntacctMappingName} from '@src/types/onyx/Policy';
 import type {
     AddressLineParams,
     AdminCanceledRequestParams,
     AlreadySignedInParams,
-    AmountEachParams,
+    ApprovalWorkflowErrorParams,
     ApprovedAmountParams,
     BeginningOfChatHistoryAdminRoomPartOneParams,
     BeginningOfChatHistoryAnnounceRoomPartOneParams,
     BeginningOfChatHistoryAnnounceRoomPartTwo,
     BeginningOfChatHistoryDomainRoomPartOneParams,
     CanceledRequestParams,
+    ChangeFieldParams,
+    ChangePolicyParams,
+    ChangeTypeParams,
     CharacterLimitParams,
+    ConfirmHoldExpenseParams,
     ConfirmThatParams,
     DateShouldBeAfterParams,
     DateShouldBeBeforeParams,
+    DelegateSubmitParams,
     DeleteActionParams,
     DeleteConfirmationParams,
+    DeleteExpenseTranslationParams,
     DidSplitAmountMessageParams,
     DistanceRateOperationsParams,
     EditActionParams,
     ElectronicFundsParams,
     EnglishTranslation,
     EnterMagicCodeParams,
+    ExportedToIntegrationParams,
     FormattedMaxLengthParams,
+    ForwardedAmountParams,
     GoBackMessageParams,
     GoToRoomParams,
     InstantSummaryParams,
+    IssueVirtualCardParams,
     LocalTimeParams,
     LoggedInAsParams,
     LogSizeParams,
     ManagerApprovedAmountParams,
     ManagerApprovedParams,
-    NewFaceEnterMagicCodeParams,
+    MarkedReimbursedParams,
+    MarkReimbursedFromIntegrationParams,
     NoLongerHaveAccessParams,
     NotAllowedExtensionParams,
     NotYouParams,
@@ -51,6 +62,7 @@ import type {
     PaySomeoneParams,
     ReimbursementRateParams,
     RemovedTheRequestParams,
+    RemoveMembersWarningPrompt,
     RenamedRoomActionParams,
     ReportArchiveReasonsClosedParams,
     ReportArchiveReasonsMergedParams,
@@ -66,26 +78,33 @@ import type {
     SetTheRequestParams,
     SettledAfterAddedBankAccountParams,
     SettleExpensifyCardParams,
+    ShareParams,
+    SignUpNewFaceCodeParams,
     SizeExceededParams,
     SplitAmountParams,
     StepCounterParams,
+    StripePaidParams,
     TaskCreatedActionParams,
     TermsParams,
     ThreadRequestReportNameParams,
     ThreadSentMoneyReportNameParams,
     ToValidateLoginParams,
     TransferParams,
+    UnapprovedParams,
+    UnshareParams,
     UntilTimeParams,
     UpdatedTheDistanceParams,
     UpdatedTheRequestParams,
     UsePlusButtonParams,
     UserIsAlreadyMemberParams,
+    UserSplitParams,
     ViolationsAutoReportedRejectedExpenseParams,
     ViolationsCashExpenseWithNoReceiptParams,
     ViolationsConversionSurchargeParams,
     ViolationsInvoiceMarkupParams,
     ViolationsMaxAgeParams,
     ViolationsMissingTagParams,
+    ViolationsModifiedAmountParams,
     ViolationsOverAutoApprovalLimitParams,
     ViolationsOverCategoryLimitParams,
     ViolationsOverLimitParams,
@@ -111,6 +130,7 @@ export default {
         yes: 'Sí',
         no: 'No',
         ok: 'OK',
+        notNow: 'Ahora no',
         learnMore: 'Más información',
         buttonConfirm: 'Ok, entendido',
         name: 'Nombre',
@@ -119,10 +139,12 @@ export default {
         to: 'A',
         optional: 'Opcional',
         new: 'Nuevo',
+        center: 'Centrar',
         search: 'Buscar',
         find: 'Encontrar',
         searchWithThreeDots: 'Buscar...',
         select: 'Seleccionar',
+        selectMultiple: 'Seleccionar varios',
         next: 'Siguiente',
         create: 'Crear',
         previous: 'Anterior',
@@ -138,7 +160,7 @@ export default {
         magicCode: 'Código mágico',
         twoFactorCode: 'Autenticación de dos factores',
         workspaces: 'Espacios de trabajo',
-        chats: 'Chats',
+        inbox: 'Recibidos',
         group: 'Grupo',
         profile: 'Perfil',
         referral: 'Remisión',
@@ -146,7 +168,10 @@ export default {
         wallet: 'Billetera',
         preferences: 'Preferencias',
         view: 'Ver',
+        review: 'Revisar',
         not: 'No',
+        privacyPolicy: 'la Política de Privacidad de Expensify',
+        addCardTermsOfService: 'Términos de Servicio',
         signIn: 'Conectarse',
         signInWithGoogle: 'Iniciar sesión con Google',
         signInWithApple: 'Iniciar sesión con Apple',
@@ -176,7 +201,6 @@ export default {
         saveAndContinue: 'Guardar y continuar',
         settings: 'Configuración',
         termsOfService: 'Términos de Servicio',
-        expensifyTermsOfService: 'Términos de Servicio de Expensify',
         members: 'Miembros',
         invite: 'Invitar',
         here: 'aquí',
@@ -184,7 +208,7 @@ export default {
         dob: 'Fecha de nacimiento',
         currentYear: 'Año actual',
         currentMonth: 'Mes actual',
-        ssnLast4: 'Últimos 4 dígitos de su SSN',
+        ssnLast4: 'Últimos 4 dígitos de tu SSN',
         ssnFull9: 'Los 9 dígitos del SSN',
         addressLine: ({lineNumber}: AddressLineParams) => `Dirección línea ${lineNumber}`,
         personalAddress: 'Dirección física personal',
@@ -214,6 +238,7 @@ export default {
         tomorrowAt: 'Mañana a las',
         yesterdayAt: 'Ayer a las',
         conjunctionAt: 'a',
+        conjunctionTo: 'a',
         genericErrorMessage: 'Ups... algo no ha ido bien y la acción no se ha podido completar. Por favor, inténtalo más tarde.',
         error: {
             invalidAmount: 'Importe no válido.',
@@ -231,6 +256,8 @@ export default {
             enterAmount: 'Introduce un importe.',
             enterDate: 'Introduce una fecha.',
             invalidTimeRange: 'Por favor, introduce una hora entre 1 y 12 (por ejemplo, 2:30 PM).',
+            pleaseCompleteForm: 'Por favor complete el formulario de arriba para continuar.',
+            pleaseSelectOne: 'Seleccione una de las opciones.',
         },
         comma: 'la coma',
         semicolon: 'el punto y coma',
@@ -260,7 +287,8 @@ export default {
         your: 'tu',
         conciergeHelp: 'Por favor, contacta con Concierge para obtener ayuda.',
         youAppearToBeOffline: 'Parece que estás desconectado.',
-        thisFeatureRequiresInternet: 'Esta función requiere una conexión a Internet activa para ser utilizada.',
+        thisFeatureRequiresInternet: 'Esta función requiere una conexión a Internet activa.',
+        attachementWillBeAvailableOnceBackOnline: 'El archivo adjunto estará disponible cuando vuelvas a estar en línea.',
         areYouSure: '¿Estás seguro?',
         verify: 'Verifique',
         yesContinue: 'Sí, continuar',
@@ -321,14 +349,34 @@ export default {
         type: 'Tipo',
         action: 'Acción',
         expenses: 'Gastos',
+        tax: 'Impuesto',
+        shared: 'Compartidos',
+        drafts: 'Borradores',
+        finished: 'Finalizados',
+        upgrade: 'Mejora',
+        companyID: 'Empresa ID',
+        userID: 'Usuario ID',
+        disable: 'Deshabilitar',
+        export: 'Exportar',
+        initialValue: 'Valor inicial',
+        currentDate: 'Fecha actual',
+        value: 'Valor',
+        downloadFailedTitle: 'Error en la descarga',
+        downloadFailedDescription: 'No se pudo completar la descarga. Por favor, inténtalo más tarde.',
+        filterLogs: 'Registros de filtrado',
+        network: 'La red',
+        reportID: 'ID del informe',
+        offlinePrompt: 'No puedes realizar esta acción ahora mismo.',
+        outstanding: 'Pendiente',
+        days: 'días',
     },
     connectionComplete: {
-        title: 'Conexión Completa',
+        title: 'Conexión completa',
         supportingText: 'Ya puedes cerrar esta página y volver a la App de Expensify.',
     },
     location: {
         useCurrent: 'Usar ubicación actual',
-        notFound: 'No pudimos encontrar tu ubicación, inténtalo de nuevo o introduce una dirección manualmente.',
+        notFound: 'No pudimos encontrar tu ubicación. Inténtalo de nuevo o introduce una dirección manualmente.',
         permissionDenied: 'Parece que has denegado el permiso a tu ubicación.',
         please: 'Por favor,',
         allowPermission: 'habilita el permiso de ubicación en la configuración',
@@ -339,13 +387,13 @@ export default {
     },
     attachmentPicker: {
         cameraPermissionRequired: 'Permiso para acceder a la cámara',
-        expensifyDoesntHaveAccessToCamera: 'Expensify no puede tomar fotos sin acceso a la cámara. Haz click en Configuración para actualizar los permisos.',
+        expensifyDoesntHaveAccessToCamera: 'Expensify no puede tomar fotos sin acceso a la cámara. Haz click en configuración para actualizar los permisos.',
         attachmentError: 'Error al adjuntar archivo',
-        errorWhileSelectingAttachment: 'Ha ocurrido un error al seleccionar un archivo adjunto. Por favor, inténtalo de nuevo.',
-        errorWhileSelectingCorruptedImage: 'Ha ocurrido un error al seleccionar un archivo adjunto corrupto. Por favor, inténtalo con otro archivo.',
+        errorWhileSelectingAttachment: 'Se ha producido un error al seleccionar un archivo adjunto. Por favor, inténtalo de nuevo.',
+        errorWhileSelectingCorruptedAttachment: 'Se ha producido un error al seleccionar un archivo adjunto corrupto. Por favor, inténtalo con otro archivo.',
         takePhoto: 'Hacer una foto',
         chooseFromGallery: 'Elegir de la galería',
-        chooseDocument: 'Elegir documento',
+        chooseDocument: 'Elegir un archivo',
         attachmentTooLarge: 'Archivo adjunto demasiado grande',
         sizeExceeded: 'El archivo adjunto supera el límite de 24 MB.',
         attachmentTooSmall: 'Archivo adjunto demasiado pequeño',
@@ -354,6 +402,8 @@ export default {
         notAllowedExtension: 'Este tipo de archivo no es compatible',
         folderNotAllowedMessage: 'Subir una carpeta no está permitido. Prueba con otro archivo.',
         protectedPDFNotSupported: 'Los PDFs con contraseña no son compatibles',
+        attachmentImageResized: 'Se ha cambiado el tamaño de esta imagen para obtener una vista previa. Descargar para resolución completa.',
+        attachmentImageTooLarge: 'Esta imagen es demasiado grande para obtener una vista previa antes de subirla.',
     },
     avatarCropModal: {
         title: 'Editar foto',
@@ -376,7 +426,7 @@ export default {
         youCanAlso: 'También puedes',
         openLinkInBrowser: 'abrir este enlace en tu navegador',
         loggedInAs: ({email}: LoggedInAsParams) =>
-            `Has iniciado sesión como ${email}. Haga clic en "Abrir enlace" en el aviso para iniciar sesión en la aplicación de escritorio con esta cuenta.`,
+            `Has iniciado sesión como ${email}. Haz clic en "Abrir enlace" en el aviso para iniciar sesión en la aplicación de escritorio con esta cuenta.`,
         doNotSeePrompt: '¿No ves el aviso?',
         tryAgain: 'Inténtalo de nuevo',
         or: ', o',
@@ -390,37 +440,55 @@ export default {
         description: 'Por favor, introduce el código utilizando el dispositivo\nen el que se solicitó originalmente',
         signInHere: 'simplemente inicia sesión aquí',
         expiredCodeTitle: 'Código mágico caducado',
-        expiredCodeDescription: 'Vuelve al dispositivo original y solicita un código nuevo.',
+        expiredCodeDescription: 'Vuelve al dispositivo original y solicita un código nuevo',
         successfulNewCodeRequest: 'Código solicitado. Por favor, comprueba tu dispositivo.',
         tfaRequiredTitle: 'Se requiere autenticación\nde dos factores',
         tfaRequiredDescription: 'Por favor, introduce el código de autenticación de dos factores\ndonde estás intentando iniciar sesión.',
+        requestOneHere: 'solicite uno aquí.',
     },
     moneyRequestConfirmationList: {
         paidBy: 'Pagado por',
-        splitWith: 'Dividir con',
-        splitAmounts: 'Importes a dividir',
         whatsItFor: '¿Para qué es?',
     },
-    optionsSelector: {
+    selectionList: {
         nameEmailOrPhoneNumber: 'Nombre, email o número de teléfono',
         findMember: 'Encuentra un miembro',
     },
+    emptyList: {
+        [CONST.IOU.TYPE.SUBMIT]: {
+            title: 'Presentar un gasto',
+            subtitleText1: 'Presente un gasto a alguien y ',
+            subtitleText2: `recibe ${CONST.REFERRAL_PROGRAM.REVENUE} dólares`,
+            subtitleText3: ' cuando se convierta en client.',
+        },
+        [CONST.IOU.TYPE.SPLIT]: {
+            title: 'Dividir un gasto',
+            subtitleText1: 'Divide con un amigo y ',
+            subtitleText2: `recibe ${CONST.REFERRAL_PROGRAM.REVENUE} dólares`,
+            subtitleText3: ' cuando se convierta en client.',
+        },
+        [CONST.IOU.TYPE.PAY]: {
+            title: 'Pagar a alguien',
+            subtitleText1: 'Paga a quien quieras y ',
+            subtitleText2: `recibe ${CONST.REFERRAL_PROGRAM.REVENUE} dólares`,
+            subtitleText3: ' cuando se convierta en client.',
+        },
+    },
     videoChatButtonAndMenu: {
-        tooltip: 'Iniciar una llamada',
+        tooltip: 'Programar una llamada',
     },
     hello: 'Hola',
     phoneCountryCode: '34',
     welcomeText: {
         getStarted: 'Comience a continuación.',
         anotherLoginPageIsOpen: 'Otra página de inicio de sesión está abierta.',
-        anotherLoginPageIsOpenExplanation: 'Ha abierto la página de inicio de sesión en una pestaña separada, inicie sesión desde esa pestaña específica.',
-        welcomeBack: '¡Bienvenido de nuevo!',
+        anotherLoginPageIsOpenExplanation: 'Ha abierto la página de inicio de sesión en una pestaña separada. Inicie sesión desde esa pestaña específica.',
         welcome: '¡Bienvenido!',
+        welcomeWithoutExclamation: 'Bienvenido',
         phrase2: 'El dinero habla. Y ahora que chat y pagos están en un mismo lugar, es también fácil.',
         phrase3: 'Tus pagos llegan tan rápido como tus mensajes.',
         enterPassword: 'Por favor, introduce tu contraseña',
-        newFaceEnterMagicCode: ({login}: NewFaceEnterMagicCodeParams) =>
-            `¡Siempre es genial ver una cara nueva por aquí! Por favor ingresa el código mágico enviado a ${login}. Debería llegar en un par de minutos.`,
+        welcomeNewFace: ({login}: SignUpNewFaceCodeParams) => `${login}, siempre es genial ver una cara nueva por aquí!`,
         welcomeEnterMagicCode: ({login}: WelcomeEnterMagicCodeParams) => `Por favor, introduce el código mágico enviado a ${login}. Debería llegar en un par de minutos.`,
     },
     login: {
@@ -440,7 +508,7 @@ export default {
     },
     samlSignIn: {
         welcomeSAMLEnabled: 'Continua iniciando sesión con el inicio de sesión único:',
-        orContinueWithMagicCode: 'O, opcionalmente, tu empresa te permite iniciar sesión con un código mágico',
+        orContinueWithMagicCode: 'También puedes iniciar sesión con un código mágico',
         useSingleSignOn: 'Usar el inicio de sesión único',
         useMagicCode: 'Usar código mágico',
         launching: 'Cargando...',
@@ -468,6 +536,10 @@ export default {
         emoji: 'Emoji',
         collapse: 'Colapsar',
         expand: 'Expandir',
+        tooltip: {
+            title: '¡Empecemos!',
+            subtitle: ' Presenta tu primer gasto',
+        },
     },
     reportActionContextMenu: {
         copyToClipboard: 'Copiar al portapapeles',
@@ -485,6 +557,7 @@ export default {
         replyInThread: 'Responder en el hilo',
         joinThread: 'Unirse al hilo',
         leaveThread: 'Dejar hilo',
+        copyOnyxData: 'Copiar datos de Onyx',
         flagAsOffensive: 'Marcar como ofensivo',
         menu: 'Menú',
     },
@@ -500,7 +573,6 @@ export default {
         beginningOfChatHistoryAdminRoomPartOne: ({workspaceName}: BeginningOfChatHistoryAdminRoomPartOneParams) =>
             `¡Este es el lugar para que los administradores de ${workspaceName} colaboren! 🎉\nUsa `,
         beginningOfChatHistoryAdminRoomPartTwo: ' para chatear sobre temas como la configuración del espacio de trabajo y mas.',
-        beginningOfChatHistoryAdminOnlyPostingRoom: 'Solo los administradores pueden enviar mensajes en esta sala.',
         beginningOfChatHistoryAnnounceRoomPartOne: ({workspaceName}: BeginningOfChatHistoryAnnounceRoomPartOneParams) =>
             `¡Este es el lugar para que todos los miembros de ${workspaceName} colaboren! 🎉\nUsa `,
         beginningOfChatHistoryAnnounceRoomPartTwo: ({workspaceName}: BeginningOfChatHistoryAnnounceRoomPartTwo) => ` para chatear sobre cualquier cosa relacionada con ${workspaceName}.`,
@@ -512,6 +584,7 @@ export default {
         beginningOfChatHistoryPolicyExpenseChatPartTwo: ' y ',
         beginningOfChatHistoryPolicyExpenseChatPartThree: ' empieza aquí! 🎉 Este es el lugar donde chatear y presentar o pagar gastos.',
         beginningOfChatHistorySelfDM: 'Este es tu espacio personal. Úsalo para notas, tareas, borradores y recordatorios.',
+        beginningOfChatHistorySystemDM: '¡Bienvenido! Vamos a configurar tu cuenta.',
         chatWithAccountManager: 'Chatea con tu gestor de cuenta aquí',
         sayHello: '¡Saluda!',
         yourSpace: 'Tu espacio',
@@ -525,6 +598,7 @@ export default {
             invoice: 'facturar un gasto',
         },
     },
+    adminOnlyCanPost: 'Solo los administradores pueden enviar mensajes en esta sala.',
     reportAction: {
         asCopilot: 'como copiloto de',
     },
@@ -532,22 +606,24 @@ export default {
         hereAlternateText: 'Notificar a todos en esta conversación',
     },
     newMessages: 'Mensajes nuevos',
+    youHaveBeenBanned: 'Nota: Se te ha prohibido comunicarte en este canal',
     reportTypingIndicator: {
         isTyping: 'está escribiendo...',
         areTyping: 'están escribiendo...',
-        multipleUsers: 'Varios usuarios',
+        multipleUsers: 'Varios miembros',
     },
     reportArchiveReasons: {
         [CONST.REPORT.ARCHIVE_REASON.DEFAULT]: 'Esta sala de chat ha sido eliminada.',
-        [CONST.REPORT.ARCHIVE_REASON.ACCOUNT_CLOSED]: ({displayName}: ReportArchiveReasonsClosedParams) => `Este chat está desactivado porque ${displayName} ha cerrado su cuenta.`,
+        [CONST.REPORT.ARCHIVE_REASON.ACCOUNT_CLOSED]: ({displayName}: ReportArchiveReasonsClosedParams) => `Este chat está desactivado porque ${displayName} ha cerrado tu cuenta.`,
         [CONST.REPORT.ARCHIVE_REASON.ACCOUNT_MERGED]: ({displayName, oldDisplayName}: ReportArchiveReasonsMergedParams) =>
-            `Este chat está desactivado porque ${oldDisplayName} ha combinado su cuenta con ${displayName}`,
+            `Este chat está desactivado porque ${oldDisplayName} ha combinado tu cuenta con ${displayName}`,
         [CONST.REPORT.ARCHIVE_REASON.REMOVED_FROM_POLICY]: ({displayName, policyName, shouldUseYou = false}: ReportArchiveReasonsRemovedFromPolicyParams) =>
             shouldUseYou
                 ? `Este chat ya no está activo porque <strong>tu</strong> ya no eres miembro del espacio de trabajo ${policyName}.`
                 : `Este chat está desactivado porque ${displayName} ha dejado de ser miembro del espacio de trabajo ${policyName}.`,
         [CONST.REPORT.ARCHIVE_REASON.POLICY_DELETED]: ({policyName}: ReportArchiveReasonsPolicyDeletedParams) =>
             `Este chat está desactivado porque el espacio de trabajo ${policyName} se ha eliminado.`,
+        [CONST.REPORT.ARCHIVE_REASON.BOOKING_END_DATE_HAS_PASSED]: 'Esta reserva está archivada.',
     },
     writeCapabilityPage: {
         label: 'Quién puede postear',
@@ -568,8 +644,8 @@ export default {
         saveTheWorld: 'Salvar el mundo',
     },
     allSettingsScreen: {
-        subscriptions: 'Suscripciones',
-        cardsAndDomains: 'Tarjetas y Dominios',
+        subscription: 'Suscripcion',
+        domains: 'Dominios',
     },
     tabSelector: {
         chat: 'Chat',
@@ -587,7 +663,11 @@ export default {
         takePhoto: 'Haz una foto',
         cameraAccess: 'Se requiere acceso a la cámara para hacer fotos de los recibos.',
         cameraErrorTitle: 'Error en la cámara',
-        cameraErrorMessage: 'Se produjo un error al hacer una foto, Por favor, inténtalo de nuevo.',
+        locationAccessTitle: 'Permitir acceso a la ubicación',
+        locationAccessMessage: 'El acceso a la ubicación nos ayuda a mantener tu zona horaria y moneda precisas dondequiera que vayas.',
+        locationErrorTitle: 'Permitir acceso a la ubicación',
+        locationErrorMessage: 'El acceso a la ubicación nos ayuda a mantener tu zona horaria y moneda precisas dondequiera que vayas.',
+        cameraErrorMessage: 'Se ha producido un error al hacer una foto. Por favor, inténtalo de nuevo.',
         dropTitle: 'Suéltalo',
         dropMessage: 'Suelta tu archivo aquí',
         flash: 'flash',
@@ -604,12 +684,18 @@ export default {
         splitBill: 'Dividir gasto',
         splitScan: 'Dividir recibo',
         splitDistance: 'Dividir distancia',
-        sendMoney: 'Pagar a alguien',
+        paySomeone: (name: string) => `Pagar a ${name ?? 'alguien'}`,
         assignTask: 'Assignar tarea',
         header: 'Acción rápida',
         trackManual: 'Crear gasto',
         trackScan: 'Crear gasto por recibo',
         trackDistance: 'Crear gasto por desplazamiento',
+        noLongerHaveReportAccess: 'Ya no tienes acceso al destino previo de esta acción rápida. Escoge uno nuevo a continuación.',
+        updateDestination: 'Actualiza el destino',
+        tooltip: {
+            title: '¡Acción rápida! ',
+            subtitle: 'A un click.',
+        },
     },
     iou: {
         amount: 'Importe',
@@ -637,37 +723,61 @@ export default {
         canceled: 'Canceló',
         posted: 'Contabilizado',
         deleteReceipt: 'Eliminar recibo',
+        pendingMatchWithCreditCard: 'Recibo pendiente de adjuntar con la transacción de la tarjeta',
+        pendingMatchWithCreditCardDescription: 'Recibo pendiente de adjuntar con la transacción de la tarjeta. Márcalo como efectivo para cancelar.',
+        markAsCash: 'Marcar como efectivo',
+        routePending: 'Ruta pendiente...',
         receiptIssuesFound: (count: number) => `${count === 1 ? 'Problema encontrado' : 'Problemas encontrados'}`,
         fieldPending: 'Pendiente...',
+        receiptScanning: 'Escaneando recibo...',
+        receiptScanInProgress: 'Escaneado de recibo en proceso',
+        receiptScanInProgressDescription: 'Escaneado de recibo en proceso. Vuelve a comprobarlo más tarde o introduce los detalles ahora.',
         defaultRate: 'Tasa predeterminada',
-        receiptScanning: 'Escaneo en curso…',
         receiptMissingDetails: 'Recibo con campos vacíos',
         missingAmount: 'Falta importe',
         missingMerchant: 'Falta comerciante',
         receiptStatusTitle: 'Escaneando…',
         receiptStatusText: 'Solo tú puedes ver este recibo cuando se está escaneando. Vuelve más tarde o introduce los detalles ahora.',
         receiptScanningFailed: 'El escaneo de recibo ha fallado. Introduce los detalles manualmente.',
-        transactionPendingText: 'La transacción tarda unos días en contabilizarse desde la fecha en que se utilizó la tarjeta.',
-        expenseCount: ({count, scanningReceipts = 0, pendingReceipts = 0}: RequestCountParams) =>
-            `${count} ${Str.pluralize('gasto', 'gastos', count)}${scanningReceipts > 0 ? `, ${scanningReceipts} escaneando` : ''}${
-                pendingReceipts > 0 ? `, ${pendingReceipts} pendiente` : ''
-            }`,
-        deleteExpense: 'Eliminar gasto',
-        deleteConfirmation: '¿Estás seguro de que quieres eliminar esta solicitud?',
+        transactionPendingDescription: 'Transacción pendiente. Puede tardar unos días en contabilizarse.',
+        companyInfo: 'Información de la empresa',
+        companyInfoDescription: 'Necesitamos algunos detalles más antes de que pueda enviar su primera factura.',
+        yourCompanyName: 'Nombre de su empresa',
+        yourCompanyWebsite: 'Sitio web de su empresa',
+        yourCompanyWebsiteNote: 'Si no tiene un sitio web, puede proporcionar el perfil de LinkedIn o de las redes sociales de su empresa.',
+        invalidDomainError: 'Ha introducido un dominio no válido. Para continuar, introduzca un dominio válido.',
+        publicDomainError: 'Ha introducido un dominio público. Para continuar, introduzca un dominio privado.',
+        expenseCount: ({count, scanningReceipts = 0, pendingReceipts = 0}: RequestCountParams) => {
+            const expenseText = `${count} ${Str.pluralize('gasto', 'gastos', count)}`;
+            const statusText = [];
+            if (scanningReceipts > 0) {
+                statusText.push(`${scanningReceipts} escaneando`);
+            }
+            if (pendingReceipts > 0) {
+                statusText.push(`${pendingReceipts} pendiente`);
+            }
+            return statusText.length > 0 ? `${expenseText} (${statusText.join(', ')})` : expenseText;
+        },
+        deleteExpense: ({count}: DeleteExpenseTranslationParams = {count: 1}) => `Eliminar ${Str.pluralize('gasto', 'gastos', count)}`,
+        deleteConfirmation: ({count}: DeleteExpenseTranslationParams = {count: 1}) => `¿Estás seguro de que quieres eliminar ${Str.pluralize('esta solicitud', 'estas solicitudes', count)}?`,
         settledExpensify: 'Pagado',
         settledElsewhere: 'Pagado de otra forma',
+        individual: 'Individual',
+        business: 'Empresa',
         settleExpensify: ({formattedAmount}: SettleExpensifyCardParams) => (formattedAmount ? `Pagar ${formattedAmount} con Expensify` : `Pagar con Expensify`),
+        settlePersonal: ({formattedAmount}: SettleExpensifyCardParams) => (formattedAmount ? `Pago ${formattedAmount} como individuo` : `Pago individual`),
+        settlePayment: ({formattedAmount}: SettleExpensifyCardParams) => `Pagar ${formattedAmount}`,
+        settleBusiness: ({formattedAmount}: SettleExpensifyCardParams) => (formattedAmount ? `Pagar ${formattedAmount} como negocio` : `Pagar como empresa`),
         payElsewhere: ({formattedAmount}: SettleExpensifyCardParams) => (formattedAmount ? `Pagar ${formattedAmount} de otra forma` : `Pagar de otra forma`),
-        nextStep: 'Pasos Siguientes',
+        nextStep: 'Pasos siguientes',
         finished: 'Finalizado',
         sendInvoice: ({amount}: RequestAmountParams) => `Enviar factura de ${amount}`,
         submitAmount: ({amount}: RequestAmountParams) => `solicitar ${amount}`,
-        trackAmount: ({amount}: RequestAmountParams) => `seguimiento de ${amount}`,
         submittedAmount: ({formattedAmount, comment}: RequestedAmountMessageParams) => `solicitó ${formattedAmount}${comment ? ` para ${comment}` : ''}`,
         trackedAmount: ({formattedAmount, comment}: RequestedAmountMessageParams) => `realizó un seguimiento de ${formattedAmount}${comment ? ` para ${comment}` : ''}`,
         splitAmount: ({amount}: SplitAmountParams) => `dividir ${amount}`,
         didSplitAmount: ({formattedAmount, comment}: DidSplitAmountMessageParams) => `dividió ${formattedAmount}${comment ? ` para ${comment}` : ''}`,
-        amountEach: ({amount}: AmountEachParams) => `${amount} cada uno`,
+        yourSplit: ({amount}: UserSplitParams) => `Tu parte ${amount}`,
         payerOwesAmount: ({payer, amount, comment}: PayerOwesAmountParams) => `${payer} debe ${amount}${comment ? ` para ${comment}` : ''}`,
         payerOwes: ({payer}: PayerOwesParams) => `${payer} debe: `,
         payerPaidAmount: ({payer, amount}: PayerPaidAmountParams) => `${payer ? `${payer} ` : ''}pagó ${amount}`,
@@ -678,10 +788,11 @@ export default {
         managerApprovedAmount: ({manager, amount}: ManagerApprovedAmountParams) => `${manager} aprobó ${amount}`,
         payerSettled: ({amount}: PayerSettledParams) => `pagó ${amount}`,
         approvedAmount: ({amount}: ApprovedAmountParams) => `aprobó ${amount}`,
-        waitingOnBankAccount: ({submitterDisplayName}: WaitingOnBankAccountParams) => `inicio el pago, pero no se procesará hasta que ${submitterDisplayName} añada una cuenta bancaria`,
+        forwardedAmount: ({amount}: ForwardedAmountParams) => `aprobó ${amount}`,
+        waitingOnBankAccount: ({submitterDisplayName}: WaitingOnBankAccountParams) => `inició el pago, pero no se procesará hasta que ${submitterDisplayName} añada una cuenta bancaria`,
         adminCanceledRequest: ({manager, amount}: AdminCanceledRequestParams) => `${manager ? `${manager}: ` : ''}canceló el pago de ${amount}.`,
         canceledRequest: ({amount, submitterDisplayName}: CanceledRequestParams) =>
-            `canceló el pago  ${amount}, porque ${submitterDisplayName} no habilitó su billetera Expensify en un plazo de 30 días.`,
+            `canceló el pago  ${amount}, porque ${submitterDisplayName} no habilitó tu Billetera Expensify en un plazo de 30 días.`,
         settledAfterAddedBankAccount: ({submitterDisplayName, amount}: SettledAfterAddedBankAccountParams) =>
             `${submitterDisplayName} añadió una cuenta bancaria. El pago de ${amount} se ha realizado.`,
         paidElsewhereWithAmount: ({payer, amount}: PaidElsewhereWithAmountParams) => `${payer ? `${payer} ` : ''}pagó ${amount} de otra forma`,
@@ -694,37 +805,41 @@ export default {
             `estableció la distancia a ${newDistanceToDisplay}, lo que estableció el importe a ${newAmountToDisplay}`,
         removedTheRequest: ({valueName, oldValueToDisplay}: RemovedTheRequestParams) => `${valueName === 'comerciante' ? 'el' : 'la'} ${valueName} (previamente ${oldValueToDisplay})`,
         updatedTheRequest: ({valueName, newValueToDisplay, oldValueToDisplay}: UpdatedTheRequestParams) =>
-            `${valueName === 'comerciante' ? 'el' : 'la'} ${valueName} a ${newValueToDisplay} (previamente ${oldValueToDisplay})`,
+            `${valueName === 'comerciante' || valueName === 'importe' || valueName === 'gasto' ? 'el' : 'la'} ${valueName} a ${newValueToDisplay} (previamente ${oldValueToDisplay})`,
         updatedTheDistance: ({newDistanceToDisplay, oldDistanceToDisplay, newAmountToDisplay, oldAmountToDisplay}: UpdatedTheDistanceParams) =>
             `cambió la distancia a ${newDistanceToDisplay} (previamente ${oldDistanceToDisplay}), lo que cambió el importe a ${newAmountToDisplay} (previamente ${oldAmountToDisplay})`,
         threadExpenseReportName: ({formattedAmount, comment}: ThreadRequestReportNameParams) => `${comment ? `${formattedAmount} para ${comment}` : `Gasto de ${formattedAmount}`}`,
         threadTrackReportName: ({formattedAmount, comment}: ThreadRequestReportNameParams) => `Seguimiento ${formattedAmount} ${comment ? `para ${comment}` : ''}`,
         threadPaySomeoneReportName: ({formattedAmount, comment}: ThreadSentMoneyReportNameParams) => `${formattedAmount} enviado${comment ? ` para ${comment}` : ''}`,
-        tagSelection: 'Selecciona una etiqueta para organizar mejor tu dinero.',
-        categorySelection: 'Seleccione una categoría para organizar mejor tu dinero.',
+        tagSelection: 'Selecciona una etiqueta para organizar mejor tus gastos.',
+        categorySelection: 'Selecciona una categoría para organizar mejor tus gastos.',
         error: {
-            invalidCategoryLength: 'El largo de la categoría escogida excede el máximo permitido (255). Por favor, escoge otra categoría o acorta la categoría primero.',
+            invalidCategoryLength: 'La longitud de la categoría escogida excede el máximo permitido (255). Por favor, escoge otra categoría o acorta la categoría primero.',
             invalidAmount: 'Por favor, ingresa un importe válido antes de continuar.',
             invalidTaxAmount: ({amount}: RequestAmountParams) => `El importe máximo del impuesto es ${amount}`,
-            invalidSplit: 'La suma de las partes no equivale al importe total.',
-            other: 'Error inesperado, por favor inténtalo más tarde.',
+            invalidSplit: 'La suma de las partes debe ser igual al importe total.',
+            invalidSplitParticipants: 'Introduce un importe superior a cero para al menos dos participantes.',
+            other: 'Error inesperado. Por favor, inténtalo más tarde.',
+            genericHoldExpenseFailureMessage: 'Error inesperado al bloquear el gasto. Por favor, inténtalo de nuevo más tarde.',
+            genericUnholdExpenseFailureMessage: 'Error inesperado al desbloquear el gasto. Por favor, inténtalo de nuevo más tarde.',
             genericCreateFailureMessage: 'Error inesperado al enviar este gasto. Por favor, inténtalo más tarde.',
-            genericCreateInvoiceFailureMessage: 'Error inesperado al enviar la factura, inténtalo de nuevo más tarde.',
-            // eslint-disable-next-line rulesdir/use-periods-for-error-messages
-            receiptFailureMessage: 'El recibo no se subió. ',
+            genericCreateInvoiceFailureMessage: 'Error inesperado al enviar la factura. Por favor, inténtalo de nuevo más tarde.',
+            receiptDeleteFailureError: 'Error inesperado al borrar este recibo. Por favor, vuelve a intentarlo más tarde.',
             // eslint-disable-next-line rulesdir/use-periods-for-error-messages
+            receiptFailureMessage: 'El recibo no se subió.',
             saveFileMessage: 'Guarda el archivo ',
+            // eslint-disable-next-line rulesdir/use-periods-for-error-messages
             loseFileMessage: 'o descarta este error y piérdelo.',
             genericDeleteFailureMessage: 'Error inesperado al eliminar este gasto. Por favor, inténtalo más tarde.',
             genericEditFailureMessage: 'Error inesperado al editar este gasto. Por favor, inténtalo más tarde.',
             genericSmartscanFailureMessage: 'La transacción tiene campos vacíos.',
             duplicateWaypointsErrorMessage: 'Por favor, elimina los puntos de ruta duplicados.',
             atLeastTwoDifferentWaypoints: 'Por favor, introduce al menos dos direcciones diferentes.',
-            splitExpenseMultipleParticipantsErrorMessage: 'Solo puedes dividir un gasto entre un único espacio de trabajo o con usuarios individuales. Por favor, actualiza tu selección.',
+            splitExpenseMultipleParticipantsErrorMessage: 'Solo puedes dividir un gasto entre un único espacio de trabajo o con miembros individuales. Por favor, actualiza tu selección.',
             invalidMerchant: 'Por favor, introduce un comerciante correcto.',
         },
-        waitingOnEnabledWallet: ({submitterDisplayName}: WaitingOnBankAccountParams) => `Inició el pago, pero no se procesará hasta que ${submitterDisplayName} active su Billetera`,
-        enableWallet: 'Habilitar Billetera',
+        waitingOnEnabledWallet: ({submitterDisplayName}: WaitingOnBankAccountParams) => `inició el pago, pero no se procesará hasta que ${submitterDisplayName} active su billetera`,
+        enableWallet: 'Habilitar billetera',
         holdExpense: 'Bloquear gasto',
         unholdExpense: 'Desbloquear gasto',
         heldExpense: 'bloqueó este gasto',
@@ -733,24 +848,53 @@ export default {
         reason: 'Razón',
         holdReasonRequired: 'Se requiere una razón para bloquear.',
         expenseOnHold: 'Este gasto está bloqueado. Revisa los comentarios para saber como proceder.',
-        confirmApprove: 'Confirma que quieres aprobar',
-        confirmApprovalAmount: 'Aprobar el total o solo la parte no bloqueada.',
-        confirmPay: 'Confirma que quieres pagar',
-        confirmPayAmount: 'Pagar todos los gastos por cuenta propia o solo el monto no bloqueado.',
+        expensesOnHold: 'Todos los gastos quedaron bloqueados. Revisa los comentarios para saber como proceder.',
+        expenseDuplicate: 'Esta solicitud tiene los mismos detalles que otra. Revisa los duplicados para eliminar el bloqueo.',
+        reviewDuplicates: 'Revisar duplicados',
+        keepAll: 'Mantener todos',
+        confirmApprove: 'Confirmar importe a aprobar',
+        confirmApprovalAmount: 'Aprueba sólo los gastos conformes, o aprueba todo el informe.',
+        confirmApprovalAllHoldAmount: ({transactionCount}: ConfirmHoldExpenseParams) =>
+            `${Str.pluralize('Este gasto está bloqueado', 'Estos gastos están bloqueados', transactionCount)}. ¿Quieres ${Str.pluralize(
+                'aprobar',
+                'aprobarlos',
+                transactionCount,
+            )} de todos modos?`,
+        confirmPay: 'Confirmar importe de pago',
+        confirmPayAmount: 'Paga lo que no está bloqueado, o paga el informe completo.',
+        confirmPayAllHoldAmount: ({transactionCount}: ConfirmHoldExpenseParams) =>
+            `${Str.pluralize('Este gasto está bloqueado', 'Estos gastos están bloqueados', transactionCount)}. ¿Quieres ${Str.pluralize(
+                'pagar',
+                'pagarlo',
+                transactionCount,
+            )} de todos modos?`,
         payOnly: 'Solo pagar',
         approveOnly: 'Solo aprobar',
-        hold: 'Bloqueada',
+        hold: 'Bloquear',
+        unhold: 'Desbloquear',
         holdEducationalTitle: 'Este gasto está',
         whatIsHoldTitle: '¿Qué es Bloquear?',
         whatIsHoldExplain: 'Bloquear es nuestra forma de agilizar la colaboración financiera. ¡"Rechazar" es tan duro!',
         holdIsTemporaryTitle: 'Bloquear suele ser temporal',
         holdIsTemporaryExplain: 'Se utiliza bloquear para aclarar confusión o aclarar un detalle importante antes del pago, no es permanente.',
         deleteHoldTitle: 'Eliminar lo que no se pagará',
-        deleteHoldExplain: 'En el raro caso de que algo se bloquear y no se pague, la persona que solicita el pago debe eliminarlo.',
+        deleteHoldExplain: 'En el raro caso de que algo se bloquee y no se pague, la persona que solicita el pago debe eliminarlo.',
         set: 'estableció',
         changed: 'cambió',
         removed: 'eliminó',
-        chooseARate: ({unit}: ReimbursementRateParams) => `Seleccione una tasa de reembolso del espacio de trabajo por ${unit}`,
+        transactionPending: 'Transacción pendiente.',
+        chooseARate: ({unit}: ReimbursementRateParams) => `Selecciona una tasa de reembolso por ${unit} del espacio de trabajo`,
+        unapprove: 'Desaprobar',
+        unapproveReport: 'Anular la aprobación del informe',
+        headsUp: 'Atención!',
+        unapproveWithIntegrationWarning: (accountingIntegration: string) =>
+            `Este informe ya se ha exportado a ${accountingIntegration}. Los cambios realizados en este informe en Expensify pueden provocar discrepancias en los datos y problemas de conciliación de la tarjeta Expensify. ¿Está seguro de que desea anular la aprobación de este informe?`,
+        reimbursable: 'reembolsable',
+        nonReimbursable: 'no reembolsable',
+        bookingPending: 'Esta reserva está pendiente',
+        bookingPendingDescription: 'Esta reserva está pendiente porque aún no se ha pagado.',
+        bookingArchived: 'Esta reserva está archivada',
+        bookingArchivedDescription: 'Esta reserva está archivada porque la fecha del viaje ha pasado. Agregue un gasto por el monto final si es necesario.',
     },
     notificationPreferencesPage: {
         header: 'Preferencias de avisos',
@@ -772,7 +916,7 @@ export default {
         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.',
+        deleteWorkspaceError: 'Lo sentimos, hubo un problema eliminando el avatar de tu espacio de trabajo',
         sizeExceeded: ({maxUploadSizeInMB}: SizeExceededParams) => `La imagen supera el tamaño máximo de ${maxUploadSizeInMB}MB.`,
         resolutionConstraints: ({minHeightInPx, minWidthInPx, maxHeightInPx, maxWidthInPx}: ResolutionConstraintsParams) =>
             `Por favor, elige una imagen más grande que ${minHeightInPx}x${minWidthInPx} píxeles y más pequeña que ${maxHeightInPx}x${maxWidthInPx} píxeles.`,
@@ -797,7 +941,7 @@ export default {
             subtitle: 'Estos detalles se muestran en tu perfil público, a disposición de los demás.',
         },
         privateSection: {
-            title: 'Privada',
+            title: 'Privado',
             subtitle: 'Estos detalles se utilizan para viajes y pagos. Nunca se mostrarán en tu perfil público.',
         },
     },
@@ -824,16 +968,16 @@ export default {
         enterMagicCode: ({contactMethod}: EnterMagicCodeParams) => `Por favor, introduce el código mágico enviado a ${contactMethod}`,
         setAsDefault: 'Establecer como predeterminado',
         yourDefaultContactMethod:
-            'Este es tu método de contacto predeterminado. No podrás eliminarlo hasta que añadas otro método de contacto y lo marques como predeterminado pulsando "Establecer como predeterminado".',
+            'Este es tu método de contacto predeterminado. Antes de poder eliminarlo, tendrás que elegir otro método de contacto y haz clic en "Establecer como predeterminado".',
         removeContactMethod: 'Eliminar método de contacto',
         removeAreYouSure: '¿Estás seguro de que quieres eliminar este método de contacto? Esta acción no se puede deshacer.',
-        failedNewContact: 'Hubo un error al añadir este método de contacto.',
+        failedNewContact: 'Se ha producido un error al añadir este método de contacto.',
         genericFailureMessages: {
             requestContactMethodValidateCode: 'No se ha podido enviar un nuevo código mágico. Espera un rato y vuelve a intentarlo.',
             validateSecondaryLogin: 'Código mágico incorrecto o no válido. Inténtalo de nuevo o solicita otro código.',
             deleteContactMethod: 'No se ha podido eliminar este método de contacto. Por favor, contacta con Concierge para obtener ayuda.',
             setDefaultContactMethod: 'No se pudo establecer un nuevo método de contacto predeterminado. Por favor contacta con Concierge para obtener ayuda.',
-            addContactMethod: 'Hubo un error al añadir este método de contacto. Por favor, contacta con Concierge para obtener ayuda.',
+            addContactMethod: 'Se ha producido un error al añadir este método de contacto. Por favor, contacta con Concierge para obtener ayuda.',
             enteredMethodIsAlreadySubmited: 'El método de contacto ingresado ya existe.',
             passwordRequired: 'Se requiere contraseña',
             contactMethodRequired: 'Se requiere método de contacto.',
@@ -865,12 +1009,12 @@ export default {
     },
     displayNamePage: {
         headerTitle: 'Nombre',
-        isShownOnProfile: 'Este nombre es visible en su perfil.',
+        isShownOnProfile: 'Este nombre es visible en tu perfil.',
     },
     timezonePage: {
         timezone: 'Zona horaria',
         isShownOnProfile: 'Tu zona horaria se muestra en tu perfil.',
-        getLocationAutomatically: 'Detecta tu ubicación automáticamente.',
+        getLocationAutomatically: 'Detecta tu ubicación automáticamente',
     },
     updateRequiredView: {
         updateRequired: 'Actualización requerida',
@@ -880,7 +1024,7 @@ export default {
     initialSettingsPage: {
         about: 'Acerca de',
         aboutPage: {
-            description: 'La nueva Expensify está creada por una comunidad de desarrolladores de código abierto de todo el mundo. Ayúdanos a construir el futuro de Expensify.',
+            description: 'La Nueva Expensify está creada por una comunidad de desarrolladores de código abierto de todo el mundo. Ayúdanos a construir el futuro de Expensify.',
             appDownloadLinks: 'Enlaces para descargar la App',
             viewKeyboardShortcuts: 'Ver atajos de teclado',
             viewTheCode: 'Ver código',
@@ -904,7 +1048,7 @@ export default {
             viewConsole: 'Ver la consola de depuración',
             debugConsole: 'Consola de depuración',
             description: 'Utilice las herramientas que aparecen a continuación para solucionar los problemas de Expensify. Si tiene algún problema, por favor',
-            submitBug: 'envíe un error',
+            submitBug: 'envíe un informe de error',
             confirmResetDescription: 'Todos los borradores no enviados se perderán, pero el resto de tus datos estarán a salvo.',
             resetAndRefresh: 'Restablecer y actualizar',
             clientSideLogging: 'Registro a nivel cliente',
@@ -913,13 +1057,16 @@ export default {
             profileTrace: 'Traza de ejecución',
             releaseOptions: 'Opciones de publicación',
             testingPreferences: 'Preferencias para Tests',
-            useStagingServer: 'Usar Servidor “Staging”',
+            useStagingServer: 'Usar servidor “staging”',
             forceOffline: 'Forzar desconexión',
             simulatFailingNetworkRequests: 'Simular fallos en solicitudes de red',
             authenticationStatus: 'Estado de autenticación',
             deviceCredentials: 'Credenciales del dispositivo',
             invalidate: 'Invalidar',
             destroy: 'Destruir',
+            maskExportOnyxStateData: 'Enmascare los datos frágiles del usuario mientras exporta el estado Onyx',
+            exportOnyxState: 'Exportar estado Onyx',
+            testCrash: 'Prueba de fallo',
         },
         debugConsole: {
             saveLog: 'Guardar registro',
@@ -929,6 +1076,7 @@ export default {
             noLogsAvailable: 'No hay registros disponibles',
             logSizeTooLarge: ({size}: LogSizeParams) => `El tamaño del registro excede el límite de ${size} MB. Utilice "Guardar registro" para descargar el archivo de registro.`,
             logs: 'Logs',
+            viewConsole: 'Ver consola',
         },
         security: 'Seguridad',
         restoreStashed: 'Restablecer login guardado',
@@ -963,7 +1111,7 @@ export default {
         changingYourPasswordPrompt: 'El cambio de contraseña va a afectar tanto a la cuenta de Expensify.com como la de Nuevo Expensify.',
         currentPassword: 'Contraseña actual',
         newPassword: 'Nueva contraseña',
-        newPasswordPrompt: 'La nueva contraseña debe ser diferente de la antigua, tener al menos 8 caracteres, 1 letra mayúscula, 1 letra minúscula y 1 número.',
+        newPasswordPrompt: 'La nueva contraseña debe ser diferente de la antigua y contener al menos 8 caracteres, 1 letra mayúscula, 1 letra minúscula y 1 número.',
     },
     twoFactorAuth: {
         headerTitle: 'Autenticación de dos factores',
@@ -982,13 +1130,18 @@ export default {
         stepVerify: 'Verificar',
         scanCode: 'Escanea el código QR usando tu',
         authenticatorApp: 'aplicación de autenticación',
-        addKey: 'O añade esta clave secreta a su aplicación de autenticación:',
+        addKey: 'O añade esta clave secreta a tu aplicación de autenticación:',
         enterCode: 'Luego introduce el código de seis dígitos generado por tu aplicación de autenticación.',
         stepSuccess: 'Finalizado',
         enabled: '¡La autenticación de dos factores está ahora habilitada!',
         congrats: 'Felicidades, ahora tienes esa seguridad adicional.',
         copy: 'Copiar',
         disable: 'Deshabilitar',
+        enableTwoFactorAuth: 'Activar la autenticación de dos factores',
+        pleaseEnableTwoFactorAuth: 'Activa la autenticación de dos factores.',
+        twoFactorAuthIsRequiredDescription: 'La autenticación de dos factores es necesaria para conectarse a Xero. Activa la autenticación de dos factores para continuar.',
+        twoFactorAuthIsRequiredForAdminsDescription:
+            'La autenticación de dos factores es necesaria para los administradores del área de trabajo de Xero. Activa la autenticación de dos factores para continuar.',
     },
     recoveryCodeForm: {
         error: {
@@ -1012,13 +1165,25 @@ export default {
     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.',
+        sharedNoteMessage: 'Guarda notas sobre este chat aquí. Los empleados de Expensify y otros miembros del dominio team.expensify.com pueden ver estas notas.',
         composerLabel: 'Notas',
         myNote: 'Mi nota',
         error: {
             genericFailureMessage: 'Las notas privadas no han podido ser guardadas.',
         },
     },
+    billingCurrency: {
+        error: {
+            securityCode: 'Por favor, introduce un código de seguridad válido.',
+        },
+        securityCode: 'Código de seguridad',
+        changePaymentCurrency: 'Cambiar moneda de facturación',
+        changeBillingCurrency: 'Cambiar la moneda de pago',
+        paymentCurrency: 'Moneda de pago',
+        note: 'Nota: Cambiar tu moneda de pago puede afectar cuánto pagarás por Expensify. Consulta nuestra',
+        noteLink: 'página de precios',
+        noteDetails: 'para conocer todos los detalles.',
+    },
     addDebitCardPage: {
         addADebitCard: 'Añadir una tarjeta de débito',
         nameOnCard: 'Nombre en la tarjeta',
@@ -1038,20 +1203,44 @@ export default {
             addressStreet: 'Por favor, introduce una dirección de facturación válida que no sea un apartado postal.',
             addressState: 'Por favor, selecciona un estado.',
             addressCity: 'Por favor, introduce una ciudad.',
-            genericFailureMessage: 'Se produjo un error al añadir tu tarjeta. Vuelva a intentarlo.',
+            genericFailureMessage: 'Se ha producido un error al añadir tu tarjeta. Por favor, vuelva a intentarlo.',
+            password: 'Por favor, introduce tu contraseña de Expensify.',
+        },
+    },
+    addPaymentCardPage: {
+        addAPaymentCard: 'Añade tarjeta de pago',
+        nameOnCard: 'Nombre en la tarjeta',
+        paymentCardNumber: 'Número de la tarjeta',
+        expiration: 'Fecha de vencimiento',
+        expirationDate: 'MMAA',
+        cvv: 'CVV',
+        billingAddress: 'Dirección de envio',
+        growlMessageOnSave: 'Tu tarjeta de pago se añadió correctamente',
+        expensifyPassword: 'Contraseña de Expensify',
+        error: {
+            invalidName: 'El nombre sólo puede incluir letras.',
+            addressZipCode: 'Por favor, introduce un código postal válido.',
+            paymentCardNumber: 'Por favor, introduce un número de tarjeta de pago válido.',
+            expirationDate: 'Por favor, selecciona una fecha de vencimiento válida.',
+            securityCode: 'Por favor, introduce un código de seguridad válido.',
+            addressStreet: 'Por favor, introduce una dirección de facturación válida que no sea un apartado postal.',
+            addressState: 'Por favor, selecciona un estado.',
+            addressCity: 'Por favor, introduce una ciudad.',
+            genericFailureMessage: 'Se ha producido un error al añadir tu tarjeta. Por favor, vuelva a intentarlo.',
             password: 'Por favor, introduce tu contraseña de Expensify.',
         },
     },
     walletPage: {
+        balance: 'Saldo',
         paymentMethodsTitle: 'Métodos de pago',
         setDefaultConfirmation: 'Marcar como método de pago predeterminado',
         setDefaultSuccess: 'Método de pago configurado',
         deleteAccount: 'Eliminar cuenta',
         deleteConfirmation: '¿Estás seguro de que quieres eliminar esta cuenta?',
         error: {
-            notOwnerOfBankAccount: 'Ha ocurrido un error al establecer esta cuenta bancaria como método de pago predeterminado.',
+            notOwnerOfBankAccount: 'Se ha producido un error al establecer esta cuenta bancaria como método de pago predeterminado.',
             invalidBankAccount: 'Esta cuenta bancaria está temporalmente suspendida.',
-            notOwnerOfFund: 'Ha ocurrido un error al establecer esta tarjeta de crédito como método de pago predeterminado.',
+            notOwnerOfFund: 'Se ha producido un error al establecer esta tarjeta de crédito como método de pago predeterminado.',
             setDefaultFailure: 'No se ha podido configurar el método de pago.',
         },
         addBankAccountFailure: 'Ocurrió un error inesperado al intentar añadir la cuenta bancaria. Inténtalo de nuevo.',
@@ -1061,22 +1250,23 @@ export default {
         secureAccessToYourMoney: 'Acceso seguro a tu dinero',
         receiveMoney: 'Recibe dinero en tu moneda local',
         expensifyWallet: 'Billetera Expensify',
-        sendAndReceiveMoney: 'Envía y recibe dinero desde tu Billetera Expensify.',
-        enableWalletToSendAndReceiveMoney: 'Habilita tu Billetera Expensify para comenzar a enviar y recibir dinero con amigos',
-        enableWallet: 'Habilitar Billetera',
+        sendAndReceiveMoney: 'Envía y recibe dinero desde tu Billetera Expensify',
+        enableWalletToSendAndReceiveMoney: 'Habilita tu Billetera Expensify para comenzar a enviar y recibir dinero con amigos.',
+        walletEnabledToSendAndReceiveMoney: 'Tu billetera ha sido habilitada para enviar y recibir dinero con amigos.',
+        enableWallet: 'Habilitar billetera',
         bankAccounts: 'Cuentas bancarias',
-        addBankAccountToSendAndReceive: 'Añade una cuenta bancaria para enviar y recibir pagos directamente en la aplicación.',
+        addBankAccountToSendAndReceive: 'Agregar una cuenta bancaria te permite recibir reembolsos por los gastos que envíes a un espacio de trabajo.',
         addBankAccount: 'Añadir cuenta bancaria',
         assignedCards: 'Tarjetas asignadas',
-        assignedCardsDescription: 'Son tarjetas asignadas por un administrador del Espacio de Trabajo para gestionar los gastos de la empresa.',
+        assignedCardsDescription: 'Son tarjetas asignadas por un administrador del espacio de trabajo para gestionar los gastos de la empresa.',
         expensifyCard: 'Tarjeta Expensify',
-        walletActivationPending: 'Estamos revisando su información, por favor vuelve en unos minutos.',
+        walletActivationPending: 'Estamos revisando tu información. Por favor, vuelve en unos minutos.',
         walletActivationFailed: 'Lamentablemente, no podemos activar tu billetera en este momento. Chatea con Concierge para obtener más ayuda.',
-        addYourBankAccount: 'Añadir tu cuenta bancaria.',
+        addYourBankAccount: 'Añadir tu cuenta bancaria',
         addBankAccountBody: 'Conectemos tu cuenta bancaria a Expensify para que sea más fácil que nunca enviar y recibir pagos directamente en la aplicación.',
-        chooseYourBankAccount: 'Elige tu cuenta bancaria.',
+        chooseYourBankAccount: 'Elige tu cuenta bancaria',
         chooseAccountBody: 'Asegúrese de elegir el adecuado.',
-        confirmYourBankAccount: 'Confirma tu cuenta bancaria.',
+        confirmYourBankAccount: 'Confirma tu cuenta bancaria',
     },
     cardPage: {
         expensifyCard: 'Tarjeta Expensify',
@@ -1099,7 +1289,7 @@ export default {
         reportFraud: 'Reportar fraude con la tarjeta virtual',
         reviewTransaction: 'Revisar transacción',
         suspiciousBannerTitle: 'Transacción sospechosa',
-        suspiciousBannerDescription: 'Hemos detectado una transacción sospechosa en la tarjeta. Haga click abajo para revisarla.',
+        suspiciousBannerDescription: 'Hemos detectado una transacción sospechosa en la tarjeta. Haz click abajo para revisarla.',
         cardLocked: 'La tarjeta está temporalmente bloqueada mientras nuestro equipo revisa la cuenta de tu empresa.',
         cardDetails: {
             cardNumber: 'Número de tarjeta virtual',
@@ -1116,10 +1306,12 @@ export default {
         workflowTitle: 'Gasto',
         workflowDescription: 'Configure un flujo de trabajo desde el momento en que se produce el gasto, incluida la aprobación y el pago',
         delaySubmissionTitle: 'Retrasar envíos',
-        delaySubmissionDescription: 'Los gastos se comparten de inmediato para una mejor visibilidad del gasto. Establece una cadencia más lenta si es necesario.',
+        delaySubmissionDescription: 'Retrasa la presentación de gastos en base a un calendario personalizado, o mantén esta opción desactivada para seguir viendo los gastos en tiempo real.',
         submissionFrequency: 'Frecuencia de envíos',
         submissionFrequencyDateOfMonth: 'Fecha del mes',
-        addApprovalsTitle: 'Requerir aprobaciones',
+        addApprovalsTitle: 'Aprobaciones',
+        addApprovalButton: 'Añadir flujo de aprobación',
+        addApprovalTip: 'Este flujo de trabajo por defecto se aplica a todos los miembros, a menos que exista un flujo de trabajo más específico',
         approver: 'Aprobador',
         connectBankAccount: 'Conectar cuenta bancaria',
         addApprovalsDescription: 'Requiere una aprobación adicional antes de autorizar un pago.',
@@ -1128,6 +1320,7 @@ export default {
         editor: {
             submissionFrequency: 'Elige cuánto tiempo Expensify debe esperar antes de compartir los gastos sin errores.',
         },
+        frequencyDescription: 'Elige la frecuencia de presentación automática de gastos, o preséntalos manualmente',
         frequencies: {
             weekly: 'Semanal',
             monthly: 'Mensual',
@@ -1142,21 +1335,54 @@ export default {
                 two: '.º',
                 few: '.º',
                 other: '.º',
+                /* eslint-disable @typescript-eslint/naming-convention */
+                '1': 'Primero',
+                '2': 'Segundo',
+                '3': 'Tercero',
+                '4': 'Cuarto',
+                '5': 'Quinto',
+                '6': 'Sexto',
+                '7': 'Séptimo',
+                '8': 'Octavo',
+                '9': 'Noveno',
+                '10': 'Décimo',
+                /* eslint-enable @typescript-eslint/naming-convention */
             },
         },
+        approverInMultipleWorkflows: 'Este miembro ya pertenece a otro flujo de aprobación. Cualquier actualización aquí se reflejará allí también.',
+        approverCircularReference: ({name1, name2}: ApprovalWorkflowErrorParams) =>
+            `<strong>${name1}</strong> ya aprueba informes a <strong>${name2}</strong>. Por favor, elige un aprobador diferente para evitar un flujo de trabajo circular.`,
     },
     workflowsDelayedSubmissionPage: {
         autoReportingErrorMessage: 'El parámetro de envío retrasado no pudo ser cambiado. Por favor, inténtelo de nuevo o contacte al soporte.',
         autoReportingFrequencyErrorMessage: 'La frecuencia de envío no pudo ser cambiada. Por favor, inténtelo de nuevo o contacte al soporte.',
         monthlyOffsetErrorMessage: 'La frecuencia mensual no pudo ser cambiada. Por favor, inténtelo de nuevo o contacte al soporte.',
     },
-    workflowsApprovalPage: {
+    workflowsCreateApprovalsPage: {
+        title: 'Confirmar',
+        header: 'Agrega más aprobadores y confirma.',
+        additionalApprover: 'Añadir aprobador',
+        submitButton: 'Añadir flujo de trabajo',
+    },
+    workflowsEditApprovalsPage: {
+        title: 'Edicion flujo de aprobación',
+        deleteTitle: 'Eliminar flujo de trabajo de aprobación',
+        deletePrompt: '¿Estás seguro de que quieres eliminar este flujo de trabajo de aprobación? Todos los miembros pasarán a usar el flujo de trabajo predeterminado.',
+    },
+    workflowsExpensesFromPage: {
+        title: 'Gastos de',
+        header: 'Cuando los siguientes miembros presenten gastos:',
+    },
+    workflowsApproverPage: {
         genericErrorMessage: 'El aprobador no pudo ser cambiado. Por favor, inténtelo de nuevo o contacte al soporte.',
+        header: 'Enviar a este miembro para su aprobación:',
     },
     workflowsPayerPage: {
         title: 'Pagador autorizado',
         genericErrorMessage: 'El pagador autorizado no se pudo cambiar. Por favor, inténtalo mas tarde.',
         admins: 'Administradores',
+        payer: 'Pagador',
+        paymentAccount: 'Cuenta de pago',
     },
     reportFraudPage: {
         title: 'Reportar fraude con la tarjeta virtual',
@@ -1219,7 +1445,7 @@ export default {
         addPaymentMethod: 'Añadir método de pago',
         addNewDebitCard: 'Añadir nueva tarjeta de débito',
         addNewBankAccount: 'Añadir nueva cuenta de banco',
-        accountLastFour: 'Cuenta terminada en',
+        accountLastFour: 'Terminada en',
         cardLastFour: 'Tarjeta terminada en',
         addFirstPaymentMethod: 'Añade un método de pago para enviar y recibir pagos directamente desde la aplicación.',
         defaultPaymentMethod: 'Predeterminado',
@@ -1239,7 +1465,7 @@ export default {
     priorityModePage: {
         priorityMode: 'Modo prioridad',
         explainerText:
-            'Elige si deseas mostrar por defecto todos los chats ordenados desde el más reciente y con los elementos anclados en la parte superior, o elige el modo #concentración, con los elementos no leídos anclados en la parte superior y ordenados alfabéticamente.',
+            'Elige #concentración si deseas enfocarte sólo en los chats no leídos y en los anclados, o mostrarlo todo con los chats más recientes y los anclados en la parte superior.',
         priorityModes: {
             default: {
                 label: 'Más recientes',
@@ -1251,6 +1477,9 @@ export default {
             },
         },
     },
+    reportDetailsPage: {
+        inWorkspace: ({policyName}) => `en ${policyName}`,
+    },
     reportDescriptionPage: {
         roomDescription: 'Descripción de la sala de chat',
         roomDescriptionOptional: 'Descripción de la sala de chat (opcional)',
@@ -1262,8 +1491,8 @@ export default {
     groupChat: {
         groupMembersListTitle: 'Directorio de los miembros del grupo.',
         lastMemberTitle: '¡Atención!',
-        lastMemberWarning: 'Ya que eres la última persona aquí, si te vas, este chat quedará inaccesible para todos los usuarios. ¿Estás seguro de que quieres salir del chat?',
-        defaultReportName: ({displayName}: {displayName: string}) => `Chat de group de ${displayName}`,
+        lastMemberWarning: 'Ya que eres la última persona aquí, si te vas, este chat quedará inaccesible para todos los miembros. ¿Estás seguro de que quieres salir del chat?',
+        defaultReportName: ({displayName}: {displayName: string}) => `Chat de grupo de ${displayName}`,
     },
     languagePage: {
         language: 'Idioma',
@@ -1342,15 +1571,24 @@ export default {
         notYou: ({user}: NotYouParams) => `¿No eres ${user}?`,
     },
     onboarding: {
+        welcome: '¡Bienvenido!',
+        explanationModal: {
+            title: 'Bienvenido a Expensify',
+            description: 'Una aplicación para gestionar en un chat todos los gastos de tu empresa y personales. Inténtalo y dinos qué te parece. ¡Hay mucho más por venir!',
+            secondaryDescription: 'Para volver a Expensify Classic, simplemente haz click en tu foto de perfil > Ir a Expensify Classic.',
+        },
         welcomeVideo: {
             title: 'Bienvenido a Expensify',
             description: 'Una aplicación para gestionar todos tus gastos de empresa y personales en un chat. Pensada para tu empresa, tu equipo y tus amigos.',
         },
+        getStarted: 'Comenzar',
         whatsYourName: '¿Cómo te llamas?',
         whereYouWork: '¿Dónde trabajas?',
         purpose: {
             title: '¿Qué quieres hacer hoy?',
-            error: 'Por favor, haga una selección antes de continuar.',
+            errorSelection: 'Por favor selecciona una opción para continuar.',
+            errorContinue: 'Por favor, haz click en continuar para configurar tu cuenta.',
+            errorBackButton: 'Por favor, finaliza las preguntas de configuración para empezar a utilizar la aplicación.',
             [CONST.ONBOARDING_CHOICES.EMPLOYER]: 'Cobrar de mi empresa',
             [CONST.ONBOARDING_CHOICES.MANAGE_TEAM]: 'Gestionar los gastos de mi equipo',
             [CONST.ONBOARDING_CHOICES.PERSONAL_SPEND]: 'Controlar y presupuestar gastos',
@@ -1368,6 +1606,7 @@ export default {
         error: {
             containsReservedWord: 'El nombre no puede contener las palabras Expensify o Concierge.',
             hasInvalidCharacter: 'El nombre no puede contener una coma o un punto y coma.',
+            requiredFirstName: 'El nombre no puede estar vacío.',
         },
     },
     privatePersonalDetails: {
@@ -1403,18 +1642,21 @@ export default {
             `Nuestro proveedor de correo electrónico ha suspendido temporalmente los correos electrónicos a ${login} debido a problemas de entrega. Para desbloquear el inicio de sesión, sigue estos pasos:`,
         confirmThat: ({login}: ConfirmThatParams) => `Confirma que ${login} está escrito correctamente y que es una dirección de correo electrónico real que puede recibir correos. `,
         emailAliases:
-            'Los alias de correo electrónico como "expenses@domain.com" deben tener acceso a su propia bandeja de entrada de correo electrónico para que sea un inicio de sesión válido de Expensify.',
-        ensureYourEmailClient: 'Asegúrese de que su cliente de correo electrónico permita correos electrónicos de expensify.com. ',
+            'Los alias de correo electrónico como "expenses@domain.com" deben tener acceso a tu propia bandeja de entrada de correo electrónico para que sea un inicio de sesión válido de Expensify.',
+        ensureYourEmailClient: 'Asegúrese de que tu cliente de correo electrónico permita correos electrónicos de expensify.com. ',
         youCanFindDirections: 'Puedes encontrar instrucciones sobre cómo completar este paso ',
         helpConfigure: ', pero es posible que necesites que el departamento de informática te ayude a configurar los ajustes de correo electrónico.',
         onceTheAbove: 'Una vez completados los pasos anteriores, ponte en contacto con ',
         toUnblock: ' para desbloquear el inicio de sesión.',
     },
+    welcomeSignUpForm: {
+        join: 'Unirse',
+    },
     detailsPage: {
         localTime: 'Hora local',
     },
     newChatPage: {
-        startGroup: 'Grupo de inicio',
+        startGroup: 'Crear grupo',
         addToGroup: 'Añadir al grupo',
     },
     yearPickerPage: {
@@ -1496,7 +1738,7 @@ export default {
     bankAccount: {
         bankInfo: 'Información bancaria',
         confirmBankInfo: 'Confirmar información bancaria',
-        manuallyAdd: 'Añadir manualmente tu cuenta bancaria',
+        manuallyAdd: '¿Cuáles son los detalles de tu cuenta bancaria comercial?',
         letsDoubleCheck: 'Verifiquemos que todo esté correcto.',
         accountEnding: 'Cuenta terminada en',
         thisBankAccount: 'Esta cuenta bancaria se utilizará para pagos comerciales en tu espacio de trabajo',
@@ -1505,51 +1747,52 @@ export default {
         chooseAnAccountBelow: 'Elige una cuenta a continuación',
         addBankAccount: 'Añadir cuenta bancaria',
         chooseAnAccount: 'Elige una cuenta',
-        connectOnlineWithPlaid: 'Conéctate a Plaid online',
+        connectOnlineWithPlaid: 'Conectar con Plaid',
         connectManually: 'Conectar manualmente',
-        desktopConnection: 'Para conectarse con Chase, Wells Fargo, Capital One o Bank of America, haga clic aquí para completar este proceso en un navegador.',
+        desktopConnection: 'Para conectarse con Chase, Wells Fargo, Capital One o Bank of America, haz clic aquí para completar este proceso en un navegador.',
         yourDataIsSecure: 'Tus datos están seguros',
-        toGetStarted: 'Añade una cuenta bancaria y emite tarjetas corporativas, reembolsa gastos y cobra y paga facturas, todo desde un mismo lugar.',
+        toGetStarted: 'Conecta una cuenta bancaria para reembolsar gastos, emitir tarjetas corporativas, y cobrar y pagar facturas todo desde un mismo lugar.',
         plaidBodyCopy: 'Ofrezca a sus empleados una forma más sencilla de pagar - y recuperar - los gastos de la empresa.',
-        checkHelpLine: 'Su número de ruta y número de cuenta se pueden encontrar en un cheque de la cuenta bancaria.',
+        checkHelpLine: 'Tus números de ruta y de cuenta se pueden encontrar en un cheque de la cuenta bancaria.',
         validateAccountError: {
             phrase1: '¡Un momento! Primero necesitas validar tu cuenta. Para hacerlo, ',
             phrase2: 'vuelve a iniciar sesión con un código mágico',
+            phrase3: 'o',
+            phrase4: 'verifica aquí tu cuenta',
         },
         hasPhoneLoginError:
             'Para añadir una cuenta bancaria verificada, asegúrate de que tu nombre de usuario principal sea un correo electrónico válido y vuelve a intentarlo. Puedes añadir tu número de teléfono como nombre de usuario secundario.',
-        hasBeenThrottledError: 'Se produjo un error al intentar añadir tu cuenta bancaria. Por favor, espera unos minutos e inténtalo de nuevo.',
-        hasCurrencyError:
-            '¡Ups! Parece que la moneda de tu espacio de trabajo está configurada en una moneda diferente a USD. Para continuar, por favor configúrala en USD e inténtalo nuevamente.',
+        hasBeenThrottledError: 'Se ha producido un error al intentar añadir tu cuenta bancaria. Por favor, espera unos minutos e inténtalo de nuevo.',
+        hasCurrencyError: '¡Ups! Parece que la moneda de tu espacio de trabajo no está configurada en USD. Por favor, configúrala en USD e inténtalo nuevamente.',
         error: {
-            youNeedToSelectAnOption: 'Debes seleccionar una opción para continuar.',
-            noBankAccountAvailable: 'Lo sentimos, no hay ninguna cuenta bancaria disponible.',
-            noBankAccountSelected: 'Por favor, elige una cuenta bancaria.',
-            taxID: 'Por favor, introduce un número de identificación fiscal válido.',
+            youNeedToSelectAnOption: 'Debes seleccionar una opción para continuar',
+            noBankAccountAvailable: 'Lo sentimos, no hay ninguna cuenta bancaria disponible',
+            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. El sitio web debe estar en minúsculas.',
             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.',
-            addressStreet: 'Por favor, introduce una calle de dirección válida que no sea un apartado postal.',
-            addressState: 'Por favor, selecciona un estado.',
-            incorporationDateFuture: 'La fecha de incorporación no puede ser futura.',
-            incorporationState: 'Por favor, selecciona una estado válido.',
-            industryCode: 'Por favor, introduce un código de clasificación de industria válido.',
-            restrictedBusiness: 'Por favor, confirma que la empresa no está en la lista de negocios restringidos.',
-            routingNumber: 'Por favor, introduce un número de ruta válido.',
-            accountNumber: 'Por favor, introduce un número de cuenta válido.',
-            routingAndAccountNumberCannotBeSame: 'El número de ruta y el número de cuenta no pueden ser iguales.',
-            companyType: 'Por favor, selecciona un tipo de compañía válido.',
+            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',
+            addressStreet: 'Por favor, introduce una calle de dirección válida que no sea un apartado postal',
+            addressState: 'Por favor, selecciona un estado',
+            incorporationDateFuture: 'La fecha de incorporación no puede ser futura',
+            incorporationState: 'Por favor, selecciona una estado válido',
+            industryCode: 'Por favor, introduce un código de clasificación de industria válido',
+            restrictedBusiness: 'Por favor, confirma que la empresa no está en la lista de negocios restringidos',
+            routingNumber: 'Por favor, introduce un número de ruta válido',
+            accountNumber: 'Por favor, introduce un número de cuenta válido',
+            routingAndAccountNumberCannotBeSame: 'Los números de ruta y de cuenta no pueden ser iguales',
+            companyType: 'Por favor, selecciona un tipo de compañía válido',
             tooManyAttempts:
                 'Debido a la gran cantidad de intentos de inicio de sesión, esta opción ha sido desactivada temporalmente durante 24 horas. Por favor, inténtalo de nuevo más tarde.',
-            address: 'Por favor, introduce una dirección válida.',
-            dob: 'Por favor, selecciona una fecha de nacimiento válida.',
-            age: 'Debe ser mayor de 18 años.',
-            ssnLast4: 'Por favor, introduce los últimos 4 dígitos del número de seguridad social.',
-            firstName: 'Por favor, introduce el nombre.',
-            lastName: 'Por favor, introduce los apellidos.',
-            noDefaultDepositAccountOrDebitCardAvailable: 'Por favor, añade una cuenta bancaria para depósitos o una tarjeta de débito.',
+            address: 'Por favor, introduce una dirección válida',
+            dob: 'Por favor, selecciona una fecha de nacimiento válida',
+            age: 'Debe ser mayor de 18 años',
+            ssnLast4: 'Por favor, introduce los últimos 4 dígitos del número de seguridad social',
+            firstName: 'Por favor, introduce el nombre',
+            lastName: 'Por favor, introduce los apellidos',
+            noDefaultDepositAccountOrDebitCardAvailable: 'Por favor, añade una cuenta bancaria para depósitos o una tarjeta de débito',
             validationAmounts: 'Los importes de validación que introduciste son incorrectos. Por favor, comprueba tu cuenta bancaria e inténtalo de nuevo.',
         },
     },
@@ -1564,7 +1807,7 @@ export default {
         unknownFilename: 'Archivo desconocido',
         passwordRequired: 'Por favor, introduce tu contraseña',
         passwordIncorrect: 'Contraseña incorrecta. Por favor, inténtalo de nuevo.',
-        failedToLoadPDF: 'Hubo un error al intentar cargar el PDF.',
+        failedToLoadPDF: 'Se ha producido un error al intentar cargar el PDF.',
         pdfPasswordForm: {
             title: 'PDF protegido con contraseña',
             infoText: 'Este PDF esta protegido con contraseña.',
@@ -1580,11 +1823,13 @@ export default {
         userIsAlreadyMember: ({login, name}: UserIsAlreadyMemberParams) => `${login} ya es miembro de ${name}`,
     },
     onfidoStep: {
-        acceptTerms: 'Al continuar con la solicitud para activar su billetera Expensify, confirma que ha leído, comprende y acepta ',
+        acceptTerms: 'Al continuar con la solicitud para activar tu Billetera Expensify, confirma que ha leído, comprende y acepta ',
         facialScan: 'Política y lanzamiento de la exploración facial de Onfido',
         tryAgain: 'Intentar otra vez',
         verifyIdentity: 'Verificar identidad',
-        genericError: 'Hubo un error al procesar este paso. Inténtalo de nuevo.',
+        letsVerifyIdentity: '¡Vamos a verificar tu identidad!',
+        butFirst: 'Pero primero, lo aburrido. Lee la jerga legal en el siguiente paso y haz clic en "Aceptar" cuando estés listo.',
+        genericError: 'Se ha producido un error al procesar este paso. Inténtalo de nuevo.',
         cameraPermissionsNotGranted: 'Permiso para acceder a la cámara',
         cameraRequestMessage: 'Necesitamos acceso a tu cámara para completar la verificación de tu cuenta de banco. Por favor habilita los permisos en Configuración > Nuevo Expensify.',
         microphonePermissionsNotGranted: 'Permiso para acceder al micrófono',
@@ -1600,7 +1845,7 @@ export default {
     },
     additionalDetailsStep: {
         headerTitle: 'Detalles adicionales',
-        helpText: 'Necesitamos confirmar la siguiente información antes de que puedas enviar y recibir dinero desde tu Billetera.',
+        helpText: 'Necesitamos confirmar la siguiente información antes de que puedas enviar y recibir dinero desde tu billetera.',
         helpTextIdologyQuestions: 'Tenemos que preguntarte unas preguntas más para terminar de verificar tu identidad',
         helpLink: 'Obtén más información sobre por qué necesitamos esto.',
         legalFirstNameLabel: 'Primer nombre legal',
@@ -1611,11 +1856,12 @@ export default {
         needSSNFull9: 'Estamos teniendo problemas para verificar tu número de seguridad social. Introduce los 9 dígitos del número de seguridad social.',
         weCouldNotVerify: 'No se pudo verificar',
         pleaseFixIt: 'Corrige esta información antes de continuar.',
-        failedKYCTextBefore: 'No se ha podido verificar correctamente tu identidad. Vuelve a intentarlo más tarde y comunicate con ',
+        failedKYCTextBefore: 'No se ha podido verificar correctamente tu identidad. Vuelve a intentarlo más tarde o comunicate con ',
         failedKYCTextAfter: ' si tienes alguna pregunta.',
     },
     termsStep: {
         headerTitle: 'Condiciones y tarifas',
+        headerTitleRefactor: 'Tarifas y condiciones',
         haveReadAndAgree: 'He leído y acepto recibir ',
         electronicDisclosures: 'divulgaciones electrónicas',
         agreeToThe: 'Estoy de acuerdo con el ',
@@ -1626,8 +1872,11 @@ export default {
         noOverdraftOrCredit: 'Sin función de sobregiro/crédito',
         electronicFundsWithdrawal: 'Retiro electrónico de fondos',
         standard: 'Estándar',
+        reviewTheFees: 'Por favor, revisa las siguientes tarifas.',
+        checkTheBoxes: 'Por favor, marca las siguientes casillas.',
+        agreeToTerms: 'Debes aceptar los términos y condiciones para continuar.',
         shortTermsForm: {
-            expensifyPaymentsAccount: ({walletProgram}: WalletProgramParams) => `La billetera Expensify es emitida por ${walletProgram}.`,
+            expensifyPaymentsAccount: ({walletProgram}: WalletProgramParams) => `La Billetera Expensify es emitida por ${walletProgram}.`,
             perPurchase: 'Por compra',
             atmWithdrawal: 'Retiro en cajeros automáticos',
             cashReload: 'Recarga de efectivo',
@@ -1647,7 +1896,7 @@ export default {
             electronicFundsInstantFeeMin: ({amount}: TermsParams) => `(mínimo ${amount})`,
         },
         longTermsForm: {
-            listOfAllFees: 'Una lista de todas las tarifas de la billetera Expensify',
+            listOfAllFees: 'Una lista de todas las tarifas de la Billetera Expensify',
             typeOfFeeHeader: 'Tipo de tarifa',
             feeAmountHeader: 'Importe de la tarifa',
             moreDetailsHeader: 'Más detalles',
@@ -1660,11 +1909,11 @@ export default {
             sendingFundsTitle: 'Enviar fondos a otro titular de cuenta',
             sendingFundsDetails: 'No se aplica ningún cargo por enviar fondos a otro titular de cuenta utilizando tu saldo cuenta bancaria o tarjeta de débito',
             electronicFundsStandardDetails:
-                'No hay cargo por transferir fondos desde tu billetera Expensify ' +
+                'No hay cargo por transferir fondos desde tu Billetera Expensify ' +
                 'a tu cuenta bancaria utilizando la opción estándar. Esta transferencia generalmente se completa en' +
                 '1-3 días laborables.',
             electronicFundsInstantDetails: ({percentage, amount}: ElectronicFundsParams) =>
-                'Hay una tarifa para transferir fondos desde tu billetera Expensify a ' +
+                'Hay una tarifa para transferir fondos desde tu Billetera Expensify a ' +
                 'la tarjeta de débito vinculada utilizando la opción de transferencia instantánea. Esta transferencia ' +
                 `generalmente se completa dentro de varios minutos. La tarifa es el ${percentage}% del importe de la ` +
                 `transferencia (con una tarifa mínima de ${amount}). `,
@@ -1687,7 +1936,7 @@ export default {
     activateStep: {
         headerTitle: 'Habilitar pagos',
         activatedTitle: '¡Billetera  activada!',
-        activatedMessage: 'Felicidades, tu Billetera está configurada y lista para hacer pagos.',
+        activatedMessage: 'Felicidades, tu billetera está configurada y lista para hacer pagos.',
         checkBackLaterTitle: 'Un momento...',
         checkBackLaterMessage: 'Todavía estamos revisando tu información. Por favor, vuelve más tarde.',
         continueToPayment: 'Continuar al pago',
@@ -1723,15 +1972,15 @@ export default {
     },
     personalInfoStep: {
         personalInfo: 'Información Personal',
-        enterYourLegalFirstAndLast: 'Introduce tu nombre y apellidos',
+        enterYourLegalFirstAndLast: '¿Cuál es tu nombre legal?',
         legalFirstName: 'Nombre',
         legalLastName: 'Apellidos',
         legalName: 'Nombre legal',
-        enterYourDateOfBirth: 'Introduce tu fecha de nacimiento',
-        enterTheLast4: 'Introduce los últimos 4 dígitos de tu número de la seguridad social',
-        dontWorry: 'No te preocupes, no hacemos ninguna verificación de crédito',
+        enterYourDateOfBirth: '¿Cuál es tu fecha de nacimiento?',
+        enterTheLast4: '¿Cuáles son los últimos 4 dígitos de tu número de la seguridad social?',
+        dontWorry: 'No te preocupes, no hacemos verificaciones de crédito personales.',
         last4SSN: 'Últimos 4 dígitos de tu número de la seguridad social',
-        enterYourAddress: 'Introduce tu dirección',
+        enterYourAddress: '¿Cuál es tu dirección?',
         address: 'Dirección',
         letsDoubleCheck: 'Revisemos que todo esté bien',
         byAddingThisBankAccount: 'Añadiendo esta cuenta bancaria, confirmas que has leído, entendido y aceptado',
@@ -1746,16 +1995,16 @@ export default {
     },
     businessInfoStep: {
         businessInfo: 'Información de la empresa',
-        enterTheNameOfYourBusiness: 'Introduce el nombre de tu empresa.',
+        enterTheNameOfYourBusiness: '¿Cuál es el nombre de tu empresa?',
         businessName: 'Nombre de la empresa',
-        enterYourCompanysTaxIdNumber: 'Introduce el número de identificación fiscal.',
+        enterYourCompanysTaxIdNumber: '¿Cuál es el número de identificación fiscal?',
         taxIDNumber: 'Número de identificación fiscal',
         taxIDNumberPlaceholder: '9 dígitos',
-        enterYourCompanysWebsite: 'Introduce la página web de tu empresa.',
+        enterYourCompanysWebsite: '¿Cuál es la página web de tu empresa?',
         companyWebsite: 'Página web de la empresa',
-        enterYourCompanysPhoneNumber: 'Introduce el número de teléfono de tu empresa.',
-        enterYourCompanysAddress: 'Introduce la dirección de tu empresa.',
-        selectYourCompanysType: 'Selecciona el tipo de empresa.',
+        enterYourCompanysPhoneNumber: '¿Cuál es el número de teléfono de tu empresa?',
+        enterYourCompanysAddress: '¿Cuál es la dirección de tu empresa?',
+        selectYourCompanysType: '¿Cuál es el tipo de empresa?',
         companyType: 'Tipo de empresa',
         incorporationType: {
             LLC: 'SRL',
@@ -1765,11 +2014,11 @@ export default {
             SOLE_PROPRIETORSHIP: 'Empresa individual',
             OTHER: 'Otros',
         },
-        selectYourCompanysIncorporationDate: 'Selecciona la fecha de constitución de la empresa.',
+        selectYourCompanysIncorporationDate: '¿Cuál es la fecha de constitución de la empresa?',
         incorporationDate: 'Fecha de constitución',
         incorporationDatePlaceholder: 'Fecha de inicio (yyyy-mm-dd)',
         incorporationState: 'Estado en el que se constituyó',
-        pleaseSelectTheStateYourCompanyWasIncorporatedIn: 'Selecciona el estado en el que se constituyó la empresa.',
+        pleaseSelectTheStateYourCompanyWasIncorporatedIn: '¿Cuál es el estado en el que se constituyó la empresa?',
         letsDoubleCheck: 'Verifiquemos que todo esté correcto',
         companyAddress: 'Dirección de la empresa',
         listOfRestrictedBusinesses: 'lista de negocios restringidos',
@@ -1781,14 +2030,14 @@ export default {
         areThereMoreIndividualsWhoOwn25percent: '¿Hay más personas que posean el 25% o más de',
         regulationRequiresUsToVerifyTheIdentity: 'La ley nos exige verificar la identidad de cualquier persona que posea más del 25% de la empresa.',
         companyOwner: 'Dueño de la empresa',
-        enterLegalFirstAndLastName: 'Introduce el nombre y apellidos legales del dueño.',
+        enterLegalFirstAndLastName: '¿Cuál es el nombre legal del dueño?',
         legalFirstName: 'Nombre legal',
         legalLastName: 'Apellidos legales',
-        enterTheDateOfBirthOfTheOwner: 'Introduce la fecha de nacimiento del dueño.',
-        enterTheLast4: 'Introduce los últimos 4 dígitos del número de la seguridad social del dueño.',
+        enterTheDateOfBirthOfTheOwner: '¿Cuál es la fecha de nacimiento del dueño?',
+        enterTheLast4: '¿Cuáles son los últimos 4 dígitos del número de la seguridad social del dueño?',
         last4SSN: 'Últimos 4 dígitos del número de la seguridad social',
         dontWorry: 'No te preocupes, ¡no realizamos verificaciones de crédito personales!',
-        enterTheOwnersAddress: 'Introduce la dirección del dueño.',
+        enterTheOwnersAddress: '¿Cuál es la dirección del dueño?',
         letsDoubleCheck: 'Vamos a verificar que todo esté correcto.',
         legalName: 'Nombre legal',
         address: 'Dirección',
@@ -1799,17 +2048,15 @@ export default {
         headerTitle: 'Validar cuenta bancaria',
         buttonText: 'Finalizar configuración',
         maxAttemptsReached: 'Se ha inhabilitado la validación de esta cuenta bancaria debido a demasiados intentos incorrectos.',
-        description:
-            'Uno o dos días después de añadir tu cuenta a Expensify, te enviaremos tres (3) transacciones a tu cuenta. Tienen un nombre de comerciante similar a "Expensify, Inc. Validation".',
+        description: 'Enviaremos tres (3) pequeñas transacciones a tu cuenta bancaria a nombre de "Expensify, Inc. Validation" dentro de los próximos 1-2 días laborables.',
         descriptionCTA: 'Introduce el importe de cada transacción en los campos siguientes. Ejemplo: 1.51.',
         reviewingInfo: '¡Gracias! Estamos revisando tu información y nos comunicaremos contigo en breve. Consulta el chat con Concierge ',
         forNextStep: ' para conocer los próximos pasos para terminar de configurar tu cuenta bancaria.',
         letsChatCTA: 'Sí, vamos a chatear',
-        letsChatText: 'Gracias. Necesitamos tu ayuda para verificar la información, pero podemos hacerlo rápidamente a través del chat. ¿Estás listo?',
+        letsChatText: '¡Ya casi estamos! Necesitamos tu ayuda para verificar unos últimos datos a través del chat. ¿Estás listo?',
         letsChatTitle: '¡Vamos a chatear!',
         enable2FATitle: 'Evita fraudes, activa la autenticación de dos factores!',
-        enable2FAText:
-            'Tu seguridad es importante para nosotros. Por favor, configura ahora la autenticación de dos factores. Eso nos permitirá disputar las transacciones de la Tarjeta Expensify y reducirá tu riesgo de fraude.',
+        enable2FAText: 'Tu seguridad es importante para nosotros. Por favor, configura ahora la autenticación de dos factores para añadir una capa adicional de protección a tu cuenta.',
         secureYourAccount: 'Asegura tu cuenta',
     },
     beneficialOwnersStep: {
@@ -1831,7 +2078,7 @@ export default {
         completeVerification: 'Completar la verificación',
         confirmAgreements: 'Por favor, confirma los acuerdos siguientes.',
         certifyTrueAndAccurate: 'Certifico que la información dada es verdadera y precisa',
-        certifyTrueAndAccurateError: 'Debe certificar que la información es verdadera y precisa',
+        certifyTrueAndAccurateError: 'Por favor, certifica que la información es verdadera y exacta',
         isAuthorizedToUseBankAccount: 'Estoy autorizado para usar la cuenta bancaria de mi empresa para gastos de empresa',
         isAuthorizedToUseBankAccountError: 'Debes ser el responsable oficial con autorización para operar la cuenta bancaria de la empresa.',
         termsAndConditions: 'Términos y Condiciones',
@@ -1843,17 +2090,15 @@ export default {
         validateButtonText: 'Validar',
         validationInputLabel: 'Transacción',
         maxAttemptsReached: 'La validación de esta cuenta bancaria se ha desactivado debido a demasiados intentos incorrectos.',
-        description:
-            'Un día o dos después de añadir tu cuenta a Expensify, te enviaremos tres (3) transacciones a tu cuenta. Tienen un nombre de comerciante similar a "Expensify, Inc. Validation".',
+        description: 'Enviaremos tres (3) pequeñas transacciones a tu cuenta bancaria a nombre de "Expensify, Inc. Validation" dentro de los próximos 1-2 días laborables.',
         descriptionCTA: 'Introduce el importe de cada transacción en los campos siguientes. Ejemplo: 1.51.',
         reviewingInfo: '¡Gracias! Estamos revisando tu información y nos comunicaremos contigo en breve. Consulta el chat con Concierge ',
         forNextSteps: ' para conocer los próximos pasos para terminar de configurar tu cuenta bancaria.',
         letsChatCTA: 'Sí, vamos a chatear',
-        letsChatText: 'Gracias. Necesitamos tu ayuda para verificar la información, pero podemos resolverlo rápidamente a través del chat. ¿Estás Listo?',
+        letsChatText: '¡Ya casi estamos! Necesitamos tu ayuda para verificar unos últimos datos a través del chat. ¿Estás listo?',
         letsChatTitle: '¡Vamos a chatear!',
         enable2FATitle: '¡Evita fraudes, activa la autenticación de dos factores!',
-        enable2FAText:
-            'Tu seguridad es importante para nosotros. Por favor, configura ahora la autenticación de dos factores. Eso nos permitirá disputar las transacciones de la Tarjeta Expensify y reducirá tu riesgo de fraude.',
+        enable2FAText: 'Tu seguridad es importante para nosotros. Por favor, configura ahora la autenticación de dos factores para añadir una capa adicional de protección a tu cuenta.',
         secureYourAccount: 'Asegura tu cuenta',
     },
     reimbursementAccountLoadingAnimation: {
@@ -1872,10 +2117,11 @@ export default {
             alerts: 'Obtén actualizaciones y alertas en tiempo real',
         },
         bookTravel: 'Reservar viajes',
+        bookDemo: 'Pedir demostración',
         termsAndConditions: {
             header: 'Antes de continuar...',
             title: 'Por favor, lee los Términos y condiciones para reservar viajes',
-            subtitle: 'Para permitir la opción de reservar viajes en su espacio de trabajo debe aceptar nuestros ',
+            subtitle: 'Para permitir la opción de reservar viajes en tu espacio de trabajo debe aceptar nuestros ',
             termsconditions: 'términos y condiciones',
             travelTermsAndConditions: 'términos y condiciones de viaje',
             helpDocIntro: 'Consulta este ',
@@ -1884,15 +2130,28 @@ export default {
             agree: 'Acepto los ',
             error: 'Debes aceptar los Términos y condiciones para que el viaje continúe',
         },
+        flight: 'Vuelo',
+        hotel: 'Hotel',
+        car: 'Auto',
+        viewTrip: 'Ver viaje',
+        viewTripDetails: 'Ver detalles del viaje',
+        trip: 'Viaje',
+        trips: 'Viajes',
+        tripSummary: 'Resumen del viaje',
+        departs: 'Sale',
+        errorMessage: 'Ha ocurrido un error. Por favor, inténtalo mas tarde.',
     },
     workspace: {
         common: {
             card: 'Tarjetas',
+            expensifyCard: 'Tarjeta Expensify',
             workflows: 'Flujos de trabajo',
             workspace: 'Espacio de trabajo',
+            companyCards: 'Tarjetas de empresa',
             edit: 'Editar espacio de trabajo',
             enabled: 'Activada',
             disabled: 'Desactivada',
+            everyone: 'Todos',
             delete: 'Eliminar espacio de trabajo',
             settings: 'Configuración',
             reimburse: 'Reembolsos',
@@ -1901,13 +2160,15 @@ export default {
             reportFields: 'Campos de informe',
             taxes: 'Impuestos',
             bills: 'Pagar facturas',
-            invoices: 'Enviar facturas',
+            invoices: 'Facturas',
             travel: 'Viajes',
             members: 'Miembros',
             accounting: 'Contabilidad',
+            rules: 'Reglas',
             plan: 'Plan',
             profile: 'Perfil',
             bankAccount: 'Cuenta bancaria',
+            displayedAs: 'Mostrado como',
             connectBankAccount: 'Conectar cuenta bancaria',
             testTransactions: 'Transacciones de prueba',
             issueAndManageCards: 'Emitir y gestionar tarjetas',
@@ -1916,8 +2177,8 @@ export default {
             settlementFrequency: 'Frecuencia de liquidación',
             deleteConfirmation: '¿Estás seguro de que quieres eliminar este espacio de trabajo?',
             unavailable: 'Espacio de trabajo no disponible',
-            memberNotFound: 'Miembro no encontrado. Para invitar a un nuevo miembro al espacio de trabajo, por favor, utiliza el botón Invitar que está arriba.',
-            notAuthorized: `No tienes acceso a esta página. ¿Estás tratando de unirte al espacio de trabajo? Comunícate con el propietario de este espacio de trabajo para que pueda añadirte como miembro. ¿Necesitas algo más? Comunícate con ${CONST.EMAIL.CONCIERGE}`,
+            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. Si estás intentando unirte a este espacio de trabajo, pide al dueño del espacio de trabajo que te añada como miembro. ¿Necesitas algo más? Comunícate con ${CONST.EMAIL.CONCIERGE}`,
             goToRoom: ({roomName}: GoToRoomParams) => `Ir a la sala ${roomName}`,
             workspaceName: 'Nombre del espacio de trabajo',
             workspaceOwner: 'Dueño',
@@ -1929,30 +2190,46 @@ export default {
             distanceRates: 'Tasas de distancia',
             welcomeNote: ({workspaceName}: WelcomeNoteParams) =>
                 `¡Has sido invitado a ${workspaceName}! Descargue la aplicación móvil Expensify en use.expensify.com/download para comenzar a rastrear sus gastos.`,
+            subscription: 'Suscripción',
+            markAsExported: 'Marcar como introducido manualmente',
+            exportIntegrationSelected: (connectionName: ConnectionName) => `Exportar a  ${CONST.POLICY.CONNECTIONS.NAME_USER_FRIENDLY[connectionName]}`,
+            letsDoubleCheck: 'Verifiquemos que todo esté correcto',
+            reportField: 'Campo del informe',
+            lineItemLevel: 'Nivel de partida',
+            reportLevel: 'Nivel de informe',
+            appliedOnExport: 'No se importa en Expensify, se aplica en la exportación',
+            shareNote: {
+                header: 'Comparte fácilmente tu espacio de trabajo con otros miembros.',
+                content: {
+                    firstPart:
+                        'Comparte este código QR o copia el enlace de abajo para facilitar que los miembros soliciten acceso a tu espacio de trabajo. Todas las solicitudes para unirse al espacio de trabajo aparecerán en la sala',
+                    secondPart: 'para tu revisión.',
+                },
+            },
+            createNewConnection: 'Crear una nueva conexión',
+            reuseExistingConnection: 'Reutilizar la conexión existente',
+            existingConnections: 'Conexiones existentes',
+            lastSyncDate: (connectionName: string, formattedDate: string) => `${connectionName} - Última sincronización ${formattedDate}`,
+            topLevel: 'Nivel superior',
         },
         qbo: {
             importDescription: 'Elige que configuraciónes de codificación son importadas desde QuickBooks Online a Expensify.',
             classes: 'Clases',
             locations: 'Lugares',
-            customers: 'Clientes/Proyectos',
-            displayedAs: 'Mostrado como',
-            accountsDescription: 'Los planes de cuentas se importan como categorías cuando está conectado con una integración de contaduría, esto no se puede desactivar.',
-            accountsSwitchTitle: 'Habilita el plan de cuentas recien importado',
-            accountsSwitchDescription: 'Las nuevas categorías importadas desde QuickBooks Online a Expensify serán activadas o desactivadas por defecto.',
-            classesDescription: 'Elige si quieres importar las clases y donde las clases son mostradas.',
-            customersDescription: 'Elige si queres importar clientes/proyectos y donde los clientes/proyectos son mostrados.',
-            locationsDescription: 'Elige si quieres importar lugares y donde los lugares son mostrados.',
-            taxesDescription: 'Elige si quires importar las tasas de impuestos y  los impuestos por defecto de tu integración de contaduría.',
+            customers: 'Clientes/proyectos',
+            accountsDescription: 'Tu plan de cuentas de Quickbooks Online se importará a Expensify como categorías.',
+            accountsSwitchTitle: 'Elige importar cuentas nuevas como categorías activadas o desactivadas.',
+            accountsSwitchDescription: 'Las categorías activas estarán disponibles para ser escogidas cuando se crea un gasto.',
+            classesDescription: 'Elige cómo gestionar las clases de QuickBooks Online en Expensify.',
+            customersDescription: 'Elige cómo gestionar los clientes/proyectos de QuickBooks Online en Expensify.',
+            locationsDescription: 'Elige cómo gestionar los lugares de QuickBooks Online en Expensify.',
+            taxesDescription: 'Elige cómo gestionar los impuestos de QuickBooks Online en Expensify.',
+            taxesJournalEntrySwitchNote: 'QuickBooks Online no permite impuestos en los asientos contables. Por favor, cambia la opción de exportación a factura de proveedor o cheque.',
             locationsAdditionalDescription:
-                'Los lugares son importados como Etiquegas. Esto limita a exportar los informes de gastos como Factura del Proveedor o Cheques a Quicbooks Online. Para desbloquear estas opciones de exportación desactiva la importación de Lugares o cambia al Plan Control para exportar Lugares como Campos de Informes.',
-            export: 'Exportar',
-            exportAs: 'Exportar cómo',
-            exportExpenses: 'Exportar gastos de bolsillo como',
+                'QuickBooks Online no permite lugares en facturas de proveedores o cheques. Como tienes activadas los lugares en tu espacio de trabajo, estas opciones de exportación no están disponibles.',
             exportInvoices: 'Exportar facturas a',
-            exportCompany: 'Exportar tarjetas de empresa como',
             exportDescription: 'Configura cómo se exportan los datos de Expensify a QuickBooks Online.',
-            preferredExporter: 'Exportador preferido',
-            date: 'Fecha',
+            date: 'Fecha de exportación',
             deepDiveExpensifyCard: 'Las transacciones de la Tarjeta Expensify se exportan automáticamente a una "Cuenta de Responsabilidad de la Tarjeta Expensify" creada con',
             deepDiveExpensifyCardIntegration: 'nuestra integración.',
             exportExpensifyCard: 'Exportar las transacciones de las tarjetas Expensify como',
@@ -1962,62 +2239,58 @@ export default {
                 values: {
                     [CONST.QUICKBOOKS_EXPORT_DATE.LAST_EXPENSE]: {
                         label: 'Fecha del último gasto',
-                        description: 'Fecha del gasto mas reciente en el informe',
+                        description: 'Fecha del gasto mas reciente en el informe.',
                     },
                     [CONST.QUICKBOOKS_EXPORT_DATE.REPORT_EXPORTED]: {
                         label: 'Fecha de exportación',
-                        description: 'Fecha de exportación del informe a QuickBooks Online',
+                        description: 'Fecha de exportación del informe a QuickBooks Online.',
                     },
                     [CONST.QUICKBOOKS_EXPORT_DATE.REPORT_SUBMITTED]: {
                         label: 'Fecha de envío',
-                        description: 'Fecha en la que el informe se envió para su aprobación',
+                        description: 'Fecha en la que el informe se envió para tu aprobación.',
                     },
                 },
             },
             receivable: 'Cuentas por cobrar', // This is an account name that will come directly from QBO, so I don't know why we need a translation for it. It should take whatever the name of the account is in QBO. Leaving this note for CS.
             archive: 'Archivo de cuentas por cobrar', // This is an account name that will come directly from QBO, so I don't know why we need a translation for it. It should take whatever the name of the account is in QBO. Leaving this note for CS.
-            exportInvoicesDescription: 'Las facturas se exportarán a esta cuenta en QuickBooks Online.',
+            exportInvoicesDescription: 'Usa esta cuenta al exportar facturas a QuickBooks Online.',
             exportCompanyCardsDescription: 'Establece cómo se exportan las compras con tarjeta de empresa a QuickBooks Online.',
             account: 'Cuenta',
+            accountDescription: 'Elige dónde contabilizar los asientos contables.',
             vendor: 'Proveedor',
-            defaultVendor: 'Proveedor predeterminado',
             defaultVendorDescription: 'Establece un proveedor predeterminado que se aplicará a todas las transacciones con tarjeta de crédito al momento de exportarlas.',
             accountsPayable: 'Cuentas por pagar',
-            accountsPayableDescription: 'Esta es la cuenta de cuentas por pagar elegida, contra la cual se crean las facturas de proveedores para cada informe.',
-            optionBelow: 'Elija una opción a continuación:',
+            accountsPayableDescription: 'Elige dónde crear las facturas de proveedores.',
+            bankAccount: 'Cuenta bancaria',
+            bankAccountDescription: 'Elige desde dónde enviar los cheques.',
+            creditCardAccount: 'Cuenta de la tarjeta de crédito',
             companyCardsLocationEnabledDescription:
-                'Nota: QuickBooks Online no admite un campo para Ubicaciones como etiquetas en las exportaciones de facturas de proveedores. A medida que importa ubicaciones, esta opción de exportación no está disponible.',
-            exportPreferredExporterNote:
-                'Puede ser cualquier administrador del espacio de trabajo, pero debe ser un administrador de dominio si configura diferentes cuentas de exportación para tarjetas de empresa individuales en la configuración del dominio.',
-            exportPreferredExporterSubNote: 'Una vez configurado, el exportador preferido verá los informes para exportar en su cuenta.',
+                'QuickBooks Online no permite lugares en las exportaciones de facturas de proveedores. Como tienes activadas los lugares en tu espacio de trabajo, esta opción de exportación no está disponible.',
             exportOutOfPocketExpensesDescription: 'Establezca cómo se exportan los gastos de bolsillo a QuickBooks Online.',
+            exportCheckDescription: 'Crearemos un cheque desglosado para cada informe de Expensify y lo enviaremos desde la cuenta bancaria a continuación.',
+            exportJournalEntryDescription: 'Crearemos una entrada contable desglosada para cada informe de Expensify y lo contabilizaremos en la cuenta a continuación.',
             exportVendorBillDescription:
-                'Crearemos una única factura de proveedor detallada para cada informe de Expensify. Si el período de la factura está cerrado, lo publicaremos en el día 1 del siguiente período abierto. Puede agregar la factura del proveedor a la cuenta A/P de su elección (a continuación).',
+                'Crearemos una factura de proveedor desglosada para cada informe de Expensify y la añadiremos a la cuenta a continuación. Si este periodo está cerrado, lo contabilizaremos en el día 1 del siguiente periodo abierto.',
             outOfPocketTaxEnabledDescription:
-                'Nota: QuickBooks Online no admite un campo para impuestos en las exportaciones de Anotación en el diario. Debido a que tienes habilitado el seguimiento de impuestos en tu área de trabajo, esta opción de exportación no está disponible.',
-            outOfPocketTaxEnabledError: 'La Anotacion en el diario no está disponible cuando los impuestos están activados. Por favor, selecciona una opción de exportación diferente.',
-            outOfPocketLocationEnabledError: 'Las facturas de proveedores no están disponibles cuando las ubicaciones están activadas. Seleccione otra opción de exportación.',
+                'QuickBooks Online no permite impuestos en las exportaciones de entradas a los asientos contables. Como tienes los impuestos activados en tu espacio de trabajo, esta opción de exportación no está disponible.',
+            outOfPocketTaxEnabledError: 'La anotacion en el diario no está disponible cuando los impuestos están activados. Por favor, selecciona otra opción de exportación diferente.',
+            outOfPocketLocationEnabledError:
+                'Las facturas de proveedores no están disponibles cuando las ubicaciones están activadas. Por favor, selecciona otra opción de exportación diferente.',
             outOfPocketLocationEnabledDescription:
-                'Nota: QuickBooks Online no admite un campo para Ubicaciones como Etiquetas en las exportaciones de Facturas de Proveedor. Al importar Ubicaciones como Etiquetas, esta opción de exportación no está disponible.',
+                'QuickBooks Online no permite lugares en facturas de proveedores o cheques. Como tienes activadas los lugares en tu espacio de trabajo, estas opciones de exportación no están disponibles.',
 
             advancedConfig: {
-                advanced: 'Avanzado',
-                autoSync: 'Autosincronización',
-                autoSyncDescription: 'Los cambios realizados en Quickbooks se reflejarán automáticamente en Expensify.',
+                autoSyncDescription: 'Expensify se sincronizará automáticamente con QuickBooks Online todos los días.',
                 inviteEmployees: 'Invitar empleados',
                 inviteEmployeesDescription: 'Importe los registros de los empleados de Quickbooks Online e invítelos a este espacio de trabajo.',
                 createEntities: 'Crear entidades automáticamente',
-                createEntitiesDescription:
-                    'Expensify creará automáticamente un proveedor en Quickbooks, si no existe. Expensify también creará automáticamente un cliente al exportar facturas.',
-                reimbursedReports: 'Sincronizar informes reembolsados',
+                createEntitiesDescription: 'Expensify creará automáticamente proveedores en QuickBooks Online si aún no existen, y creará automáticamente clientes al exportar facturas.',
                 reimbursedReportsDescription:
-                    'Cada vez que se pague un informe utilizando Expensify ACH, se creará el correspondiente pago de la factura en la cuenta de Quickbooks indicadas a continuación.',
+                    'Cada vez que se pague un informe utilizando Expensify ACH, se creará el correspondiente pago de la factura en la cuenta de Quickbooks Online indicadas a continuación.',
                 qboBillPaymentAccount: 'Cuenta de pago de las facturas de QuickBooks',
                 qboInvoiceCollectionAccount: 'Cuenta de cobro de las facturas QuickBooks',
-                accountSelectDescription:
-                    'Como has activado la sincronización de los informes de reembolso, tendrás que seleccionar la cuenta bancaria de la que saldrán tus reembolsos y crearemos el pago en QuickBooks.',
-                invoiceAccountSelectDescription:
-                    'Si está exportando facturas de Expensify a Quickbooks Online, ésta es la cuenta en la que aparecerá la factura una vez marcada como pagada.',
+                accountSelectDescription: 'Elige desde dónde pagar las facturas y crearemos el pago en QuickBooks Online.',
+                invoiceAccountSelectorDescription: 'Elige dónde recibir los pagos de facturas y crearemos el pago en QuickBooks Online.',
             },
             accounts: {
                 [CONST.QUICKBOOKS_NON_REIMBURSABLE_EXPORT_ACCOUNT_TYPE.DEBIT_CARD]: 'Tarjeta de débito',
@@ -2031,42 +2304,489 @@ export default {
                 [`${CONST.QUICKBOOKS_NON_REIMBURSABLE_EXPORT_ACCOUNT_TYPE.CREDIT_CARD}Description`]:
                     "Automáticamente relacionaremos el nombre del comerciante de la transacción con tarjeta de crédito con cualquier proveedor correspondiente en QuickBooks. Si no existen proveedores, crearemos un proveedor asociado 'Credit Card Misc.'.",
                 [`${CONST.QUICKBOOKS_REIMBURSABLE_ACCOUNT_TYPE.VENDOR_BILL}Description`]:
-                    'Crearemos una única factura detallada con los proveedores por cada informe de Expensify, con fecha del último gasto en el informe. Si este período está cerrado, la publicaremos con fecha del día 1 del próximo período abierto. Puede añadir la factura del proveedor a la cuenta A/P de su elección (a continuación).',
+                    'Crearemos una factura de proveedor desglosada para cada informe de Expensify con la fecha del último gasto, y la añadiremos a la cuenta a continuación. Si este periodo está cerrado, lo contabilizaremos en el día 1 del siguiente periodo abierto.',
 
-                [`${CONST.QUICKBOOKS_NON_REIMBURSABLE_EXPORT_ACCOUNT_TYPE.DEBIT_CARD}AccountDescription`]:
-                    'Las transacciones con tarjeta de débito se exportarán a la cuenta bancaria que aparece a continuación.”',
-                [`${CONST.QUICKBOOKS_NON_REIMBURSABLE_EXPORT_ACCOUNT_TYPE.CREDIT_CARD}AccountDescription`]:
-                    'Las transacciones con tarjeta de crédito se exportarán a la cuenta bancaria que aparece a continuación.',
+                [`${CONST.QUICKBOOKS_NON_REIMBURSABLE_EXPORT_ACCOUNT_TYPE.DEBIT_CARD}AccountDescription`]: 'Elige dónde exportar las transacciones con tarjeta de débito.',
+                [`${CONST.QUICKBOOKS_NON_REIMBURSABLE_EXPORT_ACCOUNT_TYPE.CREDIT_CARD}AccountDescription`]: 'Elige dónde exportar las transacciones con tarjeta de crédito.',
                 [`${CONST.QUICKBOOKS_REIMBURSABLE_ACCOUNT_TYPE.VENDOR_BILL}AccountDescription`]: 'Selecciona el proveedor que se aplicará a todas las transacciones con tarjeta de crédito.',
 
                 [`${CONST.QUICKBOOKS_REIMBURSABLE_ACCOUNT_TYPE.VENDOR_BILL}Error`]:
-                    'Las facturas de proveedores no están disponibles cuando las ubicaciones están habilitadas. Seleccione una opción de exportación diferente.',
+                    'Las facturas de proveedores no están disponibles cuando las ubicaciones están habilitadas. Por favor, selecciona otra opción de exportación diferente.',
                 [`${CONST.QUICKBOOKS_REIMBURSABLE_ACCOUNT_TYPE.CHECK}Error`]:
-                    'La verificación no está disponible cuando las ubicaciones están habilitadas. Seleccione una opción de exportación diferente.',
+                    'La verificación no está disponible cuando las ubicaciones están habilitadas. Por favor, selecciona otra opción de exportación diferente.',
                 [`${CONST.QUICKBOOKS_REIMBURSABLE_ACCOUNT_TYPE.JOURNAL_ENTRY}Error`]:
-                    'El asiento de diario no está disponible cuando los impuestos están habilitados. seleccione una opción de exportación diferente.',
+                    'El asiento de diario no está disponible cuando los impuestos están habilitados. Por favor, selecciona otra opción de exportación diferente.',
             },
+            noAccountsFound: 'No se ha encontrado ninguna cuenta',
+            noAccountsFoundDescription: 'Añade la cuenta en Quickbooks Online y sincroniza de nuevo la conexión.',
         },
         xero: {
             organization: 'Organización Xero',
             organizationDescription: 'Seleccione la organización en Xero desde la que está importando los datos.',
             importDescription: 'Elija qué configuraciones de codificación se importan de Xero a Expensify.',
+            accountsDescription: 'Tu plan de cuentas de Xero se importará a Expensify como categorías.',
+            accountsSwitchTitle: 'Elige importar cuentas nuevas como categorías activadas o desactivadas.',
+            accountsSwitchDescription: 'Las categorías activas estarán disponibles para ser escogidas cuando se crea un gasto.',
             trackingCategories: 'Categorías de seguimiento',
+            trackingCategoriesDescription: 'Elige cómo gestionar categorías de seguimiento de Xero en Expensify.',
+            mapTrackingCategoryTo: ({categoryName}) => `Asignar ${categoryName} de Xero a`,
+            mapTrackingCategoryToDescription: ({categoryName}) => `Elige dónde mapear ${categoryName} al exportar a Xero.`,
             customers: 'Volver a facturar a los clientes',
             customersDescription:
-                'Importar contactos de clientes. Los gastos facturables necesitan etiquetas para la exportación. Los gastos llevarán la información del cliente a Xero para las facturas de ventas.',
-            taxesDescription: 'Elige si quires importar las tasas de impuestos y  los impuestos por defecto de tu integración de contaduría.',
+                'Elige si quieres volver a facturar a los clientes en Expensify. Tus contactos de clientes de Xero se pueden etiquetar como gastos, y se exportarán a Xero como una factura de venta.',
+            taxesDescription: 'Elige cómo gestionar los impuestos de Xero en Expensify.',
             notImported: 'No importado',
+            notConfigured: 'No configurado',
+            trackingCategoriesOptions: {
+                default: 'Contacto de Xero por defecto',
+                tag: 'Etiquetas',
+            },
+            exportDescription: 'Configura cómo se exportan los datos de Expensify a Xero.',
+            purchaseBill: 'Factura de compra',
+            exportDeepDiveCompanyCard:
+                'Cada gasto exportado se contabiliza como una transacción bancaria en la cuenta bancaria de Xero que selecciones a continuación. Las fechas de las transacciones coincidirán con las fechas de el extracto bancario.',
+            bankTransactions: 'Transacciones bancarias',
+            xeroBankAccount: 'Cuenta bancaria de Xero',
+            xeroBankAccountDescription: 'Elige dónde se contabilizarán los gastos como transacciones bancarias.',
+            exportExpensesDescription: 'Los informes se exportarán como una factura de compra utilizando la fecha y el estado que seleccione a continuación',
+            purchaseBillDate: 'Fecha de la factura de compra',
+            exportInvoices: 'Exportar facturas como',
+            salesInvoice: 'Factura de venta',
+            exportInvoicesDescription: 'Las facturas de venta siempre muestran la fecha en la que se envió la factura.',
             advancedConfig: {
-                advanced: 'Avanzado',
-                autoSync: 'Autosincronización',
-                autoSyncDescription: 'Sincroniza Xero y Expensify automáticamente todos los días.',
-                purchaseBillStatusTitle: 'Set purchase bill status (optional)',
-                reimbursedReports: 'Sincronizar informes reembolsados',
+                autoSyncDescription: 'Expensify se sincronizará automáticamente con Xero todos los días.',
+                purchaseBillStatusTitle: 'Estado de la factura de compra',
                 reimbursedReportsDescription:
                     'Cada vez que se pague un informe utilizando Expensify ACH, se creará el correspondiente pago de la factura en la cuenta de Xero indicadas a continuación.',
                 xeroBillPaymentAccount: 'Cuenta de pago de las facturas de Xero',
                 xeroInvoiceCollectionAccount: 'Cuenta de cobro de las facturas Xero',
+                xeroBillPaymentAccountDescription: 'Elige desde dónde pagar las facturas y crearemos el pago en Xero.',
+                invoiceAccountSelectorDescription: 'Elige dónde recibir los pagos de facturas y crearemos el pago en Xero.',
+            },
+            exportDate: {
+                label: 'Fecha de la factura de compra',
+                description: 'Usa esta fecha al exportar el informe a Xero.',
+                values: {
+                    [CONST.XERO_EXPORT_DATE.LAST_EXPENSE]: {
+                        label: 'Fecha del último gasto',
+                        description: 'Fecha del gasto mas reciente en el informe.',
+                    },
+                    [CONST.XERO_EXPORT_DATE.REPORT_EXPORTED]: {
+                        label: 'Fecha de exportación',
+                        description: 'Fecha de exportación del informe a Xero.',
+                    },
+                    [CONST.XERO_EXPORT_DATE.REPORT_SUBMITTED]: {
+                        label: 'Fecha de envío',
+                        description: 'Fecha en la que el informe se envió para su aprobación.',
+                    },
+                },
+            },
+            invoiceStatus: {
+                label: 'Estado de la factura de compra',
+                description: 'Usa este estado al exportar facturas de compra a Xero.',
+                values: {
+                    [CONST.XERO_CONFIG.INVOICE_STATUS.DRAFT]: 'Borrador',
+                    [CONST.XERO_CONFIG.INVOICE_STATUS.AWAITING_APPROVAL]: 'Pendiente de aprobación',
+                    [CONST.XERO_CONFIG.INVOICE_STATUS.AWAITING_PAYMENT]: 'Pendiente de pago',
+                },
+            },
+            noAccountsFound: 'No se ha encontrado ninguna cuenta',
+            noAccountsFoundDescription: 'Añade la cuenta en Xero y sincroniza de nuevo la conexión.',
+        },
+
+        sageIntacct: {
+            preferredExporter: 'Exportador preferido',
+            notConfigured: 'No configurado',
+            exportDate: {
+                label: 'Fecha de exportación',
+                description: 'Utilice esta fecha cuando exporte informes a Sage Intacct.',
+                values: {
+                    [CONST.SAGE_INTACCT_EXPORT_DATE.LAST_EXPENSE]: {
+                        label: 'Fecha del último gasto',
+                        description: 'Fecha del gasto más reciente del informe.',
+                    },
+                    [CONST.SAGE_INTACCT_EXPORT_DATE.EXPORTED]: {
+                        label: 'Fecha de exportación',
+                        description: 'Fecha en la que se exportó el informe a Sage Intacct.',
+                    },
+                    [CONST.SAGE_INTACCT_EXPORT_DATE.SUBMITTED]: {
+                        label: 'Fecha de envío',
+                        description: 'Fecha de presentación del informe para su aprobación.',
+                    },
+                },
+            },
+            reimbursableExpenses: {
+                description: 'Establece cómo se exportan los gastos por cuenta propia a Sage Intacct.',
+                values: {
+                    [CONST.SAGE_INTACCT_REIMBURSABLE_EXPENSE_TYPE.EXPENSE_REPORT]: 'Informes de gastos',
+                    [CONST.SAGE_INTACCT_REIMBURSABLE_EXPENSE_TYPE.VENDOR_BILL]: 'Facturas de proveedores',
+                },
+            },
+            nonReimbursableExpenses: {
+                description: 'Establece cómo se exportan las compras con tarjeta de empresa a Sage Intacct.',
+                values: {
+                    [CONST.SAGE_INTACCT_NON_REIMBURSABLE_EXPENSE_TYPE.CREDIT_CARD_CHARGE]: 'Tarjetas de crédito',
+                    [CONST.SAGE_INTACCT_NON_REIMBURSABLE_EXPENSE_TYPE.VENDOR_BILL]: 'Facturas de proveedores',
+                },
+            },
+            creditCardAccount: 'Cuenta de tarjeta de crédito',
+            defaultVendor: 'Proveedor por defecto',
+            defaultVendorDescription: (isReimbursable: boolean): string =>
+                `Establezca un proveedor predeterminado que se aplicará a los gastos ${isReimbursable ? '' : 'no '}reembolsables que no tienen un proveedor coincidente en Sage Intacct.`,
+            exportDescription: 'Configure cómo se exportan los datos de Expensify a Sage Intacct.',
+            exportPreferredExporterNote:
+                'El exportador preferido puede ser cualquier administrador del área de trabajo, pero también debe ser un administrador del dominio si establece diferentes cuentas de exportación para tarjetas de empresa individuales en Configuración del dominio.',
+            exportPreferredExporterSubNote: 'Una vez configurado, el exportador preferido verá los informes para exportar en su cuenta.',
+            noAccountsFound: 'No se ha encontrado ninguna cuenta',
+            noAccountsFoundDescription: 'Añade la cuenta en Sage Intacct y sincroniza de nuevo la conexión.',
+            autoSync: 'Sincronización automática',
+            autoSyncDescription: 'Sincronice Sage Intacct y Expensify automáticamente, todos los días.',
+            inviteEmployees: 'Invitar a los empleados',
+            inviteEmployeesDescription:
+                'Importe los registros de empleados de Sage Intacct e invite a los empleados a este espacio de trabajo. Su flujo de trabajo de aprobación será por defecto la aprobación del gerente y se puede configurar aún más en la página Miembros.',
+            syncReimbursedReports: 'Sincronizar informes reembolsados',
+            syncReimbursedReportsDescription:
+                'Cuando un informe se reembolsa utilizando Expensify ACH, la factura de compra correspondiente se creará en la cuenta de Sage Intacct a continuación.',
+            paymentAccount: 'Cuenta de pago Sage Intacct',
+        },
+        netsuite: {
+            subsidiary: 'Subsidiaria',
+            subsidiarySelectDescription: 'Elige la subsidiaria de NetSuite de la que deseas importar datos.',
+            exportDescription: 'Configura cómo se exportan los datos de Expensify a NetSuite.',
+            exportInvoices: 'Exportar facturas a',
+            journalEntriesTaxPostingAccount: 'Cuenta de registro de impuestos de asientos contables',
+            journalEntriesProvTaxPostingAccount: 'Cuenta de registro de impuestos provinciales de asientos contables',
+            foreignCurrencyAmount: 'Exportar importe en moneda extranjera',
+            exportToNextOpenPeriod: 'Exportar al siguiente período abierto',
+            nonReimbursableJournalPostingAccount: 'Cuenta de registro de diario no reembolsable',
+            reimbursableJournalPostingAccount: 'Cuenta de registro de diario reembolsable',
+            journalPostingPreference: {
+                label: 'Preferencia de registro de asientos contables',
+                values: {
+                    [CONST.NETSUITE_JOURNAL_POSTING_PREFERENCE.JOURNALS_POSTING_INDIVIDUAL_LINE]: 'Entrada única y detallada para cada informe',
+                    [CONST.NETSUITE_JOURNAL_POSTING_PREFERENCE.JOURNALS_POSTING_TOTAL_LINE]: 'Entrada única para cada gasto individual',
+                },
+            },
+            invoiceItem: {
+                label: 'Artículo de la factura',
+                values: {
+                    [CONST.NETSUITE_INVOICE_ITEM_PREFERENCE.CREATE]: {
+                        label: 'Crear uno para mí',
+                        description: "Crearemos un 'Artículo de línea de factura de Expensify' para ti al exportar (si aún no existe).",
+                    },
+                    [CONST.NETSUITE_INVOICE_ITEM_PREFERENCE.SELECT]: {
+                        label: 'Seleccionar existente',
+                        description: 'Asociaremos las facturas de Expensify al artículo seleccionado a continuación.',
+                    },
+                },
+            },
+            exportDate: {
+                label: 'Fecha de exportación',
+                description: 'Usa esta fecha al exportar informe a NetSuite.',
+                values: {
+                    [CONST.NETSUITE_EXPORT_DATE.LAST_EXPENSE]: {
+                        label: 'Fecha del último gasto',
+                        description: 'Fecha del gasto mas reciente en el informe.',
+                    },
+                    [CONST.NETSUITE_EXPORT_DATE.EXPORTED]: {
+                        label: 'Fecha de exportación',
+                        description: 'Fecha de exportación del informe a NetSuite.',
+                    },
+                    [CONST.NETSUITE_EXPORT_DATE.SUBMITTED]: {
+                        label: 'Fecha de envío',
+                        description: 'Fecha en la que el informe se envió para su aprobación.',
+                    },
+                },
+            },
+            exportDestination: {
+                values: {
+                    [CONST.NETSUITE_EXPORT_DESTINATION.EXPENSE_REPORT]: {
+                        label: 'Informes de gastos',
+                        reimbursableDescription: 'Los gastos reembolsables se exportarán como informes de gastos a NetSuite.',
+                        nonReimbursableDescription: 'Los gastos no reembolsables se exportarán como informes de gastos a NetSuite.',
+                    },
+                    [CONST.NETSUITE_EXPORT_DESTINATION.VENDOR_BILL]: {
+                        label: 'Facturas de proveedores',
+                        reimbursableDescription:
+                            'Los gastos reembolsables se exportarán como facturas pagaderas al proveedor especificado en NetSuite.\n' +
+                            '\n' +
+                            'Si deseas establecer un proveedor específico para cada tarjeta, ve a *Configuraciones > Dominios > Tarjetas de Empresa*.',
+                        nonReimbursableDescription:
+                            'Los gastos no reembolsables se exportarán como facturas pagaderas al proveedor especificado en NetSuite.\n' +
+                            '\n' +
+                            'Si deseas establecer un proveedor específico para cada tarjeta, ve a *Configuraciones > Dominios > Tarjetas de Empresa*.',
+                    },
+                    [CONST.NETSUITE_EXPORT_DESTINATION.JOURNAL_ENTRY]: {
+                        label: 'Asientos contables',
+                        reimbursableDescription:
+                            'Los gastos reembolsables se exportarán como asientos contables a la cuenta especificada en NetSuite.\n' +
+                            '\n' +
+                            'Si deseas establecer un proveedor específico para cada tarjeta, ve a *Configuraciones > Dominios > Tarjetas de Empresa*.',
+                        nonReimbursableDescription:
+                            'Los gastos no reembolsables se exportarán como asientos contables a la cuenta especificada en NetSuite.\n' +
+                            '\n' +
+                            'Si deseas establecer un proveedor específico para cada tarjeta, ve a *Configuraciones > Dominios > Tarjetas de Empresa*.',
+                    },
+                },
+            },
+            advancedConfig: {
+                autoSyncDescription: 'Expensify se sincronizará automáticamente con NetSuite todos los días.',
+                reimbursedReportsDescription:
+                    'Cada vez que se pague un informe utilizando Expensify ACH, se creará el correspondiente pago de la factura en la cuenta de NetSuite indicadas a continuación.',
+                reimbursementsAccount: 'Cuenta de reembolsos',
+                reimbursementsAccountDescription: 'Elija la cuenta bancaria que utilizará para los reembolsos y crearemos el pago asociado en NetSuite.',
+                collectionsAccount: 'Cuenta de cobros',
+                collectionsAccountDescription: 'Una vez que una factura se marca como pagada en Expensify y se exporta a NetSuite, aparecerá contra la cuenta de abajo.',
+                approvalAccount: 'Cuenta de aprobación de cuentas por pagar',
+                approvalAccountDescription:
+                    'Elija la cuenta con la que se aprobarán las transacciones en NetSuite. Si está sincronizando informes reembolsados, esta es también la cuenta con la que se crearán los pagos de facturas.',
+                defaultApprovalAccount: 'Preferencia predeterminada de NetSuite',
+                inviteEmployees: 'Invitar empleados y establecer aprobaciones',
+                inviteEmployeesDescription:
+                    'Importar registros de empleados de NetSuite e invitar a empleados a este espacio de trabajo. Su flujo de trabajo de aprobación será por defecto la aprobación del gerente y se puede configurar más en la página *Miembros*.',
+                autoCreateEntities: 'Crear automáticamente empleados/proveedores',
+                enableCategories: 'Activar categorías recién importadas',
+                customFormID: 'ID de formulario personalizado',
+                customFormIDDescription:
+                    'Por defecto, Expensify creará entradas utilizando el formulario de transacción preferido configurado en NetSuite. Alternativamente, tienes la opción de designar un formulario de transacción específico para ser utilizado.',
+                customFormIDReimbursable: 'Gasto reembolsable',
+                customFormIDNonReimbursable: 'Gasto no reembolsable',
+                exportReportsTo: {
+                    label: 'Nivel de aprobación del informe de gastos',
+                    description:
+                        'Una vez aprobado un informe de gastos en Expensify y exportado a NetSuite, puede establecer un nivel adicional de aprobación en NetSuite antes de su contabilización.',
+                    values: {
+                        [CONST.NETSUITE_REPORTS_APPROVAL_LEVEL.REPORTS_APPROVED_NONE]: 'Preferencia predeterminada de NetSuite',
+                        [CONST.NETSUITE_REPORTS_APPROVAL_LEVEL.REPORTS_SUPERVISOR_APPROVED]: 'Solo aprobado por el supervisor',
+                        [CONST.NETSUITE_REPORTS_APPROVAL_LEVEL.REPORTS_ACCOUNTING_APPROVED]: 'Solo aprobado por contabilidad',
+                        [CONST.NETSUITE_REPORTS_APPROVAL_LEVEL.REPORTS_APPROVED_BOTH]: 'Aprobado por supervisor y contabilidad',
+                    },
+                },
+                exportVendorBillsTo: {
+                    label: 'Nivel de aprobación de facturas de proveedores',
+                    description:
+                        'Una vez aprobada una factura de proveedor en Expensify y exportada a NetSuite, puede establecer un nivel adicional de aprobación en NetSuite antes de su contabilización.',
+                    values: {
+                        [CONST.NETSUITE_VENDOR_BILLS_APPROVAL_LEVEL.VENDOR_BILLS_APPROVED_NONE]: 'Preferencia predeterminada de NetSuite',
+                        [CONST.NETSUITE_VENDOR_BILLS_APPROVAL_LEVEL.VENDOR_BILLS_APPROVAL_PENDING]: 'Aprobación pendiente',
+                        [CONST.NETSUITE_VENDOR_BILLS_APPROVAL_LEVEL.VENDOR_BILLS_APPROVED]: 'Aprobado para publicación',
+                    },
+                },
+                exportJournalsTo: {
+                    label: 'Nivel de aprobación de asientos contables',
+                    description: 'Una vez aprobado un asiento en Expensify y exportado a NetSuite, puede establecer un nivel adicional de aprobación en NetSuite antes de contabilizarlo.',
+                    values: {
+                        [CONST.NETSUITE_JOURNALS_APPROVAL_LEVEL.JOURNALS_APPROVED_NONE]: 'Preferencia predeterminada de NetSuite',
+                        [CONST.NETSUITE_JOURNALS_APPROVAL_LEVEL.JOURNALS_APPROVAL_PENDING]: 'Aprobación pendiente',
+                        [CONST.NETSUITE_JOURNALS_APPROVAL_LEVEL.JOURNALS_APPROVED]: 'Aprobado para publicación',
+                    },
+                },
+                error: {
+                    customFormID: 'Introduzca un ID numérico válido para el formulario personalizado.',
+                },
+            },
+            noAccountsFound: 'No se han encontrado cuentas',
+            noAccountsFoundDescription: 'Añade la cuenta en NetSuite y sincroniza la conexión de nuevo.',
+            noVendorsFound: 'No se han encontrado proveedores',
+            noVendorsFoundDescription: 'Añade proveedores en NetSuite y sincroniza la conexión de nuevo.',
+            noItemsFound: 'No se han encontrado artículos de factura',
+            noItemsFoundDescription: 'Añade artículos de factura en NetSuite y sincroniza la conexión de nuevo.',
+            noSubsidiariesFound: 'No se ha encontrado subsidiarias',
+            noSubsidiariesFoundDescription: 'Añade la subsidiaria en NetSuite y sincroniza de nuevo la conexión.',
+            tokenInput: {
+                title: 'Netsuite configuración',
+                formSteps: {
+                    installBundle: {
+                        title: 'Instala el paquete de Expensify',
+                        description: 'En NetSuite, ir a *Personalización > SuiteBundler > Buscar e Instalar Paquetes* > busca "Expensify" > instala el paquete.',
+                    },
+                    enableTokenAuthentication: {
+                        title: 'Habilitar la autenticación basada en token',
+                        description: 'En NetSuite, ir a *Configuración > Empresa > Habilitar Funciones > SuiteCloud* > activar *autenticación basada en token*.',
+                    },
+                    enableSoapServices: {
+                        title: 'Habilitar servicios web SOAP',
+                        description: 'En NetSuite, ir a *Configuración > Empresa > Habilitar funciones > SuiteCloud* > habilitar *Servicios Web SOAP*.',
+                    },
+                    createAccessToken: {
+                        title: 'Crear un token de acceso',
+                        description:
+                            'En NetSuite, ir a *Configuración > Usuarios/Roles > Tokens de Acceso* > crear un token de acceso para la aplicación "Expensify" y tambiém para el rol de "Integración Expensify" o "Administrador".\n\n*Importante:* Asegúrese de guardar el ID y el secreto del Token en este paso. Los necesitará para el siguiente paso.',
+                    },
+                    enterCredentials: {
+                        title: 'Ingresa tus credenciales de NetSuite',
+                        formInputs: {
+                            netSuiteAccountID: 'ID de Cuenta NetSuite',
+                            netSuiteTokenID: 'ID de Token',
+                            netSuiteTokenSecret: 'Secreto de Token',
+                        },
+                        netSuiteAccountIDDescription: 'En NetSuite, ir a *Configuración > Integración > Preferencias de Servicios Web SOAP*.',
+                    },
+                },
+            },
+            import: {
+                expenseCategories: 'Categorías de gastos',
+                expenseCategoriesDescription: 'Las categorías de gastos de NetSuite se importan a Expensify como categorías.',
+                crossSubsidiaryCustomers: 'Clientes/proyectos entre subsidiaria',
+                importFields: {
+                    departments: {
+                        title: 'Departamentos',
+                        subtitle: 'Elige cómo manejar los *departamentos* de NetSuite en Expensify.',
+                    },
+                    classes: {
+                        title: 'Clases',
+                        subtitle: 'Elige cómo manejar las *clases* en Expensify.',
+                    },
+                    locations: {
+                        title: 'Ubicaciones',
+                        subtitle: 'Elija cómo manejar *ubicaciones* en Expensify.',
+                    },
+                },
+                customersOrJobs: {
+                    title: 'Clientes/proyectos',
+                    subtitle: 'Elija cómo manejar los *clientes* y *proyectos* de NetSuite en Expensify.',
+                    importCustomers: 'Importar clientes',
+                    importJobs: 'Importar proyectos',
+                    customers: 'clientes',
+                    jobs: 'proyectos',
+                    label: (importFields: string[], importType: string) => `${importFields.join(' y ')}, ${importType}`,
+                },
+                importTaxDescription: 'Importar grupos de impuestos desde NetSuite.',
+                importCustomFields: {
+                    chooseOptionBelow: 'Elija una de las opciones siguientes:',
+                    requiredFieldError: (fieldName: string) => `Por favor, introduzca el ${fieldName}`,
+                    customSegments: {
+                        title: 'Segmentos/registros personalizados',
+                        addText: 'Añadir segmento/registro personalizado',
+                        recordTitle: 'Segmento/registro personalizado',
+                        helpLink: CONST.NETSUITE_IMPORT.HELP_LINKS.CUSTOM_SEGMENTS,
+                        helpLinkText: 'Ver instrucciones detalladas',
+                        helpText: ' sobre la configuración de segmentos/registros personalizado.',
+                        emptyTitle: 'Añadir un segmento personalizado o un registro personalizado',
+                        fields: {
+                            segmentName: 'Name',
+                            internalID: 'Identificación interna',
+                            scriptID: 'ID de guión',
+                            mapping: 'Mostrado como',
+                            customRecordScriptID: 'ID de columna de transacción',
+                        },
+                        removeTitle: 'Eliminar segmento/registro personalizado',
+                        removePrompt: '¿Está seguro de que desea eliminar este segmento/registro personalizado?',
+                        addForm: {
+                            customSegmentName: 'nombre de segmento personalizado',
+                            customRecordName: 'nombre de registro personalizado',
+                            segmentTitle: 'Segmento personalizado',
+                            customSegmentAddTitle: 'Añadir segmento personalizado',
+                            customRecordAddTitle: 'Añadir registro personalizado',
+                            recordTitle: 'Registro personalizado',
+                            segmentRecordType: '¿Desea añadir un segmento personalizado o un registro personalizado?',
+                            customSegmentNameTitle: '¿Cuál es el nombre del segmento personalizado?',
+                            customRecordNameTitle: '¿Cuál es el nombre del registro personalizado?',
+                            customSegmentNameFooter: `Puede encontrar los nombres de los segmentos personalizados en NetSuite en la página *Personalizaciones > Vínculos, registros y campos > Segmentos personalizados*.\nn_Para obtener instrucciones más detalladas, [visite nuestro sitio de ayuda](${CONST.NETSUITE_IMPORT.HELP_LINKS.CUSTOM_SEGMENTS})_.`,
+                            customRecordNameFooter: `Puede encontrar nombres de registros personalizados en NetSuite introduciendo el "Campo de columna de transacción" en la búsqueda global.\nn_Para obtener instrucciones más detalladas, [visite nuestro sitio de ayuda](${CONST.NETSUITE_IMPORT.HELP_LINKS.CUSTOM_SEGMENTS})_.`,
+                            customSegmentInternalIDTitle: '¿Cuál es la identificación interna?',
+                            customSegmentInternalIDFooter: `En primer lugar, asegúrese de que ha habilitado los ID internos en NetSuite en *Inicio > Establecer preferencias > Mostrar ID interno*. *Personalización > Listas, registros y campos > Segmentos personalizados*.\n2. Haga clic en un segmento personalizado. Haga clic en un segmento personalizado. Haga clic en el hipervínculo situado junto a *Tipo de registro personalizado*.\n4. Para obtener instrucciones más detalladas, [visite nuestro sitio de ayuda](${CONST.NETSUITE_IMPORT.HELP_LINKS.CUSTOM_LISTS})_.`,
+                            customRecordInternalIDFooter: `Puede encontrar IDs internos de registros personalizados en NetSuite siguiendo estos pasos:\n\n1. Introduzca "Campos de línea de transacción" en la búsqueda global. Haga clic en un registro personalizado. Para obtener instrucciones más detalladas, [visite nuestro sitio de ayuda](${CONST.NETSUITE_IMPORT.HELP_LINKS.CUSTOM_SEGMENTS})_.`,
+                            customSegmentScriptIDTitle: '¿Cuál es el ID del guión?',
+                            customSegmentScriptIDFooter: `Puede encontrar IDs de script de segmentos personalizados en NetSuite en: \n\n1. *Personalización > Listas, Registros y Campos > Segmentos Personalizados*.\n2. Haga clic en un segmento personalizado. a. Si desea mostrar el segmento personalizado como una *etiqueta* (a nivel de partida) en Expensify, haga clic en la subpestaña *Columnas de transacción* y utilice el *ID de campo*. b. Si desea mostrar el segmento personalizado como una *etiqueta* (a nivel de partida) en Expensify, haga clic en la subpestaña *Columnas de transacción* y utilice el *ID de campo*. Si desea mostrar el segmento personalizado como un *campo de informe* (a nivel de informe) en Expensify, haga clic en la subpestaña *Transacciones* y utilice el *ID de campo*. Para obtener instrucciones más detalladas, [visite nuestro sitio de ayuda](${CONST.NETSUITE_IMPORT.HELP_LINKS.CUSTOM_LISTS})_.`,
+                            customRecordScriptIDTitle: '¿Cuál es el ID de columna de la transacción?',
+                            customRecordScriptIDFooter: `Puede encontrar IDs de script de registro personalizados en NetSuite en:\n\n1. Introduzca "Campos de línea de transacción" en la búsqueda global.\n2. Haga clic en un registro personalizado.\n3. Para obtener instrucciones más detalladas, [visite nuestro sitio de ayuda](${CONST.NETSUITE_IMPORT.HELP_LINKS.CUSTOM_SEGMENTS})_.`,
+                            customSegmentMappingTitle: '¿Cómo debería mostrarse este segmento personalizado en Expensify?',
+                            customRecordMappingTitle: '¿Cómo debería mostrarse este registro de segmento personalizado en Expensify?',
+                        },
+                        errors: {
+                            uniqueFieldError: (fieldName: string) => `Ya existe un segmento/registro personalizado con este ${fieldName?.toLowerCase()}.`,
+                        },
+                    },
+                    customLists: {
+                        title: 'Listas personalizadas',
+                        addText: 'Añadir lista personalizada',
+                        recordTitle: 'Lista personalizado',
+                        helpLink: CONST.NETSUITE_IMPORT.HELP_LINKS.CUSTOM_LISTS,
+                        helpLinkText: 'Ver instrucciones detalladas',
+                        helpText: ' sobre cómo configurar listas personalizada.',
+                        emptyTitle: 'Añadir una lista personalizado',
+                        fields: {
+                            listName: 'Nombre',
+                            internalID: 'Identificación interna',
+                            transactionFieldID: 'ID del campo de transacción',
+                            mapping: 'Mostrado como',
+                        },
+                        removeTitle: 'Eliminar lista personalizado',
+                        removePrompt: '¿Está seguro de que desea eliminar esta lista personalizado?',
+                        addForm: {
+                            listNameTitle: 'Elija una lista personalizada',
+                            transactionFieldIDTitle: '¿Cuál es el ID del campo de transacción?',
+                            transactionFieldIDFooter: `Puede encontrar los ID de campo de transacción en NetSuite siguiendo estos pasos:\n\n1. Introduzca "Campos de línea de transacción" en búsqueda global. Introduzca "Campos de línea de transacción" en la búsqueda global.\n2. Haga clic en una lista personalizada.\n3. Para obtener instrucciones más detalladas, [visite nuestro sitio de ayuda](${CONST.NETSUITE_IMPORT.HELP_LINKS.CUSTOM_LISTS})_.`,
+                            mappingTitle: '¿Cómo debería mostrarse esta lista personalizada en Expensify?',
+                        },
+                        errors: {
+                            uniqueTransactionFieldIDError: `Ya existe una lista personalizada con este ID de campo de transacción.`,
+                        },
+                    },
+                },
+                importTypes: {
+                    [CONST.INTEGRATION_ENTITY_MAP_TYPES.NETSUITE_DEFAULT]: {
+                        label: 'Predeterminado del empleado NetSuite',
+                        description: 'No importado a Expensify, aplicado en exportación',
+                        footerContent: (importField: string) =>
+                            `Si usa ${importField} en NetSuite, aplicaremos el conjunto predeterminado en el registro del empleado al exportarlo a Informe de gastos o Entrada de diario.`,
+                    },
+                    [CONST.INTEGRATION_ENTITY_MAP_TYPES.TAG]: {
+                        label: 'Etiquetas',
+                        description: 'Nivel de línea de pedido',
+                        footerContent: (importField: string) => `Se podrán seleccionar ${importField} para cada gasto individual en el informe de un empleado.`,
+                    },
+                    [CONST.INTEGRATION_ENTITY_MAP_TYPES.REPORT_FIELD]: {
+                        label: 'Campos de informe',
+                        description: 'Nivel de informe',
+                        footerContent: (importField: string) => `La selección de ${importField} se aplicará a todos los gastos en el informe de un empleado.`,
+                    },
+                },
+            },
+        },
+        intacct: {
+            sageIntacctSetup: 'Sage Intacct configuración',
+            prerequisitesTitle: 'Antes de conectar...',
+            downloadExpensifyPackage: 'Descargar el paquete Expensify para Sage Intacct',
+            followSteps: 'Siga los pasos de nuestras instrucciones Cómo: Instrucciones para conectarse a Sage Intacct',
+            enterCredentials: 'Introduzca sus credenciales de Sage Intacct',
+            entity: 'Entidad',
+            employeeDefault: 'Sage Intacct empleado por defecto',
+            employeeDefaultDescription: 'El departamento por defecto del empleado se aplicará a sus gastos en Sage Intacct si existe.',
+            displayedAsTagDescription: 'Se podrá seleccionar el departamento para cada gasto individual en el informe de un empleado.',
+            displayedAsReportFieldDescription: 'La selección de departamento se aplicará a todos los gastos que figuren en el informe de un empleado.',
+            toggleImportTitleFirstPart: 'Elija cómo gestionar Sage Intacct ',
+            toggleImportTitleSecondPart: ' en Expensify.',
+            expenseTypes: 'Tipos de gastos',
+            expenseTypesDescription: 'Los tipos de gastos de Sage Intacct se importan a Expensify como categorías.',
+            importTaxDescription: 'Importar el tipo impositivo de compra desde Sage Intacct.',
+            userDefinedDimensions: 'Dimensiones definidas por el usuario',
+            addUserDefinedDimension: 'Añadir dimensión definida por el usuario',
+            integrationName: 'Nombre de la integración',
+            dimensionExists: 'Ya existe una dimensión con ese nombre.',
+            removeDimension: 'Eliminar dimensión definida por el usuario',
+            removeDimensionPrompt: 'Está seguro de que desea eliminar esta dimensión definida por el usuario?',
+            userDefinedDimension: 'Dimensión definida por el usuario',
+            addAUserDefinedDimension: 'Añadir una dimensión definida por el usuario',
+            detailedInstructionsLink: 'Ver instrucciones detalladas',
+            detailedInstructionsRestOfSentence: ' para añadir dimensiones definidas por el usuario.',
+            userDimensionsAdded: (dimensionsCount: number) => `${dimensionsCount} ${Str.pluralize('UDD', `UDDs`, dimensionsCount)} añadido`,
+            mappingTitle: (mappingName: SageIntacctMappingName): string => {
+                switch (mappingName) {
+                    case CONST.SAGE_INTACCT_CONFIG.MAPPINGS.DEPARTMENTS:
+                        return 'departamentos';
+                    case CONST.SAGE_INTACCT_CONFIG.MAPPINGS.CLASSES:
+                        return 'clases';
+                    case CONST.SAGE_INTACCT_CONFIG.MAPPINGS.LOCATIONS:
+                        return 'lugares';
+                    case CONST.SAGE_INTACCT_CONFIG.MAPPINGS.CUSTOMERS:
+                        return 'clientes';
+                    case CONST.SAGE_INTACCT_CONFIG.MAPPINGS.PROJECTS:
+                        return 'proyectos (empleos)';
+                    default:
+                        return 'asignaciones';
+                }
             },
         },
         type: {
@@ -2074,6 +2794,71 @@ export default {
             control: 'Control',
             collect: 'Recolectar',
         },
+        companyCards: {
+            addCompanyCards: 'Agregar tarjetas de empresa',
+            selectCardFeed: 'Seleccionar feed de tarjetas',
+        },
+        expensifyCard: {
+            issueAndManageCards: 'Emitir y gestionar Tarjetas Expensify',
+            getStartedIssuing: 'Empieza emitiendo tu primera tarjeta virtual o física.',
+            disclaimer:
+                'La tarjeta comercial Expensify Visa® es emitida por The Bancorp Bank, N.A., miembro de la FDIC, en virtud de una licencia de Visa U.S.A. Inc. y no puede utilizarse en todos los comercios que aceptan tarjetas Visa. Apple® y el logotipo de Apple® son marcas comerciales de Apple Inc. registradas en EE.UU. y otros países. App Store es una marca de servicio de Apple Inc. Google Play y el logotipo de Google Play son marcas comerciales de Google LLC.',
+            issueCard: 'Emitir tarjeta',
+            newCard: 'Nueva tarjeta',
+            name: 'Nombre',
+            lastFour: '4 últimos',
+            limit: 'Limite',
+            currentBalance: 'Saldo actual',
+            currentBalanceDescription:
+                'El saldo actual es la suma de todas las transacciones contabilizadas con la Tarjeta Expensify que se han producido desde la última fecha de liquidación.',
+            cardLimit: 'Límite de la tarjeta',
+            remainingLimit: 'Límite restante',
+            requestLimitIncrease: 'Solicitar aumento de límite',
+            remainingLimitDescription:
+                'A la hora de calcular tu límite restante, tenemos en cuenta una serie de factores: su antigüedad como cliente, la información relacionada con tu negocio que nos facilitaste al darte de alta y el efectivo disponible en tu cuenta bancaria comercial. Tu límite restante puede fluctuar a diario.',
+            earnedCashback: 'Reembolso',
+            earnedCashbackDescription: 'El saldo de devolución se basa en el gasto mensual realizado con la tarjeta Expensify en tu espacio de trabajo.',
+            issueNewCard: 'Emitir nueva tarjeta',
+            finishSetup: 'Terminar configuración',
+            chooseBankAccount: 'Elegir cuenta bancaria',
+            chooseExistingBank: 'Elige una cuenta bancaria comercial existente para pagar el saldo de su Tarjeta Expensify o añade una nueva cuenta bancaria.',
+            accountEndingIn: 'Cuenta terminada en',
+            addNewBankAccount: 'Añadir nueva cuenta bancaria',
+            settlementAccount: 'Cuenta de liquidación',
+            settlementAccountDescription: 'Elige una cuenta para pagar el saldo de tu Tarjeta Expensify.',
+            settlementAccountInfoPt1: 'Asegúrate de que esta cuenta coincide con tu',
+            settlementAccountInfoPt2: 'para que Reconciliación Continua funcione correctamente.',
+            reconciliationAccount: 'Cuenta de conciliación',
+            settlementFrequency: 'Frecuencia de liquidación',
+            settlementFrequencyDescription: 'Elige con qué frecuencia pagarás el saldo de tu Tarjeta Expensify',
+            settlementFrequencyInfo:
+                'Si deseas cambiar a la liquidación mensual, deberás conectar tu cuenta bancaria a través de Plaid y tener un historial de saldo positivo en los últimos 90 días.',
+            frequency: {
+                daily: 'Cada día',
+                monthly: 'Mensual',
+            },
+            cardDetails: 'Datos de la tarjeta',
+            virtual: 'Virtual',
+            physical: 'Física',
+            deactivate: 'Desactivar tarjeta',
+            changeCardLimit: 'Modificar el límite de la tarjeta',
+            changeLimit: 'Modificar límite',
+            smartLimitWarning: (limit: string) =>
+                `Si cambias el límite de esta tarjeta a ${limit}, las nuevas transacciones serán rechazadas hasta que apruebes antiguos gastos de la tarjeta.`,
+            monthlyLimitWarning: (limit: string) => `Si cambias el límite de esta tarjeta a ${limit}, las nuevas transacciones serán rechazadas hasta el próximo mes.`,
+            fixedLimitWarning: (limit: string) => `Si cambias el límite de esta tarjeta a ${limit}, se rechazarán las nuevas transacciones.`,
+            changeCardLimitType: 'Modificar el tipo de límite de la tarjeta',
+            changeLimitType: 'Modificar el tipo de límite',
+            changeCardSmartLimitTypeWarning: (limit: string) =>
+                `Si cambias el tipo de límite de esta tarjeta a Límite inteligente, las nuevas transacciones serán rechazadas porque ya se ha alcanzado el límite de ${limit} no aprobado.`,
+            changeCardMonthlyLimitTypeWarning: (limit: string) =>
+                `Si cambias el tipo de límite de esta tarjeta a Mensual, las nuevas transacciones serán rechazadas porque ya se ha alcanzado el límite de ${limit} mensual.`,
+            addMailingAddress: 'Añadir dirección de postal',
+            issuedCard: (assignee: string) => `¡emitió a ${assignee} una Tarjeta Expensify! La tarjeta llegará en 2-3 días laborables.`,
+            issuedCardNoMailingAddress: (assignee: string) => `¡emitió a ${assignee} una Tarjeta Expensify! La tarjeta se enviará una vez que se añada una dirección postal.`,
+            issuedCardVirtual: ({assignee, link}: IssueVirtualCardParams) => `¡emitió a ${assignee} una ${link} virtual! La tarjeta puede utilizarse inmediatamente.`,
+            addedAddress: (assignee: string) => `${assignee} ha añadido la dirección. Tarjeta Expensify llegará en 2-3 días hábiles.`,
+        },
         categories: {
             deleteCategories: 'Eliminar categorías',
             deleteCategoriesPrompt: '¿Estás seguro de que quieres eliminar estas categorías?',
@@ -2085,7 +2870,7 @@ export default {
             enableCategory: 'Activar categoría',
             deleteFailureMessage: 'Se ha producido un error al intentar eliminar la categoría. Por favor, inténtalo más tarde.',
             categoryName: 'Nombre de la categoría',
-            requiresCategory: 'Los miembros deben categorizar todos los gastos',
+            requiresCategory: 'Los miembros deben clasificar todos los gastos',
             needCategoryForExportToIntegration: 'Se requiere una categoría en cada gasto para poder exportarlo a',
             subtitle: 'Obtén una visión general de dónde te gastas el dinero. Utiliza las categorías predeterminadas o añade las tuyas propias.',
             emptyCategories: {
@@ -2096,16 +2881,29 @@ export default {
             createFailureMessage: 'Se ha producido un error al intentar crear la categoría. Por favor, inténtalo más tarde.',
             addCategory: 'Añadir categoría',
             editCategory: 'Editar categoría',
+            editCategories: 'Editar categorías',
             categoryRequiredError: 'Lo nombre de la categoría es obligatorio.',
             existingCategoryError: 'Ya existe una categoría con este nombre.',
             invalidCategoryName: 'Lo nombre de la categoría es invalido.',
             importedFromAccountingSoftware: 'Categorías importadas desde',
+            payrollCode: 'Código de nómina',
+            updatePayrollCodeFailureMessage: 'Se produjo un error al actualizar el código de nómina, por favor intente nuevamente.',
+            glCode: 'Código de Libro Mayor',
+            updateGLCodeFailureMessage: 'Se produjo un error al actualizar el código de Libro Mayor. Inténtelo nuevamente.',
         },
         moreFeatures: {
             spendSection: {
                 title: 'Gasto',
                 subtitle: 'Habilita otras funcionalidades que ayudan a aumentar tu equipo.',
             },
+            manageSection: {
+                title: 'Gestionar',
+                subtitle: 'Añade controles que ayudan a mantener los gastos dentro del presupuesto.',
+            },
+            earnSection: {
+                title: 'Gane',
+                subtitle: 'Habilita funciones opcionales para agilizar tus ingresos y recibir pagos más rápido.',
+            },
             organizeSection: {
                 title: 'Organizar',
                 subtitle: 'Agrupa y analiza el gasto, registra cada impuesto pagado.',
@@ -2114,6 +2912,30 @@ export default {
                 title: 'Integrar',
                 subtitle: 'Conecta Expensify a otros productos financieros populares.',
             },
+            expensifyCard: {
+                title: 'Tarjeta Expensify',
+                subtitle: 'Obtén información y control sobre tus gastos',
+                disableCardTitle: 'Deshabilitar la Tarjeta Expensify',
+                disableCardPrompt: 'No puedes deshabilitar la Tarjeta Expensify porque ya está en uso. Por favor, contacta con Concierge para conocer los pasos a seguir.',
+                disableCardButton: 'Chatear con Concierge',
+                feed: {
+                    title: 'Consigue la Tarjeta Expensify',
+                    subTitle: 'Optimiza tu negocio con la Tarjeta Expensify',
+                    features: {
+                        cashBack: 'Hasta un 2% de devolución en cada compra en Estadios Unidos',
+                        unlimited: 'Emitir un número ilimitado de tarjetas virtuales',
+                        spend: 'Controles de gastos y límites personalizados',
+                    },
+                    ctaTitle: 'Emitir nueva tarjeta',
+                },
+            },
+            companyCards: {
+                title: 'Tarjetas de empresa',
+                subtitle: 'Importar gastos de las tarjetas de empresa existentes.',
+                disableCardTitle: 'Deshabilitar tarjetas de empresa',
+                disableCardPrompt: 'No puedes deshabilitar las tarjetas de empresa porque esta función está en uso. Por favor, contacta a Concierge para los próximos pasos.',
+                disableCardButton: 'Chatear con Concierge',
+            },
             distanceRates: {
                 title: 'Tasas de distancia',
                 subtitle: 'Añade, actualiza y haz cumplir las tasas.',
@@ -2122,6 +2944,10 @@ export default {
                 title: 'Flujos de trabajo',
                 subtitle: 'Configura cómo se aprueba y paga los gastos.',
             },
+            invoices: {
+                title: 'Facturas',
+                subtitle: 'Enviar y recibir facturas.',
+            },
             categories: {
                 title: 'Categorías',
                 subtitle: 'Monitoriza y organiza los gastos.',
@@ -2142,10 +2968,64 @@ export default {
                 title: 'Contabilidad',
                 subtitle: 'Sincroniza tu plan de cuentas y otras opciones.',
             },
+            connectionsWarningModal: {
+                featureEnabledTitle: 'No tan rápido...',
+                featureEnabledText: 'Para activar o desactivar esta función, cambia la configuración de importación contable.',
+                disconnectText: 'Para desactivar la contabilidad, desconecta tu conexión contable del espacio de trabajo.',
+                manageSettings: 'Gestionar la configuración',
+            },
+            rules: {
+                title: 'Reglas',
+                subtitle: 'Configura cuándo se exigen los recibos, marca los gastos elevados y mucho más.',
+            },
         },
         reportFields: {
-            delete: 'Eliminar campos',
-            deleteConfirmation: '¿Estás seguro de que quieres eliminar esta campos?',
+            addField: 'Añadir campo',
+            delete: 'Eliminar campo',
+            deleteFields: 'Eliminar campos',
+            deleteConfirmation: '¿Está seguro de que desea eliminar este campo del informe?',
+            deleteFieldsConfirmation: '¿Está seguro de que desea eliminar estos campos del informe?',
+            emptyReportFields: {
+                title: 'No has creado ningún campo de informe',
+                subtitle: 'Añade un campo personalizado (texto, fecha o desplegable) que aparezca en los informes.',
+            },
+            subtitle: 'Los campos de informe se aplican a todos los gastos y pueden ser útiles cuando quieras solicitar información adicional.',
+            disableReportFields: 'Desactivar campos de informe',
+            disableReportFieldsConfirmation: 'Estás seguro? Se eliminarán los campos de texto y fecha y se desactivarán las listas.',
+            importedFromAccountingSoftware: 'Campos de informes importadas desde',
+            textType: 'Texto',
+            dateType: 'Fecha',
+            dropdownType: 'Lista',
+            textAlternateText: 'Añade un campo para introducir texto libre.',
+            dateAlternateText: 'Añade un calendario para la selección de fechas.',
+            dropdownAlternateText: 'Añade una lista de opciones para elegir.',
+            nameInputSubtitle: 'Elige un nombre para el campo del informe.',
+            typeInputSubtitle: 'Elige qué tipo de campo de informe utilizar.',
+            initialValueInputSubtitle: 'Ingresa un valor inicial para mostrar en el campo del informe.',
+            listValuesInputSubtitle: 'Estos valores aparecerán en el desplegable del campo de tu informe. Los miembros pueden seleccionar los valores habilitados.',
+            listInputSubtitle: 'Estos valores aparecerán en la lista de campos de tu informe. Los miembros pueden seleccionar los valores habilitados.',
+            deleteValue: 'Eliminar valor',
+            deleteValues: 'Eliminar valores',
+            disableValue: 'Desactivar valor',
+            disableValues: 'Desactivar valores',
+            enableValue: 'Habilitar valor',
+            enableValues: 'Habilitar valores',
+            emptyReportFieldsValues: {
+                title: 'No has creado ningún valor en la lista',
+                subtitle: 'Añade valores personalizados para que aparezcan en los informes.',
+            },
+            deleteValuePrompt: '¿Estás seguro de que quieres eliminar este valor de la lista?',
+            deleteValuesPrompt: '¿Estás seguro de que quieres eliminar estos valores de la lista?',
+            listValueRequiredError: 'Ingresa un nombre para el valor de la lista',
+            existingListValueError: 'Ya existe un valor en la lista con este nombre',
+            editValue: 'Editar valor',
+            listValues: 'Valores de la lista',
+            addValue: 'Añade valor',
+            existingReportFieldNameError: 'Ya existe un campo de informe con este nombre',
+            reportFieldNameRequiredError: 'Ingresa un nombre de campo de informe',
+            reportFieldTypeRequiredError: 'Elige un tipo de campo de informe',
+            reportFieldInitialValueRequiredError: 'Elige un valor inicial de campo de informe',
+            genericFailureMessage: 'Se ha producido un error al actualizar el campo de informe. Por favor, inténtalo de nuevo.',
         },
         tags: {
             tagName: 'Nombre de etiqueta',
@@ -2169,8 +3049,11 @@ export default {
             deleteFailureMessage: 'Se ha producido un error al intentar eliminar la etiqueta. Por favor, inténtalo más tarde.',
             tagRequiredError: 'Lo nombre de la etiqueta es obligatorio.',
             existingTagError: 'Ya existe una etiqueta con este nombre.',
-            genericFailureMessage: 'Se produjo un error al actualizar la etiqueta, inténtelo nuevamente.',
+            invalidTagNameError: 'El nombre de la etiqueta no puede ser 0. Por favor, elige un valor diferente.',
+            genericFailureMessage: 'Se ha producido un error al actualizar la etiqueta. Por favor, inténtelo nuevamente.',
             importedFromAccountingSoftware: 'Etiquetas importadas desde',
+            glCode: 'Código de Libro Mayor',
+            updateGLCodeFailureMessage: 'Se produjo un error al actualizar el código de Libro Mayor. Por favor, inténtelo nuevamente.',
         },
         taxes: {
             subtitle: 'Añade nombres, tasas y establezca valores por defecto para los impuestos.',
@@ -2179,13 +3062,17 @@ export default {
             foreignDefault: 'Moneda extranjera por defecto',
             customTaxName: 'Nombre del impuesto',
             value: 'Valor',
+            taxRate: 'Tasa de impuesto',
+            taxReclaimableOn: 'Impuesto recuperable en',
             error: {
                 taxRateAlreadyExists: 'Ya existe un impuesto con este nombre.',
+                taxCodeAlreadyExists: 'Ya existe un código de impuesto con este nombre.',
                 customNameRequired: 'El nombre del impuesto es obligatorio.',
                 valuePercentageRange: 'Por favor, introduce un porcentaje entre 0 y 100.',
                 deleteFailureMessage: 'Se ha producido un error al intentar eliminar la tasa de impuesto. Por favor, inténtalo más tarde.',
                 updateFailureMessage: 'Se ha producido un error al intentar modificar la tasa de impuesto. Por favor, inténtalo más tarde.',
                 createFailureMessage: 'Se ha producido un error al intentar crear la tasa de impuesto. Por favor, inténtalo más tarde.',
+                updateTaxClaimableFailureMessage: 'La porción recuperable debe ser menor al monto del importe por distancia.',
             },
             deleteTaxConfirmation: '¿Estás seguro de que quieres eliminar este impuesto?',
             deleteMultipleTaxConfirmation: ({taxAmount}) => `¿Estás seguro de que quieres eliminar ${taxAmount} impuestos?`,
@@ -2197,6 +3084,9 @@ export default {
                 enable: 'Activar tasa',
                 enableMultiple: 'Activar tasas',
             },
+            importedFromAccountingSoftware: 'Impuestos importadas desde',
+            taxCode: 'Código de impuesto',
+            updateTaxCodeFailureMessage: 'Se produjo un error al actualizar el código tributario, inténtelo nuevamente.',
         },
         emptyWorkspace: {
             title: 'Crea un espacio de trabajo',
@@ -2220,8 +3110,10 @@ export default {
             getTheExpensifyCardAndMore: 'Consigue la Tarjeta Expensify y más',
         },
         people: {
-            genericFailureMessage: 'Se ha producido un error al intentar eliminar a un usuario del espacio de trabajo. Por favor, inténtalo más tarde.',
+            genericFailureMessage: 'Se ha producido un error al intentar eliminar a un miembro del espacio de trabajo. Por favor, inténtalo más tarde.',
             removeMembersPrompt: '¿Estás seguro de que deseas eliminar a estos miembros?',
+            removeMembersWarningPrompt: ({memberName, ownerName}: RemoveMembersWarningPrompt) =>
+                `${memberName} es un aprobador en este espacio de trabajo. Cuando lo elimine de este espacio de trabajo, los sustituiremos en el flujo de trabajo de aprobación por el propietario del espacio de trabajo, ${ownerName}`,
             removeMembersTitle: 'Eliminar miembros',
             removeMemberButtonTitle: 'Quitar del espacio de trabajo',
             removeMemberGroupButtonTitle: 'Quitar del grupo',
@@ -2236,32 +3128,56 @@ export default {
                 cannotRemove: 'No puedes eliminarte ni a ti mismo ni al dueño del espacio de trabajo.',
                 genericRemove: 'Ha ocurrido un problema al eliminar al miembro del espacio de trabajo.',
             },
-            addedWithPrimary: 'Se agregaron algunos usuarios con sus nombres de usuario principales.',
+            addedWithPrimary: 'Se agregaron algunos miembros con sus nombres de usuario principales.',
             invitedBySecondaryLogin: ({secondaryLogin}) => `Agregado por nombre de usuario secundario ${secondaryLogin}.`,
             membersListTitle: 'Directorio de todos los miembros del espacio de trabajo.',
         },
         accounting: {
             settings: 'configuración',
             title: 'Conexiones',
-            subtitle: 'Conecta a tu sistema de contabilidad para codificar transacciones con tu plan de cuentas, auto-cotejar pagos y mantener tus finanzas sincronizadas.',
+            subtitle: 'Conecta a tu sistema de contabilidad para codificar transacciones con tu plan de cuentas, auto-cotejar pagos, y mantener tus finanzas sincronizadas.',
             qbo: 'Quickbooks Online',
             xero: 'Xero',
+            netsuite: 'NetSuite',
+            intacct: 'Sage Intacct',
+            connectionName: (integration: ConnectionName) => {
+                switch (integration) {
+                    case CONST.POLICY.CONNECTIONS.NAME.QBO:
+                        return 'Quickbooks Online';
+                    case CONST.POLICY.CONNECTIONS.NAME.XERO:
+                        return 'Xero';
+                    case CONST.POLICY.CONNECTIONS.NAME.NETSUITE:
+                        return 'NetSuite';
+                    case CONST.POLICY.CONNECTIONS.NAME.SAGE_INTACCT:
+                        return 'Sage Intacct';
+                    default: {
+                        return '';
+                    }
+                }
+            },
             setup: 'Configurar',
-            lastSync: 'Recién sincronizado',
+            lastSync: (relativeDate: string) => `Recién sincronizado ${relativeDate}`,
             import: 'Importar',
             export: 'Exportar',
             advanced: 'Avanzado',
             other: 'Otras integraciones',
             syncNow: 'Sincronizar ahora',
             disconnect: 'Desconectar',
-            disconnectTitle: (currentIntegration?: ConnectionName): string => {
-                switch (currentIntegration) {
+            disconnectTitle: (integration?: ConnectionName): string => {
+                const integrationName = integration && CONST.POLICY.CONNECTIONS.NAME_USER_FRIENDLY[integration] ? CONST.POLICY.CONNECTIONS.NAME_USER_FRIENDLY[integration] : 'integración';
+                return `Desconectar ${integrationName}`;
+            },
+            connectTitle: (integrationToConnect: ConnectionName): string => `Conectar ${CONST.POLICY.CONNECTIONS.NAME_USER_FRIENDLY[integrationToConnect] ?? 'accounting integration'}`,
+            syncError: (integration?: ConnectionName): string => {
+                switch (integration) {
                     case CONST.POLICY.CONNECTIONS.NAME.QBO:
-                        return 'Desconectar QuickBooks Online';
+                        return 'No se puede conectar a QuickBooks Online.';
                     case CONST.POLICY.CONNECTIONS.NAME.XERO:
-                        return 'Desconectar Xero';
+                        return 'No se puede conectar a Xero.';
+                    case CONST.POLICY.CONNECTIONS.NAME.NETSUITE:
+                        return 'No se puede conectar a NetSuite.';
                     default: {
-                        return 'Desconectar integración';
+                        return 'No se ha podido conectar a la integración.';
                     }
                 }
             },
@@ -2269,34 +3185,25 @@ export default {
             taxes: 'Impuestos',
             imported: 'Importado',
             notImported: 'No importado',
-            importAsCategory: 'Importado, mostrado as categoría',
+            importAsCategory: 'Importado como categorías',
             importTypes: {
                 [CONST.INTEGRATION_ENTITY_MAP_TYPES.IMPORTED]: 'Importado',
-                [CONST.INTEGRATION_ENTITY_MAP_TYPES.TAG]: 'Importado, mostrado como etiqueta',
+                [CONST.INTEGRATION_ENTITY_MAP_TYPES.TAG]: 'Importado como etiquetas',
                 [CONST.INTEGRATION_ENTITY_MAP_TYPES.DEFAULT]: 'Importado',
                 [CONST.INTEGRATION_ENTITY_MAP_TYPES.NOT_IMPORTED]: 'No importado',
                 [CONST.INTEGRATION_ENTITY_MAP_TYPES.NONE]: 'No importado',
-                [CONST.INTEGRATION_ENTITY_MAP_TYPES.REPORT_FIELD]: 'Importado, mostrado como campo de informe',
+                [CONST.INTEGRATION_ENTITY_MAP_TYPES.REPORT_FIELD]: 'Importado como campos de informe',
+                [CONST.INTEGRATION_ENTITY_MAP_TYPES.NETSUITE_DEFAULT]: 'Predeterminado del empleado NetSuite',
             },
-            disconnectPrompt: (integrationToConnect?: ConnectionName, currentIntegration?: ConnectionName): string => {
-                switch (integrationToConnect) {
-                    case CONST.POLICY.CONNECTIONS.NAME.QBO:
-                        return '¿Estás seguro de que quieres desconectar Xero para configurar QuickBooks Online?';
-                    case CONST.POLICY.CONNECTIONS.NAME.XERO:
-                        return '¿Estás seguro de que quieres desconectar QuickBooks Online para configurar Xero?';
-                    default: {
-                        switch (currentIntegration) {
-                            case CONST.POLICY.CONNECTIONS.NAME.QBO:
-                                return '¿Estás seguro de que quieres desconectar QuickBooks Online?';
-                            case CONST.POLICY.CONNECTIONS.NAME.XERO:
-                                return '¿Estás seguro de que quieres desconectar Xero?';
-                            default: {
-                                return '¿Estás seguro de que quieres desconectar integración?';
-                            }
-                        }
-                    }
-                }
+            disconnectPrompt: (currentIntegration?: ConnectionName): string => {
+                const integrationName =
+                    currentIntegration && CONST.POLICY.CONNECTIONS.NAME_USER_FRIENDLY[currentIntegration] ? CONST.POLICY.CONNECTIONS.NAME_USER_FRIENDLY[currentIntegration] : 'integración';
+                return `¿Estás seguro de que quieres desconectar ${integrationName}?`;
             },
+            connectPrompt: (integrationToConnect: ConnectionName): string =>
+                `¿Estás seguro de que quieres conectar a ${
+                    CONST.POLICY.CONNECTIONS.NAME_USER_FRIENDLY[integrationToConnect] ?? 'esta integración contable'
+                }? Esto eliminará cualquier conexión contable existente.`,
             enterCredentials: 'Ingresa tus credenciales',
             connections: {
                 syncStageName: (stage: PolicyConnectionSyncStage) => {
@@ -2304,6 +3211,8 @@ export default {
                         case 'quickbooksOnlineImportCustomers':
                             return 'Importando clientes';
                         case 'quickbooksOnlineImportEmployees':
+                        case 'netSuiteSyncImportEmployees':
+                        case 'intacctImportEmployees':
                             return 'Importando empleados';
                         case 'quickbooksOnlineImportAccounts':
                             return 'Importando cuentas';
@@ -2314,6 +3223,7 @@ export default {
                         case 'quickbooksOnlineImportProcessing':
                             return 'Procesando datos importados';
                         case 'quickbooksOnlineSyncBillPayments':
+                        case 'intacctImportSyncBillPayments':
                             return 'Sincronizando reportes reembolsados y facturas pagadas';
                         case 'quickbooksOnlineSyncTaxCodes':
                             return 'Importando tipos de impuestos';
@@ -2321,40 +3231,165 @@ export default {
                             return 'Revisando conexión a QuickBooks Online';
                         case 'quickbooksOnlineImportMain':
                             return 'Importando datos desde QuickBooks Online';
-                        case 'startingImport':
+                        case 'startingImportXero':
+                            return 'Importando datos desde Xero';
+                        case 'startingImportQBO':
                             return 'Importando datos desde QuickBooks Online';
                         case 'quickbooksOnlineSyncTitle':
                             return 'Sincronizando datos desde QuickBooks Online';
                         case 'quickbooksOnlineSyncLoadData':
+                        case 'xeroSyncStep':
+                        case 'intacctImportData':
                             return 'Cargando datos';
                         case 'quickbooksOnlineSyncApplyCategories':
                             return 'Actualizando categorías';
                         case 'quickbooksOnlineSyncApplyCustomers':
-                            return 'Actualizando Clientes/Proyectos';
+                            return 'Actualizando clientes/proyectos';
                         case 'quickbooksOnlineSyncApplyEmployees':
                             return 'Actualizando empleados';
                         case 'quickbooksOnlineSyncApplyClassesLocations':
                             return 'Actualizando clases';
+                        case 'jobDone':
+                            return 'Esperando a que se carguen los datos importados';
+                        case 'xeroSyncImportChartOfAccounts':
+                            return 'Sincronizando plan de cuentas';
+                        case 'xeroSyncImportCategories':
+                            return 'Sincronizando categorias';
+                        case 'xeroSyncImportCustomers':
+                            return 'Sincronizando clientes';
+                        case 'xeroSyncXeroReimbursedReports':
+                            return 'Marcar los informes de Expensify como reembolsados';
+                        case 'xeroSyncExpensifyReimbursedReports':
+                            return 'Marcar facturas y recibos de Xero como pagados';
+                        case 'xeroSyncImportTrackingCategories':
+                            return 'Sincronizando categorías de seguimiento';
+                        case 'xeroSyncImportBankAccounts':
+                            return 'Sincronizando cuentas bancarias';
+                        case 'xeroSyncImportTaxRates':
+                            return 'Sincronizando las tasas de impuesto';
+                        case 'xeroCheckConnection':
+                            return 'Comprobando la conexión a Xero';
+                        case 'xeroSyncTitle':
+                            return 'Sincronizando los datos de Xero';
+                        case 'netSuiteSyncConnection':
+                            return 'Iniciando conexión a NetSuite';
+                        case 'netSuiteSyncCustomers':
+                            return 'Importando clientes';
+                        case 'netSuiteSyncInitData':
+                            return 'Recuperando datos de NetSuite';
+                        case 'netSuiteSyncImportTaxes':
+                            return 'Importando impuestos';
+                        case 'netSuiteSyncImportItems':
+                            return 'Importando artículos';
+                        case 'netSuiteSyncData':
+                            return 'Importando datos a Expensify';
+                        case 'netSuiteSyncAccounts':
+                            return 'Sincronizando cuentas';
+                        case 'netSuiteSyncCurrencies':
+                            return 'Sincronizando divisas';
+                        case 'netSuiteSyncCategories':
+                            return 'Sincronizando categorías';
+                        case 'netSuiteSyncReportFields':
+                            return 'Importando datos como campos de informe de Expensify';
+                        case 'netSuiteSyncTags':
+                            return 'Importando datos como etiquetas de Expensify';
+                        case 'netSuiteSyncUpdateConnectionData':
+                            return 'Actualizando información de conexión';
+                        case 'netSuiteSyncNetSuiteReimbursedReports':
+                            return 'Marcando informes de Expensify como reembolsados';
+                        case 'netSuiteSyncImportCustomLists':
+                            return 'Importando listas personalizadas';
+                        case 'netSuiteSyncImportSubsidiaries':
+                            return 'Importando subsidiarias';
+                        case 'netSuiteSyncImportVendors':
+                            return 'Importando proveedores';
+                        case 'netSuiteSyncExpensifyReimbursedReports':
+                            return 'Marcando facturas y recibos de NetSuite como pagados';
+                        case 'intacctCheckConnection':
+                            return 'Comprobando la conexión a Sage Intacct';
+                        case 'intacctImportDimensions':
+                            return 'Importando dimensiones';
+                        case 'intacctImportTitle':
+                            return 'Importando datos desde Sage Intacct';
                         default: {
+                            // eslint-disable-next-line @typescript-eslint/restrict-template-expressions
                             return `Translation missing for stage: ${stage}`;
                         }
                     }
                 },
             },
+            preferredExporter: 'Exportador preferido',
+            exportPreferredExporterNote:
+                'Puede ser cualquier administrador del espacio de trabajo, pero debe ser un administrador de dominio si configura diferentes cuentas de exportación para tarjetas de empresa individuales en la configuración del dominio.',
+            exportPreferredExporterSubNote: 'Una vez configurado, el exportador preferido verá los informes para exportar en tu cuenta.',
+            exportAs: 'Exportar cómo',
+            exportOutOfPocket: ' Exportar gastos por cuenta propia como',
+            exportCompanyCard: 'Exportar gastos de la tarjeta de empresa como',
+            exportDate: 'Fecha de exportación',
+            defaultVendor: 'Proveedor predeterminado',
+            autoSync: 'Autosincronización',
+            reimbursedReports: 'Sincronizar informes reembolsados',
+            cardReconciliation: 'Conciliación de tarjetas',
+            reconciliationAccount: 'Cuenta de conciliación',
+            continuousReconciliation: 'Conciliación continua',
+            saveHoursOnReconciliation:
+                'Ahorra horas de conciliación en cada período contable haciendo que Expensify concilie continuamente los extractos y liquidaciones de la Tarjeta Expensify en tu nombre.',
+            enableContinuousReconciliation: 'Para activar la Conciliación Continua, activa la ',
+            chooseReconciliationAccount: {
+                chooseBankAccount: 'Elige la cuenta bancaria con la que se conciliarán los pagos de tu Tarjeta Expensify.',
+                accountMatches: 'Asegúrate de que esta cuenta coincide con ',
+                settlementAccount: 'la cuenta de liquidación de tu Tarjeta Expensify ',
+                reconciliationWorks: (lastFourPAN: string) => `(que termina en ${lastFourPAN}) para que la conciliación continua funcione correctamente.`,
+            },
         },
         card: {
             header: 'Desbloquea Tarjetas Expensify gratis',
             headerWithEcard: '¡Tus tarjetas están listas!',
-            noVBACopy: 'Conecta una cuenta bancaria para emitir tarjetas Expensify a los miembros de tu espacio de trabajo y accede a estos increíbles beneficios y más:',
+            noVBACopy: 'Conecta una cuenta bancaria para emitir Tarjetas Expensify a los miembros de tu espacio de trabajo y acceder a estos increíbles beneficios y más:',
             VBANoECardCopy:
-                'Añade tu correo electrónico de trabajo para emitir Tarjetas Expensify ilimitadas para los miembros de tu espacio de trabajo y acceder a todas estas increíbles ventajas:',
+                'Añade tu correo electrónico de trabajo para emitir Tarjetas Expensify ilimitadas a los miembros de tu espacio de trabajo y acceder a todas estas increíbles ventajas:',
             VBAWithECardCopy: 'Acceda a estos increíbles beneficios y más:',
-            benefit1: 'Hasta un 2% de devolución en tus gastos',
-            benefit2: 'Tarjetas digitales y físicas',
+            benefit1: 'Devolución de dinero en cada compra en Estados Unidos',
+            benefit2: 'Tarjetas virtuales y físicas ilimitadas',
             benefit3: 'Sin responsabilidad personal',
             benefit4: 'Límites personalizables',
             addWorkEmail: 'Añadir correo electrónico de trabajo',
             checkingDomain: '¡Un momento! Estamos todavía trabajando para habilitar tu Tarjeta Expensify. Vuelve aquí en unos minutos.',
+            issueCard: 'Emitir tarjeta',
+            issueAndManageCards: 'Emitir y gestionar Tarjetas Expensify',
+            getStartedIssuing: 'Empieza emitiendo tu primera tarjeta virtual o física.',
+            issueNewCard: {
+                whoNeedsCard: '¿Quién necesita una tarjeta?',
+                findMember: 'Buscar miembro',
+                chooseCardType: 'Elegir un tipo de tarjeta',
+                physicalCard: 'Tarjeta física',
+                physicalCardDescription: 'Ideal para los consumidores habituales',
+                virtualCard: 'Tarjeta virtual',
+                virtualCardDescription: 'Instantáneo y flexible',
+                chooseLimitType: 'Elegir un tipo de límite',
+                smartLimit: 'Límite inteligente',
+                smartLimitDescription: 'Gasta hasta una determinada cantidad antes de requerir aprobación',
+                monthly: 'Mensual',
+                monthlyDescription: 'Gasta hasta una determinada cantidad al mes',
+                fixedAmount: 'Cantidad fija',
+                fixedAmountDescription: 'Gasta hasta una determinada cantidad una vez',
+                setLimit: 'Establecer un límite',
+                giveItName: 'Dale un nombre',
+                giveItNameInstruction: 'Hazlo lo suficientemente único como para distinguirlo de los demás. Los casos de uso específicos son aún mejores.',
+                cardName: 'Nombre de la tarjeta',
+                letsDoubleCheck: 'Vuelve a comprobar que todo parece correcto. ',
+                willBeReady: 'Esta tarjeta estará lista para su uso inmediato.',
+                cardholder: 'Titular de la tarjeta',
+                cardType: 'Tipo de tarjeta',
+                limit: 'Limite',
+                limitType: 'Tipo de limite',
+                name: 'Nombre',
+            },
+            deactivateCardModal: {
+                deactivate: 'Desactivar',
+                deactivateCard: 'Desactivar tarjeta',
+                deactivateConfirmation: 'Al desactivar esta tarjeta, se rechazarán todas las transacciones futuras y no se podrá deshacer.',
+            },
         },
         reimburse: {
             captureReceipts: 'Captura recibos',
@@ -2368,13 +3403,18 @@ export default {
             trackDistanceChooseUnit: 'Elige una unidad predeterminada de medida.',
             unlockNextDayReimbursements: 'Desbloquea reembolsos diarios',
             captureNoVBACopyBeforeEmail: 'Pide a los miembros de tu espacio de trabajo que envíen recibos a ',
-            captureNoVBACopyAfterEmail: ' y descarga la App de Expensify para controlar tus gastos en efectivo sobre la marcha.',
+            captureNoVBACopyAfterEmail: ' y descarga la app de Expensify para controlar tus gastos en efectivo sobre la marcha.',
             unlockNoVBACopy: 'Conecta una cuenta bancaria para reembolsar online a los miembros de tu espacio de trabajo.',
             fastReimbursementsVBACopy: '¡Todo listo para reembolsar recibos desde tu cuenta bancaria!',
             updateCustomUnitError: 'Los cambios no han podido ser guardados. El espacio de trabajo ha sido modificado mientras estabas desconectado. Por favor, inténtalo de nuevo.',
             invalidRateError: 'Por favor, introduce una tarifa válida.',
             lowRateError: 'La tarifa debe ser mayor que 0.',
         },
+        export: {
+            notReadyHeading: 'No está listo para exportar',
+            notReadyDescription:
+                'Los borradores o informes de gastos pendientes no se pueden exportar al sistema contabilidad. Por favor, apruebe o pague estos gastos antes de exportarlos.',
+        },
         bills: {
             manageYourBills: 'Gestiona tus facturas',
             askYourVendorsBeforeEmail: 'Pide a tus proveedores que envíen sus facturas a ',
@@ -2390,12 +3430,24 @@ export default {
             invoiceFirstSectionCopy: 'Envía facturas detalladas y profesionales directamente a tus clientes desde la app de Expensify.',
             viewAllInvoices: 'Ver facturas emitidas',
             unlockOnlineInvoiceCollection: 'Desbloquea el cobro de facturas online',
-            unlockNoVBACopy: 'Conecta tu cuenta bancaria para recibir pagos online de facturas - por transferencia o con tarjeta - directamente en tu cuenta.',
+            unlockNoVBACopy: 'Conecta tu cuenta bancaria para recibir pagos de facturas online por transferencia o con tarjeta.',
             moneyBackInAFlash: '¡Tu dinero de vuelta en un momento!',
             unlockVBACopy: '¡Todo listo para recibir pagos por transferencia o con tarjeta!',
             viewUnpaidInvoices: 'Ver facturas emitidas pendientes',
             sendInvoice: 'Enviar factura',
             sendFrom: 'Enviar desde',
+            invoicingDetails: 'Detalles de facturación',
+            invoicingDetailsDescription: 'Esta información aparecerá en tus facturas.',
+            companyName: 'Nombre de la empresa',
+            companyWebsite: 'Sitio web de la empresa',
+            paymentMethods: {
+                personal: 'Personal',
+                business: 'Empresas',
+                chooseInvoiceMethod: 'Elija un método de pago:',
+                addBankAccount: 'Añadir cuenta bancaria',
+                payingAsIndividual: 'Pago individual',
+                payingAsBusiness: 'Pagar como una empresa',
+            },
         },
         travel: {
             unlockConciergeBookingTravel: 'Desbloquea la reserva de viajes con Concierge',
@@ -2408,10 +3460,10 @@ export default {
             member: 'Invitar miembros',
             members: 'Invitar miembros',
             invitePeople: 'Invitar nuevos miembros',
-            genericFailureMessage: 'Se produjo un error al invitar al usuario al espacio de trabajo. Vuelva a intentarlo..',
+            genericFailureMessage: 'Se ha producido un error al invitar al miembro al espacio de trabajo. Vuelva a intentarlo.',
             pleaseEnterValidLogin: `Asegúrese de que el correo electrónico o el número de teléfono sean válidos (p. ej. ${CONST.EXAMPLE_PHONE_NUMBER}).`,
-            user: 'usuario',
-            users: 'usuarios',
+            user: 'miembro',
+            users: 'miembros',
             invited: 'invitó',
             removed: 'eliminó',
             leftWorkspace: 'salió del espacio de trabajo',
@@ -2423,7 +3475,7 @@ export default {
             inviteMessagePrompt: 'Añadir un mensaje para hacer tu invitación destacar',
             personalMessagePrompt: 'Mensaje',
             inviteNoMembersError: 'Por favor, selecciona al menos un miembro a invitar.',
-            genericFailureMessage: 'Se produjo un error al invitar al usuario al espacio de trabajo. Vuelva a intentarlo..',
+            genericFailureMessage: 'Se ha producido un error al invitar al miembro al espacio de trabajo. Por favor, vuelva a intentarlo.',
         },
         distanceRates: {
             oopsNotSoFast: 'Ups! No tan rápido...',
@@ -2432,12 +3484,15 @@ export default {
             centrallyManage: 'Gestiona centralizadamente las tasas, elige si contabilizar en millas o kilómetros, y define una categoría por defecto',
             rate: 'Tasa',
             addRate: 'Agregar tasa',
+            trackTax: 'Impuesto de seguimiento',
             deleteRates: ({count}: DistanceRateOperationsParams) => `Eliminar ${Str.pluralize('tasa', 'tasas', count)}`,
             enableRates: ({count}: DistanceRateOperationsParams) => `Activar ${Str.pluralize('tasa', 'tasas', count)}`,
             disableRates: ({count}: DistanceRateOperationsParams) => `Desactivar ${Str.pluralize('tasa', 'tasas', count)}`,
             enableRate: 'Activar tasa',
             status: 'Estado',
             unit: 'Unidad',
+            taxFeatureNotEnabledMessage: 'Los impuestos deben estar activados en el área de trabajo para poder utilizar esta función. Dirígete a ',
+            changePromptMessage: ' para hacer ese cambio.',
             defaultCategory: 'Categoría predeterminada',
             deleteDistanceRate: 'Eliminar tasa de distancia',
             areYouSureDelete: ({count}: DistanceRateOperationsParams) => `¿Estás seguro de que quieres eliminar ${Str.pluralize('esta tasa', 'estas tasas', count)}?`,
@@ -2445,25 +3500,27 @@ export default {
         editor: {
             nameInputLabel: 'Nombre',
             descriptionInputLabel: 'Descripción',
+            typeInputLabel: 'Tipo',
+            initialValueInputLabel: 'Valor inicial',
             nameInputHelpText: 'Este es el nombre que verás en tu espacio de trabajo.',
             nameIsRequiredError: 'Debes definir un nombre para tu espacio de trabajo.',
             currencyInputLabel: 'Moneda por defecto',
             currencyInputHelpText: 'Todas los gastos en este espacio de trabajo serán convertidos a esta moneda.',
             currencyInputDisabledText: 'La moneda predeterminada no se puede cambiar porque este espacio de trabajo está vinculado a una cuenta bancaria en USD.',
             save: 'Guardar',
-            genericFailureMessage: 'Se produjo un error al guardar el espacio de trabajo. Por favor, inténtalo de nuevo.',
+            genericFailureMessage: 'Se ha producido un error al guardar el espacio de trabajo. Por favor, inténtalo de nuevo.',
             avatarUploadFailureMessage: 'No se pudo subir el avatar. Por favor, inténtalo de nuevo.',
+            addressContext: 'Se requiere una dirección para habilitar Expensify Travel. Por favor, introduce una dirección asociada con tu negocio.',
         },
         bankAccount: {
             continueWithSetup: 'Continuar con la configuración',
-            youreAlmostDone:
-                'Casi has acabado de configurar tu cuenta bancaria, que te permitirá emitir tarjetas corporativas, reembolsar gastos y cobrar pagar facturas, todo desde la misma cuenta bancaria.',
+            youreAlmostDone: 'Casi has acabado de configurar tu cuenta bancaria, que te permitirá emitir tarjetas corporativas, reembolsar gastos y cobrar pagar facturas.',
             streamlinePayments: 'Optimiza pagos',
             oneMoreThing: '¡Una cosa más!',
             allSet: '¡Todo listo!',
             accountDescriptionNoCards:
-                'Esta cuenta bancaria se utilizará para reembolsar gastos y cobrar y pagar facturas, todo desde la misma cuenta.\n\nPor favor, añade un correo electrónico de trabajo como tu nombre de usuario secundario para activar la Tarjeta Expensify.',
-            accountDescriptionWithCards: 'Esta cuenta bancaria se utilizará para emitir tarjetas corporativas, reembolsar gastos y cobrar y pagar facturas, todo desde la misma cuenta.',
+                'Esta cuenta bancaria se utilizará para reembolsar gastos y cobrar y pagar facturas.\n\nPor favor, añade un correo electrónico de trabajo como tu nombre de usuario secundario para activar la Tarjeta Expensify.',
+            accountDescriptionWithCards: 'Esta cuenta bancaria se utilizará para emitir tarjetas corporativas, reembolsar gastos y cobrar y pagar facturas.',
             addWorkEmail: 'Añadir correo electrónico de trabajo',
             letsFinishInChat: '¡Continuemos en el chat!',
             almostDone: '¡Casi listo!',
@@ -2482,11 +3539,11 @@ export default {
             updateToUSD: 'Actualizar a USD',
         },
         changeOwner: {
-            changeOwnerPageTitle: 'Dueño de la transferencia',
-            addPaymentCardTitle: 'Ingrese su tarjeta de pago para transferir la propiedad',
+            changeOwnerPageTitle: 'Transferir la propiedad',
+            addPaymentCardTitle: 'Ingrese tu tarjeta de pago para transferir la propiedad',
             addPaymentCardButtonText: 'Aceptar términos y agregar tarjeta de pago',
             addPaymentCardReadAndAcceptTextPart1: 'Lea y acepte',
-            addPaymentCardReadAndAcceptTextPart2: 'para agregar su tarjeta',
+            addPaymentCardReadAndAcceptTextPart2: 'para agregar tu tarjeta',
             addPaymentCardTerms: 'los términos',
             addPaymentCardPrivacy: 'la política de privacidad',
             addPaymentCardAnd: 'y',
@@ -2495,29 +3552,28 @@ export default {
             addPaymentCardRedundant: 'Infraestructura redundante',
             addPaymentCardLearnMore: 'Conozca más sobre nuestra',
             addPaymentCardSecurity: 'seguridad',
-            // TODO: add spanish translations below
             amountOwedTitle: 'Saldo pendiente',
             amountOwedButtonText: 'OK',
             amountOwedText: 'Esta cuenta tiene un saldo pendiente de un mes anterior.\n\n¿Quiere liquidar el saldo y hacerse cargo de la facturación de este espacio de trabajo?',
             ownerOwesAmountTitle: 'Saldo pendiente',
             ownerOwesAmountButtonText: 'Transferir saldo',
             ownerOwesAmountText: ({email, amount}) =>
-                `La cuenta propietaria de este espacio de trabajo (${email}) tiene un saldo pendiente de un mes anterior.\n\n¿Desea transferir este monto (${amount}) para hacerse cargo de la facturación de este espacio de trabajo? Su tarjeta de pago se cargará inmediatamente.`,
+                `La cuenta propietaria de este espacio de trabajo (${email}) tiene un saldo pendiente de un mes anterior.\n\n¿Desea transferir este monto (${amount}) para hacerse cargo de la facturación de este espacio de trabajo? tu tarjeta de pago se cargará inmediatamente.`,
             subscriptionTitle: 'Asumir la suscripción anual',
             subscriptionButtonText: 'Transferir suscripción',
             subscriptionText: ({usersCount, finalCount}) =>
-                `Al hacerse cargo de este espacio de trabajo se fusionará su suscripción anual asociada con su suscripción actual. Esto aumentará el tamaño de su suscripción en ${usersCount} usuarios, lo que hará que su nuevo tamaño de suscripción sea ${finalCount}. ¿Te gustaria continuar?`,
+                `Al hacerse cargo de este espacio de trabajo se fusionará tu suscripción anual asociada con tu suscripción actual. Esto aumentará el tamaño de tu suscripción en ${usersCount} miembros, lo que hará que tu nuevo tamaño de suscripción sea ${finalCount}. ¿Te gustaria continuar?`,
             duplicateSubscriptionTitle: 'Alerta de suscripción duplicada',
             duplicateSubscriptionButtonText: 'Continuar',
             duplicateSubscriptionText: ({email, workspaceName}) =>
-                `Parece que estás intentando hacerte cargo de la facturación de los espacios de trabajo de ${email}, pero para hacerlo, primero debes ser administrador de todos sus espacios de trabajo.\n\nHaz clic en "Continuar" si solo quieres tomar sobrefacturación para el espacio de trabajo ${workspaceName}.\n\nSi desea hacerse cargo de la facturación de toda su suscripción, pídales que lo agreguen como administrador a todos sus espacios de trabajo antes de hacerse cargo de la facturación.`,
+                `Parece que estás intentando hacerte cargo de la facturación de los espacios de trabajo de ${email}, pero para hacerlo, primero debes ser administrador de todos sus espacios de trabajo.\n\nHaz clic en "Continuar" si solo quieres tomar sobrefacturación para el espacio de trabajo ${workspaceName}.\n\nSi desea hacerse cargo de la facturación de toda tu suscripción, pídales que lo agreguen como administrador a todos sus espacios de trabajo antes de hacerse cargo de la facturación.`,
             hasFailedSettlementsTitle: 'No se puede transferir la propiedad',
             hasFailedSettlementsButtonText: 'Entiendo',
             hasFailedSettlementsText: ({email}) =>
                 `No puede hacerse cargo de la facturación porque ${email} tiene una liquidación vencida de la tarjeta Expensify. Avíseles que se comuniquen con concierge@expensify.com para resolver el problema. Luego, podrá hacerse cargo de la facturación de este espacio de trabajo.`,
-            failedToClearBalanceTitle: 'Failed to clear balance',
+            failedToClearBalanceTitle: 'Fallo al liquidar el saldo',
             failedToClearBalanceButtonText: 'OK',
-            failedToClearBalanceText: 'We were unable to clear the balance. Please try again later.',
+            failedToClearBalanceText: 'No hemos podido liquidar el saldo, por favor, inténtalo más tarde.',
             successTitle: '¡Guau! Todo listo.',
             successDescription: 'Ahora eres el propietario de este espacio de trabajo.',
             errorTitle: '¡Ups! No tan rapido...',
@@ -2525,6 +3581,118 @@ export default {
             errorDescriptionPartTwo: 'contacta con el conserje',
             errorDescriptionPartThree: 'por ayuda.',
         },
+
+        exportAgainModal: {
+            title: '¡Cuidado!',
+            description: (reportName: string, connectionName: ConnectionName) =>
+                `Los siguientes informes ya se han exportado a ${CONST.POLICY.CONNECTIONS.NAME_USER_FRIENDLY[connectionName]}:\n\n${reportName}\n\n¿Estás seguro de que deseas exportarlos de nuevo?`,
+            confirmText: 'Sí, exportar de nuevo',
+            cancelText: 'Cancelar',
+        },
+        upgrade: {
+            reportFields: {
+                title: 'Los campos',
+                description: `Los campos de informe permiten especificar detalles a nivel de cabecera, distintos de las etiquetas que pertenecen a los gastos en partidas individuales. Estos detalles pueden incluir nombres de proyectos específicos, información sobre viajes de negocios, ubicaciones, etc.`,
+                onlyAvailableOnPlan: 'Los campos de informe sólo están disponibles en el plan Control, a partir de ',
+            },
+            [CONST.POLICY.CONNECTIONS.NAME.NETSUITE]: {
+                title: 'NetSuite',
+                description: `Disfruta de la sincronización automática y reduce las entradas manuales con la integración Expensify + NetSuite. Obtén información financiera en profundidad y en tiempo real con la compatibilidad nativa y personalizada con segmentos, incluida la asignación de proyectos y clientes.`,
+                onlyAvailableOnPlan: 'Nuestra integración NetSuite sólo está disponible en el plan Control, a partir de ',
+            },
+            [CONST.POLICY.CONNECTIONS.NAME.SAGE_INTACCT]: {
+                title: 'Sage Intacct',
+                description: `Disfruta de una sincronización automatizada y reduce las entradas manuales con la integración Expensify + Sage Intacct. Obtén información financiera en profundidad y en tiempo real con dimensiones definidas por el usuario, así como codificación de gastos por departamento, clase, ubicación, cliente y proyecto (trabajo).`,
+                onlyAvailableOnPlan: 'Nuestra integración Sage Intacct sólo está disponible en el plan Control, a partir de ',
+            },
+            [CONST.UPGRADE_FEATURE_INTRO_MAPPING.approvals.id]: {
+                title: 'Aprobaciones anticipadas',
+                description: `Si quieres añadir más niveles de aprobación, o simplemente asegurarte de que los gastos más importantes reciben otro vistazo, no hay problema. Las aprobaciones avanzadas ayudan a realizar las comprobaciones adecuadas a cada nivel para mantener los gastos de tu equipo bajo control.`,
+                onlyAvailableOnPlan: 'Las aprobaciones avanzadas sólo están disponibles en el plan Control, con precios desde ',
+            },
+            glCodes: {
+                title: 'Códigos de libro mayor',
+                description: `Añada códigos de libro mayor a sus categorías para exportar fácilmente los gastos a sus sistemas de contabilidad y nómina.`,
+                onlyAvailableOnPlan: 'Los códigos de libro mayor solo están disponibles en el plan Control, a partir de ',
+            },
+            glAndPayrollCodes: {
+                title: 'Códigos de libro mayor y nómina',
+                description: `Añada códigos de libro mayor y nómina a sus categorías para exportar fácilmente los gastos a sus sistemas de contabilidad y nómina.`,
+                onlyAvailableOnPlan: 'Los códigos de libro mayor y nómina solo están disponibles en el plan Control, a partir de ',
+            },
+            taxCodes: {
+                title: 'Código de impuesto',
+                description: `Añada código de impuesto mayor a sus categorías para exportar fácilmente los gastos a sus sistemas de contabilidad y nómina.`,
+                onlyAvailableOnPlan: 'Los código de impuesto mayor solo están disponibles en el plan Control, a partir de ',
+            },
+            companyCards: {
+                title: 'Tarjetas de empresa',
+                description: `Las tarjetas de empresa le permiten importar los gastos de las tarjetas de empresa existentes de todos los principales emisores de tarjetas. Puede asignar tarjetas a empleados e importar transacciones automáticamente.`,
+                onlyAvailableOnPlan: 'Las tarjetas de empresa solo están disponibles en el plan Control, a partir de ',
+            },
+            rules: {
+                title: 'Reglas',
+                description: `Las reglas se ejecutan en segundo plano y mantienen tus gastos bajo control para que no tengas que preocuparte por los detalles pequeños.\n\nExige detalles de los gastos, como recibos y descripciones, establece límites y valores predeterminados, y automatiza las aprobaciones y los pagos, todo en un mismo lugar.`,
+                onlyAvailableOnPlan: 'Las reglas están disponibles solo en el plan Control, que comienza en ',
+            },
+            note: {
+                upgradeWorkspace: 'Mejore su espacio de trabajo para acceder a esta función, o',
+                learnMore: 'más información',
+                aboutOurPlans: 'sobre nuestros planes y precios.',
+            },
+            pricing: {
+                amount: '$9 ',
+                perActiveMember: 'por miembro activo al mes.',
+            },
+            upgradeToUnlock: 'Desbloquear esta función',
+            completed: {
+                headline: 'Has mejorado tu espacio de trabajo.',
+                successMessage: (policyName: string) => `Ha mejorado correctamente su espacio de trabajo ${policyName} al plan Control.`,
+                viewSubscription: 'Ver su suscripción',
+                moreDetails: 'para obtener más información.',
+                gotIt: 'Entendido, gracias.',
+            },
+        },
+        restrictedAction: {
+            restricted: 'Restringido',
+            actionsAreCurrentlyRestricted: ({workspaceName}) => `Las acciones en el espacio de trabajo ${workspaceName} están actualmente restringidas`,
+            workspaceOwnerWillNeedToAddOrUpdatePaymentCard: ({workspaceOwnerName}) =>
+                `El propietario del espacio de trabajo, ${workspaceOwnerName} tendrá que añadir o actualizar la tarjeta de pago registrada para desbloquear nueva actividad en el espacio de trabajo.`,
+            youWillNeedToAddOrUpdatePaymentCard: 'Debes añadir o actualizar la tarjeta de pago registrada para desbloquear nueva actividad en el espacio de trabajo.',
+            addPaymentCardToUnlock: 'Añade una tarjeta para desbloquearlo!',
+            addPaymentCardToContinueUsingWorkspace: 'Añade una tarjeta de pago para seguir utilizando este espacio de trabajo',
+            pleaseReachOutToYourWorkspaceAdmin: 'Si tienes alguna pregunta, ponte en contacto con el administrador de su espacio de trabajo.',
+            chatWithYourAdmin: 'Chatea con tu administrador',
+            chatInAdmins: 'Chatea en #admins',
+            addPaymentCard: 'Agregar tarjeta de pago',
+        },
+        rules: {
+            individualExpenseRules: {
+                title: 'Gastos',
+                subtitle: 'Establece controles y valores predeterminados para gastos individuales. También puedes crear reglas para',
+                receiptRequiredAmount: 'Cantidad requerida para los recibos',
+                receiptRequiredAmountDescription: 'Exige recibos cuando los gastos superen este importe, a menos que lo anule una regla de categoría.',
+                maxExpenseAmount: 'Importe máximo del gasto',
+                maxExpenseAmountDescription: 'Marca los gastos que superen este importe, a menos que una regla de categoría lo anule.',
+                maxAge: 'Antigüedad máxima',
+                maxExpenseAge: 'Antigüedad máxima de los gastos',
+                maxExpenseAgeDescription: 'Marca los gastos de más de un número determinado de días.',
+                maxExpenseAgeDays: (age: number) => `${age} ${Str.pluralize('día', 'días', age)}`,
+                billableDefault: 'Valor predeterminado facturable',
+                billableDefaultDescription: 'Elige si los gastos en efectivo y con tarjeta de crédito deben ser facturables por defecto. Los gastos facturables se activan o desactivan en',
+                billable: 'Facturable',
+                billableDescription: 'Los gastos se vuelven a facturar a los clientes en la mayoría de los casos',
+                nonBillable: 'No facturable',
+                nonBillableDescription: 'Los gastos se vuelven a facturar a los clientes en ocasiones',
+                eReceipts: 'Recibos electrónicos',
+                eReceiptsHint: 'Los recibos electrónicos se crean automáticamente',
+                eReceiptsHintLink: 'para la mayoría de las transacciones en USD',
+            },
+            expenseReportRules: {
+                title: 'Informes de gastos',
+                subtitle: 'Automatiza el cumplimiento, la aprobación y el pago de los informes de gastos.',
+            },
+        },
     },
     getAssistancePage: {
         title: 'Obtener ayuda',
@@ -2566,11 +3734,11 @@ export default {
         roomNameInvalidError: 'Los nombres de las salas solo pueden contener minúsculas, números y guiones.',
         pleaseEnterRoomName: 'Por favor, escribe el nombre de una sala.',
         pleaseSelectWorkspace: 'Por favor, selecciona un espacio de trabajo.',
-        renamedRoomAction: ({oldName, newName}: RenamedRoomActionParams) => ` cambió el nombre de la sala de ${oldName} a ${newName}`,
+        renamedRoomAction: ({oldName, newName}: RenamedRoomActionParams) => `cambió el nombre de la sala de ${oldName} a ${newName}`,
         roomRenamedTo: ({newName}: RoomRenamedToParams) => `Sala renombrada a ${newName}`,
         social: 'social',
         selectAWorkspace: 'Seleccionar un espacio de trabajo',
-        growlMessageOnRenameError: 'No se ha podido cambiar el nombre del espacio de trabajo, por favor, comprueba tu conexión e inténtalo de nuevo.',
+        growlMessageOnRenameError: 'No se ha podido cambiar el nombre del espacio de trabajo. Por favor, comprueba tu conexión e inténtalo de nuevo.',
         visibilityOptions: {
             restricted: 'Espacio de trabajo', // the translation for "restricted" visibility is actually workspace. This is so we can display restricted visibility rooms as "workspace" without having to change what's stored.
             private: 'Privada',
@@ -2579,10 +3747,16 @@ export default {
             public_announce: 'Anuncio Público',
         },
     },
+    workspaceActions: {
+        renamedWorkspaceNameAction: ({oldName, newName}) => `actualizó el nombre de este espacio de trabajo de ${oldName} a ${newName}`,
+    },
     roomMembersPage: {
-        memberNotFound: 'Miembro no encontrado. Para invitar a un nuevo miembro a la sala de chat, por favor, utiliza el botón Invitar que está más arriba.',
-        notAuthorized: `No tienes acceso a esta página. ¿Estás tratando de unirte a la sala de chat? Comunícate con el propietario de esta sala de chat para que pueda añadirte como miembro. ¿Necesitas algo más? Comunícate con ${CONST.EMAIL.CONCIERGE}`,
+        memberNotFound: 'Miembro no encontrado. Para invitar a un nuevo miembro a la sala de chat, por favor, utiliza el botón invitar que está más arriba.',
+        notAuthorized: `No tienes acceso a esta página. Si estás intentando unirte a esta sala, pide a un miembro de la sala que te añada. ¿Necesitas algo más? Comunícate con ${CONST.EMAIL.CONCIERGE}`,
         removeMembersPrompt: '¿Estás seguro de que quieres eliminar a los miembros seleccionados de la sala de chat?',
+        error: {
+            genericAdd: 'Hubo un problema al añadir este miembro a la sala de chat.',
+        },
     },
     newTaskPage: {
         assignTask: 'Asignar tarea',
@@ -2590,15 +3764,14 @@ export default {
         confirmTask: 'Confirmar tarea',
         confirmError: 'Por favor, introduce un título y selecciona un destino de tarea.',
         descriptionOptional: 'Descripción (opcional)',
-        shareSomewhere: 'Compartir en algún lugar',
         pleaseEnterTaskName: 'Por favor, introduce un título',
-        pleaseEnterTaskDestination: 'Por favor, selecciona con quién deseas compartir.',
+        pleaseEnterTaskDestination: 'Por favor, selecciona dónde deseas compartir esta tarea.',
     },
     task: {
         task: 'Tarea',
         title: 'Título',
         description: 'Descripción',
-        assignee: 'Usuario asignado',
+        assignee: 'Miembro asignado',
         completed: 'Completada',
         messages: {
             created: ({title}: TaskCreatedActionParams) => `tarea para ${title}`,
@@ -2609,8 +3782,8 @@ export default {
         },
         markAsComplete: 'Marcar como completada',
         markAsIncomplete: 'Marcar como incompleta',
-        assigneeError: 'Hubo un error al asignar esta tarea, inténtalo con otro usuario.',
-        genericCreateTaskFailureMessage: 'Error inesperado al crear el tarea, por favor, inténtalo más tarde.',
+        assigneeError: 'Se ha producido un error al asignar esta tarea. Por favor, inténtalo con otro miembro.',
+        genericCreateTaskFailureMessage: 'Error inesperado al crear la tarea. Por favor, inténtalo más tarde.',
         deleteTask: 'Eliminar tarea',
         deleteConfirmation: '¿Estás seguro de que quieres eliminar esta tarea?',
     },
@@ -2627,6 +3800,7 @@ export default {
             search: 'Abrir diálogo de búsqueda',
             newChat: 'Nueva pantalla de chat',
             copy: 'Copiar comentario',
+            openDebug: 'Abrir el diálogo de preferencias de pruebas',
         },
     },
     guides: {
@@ -2635,12 +3809,42 @@ export default {
     },
     search: {
         resultsAreLimited: 'Los resultados de búsqueda están limitados.',
+        viewResults: 'Ver resultados',
         searchResults: {
             emptyResults: {
                 title: 'No hay nada que ver aquí',
                 subtitle: 'Por favor intenta crear algo usando el botón verde.',
             },
+            emptyTripResults: {
+                title: 'No tienes viajes',
+                subtitle: 'Reserva tu primer viaje a continuación.',
+                buttonText: 'Reserva un viaje',
+            },
         },
+        groupedExpenses: 'gastos agrupados',
+        bulkActions: {
+            delete: 'Eliminar',
+            hold: 'Bloquear',
+            unhold: 'Desbloquear',
+            noOptionsAvailable: 'No hay opciones disponibles para el grupo de gastos seleccionado.',
+        },
+        filtersHeader: 'Filtros',
+        filters: {
+            date: {
+                before: (date?: string) => `Antes de ${date ?? ''}`,
+                after: (date?: string) => `Después de ${date ?? ''}`,
+            },
+            status: 'Estado',
+            keyword: 'Palabra clave',
+            hasKeywords: 'Tiene palabras clave',
+            currency: 'Divisa',
+            amount: {
+                lessThan: (amount?: string) => `Menos de ${amount ?? ''}`,
+                greaterThan: (amount?: string) => `Más que ${amount ?? ''}`,
+                between: (greaterThan: string, lessThan: string) => `Entre ${greaterThan} y ${lessThan}`,
+            },
+        },
+        expenseType: 'Tipo de gasto',
     },
     genericErrorPage: {
         title: '¡Oh-oh, algo salió mal!',
@@ -2664,7 +3868,7 @@ export default {
         },
         permissionError: {
             title: 'Permiso para acceder al almacenamiento',
-            message: 'Expensify no puede guardar los archivos adjuntos sin permiso para acceder al almacenamiento. Haz click en Configuración para actualizar los permisos.',
+            message: 'Expensify no puede guardar los archivos adjuntos sin permiso para acceder al almacenamiento. Haz click en configuración para actualizar los permisos.',
         },
     },
     desktopApplicationMenu: {
@@ -2739,8 +3943,47 @@ export default {
         genericCreateReportFailureMessage: 'Error inesperado al crear el chat. Por favor, inténtalo más tarde.',
         genericAddCommentFailureMessage: 'Error inesperado al añadir el comentario. Por favor, inténtalo más tarde.',
         genericUpdateReportFieldFailureMessage: 'Error inesperado al actualizar el campo. Por favor, inténtalo más tarde.',
-        genericUpdateReporNameEditFailureMessage: 'Error inesperado al cambiar el nombre del informe. Vuelva a intentarlo más tarde.',
+        genericUpdateReporNameEditFailureMessage: 'Error inesperado al cambiar el nombre del informe. Por favor, intentarlo más tarde.',
         noActivityYet: 'Sin actividad todavía',
+        actions: {
+            type: {
+                changeField: ({oldValue, newValue, fieldName}: ChangeFieldParams) => `cambió ${fieldName} de ${oldValue} a ${newValue}`,
+                changeFieldEmpty: ({newValue, fieldName}: ChangeFieldParams) => `cambió ${fieldName} a ${newValue}`,
+                changePolicy: ({fromPolicy, toPolicy}: ChangePolicyParams) => `cambió el espacio de trabajo de ${fromPolicy} a ${toPolicy}`,
+                changeType: ({oldType, newType}: ChangeTypeParams) => `cambió type de ${oldType} a ${newType}`,
+                delegateSubmit: ({delegateUser, originalManager}: DelegateSubmitParams) => `envié este informe a ${delegateUser} ya que ${originalManager} está de vacaciones`,
+                exportedToCSV: `exportó este informe a CSV`,
+                exportedToIntegration: {
+                    automatic: ({label}: ExportedToIntegrationParams) => `exportó este informe a ${label}.`,
+                    manual: ({label}: ExportedToIntegrationParams) => `marcó este informe como exportado manualmente a ${label}.`,
+                    reimburseableLink: 'Ver los gastos por cuenta propia.',
+                    nonReimbursableLink: 'Ver los gastos de la tarjeta de empresa.',
+                    pending: ({label}: ExportedToIntegrationParams) => `comenzó a exportar este informe a ${label}...`,
+                },
+                integrationsMessage: (errorMessage: string, label: string) => `no se pudo exportar este informe a ${label} ("${errorMessage}").`,
+                managerAttachReceipt: `agregó un recibo`,
+                managerDetachReceipt: `quitó un recibo`,
+                markedReimbursed: ({amount, currency}: MarkedReimbursedParams) => `pagó ${currency}${amount} en otro lugar`,
+                markedReimbursedFromIntegration: ({amount, currency}: MarkReimbursedFromIntegrationParams) => `pagó ${currency}${amount} mediante integración`,
+                outdatedBankAccount: `no se pudo procesar el pago debido a un problema con la cuenta bancaria del pagador`,
+                reimbursementACHBounce: `no se pudo procesar el pago porque el pagador no tiene fondos suficientes`,
+                reimbursementACHCancelled: `canceled the payment`,
+                reimbursementAccountChanged: `no se pudo procesar el pago porque el pagador cambió de cuenta bancaria`,
+                reimbursementDelayed: `procesó el pago pero se retrasó entre 1 y 2 días hábiles más`,
+                selectedForRandomAudit: `seleccionado al azar para revisión`,
+                selectedForRandomAuditMarkdown: `[seleccionado al azar](https://help.expensify.com/articles/expensify-classic/reports/Set-a-random-report-audit-schedule) para revisión`,
+                share: ({to}: ShareParams) => `miembro invitado ${to}`,
+                unshare: ({to}: UnshareParams) => `usuario eliminado ${to}`,
+                stripePaid: ({amount, currency}: StripePaidParams) => `pagado ${currency}${amount}`,
+                takeControl: `tomó el control`,
+                unapproved: ({amount, currency}: UnapprovedParams) => `no aprobado ${currency}${amount}`,
+                integrationSyncFailed: (label: string, errorMessage: string) => `no se pudo sincronizar con ${label} ("${errorMessage}")`,
+                addEmployee: (email: string, role: string) => `agregó a ${email} como ${role === 'user' ? 'miembro' : 'administrador'}`,
+                updateRole: (email: string, currentRole: string, newRole: string) =>
+                    `actualicé el rol ${email} de ${currentRole === 'user' ? 'miembro' : 'administrador'} a ${newRole === 'user' ? 'miembro' : 'administrador'}`,
+                removeMember: (email: string, role: string) => `eliminado ${role === 'user' ? 'miembro' : 'administrador'} ${email}`,
+            },
+        },
     },
     chronos: {
         oooEventSummaryFullDay: ({summary, dayCount, date}: OOOEventSummaryFullDayParams) => `${summary} por ${dayCount} ${dayCount === 1 ? 'día' : 'días'} hasta el ${date}`,
@@ -3285,7 +4528,7 @@ export default {
         nothing: 'Por ahora, nada',
     },
     moderation: {
-        flagDescription: 'Todos los mensajes marcados se enviarán a un moderador para su revisión.',
+        flagDescription: 'Todos los mensajes marcados se enviarán a un moderador para tu revisión.',
         chooseAReason: 'Elige abajo un motivo para reportarlo:',
         spam: 'Spam',
         spamDescription: 'Publicidad no solicitada',
@@ -3311,7 +4554,7 @@ export default {
         joinExpensifyOrg: 'Únete a Expensify.org para eliminar la injusticia en todo el mundo y ayuda a los profesores a dividir sus gastos para las aulas más necesitadas.',
         iKnowATeacher: 'Yo conozco a un profesor',
         iAmATeacher: 'Soy profesor',
-        getInTouch: '¡Excelente! Por favor, comparte su información para que podamos ponernos en contacto con ellos.',
+        getInTouch: '¡Excelente! Por favor, comparte tu información para que podamos ponernos en contacto con ellos.',
         introSchoolPrincipal: 'Introducción al director del colegio',
         schoolPrincipalVerfiyExpense:
             'Expensify.org divide el coste del material escolar esencial para que los estudiantes de familias con bajos ingresos puedan tener una mejor experiencia de aprendizaje. Se pedirá a tu director que verifique tus gastos.',
@@ -3360,8 +4603,8 @@ export default {
         reasonTitle: '¿Por qué necesitas una tarjeta nueva?',
         cardDamaged: 'Mi tarjeta está dañada',
         cardLostOrStolen: 'He perdido o me han robado la tarjeta',
-        confirmAddressTitle: 'Confirma que la dirección que aparece a continuación es a la que deseas que te enviemos tu nueva tarjeta.',
-        cardDamagedInfo: 'La nueva tarjeta te llegará en 2-3 días laborables y la tarjeta actual seguirá funcionando hasta que actives la nueva.',
+        confirmAddressTitle: 'Por favor, confirma la dirección postal de tu nueva tarjeta.',
+        cardDamagedInfo: 'La nueva tarjeta te llegará en 2-3 días laborables. La tarjeta actual seguirá funcionando hasta que actives la nueva.',
         cardLostOrStolenInfo: 'La tarjeta actual se desactivará permanentemente en cuanto realices el pedido. La mayoría de las tarjetas llegan en pocos días laborables.',
         address: 'Dirección',
         deactivateCardButton: 'Desactivar tarjeta',
@@ -3381,7 +4624,7 @@ export default {
             body: `¡Gana dinero por hablar con tus amigos! Inicia un chat con una cuenta nueva de Expensify y recibe $${CONST.REFERRAL_PROGRAM.REVENUE} cuando se conviertan en clientes.`,
         },
         [CONST.REFERRAL_PROGRAM.CONTENT_TYPES.SUBMIT_EXPENSE]: {
-            buttonText1: 'Presentar gasto, ',
+            buttonText1: 'Presenta un gasto, ',
             buttonText2: `recibe $${CONST.REFERRAL_PROGRAM.REVENUE}`,
             header: `Presenta un gasto y consigue $${CONST.REFERRAL_PROGRAM.REVENUE}`,
             body: `¡Vale la pena cobrar! Envia un gasto a una cuenta nueva de Expensify y recibe $${CONST.REFERRAL_PROGRAM.REVENUE} cuando se conviertan en clientes.`,
@@ -3423,7 +4666,7 @@ export default {
         categoryOutOfPolicy: 'La categoría ya no es válida',
         conversionSurcharge: ({surcharge}: ViolationsConversionSurchargeParams = {}) => `${surcharge}% de recargo aplicado`,
         customUnitOutOfPolicy: 'La unidad ya no es válida',
-        duplicatedTransaction: 'Posible duplicado',
+        duplicatedTransaction: 'Duplicado',
         fieldRequired: 'Los campos del informe son obligatorios',
         futureDate: 'Fecha futura no permitida',
         invoiceMarkup: ({invoiceMarkup}: ViolationsInvoiceMarkupParams) => `Incrementado un ${invoiceMarkup}%`,
@@ -3431,7 +4674,19 @@ export default {
         missingCategory: 'Falta categoría',
         missingComment: 'Descripción obligatoria para la categoría seleccionada',
         missingTag: ({tagName}: ViolationsMissingTagParams) => `Falta ${tagName ?? 'etiqueta'}`,
-        modifiedAmount: 'Importe superior al del recibo escaneado',
+        modifiedAmount: ({type, displayPercentVariance}: ViolationsModifiedAmountParams) => {
+            switch (type) {
+                case 'distance':
+                    return 'Importe difiere del calculado basado en distancia';
+                case 'card':
+                    return 'Importe mayor al de la transacción de la tarjeta';
+                default:
+                    if (displayPercentVariance) {
+                        return `Importe ${displayPercentVariance}% mayor al del recibo escaneado`;
+                    }
+                    return 'Importe mayor al del recibo escaneado';
+            }
+        },
         modifiedDate: 'Fecha difiere del recibo escaneado',
         nonExpensiworksExpense: 'Gasto no proviene de Expensiworks',
         overAutoApprovalLimit: ({formattedLimit}: ViolationsOverAutoApprovalLimitParams) =>
@@ -3440,15 +4695,26 @@ export default {
         overLimit: ({formattedLimit}: ViolationsOverLimitParams) => `Importe supera el límite${formattedLimit ? ` de ${formattedLimit}/persona` : ''}`,
         overLimitAttendee: ({formattedLimit}: ViolationsOverLimitParams) => `Importe supera el límite${formattedLimit ? ` de ${formattedLimit}/persona` : ''}`,
         perDayLimit: ({formattedLimit}: ViolationsPerDayLimitParams) => `Importe supera el límite diario de la categoría${formattedLimit ? ` de ${formattedLimit}/persona` : ''}`,
-        receiptNotSmartScanned: 'Recibo no verificado. Por favor, confirma su exactitud',
-        receiptRequired: (params: ViolationsReceiptRequiredParams) =>
-            `Recibo obligatorio${params ? ` para importes sobre${params.formattedLimit ? ` ${params.formattedLimit}` : ''}${params.category ? ' el límite de la categoría' : ''}` : ''}`,
+        receiptNotSmartScanned: 'Recibo no verificado. Por favor, confirma tu exactitud',
+        receiptRequired: ({formattedLimit, category}: ViolationsReceiptRequiredParams) => {
+            let message = 'Recibo obligatorio';
+            if (formattedLimit ?? category) {
+                message += ' para importes sobre';
+                if (formattedLimit) {
+                    message += ` ${formattedLimit}`;
+                }
+                if (category) {
+                    message += ' el límite de la categoría';
+                }
+            }
+            return message;
+        },
         reviewRequired: 'Revisión requerida',
         rter: ({brokenBankConnection, isAdmin, email, isTransactionOlderThan7Days, member}: ViolationsRterParams) => {
             if (brokenBankConnection) {
                 return isAdmin
-                    ? `No se puede adjuntar recibo debido a un problema con la conexión a su banco que ${email} necesita arreglar`
-                    : 'No se puede adjuntar recibo debido a un problema con la conexión a su banco que necesitas arreglar';
+                    ? `No se puede adjuntar recibo debido a un problema con la conexión a tu banco que ${email} necesita arreglar`
+                    : 'No se puede adjuntar recibo debido a un problema con la conexión a tu banco que necesitas arreglar';
             }
             if (!isTransactionOlderThan7Days) {
                 return isAdmin
@@ -3464,11 +4730,29 @@ export default {
         taxOutOfPolicy: ({taxName}: ViolationsTaxOutOfPolicyParams) => `${taxName ?? 'El impuesto'} ya no es válido`,
         taxRateChanged: 'La tasa de impuesto fue modificada',
         taxRequired: 'Falta la tasa de impuesto',
+        none: 'Ninguno',
+        taxCodeToKeep: 'Elige qué tasa de impuesto quieres conservar',
+        tagToKeep: 'Elige qué etiqueta quieres conservar',
+        isTransactionReimbursable: 'Elige si la transacción es reembolsable',
+        merchantToKeep: 'Elige qué comerciante quieres conservar',
+        descriptionToKeep: 'Elige qué descripción quieres conservar',
+        categoryToKeep: 'Elige qué categoría quieres conservar',
+        isTransactionBillable: 'Elige si la transacción es facturable',
+        keepThisOne: 'Mantener éste',
+        confirmDetails: 'Confirma los detalles que conservas',
+        confirmDuplicatesInfo: 'Los duplicados que no conserves se guardarán para que el usuario los elimine',
+        hold: 'Bloqueado',
+    },
+    reportViolations: {
+        [CONST.REPORT_VIOLATIONS.FIELD_REQUIRED]: (fieldName: string) => `${fieldName} es obligatorio`,
     },
     violationDismissal: {
         rter: {
             manual: 'marcó el recibo como pagado en efectivo.',
         },
+        duplicatedTransaction: {
+            manual: 'resolvió el duplicado',
+        },
     },
     videoPlayer: {
         play: 'Reproducir',
@@ -3478,6 +4762,7 @@ export default {
         expand: 'Expandir',
         mute: 'Silenciar',
         unmute: 'Activar sonido',
+        normal: 'Normal',
     },
     exitSurvey: {
         header: 'Antes de irte',
@@ -3495,7 +4780,7 @@ export default {
             [CONST.EXIT_SURVEY.REASONS.DONT_UNDERSTAND]: '¿Qué estás tratando de hacer?',
             [CONST.EXIT_SURVEY.REASONS.PREFER_CLASSIC]: '¿Por qué prefieres Expensify Classic?',
         },
-        responsePlaceholder: 'Su respuesta',
+        responsePlaceholder: 'Tu respuesta',
         thankYou: '¡Gracias por tus comentarios!',
         thankYouSubtitle: 'Sus respuestas nos ayudarán a crear un mejor producto para hacer las cosas bien. ¡Muchas gracias!',
         goToExpensifyClassic: 'Cambiar a Expensify Classic',
@@ -3503,7 +4788,235 @@ export default {
         offline:
             'Parece que estás desconectado. Desafortunadamente, Expensify Classic no funciona sin conexión, pero New Expensify sí. Si prefieres utilizar Expensify Classic, inténtalo de nuevo cuando tengas conexión a internet.',
     },
+    listBoundary: {
+        errorMessage: 'Se ha producido un error al cargar más mensajes.',
+        tryAgain: 'Inténtalo de nuevo',
+    },
     systemMessage: {
         mergedWithCashTransaction: 'encontró un recibo para esta transacción.',
     },
+    subscription: {
+        authenticatePaymentCard: 'Autenticar tarjeta de pago',
+        mobileReducedFunctionalityMessage: 'No puedes hacer cambios en tu suscripción en la aplicación móvil.',
+        badge: {
+            freeTrial: ({numOfDays}) => `Prueba gratuita: ${numOfDays === 1 ? `queda 1 día` : `quedan ${numOfDays} días`}`,
+        },
+        billingBanner: {
+            policyOwnerAmountOwed: {
+                title: 'Tu información de pago está desactualizada',
+                subtitle: ({date}) => `Actualiza tu tarjeta de pago antes del ${date} para continuar utilizando todas tus herramientas favoritas`,
+            },
+            policyOwnerAmountOwedOverdue: {
+                title: 'Tu información de pago está desactualizada',
+                subtitle: 'Por favor, actualiza tu información de pago.',
+            },
+            policyOwnerUnderInvoicing: {
+                title: 'Tu información de pago está desactualizada',
+                subtitle: ({date}) => `Tu pago está vencido. Por favor, paga tu factura antes del ${date} para evitar la interrupción del servicio.`,
+            },
+            policyOwnerUnderInvoicingOverdue: {
+                title: 'Tu información de pago está desactualizada',
+                subtitle: 'Tu pago está vencido. Por favor, paga tu factura.',
+            },
+            billingDisputePending: {
+                title: 'No se ha podido realizar el cobro a tu tarjeta',
+                subtitle: ({amountOwed, cardEnding}) =>
+                    `Has impugnado el cargo ${amountOwed} en la tarjeta terminada en ${cardEnding}. Tu cuenta estará bloqueada hasta que se resuelva la disputa con tu banco.`,
+            },
+            cardAuthenticationRequired: {
+                title: 'No se ha podido realizar el cobro a tu tarjeta',
+                subtitle: ({cardEnding}) =>
+                    `Tu tarjeta de pago no ha sido autenticada completamente. Por favor, completa el proceso de autenticación para activar tu tarjeta de pago que termina en ${cardEnding}.`,
+            },
+            insufficientFunds: {
+                title: 'No se ha podido realizar el cobro a tu tarjeta',
+                subtitle: ({amountOwed}) =>
+                    `Tu tarjeta de pago fue rechazada por falta de fondos. Vuelve a intentarlo o añade una nueva tarjeta de pago para liquidar tu saldo pendiente de ${amountOwed}.`,
+            },
+            cardExpired: {
+                title: 'No se ha podido realizar el cobro a tu tarjeta',
+                subtitle: ({amountOwed}) => `Tu tarjeta de pago ha expirado. Por favor, añade una nueva tarjeta de pago para liquidar tu saldo pendiente de ${amountOwed}.`,
+            },
+            cardExpireSoon: {
+                title: 'Tu tarjeta caducará pronto',
+                subtitle:
+                    'Tu tarjeta de pago caducará a finales de este mes. Haz clic en el menú de tres puntos que aparece a continuación para actualizarla y continuar utilizando todas tus herramientas favoritas.',
+            },
+            retryBillingSuccess: {
+                title: 'Éxito!',
+                subtitle: 'Tu tarjeta fue facturada correctamente.',
+            },
+            retryBillingError: {
+                title: 'No se ha podido realizar el cobro a tu tarjeta',
+                subtitle:
+                    'Antes de volver a intentarlo, llama directamente a tu banco para que autorice los cargos de Expensify y elimine las retenciones. De lo contrario, añade una tarjeta de pago diferente.',
+            },
+            cardOnDispute: ({amountOwed, cardEnding}) =>
+                `Has impugnado el cargo ${amountOwed} en la tarjeta terminada en ${cardEnding}. Tu cuenta estará bloqueada hasta que se resuelva la disputa con tu banco.`,
+            preTrial: {
+                title: 'Iniciar una prueba gratuita',
+                subtitleStart: 'El próximo paso es ',
+                subtitleLink: 'completar la configuración ',
+                subtitleEnd: 'para que tu equipo pueda empezar a enviar gastos.',
+            },
+            trialStarted: {
+                title: ({numOfDays}) => `Prueba gratuita: ¡${numOfDays === 1 ? `queda 1 día` : `quedan ${numOfDays} días`}!`,
+                subtitle: 'Añade una tarjeta de pago para seguir utilizando tus funciones favoritas.',
+            },
+            trialEnded: {
+                title: 'Tu prueba gratuita ha terminado',
+                subtitle: 'Añade una tarjeta de pago para seguir utilizando tus funciones favoritas.',
+            },
+        },
+        cardSection: {
+            title: 'Pago',
+            subtitle: 'Añade una tarjeta para pagar tu suscripción a Expensify.',
+            addCardButton: 'Añade tarjeta de pago',
+            cardNextPayment: ({nextPaymentDate}) => `Tu próxima fecha de pago es ${nextPaymentDate}.`,
+            cardEnding: ({cardNumber}) => `Tarjeta terminada en ${cardNumber}`,
+            cardInfo: ({name, expiration, currency}) => `Nombre: ${name}, Expiración: ${expiration}, Moneda: ${currency}`,
+            changeCard: 'Cambiar tarjeta de pago',
+            changeCurrency: 'Cambiar moneda de pago',
+            cardNotFound: 'No se ha añadido ninguna tarjeta de pago',
+            retryPaymentButton: 'Reintentar el pago',
+            authenticatePayment: 'Autenticar el pago',
+            requestRefund: 'Solicitar reembolso',
+            requestRefundModal: {
+                phrase1: 'Obtener un reembolso es fácil, simplemente baja tu cuenta de categoría antes de la próxima fecha de facturación y recibirás un reembolso.',
+                phrase2:
+                    'Atención: Bajar tu cuenta de categoría significa que tu(s) espacio(s) de trabajo será(n) eliminado(s). Esta acción no se puede deshacer, pero siempre puedes crear un nuevo espacio de trabajo si cambias de opinión.',
+                confirm: 'Eliminar y degradar',
+            },
+            viewPaymentHistory: 'Ver historial de pagos',
+        },
+        yourPlan: {
+            title: 'Tu plan',
+            collect: {
+                title: 'Recolectar',
+                priceAnnual: ({lower, upper}) => `Desde ${lower}/miembro activo con la Tarjeta Expensify, ${upper}/miembro activo sin la Tarjeta Expensify.`,
+                pricePayPerUse: ({lower, upper}) => `Desde ${lower}/miembro activo con la Tarjeta Expensify, ${upper}/miembro activo sin la Tarjeta Expensify.`,
+                benefit1: 'SmartScans ilimitados y seguimiento de la distancia',
+                benefit2: 'Tarjetas Expensify con Límites Inteligentes',
+                benefit3: 'Pago de facturas y facturación',
+                benefit4: 'Aprobación de gastos',
+                benefit5: 'Reembolso ACH',
+                benefit6: 'Integraciones con QuickBooks y Xero',
+                benefit7: 'Reportes e informes personalizados',
+            },
+            control: {
+                title: 'Control',
+                priceAnnual: ({lower, upper}) => `Desde ${lower}/miembro activo con la Tarjeta Expensify, ${upper}/miembro activo sin la Tarjeta Expensify.`,
+                pricePayPerUse: ({lower, upper}) => `Desde ${lower}/miembro activo con la Tarjeta Expensify, ${upper}/miembro activo sin la Tarjeta Expensify.`,
+                benefit1: 'Todo en Recolectar, más:',
+                benefit2: 'Integraciones con NetSuite y Sage Intacct',
+                benefit3: 'Sincronización de Certinia y Workday',
+                benefit4: 'Varios aprobadores de gastos',
+                benefit5: 'SAML/SSO',
+                benefit6: 'Presupuestos',
+            },
+            saveWithExpensifyTitle: 'Ahorra con la Tarjeta Expensify',
+            saveWithExpensifyDescription: 'Utiliza nuestra calculadora de ahorro para ver cómo el reembolso en efectivo de la Tarjeta Expensify puede reducir tu factura de Expensify',
+            saveWithExpensifyButton: 'Más información',
+        },
+        details: {
+            title: 'Datos de suscripción',
+            annual: 'Suscripción anual',
+            taxExempt: 'Solicitar estado de exención de impuestos',
+            taxExemptEnabled: 'Exento de impuestos',
+            payPerUse: 'Pago por uso',
+            subscriptionSize: 'Tamaño de suscripción',
+            headsUp:
+                'Atención: Si no estableces ahora el tamaño de tu suscripción, lo haremos automáticamente con el número de suscriptores activos del primer mes. A partir de ese momento, estarás suscrito para pagar al menos por ese número de afiliados durante los 12 meses siguientes. Puedes aumentar el tamaño de tu suscripción en cualquier momento, pero no puedes reducirlo hasta que finalice tu suscripción.',
+            zeroCommitment: 'Compromiso cero con la tarifa de suscripción anual reducida',
+        },
+        subscriptionSize: {
+            title: 'Tamaño de suscripción',
+            yourSize: 'El tamaño de tu suscripción es el número de plazas abiertas que puede ocupar cualquier miembro activo en un mes determinado.',
+            eachMonth:
+                'Cada mes, tu suscripción cubre hasta el número de miembros activos establecido anteriormente. Cada vez que aumentes el tamaño de tu suscripción, iniciarás una nueva suscripción de 12 meses con ese nuevo tamaño.',
+            note: 'Nota: Un miembro activo es cualquiera que haya creado, editado, enviado, aprobado, reembolsado, o exportado datos de gastos vinculados al espacio de trabajo de tu empresa.',
+            confirmDetails: 'Confirma los datos de tu nueva suscripción anual:',
+            subscriptionSize: 'Tamaño de suscripción',
+            activeMembers: ({size}) => `${size} miembros activos/mes`,
+            subscriptionRenews: 'Renovación de la suscripción',
+            youCantDowngrade: 'No puedes bajar de categoría durante tu suscripción anual.',
+            youAlreadyCommitted: ({size, date}) =>
+                `Ya se ha comprometido a un tamaño de suscripción anual de ${size} miembros activos al mes hasta el ${date}. Puede cambiar a una suscripción de pago por uso en ${date} desactivando la auto-renovación.`,
+            error: {
+                size: 'Por favor ingrese un tamaño de suscripción valido.',
+                sameSize: 'Por favor, introduce un número diferente al de tu subscripción actual.',
+            },
+        },
+        paymentCard: {
+            addPaymentCard: 'Añade tarjeta de pago',
+            enterPaymentCardDetails: 'Introduce los datos de tu tarjeta de pago',
+            security: 'Expensify es PCI-DSS obediente, utiliza cifrado a nivel bancario, y emplea infraestructura redundante para proteger tus datos.',
+            learnMoreAboutSecurity: 'Conozca más sobre nuestra seguridad.',
+        },
+        subscriptionSettings: {
+            title: 'Configuración de suscripción',
+            autoRenew: 'Auto-renovación',
+            autoIncrease: 'Auto-incremento',
+            saveUpTo: ({amountWithCurrency}) => `Ahorre hasta ${amountWithCurrency} al mes por miembro activo`,
+            automaticallyIncrease:
+                'Aumenta automáticamente tus plazas anuales para dar lugar a los miembros activos que superen el tamaño de tu suscripción. Nota: Esto ampliará la fecha de finalización de tu suscripción anual.',
+            disableAutoRenew: 'Desactivar auto-renovación',
+            helpUsImprove: 'Ayúdanos a mejorar Expensify',
+            whatsMainReason: '¿Cuál es la razón principal por la que deseas desactivar la auto-renovación?',
+            renewsOn: ({date}) => `Se renovará el ${date}.`,
+        },
+        requestEarlyCancellation: {
+            title: 'Solicitar cancelación anticipada',
+            subtitle: '¿Cuál es la razón principal por la que solicitas la cancelación anticipada?',
+            subscriptionCanceled: {
+                title: 'Suscripción cancelada',
+                subtitle: 'Tu suscripción anual ha sido cancelada.',
+                info: 'Ya puedes seguir utilizando tu(s) espacio(s) de trabajo en la modalidad de pago por uso.',
+                preventFutureActivity: {
+                    part1: 'Si quieres evitar actividad y cargos futuros, debes ',
+                    link: 'eliminar tu(s) espacio(s) de trabajo.',
+                    part2: ' Ten en cuenta que cuando elimines tu(s) espacio(s) de trabajo, se te cobrará cualquier actividad pendienteque se haya incurrido durante el mes en curso.',
+                },
+            },
+            requestSubmitted: {
+                title: 'Solicitud enviada',
+                subtitle: {
+                    part1: 'Gracias por hacernos saber que deseas cancelar tu suscripción. Estamos revisando tu solicitud y nos comunicaremos contigo en breve a través de tu chat con ',
+                    link: 'Concierge',
+                    part2: '.',
+                },
+            },
+            acknowledgement: {
+                part1: 'Al solicitar la cancelación anticipada, reconozco y acepto que Expensify no tiene ninguna obligación de conceder dicha solicitud en virtud de las ',
+                link: 'Condiciones de Servicio',
+                part2: ' de Expensify u otro acuerdo de servicios aplicable entre Expensify y yo, y que Expensify se reserva el derecho exclusivo a conceder dicha solicitud.',
+            },
+        },
+    },
+    feedbackSurvey: {
+        tooLimited: 'Hay que mejorar la funcionalidad',
+        tooExpensive: 'Demasiado caro',
+        inadequateSupport: 'Atención al cliente inadecuada',
+        businessClosing: 'Cierre, reducción, o adquisición de la empresa',
+        additionalInfoTitle: '¿A qué software está migrando y por qué?',
+        additionalInfoInputLabel: 'Tu respuesta',
+    },
+    roomChangeLog: {
+        updateRoomDescription: 'establece la descripción de la sala a:',
+        clearRoomDescription: 'la descripción de la habitación ha sido borrada',
+    },
+    delegate: {
+        switchAccount: 'Cambiar de cuenta:',
+        role: (role: DelegateRole): string => {
+            switch (role) {
+                case CONST.DELEGATE_ROLE.ALL:
+                    return 'Completo';
+                case CONST.DELEGATE_ROLE.SUBMITTER:
+                    return 'Limitado';
+                default:
+                    return '';
+            }
+        },
+        genericError: '¡Ups! Ha ocurrido un error. Por favor, inténtalo de nuevo.',
+    },
 } satisfies EnglishTranslation;
diff --git a/src/languages/types.ts b/src/languages/types.ts
index 23c892bc73e1..f3d6f5b677e6 100644
--- a/src/languages/types.ts
+++ b/src/languages/types.ts
@@ -1,5 +1,6 @@
-import type {ReportAction} from '@src/types/onyx';
+import type {OnyxInputOrEntry, ReportAction} from '@src/types/onyx';
 import type {Unit} from '@src/types/onyx/Policy';
+import type {ViolationDataType} from '@src/types/onyx/TransactionViolation';
 import type en from './en';
 
 type AddressLineParams = {
@@ -18,7 +19,7 @@ type LoggedInAsParams = {
     email: string;
 };
 
-type NewFaceEnterMagicCodeParams = {
+type SignUpNewFaceCodeParams = {
     login: string;
 };
 
@@ -40,15 +41,15 @@ type LocalTimeParams = {
 };
 
 type EditActionParams = {
-    action: ReportAction | null;
+    action: OnyxInputOrEntry<ReportAction>;
 };
 
 type DeleteActionParams = {
-    action: ReportAction | null;
+    action: OnyxInputOrEntry<ReportAction>;
 };
 
 type DeleteConfirmationParams = {
-    action: ReportAction | null;
+    action: OnyxInputOrEntry<ReportAction>;
 };
 
 type BeginningOfChatHistoryDomainRoomPartOneParams = {
@@ -112,7 +113,7 @@ type SplitAmountParams = {amount: string};
 
 type DidSplitAmountMessageParams = {formattedAmount: string; comment: string};
 
-type AmountEachParams = {amount: string};
+type UserSplitParams = {amount: string};
 
 type PayerOwesAmountParams = {payer: string; amount: number | string; comment?: string};
 
@@ -122,6 +123,8 @@ type PayerPaidAmountParams = {payer?: string; amount: number | string};
 
 type ApprovedAmountParams = {amount: number | string};
 
+type ForwardedAmountParams = {amount: number | string};
+
 type ManagerApprovedParams = {manager: string};
 
 type ManagerApprovedAmountParams = {manager: string; amount: number | string};
@@ -222,6 +225,8 @@ type ViolationsMaxAgeParams = {maxAge: number};
 
 type ViolationsMissingTagParams = {tagName?: string};
 
+type ViolationsModifiedAmountParams = {type?: ViolationDataType; displayPercentVariance?: number};
+
 type ViolationsOverAutoApprovalLimitParams = {formattedLimit?: string};
 
 type ViolationsOverCategoryLimitParams = {formattedLimit?: string};
@@ -298,18 +303,73 @@ type DistanceRateOperationsParams = {count: number};
 
 type ReimbursementRateParams = {unit: Unit};
 
+type ConfirmHoldExpenseParams = {transactionCount: number};
+
+type ChangeFieldParams = {oldValue?: string; newValue: string; fieldName: string};
+
+type ChangePolicyParams = {fromPolicy: string; toPolicy: string};
+
+type ChangeTypeParams = {oldType: string; newType: string};
+
+type DelegateSubmitParams = {delegateUser: string; originalManager: string};
+
+type ExportedToIntegrationParams = {label: string; markedManually?: boolean; inProgress?: boolean; lastModified?: string};
+
+type IntegrationsMessageParams = {
+    label: string;
+    result: {
+        code?: number;
+        messages?: string[];
+        title?: string;
+        link?: {
+            url: string;
+            text: string;
+        };
+    };
+};
+
+type MarkedReimbursedParams = {amount: string; currency: string};
+
+type MarkReimbursedFromIntegrationParams = {amount: string; currency: string};
+
+type ShareParams = {to: string};
+
+type UnshareParams = {to: string};
+
+type StripePaidParams = {amount: string; currency: string};
+
+type UnapprovedParams = {amount: string; currency: string};
+type RemoveMembersWarningPrompt = {
+    memberName: string;
+    ownerName: string;
+};
+
+type DeleteExpenseTranslationParams = {
+    count: number;
+};
+
+type IssueVirtualCardParams = {
+    assignee: string;
+    link: string;
+};
+
+type ApprovalWorkflowErrorParams = {
+    name1: string;
+    name2: string;
+};
+
 export type {
-    AdminCanceledRequestParams,
-    ApprovedAmountParams,
     AddressLineParams,
+    AdminCanceledRequestParams,
     AlreadySignedInParams,
-    AmountEachParams,
+    ApprovedAmountParams,
     BeginningOfChatHistoryAdminRoomPartOneParams,
     BeginningOfChatHistoryAnnounceRoomPartOneParams,
     BeginningOfChatHistoryAnnounceRoomPartTwo,
     BeginningOfChatHistoryDomainRoomPartOneParams,
     CanceledRequestParams,
     CharacterLimitParams,
+    ConfirmHoldExpenseParams,
     ConfirmThatParams,
     DateShouldBeAfterParams,
     DateShouldBeBeforeParams,
@@ -322,14 +382,18 @@ export type {
     EnglishTranslation,
     EnterMagicCodeParams,
     FormattedMaxLengthParams,
+    ForwardedAmountParams,
     GoBackMessageParams,
     GoToRoomParams,
+    HeldRequestParams,
     InstantSummaryParams,
+    IssueVirtualCardParams,
     LocalTimeParams,
+    LogSizeParams,
     LoggedInAsParams,
     ManagerApprovedAmountParams,
     ManagerApprovedParams,
-    NewFaceEnterMagicCodeParams,
+    SignUpNewFaceCodeParams,
     NoLongerHaveAccessParams,
     NotAllowedExtensionParams,
     NotYouParams,
@@ -339,11 +403,13 @@ export type {
     PaidElsewhereWithAmountParams,
     PaidWithExpensifyWithAmountParams,
     ParentNavigationSummaryParams,
+    PaySomeoneParams,
     PayerOwesAmountParams,
     PayerOwesParams,
     PayerPaidAmountParams,
     PayerPaidParams,
     PayerSettledParams,
+    ReimbursementRateParams,
     RemovedTheRequestParams,
     RenamedRoomActionParams,
     ReportArchiveReasonsClosedParams,
@@ -375,13 +441,16 @@ export type {
     UntilTimeParams,
     UpdatedTheDistanceParams,
     UpdatedTheRequestParams,
+    UsePlusButtonParams,
     UserIsAlreadyMemberParams,
+    UserSplitParams,
     ViolationsAutoReportedRejectedExpenseParams,
     ViolationsCashExpenseWithNoReceiptParams,
     ViolationsConversionSurchargeParams,
     ViolationsInvoiceMarkupParams,
     ViolationsMaxAgeParams,
     ViolationsMissingTagParams,
+    ViolationsModifiedAmountParams,
     ViolationsOverAutoApprovalLimitParams,
     ViolationsOverCategoryLimitParams,
     ViolationsOverLimitParams,
@@ -392,14 +461,24 @@ export type {
     ViolationsTaxOutOfPolicyParams,
     WaitingOnBankAccountParams,
     WalletProgramParams,
-    UsePlusButtonParams,
     WeSentYouMagicSignInLinkParams,
     WelcomeEnterMagicCodeParams,
     WelcomeNoteParams,
     WelcomeToRoomParams,
     ZipCodeExampleFormatParams,
-    LogSizeParams,
-    HeldRequestParams,
-    PaySomeoneParams,
-    ReimbursementRateParams,
+    ChangeFieldParams,
+    ChangePolicyParams,
+    ChangeTypeParams,
+    ExportedToIntegrationParams,
+    DelegateSubmitParams,
+    IntegrationsMessageParams,
+    MarkedReimbursedParams,
+    MarkReimbursedFromIntegrationParams,
+    ShareParams,
+    UnshareParams,
+    StripePaidParams,
+    UnapprovedParams,
+    RemoveMembersWarningPrompt,
+    DeleteExpenseTranslationParams,
+    ApprovalWorkflowErrorParams,
 };
diff --git a/src/libs/API/index.ts b/src/libs/API/index.ts
index bfa1b95836f8..65fd2b6ad015 100644
--- a/src/libs/API/index.ts
+++ b/src/libs/API/index.ts
@@ -1,5 +1,6 @@
 import type {OnyxUpdate} from 'react-native-onyx';
 import Onyx from 'react-native-onyx';
+import type {SetRequired} from 'type-fest';
 import Log from '@libs/Log';
 import * as Middleware from '@libs/Middleware';
 import * as SequentialQueue from '@libs/Network/SequentialQueue';
@@ -8,9 +9,9 @@ import * as Request from '@libs/Request';
 import * as PersistedRequests from '@userActions/PersistedRequests';
 import CONST from '@src/CONST';
 import type OnyxRequest from '@src/types/onyx/Request';
+import type {PaginatedRequest, PaginationConfig} from '@src/types/onyx/Request';
 import type Response from '@src/types/onyx/Response';
-import pkg from '../../../package.json';
-import type {ApiRequest, ApiRequestCommandParameters, ReadCommand, SideEffectRequestCommand, WriteCommand} from './types';
+import type {ApiCommand, ApiRequestCommandParameters, ApiRequestType, CommandOfType, ReadCommand, SideEffectRequestCommand, WriteCommand} from './types';
 
 // Setup API middlewares. Each request made will pass through a series of middleware functions that will get called in sequence (each one passing the result of the previous to the next).
 // Note: The ordering here is intentional as we want to Log, Recheck Connection, Reauthenticate, and Save the Response in Onyx. Errors thrown in one middleware will bubble to the next.
@@ -28,6 +29,8 @@ Request.use(Middleware.Reauthentication);
 // If an optimistic ID is not used by the server, this will update the remaining serialized requests using that optimistic ID to use the correct ID instead.
 Request.use(Middleware.HandleUnusedOptimisticID);
 
+Request.use(Middleware.Pagination);
+
 // SaveResponseInOnyx - Merges either the successData or failureData (or finallyData, if included in place of the former two values) into Onyx depending on if the call was successful or not. This needs to be the LAST middleware we use, don't add any
 // middlewares after this, because the SequentialQueue depends on the result of this middleware to pause the queue (if needed) to bring the app to an up-to-date state.
 Request.use(Middleware.SaveResponseInOnyx);
@@ -40,54 +43,83 @@ type OnyxData = {
 };
 
 /**
- * All calls to API.write() will be persisted to disk as JSON with the params, successData, and failureData (or finallyData, if included in place of the former two values).
- * This is so that if the network is unavailable or the app is closed, we can send the WRITE request later.
- *
- * @param command - Name of API command to call.
- * @param apiCommandParameters - Parameters to send to the API.
- * @param onyxData  - Object containing errors, loading states, and optimistic UI data that will be merged
- *                             into Onyx before and after a request is made. Each nested object will be formatted in
- *                             the same way as an API response.
- * @param [onyxData.optimisticData] - Onyx instructions that will be passed to Onyx.update() before the request is made.
- * @param [onyxData.successData] - Onyx instructions that will be passed to Onyx.update() when the response has jsonCode === 200.
- * @param [onyxData.failureData] - Onyx instructions that will be passed to Onyx.update() when the response has jsonCode !== 200.
- * @param [onyxData.finallyData] - Onyx instructions that will be passed to Onyx.update() when the response has jsonCode === 200 or jsonCode !== 200.
+ * Prepare the request to be sent. Bind data together with request metadata and apply optimistic Onyx data.
  */
-function write<TCommand extends WriteCommand>(command: TCommand, apiCommandParameters: ApiRequestCommandParameters[TCommand], onyxData: OnyxData = {}) {
-    Log.info('Called API write', false, {command, ...apiCommandParameters});
-    const {optimisticData, ...onyxDataWithoutOptimisticData} = onyxData;
+function prepareRequest<TCommand extends ApiCommand>(command: TCommand, type: ApiRequestType, params: ApiRequestCommandParameters[TCommand], onyxData: OnyxData = {}): OnyxRequest {
+    Log.info('[API] Preparing request', false, {command, type});
 
-    // Optimistically update Onyx
+    const {optimisticData, ...onyxDataWithoutOptimisticData} = onyxData;
     if (optimisticData) {
+        Log.info('[API] Applying optimistic data', false, {command, type});
         Onyx.update(optimisticData);
     }
 
-    // Assemble the data we'll send to the API
+    const isWriteRequest = type === CONST.API_REQUEST_TYPE.WRITE;
+
+    // Prepare the data we'll send to the API
     const data = {
-        ...apiCommandParameters,
-        appversion: pkg.version,
-        apiRequestType: CONST.API_REQUEST_TYPE.WRITE,
+        ...params,
+        apiRequestType: type,
 
         // We send the pusherSocketID with all write requests so that the api can include it in push events to prevent Pusher from sending the events to the requesting client. The push event
         // is sent back to the requesting client in the response data instead, which prevents a replay effect in the UI. See https://github.com/Expensify/App/issues/12775.
-        pusherSocketID: Pusher.getPusherSocketID(),
+        pusherSocketID: isWriteRequest ? Pusher.getPusherSocketID() : undefined,
     };
 
-    // Assemble all the request data we'll be storing in the queue
-    const request: OnyxRequest = {
+    // Assemble all request metadata (used by middlewares, and for persisted requests stored in Onyx)
+    const request: SetRequired<OnyxRequest, 'data'> = {
         command,
-        data: {
-            ...data,
-
-            // This should be removed once we are no longer using deprecatedAPI https://github.com/Expensify/Expensify/issues/215650
-            shouldRetry: true,
-            canCancel: true,
-        },
+        data,
         ...onyxDataWithoutOptimisticData,
     };
 
+    if (isWriteRequest) {
+        // This should be removed once we are no longer using deprecatedAPI https://github.com/Expensify/Expensify/issues/215650
+        request.data.shouldRetry = true;
+        request.data.canCancel = true;
+    }
+
+    return request;
+}
+
+/**
+ * Process a prepared request according to its type.
+ */
+function processRequest(request: OnyxRequest, type: ApiRequestType): Promise<void | Response> {
     // Write commands can be saved and retried, so push it to the SequentialQueue
-    SequentialQueue.push(request);
+    if (type === CONST.API_REQUEST_TYPE.WRITE) {
+        SequentialQueue.push(request);
+        return Promise.resolve();
+    }
+
+    // Read requests are processed right away, but don't return the response to the caller
+    if (type === CONST.API_REQUEST_TYPE.READ) {
+        Request.processWithMiddleware(request);
+        return Promise.resolve();
+    }
+
+    // Requests with side effects process right away, and return the response to the caller
+    return Request.processWithMiddleware(request);
+}
+
+/**
+ * All calls to API.write() will be persisted to disk as JSON with the params, successData, and failureData (or finallyData, if included in place of the former two values).
+ * This is so that if the network is unavailable or the app is closed, we can send the WRITE request later.
+ *
+ * @param command - Name of API command to call.
+ * @param apiCommandParameters - Parameters to send to the API.
+ * @param onyxData  - Object containing errors, loading states, and optimistic UI data that will be merged
+ *                             into Onyx before and after a request is made. Each nested object will be formatted in
+ *                             the same way as an API response.
+ * @param [onyxData.optimisticData] - Onyx instructions that will be passed to Onyx.update() before the request is made.
+ * @param [onyxData.successData] - Onyx instructions that will be passed to Onyx.update() when the response has jsonCode === 200.
+ * @param [onyxData.failureData] - Onyx instructions that will be passed to Onyx.update() when the response has jsonCode !== 200.
+ * @param [onyxData.finallyData] - Onyx instructions that will be passed to Onyx.update() when the response has jsonCode === 200 or jsonCode !== 200.
+ */
+function write<TCommand extends WriteCommand>(command: TCommand, apiCommandParameters: ApiRequestCommandParameters[TCommand], onyxData: OnyxData = {}): void {
+    Log.info('[API] Called API write', false, {command, ...apiCommandParameters});
+    const request = prepareRequest(command, CONST.API_REQUEST_TYPE.WRITE, apiCommandParameters, onyxData);
+    processRequest(request, CONST.API_REQUEST_TYPE.WRITE);
 }
 
 /**
@@ -107,40 +139,30 @@ function write<TCommand extends WriteCommand>(command: TCommand, apiCommandParam
  * @param [onyxData.successData] - Onyx instructions that will be passed to Onyx.update() when the response has jsonCode === 200.
  * @param [onyxData.failureData] - Onyx instructions that will be passed to Onyx.update() when the response has jsonCode !== 200.
  * @param [onyxData.finallyData] - Onyx instructions that will be passed to Onyx.update() when the response has jsonCode === 200 or jsonCode !== 200.
- * @param [apiRequestType] - Can be either 'read', 'write', or 'makeRequestWithSideEffects'. We use this to either return the chained
- *                                    response back to the caller or to trigger reconnection callbacks when re-authentication is required.
  * @returns
  */
-function makeRequestWithSideEffects<TCommand extends SideEffectRequestCommand | WriteCommand | ReadCommand>(
+function makeRequestWithSideEffects<TCommand extends SideEffectRequestCommand>(
     command: TCommand,
     apiCommandParameters: ApiRequestCommandParameters[TCommand],
     onyxData: OnyxData = {},
-    apiRequestType: ApiRequest = CONST.API_REQUEST_TYPE.MAKE_REQUEST_WITH_SIDE_EFFECTS,
 ): Promise<void | Response> {
-    Log.info('Called API makeRequestWithSideEffects', false, {command, ...apiCommandParameters});
-    const {optimisticData, ...onyxDataWithoutOptimisticData} = onyxData;
-
-    // Optimistically update Onyx
-    if (optimisticData) {
-        Onyx.update(optimisticData);
-    }
-
-    // Assemble the data we'll send to the API
-    const data = {
-        ...apiCommandParameters,
-        appversion: pkg.version,
-        apiRequestType,
-    };
-
-    // Assemble all the request data we'll be storing
-    const request: OnyxRequest = {
-        command,
-        data,
-        ...onyxDataWithoutOptimisticData,
-    };
+    Log.info('[API] Called API makeRequestWithSideEffects', false, {command, ...apiCommandParameters});
+    const request = prepareRequest(command, CONST.API_REQUEST_TYPE.MAKE_REQUEST_WITH_SIDE_EFFECTS, apiCommandParameters, onyxData);
 
     // Return a promise containing the response from HTTPS
-    return Request.processWithMiddleware(request);
+    return processRequest(request, CONST.API_REQUEST_TYPE.MAKE_REQUEST_WITH_SIDE_EFFECTS);
+}
+
+/**
+ * Ensure all write requests on the sequential queue have finished responding before running read requests.
+ * Responses from read requests can overwrite the optimistic data inserted by
+ * write requests that use the same Onyx keys and haven't responded yet.
+ */
+function waitForWrites<TCommand extends ReadCommand>(command: TCommand) {
+    if (PersistedRequests.getLength() > 0) {
+        Log.info(`[API] '${command}' is waiting on ${PersistedRequests.getLength()} write commands`);
+    }
+    return SequentialQueue.waitForIdle();
 }
 
 /**
@@ -156,14 +178,57 @@ function makeRequestWithSideEffects<TCommand extends SideEffectRequestCommand |
  * @param [onyxData.failureData] - Onyx instructions that will be passed to Onyx.update() when the response has jsonCode !== 200.
  * @param [onyxData.finallyData] - Onyx instructions that will be passed to Onyx.update() when the response has jsonCode === 200 or jsonCode !== 200.
  */
-function read<TCommand extends ReadCommand>(command: TCommand, apiCommandParameters: ApiRequestCommandParameters[TCommand], onyxData: OnyxData = {}) {
-    // Ensure all write requests on the sequential queue have finished responding before running read requests.
-    // Responses from read requests can overwrite the optimistic data inserted by
-    // write requests that use the same Onyx keys and haven't responded yet.
-    if (PersistedRequests.getLength() > 0) {
-        Log.info(`[API] '${command}' is waiting on ${PersistedRequests.getLength()} write commands`);
+function read<TCommand extends ReadCommand>(command: TCommand, apiCommandParameters: ApiRequestCommandParameters[TCommand], onyxData: OnyxData = {}): void {
+    Log.info('[API] Called API.read', false, {command, ...apiCommandParameters});
+
+    waitForWrites(command).then(() => {
+        const request = prepareRequest(command, CONST.API_REQUEST_TYPE.READ, apiCommandParameters, onyxData);
+        processRequest(request, CONST.API_REQUEST_TYPE.READ);
+    });
+}
+
+function paginate<TRequestType extends typeof CONST.API_REQUEST_TYPE.MAKE_REQUEST_WITH_SIDE_EFFECTS, TCommand extends CommandOfType<TRequestType>>(
+    type: TRequestType,
+    command: TCommand,
+    apiCommandParameters: ApiRequestCommandParameters[TCommand],
+    onyxData: OnyxData,
+    config: PaginationConfig,
+): Promise<Response | void>;
+function paginate<TRequestType extends typeof CONST.API_REQUEST_TYPE.READ | typeof CONST.API_REQUEST_TYPE.WRITE, TCommand extends CommandOfType<TRequestType>>(
+    type: TRequestType,
+    command: TCommand,
+    apiCommandParameters: ApiRequestCommandParameters[TCommand],
+    onyxData: OnyxData,
+    config: PaginationConfig,
+): void;
+function paginate<TRequestType extends ApiRequestType, TCommand extends CommandOfType<TRequestType>>(
+    type: TRequestType,
+    command: TCommand,
+    apiCommandParameters: ApiRequestCommandParameters[TCommand],
+    onyxData: OnyxData,
+    config: PaginationConfig,
+): Promise<Response | void> | void {
+    Log.info('[API] Called API.paginate', false, {command, ...apiCommandParameters});
+    const request: PaginatedRequest = {
+        ...prepareRequest(command, type, apiCommandParameters, onyxData),
+        ...config,
+        ...{
+            isPaginated: true,
+        },
+    };
+
+    switch (type) {
+        case CONST.API_REQUEST_TYPE.WRITE:
+            processRequest(request, type);
+            return;
+        case CONST.API_REQUEST_TYPE.MAKE_REQUEST_WITH_SIDE_EFFECTS:
+            return processRequest(request, type);
+        case CONST.API_REQUEST_TYPE.READ:
+            waitForWrites(command as ReadCommand).then(() => processRequest(request, type));
+            return;
+        default:
+            throw new Error('Unknown API request type');
     }
-    SequentialQueue.waitForIdle().then(() => makeRequestWithSideEffects(command, apiCommandParameters, onyxData, CONST.API_REQUEST_TYPE.READ));
 }
 
-export {write, makeRequestWithSideEffects, read};
+export {write, makeRequestWithSideEffects, read, paginate};
diff --git a/src/libs/API/parameters/AddPaymentCardParams.ts b/src/libs/API/parameters/AddPaymentCardParams.ts
index 1c9b1fc4fa30..3a59c678ac4f 100644
--- a/src/libs/API/parameters/AddPaymentCardParams.ts
+++ b/src/libs/API/parameters/AddPaymentCardParams.ts
@@ -8,7 +8,7 @@ type AddPaymentCardParams = {
     cardCVV: string;
     addressName: string;
     addressZip: string;
-    currency: ValueOf<typeof CONST.CURRENCY>;
+    currency: ValueOf<typeof CONST.PAYMENT_CARD_CURRENCY>;
     isP2PDebitCard: boolean;
 };
 export default AddPaymentCardParams;
diff --git a/src/libs/API/parameters/AddSubscriptionPaymentCardParams.ts b/src/libs/API/parameters/AddSubscriptionPaymentCardParams.ts
new file mode 100644
index 000000000000..ef8fbc382737
--- /dev/null
+++ b/src/libs/API/parameters/AddSubscriptionPaymentCardParams.ts
@@ -0,0 +1,11 @@
+type AddSubscriptionPaymentCardParams = {
+    cardNumber: string;
+    cardYear: string;
+    cardMonth: string;
+    cardCVV: string;
+    addressName: string;
+    addressZip: string;
+    currency: string;
+};
+
+export default AddSubscriptionPaymentCardParams;
diff --git a/src/libs/API/parameters/ApproveMoneyRequestParams.ts b/src/libs/API/parameters/ApproveMoneyRequestParams.ts
index fc6528047f22..f6eb93270428 100644
--- a/src/libs/API/parameters/ApproveMoneyRequestParams.ts
+++ b/src/libs/API/parameters/ApproveMoneyRequestParams.ts
@@ -2,6 +2,20 @@ type ApproveMoneyRequestParams = {
     reportID: string;
     approvedReportActionID: string;
     full?: boolean;
+    optimisticHoldReportID?: string;
+    optimisticHoldActionID?: string;
+    /**
+     * Stringified JSON object with type of following structure:
+     * Array<{
+     *   optimisticReportActionID: string;
+     *   oldReportActionID: string;
+     * }>
+     */
+    optimisticHoldReportExpenseActionIDs?: string;
+    /**
+     * Call the optimized version of ApproveMoneyRequest
+     */
+    v2?: boolean;
 };
 
 export default ApproveMoneyRequestParams;
diff --git a/src/libs/API/parameters/CancelBillingSubscriptionParams.ts b/src/libs/API/parameters/CancelBillingSubscriptionParams.ts
new file mode 100644
index 000000000000..252a7420d27d
--- /dev/null
+++ b/src/libs/API/parameters/CancelBillingSubscriptionParams.ts
@@ -0,0 +1,8 @@
+import type {FeedbackSurveyOptionID} from '@src/CONST';
+
+type CancelBillingSubscriptionParams = {
+    cancellationReason: FeedbackSurveyOptionID;
+    cancellationNote: string;
+};
+
+export default CancelBillingSubscriptionParams;
diff --git a/src/libs/API/parameters/CardDeactivateParams.ts b/src/libs/API/parameters/CardDeactivateParams.ts
new file mode 100644
index 000000000000..e329d02a0c9e
--- /dev/null
+++ b/src/libs/API/parameters/CardDeactivateParams.ts
@@ -0,0 +1,6 @@
+type CardDeactivateParams = {
+    authToken: string;
+    cardID: number;
+};
+
+export default CardDeactivateParams;
diff --git a/src/libs/API/parameters/CompleteEngagementModalParams.ts b/src/libs/API/parameters/CompleteEngagementModalParams.ts
deleted file mode 100644
index cffbc0a5ba66..000000000000
--- a/src/libs/API/parameters/CompleteEngagementModalParams.ts
+++ /dev/null
@@ -1,10 +0,0 @@
-type CompleteEngagementModalParams = {
-    reportID: string;
-    reportActionID?: string;
-    commentReportActionID?: string | null;
-    reportComment?: string;
-    engagementChoice: string;
-    timezone?: string;
-};
-
-export default CompleteEngagementModalParams;
diff --git a/src/libs/API/parameters/CompleteGuidedSetupParams.ts b/src/libs/API/parameters/CompleteGuidedSetupParams.ts
index e3a0309d5113..8e1273ac6053 100644
--- a/src/libs/API/parameters/CompleteGuidedSetupParams.ts
+++ b/src/libs/API/parameters/CompleteGuidedSetupParams.ts
@@ -3,6 +3,7 @@ import type {OnboardingPurposeType} from '@src/CONST';
 type CompleteGuidedSetupParams = {
     firstName: string;
     lastName: string;
+    actorAccountID: number;
     guidedSetupData: string;
     engagementChoice: OnboardingPurposeType;
 };
diff --git a/src/libs/API/parameters/CompleteSplitBillParams.ts b/src/libs/API/parameters/CompleteSplitBillParams.ts
index 50054ba6fd10..67ca011b70d9 100644
--- a/src/libs/API/parameters/CompleteSplitBillParams.ts
+++ b/src/libs/API/parameters/CompleteSplitBillParams.ts
@@ -8,6 +8,9 @@ type CompleteSplitBillParams = {
     category?: string;
     tag?: string;
     splits: string;
+    taxCode?: string;
+    taxAmount?: number;
+    billable?: boolean;
 };
 
 export default CompleteSplitBillParams;
diff --git a/src/libs/API/parameters/ConfigureExpensifyCardsForPolicyParams.ts b/src/libs/API/parameters/ConfigureExpensifyCardsForPolicyParams.ts
new file mode 100644
index 000000000000..dea6b2705188
--- /dev/null
+++ b/src/libs/API/parameters/ConfigureExpensifyCardsForPolicyParams.ts
@@ -0,0 +1,6 @@
+type ConfigureExpensifyCardsForPolicyParams = {
+    policyID: string;
+    bankAccountID: number;
+};
+
+export default ConfigureExpensifyCardsForPolicyParams;
diff --git a/src/libs/API/parameters/ConnectAsDelegateParams.ts b/src/libs/API/parameters/ConnectAsDelegateParams.ts
new file mode 100644
index 000000000000..6bd2c666e1b0
--- /dev/null
+++ b/src/libs/API/parameters/ConnectAsDelegateParams.ts
@@ -0,0 +1,5 @@
+type ConnectAsDelegateParams = {
+    to: string;
+};
+
+export default ConnectAsDelegateParams;
diff --git a/src/libs/API/parameters/ConnectPolicyToNetSuiteParams.ts b/src/libs/API/parameters/ConnectPolicyToNetSuiteParams.ts
new file mode 100644
index 000000000000..2143ca1b039c
--- /dev/null
+++ b/src/libs/API/parameters/ConnectPolicyToNetSuiteParams.ts
@@ -0,0 +1,8 @@
+type ConnectPolicyToNetSuiteParams = {
+    policyID: string;
+    netSuiteAccountID: string;
+    netSuiteTokenID: string;
+    netSuiteTokenSecret: string;
+};
+
+export default ConnectPolicyToNetSuiteParams;
diff --git a/src/libs/API/parameters/ConnectPolicyToSageIntacctParams.ts b/src/libs/API/parameters/ConnectPolicyToSageIntacctParams.ts
new file mode 100644
index 000000000000..3b5cfc973e4d
--- /dev/null
+++ b/src/libs/API/parameters/ConnectPolicyToSageIntacctParams.ts
@@ -0,0 +1,8 @@
+type ConnectPolicyToSageIntacctParams = {
+    policyID: string;
+    intacctCompanyID: string;
+    intacctUserID: string;
+    intacctPassword: string;
+};
+
+export default ConnectPolicyToSageIntacctParams;
diff --git a/src/libs/API/parameters/CopyExistingPolicyConnectionParams.ts b/src/libs/API/parameters/CopyExistingPolicyConnectionParams.ts
new file mode 100644
index 000000000000..78384e277f16
--- /dev/null
+++ b/src/libs/API/parameters/CopyExistingPolicyConnectionParams.ts
@@ -0,0 +1,9 @@
+import type {ConnectionName} from '@src/types/onyx/Policy';
+
+type CopyExistingPolicyConnectionParams = {
+    policyID: string;
+    targetPolicyID: string;
+    connectionName: ConnectionName;
+};
+
+export default CopyExistingPolicyConnectionParams;
diff --git a/src/libs/API/parameters/CreateDistanceRequestParams.ts b/src/libs/API/parameters/CreateDistanceRequestParams.ts
index b9adee4393ec..07dd594d7356 100644
--- a/src/libs/API/parameters/CreateDistanceRequestParams.ts
+++ b/src/libs/API/parameters/CreateDistanceRequestParams.ts
@@ -1,21 +1,25 @@
 type CreateDistanceRequestParams = {
-    comment: string;
-    iouReportID: string;
-    chatReportID: string;
     transactionID: string;
-    reportActionID: string;
+    chatReportID: string;
     createdChatReportActionID: string;
-    createdIOUReportActionID: string;
-    reportPreviewReportActionID: string;
+    reportActionID: string;
     waypoints: string;
+    customUnitRateID: string;
+    comment: string;
     created: string;
+    iouReportID?: string;
+    createdIOUReportActionID?: string;
+    reportPreviewReportActionID?: string;
     category?: string;
     tag?: string;
+    taxCode?: string;
+    taxAmount?: number;
     billable?: boolean;
-    transactionThreadReportID: string;
-    createdReportActionIDForThread: string;
-    payerEmail: string;
-    customUnitRateID?: string;
+    transactionThreadReportID?: string;
+    createdReportActionIDForThread?: string;
+    payerEmail?: string;
+    splits?: string;
+    chatType?: string;
 };
 
 export default CreateDistanceRequestParams;
diff --git a/src/libs/API/parameters/CreateExpensifyCardParams.ts b/src/libs/API/parameters/CreateExpensifyCardParams.ts
new file mode 100644
index 000000000000..1425a4ba9b99
--- /dev/null
+++ b/src/libs/API/parameters/CreateExpensifyCardParams.ts
@@ -0,0 +1,10 @@
+type CreateExpensifyCardParams = {
+    policyID: string;
+    assigneeEmail: string;
+    limit: number;
+    limitType: string;
+    cardTitle: string;
+    feedCountry: string;
+};
+
+export default CreateExpensifyCardParams;
diff --git a/src/libs/API/parameters/CreateWorkspaceReportFieldListValueParams.ts b/src/libs/API/parameters/CreateWorkspaceReportFieldListValueParams.ts
new file mode 100644
index 000000000000..950287bc5d04
--- /dev/null
+++ b/src/libs/API/parameters/CreateWorkspaceReportFieldListValueParams.ts
@@ -0,0 +1,10 @@
+type CreateWorkspaceReportFieldListValueParams = {
+    policyID: string;
+    /**
+     * Stringified JSON object with type of following structure:
+     * Array<string>
+     */
+    reportFields: string;
+};
+
+export default CreateWorkspaceReportFieldListValueParams;
diff --git a/src/libs/API/parameters/CreateWorkspaceReportFieldParams.ts b/src/libs/API/parameters/CreateWorkspaceReportFieldParams.ts
new file mode 100644
index 000000000000..33692d210959
--- /dev/null
+++ b/src/libs/API/parameters/CreateWorkspaceReportFieldParams.ts
@@ -0,0 +1,10 @@
+type CreateWorkspaceReportFieldParams = {
+    policyID: string;
+    /**
+     * Stringified JSON object with type of following structure:
+     * Array<string>
+     */
+    reportFields: string;
+};
+
+export default CreateWorkspaceReportFieldParams;
diff --git a/src/libs/API/parameters/DeleteMoneyRequestOnSearchParams.ts b/src/libs/API/parameters/DeleteMoneyRequestOnSearchParams.ts
new file mode 100644
index 000000000000..e44774ae671b
--- /dev/null
+++ b/src/libs/API/parameters/DeleteMoneyRequestOnSearchParams.ts
@@ -0,0 +1,6 @@
+type DeleteMoneyRequestOnSearchParams = {
+    hash: number;
+    transactionIDList: string[];
+};
+
+export default DeleteMoneyRequestOnSearchParams;
diff --git a/src/libs/API/parameters/DeletePolicyReportField.ts b/src/libs/API/parameters/DeletePolicyReportField.ts
new file mode 100644
index 000000000000..d79e9b07249e
--- /dev/null
+++ b/src/libs/API/parameters/DeletePolicyReportField.ts
@@ -0,0 +1,10 @@
+type DeletePolicyReportField = {
+    policyID: string;
+    /**
+     * Stringified JSON object with type of following structure:
+     * Array<string>
+     */
+    reportFields: string;
+};
+
+export default DeletePolicyReportField;
diff --git a/src/libs/API/parameters/DismissViolationParams.ts b/src/libs/API/parameters/DismissViolationParams.ts
new file mode 100644
index 000000000000..9c5ba4d15661
--- /dev/null
+++ b/src/libs/API/parameters/DismissViolationParams.ts
@@ -0,0 +1,7 @@
+type DismissViolationParams = {
+    name: string;
+    transactionIDList: string;
+    reportActionIDList: string;
+};
+
+export default DismissViolationParams;
diff --git a/src/libs/API/parameters/EnablePolicyCompanyCardsParams.ts b/src/libs/API/parameters/EnablePolicyCompanyCardsParams.ts
new file mode 100644
index 000000000000..0bf3ce34b9d2
--- /dev/null
+++ b/src/libs/API/parameters/EnablePolicyCompanyCardsParams.ts
@@ -0,0 +1,7 @@
+type EnablePolicyCompanyCardsParams = {
+    authToken?: string | null;
+    policyID: string;
+    enabled: boolean;
+};
+
+export default EnablePolicyCompanyCardsParams;
diff --git a/src/libs/API/parameters/EnablePolicyExpensifyCardsParams.ts b/src/libs/API/parameters/EnablePolicyExpensifyCardsParams.ts
new file mode 100644
index 000000000000..e918683ffd1f
--- /dev/null
+++ b/src/libs/API/parameters/EnablePolicyExpensifyCardsParams.ts
@@ -0,0 +1,7 @@
+type EnablePolicyExpensifyCardsParams = {
+    authToken: string;
+    policyID: string;
+    enabled: boolean;
+};
+
+export default EnablePolicyExpensifyCardsParams;
diff --git a/src/libs/API/parameters/EnablePolicyInvoicingParams.ts b/src/libs/API/parameters/EnablePolicyInvoicingParams.ts
new file mode 100644
index 000000000000..c17268db84e7
--- /dev/null
+++ b/src/libs/API/parameters/EnablePolicyInvoicingParams.ts
@@ -0,0 +1,6 @@
+type EnablePolicyInvoicingParams = {
+    policyID: string;
+    enabled: boolean;
+};
+
+export default EnablePolicyInvoicingParams;
diff --git a/src/libs/API/parameters/EnableWorkspaceReportFieldListValueParams.ts b/src/libs/API/parameters/EnableWorkspaceReportFieldListValueParams.ts
new file mode 100644
index 000000000000..7c54a2f4c68b
--- /dev/null
+++ b/src/libs/API/parameters/EnableWorkspaceReportFieldListValueParams.ts
@@ -0,0 +1,10 @@
+type EnableWorkspaceReportFieldListValueParams = {
+    policyID: string;
+    /**
+     * Stringified JSON object with type of following structure:
+     * Array<string>
+     */
+    reportFields: string;
+};
+
+export default EnableWorkspaceReportFieldListValueParams;
diff --git a/src/libs/API/parameters/ExportSearchItemsToCSVParams.ts b/src/libs/API/parameters/ExportSearchItemsToCSVParams.ts
new file mode 100644
index 000000000000..057b6188e3ea
--- /dev/null
+++ b/src/libs/API/parameters/ExportSearchItemsToCSVParams.ts
@@ -0,0 +1,11 @@
+import type {SearchQueryString, SearchStatus} from '@components/Search/types';
+
+type ExportSearchItemsToCSVParams = {
+    query: SearchStatus;
+    jsonQuery: SearchQueryString;
+    reportIDList: string[];
+    transactionIDList: string[];
+    policyIDs: string[];
+};
+
+export default ExportSearchItemsToCSVParams;
diff --git a/src/libs/API/parameters/GenerateSpotnanaTokenParams.ts b/src/libs/API/parameters/GenerateSpotnanaTokenParams.ts
new file mode 100644
index 000000000000..bc67e9197502
--- /dev/null
+++ b/src/libs/API/parameters/GenerateSpotnanaTokenParams.ts
@@ -0,0 +1,5 @@
+type GenerateSpotnanaTokenParams = {
+    policyID: string;
+};
+
+export default GenerateSpotnanaTokenParams;
diff --git a/src/libs/API/parameters/HoldMoneyRequestOnSearchParams.ts b/src/libs/API/parameters/HoldMoneyRequestOnSearchParams.ts
new file mode 100644
index 000000000000..46ceed818cb8
--- /dev/null
+++ b/src/libs/API/parameters/HoldMoneyRequestOnSearchParams.ts
@@ -0,0 +1,7 @@
+type HoldMoneyRequestOnSearchParams = {
+    hash: number;
+    transactionIDList: string[];
+    comment: string;
+};
+
+export default HoldMoneyRequestOnSearchParams;
diff --git a/src/libs/API/parameters/InviteToRoomParams.ts b/src/libs/API/parameters/InviteToRoomParams.ts
index b1af3a4fc3df..975673440f4c 100644
--- a/src/libs/API/parameters/InviteToRoomParams.ts
+++ b/src/libs/API/parameters/InviteToRoomParams.ts
@@ -1,6 +1,7 @@
 type InviteToRoomParams = {
     reportID: string;
     inviteeEmails: string[];
+    accountIDList: string;
 };
 
 export default InviteToRoomParams;
diff --git a/src/libs/API/parameters/MarkAsCashParams.ts b/src/libs/API/parameters/MarkAsCashParams.ts
new file mode 100644
index 000000000000..751963f1a52f
--- /dev/null
+++ b/src/libs/API/parameters/MarkAsCashParams.ts
@@ -0,0 +1,6 @@
+type MarkAsCashParams = {
+    transactionID: string;
+    reportActionID: string;
+};
+
+export default MarkAsCashParams;
diff --git a/src/libs/API/parameters/MarkAsExportedParams.ts b/src/libs/API/parameters/MarkAsExportedParams.ts
new file mode 100644
index 000000000000..ed457afb42e3
--- /dev/null
+++ b/src/libs/API/parameters/MarkAsExportedParams.ts
@@ -0,0 +1,14 @@
+type MarkAsExportedParams = {
+    markedManually: boolean;
+    /**
+     * Stringified JSON object with type of following structure:
+     * Array<{
+     *   reportID: number;
+     *   label: string;
+     *   optimisticReportActionID: string;
+     * }>
+     */
+    data: string;
+};
+
+export default MarkAsExportedParams;
diff --git a/src/libs/API/parameters/OpenCardDetailsPageParams.ts b/src/libs/API/parameters/OpenCardDetailsPageParams.ts
new file mode 100644
index 000000000000..e279326c8a82
--- /dev/null
+++ b/src/libs/API/parameters/OpenCardDetailsPageParams.ts
@@ -0,0 +1,6 @@
+type OpenCardDetailsPageParams = {
+    authToken: string;
+    cardID: number;
+};
+
+export default OpenCardDetailsPageParams;
diff --git a/src/libs/API/parameters/OpenPolicyEditCardLimitTypePageParams.ts b/src/libs/API/parameters/OpenPolicyEditCardLimitTypePageParams.ts
new file mode 100644
index 000000000000..21c79803cf01
--- /dev/null
+++ b/src/libs/API/parameters/OpenPolicyEditCardLimitTypePageParams.ts
@@ -0,0 +1,7 @@
+type OpenPolicyEditCardLimitTypePageParams = {
+    policyID: string;
+    authToken: string | null | undefined;
+    cardID: number;
+};
+
+export default OpenPolicyEditCardLimitTypePageParams;
diff --git a/src/libs/API/parameters/OpenPolicyExpensifyCardsPageParams.ts b/src/libs/API/parameters/OpenPolicyExpensifyCardsPageParams.ts
new file mode 100644
index 000000000000..c3c89857ab3b
--- /dev/null
+++ b/src/libs/API/parameters/OpenPolicyExpensifyCardsPageParams.ts
@@ -0,0 +1,6 @@
+type OpenPolicyExpensifyCardsPageParams = {
+    policyID: string;
+    authToken: string | null | undefined;
+};
+
+export default OpenPolicyExpensifyCardsPageParams;
diff --git a/src/libs/API/parameters/OpenPolicyInitialPageParams.ts b/src/libs/API/parameters/OpenPolicyInitialPageParams.ts
new file mode 100644
index 000000000000..764abe9a6a77
--- /dev/null
+++ b/src/libs/API/parameters/OpenPolicyInitialPageParams.ts
@@ -0,0 +1,5 @@
+type OpenPolicyInitialPageParams = {
+    policyID: string;
+};
+
+export default OpenPolicyInitialPageParams;
diff --git a/src/libs/API/parameters/OpenPolicyProfilePageParams.ts b/src/libs/API/parameters/OpenPolicyProfilePageParams.ts
new file mode 100644
index 000000000000..55dce33a3dac
--- /dev/null
+++ b/src/libs/API/parameters/OpenPolicyProfilePageParams.ts
@@ -0,0 +1,5 @@
+type OpenPolicyProfilePageParams = {
+    policyID: string;
+};
+
+export default OpenPolicyProfilePageParams;
diff --git a/src/libs/API/parameters/OpenPolicyReportFieldsPageParams.ts b/src/libs/API/parameters/OpenPolicyReportFieldsPageParams.ts
new file mode 100644
index 000000000000..80d5d1f1aa07
--- /dev/null
+++ b/src/libs/API/parameters/OpenPolicyReportFieldsPageParams.ts
@@ -0,0 +1,5 @@
+type OpenPolicyReportFieldsPageParams = {
+    policyID: string;
+};
+
+export default OpenPolicyReportFieldsPageParams;
diff --git a/src/libs/API/parameters/OpenProfileParams.ts b/src/libs/API/parameters/OpenProfileParams.ts
deleted file mode 100644
index f42ea8234fc8..000000000000
--- a/src/libs/API/parameters/OpenProfileParams.ts
+++ /dev/null
@@ -1,5 +0,0 @@
-type OpenProfileParams = {
-    timezone: string;
-};
-
-export default OpenProfileParams;
diff --git a/src/libs/API/parameters/PayInvoiceParams.ts b/src/libs/API/parameters/PayInvoiceParams.ts
new file mode 100644
index 000000000000..a6b9746d87bc
--- /dev/null
+++ b/src/libs/API/parameters/PayInvoiceParams.ts
@@ -0,0 +1,10 @@
+import type {PaymentMethodType} from '@src/types/onyx/OriginalMessage';
+
+type PayInvoiceParams = {
+    reportID: string;
+    reportActionID: string;
+    paymentMethodType: PaymentMethodType;
+    payAsBusiness: boolean;
+};
+
+export default PayInvoiceParams;
diff --git a/src/libs/API/parameters/PayMoneyRequestParams.ts b/src/libs/API/parameters/PayMoneyRequestParams.ts
index 229cb0b8c98e..3ad98429b75c 100644
--- a/src/libs/API/parameters/PayMoneyRequestParams.ts
+++ b/src/libs/API/parameters/PayMoneyRequestParams.ts
@@ -7,6 +7,16 @@ type PayMoneyRequestParams = {
     paymentMethodType: PaymentMethodType;
     full: boolean;
     amount?: number;
+    optimisticHoldReportID?: string;
+    optimisticHoldActionID?: string;
+    /**
+     * Stringified JSON object with type of following structure:
+     * Array<{
+     *   optimisticReportActionID: string;
+     *   oldReportActionID: string;
+     * }>
+     */
+    optimisticHoldReportExpenseActionIDs?: string;
 };
 
 export default PayMoneyRequestParams;
diff --git a/src/libs/API/parameters/RemoveWorkspaceReportFieldListValueParams.ts b/src/libs/API/parameters/RemoveWorkspaceReportFieldListValueParams.ts
new file mode 100644
index 000000000000..94d90a8dbaae
--- /dev/null
+++ b/src/libs/API/parameters/RemoveWorkspaceReportFieldListValueParams.ts
@@ -0,0 +1,10 @@
+type RemoveWorkspaceReportFieldListValueParams = {
+    policyID: string;
+    /**
+     * Stringified JSON object with type of following structure:
+     * Array<string>
+     */
+    reportFields: string;
+};
+
+export default RemoveWorkspaceReportFieldListValueParams;
diff --git a/src/libs/API/parameters/RenamePolicyTaglist.ts b/src/libs/API/parameters/RenamePolicyTaglist.ts
deleted file mode 100644
index 8c92c99aa7fb..000000000000
--- a/src/libs/API/parameters/RenamePolicyTaglist.ts
+++ /dev/null
@@ -1,7 +0,0 @@
-type RenamePolicyTaglist = {
-    policyID: string;
-    oldName: string;
-    newName: string;
-};
-
-export default RenamePolicyTaglist;
diff --git a/src/libs/API/parameters/RenamePolicyTaglistParams.ts b/src/libs/API/parameters/RenamePolicyTaglistParams.ts
new file mode 100644
index 000000000000..dd7d08209d32
--- /dev/null
+++ b/src/libs/API/parameters/RenamePolicyTaglistParams.ts
@@ -0,0 +1,8 @@
+type RenamePolicyTaglistParams = {
+    policyID: string;
+    oldName: string;
+    newName: string;
+    tagListIndex: number;
+};
+
+export default RenamePolicyTaglistParams;
diff --git a/src/libs/API/parameters/RenamePolicyTagsParams.ts b/src/libs/API/parameters/RenamePolicyTagsParams.ts
index bcf38384cf2c..6a384623d91f 100644
--- a/src/libs/API/parameters/RenamePolicyTagsParams.ts
+++ b/src/libs/API/parameters/RenamePolicyTagsParams.ts
@@ -2,6 +2,7 @@ type RenamePolicyTagsParams = {
     policyID: string;
     oldName: string;
     newName: string;
+    tagListIndex: number;
 };
 
 export default RenamePolicyTagsParams;
diff --git a/src/libs/API/parameters/ReportExportParams.ts b/src/libs/API/parameters/ReportExportParams.ts
new file mode 100644
index 000000000000..c6a4b7b58ee8
--- /dev/null
+++ b/src/libs/API/parameters/ReportExportParams.ts
@@ -0,0 +1,17 @@
+import type {ValueOf} from 'type-fest';
+import type CONST from '@src/CONST';
+
+type ReportExportParams = {
+    reportIDList: string;
+    connectionName: ValueOf<typeof CONST.POLICY.CONNECTIONS.NAME>;
+    type: 'MANUAL';
+    /**
+     * Stringified JSON object with type of following structure:
+     * {
+     *   [reportID]: optimisticReportActionID;
+     * }>
+     */
+    optimisticReportActions: string;
+};
+
+export default ReportExportParams;
diff --git a/src/libs/API/parameters/RequestExpensifyCardLimitIncreaseParams.ts b/src/libs/API/parameters/RequestExpensifyCardLimitIncreaseParams.ts
new file mode 100644
index 000000000000..6e118f2a1c06
--- /dev/null
+++ b/src/libs/API/parameters/RequestExpensifyCardLimitIncreaseParams.ts
@@ -0,0 +1,6 @@
+type RequestExpensifyCardLimitIncreaseParams = {
+    authToken: string | null | undefined;
+    settlementBankAccountID: string;
+};
+
+export default RequestExpensifyCardLimitIncreaseParams;
diff --git a/src/libs/API/parameters/RequestMoneyParams.ts b/src/libs/API/parameters/RequestMoneyParams.ts
index 053c5802e1ba..e3e600a4e367 100644
--- a/src/libs/API/parameters/RequestMoneyParams.ts
+++ b/src/libs/API/parameters/RequestMoneyParams.ts
@@ -27,6 +27,7 @@ type RequestMoneyParams = {
     receiptGpsPoints?: string;
     transactionThreadReportID: string;
     createdReportActionIDForThread: string;
+    reimbursible?: boolean;
 };
 
 export default RequestMoneyParams;
diff --git a/src/libs/API/parameters/ResolveActionableReportMentionWhisperParams.ts b/src/libs/API/parameters/ResolveActionableReportMentionWhisperParams.ts
new file mode 100644
index 000000000000..d8b4c036e842
--- /dev/null
+++ b/src/libs/API/parameters/ResolveActionableReportMentionWhisperParams.ts
@@ -0,0 +1,9 @@
+import type {ValueOf} from 'type-fest';
+import type CONST from '@src/CONST';
+
+type ResolveActionableReportMentionWhisperParams = {
+    reportActionID: string;
+    resolution: ValueOf<typeof CONST.REPORT.ACTIONABLE_REPORT_MENTION_WHISPER_RESOLUTION>;
+};
+
+export default ResolveActionableReportMentionWhisperParams;
diff --git a/src/libs/API/parameters/Search.ts b/src/libs/API/parameters/Search.ts
index 44e8c9f2d0fb..64bfc5baf5a1 100644
--- a/src/libs/API/parameters/Search.ts
+++ b/src/libs/API/parameters/Search.ts
@@ -1,6 +1,8 @@
+import type {SearchQueryString} from '@components/Search/types';
+
 type SearchParams = {
-    query: string;
     hash: number;
+    jsonQuery: SearchQueryString;
 };
 
 export default SearchParams;
diff --git a/src/libs/API/parameters/SearchForReportsParams.ts b/src/libs/API/parameters/SearchForReportsParams.ts
index b6d1bbadb1dc..5cc90e39ffed 100644
--- a/src/libs/API/parameters/SearchForReportsParams.ts
+++ b/src/libs/API/parameters/SearchForReportsParams.ts
@@ -1,5 +1,6 @@
 type SearchForReportsParams = {
     searchInput: string;
+    canCancel?: boolean;
 };
 
 export default SearchForReportsParams;
diff --git a/src/libs/API/parameters/SendInvoiceParams.ts b/src/libs/API/parameters/SendInvoiceParams.ts
index 5ede0dcaa920..e2cac84e0d12 100644
--- a/src/libs/API/parameters/SendInvoiceParams.ts
+++ b/src/libs/API/parameters/SendInvoiceParams.ts
@@ -1,19 +1,30 @@
-type SendInvoiceParams = {
-    senderWorkspaceID: string;
-    accountID: number;
-    receiverEmail?: string;
-    receiverInvoiceRoomID?: string;
-    amount: number;
-    currency: string;
-    merchant: string;
-    date: string;
-    category?: string;
-    invoiceRoomReportID?: string;
-    createdChatReportActionID: string;
-    invoiceReportID: string;
-    reportPreviewReportActionID: string;
-    transactionID: string;
-    transactionThreadReportID: string;
-};
+import type {RequireAtLeastOne} from 'type-fest';
+
+type SendInvoiceParams = RequireAtLeastOne<
+    {
+        senderWorkspaceID: string;
+        accountID: number;
+        receiverEmail?: string;
+        receiverInvoiceRoomID?: string;
+        amount: number;
+        currency: string;
+        comment: string;
+        merchant: string;
+        date: string;
+        category?: string;
+        invoiceRoomReportID?: string;
+        createdChatReportActionID: string;
+        invoiceReportID: string;
+        reportPreviewReportActionID: string;
+        transactionID: string;
+        transactionThreadReportID: string;
+        companyName?: string;
+        companyWebsite?: string;
+        createdIOUReportActionID: string;
+        createdReportActionIDForThread: string;
+        reportActionID: string;
+    },
+    'receiverEmail' | 'receiverInvoiceRoomID'
+>;
 
 export default SendInvoiceParams;
diff --git a/src/libs/API/parameters/SetPolicyBillableMode.ts b/src/libs/API/parameters/SetPolicyBillableMode.ts
new file mode 100644
index 000000000000..2a313ab2bf0c
--- /dev/null
+++ b/src/libs/API/parameters/SetPolicyBillableMode.ts
@@ -0,0 +1,12 @@
+type SetPolicyBillableMode = {
+    defaultBillable: boolean;
+    /**
+     * Stringified JSON object with type of following structure:
+     *  disabledFields: {
+     *      defaultBillable: boolean;
+     *  };
+     */
+    disabledFields: string;
+};
+
+export default SetPolicyBillableMode;
diff --git a/src/libs/API/parameters/SetPolicyExpenseMaxAge.ts b/src/libs/API/parameters/SetPolicyExpenseMaxAge.ts
new file mode 100644
index 000000000000..df625978b425
--- /dev/null
+++ b/src/libs/API/parameters/SetPolicyExpenseMaxAge.ts
@@ -0,0 +1,6 @@
+type SetPolicyExpenseMaxAge = {
+    policyID: string;
+    maxExpenseAge: number;
+};
+
+export default SetPolicyExpenseMaxAge;
diff --git a/src/libs/API/parameters/SetPolicyExpenseMaxAmount.ts b/src/libs/API/parameters/SetPolicyExpenseMaxAmount.ts
new file mode 100644
index 000000000000..79fe09c6c326
--- /dev/null
+++ b/src/libs/API/parameters/SetPolicyExpenseMaxAmount.ts
@@ -0,0 +1,6 @@
+type SetPolicyExpenseMaxAmount = {
+    policyID: string;
+    maxExpenseAmount: number;
+};
+
+export default SetPolicyExpenseMaxAmount;
diff --git a/src/libs/API/parameters/SetPolicyExpenseMaxAmountNoReceipt.ts b/src/libs/API/parameters/SetPolicyExpenseMaxAmountNoReceipt.ts
new file mode 100644
index 000000000000..856294c1fc42
--- /dev/null
+++ b/src/libs/API/parameters/SetPolicyExpenseMaxAmountNoReceipt.ts
@@ -0,0 +1,6 @@
+type SetPolicyExpenseMaxAmountNoReceipt = {
+    policyID: string;
+    maxExpenseAmountNoReceipt: number;
+};
+
+export default SetPolicyExpenseMaxAmountNoReceipt;
diff --git a/src/libs/API/parameters/SetPolicyRulesEnabledParams.ts b/src/libs/API/parameters/SetPolicyRulesEnabledParams.ts
new file mode 100644
index 000000000000..c748a98e4119
--- /dev/null
+++ b/src/libs/API/parameters/SetPolicyRulesEnabledParams.ts
@@ -0,0 +1,6 @@
+type SetPolicyRulesEnabledParams = {
+    policyID: string;
+    enabled: boolean;
+};
+
+export default SetPolicyRulesEnabledParams;
diff --git a/src/libs/API/parameters/SetPolicyTagsEnabled.ts b/src/libs/API/parameters/SetPolicyTagsEnabled.ts
index 86720b84bf8b..67928a3227e3 100644
--- a/src/libs/API/parameters/SetPolicyTagsEnabled.ts
+++ b/src/libs/API/parameters/SetPolicyTagsEnabled.ts
@@ -5,6 +5,11 @@ type SetPolicyTagsEnabled = {
      * Array<{name: string; enabled: boolean}>
      */
     tags: string;
+    /**
+     * When the tags are imported as multi level tags, the index of the top
+     * most tag list item
+     */
+    tagListIndex: number;
 };
 
 export default SetPolicyTagsEnabled;
diff --git a/src/libs/API/parameters/SetPolicyTagsRequired.ts b/src/libs/API/parameters/SetPolicyTagsRequired.ts
new file mode 100644
index 000000000000..8defd4a80840
--- /dev/null
+++ b/src/libs/API/parameters/SetPolicyTagsRequired.ts
@@ -0,0 +1,7 @@
+type SetPolicyTagsRequired = {
+    policyID: string;
+    tagListIndex: number;
+    requireTagList: boolean;
+};
+
+export default SetPolicyTagsRequired;
diff --git a/src/libs/API/parameters/SetWorkspaceAutoReportingParams.ts b/src/libs/API/parameters/SetWorkspaceAutoReportingParams.ts
deleted file mode 100644
index a87817986ffa..000000000000
--- a/src/libs/API/parameters/SetWorkspaceAutoReportingParams.ts
+++ /dev/null
@@ -1,6 +0,0 @@
-type SetWorkspaceAutoReportingParams = {
-    policyID: string;
-    enabled: boolean;
-};
-
-export default SetWorkspaceAutoReportingParams;
diff --git a/src/libs/API/parameters/SetWorkspaceEReceiptsEnabled.ts b/src/libs/API/parameters/SetWorkspaceEReceiptsEnabled.ts
new file mode 100644
index 000000000000..29031eca2cec
--- /dev/null
+++ b/src/libs/API/parameters/SetWorkspaceEReceiptsEnabled.ts
@@ -0,0 +1,5 @@
+type SetWorkspaceEReceiptsEnabled = {
+    eReceipts: boolean;
+};
+
+export default SetWorkspaceEReceiptsEnabled;
diff --git a/src/libs/API/parameters/SignUpUserParams.ts b/src/libs/API/parameters/SignUpUserParams.ts
new file mode 100644
index 000000000000..00080017d30f
--- /dev/null
+++ b/src/libs/API/parameters/SignUpUserParams.ts
@@ -0,0 +1,9 @@
+import type {ValueOf} from 'type-fest';
+import type CONST from '@src/CONST';
+
+type SignUpUserParams = {
+    email?: string;
+    preferredLocale: ValueOf<typeof CONST.LOCALES> | null;
+};
+
+export default SignUpUserParams;
diff --git a/src/libs/API/parameters/SplitBillParams.ts b/src/libs/API/parameters/SplitBillParams.ts
index dd5a88141222..76252abe3292 100644
--- a/src/libs/API/parameters/SplitBillParams.ts
+++ b/src/libs/API/parameters/SplitBillParams.ts
@@ -15,6 +15,8 @@ type SplitBillParams = {
     policyID: string | undefined;
     chatType: string | undefined;
     splitPayerAccountIDs: number[];
+    taxCode: string;
+    taxAmount: number;
 };
 
 export default SplitBillParams;
diff --git a/src/libs/API/parameters/StartIssueNewCardFlowParams.ts b/src/libs/API/parameters/StartIssueNewCardFlowParams.ts
new file mode 100644
index 000000000000..8ed04b756a10
--- /dev/null
+++ b/src/libs/API/parameters/StartIssueNewCardFlowParams.ts
@@ -0,0 +1,5 @@
+type StartIssueNewCardFlowParams = {
+    policyID: string;
+};
+
+export default StartIssueNewCardFlowParams;
diff --git a/src/libs/API/parameters/StartSplitBillParams.ts b/src/libs/API/parameters/StartSplitBillParams.ts
index ce7a310f14e2..499073c88de9 100644
--- a/src/libs/API/parameters/StartSplitBillParams.ts
+++ b/src/libs/API/parameters/StartSplitBillParams.ts
@@ -14,6 +14,8 @@ type StartSplitBillParams = {
     createdReportActionID?: string;
     billable: boolean;
     chatType?: string;
+    taxCode?: string;
+    taxAmount?: number;
 };
 
 export default StartSplitBillParams;
diff --git a/src/libs/API/parameters/SyncPolicyToNetSuiteParams.ts b/src/libs/API/parameters/SyncPolicyToNetSuiteParams.ts
new file mode 100644
index 000000000000..9227f40997ff
--- /dev/null
+++ b/src/libs/API/parameters/SyncPolicyToNetSuiteParams.ts
@@ -0,0 +1,6 @@
+type SyncPolicyToNetSuiteParams = {
+    policyID: string;
+    idempotencyKey: string;
+};
+
+export default SyncPolicyToNetSuiteParams;
diff --git a/src/libs/API/parameters/SyncPolicyToXeroParams.ts b/src/libs/API/parameters/SyncPolicyToXeroParams.ts
new file mode 100644
index 000000000000..0932f860c29e
--- /dev/null
+++ b/src/libs/API/parameters/SyncPolicyToXeroParams.ts
@@ -0,0 +1,6 @@
+type SyncPolicyToXeroParams = {
+    policyID: string;
+    idempotencyKey: string;
+};
+
+export default SyncPolicyToXeroParams;
diff --git a/src/libs/API/parameters/ToggleCardContinuousReconciliationParams.ts b/src/libs/API/parameters/ToggleCardContinuousReconciliationParams.ts
new file mode 100644
index 000000000000..7433418058bd
--- /dev/null
+++ b/src/libs/API/parameters/ToggleCardContinuousReconciliationParams.ts
@@ -0,0 +1,7 @@
+type ToggleCardContinuousReconciliationParams = {
+    workspaceAccountID: number;
+    shouldUseContinuousReconciliation: boolean;
+    expensifyCardContinuousReconciliationConnection?: string;
+};
+
+export default ToggleCardContinuousReconciliationParams;
diff --git a/src/libs/API/parameters/TrackExpenseParams.ts b/src/libs/API/parameters/TrackExpenseParams.ts
index 5f15a6a3f521..d5e1de2e625b 100644
--- a/src/libs/API/parameters/TrackExpenseParams.ts
+++ b/src/libs/API/parameters/TrackExpenseParams.ts
@@ -26,6 +26,7 @@ type TrackExpenseParams = {
     transactionThreadReportID: string;
     createdReportActionIDForThread: string;
     waypoints?: string;
+    actionableWhisperReportActionID?: string;
 };
 
 export default TrackExpenseParams;
diff --git a/src/libs/API/parameters/TransactionMergeParams.ts b/src/libs/API/parameters/TransactionMergeParams.ts
new file mode 100644
index 000000000000..9e2516e2637f
--- /dev/null
+++ b/src/libs/API/parameters/TransactionMergeParams.ts
@@ -0,0 +1,17 @@
+type TransactionMergeParams = {
+    transactionID: string;
+    transactionIDList: string[];
+    created: string;
+    merchant: string;
+    amount: number;
+    currency: string;
+    category: string;
+    comment: string;
+    billable: boolean;
+    reimbursable: boolean;
+    tag: string;
+    receiptID: number;
+    reportID: string;
+};
+
+export default TransactionMergeParams;
diff --git a/src/libs/API/parameters/UnapproveExpenseReportParams.ts b/src/libs/API/parameters/UnapproveExpenseReportParams.ts
new file mode 100644
index 000000000000..ba25424aeda6
--- /dev/null
+++ b/src/libs/API/parameters/UnapproveExpenseReportParams.ts
@@ -0,0 +1,6 @@
+type UnapproveExpenseReportParams = {
+    reportID: string;
+    reportActionID: string;
+};
+
+export default UnapproveExpenseReportParams;
diff --git a/src/libs/API/parameters/UnholdMoneyRequestOnSearchParams.ts b/src/libs/API/parameters/UnholdMoneyRequestOnSearchParams.ts
new file mode 100644
index 000000000000..a32b57731999
--- /dev/null
+++ b/src/libs/API/parameters/UnholdMoneyRequestOnSearchParams.ts
@@ -0,0 +1,6 @@
+type UnholdMoneyRequestOnSearchParams = {
+    hash: number;
+    transactionIDList: string[];
+};
+
+export default UnholdMoneyRequestOnSearchParams;
diff --git a/src/libs/API/parameters/UpdateBillingCurrencyParams.ts b/src/libs/API/parameters/UpdateBillingCurrencyParams.ts
new file mode 100644
index 000000000000..0ab3dc9665a5
--- /dev/null
+++ b/src/libs/API/parameters/UpdateBillingCurrencyParams.ts
@@ -0,0 +1,9 @@
+import type {ValueOf} from 'type-fest';
+import type CONST from '@src/CONST';
+
+type UpdateBillingCurrencyParams = {
+    currency: ValueOf<typeof CONST.PAYMENT_CARD_CURRENCY>;
+    cardCVV: string;
+};
+
+export default UpdateBillingCurrencyParams;
diff --git a/src/libs/API/parameters/UpdateCardSettlementAccountParams.ts b/src/libs/API/parameters/UpdateCardSettlementAccountParams.ts
new file mode 100644
index 000000000000..8af37bb9d4ce
--- /dev/null
+++ b/src/libs/API/parameters/UpdateCardSettlementAccountParams.ts
@@ -0,0 +1,6 @@
+type UpdateCardSettlementAccountParams = {
+    domainName: string;
+    settlementBankAccountID: number;
+};
+
+export default UpdateCardSettlementAccountParams;
diff --git a/src/libs/API/parameters/UpdateCardSettlementFrequencyParams.ts b/src/libs/API/parameters/UpdateCardSettlementFrequencyParams.ts
new file mode 100644
index 000000000000..6085713bac97
--- /dev/null
+++ b/src/libs/API/parameters/UpdateCardSettlementFrequencyParams.ts
@@ -0,0 +1,9 @@
+import type {ValueOf} from 'type-fest';
+import type CONST from '@src/CONST';
+
+type UpdateCardSettlementFrequencyParams = {
+    settlementFrequency: ValueOf<typeof CONST.EXPENSIFY_CARD.FREQUENCY_SETTING>;
+    workspaceAccountID: number;
+};
+
+export default UpdateCardSettlementFrequencyParams;
diff --git a/src/libs/API/parameters/UpdateExpensifyCardLimitParams.ts b/src/libs/API/parameters/UpdateExpensifyCardLimitParams.ts
new file mode 100644
index 000000000000..d64094185a79
--- /dev/null
+++ b/src/libs/API/parameters/UpdateExpensifyCardLimitParams.ts
@@ -0,0 +1,7 @@
+type UpdateExpensifyCardLimitParams = {
+    authToken: string;
+    cardID: number;
+    limit: number;
+};
+
+export default UpdateExpensifyCardLimitParams;
diff --git a/src/libs/API/parameters/UpdateExpensifyCardLimitTypeParams.ts b/src/libs/API/parameters/UpdateExpensifyCardLimitTypeParams.ts
new file mode 100644
index 000000000000..8faafab82b8e
--- /dev/null
+++ b/src/libs/API/parameters/UpdateExpensifyCardLimitTypeParams.ts
@@ -0,0 +1,7 @@
+type UpdateExpensifyCardLimitTypeParams = {
+    authToken: string;
+    cardID: number;
+    limitType: string;
+};
+
+export default UpdateExpensifyCardLimitTypeParams;
diff --git a/src/libs/API/parameters/UpdateExpensifyCardTitleParams.ts b/src/libs/API/parameters/UpdateExpensifyCardTitleParams.ts
new file mode 100644
index 000000000000..94e79634a72a
--- /dev/null
+++ b/src/libs/API/parameters/UpdateExpensifyCardTitleParams.ts
@@ -0,0 +1,7 @@
+type UpdateExpensifyCardTitleParams = {
+    authToken: string;
+    cardID: number;
+    cardTitle: string;
+};
+
+export default UpdateExpensifyCardTitleParams;
diff --git a/src/libs/API/parameters/UpdateFrequentlyUsedEmojisParams.ts b/src/libs/API/parameters/UpdateFrequentlyUsedEmojisParams.ts
deleted file mode 100644
index f790ada3aad9..000000000000
--- a/src/libs/API/parameters/UpdateFrequentlyUsedEmojisParams.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-type UpdateFrequentlyUsedEmojisParams = {value: string};
-
-export default UpdateFrequentlyUsedEmojisParams;
diff --git a/src/libs/API/parameters/UpdateManyPolicyConnectionConfigurationsParams.ts b/src/libs/API/parameters/UpdateManyPolicyConnectionConfigurationsParams.ts
new file mode 100644
index 000000000000..6496d3e94266
--- /dev/null
+++ b/src/libs/API/parameters/UpdateManyPolicyConnectionConfigurationsParams.ts
@@ -0,0 +1,8 @@
+type UpdateManyPolicyConnectionConfigurationsParams = {
+    policyID: string;
+    connectionName: string;
+    configUpdate: string;
+    idempotencyKey: string;
+};
+
+export default UpdateManyPolicyConnectionConfigurationsParams;
diff --git a/src/libs/API/parameters/UpdateNetSuiteCustomFormIDParams.ts b/src/libs/API/parameters/UpdateNetSuiteCustomFormIDParams.ts
new file mode 100644
index 000000000000..01e5db8c1089
--- /dev/null
+++ b/src/libs/API/parameters/UpdateNetSuiteCustomFormIDParams.ts
@@ -0,0 +1,10 @@
+import type {ValueOf} from 'type-fest';
+import type CONST from '@src/CONST';
+
+type UpdateNetSuiteCustomFormIDParams = {
+    policyID: string;
+    formID: string;
+    formType: ValueOf<typeof CONST.NETSUITE_MAP_EXPORT_DESTINATION>;
+};
+
+export default UpdateNetSuiteCustomFormIDParams;
diff --git a/src/libs/API/parameters/UpdateNetSuiteCustomersJobsParams.ts b/src/libs/API/parameters/UpdateNetSuiteCustomersJobsParams.ts
new file mode 100644
index 000000000000..c29b503a9acf
--- /dev/null
+++ b/src/libs/API/parameters/UpdateNetSuiteCustomersJobsParams.ts
@@ -0,0 +1,10 @@
+import type {ValueOf} from 'type-fest';
+import type CONST from '@src/CONST';
+
+type UpdateNetSuiteCustomersJobsParams = {
+    policyID: string;
+    customersMapping: ValueOf<typeof CONST.INTEGRATION_ENTITY_MAP_TYPES>;
+    jobsMapping: ValueOf<typeof CONST.INTEGRATION_ENTITY_MAP_TYPES>;
+};
+
+export default UpdateNetSuiteCustomersJobsParams;
diff --git a/src/libs/API/parameters/UpdateNetSuiteGenericTypeParams.ts b/src/libs/API/parameters/UpdateNetSuiteGenericTypeParams.ts
new file mode 100644
index 000000000000..3834dfbf7e66
--- /dev/null
+++ b/src/libs/API/parameters/UpdateNetSuiteGenericTypeParams.ts
@@ -0,0 +1,7 @@
+type UpdateNetSuiteGenericTypeParams<K extends string | number | symbol, Type> = {
+    [K2 in K]: Type;
+} & {
+    policyID: string;
+};
+
+export default UpdateNetSuiteGenericTypeParams;
diff --git a/src/libs/API/parameters/UpdateNetSuiteSubsidiaryParams.ts b/src/libs/API/parameters/UpdateNetSuiteSubsidiaryParams.ts
new file mode 100644
index 000000000000..15353589663a
--- /dev/null
+++ b/src/libs/API/parameters/UpdateNetSuiteSubsidiaryParams.ts
@@ -0,0 +1,7 @@
+type UpdateNetSuiteSubsidiaryParams = {
+    policyID: string;
+    subsidiary: string;
+    subsidiaryID: string;
+};
+
+export default UpdateNetSuiteSubsidiaryParams;
diff --git a/src/libs/API/parameters/UpdatePolicyCategoryGLCodeParams.ts b/src/libs/API/parameters/UpdatePolicyCategoryGLCodeParams.ts
new file mode 100644
index 000000000000..f5e4d4ab7eca
--- /dev/null
+++ b/src/libs/API/parameters/UpdatePolicyCategoryGLCodeParams.ts
@@ -0,0 +1,7 @@
+type UpdatePolicyCategoryGLCodeParams = {
+    policyID: string;
+    categoryName: string;
+    glCode: string;
+};
+
+export default UpdatePolicyCategoryGLCodeParams;
diff --git a/src/libs/API/parameters/UpdatePolicyCategoryPayrollCodeParams.ts b/src/libs/API/parameters/UpdatePolicyCategoryPayrollCodeParams.ts
new file mode 100644
index 000000000000..8751832f7cad
--- /dev/null
+++ b/src/libs/API/parameters/UpdatePolicyCategoryPayrollCodeParams.ts
@@ -0,0 +1,7 @@
+type UpdatePolicyCategoryPayrollCodeParams = {
+    policyID: string;
+    categoryName: string;
+    payrollCode: string;
+};
+
+export default UpdatePolicyCategoryPayrollCodeParams;
diff --git a/src/libs/API/parameters/UpdatePolicyConnectionConfigParams.ts b/src/libs/API/parameters/UpdatePolicyConnectionConfigParams.ts
index 2a5c6da51cec..111674b8ffb6 100644
--- a/src/libs/API/parameters/UpdatePolicyConnectionConfigParams.ts
+++ b/src/libs/API/parameters/UpdatePolicyConnectionConfigParams.ts
@@ -2,7 +2,7 @@ type UpdatePolicyConnectionConfigParams = {
     policyID: string;
     connectionName: string;
     settingName: string;
-    settingValue?: string;
+    settingValue: string;
     idempotencyKey: string;
 };
 
diff --git a/src/libs/API/parameters/UpdatePolicyTagGLCodeParams.ts b/src/libs/API/parameters/UpdatePolicyTagGLCodeParams.ts
new file mode 100644
index 000000000000..f720864a8f68
--- /dev/null
+++ b/src/libs/API/parameters/UpdatePolicyTagGLCodeParams.ts
@@ -0,0 +1,9 @@
+type UpdatePolicyTagGLCodeParams = {
+    policyID: string;
+    tagListName: string;
+    tagListIndex: number;
+    tagName: string;
+    glCode: string;
+};
+
+export default UpdatePolicyTagGLCodeParams;
diff --git a/src/libs/API/parameters/UpdatePolicyTaxCodeParams.ts b/src/libs/API/parameters/UpdatePolicyTaxCodeParams.ts
new file mode 100644
index 000000000000..9218b0223a2c
--- /dev/null
+++ b/src/libs/API/parameters/UpdatePolicyTaxCodeParams.ts
@@ -0,0 +1,8 @@
+type UpdatePolicyTaxCodeParams = {
+    policyID: string;
+    oldTaxCode: string;
+    newTaxCode: string;
+    taxID: string;
+};
+
+export default UpdatePolicyTaxCodeParams;
diff --git a/src/libs/API/parameters/UpdateQuickbooksOnlineGenericTypeParams.ts b/src/libs/API/parameters/UpdateQuickbooksOnlineGenericTypeParams.ts
new file mode 100644
index 000000000000..a4caeb9fbe0a
--- /dev/null
+++ b/src/libs/API/parameters/UpdateQuickbooksOnlineGenericTypeParams.ts
@@ -0,0 +1,7 @@
+type UpdateQuickbooksOnlineGenericTypeParams = {
+    policyID: string;
+    settingValue: string;
+    idempotencyKey: string;
+};
+
+export default UpdateQuickbooksOnlineGenericTypeParams;
diff --git a/src/libs/API/parameters/UpdateRoomDescriptionParams.ts b/src/libs/API/parameters/UpdateRoomDescriptionParams.ts
index 4d78d07a9189..6f143658ddf7 100644
--- a/src/libs/API/parameters/UpdateRoomDescriptionParams.ts
+++ b/src/libs/API/parameters/UpdateRoomDescriptionParams.ts
@@ -1,6 +1,7 @@
 type UpdateRoomDescriptionParams = {
     reportID: string;
     description: string;
+    reportActionID: string;
 };
 
 export default UpdateRoomDescriptionParams;
diff --git a/src/libs/API/parameters/UpdateSageIntacctGenericParams.ts b/src/libs/API/parameters/UpdateSageIntacctGenericParams.ts
new file mode 100644
index 000000000000..5ac0ccc21218
--- /dev/null
+++ b/src/libs/API/parameters/UpdateSageIntacctGenericParams.ts
@@ -0,0 +1,7 @@
+type UpdateSageIntacctGenericParams<K extends string | number | symbol, Type> = {
+    [K2 in K]: Type;
+} & {
+    policyID: string;
+};
+
+export default UpdateSageIntacctGenericParams;
diff --git a/src/libs/API/parameters/UpdateSageIntacctGenericTypeParams.ts b/src/libs/API/parameters/UpdateSageIntacctGenericTypeParams.ts
new file mode 100644
index 000000000000..509a06cadb2c
--- /dev/null
+++ b/src/libs/API/parameters/UpdateSageIntacctGenericTypeParams.ts
@@ -0,0 +1,7 @@
+type UpdateSageIntacctGenericTypeParams<K extends string | number | symbol, Type> = {
+    [K2 in K]: Type;
+} & {
+    policyID: string;
+};
+
+export default UpdateSageIntacctGenericTypeParams;
diff --git a/src/libs/API/parameters/UpdateSubscriptionAddNewUsersAutomaticallyParams.ts b/src/libs/API/parameters/UpdateSubscriptionAddNewUsersAutomaticallyParams.ts
new file mode 100644
index 000000000000..6d8fcc54ce81
--- /dev/null
+++ b/src/libs/API/parameters/UpdateSubscriptionAddNewUsersAutomaticallyParams.ts
@@ -0,0 +1,5 @@
+type UpdateSubscriptionAddNewUsersAutomaticallyParams = {
+    addNewUsersAutomatically: boolean;
+};
+
+export default UpdateSubscriptionAddNewUsersAutomaticallyParams;
diff --git a/src/libs/API/parameters/UpdateSubscriptionAutoRenewParams.ts b/src/libs/API/parameters/UpdateSubscriptionAutoRenewParams.ts
new file mode 100644
index 000000000000..93ddefa49eea
--- /dev/null
+++ b/src/libs/API/parameters/UpdateSubscriptionAutoRenewParams.ts
@@ -0,0 +1,9 @@
+import type {FeedbackSurveyOptionID} from '@src/CONST';
+
+type UpdateSubscriptionAutoRenewParams = {
+    autoRenew: boolean;
+    disableAutoRenewReason?: FeedbackSurveyOptionID;
+    disableAutoRenewAdditionalNote?: string;
+};
+
+export default UpdateSubscriptionAutoRenewParams;
diff --git a/src/libs/API/parameters/UpdateSubscriptionSizeParams.ts b/src/libs/API/parameters/UpdateSubscriptionSizeParams.ts
new file mode 100644
index 000000000000..17382a7265e6
--- /dev/null
+++ b/src/libs/API/parameters/UpdateSubscriptionSizeParams.ts
@@ -0,0 +1,5 @@
+type UpdateSubscriptionSizeParams = {
+    userCount: number;
+};
+
+export default UpdateSubscriptionSizeParams;
diff --git a/src/libs/API/parameters/UpdateSubscriptionTypeParams.ts b/src/libs/API/parameters/UpdateSubscriptionTypeParams.ts
new file mode 100644
index 000000000000..aeb29c304b90
--- /dev/null
+++ b/src/libs/API/parameters/UpdateSubscriptionTypeParams.ts
@@ -0,0 +1,7 @@
+import type {SubscriptionType} from '@src/CONST';
+
+type UpdateSubscriptionTypeParams = {
+    type: SubscriptionType;
+};
+
+export default UpdateSubscriptionTypeParams;
diff --git a/src/libs/API/parameters/UpdateWorkspaceReportFieldInitialValueParams.ts b/src/libs/API/parameters/UpdateWorkspaceReportFieldInitialValueParams.ts
new file mode 100644
index 000000000000..a72781ff1c37
--- /dev/null
+++ b/src/libs/API/parameters/UpdateWorkspaceReportFieldInitialValueParams.ts
@@ -0,0 +1,10 @@
+type UpdateWorkspaceReportFieldInitialValueParams = {
+    policyID: string;
+    /**
+     * Stringified JSON object with type of following structure:
+     * Array<string>
+     */
+    reportFields: string;
+};
+
+export default UpdateWorkspaceReportFieldInitialValueParams;
diff --git a/src/libs/API/parameters/UpdateXeroGenericTypeParams.ts b/src/libs/API/parameters/UpdateXeroGenericTypeParams.ts
new file mode 100644
index 000000000000..02667483bdd3
--- /dev/null
+++ b/src/libs/API/parameters/UpdateXeroGenericTypeParams.ts
@@ -0,0 +1,7 @@
+type UpdateXeroGenericTypeParams = {
+    policyID: string;
+    settingValue: string;
+    idempotencyKey: string;
+};
+
+export default UpdateXeroGenericTypeParams;
diff --git a/src/libs/API/parameters/UpgradeToCorporateParams.ts b/src/libs/API/parameters/UpgradeToCorporateParams.ts
new file mode 100644
index 000000000000..ee9d1359c4dd
--- /dev/null
+++ b/src/libs/API/parameters/UpgradeToCorporateParams.ts
@@ -0,0 +1,6 @@
+type UpgradeToCorporateParams = {
+    policyID: string;
+    featureName: string;
+};
+
+export default UpgradeToCorporateParams;
diff --git a/src/libs/API/parameters/VerifySetupIntentParams.ts b/src/libs/API/parameters/VerifySetupIntentParams.ts
new file mode 100644
index 000000000000..60138f607ad4
--- /dev/null
+++ b/src/libs/API/parameters/VerifySetupIntentParams.ts
@@ -0,0 +1,5 @@
+type VerifySetupIntentParams = {
+    accountID: number;
+    isVerifying: boolean;
+};
+export default VerifySetupIntentParams;
diff --git a/src/libs/API/parameters/WorkspaceApprovalParams.ts b/src/libs/API/parameters/WorkspaceApprovalParams.ts
new file mode 100644
index 000000000000..0a84bc552bc4
--- /dev/null
+++ b/src/libs/API/parameters/WorkspaceApprovalParams.ts
@@ -0,0 +1,21 @@
+type CreateWorkspaceApprovalParams = {
+    authToken: string;
+    policyID: string;
+    /**
+     * Stringified JSON object with type of following structure:
+     * Array<{
+     *  email: string;
+     *  forwardsTo?: string;
+     *  submitsTo?: string;
+     * }>
+     */
+    employees: string;
+};
+
+type UpdateWorkspaceApprovalParams = CreateWorkspaceApprovalParams & {
+    defaultApprover?: string;
+};
+
+type RemoveWorkspaceApprovalParams = CreateWorkspaceApprovalParams;
+
+export type {CreateWorkspaceApprovalParams, UpdateWorkspaceApprovalParams, RemoveWorkspaceApprovalParams};
diff --git a/src/libs/API/parameters/index.ts b/src/libs/API/parameters/index.ts
index 30261051c0e5..9294ab0c98a1 100644
--- a/src/libs/API/parameters/index.ts
+++ b/src/libs/API/parameters/index.ts
@@ -1,6 +1,7 @@
 export type {default as ActivatePhysicalExpensifyCardParams} from './ActivatePhysicalExpensifyCardParams';
 export type {default as AddNewContactMethodParams} from './AddNewContactMethodParams';
 export type {default as AddPaymentCardParams} from './AddPaymentCardParams';
+export type {default as VerifySetupIntentParams} from './VerifySetupIntentParams';
 export type {default as AddPersonalBankAccountParams} from './AddPersonalBankAccountParams';
 export type {default as RestartBankAccountSetupParams} from './RestartBankAccountSetupParams';
 export type {default as AddSchoolPrincipalParams} from './AddSchoolPrincipalParams';
@@ -12,7 +13,11 @@ export type {default as BeginSignInParams} from './BeginSignInParams';
 export type {default as CloseAccountParams} from './CloseAccountParams';
 export type {default as ConnectBankAccountParams} from './ConnectBankAccountParams';
 export type {default as ConnectPolicyToAccountingIntegrationParams} from './ConnectPolicyToAccountingIntegrationParams';
+export type {default as OpenPolicyProfilePageParams} from './OpenPolicyProfilePageParams';
+export type {default as OpenPolicyInitialPageParams} from './OpenPolicyInitialPageParams';
 export type {default as SyncPolicyToQuickbooksOnlineParams} from './SyncPolicyToQuickbooksOnlineParams';
+export type {default as SyncPolicyToXeroParams} from './SyncPolicyToXeroParams';
+export type {default as SyncPolicyToNetSuiteParams} from './SyncPolicyToNetSuiteParams';
 export type {default as DeleteContactMethodParams} from './DeleteContactMethodParams';
 export type {default as DeletePaymentBankAccountParams} from './DeletePaymentBankAccountParams';
 export type {default as DeletePaymentCardParams} from './DeletePaymentCardParams';
@@ -31,7 +36,6 @@ export type {default as OpenAppParams} from './OpenAppParams';
 export type {default as OpenOldDotLinkParams} from './OpenOldDotLinkParams';
 export type {default as OpenPlaidBankAccountSelectorParams} from './OpenPlaidBankAccountSelectorParams';
 export type {default as OpenPlaidBankLoginParams} from './OpenPlaidBankLoginParams';
-export type {default as OpenProfileParams} from './OpenProfileParams';
 export type {default as OpenPublicProfilePageParams} from './OpenPublicProfilePageParams';
 export type {default as OpenReimbursementAccountPageParams} from './OpenReimbursementAccountPageParams';
 export type {default as OpenReportParams} from './OpenReportParams';
@@ -47,6 +51,7 @@ export type {default as RequestReplacementExpensifyCardParams} from './RequestRe
 export type {default as RequestUnlinkValidationLinkParams} from './RequestUnlinkValidationLinkParams';
 export type {default as RequestAccountValidationLinkParams} from './RequestAccountValidationLinkParams';
 export type {default as ResolveActionableMentionWhisperParams} from './ResolveActionableMentionWhisperParams';
+export type {default as ResolveActionableReportMentionWhisperParams} from './ResolveActionableReportMentionWhisperParams';
 export type {default as RevealExpensifyCardDetailsParams} from './RevealExpensifyCardDetailsParams';
 export type {default as SearchForReportsParams} from './SearchForReportsParams';
 export type {default as SearchForRoomsToMentionParams} from './SearchForRoomsToMentionParams';
@@ -60,7 +65,6 @@ export type {default as UpdateAutomaticTimezoneParams} from './UpdateAutomaticTi
 export type {default as UpdateChatPriorityModeParams} from './UpdateChatPriorityModeParams';
 export type {default as UpdateDateOfBirthParams} from './UpdateDateOfBirthParams';
 export type {default as UpdateDisplayNameParams} from './UpdateDisplayNameParams';
-export type {default as UpdateFrequentlyUsedEmojisParams} from './UpdateFrequentlyUsedEmojisParams';
 export type {default as UpdateGroupChatNameParams} from './UpdateGroupChatNameParams';
 export type {default as UpdateGroupChatMemberRolesParams} from './UpdateGroupChatMemberRolesParams';
 export type {default as UpdateHomeAddressParams} from './UpdateHomeAddressParams';
@@ -95,6 +99,7 @@ export type {default as UpdateRoomVisibilityParams} from './UpdateRoomVisibility
 export type {default as UpdateReportWriteCapabilityParams} from './UpdateReportWriteCapabilityParams';
 export type {default as AddWorkspaceRoomParams} from './AddWorkspaceRoomParams';
 export type {default as UpdatePolicyRoomNameParams} from './UpdatePolicyRoomNameParams';
+export type {default as UpdateBillingCurrencyParams} from './UpdateBillingCurrencyParams';
 export type {default as AddEmojiReactionParams} from './AddEmojiReactionParams';
 export type {default as RemoveEmojiReactionParams} from './RemoveEmojiReactionParams';
 export type {default as LeaveRoomParams} from './LeaveRoomParams';
@@ -120,6 +125,7 @@ export type {default as AddMembersToWorkspaceParams} from './AddMembersToWorkspa
 export type {default as DeleteMembersFromWorkspaceParams} from './DeleteMembersFromWorkspaceParams';
 export type {default as OpenWorkspaceParams} from './OpenWorkspaceParams';
 export type {default as OpenWorkspaceViewParams} from './OpenWorkspaceViewParams';
+export type {default as ConnectPolicyToSageIntacctParams} from './ConnectPolicyToSageIntacctParams';
 export type {default as OpenWorkspaceReimburseViewParams} from './OpenWorkspaceReimburseViewParams';
 export type {default as OpenWorkspaceInvitePageParams} from './OpenWorkspaceInvitePageParams';
 export type {default as OpenWorkspaceMembersPageParams} from './OpenWorkspaceMembersPageParams';
@@ -134,7 +140,6 @@ export type {default as EditTaskAssigneeParams} from './EditTaskAssigneeParams';
 export type {default as EditTaskParams} from './EditTaskParams';
 export type {default as ReopenTaskParams} from './ReopenTaskParams';
 export type {default as CompleteTaskParams} from './CompleteTaskParams';
-export type {default as CompleteEngagementModalParams} from './CompleteEngagementModalParams';
 export type {default as SetNameValuePairParams} from './SetNameValuePairParams';
 export type {default as SetReportFieldParams} from './SetReportFieldParams';
 export type {default as SetReportNameParams} from './SetReportNameParams';
@@ -148,6 +153,7 @@ export type {default as CreateDistanceRequestParams} from './CreateDistanceReque
 export type {default as StartSplitBillParams} from './StartSplitBillParams';
 export type {default as SendMoneyParams} from './SendMoneyParams';
 export type {default as ApproveMoneyRequestParams} from './ApproveMoneyRequestParams';
+export type {default as UnapproveExpenseReportParams} from './UnapproveExpenseReportParams';
 export type {default as EditMoneyRequestParams} from './EditMoneyRequestParams';
 export type {default as ReplaceReceiptParams} from './ReplaceReceiptParams';
 export type {default as SubmitReportParams} from './SubmitReportParams';
@@ -164,14 +170,16 @@ export type {default as CreateWorkspaceCategoriesParams} from './CreateWorkspace
 export type {default as RenameWorkspaceCategoriesParams} from './RenameWorkspaceCategoriesParams';
 export type {default as SetWorkspaceRequiresCategoryParams} from './SetWorkspaceRequiresCategoryParams';
 export type {default as DeleteWorkspaceCategoriesParams} from './DeleteWorkspaceCategoriesParams';
-export type {default as SetWorkspaceAutoReportingParams} from './SetWorkspaceAutoReportingParams';
+export type {default as UpdatePolicyCategoryPayrollCodeParams} from './UpdatePolicyCategoryPayrollCodeParams';
+export type {default as UpdatePolicyCategoryGLCodeParams} from './UpdatePolicyCategoryGLCodeParams';
 export type {default as SetWorkspaceAutoReportingFrequencyParams} from './SetWorkspaceAutoReportingFrequencyParams';
 export type {default as SetWorkspaceAutoReportingMonthlyOffsetParams} from './SetWorkspaceAutoReportingMonthlyOffsetParams';
 export type {default as SetWorkspaceApprovalModeParams} from './SetWorkspaceApprovalModeParams';
 export type {default as SetWorkspacePayerParams} from './SetWorkspacePayerParams';
 export type {default as SetWorkspaceReimbursementParams} from './SetWorkspaceReimbursementParams';
 export type {default as SetPolicyRequiresTag} from './SetPolicyRequiresTag';
-export type {default as RenamePolicyTaglist} from './RenamePolicyTaglist';
+export type {default as SetPolicyTagsRequired} from './SetPolicyTagsRequired';
+export type {default as RenamePolicyTaglistParams} from './RenamePolicyTaglistParams';
 export type {default as SwitchToOldDotParams} from './SwitchToOldDotParams';
 export type {default as TrackExpenseParams} from './TrackExpenseParams';
 export type {default as EnablePolicyCategoriesParams} from './EnablePolicyCategoriesParams';
@@ -181,6 +189,7 @@ export type {default as EnablePolicyTagsParams} from './EnablePolicyTagsParams';
 export type {default as SetPolicyTagsEnabled} from './SetPolicyTagsEnabled';
 export type {default as EnablePolicyWorkflowsParams} from './EnablePolicyWorkflowsParams';
 export type {default as EnablePolicyReportFieldsParams} from './EnablePolicyReportFieldsParams';
+export type {default as EnablePolicyExpensifyCardsParams} from './EnablePolicyExpensifyCardsParams';
 export type {default as AcceptJoinRequestParams} from './AcceptJoinRequest';
 export type {default as DeclineJoinRequestParams} from './DeclineJoinRequest';
 export type {default as JoinPolicyInviteLinkParams} from './JoinPolicyInviteLink';
@@ -188,6 +197,7 @@ export type {default as CreatePolicyTaxParams} from './CreatePolicyTaxParams';
 export type {default as OpenPolicyWorkflowsPageParams} from './OpenPolicyWorkflowsPageParams';
 export type {default as OpenPolicyDistanceRatesPageParams} from './OpenPolicyDistanceRatesPageParams';
 export type {default as OpenPolicyTaxesPageParams} from './OpenPolicyTaxesPageParams';
+export type {default as OpenPolicyReportFieldsPageParams} from './OpenPolicyReportFieldsPageParams';
 export type {default as EnablePolicyTaxesParams} from './EnablePolicyTaxesParams';
 export type {default as OpenPolicyMoreFeaturesPageParams} from './OpenPolicyMoreFeaturesPageParams';
 export type {default as CreatePolicyDistanceRateParams} from './CreatePolicyDistanceRateParams';
@@ -204,12 +214,17 @@ export type {default as DeletePolicyTaxesParams} from './DeletePolicyTaxesParams
 export type {default as UpdatePolicyTaxValueParams} from './UpdatePolicyTaxValueParams';
 export type {default as RenamePolicyTagsParams} from './RenamePolicyTagsParams';
 export type {default as DeletePolicyTagsParams} from './DeletePolicyTagsParams';
+export type {default as UpdatePolicyTagGLCodeParams} from './UpdatePolicyTagGLCodeParams';
+export type {default as AddSubscriptionPaymentCardParams} from './AddSubscriptionPaymentCardParams';
 export type {default as SetPolicyCustomTaxNameParams} from './SetPolicyCustomTaxNameParams';
 export type {default as SetPolicyForeignCurrencyDefaultParams} from './SetPolicyForeignCurrencyDefaultParams';
 export type {default as SetPolicyCurrencyDefaultParams} from './SetPolicyCurrencyDefaultParams';
+export type {default as UpdateQuickbooksOnlineGenericTypeParams} from './UpdateQuickbooksOnlineGenericTypeParams';
 export type {default as UpdatePolicyConnectionConfigParams} from './UpdatePolicyConnectionConfigParams';
+export type {default as UpdateManyPolicyConnectionConfigurationsParams} from './UpdateManyPolicyConnectionConfigurationsParams';
 export type {default as RemovePolicyConnectionParams} from './RemovePolicyConnectionParams';
 export type {default as RenamePolicyTaxParams} from './RenamePolicyTaxParams';
+export type {default as UpdatePolicyTaxCodeParams} from './UpdatePolicyTaxCodeParams';
 export type {default as CompleteGuidedSetupParams} from './CompleteGuidedSetupParams';
 export type {default as DismissTrackExpenseActionableWhisperParams} from './DismissTrackExpenseActionableWhisperParams';
 export type {default as ConvertTrackedExpenseToRequestParams} from './ConvertTrackedExpenseToRequestParams';
@@ -217,5 +232,61 @@ export type {default as ShareTrackedExpenseParams} from './ShareTrackedExpensePa
 export type {default as CategorizeTrackedExpenseParams} from './CategorizeTrackedExpenseParams';
 export type {default as LeavePolicyParams} from './LeavePolicyParams';
 export type {default as OpenPolicyAccountingPageParams} from './OpenPolicyAccountingPageParams';
+export type {default as DismissViolationParams} from './DismissViolationParams';
 export type {default as SearchParams} from './Search';
 export type {default as SendInvoiceParams} from './SendInvoiceParams';
+export type {default as PayInvoiceParams} from './PayInvoiceParams';
+export type {default as MarkAsCashParams} from './MarkAsCashParams';
+export type {default as TransactionMergeParams} from './TransactionMergeParams';
+export type {default as UpdateSubscriptionTypeParams} from './UpdateSubscriptionTypeParams';
+export type {default as SignUpUserParams} from './SignUpUserParams';
+export type {default as UpdateSubscriptionAutoRenewParams} from './UpdateSubscriptionAutoRenewParams';
+export type {default as UpdateSubscriptionAddNewUsersAutomaticallyParams} from './UpdateSubscriptionAddNewUsersAutomaticallyParams';
+export type {default as GenerateSpotnanaTokenParams} from './GenerateSpotnanaTokenParams';
+export type {default as UpdateSubscriptionSizeParams} from './UpdateSubscriptionSizeParams';
+export type {default as ReportExportParams} from './ReportExportParams';
+export type {default as MarkAsExportedParams} from './MarkAsExportedParams';
+export type {default as UpgradeToCorporateParams} from './UpgradeToCorporateParams';
+export type {default as DeleteMoneyRequestOnSearchParams} from './DeleteMoneyRequestOnSearchParams';
+export type {default as HoldMoneyRequestOnSearchParams} from './HoldMoneyRequestOnSearchParams';
+export type {default as UnholdMoneyRequestOnSearchParams} from './UnholdMoneyRequestOnSearchParams';
+export type {default as UpdateNetSuiteSubsidiaryParams} from './UpdateNetSuiteSubsidiaryParams';
+export type {default as DeletePolicyReportField} from './DeletePolicyReportField';
+export type {default as ConnectPolicyToNetSuiteParams} from './ConnectPolicyToNetSuiteParams';
+export type {default as CreateWorkspaceReportFieldParams} from './CreateWorkspaceReportFieldParams';
+export type {default as UpdateWorkspaceReportFieldInitialValueParams} from './UpdateWorkspaceReportFieldInitialValueParams';
+export type {default as EnableWorkspaceReportFieldListValueParams} from './EnableWorkspaceReportFieldListValueParams';
+export type {default as EnablePolicyInvoicingParams} from './EnablePolicyInvoicingParams';
+export type {default as CreateWorkspaceReportFieldListValueParams} from './CreateWorkspaceReportFieldListValueParams';
+export type {default as RemoveWorkspaceReportFieldListValueParams} from './RemoveWorkspaceReportFieldListValueParams';
+export type {default as OpenPolicyExpensifyCardsPageParams} from './OpenPolicyExpensifyCardsPageParams';
+export type {default as OpenPolicyEditCardLimitTypePageParams} from './OpenPolicyEditCardLimitTypePageParams';
+export type {default as RequestExpensifyCardLimitIncreaseParams} from './RequestExpensifyCardLimitIncreaseParams';
+export type {default as UpdateNetSuiteGenericTypeParams} from './UpdateNetSuiteGenericTypeParams';
+export type {default as CancelBillingSubscriptionParams} from './CancelBillingSubscriptionParams';
+export type {default as UpdateNetSuiteCustomFormIDParams} from './UpdateNetSuiteCustomFormIDParams';
+export type {default as UpdateSageIntacctGenericTypeParams} from './UpdateSageIntacctGenericTypeParams';
+export type {default as UpdateNetSuiteCustomersJobsParams} from './UpdateNetSuiteCustomersJobsParams';
+export type {default as CopyExistingPolicyConnectionParams} from './CopyExistingPolicyConnectionParams';
+export type {default as ExportSearchItemsToCSVParams} from './ExportSearchItemsToCSVParams';
+export type {default as UpdateExpensifyCardLimitParams} from './UpdateExpensifyCardLimitParams';
+export type {CreateWorkspaceApprovalParams, UpdateWorkspaceApprovalParams, RemoveWorkspaceApprovalParams} from './WorkspaceApprovalParams';
+export type {default as StartIssueNewCardFlowParams} from './StartIssueNewCardFlowParams';
+export type {default as ConnectAsDelegateParams} from './ConnectAsDelegateParams';
+export type {default as SetPolicyRulesEnabledParams} from './SetPolicyRulesEnabledParams';
+export type {default as SetPolicyExpenseMaxAmountNoReceipt} from './SetPolicyExpenseMaxAmountNoReceipt';
+export type {default as SetPolicyExpenseMaxAmount} from './SetPolicyExpenseMaxAmount';
+export type {default as SetPolicyExpenseMaxAge} from './SetPolicyExpenseMaxAge';
+export type {default as SetPolicyBillableMode} from './SetPolicyBillableMode';
+export type {default as SetWorkspaceEReceiptsEnabled} from './SetWorkspaceEReceiptsEnabled';
+export type {default as ConfigureExpensifyCardsForPolicyParams} from './ConfigureExpensifyCardsForPolicyParams';
+export type {default as CreateExpensifyCardParams} from './CreateExpensifyCardParams';
+export type {default as UpdateExpensifyCardTitleParams} from './UpdateExpensifyCardTitleParams';
+export type {default as OpenCardDetailsPageParams} from './OpenCardDetailsPageParams';
+export type {default as EnablePolicyCompanyCardsParams} from './EnablePolicyCompanyCardsParams';
+export type {default as ToggleCardContinuousReconciliationParams} from './ToggleCardContinuousReconciliationParams';
+export type {default as CardDeactivateParams} from './CardDeactivateParams';
+export type {default as UpdateExpensifyCardLimitTypeParams} from './UpdateExpensifyCardLimitTypeParams';
+export type {default as UpdateXeroGenericTypeParams} from './UpdateXeroGenericTypeParams';
+export type {default as UpdateCardSettlementFrequencyParams} from './UpdateCardSettlementFrequencyParams';
+export type {default as UpdateCardSettlementAccountParams} from './UpdateCardSettlementAccountParams';
diff --git a/src/libs/API/types.ts b/src/libs/API/types.ts
index c61e1278ff8a..457eeb7c9b03 100644
--- a/src/libs/API/types.ts
+++ b/src/libs/API/types.ts
@@ -1,14 +1,14 @@
 import type {ValueOf} from 'type-fest';
 import type CONST from '@src/CONST';
+import type {SageIntacctMappingValue} from '@src/types/onyx/Policy';
 import type {EmptyObject} from '@src/types/utils/EmptyObject';
 import type * as Parameters from './parameters';
 import type SignInUserParams from './parameters/SignInUserParams';
 import type UpdateBeneficialOwnersForBankAccountParams from './parameters/UpdateBeneficialOwnersForBankAccountParams';
 
-type ApiRequest = ValueOf<typeof CONST.API_REQUEST_TYPE>;
+type ApiRequestType = ValueOf<typeof CONST.API_REQUEST_TYPE>;
 
 const WRITE_COMMANDS = {
-    SET_WORKSPACE_AUTO_REPORTING: 'SetWorkspaceAutoReporting',
     SET_WORKSPACE_AUTO_REPORTING_FREQUENCY: 'SetWorkspaceAutoReportingFrequency',
     SET_WORKSPACE_AUTO_REPORTING_MONTHLY_OFFSET: 'SetWorkspaceAutoReportingOffset',
     SET_WORKSPACE_APPROVAL_MODE: 'SetWorkspaceApprovalMode',
@@ -18,7 +18,6 @@ const WRITE_COMMANDS = {
     UPDATE_PREFERRED_LOCALE: 'UpdatePreferredLocale',
     OPEN_APP: 'OpenApp',
     RECONNECT_APP: 'ReconnectApp',
-    OPEN_PROFILE: 'OpenProfile',
     HANDLE_RESTRICTED_EVENT: 'HandleRestrictedEvent',
     OPEN_REPORT: 'OpenReport',
     DELETE_PAYMENT_BANK_ACCOUNT: 'DeletePaymentBankAccount',
@@ -32,9 +31,15 @@ const WRITE_COMMANDS = {
     REPORT_VIRTUAL_EXPENSIFY_CARD_FRAUD: 'ReportVirtualExpensifyCardFraud',
     REQUEST_REPLACEMENT_EXPENSIFY_CARD: 'RequestReplacementExpensifyCard',
     ACTIVATE_PHYSICAL_EXPENSIFY_CARD: 'ActivatePhysicalExpensifyCard',
+    UPDATE_EXPENSIFY_CARD_LIMIT: 'UpdateExpensifyCardLimit',
+    UPDATE_EXPENSIFY_CARD_TITLE: 'UpdateExpensifyCardTitle',
+    UPDATE_EXPENSIFY_CARD_LIMIT_TYPE: 'UpdateExpensifyCardLimitType',
+    CARD_DEACTIVATE: 'Card_Deactivate',
     CHRONOS_REMOVE_OOO_EVENT: 'Chronos_RemoveOOOEvent',
     MAKE_DEFAULT_PAYMENT_METHOD: 'MakeDefaultPaymentMethod',
     ADD_PAYMENT_CARD: 'AddPaymentCard',
+    ADD_PAYMENT_CARD_GBP: 'AddPaymentCardGBP',
+    VERIFY_SETUP_INTENT: 'User_VerifySetupIntent',
     TRANSFER_WALLET_BALANCE: 'TransferWalletBalance',
     DELETE_PAYMENT_CARD: 'DeletePaymentCard',
     UPDATE_PRONOUNS: 'UpdatePronouns',
@@ -58,7 +63,6 @@ const WRITE_COMMANDS = {
     VALIDATE_LOGIN: 'ValidateLogin',
     VALIDATE_SECONDARY_LOGIN: 'ValidateSecondaryLogin',
     UPDATE_PREFERRED_EMOJI_SKIN_TONE: 'UpdatePreferredEmojiSkinTone',
-    UPDATE_FREQUENTLY_USED_EMOJIS: 'UpdateFrequentlyUsedEmojis',
     UPDATE_CHAT_PRIORITY_MODE: 'UpdateChatPriorityMode',
     SET_CONTACT_METHOD_AS_DEFAULT: 'SetContactMethodAsDefault',
     UPDATE_THEME: 'UpdateTheme',
@@ -80,7 +84,6 @@ const WRITE_COMMANDS = {
     UNLINK_LOGIN: 'UnlinkLogin',
     ENABLE_TWO_FACTOR_AUTH: 'EnableTwoFactorAuth',
     DISABLE_TWO_FACTOR_AUTH: 'DisableTwoFactorAuth',
-    TWO_FACTOR_AUTH_VALIDATE: 'TwoFactorAuth_Validate',
     ADD_COMMENT: 'AddComment',
     ADD_ATTACHMENT: 'AddAttachment',
     ADD_TEXT_AND_ATTACHMENT: 'AddTextAndAttachment',
@@ -113,6 +116,7 @@ const WRITE_COMMANDS = {
     FLAG_COMMENT: 'FlagComment',
     UPDATE_REPORT_PRIVATE_NOTE: 'UpdateReportPrivateNote',
     RESOLVE_ACTIONABLE_MENTION_WHISPER: 'ResolveActionableMentionWhisper',
+    RESOLVE_ACTIONABLE_REPORT_MENTION_WHISPER: 'ResolveActionableReportMentionWhisper',
     DELETE_WORKSPACE: 'DeleteWorkspace',
     DELETE_MEMBERS_FROM_WORKSPACE: 'DeleteMembersFromWorkspace',
     ADD_MEMBERS_TO_WORKSPACE: 'AddMembersToWorkspace',
@@ -131,18 +135,23 @@ const WRITE_COMMANDS = {
     CREATE_POLICY_TAG: 'CreatePolicyTag',
     RENAME_POLICY_TAG: 'RenamePolicyTag',
     SET_WORKSPACE_REQUIRES_CATEGORY: 'SetWorkspaceRequiresCategory',
+    UPDATE_POLICY_CATEGORY_PAYROLL_CODE: 'UpdatePolicyCategoryPayrollCode',
+    UPDATE_POLICY_CATEGORY_GL_CODE: 'UpdatePolicyCategoryGLCode',
     DELETE_WORKSPACE_CATEGORIES: 'DeleteWorkspaceCategories',
+    DELETE_POLICY_REPORT_FIELD: 'DeletePolicyReportField',
+    SET_POLICY_TAGS_REQUIRED: 'SetPolicyTagsRequired',
     SET_POLICY_REQUIRES_TAG: 'SetPolicyRequiresTag',
     RENAME_POLICY_TAG_LIST: 'RenamePolicyTaglist',
     DELETE_POLICY_TAGS: 'DeletePolicyTags',
+    UPDATE_POLICY_TAG_GL_CODE: 'UpdatePolicyTagGLCode',
     CREATE_TASK: 'CreateTask',
     CANCEL_TASK: 'CancelTask',
     EDIT_TASK_ASSIGNEE: 'EditTaskAssignee',
     EDIT_TASK: 'EditTask',
     REOPEN_TASK: 'ReopenTask',
     COMPLETE_TASK: 'CompleteTask',
-    COMPLETE_ENGAGEMENT_MODAL: 'CompleteEngagementModal',
     COMPLETE_GUIDED_SETUP: 'CompleteGuidedSetup',
+    COMPLETE_HYBRID_APP_ONBOARDING: 'CompleteHybridAppOnboarding',
     SET_NAME_VALUE_PAIR: 'SetNameValuePair',
     SET_REPORT_FIELD: 'Report_SetFields',
     DELETE_REPORT_FIELD: 'RemoveReportField',
@@ -155,10 +164,12 @@ const WRITE_COMMANDS = {
     UPDATE_MONEY_REQUEST_TAX_AMOUNT: 'UpdateMoneyRequestTaxAmount',
     UPDATE_MONEY_REQUEST_TAX_RATE: 'UpdateMoneyRequestTaxRate',
     UPDATE_MONEY_REQUEST_DISTANCE: 'UpdateMoneyRequestDistance',
+    UPDATE_MONEY_REQUEST_DISTANCE_RATE: 'UpdateMoneyRequestDistanceRate',
     UPDATE_MONEY_REQUEST_CATEGORY: 'UpdateMoneyRequestCategory',
     UPDATE_MONEY_REQUEST_DESCRIPTION: 'UpdateMoneyRequestDescription',
     UPDATE_MONEY_REQUEST_AMOUNT_AND_CURRENCY: 'UpdateMoneyRequestAmountAndCurrency',
     HOLD_MONEY_REQUEST: 'HoldRequest',
+    UPDATE_BILLING_CARD_CURRENCY: 'UpdateBillingCardCurrency',
     UNHOLD_MONEY_REQUEST: 'UnHoldRequest',
     UPDATE_DISTANCE_REQUEST: 'UpdateDistanceRequest',
     REQUEST_MONEY: 'RequestMoney',
@@ -170,6 +181,7 @@ const WRITE_COMMANDS = {
     SEND_MONEY_ELSEWHERE: 'SendMoneyElsewhere',
     SEND_MONEY_WITH_WALLET: 'SendMoneyWithWallet',
     APPROVE_MONEY_REQUEST: 'ApproveMoneyRequest',
+    UNAPPROVE_EXPENSE_REPORT: 'UnapproveExpenseReport',
     EDIT_MONEY_REQUEST: 'EditMoneyRequest',
     REPLACE_RECEIPT: 'ReplaceReceipt',
     SUBMIT_REPORT: 'SubmitReport',
@@ -187,6 +199,15 @@ const WRITE_COMMANDS = {
     ENABLE_POLICY_TAXES: 'EnablePolicyTaxes',
     ENABLE_POLICY_WORKFLOWS: 'EnablePolicyWorkflows',
     ENABLE_POLICY_REPORT_FIELDS: 'EnablePolicyReportFields',
+    ENABLE_POLICY_EXPENSIFY_CARDS: 'EnablePolicyExpensifyCards',
+    ENABLE_POLICY_COMPANY_CARDS: 'EnablePolicyCompanyCards',
+    ENABLE_POLICY_INVOICING: 'EnablePolicyInvoicing',
+    SET_POLICY_RULES_ENABLED: 'SetPolicyRulesEnabled',
+    SET_POLICY_EXPENSE_MAX_AMOUNT_NO_RECEIPT: 'SetPolicyExpenseMaxAmountNoReceipt',
+    SET_POLICY_EXPENSE_MAX_AMOUNT: 'SetPolicyExpenseMaxAmount',
+    SET_POLICY_EXPENSE_MAX_AGE: ' SetPolicyExpenseMaxAge',
+    SET_POLICY_BILLABLE_MODE: ' SetPolicyBillableMode',
+    SET_WORKSPACE_ERECEIPTS_ENABLED: 'SetWorkspaceEReceiptsEnabled',
     SET_POLICY_TAXES_CURRENCY_DEFAULT: 'SetPolicyCurrencyDefaultTax',
     SET_POLICY_TAXES_FOREIGN_CURRENCY_DEFAULT: 'SetPolicyForeignCurrencyDefaultTax',
     SET_POLICY_CUSTOM_TAX_NAME: 'SetPolicyCustomTaxName',
@@ -195,17 +216,25 @@ const WRITE_COMMANDS = {
     DECLINE_JOIN_REQUEST: 'DeclineJoinRequest',
     CREATE_POLICY_TAX: 'CreatePolicyTax',
     UPDATE_POLICY_CONNECTION_CONFIG: 'UpdatePolicyConnectionConfiguration',
+    UPDATE_QUICKBOOKS_ONLINE_ENABLE_NEW_CATEGORIES: 'UpdateQuickbooksOnlineEnableNewCategories',
+    UPDATE_QUICKBOOKS_ONLINE_AUTO_CREATE_VENDOR: 'UpdateQuickbooksOnlineAutoCreateVendor',
+    UPDATE_QUICKBOOKS_ONLINE_REIMBURSABLE_EXPENSES_ACCOUNT: 'UpdateQuickbooksOnlineReimbursableExpensesAccount',
+    UPDATE_MANY_POLICY_CONNECTION_CONFIGS: 'UpdateManyPolicyConnectionConfigurations',
     REMOVE_POLICY_CONNECTION: 'RemovePolicyConnection',
     SET_POLICY_TAXES_ENABLED: 'SetPolicyTaxesEnabled',
     DELETE_POLICY_TAXES: 'DeletePolicyTaxes',
     UPDATE_POLICY_TAX_VALUE: 'UpdatePolicyTaxValue',
     RENAME_POLICY_TAX: 'RenamePolicyTax',
+    UPDATE_POLICY_TAX_CODE: 'UpdatePolicyTaxCode',
     CREATE_POLICY_DISTANCE_RATE: 'CreatePolicyDistanceRate',
     REQUEST_WORKSPACE_OWNER_CHANGE: 'RequestWorkspaceOwnerChange',
     ADD_BILLING_CARD_AND_REQUEST_WORKSPACE_OWNER_CHANGE: 'AddBillingCardAndRequestPolicyOwnerChange',
     SET_POLICY_DISTANCE_RATES_UNIT: 'SetPolicyDistanceRatesUnit',
     SET_POLICY_DISTANCE_RATES_DEFAULT_CATEGORY: 'SetPolicyDistanceRatesDefaultCategory',
+    ENABLE_DISTANCE_REQUEST_TAX: 'EnableDistanceRequestTax',
     UPDATE_POLICY_DISTANCE_RATE_VALUE: 'UpdatePolicyDistanceRateValue',
+    UPDATE_POLICY_DISTANCE_TAX_RATE_VALUE: 'UpdateDistanceTaxRate',
+    UPDATE_DISTANCE_TAX_CLAIMABLE_VALUE: 'UpdateDistanceTaxClaimableValue',
     SET_POLICY_DISTANCE_RATES_ENABLED: 'SetPolicyDistanceRatesEnabled',
     DELETE_POLICY_DISTANCE_RATES: 'DeletePolicyDistanceRates',
     DISMISS_TRACK_EXPENSE_ACTIONABLE_WHISPER: 'DismissActionableWhisper',
@@ -213,8 +242,112 @@ const WRITE_COMMANDS = {
     CATEGORIZE_TRACKED_EXPENSE: 'CategorizeTrackedExpense',
     SHARE_TRACKED_EXPENSE: 'ShareTrackedExpense',
     LEAVE_POLICY: 'LeavePolicy',
+    DISMISS_VIOLATION: 'DismissViolation',
     ACCEPT_SPOTNANA_TERMS: 'AcceptSpotnanaTerms',
     SEND_INVOICE: 'SendInvoice',
+    PAY_INVOICE: 'PayInvoice',
+    MARK_AS_CASH: 'MarkAsCash',
+    TRANSACTION_MERGE: 'Transaction_Merge',
+    UPDATE_SUBSCRIPTION_TYPE: 'UpdateSubscriptionType',
+    SIGN_UP_USER: 'SignUpUser',
+    UPDATE_SUBSCRIPTION_AUTO_RENEW: 'UpdateSubscriptionAutoRenew',
+    UPDATE_SUBSCRIPTION_ADD_NEW_USERS_AUTOMATICALLY: 'UpdateSubscriptionAddNewUsersAutomatically',
+    UPDATE_SUBSCRIPTION_SIZE: 'UpdateSubscriptionSize',
+    REPORT_EXPORT: 'Report_Export',
+    MARK_AS_EXPORTED: 'MarkAsExported',
+    UPGRADE_TO_CORPORATE: 'UpgradeToCorporate',
+    DELETE_MONEY_REQUEST_ON_SEARCH: 'DeleteMoneyRequestOnSearch',
+    HOLD_MONEY_REQUEST_ON_SEARCH: 'HoldMoneyRequestOnSearch',
+    UNHOLD_MONEY_REQUEST_ON_SEARCH: 'UnholdMoneyRequestOnSearch',
+    REQUEST_REFUND: 'User_RefundPurchase',
+    UPDATE_NETSUITE_SUBSIDIARY: 'UpdateNetSuiteSubsidiary',
+    CREATE_WORKSPACE_REPORT_FIELD: 'CreatePolicyReportField',
+    UPDATE_WORKSPACE_REPORT_FIELD_INITIAL_VALUE: 'SetPolicyReportFieldDefault',
+    ENABLE_WORKSPACE_REPORT_FIELD_LIST_VALUE: 'EnablePolicyReportFieldOption',
+    CREATE_WORKSPACE_REPORT_FIELD_LIST_VALUE: 'CreatePolicyReportFieldOption',
+    REMOVE_WORKSPACE_REPORT_FIELD_LIST_VALUE: 'RemovePolicyReportFieldOption',
+    UPDATE_NETSUITE_SYNC_TAX_CONFIGURATION: 'UpdateNetSuiteSyncTaxConfiguration',
+    UPDATE_NETSUITE_CROSS_SUBSIDIARY_CUSTOMER_CONFIGURATION: 'UpdateNetSuiteCrossSubsidiaryCustomerConfiguration',
+    UPDATE_NETSUITE_DEPARTMENTS_MAPPING: 'UpdateNetSuiteDepartmentsMapping',
+    UPDATE_NETSUITE_CLASSES_MAPPING: 'UpdateNetSuiteClassesMapping',
+    UPDATE_NETSUITE_LOCATIONS_MAPPING: 'UpdateNetSuiteLocationsMapping',
+    UPDATE_NETSUITE_CUSTOMERS_MAPPING: 'UpdateNetSuiteCustomersMapping',
+    UPDATE_NETSUITE_JOBS_MAPPING: 'UpdateNetSuiteJobsMapping',
+    UPDATE_NETSUITE_CUSTOMERS_JOBS_MAPPING: 'UpdateNetSuiteCustomersJobsMapping',
+    UPDATE_NETSUITE_EXPORTER: 'UpdateNetSuiteExporter',
+    UPDATE_NETSUITE_EXPORT_DATE: 'UpdateNetSuiteExportDate',
+    UPDATE_NETSUITE_REIMBURSABLE_EXPENSES_EXPORT_DESTINATION: 'UpdateNetSuiteReimbursableExpensesExportDestination',
+    UPDATE_NETSUITE_NONREIMBURSABLE_EXPENSES_EXPORT_DESTINATION: 'UpdateNetSuiteNonreimbursableExpensesExportDestination',
+    UPDATE_NETSUITE_DEFAULT_VENDOR: 'UpdateNetSuiteDefaultVendor',
+    UPDATE_NETSUITE_REIMBURSABLE_PAYABLE_ACCOUNT: 'UpdateNetSuiteReimbursablePayableAccount',
+    UPDATE_NETSUITE_PAYABLE_ACCT: 'UpdateNetSuitePayableAcct',
+    UPDATE_NETSUITE_JOURNAL_POSTING_PREFERENCE: 'UpdateNetSuiteJournalPostingPreference',
+    UPDATE_NETSUITE_RECEIVABLE_ACCOUNT: 'UpdateNetSuiteReceivableAccount',
+    UPDATE_NETSUITE_INVOICE_ITEM_PREFERENCE: 'UpdateNetSuiteInvoiceItemPreference',
+    UPDATE_NETSUITE_INVOICE_ITEM: 'UpdateNetSuiteInvoiceItem',
+    UPDATE_NETSUITE_PROVINCIAL_TAX_POSTING_ACCOUNT: 'UpdateNetSuiteProvincialTaxPostingAccount',
+    UPDATE_NETSUITE_TAX_POSTING_ACCOUNT: 'UpdateNetSuiteTaxPostingAccount',
+    UPDATE_NETSUITE_ALLOW_FOREIGN_CURRENCY: 'UpdateNetSuiteAllowForeignCurrency',
+    UPDATE_NETSUITE_EXPORT_TO_NEXT_OPEN_PERIOD: 'UpdateNetSuiteExportToNextOpenPeriod',
+    UPDATE_NETSUITE_CUSTOM_SEGMENTS: 'UpdateNetSuiteCustomSegments',
+    UPDATE_NETSUITE_CUSTOM_LISTS: 'UpdateNetSuiteCustomLists',
+    UPDATE_NETSUITE_AUTO_SYNC: 'UpdateNetSuiteAutoSync',
+    UPDATE_NETSUITE_SYNC_REIMBURSED_REPORTS: 'UpdateNetSuiteSyncReimbursedReports',
+    UPDATE_NETSUITE_SYNC_PEOPLE: 'UpdateNetSuiteSyncPeople',
+    UPDATE_NETSUITE_AUTO_CREATE_ENTITIES: 'UpdateNetSuiteAutoCreateEntities',
+    UPDATE_NETSUITE_ENABLE_NEW_CATEGORIES: 'UpdateNetSuiteEnableNewCategories',
+    UPDATE_NETSUITE_CUSTOM_FORM_ID_OPTIONS_ENABLED: 'UpdateNetSuiteCustomFormIDOptionsEnabled',
+    UPDATE_NETSUITE_REIMBURSEMENT_ACCOUNT_ID: 'UpdateNetSuiteReimbursementAccountID',
+    UPDATE_NETSUITE_COLLECTION_ACCOUNT: 'UpdateNetSuiteCollectionAccount',
+    UPDATE_NETSUITE_EXPORT_REPORTS_TO: 'UpdateNetSuiteExportReportsTo',
+    UPDATE_NETSUITE_VENDOR_BILLS_TO: 'UpdateNetSuiteExportVendorBillsTo',
+    UPDATE_NETSUITE_JOURNALS_TO: 'UpdateNetSuiteExportJournalsTo',
+    UPDATE_NETSUITE_APPROVAL_ACCOUNT: 'UpdateNetSuiteApprovalAccount',
+    UPDATE_NETSUITE_CUSTOM_FORM_ID_OPTIONS_REIMBURSABLE: 'UpdateNetSuiteCustomFormIDOptionsReimbursable',
+    UPDATE_NETSUITE_CUSTOM_FORM_ID_OPTIONS_NON_REIMBURSABLE: 'UpdateNetSuiteCustomFormIDOptionsNonReimbursable',
+    REQUEST_EXPENSIFY_CARD_LIMIT_INCREASE: 'RequestExpensifyCardLimitIncrease',
+    CONNECT_POLICY_TO_SAGE_INTACCT: 'ConnectPolicyToSageIntacct',
+    COPY_EXISTING_POLICY_CONNECTION: 'CopyExistingPolicyConnection',
+    UPDATE_SAGE_INTACCT_AUTO_SYNC: 'UpdateSageIntacctAutoSync',
+    UPDATE_SAGE_INTACCT_IMPORT_EMPLOYEES: 'UpdateSageIntacctImportEmployees',
+    UPDATE_SAGE_INTACCT_APPROVAL_MODE: 'UpdateSageIntacctApprovalMode',
+    UPDATE_SAGE_INTACCT_SYNC_REIMBURSED_REPORTS: 'UpdateSageIntacctSyncReimbursedReports',
+    UPDATE_SAGE_INTACCT_SYNC_REIMBURSEMENT_ACCOUNT_ID: 'UpdateSageIntacctSyncReimbursementAccountID',
+    CONNECT_POLICY_TO_NETSUITE: 'ConnectPolicyToNetSuite',
+    CLEAR_OUTSTANDING_BALANCE: 'ClearOutstandingBalance',
+    CANCEL_BILLING_SUBSCRIPTION: 'CancelBillingSubscriptionNewDot',
+    UPDATE_SAGE_INTACCT_ENTITY: 'UpdateSageIntacctEntity',
+    UPDATE_SAGE_INTACCT_BILLABLE: 'UpdateSageIntacctBillable',
+    UPDATE_SAGE_INTACCT_DEPARTMENT_MAPPING: 'UpdateSageIntacctDepartmentsMapping',
+    UPDATE_SAGE_INTACCT_CLASSES_MAPPING: 'UpdateSageIntacctClassesMapping',
+    UPDATE_SAGE_INTACCT_LOCATIONS_MAPPING: 'UpdateSageIntacctLocationsMapping',
+    UPDATE_SAGE_INTACCT_CUSTOMERS_MAPPING: 'UpdateSageIntacctCustomersMapping',
+    UPDATE_SAGE_INTACCT_PROJECTS_MAPPING: 'UpdateSageIntacctProjectsMapping',
+    UPDATE_SAGE_INTACCT_SYNC_TAX_CONFIGURATION: 'UpdateSageIntacctSyncTaxConfiguration',
+    UPDATE_SAGE_INTACCT_USER_DIMENSION: 'UpdateSageIntacctUserDimension',
+    UPDATE_SAGE_INTACCT_EXPORTER: 'UpdateSageIntacctExporter',
+    UPDATE_SAGE_INTACCT_EXPORT_DATE: 'UpdateSageIntacctExportDate',
+    UPDATE_SAGE_INTACCT_REIMBURSABLE_EXPENSES_EXPORT_DESTINATION: 'UpdateSageIntacctReimbursableExpensesExportDestination',
+    UPDATE_SAGE_INTACCT_NON_REIMBURSABLE_EXPENSES_EXPORT_DESTINATION: 'UpdateSageIntacctNonreimbursableExpensesExportDestination',
+    UPDATE_SAGE_INTACCT_REIMBURSABLE_EXPENSES_REPORT_EXPORT_DEFAULT_VENDOR: 'UpdateSageIntacctReimbursableExpensesReportExportDefaultVendor',
+    UPDATE_SAGE_INTACCT_NON_REIMBURSABLE_EXPENSES_CREDIT_CARD_CHARGE_EXPORT_DEFAULT_VENDOR: 'UpdateSageIntacctNonreimbursableExpensesCreditCardChargeExportDefaultVendor',
+    UPDATE_SAGE_INTACCT_NON_REIMBURSABLE_EXPENSES_EXPORT_ACCOUNT: 'UpdateSageIntacctNonreimbursableExpensesExportAccount',
+    UPDATE_SAGE_INTACCT_NON_REIMBURSABLE_EXPENSES_EXPORT_VENDOR: 'UpdateSageIntacctNonreimbursableExpensesExportVendor',
+    REQUEST_TAX_EXEMPTION: 'RequestTaxExemption',
+    EXPORT_SEARCH_ITEMS_TO_CSV: 'ExportSearchToCSV',
+    CREATE_WORKSPACE_APPROVAL: 'CreateWorkspaceApproval',
+    UPDATE_WORKSPACE_APPROVAL: 'UpdateWorkspaceApproval',
+    REMOVE_WORKSPACE_APPROVAL: 'RemoveWorkspaceApproval',
+    CONFIGURE_EXPENSIFY_CARDS_FOR_POLICY: 'ConfigureExpensifyCardsForPolicy',
+    CREATE_EXPENSIFY_CARD: 'CreateExpensifyCard',
+    CREATE_ADMIN_ISSUED_VIRTUAL_CARD: 'CreateAdminIssuedVirtualCard',
+    TOGGLE_CARD_CONTINUOUS_RECONCILIATION: 'ToggleCardContinuousReconciliation',
+    UPDATE_CARD_SETTLEMENT_FREQUENCY: 'UpdateCardSettlementFrequency',
+    UPDATE_CARD_SETTLEMENT_ACCOUNT: 'UpdateCardSettlementAccount',
+    UPDATE_XERO_IMPORT_TRACKING_CATEGORIES: 'UpdateXeroImportTrackingCategories',
+    UPDATE_XERO_IMPORT_TAX_RATES: 'UpdateXeroImportTaxRates',
+    UPDATE_XERO_TENANT_ID: 'UpdateXeroTenantID',
+    UPDATE_XERO_MAPPING: 'UpdateXeroMappings',
 } as const;
 
 type WriteCommand = ValueOf<typeof WRITE_COMMANDS>;
@@ -224,7 +357,6 @@ type WriteCommandParameters = {
     [WRITE_COMMANDS.UPDATE_PREFERRED_LOCALE]: Parameters.UpdatePreferredLocaleParams;
     [WRITE_COMMANDS.RECONNECT_APP]: Parameters.ReconnectAppParams;
     [WRITE_COMMANDS.OPEN_APP]: Parameters.OpenAppParams;
-    [WRITE_COMMANDS.OPEN_PROFILE]: Parameters.OpenProfileParams;
     [WRITE_COMMANDS.HANDLE_RESTRICTED_EVENT]: Parameters.HandleRestrictedEventParams;
     [WRITE_COMMANDS.OPEN_REPORT]: Parameters.OpenReportParams;
     [WRITE_COMMANDS.DELETE_PAYMENT_BANK_ACCOUNT]: Parameters.DeletePaymentBankAccountParams;
@@ -238,8 +370,14 @@ type WriteCommandParameters = {
     [WRITE_COMMANDS.REPORT_VIRTUAL_EXPENSIFY_CARD_FRAUD]: Parameters.ReportVirtualExpensifyCardFraudParams;
     [WRITE_COMMANDS.REQUEST_REPLACEMENT_EXPENSIFY_CARD]: Parameters.RequestReplacementExpensifyCardParams;
     [WRITE_COMMANDS.ACTIVATE_PHYSICAL_EXPENSIFY_CARD]: Parameters.ActivatePhysicalExpensifyCardParams;
+    [WRITE_COMMANDS.UPDATE_EXPENSIFY_CARD_LIMIT]: Parameters.UpdateExpensifyCardLimitParams;
+    [WRITE_COMMANDS.UPDATE_EXPENSIFY_CARD_TITLE]: Parameters.UpdateExpensifyCardTitleParams;
+    [WRITE_COMMANDS.UPDATE_EXPENSIFY_CARD_LIMIT_TYPE]: Parameters.UpdateExpensifyCardLimitTypeParams;
+    [WRITE_COMMANDS.CARD_DEACTIVATE]: Parameters.CardDeactivateParams;
     [WRITE_COMMANDS.MAKE_DEFAULT_PAYMENT_METHOD]: Parameters.MakeDefaultPaymentMethodParams;
     [WRITE_COMMANDS.ADD_PAYMENT_CARD]: Parameters.AddPaymentCardParams;
+    [WRITE_COMMANDS.ADD_PAYMENT_CARD_GBP]: Parameters.AddPaymentCardParams;
+    [WRITE_COMMANDS.VERIFY_SETUP_INTENT]: Parameters.VerifySetupIntentParams;
     [WRITE_COMMANDS.DELETE_PAYMENT_CARD]: Parameters.DeletePaymentCardParams;
     [WRITE_COMMANDS.UPDATE_PRONOUNS]: Parameters.UpdatePronounsParams;
     [WRITE_COMMANDS.UPDATE_DISPLAY_NAME]: Parameters.UpdateDisplayNameParams;
@@ -250,7 +388,7 @@ type WriteCommandParameters = {
     [WRITE_COMMANDS.UPDATE_AUTOMATIC_TIMEZONE]: Parameters.UpdateAutomaticTimezoneParams;
     [WRITE_COMMANDS.UPDATE_SELECTED_TIMEZONE]: Parameters.UpdateSelectedTimezoneParams;
     [WRITE_COMMANDS.UPDATE_USER_AVATAR]: Parameters.UpdateUserAvatarParams;
-    [WRITE_COMMANDS.DELETE_USER_AVATAR]: EmptyObject;
+    [WRITE_COMMANDS.DELETE_USER_AVATAR]: null;
     [WRITE_COMMANDS.REFER_TEACHERS_UNITE_VOLUNTEER]: Parameters.ReferTeachersUniteVolunteerParams;
     [WRITE_COMMANDS.ADD_SCHOOL_PRINCIPAL]: Parameters.AddSchoolPrincipalParams;
     [WRITE_COMMANDS.CLOSE_ACCOUNT]: Parameters.CloseAccountParams;
@@ -261,12 +399,11 @@ type WriteCommandParameters = {
     [WRITE_COMMANDS.VALIDATE_LOGIN]: Parameters.ValidateLoginParams;
     [WRITE_COMMANDS.VALIDATE_SECONDARY_LOGIN]: Parameters.ValidateSecondaryLoginParams;
     [WRITE_COMMANDS.UPDATE_PREFERRED_EMOJI_SKIN_TONE]: Parameters.UpdatePreferredEmojiSkinToneParams;
-    [WRITE_COMMANDS.UPDATE_FREQUENTLY_USED_EMOJIS]: Parameters.UpdateFrequentlyUsedEmojisParams;
     [WRITE_COMMANDS.UPDATE_CHAT_PRIORITY_MODE]: Parameters.UpdateChatPriorityModeParams;
     [WRITE_COMMANDS.SET_CONTACT_METHOD_AS_DEFAULT]: Parameters.SetContactMethodAsDefaultParams;
     [WRITE_COMMANDS.UPDATE_THEME]: Parameters.UpdateThemeParams;
     [WRITE_COMMANDS.UPDATE_STATUS]: Parameters.UpdateStatusParams;
-    [WRITE_COMMANDS.CLEAR_STATUS]: EmptyObject;
+    [WRITE_COMMANDS.CLEAR_STATUS]: null;
     [WRITE_COMMANDS.UPDATE_PERSONAL_DETAILS_FOR_WALLET]: Parameters.UpdatePersonalDetailsForWalletParams;
     [WRITE_COMMANDS.VERIFY_IDENTITY]: Parameters.VerifyIdentityParams;
     [WRITE_COMMANDS.ACCEPT_WALLET_TERMS]: Parameters.AcceptWalletTermsParams;
@@ -281,9 +418,8 @@ type WriteCommandParameters = {
     [WRITE_COMMANDS.SIGN_IN_USER_WITH_LINK]: Parameters.SignInUserWithLinkParams;
     [WRITE_COMMANDS.REQUEST_UNLINK_VALIDATION_LINK]: Parameters.RequestUnlinkValidationLinkParams;
     [WRITE_COMMANDS.UNLINK_LOGIN]: Parameters.UnlinkLoginParams;
-    [WRITE_COMMANDS.ENABLE_TWO_FACTOR_AUTH]: EmptyObject;
-    [WRITE_COMMANDS.DISABLE_TWO_FACTOR_AUTH]: EmptyObject;
-    [WRITE_COMMANDS.TWO_FACTOR_AUTH_VALIDATE]: Parameters.ValidateTwoFactorAuthParams;
+    [WRITE_COMMANDS.ENABLE_TWO_FACTOR_AUTH]: null;
+    [WRITE_COMMANDS.DISABLE_TWO_FACTOR_AUTH]: null;
     [WRITE_COMMANDS.ADD_COMMENT]: Parameters.AddCommentOrAttachementParams;
     [WRITE_COMMANDS.ADD_ATTACHMENT]: Parameters.AddCommentOrAttachementParams;
     [WRITE_COMMANDS.ADD_TEXT_AND_ATTACHMENT]: Parameters.AddCommentOrAttachementParams;
@@ -317,6 +453,7 @@ type WriteCommandParameters = {
     [WRITE_COMMANDS.FLAG_COMMENT]: Parameters.FlagCommentParams;
     [WRITE_COMMANDS.UPDATE_REPORT_PRIVATE_NOTE]: Parameters.UpdateReportPrivateNoteParams;
     [WRITE_COMMANDS.RESOLVE_ACTIONABLE_MENTION_WHISPER]: Parameters.ResolveActionableMentionWhisperParams;
+    [WRITE_COMMANDS.RESOLVE_ACTIONABLE_REPORT_MENTION_WHISPER]: Parameters.ResolveActionableReportMentionWhisperParams;
     [WRITE_COMMANDS.CHRONOS_REMOVE_OOO_EVENT]: Parameters.ChronosRemoveOOOEventParams;
     [WRITE_COMMANDS.TRANSFER_WALLET_BALANCE]: Parameters.TransferWalletBalanceParams;
     [WRITE_COMMANDS.DELETE_WORKSPACE]: Parameters.DeleteWorkspaceParams;
@@ -335,10 +472,15 @@ type WriteCommandParameters = {
     [WRITE_COMMANDS.RENAME_WORKSPACE_CATEGORY]: Parameters.RenameWorkspaceCategoriesParams;
     [WRITE_COMMANDS.SET_WORKSPACE_REQUIRES_CATEGORY]: Parameters.SetWorkspaceRequiresCategoryParams;
     [WRITE_COMMANDS.DELETE_WORKSPACE_CATEGORIES]: Parameters.DeleteWorkspaceCategoriesParams;
+    [WRITE_COMMANDS.UPDATE_POLICY_CATEGORY_PAYROLL_CODE]: Parameters.UpdatePolicyCategoryPayrollCodeParams;
+    [WRITE_COMMANDS.UPDATE_POLICY_CATEGORY_GL_CODE]: Parameters.UpdatePolicyCategoryGLCodeParams;
+    [WRITE_COMMANDS.DELETE_POLICY_REPORT_FIELD]: Parameters.DeletePolicyReportField;
     [WRITE_COMMANDS.SET_POLICY_REQUIRES_TAG]: Parameters.SetPolicyRequiresTag;
-    [WRITE_COMMANDS.RENAME_POLICY_TAG_LIST]: Parameters.RenamePolicyTaglist;
+    [WRITE_COMMANDS.SET_POLICY_TAGS_REQUIRED]: Parameters.SetPolicyTagsRequired;
+    [WRITE_COMMANDS.RENAME_POLICY_TAG_LIST]: Parameters.RenamePolicyTaglistParams;
     [WRITE_COMMANDS.CREATE_POLICY_TAG]: Parameters.CreatePolicyTagsParams;
     [WRITE_COMMANDS.RENAME_POLICY_TAG]: Parameters.RenamePolicyTagsParams;
+    [WRITE_COMMANDS.UPDATE_POLICY_TAG_GL_CODE]: Parameters.UpdatePolicyTagGLCodeParams;
     [WRITE_COMMANDS.SET_POLICY_TAGS_ENABLED]: Parameters.SetPolicyTagsEnabled;
     [WRITE_COMMANDS.DELETE_POLICY_TAGS]: Parameters.DeletePolicyTagsParams;
     [WRITE_COMMANDS.CREATE_TASK]: Parameters.CreateTaskParams;
@@ -347,8 +489,8 @@ type WriteCommandParameters = {
     [WRITE_COMMANDS.EDIT_TASK]: Parameters.EditTaskParams;
     [WRITE_COMMANDS.REOPEN_TASK]: Parameters.ReopenTaskParams;
     [WRITE_COMMANDS.COMPLETE_TASK]: Parameters.CompleteTaskParams;
-    [WRITE_COMMANDS.COMPLETE_ENGAGEMENT_MODAL]: Parameters.CompleteEngagementModalParams;
     [WRITE_COMMANDS.COMPLETE_GUIDED_SETUP]: Parameters.CompleteGuidedSetupParams;
+    [WRITE_COMMANDS.COMPLETE_HYBRID_APP_ONBOARDING]: EmptyObject;
     [WRITE_COMMANDS.SET_NAME_VALUE_PAIR]: Parameters.SetNameValuePairParams;
     [WRITE_COMMANDS.SET_REPORT_FIELD]: Parameters.SetReportFieldParams;
     [WRITE_COMMANDS.SET_REPORT_NAME]: Parameters.SetReportNameParams;
@@ -361,6 +503,7 @@ type WriteCommandParameters = {
     [WRITE_COMMANDS.UPDATE_MONEY_REQUEST_TAX_AMOUNT]: Parameters.UpdateMoneyRequestParams;
     [WRITE_COMMANDS.UPDATE_MONEY_REQUEST_TAX_RATE]: Parameters.UpdateMoneyRequestParams;
     [WRITE_COMMANDS.UPDATE_MONEY_REQUEST_DISTANCE]: Parameters.UpdateMoneyRequestParams;
+    [WRITE_COMMANDS.UPDATE_MONEY_REQUEST_DISTANCE_RATE]: Parameters.UpdateMoneyRequestParams;
     [WRITE_COMMANDS.UPDATE_MONEY_REQUEST_CATEGORY]: Parameters.UpdateMoneyRequestParams;
     [WRITE_COMMANDS.UPDATE_MONEY_REQUEST_DESCRIPTION]: Parameters.UpdateMoneyRequestParams;
     [WRITE_COMMANDS.HOLD_MONEY_REQUEST]: Parameters.HoldMoneyRequestParams;
@@ -376,6 +519,7 @@ type WriteCommandParameters = {
     [WRITE_COMMANDS.SEND_MONEY_ELSEWHERE]: Parameters.SendMoneyParams;
     [WRITE_COMMANDS.SEND_MONEY_WITH_WALLET]: Parameters.SendMoneyParams;
     [WRITE_COMMANDS.APPROVE_MONEY_REQUEST]: Parameters.ApproveMoneyRequestParams;
+    [WRITE_COMMANDS.UNAPPROVE_EXPENSE_REPORT]: Parameters.UnapproveExpenseReportParams;
     [WRITE_COMMANDS.EDIT_MONEY_REQUEST]: Parameters.EditMoneyRequestParams;
     [WRITE_COMMANDS.REPLACE_RECEIPT]: Parameters.ReplaceReceiptParams;
     [WRITE_COMMANDS.SUBMIT_REPORT]: Parameters.SubmitReportParams;
@@ -385,7 +529,6 @@ type WriteCommandParameters = {
     [WRITE_COMMANDS.CANCEL_PAYMENT]: Parameters.CancelPaymentParams;
     [WRITE_COMMANDS.ACCEPT_ACH_CONTRACT_FOR_BANK_ACCOUNT]: Parameters.AcceptACHContractForBankAccount;
     [WRITE_COMMANDS.UPDATE_WORKSPACE_DESCRIPTION]: Parameters.UpdateWorkspaceDescriptionParams;
-    [WRITE_COMMANDS.SET_WORKSPACE_AUTO_REPORTING]: Parameters.SetWorkspaceAutoReportingParams;
     [WRITE_COMMANDS.SET_WORKSPACE_AUTO_REPORTING_FREQUENCY]: Parameters.SetWorkspaceAutoReportingFrequencyParams;
     [WRITE_COMMANDS.SET_WORKSPACE_AUTO_REPORTING_MONTHLY_OFFSET]: Parameters.SetWorkspaceAutoReportingMonthlyOffsetParams;
     [WRITE_COMMANDS.SET_WORKSPACE_APPROVAL_MODE]: Parameters.SetWorkspaceApprovalModeParams;
@@ -400,6 +543,10 @@ type WriteCommandParameters = {
     [WRITE_COMMANDS.ENABLE_POLICY_TAXES]: Parameters.EnablePolicyTaxesParams;
     [WRITE_COMMANDS.ENABLE_POLICY_WORKFLOWS]: Parameters.EnablePolicyWorkflowsParams;
     [WRITE_COMMANDS.ENABLE_POLICY_REPORT_FIELDS]: Parameters.EnablePolicyReportFieldsParams;
+    [WRITE_COMMANDS.ENABLE_POLICY_EXPENSIFY_CARDS]: Parameters.EnablePolicyExpensifyCardsParams;
+    [WRITE_COMMANDS.ENABLE_POLICY_COMPANY_CARDS]: Parameters.EnablePolicyCompanyCardsParams;
+    [WRITE_COMMANDS.ENABLE_POLICY_INVOICING]: Parameters.EnablePolicyInvoicingParams;
+    [WRITE_COMMANDS.SET_POLICY_RULES_ENABLED]: Parameters.SetPolicyRulesEnabledParams;
     [WRITE_COMMANDS.JOIN_POLICY_VIA_INVITE_LINK]: Parameters.JoinPolicyInviteLinkParams;
     [WRITE_COMMANDS.ACCEPT_JOIN_REQUEST]: Parameters.AcceptJoinRequestParams;
     [WRITE_COMMANDS.DECLINE_JOIN_REQUEST]: Parameters.DeclineJoinRequestParams;
@@ -414,28 +561,158 @@ type WriteCommandParameters = {
     [WRITE_COMMANDS.REQUEST_WORKSPACE_OWNER_CHANGE]: Parameters.RequestWorkspaceOwnerChangeParams;
     [WRITE_COMMANDS.ADD_BILLING_CARD_AND_REQUEST_WORKSPACE_OWNER_CHANGE]: Parameters.AddBillingCardAndRequestWorkspaceOwnerChangeParams;
     [WRITE_COMMANDS.RENAME_POLICY_TAX]: Parameters.RenamePolicyTaxParams;
+    [WRITE_COMMANDS.UPDATE_POLICY_TAX_CODE]: Parameters.UpdatePolicyTaxCodeParams;
     [WRITE_COMMANDS.SET_POLICY_DISTANCE_RATES_UNIT]: Parameters.SetPolicyDistanceRatesUnitParams;
     [WRITE_COMMANDS.SET_POLICY_DISTANCE_RATES_DEFAULT_CATEGORY]: Parameters.SetPolicyDistanceRatesDefaultCategoryParams;
-
-    // eslint-disable-next-line @typescript-eslint/no-explicit-any
+    [WRITE_COMMANDS.ENABLE_DISTANCE_REQUEST_TAX]: Parameters.SetPolicyDistanceRatesDefaultCategoryParams;
+    [WRITE_COMMANDS.REPORT_EXPORT]: Parameters.ReportExportParams;
+    [WRITE_COMMANDS.MARK_AS_EXPORTED]: Parameters.MarkAsExportedParams;
+    [WRITE_COMMANDS.REQUEST_EXPENSIFY_CARD_LIMIT_INCREASE]: Parameters.RequestExpensifyCardLimitIncreaseParams;
+    [WRITE_COMMANDS.CLEAR_OUTSTANDING_BALANCE]: null;
+    [WRITE_COMMANDS.CANCEL_BILLING_SUBSCRIPTION]: Parameters.CancelBillingSubscriptionParams;
+    [WRITE_COMMANDS.SET_POLICY_RULES_ENABLED]: Parameters.SetPolicyRulesEnabledParams;
+    [WRITE_COMMANDS.SET_POLICY_EXPENSE_MAX_AMOUNT_NO_RECEIPT]: Parameters.SetPolicyExpenseMaxAmountNoReceipt;
+    [WRITE_COMMANDS.SET_POLICY_EXPENSE_MAX_AMOUNT]: Parameters.SetPolicyExpenseMaxAmount;
+    [WRITE_COMMANDS.SET_POLICY_EXPENSE_MAX_AGE]: Parameters.SetPolicyExpenseMaxAge;
+    [WRITE_COMMANDS.SET_POLICY_BILLABLE_MODE]: Parameters.SetPolicyBillableMode;
+    [WRITE_COMMANDS.SET_WORKSPACE_ERECEIPTS_ENABLED]: Parameters.SetWorkspaceEReceiptsEnabled;
+    [WRITE_COMMANDS.UPDATE_QUICKBOOKS_ONLINE_ENABLE_NEW_CATEGORIES]: Parameters.UpdateQuickbooksOnlineGenericTypeParams;
+    [WRITE_COMMANDS.UPDATE_QUICKBOOKS_ONLINE_AUTO_CREATE_VENDOR]: Parameters.UpdateQuickbooksOnlineGenericTypeParams;
+    [WRITE_COMMANDS.UPDATE_QUICKBOOKS_ONLINE_REIMBURSABLE_EXPENSES_ACCOUNT]: Parameters.UpdateQuickbooksOnlineGenericTypeParams;
     [WRITE_COMMANDS.UPDATE_POLICY_CONNECTION_CONFIG]: Parameters.UpdatePolicyConnectionConfigParams;
+    [WRITE_COMMANDS.UPDATE_MANY_POLICY_CONNECTION_CONFIGS]: Parameters.UpdateManyPolicyConnectionConfigurationsParams;
     [WRITE_COMMANDS.REMOVE_POLICY_CONNECTION]: Parameters.RemovePolicyConnectionParams;
     [WRITE_COMMANDS.UPDATE_POLICY_DISTANCE_RATE_VALUE]: Parameters.UpdatePolicyDistanceRateValueParams;
+    [WRITE_COMMANDS.UPDATE_POLICY_DISTANCE_TAX_RATE_VALUE]: Parameters.UpdatePolicyDistanceRateValueParams;
+    [WRITE_COMMANDS.UPDATE_DISTANCE_TAX_CLAIMABLE_VALUE]: Parameters.UpdatePolicyDistanceRateValueParams;
     [WRITE_COMMANDS.SET_POLICY_DISTANCE_RATES_ENABLED]: Parameters.SetPolicyDistanceRatesEnabledParams;
     [WRITE_COMMANDS.DELETE_POLICY_DISTANCE_RATES]: Parameters.DeletePolicyDistanceRatesParams;
     [WRITE_COMMANDS.DISMISS_TRACK_EXPENSE_ACTIONABLE_WHISPER]: Parameters.DismissTrackExpenseActionableWhisperParams;
+    [WRITE_COMMANDS.UPDATE_BILLING_CARD_CURRENCY]: Parameters.UpdateBillingCurrencyParams;
     [WRITE_COMMANDS.CONVERT_TRACKED_EXPENSE_TO_REQUEST]: Parameters.ConvertTrackedExpenseToRequestParams;
     [WRITE_COMMANDS.CATEGORIZE_TRACKED_EXPENSE]: Parameters.CategorizeTrackedExpenseParams;
     [WRITE_COMMANDS.SHARE_TRACKED_EXPENSE]: Parameters.ShareTrackedExpenseParams;
     [WRITE_COMMANDS.LEAVE_POLICY]: Parameters.LeavePolicyParams;
-    [WRITE_COMMANDS.ACCEPT_SPOTNANA_TERMS]: EmptyObject;
+    [WRITE_COMMANDS.DISMISS_VIOLATION]: Parameters.DismissViolationParams;
+    [WRITE_COMMANDS.ACCEPT_SPOTNANA_TERMS]: null;
     [WRITE_COMMANDS.SEND_INVOICE]: Parameters.SendInvoiceParams;
+    [WRITE_COMMANDS.PAY_INVOICE]: Parameters.PayInvoiceParams;
+    [WRITE_COMMANDS.MARK_AS_CASH]: Parameters.MarkAsCashParams;
+    [WRITE_COMMANDS.TRANSACTION_MERGE]: Parameters.TransactionMergeParams;
+    [WRITE_COMMANDS.UPDATE_SUBSCRIPTION_TYPE]: Parameters.UpdateSubscriptionTypeParams;
+    [WRITE_COMMANDS.SIGN_UP_USER]: Parameters.SignUpUserParams;
+    [WRITE_COMMANDS.UPDATE_SUBSCRIPTION_AUTO_RENEW]: Parameters.UpdateSubscriptionAutoRenewParams;
+    [WRITE_COMMANDS.UPDATE_SUBSCRIPTION_ADD_NEW_USERS_AUTOMATICALLY]: Parameters.UpdateSubscriptionAddNewUsersAutomaticallyParams;
+    [WRITE_COMMANDS.UPDATE_SUBSCRIPTION_SIZE]: Parameters.UpdateSubscriptionSizeParams;
+    [WRITE_COMMANDS.REQUEST_TAX_EXEMPTION]: null;
+
+    [WRITE_COMMANDS.DELETE_MONEY_REQUEST_ON_SEARCH]: Parameters.DeleteMoneyRequestOnSearchParams;
+    [WRITE_COMMANDS.HOLD_MONEY_REQUEST_ON_SEARCH]: Parameters.HoldMoneyRequestOnSearchParams;
+    [WRITE_COMMANDS.UNHOLD_MONEY_REQUEST_ON_SEARCH]: Parameters.UnholdMoneyRequestOnSearchParams;
+
+    [WRITE_COMMANDS.REQUEST_REFUND]: null;
+    [WRITE_COMMANDS.CONNECT_POLICY_TO_SAGE_INTACCT]: Parameters.ConnectPolicyToSageIntacctParams;
+    [WRITE_COMMANDS.COPY_EXISTING_POLICY_CONNECTION]: Parameters.CopyExistingPolicyConnectionParams;
+    [WRITE_COMMANDS.UPDATE_SAGE_INTACCT_EXPORTER]: Parameters.UpdateSageIntacctGenericTypeParams<'email', string>;
+    [WRITE_COMMANDS.UPDATE_SAGE_INTACCT_EXPORT_DATE]: Parameters.UpdateSageIntacctGenericTypeParams<'value', string>;
+    [WRITE_COMMANDS.UPDATE_SAGE_INTACCT_REIMBURSABLE_EXPENSES_EXPORT_DESTINATION]: Parameters.UpdateSageIntacctGenericTypeParams<'value', string>;
+    [WRITE_COMMANDS.UPDATE_SAGE_INTACCT_NON_REIMBURSABLE_EXPENSES_EXPORT_DESTINATION]: Parameters.UpdateSageIntacctGenericTypeParams<'value', string>;
+    [WRITE_COMMANDS.UPDATE_SAGE_INTACCT_REIMBURSABLE_EXPENSES_REPORT_EXPORT_DEFAULT_VENDOR]: Parameters.UpdateSageIntacctGenericTypeParams<'vendorID', string>;
+    [WRITE_COMMANDS.UPDATE_SAGE_INTACCT_NON_REIMBURSABLE_EXPENSES_CREDIT_CARD_CHARGE_EXPORT_DEFAULT_VENDOR]: Parameters.UpdateSageIntacctGenericTypeParams<'vendorID', string>;
+    [WRITE_COMMANDS.UPDATE_SAGE_INTACCT_NON_REIMBURSABLE_EXPENSES_EXPORT_ACCOUNT]: Parameters.UpdateSageIntacctGenericTypeParams<'creditCardAccountID', string>;
+    [WRITE_COMMANDS.UPDATE_SAGE_INTACCT_NON_REIMBURSABLE_EXPENSES_EXPORT_VENDOR]: Parameters.UpdateSageIntacctGenericTypeParams<'vendorID', string>;
+    [WRITE_COMMANDS.UPDATE_SAGE_INTACCT_AUTO_SYNC]: Parameters.UpdateSageIntacctGenericTypeParams<'enabled', boolean>;
+    [WRITE_COMMANDS.UPDATE_SAGE_INTACCT_IMPORT_EMPLOYEES]: Parameters.UpdateSageIntacctGenericTypeParams<'enabled', boolean>;
+    [WRITE_COMMANDS.UPDATE_SAGE_INTACCT_APPROVAL_MODE]: Parameters.UpdateSageIntacctGenericTypeParams<'value', string>;
+    [WRITE_COMMANDS.UPDATE_SAGE_INTACCT_SYNC_REIMBURSED_REPORTS]: Parameters.UpdateSageIntacctGenericTypeParams<'enabled', boolean>;
+    [WRITE_COMMANDS.UPDATE_SAGE_INTACCT_SYNC_REIMBURSEMENT_ACCOUNT_ID]: Parameters.UpdateSageIntacctGenericTypeParams<'vendorID', string>;
+
+    [WRITE_COMMANDS.UPGRADE_TO_CORPORATE]: Parameters.UpgradeToCorporateParams;
+
+    // Netsuite parameters
+    [WRITE_COMMANDS.UPDATE_NETSUITE_SUBSIDIARY]: Parameters.UpdateNetSuiteSubsidiaryParams;
+    [WRITE_COMMANDS.CONNECT_POLICY_TO_NETSUITE]: Parameters.ConnectPolicyToNetSuiteParams;
+
+    // Workspace report field parameters
+    [WRITE_COMMANDS.CREATE_WORKSPACE_REPORT_FIELD]: Parameters.CreateWorkspaceReportFieldParams;
+    [WRITE_COMMANDS.UPDATE_WORKSPACE_REPORT_FIELD_INITIAL_VALUE]: Parameters.UpdateWorkspaceReportFieldInitialValueParams;
+    [WRITE_COMMANDS.ENABLE_WORKSPACE_REPORT_FIELD_LIST_VALUE]: Parameters.EnableWorkspaceReportFieldListValueParams;
+    [WRITE_COMMANDS.CREATE_WORKSPACE_REPORT_FIELD_LIST_VALUE]: Parameters.CreateWorkspaceReportFieldListValueParams;
+    [WRITE_COMMANDS.REMOVE_WORKSPACE_REPORT_FIELD_LIST_VALUE]: Parameters.RemoveWorkspaceReportFieldListValueParams;
+
+    [WRITE_COMMANDS.UPDATE_NETSUITE_SYNC_TAX_CONFIGURATION]: Parameters.UpdateNetSuiteGenericTypeParams<'enabled', boolean>;
+    [WRITE_COMMANDS.UPDATE_NETSUITE_CROSS_SUBSIDIARY_CUSTOMER_CONFIGURATION]: Parameters.UpdateNetSuiteGenericTypeParams<'enabled', boolean>;
+    [WRITE_COMMANDS.UPDATE_NETSUITE_DEPARTMENTS_MAPPING]: Parameters.UpdateNetSuiteGenericTypeParams<'mapping', ValueOf<typeof CONST.INTEGRATION_ENTITY_MAP_TYPES>>;
+    [WRITE_COMMANDS.UPDATE_NETSUITE_CLASSES_MAPPING]: Parameters.UpdateNetSuiteGenericTypeParams<'mapping', ValueOf<typeof CONST.INTEGRATION_ENTITY_MAP_TYPES>>;
+    [WRITE_COMMANDS.UPDATE_NETSUITE_LOCATIONS_MAPPING]: Parameters.UpdateNetSuiteGenericTypeParams<'mapping', ValueOf<typeof CONST.INTEGRATION_ENTITY_MAP_TYPES>>;
+    [WRITE_COMMANDS.UPDATE_NETSUITE_CUSTOMERS_MAPPING]: Parameters.UpdateNetSuiteGenericTypeParams<'mapping', ValueOf<typeof CONST.INTEGRATION_ENTITY_MAP_TYPES>>;
+    [WRITE_COMMANDS.UPDATE_NETSUITE_JOBS_MAPPING]: Parameters.UpdateNetSuiteGenericTypeParams<'mapping', ValueOf<typeof CONST.INTEGRATION_ENTITY_MAP_TYPES>>;
+    [WRITE_COMMANDS.UPDATE_NETSUITE_CUSTOMERS_JOBS_MAPPING]: Parameters.UpdateNetSuiteCustomersJobsParams;
+    [WRITE_COMMANDS.UPDATE_NETSUITE_EXPORTER]: Parameters.UpdateNetSuiteGenericTypeParams<'email', string>;
+    [WRITE_COMMANDS.UPDATE_NETSUITE_EXPORT_DATE]: Parameters.UpdateNetSuiteGenericTypeParams<'value', ValueOf<typeof CONST.NETSUITE_EXPORT_DATE>>;
+    [WRITE_COMMANDS.UPDATE_NETSUITE_REIMBURSABLE_EXPENSES_EXPORT_DESTINATION]: Parameters.UpdateNetSuiteGenericTypeParams<'value', ValueOf<typeof CONST.NETSUITE_EXPORT_DESTINATION>>;
+    [WRITE_COMMANDS.UPDATE_NETSUITE_NONREIMBURSABLE_EXPENSES_EXPORT_DESTINATION]: Parameters.UpdateNetSuiteGenericTypeParams<'value', ValueOf<typeof CONST.NETSUITE_EXPORT_DESTINATION>>;
+    [WRITE_COMMANDS.UPDATE_NETSUITE_DEFAULT_VENDOR]: Parameters.UpdateNetSuiteGenericTypeParams<'vendorID', string>;
+    [WRITE_COMMANDS.UPDATE_NETSUITE_REIMBURSABLE_PAYABLE_ACCOUNT]: Parameters.UpdateNetSuiteGenericTypeParams<'bankAccountID', string>;
+    [WRITE_COMMANDS.UPDATE_NETSUITE_PAYABLE_ACCT]: Parameters.UpdateNetSuiteGenericTypeParams<'bankAccountID', string>;
+    [WRITE_COMMANDS.UPDATE_NETSUITE_JOURNAL_POSTING_PREFERENCE]: Parameters.UpdateNetSuiteGenericTypeParams<'value', ValueOf<typeof CONST.NETSUITE_JOURNAL_POSTING_PREFERENCE>>;
+    [WRITE_COMMANDS.UPDATE_NETSUITE_RECEIVABLE_ACCOUNT]: Parameters.UpdateNetSuiteGenericTypeParams<'bankAccountID', string>;
+    [WRITE_COMMANDS.UPDATE_NETSUITE_INVOICE_ITEM_PREFERENCE]: Parameters.UpdateNetSuiteGenericTypeParams<'value', ValueOf<typeof CONST.NETSUITE_INVOICE_ITEM_PREFERENCE>>;
+    [WRITE_COMMANDS.UPDATE_NETSUITE_INVOICE_ITEM]: Parameters.UpdateNetSuiteGenericTypeParams<'itemID', string>;
+    [WRITE_COMMANDS.UPDATE_NETSUITE_PROVINCIAL_TAX_POSTING_ACCOUNT]: Parameters.UpdateNetSuiteGenericTypeParams<'bankAccountID', string>;
+    [WRITE_COMMANDS.UPDATE_NETSUITE_TAX_POSTING_ACCOUNT]: Parameters.UpdateNetSuiteGenericTypeParams<'bankAccountID', string>;
+    [WRITE_COMMANDS.UPDATE_NETSUITE_ALLOW_FOREIGN_CURRENCY]: Parameters.UpdateNetSuiteGenericTypeParams<'enabled', boolean>;
+    [WRITE_COMMANDS.UPDATE_NETSUITE_EXPORT_TO_NEXT_OPEN_PERIOD]: Parameters.UpdateNetSuiteGenericTypeParams<'enabled', boolean>;
+    [WRITE_COMMANDS.UPDATE_NETSUITE_CUSTOM_SEGMENTS]: Parameters.UpdateNetSuiteGenericTypeParams<'customSegments', string>; // JSON string NetSuiteCustomSegment[]
+    [WRITE_COMMANDS.UPDATE_NETSUITE_CUSTOM_LISTS]: Parameters.UpdateNetSuiteGenericTypeParams<'customLists', string>; // JSON string NetSuiteCustomList[]
+    [WRITE_COMMANDS.UPDATE_NETSUITE_AUTO_SYNC]: Parameters.UpdateNetSuiteGenericTypeParams<'enabled', boolean>;
+    [WRITE_COMMANDS.UPDATE_NETSUITE_SYNC_REIMBURSED_REPORTS]: Parameters.UpdateNetSuiteGenericTypeParams<'enabled', boolean>;
+    [WRITE_COMMANDS.UPDATE_NETSUITE_SYNC_PEOPLE]: Parameters.UpdateNetSuiteGenericTypeParams<'enabled', boolean>;
+    [WRITE_COMMANDS.UPDATE_NETSUITE_AUTO_CREATE_ENTITIES]: Parameters.UpdateNetSuiteGenericTypeParams<'enabled', boolean>;
+    [WRITE_COMMANDS.UPDATE_NETSUITE_ENABLE_NEW_CATEGORIES]: Parameters.UpdateNetSuiteGenericTypeParams<'enabled', boolean>;
+    [WRITE_COMMANDS.UPDATE_NETSUITE_CUSTOM_FORM_ID_OPTIONS_ENABLED]: Parameters.UpdateNetSuiteGenericTypeParams<'enabled', boolean>;
+    [WRITE_COMMANDS.UPDATE_NETSUITE_REIMBURSEMENT_ACCOUNT_ID]: Parameters.UpdateNetSuiteGenericTypeParams<'bankAccountID', string>;
+    [WRITE_COMMANDS.UPDATE_NETSUITE_COLLECTION_ACCOUNT]: Parameters.UpdateNetSuiteGenericTypeParams<'bankAccountID', string>;
+    [WRITE_COMMANDS.UPDATE_NETSUITE_EXPORT_REPORTS_TO]: Parameters.UpdateNetSuiteGenericTypeParams<'value', ValueOf<typeof CONST.NETSUITE_REPORTS_APPROVAL_LEVEL>>;
+    [WRITE_COMMANDS.UPDATE_NETSUITE_VENDOR_BILLS_TO]: Parameters.UpdateNetSuiteGenericTypeParams<'value', ValueOf<typeof CONST.NETSUITE_VENDOR_BILLS_APPROVAL_LEVEL>>;
+    [WRITE_COMMANDS.UPDATE_NETSUITE_JOURNALS_TO]: Parameters.UpdateNetSuiteGenericTypeParams<'value', ValueOf<typeof CONST.NETSUITE_JOURNALS_APPROVAL_LEVEL>>;
+    [WRITE_COMMANDS.UPDATE_NETSUITE_APPROVAL_ACCOUNT]: Parameters.UpdateNetSuiteGenericTypeParams<'value', string>;
+    [WRITE_COMMANDS.UPDATE_NETSUITE_CUSTOM_FORM_ID_OPTIONS_REIMBURSABLE]: Parameters.UpdateNetSuiteCustomFormIDParams;
+    [WRITE_COMMANDS.UPDATE_NETSUITE_CUSTOM_FORM_ID_OPTIONS_NON_REIMBURSABLE]: Parameters.UpdateNetSuiteCustomFormIDParams;
+    [WRITE_COMMANDS.UPDATE_SAGE_INTACCT_ENTITY]: Parameters.UpdateSageIntacctGenericTypeParams<'entity', string>;
+    [WRITE_COMMANDS.UPDATE_SAGE_INTACCT_BILLABLE]: Parameters.UpdateSageIntacctGenericTypeParams<'enabled', boolean>;
+    [WRITE_COMMANDS.UPDATE_SAGE_INTACCT_DEPARTMENT_MAPPING]: Parameters.UpdateSageIntacctGenericTypeParams<'mapping', SageIntacctMappingValue>;
+    [WRITE_COMMANDS.UPDATE_SAGE_INTACCT_CLASSES_MAPPING]: Parameters.UpdateSageIntacctGenericTypeParams<'mapping', SageIntacctMappingValue>;
+    [WRITE_COMMANDS.UPDATE_SAGE_INTACCT_LOCATIONS_MAPPING]: Parameters.UpdateSageIntacctGenericTypeParams<'mapping', SageIntacctMappingValue>;
+    [WRITE_COMMANDS.UPDATE_SAGE_INTACCT_CUSTOMERS_MAPPING]: Parameters.UpdateSageIntacctGenericTypeParams<'mapping', SageIntacctMappingValue>;
+    [WRITE_COMMANDS.UPDATE_SAGE_INTACCT_PROJECTS_MAPPING]: Parameters.UpdateSageIntacctGenericTypeParams<'mapping', SageIntacctMappingValue>;
+    [WRITE_COMMANDS.UPDATE_SAGE_INTACCT_SYNC_TAX_CONFIGURATION]: Parameters.UpdateSageIntacctGenericTypeParams<'enabled', boolean>;
+    [WRITE_COMMANDS.UPDATE_SAGE_INTACCT_USER_DIMENSION]: Parameters.UpdateSageIntacctGenericTypeParams<'dimensions', string>;
+    [WRITE_COMMANDS.EXPORT_SEARCH_ITEMS_TO_CSV]: Parameters.ExportSearchItemsToCSVParams;
+    [WRITE_COMMANDS.CREATE_WORKSPACE_APPROVAL]: Parameters.CreateWorkspaceApprovalParams;
+    [WRITE_COMMANDS.UPDATE_WORKSPACE_APPROVAL]: Parameters.UpdateWorkspaceApprovalParams;
+    [WRITE_COMMANDS.REMOVE_WORKSPACE_APPROVAL]: Parameters.RemoveWorkspaceApprovalParams;
+    [WRITE_COMMANDS.CONFIGURE_EXPENSIFY_CARDS_FOR_POLICY]: Parameters.ConfigureExpensifyCardsForPolicyParams;
+    [WRITE_COMMANDS.CREATE_EXPENSIFY_CARD]: Parameters.CreateExpensifyCardParams;
+    [WRITE_COMMANDS.CREATE_ADMIN_ISSUED_VIRTUAL_CARD]: Omit<Parameters.CreateExpensifyCardParams, 'feedCountry'>;
+    [WRITE_COMMANDS.TOGGLE_CARD_CONTINUOUS_RECONCILIATION]: Parameters.ToggleCardContinuousReconciliationParams;
+    [WRITE_COMMANDS.UPDATE_CARD_SETTLEMENT_FREQUENCY]: Parameters.UpdateCardSettlementFrequencyParams;
+    [WRITE_COMMANDS.UPDATE_CARD_SETTLEMENT_ACCOUNT]: Parameters.UpdateCardSettlementAccountParams;
+
+    // Xero API
+    [WRITE_COMMANDS.UPDATE_XERO_TENANT_ID]: Parameters.UpdateXeroGenericTypeParams;
+    [WRITE_COMMANDS.UPDATE_XERO_IMPORT_TAX_RATES]: Parameters.UpdateXeroGenericTypeParams;
+    [WRITE_COMMANDS.UPDATE_XERO_MAPPING]: Parameters.UpdateXeroGenericTypeParams;
+    [WRITE_COMMANDS.UPDATE_XERO_IMPORT_TRACKING_CATEGORIES]: Parameters.UpdateXeroGenericTypeParams;
 };
 
 const READ_COMMANDS = {
     CONNECT_POLICY_TO_QUICKBOOKS_ONLINE: 'ConnectPolicyToQuickbooksOnline',
     CONNECT_POLICY_TO_XERO: 'ConnectPolicyToXero',
     SYNC_POLICY_TO_QUICKBOOKS_ONLINE: 'SyncPolicyToQuickbooksOnline',
+    SYNC_POLICY_TO_XERO: 'SyncPolicyToXero',
+    SYNC_POLICY_TO_NETSUITE: 'SyncPolicyToNetSuite',
+    SYNC_POLICY_TO_SAGE_INTACCT: 'SyncPolicyToSageIntacct',
     OPEN_REIMBURSEMENT_ACCOUNT_PAGE: 'OpenReimbursementAccountPage',
     OPEN_WORKSPACE_VIEW: 'OpenWorkspaceView',
     GET_MAPBOX_ACCESS_TOKEN: 'GetMapboxAccessToken',
@@ -467,13 +744,22 @@ const READ_COMMANDS = {
     OPEN_POLICY_CATEGORIES_PAGE: 'OpenPolicyCategoriesPage',
     OPEN_POLICY_TAGS_PAGE: 'OpenPolicyTagsPage',
     OPEN_POLICY_TAXES_PAGE: 'OpenPolicyTaxesPage',
+    OPEN_POLICY_REPORT_FIELDS_PAGE: 'OpenPolicyReportFieldsPage',
+    OPEN_POLICY_EXPENSIFY_CARDS_PAGE: 'OpenPolicyExpensifyCardsPage',
+    OPEN_POLICY_EDIT_CARD_LIMIT_TYPE_PAGE: 'OpenPolicyEditCardLimitTypePage',
     OPEN_WORKSPACE_INVITE_PAGE: 'OpenWorkspaceInvitePage',
     OPEN_DRAFT_WORKSPACE_REQUEST: 'OpenDraftWorkspaceRequest',
     OPEN_POLICY_WORKFLOWS_PAGE: 'OpenPolicyWorkflowsPage',
     OPEN_POLICY_DISTANCE_RATES_PAGE: 'OpenPolicyDistanceRatesPage',
     OPEN_POLICY_MORE_FEATURES_PAGE: 'OpenPolicyMoreFeaturesPage',
     OPEN_POLICY_ACCOUNTING_PAGE: 'OpenPolicyAccountingPage',
+    OPEN_POLICY_PROFILE_PAGE: 'OpenPolicyProfilePage',
+    OPEN_POLICY_INITIAL_PAGE: 'OpenPolicyInitialPage',
     SEARCH: 'Search',
+    OPEN_SUBSCRIPTION_PAGE: 'OpenSubscriptionPage',
+    OPEN_DRAFT_DISTANCE_EXPENSE: 'OpenDraftDistanceExpense',
+    START_ISSUE_NEW_CARD_FLOW: 'StartIssueNewCardFlow',
+    OPEN_CARD_DETAILS_PAGE: 'OpenCardDetailsPage',
 } as const;
 
 type ReadCommand = ValueOf<typeof READ_COMMANDS>;
@@ -482,11 +768,14 @@ type ReadCommandParameters = {
     [READ_COMMANDS.CONNECT_POLICY_TO_QUICKBOOKS_ONLINE]: Parameters.ConnectPolicyToAccountingIntegrationParams;
     [READ_COMMANDS.CONNECT_POLICY_TO_XERO]: Parameters.ConnectPolicyToAccountingIntegrationParams;
     [READ_COMMANDS.SYNC_POLICY_TO_QUICKBOOKS_ONLINE]: Parameters.SyncPolicyToQuickbooksOnlineParams;
+    [READ_COMMANDS.SYNC_POLICY_TO_XERO]: Parameters.SyncPolicyToXeroParams;
+    [READ_COMMANDS.SYNC_POLICY_TO_NETSUITE]: Parameters.SyncPolicyToNetSuiteParams;
+    [READ_COMMANDS.SYNC_POLICY_TO_SAGE_INTACCT]: Parameters.SyncPolicyToNetSuiteParams;
     [READ_COMMANDS.OPEN_REIMBURSEMENT_ACCOUNT_PAGE]: Parameters.OpenReimbursementAccountPageParams;
     [READ_COMMANDS.OPEN_WORKSPACE_VIEW]: Parameters.OpenWorkspaceViewParams;
-    [READ_COMMANDS.GET_MAPBOX_ACCESS_TOKEN]: EmptyObject;
-    [READ_COMMANDS.OPEN_PAYMENTS_PAGE]: EmptyObject;
-    [READ_COMMANDS.OPEN_PERSONAL_DETAILS]: EmptyObject;
+    [READ_COMMANDS.GET_MAPBOX_ACCESS_TOKEN]: null;
+    [READ_COMMANDS.OPEN_PAYMENTS_PAGE]: null;
+    [READ_COMMANDS.OPEN_PERSONAL_DETAILS]: null;
     [READ_COMMANDS.OPEN_PUBLIC_PROFILE_PAGE]: Parameters.OpenPublicProfilePageParams;
     [READ_COMMANDS.OPEN_PLAID_BANK_LOGIN]: Parameters.OpenPlaidBankLoginParams;
     [READ_COMMANDS.OPEN_PLAID_BANK_ACCOUNT_SELECTOR]: Parameters.OpenPlaidBankAccountSelectorParams;
@@ -501,9 +790,9 @@ type ReadCommandParameters = {
     [READ_COMMANDS.GET_ROUTE]: Parameters.GetRouteParams;
     [READ_COMMANDS.GET_ROUTE_FOR_DRAFT]: Parameters.GetRouteParams;
     [READ_COMMANDS.GET_STATEMENT_PDF]: Parameters.GetStatementPDFParams;
-    [READ_COMMANDS.OPEN_ONFIDO_FLOW]: EmptyObject;
-    [READ_COMMANDS.OPEN_INITIAL_SETTINGS_PAGE]: EmptyObject;
-    [READ_COMMANDS.OPEN_ENABLE_PAYMENTS_PAGE]: EmptyObject;
+    [READ_COMMANDS.OPEN_ONFIDO_FLOW]: null;
+    [READ_COMMANDS.OPEN_INITIAL_SETTINGS_PAGE]: null;
+    [READ_COMMANDS.OPEN_ENABLE_PAYMENTS_PAGE]: null;
     [READ_COMMANDS.BEGIN_SIGNIN]: Parameters.BeginSignInParams;
     [READ_COMMANDS.SIGN_IN_WITH_SHORT_LIVED_AUTH_TOKEN]: Parameters.SignInWithShortLivedAuthTokenParams;
     [READ_COMMANDS.SIGN_IN_WITH_SUPPORT_AUTH_TOKEN]: Parameters.SignInWithSupportAuthTokenParams;
@@ -513,23 +802,39 @@ type ReadCommandParameters = {
     [READ_COMMANDS.OPEN_POLICY_CATEGORIES_PAGE]: Parameters.OpenPolicyCategoriesPageParams;
     [READ_COMMANDS.OPEN_POLICY_TAGS_PAGE]: Parameters.OpenPolicyTagsPageParams;
     [READ_COMMANDS.OPEN_POLICY_TAXES_PAGE]: Parameters.OpenPolicyTaxesPageParams;
+    [READ_COMMANDS.OPEN_POLICY_REPORT_FIELDS_PAGE]: Parameters.OpenPolicyReportFieldsPageParams;
     [READ_COMMANDS.OPEN_WORKSPACE_INVITE_PAGE]: Parameters.OpenWorkspaceInvitePageParams;
     [READ_COMMANDS.OPEN_DRAFT_WORKSPACE_REQUEST]: Parameters.OpenDraftWorkspaceRequestParams;
     [READ_COMMANDS.OPEN_POLICY_WORKFLOWS_PAGE]: Parameters.OpenPolicyWorkflowsPageParams;
     [READ_COMMANDS.OPEN_POLICY_DISTANCE_RATES_PAGE]: Parameters.OpenPolicyDistanceRatesPageParams;
     [READ_COMMANDS.OPEN_POLICY_MORE_FEATURES_PAGE]: Parameters.OpenPolicyMoreFeaturesPageParams;
     [READ_COMMANDS.OPEN_POLICY_ACCOUNTING_PAGE]: Parameters.OpenPolicyAccountingPageParams;
+    [READ_COMMANDS.OPEN_POLICY_EXPENSIFY_CARDS_PAGE]: Parameters.OpenPolicyExpensifyCardsPageParams;
+    [READ_COMMANDS.OPEN_POLICY_EDIT_CARD_LIMIT_TYPE_PAGE]: Parameters.OpenPolicyEditCardLimitTypePageParams;
+    [READ_COMMANDS.OPEN_POLICY_PROFILE_PAGE]: Parameters.OpenPolicyProfilePageParams;
+    [READ_COMMANDS.OPEN_POLICY_INITIAL_PAGE]: Parameters.OpenPolicyInitialPageParams;
     [READ_COMMANDS.SEARCH]: Parameters.SearchParams;
+    [READ_COMMANDS.OPEN_SUBSCRIPTION_PAGE]: null;
+    [READ_COMMANDS.OPEN_DRAFT_DISTANCE_EXPENSE]: null;
+    [READ_COMMANDS.START_ISSUE_NEW_CARD_FLOW]: Parameters.StartIssueNewCardFlowParams;
+    [READ_COMMANDS.OPEN_CARD_DETAILS_PAGE]: Parameters.OpenCardDetailsPageParams;
 };
 
 const SIDE_EFFECT_REQUEST_COMMANDS = {
+    ACCEPT_SPOTNANA_TERMS: 'AcceptSpotnanaTerms',
     AUTHENTICATE_PUSHER: 'AuthenticatePusher',
-    OPEN_REPORT: 'OpenReport',
-    OPEN_OLD_DOT_LINK: 'OpenOldDotLink',
-    REVEAL_EXPENSIFY_CARD_DETAILS: 'RevealExpensifyCardDetails',
+    GENERATE_SPOTNANA_TOKEN: 'GenerateSpotnanaToken',
     GET_MISSING_ONYX_MESSAGES: 'GetMissingOnyxMessages',
     JOIN_POLICY_VIA_INVITE_LINK: 'JoinWorkspaceViaInviteLink',
+    OPEN_OLD_DOT_LINK: 'OpenOldDotLink',
+    OPEN_REPORT: 'OpenReport',
     RECONNECT_APP: 'ReconnectApp',
+    ADD_PAYMENT_CARD_GBP: 'AddPaymentCardGBP',
+    REVEAL_EXPENSIFY_CARD_DETAILS: 'RevealExpensifyCardDetails',
+    SWITCH_TO_OLD_DOT: 'SwitchToOldDot',
+    TWO_FACTOR_AUTH_VALIDATE: 'TwoFactorAuth_Validate',
+    CONNECT_AS_DELEGATE: 'ConnectAsDelegate',
+    DISCONNECT_AS_DELEGATE: 'DisconnectAsDelegate',
 } as const;
 
 type SideEffectRequestCommand = ValueOf<typeof SIDE_EFFECT_REQUEST_COMMANDS>;
@@ -542,10 +847,23 @@ type SideEffectRequestCommandParameters = {
     [SIDE_EFFECT_REQUEST_COMMANDS.GET_MISSING_ONYX_MESSAGES]: Parameters.GetMissingOnyxMessagesParams;
     [SIDE_EFFECT_REQUEST_COMMANDS.JOIN_POLICY_VIA_INVITE_LINK]: Parameters.JoinPolicyInviteLinkParams;
     [SIDE_EFFECT_REQUEST_COMMANDS.RECONNECT_APP]: Parameters.ReconnectAppParams;
+    [SIDE_EFFECT_REQUEST_COMMANDS.GENERATE_SPOTNANA_TOKEN]: Parameters.GenerateSpotnanaTokenParams;
+    [SIDE_EFFECT_REQUEST_COMMANDS.ADD_PAYMENT_CARD_GBP]: Parameters.AddPaymentCardParams;
+    [SIDE_EFFECT_REQUEST_COMMANDS.ACCEPT_SPOTNANA_TERMS]: null;
+    [SIDE_EFFECT_REQUEST_COMMANDS.TWO_FACTOR_AUTH_VALIDATE]: Parameters.ValidateTwoFactorAuthParams;
+    [SIDE_EFFECT_REQUEST_COMMANDS.CONNECT_AS_DELEGATE]: Parameters.ConnectAsDelegateParams;
+    [SIDE_EFFECT_REQUEST_COMMANDS.DISCONNECT_AS_DELEGATE]: EmptyObject;
 };
 
 type ApiRequestCommandParameters = WriteCommandParameters & ReadCommandParameters & SideEffectRequestCommandParameters;
 
 export {WRITE_COMMANDS, READ_COMMANDS, SIDE_EFFECT_REQUEST_COMMANDS};
 
-export type {ApiRequest, ApiRequestCommandParameters, WriteCommand, ReadCommand, SideEffectRequestCommand};
+type ApiCommand = WriteCommand | ReadCommand | SideEffectRequestCommand;
+type CommandOfType<TRequestType extends ApiRequestType> = TRequestType extends typeof CONST.API_REQUEST_TYPE.WRITE
+    ? WriteCommand
+    : TRequestType extends typeof CONST.API_REQUEST_TYPE.READ
+    ? ReadCommand
+    : SideEffectRequestCommand;
+
+export type {ApiCommand, ApiRequestType, ApiRequestCommandParameters, CommandOfType, WriteCommand, ReadCommand, SideEffectRequestCommand};
diff --git a/src/libs/Accessibility/blurActiveElement/index.native.ts b/src/libs/Accessibility/blurActiveElement/index.native.ts
new file mode 100644
index 000000000000..fe84de5dd2bd
--- /dev/null
+++ b/src/libs/Accessibility/blurActiveElement/index.native.ts
@@ -0,0 +1,3 @@
+const blurActiveElement = () => {};
+
+export default blurActiveElement;
diff --git a/src/libs/Accessibility/blurActiveElement/index.ts b/src/libs/Accessibility/blurActiveElement/index.ts
new file mode 100644
index 000000000000..71040ea24623
--- /dev/null
+++ b/src/libs/Accessibility/blurActiveElement/index.ts
@@ -0,0 +1,8 @@
+const blurActiveElement = () => {
+    if (!(document.activeElement instanceof HTMLElement)) {
+        return;
+    }
+    document.activeElement.blur();
+};
+
+export default blurActiveElement;
diff --git a/src/libs/AccountUtils.ts b/src/libs/AccountUtils.ts
index d903584e15b4..b926e20ca59c 100644
--- a/src/libs/AccountUtils.ts
+++ b/src/libs/AccountUtils.ts
@@ -5,4 +5,7 @@ import type {Account} from '@src/types/onyx';
 const isValidateCodeFormSubmitting = (account: OnyxEntry<Account>) =>
     !!account?.isLoading && account.loadingForm === (account.requiresTwoFactorAuth ? CONST.FORMS.VALIDATE_TFA_CODE_FORM : CONST.FORMS.VALIDATE_CODE_FORM);
 
-export default {isValidateCodeFormSubmitting};
+/** Whether the accound ID is an odd number, useful for A/B testing. */
+const isAccountIDOddNumber = (accountID: number) => accountID % 2 === 1;
+
+export default {isValidateCodeFormSubmitting, isAccountIDOddNumber};
diff --git a/src/libs/AccountingUtils.ts b/src/libs/AccountingUtils.ts
new file mode 100644
index 000000000000..fe472752978a
--- /dev/null
+++ b/src/libs/AccountingUtils.ts
@@ -0,0 +1,27 @@
+import type {ValueOf} from 'type-fest';
+import CONST from '@src/CONST';
+import type {ConnectionName} from '@src/types/onyx/Policy';
+
+const ROUTE_NAME_MAPPING = {
+    [CONST.POLICY.CONNECTIONS.ROUTE.QBO]: CONST.POLICY.CONNECTIONS.NAME.QBO,
+    [CONST.POLICY.CONNECTIONS.ROUTE.XERO]: CONST.POLICY.CONNECTIONS.NAME.XERO,
+    [CONST.POLICY.CONNECTIONS.ROUTE.SAGE_INTACCT]: CONST.POLICY.CONNECTIONS.NAME.SAGE_INTACCT,
+    [CONST.POLICY.CONNECTIONS.ROUTE.NETSUITE]: CONST.POLICY.CONNECTIONS.NAME.NETSUITE,
+};
+
+const NAME_ROUTE_MAPPING = {
+    [CONST.POLICY.CONNECTIONS.NAME.QBO]: CONST.POLICY.CONNECTIONS.ROUTE.QBO,
+    [CONST.POLICY.CONNECTIONS.NAME.XERO]: CONST.POLICY.CONNECTIONS.ROUTE.XERO,
+    [CONST.POLICY.CONNECTIONS.NAME.SAGE_INTACCT]: CONST.POLICY.CONNECTIONS.ROUTE.SAGE_INTACCT,
+    [CONST.POLICY.CONNECTIONS.NAME.NETSUITE]: CONST.POLICY.CONNECTIONS.ROUTE.NETSUITE,
+};
+
+function getConnectionNameFromRouteParam(routeParam: ValueOf<typeof CONST.POLICY.CONNECTIONS.ROUTE>) {
+    return ROUTE_NAME_MAPPING[routeParam];
+}
+
+function getRouteParamForConnection(connectionName: ConnectionName) {
+    return NAME_ROUTE_MAPPING[connectionName];
+}
+
+export {getConnectionNameFromRouteParam, getRouteParamForConnection};
diff --git a/src/libs/ActiveClientManager/index.ts b/src/libs/ActiveClientManager/index.ts
index e703ce0458f4..e93cdb07d084 100644
--- a/src/libs/ActiveClientManager/index.ts
+++ b/src/libs/ActiveClientManager/index.ts
@@ -3,7 +3,7 @@
  * only one tab is processing those saved requests or we would be duplicating data (or creating errors).
  * This file ensures exactly that by tracking all the clientIDs connected, storing the most recent one last and it considers that last clientID the "leader".
  */
-import Str from 'expensify-common/lib/str';
+import {Str} from 'expensify-common';
 import Onyx from 'react-native-onyx';
 import * as ActiveClients from '@userActions/ActiveClients';
 import ONYXKEYS from '@src/ONYXKEYS';
@@ -45,6 +45,34 @@ Onyx.connect({
     },
 });
 
+let isPromotingNewLeader = false;
+
+/**
+ * The last GUID is the most recent GUID, so that should be the leader
+ */
+const isClientTheLeader: IsClientTheLeader = () => {
+    /**
+     * When a new leader is being promoted, there is a brief period during which the current leader's clientID
+     * is removed from the activeClients list due to asynchronous operations, but the new leader has not officially
+     * taken over yet. This can result in a situation where, upon page refresh, multiple leaders are being reported.
+     * This early return statement here will prevent that from happening by maintaining the current leader as
+     * the 'active leader' until the other leader is fully promoted.
+     */
+    if (isPromotingNewLeader) {
+        return true;
+    }
+
+    const lastActiveClient = activeClients.length && activeClients[activeClients.length - 1];
+
+    return lastActiveClient === clientID;
+};
+
+const cleanUpClientId = () => {
+    isPromotingNewLeader = isClientTheLeader();
+    activeClients = activeClients.filter((id) => id !== clientID);
+    ActiveClients.setActiveClients(activeClients);
+};
+
 /**
  * Add our client ID to the list of active IDs.
  * We want to ensure we have no duplicates and that the activeClient gets added at the end of the array (see isClientTheLeader)
@@ -53,15 +81,8 @@ const init: Init = () => {
     activeClients = activeClients.filter((id) => id !== clientID);
     activeClients.push(clientID);
     ActiveClients.setActiveClients(activeClients).then(resolveSavedSelfPromise);
-};
 
-/**
- * The last GUID is the most recent GUID, so that should be the leader
- */
-const isClientTheLeader: IsClientTheLeader = () => {
-    const lastActiveClient = activeClients.length && activeClients[activeClients.length - 1];
-
-    return lastActiveClient === clientID;
+    window.addEventListener('beforeunload', cleanUpClientId);
 };
 
 export {init, isClientTheLeader, isReady};
diff --git a/src/libs/BankAccountUtils.ts b/src/libs/BankAccountUtils.ts
index a7fbc5f3bd4e..7088b01f83f9 100644
--- a/src/libs/BankAccountUtils.ts
+++ b/src/libs/BankAccountUtils.ts
@@ -1,9 +1,14 @@
-import Str from 'expensify-common/lib/str';
 import type {OnyxEntry} from 'react-native-onyx';
 import type * as OnyxTypes from '@src/types/onyx';
 
+// eslint-disable-next-line @typescript-eslint/no-unused-vars
 function getDefaultCompanyWebsite(session: OnyxEntry<OnyxTypes.Session>, user: OnyxEntry<OnyxTypes.User>): string {
-    return user?.isFromPublicDomain ? 'https://' : `https://www.${Str.extractEmailDomain(session?.email ?? '')}`;
+    // temporarily always return https:// to fix https://github.com/Expensify/App/issues/47227 until https://github.com/Expensify/App/issues/45278 is resolved.
+    return 'https://';
 }
-// eslint-disable-next-line import/prefer-default-export
-export {getDefaultCompanyWebsite};
+
+function getLastFourDigits(bankAccountNumber: string): string {
+    return bankAccountNumber ? bankAccountNumber.slice(-4) : '';
+}
+
+export {getDefaultCompanyWebsite, getLastFourDigits};
diff --git a/src/libs/Browser/index.ts b/src/libs/Browser/index.ts
index 9569d3583809..aeec4f4def4a 100644
--- a/src/libs/Browser/index.ts
+++ b/src/libs/Browser/index.ts
@@ -1,4 +1,4 @@
-import type {GetBrowser, IsMobile, IsMobileChrome, IsMobileSafari, IsSafari, OpenRouteInDesktopApp} from './types';
+import type {GetBrowser, IsChromeIOS, IsMobile, IsMobileChrome, IsMobileSafari, IsMobileWebKit, IsSafari, OpenRouteInDesktopApp} from './types';
 
 const getBrowser: GetBrowser = () => '';
 
@@ -8,8 +8,12 @@ const isMobileSafari: IsMobileSafari = () => false;
 
 const isMobileChrome: IsMobileChrome = () => false;
 
+const isMobileWebKit: IsMobileWebKit = () => false;
+
+const isChromeIOS: IsChromeIOS = () => false;
+
 const isSafari: IsSafari = () => false;
 
 const openRouteInDesktopApp: OpenRouteInDesktopApp = () => {};
 
-export {getBrowser, isMobile, isMobileSafari, isSafari, isMobileChrome, openRouteInDesktopApp};
+export {getBrowser, isMobile, isMobileSafari, isMobileWebKit, isSafari, isMobileChrome, isChromeIOS, openRouteInDesktopApp};
diff --git a/src/libs/Browser/index.website.ts b/src/libs/Browser/index.website.ts
index 7e88e2bbd5f7..2007f2c6cbc0 100644
--- a/src/libs/Browser/index.website.ts
+++ b/src/libs/Browser/index.website.ts
@@ -1,7 +1,7 @@
 import CONFIG from '@src/CONFIG';
 import CONST from '@src/CONST';
 import ROUTES from '@src/ROUTES';
-import type {GetBrowser, IsMobile, IsMobileChrome, IsMobileSafari, IsSafari, OpenRouteInDesktopApp} from './types';
+import type {GetBrowser, IsChromeIOS, IsMobile, IsMobileChrome, IsMobileSafari, IsMobileWebKit, IsSafari, OpenRouteInDesktopApp} from './types';
 
 /**
  * Fetch browser name from UA string
@@ -58,17 +58,33 @@ const isMobileChrome: IsMobileChrome = () => {
     return /Android/i.test(userAgent) && /chrome|chromium|crios/i.test(userAgent);
 };
 
+/**
+ * Checks if the requesting user agent is a WebKit-based browser on an iOS mobile device.
+ */
+const isMobileWebKit: IsMobileWebKit = () => {
+    const userAgent = navigator.userAgent;
+    return /iP(ad|od|hone)/i.test(userAgent) && /WebKit/i.test(userAgent);
+};
+
+/**
+ * Checks if the requesting user agent is a Chrome browser on an iOS mobile device.
+ */
+const isChromeIOS: IsChromeIOS = () => {
+    const userAgent = navigator.userAgent;
+    return /iP(ad|od|hone)/i.test(userAgent) && /CriOS/i.test(userAgent);
+};
+
 const isSafari: IsSafari = () => getBrowser() === 'safari' || isMobileSafari();
 
 /**
  * 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.
  */
-const openRouteInDesktopApp: OpenRouteInDesktopApp = (shortLivedAuthToken = '', email = '') => {
+const openRouteInDesktopApp: OpenRouteInDesktopApp = (shortLivedAuthToken = '', email = '', initialRoute = '') => {
     const params = new URLSearchParams();
     // If the user is opening the desktop app through a third party signin flow, we need to manually add the exitTo param
     // so that the desktop app redirects to the correct home route after signin is complete.
     const openingFromDesktopRedirect = window.location.pathname === `/${ROUTES.DESKTOP_SIGN_IN_REDIRECT}`;
-    params.set('exitTo', `${openingFromDesktopRedirect ? '/r' : window.location.pathname}${window.location.search}${window.location.hash}`);
+    params.set('exitTo', `${openingFromDesktopRedirect ? '/r' : initialRoute || window.location.pathname}${window.location.search}${window.location.hash}`);
     if (email && shortLivedAuthToken) {
         params.set('email', email);
         params.set('shortLivedAuthToken', shortLivedAuthToken);
@@ -101,4 +117,4 @@ const openRouteInDesktopApp: OpenRouteInDesktopApp = (shortLivedAuthToken = '',
     }
 };
 
-export {getBrowser, isMobile, isMobileSafari, isSafari, isMobileChrome, openRouteInDesktopApp};
+export {getBrowser, isMobile, isMobileSafari, isMobileWebKit, isSafari, isMobileChrome, isChromeIOS, openRouteInDesktopApp};
diff --git a/src/libs/Browser/types.ts b/src/libs/Browser/types.ts
index 2e84dca3fd7f..ff0de91e7b78 100644
--- a/src/libs/Browser/types.ts
+++ b/src/libs/Browser/types.ts
@@ -6,8 +6,12 @@ type IsMobileSafari = () => boolean;
 
 type IsMobileChrome = () => boolean;
 
+type IsMobileWebKit = () => boolean;
+
+type IsChromeIOS = () => boolean;
+
 type IsSafari = () => boolean;
 
-type OpenRouteInDesktopApp = (shortLivedAuthToken?: string, email?: string) => void;
+type OpenRouteInDesktopApp = (shortLivedAuthToken?: string, email?: string, initialRoute?: string) => void;
 
-export type {GetBrowser, IsMobile, IsMobileSafari, IsMobileChrome, IsSafari, OpenRouteInDesktopApp};
+export type {GetBrowser, IsMobile, IsMobileSafari, IsMobileChrome, IsMobileWebKit, IsSafari, IsChromeIOS, OpenRouteInDesktopApp};
diff --git a/src/libs/CardUtils.ts b/src/libs/CardUtils.ts
index 106debd0a7e5..2398bc1e729a 100644
--- a/src/libs/CardUtils.ts
+++ b/src/libs/CardUtils.ts
@@ -1,11 +1,18 @@
 import lodash from 'lodash';
 import Onyx from 'react-native-onyx';
 import type {OnyxEntry} from 'react-native-onyx';
+import type {ValueOf} from 'type-fest';
+import * as Illustrations from '@src/components/Icon/Illustrations';
 import CONST from '@src/CONST';
+import type {TranslationPaths} from '@src/languages/types';
 import type {OnyxValues} from '@src/ONYXKEYS';
 import ONYXKEYS from '@src/ONYXKEYS';
-import type {Card, CardList} from '@src/types/onyx';
+import type {BankAccountList, Card, CardList, PersonalDetailsList, WorkspaceCardsList} from '@src/types/onyx';
+import {isEmptyObject} from '@src/types/utils/EmptyObject';
+import type IconAsset from '@src/types/utils/IconAsset';
+import localeCompare from './LocaleCompare';
 import * as Localize from './Localize';
+import * as PersonalDetailsUtils from './PersonalDetailsUtils';
 
 let allCards: OnyxValues[typeof ONYXKEYS.CARD_LIST] = {};
 Onyx.connect({
@@ -139,6 +146,54 @@ function hasDetectedFraud(cardList: Record<string, Card>): boolean {
     return Object.values(cardList).some((card) => card.fraud !== CONST.EXPENSIFY_CARD.FRAUD_TYPES.NONE);
 }
 
+function getMCardNumberString(cardNumber: string): string {
+    return cardNumber.replace(/\s/g, '');
+}
+
+function getTranslationKeyForLimitType(limitType: ValueOf<typeof CONST.EXPENSIFY_CARD.LIMIT_TYPES> | undefined): TranslationPaths | '' {
+    switch (limitType) {
+        case CONST.EXPENSIFY_CARD.LIMIT_TYPES.SMART:
+            return 'workspace.card.issueNewCard.smartLimit';
+        case CONST.EXPENSIFY_CARD.LIMIT_TYPES.FIXED:
+            return 'workspace.card.issueNewCard.fixedAmount';
+        case CONST.EXPENSIFY_CARD.LIMIT_TYPES.MONTHLY:
+            return 'workspace.card.issueNewCard.monthly';
+        default:
+            return '';
+    }
+}
+
+function getEligibleBankAccountsForCard(bankAccountsList: OnyxEntry<BankAccountList>) {
+    if (!bankAccountsList || isEmptyObject(bankAccountsList)) {
+        return [];
+    }
+    return Object.values(bankAccountsList).filter((bankAccount) => bankAccount?.accountData?.type === CONST.BANK_ACCOUNT.TYPE.BUSINESS && bankAccount?.accountData?.allowDebit);
+}
+
+function sortCardsByCardholderName(cardsList: OnyxEntry<WorkspaceCardsList>, personalDetails: OnyxEntry<PersonalDetailsList>): Card[] {
+    return Object.values(cardsList ?? {}).sort((cardA: Card, cardB: Card) => {
+        const userA = personalDetails?.[cardA.accountID ?? '-1'] ?? {};
+        const userB = personalDetails?.[cardB.accountID ?? '-1'] ?? {};
+
+        const aName = PersonalDetailsUtils.getDisplayNameOrDefault(userA);
+        const bName = PersonalDetailsUtils.getDisplayNameOrDefault(userB);
+
+        return localeCompare(aName, bName);
+    });
+}
+
+function getCardFeedIcon(cardFeed: string): IconAsset {
+    if (cardFeed.startsWith(CONST.COMPANY_CARD.FEED_BANK_NAME.MASTER_CARD)) {
+        return Illustrations.MasterCardCompanyCards;
+    }
+
+    if (cardFeed.startsWith(CONST.COMPANY_CARD.FEED_BANK_NAME.VISA)) {
+        return Illustrations.VisaCompanyCards;
+    }
+
+    return Illustrations.AmexCompanyCards;
+}
+
 export {
     isExpensifyCard,
     isCorporateCard,
@@ -150,4 +205,9 @@ export {
     getCardDescription,
     findPhysicalCard,
     hasDetectedFraud,
+    getMCardNumberString,
+    getTranslationKeyForLimitType,
+    getEligibleBankAccountsForCard,
+    sortCardsByCardholderName,
+    getCardFeedIcon,
 };
diff --git a/src/libs/Clipboard/index.ts b/src/libs/Clipboard/index.ts
index 512eebce78e2..130aad270b92 100644
--- a/src/libs/Clipboard/index.ts
+++ b/src/libs/Clipboard/index.ts
@@ -115,10 +115,14 @@ const setHtml: SetHtml = (html: string, text: string) => {
         // See https://webkit.org/blog/10855/async-clipboard-api/ for more details.
         setHTMLSync(html, text);
     } else {
+        const htmlNonClosingTags = html
+            .replace(/<mention-report reportID="(\d+)" *\/>/gi, '<mention-report reportID="$1"></mention-report>')
+            .replace(/<mention-user accountID="(\d+)" *\/>/gi, '<mention-user accountID="$1"></mention-user>');
+
         navigator.clipboard.write([
             new ClipboardItem({
                 /* eslint-disable @typescript-eslint/naming-convention */
-                'text/html': new Blob([html], {type: 'text/html'}),
+                'text/html': new Blob([htmlNonClosingTags], {type: 'text/html'}),
                 'text/plain': new Blob([text], {type: 'text/plain'}),
             }),
         ]);
diff --git a/src/libs/ComponentUtils/index.native.ts b/src/libs/ComponentUtils/index.native.ts
index 5ad39162e1a0..7a3492c20ded 100644
--- a/src/libs/ComponentUtils/index.native.ts
+++ b/src/libs/ComponentUtils/index.native.ts
@@ -1,7 +1,20 @@
+import type {Component} from 'react';
+import type {AnimatedRef} from 'react-native-reanimated';
+import {dispatchCommand} from 'react-native-reanimated';
 import type {AccessibilityRoleForm, NewPasswordAutocompleteType, PasswordAutocompleteType} from './types';
 
 const PASSWORD_AUTOCOMPLETE_TYPE: PasswordAutocompleteType = 'password';
 const NEW_PASSWORD_AUTOCOMPLETE_TYPE: NewPasswordAutocompleteType = 'password-new';
 const ACCESSIBILITY_ROLE_FORM: AccessibilityRoleForm = 'none';
 
-export {PASSWORD_AUTOCOMPLETE_TYPE, ACCESSIBILITY_ROLE_FORM, NEW_PASSWORD_AUTOCOMPLETE_TYPE};
+/**
+ * Clears a text input on the UI thread using a custom clear command
+ * that bypasses the event count check.
+ */
+function forceClearInput(animatedInputRef: AnimatedRef<Component>) {
+    'worklet';
+
+    dispatchCommand(animatedInputRef, 'clear');
+}
+
+export {PASSWORD_AUTOCOMPLETE_TYPE, ACCESSIBILITY_ROLE_FORM, NEW_PASSWORD_AUTOCOMPLETE_TYPE, forceClearInput};
diff --git a/src/libs/ComponentUtils/index.ts b/src/libs/ComponentUtils/index.ts
index 38abb98594da..f7c48f87af5a 100644
--- a/src/libs/ComponentUtils/index.ts
+++ b/src/libs/ComponentUtils/index.ts
@@ -1,3 +1,6 @@
+import type {Component} from 'react';
+import type {TextInput} from 'react-native';
+import type {AnimatedRef} from 'react-native-reanimated';
 import type {AccessibilityRoleForm, NewPasswordAutocompleteType, PasswordAutocompleteType} from './types';
 
 /**
@@ -7,4 +10,10 @@ const PASSWORD_AUTOCOMPLETE_TYPE: PasswordAutocompleteType = 'current-password';
 const NEW_PASSWORD_AUTOCOMPLETE_TYPE: NewPasswordAutocompleteType = 'new-password';
 const ACCESSIBILITY_ROLE_FORM: AccessibilityRoleForm = 'form';
 
-export {PASSWORD_AUTOCOMPLETE_TYPE, ACCESSIBILITY_ROLE_FORM, NEW_PASSWORD_AUTOCOMPLETE_TYPE};
+function forceClearInput(_: AnimatedRef<Component>, textInputRef: React.RefObject<TextInput>) {
+    'worklet';
+
+    textInputRef.current?.clear();
+}
+
+export {PASSWORD_AUTOCOMPLETE_TYPE, ACCESSIBILITY_ROLE_FORM, NEW_PASSWORD_AUTOCOMPLETE_TYPE, forceClearInput};
diff --git a/src/libs/ComposerFocusManager.ts b/src/libs/ComposerFocusManager.ts
index d793c202d243..30797c42ead3 100644
--- a/src/libs/ComposerFocusManager.ts
+++ b/src/libs/ComposerFocusManager.ts
@@ -1,4 +1,3 @@
-import type {View} from 'react-native';
 import {TextInput} from 'react-native';
 import type {ValueOf} from 'type-fest';
 import CONST from '@src/CONST';
@@ -10,8 +9,6 @@ type InputElement = (TextInput & HTMLElement) | null;
 
 type RestoreFocusType = ValueOf<typeof CONST.MODAL.RESTORE_FOCUS_TYPE> | undefined;
 
-type ModalContainer = (View & HTMLElement) | undefined | null;
-
 /**
  * So far, modern browsers only support the file cancel event in some newer versions
  * (i.e., Chrome: 113+ / Firefox: 91+ / Safari 16.4+), and there is no standard feature detection method available.
@@ -89,15 +86,16 @@ function getId() {
 /**
  * Save the focus state when opening the modal.
  */
-function saveFocusState(id: ModalId, isInUploadingContext = false, shouldClearFocusWithType = false, container: ModalContainer = undefined) {
+function saveFocusState(id: ModalId, isInUploadingContext = false, shouldClearFocusWithType = false) {
     const activeInput = getActiveInput();
 
     // For popoverWithoutOverlay, react calls autofocus before useEffect.
     const input = focusedInput ?? activeInput;
     focusedInput = null;
-    if (activeModals.indexOf(id) < 0) {
-        activeModals.push(id);
+    if (activeModals.indexOf(id) >= 0) {
+        return;
     }
+    activeModals.push(id);
 
     if (shouldClearFocusWithType) {
         focusMap.forEach((value, key) => {
@@ -108,9 +106,6 @@ function saveFocusState(id: ModalId, isInUploadingContext = false, shouldClearFo
         });
     }
 
-    if (container?.contains(input)) {
-        return;
-    }
     focusMap.set(id, {input, isInUploadingContext});
     input?.blur();
 }
diff --git a/src/libs/ComposerUtils/index.ts b/src/libs/ComposerUtils/index.ts
index 04d857a8faeb..7fc0299fa393 100644
--- a/src/libs/ComposerUtils/index.ts
+++ b/src/libs/ComposerUtils/index.ts
@@ -1,3 +1,4 @@
+import type {TextSelection} from '@components/Composer/types';
 import * as DeviceCapabilities from '@libs/DeviceCapabilities';
 
 type Selection = {
@@ -8,7 +9,7 @@ type Selection = {
 /**
  * Replace substring between selection with a text.
  */
-function insertText(text: string, selection: Selection, textToInsert: string): string {
+function insertText(text: string, selection: TextSelection, textToInsert: string): string {
     return text.slice(0, selection.start) + textToInsert + text.slice(selection.end, text.length);
 }
 
diff --git a/src/libs/ConnectionUtils.ts b/src/libs/ConnectionUtils.ts
new file mode 100644
index 000000000000..b3a5e38ffb8a
--- /dev/null
+++ b/src/libs/ConnectionUtils.ts
@@ -0,0 +1,19 @@
+import CONST from '@src/CONST';
+import type {QBONonReimbursableExportAccountType} from '@src/types/onyx/Policy';
+import {translateLocal} from './Localize';
+
+function getQBONonReimbursableExportAccountType(exportDestination: QBONonReimbursableExportAccountType | undefined): string {
+    switch (exportDestination) {
+        case CONST.QUICKBOOKS_NON_REIMBURSABLE_EXPORT_ACCOUNT_TYPE.DEBIT_CARD:
+            return translateLocal('workspace.qbo.bankAccount');
+        case CONST.QUICKBOOKS_NON_REIMBURSABLE_EXPORT_ACCOUNT_TYPE.CREDIT_CARD:
+            return translateLocal('workspace.qbo.creditCardAccount');
+        case CONST.QUICKBOOKS_NON_REIMBURSABLE_EXPORT_ACCOUNT_TYPE.VENDOR_BILL:
+            return translateLocal('workspace.qbo.accountsPayable');
+        default:
+            return translateLocal('workspace.qbo.account');
+    }
+}
+
+// eslint-disable-next-line import/prefer-default-export
+export {getQBONonReimbursableExportAccountType};
diff --git a/src/libs/Console/index.ts b/src/libs/Console/index.ts
index f03d33674bde..153008e2b785 100644
--- a/src/libs/Console/index.ts
+++ b/src/libs/Console/index.ts
@@ -53,7 +53,7 @@ function logMessage(args: unknown[]) {
             return String(arg);
         })
         .join(' ');
-    const newLog = {time: new Date(), level: CONST.DEBUG_CONSOLE.LEVELS.INFO, message};
+    const newLog = {time: new Date(), level: CONST.DEBUG_CONSOLE.LEVELS.INFO, message, extraData: ''};
     addLog(newLog);
 }
 
@@ -87,8 +87,7 @@ const charMap: Record<string, string> = {
  * @param text the text to sanitize
  * @returns the sanitized text
  */
-function sanitizeConsoleInput(text: string) {
-    // eslint-disable-next-line @typescript-eslint/no-unsafe-return
+function sanitizeConsoleInput(text: string): string {
     return text.replace(charsToSanitize, (match) => charMap[match]);
 }
 
@@ -102,19 +101,19 @@ function createLog(text: string) {
     try {
         // @ts-expect-error Any code inside `sanitizedInput` that gets evaluated by `eval()` will be executed in the context of the current this value.
         // eslint-disable-next-line no-eval, no-invalid-this
-        const result = eval.call(this, text);
+        const result = eval.call(this, text) as unknown;
 
         if (result !== undefined) {
             return [
-                {time, level: CONST.DEBUG_CONSOLE.LEVELS.INFO, message: `> ${text}`},
-                {time, level: CONST.DEBUG_CONSOLE.LEVELS.RESULT, message: String(result)},
+                {time, level: CONST.DEBUG_CONSOLE.LEVELS.INFO, message: `> ${text}`, extraData: ''},
+                {time, level: CONST.DEBUG_CONSOLE.LEVELS.RESULT, message: String(result), extraData: ''},
             ];
         }
-        return [{time, level: CONST.DEBUG_CONSOLE.LEVELS.INFO, message: `> ${text}`}];
+        return [{time, level: CONST.DEBUG_CONSOLE.LEVELS.INFO, message: `> ${text}`, extraData: ''}];
     } catch (error) {
         return [
-            {time, level: CONST.DEBUG_CONSOLE.LEVELS.ERROR, message: `> ${text}`},
-            {time, level: CONST.DEBUG_CONSOLE.LEVELS.ERROR, message: `Error: ${(error as Error).message}`},
+            {time, level: CONST.DEBUG_CONSOLE.LEVELS.ERROR, message: `> ${text}`, extraData: ''},
+            {time, level: CONST.DEBUG_CONSOLE.LEVELS.ERROR, message: `Error: ${(error as Error).message}`, extraData: ''},
         ];
     }
 }
@@ -131,7 +130,7 @@ function parseStringifiedMessages(logs: Log[]): Log[] {
 
     return logs.map((log) => {
         try {
-            const parsedMessage = JSON.parse(log.message);
+            const parsedMessage = JSON.parse(log.message) as Log['message'];
             return {
                 ...log,
                 message: parsedMessage,
diff --git a/src/libs/CurrencyUtils.ts b/src/libs/CurrencyUtils.ts
index 95970d2a9582..c3b80797d750 100644
--- a/src/libs/CurrencyUtils.ts
+++ b/src/libs/CurrencyUtils.ts
@@ -87,9 +87,24 @@ function convertToBackendAmount(amountAsFloat: number): number {
  *
  * @note we do not support any currencies with more than two decimal places.
  */
-function convertToFrontendAmount(amountAsInt: number): number {
-    return Math.trunc(amountAsInt) / 100.0;
+function convertToFrontendAmountAsInteger(amountAsInt: number, currency: string = CONST.CURRENCY.USD): number {
+    const decimals = getCurrencyDecimals(currency);
+    return Number((Math.trunc(amountAsInt) / 100.0).toFixed(decimals));
 }
+
+/**
+ * Takes an amount in "cents" as an integer and converts it to a string amount used in the frontend.
+ *
+ * @note we do not support any currencies with more than two decimal places.
+ */
+function convertToFrontendAmountAsString(amountAsInt: number | null | undefined, currency: string = CONST.CURRENCY.USD, withDecimals = true): string {
+    if (amountAsInt === null || amountAsInt === undefined) {
+        return '';
+    }
+    const decimals = withDecimals ? getCurrencyDecimals(currency) : 0;
+    return convertToFrontendAmountAsInteger(amountAsInt, currency).toFixed(decimals);
+}
+
 /**
  * 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)
@@ -98,14 +113,43 @@ function convertToFrontendAmount(amountAsInt: number): number {
  * @param currency - IOU currency
  */
 function convertToDisplayString(amountInCents = 0, currency: string = CONST.CURRENCY.USD): string {
-    const convertedAmount = convertToFrontendAmount(amountInCents);
+    const convertedAmount = convertToFrontendAmountAsInteger(amountInCents, currency);
+    /**
+     * Fallback currency to USD if it empty string or undefined
+     */
+    let currencyWithFallback = currency;
+    if (!currency) {
+        currencyWithFallback = CONST.CURRENCY.USD;
+    }
     return NumberFormatUtils.format(BaseLocaleListener.getPreferredLocale(), convertedAmount, {
         style: 'currency',
-        currency,
+        currency: currencyWithFallback,
 
-        // We are forcing the number of decimals because we override the default number of decimals in the backend for RSD
+        // We are forcing the number of decimals because we override the default number of decimals in the backend for some currencies
         // See: https://github.com/Expensify/PHP-Libs/pull/834
-        minimumFractionDigits: currency === 'RSD' ? getCurrencyDecimals(currency) : undefined,
+        minimumFractionDigits: getCurrencyDecimals(currency),
+        // For currencies that have decimal places > 2, floor to 2 instead as we don't support more than 2 decimal places.
+        maximumFractionDigits: 2,
+    });
+}
+
+/**
+ * Given the amount in the "cents", convert it to a short string (no decimals) for display in the UI.
+ * The backend always handle things in "cents" (subunit equal to 1/100)
+ *
+ * @param amountInCents – should be an integer. Anything after a decimal place will be dropped.
+ * @param currency - IOU currency
+ */
+function convertToShortDisplayString(amountInCents = 0, currency: string = CONST.CURRENCY.USD): string {
+    const convertedAmount = convertToFrontendAmountAsInteger(amountInCents, currency);
+
+    return NumberFormatUtils.format(BaseLocaleListener.getPreferredLocale(), convertedAmount, {
+        style: 'currency',
+        currency,
+
+        // There will be no decimals displayed (e.g. $9)
+        minimumFractionDigits: 0,
+        maximumFractionDigits: 0,
     });
 }
 
@@ -124,12 +168,33 @@ function convertAmountToDisplayString(amount = 0, currency: string = CONST.CURRE
     });
 }
 
+/**
+ * Acts the same as `convertAmountToDisplayString` but the result string does not contain currency
+ */
+function convertToDisplayStringWithoutCurrency(amountInCents: number, currency: string = CONST.CURRENCY.USD) {
+    const convertedAmount = convertToFrontendAmountAsInteger(amountInCents, currency);
+    return NumberFormatUtils.formatToParts(BaseLocaleListener.getPreferredLocale(), convertedAmount, {
+        style: 'currency',
+        currency,
+
+        // We are forcing the number of decimals because we override the default number of decimals in the backend for some currencies
+        // See: https://github.com/Expensify/PHP-Libs/pull/834
+        minimumFractionDigits: getCurrencyDecimals(currency),
+        // For currencies that have decimal places > 2, floor to 2 instead as we don't support more than 2 decimal places.
+        maximumFractionDigits: 2,
+    })
+        .filter((x) => x.type !== 'currency')
+        .filter((x) => x.type !== 'literal' || x.value.trim().length !== 0)
+        .map((x) => x.value)
+        .join('');
+}
+
 /**
  * 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);
+    return !!currency;
 }
 
 export {
@@ -139,8 +204,11 @@ export {
     getCurrencySymbol,
     isCurrencySymbolLTR,
     convertToBackendAmount,
-    convertToFrontendAmount,
+    convertToFrontendAmountAsInteger,
+    convertToFrontendAmountAsString,
     convertToDisplayString,
     convertAmountToDisplayString,
+    convertToDisplayStringWithoutCurrency,
     isValidCurrencyCode,
+    convertToShortDisplayString,
 };
diff --git a/src/libs/DateUtils.ts b/src/libs/DateUtils.ts
index 8bd37ddd698d..0b4a847f3733 100644
--- a/src/libs/DateUtils.ts
+++ b/src/libs/DateUtils.ts
@@ -15,8 +15,10 @@ import {
     isAfter,
     isBefore,
     isSameDay,
+    isSameMonth,
     isSameSecond,
     isSameYear,
+    isThisYear,
     isValid,
     parse,
     set,
@@ -41,7 +43,7 @@ import * as CurrentDate from './actions/CurrentDate';
 import * as Localize from './Localize';
 import Log from './Log';
 
-type CustomStatusTypes = (typeof CONST.CUSTOM_STATUS_TYPES)[keyof typeof CONST.CUSTOM_STATUS_TYPES];
+type CustomStatusTypes = ValueOf<typeof CONST.CUSTOM_STATUS_TYPES>;
 type Locale = ValueOf<typeof CONST.LOCALES>;
 type WeekDay = 0 | 1 | 2 | 3 | 4 | 5 | 6;
 
@@ -81,6 +83,10 @@ Onyx.connect({
     callback: (value) => (networkTimeSkew = value?.timeSkew ?? 0),
 });
 
+function isDate(arg: unknown): arg is Date {
+    return Object.prototype.toString.call(arg) === '[object Date]';
+}
+
 /**
  * Get the day of the week that the week starts on
  */
@@ -131,7 +137,15 @@ function getLocalDateFromDatetime(locale: Locale, datetime?: string, currentSele
         }
         return res;
     }
-    const parsedDatetime = new Date(`${datetime}Z`);
+    let parsedDatetime;
+    try {
+        // in some cases we cannot add 'Z' to the date string
+        parsedDatetime = new Date(`${datetime}Z`);
+        parsedDatetime.toISOString(); // we need to call toISOString because it throws RangeError in case of an invalid date
+    } catch (e) {
+        parsedDatetime = new Date(datetime);
+    }
+
     return utcToZonedTime(parsedDatetime, currentSelectedTimezone);
 }
 
@@ -232,7 +246,7 @@ function datetimeToCalendarTime(locale: Locale, datetime: string, includeTimeZon
  */
 function datetimeToRelative(locale: Locale, datetime: string): string {
     const date = getLocalDateFromDatetime(locale, datetime);
-    return formatDistanceToNow(date, {addSuffix: true});
+    return formatDistanceToNow(date, {addSuffix: true, locale: locale === CONST.LOCALES.EN ? enGB : es});
 }
 
 /**
@@ -378,7 +392,8 @@ function getDBTime(timestamp: string | number = ''): string {
  */
 function getDBTimeWithSkew(timestamp: string | number = ''): string {
     if (networkTimeSkew > 0) {
-        return getDBTime(new Date(timestamp).valueOf() + networkTimeSkew);
+        const datetime = timestamp ? new Date(timestamp) : new Date();
+        return getDBTime(datetime.valueOf() + networkTimeSkew);
     }
     return getDBTime(timestamp);
 }
@@ -648,7 +663,7 @@ const getDayValidationErrorKey = (inputDate: Date): string => {
     }
 
     if (isAfter(startOfDay(new Date()), startOfDay(inputDate))) {
-        return 'common.error.invalidDateShouldBeFuture';
+        return Localize.translateLocal('common.error.invalidDateShouldBeFuture');
     }
     return '';
 };
@@ -662,7 +677,7 @@ const getDayValidationErrorKey = (inputDate: Date): string => {
 const getTimeValidationErrorKey = (inputTime: Date): string => {
     const timeNowPlusOneMinute = addMinutes(new Date(), 1);
     if (isBefore(inputTime, timeNowPlusOneMinute)) {
-        return 'common.error.invalidTimeShouldBeFuture';
+        return Localize.translateLocal('common.error.invalidTimeShouldBeFuture');
     }
     return '';
 };
@@ -700,15 +715,6 @@ function formatToSupportedTimezone(timezoneInput: Timezone): Timezone {
     };
 }
 
-/**
- * Return the date with full format if the created date is the current date.
- * Otherwise return the created date.
- */
-function enrichMoneyRequestTimestamp(created: string): string {
-    const now = new Date();
-    const createdDate = parse(created, CONST.DATE.FNS_FORMAT_STRING, now);
-    return isSameDay(createdDate, now) ? getDBTimeFromDate(now) : created;
-}
 /**
  * Returns the last business day of given date month
  *
@@ -728,7 +734,93 @@ function getLastBusinessDayOfMonth(inputDate: Date): number {
     return getDate(currentDate);
 }
 
+/**
+ * Returns a formatted date range from date 1 to date 2.
+ * Dates are formatted as follows:
+ * 1. When both dates refer to the same day: Mar 17
+ * 2. When both dates refer to the same month: Mar 17-20
+ * 3. When both dates refer to the same year: Feb 28 to Mar 1
+ * 4. When the dates are from different years: Dec 28, 2023 to Jan 5, 2024
+ */
+function getFormattedDateRange(date1: Date, date2: Date): string {
+    const {translateLocal} = Localize;
+
+    if (isSameDay(date1, date2)) {
+        // Dates are from the same day
+        return format(date1, 'MMM d');
+    }
+    if (isSameMonth(date1, date2)) {
+        // Dates in the same month and year, differ by days
+        return `${format(date1, 'MMM d')}-${format(date2, 'd')}`;
+    }
+    if (isSameYear(date1, date2)) {
+        // Dates are in the same year, differ by months
+        return `${format(date1, 'MMM d')} ${translateLocal('common.to').toLowerCase()} ${format(date2, 'MMM d')}`;
+    }
+    // Dates differ by years, months, days
+    return `${format(date1, 'MMM d, yyyy')} ${translateLocal('common.to').toLowerCase()} ${format(date2, 'MMM d, yyyy')}`;
+}
+
+/**
+ * Returns a formatted date range from date 1 to date 2 of a reservation.
+ * Dates are formatted as follows:
+ * 1. When both dates refer to the same day and the current year: Sunday, Mar 17
+ * 2. When both dates refer to the same day but not the current year: Wednesday, Mar 17, 2023
+ * 3. When both dates refer to the current year: Sunday, Mar 17 to Wednesday, Mar 20
+ * 4. When the dates are from different years or from a year which is not current: Wednesday, Mar 17, 2023 to Saturday, Jan 20, 2024
+ */
+function getFormattedReservationRangeDate(date1: Date, date2: Date): string {
+    const {translateLocal} = Localize;
+    if (isSameDay(date1, date2) && isThisYear(date1)) {
+        // Dates are from the same day
+        return format(date1, 'EEEE, MMM d');
+    }
+    if (isSameDay(date1, date2)) {
+        // Dates are from the same day but not this year
+        return format(date1, 'EEEE, MMM d, yyyy');
+    }
+    if (isSameYear(date1, date2) && isThisYear(date1)) {
+        // Dates are in the current year, differ by months
+        return `${format(date1, 'EEEE, MMM d')} ${translateLocal('common.conjunctionTo')} ${format(date2, 'EEEE, MMM d')}`;
+    }
+    // Dates differ by years, months, days or only by months but the year is not current
+    return `${format(date1, 'EEEE, MMM d, yyyy')} ${translateLocal('common.conjunctionTo')} ${format(date2, 'EEEE, MMM d, yyyy')}`;
+}
+
+/**
+ * Returns a formatted date of departure.
+ * Dates are formatted as follows:
+ * 1. When the date refers to the current day: Departs on Sunday, Mar 17 at 8:00
+ * 2. When the date refers not to the current day: Departs on Wednesday, Mar 17, 2023 at 8:00
+ */
+function getFormattedTransportDate(date: Date): string {
+    const {translateLocal} = Localize;
+    if (isThisYear(date)) {
+        return `${translateLocal('travel.departs')} ${format(date, 'EEEE, MMM d')} ${translateLocal('common.conjunctionAt')} ${format(date, 'HH:MM')}`;
+    }
+    return `${translateLocal('travel.departs')} ${format(date, 'EEEE, MMM d, yyyy')} ${translateLocal('common.conjunctionAt')} ${format(date, 'HH:MM')}`;
+}
+
+function doesDateBelongToAPastYear(date: string): boolean {
+    const transactionYear = new Date(date).getFullYear();
+    return transactionYear !== new Date().getFullYear();
+}
+
+/**
+ * Returns a boolean value indicating whether the card has expired.
+ * @param expiryMonth month when card expires (starts from 1 so can be any number between 1 and 12)
+ * @param expiryYear year when card expires
+ */
+
+function isCardExpired(expiryMonth: number, expiryYear: number): boolean {
+    const currentYear = new Date().getFullYear();
+    const currentMonth = new Date().getMonth() + 1;
+
+    return expiryYear < currentYear || (expiryYear === currentYear && expiryMonth < currentMonth);
+}
+
 const DateUtils = {
+    isDate,
     formatToDayOfWeek,
     formatToLongDateWithWeekday,
     formatToLocalTime,
@@ -766,8 +858,12 @@ const DateUtils = {
     getWeekEndsOn,
     isTimeAtLeastOneMinuteInFuture,
     formatToSupportedTimezone,
-    enrichMoneyRequestTimestamp,
     getLastBusinessDayOfMonth,
+    getFormattedDateRange,
+    getFormattedReservationRangeDate,
+    getFormattedTransportDate,
+    doesDateBelongToAPastYear,
+    isCardExpired,
 };
 
 export default DateUtils;
diff --git a/src/libs/DistanceRequestUtils.ts b/src/libs/DistanceRequestUtils.ts
index 9cb48534214e..b5af91dfacfb 100644
--- a/src/libs/DistanceRequestUtils.ts
+++ b/src/libs/DistanceRequestUtils.ts
@@ -1,15 +1,16 @@
-import type {OnyxCollection, OnyxEntry} from 'react-native-onyx';
+import type {OnyxEntry} from 'react-native-onyx';
 import Onyx from 'react-native-onyx';
 import type {LocaleContextProps} from '@components/LocaleContextProvider';
 import type {RateAndUnit} from '@src/CONST';
 import CONST from '@src/CONST';
 import ONYXKEYS from '@src/ONYXKEYS';
-import type {LastSelectedDistanceRates, Report} from '@src/types/onyx';
+import type {LastSelectedDistanceRates, OnyxInputOrEntry} from '@src/types/onyx';
 import type {Unit} from '@src/types/onyx/Policy';
 import type Policy from '@src/types/onyx/Policy';
-import type {EmptyObject} from '@src/types/utils/EmptyObject';
+import {isEmptyObject} from '@src/types/utils/EmptyObject';
 import * as CurrencyUtils from './CurrencyUtils';
 import * as PolicyUtils from './PolicyUtils';
+import * as ReportConnection from './ReportConnection';
 import * as ReportUtils from './ReportUtils';
 
 type MileageRate = {
@@ -28,16 +29,38 @@ Onyx.connect({
     },
 });
 
-let allReports: OnyxCollection<Report>;
-Onyx.connect({
-    key: ONYXKEYS.COLLECTION.REPORT,
-    waitForCollectionCallback: true,
-    callback: (value) => (allReports = value),
-});
-
 const METERS_TO_KM = 0.001; // 1 kilometer is 1000 meters
 const METERS_TO_MILES = 0.000621371; // There are approximately 0.000621371 miles in a meter
 
+function getMileageRates(policy: OnyxInputOrEntry<Policy>, includeDisabledRates = false): Record<string, MileageRate> {
+    const mileageRates: Record<string, MileageRate> = {};
+
+    if (!policy?.customUnits) {
+        return mileageRates;
+    }
+
+    const distanceUnit = PolicyUtils.getCustomUnit(policy);
+    if (!distanceUnit?.rates) {
+        return mileageRates;
+    }
+
+    Object.entries(distanceUnit.rates).forEach(([rateID, rate]) => {
+        if (!includeDisabledRates && rate.enabled === false) {
+            return;
+        }
+
+        mileageRates[rateID] = {
+            rate: rate.rate,
+            currency: rate.currency,
+            unit: distanceUnit.attributes.unit,
+            name: rate.name,
+            customUnitRateID: rate.customUnitRateID,
+        };
+    });
+
+    return mileageRates;
+}
+
 /**
  * Retrieves the default mileage rate based on a given policy.
  *
@@ -48,17 +71,18 @@ const METERS_TO_MILES = 0.000621371; // There are approximately 0.000621371 mile
  * @returns [currency] - The currency associated with the rate.
  * @returns [unit] - The unit of measurement for the distance.
  */
-function getDefaultMileageRate(policy: OnyxEntry<Policy> | EmptyObject): MileageRate | null {
-    if (!policy?.customUnits) {
-        return null;
+function getDefaultMileageRate(policy: OnyxInputOrEntry<Policy>): MileageRate | undefined {
+    if (isEmptyObject(policy) || !policy?.customUnits) {
+        return undefined;
     }
 
-    const distanceUnit = Object.values(policy.customUnits).find((unit) => unit.name === CONST.CUSTOM_UNITS.NAME_DISTANCE);
+    const distanceUnit = PolicyUtils.getCustomUnit(policy);
     if (!distanceUnit?.rates) {
-        return null;
+        return;
     }
+    const mileageRates = Object.values(getMileageRates(policy));
 
-    const distanceRate = Object.values(distanceUnit.rates).find((rate) => rate.name === CONST.CUSTOM_UNITS.DEFAULT_RATE) ?? Object.values(distanceUnit.rates)[0];
+    const distanceRate = mileageRates.find((rate) => rate.name === CONST.CUSTOM_UNITS.DEFAULT_RATE) ?? mileageRates[0] ?? {};
 
     return {
         customUnitRateID: distanceRate.customUnitRateID,
@@ -104,6 +128,7 @@ function getRoundedDistanceInUnits(distanceInMeters: number, unit: Unit): string
  * @param currency The currency associated with the rate
  * @param translate Translate function
  * @param toLocaleDigit Function to convert to localized digit
+ * @param useShortFormUnit If true, the unit will be returned in short form (e.g., "mi", "km").
  * @returns A string that displays the rate used for expense calculation
  */
 function getRateForDisplay(
@@ -113,6 +138,7 @@ function getRateForDisplay(
     translate: LocaleContextProps['translate'],
     toLocaleDigit: LocaleContextProps['toLocaleDigit'],
     isOffline?: boolean,
+    useShortFormUnit?: boolean,
 ): string {
     if (isOffline && !rate) {
         return translate('iou.defaultRate');
@@ -122,11 +148,11 @@ function getRateForDisplay(
     }
 
     const singularDistanceUnit = unit === CONST.CUSTOM_UNITS.DISTANCE_UNIT_MILES ? translate('common.mile') : translate('common.kilometer');
-    const formattedRate = PolicyUtils.getUnitRateValue(toLocaleDigit, {rate});
+    const formattedRate = PolicyUtils.getUnitRateValue(toLocaleDigit, {rate}, useShortFormUnit);
     // eslint-disable-next-line @typescript-eslint/prefer-nullish-coalescing
     const currencySymbol = CurrencyUtils.getCurrencySymbol(currency) || `${currency} `;
 
-    return `${currencySymbol}${formattedRate} / ${singularDistanceUnit}`;
+    return `${currencySymbol}${formattedRate} / ${useShortFormUnit ? unit : singularDistanceUnit}`;
 }
 
 /**
@@ -135,14 +161,26 @@ function getRateForDisplay(
  * @param unit Unit that should be used to display the distance
  * @param rate Expensable amount allowed per unit
  * @param translate Translate function
+ * @param useShortFormUnit If true, the unit will be returned in short form (e.g., "mi", "km").
  * @returns A string that describes the distance traveled
  */
-function getDistanceForDisplay(hasRoute: boolean, distanceInMeters: number, unit: Unit | undefined, rate: number | undefined, translate: LocaleContextProps['translate']): string {
+function getDistanceForDisplay(
+    hasRoute: boolean,
+    distanceInMeters: number,
+    unit: Unit | undefined,
+    rate: number | undefined,
+    translate: LocaleContextProps['translate'],
+    useShortFormUnit?: boolean,
+): string {
     if (!hasRoute || !rate || !unit || !distanceInMeters) {
         return translate('iou.fieldPending');
     }
 
     const distanceInUnits = getRoundedDistanceInUnits(distanceInMeters, unit);
+    if (useShortFormUnit) {
+        return `${distanceInUnits} ${unit}`;
+    }
+
     const distanceUnit = unit === CONST.CUSTOM_UNITS.DISTANCE_UNIT_MILES ? translate('common.miles') : translate('common.kilometers');
     const singularDistanceUnit = unit === CONST.CUSTOM_UNITS.DISTANCE_UNIT_MILES ? translate('common.mile') : translate('common.kilometer');
     const unitString = distanceInUnits === '1' ? singularDistanceUnit : distanceUnit;
@@ -173,44 +211,12 @@ function getDistanceMerchant(
         return translate('iou.fieldPending');
     }
 
-    const distanceInUnits = getDistanceForDisplay(hasRoute, distanceInMeters, unit, rate, translate);
-    const ratePerUnit = getRateForDisplay(unit, rate, currency, translate, toLocaleDigit);
+    const distanceInUnits = getDistanceForDisplay(hasRoute, distanceInMeters, unit, rate, translate, true);
+    const ratePerUnit = getRateForDisplay(unit, rate, currency, translate, toLocaleDigit, undefined, true);
 
     return `${distanceInUnits} @ ${ratePerUnit}`;
 }
 
-/**
- * Retrieves the mileage rates for given policy.
- *
- * @param policy - The policy from which to extract the mileage rates.
- *
- * @returns An array of mileage rates or an empty array if not found.
- */
-function getMileageRates(policy: OnyxEntry<Policy>): Record<string, MileageRate> {
-    const mileageRates: Record<string, MileageRate> = {};
-
-    if (!policy || !policy?.customUnits) {
-        return mileageRates;
-    }
-
-    const distanceUnit = Object.values(policy.customUnits).find((unit) => unit.name === CONST.CUSTOM_UNITS.NAME_DISTANCE);
-    if (!distanceUnit?.rates) {
-        return mileageRates;
-    }
-
-    Object.entries(distanceUnit.rates).forEach(([rateID, rate]) => {
-        mileageRates[rateID] = {
-            rate: rate.rate,
-            currency: rate.currency,
-            unit: distanceUnit.attributes.unit,
-            name: rate.name,
-            customUnitRateID: rate.customUnitRateID,
-        };
-    });
-
-    return mileageRates;
-}
-
 /**
  * Retrieves the rate and unit for a P2P distance expense for a given currency.
  *
@@ -218,7 +224,11 @@ function getMileageRates(policy: OnyxEntry<Policy>): Record<string, MileageRate>
  * @returns The rate and unit in RateAndUnit object.
  */
 function getRateForP2P(currency: string): RateAndUnit {
-    return CONST.CURRENCY_TO_DEFAULT_MILEAGE_RATE[currency] ?? CONST.CURRENCY_TO_DEFAULT_MILEAGE_RATE.USD;
+    const currencyWithExistingRate = CONST.CURRENCY_TO_DEFAULT_MILEAGE_RATE[currency] ? currency : CONST.CURRENCY.USD;
+    return {
+        ...CONST.CURRENCY_TO_DEFAULT_MILEAGE_RATE[currencyWithExistingRate],
+        currency: currencyWithExistingRate,
+    };
 }
 
 /**
@@ -252,20 +262,43 @@ function convertToDistanceInMeters(distance: number, unit: Unit): number {
 /**
  * Returns custom unit rate ID for the distance transaction
  */
-function getCustomUnitRateID(reportID: string) {
-    const report = allReports?.[`${ONYXKEYS.COLLECTION.REPORT}${reportID}`] ?? null;
-    const parentReport = allReports?.[`${ONYXKEYS.COLLECTION.REPORT}${report?.parentReportID}`] ?? null;
-    const policy = PolicyUtils.getPolicy(report?.policyID ?? parentReport?.policyID ?? '');
-
+function getCustomUnitRateID(reportID: string, shouldUseDefault?: boolean) {
+    const allReports = ReportConnection.getAllReports();
+    const report = allReports?.[`${ONYXKEYS.COLLECTION.REPORT}${reportID}`];
+    const parentReport = allReports?.[`${ONYXKEYS.COLLECTION.REPORT}${report?.parentReportID}`];
+    const policy = PolicyUtils.getPolicy(report?.policyID ?? parentReport?.policyID ?? '-1');
     let customUnitRateID: string = CONST.CUSTOM_UNITS.FAKE_P2P_ID;
 
     if (ReportUtils.isPolicyExpenseChat(report) || ReportUtils.isPolicyExpenseChat(parentReport)) {
-        customUnitRateID = lastSelectedDistanceRates?.[policy?.id ?? ''] ?? getDefaultMileageRate(policy)?.customUnitRateID ?? '';
+        const distanceUnit = Object.values(policy?.customUnits ?? {}).find((unit) => unit.name === CONST.CUSTOM_UNITS.NAME_DISTANCE);
+        const lastSelectedDistanceRateID = lastSelectedDistanceRates?.[policy?.id ?? '-1'] ?? '-1';
+        const lastSelectedDistanceRate = distanceUnit?.rates[lastSelectedDistanceRateID] ?? {};
+        if (lastSelectedDistanceRate.enabled && lastSelectedDistanceRateID && !shouldUseDefault) {
+            customUnitRateID = lastSelectedDistanceRateID;
+        } else {
+            customUnitRateID = getDefaultMileageRate(policy)?.customUnitRateID ?? '-1';
+        }
     }
 
     return customUnitRateID;
 }
 
+/**
+ * Get taxable amount from a specific distance rate, taking into consideration the tax claimable amount configured for the distance rate
+ */
+function getTaxableAmount(policy: OnyxEntry<Policy>, customUnitRateID: string, distance: number) {
+    const distanceUnit = PolicyUtils.getCustomUnit(policy);
+    const customUnitRate = PolicyUtils.getCustomUnitRate(policy, customUnitRateID);
+    if (!distanceUnit || !distanceUnit?.customUnitID || !customUnitRate) {
+        return 0;
+    }
+    const unit = distanceUnit?.attributes?.unit ?? CONST.CUSTOM_UNITS.DISTANCE_UNIT_MILES;
+    const rate = customUnitRate?.rate ?? 0;
+    const amount = getDistanceRequestAmount(distance, unit, rate);
+    const taxClaimablePercentage = customUnitRate.attributes?.taxClaimablePercentage ?? 0;
+    return amount * taxClaimablePercentage;
+}
+
 export default {
     getDefaultMileageRate,
     getDistanceMerchant,
@@ -276,6 +309,7 @@ export default {
     getRateForP2P,
     getCustomUnitRateID,
     convertToDistanceInMeters,
+    getTaxableAmount,
 };
 
 export type {MileageRate};
diff --git a/src/libs/DomUtils/index.ts b/src/libs/DomUtils/index.ts
index 330123833c1f..e6286dce77fc 100644
--- a/src/libs/DomUtils/index.ts
+++ b/src/libs/DomUtils/index.ts
@@ -8,8 +8,7 @@ const addCSS = (css: string, styleId: string) => {
     if (existingStyle) {
         if ('styleSheet' in existingStyle) {
             // Supports IE8 and below
-            // eslint-disable-next-line @typescript-eslint/no-explicit-any
-            (existingStyle.styleSheet as any).cssText = css;
+            (existingStyle.styleSheet as CSSStyleDeclaration).cssText = css;
         } else {
             existingStyle.innerHTML = css;
         }
@@ -20,8 +19,7 @@ const addCSS = (css: string, styleId: string) => {
 
         if ('styleSheet' in styleElement) {
             // Supports IE8 and below
-            // eslint-disable-next-line @typescript-eslint/no-explicit-any
-            (styleElement.styleSheet as any).cssText = css;
+            (styleElement.styleSheet as CSSStyleDeclaration).cssText = css;
         } else {
             styleElement.appendChild(document.createTextNode(css));
         }
diff --git a/src/libs/E2E/actions/e2eLogin.ts b/src/libs/E2E/actions/e2eLogin.ts
index f98eab5005e1..25aee3c43d83 100644
--- a/src/libs/E2E/actions/e2eLogin.ts
+++ b/src/libs/E2E/actions/e2eLogin.ts
@@ -43,7 +43,7 @@ export default function (): Promise<boolean> {
 
     // Subscribe to auth token, to check if we are authenticated
     return new Promise((resolve, reject) => {
-        const connectionId = Onyx.connect({
+        const connection = Onyx.connect({
             key: ONYXKEYS.SESSION,
             callback: (session) => {
                 if (session?.authToken == null || session.authToken.length === 0) {
@@ -67,7 +67,7 @@ export default function (): Promise<boolean> {
                 }
                 // signal that auth was completed
                 resolve(neededLogin);
-                Onyx.disconnect(connectionId);
+                Onyx.disconnect(connection);
             },
         });
     });
diff --git a/src/libs/E2E/actions/waitForAppLoaded.ts b/src/libs/E2E/actions/waitForAppLoaded.ts
index bea739a1b4c7..ebb53657eade 100644
--- a/src/libs/E2E/actions/waitForAppLoaded.ts
+++ b/src/libs/E2E/actions/waitForAppLoaded.ts
@@ -4,7 +4,7 @@ import ONYXKEYS from '@src/ONYXKEYS';
 // Once we get the sidebar loaded end mark we know that the app is ready to be used:
 export default function waitForAppLoaded(): Promise<void> {
     return new Promise((resolve) => {
-        const connectionId = Onyx.connect({
+        const connection = Onyx.connect({
             key: ONYXKEYS.IS_SIDEBAR_LOADED,
             callback: (isSidebarLoaded) => {
                 if (!isSidebarLoaded) {
@@ -12,7 +12,7 @@ export default function waitForAppLoaded(): Promise<void> {
                 }
 
                 resolve();
-                Onyx.disconnect(connectionId);
+                Onyx.disconnect(connection);
             },
         });
     });
diff --git a/src/libs/E2E/client.ts b/src/libs/E2E/client.ts
index 5aa999267ead..7a0259de7eef 100644
--- a/src/libs/E2E/client.ts
+++ b/src/libs/E2E/client.ts
@@ -1,6 +1,7 @@
 import Config from '../../../tests/e2e/config';
 import Routes from '../../../tests/e2e/server/routes';
 import type {NetworkCacheMap, TestConfig, TestResult} from './types';
+import {waitForActiveRequestsToBeEmpty} from './utils/NetworkInterceptor';
 
 type NativeCommandPayload = {
     text: string;
@@ -57,7 +58,7 @@ const submitTestResults = (testResult: TestResult): Promise<void> => {
     });
 };
 
-const submitTestDone = () => fetch(`${SERVER_ADDRESS}${Routes.testDone}`, defaultRequestInit);
+const submitTestDone = () => waitForActiveRequestsToBeEmpty().then(() => fetch(`${SERVER_ADDRESS}${Routes.testDone}`, defaultRequestInit));
 
 let currentActiveTestConfig: TestConfig | null = null;
 
diff --git a/src/libs/E2E/reactNativeLaunchingTest.ts b/src/libs/E2E/reactNativeLaunchingTest.ts
index f23508987268..f952998f0aad 100644
--- a/src/libs/E2E/reactNativeLaunchingTest.ts
+++ b/src/libs/E2E/reactNativeLaunchingTest.ts
@@ -5,7 +5,6 @@
  * By doing this, we avoid bundling any E2E testing code
  * into the actual release app.
  */
-import type {ValueOf} from 'type-fest';
 import * as Metrics from '@libs/Metrics';
 import Performance from '@libs/Performance';
 import Config from 'react-native-config';
@@ -13,9 +12,7 @@ import E2EConfig from '../../../tests/e2e/config';
 import E2EClient from './client';
 import installNetworkInterceptor from './utils/NetworkInterceptor';
 import LaunchArgs from './utils/LaunchArgs';
-import type { TestConfig } from './types';
-
-type Tests = Record<ValueOf<typeof E2EConfig.TEST_NAMES>, (config: TestConfig) => void>;
+import type {TestModule, Tests} from './types';
 
 console.debug('==========================');
 console.debug('==== Running e2e test ====');
@@ -34,11 +31,11 @@ if (!appInstanceId) {
 
 // import your test here, define its name and config first in e2e/config.js
 const tests: Tests = {
-    [E2EConfig.TEST_NAMES.AppStartTime]: require('./tests/appStartTimeTest.e2e').default,
-    [E2EConfig.TEST_NAMES.OpenChatFinderPage]: require('./tests/openChatFinderPageTest.e2e').default,
-    [E2EConfig.TEST_NAMES.ChatOpening]: require('./tests/chatOpeningTest.e2e').default,
-    [E2EConfig.TEST_NAMES.ReportTyping]: require('./tests/reportTypingTest.e2e').default,
-    [E2EConfig.TEST_NAMES.Linking]: require('./tests/linkingTest.e2e').default,
+    [E2EConfig.TEST_NAMES.AppStartTime]: require<TestModule>('./tests/appStartTimeTest.e2e').default,
+    [E2EConfig.TEST_NAMES.OpenChatFinderPage]: require<TestModule>('./tests/openChatFinderPageTest.e2e').default,
+    [E2EConfig.TEST_NAMES.ChatOpening]: require<TestModule>('./tests/chatOpeningTest.e2e').default,
+    [E2EConfig.TEST_NAMES.ReportTyping]: require<TestModule>('./tests/reportTypingTest.e2e').default,
+    [E2EConfig.TEST_NAMES.Linking]: require<TestModule>('./tests/linkingTest.e2e').default,
 };
 
 // Once we receive the TII measurement we know that the app is initialized and ready to be used:
@@ -69,7 +66,7 @@ E2EClient.getTestConfig()
                 branch: Config.E2E_BRANCH,
                 name: config.name,
                 error: `Test '${config.name}' not found`,
-                isCritical: false, 
+                isCritical: false,
             });
         }
 
diff --git a/src/libs/E2E/tests/appStartTimeTest.e2e.ts b/src/libs/E2E/tests/appStartTimeTest.e2e.ts
index 321fc3773d51..188dd65c85e9 100644
--- a/src/libs/E2E/tests/appStartTimeTest.e2e.ts
+++ b/src/libs/E2E/tests/appStartTimeTest.e2e.ts
@@ -26,7 +26,8 @@ const test = () => {
                 E2EClient.submitTestResults({
                     branch: Config.E2E_BRANCH,
                     name: `App start ${metric.name}`,
-                    duration: metric.duration,
+                    metric: metric.duration,
+                    unit: 'ms',
                 }),
             ),
         )
diff --git a/src/libs/E2E/tests/chatOpeningTest.e2e.ts b/src/libs/E2E/tests/chatOpeningTest.e2e.ts
index 8e43c4ece564..8e2a0a81da7d 100644
--- a/src/libs/E2E/tests/chatOpeningTest.e2e.ts
+++ b/src/libs/E2E/tests/chatOpeningTest.e2e.ts
@@ -49,7 +49,8 @@ const test = (config: NativeConfig) => {
                 E2EClient.submitTestResults({
                     branch: Config.E2E_BRANCH,
                     name: 'Chat opening',
-                    duration: entry.duration,
+                    metric: entry.duration,
+                    unit: 'ms',
                 })
                     .then(() => {
                         console.debug('[E2E] Done with chat opening, exiting…');
@@ -64,7 +65,8 @@ const test = (config: NativeConfig) => {
                 E2EClient.submitTestResults({
                     branch: Config.E2E_BRANCH,
                     name: 'Chat TTI',
-                    duration: entry.duration,
+                    metric: entry.duration,
+                    unit: 'ms',
                 })
                     .then(() => {
                         console.debug('[E2E] Done with chat TTI tracking, exiting…');
diff --git a/src/libs/E2E/tests/linkingTest.e2e.ts b/src/libs/E2E/tests/linkingTest.e2e.ts
index c48ffb5a8057..7e6c7ea697ba 100644
--- a/src/libs/E2E/tests/linkingTest.e2e.ts
+++ b/src/libs/E2E/tests/linkingTest.e2e.ts
@@ -1,16 +1,23 @@
+import {DeviceEventEmitter} from 'react-native';
 import type {NativeConfig} from 'react-native-config';
 import Config from 'react-native-config';
-import {getViewableItems} from '@components/InvertedFlatList/BaseInvertedFlatList/index.e2e';
 import Timing from '@libs/actions/Timing';
 import E2ELogin from '@libs/E2E/actions/e2eLogin';
 import waitForAppLoaded from '@libs/E2E/actions/waitForAppLoaded';
 import E2EClient from '@libs/E2E/client';
 import getConfigValueOrThrow from '@libs/E2E/utils/getConfigValueOrThrow';
+import getPromiseWithResolve from '@libs/E2E/utils/getPromiseWithResolve';
 import Navigation from '@libs/Navigation/Navigation';
 import Performance from '@libs/Performance';
 import CONST from '@src/CONST';
 import ROUTES from '@src/ROUTES';
 
+type ViewableItem = {
+    reportActionID?: string;
+};
+
+type ViewableItemResponse = Array<{item?: ViewableItem}>;
+
 const test = (config: NativeConfig) => {
     console.debug('[E2E] Logging in for comment linking');
 
@@ -23,6 +30,29 @@ const test = (config: NativeConfig) => {
             return waitForAppLoaded().then(() => E2EClient.submitTestDone());
         }
 
+        const [appearMessagePromise, appearMessageResolve] = getPromiseWithResolve();
+        const [switchReportPromise, switchReportResolve] = getPromiseWithResolve();
+
+        Promise.all([appearMessagePromise, switchReportPromise])
+            .then(() => {
+                console.debug('[E2E] Test completed successfully, exiting…');
+                E2EClient.submitTestDone();
+            })
+            .catch((err) => {
+                console.debug('[E2E] Error while submitting test results:', err);
+            });
+
+        const subscription = DeviceEventEmitter.addListener('onViewableItemsChanged', (res: ViewableItemResponse) => {
+            console.debug('[E2E] Viewable items retrieved, verifying correct message…', res);
+
+            if (!!res && res?.[0]?.item?.reportActionID === linkedReportActionID) {
+                appearMessageResolve();
+                subscription.remove();
+            } else {
+                console.debug(`[E2E] Provided message id '${res?.[0]?.item?.reportActionID}' doesn't match to an expected '${linkedReportActionID}'. Waiting for a next one…`);
+            }
+        });
+
         Performance.subscribeToMeasurements((entry) => {
             if (entry.name === CONST.TIMING.SIDEBAR_LOADED) {
                 console.debug('[E2E] Sidebar loaded, navigating to a report…');
@@ -41,27 +71,15 @@ const test = (config: NativeConfig) => {
 
             if (entry.name === CONST.TIMING.SWITCH_REPORT) {
                 console.debug('[E2E] Linking: 1');
-                setTimeout(() => {
-                    const res = getViewableItems();
-                    console.debug('[E2E] Viewable items retrieved, verifying correct message…');
-
-                    if (!!res && res[0]?.item?.reportActionID === linkedReportActionID) {
-                        E2EClient.submitTestResults({
-                            branch: Config.E2E_BRANCH,
-                            name: 'Comment linking',
-                            duration: entry.duration,
-                        })
-                            .then(() => {
-                                console.debug('[E2E] Test completed successfully, exiting…');
-                                E2EClient.submitTestDone();
-                            })
-                            .catch((err) => {
-                                console.debug('[E2E] Error while submitting test results:', err);
-                            });
-                    } else {
-                        console.debug('[E2E] Message verification failed');
-                    }
-                }, 3000);
+
+                E2EClient.submitTestResults({
+                    branch: Config.E2E_BRANCH,
+                    name: 'Comment linking',
+                    metric: entry.duration,
+                    unit: 'ms',
+                });
+
+                switchReportResolve();
             }
         });
     });
diff --git a/src/libs/E2E/tests/openChatFinderPageTest.e2e.ts b/src/libs/E2E/tests/openChatFinderPageTest.e2e.ts
index 4ac7995b914f..2c2f2eda4efe 100644
--- a/src/libs/E2E/tests/openChatFinderPageTest.e2e.ts
+++ b/src/libs/E2E/tests/openChatFinderPageTest.e2e.ts
@@ -34,6 +34,7 @@ const test = () => {
         Performance.subscribeToMeasurements((entry) => {
             if (entry.name === CONST.TIMING.SIDEBAR_LOADED) {
                 console.debug(`[E2E] Sidebar loaded, navigating to chat finder route…`);
+                Performance.markStart(CONST.TIMING.CHAT_FINDER_RENDER);
                 Navigation.navigate(ROUTES.CHAT_FINDER);
                 return;
             }
@@ -44,7 +45,8 @@ const test = () => {
                 E2EClient.submitTestResults({
                     branch: Config.E2E_BRANCH,
                     name: 'Open Chat Finder Page TTI',
-                    duration: entry.duration,
+                    metric: entry.duration,
+                    unit: 'ms',
                 })
                     .then(() => {
                         openSearchPageResolve();
@@ -59,7 +61,8 @@ const test = () => {
                 E2EClient.submitTestResults({
                     branch: Config.E2E_BRANCH,
                     name: 'Load Search Options',
-                    duration: entry.duration,
+                    metric: entry.duration,
+                    unit: 'ms',
                 })
                     .then(() => {
                         loadSearchOptionsResolve();
diff --git a/src/libs/E2E/tests/reportTypingTest.e2e.ts b/src/libs/E2E/tests/reportTypingTest.e2e.ts
index 817bda941611..efe1c380dfd0 100644
--- a/src/libs/E2E/tests/reportTypingTest.e2e.ts
+++ b/src/libs/E2E/tests/reportTypingTest.e2e.ts
@@ -1,13 +1,16 @@
 import type {NativeConfig} from 'react-native-config';
 import Config from 'react-native-config';
+import {runOnUI} from 'react-native-reanimated';
 import E2ELogin from '@libs/E2E/actions/e2eLogin';
 import waitForAppLoaded from '@libs/E2E/actions/waitForAppLoaded';
 import waitForKeyboard from '@libs/E2E/actions/waitForKeyboard';
 import E2EClient from '@libs/E2E/client';
 import getConfigValueOrThrow from '@libs/E2E/utils/getConfigValueOrThrow';
+import getPromiseWithResolve from '@libs/E2E/utils/getPromiseWithResolve';
 import Navigation from '@libs/Navigation/Navigation';
 import Performance from '@libs/Performance';
 import {getRerenderCount, resetRerenderCount} from '@pages/home/report/ReportActionCompose/ComposerWithSuggestions/index.e2e';
+import {onSubmitAction} from '@pages/home/report/ReportActionCompose/ReportActionCompose';
 import CONST from '@src/CONST';
 import ROUTES from '@src/ROUTES';
 import * as NativeCommands from '../../../../tests/e2e/nativeCommands/NativeCommandsAction';
@@ -17,6 +20,7 @@ const test = (config: NativeConfig) => {
     console.debug('[E2E] Logging in for typing');
 
     const reportID = getConfigValueOrThrow('reportID', config);
+    const message = getConfigValueOrThrow('message', config);
 
     E2ELogin().then((neededLogin) => {
         if (neededLogin) {
@@ -28,7 +32,26 @@ const test = (config: NativeConfig) => {
 
         console.debug('[E2E] Logged in, getting typing metrics and submitting them…');
 
+        const [renderTimesPromise, renderTimesResolve] = getPromiseWithResolve();
+        const [messageSentPromise, messageSentResolve] = getPromiseWithResolve();
+
+        Promise.all([renderTimesPromise, messageSentPromise]).then(() => {
+            console.debug(`[E2E] Submitting!`);
+
+            E2EClient.submitTestDone();
+        });
+
         Performance.subscribeToMeasurements((entry) => {
+            if (entry.name === CONST.TIMING.MESSAGE_SENT) {
+                E2EClient.submitTestResults({
+                    branch: Config.E2E_BRANCH,
+                    name: 'Message sent',
+                    metric: entry.duration,
+                    unit: 'ms',
+                }).then(messageSentResolve);
+                return;
+            }
+
             if (entry.name !== CONST.TIMING.SIDEBAR_LOADED) {
                 return;
             }
@@ -46,17 +69,26 @@ const test = (config: NativeConfig) => {
                         return Promise.resolve();
                     })
                     .then(() => E2EClient.sendNativeCommand(NativeCommands.makeTypeTextCommand('A')))
-                    .then(() => {
-                        setTimeout(() => {
-                            const rerenderCount = getRerenderCount();
+                    .then(
+                        () =>
+                            new Promise((resolve) => {
+                                setTimeout(() => {
+                                    const rerenderCount = getRerenderCount();
 
-                            E2EClient.submitTestResults({
-                                branch: Config.E2E_BRANCH,
-                                name: 'Composer typing rerender count',
-                                renderCount: rerenderCount,
-                            }).then(E2EClient.submitTestDone);
-                        }, 3000);
-                    })
+                                    E2EClient.submitTestResults({
+                                        branch: Config.E2E_BRANCH,
+                                        name: 'Composer typing rerender count',
+                                        metric: rerenderCount,
+                                        unit: 'renders',
+                                    })
+                                        .then(renderTimesResolve)
+                                        .then(resolve);
+                                }, 3000);
+                            }),
+                    )
+                    .then(() => E2EClient.sendNativeCommand(NativeCommands.makeBackspaceCommand()))
+                    .then(() => E2EClient.sendNativeCommand(NativeCommands.makeTypeTextCommand(message)))
+                    .then(() => runOnUI(onSubmitAction)())
                     .catch((error) => {
                         console.error('[E2E] Error while test', error);
                         E2EClient.submitTestDone();
diff --git a/src/libs/E2E/types.ts b/src/libs/E2E/types.ts
index 5cd6692c9215..8640c76e631e 100644
--- a/src/libs/E2E/types.ts
+++ b/src/libs/E2E/types.ts
@@ -1,5 +1,6 @@
 import type {TEST_NAMES} from 'tests/e2e/config';
 import type {ValueOf} from 'type-fest';
+import type E2EConfig from '../../../tests/e2e/config';
 
 type SigninParams = {
     email?: string;
@@ -26,6 +27,14 @@ type TestConfig = {
     [key: string]: string | {autoFocus: boolean};
 };
 
+type Test = (config: TestConfig) => void;
+
+type TestModule = {default: Test};
+
+type Tests = Record<ValueOf<typeof E2EConfig.TEST_NAMES>, Test>;
+
+type Unit = 'ms' | 'MB' | '%' | 'renders' | 'FPS';
+
 type TestResult = {
     /** Name of the test */
     name: string;
@@ -33,8 +42,8 @@ type TestResult = {
     /** The branch where test were running */
     branch?: string;
 
-    /** Duration in milliseconds */
-    duration?: number;
+    /** The numeric value of the measurement */
+    metric?: number;
 
     /** Optional, if set indicates that the test run failed and has no valid results. */
     error?: string;
@@ -45,8 +54,8 @@ type TestResult = {
      */
     isCritical?: boolean;
 
-    /** Render count */
-    renderCount?: number;
+    /** The unit of the measurement */
+    unit?: Unit;
 };
 
-export type {SigninParams, IsE2ETestSession, NetworkCacheMap, NetworkCacheEntry, TestConfig, TestResult};
+export type {SigninParams, IsE2ETestSession, NetworkCacheMap, NetworkCacheEntry, TestConfig, TestResult, TestModule, Tests, Unit};
diff --git a/src/libs/E2E/utils/NetworkInterceptor.ts b/src/libs/E2E/utils/NetworkInterceptor.ts
index 3a4a48f7db53..511c8014f0cd 100644
--- a/src/libs/E2E/utils/NetworkInterceptor.ts
+++ b/src/libs/E2E/utils/NetworkInterceptor.ts
@@ -1,4 +1,5 @@
 /* eslint-disable @lwc/lwc/no-async-await */
+import {DeviceEventEmitter} from 'react-native';
 import type {NetworkCacheEntry, NetworkCacheMap} from '@libs/E2E/types';
 
 const LOG_TAG = `[E2E][NetworkInterceptor]`;
@@ -25,7 +26,7 @@ function getFetchRequestHeadersAsObject(fetchRequest: RequestInit): Record<strin
         });
     } else if (typeof fetchRequest.headers === 'object') {
         Object.entries(fetchRequest.headers).forEach(([key, value]) => {
-            headers[key] = value;
+            headers[key] = value as string;
         });
     }
     return headers;
@@ -93,6 +94,33 @@ function hashFetchArgs(args: Parameters<typeof fetch>) {
     return `${url}${JSON.stringify(headers)}`;
 }
 
+let activeRequestsCount = 0;
+
+const ACTIVE_REQUESTS_QUEUE_IS_EMPTY_EVENT = 'activeRequestsQueueIsEmpty';
+
+/**
+ * Assures that ongoing network requests are empty. **Highly desirable** to call this function before closing the app.
+ * Otherwise if some requests are persisted - they will be executed on the next app start. And it can lead to a situation
+ * where we can have `N * M` requests (where `N` is the number of app run per test and `M` is the number of test suites)
+ * and such big amount of requests can lead to a situation, where first app run (in test suite to cache network requests)
+ * may be blocked by spinners and lead to unbelievable big time execution, which eventually will be bigger than timeout and
+ * will lead to a test failure.
+ */
+function waitForActiveRequestsToBeEmpty(): Promise<void> {
+    console.debug('Waiting for requests queue to be empty...', activeRequestsCount);
+
+    if (activeRequestsCount === 0) {
+        return Promise.resolve();
+    }
+
+    return new Promise((resolve) => {
+        const subscription = DeviceEventEmitter.addListener(ACTIVE_REQUESTS_QUEUE_IS_EMPTY_EVENT, () => {
+            subscription.remove();
+            resolve();
+        });
+    });
+}
+
 /**
  * Install a network interceptor by overwriting the global fetch function:
  * - Overwrites fetch globally with a custom implementation
@@ -145,6 +173,8 @@ export default function installNetworkInterceptor(
             console.debug('!!! Missed cache hit for url:', url);
         }
 
+        activeRequestsCount++;
+
         return originalFetch(...args)
             .then(async (res) => {
                 if (networkCache != null) {
@@ -166,6 +196,16 @@ export default function installNetworkInterceptor(
             .then((res) => {
                 console.debug(LOG_TAG, 'Network cache updated!');
                 return res;
+            })
+            .finally(() => {
+                console.debug('Active requests count:', activeRequestsCount);
+
+                activeRequestsCount--;
+
+                if (activeRequestsCount === 0) {
+                    DeviceEventEmitter.emit(ACTIVE_REQUESTS_QUEUE_IS_EMPTY_EVENT);
+                }
             });
     };
 }
+export {waitForActiveRequestsToBeEmpty};
diff --git a/src/libs/EmojiTrie.ts b/src/libs/EmojiTrie.ts
index d0f0b0dcfab6..88a1a7a275d4 100644
--- a/src/libs/EmojiTrie.ts
+++ b/src/libs/EmojiTrie.ts
@@ -1,7 +1,10 @@
+import type {TupleToUnion} from 'type-fest';
 import emojis, {localeEmojis} from '@assets/emojis';
 import type {Emoji, HeaderEmoji, PickerEmoji} from '@assets/emojis/types';
 import CONST from '@src/CONST';
+import type {Locale} from '@src/types/onyx';
 import Timing from './actions/Timing';
+import StringUtils from './StringUtils';
 import Trie from './Trie';
 
 type EmojiMetaData = {
@@ -15,7 +18,7 @@ Timing.start(CONST.TIMING.TRIE_INITIALIZATION);
 
 const supportedLanguages = [CONST.LOCALES.DEFAULT, CONST.LOCALES.ES] as const;
 
-type SupportedLanguage = (typeof supportedLanguages)[number];
+type SupportedLanguage = TupleToUnion<typeof supportedLanguages>;
 
 type EmojiTrie = {
     [key in SupportedLanguage]?: Trie<EmojiMetaData>;
@@ -32,15 +35,25 @@ type EmojiTrie = {
 function addKeywordsToTrie(trie: Trie<EmojiMetaData>, keywords: string[], item: Emoji, name: string, shouldPrependKeyword = false) {
     keywords.forEach((keyword) => {
         const keywordNode = trie.search(keyword);
+        const normalizedKeyword = StringUtils.normalizeAccents(keyword);
+
         if (!keywordNode) {
-            trie.add(keyword, {suggestions: [{code: item.code, types: item.types, name}]});
+            const metadata = {suggestions: [{code: item.code, types: item.types, name}]};
+            if (normalizedKeyword !== keyword) {
+                trie.add(normalizedKeyword, metadata);
+            }
+            trie.add(keyword, metadata);
         } else {
             const suggestion = {code: item.code, types: item.types, name};
             const suggestions = shouldPrependKeyword ? [suggestion, ...(keywordNode.metaData.suggestions ?? [])] : [...(keywordNode.metaData.suggestions ?? []), suggestion];
-            trie.update(keyword, {
+            const newMetadata = {
                 ...keywordNode.metaData,
                 suggestions,
-            });
+            };
+            if (normalizedKeyword !== keyword) {
+                trie.update(normalizedKeyword, newMetadata);
+            }
+            trie.update(keyword, newMetadata);
         }
     });
 }
@@ -67,12 +80,21 @@ function createTrie(lang: SupportedLanguage = CONST.LOCALES.DEFAULT): Trie<Emoji
         .forEach((item: Emoji) => {
             const englishName = item.name;
             const localeName = langEmojis?.[item.code]?.name ?? englishName;
+            const normalizedName = StringUtils.normalizeAccents(localeName);
 
             const node = trie.search(localeName);
             if (!node) {
-                trie.add(localeName, {code: item.code, types: item.types, name: localeName, suggestions: []});
+                const metadata = {code: item.code, types: item.types, name: localeName, suggestions: []};
+                if (normalizedName !== localeName) {
+                    trie.add(normalizedName, metadata);
+                }
+                trie.add(localeName, metadata);
             } else {
-                trie.update(localeName, {code: item.code, types: item.types, name: localeName, suggestions: node.metaData.suggestions});
+                const newMetadata = {code: item.code, types: item.types, name: localeName, suggestions: node.metaData.suggestions};
+                if (normalizedName !== localeName) {
+                    trie.update(normalizedName, newMetadata);
+                }
+                trie.update(localeName, newMetadata);
             }
 
             const nameParts = getNameParts(localeName).slice(1); // We remove the first part because we already index the full name.
@@ -95,9 +117,25 @@ function createTrie(lang: SupportedLanguage = CONST.LOCALES.DEFAULT): Trie<Emoji
     return trie;
 }
 
-const emojiTrie: EmojiTrie = supportedLanguages.reduce((prev, cur) => ({...prev, [cur]: createTrie(cur)}), {});
+const emojiTrie: EmojiTrie = supportedLanguages.reduce((acc, lang) => {
+    acc[lang] = undefined;
+    return acc;
+}, {} as EmojiTrie);
+
+const buildEmojisTrie = (locale: Locale) => {
+    // Normalize the locale to lowercase and take the first part before any dash
+    const normalizedLocale = locale.toLowerCase().split('-')[0];
+    const localeToUse = supportedLanguages.includes(normalizedLocale as SupportedLanguage) ? (normalizedLocale as SupportedLanguage) : undefined;
+
+    if (!localeToUse || emojiTrie[localeToUse]) {
+        return; // Return early if the locale is not supported or the trie is already built
+    }
+    emojiTrie[localeToUse] = createTrie(localeToUse);
+};
 
 Timing.end(CONST.TIMING.TRIE_INITIALIZATION);
 
 export default emojiTrie;
+export {buildEmojisTrie};
+
 export type {SupportedLanguage};
diff --git a/src/libs/EmojiUtils.ts b/src/libs/EmojiUtils.ts
index 3b189dbb084f..a8958295bb96 100644
--- a/src/libs/EmojiUtils.ts
+++ b/src/libs/EmojiUtils.ts
@@ -1,6 +1,4 @@
-import {getUnixTime} from 'date-fns';
-import Str from 'expensify-common/lib/str';
-import memoize from 'lodash/memoize';
+import {Str} from 'expensify-common';
 import Onyx from 'react-native-onyx';
 import type {OnyxEntry} from 'react-native-onyx';
 import * as Emojis from '@assets/emojis';
@@ -10,12 +8,20 @@ import ONYXKEYS from '@src/ONYXKEYS';
 import type {FrequentlyUsedEmoji, Locale} from '@src/types/onyx';
 import type {ReportActionReaction, UsersReactions} from '@src/types/onyx/ReportActionReactions';
 import type IconAsset from '@src/types/utils/IconAsset';
+import type EmojiTrie from './EmojiTrie';
+import type {SupportedLanguage} from './EmojiTrie';
+import memoize from './memoize';
 
 type HeaderIndice = {code: string; index: number; icon: IconAsset};
 type EmojiSpacer = {code: string; spacer: boolean};
 type EmojiPickerListItem = EmojiSpacer | Emoji | HeaderEmoji;
 type EmojiPickerList = EmojiPickerListItem[];
 type ReplacedEmoji = {text: string; emojis: Emoji[]; cursorPosition?: number};
+type EmojiTrieModule = {default: typeof EmojiTrie};
+
+const findEmojiByName = (name: string): Emoji => Emojis.emojiNameTable[name];
+
+const findEmojiByCode = (code: string): Emoji => Emojis.emojiCodeTableWithSkinTones[code];
 
 let frequentlyUsedEmojis: FrequentlyUsedEmoji[] = [];
 Onyx.connect({
@@ -27,17 +33,43 @@ Onyx.connect({
         frequentlyUsedEmojis =
             val
                 ?.map((item) => {
-                    const emoji = Emojis.emojiCodeTableWithSkinTones[item.code];
-                    return {...emoji, count: item.count, lastUpdatedAt: item.lastUpdatedAt};
+                    let emoji = item;
+                    if (!item.code) {
+                        emoji = {...emoji, ...findEmojiByName(item.name)};
+                    }
+                    if (!item.name) {
+                        emoji = {...emoji, ...findEmojiByCode(item.code)};
+                    }
+                    const emojiWithSkinTones = Emojis.emojiCodeTableWithSkinTones[emoji.code];
+                    if (!emojiWithSkinTones) {
+                        return null;
+                    }
+                    return {...emojiWithSkinTones, count: item.count, lastUpdatedAt: item.lastUpdatedAt};
                 })
                 .filter((emoji): emoji is FrequentlyUsedEmoji => !!emoji) ?? [];
+
+        // On AddComment API response, each variant of the same emoji (with different skin tones) is
+        // treated as a separate entry due to unique emoji codes for each variant.
+        // So merge duplicate emojis, sum their counts, and use the latest lastUpdatedAt timestamp, then sort accordingly.
+        const frequentlyUsedEmojiCodesToObjects = new Map<string, FrequentlyUsedEmoji>();
+        frequentlyUsedEmojis.forEach((emoji) => {
+            const existingEmoji = frequentlyUsedEmojiCodesToObjects.get(emoji.code);
+            if (existingEmoji) {
+                existingEmoji.count += emoji.count;
+                existingEmoji.lastUpdatedAt = Math.max(existingEmoji.lastUpdatedAt, emoji.lastUpdatedAt);
+            } else {
+                frequentlyUsedEmojiCodesToObjects.set(emoji.code, emoji);
+            }
+        });
+        frequentlyUsedEmojis = Array.from(frequentlyUsedEmojiCodesToObjects.values()).sort((a, b) => {
+            if (a.count !== b.count) {
+                return b.count - a.count;
+            }
+            return b.lastUpdatedAt - a.lastUpdatedAt;
+        });
     },
 });
 
-const findEmojiByName = (name: string): Emoji => Emojis.emojiNameTable[name];
-
-const findEmojiByCode = (code: string): Emoji => Emojis.emojiCodeTableWithSkinTones[code];
-
 const getEmojiName = (emoji: Emoji, lang: Locale = CONST.LOCALES.DEFAULT): string => {
     if (!emoji) {
         return '';
@@ -64,42 +96,45 @@ const getLocalizedEmojiName = (name: string, lang: OnyxEntry<Locale>): string =>
 /**
  * Get the unicode code of an emoji in base 16.
  */
-const getEmojiUnicode = memoize((input: string) => {
-    if (input.length === 0) {
-        return '';
-    }
+const getEmojiUnicode = memoize(
+    (input: string) => {
+        if (input.length === 0) {
+            return '';
+        }
 
-    if (input.length === 1) {
-        return input
-            .charCodeAt(0)
-            .toString()
-            .split(' ')
-            .map((val) => parseInt(val, 10).toString(16))
-            .join(' ');
-    }
+        if (input.length === 1) {
+            return input
+                .charCodeAt(0)
+                .toString()
+                .split(' ')
+                .map((val) => parseInt(val, 10).toString(16))
+                .join(' ');
+        }
 
-    const pairs = [];
-
-    // Some Emojis in UTF-16 are stored as a pair of 2 Unicode characters (e.g. Flags)
-    // The first char is generally between the range U+D800 to U+DBFF called High surrogate
-    // & the second char between the range U+DC00 to U+DFFF called low surrogate
-    // More info in the following links:
-    // 1. https://docs.microsoft.com/en-us/windows/win32/intl/surrogates-and-supplementary-characters
-    // 2. https://thekevinscott.com/emojis-in-javascript/
-    for (let i = 0; i < input.length; i++) {
-        if (input.charCodeAt(i) >= 0xd800 && input.charCodeAt(i) <= 0xdbff) {
-            // high surrogate
-            if (input.charCodeAt(i + 1) >= 0xdc00 && input.charCodeAt(i + 1) <= 0xdfff) {
-                // low surrogate
-                pairs.push((input.charCodeAt(i) - 0xd800) * 0x400 + (input.charCodeAt(i + 1) - 0xdc00) + 0x10000);
+        const pairs = [];
+
+        // Some Emojis in UTF-16 are stored as a pair of 2 Unicode characters (e.g. Flags)
+        // The first char is generally between the range U+D800 to U+DBFF called High surrogate
+        // & the second char between the range U+DC00 to U+DFFF called low surrogate
+        // More info in the following links:
+        // 1. https://docs.microsoft.com/en-us/windows/win32/intl/surrogates-and-supplementary-characters
+        // 2. https://thekevinscott.com/emojis-in-javascript/
+        for (let i = 0; i < input.length; i++) {
+            if (input.charCodeAt(i) >= 0xd800 && input.charCodeAt(i) <= 0xdbff) {
+                // high surrogate
+                if (input.charCodeAt(i + 1) >= 0xdc00 && input.charCodeAt(i + 1) <= 0xdfff) {
+                    // low surrogate
+                    pairs.push((input.charCodeAt(i) - 0xd800) * 0x400 + (input.charCodeAt(i + 1) - 0xdc00) + 0x10000);
+                }
+            } else if (input.charCodeAt(i) < 0xd800 || input.charCodeAt(i) > 0xdfff) {
+                // modifiers and joiners
+                pairs.push(input.charCodeAt(i));
             }
-        } else if (input.charCodeAt(i) < 0xd800 || input.charCodeAt(i) > 0xdfff) {
-            // modifiers and joiners
-            pairs.push(input.charCodeAt(i));
         }
-    }
-    return pairs.map((val) => parseInt(String(val), 10).toString(16)).join(' ');
-});
+        return pairs.map((val) => parseInt(String(val), 10).toString(16)).join(' ');
+    },
+    {monitoringName: 'getEmojiUnicode'},
+);
 
 /**
  * Function to remove Skin Tone and utf16 surrogates from Emoji
@@ -191,7 +226,7 @@ function getDynamicSpacing(emojiCount: number, suffix: number): EmojiSpacer[] {
 function addSpacesToEmojiCategories(emojis: PickerEmojis): EmojiPickerList {
     let updatedEmojis: EmojiPickerList = [];
     emojis.forEach((emoji, index) => {
-        if ('header' in emoji) {
+        if (emoji && typeof emoji === 'object' && 'header' in emoji) {
             updatedEmojis = updatedEmojis.concat(getDynamicSpacing(updatedEmojis.length, index), [emoji], getDynamicSpacing(1, index));
             return;
         }
@@ -208,39 +243,21 @@ function mergeEmojisWithFrequentlyUsedEmojis(emojis: PickerEmojis): EmojiPickerL
         return addSpacesToEmojiCategories(emojis);
     }
 
-    const mergedEmojis = [Emojis.categoryFrequentlyUsed, ...frequentlyUsedEmojis, ...emojis];
-    return addSpacesToEmojiCategories(mergedEmojis);
-}
-
-/**
- * Get the updated frequently used emojis list by usage
- */
-function getFrequentlyUsedEmojis(newEmoji: Emoji | Emoji[]): FrequentlyUsedEmoji[] {
-    let frequentEmojiList = [...frequentlyUsedEmojis];
-
-    const maxFrequentEmojiCount = CONST.EMOJI_FREQUENT_ROW_COUNT * CONST.EMOJI_NUM_PER_ROW - 1;
-
-    const currentTimestamp = getUnixTime(new Date());
-    (Array.isArray(newEmoji) ? [...newEmoji] : [newEmoji]).forEach((emoji) => {
-        let currentEmojiCount = 1;
-        const emojiIndex = frequentEmojiList.findIndex((e) => e.code === emoji.code);
-        if (emojiIndex >= 0) {
-            currentEmojiCount = frequentEmojiList[emojiIndex].count + 1;
-            frequentEmojiList.splice(emojiIndex, 1);
+    const formattedFrequentlyUsedEmojis = frequentlyUsedEmojis.map((frequentlyUsedEmoji: Emoji): Emoji => {
+        // Frequently used emojis in the old format will have name/types/code stored with them
+        // The back-end may not always have both, so we'll need to fill them in.
+        if (!('code' in (frequentlyUsedEmoji as FrequentlyUsedEmoji))) {
+            return findEmojiByName(frequentlyUsedEmoji.name);
+        }
+        if (!('name' in (frequentlyUsedEmoji as FrequentlyUsedEmoji))) {
+            return findEmojiByCode(frequentlyUsedEmoji.code);
         }
 
-        const updatedEmoji = {...Emojis.emojiCodeTableWithSkinTones[emoji.code], count: currentEmojiCount, lastUpdatedAt: currentTimestamp};
-
-        // We want to make sure the current emoji is added to the list
-        // Hence, we take one less than the current frequent used emojis
-        frequentEmojiList = frequentEmojiList.slice(0, maxFrequentEmojiCount);
-        frequentEmojiList.push(updatedEmoji);
-
-        // Sort the list by count and lastUpdatedAt in descending order
-        frequentEmojiList.sort((a, b) => b.count - a.count || b.lastUpdatedAt - a.lastUpdatedAt);
+        return frequentlyUsedEmoji;
     });
 
-    return frequentEmojiList;
+    const mergedEmojis = [Emojis.categoryFrequentlyUsed, ...formattedFrequentlyUsedEmojis, ...emojis];
+    return addSpacesToEmojiCategories(mergedEmojis);
 }
 
 /**
@@ -312,9 +329,9 @@ function getAddedEmojis(currentEmojis: Emoji[], formerEmojis: Emoji[]): Emoji[]
  */
 function replaceEmojis(text: string, preferredSkinTone: OnyxEntry<number | string> = CONST.EMOJI_DEFAULT_SKIN_TONE, lang: Locale = CONST.LOCALES.DEFAULT): ReplacedEmoji {
     // emojisTrie is importing the emoji JSON file on the app starting and we want to avoid it
-    const emojisTrie = require('./EmojiTrie').default;
+    const emojisTrie = require<EmojiTrieModule>('./EmojiTrie').default;
 
-    const trie = emojisTrie[lang];
+    const trie = emojisTrie[lang as SupportedLanguage];
     if (!trie) {
         return {text, emojis: []};
     }
@@ -390,9 +407,9 @@ function replaceAndExtractEmojis(text: string, preferredSkinTone: OnyxEntry<numb
  */
 function suggestEmojis(text: string, lang: Locale, limit: number = CONST.AUTO_COMPLETE_SUGGESTER.MAX_AMOUNT_OF_SUGGESTIONS): Emoji[] | undefined {
     // emojisTrie is importing the emoji JSON file on the app starting and we want to avoid it
-    const emojisTrie = require('./EmojiTrie').default;
+    const emojisTrie = require<EmojiTrieModule>('./EmojiTrie').default;
 
-    const trie = emojisTrie[lang];
+    const trie = emojisTrie[lang as SupportedLanguage];
     if (!trie) {
         return [];
     }
@@ -431,7 +448,7 @@ function suggestEmojis(text: string, lang: Locale, limit: number = CONST.AUTO_CO
 /**
  * Retrieve preferredSkinTone as Number to prevent legacy 'default' String value
  */
-const getPreferredSkinToneIndex = (value: string | number | null): number => {
+const getPreferredSkinToneIndex = (value: OnyxEntry<string | number>): number => {
     if (value !== null && Number.isInteger(Number(value))) {
         return Number(value);
     }
@@ -517,13 +534,13 @@ const enrichEmojiReactionWithTimestamps = (emoji: ReportActionReaction, emojiNam
  */
 function hasAccountIDEmojiReacted(accountID: number, usersReactions: UsersReactions, skinTone?: number) {
     if (skinTone === undefined) {
-        return Boolean(usersReactions[accountID]);
+        return !!usersReactions[accountID];
     }
     const userReaction = usersReactions[accountID];
     if (!userReaction?.skinTones || !Object.values(userReaction?.skinTones ?? {}).length) {
         return false;
     }
-    return Boolean(userReaction.skinTones[skinTone]);
+    return !!userReaction.skinTones[skinTone];
 }
 
 /**
@@ -578,7 +595,6 @@ export {
     getLocalizedEmojiName,
     getHeaderEmojis,
     mergeEmojisWithFrequentlyUsedEmojis,
-    getFrequentlyUsedEmojis,
     containsOnlyEmojis,
     replaceEmojis,
     suggestEmojis,
diff --git a/src/libs/Environment/betaChecker/index.android.ts b/src/libs/Environment/betaChecker/index.android.ts
index 4b912e0daaa5..0592cc0b3923 100644
--- a/src/libs/Environment/betaChecker/index.android.ts
+++ b/src/libs/Environment/betaChecker/index.android.ts
@@ -4,13 +4,18 @@ import * as AppUpdate from '@libs/actions/AppUpdate';
 import CONST from '@src/CONST';
 import ONYXKEYS from '@src/ONYXKEYS';
 import pkg from '../../../../package.json';
-import type IsBetaBuild from './types';
+import type {IsBetaBuild} from './types';
+
+type GithubReleaseJSON = {
+    // eslint-disable-next-line @typescript-eslint/naming-convention
+    tag_name: string | semver.SemVer;
+};
 
 let isLastSavedBeta = false;
 Onyx.connect({
     key: ONYXKEYS.IS_BETA,
     callback: (value) => {
-        isLastSavedBeta = Boolean(value);
+        isLastSavedBeta = !!value;
     },
 });
 
@@ -21,7 +26,7 @@ function isBetaBuild(): IsBetaBuild {
     return new Promise((resolve) => {
         fetch(CONST.GITHUB_RELEASE_URL)
             .then((res) => res.json())
-            .then((json) => {
+            .then((json: GithubReleaseJSON) => {
                 const productionVersion = json.tag_name;
                 if (!productionVersion) {
                     AppUpdate.setIsAppInBeta(false);
diff --git a/src/libs/Environment/betaChecker/index.ios.ts b/src/libs/Environment/betaChecker/index.ios.ts
index dae79dabfd2b..3220d9b00e05 100644
--- a/src/libs/Environment/betaChecker/index.ios.ts
+++ b/src/libs/Environment/betaChecker/index.ios.ts
@@ -1,5 +1,5 @@
 import {NativeModules} from 'react-native';
-import type IsBetaBuild from './types';
+import type {IsBetaBuild} from './types';
 
 /**
  * Check to see if the build is staging (TestFlight) or production
diff --git a/src/libs/Environment/betaChecker/index.ts b/src/libs/Environment/betaChecker/index.ts
index ce1668759c8c..eaa8bfbc1500 100644
--- a/src/libs/Environment/betaChecker/index.ts
+++ b/src/libs/Environment/betaChecker/index.ts
@@ -1,4 +1,4 @@
-import type IsBetaBuild from './types';
+import type {IsBetaBuild} from './types';
 
 /**
  * There's no beta build in non native
diff --git a/src/libs/Environment/betaChecker/types.ts b/src/libs/Environment/betaChecker/types.ts
index 61ce4bc9cec4..ef205425a309 100644
--- a/src/libs/Environment/betaChecker/types.ts
+++ b/src/libs/Environment/betaChecker/types.ts
@@ -1,3 +1,7 @@
 type IsBetaBuild = Promise<boolean>;
 
-export default IsBetaBuild;
+type EnvironmentCheckerModule = {
+    isBeta: () => IsBetaBuild;
+};
+
+export type {IsBetaBuild, EnvironmentCheckerModule};
diff --git a/src/libs/ErrorUtils.ts b/src/libs/ErrorUtils.ts
index 3487f05b9c05..cf852e533a20 100644
--- a/src/libs/ErrorUtils.ts
+++ b/src/libs/ErrorUtils.ts
@@ -1,4 +1,5 @@
 import mapValues from 'lodash/mapValues';
+import type {OnyxEntry} from 'react-native-onyx';
 import CONST from '@src/CONST';
 import type {TranslationFlatObject, TranslationPaths} from '@src/languages/types';
 import type {ErrorFields, Errors} from '@src/types/onyx/OnyxCommon';
@@ -37,11 +38,19 @@ function getAuthenticateErrorMessage(response: Response): keyof TranslationFlatO
 }
 
 /**
- * Method used to get an error object with microsecond as the key.
- * @param error - error key or message to be saved
+ * Creates an error object with a timestamp (in microseconds) as the key and the translated error message as the value.
+ * @param error - The translation key for the error message.
  */
-function getMicroSecondOnyxError(error: string, isTranslated = false, errorKey?: number): Errors {
-    return {[errorKey ?? DateUtils.getMicroseconds()]: error && [error, {isTranslated}]};
+function getMicroSecondOnyxErrorWithTranslationKey(error: TranslationPaths, errorKey?: number): Errors {
+    return {[errorKey ?? DateUtils.getMicroseconds()]: Localize.translateLocal(error)};
+}
+
+/**
+ * Creates an error object with a timestamp (in microseconds) as the key and the error message as the value.
+ * @param error - The error message.
+ */
+function getMicroSecondOnyxErrorWithMessage(error: string, errorKey?: number): Errors {
+    return {[errorKey ?? DateUtils.getMicroseconds()]: error};
 }
 
 /**
@@ -53,15 +62,15 @@ function getMicroSecondOnyxErrorObject(error: Errors, errorKey?: number): ErrorF
 }
 
 // We can assume that if error is a string, it has already been translated because it is server error
-function getErrorMessageWithTranslationData(error: Localize.MaybePhraseKey): Localize.MaybePhraseKey {
-    return typeof error === 'string' ? [error, {isTranslated: true}] : error;
+function getErrorMessageWithTranslationData(error: string | null): string {
+    return error ?? '';
 }
 
 type OnyxDataWithErrors = {
     errors?: Errors | null;
 };
 
-function getLatestErrorMessage<TOnyxData extends OnyxDataWithErrors>(onyxData: TOnyxData | null): Localize.MaybePhraseKey {
+function getLatestErrorMessage<TOnyxData extends OnyxDataWithErrors>(onyxData: OnyxEntry<TOnyxData> | null): string {
     const errors = onyxData?.errors ?? {};
 
     if (Object.keys(errors).length === 0) {
@@ -69,11 +78,11 @@ function getLatestErrorMessage<TOnyxData extends OnyxDataWithErrors>(onyxData: T
     }
 
     const key = Object.keys(errors).sort().reverse()[0];
-    return getErrorMessageWithTranslationData(errors[key]);
+    return getErrorMessageWithTranslationData(errors[key] ?? '');
 }
 
-function getLatestErrorMessageField<TOnyxData extends OnyxDataWithErrors>(onyxData: TOnyxData): Errors {
-    const errors = onyxData.errors ?? {};
+function getLatestErrorMessageField<TOnyxData extends OnyxDataWithErrors>(onyxData: OnyxEntry<TOnyxData>): Errors {
+    const errors = onyxData?.errors ?? {};
 
     if (Object.keys(errors).length === 0) {
         return {};
@@ -88,8 +97,8 @@ type OnyxDataWithErrorFields = {
     errorFields?: ErrorFields;
 };
 
-function getLatestErrorField<TOnyxData extends OnyxDataWithErrorFields>(onyxData: TOnyxData, fieldName: string): Errors {
-    const errorsForField = onyxData.errorFields?.[fieldName] ?? {};
+function getLatestErrorField<TOnyxData extends OnyxDataWithErrorFields>(onyxData: OnyxEntry<TOnyxData>, fieldName: string): Errors {
+    const errorsForField = onyxData?.errorFields?.[fieldName] ?? {};
 
     if (Object.keys(errorsForField).length === 0) {
         return {};
@@ -99,8 +108,8 @@ function getLatestErrorField<TOnyxData extends OnyxDataWithErrorFields>(onyxData
     return {[key]: getErrorMessageWithTranslationData(errorsForField[key])};
 }
 
-function getEarliestErrorField<TOnyxData extends OnyxDataWithErrorFields>(onyxData: TOnyxData, fieldName: string): Errors {
-    const errorsForField = onyxData.errorFields?.[fieldName] ?? {};
+function getEarliestErrorField<TOnyxData extends OnyxDataWithErrorFields>(onyxData: OnyxEntry<TOnyxData>, fieldName: string): Errors {
+    const errorsForField = onyxData?.errorFields?.[fieldName] ?? {};
 
     if (Object.keys(errorsForField).length === 0) {
         return {};
@@ -113,8 +122,8 @@ function getEarliestErrorField<TOnyxData extends OnyxDataWithErrorFields>(onyxDa
 /**
  * Method used to get the latest error field for any field
  */
-function getLatestErrorFieldForAnyField<TOnyxData extends OnyxDataWithErrorFields>(onyxData: TOnyxData): Errors {
-    const errorFields = onyxData.errorFields ?? {};
+function getLatestErrorFieldForAnyField<TOnyxData extends OnyxDataWithErrorFields>(onyxData: OnyxEntry<TOnyxData>): Errors {
+    const errorFields = onyxData?.errorFields ?? {};
 
     if (Object.keys(errorFields).length === 0) {
         return {};
@@ -122,20 +131,20 @@ function getLatestErrorFieldForAnyField<TOnyxData extends OnyxDataWithErrorField
 
     const fieldNames = Object.keys(errorFields);
     const latestErrorFields = fieldNames.map((fieldName) => getLatestErrorField(onyxData, fieldName));
-    return latestErrorFields.reduce((acc, error) => ({...acc, ...error}), {});
+    return latestErrorFields.reduce((acc, error) => Object.assign(acc, error), {});
 }
 
 /**
- * Method used to attach already translated message with isTranslated property
+ * Method used to attach already translated message
  * @param errors - An object containing current errors in the form
- * @returns Errors in the form of {timestamp: [message, {isTranslated}]}
+ * @returns Errors in the form of {timestamp: message}
  */
-function getErrorsWithTranslationData(errors: Localize.MaybePhraseKey | Errors): Errors {
-    if (!errors || (Array.isArray(errors) && errors.length === 0)) {
+function getErrorsWithTranslationData(errors: Errors): Errors {
+    if (!errors) {
         return {};
     }
 
-    if (typeof errors === 'string' || Array.isArray(errors)) {
+    if (typeof errors === 'string') {
         // eslint-disable-next-line @typescript-eslint/naming-convention
         return {'0': getErrorMessageWithTranslationData(errors)};
     }
@@ -148,21 +157,18 @@ function getErrorsWithTranslationData(errors: Localize.MaybePhraseKey | Errors):
  * @param errors - An object containing current errors in the form
  * @param message - Message to assign to the inputID errors
  */
-function addErrorMessage<TKey extends TranslationPaths>(errors: Errors, inputID?: string | null, message?: TKey | Localize.MaybePhraseKey) {
+function addErrorMessage(errors: Errors, inputID?: string | null, message?: string | null) {
     if (!message || !inputID) {
         return;
     }
 
     const errorList = errors;
     const error = errorList[inputID];
-    const translatedMessage = Localize.translateIfPhraseKey(message);
 
     if (!error) {
-        errorList[inputID] = [translatedMessage, {isTranslated: true}];
+        errorList[inputID] = message;
     } else if (typeof error === 'string') {
-        errorList[inputID] = [`${error}\n${translatedMessage}`, {isTranslated: true}];
-    } else if (Array.isArray(error)) {
-        error[0] = `${error[0]}\n${translatedMessage}`;
+        errorList[inputID] = `${error}\n${message}`;
     }
 }
 
@@ -189,10 +195,11 @@ export {
     getErrorMessageWithTranslationData,
     getErrorsWithTranslationData,
     getLatestErrorField,
+    getLatestErrorFieldForAnyField,
     getLatestErrorMessage,
     getLatestErrorMessageField,
-    getLatestErrorFieldForAnyField,
-    getMicroSecondOnyxError,
+    getMicroSecondOnyxErrorWithTranslationKey,
+    getMicroSecondOnyxErrorWithMessage,
     getMicroSecondOnyxErrorObject,
     isReceiptError,
 };
diff --git a/src/libs/ExportOnyxState/common.ts b/src/libs/ExportOnyxState/common.ts
new file mode 100644
index 000000000000..ac2adf010eca
--- /dev/null
+++ b/src/libs/ExportOnyxState/common.ts
@@ -0,0 +1,34 @@
+import {Str} from 'expensify-common';
+import ONYXKEYS from '@src/ONYXKEYS';
+
+const maskFragileData = (data: Record<string, unknown>, parentKey?: string): Record<string, unknown> => {
+    const maskedData: Record<string, unknown> = {};
+
+    if (!data) {
+        return maskedData;
+    }
+
+    Object.keys(data).forEach((key) => {
+        if (!Object.prototype.hasOwnProperty.call(data, key)) {
+            return;
+        }
+
+        const value = data[key];
+
+        if (typeof value === 'string' && (Str.isValidEmail(value) || key === 'authToken' || key === 'encryptedAuthToken')) {
+            maskedData[key] = '***';
+        } else if (parentKey && parentKey.includes(ONYXKEYS.COLLECTION.REPORT_ACTIONS) && (key === 'text' || key === 'html')) {
+            maskedData[key] = '***';
+        } else if (typeof value === 'object') {
+            maskedData[key] = maskFragileData(value as Record<string, unknown>, key.includes(ONYXKEYS.COLLECTION.REPORT_ACTIONS) ? key : parentKey);
+        } else {
+            maskedData[key] = value;
+        }
+    });
+
+    return maskedData;
+};
+
+export default {
+    maskFragileData,
+};
diff --git a/src/libs/ExportOnyxState/index.native.ts b/src/libs/ExportOnyxState/index.native.ts
new file mode 100644
index 000000000000..bc32b29bc2ab
--- /dev/null
+++ b/src/libs/ExportOnyxState/index.native.ts
@@ -0,0 +1,42 @@
+import RNFS from 'react-native-fs';
+import {open} from 'react-native-quick-sqlite';
+import Share from 'react-native-share';
+import CONST from '@src/CONST';
+import common from './common';
+
+const readFromOnyxDatabase = () =>
+    new Promise((resolve) => {
+        const db = open({name: CONST.DEFAULT_DB_NAME});
+        const query = `SELECT * FROM ${CONST.DEFAULT_TABLE_NAME}`;
+
+        db.executeAsync(query, []).then(({rows}) => {
+            // eslint-disable-next-line no-underscore-dangle, @typescript-eslint/no-unsafe-member-access
+            const result = rows?._array.map((row) => ({[row?.record_key]: JSON.parse(row?.valueJSON as string) as unknown}));
+
+            resolve(result);
+        });
+    });
+
+const shareAsFile = (value: string) => {
+    try {
+        // Define new filename and path for the app info file
+        const infoFileName = CONST.DEFAULT_ONYX_DUMP_FILE_NAME;
+        const infoFilePath = `${RNFS.DocumentDirectoryPath}/${infoFileName}`;
+        const actualInfoFile = `file://${infoFilePath}`;
+
+        RNFS.writeFile(infoFilePath, value, 'utf8').then(() => {
+            Share.open({
+                url: actualInfoFile,
+                failOnCancel: false,
+            });
+        });
+    } catch (error) {
+        console.error('Error renaming and sharing file:', error);
+    }
+};
+
+export default {
+    maskFragileData: common.maskFragileData,
+    readFromOnyxDatabase,
+    shareAsFile,
+};
diff --git a/src/libs/ExportOnyxState/index.ts b/src/libs/ExportOnyxState/index.ts
new file mode 100644
index 000000000000..16a2e96bc25e
--- /dev/null
+++ b/src/libs/ExportOnyxState/index.ts
@@ -0,0 +1,50 @@
+import CONST from '@src/CONST';
+import common from './common';
+
+const readFromOnyxDatabase = () =>
+    new Promise<Record<string, unknown>>((resolve) => {
+        let db: IDBDatabase;
+        const openRequest = indexedDB.open(CONST.DEFAULT_DB_NAME);
+        openRequest.onsuccess = () => {
+            db = openRequest.result;
+            const transaction = db.transaction(CONST.DEFAULT_TABLE_NAME);
+            const objectStore = transaction.objectStore(CONST.DEFAULT_TABLE_NAME);
+            const cursor = objectStore.openCursor();
+
+            const queryResult: Record<string, unknown> = {};
+
+            cursor.onerror = () => {
+                console.error('Error reading cursor');
+            };
+
+            cursor.onsuccess = (event) => {
+                const {result} = event.target as IDBRequest<IDBCursorWithValue>;
+                if (result) {
+                    queryResult[result.primaryKey as string] = result.value;
+                    result.continue();
+                } else {
+                    // no results mean the cursor has reached the end of the data
+                    resolve(queryResult);
+                }
+            };
+        };
+    });
+
+const shareAsFile = (value: string) => {
+    const element = document.createElement('a');
+    element.setAttribute('href', `data:text/plain;charset=utf-8,${encodeURIComponent(value)}`);
+    element.setAttribute('download', CONST.DEFAULT_ONYX_DUMP_FILE_NAME);
+
+    element.style.display = 'none';
+    document.body.appendChild(element);
+
+    element.click();
+
+    document.body.removeChild(element);
+};
+
+export default {
+    maskFragileData: common.maskFragileData,
+    readFromOnyxDatabase,
+    shareAsFile,
+};
diff --git a/src/libs/Firebase/index.native.ts b/src/libs/Firebase/index.native.ts
index bf8551954671..d2746d8b25e7 100644
--- a/src/libs/Firebase/index.native.ts
+++ b/src/libs/Firebase/index.native.ts
@@ -1,7 +1,11 @@
 /* eslint-disable no-unused-vars */
+import crashlytics from '@react-native-firebase/crashlytics';
 import perf from '@react-native-firebase/perf';
 import * as Environment from '@libs/Environment/Environment';
-import type {StartTrace, StopTrace, TraceMap} from './types';
+import * as PersonalDetailsUtils from '@libs/PersonalDetailsUtils';
+import * as ReportConnection from '@libs/ReportConnection';
+import * as SessionUtils from '@libs/SessionUtils';
+import type {FirebaseAttributes, Log, StartTrace, StopTrace, TraceMap} from './types';
 
 const traceMap: TraceMap = {};
 
@@ -15,9 +19,14 @@ const startTrace: StartTrace = (customEventName) => {
         return;
     }
 
+    const attributes = getAttributes();
+
     perf()
         .startTrace(customEventName)
         .then((trace) => {
+            Object.entries(attributes).forEach(([name, value]) => {
+                trace.putAttribute(name, value);
+            });
             traceMap[customEventName] = {
                 trace,
                 start,
@@ -46,7 +55,26 @@ const stopTrace: StopTrace = (customEventName) => {
     delete traceMap[customEventName];
 };
 
+const log: Log = (action: string) => {
+    crashlytics().log(action);
+};
+
+function getAttributes(): FirebaseAttributes {
+    const session = SessionUtils.getSession();
+
+    const accountId = session?.accountID?.toString() ?? 'N/A';
+    const reportsLength = ReportConnection.getAllReportsLength().toString();
+    const personalDetailsLength = PersonalDetailsUtils.getPersonalDetailsLength().toString();
+
+    return {
+        accountId,
+        reportsLength,
+        personalDetailsLength,
+    };
+}
+
 export default {
     startTrace,
     stopTrace,
+    log,
 };
diff --git a/src/libs/Firebase/index.ts b/src/libs/Firebase/index.ts
index 8698a841db4a..13e354ec61a6 100644
--- a/src/libs/Firebase/index.ts
+++ b/src/libs/Firebase/index.ts
@@ -1,10 +1,12 @@
-import type {StartTrace, StopTrace} from './types';
+import type {Log, StartTrace, StopTrace} from './types';
 
 /** Web does not use Firebase for performance tracing */
 const startTrace: StartTrace = () => {};
 const stopTrace: StopTrace = () => {};
+const log: Log = () => {};
 
 export default {
     startTrace,
     stopTrace,
+    log,
 };
diff --git a/src/libs/Firebase/types.ts b/src/libs/Firebase/types.ts
index 1a1d4959740a..e262e3c73e81 100644
--- a/src/libs/Firebase/types.ts
+++ b/src/libs/Firebase/types.ts
@@ -7,5 +7,11 @@ type Trace = {
 type TraceMap = Record<string, Trace>;
 type StartTrace = (customEventName: string) => void;
 type StopTrace = (customEventName: string) => void;
+type Log = (action: string) => void;
+type FirebaseAttributes = {
+    accountId: string;
+    personalDetailsLength: string;
+    reportsLength: string;
+};
 
-export type {StartTrace, StopTrace, TraceMap};
+export type {StartTrace, StopTrace, TraceMap, Log, FirebaseAttributes};
diff --git a/src/libs/Fullstory/index.native.ts b/src/libs/Fullstory/index.native.ts
new file mode 100644
index 000000000000..7974c35562ca
--- /dev/null
+++ b/src/libs/Fullstory/index.native.ts
@@ -0,0 +1,73 @@
+import FullStory, {FSPage} from '@fullstory/react-native';
+import type {OnyxEntry} from 'react-native-onyx';
+import {useOnyx} from 'react-native-onyx';
+import CONST from '@src/CONST';
+import * as Environment from '@src/libs/Environment/Environment';
+import ONYXKEYS from '@src/ONYXKEYS';
+import type {UserMetadata} from '@src/types/onyx';
+
+/**
+ * Fullstory React-Native lib adapter
+ * Proxy function calls to React-Native lib
+ * */
+const FS = {
+    /**
+     * Initializes FullStory
+     */
+    init: () => {
+        Environment.getEnvironment().then((envName: string) => {
+            // We only want to start fullstory if the app is running in production
+            if (envName !== CONST.ENVIRONMENT.PRODUCTION) {
+                return;
+            }
+            FullStory.restart();
+            const [session] = useOnyx(ONYXKEYS.USER_METADATA);
+            FS.fsIdentify(session);
+        });
+    },
+
+    /**
+     * Sets the identity as anonymous using the FullStory library.
+     */
+    anonymize: () => FullStory.anonymize(),
+
+    /**
+     * Sets the identity consent status using the FullStory library.
+     */
+    consent: (c: boolean) => FullStory.consent(c),
+
+    /**
+     * Initializes the FullStory metadata with the provided metadata information.
+     */
+    consentAndIdentify: (value: OnyxEntry<UserMetadata>) => {
+        try {
+            // We only use FullStory in production environment
+            FullStory.consent(true);
+            FS.fsIdentify(value);
+        } catch (e) {
+            // error handler
+        }
+    },
+
+    /**
+     * Sets the FullStory user identity based on the provided metadata information.
+     * If the metadata is null or the email is 'undefined', the user identity is anonymized.
+     * If the metadata contains an accountID, the user identity is defined with it.
+     */
+    fsIdentify: (metadata: OnyxEntry<UserMetadata>) => {
+        if (!metadata?.accountID) {
+            // anonymize FullStory user identity metadata
+            FullStory.anonymize();
+        } else {
+            Environment.getEnvironment().then((envName: string) => {
+                // define FullStory user identity
+                const localMetadata = metadata;
+                localMetadata.environment = envName;
+                FullStory.identify(String(localMetadata.accountID), localMetadata);
+            });
+        }
+    },
+};
+
+export default FS;
+export {FSPage};
diff --git a/src/libs/Fullstory/index.ts b/src/libs/Fullstory/index.ts
new file mode 100644
index 000000000000..8419bccabb90
--- /dev/null
+++ b/src/libs/Fullstory/index.ts
@@ -0,0 +1,103 @@
+import {FullStory, init, isInitialized} from '@fullstory/browser';
+import type {OnyxEntry} from 'react-native-onyx';
+import CONST from '@src/CONST';
+import * as Environment from '@src/libs/Environment/Environment';
+import type {UserMetadata} from '@src/types/onyx';
+import type NavigationProperties from './types';
+
+// Placeholder Browser API does not support Manual Page definition
+class FSPage {
+    private pageName;
+
+    private properties;
+
+    constructor(name: string, properties: NavigationProperties) {
+        this.pageName = name;
+        this.properties = properties;
+    }
+
+    start() {}
+}
+
+/**
+ * Web does not use Fullstory React-Native lib
+ * Proxy function calls to Browser Snippet instance
+ * */
+const FS = {
+    /**
+     * Executes a function when the FullStory library is ready, either by initialization or by observing the start event.
+     */
+    onReady: () =>
+        new Promise((resolve) => {
+            Environment.getEnvironment().then((envName: string) => {
+                if (CONST.ENVIRONMENT.PRODUCTION !== envName) {
+                    return;
+                }
+                // Initialised via HEAD snippet
+                if (!isInitialized()) {
+                    init({orgId: ''}, resolve);
+                } else {
+                    FullStory('observe', {type: 'start', callback: resolve});
+                }
+            });
+        }),
+
+    /**
+     * Sets the identity as anonymous using the FullStory library.
+     */
+    anonymize: () => FullStory('setIdentity', {anonymous: true}),
+
+    /**
+     * Sets the identity consent status using the FullStory library.
+     */
+    consent: (c: boolean) => FullStory('setIdentity', {consent: c}),
+
+    /**
+     * Initializes the FullStory metadata with the provided metadata information.
+     */
+    consentAndIdentify: (value: OnyxEntry<UserMetadata>) => {
+        try {
+            Environment.getEnvironment().then((envName: string) => {
+                if (CONST.ENVIRONMENT.PRODUCTION !== envName) {
+                    return;
+                }
+                FS.onReady().then(() => {
+                    FS.consent(true);
+                    if (value) {
+                        const localMetadata = value;
+                        localMetadata.environment = envName;
+                        FS.fsIdentify(localMetadata);
+                    }
+                });
+            });
+        } catch (e) {
+            // error handler
+        }
+    },
+
+    /**
+     * Sets the FullStory user identity based on the provided metadata information.
+     * If the metadata does not contain an email, the user identity is anonymized.
+     * If the metadata contains an accountID, the user identity is defined with it.
+     */
+    fsIdentify: (metadata: OnyxEntry<UserMetadata>) => {
+        if (!metadata?.accountID) {
+            // anonymize FullStory user identity metadata
+            FS.anonymize();
+        } else {
+            // define FullStory user identity
+            FullStory('setIdentity', {
+                uid: String(metadata.accountID),
+                properties: metadata,
+            });
+        }
+    },
+
+    /**
+     * Init function, created so we're consistent with the native file
+     */
+    init: () => {},
+};
+
+export default FS;
+export {FSPage};
diff --git a/src/libs/Fullstory/types.ts b/src/libs/Fullstory/types.ts
new file mode 100644
index 000000000000..24878fd0fbd3
--- /dev/null
+++ b/src/libs/Fullstory/types.ts
@@ -0,0 +1,5 @@
+type NavigationProperties = {
+    path: string;
+};
+
+export default NavigationProperties;
diff --git a/src/libs/GetPhysicalCardUtils.ts b/src/libs/GetPhysicalCardUtils.ts
index 48c537f0f14c..8dc46204db3c 100644
--- a/src/libs/GetPhysicalCardUtils.ts
+++ b/src/libs/GetPhysicalCardUtils.ts
@@ -9,7 +9,8 @@ import * as PersonalDetailsUtils from './PersonalDetailsUtils';
 import * as UserUtils from './UserUtils';
 
 function getCurrentRoute(domain: string, privatePersonalDetails: OnyxEntry<PrivatePersonalDetails>): Route {
-    const {address, legalFirstName, legalLastName, phoneNumber} = privatePersonalDetails ?? {};
+    const {legalFirstName, legalLastName, phoneNumber} = privatePersonalDetails ?? {};
+    const address = PersonalDetailsUtils.getCurrentAddress(privatePersonalDetails);
 
     if (!legalFirstName && !legalLastName) {
         return ROUTES.SETTINGS_WALLET_CARD_GET_PHYSICAL_NAME.getRoute(domain);
@@ -55,7 +56,8 @@ function setCurrentRoute(currentRoute: string, domain: string, privatePersonalDe
  * @returns
  */
 function getUpdatedDraftValues(draftValues: OnyxEntry<GetPhysicalCardForm>, privatePersonalDetails: OnyxEntry<PrivatePersonalDetails>, loginList: OnyxEntry<LoginList>): GetPhysicalCardForm {
-    const {address, legalFirstName, legalLastName, phoneNumber} = privatePersonalDetails ?? {};
+    const {legalFirstName, legalLastName, phoneNumber} = privatePersonalDetails ?? {};
+    const address = PersonalDetailsUtils.getCurrentAddress(privatePersonalDetails);
 
     return {
         /* eslint-disable @typescript-eslint/prefer-nullish-coalescing */
@@ -78,13 +80,13 @@ function getUpdatedDraftValues(draftValues: OnyxEntry<GetPhysicalCardForm>, priv
  * @param draftValues
  * @returns
  */
-function getUpdatedPrivatePersonalDetails(draftValues: OnyxEntry<GetPhysicalCardForm>): PrivatePersonalDetails {
+function getUpdatedPrivatePersonalDetails(draftValues: OnyxEntry<GetPhysicalCardForm>, privatePersonalDetails: OnyxEntry<PrivatePersonalDetails>): PrivatePersonalDetails {
     const {addressLine1, addressLine2, city = '', country = '', legalFirstName, legalLastName, phoneNumber, state = '', zipPostCode = ''} = draftValues ?? {};
     return {
         legalFirstName,
         legalLastName,
         phoneNumber,
-        address: {street: PersonalDetailsUtils.getFormattedStreet(addressLine1, addressLine2), city, country, state, zip: zipPostCode},
+        addresses: [...(privatePersonalDetails?.addresses ?? []), {street: PersonalDetailsUtils.getFormattedStreet(addressLine1, addressLine2), city, country, state, zip: zipPostCode}],
     };
 }
 
diff --git a/src/libs/GetStyledTextArray.ts b/src/libs/GetStyledTextArray.ts
index 9bc6ccc33b4c..9eb8971c81bd 100644
--- a/src/libs/GetStyledTextArray.ts
+++ b/src/libs/GetStyledTextArray.ts
@@ -1,4 +1,5 @@
-import Str from 'expensify-common/lib/str';
+import {Str} from 'expensify-common';
+import StringUtils from './StringUtils';
 
 type StyledText = {
     text: string;
@@ -8,7 +9,9 @@ type StyledText = {
 const getStyledTextArray = (name: string, prefix: string): StyledText[] => {
     const texts = [];
     const prefixLowercase = prefix.toLowerCase();
-    const prefixLocation = name.toLowerCase().search(Str.escapeForRegExp(prefixLowercase));
+    const prefixLocation = StringUtils.normalizeAccents(name)
+        .toLowerCase()
+        .search(Str.escapeForRegExp(StringUtils.normalizeAccents(prefixLowercase)));
 
     if (prefixLocation === 0 && prefix.length === name.length) {
         texts.push({text: name, isColored: true});
diff --git a/src/libs/HeaderUtils.ts b/src/libs/HeaderUtils.ts
index 4d58d74169e8..03c582d6b16b 100644
--- a/src/libs/HeaderUtils.ts
+++ b/src/libs/HeaderUtils.ts
@@ -1,9 +1,11 @@
 import type {ThreeDotsMenuItem} from '@components/HeaderWithBackButton/types';
 import * as Expensicons from '@components/Icon/Expensicons';
+import ROUTES from '@src/ROUTES';
 import type OnyxReport from '@src/types/onyx/Report';
 import * as Report from './actions/Report';
 import * as Session from './actions/Session';
 import * as Localize from './Localize';
+import Navigation from './Navigation/Navigation';
 
 function getPinMenuItem(report: OnyxReport): ThreeDotsMenuItem {
     const isPinned = !!report.isPinned;
@@ -15,7 +17,16 @@ function getPinMenuItem(report: OnyxReport): ThreeDotsMenuItem {
     };
 }
 
+function getShareMenuItem(report: OnyxReport): ThreeDotsMenuItem {
+    return {
+        icon: Expensicons.QrCode,
+        text: Localize.translateLocal('common.share'),
+        onSelected: () => Navigation.navigate(ROUTES.REPORT_WITH_ID_DETAILS_SHARE_CODE.getRoute(report?.reportID ?? '')),
+    };
+}
+
 export {
     // eslint-disable-next-line import/prefer-default-export
     getPinMenuItem,
+    getShareMenuItem,
 };
diff --git a/src/libs/HttpUtils.ts b/src/libs/HttpUtils.ts
index 842776d0c8dd..a8ef8a90dffe 100644
--- a/src/libs/HttpUtils.ts
+++ b/src/libs/HttpUtils.ts
@@ -7,26 +7,35 @@ import type {RequestType} from '@src/types/onyx/Request';
 import type Response from '@src/types/onyx/Response';
 import * as NetworkActions from './actions/Network';
 import * as UpdateRequired from './actions/UpdateRequired';
-import {SIDE_EFFECT_REQUEST_COMMANDS, WRITE_COMMANDS} from './API/types';
+import {READ_COMMANDS, SIDE_EFFECT_REQUEST_COMMANDS, WRITE_COMMANDS} from './API/types';
 import * as ApiUtils from './ApiUtils';
 import HttpsError from './Errors/HttpsError';
 
 let shouldFailAllRequests = false;
 let shouldForceOffline = false;
 
+const ABORT_COMMANDS = {
+    All: 'All',
+    [READ_COMMANDS.SEARCH_FOR_REPORTS]: READ_COMMANDS.SEARCH_FOR_REPORTS,
+} as const;
+
+type AbortCommand = keyof typeof ABORT_COMMANDS;
+
 Onyx.connect({
     key: ONYXKEYS.NETWORK,
     callback: (network) => {
         if (!network) {
             return;
         }
-        shouldFailAllRequests = Boolean(network.shouldFailAllRequests);
-        shouldForceOffline = Boolean(network.shouldForceOffline);
+        shouldFailAllRequests = !!network.shouldFailAllRequests;
+        shouldForceOffline = !!network.shouldForceOffline;
     },
 });
 
 // We use the AbortController API to terminate pending request in `cancelPendingRequests`
-let cancellationController = new AbortController();
+const abortControllerMap = new Map<AbortCommand, AbortController>();
+abortControllerMap.set(ABORT_COMMANDS.All, new AbortController());
+abortControllerMap.set(ABORT_COMMANDS.SearchForReports, new AbortController());
 
 // Some existing old commands (6+ years) exempted from the auth writes count check
 const exemptedCommandsWithAuthWrites: string[] = ['SetWorkspaceAutoReportingFrequency'];
@@ -45,11 +54,11 @@ const APICommandRegex = /\/api\/([^&?]+)\??.*/;
  * Send an HTTP request, and attempt to resolve the json response.
  * If there is a network error, we'll set the application offline.
  */
-function processHTTPRequest(url: string, method: RequestType = 'get', body: FormData | null = null, canCancel = true): Promise<Response> {
+function processHTTPRequest(url: string, method: RequestType = 'get', body: FormData | null = null, abortSignal: AbortSignal | undefined = undefined): Promise<Response> {
     const startTime = new Date().valueOf();
     return fetch(url, {
         // We hook requests to the same Controller signal, so we can cancel them all at once
-        signal: canCancel ? cancellationController.signal : undefined,
+        signal: abortSignal,
         method,
         body,
     })
@@ -159,15 +168,19 @@ function xhr(command: string, data: Record<string, unknown>, type: RequestType =
     });
 
     const url = ApiUtils.getCommandURL({shouldUseSecure, command});
-    return processHTTPRequest(url, type, formData, Boolean(data.canCancel));
+
+    const abortSignalController = data.canCancel ? abortControllerMap.get(command as AbortCommand) ?? abortControllerMap.get(ABORT_COMMANDS.All) : undefined;
+    return processHTTPRequest(url, type, formData, abortSignalController?.signal);
 }
 
-function cancelPendingRequests() {
-    cancellationController.abort();
+function cancelPendingRequests(command: AbortCommand = ABORT_COMMANDS.All) {
+    const controller = abortControllerMap.get(command);
+
+    controller?.abort();
 
     // We create a new instance because once `abort()` is called any future requests using the same controller would
     // automatically get rejected: https://dom.spec.whatwg.org/#abortcontroller-api-integration
-    cancellationController = new AbortController();
+    abortControllerMap.set(command, new AbortController());
 }
 
 export default {
diff --git a/src/libs/IOUUtils.ts b/src/libs/IOUUtils.ts
index 9ff4f5fb8d11..55ac4ba2ac36 100644
--- a/src/libs/IOUUtils.ts
+++ b/src/libs/IOUUtils.ts
@@ -1,8 +1,7 @@
-import type {OnyxEntry} from 'react-native-onyx';
 import type {IOUAction, IOUType} from '@src/CONST';
 import CONST from '@src/CONST';
 import ROUTES from '@src/ROUTES';
-import type {Report, Transaction} from '@src/types/onyx';
+import type {OnyxInputOrEntry, Report, Transaction} from '@src/types/onyx';
 import type {IOURequestType} from './actions/IOU';
 import * as CurrencyUtils from './CurrencyUtils';
 import Navigation from './Navigation/Navigation';
@@ -60,7 +59,7 @@ function calculateAmount(numberOfParticipants: number, total: number, currency:
  * @param isDeleting - whether the user is deleting the expense
  * @param isUpdating - whether the user is updating the expense
  */
-function updateIOUOwnerAndTotal<TReport extends OnyxEntry<Report>>(
+function updateIOUOwnerAndTotal<TReport extends OnyxInputOrEntry<Report>>(
     iouReport: TReport,
     actorAccountID: number,
     amount: number,
@@ -142,7 +141,11 @@ function insertTagIntoTransactionTagsString(transactionTags: string, tag: string
     const tagArray = TransactionUtils.getTagArrayFromName(transactionTags);
     tagArray[tagIndex] = tag;
 
-    return tagArray.join(CONST.COLON).replace(/:*$/, '');
+    while (tagArray.length > 0 && !tagArray[tagArray.length - 1]) {
+        tagArray.pop();
+    }
+
+    return tagArray.map((tagItem) => tagItem.trim()).join(CONST.COLON);
 }
 
 function isMovingTransactionFromTrackExpense(action?: IOUAction) {
@@ -153,11 +156,16 @@ function isMovingTransactionFromTrackExpense(action?: IOUAction) {
     return false;
 }
 
+function shouldUseTransactionDraft(action: IOUAction | undefined) {
+    return action === CONST.IOU.ACTION.CREATE || isMovingTransactionFromTrackExpense(action);
+}
+
 export {
     calculateAmount,
     insertTagIntoTransactionTagsString,
     isIOUReportPendingCurrencyConversion,
     isMovingTransactionFromTrackExpense,
+    shouldUseTransactionDraft,
     isValidMoneyRequestType,
     navigateToStartMoneyRequestStep,
     updateIOUOwnerAndTotal,
diff --git a/src/libs/IntlPolyfill/index.android.ts b/src/libs/IntlPolyfill/index.android.ts
index 7a21ae26bfa4..37647b9d2939 100644
--- a/src/libs/IntlPolyfill/index.android.ts
+++ b/src/libs/IntlPolyfill/index.android.ts
@@ -9,7 +9,7 @@ const intlPolyfill: IntlPolyfill = () => {
     // not yet implemented in hermes.
     // see support: https://hermesengine.dev/docs/intl/
 
-    require('@formatjs/intl-locale/polyfill');
+    require('@formatjs/intl-locale/polyfill-force');
 
     polyfillListFormat();
 };
diff --git a/src/libs/IntlPolyfill/index.ios.ts b/src/libs/IntlPolyfill/index.ios.ts
index 569b666eb434..4701737c2b1c 100644
--- a/src/libs/IntlPolyfill/index.ios.ts
+++ b/src/libs/IntlPolyfill/index.ios.ts
@@ -11,11 +11,11 @@ const intlPolyfill: IntlPolyfill = () => {
     // not yet implemented in hermes.
     // see support: https://hermesengine.dev/docs/intl/
 
-    require('@formatjs/intl-locale/polyfill');
+    require('@formatjs/intl-locale/polyfill-force');
 
     // Required to polyfill NumberFormat on iOS
     // see: https://github.com/facebook/hermes/issues/1172#issuecomment-1776156538
-    require('@formatjs/intl-pluralrules/polyfill');
+    require('@formatjs/intl-pluralrules/polyfill-force');
     polyfillNumberFormat();
 
     // Required to polyfill DateTimeFormat on iOS
diff --git a/src/libs/IntlPolyfill/index.ts b/src/libs/IntlPolyfill/index.ts
index 4f05fdbefd51..0828a6fc8d28 100644
--- a/src/libs/IntlPolyfill/index.ts
+++ b/src/libs/IntlPolyfill/index.ts
@@ -1,4 +1,3 @@
-import polyfillDateTimeFormat from './polyfillDateTimeFormat';
 import polyfillNumberFormat from './polyfillNumberFormat';
 import type IntlPolyfill from './types';
 
@@ -8,6 +7,5 @@ import type IntlPolyfill from './types';
  */
 const intlPolyfill: IntlPolyfill = () => {
     polyfillNumberFormat();
-    polyfillDateTimeFormat();
 };
 export default intlPolyfill;
diff --git a/src/libs/IntlPolyfill/polyfillDateTimeFormat.ts b/src/libs/IntlPolyfill/polyfillDateTimeFormat.ts
index 13eaaabbd8f4..7e5941832b56 100644
--- a/src/libs/IntlPolyfill/polyfillDateTimeFormat.ts
+++ b/src/libs/IntlPolyfill/polyfillDateTimeFormat.ts
@@ -1,33 +1,16 @@
 import type {DateTimeFormatConstructor} from '@formatjs/intl-datetimeformat';
 import DateUtils from '@libs/DateUtils';
+import {timezoneBackwardMap} from '@src/TIMEZONES';
 
-/* eslint-disable @typescript-eslint/naming-convention */
-const tzLinks: Record<string, string> = {
-    'Africa/Abidjan': 'Africa/Accra',
-    CET: 'Europe/Paris',
-    CST6CDT: 'America/Chicago',
-    EET: 'Europe/Sofia',
-    EST: 'America/Cancun',
-    EST5EDT: 'America/New_York',
-    'Etc/GMT': 'UTC',
-    'Etc/UTC': 'UTC',
-    Factory: 'UTC',
-    GMT: 'UTC',
-    HST: 'Pacific/Honolulu',
-    MET: 'Europe/Paris',
-    MST: 'America/Phoenix',
-    MST7MDT: 'America/Denver',
-    PST8PDT: 'America/Los_Angeles',
-    WET: 'Europe/Lisbon',
-};
 /* eslint-enable @typescript-eslint/naming-convention */
 
 export default function () {
     // Because JS Engines do not expose default timezone, the polyfill cannot detect local timezone that a browser is in.
     // We must manually do this by getting the local timezone before adding polyfill.
     let currentTimezone = DateUtils.getCurrentTimezone().selected as string;
-    if (currentTimezone in tzLinks) {
-        currentTimezone = tzLinks[currentTimezone];
+
+    if (currentTimezone in timezoneBackwardMap) {
+        currentTimezone = timezoneBackwardMap[currentTimezone];
     }
 
     require('@formatjs/intl-datetimeformat/polyfill-force');
diff --git a/src/libs/KeyboardShortcut/index.ts b/src/libs/KeyboardShortcut/index.ts
index b349c43b5715..4f89d44da959 100644
--- a/src/libs/KeyboardShortcut/index.ts
+++ b/src/libs/KeyboardShortcut/index.ts
@@ -1,4 +1,4 @@
-import Str from 'expensify-common/lib/str';
+import {Str} from 'expensify-common';
 import * as KeyCommand from 'react-native-key-command';
 import getOperatingSystem from '@libs/getOperatingSystem';
 import localeCompare from '@libs/LocaleCompare';
diff --git a/src/libs/LocaleDigitUtils.ts b/src/libs/LocaleDigitUtils.ts
index 156e58c59033..0362f4aa963f 100644
--- a/src/libs/LocaleDigitUtils.ts
+++ b/src/libs/LocaleDigitUtils.ts
@@ -1,8 +1,8 @@
-import _ from 'lodash';
 import type {ValueOf} from 'type-fest';
 import type CONST from '@src/CONST';
 import type {TranslationPaths} from '@src/languages/types';
 import * as Localize from './Localize';
+import memoize from './memoize';
 import * as NumberFormatUtils from './NumberFormatUtils';
 
 type Locale = ValueOf<typeof CONST.LOCALES>;
@@ -13,28 +13,31 @@ const INDEX_DECIMAL = 10;
 const INDEX_MINUS_SIGN = 11;
 const INDEX_GROUP = 12;
 
-const getLocaleDigits = _.memoize((locale: Locale): string[] => {
-    const localeDigits = [...STANDARD_DIGITS];
-    for (let i = 0; i <= 9; i++) {
-        localeDigits[i] = NumberFormatUtils.format(locale, i);
-    }
-    NumberFormatUtils.formatToParts(locale, 1000000.5).forEach((part) => {
-        switch (part.type) {
-            case 'decimal':
-                localeDigits[INDEX_DECIMAL] = part.value;
-                break;
-            case 'minusSign':
-                localeDigits[INDEX_MINUS_SIGN] = part.value;
-                break;
-            case 'group':
-                localeDigits[INDEX_GROUP] = part.value;
-                break;
-            default:
-                break;
+const getLocaleDigits = memoize(
+    (locale: Locale): string[] => {
+        const localeDigits = [...STANDARD_DIGITS];
+        for (let i = 0; i <= 9; i++) {
+            localeDigits[i] = NumberFormatUtils.format(locale, i);
         }
-    });
-    return localeDigits;
-});
+        NumberFormatUtils.formatToParts(locale, 1000000.5).forEach((part) => {
+            switch (part.type) {
+                case 'decimal':
+                    localeDigits[INDEX_DECIMAL] = part.value;
+                    break;
+                case 'minusSign':
+                    localeDigits[INDEX_MINUS_SIGN] = part.value;
+                    break;
+                case 'group':
+                    localeDigits[INDEX_GROUP] = part.value;
+                    break;
+                default:
+                    break;
+            }
+        });
+        return localeDigits;
+    },
+    {monitoringName: 'getLocaleDigits'},
+);
 
 /**
  * Gets the locale digit corresponding to a standard digit.
@@ -70,10 +73,13 @@ function fromLocaleDigit(locale: Locale, localeDigit: string): string {
 
 /**
  * Formats a number into its localized ordinal representation i.e 1st, 2nd etc
+ * @param locale - The locale to use for formatting
+ * @param number - The number to format
+ * @param writtenOrdinals - If true, returns the written ordinal (e.g. "first", "second") for numbers 1-10
  */
-function toLocaleOrdinal(locale: Locale, number: number): string {
+function toLocaleOrdinal(locale: Locale, number: number, writtenOrdinals = false): string {
     // Defaults to "other" suffix or "th" in English
-    let suffixKey = 'workflowsPage.frequencies.ordinals.other';
+    let suffixKey: TranslationPaths = 'workflowsPage.frequencies.ordinals.other';
 
     // Calculate last digit of the number to determine basic ordinality
     const lastDigit = number % 10;
@@ -81,6 +87,10 @@ function toLocaleOrdinal(locale: Locale, number: number): string {
     // Calculate last two digits to handle exceptions in the 11-13 range
     const lastTwoDigits = number % 100;
 
+    if (writtenOrdinals && number >= 1 && number <= 10) {
+        return Localize.translate(locale, `workflowsPage.frequencies.ordinals.${number}` as TranslationPaths);
+    }
+
     if (lastDigit === 1 && lastTwoDigits !== 11) {
         suffixKey = 'workflowsPage.frequencies.ordinals.one';
     } else if (lastDigit === 2 && lastTwoDigits !== 12) {
@@ -89,7 +99,7 @@ function toLocaleOrdinal(locale: Locale, number: number): string {
         suffixKey = 'workflowsPage.frequencies.ordinals.few';
     }
 
-    const suffix = Localize.translate(locale, suffixKey as TranslationPaths);
+    const suffix = Localize.translate(locale, suffixKey);
 
     return `${number}${suffix}`;
 }
diff --git a/src/libs/LocalePhoneNumber.ts b/src/libs/LocalePhoneNumber.ts
index 460d5fc0fe9f..3e3e4c4e0def 100644
--- a/src/libs/LocalePhoneNumber.ts
+++ b/src/libs/LocalePhoneNumber.ts
@@ -1,4 +1,4 @@
-import Str from 'expensify-common/lib/str';
+import {Str} from 'expensify-common';
 import Onyx from 'react-native-onyx';
 import CONST from '@src/CONST';
 import ONYXKEYS from '@src/ONYXKEYS';
@@ -19,6 +19,9 @@ function formatPhoneNumber(number: string): string {
         return '';
     }
 
+    // eslint-disable-next-line no-param-reassign
+    number = number.replace(/ /g, '\u00A0');
+
     // do not parse the string, if it doesn't contain the SMS domain and it's not a phone number
     if (number.indexOf(CONST.SMS.DOMAIN) === -1 && !CONST.REGEX.DIGITS_AND_PLUS.test(number)) {
         return number;
diff --git a/src/libs/LocaleUtils.ts b/src/libs/LocaleUtils.ts
index 1a63cbf579d5..1802a26d6ffe 100644
--- a/src/libs/LocaleUtils.ts
+++ b/src/libs/LocaleUtils.ts
@@ -1,7 +1,7 @@
-import type {ValueOf} from 'type-fest';
+import type {TupleToUnion, ValueOf} from 'type-fest';
 import CONST from '@src/CONST';
 
-function getLanguageFromLocale(locale: ValueOf<typeof CONST.LOCALES>): (typeof CONST.LANGUAGES)[number] {
+function getLanguageFromLocale(locale: ValueOf<typeof CONST.LOCALES>): TupleToUnion<typeof CONST.LANGUAGES> {
     switch (locale) {
         case CONST.LOCALES.ES_ES:
         case CONST.LOCALES.ES_ES_ONFIDO:
diff --git a/src/libs/Localize/index.ts b/src/libs/Localize/index.ts
index 39a874199004..c9eef3170245 100644
--- a/src/libs/Localize/index.ts
+++ b/src/libs/Localize/index.ts
@@ -1,4 +1,3 @@
-import PropTypes from 'prop-types';
 import * as RNLocalize from 'react-native-localize';
 import Onyx from 'react-native-onyx';
 import type {ValueOf} from 'type-fest';
@@ -10,7 +9,6 @@ import translations from '@src/languages/translations';
 import type {TranslationFlatObject, TranslationPaths} from '@src/languages/types';
 import ONYXKEYS from '@src/ONYXKEYS';
 import type {Locale} from '@src/types/onyx';
-import type {ReceiptError} from '@src/types/onyx/Transaction';
 import LocaleListener from './LocaleListener';
 import BaseLocaleListener from './LocaleListener/BaseLocaleListener';
 
@@ -67,7 +65,7 @@ type Phrase<TKey extends TranslationPaths> = TranslationFlatObject[TKey] extends
  */
 const translationCache = new Map<ValueOf<typeof CONST.LOCALES>, Map<TranslationPaths, string>>(
     Object.values(CONST.LOCALES).reduce((cache, locale) => {
-        cache.push([locale, new Map()]);
+        cache.push([locale, new Map<TranslationPaths, string>()]);
         return cache;
     }, [] as Array<[ValueOf<typeof CONST.LOCALES>, Map<TranslationPaths, string>]>),
 );
@@ -176,42 +174,6 @@ function translateLocal<TKey extends TranslationPaths>(phrase: TKey, ...variable
     return translate(BaseLocaleListener.getPreferredLocale(), phrase, ...variables);
 }
 
-/**
- * Traslatable text with phrase key and/or variables
- * Use MaybePhraseKey for Typescript
- *
- * E.g. ['common.error.characterLimitExceedCounter', {length: 5, limit: 20}]
- */
-const translatableTextPropTypes = PropTypes.oneOfType([PropTypes.string, PropTypes.arrayOf(PropTypes.oneOfType([PropTypes.string, PropTypes.object]))]);
-
-type MaybePhraseKey = string | null | [string, Record<string, unknown> & {isTranslated?: boolean}] | [];
-
-/**
- * Return translated string for given error.
- */
-function translateIfPhraseKey(message: MaybePhraseKey): string;
-function translateIfPhraseKey(message: ReceiptError): ReceiptError;
-function translateIfPhraseKey(message: MaybePhraseKey | ReceiptError): string | ReceiptError;
-function translateIfPhraseKey(message: MaybePhraseKey | ReceiptError): string | ReceiptError {
-    if (!message || (Array.isArray(message) && message.length === 0)) {
-        return '';
-    }
-
-    try {
-        // check if error message has a variable parameter
-        const [phrase, variables] = Array.isArray(message) ? message : [message];
-
-        // This condition checks if the error is already translated. For example, if there are multiple errors per input, we handle translation in ErrorUtils.addErrorMessage due to the inability to concatenate error keys.
-        if (variables?.isTranslated) {
-            return phrase;
-        }
-
-        return translateLocal(phrase as TranslationPaths, variables as never);
-    } catch (error) {
-        return Array.isArray(message) ? message[0] : message;
-    }
-}
-
 function getPreferredListFormat(): Intl.ListFormat {
     if (!CONJUNCTION_LIST_FORMATS_FOR_LOCALES) {
         init();
@@ -263,5 +225,5 @@ function getDevicePreferredLocale(): Locale {
     return RNLocalize.findBestAvailableLanguage([CONST.LOCALES.EN, CONST.LOCALES.ES])?.languageTag ?? CONST.LOCALES.DEFAULT;
 }
 
-export {translatableTextPropTypes, translate, translateLocal, translateIfPhraseKey, formatList, formatMessageElementList, getDevicePreferredLocale};
-export type {PhraseParameters, Phrase, MaybePhraseKey};
+export {translate, translateLocal, formatList, formatMessageElementList, getDevicePreferredLocale};
+export type {PhraseParameters, Phrase};
diff --git a/src/libs/Log.ts b/src/libs/Log.ts
index 101996870e1d..72673b8d3f79 100644
--- a/src/libs/Log.ts
+++ b/src/libs/Log.ts
@@ -2,13 +2,13 @@
 // 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 Logger from 'expensify-common/lib/Logger';
+import {Logger} from 'expensify-common';
 import Onyx from 'react-native-onyx';
 import type {Merge} from 'type-fest';
 import CONST from '@src/CONST';
 import ONYXKEYS from '@src/ONYXKEYS';
 import pkg from '../../package.json';
-import {addLog} from './actions/Console';
+import {addLog, flushAllLogsOnAppLaunch} from './actions/Console';
 import {shouldAttachLog} from './Console';
 import getPlatform from './getPlatform';
 import * as Network from './Network';
@@ -24,7 +24,7 @@ Onyx.connect({
             shouldCollectLogs = false;
         }
 
-        shouldCollectLogs = Boolean(val);
+        shouldCollectLogs = !!val;
     },
 });
 
@@ -66,16 +66,17 @@ function serverLoggingCallback(logger: Logger, params: ServerLoggingCallbackOpti
 // callback methods are passed in here so we can decouple the logging library from the logging methods.
 const Log = new Logger({
     serverLoggingCallback,
-    clientLoggingCallback: (message) => {
+    clientLoggingCallback: (message, extraData) => {
         if (!shouldAttachLog(message)) {
             return;
         }
 
-        console.debug(message);
-
-        if (shouldCollectLogs) {
-            addLog({time: new Date(), level: CONST.DEBUG_CONSOLE.LEVELS.DEBUG, message});
-        }
+        flushAllLogsOnAppLaunch().then(() => {
+            console.debug(message, extraData);
+            if (shouldCollectLogs) {
+                addLog({time: new Date(), level: CONST.DEBUG_CONSOLE.LEVELS.DEBUG, message, extraData});
+            }
+        });
     },
     isDebug: true,
 });
diff --git a/src/libs/LoginUtils.ts b/src/libs/LoginUtils.ts
index 2d49cb992717..191fd72db4e9 100644
--- a/src/libs/LoginUtils.ts
+++ b/src/libs/LoginUtils.ts
@@ -1,5 +1,4 @@
-import {PUBLIC_DOMAINS} from 'expensify-common/lib/CONST';
-import Str from 'expensify-common/lib/str';
+import {PUBLIC_DOMAINS, Str} from 'expensify-common';
 import Onyx from 'react-native-onyx';
 import CONST from '@src/CONST';
 import ONYXKEYS from '@src/ONYXKEYS';
@@ -22,7 +21,14 @@ function getPhoneNumberWithoutSpecialChars(phone: string): string {
  * Append user country code to the phone number
  */
 function appendCountryCode(phone: string): string {
-    return phone.startsWith('+') ? phone : `+${countryCodeByIP}${phone}`;
+    if (phone.startsWith('+')) {
+        return phone;
+    }
+    const phoneWithCountryCode = `+${countryCodeByIP}${phone}`;
+    if (parsePhoneNumber(phoneWithCountryCode).possible) {
+        return phoneWithCountryCode;
+    }
+    return `+${phone}`;
 }
 
 /**
diff --git a/src/libs/Middleware/HandleUnusedOptimisticID.ts b/src/libs/Middleware/HandleUnusedOptimisticID.ts
index eb419401d84d..db726855d075 100644
--- a/src/libs/Middleware/HandleUnusedOptimisticID.ts
+++ b/src/libs/Middleware/HandleUnusedOptimisticID.ts
@@ -5,6 +5,16 @@ import * as PersistedRequests from '@userActions/PersistedRequests';
 import ONYXKEYS from '@src/ONYXKEYS';
 import type Report from '@src/types/onyx/Report';
 
+/**
+ * This middleware checks for the presence of a field called preexistingReportID in the response.
+ * If present, that means that the client passed an optimistic reportID with the request that the server did not use.
+ * This can happen because there was already a report matching the parameters provided that the client didn't know about.
+ * (i.e: a DM chat report with the same set of participants)
+ *
+ * If that happens, this middleware checks for any serialized network requests that reference the unused optimistic ID.
+ * If it finds any, it replaces the unused optimistic ID with the "real ID" from the server.
+ * That way these serialized requests function as expected rather than returning a 404.
+ */
 const handleUnusedOptimisticID: Middleware = (requestResponse, request, isFromSequentialQueue) =>
     requestResponse.then((response) => {
         const responseOnyxData = response?.onyxData ?? [];
diff --git a/src/libs/Middleware/Logging.ts b/src/libs/Middleware/Logging.ts
index 97f4a21866c5..d327dd06becc 100644
--- a/src/libs/Middleware/Logging.ts
+++ b/src/libs/Middleware/Logging.ts
@@ -1,4 +1,5 @@
 import {SIDE_EFFECT_REQUEST_COMMANDS} from '@libs/API/types';
+import type HttpsError from '@libs/Errors/HttpsError';
 import Log from '@libs/Log';
 import CONST from '@src/CONST';
 import type Request from '@src/types/onyx/Request';
@@ -31,17 +32,28 @@ function logRequestDetails(message: string, request: Request, response?: Respons
         logParams.requestID = response.requestID;
     }
 
-    Log.info(message, false, logParams);
+    const extraData: Record<string, unknown> = {};
+    /**
+     * We don't want to log the request and response data for AuthenticatePusher
+     * requests because they contain sensitive information.
+     */
+    if (request.command !== 'AuthenticatePusher') {
+        extraData.request = request;
+        extraData.response = response;
+    }
+
+    Log.info(message, false, logParams, false, extraData);
 }
 
 const Logging: Middleware = (response, request) => {
-    logRequestDetails('Making API request', request);
+    const startTime = Date.now();
+    logRequestDetails('[Network] Making API request', request);
     return response
         .then((data) => {
-            logRequestDetails('Finished API request', request, data);
+            logRequestDetails(`[Network] Finished API request in ${Date.now() - startTime}ms`, request, data);
             return data;
         })
-        .catch((error) => {
+        .catch((error: HttpsError) => {
             const logParams: Record<string, unknown> = {
                 message: error.message,
                 status: error.status,
@@ -69,12 +81,12 @@ const Logging: Middleware = (response, request) => {
                     CONST.ERROR.IOS_NETWORK_CONNECTION_LOST_RUSSIAN,
                     CONST.ERROR.IOS_NETWORK_CONNECTION_LOST_SWEDISH,
                     CONST.ERROR.IOS_NETWORK_CONNECTION_LOST_SPANISH,
-                ].includes(error.message)
+                ].some((message) => message === error.message)
             ) {
                 // These errors seem to happen for native devices with interrupted connections. Often we will see logs about Pusher disconnecting together with these.
                 // This type of error may also indicate a problem with SSL certs.
                 Log.hmmm('[Network] API request error: Connection interruption likely', logParams);
-            } else if ([CONST.ERROR.FIREFOX_DOCUMENT_LOAD_ABORTED, CONST.ERROR.SAFARI_DOCUMENT_LOAD_ABORTED].includes(error.message)) {
+            } else if ([CONST.ERROR.FIREFOX_DOCUMENT_LOAD_ABORTED, CONST.ERROR.SAFARI_DOCUMENT_LOAD_ABORTED].some((message) => message === error.message)) {
                 // This message can be observed page load is interrupted (closed or navigated away).
                 Log.hmmm('[Network] API request error: User likely navigated away from or closed browser', logParams);
             } else if (error.message === CONST.ERROR.IOS_LOAD_FAILED) {
diff --git a/src/libs/Middleware/Pagination.ts b/src/libs/Middleware/Pagination.ts
new file mode 100644
index 000000000000..ff5f5942674f
--- /dev/null
+++ b/src/libs/Middleware/Pagination.ts
@@ -0,0 +1,137 @@
+import fastMerge from 'expensify-common/dist/fastMerge';
+import type {OnyxCollection} from 'react-native-onyx';
+import Onyx from 'react-native-onyx';
+import type {ApiCommand} from '@libs/API/types';
+import Log from '@libs/Log';
+import PaginationUtils from '@libs/PaginationUtils';
+import CONST from '@src/CONST';
+import type {OnyxCollectionKey, OnyxPagesKey, OnyxValues} from '@src/ONYXKEYS';
+import type {Request} from '@src/types/onyx';
+import type {PaginatedRequest} from '@src/types/onyx/Request';
+import type Middleware from './types';
+
+type PagedResource<TResourceKey extends OnyxCollectionKey> = OnyxValues[TResourceKey] extends Record<string, infer TResource> ? TResource : never;
+
+type PaginationCommonConfig<TResourceKey extends OnyxCollectionKey = OnyxCollectionKey, TPageKey extends OnyxPagesKey = OnyxPagesKey> = {
+    resourceCollectionKey: TResourceKey;
+    pageCollectionKey: TPageKey;
+    sortItems: (items: OnyxValues[TResourceKey]) => Array<PagedResource<TResourceKey>>;
+    getItemID: (item: PagedResource<TResourceKey>) => string;
+    isLastItem: (item: PagedResource<TResourceKey>) => boolean;
+};
+
+type PaginationConfig<TResourceKey extends OnyxCollectionKey, TPageKey extends OnyxPagesKey> = PaginationCommonConfig<TResourceKey, TPageKey> & {
+    initialCommand: ApiCommand;
+    previousCommand: ApiCommand;
+    nextCommand: ApiCommand;
+};
+
+type PaginationConfigMapValue = PaginationCommonConfig & {
+    type: 'initial' | 'next' | 'previous';
+};
+
+// Map of API commands to their pagination configs
+const paginationConfigs = new Map<string, PaginationConfigMapValue>();
+
+// Local cache of paginated Onyx resources
+const resources = new Map<OnyxCollectionKey, OnyxCollection<OnyxValues[OnyxCollectionKey]>>();
+
+// Local cache of Onyx pages objects
+const pages = new Map<OnyxPagesKey, OnyxCollection<OnyxValues[OnyxPagesKey]>>();
+
+function registerPaginationConfig<TResourceKey extends OnyxCollectionKey, TPageKey extends OnyxPagesKey>({
+    initialCommand,
+    previousCommand,
+    nextCommand,
+    ...config
+}: PaginationConfig<TResourceKey, TPageKey>): void {
+    paginationConfigs.set(initialCommand, {...config, type: 'initial'} as unknown as PaginationConfigMapValue);
+    paginationConfigs.set(previousCommand, {...config, type: 'previous'} as unknown as PaginationConfigMapValue);
+    paginationConfigs.set(nextCommand, {...config, type: 'next'} as unknown as PaginationConfigMapValue);
+    Onyx.connect<OnyxCollectionKey>({
+        key: config.resourceCollectionKey,
+        waitForCollectionCallback: true,
+        callback: (data) => {
+            resources.set(config.resourceCollectionKey, data);
+        },
+    });
+    Onyx.connect<OnyxPagesKey>({
+        key: config.pageCollectionKey,
+        waitForCollectionCallback: true,
+        callback: (data) => {
+            pages.set(config.pageCollectionKey, data);
+        },
+    });
+}
+
+function isPaginatedRequest(request: Request | PaginatedRequest): request is PaginatedRequest {
+    return 'isPaginated' in request && request.isPaginated;
+}
+
+/**
+ * This middleware handles paginated requests marked with isPaginated: true. It works by:
+ *
+ * 1. Extracting the paginated resources from the response
+ * 2. Sorting them
+ * 3. Merging the new page of resources with any preexisting pages it overlaps with
+ * 4. Updating the saved pages in Onyx for that resource.
+ *
+ * It does this to keep track of what it's fetched via pagination and what may have showed up from other sources,
+ * so it can keep track of and fill any potential gaps in paginated lists.
+ */
+const Pagination: Middleware = (requestResponse, request) => {
+    const paginationConfig = paginationConfigs.get(request.command);
+    if (!paginationConfig || !isPaginatedRequest(request)) {
+        return requestResponse;
+    }
+
+    const {resourceCollectionKey, pageCollectionKey, sortItems, getItemID, isLastItem, type} = paginationConfig;
+    const {resourceID, cursorID} = request;
+    return requestResponse.then((response) => {
+        if (!response?.onyxData) {
+            return Promise.resolve(response);
+        }
+
+        const resourceKey = `${resourceCollectionKey}${resourceID}` as const;
+        const pageKey = `${pageCollectionKey}${resourceID}` as const;
+
+        // Create a new page based on the response
+        const pageItems = (response.onyxData.find((data) => data.key === resourceKey)?.value ?? {}) as OnyxValues[typeof resourceCollectionKey];
+        const sortedPageItems = sortItems(pageItems);
+        if (sortedPageItems.length === 0) {
+            // Must have at least 1 action to create a page.
+            Log.hmmm(`[Pagination] Did not receive any items in the response to ${request.command}`);
+            return Promise.resolve(response);
+        }
+
+        const newPage = sortedPageItems.map((item) => getItemID(item));
+
+        // Detect if we are at the start of the list. This will always be the case for the initial request with no cursor.
+        // For previous requests we check that no new data is returned. Ideally the server would return that info.
+        if ((type === 'initial' && !cursorID) || (type === 'next' && newPage.length === 1 && newPage[0] === cursorID)) {
+            newPage.unshift(CONST.PAGINATION_START_ID);
+        }
+        if (isLastItem(sortedPageItems[sortedPageItems.length - 1])) {
+            newPage.push(CONST.PAGINATION_END_ID);
+        }
+
+        const resourceCollections = resources.get(resourceCollectionKey) ?? {};
+        const existingItems = resourceCollections[resourceKey] ?? {};
+        const allItems = fastMerge(existingItems, pageItems, true);
+        const sortedAllItems = sortItems(allItems);
+
+        const pagesCollections = pages.get(pageCollectionKey) ?? {};
+        const existingPages = pagesCollections[pageKey] ?? [];
+        const mergedPages = PaginationUtils.mergeAndSortContinuousPages(sortedAllItems, [...existingPages, newPage], getItemID);
+
+        response.onyxData.push({
+            key: pageKey,
+            onyxMethod: Onyx.METHOD.SET,
+            value: mergedPages,
+        });
+
+        return Promise.resolve(response);
+    });
+};
+
+export {Pagination, registerPaginationConfig};
diff --git a/src/libs/Middleware/RecheckConnection.ts b/src/libs/Middleware/RecheckConnection.ts
index f3f7d2e7b688..e62c716013cd 100644
--- a/src/libs/Middleware/RecheckConnection.ts
+++ b/src/libs/Middleware/RecheckConnection.ts
@@ -15,7 +15,7 @@ const RecheckConnection: Middleware = (response) => {
     // When the request goes past a certain amount of time we trigger a re-check of the connection
     const cancelRequestTimeoutTimer = startRecheckTimeoutTimer();
     return response
-        .catch((error) => {
+        .catch((error: Error) => {
             if (error.name !== CONST.ERROR.REQUEST_CANCELLED) {
                 // Because we ran into an error we assume we might be offline and do a "connection" health test
                 NetworkConnection.recheckNetworkConnection();
diff --git a/src/libs/Middleware/SaveResponseInOnyx.ts b/src/libs/Middleware/SaveResponseInOnyx.ts
index ffe4f8a9bea9..f895542df481 100644
--- a/src/libs/Middleware/SaveResponseInOnyx.ts
+++ b/src/libs/Middleware/SaveResponseInOnyx.ts
@@ -5,7 +5,12 @@ import type Middleware from './types';
 
 // If we're executing any of these requests, we don't need to trigger our OnyxUpdates flow to update the current data even if our current value is out of
 // date because all these requests are updating the app to the most current state.
-const requestsToIgnoreLastUpdateID: string[] = [WRITE_COMMANDS.OPEN_APP, SIDE_EFFECT_REQUEST_COMMANDS.RECONNECT_APP, SIDE_EFFECT_REQUEST_COMMANDS.GET_MISSING_ONYX_MESSAGES];
+const requestsToIgnoreLastUpdateID: string[] = [
+    WRITE_COMMANDS.OPEN_APP,
+    SIDE_EFFECT_REQUEST_COMMANDS.RECONNECT_APP,
+    WRITE_COMMANDS.CLOSE_ACCOUNT,
+    SIDE_EFFECT_REQUEST_COMMANDS.GET_MISSING_ONYX_MESSAGES,
+];
 
 const SaveResponseInOnyx: Middleware = (requestResponse, request) =>
     requestResponse.then((response = {}) => {
diff --git a/src/libs/Middleware/index.ts b/src/libs/Middleware/index.ts
index 3b1790b3cda5..7f02e23ad9b8 100644
--- a/src/libs/Middleware/index.ts
+++ b/src/libs/Middleware/index.ts
@@ -1,7 +1,8 @@
 import HandleUnusedOptimisticID from './HandleUnusedOptimisticID';
 import Logging from './Logging';
+import {Pagination} from './Pagination';
 import Reauthentication from './Reauthentication';
 import RecheckConnection from './RecheckConnection';
 import SaveResponseInOnyx from './SaveResponseInOnyx';
 
-export {HandleUnusedOptimisticID, Logging, Reauthentication, RecheckConnection, SaveResponseInOnyx};
+export {HandleUnusedOptimisticID, Logging, Reauthentication, RecheckConnection, SaveResponseInOnyx, Pagination};
diff --git a/src/libs/Middleware/types.ts b/src/libs/Middleware/types.ts
index 4cc0a1cc1026..794143123768 100644
--- a/src/libs/Middleware/types.ts
+++ b/src/libs/Middleware/types.ts
@@ -1,6 +1,7 @@
 import type Request from '@src/types/onyx/Request';
+import type {PaginatedRequest} from '@src/types/onyx/Request';
 import type Response from '@src/types/onyx/Response';
 
-type Middleware = (response: Promise<Response | void>, request: Request, isFromSequentialQueue: boolean) => Promise<Response | void>;
+type Middleware = (response: Promise<Response | void>, request: Request | PaginatedRequest, isFromSequentialQueue: boolean) => Promise<Response | void>;
 
 export default Middleware;
diff --git a/src/libs/ModifiedExpenseMessage.ts b/src/libs/ModifiedExpenseMessage.ts
index 2df75030ac19..798bc74869e7 100644
--- a/src/libs/ModifiedExpenseMessage.ts
+++ b/src/libs/ModifiedExpenseMessage.ts
@@ -2,16 +2,16 @@ import Onyx from 'react-native-onyx';
 import type {OnyxCollection, OnyxEntry} from 'react-native-onyx';
 import CONST from '@src/CONST';
 import ONYXKEYS from '@src/ONYXKEYS';
-import type {PolicyTagList, ReportAction} from '@src/types/onyx';
+import type {PolicyTagLists, ReportAction} from '@src/types/onyx';
 import * as CurrencyUtils from './CurrencyUtils';
 import DateUtils from './DateUtils';
-import getReportPolicyID from './getReportPolicyID';
 import * as Localize from './Localize';
 import * as PolicyUtils from './PolicyUtils';
-import type {ExpenseOriginalMessage} from './ReportUtils';
+import * as ReportActionsUtils from './ReportActionsUtils';
+import * as ReportConnection from './ReportConnection';
 import * as TransactionUtils from './TransactionUtils';
 
-let allPolicyTags: OnyxCollection<PolicyTagList> = {};
+let allPolicyTags: OnyxCollection<PolicyTagLists> = {};
 Onyx.connect({
     key: ONYXKEYS.COLLECTION.POLICY_TAGS,
     waitForCollectionCallback: true,
@@ -24,6 +24,13 @@ Onyx.connect({
     },
 });
 
+/**
+ * Utility to get message based on boolean literal value.
+ */
+function getBooleanLiteralMessage(value: string | undefined, truthyMessage: string, falsyMessage: string): string {
+    return value === 'true' ? truthyMessage : falsyMessage;
+}
+
 /**
  * Builds the partial message fragment for a modified field on the expense.
  */
@@ -105,32 +112,33 @@ function getForDistanceRequest(newDistance: string, oldDistance: string, newAmou
  * ModifiedExpense::getNewDotComment in Web-Expensify should match this.
  * If we change this function be sure to update the backend as well.
  */
-function getForReportAction(reportID: string | undefined, reportAction: OnyxEntry<ReportAction> | ReportAction | Record<string, never>): string {
-    if (reportAction?.actionName !== CONST.REPORT.ACTIONS.TYPE.MODIFIED_EXPENSE) {
+function getForReportAction(reportID: string | undefined, reportAction: OnyxEntry<ReportAction>): string {
+    if (!ReportActionsUtils.isModifiedExpenseAction(reportAction)) {
         return '';
     }
-    const reportActionOriginalMessage = reportAction?.originalMessage as ExpenseOriginalMessage | undefined;
-    const policyID = getReportPolicyID(reportID) ?? '';
+    const reportActionOriginalMessage = ReportActionsUtils.getOriginalMessage(reportAction);
+    const policyID = ReportConnection.getAllReports()?.[`${ONYXKEYS.COLLECTION.REPORT}${reportID}`]?.policyID ?? '-1';
 
     const removalFragments: string[] = [];
     const setFragments: string[] = [];
     const changeFragments: string[] = [];
 
+    const isReportActionOriginalMessageAnObject = reportActionOriginalMessage && typeof reportActionOriginalMessage === 'object';
     const hasModifiedAmount =
-        reportActionOriginalMessage &&
+        isReportActionOriginalMessageAnObject &&
         'oldAmount' in reportActionOriginalMessage &&
         'oldCurrency' in reportActionOriginalMessage &&
         'amount' in reportActionOriginalMessage &&
         'currency' in reportActionOriginalMessage;
 
-    const hasModifiedMerchant = reportActionOriginalMessage && 'oldMerchant' in reportActionOriginalMessage && 'merchant' in reportActionOriginalMessage;
+    const hasModifiedMerchant = isReportActionOriginalMessageAnObject && 'oldMerchant' in reportActionOriginalMessage && 'merchant' in reportActionOriginalMessage;
 
     if (hasModifiedAmount) {
-        const oldCurrency = reportActionOriginalMessage?.oldCurrency ?? '';
+        const oldCurrency = reportActionOriginalMessage?.oldCurrency;
         const oldAmountValue = reportActionOriginalMessage?.oldAmount ?? 0;
         const oldAmount = oldAmountValue > 0 ? CurrencyUtils.convertToDisplayString(reportActionOriginalMessage?.oldAmount ?? 0, oldCurrency) : '';
 
-        const currency = reportActionOriginalMessage?.currency ?? '';
+        const currency = reportActionOriginalMessage?.currency;
         const amount = CurrencyUtils.convertToDisplayString(reportActionOriginalMessage?.amount ?? 0, currency);
 
         // Only Distance edits should modify amount and merchant (which stores distance) in a single transaction.
@@ -142,7 +150,7 @@ function getForReportAction(reportID: string | undefined, reportAction: OnyxEntr
         buildMessageFragmentForValue(amount, oldAmount, Localize.translateLocal('iou.amount'), false, setFragments, removalFragments, changeFragments);
     }
 
-    const hasModifiedComment = reportActionOriginalMessage && 'oldComment' in reportActionOriginalMessage && 'newComment' in reportActionOriginalMessage;
+    const hasModifiedComment = isReportActionOriginalMessageAnObject && 'oldComment' in reportActionOriginalMessage && 'newComment' in reportActionOriginalMessage;
     if (hasModifiedComment) {
         buildMessageFragmentForValue(
             reportActionOriginalMessage?.newComment ?? '',
@@ -181,7 +189,7 @@ function getForReportAction(reportID: string | undefined, reportAction: OnyxEntr
         );
     }
 
-    const hasModifiedCategory = reportActionOriginalMessage && 'oldCategory' in reportActionOriginalMessage && 'category' in reportActionOriginalMessage;
+    const hasModifiedCategory = isReportActionOriginalMessageAnObject && 'oldCategory' in reportActionOriginalMessage && 'category' in reportActionOriginalMessage;
     if (hasModifiedCategory) {
         buildMessageFragmentForValue(
             reportActionOriginalMessage?.category ?? '',
@@ -194,7 +202,7 @@ function getForReportAction(reportID: string | undefined, reportAction: OnyxEntr
         );
     }
 
-    const hasModifiedTag = reportActionOriginalMessage && 'oldTag' in reportActionOriginalMessage && 'tag' in reportActionOriginalMessage;
+    const hasModifiedTag = isReportActionOriginalMessageAnObject && 'oldTag' in reportActionOriginalMessage && 'tag' in reportActionOriginalMessage;
     if (hasModifiedTag) {
         const policyTags = allPolicyTags?.[`${ONYXKEYS.COLLECTION.POLICY_TAGS}${policyID}`] ?? {};
         const transactionTag = reportActionOriginalMessage?.tag ?? '';
@@ -225,7 +233,7 @@ function getForReportAction(reportID: string | undefined, reportAction: OnyxEntr
         });
     }
 
-    const hasModifiedTaxAmount = reportActionOriginalMessage && 'oldTaxAmount' in reportActionOriginalMessage && 'taxAmount' in reportActionOriginalMessage;
+    const hasModifiedTaxAmount = isReportActionOriginalMessageAnObject && 'oldTaxAmount' in reportActionOriginalMessage && 'taxAmount' in reportActionOriginalMessage;
     if (hasModifiedTaxAmount) {
         const currency = reportActionOriginalMessage?.currency;
 
@@ -235,7 +243,7 @@ function getForReportAction(reportID: string | undefined, reportAction: OnyxEntr
         buildMessageFragmentForValue(taxAmount, oldTaxAmount, Localize.translateLocal('iou.taxAmount'), false, setFragments, removalFragments, changeFragments);
     }
 
-    const hasModifiedTaxRate = reportActionOriginalMessage && 'oldTaxRate' in reportActionOriginalMessage && 'taxRate' in reportActionOriginalMessage;
+    const hasModifiedTaxRate = isReportActionOriginalMessageAnObject && 'oldTaxRate' in reportActionOriginalMessage && 'taxRate' in reportActionOriginalMessage;
     if (hasModifiedTaxRate) {
         buildMessageFragmentForValue(
             reportActionOriginalMessage?.taxRate ?? '',
@@ -248,7 +256,7 @@ function getForReportAction(reportID: string | undefined, reportAction: OnyxEntr
         );
     }
 
-    const hasModifiedBillable = reportActionOriginalMessage && 'oldBillable' in reportActionOriginalMessage && 'billable' in reportActionOriginalMessage;
+    const hasModifiedBillable = isReportActionOriginalMessageAnObject && 'oldBillable' in reportActionOriginalMessage && 'billable' in reportActionOriginalMessage;
     if (hasModifiedBillable) {
         buildMessageFragmentForValue(
             reportActionOriginalMessage?.billable ?? '',
@@ -261,6 +269,19 @@ function getForReportAction(reportID: string | undefined, reportAction: OnyxEntr
         );
     }
 
+    const hasModifiedReimbursable = isReportActionOriginalMessageAnObject && 'oldReimbursable' in reportActionOriginalMessage && 'reimbursable' in reportActionOriginalMessage;
+    if (hasModifiedReimbursable) {
+        buildMessageFragmentForValue(
+            getBooleanLiteralMessage(reportActionOriginalMessage?.reimbursable, Localize.translateLocal('iou.reimbursable'), Localize.translateLocal('iou.nonReimbursable')),
+            getBooleanLiteralMessage(reportActionOriginalMessage?.oldReimbursable, Localize.translateLocal('iou.reimbursable'), Localize.translateLocal('iou.nonReimbursable')),
+            Localize.translateLocal('iou.expense'),
+            true,
+            setFragments,
+            removalFragments,
+            changeFragments,
+        );
+    }
+
     const message =
         getMessageLine(`\n${Localize.translateLocal('iou.changed')}`, changeFragments) +
         getMessageLine(`\n${Localize.translateLocal('iou.set')}`, setFragments) +
diff --git a/src/libs/MoneyRequestUtils.ts b/src/libs/MoneyRequestUtils.ts
index 2da048ffab4f..67ba9f62421d 100644
--- a/src/libs/MoneyRequestUtils.ts
+++ b/src/libs/MoneyRequestUtils.ts
@@ -17,6 +17,10 @@ function stripSpacesFromAmount(amount: string): string {
     return amount.replace(/\s+/g, '');
 }
 
+function replaceCommasWithPeriod(amount: string): string {
+    return amount.replace(/,+/g, '.');
+}
+
 /**
  * Strip decimals from the amount
  */
@@ -33,31 +37,16 @@ function addLeadingZero(amount: string): string {
     return amount.startsWith('.') ? `0${amount}` : amount;
 }
 
-/**
- * Calculate the length of the amount with leading zeroes
- */
-function calculateAmountLength(amount: string, decimals: number): number {
-    const leadingZeroes = amount.match(/^0+/);
-    const leadingZeroesLength = leadingZeroes?.[0]?.length ?? 0;
-    const absAmount = parseFloat((Number(stripCommaFromAmount(amount)) * 10 ** decimals).toFixed(2)).toString();
-
-    if (/\D/.test(absAmount)) {
-        return CONST.IOU.AMOUNT_MAX_LENGTH + 1;
-    }
-
-    return leadingZeroesLength + (absAmount === '0' ? 2 : absAmount.length);
-}
-
 /**
  * Check if amount is a decimal up to 3 digits
  */
 function validateAmount(amount: string, decimals: number, amountMaxLength: number = CONST.IOU.AMOUNT_MAX_LENGTH): boolean {
     const regexString =
         decimals === 0
-            ? `^\\d+(,\\d*)*$` // Don't allow decimal point if decimals === 0
-            : `^\\d+(,\\d*)*(\\.\\d{0,${decimals}})?$`; // Allow the decimal point and the desired number of digits after the point
+            ? `^\\d{1,${amountMaxLength}}$` // Don't allow decimal point if decimals === 0
+            : `^\\d{1,${amountMaxLength}}(\\.\\d{0,${decimals}})?$`; // Allow the decimal point and the desired number of digits after the point
     const decimalNumberRegex = new RegExp(regexString, 'i');
-    return amount === '' || (decimalNumberRegex.test(amount) && calculateAmountLength(amount, decimals) <= amountMaxLength);
+    return amount === '' || decimalNumberRegex.test(amount);
 }
 
 /**
@@ -91,4 +80,4 @@ function isScanRequest(selectedTab: SelectedTabRequest): boolean {
     return selectedTab === CONST.TAB_REQUEST.SCAN;
 }
 
-export {addLeadingZero, isDistanceRequest, isScanRequest, replaceAllDigits, stripCommaFromAmount, stripDecimalsFromAmount, stripSpacesFromAmount, validateAmount};
+export {addLeadingZero, isDistanceRequest, isScanRequest, replaceAllDigits, stripCommaFromAmount, stripDecimalsFromAmount, stripSpacesFromAmount, replaceCommasWithPeriod, validateAmount};
diff --git a/src/libs/Navigation/AppNavigator/AuthScreens.tsx b/src/libs/Navigation/AppNavigator/AuthScreens.tsx
index e5fee6805c79..d63d52ab7365 100644
--- a/src/libs/Navigation/AppNavigator/AuthScreens.tsx
+++ b/src/libs/Navigation/AppNavigator/AuthScreens.tsx
@@ -2,20 +2,28 @@ import React, {memo, useEffect, useMemo, useRef} from 'react';
 import {View} from 'react-native';
 import type {OnyxEntry} from 'react-native-onyx';
 import Onyx, {withOnyx} from 'react-native-onyx';
+import type {ValueOf} from 'type-fest';
 import OptionsListContextProvider from '@components/OptionListContextProvider';
+import useActiveWorkspace from '@hooks/useActiveWorkspace';
 import useOnboardingLayout from '@hooks/useOnboardingLayout';
+import usePermissions from '@hooks/usePermissions';
 import useStyleUtils from '@hooks/useStyleUtils';
 import useThemeStyles from '@hooks/useThemeStyles';
 import useWindowDimensions from '@hooks/useWindowDimensions';
+import {READ_COMMANDS} from '@libs/API/types';
+import HttpUtils from '@libs/HttpUtils';
 import KeyboardShortcut from '@libs/KeyboardShortcut';
 import Log from '@libs/Log';
 import getCurrentUrl from '@libs/Navigation/currentUrl';
 import getOnboardingModalScreenOptions from '@libs/Navigation/getOnboardingModalScreenOptions';
 import Navigation from '@libs/Navigation/Navigation';
-import type {AuthScreensParamList} from '@libs/Navigation/types';
+import type {AuthScreensParamList, CentralPaneName, CentralPaneScreensParamList} from '@libs/Navigation/types';
 import NetworkConnection from '@libs/NetworkConnection';
+import onyxSubscribe from '@libs/onyxSubscribe';
 import * as Pusher from '@libs/Pusher/pusher';
 import PusherConnectionManager from '@libs/PusherConnectionManager';
+import * as ReportUtils from '@libs/ReportUtils';
+import {buildSearchQueryString} from '@libs/SearchUtils';
 import * as SessionUtils from '@libs/SessionUtils';
 import ConnectionCompletePage from '@pages/ConnectionCompletePage';
 import NotFoundPage from '@pages/ErrorPage/NotFoundPage';
@@ -28,6 +36,7 @@ import * as PersonalDetails from '@userActions/PersonalDetails';
 import * as PriorityMode from '@userActions/PriorityMode';
 import * as Report from '@userActions/Report';
 import * as Session from '@userActions/Session';
+import toggleTestToolsModal from '@userActions/TestTool';
 import Timing from '@userActions/Timing';
 import * as User from '@userActions/User';
 import CONFIG from '@src/CONFIG';
@@ -38,11 +47,13 @@ import ROUTES from '@src/ROUTES';
 import SCREENS from '@src/SCREENS';
 import type * as OnyxTypes from '@src/types/onyx';
 import type {SelectedTimezone, Timezone} from '@src/types/onyx/PersonalDetails';
+import type ReactComponentModule from '@src/types/utils/ReactComponentModule';
+import CENTRAL_PANE_SCREENS from './CENTRAL_PANE_SCREENS';
 import createCustomStackNavigator from './createCustomStackNavigator';
 import defaultScreenOptions from './defaultScreenOptions';
 import getRootNavigatorScreenOptions from './getRootNavigatorScreenOptions';
 import BottomTabNavigator from './Navigators/BottomTabNavigator';
-import CentralPaneNavigator from './Navigators/CentralPaneNavigator';
+import ExplanationModalNavigator from './Navigators/ExplanationModalNavigator';
 import FeatureTrainingModalNavigator from './Navigators/FeatureTrainingModalNavigator';
 import FullScreenNavigator from './Navigators/FullScreenNavigator';
 import LeftModalNavigator from './Navigators/LeftModalNavigator';
@@ -61,15 +72,38 @@ type AuthScreensProps = {
     initialLastUpdateIDAppliedToClient: OnyxEntry<number>;
 };
 
-const loadReportAttachments = () => require('../../../pages/home/report/ReportAttachments').default as React.ComponentType;
-const loadValidateLoginPage = () => require('../../../pages/ValidateLoginPage').default as React.ComponentType;
-const loadLogOutPreviousUserPage = () => require('../../../pages/LogOutPreviousUserPage').default as React.ComponentType;
-const loadConciergePage = () => require('../../../pages/ConciergePage').default as React.ComponentType;
-const loadProfileAvatar = () => require('../../../pages/settings/Profile/ProfileAvatar').default as React.ComponentType;
-const loadWorkspaceAvatar = () => require('../../../pages/workspace/WorkspaceAvatar').default as React.ComponentType;
-const loadReportAvatar = () => require('../../../pages/ReportAvatar').default as React.ComponentType;
-const loadReceiptView = () => require('../../../pages/TransactionReceiptPage').default as React.ComponentType;
-const loadWorkspaceJoinUser = () => require('@pages/workspace/WorkspaceJoinUserPage').default as React.ComponentType;
+const loadReportAttachments = () => require<ReactComponentModule>('../../../pages/home/report/ReportAttachments').default;
+const loadValidateLoginPage = () => require<ReactComponentModule>('../../../pages/ValidateLoginPage').default;
+const loadLogOutPreviousUserPage = () => require<ReactComponentModule>('../../../pages/LogOutPreviousUserPage').default;
+const loadConciergePage = () => require<ReactComponentModule>('../../../pages/ConciergePage').default;
+const loadTrackExpensePage = () => require<ReactComponentModule>('../../../pages/TrackExpensePage').default;
+const loadSubmitExpensePage = () => require<ReactComponentModule>('../../../pages/SubmitExpensePage').default;
+const loadProfileAvatar = () => require<ReactComponentModule>('../../../pages/settings/Profile/ProfileAvatar').default;
+const loadWorkspaceAvatar = () => require<ReactComponentModule>('../../../pages/workspace/WorkspaceAvatar').default;
+const loadReportAvatar = () => require<ReactComponentModule>('../../../pages/ReportAvatar').default;
+const loadReceiptView = () => require<ReactComponentModule>('../../../pages/TransactionReceiptPage').default;
+const loadWorkspaceJoinUser = () => require<ReactComponentModule>('@pages/workspace/WorkspaceJoinUserPage').default;
+
+function shouldOpenOnAdminRoom() {
+    const url = getCurrentUrl();
+    return url ? new URL(url).searchParams.get('openOnAdminRoom') === 'true' : false;
+}
+
+function getCentralPaneScreenInitialParams(screenName: CentralPaneName, initialReportID?: string): Partial<ValueOf<CentralPaneScreensParamList>> {
+    if (screenName === SCREENS.SEARCH.CENTRAL_PANE) {
+        // Generate default query string with buildSearchQueryString without argument.
+        return {q: buildSearchQueryString(), isCustomQuery: false};
+    }
+
+    if (screenName === SCREENS.REPORT) {
+        return {
+            openOnAdminRoom: shouldOpenOnAdminRoom() ? true : undefined,
+            reportID: initialReportID,
+        };
+    }
+
+    return undefined;
+}
 
 let timezone: Timezone | null;
 let currentAccountID = -1;
@@ -125,7 +159,7 @@ Onyx.connect({
 
 Onyx.connect({
     key: ONYXKEYS.ONYX_UPDATES_LAST_UPDATE_ID_APPLIED_TO_CLIENT,
-    callback: (value: OnyxEntry<number>) => {
+    callback: (value) => {
         lastUpdateIDAppliedToClient = value;
     },
 });
@@ -149,6 +183,9 @@ const modalScreenListeners = {
     focus: () => {
         Modal.setModalVisibility(true);
     },
+    blur: () => {
+        Modal.setModalVisibility(false);
+    },
     beforeRemove: () => {
         // Clear search input (WorkspaceInvitePage) when modal is closed
         SearchInputManager.searchInput = '';
@@ -157,21 +194,45 @@ const modalScreenListeners = {
     },
 };
 
+// Extended modal screen listeners with additional cancellation of pending requests
+const modalScreenListenersWithCancelSearch = {
+    ...modalScreenListeners,
+    beforeRemove: () => {
+        modalScreenListeners.beforeRemove();
+        HttpUtils.cancelPendingRequests(READ_COMMANDS.SEARCH_FOR_REPORTS);
+    },
+};
+
 function AuthScreens({session, lastOpenedPublicRoomID, initialLastUpdateIDAppliedToClient}: AuthScreensProps) {
     const styles = useThemeStyles();
     const StyleUtils = useStyleUtils();
     const {isSmallScreenWidth} = useWindowDimensions();
-    const {shouldUseNarrowLayout} = useOnboardingLayout();
+    const {isMediumOrLargerScreenWidth} = useOnboardingLayout();
     const screenOptions = getRootNavigatorScreenOptions(isSmallScreenWidth, styles, StyleUtils);
-    const onboardingModalScreenOptions = useMemo(() => screenOptions.onboardingModalNavigator(shouldUseNarrowLayout), [screenOptions, shouldUseNarrowLayout]);
+    const {canUseDefaultRooms} = usePermissions();
+    const {activeWorkspaceID} = useActiveWorkspace();
+    const onboardingModalScreenOptions = useMemo(() => screenOptions.onboardingModalNavigator(isMediumOrLargerScreenWidth), [screenOptions, isMediumOrLargerScreenWidth]);
     const onboardingScreenOptions = useMemo(
-        () => getOnboardingModalScreenOptions(isSmallScreenWidth, styles, StyleUtils, shouldUseNarrowLayout),
-        [StyleUtils, isSmallScreenWidth, shouldUseNarrowLayout, styles],
+        () => getOnboardingModalScreenOptions(isSmallScreenWidth, styles, StyleUtils, isMediumOrLargerScreenWidth),
+        [StyleUtils, isSmallScreenWidth, isMediumOrLargerScreenWidth, styles],
     );
-    const isInitialRender = useRef(true);
+    const modal = useRef<OnyxTypes.Modal>({});
 
+    let initialReportID: string | undefined;
+    const isInitialRender = useRef(true);
     if (isInitialRender.current) {
         Timing.start(CONST.TIMING.HOMEPAGE_INITIAL_RENDER);
+
+        const currentURL = getCurrentUrl();
+        if (currentURL) {
+            initialReportID = new URL(currentURL).pathname.match(CONST.REGEX.REPORT_ID_FROM_PATH)?.at(1);
+        }
+
+        if (!initialReportID) {
+            const initialReport = ReportUtils.findLastAccessedReport(!canUseDefaultRooms, shouldOpenOnAdminRoom(), activeWorkspaceID);
+            initialReportID = initialReport?.reportID ?? '';
+        }
+
         isInitialRender.current = false;
     }
 
@@ -179,6 +240,7 @@ function AuthScreens({session, lastOpenedPublicRoomID, initialLastUpdateIDApplie
         const shortcutsOverviewShortcutConfig = CONST.KEYBOARD_SHORTCUTS.SHORTCUTS;
         const searchShortcutConfig = CONST.KEYBOARD_SHORTCUTS.SEARCH;
         const chatShortcutConfig = CONST.KEYBOARD_SHORTCUTS.NEW_CHAT;
+        const debugShortcutConfig = CONST.KEYBOARD_SHORTCUTS.DEBUG;
         const currentUrl = getCurrentUrl();
         const isLoggingInAsNewUser = !!session?.email && SessionUtils.isLoggingInAsNewUser(currentUrl, session.email);
         // Sign out the current user if we're transitioning with a different user
@@ -223,6 +285,36 @@ function AuthScreens({session, lastOpenedPublicRoomID, initialLastUpdateIDApplie
 
         Timing.end(CONST.TIMING.HOMEPAGE_INITIAL_RENDER);
 
+        const unsubscribeOnyxModal = onyxSubscribe({
+            key: ONYXKEYS.MODAL,
+            callback: (modalArg) => {
+                if (modalArg === null || typeof modalArg !== 'object') {
+                    return;
+                }
+                modal.current = modalArg;
+            },
+        });
+
+        const shortcutConfig = CONST.KEYBOARD_SHORTCUTS.ESCAPE;
+        const unsubscribeEscapeKey = KeyboardShortcut.subscribe(
+            shortcutConfig.shortcutKey,
+            () => {
+                if (modal.current.willAlertModalBecomeVisible) {
+                    return;
+                }
+
+                if (modal.current.disableDismissOnEscape) {
+                    return;
+                }
+
+                Navigation.dismissModal();
+            },
+            shortcutConfig.descriptionKey,
+            shortcutConfig.modifiers,
+            true,
+            true,
+        );
+
         // Listen to keyboard shortcuts for opening certain pages
         const unsubscribeShortcutsOverviewShortcut = KeyboardShortcut.subscribe(
             shortcutsOverviewShortcutConfig.shortcutKey,
@@ -262,31 +354,50 @@ function AuthScreens({session, lastOpenedPublicRoomID, initialLastUpdateIDApplie
             true,
         );
 
+        const unsubscribeDebugShortcut = KeyboardShortcut.subscribe(
+            debugShortcutConfig.shortcutKey,
+            () => {
+                toggleTestToolsModal();
+            },
+            debugShortcutConfig.descriptionKey,
+            debugShortcutConfig.modifiers,
+            true,
+        );
+
         return () => {
+            unsubscribeEscapeKey();
+            unsubscribeOnyxModal();
             unsubscribeShortcutsOverviewShortcut();
             unsubscribeSearchShortcut();
             unsubscribeChatShortcut();
+            unsubscribeDebugShortcut();
             Session.cleanupSession();
         };
 
         // Rule disabled because this effect is only for component did mount & will component unmount lifecycle event
-        // eslint-disable-next-line react-hooks/exhaustive-deps
+        // eslint-disable-next-line react-compiler/react-compiler, react-hooks/exhaustive-deps
     }, []);
 
+    const CentralPaneScreenOptions = {
+        headerShown: false,
+        title: 'New Expensify',
+
+        // Prevent unnecessary scrolling
+        cardStyle: styles.cardStyleNavigator,
+    };
+
     return (
         <OptionsListContextProvider>
             <View style={styles.rootNavigatorContainerStyles(isSmallScreenWidth)}>
-                <RootStack.Navigator isSmallScreenWidth={isSmallScreenWidth}>
+                <RootStack.Navigator
+                    screenOptions={screenOptions.centralPaneNavigator}
+                    isSmallScreenWidth={isSmallScreenWidth}
+                >
                     <RootStack.Screen
                         name={NAVIGATORS.BOTTOM_TAB_NAVIGATOR}
                         options={screenOptions.bottomTab}
                         component={BottomTabNavigator}
                     />
-                    <RootStack.Screen
-                        name={NAVIGATORS.CENTRAL_PANE_NAVIGATOR}
-                        options={screenOptions.centralPaneNavigator}
-                        component={CentralPaneNavigator}
-                    />
                     <RootStack.Screen
                         name={SCREENS.VALIDATE_LOGIN}
                         options={{
@@ -307,7 +418,17 @@ function AuthScreens({session, lastOpenedPublicRoomID, initialLastUpdateIDApplie
                         getComponent={loadConciergePage}
                     />
                     <RootStack.Screen
-                        name={SCREENS.REPORT_ATTACHMENTS}
+                        name={SCREENS.TRACK_EXPENSE}
+                        options={defaultScreenOptions}
+                        getComponent={loadTrackExpensePage}
+                    />
+                    <RootStack.Screen
+                        name={SCREENS.SUBMIT_EXPENSE}
+                        options={defaultScreenOptions}
+                        getComponent={loadSubmitExpensePage}
+                    />
+                    <RootStack.Screen
+                        name={SCREENS.ATTACHMENTS}
                         options={{
                             headerShown: false,
                             presentation: 'transparentModal',
@@ -351,7 +472,7 @@ function AuthScreens({session, lastOpenedPublicRoomID, initialLastUpdateIDApplie
                         name={NAVIGATORS.RIGHT_MODAL_NAVIGATOR}
                         options={screenOptions.rightModalNavigator}
                         component={RightModalNavigator}
-                        listeners={modalScreenListeners}
+                        listeners={modalScreenListenersWithCancelSearch}
                     />
                     <RootStack.Screen
                         name={NAVIGATORS.FULL_SCREEN_NAVIGATOR}
@@ -369,10 +490,16 @@ function AuthScreens({session, lastOpenedPublicRoomID, initialLastUpdateIDApplie
                         options={screenOptions.fullScreen}
                         component={DesktopSignInRedirectPage}
                     />
+                    <RootStack.Screen
+                        name={NAVIGATORS.EXPLANATION_MODAL_NAVIGATOR}
+                        options={onboardingModalScreenOptions}
+                        component={ExplanationModalNavigator}
+                    />
                     <RootStack.Screen
                         name={NAVIGATORS.FEATURE_TRANING_MODAL_NAVIGATOR}
                         options={onboardingModalScreenOptions}
                         component={FeatureTrainingModalNavigator}
+                        listeners={modalScreenListeners}
                     />
                     <RootStack.Screen
                         name={NAVIGATORS.WELCOME_VIDEO_MODAL_NAVIGATOR}
@@ -383,6 +510,12 @@ function AuthScreens({session, lastOpenedPublicRoomID, initialLastUpdateIDApplie
                         name={NAVIGATORS.ONBOARDING_MODAL_NAVIGATOR}
                         options={onboardingScreenOptions}
                         component={OnboardingModalNavigator}
+                        listeners={{
+                            focus: () => {
+                                Modal.setDisableDismissOnEscape(true);
+                            },
+                            beforeRemove: () => Modal.setDisableDismissOnEscape(false),
+                        }}
                     />
                     <RootStack.Screen
                         name={SCREENS.WORKSPACE_JOIN_USER}
@@ -407,6 +540,18 @@ function AuthScreens({session, lastOpenedPublicRoomID, initialLastUpdateIDApplie
                         options={defaultScreenOptions}
                         component={ConnectionCompletePage}
                     />
+                    {Object.entries(CENTRAL_PANE_SCREENS).map(([screenName, componentGetter]) => {
+                        const centralPaneName = screenName as CentralPaneName;
+                        return (
+                            <RootStack.Screen
+                                key={centralPaneName}
+                                name={centralPaneName}
+                                initialParams={getCentralPaneScreenInitialParams(centralPaneName, initialReportID)}
+                                getComponent={componentGetter}
+                                options={CentralPaneScreenOptions}
+                            />
+                        );
+                    })}
                 </RootStack.Navigator>
             </View>
         </OptionsListContextProvider>
diff --git a/src/libs/Navigation/AppNavigator/CENTRAL_PANE_SCREENS.tsx b/src/libs/Navigation/AppNavigator/CENTRAL_PANE_SCREENS.tsx
new file mode 100644
index 000000000000..5bbe2046040a
--- /dev/null
+++ b/src/libs/Navigation/AppNavigator/CENTRAL_PANE_SCREENS.tsx
@@ -0,0 +1,22 @@
+import type {CentralPaneName} from '@libs/Navigation/types';
+import withPrepareCentralPaneScreen from '@src/components/withPrepareCentralPaneScreen';
+import SCREENS from '@src/SCREENS';
+import type ReactComponentModule from '@src/types/utils/ReactComponentModule';
+
+type Screens = Partial<Record<CentralPaneName, () => React.ComponentType>>;
+
+const CENTRAL_PANE_SCREENS = {
+    [SCREENS.SETTINGS.WORKSPACES]: withPrepareCentralPaneScreen(() => require<ReactComponentModule>('../../../pages/workspace/WorkspacesListPage').default),
+    [SCREENS.SETTINGS.PREFERENCES.ROOT]: withPrepareCentralPaneScreen(() => require<ReactComponentModule>('../../../pages/settings/Preferences/PreferencesPage').default),
+    [SCREENS.SETTINGS.SECURITY]: withPrepareCentralPaneScreen(() => require<ReactComponentModule>('../../../pages/settings/Security/SecuritySettingsPage').default),
+    [SCREENS.SETTINGS.PROFILE.ROOT]: withPrepareCentralPaneScreen(() => require<ReactComponentModule>('../../../pages/settings/Profile/ProfilePage').default),
+    [SCREENS.SETTINGS.WALLET.ROOT]: withPrepareCentralPaneScreen(() => require<ReactComponentModule>('../../../pages/settings/Wallet/WalletPage').default),
+    [SCREENS.SETTINGS.ABOUT]: withPrepareCentralPaneScreen(() => require<ReactComponentModule>('../../../pages/settings/AboutPage/AboutPage').default),
+    [SCREENS.SETTINGS.TROUBLESHOOT]: withPrepareCentralPaneScreen(() => require<ReactComponentModule>('../../../pages/settings/Troubleshoot/TroubleshootPage').default),
+    [SCREENS.SETTINGS.SAVE_THE_WORLD]: withPrepareCentralPaneScreen(() => require<ReactComponentModule>('../../../pages/TeachersUnite/SaveTheWorldPage').default),
+    [SCREENS.SETTINGS.SUBSCRIPTION.ROOT]: withPrepareCentralPaneScreen(() => require<ReactComponentModule>('../../../pages/settings/Subscription/SubscriptionSettingsPage').default),
+    [SCREENS.SEARCH.CENTRAL_PANE]: withPrepareCentralPaneScreen(() => require<ReactComponentModule>('../../../pages/Search/SearchPage').default),
+    [SCREENS.REPORT]: withPrepareCentralPaneScreen(() => require<ReactComponentModule>('../../../pages/home/ReportScreen').default),
+} satisfies Screens;
+
+export default CENTRAL_PANE_SCREENS;
diff --git a/src/libs/Navigation/AppNavigator/ModalNavigatorScreenOptions.ts b/src/libs/Navigation/AppNavigator/ModalNavigatorScreenOptions.ts
index e49a94bf4ed7..9dcbe8143b4a 100644
--- a/src/libs/Navigation/AppNavigator/ModalNavigatorScreenOptions.ts
+++ b/src/libs/Navigation/AppNavigator/ModalNavigatorScreenOptions.ts
@@ -1,5 +1,6 @@
 import type {StackNavigationOptions} from '@react-navigation/stack';
 import {CardStyleInterpolators} from '@react-navigation/stack';
+import type {GestureDirection} from '@react-navigation/stack/lib/typescript/src/types';
 import type {ThemeStyles} from '@styles/index';
 
 /**
@@ -7,10 +8,10 @@ import type {ThemeStyles} from '@styles/index';
  * @param themeStyles - The styles object
  * @returns The screen options object
  */
-const ModalNavigatorScreenOptions = (themeStyles: ThemeStyles): StackNavigationOptions => ({
+const ModalNavigatorScreenOptions = (themeStyles: ThemeStyles, gestureDirection: GestureDirection = 'horizontal'): StackNavigationOptions => ({
     headerShown: false,
     animationEnabled: true,
-    gestureDirection: 'horizontal',
+    gestureDirection,
     cardStyle: themeStyles.navigationScreenCardStyle,
     cardStyleInterpolator: CardStyleInterpolators.forHorizontalIOS,
 });
diff --git a/src/libs/Navigation/AppNavigator/ModalStackNavigators/WorkspaceSettingsModalStackNavigator.tsx b/src/libs/Navigation/AppNavigator/ModalStackNavigators/WorkspaceSettingsModalStackNavigator.tsx
deleted file mode 100644
index 172b62239131..000000000000
--- a/src/libs/Navigation/AppNavigator/ModalStackNavigators/WorkspaceSettingsModalStackNavigator.tsx
+++ /dev/null
@@ -1,89 +0,0 @@
-import {createStackNavigator} from '@react-navigation/stack';
-import React from 'react';
-import SCREENS from '@src/SCREENS';
-import useModalScreenOptions from './useModalScreenOptions';
-
-const StackNavigator = createStackNavigator();
-
-function WorkspaceSettingsModalStackNavigator() {
-    const screenOptions = useModalScreenOptions((styles) => ({cardStyle: styles.navigationScreenCardStyle, headerShown: false}));
-
-    return (
-        <StackNavigator.Navigator screenOptions={screenOptions}>
-            <StackNavigator.Screen
-                key={SCREENS.WORKSPACE.PROFILE}
-                name={SCREENS.WORKSPACE.PROFILE}
-                getComponent={() => require('@pages/workspace/WorkspaceProfilePage').default as React.ComponentType}
-            />
-            <StackNavigator.Screen
-                key={SCREENS.WORKSPACE.CARD}
-                name={SCREENS.WORKSPACE.CARD}
-                getComponent={() => require('@pages/workspace/card/WorkspaceCardPage').default as React.ComponentType}
-            />
-            <StackNavigator.Screen
-                key={SCREENS.WORKSPACE.WORKFLOWS}
-                name={SCREENS.WORKSPACE.WORKFLOWS}
-                getComponent={() => require('@pages/workspace/workflows/WorkspaceWorkflowsPage').default as React.ComponentType}
-            />
-            <StackNavigator.Screen
-                key={SCREENS.WORKSPACE.REIMBURSE}
-                name={SCREENS.WORKSPACE.REIMBURSE}
-                getComponent={() => require('@pages/workspace/reimburse/WorkspaceReimbursePage').default as React.ComponentType}
-            />
-            <StackNavigator.Screen
-                key={SCREENS.WORKSPACE.BILLS}
-                name={SCREENS.WORKSPACE.BILLS}
-                getComponent={() => require('@pages/workspace/bills/WorkspaceBillsPage').default as React.ComponentType}
-            />
-            <StackNavigator.Screen
-                key={SCREENS.WORKSPACE.INVOICES}
-                name={SCREENS.WORKSPACE.INVOICES}
-                getComponent={() => require('@pages/workspace/invoices/WorkspaceInvoicesPage').default as React.ComponentType}
-            />
-            <StackNavigator.Screen
-                key={SCREENS.WORKSPACE.TRAVEL}
-                name={SCREENS.WORKSPACE.TRAVEL}
-                getComponent={() => require('@pages/workspace/travel/WorkspaceTravelPage').default as React.ComponentType}
-            />
-            <StackNavigator.Screen
-                key={SCREENS.WORKSPACE.MEMBERS}
-                name={SCREENS.WORKSPACE.MEMBERS}
-                getComponent={() => require('@pages/workspace/WorkspaceMembersPage').default as React.ComponentType}
-            />
-
-            <StackNavigator.Screen
-                key={SCREENS.WORKSPACE.ACCOUNTING.ROOT}
-                name={SCREENS.WORKSPACE.ACCOUNTING.ROOT}
-                getComponent={() => require('@pages/workspace/accounting/PolicyAccountingPage').default as React.ComponentType}
-            />
-
-            <StackNavigator.Screen
-                key={SCREENS.WORKSPACE.CATEGORIES}
-                name={SCREENS.WORKSPACE.CATEGORIES}
-                getComponent={() => require('@pages/workspace/categories/WorkspaceCategoriesPage').default as React.ComponentType}
-            />
-            <StackNavigator.Screen
-                key={SCREENS.WORKSPACE.MORE_FEATURES}
-                name={SCREENS.WORKSPACE.MORE_FEATURES}
-                getComponent={() => require('@pages/workspace/WorkspaceMoreFeaturesPage').default as React.ComponentType}
-            />
-            <StackNavigator.Screen
-                key={SCREENS.WORKSPACE.TAGS}
-                name={SCREENS.WORKSPACE.TAGS}
-                getComponent={() => require('@pages/workspace/tags/WorkspaceTagsPage').default as React.ComponentType}
-            />
-            <StackNavigator.Screen
-                key={SCREENS.WORKSPACE.TAXES}
-                name={SCREENS.WORKSPACE.TAXES}
-                getComponent={() => require('@pages/workspace/taxes/WorkspaceTaxesPage').default as React.ComponentType}
-            />
-            <StackNavigator.Screen
-                key={SCREENS.WORKSPACE.DISTANCE_RATES}
-                name={SCREENS.WORKSPACE.DISTANCE_RATES}
-                getComponent={() => require('@pages/workspace/distanceRates/PolicyDistanceRatesPage').default as React.ComponentType}
-            />
-        </StackNavigator.Navigator>
-    );
-}
-
-export default WorkspaceSettingsModalStackNavigator;
diff --git a/src/libs/Navigation/AppNavigator/ModalStackNavigators/index.tsx b/src/libs/Navigation/AppNavigator/ModalStackNavigators/index.tsx
index 77e1337d04ce..187e71df4d98 100644
--- a/src/libs/Navigation/AppNavigator/ModalStackNavigators/index.tsx
+++ b/src/libs/Navigation/AppNavigator/ModalStackNavigators/index.tsx
@@ -4,8 +4,6 @@ import {createStackNavigator} from '@react-navigation/stack';
 import React from 'react';
 import type {
     AddPersonalBankAccountNavigatorParamList,
-    ChatFinderNavigatorParamList,
-    DetailsNavigatorParamList,
     EditRequestNavigatorParamList,
     EnablePaymentsNavigatorParamList,
     FlagCommentNavigatorParamList,
@@ -22,21 +20,22 @@ import type {
     ReportSettingsNavigatorParamList,
     RoomInviteNavigatorParamList,
     RoomMembersNavigatorParamList,
+    SearchAdvancedFiltersParamList,
     SearchReportParamList,
     SettingsNavigatorParamList,
     SignInNavigatorParamList,
     SplitDetailsNavigatorParamList,
     TaskDetailsNavigatorParamList,
     TeachersUniteNavigatorParamList,
+    TransactionDuplicateNavigatorParamList,
     TravelNavigatorParamList,
     WalletStatementNavigatorParamList,
-    WorkspaceSwitcherNavigatorParamList,
 } from '@navigation/types';
 import type {ThemeStyles} from '@styles/index';
 import type {Screen} from '@src/SCREENS';
 import SCREENS from '@src/SCREENS';
+import type ReactComponentModule from '@src/types/utils/ReactComponentModule';
 import useModalScreenOptions from './useModalScreenOptions';
-import WorkspaceSettingsModalStackNavigator from './WorkspaceSettingsModalStackNavigator';
 
 type Screens = Partial<Record<Screen, () => React.ComponentType>>;
 
@@ -71,298 +70,477 @@ function createModalStackNavigator<TStackParams extends ParamListBase>(screens:
 }
 
 const MoneyRequestModalStackNavigator = createModalStackNavigator<MoneyRequestNavigatorParamList>({
-    [SCREENS.MONEY_REQUEST.START]: () => require('../../../../pages/iou/request/IOURequestRedirectToStartPage').default as React.ComponentType,
-    [SCREENS.MONEY_REQUEST.CREATE]: () => require('../../../../pages/iou/request/IOURequestStartPage').default as React.ComponentType,
-    [SCREENS.MONEY_REQUEST.STEP_CONFIRMATION]: () => require('../../../../pages/iou/request/step/IOURequestStepConfirmation').default as React.ComponentType,
-    [SCREENS.MONEY_REQUEST.STEP_AMOUNT]: () => require('../../../../pages/iou/request/step/IOURequestStepAmount').default as React.ComponentType,
-    [SCREENS.MONEY_REQUEST.STEP_TAX_AMOUNT]: () => require('../../../../pages/iou/request/step/IOURequestStepTaxAmountPage').default as React.ComponentType,
-    [SCREENS.MONEY_REQUEST.STEP_TAX_RATE]: () => require('../../../../pages/iou/request/step/IOURequestStepTaxRatePage').default as React.ComponentType,
-    [SCREENS.MONEY_REQUEST.STEP_CATEGORY]: () => require('../../../../pages/iou/request/step/IOURequestStepCategory').default as React.ComponentType,
-    [SCREENS.MONEY_REQUEST.STEP_CURRENCY]: () => require('../../../../pages/iou/request/step/IOURequestStepCurrency').default as React.ComponentType,
-    [SCREENS.MONEY_REQUEST.STEP_DATE]: () => require('../../../../pages/iou/request/step/IOURequestStepDate').default as React.ComponentType,
-    [SCREENS.MONEY_REQUEST.STEP_DESCRIPTION]: () => require('../../../../pages/iou/request/step/IOURequestStepDescription').default as React.ComponentType,
-    [SCREENS.MONEY_REQUEST.STEP_DISTANCE]: () => require('../../../../pages/iou/request/step/IOURequestStepDistance').default as React.ComponentType,
-    [SCREENS.MONEY_REQUEST.STEP_DISTANCE_RATE]: () => require('@pages/iou/request/step/IOURequestStepDistanceRate').default as React.ComponentType,
-    [SCREENS.MONEY_REQUEST.STEP_MERCHANT]: () => require('../../../../pages/iou/request/step/IOURequestStepMerchant').default as React.ComponentType,
-    [SCREENS.MONEY_REQUEST.STEP_PARTICIPANTS]: () => require('../../../../pages/iou/request/step/IOURequestStepParticipants').default as React.ComponentType,
-    [SCREENS.MONEY_REQUEST.STEP_SCAN]: () => require('../../../../pages/iou/request/step/IOURequestStepScan').default as React.ComponentType,
-    [SCREENS.MONEY_REQUEST.STEP_TAG]: () => require('../../../../pages/iou/request/step/IOURequestStepTag').default as React.ComponentType,
-    [SCREENS.MONEY_REQUEST.STEP_WAYPOINT]: () => require('../../../../pages/iou/request/step/IOURequestStepWaypoint').default as React.ComponentType,
-    [SCREENS.MONEY_REQUEST.STEP_SPLIT_PAYER]: () => require('../../../../pages/iou/request/step/IOURequestStepSplitPayer').default as React.ComponentType,
-    [SCREENS.MONEY_REQUEST.STEP_SEND_FROM]: () => require('../../../../pages/iou/request/step/IOURequestStepSendFrom').default as React.ComponentType,
-    [SCREENS.MONEY_REQUEST.HOLD]: () => require('../../../../pages/iou/HoldReasonPage').default as React.ComponentType,
-    [SCREENS.IOU_SEND.ADD_BANK_ACCOUNT]: () => require('../../../../pages/AddPersonalBankAccountPage').default as React.ComponentType,
-    [SCREENS.IOU_SEND.ADD_DEBIT_CARD]: () => require('../../../../pages/settings/Wallet/AddDebitCardPage').default as React.ComponentType,
-    [SCREENS.IOU_SEND.ENABLE_PAYMENTS]: () => require('../../../../pages/EnablePayments/EnablePaymentsPage').default as React.ComponentType,
-    [SCREENS.MONEY_REQUEST.STATE_SELECTOR]: () => require('../../../../pages/settings/Profile/PersonalDetails/StateSelectionPage').default as React.ComponentType,
+    [SCREENS.MONEY_REQUEST.START]: () => require<ReactComponentModule>('../../../../pages/iou/request/IOURequestRedirectToStartPage').default,
+    [SCREENS.MONEY_REQUEST.CREATE]: () => require<ReactComponentModule>('../../../../pages/iou/request/IOURequestStartPage').default,
+    [SCREENS.MONEY_REQUEST.STEP_CONFIRMATION]: () => require<ReactComponentModule>('../../../../pages/iou/request/step/IOURequestStepConfirmation').default,
+    [SCREENS.MONEY_REQUEST.STEP_AMOUNT]: () => require<ReactComponentModule>('../../../../pages/iou/request/step/IOURequestStepAmount').default,
+    [SCREENS.MONEY_REQUEST.STEP_TAX_AMOUNT]: () => require<ReactComponentModule>('../../../../pages/iou/request/step/IOURequestStepTaxAmountPage').default,
+    [SCREENS.MONEY_REQUEST.STEP_TAX_RATE]: () => require<ReactComponentModule>('../../../../pages/iou/request/step/IOURequestStepTaxRatePage').default,
+    [SCREENS.MONEY_REQUEST.STEP_CATEGORY]: () => require<ReactComponentModule>('../../../../pages/iou/request/step/IOURequestStepCategory').default,
+    [SCREENS.MONEY_REQUEST.STEP_CURRENCY]: () => require<ReactComponentModule>('../../../../pages/iou/request/step/IOURequestStepCurrency').default,
+    [SCREENS.MONEY_REQUEST.STEP_DATE]: () => require<ReactComponentModule>('../../../../pages/iou/request/step/IOURequestStepDate').default,
+    [SCREENS.MONEY_REQUEST.STEP_DESCRIPTION]: () => require<ReactComponentModule>('../../../../pages/iou/request/step/IOURequestStepDescription').default,
+    [SCREENS.MONEY_REQUEST.STEP_DISTANCE]: () => require<ReactComponentModule>('../../../../pages/iou/request/step/IOURequestStepDistance').default,
+    [SCREENS.MONEY_REQUEST.STEP_DISTANCE_RATE]: () => require<ReactComponentModule>('@pages/iou/request/step/IOURequestStepDistanceRate').default,
+    [SCREENS.MONEY_REQUEST.STEP_MERCHANT]: () => require<ReactComponentModule>('../../../../pages/iou/request/step/IOURequestStepMerchant').default,
+    [SCREENS.MONEY_REQUEST.STEP_PARTICIPANTS]: () => require<ReactComponentModule>('../../../../pages/iou/request/step/IOURequestStepParticipants').default,
+    [SCREENS.SETTINGS_CATEGORIES.SETTINGS_CATEGORIES_ROOT]: () => require<ReactComponentModule>('../../../../pages/workspace/categories/WorkspaceCategoriesPage').default,
+    [SCREENS.MONEY_REQUEST.STEP_SCAN]: () => require<ReactComponentModule>('../../../../pages/iou/request/step/IOURequestStepScan').default,
+    [SCREENS.MONEY_REQUEST.STEP_TAG]: () => require<ReactComponentModule>('../../../../pages/iou/request/step/IOURequestStepTag').default,
+    [SCREENS.MONEY_REQUEST.STEP_WAYPOINT]: () => require<ReactComponentModule>('../../../../pages/iou/request/step/IOURequestStepWaypoint').default,
+    [SCREENS.MONEY_REQUEST.STEP_SPLIT_PAYER]: () => require<ReactComponentModule>('../../../../pages/iou/request/step/IOURequestStepSplitPayer').default,
+    [SCREENS.MONEY_REQUEST.STEP_SEND_FROM]: () => require<ReactComponentModule>('../../../../pages/iou/request/step/IOURequestStepSendFrom').default,
+    [SCREENS.MONEY_REQUEST.STEP_COMPANY_INFO]: () => require<ReactComponentModule>('../../../../pages/iou/request/step/IOURequestStepCompanyInfo').default,
+    [SCREENS.MONEY_REQUEST.HOLD]: () => require<ReactComponentModule>('../../../../pages/iou/HoldReasonPage').default,
+    [SCREENS.IOU_SEND.ADD_BANK_ACCOUNT]: () => require<ReactComponentModule>('../../../../pages/AddPersonalBankAccountPage').default,
+    [SCREENS.IOU_SEND.ADD_DEBIT_CARD]: () => require<ReactComponentModule>('../../../../pages/settings/Wallet/AddDebitCardPage').default,
+    [SCREENS.IOU_SEND.ENABLE_PAYMENTS]: () => require<ReactComponentModule>('../../../../pages/EnablePayments/EnablePaymentsPage').default,
+    [SCREENS.MONEY_REQUEST.STATE_SELECTOR]: () => require<ReactComponentModule>('../../../../pages/settings/Profile/PersonalDetails/StateSelectionPage').default,
 });
 
 const TravelModalStackNavigator = createModalStackNavigator<TravelNavigatorParamList>({
-    [SCREENS.TRAVEL.MY_TRIPS]: () => require('../../../../pages/Travel/MyTripsPage').default as React.ComponentType,
-    [SCREENS.TRAVEL.TCS]: () => require('../../../../pages/Travel/TravelTerms').default as React.ComponentType,
+    [SCREENS.TRAVEL.MY_TRIPS]: () => require<ReactComponentModule>('../../../../pages/Travel/MyTripsPage').default,
+    [SCREENS.TRAVEL.TCS]: () => require<ReactComponentModule>('../../../../pages/Travel/TravelTerms').default,
 });
 
 const SplitDetailsModalStackNavigator = createModalStackNavigator<SplitDetailsNavigatorParamList>({
-    [SCREENS.SPLIT_DETAILS.ROOT]: () => require('../../../../pages/iou/SplitBillDetailsPage').default as React.ComponentType,
-});
-
-const DetailsModalStackNavigator = createModalStackNavigator<DetailsNavigatorParamList>({
-    [SCREENS.DETAILS_ROOT]: () => require('../../../../pages/DetailsPage').default as React.ComponentType,
+    [SCREENS.SPLIT_DETAILS.ROOT]: () => require<ReactComponentModule>('../../../../pages/iou/SplitBillDetailsPage').default,
 });
 
 const ProfileModalStackNavigator = createModalStackNavigator<ProfileNavigatorParamList>({
-    [SCREENS.PROFILE_ROOT]: () => require('../../../../pages/ProfilePage').default as React.ComponentType,
+    [SCREENS.PROFILE_ROOT]: () => require<ReactComponentModule>('../../../../pages/ProfilePage').default,
 });
 
 const ReportDetailsModalStackNavigator = createModalStackNavigator<ReportDetailsNavigatorParamList>({
-    [SCREENS.REPORT_DETAILS.ROOT]: () => require('../../../../pages/ReportDetailsPage').default as React.ComponentType,
-    [SCREENS.REPORT_DETAILS.SHARE_CODE]: () => require('../../../../pages/home/report/ReportDetailsShareCodePage').default as React.ComponentType,
+    [SCREENS.REPORT_DETAILS.ROOT]: () => require<ReactComponentModule>('../../../../pages/ReportDetailsPage').default,
+    [SCREENS.REPORT_DETAILS.SHARE_CODE]: () => require<ReactComponentModule>('../../../../pages/home/report/ReportDetailsShareCodePage').default,
+    [SCREENS.REPORT_DETAILS.EXPORT]: () => require<ReactComponentModule>('../../../../pages/home/report/ReportDetailsExportPage').default,
 });
 
 const ReportSettingsModalStackNavigator = createModalStackNavigator<ReportSettingsNavigatorParamList>({
-    [SCREENS.REPORT_SETTINGS.ROOT]: () => require('../../../../pages/settings/Report/ReportSettingsPage').default as React.ComponentType,
-    [SCREENS.REPORT_SETTINGS.ROOM_NAME]: () => require('../../../../pages/settings/Report/RoomNamePage').default as React.ComponentType,
-    [SCREENS.REPORT_SETTINGS.GROUP_NAME]: () => require('../../../../pages/GroupChatNameEditPage').default as React.ComponentType,
-    [SCREENS.REPORT_SETTINGS.NOTIFICATION_PREFERENCES]: () => require('../../../../pages/settings/Report/NotificationPreferencePage').default as React.ComponentType,
-    [SCREENS.REPORT_SETTINGS.WRITE_CAPABILITY]: () => require('../../../../pages/settings/Report/WriteCapabilityPage').default as React.ComponentType,
-    [SCREENS.REPORT_SETTINGS.VISIBILITY]: () => require('../../../../pages/settings/Report/VisibilityPage').default as React.ComponentType,
+    [SCREENS.REPORT_SETTINGS.ROOT]: () => require<ReactComponentModule>('../../../../pages/settings/Report/ReportSettingsPage').default,
+    [SCREENS.REPORT_SETTINGS.NAME]: () => require<ReactComponentModule>('../../../../pages/settings/Report/NamePage').default,
+    [SCREENS.REPORT_SETTINGS.NOTIFICATION_PREFERENCES]: () => require<ReactComponentModule>('../../../../pages/settings/Report/NotificationPreferencePage').default,
+    [SCREENS.REPORT_SETTINGS.WRITE_CAPABILITY]: () => require<ReactComponentModule>('../../../../pages/settings/Report/WriteCapabilityPage').default,
+    [SCREENS.REPORT_SETTINGS.VISIBILITY]: () => require<ReactComponentModule>('../../../../pages/settings/Report/VisibilityPage').default,
 });
 
 const TaskModalStackNavigator = createModalStackNavigator<TaskDetailsNavigatorParamList>({
-    [SCREENS.TASK.TITLE]: () => require('../../../../pages/tasks/TaskTitlePage').default as React.ComponentType,
-    [SCREENS.TASK.ASSIGNEE]: () => require('../../../../pages/tasks/TaskAssigneeSelectorModal').default as React.ComponentType,
+    [SCREENS.TASK.TITLE]: () => require<ReactComponentModule>('../../../../pages/tasks/TaskTitlePage').default,
+    [SCREENS.TASK.ASSIGNEE]: () => require<ReactComponentModule>('../../../../pages/tasks/TaskAssigneeSelectorModal').default,
 });
 
 const ReportDescriptionModalStackNavigator = createModalStackNavigator<ReportDescriptionNavigatorParamList>({
-    [SCREENS.REPORT_DESCRIPTION_ROOT]: () => require('../../../../pages/ReportDescriptionPage').default as React.ComponentType,
+    [SCREENS.REPORT_DESCRIPTION_ROOT]: () => require<ReactComponentModule>('../../../../pages/ReportDescriptionPage').default,
+});
+
+const CategoriesModalStackNavigator = createModalStackNavigator({
+    [SCREENS.SETTINGS_CATEGORIES.SETTINGS_CATEGORIES_SETTINGS]: () => require<ReactComponentModule>('../../../../pages/workspace/categories/WorkspaceCategoriesSettingsPage').default,
+    [SCREENS.SETTINGS_CATEGORIES.SETTINGS_CATEGORY_CREATE]: () => require<ReactComponentModule>('../../../../pages/workspace/categories/CreateCategoryPage').default,
+    [SCREENS.SETTINGS_CATEGORIES.SETTINGS_CATEGORY_EDIT]: () => require<ReactComponentModule>('../../../../pages/workspace/categories/EditCategoryPage').default,
+    [SCREENS.SETTINGS_CATEGORIES.SETTINGS_CATEGORY_SETTINGS]: () => require<ReactComponentModule>('../../../../pages/workspace/categories/CategorySettingsPage').default,
 });
 
 const ReportParticipantsModalStackNavigator = createModalStackNavigator<ParticipantsNavigatorParamList>({
-    [SCREENS.REPORT_PARTICIPANTS.ROOT]: () => require('../../../../pages/ReportParticipantsPage').default as React.ComponentType,
-    [SCREENS.REPORT_PARTICIPANTS.INVITE]: () => require('../../../../pages/InviteReportParticipantsPage').default as React.ComponentType,
-    [SCREENS.REPORT_PARTICIPANTS.DETAILS]: () => require('../../../../pages/ReportParticipantDetailsPage').default as React.ComponentType,
-    [SCREENS.REPORT_PARTICIPANTS.ROLE]: () => require('../../../../pages/ReportParticipantRoleSelectionPage').default as React.ComponentType,
+    [SCREENS.REPORT_PARTICIPANTS.ROOT]: () => require<ReactComponentModule>('../../../../pages/ReportParticipantsPage').default,
+    [SCREENS.REPORT_PARTICIPANTS.INVITE]: () => require<ReactComponentModule>('../../../../pages/InviteReportParticipantsPage').default,
+    [SCREENS.REPORT_PARTICIPANTS.DETAILS]: () => require<ReactComponentModule>('../../../../pages/ReportParticipantDetailsPage').default,
+    [SCREENS.REPORT_PARTICIPANTS.ROLE]: () => require<ReactComponentModule>('../../../../pages/ReportParticipantRoleSelectionPage').default,
 });
 
 const RoomMembersModalStackNavigator = createModalStackNavigator<RoomMembersNavigatorParamList>({
-    [SCREENS.ROOM_MEMBERS_ROOT]: () => require('../../../../pages/RoomMembersPage').default as React.ComponentType,
+    [SCREENS.ROOM_MEMBERS_ROOT]: () => require<ReactComponentModule>('../../../../pages/RoomMembersPage').default,
 });
 
 const RoomInviteModalStackNavigator = createModalStackNavigator<RoomInviteNavigatorParamList>({
-    [SCREENS.ROOM_INVITE_ROOT]: () => require('../../../../pages/RoomInvitePage').default as React.ComponentType,
-});
-
-const ChatFinderModalStackNavigator = createModalStackNavigator<ChatFinderNavigatorParamList>({
-    [SCREENS.CHAT_FINDER_ROOT]: () => require('../../../../pages/ChatFinderPage').default as React.ComponentType,
+    [SCREENS.ROOM_INVITE_ROOT]: () => require<ReactComponentModule>('../../../../pages/RoomInvitePage').default,
 });
 
 const NewChatModalStackNavigator = createModalStackNavigator<NewChatNavigatorParamList>({
-    [SCREENS.NEW_CHAT.ROOT]: () => require('../../../../pages/NewChatSelectorPage').default as React.ComponentType,
-    [SCREENS.NEW_CHAT.NEW_CHAT_CONFIRM]: () => require('../../../../pages/NewChatConfirmPage').default as React.ComponentType,
-    [SCREENS.NEW_CHAT.NEW_CHAT_EDIT_NAME]: () => require('../../../../pages/GroupChatNameEditPage').default as React.ComponentType,
+    [SCREENS.NEW_CHAT.ROOT]: () => require<ReactComponentModule>('../../../../pages/NewChatSelectorPage').default,
+    [SCREENS.NEW_CHAT.NEW_CHAT_CONFIRM]: () => require<ReactComponentModule>('../../../../pages/NewChatConfirmPage').default,
+    [SCREENS.NEW_CHAT.NEW_CHAT_EDIT_NAME]: () => require<ReactComponentModule>('../../../../pages/GroupChatNameEditPage').default,
 });
 
 const NewTaskModalStackNavigator = createModalStackNavigator<NewTaskNavigatorParamList>({
-    [SCREENS.NEW_TASK.ROOT]: () => require('../../../../pages/tasks/NewTaskPage').default as React.ComponentType,
-    [SCREENS.NEW_TASK.TASK_ASSIGNEE_SELECTOR]: () => require('../../../../pages/tasks/TaskAssigneeSelectorModal').default as React.ComponentType,
-    [SCREENS.NEW_TASK.TASK_SHARE_DESTINATION_SELECTOR]: () => require('../../../../pages/tasks/TaskShareDestinationSelectorModal').default as React.ComponentType,
-    [SCREENS.NEW_TASK.DETAILS]: () => require('../../../../pages/tasks/NewTaskDetailsPage').default as React.ComponentType,
-    [SCREENS.NEW_TASK.TITLE]: () => require('../../../../pages/tasks/NewTaskTitlePage').default as React.ComponentType,
-    [SCREENS.NEW_TASK.DESCRIPTION]: () => require('../../../../pages/tasks/NewTaskDescriptionPage').default as React.ComponentType,
+    [SCREENS.NEW_TASK.ROOT]: () => require<ReactComponentModule>('../../../../pages/tasks/NewTaskPage').default,
+    [SCREENS.NEW_TASK.TASK_ASSIGNEE_SELECTOR]: () => require<ReactComponentModule>('../../../../pages/tasks/TaskAssigneeSelectorModal').default,
+    [SCREENS.NEW_TASK.TASK_SHARE_DESTINATION_SELECTOR]: () => require<ReactComponentModule>('../../../../pages/tasks/TaskShareDestinationSelectorModal').default,
+    [SCREENS.NEW_TASK.DETAILS]: () => require<ReactComponentModule>('../../../../pages/tasks/NewTaskDetailsPage').default,
+    [SCREENS.NEW_TASK.TITLE]: () => require<ReactComponentModule>('../../../../pages/tasks/NewTaskTitlePage').default,
+    [SCREENS.NEW_TASK.DESCRIPTION]: () => require<ReactComponentModule>('../../../../pages/tasks/NewTaskDescriptionPage').default,
 });
 
 const NewTeachersUniteNavigator = createModalStackNavigator<TeachersUniteNavigatorParamList>({
-    [SCREENS.SAVE_THE_WORLD.ROOT]: () => require('../../../../pages/TeachersUnite/SaveTheWorldPage').default as React.ComponentType,
-    [SCREENS.I_KNOW_A_TEACHER]: () => require('../../../../pages/TeachersUnite/KnowATeacherPage').default as React.ComponentType,
-    [SCREENS.INTRO_SCHOOL_PRINCIPAL]: () => require('../../../../pages/TeachersUnite/ImTeacherPage').default as React.ComponentType,
-    [SCREENS.I_AM_A_TEACHER]: () => require('../../../../pages/TeachersUnite/ImTeacherPage').default as React.ComponentType,
-});
-
-const WorkspaceSwitcherModalStackNavigator = createModalStackNavigator<WorkspaceSwitcherNavigatorParamList>({
-    [SCREENS.WORKSPACE_SWITCHER.ROOT]: () => require('../../../../pages/WorkspaceSwitcherPage').default as React.ComponentType,
+    [SCREENS.SAVE_THE_WORLD.ROOT]: () => require<ReactComponentModule>('../../../../pages/TeachersUnite/SaveTheWorldPage').default,
+    [SCREENS.I_KNOW_A_TEACHER]: () => require<ReactComponentModule>('../../../../pages/TeachersUnite/KnowATeacherPage').default,
+    [SCREENS.INTRO_SCHOOL_PRINCIPAL]: () => require<ReactComponentModule>('../../../../pages/TeachersUnite/ImTeacherPage').default,
+    [SCREENS.I_AM_A_TEACHER]: () => require<ReactComponentModule>('../../../../pages/TeachersUnite/ImTeacherPage').default,
 });
 
 const SettingsModalStackNavigator = createModalStackNavigator<SettingsNavigatorParamList>({
-    [SCREENS.SETTINGS.SHARE_CODE]: () => require('../../../../pages/ShareCodePage').default as React.ComponentType,
-    [SCREENS.SETTINGS.PROFILE.PRONOUNS]: () => require('../../../../pages/settings/Profile/PronounsPage').default as React.ComponentType,
-    [SCREENS.SETTINGS.PROFILE.DISPLAY_NAME]: () => require('../../../../pages/settings/Profile/DisplayNamePage').default as React.ComponentType,
-    [SCREENS.SETTINGS.PROFILE.TIMEZONE]: () => require('../../../../pages/settings/Profile/TimezoneInitialPage').default as React.ComponentType,
-    [SCREENS.SETTINGS.PROFILE.TIMEZONE_SELECT]: () => require('../../../../pages/settings/Profile/TimezoneSelectPage').default as React.ComponentType,
-    [SCREENS.SETTINGS.PROFILE.LEGAL_NAME]: () => require('../../../../pages/settings/Profile/PersonalDetails/LegalNamePage').default as React.ComponentType,
-    [SCREENS.SETTINGS.PROFILE.DATE_OF_BIRTH]: () => require('../../../../pages/settings/Profile/PersonalDetails/DateOfBirthPage').default as React.ComponentType,
-    [SCREENS.SETTINGS.PROFILE.ADDRESS]: () => require('../../../../pages/settings/Profile/PersonalDetails/AddressPage').default as React.ComponentType,
-    [SCREENS.SETTINGS.PROFILE.ADDRESS_COUNTRY]: () => require('../../../../pages/settings/Profile/PersonalDetails/CountrySelectionPage').default as React.ComponentType,
-    [SCREENS.SETTINGS.PROFILE.ADDRESS_STATE]: () => require('../../../../pages/settings/Profile/PersonalDetails/StateSelectionPage').default as React.ComponentType,
-    [SCREENS.SETTINGS.PROFILE.CONTACT_METHODS]: () => require('../../../../pages/settings/Profile/Contacts/ContactMethodsPage').default as React.ComponentType,
-    [SCREENS.SETTINGS.PROFILE.CONTACT_METHOD_DETAILS]: () => require('../../../../pages/settings/Profile/Contacts/ContactMethodDetailsPage').default as React.ComponentType,
-    [SCREENS.SETTINGS.PROFILE.NEW_CONTACT_METHOD]: () => require('../../../../pages/settings/Profile/Contacts/NewContactMethodPage').default as React.ComponentType,
-    [SCREENS.SETTINGS.PREFERENCES.PRIORITY_MODE]: () => require('../../../../pages/settings/Preferences/PriorityModePage').default as React.ComponentType,
-    [SCREENS.WORKSPACE.ACCOUNTING.ROOT]: () => require('../../../../pages/workspace/accounting/PolicyAccountingPage').default as React.ComponentType,
-    [SCREENS.SETTINGS.PREFERENCES.LANGUAGE]: () => require('../../../../pages/settings/Preferences/LanguagePage').default as React.ComponentType,
-    [SCREENS.SETTINGS.PREFERENCES.THEME]: () => require('../../../../pages/settings/Preferences/ThemePage').default as React.ComponentType,
-    [SCREENS.SETTINGS.CLOSE]: () => require('../../../../pages/settings/Security/CloseAccountPage').default as React.ComponentType,
-    [SCREENS.SETTINGS.APP_DOWNLOAD_LINKS]: () => require('../../../../pages/settings/AppDownloadLinks').default as React.ComponentType,
-    [SCREENS.SETTINGS.CONSOLE]: () => require('../../../../pages/settings/AboutPage/ConsolePage').default as React.ComponentType,
-    [SCREENS.SETTINGS.SHARE_LOG]: () => require('../../../../pages/settings/AboutPage/ShareLogPage').default as React.ComponentType,
-    [SCREENS.SETTINGS.WALLET.CARDS_DIGITAL_DETAILS_UPDATE_ADDRESS]: () => require('../../../../pages/settings/Profile/PersonalDetails/AddressPage').default as React.ComponentType,
-    [SCREENS.SETTINGS.WALLET.DOMAIN_CARD]: () => require('../../../../pages/settings/Wallet/ExpensifyCardPage').default as React.ComponentType,
-    [SCREENS.SETTINGS.WALLET.REPORT_VIRTUAL_CARD_FRAUD]: () => require('../../../../pages/settings/Wallet/ReportVirtualCardFraudPage').default as React.ComponentType,
-    [SCREENS.SETTINGS.WALLET.CARD_ACTIVATE]: () => require('../../../../pages/settings/Wallet/ActivatePhysicalCardPage').default as React.ComponentType,
-    [SCREENS.SETTINGS.WALLET.CARD_GET_PHYSICAL.NAME]: () => require('../../../../pages/settings/Wallet/Card/GetPhysicalCardName').default as React.ComponentType,
-    [SCREENS.SETTINGS.WALLET.CARD_GET_PHYSICAL.PHONE]: () => require('../../../../pages/settings/Wallet/Card/GetPhysicalCardPhone').default as React.ComponentType,
-    [SCREENS.SETTINGS.WALLET.CARD_GET_PHYSICAL.ADDRESS]: () => require('../../../../pages/settings/Wallet/Card/GetPhysicalCardAddress').default as React.ComponentType,
-    [SCREENS.SETTINGS.WALLET.CARD_GET_PHYSICAL.CONFIRM]: () => require('../../../../pages/settings/Wallet/Card/GetPhysicalCardConfirm').default as React.ComponentType,
-    [SCREENS.SETTINGS.WALLET.TRANSFER_BALANCE]: () => require('../../../../pages/settings/Wallet/TransferBalancePage').default as React.ComponentType,
-    [SCREENS.SETTINGS.WALLET.CHOOSE_TRANSFER_ACCOUNT]: () => require('../../../../pages/settings/Wallet/ChooseTransferAccountPage').default as React.ComponentType,
-    [SCREENS.SETTINGS.WALLET.ENABLE_PAYMENTS]: () => require('../../../../pages/EnablePayments/EnablePaymentsPage').default as React.ComponentType,
-    [SCREENS.SETTINGS.WALLET.ENABLE_PAYMENTS_REFACTOR]: () => require('../../../../pages/EnablePayments/PersonalInfo/PersonalInfo').default as React.ComponentType,
-    [SCREENS.SETTINGS.ADD_DEBIT_CARD]: () => require('../../../../pages/settings/Wallet/AddDebitCardPage').default as React.ComponentType,
-    [SCREENS.SETTINGS.ADD_BANK_ACCOUNT]: () => require('../../../../pages/AddPersonalBankAccountPage').default as React.ComponentType,
-    [SCREENS.SETTINGS.ADD_BANK_ACCOUNT_REFACTOR]: () => require('../../../../pages/EnablePayments/AddBankAccount/AddBankAccount').default as React.ComponentType,
-    [SCREENS.SETTINGS.PROFILE.STATUS]: () => require('../../../../pages/settings/Profile/CustomStatus/StatusPage').default as React.ComponentType,
-    [SCREENS.SETTINGS.PROFILE.STATUS_CLEAR_AFTER]: () => require('../../../../pages/settings/Profile/CustomStatus/StatusClearAfterPage').default as React.ComponentType,
-    [SCREENS.SETTINGS.PROFILE.STATUS_CLEAR_AFTER_DATE]: () => require('../../../../pages/settings/Profile/CustomStatus/SetDatePage').default as React.ComponentType,
-    [SCREENS.SETTINGS.PROFILE.STATUS_CLEAR_AFTER_TIME]: () => require('../../../../pages/settings/Profile/CustomStatus/SetTimePage').default as React.ComponentType,
-    [SCREENS.WORKSPACE.RATE_AND_UNIT]: () => require('../../../../pages/workspace/reimburse/WorkspaceRateAndUnitPage/InitialPage').default as React.ComponentType,
-    [SCREENS.WORKSPACE.RATE_AND_UNIT_RATE]: () => require('../../../../pages/workspace/reimburse/WorkspaceRateAndUnitPage/RatePage').default as React.ComponentType,
-    [SCREENS.WORKSPACE.RATE_AND_UNIT_UNIT]: () => require('../../../../pages/workspace/reimburse/WorkspaceRateAndUnitPage/UnitPage').default as React.ComponentType,
-    [SCREENS.WORKSPACE.INVITE]: () => require('../../../../pages/workspace/WorkspaceInvitePage').default as React.ComponentType,
-    [SCREENS.WORKSPACE.WORKFLOWS_APPROVER]: () => require('../../../../pages/workspace/workflows/WorkspaceWorkflowsApproverPage').default as React.ComponentType,
-    [SCREENS.WORKSPACE.INVITE_MESSAGE]: () => require('../../../../pages/workspace/WorkspaceInviteMessagePage').default as React.ComponentType,
-    [SCREENS.WORKSPACE.WORKFLOWS_PAYER]: () => require('../../../../pages/workspace/workflows/WorkspaceWorkflowsPayerPage').default as React.ComponentType,
-    [SCREENS.WORKSPACE.NAME]: () => require('../../../../pages/workspace/WorkspaceNamePage').default as React.ComponentType,
-    [SCREENS.WORKSPACE.DESCRIPTION]: () => require('../../../../pages/workspace/WorkspaceProfileDescriptionPage').default as React.ComponentType,
-    [SCREENS.WORKSPACE.SHARE]: () => require('../../../../pages/workspace/WorkspaceProfileSharePage').default as React.ComponentType,
-    [SCREENS.WORKSPACE.CURRENCY]: () => require('../../../../pages/workspace/WorkspaceProfileCurrencyPage').default as React.ComponentType,
-    [SCREENS.WORKSPACE.CATEGORY_SETTINGS]: () => require('../../../../pages/workspace/categories/CategorySettingsPage').default as React.ComponentType,
-    [SCREENS.WORKSPACE.ADDRESS]: () => require('../../../../pages/workspace/WorkspaceProfileAddressPage').default as React.ComponentType,
-    [SCREENS.WORKSPACE.CATEGORIES_SETTINGS]: () => require('../../../../pages/workspace/categories/WorkspaceCategoriesSettingsPage').default as React.ComponentType,
-    [SCREENS.WORKSPACE.MEMBER_DETAILS]: () => require('../../../../pages/workspace/members/WorkspaceMemberDetailsPage').default as React.ComponentType,
-    [SCREENS.WORKSPACE.OWNER_CHANGE_CHECK]: () => require('@pages/workspace/members/WorkspaceOwnerChangeWrapperPage').default as React.ComponentType,
-    [SCREENS.WORKSPACE.OWNER_CHANGE_SUCCESS]: () => require('../../../../pages/workspace/members/WorkspaceOwnerChangeSuccessPage').default as React.ComponentType,
-    [SCREENS.WORKSPACE.OWNER_CHANGE_ERROR]: () => require('../../../../pages/workspace/members/WorkspaceOwnerChangeErrorPage').default as React.ComponentType,
-    [SCREENS.WORKSPACE.CATEGORY_CREATE]: () => require('../../../../pages/workspace/categories/CreateCategoryPage').default as React.ComponentType,
-    [SCREENS.WORKSPACE.CATEGORY_EDIT]: () => require('../../../../pages/workspace/categories/EditCategoryPage').default as React.ComponentType,
-    [SCREENS.WORKSPACE.CREATE_DISTANCE_RATE]: () => require('../../../../pages/workspace/distanceRates/CreateDistanceRatePage').default as React.ComponentType,
-    [SCREENS.WORKSPACE.DISTANCE_RATES_SETTINGS]: () => require('../../../../pages/workspace/distanceRates/PolicyDistanceRatesSettingsPage').default as React.ComponentType,
-    [SCREENS.WORKSPACE.DISTANCE_RATE_DETAILS]: () => require('../../../../pages/workspace/distanceRates/PolicyDistanceRateDetailsPage').default as React.ComponentType,
-    [SCREENS.WORKSPACE.DISTANCE_RATE_EDIT]: () => require('../../../../pages/workspace/distanceRates/PolicyDistanceRateEditPage').default as React.ComponentType,
-    [SCREENS.WORKSPACE.TAGS_SETTINGS]: () => require('../../../../pages/workspace/tags/WorkspaceTagsSettingsPage').default as React.ComponentType,
-    [SCREENS.WORKSPACE.TAG_SETTINGS]: () => require('../../../../pages/workspace/tags/TagSettingsPage').default as React.ComponentType,
-    [SCREENS.WORKSPACE.TAGS_EDIT]: () => require('../../../../pages/workspace/tags/WorkspaceEditTagsPage').default as React.ComponentType,
-    [SCREENS.WORKSPACE.TAG_CREATE]: () => require('../../../../pages/workspace/tags/WorkspaceCreateTagPage').default as React.ComponentType,
-    [SCREENS.WORKSPACE.TAG_EDIT]: () => require('../../../../pages/workspace/tags/EditTagPage').default as React.ComponentType,
-    [SCREENS.WORKSPACE.TAXES_SETTINGS]: () => require('../../../../pages/workspace/taxes/WorkspaceTaxesSettingsPage').default as React.ComponentType,
-    [SCREENS.WORKSPACE.TAXES_SETTINGS_CUSTOM_TAX_NAME]: () => require('../../../../pages/workspace/taxes/WorkspaceTaxesSettingsCustomTaxName').default as React.ComponentType,
-    [SCREENS.WORKSPACE.TAXES_SETTINGS_FOREIGN_CURRENCY_DEFAULT]: () => require('../../../../pages/workspace/taxes/WorkspaceTaxesSettingsForeignCurrency').default as React.ComponentType,
-    [SCREENS.WORKSPACE.TAXES_SETTINGS_WORKSPACE_CURRENCY_DEFAULT]: () => require('../../../../pages/workspace/taxes/WorkspaceTaxesSettingsWorkspaceCurrency').default as React.ComponentType,
+    [SCREENS.SETTINGS.SHARE_CODE]: () => require<ReactComponentModule>('../../../../pages/ShareCodePage').default,
+    [SCREENS.SETTINGS.PROFILE.PRONOUNS]: () => require<ReactComponentModule>('../../../../pages/settings/Profile/PronounsPage').default,
+    [SCREENS.SETTINGS.PROFILE.DISPLAY_NAME]: () => require<ReactComponentModule>('../../../../pages/settings/Profile/DisplayNamePage').default,
+    [SCREENS.SETTINGS.PROFILE.TIMEZONE]: () => require<ReactComponentModule>('../../../../pages/settings/Profile/TimezoneInitialPage').default,
+    [SCREENS.SETTINGS.PROFILE.TIMEZONE_SELECT]: () => require<ReactComponentModule>('../../../../pages/settings/Profile/TimezoneSelectPage').default,
+    [SCREENS.SETTINGS.PROFILE.LEGAL_NAME]: () => require<ReactComponentModule>('../../../../pages/settings/Profile/PersonalDetails/LegalNamePage').default,
+    [SCREENS.SETTINGS.PROFILE.DATE_OF_BIRTH]: () => require<ReactComponentModule>('../../../../pages/settings/Profile/PersonalDetails/DateOfBirthPage').default,
+    [SCREENS.SETTINGS.PROFILE.ADDRESS]: () => require<ReactComponentModule>('../../../../pages/settings/Profile/PersonalDetails/PersonalAddressPage').default,
+    [SCREENS.SETTINGS.PROFILE.ADDRESS_COUNTRY]: () => require<ReactComponentModule>('../../../../pages/settings/Profile/PersonalDetails/CountrySelectionPage').default,
+    [SCREENS.SETTINGS.PROFILE.ADDRESS_STATE]: () => require<ReactComponentModule>('../../../../pages/settings/Profile/PersonalDetails/StateSelectionPage').default,
+    [SCREENS.SETTINGS.PROFILE.CONTACT_METHODS]: () => require<ReactComponentModule>('../../../../pages/settings/Profile/Contacts/ContactMethodsPage').default,
+    [SCREENS.SETTINGS.PROFILE.CONTACT_METHOD_DETAILS]: () => require<ReactComponentModule>('../../../../pages/settings/Profile/Contacts/ContactMethodDetailsPage').default,
+    [SCREENS.SETTINGS.PROFILE.NEW_CONTACT_METHOD]: () => require<ReactComponentModule>('../../../../pages/settings/Profile/Contacts/NewContactMethodPage').default,
+    [SCREENS.SETTINGS.PREFERENCES.PRIORITY_MODE]: () => require<ReactComponentModule>('../../../../pages/settings/Preferences/PriorityModePage').default,
+    [SCREENS.WORKSPACE.ACCOUNTING.ROOT]: () => require<ReactComponentModule>('../../../../pages/workspace/accounting/PolicyAccountingPage').default,
+    [SCREENS.SETTINGS.PREFERENCES.LANGUAGE]: () => require<ReactComponentModule>('../../../../pages/settings/Preferences/LanguagePage').default,
+    [SCREENS.SETTINGS.PREFERENCES.THEME]: () => require<ReactComponentModule>('../../../../pages/settings/Preferences/ThemePage').default,
+    [SCREENS.SETTINGS.CLOSE]: () => require<ReactComponentModule>('../../../../pages/settings/Security/CloseAccountPage').default,
+    [SCREENS.SETTINGS.APP_DOWNLOAD_LINKS]: () => require<ReactComponentModule>('../../../../pages/settings/AppDownloadLinks').default,
+    [SCREENS.SETTINGS.CONSOLE]: () => require<ReactComponentModule>('../../../../pages/settings/AboutPage/ConsolePage').default,
+    [SCREENS.SETTINGS.SHARE_LOG]: () => require<ReactComponentModule>('../../../../pages/settings/AboutPage/ShareLogPage').default,
+    [SCREENS.SETTINGS.WALLET.CARDS_DIGITAL_DETAILS_UPDATE_ADDRESS]: () => require<ReactComponentModule>('../../../../pages/settings/Profile/PersonalDetails/PersonalAddressPage').default,
+    [SCREENS.SETTINGS.WALLET.DOMAIN_CARD]: () => require<ReactComponentModule>('../../../../pages/settings/Wallet/ExpensifyCardPage').default,
+    [SCREENS.SETTINGS.WALLET.REPORT_VIRTUAL_CARD_FRAUD]: () => require<ReactComponentModule>('../../../../pages/settings/Wallet/ReportVirtualCardFraudPage').default,
+    [SCREENS.SETTINGS.WALLET.CARD_ACTIVATE]: () => require<ReactComponentModule>('../../../../pages/settings/Wallet/ActivatePhysicalCardPage').default,
+    [SCREENS.SETTINGS.WALLET.CARD_GET_PHYSICAL.NAME]: () => require<ReactComponentModule>('../../../../pages/settings/Wallet/Card/GetPhysicalCardName').default,
+    [SCREENS.SETTINGS.WALLET.CARD_GET_PHYSICAL.PHONE]: () => require<ReactComponentModule>('../../../../pages/settings/Wallet/Card/GetPhysicalCardPhone').default,
+    [SCREENS.SETTINGS.WALLET.CARD_GET_PHYSICAL.ADDRESS]: () => require<ReactComponentModule>('../../../../pages/settings/Wallet/Card/GetPhysicalCardAddress').default,
+    [SCREENS.SETTINGS.WALLET.CARD_GET_PHYSICAL.CONFIRM]: () => require<ReactComponentModule>('../../../../pages/settings/Wallet/Card/GetPhysicalCardConfirm').default,
+    [SCREENS.SETTINGS.WALLET.TRANSFER_BALANCE]: () => require<ReactComponentModule>('../../../../pages/settings/Wallet/TransferBalancePage').default,
+    [SCREENS.SETTINGS.WALLET.CHOOSE_TRANSFER_ACCOUNT]: () => require<ReactComponentModule>('../../../../pages/settings/Wallet/ChooseTransferAccountPage').default,
+    [SCREENS.SETTINGS.WALLET.ENABLE_PAYMENTS]: () => require<ReactComponentModule>('../../../../pages/EnablePayments/EnablePayments').default,
+    [SCREENS.SETTINGS.ADD_DEBIT_CARD]: () => require<ReactComponentModule>('../../../../pages/settings/Wallet/AddDebitCardPage').default,
+    [SCREENS.SETTINGS.ADD_BANK_ACCOUNT]: () => require<ReactComponentModule>('../../../../pages/AddPersonalBankAccountPage').default,
+    [SCREENS.SETTINGS.PROFILE.STATUS]: () => require<ReactComponentModule>('../../../../pages/settings/Profile/CustomStatus/StatusPage').default,
+    [SCREENS.SETTINGS.PROFILE.STATUS_CLEAR_AFTER]: () => require<ReactComponentModule>('../../../../pages/settings/Profile/CustomStatus/StatusClearAfterPage').default,
+    [SCREENS.SETTINGS.PROFILE.STATUS_CLEAR_AFTER_DATE]: () => require<ReactComponentModule>('../../../../pages/settings/Profile/CustomStatus/SetDatePage').default,
+    [SCREENS.SETTINGS.PROFILE.STATUS_CLEAR_AFTER_TIME]: () => require<ReactComponentModule>('../../../../pages/settings/Profile/CustomStatus/SetTimePage').default,
+    [SCREENS.SETTINGS.SUBSCRIPTION.SIZE]: () => require<ReactComponentModule>('../../../../pages/settings/Subscription/SubscriptionSize').default,
+    [SCREENS.SETTINGS.SUBSCRIPTION.DISABLE_AUTO_RENEW_SURVEY]: () => require<ReactComponentModule>('../../../../pages/settings/Subscription/DisableAutoRenewSurveyPage').default,
+    [SCREENS.SETTINGS.SUBSCRIPTION.REQUEST_EARLY_CANCELLATION]: () => require<ReactComponentModule>('../../../../pages/settings/Subscription/RequestEarlyCancellationPage').default,
+    [SCREENS.WORKSPACE.RATE_AND_UNIT]: () => require<ReactComponentModule>('../../../../pages/workspace/reimburse/WorkspaceRateAndUnitPage/InitialPage').default,
+    [SCREENS.WORKSPACE.RATE_AND_UNIT_RATE]: () => require<ReactComponentModule>('../../../../pages/workspace/reimburse/WorkspaceRateAndUnitPage/RatePage').default,
+    [SCREENS.WORKSPACE.RATE_AND_UNIT_UNIT]: () => require<ReactComponentModule>('../../../../pages/workspace/reimburse/WorkspaceRateAndUnitPage/UnitPage').default,
+    [SCREENS.WORKSPACE.INVITE]: () => require<ReactComponentModule>('../../../../pages/workspace/WorkspaceInvitePage').default,
+    [SCREENS.WORKSPACE.WORKFLOWS_APPROVALS_NEW]: () => require<ReactComponentModule>('../../../../pages/workspace/workflows/approvals/WorkspaceWorkflowsApprovalsCreatePage').default,
+    [SCREENS.WORKSPACE.WORKFLOWS_APPROVALS_EDIT]: () => require<ReactComponentModule>('../../../../pages/workspace/workflows/approvals/WorkspaceWorkflowsApprovalsEditPage').default,
+    [SCREENS.WORKSPACE.WORKFLOWS_APPROVALS_EXPENSES_FROM]: () =>
+        require<ReactComponentModule>('../../../../pages/workspace/workflows/approvals/WorkspaceWorkflowsApprovalsExpensesFromPage').default,
+    [SCREENS.WORKSPACE.WORKFLOWS_APPROVALS_APPROVER]: () => require<ReactComponentModule>('../../../../pages/workspace/workflows/approvals/WorkspaceWorkflowsApprovalsApproverPage').default,
+    [SCREENS.WORKSPACE.INVITE_MESSAGE]: () => require<ReactComponentModule>('../../../../pages/workspace/WorkspaceInviteMessagePage').default,
+    [SCREENS.WORKSPACE.WORKFLOWS_PAYER]: () => require<ReactComponentModule>('../../../../pages/workspace/workflows/WorkspaceWorkflowsPayerPage').default,
+    [SCREENS.WORKSPACE.NAME]: () => require<ReactComponentModule>('../../../../pages/workspace/WorkspaceNamePage').default,
+    [SCREENS.WORKSPACE.DESCRIPTION]: () => require<ReactComponentModule>('../../../../pages/workspace/WorkspaceProfileDescriptionPage').default,
+    [SCREENS.WORKSPACE.SHARE]: () => require<ReactComponentModule>('../../../../pages/workspace/WorkspaceProfileSharePage').default,
+    [SCREENS.WORKSPACE.CURRENCY]: () => require<ReactComponentModule>('../../../../pages/workspace/WorkspaceProfileCurrencyPage').default,
+    [SCREENS.WORKSPACE.CATEGORY_SETTINGS]: () => require<ReactComponentModule>('../../../../pages/workspace/categories/CategorySettingsPage').default,
+    [SCREENS.WORKSPACE.ADDRESS]: () => require<ReactComponentModule>('../../../../pages/workspace/WorkspaceProfileAddressPage').default,
+    [SCREENS.WORKSPACE.CATEGORIES_SETTINGS]: () => require<ReactComponentModule>('../../../../pages/workspace/categories/WorkspaceCategoriesSettingsPage').default,
+    [SCREENS.WORKSPACE.UPGRADE]: () => require<ReactComponentModule>('../../../../pages/workspace/upgrade/WorkspaceUpgradePage').default,
+    [SCREENS.WORKSPACE.MEMBER_DETAILS]: () => require<ReactComponentModule>('../../../../pages/workspace/members/WorkspaceMemberDetailsPage').default,
+    [SCREENS.WORKSPACE.OWNER_CHANGE_CHECK]: () => require<ReactComponentModule>('@pages/workspace/members/WorkspaceOwnerChangeWrapperPage').default,
+    [SCREENS.WORKSPACE.OWNER_CHANGE_SUCCESS]: () => require<ReactComponentModule>('../../../../pages/workspace/members/WorkspaceOwnerChangeSuccessPage').default,
+    [SCREENS.WORKSPACE.OWNER_CHANGE_ERROR]: () => require<ReactComponentModule>('../../../../pages/workspace/members/WorkspaceOwnerChangeErrorPage').default,
+    [SCREENS.WORKSPACE.CATEGORY_CREATE]: () => require<ReactComponentModule>('../../../../pages/workspace/categories/CreateCategoryPage').default,
+    [SCREENS.WORKSPACE.CATEGORY_EDIT]: () => require<ReactComponentModule>('../../../../pages/workspace/categories/EditCategoryPage').default,
+    [SCREENS.WORKSPACE.CATEGORY_PAYROLL_CODE]: () => require<ReactComponentModule>('../../../../pages/workspace/categories/CategoryPayrollCodePage').default,
+    [SCREENS.WORKSPACE.CATEGORY_GL_CODE]: () => require<ReactComponentModule>('../../../../pages/workspace/categories/CategoryGLCodePage').default,
+    [SCREENS.WORKSPACE.CREATE_DISTANCE_RATE]: () => require<ReactComponentModule>('../../../../pages/workspace/distanceRates/CreateDistanceRatePage').default,
+    [SCREENS.WORKSPACE.DISTANCE_RATES_SETTINGS]: () => require<ReactComponentModule>('../../../../pages/workspace/distanceRates/PolicyDistanceRatesSettingsPage').default,
+    [SCREENS.WORKSPACE.DISTANCE_RATE_DETAILS]: () => require<ReactComponentModule>('../../../../pages/workspace/distanceRates/PolicyDistanceRateDetailsPage').default,
+    [SCREENS.WORKSPACE.DISTANCE_RATE_EDIT]: () => require<ReactComponentModule>('../../../../pages/workspace/distanceRates/PolicyDistanceRateEditPage').default,
+    [SCREENS.WORKSPACE.DISTANCE_RATE_TAX_RECLAIMABLE_ON_EDIT]: () =>
+        require<ReactComponentModule>('../../../../pages/workspace/distanceRates/PolicyDistanceRateTaxReclaimableEditPage').default,
+    [SCREENS.WORKSPACE.DISTANCE_RATE_TAX_RATE_EDIT]: () => require<ReactComponentModule>('../../../../pages/workspace/distanceRates/PolicyDistanceRateTaxRateEditPage').default,
+    [SCREENS.WORKSPACE.TAGS_SETTINGS]: () => require<ReactComponentModule>('../../../../pages/workspace/tags/WorkspaceTagsSettingsPage').default,
+    [SCREENS.WORKSPACE.TAG_SETTINGS]: () => require<ReactComponentModule>('../../../../pages/workspace/tags/TagSettingsPage').default,
+    [SCREENS.WORKSPACE.TAG_LIST_VIEW]: () => require<ReactComponentModule>('../../../../pages/workspace/tags/WorkspaceViewTagsPage').default,
+    [SCREENS.WORKSPACE.TAGS_EDIT]: () => require<ReactComponentModule>('../../../../pages/workspace/tags/WorkspaceEditTagsPage').default,
+    [SCREENS.WORKSPACE.TAG_CREATE]: () => require<ReactComponentModule>('../../../../pages/workspace/tags/WorkspaceCreateTagPage').default,
+    [SCREENS.WORKSPACE.TAG_EDIT]: () => require<ReactComponentModule>('../../../../pages/workspace/tags/EditTagPage').default,
+    [SCREENS.WORKSPACE.TAG_GL_CODE]: () => require<ReactComponentModule>('../../../../pages/workspace/tags/TagGLCodePage').default,
+    [SCREENS.WORKSPACE.TAXES_SETTINGS]: () => require<ReactComponentModule>('../../../../pages/workspace/taxes/WorkspaceTaxesSettingsPage').default,
+    [SCREENS.WORKSPACE.TAXES_SETTINGS_CUSTOM_TAX_NAME]: () => require<ReactComponentModule>('../../../../pages/workspace/taxes/WorkspaceTaxesSettingsCustomTaxName').default,
+    [SCREENS.WORKSPACE.TAXES_SETTINGS_FOREIGN_CURRENCY_DEFAULT]: () => require<ReactComponentModule>('../../../../pages/workspace/taxes/WorkspaceTaxesSettingsForeignCurrency').default,
+    [SCREENS.WORKSPACE.TAXES_SETTINGS_WORKSPACE_CURRENCY_DEFAULT]: () => require<ReactComponentModule>('../../../../pages/workspace/taxes/WorkspaceTaxesSettingsWorkspaceCurrency').default,
     [SCREENS.WORKSPACE.ACCOUNTING.QUICKBOOKS_ONLINE_EXPORT]: () =>
-        require('../../../../pages/workspace/accounting/qbo/export/QuickbooksExportConfigurationPage').default as React.ComponentType,
+        require<ReactComponentModule>('../../../../pages/workspace/accounting/qbo/export/QuickbooksExportConfigurationPage').default,
     [SCREENS.WORKSPACE.ACCOUNTING.QUICKBOOKS_ONLINE_EXPORT_DATE_SELECT]: () =>
-        require('../../../../pages/workspace/accounting/qbo/export/QuickbooksExportDateSelectPage').default as React.ComponentType,
+        require<ReactComponentModule>('../../../../pages/workspace/accounting/qbo/export/QuickbooksExportDateSelectPage').default,
     [SCREENS.WORKSPACE.ACCOUNTING.QUICKBOOKS_ONLINE_EXPORT_INVOICE_ACCOUNT_SELECT]: () =>
-        require('../../../../pages/workspace/accounting/qbo/export/QuickbooksExportInvoiceAccountSelectPage').default as React.ComponentType,
+        require<ReactComponentModule>('../../../../pages/workspace/accounting/qbo/export/QuickbooksExportInvoiceAccountSelectPage').default,
     [SCREENS.WORKSPACE.ACCOUNTING.QUICKBOOKS_ONLINE_EXPORT_OUT_OF_POCKET_EXPENSES_ACCOUNT_SELECT]: () =>
-        require('../../../../pages/workspace/accounting/qbo/export/QuickbooksOutOfPocketExpenseAccountSelectPage').default as React.ComponentType,
-    [SCREENS.WORKSPACE.ACCOUNTING.QUICKBOOKS_ONLINE_COMPANY_CARD_EXPENSE_ACCOUNT_PAYABLE_SELECT]: () =>
-        require('../../../../pages/workspace/accounting/qbo/export/QuickbooksCompanyCardExpenseAccountPayableSelectPage').default as React.ComponentType,
+        require<ReactComponentModule>('../../../../pages/workspace/accounting/qbo/export/QuickbooksOutOfPocketExpenseAccountSelectPage').default,
     [SCREENS.WORKSPACE.ACCOUNTING.QUICKBOOKS_ONLINE_EXPORT_OUT_OF_POCKET_EXPENSES]: () =>
-        require('../../../../pages/workspace/accounting/qbo/export/QuickbooksOutOfPocketExpenseConfigurationPage').default as React.ComponentType,
+        require<ReactComponentModule>('../../../../pages/workspace/accounting/qbo/export/QuickbooksOutOfPocketExpenseConfigurationPage').default,
     [SCREENS.WORKSPACE.ACCOUNTING.QUICKBOOKS_ONLINE_EXPORT_OUT_OF_POCKET_EXPENSES_SELECT]: () =>
-        require('../../../../pages/workspace/accounting/qbo/export/QuickbooksOutOfPocketExpenseEntitySelectPage').default as React.ComponentType,
+        require<ReactComponentModule>('../../../../pages/workspace/accounting/qbo/export/QuickbooksOutOfPocketExpenseEntitySelectPage').default,
     [SCREENS.WORKSPACE.ACCOUNTING.QUICKBOOKS_ONLINE_NON_REIMBURSABLE_DEFAULT_VENDOR_SELECT]: () =>
-        require('../../../../pages/workspace/accounting/qbo/export/QuickbooksNonReimbursableDefaultVendorSelectPage').default as React.ComponentType,
+        require<ReactComponentModule>('../../../../pages/workspace/accounting/qbo/export/QuickbooksNonReimbursableDefaultVendorSelectPage').default,
     [SCREENS.WORKSPACE.ACCOUNTING.QUICKBOOKS_ONLINE_COMPANY_CARD_EXPENSE_ACCOUNT_SELECT]: () =>
-        require('@pages/workspace/accounting/qbo/export/QuickbooksCompanyCardExpenseAccountSelectPage').default as React.ComponentType,
+        require<ReactComponentModule>('@pages/workspace/accounting/qbo/export/QuickbooksCompanyCardExpenseAccountSelectPage').default,
     [SCREENS.WORKSPACE.ACCOUNTING.QUICKBOOKS_ONLINE_COMPANY_CARD_EXPENSE_ACCOUNT_COMPANY_CARD_SELECT]: () =>
-        require('../../../../pages/workspace/accounting/qbo/export/QuickbooksCompanyCardExpenseAccountSelectCardPage').default as React.ComponentType,
+        require<ReactComponentModule>('../../../../pages/workspace/accounting/qbo/export/QuickbooksCompanyCardExpenseAccountSelectCardPage').default,
     [SCREENS.WORKSPACE.ACCOUNTING.QUICKBOOKS_ONLINE_COMPANY_CARD_EXPENSE_ACCOUNT]: () =>
-        require('../../../../pages/workspace/accounting/qbo/export/QuickbooksCompanyCardExpenseAccountPage').default as React.ComponentType,
+        require<ReactComponentModule>('../../../../pages/workspace/accounting/qbo/export/QuickbooksCompanyCardExpenseAccountPage').default,
     [SCREENS.WORKSPACE.ACCOUNTING.QUICKBOOKS_ONLINE_EXPORT_PREFERRED_EXPORTER]: () =>
-        require('../../../../pages/workspace/accounting/qbo/export/QuickbooksPreferredExporterConfigurationPage').default as React.ComponentType,
-    [SCREENS.REIMBURSEMENT_ACCOUNT]: () => require('../../../../pages/ReimbursementAccount/ReimbursementAccountPage').default as React.ComponentType,
-    [SCREENS.GET_ASSISTANCE]: () => require('../../../../pages/GetAssistancePage').default as React.ComponentType,
-    [SCREENS.SETTINGS.TWO_FACTOR_AUTH]: () => require('../../../../pages/settings/Security/TwoFactorAuth/TwoFactorAuthPage').default as React.ComponentType,
-    [SCREENS.SETTINGS.REPORT_CARD_LOST_OR_DAMAGED]: () => require('../../../../pages/settings/Wallet/ReportCardLostPage').default as React.ComponentType,
-    [SCREENS.KEYBOARD_SHORTCUTS]: () => require('../../../../pages/KeyboardShortcutsPage').default as React.ComponentType,
-    [SCREENS.SETTINGS.EXIT_SURVEY.REASON]: () => require('../../../../pages/settings/ExitSurvey/ExitSurveyReasonPage').default as React.ComponentType,
-    [SCREENS.SETTINGS.EXIT_SURVEY.RESPONSE]: () => require('../../../../pages/settings/ExitSurvey/ExitSurveyResponsePage').default as React.ComponentType,
-    [SCREENS.SETTINGS.EXIT_SURVEY.CONFIRM]: () => require('../../../../pages/settings/ExitSurvey/ExitSurveyConfirmPage').default as React.ComponentType,
-    [SCREENS.WORKSPACE.ACCOUNTING.QUICKBOOKS_ONLINE_IMPORT]: () => require('../../../../pages/workspace/accounting/qbo/import/QuickbooksImportPage').default as React.ComponentType,
+        require<ReactComponentModule>('../../../../pages/workspace/accounting/qbo/export/QuickbooksPreferredExporterConfigurationPage').default,
+    [SCREENS.REIMBURSEMENT_ACCOUNT]: () => require<ReactComponentModule>('../../../../pages/ReimbursementAccount/ReimbursementAccountPage').default,
+    [SCREENS.GET_ASSISTANCE]: () => require<ReactComponentModule>('../../../../pages/GetAssistancePage').default,
+    [SCREENS.SETTINGS.TWO_FACTOR_AUTH]: () => require<ReactComponentModule>('../../../../pages/settings/Security/TwoFactorAuth/TwoFactorAuthPage').default,
+    [SCREENS.SETTINGS.REPORT_CARD_LOST_OR_DAMAGED]: () => require<ReactComponentModule>('../../../../pages/settings/Wallet/ReportCardLostPage').default,
+    [SCREENS.KEYBOARD_SHORTCUTS]: () => require<ReactComponentModule>('../../../../pages/KeyboardShortcutsPage').default,
+    [SCREENS.SETTINGS.EXIT_SURVEY.REASON]: () => require<ReactComponentModule>('../../../../pages/settings/ExitSurvey/ExitSurveyReasonPage').default,
+    [SCREENS.SETTINGS.EXIT_SURVEY.RESPONSE]: () => require<ReactComponentModule>('../../../../pages/settings/ExitSurvey/ExitSurveyResponsePage').default,
+    [SCREENS.SETTINGS.EXIT_SURVEY.CONFIRM]: () => require<ReactComponentModule>('../../../../pages/settings/ExitSurvey/ExitSurveyConfirmPage').default,
+    [SCREENS.WORKSPACE.ACCOUNTING.QUICKBOOKS_ONLINE_IMPORT]: () => require<ReactComponentModule>('../../../../pages/workspace/accounting/qbo/import/QuickbooksImportPage').default,
     [SCREENS.WORKSPACE.ACCOUNTING.QUICKBOOKS_ONLINE_CHART_OF_ACCOUNTS]: () =>
-        require('../../../../pages/workspace/accounting/qbo/import/QuickbooksChartOfAccountsPage').default as React.ComponentType,
-    [SCREENS.WORKSPACE.ACCOUNTING.QUICKBOOKS_ONLINE_CUSTOMERS]: () => require('../../../../pages/workspace/accounting/qbo/import/QuickbooksCustomersPage').default as React.ComponentType,
-    [SCREENS.WORKSPACE.ACCOUNTING.QUICKBOOKS_ONLINE_TAXES]: () => require('../../../../pages/workspace/accounting/qbo/import/QuickbooksTaxesPage').default as React.ComponentType,
-    [SCREENS.WORKSPACE.ACCOUNTING.QUICKBOOKS_ONLINE_LOCATIONS]: () => require('../../../../pages/workspace/accounting/qbo/import/QuickbooksLocationsPage').default as React.ComponentType,
-    [SCREENS.WORKSPACE.ACCOUNTING.QUICKBOOKS_ONLINE_CLASSES]: () => require('../../../../pages/workspace/accounting/qbo/import/QuickbooksClassesPage').default as React.ComponentType,
-    [SCREENS.WORKSPACE.ACCOUNTING.QUICKBOOKS_ONLINE_ADVANCED]: () => require('../../../../pages/workspace/accounting/qbo/advanced/QuickbooksAdvancedPage').default as React.ComponentType,
+        require<ReactComponentModule>('../../../../pages/workspace/accounting/qbo/import/QuickbooksChartOfAccountsPage').default,
+    [SCREENS.WORKSPACE.ACCOUNTING.QUICKBOOKS_ONLINE_CUSTOMERS]: () => require<ReactComponentModule>('../../../../pages/workspace/accounting/qbo/import/QuickbooksCustomersPage').default,
+    [SCREENS.WORKSPACE.ACCOUNTING.QUICKBOOKS_ONLINE_TAXES]: () => require<ReactComponentModule>('../../../../pages/workspace/accounting/qbo/import/QuickbooksTaxesPage').default,
+    [SCREENS.WORKSPACE.ACCOUNTING.QUICKBOOKS_ONLINE_LOCATIONS]: () => require<ReactComponentModule>('../../../../pages/workspace/accounting/qbo/import/QuickbooksLocationsPage').default,
+    [SCREENS.WORKSPACE.ACCOUNTING.QUICKBOOKS_ONLINE_CLASSES]: () => require<ReactComponentModule>('../../../../pages/workspace/accounting/qbo/import/QuickbooksClassesPage').default,
+    [SCREENS.WORKSPACE.ACCOUNTING.QUICKBOOKS_ONLINE_ADVANCED]: () => require<ReactComponentModule>('../../../../pages/workspace/accounting/qbo/advanced/QuickbooksAdvancedPage').default,
     [SCREENS.WORKSPACE.ACCOUNTING.QUICKBOOKS_ONLINE_ACCOUNT_SELECTOR]: () =>
-        require('../../../../pages/workspace/accounting/qbo/advanced/QuickbooksAccountSelectPage').default as React.ComponentType,
+        require<ReactComponentModule>('../../../../pages/workspace/accounting/qbo/advanced/QuickbooksAccountSelectPage').default,
     [SCREENS.WORKSPACE.ACCOUNTING.QUICKBOOKS_ONLINE_INVOICE_ACCOUNT_SELECTOR]: () =>
-        require('../../../../pages/workspace/accounting/qbo/advanced/QuickbooksInvoiceAccountSelectPage').default as React.ComponentType,
-
-    [SCREENS.WORKSPACE.ACCOUNTING.XERO_IMPORT]: () => require('../../../../pages/workspace/accounting/xero/XeroImportPage').default as React.ComponentType,
-    [SCREENS.WORKSPACE.ACCOUNTING.XERO_ORGANIZATION]: () => require('../../../../pages/workspace/accounting/xero/XeroOrganizationConfigurationPage').default as React.ComponentType,
-    [SCREENS.WORKSPACE.ACCOUNTING.XERO_CUSTOMER]: () => require('../../../../pages/workspace/accounting/xero/import/XeroCustomerConfigurationPage').default as React.ComponentType,
-    [SCREENS.WORKSPACE.ACCOUNTING.XERO_TAXES]: () => require('../../../../pages/workspace/accounting/xero/XeroTaxesConfigurationPage').default as React.ComponentType,
-    [SCREENS.WORKSPACE.ACCOUNTING.XERO_ADVANCED]: () => require('../../../../pages/workspace/accounting/xero/advanced/XeroAdvancedPage').default as React.ComponentType,
-    [SCREENS.WORKSPACE.WORKFLOWS_AUTO_REPORTING_FREQUENCY]: () => require('../../../../pages/workspace/workflows/WorkspaceAutoReportingFrequencyPage').default as React.ComponentType,
-    [SCREENS.WORKSPACE.WORKFLOWS_AUTO_REPORTING_MONTHLY_OFFSET]: () =>
-        require('../../../../pages/workspace/workflows/WorkspaceAutoReportingMonthlyOffsetPage').default as React.ComponentType,
-    [SCREENS.WORKSPACE.TAX_EDIT]: () => require('../../../../pages/workspace/taxes/WorkspaceEditTaxPage').default as React.ComponentType,
-    [SCREENS.WORKSPACE.TAX_NAME]: () => require('../../../../pages/workspace/taxes/NamePage').default as React.ComponentType,
-    [SCREENS.WORKSPACE.TAX_VALUE]: () => require('../../../../pages/workspace/taxes/ValuePage').default as React.ComponentType,
-    [SCREENS.WORKSPACE.TAX_CREATE]: () => require('../../../../pages/workspace/taxes/WorkspaceCreateTaxPage').default as React.ComponentType,
-    [SCREENS.SETTINGS.SAVE_THE_WORLD]: () => require('../../../../pages/TeachersUnite/SaveTheWorldPage').default as React.ComponentType,
+        require<ReactComponentModule>('../../../../pages/workspace/accounting/qbo/advanced/QuickbooksInvoiceAccountSelectPage').default,
+
+    [SCREENS.WORKSPACE.ACCOUNTING.XERO_IMPORT]: () => require<ReactComponentModule>('../../../../pages/workspace/accounting/xero/XeroImportPage').default,
+    [SCREENS.WORKSPACE.ACCOUNTING.XERO_ORGANIZATION]: () => require<ReactComponentModule>('../../../../pages/workspace/accounting/xero/XeroOrganizationConfigurationPage').default,
+    [SCREENS.WORKSPACE.ACCOUNTING.XERO_CHART_OF_ACCOUNTS]: () => require<ReactComponentModule>('../../../../pages/workspace/accounting/xero/import/XeroChartOfAccountsPage').default,
+    [SCREENS.WORKSPACE.ACCOUNTING.XERO_CUSTOMER]: () => require<ReactComponentModule>('../../../../pages/workspace/accounting/xero/import/XeroCustomerConfigurationPage').default,
+    [SCREENS.WORKSPACE.ACCOUNTING.XERO_TAXES]: () => require<ReactComponentModule>('../../../../pages/workspace/accounting/xero/XeroTaxesConfigurationPage').default,
+    [SCREENS.WORKSPACE.ACCOUNTING.XERO_TRACKING_CATEGORIES]: () => require<ReactComponentModule>('../../../../pages/workspace/accounting/xero/XeroTrackingCategoryConfigurationPage').default,
+    [SCREENS.WORKSPACE.ACCOUNTING.XERO_MAP_TRACKING_CATEGORY]: () =>
+        require<ReactComponentModule>('../../../../pages/workspace/accounting/xero/XeroMapTrackingCategoryConfigurationPage').default,
+    [SCREENS.WORKSPACE.ACCOUNTING.XERO_EXPORT]: () => require<ReactComponentModule>('../../../../pages/workspace/accounting/xero/export/XeroExportConfigurationPage').default,
+    [SCREENS.WORKSPACE.ACCOUNTING.XERO_EXPORT_PURCHASE_BILL_DATE_SELECT]: () =>
+        require<ReactComponentModule>('../../../../pages/workspace/accounting/xero/export/XeroPurchaseBillDateSelectPage').default,
+    [SCREENS.WORKSPACE.ACCOUNTING.XERO_EXPORT_BANK_ACCOUNT_SELECT]: () =>
+        require<ReactComponentModule>('../../../../pages/workspace/accounting/xero/export/XeroBankAccountSelectPage').default,
+    [SCREENS.WORKSPACE.ACCOUNTING.XERO_ADVANCED]: () => require<ReactComponentModule>('../../../../pages/workspace/accounting/xero/advanced/XeroAdvancedPage').default,
+    [SCREENS.WORKSPACE.ACCOUNTING.XERO_BILL_STATUS_SELECTOR]: () =>
+        require<ReactComponentModule>('../../../../pages/workspace/accounting/xero/export/XeroPurchaseBillStatusSelectorPage').default,
+    [SCREENS.WORKSPACE.ACCOUNTING.XERO_INVOICE_ACCOUNT_SELECTOR]: () =>
+        require<ReactComponentModule>('../../../../pages/workspace/accounting/xero/advanced/XeroInvoiceAccountSelectorPage').default,
+    [SCREENS.WORKSPACE.ACCOUNTING.XERO_EXPORT_PREFERRED_EXPORTER_SELECT]: () =>
+        require<ReactComponentModule>('../../../../pages/workspace/accounting/xero/export/XeroPreferredExporterSelectPage').default,
+    [SCREENS.WORKSPACE.ACCOUNTING.XERO_BILL_PAYMENT_ACCOUNT_SELECTOR]: () =>
+        require<ReactComponentModule>('../../../../pages/workspace/accounting/xero/advanced/XeroBillPaymentAccountSelectorPage').default,
+
+    [SCREENS.WORKSPACE.ACCOUNTING.NETSUITE_SUBSIDIARY_SELECTOR]: () => require<ReactComponentModule>('../../../../pages/workspace/accounting/netsuite/NetSuiteSubsidiarySelector').default,
+    [SCREENS.WORKSPACE.ACCOUNTING.NETSUITE_REUSE_EXISTING_CONNECTIONS]: () =>
+        require<ReactComponentModule>('../../../../pages/workspace/accounting/netsuite/NetSuiteTokenInput/NetSuiteExistingConnectionsPage').default,
+    [SCREENS.WORKSPACE.ACCOUNTING.NETSUITE_TOKEN_INPUT]: () =>
+        require<ReactComponentModule>('../../../../pages/workspace/accounting/netsuite/NetSuiteTokenInput/NetSuiteTokenInputPage').default,
+    [SCREENS.WORKSPACE.ACCOUNTING.NETSUITE_IMPORT]: () => require<ReactComponentModule>('../../../../pages/workspace/accounting/netsuite/import/NetSuiteImportPage').default,
+    [SCREENS.WORKSPACE.ACCOUNTING.NETSUITE_IMPORT_MAPPING]: () => require<ReactComponentModule>('../../../../pages/workspace/accounting/netsuite/import/NetSuiteImportMappingPage').default,
+    [SCREENS.WORKSPACE.ACCOUNTING.NETSUITE_IMPORT_CUSTOM_FIELD]: () =>
+        require<ReactComponentModule>('../../../../pages/workspace/accounting/netsuite/import/NetSuiteImportCustomFieldPage').default,
+    [SCREENS.WORKSPACE.ACCOUNTING.NETSUITE_IMPORT_CUSTOM_FIELD_VIEW]: () =>
+        require<ReactComponentModule>('../../../../pages/workspace/accounting/netsuite/import/NetSuiteImportCustomFieldView').default,
+    [SCREENS.WORKSPACE.ACCOUNTING.NETSUITE_IMPORT_CUSTOM_FIELD_EDIT]: () =>
+        require<ReactComponentModule>('../../../../pages/workspace/accounting/netsuite/import/NetSuiteImportCustomFieldEdit').default,
+    [SCREENS.WORKSPACE.ACCOUNTING.NETSUITE_IMPORT_CUSTOM_LIST_ADD]: () =>
+        require<ReactComponentModule>('../../../../pages/workspace/accounting/netsuite/import/NetSuiteImportCustomFieldNew/NetSuiteImportAddCustomListPage').default,
+    [SCREENS.WORKSPACE.ACCOUNTING.NETSUITE_IMPORT_CUSTOM_SEGMENT_ADD]: () =>
+        require<ReactComponentModule>('../../../../pages/workspace/accounting/netsuite/import/NetSuiteImportCustomFieldNew/NetSuiteImportAddCustomSegmentPage').default,
+    [SCREENS.WORKSPACE.ACCOUNTING.NETSUITE_IMPORT_CUSTOMERS_OR_PROJECTS]: () =>
+        require<ReactComponentModule>('../../../../pages/workspace/accounting/netsuite/import/NetSuiteImportCustomersOrProjectsPage').default,
+    [SCREENS.WORKSPACE.ACCOUNTING.NETSUITE_IMPORT_CUSTOMERS_OR_PROJECTS_SELECT]: () =>
+        require<ReactComponentModule>('../../../../pages/workspace/accounting/netsuite/import/NetSuiteImportCustomersOrProjectSelectPage').default,
+    [SCREENS.WORKSPACE.ACCOUNTING.NETSUITE_EXPORT]: () => require<ReactComponentModule>('../../../../pages/workspace/accounting/netsuite/export/NetSuiteExportConfigurationPage').default,
+    [SCREENS.WORKSPACE.ACCOUNTING.NETSUITE_PREFERRED_EXPORTER_SELECT]: () =>
+        require<ReactComponentModule>('../../../../pages/workspace/accounting/netsuite/export/NetSuitePreferredExporterSelectPage').default,
+    [SCREENS.WORKSPACE.ACCOUNTING.NETSUITE_DATE_SELECT]: () => require<ReactComponentModule>('../../../../pages/workspace/accounting/netsuite/export/NetSuiteDateSelectPage').default,
+    [SCREENS.WORKSPACE.ACCOUNTING.NETSUITE_EXPORT_EXPENSES]: () => require<ReactComponentModule>('../../../../pages/workspace/accounting/netsuite/export/NetSuiteExportExpensesPage').default,
+    [SCREENS.WORKSPACE.ACCOUNTING.NETSUITE_EXPORT_EXPENSES_DESTINATION_SELECT]: () =>
+        require<ReactComponentModule>('../../../../pages/workspace/accounting/netsuite/export/NetSuiteExportExpensesDestinationSelectPage').default,
+    [SCREENS.WORKSPACE.ACCOUNTING.NETSUITE_EXPORT_EXPENSES_VENDOR_SELECT]: () =>
+        require<ReactComponentModule>('../../../../pages/workspace/accounting/netsuite/export/NetSuiteExportExpensesVendorSelectPage').default,
+    [SCREENS.WORKSPACE.ACCOUNTING.NETSUITE_EXPORT_EXPENSES_PAYABLE_ACCOUNT_SELECT]: () =>
+        require<ReactComponentModule>('../../../../pages/workspace/accounting/netsuite/export/NetSuiteExportExpensesPayableAccountSelectPage').default,
+    [SCREENS.WORKSPACE.ACCOUNTING.NETSUITE_EXPORT_EXPENSES_JOURNAL_POSTING_PREFERENCE_SELECT]: () =>
+        require<ReactComponentModule>('../../../../pages/workspace/accounting/netsuite/export/NetSuiteExportExpensesJournalPostingPreferenceSelectPage').default,
+    [SCREENS.WORKSPACE.ACCOUNTING.NETSUITE_RECEIVABLE_ACCOUNT_SELECT]: () =>
+        require<ReactComponentModule>('../../../../pages/workspace/accounting/netsuite/export/NetSuiteReceivableAccountSelectPage').default,
+    [SCREENS.WORKSPACE.ACCOUNTING.NETSUITE_INVOICE_ITEM_PREFERENCE_SELECT]: () =>
+        require<ReactComponentModule>('../../../../pages/workspace/accounting/netsuite/export/NetSuiteInvoiceItemPreferenceSelectPage').default,
+    [SCREENS.WORKSPACE.ACCOUNTING.NETSUITE_INVOICE_ITEM_SELECT]: () =>
+        require<ReactComponentModule>('../../../../pages/workspace/accounting/netsuite/export/NetSuiteInvoiceItemSelectPage').default,
+    [SCREENS.WORKSPACE.ACCOUNTING.NETSUITE_TAX_POSTING_ACCOUNT_SELECT]: () =>
+        require<ReactComponentModule>('../../../../pages/workspace/accounting/netsuite/export/NetSuiteTaxPostingAccountSelectPage').default,
+    [SCREENS.WORKSPACE.ACCOUNTING.NETSUITE_PROVINCIAL_TAX_POSTING_ACCOUNT_SELECT]: () =>
+        require<ReactComponentModule>('../../../../pages/workspace/accounting/netsuite/export/NetSuiteProvincialTaxPostingAccountSelectPage').default,
+    [SCREENS.WORKSPACE.ACCOUNTING.NETSUITE_ADVANCED]: () => require<ReactComponentModule>('../../../../pages/workspace/accounting/netsuite/advanced/NetSuiteAdvancedPage').default,
+    [SCREENS.WORKSPACE.ACCOUNTING.NETSUITE_REIMBURSEMENT_ACCOUNT_SELECT]: () =>
+        require<ReactComponentModule>('../../../../pages/workspace/accounting/netsuite/advanced/NetSuiteReimbursementAccountSelectPage').default,
+    [SCREENS.WORKSPACE.ACCOUNTING.NETSUITE_COLLECTION_ACCOUNT_SELECT]: () =>
+        require<ReactComponentModule>('../../../../pages/workspace/accounting/netsuite/advanced/NetSuiteCollectionAccountSelectPage').default,
+    [SCREENS.WORKSPACE.ACCOUNTING.NETSUITE_EXPENSE_REPORT_APPROVAL_LEVEL_SELECT]: () =>
+        require<ReactComponentModule>('../../../../pages/workspace/accounting/netsuite/advanced/NetSuiteExpenseReportApprovalLevelSelectPage').default,
+    [SCREENS.WORKSPACE.ACCOUNTING.NETSUITE_VENDOR_BILL_APPROVAL_LEVEL_SELECT]: () =>
+        require<ReactComponentModule>('../../../../pages/workspace/accounting/netsuite/advanced/NetSuiteVendorBillApprovalLevelSelectPage').default,
+    [SCREENS.WORKSPACE.ACCOUNTING.NETSUITE_JOURNAL_ENTRY_APPROVAL_LEVEL_SELECT]: () =>
+        require<ReactComponentModule>('../../../../pages/workspace/accounting/netsuite/advanced/NetSuiteJournalEntryApprovalLevelSelectPage').default,
+    [SCREENS.WORKSPACE.ACCOUNTING.NETSUITE_APPROVAL_ACCOUNT_SELECT]: () =>
+        require<ReactComponentModule>('../../../../pages/workspace/accounting/netsuite/advanced/NetSuiteApprovalAccountSelectPage').default,
+    [SCREENS.WORKSPACE.ACCOUNTING.NETSUITE_CUSTOM_FORM_ID]: () => require<ReactComponentModule>('../../../../pages/workspace/accounting/netsuite/advanced/NetSuiteCustomFormIDPage').default,
+    [SCREENS.WORKSPACE.ACCOUNTING.SAGE_INTACCT_PREREQUISITES]: () => require<ReactComponentModule>('../../../../pages/workspace/accounting/intacct/SageIntacctPrerequisitesPage').default,
+    [SCREENS.WORKSPACE.ACCOUNTING.ENTER_SAGE_INTACCT_CREDENTIALS]: () =>
+        require<ReactComponentModule>('../../../../pages/workspace/accounting/intacct/EnterSageIntacctCredentialsPage').default,
+    [SCREENS.WORKSPACE.ACCOUNTING.EXISTING_SAGE_INTACCT_CONNECTIONS]: () => require<ReactComponentModule>('../../../../pages/workspace/accounting/intacct/ExistingConnectionsPage').default,
+    [SCREENS.WORKSPACE.ACCOUNTING.SAGE_INTACCT_ENTITY]: () => require<ReactComponentModule>('../../../../pages/workspace/accounting/intacct/SageIntacctEntityPage').default,
+    [SCREENS.WORKSPACE.ACCOUNTING.SAGE_INTACCT_EXPORT]: () => require<ReactComponentModule>('../../../../pages/workspace/accounting/intacct/export/SageIntacctExportPage').default,
+    [SCREENS.WORKSPACE.ACCOUNTING.SAGE_INTACCT_PREFERRED_EXPORTER]: () =>
+        require<ReactComponentModule>('../../../../pages/workspace/accounting/intacct/export/SageIntacctPreferredExporterPage').default,
+    [SCREENS.WORKSPACE.ACCOUNTING.SAGE_INTACCT_EXPORT_DATE]: () => require<ReactComponentModule>('../../../../pages/workspace/accounting/intacct/export/SageIntacctDatePage').default,
+    [SCREENS.WORKSPACE.ACCOUNTING.SAGE_INTACCT_REIMBURSABLE_EXPENSES]: () =>
+        require<ReactComponentModule>('../../../../pages/workspace/accounting/intacct/export/SageIntacctReimbursableExpensesPage').default,
+    [SCREENS.WORKSPACE.ACCOUNTING.SAGE_INTACCT_NON_REIMBURSABLE_EXPENSES]: () =>
+        require<ReactComponentModule>('../../../../pages/workspace/accounting/intacct/export/SageIntacctNonReimbursableExpensesPage').default,
+    [SCREENS.WORKSPACE.ACCOUNTING.SAGE_INTACCT_DEFAULT_VENDOR]: () =>
+        require<ReactComponentModule>('../../../../pages/workspace/accounting/intacct/export/SageIntacctDefaultVendorPage').default,
+    [SCREENS.WORKSPACE.ACCOUNTING.SAGE_INTACCT_NON_REIMBURSABLE_CREDIT_CARD_ACCOUNT]: () =>
+        require<ReactComponentModule>('../../../../pages/workspace/accounting/intacct/export/SageIntacctNonReimbursableCreditCardAccountPage').default,
+    [SCREENS.WORKSPACE.ACCOUNTING.SAGE_INTACCT_ADVANCED]: () => require<ReactComponentModule>('../../../../pages/workspace/accounting/intacct/advanced/SageIntacctAdvancedPage').default,
+    [SCREENS.WORKSPACE.ACCOUNTING.SAGE_INTACCT_PAYMENT_ACCOUNT]: () =>
+        require<ReactComponentModule>('../../../../pages/workspace/accounting/intacct/advanced/SageIntacctPaymentAccountPage').default,
+    [SCREENS.WORKSPACE.ACCOUNTING.CARD_RECONCILIATION]: () => require<ReactComponentModule>('../../../../pages/workspace/accounting/reconciliation/CardReconciliationPage').default,
+    [SCREENS.WORKSPACE.ACCOUNTING.RECONCILIATION_ACCOUNT_SETTINGS]: () =>
+        require<ReactComponentModule>('../../../../pages/workspace/accounting/reconciliation/ReconciliationAccountSettingsPage').default,
+    [SCREENS.WORKSPACE.WORKFLOWS_AUTO_REPORTING_FREQUENCY]: () => require<ReactComponentModule>('../../../../pages/workspace/workflows/WorkspaceAutoReportingFrequencyPage').default,
+    [SCREENS.WORKSPACE.WORKFLOWS_AUTO_REPORTING_MONTHLY_OFFSET]: () => require<ReactComponentModule>('../../../../pages/workspace/workflows/WorkspaceAutoReportingMonthlyOffsetPage').default,
+    [SCREENS.WORKSPACE.TAX_EDIT]: () => require<ReactComponentModule>('../../../../pages/workspace/taxes/WorkspaceEditTaxPage').default,
+    [SCREENS.WORKSPACE.TAX_NAME]: () => require<ReactComponentModule>('../../../../pages/workspace/taxes/NamePage').default,
+    [SCREENS.WORKSPACE.TAX_VALUE]: () => require<ReactComponentModule>('../../../../pages/workspace/taxes/ValuePage').default,
+    [SCREENS.WORKSPACE.TAX_CREATE]: () => require<ReactComponentModule>('../../../../pages/workspace/taxes/WorkspaceCreateTaxPage').default,
+    [SCREENS.WORKSPACE.TAX_CODE]: () => require<ReactComponentModule>('../../../../pages/workspace/taxes/WorkspaceTaxCodePage').default,
+    [SCREENS.WORKSPACE.INVOICES_COMPANY_NAME]: () => require<ReactComponentModule>('../../../../pages/workspace/invoices/WorkspaceInvoicingDetailsName').default,
+    [SCREENS.WORKSPACE.INVOICES_COMPANY_WEBSITE]: () => require<ReactComponentModule>('../../../../pages/workspace/invoices/WorkspaceInvoicingDetailsWebsite').default,
+    [SCREENS.WORKSPACE.COMPANY_CARDS_SELECT_FEED]: () => require<ReactComponentModule>('../../../../pages/workspace/companyCards/WorkspaceCompanyCardFeedSelectorPage').default,
+    [SCREENS.WORKSPACE.EXPENSIFY_CARD_ISSUE_NEW]: () => require<ReactComponentModule>('../../../../pages/workspace/expensifyCard/issueNew/IssueNewCardPage').default,
+    [SCREENS.WORKSPACE.EXPENSIFY_CARD_SETTINGS]: () => require<ReactComponentModule>('../../../../pages/workspace/expensifyCard/WorkspaceCardSettingsPage').default,
+    [SCREENS.WORKSPACE.EXPENSIFY_CARD_SETTINGS_ACCOUNT]: () => require<ReactComponentModule>('../../../../pages/workspace/expensifyCard/WorkspaceSettlementAccountPage').default,
+    [SCREENS.WORKSPACE.EXPENSIFY_CARD_SETTINGS_FREQUENCY]: () => require<ReactComponentModule>('../../../../pages/workspace/expensifyCard/WorkspaceSettlementFrequencyPage').default,
+    [SCREENS.WORKSPACE.EXPENSIFY_CARD_BANK_ACCOUNT]: () => require<ReactComponentModule>('../../../../pages/workspace/expensifyCard/WorkspaceExpensifyCardBankAccounts').default,
+    [SCREENS.WORKSPACE.EXPENSIFY_CARD_DETAILS]: () => require<ReactComponentModule>('../../../../pages/workspace/expensifyCard/WorkspaceExpensifyCardDetailsPage').default,
+    [SCREENS.WORKSPACE.EXPENSIFY_CARD_NAME]: () => require<ReactComponentModule>('../../../../pages/workspace/expensifyCard/WorkspaceEditCardNamePage').default,
+    [SCREENS.WORKSPACE.EXPENSIFY_CARD_LIMIT]: () => require<ReactComponentModule>('../../../../pages/workspace/expensifyCard/WorkspaceEditCardLimitPage').default,
+    [SCREENS.WORKSPACE.EXPENSIFY_CARD_LIMIT_TYPE]: () => require<ReactComponentModule>('../../../../pages/workspace/expensifyCard/WorkspaceEditCardLimitTypePage').default,
+    [SCREENS.SETTINGS.SAVE_THE_WORLD]: () => require<ReactComponentModule>('../../../../pages/TeachersUnite/SaveTheWorldPage').default,
+    [SCREENS.SETTINGS.SUBSCRIPTION.CHANGE_PAYMENT_CURRENCY]: () => require<ReactComponentModule>('../../../../pages/settings/PaymentCard/ChangeCurrency').default,
+    [SCREENS.SETTINGS.SUBSCRIPTION.CHANGE_BILLING_CURRENCY]: () => require<ReactComponentModule>('../../../../pages/settings/Subscription/PaymentCard/ChangeBillingCurrency').default,
+    [SCREENS.SETTINGS.SUBSCRIPTION.ADD_PAYMENT_CARD]: () => require<ReactComponentModule>('../../../../pages/settings/Subscription/PaymentCard').default,
+    [SCREENS.SETTINGS.ADD_PAYMENT_CARD_CHANGE_CURRENCY]: () => require<ReactComponentModule>('../../../../pages/settings/PaymentCard/ChangeCurrency').default,
+    [SCREENS.WORKSPACE.REPORT_FIELDS_CREATE]: () => require<ReactComponentModule>('../../../../pages/workspace/reportFields/CreateReportFieldsPage').default,
+    [SCREENS.WORKSPACE.REPORT_FIELDS_SETTINGS]: () => require<ReactComponentModule>('../../../../pages/workspace/reportFields/ReportFieldsSettingsPage').default,
+    [SCREENS.WORKSPACE.REPORT_FIELDS_LIST_VALUES]: () => require<ReactComponentModule>('../../../../pages/workspace/reportFields/ReportFieldsListValuesPage').default,
+    [SCREENS.WORKSPACE.REPORT_FIELDS_ADD_VALUE]: () => require<ReactComponentModule>('../../../../pages/workspace/reportFields/ReportFieldsAddListValuePage').default,
+    [SCREENS.WORKSPACE.REPORT_FIELDS_VALUE_SETTINGS]: () => require<ReactComponentModule>('../../../../pages/workspace/reportFields/ReportFieldsValueSettingsPage').default,
+    [SCREENS.WORKSPACE.REPORT_FIELDS_EDIT_INITIAL_VALUE]: () => require<ReactComponentModule>('../../../../pages/workspace/reportFields/ReportFieldsInitialValuePage').default,
+    [SCREENS.WORKSPACE.REPORT_FIELDS_EDIT_VALUE]: () => require<ReactComponentModule>('../../../../pages/workspace/reportFields/ReportFieldsEditValuePage').default,
+    [SCREENS.WORKSPACE.ACCOUNTING.SAGE_INTACCT_IMPORT]: () => require<ReactComponentModule>('../../../../pages/workspace/accounting/intacct/import/SageIntacctImportPage').default,
+    [SCREENS.WORKSPACE.ACCOUNTING.SAGE_INTACCT_TOGGLE_MAPPING]: () =>
+        require<ReactComponentModule>('../../../../pages/workspace/accounting/intacct/import/SageIntacctToggleMappingsPage').default,
+    [SCREENS.WORKSPACE.ACCOUNTING.SAGE_INTACCT_MAPPING_TYPE]: () =>
+        require<ReactComponentModule>('../../../../pages/workspace/accounting/intacct/import/SageIntacctMappingsTypePage').default,
+    [SCREENS.WORKSPACE.ACCOUNTING.SAGE_INTACCT_USER_DIMENSIONS]: () =>
+        require<ReactComponentModule>('../../../../pages/workspace/accounting/intacct/import/SageIntacctUserDimensionsPage').default,
+    [SCREENS.WORKSPACE.ACCOUNTING.SAGE_INTACCT_ADD_USER_DIMENSION]: () =>
+        require<ReactComponentModule>('../../../../pages/workspace/accounting/intacct/import/SageIntacctAddUserDimensionPage').default,
+    [SCREENS.WORKSPACE.ACCOUNTING.SAGE_INTACCT_EDIT_USER_DIMENSION]: () =>
+        require<ReactComponentModule>('../../../../pages/workspace/accounting/intacct/import/SageIntacctEditUserDimensionsPage').default,
+    [SCREENS.WORKSPACE.RULES_RECEIPT_REQUIRED_AMOUNT]: () => require<ReactComponentModule>('../../../../pages/workspace/rules/RulesReceiptRequiredAmountPage').default,
+    [SCREENS.WORKSPACE.RULES_MAX_EXPENSE_AMOUNT]: () => require<ReactComponentModule>('../../../../pages/workspace/rules/RulesMaxExpenseAmountPage').default,
+    [SCREENS.WORKSPACE.RULES_MAX_EXPENSE_AGE]: () => require<ReactComponentModule>('../../../../pages/workspace/rules/RulesMaxExpenseAgePage').default,
+    [SCREENS.WORKSPACE.RULES_BILLABLE_DEFAULT]: () => require<ReactComponentModule>('../../../../pages/workspace/rules/RulesBillableDefaultPage').default,
 });
 
 const EnablePaymentsStackNavigator = createModalStackNavigator<EnablePaymentsNavigatorParamList>({
-    [SCREENS.ENABLE_PAYMENTS_ROOT]: () => require('../../../../pages/EnablePayments/EnablePaymentsPage').default as React.ComponentType,
+    [SCREENS.ENABLE_PAYMENTS_ROOT]: () => require<ReactComponentModule>('../../../../pages/EnablePayments/EnablePaymentsPage').default,
 });
 
 const AddPersonalBankAccountModalStackNavigator = createModalStackNavigator<AddPersonalBankAccountNavigatorParamList>({
-    [SCREENS.ADD_PERSONAL_BANK_ACCOUNT_ROOT]: () => require('../../../../pages/AddPersonalBankAccountPage').default as React.ComponentType,
+    [SCREENS.ADD_PERSONAL_BANK_ACCOUNT_ROOT]: () => require<ReactComponentModule>('../../../../pages/AddPersonalBankAccountPage').default,
 });
 
 const ReimbursementAccountModalStackNavigator = createModalStackNavigator<ReimbursementAccountNavigatorParamList>({
-    [SCREENS.REIMBURSEMENT_ACCOUNT_ROOT]: () => require('../../../../pages/ReimbursementAccount/ReimbursementAccountPage').default as React.ComponentType,
+    [SCREENS.REIMBURSEMENT_ACCOUNT_ROOT]: () => require<ReactComponentModule>('../../../../pages/ReimbursementAccount/ReimbursementAccountPage').default,
 });
 
 const WalletStatementStackNavigator = createModalStackNavigator<WalletStatementNavigatorParamList>({
-    [SCREENS.WALLET_STATEMENT_ROOT]: () => require('../../../../pages/wallet/WalletStatementPage').default as React.ComponentType,
+    [SCREENS.WALLET_STATEMENT_ROOT]: () => require<ReactComponentModule>('../../../../pages/wallet/WalletStatementPage').default,
 });
 
 const FlagCommentStackNavigator = createModalStackNavigator<FlagCommentNavigatorParamList>({
-    [SCREENS.FLAG_COMMENT_ROOT]: () => require('../../../../pages/FlagCommentPage').default as React.ComponentType,
+    [SCREENS.FLAG_COMMENT_ROOT]: () => require<ReactComponentModule>('../../../../pages/FlagCommentPage').default,
 });
 
 const EditRequestStackNavigator = createModalStackNavigator<EditRequestNavigatorParamList>({
-    [SCREENS.EDIT_REQUEST.REPORT_FIELD]: () => require('../../../../pages/EditReportFieldPage').default as React.ComponentType,
+    [SCREENS.EDIT_REQUEST.REPORT_FIELD]: () => require<ReactComponentModule>('../../../../pages/EditReportFieldPage').default,
 });
 
 const PrivateNotesModalStackNavigator = createModalStackNavigator<PrivateNotesNavigatorParamList>({
-    [SCREENS.PRIVATE_NOTES.LIST]: () => require('../../../../pages/PrivateNotes/PrivateNotesListPage').default as React.ComponentType,
-    [SCREENS.PRIVATE_NOTES.EDIT]: () => require('../../../../pages/PrivateNotes/PrivateNotesEditPage').default as React.ComponentType,
+    [SCREENS.PRIVATE_NOTES.LIST]: () => require<ReactComponentModule>('../../../../pages/PrivateNotes/PrivateNotesListPage').default,
+    [SCREENS.PRIVATE_NOTES.EDIT]: () => require<ReactComponentModule>('../../../../pages/PrivateNotes/PrivateNotesEditPage').default,
 });
 
 const SignInModalStackNavigator = createModalStackNavigator<SignInNavigatorParamList>({
-    [SCREENS.SIGN_IN_ROOT]: () => require('../../../../pages/signin/SignInModal').default as React.ComponentType,
+    [SCREENS.SIGN_IN_ROOT]: () => require<ReactComponentModule>('../../../../pages/signin/SignInModal').default,
 });
 const ReferralModalStackNavigator = createModalStackNavigator<ReferralDetailsNavigatorParamList>({
-    [SCREENS.REFERRAL_DETAILS]: () => require('../../../../pages/ReferralDetailsPage').default as React.ComponentType,
+    [SCREENS.REFERRAL_DETAILS]: () => require<ReactComponentModule>('../../../../pages/ReferralDetailsPage').default,
 });
 
 const ProcessMoneyRequestHoldStackNavigator = createModalStackNavigator({
-    [SCREENS.PROCESS_MONEY_REQUEST_HOLD_ROOT]: () => require('../../../../pages/ProcessMoneyRequestHoldPage').default as React.ComponentType,
+    [SCREENS.PROCESS_MONEY_REQUEST_HOLD_ROOT]: () => require<ReactComponentModule>('../../../../pages/ProcessMoneyRequestHoldPage').default,
+});
+
+const TransactionDuplicateStackNavigator = createModalStackNavigator<TransactionDuplicateNavigatorParamList>({
+    [SCREENS.TRANSACTION_DUPLICATE.REVIEW]: () => require<ReactComponentModule>('../../../../pages/TransactionDuplicate/Review').default,
+    [SCREENS.TRANSACTION_DUPLICATE.MERCHANT]: () => require<ReactComponentModule>('../../../../pages/TransactionDuplicate/ReviewMerchant').default,
+    [SCREENS.TRANSACTION_DUPLICATE.CATEGORY]: () => require<ReactComponentModule>('../../../../pages/TransactionDuplicate/ReviewCategory').default,
+    [SCREENS.TRANSACTION_DUPLICATE.TAG]: () => require<ReactComponentModule>('../../../../pages/TransactionDuplicate/ReviewTag').default,
+    [SCREENS.TRANSACTION_DUPLICATE.DESCRIPTION]: () => require<ReactComponentModule>('../../../../pages/TransactionDuplicate/ReviewDescription').default,
+    [SCREENS.TRANSACTION_DUPLICATE.TAX_CODE]: () => require<ReactComponentModule>('../../../../pages/TransactionDuplicate/ReviewTaxCode').default,
+    [SCREENS.TRANSACTION_DUPLICATE.BILLABLE]: () => require<ReactComponentModule>('../../../../pages/TransactionDuplicate/ReviewBillable').default,
+    [SCREENS.TRANSACTION_DUPLICATE.REIMBURSABLE]: () => require<ReactComponentModule>('../../../../pages/TransactionDuplicate/ReviewReimbursable').default,
+    [SCREENS.TRANSACTION_DUPLICATE.CONFIRMATION]: () => require<ReactComponentModule>('../../../../pages/TransactionDuplicate/Confirmation').default,
 });
 
 const SearchReportModalStackNavigator = createModalStackNavigator<SearchReportParamList>({
-    [SCREENS.SEARCH.REPORT_RHP]: () => require('../../../../pages/home/ReportScreen').default as React.ComponentType,
+    [SCREENS.SEARCH.REPORT_RHP]: () => require<ReactComponentModule>('../../../../pages/home/ReportScreen').default,
+    [SCREENS.SEARCH.TRANSACTION_HOLD_REASON_RHP]: () => require<ReactComponentModule>('../../../../pages/Search/SearchHoldReasonPage').default,
+});
+
+const SearchAdvancedFiltersModalStackNavigator = createModalStackNavigator<SearchAdvancedFiltersParamList>({
+    [SCREENS.SEARCH.ADVANCED_FILTERS_RHP]: () => require<ReactComponentModule>('../../../../pages/Search/SearchAdvancedFiltersPage').default,
+    [SCREENS.SEARCH.ADVANCED_FILTERS_DATE_RHP]: () => require<ReactComponentModule>('../../../../pages/Search/SearchAdvancedFiltersPage/SearchFiltersDatePage').default,
+    [SCREENS.SEARCH.ADVANCED_FILTERS_CURRENCY_RHP]: () => require<ReactComponentModule>('../../../../pages/Search/SearchAdvancedFiltersPage/SearchFiltersCurrencyPage').default,
+    [SCREENS.SEARCH.ADVANCED_FILTERS_DESCRIPTION_RHP]: () => require<ReactComponentModule>('../../../../pages/Search/SearchAdvancedFiltersPage/SearchFiltersDescriptionPage').default,
+    [SCREENS.SEARCH.ADVANCED_FILTERS_MERCHANT_RHP]: () => require<ReactComponentModule>('../../../../pages/Search/SearchAdvancedFiltersPage/SearchFiltersMerchantPage').default,
+    [SCREENS.SEARCH.ADVANCED_FILTERS_REPORT_ID_RHP]: () => require<ReactComponentModule>('../../../../pages/Search/SearchAdvancedFiltersPage/SearchFiltersReportIDPage').default,
+    [SCREENS.SEARCH.ADVANCED_FILTERS_AMOUNT_RHP]: () => require<ReactComponentModule>('../../../../pages/Search/SearchAdvancedFiltersPage/SearchFiltersAmountPage').default,
+    [SCREENS.SEARCH.ADVANCED_FILTERS_CATEGORY_RHP]: () => require<ReactComponentModule>('../../../../pages/Search/SearchAdvancedFiltersPage/SearchFiltersCategoryPage').default,
+    [SCREENS.SEARCH.ADVANCED_FILTERS_KEYWORD_RHP]: () => require<ReactComponentModule>('../../../../pages/Search/SearchAdvancedFiltersPage/SearchFiltersKeywordPage').default,
+    [SCREENS.SEARCH.ADVANCED_FILTERS_CARD_RHP]: () => require<ReactComponentModule>('../../../../pages/Search/SearchAdvancedFiltersPage/SearchFiltersCardPage').default,
+    [SCREENS.SEARCH.ADVANCED_FILTERS_TAX_RATE_RHP]: () => require<ReactComponentModule>('../../../../pages/Search/SearchAdvancedFiltersPage/SearchFiltersTaxRatePage').default,
+    [SCREENS.SEARCH.ADVANCED_FILTERS_EXPENSE_TYPE_RHP]: () => require<ReactComponentModule>('../../../../pages/Search/SearchAdvancedFiltersPage/SearchFiltersExpenseTypePage').default,
+    [SCREENS.SEARCH.ADVANCED_FILTERS_TAG_RHP]: () => require<ReactComponentModule>('../../../../pages/Search/SearchAdvancedFiltersPage/SearchFiltersTagPage').default,
+    [SCREENS.SEARCH.ADVANCED_FILTERS_FROM_RHP]: () => require<ReactComponentModule>('@pages/Search/SearchAdvancedFiltersPage/SearchFiltersFromPage').default,
+    [SCREENS.SEARCH.ADVANCED_FILTERS_TO_RHP]: () => require<ReactComponentModule>('@pages/Search/SearchAdvancedFiltersPage/SearchFiltersToPage').default,
+});
+
+const RestrictedActionModalStackNavigator = createModalStackNavigator<SearchReportParamList>({
+    [SCREENS.RESTRICTED_ACTION_ROOT]: () => require<ReactComponentModule>('../../../../pages/RestrictedAction/Workspace/WorkspaceRestrictedActionPage').default,
 });
 
 export {
     AddPersonalBankAccountModalStackNavigator,
-    DetailsModalStackNavigator,
     EditRequestStackNavigator,
     EnablePaymentsStackNavigator,
     FlagCommentStackNavigator,
@@ -371,24 +549,25 @@ export {
     NewTaskModalStackNavigator,
     NewTeachersUniteNavigator,
     PrivateNotesModalStackNavigator,
+    ProcessMoneyRequestHoldStackNavigator,
     ProfileModalStackNavigator,
     ReferralModalStackNavigator,
     TravelModalStackNavigator,
-    WorkspaceSwitcherModalStackNavigator,
     ReimbursementAccountModalStackNavigator,
+    ReportDescriptionModalStackNavigator,
     ReportDetailsModalStackNavigator,
     ReportParticipantsModalStackNavigator,
     ReportSettingsModalStackNavigator,
-    ReportDescriptionModalStackNavigator,
     RoomInviteModalStackNavigator,
     RoomMembersModalStackNavigator,
-    ChatFinderModalStackNavigator,
     SettingsModalStackNavigator,
     SignInModalStackNavigator,
+    CategoriesModalStackNavigator,
     SplitDetailsModalStackNavigator,
     TaskModalStackNavigator,
     WalletStatementStackNavigator,
-    ProcessMoneyRequestHoldStackNavigator,
-    WorkspaceSettingsModalStackNavigator,
+    TransactionDuplicateStackNavigator,
     SearchReportModalStackNavigator,
+    RestrictedActionModalStackNavigator,
+    SearchAdvancedFiltersModalStackNavigator,
 };
diff --git a/src/libs/Navigation/AppNavigator/ModalStackNavigators/useModalScreenOptions.ts b/src/libs/Navigation/AppNavigator/ModalStackNavigators/useModalScreenOptions.ts
index 3c5ef1833835..460b0c732797 100644
--- a/src/libs/Navigation/AppNavigator/ModalStackNavigators/useModalScreenOptions.ts
+++ b/src/libs/Navigation/AppNavigator/ModalStackNavigators/useModalScreenOptions.ts
@@ -1,19 +1,32 @@
-import type {StackNavigationOptions} from '@react-navigation/stack';
+import type {StackCardInterpolationProps, StackNavigationOptions} from '@react-navigation/stack';
 import {CardStyleInterpolators} from '@react-navigation/stack';
 import {useMemo} from 'react';
+import useStyleUtils from '@hooks/useStyleUtils';
 import useThemeStyles from '@hooks/useThemeStyles';
+import useWindowDimensions from '@hooks/useWindowDimensions';
+import {isSafari} from '@libs/Browser';
+import createModalCardStyleInterpolator from '@navigation/AppNavigator/createModalCardStyleInterpolator';
 import type {ThemeStyles} from '@src/styles';
 
 function useModalScreenOptions(getScreenOptions?: (styles: ThemeStyles) => StackNavigationOptions) {
     const styles = useThemeStyles();
+    const styleUtils = useStyleUtils();
+    const {isSmallScreenWidth} = useWindowDimensions();
+
+    let cardStyleInterpolator = CardStyleInterpolators.forHorizontalIOS;
+
+    if (isSafari()) {
+        const customInterpolator = createModalCardStyleInterpolator(styleUtils);
+        cardStyleInterpolator = (props: StackCardInterpolationProps) => customInterpolator(isSmallScreenWidth, false, false, props);
+    }
 
     const defaultSubRouteOptions = useMemo(
         (): StackNavigationOptions => ({
             cardStyle: styles.navigationScreenCardStyle,
             headerShown: false,
-            cardStyleInterpolator: CardStyleInterpolators.forHorizontalIOS,
+            cardStyleInterpolator,
         }),
-        [styles],
+        [styles, cardStyleInterpolator],
     );
 
     return getScreenOptions?.(styles) ?? defaultSubRouteOptions;
diff --git a/src/libs/Navigation/AppNavigator/Navigators/ActiveCentralPaneRouteContext.ts b/src/libs/Navigation/AppNavigator/Navigators/ActiveCentralPaneRouteContext.ts
new file mode 100644
index 000000000000..6f37126584a2
--- /dev/null
+++ b/src/libs/Navigation/AppNavigator/Navigators/ActiveCentralPaneRouteContext.ts
@@ -0,0 +1,6 @@
+import React from 'react';
+import type {AuthScreensParamList, NavigationPartialRoute} from '@libs/Navigation/types';
+
+const ActiveCentralPaneRouteContext = React.createContext<NavigationPartialRoute<keyof AuthScreensParamList> | undefined>(undefined);
+
+export default ActiveCentralPaneRouteContext;
diff --git a/src/libs/Navigation/AppNavigator/Navigators/ActiveRouteContext.ts b/src/libs/Navigation/AppNavigator/Navigators/ActiveRouteContext.ts
deleted file mode 100644
index 6d0de3211e7c..000000000000
--- a/src/libs/Navigation/AppNavigator/Navigators/ActiveRouteContext.ts
+++ /dev/null
@@ -1,6 +0,0 @@
-import React from 'react';
-import type {CentralPaneNavigatorParamList, NavigationPartialRoute} from '@libs/Navigation/types';
-
-const ActiveRouteContext = React.createContext<NavigationPartialRoute<keyof CentralPaneNavigatorParamList> | undefined>(undefined);
-
-export default ActiveRouteContext;
diff --git a/src/libs/Navigation/AppNavigator/Navigators/BottomTabNavigator.tsx b/src/libs/Navigation/AppNavigator/Navigators/BottomTabNavigator.tsx
index 6680ea302441..30e8d4c668c6 100644
--- a/src/libs/Navigation/AppNavigator/Navigators/BottomTabNavigator.tsx
+++ b/src/libs/Navigation/AppNavigator/Navigators/BottomTabNavigator.tsx
@@ -3,14 +3,14 @@ import type {StackNavigationOptions} from '@react-navigation/stack';
 import React from 'react';
 import createCustomBottomTabNavigator from '@libs/Navigation/AppNavigator/createCustomBottomTabNavigator';
 import getTopmostCentralPaneRoute from '@libs/Navigation/getTopmostCentralPaneRoute';
-import type {BottomTabNavigatorParamList} from '@libs/Navigation/types';
+import type {BottomTabNavigatorParamList, CentralPaneName, NavigationPartialRoute, RootStackParamList} from '@libs/Navigation/types';
 import SidebarScreen from '@pages/home/sidebar/SidebarScreen';
 import SearchPageBottomTab from '@pages/Search/SearchPageBottomTab';
 import SCREENS from '@src/SCREENS';
-import ActiveRouteContext from './ActiveRouteContext';
-
-const loadInitialSettingsPage = () => require('../../../../pages/settings/InitialSettingsPage').default as React.ComponentType;
+import type ReactComponentModule from '@src/types/utils/ReactComponentModule';
+import ActiveCentralPaneRouteContext from './ActiveCentralPaneRouteContext';
 
+const loadInitialSettingsPage = () => require<ReactComponentModule>('../../../../pages/settings/InitialSettingsPage').default;
 const Tab = createCustomBottomTabNavigator<BottomTabNavigatorParamList>();
 
 const screenOptions: StackNavigationOptions = {
@@ -19,10 +19,9 @@ const screenOptions: StackNavigationOptions = {
 };
 
 function BottomTabNavigator() {
-    const activeRoute = useNavigationState(getTopmostCentralPaneRoute);
-
+    const activeRoute = useNavigationState<RootStackParamList, NavigationPartialRoute<CentralPaneName> | undefined>(getTopmostCentralPaneRoute);
     return (
-        <ActiveRouteContext.Provider value={activeRoute}>
+        <ActiveCentralPaneRouteContext.Provider value={activeRoute}>
             <Tab.Navigator screenOptions={screenOptions}>
                 <Tab.Screen
                     name={SCREENS.HOME}
@@ -37,7 +36,7 @@ function BottomTabNavigator() {
                     getComponent={loadInitialSettingsPage}
                 />
             </Tab.Navigator>
-        </ActiveRouteContext.Provider>
+        </ActiveCentralPaneRouteContext.Provider>
     );
 }
 
diff --git a/src/libs/Navigation/AppNavigator/Navigators/CentralPaneNavigator/BaseCentralPaneNavigator.tsx b/src/libs/Navigation/AppNavigator/Navigators/CentralPaneNavigator/BaseCentralPaneNavigator.tsx
deleted file mode 100644
index 884cfbeb2494..000000000000
--- a/src/libs/Navigation/AppNavigator/Navigators/CentralPaneNavigator/BaseCentralPaneNavigator.tsx
+++ /dev/null
@@ -1,62 +0,0 @@
-import {createStackNavigator} from '@react-navigation/stack';
-import React from 'react';
-import useThemeStyles from '@hooks/useThemeStyles';
-import ReportScreenWrapper from '@libs/Navigation/AppNavigator/ReportScreenWrapper';
-import getCurrentUrl from '@libs/Navigation/currentUrl';
-import type {CentralPaneNavigatorParamList} from '@navigation/types';
-import SearchPage from '@pages/Search/SearchPage';
-import SCREENS from '@src/SCREENS';
-
-const Stack = createStackNavigator<CentralPaneNavigatorParamList>();
-
-const url = getCurrentUrl();
-const openOnAdminRoom = url ? new URL(url).searchParams.get('openOnAdminRoom') : undefined;
-
-type Screens = Partial<Record<keyof CentralPaneNavigatorParamList, () => React.ComponentType>>;
-
-const settingsScreens = {
-    [SCREENS.SETTINGS.WORKSPACES]: () => require('../../../../../pages/workspace/WorkspacesListPage').default as React.ComponentType,
-    [SCREENS.SETTINGS.PREFERENCES.ROOT]: () => require('../../../../../pages/settings/Preferences/PreferencesPage').default as React.ComponentType,
-    [SCREENS.SETTINGS.SECURITY]: () => require('../../../../../pages/settings/Security/SecuritySettingsPage').default as React.ComponentType,
-    [SCREENS.SETTINGS.PROFILE.ROOT]: () => require('../../../../../pages/settings/Profile/ProfilePage').default as React.ComponentType,
-    [SCREENS.SETTINGS.WALLET.ROOT]: () => require('../../../../../pages/settings/Wallet/WalletPage').default as React.ComponentType,
-    [SCREENS.SETTINGS.ABOUT]: () => require('../../../../../pages/settings/AboutPage/AboutPage').default as React.ComponentType,
-    [SCREENS.SETTINGS.TROUBLESHOOT]: () => require('../../../../../pages/settings/Troubleshoot/TroubleshootPage').default as React.ComponentType,
-    [SCREENS.SETTINGS.SAVE_THE_WORLD]: () => require('../../../../../pages/TeachersUnite/SaveTheWorldPage').default as React.ComponentType,
-} satisfies Screens;
-
-function BaseCentralPaneNavigator() {
-    const styles = useThemeStyles();
-    const options = {
-        headerShown: false,
-        title: 'New Expensify',
-
-        // Prevent unnecessary scrolling
-        cardStyle: styles.cardStyleNavigator,
-    };
-    return (
-        <Stack.Navigator screenOptions={options}>
-            <Stack.Screen
-                name={SCREENS.REPORT}
-                // We do it this way to avoid adding the url params to url
-                initialParams={{openOnAdminRoom: openOnAdminRoom === 'true' || undefined}}
-                component={ReportScreenWrapper}
-            />
-            <Stack.Screen
-                name={SCREENS.SEARCH.CENTRAL_PANE}
-                // We do it this way to avoid adding the url params to url
-                component={SearchPage}
-            />
-
-            {Object.entries(settingsScreens).map(([screenName, componentGetter]) => (
-                <Stack.Screen
-                    key={screenName}
-                    name={screenName as keyof Screens}
-                    getComponent={componentGetter}
-                />
-            ))}
-        </Stack.Navigator>
-    );
-}
-
-export default BaseCentralPaneNavigator;
diff --git a/src/libs/Navigation/AppNavigator/Navigators/CentralPaneNavigator/index.native.tsx b/src/libs/Navigation/AppNavigator/Navigators/CentralPaneNavigator/index.native.tsx
deleted file mode 100644
index 45ab2f070717..000000000000
--- a/src/libs/Navigation/AppNavigator/Navigators/CentralPaneNavigator/index.native.tsx
+++ /dev/null
@@ -1,13 +0,0 @@
-import React from 'react';
-import FreezeWrapper from '@libs/Navigation/FreezeWrapper';
-import BaseCentralPaneNavigator from './BaseCentralPaneNavigator';
-
-function CentralPaneNavigator() {
-    return (
-        <FreezeWrapper>
-            <BaseCentralPaneNavigator />
-        </FreezeWrapper>
-    );
-}
-
-export default CentralPaneNavigator;
diff --git a/src/libs/Navigation/AppNavigator/Navigators/CentralPaneNavigator/index.tsx b/src/libs/Navigation/AppNavigator/Navigators/CentralPaneNavigator/index.tsx
deleted file mode 100644
index 711dd468c77d..000000000000
--- a/src/libs/Navigation/AppNavigator/Navigators/CentralPaneNavigator/index.tsx
+++ /dev/null
@@ -1,10 +0,0 @@
-import React from 'react';
-import BaseCentralPaneNavigator from './BaseCentralPaneNavigator';
-
-// We don't need to use freeze wraper on web because we don't render all report routes anyway.
-// You can see this optimalization in the customStackNavigator.
-function CentralPaneNavigator() {
-    return <BaseCentralPaneNavigator />;
-}
-
-export default CentralPaneNavigator;
diff --git a/src/libs/Navigation/AppNavigator/Navigators/ExplanationModalNavigator.tsx b/src/libs/Navigation/AppNavigator/Navigators/ExplanationModalNavigator.tsx
new file mode 100644
index 000000000000..f4136bb8783a
--- /dev/null
+++ b/src/libs/Navigation/AppNavigator/Navigators/ExplanationModalNavigator.tsx
@@ -0,0 +1,28 @@
+import {createStackNavigator} from '@react-navigation/stack';
+import React from 'react';
+import {View} from 'react-native';
+import NoDropZone from '@components/DragAndDrop/NoDropZone';
+import ExplanationModal from '@components/ExplanationModal';
+import type {ExplanationModalNavigatorParamList} from '@libs/Navigation/types';
+import SCREENS from '@src/SCREENS';
+
+const Stack = createStackNavigator<ExplanationModalNavigatorParamList>();
+
+function ExplanationModalNavigator() {
+    return (
+        <NoDropZone>
+            <View>
+                <Stack.Navigator screenOptions={{headerShown: false, animationEnabled: true}}>
+                    <Stack.Screen
+                        name={SCREENS.EXPLANATION_MODAL.ROOT}
+                        component={ExplanationModal}
+                    />
+                </Stack.Navigator>
+            </View>
+        </NoDropZone>
+    );
+}
+
+ExplanationModalNavigator.displayName = 'ExplanationModalNavigator';
+
+export default ExplanationModalNavigator;
diff --git a/src/libs/Navigation/AppNavigator/Navigators/FullScreenNavigator.tsx b/src/libs/Navigation/AppNavigator/Navigators/FullScreenNavigator.tsx
index 07b069462dd1..22a190913ed2 100644
--- a/src/libs/Navigation/AppNavigator/Navigators/FullScreenNavigator.tsx
+++ b/src/libs/Navigation/AppNavigator/Navigators/FullScreenNavigator.tsx
@@ -1,17 +1,42 @@
 import React from 'react';
 import {View} from 'react-native';
+import FocusTrapForScreens from '@components/FocusTrap/FocusTrapForScreen';
 import useStyleUtils from '@hooks/useStyleUtils';
 import useThemeStyles from '@hooks/useThemeStyles';
 import useWindowDimensions from '@hooks/useWindowDimensions';
 import createCustomFullScreenNavigator from '@libs/Navigation/AppNavigator/createCustomFullScreenNavigator';
 import getRootNavigatorScreenOptions from '@libs/Navigation/AppNavigator/getRootNavigatorScreenOptions';
-import * as ModalStackNavigators from '@libs/Navigation/AppNavigator/ModalStackNavigators';
+import type {FullScreenNavigatorParamList} from '@libs/Navigation/types';
 import SCREENS from '@src/SCREENS';
+import type ReactComponentModule from '@src/types/utils/ReactComponentModule';
 
-const loadWorkspaceInitialPage = () => require('../../../../pages/workspace/WorkspaceInitialPage').default as React.ComponentType;
+const loadWorkspaceInitialPage = () => require<ReactComponentModule>('../../../../pages/workspace/WorkspaceInitialPage').default;
 
 const RootStack = createCustomFullScreenNavigator();
 
+type Screens = Partial<Record<keyof FullScreenNavigatorParamList, () => React.ComponentType>>;
+
+const CENTRAL_PANE_WORKSPACE_SCREENS = {
+    [SCREENS.WORKSPACE.PROFILE]: () => require<ReactComponentModule>('../../../../pages/workspace/WorkspaceProfilePage').default,
+    [SCREENS.WORKSPACE.CARD]: () => require<ReactComponentModule>('../../../../pages/workspace/card/WorkspaceCardPage').default,
+    [SCREENS.WORKSPACE.WORKFLOWS]: () => require<ReactComponentModule>('../../../../pages/workspace/workflows/WorkspaceWorkflowsPage').default,
+    [SCREENS.WORKSPACE.REIMBURSE]: () => require<ReactComponentModule>('../../../../pages/workspace/reimburse/WorkspaceReimbursePage').default,
+    [SCREENS.WORKSPACE.BILLS]: () => require<ReactComponentModule>('../../../../pages/workspace/bills/WorkspaceBillsPage').default,
+    [SCREENS.WORKSPACE.INVOICES]: () => require<ReactComponentModule>('../../../../pages/workspace/invoices/WorkspaceInvoicesPage').default,
+    [SCREENS.WORKSPACE.TRAVEL]: () => require<ReactComponentModule>('../../../../pages/workspace/travel/WorkspaceTravelPage').default,
+    [SCREENS.WORKSPACE.MEMBERS]: () => require<ReactComponentModule>('../../../../pages/workspace/WorkspaceMembersPage').default,
+    [SCREENS.WORKSPACE.ACCOUNTING.ROOT]: () => require<ReactComponentModule>('../../../../pages/workspace/accounting/PolicyAccountingPage').default,
+    [SCREENS.WORKSPACE.CATEGORIES]: () => require<ReactComponentModule>('../../../../pages/workspace/categories/WorkspaceCategoriesPage').default,
+    [SCREENS.WORKSPACE.MORE_FEATURES]: () => require<ReactComponentModule>('../../../../pages/workspace/WorkspaceMoreFeaturesPage').default,
+    [SCREENS.WORKSPACE.TAGS]: () => require<ReactComponentModule>('../../../../pages/workspace/tags/WorkspaceTagsPage').default,
+    [SCREENS.WORKSPACE.TAXES]: () => require<ReactComponentModule>('../../../../pages/workspace/taxes/WorkspaceTaxesPage').default,
+    [SCREENS.WORKSPACE.REPORT_FIELDS]: () => require<ReactComponentModule>('../../../../pages/workspace/reportFields/WorkspaceReportFieldsPage').default,
+    [SCREENS.WORKSPACE.EXPENSIFY_CARD]: () => require<ReactComponentModule>('../../../../pages/workspace/expensifyCard/WorkspaceExpensifyCardPage').default,
+    [SCREENS.WORKSPACE.COMPANY_CARDS]: () => require<ReactComponentModule>('../../../../pages/workspace/companyCards/WorkspaceCompanyCardsPage').default,
+    [SCREENS.WORKSPACE.DISTANCE_RATES]: () => require<ReactComponentModule>('../../../../pages/workspace/distanceRates/PolicyDistanceRatesPage').default,
+    [SCREENS.WORKSPACE.RULES]: () => require<ReactComponentModule>('../../../../pages/workspace/rules/PolicyRulesPage').default,
+} satisfies Screens;
+
 function FullScreenNavigator() {
     const styles = useThemeStyles();
     const StyleUtils = useStyleUtils();
@@ -19,23 +44,28 @@ function FullScreenNavigator() {
     const screenOptions = getRootNavigatorScreenOptions(isSmallScreenWidth, styles, StyleUtils);
 
     return (
-        <View style={styles.rootNavigatorContainerStyles(isSmallScreenWidth)}>
-            <RootStack.Navigator>
-                <RootStack.Screen
-                    name={SCREENS.WORKSPACE.INITIAL}
-                    options={screenOptions.homeScreen}
-                    getComponent={loadWorkspaceInitialPage}
-                />
-                <RootStack.Screen
-                    name={SCREENS.WORKSPACES_CENTRAL_PANE}
-                    options={screenOptions.centralPaneNavigator}
-                    component={ModalStackNavigators.WorkspaceSettingsModalStackNavigator}
-                />
-            </RootStack.Navigator>
-        </View>
+        <FocusTrapForScreens>
+            <View style={styles.rootNavigatorContainerStyles(isSmallScreenWidth)}>
+                <RootStack.Navigator screenOptions={screenOptions.centralPaneNavigator}>
+                    <RootStack.Screen
+                        name={SCREENS.WORKSPACE.INITIAL}
+                        options={screenOptions.homeScreen}
+                        getComponent={loadWorkspaceInitialPage}
+                    />
+                    {Object.entries(CENTRAL_PANE_WORKSPACE_SCREENS).map(([screenName, componentGetter]) => (
+                        <RootStack.Screen
+                            key={screenName}
+                            name={screenName as keyof Screens}
+                            getComponent={componentGetter}
+                        />
+                    ))}
+                </RootStack.Navigator>
+            </View>
+        </FocusTrapForScreens>
     );
 }
 
 FullScreenNavigator.displayName = 'FullScreenNavigator';
 
+export {CENTRAL_PANE_WORKSPACE_SCREENS};
 export default FullScreenNavigator;
diff --git a/src/libs/Navigation/AppNavigator/Navigators/LeftModalNavigator.tsx b/src/libs/Navigation/AppNavigator/Navigators/LeftModalNavigator.tsx
index 159430a66a43..2aebe9f111f5 100644
--- a/src/libs/Navigation/AppNavigator/Navigators/LeftModalNavigator.tsx
+++ b/src/libs/Navigation/AppNavigator/Navigators/LeftModalNavigator.tsx
@@ -6,20 +6,23 @@ import NoDropZone from '@components/DragAndDrop/NoDropZone';
 import useThemeStyles from '@hooks/useThemeStyles';
 import useWindowDimensions from '@hooks/useWindowDimensions';
 import ModalNavigatorScreenOptions from '@libs/Navigation/AppNavigator/ModalNavigatorScreenOptions';
-import * as ModalStackNavigators from '@libs/Navigation/AppNavigator/ModalStackNavigators';
 import type {AuthScreensParamList, LeftModalNavigatorParamList} from '@libs/Navigation/types';
-import type NAVIGATORS from '@src/NAVIGATORS';
+import NAVIGATORS from '@src/NAVIGATORS';
 import SCREENS from '@src/SCREENS';
+import type ReactComponentModule from '@src/types/utils/ReactComponentModule';
 import Overlay from './Overlay';
 
 type LeftModalNavigatorProps = StackScreenProps<AuthScreensParamList, typeof NAVIGATORS.LEFT_MODAL_NAVIGATOR>;
 
+const loadChatFinder = () => require<ReactComponentModule>('../../../../pages/ChatFinderPage').default;
+const loadWorkspaceSwitcherPage = () => require<ReactComponentModule>('../../../../pages/WorkspaceSwitcherPage').default;
+
 const Stack = createStackNavigator<LeftModalNavigatorParamList>();
 
 function LeftModalNavigator({navigation}: LeftModalNavigatorProps) {
     const styles = useThemeStyles();
     const {isSmallScreenWidth} = useWindowDimensions();
-    const screenOptions = useMemo(() => ModalNavigatorScreenOptions(styles), [styles]);
+    const screenOptions = useMemo(() => ModalNavigatorScreenOptions(styles, 'horizontal-inverted'), [styles]);
 
     return (
         <NoDropZone>
@@ -30,14 +33,17 @@ function LeftModalNavigator({navigation}: LeftModalNavigatorProps) {
                 />
             )}
             <View style={styles.LHPNavigatorContainer(isSmallScreenWidth)}>
-                <Stack.Navigator screenOptions={screenOptions}>
+                <Stack.Navigator
+                    screenOptions={screenOptions}
+                    id={NAVIGATORS.LEFT_MODAL_NAVIGATOR}
+                >
                     <Stack.Screen
                         name={SCREENS.LEFT_MODAL.CHAT_FINDER}
-                        component={ModalStackNavigators.ChatFinderModalStackNavigator}
+                        getComponent={loadChatFinder}
                     />
                     <Stack.Screen
                         name={SCREENS.LEFT_MODAL.WORKSPACE_SWITCHER}
-                        component={ModalStackNavigators.WorkspaceSwitcherModalStackNavigator}
+                        getComponent={loadWorkspaceSwitcherPage}
                     />
                 </Stack.Navigator>
             </View>
diff --git a/src/libs/Navigation/AppNavigator/Navigators/OnboardingModalNavigator.tsx b/src/libs/Navigation/AppNavigator/Navigators/OnboardingModalNavigator.tsx
index ef3f6340f3e4..662910b3b28b 100644
--- a/src/libs/Navigation/AppNavigator/Navigators/OnboardingModalNavigator.tsx
+++ b/src/libs/Navigation/AppNavigator/Navigators/OnboardingModalNavigator.tsx
@@ -1,14 +1,25 @@
 import {createStackNavigator} from '@react-navigation/stack';
-import React from 'react';
+import React, {useCallback, useEffect} from 'react';
 import {View} from 'react-native';
+import {useOnyx} from 'react-native-onyx';
 import NoDropZone from '@components/DragAndDrop/NoDropZone';
+import FocusTrapForScreens from '@components/FocusTrap/FocusTrapForScreen';
+import useKeyboardShortcut from '@hooks/useKeyboardShortcut';
 import useOnboardingLayout from '@hooks/useOnboardingLayout';
 import useThemeStyles from '@hooks/useThemeStyles';
+import useWindowDimensions from '@hooks/useWindowDimensions';
+import hasCompletedGuidedSetupFlowSelector from '@libs/hasCompletedGuidedSetupFlowSelector';
 import OnboardingModalNavigatorScreenOptions from '@libs/Navigation/AppNavigator/OnboardingModalNavigatorScreenOptions';
+import Navigation from '@libs/Navigation/Navigation';
 import type {OnboardingModalNavigatorParamList} from '@libs/Navigation/types';
+import OnboardingRefManager from '@libs/OnboardingRefManager';
 import OnboardingPersonalDetails from '@pages/OnboardingPersonalDetails';
 import OnboardingPurpose from '@pages/OnboardingPurpose';
 import OnboardingWork from '@pages/OnboardingWork';
+import * as Report from '@userActions/Report';
+import CONST from '@src/CONST';
+import ONYXKEYS from '@src/ONYXKEYS';
+import ROUTES from '@src/ROUTES';
 import SCREENS from '@src/SCREENS';
 import Overlay from './Overlay';
 
@@ -16,28 +27,70 @@ const Stack = createStackNavigator<OnboardingModalNavigatorParamList>();
 
 function OnboardingModalNavigator() {
     const styles = useThemeStyles();
-    const {shouldUseNarrowLayout} = useOnboardingLayout();
+    const {isMediumOrLargerScreenWidth} = useOnboardingLayout();
+    const [hasCompletedGuidedSetupFlow] = useOnyx(ONYXKEYS.NVP_ONBOARDING, {
+        selector: hasCompletedGuidedSetupFlowSelector,
+    });
+    const {isSmallScreenWidth} = useWindowDimensions();
 
+    useEffect(() => {
+        if (!hasCompletedGuidedSetupFlow) {
+            return;
+        }
+        Navigation.isNavigationReady().then(() => {
+            // On small screens, pop all navigation states and go back to HOME.
+            // On large screens, need to go back to previous route and then redirect to Concierge,
+            // otherwise going back on Concierge will go to onboarding and then redirected to Concierge again
+            if (isSmallScreenWidth) {
+                Navigation.setShouldPopAllStateOnUP(true);
+                Navigation.goBack(ROUTES.HOME, true, true);
+            } else {
+                Navigation.goBack();
+                Report.navigateToConciergeChat();
+            }
+        });
+    }, [hasCompletedGuidedSetupFlow, isSmallScreenWidth]);
+
+    const outerViewRef = React.useRef<View>(null);
+
+    const handleOuterClick = useCallback(() => {
+        OnboardingRefManager.handleOuterClick();
+    }, []);
+
+    useKeyboardShortcut(CONST.KEYBOARD_SHORTCUTS.ESCAPE, handleOuterClick, {shouldBubble: true});
+
+    if (hasCompletedGuidedSetupFlow) {
+        return null;
+    }
     return (
         <NoDropZone>
             <Overlay />
-            <View style={styles.onboardingNavigatorOuterView}>
-                <View style={styles.OnboardingNavigatorInnerView(shouldUseNarrowLayout)}>
-                    <Stack.Navigator screenOptions={OnboardingModalNavigatorScreenOptions()}>
-                        <Stack.Screen
-                            name={SCREENS.ONBOARDING.PURPOSE}
-                            component={OnboardingPurpose}
-                        />
-                        <Stack.Screen
-                            name={SCREENS.ONBOARDING.PERSONAL_DETAILS}
-                            component={OnboardingPersonalDetails}
-                        />
-                        <Stack.Screen
-                            name={SCREENS.ONBOARDING.WORK}
-                            component={OnboardingWork}
-                        />
-                    </Stack.Navigator>
-                </View>
+            <View
+                ref={outerViewRef}
+                onClick={handleOuterClick}
+                style={styles.onboardingNavigatorOuterView}
+            >
+                <FocusTrapForScreens>
+                    <View
+                        onClick={(e) => e.stopPropagation()}
+                        style={styles.OnboardingNavigatorInnerView(isMediumOrLargerScreenWidth)}
+                    >
+                        <Stack.Navigator screenOptions={OnboardingModalNavigatorScreenOptions()}>
+                            <Stack.Screen
+                                name={SCREENS.ONBOARDING.PURPOSE}
+                                component={OnboardingPurpose}
+                            />
+                            <Stack.Screen
+                                name={SCREENS.ONBOARDING.PERSONAL_DETAILS}
+                                component={OnboardingPersonalDetails}
+                            />
+                            <Stack.Screen
+                                name={SCREENS.ONBOARDING.WORK}
+                                component={OnboardingWork}
+                            />
+                        </Stack.Navigator>
+                    </View>
+                </FocusTrapForScreens>
             </View>
         </NoDropZone>
     );
diff --git a/src/libs/Navigation/AppNavigator/Navigators/Overlay/BaseOverlay.tsx b/src/libs/Navigation/AppNavigator/Navigators/Overlay/BaseOverlay.tsx
index 656416b7e088..b097ae6f1ce0 100644
--- a/src/libs/Navigation/AppNavigator/Navigators/Overlay/BaseOverlay.tsx
+++ b/src/libs/Navigation/AppNavigator/Navigators/Overlay/BaseOverlay.tsx
@@ -23,7 +23,10 @@ function BaseOverlay({shouldUseNativeStyles, onPress, isModalOnTheLeft = false}:
     const {translate} = useLocalize();
 
     return (
-        <Animated.View style={shouldUseNativeStyles ? styles.nativeOverlayStyles(current) : styles.overlayStyles(current, isModalOnTheLeft)}>
+        <Animated.View
+            id="BaseOverlay"
+            style={shouldUseNativeStyles ? styles.nativeOverlayStyles(current) : styles.overlayStyles(current, isModalOnTheLeft)}
+        >
             <View style={[styles.flex1, styles.flexColumn]}>
                 {/* In the latest Electron version buttons can't be both clickable and draggable.
              That's why we added this workaround. Because of two Pressable components on the desktop app
diff --git a/src/libs/Navigation/AppNavigator/Navigators/RightModalNavigator.tsx b/src/libs/Navigation/AppNavigator/Navigators/RightModalNavigator.tsx
index 1d595f05ee88..646552c44055 100644
--- a/src/libs/Navigation/AppNavigator/Navigators/RightModalNavigator.tsx
+++ b/src/libs/Navigation/AppNavigator/Navigators/RightModalNavigator.tsx
@@ -1,14 +1,18 @@
-import type {StackScreenProps} from '@react-navigation/stack';
+import type {StackCardInterpolationProps, StackScreenProps} from '@react-navigation/stack';
 import {createStackNavigator} from '@react-navigation/stack';
 import React, {useMemo, useRef} from 'react';
-import {View} from 'react-native';
+import {InteractionManager, View} from 'react-native';
 import NoDropZone from '@components/DragAndDrop/NoDropZone';
+import useStyleUtils from '@hooks/useStyleUtils';
 import useThemeStyles from '@hooks/useThemeStyles';
 import useWindowDimensions from '@hooks/useWindowDimensions';
+import {abandonReviewDuplicateTransactions} from '@libs/actions/Transaction';
+import {isSafari} from '@libs/Browser';
 import ModalNavigatorScreenOptions from '@libs/Navigation/AppNavigator/ModalNavigatorScreenOptions';
 import * as ModalStackNavigators from '@libs/Navigation/AppNavigator/ModalStackNavigators';
+import createModalCardStyleInterpolator from '@navigation/AppNavigator/createModalCardStyleInterpolator';
 import type {AuthScreensParamList, RightModalNavigatorParamList} from '@navigation/types';
-import type NAVIGATORS from '@src/NAVIGATORS';
+import NAVIGATORS from '@src/NAVIGATORS';
 import SCREENS from '@src/SCREENS';
 import Overlay from './Overlay';
 
@@ -16,11 +20,21 @@ type RightModalNavigatorProps = StackScreenProps<AuthScreensParamList, typeof NA
 
 const Stack = createStackNavigator<RightModalNavigatorParamList>();
 
-function RightModalNavigator({navigation}: RightModalNavigatorProps) {
+function RightModalNavigator({navigation, route}: RightModalNavigatorProps) {
     const styles = useThemeStyles();
+    const styleUtils = useStyleUtils();
     const {isSmallScreenWidth} = useWindowDimensions();
-    const screenOptions = useMemo(() => ModalNavigatorScreenOptions(styles), [styles]);
     const isExecutingRef = useRef<boolean>(false);
+    const screenOptions = useMemo(() => {
+        const options = ModalNavigatorScreenOptions(styles);
+        // The .forHorizontalIOS interpolator from `@react-navigation` is misbehaving on Safari, so we override it with Expensify custom interpolator
+        if (isSafari()) {
+            const customInterpolator = createModalCardStyleInterpolator(styleUtils);
+            options.cardStyleInterpolator = (props: StackCardInterpolationProps) => customInterpolator(isSmallScreenWidth, false, false, props);
+        }
+
+        return options;
+    }, [isSmallScreenWidth, styleUtils, styles]);
 
     return (
         <NoDropZone>
@@ -36,7 +50,27 @@ function RightModalNavigator({navigation}: RightModalNavigatorProps) {
                 />
             )}
             <View style={styles.RHPNavigatorContainer(isSmallScreenWidth)}>
-                <Stack.Navigator screenOptions={screenOptions}>
+                <Stack.Navigator
+                    screenOptions={screenOptions}
+                    screenListeners={{
+                        blur: () => {
+                            if (
+                                // @ts-expect-error There is something wrong with a types here and it's don't see the params list
+                                navigation.getState().routes.find((routes) => routes.name === NAVIGATORS.RIGHT_MODAL_NAVIGATOR)?.params?.screen ===
+                                    SCREENS.RIGHT_MODAL.TRANSACTION_DUPLICATE ||
+                                route.params?.screen !== SCREENS.RIGHT_MODAL.TRANSACTION_DUPLICATE
+                            ) {
+                                return;
+                            }
+                            // Delay clearing review duplicate data till the RHP is completely closed
+                            // to avoid not found showing briefly in confirmation page when RHP is closing
+                            InteractionManager.runAfterInteractions(() => {
+                                abandonReviewDuplicateTransactions();
+                            });
+                        },
+                    }}
+                    id={NAVIGATORS.RIGHT_MODAL_NAVIGATOR}
+                >
                     <Stack.Screen
                         name={SCREENS.RIGHT_MODAL.SETTINGS}
                         component={ModalStackNavigators.SettingsModalStackNavigator}
@@ -45,10 +79,6 @@ function RightModalNavigator({navigation}: RightModalNavigatorProps) {
                         name={SCREENS.RIGHT_MODAL.NEW_CHAT}
                         component={ModalStackNavigators.NewChatModalStackNavigator}
                     />
-                    <Stack.Screen
-                        name={SCREENS.RIGHT_MODAL.DETAILS}
-                        component={ModalStackNavigators.DetailsModalStackNavigator}
-                    />
                     <Stack.Screen
                         name={SCREENS.RIGHT_MODAL.PROFILE}
                         component={ModalStackNavigators.ProfileModalStackNavigator}
@@ -65,6 +95,10 @@ function RightModalNavigator({navigation}: RightModalNavigatorProps) {
                         name={SCREENS.RIGHT_MODAL.REPORT_DESCRIPTION}
                         component={ModalStackNavigators.ReportDescriptionModalStackNavigator}
                     />
+                    <Stack.Screen
+                        name={SCREENS.RIGHT_MODAL.SETTINGS_CATEGORIES}
+                        component={ModalStackNavigators.CategoriesModalStackNavigator}
+                    />
                     <Stack.Screen
                         name={SCREENS.RIGHT_MODAL.PARTICIPANTS}
                         component={ModalStackNavigators.ReportParticipantsModalStackNavigator}
@@ -133,6 +167,10 @@ function RightModalNavigator({navigation}: RightModalNavigatorProps) {
                         name="ProcessMoneyRequestHold"
                         component={ModalStackNavigators.ProcessMoneyRequestHoldStackNavigator}
                     />
+                    <Stack.Screen
+                        name={SCREENS.RIGHT_MODAL.TRANSACTION_DUPLICATE}
+                        component={ModalStackNavigators.TransactionDuplicateStackNavigator}
+                    />
                     <Stack.Screen
                         name={SCREENS.RIGHT_MODAL.TRAVEL}
                         component={ModalStackNavigators.TravelModalStackNavigator}
@@ -141,6 +179,14 @@ function RightModalNavigator({navigation}: RightModalNavigatorProps) {
                         name={SCREENS.RIGHT_MODAL.SEARCH_REPORT}
                         component={ModalStackNavigators.SearchReportModalStackNavigator}
                     />
+                    <Stack.Screen
+                        name={SCREENS.RIGHT_MODAL.RESTRICTED_ACTION}
+                        component={ModalStackNavigators.RestrictedActionModalStackNavigator}
+                    />
+                    <Stack.Screen
+                        name={SCREENS.RIGHT_MODAL.SEARCH_ADVANCED_FILTERS}
+                        component={ModalStackNavigators.SearchAdvancedFiltersModalStackNavigator}
+                    />
                 </Stack.Navigator>
             </View>
         </NoDropZone>
diff --git a/src/libs/Navigation/AppNavigator/ReportScreenIDSetter.ts b/src/libs/Navigation/AppNavigator/ReportScreenIDSetter.ts
deleted file mode 100644
index 5407a451682a..000000000000
--- a/src/libs/Navigation/AppNavigator/ReportScreenIDSetter.ts
+++ /dev/null
@@ -1,128 +0,0 @@
-import {useEffect} from 'react';
-import type {OnyxCollection, OnyxEntry} from 'react-native-onyx';
-import {withOnyx} from 'react-native-onyx';
-import useActiveWorkspace from '@hooks/useActiveWorkspace';
-import usePermissions from '@hooks/usePermissions';
-import {getPolicyEmployeeListByIdWithoutCurrentUser} from '@libs/PolicyUtils';
-import * as ReportUtils from '@libs/ReportUtils';
-import ONYXKEYS from '@src/ONYXKEYS';
-import type {PersonalDetailsList, Policy, Report, ReportMetadata} from '@src/types/onyx';
-import type {ReportScreenWrapperProps} from './ReportScreenWrapper';
-
-type ReportScreenIDSetterComponentProps = {
-    /** Available reports that would be displayed in this navigator */
-    reports: OnyxCollection<Report>;
-
-    /** The policies which the user has access to */
-    policies: OnyxCollection<Policy>;
-
-    /** The personal details of the person who is logged in */
-    personalDetails: OnyxEntry<PersonalDetailsList>;
-
-    /** Whether user is a new user */
-    isFirstTimeNewExpensifyUser: OnyxEntry<boolean>;
-
-    /** The report metadata */
-    reportMetadata: OnyxCollection<ReportMetadata>;
-
-    /** The accountID of the current user */
-    accountID?: number;
-};
-
-type ReportScreenIDSetterProps = ReportScreenIDSetterComponentProps & ReportScreenWrapperProps;
-
-/**
- * Get the most recently accessed report for the user
- */
-const getLastAccessedReportID = (
-    reports: OnyxCollection<Report>,
-    ignoreDefaultRooms: boolean,
-    policies: OnyxCollection<Policy>,
-    isFirstTimeNewExpensifyUser: OnyxEntry<boolean>,
-    openOnAdminRoom: boolean,
-    reportMetadata: OnyxCollection<ReportMetadata>,
-    policyID?: string,
-    policyMemberAccountIDs?: number[],
-): string | undefined => {
-    const lastReport = ReportUtils.findLastAccessedReport(
-        reports,
-        ignoreDefaultRooms,
-        policies,
-        !!isFirstTimeNewExpensifyUser,
-        openOnAdminRoom,
-        reportMetadata,
-        policyID,
-        policyMemberAccountIDs,
-    );
-    return 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, navigation, isFirstTimeNewExpensifyUser = false, reportMetadata, accountID, personalDetails}: ReportScreenIDSetterProps) {
-    const {canUseDefaultRooms} = usePermissions();
-    const {activeWorkspaceID} = useActiveWorkspace();
-
-    useEffect(() => {
-        // Don't update if there is a reportID in the params already
-        if (route?.params?.reportID) {
-            const reportActionID = route?.params?.reportActionID;
-            const regexValidReportActionID = new RegExp(/^\d*$/);
-            if (reportActionID && !regexValidReportActionID.test(reportActionID)) {
-                navigation.setParams({reportActionID: ''});
-            }
-            return;
-        }
-
-        const policyMemberAccountIDs = getPolicyEmployeeListByIdWithoutCurrentUser(policies, activeWorkspaceID, accountID);
-
-        // If there is no reportID in route, try to find last accessed and use it for setParams
-        const reportID = getLastAccessedReportID(
-            reports,
-            !canUseDefaultRooms,
-            policies,
-            isFirstTimeNewExpensifyUser,
-            !!reports?.params?.openOnAdminRoom,
-            reportMetadata,
-            activeWorkspaceID,
-            policyMemberAccountIDs,
-        );
-
-        // It's possible that reports aren't fully loaded yet
-        // in that case the reportID is undefined
-        if (reportID) {
-            navigation.setParams({reportID: String(reportID)});
-        }
-    }, [route, navigation, reports, canUseDefaultRooms, policies, isFirstTimeNewExpensifyUser, reportMetadata, activeWorkspaceID, personalDetails, accountID]);
-
-    // The ReportScreen without the reportID set will display a skeleton
-    // until the reportID is loaded and set in the route param
-    return null;
-}
-
-ReportScreenIDSetter.displayName = 'ReportScreenIDSetter';
-
-export default withOnyx<ReportScreenIDSetterProps, ReportScreenIDSetterComponentProps>({
-    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,
-    },
-    reportMetadata: {
-        key: ONYXKEYS.COLLECTION.REPORT_METADATA,
-        allowStaleData: true,
-    },
-    accountID: {
-        key: ONYXKEYS.SESSION,
-        selector: (session) => session?.accountID,
-    },
-    personalDetails: {
-        key: ONYXKEYS.PERSONAL_DETAILS_LIST,
-    },
-})(ReportScreenIDSetter);
diff --git a/src/libs/Navigation/AppNavigator/ReportScreenWrapper.tsx b/src/libs/Navigation/AppNavigator/ReportScreenWrapper.tsx
deleted file mode 100644
index 5d710afa69e9..000000000000
--- a/src/libs/Navigation/AppNavigator/ReportScreenWrapper.tsx
+++ /dev/null
@@ -1,30 +0,0 @@
-import type {StackScreenProps} from '@react-navigation/stack';
-import React from 'react';
-import type {CentralPaneNavigatorParamList} from '@navigation/types';
-import ReportScreen from '@pages/home/ReportScreen';
-import type SCREENS from '@src/SCREENS';
-import ReportScreenIDSetter from './ReportScreenIDSetter';
-
-type ReportScreenWrapperProps = StackScreenProps<CentralPaneNavigatorParamList, typeof SCREENS.REPORT>;
-
-function ReportScreenWrapper({route, navigation}: ReportScreenWrapperProps) {
-    // The ReportScreen without the reportID set will display a skeleton
-    // until the reportID is loaded and set in the route param
-    return (
-        <>
-            <ReportScreen
-                route={route}
-                navigation={navigation}
-            />
-            <ReportScreenIDSetter
-                route={route}
-                navigation={navigation}
-            />
-        </>
-    );
-}
-
-ReportScreenWrapper.displayName = 'ReportScreenWrapper';
-
-export default ReportScreenWrapper;
-export type {ReportScreenWrapperProps};
diff --git a/src/libs/Navigation/AppNavigator/createCustomBottomTabNavigator/BottomTabBar.tsx b/src/libs/Navigation/AppNavigator/createCustomBottomTabNavigator/BottomTabBar.tsx
index 7f26177eeb0f..394a617278d4 100644
--- a/src/libs/Navigation/AppNavigator/createCustomBottomTabNavigator/BottomTabBar.tsx
+++ b/src/libs/Navigation/AppNavigator/createCustomBottomTabNavigator/BottomTabBar.tsx
@@ -1,21 +1,26 @@
-import {useNavigation, useNavigationState} from '@react-navigation/native';
-import React, {useEffect} from 'react';
-import {View} from 'react-native';
-import type {OnyxEntry} from 'react-native-onyx';
-import {withOnyx} from 'react-native-onyx';
+import {useNavigation} from '@react-navigation/native';
+import React, {memo, useCallback, useEffect, useState} from 'react';
+import {NativeModules, View} from 'react-native';
+import {useOnyx} from 'react-native-onyx';
 import Icon from '@components/Icon';
 import * as Expensicons from '@components/Icon/Expensicons';
 import {PressableWithFeedback} from '@components/Pressable';
+import type {SearchQueryString} from '@components/Search/types';
 import Tooltip from '@components/Tooltip';
 import useActiveWorkspace from '@hooks/useActiveWorkspace';
 import useLocalize from '@hooks/useLocalize';
 import useTheme from '@hooks/useTheme';
 import useThemeStyles from '@hooks/useThemeStyles';
 import * as Session from '@libs/actions/Session';
-import getTopmostBottomTabRoute from '@libs/Navigation/getTopmostBottomTabRoute';
-import getTopmostCentralPaneRoute from '@libs/Navigation/getTopmostCentralPaneRoute';
-import Navigation from '@libs/Navigation/Navigation';
+import interceptAnonymousUser from '@libs/interceptAnonymousUser';
+import linkingConfig from '@libs/Navigation/linkingConfig';
+import getAdaptedStateFromPath from '@libs/Navigation/linkingConfig/getAdaptedStateFromPath';
+import Navigation, {navigationRef} from '@libs/Navigation/Navigation';
 import type {RootStackParamList, State} from '@libs/Navigation/types';
+import {isCentralPaneName} from '@libs/NavigationUtils';
+import * as PolicyUtils from '@libs/PolicyUtils';
+import * as SearchUtils from '@libs/SearchUtils';
+import type {BrickRoad} from '@libs/WorkspacesSettingsUtils';
 import {getChatTabBrickRoad} from '@libs/WorkspacesSettingsUtils';
 import BottomTabAvatar from '@pages/home/sidebar/BottomTabAvatar';
 import BottomTabBarFloatingActionButton from '@pages/home/sidebar/BottomTabBarFloatingActionButton';
@@ -24,21 +29,55 @@ import * as Welcome from '@userActions/Welcome';
 import CONST from '@src/CONST';
 import NAVIGATORS from '@src/NAVIGATORS';
 import ONYXKEYS from '@src/ONYXKEYS';
+import type {Route} from '@src/ROUTES';
 import ROUTES from '@src/ROUTES';
 import SCREENS from '@src/SCREENS';
 
-type PurposeForUsingExpensifyModalOnyxProps = {
-    isLoadingApp: OnyxEntry<boolean>;
+type BottomTabBarProps = {
+    selectedTab: string | undefined;
 };
-type PurposeForUsingExpensifyModalProps = PurposeForUsingExpensifyModalOnyxProps;
 
-function BottomTabBar({isLoadingApp = false}: PurposeForUsingExpensifyModalProps) {
+/**
+ * Returns SearchQueryString that has policyID correctly set.
+ *
+ * When we're coming back to Search Screen we might have pre-existing policyID inside SearchQuery.
+ * There are 2 cases when we might want to remove this `policyID`:
+ *  - if Policy was removed in another screen
+ *  - if WorkspaceSwitcher was used to globally unset a policyID
+ * Otherwise policyID will be inserted into query
+ */
+function handleQueryWithPolicyID(query: SearchQueryString, activePolicyID?: string): SearchQueryString {
+    const queryJSON = SearchUtils.buildSearchQueryJSON(query);
+    if (!queryJSON) {
+        return query;
+    }
+
+    const policyID = queryJSON.policyID ?? activePolicyID;
+    const policy = PolicyUtils.getPolicy(policyID);
+
+    // In case policy is missing or there is no policy currently selected via WorkspaceSwitcher we remove it
+    if (!activePolicyID || !policy) {
+        delete queryJSON.policyID;
+    } else {
+        queryJSON.policyID = policyID;
+    }
+
+    return SearchUtils.buildSearchQueryString(queryJSON);
+}
+
+function BottomTabBar({selectedTab}: BottomTabBarProps) {
     const theme = useTheme();
     const styles = useThemeStyles();
     const {translate} = useLocalize();
+    const navigation = useNavigation();
     const {activeWorkspaceID} = useActiveWorkspace();
+    const [isLoadingApp] = useOnyx(ONYXKEYS.IS_LOADING_APP);
+    const transactionViolations = useOnyx(ONYXKEYS.COLLECTION.TRANSACTION_VIOLATIONS);
+    const [chatTabBrickRoad, setChatTabBrickRoad] = useState<BrickRoad>(getChatTabBrickRoad(activeWorkspaceID));
 
-    const navigation = useNavigation();
+    useEffect(() => {
+        setChatTabBrickRoad(getChatTabBrickRoad(activeWorkspaceID));
+    }, [activeWorkspaceID, transactionViolations]);
 
     useEffect(() => {
         const navigationState = navigation.getState() as State<RootStackParamList> | undefined;
@@ -46,44 +85,73 @@ function BottomTabBar({isLoadingApp = false}: PurposeForUsingExpensifyModalProps
         const currentRoute = routes?.[navigationState?.index ?? 0];
         // When we are redirected to the Settings tab from the OldDot, we don't want to call the Welcome.show() method.
         // To prevent this, the value of the bottomTabRoute?.name is checked here
-        if (Boolean(currentRoute && currentRoute.name !== NAVIGATORS.BOTTOM_TAB_NAVIGATOR && currentRoute.name !== NAVIGATORS.CENTRAL_PANE_NAVIGATOR) || Session.isAnonymousUser()) {
+        if (!!(currentRoute && currentRoute.name !== NAVIGATORS.BOTTOM_TAB_NAVIGATOR && !isCentralPaneName(currentRoute.name)) || Session.isAnonymousUser()) {
+            return;
+        }
+
+        // HybridApp has own entry point when we decide whether to display onboarding and explanation modal.
+        if (NativeModules.HybridAppModule) {
             return;
         }
 
-        Welcome.isOnboardingFlowCompleted({onNotCompleted: () => Navigation.navigate(ROUTES.ONBOARDING_ROOT)});
-        // eslint-disable-next-line react-hooks/exhaustive-deps
+        Welcome.isOnboardingFlowCompleted({
+            onNotCompleted: () => {
+                const {adaptedState} = getAdaptedStateFromPath(ROUTES.ONBOARDING_ROOT.route, linkingConfig.config);
+                navigationRef.resetRoot(adaptedState);
+            },
+        });
+
+        // eslint-disable-next-line react-compiler/react-compiler, react-hooks/exhaustive-deps
     }, [isLoadingApp]);
 
-    // Parent navigator of the bottom tab bar is the root navigator.
-    const currentTabName = useNavigationState<RootStackParamList, string | undefined>((state) => {
-        const topmostCentralPaneRoute = getTopmostCentralPaneRoute(state);
+    const navigateToChats = useCallback(() => {
+        if (selectedTab === SCREENS.HOME) {
+            return;
+        }
+        const route = activeWorkspaceID ? (`/w/${activeWorkspaceID}/${ROUTES.HOME}` as Route) : ROUTES.HOME;
+        Navigation.navigate(route);
+    }, [activeWorkspaceID, selectedTab]);
 
-        if (topmostCentralPaneRoute && topmostCentralPaneRoute.name === SCREENS.SEARCH.CENTRAL_PANE) {
-            return SCREENS.SEARCH.CENTRAL_PANE;
+    const navigateToSearch = useCallback(() => {
+        if (selectedTab === SCREENS.SEARCH.BOTTOM_TAB) {
+            return;
         }
+        interceptAnonymousUser(() => {
+            const currentSearchParams = SearchUtils.getCurrentSearchParams();
+            if (currentSearchParams) {
+                const {q, ...rest} = currentSearchParams;
+                const cleanedQuery = handleQueryWithPolicyID(q, activeWorkspaceID);
 
-        const topmostBottomTabRoute = getTopmostBottomTabRoute(state);
-        return topmostBottomTabRoute?.name ?? SCREENS.HOME;
-    });
+                Navigation.navigate(
+                    ROUTES.SEARCH_CENTRAL_PANE.getRoute({
+                        query: cleanedQuery,
+                        ...rest,
+                    }),
+                );
+                return;
+            }
 
-    const chatTabBrickRoad = getChatTabBrickRoad(activeWorkspaceID);
+            const defaultCannedQuery = SearchUtils.buildCannedSearchQuery();
+            // when navigating to search we might have an activePolicyID set from workspace switcher
+            const query = activeWorkspaceID ? `${defaultCannedQuery} ${CONST.SEARCH.SYNTAX_ROOT_KEYS.POLICY_ID}:${activeWorkspaceID}` : defaultCannedQuery;
+            Navigation.navigate(ROUTES.SEARCH_CENTRAL_PANE.getRoute({query}));
+        });
+    }, [activeWorkspaceID, selectedTab]);
 
     return (
         <View style={styles.bottomTabBarContainer}>
-            <Tooltip text={translate('common.chats')}>
+            <Tooltip text={translate('common.inbox')}>
                 <PressableWithFeedback
-                    onPress={() => {
-                        Navigation.navigate(ROUTES.HOME);
-                    }}
+                    onPress={navigateToChats}
                     role={CONST.ROLE.BUTTON}
-                    accessibilityLabel={translate('common.chats')}
+                    accessibilityLabel={translate('common.inbox')}
                     wrapperStyle={styles.flex1}
                     style={styles.bottomTabBarItem}
                 >
                     <View>
                         <Icon
-                            src={Expensicons.ChatBubble}
-                            fill={currentTabName === SCREENS.HOME ? theme.iconMenu : theme.icon}
+                            src={Expensicons.Inbox}
+                            fill={selectedTab === SCREENS.HOME ? theme.iconMenu : theme.icon}
                             width={variables.iconBottomBar}
                             height={variables.iconBottomBar}
                         />
@@ -93,16 +161,32 @@ function BottomTabBar({isLoadingApp = false}: PurposeForUsingExpensifyModalProps
                     </View>
                 </PressableWithFeedback>
             </Tooltip>
-            <BottomTabBarFloatingActionButton />
-            <BottomTabAvatar isSelected={currentTabName === SCREENS.SETTINGS.ROOT} />
+            <Tooltip text={translate('common.search')}>
+                <PressableWithFeedback
+                    onPress={navigateToSearch}
+                    role={CONST.ROLE.BUTTON}
+                    accessibilityLabel={translate('common.search')}
+                    wrapperStyle={styles.flex1}
+                    style={styles.bottomTabBarItem}
+                >
+                    <View>
+                        <Icon
+                            src={Expensicons.MoneySearch}
+                            fill={selectedTab === SCREENS.SEARCH.BOTTOM_TAB ? theme.iconMenu : theme.icon}
+                            width={variables.iconBottomBar}
+                            height={variables.iconBottomBar}
+                        />
+                    </View>
+                </PressableWithFeedback>
+            </Tooltip>
+            <BottomTabAvatar isSelected={selectedTab === SCREENS.SETTINGS.ROOT} />
+            <View style={[styles.flex1, styles.bottomTabBarItem]}>
+                <BottomTabBarFloatingActionButton />
+            </View>
         </View>
     );
 }
 
 BottomTabBar.displayName = 'BottomTabBar';
 
-export default withOnyx<PurposeForUsingExpensifyModalProps, PurposeForUsingExpensifyModalOnyxProps>({
-    isLoadingApp: {
-        key: ONYXKEYS.IS_LOADING_APP,
-    },
-})(BottomTabBar);
+export default memo(BottomTabBar);
diff --git a/src/libs/Navigation/AppNavigator/createCustomBottomTabNavigator/TopBar.tsx b/src/libs/Navigation/AppNavigator/createCustomBottomTabNavigator/TopBar.tsx
index 6fdc075d9458..dc3ab4c48c08 100644
--- a/src/libs/Navigation/AppNavigator/createCustomBottomTabNavigator/TopBar.tsx
+++ b/src/libs/Navigation/AppNavigator/createCustomBottomTabNavigator/TopBar.tsx
@@ -1,7 +1,6 @@
 import React from 'react';
 import {View} from 'react-native';
-import type {OnyxEntry} from 'react-native-onyx';
-import {withOnyx} from 'react-native-onyx';
+import {useOnyx} from 'react-native-onyx';
 import Breadcrumbs from '@components/Breadcrumbs';
 import Icon from '@components/Icon';
 import * as Expensicons from '@components/Icon/Expensicons';
@@ -9,28 +8,26 @@ import {PressableWithoutFeedback} from '@components/Pressable';
 import Tooltip from '@components/Tooltip';
 import WorkspaceSwitcherButton from '@components/WorkspaceSwitcherButton';
 import useLocalize from '@hooks/useLocalize';
+import usePolicy from '@hooks/usePolicy';
 import useTheme from '@hooks/useTheme';
 import useThemeStyles from '@hooks/useThemeStyles';
 import Navigation from '@libs/Navigation/Navigation';
+import Performance from '@libs/Performance';
 import SignInButton from '@pages/home/sidebar/SignInButton';
 import * as Session from '@userActions/Session';
+import Timing from '@userActions/Timing';
 import CONST from '@src/CONST';
 import ONYXKEYS from '@src/ONYXKEYS';
 import ROUTES from '@src/ROUTES';
-import type {Policy, Session as SessionType} from '@src/types/onyx';
 
-type TopBarOnyxProps = {
-    policy: OnyxEntry<Policy>;
-    session: OnyxEntry<Pick<SessionType, 'authTokenType'>>;
-};
+type TopBarProps = {breadcrumbLabel: string; activeWorkspaceID?: string; shouldDisplaySearch?: boolean};
 
-// eslint-disable-next-line react/no-unused-prop-types
-type TopBarProps = {breadcrumbLabel: string; activeWorkspaceID?: string; shouldDisplaySearch?: boolean} & TopBarOnyxProps;
-
-function TopBar({policy, session, breadcrumbLabel, shouldDisplaySearch = true}: TopBarProps) {
+function TopBar({breadcrumbLabel, activeWorkspaceID, shouldDisplaySearch = true}: TopBarProps) {
     const styles = useThemeStyles();
     const theme = useTheme();
     const {translate} = useLocalize();
+    const policy = usePolicy(activeWorkspaceID);
+    const [session] = useOnyx(ONYXKEYS.SESSION, {selector: (sessionValue) => sessionValue && {authTokenType: sessionValue.authTokenType}});
     const isAnonymousUser = Session.isAnonymousUser(session);
 
     const headerBreadcrumb = policy?.name
@@ -45,7 +42,7 @@ function TopBar({policy, session, breadcrumbLabel, shouldDisplaySearch = true}:
     return (
         <View style={styles.w100}>
             <View
-                style={[styles.flexRow, styles.gap4, styles.mh3, styles.mv5, styles.alignItemsCenter, {justifyContent: 'space-between'}]}
+                style={[styles.flexRow, styles.gap4, styles.mh3, styles.mv5, styles.alignItemsCenter, styles.justifyContentBetween]}
                 dataSet={{dragArea: true}}
             >
                 <View style={[styles.flex1, styles.flexRow, styles.alignItemsCenter, styles.ml2]}>
@@ -67,8 +64,12 @@ function TopBar({policy, session, breadcrumbLabel, shouldDisplaySearch = true}:
                     <Tooltip text={translate('common.find')}>
                         <PressableWithoutFeedback
                             accessibilityLabel={translate('sidebarScreen.buttonFind')}
-                            style={[styles.flexRow, styles.mr2]}
-                            onPress={Session.checkIfActionIsAllowed(() => Navigation.navigate(ROUTES.CHAT_FINDER))}
+                            style={[styles.flexRow, styles.mr2, styles.touchableButtonImage]}
+                            onPress={Session.checkIfActionIsAllowed(() => {
+                                Timing.start(CONST.TIMING.CHAT_FINDER_RENDER);
+                                Performance.markStart(CONST.TIMING.CHAT_FINDER_RENDER);
+                                Navigation.navigate(ROUTES.CHAT_FINDER);
+                            })}
                         >
                             <Icon
                                 src={Expensicons.MagnifyingGlass}
@@ -84,12 +85,4 @@ function TopBar({policy, session, breadcrumbLabel, shouldDisplaySearch = true}:
 
 TopBar.displayName = 'TopBar';
 
-export default withOnyx<TopBarProps, TopBarOnyxProps>({
-    policy: {
-        key: ({activeWorkspaceID}) => `${ONYXKEYS.COLLECTION.POLICY}${activeWorkspaceID}`,
-    },
-    session: {
-        key: ONYXKEYS.SESSION,
-        selector: (session) => session && {authTokenType: session.authTokenType},
-    },
-})(TopBar);
+export default TopBar;
diff --git a/src/libs/Navigation/AppNavigator/createCustomBottomTabNavigator/index.tsx b/src/libs/Navigation/AppNavigator/createCustomBottomTabNavigator/index.tsx
index 8c53027cf713..89b83dae816c 100644
--- a/src/libs/Navigation/AppNavigator/createCustomBottomTabNavigator/index.tsx
+++ b/src/libs/Navigation/AppNavigator/createCustomBottomTabNavigator/index.tsx
@@ -44,11 +44,14 @@ function CustomBottomTabNavigator({initialRouteName, children, screenOptions, ..
 
     const styles = useThemeStyles();
     const stateToRender = getStateToRender(state);
+    const selectedTab = stateToRender.routes.at(-1)?.name;
 
     return (
         <ScreenWrapper
             testID={CustomBottomTabNavigator.displayName}
             shouldShowOfflineIndicator={false}
+            shouldEnableKeyboardAvoidingView={false}
+            shouldEnablePickerAvoiding={false}
         >
             <View style={styles.flex1}>
                 <NavigationContent>
@@ -60,7 +63,7 @@ function CustomBottomTabNavigator({initialRouteName, children, screenOptions, ..
                         navigation={navigation}
                     />
                 </NavigationContent>
-                <BottomTabBar />
+                <BottomTabBar selectedTab={selectedTab} />
             </View>
         </ScreenWrapper>
     );
diff --git a/src/libs/Navigation/AppNavigator/createCustomFullScreenNavigator/CustomFullScreenRouter.tsx b/src/libs/Navigation/AppNavigator/createCustomFullScreenNavigator/CustomFullScreenRouter.tsx
index eb19f891ecd5..27e976d9be0c 100644
--- a/src/libs/Navigation/AppNavigator/createCustomFullScreenNavigator/CustomFullScreenRouter.tsx
+++ b/src/libs/Navigation/AppNavigator/createCustomFullScreenNavigator/CustomFullScreenRouter.tsx
@@ -11,11 +11,6 @@ const isAtLeastOneInState = (state: StackState, screenName: string): boolean =>
 function adaptStateIfNecessary(state: StackState) {
     const isNarrowLayout = getIsNarrowLayout();
     const workspaceCentralPane = state.routes.at(-1);
-    const topmostWorkspaceCentralPaneRoute = workspaceCentralPane?.state?.routes[0];
-
-    // When a screen from the FullScreenNavigator is opened from the deeplink then params should be passed to SCREENS.WORKSPACE.INITIAL from the variable defined below.
-    const workspacesCentralPaneParams =
-        workspaceCentralPane?.params && 'params' in workspaceCentralPane.params ? (workspaceCentralPane.params.params as Record<string, string | undefined>) : undefined;
 
     // There should always be WORKSPACE.INITIAL screen in the state to make sure go back works properly if we deeplinkg to a subpage of settings.
     if (!isAtLeastOneInState(state, SCREENS.WORKSPACE.INITIAL)) {
@@ -28,31 +23,24 @@ function adaptStateIfNecessary(state: StackState) {
             // Unshift the root screen to fill left pane.
             state.routes.unshift({
                 name: SCREENS.WORKSPACE.INITIAL,
-                params: topmostWorkspaceCentralPaneRoute?.params ?? workspacesCentralPaneParams,
+                params: workspaceCentralPane?.params,
             });
         }
     }
 
     // If the screen is wide, there should be at least two screens inside:
     // - WORKSPACE.INITIAL to cover left pane.
-    // - WORKSPACES_CENTRAL_PANE to cover central pane.
+    // - WORKSPACE.PROFILE (first workspace settings screen) to cover central pane.
     if (!isNarrowLayout) {
-        if (!isAtLeastOneInState(state, SCREENS.WORKSPACES_CENTRAL_PANE)) {
+        if (state.routes.length === 1 && state.routes[0].name === SCREENS.WORKSPACE.INITIAL) {
             // @ts-expect-error Updating read only property
             // noinspection JSConstantReassignment
             state.stale = true; // eslint-disable-line
             // Push the default settings central pane screen.
             if (state.stale === true) {
                 state.routes.push({
-                    name: SCREENS.WORKSPACES_CENTRAL_PANE,
-                    state: {
-                        routes: [
-                            {
-                                name: SCREENS.WORKSPACE.PROFILE,
-                                params: state.routes[0]?.params,
-                            },
-                        ],
-                    },
+                    name: SCREENS.WORKSPACE.PROFILE,
+                    params: state.routes[0]?.params,
                 });
             }
         }
diff --git a/src/libs/Navigation/AppNavigator/createCustomFullScreenNavigator/index.tsx b/src/libs/Navigation/AppNavigator/createCustomFullScreenNavigator/index.tsx
index f35c609402b0..7b928e4cf4df 100644
--- a/src/libs/Navigation/AppNavigator/createCustomFullScreenNavigator/index.tsx
+++ b/src/libs/Navigation/AppNavigator/createCustomFullScreenNavigator/index.tsx
@@ -29,7 +29,7 @@ function CustomFullScreenNavigator(props: FullScreenNavigatorProps) {
         }
         // We need to separately reset state of this navigator to trigger getRehydratedState.
         navigation.reset(navigation.getState());
-        // eslint-disable-next-line react-hooks/exhaustive-deps
+        // eslint-disable-next-line react-compiler/react-compiler, react-hooks/exhaustive-deps
     }, [isSmallScreenWidth]);
 
     return (
diff --git a/src/libs/Navigation/AppNavigator/createCustomStackNavigator/CustomRouter.ts b/src/libs/Navigation/AppNavigator/createCustomStackNavigator/CustomRouter.ts
index 504803026994..5b3cefb63a2d 100644
--- a/src/libs/Navigation/AppNavigator/createCustomStackNavigator/CustomRouter.ts
+++ b/src/libs/Navigation/AppNavigator/createCustomStackNavigator/CustomRouter.ts
@@ -1,12 +1,16 @@
-import type {RouterConfigOptions, StackNavigationState} from '@react-navigation/native';
-import {getPathFromState, StackRouter} from '@react-navigation/native';
+import type {CommonActions, RouterConfigOptions, StackActionType, StackNavigationState} from '@react-navigation/native';
+import {findFocusedRoute, getPathFromState, StackRouter} from '@react-navigation/native';
 import type {ParamListBase} from '@react-navigation/routers';
 import getIsNarrowLayout from '@libs/getIsNarrowLayout';
+import * as Localize from '@libs/Localize';
 import getTopmostBottomTabRoute from '@libs/Navigation/getTopmostBottomTabRoute';
 import getTopmostCentralPaneRoute from '@libs/Navigation/getTopmostCentralPaneRoute';
 import linkingConfig from '@libs/Navigation/linkingConfig';
 import getAdaptedStateFromPath from '@libs/Navigation/linkingConfig/getAdaptedStateFromPath';
 import type {NavigationPartialRoute, RootStackParamList, State} from '@libs/Navigation/types';
+import {isCentralPaneName, isOnboardingFlowName} from '@libs/NavigationUtils';
+import * as Welcome from '@userActions/Welcome';
+import CONST from '@src/CONST';
 import NAVIGATORS from '@src/NAVIGATORS';
 import SCREENS from '@src/SCREENS';
 import type {ResponsiveStackNavigatorRouterOptions} from './types';
@@ -66,8 +70,8 @@ function compareAndAdaptState(state: StackNavigationState<RootStackParamList>) {
             return;
         }
 
-        const topmostCentralPaneRoute = state.routes.filter((route) => route.name === NAVIGATORS.CENTRAL_PANE_NAVIGATOR).at(-1);
-        const templateCentralPaneRoute = templateState.routes.find((route) => route.name === NAVIGATORS.CENTRAL_PANE_NAVIGATOR);
+        const topmostCentralPaneRoute = state.routes.filter((route) => isCentralPaneName(route.name)).at(-1);
+        const templateCentralPaneRoute = templateState.routes.find((route) => isCentralPaneName(route.name));
 
         const topmostCentralPaneRouteExtracted = getTopmostCentralPaneRoute(state);
         const templateCentralPaneRouteExtracted = getTopmostCentralPaneRoute(templateState as State<RootStackParamList>);
@@ -96,6 +100,23 @@ function compareAndAdaptState(state: StackNavigationState<RootStackParamList>) {
     }
 }
 
+function shouldPreventReset(state: StackNavigationState<ParamListBase>, action: CommonActions.Action | StackActionType) {
+    if (action.type !== CONST.NAVIGATION_ACTIONS.RESET || !action?.payload) {
+        return false;
+    }
+    const currentFocusedRoute = findFocusedRoute(state);
+    const targetFocusedRoute = findFocusedRoute(action?.payload);
+
+    // We want to prevent the user from navigating back to a non-onboarding screen if they are currently on an onboarding screen
+    if (isOnboardingFlowName(currentFocusedRoute?.name) && !isOnboardingFlowName(targetFocusedRoute?.name)) {
+        Welcome.setOnboardingErrorMessage(Localize.translateLocal('onboarding.purpose.errorBackButton'));
+        // We reset the URL as the browser sets it in a way that doesn't match the navigation state
+        // eslint-disable-next-line no-restricted-globals
+        history.replaceState({}, '', getPathFromState(state, linkingConfig.config));
+        return true;
+    }
+}
+
 function CustomRouter(options: ResponsiveStackNavigatorRouterOptions) {
     const stackRouter = StackRouter(options);
 
@@ -106,6 +127,12 @@ function CustomRouter(options: ResponsiveStackNavigatorRouterOptions) {
             const state = stackRouter.getRehydratedState(partialState, {routeNames, routeParamList, routeGetIdList});
             return state;
         },
+        getStateForAction(state: StackNavigationState<ParamListBase>, action: CommonActions.Action | StackActionType, configOptions: RouterConfigOptions) {
+            if (shouldPreventReset(state, action)) {
+                return state;
+            }
+            return stackRouter.getStateForAction(state, action, configOptions);
+        },
     };
 }
 
diff --git a/src/libs/Navigation/AppNavigator/createCustomStackNavigator/index.tsx b/src/libs/Navigation/AppNavigator/createCustomStackNavigator/index.tsx
index 29b9b1072d3d..310766f80e9d 100644
--- a/src/libs/Navigation/AppNavigator/createCustomStackNavigator/index.tsx
+++ b/src/libs/Navigation/AppNavigator/createCustomStackNavigator/index.tsx
@@ -1,4 +1,4 @@
-import type {ParamListBase, StackActionHelpers, StackNavigationState} from '@react-navigation/native';
+import type {ParamListBase, RouteProp, StackActionHelpers, StackNavigationState} from '@react-navigation/native';
 import {createNavigatorFactory, useNavigationBuilder} from '@react-navigation/native';
 import type {StackNavigationEventMap, StackNavigationOptions} from '@react-navigation/stack';
 import {StackView} from '@react-navigation/stack';
@@ -9,7 +9,7 @@ import useWindowDimensions from '@hooks/useWindowDimensions';
 import getTopmostCentralPaneRoute from '@libs/Navigation/getTopmostCentralPaneRoute';
 import navigationRef from '@libs/Navigation/navigationRef';
 import type {RootStackParamList, State} from '@libs/Navigation/types';
-import NAVIGATORS from '@src/NAVIGATORS';
+import {isCentralPaneName} from '@libs/NavigationUtils';
 import SCREENS from '@src/SCREENS';
 import CustomRouter from './CustomRouter';
 import type {ResponsiveStackNavigatorProps, ResponsiveStackNavigatorRouterOptions} from './types';
@@ -21,7 +21,7 @@ function reduceCentralPaneRoutes(routes: Routes): Routes {
     const reverseRoutes = [...routes].reverse();
 
     reverseRoutes.forEach((route) => {
-        if (route.name === NAVIGATORS.CENTRAL_PANE_NAVIGATOR) {
+        if (isCentralPaneName(route.name)) {
             // Remove all central pane routes except the last 3. This will improve performance.
             if (count < 3) {
                 result.push(route);
@@ -61,20 +61,32 @@ function ResponsiveStackNavigator(props: ResponsiveStackNavigatorProps) {
     const {stateToRender, searchRoute} = useMemo(() => {
         const routes = reduceCentralPaneRoutes(state.routes);
 
-        const lastRoute = routes[routes.length - 1];
-        const isLastRouteSearchRoute = getTopmostCentralPaneRoute({routes: [lastRoute]} as State<RootStackParamList>)?.name === SCREENS.SEARCH.CENTRAL_PANE;
+        if (isSmallScreenWidth) {
+            const isSearchCentralPane = (route: RouteProp<ParamListBase>) => getTopmostCentralPaneRoute({routes: [route]} as State<RootStackParamList>)?.name === SCREENS.SEARCH.CENTRAL_PANE;
 
-        const firstRoute = routes[0];
+            const lastRoute = routes[routes.length - 1];
+            const lastSearchCentralPane = isSearchCentralPane(lastRoute) ? lastRoute : undefined;
+            const filteredRoutes = routes.filter((route) => !isSearchCentralPane(route));
+
+            // On narrow layout, if we are on /search route we want to hide all central pane routes and show only the bottom tab navigator.
+            if (lastSearchCentralPane) {
+                return {
+                    stateToRender: {
+                        ...state,
+                        index: 0,
+                        routes: [filteredRoutes[0]],
+                    },
+                    searchRoute: lastSearchCentralPane,
+                };
+            }
 
-        // On narrow layout, if we are on /search route we want to hide all central pane routes and show only the bottom tab navigator.
-        if (isSmallScreenWidth && isLastRouteSearchRoute) {
             return {
                 stateToRender: {
                     ...state,
-                    index: 0,
-                    routes: [firstRoute],
+                    index: filteredRoutes.length - 1,
+                    routes: filteredRoutes,
                 },
-                searchRoute: lastRoute,
+                searchRoute: undefined,
             };
         }
 
diff --git a/src/libs/Navigation/AppNavigator/getActionsFromPartialDiff.ts b/src/libs/Navigation/AppNavigator/getActionsFromPartialDiff.ts
index 1d0e90c041be..9685f4fc0339 100644
--- a/src/libs/Navigation/AppNavigator/getActionsFromPartialDiff.ts
+++ b/src/libs/Navigation/AppNavigator/getActionsFromPartialDiff.ts
@@ -22,12 +22,7 @@ function getActionsFromPartialDiff(diff: GetPartialStateDiffReturnType): Navigat
 
     if (centralPaneDiff) {
         // In this case we have to wrap the inner central pane route with central pane navigator.
-        actions.push(
-            StackActions.push(NAVIGATORS.CENTRAL_PANE_NAVIGATOR, {
-                screen: centralPaneDiff.name,
-                params: centralPaneDiff.params,
-            }),
-        );
+        actions.push(StackActions.push(centralPaneDiff.name, centralPaneDiff.params));
     }
 
     if (fullScreenDiff) {
diff --git a/src/libs/Navigation/AppNavigator/getPartialStateDiff.ts b/src/libs/Navigation/AppNavigator/getPartialStateDiff.ts
index 4c18e161c9a9..17a8ee158219 100644
--- a/src/libs/Navigation/AppNavigator/getPartialStateDiff.ts
+++ b/src/libs/Navigation/AppNavigator/getPartialStateDiff.ts
@@ -53,7 +53,7 @@ function getPartialStateDiff(state: State<RootStackParamList>, templateState: St
             (stateTopmostCentralPane &&
                 templateStateTopmostCentralPane &&
                 stateTopmostCentralPane.name !== templateStateTopmostCentralPane.name &&
-                !shallowCompare(stateTopmostCentralPane.params, templateStateTopmostCentralPane.params))
+                !shallowCompare(stateTopmostCentralPane.params as Record<string, unknown> | undefined, templateStateTopmostCentralPane.params as Record<string, unknown> | undefined))
         ) {
             // We need to wrap central pane routes in the central pane navigator.
             diff[NAVIGATORS.CENTRAL_PANE_NAVIGATOR] = templateStateTopmostCentralPane;
@@ -72,8 +72,8 @@ function getPartialStateDiff(state: State<RootStackParamList>, templateState: St
             (!stateTopmostFullScreen && templateStateTopmostFullScreen) ||
             (stateTopmostFullScreen &&
                 templateStateTopmostFullScreen &&
-                stateTopmostFullScreen.name !== templateStateTopmostFullScreen.name &&
-                !shallowCompare(stateTopmostFullScreen.params, templateStateTopmostFullScreen.params))
+                (stateTopmostFullScreen.name !== templateStateTopmostFullScreen.name ||
+                    !shallowCompare(stateTopmostFullScreen.params as Record<string, unknown> | undefined, templateStateTopmostFullScreen.params as Record<string, unknown> | undefined)))
         ) {
             diff[NAVIGATORS.FULL_SCREEN_NAVIGATOR] = fullScreenDiff;
         }
diff --git a/src/libs/Navigation/AppNavigator/getRootNavigatorScreenOptions.ts b/src/libs/Navigation/AppNavigator/getRootNavigatorScreenOptions.ts
index 31e4bc37971b..e09f85936385 100644
--- a/src/libs/Navigation/AppNavigator/getRootNavigatorScreenOptions.ts
+++ b/src/libs/Navigation/AppNavigator/getRootNavigatorScreenOptions.ts
@@ -1,5 +1,4 @@
 import type {StackCardInterpolationProps, StackNavigationOptions} from '@react-navigation/stack';
-import type {ViewStyle} from 'react-native';
 import type {ThemeStyles} from '@styles/index';
 import type {StyleUtilsType} from '@styles/utils';
 import variables from '@styles/variables';
@@ -61,8 +60,7 @@ const getRootNavigatorScreenOptions: GetRootNavigatorScreenOptions = (isSmallScr
                 width: '100%',
                 top: 0,
                 left: 0,
-                // We need to guarantee that it covers BottomTabBar on web, but fixed position is not supported in react native.
-                position: 'fixed' as ViewStyle['position'],
+                position: 'fixed',
             },
         }),
         leftModalNavigator: {
@@ -107,6 +105,9 @@ const getRootNavigatorScreenOptions: GetRootNavigatorScreenOptions = (isSmallScr
                 // This is necessary to cover whole screen. Including translated sidebar.
                 marginLeft: isSmallScreenWidth ? 0 : -variables.sideBarWidth,
             },
+
+            // We need to turn off animation for the full screen to avoid delay when closing screens.
+            animationEnabled: isSmallScreenWidth,
         },
 
         centralPaneNavigator: {
diff --git a/src/libs/Navigation/AppNavigator/index.native.tsx b/src/libs/Navigation/AppNavigator/index.native.tsx
new file mode 100644
index 000000000000..0da93237d617
--- /dev/null
+++ b/src/libs/Navigation/AppNavigator/index.native.tsx
@@ -0,0 +1,40 @@
+import React, {memo, useContext, useEffect} from 'react';
+import {NativeModules} from 'react-native';
+import {InitialURLContext} from '@components/InitialURLContextProvider';
+import Navigation from '@libs/Navigation/Navigation';
+import ROUTES from '@src/ROUTES';
+import type ReactComponentModule from '@src/types/utils/ReactComponentModule';
+
+type AppNavigatorProps = {
+    /** If we have an authToken this is true */
+    authenticated: boolean;
+};
+
+function AppNavigator({authenticated}: AppNavigatorProps) {
+    const initUrl = useContext(InitialURLContext);
+
+    useEffect(() => {
+        if (!NativeModules.HybridAppModule || !initUrl || !initUrl.includes(ROUTES.TRANSITION_BETWEEN_APPS)) {
+            return;
+        }
+
+        Navigation.isNavigationReady().then(() => {
+            Navigation.navigate(initUrl);
+        });
+    }, [initUrl]);
+
+    if (authenticated) {
+        const AuthScreens = require<ReactComponentModule>('./AuthScreens').default;
+
+        // These are the protected screens and only accessible when an authToken is present
+        return <AuthScreens />;
+    }
+
+    const PublicScreens = require<ReactComponentModule>('./PublicScreens').default;
+
+    return <PublicScreens />;
+}
+
+AppNavigator.displayName = 'AppNavigator';
+
+export default memo(AppNavigator);
diff --git a/src/libs/Navigation/AppNavigator/index.tsx b/src/libs/Navigation/AppNavigator/index.tsx
index 9729a2f812ce..e0f1dae94f62 100644
--- a/src/libs/Navigation/AppNavigator/index.tsx
+++ b/src/libs/Navigation/AppNavigator/index.tsx
@@ -1,7 +1,12 @@
-import React, {useContext, useEffect} from 'react';
+import React, {lazy, memo, Suspense, useContext, useEffect} from 'react';
 import {NativeModules} from 'react-native';
 import {InitialURLContext} from '@components/InitialURLContextProvider';
 import Navigation from '@libs/Navigation/Navigation';
+import ROUTES from '@src/ROUTES';
+import lazyRetry from '@src/utils/lazyRetry';
+
+const AuthScreens = lazy(() => lazyRetry(() => import('./AuthScreens')));
+const PublicScreens = lazy(() => lazyRetry(() => import('./PublicScreens')));
 
 type AppNavigatorProps = {
     /** If we have an authToken this is true */
@@ -12,7 +17,7 @@ function AppNavigator({authenticated}: AppNavigatorProps) {
     const initUrl = useContext(InitialURLContext);
 
     useEffect(() => {
-        if (!NativeModules.HybridAppModule || !initUrl) {
+        if (!NativeModules.HybridAppModule || !initUrl || !initUrl.includes(ROUTES.TRANSITION_BETWEEN_APPS)) {
             return;
         }
 
@@ -22,14 +27,21 @@ function AppNavigator({authenticated}: AppNavigatorProps) {
     }, [initUrl]);
 
     if (authenticated) {
-        const AuthScreens = require('./AuthScreens').default;
-
         // These are the protected screens and only accessible when an authToken is present
-        return <AuthScreens />;
+        return (
+            <Suspense fallback={null}>
+                <AuthScreens />
+            </Suspense>
+        );
     }
-    const PublicScreens = require('./PublicScreens').default;
-    return <PublicScreens />;
+
+    return (
+        <Suspense fallback={null}>
+            <PublicScreens />
+        </Suspense>
+    );
 }
 
 AppNavigator.displayName = 'AppNavigator';
-export default AppNavigator;
+
+export default memo(AppNavigator);
diff --git a/src/libs/Navigation/FreezeWrapper.tsx b/src/libs/Navigation/FreezeWrapper.tsx
index bb6ab107373b..fb5f769b19c1 100644
--- a/src/libs/Navigation/FreezeWrapper.tsx
+++ b/src/libs/Navigation/FreezeWrapper.tsx
@@ -2,6 +2,7 @@ import {useIsFocused, useNavigation, useRoute} from '@react-navigation/native';
 import React, {useEffect, useRef, useState} from 'react';
 import {Freeze} from 'react-freeze';
 import type ChildrenProps from '@src/types/utils/ChildrenProps';
+import shouldSetScreenBlurred from './shouldSetScreenBlurred';
 
 type FreezeWrapperProps = ChildrenProps & {
     /** Prop to disable freeze */
@@ -19,19 +20,13 @@ function FreezeWrapper({keepVisible = false, children}: FreezeWrapperProps) {
     useEffect(() => {
         const index = navigation.getState()?.routes.findIndex((route) => route.key === currentRoute.key) ?? 0;
         screenIndexRef.current = index;
-        // eslint-disable-next-line react-hooks/exhaustive-deps
+        // eslint-disable-next-line react-compiler/react-compiler, react-hooks/exhaustive-deps
     }, []);
 
     useEffect(() => {
         const unsubscribe = navigation.addListener('state', () => {
-            // if the screen is more than 1 screen away from the current screen, freeze it,
-            // we don't want to freeze the screen if it's the previous screen because the freeze placeholder
-            // would be visible at the beginning of the back animation then
-            if ((navigation.getState()?.index ?? 0) - (screenIndexRef.current ?? 0) > 1) {
-                setIsScreenBlurred(true);
-            } else {
-                setIsScreenBlurred(false);
-            }
+            const navigationIndex = (navigation.getState()?.index ?? 0) - (screenIndexRef.current ?? 0);
+            setIsScreenBlurred(shouldSetScreenBlurred(navigationIndex));
         });
         return () => unsubscribe();
     }, [isFocused, isScreenBlurred, navigation]);
diff --git a/src/libs/Navigation/Navigation.ts b/src/libs/Navigation/Navigation.ts
index 6f5e86f057d8..4bd86503fd2b 100644
--- a/src/libs/Navigation/Navigation.ts
+++ b/src/libs/Navigation/Navigation.ts
@@ -1,26 +1,32 @@
 import {findFocusedRoute} from '@react-navigation/core';
 import type {EventArg, NavigationContainerEventMap} from '@react-navigation/native';
 import {CommonActions, getPathFromState, StackActions} from '@react-navigation/native';
+import type {OnyxEntry} from 'react-native-onyx';
 import Log from '@libs/Log';
+import {isCentralPaneName, removePolicyIDParamFromState} from '@libs/NavigationUtils';
+import * as ReportConnection from '@libs/ReportConnection';
 import * as ReportUtils from '@libs/ReportUtils';
-import {getReport} from '@libs/ReportUtils';
 import CONST from '@src/CONST';
 import NAVIGATORS from '@src/NAVIGATORS';
+import ONYXKEYS from '@src/ONYXKEYS';
 import type {HybridAppRoute, Route} from '@src/ROUTES';
 import ROUTES, {HYBRID_APP_ROUTES} from '@src/ROUTES';
 import {PROTECTED_SCREENS} from '@src/SCREENS';
 import type {Report} from '@src/types/onyx';
-import type {EmptyObject} from '@src/types/utils/EmptyObject';
 import originalCloseRHPFlow from './closeRHPFlow';
 import originalDismissModal from './dismissModal';
 import originalDismissModalWithReport from './dismissModalWithReport';
+import getTopmostBottomTabRoute from './getTopmostBottomTabRoute';
+import getTopmostCentralPaneRoute from './getTopmostCentralPaneRoute';
 import originalGetTopmostReportActionId from './getTopmostReportActionID';
 import originalGetTopmostReportId from './getTopmostReportId';
 import linkingConfig from './linkingConfig';
+import getMatchingBottomTabRouteForState from './linkingConfig/getMatchingBottomTabRouteForState';
 import linkTo from './linkTo';
 import navigationRef from './navigationRef';
+import setNavigationActionToMicrotaskQueue from './setNavigationActionToMicrotaskQueue';
 import switchPolicyID from './switchPolicyID';
-import type {NavigationStateRoute, State, StateOrRoute, SwitchPolicyIDParams} from './types';
+import type {NavigationStateRoute, RootStackParamList, State, StateOrRoute, SwitchPolicyIDParams} from './types';
 
 let resolveNavigationIsReadyPromise: () => void;
 const navigationIsReadyPromise = new Promise<void>((resolve) => {
@@ -34,8 +40,8 @@ let shouldPopAllStateOnUP = false;
 /**
  * Inform the navigation that next time user presses UP we should pop all the state back to LHN.
  */
-function setShouldPopAllStateOnUP() {
-    shouldPopAllStateOnUP = true;
+function setShouldPopAllStateOnUP(shouldPopAllStateFlag: boolean) {
+    shouldPopAllStateOnUP = shouldPopAllStateFlag;
 }
 
 function canNavigate(methodName: string, params: Record<string, unknown> = {}): boolean {
@@ -58,7 +64,7 @@ const dismissModal = (reportID?: string, ref = navigationRef) => {
         originalDismissModal(ref);
         return;
     }
-    const report = getReport(reportID);
+    const report = ReportConnection.getAllReports()?.[`${ONYXKEYS.COLLECTION.REPORT}${reportID}`];
     originalDismissModalWithReport({reportID, ...report}, ref);
 };
 // Re-exporting the closeRHPFlow here to fill in default value for navigationRef. The closeRHPFlow isn't defined in this file to avoid cyclic dependencies.
@@ -67,7 +73,7 @@ const closeRHPFlow = (ref = navigationRef) => originalCloseRHPFlow(ref);
 // Re-exporting the dismissModalWithReport here to fill in default value for navigationRef. The dismissModalWithReport isn't defined in this file to avoid cyclic dependencies.
 // This method is needed because it allows to dismiss the modal and then open the report. Within this method is checked whether the report belongs to a specific workspace. Sometimes the report we want to check, hasn't been added to the Onyx yet.
 // Then we can pass the report as a param without getting it from the Onyx.
-const dismissModalWithReport = (report: Report | EmptyObject, ref = navigationRef) => originalDismissModalWithReport(report, ref);
+const dismissModalWithReport = (report: OnyxEntry<Report>, ref = navigationRef) => originalDismissModalWithReport(report, ref);
 
 /** Method for finding on which index in stack we are. */
 function getActiveRouteIndex(stateOrRoute: StateOrRoute, index?: number): number | undefined {
@@ -118,7 +124,9 @@ function getDistanceFromPathInRootNavigator(path?: string): number {
             break;
         }
 
-        const pathFromState = getPathFromState(currentState, linkingConfig.config);
+        // When comparing path and pathFromState, the policyID parameter isn't included in the comparison
+        const currentStateWithoutPolicyID = removePolicyIDParamFromState(currentState as State<RootStackParamList>);
+        const pathFromState = getPathFromState(currentStateWithoutPolicyID, linkingConfig.config);
         if (path === pathFromState.substring(1)) {
             return index;
         }
@@ -136,10 +144,6 @@ function getActiveRoute(): string {
         return '';
     }
 
-    if (currentRoute?.path) {
-        return currentRoute.path;
-    }
-
     const routeFromState = getPathFromState(navigationRef.getRootState(), linkingConfig.config);
 
     if (routeFromState) {
@@ -220,24 +224,67 @@ function goBack(fallbackRoute?: Route, shouldEnforceFallback = false, shouldPopT
         return;
     }
 
-    const isCentralPaneFocused = findFocusedRoute(navigationRef.current.getState())?.name === NAVIGATORS.CENTRAL_PANE_NAVIGATOR;
+    const isCentralPaneFocused = isCentralPaneName(findFocusedRoute(navigationRef.current.getState())?.name);
     const distanceFromPathInRootNavigator = getDistanceFromPathInRootNavigator(fallbackRoute ?? '');
 
-    // Allow CentralPane to use UP with fallback route if the path is not found in root navigator.
-    if (isCentralPaneFocused && fallbackRoute && distanceFromPathInRootNavigator === -1) {
-        navigate(fallbackRoute, CONST.NAVIGATION.TYPE.FORCED_UP);
-        return;
+    if (isCentralPaneFocused && fallbackRoute) {
+        // Allow CentralPane to use UP with fallback route if the path is not found in root navigator.
+        if (distanceFromPathInRootNavigator === -1) {
+            navigate(fallbackRoute, CONST.NAVIGATION.TYPE.UP);
+            return;
+        }
+
+        // Add possibility to go back more than one screen in root navigator if that screen is on the stack.
+        if (distanceFromPathInRootNavigator > 0) {
+            navigationRef.current.dispatch(StackActions.pop(distanceFromPathInRootNavigator));
+            return;
+        }
     }
 
-    // Add possibility to go back more than one screen in root navigator if that screen is on the stack.
-    if (isCentralPaneFocused && fallbackRoute && distanceFromPathInRootNavigator > 0) {
-        navigationRef.current.dispatch(StackActions.pop(distanceFromPathInRootNavigator));
-        return;
+    // If the central pane is focused, it's possible that we navigated from other central pane with different matching bottom tab.
+    if (isCentralPaneFocused) {
+        const rootState = navigationRef.getRootState();
+        const stateAfterPop = {routes: rootState.routes.slice(0, -1)} as State<RootStackParamList>;
+        const topmostCentralPaneRouteAfterPop = getTopmostCentralPaneRoute(stateAfterPop);
+
+        const topmostBottomTabRoute = getTopmostBottomTabRoute(rootState as State<RootStackParamList>);
+        const matchingBottomTabRoute = getMatchingBottomTabRouteForState(stateAfterPop);
+
+        // If the central pane is defined after the pop action, we need to check if it's synced with the bottom tab screen.
+        // If not, we need to pop to the bottom tab screen/screens to sync it with the new central pane.
+        if (topmostCentralPaneRouteAfterPop && topmostBottomTabRoute?.name !== matchingBottomTabRoute.name) {
+            const bottomTabNavigator = rootState.routes.find((item: NavigationStateRoute) => item.name === NAVIGATORS.BOTTOM_TAB_NAVIGATOR)?.state;
+
+            if (bottomTabNavigator && bottomTabNavigator.index) {
+                const matchingIndex = bottomTabNavigator.routes.findLastIndex((item) => item.name === matchingBottomTabRoute.name);
+                const indexToPop = matchingIndex !== -1 ? bottomTabNavigator.index - matchingIndex : undefined;
+                navigationRef.current.dispatch({...StackActions.pop(indexToPop), target: bottomTabNavigator?.key});
+            }
+        }
     }
 
     navigationRef.current.goBack();
 }
 
+/**
+ * Close the current screen and navigate to the route.
+ * If the current screen is the first screen in the navigator, we force using the fallback route to replace the current screen.
+ * It's useful in a case where we want to close an RHP and navigate to another RHP to prevent any blink effect.
+ */
+function closeAndNavigate(route: Route) {
+    if (!navigationRef.current) {
+        return;
+    }
+
+    const isFirstRouteInNavigator = !getActiveRouteIndex(navigationRef.current.getState());
+    if (isFirstRouteInNavigator) {
+        goBack(route, true);
+        return;
+    }
+    goBack();
+    navigate(route);
+}
+
 /**
  * Reset the navigation state to Home page
  */
@@ -355,12 +402,8 @@ function navigateWithSwitchPolicyID(params: SwitchPolicyIDParams) {
     return switchPolicyID(navigationRef.current, params);
 }
 
-/** Check if the modal is being displayed */
-function isDisplayedInModal() {
-    const state = navigationRef?.current?.getRootState();
-    const lastRoute = state?.routes?.at(-1);
-    const lastRouteName = lastRoute?.name;
-    return lastRouteName === NAVIGATORS.LEFT_MODAL_NAVIGATOR || lastRouteName === NAVIGATORS.RIGHT_MODAL_NAVIGATOR;
+function getTopMostCentralPaneRouteFromRootState() {
+    return getTopmostCentralPaneRoute(navigationRef.getRootState() as State<RootStackParamList>);
 }
 
 export default {
@@ -372,6 +415,7 @@ export default {
     isActiveRoute,
     getActiveRoute,
     getActiveRouteWithoutParams,
+    closeAndNavigate,
     goBack,
     isNavigationReady,
     setIsNavigationReady,
@@ -382,8 +426,9 @@ export default {
     parseHybridAppUrl,
     navigateWithSwitchPolicyID,
     resetToHome,
-    isDisplayedInModal,
     closeRHPFlow,
+    setNavigationActionToMicrotaskQueue,
+    getTopMostCentralPaneRouteFromRootState,
 };
 
 export {navigationRef};
diff --git a/src/libs/Navigation/NavigationRoot.tsx b/src/libs/Navigation/NavigationRoot.tsx
index 506eae2bdfd2..152594ba6b3e 100644
--- a/src/libs/Navigation/NavigationRoot.tsx
+++ b/src/libs/Navigation/NavigationRoot.tsx
@@ -1,22 +1,30 @@
 import type {NavigationState} from '@react-navigation/native';
 import {DefaultTheme, findFocusedRoute, NavigationContainer} from '@react-navigation/native';
 import React, {useContext, useEffect, useMemo, useRef} from 'react';
+import {useOnyx} from 'react-native-onyx';
+import HybridAppMiddleware from '@components/HybridAppMiddleware';
 import {ScrollOffsetContext} from '@components/ScrollOffsetContextProvider';
 import useActiveWorkspace from '@hooks/useActiveWorkspace';
 import useCurrentReportID from '@hooks/useCurrentReportID';
 import useTheme from '@hooks/useTheme';
 import useWindowDimensions from '@hooks/useWindowDimensions';
+import Firebase from '@libs/Firebase';
+import {FSPage} from '@libs/Fullstory';
+import hasCompletedGuidedSetupFlowSelector from '@libs/hasCompletedGuidedSetupFlowSelector';
 import Log from '@libs/Log';
 import {getPathFromURL} from '@libs/Url';
 import {updateLastVisitedPath} from '@userActions/App';
+import CONST from '@src/CONST';
+import ONYXKEYS from '@src/ONYXKEYS';
 import type {Route} from '@src/ROUTES';
-import SCREENS from '@src/SCREENS';
+import ROUTES from '@src/ROUTES';
 import AppNavigator from './AppNavigator';
 import getPolicyIDFromState from './getPolicyIDFromState';
 import linkingConfig from './linkingConfig';
 import customGetPathFromState from './linkingConfig/customGetPathFromState';
 import getAdaptedStateFromPath from './linkingConfig/getAdaptedStateFromPath';
 import Navigation, {navigationRef} from './Navigation';
+import setupCustomAndroidBackHandler from './setupCustomAndroidBackHandler';
 import type {RootStackParamList} from './types';
 
 type NavigationRootProps = {
@@ -31,6 +39,9 @@ type NavigationRootProps = {
 
     /** Fired when react-navigation is ready */
     onReady: () => void;
+
+    /** Flag to indicate if the require 2FA modal should be shown to the user */
+    shouldShowRequire2FAModal: boolean;
 };
 
 /**
@@ -45,7 +56,7 @@ function parseAndLogRoute(state: NavigationState) {
 
     const focusedRoute = findFocusedRoute(state);
 
-    if (focusedRoute?.name !== SCREENS.NOT_FOUND && focusedRoute?.name !== SCREENS.SAML_SIGN_IN) {
+    if (focusedRoute && !CONST.EXCLUDE_FROM_LAST_VISITED_PATH.includes(focusedRoute?.name)) {
         updateLastVisitedPath(currentPath);
     }
 
@@ -57,9 +68,15 @@ function parseAndLogRoute(state: NavigationState) {
     }
 
     Navigation.setIsNavigationReady();
+
+    // Fullstory Page navigation tracking
+    const focusedRouteName = focusedRoute?.name;
+    if (focusedRouteName) {
+        new FSPage(focusedRouteName, {path: currentPath}).start();
+    }
 }
 
-function NavigationRoot({authenticated, lastVisitedPath, initialUrl, onReady}: NavigationRootProps) {
+function NavigationRoot({authenticated, lastVisitedPath, initialUrl, onReady, shouldShowRequire2FAModal}: NavigationRootProps) {
     const firstRenderRef = useRef(true);
     const theme = useTheme();
     const {cleanStaleScrollOffsets} = useContext(ScrollOffsetContext);
@@ -67,26 +84,44 @@ function NavigationRoot({authenticated, lastVisitedPath, initialUrl, onReady}: N
     const currentReportIDValue = useCurrentReportID();
     const {isSmallScreenWidth} = useWindowDimensions();
     const {setActiveWorkspaceID} = useActiveWorkspace();
+    const [user] = useOnyx(ONYXKEYS.USER);
 
-    const initialState = useMemo(
-        () => {
-            if (!lastVisitedPath) {
-                return undefined;
-            }
+    const [hasCompletedGuidedSetupFlow] = useOnyx(ONYXKEYS.NVP_ONBOARDING, {
+        selector: hasCompletedGuidedSetupFlowSelector,
+    });
 
-            const path = initialUrl ? getPathFromURL(initialUrl) : null;
-
-            // For non-nullable paths we don't want to set initial state
-            if (path) {
-                return;
-            }
+    const initialState = useMemo(() => {
+        if (!user || user.isFromPublicDomain) {
+            return;
+        }
 
-            const {adaptedState} = getAdaptedStateFromPath(lastVisitedPath, linkingConfig.config);
+        // If the user haven't completed the flow, we want to always redirect them to the onboarding flow.
+        // We also make sure that the user is authenticated.
+        if (!hasCompletedGuidedSetupFlow && authenticated && !shouldShowRequire2FAModal) {
+            const {adaptedState} = getAdaptedStateFromPath(ROUTES.ONBOARDING_ROOT.route, linkingConfig.config);
             return adaptedState;
-        },
-        // eslint-disable-next-line react-hooks/exhaustive-deps
-        [],
-    );
+        }
+
+        // If there is no lastVisitedPath, we can do early return. We won't modify the default behavior.
+        if (!lastVisitedPath) {
+            return undefined;
+        }
+
+        const path = initialUrl ? getPathFromURL(initialUrl) : null;
+
+        // If the user opens the root of app "/" it will be parsed to empty string "".
+        // If the path is defined and different that empty string we don't want to modify the default behavior.
+        if (path) {
+            return;
+        }
+
+        // Otherwise we want to redirect the user to the last visited path.
+        const {adaptedState} = getAdaptedStateFromPath(lastVisitedPath, linkingConfig.config);
+        return adaptedState;
+
+        // The initialState value is relevant only on the first render.
+        // eslint-disable-next-line react-compiler/react-compiler, react-hooks/exhaustive-deps
+    }, []);
 
     // https://reactnavigation.org/docs/themes
     const navigationTheme = useMemo(
@@ -102,22 +137,25 @@ function NavigationRoot({authenticated, lastVisitedPath, initialUrl, onReady}: N
 
     useEffect(() => {
         if (firstRenderRef.current) {
+            setupCustomAndroidBackHandler();
+
             // we don't want to make the report back button go back to LHN if the user
             // started on the small screen so we don't set it on the first render
             // making it only work on consecutive changes of the screen size
             firstRenderRef.current = false;
             return;
         }
-        if (!isSmallScreenWidth) {
-            return;
-        }
-        Navigation.setShouldPopAllStateOnUP();
+
+        Navigation.setShouldPopAllStateOnUP(!isSmallScreenWidth);
     }, [isSmallScreenWidth]);
 
     const handleStateChange = (state: NavigationState | undefined) => {
         if (!state) {
             return;
         }
+        const currentRoute = navigationRef.getCurrentRoute();
+        Firebase.log(`[NAVIGATION] screen: ${currentRoute?.name}, params: ${JSON.stringify(currentRoute?.params ?? {})}`);
+
         const activeWorkspaceID = getPolicyIDFromState(state as NavigationState<RootStackParamList>);
         // Performance optimization to avoid context consumers to delay first render
         setTimeout(() => {
@@ -142,7 +180,10 @@ function NavigationRoot({authenticated, lastVisitedPath, initialUrl, onReady}: N
                 enabled: false,
             }}
         >
-            <AppNavigator authenticated={authenticated} />
+            {/* HybridAppMiddleware needs to have access to navigation ref and SplashScreenHidden context */}
+            <HybridAppMiddleware authenticated={authenticated}>
+                <AppNavigator authenticated={authenticated} />
+            </HybridAppMiddleware>
         </NavigationContainer>
     );
 }
diff --git a/src/libs/Navigation/OnyxTabNavigator.tsx b/src/libs/Navigation/OnyxTabNavigator.tsx
index 734d8ee2a373..5c5bbe201ab4 100644
--- a/src/libs/Navigation/OnyxTabNavigator.tsx
+++ b/src/libs/Navigation/OnyxTabNavigator.tsx
@@ -1,73 +1,181 @@
 import type {MaterialTopTabNavigationEventMap} from '@react-navigation/material-top-tabs';
 import {createMaterialTopTabNavigator} from '@react-navigation/material-top-tabs';
 import type {EventMapCore, NavigationState, ScreenListeners} from '@react-navigation/native';
-import React from 'react';
-import {withOnyx} from 'react-native-onyx';
-import type {OnyxEntry} from 'react-native-onyx';
+import {useRoute} from '@react-navigation/native';
+import React, {useCallback, useContext, useEffect, useState} from 'react';
+import {useOnyx} from 'react-native-onyx';
+import FocusTrapContainerElement from '@components/FocusTrap/FocusTrapContainerElement';
 import type {TabSelectorProps} from '@components/TabSelector/TabSelector';
+import useThemeStyles from '@hooks/useThemeStyles';
 import type {IOURequestType} from '@libs/actions/IOU';
 import Tab from '@userActions/Tab';
 import ONYXKEYS from '@src/ONYXKEYS';
 import type {SelectedTabRequest} from '@src/types/onyx';
 import type ChildrenProps from '@src/types/utils/ChildrenProps';
+import isLoadingOnyxValue from '@src/types/utils/isLoadingOnyxValue';
 import {defaultScreenOptions} from './OnyxTabNavigatorConfig';
 
-type OnyxTabNavigatorOnyxProps = {
-    selectedTab: OnyxEntry<SelectedTabRequest>;
-};
+type OnyxTabNavigatorProps = ChildrenProps & {
+    /** ID of the tab component to be saved in onyx */
+    id: string;
+
+    /** Name of the selected tab */
+    defaultSelectedTab?: SelectedTabRequest;
 
-type OnyxTabNavigatorProps = OnyxTabNavigatorOnyxProps &
-    ChildrenProps & {
-        /** ID of the tab component to be saved in onyx */
-        id: string;
+    /** A function triggered when a tab has been selected */
+    onTabSelected?: (newIouType: IOURequestType) => void;
 
-        /** Name of the selected tab */
-        selectedTab?: SelectedTabRequest;
+    tabBar: (props: TabSelectorProps) => React.ReactNode;
 
-        /** A function triggered when a tab has been selected */
-        onTabSelected?: (newIouType: IOURequestType) => void;
+    screenListeners?: ScreenListeners<NavigationState, MaterialTopTabNavigationEventMap>;
 
-        tabBar: (props: TabSelectorProps) => React.ReactNode;
+    /** Callback to register the focus trap container elements of the current active tab.
+     * Use this in the parent component to get the focus trap container element of the active tab,
+     * then pass it to the ScreenWrapper so that only focusable elements of the active tab are included in the focus trap
+     * Check the `IOURequestStartPage.tsx` and `NewChatSelectorPage.tsx` components for example usage
+     */
+    onActiveTabFocusTrapContainerElementChanged?: (containerElement: HTMLElement | null) => void;
 
-        screenListeners?: ScreenListeners<NavigationState, MaterialTopTabNavigationEventMap>;
-    };
+    /** Callback to register the focus trap container elements of the tab bar.
+     * This callback is useful when the custom-rendered tab bar is supporting the focus trap container element registration (which is the case of `TabSelector.tsx` component).
+     * Together, with the `onActiveTabFocusTrapContainerElementChanged` callback, we can manage the focus trap of the tab navigator in the parent component.
+     */
+    onTabBarFocusTrapContainerElementChanged?: (containerElement: HTMLElement | null) => void;
+};
 
 // eslint-disable-next-line rulesdir/no-inline-named-export
-export const TopTab = createMaterialTopTabNavigator();
+const TopTab = createMaterialTopTabNavigator();
+
+// The TabFocusTrapContext is to collect the focus trap container element of each tab screen.
+// This provider is placed in the OnyxTabNavigator component and the consumer is in the TabScreenWithFocusTrapWrapper component.
+const TabFocusTrapContext = React.createContext<(tabName: string, containerElement: HTMLElement | null) => void>(() => {});
 
 // This takes all the same props as MaterialTopTabsNavigator: https://reactnavigation.org/docs/material-top-tab-navigator/#props,
 // except ID is now required, and it gets a `selectedTab` from Onyx
-function OnyxTabNavigator({id, selectedTab, children, onTabSelected = () => {}, screenListeners, ...rest}: OnyxTabNavigatorProps) {
+// It also takes 2 more optional callbacks to manage the focus trap container elements of the tab bar and the active tab
+function OnyxTabNavigator({
+    id,
+    defaultSelectedTab,
+    tabBar: TabBar,
+    children,
+    onTabBarFocusTrapContainerElementChanged,
+    onActiveTabFocusTrapContainerElementChanged,
+    onTabSelected = () => {},
+    screenListeners,
+    ...rest
+}: OnyxTabNavigatorProps) {
+    // Mapping of tab name to focus trap container element
+    const [focusTrapContainerElementMapping, setFocusTrapContainerElementMapping] = useState<Record<string, HTMLElement>>({});
+    const [selectedTab, selectedTabResult] = useOnyx(`${ONYXKEYS.COLLECTION.SELECTED_TAB}${id}`);
+
+    // This callback is used to register the focus trap container element of each avaiable tab screen
+    const setTabFocusTrapContainerElement = useCallback((tabName: string, containerElement: HTMLElement | null) => {
+        setFocusTrapContainerElementMapping((prevMapping) => {
+            const resultMapping = {...prevMapping};
+            if (containerElement) {
+                resultMapping[tabName] = containerElement;
+            } else {
+                delete resultMapping[tabName];
+            }
+            return resultMapping;
+        });
+    }, []);
+
+    /**
+     * This is a TabBar wrapper component that includes the focus trap container element callback.
+     * In `TabSelector.tsx` component, the callback prop to register focus trap container element is supported out of the box
+     */
+    const TabBarWithFocusTrapInclusion = useCallback(
+        (props: TabSelectorProps) => {
+            return (
+                <TabBar
+                    onFocusTrapContainerElementChanged={onTabBarFocusTrapContainerElementChanged}
+                    // eslint-disable-next-line react/jsx-props-no-spreading
+                    {...props}
+                />
+            );
+        },
+        [onTabBarFocusTrapContainerElementChanged, TabBar],
+    );
+
+    // If the selected tab changes, we need to update the focus trap container element of the active tab
+    useEffect(() => {
+        onActiveTabFocusTrapContainerElementChanged?.(selectedTab ? focusTrapContainerElementMapping[selectedTab] : null);
+    }, [selectedTab, focusTrapContainerElementMapping, onActiveTabFocusTrapContainerElementChanged]);
+
+    if (isLoadingOnyxValue(selectedTabResult)) {
+        return null;
+    }
+
+    return (
+        <TabFocusTrapContext.Provider value={setTabFocusTrapContainerElement}>
+            <TopTab.Navigator
+                /* eslint-disable-next-line react/jsx-props-no-spreading */
+                {...rest}
+                id={id}
+                initialRouteName={selectedTab ?? defaultSelectedTab}
+                backBehavior="initialRoute"
+                keyboardDismissMode="none"
+                tabBar={TabBarWithFocusTrapInclusion}
+                screenListeners={{
+                    state: (e) => {
+                        const event = e as unknown as EventMapCore<NavigationState>['state'];
+                        const state = event.data.state;
+                        const index = state.index;
+                        const routeNames = state.routeNames;
+                        Tab.setSelectedTab(id, routeNames[index] as SelectedTabRequest);
+                        onTabSelected(routeNames[index] as IOURequestType);
+                    },
+                    ...(screenListeners ?? {}),
+                }}
+                screenOptions={defaultScreenOptions}
+            >
+                {children}
+            </TopTab.Navigator>
+        </TabFocusTrapContext.Provider>
+    );
+}
+
+/**
+ * We should use this wrapper for each tab screen. This will help register the focus trap container element of each tab screen.
+ * In the OnyxTabNavigator component, depending on the selected tab, we will further register the correct container element of the current active tab to the parent focus trap.
+ * This must be used if we want to include all tabbable elements of one tab screen in the parent focus trap if that tab screen is active.
+ * Example usage (check the `IOURequestStartPage.tsx` and `NewChatSelectorPage.tsx` components for more info)
+ * ```tsx
+ * <OnyxTabNavigator>
+ *   <Tab.Screen>
+ *     {() => (
+ *       <TabScreenWithFocusTrapWrapper>
+ *          <Content />
+ *        </TabScreenWithFocusTrapWrapper>
+ *     )}
+ *   </Tab.Screen>
+ * </OnyxTabNavigator>
+ * ```
+ */
+function TabScreenWithFocusTrapWrapper({children}: {children?: React.ReactNode}) {
+    const route = useRoute();
+    const styles = useThemeStyles();
+    const setTabContainerElement = useContext(TabFocusTrapContext);
+    const handleContainerElementChanged = useCallback(
+        (element: HTMLElement | null) => {
+            setTabContainerElement(route.name, element);
+        },
+        [setTabContainerElement, route.name],
+    );
+
     return (
-        <TopTab.Navigator
-            /* eslint-disable-next-line react/jsx-props-no-spreading */
-            {...rest}
-            id={id}
-            initialRouteName={selectedTab}
-            backBehavior="initialRoute"
-            keyboardDismissMode="none"
-            screenListeners={{
-                state: (e) => {
-                    const event = e as unknown as EventMapCore<NavigationState>['state'];
-                    const state = event.data.state;
-                    const index = state.index;
-                    const routeNames = state.routeNames;
-                    Tab.setSelectedTab(id, routeNames[index] as SelectedTabRequest);
-                    onTabSelected(routeNames[index] as IOURequestType);
-                },
-                ...(screenListeners ?? {}),
-            }}
-            screenOptions={defaultScreenOptions}
+        <FocusTrapContainerElement
+            onContainerElementChanged={handleContainerElementChanged}
+            style={[styles.w100, styles.h100]}
         >
             {children}
-        </TopTab.Navigator>
+        </FocusTrapContainerElement>
     );
 }
 
 OnyxTabNavigator.displayName = 'OnyxTabNavigator';
 
-export default withOnyx<OnyxTabNavigatorProps, OnyxTabNavigatorOnyxProps>({
-    selectedTab: {
-        key: ({id}) => `${ONYXKEYS.COLLECTION.SELECTED_TAB}${id}`,
-    },
-})(OnyxTabNavigator);
+export default OnyxTabNavigator;
+
+export {TabScreenWithFocusTrapWrapper, TopTab};
diff --git a/src/libs/Navigation/dismissModal.ts b/src/libs/Navigation/dismissModal.ts
index 7e88901e8b0b..dd0e512ea33d 100644
--- a/src/libs/Navigation/dismissModal.ts
+++ b/src/libs/Navigation/dismissModal.ts
@@ -24,7 +24,7 @@ function dismissModal(navigationRef: NavigationContainerRef<RootStackParamList>)
         case NAVIGATORS.ONBOARDING_MODAL_NAVIGATOR:
         case NAVIGATORS.FEATURE_TRANING_MODAL_NAVIGATOR:
         case SCREENS.NOT_FOUND:
-        case SCREENS.REPORT_ATTACHMENTS:
+        case SCREENS.ATTACHMENTS:
         case SCREENS.TRANSACTION_RECEIPT:
         case SCREENS.PROFILE_AVATAR:
         case SCREENS.WORKSPACE_AVATAR:
diff --git a/src/libs/Navigation/dismissModalWithReport.ts b/src/libs/Navigation/dismissModalWithReport.ts
index c0405c2c9da0..1579a0565726 100644
--- a/src/libs/Navigation/dismissModalWithReport.ts
+++ b/src/libs/Navigation/dismissModalWithReport.ts
@@ -2,14 +2,15 @@ import {getActionFromState} from '@react-navigation/core';
 import type {NavigationContainerRef} from '@react-navigation/native';
 import {StackActions} from '@react-navigation/native';
 import {findLastIndex} from 'lodash';
+import type {OnyxEntry} from 'react-native-onyx';
 import Log from '@libs/Log';
+import {isCentralPaneName} from '@libs/NavigationUtils';
 import getPolicyEmployeeAccountIDs from '@libs/PolicyEmployeeListUtils';
 import {doesReportBelongToWorkspace} from '@libs/ReportUtils';
 import NAVIGATORS from '@src/NAVIGATORS';
 import ROUTES from '@src/ROUTES';
 import SCREENS from '@src/SCREENS';
 import type {Report} from '@src/types/onyx';
-import type {EmptyObject} from '@src/types/utils/EmptyObject';
 import {isEmptyObject} from '@src/types/utils/EmptyObject';
 import getPolicyIDFromState from './getPolicyIDFromState';
 import getStateFromPath from './getStateFromPath';
@@ -25,7 +26,7 @@ import type {RootStackParamList, StackNavigationAction, State} from './types';
  *
  * @param targetReportID - The reportID to navigate to after dismissing the modal
  */
-function dismissModalWithReport(targetReport: Report | EmptyObject, navigationRef: NavigationContainerRef<RootStackParamList>) {
+function dismissModalWithReport(targetReport: OnyxEntry<Report>, navigationRef: NavigationContainerRef<RootStackParamList>) {
     if (!navigationRef.isReady()) {
         return;
     }
@@ -37,15 +38,15 @@ function dismissModalWithReport(targetReport: Report | EmptyObject, navigationRe
         case NAVIGATORS.LEFT_MODAL_NAVIGATOR:
         case NAVIGATORS.RIGHT_MODAL_NAVIGATOR:
         case SCREENS.NOT_FOUND:
-        case SCREENS.REPORT_ATTACHMENTS:
+        case SCREENS.ATTACHMENTS:
         case SCREENS.TRANSACTION_RECEIPT:
         case SCREENS.PROFILE_AVATAR:
         case SCREENS.WORKSPACE_AVATAR:
         case SCREENS.REPORT_AVATAR:
         case SCREENS.CONCIERGE:
             // If we are not in the target report, we need to navigate to it after dismissing the modal
-            if (targetReport.reportID !== getTopmostReportId(state)) {
-                const reportState = getStateFromPath(ROUTES.REPORT_WITH_ID.getRoute(targetReport.reportID));
+            if (targetReport?.reportID !== getTopmostReportId(state)) {
+                const reportState = getStateFromPath(ROUTES.REPORT_WITH_ID.getRoute(targetReport?.reportID ?? '-1'));
                 const policyID = getPolicyIDFromState(state as State<RootStackParamList>);
                 const policyMemberAccountIDs = getPolicyEmployeeAccountIDs(policyID);
                 const shouldOpenAllWorkspace = isEmptyObject(targetReport) ? true : !doesReportBelongToWorkspace(targetReport, policyMemberAccountIDs, policyID);
@@ -64,7 +65,7 @@ function dismissModalWithReport(targetReport: Report | EmptyObject, navigationRe
                 // If not-found page is in the route stack, we need to close it
             } else if (state.routes.some((route) => route.name === SCREENS.NOT_FOUND)) {
                 const lastRouteIndex = state.routes.length - 1;
-                const centralRouteIndex = findLastIndex(state.routes, (route) => route.name === NAVIGATORS.CENTRAL_PANE_NAVIGATOR);
+                const centralRouteIndex = findLastIndex(state.routes, (route) => isCentralPaneName(route.name));
                 navigationRef.dispatch({...StackActions.pop(lastRouteIndex - centralRouteIndex), target: state.key});
             } else {
                 navigationRef.dispatch({...StackActions.pop(), target: state.key});
diff --git a/src/libs/Navigation/extractPolicyIDFromQuery.ts b/src/libs/Navigation/extractPolicyIDFromQuery.ts
new file mode 100644
index 000000000000..bd0464f4aab6
--- /dev/null
+++ b/src/libs/Navigation/extractPolicyIDFromQuery.ts
@@ -0,0 +1,22 @@
+import * as SearchUtils from '@libs/SearchUtils';
+import type {NavigationPartialRoute} from './types';
+
+function extractPolicyIDFromQuery(route?: NavigationPartialRoute<string>) {
+    if (!route?.params) {
+        return undefined;
+    }
+
+    if (!('q' in route.params)) {
+        return undefined;
+    }
+
+    const queryString = route.params.q as string;
+    const queryJSON = SearchUtils.buildSearchQueryJSON(queryString);
+    if (!queryJSON) {
+        return undefined;
+    }
+
+    return SearchUtils.getPolicyIDFromSearchQuery(queryJSON);
+}
+
+export default extractPolicyIDFromQuery;
diff --git a/src/libs/Navigation/extrapolateStateFromParams.ts b/src/libs/Navigation/extrapolateStateFromParams.ts
new file mode 100644
index 000000000000..6ad13b10a5f0
--- /dev/null
+++ b/src/libs/Navigation/extrapolateStateFromParams.ts
@@ -0,0 +1,30 @@
+import type {InitialState} from '@react-navigation/native';
+
+/**
+ * It's possible that information from params about which screen we want to open is not in the state yet.
+ * In that case this function will state with information from params.
+ * This will help us with comparing one state to another.
+ * e.g. making sure that we are not navigating to the same screen twice.
+ * @param state - react-navigation state
+ */
+function extrapolateStateFromParams(state: InitialState) {
+    let current: InitialState | undefined = state;
+
+    while (current?.routes != null) {
+        const topRoute: InitialState['routes'][0] = current.routes[current.index ?? 0];
+        const params = topRoute?.params;
+        if (topRoute.state != null) {
+            current = topRoute.state;
+        } else if (params != null && 'screen' in params && typeof params.screen === 'string') {
+            // eslint-disable-next-line @typescript-eslint/ban-types
+            topRoute.state = {routes: [{name: params.screen, params: 'params' in params ? (params.params as object) : undefined}]};
+            current = topRoute.state;
+        } else {
+            break;
+        }
+    }
+
+    return state;
+}
+
+export default extrapolateStateFromParams;
diff --git a/src/libs/Navigation/getOnboardingModalScreenOptions/index.native.ts b/src/libs/Navigation/getOnboardingModalScreenOptions/index.native.ts
index 170a2f1c5865..98dd131a9332 100644
--- a/src/libs/Navigation/getOnboardingModalScreenOptions/index.native.ts
+++ b/src/libs/Navigation/getOnboardingModalScreenOptions/index.native.ts
@@ -3,7 +3,10 @@ import type {ThemeStyles} from '@styles/index';
 import type {StyleUtilsType} from '@styles/utils';
 
 function getOnboardingModalScreenOptions(isSmallScreenWidth: boolean, styles: ThemeStyles, StyleUtils: StyleUtilsType) {
-    return getRootNavigatorScreenOptions(isSmallScreenWidth, styles, StyleUtils).fullScreen;
+    return {
+        ...getRootNavigatorScreenOptions(isSmallScreenWidth, styles, StyleUtils).fullScreen,
+        gestureEnabled: false,
+    };
 }
 
 export default getOnboardingModalScreenOptions;
diff --git a/src/libs/Navigation/getPolicyIDFromState.ts b/src/libs/Navigation/getPolicyIDFromState.ts
index 00236fb0fce0..62690f29a98f 100644
--- a/src/libs/Navigation/getPolicyIDFromState.ts
+++ b/src/libs/Navigation/getPolicyIDFromState.ts
@@ -1,16 +1,23 @@
+import extractPolicyIDFromQuery from './extractPolicyIDFromQuery';
 import getTopmostBottomTabRoute from './getTopmostBottomTabRoute';
 import type {RootStackParamList, State} from './types';
 
+/**
+ * returns policyID value if one exists in navigation state
+ *
+ * PolicyID in this app can be stored in two ways:
+ *  - on most screens but NOT Search as `policyID` param
+ *  - on Search related screens as policyID filter inside `q` (SearchQuery) param
+ */
 const getPolicyIDFromState = (state: State<RootStackParamList>): string | undefined => {
     const topmostBottomTabRoute = getTopmostBottomTabRoute(state);
 
-    const shouldAddPolicyIDToUrl = !!topmostBottomTabRoute && !!topmostBottomTabRoute.params && 'policyID' in topmostBottomTabRoute.params && !!topmostBottomTabRoute.params?.policyID;
-
-    if (!shouldAddPolicyIDToUrl) {
-        return undefined;
+    const policyID = topmostBottomTabRoute && topmostBottomTabRoute.params && 'policyID' in topmostBottomTabRoute.params && topmostBottomTabRoute.params?.policyID;
+    if (policyID) {
+        return topmostBottomTabRoute.params?.policyID as string;
     }
 
-    return topmostBottomTabRoute.params?.policyID as string;
+    return extractPolicyIDFromQuery(topmostBottomTabRoute);
 };
 
 export default getPolicyIDFromState;
diff --git a/src/libs/Navigation/getTopmostCentralPaneRoute.ts b/src/libs/Navigation/getTopmostCentralPaneRoute.ts
index 934cca1a673e..5ac72281eaf6 100644
--- a/src/libs/Navigation/getTopmostCentralPaneRoute.ts
+++ b/src/libs/Navigation/getTopmostCentralPaneRoute.ts
@@ -1,4 +1,4 @@
-import NAVIGATORS from '@src/NAVIGATORS';
+import {isCentralPaneName} from '@libs/NavigationUtils';
 import type {CentralPaneName, NavigationPartialRoute, RootStackParamList, State} from './types';
 
 // Get the name of topmost central pane route in the navigation stack.
@@ -7,24 +7,13 @@ function getTopmostCentralPaneRoute(state: State<RootStackParamList>): Navigatio
         return;
     }
 
-    const topmostCentralPane = state.routes.filter((route) => route.name === NAVIGATORS.CENTRAL_PANE_NAVIGATOR).at(-1);
+    const topmostCentralPane = state.routes.filter((route) => isCentralPaneName(route.name)).at(-1);
 
     if (!topmostCentralPane) {
         return;
     }
 
-    if (!!topmostCentralPane.params && 'screen' in topmostCentralPane.params) {
-        return {name: topmostCentralPane.params.screen as CentralPaneName, params: topmostCentralPane.params.params};
-    }
-
-    if (!topmostCentralPane.state) {
-        return;
-    }
-
-    // There will be at least one route in the central pane navigator.
-    const {name, params} = topmostCentralPane.state.routes.at(-1) as NavigationPartialRoute<CentralPaneName>;
-
-    return {name, params};
+    return topmostCentralPane as NavigationPartialRoute<CentralPaneName>;
 }
 
 export default getTopmostCentralPaneRoute;
diff --git a/src/libs/Navigation/getTopmostFullScreenRoute.ts b/src/libs/Navigation/getTopmostFullScreenRoute.ts
index 25c74ea0ce6b..fcc28ce76926 100644
--- a/src/libs/Navigation/getTopmostFullScreenRoute.ts
+++ b/src/libs/Navigation/getTopmostFullScreenRoute.ts
@@ -13,18 +13,16 @@ function getTopmostFullScreenRoute(state: State<RootStackParamList>): Navigation
         return;
     }
 
-    if (!!topmostFullScreenRoute.params && 'screen' in topmostFullScreenRoute.params) {
-        return {name: topmostFullScreenRoute.params.screen as FullScreenName, params: topmostFullScreenRoute.params.params};
-    }
+    if (topmostFullScreenRoute.state) {
+        // There will be at least one route in the fullscreen navigator.
+        const {name, params} = topmostFullScreenRoute.state.routes.at(-1) as NavigationPartialRoute<FullScreenName>;
 
-    if (!topmostFullScreenRoute.state) {
-        return;
+        return {name, params};
     }
 
-    // There will be at least one route in the fullscreen navigator.
-    const {name, params} = topmostFullScreenRoute.state.routes.at(-1) as NavigationPartialRoute<FullScreenName>;
-
-    return {name, params};
+    if (!!topmostFullScreenRoute.params && 'screen' in topmostFullScreenRoute.params) {
+        return {name: topmostFullScreenRoute.params.screen as FullScreenName, params: topmostFullScreenRoute.params.params};
+    }
 }
 
 export default getTopmostFullScreenRoute;
diff --git a/src/libs/Navigation/getTopmostNestedRHPRoute.ts b/src/libs/Navigation/getTopmostNestedRHPRoute.ts
deleted file mode 100644
index 4edcb4e7001e..000000000000
--- a/src/libs/Navigation/getTopmostNestedRHPRoute.ts
+++ /dev/null
@@ -1,25 +0,0 @@
-import NAVIGATORS from '@src/NAVIGATORS';
-import type {NavigationPartialRoute, State} from './types';
-
-/**
- * @param state - react-navigation state
- */
-const getTopmostNestedRHPRoute = (state: State): NavigationPartialRoute | undefined => {
-    const topmostRightPane = state.routes.filter((route) => route.name === NAVIGATORS.RIGHT_MODAL_NAVIGATOR).at(-1);
-
-    if (topmostRightPane?.state) {
-        return getTopmostNestedRHPRoute(topmostRightPane.state);
-    }
-
-    const topmostRoute = state.routes.at(-1);
-
-    if (topmostRoute?.state) {
-        return getTopmostNestedRHPRoute(topmostRoute.state);
-    }
-
-    if (topmostRoute) {
-        return {name: topmostRoute.name, params: topmostRoute.params};
-    }
-};
-
-export default getTopmostNestedRHPRoute;
diff --git a/src/libs/Navigation/getTopmostReportActionID.ts b/src/libs/Navigation/getTopmostReportActionID.ts
index a1527a5f36b8..d3c6e41887d8 100644
--- a/src/libs/Navigation/getTopmostReportActionID.ts
+++ b/src/libs/Navigation/getTopmostReportActionID.ts
@@ -1,5 +1,5 @@
 import type {NavigationState, PartialState} from '@react-navigation/native';
-import NAVIGATORS from '@src/NAVIGATORS';
+import {isCentralPaneName} from '@libs/NavigationUtils';
 import SCREENS from '@src/SCREENS';
 import type {RootStackParamList} from './types';
 
@@ -16,12 +16,12 @@ function getTopmostReportActionID(state: NavigationState | NavigationState<RootS
         return;
     }
 
-    const topmostCentralPane = state.routes.filter((route) => route.name === NAVIGATORS.CENTRAL_PANE_NAVIGATOR).at(-1);
+    const topmostCentralPane = state.routes.filter((route) => isCentralPaneName(route.name)).at(-1);
     if (!topmostCentralPane) {
         return;
     }
 
-    const directReportParams = topmostCentralPane.params && 'params' in topmostCentralPane.params && topmostCentralPane?.params?.params;
+    const directReportParams = topmostCentralPane.params;
     const directReportActionIDParam = directReportParams && 'reportActionID' in directReportParams && directReportParams?.reportActionID;
 
     if (!topmostCentralPane.state && !directReportActionIDParam) {
diff --git a/src/libs/Navigation/getTopmostReportId.ts b/src/libs/Navigation/getTopmostReportId.ts
index aac8e7654865..dc53d040f087 100644
--- a/src/libs/Navigation/getTopmostReportId.ts
+++ b/src/libs/Navigation/getTopmostReportId.ts
@@ -1,5 +1,5 @@
 import type {NavigationState, PartialState} from '@react-navigation/native';
-import NAVIGATORS from '@src/NAVIGATORS';
+import {isCentralPaneName} from '@libs/NavigationUtils';
 import SCREENS from '@src/SCREENS';
 import type {RootStackParamList} from './types';
 
@@ -16,12 +16,12 @@ function getTopmostReportId(state: NavigationState | NavigationState<RootStackPa
         return;
     }
 
-    const topmostCentralPane = state.routes?.filter((route) => route.name === NAVIGATORS.CENTRAL_PANE_NAVIGATOR).at(-1);
+    const topmostCentralPane = state.routes?.filter((route) => isCentralPaneName(route.name)).at(-1);
     if (!topmostCentralPane) {
         return;
     }
 
-    const directReportParams = topmostCentralPane.params && 'params' in topmostCentralPane.params && topmostCentralPane?.params?.params;
+    const directReportParams = topmostCentralPane.params;
     const directReportIdParam = directReportParams && 'reportID' in directReportParams && directReportParams?.reportID;
 
     if (!topmostCentralPane.state && !directReportIdParam) {
diff --git a/src/libs/Navigation/getTopmostWorkspacesCentralPaneName.ts b/src/libs/Navigation/getTopmostWorkspacesCentralPaneName.ts
deleted file mode 100644
index db11368c1345..000000000000
--- a/src/libs/Navigation/getTopmostWorkspacesCentralPaneName.ts
+++ /dev/null
@@ -1,27 +0,0 @@
-import type {NavigationState, PartialState} from '@react-navigation/native';
-import SCREENS from '@src/SCREENS';
-
-// Get the name of topmost report in the navigation stack.
-function getTopmostWorkspacesCentralPaneName(state: NavigationState | PartialState<NavigationState>): string | undefined {
-    if (!state) {
-        return;
-    }
-
-    const topmostCentralPane = state.routes.filter((route) => typeof route !== 'number' && 'name' in route && route.name === SCREENS.WORKSPACES_CENTRAL_PANE).at(-1);
-
-    if (!topmostCentralPane) {
-        return;
-    }
-
-    if (!!topmostCentralPane.params && 'screen' in topmostCentralPane.params && typeof topmostCentralPane.params.screen === 'string') {
-        return topmostCentralPane.params.screen;
-    }
-
-    if (!topmostCentralPane.state) {
-        return;
-    }
-
-    return topmostCentralPane.state?.routes.at(-1)?.name;
-}
-
-export default getTopmostWorkspacesCentralPaneName;
diff --git a/src/libs/Navigation/isReportOpenInRHP.ts b/src/libs/Navigation/isReportOpenInRHP.ts
new file mode 100644
index 000000000000..51e8a95bb66b
--- /dev/null
+++ b/src/libs/Navigation/isReportOpenInRHP.ts
@@ -0,0 +1,17 @@
+import type {NavigationState} from '@react-navigation/native';
+import NAVIGATORS from '@src/NAVIGATORS';
+import SCREENS from '@src/SCREENS';
+
+const isReportOpenInRHP = (state: NavigationState | undefined): boolean => {
+    const lastRoute = state?.routes?.at(-1);
+    if (!lastRoute) {
+        return false;
+    }
+    const params = lastRoute.params;
+    if (params && 'screen' in params && typeof params.screen === 'string' && params.screen === SCREENS.RIGHT_MODAL.SEARCH_REPORT) {
+        return true;
+    }
+    return !!(lastRoute.name === NAVIGATORS.RIGHT_MODAL_NAVIGATOR && lastRoute.state?.routes?.some((route) => route?.name === SCREENS.RIGHT_MODAL.SEARCH_REPORT));
+};
+
+export default isReportOpenInRHP;
diff --git a/src/libs/Navigation/isSearchTopmostCentralPane.ts b/src/libs/Navigation/isSearchTopmostCentralPane.ts
new file mode 100644
index 000000000000..3c315116bb00
--- /dev/null
+++ b/src/libs/Navigation/isSearchTopmostCentralPane.ts
@@ -0,0 +1,22 @@
+import SCREENS from '@src/SCREENS';
+import getTopmostCentralPaneRoute from './getTopmostCentralPaneRoute';
+import {navigationRef} from './Navigation';
+import type {RootStackParamList, State} from './types';
+
+const isSearchTopmostCentralPane = (): boolean => {
+    const rootState = navigationRef.getRootState() as State<RootStackParamList>;
+
+    if (!rootState) {
+        return false;
+    }
+
+    const topmostCentralPaneRoute = getTopmostCentralPaneRoute(rootState);
+
+    if (topmostCentralPaneRoute?.name === SCREENS.SEARCH.CENTRAL_PANE) {
+        return true;
+    }
+
+    return false;
+};
+
+export default isSearchTopmostCentralPane;
diff --git a/src/libs/Navigation/isSideModalNavigator.ts b/src/libs/Navigation/isSideModalNavigator.ts
new file mode 100644
index 000000000000..d3119d70bf5d
--- /dev/null
+++ b/src/libs/Navigation/isSideModalNavigator.ts
@@ -0,0 +1,7 @@
+import NAVIGATORS from '@src/NAVIGATORS';
+
+function isSideModalNavigator(targetNavigator?: string) {
+    return targetNavigator === NAVIGATORS.LEFT_MODAL_NAVIGATOR || targetNavigator === NAVIGATORS.RIGHT_MODAL_NAVIGATOR;
+}
+
+export default isSideModalNavigator;
diff --git a/src/libs/Navigation/linkTo.ts b/src/libs/Navigation/linkTo.ts
deleted file mode 100644
index 4bddbaf044e7..000000000000
--- a/src/libs/Navigation/linkTo.ts
+++ /dev/null
@@ -1,266 +0,0 @@
-import {getActionFromState} from '@react-navigation/core';
-import type {NavigationAction, NavigationContainerRef, NavigationState, PartialState} from '@react-navigation/native';
-import {omitBy} from 'lodash';
-import type {Writable} from 'type-fest';
-import getIsNarrowLayout from '@libs/getIsNarrowLayout';
-import shallowCompare from '@libs/ObjectUtils';
-import {extractPolicyIDFromPath, getPathWithoutPolicyID} from '@libs/PolicyUtils';
-import CONST from '@src/CONST';
-import NAVIGATORS from '@src/NAVIGATORS';
-import type {Route} from '@src/ROUTES';
-import getActionsFromPartialDiff from './AppNavigator/getActionsFromPartialDiff';
-import getPartialStateDiff from './AppNavigator/getPartialStateDiff';
-import dismissModal from './dismissModal';
-import getPolicyIDFromState from './getPolicyIDFromState';
-import getStateFromPath from './getStateFromPath';
-import getTopmostBottomTabRoute from './getTopmostBottomTabRoute';
-import getTopmostCentralPaneRoute from './getTopmostCentralPaneRoute';
-import linkingConfig from './linkingConfig';
-import getAdaptedStateFromPath from './linkingConfig/getAdaptedStateFromPath';
-import getMatchingBottomTabRouteForState from './linkingConfig/getMatchingBottomTabRouteForState';
-import getMatchingCentralPaneRouteForState from './linkingConfig/getMatchingCentralPaneRouteForState';
-import replacePathInNestedState from './linkingConfig/replacePathInNestedState';
-import type {NavigationRoot, RootStackParamList, StackNavigationAction, State} from './types';
-
-type ActionPayloadParams = {
-    screen?: string;
-    params?: unknown;
-    path?: string;
-};
-
-type ActionPayload = {
-    params?: ActionPayloadParams;
-};
-
-/**
- * Motivation for this function is described in NAVIGATION.md
- *
- * @param action action generated by getActionFromState
- * @param state The root state
- * @returns minimalAction minimal action is the action that we should dispatch
- */
-function getMinimalAction(action: NavigationAction, state: NavigationState): Writable<NavigationAction> {
-    let currentAction: NavigationAction = action;
-    let currentState: State | undefined = state;
-    let currentTargetKey: string | undefined;
-
-    while (currentAction.payload && 'name' in currentAction.payload && currentState?.routes[currentState.index ?? -1].name === currentAction.payload.name) {
-        if (!currentState?.routes[currentState.index ?? -1].state) {
-            break;
-        }
-
-        currentState = currentState?.routes[currentState.index ?? -1].state;
-        currentTargetKey = currentState?.key;
-
-        const payload = currentAction.payload as ActionPayload;
-
-        // Creating new smaller action
-        currentAction = {
-            type: currentAction.type,
-            payload: {
-                name: payload?.params?.screen,
-                params: payload?.params?.params,
-                path: payload?.params?.path,
-            },
-            target: currentTargetKey,
-        };
-    }
-    return currentAction;
-}
-
-// Because we need to change the type to push, we also need to set target for this action to the bottom tab navigator.
-function getActionForBottomTabNavigator(
-    action: StackNavigationAction,
-    state: NavigationState<RootStackParamList>,
-    policyID?: string,
-    shouldNavigate?: boolean,
-): Writable<NavigationAction> | undefined {
-    const bottomTabNavigatorRoute = state.routes.at(0);
-
-    if (!bottomTabNavigatorRoute || bottomTabNavigatorRoute.state === undefined || !action || action.type !== CONST.NAVIGATION.ACTION_TYPE.NAVIGATE) {
-        return;
-    }
-
-    const params = action.payload.params as ActionPayloadParams;
-    let payloadParams = params.params as Record<string, string | undefined>;
-    const screen = params.screen;
-
-    if (!payloadParams) {
-        payloadParams = {policyID};
-    } else if (!('policyID' in payloadParams && !!payloadParams?.policyID)) {
-        payloadParams = {...payloadParams, policyID};
-    }
-
-    // Check if the current bottom tab is the same as the one we want to navigate to. If it is, we don't need to do anything.
-    const bottomTabCurrentTab = getTopmostBottomTabRoute(state);
-    const bottomTabParams = bottomTabCurrentTab?.params as Record<string, string | undefined>;
-
-    // Verify if the policyID is different than the one we are currently on. If it is, we need to navigate to the new policyID.
-    const isNewPolicy = bottomTabParams?.policyID !== payloadParams?.policyID;
-    if (bottomTabCurrentTab?.name === screen && !shouldNavigate && !isNewPolicy) {
-        return;
-    }
-
-    return {
-        type: CONST.NAVIGATION.ACTION_TYPE.PUSH,
-        payload: {
-            name: screen,
-            params: payloadParams,
-        },
-        target: bottomTabNavigatorRoute.state.key,
-    };
-}
-
-function isModalNavigator(targetNavigator?: string) {
-    return targetNavigator === NAVIGATORS.LEFT_MODAL_NAVIGATOR || targetNavigator === NAVIGATORS.RIGHT_MODAL_NAVIGATOR;
-}
-
-export default function linkTo(navigation: NavigationContainerRef<RootStackParamList> | null, path: Route, type?: string, isActiveRoute?: boolean) {
-    if (!navigation) {
-        throw new Error("Couldn't find a navigation object. Is your component inside a screen in a navigator?");
-    }
-    let root: NavigationRoot = navigation;
-    let current: NavigationRoot | undefined;
-    // Traverse up to get the root navigation
-    // eslint-disable-next-line no-cond-assign
-    while ((current = root.getParent())) {
-        root = current;
-    }
-    const pathWithoutPolicyID = getPathWithoutPolicyID(`/${path}`) as Route;
-    const rootState = navigation.getRootState() as NavigationState<RootStackParamList>;
-    const stateFromPath = getStateFromPath(pathWithoutPolicyID) as PartialState<NavigationState<RootStackParamList>>;
-
-    // Creating path with /w/ included if necessary.
-    const extractedPolicyID = extractPolicyIDFromPath(`/${path}`);
-    const policyIDFromState = getPolicyIDFromState(rootState);
-    const policyID = extractedPolicyID ?? policyIDFromState;
-
-    const isNarrowLayout = getIsNarrowLayout();
-
-    const isFullScreenOnTop = rootState.routes?.at(-1)?.name === NAVIGATORS.FULL_SCREEN_NAVIGATOR;
-
-    if (policyID && !isFullScreenOnTop) {
-        // The stateFromPath doesn't include proper path if there is a policy passed with /w/id.
-        // We need to replace the path in the state with the proper one.
-        // To avoid this hacky solution we may want to create custom getActionFromState function in the future.
-        replacePathInNestedState(stateFromPath, `/w/${policyID}${pathWithoutPolicyID}`);
-    }
-
-    const action: StackNavigationAction = getActionFromState(stateFromPath, linkingConfig.config);
-    // If action type is different than NAVIGATE we can't change it to the PUSH safely
-    if (action?.type === CONST.NAVIGATION.ACTION_TYPE.NAVIGATE) {
-        const topmostCentralPaneRoute = getTopmostCentralPaneRoute(rootState);
-        const topRouteName = rootState?.routes?.at(-1)?.name;
-        const isTargetNavigatorOnTop = topRouteName === action.payload.name;
-
-        const isTargetScreenDifferentThanCurrent = Boolean(topmostCentralPaneRoute && topmostCentralPaneRoute.name !== action.payload.params?.screen);
-        const areParamsDifferent = !shallowCompare(
-            omitBy(topmostCentralPaneRoute?.params, (value) => value === undefined),
-            omitBy(action.payload.params?.params, (value) => value === undefined),
-        );
-        // In case if type is 'FORCED_UP' we replace current screen with the provided. This means the current screen no longer exists in the stack
-        if (type === CONST.NAVIGATION.TYPE.FORCED_UP) {
-            action.type = CONST.NAVIGATION.ACTION_TYPE.REPLACE;
-
-            // If this action is navigating to the report screen and the top most navigator is different from the one we want to navigate - PUSH the new screen to the top of the stack
-        } else if (action.payload.name === NAVIGATORS.CENTRAL_PANE_NAVIGATOR && (isTargetScreenDifferentThanCurrent || areParamsDifferent)) {
-            // We need to push a tab if the tab doesn't match the central pane route that we are going to push.
-            const topmostBottomTabRoute = getTopmostBottomTabRoute(rootState);
-            const matchingBottomTabRoute = getMatchingBottomTabRouteForState(stateFromPath, policyID);
-            const isNewPolicyID =
-                (topmostBottomTabRoute?.params as Record<string, string | undefined>)?.policyID !== (matchingBottomTabRoute?.params as Record<string, string | undefined>)?.policyID;
-            if (topmostBottomTabRoute && (topmostBottomTabRoute.name !== matchingBottomTabRoute.name || isNewPolicyID)) {
-                root.dispatch({
-                    type: CONST.NAVIGATION.ACTION_TYPE.PUSH,
-                    payload: matchingBottomTabRoute,
-                });
-            }
-
-            action.type = CONST.NAVIGATION.ACTION_TYPE.PUSH;
-
-            // If the type is UP, we deeplinked into one of the RHP flows and we want to replace the current screen with the previous one in the flow
-            // and at the same time we want the back button to go to the page we were before the deeplink
-        } else if (type === CONST.NAVIGATION.TYPE.UP) {
-            action.type = CONST.NAVIGATION.ACTION_TYPE.REPLACE;
-
-            // If this action is navigating to ModalNavigator or FullScreenNavigator and the last route on the root navigator is not already opened Navigator then push
-        } else if ((action.payload.name === NAVIGATORS.FULL_SCREEN_NAVIGATOR || isModalNavigator(action.payload.name)) && !isTargetNavigatorOnTop) {
-            if (isModalNavigator(topRouteName)) {
-                dismissModal(navigation);
-            }
-
-            // If this RHP has mandatory central pane and bottom tab screens defined we need to push them.
-            const {adaptedState, metainfo} = getAdaptedStateFromPath(path, linkingConfig.config);
-            if (adaptedState && (metainfo.isCentralPaneAndBottomTabMandatory || metainfo.isFullScreenNavigatorMandatory)) {
-                const diff = getPartialStateDiff(rootState, adaptedState as State<RootStackParamList>, metainfo);
-                const diffActions = getActionsFromPartialDiff(diff);
-                for (const diffAction of diffActions) {
-                    root.dispatch(diffAction);
-                }
-            }
-            // All actions related to FullScreenNavigator on wide screen are pushed when comparing differences between rootState and adaptedState.
-            if (action.payload.name === NAVIGATORS.FULL_SCREEN_NAVIGATOR && !isNarrowLayout) {
-                return;
-            }
-            action.type = CONST.NAVIGATION.ACTION_TYPE.PUSH;
-
-            // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
-        } else if (action.payload.name === NAVIGATORS.BOTTOM_TAB_NAVIGATOR) {
-            // If path contains a policyID, we should invoke the navigate function
-            const shouldNavigate = !!extractedPolicyID;
-            const actionForBottomTabNavigator = getActionForBottomTabNavigator(action, rootState, policyID, shouldNavigate);
-
-            if (!actionForBottomTabNavigator) {
-                return;
-            }
-
-            root.dispatch(actionForBottomTabNavigator);
-
-            // If the layout is wide we need to push matching central pane route to the stack.
-            if (!isNarrowLayout) {
-                // stateFromPath should always include bottom tab navigator state, so getMatchingCentralPaneRouteForState will be always defined.
-                // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
-                const matchingCentralPaneRoute = getMatchingCentralPaneRouteForState(stateFromPath, rootState)!;
-                if (matchingCentralPaneRoute && 'name' in matchingCentralPaneRoute) {
-                    root.dispatch({
-                        type: CONST.NAVIGATION.ACTION_TYPE.PUSH,
-                        payload: {
-                            name: NAVIGATORS.CENTRAL_PANE_NAVIGATOR,
-                            params: {
-                                screen: matchingCentralPaneRoute.name,
-                                params: matchingCentralPaneRoute.params,
-                            },
-                        },
-                    });
-                }
-            } else {
-                // If the layout is small we need to pop everything from the central pane so the bottom tab navigator is visible.
-                root.dispatch({
-                    type: 'POP_TO_TOP',
-                    target: rootState.key,
-                });
-            }
-            return;
-        }
-    }
-
-    if (action && 'payload' in action && action.payload && 'name' in action.payload && isModalNavigator(action.payload.name)) {
-        const minimalAction = getMinimalAction(action, navigation.getRootState());
-        if (minimalAction) {
-            // There are situations where a route already exists on the current navigation stack
-            // But we want to push the same route instead of going back in the stack
-            // Which would break the user navigation history
-            if (!isActiveRoute && type === CONST.NAVIGATION.ACTION_TYPE.PUSH) {
-                minimalAction.type = CONST.NAVIGATION.ACTION_TYPE.PUSH;
-            }
-            root.dispatch(minimalAction);
-            return;
-        }
-    }
-
-    if (action !== undefined) {
-        root.dispatch(action);
-    } else {
-        root.reset(stateFromPath);
-    }
-}
diff --git a/src/libs/Navigation/linkTo/getActionForBottomTabNavigator.ts b/src/libs/Navigation/linkTo/getActionForBottomTabNavigator.ts
new file mode 100644
index 000000000000..85580d068ad7
--- /dev/null
+++ b/src/libs/Navigation/linkTo/getActionForBottomTabNavigator.ts
@@ -0,0 +1,50 @@
+import type {NavigationAction, NavigationState} from '@react-navigation/native';
+import type {Writable} from 'type-fest';
+import type {RootStackParamList, StackNavigationAction} from '@libs/Navigation/types';
+import getTopmostBottomTabRoute from '@navigation/getTopmostBottomTabRoute';
+import CONST from '@src/CONST';
+import type {ActionPayloadParams} from './types';
+
+// Because we need to change the type to push, we also need to set target for this action to the bottom tab navigator.
+function getActionForBottomTabNavigator(
+    action: StackNavigationAction,
+    state: NavigationState<RootStackParamList>,
+    policyID?: string,
+    shouldNavigate?: boolean,
+): Writable<NavigationAction> | undefined {
+    const bottomTabNavigatorRoute = state.routes.at(0);
+    if (!bottomTabNavigatorRoute || bottomTabNavigatorRoute.state === undefined || !action || action.type !== CONST.NAVIGATION.ACTION_TYPE.NAVIGATE) {
+        return;
+    }
+
+    const params = action.payload.params as ActionPayloadParams;
+    let payloadParams = params.params as Record<string, string | undefined>;
+    const screen = params.screen;
+
+    if (policyID && !payloadParams?.policyID) {
+        payloadParams = {...payloadParams, policyID};
+    } else if (!policyID) {
+        delete payloadParams?.policyID;
+    }
+
+    // Check if the current bottom tab is the same as the one we want to navigate to. If it is, we don't need to do anything.
+    const bottomTabCurrentTab = getTopmostBottomTabRoute(state);
+    const bottomTabParams = bottomTabCurrentTab?.params as Record<string, string | undefined>;
+
+    // Verify if the policyID is different than the one we are currently on. If it is, we need to navigate to the new policyID.
+    const isNewPolicy = bottomTabParams?.policyID !== payloadParams?.policyID;
+    if (bottomTabCurrentTab?.name === screen && !shouldNavigate && !isNewPolicy) {
+        return;
+    }
+
+    return {
+        type: CONST.NAVIGATION.ACTION_TYPE.PUSH,
+        payload: {
+            name: screen,
+            params: payloadParams,
+        },
+        target: bottomTabNavigatorRoute.state.key,
+    };
+}
+
+export default getActionForBottomTabNavigator;
diff --git a/src/libs/Navigation/linkTo/getMinimalAction.ts b/src/libs/Navigation/linkTo/getMinimalAction.ts
new file mode 100644
index 000000000000..ff01b3b8333b
--- /dev/null
+++ b/src/libs/Navigation/linkTo/getMinimalAction.ts
@@ -0,0 +1,42 @@
+import type {NavigationAction, NavigationState} from '@react-navigation/native';
+import type {Writable} from 'type-fest';
+import type {State} from '@navigation/types';
+import type {ActionPayload} from './types';
+
+/**
+ * Motivation for this function is described in NAVIGATION.md
+ *
+ * @param action action generated by getActionFromState
+ * @param state The root state
+ * @returns minimalAction minimal action is the action that we should dispatch
+ */
+function getMinimalAction(action: NavigationAction, state: NavigationState): Writable<NavigationAction> {
+    let currentAction: NavigationAction = action;
+    let currentState: State | undefined = state;
+    let currentTargetKey: string | undefined;
+
+    while (currentAction.payload && 'name' in currentAction.payload && currentState?.routes[currentState.index ?? -1].name === currentAction.payload.name) {
+        if (!currentState?.routes[currentState.index ?? -1].state) {
+            break;
+        }
+
+        currentState = currentState?.routes[currentState.index ?? -1].state;
+        currentTargetKey = currentState?.key;
+
+        const payload = currentAction.payload as ActionPayload;
+
+        // Creating new smaller action
+        currentAction = {
+            type: currentAction.type,
+            payload: {
+                name: payload?.params?.screen,
+                params: payload?.params?.params,
+                path: payload?.params?.path,
+            },
+            target: currentTargetKey,
+        };
+    }
+    return currentAction;
+}
+
+export default getMinimalAction;
diff --git a/src/libs/Navigation/linkTo/index.ts b/src/libs/Navigation/linkTo/index.ts
new file mode 100644
index 000000000000..1fc99c771ca5
--- /dev/null
+++ b/src/libs/Navigation/linkTo/index.ts
@@ -0,0 +1,223 @@
+import {getActionFromState} from '@react-navigation/core';
+import type {NavigationContainerRef, NavigationState, PartialState} from '@react-navigation/native';
+import {findFocusedRoute} from '@react-navigation/native';
+import {omitBy} from 'lodash';
+import getIsNarrowLayout from '@libs/getIsNarrowLayout';
+import isReportOpenInRHP from '@libs/Navigation/isReportOpenInRHP';
+import {isCentralPaneName} from '@libs/NavigationUtils';
+import shallowCompare from '@libs/ObjectUtils';
+import {extractPolicyIDFromPath, getPathWithoutPolicyID} from '@libs/PolicyUtils';
+import getActionsFromPartialDiff from '@navigation/AppNavigator/getActionsFromPartialDiff';
+import getPartialStateDiff from '@navigation/AppNavigator/getPartialStateDiff';
+import dismissModal from '@navigation/dismissModal';
+import extractPolicyIDFromQuery from '@navigation/extractPolicyIDFromQuery';
+import extrapolateStateFromParams from '@navigation/extrapolateStateFromParams';
+import getPolicyIDFromState from '@navigation/getPolicyIDFromState';
+import getStateFromPath from '@navigation/getStateFromPath';
+import getTopmostBottomTabRoute from '@navigation/getTopmostBottomTabRoute';
+import getTopmostCentralPaneRoute from '@navigation/getTopmostCentralPaneRoute';
+import getTopmostReportId from '@navigation/getTopmostReportId';
+import isSideModalNavigator from '@navigation/isSideModalNavigator';
+import linkingConfig from '@navigation/linkingConfig';
+import getAdaptedStateFromPath from '@navigation/linkingConfig/getAdaptedStateFromPath';
+import getMatchingBottomTabRouteForState from '@navigation/linkingConfig/getMatchingBottomTabRouteForState';
+import getMatchingCentralPaneRouteForState from '@navigation/linkingConfig/getMatchingCentralPaneRouteForState';
+import replacePathInNestedState from '@navigation/linkingConfig/replacePathInNestedState';
+import type {NavigationRoot, RootStackParamList, StackNavigationAction, State} from '@navigation/types';
+import CONST from '@src/CONST';
+import NAVIGATORS from '@src/NAVIGATORS';
+import type {Route} from '@src/ROUTES';
+import SCREENS from '@src/SCREENS';
+import getActionForBottomTabNavigator from './getActionForBottomTabNavigator';
+import getMinimalAction from './getMinimalAction';
+import type {ActionPayloadParams} from './types';
+
+export default function linkTo(navigation: NavigationContainerRef<RootStackParamList> | null, path: Route, type?: string, isActiveRoute?: boolean) {
+    if (!navigation) {
+        throw new Error("Couldn't find a navigation object. Is your component inside a screen in a navigator?");
+    }
+    let root: NavigationRoot = navigation;
+    let current: NavigationRoot | undefined;
+    // Traverse up to get the root navigation
+    // eslint-disable-next-line no-cond-assign
+    while ((current = root.getParent())) {
+        root = current;
+    }
+
+    const pathWithoutPolicyID = getPathWithoutPolicyID(`/${path}`) as Route;
+    const rootState = navigation.getRootState() as NavigationState<RootStackParamList>;
+    const stateFromPath = getStateFromPath(pathWithoutPolicyID) as PartialState<NavigationState<RootStackParamList>>;
+    // Creating path with /w/ included if necessary.
+    const topmostCentralPaneRoute = getTopmostCentralPaneRoute(rootState);
+
+    const extractedPolicyID = extractPolicyIDFromPath(`/${path}`);
+    const policyIDFromState = getPolicyIDFromState(rootState);
+    const policyID = extractedPolicyID ?? policyIDFromState;
+    const lastRoute = rootState?.routes?.at(-1);
+
+    const isNarrowLayout = getIsNarrowLayout();
+
+    const isFullScreenOnTop = lastRoute?.name === NAVIGATORS.FULL_SCREEN_NAVIGATOR;
+
+    // policyID on SCREENS.SEARCH.CENTRAL_PANE can be present only as part of SearchQuery, while on other pages it's stored in the url in the format: /w/:policyID/
+    if (policyID && !isFullScreenOnTop && !policyIDFromState) {
+        // The stateFromPath doesn't include proper path if there is a policy passed with /w/id.
+        // We need to replace the path in the state with the proper one.
+        // To avoid this hacky solution we may want to create custom getActionFromState function in the future.
+        replacePathInNestedState(stateFromPath, `/w/${policyID}${pathWithoutPolicyID}`);
+    }
+
+    const action: StackNavigationAction = getActionFromState(stateFromPath, linkingConfig.config);
+
+    const isReportInRhpOpened = isReportOpenInRHP(rootState);
+
+    // If action type is different than NAVIGATE we can't change it to the PUSH safely
+    if (action?.type === CONST.NAVIGATION.ACTION_TYPE.NAVIGATE) {
+        const actionPayloadParams = action.payload.params as ActionPayloadParams;
+
+        const topRouteName = lastRoute?.name;
+
+        // CentralPane screens aren't nested in any navigator, if actionPayloadParams?.screen is undefined, it means the screen name and parameters have to be read directly from action.payload
+        const targetName = actionPayloadParams?.screen ?? action.payload.name;
+        const targetParams = actionPayloadParams?.params ?? actionPayloadParams;
+        const isTargetNavigatorOnTop = topRouteName === action.payload.name;
+
+        const isTargetScreenDifferentThanCurrent = !!(!topmostCentralPaneRoute || topmostCentralPaneRoute.name !== targetName);
+        const areParamsDifferent =
+            targetName === SCREENS.REPORT
+                ? getTopmostReportId(rootState) !== getTopmostReportId(stateFromPath)
+                : !shallowCompare(
+                      omitBy(topmostCentralPaneRoute?.params as Record<string, unknown> | undefined, (value) => value === undefined),
+                      omitBy(targetParams as Record<string, unknown> | undefined, (value) => value === undefined),
+                  );
+
+        // If this action is navigating to the report screen and the top most navigator is different from the one we want to navigate - PUSH the new screen to the top of the stack by default
+        if (isCentralPaneName(action.payload.name) && (isTargetScreenDifferentThanCurrent || areParamsDifferent)) {
+            // We need to push a tab if the tab doesn't match the central pane route that we are going to push.
+            const topmostBottomTabRoute = getTopmostBottomTabRoute(rootState);
+
+            const focusedRoute = findFocusedRoute(stateFromPath);
+            const policyIDFromQuery = extractPolicyIDFromQuery(focusedRoute);
+            const matchingBottomTabRoute = getMatchingBottomTabRouteForState(stateFromPath, policyID ?? policyIDFromQuery);
+            const isOpeningSearch = matchingBottomTabRoute.name === SCREENS.SEARCH.BOTTOM_TAB;
+            const isNewPolicyID =
+                ((topmostBottomTabRoute?.params as Record<string, string | undefined>)?.policyID ?? '') !==
+                ((matchingBottomTabRoute?.params as Record<string, string | undefined>)?.policyID ?? '');
+
+            if (topmostBottomTabRoute && (topmostBottomTabRoute.name !== matchingBottomTabRoute.name || isNewPolicyID || isOpeningSearch)) {
+                root.dispatch({
+                    type: CONST.NAVIGATION.ACTION_TYPE.PUSH,
+                    payload: matchingBottomTabRoute,
+                });
+            }
+
+            if (type === CONST.NAVIGATION.TYPE.UP) {
+                action.type = CONST.NAVIGATION.ACTION_TYPE.REPLACE;
+            } else {
+                action.type = CONST.NAVIGATION.ACTION_TYPE.PUSH;
+            }
+
+            // If the type is UP, we deeplinked into one of the RHP flows and we want to replace the current screen with the previous one in the flow
+            // and at the same time we want the back button to go to the page we were before the deeplink
+        } else if (type === CONST.NAVIGATION.TYPE.UP) {
+            if (!areParamsDifferent && isSideModalNavigator(lastRoute?.name) && topmostCentralPaneRoute?.name === targetName) {
+                dismissModal(navigation);
+                return;
+            }
+            action.type = CONST.NAVIGATION.ACTION_TYPE.REPLACE;
+
+            // If this action is navigating to ModalNavigator or FullScreenNavigator and the last route on the root navigator is not already opened Navigator then push
+        } else if ((action.payload.name === NAVIGATORS.FULL_SCREEN_NAVIGATOR || isSideModalNavigator(action.payload.name)) && !isTargetNavigatorOnTop) {
+            if (isSideModalNavigator(topRouteName)) {
+                dismissModal(navigation);
+            }
+
+            // If this RHP has mandatory central pane and bottom tab screens defined we need to push them.
+            const {adaptedState, metainfo} = getAdaptedStateFromPath(path, linkingConfig.config);
+            if (adaptedState && (metainfo.isCentralPaneAndBottomTabMandatory || metainfo.isFullScreenNavigatorMandatory)) {
+                const diff = getPartialStateDiff(rootState, adaptedState as State<RootStackParamList>, metainfo);
+                const diffActions = getActionsFromPartialDiff(diff);
+                for (const diffAction of diffActions) {
+                    root.dispatch(diffAction);
+                }
+            }
+            // All actions related to FullScreenNavigator on wide screen are pushed when comparing differences between rootState and adaptedState.
+            if (action.payload.name === NAVIGATORS.FULL_SCREEN_NAVIGATOR) {
+                return;
+            }
+            action.type = CONST.NAVIGATION.ACTION_TYPE.PUSH;
+
+            // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+        } else if (action.payload.name === NAVIGATORS.BOTTOM_TAB_NAVIGATOR) {
+            // If path contains a policyID, we should invoke the navigate function
+            const shouldNavigate = !!extractedPolicyID;
+            const actionForBottomTabNavigator = getActionForBottomTabNavigator(action, rootState, policyID, shouldNavigate);
+
+            if (!actionForBottomTabNavigator) {
+                return;
+            }
+
+            root.dispatch(actionForBottomTabNavigator);
+
+            // If the layout is wide we need to push matching central pane route to the stack.
+            if (!isNarrowLayout) {
+                // stateFromPath should always include bottom tab navigator state, so getMatchingCentralPaneRouteForState will be always defined.
+                // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+                const matchingCentralPaneRoute = getMatchingCentralPaneRouteForState(stateFromPath, rootState)!;
+                if (matchingCentralPaneRoute && 'name' in matchingCentralPaneRoute) {
+                    root.dispatch({
+                        type: CONST.NAVIGATION.ACTION_TYPE.PUSH,
+                        payload: {
+                            name: matchingCentralPaneRoute.name,
+                            params: matchingCentralPaneRoute.params,
+                        },
+                    });
+                }
+            } else {
+                // If the layout is small we need to pop everything from the central pane so the bottom tab navigator is visible.
+                root.dispatch({
+                    type: 'POP_TO_TOP',
+                    target: rootState.key,
+                });
+            }
+            return;
+        }
+    }
+
+    if (action && 'payload' in action && action.payload && 'name' in action.payload && isSideModalNavigator(action.payload.name)) {
+        // Information about the state may be in the params.
+        const currentFocusedRoute = findFocusedRoute(extrapolateStateFromParams(rootState));
+        const targetFocusedRoute = findFocusedRoute(stateFromPath);
+
+        // If the current focused route is the same as the target focused route, we don't want to navigate.
+        if (
+            currentFocusedRoute?.name === targetFocusedRoute?.name &&
+            shallowCompare(currentFocusedRoute?.params as Record<string, string | undefined>, targetFocusedRoute?.params as Record<string, string | undefined>)
+        ) {
+            return;
+        }
+
+        const minimalAction = getMinimalAction(action, navigation.getRootState());
+        if (minimalAction) {
+            // There are situations where a route already exists on the current navigation stack
+            // But we want to push the same route instead of going back in the stack
+            // Which would break the user navigation history
+            if (!isActiveRoute && type === CONST.NAVIGATION.ACTION_TYPE.PUSH) {
+                minimalAction.type = CONST.NAVIGATION.ACTION_TYPE.PUSH;
+            }
+            root.dispatch(minimalAction);
+            return;
+        }
+    }
+
+    // When we navigate from the ReportScreen opened in RHP, this page shouldn't be removed from the navigation state to allow users to go back to it.
+    if (isReportInRhpOpened && action) {
+        action.type = CONST.NAVIGATION.ACTION_TYPE.PUSH;
+    }
+
+    if (action !== undefined) {
+        root.dispatch(action);
+    } else {
+        root.reset(stateFromPath);
+    }
+}
diff --git a/src/libs/Navigation/linkTo/types.ts b/src/libs/Navigation/linkTo/types.ts
new file mode 100644
index 000000000000..254a4cdef2a5
--- /dev/null
+++ b/src/libs/Navigation/linkTo/types.ts
@@ -0,0 +1,11 @@
+type ActionPayloadParams = {
+    screen?: string;
+    params?: unknown;
+    path?: string;
+};
+
+type ActionPayload = {
+    params?: ActionPayloadParams;
+};
+
+export type {ActionPayload, ActionPayloadParams};
diff --git a/src/libs/Navigation/linkingConfig/CENTRAL_PANE_TO_RHP_MAPPING.ts b/src/libs/Navigation/linkingConfig/CENTRAL_PANE_TO_RHP_MAPPING.ts
index 2871e6365112..8a4a53e0f705 100755
--- a/src/libs/Navigation/linkingConfig/CENTRAL_PANE_TO_RHP_MAPPING.ts
+++ b/src/libs/Navigation/linkingConfig/CENTRAL_PANE_TO_RHP_MAPPING.ts
@@ -19,6 +19,9 @@ const CENTRAL_PANE_TO_RHP_MAPPING: Partial<Record<CentralPaneName, string[]>> =
         SCREENS.SETTINGS.PROFILE.ADDRESS,
         SCREENS.SETTINGS.PROFILE.ADDRESS_COUNTRY,
         SCREENS.SETTINGS.SHARE_CODE,
+        SCREENS.SETTINGS.EXIT_SURVEY.REASON,
+        SCREENS.SETTINGS.EXIT_SURVEY.RESPONSE,
+        SCREENS.SETTINGS.EXIT_SURVEY.CONFIRM,
     ],
     [SCREENS.SETTINGS.PREFERENCES.ROOT]: [SCREENS.SETTINGS.PREFERENCES.PRIORITY_MODE, SCREENS.SETTINGS.PREFERENCES.LANGUAGE, SCREENS.SETTINGS.PREFERENCES.THEME],
     [SCREENS.SETTINGS.WALLET.ROOT]: [
@@ -38,7 +41,32 @@ const CENTRAL_PANE_TO_RHP_MAPPING: Partial<Record<CentralPaneName, string[]>> =
     [SCREENS.SETTINGS.ABOUT]: [SCREENS.SETTINGS.APP_DOWNLOAD_LINKS],
     [SCREENS.SETTINGS.SAVE_THE_WORLD]: [SCREENS.I_KNOW_A_TEACHER, SCREENS.INTRO_SCHOOL_PRINCIPAL, SCREENS.I_AM_A_TEACHER],
     [SCREENS.SETTINGS.TROUBLESHOOT]: [SCREENS.SETTINGS.CONSOLE],
-    [SCREENS.SEARCH.CENTRAL_PANE]: [SCREENS.SEARCH.REPORT_RHP],
+    [SCREENS.SEARCH.CENTRAL_PANE]: [
+        SCREENS.SEARCH.REPORT_RHP,
+        SCREENS.SEARCH.TRANSACTION_HOLD_REASON_RHP,
+        SCREENS.SEARCH.ADVANCED_FILTERS_RHP,
+        SCREENS.SEARCH.ADVANCED_FILTERS_CURRENCY_RHP,
+        SCREENS.SEARCH.ADVANCED_FILTERS_DATE_RHP,
+        SCREENS.SEARCH.ADVANCED_FILTERS_DESCRIPTION_RHP,
+        SCREENS.SEARCH.ADVANCED_FILTERS_MERCHANT_RHP,
+        SCREENS.SEARCH.ADVANCED_FILTERS_REPORT_ID_RHP,
+        SCREENS.SEARCH.ADVANCED_FILTERS_AMOUNT_RHP,
+        SCREENS.SEARCH.ADVANCED_FILTERS_CATEGORY_RHP,
+        SCREENS.SEARCH.ADVANCED_FILTERS_KEYWORD_RHP,
+        SCREENS.SEARCH.ADVANCED_FILTERS_TAX_RATE_RHP,
+        SCREENS.SEARCH.ADVANCED_FILTERS_EXPENSE_TYPE_RHP,
+        SCREENS.SEARCH.ADVANCED_FILTERS_TAG_RHP,
+        SCREENS.SEARCH.ADVANCED_FILTERS_FROM_RHP,
+        SCREENS.SEARCH.ADVANCED_FILTERS_TO_RHP,
+    ],
+    [SCREENS.SETTINGS.SUBSCRIPTION.ROOT]: [
+        SCREENS.SETTINGS.SUBSCRIPTION.ADD_PAYMENT_CARD,
+        SCREENS.SETTINGS.SUBSCRIPTION.SIZE,
+        SCREENS.SETTINGS.SUBSCRIPTION.DISABLE_AUTO_RENEW_SURVEY,
+        SCREENS.SETTINGS.SUBSCRIPTION.REQUEST_EARLY_CANCELLATION,
+        SCREENS.SETTINGS.SUBSCRIPTION.CHANGE_BILLING_CURRENCY,
+        SCREENS.SETTINGS.SUBSCRIPTION.CHANGE_PAYMENT_CURRENCY,
+    ],
 };
 
 export default CENTRAL_PANE_TO_RHP_MAPPING;
diff --git a/src/libs/Navigation/linkingConfig/FULL_SCREEN_TO_RHP_MAPPING.ts b/src/libs/Navigation/linkingConfig/FULL_SCREEN_TO_RHP_MAPPING.ts
index f5a45b2ece19..19e889092fb2 100755
--- a/src/libs/Navigation/linkingConfig/FULL_SCREEN_TO_RHP_MAPPING.ts
+++ b/src/libs/Navigation/linkingConfig/FULL_SCREEN_TO_RHP_MAPPING.ts
@@ -11,9 +11,13 @@ const FULL_SCREEN_TO_RHP_MAPPING: Partial<Record<FullScreenName, string[]>> = {
         SCREENS.WORKSPACE.OWNER_CHANGE_CHECK,
         SCREENS.WORKSPACE.OWNER_CHANGE_SUCCESS,
         SCREENS.WORKSPACE.OWNER_CHANGE_ERROR,
+        SCREENS.WORKSPACE.OWNER_CHANGE_ERROR,
     ],
     [SCREENS.WORKSPACE.WORKFLOWS]: [
-        SCREENS.WORKSPACE.WORKFLOWS_APPROVER,
+        SCREENS.WORKSPACE.WORKFLOWS_APPROVALS_NEW,
+        SCREENS.WORKSPACE.WORKFLOWS_APPROVALS_EDIT,
+        SCREENS.WORKSPACE.WORKFLOWS_APPROVALS_EXPENSES_FROM,
+        SCREENS.WORKSPACE.WORKFLOWS_APPROVALS_APPROVER,
         SCREENS.WORKSPACE.WORKFLOWS_AUTO_REPORTING_FREQUENCY,
         SCREENS.WORKSPACE.WORKFLOWS_AUTO_REPORTING_MONTHLY_OFFSET,
         SCREENS.WORKSPACE.WORKFLOWS_PAYER,
@@ -28,7 +32,6 @@ const FULL_SCREEN_TO_RHP_MAPPING: Partial<Record<FullScreenName, string[]>> = {
         SCREENS.WORKSPACE.ACCOUNTING.QUICKBOOKS_ONLINE_EXPORT,
         SCREENS.WORKSPACE.ACCOUNTING.QUICKBOOKS_ONLINE_EXPORT_DATE_SELECT,
         SCREENS.WORKSPACE.ACCOUNTING.QUICKBOOKS_ONLINE_EXPORT_INVOICE_ACCOUNT_SELECT,
-        SCREENS.WORKSPACE.ACCOUNTING.QUICKBOOKS_ONLINE_COMPANY_CARD_EXPENSE_ACCOUNT_PAYABLE_SELECT,
         SCREENS.WORKSPACE.ACCOUNTING.QUICKBOOKS_ONLINE_EXPORT_OUT_OF_POCKET_EXPENSES_ACCOUNT_SELECT,
         SCREENS.WORKSPACE.ACCOUNTING.QUICKBOOKS_ONLINE_COMPANY_CARD_EXPENSE_ACCOUNT,
         SCREENS.WORKSPACE.ACCOUNTING.QUICKBOOKS_ONLINE_COMPANY_CARD_EXPENSE_ACCOUNT_SELECT,
@@ -41,10 +44,74 @@ const FULL_SCREEN_TO_RHP_MAPPING: Partial<Record<FullScreenName, string[]>> = {
         SCREENS.WORKSPACE.ACCOUNTING.QUICKBOOKS_ONLINE_ACCOUNT_SELECTOR,
         SCREENS.WORKSPACE.ACCOUNTING.QUICKBOOKS_ONLINE_INVOICE_ACCOUNT_SELECTOR,
         SCREENS.WORKSPACE.ACCOUNTING.XERO_IMPORT,
+        SCREENS.WORKSPACE.ACCOUNTING.XERO_CHART_OF_ACCOUNTS,
         SCREENS.WORKSPACE.ACCOUNTING.XERO_ORGANIZATION,
         SCREENS.WORKSPACE.ACCOUNTING.XERO_CUSTOMER,
         SCREENS.WORKSPACE.ACCOUNTING.XERO_TAXES,
+        SCREENS.WORKSPACE.ACCOUNTING.XERO_TRACKING_CATEGORIES,
+        SCREENS.WORKSPACE.ACCOUNTING.XERO_MAP_TRACKING_CATEGORY,
+        SCREENS.WORKSPACE.ACCOUNTING.XERO_EXPORT,
+        SCREENS.WORKSPACE.ACCOUNTING.XERO_EXPORT_PURCHASE_BILL_DATE_SELECT,
         SCREENS.WORKSPACE.ACCOUNTING.XERO_ADVANCED,
+        SCREENS.WORKSPACE.ACCOUNTING.XERO_BILL_STATUS_SELECTOR,
+        SCREENS.WORKSPACE.ACCOUNTING.XERO_INVOICE_ACCOUNT_SELECTOR,
+        SCREENS.WORKSPACE.ACCOUNTING.XERO_EXPORT_PREFERRED_EXPORTER_SELECT,
+        SCREENS.WORKSPACE.ACCOUNTING.XERO_BILL_PAYMENT_ACCOUNT_SELECTOR,
+        SCREENS.WORKSPACE.ACCOUNTING.XERO_EXPORT_BANK_ACCOUNT_SELECT,
+        SCREENS.WORKSPACE.ACCOUNTING.NETSUITE_SUBSIDIARY_SELECTOR,
+        SCREENS.WORKSPACE.ACCOUNTING.NETSUITE_REUSE_EXISTING_CONNECTIONS,
+        SCREENS.WORKSPACE.ACCOUNTING.NETSUITE_TOKEN_INPUT,
+        SCREENS.WORKSPACE.ACCOUNTING.NETSUITE_IMPORT,
+        SCREENS.WORKSPACE.ACCOUNTING.NETSUITE_IMPORT_MAPPING,
+        SCREENS.WORKSPACE.ACCOUNTING.NETSUITE_IMPORT_CUSTOM_FIELD,
+        SCREENS.WORKSPACE.ACCOUNTING.NETSUITE_IMPORT_CUSTOM_FIELD_VIEW,
+        SCREENS.WORKSPACE.ACCOUNTING.NETSUITE_IMPORT_CUSTOM_FIELD_EDIT,
+        SCREENS.WORKSPACE.ACCOUNTING.NETSUITE_IMPORT_CUSTOM_LIST_ADD,
+        SCREENS.WORKSPACE.ACCOUNTING.NETSUITE_IMPORT_CUSTOM_SEGMENT_ADD,
+        SCREENS.WORKSPACE.ACCOUNTING.NETSUITE_IMPORT_CUSTOMERS_OR_PROJECTS,
+        SCREENS.WORKSPACE.ACCOUNTING.NETSUITE_IMPORT_CUSTOMERS_OR_PROJECTS_SELECT,
+        SCREENS.WORKSPACE.ACCOUNTING.NETSUITE_EXPORT,
+        SCREENS.WORKSPACE.ACCOUNTING.NETSUITE_PREFERRED_EXPORTER_SELECT,
+        SCREENS.WORKSPACE.ACCOUNTING.NETSUITE_DATE_SELECT,
+        SCREENS.WORKSPACE.ACCOUNTING.NETSUITE_EXPORT_EXPENSES,
+        SCREENS.WORKSPACE.ACCOUNTING.NETSUITE_EXPORT_EXPENSES_DESTINATION_SELECT,
+        SCREENS.WORKSPACE.ACCOUNTING.NETSUITE_EXPORT_EXPENSES_VENDOR_SELECT,
+        SCREENS.WORKSPACE.ACCOUNTING.NETSUITE_EXPORT_EXPENSES_PAYABLE_ACCOUNT_SELECT,
+        SCREENS.WORKSPACE.ACCOUNTING.NETSUITE_EXPORT_EXPENSES_JOURNAL_POSTING_PREFERENCE_SELECT,
+        SCREENS.WORKSPACE.ACCOUNTING.NETSUITE_RECEIVABLE_ACCOUNT_SELECT,
+        SCREENS.WORKSPACE.ACCOUNTING.NETSUITE_INVOICE_ITEM_PREFERENCE_SELECT,
+        SCREENS.WORKSPACE.ACCOUNTING.NETSUITE_INVOICE_ITEM_SELECT,
+        SCREENS.WORKSPACE.ACCOUNTING.NETSUITE_TAX_POSTING_ACCOUNT_SELECT,
+        SCREENS.WORKSPACE.ACCOUNTING.NETSUITE_PROVINCIAL_TAX_POSTING_ACCOUNT_SELECT,
+        SCREENS.WORKSPACE.ACCOUNTING.NETSUITE_ADVANCED,
+        SCREENS.WORKSPACE.ACCOUNTING.NETSUITE_REIMBURSEMENT_ACCOUNT_SELECT,
+        SCREENS.WORKSPACE.ACCOUNTING.NETSUITE_COLLECTION_ACCOUNT_SELECT,
+        SCREENS.WORKSPACE.ACCOUNTING.NETSUITE_EXPENSE_REPORT_APPROVAL_LEVEL_SELECT,
+        SCREENS.WORKSPACE.ACCOUNTING.NETSUITE_VENDOR_BILL_APPROVAL_LEVEL_SELECT,
+        SCREENS.WORKSPACE.ACCOUNTING.NETSUITE_JOURNAL_ENTRY_APPROVAL_LEVEL_SELECT,
+        SCREENS.WORKSPACE.ACCOUNTING.NETSUITE_APPROVAL_ACCOUNT_SELECT,
+        SCREENS.WORKSPACE.ACCOUNTING.NETSUITE_CUSTOM_FORM_ID,
+        SCREENS.WORKSPACE.ACCOUNTING.SAGE_INTACCT_PREREQUISITES,
+        SCREENS.WORKSPACE.ACCOUNTING.ENTER_SAGE_INTACCT_CREDENTIALS,
+        SCREENS.WORKSPACE.ACCOUNTING.EXISTING_SAGE_INTACCT_CONNECTIONS,
+        SCREENS.WORKSPACE.ACCOUNTING.SAGE_INTACCT_ENTITY,
+        SCREENS.WORKSPACE.ACCOUNTING.SAGE_INTACCT_IMPORT,
+        SCREENS.WORKSPACE.ACCOUNTING.SAGE_INTACCT_MAPPING_TYPE,
+        SCREENS.WORKSPACE.ACCOUNTING.SAGE_INTACCT_TOGGLE_MAPPING,
+        SCREENS.WORKSPACE.ACCOUNTING.SAGE_INTACCT_USER_DIMENSIONS,
+        SCREENS.WORKSPACE.ACCOUNTING.SAGE_INTACCT_ADD_USER_DIMENSION,
+        SCREENS.WORKSPACE.ACCOUNTING.SAGE_INTACCT_EDIT_USER_DIMENSION,
+        SCREENS.WORKSPACE.ACCOUNTING.SAGE_INTACCT_EXPORT,
+        SCREENS.WORKSPACE.ACCOUNTING.SAGE_INTACCT_PREFERRED_EXPORTER,
+        SCREENS.WORKSPACE.ACCOUNTING.SAGE_INTACCT_EXPORT_DATE,
+        SCREENS.WORKSPACE.ACCOUNTING.SAGE_INTACCT_REIMBURSABLE_EXPENSES,
+        SCREENS.WORKSPACE.ACCOUNTING.SAGE_INTACCT_NON_REIMBURSABLE_EXPENSES,
+        SCREENS.WORKSPACE.ACCOUNTING.SAGE_INTACCT_DEFAULT_VENDOR,
+        SCREENS.WORKSPACE.ACCOUNTING.SAGE_INTACCT_NON_REIMBURSABLE_CREDIT_CARD_ACCOUNT,
+        SCREENS.WORKSPACE.ACCOUNTING.SAGE_INTACCT_ADVANCED,
+        SCREENS.WORKSPACE.ACCOUNTING.SAGE_INTACCT_PAYMENT_ACCOUNT,
+        SCREENS.WORKSPACE.ACCOUNTING.CARD_RECONCILIATION,
+        SCREENS.WORKSPACE.ACCOUNTING.RECONCILIATION_ACCOUNT_SETTINGS,
     ],
     [SCREENS.WORKSPACE.TAXES]: [
         SCREENS.WORKSPACE.TAXES_SETTINGS,
@@ -56,15 +123,61 @@ const FULL_SCREEN_TO_RHP_MAPPING: Partial<Record<FullScreenName, string[]>> = {
         SCREENS.WORKSPACE.TAX_EDIT,
         SCREENS.WORKSPACE.TAX_NAME,
         SCREENS.WORKSPACE.TAX_VALUE,
+        SCREENS.WORKSPACE.TAX_CODE,
+    ],
+    [SCREENS.WORKSPACE.TAGS]: [
+        SCREENS.WORKSPACE.TAGS_SETTINGS,
+        SCREENS.WORKSPACE.TAGS_EDIT,
+        SCREENS.WORKSPACE.TAG_CREATE,
+        SCREENS.WORKSPACE.TAG_SETTINGS,
+        SCREENS.WORKSPACE.TAG_EDIT,
+        SCREENS.WORKSPACE.TAG_LIST_VIEW,
+        SCREENS.WORKSPACE.TAG_GL_CODE,
+    ],
+    [SCREENS.WORKSPACE.CATEGORIES]: [
+        SCREENS.WORKSPACE.CATEGORY_CREATE,
+        SCREENS.WORKSPACE.CATEGORY_SETTINGS,
+        SCREENS.WORKSPACE.CATEGORIES_SETTINGS,
+        SCREENS.WORKSPACE.CATEGORY_EDIT,
+        SCREENS.WORKSPACE.CATEGORY_GL_CODE,
+        SCREENS.WORKSPACE.CATEGORY_PAYROLL_CODE,
     ],
-    [SCREENS.WORKSPACE.TAGS]: [SCREENS.WORKSPACE.TAGS_SETTINGS, SCREENS.WORKSPACE.TAGS_EDIT, SCREENS.WORKSPACE.TAG_CREATE, SCREENS.WORKSPACE.TAG_SETTINGS, SCREENS.WORKSPACE.TAG_EDIT],
-    [SCREENS.WORKSPACE.CATEGORIES]: [SCREENS.WORKSPACE.CATEGORY_CREATE, SCREENS.WORKSPACE.CATEGORY_SETTINGS, SCREENS.WORKSPACE.CATEGORIES_SETTINGS, SCREENS.WORKSPACE.CATEGORY_EDIT],
     [SCREENS.WORKSPACE.DISTANCE_RATES]: [
         SCREENS.WORKSPACE.CREATE_DISTANCE_RATE,
         SCREENS.WORKSPACE.DISTANCE_RATES_SETTINGS,
         SCREENS.WORKSPACE.DISTANCE_RATE_EDIT,
+        SCREENS.WORKSPACE.DISTANCE_RATE_TAX_RECLAIMABLE_ON_EDIT,
+        SCREENS.WORKSPACE.DISTANCE_RATE_TAX_RATE_EDIT,
         SCREENS.WORKSPACE.DISTANCE_RATE_DETAILS,
     ],
+    [SCREENS.WORKSPACE.REPORT_FIELDS]: [
+        SCREENS.WORKSPACE.REPORT_FIELDS_CREATE,
+        SCREENS.WORKSPACE.REPORT_FIELDS_SETTINGS,
+        SCREENS.WORKSPACE.REPORT_FIELDS_LIST_VALUES,
+        SCREENS.WORKSPACE.REPORT_FIELDS_ADD_VALUE,
+        SCREENS.WORKSPACE.REPORT_FIELDS_VALUE_SETTINGS,
+        SCREENS.WORKSPACE.REPORT_FIELDS_EDIT_VALUE,
+        SCREENS.WORKSPACE.REPORT_FIELDS_EDIT_INITIAL_VALUE,
+    ],
+    [SCREENS.WORKSPACE.INVOICES]: [SCREENS.WORKSPACE.INVOICES_COMPANY_NAME, SCREENS.WORKSPACE.INVOICES_COMPANY_WEBSITE],
+    [SCREENS.WORKSPACE.COMPANY_CARDS]: [SCREENS.WORKSPACE.COMPANY_CARDS_SELECT_FEED],
+    [SCREENS.WORKSPACE.EXPENSIFY_CARD]: [
+        SCREENS.WORKSPACE.EXPENSIFY_CARD_ISSUE_NEW,
+        SCREENS.WORKSPACE.EXPENSIFY_CARD_BANK_ACCOUNT,
+        SCREENS.WORKSPACE.EXPENSIFY_CARD_SETTINGS,
+        SCREENS.WORKSPACE.EXPENSIFY_CARD_SETTINGS_ACCOUNT,
+        SCREENS.WORKSPACE.EXPENSIFY_CARD_SETTINGS_FREQUENCY,
+        SCREENS.WORKSPACE.EXPENSIFY_CARD_DETAILS,
+        SCREENS.WORKSPACE.EXPENSIFY_CARD_NAME,
+        SCREENS.WORKSPACE.EXPENSIFY_CARD_LIMIT,
+        SCREENS.WORKSPACE.EXPENSIFY_CARD_LIMIT_TYPE,
+    ],
+    [SCREENS.WORKSPACE.RULES]: [
+        SCREENS.WORKSPACE.RULES_RECEIPT_REQUIRED_AMOUNT,
+        SCREENS.WORKSPACE.RULES_MAX_EXPENSE_AMOUNT,
+        SCREENS.WORKSPACE.RULES_MAX_EXPENSE_AGE,
+        SCREENS.WORKSPACE.RULES_BILLABLE_DEFAULT,
+    ],
 };
 
 export default FULL_SCREEN_TO_RHP_MAPPING;
diff --git a/src/libs/Navigation/linkingConfig/TAB_TO_CENTRAL_PANE_MAPPING.ts b/src/libs/Navigation/linkingConfig/TAB_TO_CENTRAL_PANE_MAPPING.ts
index 9e40a3dc0d4c..a68959ae7d0f 100755
--- a/src/libs/Navigation/linkingConfig/TAB_TO_CENTRAL_PANE_MAPPING.ts
+++ b/src/libs/Navigation/linkingConfig/TAB_TO_CENTRAL_PANE_MAPPING.ts
@@ -13,14 +13,15 @@ const TAB_TO_CENTRAL_PANE_MAPPING: Record<BottomTabName, CentralPaneName[]> = {
         SCREENS.SETTINGS.WORKSPACES,
         SCREENS.SETTINGS.SAVE_THE_WORLD,
         SCREENS.SETTINGS.TROUBLESHOOT,
+        SCREENS.SETTINGS.SUBSCRIPTION.ROOT,
     ],
 };
 
 const generateCentralPaneToTabMapping = (): Record<CentralPaneName, BottomTabName> => {
     const mapping: Record<CentralPaneName, BottomTabName> = {} as Record<CentralPaneName, BottomTabName>;
-    for (const [tabName, centralPaneNames] of Object.entries(TAB_TO_CENTRAL_PANE_MAPPING)) {
-        for (const centralPaneName of centralPaneNames) {
-            mapping[centralPaneName] = tabName as BottomTabName;
+    for (const [tabName, CentralPaneNames] of Object.entries(TAB_TO_CENTRAL_PANE_MAPPING)) {
+        for (const CentralPaneName of CentralPaneNames) {
+            mapping[CentralPaneName] = tabName as BottomTabName;
         }
     }
     return mapping;
diff --git a/src/libs/Navigation/linkingConfig/config.ts b/src/libs/Navigation/linkingConfig/config.ts
index 618805f3c02a..6ee3b14b64ed 100644
--- a/src/libs/Navigation/linkingConfig/config.ts
+++ b/src/libs/Navigation/linkingConfig/config.ts
@@ -1,9 +1,11 @@
-/* eslint-disable @typescript-eslint/naming-convention */
 import type {LinkingOptions} from '@react-navigation/native';
 import type {RootStackParamList} from '@navigation/types';
 import NAVIGATORS from '@src/NAVIGATORS';
 import ROUTES from '@src/ROUTES';
+import type {Screen} from '@src/SCREENS';
 import SCREENS from '@src/SCREENS';
+import type {RouteConfig} from './createNormalizedConfigs';
+import createNormalizedConfigs from './createNormalizedConfigs';
 
 // Moved to a separate file to avoid cyclic dependencies.
 const config: LinkingOptions<RootStackParamList>['config'] = {
@@ -15,16 +17,52 @@ const config: LinkingOptions<RootStackParamList>['config'] = {
         [SCREENS.TRANSITION_BETWEEN_APPS]: ROUTES.TRANSITION_BETWEEN_APPS,
         [SCREENS.CONNECTION_COMPLETE]: ROUTES.CONNECTION_COMPLETE,
         [SCREENS.CONCIERGE]: ROUTES.CONCIERGE,
+        [SCREENS.TRACK_EXPENSE]: ROUTES.TRACK_EXPENSE,
+        [SCREENS.SUBMIT_EXPENSE]: ROUTES.SUBMIT_EXPENSE,
         [SCREENS.SIGN_IN_WITH_APPLE_DESKTOP]: ROUTES.APPLE_SIGN_IN,
         [SCREENS.SIGN_IN_WITH_GOOGLE_DESKTOP]: ROUTES.GOOGLE_SIGN_IN,
         [SCREENS.SAML_SIGN_IN]: ROUTES.SAML_SIGN_IN,
         [SCREENS.DESKTOP_SIGN_IN_REDIRECT]: ROUTES.DESKTOP_SIGN_IN_REDIRECT,
-        [SCREENS.REPORT_ATTACHMENTS]: ROUTES.REPORT_ATTACHMENTS.route,
+        [SCREENS.ATTACHMENTS]: ROUTES.ATTACHMENTS.route,
         [SCREENS.PROFILE_AVATAR]: ROUTES.PROFILE_AVATAR.route,
         [SCREENS.WORKSPACE_AVATAR]: ROUTES.WORKSPACE_AVATAR.route,
         [SCREENS.REPORT_AVATAR]: ROUTES.REPORT_AVATAR.route,
         [SCREENS.TRANSACTION_RECEIPT]: ROUTES.TRANSACTION_RECEIPT.route,
         [SCREENS.WORKSPACE_JOIN_USER]: ROUTES.WORKSPACE_JOIN_USER.route,
+        [SCREENS.REPORT]: ROUTES.REPORT_WITH_ID.route,
+        [SCREENS.SETTINGS.PROFILE.ROOT]: {
+            path: ROUTES.SETTINGS_PROFILE,
+            exact: true,
+        },
+        [SCREENS.SETTINGS.PREFERENCES.ROOT]: {
+            path: ROUTES.SETTINGS_PREFERENCES,
+            exact: true,
+        },
+        [SCREENS.SETTINGS.SECURITY]: {
+            path: ROUTES.SETTINGS_SECURITY,
+            exact: true,
+        },
+        [SCREENS.SETTINGS.WALLET.ROOT]: {
+            path: ROUTES.SETTINGS_WALLET,
+            exact: true,
+        },
+        [SCREENS.SETTINGS.ABOUT]: {
+            path: ROUTES.SETTINGS_ABOUT,
+            exact: true,
+        },
+        [SCREENS.SETTINGS.TROUBLESHOOT]: {
+            path: ROUTES.SETTINGS_TROUBLESHOOT,
+            exact: true,
+        },
+        [SCREENS.SETTINGS.WORKSPACES]: ROUTES.SETTINGS_WORKSPACES,
+        [SCREENS.SEARCH.CENTRAL_PANE]: {
+            path: ROUTES.SEARCH_CENTRAL_PANE.route,
+            parse: {
+                isCustomQuery: (isCustomQuery) => isCustomQuery.toLowerCase() === 'true',
+            },
+        },
+        [SCREENS.SETTINGS.SAVE_THE_WORLD]: ROUTES.SETTINGS_SAVE_THE_WORLD,
+        [SCREENS.SETTINGS.SUBSCRIPTION.ROOT]: ROUTES.SETTINGS_SUBSCRIPTION,
 
         // Sidebar
         [NAVIGATORS.BOTTOM_TAB_NAVIGATOR]: {
@@ -38,52 +76,12 @@ const config: LinkingOptions<RootStackParamList>['config'] = {
             },
         },
 
-        [NAVIGATORS.CENTRAL_PANE_NAVIGATOR]: {
-            screens: {
-                [SCREENS.REPORT]: ROUTES.REPORT_WITH_ID.route,
-                [SCREENS.SETTINGS.PROFILE.ROOT]: {
-                    path: ROUTES.SETTINGS_PROFILE,
-                    exact: true,
-                },
-                [SCREENS.SETTINGS.PREFERENCES.ROOT]: {
-                    path: ROUTES.SETTINGS_PREFERENCES,
-                    exact: true,
-                },
-                [SCREENS.SETTINGS.SECURITY]: {
-                    path: ROUTES.SETTINGS_SECURITY,
-                    exact: true,
-                },
-                [SCREENS.SETTINGS.WALLET.ROOT]: {
-                    path: ROUTES.SETTINGS_WALLET,
-                    exact: true,
-                },
-                [SCREENS.SETTINGS.ABOUT]: {
-                    path: ROUTES.SETTINGS_ABOUT,
-                    exact: true,
-                },
-                [SCREENS.SETTINGS.TROUBLESHOOT]: {
-                    path: ROUTES.SETTINGS_TROUBLESHOOT,
-                    exact: true,
-                },
-                [SCREENS.SETTINGS.WORKSPACES]: ROUTES.SETTINGS_WORKSPACES,
-                [SCREENS.SEARCH.CENTRAL_PANE]: ROUTES.SEARCH.route,
-                [SCREENS.SETTINGS.SAVE_THE_WORLD]: ROUTES.SETTINGS_SAVE_THE_WORLD,
-            },
-        },
         [SCREENS.NOT_FOUND]: '*',
         [NAVIGATORS.LEFT_MODAL_NAVIGATOR]: {
             screens: {
-                [SCREENS.LEFT_MODAL.CHAT_FINDER]: {
-                    screens: {
-                        [SCREENS.CHAT_FINDER_ROOT]: ROUTES.CHAT_FINDER,
-                    },
-                },
+                [SCREENS.LEFT_MODAL.CHAT_FINDER]: ROUTES.CHAT_FINDER,
                 [SCREENS.LEFT_MODAL.WORKSPACE_SWITCHER]: {
-                    screens: {
-                        [SCREENS.WORKSPACE_SWITCHER.ROOT]: {
-                            path: ROUTES.WORKSPACE_SWITCHER,
-                        },
-                    },
+                    path: ROUTES.WORKSPACE_SWITCHER,
                 },
             },
         },
@@ -103,20 +101,28 @@ const config: LinkingOptions<RootStackParamList>['config'] = {
                 },
             },
         },
+        [NAVIGATORS.EXPLANATION_MODAL_NAVIGATOR]: {
+            screens: {
+                [SCREENS.EXPLANATION_MODAL.ROOT]: {
+                    path: ROUTES.EXPLANATION_MODAL_ROOT,
+                    exact: true,
+                },
+            },
+        },
         [NAVIGATORS.ONBOARDING_MODAL_NAVIGATOR]: {
-            path: ROUTES.ONBOARDING_ROOT,
+            path: ROUTES.ONBOARDING_ROOT.route,
             initialRouteName: SCREENS.ONBOARDING.PURPOSE,
             screens: {
                 [SCREENS.ONBOARDING.PURPOSE]: {
-                    path: ROUTES.ONBOARDING_PURPOSE,
+                    path: ROUTES.ONBOARDING_PURPOSE.route,
                     exact: true,
                 },
                 [SCREENS.ONBOARDING.PERSONAL_DETAILS]: {
-                    path: ROUTES.ONBOARDING_PERSONAL_DETAILS,
+                    path: ROUTES.ONBOARDING_PERSONAL_DETAILS.route,
                     exact: true,
                 },
                 [SCREENS.ONBOARDING.WORK]: {
-                    path: ROUTES.ONBOARDING_WORK,
+                    path: ROUTES.ONBOARDING_WORK.route,
                     exact: true,
                 },
             },
@@ -133,6 +139,22 @@ const config: LinkingOptions<RootStackParamList>['config'] = {
                             path: ROUTES.SETTINGS_LANGUAGE,
                             exact: true,
                         },
+                        [SCREENS.SETTINGS.SUBSCRIPTION.ADD_PAYMENT_CARD]: {
+                            path: ROUTES.SETTINGS_SUBSCRIPTION_ADD_PAYMENT_CARD,
+                            exact: true,
+                        },
+                        [SCREENS.SETTINGS.SUBSCRIPTION.CHANGE_BILLING_CURRENCY]: {
+                            path: ROUTES.SETTINGS_SUBSCRIPTION_CHANGE_BILLING_CURRENCY,
+                            exact: true,
+                        },
+                        [SCREENS.SETTINGS.SUBSCRIPTION.CHANGE_PAYMENT_CURRENCY]: {
+                            path: ROUTES.SETTINGS_SUBSCRIPTION_CHANGE_PAYMENT_CURRENCY,
+                            exact: true,
+                        },
+                        [SCREENS.SETTINGS.ADD_PAYMENT_CARD_CHANGE_CURRENCY]: {
+                            path: ROUTES.SETTINGS_CHANGE_CURRENCY,
+                            exact: true,
+                        },
                         [SCREENS.SETTINGS.PREFERENCES.THEME]: {
                             path: ROUTES.SETTINGS_THEME,
                             exact: true,
@@ -169,10 +191,6 @@ const config: LinkingOptions<RootStackParamList>['config'] = {
                             path: ROUTES.SETTINGS_ENABLE_PAYMENTS,
                             exact: true,
                         },
-                        [SCREENS.SETTINGS.WALLET.ENABLE_PAYMENTS_REFACTOR]: {
-                            path: ROUTES.SETTINGS_ENABLE_PAYMENTS_REFACTOR,
-                            exact: true,
-                        },
                         [SCREENS.SETTINGS.WALLET.TRANSFER_BALANCE]: {
                             path: ROUTES.SETTINGS_WALLET_TRANSFER_BALANCE,
                             exact: true,
@@ -201,10 +219,6 @@ const config: LinkingOptions<RootStackParamList>['config'] = {
                             path: ROUTES.SETTINGS_ADD_BANK_ACCOUNT,
                             exact: true,
                         },
-                        [SCREENS.SETTINGS.ADD_BANK_ACCOUNT_REFACTOR]: {
-                            path: ROUTES.SETTINGS_ADD_BANK_ACCOUNT_REFACTOR,
-                            exact: true,
-                        },
                         [SCREENS.SETTINGS.PROFILE.PRONOUNS]: {
                             path: ROUTES.SETTINGS_PRONOUNS,
                             exact: true,
@@ -226,7 +240,7 @@ const config: LinkingOptions<RootStackParamList>['config'] = {
                             exact: true,
                         },
                         [SCREENS.SETTINGS.CONSOLE]: {
-                            path: ROUTES.SETTINGS_CONSOLE,
+                            path: ROUTES.SETTINGS_CONSOLE.route,
                             exact: true,
                         },
                         [SCREENS.SETTINGS.SHARE_LOG]: ROUTES.SETTINGS_SHARE_LOG.route,
@@ -278,6 +292,18 @@ const config: LinkingOptions<RootStackParamList>['config'] = {
                         [SCREENS.SETTINGS.PROFILE.STATUS_CLEAR_AFTER_TIME]: {
                             path: ROUTES.SETTINGS_STATUS_CLEAR_AFTER_TIME,
                         },
+                        [SCREENS.SETTINGS.SUBSCRIPTION.SIZE]: {
+                            path: ROUTES.SETTINGS_SUBSCRIPTION_SIZE.route,
+                            parse: {
+                                canChangeSize: Number,
+                            },
+                        },
+                        [SCREENS.SETTINGS.SUBSCRIPTION.DISABLE_AUTO_RENEW_SURVEY]: {
+                            path: ROUTES.SETTINGS_SUBSCRIPTION_DISABLE_AUTO_RENEW_SURVEY,
+                        },
+                        [SCREENS.SETTINGS.SUBSCRIPTION.REQUEST_EARLY_CANCELLATION]: {
+                            path: ROUTES.SETTINGS_SUBSCRIPTION_REQUEST_EARLY_CANCELLATION,
+                        },
                         [SCREENS.WORKSPACE.CURRENCY]: {
                             path: ROUTES.WORKSPACE_PROFILE_CURRENCY.route,
                         },
@@ -293,9 +319,6 @@ const config: LinkingOptions<RootStackParamList>['config'] = {
                         [SCREENS.WORKSPACE.ACCOUNTING.QUICKBOOKS_ONLINE_EXPORT]: {path: ROUTES.POLICY_ACCOUNTING_QUICKBOOKS_ONLINE_EXPORT.route},
                         [SCREENS.WORKSPACE.ACCOUNTING.QUICKBOOKS_ONLINE_EXPORT_DATE_SELECT]: {path: ROUTES.POLICY_ACCOUNTING_QUICKBOOKS_ONLINE_EXPORT_DATE_SELECT.route},
                         [SCREENS.WORKSPACE.ACCOUNTING.QUICKBOOKS_ONLINE_EXPORT_INVOICE_ACCOUNT_SELECT]: {path: ROUTES.POLICY_ACCOUNTING_QUICKBOOKS_ONLINE_INVOICE_ACCOUNT_SELECT.route},
-                        [SCREENS.WORKSPACE.ACCOUNTING.QUICKBOOKS_ONLINE_COMPANY_CARD_EXPENSE_ACCOUNT_PAYABLE_SELECT]: {
-                            path: ROUTES.POLICY_ACCOUNTING_QUICKBOOKS_ONLINE_COMPANY_CARD_EXPENSE_ACCOUNT_PAYABLE_SELECT.route,
-                        },
                         [SCREENS.WORKSPACE.ACCOUNTING.QUICKBOOKS_ONLINE_EXPORT_OUT_OF_POCKET_EXPENSES_ACCOUNT_SELECT]: {
                             path: ROUTES.POLICY_ACCOUNTING_QUICKBOOKS_ONLINE_EXPORT_OUT_OF_POCKET_EXPENSES_ACCOUNT_SELECT.route,
                         },
@@ -328,10 +351,118 @@ const config: LinkingOptions<RootStackParamList>['config'] = {
                             path: ROUTES.WORKSPACE_ACCOUNTING_QUICKBOOKS_ONLINE_INVOICE_ACCOUNT_SELECTOR.route,
                         },
                         [SCREENS.WORKSPACE.ACCOUNTING.XERO_IMPORT]: {path: ROUTES.POLICY_ACCOUNTING_XERO_IMPORT.route},
+                        [SCREENS.WORKSPACE.ACCOUNTING.XERO_CHART_OF_ACCOUNTS]: {path: ROUTES.POLICY_ACCOUNTING_XERO_CHART_OF_ACCOUNTS.route},
                         [SCREENS.WORKSPACE.ACCOUNTING.XERO_ORGANIZATION]: {path: ROUTES.POLICY_ACCOUNTING_XERO_ORGANIZATION.route},
+                        [SCREENS.WORKSPACE.ACCOUNTING.XERO_TRACKING_CATEGORIES]: {path: ROUTES.POLICY_ACCOUNTING_XERO_TRACKING_CATEGORIES.route},
+                        [SCREENS.WORKSPACE.ACCOUNTING.XERO_MAP_TRACKING_CATEGORY]: {path: ROUTES.POLICY_ACCOUNTING_XERO_TRACKING_CATEGORIES_MAP.route},
                         [SCREENS.WORKSPACE.ACCOUNTING.XERO_CUSTOMER]: {path: ROUTES.POLICY_ACCOUNTING_XERO_CUSTOMER.route},
                         [SCREENS.WORKSPACE.ACCOUNTING.XERO_TAXES]: {path: ROUTES.POLICY_ACCOUNTING_XERO_TAXES.route},
+                        [SCREENS.WORKSPACE.ACCOUNTING.XERO_EXPORT]: {path: ROUTES.POLICY_ACCOUNTING_XERO_EXPORT.route},
+                        [SCREENS.WORKSPACE.ACCOUNTING.XERO_EXPORT_PURCHASE_BILL_DATE_SELECT]: {path: ROUTES.POLICY_ACCOUNTING_XERO_EXPORT_PURCHASE_BILL_DATE_SELECT.route},
+                        [SCREENS.WORKSPACE.ACCOUNTING.XERO_EXPORT_BANK_ACCOUNT_SELECT]: {path: ROUTES.POLICY_ACCOUNTING_XERO_EXPORT_BANK_ACCOUNT_SELECT.route},
                         [SCREENS.WORKSPACE.ACCOUNTING.XERO_ADVANCED]: {path: ROUTES.POLICY_ACCOUNTING_XERO_ADVANCED.route},
+                        [SCREENS.WORKSPACE.ACCOUNTING.XERO_BILL_STATUS_SELECTOR]: {path: ROUTES.POLICY_ACCOUNTING_XERO_BILL_STATUS_SELECTOR.route},
+                        [SCREENS.WORKSPACE.ACCOUNTING.XERO_INVOICE_ACCOUNT_SELECTOR]: {path: ROUTES.POLICY_ACCOUNTING_XERO_INVOICE_SELECTOR.route},
+                        [SCREENS.WORKSPACE.ACCOUNTING.XERO_EXPORT_PREFERRED_EXPORTER_SELECT]: {path: ROUTES.POLICY_ACCOUNTING_XERO_PREFERRED_EXPORTER_SELECT.route},
+                        [SCREENS.WORKSPACE.ACCOUNTING.XERO_BILL_PAYMENT_ACCOUNT_SELECTOR]: {path: ROUTES.POLICY_ACCOUNTING_XERO_BILL_PAYMENT_ACCOUNT_SELECTOR.route},
+                        [SCREENS.WORKSPACE.ACCOUNTING.NETSUITE_SUBSIDIARY_SELECTOR]: {path: ROUTES.POLICY_ACCOUNTING_NETSUITE_SUBSIDIARY_SELECTOR.route},
+                        [SCREENS.WORKSPACE.ACCOUNTING.NETSUITE_TOKEN_INPUT]: {path: ROUTES.POLICY_ACCOUNTING_NETSUITE_TOKEN_INPUT.route},
+                        [SCREENS.WORKSPACE.ACCOUNTING.NETSUITE_REUSE_EXISTING_CONNECTIONS]: {path: ROUTES.POLICY_ACCOUNTING_NETSUITE_EXISTING_CONNECTIONS.route},
+                        [SCREENS.WORKSPACE.ACCOUNTING.NETSUITE_IMPORT]: {path: ROUTES.POLICY_ACCOUNTING_NETSUITE_IMPORT.route},
+                        [SCREENS.WORKSPACE.ACCOUNTING.NETSUITE_IMPORT_MAPPING]: {path: ROUTES.POLICY_ACCOUNTING_NETSUITE_IMPORT_MAPPING.route},
+                        [SCREENS.WORKSPACE.ACCOUNTING.NETSUITE_IMPORT_CUSTOM_FIELD]: {path: ROUTES.POLICY_ACCOUNTING_NETSUITE_IMPORT_CUSTOM_FIELD_MAPPING.route},
+                        [SCREENS.WORKSPACE.ACCOUNTING.NETSUITE_IMPORT_CUSTOM_FIELD_VIEW]: {path: ROUTES.POLICY_ACCOUNTING_NETSUITE_IMPORT_CUSTOM_FIELD_VIEW.route},
+                        [SCREENS.WORKSPACE.ACCOUNTING.NETSUITE_IMPORT_CUSTOM_FIELD_EDIT]: {path: ROUTES.POLICY_ACCOUNTING_NETSUITE_IMPORT_CUSTOM_FIELD_EDIT.route},
+                        [SCREENS.WORKSPACE.ACCOUNTING.NETSUITE_IMPORT_CUSTOM_LIST_ADD]: {path: ROUTES.POLICY_ACCOUNTING_NETSUITE_IMPORT_CUSTOM_LIST_ADD.route},
+                        [SCREENS.WORKSPACE.ACCOUNTING.NETSUITE_IMPORT_CUSTOM_SEGMENT_ADD]: {path: ROUTES.POLICY_ACCOUNTING_NETSUITE_IMPORT_CUSTOM_SEGMENT_ADD.route},
+                        [SCREENS.WORKSPACE.ACCOUNTING.NETSUITE_IMPORT_CUSTOMERS_OR_PROJECTS]: {path: ROUTES.POLICY_ACCOUNTING_NETSUITE_IMPORT_CUSTOMERS_OR_PROJECTS.route},
+                        [SCREENS.WORKSPACE.ACCOUNTING.NETSUITE_IMPORT_CUSTOMERS_OR_PROJECTS_SELECT]: {path: ROUTES.POLICY_ACCOUNTING_NETSUITE_IMPORT_CUSTOMERS_OR_PROJECTS_SELECT.route},
+                        [SCREENS.WORKSPACE.ACCOUNTING.NETSUITE_EXPORT]: {
+                            path: ROUTES.POLICY_ACCOUNTING_NETSUITE_EXPORT.route,
+                        },
+                        [SCREENS.WORKSPACE.ACCOUNTING.NETSUITE_PREFERRED_EXPORTER_SELECT]: {
+                            path: ROUTES.POLICY_ACCOUNTING_NETSUITE_PREFERRED_EXPORTER_SELECT.route,
+                        },
+                        [SCREENS.WORKSPACE.ACCOUNTING.NETSUITE_DATE_SELECT]: {
+                            path: ROUTES.POLICY_ACCOUNTING_NETSUITE_DATE_SELECT.route,
+                        },
+                        [SCREENS.WORKSPACE.ACCOUNTING.NETSUITE_EXPORT_EXPENSES]: {
+                            path: ROUTES.POLICY_ACCOUNTING_NETSUITE_EXPORT_EXPENSES.route,
+                        },
+                        [SCREENS.WORKSPACE.ACCOUNTING.NETSUITE_EXPORT_EXPENSES_DESTINATION_SELECT]: {
+                            path: ROUTES.POLICY_ACCOUNTING_NETSUITE_EXPORT_EXPENSES_DESTINATION_SELECT.route,
+                        },
+                        [SCREENS.WORKSPACE.ACCOUNTING.NETSUITE_EXPORT_EXPENSES_VENDOR_SELECT]: {
+                            path: ROUTES.POLICY_ACCOUNTING_NETSUITE_EXPORT_EXPENSES_VENDOR_SELECT.route,
+                        },
+                        [SCREENS.WORKSPACE.ACCOUNTING.NETSUITE_EXPORT_EXPENSES_PAYABLE_ACCOUNT_SELECT]: {
+                            path: ROUTES.POLICY_ACCOUNTING_NETSUITE_EXPORT_EXPENSES_PAYABLE_ACCOUNT_SELECT.route,
+                        },
+                        [SCREENS.WORKSPACE.ACCOUNTING.NETSUITE_EXPORT_EXPENSES_JOURNAL_POSTING_PREFERENCE_SELECT]: {
+                            path: ROUTES.POLICY_ACCOUNTING_NETSUITE_EXPORT_EXPENSES_JOURNAL_POSTING_PREFERENCE_SELECT.route,
+                        },
+                        [SCREENS.WORKSPACE.ACCOUNTING.NETSUITE_RECEIVABLE_ACCOUNT_SELECT]: {
+                            path: ROUTES.POLICY_ACCOUNTING_NETSUITE_RECEIVABLE_ACCOUNT_SELECT.route,
+                        },
+                        [SCREENS.WORKSPACE.ACCOUNTING.NETSUITE_INVOICE_ITEM_PREFERENCE_SELECT]: {
+                            path: ROUTES.POLICY_ACCOUNTING_NETSUITE_INVOICE_ITEM_PREFERENCE_SELECT.route,
+                        },
+                        [SCREENS.WORKSPACE.ACCOUNTING.NETSUITE_INVOICE_ITEM_SELECT]: {
+                            path: ROUTES.POLICY_ACCOUNTING_NETSUITE_INVOICE_ITEM_SELECT.route,
+                        },
+                        [SCREENS.WORKSPACE.ACCOUNTING.NETSUITE_TAX_POSTING_ACCOUNT_SELECT]: {
+                            path: ROUTES.POLICY_ACCOUNTING_NETSUITE_TAX_POSTING_ACCOUNT_SELECT.route,
+                        },
+                        [SCREENS.WORKSPACE.ACCOUNTING.NETSUITE_PROVINCIAL_TAX_POSTING_ACCOUNT_SELECT]: {
+                            path: ROUTES.POLICY_ACCOUNTING_NETSUITE_PROVINCIAL_TAX_POSTING_ACCOUNT_SELECT.route,
+                        },
+                        [SCREENS.WORKSPACE.ACCOUNTING.NETSUITE_ADVANCED]: {
+                            path: ROUTES.POLICY_ACCOUNTING_NETSUITE_ADVANCED.route,
+                        },
+                        [SCREENS.WORKSPACE.ACCOUNTING.NETSUITE_REIMBURSEMENT_ACCOUNT_SELECT]: {
+                            path: ROUTES.POLICY_ACCOUNTING_NETSUITE_REIMBURSEMENT_ACCOUNT_SELECT.route,
+                        },
+                        [SCREENS.WORKSPACE.ACCOUNTING.NETSUITE_COLLECTION_ACCOUNT_SELECT]: {
+                            path: ROUTES.POLICY_ACCOUNTING_NETSUITE_COLLECTION_ACCOUNT_SELECT.route,
+                        },
+                        [SCREENS.WORKSPACE.ACCOUNTING.NETSUITE_EXPENSE_REPORT_APPROVAL_LEVEL_SELECT]: {
+                            path: ROUTES.POLICY_ACCOUNTING_NETSUITE_EXPENSE_REPORT_APPROVAL_LEVEL_SELECT.route,
+                        },
+                        [SCREENS.WORKSPACE.ACCOUNTING.NETSUITE_VENDOR_BILL_APPROVAL_LEVEL_SELECT]: {
+                            path: ROUTES.POLICY_ACCOUNTING_NETSUITE_VENDOR_BILL_APPROVAL_LEVEL_SELECT.route,
+                        },
+                        [SCREENS.WORKSPACE.ACCOUNTING.NETSUITE_JOURNAL_ENTRY_APPROVAL_LEVEL_SELECT]: {
+                            path: ROUTES.POLICY_ACCOUNTING_NETSUITE_JOURNAL_ENTRY_APPROVAL_LEVEL_SELECT.route,
+                        },
+                        [SCREENS.WORKSPACE.ACCOUNTING.NETSUITE_APPROVAL_ACCOUNT_SELECT]: {
+                            path: ROUTES.POLICY_ACCOUNTING_NETSUITE_APPROVAL_ACCOUNT_SELECT.route,
+                        },
+                        [SCREENS.WORKSPACE.ACCOUNTING.NETSUITE_CUSTOM_FORM_ID]: {
+                            path: ROUTES.POLICY_ACCOUNTING_NETSUITE_CUSTOM_FORM_ID.route,
+                        },
+                        [SCREENS.WORKSPACE.ACCOUNTING.SAGE_INTACCT_PREREQUISITES]: {path: ROUTES.POLICY_ACCOUNTING_SAGE_INTACCT_PREREQUISITES.route},
+                        [SCREENS.WORKSPACE.ACCOUNTING.ENTER_SAGE_INTACCT_CREDENTIALS]: {path: ROUTES.POLICY_ACCOUNTING_SAGE_INTACCT_ENTER_CREDENTIALS.route},
+                        [SCREENS.WORKSPACE.ACCOUNTING.EXISTING_SAGE_INTACCT_CONNECTIONS]: {path: ROUTES.POLICY_ACCOUNTING_SAGE_INTACCT_EXISTING_CONNECTIONS.route},
+                        [SCREENS.WORKSPACE.ACCOUNTING.SAGE_INTACCT_ENTITY]: {path: ROUTES.POLICY_ACCOUNTING_SAGE_INTACCT_ENTITY.route},
+                        [SCREENS.WORKSPACE.ACCOUNTING.SAGE_INTACCT_IMPORT]: {path: ROUTES.POLICY_ACCOUNTING_SAGE_INTACCT_IMPORT.route},
+                        [SCREENS.WORKSPACE.ACCOUNTING.SAGE_INTACCT_MAPPING_TYPE]: {path: ROUTES.POLICY_ACCOUNTING_SAGE_INTACCT_MAPPINGS_TYPE.route},
+                        [SCREENS.WORKSPACE.ACCOUNTING.SAGE_INTACCT_TOGGLE_MAPPING]: {path: ROUTES.POLICY_ACCOUNTING_SAGE_INTACCT_TOGGLE_MAPPINGS.route},
+                        [SCREENS.WORKSPACE.ACCOUNTING.SAGE_INTACCT_USER_DIMENSIONS]: {path: ROUTES.POLICY_ACCOUNTING_SAGE_INTACCT_USER_DIMENSIONS.route},
+                        [SCREENS.WORKSPACE.ACCOUNTING.SAGE_INTACCT_ADD_USER_DIMENSION]: {path: ROUTES.POLICY_ACCOUNTING_SAGE_INTACCT_ADD_USER_DIMENSION.route},
+                        [SCREENS.WORKSPACE.ACCOUNTING.SAGE_INTACCT_EDIT_USER_DIMENSION]: {path: ROUTES.POLICY_ACCOUNTING_SAGE_INTACCT_EDIT_USER_DIMENSION.route},
+                        [SCREENS.WORKSPACE.ACCOUNTING.SAGE_INTACCT_EXPORT]: {path: ROUTES.POLICY_ACCOUNTING_SAGE_INTACCT_EXPORT.route},
+                        [SCREENS.WORKSPACE.ACCOUNTING.SAGE_INTACCT_PREFERRED_EXPORTER]: {path: ROUTES.POLICY_ACCOUNTING_SAGE_INTACCT_PREFERRED_EXPORTER.route},
+                        [SCREENS.WORKSPACE.ACCOUNTING.SAGE_INTACCT_EXPORT_DATE]: {path: ROUTES.POLICY_ACCOUNTING_SAGE_INTACCT_EXPORT_DATE.route},
+                        [SCREENS.WORKSPACE.ACCOUNTING.SAGE_INTACCT_REIMBURSABLE_EXPENSES]: {path: ROUTES.POLICY_ACCOUNTING_SAGE_INTACCT_REIMBURSABLE_EXPENSES.route},
+                        [SCREENS.WORKSPACE.ACCOUNTING.SAGE_INTACCT_NON_REIMBURSABLE_EXPENSES]: {path: ROUTES.POLICY_ACCOUNTING_SAGE_INTACCT_NON_REIMBURSABLE_EXPENSES.route},
+                        [SCREENS.WORKSPACE.ACCOUNTING.SAGE_INTACCT_DEFAULT_VENDOR]: {path: ROUTES.POLICY_ACCOUNTING_SAGE_INTACCT_DEFAULT_VENDOR.route},
+                        [SCREENS.WORKSPACE.ACCOUNTING.SAGE_INTACCT_NON_REIMBURSABLE_CREDIT_CARD_ACCOUNT]: {
+                            path: ROUTES.POLICY_ACCOUNTING_SAGE_INTACCT_NON_REIMBURSABLE_CREDIT_CARD_ACCOUNT.route,
+                        },
+                        [SCREENS.WORKSPACE.ACCOUNTING.SAGE_INTACCT_ADVANCED]: {path: ROUTES.POLICY_ACCOUNTING_SAGE_INTACCT_ADVANCED.route},
+                        [SCREENS.WORKSPACE.ACCOUNTING.SAGE_INTACCT_PAYMENT_ACCOUNT]: {path: ROUTES.POLICY_ACCOUNTING_SAGE_INTACCT_PAYMENT_ACCOUNT.route},
+                        [SCREENS.WORKSPACE.ACCOUNTING.CARD_RECONCILIATION]: {path: ROUTES.WORKSPACE_ACCOUNTING_CARD_RECONCILIATION.route},
+                        [SCREENS.WORKSPACE.ACCOUNTING.RECONCILIATION_ACCOUNT_SETTINGS]: {path: ROUTES.WORKSPACE_ACCOUNTING_RECONCILIATION_ACCOUNT_SETTINGS.route},
                         [SCREENS.WORKSPACE.DESCRIPTION]: {
                             path: ROUTES.WORKSPACE_PROFILE_DESCRIPTION.route,
                         },
@@ -344,6 +475,42 @@ const config: LinkingOptions<RootStackParamList>['config'] = {
                         [SCREENS.WORKSPACE.SHARE]: {
                             path: ROUTES.WORKSPACE_PROFILE_SHARE.route,
                         },
+                        [SCREENS.WORKSPACE.INVOICES_COMPANY_NAME]: {
+                            path: ROUTES.WORKSPACE_INVOICES_COMPANY_NAME.route,
+                        },
+                        [SCREENS.WORKSPACE.INVOICES_COMPANY_WEBSITE]: {
+                            path: ROUTES.WORKSPACE_INVOICES_COMPANY_WEBSITE.route,
+                        },
+                        [SCREENS.WORKSPACE.COMPANY_CARDS_SELECT_FEED]: {
+                            path: ROUTES.WORKSPACE_COMPANY_CARDS_SELECT_FEED.route,
+                        },
+                        [SCREENS.WORKSPACE.EXPENSIFY_CARD_LIMIT]: {
+                            path: ROUTES.WORKSPACE_EXPENSIFY_CARD_LIMIT.route,
+                        },
+                        [SCREENS.WORKSPACE.EXPENSIFY_CARD_ISSUE_NEW]: {
+                            path: ROUTES.WORKSPACE_EXPENSIFY_CARD_ISSUE_NEW.route,
+                        },
+                        [SCREENS.WORKSPACE.EXPENSIFY_CARD_NAME]: {
+                            path: ROUTES.WORKSPACE_EXPENSIFY_CARD_NAME.route,
+                        },
+                        [SCREENS.WORKSPACE.EXPENSIFY_CARD_LIMIT_TYPE]: {
+                            path: ROUTES.WORKSPACE_EXPENSIFY_CARD_LIMIT_TYPE.route,
+                        },
+                        [SCREENS.WORKSPACE.EXPENSIFY_CARD_BANK_ACCOUNT]: {
+                            path: ROUTES.WORKSPACE_EXPENSIFY_CARD_BANK_ACCOUNT.route,
+                        },
+                        [SCREENS.WORKSPACE.EXPENSIFY_CARD_SETTINGS]: {
+                            path: ROUTES.WORKSPACE_EXPENSIFY_CARD_SETTINGS.route,
+                        },
+                        [SCREENS.WORKSPACE.EXPENSIFY_CARD_SETTINGS_FREQUENCY]: {
+                            path: ROUTES.WORKSPACE_EXPENSIFY_CARD_SETTINGS_FREQUENCY.route,
+                        },
+                        [SCREENS.WORKSPACE.EXPENSIFY_CARD_SETTINGS_ACCOUNT]: {
+                            path: ROUTES.WORKSPACE_EXPENSIFY_CARD_SETTINGS_ACCOUNT.route,
+                        },
+                        [SCREENS.WORKSPACE.EXPENSIFY_CARD_DETAILS]: {
+                            path: ROUTES.WORKSPACE_EXPENSIFY_CARD_DETAILS.route,
+                        },
                         [SCREENS.WORKSPACE.RATE_AND_UNIT]: {
                             path: ROUTES.WORKSPACE_RATE_AND_UNIT.route,
                         },
@@ -356,8 +523,20 @@ const config: LinkingOptions<RootStackParamList>['config'] = {
                         [SCREENS.WORKSPACE.INVITE]: {
                             path: ROUTES.WORKSPACE_INVITE.route,
                         },
-                        [SCREENS.WORKSPACE.WORKFLOWS_APPROVER]: {
-                            path: ROUTES.WORKSPACE_WORKFLOWS_APPROVER.route,
+                        [SCREENS.WORKSPACE.WORKFLOWS_APPROVALS_NEW]: {
+                            path: ROUTES.WORKSPACE_WORKFLOWS_APPROVALS_NEW.route,
+                        },
+                        [SCREENS.WORKSPACE.WORKFLOWS_APPROVALS_EDIT]: {
+                            path: ROUTES.WORKSPACE_WORKFLOWS_APPROVALS_EDIT.route,
+                            parse: {
+                                firstApproverEmail: (firstApproverEmail: string) => decodeURIComponent(firstApproverEmail),
+                            },
+                        },
+                        [SCREENS.WORKSPACE.WORKFLOWS_APPROVALS_EXPENSES_FROM]: {
+                            path: ROUTES.WORKSPACE_WORKFLOWS_APPROVALS_EXPENSES_FROM.route,
+                        },
+                        [SCREENS.WORKSPACE.WORKFLOWS_APPROVALS_APPROVER]: {
+                            path: ROUTES.WORKSPACE_WORKFLOWS_APPROVALS_APPROVER.route,
                         },
                         [SCREENS.WORKSPACE.INVITE_MESSAGE]: {
                             path: ROUTES.WORKSPACE_INVITE_MESSAGE.route,
@@ -368,6 +547,12 @@ const config: LinkingOptions<RootStackParamList>['config'] = {
                                 categoryName: (categoryName: string) => decodeURIComponent(categoryName),
                             },
                         },
+                        [SCREENS.WORKSPACE.UPGRADE]: {
+                            path: ROUTES.WORKSPACE_UPGRADE.route,
+                            parse: {
+                                featureName: (featureName: string) => decodeURIComponent(featureName),
+                            },
+                        },
                         [SCREENS.WORKSPACE.CATEGORIES_SETTINGS]: {
                             path: ROUTES.WORKSPACE_CATEGORIES_SETTINGS.route,
                         },
@@ -395,6 +580,18 @@ const config: LinkingOptions<RootStackParamList>['config'] = {
                                 categoryName: (categoryName: string) => decodeURIComponent(categoryName),
                             },
                         },
+                        [SCREENS.WORKSPACE.CATEGORY_PAYROLL_CODE]: {
+                            path: ROUTES.WORKSPACE_CATEGORY_PAYROLL_CODE.route,
+                            parse: {
+                                categoryName: (categoryName: string) => decodeURIComponent(categoryName),
+                            },
+                        },
+                        [SCREENS.WORKSPACE.CATEGORY_GL_CODE]: {
+                            path: ROUTES.WORKSPACE_CATEGORY_GL_CODE.route,
+                            parse: {
+                                categoryName: (categoryName: string) => decodeURIComponent(categoryName),
+                            },
+                        },
                         [SCREENS.WORKSPACE.CREATE_DISTANCE_RATE]: {
                             path: ROUTES.WORKSPACE_CREATE_DISTANCE_RATE.route,
                         },
@@ -407,11 +604,20 @@ const config: LinkingOptions<RootStackParamList>['config'] = {
                         [SCREENS.WORKSPACE.DISTANCE_RATE_EDIT]: {
                             path: ROUTES.WORKSPACE_DISTANCE_RATE_EDIT.route,
                         },
+                        [SCREENS.WORKSPACE.DISTANCE_RATE_TAX_RECLAIMABLE_ON_EDIT]: {
+                            path: ROUTES.WORKSPACE_DISTANCE_RATE_TAX_RECLAIMABLE_ON_EDIT.route,
+                        },
+                        [SCREENS.WORKSPACE.DISTANCE_RATE_TAX_RATE_EDIT]: {
+                            path: ROUTES.WORKSPACE_DISTANCE_RATE_TAX_RATE_EDIT.route,
+                        },
                         [SCREENS.WORKSPACE.TAGS_SETTINGS]: {
                             path: ROUTES.WORKSPACE_TAGS_SETTINGS.route,
                         },
                         [SCREENS.WORKSPACE.TAGS_EDIT]: {
                             path: ROUTES.WORKSPACE_EDIT_TAGS.route,
+                            parse: {
+                                orderWeight: Number,
+                            },
                         },
                         [SCREENS.WORKSPACE.TAG_CREATE]: {
                             path: ROUTES.WORKSPACE_TAG_CREATE.route,
@@ -419,15 +625,30 @@ const config: LinkingOptions<RootStackParamList>['config'] = {
                         [SCREENS.WORKSPACE.TAG_EDIT]: {
                             path: ROUTES.WORKSPACE_TAG_EDIT.route,
                             parse: {
+                                orderWeight: Number,
+                                tagName: (tagName: string) => decodeURIComponent(tagName),
+                            },
+                        },
+                        [SCREENS.WORKSPACE.TAG_GL_CODE]: {
+                            path: ROUTES.WORKSPACE_TAG_GL_CODE.route,
+                            parse: {
+                                orderWeight: Number,
                                 tagName: (tagName: string) => decodeURIComponent(tagName),
                             },
                         },
                         [SCREENS.WORKSPACE.TAG_SETTINGS]: {
                             path: ROUTES.WORKSPACE_TAG_SETTINGS.route,
                             parse: {
+                                orderWeight: Number,
                                 tagName: (tagName: string) => decodeURIComponent(tagName),
                             },
                         },
+                        [SCREENS.WORKSPACE.TAG_LIST_VIEW]: {
+                            path: ROUTES.WORKSPACE_TAG_LIST_VIEW.route,
+                            parse: {
+                                orderWeight: Number,
+                            },
+                        },
                         [SCREENS.WORKSPACE.TAXES_SETTINGS]: {
                             path: ROUTES.WORKSPACE_TAXES_SETTINGS.route,
                         },
@@ -440,6 +661,42 @@ const config: LinkingOptions<RootStackParamList>['config'] = {
                         [SCREENS.WORKSPACE.TAXES_SETTINGS_WORKSPACE_CURRENCY_DEFAULT]: {
                             path: ROUTES.WORKSPACE_TAXES_SETTINGS_WORKSPACE_CURRENCY_DEFAULT.route,
                         },
+                        [SCREENS.WORKSPACE.REPORT_FIELDS_CREATE]: {
+                            path: ROUTES.WORKSPACE_CREATE_REPORT_FIELD.route,
+                        },
+                        [SCREENS.WORKSPACE.REPORT_FIELDS_LIST_VALUES]: {
+                            path: ROUTES.WORKSPACE_REPORT_FIELDS_LIST_VALUES.route,
+                            parse: {
+                                reportFieldID: (reportFieldID: string) => decodeURIComponent(reportFieldID),
+                            },
+                        },
+                        [SCREENS.WORKSPACE.REPORT_FIELDS_ADD_VALUE]: {
+                            path: ROUTES.WORKSPACE_REPORT_FIELDS_ADD_VALUE.route,
+                            parse: {
+                                reportFieldID: (reportFieldID: string) => decodeURIComponent(reportFieldID),
+                            },
+                        },
+                        [SCREENS.WORKSPACE.REPORT_FIELDS_VALUE_SETTINGS]: {
+                            path: ROUTES.WORKSPACE_REPORT_FIELDS_VALUE_SETTINGS.route,
+                            parse: {
+                                reportFieldID: (reportFieldID: string) => decodeURIComponent(reportFieldID),
+                            },
+                        },
+                        [SCREENS.WORKSPACE.REPORT_FIELDS_EDIT_VALUE]: {
+                            path: ROUTES.WORKSPACE_REPORT_FIELDS_EDIT_VALUE.route,
+                        },
+                        [SCREENS.WORKSPACE.REPORT_FIELDS_SETTINGS]: {
+                            path: ROUTES.WORKSPACE_REPORT_FIELDS_SETTINGS.route,
+                            parse: {
+                                reportFieldID: (reportFieldID: string) => decodeURIComponent(reportFieldID),
+                            },
+                        },
+                        [SCREENS.WORKSPACE.REPORT_FIELDS_EDIT_INITIAL_VALUE]: {
+                            path: ROUTES.WORKSPACE_EDIT_REPORT_FIELDS_INITIAL_VALUE.route,
+                            parse: {
+                                reportFieldID: (reportFieldID: string) => decodeURIComponent(reportFieldID),
+                            },
+                        },
                         [SCREENS.REIMBURSEMENT_ACCOUNT]: {
                             path: ROUTES.BANK_ACCOUNT_WITH_STEP_TO_OPEN.route,
                             exact: true,
@@ -472,6 +729,12 @@ const config: LinkingOptions<RootStackParamList>['config'] = {
                                 taxID: (taxID: string) => decodeURIComponent(taxID),
                             },
                         },
+                        [SCREENS.WORKSPACE.TAX_CODE]: {
+                            path: ROUTES.WORKSPACE_TAX_CODE.route,
+                            parse: {
+                                taxID: (taxID: string) => decodeURIComponent(taxID),
+                            },
+                        },
                         [SCREENS.WORKSPACE.TAX_NAME]: {
                             path: ROUTES.WORKSPACE_TAX_NAME.route,
                             parse: {
@@ -484,6 +747,18 @@ const config: LinkingOptions<RootStackParamList>['config'] = {
                                 taxID: (taxID: string) => decodeURIComponent(taxID),
                             },
                         },
+                        [SCREENS.WORKSPACE.RULES_RECEIPT_REQUIRED_AMOUNT]: {
+                            path: ROUTES.RULES_RECEIPT_REQUIRED_AMOUNT.route,
+                        },
+                        [SCREENS.WORKSPACE.RULES_MAX_EXPENSE_AMOUNT]: {
+                            path: ROUTES.RULES_MAX_EXPENSE_AMOUNT.route,
+                        },
+                        [SCREENS.WORKSPACE.RULES_MAX_EXPENSE_AGE]: {
+                            path: ROUTES.RULES_MAX_EXPENSE_AGE.route,
+                        },
+                        [SCREENS.WORKSPACE.RULES_BILLABLE_DEFAULT]: {
+                            path: ROUTES.RULES_BILLABLE_DEFAULT.route,
+                        },
                     },
                 },
                 [SCREENS.RIGHT_MODAL.PRIVATE_NOTES]: {
@@ -496,6 +771,7 @@ const config: LinkingOptions<RootStackParamList>['config'] = {
                     screens: {
                         [SCREENS.REPORT_DETAILS.ROOT]: ROUTES.REPORT_WITH_ID_DETAILS.route,
                         [SCREENS.REPORT_DETAILS.SHARE_CODE]: ROUTES.REPORT_WITH_ID_DETAILS_SHARE_CODE.route,
+                        [SCREENS.REPORT_DETAILS.EXPORT]: ROUTES.REPORT_WITH_ID_DETAILS_EXPORT.route,
                     },
                 },
                 [SCREENS.RIGHT_MODAL.REPORT_SETTINGS]: {
@@ -503,11 +779,8 @@ const config: LinkingOptions<RootStackParamList>['config'] = {
                         [SCREENS.REPORT_SETTINGS.ROOT]: {
                             path: ROUTES.REPORT_SETTINGS.route,
                         },
-                        [SCREENS.REPORT_SETTINGS.ROOM_NAME]: {
-                            path: ROUTES.REPORT_SETTINGS_ROOM_NAME.route,
-                        },
-                        [SCREENS.REPORT_SETTINGS.GROUP_NAME]: {
-                            path: ROUTES.REPORT_SETTINGS_GROUP_NAME.route,
+                        [SCREENS.REPORT_SETTINGS.NAME]: {
+                            path: ROUTES.REPORT_SETTINGS_NAME.route,
                         },
                         [SCREENS.REPORT_SETTINGS.NOTIFICATION_PREFERENCES]: {
                             path: ROUTES.REPORT_SETTINGS_NOTIFICATION_PREFERENCES.route,
@@ -520,6 +793,28 @@ const config: LinkingOptions<RootStackParamList>['config'] = {
                         },
                     },
                 },
+                [SCREENS.RIGHT_MODAL.SETTINGS_CATEGORIES]: {
+                    screens: {
+                        [SCREENS.SETTINGS_CATEGORIES.SETTINGS_CATEGORY_SETTINGS]: {
+                            path: ROUTES.SETTINGS_CATEGORY_SETTINGS.route,
+                            parse: {
+                                categoryName: (categoryName: string) => decodeURIComponent(categoryName),
+                            },
+                        },
+                        [SCREENS.SETTINGS_CATEGORIES.SETTINGS_CATEGORIES_SETTINGS]: {
+                            path: ROUTES.SETTINGS_CATEGORIES_SETTINGS.route,
+                        },
+                        [SCREENS.SETTINGS_CATEGORIES.SETTINGS_CATEGORY_CREATE]: {
+                            path: ROUTES.SETTINGS_CATEGORY_CREATE.route,
+                        },
+                        [SCREENS.SETTINGS_CATEGORIES.SETTINGS_CATEGORY_EDIT]: {
+                            path: ROUTES.SETTINGS_CATEGORY_EDIT.route,
+                            parse: {
+                                categoryName: (categoryName: string) => decodeURIComponent(categoryName),
+                            },
+                        },
+                    },
+                },
                 [SCREENS.RIGHT_MODAL.REPORT_DESCRIPTION]: {
                     screens: {
                         [SCREENS.REPORT_DESCRIPTION_ROOT]: ROUTES.REPORT_DESCRIPTION.route,
@@ -568,11 +863,6 @@ const config: LinkingOptions<RootStackParamList>['config'] = {
                         [SCREENS.I_AM_A_TEACHER]: ROUTES.I_AM_A_TEACHER,
                     },
                 },
-                [SCREENS.RIGHT_MODAL.DETAILS]: {
-                    screens: {
-                        [SCREENS.DETAILS_ROOT]: ROUTES.DETAILS.route,
-                    },
-                },
                 [SCREENS.RIGHT_MODAL.PROFILE]: {
                     screens: {
                         [SCREENS.PROFILE_ROOT]: ROUTES.PROFILE.route,
@@ -617,7 +907,9 @@ const config: LinkingOptions<RootStackParamList>['config'] = {
                                 },
                             },
                         },
+                        [SCREENS.SETTINGS_CATEGORIES.SETTINGS_CATEGORIES_ROOT]: ROUTES.SETTINGS_CATEGORIES_ROOT.route,
                         [SCREENS.MONEY_REQUEST.STEP_SEND_FROM]: ROUTES.MONEY_REQUEST_STEP_SEND_FROM.route,
+                        [SCREENS.MONEY_REQUEST.STEP_COMPANY_INFO]: ROUTES.MONEY_REQUEST_STEP_COMPANY_INFO.route,
                         [SCREENS.MONEY_REQUEST.STEP_AMOUNT]: ROUTES.MONEY_REQUEST_STEP_AMOUNT.route,
                         [SCREENS.MONEY_REQUEST.STEP_CATEGORY]: ROUTES.MONEY_REQUEST_STEP_CATEGORY.route,
                         [SCREENS.MONEY_REQUEST.STEP_CONFIRMATION]: ROUTES.MONEY_REQUEST_STEP_CONFIRMATION.route,
@@ -641,6 +933,46 @@ const config: LinkingOptions<RootStackParamList>['config'] = {
                         [SCREENS.IOU_SEND.ADD_DEBIT_CARD]: ROUTES.IOU_SEND_ADD_DEBIT_CARD,
                     },
                 },
+                [SCREENS.RIGHT_MODAL.TRANSACTION_DUPLICATE]: {
+                    screens: {
+                        [SCREENS.TRANSACTION_DUPLICATE.REVIEW]: {
+                            path: ROUTES.TRANSACTION_DUPLICATE_REVIEW_PAGE.route,
+                            exact: true,
+                        },
+                        [SCREENS.TRANSACTION_DUPLICATE.MERCHANT]: {
+                            path: ROUTES.TRANSACTION_DUPLICATE_REVIEW_MERCHANT_PAGE.route,
+                            exact: true,
+                        },
+                        [SCREENS.TRANSACTION_DUPLICATE.CATEGORY]: {
+                            path: ROUTES.TRANSACTION_DUPLICATE_REVIEW_CATEGORY_PAGE.route,
+                            exact: true,
+                        },
+                        [SCREENS.TRANSACTION_DUPLICATE.TAG]: {
+                            path: ROUTES.TRANSACTION_DUPLICATE_REVIEW_TAG_PAGE.route,
+                            exact: true,
+                        },
+                        [SCREENS.TRANSACTION_DUPLICATE.DESCRIPTION]: {
+                            path: ROUTES.TRANSACTION_DUPLICATE_REVIEW_DESCRIPTION_PAGE.route,
+                            exact: true,
+                        },
+                        [SCREENS.TRANSACTION_DUPLICATE.TAX_CODE]: {
+                            path: ROUTES.TRANSACTION_DUPLICATE_REVIEW_TAX_CODE_PAGE.route,
+                            exact: true,
+                        },
+                        [SCREENS.TRANSACTION_DUPLICATE.REIMBURSABLE]: {
+                            path: ROUTES.TRANSACTION_DUPLICATE_REVIEW_REIMBURSABLE_PAGE.route,
+                            exact: true,
+                        },
+                        [SCREENS.TRANSACTION_DUPLICATE.BILLABLE]: {
+                            path: ROUTES.TRANSACTION_DUPLICATE_REVIEW_BILLABLE_PAGE.route,
+                            exact: true,
+                        },
+                        [SCREENS.TRANSACTION_DUPLICATE.CONFIRMATION]: {
+                            path: ROUTES.TRANSACTION_DUPLICATE_CONFIRMATION_PAGE.route,
+                            exact: true,
+                        },
+                    },
+                },
                 [SCREENS.RIGHT_MODAL.SPLIT_DETAILS]: {
                     screens: {
                         [SCREENS.SPLIT_DETAILS.ROOT]: ROUTES.SPLIT_BILL_DETAILS.route,
@@ -701,6 +1033,31 @@ const config: LinkingOptions<RootStackParamList>['config'] = {
                 [SCREENS.RIGHT_MODAL.SEARCH_REPORT]: {
                     screens: {
                         [SCREENS.SEARCH.REPORT_RHP]: ROUTES.SEARCH_REPORT.route,
+                        [SCREENS.SEARCH.TRANSACTION_HOLD_REASON_RHP]: ROUTES.TRANSACTION_HOLD_REASON_RHP,
+                    },
+                },
+                [SCREENS.RIGHT_MODAL.SEARCH_ADVANCED_FILTERS]: {
+                    screens: {
+                        [SCREENS.SEARCH.ADVANCED_FILTERS_RHP]: ROUTES.SEARCH_ADVANCED_FILTERS,
+                        [SCREENS.SEARCH.ADVANCED_FILTERS_DATE_RHP]: ROUTES.SEARCH_ADVANCED_FILTERS_DATE,
+                        [SCREENS.SEARCH.ADVANCED_FILTERS_CURRENCY_RHP]: ROUTES.SEARCH_ADVANCED_FILTERS_CURRENCY,
+                        [SCREENS.SEARCH.ADVANCED_FILTERS_MERCHANT_RHP]: ROUTES.SEARCH_ADVANCED_FILTERS_MERCHANT,
+                        [SCREENS.SEARCH.ADVANCED_FILTERS_DESCRIPTION_RHP]: ROUTES.SEARCH_ADVANCED_FILTERS_DESCRIPTION,
+                        [SCREENS.SEARCH.ADVANCED_FILTERS_REPORT_ID_RHP]: ROUTES.SEARCH_ADVANCED_FILTERS_REPORT_ID,
+                        [SCREENS.SEARCH.ADVANCED_FILTERS_AMOUNT_RHP]: ROUTES.SEARCH_ADVANCED_FILTERS_AMOUNT,
+                        [SCREENS.SEARCH.ADVANCED_FILTERS_CATEGORY_RHP]: ROUTES.SEARCH_ADVANCED_FILTERS_CATEGORY,
+                        [SCREENS.SEARCH.ADVANCED_FILTERS_KEYWORD_RHP]: ROUTES.SEARCH_ADVANCED_FILTERS_KEYWORD,
+                        [SCREENS.SEARCH.ADVANCED_FILTERS_CARD_RHP]: ROUTES.SEARCH_ADVANCED_FILTERS_CARD,
+                        [SCREENS.SEARCH.ADVANCED_FILTERS_TAX_RATE_RHP]: ROUTES.SEARCH_ADVANCED_FILTERS_TAX_RATE,
+                        [SCREENS.SEARCH.ADVANCED_FILTERS_EXPENSE_TYPE_RHP]: ROUTES.SEARCH_ADVANCED_FILTERS_EXPENSE_TYPE,
+                        [SCREENS.SEARCH.ADVANCED_FILTERS_TAG_RHP]: ROUTES.SEARCH_ADVANCED_FILTERS_TAG,
+                        [SCREENS.SEARCH.ADVANCED_FILTERS_FROM_RHP]: ROUTES.SEARCH_ADVANCED_FILTERS_FROM,
+                        [SCREENS.SEARCH.ADVANCED_FILTERS_TO_RHP]: ROUTES.SEARCH_ADVANCED_FILTERS_TO,
+                    },
+                },
+                [SCREENS.RIGHT_MODAL.RESTRICTED_ACTION]: {
+                    screens: {
+                        [SCREENS.RESTRICTED_ACTION_ROOT]: ROUTES.RESTRICTED_ACTION.route,
                     },
                 },
             },
@@ -711,53 +1068,85 @@ const config: LinkingOptions<RootStackParamList>['config'] = {
                 [SCREENS.WORKSPACE.INITIAL]: {
                     path: ROUTES.WORKSPACE_INITIAL.route,
                 },
-                [SCREENS.WORKSPACES_CENTRAL_PANE]: {
-                    screens: {
-                        [SCREENS.WORKSPACE.PROFILE]: ROUTES.WORKSPACE_PROFILE.route,
-                        [SCREENS.WORKSPACE.CARD]: {
-                            path: ROUTES.WORKSPACE_CARD.route,
-                        },
-                        [SCREENS.WORKSPACE.WORKFLOWS]: {
-                            path: ROUTES.WORKSPACE_WORKFLOWS.route,
-                        },
-                        [SCREENS.WORKSPACE.REIMBURSE]: {
-                            path: ROUTES.WORKSPACE_REIMBURSE.route,
-                        },
-                        [SCREENS.WORKSPACE.BILLS]: {
-                            path: ROUTES.WORKSPACE_BILLS.route,
-                        },
-                        [SCREENS.WORKSPACE.INVOICES]: {
-                            path: ROUTES.WORKSPACE_INVOICES.route,
-                        },
-                        [SCREENS.WORKSPACE.TRAVEL]: {
-                            path: ROUTES.WORKSPACE_TRAVEL.route,
-                        },
-                        [SCREENS.WORKSPACE.MEMBERS]: {
-                            path: ROUTES.WORKSPACE_MEMBERS.route,
-                        },
-                        [SCREENS.WORKSPACE.ACCOUNTING.ROOT]: {
-                            path: ROUTES.POLICY_ACCOUNTING.route,
-                        },
-                        [SCREENS.WORKSPACE.CATEGORIES]: {
-                            path: ROUTES.WORKSPACE_CATEGORIES.route,
-                        },
-                        [SCREENS.WORKSPACE.MORE_FEATURES]: {
-                            path: ROUTES.WORKSPACE_MORE_FEATURES.route,
-                        },
-                        [SCREENS.WORKSPACE.TAGS]: {
-                            path: ROUTES.WORKSPACE_TAGS.route,
-                        },
-                        [SCREENS.WORKSPACE.TAXES]: {
-                            path: ROUTES.WORKSPACE_TAXES.route,
-                        },
-                        [SCREENS.WORKSPACE.DISTANCE_RATES]: {
-                            path: ROUTES.WORKSPACE_DISTANCE_RATES.route,
-                        },
-                    },
+                [SCREENS.WORKSPACE.PROFILE]: ROUTES.WORKSPACE_PROFILE.route,
+                [SCREENS.WORKSPACE.CARD]: {
+                    path: ROUTES.WORKSPACE_CARD.route,
+                },
+                [SCREENS.WORKSPACE.EXPENSIFY_CARD]: {
+                    path: ROUTES.WORKSPACE_EXPENSIFY_CARD.route,
+                },
+                [SCREENS.WORKSPACE.COMPANY_CARDS]: {
+                    path: ROUTES.WORKSPACE_COMPANY_CARDS.route,
+                },
+                [SCREENS.WORKSPACE.WORKFLOWS]: {
+                    path: ROUTES.WORKSPACE_WORKFLOWS.route,
+                },
+                [SCREENS.WORKSPACE.REIMBURSE]: {
+                    path: ROUTES.WORKSPACE_REIMBURSE.route,
+                },
+                [SCREENS.WORKSPACE.BILLS]: {
+                    path: ROUTES.WORKSPACE_BILLS.route,
+                },
+                [SCREENS.WORKSPACE.INVOICES]: {
+                    path: ROUTES.WORKSPACE_INVOICES.route,
+                },
+                [SCREENS.WORKSPACE.TRAVEL]: {
+                    path: ROUTES.WORKSPACE_TRAVEL.route,
+                },
+                [SCREENS.WORKSPACE.MEMBERS]: {
+                    path: ROUTES.WORKSPACE_MEMBERS.route,
+                },
+                [SCREENS.WORKSPACE.ACCOUNTING.ROOT]: {
+                    path: ROUTES.POLICY_ACCOUNTING.route,
+                },
+                [SCREENS.WORKSPACE.CATEGORIES]: {
+                    path: ROUTES.WORKSPACE_CATEGORIES.route,
+                },
+                [SCREENS.WORKSPACE.MORE_FEATURES]: {
+                    path: ROUTES.WORKSPACE_MORE_FEATURES.route,
+                },
+                [SCREENS.WORKSPACE.TAGS]: {
+                    path: ROUTES.WORKSPACE_TAGS.route,
+                },
+                [SCREENS.WORKSPACE.TAXES]: {
+                    path: ROUTES.WORKSPACE_TAXES.route,
+                },
+                [SCREENS.WORKSPACE.REPORT_FIELDS]: {
+                    path: ROUTES.WORKSPACE_REPORT_FIELDS.route,
+                },
+                [SCREENS.WORKSPACE.DISTANCE_RATES]: {
+                    path: ROUTES.WORKSPACE_DISTANCE_RATES.route,
+                },
+                [SCREENS.WORKSPACE.RULES]: {
+                    path: ROUTES.WORKSPACE_RULES.route,
                 },
             },
         },
     },
 };
 
+const normalizedConfigs = Object.keys(config.screens)
+    .map((key) =>
+        createNormalizedConfigs(
+            key,
+            config.screens,
+            [],
+            config.initialRouteName
+                ? [
+                      {
+                          initialRouteName: config.initialRouteName,
+                          parentScreens: [],
+                      },
+                  ]
+                : [],
+            [],
+        ),
+    )
+    .flat()
+    .reduce((acc, route) => {
+        acc[route.screen as Screen] = route;
+        return acc;
+    }, {} as Record<Screen, RouteConfig>);
+
+export {normalizedConfigs};
 export default config;
diff --git a/src/libs/Navigation/linkingConfig/createNormalizedConfigs.ts b/src/libs/Navigation/linkingConfig/createNormalizedConfigs.ts
new file mode 100644
index 000000000000..9e21c7d073cb
--- /dev/null
+++ b/src/libs/Navigation/linkingConfig/createNormalizedConfigs.ts
@@ -0,0 +1,135 @@
+/* eslint-disable @typescript-eslint/no-unsafe-assignment */
+
+/* eslint-disable @typescript-eslint/default-param-last */
+
+/* eslint-disable @typescript-eslint/prefer-nullish-coalescing */
+
+/* eslint-disable no-param-reassign */
+
+/* eslint-disable @typescript-eslint/no-unsafe-argument */
+
+/* eslint-disable @typescript-eslint/no-non-null-assertion */
+
+/* eslint-disable @typescript-eslint/no-unsafe-member-access */
+
+/* eslint-disable @typescript-eslint/no-explicit-any */
+
+/* eslint-disable @typescript-eslint/ban-types */
+// THOSE FUNCTIONS ARE COPIED FROM react-navigation/core IN ORDER TO AVOID PATCHING
+// THAT'S THE REASON WHY ESLINT IS DISABLED
+import type {PathConfigMap} from '@react-navigation/native';
+
+type ParseConfig = Record<string, (value: string) => any>;
+
+type RouteConfig = {
+    screen: string;
+    regex?: RegExp;
+    path: string;
+    pattern: string;
+    routeNames: string[];
+    parse?: ParseConfig;
+};
+
+type InitialRouteConfig = {
+    initialRouteName: string;
+    parentScreens: string[];
+};
+
+const joinPaths = (...paths: string[]): string =>
+    ([] as string[])
+        .concat(...paths.map((p) => p.split('/')))
+        .filter(Boolean)
+        .join('/');
+
+const createConfigItem = (screen: string, routeNames: string[], pattern: string, path: string, parse?: ParseConfig): RouteConfig => {
+    // Normalize pattern to remove any leading, trailing slashes, duplicate slashes etc.
+    pattern = pattern.split('/').filter(Boolean).join('/');
+
+    const regex = pattern
+        ? new RegExp(
+              `^(${pattern
+                  .split('/')
+                  .map((it) => {
+                      if (it.startsWith(':')) {
+                          return `(([^/]+\\/)${it.endsWith('?') ? '?' : ''})`;
+                      }
+
+                      return `${it === '*' ? '.*' : escape(it)}\\/`;
+                  })
+                  .join('')})`,
+          )
+        : undefined;
+
+    return {
+        screen,
+        regex,
+        pattern,
+        path,
+        // The routeNames array is mutated, so copy it to keep the current state
+        routeNames: [...routeNames],
+        parse,
+    };
+};
+
+const createNormalizedConfigs = (
+    screen: string,
+    routeConfig: PathConfigMap<object>,
+    routeNames: string[] = [],
+    initials: InitialRouteConfig[],
+    parentScreens: string[],
+    parentPattern?: string,
+): RouteConfig[] => {
+    const configs: RouteConfig[] = [];
+
+    routeNames.push(screen);
+
+    parentScreens.push(screen);
+
+    // @ts-expect-error: we can't strongly typecheck this for now
+    const config = routeConfig[screen];
+
+    if (typeof config === 'string') {
+        // If a string is specified as the value of the key(e.g. Foo: '/path'), use it as the pattern
+        const pattern = parentPattern ? joinPaths(parentPattern, config) : config;
+
+        configs.push(createConfigItem(screen, routeNames, pattern, config));
+    } else if (typeof config === 'object') {
+        let pattern: string | undefined;
+
+        // if an object is specified as the value (e.g. Foo: { ... }),
+        // it can have `path` property and
+        // it could have `screens` prop which has nested configs
+        if (typeof config.path === 'string') {
+            if (config.exact && config.path === undefined) {
+                throw new Error("A 'path' needs to be specified when specifying 'exact: true'. If you don't want this screen in the URL, specify it as empty string, e.g. `path: ''`.");
+            }
+
+            pattern = config.exact !== true ? joinPaths(parentPattern || '', config.path || '') : config.path || '';
+
+            configs.push(createConfigItem(screen, routeNames, pattern!, config.path, config.parse));
+        }
+
+        if (config.screens) {
+            // property `initialRouteName` without `screens` has no purpose
+            if (config.initialRouteName) {
+                initials.push({
+                    initialRouteName: config.initialRouteName,
+                    parentScreens,
+                });
+            }
+
+            Object.keys(config.screens).forEach((nestedConfig) => {
+                const result = createNormalizedConfigs(nestedConfig, config.screens as PathConfigMap<object>, routeNames, initials, [...parentScreens], pattern ?? parentPattern);
+
+                configs.push(...result);
+            });
+        }
+    }
+
+    routeNames.pop();
+
+    return configs;
+};
+
+export type {RouteConfig};
+export default createNormalizedConfigs;
diff --git a/src/libs/Navigation/linkingConfig/customGetPathFromState.ts b/src/libs/Navigation/linkingConfig/customGetPathFromState.ts
index 4017b1b2b17c..a9c9b6f23b19 100644
--- a/src/libs/Navigation/linkingConfig/customGetPathFromState.ts
+++ b/src/libs/Navigation/linkingConfig/customGetPathFromState.ts
@@ -1,26 +1,21 @@
 import {getPathFromState} from '@react-navigation/native';
-import _ from 'lodash';
 import getPolicyIDFromState from '@libs/Navigation/getPolicyIDFromState';
 import getTopmostBottomTabRoute from '@libs/Navigation/getTopmostBottomTabRoute';
-import type {RootStackParamList, State} from '@libs/Navigation/types';
+import type {BottomTabName, RootStackParamList, State} from '@libs/Navigation/types';
+import {removePolicyIDParamFromState} from '@libs/NavigationUtils';
 import SCREENS from '@src/SCREENS';
 
-const removePolicyIDParamFromState = (state: State<RootStackParamList>) => {
-    const stateCopy = _.cloneDeep(state);
-    const bottomTabRoute = getTopmostBottomTabRoute(stateCopy);
-    if (bottomTabRoute?.params && 'policyID' in bottomTabRoute.params) {
-        delete bottomTabRoute.params.policyID;
-    }
-    return stateCopy;
-};
+// The policy ID parameter should be included in the URL when any of these pages is opened in the bottom tab.
+const SCREENS_WITH_POLICY_ID_IN_URL: BottomTabName[] = [SCREENS.HOME] as const;
 
 const customGetPathFromState: typeof getPathFromState = (state, options) => {
     // For the Home and Settings pages we should remove policyID from the params, because on small screens it's displayed twice in the URL
     const stateWithoutPolicyID = removePolicyIDParamFromState(state as State<RootStackParamList>);
     const path = getPathFromState(stateWithoutPolicyID, options);
     const policyIDFromState = getPolicyIDFromState(state as State<RootStackParamList>);
-    const isHomeOpened = getTopmostBottomTabRoute(state as State<RootStackParamList>)?.name === SCREENS.HOME;
-    return `${policyIDFromState && isHomeOpened ? `/w/${policyIDFromState}` : ''}${path}`;
+    const topmostBottomTabRouteName = getTopmostBottomTabRoute(state as State<RootStackParamList>)?.name;
+    const shouldAddPolicyID = !!topmostBottomTabRouteName && SCREENS_WITH_POLICY_ID_IN_URL.includes(topmostBottomTabRouteName);
+    return `${policyIDFromState && shouldAddPolicyID ? `/w/${policyIDFromState}` : ''}${path}`;
 };
 
 export default customGetPathFromState;
diff --git a/src/libs/Navigation/linkingConfig/getAdaptedStateFromPath.ts b/src/libs/Navigation/linkingConfig/getAdaptedStateFromPath.ts
index d89c6c5a1751..10e68ad4a6a8 100644
--- a/src/libs/Navigation/linkingConfig/getAdaptedStateFromPath.ts
+++ b/src/libs/Navigation/linkingConfig/getAdaptedStateFromPath.ts
@@ -1,22 +1,37 @@
 import type {NavigationState, PartialState, Route} from '@react-navigation/native';
-import {getStateFromPath} from '@react-navigation/native';
+import {findFocusedRoute, getStateFromPath} from '@react-navigation/native';
+import pick from 'lodash/pick';
+import type {TupleToUnion} from 'type-fest';
 import {isAnonymousUser} from '@libs/actions/Session';
 import getIsNarrowLayout from '@libs/getIsNarrowLayout';
-import getTopmostNestedRHPRoute from '@libs/Navigation/getTopmostNestedRHPRoute';
 import type {BottomTabName, CentralPaneName, FullScreenName, NavigationPartialRoute, RootStackParamList} from '@libs/Navigation/types';
+import {isCentralPaneName} from '@libs/NavigationUtils';
 import {extractPolicyIDFromPath, getPathWithoutPolicyID} from '@libs/PolicyUtils';
+import * as ReportConnection from '@libs/ReportConnection';
+import extractPolicyIDFromQuery from '@navigation/extractPolicyIDFromQuery';
+import CONST from '@src/CONST';
 import NAVIGATORS from '@src/NAVIGATORS';
+import ONYXKEYS from '@src/ONYXKEYS';
+import type {Screen} from '@src/SCREENS';
 import SCREENS from '@src/SCREENS';
 import CENTRAL_PANE_TO_RHP_MAPPING from './CENTRAL_PANE_TO_RHP_MAPPING';
-import config from './config';
+import config, {normalizedConfigs} from './config';
 import FULL_SCREEN_TO_RHP_MAPPING from './FULL_SCREEN_TO_RHP_MAPPING';
 import getMatchingBottomTabRouteForState from './getMatchingBottomTabRouteForState';
 import getMatchingCentralPaneRouteForState from './getMatchingCentralPaneRouteForState';
 import replacePathInNestedState from './replacePathInNestedState';
 
-const RHP_SCREENS_OPENED_FROM_LHN = [SCREENS.SETTINGS.SHARE_CODE, SCREENS.SETTINGS.PROFILE.STATUS] as const;
+const RHP_SCREENS_OPENED_FROM_LHN = [
+    SCREENS.SETTINGS.SHARE_CODE,
+    SCREENS.SETTINGS.PROFILE.STATUS,
+    SCREENS.SETTINGS.PREFERENCES.PRIORITY_MODE,
+    SCREENS.MONEY_REQUEST.CREATE,
+    SCREENS.SETTINGS.EXIT_SURVEY.REASON,
+    SCREENS.SETTINGS.EXIT_SURVEY.RESPONSE,
+    SCREENS.SETTINGS.EXIT_SURVEY.CONFIRM,
+] satisfies Screen[];
 
-type RHPScreenOpenedFromLHN = (typeof RHP_SCREENS_OPENED_FROM_LHN)[number];
+type RHPScreenOpenedFromLHN = TupleToUnion<typeof RHP_SCREENS_OPENED_FROM_LHN>;
 
 type Metainfo = {
     // Sometimes modal screens don't have information about what should be visible under the overlay.
@@ -54,12 +69,8 @@ const addPolicyIDToRoute = (route: NavigationPartialRoute, policyID?: string) =>
 };
 
 function createBottomTabNavigator(route: NavigationPartialRoute<BottomTabName>, policyID?: string): NavigationPartialRoute<typeof NAVIGATORS.BOTTOM_TAB_NAVIGATOR> {
-    const routesForBottomTabNavigator: Array<NavigationPartialRoute<BottomTabName>> = [{name: SCREENS.HOME, params: {policyID}}];
-
-    if (route.name !== SCREENS.HOME) {
-        // If the generated state requires tab other than HOME, we need to insert it.
-        routesForBottomTabNavigator.push(addPolicyIDToRoute(route, policyID) as NavigationPartialRoute<BottomTabName>);
-    }
+    const routesForBottomTabNavigator: Array<NavigationPartialRoute<BottomTabName>> = [];
+    routesForBottomTabNavigator.push(addPolicyIDToRoute(route, policyID) as NavigationPartialRoute<BottomTabName>);
 
     return {
         name: NAVIGATORS.BOTTOM_TAB_NAVIGATOR,
@@ -67,13 +78,6 @@ function createBottomTabNavigator(route: NavigationPartialRoute<BottomTabName>,
     };
 }
 
-function createCentralPaneNavigator(route: NavigationPartialRoute<CentralPaneName>): NavigationPartialRoute<typeof NAVIGATORS.CENTRAL_PANE_NAVIGATOR> {
-    return {
-        name: NAVIGATORS.CENTRAL_PANE_NAVIGATOR,
-        state: getRoutesWithIndex([route]),
-    };
-}
-
 function createFullScreenNavigator(route?: NavigationPartialRoute<FullScreenName>): NavigationPartialRoute<typeof NAVIGATORS.FULL_SCREEN_NAVIGATOR> {
     const routes = [];
 
@@ -86,11 +90,9 @@ function createFullScreenNavigator(route?: NavigationPartialRoute<FullScreenName
             policyID,
         },
     });
+
     if (route) {
-        routes.push({
-            name: SCREENS.WORKSPACES_CENTRAL_PANE,
-            state: getRoutesWithIndex([route]),
-        });
+        routes.push(route);
     }
     return {
         name: NAVIGATORS.FULL_SCREEN_NAVIGATOR,
@@ -98,10 +100,16 @@ function createFullScreenNavigator(route?: NavigationPartialRoute<FullScreenName
     };
 }
 
+function getParamsFromRoute(screenName: string): string[] {
+    const routeConfig = normalizedConfigs[screenName as Screen];
+
+    const route = routeConfig.pattern;
+
+    return route.match(/(?<=[:?&])(\w+)(?=[/=?&]|$)/g) ?? [];
+}
+
 // This function will return CentralPaneNavigator route or FullScreenNavigator route.
-function getMatchingRootRouteForRHPRoute(
-    route: NavigationPartialRoute,
-): NavigationPartialRoute<typeof NAVIGATORS.CENTRAL_PANE_NAVIGATOR | typeof NAVIGATORS.FULL_SCREEN_NAVIGATOR> | undefined {
+function getMatchingRootRouteForRHPRoute(route: NavigationPartialRoute): NavigationPartialRoute<CentralPaneName | typeof NAVIGATORS.FULL_SCREEN_NAVIGATOR> | undefined {
     // Check for backTo param. One screen with different backTo value may need diferent screens visible under the overlay.
     if (route.params && 'backTo' in route.params && typeof route.params.backTo === 'string') {
         const stateForBackTo = getStateFromPath(route.params.backTo, config);
@@ -111,20 +119,17 @@ function getMatchingRootRouteForRHPRoute(
 
             const centralPaneOrFullScreenNavigator = stateForBackTo.routes.find(
                 // eslint-disable-next-line @typescript-eslint/no-shadow
-                (route) => route.name === NAVIGATORS.CENTRAL_PANE_NAVIGATOR || route.name === NAVIGATORS.FULL_SCREEN_NAVIGATOR,
+                (route) => isCentralPaneName(route.name) || route.name === NAVIGATORS.FULL_SCREEN_NAVIGATOR,
             );
 
             // If there is rhpNavigator in the state generated for backTo url, we want to get root route matching to this rhp screen.
             if (rhpNavigator && rhpNavigator.state) {
-                const topmostNestedRHPRoute = getTopmostNestedRHPRoute(stateForBackTo);
-                if (topmostNestedRHPRoute) {
-                    return getMatchingRootRouteForRHPRoute(topmostNestedRHPRoute);
-                }
+                return getMatchingRootRouteForRHPRoute(findFocusedRoute(stateForBackTo) as NavigationPartialRoute);
             }
 
             // If we know that backTo targets the root route (central pane or full screen) we want to use it.
             if (centralPaneOrFullScreenNavigator && centralPaneOrFullScreenNavigator.state) {
-                return centralPaneOrFullScreenNavigator as NavigationPartialRoute<typeof NAVIGATORS.CENTRAL_PANE_NAVIGATOR | typeof NAVIGATORS.FULL_SCREEN_NAVIGATOR>;
+                return centralPaneOrFullScreenNavigator as NavigationPartialRoute<CentralPaneName | typeof NAVIGATORS.FULL_SCREEN_NAVIGATOR>;
             }
         }
     }
@@ -132,20 +137,27 @@ function getMatchingRootRouteForRHPRoute(
     // Check for CentralPaneNavigator
     for (const [centralPaneName, RHPNames] of Object.entries(CENTRAL_PANE_TO_RHP_MAPPING)) {
         if (RHPNames.includes(route.name)) {
-            const params = {...route.params};
-            if (centralPaneName === SCREENS.SEARCH.CENTRAL_PANE) {
-                delete (params as Record<string, string | undefined>)?.reportID;
-            }
-            return createCentralPaneNavigator({name: centralPaneName as CentralPaneName, params});
+            const paramsFromRoute = getParamsFromRoute(centralPaneName);
+
+            return {name: centralPaneName as CentralPaneName, params: pick(route.params, paramsFromRoute)};
         }
     }
 
     // Check for FullScreenNavigator
     for (const [fullScreenName, RHPNames] of Object.entries(FULL_SCREEN_TO_RHP_MAPPING)) {
-        if (RHPNames && RHPNames.includes(route.name)) {
-            return createFullScreenNavigator({name: fullScreenName as FullScreenName, params: route.params});
+        if (RHPNames.includes(route.name)) {
+            const paramsFromRoute = getParamsFromRoute(fullScreenName);
+
+            return createFullScreenNavigator({name: fullScreenName as FullScreenName, params: pick(route.params, paramsFromRoute)});
         }
     }
+
+    // check for valid reportID in the route params
+    // if the reportID is valid, we should navigate back to screen report in CPN
+    const reportID = (route.params as Record<string, string | undefined>)?.reportID;
+    if (ReportConnection.getAllReports()?.[`${ONYXKEYS.COLLECTION.REPORT}${reportID}`]?.reportID) {
+        return {name: SCREENS.REPORT, params: {reportID}};
+    }
 }
 
 function getAdaptedState(state: PartialState<NavigationState<RootStackParamList>>, policyID?: string): GetAdaptedStateReturnType {
@@ -157,19 +169,14 @@ function getAdaptedState(state: PartialState<NavigationState<RootStackParamList>
 
     // We need to check what is defined to know what we need to add.
     const bottomTabNavigator = state.routes.find((route) => route.name === NAVIGATORS.BOTTOM_TAB_NAVIGATOR);
-    const centralPaneNavigator = state.routes.find((route) => route.name === NAVIGATORS.CENTRAL_PANE_NAVIGATOR);
+    const centralPaneNavigator = state.routes.find((route) => isCentralPaneName(route.name));
     const fullScreenNavigator = state.routes.find((route) => route.name === NAVIGATORS.FULL_SCREEN_NAVIGATOR);
     const rhpNavigator = state.routes.find((route) => route.name === NAVIGATORS.RIGHT_MODAL_NAVIGATOR);
     const lhpNavigator = state.routes.find((route) => route.name === NAVIGATORS.LEFT_MODAL_NAVIGATOR);
     const onboardingModalNavigator = state.routes.find((route) => route.name === NAVIGATORS.ONBOARDING_MODAL_NAVIGATOR);
     const welcomeVideoModalNavigator = state.routes.find((route) => route.name === NAVIGATORS.WELCOME_VIDEO_MODAL_NAVIGATOR);
+    const attachmentsScreen = state.routes.find((route) => route.name === SCREENS.ATTACHMENTS);
     const featureTrainingModalNavigator = state.routes.find((route) => route.name === NAVIGATORS.FEATURE_TRANING_MODAL_NAVIGATOR);
-    const reportAttachmentsScreen = state.routes.find((route) => route.name === SCREENS.REPORT_ATTACHMENTS);
-
-    if (isNarrowLayout) {
-        metainfo.isFullScreenNavigatorMandatory = false;
-        metainfo.isCentralPaneAndBottomTabMandatory = false;
-    }
 
     if (rhpNavigator) {
         // Routes
@@ -178,18 +185,18 @@ function getAdaptedState(state: PartialState<NavigationState<RootStackParamList>
         // - found rhp
 
         // This one will be defined because rhpNavigator is defined.
-        const topmostNestedRHPRoute = getTopmostNestedRHPRoute(state);
+        const focusedRHPRoute = findFocusedRoute(state);
         const routes = [];
 
-        if (topmostNestedRHPRoute) {
-            let matchingRootRoute = getMatchingRootRouteForRHPRoute(topmostNestedRHPRoute);
-            const isRHPScreenOpenedFromLHN = topmostNestedRHPRoute?.name && RHP_SCREENS_OPENED_FROM_LHN.includes(topmostNestedRHPRoute?.name as RHPScreenOpenedFromLHN);
+        if (focusedRHPRoute) {
+            let matchingRootRoute = getMatchingRootRouteForRHPRoute(focusedRHPRoute);
+            const isRHPScreenOpenedFromLHN = focusedRHPRoute?.name && RHP_SCREENS_OPENED_FROM_LHN.includes(focusedRHPRoute?.name as RHPScreenOpenedFromLHN);
             // This may happen if this RHP doens't have a route that should be under the overlay defined.
             if (!matchingRootRoute || isRHPScreenOpenedFromLHN) {
                 metainfo.isCentralPaneAndBottomTabMandatory = false;
                 metainfo.isFullScreenNavigatorMandatory = false;
                 // If matchingRootRoute is undefined and it's a narrow layout, don't add a report screen under the RHP.
-                matchingRootRoute = matchingRootRoute ?? (!isNarrowLayout ? createCentralPaneNavigator({name: SCREENS.REPORT}) : undefined);
+                matchingRootRoute = matchingRootRoute ?? (!isNarrowLayout ? {name: SCREENS.REPORT} : undefined);
             }
 
             // If the root route is type of FullScreenNavigator, the default bottom tab will be added.
@@ -198,7 +205,7 @@ function getAdaptedState(state: PartialState<NavigationState<RootStackParamList>
             // When we open a screen in RHP from FullScreenNavigator, we need to add the appropriate screen in CentralPane.
             // Then, when we close FullScreenNavigator, we will be redirected to the correct page in CentralPane.
             if (matchingRootRoute?.name === NAVIGATORS.FULL_SCREEN_NAVIGATOR) {
-                routes.push(createCentralPaneNavigator({name: SCREENS.SETTINGS.WORKSPACES}));
+                routes.push({name: SCREENS.SETTINGS.WORKSPACES});
             }
 
             if (matchingRootRoute && (!isNarrowLayout || !isRHPScreenOpenedFromLHN)) {
@@ -231,11 +238,9 @@ function getAdaptedState(state: PartialState<NavigationState<RootStackParamList>
             ),
         );
         if (!isNarrowLayout) {
-            routes.push(
-                createCentralPaneNavigator({
-                    name: SCREENS.REPORT,
-                }),
-            );
+            routes.push({
+                name: SCREENS.REPORT,
+            });
         }
 
         // Separate ifs are necessary for typescript to see that we are not pushing undefined to the array.
@@ -276,11 +281,9 @@ function getAdaptedState(state: PartialState<NavigationState<RootStackParamList>
             ),
         );
 
-        routes.push(
-            createCentralPaneNavigator({
-                name: SCREENS.SETTINGS.WORKSPACES,
-            }),
-        );
+        routes.push({
+            name: SCREENS.SETTINGS.WORKSPACES,
+        });
 
         routes.push(fullScreenNavigator);
 
@@ -303,25 +306,27 @@ function getAdaptedState(state: PartialState<NavigationState<RootStackParamList>
             metainfo,
         };
     }
-    if (reportAttachmentsScreen) {
+    if (attachmentsScreen) {
         // Routes
         // - matching bottom tab
         // - central pane (report screen) of the attachment
         // - found report attachments
         const routes = [];
-        const reportAttachments = reportAttachmentsScreen as Route<'ReportAttachments', RootStackParamList['ReportAttachments']>;
+        const reportAttachments = attachmentsScreen as Route<'Attachments', RootStackParamList['Attachments']>;
 
-        const matchingBottomTabRoute = getMatchingBottomTabRouteForState(state);
-        routes.push(createBottomTabNavigator(matchingBottomTabRoute, policyID));
-        if (!isNarrowLayout) {
-            routes.push(createCentralPaneNavigator({name: SCREENS.REPORT, params: {reportID: reportAttachments.params?.reportID ?? ''}}));
-        }
-        routes.push(reportAttachments);
+        if (reportAttachments.params?.type === CONST.ATTACHMENT_TYPE.REPORT) {
+            const matchingBottomTabRoute = getMatchingBottomTabRouteForState(state);
+            routes.push(createBottomTabNavigator(matchingBottomTabRoute, policyID));
+            if (!isNarrowLayout) {
+                routes.push({name: SCREENS.REPORT, params: {reportID: reportAttachments.params?.reportID ?? '-1'}});
+            }
+            routes.push(reportAttachments);
 
-        return {
-            adaptedState: getRoutesWithIndex(routes),
-            metainfo,
-        };
+            return {
+                adaptedState: getRoutesWithIndex(routes),
+                metainfo,
+            };
+        }
     }
 
     // We need to make sure that this if only handles states where we deeplink to the bottom tab directly
@@ -341,11 +346,11 @@ function getAdaptedState(state: PartialState<NavigationState<RootStackParamList>
         const routes = [...state.routes];
         const matchingCentralPaneRoute = getMatchingCentralPaneRouteForState(state);
         if (matchingCentralPaneRoute) {
-            routes.push(createCentralPaneNavigator(matchingCentralPaneRoute));
+            routes.push(matchingCentralPaneRoute);
         } else {
             // If there is no matching central pane, we want to add the default one.
             metainfo.isCentralPaneAndBottomTabMandatory = false;
-            routes.push(createCentralPaneNavigator({name: SCREENS.REPORT}));
+            routes.push({name: SCREENS.REPORT});
         }
 
         return {
@@ -374,7 +379,11 @@ const getAdaptedStateFromPath: GetAdaptedStateFromPath = (path, options) => {
         throw new Error('Unable to parse path');
     }
 
-    return getAdaptedState(state, policyID);
+    // On SCREENS.SEARCH.CENTRAL_PANE policyID is stored differently inside search query ("q" param), so we're handling this case
+    const focusedRoute = findFocusedRoute(state);
+    const policyIDFromQuery = extractPolicyIDFromQuery(focusedRoute);
+
+    return getAdaptedState(state, policyID ?? policyIDFromQuery);
 };
 
 export default getAdaptedStateFromPath;
diff --git a/src/libs/Navigation/linkingConfig/getMatchingBottomTabRouteForState.ts b/src/libs/Navigation/linkingConfig/getMatchingBottomTabRouteForState.ts
index fd45685acf23..7b213fdfeb6e 100644
--- a/src/libs/Navigation/linkingConfig/getMatchingBottomTabRouteForState.ts
+++ b/src/libs/Navigation/linkingConfig/getMatchingBottomTabRouteForState.ts
@@ -21,6 +21,12 @@ function getMatchingBottomTabRouteForState(state: State<RootStackParamList>, pol
     }
 
     const tabName = CENTRAL_PANE_TO_TAB_MAPPING[topmostCentralPaneRoute.name];
+
+    if (tabName === SCREENS.SEARCH.BOTTOM_TAB) {
+        const topmostCentralPaneRouteParams = {...topmostCentralPaneRoute.params} as Record<string, string | undefined>;
+        return {name: tabName, params: topmostCentralPaneRouteParams};
+    }
+
     return {name: tabName, params: paramsWithPolicyID};
 }
 
diff --git a/src/libs/Navigation/linkingConfig/getMatchingCentralPaneRouteForState.ts b/src/libs/Navigation/linkingConfig/getMatchingCentralPaneRouteForState.ts
index 51cb9e3aa9a5..0679bfa26285 100644
--- a/src/libs/Navigation/linkingConfig/getMatchingCentralPaneRouteForState.ts
+++ b/src/libs/Navigation/linkingConfig/getMatchingCentralPaneRouteForState.ts
@@ -1,5 +1,5 @@
 import getTopmostBottomTabRoute from '@libs/Navigation/getTopmostBottomTabRoute';
-import type {CentralPaneName, CentralPaneNavigatorParamList, NavigationPartialRoute, RootStackParamList, State} from '@libs/Navigation/types';
+import type {AuthScreensParamList, CentralPaneName, NavigationPartialRoute, RootStackParamList, State} from '@libs/Navigation/types';
 import NAVIGATORS from '@src/NAVIGATORS';
 import SCREENS from '@src/SCREENS';
 import TAB_TO_CENTRAL_PANE_MAPPING from './TAB_TO_CENTRAL_PANE_MAPPING';
@@ -31,24 +31,8 @@ const getTopMostReportIDFromRHP = (state: State): string => {
     return '';
 };
 
-// Check if the given route has a policyID equal to the id provided in the function params
-function hasRouteMatchingPolicyID(route: NavigationPartialRoute<CentralPaneName>, policyID?: string) {
-    if (!route?.params) {
-        return false;
-    }
-
-    const params = `params` in route.params ? (route.params.params as Record<string, string | undefined>) : undefined;
-
-    // If params are not defined, then we need to check if the policyID exists
-    if (!params) {
-        return !policyID;
-    }
-
-    return 'policyID' in params && params.policyID === policyID;
-}
-
 // Get already opened settings screen within the policy
-function getAlreadyOpenedSettingsScreen(rootState?: State, policyID?: string): keyof CentralPaneNavigatorParamList | undefined {
+function getAlreadyOpenedSettingsScreen(rootState?: State): keyof AuthScreensParamList | undefined {
     if (!rootState) {
         return undefined;
     }
@@ -56,18 +40,9 @@ function getAlreadyOpenedSettingsScreen(rootState?: State, policyID?: string): k
     // If one of the screen from TAB_TO_CENTRAL_PANE_MAPPING[SCREENS.SETTINGS.ROOT] is now in the navigation state, we can decide which screen we should display.
     // A screen from the navigation state can be pushed to the navigation state again only if it has a matching policyID with the currently selected workspace.
     // Otherwise, when we switch the workspace, we want to display the initial screen in the settings tab.
-    const alreadyOpenedSettingsTab = rootState.routes
-        .filter((item) => item.params && 'screen' in item.params && TAB_TO_CENTRAL_PANE_MAPPING[SCREENS.SETTINGS.ROOT].includes(item.params.screen as keyof CentralPaneNavigatorParamList))
-        .at(-1);
-
-    if (!hasRouteMatchingPolicyID(alreadyOpenedSettingsTab as NavigationPartialRoute<CentralPaneName>, policyID)) {
-        return undefined;
-    }
-
-    const settingsScreen =
-        alreadyOpenedSettingsTab?.params && 'screen' in alreadyOpenedSettingsTab.params ? (alreadyOpenedSettingsTab?.params?.screen as keyof CentralPaneNavigatorParamList) : undefined;
+    const alreadyOpenedSettingsScreen = rootState.routes.filter((item) => TAB_TO_CENTRAL_PANE_MAPPING[SCREENS.SETTINGS.ROOT].includes(item.name as CentralPaneName)).at(-1);
 
-    return settingsScreen;
+    return alreadyOpenedSettingsScreen?.name as keyof AuthScreensParamList;
 }
 
 // Get matching central pane route for bottom tab navigator. e.g HOME -> REPORT
@@ -82,9 +57,8 @@ function getMatchingCentralPaneRouteForState(state: State<RootStackParamList>, r
 
     if (topmostBottomTabRoute.name === SCREENS.SETTINGS.ROOT) {
         // When we go back to the settings tab without switching the workspace id, we want to return to the previously opened screen
-        const policyID = topmostBottomTabRoute?.params && 'policyID' in topmostBottomTabRoute.params ? (topmostBottomTabRoute.params.policyID as string) : undefined;
-        const screen = getAlreadyOpenedSettingsScreen(rootState, policyID) ?? centralPaneName;
-        return {name: screen, params: topmostBottomTabRoute.params};
+        const screen = getAlreadyOpenedSettingsScreen(rootState) ?? centralPaneName;
+        return {name: screen as CentralPaneName, params: topmostBottomTabRoute.params};
     }
 
     if (topmostBottomTabRoute.name === SCREENS.HOME) {
diff --git a/src/libs/Navigation/linkingConfig/index.ts b/src/libs/Navigation/linkingConfig/index.ts
index 95fe2f3b6c55..1f556aa67809 100644
--- a/src/libs/Navigation/linkingConfig/index.ts
+++ b/src/libs/Navigation/linkingConfig/index.ts
@@ -1,29 +1,22 @@
 /* eslint-disable @typescript-eslint/naming-convention */
 import type {LinkingOptions} from '@react-navigation/native';
 import type {RootStackParamList} from '@navigation/types';
-import CONST from '@src/CONST';
 import config from './config';
 import customGetPathFromState from './customGetPathFromState';
 import getAdaptedStateFromPath from './getAdaptedStateFromPath';
+import prefixes from './prefixes';
+import subscribe from './subscribe';
 
 const linkingConfig: LinkingOptions<RootStackParamList> = {
     getStateFromPath: (...args) => {
         const {adaptedState} = getAdaptedStateFromPath(...args);
 
         // ResultState | undefined is the type this function expect.
-        // eslint-disable-next-line @typescript-eslint/no-unsafe-return
         return adaptedState;
     },
+    subscribe,
     getPathFromState: customGetPathFromState,
-    prefixes: [
-        'app://-/',
-        'new-expensify://',
-        'https://www.expensify.cash',
-        'https://staging.expensify.cash',
-        'https://dev.new.expensify.com',
-        CONST.NEW_EXPENSIFY_URL,
-        CONST.STAGING_NEW_EXPENSIFY_URL,
-    ],
+    prefixes,
     config,
 };
 
diff --git a/src/libs/Navigation/linkingConfig/prefixes.ts b/src/libs/Navigation/linkingConfig/prefixes.ts
new file mode 100644
index 000000000000..ca2da6f56b39
--- /dev/null
+++ b/src/libs/Navigation/linkingConfig/prefixes.ts
@@ -0,0 +1,15 @@
+import type {LinkingOptions} from '@react-navigation/native';
+import type {RootStackParamList} from '@libs/Navigation/types';
+import CONST from '@src/CONST';
+
+const prefixes: LinkingOptions<RootStackParamList>['prefixes'] = [
+    'app://-/',
+    'new-expensify://',
+    'https://www.expensify.cash',
+    'https://staging.expensify.cash',
+    'https://dev.new.expensify.com',
+    CONST.NEW_EXPENSIFY_URL,
+    CONST.STAGING_NEW_EXPENSIFY_URL,
+];
+
+export default prefixes;
diff --git a/src/libs/Navigation/linkingConfig/subscribe/index.native.ts b/src/libs/Navigation/linkingConfig/subscribe/index.native.ts
new file mode 100644
index 000000000000..46720e9884e9
--- /dev/null
+++ b/src/libs/Navigation/linkingConfig/subscribe/index.native.ts
@@ -0,0 +1,40 @@
+/* eslint-disable @typescript-eslint/naming-convention */
+import type {LinkingOptions} from '@react-navigation/native';
+import {findFocusedRoute, getStateFromPath} from '@react-navigation/native';
+import extractPathFromURL from '@react-navigation/native/src/extractPathFromURL';
+import {Linking} from 'react-native';
+import Navigation from '@libs/Navigation/Navigation';
+import config from '@navigation/linkingConfig/config';
+import prefixes from '@navigation/linkingConfig/prefixes';
+import type {RootStackParamList} from '@navigation/types';
+import type {Route} from '@src/ROUTES';
+import SCREENS from '@src/SCREENS';
+
+// This field in linkingConfig is supported on native only.
+const subscribe: LinkingOptions<RootStackParamList>['subscribe'] = (listener) => {
+    // We need to override the default behaviour for the deep link to search screen.
+    // Even on mobile narrow layout, this screen need to push two screens on the stack to work (bottom tab and central pane).
+    // That's why we are going to handle it with our navigate function instead the default react-navigation one.
+    const linkingSubscription = Linking.addEventListener('url', ({url}) => {
+        const path = extractPathFromURL(prefixes, url);
+
+        if (path) {
+            const stateFromPath = getStateFromPath(path, config);
+            if (stateFromPath) {
+                const focusedRoute = findFocusedRoute(stateFromPath);
+                if (focusedRoute && focusedRoute.name === SCREENS.SEARCH.CENTRAL_PANE) {
+                    Navigation.navigate(path as Route);
+                    return;
+                }
+            }
+        }
+
+        listener(url);
+    });
+    return () => {
+        // Clean up the event listeners
+        linkingSubscription.remove();
+    };
+};
+
+export default subscribe;
diff --git a/src/libs/Navigation/linkingConfig/subscribe/index.ts b/src/libs/Navigation/linkingConfig/subscribe/index.ts
new file mode 100644
index 000000000000..74ef4133cb55
--- /dev/null
+++ b/src/libs/Navigation/linkingConfig/subscribe/index.ts
@@ -0,0 +1,7 @@
+import type {LinkingOptions} from '@react-navigation/native';
+import type {RootStackParamList} from '@libs/Navigation/types';
+
+// This field in linkingConfig is supported on native only.
+const subscribe: LinkingOptions<RootStackParamList>['subscribe'] = undefined;
+
+export default subscribe;
diff --git a/src/libs/Navigation/setNavigationActionToMicrotaskQueue.ts b/src/libs/Navigation/setNavigationActionToMicrotaskQueue.ts
new file mode 100644
index 000000000000..f6c221185de6
--- /dev/null
+++ b/src/libs/Navigation/setNavigationActionToMicrotaskQueue.ts
@@ -0,0 +1,13 @@
+export default function setNavigationActionToMicrotaskQueue(navigationAction: () => void) {
+    /**
+     * The function is used when the app needs to set a navigation action to the microtask queue, it guarantees to execute Onyx.update first, then the navigation action.
+     * More details - https://github.com/Expensify/App/issues/37785#issuecomment-1989056726.
+     */
+    new Promise<void>((resolve) => {
+        resolve();
+    }).then(() => {
+        requestAnimationFrame(() => {
+            navigationAction();
+        });
+    });
+}
diff --git a/src/libs/Navigation/setupCustomAndroidBackHandler/index.android.ts b/src/libs/Navigation/setupCustomAndroidBackHandler/index.android.ts
new file mode 100644
index 000000000000..f7c2140b1117
--- /dev/null
+++ b/src/libs/Navigation/setupCustomAndroidBackHandler/index.android.ts
@@ -0,0 +1,73 @@
+import {findFocusedRoute, StackActions} from '@react-navigation/native';
+import type {StackScreenProps} from '@react-navigation/stack';
+import {BackHandler, NativeModules} from 'react-native';
+import getTopmostCentralPaneRoute from '@navigation/getTopmostCentralPaneRoute';
+import navigationRef from '@navigation/navigationRef';
+import type {BottomTabNavigatorParamList, RootStackParamList, State} from '@navigation/types';
+import NAVIGATORS from '@src/NAVIGATORS';
+import SCREENS from '@src/SCREENS';
+
+type SearchPageProps = StackScreenProps<BottomTabNavigatorParamList, typeof SCREENS.SEARCH.BOTTOM_TAB>;
+
+// We need to do some custom handling for the back button on Android for actions related to the search page.
+function setupCustomAndroidBackHandler() {
+    const onBackPress = () => {
+        const rootState = navigationRef.getRootState();
+        const bottomTabRoute = rootState?.routes?.find((route) => route.name === NAVIGATORS.BOTTOM_TAB_NAVIGATOR);
+        const bottomTabRoutes = bottomTabRoute?.state?.routes;
+        const focusedRoute = findFocusedRoute(rootState);
+
+        // Shouldn't happen but for type safety.
+        if (!bottomTabRoutes) {
+            return false;
+        }
+
+        const isLastScreenOnStack = bottomTabRoutes.length === 1 && rootState?.routes?.length === 1;
+
+        if (NativeModules.HybridAppModule && isLastScreenOnStack) {
+            NativeModules.HybridAppModule.exitApp();
+        }
+
+        // Handle back press on the search page.
+        // We need to pop two screens, from the central pane and from the bottom tab.
+        if (bottomTabRoutes[bottomTabRoutes.length - 1].name === SCREENS.SEARCH.BOTTOM_TAB && focusedRoute?.name === SCREENS.SEARCH.CENTRAL_PANE) {
+            navigationRef.dispatch({...StackActions.pop(), target: bottomTabRoute?.state?.key});
+            navigationRef.dispatch({...StackActions.pop()});
+
+            const centralPaneRouteAfterPop = getTopmostCentralPaneRoute({routes: [rootState?.routes?.at(-2)]} as State<RootStackParamList>);
+            const bottomTabRouteAfterPop = bottomTabRoutes.at(-2);
+
+            // It's possible that central pane search is desynchronized with the bottom tab search.
+            // e.g. opening a tab different from search will wipe out central pane screens.
+            // In that case we have to push the proper one.
+            if (
+                bottomTabRouteAfterPop &&
+                bottomTabRouteAfterPop.name === SCREENS.SEARCH.BOTTOM_TAB &&
+                (!centralPaneRouteAfterPop || centralPaneRouteAfterPop.name !== SCREENS.SEARCH.CENTRAL_PANE)
+            ) {
+                const searchParams = bottomTabRoutes[bottomTabRoutes.length - 2].params as SearchPageProps['route']['params'];
+                navigationRef.dispatch({...StackActions.push(SCREENS.SEARCH.CENTRAL_PANE, searchParams)});
+            }
+
+            return true;
+        }
+
+        // Handle back press to go back to the search page.
+        // It's possible that central pane search is desynchronized with the bottom tab search.
+        // e.g. opening a tab different from search will wipe out central pane screens.
+        // In that case we have to push the proper one.
+        if (bottomTabRoutes && bottomTabRoutes?.length >= 2 && bottomTabRoutes[bottomTabRoutes.length - 2].name === SCREENS.SEARCH.BOTTOM_TAB && rootState?.routes?.length === 1) {
+            const searchParams = bottomTabRoutes[bottomTabRoutes.length - 2].params as SearchPageProps['route']['params'];
+            navigationRef.dispatch({...StackActions.push(SCREENS.SEARCH.CENTRAL_PANE, searchParams)});
+            navigationRef.dispatch({...StackActions.pop(), target: bottomTabRoute?.state?.key});
+            return true;
+        }
+
+        // Handle all other cases with default handler.
+        return false;
+    };
+
+    BackHandler.addEventListener('hardwareBackPress', onBackPress);
+}
+
+export default setupCustomAndroidBackHandler;
diff --git a/src/libs/Navigation/setupCustomAndroidBackHandler/index.ts b/src/libs/Navigation/setupCustomAndroidBackHandler/index.ts
new file mode 100644
index 000000000000..aa9077e1220f
--- /dev/null
+++ b/src/libs/Navigation/setupCustomAndroidBackHandler/index.ts
@@ -0,0 +1,4 @@
+// Do nothing for platforms different than Android.
+function setupCustomAndroidBackHandler() {}
+
+export default setupCustomAndroidBackHandler;
diff --git a/src/libs/Navigation/shouldSetScreenBlurred/index.native.tsx b/src/libs/Navigation/shouldSetScreenBlurred/index.native.tsx
new file mode 100644
index 000000000000..4043fddb7372
--- /dev/null
+++ b/src/libs/Navigation/shouldSetScreenBlurred/index.native.tsx
@@ -0,0 +1,12 @@
+/**
+ * @param navigationIndex
+ *
+ * Decides whether to set screen to blurred state.
+ *
+ * If the screen is more than 1 screen away from the current screen, freeze it,
+ * we don't want to freeze the screen if it's the previous screen because the freeze placeholder
+ * would be visible at the beginning of the back animation then
+ */
+const shouldSetScreenBlurred = (navigationIndex: number) => navigationIndex > 1;
+
+export default shouldSetScreenBlurred;
diff --git a/src/libs/Navigation/shouldSetScreenBlurred/index.tsx b/src/libs/Navigation/shouldSetScreenBlurred/index.tsx
new file mode 100644
index 000000000000..14b45921bdb2
--- /dev/null
+++ b/src/libs/Navigation/shouldSetScreenBlurred/index.tsx
@@ -0,0 +1,13 @@
+/**
+ * @param navigationIndex
+ *
+ * Decides whether to set screen to blurred state.
+ *
+ * Allow freezing the first screen and more in the stack only on
+ * web and desktop platforms. The reason is that in the case of
+ * LHN, we have FlashList rendering in the back while we are on
+ * Settings screen.
+ */
+const shouldSetScreenBlurred = (navigationIndex: number) => navigationIndex >= 1;
+
+export default shouldSetScreenBlurred;
diff --git a/src/libs/Navigation/switchPolicyID.ts b/src/libs/Navigation/switchPolicyID.ts
index 685c21d88e79..f65b32006c0e 100644
--- a/src/libs/Navigation/switchPolicyID.ts
+++ b/src/libs/Navigation/switchPolicyID.ts
@@ -1,11 +1,13 @@
 import {getActionFromState} from '@react-navigation/core';
 import type {NavigationAction, NavigationContainerRef, NavigationState, PartialState} from '@react-navigation/native';
 import {getPathFromState} from '@react-navigation/native';
-import type {ValueOf, Writable} from 'type-fest';
+import type {Writable} from 'type-fest';
 import getIsNarrowLayout from '@libs/getIsNarrowLayout';
+import {isCentralPaneName} from '@libs/NavigationUtils';
+import * as SearchUtils from '@libs/SearchUtils';
 import CONST from '@src/CONST';
-import NAVIGATORS from '@src/NAVIGATORS';
 import type {Route} from '@src/ROUTES';
+import ROUTES from '@src/ROUTES';
 import SCREENS from '@src/SCREENS';
 import getStateFromPath from './getStateFromPath';
 import getTopmostCentralPaneRoute from './getTopmostCentralPaneRoute';
@@ -18,7 +20,7 @@ type ActionPayloadParams = {
     path?: string;
 };
 
-type CentralPaneRouteParams = Record<string, string> & {policyID?: string; reportID?: string};
+type CentralPaneRouteParams = Record<string, string> & {policyID?: string; q?: string; reportID?: string};
 
 function checkIfActionPayloadNameIsEqual(action: Writable<NavigationAction>, screenName: string) {
     return action?.payload && 'name' in action.payload && action?.payload?.name === screenName;
@@ -31,31 +33,32 @@ function getActionForBottomTabNavigator(action: StackNavigationAction, state: Na
         return;
     }
 
-    const params = action.payload.params as ActionPayloadParams;
-    let payloadParams = params?.params as Record<string, string | undefined>;
-    let screen = params.screen;
-
-    // Case when the user is on the AllSettingsScreen and selects the specific workspace. The user is redirected then to the specific workspace settings.
-    if (screen === SCREENS.ALL_SETTINGS && policyID) {
-        screen = SCREENS.WORKSPACE.INITIAL;
+    let name: string | undefined;
+    let params: Record<string, string | undefined>;
+    if (isCentralPaneName(action.payload.name)) {
+        name = action.payload.name;
+        params = action.payload.params as Record<string, string | undefined>;
+    } else {
+        const actionPayloadParams = action.payload.params as ActionPayloadParams;
+        name = actionPayloadParams.screen;
+        params = actionPayloadParams?.params as Record<string, string | undefined>;
     }
 
-    // Alternative case when the user is on the specific workspace settings screen and selects "All" workspace.
-    else if (!policyID && screen === SCREENS.WORKSPACE.INITIAL) {
-        screen = SCREENS.ALL_SETTINGS;
+    if (name === SCREENS.SEARCH.CENTRAL_PANE) {
+        name = SCREENS.SEARCH.BOTTOM_TAB;
     }
 
-    if (!payloadParams) {
-        payloadParams = {policyID};
+    if (!params) {
+        params = {policyID};
     } else {
-        payloadParams.policyID = policyID;
+        params.policyID = policyID;
     }
 
     return {
         type: CONST.NAVIGATION.ACTION_TYPE.PUSH,
         payload: {
-            name: screen,
-            params: payloadParams,
+            name,
+            params,
         },
         target: bottomTabNavigatorRoute.state.key,
     };
@@ -65,7 +68,6 @@ export default function switchPolicyID(navigation: NavigationContainerRef<RootSt
     if (!navigation) {
         throw new Error("Couldn't find a navigation object. Is your component inside a screen in a navigator?");
     }
-
     let root: NavigationRoot = navigation;
     let current: NavigationRoot | undefined;
 
@@ -76,7 +78,15 @@ export default function switchPolicyID(navigation: NavigationContainerRef<RootSt
     }
 
     const rootState = navigation.getRootState() as NavigationState<RootStackParamList>;
-    const newPath = route ?? getPathFromState({routes: rootState.routes} as State, linkingConfig.config);
+    const topmostCentralPaneRoute = getTopmostCentralPaneRoute(rootState);
+    let newPath = route ?? getPathFromState({routes: rootState.routes} as State, linkingConfig.config);
+
+    // Currently, the search page displayed in the bottom tab has the same URL as the page in the central pane, so we need to redirect to the correct search route.
+    // Here's the configuration: src/libs/Navigation/AppNavigator/createCustomStackNavigator/index.tsx
+    const isOpeningSearchFromBottomTab = !route && topmostCentralPaneRoute?.name === SCREENS.SEARCH.CENTRAL_PANE;
+    if (isOpeningSearchFromBottomTab) {
+        newPath = ROUTES.SEARCH_CENTRAL_PANE.getRoute({query: SearchUtils.buildCannedSearchQuery()});
+    }
     const stateFromPath = getStateFromPath(newPath as Route) as PartialState<NavigationState<RootStackParamList>>;
     const action: StackNavigationAction = getActionFromState(stateFromPath, linkingConfig.config);
 
@@ -93,51 +103,41 @@ export default function switchPolicyID(navigation: NavigationContainerRef<RootSt
         return;
     }
 
+    // The correct route for SearchPage is located in the CentralPane
+    const shouldAddToCentralPane = !getIsNarrowLayout() || isOpeningSearchFromBottomTab;
+
     // If the layout is wide we need to push matching central pane route to the stack.
-    if (!getIsNarrowLayout()) {
-        // Case when the user selects "All" workspace from the specific workspace settings
-        if (checkIfActionPayloadNameIsEqual(actionForBottomTabNavigator, SCREENS.ALL_SETTINGS) && !policyID) {
-            root.dispatch({
-                type: CONST.NAVIGATION.ACTION_TYPE.PUSH,
-                payload: {
-                    name: NAVIGATORS.CENTRAL_PANE_NAVIGATOR,
-                    params: {
-                        screen: SCREENS.SETTINGS.WORKSPACES,
-                        params: undefined,
-                    },
-                },
-            });
-        } else {
-            const topmostCentralPaneRoute = getTopmostCentralPaneRoute(rootState);
-            const screen = topmostCentralPaneRoute?.name;
-            const params: CentralPaneRouteParams = {...topmostCentralPaneRoute?.params};
-            const isWorkspaceScreen = screen && Object.values(SCREENS.WORKSPACE).includes(screen as ValueOf<typeof SCREENS.WORKSPACE>);
-
-            // Only workspace settings screens have to store the policyID in the params.
-            // In other case, the policyID is read from the BottomTab params.
-            if (!isWorkspaceScreen) {
-                delete params.policyID;
+    if (shouldAddToCentralPane) {
+        const params: CentralPaneRouteParams = {...topmostCentralPaneRoute?.params};
+        if (isOpeningSearchFromBottomTab && params.q) {
+            if (policyID) {
+                const queryJSON = SearchUtils.buildSearchQueryJSON(params.q);
+                if (queryJSON) {
+                    queryJSON.policyID = policyID;
+                    params.q = SearchUtils.buildSearchQueryString(queryJSON);
+                }
             } else {
-                params.policyID = policyID;
-            }
-
-            // If the user is on the home page and changes the current workspace, then should be displayed a report from the selected workspace.
-            // To achieve that, it's necessary to navigate without the reportID param.
-            if (checkIfActionPayloadNameIsEqual(actionForBottomTabNavigator, SCREENS.HOME)) {
-                delete params.reportID;
+                const queryJSON = SearchUtils.buildSearchQueryJSON(params.q);
+                if (queryJSON) {
+                    delete queryJSON.policyID;
+                    params.q = SearchUtils.buildSearchQueryString(queryJSON);
+                }
             }
+        }
 
-            root.dispatch({
-                type: CONST.NAVIGATION.ACTION_TYPE.PUSH,
-                payload: {
-                    name: NAVIGATORS.CENTRAL_PANE_NAVIGATOR,
-                    params: {
-                        screen,
-                        params,
-                    },
-                },
-            });
+        // If the user is on the home page and changes the current workspace, then should be displayed a report from the selected workspace.
+        // To achieve that, it's necessary to navigate without the reportID param.
+        if (checkIfActionPayloadNameIsEqual(actionForBottomTabNavigator, SCREENS.HOME)) {
+            delete params.reportID;
         }
+
+        root.dispatch({
+            type: CONST.NAVIGATION.ACTION_TYPE.PUSH,
+            payload: {
+                name: topmostCentralPaneRoute?.name,
+                params,
+            },
+        });
     } else {
         // If the layout is small we need to pop everything from the central pane so the bottom tab navigator is visible.
         root.dispatch({
diff --git a/src/libs/Navigation/types.ts b/src/libs/Navigation/types.ts
index d6511937ad43..28544da90423 100644
--- a/src/libs/Navigation/types.ts
+++ b/src/libs/Navigation/types.ts
@@ -10,7 +10,8 @@ import type {
     PartialState,
     Route,
 } from '@react-navigation/native';
-import type {ValueOf} from 'type-fest';
+import type {TupleToUnion, ValueOf} from 'type-fest';
+import type {SearchQueryString} from '@components/Search/types';
 import type {IOURequestType} from '@libs/actions/IOU';
 import type CONST from '@src/CONST';
 import type {Country, IOUAction, IOUType} from '@src/CONST';
@@ -18,6 +19,7 @@ import type NAVIGATORS from '@src/NAVIGATORS';
 import type {HybridAppRoute, Route as Routes} from '@src/ROUTES';
 import type SCREENS from '@src/SCREENS';
 import type EXIT_SURVEY_REASON_FORM_INPUT_IDS from '@src/types/form/ExitSurveyReasonForm';
+import type {ConnectionName, SageIntacctMappingName} from '@src/types/onyx/Policy';
 
 type NavigationRef = NavigationContainerRefWithCurrent<RootStackParamList>;
 
@@ -48,11 +50,12 @@ type NavigationPartialRoute<TRouteName extends string = string> = PartialRoute<R
 type StateOrRoute = NavigationState | NavigationStateRoute | NavigationPartialRoute;
 type State<TParamList extends ParamListBase = ParamListBase> = NavigationState<TParamList> | PartialState<NavigationState<TParamList>>;
 
-type CentralPaneNavigatorParamList = {
+type CentralPaneScreensParamList = {
     [SCREENS.REPORT]: {
         reportActionID: string;
         reportID: string;
         openOnAdminRoom?: boolean;
+        referrer?: string;
     };
     [SCREENS.SETTINGS.PROFILE.ROOT]: undefined;
     [SCREENS.SETTINGS.PREFERENCES.ROOT]: undefined;
@@ -61,22 +64,32 @@ type CentralPaneNavigatorParamList = {
     [SCREENS.SETTINGS.ABOUT]: undefined;
     [SCREENS.SETTINGS.TROUBLESHOOT]: undefined;
     [SCREENS.SETTINGS.WORKSPACES]: undefined;
+
+    // Param types of the search central pane are also used for the search bottom tab screen.
     [SCREENS.SEARCH.CENTRAL_PANE]: {
-        query: string;
+        q: SearchQueryString;
+        isCustomQuery: boolean;
     };
     [SCREENS.SETTINGS.SAVE_THE_WORLD]: undefined;
+    [SCREENS.SETTINGS.SUBSCRIPTION.ROOT]: undefined;
 };
 
-type WorkspaceSwitcherNavigatorParamList = {
-    [SCREENS.WORKSPACE_SWITCHER.ROOT]: undefined;
+type BackToParams = {
+    backTo?: Routes;
 };
 
-type BackToParams = {
+type BackToAndForwardToParms = {
     backTo?: Routes;
+    forwardTo?: Routes;
+};
+
+type SearchNavigatorParamList = {
+    [SCREENS.SEARCH.BOTTOM_TAB]: undefined;
+    [SCREENS.SEARCH.CENTRAL_PANE]: undefined;
+    [SCREENS.SEARCH.REPORT_RHP]: undefined;
 };
 
 type SettingsNavigatorParamList = {
-    [SCREENS.SETTINGS.ROOT]: undefined;
     [SCREENS.SETTINGS.SHARE_CODE]: undefined;
     [SCREENS.SETTINGS.PROFILE.ROOT]: undefined;
     [SCREENS.SETTINGS.PROFILE.PRONOUNS]: undefined;
@@ -97,11 +110,13 @@ type SettingsNavigatorParamList = {
     };
     [SCREENS.SETTINGS.PROFILE.CONTACT_METHOD_DETAILS]: {
         contactMethod: string;
+        backTo?: Routes;
     };
     [SCREENS.SETTINGS.PROFILE.NEW_CONTACT_METHOD]: {
         backTo: Routes;
     };
     [SCREENS.SETTINGS.PREFERENCES.ROOT]: undefined;
+    [SCREENS.SETTINGS.SUBSCRIPTION.ROOT]: undefined;
     [SCREENS.SETTINGS.PREFERENCES.PRIORITY_MODE]: undefined;
     [SCREENS.SETTINGS.PREFERENCES.LANGUAGE]: undefined;
     [SCREENS.SETTINGS.PREFERENCES.THEME]: undefined;
@@ -111,10 +126,13 @@ type SettingsNavigatorParamList = {
     [SCREENS.SETTINGS.TROUBLESHOOT]: undefined;
     [SCREENS.SETTINGS.APP_DOWNLOAD_LINKS]: undefined;
     [SCREENS.SETTINGS.TROUBLESHOOT]: undefined;
-    [SCREENS.SETTINGS.CONSOLE]: undefined;
+    [SCREENS.SETTINGS.CONSOLE]: {
+        backTo: Routes;
+    };
     [SCREENS.SETTINGS.SHARE_LOG]: {
         /** URL of the generated file to share logs in a report */
         source: string;
+        backTo: Routes;
     };
     [SCREENS.SETTINGS.WALLET.ROOT]: undefined;
     [SCREENS.SETTINGS.WALLET.CARDS_DIGITAL_DETAILS_UPDATE_ADDRESS]: undefined;
@@ -163,7 +181,10 @@ type SettingsNavigatorParamList = {
     [SCREENS.SETTINGS.PROFILE.STATUS_CLEAR_AFTER_DATE]: undefined;
     [SCREENS.SETTINGS.PROFILE.STATUS_CLEAR_AFTER_TIME]: undefined;
     [SCREENS.WORKSPACE.CURRENCY]: undefined;
-    [SCREENS.WORKSPACE.ADDRESS]: undefined;
+    [SCREENS.WORKSPACE.ADDRESS]: {
+        policyID: string;
+        country?: Country | '';
+    };
     [SCREENS.WORKSPACE.NAME]: undefined;
     [SCREENS.WORKSPACE.DESCRIPTION]: undefined;
     [SCREENS.WORKSPACE.SHARE]: undefined;
@@ -184,17 +205,34 @@ type SettingsNavigatorParamList = {
     };
     [SCREENS.WORKSPACE.CATEGORY_CREATE]: {
         policyID: string;
+        backTo?: Routes;
     };
     [SCREENS.WORKSPACE.CATEGORY_EDIT]: {
         policyID: string;
         categoryName: string;
+        backTo?: Routes;
+    };
+    [SCREENS.WORKSPACE.CATEGORY_PAYROLL_CODE]: {
+        policyID: string;
+        categoryName: string;
+    };
+    [SCREENS.WORKSPACE.CATEGORY_GL_CODE]: {
+        policyID: string;
+        categoryName: string;
     };
     [SCREENS.WORKSPACE.CATEGORY_SETTINGS]: {
         policyID: string;
         categoryName: string;
+        backTo?: Routes;
+    };
+    [SCREENS.WORKSPACE.UPGRADE]: {
+        policyID: string;
+        featureName: string;
+        backTo?: Routes;
     };
     [SCREENS.WORKSPACE.CATEGORIES_SETTINGS]: {
         policyID: string;
+        backTo?: Routes;
     };
     [SCREENS.WORKSPACE.TAG_CREATE]: {
         policyID: string;
@@ -207,21 +245,47 @@ type SettingsNavigatorParamList = {
         policyID: string;
         rateID: string;
     };
+    [SCREENS.WORKSPACE.DISTANCE_RATE_TAX_RECLAIMABLE_ON_EDIT]: {
+        policyID: string;
+        rateID: string;
+    };
+    [SCREENS.WORKSPACE.DISTANCE_RATE_TAX_RATE_EDIT]: {
+        policyID: string;
+        rateID: string;
+    };
     [SCREENS.WORKSPACE.TAGS_SETTINGS]: {
         policyID: string;
     };
     [SCREENS.WORKSPACE.TAG_SETTINGS]: {
         policyID: string;
+        orderWeight: number;
         tagName: string;
     };
+    [SCREENS.WORKSPACE.TAG_LIST_VIEW]: {
+        policyID: string;
+        orderWeight: number;
+    };
     [SCREENS.WORKSPACE.TAGS_EDIT]: {
         policyID: string;
-        tagName: string;
+        orderWeight: number;
     };
     [SCREENS.WORKSPACE.TAG_EDIT]: {
         policyID: string;
+        orderWeight: number;
+        tagName: string;
+    };
+    [SCREENS.WORKSPACE.TAG_GL_CODE]: {
+        policyID: string;
+        orderWeight: number;
         tagName: string;
     };
+    [SCREENS.SETTINGS.SUBSCRIPTION.ROOT]: undefined;
+    [SCREENS.SETTINGS.SUBSCRIPTION.SIZE]: {
+        canChangeSize: 0 | 1;
+    };
+    [SCREENS.SETTINGS.SUBSCRIPTION.ADD_PAYMENT_CARD]: undefined;
+    [SCREENS.SETTINGS.SUBSCRIPTION.CHANGE_BILLING_CURRENCY]: undefined;
+    [SCREENS.SETTINGS.SUBSCRIPTION.CHANGE_PAYMENT_CURRENCY]: undefined;
     [SCREENS.WORKSPACE.TAXES_SETTINGS]: {
         policyID: string;
     };
@@ -234,6 +298,34 @@ type SettingsNavigatorParamList = {
     [SCREENS.WORKSPACE.TAXES_SETTINGS_WORKSPACE_CURRENCY_DEFAULT]: {
         policyID: string;
     };
+    [SCREENS.WORKSPACE.REPORT_FIELDS_CREATE]: {
+        policyID: string;
+    };
+    [SCREENS.WORKSPACE.REPORT_FIELDS_LIST_VALUES]: {
+        policyID: string;
+        reportFieldID?: string;
+    };
+    [SCREENS.WORKSPACE.REPORT_FIELDS_ADD_VALUE]: {
+        policyID: string;
+        reportFieldID?: string;
+    };
+    [SCREENS.WORKSPACE.REPORT_FIELDS_VALUE_SETTINGS]: {
+        policyID: string;
+        valueIndex: number;
+        reportFieldID?: string;
+    };
+    [SCREENS.WORKSPACE.REPORT_FIELDS_EDIT_VALUE]: {
+        policyID: string;
+        valueIndex: number;
+    };
+    [SCREENS.WORKSPACE.REPORT_FIELDS_SETTINGS]: {
+        policyID: string;
+        reportFieldID: string;
+    };
+    [SCREENS.WORKSPACE.REPORT_FIELDS_EDIT_INITIAL_VALUE]: {
+        policyID: string;
+        reportFieldID: string;
+    };
     [SCREENS.WORKSPACE.MEMBER_DETAILS]: {
         policyID: string;
         accountID: string;
@@ -305,15 +397,15 @@ type SettingsNavigatorParamList = {
     [SCREENS.WORKSPACE.ACCOUNTING.QUICKBOOKS_ONLINE_COMPANY_CARD_EXPENSE_ACCOUNT_COMPANY_CARD_SELECT]: {
         policyID: string;
     };
-    [SCREENS.WORKSPACE.ACCOUNTING.QUICKBOOKS_ONLINE_COMPANY_CARD_EXPENSE_ACCOUNT_PAYABLE_SELECT]: {
-        policyID: string;
-    };
     [SCREENS.WORKSPACE.ACCOUNTING.QUICKBOOKS_ONLINE_EXPORT_PREFERRED_EXPORTER]: {
         policyID: string;
     };
     [SCREENS.WORKSPACE.ACCOUNTING.XERO_IMPORT]: {
         policyID: string;
     };
+    [SCREENS.WORKSPACE.ACCOUNTING.XERO_CHART_OF_ACCOUNTS]: {
+        policyID: string;
+    };
     [SCREENS.WORKSPACE.ACCOUNTING.XERO_CUSTOMER]: {
         policyID: string;
     };
@@ -324,13 +416,223 @@ type SettingsNavigatorParamList = {
     [SCREENS.WORKSPACE.ACCOUNTING.XERO_TAXES]: {
         policyID: string;
     };
+    [SCREENS.WORKSPACE.ACCOUNTING.XERO_TRACKING_CATEGORIES]: {
+        policyID: string;
+    };
+    [SCREENS.WORKSPACE.ACCOUNTING.XERO_MAP_TRACKING_CATEGORY]: {
+        policyID: string;
+        categoryId: string;
+        categoryName: string;
+    };
+    [SCREENS.WORKSPACE.ACCOUNTING.XERO_EXPORT]: {
+        policyID: string;
+    };
+    [SCREENS.WORKSPACE.ACCOUNTING.XERO_EXPORT_PURCHASE_BILL_DATE_SELECT]: {
+        policyID: string;
+    };
     [SCREENS.WORKSPACE.ACCOUNTING.XERO_ADVANCED]: {
         policyID: string;
     };
+    [SCREENS.WORKSPACE.ACCOUNTING.XERO_BILL_STATUS_SELECTOR]: {
+        policyID: string;
+    };
+    [SCREENS.WORKSPACE.ACCOUNTING.XERO_INVOICE_ACCOUNT_SELECTOR]: {
+        policyID: string;
+    };
+    [SCREENS.WORKSPACE.ACCOUNTING.XERO_EXPORT_PREFERRED_EXPORTER_SELECT]: {
+        policyID: string;
+    };
+    [SCREENS.WORKSPACE.ACCOUNTING.XERO_BILL_PAYMENT_ACCOUNT_SELECTOR]: {
+        policyID: string;
+    };
+    [SCREENS.WORKSPACE.ACCOUNTING.SAGE_INTACCT_PREREQUISITES]: {
+        policyID: string;
+    };
+    [SCREENS.WORKSPACE.ACCOUNTING.ENTER_SAGE_INTACCT_CREDENTIALS]: {
+        policyID: string;
+    };
+    [SCREENS.WORKSPACE.ACCOUNTING.EXISTING_SAGE_INTACCT_CONNECTIONS]: {
+        policyID: string;
+    };
+    [SCREENS.WORKSPACE.ACCOUNTING.SAGE_INTACCT_ENTITY]: {
+        policyID: string;
+    };
+    [SCREENS.WORKSPACE.ACCOUNTING.NETSUITE_SUBSIDIARY_SELECTOR]: {
+        policyID: string;
+    };
+    [SCREENS.WORKSPACE.ACCOUNTING.NETSUITE_REUSE_EXISTING_CONNECTIONS]: {
+        policyID: string;
+    };
+    [SCREENS.WORKSPACE.ACCOUNTING.NETSUITE_TOKEN_INPUT]: {
+        policyID: string;
+    };
+    [SCREENS.WORKSPACE.ACCOUNTING.NETSUITE_IMPORT]: {
+        policyID: string;
+    };
+    [SCREENS.WORKSPACE.ACCOUNTING.NETSUITE_IMPORT_CUSTOMERS_OR_PROJECTS]: {
+        policyID: string;
+    };
+    [SCREENS.WORKSPACE.ACCOUNTING.NETSUITE_IMPORT_CUSTOMERS_OR_PROJECTS_SELECT]: {
+        policyID: string;
+    };
+    [SCREENS.WORKSPACE.ACCOUNTING.NETSUITE_IMPORT_MAPPING]: {
+        policyID: string;
+        importField: TupleToUnion<typeof CONST.NETSUITE_CONFIG.IMPORT_FIELDS>;
+    };
+    [SCREENS.WORKSPACE.ACCOUNTING.NETSUITE_IMPORT_CUSTOM_FIELD]: {
+        policyID: string;
+        importCustomField: TupleToUnion<typeof CONST.NETSUITE_CONFIG.IMPORT_CUSTOM_FIELDS>;
+    };
+    [SCREENS.WORKSPACE.ACCOUNTING.NETSUITE_IMPORT_CUSTOM_FIELD_VIEW]: {
+        policyID: string;
+        importCustomField: TupleToUnion<typeof CONST.NETSUITE_CONFIG.IMPORT_CUSTOM_FIELDS>;
+        internalID: string;
+    };
+    [SCREENS.WORKSPACE.ACCOUNTING.NETSUITE_IMPORT_CUSTOM_FIELD_EDIT]: {
+        policyID: string;
+        importCustomField: TupleToUnion<typeof CONST.NETSUITE_CONFIG.IMPORT_CUSTOM_FIELDS>;
+        internalID: string;
+        fieldName: string;
+    };
+    [SCREENS.WORKSPACE.ACCOUNTING.NETSUITE_IMPORT_CUSTOM_LIST_ADD]: {
+        policyID: string;
+    };
+    [SCREENS.WORKSPACE.ACCOUNTING.NETSUITE_IMPORT_CUSTOM_SEGMENT_ADD]: {
+        policyID: string;
+    };
+    [SCREENS.WORKSPACE.ACCOUNTING.NETSUITE_EXPORT]: {
+        policyID: string;
+    };
+    [SCREENS.WORKSPACE.ACCOUNTING.NETSUITE_PREFERRED_EXPORTER_SELECT]: {
+        policyID: string;
+    };
+    [SCREENS.WORKSPACE.ACCOUNTING.NETSUITE_DATE_SELECT]: {
+        policyID: string;
+    };
+    [SCREENS.WORKSPACE.ACCOUNTING.NETSUITE_EXPORT_EXPENSES]: {
+        policyID: string;
+        expenseType: ValueOf<typeof CONST.NETSUITE_EXPENSE_TYPE>;
+    };
+    [SCREENS.WORKSPACE.ACCOUNTING.NETSUITE_EXPORT_EXPENSES_DESTINATION_SELECT]: {
+        policyID: string;
+        expenseType: ValueOf<typeof CONST.NETSUITE_EXPENSE_TYPE>;
+    };
+    [SCREENS.WORKSPACE.ACCOUNTING.NETSUITE_EXPORT_EXPENSES_VENDOR_SELECT]: {
+        policyID: string;
+        expenseType: ValueOf<typeof CONST.NETSUITE_EXPENSE_TYPE>;
+    };
+    [SCREENS.WORKSPACE.ACCOUNTING.NETSUITE_EXPORT_EXPENSES_PAYABLE_ACCOUNT_SELECT]: {
+        policyID: string;
+        expenseType: ValueOf<typeof CONST.NETSUITE_EXPENSE_TYPE>;
+    };
+    [SCREENS.WORKSPACE.ACCOUNTING.NETSUITE_EXPORT_EXPENSES_JOURNAL_POSTING_PREFERENCE_SELECT]: {
+        policyID: string;
+        expenseType: ValueOf<typeof CONST.NETSUITE_EXPENSE_TYPE>;
+    };
+    [SCREENS.WORKSPACE.ACCOUNTING.NETSUITE_RECEIVABLE_ACCOUNT_SELECT]: {
+        policyID: string;
+    };
+    [SCREENS.WORKSPACE.ACCOUNTING.NETSUITE_INVOICE_ITEM_PREFERENCE_SELECT]: {
+        policyID: string;
+    };
+    [SCREENS.WORKSPACE.ACCOUNTING.NETSUITE_INVOICE_ITEM_SELECT]: {
+        policyID: string;
+    };
+    [SCREENS.WORKSPACE.ACCOUNTING.NETSUITE_TAX_POSTING_ACCOUNT_SELECT]: {
+        policyID: string;
+    };
+    [SCREENS.WORKSPACE.ACCOUNTING.NETSUITE_PROVINCIAL_TAX_POSTING_ACCOUNT_SELECT]: {
+        policyID: string;
+    };
+    [SCREENS.WORKSPACE.ACCOUNTING.NETSUITE_ADVANCED]: {
+        policyID: string;
+    };
+    [SCREENS.WORKSPACE.ACCOUNTING.NETSUITE_REIMBURSEMENT_ACCOUNT_SELECT]: {
+        policyID: string;
+    };
+    [SCREENS.WORKSPACE.ACCOUNTING.NETSUITE_COLLECTION_ACCOUNT_SELECT]: {
+        policyID: string;
+    };
+    [SCREENS.WORKSPACE.ACCOUNTING.NETSUITE_EXPENSE_REPORT_APPROVAL_LEVEL_SELECT]: {
+        policyID: string;
+    };
+    [SCREENS.WORKSPACE.ACCOUNTING.NETSUITE_VENDOR_BILL_APPROVAL_LEVEL_SELECT]: {
+        policyID: string;
+    };
+    [SCREENS.WORKSPACE.ACCOUNTING.NETSUITE_JOURNAL_ENTRY_APPROVAL_LEVEL_SELECT]: {
+        policyID: string;
+    };
+    [SCREENS.WORKSPACE.ACCOUNTING.NETSUITE_APPROVAL_ACCOUNT_SELECT]: {
+        policyID: string;
+    };
+    [SCREENS.WORKSPACE.ACCOUNTING.NETSUITE_CUSTOM_FORM_ID]: {
+        policyID: string;
+        expenseType: ValueOf<typeof CONST.NETSUITE_EXPENSE_TYPE>;
+    };
+    [SCREENS.WORKSPACE.ACCOUNTING.SAGE_INTACCT_IMPORT]: {
+        policyID: string;
+    };
+    [SCREENS.WORKSPACE.ACCOUNTING.SAGE_INTACCT_TOGGLE_MAPPING]: {
+        policyID: string;
+        mapping: SageIntacctMappingName;
+    };
+    [SCREENS.WORKSPACE.ACCOUNTING.SAGE_INTACCT_MAPPING_TYPE]: {
+        policyID: string;
+        mapping: SageIntacctMappingName;
+    };
+    [SCREENS.WORKSPACE.ACCOUNTING.SAGE_INTACCT_ADD_USER_DIMENSION]: {
+        policyID: string;
+    };
+    [SCREENS.WORKSPACE.ACCOUNTING.SAGE_INTACCT_USER_DIMENSIONS]: {
+        policyID: string;
+    };
+    [SCREENS.WORKSPACE.ACCOUNTING.SAGE_INTACCT_EDIT_USER_DIMENSION]: {
+        policyID: string;
+        dimensionName: string;
+    };
+    [SCREENS.WORKSPACE.ACCOUNTING.SAGE_INTACCT_EXPORT]: {
+        policyID: string;
+    };
+    [SCREENS.WORKSPACE.ACCOUNTING.SAGE_INTACCT_PREFERRED_EXPORTER]: {
+        policyID: string;
+    };
+    [SCREENS.WORKSPACE.ACCOUNTING.SAGE_INTACCT_EXPORT_DATE]: {
+        policyID: string;
+    };
+    [SCREENS.WORKSPACE.ACCOUNTING.SAGE_INTACCT_REIMBURSABLE_EXPENSES]: {
+        policyID: string;
+    };
+    [SCREENS.WORKSPACE.ACCOUNTING.SAGE_INTACCT_NON_REIMBURSABLE_EXPENSES]: {
+        policyID: string;
+    };
+    [SCREENS.WORKSPACE.ACCOUNTING.SAGE_INTACCT_DEFAULT_VENDOR]: {
+        policyID: string;
+        reimbursable: string;
+    };
+    [SCREENS.WORKSPACE.ACCOUNTING.SAGE_INTACCT_NON_REIMBURSABLE_CREDIT_CARD_ACCOUNT]: {
+        policyID: string;
+    };
+    [SCREENS.WORKSPACE.ACCOUNTING.SAGE_INTACCT_ADVANCED]: {
+        policyID: string;
+    };
+    [SCREENS.WORKSPACE.ACCOUNTING.SAGE_INTACCT_PAYMENT_ACCOUNT]: {
+        policyID: string;
+    };
+    [SCREENS.WORKSPACE.ACCOUNTING.CARD_RECONCILIATION]: {
+        policyID: string;
+        connection: ValueOf<typeof CONST.POLICY.CONNECTIONS.ROUTE>;
+    };
+    [SCREENS.WORKSPACE.ACCOUNTING.RECONCILIATION_ACCOUNT_SETTINGS]: {
+        policyID: string;
+        connection: ValueOf<typeof CONST.POLICY.CONNECTIONS.ROUTE>;
+    };
     [SCREENS.GET_ASSISTANCE]: {
         backTo: Routes;
     };
-    [SCREENS.SETTINGS.TWO_FACTOR_AUTH]: BackToParams;
+    [SCREENS.SETTINGS.TWO_FACTOR_AUTH]: {
+        backTo?: Routes;
+        forwardTo?: string;
+    };
     [SCREENS.SETTINGS.REPORT_CARD_LOST_OR_DAMAGED]: {
         /** cardID of selected card */
         cardID: string;
@@ -359,17 +661,69 @@ type SettingsNavigatorParamList = {
         policyID: string;
         taxID: string;
     };
+    [SCREENS.WORKSPACE.TAX_CODE]: {
+        policyID: string;
+        taxID: string;
+    };
+    [SCREENS.WORKSPACE.INVOICES_COMPANY_NAME]: {
+        policyID: string;
+    };
+    [SCREENS.WORKSPACE.INVOICES_COMPANY_WEBSITE]: {
+        policyID: string;
+    };
+    [SCREENS.WORKSPACE.COMPANY_CARDS_SELECT_FEED]: {
+        policyID: string;
+    };
+    [SCREENS.WORKSPACE.EXPENSIFY_CARD_ISSUE_NEW]: {
+        policyID: string;
+    };
+    [SCREENS.WORKSPACE.EXPENSIFY_CARD_BANK_ACCOUNT]: {
+        policyID: string;
+    };
+    [SCREENS.WORKSPACE.EXPENSIFY_CARD_SETTINGS]: {
+        policyID: string;
+    };
+    [SCREENS.WORKSPACE.EXPENSIFY_CARD_SETTINGS_ACCOUNT]: {
+        policyID: string;
+    };
+    [SCREENS.WORKSPACE.EXPENSIFY_CARD_SETTINGS_FREQUENCY]: {
+        policyID: string;
+    };
+    [SCREENS.WORKSPACE.EXPENSIFY_CARD_DETAILS]: {
+        policyID: string;
+        cardID: string;
+        backTo?: Routes;
+    };
+    [SCREENS.WORKSPACE.EXPENSIFY_CARD_NAME]: {
+        policyID: string;
+        cardID: string;
+    };
+    [SCREENS.WORKSPACE.EXPENSIFY_CARD_LIMIT]: {
+        policyID: string;
+        cardID: string;
+    };
+    [SCREENS.WORKSPACE.EXPENSIFY_CARD_LIMIT_TYPE]: {
+        policyID: string;
+        cardID: string;
+    };
+    [SCREENS.WORKSPACE.RULES_RECEIPT_REQUIRED_AMOUNT]: {
+        policyID: string;
+    };
+    [SCREENS.WORKSPACE.RULES_MAX_EXPENSE_AMOUNT]: {
+        policyID: string;
+    };
+    [SCREENS.WORKSPACE.RULES_MAX_EXPENSE_AGE]: {
+        policyID: string;
+    };
+    [SCREENS.WORKSPACE.RULES_BILLABLE_DEFAULT]: {
+        policyID: string;
+    };
 } & ReimbursementAccountNavigatorParamList;
 
 type NewChatNavigatorParamList = {
     [SCREENS.NEW_CHAT.ROOT]: undefined;
-    [SCREENS.NEW_CHAT.NEW_CHAT_EDIT_NAME]: {
-        reportID?: string;
-    };
-};
-
-type ChatFinderNavigatorParamList = {
-    [SCREENS.CHAT_FINDER_ROOT]: undefined;
+    [SCREENS.NEW_CHAT.NEW_CHAT_CONFIRM]: undefined;
+    [SCREENS.NEW_CHAT.NEW_CHAT_EDIT_NAME]: undefined;
 };
 
 type DetailsNavigatorParamList = {
@@ -383,6 +737,7 @@ type ProfileNavigatorParamList = {
     [SCREENS.PROFILE_ROOT]: {
         accountID: string;
         reportID: string;
+        login?: string;
         backTo: Routes;
     };
 };
@@ -392,14 +747,18 @@ type ReportDetailsNavigatorParamList = {
     [SCREENS.REPORT_DETAILS.SHARE_CODE]: {
         reportID: string;
     };
+    [SCREENS.REPORT_DETAILS.EXPORT]: {
+        reportID: string;
+        policyID: string;
+        connectionName: ConnectionName;
+    };
 };
 
 type ReportSettingsNavigatorParamList = {
-    [SCREENS.REPORT_SETTINGS.ROOT]: undefined;
-    [SCREENS.REPORT_SETTINGS.ROOM_NAME]: undefined;
-    [SCREENS.REPORT_SETTINGS.GROUP_NAME]: undefined;
-    [SCREENS.REPORT_SETTINGS.NOTIFICATION_PREFERENCES]: undefined;
-    [SCREENS.REPORT_SETTINGS.WRITE_CAPABILITY]: undefined;
+    [SCREENS.REPORT_SETTINGS.ROOT]: {reportID: string};
+    [SCREENS.REPORT_SETTINGS.NAME]: {reportID: string};
+    [SCREENS.REPORT_SETTINGS.NOTIFICATION_PREFERENCES]: {reportID: string};
+    [SCREENS.REPORT_SETTINGS.WRITE_CAPABILITY]: {reportID: string};
     [SCREENS.REPORT_SETTINGS.VISIBILITY]: {
         reportID: string;
     };
@@ -440,6 +799,12 @@ type MoneyRequestNavigatorParamList = {
         reportID: string;
         backTo: Routes;
     };
+    [SCREENS.MONEY_REQUEST.STEP_COMPANY_INFO]: {
+        iouType: IOUType;
+        transactionID: string;
+        reportID: string;
+        backTo: Routes;
+    };
     [SCREENS.MONEY_REQUEST.STEP_PARTICIPANTS]: {
         action: IOUAction;
         iouType: Exclude<IOUType, typeof CONST.IOU.TYPE.REQUEST | typeof CONST.IOU.TYPE.SEND>;
@@ -553,6 +918,7 @@ type MoneyRequestNavigatorParamList = {
         currency?: string;
     };
     [SCREENS.MONEY_REQUEST.STEP_DISTANCE_RATE]: {
+        action: IOUAction;
         iouType: ValueOf<typeof CONST.IOU.TYPE>;
         transactionID: string;
         backTo: Routes;
@@ -565,6 +931,7 @@ type MoneyRequestNavigatorParamList = {
         reportID: string;
         pageIndex?: string;
         backTo?: string;
+        participantsAutoAssigned?: string;
     };
     [SCREENS.MONEY_REQUEST.STEP_SCAN]: {
         action: IOUAction;
@@ -683,9 +1050,36 @@ type PrivateNotesNavigatorParamList = {
     };
 };
 
+type TransactionDuplicateNavigatorParamList = {
+    [SCREENS.TRANSACTION_DUPLICATE.REVIEW]: {
+        threadReportID: string;
+    };
+    [SCREENS.TRANSACTION_DUPLICATE.MERCHANT]: {
+        threadReportID: string;
+    };
+    [SCREENS.TRANSACTION_DUPLICATE.CATEGORY]: {
+        threadReportID: string;
+    };
+    [SCREENS.TRANSACTION_DUPLICATE.TAG]: {
+        threadReportID: string;
+    };
+    [SCREENS.TRANSACTION_DUPLICATE.DESCRIPTION]: {
+        threadReportID: string;
+    };
+    [SCREENS.TRANSACTION_DUPLICATE.TAX_CODE]: {
+        threadReportID: string;
+    };
+    [SCREENS.TRANSACTION_DUPLICATE.BILLABLE]: {
+        threadReportID: string;
+    };
+    [SCREENS.TRANSACTION_DUPLICATE.REIMBURSABLE]: {
+        threadReportID: string;
+    };
+};
+
 type LeftModalNavigatorParamList = {
-    [SCREENS.LEFT_MODAL.CHAT_FINDER]: NavigatorScreenParams<ChatFinderNavigatorParamList>;
-    [SCREENS.LEFT_MODAL.WORKSPACE_SWITCHER]: NavigatorScreenParams<WorkspaceSwitcherNavigatorParamList>;
+    [SCREENS.LEFT_MODAL.CHAT_FINDER]: undefined;
+    [SCREENS.LEFT_MODAL.WORKSPACE_SWITCHER]: undefined;
 };
 
 type RightModalNavigatorParamList = {
@@ -696,6 +1090,7 @@ type RightModalNavigatorParamList = {
     [SCREENS.SETTINGS.SHARE_CODE]: undefined;
     [SCREENS.RIGHT_MODAL.REPORT_DETAILS]: NavigatorScreenParams<ReportDetailsNavigatorParamList>;
     [SCREENS.RIGHT_MODAL.REPORT_SETTINGS]: NavigatorScreenParams<ReportSettingsNavigatorParamList>;
+    [SCREENS.RIGHT_MODAL.SETTINGS_CATEGORIES]: NavigatorScreenParams<SettingsNavigatorParamList>;
     [SCREENS.RIGHT_MODAL.REPORT_DESCRIPTION]: NavigatorScreenParams<ReportDescriptionNavigatorParamList>;
     [SCREENS.RIGHT_MODAL.PARTICIPANTS]: NavigatorScreenParams<ParticipantsNavigatorParamList>;
     [SCREENS.RIGHT_MODAL.ROOM_MEMBERS]: NavigatorScreenParams<RoomMembersNavigatorParamList>;
@@ -714,27 +1109,53 @@ type RightModalNavigatorParamList = {
     [SCREENS.RIGHT_MODAL.PROCESS_MONEY_REQUEST_HOLD]: NavigatorScreenParams<ProcessMoneyRequestHoldNavigatorParamList>;
     [SCREENS.RIGHT_MODAL.REFERRAL]: NavigatorScreenParams<ReferralDetailsNavigatorParamList>;
     [SCREENS.RIGHT_MODAL.PRIVATE_NOTES]: NavigatorScreenParams<PrivateNotesNavigatorParamList>;
+    [SCREENS.RIGHT_MODAL.TRANSACTION_DUPLICATE]: NavigatorScreenParams<TransactionDuplicateNavigatorParamList>;
     [SCREENS.RIGHT_MODAL.TRAVEL]: NavigatorScreenParams<TravelNavigatorParamList>;
     [SCREENS.RIGHT_MODAL.SEARCH_REPORT]: NavigatorScreenParams<SearchReportParamList>;
+    [SCREENS.RIGHT_MODAL.RESTRICTED_ACTION]: NavigatorScreenParams<RestrictedActionParamList>;
+    [SCREENS.RIGHT_MODAL.SEARCH_ADVANCED_FILTERS]: NavigatorScreenParams<SearchAdvancedFiltersParamList>;
 };
 
 type TravelNavigatorParamList = {
     [SCREENS.TRAVEL.MY_TRIPS]: undefined;
-    [SCREENS.RIGHT_MODAL.SEARCH_REPORT]: NavigatorScreenParams<SearchReportParamList>;
 };
 
-type WorkspacesCentralPaneNavigatorParamList = {
+type FullScreenNavigatorParamList = {
+    [SCREENS.WORKSPACE.INITIAL]: {
+        policyID: string;
+        backTo?: string;
+    };
     [SCREENS.WORKSPACE.PROFILE]: {
         policyID: string;
     };
     [SCREENS.WORKSPACE.CARD]: {
         policyID: string;
     };
+    [SCREENS.WORKSPACE.EXPENSIFY_CARD]: {
+        policyID: string;
+    };
+    [SCREENS.WORKSPACE.COMPANY_CARDS]: {
+        policyID: string;
+    };
     [SCREENS.WORKSPACE.WORKFLOWS]: {
         policyID: string;
     };
-    [SCREENS.WORKSPACE.WORKFLOWS_APPROVER]: {
+    [SCREENS.WORKSPACE.WORKFLOWS_APPROVALS_NEW]: {
+        policyID: string;
+        backTo?: Routes;
+    };
+    [SCREENS.WORKSPACE.WORKFLOWS_APPROVALS_EDIT]: {
         policyID: string;
+        firstApproverEmail: string;
+    };
+    [SCREENS.WORKSPACE.WORKFLOWS_APPROVALS_EXPENSES_FROM]: {
+        policyID: string;
+        backTo?: Routes;
+    };
+    [SCREENS.WORKSPACE.WORKFLOWS_APPROVALS_APPROVER]: {
+        policyID: string;
+        approverIndex?: number;
+        backTo?: Routes;
     };
     [SCREENS.WORKSPACE.WORKFLOWS_AUTO_REPORTING_FREQUENCY]: {
         policyID: string;
@@ -759,21 +1180,23 @@ type WorkspacesCentralPaneNavigatorParamList = {
     };
     [SCREENS.WORKSPACE.CATEGORIES]: {
         policyID: string;
+        backTo?: Routes;
     };
     [SCREENS.WORKSPACE.MORE_FEATURES]: {
         policyID: string;
     };
     [SCREENS.WORKSPACE.TAGS]: {
         policyID: string;
-        tagName: string;
     };
     [SCREENS.WORKSPACE.TAXES]: {
         policyID: string;
     };
+    [SCREENS.WORKSPACE.REPORT_FIELDS]: {
+        policyID: string;
+    };
     [SCREENS.WORKSPACE.DISTANCE_RATES]: {
         policyID: string;
     };
-
     [SCREENS.WORKSPACE.ACCOUNTING.ROOT]: {
         policyID: string;
     };
@@ -786,30 +1209,41 @@ type WorkspacesCentralPaneNavigatorParamList = {
     [SCREENS.WORKSPACE.ACCOUNTING.QUICKBOOKS_ONLINE_INVOICE_ACCOUNT_SELECTOR]: {
         policyID: string;
     };
-};
-
-type FullScreenNavigatorParamList = {
-    [SCREENS.WORKSPACE.INITIAL]: {
+    [SCREENS.WORKSPACE.EXPENSIFY_CARD]: {
+        policyID: string;
+    };
+    [SCREENS.WORKSPACE.RULES]: {
         policyID: string;
     };
-    [SCREENS.WORKSPACES_CENTRAL_PANE]: NavigatorScreenParams<WorkspacesCentralPaneNavigatorParamList>;
 };
 
 type OnboardingModalNavigatorParamList = {
-    [SCREENS.ONBOARDING_MODAL.ONBOARDING]: undefined;
-    [SCREENS.ONBOARDING.PERSONAL_DETAILS]: undefined;
-    [SCREENS.ONBOARDING.PURPOSE]: undefined;
-    [SCREENS.ONBOARDING.WORK]: undefined;
+    [SCREENS.ONBOARDING_MODAL.ONBOARDING]: {
+        backTo?: string;
+    };
+    [SCREENS.ONBOARDING.PERSONAL_DETAILS]: {
+        backTo?: string;
+    };
+    [SCREENS.ONBOARDING.PURPOSE]: {
+        backTo?: string;
+    };
+    [SCREENS.ONBOARDING.WORK]: {
+        backTo?: string;
+    };
 };
 
 type WelcomeVideoModalNavigatorParamList = {
     [SCREENS.WELCOME_VIDEO.ROOT]: undefined;
 };
 
+type ExplanationModalNavigatorParamList = {
+    [SCREENS.EXPLANATION_MODAL.ROOT]: undefined;
+};
+
 type BottomTabNavigatorParamList = {
-    [SCREENS.HOME]: undefined;
-    [SCREENS.SEARCH.BOTTOM_TAB]: undefined;
-    [SCREENS.SETTINGS.ROOT]: undefined;
+    [SCREENS.HOME]: {policyID?: string};
+    [SCREENS.SEARCH.BOTTOM_TAB]: CentralPaneScreensParamList[typeof SCREENS.SEARCH.CENTRAL_PANE];
+    [SCREENS.SETTINGS.ROOT]: {policyID?: string};
 };
 
 type SharedScreensParamList = {
@@ -843,55 +1277,73 @@ type PublicScreensParamList = SharedScreensParamList & {
     [SCREENS.CONNECTION_COMPLETE]: undefined;
 };
 
-type AuthScreensParamList = SharedScreensParamList & {
-    [NAVIGATORS.CENTRAL_PANE_NAVIGATOR]: NavigatorScreenParams<CentralPaneNavigatorParamList>;
-    [SCREENS.CONCIERGE]: undefined;
-    [SCREENS.REPORT_ATTACHMENTS]: {
-        reportID: string;
-        source: string;
+type AuthScreensParamList = CentralPaneScreensParamList &
+    SharedScreensParamList & {
+        [SCREENS.CONCIERGE]: undefined;
+        [SCREENS.TRACK_EXPENSE]: undefined;
+        [SCREENS.SUBMIT_EXPENSE]: undefined;
+        [SCREENS.ATTACHMENTS]: {
+            reportID: string;
+            source: string;
+            type: ValueOf<typeof CONST.ATTACHMENT_TYPE>;
+            accountID: string;
+        };
+        [SCREENS.PROFILE_AVATAR]: {
+            accountID: string;
+        };
+        [SCREENS.WORKSPACE_AVATAR]: {
+            policyID: string;
+        };
+        [SCREENS.WORKSPACE_JOIN_USER]: {
+            policyID: string;
+            email: string;
+        };
+        [SCREENS.REPORT_AVATAR]: {
+            reportID: string;
+            policyID?: string;
+        };
+        [SCREENS.NOT_FOUND]: undefined;
+        [NAVIGATORS.LEFT_MODAL_NAVIGATOR]: NavigatorScreenParams<LeftModalNavigatorParamList>;
+        [NAVIGATORS.RIGHT_MODAL_NAVIGATOR]: NavigatorScreenParams<RightModalNavigatorParamList>;
+        [NAVIGATORS.FULL_SCREEN_NAVIGATOR]: NavigatorScreenParams<FullScreenNavigatorParamList>;
+        [NAVIGATORS.ONBOARDING_MODAL_NAVIGATOR]: NavigatorScreenParams<OnboardingModalNavigatorParamList>;
+        [NAVIGATORS.FEATURE_TRANING_MODAL_NAVIGATOR]: NavigatorScreenParams<FeatureTrainingNavigatorParamList>;
+        [NAVIGATORS.WELCOME_VIDEO_MODAL_NAVIGATOR]: NavigatorScreenParams<WelcomeVideoModalNavigatorParamList>;
+        [NAVIGATORS.EXPLANATION_MODAL_NAVIGATOR]: NavigatorScreenParams<ExplanationModalNavigatorParamList>;
+        [SCREENS.DESKTOP_SIGN_IN_REDIRECT]: undefined;
+        [SCREENS.TRANSACTION_RECEIPT]: {
+            reportID: string;
+            transactionID: string;
+            readonly?: boolean;
+        };
+        [SCREENS.CONNECTION_COMPLETE]: undefined;
     };
-    [SCREENS.PROFILE_AVATAR]: {
-        accountID: string;
-    };
-    [SCREENS.WORKSPACE_AVATAR]: {
-        policyID: string;
-    };
-    [SCREENS.WORKSPACE_JOIN_USER]: {
-        policyID: string;
-        email: string;
-    };
-    [SCREENS.REPORT_AVATAR]: {
-        reportID: string;
-    };
-    [SCREENS.NOT_FOUND]: undefined;
-    [NAVIGATORS.LEFT_MODAL_NAVIGATOR]: NavigatorScreenParams<LeftModalNavigatorParamList>;
-    [NAVIGATORS.RIGHT_MODAL_NAVIGATOR]: NavigatorScreenParams<RightModalNavigatorParamList>;
-    [NAVIGATORS.FULL_SCREEN_NAVIGATOR]: NavigatorScreenParams<FullScreenNavigatorParamList>;
-    [NAVIGATORS.ONBOARDING_MODAL_NAVIGATOR]: NavigatorScreenParams<OnboardingModalNavigatorParamList>;
-    [NAVIGATORS.FEATURE_TRANING_MODAL_NAVIGATOR]: NavigatorScreenParams<FeatureTrainingNavigatorParamList>;
-    [NAVIGATORS.WELCOME_VIDEO_MODAL_NAVIGATOR]: NavigatorScreenParams<WelcomeVideoModalNavigatorParamList>;
-    [SCREENS.DESKTOP_SIGN_IN_REDIRECT]: undefined;
-    [SCREENS.TRANSACTION_RECEIPT]: {
-        reportID: string;
-        transactionID: string;
-    };
-    [SCREENS.CONNECTION_COMPLETE]: undefined;
-};
 
 type SearchReportParamList = {
     [SCREENS.SEARCH.REPORT_RHP]: {
-        query: string;
         reportID: string;
     };
 };
 
-type RootStackParamList = PublicScreensParamList & AuthScreensParamList & ChatFinderNavigatorParamList;
+type SearchAdvancedFiltersParamList = {
+    [SCREENS.SEARCH.ADVANCED_FILTERS_RHP]: Record<string, never>;
+};
+
+type RestrictedActionParamList = {
+    [SCREENS.RESTRICTED_ACTION_ROOT]: {
+        policyID: string;
+    };
+};
+
+type RootStackParamList = PublicScreensParamList & AuthScreensParamList & LeftModalNavigatorParamList;
 
 type BottomTabName = keyof BottomTabNavigatorParamList;
 
-type CentralPaneName = keyof CentralPaneNavigatorParamList;
+type FullScreenName = keyof FullScreenNavigatorParamList;
+
+type CentralPaneName = keyof CentralPaneScreensParamList;
 
-type FullScreenName = keyof WorkspacesCentralPaneNavigatorParamList;
+type OnboardingFlowName = keyof OnboardingModalNavigatorParamList;
 
 type SwitchPolicyIDParams = {
     policyID?: string;
@@ -902,15 +1354,16 @@ type SwitchPolicyIDParams = {
 export type {
     AddPersonalBankAccountNavigatorParamList,
     AuthScreensParamList,
+    CentralPaneScreensParamList,
+    CentralPaneName,
     BackToParams,
+    BackToAndForwardToParms,
     BottomTabName,
     BottomTabNavigatorParamList,
-    CentralPaneName,
-    CentralPaneNavigatorParamList,
-    ChatFinderNavigatorParamList,
     DetailsNavigatorParamList,
     EditRequestNavigatorParamList,
     EnablePaymentsNavigatorParamList,
+    ExplanationModalNavigatorParamList,
     FlagCommentNavigatorParamList,
     FullScreenName,
     FullScreenNavigatorParamList,
@@ -923,6 +1376,7 @@ export type {
     NewChatNavigatorParamList,
     NewTaskNavigatorParamList,
     OnboardingModalNavigatorParamList,
+    OnboardingFlowName,
     ParticipantsNavigatorParamList,
     PrivateNotesNavigatorParamList,
     ProfileNavigatorParamList,
@@ -936,6 +1390,7 @@ export type {
     RoomInviteNavigatorParamList,
     RoomMembersNavigatorParamList,
     RootStackParamList,
+    SearchNavigatorParamList,
     SettingsNavigatorParamList,
     SignInNavigatorParamList,
     FeatureTrainingNavigatorParamList,
@@ -949,7 +1404,8 @@ export type {
     TeachersUniteNavigatorParamList,
     WalletStatementNavigatorParamList,
     WelcomeVideoModalNavigatorParamList,
-    WorkspaceSwitcherNavigatorParamList,
-    WorkspacesCentralPaneNavigatorParamList,
+    TransactionDuplicateNavigatorParamList,
     SearchReportParamList,
+    SearchAdvancedFiltersParamList,
+    RestrictedActionParamList,
 };
diff --git a/src/libs/NavigationUtils.ts b/src/libs/NavigationUtils.ts
new file mode 100644
index 000000000000..ea1710b9931c
--- /dev/null
+++ b/src/libs/NavigationUtils.ts
@@ -0,0 +1,46 @@
+import cloneDeep from 'lodash/cloneDeep';
+import SCREENS from '@src/SCREENS';
+import getTopmostBottomTabRoute from './Navigation/getTopmostBottomTabRoute';
+import type {CentralPaneName, OnboardingFlowName, RootStackParamList, State} from './Navigation/types';
+
+const CENTRAL_PANE_SCREEN_NAMES = new Set([
+    SCREENS.SETTINGS.WORKSPACES,
+    SCREENS.SETTINGS.PREFERENCES.ROOT,
+    SCREENS.SETTINGS.SECURITY,
+    SCREENS.SETTINGS.PROFILE.ROOT,
+    SCREENS.SETTINGS.WALLET.ROOT,
+    SCREENS.SETTINGS.ABOUT,
+    SCREENS.SETTINGS.TROUBLESHOOT,
+    SCREENS.SETTINGS.SAVE_THE_WORLD,
+    SCREENS.SETTINGS.SUBSCRIPTION.ROOT,
+    SCREENS.SEARCH.CENTRAL_PANE,
+    SCREENS.REPORT,
+]);
+
+const ONBOARDING_SCREEN_NAMES = new Set([SCREENS.ONBOARDING.PERSONAL_DETAILS, SCREENS.ONBOARDING.PURPOSE, SCREENS.ONBOARDING.WORK, SCREENS.ONBOARDING_MODAL.ONBOARDING]);
+
+const removePolicyIDParamFromState = (state: State<RootStackParamList>) => {
+    const stateCopy = cloneDeep(state);
+    const bottomTabRoute = getTopmostBottomTabRoute(stateCopy);
+    if (bottomTabRoute?.params && 'policyID' in bottomTabRoute.params) {
+        delete bottomTabRoute.params.policyID;
+    }
+    return stateCopy;
+};
+
+function isCentralPaneName(screen: string | undefined): screen is CentralPaneName {
+    if (!screen) {
+        return false;
+    }
+    return CENTRAL_PANE_SCREEN_NAMES.has(screen as CentralPaneName);
+}
+
+function isOnboardingFlowName(screen: string | undefined): screen is OnboardingFlowName {
+    if (!screen) {
+        return false;
+    }
+
+    return ONBOARDING_SCREEN_NAMES.has(screen as OnboardingFlowName);
+}
+
+export {isCentralPaneName, removePolicyIDParamFromState, isOnboardingFlowName};
diff --git a/src/libs/Network/NetworkStore.ts b/src/libs/Network/NetworkStore.ts
index 086beddc970e..89b40e63834c 100644
--- a/src/libs/Network/NetworkStore.ts
+++ b/src/libs/Network/NetworkStore.ts
@@ -1,12 +1,12 @@
 import Onyx from 'react-native-onyx';
 import type {ValueOf} from 'type-fest';
-import {SIDE_EFFECT_REQUEST_COMMANDS, WRITE_COMMANDS} from '@libs/API/types';
+import {READ_COMMANDS, SIDE_EFFECT_REQUEST_COMMANDS, WRITE_COMMANDS} from '@libs/API/types';
 import CONST from '@src/CONST';
 import ONYXKEYS from '@src/ONYXKEYS';
 import type Credentials from '@src/types/onyx/Credentials';
 
-let credentials: Credentials | null = null;
-let authToken: string | null = null;
+let credentials: Credentials | null | undefined;
+let authToken: string | null | undefined;
 let authTokenType: ValueOf<typeof CONST.AUTH_TOKEN_TYPES> | null;
 let currentUserEmail: string | null = null;
 let offline = false;
@@ -62,7 +62,7 @@ Onyx.connect({
 Onyx.connect({
     key: ONYXKEYS.CREDENTIALS,
     callback: (val) => {
-        credentials = val;
+        credentials = val ?? null;
         checkRequiredData();
     },
 });
@@ -81,11 +81,11 @@ Onyx.connect({
             triggerReconnectCallback();
         }
 
-        offline = Boolean(network.shouldForceOffline) || !!network.isOffline;
+        offline = !!network.shouldForceOffline || !!network.isOffline;
     },
 });
 
-function getCredentials(): Credentials | null {
+function getCredentials(): Credentials | null | undefined {
     return credentials;
 }
 
@@ -93,12 +93,12 @@ function isOffline(): boolean {
     return offline;
 }
 
-function getAuthToken(): string | null {
+function getAuthToken(): string | null | undefined {
     return authToken;
 }
 
 function isSupportRequest(command: string): boolean {
-    return [WRITE_COMMANDS.OPEN_APP, SIDE_EFFECT_REQUEST_COMMANDS.RECONNECT_APP, SIDE_EFFECT_REQUEST_COMMANDS.OPEN_REPORT].some((cmd) => cmd === command);
+    return [WRITE_COMMANDS.OPEN_APP, SIDE_EFFECT_REQUEST_COMMANDS.RECONNECT_APP, SIDE_EFFECT_REQUEST_COMMANDS.OPEN_REPORT, READ_COMMANDS.SEARCH].some((cmd) => cmd === command);
 }
 
 function isSupportAuthToken(): boolean {
diff --git a/src/libs/Network/SequentialQueue.ts b/src/libs/Network/SequentialQueue.ts
index b94166c0249d..fb09f7f216bd 100644
--- a/src/libs/Network/SequentialQueue.ts
+++ b/src/libs/Network/SequentialQueue.ts
@@ -1,5 +1,6 @@
 import Onyx from 'react-native-onyx';
 import * as ActiveClientManager from '@libs/ActiveClientManager';
+import Log from '@libs/Log';
 import * as Request from '@libs/Request';
 import * as RequestThrottle from '@libs/RequestThrottle';
 import * as PersistedRequests from '@userActions/PersistedRequests';
@@ -9,6 +10,11 @@ import ONYXKEYS from '@src/ONYXKEYS';
 import type OnyxRequest from '@src/types/onyx/Request';
 import * as NetworkStore from './NetworkStore';
 
+type RequestError = Error & {
+    name?: string;
+    message?: string;
+};
+
 let resolveIsReadyPromise: ((args?: unknown[]) => void) | undefined;
 let isReadyPromise = new Promise((resolve) => {
     resolveIsReadyPromise = resolve;
@@ -26,10 +32,11 @@ let isQueuePaused = false;
  */
 function pause() {
     if (isQueuePaused) {
+        Log.info('[SequentialQueue] Queue already paused');
         return;
     }
 
-    console.debug('[SequentialQueue] Pausing the queue');
+    Log.info('[SequentialQueue] Pausing the queue');
     isQueuePaused = true;
 }
 
@@ -40,6 +47,7 @@ function flushOnyxUpdatesQueue() {
     // The only situation where the queue is paused is if we found a gap between the app current data state and our server's. If that happens,
     // we'll trigger async calls to make the client updated again. While we do that, we don't want to insert anything in Onyx.
     if (isQueuePaused) {
+        Log.info('[SequentialQueue] Queue already paused');
         return;
     }
     QueuedOnyxUpdates.flushQueue();
@@ -56,11 +64,18 @@ function flushOnyxUpdatesQueue() {
 function process(): Promise<void> {
     // When the queue is paused, return early. This prevents any new requests from happening. The queue will be flushed again when the queue is unpaused.
     if (isQueuePaused) {
+        Log.info('[SequentialQueue] Unable to process. Queue is paused.');
+        return Promise.resolve();
+    }
+
+    if (NetworkStore.isOffline()) {
+        Log.info('[SequentialQueue] Unable to process. We are offline.');
         return Promise.resolve();
     }
 
     const persistedRequests = PersistedRequests.getAll();
-    if (persistedRequests.length === 0 || NetworkStore.isOffline()) {
+    if (persistedRequests.length === 0) {
+        Log.info('[SequentialQueue] Unable to process. No requests to process.');
         return Promise.resolve();
     }
 
@@ -72,13 +87,14 @@ function process(): Promise<void> {
             // A response might indicate that the queue should be paused. This happens when a gap in onyx updates is detected between the client and the server and
             // that gap needs resolved before the queue can continue.
             if (response?.shouldPauseQueue) {
+                Log.info("[SequentialQueue] Handled 'shouldPauseQueue' in response. Pausing the queue.");
                 pause();
             }
             PersistedRequests.remove(requestToProcess);
             RequestThrottle.clear();
             return process();
         })
-        .catch((error) => {
+        .catch((error: RequestError) => {
             // On sign out we cancel any in flight requests from the user. Since that user is no longer signed in their requests should not be retried.
             // Duplicate records don't need to be retried as they just mean the record already exists on the server
             if (error.name === CONST.ERROR.REQUEST_CANCELLED || error.message === CONST.ERROR.DUPLICATE_RECORD) {
@@ -102,16 +118,24 @@ function process(): Promise<void> {
 function flush() {
     // When the queue is paused, return early. This will keep an requests in the queue and they will get flushed again when the queue is unpaused
     if (isQueuePaused) {
+        Log.info('[SequentialQueue] Unable to flush. Queue is paused.');
+        return;
+    }
+
+    if (isSequentialQueueRunning) {
+        Log.info('[SequentialQueue] Unable to flush. Queue is already running.');
         return;
     }
 
-    if (isSequentialQueueRunning || PersistedRequests.getAll().length === 0) {
+    if (PersistedRequests.getAll().length === 0) {
+        Log.info('[SequentialQueue] Unable to flush. No requests to process.');
         return;
     }
 
     // ONYXKEYS.PERSISTED_REQUESTS is shared across clients, thus every client/tab will have a copy
     // It is very important to only process the queue from leader client otherwise requests will be duplicated.
     if (!ActiveClientManager.isClientTheLeader()) {
+        Log.info('[SequentialQueue] Unable to flush. Client is not the leader.');
         return;
     }
 
@@ -123,13 +147,19 @@ function flush() {
     });
 
     // Ensure persistedRequests are read from storage before proceeding with the queue
-    const connectionID = Onyx.connect({
+    const connection = Onyx.connect({
         key: ONYXKEYS.PERSISTED_REQUESTS,
+        // We exceptionally opt out of reusing the connection here to avoid extra callback calls due to
+        // an existing connection already made in PersistedRequests.ts.
+        reuseConnection: false,
         callback: () => {
-            Onyx.disconnect(connectionID);
+            Onyx.disconnect(connection);
             process().finally(() => {
+                Log.info('[SequentialQueue] Finished processing queue.');
                 isSequentialQueueRunning = false;
-                resolveIsReadyPromise?.();
+                if (NetworkStore.isOffline() || PersistedRequests.getAll().length === 0) {
+                    resolveIsReadyPromise?.();
+                }
                 currentRequest = null;
                 flushOnyxUpdatesQueue();
             });
@@ -142,6 +172,7 @@ function flush() {
  */
 function unpause() {
     if (!isQueuePaused) {
+        Log.info('[SequentialQueue] Unable to unpause queue. We are already processing.');
         return;
     }
 
diff --git a/src/libs/Network/enhanceParameters.ts b/src/libs/Network/enhanceParameters.ts
index 5c4590baded3..01d2185a34c6 100644
--- a/src/libs/Network/enhanceParameters.ts
+++ b/src/libs/Network/enhanceParameters.ts
@@ -1,8 +1,25 @@
+import Onyx from 'react-native-onyx';
 import * as Environment from '@libs/Environment/Environment';
 import getPlatform from '@libs/getPlatform';
 import CONFIG from '@src/CONFIG';
+import ONYXKEYS from '@src/ONYXKEYS';
+import pkg from '../../../package.json';
 import * as NetworkStore from './NetworkStore';
 
+// For all requests, we'll send the lastUpdateID that is applied to this client. This will
+// allow us to calculate previousUpdateID faster.
+let lastUpdateIDAppliedToClient = -1;
+Onyx.connect({
+    key: ONYXKEYS.ONYX_UPDATES_LAST_UPDATE_ID_APPLIED_TO_CLIENT,
+    callback: (value) => {
+        if (value) {
+            lastUpdateIDAppliedToClient = value;
+        } else {
+            lastUpdateIDAppliedToClient = -1;
+        }
+    },
+});
+
 /**
  * Does this command require an authToken?
  */
@@ -17,7 +34,7 @@ export default function enhanceParameters(command: string, parameters: Record<st
     const finalParameters = {...parameters};
 
     if (isAuthTokenRequired(command) && !parameters.authToken) {
-        finalParameters.authToken = NetworkStore.getAuthToken();
+        finalParameters.authToken = NetworkStore.getAuthToken() ?? null;
     }
 
     finalParameters.referer = CONFIG.EXPENSIFY.EXPENSIFY_CASH_REFERER;
@@ -36,5 +53,9 @@ export default function enhanceParameters(command: string, parameters: Record<st
 
     finalParameters.isFromDevEnv = Environment.isDevelopment();
 
+    finalParameters.appversion = pkg.version;
+
+    finalParameters.clientUpdateID = lastUpdateIDAppliedToClient;
+
     return finalParameters;
 }
diff --git a/src/libs/NetworkConnection.ts b/src/libs/NetworkConnection.ts
index 2077a168b4b9..c77ed94ca1bb 100644
--- a/src/libs/NetworkConnection.ts
+++ b/src/libs/NetworkConnection.ts
@@ -11,22 +11,36 @@ import AppStateMonitor from './AppStateMonitor';
 import Log from './Log';
 
 let isOffline = false;
-let hasPendingNetworkCheck = false;
 type NetworkStatus = ValueOf<typeof CONST.NETWORK.NETWORK_STATUS>;
 
+type ResponseJSON = {
+    jsonCode: number;
+};
+
 // Holds all of the callbacks that need to be triggered when the network reconnects
 let callbackID = 0;
 const reconnectionCallbacks: Record<string, () => void> = {};
 
+let isServerUp = true;
+let wasServerDown = false;
+
 /**
  * Loop over all reconnection callbacks and fire each one
  */
 const triggerReconnectionCallbacks = throttle(
     (reason) => {
-        Log.info(`[NetworkConnection] Firing reconnection callbacks because ${reason}`);
-        Object.values(reconnectionCallbacks).forEach((callback) => {
-            callback();
-        });
+        let delay = 0;
+
+        if (wasServerDown && isServerUp) {
+            delay = Math.floor(Math.random() * 61000);
+            wasServerDown = false;
+        }
+        setTimeout(() => {
+            Log.info(`[NetworkConnection] Firing reconnection callbacks because ${reason}`);
+            Object.values(reconnectionCallbacks).forEach((callback) => {
+                callback();
+            });
+        }, delay);
     },
     5000,
     {trailing: false},
@@ -36,8 +50,8 @@ const triggerReconnectionCallbacks = throttle(
  * Called when the offline status of the app changes and if the network is "reconnecting" (going from offline to online)
  * then all of the reconnection callbacks are triggered
  */
-function setOfflineStatus(isCurrentlyOffline: boolean): void {
-    NetworkActions.setIsOffline(isCurrentlyOffline);
+function setOfflineStatus(isCurrentlyOffline: boolean, reason = ''): void {
+    NetworkActions.setIsOffline(isCurrentlyOffline, reason);
 
     // When reconnecting, ie, going from offline to online, all the reconnection callbacks
     // are triggered (this is usually Actions that need to re-download data from the server)
@@ -56,17 +70,37 @@ Onyx.connect({
         if (!network) {
             return;
         }
-        const currentShouldForceOffline = Boolean(network.shouldForceOffline);
+        const currentShouldForceOffline = !!network.shouldForceOffline;
         if (currentShouldForceOffline === shouldForceOffline) {
             return;
         }
         shouldForceOffline = currentShouldForceOffline;
         if (shouldForceOffline) {
-            setOfflineStatus(true);
+            setOfflineStatus(true, 'shouldForceOffline was detected in the Onyx data');
+            Log.info(`[NetworkStatus] Setting "offlineStatus" to "true" because user is under force offline`);
         } else {
             // If we are no longer forcing offline fetch the NetInfo to set isOffline appropriately
-            NetInfo.fetch().then((state) => setOfflineStatus((state.isInternetReachable ?? false) === false));
+            NetInfo.fetch().then((state) => {
+                const isInternetUnreachable = (state.isInternetReachable ?? false) === false;
+                setOfflineStatus(isInternetUnreachable || !isServerUp, 'NetInfo checked if the internet is reachable');
+                Log.info(
+                    `[NetworkStatus] The force-offline mode was turned off. Getting the device network status from NetInfo. Network state: ${JSON.stringify(
+                        state,
+                    )}. Setting the offline status to: ${isInternetUnreachable}.`,
+                );
+            });
+        }
+    },
+});
+
+let accountID = 0;
+Onyx.connect({
+    key: ONYXKEYS.SESSION,
+    callback: (session) => {
+        if (!session?.accountID) {
+            return;
         }
+        accountID = session.accountID;
     },
 });
 
@@ -74,8 +108,9 @@ Onyx.connect({
  * Set up the event listener for NetInfo to tell whether the user has
  * internet connectivity or not. This is more reliable than the Pusher
  * `disconnected` event which takes about 10-15 seconds to emit.
+ * @returns unsubscribe method
  */
-function subscribeToNetInfo(): void {
+function subscribeToNetInfo(): () => void {
     // Note: We are disabling the configuration for NetInfo when using the local web API since requests can get stuck in a 'Pending' state and are not reliable indicators for "offline".
     // If you need to test the "recheck" feature then switch to the production API proxy server.
     if (!CONFIG.IS_USING_LOCAL_WEB) {
@@ -84,7 +119,7 @@ function subscribeToNetInfo(): void {
             // By default, NetInfo uses `/` for `reachabilityUrl`
             // When App is served locally (or from Electron) this address is always reachable - even offline
             // Using the API url ensures reachability is tested over internet
-            reachabilityUrl: `${CONFIG.EXPENSIFY.DEFAULT_API_ROOT}api/Ping`,
+            reachabilityUrl: `${CONFIG.EXPENSIFY.DEFAULT_API_ROOT}api/Ping?accountID=${accountID || 'unknown'}`,
             reachabilityMethod: 'GET',
             reachabilityTest: (response) => {
                 if (!response.ok) {
@@ -92,8 +127,22 @@ function subscribeToNetInfo(): void {
                 }
                 return response
                     .json()
-                    .then((json) => Promise.resolve(json.jsonCode === 200))
-                    .catch(() => Promise.resolve(false));
+                    .then((json: ResponseJSON) => {
+                        if (json.jsonCode !== 200 && isServerUp) {
+                            Log.info('[NetworkConnection] Received non-200 response from reachability test. Setting isServerUp status to false.');
+                            isServerUp = false;
+                            wasServerDown = true;
+                        } else if (json.jsonCode === 200 && !isServerUp) {
+                            Log.info('[NetworkConnection] Received 200 response from reachability test. Setting isServerUp status to true.');
+                            isServerUp = true;
+                        }
+                        return Promise.resolve(json.jsonCode === 200);
+                    })
+                    .catch(() => {
+                        isServerUp = false;
+                        wasServerDown = true;
+                        return Promise.resolve(false);
+                    });
             },
 
             // If a check is taking longer than this time we're considered offline
@@ -103,13 +152,14 @@ function subscribeToNetInfo(): void {
 
     // Subscribe to the state change event via NetInfo so we can update
     // whether a user has internet connectivity or not.
-    NetInfo.addEventListener((state) => {
+    const unsubscribeNetInfo = NetInfo.addEventListener((state) => {
         Log.info('[NetworkConnection] NetInfo state change', false, {...state});
         if (shouldForceOffline) {
             Log.info('[NetworkConnection] Not setting offline status because shouldForceOffline = true');
             return;
         }
-        setOfflineStatus((state.isInternetReachable ?? false) === false);
+        setOfflineStatus(state.isInternetReachable === false || !isServerUp, 'NetInfo received a state change event');
+        Log.info(`[NetworkStatus] NetInfo.addEventListener event coming, setting "offlineStatus" to ${!!state.isInternetReachable} with network state: ${JSON.stringify(state)}`);
         let networkStatus;
         if (!isBoolean(state.isInternetReachable)) {
             networkStatus = CONST.NETWORK.NETWORK_STATUS.UNKNOWN;
@@ -118,6 +168,21 @@ function subscribeToNetInfo(): void {
         }
         NetworkActions.setNetWorkStatus(networkStatus);
     });
+
+    // Periodically recheck the network connection
+    // More info: https://github.com/Expensify/App/issues/42988
+    const recheckIntervalID = setInterval(() => {
+        if (!isOffline) {
+            return;
+        }
+        recheckNetworkConnection();
+        Log.info(`[NetworkStatus] Rechecking the network connection with "isOffline" set to "true" to double-check internet reachability.`);
+    }, CONST.NETWORK.RECHECK_INTERVAL_MS);
+
+    return () => {
+        clearInterval(recheckIntervalID);
+        unsubscribeNetInfo();
+    };
 }
 
 function listenForReconnect() {
@@ -150,13 +215,8 @@ function clearReconnectionCallbacks() {
  * Refresh NetInfo state.
  */
 function recheckNetworkConnection() {
-    if (hasPendingNetworkCheck) {
-        return;
-    }
-
     Log.info('[NetworkConnection] recheck NetInfo');
-    hasPendingNetworkCheck = true;
-    NetInfo.refresh().finally(() => (hasPendingNetworkCheck = false));
+    NetInfo.refresh();
 }
 
 export default {
diff --git a/src/libs/NextStepUtils.ts b/src/libs/NextStepUtils.ts
index 66f63ddfd27f..544bc228fa70 100644
--- a/src/libs/NextStepUtils.ts
+++ b/src/libs/NextStepUtils.ts
@@ -1,14 +1,13 @@
 import {format, lastDayOfMonth, setDate} from 'date-fns';
-import Str from 'expensify-common/lib/str';
+import {Str} from 'expensify-common';
 import Onyx from 'react-native-onyx';
-import type {OnyxCollection} from 'react-native-onyx';
+import type {OnyxCollection, OnyxEntry} from 'react-native-onyx';
 import type {ValueOf} from 'type-fest';
 import CONST from '@src/CONST';
 import ONYXKEYS from '@src/ONYXKEYS';
 import type {Policy, Report, ReportNextStep} from '@src/types/onyx';
 import type {Message} from '@src/types/onyx/ReportNextStep';
 import type DeepValueOf from '@src/types/utils/DeepValueOf';
-import type {EmptyObject} from '@src/types/utils/EmptyObject';
 import DateUtils from './DateUtils';
 import EmailUtils from './EmailUtils';
 import * as PersonalDetailsUtils from './PersonalDetailsUtils';
@@ -16,6 +15,7 @@ import * as PolicyUtils from './PolicyUtils';
 import * as ReportUtils from './ReportUtils';
 
 let currentUserAccountID = -1;
+let currentUserEmail = '';
 Onyx.connect({
     key: ONYXKEYS.SESSION,
     callback: (value) => {
@@ -24,6 +24,7 @@ Onyx.connect({
         }
 
         currentUserAccountID = value?.accountID ?? -1;
+        currentUserEmail = value?.email ?? '';
     },
 });
 
@@ -52,16 +53,26 @@ function parseMessage(messages: Message[] | undefined) {
     });
 
     const formattedHtml = nextStepHTML
-        .replace(/%expenses/g, 'these expenses')
-        .replace(/%Expenses/g, 'These expenses')
+        .replace(/%expenses/g, 'expense(s)')
+        .replace(/%Expenses/g, 'Expense(s)')
         .replace(/%tobe/g, 'are');
 
     return `<next-step>${formattedHtml}</next-step>`;
 }
 
-type BuildNextStepParameters = {
-    isPaidWithExpensify?: boolean;
-};
+function getNextApproverDisplayName(policy: Policy, ownerAccountID: number, submitToAccountID: number, report: OnyxEntry<Report>) {
+    const approvalChain = ReportUtils.getApprovalChain(policy, ownerAccountID, report?.total ?? 0);
+    if (approvalChain.length === 0) {
+        return ReportUtils.getDisplayNameForParticipant(submitToAccountID);
+    }
+
+    const nextApproverEmail = approvalChain.length === 1 ? approvalChain[0] : approvalChain[approvalChain.indexOf(currentUserEmail) + 1];
+    if (!nextApproverEmail) {
+        return ReportUtils.getDisplayNameForParticipant(submitToAccountID);
+    }
+
+    return PersonalDetailsUtils.getPersonalDetailByEmail(nextApproverEmail)?.displayName ?? nextApproverEmail;
+}
 
 /**
  * Generates an optimistic nextStep based on a current report status and other properties.
@@ -71,24 +82,21 @@ type BuildNextStepParameters = {
  * @param parameters.isPaidWithExpensify - Whether a report has been paid with Expensify or outside
  * @returns nextStep
  */
-function buildNextStep(
-    report: Report | EmptyObject,
-    predictedNextStatus: ValueOf<typeof CONST.REPORT.STATUS_NUM>,
-    {isPaidWithExpensify}: BuildNextStepParameters = {},
-): ReportNextStep | null {
+function buildNextStep(report: OnyxEntry<Report>, predictedNextStatus: ValueOf<typeof CONST.REPORT.STATUS_NUM>): ReportNextStep | null {
     if (!ReportUtils.isExpenseReport(report)) {
         return null;
     }
 
-    const {policyID = '', ownerAccountID = -1, managerID = -1} = report;
+    const {policyID = '', ownerAccountID = -1} = report ?? {};
     const policy = allPolicies?.[`${ONYXKEYS.COLLECTION.POLICY}${policyID}`] ?? ({} as Policy);
-    const {harvesting, preventSelfApproval, autoReportingFrequency, autoReportingOffset} = policy;
+    const {harvesting, autoReportingOffset} = policy;
+    const autoReportingFrequency = PolicyUtils.getCorrectedAutoReportingFrequency(policy);
     const submitToAccountID = PolicyUtils.getSubmitToAccountID(policy, ownerAccountID);
-    const isOwner = currentUserAccountID === ownerAccountID;
-    const isManager = currentUserAccountID === managerID;
-    const isSelfApproval = currentUserAccountID === submitToAccountID;
-    const ownerLogin = PersonalDetailsUtils.getLoginsByAccountIDs([ownerAccountID])[0] ?? '';
-    const managerDisplayName = isSelfApproval ? 'you' : ReportUtils.getDisplayNameForParticipant(submitToAccountID) ?? '';
+    const ownerDisplayName = ReportUtils.getDisplayNameForParticipant(ownerAccountID);
+    const nextApproverDisplayName = getNextApproverDisplayName(policy, ownerAccountID, submitToAccountID, report);
+
+    const reimburserAccountID = PolicyUtils.getReimburserAccountID(policy);
+    const reimburserDisplayName = ReportUtils.getDisplayNameForParticipant(reimburserAccountID);
     const type: ReportNextStep['type'] = 'neutral';
     let optimisticNextStep: ReportNextStep | null;
 
@@ -98,24 +106,23 @@ function buildNextStep(
             // Self review
             optimisticNextStep = {
                 type,
-                title: 'Next Steps:',
+                icon: CONST.NEXT_STEP.ICONS.HOURGLASS,
                 message: [
                     {
                         text: 'Waiting for ',
                     },
                     {
-                        text: 'you',
+                        text: `${ownerDisplayName}`,
                         type: 'strong',
                     },
                     {
                         text: ' to ',
                     },
                     {
-                        text: 'submit',
-                        type: 'strong',
+                        text: 'add',
                     },
                     {
-                        text: ' these expenses.',
+                        text: ' %expenses.',
                     },
                 ],
             };
@@ -124,7 +131,14 @@ function buildNextStep(
             if (harvesting?.enabled && autoReportingFrequency !== CONST.POLICY.AUTO_REPORTING_FREQUENCIES.MANUAL) {
                 optimisticNextStep.message = [
                     {
-                        text: 'These expenses are scheduled to ',
+                        text: 'Waiting for ',
+                    },
+                    {
+                        text: `${ownerDisplayName}'s`,
+                        type: 'strong',
+                    },
+                    {
+                        text: ' %expenses to automatically submit',
                     },
                 ];
                 let harvestingSuffix = '';
@@ -152,107 +166,48 @@ function buildNextStep(
                         [CONST.POLICY.AUTO_REPORTING_FREQUENCIES.WEEKLY]: 'on Sunday',
                         [CONST.POLICY.AUTO_REPORTING_FREQUENCIES.SEMI_MONTHLY]: 'on the 1st and 16th of each month',
                         [CONST.POLICY.AUTO_REPORTING_FREQUENCIES.MONTHLY]: formattedDate ? `on the ${formattedDate} of each month` : '',
-                        [CONST.POLICY.AUTO_REPORTING_FREQUENCIES.TRIP]: 'at the end of your trip',
+                        [CONST.POLICY.AUTO_REPORTING_FREQUENCIES.TRIP]: 'at the end of their trip',
                         [CONST.POLICY.AUTO_REPORTING_FREQUENCIES.INSTANT]: '',
                         [CONST.POLICY.AUTO_REPORTING_FREQUENCIES.MANUAL]: '',
                     };
 
                     if (harvestingSuffixes[autoReportingFrequency]) {
-                        harvestingSuffix = ` ${harvestingSuffixes[autoReportingFrequency]}`;
+                        harvestingSuffix = `${harvestingSuffixes[autoReportingFrequency]}`;
                     }
                 }
 
-                optimisticNextStep.message.push(
-                    {
-                        text: `automatically submit${harvestingSuffix}!`,
-                        type: 'strong',
-                    },
-                    {
-                        text: ' No further action required!',
-                    },
-                );
-            }
-
-            // Prevented self submitting
-            if (preventSelfApproval && isSelfApproval) {
-                optimisticNextStep.message = [
-                    {
-                        text: "Oops! Looks like you're submitting to ",
-                    },
-                    {
-                        text: 'yourself',
-                        type: 'strong',
-                    },
-                    {
-                        text: '. Approving your own reports is ',
-                    },
-                    {
-                        text: 'forbidden',
-                        type: 'strong',
-                    },
-                    {
-                        text: ' by your policy. Please submit this report to someone else or contact your admin to change the person you submit to.',
-                    },
-                ];
+                optimisticNextStep.message.push({
+                    text: ` ${harvestingSuffix}`,
+                });
             }
 
             break;
 
         // Generates an optimistic nextStep once a report has been submitted
         case CONST.REPORT.STATUS_NUM.SUBMITTED: {
-            const verb = isManager ? 'review' : 'approve';
-
             // Another owner
             optimisticNextStep = {
                 type,
-                title: 'Next Steps:',
+                icon: CONST.NEXT_STEP.ICONS.HOURGLASS,
                 message: [
-                    {
-                        text: ownerLogin,
-                        type: 'strong',
-                    },
-                    {
-                        text: ' is waiting for ',
-                    },
-                    {
-                        text: 'you',
-                        type: 'strong',
-                    },
-                    {
-                        text: ' to ',
-                    },
-                    {
-                        text: verb,
-                        type: 'strong',
-                    },
-                    {
-                        text: ' these %expenses.',
-                    },
-                ],
-            };
-
-            // Self review & another reviewer
-            if (!isSelfApproval || (isSelfApproval && isOwner)) {
-                optimisticNextStep.message = [
                     {
                         text: 'Waiting for ',
                     },
                     {
-                        text: managerDisplayName,
+                        text: nextApproverDisplayName,
                         type: 'strong',
                     },
                     {
                         text: ' to ',
                     },
                     {
-                        text: verb,
-                        type: 'strong',
+                        text: 'approve',
                     },
                     {
                         text: ' %expenses.',
                     },
-                ];
-            }
+                ],
+            };
 
             break;
         }
@@ -260,8 +215,8 @@ function buildNextStep(
         // Generates an optimistic nextStep once a report has been closed for example in the case of Submit and Close approval flow
         case CONST.REPORT.STATUS_NUM.CLOSED:
             optimisticNextStep = {
+                icon: CONST.NEXT_STEP.ICONS.CHECKMARK,
                 type,
-                title: 'Finished!',
                 message: [
                     {
                         text: 'No further action required!',
@@ -273,16 +228,37 @@ function buildNextStep(
 
         // Generates an optimistic nextStep once a report has been approved
         case CONST.REPORT.STATUS_NUM.APPROVED:
+            if (
+                ReportUtils.isInvoiceReport(report) ||
+                !ReportUtils.isPayer(
+                    {
+                        accountID: currentUserAccountID,
+                        email: currentUserEmail,
+                    },
+                    report,
+                )
+            ) {
+                optimisticNextStep = {
+                    type,
+                    icon: CONST.NEXT_STEP.ICONS.CHECKMARK,
+                    message: [
+                        {
+                            text: 'No further action required!',
+                        },
+                    ],
+                };
+                break;
+            }
             // Self review
             optimisticNextStep = {
                 type,
-                title: 'Next Steps:',
+                icon: CONST.NEXT_STEP.ICONS.HOURGLASS,
                 message: [
                     {
                         text: 'Waiting for ',
                     },
                     {
-                        text: 'you',
+                        text: reimburserDisplayName,
                         type: 'strong',
                     },
                     {
@@ -290,37 +266,12 @@ function buildNextStep(
                     },
                     {
                         text: 'pay',
-                        type: 'strong',
                     },
                     {
                         text: ' %expenses.',
                     },
                 ],
             };
-
-            // Another owner
-            if (!isOwner) {
-                optimisticNextStep.message = [
-                    {
-                        text: 'Waiting for ',
-                    },
-                    {
-                        text: managerDisplayName,
-                        type: 'strong',
-                    },
-                    {
-                        text: ' to ',
-                    },
-                    {
-                        text: 'pay',
-                        type: 'strong',
-                    },
-                    {
-                        text: ' %expenses.',
-                    },
-                ];
-            }
-
             break;
 
         // Generates an optimistic nextStep once a report has been paid
@@ -328,29 +279,14 @@ function buildNextStep(
             // Paid with wallet
             optimisticNextStep = {
                 type,
-                title: 'Finished!',
+                icon: CONST.NEXT_STEP.ICONS.CHECKMARK,
                 message: [
                     {
-                        text: 'You',
-                        type: 'strong',
-                    },
-                    {
-                        text: ' have marked these expenses as ',
-                    },
-                    {
-                        text: 'paid',
-                        type: 'strong',
+                        text: 'No further action required!',
                     },
                 ],
             };
 
-            // Paid outside of Expensify
-            if (isPaidWithExpensify === false) {
-                optimisticNextStep.message?.push({text: ' outside of Expensify'});
-            }
-
-            optimisticNextStep.message?.push({text: '.'});
-
             break;
 
         // Resets a nextStep
diff --git a/src/libs/Notification/LocalNotification/BrowserNotifications.ts b/src/libs/Notification/LocalNotification/BrowserNotifications.ts
index ee6d00ee2208..4c214a66c569 100644
--- a/src/libs/Notification/LocalNotification/BrowserNotifications.ts
+++ b/src/libs/Notification/LocalNotification/BrowserNotifications.ts
@@ -1,9 +1,10 @@
 // Web and desktop implementation only. Do not import for direct use. Use LocalNotification.
-import Str from 'expensify-common/lib/str';
+import {Str} from 'expensify-common';
 import type {ImageSourcePropType} from 'react-native';
 import EXPENSIFY_ICON_URL from '@assets/images/expensify-logo-round-clearspace.png';
 import * as AppUpdate from '@libs/actions/AppUpdate';
 import ModifiedExpenseMessage from '@libs/ModifiedExpenseMessage';
+import {getTextFromHtml} from '@libs/ReportActionsUtils';
 import * as ReportUtils from '@libs/ReportUtils';
 import type {Report, ReportAction} from '@src/types/onyx';
 import focusApp from './focusApp';
@@ -101,7 +102,12 @@ export default {
         const plainTextPerson = person?.map((f) => f.text).join() ?? '';
 
         // Specifically target the comment part of the message
-        const plainTextMessage = message?.find((f) => f?.type === 'COMMENT')?.text ?? '';
+        let plainTextMessage = '';
+        if (Array.isArray(message)) {
+            plainTextMessage = getTextFromHtml(message?.find((f) => f?.type === 'COMMENT')?.html);
+        } else {
+            plainTextMessage = message?.type === 'COMMENT' ? getTextFromHtml(message?.html) : '';
+        }
 
         if (isChatRoom) {
             const roomName = ReportUtils.getReportName(report);
@@ -153,7 +159,7 @@ export default {
      */
     clearNotifications(shouldClearNotification: (notificationData: LocalNotificationData) => boolean) {
         Object.values(notificationCache)
-            .filter((notification) => shouldClearNotification(notification.data))
+            .filter((notification) => shouldClearNotification(notification.data as LocalNotificationData))
             .forEach((notification) => notification.close());
     },
 };
diff --git a/src/libs/Notification/PushNotification/NotificationType.ts b/src/libs/Notification/PushNotification/NotificationType.ts
index 40778f38c0d4..0ae8d9cc488e 100644
--- a/src/libs/Notification/PushNotification/NotificationType.ts
+++ b/src/libs/Notification/PushNotification/NotificationType.ts
@@ -1,30 +1,35 @@
+import type {ValueOf} from 'type-fest';
 import type {OnyxServerUpdate} from '@src/types/onyx/OnyxUpdatesFromServer';
 
 const NotificationType = {
     REPORT_COMMENT: 'reportComment',
+    MONEY_REQUEST: 'moneyRequest',
 } as const;
 
 type NotificationDataMap = {
-    [NotificationType.REPORT_COMMENT]: ReportCommentNotificationData;
+    [NotificationType.REPORT_COMMENT]: ReportActionPushNotificationData;
+    [NotificationType.MONEY_REQUEST]: ReportActionPushNotificationData;
 };
 
-type NotificationData = ReportCommentNotificationData;
+type PushNotificationData = ReportActionPushNotificationData;
 
-type ReportCommentNotificationData = {
+type BasePushNotificationData = {
     title: string;
-    type: typeof NotificationType.REPORT_COMMENT;
-    reportID: number;
-    reportActionID: string;
-    shouldScrollToLastUnread?: boolean;
-    roomName?: string;
+    type: ValueOf<typeof NotificationType>;
     onyxData?: OnyxServerUpdate[];
     lastUpdateID?: number;
     previousUpdateID?: number;
 };
 
+type ReportActionPushNotificationData = BasePushNotificationData & {
+    reportID: number;
+    reportActionID: string;
+    roomName?: string;
+};
+
 /**
  * See https://github.com/Expensify/Web-Expensify/blob/main/lib/MobilePushNotifications.php for the various
  * types of push notifications sent by our API.
  */
 export default NotificationType;
-export type {NotificationDataMap, NotificationData, ReportCommentNotificationData};
+export type {NotificationDataMap, PushNotificationData, ReportActionPushNotificationData};
diff --git a/src/libs/Notification/PushNotification/index.native.ts b/src/libs/Notification/PushNotification/index.native.ts
index 43ddff2508ee..334317ec5d0a 100644
--- a/src/libs/Notification/PushNotification/index.native.ts
+++ b/src/libs/Notification/PushNotification/index.native.ts
@@ -5,12 +5,13 @@ import Log from '@libs/Log';
 import * as PushNotificationActions from '@userActions/PushNotification';
 import ONYXKEYS from '@src/ONYXKEYS';
 import ForegroundNotifications from './ForegroundNotifications';
-import type {NotificationData} from './NotificationType';
+import type {PushNotificationData} from './NotificationType';
 import NotificationType from './NotificationType';
+import parsePushNotificationPayload from './parsePushNotificationPayload';
 import type {ClearNotifications, Deregister, Init, OnReceived, OnSelected, Register} from './types';
 import type PushNotificationType from './types';
 
-type NotificationEventActionCallback = (data: NotificationData) => Promise<void>;
+type NotificationEventActionCallback = (data: PushNotificationData) => Promise<void>;
 
 type NotificationEventActionMap = Partial<Record<EventType, Record<string, NotificationEventActionCallback>>>;
 
@@ -27,14 +28,8 @@ const notificationEventActionMap: NotificationEventActionMap = {};
  */
 function pushNotificationEventCallback(eventType: EventType, notification: PushPayload) {
     const actionMap = notificationEventActionMap[eventType] ?? {};
-    let payload = notification.extras.payload;
 
-    // On Android, some notification payloads are sent as a JSON string rather than an object
-    if (typeof payload === 'string') {
-        payload = JSON.parse(payload);
-    }
-
-    const data = payload as NotificationData;
+    const data = parsePushNotificationPayload(notification.extras.payload);
 
     Log.info(`[PushNotification] Callback triggered for ${eventType}`);
 
@@ -130,7 +125,7 @@ const register: Register = (notificationID) => {
             // Refresh notification opt-in status NVP for the new user.
             refreshNotificationOptInStatus();
         })
-        .catch((error) => {
+        .catch((error: Record<string, unknown>) => {
             Log.warn('[PushNotification] Failed to register for push notifications! Reason: ', error);
         });
 };
diff --git a/src/libs/Notification/PushNotification/parsePushNotificationPayload.ts b/src/libs/Notification/PushNotification/parsePushNotificationPayload.ts
new file mode 100644
index 000000000000..8ef20dd9f537
--- /dev/null
+++ b/src/libs/Notification/PushNotification/parsePushNotificationPayload.ts
@@ -0,0 +1,20 @@
+import type {JsonObject, JsonValue} from '@ua/react-native-airship';
+import Log from '@libs/Log';
+import type {PushNotificationData} from './NotificationType';
+
+/**
+ * Parse the payload of a push notification. On Android, some notification payloads are sent as a JSON string rather than an object
+ */
+export default function parsePushNotificationPayload(payload: JsonValue | undefined): PushNotificationData | undefined {
+    let data = payload;
+    if (typeof payload === 'string') {
+        try {
+            data = JSON.parse(payload) as JsonObject;
+        } catch {
+            Log.hmmm(`[PushNotification] Failed to parse the payload`, payload);
+            data = undefined;
+        }
+    }
+
+    return data ? (data as PushNotificationData) : undefined;
+}
diff --git a/src/libs/Notification/PushNotification/shouldShowPushNotification.ts b/src/libs/Notification/PushNotification/shouldShowPushNotification.ts
index 89aa53b5634a..3bd7bf94c1e2 100644
--- a/src/libs/Notification/PushNotification/shouldShowPushNotification.ts
+++ b/src/libs/Notification/PushNotification/shouldShowPushNotification.ts
@@ -2,24 +2,16 @@ import type {PushPayload} from '@ua/react-native-airship';
 import Log from '@libs/Log';
 import * as ReportActionUtils from '@libs/ReportActionsUtils';
 import * as Report from '@userActions/Report';
-import type {NotificationData} from './NotificationType';
+import parsePushNotificationPayload from './parsePushNotificationPayload';
 
 /**
  * Returns whether the given Airship notification should be shown depending on the current state of the app
  */
 export default function shouldShowPushNotification(pushPayload: PushPayload): boolean {
     Log.info('[PushNotification] push notification received', false, {pushPayload});
+    const data = parsePushNotificationPayload(pushPayload.extras.payload);
 
-    let payload = pushPayload.extras.payload;
-
-    // The payload is string encoded on Android
-    if (typeof payload === 'string') {
-        payload = JSON.parse(payload);
-    }
-
-    const data = payload as NotificationData;
-
-    if (!data.reportID) {
+    if (data?.reportID === undefined) {
         Log.info('[PushNotification] Not a report action notification. Showing notification');
         return true;
     }
diff --git a/src/libs/Notification/PushNotification/subscribePushNotification/index.ts b/src/libs/Notification/PushNotification/subscribePushNotification/index.ts
index c5519b42dc09..c1a1442b1e53 100644
--- a/src/libs/Notification/PushNotification/subscribePushNotification/index.ts
+++ b/src/libs/Notification/PushNotification/subscribePushNotification/index.ts
@@ -1,8 +1,119 @@
+import {NativeModules} from 'react-native';
 import Onyx from 'react-native-onyx';
-import subscribeToReportCommentPushNotifications from '@libs/Notification/PushNotification/subscribeToReportCommentPushNotifications';
+import applyOnyxUpdatesReliably from '@libs/actions/applyOnyxUpdatesReliably';
+import * as ActiveClientManager from '@libs/ActiveClientManager';
+import Log from '@libs/Log';
+import Navigation from '@libs/Navigation/Navigation';
+import type {ReportActionPushNotificationData} from '@libs/Notification/PushNotification/NotificationType';
+import getPolicyEmployeeAccountIDs from '@libs/PolicyEmployeeListUtils';
+import {extractPolicyIDFromPath} from '@libs/PolicyUtils';
+import * as ReportConnection from '@libs/ReportConnection';
+import {doesReportBelongToWorkspace} from '@libs/ReportUtils';
+import Visibility from '@libs/Visibility';
+import * as Modal from '@userActions/Modal';
+import CONST from '@src/CONST';
 import ONYXKEYS from '@src/ONYXKEYS';
+import ROUTES from '@src/ROUTES';
+import type {OnyxUpdatesFromServer} from '@src/types/onyx';
+import {isEmptyObject} from '@src/types/utils/EmptyObject';
 import PushNotification from '..';
 
+let lastVisitedPath: string | undefined;
+Onyx.connect({
+    key: ONYXKEYS.LAST_VISITED_PATH,
+    callback: (value) => {
+        if (!value) {
+            return;
+        }
+        lastVisitedPath = value;
+    },
+});
+
+function getLastUpdateIDAppliedToClient(): Promise<number> {
+    return new Promise((resolve) => {
+        Onyx.connect({
+            key: ONYXKEYS.ONYX_UPDATES_LAST_UPDATE_ID_APPLIED_TO_CLIENT,
+            callback: (value) => resolve(value ?? 0),
+        });
+    });
+}
+
+function applyOnyxData({reportID, reportActionID, onyxData, lastUpdateID, previousUpdateID}: ReportActionPushNotificationData): Promise<void> {
+    Log.info(`[PushNotification] Applying onyx data in the ${Visibility.isVisible() ? 'foreground' : 'background'}`, false, {reportID, reportActionID});
+
+    if (!ActiveClientManager.isClientTheLeader()) {
+        Log.info('[PushNotification] received report comment notification, but ignoring it since this is not the active client');
+        return Promise.resolve();
+    }
+
+    if (!onyxData || !lastUpdateID || !previousUpdateID) {
+        Log.hmmm("[PushNotification] didn't apply onyx updates because some data is missing", {lastUpdateID, previousUpdateID, onyxDataCount: onyxData?.length ?? 0});
+        return Promise.resolve();
+    }
+
+    Log.info('[PushNotification] reliable onyx update received', false, {lastUpdateID, previousUpdateID, onyxDataCount: onyxData?.length ?? 0});
+    const updates: OnyxUpdatesFromServer = {
+        type: CONST.ONYX_UPDATE_TYPES.AIRSHIP,
+        lastUpdateID,
+        previousUpdateID,
+        updates: [
+            {
+                eventType: '', // This is only needed for Pusher events
+                data: onyxData,
+            },
+        ],
+    };
+
+    /**
+     * When this callback runs in the background on Android (via Headless JS), no other Onyx.connect callbacks will run. This means that
+     * lastUpdateIDAppliedToClient will NOT be populated in other libs. To workaround this, we manually read the value here
+     * and pass it as a param
+     */
+    return getLastUpdateIDAppliedToClient().then((lastUpdateIDAppliedToClient) => applyOnyxUpdatesReliably(updates, true, lastUpdateIDAppliedToClient));
+}
+
+function navigateToReport({reportID, reportActionID}: ReportActionPushNotificationData): Promise<void> {
+    Log.info('[PushNotification] Navigating to report', false, {reportID, reportActionID});
+
+    const policyID = lastVisitedPath && extractPolicyIDFromPath(lastVisitedPath);
+    const report = ReportConnection.getAllReports()?.[`${ONYXKEYS.COLLECTION.REPORT}${reportID}`];
+    const policyEmployeeAccountIDs = policyID ? getPolicyEmployeeAccountIDs(policyID) : [];
+    const reportBelongsToWorkspace = policyID && !isEmptyObject(report) && doesReportBelongToWorkspace(report, policyEmployeeAccountIDs, policyID);
+
+    Navigation.isNavigationReady()
+        .then(Navigation.waitForProtectedRoutes)
+        .then(() => {
+            // The attachment modal remains open when navigating to the report so we need to close it
+            Modal.close(() => {
+                try {
+                    // Get rid of the transition screen, if it is on the top of the stack
+                    if (NativeModules.HybridAppModule && Navigation.getActiveRoute().includes(ROUTES.TRANSITION_BETWEEN_APPS)) {
+                        Navigation.goBack();
+                    }
+                    // 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();
+                    }
+
+                    Log.info('[PushNotification] onSelected() - Navigation is ready. Navigating...', false, {reportID, reportActionID});
+                    if (!reportBelongsToWorkspace) {
+                        Navigation.navigateWithSwitchPolicyID({route: ROUTES.HOME});
+                    }
+                    Navigation.navigate(ROUTES.REPORT_WITH_ID.getRoute(String(reportID)));
+                } catch (error) {
+                    let errorMessage = String(error);
+                    if (error instanceof Error) {
+                        errorMessage = error.message;
+                    }
+
+                    Log.alert('[PushNotification] onSelected() - failed', {reportID, reportActionID, error: errorMessage});
+                }
+            });
+        });
+
+    return Promise.resolve();
+}
+
 /**
  * Manage push notification subscriptions on sign-in/sign-out.
  *
@@ -14,10 +125,14 @@ Onyx.connect({
     callback: (notificationID) => {
         if (notificationID) {
             PushNotification.register(notificationID);
-
-            // Prevent issue where report linking fails after users switch accounts without closing the app
             PushNotification.init();
-            subscribeToReportCommentPushNotifications();
+
+            // Subscribe handlers for different push notification types
+            PushNotification.onReceived(PushNotification.TYPE.REPORT_COMMENT, applyOnyxData);
+            PushNotification.onSelected(PushNotification.TYPE.REPORT_COMMENT, navigateToReport);
+
+            PushNotification.onReceived(PushNotification.TYPE.MONEY_REQUEST, applyOnyxData);
+            PushNotification.onSelected(PushNotification.TYPE.MONEY_REQUEST, navigateToReport);
         } else {
             PushNotification.deregister();
             PushNotification.clearNotifications();
diff --git a/src/libs/Notification/PushNotification/subscribeToReportCommentPushNotifications.ts b/src/libs/Notification/PushNotification/subscribeToReportCommentPushNotifications.ts
deleted file mode 100644
index a9b8fc0b64f4..000000000000
--- a/src/libs/Notification/PushNotification/subscribeToReportCommentPushNotifications.ts
+++ /dev/null
@@ -1,118 +0,0 @@
-import Onyx from 'react-native-onyx';
-import applyOnyxUpdatesReliably from '@libs/actions/applyOnyxUpdatesReliably';
-import * as ActiveClientManager from '@libs/ActiveClientManager';
-import Log from '@libs/Log';
-import Navigation from '@libs/Navigation/Navigation';
-import getPolicyEmployeeAccountIDs from '@libs/PolicyEmployeeListUtils';
-import {extractPolicyIDFromPath} from '@libs/PolicyUtils';
-import {doesReportBelongToWorkspace, getReport} from '@libs/ReportUtils';
-import Visibility from '@libs/Visibility';
-import * as Modal from '@userActions/Modal';
-import CONST from '@src/CONST';
-import ONYXKEYS from '@src/ONYXKEYS';
-import ROUTES from '@src/ROUTES';
-import type {OnyxUpdatesFromServer} from '@src/types/onyx';
-import {isEmptyObject} from '@src/types/utils/EmptyObject';
-import PushNotification from './index';
-
-let lastVisitedPath: string | undefined;
-Onyx.connect({
-    key: ONYXKEYS.LAST_VISITED_PATH,
-    callback: (value) => {
-        if (!value) {
-            return;
-        }
-        lastVisitedPath = value;
-    },
-});
-
-function getLastUpdateIDAppliedToClient(): Promise<number> {
-    return new Promise((resolve) => {
-        Onyx.connect({
-            key: ONYXKEYS.ONYX_UPDATES_LAST_UPDATE_ID_APPLIED_TO_CLIENT,
-            callback: (value) => resolve(value ?? 0),
-        });
-    });
-}
-
-/**
- * Setup reportComment push notification callbacks.
- */
-export default function subscribeToReportCommentPushNotifications() {
-    PushNotification.onReceived(PushNotification.TYPE.REPORT_COMMENT, ({reportID, reportActionID, onyxData, lastUpdateID, previousUpdateID}) => {
-        Log.info(`[PushNotification] received report comment notification in the ${Visibility.isVisible() ? 'foreground' : 'background'}`, false, {reportID, reportActionID});
-
-        if (!ActiveClientManager.isClientTheLeader()) {
-            Log.info('[PushNotification] received report comment notification, but ignoring it since this is not the active client');
-            return Promise.resolve();
-        }
-
-        if (!onyxData || !lastUpdateID || !previousUpdateID) {
-            Log.hmmm("[PushNotification] didn't apply onyx updates because some data is missing", {lastUpdateID, previousUpdateID, onyxDataCount: onyxData?.length ?? 0});
-            return Promise.resolve();
-        }
-
-        Log.info('[PushNotification] reliable onyx update received', false, {lastUpdateID, previousUpdateID, onyxDataCount: onyxData?.length ?? 0});
-        const updates: OnyxUpdatesFromServer = {
-            type: CONST.ONYX_UPDATE_TYPES.AIRSHIP,
-            lastUpdateID,
-            previousUpdateID,
-            updates: [
-                {
-                    eventType: 'eventType',
-                    data: onyxData,
-                },
-            ],
-        };
-
-        /**
-         * When this callback runs in the background on Android (via Headless JS), no other Onyx.connect callbacks will run. This means that
-         * lastUpdateIDAppliedToClient will NOT be populated in other libs. To workaround this, we manually read the value here
-         * and pass it as a param
-         */
-        return getLastUpdateIDAppliedToClient().then((lastUpdateIDAppliedToClient) => applyOnyxUpdatesReliably(updates, true, lastUpdateIDAppliedToClient));
-    });
-
-    // Open correct report when push notification is clicked
-    PushNotification.onSelected(PushNotification.TYPE.REPORT_COMMENT, ({reportID, reportActionID}) => {
-        if (!reportID) {
-            Log.warn('[PushNotification] This push notification has no reportID');
-        }
-
-        const policyID = lastVisitedPath && extractPolicyIDFromPath(lastVisitedPath);
-        const report = getReport(reportID.toString());
-        const policyEmployeeAccountIDs = policyID ? getPolicyEmployeeAccountIDs(policyID) : [];
-
-        const reportBelongsToWorkspace = policyID && !isEmptyObject(report) && doesReportBelongToWorkspace(report, policyEmployeeAccountIDs, policyID);
-
-        Log.info('[PushNotification] onSelected() - called', false, {reportID, reportActionID});
-        Navigation.isNavigationReady()
-            .then(Navigation.waitForProtectedRoutes)
-            .then(() => {
-                // The attachment modal remains open when navigating to the report so we need to close it
-                Modal.close(() => {
-                    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();
-                        }
-
-                        Log.info('[PushNotification] onSelected() - Navigation is ready. Navigating...', false, {reportID, reportActionID});
-                        if (!reportBelongsToWorkspace) {
-                            Navigation.navigateWithSwitchPolicyID({route: ROUTES.HOME});
-                        }
-                        Navigation.navigate(ROUTES.REPORT_WITH_ID.getRoute(String(reportID)));
-                    } catch (error) {
-                        let errorMessage = String(error);
-                        if (error instanceof Error) {
-                            errorMessage = error.message;
-                        }
-
-                        Log.alert('[PushNotification] onSelected() - failed', {reportID, reportActionID, error: errorMessage});
-                    }
-                });
-            });
-
-        return Promise.resolve();
-    });
-}
diff --git a/src/libs/Notification/clearReportNotifications/index.native.ts b/src/libs/Notification/clearReportNotifications/index.native.ts
index d9a30320a02e..ad7d80a5b832 100644
--- a/src/libs/Notification/clearReportNotifications/index.native.ts
+++ b/src/libs/Notification/clearReportNotifications/index.native.ts
@@ -1,19 +1,15 @@
 import type {PushPayload} from '@ua/react-native-airship';
 import Airship from '@ua/react-native-airship';
 import Log from '@libs/Log';
-import type {NotificationData} from '@libs/Notification/PushNotification/NotificationType';
+import parsePushNotificationPayload from '@libs/Notification/PushNotification/parsePushNotificationPayload';
 import CONST from '@src/CONST';
 import type ClearReportNotifications from './types';
 
 const parseNotificationAndReportIDs = (pushPayload: PushPayload) => {
-    let payload = pushPayload.extras.payload;
-    if (typeof payload === 'string') {
-        payload = JSON.parse(payload);
-    }
-    const data = payload as NotificationData;
+    const data = parsePushNotificationPayload(pushPayload.extras.payload);
     return {
         notificationID: pushPayload.notificationId,
-        reportID: String(data.reportID),
+        reportID: data?.reportID !== undefined ? String(data.reportID) : undefined,
     };
 };
 
@@ -34,7 +30,7 @@ const clearReportNotifications: ClearReportNotifications = (reportID: string) =>
             Log.info(`[PushNotification] found ${reportNotificationIDs.length} notifications to clear`, false, {reportID});
             reportNotificationIDs.forEach((notificationID) => Airship.push.clearNotification(notificationID));
         })
-        .catch((error) => {
+        .catch((error: unknown) => {
             Log.alert(`${CONST.ERROR.ENSURE_BUGBOT} [PushNotification] BrowserNotifications.clearReportNotifications threw an error. This should never happen.`, {reportID, error});
         });
 };
diff --git a/src/libs/NumberFormatUtils.ts b/src/libs/NumberFormatUtils.ts
deleted file mode 100644
index bf42e25cbb48..000000000000
--- a/src/libs/NumberFormatUtils.ts
+++ /dev/null
@@ -1,12 +0,0 @@
-import type {ValueOf} from 'type-fest';
-import type CONST from '@src/CONST';
-
-function format(locale: ValueOf<typeof CONST.LOCALES>, number: number, options?: Intl.NumberFormatOptions): string {
-    return new Intl.NumberFormat(locale, options).format(number);
-}
-
-function formatToParts(locale: ValueOf<typeof CONST.LOCALES>, number: number, options?: Intl.NumberFormatOptions): Intl.NumberFormatPart[] {
-    return new Intl.NumberFormat(locale, options).formatToParts(number);
-}
-
-export {format, formatToParts};
diff --git a/src/libs/NumberFormatUtils/index.ts b/src/libs/NumberFormatUtils/index.ts
new file mode 100644
index 000000000000..57ad6c63039b
--- /dev/null
+++ b/src/libs/NumberFormatUtils/index.ts
@@ -0,0 +1,18 @@
+import type {ValueOf} from 'type-fest';
+import memoize from '@libs/memoize';
+import type CONST from '@src/CONST';
+import initPolyfill from './intlPolyfill';
+
+initPolyfill();
+
+const MemoizedNumberFormat = memoize(Intl.NumberFormat, {maxSize: 10});
+
+function format(locale: ValueOf<typeof CONST.LOCALES>, number: number, options?: Intl.NumberFormatOptions): string {
+    return new MemoizedNumberFormat(locale, options).format(number);
+}
+
+function formatToParts(locale: ValueOf<typeof CONST.LOCALES>, number: number, options?: Intl.NumberFormatOptions): Intl.NumberFormatPart[] {
+    return new MemoizedNumberFormat(locale, options).formatToParts(number);
+}
+
+export {format, formatToParts};
diff --git a/src/libs/NumberFormatUtils/intlPolyfill.ios.ts b/src/libs/NumberFormatUtils/intlPolyfill.ios.ts
new file mode 100644
index 000000000000..4745284c0b61
--- /dev/null
+++ b/src/libs/NumberFormatUtils/intlPolyfill.ios.ts
@@ -0,0 +1,10 @@
+import intlPolyfill from '@libs/IntlPolyfill';
+
+// On iOS, polyfills from `additionalSetup` are applied after memoization, which results in incorrect cache entry of `Intl.NumberFormat` (e.g. lacking `formatToParts` method).
+// To fix this, we need to apply the polyfill manually before memoization.
+// For further information, see: https://github.com/Expensify/App/pull/43868#issuecomment-2217637217
+const initPolyfill = () => {
+    intlPolyfill();
+};
+
+export default initPolyfill;
diff --git a/src/libs/NumberFormatUtils/intlPolyfill.ts b/src/libs/NumberFormatUtils/intlPolyfill.ts
new file mode 100644
index 000000000000..31fedd6a01b6
--- /dev/null
+++ b/src/libs/NumberFormatUtils/intlPolyfill.ts
@@ -0,0 +1,2 @@
+const initPolyfill = () => {};
+export default initPolyfill;
diff --git a/src/libs/ObjectUtils.ts b/src/libs/ObjectUtils.ts
index 9ffa461506c8..644fe1c7596e 100644
--- a/src/libs/ObjectUtils.ts
+++ b/src/libs/ObjectUtils.ts
@@ -1,11 +1,11 @@
-// eslint-disable-next-line @typescript-eslint/ban-types
-const shallowCompare = (obj1?: object, obj2?: object) => {
+const shallowCompare = (obj1?: Record<string, unknown>, obj2?: Record<string, unknown>): boolean => {
     if (!obj1 && !obj2) {
         return true;
     }
     if (obj1 && obj2) {
-        // @ts-expect-error we know that obj1 and obj2 are params of a route.
-        return Object.keys(obj1).length === Object.keys(obj2).length && Object.keys(obj1).every((key) => obj1[key] === obj2[key]);
+        const keys1 = Object.keys(obj1);
+        const keys2 = Object.keys(obj2);
+        return keys1.length === keys2.length && keys1.every((key) => obj1[key] === obj2[key]);
     }
     return false;
 };
diff --git a/src/libs/OnboardingRefManager.ts b/src/libs/OnboardingRefManager.ts
new file mode 100644
index 000000000000..a32d116348d2
--- /dev/null
+++ b/src/libs/OnboardingRefManager.ts
@@ -0,0 +1,17 @@
+import React from 'react';
+
+type TOnboardingRef = {
+    handleOuterClick: () => void;
+};
+
+const onboardingRef = React.createRef<TOnboardingRef>();
+
+const OnboardingRefManager = {
+    ref: onboardingRef,
+    handleOuterClick: () => {
+        onboardingRef.current?.handleOuterClick();
+    },
+};
+
+export type {TOnboardingRef};
+export default OnboardingRefManager;
diff --git a/src/libs/OptionsListUtils.ts b/src/libs/OptionsListUtils.ts
index b599fdc6d0f1..7d9283ff9fea 100644
--- a/src/libs/OptionsListUtils.ts
+++ b/src/libs/OptionsListUtils.ts
@@ -1,5 +1,5 @@
 /* eslint-disable no-continue */
-import Str from 'expensify-common/lib/str';
+import {Str} from 'expensify-common';
 // eslint-disable-next-line you-dont-need-lodash-underscore/get
 import lodashGet from 'lodash/get';
 import lodashOrderBy from 'lodash/orderBy';
@@ -7,19 +7,23 @@ import lodashSet from 'lodash/set';
 import lodashSortBy from 'lodash/sortBy';
 import Onyx from 'react-native-onyx';
 import type {OnyxCollection, OnyxEntry} from 'react-native-onyx';
+import {FallbackAvatar} from '@components/Icon/Expensicons';
 import type {SelectedTagOption} from '@components/TagPicker';
+import type {IOUAction} from '@src/CONST';
 import CONST from '@src/CONST';
 import type {TranslationPaths} from '@src/languages/types';
 import ONYXKEYS from '@src/ONYXKEYS';
 import type {
     Beta,
     Login,
+    OnyxInputOrEntry,
     PersonalDetails,
     PersonalDetailsList,
     Policy,
     PolicyCategories,
+    PolicyCategory,
     PolicyTag,
-    PolicyTagList,
+    PolicyTagLists,
     PolicyTags,
     Report,
     ReportAction,
@@ -33,11 +37,9 @@ import type {
 import type {Participant} from '@src/types/onyx/IOU';
 import type * as OnyxCommon from '@src/types/onyx/OnyxCommon';
 import type DeepValueOf from '@src/types/utils/DeepValueOf';
-import type {EmptyObject} from '@src/types/utils/EmptyObject';
 import {isEmptyObject} from '@src/types/utils/EmptyObject';
 import times from '@src/utils/times';
 import Timing from './actions/Timing';
-import * as CollectionUtils from './CollectionUtils';
 import * as ErrorUtils from './ErrorUtils';
 import filterArrayByMatch from './filterArrayByMatch';
 import localeCompare from './LocaleCompare';
@@ -47,7 +49,6 @@ import * as LoginUtils from './LoginUtils';
 import ModifiedExpenseMessage from './ModifiedExpenseMessage';
 import Navigation from './Navigation/Navigation';
 import Performance from './Performance';
-import Permissions from './Permissions';
 import * as PersonalDetailsUtils from './PersonalDetailsUtils';
 import * as PhoneNumber from './PhoneNumber';
 import * as PolicyUtils from './PolicyUtils';
@@ -78,6 +79,7 @@ type OptionTree = {
     tooltipText: string;
     isDisabled: boolean;
     isSelected: boolean;
+    pendingAction?: OnyxCommon.PendingAction;
 } & Option;
 
 type PayeePersonalDetails = {
@@ -106,7 +108,8 @@ type TaxRatesOption = {
     tooltipText?: string;
     isDisabled?: boolean;
     keyForList?: string;
-    data: Partial<TaxRate>;
+    isSelected?: boolean;
+    pendingAction?: OnyxCommon.PendingAction;
 };
 
 type TaxSection = {
@@ -124,6 +127,13 @@ type Category = {
     name: string;
     enabled: boolean;
     isSelected?: boolean;
+    pendingAction?: OnyxCommon.PendingAction;
+};
+
+type Tax = {
+    modifiedName: string;
+    isSelected?: boolean;
+    isDisabled?: boolean;
 };
 
 type Hierarchy = Record<string, Category & {[key: string]: Hierarchy & Category}>;
@@ -135,7 +145,6 @@ type GetOptionsConfig = {
     maxRecentReportsToShow?: number;
     excludeLogins?: string[];
     includeMultipleParticipantReports?: boolean;
-    includePersonalDetails?: boolean;
     includeRecentReports?: boolean;
     includeSelfDM?: boolean;
     sortByReportTypeInSearch?: boolean;
@@ -159,10 +168,15 @@ type GetOptionsConfig = {
     includeSelectedOptions?: boolean;
     includeTaxRates?: boolean;
     taxRates?: TaxRatesWithDefault;
+    policy?: OnyxEntry<Policy>;
+    transaction?: OnyxEntry<Transaction>;
     includePolicyReportFieldOptions?: boolean;
     policyReportFieldOptions?: string[];
     recentlyUsedPolicyReportFieldOptions?: string[];
     transactionViolations?: OnyxCollection<TransactionViolation[]>;
+    includeInvoiceRooms?: boolean;
+    includeDomainEmail?: boolean;
+    action?: IOUAction;
 };
 
 type GetUserToInviteConfig = {
@@ -170,7 +184,6 @@ type GetUserToInviteConfig = {
     excludeUnknownUsers?: boolean;
     optionsToExclude?: Array<Partial<ReportUtils.OptionData>>;
     selectedOptions?: Array<Partial<ReportUtils.OptionData>>;
-    betas: OnyxEntry<Beta[]>;
     reportActions?: ReportActions;
     showChatPreviewLine?: boolean;
 };
@@ -204,6 +217,11 @@ type Options = {
 
 type PreviewConfig = {showChatPreviewLine?: boolean; forcePolicyNamePreview?: boolean; showPersonalDetails?: boolean};
 
+type FilterOptionsConfig = Pick<GetOptionsConfig, 'sortByReportTypeInSearch' | 'canInviteUser' | 'selectedOptions' | 'excludeUnknownUsers' | 'excludeLogins' | 'maxRecentReportsToShow'> & {
+    preferChatroomsOverThreads?: boolean;
+    preferPolicyExpenseChat?: boolean;
+};
+
 /**
  * OptionsListUtils is used to build a list options passed to the OptionsList component. Several different UI views can
  * be configured to display different results based on the options passed to the private getOptions() method. Public
@@ -254,32 +272,56 @@ Onyx.connect({
     },
 });
 
+let allPolicyCategories: OnyxCollection<PolicyCategories> = {};
+Onyx.connect({
+    key: ONYXKEYS.COLLECTION.POLICY_CATEGORIES,
+    waitForCollectionCallback: true,
+    callback: (val) => (allPolicyCategories = val),
+});
+
 const lastReportActions: ReportActions = {};
 const allSortedReportActions: Record<string, ReportAction[]> = {};
-const allReportActions: Record<string, ReportActions | null> = {};
-const visibleReportActionItems: ReportActions = {};
+let allReportActions: OnyxCollection<ReportActions>;
+const lastVisibleReportActions: ReportActions = {};
 Onyx.connect({
     key: ONYXKEYS.COLLECTION.REPORT_ACTIONS,
-    callback: (actions, key) => {
-        if (!key || !actions) {
+    waitForCollectionCallback: true,
+    callback: (actions) => {
+        if (!actions) {
             return;
         }
-        const reportID = CollectionUtils.extractCollectionItemID(key);
-        allReportActions[reportID] = actions;
-        let sortedReportActions = ReportActionUtils.getSortedReportActions(Object.values(actions), true);
-        allSortedReportActions[reportID] = sortedReportActions;
-
-        const transactionThreadReportID = ReportActionUtils.getOneTransactionThreadReportID(reportID, allReportActions[reportID], true);
-        if (transactionThreadReportID) {
-            sortedReportActions = ReportActionUtils.getCombinedReportActions(allSortedReportActions[reportID], allSortedReportActions[transactionThreadReportID]);
-        }
 
-        lastReportActions[reportID] = sortedReportActions[0];
+        allReportActions = actions ?? {};
+
+        // Iterate over the report actions to build the sorted and lastVisible report actions objects
+        Object.entries(allReportActions).forEach((reportActions) => {
+            const reportID = reportActions[0].split('_')[1];
+            const reportActionsArray = Object.values(reportActions[1] ?? {});
+            let sortedReportActions = ReportActionUtils.getSortedReportActions(reportActionsArray, true);
+            allSortedReportActions[reportID] = sortedReportActions;
+
+            // If the report is a one-transaction report and has , we need to return the combined reportActions so that the LHN can display modifications
+            // to the transaction thread or the report itself
+            const transactionThreadReportID = ReportActionUtils.getOneTransactionThreadReportID(reportID, actions[reportActions[0]]);
+            if (transactionThreadReportID) {
+                const transactionThreadReportActionsArray = Object.values(actions[`${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${transactionThreadReportID}`] ?? {});
+                sortedReportActions = ReportActionUtils.getCombinedReportActions(sortedReportActions, transactionThreadReportID, transactionThreadReportActionsArray, reportID);
+            }
 
-        // The report is only visible if it is the last action not deleted that
-        // does not match a closed or created state.
-        const reportActionsForDisplay = sortedReportActions.filter((reportAction) => ReportActionUtils.shouldReportActionBeVisibleAsLastAction(reportAction));
-        visibleReportActionItems[reportID] = reportActionsForDisplay[0];
+            lastReportActions[reportID] = sortedReportActions[0];
+
+            // The report is only visible if it is the last action not deleted that
+            // does not match a closed or created state.
+            const reportActionsForDisplay = sortedReportActions.filter(
+                (reportAction, actionKey) =>
+                    ReportActionUtils.shouldReportActionBeVisible(reportAction, actionKey) &&
+                    !ReportActionUtils.isWhisperAction(reportAction) &&
+                    reportAction.actionName !== CONST.REPORT.ACTIONS.TYPE.CREATED &&
+                    reportAction.pendingAction !== CONST.RED_BRICK_ROAD_PENDING_ACTION.DELETE &&
+                    !ReportActionUtils.isResolvedActionTrackExpense(reportAction),
+            );
+            lastVisibleReportActions[reportID] = reportActionsForDisplay[0];
+        });
     },
 });
 
@@ -303,6 +345,11 @@ Onyx.connect({
             }, {});
     },
 });
+let activePolicyID: OnyxEntry<string>;
+Onyx.connect({
+    key: ONYXKEYS.NVP_ACTIVE_POLICY_ID,
+    callback: (value) => (activePolicyID = value),
+});
 
 /**
  * @param defaultValues {login: accountID} In workspace invite page, when new user is added we pass available data to opt in
@@ -314,13 +361,14 @@ function getAvatarsForAccountIDs(accountIDs: number[], personalDetails: OnyxEntr
     Object.entries(defaultValues).forEach((item) => {
         reversedDefaultValues[item[1]] = item[0];
     });
+
     return accountIDs.map((accountID) => {
         const login = reversedDefaultValues[accountID] ?? '';
-        const userPersonalDetail = personalDetails?.[accountID] ?? {login, accountID, avatar: ''};
+        const userPersonalDetail = personalDetails?.[accountID] ?? {login, accountID};
 
         return {
             id: accountID,
-            source: UserUtils.getAvatar(userPersonalDetail.avatar, userPersonalDetail.accountID),
+            source: userPersonalDetail.avatar ?? FallbackAvatar,
             type: CONST.ICON_TYPE_AVATAR,
             name: userPersonalDetail.login ?? '',
         };
@@ -331,7 +379,7 @@ function getAvatarsForAccountIDs(accountIDs: number[], personalDetails: OnyxEntr
  * Returns the personal details for an array of accountIDs
  * @returns keys of the object are emails, values are PersonalDetails objects.
  */
-function getPersonalDetailsForAccountIDs(accountIDs: number[] | undefined, personalDetails: OnyxEntry<PersonalDetailsList>): PersonalDetailsList {
+function getPersonalDetailsForAccountIDs(accountIDs: number[] | undefined, personalDetails: OnyxInputOrEntry<PersonalDetailsList>): PersonalDetailsList {
     const personalDetailsForAccountIDs: PersonalDetailsList = {};
     if (!personalDetails) {
         return personalDetailsForAccountIDs;
@@ -341,11 +389,9 @@ function getPersonalDetailsForAccountIDs(accountIDs: number[] | undefined, perso
         if (!cleanAccountID) {
             return;
         }
-        let personalDetail: OnyxEntry<PersonalDetails> = personalDetails[accountID];
+        let personalDetail: OnyxEntry<PersonalDetails> = personalDetails[accountID] ?? undefined;
         if (!personalDetail) {
-            personalDetail = {
-                avatar: UserUtils.getDefaultAvatar(cleanAccountID),
-            } as PersonalDetails;
+            personalDetail = {} as PersonalDetails;
         }
 
         if (cleanAccountID === CONST.ACCOUNT_ID.CONCIERGE) {
@@ -374,6 +420,7 @@ function getParticipantsOption(participant: ReportUtils.OptionData | Participant
     // eslint-disable-next-line @typescript-eslint/prefer-nullish-coalescing
     const login = detail?.login || participant.login || '';
     const displayName = PersonalDetailsUtils.getDisplayNameOrDefault(detail, LocalePhoneNumber.formatPhoneNumber(login));
+
     return {
         keyForList: String(detail?.accountID),
         login,
@@ -384,7 +431,7 @@ function getParticipantsOption(participant: ReportUtils.OptionData | Participant
         alternateText: LocalePhoneNumber.formatPhoneNumber(login) || displayName,
         icons: [
             {
-                source: UserUtils.getAvatar(detail?.avatar ?? '', detail?.accountID ?? -1),
+                source: detail?.avatar ?? FallbackAvatar,
                 name: login,
                 type: CONST.ICON_TYPE_AVATAR,
                 id: detail?.accountID,
@@ -397,31 +444,6 @@ function getParticipantsOption(participant: ReportUtils.OptionData | Participant
     };
 }
 
-/**
- * Constructs a Set with all possible names (displayName, firstName, lastName, email) for all participants in a report,
- * to be used in isSearchStringMatch.
- */
-function getParticipantNames(personalDetailList?: Array<Partial<PersonalDetails>> | null): Set<string> {
-    // We use a Set because `Set.has(value)` on a Set of with n entries is up to n (or log(n)) times faster than
-    // `_.contains(Array, value)` for an Array with n members.
-    const participantNames = new Set<string>();
-    personalDetailList?.forEach((participant) => {
-        if (participant.login) {
-            participantNames.add(participant.login.toLowerCase());
-        }
-        if (participant.firstName) {
-            participantNames.add(participant.firstName.toLowerCase());
-        }
-        if (participant.lastName) {
-            participantNames.add(participant.lastName.toLowerCase());
-        }
-        if (participant.displayName) {
-            participantNames.add(PersonalDetailsUtils.getDisplayNameOrDefault(participant).toLowerCase());
-        }
-    });
-    return participantNames;
-}
-
 /**
  * A very optimized method to remove duplicates from an array.
  * Taken from https://stackoverflow.com/a/9229821/9114791
@@ -441,75 +463,34 @@ function uniqFast(items: string[]): string[] {
     return result;
 }
 
-/**
- * Returns a string with all relevant search terms.
- *
- * This method must be incredibly performant. It was found to be a big performance bottleneck
- * when dealing with accounts that have thousands of reports. For loops are more efficient than _.each
- * Array.prototype.push.apply is faster than using the spread operator.
- */
-function getSearchText(
-    report: OnyxEntry<Report>,
-    reportName: string,
-    personalDetailList: Array<Partial<PersonalDetails>>,
-    isChatRoomOrPolicyExpenseChat: boolean,
-    isThread: boolean,
-): string {
-    const searchTerms: string[] = [];
-
-    for (const personalDetail of personalDetailList) {
-        if (personalDetail.login) {
-            // The regex below is used to remove dots only from the local part of the user email (local-part@domain)
-            // so that we can match emails that have dots without explicitly writing the dots (e.g: fistlast@domain will match first.last@domain)
-            // More info https://github.com/Expensify/App/issues/8007
-            searchTerms.push(PersonalDetailsUtils.getDisplayNameOrDefault(personalDetail, '', false), personalDetail.login, personalDetail.login.replace(/\.(?=[^\s@]*@)/g, ''));
-        }
-    }
-
-    if (report) {
-        Array.prototype.push.apply(searchTerms, reportName.split(/[,\s]/));
-
-        if (isThread) {
-            const title = ReportUtils.getReportName(report);
-            const chatRoomSubtitle = ReportUtils.getChatRoomSubtitle(report);
-
-            Array.prototype.push.apply(searchTerms, title.split(/[,\s]/));
-            Array.prototype.push.apply(searchTerms, chatRoomSubtitle?.split(/[,\s]/) ?? ['']);
-        } else if (isChatRoomOrPolicyExpenseChat) {
-            const chatRoomSubtitle = ReportUtils.getChatRoomSubtitle(report);
-
-            Array.prototype.push.apply(searchTerms, chatRoomSubtitle?.split(/[,\s]/) ?? ['']);
-        }
-    }
-
-    return uniqFast(searchTerms).join(' ');
-}
-
 /**
  * Get an object of error messages keyed by microtime by combining all error objects related to the report.
  */
 function getAllReportErrors(report: OnyxEntry<Report>, reportActions: OnyxEntry<ReportActions>): OnyxCommon.Errors {
     const reportErrors = report?.errors ?? {};
     const reportErrorFields = report?.errorFields ?? {};
-    const reportActionErrors: OnyxCommon.ErrorFields = Object.values(reportActions ?? {}).reduce(
-        (prevReportActionErrors, action) => (!action || isEmptyObject(action.errors) ? prevReportActionErrors : {...prevReportActionErrors, ...action.errors}),
-        {},
-    );
+    const reportActionErrors: OnyxCommon.ErrorFields = Object.values(reportActions ?? {}).reduce((prevReportActionErrors, action) => {
+        if (!action || isEmptyObject(action.errors)) {
+            return prevReportActionErrors;
+        }
+
+        return Object.assign(prevReportActionErrors, action.errors);
+    }, {});
     const parentReportAction: OnyxEntry<ReportAction> =
-        !report?.parentReportID || !report?.parentReportActionID ? null : allReportActions?.[report.parentReportID ?? '']?.[report.parentReportActionID ?? ''] ?? null;
+        !report?.parentReportID || !report?.parentReportActionID ? undefined : allReportActions?.[report.parentReportID ?? '-1']?.[report.parentReportActionID ?? '-1'];
 
-    if (parentReportAction?.actorAccountID === currentUserAccountID && ReportActionUtils.isTransactionThread(parentReportAction)) {
-        const transactionID = parentReportAction?.actionName === CONST.REPORT.ACTIONS.TYPE.IOU ? parentReportAction?.originalMessage?.IOUTransactionID : null;
+    if (ReportActionUtils.wasActionTakenByCurrentUser(parentReportAction) && ReportActionUtils.isTransactionThread(parentReportAction)) {
+        const transactionID = ReportActionUtils.isMoneyRequestAction(parentReportAction) ? ReportActionUtils.getOriginalMessage(parentReportAction)?.IOUTransactionID : null;
         const transaction = allTransactions?.[`${ONYXKEYS.COLLECTION.TRANSACTION}${transactionID}`];
         if (TransactionUtils.hasMissingSmartscanFields(transaction ?? null) && !ReportUtils.isSettled(transaction?.reportID)) {
-            reportActionErrors.smartscan = ErrorUtils.getMicroSecondOnyxError('report.genericSmartscanFailureMessage');
+            reportActionErrors.smartscan = ErrorUtils.getMicroSecondOnyxErrorWithTranslationKey('iou.error.genericSmartscanFailureMessage');
         }
     } else if ((ReportUtils.isIOUReport(report) || ReportUtils.isExpenseReport(report)) && report?.ownerAccountID === currentUserAccountID) {
-        if (ReportUtils.hasMissingSmartscanFields(report?.reportID ?? '') && !ReportUtils.isSettled(report?.reportID)) {
-            reportActionErrors.smartscan = ErrorUtils.getMicroSecondOnyxError('report.genericSmartscanFailureMessage');
+        if (ReportUtils.shouldShowRBRForMissingSmartscanFields(report?.reportID ?? '-1') && !ReportUtils.isSettled(report?.reportID)) {
+            reportActionErrors.smartscan = ErrorUtils.getMicroSecondOnyxErrorWithTranslationKey('iou.error.genericSmartscanFailureMessage');
         }
     } else if (ReportUtils.hasSmartscanError(Object.values(reportActions ?? {}))) {
-        reportActionErrors.smartscan = ErrorUtils.getMicroSecondOnyxError('report.genericSmartscanFailureMessage');
+        reportActionErrors.smartscan = ErrorUtils.getMicroSecondOnyxErrorWithTranslationKey('iou.error.genericSmartscanFailureMessage');
     }
     // All error objects related to the report. Each object in the sources contains error messages keyed by microtime
     const errorSources = {
@@ -518,7 +499,13 @@ function getAllReportErrors(report: OnyxEntry<Report>, reportActions: OnyxEntry<
         ...reportActionErrors,
     };
     // Combine all error messages keyed by microtime into one object
-    const allReportErrors = Object.values(errorSources)?.reduce((prevReportErrors, errors) => (isEmptyObject(errors) ? prevReportErrors : {...prevReportErrors, ...errors}), {});
+    const allReportErrors = Object.values(errorSources)?.reduce((prevReportErrors, errors) => {
+        if (isEmptyObject(errors)) {
+            return prevReportErrors;
+        }
+
+        return Object.assign(prevReportErrors, errors);
+    }, {});
 
     return allReportErrors;
 }
@@ -536,16 +523,23 @@ function getLastActorDisplayName(lastActorDetails: Partial<PersonalDetails> | nu
 /**
  * Update alternate text for the option when applicable
  */
-function getAlternateText(
-    option: ReportUtils.OptionData,
-    {showChatPreviewLine = false, forcePolicyNamePreview = false, lastMessageTextFromReport = ''}: PreviewConfig & {lastMessageTextFromReport?: string},
-) {
+function getAlternateText(option: ReportUtils.OptionData, {showChatPreviewLine = false, forcePolicyNamePreview = false}: PreviewConfig) {
+    const report = ReportUtils.getReportOrDraftReport(option.reportID);
+    const isAdminRoom = ReportUtils.isAdminRoom(report);
+    const isAnnounceRoom = ReportUtils.isAnnounceRoom(report);
+
     if (!!option.isThread || !!option.isMoneyRequestReport) {
-        return lastMessageTextFromReport.length > 0 ? option.lastMessageText : Localize.translate(preferredLocale, 'report.noActivityYet');
+        return option.lastMessageText ? option.lastMessageText : Localize.translate(preferredLocale, 'report.noActivityYet');
+    }
+
+    if (option.isChatRoom && !isAdminRoom && !isAnnounceRoom) {
+        return showChatPreviewLine && option.lastMessageText ? option.lastMessageText : option.subtitle;
     }
-    if (!!option.isChatRoom || !!option.isPolicyExpenseChat) {
+
+    if ((option.isPolicyExpenseChat ?? false) || isAdminRoom || isAnnounceRoom) {
         return showChatPreviewLine && !forcePolicyNamePreview && option.lastMessageText ? option.lastMessageText : option.subtitle;
     }
+
     if (option.isTaskReport) {
         return showChatPreviewLine && option.lastMessageText ? option.lastMessageText : Localize.translate(preferredLocale, 'report.noActivityYet');
     }
@@ -555,19 +549,56 @@ function getAlternateText(
         : LocalePhoneNumber.formatPhoneNumber(option.participantsList && option.participantsList.length > 0 ? option.participantsList[0].login ?? '' : '');
 }
 
+function isSearchStringMatchUserDetails(personalDetail: PersonalDetails, searchValue: string) {
+    let memberDetails = '';
+    if (personalDetail.login) {
+        memberDetails += ` ${personalDetail.login}`;
+    }
+    if (personalDetail.firstName) {
+        memberDetails += ` ${personalDetail.firstName}`;
+    }
+    if (personalDetail.lastName) {
+        memberDetails += ` ${personalDetail.lastName}`;
+    }
+    if (personalDetail.displayName) {
+        memberDetails += ` ${PersonalDetailsUtils.getDisplayNameOrDefault(personalDetail)}`;
+    }
+    if (personalDetail.phoneNumber) {
+        memberDetails += ` ${personalDetail.phoneNumber}`;
+    }
+    return isSearchStringMatch(searchValue.trim(), memberDetails.toLowerCase());
+}
+
+/**
+ * Get IOU report ID of report last action if the action is report action preview
+ */
+function getIOUReportIDOfLastAction(report: OnyxEntry<Report>): string | undefined {
+    if (!report?.reportID) {
+        return;
+    }
+    const lastAction = lastVisibleReportActions[report.reportID];
+    if (!ReportActionUtils.isReportPreviewAction(lastAction)) {
+        return;
+    }
+    return ReportUtils.getReportOrDraftReport(ReportActionUtils.getIOUReportIDFromReportActionPreview(lastAction))?.reportID;
+}
+
 /**
  * Get the last message text from the report directly or from other sources for special cases.
  */
 function getLastMessageTextForReport(report: OnyxEntry<Report>, lastActorDetails: Partial<PersonalDetails> | null, policy?: OnyxEntry<Policy>): string {
-    const lastReportAction = visibleReportActionItems[report?.reportID ?? ''] ?? null;
+    const reportID = report?.reportID ?? '-1';
+    const lastReportAction = lastVisibleReportActions[reportID] ?? null;
 
     // some types of actions are filtered out for lastReportAction, in some cases we need to check the actual last action
-    const lastOriginalReportAction = lastReportActions[report?.reportID ?? ''] ?? null;
+    const lastOriginalReportAction = lastReportActions[reportID] ?? null;
     let lastMessageTextFromReport = '';
+    const reportNameValuePairs = ReportUtils.getReportNameValuePairs(report?.reportID);
 
-    if (ReportUtils.isArchivedRoom(report)) {
+    if (ReportUtils.isArchivedRoom(report, reportNameValuePairs)) {
         const archiveReason =
-            (lastOriginalReportAction?.actionName === CONST.REPORT.ACTIONS.TYPE.CLOSED && lastOriginalReportAction?.originalMessage?.reason) || CONST.REPORT.ARCHIVE_REASON.DEFAULT;
+            // eslint-disable-next-line @typescript-eslint/prefer-nullish-coalescing
+            (ReportActionUtils.isClosedAction(lastOriginalReportAction) && ReportActionUtils.getOriginalMessage(lastOriginalReportAction)?.reason) || CONST.REPORT.ARCHIVE_REASON.DEFAULT;
         switch (archiveReason) {
             case CONST.REPORT.ARCHIVE_REASON.ACCOUNT_CLOSED:
             case CONST.REPORT.ARCHIVE_REASON.REMOVED_FROM_POLICY:
@@ -578,6 +609,10 @@ function getLastMessageTextForReport(report: OnyxEntry<Report>, lastActorDetails
                 });
                 break;
             }
+            case CONST.REPORT.ARCHIVE_REASON.BOOKING_END_DATE_HAS_PASSED: {
+                lastMessageTextFromReport = Localize.translate(preferredLocale, `reportArchiveReasons.${archiveReason}`);
+                break;
+            }
             default: {
                 lastMessageTextFromReport = Localize.translate(preferredLocale, `reportArchiveReasons.default`);
             }
@@ -586,9 +621,9 @@ function getLastMessageTextForReport(report: OnyxEntry<Report>, lastActorDetails
         const properSchemaForMoneyRequestMessage = ReportUtils.getReportPreviewMessage(report, lastReportAction, true, false, null, true);
         lastMessageTextFromReport = ReportUtils.formatReportLastMessageText(properSchemaForMoneyRequestMessage);
     } else if (ReportActionUtils.isReportPreviewAction(lastReportAction)) {
-        const iouReport = ReportUtils.getReport(ReportActionUtils.getIOUReportIDFromReportActionPreview(lastReportAction));
-        const lastIOUMoneyReportAction = allSortedReportActions[iouReport?.reportID ?? '']?.find(
-            (reportAction, key) =>
+        const iouReport = ReportUtils.getReportOrDraftReport(ReportActionUtils.getIOUReportIDFromReportActionPreview(lastReportAction));
+        const lastIOUMoneyReportAction = allSortedReportActions[iouReport?.reportID ?? '-1']?.find(
+            (reportAction, key): reportAction is ReportAction<typeof CONST.REPORT.ACTIONS.TYPE.IOU> =>
                 ReportActionUtils.shouldReportActionBeVisible(reportAction, key) &&
                 reportAction.pendingAction !== CONST.RED_BRICK_ROAD_PENDING_ACTION.DELETE &&
                 ReportActionUtils.isMoneyRequestAction(reportAction),
@@ -609,9 +644,9 @@ function getLastMessageTextForReport(report: OnyxEntry<Report>, lastActorDetails
         lastMessageTextFromReport = ReportUtils.getReimbursementDeQueuedActionMessage(lastReportAction, report, true);
     } else if (ReportActionUtils.isDeletedParentAction(lastReportAction) && ReportUtils.isChatReport(report)) {
         lastMessageTextFromReport = ReportUtils.getDeletedParentActionMessageForChatReport(lastReportAction);
-    } else if (ReportActionUtils.isPendingRemove(lastReportAction) && ReportActionUtils.isThreadParentMessage(lastReportAction, report?.reportID ?? '')) {
+    } else if (ReportActionUtils.isPendingRemove(lastReportAction) && ReportActionUtils.isThreadParentMessage(lastReportAction, report?.reportID ?? '-1')) {
         lastMessageTextFromReport = Localize.translateLocal('parentReportAction.hiddenMessage');
-    } else if (ReportUtils.isReportMessageAttachment({text: report?.lastMessageText ?? '', html: report?.lastMessageHtml, translationKey: report?.lastMessageTranslationKey, type: ''})) {
+    } else if (ReportUtils.isReportMessageAttachment({text: report?.lastMessageText ?? '-1', html: report?.lastMessageHtml, translationKey: report?.lastMessageTranslationKey, type: ''})) {
         // eslint-disable-next-line @typescript-eslint/prefer-nullish-coalescing
         lastMessageTextFromReport = `[${Localize.translateLocal((report?.lastMessageTranslationKey || 'common.attachment') as TranslationPaths)}]`;
     } else if (ReportActionUtils.isModifiedExpenseAction(lastReportAction)) {
@@ -621,8 +656,18 @@ function getLastMessageTextForReport(report: OnyxEntry<Report>, lastActorDetails
         lastMessageTextFromReport = ReportUtils.formatReportLastMessageText(TaskUtils.getTaskReportActionMessage(lastReportAction).text);
     } else if (ReportActionUtils.isCreatedTaskReportAction(lastReportAction)) {
         lastMessageTextFromReport = TaskUtils.getTaskCreatedMessage(lastReportAction);
-    } else if (ReportActionUtils.isApprovedOrSubmittedReportAction(lastReportAction)) {
+    } else if (lastReportAction?.actionName === CONST.REPORT.ACTIONS.TYPE.SUBMITTED) {
+        lastMessageTextFromReport = ReportUtils.getIOUSubmittedMessage(lastReportAction);
+    } else if (lastReportAction?.actionName === CONST.REPORT.ACTIONS.TYPE.APPROVED) {
+        lastMessageTextFromReport = ReportUtils.getIOUApprovedMessage(lastReportAction);
+    } else if (lastReportAction?.actionName === CONST.REPORT.ACTIONS.TYPE.FORWARDED) {
+        lastMessageTextFromReport = ReportUtils.getIOUForwardedMessage(lastReportAction);
+    } else if (ReportActionUtils.isActionableAddPaymentCard(lastReportAction)) {
         lastMessageTextFromReport = ReportActionUtils.getReportActionMessageText(lastReportAction);
+    } else if (lastReportAction?.actionName === 'EXPORTINTEGRATION') {
+        lastMessageTextFromReport = ReportActionUtils.getExportIntegrationLastMessageText(lastReportAction);
+    } else if (lastReportAction?.actionName && ReportActionUtils.isOldDotReportAction(lastReportAction)) {
+        lastMessageTextFromReport = ReportActionUtils.getMessageOfOldDotReportAction(lastReportAction, false);
     }
 
     return lastMessageTextFromReport || (report?.lastMessageText ?? '');
@@ -633,8 +678,8 @@ function getLastMessageTextForReport(report: OnyxEntry<Report>, lastActorDetails
  */
 function createOption(
     accountIDs: number[],
-    personalDetails: OnyxEntry<PersonalDetailsList>,
-    report: OnyxEntry<Report>,
+    personalDetails: OnyxInputOrEntry<PersonalDetailsList>,
+    report: OnyxInputOrEntry<Report>,
     reportActions: ReportActions,
     config?: PreviewConfig,
 ): ReportUtils.OptionData {
@@ -656,7 +701,6 @@ function createOption(
         phoneNumber: undefined,
         hasDraftComment: false,
         keyForList: undefined,
-        searchText: undefined,
         isDefaultRoom: false,
         isPinned: false,
         isWaitingOnBankAccount: false,
@@ -682,11 +726,13 @@ function createOption(
     let reportName;
     result.participantsList = personalDetailList;
     result.isOptimisticPersonalDetail = personalDetail?.isOptimisticPersonalDetail;
+    const reportNameValuePairs = ReportUtils.getReportNameValuePairs(report?.reportID);
     if (report) {
         result.isChatRoom = ReportUtils.isChatRoom(report);
         result.isDefaultRoom = ReportUtils.isDefaultRoom(report);
-        result.isArchivedRoom = ReportUtils.isArchivedRoom(report);
+        result.isArchivedRoom = ReportUtils.isArchivedRoom(report, reportNameValuePairs);
         result.isExpenseReport = ReportUtils.isExpenseReport(report);
+        result.isInvoiceRoom = ReportUtils.isInvoiceRoom(report);
         result.isMoneyRequestReport = ReportUtils.isMoneyRequestReport(report);
         result.isThread = ReportUtils.isChatThread(report);
         result.isTaskReport = ReportUtils.isTaskReport(report);
@@ -702,20 +748,24 @@ function createOption(
         result.isPinned = report.isPinned;
         result.iouReportID = report.iouReportID;
         result.keyForList = String(report.reportID);
-        result.tooltipText = ReportUtils.getReportParticipantsTitle(report.visibleChatMemberAccountIDs ?? []);
         result.isWaitingOnBankAccount = report.isWaitingOnBankAccount;
         result.policyID = report.policyID;
         result.isSelfDM = ReportUtils.isSelfDM(report);
+        result.notificationPreference = report.notificationPreference;
+
+        const visibleParticipantAccountIDs = ReportUtils.getParticipantsAccountIDsForDisplay(report, true);
 
-        hasMultipleParticipants = personalDetailList.length > 1 || result.isChatRoom || result.isPolicyExpenseChat;
+        result.tooltipText = ReportUtils.getReportParticipantsTitle(visibleParticipantAccountIDs);
+
+        hasMultipleParticipants = personalDetailList.length > 1 || result.isChatRoom || result.isPolicyExpenseChat || ReportUtils.isGroupChat(report);
         subtitle = ReportUtils.getChatRoomSubtitle(report);
 
-        const lastActorDetails = personalDetailMap[report.lastActorAccountID ?? 0] ?? null;
+        const lastActorDetails = personalDetailMap[report.lastActorAccountID ?? -1] ?? null;
         const lastActorDisplayName = getLastActorDisplayName(lastActorDetails, hasMultipleParticipants);
         const lastMessageTextFromReport = getLastMessageTextForReport(report, lastActorDetails);
         let lastMessageText = lastMessageTextFromReport;
 
-        const lastAction = visibleReportActionItems[report.reportID];
+        const lastAction = lastVisibleReportActions[report.reportID];
         const shouldDisplayLastActorName = lastAction && lastAction.actionName !== CONST.REPORT.ACTIONS.TYPE.REPORT_PREVIEW && lastAction.actionName !== CONST.REPORT.ACTIONS.TYPE.IOU;
 
         if (shouldDisplayLastActorName && lastActorDisplayName && lastMessageTextFromReport) {
@@ -725,8 +775,7 @@ function createOption(
         result.lastMessageText = lastMessageText;
 
         // If displaying chat preview line is needed, let's overwrite the default alternate text
-        result.alternateText =
-            showPersonalDetails && personalDetail?.login ? personalDetail.login : getAlternateText(result, {showChatPreviewLine, forcePolicyNamePreview, lastMessageTextFromReport});
+        result.alternateText = showPersonalDetails && personalDetail?.login ? personalDetail.login : getAlternateText(result, {showChatPreviewLine, forcePolicyNamePreview});
 
         reportName = showPersonalDetails
             ? ReportUtils.getDisplayNameForParticipant(accountIDs[0]) || LocalePhoneNumber.formatPhoneNumber(personalDetail?.login ?? '')
@@ -742,23 +791,14 @@ function createOption(
     result.isIOUReportOwner = ReportUtils.isIOUOwnedByCurrentUser(result);
     result.iouReportAmount = ReportUtils.getMoneyRequestSpendBreakdown(result).totalDisplaySpend;
 
-    if (!hasMultipleParticipants) {
+    if (!hasMultipleParticipants && (!report || (report && !ReportUtils.isGroupChat(report) && !ReportUtils.isChatRoom(report)))) {
         result.login = personalDetail?.login;
         result.accountID = Number(personalDetail?.accountID);
         result.phoneNumber = personalDetail?.phoneNumber;
     }
 
     result.text = reportName;
-    // Disabling this line for safeness as nullish coalescing works only if the value is undefined or null
-    // eslint-disable-next-line @typescript-eslint/prefer-nullish-coalescing
-    result.searchText = getSearchText(report, reportName, personalDetailList, !!result.isChatRoom || !!result.isPolicyExpenseChat, !!result.isThread);
-    result.icons = ReportUtils.getIcons(
-        report,
-        personalDetails,
-        UserUtils.getAvatar(personalDetail?.avatar ?? '', personalDetail?.accountID),
-        personalDetail?.login,
-        personalDetail?.accountID,
-    );
+    result.icons = ReportUtils.getIcons(report, personalDetails, personalDetail?.avatar, personalDetail?.login, personalDetail?.accountID, null);
     result.subtitle = subtitle;
 
     return result;
@@ -768,12 +808,13 @@ function createOption(
  * Get the option for a given report.
  */
 function getReportOption(participant: Participant): ReportUtils.OptionData {
-    const report = ReportUtils.getReport(participant.reportID);
+    const report = ReportUtils.getReportOrDraftReport(participant.reportID);
+    const visibleParticipantAccountIDs = ReportUtils.getParticipantsAccountIDsForDisplay(report, true);
 
     const option = createOption(
-        report?.visibleChatMemberAccountIDs ?? [],
+        visibleParticipantAccountIDs,
         allPersonalDetails ?? {},
-        !isEmptyObject(report) ? report : null,
+        !isEmptyObject(report) ? report : undefined,
         {},
         {
             showChatPreviewLine: false,
@@ -784,10 +825,14 @@ function getReportOption(participant: Participant): ReportUtils.OptionData {
     // Update text & alternateText because createOption returns workspace name only if report is owned by the user
     if (option.isSelfDM) {
         option.alternateText = Localize.translateLocal('reportActionsView.yourSpace');
+    } else if (option.isInvoiceRoom) {
+        option.text = ReportUtils.getReportName(report);
+        option.alternateText = Localize.translateLocal('workspace.common.invoices');
     } else {
         option.text = ReportUtils.getPolicyName(report);
         option.alternateText = Localize.translateLocal('workspace.common.workspace');
     }
+    option.isDisabled = ReportUtils.isDraftReport(participant.reportID);
     option.selected = participant.selected;
     option.isSelected = participant.selected;
     return option;
@@ -797,10 +842,14 @@ function getReportOption(participant: Participant): ReportUtils.OptionData {
  * Get the option for a policy expense report.
  */
 function getPolicyExpenseReportOption(participant: Participant | ReportUtils.OptionData): ReportUtils.OptionData {
-    const expenseReport = ReportUtils.isPolicyExpenseChat(participant) ? ReportUtils.getReport(participant.reportID) : null;
+    const expenseReport = ReportUtils.isPolicyExpenseChat(participant) ? ReportUtils.getReportOrDraftReport(participant.reportID) : null;
+
+    const visibleParticipantAccountIDs = Object.entries(expenseReport?.participants ?? {})
+        .filter(([, reportParticipant]) => reportParticipant && !reportParticipant.hidden)
+        .map(([accountID]) => Number(accountID));
 
     const option = createOption(
-        expenseReport?.visibleChatMemberAccountIDs ?? [],
+        visibleParticipantAccountIDs,
         allPersonalDetails ?? {},
         !isEmptyObject(expenseReport) ? expenseReport : null,
         {},
@@ -873,7 +922,7 @@ function getSearchValueForPhoneOrEmail(searchTerm: string) {
  * Verifies that there is at least one enabled option
  */
 function hasEnabledOptions(options: PolicyCategories | PolicyTag[]): boolean {
-    return Object.values(options).some((option) => option.enabled && option.pendingAction !== CONST.RED_BRICK_ROAD_PENDING_ACTION.DELETE);
+    return Object.values(options).some((option: PolicyTag | PolicyCategory) => option.enabled && option.pendingAction !== CONST.RED_BRICK_ROAD_PENDING_ACTION.DELETE);
 }
 
 /**
@@ -886,7 +935,7 @@ function sortCategories(categories: Record<string, Category>): Category[] {
     const sortedCategories = Object.values(categories).sort((a, b) => a.name.localeCompare(b.name));
 
     // An object that respects nesting of categories. Also, can contain only uniq categories.
-    const hierarchy = {};
+    const hierarchy: Hierarchy = {};
     /**
      * Iterates over all categories to set each category in a proper place in hierarchy
      * It gets a path based on a category name e.g. "Parent: Child: Subcategory" -> "Parent.Child.Subcategory".
@@ -904,10 +953,11 @@ function sortCategories(categories: Record<string, Category>): Category[] {
      */
     sortedCategories.forEach((category) => {
         const path = category.name.split(CONST.PARENT_CHILD_SEPARATOR);
-        const existedValue = lodashGet(hierarchy, path, {});
+        const existedValue = lodashGet(hierarchy, path, {}) as Hierarchy;
         lodashSet(hierarchy, path, {
             ...existedValue,
             name: category.name,
+            pendingAction: category.pendingAction,
         });
     });
 
@@ -918,10 +968,11 @@ function sortCategories(categories: Record<string, Category>): Category[] {
      */
     const flatHierarchy = (initialHierarchy: Hierarchy) =>
         Object.values(initialHierarchy).reduce((acc: Category[], category) => {
-            const {name, ...subcategories} = category;
+            const {name, pendingAction, ...subcategories} = category;
             if (name) {
                 const categoryObject: Category = {
                     name,
+                    pendingAction,
                     enabled: categories[name]?.enabled ?? false,
                 };
 
@@ -958,7 +1009,7 @@ function sortTags(tags: Record<string, PolicyTag | SelectedTagOption> | Array<Po
  * @param options[].name - a name of an option
  * @param [isOneLine] - a flag to determine if text should be one line
  */
-function getCategoryOptionTree(options: Record<string, Category> | Category[], isOneLine = false, selectedOptionsName: string[] = []): OptionTree[] {
+function getCategoryOptionTree(options: Record<string, Category> | Category[], isOneLine = false, selectedOptions: Category[] = []): OptionTree[] {
     const optionCollection = new Map<string, OptionTree>();
     Object.values(options).forEach((option) => {
         if (isOneLine) {
@@ -971,8 +1022,9 @@ function getCategoryOptionTree(options: Record<string, Category> | Category[], i
                 keyForList: option.name,
                 searchText: option.name,
                 tooltipText: option.name,
-                isDisabled: !option.enabled,
+                isDisabled: !option.enabled || option.pendingAction === CONST.RED_BRICK_ROAD_PENDING_ACTION.DELETE,
                 isSelected: !!option.isSelected,
+                pendingAction: option.pendingAction,
             });
 
             return;
@@ -982,6 +1034,8 @@ function getCategoryOptionTree(options: Record<string, Category> | Category[], i
             const indents = times(index, () => CONST.INDENTS).join('');
             const isChild = array.length - 1 === index;
             const searchText = array.slice(0, index + 1).join(CONST.PARENT_CHILD_SEPARATOR);
+            const selectedParentOption = !isChild && Object.values(selectedOptions).find((op) => op.name === searchText);
+            const isParentOptionDisabled = !selectedParentOption || !selectedParentOption.enabled || selectedParentOption.pendingAction === CONST.RED_BRICK_ROAD_PENDING_ACTION.DELETE;
 
             if (optionCollection.has(searchText)) {
                 return;
@@ -992,8 +1046,9 @@ function getCategoryOptionTree(options: Record<string, Category> | Category[], i
                 keyForList: searchText,
                 searchText,
                 tooltipText: optionName,
-                isDisabled: isChild ? !option.enabled : true,
-                isSelected: isChild ? !!option.isSelected : selectedOptionsName.includes(searchText),
+                isDisabled: isChild ? !option.enabled || option.pendingAction === CONST.RED_BRICK_ROAD_PENDING_ACTION.DELETE : isParentOptionDisabled,
+                isSelected: isChild ? !!option.isSelected : !!selectedParentOption,
+                pendingAction: option.pendingAction,
             });
         });
     });
@@ -1013,12 +1068,22 @@ function getCategoryListSections(
 ): CategoryTreeSection[] {
     const sortedCategories = sortCategories(categories);
     const enabledCategories = Object.values(sortedCategories).filter((category) => category.enabled);
-
+    const enabledCategoriesNames = enabledCategories.map((category) => category.name);
+    const selectedOptionsWithDisabledState: Category[] = [];
     const categorySections: CategoryTreeSection[] = [];
     const numberOfEnabledCategories = enabledCategories.length;
 
+    selectedOptions.forEach((option) => {
+        if (enabledCategoriesNames.includes(option.name)) {
+            const categoryObj = enabledCategories.find((category) => category.name === option.name);
+            selectedOptionsWithDisabledState.push({...(categoryObj ?? option), isSelected: true, enabled: true});
+            return;
+        }
+        selectedOptionsWithDisabledState.push({...option, isSelected: true, enabled: false});
+    });
+
     if (numberOfEnabledCategories === 0 && selectedOptions.length > 0) {
-        const data = getCategoryOptionTree(selectedOptions, true);
+        const data = getCategoryOptionTree(selectedOptionsWithDisabledState, true);
         categorySections.push({
             // "Selected" section
             title: '',
@@ -1031,9 +1096,10 @@ function getCategoryListSections(
     }
 
     if (searchInputValue) {
+        const categoriesForSearch = [...selectedOptionsWithDisabledState, ...enabledCategories];
         const searchCategories: Category[] = [];
 
-        enabledCategories.forEach((category) => {
+        categoriesForSearch.forEach((category) => {
             if (!category.name.toLowerCase().includes(searchInputValue.toLowerCase())) {
                 return;
             }
@@ -1056,7 +1122,7 @@ function getCategoryListSections(
     }
 
     if (selectedOptions.length > 0) {
-        const data = getCategoryOptionTree(selectedOptions, true);
+        const data = getCategoryOptionTree(selectedOptionsWithDisabledState, true);
         categorySections.push({
             // "Selected" section
             title: '',
@@ -1070,7 +1136,7 @@ function getCategoryListSections(
     const filteredCategories = enabledCategories.filter((category) => !selectedOptionNames.includes(category.name));
 
     if (numberOfEnabledCategories < CONST.CATEGORY_LIST_THRESHOLD) {
-        const data = getCategoryOptionTree(filteredCategories, false, selectedOptionNames);
+        const data = getCategoryOptionTree(filteredCategories, false, selectedOptionsWithDisabledState);
         categorySections.push({
             // "All" section when items amount less than the threshold
             title: '',
@@ -1083,7 +1149,10 @@ function getCategoryListSections(
     }
 
     const filteredRecentlyUsedCategories = recentlyUsedCategories
-        .filter((categoryName) => !selectedOptionNames.includes(categoryName) && categories[categoryName]?.enabled)
+        .filter(
+            (categoryName) =>
+                !selectedOptionNames.includes(categoryName) && categories[categoryName]?.enabled && categories[categoryName]?.pendingAction !== CONST.RED_BRICK_ROAD_PENDING_ACTION.DELETE,
+        )
         .map((categoryName) => ({
             name: categoryName,
             enabled: categories[categoryName].enabled ?? false,
@@ -1102,7 +1171,7 @@ function getCategoryListSections(
         });
     }
 
-    const data = getCategoryOptionTree(filteredCategories, false, selectedOptionNames);
+    const data = getCategoryOptionTree(filteredCategories, false, selectedOptionsWithDisabledState);
     categorySections.push({
         // "All" section when items amount more than the threshold
         title: Localize.translateLocal('common.all'),
@@ -1119,7 +1188,7 @@ function getCategoryListSections(
  *
  * @param tags - an initial tag array
  */
-function getTagsOptions(tags: Array<Pick<PolicyTag, 'name' | 'enabled'>>, selectedOptions?: SelectedTagOption[]): Option[] {
+function getTagsOptions(tags: Array<Pick<PolicyTag, 'name' | 'enabled' | 'pendingAction'>>, selectedOptions?: SelectedTagOption[]): Option[] {
     return tags.map((tag) => {
         // This is to remove unnecessary escaping backslash in tag name sent from backend.
         const cleanedName = PolicyUtils.getCleanedTagName(tag.name);
@@ -1128,8 +1197,9 @@ function getTagsOptions(tags: Array<Pick<PolicyTag, 'name' | 'enabled'>>, select
             keyForList: tag.name,
             searchText: tag.name,
             tooltipText: cleanedName,
-            isDisabled: !tag.enabled,
+            isDisabled: !tag.enabled || tag.pendingAction === CONST.RED_BRICK_ROAD_PENDING_ACTION.DELETE,
             isSelected: selectedOptions?.some((selectedTag) => selectedTag.name === tag.name),
+            pendingAction: tag.pendingAction,
         };
     });
 }
@@ -1147,34 +1217,42 @@ function getTagListSections(
     const tagSections = [];
     const sortedTags = sortTags(tags) as PolicyTag[];
     const selectedOptionNames = selectedOptions.map((selectedOption) => selectedOption.name);
-    const enabledTags = [...selectedOptions, ...sortedTags.filter((tag) => tag.enabled && !selectedOptionNames.includes(tag.name))];
+    const enabledTags = sortedTags.filter((tag) => tag.enabled);
+    const enabledTagsNames = enabledTags.map((tag) => tag.name);
+    const enabledTagsWithoutSelectedOptions = enabledTags.filter((tag) => !selectedOptionNames.includes(tag.name));
+    const selectedTagsWithDisabledState: SelectedTagOption[] = [];
     const numberOfTags = enabledTags.length;
 
+    selectedOptions.forEach((tag) => {
+        if (enabledTagsNames.includes(tag.name)) {
+            selectedTagsWithDisabledState.push({...tag, enabled: true});
+            return;
+        }
+        selectedTagsWithDisabledState.push({...tag, enabled: false});
+    });
+
     // 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 = selectedOptions.map((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,
-            data: getTagsOptions(selectedTagOptions, selectedOptions),
+            data: getTagsOptions(selectedTagsWithDisabledState, selectedOptions),
         });
 
         return tagSections;
     }
 
     if (searchInputValue) {
-        const searchTags = enabledTags.filter((tag) => PolicyUtils.getCleanedTagName(tag.name.toLowerCase()).includes(searchInputValue.toLowerCase()));
+        const enabledSearchTags = enabledTagsWithoutSelectedOptions.filter((tag) => PolicyUtils.getCleanedTagName(tag.name.toLowerCase()).includes(searchInputValue.toLowerCase()));
+        const selectedSearchTags = selectedTagsWithDisabledState.filter((tag) => PolicyUtils.getCleanedTagName(tag.name.toLowerCase()).includes(searchInputValue.toLowerCase()));
+        const tagsForSearch = [...selectedSearchTags, ...enabledSearchTags];
 
         tagSections.push({
             // "Search" section
             title: '',
             shouldShow: true,
-            data: getTagsOptions(searchTags, selectedOptions),
+            data: getTagsOptions(tagsForSearch, selectedOptions),
         });
 
         return tagSections;
@@ -1185,7 +1263,7 @@ function getTagListSections(
             // "All" section when items amount less than the threshold
             title: '',
             shouldShow: false,
-            data: getTagsOptions(enabledTags, selectedOptions),
+            data: getTagsOptions([...selectedTagsWithDisabledState, ...enabledTagsWithoutSelectedOptions], selectedOptions),
         });
 
         return tagSections;
@@ -1194,23 +1272,16 @@ function getTagListSections(
     const filteredRecentlyUsedTags = recentlyUsedTags
         .filter((recentlyUsedTag) => {
             const tagObject = tags.find((tag) => tag.name === recentlyUsedTag);
-            return !!tagObject?.enabled && !selectedOptionNames.includes(recentlyUsedTag);
+            return !!tagObject?.enabled && !selectedOptionNames.includes(recentlyUsedTag) && tagObject?.pendingAction !== CONST.RED_BRICK_ROAD_PENDING_ACTION.DELETE;
         })
         .map((tag) => ({name: tag, enabled: true}));
-    const filteredTags = enabledTags.filter((tag) => !selectedOptionNames.includes(tag.name));
 
     if (selectedOptions.length) {
-        const selectedTagOptions = selectedOptions.map((option) => ({
-            name: option.name,
-            // Should be marked as enabled to be able to unselect even though the selected category is disabled
-            enabled: true,
-        }));
-
         tagSections.push({
             // "Selected" section
             title: '',
             shouldShow: true,
-            data: getTagsOptions(selectedTagOptions, selectedOptions),
+            data: getTagsOptions(selectedTagsWithDisabledState, selectedOptions),
         });
     }
 
@@ -1229,7 +1300,7 @@ function getTagListSections(
         // "All" section when items amount more than the threshold
         title: Localize.translateLocal('common.all'),
         shouldShow: true,
-        data: getTagsOptions(filteredTags, selectedOptions),
+        data: getTagsOptions(enabledTagsWithoutSelectedOptions, selectedOptions),
     });
 
     return tagSections;
@@ -1238,7 +1309,7 @@ function getTagListSections(
 /**
  * Verifies that there is at least one enabled tag
  */
-function hasEnabledTags(policyTagList: Array<PolicyTagList[keyof PolicyTagList]>) {
+function hasEnabledTags(policyTagList: Array<PolicyTagLists[keyof PolicyTagLists]>) {
     const policyTagValueList = policyTagList.map(({tags}) => Object.values(tags)).flat();
 
     return hasEnabledOptions(policyTagValueList);
@@ -1319,20 +1390,6 @@ function getReportFieldOptionsSection(options: string[], recentlyUsedOptions: st
     return reportFieldOptionsSections;
 }
 
-/**
- * Transforms tax rates to a new object format - to add codes and new name with concatenated name and value.
- *
- * @param  taxRates - The original tax rates object.
- * @returns The transformed tax rates object.g
- */
-function transformedTaxRates(taxRates: TaxRatesWithDefault | undefined): Record<string, TaxRate> {
-    const defaultTaxKey = taxRates?.defaultExternalID;
-    const getModifiedName = (data: TaxRate, code: string) =>
-        `${data.name} (${data.value})${defaultTaxKey === code ? ` ${CONST.DOT_SEPARATOR} ${Localize.translateLocal('common.default')}` : ''}`;
-    const taxes = Object.fromEntries(Object.entries(taxRates?.taxes ?? {}).map(([code, data]) => [code, {...data, code, modifiedName: getModifiedName(data, code), name: data.name}]));
-    return taxes;
-}
-
 /**
  * Sorts tax rates alphabetically by name.
  */
@@ -1345,53 +1402,64 @@ function sortTaxRates(taxRates: TaxRates): TaxRate[] {
  * Builds the options for taxRates
  */
 function getTaxRatesOptions(taxRates: Array<Partial<TaxRate>>): TaxRatesOption[] {
-    return taxRates.map((taxRate) => ({
-        text: taxRate.modifiedName,
-        keyForList: taxRate.modifiedName,
-        searchText: taxRate.modifiedName,
-        tooltipText: taxRate.modifiedName,
-        isDisabled: taxRate.isDisabled,
-        data: taxRate,
+    return taxRates.map(({code, modifiedName, isDisabled, isSelected, pendingAction}) => ({
+        code,
+        text: modifiedName,
+        keyForList: modifiedName,
+        searchText: modifiedName,
+        tooltipText: modifiedName,
+        isDisabled: !!isDisabled || pendingAction === CONST.RED_BRICK_ROAD_PENDING_ACTION.DELETE,
+        isSelected,
+        pendingAction,
     }));
 }
 
 /**
  * Builds the section list for tax rates
  */
-function getTaxRatesSection(taxRates: TaxRatesWithDefault | undefined, selectedOptions: Category[], searchInputValue: string): TaxSection[] {
+function getTaxRatesSection(policy: OnyxEntry<Policy> | undefined, selectedOptions: Tax[], searchInputValue: string, transaction?: OnyxEntry<Transaction>): TaxSection[] {
     const policyRatesSections = [];
 
-    const taxes = transformedTaxRates(taxRates);
+    const taxes = TransactionUtils.transformedTaxRates(policy, transaction);
 
     const sortedTaxRates = sortTaxRates(taxes);
+    const selectedOptionNames = selectedOptions.map((selectedOption) => selectedOption.modifiedName);
     const enabledTaxRates = sortedTaxRates.filter((taxRate) => !taxRate.isDisabled);
+    const enabledTaxRatesNames = enabledTaxRates.map((tax) => tax.modifiedName);
+    const enabledTaxRatesWithoutSelectedOptions = enabledTaxRates.filter((tax) => tax.modifiedName && !selectedOptionNames.includes(tax.modifiedName));
+    const selectedTaxRateWithDisabledState: Tax[] = [];
     const numberOfTaxRates = enabledTaxRates.length;
 
+    selectedOptions.forEach((tax) => {
+        if (enabledTaxRatesNames.includes(tax.modifiedName)) {
+            selectedTaxRateWithDisabledState.push({...tax, isDisabled: false, isSelected: true});
+            return;
+        }
+        selectedTaxRateWithDisabledState.push({...tax, isDisabled: true, isSelected: true});
+    });
+
     // If all tax are disabled but there's a previously selected tag, show only the selected tag
     if (numberOfTaxRates === 0 && selectedOptions.length > 0) {
-        const selectedTaxRateOptions = selectedOptions.map((option) => ({
-            modifiedName: option.name,
-            // Should be marked as enabled to be able to be de-selected
-            isDisabled: false,
-        }));
         policyRatesSections.push({
             // "Selected" sectiong
             title: '',
             shouldShow: false,
-            data: getTaxRatesOptions(selectedTaxRateOptions),
+            data: getTaxRatesOptions(selectedTaxRateWithDisabledState),
         });
 
         return policyRatesSections;
     }
 
     if (searchInputValue) {
-        const searchTaxRates = enabledTaxRates.filter((taxRate) => taxRate.modifiedName?.toLowerCase().includes(searchInputValue.toLowerCase()));
+        const enabledSearchTaxRates = enabledTaxRatesWithoutSelectedOptions.filter((taxRate) => taxRate.modifiedName?.toLowerCase().includes(searchInputValue.toLowerCase()));
+        const selectedSearchTags = selectedTaxRateWithDisabledState.filter((taxRate) => taxRate.modifiedName?.toLowerCase().includes(searchInputValue.toLowerCase()));
+        const taxesForSearch = [...selectedSearchTags, ...enabledSearchTaxRates];
 
         policyRatesSections.push({
             // "Search" section
             title: '',
             shouldShow: true,
-            data: getTaxRatesOptions(searchTaxRates),
+            data: getTaxRatesOptions(taxesForSearch),
         });
 
         return policyRatesSections;
@@ -1402,30 +1470,18 @@ function getTaxRatesSection(taxRates: TaxRatesWithDefault | undefined, selectedO
             // "All" section when items amount less than the threshold
             title: '',
             shouldShow: false,
-            data: getTaxRatesOptions(enabledTaxRates),
+            data: getTaxRatesOptions([...selectedTaxRateWithDisabledState, ...enabledTaxRatesWithoutSelectedOptions]),
         });
 
         return policyRatesSections;
     }
 
-    const selectedOptionNames = selectedOptions.map((selectedOption) => selectedOption.name);
-    const filteredTaxRates = enabledTaxRates.filter((taxRate) => taxRate.modifiedName && !selectedOptionNames.includes(taxRate.modifiedName));
-
     if (selectedOptions.length > 0) {
-        const selectedTaxRatesOptions = selectedOptions.map((option) => {
-            const taxRateObject = Object.values(taxes).find((taxRate) => taxRate.modifiedName === option.name);
-
-            return {
-                modifiedName: option.name,
-                isDisabled: !!taxRateObject?.isDisabled,
-            };
-        });
-
         policyRatesSections.push({
             // "Selected" section
             title: '',
             shouldShow: true,
-            data: getTaxRatesOptions(selectedTaxRatesOptions),
+            data: getTaxRatesOptions(selectedTaxRateWithDisabledState),
         });
     }
 
@@ -1433,7 +1489,7 @@ function getTaxRatesSection(taxRates: TaxRatesWithDefault | undefined, selectedO
         // "All" section when number of items are more than the threshold
         title: '',
         shouldShow: true,
-        data: getTaxRatesOptions(filteredTaxRates),
+        data: getTaxRatesOptions(enabledTaxRatesWithoutSelectedOptions),
     });
 
     return policyRatesSections;
@@ -1465,28 +1521,18 @@ function createOptionList(personalDetails: OnyxEntry<PersonalDetailsList>, repor
                 return;
             }
 
-            const isSelfDM = ReportUtils.isSelfDM(report);
-            let accountIDs = [];
-
-            if (isSelfDM) {
-                // For selfDM we need to add the currentUser as participants.
-                accountIDs = [currentUserAccountID ?? 0];
-            } else {
-                accountIDs = Object.keys(report.participants ?? {}).map(Number);
-                if (ReportUtils.isOneOnOneChat(report)) {
-                    // For 1:1 chat, we don't want to include currentUser as participants in order to not mark 1:1 chats as having multiple participants
-                    accountIDs = accountIDs.filter((accountID) => accountID !== currentUserAccountID);
-                }
-            }
+            const isOneOnOneChat = ReportUtils.isOneOnOneChat(report);
+            const accountIDs = ReportUtils.getParticipantsAccountIDsForDisplay(report);
 
-            if (!accountIDs || accountIDs.length === 0) {
+            const isChatRoom = ReportUtils.isChatRoom(report);
+            if ((!accountIDs || accountIDs.length === 0) && !isChatRoom) {
                 return;
             }
 
             // Save the report in the map if this is a single participant so we can associate the reportID with the
             // personal detail option later. Individuals should not be associated with single participant
             // policyExpenseChats or chatRooms since those are not people.
-            if (accountIDs.length <= 1) {
+            if (accountIDs.length <= 1 && isOneOnOneChat) {
                 reportMapForAccountIDs[accountIDs[0]] = report;
             }
 
@@ -1509,8 +1555,7 @@ function createOptionList(personalDetails: OnyxEntry<PersonalDetailsList>, repor
 }
 
 function createOptionFromReport(report: Report, personalDetails: OnyxEntry<PersonalDetailsList>) {
-    const isSelfDM = ReportUtils.isSelfDM(report);
-    const accountIDs = isSelfDM ? [currentUserAccountID ?? 0] : report.participantAccountIDs ?? [];
+    const accountIDs = ReportUtils.getParticipantsAccountIDsForDisplay(report);
 
     return {
         item: report,
@@ -1524,11 +1569,21 @@ function createOptionFromReport(report: Report, personalDetails: OnyxEntry<Perso
  * @param searchValue - search string
  * @returns a sorted list of options
  */
-function orderOptions(options: ReportUtils.OptionData[], searchValue: string | undefined) {
+function orderOptions(options: ReportUtils.OptionData[], searchValue: string | undefined, {preferChatroomsOverThreads = false, preferPolicyExpenseChat = false} = {}) {
     return lodashOrderBy(
         options,
         [
             (option) => {
+                if (option.isPolicyExpenseChat && preferPolicyExpenseChat && option.policyID === activePolicyID) {
+                    return 0;
+                }
+
+                if (option.isSelfDM) {
+                    return 0;
+                }
+                if (preferChatroomsOverThreads && option.isThread) {
+                    return 4;
+                }
                 if (!!option.isChatRoom || option.isArchivedRoom) {
                     return 3;
                 }
@@ -1547,19 +1602,37 @@ function orderOptions(options: ReportUtils.OptionData[], searchValue: string | u
     );
 }
 
+function canCreateOptimisticPersonalDetailOption({
+    searchValue,
+    recentReportOptions,
+    personalDetailsOptions,
+    currentUserOption,
+}: {
+    searchValue: string;
+    recentReportOptions: ReportUtils.OptionData[];
+    personalDetailsOptions: ReportUtils.OptionData[];
+    currentUserOption?: ReportUtils.OptionData | null;
+    excludeUnknownUsers: boolean;
+}) {
+    const noOptions = recentReportOptions.length + personalDetailsOptions.length === 0 && !currentUserOption;
+    const noOptionsMatchExactly = !personalDetailsOptions
+        .concat(recentReportOptions)
+        .find((option) => option.login === PhoneNumber.addSMSDomainIfPhoneNumber(searchValue ?? '').toLowerCase() || option.login === searchValue?.toLowerCase());
+
+    return noOptions || noOptionsMatchExactly;
+}
+
 /**
  * We create a new user option if the following conditions are satisfied:
  * - There's no matching recent report and personal detail option
  * - The searchValue is a valid email or phone number
  * - The searchValue isn't the current personal detail login
- * - We can use chronos or the search value is not the chronos email
  */
 function getUserToInviteOption({
     searchValue,
     excludeUnknownUsers = false,
     optionsToExclude = [],
     selectedOptions = [],
-    betas,
     reportActions = {},
     showChatPreviewLine = false,
 }: GetUserToInviteConfig): ReportUtils.OptionData | null {
@@ -1570,17 +1643,8 @@ function getUserToInviteOption({
     const isValidPhoneNumber = parsedPhoneNumber.possible && Str.isValidE164Phone(LoginUtils.getPhoneNumberWithoutSpecialChars(parsedPhoneNumber.number?.input ?? ''));
     const isInOptionToExclude =
         optionsToExclude.findIndex((optionToExclude) => 'login' in optionToExclude && optionToExclude.login === PhoneNumber.addSMSDomainIfPhoneNumber(searchValue).toLowerCase()) !== -1;
-    const isChronosEmail = searchValue === CONST.EMAIL.CHRONOS;
 
-    if (
-        !searchValue ||
-        isCurrentUserLogin ||
-        isInSelectedOption ||
-        (!isValidEmail && !isValidPhoneNumber) ||
-        isInOptionToExclude ||
-        (isChronosEmail && !Permissions.canUseChronos(betas)) ||
-        excludeUnknownUsers
-    ) {
+    if (!searchValue || isCurrentUserLogin || isInSelectedOption || (!isValidEmail && !isValidPhoneNumber) || isInOptionToExclude || excludeUnknownUsers) {
         return null;
     }
 
@@ -1606,7 +1670,8 @@ function getUserToInviteOption({
     // If user doesn't exist, use a fallback avatar
     userToInvite.icons = [
         {
-            source: UserUtils.getAvatar('', optimisticAccountID),
+            source: FallbackAvatar,
+            id: optimisticAccountID,
             name: searchValue,
             type: CONST.ICON_TYPE_AVATAR,
         },
@@ -1615,6 +1680,23 @@ function getUserToInviteOption({
     return userToInvite;
 }
 
+/**
+ * Check whether report has violations
+ */
+function shouldShowViolations(report: Report, transactionViolations: OnyxCollection<TransactionViolation[]>) {
+    const {parentReportID, parentReportActionID} = report ?? {};
+    const canGetParentReport = parentReportID && parentReportActionID && allReportActions;
+    if (!canGetParentReport) {
+        return false;
+    }
+    const parentReportActions = allReportActions ? allReportActions[`${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${parentReportID}`] ?? {} : {};
+    const parentReportAction = parentReportActions[parentReportActionID] ?? null;
+    if (!parentReportAction) {
+        return false;
+    }
+    return ReportUtils.shouldDisplayTransactionThreadViolations(report, transactionViolations, parentReportAction);
+}
+
 /**
  * filter options based on specific conditions
  */
@@ -1627,7 +1709,6 @@ function getOptions(
         maxRecentReportsToShow = 0,
         excludeLogins = [],
         includeMultipleParticipantReports = false,
-        includePersonalDetails = false,
         includeRecentReports = false,
         // When sortByReportTypeInSearch flag is true, recentReports will include the personalDetails options as well.
         sortByReportTypeInSearch = false,
@@ -1651,11 +1732,15 @@ function getOptions(
         includeSelectedOptions = false,
         transactionViolations = {},
         includeTaxRates,
-        taxRates,
+        policy,
+        transaction,
         includeSelfDM = false,
         includePolicyReportFieldOptions = false,
         policyReportFieldOptions = [],
         recentlyUsedPolicyReportFieldOptions = [],
+        includeInvoiceRooms = false,
+        includeDomainEmail = false,
+        action,
     }: GetOptionsConfig,
 ): Options {
     if (includeCategories) {
@@ -1687,7 +1772,7 @@ function getOptions(
     }
 
     if (includeTaxRates) {
-        const taxRatesOptions = getTaxRatesSection(taxRates, selectedOptions as Category[], searchInputValue);
+        const taxRatesOptions = getTaxRatesSection(policy, selectedOptions as Tax[], searchInputValue, transaction);
 
         return {
             recentReports: [],
@@ -1716,17 +1801,12 @@ function getOptions(
 
     const parsedPhoneNumber = PhoneNumber.parsePhoneNumber(LoginUtils.appendCountryCode(Str.removeSMSDomain(searchInputValue)));
     const searchValue = parsedPhoneNumber.possible ? parsedPhoneNumber.number?.e164 ?? '' : searchInputValue.toLowerCase();
-    const topmostReportId = Navigation.getTopmostReportId() ?? '';
+    const topmostReportId = Navigation.getTopmostReportId() ?? '-1';
 
     // Filter out all the reports that shouldn't be displayed
     const filteredReportOptions = options.reports.filter((option) => {
         const report = option.item;
-
-        const {parentReportID, parentReportActionID} = report ?? {};
-        const canGetParentReport = parentReportID && parentReportActionID && allReportActions;
-        const parentReportAction = canGetParentReport ? allReportActions[parentReportID]?.[parentReportActionID] ?? null : null;
-        const doesReportHaveViolations =
-            (betas?.includes(CONST.BETAS.VIOLATIONS) && ReportUtils.doesTransactionThreadHaveViolations(report, transactionViolations, parentReportAction)) ?? false;
+        const doesReportHaveViolations = shouldShowViolations(report, transactionViolations);
 
         return ReportUtils.shouldReportBeInOptionList({
             report,
@@ -1734,14 +1814,17 @@ function getOptions(
             betas,
             policies,
             doesReportHaveViolations,
-            isInGSDMode: false,
+            isInFocusMode: false,
             excludeEmptyChats: false,
             includeSelfDM,
+            login: option.login,
+            includeDomainEmail,
         });
     });
 
     // Sorting the reports works like this:
     // - Order everything by the last message timestamp (descending)
+    // - When searching, self DM is put at the top
     // - All archived reports should remain at the bottom
     const orderedReportOptions = lodashSortBy(filteredReportOptions, (option) => {
         const report = option.item;
@@ -1749,6 +1832,10 @@ function getOptions(
             return CONST.DATE.UNIX_EPOCH;
         }
 
+        if (searchValue) {
+            return [option.isSelfDM, report?.lastVisibleActionCreated];
+        }
+
         return report?.lastVisibleActionCreated;
     });
     orderedReportOptions.reverse();
@@ -1765,18 +1852,8 @@ function getOptions(
         const isPolicyExpenseChat = option.isPolicyExpenseChat;
         const isMoneyRequestReport = option.isMoneyRequestReport;
         const isSelfDM = option.isSelfDM;
-        let accountIDs = [];
-
-        if (isSelfDM) {
-            // For selfDM we need to add the currentUser as participants.
-            accountIDs = [currentUserAccountID ?? 0];
-        } else {
-            accountIDs = Object.keys(report.participants ?? {}).map(Number);
-            if (ReportUtils.isOneOnOneChat(report)) {
-                // For 1:1 chat, we don't want to include currentUser as participants in order to not mark 1:1 chats as having multiple participants
-                accountIDs = accountIDs.filter((accountID) => accountID !== currentUserAccountID);
-            }
-        }
+        const isChatRoom = option.isChatRoom;
+        const accountIDs = ReportUtils.getParticipantsAccountIDsForDisplay(report);
 
         if (isPolicyExpenseChat && report.isOwnPolicyExpenseChat && !includeOwnedWorkspaceChats) {
             return;
@@ -1808,14 +1885,16 @@ function getOptions(
             return;
         }
 
-        if (!accountIDs || accountIDs.length === 0) {
+        if ((!accountIDs || accountIDs.length === 0) && !isChatRoom) {
             return;
         }
 
         return option;
     });
 
-    const havingLoginPersonalDetails = options.personalDetails.filter((detail) => !!detail?.login && !!detail.accountID && !detail?.isOptimisticPersonalDetail);
+    const havingLoginPersonalDetails = includeP2P
+        ? options.personalDetails.filter((detail) => !!detail?.login && !!detail.accountID && !detail?.isOptimisticPersonalDetail && (includeDomainEmail || !Str.isDomainEmail(detail.login)))
+        : [];
     let allPersonalDetailsOptions = havingLoginPersonalDetails;
 
     if (sortPersonalDetailsByAlphaAsc) {
@@ -1823,7 +1902,7 @@ function getOptions(
         allPersonalDetailsOptions = lodashOrderBy(allPersonalDetailsOptions, [(personalDetail) => personalDetail.text?.toLowerCase()], 'asc');
     }
 
-    const optionsToExclude: Option[] = [{login: CONST.EMAIL.NOTIFICATIONS}];
+    const optionsToExclude: Option[] = [];
 
     // If we're including selected options from the search results, we only want to exclude them if the search input is empty
     // This is because on certain pages, we show the selected options at the top when the search input is empty
@@ -1860,8 +1939,19 @@ function getOptions(
             const isCurrentUserOwnedPolicyExpenseChatThatCouldShow =
                 reportOption.isPolicyExpenseChat && reportOption.ownerAccountID === currentUserAccountID && includeOwnedWorkspaceChats && !reportOption.isArchivedRoom;
 
-            // Skip if we aren't including multiple participant reports and this report has multiple participants
-            if (!isCurrentUserOwnedPolicyExpenseChatThatCouldShow && !includeMultipleParticipantReports && !reportOption.login) {
+            const shouldShowInvoiceRoom =
+                includeInvoiceRooms && ReportUtils.isInvoiceRoom(reportOption.item) && ReportUtils.isPolicyAdmin(reportOption.policyID ?? '', policies) && !reportOption.isArchivedRoom;
+            // TODO: Uncomment the following line when the invoices screen is ready - https://github.com/Expensify/App/issues/45175.
+            // && PolicyUtils.canSendInvoiceFromWorkspace(reportOption.policyID);
+
+            /**
+                Exclude the report option if it doesn't meet any of the following conditions:
+                - It is not an owned policy expense chat that could be shown
+                - Multiple participant reports are not included
+                - It doesn't have a login
+                - It is not an invoice room that should be shown
+            */
+            if (!isCurrentUserOwnedPolicyExpenseChatThatCouldShow && !includeMultipleParticipantReports && !reportOption.login && !shouldShowInvoiceRoom) {
                 continue;
             }
 
@@ -1874,26 +1964,18 @@ function getOptions(
                 continue;
             }
 
-            // Finally check to see if this option is a match for the provided search string if we have one
-            const {searchText, participantsList, isChatRoom} = reportOption;
-            const participantNames = getParticipantNames(participantsList);
-
-            if (searchValue) {
-                // Determine if the search is happening within a chat room and starts with the report ID
-                const isReportIdSearch = isChatRoom && Str.startsWith(reportOption.reportID ?? '', searchValue);
-
-                // Check if the search string matches the search text or participant names considering the type of the room
-                const isSearchMatch = isSearchStringMatch(searchValue, searchText, participantNames, isChatRoom);
+            reportOption.isSelected = isReportSelected(reportOption, selectedOptions);
+            reportOption.isBold = shouldUseBoldText(reportOption);
 
-                if (!isReportIdSearch && !isSearchMatch) {
-                    continue;
+            if (action === CONST.IOU.ACTION.CATEGORIZE) {
+                const policyCategories = allPolicyCategories?.[`${ONYXKEYS.COLLECTION.POLICY_CATEGORIES}${reportOption.policyID}`] ?? {};
+                if (getEnabledCategoriesCount(policyCategories) !== 0) {
+                    recentReportOptions.push(reportOption);
                 }
+            } else {
+                recentReportOptions.push(reportOption);
             }
 
-            reportOption.isSelected = isReportSelected(reportOption, selectedOptions);
-
-            recentReportOptions.push(reportOption);
-
             // Add this login to the exclude list so it won't appear when we process the personal details
             if (reportOption.login) {
                 optionsToExclude.push({login: reportOption.login});
@@ -1901,52 +1983,48 @@ function getOptions(
         }
     }
 
-    if (includePersonalDetails) {
-        const personalDetailsOptionsToExclude = [...optionsToExclude, {login: currentUserLogin}];
-        // Next loop over all personal details removing any that are selectedUsers or recentChats
-        allPersonalDetailsOptions.forEach((personalDetailOption) => {
-            if (personalDetailsOptionsToExclude.some((optionToExclude) => optionToExclude.login === personalDetailOption.login)) {
-                return;
-            }
-            const {searchText, participantsList, isChatRoom} = personalDetailOption;
-            const participantNames = getParticipantNames(participantsList);
-            if (searchValue && !isSearchStringMatch(searchValue, searchText, participantNames, isChatRoom)) {
-                return;
-            }
-
-            personalDetailsOptions.push(personalDetailOption);
-        });
-    }
+    const personalDetailsOptionsToExclude = [...optionsToExclude, {login: currentUserLogin}];
+    // Next loop over all personal details removing any that are selectedUsers or recentChats
+    for (const personalDetailOption of allPersonalDetailsOptions) {
+        if (personalDetailsOptionsToExclude.some((optionToExclude) => optionToExclude.login === personalDetailOption.login)) {
+            continue;
+        }
+        personalDetailOption.isBold = shouldUseBoldText(personalDetailOption);
 
-    let currentUserOption = allPersonalDetailsOptions.find((personalDetailsOption) => personalDetailsOption.login === currentUserLogin);
-    if (searchValue && currentUserOption && !isSearchStringMatch(searchValue, currentUserOption.searchText)) {
-        currentUserOption = undefined;
+        personalDetailsOptions.push(personalDetailOption);
     }
 
-    const noOptions = recentReportOptions.length + personalDetailsOptions.length === 0 && !currentUserOption;
-    const noOptionsMatchExactly = !personalDetailsOptions
-        .concat(recentReportOptions)
-        .find((option) => option.login === PhoneNumber.addSMSDomainIfPhoneNumber(searchValue ?? '').toLowerCase() || option.login === searchValue?.toLowerCase());
+    const currentUserOption = allPersonalDetailsOptions.find((personalDetailsOption) => personalDetailsOption.login === currentUserLogin);
 
-    const userToInvite =
-        noOptions || noOptionsMatchExactly
-            ? getUserToInviteOption({
-                  searchValue,
-                  excludeUnknownUsers,
-                  optionsToExclude,
-                  selectedOptions,
-                  betas,
-                  reportActions,
-                  showChatPreviewLine,
-              })
-            : null;
+    let userToInvite: ReportUtils.OptionData | null = null;
+    if (
+        canCreateOptimisticPersonalDetailOption({
+            searchValue,
+            recentReportOptions,
+            personalDetailsOptions,
+            currentUserOption,
+            excludeUnknownUsers,
+        })
+    ) {
+        userToInvite = getUserToInviteOption({
+            searchValue,
+            excludeUnknownUsers,
+            optionsToExclude,
+            selectedOptions,
+            reportActions,
+            showChatPreviewLine,
+        });
+    }
 
     // If we are prioritizing 1:1 chats in search, do it only once we started searching
-    if (sortByReportTypeInSearch && searchValue !== '') {
+    if (sortByReportTypeInSearch && (searchValue !== '' || !!action)) {
         // When sortByReportTypeInSearch is true, recentReports will be returned with all the reports including personalDetailsOptions in the correct Order.
-        recentReportOptions.push(...personalDetailsOptions);
-        personalDetailsOptions = [];
-        recentReportOptions = orderOptions(recentReportOptions, searchValue);
+        // If we're in money request flow, we only order the recent report option.
+        if (!action) {
+            recentReportOptions.push(...personalDetailsOptions);
+            personalDetailsOptions = [];
+        }
+        recentReportOptions = orderOptions(recentReportOptions, searchValue, {preferChatroomsOverThreads: true, preferPolicyExpenseChat: !!action});
     }
 
     return {
@@ -1974,7 +2052,7 @@ function getSearchOptions(options: OptionList, searchValue = '', betas: Beta[] =
         maxRecentReportsToShow: 0, // Unlimited
         sortByReportTypeInSearch: true,
         showChatPreviewLine: true,
-        includePersonalDetails: true,
+        includeP2P: true,
         forcePolicyNamePreview: true,
         includeOwnedWorkspaceChats: true,
         includeThreads: true,
@@ -1995,7 +2073,7 @@ function getShareLogOptions(options: OptionList, searchValue = '', betas: Beta[]
         includeRecentReports: true,
         includeMultipleParticipantReports: true,
         sortByReportTypeInSearch: true,
-        includePersonalDetails: true,
+        includeP2P: true,
         forcePolicyNamePreview: true,
         includeOwnedWorkspaceChats: true,
         includeSelfDM: true,
@@ -2006,36 +2084,26 @@ function getShareLogOptions(options: OptionList, searchValue = '', betas: Beta[]
 /**
  * Build the IOUConfirmation options for showing the payee personalDetail
  */
-function getIOUConfirmationOptionsFromPayeePersonalDetail(personalDetail: PersonalDetails | EmptyObject, amountText?: string): PayeePersonalDetails {
-    const formattedLogin = LocalePhoneNumber.formatPhoneNumber(personalDetail.login ?? '');
+function getIOUConfirmationOptionsFromPayeePersonalDetail(personalDetail: OnyxEntry<PersonalDetails>, amountText?: string): PayeePersonalDetails {
+    const formattedLogin = LocalePhoneNumber.formatPhoneNumber(personalDetail?.login ?? '');
     return {
         text: PersonalDetailsUtils.getDisplayNameOrDefault(personalDetail, formattedLogin),
         alternateText: formattedLogin || PersonalDetailsUtils.getDisplayNameOrDefault(personalDetail, '', false),
         icons: [
             {
-                source: UserUtils.getAvatar(personalDetail.avatar, personalDetail.accountID),
-                name: personalDetail.login ?? '',
+                source: personalDetail?.avatar ?? FallbackAvatar,
+                name: personalDetail?.login ?? '',
                 type: CONST.ICON_TYPE_AVATAR,
-                id: personalDetail.accountID,
+                id: personalDetail?.accountID,
             },
         ],
         descriptiveText: amountText ?? '',
-        login: personalDetail.login ?? '',
-        accountID: personalDetail.accountID,
-        keyForList: String(personalDetail.accountID),
+        login: personalDetail?.login ?? '',
+        accountID: personalDetail?.accountID ?? -1,
+        keyForList: String(personalDetail?.accountID ?? -1),
     };
 }
 
-/**
- * Build the IOUConfirmationOptions for showing participants
- */
-function getIOUConfirmationOptionsFromParticipants(participants: Array<Participant | ReportUtils.OptionData>, amountText: string): Array<Participant | ReportUtils.OptionData> {
-    return participants.map((participant) => ({
-        ...participant,
-        descriptiveText: amountText,
-    }));
-}
-
 /**
  * Build the options for the New Group view
  */
@@ -2057,13 +2125,15 @@ function getFilteredOptions(
     canInviteUser = true,
     includeSelectedOptions = false,
     includeTaxRates = false,
+    maxRecentReportsToShow: number = CONST.IOU.MAX_RECENT_REPORTS_TO_SHOW,
     taxRates: TaxRatesWithDefault = {} as TaxRatesWithDefault,
     includeSelfDM = false,
     includePolicyReportFieldOptions = false,
     policyReportFieldOptions: string[] = [],
     recentlyUsedPolicyReportFieldOptions: string[] = [],
-    includePersonalDetails = true,
-    maxRecentReportsToShow = 5,
+    includeInvoiceRooms = false,
+    action: IOUAction | undefined = undefined,
+    sortByReportTypeInSearch = false,
 ) {
     return getOptions(
         {reports, personalDetails},
@@ -2072,7 +2142,6 @@ function getFilteredOptions(
             searchInputValue: searchValue.trim(),
             selectedOptions,
             includeRecentReports: true,
-            includePersonalDetails,
             maxRecentReportsToShow,
             excludeLogins,
             includeOwnedWorkspaceChats,
@@ -2091,6 +2160,9 @@ function getFilteredOptions(
             includePolicyReportFieldOptions,
             policyReportFieldOptions,
             recentlyUsedPolicyReportFieldOptions,
+            includeInvoiceRooms,
+            action,
+            sortByReportTypeInSearch,
         },
     );
 }
@@ -2118,7 +2190,6 @@ function getShareDestinationOptions(
             maxRecentReportsToShow: 0, // Unlimited
             includeRecentReports: true,
             includeMultipleParticipantReports: true,
-            includePersonalDetails: false,
             showChatPreviewLine: true,
             forcePolicyNamePreview: true,
             includeThreads: true,
@@ -2147,14 +2218,14 @@ function formatMemberForList(member: ReportUtils.OptionData): MemberForList {
         // eslint-disable-next-line @typescript-eslint/prefer-nullish-coalescing
         alternateText: member.alternateText || member.login || '',
         // eslint-disable-next-line @typescript-eslint/prefer-nullish-coalescing
-        keyForList: member.keyForList || String(accountID ?? 0) || '',
+        keyForList: member.keyForList || String(accountID ?? -1) || '',
         isSelected: member.isSelected ?? false,
         isDisabled: member.isDisabled ?? false,
         accountID,
         login: member.login ?? '',
         icons: member.icons,
         pendingAction: member.pendingAction,
-        reportID: member.reportID ?? '',
+        reportID: member.reportID ?? '-1',
     };
 }
 
@@ -2175,7 +2246,7 @@ function getMemberInviteOptions(
         {
             betas,
             searchInputValue: searchValue.trim(),
-            includePersonalDetails: true,
+            includeP2P: true,
             excludeLogins,
             sortPersonalDetailsByAlphaAsc: true,
             includeSelectedOptions,
@@ -2260,11 +2331,12 @@ function formatSectionsFromSearchTerm(
         };
     }
 
+    const cleanSearchTerm = searchTerm.trim().toLowerCase();
     // If you select a new user you don't have a contact for, they won't get returned as part of a recent report or personal details
     // This will add them to the list of options, deduping them if they already exist in the other lists
     const selectedParticipantsWithoutDetails = selectedOptions.filter((participant) => {
         const accountID = participant.accountID ?? null;
-        const isPartOfSearchTerm = participant.searchText?.toLowerCase().includes(searchTerm.trim().toLowerCase());
+        const isPartOfSearchTerm = getPersonalDetailSearchTerms(participant).join(' ').toLowerCase().includes(cleanSearchTerm);
         const isReportInRecentReports = filteredRecentReports.some((report) => report.accountID === accountID);
         const isReportInPersonalDetails = filteredPersonalDetails.some((personalDetail) => personalDetail.accountID === accountID);
         return isPartOfSearchTerm && !isReportInRecentReports && !isReportInPersonalDetails;
@@ -2296,47 +2368,50 @@ function getFirstKeyForList(data?: Option[] | null) {
 
     return firstNonEmptyDataObj.keyForList ? firstNonEmptyDataObj.keyForList : '';
 }
+
+function getPersonalDetailSearchTerms(item: Partial<ReportUtils.OptionData>) {
+    return [item.participantsList?.[0]?.displayName ?? '', item.login ?? '', item.login?.replace(CONST.EMAIL_SEARCH_REGEX, '') ?? ''];
+}
+
+function getCurrentUserSearchTerms(item: ReportUtils.OptionData) {
+    return [item.text ?? '', item.login ?? '', item.login?.replace(CONST.EMAIL_SEARCH_REGEX, '') ?? ''];
+}
 /**
  * Filters options based on the search input value
  */
-function filterOptions(options: Options, searchInputValue: string, betas: OnyxEntry<Beta[]> = []): Options {
-    const searchValue = getSearchValueForPhoneOrEmail(searchInputValue);
-    const searchTerms = searchValue ? searchValue.split(' ') : [];
-
-    // The regex below is used to remove dots only from the local part of the user email (local-part@domain)
-    // so that we can match emails that have dots without explicitly writing the dots (e.g: fistlast@domain will match first.last@domain)
-    const emailRegex = /\.(?=[^\s@]*@)/g;
+function filterOptions(options: Options, searchInputValue: string, config?: FilterOptionsConfig): Options {
+    const {
+        sortByReportTypeInSearch = false,
+        canInviteUser = true,
+        maxRecentReportsToShow = 0,
+        excludeLogins = [],
+        preferChatroomsOverThreads = false,
+        preferPolicyExpenseChat = false,
+    } = config ?? {};
+    if (searchInputValue.trim() === '' && maxRecentReportsToShow > 0) {
+        return {...options, recentReports: options.recentReports.slice(0, maxRecentReportsToShow)};
+    }
 
-    const getParticipantsLoginsArray = (item: ReportUtils.OptionData) => {
-        const keys: string[] = [];
-        const visibleChatMemberAccountIDs = item.participantsList ?? [];
-        if (allPersonalDetails) {
-            visibleChatMemberAccountIDs.forEach((participant) => {
-                const login = participant?.login;
+    const parsedPhoneNumber = PhoneNumber.parsePhoneNumber(LoginUtils.appendCountryCode(Str.removeSMSDomain(searchInputValue)));
+    const searchValue = parsedPhoneNumber.possible && parsedPhoneNumber.number?.e164 ? parsedPhoneNumber.number.e164 : searchInputValue.toLowerCase();
+    const searchTerms = searchValue ? searchValue.split(' ') : [];
 
-                if (participant?.displayName) {
-                    keys.push(participant.displayName);
-                }
+    const optionsToExclude: Option[] = [{login: CONST.EMAIL.NOTIFICATIONS}];
 
-                if (login) {
-                    keys.push(login);
-                    keys.push(login.replace(emailRegex, ''));
-                }
-            });
-        }
+    excludeLogins.forEach((login) => {
+        optionsToExclude.push({login});
+    });
 
-        return keys;
-    };
     const matchResults = searchTerms.reduceRight((items, term) => {
         const recentReports = filterArrayByMatch(items.recentReports, term, (item) => {
-            let values: string[] = [];
+            const values: string[] = [];
             if (item.text) {
                 values.push(item.text);
             }
 
             if (item.login) {
                 values.push(item.login);
-                values.push(item.login.replace(emailRegex, ''));
+                values.push(item.login.replace(CONST.EMAIL_SEARCH_REGEX, ''));
             }
 
             if (item.isThread) {
@@ -2348,38 +2423,69 @@ function filterOptions(options: Options, searchInputValue: string, betas: OnyxEn
                     values.push(item.subtitle);
                 }
             }
-            values = values.concat(getParticipantsLoginsArray(item));
 
             return uniqFast(values);
         });
-        const personalDetails = filterArrayByMatch(items.personalDetails, term, (item) =>
-            uniqFast([item.participantsList?.[0]?.displayName ?? '', item.login ?? '', item.login?.replace(emailRegex, '') ?? '']),
-        );
+        const personalDetails = filterArrayByMatch(items.personalDetails, term, (item) => uniqFast(getPersonalDetailSearchTerms(item)));
+
+        const currentUserOptionSearchText = items.currentUserOption ? uniqFast(getCurrentUserSearchTerms(items.currentUserOption)).join(' ') : '';
+
+        const currentUserOption = isSearchStringMatch(term, currentUserOptionSearchText) ? items.currentUserOption : null;
 
         return {
             recentReports: recentReports ?? [],
             personalDetails: personalDetails ?? [],
             userToInvite: null,
-            currentUserOption: null,
+            currentUserOption,
             categoryOptions: [],
             tagOptions: [],
             taxRatesOptions: [],
         };
     }, options);
 
-    const recentReports = matchResults.recentReports.concat(matchResults.personalDetails);
-    const userToInvite =
-        recentReports.length === 0
-            ? getUserToInviteOption({
-                  searchValue,
-                  betas,
-              })
-            : null;
+    let {recentReports, personalDetails} = matchResults;
+
+    if (sortByReportTypeInSearch) {
+        recentReports = recentReports.concat(personalDetails);
+        personalDetails = [];
+        recentReports = orderOptions(recentReports, searchValue);
+    }
+
+    let userToInvite = null;
+    if (canInviteUser) {
+        if (recentReports.length === 0 && personalDetails.length === 0) {
+            userToInvite = getUserToInviteOption({
+                searchValue,
+                selectedOptions: config?.selectedOptions,
+                optionsToExclude,
+            });
+        }
+    }
+
+    if (maxRecentReportsToShow > 0 && recentReports.length > maxRecentReportsToShow) {
+        recentReports.splice(maxRecentReportsToShow);
+    }
 
     return {
-        personalDetails: [],
-        recentReports: orderOptions(recentReports, searchValue),
+        personalDetails,
+        recentReports: orderOptions(recentReports, searchValue, {preferChatroomsOverThreads, preferPolicyExpenseChat}),
         userToInvite,
+        currentUserOption: matchResults.currentUserOption,
+        categoryOptions: [],
+        tagOptions: [],
+        taxRatesOptions: [],
+    };
+}
+
+function sortAlphabetically<T extends Partial<Record<TKey, string | undefined>>, TKey extends keyof T>(items: T[], key: TKey): T[] {
+    return items.sort((a, b) => (a[key] ?? '').toLowerCase().localeCompare((b[key] ?? '').toLowerCase()));
+}
+
+function getEmptyOptions(): Options {
+    return {
+        recentReports: [],
+        personalDetails: [],
+        userToInvite: null,
         currentUserOption: null,
         categoryOptions: [],
         tagOptions: [],
@@ -2387,6 +2493,10 @@ function filterOptions(options: Options, searchInputValue: string, betas: OnyxEn
     };
 }
 
+function shouldUseBoldText(report: ReportUtils.OptionData): boolean {
+    return report.isUnread === true && report.notificationPreference !== CONST.REPORT.NOTIFICATION_PREFERENCE.MUTE;
+}
+
 export {
     getAvatarsForAccountIDs,
     isCurrentUser,
@@ -2400,10 +2510,10 @@ export {
     getSearchValueForPhoneOrEmail,
     getPersonalDetailsForAccountIDs,
     getIOUConfirmationOptionsFromPayeePersonalDetail,
-    getIOUConfirmationOptionsFromParticipants,
-    getSearchText,
+    isSearchStringMatchUserDetails,
     getAllReportErrors,
     getPolicyExpenseReportOption,
+    getIOUReportIDOfLastAction,
     getParticipantsOption,
     isSearchStringMatch,
     shouldOptionShowTooltip,
@@ -2412,12 +2522,12 @@ export {
     getEnabledCategoriesCount,
     hasEnabledOptions,
     sortCategories,
+    sortAlphabetically,
     sortTags,
     getCategoryOptionTree,
     hasEnabledTags,
     formatMemberForList,
     formatSectionsFromSearchTerm,
-    transformedTaxRates,
     getShareLogOptions,
     filterOptions,
     createOptionList,
@@ -2425,6 +2535,13 @@ export {
     getReportOption,
     getTaxRatesSection,
     getFirstKeyForList,
+    canCreateOptimisticPersonalDetailOption,
+    getUserToInviteOption,
+    shouldShowViolations,
+    getPersonalDetailSearchTerms,
+    getCurrentUserSearchTerms,
+    getEmptyOptions,
+    shouldUseBoldText,
 };
 
-export type {MemberForList, CategorySection, CategoryTreeSection, Options, OptionList, SearchOption, PayeePersonalDetails, Category, TaxRatesOption, Option, OptionTree};
+export type {MemberForList, CategorySection, CategoryTreeSection, Options, OptionList, SearchOption, PayeePersonalDetails, Category, Tax, TaxRatesOption, Option, OptionTree};
diff --git a/src/libs/PaginationUtils.ts b/src/libs/PaginationUtils.ts
new file mode 100644
index 000000000000..a08868f5dcc1
--- /dev/null
+++ b/src/libs/PaginationUtils.ts
@@ -0,0 +1,195 @@
+import CONST from '@src/CONST';
+import type Pages from '@src/types/onyx/Pages';
+
+type PageWithIndex = {
+    /** The IDs we store in Onyx and which make up the page. */
+    ids: string[];
+
+    /** The first ID in the page. */
+    firstID: string;
+
+    /** The index of the first ID in the page in the complete set of sorted items. */
+    firstIndex: number;
+
+    /** The last ID in the page. */
+    lastID: string;
+
+    /** The index of the last ID in the page in the complete set of sorted items. */
+    lastIndex: number;
+};
+
+// It's useful to be able to reference and item along with its index in a sorted array,
+// since the index is needed for ordering but the id is what we actually store.
+type ItemWithIndex = {
+    id: string;
+    index: number;
+};
+
+/**
+ * Finds the id and index in sortedItems of the first item in the given page that's present in sortedItems.
+ */
+function findFirstItem<TResource>(sortedItems: TResource[], page: string[], getID: (item: TResource) => string): ItemWithIndex | null {
+    for (const id of page) {
+        if (id === CONST.PAGINATION_START_ID) {
+            return {id, index: 0};
+        }
+        const index = sortedItems.findIndex((item) => getID(item) === id);
+        if (index !== -1) {
+            return {id, index};
+        }
+    }
+    return null;
+}
+
+/**
+ * Finds the id and index in sortedItems of the last item in the given page that's present in sortedItems.
+ */
+function findLastItem<TResource>(sortedItems: TResource[], page: string[], getID: (item: TResource) => string): ItemWithIndex | null {
+    for (let i = page.length - 1; i >= 0; i--) {
+        const id = page[i];
+        if (id === CONST.PAGINATION_END_ID) {
+            return {id, index: sortedItems.length - 1};
+        }
+        const index = sortedItems.findIndex((item) => getID(item) === id);
+        if (index !== -1) {
+            return {id, index};
+        }
+    }
+    return null;
+}
+
+/**
+ * Finds the index and id of the first and last items of each page in `sortedItems`.
+ */
+function getPagesWithIndexes<TResource>(sortedItems: TResource[], pages: Pages, getID: (item: TResource) => string): PageWithIndex[] {
+    return pages
+        .map((page) => {
+            let firstItem = findFirstItem(sortedItems, page, getID);
+            let lastItem = findLastItem(sortedItems, page, getID);
+
+            // If all actions in the page are not found it will be removed.
+            if (firstItem === null || lastItem === null) {
+                return null;
+            }
+
+            // In case actions were reordered, we need to swap them.
+            if (firstItem.index > lastItem.index) {
+                const temp = firstItem;
+                firstItem = lastItem;
+                lastItem = temp;
+            }
+
+            const ids = sortedItems.slice(firstItem.index, lastItem.index + 1).map((item) => getID(item));
+            if (firstItem.id === CONST.PAGINATION_START_ID) {
+                ids.unshift(CONST.PAGINATION_START_ID);
+            }
+            if (lastItem.id === CONST.PAGINATION_END_ID) {
+                ids.push(CONST.PAGINATION_END_ID);
+            }
+
+            return {
+                ids,
+                firstID: firstItem.id,
+                firstIndex: firstItem.index,
+                lastID: lastItem.id,
+                lastIndex: lastItem.index,
+            };
+        })
+        .filter((page): page is PageWithIndex => page !== null);
+}
+
+/**
+ * Given a sorted array of items and an array of Pages of item IDs, find any overlapping pages and merge them together.
+ */
+function mergeAndSortContinuousPages<TResource>(sortedItems: TResource[], pages: Pages, getItemID: (item: TResource) => string): Pages {
+    const pagesWithIndexes = getPagesWithIndexes(sortedItems, pages, getItemID);
+    if (pagesWithIndexes.length === 0) {
+        return [];
+    }
+
+    // Pages need to be sorted by firstIndex ascending then by lastIndex descending
+    const sortedPages = pagesWithIndexes.sort((a, b) => {
+        if (a.firstIndex !== b.firstIndex || a.firstID !== b.firstID) {
+            if (a.firstID === CONST.PAGINATION_START_ID) {
+                return -1;
+            }
+            return a.firstIndex - b.firstIndex;
+        }
+        if (a.lastID === CONST.PAGINATION_END_ID) {
+            return 1;
+        }
+        return b.lastIndex - a.lastIndex;
+    });
+
+    const result = [sortedPages[0]];
+    for (let i = 1; i < sortedPages.length; i++) {
+        const page = sortedPages[i];
+        const prevPage = result[result.length - 1];
+
+        // Current page is inside the previous page, skip
+        if (page.lastIndex <= prevPage.lastIndex && page.lastID !== CONST.PAGINATION_END_ID) {
+            // eslint-disable-next-line no-continue
+            continue;
+        }
+
+        // Current page overlaps with the previous page, merge.
+        // This happens if the ids from the current page and previous page are the same or if the indexes overlap
+        if (page.firstID === prevPage.lastID || page.firstIndex < prevPage.lastIndex) {
+            result[result.length - 1] = {
+                firstID: prevPage.firstID,
+                firstIndex: prevPage.firstIndex,
+                lastID: page.lastID,
+                lastIndex: page.lastIndex,
+                // Only add items from prevPage that are not included in page in case of overlap.
+                ids: prevPage.ids.slice(0, prevPage.ids.indexOf(page.firstID)).concat(page.ids),
+            };
+            // eslint-disable-next-line no-continue
+            continue;
+        }
+
+        // No overlap, add the current page as is.
+        result.push(page);
+    }
+
+    return result.map((page) => page.ids);
+}
+
+/**
+ * Returns the page of items that contains the item with the given ID, or the first page if null.
+ * See unit tests for example of inputs and expected outputs.
+ *
+ * Note: sortedItems should be sorted in descending order.
+ */
+function getContinuousChain<TResource>(sortedItems: TResource[], pages: Pages, getID: (item: TResource) => string, id?: string): TResource[] {
+    if (pages.length === 0) {
+        return id ? [] : sortedItems;
+    }
+
+    const pagesWithIndexes = getPagesWithIndexes(sortedItems, pages, getID);
+
+    let page: PageWithIndex;
+
+    if (id) {
+        const index = sortedItems.findIndex((item) => getID(item) === id);
+
+        // If we are linking to an action that doesn't exist in Onyx, return an empty array
+        if (index === -1) {
+            return [];
+        }
+
+        const linkedPage = pagesWithIndexes.find((pageIndex) => index >= pageIndex.firstIndex && index <= pageIndex.lastIndex);
+
+        // If we are linked to an action in a gap return it by itself
+        if (!linkedPage) {
+            return [sortedItems[index]];
+        }
+
+        page = linkedPage;
+    } else {
+        page = pagesWithIndexes[0];
+    }
+
+    return page ? sortedItems.slice(page.firstIndex, page.lastIndex + 1) : sortedItems;
+}
+
+export default {mergeAndSortContinuousPages, getContinuousChain};
diff --git a/src/libs/Parser.ts b/src/libs/Parser.ts
new file mode 100644
index 000000000000..9d791b1d4f7b
--- /dev/null
+++ b/src/libs/Parser.ts
@@ -0,0 +1,55 @@
+// eslint-disable-next-line no-restricted-imports
+import {ExpensiMark} from 'expensify-common';
+import Onyx from 'react-native-onyx';
+import ONYXKEYS from '@src/ONYXKEYS';
+import Log from './Log';
+import * as ReportConnection from './ReportConnection';
+
+const accountIDToNameMap: Record<string, string> = {};
+
+Onyx.connect({
+    key: ONYXKEYS.PERSONAL_DETAILS_LIST,
+    callback: (personalDetailsList) => {
+        Object.values(personalDetailsList ?? {}).forEach((personalDetails) => {
+            if (!personalDetails) {
+                return;
+            }
+
+            accountIDToNameMap[personalDetails.accountID] = personalDetails.login ?? personalDetails.displayName ?? '';
+        });
+    },
+});
+
+type Extras = {
+    reportIDToName?: Record<string, string>;
+    accountIDToName?: Record<string, string>;
+    cacheVideoAttributes?: (vidSource: string, attrs: string) => void;
+    videoAttributeCache?: Record<string, string>;
+};
+
+class ExpensiMarkWithContext extends ExpensiMark {
+    htmlToMarkdown(htmlString: string, extras?: Extras): string {
+        return super.htmlToMarkdown(htmlString, {
+            reportIDToName: extras?.reportIDToName ?? ReportConnection.getAllReportsNameMap(),
+            accountIDToName: extras?.accountIDToName ?? accountIDToNameMap,
+            cacheVideoAttributes: extras?.cacheVideoAttributes,
+        });
+    }
+
+    htmlToText(htmlString: string, extras?: Extras): string {
+        return super.htmlToText(htmlString, {
+            reportIDToName: extras?.reportIDToName ?? ReportConnection.getAllReportsNameMap(),
+            accountIDToName: extras?.accountIDToName ?? accountIDToNameMap,
+            cacheVideoAttributes: extras?.cacheVideoAttributes,
+        });
+    }
+
+    truncateHTML(htmlString: string, limit: number, extras?: {ellipsis: string | undefined}): string {
+        return super.truncateHTML(htmlString, limit, extras);
+    }
+}
+
+ExpensiMarkWithContext.setLogger(Log);
+const Parser = new ExpensiMarkWithContext();
+
+export default Parser;
diff --git a/src/libs/PaymentUtils.ts b/src/libs/PaymentUtils.ts
index 60dac04a09ac..c18ebd217406 100644
--- a/src/libs/PaymentUtils.ts
+++ b/src/libs/PaymentUtils.ts
@@ -1,13 +1,15 @@
+import type {ValueOf} from 'type-fest';
 import getBankIcon from '@components/Icon/BankIcons';
 import type {ThemeStyles} from '@styles/index';
 import CONST from '@src/CONST';
 import type BankAccount from '@src/types/onyx/BankAccount';
 import type Fund from '@src/types/onyx/Fund';
 import type PaymentMethod from '@src/types/onyx/PaymentMethod';
+import type {ACHAccount} from '@src/types/onyx/Policy';
 import * as Localize from './Localize';
 import BankAccountModel from './models/BankAccount';
 
-type AccountType = BankAccount['accountType'] | Fund['accountType'];
+type AccountType = ValueOf<typeof CONST.PAYMENT_METHODS> | undefined;
 
 /**
  * Check to see if user has either a debit card or personal bank account added that can be used with a wallet.
@@ -25,11 +27,14 @@ function hasExpensifyPaymentMethod(fundList: Record<string, Fund>, bankAccountLi
     return validBankAccount || (shouldIncludeDebitCard && validDebitCard);
 }
 
-function getPaymentMethodDescription(accountType: AccountType, account: BankAccount['accountData'] | Fund['accountData']): string {
+function getPaymentMethodDescription(accountType: AccountType, account: BankAccount['accountData'] | Fund['accountData'] | ACHAccount): string {
     if (account) {
         if (accountType === CONST.PAYMENT_METHODS.PERSONAL_BANK_ACCOUNT && 'accountNumber' in account) {
             return `${Localize.translateLocal('paymentMethodList.accountLastFour')} ${account.accountNumber?.slice(-4)}`;
         }
+        if (accountType === CONST.PAYMENT_METHODS.BUSINESS_BANK_ACCOUNT && 'accountNumber' in account) {
+            return `${Localize.translateLocal('paymentMethodList.accountLastFour')} ${account.accountNumber?.slice(-4)}`;
+        }
         if (accountType === CONST.PAYMENT_METHODS.DEBIT_CARD && 'cardNumber' in account) {
             return `${Localize.translateLocal('paymentMethodList.cardLastFour')} ${account.cardNumber?.slice(-4)}`;
         }
diff --git a/src/libs/Performance.tsx b/src/libs/Performance.tsx
index 9302b538a621..ef2b08e47229 100644
--- a/src/libs/Performance.tsx
+++ b/src/libs/Performance.tsx
@@ -3,7 +3,7 @@ import isObject from 'lodash/isObject';
 import lodashTransform from 'lodash/transform';
 import React, {forwardRef, Profiler} from 'react';
 import {Alert, InteractionManager} from 'react-native';
-import type {PerformanceEntry, PerformanceMark, PerformanceMeasure, Performance as RNPerformance} from 'react-native-performance';
+import type {PerformanceEntry, PerformanceMark, PerformanceMeasure, ReactNativePerformance, Performance as RNPerformance} from 'react-native-performance';
 import type {PerformanceObserverEntryList} from 'react-native-performance/lib/typescript/performance-observer';
 import CONST from '@src/CONST';
 import isE2ETestSession from './E2E/isE2ETestSession';
@@ -86,7 +86,7 @@ const Performance: PerformanceModule = {
 };
 
 if (Metrics.canCapturePerformanceMetrics()) {
-    const perfModule = require('react-native-performance');
+    const perfModule = require<ReactNativePerformance>('react-native-performance');
     perfModule.setResourceLoggingEnabled(true);
     rnPerformance = perfModule.default;
 
diff --git a/src/libs/Permissions.ts b/src/libs/Permissions.ts
index 79955c0fdf30..466a0418910c 100644
--- a/src/libs/Permissions.ts
+++ b/src/libs/Permissions.ts
@@ -7,24 +7,12 @@ function canUseAllBetas(betas: OnyxEntry<Beta[]>): boolean {
     return !!betas?.includes(CONST.BETAS.ALL);
 }
 
-function canUseChronos(betas: OnyxEntry<Beta[]>): boolean {
-    return !!betas?.includes(CONST.BETAS.CHRONOS_IN_CASH) || canUseAllBetas(betas);
-}
-
 function canUseDefaultRooms(betas: OnyxEntry<Beta[]>): boolean {
     return !!betas?.includes(CONST.BETAS.DEFAULT_ROOMS) || canUseAllBetas(betas);
 }
 
-function canUseReportFields(betas: OnyxEntry<Beta[]>): boolean {
-    return !!betas?.includes(CONST.BETAS.REPORT_FIELDS) || canUseAllBetas(betas);
-}
-
-function canUseViolations(betas: OnyxEntry<Beta[]>): boolean {
-    return !!betas?.includes(CONST.BETAS.VIOLATIONS) || canUseAllBetas(betas);
-}
-
-function canUseTrackExpense(betas: OnyxEntry<Beta[]>): boolean {
-    return !!betas?.includes(CONST.BETAS.TRACK_EXPENSE) || canUseAllBetas(betas);
+function canUseDupeDetection(betas: OnyxEntry<Beta[]>): boolean {
+    return !!betas?.includes(CONST.BETAS.DUPE_DETECTION) || canUseAllBetas(betas);
 }
 
 function canUseP2PDistanceRequests(betas: OnyxEntry<Beta[]>, iouType: IOUType | undefined): boolean {
@@ -32,20 +20,33 @@ function canUseP2PDistanceRequests(betas: OnyxEntry<Beta[]>, iouType: IOUType |
     return !!betas?.includes(CONST.BETAS.P2P_DISTANCE_REQUESTS) || canUseAllBetas(betas) || iouType === CONST.IOU.TYPE.TRACK;
 }
 
-function canUseWorkflowsDelayedSubmission(betas: OnyxEntry<Beta[]>): boolean {
-    return !!betas?.includes(CONST.BETAS.WORKFLOWS_DELAYED_SUBMISSION) || canUseAllBetas(betas);
+function canUseWorkflowsAdvancedApproval(betas: OnyxEntry<Beta[]>): boolean {
+    return !!betas?.includes(CONST.BETAS.WORKFLOWS_ADVANCED_APPROVAL) || canUseAllBetas(betas);
 }
 
 function canUseSpotnanaTravel(betas: OnyxEntry<Beta[]>): boolean {
     return !!betas?.includes(CONST.BETAS.SPOTNANA_TRAVEL) || canUseAllBetas(betas);
 }
 
-function canUseAccountingIntegrations(betas: OnyxEntry<Beta[]>): boolean {
-    return !!betas?.includes(CONST.BETAS.ACCOUNTING_ON_NEW_EXPENSIFY) || canUseAllBetas(betas);
+function canUseWorkspaceFeeds(betas: OnyxEntry<Beta[]>): boolean {
+    return !!betas?.includes(CONST.BETAS.WORKSPACE_FEEDS) || canUseAllBetas(betas);
+}
+
+function canUseNetSuiteUSATax(betas: OnyxEntry<Beta[]>): boolean {
+    return !!betas?.includes(CONST.BETAS.NETSUITE_USA_TAX) || canUseAllBetas(betas);
+}
+
+function canUseNewDotCopilot(betas: OnyxEntry<Beta[]>): boolean {
+    return !!betas?.includes(CONST.BETAS.NEW_DOT_COPILOT) || canUseAllBetas(betas);
+}
+
+function canUseWorkspaceRules(betas: OnyxEntry<Beta[]>): boolean {
+    return !!betas?.includes(CONST.BETAS.WORKSPACE_RULES) || canUseAllBetas(betas);
 }
 
-function canUseXeroIntegration(betas: OnyxEntry<Beta[]>): boolean {
-    return !!betas?.includes(CONST.BETAS.XERO_ON_NEW_EXPENSIFY) || canUseAllBetas(betas);
+function canUseCombinedTrackSubmit(betas: OnyxEntry<Beta[]>): boolean {
+    // We don't need to show this to all betas since this will be used for developing a feature for A/B testing.
+    return !!betas?.includes(CONST.BETAS.COMBINED_TRACK_SUBMIT);
 }
 
 /**
@@ -56,15 +57,15 @@ function canUseLinkPreviews(): boolean {
 }
 
 export default {
-    canUseChronos,
     canUseDefaultRooms,
     canUseLinkPreviews,
-    canUseViolations,
-    canUseTrackExpense,
-    canUseReportFields,
+    canUseDupeDetection,
     canUseP2PDistanceRequests,
-    canUseWorkflowsDelayedSubmission,
+    canUseWorkflowsAdvancedApproval,
     canUseSpotnanaTravel,
-    canUseAccountingIntegrations,
-    canUseXeroIntegration,
+    canUseWorkspaceFeeds,
+    canUseNetSuiteUSATax,
+    canUseNewDotCopilot,
+    canUseWorkspaceRules,
+    canUseCombinedTrackSubmit,
 };
diff --git a/src/libs/PersonalDetailsUtils.ts b/src/libs/PersonalDetailsUtils.ts
index ffa0605f1eba..fe3ea7de3bac 100644
--- a/src/libs/PersonalDetailsUtils.ts
+++ b/src/libs/PersonalDetailsUtils.ts
@@ -1,10 +1,10 @@
-import Str from 'expensify-common/lib/str';
+import {Str} from 'expensify-common';
 import type {OnyxEntry, OnyxUpdate} from 'react-native-onyx';
 import Onyx from 'react-native-onyx';
-import type {CurrentUserPersonalDetails} from '@components/withCurrentUserPersonalDetails';
 import CONST from '@src/CONST';
 import ONYXKEYS from '@src/ONYXKEYS';
-import type {PersonalDetails, PersonalDetailsList, PrivatePersonalDetails} from '@src/types/onyx';
+import type {OnyxInputOrEntry, PersonalDetails, PersonalDetailsList, PrivatePersonalDetails} from '@src/types/onyx';
+import type {Address} from '@src/types/onyx/PrivatePersonalDetails';
 import type {OnyxData} from '@src/types/onyx/Request';
 import {isEmptyObject} from '@src/types/utils/EmptyObject';
 import * as LocalePhoneNumber from './LocalePhoneNumber';
@@ -33,13 +33,29 @@ Onyx.connect({
     },
 });
 
+let hiddenTranslation = '';
+let youTranslation = '';
+
+Onyx.connect({
+    key: ONYXKEYS.NVP_PREFERRED_LOCALE,
+    callback: (value) => {
+        if (!value) {
+            return;
+        }
+        hiddenTranslation = Localize.translateLocal('common.hidden');
+        youTranslation = Localize.translateLocal('common.you').toLowerCase();
+    },
+});
+
+const regexMergedAccount = new RegExp(CONST.REGEX.MERGED_ACCOUNT_PREFIX);
+
 function getDisplayNameOrDefault(passedPersonalDetails?: Partial<PersonalDetails> | null, defaultValue = '', shouldFallbackToHidden = true, shouldAddCurrentUserPostfix = false): string {
     let displayName = passedPersonalDetails?.displayName ?? '';
 
     // If the displayName starts with the merged account prefix, remove it.
-    if (displayName.startsWith(CONST.MERGED_ACCOUNT_PREFIX)) {
+    if (regexMergedAccount.test(displayName)) {
         // Remove the merged account prefix from the displayName.
-        displayName = displayName.substring(CONST.MERGED_ACCOUNT_PREFIX.length);
+        displayName = displayName.replace(CONST.REGEX.MERGED_ACCOUNT_PREFIX, '');
     }
 
     // If the displayName is not set by the user, the backend sets the diplayName same as the login so
@@ -49,13 +65,17 @@ function getDisplayNameOrDefault(passedPersonalDetails?: Partial<PersonalDetails
     }
 
     if (shouldAddCurrentUserPostfix && !!displayName) {
-        displayName = `${displayName} (${Localize.translateLocal('common.you').toLowerCase()})`;
+        displayName = `${displayName} (${youTranslation})`;
+    }
+
+    if (passedPersonalDetails?.accountID === CONST.ACCOUNT_ID.CONCIERGE) {
+        displayName = CONST.CONCIERGE_DISPLAY_NAME;
     }
 
     if (displayName) {
         return displayName;
     }
-    return defaultValue || (shouldFallbackToHidden ? Localize.translateLocal('common.hidden') : '');
+    return defaultValue || (shouldFallbackToHidden ? hiddenTranslation : '');
 }
 
 /**
@@ -115,7 +135,7 @@ function getAccountIDsByLogins(logins: string[]): number[] {
  */
 function getLoginsByAccountIDs(accountIDs: number[]): string[] {
     return accountIDs.reduce((foundLogins: string[], accountID) => {
-        const currentDetail: Partial<PersonalDetails> = personalDetails.find((detail) => Number(detail?.accountID) === Number(accountID)) ?? {};
+        const currentDetail: Partial<PersonalDetails> = allPersonalDetails?.[accountID] ?? {};
         if (currentDetail.login) {
             foundLogins.push(currentDetail.login);
         }
@@ -153,8 +173,8 @@ function getPersonalDetailsOnyxDataForOptimisticUsers(newLogins: string[], newAc
         personalDetailsNew[accountID] = {
             login,
             accountID,
-            avatar: UserUtils.getDefaultAvatarURL(accountID),
             displayName: LocalePhoneNumber.formatPhoneNumber(login),
+            isOptimisticPersonalDetail: true,
         };
 
         /**
@@ -216,6 +236,18 @@ function getStreetLines(street = '') {
     return [streets[0], streets[1]];
 }
 
+/**
+ * Get the current address from addresses array
+ *
+ * @param privatePersonalDetails - details object
+ * @returns - current address object
+ */
+function getCurrentAddress(privatePersonalDetails: OnyxEntry<PrivatePersonalDetails>): Address | undefined {
+    const {addresses} = privatePersonalDetails ?? {};
+    const currentAddress = addresses?.find((address) => address.current);
+    return currentAddress ?? addresses?.[addresses.length - 1];
+}
+
 /**
  * Formats an address object into an easily readable string
  *
@@ -223,7 +255,7 @@ function getStreetLines(street = '') {
  * @returns - formatted address
  */
 function getFormattedAddress(privatePersonalDetails: OnyxEntry<PrivatePersonalDetails>): string {
-    const {address} = privatePersonalDetails ?? {};
+    const address = getCurrentAddress(privatePersonalDetails);
     const [street1, street2] = getStreetLines(address?.street);
     const formattedAddress =
         formatPiece(street1) + formatPiece(street2) + formatPiece(address?.city) + formatPiece(address?.state) + formatPiece(address?.zip) + formatPiece(address?.country);
@@ -247,7 +279,7 @@ function getEffectiveDisplayName(personalDetail?: PersonalDetails): string | und
 /**
  * Creates a new displayName for a user based on passed personal details or login.
  */
-function createDisplayName(login: string, passedPersonalDetails: Pick<PersonalDetails, 'firstName' | 'lastName'> | OnyxEntry<PersonalDetails>): string {
+function createDisplayName(login: string, passedPersonalDetails: Pick<PersonalDetails, 'firstName' | 'lastName'> | OnyxInputOrEntry<PersonalDetails>): string {
     // If we have a number like +15857527441@expensify.sms then let's remove @expensify.sms and format it
     // so that the option looks cleaner in our UI.
     const userLogin = LocalePhoneNumber.formatPhoneNumber(login);
@@ -269,7 +301,7 @@ function createDisplayName(login: string, passedPersonalDetails: Pick<PersonalDe
  * If the login is the same as the displayName, then they don't exist,
  * so we return empty strings instead.
  */
-function extractFirstAndLastNameFromAvailableDetails({login, displayName, firstName, lastName}: CurrentUserPersonalDetails): FirstAndLastName {
+function extractFirstAndLastNameFromAvailableDetails({login, displayName, firstName, lastName}: PersonalDetails): FirstAndLastName {
     // It's possible for firstName to be empty string, so we must use "||" to consider lastName instead.
     // eslint-disable-next-line @typescript-eslint/prefer-nullish-coalescing
     if (firstName || lastName) {
@@ -302,6 +334,10 @@ function isPersonalDetailsEmpty() {
     return !personalDetails.length;
 }
 
+function getPersonalDetailsLength() {
+    return personalDetails.length;
+}
+
 export {
     isPersonalDetailsEmpty,
     getDisplayNameOrDefault,
@@ -310,6 +346,7 @@ export {
     getAccountIDsByLogins,
     getLoginsByAccountIDs,
     getPersonalDetailsOnyxDataForOptimisticUsers,
+    getCurrentAddress,
     getFormattedAddress,
     getFormattedStreet,
     getStreetLines,
@@ -317,4 +354,5 @@ export {
     createDisplayName,
     extractFirstAndLastNameFromAvailableDetails,
     getNewAccountIDsAndLogins,
+    getPersonalDetailsLength,
 };
diff --git a/src/libs/PhoneNumber.ts b/src/libs/PhoneNumber.ts
index 787b3634030a..84ef35a18489 100644
--- a/src/libs/PhoneNumber.ts
+++ b/src/libs/PhoneNumber.ts
@@ -1,7 +1,7 @@
 // eslint-disable-next-line no-restricted-imports
 import {parsePhoneNumber as originalParsePhoneNumber} from 'awesome-phonenumber';
 import type {ParsedPhoneNumber, ParsedPhoneNumberInvalid, PhoneNumberParseOptions} from 'awesome-phonenumber';
-import Str from 'expensify-common/lib/str';
+import {Str} from 'expensify-common';
 import CONST from '@src/CONST';
 
 /**
diff --git a/src/libs/PolicyDistanceRatesUtils.ts b/src/libs/PolicyDistanceRatesUtils.ts
index db739cc3b8c7..7e2c0bb83320 100644
--- a/src/libs/PolicyDistanceRatesUtils.ts
+++ b/src/libs/PolicyDistanceRatesUtils.ts
@@ -4,11 +4,14 @@ import type ONYXKEYS from '@src/ONYXKEYS';
 import type {Rate} from '@src/types/onyx/Policy';
 import * as CurrencyUtils from './CurrencyUtils';
 import getPermittedDecimalSeparator from './getPermittedDecimalSeparator';
+import * as Localize from './Localize';
 import * as MoneyRequestUtils from './MoneyRequestUtils';
 import * as NumberUtils from './NumberUtils';
 
 type RateValueForm = typeof ONYXKEYS.FORMS.WORKSPACE_RATE_AND_UNIT_FORM | typeof ONYXKEYS.FORMS.POLICY_CREATE_DISTANCE_RATE_FORM | typeof ONYXKEYS.FORMS.POLICY_DISTANCE_RATE_EDIT_FORM;
 
+type TaxReclaimableForm = typeof ONYXKEYS.FORMS.POLICY_DISTANCE_RATE_TAX_RECLAIMABLE_ON_EDIT_FORM;
+
 function validateRateValue(values: FormOnyxValues<RateValueForm>, currency: string, toLocaleDigit: (arg: string) => string): FormInputErrors<RateValueForm> {
     const errors: FormInputErrors<RateValueForm> = {};
     const parsedRate = MoneyRequestUtils.replaceAllDigits(values.rate, toLocaleDigit);
@@ -17,9 +20,18 @@ function validateRateValue(values: FormOnyxValues<RateValueForm>, currency: stri
     // Allow one more decimal place for accuracy
     const rateValueRegex = RegExp(String.raw`^-?\d{0,8}([${getPermittedDecimalSeparator(decimalSeparator)}]\d{0,${CurrencyUtils.getCurrencyDecimals(currency) + 1}})?$`, 'i');
     if (!rateValueRegex.test(parsedRate) || parsedRate === '') {
-        errors.rate = 'workspace.reimburse.invalidRateError';
+        errors.rate = Localize.translateLocal('workspace.reimburse.invalidRateError');
     } else if (NumberUtils.parseFloatAnyLocale(parsedRate) <= 0) {
-        errors.rate = 'workspace.reimburse.lowRateError';
+        errors.rate = Localize.translateLocal('workspace.reimburse.lowRateError');
+    }
+    return errors;
+}
+
+function validateTaxClaimableValue(values: FormOnyxValues<TaxReclaimableForm>, rate: Rate): FormInputErrors<TaxReclaimableForm> {
+    const errors: FormInputErrors<TaxReclaimableForm> = {};
+
+    if (rate.rate && Number(values.taxClaimableValue) > rate.rate / 100) {
+        errors.taxClaimableValue = Localize.translateLocal('workspace.taxes.error.updateTaxClaimableFailureMessage');
     }
     return errors;
 }
@@ -33,4 +45,4 @@ function getOptimisticRateName(rates: Record<string, Rate>): string {
     return existingRatesWithSameName.length ? `${CONST.CUSTOM_UNITS.DEFAULT_RATE} ${existingRatesWithSameName.length}` : CONST.CUSTOM_UNITS.DEFAULT_RATE;
 }
 
-export {validateRateValue, getOptimisticRateName};
+export {validateRateValue, getOptimisticRateName, validateTaxClaimableValue};
diff --git a/src/libs/PolicyUtils.ts b/src/libs/PolicyUtils.ts
index f886558c54f6..2ed6443b243e 100644
--- a/src/libs/PolicyUtils.ts
+++ b/src/libs/PolicyUtils.ts
@@ -1,23 +1,52 @@
-import Str from 'expensify-common/lib/str';
+import {Str} from 'expensify-common';
 import type {OnyxCollection, OnyxEntry} from 'react-native-onyx';
 import Onyx from 'react-native-onyx';
 import type {ValueOf} from 'type-fest';
+import type {LocaleContextProps} from '@components/LocaleContextProvider';
+import type {SelectorType} from '@components/SelectionScreen';
 import CONST from '@src/CONST';
 import ONYXKEYS from '@src/ONYXKEYS';
 import ROUTES from '@src/ROUTES';
-import type {Policy, PolicyCategories, PolicyEmployeeList, PolicyTagList, PolicyTags, TaxRate} from '@src/types/onyx';
-import type {PolicyFeatureName, Rate, Tenant} from '@src/types/onyx/Policy';
+import INPUT_IDS from '@src/types/form/NetSuiteCustomFieldForm';
+import type {OnyxInputOrEntry, Policy, PolicyCategories, PolicyEmployeeList, PolicyTagLists, PolicyTags, TaxRate} from '@src/types/onyx';
+import type {ErrorFields, PendingAction, PendingFields} from '@src/types/onyx/OnyxCommon';
+import type {
+    ConnectionLastSync,
+    ConnectionName,
+    Connections,
+    CustomUnit,
+    InvoiceItem,
+    NetSuiteAccount,
+    NetSuiteConnection,
+    NetSuiteCustomList,
+    NetSuiteCustomSegment,
+    NetSuiteTaxAccount,
+    NetSuiteVendor,
+    PolicyConnectionSyncProgress,
+    PolicyFeatureName,
+    Rate,
+    Tenant,
+} from '@src/types/onyx/Policy';
 import type PolicyEmployee from '@src/types/onyx/PolicyEmployee';
-import type {EmptyObject} from '@src/types/utils/EmptyObject';
 import {isEmptyObject} from '@src/types/utils/EmptyObject';
-import getPolicyIDFromState from './Navigation/getPolicyIDFromState';
-import Navigation, {navigationRef} from './Navigation/Navigation';
-import type {RootStackParamList, State} from './Navigation/types';
+import {getSynchronizationErrorMessage} from './actions/connections';
+import * as Localize from './Localize';
+import Navigation from './Navigation/Navigation';
 import * as NetworkStore from './Network/NetworkStore';
 import {getAccountIDsByLogins, getLoginsByAccountIDs, getPersonalDetailByEmail} from './PersonalDetailsUtils';
 
 type MemberEmailsToAccountIDs = Record<string, number>;
 
+type WorkspaceDetails = {
+    policyID: string | undefined;
+    name: string;
+};
+
+type ConnectionWithLastSyncData = {
+    /** State of the last synchronization */
+    lastSync?: ConnectionLastSync;
+};
+
 let allPolicies: OnyxCollection<Policy>;
 
 Onyx.connect({
@@ -30,9 +59,9 @@ Onyx.connect({
  * 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.
  */
-function getActivePolicies(policies: OnyxCollection<Policy>): Policy[] {
+function getActivePolicies(policies: OnyxCollection<Policy> | null): Policy[] {
     return Object.values(policies ?? {}).filter<Policy>(
-        (policy): policy is Policy => policy !== null && policy && policy.pendingAction !== CONST.RED_BRICK_ROAD_PENDING_ACTION.DELETE && !!policy.name && !!policy.id,
+        (policy): policy is Policy => !!policy && policy.pendingAction !== CONST.RED_BRICK_ROAD_PENDING_ACTION.DELETE && !!policy.name && !!policy.id,
     );
 }
 
@@ -57,6 +86,13 @@ function hasPolicyCategoriesError(policyCategories: OnyxEntry<PolicyCategories>)
     return Object.keys(policyCategories ?? {}).some((categoryName) => Object.keys(policyCategories?.[categoryName]?.errors ?? {}).length > 0);
 }
 
+/**
+ * Checks if the policy had a sync error.
+ */
+function hasSyncError(policy: OnyxEntry<Policy>): boolean {
+    return (Object.keys(policy?.connections ?? {}) as ConnectionName[]).some((connection) => !!getSynchronizationErrorMessage(policy, connection, false));
+}
+
 /**
  * Check if the policy has any error fields.
  */
@@ -86,23 +122,45 @@ function getNumericValue(value: number | string, toLocaleDigit: (arg: string) =>
     return numValue.toFixed(CONST.CUSTOM_UNITS.RATE_DECIMALS);
 }
 
-function getRateDisplayValue(value: number, toLocaleDigit: (arg: string) => string): string {
+/**
+ * Retrieves the distance custom unit object for the given policy
+ */
+function getCustomUnit(policy: OnyxEntry<Policy>): CustomUnit | undefined {
+    return Object.values(policy?.customUnits ?? {}).find((unit) => unit.name === CONST.CUSTOM_UNITS.NAME_DISTANCE);
+}
+
+/**
+ * Retrieves custom unit rate object from the given customUnitRateID
+ */
+function getCustomUnitRate(policy: OnyxEntry<Policy>, customUnitRateID: string): Rate | undefined {
+    const distanceUnit = getCustomUnit(policy);
+    return distanceUnit?.rates[customUnitRateID];
+}
+
+function getRateDisplayValue(value: number, toLocaleDigit: (arg: string) => string, withDecimals?: boolean): string {
     const numValue = getNumericValue(value, toLocaleDigit);
     if (Number.isNaN(numValue)) {
         return '';
     }
+
+    if (withDecimals) {
+        const decimalPart = numValue.toString().split('.')[1];
+        const fixedDecimalPoints = decimalPart.length > 2 && !decimalPart.endsWith('0') ? 3 : 2;
+        return Number(numValue).toFixed(fixedDecimalPoints).toString().replace('.', toLocaleDigit('.'));
+    }
+
     return numValue.toString().replace('.', toLocaleDigit('.')).substring(0, value.toString().length);
 }
 
-function getUnitRateValue(toLocaleDigit: (arg: string) => string, customUnitRate?: Rate) {
-    return getRateDisplayValue((customUnitRate?.rate ?? 0) / CONST.POLICY.CUSTOM_UNIT_RATE_BASE_OFFSET, toLocaleDigit);
+function getUnitRateValue(toLocaleDigit: (arg: string) => string, customUnitRate?: Rate, withDecimals?: boolean) {
+    return getRateDisplayValue((customUnitRate?.rate ?? 0) / CONST.POLICY.CUSTOM_UNIT_RATE_BASE_OFFSET, toLocaleDigit, withDecimals);
 }
 
 /**
  * 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.
  */
 function getPolicyBrickRoadIndicatorStatus(policy: OnyxEntry<Policy>): ValueOf<typeof CONST.BRICK_ROAD_INDICATOR_STATUS> | undefined {
-    if (hasEmployeeListError(policy) || hasCustomUnitsError(policy) || hasPolicyErrorFields(policy)) {
+    if (hasEmployeeListError(policy) || hasCustomUnitsError(policy) || hasPolicyErrorFields(policy) || hasSyncError(policy)) {
         return CONST.BRICK_ROAD_INDICATOR_STATUS.ERROR;
     }
     return undefined;
@@ -118,8 +176,9 @@ function getPolicyBrickRoadIndicatorStatus(policy: OnyxEntry<Policy>): ValueOf<t
 function shouldShowPolicy(policy: OnyxEntry<Policy>, isOffline: boolean): boolean {
     return (
         !!policy &&
-        (policy?.isPolicyExpenseChatEnabled || Boolean(policy?.isJoinRequestPending)) &&
-        (isOffline || policy?.pendingAction !== CONST.RED_BRICK_ROAD_PENDING_ACTION.DELETE || Object.keys(policy.errors ?? {}).length > 0)
+        (policy?.type !== CONST.POLICY.TYPE.PERSONAL || !!policy?.isJoinRequestPending) &&
+        (isOffline || policy?.pendingAction !== CONST.RED_BRICK_ROAD_PENDING_ACTION.DELETE || Object.keys(policy.errors ?? {}).length > 0) &&
+        !!policy?.role
     );
 }
 
@@ -131,32 +190,41 @@ function isExpensifyTeam(email: string | undefined): boolean {
 /**
  * Checks if the current user is an admin of the policy.
  */
-const isPolicyAdmin = (policy: OnyxEntry<Policy> | EmptyObject): boolean => policy?.role === CONST.POLICY.ROLE.ADMIN;
+const isPolicyAdmin = (policy: OnyxInputOrEntry<Policy>, currentUserLogin?: string): boolean =>
+    (policy?.role ?? (currentUserLogin && policy?.employeeList?.[currentUserLogin]?.role)) === CONST.POLICY.ROLE.ADMIN;
+
+/**
+ * Checks if the current user is of the role "user" on the policy.
+ */
+const isPolicyUser = (policy: OnyxInputOrEntry<Policy>, currentUserLogin?: string): boolean =>
+    (policy?.role ?? (currentUserLogin && policy?.employeeList?.[currentUserLogin]?.role)) === CONST.POLICY.ROLE.USER;
 
 /**
  * Checks if the policy is a free group policy.
  */
-const isFreeGroupPolicy = (policy: OnyxEntry<Policy> | EmptyObject): boolean => policy?.type === CONST.POLICY.TYPE.FREE;
+const isFreeGroupPolicy = (policy: OnyxEntry<Policy>): boolean => policy?.type === CONST.POLICY.TYPE.FREE;
 
 const isPolicyEmployee = (policyID: string, policies: OnyxCollection<Policy>): boolean => Object.values(policies ?? {}).some((policy) => policy?.id === policyID);
 
 /**
  * Checks if the current user is an owner (creator) of the policy.
  */
-const isPolicyOwner = (policy: OnyxEntry<Policy> | EmptyObject, currentUserAccountID: number): boolean => policy?.ownerAccountID === currentUserAccountID;
+const isPolicyOwner = (policy: OnyxInputOrEntry<Policy>, currentUserAccountID: number): boolean => policy?.ownerAccountID === currentUserAccountID;
 
 /**
- * Create an object mapping member emails to their accountIDs. Filter for members without errors, and get the login email from the personalDetail object using the accountID.
+ * Create an object mapping member emails to their accountIDs. Filter for members without errors if includeMemberWithErrors is false, and get the login email from the personalDetail object using the accountID.
  *
- * We only return members without errors. Otherwise, the members with errors would immediately be removed before the user has a chance to read the error.
+ * If includeMemberWithErrors is false, We only return members without errors. Otherwise, the members with errors would immediately be removed before the user has a chance to read the error.
  */
-function getMemberAccountIDsForWorkspace(employeeList: PolicyEmployeeList | undefined): MemberEmailsToAccountIDs {
+function getMemberAccountIDsForWorkspace(employeeList: PolicyEmployeeList | undefined, includeMemberWithErrors = false): MemberEmailsToAccountIDs {
     const members = employeeList ?? {};
     const memberEmailsToAccountIDs: MemberEmailsToAccountIDs = {};
     Object.keys(members).forEach((email) => {
-        const member = members?.[email];
-        if (Object.keys(member?.errors ?? {})?.length > 0) {
-            return;
+        if (!includeMemberWithErrors) {
+            const member = members?.[email];
+            if (Object.keys(member?.errors ?? {})?.length > 0) {
+                return;
+            }
         }
         const personalDetail = getPersonalDetailByEmail(email);
         if (!personalDetail?.login) {
@@ -188,7 +256,7 @@ function getIneligibleInvitees(employeeList?: PolicyEmployeeList): string[] {
     return memberEmailsToExclude;
 }
 
-function getSortedTagKeys(policyTagList: OnyxEntry<PolicyTagList>): Array<keyof PolicyTagList> {
+function getSortedTagKeys(policyTagList: OnyxEntry<PolicyTagLists>): Array<keyof PolicyTagLists> {
     if (isEmptyObject(policyTagList)) {
         return [];
     }
@@ -199,17 +267,18 @@ function getSortedTagKeys(policyTagList: OnyxEntry<PolicyTagList>): Array<keyof
 /**
  * Gets a tag name of policy tags based on a tag's orderWeight.
  */
-function getTagListName(policyTagList: OnyxEntry<PolicyTagList>, orderWeight: number): string {
+function getTagListName(policyTagList: OnyxEntry<PolicyTagLists>, orderWeight: number): string {
     if (isEmptyObject(policyTagList)) {
         return '';
     }
 
     return Object.values(policyTagList).find((tag) => tag.orderWeight === orderWeight)?.name ?? '';
 }
+
 /**
  * Gets all tag lists of a policy
  */
-function getTagLists(policyTagList: OnyxEntry<PolicyTagList>): Array<PolicyTagList[keyof PolicyTagList]> {
+function getTagLists(policyTagList: OnyxEntry<PolicyTagLists>): Array<ValueOf<PolicyTagLists>> {
     if (isEmptyObject(policyTagList)) {
         return [];
     }
@@ -222,7 +291,7 @@ function getTagLists(policyTagList: OnyxEntry<PolicyTagList>): Array<PolicyTagLi
 /**
  * Gets a tag list of a policy by a tag index
  */
-function getTagList(policyTagList: OnyxEntry<PolicyTagList>, tagIndex: number): PolicyTagList[keyof PolicyTagList] {
+function getTagList(policyTagList: OnyxEntry<PolicyTagLists>, tagIndex: number): ValueOf<PolicyTagLists> {
     const tagLists = getTagLists(policyTagList);
 
     return (
@@ -234,11 +303,29 @@ function getTagList(policyTagList: OnyxEntry<PolicyTagList>, tagIndex: number):
     );
 }
 
+function getTagNamesFromTagsLists(policyTagLists: PolicyTagLists): string[] {
+    const uniqueTagNames = new Set<string>();
+
+    for (const policyTagList of Object.values(policyTagLists ?? {})) {
+        for (const tag of Object.values(policyTagList.tags)) {
+            uniqueTagNames.add(getCleanedTagName(tag.name));
+        }
+    }
+    return Array.from(uniqueTagNames);
+}
+
 /**
  * Cleans up escaping of colons (used to create multi-level tags, e.g. "Parent: Child") in the tag name we receive from the backend
  */
 function getCleanedTagName(tag: string) {
-    return tag?.replace(/\\{1,2}:/g, CONST.COLON);
+    return tag?.replace(/\\:/g, CONST.COLON);
+}
+
+/**
+ * Escape colon from tag name
+ */
+function escapeTagName(tag: string) {
+    return tag?.replaceAll(CONST.COLON, '\\:');
 }
 
 /**
@@ -248,33 +335,76 @@ function getCountOfEnabledTagsOfList(policyTags: PolicyTags) {
     return Object.values(policyTags).filter((policyTag) => policyTag.enabled).length;
 }
 
+/**
+ * Whether the policy has multi-level tags
+ */
+function isMultiLevelTags(policyTagList: OnyxEntry<PolicyTagLists>): boolean {
+    return Object.keys(policyTagList ?? {}).length > 1;
+}
+
 function isPendingDeletePolicy(policy: OnyxEntry<Policy>): boolean {
     return policy?.pendingAction === CONST.RED_BRICK_ROAD_PENDING_ACTION.DELETE;
 }
 
-function isPaidGroupPolicy(policy: OnyxEntry<Policy> | EmptyObject): boolean {
+function isPaidGroupPolicy(policy: OnyxEntry<Policy>): boolean {
     return policy?.type === CONST.POLICY.TYPE.TEAM || policy?.type === CONST.POLICY.TYPE.CORPORATE;
 }
 
-function isTaxTrackingEnabled(isPolicyExpenseChat: boolean, policy: OnyxEntry<Policy>): boolean {
-    return (isPolicyExpenseChat && (policy?.tax?.trackingEnabled ?? policy?.isTaxTrackingEnabled)) ?? false;
+function isControlPolicy(policy: OnyxEntry<Policy>): boolean {
+    return policy?.type === CONST.POLICY.TYPE.CORPORATE;
+}
+
+function isTaxTrackingEnabled(isPolicyExpenseChat: boolean, policy: OnyxEntry<Policy>, isDistanceRequest: boolean): boolean {
+    const distanceUnit = getCustomUnit(policy);
+    const customUnitID = distanceUnit?.customUnitID ?? 0;
+    const isPolicyTaxTrackingEnabled = isPolicyExpenseChat && policy?.tax?.trackingEnabled;
+    const isTaxEnabledForDistance = isPolicyTaxTrackingEnabled && policy?.customUnits?.[customUnitID]?.attributes?.taxEnabled;
+
+    return !!(isDistanceRequest ? isTaxEnabledForDistance : isPolicyTaxTrackingEnabled);
 }
 
 /**
  * Checks if policy's scheduled submit / auto reporting frequency is "instant".
  * Note: Free policies have "instant" submit always enabled.
  */
-function isInstantSubmitEnabled(policy: OnyxEntry<Policy> | EmptyObject): boolean {
+function isInstantSubmitEnabled(policy: OnyxInputOrEntry<Policy>): boolean {
     return policy?.type === CONST.POLICY.TYPE.FREE || (policy?.autoReporting === true && policy?.autoReportingFrequency === CONST.POLICY.AUTO_REPORTING_FREQUENCIES.INSTANT);
 }
 
+/**
+ * This gets a "corrected" value for autoReportingFrequency. The purpose of this function is to encapsulate some logic around the "immediate" frequency.
+ *
+ * - "immediate" is actually not immediate. For that you want "instant".
+ * - (immediate && harvesting.enabled) === daily
+ * - (immediate && !harvesting.enabled) === manual
+ *
+ * Note that "daily" and "manual" only exist as options for the API, not in the database or Onyx.
+ */
+function getCorrectedAutoReportingFrequency(policy: OnyxInputOrEntry<Policy>): ValueOf<typeof CONST.POLICY.AUTO_REPORTING_FREQUENCIES> | undefined {
+    if (policy?.autoReportingFrequency !== CONST.POLICY.AUTO_REPORTING_FREQUENCIES.IMMEDIATE) {
+        return policy?.autoReportingFrequency;
+    }
+
+    if (policy?.harvesting?.enabled) {
+        // This is actually not really "immediate". It's "daily". Surprise!
+        return CONST.POLICY.AUTO_REPORTING_FREQUENCIES.IMMEDIATE;
+    }
+
+    // "manual" is really just "immediate" (aka "daily") with harvesting disabled
+    return CONST.POLICY.AUTO_REPORTING_FREQUENCIES.MANUAL;
+}
+
 /**
  * Checks if policy's approval mode is "optional", a.k.a. "Submit & Close"
  */
-function isSubmitAndClose(policy: OnyxEntry<Policy> | EmptyObject): boolean {
+function isSubmitAndClose(policy: OnyxInputOrEntry<Policy>): boolean {
     return policy?.approvalMode === CONST.POLICY.APPROVAL_MODE.OPTIONAL;
 }
 
+function isControlOnAdvancedApprovalMode(policy: OnyxInputOrEntry<Policy>): boolean {
+    return policy?.type === CONST.POLICY.TYPE.CORPORATE && getApprovalWorkflow(policy) === CONST.POLICY.APPROVAL_MODE.ADVANCED;
+}
+
 function extractPolicyIDFromPath(path: string) {
     return path.match(CONST.REGEX.POLICY_ID_FROM_PATH)?.[1];
 }
@@ -283,7 +413,7 @@ function extractPolicyIDFromPath(path: string) {
  * Whether the policy has active accounting integration connections
  */
 function hasAccountingConnections(policy: OnyxEntry<Policy>) {
-    return Boolean(policy?.connections);
+    return !isEmptyObject(policy?.connections);
 }
 
 function getPathWithoutPolicyID(path: string) {
@@ -307,22 +437,44 @@ function getTaxByID(policy: OnyxEntry<Policy>, taxID: string): TaxRate | undefin
     return policy?.taxRates?.taxes?.[taxID];
 }
 
+/** Get a tax rate object built like Record<TaxRateName, RelatedTaxRateKeys>.
+ * We want to allow user to choose over TaxRateName and there might be a situation when one TaxRateName has two possible keys in different policies */
+function getAllTaxRatesNamesAndKeys(): Record<string, string[]> {
+    const allTaxRates: Record<string, string[]> = {};
+    Object.values(allPolicies ?? {})?.forEach((policy) => {
+        if (!policy?.taxRates?.taxes) {
+            return;
+        }
+        Object.entries(policy?.taxRates?.taxes).forEach(([taxRateKey, taxRate]) => {
+            if (!allTaxRates[taxRate.name]) {
+                allTaxRates[taxRate.name] = [taxRateKey];
+                return;
+            }
+            allTaxRates[taxRate.name].push(taxRateKey);
+        });
+    });
+    return allTaxRates;
+}
+
 /**
  * Whether the tax rate can be deleted and disabled
  */
 function canEditTaxRate(policy: Policy, taxID: string): boolean {
-    return policy.taxRates?.defaultExternalID !== taxID;
+    return policy.taxRates?.defaultExternalID !== taxID && policy.taxRates?.foreignTaxDefault !== taxID;
 }
 
-function isPolicyFeatureEnabled(policy: OnyxEntry<Policy> | EmptyObject, featureName: PolicyFeatureName): boolean {
+function isPolicyFeatureEnabled(policy: OnyxEntry<Policy>, featureName: PolicyFeatureName): boolean {
     if (featureName === CONST.POLICY.MORE_FEATURES.ARE_TAXES_ENABLED) {
-        return Boolean(policy?.tax?.trackingEnabled);
+        return !!policy?.tax?.trackingEnabled;
+    }
+    if (featureName === CONST.POLICY.MORE_FEATURES.ARE_CONNECTIONS_ENABLED) {
+        return policy?.[featureName] ? !!policy?.[featureName] : !isEmptyObject(policy?.connections);
     }
 
-    return Boolean(policy?.[featureName]);
+    return !!policy?.[featureName];
 }
 
-function getApprovalWorkflow(policy: OnyxEntry<Policy> | EmptyObject): ValueOf<typeof CONST.POLICY.APPROVAL_MODE> {
+function getApprovalWorkflow(policy: OnyxEntry<Policy>): ValueOf<typeof CONST.POLICY.APPROVAL_MODE> {
     if (policy?.type === CONST.POLICY.TYPE.PERSONAL) {
         return CONST.POLICY.APPROVAL_MODE.OPTIONAL;
     }
@@ -330,14 +482,14 @@ function getApprovalWorkflow(policy: OnyxEntry<Policy> | EmptyObject): ValueOf<t
     return policy?.approvalMode ?? CONST.POLICY.APPROVAL_MODE.ADVANCED;
 }
 
-function getDefaultApprover(policy: OnyxEntry<Policy> | EmptyObject): string {
+function getDefaultApprover(policy: OnyxEntry<Policy>): string {
     return policy?.approver ?? policy?.owner ?? '';
 }
 
 /**
  * Returns the accountID to whom the given employeeAccountID submits reports to in the given Policy.
  */
-function getSubmitToAccountID(policy: OnyxEntry<Policy> | EmptyObject, employeeAccountID: number): number {
+function getSubmitToAccountID(policy: OnyxEntry<Policy>, employeeAccountID: number): number {
     const employeeLogin = getLoginsByAccountIDs([employeeAccountID])[0];
     const defaultApprover = getDefaultApprover(policy);
 
@@ -354,40 +506,87 @@ function getSubmitToAccountID(policy: OnyxEntry<Policy> | EmptyObject, employeeA
     return getAccountIDsByLogins([employee.submitsTo ?? defaultApprover])[0];
 }
 
-function getPersonalPolicy() {
-    return Object.values(allPolicies ?? {}).find((policy) => policy?.type === CONST.POLICY.TYPE.PERSONAL);
+function getSubmitToEmail(policy: OnyxEntry<Policy>, employeeAccountID: number): string {
+    const submitToAccountID = getSubmitToAccountID(policy, employeeAccountID);
+    return getLoginsByAccountIDs([submitToAccountID])[0] ?? '';
+}
+
+/**
+ * Returns the email of the account to forward the report to depending on the approver's approval limit.
+ * Used for advanced approval mode only.
+ */
+function getForwardsToAccount(policy: OnyxEntry<Policy>, employeeEmail: string, reportTotal: number): string {
+    if (!isControlOnAdvancedApprovalMode(policy)) {
+        return '';
+    }
+
+    const employee = policy?.employeeList?.[employeeEmail];
+    if (!employee) {
+        return '';
+    }
+
+    const positiveReportTotal = Math.abs(reportTotal);
+    if (employee.approvalLimit && employee.overLimitForwardsTo && positiveReportTotal > employee.approvalLimit) {
+        return employee.overLimitForwardsTo;
+    }
+    return employee.forwardsTo ?? '';
 }
 
 /**
- *  Get the currently selected policy ID stored in the navigation state.
+ * Returns the accountID of the policy reimburser, if not available — falls back to the policy owner.
  */
-function getPolicyIDFromNavigationState() {
-    return getPolicyIDFromState(navigationRef.getRootState() as State<RootStackParamList>);
+function getReimburserAccountID(policy: OnyxEntry<Policy>): number {
+    const reimburserEmail = policy?.achAccount?.reimburser ?? policy?.owner ?? '';
+    return getAccountIDsByLogins([reimburserEmail])[0];
+}
+
+function getPersonalPolicy() {
+    return Object.values(allPolicies ?? {}).find((policy) => policy?.type === CONST.POLICY.TYPE.PERSONAL);
 }
 
 function getAdminEmployees(policy: OnyxEntry<Policy>): PolicyEmployee[] {
-    return Object.values(policy?.employeeList ?? {}).filter((employee) => employee.role === CONST.POLICY.ROLE.ADMIN);
+    if (!policy || !policy.employeeList) {
+        return [];
+    }
+    return Object.keys(policy.employeeList)
+        .map((email) => ({...policy.employeeList?.[email], email}))
+        .filter((employee) => employee.role === CONST.POLICY.ROLE.ADMIN);
 }
 
 /**
  * Returns the policy of the report
  */
-function getPolicy(policyID: string | undefined): Policy | EmptyObject {
+function getPolicy(policyID: string | undefined): OnyxEntry<Policy> {
     if (!allPolicies || !policyID) {
-        return {};
+        return undefined;
     }
-    return allPolicies[`${ONYXKEYS.COLLECTION.POLICY}${policyID}`] ?? {};
+    return allPolicies[`${ONYXKEYS.COLLECTION.POLICY}${policyID}`];
 }
 
 /** Return active policies where current user is an admin */
-function getActiveAdminWorkspaces(policies: OnyxCollection<Policy>): Policy[] {
+function getActiveAdminWorkspaces(policies: OnyxCollection<Policy> | null): Policy[] {
     const activePolicies = getActivePolicies(policies);
     return activePolicies.filter((policy) => shouldShowPolicy(policy, NetworkStore.isOffline()) && isPolicyAdmin(policy));
 }
 
+/** Whether the user can send invoice from the workspace */
+function canSendInvoiceFromWorkspace(policyID: string | undefined): boolean {
+    const policy = getPolicy(policyID);
+    return policy?.areInvoicesEnabled ?? false;
+}
+
 /** Whether the user can send invoice */
-function canSendInvoice(policies: OnyxCollection<Policy>): boolean {
+function canSendInvoice(policies: OnyxCollection<Policy> | null): boolean {
     return getActiveAdminWorkspaces(policies).length > 0;
+    // TODO: Uncomment the following line when the invoices screen is ready - https://github.com/Expensify/App/issues/45175.
+    // return getActiveAdminWorkspaces(policies).some((policy) => canSendInvoiceFromWorkspace(policy.id));
+}
+
+function hasDependentTags(policy: OnyxEntry<Policy>, policyTagList: OnyxEntry<PolicyTagLists>) {
+    if (!policy?.hasMultipleTagLists) {
+        return false;
+    }
+    return Object.values(policyTagList ?? {}).some((tagList) => Object.values(tagList.tags).some((tag) => !!tag.rules?.parentTagsFilter || !!tag.parentTagsFilter));
 }
 
 /** Get the Xero organizations connected to the policy */
@@ -404,53 +603,494 @@ function findCurrentXeroOrganization(tenants: Tenant[] | undefined, organization
     return tenants?.find((tenant) => tenant.id === organizationID);
 }
 
+function getCurrentXeroOrganizationName(policy: Policy | undefined): string | undefined {
+    return findCurrentXeroOrganization(getXeroTenants(policy), policy?.connections?.xero?.config?.tenantID)?.name;
+}
+
+function getXeroBankAccounts(policy: Policy | undefined, selectedBankAccountId: string | undefined): SelectorType[] {
+    const bankAccounts = policy?.connections?.xero?.data?.bankAccounts ?? [];
+
+    return (bankAccounts ?? []).map(({id, name}) => ({
+        value: id,
+        text: name,
+        keyForList: id,
+        isSelected: selectedBankAccountId === id,
+    }));
+}
+
+function areSettingsInErrorFields(settings?: string[], errorFields?: ErrorFields) {
+    if (settings === undefined || errorFields === undefined) {
+        return false;
+    }
+
+    const keys = Object.keys(errorFields);
+    return settings.some((setting) => keys.includes(setting));
+}
+
+function settingsPendingAction(settings?: string[], pendingFields?: PendingFields<string>): PendingAction | undefined {
+    if (settings === undefined || pendingFields === undefined) {
+        return null;
+    }
+
+    const key = Object.keys(pendingFields).find((setting) => settings.includes(setting));
+    return pendingFields[key ?? '-1'];
+}
+
+function findSelectedVendorWithDefaultSelect(vendors: NetSuiteVendor[] | undefined, selectedVendorId: string | undefined) {
+    const selectedVendor = (vendors ?? []).find(({id}) => id === selectedVendorId);
+    return selectedVendor ?? vendors?.[0] ?? undefined;
+}
+
+function findSelectedBankAccountWithDefaultSelect(accounts: NetSuiteAccount[] | undefined, selectedBankAccountId: string | undefined) {
+    const selectedBankAccount = (accounts ?? []).find(({id}) => id === selectedBankAccountId);
+    return selectedBankAccount ?? accounts?.[0] ?? undefined;
+}
+
+function findSelectedInvoiceItemWithDefaultSelect(invoiceItems: InvoiceItem[] | undefined, selectedItemId: string | undefined) {
+    const selectedInvoiceItem = (invoiceItems ?? []).find(({id}) => id === selectedItemId);
+    return selectedInvoiceItem ?? invoiceItems?.[0] ?? undefined;
+}
+
+function findSelectedTaxAccountWithDefaultSelect(taxAccounts: NetSuiteTaxAccount[] | undefined, selectedAccountId: string | undefined) {
+    const selectedTaxAccount = (taxAccounts ?? []).find(({externalID}) => externalID === selectedAccountId);
+    return selectedTaxAccount ?? taxAccounts?.[0] ?? undefined;
+}
+
+function getNetSuiteVendorOptions(policy: Policy | undefined, selectedVendorId: string | undefined): SelectorType[] {
+    const vendors = policy?.connections?.netsuite.options.data.vendors;
+
+    const selectedVendor = findSelectedVendorWithDefaultSelect(vendors, selectedVendorId);
+
+    return (vendors ?? []).map(({id, name}) => ({
+        value: id,
+        text: name,
+        keyForList: id,
+        isSelected: selectedVendor?.id === id,
+    }));
+}
+
+function getNetSuitePayableAccountOptions(policy: Policy | undefined, selectedBankAccountId: string | undefined): SelectorType[] {
+    const payableAccounts = policy?.connections?.netsuite.options.data.payableList;
+
+    const selectedPayableAccount = findSelectedBankAccountWithDefaultSelect(payableAccounts, selectedBankAccountId);
+
+    return (payableAccounts ?? []).map(({id, name}) => ({
+        value: id,
+        text: name,
+        keyForList: id,
+        isSelected: selectedPayableAccount?.id === id,
+    }));
+}
+
+function getNetSuiteReceivableAccountOptions(policy: Policy | undefined, selectedBankAccountId: string | undefined): SelectorType[] {
+    const receivableAccounts = policy?.connections?.netsuite.options.data.receivableList;
+
+    const selectedReceivableAccount = findSelectedBankAccountWithDefaultSelect(receivableAccounts, selectedBankAccountId);
+
+    return (receivableAccounts ?? []).map(({id, name}) => ({
+        value: id,
+        text: name,
+        keyForList: id,
+        isSelected: selectedReceivableAccount?.id === id,
+    }));
+}
+
+function getNetSuiteInvoiceItemOptions(policy: Policy | undefined, selectedItemId: string | undefined): SelectorType[] {
+    const invoiceItems = policy?.connections?.netsuite.options.data.items;
+
+    const selectedInvoiceItem = findSelectedInvoiceItemWithDefaultSelect(invoiceItems, selectedItemId);
+
+    return (invoiceItems ?? []).map(({id, name}) => ({
+        value: id,
+        text: name,
+        keyForList: id,
+        isSelected: selectedInvoiceItem?.id === id,
+    }));
+}
+
+function getNetSuiteTaxAccountOptions(policy: Policy | undefined, subsidiaryCountry?: string, selectedAccountId?: string): SelectorType[] {
+    const taxAccounts = policy?.connections?.netsuite.options.data.taxAccountsList;
+    const accountOptions = (taxAccounts ?? []).filter(({country}) => country === subsidiaryCountry);
+
+    const selectedTaxAccount = findSelectedTaxAccountWithDefaultSelect(accountOptions, selectedAccountId);
+
+    return accountOptions.map(({externalID, name}) => ({
+        value: externalID,
+        text: name,
+        keyForList: externalID,
+        isSelected: selectedTaxAccount?.externalID === externalID,
+    }));
+}
+
+function canUseTaxNetSuite(canUseNetSuiteUSATax?: boolean, subsidiaryCountry?: string) {
+    return !!canUseNetSuiteUSATax || CONST.NETSUITE_TAX_COUNTRIES.includes(subsidiaryCountry ?? '');
+}
+
+function canUseProvincialTaxNetSuite(subsidiaryCountry?: string) {
+    return subsidiaryCountry === '_canada';
+}
+
+function getFilteredReimbursableAccountOptions(payableAccounts: NetSuiteAccount[] | undefined) {
+    return (payableAccounts ?? []).filter(({type}) => type === CONST.NETSUITE_ACCOUNT_TYPE.BANK || type === CONST.NETSUITE_ACCOUNT_TYPE.CREDIT_CARD);
+}
+
+function getNetSuiteReimbursableAccountOptions(policy: Policy | undefined, selectedBankAccountId: string | undefined): SelectorType[] {
+    const payableAccounts = policy?.connections?.netsuite.options.data.payableList;
+    const accountOptions = getFilteredReimbursableAccountOptions(payableAccounts);
+
+    const selectedPayableAccount = findSelectedBankAccountWithDefaultSelect(accountOptions, selectedBankAccountId);
+
+    return accountOptions.map(({id, name}) => ({
+        value: id,
+        text: name,
+        keyForList: id,
+        isSelected: selectedPayableAccount?.id === id,
+    }));
+}
+
+function getFilteredCollectionAccountOptions(payableAccounts: NetSuiteAccount[] | undefined) {
+    return (payableAccounts ?? []).filter(({type}) => type === CONST.NETSUITE_ACCOUNT_TYPE.BANK);
+}
+
+function getNetSuiteCollectionAccountOptions(policy: Policy | undefined, selectedBankAccountId: string | undefined): SelectorType[] {
+    const payableAccounts = policy?.connections?.netsuite.options.data.payableList;
+    const accountOptions = getFilteredCollectionAccountOptions(payableAccounts);
+
+    const selectedPayableAccount = findSelectedBankAccountWithDefaultSelect(accountOptions, selectedBankAccountId);
+
+    return accountOptions.map(({id, name}) => ({
+        value: id,
+        text: name,
+        keyForList: id,
+        isSelected: selectedPayableAccount?.id === id,
+    }));
+}
+
+function getFilteredApprovalAccountOptions(payableAccounts: NetSuiteAccount[] | undefined) {
+    return (payableAccounts ?? []).filter(({type}) => type === CONST.NETSUITE_ACCOUNT_TYPE.ACCOUNTS_PAYABLE);
+}
+
+function getNetSuiteApprovalAccountOptions(policy: Policy | undefined, selectedBankAccountId: string | undefined): SelectorType[] {
+    const payableAccounts = policy?.connections?.netsuite.options.data.payableList;
+    const defaultApprovalAccount: NetSuiteAccount = {
+        id: CONST.NETSUITE_APPROVAL_ACCOUNT_DEFAULT,
+        name: Localize.translateLocal('workspace.netsuite.advancedConfig.defaultApprovalAccount'),
+        type: CONST.NETSUITE_ACCOUNT_TYPE.ACCOUNTS_PAYABLE,
+    };
+    const accountOptions = getFilteredApprovalAccountOptions([defaultApprovalAccount].concat(payableAccounts ?? []));
+
+    const selectedPayableAccount = findSelectedBankAccountWithDefaultSelect(accountOptions, selectedBankAccountId);
+
+    return accountOptions.map(({id, name}) => ({
+        value: id,
+        text: name,
+        keyForList: id,
+        isSelected: selectedPayableAccount?.id === id,
+    }));
+}
+
+function getCustomersOrJobsLabelNetSuite(policy: Policy | undefined, translate: LocaleContextProps['translate']): string | undefined {
+    const importMapping = policy?.connections?.netsuite?.options?.config?.syncOptions?.mapping;
+    if (!importMapping?.customers && !importMapping?.jobs) {
+        return undefined;
+    }
+    const importFields: string[] = [];
+    const importCustomer = importMapping?.customers ?? CONST.INTEGRATION_ENTITY_MAP_TYPES.NETSUITE_DEFAULT;
+    const importJobs = importMapping?.jobs ?? CONST.INTEGRATION_ENTITY_MAP_TYPES.NETSUITE_DEFAULT;
+
+    if (importCustomer === CONST.INTEGRATION_ENTITY_MAP_TYPES.NETSUITE_DEFAULT && importJobs === CONST.INTEGRATION_ENTITY_MAP_TYPES.NETSUITE_DEFAULT) {
+        return undefined;
+    }
+
+    const importedValue = importMapping?.customers !== CONST.INTEGRATION_ENTITY_MAP_TYPES.NETSUITE_DEFAULT ? importCustomer : importJobs;
+
+    if (importCustomer !== CONST.INTEGRATION_ENTITY_MAP_TYPES.NETSUITE_DEFAULT) {
+        importFields.push(translate('workspace.netsuite.import.customersOrJobs.customers'));
+    }
+
+    if (importJobs !== CONST.INTEGRATION_ENTITY_MAP_TYPES.NETSUITE_DEFAULT) {
+        importFields.push(translate('workspace.netsuite.import.customersOrJobs.jobs'));
+    }
+
+    const importedValueLabel = translate(`workspace.netsuite.import.customersOrJobs.label`, importFields, translate(`workspace.accounting.importTypes.${importedValue}`).toLowerCase());
+    return importedValueLabel.charAt(0).toUpperCase() + importedValueLabel.slice(1);
+}
+
+function isNetSuiteCustomSegmentRecord(customField: NetSuiteCustomList | NetSuiteCustomSegment): boolean {
+    return 'segmentName' in customField;
+}
+
+function getNameFromNetSuiteCustomField(customField: NetSuiteCustomList | NetSuiteCustomSegment): string {
+    return 'segmentName' in customField ? customField.segmentName : customField.listName;
+}
+
+function isNetSuiteCustomFieldPropertyEditable(customField: NetSuiteCustomList | NetSuiteCustomSegment, fieldName: string) {
+    const fieldsAllowedToEdit = isNetSuiteCustomSegmentRecord(customField) ? [INPUT_IDS.SEGMENT_NAME, INPUT_IDS.INTERNAL_ID, INPUT_IDS.SCRIPT_ID, INPUT_IDS.MAPPING] : [INPUT_IDS.MAPPING];
+    const fieldKey = fieldName as keyof typeof customField;
+    return fieldsAllowedToEdit.includes(fieldKey);
+}
+
+function getIntegrationLastSuccessfulDate(connection?: Connections[keyof Connections], connectionSyncProgress?: PolicyConnectionSyncProgress) {
+    let syncSuccessfulDate;
+    if (!connection) {
+        return undefined;
+    }
+    if ((connection as NetSuiteConnection)?.lastSyncDate) {
+        syncSuccessfulDate = (connection as NetSuiteConnection)?.lastSyncDate;
+    } else {
+        syncSuccessfulDate = (connection as ConnectionWithLastSyncData)?.lastSync?.successfulDate;
+    }
+
+    if (
+        connectionSyncProgress &&
+        connectionSyncProgress.stageInProgress === CONST.POLICY.CONNECTIONS.SYNC_STAGE_NAME.JOB_DONE &&
+        syncSuccessfulDate &&
+        connectionSyncProgress.timestamp > syncSuccessfulDate
+    ) {
+        syncSuccessfulDate = connectionSyncProgress.timestamp;
+    }
+    return syncSuccessfulDate;
+}
+
+function getCurrentSageIntacctEntityName(policy: Policy | undefined, defaultNameIfNoEntity: string): string | undefined {
+    const currentEntityID = policy?.connections?.intacct?.config?.entity;
+    if (!currentEntityID) {
+        return defaultNameIfNoEntity;
+    }
+    const entities = policy?.connections?.intacct?.data?.entities;
+    return entities?.find((entity) => entity.id === currentEntityID)?.name;
+}
+
+function getSageIntacctBankAccounts(policy?: Policy, selectedBankAccountId?: string): SelectorType[] {
+    const bankAccounts = policy?.connections?.intacct?.data?.bankAccounts ?? [];
+    return (bankAccounts ?? []).map(({id, name}) => ({
+        value: id,
+        text: name,
+        keyForList: id,
+        isSelected: selectedBankAccountId === id,
+    }));
+}
+
+function getSageIntacctVendors(policy?: Policy, selectedVendorId?: string): SelectorType[] {
+    const vendors = policy?.connections?.intacct?.data?.vendors ?? [];
+    return vendors.map(({id, value}) => ({
+        value: id,
+        text: value,
+        keyForList: id,
+        isSelected: selectedVendorId === id,
+    }));
+}
+
+function getSageIntacctNonReimbursableActiveDefaultVendor(policy?: Policy): string | undefined {
+    const {
+        nonReimbursableCreditCardChargeDefaultVendor: creditCardDefaultVendor,
+        nonReimbursableVendor: expenseReportDefaultVendor,
+        nonReimbursable,
+    } = policy?.connections?.intacct?.config.export ?? {};
+
+    return nonReimbursable === CONST.SAGE_INTACCT_NON_REIMBURSABLE_EXPENSE_TYPE.CREDIT_CARD_CHARGE ? creditCardDefaultVendor : expenseReportDefaultVendor;
+}
+
+function getSageIntacctCreditCards(policy?: Policy, selectedAccount?: string): SelectorType[] {
+    const creditCards = policy?.connections?.intacct?.data?.creditCards ?? [];
+    return creditCards.map(({name}) => ({
+        value: name,
+        text: name,
+        keyForList: name,
+        isSelected: name === selectedAccount,
+    }));
+}
+
+/**
+ * Sort the workspaces by their name, while keeping the selected one at the beginning.
+ * @param workspace1 Details of the first workspace to be compared.
+ * @param workspace2 Details of the second workspace to be compared.
+ * @param selectedWorkspaceID ID of the selected workspace which needs to be at the beginning.
+ */
+const sortWorkspacesBySelected = (workspace1: WorkspaceDetails, workspace2: WorkspaceDetails, selectedWorkspaceID: string | undefined): number => {
+    if (workspace1.policyID === selectedWorkspaceID) {
+        return -1;
+    }
+    if (workspace2.policyID === selectedWorkspaceID) {
+        return 1;
+    }
+    return workspace1.name?.toLowerCase().localeCompare(workspace2.name?.toLowerCase() ?? '') ?? 0;
+};
+
+/**
+ * Takes removes pendingFields and errorFields from a customUnit
+ */
+function removePendingFieldsFromCustomUnit(customUnit: CustomUnit): CustomUnit {
+    const cleanedCustomUnit = {...customUnit};
+
+    delete cleanedCustomUnit.pendingFields;
+    delete cleanedCustomUnit.errorFields;
+
+    return cleanedCustomUnit;
+}
+
+function navigateWhenEnableFeature(policyID: string) {
+    setTimeout(() => {
+        Navigation.navigate(ROUTES.WORKSPACE_INITIAL.getRoute(policyID));
+    }, CONST.WORKSPACE_ENABLE_FEATURE_REDIRECT_DELAY);
+}
+
+function getConnectedIntegration(policy: Policy | undefined, accountingIntegrations?: ConnectionName[]) {
+    return (accountingIntegrations ?? Object.values(CONST.POLICY.CONNECTIONS.NAME)).find((integration) => !!policy?.connections?.[integration]);
+}
+
+function hasIntegrationAutoSync(policy: Policy | undefined, connectedIntegration?: ConnectionName) {
+    return (connectedIntegration && policy?.connections?.[connectedIntegration]?.config?.autoSync?.enabled) ?? false;
+}
+
+function getCurrentConnectionName(policy: Policy | undefined): string | undefined {
+    const accountingIntegrations = Object.values(CONST.POLICY.CONNECTIONS.NAME);
+    const connectionKey = accountingIntegrations.find((integration) => !!policy?.connections?.[integration]);
+    return connectionKey ? CONST.POLICY.CONNECTIONS.NAME_USER_FRIENDLY[connectionKey] : undefined;
+}
+
+/**
+ * Check if the policy member is deleted from the workspace
+ */
+function isDeletedPolicyEmployee(policyEmployee: PolicyEmployee, isOffline: boolean) {
+    return !isOffline && policyEmployee.pendingAction === CONST.RED_BRICK_ROAD_PENDING_ACTION.DELETE && isEmptyObject(policyEmployee.errors);
+}
+
+function hasNoPolicyOtherThanPersonalType() {
+    return (
+        Object.values(allPolicies ?? {}).filter((policy) => policy && policy.type !== CONST.POLICY.TYPE.PERSONAL && policy.pendingAction !== CONST.RED_BRICK_ROAD_PENDING_ACTION.DELETE)
+            .length === 0
+    );
+}
+
+function getCurrentTaxID(policy: OnyxEntry<Policy>, taxID: string): string | undefined {
+    return Object.keys(policy?.taxRates?.taxes ?? {}).find((taxIDKey) => policy?.taxRates?.taxes?.[taxIDKey].previousTaxCode === taxID || taxIDKey === taxID);
+}
+
+function getWorkspaceAccountID(policyID: string) {
+    const policy = getPolicy(policyID);
+
+    if (!policy) {
+        return 0;
+    }
+    return policy.workspaceAccountID ?? 0;
+}
+
+function getDomainNameForPolicy(policyID?: string): string {
+    if (!policyID) {
+        return '';
+    }
+
+    return `${CONST.EXPENSIFY_POLICY_DOMAIN}${policyID}${CONST.EXPENSIFY_POLICY_DOMAIN_EXTENSION}`;
+}
+
 export {
+    canEditTaxRate,
+    extractPolicyIDFromPath,
+    escapeTagName,
     getActivePolicies,
+    getAdminEmployees,
+    getCleanedTagName,
+    getConnectedIntegration,
+    getCountOfEnabledTagsOfList,
+    getIneligibleInvitees,
+    getMemberAccountIDsForWorkspace,
+    getNumericValue,
+    isMultiLevelTags,
+    getPathWithoutPolicyID,
+    getPersonalPolicy,
+    getPolicy,
+    getPolicyBrickRoadIndicatorStatus,
+    getPolicyEmployeeListByIdWithoutCurrentUser,
+    getSortedTagKeys,
+    getTagList,
+    getTagListName,
+    getTagLists,
+    getTaxByID,
+    getUnitRateValue,
+    getRateDisplayValue,
+    goBackFromInvalidPolicy,
     hasAccountingConnections,
+    hasSyncError,
+    hasCustomUnitsError,
     hasEmployeeListError,
+    hasIntegrationAutoSync,
+    hasPolicyCategoriesError,
     hasPolicyError,
     hasPolicyErrorFields,
-    hasCustomUnitsError,
-    getNumericValue,
-    getUnitRateValue,
-    getPolicyBrickRoadIndicatorStatus,
-    shouldShowPolicy,
+    hasTaxRateError,
+    isControlOnAdvancedApprovalMode,
     isExpensifyTeam,
-    isInstantSubmitEnabled,
+    isDeletedPolicyEmployee,
     isFreeGroupPolicy,
-    isPolicyAdmin,
-    isTaxTrackingEnabled,
-    isSubmitAndClose,
-    getMemberAccountIDsForWorkspace,
-    getIneligibleInvitees,
-    getTagLists,
-    getTagListName,
-    getSortedTagKeys,
-    canEditTaxRate,
-    getTagList,
-    getCleanedTagName,
-    getCountOfEnabledTagsOfList,
+    isInstantSubmitEnabled,
+    getCorrectedAutoReportingFrequency,
+    isPaidGroupPolicy,
     isPendingDeletePolicy,
+    isPolicyAdmin,
+    isPolicyUser,
     isPolicyEmployee,
-    isPolicyOwner,
-    isPaidGroupPolicy,
-    extractPolicyIDFromPath,
-    getPathWithoutPolicyID,
-    getPolicyEmployeeListByIdWithoutCurrentUser,
-    goBackFromInvalidPolicy,
-    getPersonalPolicy,
     isPolicyFeatureEnabled,
-    hasTaxRateError,
-    getTaxByID,
-    hasPolicyCategoriesError,
-    getPolicyIDFromNavigationState,
-    getSubmitToAccountID,
-    getAdminEmployees,
-    getPolicy,
+    isPolicyOwner,
+    isSubmitAndClose,
+    isTaxTrackingEnabled,
+    shouldShowPolicy,
     getActiveAdminWorkspaces,
+    canSendInvoiceFromWorkspace,
     canSendInvoice,
+    hasDependentTags,
     getXeroTenants,
     findCurrentXeroOrganization,
+    getCurrentXeroOrganizationName,
+    getXeroBankAccounts,
+    findSelectedVendorWithDefaultSelect,
+    findSelectedBankAccountWithDefaultSelect,
+    findSelectedInvoiceItemWithDefaultSelect,
+    findSelectedTaxAccountWithDefaultSelect,
+    getNetSuiteVendorOptions,
+    canUseTaxNetSuite,
+    canUseProvincialTaxNetSuite,
+    getFilteredReimbursableAccountOptions,
+    getNetSuiteReimbursableAccountOptions,
+    getFilteredCollectionAccountOptions,
+    getNetSuiteCollectionAccountOptions,
+    getFilteredApprovalAccountOptions,
+    getNetSuiteApprovalAccountOptions,
+    getNetSuitePayableAccountOptions,
+    getNetSuiteReceivableAccountOptions,
+    getNetSuiteInvoiceItemOptions,
+    getNetSuiteTaxAccountOptions,
+    getSageIntacctVendors,
+    getSageIntacctNonReimbursableActiveDefaultVendor,
+    getSageIntacctCreditCards,
+    getSageIntacctBankAccounts,
+    getCustomUnit,
+    getCustomUnitRate,
+    sortWorkspacesBySelected,
+    removePendingFieldsFromCustomUnit,
+    navigateWhenEnableFeature,
+    getIntegrationLastSuccessfulDate,
+    getCurrentConnectionName,
+    getCustomersOrJobsLabelNetSuite,
+    getDefaultApprover,
+    getApprovalWorkflow,
+    getReimburserAccountID,
+    isControlPolicy,
+    isNetSuiteCustomSegmentRecord,
+    getNameFromNetSuiteCustomField,
+    isNetSuiteCustomFieldPropertyEditable,
+    getCurrentSageIntacctEntityName,
+    hasNoPolicyOtherThanPersonalType,
+    getCurrentTaxID,
+    areSettingsInErrorFields,
+    settingsPendingAction,
+    getSubmitToEmail,
+    getForwardsToAccount,
+    getSubmitToAccountID,
+    getWorkspaceAccountID,
+    getAllTaxRatesNamesAndKeys as getAllTaxRates,
+    getTagNamesFromTagsLists,
+    getDomainNameForPolicy,
 };
 
 export type {MemberEmailsToAccountIDs};
diff --git a/src/libs/Pusher/pusher.ts b/src/libs/Pusher/pusher.ts
index 48c5e5c1409f..a3383dbadb8a 100644
--- a/src/libs/Pusher/pusher.ts
+++ b/src/libs/Pusher/pusher.ts
@@ -36,7 +36,9 @@ type PusherEventMap = {
     [TYPE.USER_IS_LEAVING_ROOM]: UserIsLeavingRoomEvent;
 };
 
-type EventData<EventName extends string> = EventName extends keyof PusherEventMap ? PusherEventMap[EventName] : OnyxUpdatesFromServer;
+type EventData<EventName extends string> = {chunk?: string; id?: string; index?: number; final?: boolean} & (EventName extends keyof PusherEventMap
+    ? PusherEventMap[EventName]
+    : OnyxUpdatesFromServer);
 
 type EventCallbackError = {type: ValueOf<typeof CONST.ERROR>; data: {code: number}};
 
@@ -63,7 +65,7 @@ Onyx.connect({
         if (!network) {
             return;
         }
-        shouldForceOffline = Boolean(network.shouldForceOffline);
+        shouldForceOffline = !!network.shouldForceOffline;
     },
 });
 
@@ -72,6 +74,8 @@ let pusherSocketID = '';
 const socketEventCallbacks: SocketEventCallback[] = [];
 let customAuthorizer: ChannelAuthorizerGenerator;
 
+const eventsBoundToChannels = new Map<Channel, Set<PusherEventName>>();
+
 /**
  * Trigger each of the socket event callbacks with the event information
  */
@@ -153,7 +157,7 @@ function getChannel(channelName: string): Channel | undefined {
  * Binds an event callback to a channel + eventName
  */
 function bindEventToChannel<EventName extends PusherEventName>(channel: Channel | undefined, eventName: EventName, eventCallback: (data: EventData<EventName>) => void = () => {}) {
-    if (!eventName) {
+    if (!eventName || !channel) {
         return;
     }
 
@@ -164,9 +168,9 @@ function bindEventToChannel<EventName extends PusherEventName>(channel: Channel
             return;
         }
 
-        let data;
+        let data: EventData<EventName>;
         try {
-            data = isObject(eventData) ? eventData : JSON.parse(eventData);
+            data = isObject(eventData) ? eventData : (JSON.parse(eventData) as EventData<EventName>);
         } catch (err) {
             Log.alert('[Pusher] Unable to parse single JSON event data from Pusher', {error: err, eventData});
             return;
@@ -187,7 +191,9 @@ function bindEventToChannel<EventName extends PusherEventName>(channel: Channel
 
         // Add it to the rolling list.
         const chunkedEvent = chunkedDataEvents[data.id];
-        chunkedEvent.chunks[data.index] = data.chunk;
+        if (data.index !== undefined) {
+            chunkedEvent.chunks[data.index] = data.chunk;
+        }
 
         // If this is the last packet, mark that we've hit the end.
         if (data.final) {
@@ -198,7 +204,7 @@ function bindEventToChannel<EventName extends PusherEventName>(channel: Channel
         // packet.
         if (chunkedEvent.receivedFinal && chunkedEvent.chunks.length === Object.keys(chunkedEvent.chunks).length) {
             try {
-                eventCallback(JSON.parse(chunkedEvent.chunks.join('')));
+                eventCallback(JSON.parse(chunkedEvent.chunks.join('')) as EventData<EventName>);
             } catch (err) {
                 Log.alert('[Pusher] Unable to parse chunked JSON response from Pusher', {
                     error: err,
@@ -213,7 +219,11 @@ function bindEventToChannel<EventName extends PusherEventName>(channel: Channel
         }
     };
 
-    channel?.bind(eventName, callback);
+    channel.bind(eventName, callback);
+    if (!eventsBoundToChannels.has(channel)) {
+        eventsBoundToChannels.set(channel, new Set());
+    }
+    eventsBoundToChannels.get(channel)?.add(eventName);
 }
 
 /**
@@ -237,7 +247,7 @@ function subscribe<EventName extends PusherEventName>(
             Log.info('[Pusher] Attempting to subscribe to channel', false, {channelName, eventName});
             let channel = getChannel(channelName);
 
-            if (!channel || !channel.subscribed) {
+            if (!channel?.subscribed) {
                 channel = socket.subscribe(channelName);
                 let isBound = false;
                 channel.bind('pusher:subscription_succeeded', () => {
@@ -288,6 +298,12 @@ function unsubscribe(channelName: string, eventName: PusherEventName = '') {
     if (eventName) {
         Log.info('[Pusher] Unbinding event', false, {eventName, channelName});
         channel.unbind(eventName);
+        eventsBoundToChannels.get(channel)?.delete(eventName);
+        if (eventsBoundToChannels.get(channel)?.size === 0) {
+            Log.info(`[Pusher] After unbinding ${eventName} from channel ${channelName}, no other events were bound to that channel. Unsubscribing...`, false);
+            eventsBoundToChannels.delete(channel);
+            socket?.unsubscribe(channelName);
+        }
     } else {
         if (!channel.subscribed) {
             Log.info('Pusher] Attempted to unsubscribe from channel, but we are not subscribed to begin with', false, {channelName});
diff --git a/src/libs/PusherUtils.ts b/src/libs/PusherUtils.ts
index 2bd79adef516..8a83bb012b3a 100644
--- a/src/libs/PusherUtils.ts
+++ b/src/libs/PusherUtils.ts
@@ -17,6 +17,7 @@ function subscribeToMultiEvent(eventType: string, callback: Callback) {
 
 function triggerMultiEventHandler(eventType: string, data: OnyxUpdate[]): Promise<void> {
     if (!multiEventCallbackMapping[eventType]) {
+        Log.warn('[PusherUtils] Received unexpected multi-event', {eventType});
         return Promise.resolve();
     }
     return multiEventCallbackMapping[eventType](data);
diff --git a/src/libs/Queue/Queue.ts b/src/libs/Queue/Queue.ts
new file mode 100644
index 000000000000..8b2011e64371
--- /dev/null
+++ b/src/libs/Queue/Queue.ts
@@ -0,0 +1,81 @@
+import Log from '@libs/Log';
+import CONST from '@src/CONST';
+import type Queue from './QueueType';
+
+// Function to create a new queue
+function createQueue<T>(processItem: (item: T) => Promise<void>): Queue<T> {
+    // Array to hold the elements of the queue
+    const elements: T[] = [];
+    let isProcessing = false;
+
+    // Function to remove an item from the front of the queue
+    function dequeue(): T | undefined {
+        return elements.shift();
+    }
+
+    // Function to check if the queue is empty
+    function isEmpty(): boolean {
+        return elements.length === 0;
+    }
+
+    // Function to process the next item in the queue
+    function processNext(): Promise<void> {
+        return new Promise((resolve) => {
+            if (!isEmpty()) {
+                const nextItem = dequeue();
+                if (nextItem) {
+                    processItem(nextItem)
+                        .catch((error: Error) => {
+                            const errorMessage = error.message ?? CONST.ERROR.UNKNOWN_ERROR;
+
+                            Log.hmmm('Queue error:', {errorMessage});
+                        })
+                        .finally(() => {
+                            processNext().then(resolve);
+                        });
+                }
+            } else {
+                isProcessing = false;
+                resolve();
+            }
+        });
+    }
+
+    // Initiates the processing of items in the queue.
+    // Continues to dequeue and process items as long as the queue is not empty.
+    // Sets the `isProcessing` flag to true at the start and resets it to false once all items have been processed.
+    function run(): Promise<void> {
+        isProcessing = true;
+        return processNext();
+    }
+
+    // Adds an item to the queue and initiates processing if not already in progress
+    function enqueue(item: T): void {
+        elements.push(item);
+        if (!isProcessing) {
+            run();
+        }
+    }
+
+    // Function to get the item at the front of the queue without removing it
+    function peek(): T | undefined {
+        return elements.length > 0 ? elements[0] : undefined;
+    }
+
+    // Function to get the number of items in the queue
+    function size(): number {
+        return elements.length;
+    }
+
+    // Return an object with the queue operations
+    return {
+        run,
+        enqueue,
+        dequeue,
+        isEmpty,
+        peek,
+        size,
+    };
+}
+
+export default createQueue;
diff --git a/src/libs/Queue/QueueType.ts b/src/libs/Queue/QueueType.ts
new file mode 100644
index 000000000000..a38eb0864e0a
--- /dev/null
+++ b/src/libs/Queue/QueueType.ts
@@ -0,0 +1,10 @@
+type Queue<T> = {
+    run(): Promise<void>;
+    enqueue: (item: T) => void;
+    dequeue: () => T | undefined;
+    isEmpty: () => boolean;
+    peek: () => T | undefined;
+    size: () => number;
+};
+
+export default Queue;
diff --git a/src/libs/ReceiptUtils.ts b/src/libs/ReceiptUtils.ts
index 849bc50e77b0..b42a23e215bf 100644
--- a/src/libs/ReceiptUtils.ts
+++ b/src/libs/ReceiptUtils.ts
@@ -1,4 +1,4 @@
-import Str from 'expensify-common/lib/str';
+import {Str} from 'expensify-common';
 import _ from 'lodash';
 import type {OnyxEntry} from 'react-native-onyx';
 import CONST from '@src/CONST';
@@ -56,7 +56,7 @@ function getThumbnailAndImageURIs(transaction: OnyxEntry<Transaction>, receiptPa
         return {thumbnail: `${path.substring(0, path.length - 4)}.jpg.1024.jpg`, image: path, filename};
     }
 
-    const isLocalFile = typeof path === 'number' || path.startsWith('blob:') || path.startsWith('file:') || path.startsWith('/');
+    const isLocalFile = FileUtils.isLocalFile(path);
     const {fileExtension} = FileUtils.splitExtensionFromFileName(filename);
     return {isThumbnail: true, fileExtension: Object.values(CONST.IOU.FILE_TYPES).find((type) => type === fileExtension), image: path, isLocalFile, filename};
 }
diff --git a/src/libs/ReportActionComposeFocusManager.ts b/src/libs/ReportActionComposeFocusManager.ts
index 11c1fd04329f..2dfa81d89a20 100644
--- a/src/libs/ReportActionComposeFocusManager.ts
+++ b/src/libs/ReportActionComposeFocusManager.ts
@@ -1,11 +1,14 @@
 import React from 'react';
+import type {MutableRefObject} from 'react';
 import type {TextInput} from 'react-native';
-import ROUTES from '@src/ROUTES';
-import Navigation from './Navigation/Navigation';
+import SCREENS from '@src/SCREENS';
+import getTopmostRouteName from './Navigation/getTopmostRouteName';
+import isReportOpenInRHP from './Navigation/isReportOpenInRHP';
+import navigationRef from './Navigation/navigationRef';
 
 type FocusCallback = (shouldFocusForNonBlurInputOnTapOutside?: boolean) => void;
 
-const composerRef = React.createRef<TextInput>();
+const composerRef: MutableRefObject<TextInput | null> = 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.
@@ -30,8 +33,9 @@ function onComposerFocus(callback: FocusCallback | null, isMainComposer = false)
  * Request focus on the ReportActionComposer
  */
 function focus(shouldFocusForNonBlurInputOnTapOutside?: boolean) {
-    /** Do not trigger the refocusing when the active route is not the report route, */
-    if (!Navigation.isActiveRoute(ROUTES.REPORT_WITH_ID.getRoute(Navigation.getTopmostReportId() ?? ''))) {
+    /** Do not trigger the refocusing when the active route is not the report screen */
+    const navigationState = navigationRef.getState();
+    if (!navigationState || (!isReportOpenInRHP(navigationState) && getTopmostRouteName(navigationState) !== SCREENS.REPORT)) {
         return;
     }
 
diff --git a/src/libs/ReportActionItemEventHandler/index.android.ts b/src/libs/ReportActionItemEventHandler/index.android.ts
new file mode 100644
index 000000000000..ba24fceb9899
--- /dev/null
+++ b/src/libs/ReportActionItemEventHandler/index.android.ts
@@ -0,0 +1,14 @@
+import {InteractionManager} from 'react-native';
+import type ReportActionItemEventHandler from './types';
+
+const reportActionItemEventHandler: ReportActionItemEventHandler = {
+    handleComposerLayoutChange: (reportScrollManager, index) => () => {
+        InteractionManager.runAfterInteractions(() => {
+            requestAnimationFrame(() => {
+                reportScrollManager.scrollToIndex(index, true);
+            });
+        });
+    },
+};
+
+export default reportActionItemEventHandler;
diff --git a/src/libs/ReportActionItemEventHandler/index.ts b/src/libs/ReportActionItemEventHandler/index.ts
new file mode 100644
index 000000000000..87d79a8d3ad0
--- /dev/null
+++ b/src/libs/ReportActionItemEventHandler/index.ts
@@ -0,0 +1,7 @@
+import type ReportActionItemEventHandler from './types';
+
+const reportActionItemEventHandler: ReportActionItemEventHandler = {
+    handleComposerLayoutChange: () => () => {},
+};
+
+export default reportActionItemEventHandler;
diff --git a/src/libs/ReportActionItemEventHandler/types.ts b/src/libs/ReportActionItemEventHandler/types.ts
new file mode 100644
index 000000000000..810c3ec02373
--- /dev/null
+++ b/src/libs/ReportActionItemEventHandler/types.ts
@@ -0,0 +1,8 @@
+import type {LayoutChangeEvent} from 'react-native';
+import type ReportScrollManagerData from '@hooks/useReportScrollManager/types';
+
+type ReportActionItemEventHandler = {
+    handleComposerLayoutChange: (reportScrollManager: ReportScrollManagerData, index: number) => (event: LayoutChangeEvent) => void;
+};
+
+export default ReportActionItemEventHandler;
diff --git a/src/libs/ReportActionsUtils.ts b/src/libs/ReportActionsUtils.ts
index 64c4ed61f7fd..4d126cf9cbf4 100644
--- a/src/libs/ReportActionsUtils.ts
+++ b/src/libs/ReportActionsUtils.ts
@@ -1,35 +1,32 @@
-import fastMerge from 'expensify-common/lib/fastMerge';
+import {fastMerge, Str} from 'expensify-common';
 import _ from 'lodash';
 import lodashFindLast from 'lodash/findLast';
-import type {OnyxCollection, OnyxEntry, OnyxUpdate} from 'react-native-onyx';
+import type {NullishDeep, OnyxCollection, OnyxEntry, OnyxUpdate} from 'react-native-onyx';
 import Onyx from 'react-native-onyx';
 import type {ValueOf} from 'type-fest';
 import CONST from '@src/CONST';
 import type {TranslationPaths} from '@src/languages/types';
 import ONYXKEYS from '@src/ONYXKEYS';
-import type {
-    ActionName,
-    ChangeLog,
-    IOUMessage,
-    OriginalMessageActionableMentionWhisper,
-    OriginalMessageDismissedViolation,
-    OriginalMessageIOU,
-    OriginalMessageJoinPolicyChangeLog,
-    OriginalMessageReimbursementDequeued,
-} from '@src/types/onyx/OriginalMessage';
+import type {OnyxInputOrEntry} from '@src/types/onyx';
+import type {JoinWorkspaceResolution, OriginalMessageChangeLog, OriginalMessageExportIntegration} from '@src/types/onyx/OriginalMessage';
 import type Report from '@src/types/onyx/Report';
-import type {Message, ReportActionBase, ReportActions} from '@src/types/onyx/ReportAction';
 import type ReportAction from '@src/types/onyx/ReportAction';
-import type {EmptyObject} from '@src/types/utils/EmptyObject';
+import type {Message, OldDotReportAction, OriginalMessage, ReportActions} from '@src/types/onyx/ReportAction';
+import type ReportActionName from '@src/types/onyx/ReportActionName';
 import {isEmptyObject} from '@src/types/utils/EmptyObject';
 import DateUtils from './DateUtils';
 import * as Environment from './Environment/Environment';
+import getBase62ReportID from './getBase62ReportID';
 import isReportMessageAttachment from './isReportMessageAttachment';
 import * as Localize from './Localize';
 import Log from './Log';
 import type {MessageElementBase, MessageTextElement} from './MessageElement';
+import Parser from './Parser';
 import * as PersonalDetailsUtils from './PersonalDetailsUtils';
-import type {OptimisticIOUReportAction} from './ReportUtils';
+import * as ReportConnection from './ReportConnection';
+import type {OptimisticIOUReportAction, PartialReportAction} from './ReportUtils';
+import StringUtils from './StringUtils';
+// eslint-disable-next-line import/no-cycle
 import * as TransactionUtils from './TransactionUtils';
 
 type LastVisibleMessage = {
@@ -51,17 +48,6 @@ type MemberChangeMessageRoomReferenceElement = {
 
 type MemberChangeMessageElement = MessageTextElement | MemberChangeMessageUserMentionElement | MemberChangeMessageRoomReferenceElement;
 
-const policyChangeActionsSet = new Set<string>(Object.values(CONST.REPORT.ACTIONS.TYPE.POLICY_CHANGE_LOG));
-
-let allReports: OnyxCollection<Report> = {};
-Onyx.connect({
-    key: ONYXKEYS.COLLECTION.REPORT,
-    waitForCollectionCallback: true,
-    callback: (reports) => {
-        allReports = reports;
-    },
-});
-
 let allReportActions: OnyxCollection<ReportActions>;
 Onyx.connect({
     key: ONYXKEYS.COLLECTION.REPORT_ACTIONS,
@@ -82,6 +68,7 @@ Onyx.connect({
 });
 
 let currentUserAccountID: number | undefined;
+let currentEmail = '';
 Onyx.connect({
     key: ONYXKEYS.SESSION,
     callback: (value) => {
@@ -91,94 +78,238 @@ Onyx.connect({
         }
 
         currentUserAccountID = value.accountID;
+        currentEmail = value?.email ?? '';
     },
 });
 
 let environmentURL: string;
 Environment.getEnvironmentURL().then((url: string) => (environmentURL = url));
 
-function isCreatedAction(reportAction: OnyxEntry<ReportAction>): boolean {
+/*
+ * Url to the Xero non reimbursable expenses list
+ */
+const XERO_NON_REIMBURSABLE_EXPENSES_URL = 'https://go.xero.com/Bank/BankAccounts.aspx';
+
+/*
+ * Url to the NetSuite global search, which should be suffixed with the reportID.
+ */
+const NETSUITE_NON_REIMBURSABLE_EXPENSES_URL_PREFIX =
+    'https://system.netsuite.com/app/common/search/ubersearchresults.nl?quicksearch=T&searchtype=Uber&frame=be&Uber_NAMEtype=KEYWORDSTARTSWITH&Uber_NAME=';
+
+/*
+ * Url prefix to any Salesforce transaction or transaction list.
+ */
+const SALESFORCE_EXPENSES_URL_PREFIX = 'https://login.salesforce.com/';
+
+/*
+ * Url to the QBO expenses list
+ */
+const QBO_EXPENSES_URL = 'https://qbo.intuit.com/app/expenses';
+
+const POLICY_CHANGE_LOG_ARRAY = Object.values(CONST.REPORT.ACTIONS.TYPE.POLICY_CHANGE_LOG);
+
+function isCreatedAction(reportAction: OnyxInputOrEntry<ReportAction>): boolean {
     return reportAction?.actionName === CONST.REPORT.ACTIONS.TYPE.CREATED;
 }
 
-function isDeletedAction(reportAction: OnyxEntry<ReportAction | OptimisticIOUReportAction>): boolean {
+function isDeletedAction(reportAction: OnyxInputOrEntry<ReportAction | OptimisticIOUReportAction>): boolean {
     const message = reportAction?.message ?? [];
 
+    if (!Array.isArray(message)) {
+        return message?.html === '' ?? message?.deleted;
+    }
+
     // A legacy deleted comment has either an empty array or an object with html field with empty string as value
     const isLegacyDeletedComment = message.length === 0 || message[0]?.html === '';
 
     return isLegacyDeletedComment || !!message[0]?.deleted;
 }
 
-function isDeletedParentAction(reportAction: OnyxEntry<ReportAction>): boolean {
-    return (reportAction?.message?.[0]?.isDeletedParentAction ?? false) && (reportAction?.childVisibleActionCount ?? 0) > 0;
+function getReportActionMessage(reportAction: PartialReportAction) {
+    return Array.isArray(reportAction?.message) ? reportAction.message[0] : reportAction?.message;
 }
 
-function isReversedTransaction(reportAction: OnyxEntry<ReportAction | OptimisticIOUReportAction>) {
-    return (reportAction?.message?.[0]?.isReversedTransaction ?? false) && ((reportAction as ReportAction)?.childVisibleActionCount ?? 0) > 0;
+function isDeletedParentAction(reportAction: OnyxInputOrEntry<ReportAction>): boolean {
+    return (getReportActionMessage(reportAction)?.isDeletedParentAction ?? false) && (reportAction?.childVisibleActionCount ?? 0) > 0;
 }
 
-function isPendingRemove(reportAction: OnyxEntry<ReportAction> | EmptyObject): boolean {
-    if (isEmptyObject(reportAction)) {
-        return false;
-    }
-    return reportAction?.message?.[0]?.moderationDecision?.decision === CONST.MODERATION.MODERATOR_DECISION_PENDING_REMOVE;
+function isReversedTransaction(reportAction: OnyxInputOrEntry<ReportAction | OptimisticIOUReportAction>) {
+    return (getReportActionMessage(reportAction)?.isReversedTransaction ?? false) && ((reportAction as ReportAction)?.childVisibleActionCount ?? 0) > 0;
 }
 
-function isMoneyRequestAction(reportAction: OnyxEntry<ReportAction>): reportAction is ReportAction & OriginalMessageIOU {
-    return reportAction?.actionName === CONST.REPORT.ACTIONS.TYPE.IOU;
+function isPendingRemove(reportAction: OnyxInputOrEntry<ReportAction>): boolean {
+    return getReportActionMessage(reportAction)?.moderationDecision?.decision === CONST.MODERATION.MODERATOR_DECISION_PENDING_REMOVE;
 }
 
-function isReportPreviewAction(reportAction: OnyxEntry<ReportAction>): boolean {
-    return reportAction?.actionName === CONST.REPORT.ACTIONS.TYPE.REPORT_PREVIEW;
+function isMoneyRequestAction(reportAction: OnyxInputOrEntry<ReportAction>): reportAction is ReportAction<typeof CONST.REPORT.ACTIONS.TYPE.IOU> {
+    return isActionOfType(reportAction, CONST.REPORT.ACTIONS.TYPE.IOU);
 }
 
-function isReportActionSubmitted(reportAction: OnyxEntry<ReportAction>): boolean {
-    return reportAction?.actionName === CONST.REPORT.ACTIONS.TYPE.SUBMITTED;
+function isReportPreviewAction(reportAction: OnyxInputOrEntry<ReportAction>): reportAction is ReportAction<typeof CONST.REPORT.ACTIONS.TYPE.REPORT_PREVIEW> {
+    return isActionOfType(reportAction, CONST.REPORT.ACTIONS.TYPE.REPORT_PREVIEW);
 }
 
-function isModifiedExpenseAction(reportAction: OnyxEntry<ReportAction> | ReportAction | Record<string, never>): boolean {
-    return reportAction?.actionName === CONST.REPORT.ACTIONS.TYPE.MODIFIED_EXPENSE;
+function isSubmittedAction(reportAction: OnyxInputOrEntry<ReportAction>): reportAction is ReportAction<typeof CONST.REPORT.ACTIONS.TYPE.SUBMITTED> {
+    return isActionOfType(reportAction, CONST.REPORT.ACTIONS.TYPE.SUBMITTED);
+}
+function isApprovedAction(reportAction: OnyxInputOrEntry<ReportAction>): reportAction is ReportAction<typeof CONST.REPORT.ACTIONS.TYPE.APPROVED> {
+    return isActionOfType(reportAction, CONST.REPORT.ACTIONS.TYPE.APPROVED);
 }
 
-function isWhisperAction(reportAction: OnyxEntry<ReportAction> | EmptyObject): boolean {
-    return (reportAction?.whisperedToAccountIDs ?? []).length > 0;
+function isForwardedAction(reportAction: OnyxInputOrEntry<ReportAction>): reportAction is ReportAction<typeof CONST.REPORT.ACTIONS.TYPE.FORWARDED> {
+    return isActionOfType(reportAction, CONST.REPORT.ACTIONS.TYPE.FORWARDED);
+}
+
+function isModifiedExpenseAction(reportAction: OnyxInputOrEntry<ReportAction>): reportAction is ReportAction<typeof CONST.REPORT.ACTIONS.TYPE.MODIFIED_EXPENSE> {
+    return isActionOfType(reportAction, CONST.REPORT.ACTIONS.TYPE.MODIFIED_EXPENSE);
+}
+
+function isPolicyChangeLogAction(reportAction: OnyxInputOrEntry<ReportAction>): reportAction is ReportAction<ValueOf<typeof CONST.REPORT.ACTIONS.TYPE.POLICY_CHANGE_LOG>> {
+    return isActionOfType(reportAction, ...POLICY_CHANGE_LOG_ARRAY);
+}
+
+function isChronosOOOListAction(reportAction: OnyxInputOrEntry<ReportAction>): reportAction is ReportAction<typeof CONST.REPORT.ACTIONS.TYPE.CHRONOS_OOO_LIST> {
+    return isActionOfType(reportAction, CONST.REPORT.ACTIONS.TYPE.CHRONOS_OOO_LIST);
+}
+
+function isAddCommentAction(reportAction: OnyxInputOrEntry<ReportAction>): reportAction is ReportAction<typeof CONST.REPORT.ACTIONS.TYPE.ADD_COMMENT> {
+    return isActionOfType(reportAction, CONST.REPORT.ACTIONS.TYPE.ADD_COMMENT);
+}
+
+function isCreatedTaskReportAction(reportAction: OnyxInputOrEntry<ReportAction>): reportAction is ReportAction<typeof CONST.REPORT.ACTIONS.TYPE.ADD_COMMENT> {
+    return isActionOfType(reportAction, CONST.REPORT.ACTIONS.TYPE.ADD_COMMENT) && !!getOriginalMessage(reportAction)?.taskReportID;
+}
+
+function isTripPreview(reportAction: OnyxInputOrEntry<ReportAction>): reportAction is ReportAction<typeof CONST.REPORT.ACTIONS.TYPE.TRIPPREVIEW> {
+    return isActionOfType(reportAction, CONST.REPORT.ACTIONS.TYPE.TRIPPREVIEW);
+}
+
+function isActionOfType<T extends ReportActionName[]>(
+    action: OnyxInputOrEntry<ReportAction>,
+    ...actionNames: T
+): action is {
+    [K in keyof T]: ReportAction<T[K]>;
+}[number] {
+    const actionName = action?.actionName as T[number];
+
+    // This is purely a performance optimization to limit the 'includes()' calls on Hermes
+    for (const i of actionNames) {
+        if (i === actionName) {
+            return true;
+        }
+    }
+
+    return false;
+}
+
+function getOriginalMessage<T extends ReportActionName>(reportAction: OnyxInputOrEntry<ReportAction<T>>): OriginalMessage<T> | undefined {
+    if (!Array.isArray(reportAction?.message)) {
+        return reportAction?.message ?? reportAction?.originalMessage;
+    }
+    return reportAction.originalMessage;
+}
+
+function isExportIntegrationAction(reportAction: OnyxInputOrEntry<ReportAction>): boolean {
+    return reportAction?.actionName === CONST.REPORT.ACTIONS.TYPE.EXPORTED_TO_INTEGRATION;
+}
+
+/**
+ * We are in the process of deprecating reportAction.originalMessage and will be setting the db version of "message" to reportAction.message in the future see: https://github.com/Expensify/App/issues/39797
+ * In the interim, we must check to see if we have an object or array for the reportAction.message, if we have an array we will use the originalMessage as this means we have not yet migrated.
+ */
+function getWhisperedTo(reportAction: OnyxInputOrEntry<ReportAction>): number[] {
+    if (!reportAction) {
+        return [];
+    }
+    const originalMessage = getOriginalMessage(reportAction);
+    const message = getReportActionMessage(reportAction);
+
+    if (!(originalMessage && typeof originalMessage === 'object' && 'whisperedTo' in originalMessage) && !(message && typeof message === 'object' && 'whisperedTo' in message)) {
+        return [];
+    }
+
+    if (message !== null && !Array.isArray(message) && typeof message === 'object' && 'whisperedTo' in message) {
+        return message?.whisperedTo ?? [];
+    }
+
+    if (originalMessage && typeof originalMessage === 'object' && 'whisperedTo' in originalMessage) {
+        return originalMessage?.whisperedTo ?? [];
+    }
+
+    if (typeof originalMessage !== 'object') {
+        Log.info('Original message is not an object for reportAction: ', true, {reportActionID: reportAction?.reportActionID, actionName: reportAction?.actionName});
+    }
+
+    return [];
+}
+
+function isWhisperAction(reportAction: OnyxInputOrEntry<ReportAction>): boolean {
+    return getWhisperedTo(reportAction).length > 0;
 }
 
 /**
  * Checks whether the report action is a whisper targeting someone other than the current user.
  */
-function isWhisperActionTargetedToOthers(reportAction: OnyxEntry<ReportAction>): boolean {
+function isWhisperActionTargetedToOthers(reportAction: OnyxInputOrEntry<ReportAction>): boolean {
     if (!isWhisperAction(reportAction)) {
         return false;
     }
-    return !reportAction?.whisperedToAccountIDs?.includes(currentUserAccountID ?? 0);
+    return !getWhisperedTo(reportAction).includes(currentUserAccountID ?? -1);
 }
 
-function isReimbursementQueuedAction(reportAction: OnyxEntry<ReportAction>) {
-    return reportAction?.actionName === CONST.REPORT.ACTIONS.TYPE.REIMBURSEMENT_QUEUED;
+function isReimbursementQueuedAction(reportAction: OnyxInputOrEntry<ReportAction>): reportAction is ReportAction<typeof CONST.REPORT.ACTIONS.TYPE.REIMBURSEMENT_QUEUED> {
+    return isActionOfType(reportAction, CONST.REPORT.ACTIONS.TYPE.REIMBURSEMENT_QUEUED);
 }
 
-function isMemberChangeAction(reportAction: OnyxEntry<ReportAction>) {
-    return (
-        reportAction?.actionName === CONST.REPORT.ACTIONS.TYPE.ROOM_CHANGE_LOG.INVITE_TO_ROOM ||
-        reportAction?.actionName === CONST.REPORT.ACTIONS.TYPE.ROOM_CHANGE_LOG.REMOVE_FROM_ROOM ||
-        reportAction?.actionName === CONST.REPORT.ACTIONS.TYPE.POLICY_CHANGE_LOG.INVITE_TO_ROOM ||
-        reportAction?.actionName === CONST.REPORT.ACTIONS.TYPE.POLICY_CHANGE_LOG.REMOVE_FROM_ROOM ||
-        reportAction?.actionName === CONST.REPORT.ACTIONS.TYPE.POLICY_CHANGE_LOG.LEAVE_POLICY
+function isMemberChangeAction(
+    reportAction: OnyxInputOrEntry<ReportAction>,
+): reportAction is ReportAction<ValueOf<typeof CONST.REPORT.ACTIONS.TYPE.ROOM_CHANGE_LOG | typeof CONST.REPORT.ACTIONS.TYPE.POLICY_CHANGE_LOG>> {
+    return isActionOfType(
+        reportAction,
+        CONST.REPORT.ACTIONS.TYPE.ROOM_CHANGE_LOG.INVITE_TO_ROOM,
+        CONST.REPORT.ACTIONS.TYPE.ROOM_CHANGE_LOG.REMOVE_FROM_ROOM,
+        CONST.REPORT.ACTIONS.TYPE.POLICY_CHANGE_LOG.INVITE_TO_ROOM,
+        CONST.REPORT.ACTIONS.TYPE.POLICY_CHANGE_LOG.REMOVE_FROM_ROOM,
+        CONST.REPORT.ACTIONS.TYPE.POLICY_CHANGE_LOG.LEAVE_POLICY,
     );
 }
 
-function isInviteMemberAction(reportAction: OnyxEntry<ReportAction>) {
-    return reportAction?.actionName === CONST.REPORT.ACTIONS.TYPE.ROOM_CHANGE_LOG.INVITE_TO_ROOM || reportAction?.actionName === CONST.REPORT.ACTIONS.TYPE.POLICY_CHANGE_LOG.INVITE_TO_ROOM;
+function isInviteMemberAction(
+    reportAction: OnyxEntry<ReportAction>,
+): reportAction is ReportAction<typeof CONST.REPORT.ACTIONS.TYPE.ROOM_CHANGE_LOG.INVITE_TO_ROOM | typeof CONST.REPORT.ACTIONS.TYPE.POLICY_CHANGE_LOG.INVITE_TO_ROOM> {
+    return isActionOfType(reportAction, CONST.REPORT.ACTIONS.TYPE.ROOM_CHANGE_LOG.INVITE_TO_ROOM, CONST.REPORT.ACTIONS.TYPE.POLICY_CHANGE_LOG.INVITE_TO_ROOM);
+}
+
+function isLeavePolicyAction(reportAction: OnyxEntry<ReportAction>): reportAction is ReportAction<typeof CONST.REPORT.ACTIONS.TYPE.POLICY_CHANGE_LOG.LEAVE_POLICY> {
+    return isActionOfType(reportAction, CONST.REPORT.ACTIONS.TYPE.POLICY_CHANGE_LOG.LEAVE_POLICY);
+}
+
+function isReimbursementDeQueuedAction(reportAction: OnyxEntry<ReportAction>): reportAction is ReportAction<typeof CONST.REPORT.ACTIONS.TYPE.REIMBURSEMENT_DEQUEUED> {
+    return isActionOfType(reportAction, CONST.REPORT.ACTIONS.TYPE.REIMBURSEMENT_DEQUEUED);
+}
+
+function isClosedAction(reportAction: OnyxEntry<ReportAction>): reportAction is ReportAction<typeof CONST.REPORT.ACTIONS.TYPE.CLOSED> {
+    return isActionOfType(reportAction, CONST.REPORT.ACTIONS.TYPE.CLOSED);
 }
 
-function isLeavePolicyAction(reportAction: OnyxEntry<ReportAction>) {
-    return reportAction?.actionName === CONST.REPORT.ACTIONS.TYPE.POLICY_CHANGE_LOG.LEAVE_POLICY;
+function isRenamedAction(reportAction: OnyxEntry<ReportAction>): reportAction is ReportAction<typeof CONST.REPORT.ACTIONS.TYPE.RENAMED> {
+    return isActionOfType(reportAction, CONST.REPORT.ACTIONS.TYPE.RENAMED);
 }
 
-function isReimbursementDeQueuedAction(reportAction: OnyxEntry<ReportAction>): reportAction is ReportActionBase & OriginalMessageReimbursementDequeued {
-    return reportAction?.actionName === CONST.REPORT.ACTIONS.TYPE.REIMBURSEMENT_DEQUEUED;
+function isRoomChangeLogAction(reportAction: OnyxEntry<ReportAction>): reportAction is ReportAction<ValueOf<typeof CONST.REPORT.ACTIONS.TYPE.ROOM_CHANGE_LOG>> {
+    return isActionOfType(reportAction, ...Object.values(CONST.REPORT.ACTIONS.TYPE.ROOM_CHANGE_LOG));
+}
+
+function isInviteOrRemovedAction(
+    reportAction: OnyxInputOrEntry<ReportAction>,
+): reportAction is ReportAction<ValueOf<typeof CONST.REPORT.ACTIONS.TYPE.POLICY_CHANGE_LOG | typeof CONST.REPORT.ACTIONS.TYPE.ROOM_CHANGE_LOG>> {
+    return isActionOfType(
+        reportAction,
+        CONST.REPORT.ACTIONS.TYPE.ROOM_CHANGE_LOG.INVITE_TO_ROOM,
+        CONST.REPORT.ACTIONS.TYPE.ROOM_CHANGE_LOG.REMOVE_FROM_ROOM,
+        CONST.REPORT.ACTIONS.TYPE.POLICY_CHANGE_LOG.INVITE_TO_ROOM,
+        CONST.REPORT.ACTIONS.TYPE.POLICY_CHANGE_LOG.REMOVE_FROM_ROOM,
+    );
 }
 
 /**
@@ -194,11 +325,11 @@ function isThreadParentMessage(reportAction: OnyxEntry<ReportAction>, reportID:
  *
  * @deprecated Use Onyx.connect() or withOnyx() instead
  */
-function getParentReportAction(report: OnyxEntry<Report> | EmptyObject): ReportAction | EmptyObject {
+function getParentReportAction(report: OnyxInputOrEntry<Report>): OnyxEntry<ReportAction> {
     if (!report?.parentReportID || !report.parentReportActionID) {
-        return {};
+        return undefined;
     }
-    return allReportActions?.[`${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${report.parentReportID}`]?.[report.parentReportActionID] ?? {};
+    return allReportActions?.[`${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${report.parentReportID}`]?.[report.parentReportActionID];
 }
 
 /**
@@ -206,9 +337,9 @@ function getParentReportAction(report: OnyxEntry<Report> | EmptyObject): ReportA
  */
 function isSentMoneyReportAction(reportAction: OnyxEntry<ReportAction | OptimisticIOUReportAction>): boolean {
     return (
-        reportAction?.actionName === CONST.REPORT.ACTIONS.TYPE.IOU &&
-        (reportAction?.originalMessage as IOUMessage)?.type === CONST.IOU.REPORT_ACTION_TYPE.PAY &&
-        !!(reportAction?.originalMessage as IOUMessage)?.IOUDetails
+        isActionOfType(reportAction, CONST.REPORT.ACTIONS.TYPE.IOU) &&
+        getOriginalMessage(reportAction)?.type === CONST.IOU.REPORT_ACTION_TYPE.PAY &&
+        !!getOriginalMessage(reportAction)?.IOUDetails
     );
 }
 
@@ -216,12 +347,15 @@ function isSentMoneyReportAction(reportAction: OnyxEntry<ReportAction | Optimist
  * Returns whether the thread is a transaction thread, which is any thread with IOU parent
  * report action from requesting money (type - create) or from sending money (type - pay with IOUDetails field)
  */
-function isTransactionThread(parentReportAction: OnyxEntry<ReportAction> | EmptyObject): boolean {
+function isTransactionThread(parentReportAction: OnyxInputOrEntry<ReportAction>): boolean {
+    if (isEmptyObject(parentReportAction) || !isMoneyRequestAction(parentReportAction)) {
+        return false;
+    }
+    const originalMessage = getOriginalMessage(parentReportAction);
     return (
-        parentReportAction?.actionName === CONST.REPORT.ACTIONS.TYPE.IOU &&
-        (parentReportAction.originalMessage.type === CONST.IOU.REPORT_ACTION_TYPE.CREATE ||
-            parentReportAction.originalMessage.type === CONST.IOU.REPORT_ACTION_TYPE.TRACK ||
-            (parentReportAction.originalMessage.type === CONST.IOU.REPORT_ACTION_TYPE.PAY && !!parentReportAction.originalMessage.IOUDetails))
+        originalMessage?.type === CONST.IOU.REPORT_ACTION_TYPE.CREATE ||
+        originalMessage?.type === CONST.IOU.REPORT_ACTION_TYPE.TRACK ||
+        (originalMessage?.type === CONST.IOU.REPORT_ACTION_TYPE.PAY && !!originalMessage?.IOUDetails)
     );
 }
 
@@ -265,84 +399,51 @@ function getSortedReportActions(reportActions: ReportAction[] | null, shouldSort
  * Returns a sorted and filtered list of report actions from a report and it's associated child
  * transaction thread report in order to correctly display reportActions from both reports in the one-transaction report view.
  */
-function getCombinedReportActions(reportActions: ReportAction[], transactionThreadReportActions: ReportAction[]): ReportAction[] {
-    if (isEmptyObject(transactionThreadReportActions)) {
+function getCombinedReportActions(
+    reportActions: ReportAction[],
+    transactionThreadReportID: string | null,
+    transactionThreadReportActions: ReportAction[],
+    reportID?: string,
+): ReportAction[] {
+    const isSentMoneyReport = reportActions.some((action) => isSentMoneyReportAction(action));
+
+    // We don't want to combine report actions of transaction thread in iou report of send money request because we display the transaction report of send money request as a normal thread
+    if (_.isEmpty(transactionThreadReportID) || isSentMoneyReport) {
         return reportActions;
     }
 
-    // Filter out the created action from the transaction thread report actions, since we already have the parent report's created action in `reportActions`
-    const filteredTransactionThreadReportActions = transactionThreadReportActions?.filter((action) => action.actionName !== CONST.REPORT.ACTIONS.TYPE.CREATED);
+    // Usually, we filter out the created action from the transaction thread report actions, since we already have the parent report's created action in `reportActions`
+    // However, in the case of moving track expense, the transaction thread will be created first in a track expense, thus we should keep the CREATED of the transaction thread and filter out CREATED action of the IOU
+    // This makes sense because in a combined report action list, whichever CREATED is first need to be retained.
+    const transactionThreadCreatedAction = transactionThreadReportActions?.find((action) => action.actionName === CONST.REPORT.ACTIONS.TYPE.CREATED);
+    const parentReportCreatedAction = reportActions?.find((action) => action.actionName === CONST.REPORT.ACTIONS.TYPE.CREATED);
+
+    let filteredTransactionThreadReportActions = transactionThreadReportActions;
+    let filteredParentReportActions = reportActions;
+
+    if (transactionThreadCreatedAction && parentReportCreatedAction && transactionThreadCreatedAction.created > parentReportCreatedAction.created) {
+        filteredTransactionThreadReportActions = transactionThreadReportActions?.filter((action) => action.actionName !== CONST.REPORT.ACTIONS.TYPE.CREATED);
+    } else if (transactionThreadCreatedAction) {
+        filteredParentReportActions = reportActions?.filter((action) => action.actionName !== CONST.REPORT.ACTIONS.TYPE.CREATED);
+    }
 
+    const report = ReportConnection.getAllReports()?.[`${ONYXKEYS.COLLECTION.REPORT}${reportID}`];
+    const isSelfDM = report?.chatType === CONST.REPORT.CHAT_TYPE.SELF_DM;
     // Filter out request and send money request actions because we don't want to show any preview actions for one transaction reports
-    const filteredReportActions = [...reportActions, ...filteredTransactionThreadReportActions].filter((action) => {
-        const actionType = (action as OriginalMessageIOU).originalMessage?.type ?? '';
-        return actionType !== CONST.IOU.REPORT_ACTION_TYPE.CREATE && actionType !== CONST.IOU.REPORT_ACTION_TYPE.TRACK && !isSentMoneyReportAction(action);
+    const filteredReportActions = [...filteredParentReportActions, ...filteredTransactionThreadReportActions].filter((action) => {
+        if (!isMoneyRequestAction(action)) {
+            return true;
+        }
+        const actionType = getOriginalMessage(action)?.type ?? '';
+        if (isSelfDM) {
+            return actionType !== CONST.IOU.REPORT_ACTION_TYPE.CREATE;
+        }
+        return actionType !== CONST.IOU.REPORT_ACTION_TYPE.CREATE && actionType !== CONST.IOU.REPORT_ACTION_TYPE.TRACK;
     });
 
     return getSortedReportActions(filteredReportActions, true);
 }
 
-/**
- * Returns the largest gapless range of reportActions including a the provided reportActionID, where a "gap" is defined as a reportAction's `previousReportActionID` not matching the previous reportAction in the sortedReportActions array.
- * See unit tests for example of inputs and expected outputs.
- * Note: sortedReportActions sorted in descending order
- */
-function getContinuousReportActionChain(sortedReportActions: ReportAction[], id?: string): ReportAction[] {
-    let index;
-
-    if (id) {
-        index = sortedReportActions.findIndex((reportAction) => reportAction.reportActionID === id);
-    } else {
-        index = sortedReportActions.findIndex(
-            (reportAction) =>
-                reportAction.pendingAction !== CONST.RED_BRICK_ROAD_PENDING_ACTION.ADD &&
-                reportAction.pendingAction !== CONST.RED_BRICK_ROAD_PENDING_ACTION.DELETE &&
-                !reportAction.isOptimisticAction,
-        );
-    }
-
-    if (index === -1) {
-        // if no non-pending action is found, that means all actions on the report are optimistic
-        // in this case, we'll assume the whole chain of reportActions is continuous and return it in its entirety
-        return id ? [] : sortedReportActions;
-    }
-
-    let startIndex = index;
-    let endIndex = index;
-
-    // Iterate forwards through the array, starting from endIndex. This loop checks the continuity of actions by:
-    // 1. Comparing the current item's previousReportActionID with the next item's reportActionID.
-    //    This ensures that we are moving in a sequence of related actions from newer to older.
-    while (
-        (endIndex < sortedReportActions.length - 1 && sortedReportActions[endIndex].previousReportActionID === sortedReportActions[endIndex + 1].reportActionID) ||
-        !!sortedReportActions[endIndex + 1]?.whisperedToAccountIDs?.length ||
-        !!sortedReportActions[endIndex]?.whisperedToAccountIDs?.length ||
-        sortedReportActions[endIndex]?.actionName === CONST.REPORT.ACTIONS.TYPE.ROOM_CHANGE_LOG.INVITE_TO_ROOM ||
-        sortedReportActions[endIndex + 1]?.actionName === CONST.REPORT.ACTIONS.TYPE.CLOSED ||
-        sortedReportActions[endIndex + 1]?.actionName === CONST.REPORT.ACTIONS.TYPE.CREATED
-    ) {
-        endIndex++;
-    }
-
-    // Iterate backwards through the sortedReportActions, starting from startIndex. This loop has two main checks:
-    // 1. It compares the current item's reportActionID with the previous item's previousReportActionID.
-    //    This is to ensure continuity in a sequence of actions.
-    // 2. If the first condition fails, it then checks if the previous item has a pendingAction of 'add'.
-    //    This additional check is to include recently sent messages that might not yet be part of the established sequence.
-    while (
-        (startIndex > 0 && sortedReportActions[startIndex].reportActionID === sortedReportActions[startIndex - 1].previousReportActionID) ||
-        sortedReportActions[startIndex - 1]?.pendingAction === CONST.RED_BRICK_ROAD_PENDING_ACTION.ADD ||
-        sortedReportActions[startIndex - 1]?.pendingAction === CONST.RED_BRICK_ROAD_PENDING_ACTION.DELETE ||
-        // eslint-disable-next-line @typescript-eslint/prefer-nullish-coalescing
-        sortedReportActions[startIndex - 1]?.isOptimisticAction ||
-        sortedReportActions[startIndex - 1]?.actionName === CONST.REPORT.ACTIONS.TYPE.ROOM_CHANGE_LOG.INVITE_TO_ROOM
-    ) {
-        startIndex--;
-    }
-
-    return sortedReportActions.slice(startIndex, endIndex + 1);
-}
-
 /**
  * Finds most recent IOU request action ID.
  */
@@ -355,7 +456,17 @@ function getMostRecentIOURequestActionID(reportActions: ReportAction[] | null):
         CONST.IOU.REPORT_ACTION_TYPE.SPLIT,
         CONST.IOU.REPORT_ACTION_TYPE.TRACK,
     ];
-    const iouRequestActions = reportActions?.filter((action) => action.actionName === CONST.REPORT.ACTIONS.TYPE.IOU && iouRequestTypes.includes(action.originalMessage.type)) ?? [];
+    const iouRequestActions =
+        reportActions?.filter((action) => {
+            if (!isActionOfType(action, CONST.REPORT.ACTIONS.TYPE.IOU)) {
+                return false;
+            }
+            const actionType = getOriginalMessage(action)?.type;
+            if (!actionType) {
+                return false;
+            }
+            return iouRequestTypes.includes(actionType);
+        }) ?? [];
 
     if (iouRequestActions.length === 0) {
         return null;
@@ -369,10 +480,9 @@ function getMostRecentIOURequestActionID(reportActions: ReportAction[] | null):
  * Returns array of links inside a given report action
  */
 function extractLinksFromMessageHtml(reportAction: OnyxEntry<ReportAction>): string[] {
-    const htmlContent = reportAction?.message?.[0]?.html;
+    const htmlContent = getReportActionHtml(reportAction);
 
-    // Regex to get link in href prop inside of <a/> component
-    const regex = /<a\s+(?:[^>]*?\s+)?href="([^"]*)"/gi;
+    const regex = CONST.REGEX_LINK_IN_ANCHOR;
 
     if (!htmlContent) {
         return [];
@@ -386,9 +496,9 @@ function extractLinksFromMessageHtml(reportAction: OnyxEntry<ReportAction>): str
  * @param reportActions - all actions
  * @param actionIndex - index of the action
  */
-function findPreviousAction(reportActions: ReportAction[] | null, actionIndex: number): OnyxEntry<ReportAction> {
+function findPreviousAction(reportActions: ReportAction[] | undefined, actionIndex: number): OnyxEntry<ReportAction> {
     if (!reportActions) {
-        return null;
+        return undefined;
     }
 
     for (let i = actionIndex + 1; i < reportActions.length; i++) {
@@ -399,7 +509,7 @@ function findPreviousAction(reportActions: ReportAction[] | null, actionIndex: n
         }
     }
 
-    return null;
+    return undefined;
 }
 
 /**
@@ -408,7 +518,7 @@ function findPreviousAction(reportActions: ReportAction[] | null, actionIndex: n
  *
  * @param actionIndex - index of the comment item in state to check
  */
-function isConsecutiveActionMadeByPreviousActor(reportActions: ReportAction[] | null, actionIndex: number): boolean {
+function isConsecutiveActionMadeByPreviousActor(reportActions: ReportAction[] | undefined, actionIndex: number): boolean {
     const previousAction = findPreviousAction(reportActions, actionIndex);
     const currentAction = reportActions?.[actionIndex];
 
@@ -443,13 +553,13 @@ function isConsecutiveActionMadeByPreviousActor(reportActions: ReportAction[] |
         return false;
     }
 
-    if (isReportActionSubmitted(currentAction)) {
+    if (isSubmittedAction(currentAction)) {
         const currentActionAdminAccountID = currentAction.adminAccountID;
 
         return currentActionAdminAccountID === previousAction.actorAccountID || currentActionAdminAccountID === previousAction.adminAccountID;
     }
 
-    if (isReportActionSubmitted(previousAction)) {
+    if (isSubmittedAction(previousAction)) {
         return typeof previousAction.adminAccountID === 'number'
             ? currentAction.actorAccountID === previousAction.adminAccountID
             : currentAction.actorAccountID === previousAction.actorAccountID;
@@ -473,11 +583,22 @@ function isReportActionDeprecated(reportAction: OnyxEntry<ReportAction>, key: st
         return true;
     }
 
+    const deprecatedOldDotReportActions: ReportActionName[] = [
+        CONST.REPORT.ACTIONS.TYPE.DELETED_ACCOUNT,
+        CONST.REPORT.ACTIONS.TYPE.REIMBURSEMENT_REQUESTED,
+        CONST.REPORT.ACTIONS.TYPE.REIMBURSEMENT_SETUP_REQUESTED,
+        CONST.REPORT.ACTIONS.TYPE.DONATION,
+    ];
+    if (deprecatedOldDotReportActions.includes(reportAction.actionName)) {
+        Log.info('Front end filtered out reportAction for being an older, deprecated report action', false, reportAction);
+        return true;
+    }
+
     return false;
 }
 
 const {POLICY_CHANGE_LOG: policyChangelogTypes, ROOM_CHANGE_LOG: roomChangeLogTypes, ...otherActionTypes} = CONST.REPORT.ACTIONS.TYPE;
-const supportedActionTypes: ActionName[] = [...Object.values(otherActionTypes), ...Object.values(policyChangelogTypes), ...Object.values(roomChangeLogTypes)];
+const supportedActionTypes: ReportActionName[] = [...Object.values(otherActionTypes), ...Object.values(policyChangelogTypes), ...Object.values(roomChangeLogTypes)];
 
 /**
  * Checks if a reportAction is fit for display, meaning that it's not deprecated, is of a valid
@@ -516,9 +637,14 @@ function shouldReportActionBeVisible(reportAction: OnyxEntry<ReportAction>, key:
         return false;
     }
 
+    if (isTripPreview(reportAction)) {
+        return true;
+    }
+
     // All other actions are displayed except thread parents, deleted, or non-pending actions
     const isDeleted = isDeletedAction(reportAction);
     const isPending = !!reportAction.pendingAction;
+
     return !isDeleted || isPending || isDeletedParentAction(reportAction) || isReversedTransaction(reportAction);
 }
 
@@ -532,11 +658,29 @@ function shouldHideNewMarker(reportAction: OnyxEntry<ReportAction>): boolean {
     return !isNetworkOffline && reportAction.pendingAction === CONST.RED_BRICK_ROAD_PENDING_ACTION.DELETE;
 }
 
+/**
+ * Checks whether an action is actionable track expense.
+ *
+ */
+function isActionableTrackExpense(reportAction: OnyxInputOrEntry<ReportAction>): reportAction is ReportAction<typeof CONST.REPORT.ACTIONS.TYPE.ACTIONABLE_TRACK_EXPENSE_WHISPER> {
+    return isActionOfType(reportAction, CONST.REPORT.ACTIONS.TYPE.ACTIONABLE_TRACK_EXPENSE_WHISPER);
+}
+
+/**
+ * Checks whether an action is actionable track expense and resolved.
+ *
+ */
+function isResolvedActionTrackExpense(reportAction: OnyxEntry<ReportAction>): boolean {
+    const originalMessage = getOriginalMessage(reportAction);
+    const resolution = originalMessage && typeof originalMessage === 'object' && 'resolution' in originalMessage ? originalMessage?.resolution : null;
+    return isActionableTrackExpense(reportAction) && !!resolution;
+}
+
 /**
  * Checks if a reportAction is fit for display as report last action, meaning that
  * it satisfies shouldReportActionBeVisible, it's not whisper action and not deleted.
  */
-function shouldReportActionBeVisibleAsLastAction(reportAction: OnyxEntry<ReportAction>): boolean {
+function shouldReportActionBeVisibleAsLastAction(reportAction: OnyxInputOrEntry<ReportAction>): boolean {
     if (!reportAction) {
         return false;
     }
@@ -550,7 +694,8 @@ function shouldReportActionBeVisibleAsLastAction(reportAction: OnyxEntry<ReportA
     return (
         shouldReportActionBeVisible(reportAction, reportAction.reportActionID) &&
         !(isWhisperAction(reportAction) && !isReportPreviewAction(reportAction) && !isMoneyRequestAction(reportAction)) &&
-        !(isDeletedAction(reportAction) && !isDeletedParentAction(reportAction))
+        !(isDeletedAction(reportAction) && !isDeletedParentAction(reportAction)) &&
+        !isResolvedActionTrackExpense(reportAction)
     );
 }
 
@@ -559,7 +704,7 @@ function shouldReportActionBeVisibleAsLastAction(reportAction: OnyxEntry<ReportA
  * which includes a baseURL placeholder that's replaced in the client.
  */
 function replaceBaseURLInPolicyChangeLogAction(reportAction: ReportAction): ReportAction {
-    if (!reportAction?.message || !policyChangeActionsSet.has(reportAction?.actionName)) {
+    if (!reportAction?.message || !isPolicyChangeLogAction(reportAction)) {
         return reportAction;
     }
 
@@ -569,26 +714,37 @@ function replaceBaseURLInPolicyChangeLogAction(reportAction: ReportAction): Repo
         return updatedReportAction;
     }
 
-    if (updatedReportAction.message[0]) {
-        updatedReportAction.message[0].html = reportAction.message?.[0]?.html?.replace('%baseURL', environmentURL);
+    if (Array.isArray(updatedReportAction.message) && updatedReportAction.message[0]) {
+        updatedReportAction.message[0].html = getReportActionHtml(reportAction)?.replace('%baseURL', environmentURL);
     }
 
     return updatedReportAction;
 }
 
-function getLastVisibleAction(reportID: string, actionsToMerge: OnyxCollection<ReportAction> = {}): OnyxEntry<ReportAction> {
-    const reportActions = Object.values(fastMerge(allReportActions?.[`${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${reportID}`] ?? {}, actionsToMerge ?? {}, true));
-    const visibleReportActions = Object.values(reportActions ?? {}).filter((action): action is ReportAction => shouldReportActionBeVisibleAsLastAction(action));
+function getLastVisibleAction(reportID: string, actionsToMerge: Record<string, NullishDeep<ReportAction> | null> = {}): OnyxEntry<ReportAction> {
+    let reportActions: Array<ReportAction | null | undefined> = [];
+    if (!_.isEmpty(actionsToMerge)) {
+        reportActions = Object.values(fastMerge(allReportActions?.[`${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${reportID}`] ?? {}, actionsToMerge ?? {}, true)) as Array<
+            ReportAction | null | undefined
+        >;
+    } else {
+        reportActions = Object.values(allReportActions?.[`${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${reportID}`] ?? {});
+    }
+    const visibleReportActions = reportActions.filter((action): action is ReportAction => shouldReportActionBeVisibleAsLastAction(action));
     const sortedReportActions = getSortedReportActions(visibleReportActions, true);
     if (sortedReportActions.length === 0) {
-        return null;
+        return undefined;
     }
     return sortedReportActions[0];
 }
 
-function getLastVisibleMessage(reportID: string, actionsToMerge: OnyxCollection<ReportAction> = {}, reportAction: OnyxEntry<ReportAction> | undefined = undefined): LastVisibleMessage {
+function getLastVisibleMessage(
+    reportID: string,
+    actionsToMerge: Record<string, NullishDeep<ReportAction> | null> = {},
+    reportAction: OnyxInputOrEntry<ReportAction> | undefined = undefined,
+): LastVisibleMessage {
     const lastVisibleAction = reportAction ?? getLastVisibleAction(reportID, actionsToMerge);
-    const message = lastVisibleAction?.message?.[0];
+    const message = getReportActionMessage(lastVisibleAction);
 
     if (message && isReportMessageAttachment(message)) {
         return {
@@ -604,9 +760,9 @@ function getLastVisibleMessage(reportID: string, actionsToMerge: OnyxCollection<
         };
     }
 
-    let messageText = message?.text ?? '';
+    let messageText = getReportActionMessageText(lastVisibleAction) ?? '';
     if (messageText) {
-        messageText = String(messageText).replace(CONST.REGEX.LINE_BREAK, ' ').substring(0, CONST.REPORT.LAST_MESSAGE_TEXT_MAX_LENGTH).trim();
+        messageText = StringUtils.lineBreaksToSpaces(String(messageText)).substring(0, CONST.REPORT.LAST_MESSAGE_TEXT_MAX_LENGTH).trim();
     }
     return {
         lastMessageText: messageText,
@@ -616,7 +772,7 @@ function getLastVisibleMessage(reportID: string, actionsToMerge: OnyxCollection<
 /**
  * A helper method to filter out report actions keyed by sequenceNumbers.
  */
-function filterOutDeprecatedReportActions(reportActions: ReportActions | null): ReportAction[] {
+function filterOutDeprecatedReportActions(reportActions: OnyxEntry<ReportActions>): ReportAction[] {
     return Object.entries(reportActions ?? {})
         .filter(([key, reportAction]) => !isReportActionDeprecated(reportAction, key))
         .map((entry) => entry[1]);
@@ -628,14 +784,14 @@ function filterOutDeprecatedReportActions(reportActions: ReportActions | null):
  * to ensure they will always be displayed in the same order (in case multiple actions have the same timestamp).
  * This is all handled with getSortedReportActions() which is used by several other methods to keep the code DRY.
  */
-function getSortedReportActionsForDisplay(reportActions: ReportActions | null | ReportAction[], shouldIncludeInvisibleActions = false): ReportAction[] {
+function getSortedReportActionsForDisplay(reportActions: OnyxEntry<ReportActions> | ReportAction[], shouldIncludeInvisibleActions = false): ReportAction[] {
     let filteredReportActions: ReportAction[] = [];
     if (!reportActions) {
         return [];
     }
 
     if (shouldIncludeInvisibleActions) {
-        filteredReportActions = Object.values(reportActions);
+        filteredReportActions = Object.values(reportActions).filter(Boolean);
     } else {
         filteredReportActions = Object.entries(reportActions)
             .filter(([key, reportAction]) => shouldReportActionBeVisible(reportAction, key))
@@ -652,15 +808,15 @@ function getSortedReportActionsForDisplay(reportActions: ReportActions | null |
  * Additionally, archived #admins and #announce do not have the closed report action so we will return null if none is found.
  *
  */
-function getLastClosedReportAction(reportActions: ReportActions | null): OnyxEntry<ReportAction> {
+function getLastClosedReportAction(reportActions: OnyxEntry<ReportActions>): OnyxEntry<ReportAction> {
     // If closed report action is not present, return early
     if (!Object.values(reportActions ?? {}).some((action) => action.actionName === CONST.REPORT.ACTIONS.TYPE.CLOSED)) {
-        return null;
+        return undefined;
     }
 
     const filteredReportActions = filterOutDeprecatedReportActions(reportActions);
     const sortedReportActions = getSortedReportActions(filteredReportActions);
-    return lodashFindLast(sortedReportActions, (action) => action.actionName === CONST.REPORT.ACTIONS.TYPE.CLOSED) ?? null;
+    return lodashFindLast(sortedReportActions, (action) => action.actionName === CONST.REPORT.ACTIONS.TYPE.CLOSED);
 }
 
 /**
@@ -682,7 +838,7 @@ function getFirstVisibleReportActionID(sortedReportActions: ReportAction[] = [],
 /**
  * @returns The latest report action in the `onyxData` or `null` if one couldn't be found
  */
-function getLatestReportActionFromOnyxData(onyxData: OnyxUpdate[] | null): OnyxEntry<ReportAction> {
+function getLatestReportActionFromOnyxData(onyxData: OnyxUpdate[] | null): NonNullable<OnyxEntry<ReportAction>> | null {
     const reportActionUpdate = onyxData?.find((onyxUpdate) => onyxUpdate.key.startsWith(ONYXKEYS.COLLECTION.REPORT_ACTIONS));
 
     if (!reportActionUpdate) {
@@ -699,14 +855,14 @@ function getLatestReportActionFromOnyxData(onyxData: OnyxUpdate[] | null): OnyxE
  */
 function getLinkedTransactionID(reportActionOrID: string | OnyxEntry<ReportAction>, reportID?: string): string | null {
     const reportAction = typeof reportActionOrID === 'string' ? allReportActions?.[`${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${reportID}`]?.[reportActionOrID] : reportActionOrID;
-    if (!reportAction || reportAction.actionName !== CONST.REPORT.ACTIONS.TYPE.IOU) {
+    if (!reportAction || !isMoneyRequestAction(reportAction)) {
         return null;
     }
-    return reportAction.originalMessage?.IOUTransactionID ?? null;
+    return getOriginalMessage(reportAction)?.IOUTransactionID ?? null;
 }
 
-function getReportAction(reportID: string, reportActionID: string): OnyxEntry<ReportAction> {
-    return allReportActions?.[`${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${reportID}`]?.[reportActionID] ?? null;
+function getReportAction(reportID: string, reportActionID: string): ReportAction | undefined {
+    return allReportActions?.[`${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${reportID}`]?.[reportActionID];
 }
 
 function getMostRecentReportActionLastModified(): string {
@@ -736,7 +892,7 @@ function getMostRecentReportActionLastModified(): string {
 
     // We might not have actions so we also look at the report objects to see if any have a lastVisibleActionLastModified that is more recent. We don't need to get
     // any reports that have been updated before either a recently updated report or reportAction as we should be up to date on these
-    Object.values(allReports ?? {}).forEach((report) => {
+    Object.values(ReportConnection.getAllReports() ?? {}).forEach((report) => {
         const reportLastVisibleActionLastModified = report?.lastVisibleActionLastModified ?? report?.lastVisibleActionCreated;
         if (!reportLastVisibleActionLastModified || reportLastVisibleActionLastModified < mostRecentReportActionLastModified) {
             return;
@@ -751,11 +907,10 @@ function getMostRecentReportActionLastModified(): string {
 /**
  * @returns The report preview action or `null` if one couldn't be found
  */
-function getReportPreviewAction(chatReportID: string, iouReportID: string): OnyxEntry<ReportAction> {
-    return (
-        Object.values(allReportActions?.[`${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${chatReportID}`] ?? {}).find(
-            (reportAction) => reportAction && reportAction.actionName === CONST.REPORT.ACTIONS.TYPE.REPORT_PREVIEW && reportAction.originalMessage.linkedReportID === iouReportID,
-        ) ?? null
+function getReportPreviewAction(chatReportID: string, iouReportID: string): OnyxEntry<ReportAction<typeof CONST.REPORT.ACTIONS.TYPE.REPORT_PREVIEW>> {
+    return Object.values(allReportActions?.[`${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${chatReportID}`] ?? {}).find(
+        (reportAction): reportAction is ReportAction<typeof CONST.REPORT.ACTIONS.TYPE.REPORT_PREVIEW> =>
+            reportAction && isActionOfType(reportAction, CONST.REPORT.ACTIONS.TYPE.REPORT_PREVIEW) && getOriginalMessage(reportAction)?.linkedReportID === iouReportID,
     );
 }
 
@@ -763,18 +918,14 @@ function getReportPreviewAction(chatReportID: string, iouReportID: string): Onyx
  * Get the iouReportID for a given report action.
  */
 function getIOUReportIDFromReportActionPreview(reportAction: OnyxEntry<ReportAction>): string {
-    return reportAction?.actionName === CONST.REPORT.ACTIONS.TYPE.REPORT_PREVIEW ? reportAction.originalMessage.linkedReportID : '0';
-}
-
-function isCreatedTaskReportAction(reportAction: OnyxEntry<ReportAction>): boolean {
-    return reportAction?.actionName === CONST.REPORT.ACTIONS.TYPE.ADD_COMMENT && !!reportAction.originalMessage?.taskReportID;
+    return isActionOfType(reportAction, CONST.REPORT.ACTIONS.TYPE.REPORT_PREVIEW) ? getOriginalMessage(reportAction)?.linkedReportID ?? '-1' : '-1';
 }
 
 /**
  * A helper method to identify if the message is deleted or not.
  */
-function isMessageDeleted(reportAction: OnyxEntry<ReportAction>): boolean {
-    return reportAction?.message?.[0]?.isDeletedParentAction ?? false;
+function isMessageDeleted(reportAction: OnyxInputOrEntry<ReportAction>): boolean {
+    return getReportActionMessage(reportAction)?.isDeletedParentAction ?? false;
 }
 
 /**
@@ -784,12 +935,16 @@ function getNumberOfMoneyRequests(reportPreviewAction: OnyxEntry<ReportAction>):
     return reportPreviewAction?.childMoneyRequestCount ?? 0;
 }
 
-function isSplitBillAction(reportAction: OnyxEntry<ReportAction>): boolean {
-    return reportAction?.actionName === CONST.REPORT.ACTIONS.TYPE.IOU && reportAction.originalMessage.type === CONST.IOU.REPORT_ACTION_TYPE.SPLIT;
+function isSplitBillAction(reportAction: OnyxInputOrEntry<ReportAction>): reportAction is ReportAction<typeof CONST.REPORT.ACTIONS.TYPE.IOU> {
+    return isActionOfType(reportAction, CONST.REPORT.ACTIONS.TYPE.IOU) && getOriginalMessage(reportAction)?.type === CONST.IOU.REPORT_ACTION_TYPE.SPLIT;
+}
+
+function isTrackExpenseAction(reportAction: OnyxEntry<ReportAction | OptimisticIOUReportAction>): reportAction is ReportAction<typeof CONST.REPORT.ACTIONS.TYPE.IOU> {
+    return isActionOfType(reportAction, CONST.REPORT.ACTIONS.TYPE.IOU) && getOriginalMessage(reportAction)?.type === CONST.IOU.REPORT_ACTION_TYPE.TRACK;
 }
 
-function isTrackExpenseAction(reportAction: OnyxEntry<ReportAction | OptimisticIOUReportAction>): boolean {
-    return reportAction?.actionName === CONST.REPORT.ACTIONS.TYPE.IOU && (reportAction.originalMessage as IOUMessage).type === CONST.IOU.REPORT_ACTION_TYPE.TRACK;
+function isPayAction(reportAction: OnyxInputOrEntry<ReportAction | OptimisticIOUReportAction>): reportAction is ReportAction<typeof CONST.REPORT.ACTIONS.TYPE.IOU> {
+    return isActionOfType(reportAction, CONST.REPORT.ACTIONS.TYPE.IOU) && getOriginalMessage(reportAction)?.type === CONST.IOU.REPORT_ACTION_TYPE.PAY;
 }
 
 function isTaskAction(reportAction: OnyxEntry<ReportAction>): boolean {
@@ -802,65 +957,71 @@ function isTaskAction(reportAction: OnyxEntry<ReportAction>): boolean {
     );
 }
 
+// Get all IOU report actions for the report.
+const iouRequestTypes = new Set<ValueOf<typeof CONST.IOU.REPORT_ACTION_TYPE>>([
+    CONST.IOU.REPORT_ACTION_TYPE.CREATE,
+    CONST.IOU.REPORT_ACTION_TYPE.SPLIT,
+    CONST.IOU.REPORT_ACTION_TYPE.PAY,
+    CONST.IOU.REPORT_ACTION_TYPE.TRACK,
+]);
 /**
  * Gets the reportID for the transaction thread associated with a report by iterating over the reportActions and identifying the IOU report actions.
  * Returns a reportID if there is exactly one transaction thread for the report, and null otherwise.
  */
-function getOneTransactionThreadReportID(
-    reportID: string,
-    reportActions: OnyxEntry<ReportActions> | ReportAction[],
-    skipReportTypeCheck: boolean | undefined = undefined,
-    isOffline: boolean | undefined = undefined,
-): string | null {
-    if (!skipReportTypeCheck) {
-        // If the report is not an IOU, Expense report, or Invoice, it shouldn't be treated as one-transaction report.
-        const report = allReports?.[`${ONYXKEYS.COLLECTION.REPORT}${reportID}`];
-        if (report?.type !== CONST.REPORT.TYPE.IOU && report?.type !== CONST.REPORT.TYPE.EXPENSE && report?.type !== CONST.REPORT.TYPE.INVOICE) {
-            return null;
-        }
+function getOneTransactionThreadReportID(reportID: string, reportActions: OnyxEntry<ReportActions> | ReportAction[], isOffline: boolean | undefined = undefined): string | undefined {
+    // If the report is not an IOU, Expense report, or Invoice, it shouldn't be treated as one-transaction report.
+    const report = ReportConnection.getAllReports()?.[`${ONYXKEYS.COLLECTION.REPORT}${reportID}`];
+    if (report?.type !== CONST.REPORT.TYPE.IOU && report?.type !== CONST.REPORT.TYPE.EXPENSE && report?.type !== CONST.REPORT.TYPE.INVOICE) {
+        return;
     }
 
-    const reportActionsArray = Object.values(reportActions ?? {});
+    const reportActionsArray = Array.isArray(reportActions) ? reportActions : Object.values(reportActions ?? {});
     if (!reportActionsArray.length) {
-        return null;
+        return;
     }
 
-    // Get all IOU report actions for the report.
-    const iouRequestTypes: Array<ValueOf<typeof CONST.IOU.REPORT_ACTION_TYPE>> = [
-        CONST.IOU.REPORT_ACTION_TYPE.CREATE,
-        CONST.IOU.REPORT_ACTION_TYPE.SPLIT,
-        CONST.IOU.REPORT_ACTION_TYPE.PAY,
-        CONST.IOU.REPORT_ACTION_TYPE.TRACK,
-    ];
+    const iouRequestActions = [];
+    for (const action of reportActionsArray) {
+        if (!isMoneyRequestAction(action)) {
+            // eslint-disable-next-line no-continue
+            continue;
+        }
 
-    const iouRequestActions = reportActionsArray.filter(
-        (action) =>
-            action.actionName === CONST.REPORT.ACTIONS.TYPE.IOU &&
-            (iouRequestTypes.includes(action.originalMessage.type) ?? []) &&
+        const originalMessage = getOriginalMessage(action);
+        const actionType = originalMessage?.type;
+        if (
+            actionType &&
+            iouRequestTypes.has(actionType) &&
             action.childReportID &&
             // Include deleted IOU reportActions if:
             // - they have an assocaited IOU transaction ID or
             // - they have visibile childActions (like comments) that we'd want to display
             // - the action is pending deletion and the user is offline
-            (Boolean(action.originalMessage.IOUTransactionID) ||
+            (!!originalMessage?.IOUTransactionID ||
                 // eslint-disable-next-line @typescript-eslint/prefer-nullish-coalescing
                 (isMessageDeleted(action) && action.childVisibleActionCount) ||
-                (action.pendingAction === CONST.RED_BRICK_ROAD_PENDING_ACTION.DELETE && (isOffline ?? isNetworkOffline))),
-    );
+                (action.pendingAction === CONST.RED_BRICK_ROAD_PENDING_ACTION.DELETE && (isOffline ?? isNetworkOffline)))
+        ) {
+            iouRequestActions.push(action);
+        }
+    }
 
     // If we don't have any IOU request actions, or we have more than one IOU request actions, this isn't a oneTransaction report
     if (!iouRequestActions.length || iouRequestActions.length > 1) {
-        return null;
+        return;
     }
 
+    const singleAction = iouRequestActions[0];
+    const originalMessage = getOriginalMessage(singleAction);
+
     // If there's only one IOU request action associated with the report but it's been deleted, then we don't consider this a oneTransaction report
     // and want to display it using the standard view
-    if (((iouRequestActions[0] as OriginalMessageIOU).originalMessage?.deleted ?? '') !== '') {
-        return null;
+    if ((originalMessage?.deleted ?? '') !== '' && isMoneyRequestAction(singleAction)) {
+        return;
     }
 
     // Ensure we have a childReportID associated with the IOU report action
-    return iouRequestActions[0].childReportID ?? null;
+    return singleAction.childReportID;
 }
 
 /**
@@ -884,11 +1045,11 @@ function getAllReportActions(reportID: string): ReportActions {
  * Check whether a report action is an attachment (a file, such as an image or a zip).
  *
  */
-function isReportActionAttachment(reportAction: OnyxEntry<ReportAction>): boolean {
-    const message = reportAction?.message?.[0];
+function isReportActionAttachment(reportAction: OnyxInputOrEntry<ReportAction>): boolean {
+    const message = getReportActionMessage(reportAction);
 
-    if (reportAction && ('isAttachment' in reportAction || 'attachmentInfo' in reportAction)) {
-        return reportAction?.isAttachment ?? !!reportAction?.attachmentInfo ?? false;
+    if (reportAction && ('isAttachmentOnly' in reportAction || 'isAttachmentWithText' in reportAction)) {
+        return reportAction.isAttachmentOnly ?? reportAction.isAttachmentWithText ?? false;
     }
 
     if (message) {
@@ -904,7 +1065,7 @@ function isNotifiableReportAction(reportAction: OnyxEntry<ReportAction>): boolea
         return false;
     }
 
-    const actions: ActionName[] = [CONST.REPORT.ACTIONS.TYPE.ADD_COMMENT, CONST.REPORT.ACTIONS.TYPE.IOU, CONST.REPORT.ACTIONS.TYPE.MODIFIED_EXPENSE];
+    const actions: ReportActionName[] = [CONST.REPORT.ACTIONS.TYPE.ADD_COMMENT, CONST.REPORT.ACTIONS.TYPE.IOU, CONST.REPORT.ACTIONS.TYPE.MODIFIED_EXPENSE];
 
     return actions.includes(reportAction.actionName);
 }
@@ -913,6 +1074,10 @@ function getMemberChangeMessageElements(reportAction: OnyxEntry<ReportAction>):
     const isInviteAction = isInviteMemberAction(reportAction);
     const isLeaveAction = isLeavePolicyAction(reportAction);
 
+    if (!isMemberChangeAction(reportAction)) {
+        return [];
+    }
+
     // Currently, we only render messages when members are invited
     let verb = Localize.translateLocal('workspace.invite.removed');
     if (isInviteAction) {
@@ -923,7 +1088,7 @@ function getMemberChangeMessageElements(reportAction: OnyxEntry<ReportAction>):
         verb = Localize.translateLocal('workspace.invite.leftWorkspace');
     }
 
-    const originalMessage = reportAction?.originalMessage as ChangeLog;
+    const originalMessage = getOriginalMessage(reportAction);
     const targetAccountIDs: number[] = originalMessage?.targetAccountIDs ?? [];
     const personalDetails = PersonalDetailsUtils.getPersonalDetailsByIDs(targetAccountIDs, 0);
 
@@ -973,40 +1138,39 @@ function getMemberChangeMessageElements(reportAction: OnyxEntry<ReportAction>):
     ];
 }
 
-function getMemberChangeMessageFragment(reportAction: OnyxEntry<ReportAction>): Message {
-    const messageElements: readonly MemberChangeMessageElement[] = getMemberChangeMessageElements(reportAction);
-    const html = messageElements
-        .map((messageElement) => {
-            switch (messageElement.kind) {
-                case 'userMention':
-                    return `<mention-user accountID=${messageElement.accountID}>${messageElement.content}</mention-user>`;
-                case 'roomReference':
-                    return `<a href="${environmentURL}/r/${messageElement.roomID}" target="_blank">${messageElement.roomName}</a>`;
-                default:
-                    return messageElement.content;
-            }
-        })
-        .join('');
+function getReportActionHtml(reportAction: PartialReportAction): string {
+    return getReportActionMessage(reportAction)?.html ?? '';
+}
 
-    return {
-        html: `<muted-text>${html}</muted-text>`,
-        text: reportAction?.message?.[0] ? reportAction?.message?.[0]?.text : '',
-        type: CONST.REPORT.MESSAGE.TYPE.COMMENT,
-    };
+function getReportActionText(reportAction: PartialReportAction): string {
+    const message = getReportActionMessage(reportAction);
+    // Sometime html can be an empty string
+    // eslint-disable-next-line @typescript-eslint/prefer-nullish-coalescing
+    const text = (message?.html || message?.text) ?? '';
+    return text ? Parser.htmlToText(text) : '';
+}
+
+function getTextFromHtml(html?: string): string {
+    return html ? Parser.htmlToText(html) : '';
+}
+
+function isOldDotLegacyAction(action: OldDotReportAction | PartialReportAction): action is PartialReportAction {
+    return [
+        CONST.REPORT.ACTIONS.TYPE.DELETED_ACCOUNT,
+        CONST.REPORT.ACTIONS.TYPE.DONATION,
+        CONST.REPORT.ACTIONS.TYPE.EXPORTED_TO_QUICK_BOOKS,
+        CONST.REPORT.ACTIONS.TYPE.REIMBURSEMENT_REQUESTED,
+        CONST.REPORT.ACTIONS.TYPE.REIMBURSEMENT_SETUP,
+    ].some((oldDotActionName) => oldDotActionName === action?.actionName);
 }
 
-function isOldDotReportAction(action: ReportAction): boolean {
+function isOldDotReportAction(action: ReportAction | OldDotReportAction) {
     return [
         CONST.REPORT.ACTIONS.TYPE.CHANGE_FIELD,
         CONST.REPORT.ACTIONS.TYPE.CHANGE_POLICY,
         CONST.REPORT.ACTIONS.TYPE.CHANGE_TYPE,
         CONST.REPORT.ACTIONS.TYPE.DELEGATE_SUBMIT,
-        CONST.REPORT.ACTIONS.TYPE.DELETED_ACCOUNT,
-        CONST.REPORT.ACTIONS.TYPE.DONATION,
         CONST.REPORT.ACTIONS.TYPE.EXPORTED_TO_CSV,
-        CONST.REPORT.ACTIONS.TYPE.EXPORTED_TO_INTEGRATION,
-        CONST.REPORT.ACTIONS.TYPE.EXPORTED_TO_QUICK_BOOKS,
-        CONST.REPORT.ACTIONS.TYPE.FORWARDED,
         CONST.REPORT.ACTIONS.TYPE.INTEGRATIONS_MESSAGE,
         CONST.REPORT.ACTIONS.TYPE.MANAGER_ATTACH_RECEIPT,
         CONST.REPORT.ACTIONS.TYPE.MANAGER_DETACH_RECEIPT,
@@ -1017,23 +1181,123 @@ function isOldDotReportAction(action: ReportAction): boolean {
         CONST.REPORT.ACTIONS.TYPE.REIMBURSEMENT_ACH_CANCELLED,
         CONST.REPORT.ACTIONS.TYPE.REIMBURSEMENT_ACCOUNT_CHANGED,
         CONST.REPORT.ACTIONS.TYPE.REIMBURSEMENT_DELAYED,
-        CONST.REPORT.ACTIONS.TYPE.REIMBURSEMENT_REQUESTED,
-        CONST.REPORT.ACTIONS.TYPE.REIMBURSEMENT_SETUP,
         CONST.REPORT.ACTIONS.TYPE.SELECTED_FOR_RANDOM_AUDIT,
         CONST.REPORT.ACTIONS.TYPE.SHARE,
         CONST.REPORT.ACTIONS.TYPE.STRIPE_PAID,
         CONST.REPORT.ACTIONS.TYPE.TAKE_CONTROL,
-        CONST.REPORT.ACTIONS.TYPE.UNAPPROVED,
         CONST.REPORT.ACTIONS.TYPE.UNSHARE,
+        CONST.REPORT.ACTIONS.TYPE.DELETED_ACCOUNT,
+        CONST.REPORT.ACTIONS.TYPE.DONATION,
+        CONST.REPORT.ACTIONS.TYPE.EXPORTED_TO_QUICK_BOOKS,
+        CONST.REPORT.ACTIONS.TYPE.REIMBURSEMENT_REQUESTED,
+        CONST.REPORT.ACTIONS.TYPE.REIMBURSEMENT_SETUP,
     ].some((oldDotActionName) => oldDotActionName === action.actionName);
 }
 
+function getMessageOfOldDotLegacyAction(legacyAction: PartialReportAction) {
+    if (!Array.isArray(legacyAction?.message)) {
+        return getReportActionText(legacyAction);
+    }
+    if (legacyAction.message.length !== 0) {
+        // Sometime html can be an empty string
+        // eslint-disable-next-line @typescript-eslint/prefer-nullish-coalescing
+        return legacyAction?.message?.map((element) => getTextFromHtml(element?.html || element?.text)).join('') ?? '';
+    }
+    return '';
+}
+
 /**
  * Helper method to format message of OldDot Actions.
- * For now, we just concat all of the text elements of the message to create the full message.
  */
-function getMessageOfOldDotReportAction(reportAction: OnyxEntry<ReportAction>): string {
-    return reportAction?.message?.map((element) => element?.text).join('') ?? '';
+function getMessageOfOldDotReportAction(oldDotAction: PartialReportAction | OldDotReportAction, withMarkdown = true): string {
+    if (isOldDotLegacyAction(oldDotAction)) {
+        return getMessageOfOldDotLegacyAction(oldDotAction);
+    }
+
+    const {originalMessage, actionName} = oldDotAction;
+    switch (actionName) {
+        case CONST.REPORT.ACTIONS.TYPE.CHANGE_FIELD: {
+            const {oldValue, newValue, fieldName} = originalMessage;
+            if (!oldValue) {
+                return Localize.translateLocal('report.actions.type.changeFieldEmpty', {newValue, fieldName});
+            }
+            return Localize.translateLocal('report.actions.type.changeField', {oldValue, newValue, fieldName});
+        }
+        case CONST.REPORT.ACTIONS.TYPE.CHANGE_POLICY: {
+            const {fromPolicy, toPolicy} = originalMessage;
+            return Localize.translateLocal('report.actions.type.changePolicy', {fromPolicy, toPolicy});
+        }
+        case CONST.REPORT.ACTIONS.TYPE.DELEGATE_SUBMIT: {
+            const {delegateUser, originalManager} = originalMessage;
+            return Localize.translateLocal('report.actions.type.delegateSubmit', {delegateUser, originalManager});
+        }
+        case CONST.REPORT.ACTIONS.TYPE.EXPORTED_TO_CSV:
+            return Localize.translateLocal('report.actions.type.exportedToCSV');
+        case CONST.REPORT.ACTIONS.TYPE.INTEGRATIONS_MESSAGE: {
+            const {result, label} = originalMessage;
+            const errorMessage = result?.messages?.join(', ') ?? '';
+            return Localize.translateLocal('report.actions.type.integrationsMessage', errorMessage, label);
+        }
+        case CONST.REPORT.ACTIONS.TYPE.MANAGER_ATTACH_RECEIPT:
+            return Localize.translateLocal('report.actions.type.managerAttachReceipt');
+        case CONST.REPORT.ACTIONS.TYPE.MANAGER_DETACH_RECEIPT:
+            return Localize.translateLocal('report.actions.type.managerDetachReceipt');
+        case CONST.REPORT.ACTIONS.TYPE.MARK_REIMBURSED_FROM_INTEGRATION: {
+            const {amount, currency} = originalMessage;
+            return Localize.translateLocal('report.actions.type.markedReimbursedFromIntegration', {amount, currency});
+        }
+        case CONST.REPORT.ACTIONS.TYPE.OUTDATED_BANK_ACCOUNT:
+            return Localize.translateLocal('report.actions.type.outdatedBankAccount');
+        case CONST.REPORT.ACTIONS.TYPE.REIMBURSEMENT_ACH_BOUNCE:
+            return Localize.translateLocal('report.actions.type.reimbursementACHBounce');
+        case CONST.REPORT.ACTIONS.TYPE.REIMBURSEMENT_ACH_CANCELLED:
+            return Localize.translateLocal('report.actions.type.reimbursementACHCancelled');
+        case CONST.REPORT.ACTIONS.TYPE.REIMBURSEMENT_ACCOUNT_CHANGED:
+            return Localize.translateLocal('report.actions.type.reimbursementAccountChanged');
+        case CONST.REPORT.ACTIONS.TYPE.REIMBURSEMENT_DELAYED:
+            return Localize.translateLocal('report.actions.type.reimbursementDelayed');
+        case CONST.REPORT.ACTIONS.TYPE.SELECTED_FOR_RANDOM_AUDIT:
+            return Localize.translateLocal(`report.actions.type.selectedForRandomAudit${withMarkdown ? 'Markdown' : ''}`);
+        case CONST.REPORT.ACTIONS.TYPE.SHARE:
+            return Localize.translateLocal('report.actions.type.share', {to: originalMessage.to});
+        case CONST.REPORT.ACTIONS.TYPE.UNSHARE:
+            return Localize.translateLocal('report.actions.type.unshare', {to: originalMessage.to});
+        case CONST.REPORT.ACTIONS.TYPE.TAKE_CONTROL:
+            return Localize.translateLocal('report.actions.type.takeControl');
+        default:
+            return '';
+    }
+}
+
+function getMemberChangeMessageFragment(reportAction: OnyxEntry<ReportAction>): Message {
+    const messageElements: readonly MemberChangeMessageElement[] = getMemberChangeMessageElements(reportAction);
+    const html = messageElements
+        .map((messageElement) => {
+            switch (messageElement.kind) {
+                case 'userMention':
+                    return `<mention-user accountID=${messageElement.accountID}>${messageElement.content}</mention-user>`;
+                case 'roomReference':
+                    return `<a href="${environmentURL}/r/${messageElement.roomID}" target="_blank">${messageElement.roomName}</a>`;
+                default:
+                    return messageElement.content;
+            }
+        })
+        .join('');
+
+    return {
+        html: `<muted-text>${html}</muted-text>`,
+        text: getReportActionMessage(reportAction) ? getReportActionText(reportAction) : '',
+        type: CONST.REPORT.MESSAGE.TYPE.COMMENT,
+    };
+}
+
+function getUpdateRoomDescriptionFragment(reportAction: ReportAction): Message {
+    const html = getUpdateRoomDescriptionMessage(reportAction);
+    return {
+        html: `<muted-text>${html}</muted-text>`,
+        text: getReportActionMessage(reportAction) ? getReportActionText(reportAction) : '',
+        type: CONST.REPORT.MESSAGE.TYPE.COMMENT,
+    };
 }
 
 function getMemberChangeMessagePlainText(reportAction: OnyxEntry<ReportAction>): string {
@@ -1041,6 +1305,25 @@ function getMemberChangeMessagePlainText(reportAction: OnyxEntry<ReportAction>):
     return messageElements.map((element) => element.content).join('');
 }
 
+function getReportActionMessageFragments(action: ReportAction): Message[] {
+    if (isOldDotReportAction(action)) {
+        const oldDotMessage = getMessageOfOldDotReportAction(action);
+        const html = isActionOfType(action, CONST.REPORT.ACTIONS.TYPE.SELECTED_FOR_RANDOM_AUDIT) ? Parser.replace(oldDotMessage) : oldDotMessage;
+        return [{text: oldDotMessage, html: `<muted-text>${html}</muted-text>`, type: 'COMMENT'}];
+    }
+
+    if (isActionOfType(action, CONST.REPORT.ACTIONS.TYPE.ROOM_CHANGE_LOG.UPDATE_ROOM_DESCRIPTION)) {
+        const message = getUpdateRoomDescriptionMessage(action);
+        return [{text: message, html: `<muted-text>${message}</muted-text>`, type: 'COMMENT'}];
+    }
+
+    const actionMessage = action.previousMessage ?? action.message;
+    if (Array.isArray(actionMessage)) {
+        return actionMessage.filter((item): item is Message => !!item);
+    }
+    return actionMessage ? [actionMessage] : [];
+}
+
 /**
  * Helper method to determine if the provided accountID has submitted an expense on the specified report.
  *
@@ -1065,8 +1348,16 @@ function hasRequestFromCurrentAccount(reportID: string, currentAccountID: number
  * Checks if a given report action corresponds to an actionable mention whisper.
  * @param reportAction
  */
-function isActionableMentionWhisper(reportAction: OnyxEntry<ReportAction>): reportAction is ReportActionBase & OriginalMessageActionableMentionWhisper {
-    return reportAction?.actionName === CONST.REPORT.ACTIONS.TYPE.ACTIONABLE_MENTION_WHISPER;
+function isActionableMentionWhisper(reportAction: OnyxEntry<ReportAction>): reportAction is ReportAction<typeof CONST.REPORT.ACTIONS.TYPE.ACTIONABLE_MENTION_WHISPER> {
+    return isActionOfType(reportAction, CONST.REPORT.ACTIONS.TYPE.ACTIONABLE_MENTION_WHISPER);
+}
+
+/**
+ * Checks if a given report action corresponds to an actionable report mention whisper.
+ * @param reportAction
+ */
+function isActionableReportMentionWhisper(reportAction: OnyxEntry<ReportAction>): reportAction is ReportAction<typeof CONST.REPORT.ACTIONS.TYPE.ACTIONABLE_REPORT_MENTION_WHISPER> {
+    return isActionOfType(reportAction, CONST.REPORT.ACTIONS.TYPE.ACTIONABLE_REPORT_MENTION_WHISPER);
 }
 
 /**
@@ -1074,8 +1365,11 @@ function isActionableMentionWhisper(reportAction: OnyxEntry<ReportAction>): repo
  * @param reportAction
  * @returns the actionable mention whisper message.
  */
-function getActionableMentionWhisperMessage(reportAction: OnyxEntry<ReportAction>): string {
-    const originalMessage = reportAction?.originalMessage as OriginalMessageActionableMentionWhisper['originalMessage'];
+function getActionableMentionWhisperMessage(reportAction: OnyxEntry<ReportAction<typeof CONST.REPORT.ACTIONS.TYPE.ACTIONABLE_MENTION_WHISPER>>): string {
+    if (!reportAction) {
+        return '';
+    }
+    const originalMessage = getOriginalMessage(reportAction);
     const targetAccountIDs: number[] = originalMessage?.inviteeAccountIDs ?? [];
     const personalDetails = PersonalDetailsUtils.getPersonalDetailsByIDs(targetAccountIDs, 0);
     const mentionElements = targetAccountIDs.map((accountID): string => {
@@ -1099,16 +1393,16 @@ function isReportActionUnread(reportAction: OnyxEntry<ReportAction>, lastReadTim
         return !isCreatedAction(reportAction);
     }
 
-    return Boolean(reportAction && lastReadTime && reportAction.created && lastReadTime < reportAction.created);
+    return !!(reportAction && lastReadTime && reportAction.created && lastReadTime < reportAction.created);
 }
 
 /**
  * Check whether the current report action of the report is unread or not
  *
  */
-function isCurrentActionUnread(report: Report | EmptyObject, reportAction: ReportAction): boolean {
-    const lastReadTime = report.lastReadTime ?? '';
-    const sortedReportActions = getSortedReportActions(Object.values(getAllReportActions(report.reportID)));
+function isCurrentActionUnread(report: OnyxEntry<Report>, reportAction: ReportAction): boolean {
+    const lastReadTime = report?.lastReadTime ?? '';
+    const sortedReportActions = getSortedReportActions(Object.values(getAllReportActions(report?.reportID ?? '-1')));
     const currentActionIndex = sortedReportActions.findIndex((action) => action.reportActionID === reportAction.reportActionID);
     if (currentActionIndex === -1) {
         return false;
@@ -1121,12 +1415,8 @@ function isCurrentActionUnread(report: Report | EmptyObject, reportAction: Repor
  * Checks if a given report action corresponds to a join request action.
  * @param reportAction
  */
-function isActionableJoinRequest(reportAction: OnyxEntry<ReportAction>): boolean {
-    return reportAction?.actionName === CONST.REPORT.ACTIONS.TYPE.ACTIONABLE_JOIN_REQUEST;
-}
-
-function isActionableTrackExpense(reportAction: OnyxEntry<ReportAction>): boolean {
-    return reportAction?.actionName === CONST.REPORT.ACTIONS.TYPE.ACTIONABLE_TRACK_EXPENSE_WHISPER;
+function isActionableJoinRequest(reportAction: OnyxEntry<ReportAction>): reportAction is ReportAction<typeof CONST.REPORT.ACTIONS.TYPE.ACTIONABLE_JOIN_REQUEST> {
+    return isActionOfType(reportAction, CONST.REPORT.ACTIONS.TYPE.ACTIONABLE_JOIN_REQUEST);
 }
 
 /**
@@ -1134,27 +1424,31 @@ function isActionableTrackExpense(reportAction: OnyxEntry<ReportAction>): boolea
  * @param reportID
  */
 function isActionableJoinRequestPending(reportID: string): boolean {
-    const sortedReportActions = getSortedReportActions(Object.values(getAllReportActions(reportID)));
-    const findPendingRequest = sortedReportActions.find(
-        (reportActionItem) => isActionableJoinRequest(reportActionItem) && (reportActionItem as OriginalMessageJoinPolicyChangeLog)?.originalMessage?.choice === '',
+    const findPendingRequest = Object.values(getAllReportActions(reportID)).find(
+        (reportActionItem) => isActionableJoinRequest(reportActionItem) && getOriginalMessage(reportActionItem)?.choice === ('' as JoinWorkspaceResolution),
     );
     return !!findPendingRequest;
 }
 
-function isApprovedOrSubmittedReportAction(action: OnyxEntry<ReportAction> | EmptyObject) {
+function isApprovedOrSubmittedReportAction(action: OnyxEntry<ReportAction>) {
     return [CONST.REPORT.ACTIONS.TYPE.APPROVED, CONST.REPORT.ACTIONS.TYPE.SUBMITTED].some((type) => type === action?.actionName);
 }
 
 /**
  * Gets the text version of the message in a report action
  */
-function getReportActionMessageText(reportAction: OnyxEntry<ReportAction> | EmptyObject): string {
-    return reportAction?.message?.reduce((acc, curr) => `${acc}${curr?.text}`, '') ?? '';
+function getReportActionMessageText(reportAction: OnyxEntry<ReportAction>): string {
+    if (!Array.isArray(reportAction?.message)) {
+        return getReportActionText(reportAction);
+    }
+    // Sometime html can be an empty string
+    // eslint-disable-next-line @typescript-eslint/prefer-nullish-coalescing
+    return reportAction?.message?.reduce((acc, curr) => `${acc}${getTextFromHtml(curr?.html || curr?.text)}`, '') ?? '';
 }
 
-function getDismissedViolationMessageText(originalMessage: OriginalMessageDismissedViolation['originalMessage']): string {
-    const reason = originalMessage.reason;
-    const violationName = originalMessage.violationName;
+function getDismissedViolationMessageText(originalMessage: ReportAction<typeof CONST.REPORT.ACTIONS.TYPE.DISMISSED_VIOLATION>['originalMessage']): string {
+    const reason = originalMessage?.reason;
+    const violationName = originalMessage?.violationName;
     return Localize.translateLocal(`violationDismissal.${violationName}.${reason}` as TranslationPaths);
 }
 
@@ -1162,73 +1456,306 @@ function getDismissedViolationMessageText(originalMessage: OriginalMessageDismis
  * Check if the linked transaction is on hold
  */
 function isLinkedTransactionHeld(reportActionID: string, reportID: string): boolean {
-    return TransactionUtils.isOnHoldByTransactionID(getLinkedTransactionID(reportActionID, reportID) ?? '');
+    return TransactionUtils.isOnHoldByTransactionID(getLinkedTransactionID(reportActionID, reportID) ?? '-1');
+}
+
+function getMentionedAccountIDsFromAction(reportAction: OnyxInputOrEntry<ReportAction>) {
+    return isActionOfType(reportAction, CONST.REPORT.ACTIONS.TYPE.ADD_COMMENT) ? getOriginalMessage(reportAction)?.mentionedAccountIDs ?? [] : [];
+}
+
+function getMentionedEmailsFromMessage(message: string) {
+    const mentionEmailRegex = /<mention-user>(.*?)<\/mention-user>/g;
+    const matches = [...message.matchAll(mentionEmailRegex)];
+    return matches.map((match) => Str.removeSMSDomain(match[1].substring(1)));
+}
+
+function didMessageMentionCurrentUser(reportAction: OnyxInputOrEntry<ReportAction>) {
+    const accountIDsFromMessage = getMentionedAccountIDsFromAction(reportAction);
+    const message = getReportActionMessage(reportAction)?.html ?? '';
+    const emailsFromMessage = getMentionedEmailsFromMessage(message);
+    return accountIDsFromMessage.includes(currentUserAccountID ?? -1) || emailsFromMessage.includes(currentEmail) || message.includes('<mention-here>');
+}
+
+/**
+ * Check if the current user is the requestor of the action
+ */
+function wasActionTakenByCurrentUser(reportAction: OnyxInputOrEntry<ReportAction>): boolean {
+    return currentUserAccountID === reportAction?.actorAccountID;
+}
+
+/**
+ * Get IOU action for a reportID and transactionID
+ */
+function getIOUActionForReportID(reportID: string, transactionID: string): OnyxEntry<ReportAction> {
+    const report = ReportConnection.getAllReports()?.[`${ONYXKEYS.COLLECTION.REPORT}${reportID}`];
+    const reportActions = getAllReportActions(report?.reportID ?? '');
+    const action = Object.values(reportActions ?? {})?.find((reportAction) => {
+        const IOUTransactionID = isMoneyRequestAction(reportAction) ? getOriginalMessage(reportAction)?.IOUTransactionID : -1;
+        return IOUTransactionID === transactionID;
+    });
+    return action;
+}
+
+/**
+ * Get the track expense actionable whisper of the corresponding track expense
+ */
+function getTrackExpenseActionableWhisper(transactionID: string, chatReportID: string) {
+    const chatReportActions = allReportActions?.[`${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${chatReportID}`] ?? {};
+    return Object.values(chatReportActions).find((action: ReportAction) => isActionableTrackExpense(action) && getOriginalMessage(action)?.transactionID === transactionID);
+}
+
+/**
+ * Checks if a given report action corresponds to a add payment card action.
+ * @param reportAction
+ */
+function isActionableAddPaymentCard(reportAction: OnyxEntry<ReportAction>): reportAction is ReportAction<typeof CONST.REPORT.ACTIONS.TYPE.ACTIONABLE_ADD_PAYMENT_CARD> {
+    return reportAction?.actionName === CONST.REPORT.ACTIONS.TYPE.ACTIONABLE_ADD_PAYMENT_CARD;
+}
+
+function getExportIntegrationLastMessageText(reportAction: OnyxEntry<ReportAction>): string {
+    const fragments = getExportIntegrationActionFragments(reportAction);
+    return fragments.reduce((acc, fragment) => `${acc} ${fragment.text}`, '');
+}
+
+function getExportIntegrationMessageHTML(reportAction: OnyxEntry<ReportAction>): string {
+    const fragments = getExportIntegrationActionFragments(reportAction);
+    const htmlFragments = fragments.map((fragment) => (fragment.url ? `<a href="${fragment.url}">${fragment.text}</a>` : fragment.text));
+    return htmlFragments.join(' ');
+}
+
+function getExportIntegrationActionFragments(reportAction: OnyxEntry<ReportAction>): Array<{text: string; url: string}> {
+    if (reportAction?.actionName !== 'EXPORTINTEGRATION') {
+        throw Error(`received wrong action type. actionName: ${reportAction?.actionName}`);
+    }
+
+    const isPending = reportAction?.pendingAction === CONST.RED_BRICK_ROAD_PENDING_ACTION.ADD;
+    const originalMessage = (getOriginalMessage(reportAction) ?? {}) as OriginalMessageExportIntegration;
+    const {label, markedManually} = originalMessage;
+    const reimbursableUrls = originalMessage.reimbursableUrls ?? [];
+    const nonReimbursableUrls = originalMessage.nonReimbursableUrls ?? [];
+    const reportID = reportAction?.reportID ?? '';
+    const wasExportedAfterBase62 = (reportAction?.created ?? '') > '2022-11-14';
+    const base62ReportID = getBase62ReportID(Number(reportID));
+
+    const result: Array<{text: string; url: string}> = [];
+    if (isPending) {
+        result.push({
+            text: Localize.translateLocal('report.actions.type.exportedToIntegration.pending', {label}),
+            url: '',
+        });
+    } else if (markedManually) {
+        result.push({
+            text: Localize.translateLocal('report.actions.type.exportedToIntegration.manual', {label}),
+            url: '',
+        });
+    } else {
+        result.push({
+            text: Localize.translateLocal('report.actions.type.exportedToIntegration.automatic', {label}),
+            url: '',
+        });
+    }
+
+    if (reimbursableUrls.length === 1) {
+        result.push({
+            text: Localize.translateLocal('report.actions.type.exportedToIntegration.reimburseableLink'),
+            url: reimbursableUrls[0],
+        });
+    }
+
+    if (nonReimbursableUrls.length) {
+        const text = Localize.translateLocal('report.actions.type.exportedToIntegration.nonReimbursableLink');
+        let url = '';
+
+        if (nonReimbursableUrls.length === 1) {
+            url = nonReimbursableUrls[0];
+        } else {
+            switch (label) {
+                case CONST.POLICY.CONNECTIONS.NAME_USER_FRIENDLY.xero:
+                    url = XERO_NON_REIMBURSABLE_EXPENSES_URL;
+                    break;
+                case CONST.POLICY.CONNECTIONS.NAME_USER_FRIENDLY.netsuite:
+                    url = NETSUITE_NON_REIMBURSABLE_EXPENSES_URL_PREFIX;
+                    url += wasExportedAfterBase62 ? base62ReportID : reportID;
+                    break;
+                case CONST.POLICY.CONNECTIONS.NAME_USER_FRIENDLY.financialForce:
+                    // The first three characters in a Salesforce ID is the expense type
+                    url = nonReimbursableUrls[0].substring(0, SALESFORCE_EXPENSES_URL_PREFIX.length + 3);
+                    break;
+                default:
+                    url = QBO_EXPENSES_URL;
+            }
+        }
+
+        result.push({text, url});
+    }
+
+    return result;
+}
+
+function getUpdateRoomDescriptionMessage(reportAction: ReportAction): string {
+    const originalMessage = getOriginalMessage(reportAction) as OriginalMessageChangeLog;
+    if (originalMessage?.description) {
+        return `${Localize.translateLocal('roomChangeLog.updateRoomDescription')} ${originalMessage?.description}`;
+    }
+
+    return Localize.translateLocal('roomChangeLog.clearRoomDescription');
+}
+
+function isPolicyChangeLogAddEmployeeMessage(reportAction: OnyxInputOrEntry<ReportAction>): reportAction is ReportAction<typeof CONST.REPORT.ACTIONS.TYPE.POLICY_CHANGE_LOG.ADD_EMPLOYEE> {
+    return isActionOfType(reportAction, CONST.REPORT.ACTIONS.TYPE.POLICY_CHANGE_LOG.ADD_EMPLOYEE);
+}
+
+function getPolicyChangeLogAddEmployeeMessage(reportAction: OnyxInputOrEntry<ReportAction>): string {
+    if (!isPolicyChangeLogAddEmployeeMessage(reportAction)) {
+        return '';
+    }
+
+    const originalMessage = getOriginalMessage(reportAction);
+    const email = originalMessage?.email ?? '';
+    const role = originalMessage?.role ?? '';
+    return Localize.translateLocal('report.actions.type.addEmployee', email, role);
+}
+
+function isPolicyChangeLogChangeRoleMessage(reportAction: OnyxInputOrEntry<ReportAction>): reportAction is ReportAction<typeof CONST.REPORT.ACTIONS.TYPE.POLICY_CHANGE_LOG.UPDATE_EMPLOYEE> {
+    return isActionOfType(reportAction, CONST.REPORT.ACTIONS.TYPE.POLICY_CHANGE_LOG.UPDATE_EMPLOYEE);
+}
+
+function getPolicyChangeLogChangeRoleMessage(reportAction: OnyxInputOrEntry<ReportAction>): string {
+    if (!isPolicyChangeLogChangeRoleMessage(reportAction)) {
+        return '';
+    }
+    const originalMessage = getOriginalMessage(reportAction);
+    const email = originalMessage?.email ?? '';
+    const newRole = originalMessage?.newValue ?? '';
+    const oldRole = originalMessage?.oldValue ?? '';
+    return Localize.translateLocal('report.actions.type.updateRole', email, oldRole, newRole);
+}
+
+function isPolicyChangeLogDeleteMemberMessage(
+    reportAction: OnyxInputOrEntry<ReportAction>,
+): reportAction is ReportAction<typeof CONST.REPORT.ACTIONS.TYPE.POLICY_CHANGE_LOG.DELETE_EMPLOYEE> {
+    return isActionOfType(reportAction, CONST.REPORT.ACTIONS.TYPE.POLICY_CHANGE_LOG.DELETE_EMPLOYEE);
+}
+
+function getPolicyChangeLogDeleteMemberMessage(reportAction: OnyxInputOrEntry<ReportAction>): string {
+    if (!isPolicyChangeLogDeleteMemberMessage(reportAction)) {
+        return '';
+    }
+    const originalMessage = getOriginalMessage(reportAction);
+    const email = originalMessage?.email ?? '';
+    const role = originalMessage?.role ?? '';
+    return Localize.translateLocal('report.actions.type.removeMember', email, role);
+}
+
+function getRenamedAction(reportAction: OnyxEntry<ReportAction<typeof CONST.REPORT.ACTIONS.TYPE.RENAMED>>) {
+    const initialMessage = getOriginalMessage(reportAction);
+    return Localize.translateLocal('newRoomPage.renamedRoomAction', {
+        oldName: initialMessage?.oldName ?? '',
+        newName: initialMessage?.newName ?? '',
+    });
 }
 
 export {
+    doesReportHaveVisibleActions,
     extractLinksFromMessageHtml,
+    getActionableMentionWhisperMessage,
+    getAllReportActions,
+    getCombinedReportActions,
     getDismissedViolationMessageText,
-    getOneTransactionThreadReportID,
+    getFirstVisibleReportActionID,
+    getIOUActionForReportID,
     getIOUReportIDFromReportActionPreview,
     getLastClosedReportAction,
     getLastVisibleAction,
     getLastVisibleMessage,
     getLatestReportActionFromOnyxData,
     getLinkedTransactionID,
+    getMemberChangeMessageFragment,
+    getUpdateRoomDescriptionFragment,
+    getMemberChangeMessagePlainText,
+    getReportActionMessageFragments,
+    getMessageOfOldDotReportAction,
     getMostRecentIOURequestActionID,
     getMostRecentReportActionLastModified,
     getNumberOfMoneyRequests,
+    getOneTransactionThreadReportID,
+    getOriginalMessage,
     getParentReportAction,
     getReportAction,
+    getReportActionHtml,
+    getReportActionMessage,
     getReportActionMessageText,
-    isApprovedOrSubmittedReportAction,
+    getReportActionText,
     getReportPreviewAction,
     getSortedReportActions,
-    getCombinedReportActions,
     getSortedReportActionsForDisplay,
+    getTextFromHtml,
+    getTrackExpenseActionableWhisper,
+    getWhisperedTo,
+    hasRequestFromCurrentAccount,
+    isActionOfType,
+    isActionableJoinRequest,
+    isActionableJoinRequestPending,
+    isActionableMentionWhisper,
+    isActionableReportMentionWhisper,
+    isActionableTrackExpense,
+    isAddCommentAction,
+    isApprovedOrSubmittedReportAction,
+    isChronosOOOListAction,
+    isClosedAction,
     isConsecutiveActionMadeByPreviousActor,
     isCreatedAction,
     isCreatedTaskReportAction,
+    isCurrentActionUnread,
     isDeletedAction,
     isDeletedParentAction,
+    isLinkedTransactionHeld,
+    isMemberChangeAction,
+    isExportIntegrationAction,
     isMessageDeleted,
     isModifiedExpenseAction,
     isMoneyRequestAction,
     isNotifiableReportAction,
+    isOldDotReportAction,
+    isPayAction,
     isPendingRemove,
-    isReversedTransaction,
+    isPolicyChangeLogAction,
+    isReimbursementDeQueuedAction,
+    isReimbursementQueuedAction,
+    isRenamedAction,
     isReportActionAttachment,
     isReportActionDeprecated,
     isReportPreviewAction,
+    isResolvedActionTrackExpense,
+    isReversedTransaction,
+    isRoomChangeLogAction,
     isSentMoneyReportAction,
     isSplitBillAction,
-    isTrackExpenseAction,
     isTaskAction,
-    doesReportHaveVisibleActions,
     isThreadParentMessage,
+    isTrackExpenseAction,
     isTransactionThread,
+    isTripPreview,
     isWhisperAction,
+    isSubmittedAction,
+    isApprovedAction,
+    isForwardedAction,
     isWhisperActionTargetedToOthers,
-    isReimbursementQueuedAction,
-    shouldReportActionBeVisible,
     shouldHideNewMarker,
+    shouldReportActionBeVisible,
     shouldReportActionBeVisibleAsLastAction,
-    getContinuousReportActionChain,
-    hasRequestFromCurrentAccount,
-    getFirstVisibleReportActionID,
-    isMemberChangeAction,
-    getMemberChangeMessageFragment,
-    isOldDotReportAction,
-    getMessageOfOldDotReportAction,
-    getMemberChangeMessagePlainText,
-    isReimbursementDeQueuedAction,
-    isActionableMentionWhisper,
-    getActionableMentionWhisperMessage,
-    isCurrentActionUnread,
-    isActionableJoinRequest,
-    isActionableJoinRequestPending,
-    isActionableTrackExpense,
-    isLinkedTransactionHeld,
+    wasActionTakenByCurrentUser,
+    isInviteOrRemovedAction,
+    isActionableAddPaymentCard,
+    getExportIntegrationActionFragments,
+    getExportIntegrationLastMessageText,
+    getExportIntegrationMessageHTML,
+    getUpdateRoomDescriptionMessage,
+    didMessageMentionCurrentUser,
+    getPolicyChangeLogAddEmployeeMessage,
+    getPolicyChangeLogChangeRoleMessage,
+    getPolicyChangeLogDeleteMemberMessage,
+    getRenamedAction,
 };
 
 export type {LastVisibleMessage};
diff --git a/src/libs/ReportConnection.ts b/src/libs/ReportConnection.ts
new file mode 100644
index 000000000000..a390a5cea2a9
--- /dev/null
+++ b/src/libs/ReportConnection.ts
@@ -0,0 +1,51 @@
+import type {OnyxCollection} from 'react-native-onyx';
+import Onyx from 'react-native-onyx';
+import ONYXKEYS from '@src/ONYXKEYS';
+import type {Report} from '@src/types/onyx';
+import * as PriorityModeActions from './actions/PriorityMode';
+import * as ReportHelperActions from './actions/Report';
+
+// Dynamic Import to avoid circular dependency
+const UnreadIndicatorUpdaterHelper = () => import('./UnreadIndicatorUpdater');
+
+const reportIDToNameMap: Record<string, string> = {};
+let allReports: OnyxCollection<Report>;
+Onyx.connect({
+    key: ONYXKEYS.COLLECTION.REPORT,
+    waitForCollectionCallback: true,
+    callback: (value) => {
+        allReports = value;
+        UnreadIndicatorUpdaterHelper().then((module) => {
+            module.triggerUnreadUpdate();
+        });
+        // Each time a new report is added we will check to see if the user should be switched
+        PriorityModeActions.autoSwitchToFocusMode();
+
+        if (!value) {
+            return;
+        }
+        Object.values(value).forEach((report) => {
+            if (!report) {
+                return;
+            }
+            reportIDToNameMap[report.reportID] = report.reportName ?? report.displayName ?? report.reportID;
+            ReportHelperActions.handleReportChanged(report);
+        });
+    },
+});
+
+// This function is used to get all reports
+function getAllReports() {
+    return allReports;
+}
+
+// This function is used to get all reports name map
+function getAllReportsNameMap() {
+    return reportIDToNameMap;
+}
+
+function getAllReportsLength() {
+    return Object.keys(allReports ?? {}).length;
+}
+
+export {getAllReports, getAllReportsNameMap, getAllReportsLength};
diff --git a/src/libs/ReportUtils.ts b/src/libs/ReportUtils.ts
index 7da99d3ca8e6..f8f85beff4ad 100644
--- a/src/libs/ReportUtils.ts
+++ b/src/libs/ReportUtils.ts
@@ -1,26 +1,31 @@
 import {format} from 'date-fns';
-import ExpensiMark from 'expensify-common/lib/ExpensiMark';
-import Str from 'expensify-common/lib/str';
-import {isEmpty} from 'lodash';
+import {Str} from 'expensify-common';
+import {isEmpty, isNumber} from 'lodash';
 import lodashEscape from 'lodash/escape';
 import lodashFindLastIndex from 'lodash/findLastIndex';
 import lodashIntersection from 'lodash/intersection';
 import lodashIsEqual from 'lodash/isEqual';
+import lodashMaxBy from 'lodash/maxBy';
 import type {OnyxCollection, OnyxEntry, OnyxUpdate} from 'react-native-onyx';
 import Onyx from 'react-native-onyx';
-import type {ValueOf} from 'type-fest';
+import type {SvgProps} from 'react-native-svg';
+import type {OriginalMessageModifiedExpense} from 'src/types/onyx/OriginalMessage';
+import type {TupleToUnion, ValueOf} from 'type-fest';
 import type {FileObject} from '@components/AttachmentModal';
-import * as Expensicons from '@components/Icon/Expensicons';
+import {FallbackAvatar, QBOCircle, XeroCircle} from '@components/Icon/Expensicons';
 import * as defaultGroupAvatars from '@components/Icon/GroupDefaultAvatars';
 import * as defaultWorkspaceAvatars from '@components/Icon/WorkspaceDefaultAvatars';
+import type {MoneyRequestAmountInputProps} from '@components/MoneyRequestAmountInput';
 import type {IOUAction, IOUType} from '@src/CONST';
 import CONST from '@src/CONST';
 import type {ParentNavigationSummaryParams, TranslationPaths} from '@src/languages/types';
 import ONYXKEYS from '@src/ONYXKEYS';
 import type {Route} from '@src/ROUTES';
 import ROUTES from '@src/ROUTES';
+import SCREENS from '@src/SCREENS';
 import type {
     Beta,
+    OnyxInputOrEntry,
     PersonalDetails,
     PersonalDetailsList,
     Policy,
@@ -28,99 +33,74 @@ import type {
     Report,
     ReportAction,
     ReportMetadata,
+    ReportNameValuePairs,
+    ReportViolationName,
+    ReportViolations,
     Session,
     Task,
-    TaxRate,
     Transaction,
     TransactionViolation,
     UserWallet,
 } from '@src/types/onyx';
 import type {Participant} from '@src/types/onyx/IOU';
+import type {SelectedParticipant} from '@src/types/onyx/NewGroupChatDraft';
+import type {OriginalMessageExportedToIntegration} from '@src/types/onyx/OldDotAction';
+import type Onboarding from '@src/types/onyx/Onboarding';
 import type {Errors, Icon, PendingAction} from '@src/types/onyx/OnyxCommon';
-import type {
-    ChangeLog,
-    IOUMessage,
-    OriginalMessageActionName,
-    OriginalMessageCreated,
-    OriginalMessageReimbursementDequeued,
-    OriginalMessageRenamed,
-    OriginalMessageRoomChangeLog,
-    PaymentMethodType,
-    ReimbursementDeQueuedMessage,
-} from '@src/types/onyx/OriginalMessage';
+import type {OriginalMessageChangeLog, PaymentMethodType} from '@src/types/onyx/OriginalMessage';
 import type {Status} from '@src/types/onyx/PersonalDetails';
+import type {ConnectionName} from '@src/types/onyx/Policy';
 import type {NotificationPreference, Participants, PendingChatMember, Participant as ReportParticipant} from '@src/types/onyx/Report';
-import type {Message, ReportActionBase, ReportActions} from '@src/types/onyx/ReportAction';
-import type {Comment, Receipt, TransactionChanges, WaypointCollection} from '@src/types/onyx/Transaction';
-import type {EmptyObject} from '@src/types/utils/EmptyObject';
+import type {Message, ReportActions} from '@src/types/onyx/ReportAction';
+import type {Comment, TransactionChanges, WaypointCollection} from '@src/types/onyx/Transaction';
 import {isEmptyObject} from '@src/types/utils/EmptyObject';
 import type IconAsset from '@src/types/utils/IconAsset';
+import AccountUtils from './AccountUtils';
 import * as IOU from './actions/IOU';
-import * as PolicyActions from './actions/Policy';
+import * as PolicyActions from './actions/Policy/Policy';
 import * as store from './actions/ReimbursementAccount/store';
+import * as SessionUtils from './actions/Session';
 import * as CurrencyUtils from './CurrencyUtils';
 import DateUtils from './DateUtils';
 import {hasValidDraftComment} from './DraftCommentUtils';
-import originalGetReportPolicyID from './getReportPolicyID';
+import getAttachmentDetails from './fileDownload/getAttachmentDetails';
+import getIsSmallScreenWidth from './getIsSmallScreenWidth';
 import isReportMessageAttachment from './isReportMessageAttachment';
 import localeCompare from './LocaleCompare';
 import * as LocalePhoneNumber from './LocalePhoneNumber';
 import * as Localize from './Localize';
+import Log from './Log';
 import {isEmailPublicDomain} from './LoginUtils';
 import ModifiedExpenseMessage from './ModifiedExpenseMessage';
 import linkingConfig from './Navigation/linkingConfig';
 import Navigation from './Navigation/Navigation';
 import * as NumberUtils from './NumberUtils';
+import Parser from './Parser';
 import Permissions from './Permissions';
 import * as PersonalDetailsUtils from './PersonalDetailsUtils';
 import * as PhoneNumber from './PhoneNumber';
 import * as PolicyUtils from './PolicyUtils';
 import type {LastVisibleMessage} from './ReportActionsUtils';
 import * as ReportActionsUtils from './ReportActionsUtils';
+import * as ReportConnection from './ReportConnection';
+import StringUtils from './StringUtils';
 import * as TransactionUtils from './TransactionUtils';
 import * as Url from './Url';
+import type {AvatarSource} from './UserUtils';
 import * as UserUtils from './UserUtils';
 
 type AvatarRange = 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | 10 | 11 | 12 | 13 | 14 | 15 | 16 | 17 | 18;
 
-type WelcomeMessage = {showReportName: boolean; phrase1?: string; phrase2?: string};
-
-type ExpenseOriginalMessage = {
-    oldComment?: string;
-    newComment?: string;
-    comment?: string;
-    merchant?: string;
-    oldCreated?: string;
-    created?: string;
-    oldMerchant?: string;
-    oldAmount?: number;
-    amount?: number;
-    oldCurrency?: string;
-    currency?: string;
-    category?: string;
-    oldCategory?: string;
-    tag?: string;
-    oldTag?: string;
-    billable?: string;
-    oldBillable?: string;
-    oldTaxAmount?: number;
-    taxAmount?: number;
-    taxRate?: string;
-    oldTaxRate?: string;
-};
-
 type SpendBreakdown = {
     nonReimbursableSpend: number;
     reimbursableSpend: number;
     totalDisplaySpend: number;
 };
 
-type ParticipantDetails = [number, string, UserUtils.AvatarSource, UserUtils.AvatarSource];
-
-type OptimisticInviteReportAction = ReportActionBase & OriginalMessageRoomChangeLog;
+type ParticipantDetails = [number, string, AvatarSource, AvatarSource];
 
 type OptimisticAddCommentReportAction = Pick<
-    ReportAction,
+    ReportAction<typeof CONST.REPORT.ACTIONS.TYPE.ADD_COMMENT>,
     | 'reportActionID'
     | 'actionName'
     | 'actorAccountID'
@@ -130,8 +110,8 @@ type OptimisticAddCommentReportAction = Pick<
     | 'created'
     | 'message'
     | 'isFirstItem'
-    | 'isAttachment'
-    | 'attachmentInfo'
+    | 'isAttachmentOnly'
+    | 'isAttachmentWithText'
     | 'pendingAction'
     | 'shouldShow'
     | 'originalMessage'
@@ -147,7 +127,6 @@ type OptimisticAddCommentReportAction = Pick<
     | 'childCommenterCount'
     | 'childLastVisibleActionCreated'
     | 'childOldestFourAccountIDs'
-    | 'whisperedToAccountIDs'
 > & {isOptimisticAction: boolean};
 
 type OptimisticReportAction = {
@@ -179,6 +158,8 @@ type OptimisticExpenseReport = Pick<
     | 'notificationPreference'
     | 'parentReportID'
     | 'lastVisibleActionCreated'
+    | 'parentReportActionID'
+    | 'fieldList'
 >;
 
 type OptimisticIOUReportAction = Pick<
@@ -187,7 +168,7 @@ type OptimisticIOUReportAction = Pick<
     | 'actorAccountID'
     | 'automatic'
     | 'avatar'
-    | 'isAttachment'
+    | 'isAttachmentOnly'
     | 'originalMessage'
     | 'message'
     | 'person'
@@ -196,12 +177,13 @@ type OptimisticIOUReportAction = Pick<
     | 'created'
     | 'pendingAction'
     | 'receipt'
-    | 'whisperedToAccountIDs'
     | 'childReportID'
     | 'childVisibleActionCount'
     | 'childCommenterCount'
 >;
 
+type PartialReportAction = OnyxInputOrEntry<ReportAction> | Partial<ReportAction> | OptimisticIOUReportAction | OptimisticApprovedReportAction | OptimisticSubmittedReportAction | undefined;
+
 type ReportRouteParams = {
     reportID: string;
     isSubReportPageRoute: boolean;
@@ -213,18 +195,23 @@ type ReportOfflinePendingActionAndErrors = {
 };
 
 type OptimisticApprovedReportAction = Pick<
-    ReportAction,
-    'actionName' | 'actorAccountID' | 'automatic' | 'avatar' | 'isAttachment' | 'originalMessage' | 'message' | 'person' | 'reportActionID' | 'shouldShow' | 'created' | 'pendingAction'
+    ReportAction<typeof CONST.REPORT.ACTIONS.TYPE.APPROVED>,
+    'actionName' | 'actorAccountID' | 'automatic' | 'avatar' | 'isAttachmentOnly' | 'originalMessage' | 'message' | 'person' | 'reportActionID' | 'shouldShow' | 'created' | 'pendingAction'
+>;
+
+type OptimisticUnapprovedReportAction = Pick<
+    ReportAction<typeof CONST.REPORT.ACTIONS.TYPE.UNAPPROVED>,
+    'actionName' | 'actorAccountID' | 'automatic' | 'avatar' | 'isAttachmentOnly' | 'originalMessage' | 'message' | 'person' | 'reportActionID' | 'shouldShow' | 'created' | 'pendingAction'
 >;
 
 type OptimisticSubmittedReportAction = Pick<
-    ReportAction,
+    ReportAction<typeof CONST.REPORT.ACTIONS.TYPE.SUBMITTED>,
     | 'actionName'
     | 'actorAccountID'
     | 'adminAccountID'
     | 'automatic'
     | 'avatar'
-    | 'isAttachment'
+    | 'isAttachmentOnly'
     | 'originalMessage'
     | 'message'
     | 'person'
@@ -236,7 +223,7 @@ type OptimisticSubmittedReportAction = Pick<
 
 type OptimisticHoldReportAction = Pick<
     ReportAction,
-    'actionName' | 'actorAccountID' | 'automatic' | 'avatar' | 'isAttachment' | 'originalMessage' | 'message' | 'person' | 'reportActionID' | 'shouldShow' | 'created' | 'pendingAction'
+    'actionName' | 'actorAccountID' | 'automatic' | 'avatar' | 'isAttachmentOnly' | 'originalMessage' | 'message' | 'person' | 'reportActionID' | 'shouldShow' | 'created' | 'pendingAction'
 >;
 
 type OptimisticCancelPaymentReportAction = Pick<
@@ -250,15 +237,29 @@ type OptimisticEditedTaskReportAction = Pick<
 >;
 
 type OptimisticClosedReportAction = Pick<
-    ReportAction,
+    ReportAction<typeof CONST.REPORT.ACTIONS.TYPE.CLOSED>,
     'actionName' | 'actorAccountID' | 'automatic' | 'avatar' | 'created' | 'message' | 'originalMessage' | 'pendingAction' | 'person' | 'reportActionID' | 'shouldShow'
 >;
 
-type OptimisticCreatedReportAction = OriginalMessageCreated &
-    Pick<ReportActionBase, 'actorAccountID' | 'automatic' | 'avatar' | 'created' | 'message' | 'person' | 'reportActionID' | 'shouldShow' | 'pendingAction'>;
+type OptimisticDismissedViolationReportAction = Pick<
+    ReportAction,
+    'actionName' | 'actorAccountID' | 'avatar' | 'created' | 'message' | 'originalMessage' | 'person' | 'reportActionID' | 'shouldShow' | 'pendingAction'
+>;
+
+type OptimisticCreatedReportAction = Pick<
+    ReportAction<typeof CONST.REPORT.ACTIONS.TYPE.CREATED>,
+    'actorAccountID' | 'automatic' | 'avatar' | 'created' | 'message' | 'person' | 'reportActionID' | 'shouldShow' | 'pendingAction' | 'actionName'
+>;
+
+type OptimisticRenamedReportAction = Pick<
+    ReportAction<typeof CONST.REPORT.ACTIONS.TYPE.RENAMED>,
+    'actorAccountID' | 'automatic' | 'avatar' | 'created' | 'message' | 'person' | 'reportActionID' | 'shouldShow' | 'pendingAction' | 'actionName' | 'originalMessage'
+>;
 
-type OptimisticRenamedReportAction = OriginalMessageRenamed &
-    Pick<ReportActionBase, 'actorAccountID' | 'automatic' | 'avatar' | 'created' | 'message' | 'person' | 'reportActionID' | 'shouldShow' | 'pendingAction'>;
+type OptimisticRoomDescriptionUpdatedReportAction = Pick<
+    ReportAction<typeof CONST.REPORT.ACTIONS.TYPE.ROOM_CHANGE_LOG.UPDATE_ROOM_DESCRIPTION>,
+    'actorAccountID' | 'created' | 'message' | 'person' | 'reportActionID' | 'pendingAction' | 'actionName' | 'originalMessage'
+>;
 
 type OptimisticChatReport = Pick<
     Report,
@@ -281,8 +282,6 @@ type OptimisticChatReport = Pick<
     | 'parentReportActionID'
     | 'parentReportID'
     | 'participants'
-    | 'participantAccountIDs'
-    | 'visibleChatMemberAccountIDs'
     | 'policyID'
     | 'reportID'
     | 'reportName'
@@ -298,6 +297,12 @@ type OptimisticChatReport = Pick<
     isOptimisticReport: true;
 };
 
+type OptimisticExportIntegrationAction = OriginalMessageExportedToIntegration &
+    Pick<
+        ReportAction<typeof CONST.REPORT.ACTIONS.TYPE.EXPORTED_TO_INTEGRATION>,
+        'reportActionID' | 'actorAccountID' | 'avatar' | 'created' | 'lastModified' | 'message' | 'person' | 'shouldShow' | 'pendingAction' | 'errors' | 'automatic'
+    >;
+
 type OptimisticTaskReportAction = Pick<
     ReportAction,
     | 'reportActionID'
@@ -306,7 +311,7 @@ type OptimisticTaskReportAction = Pick<
     | 'automatic'
     | 'avatar'
     | 'created'
-    | 'isAttachment'
+    | 'isAttachmentOnly'
     | 'message'
     | 'originalMessage'
     | 'person'
@@ -334,8 +339,8 @@ type OptimisticWorkspaceChats = {
 };
 
 type OptimisticModifiedExpenseReportAction = Pick<
-    ReportAction,
-    'actionName' | 'actorAccountID' | 'automatic' | 'avatar' | 'created' | 'isAttachment' | 'message' | 'originalMessage' | 'person' | 'pendingAction' | 'reportActionID' | 'shouldShow'
+    ReportAction<typeof CONST.REPORT.ACTIONS.TYPE.MODIFIED_EXPENSE>,
+    'actionName' | 'actorAccountID' | 'automatic' | 'avatar' | 'created' | 'isAttachmentOnly' | 'message' | 'originalMessage' | 'person' | 'pendingAction' | 'reportActionID' | 'shouldShow'
 > & {reportID?: string};
 
 type OptimisticTaskReport = Pick<
@@ -344,8 +349,7 @@ type OptimisticTaskReport = Pick<
     | 'reportName'
     | 'description'
     | 'ownerAccountID'
-    | 'participantAccountIDs'
-    | 'visibleChatMemberAccountIDs'
+    | 'participants'
     | 'managerID'
     | 'type'
     | 'parentReportID'
@@ -355,6 +359,7 @@ type OptimisticTaskReport = Pick<
     | 'notificationPreference'
     | 'parentReportActionID'
     | 'lastVisibleActionCreated'
+    | 'hasParentAccess'
 >;
 
 type TransactionDetails = {
@@ -365,6 +370,7 @@ type TransactionDetails = {
     currency: string;
     merchant: string;
     waypoints?: WaypointCollection | string;
+    customUnitRateID?: string;
     comment: string;
     category: string;
     billable: boolean;
@@ -384,8 +390,7 @@ type OptimisticIOUReport = Pick<
     | 'managerID'
     | 'policyID'
     | 'ownerAccountID'
-    | 'participantAccountIDs'
-    | 'visibleChatMemberAccountIDs'
+    | 'participants'
     | 'reportID'
     | 'stateNum'
     | 'statusNum'
@@ -394,6 +399,7 @@ type OptimisticIOUReport = Pick<
     | 'notificationPreference'
     | 'parentReportID'
     | 'lastVisibleActionCreated'
+    | 'fieldList'
 >;
 type DisplayNameWithTooltips = Array<Pick<PersonalDetails, 'accountID' | 'pronouns' | 'displayName' | 'login' | 'avatar'>>;
 
@@ -435,6 +441,7 @@ type OptionData = {
     parentReportAction?: OnyxEntry<ReportAction>;
     displayNamesWithTooltips?: DisplayNameWithTooltips | null;
     isDefaultRoom?: boolean;
+    isInvoiceRoom?: boolean;
     isExpenseReport?: boolean;
     isOptimisticPersonalDetail?: boolean;
     selected?: boolean;
@@ -445,9 +452,16 @@ type OptionData = {
     isDisabled?: boolean | null;
     name?: string | null;
     isSelfDM?: boolean;
+    isOneOnOneChat?: boolean;
     reportID?: string;
     enabled?: boolean;
-    data?: Partial<TaxRate>;
+    code?: string;
+    transactionThreadReportID?: string | null;
+    shouldShowAmountInput?: boolean;
+    amountInputProps?: MoneyRequestAmountInputProps;
+    tabIndex?: 0 | -1;
+    isConciergeChat?: boolean;
+    isBold?: boolean;
 } & Report;
 
 type OnyxDataTaskAssigneeChat = {
@@ -478,6 +492,7 @@ type OutstandingChildRequest = {
 type ParsingDetails = {
     shouldEscapeText?: boolean;
     reportID?: string;
+    policyID?: string;
 };
 
 let currentUserEmail: string | undefined;
@@ -485,8 +500,12 @@ let currentUserPrivateDomain: string | undefined;
 let currentUserAccountID: number | undefined;
 let isAnonymousUser = false;
 
-const defaultAvatarBuildingIconTestID = 'SvgDefaultAvatarBuilding Icon';
+// This cache is used to save parse result of report action html message into text
+// to prevent unnecessary parsing when the report action is not changed/modified.
+// Example case: when we need to get a report name of a thread which is dependent on a report action message.
+const parsedReportActionMessageCache: Record<string, string> = {};
 
+const defaultAvatarBuildingIconTestID = 'SvgDefaultAvatarBuilding Icon';
 Onyx.connect({
     key: ONYXKEYS.SESSION,
     callback: (value) => {
@@ -502,23 +521,23 @@ Onyx.connect({
     },
 });
 
-let allPersonalDetails: OnyxCollection<PersonalDetails>;
+let allPersonalDetails: OnyxEntry<PersonalDetailsList>;
 let allPersonalDetailLogins: string[];
 let currentUserPersonalDetails: OnyxEntry<PersonalDetails>;
 Onyx.connect({
     key: ONYXKEYS.PERSONAL_DETAILS_LIST,
     callback: (value) => {
-        currentUserPersonalDetails = value?.[currentUserAccountID ?? -1] ?? null;
+        currentUserPersonalDetails = value?.[currentUserAccountID ?? -1] ?? undefined;
         allPersonalDetails = value ?? {};
         allPersonalDetailLogins = Object.values(allPersonalDetails).map((personalDetail) => personalDetail?.login ?? '');
     },
 });
 
-let allReports: OnyxCollection<Report>;
+let allReportsDraft: OnyxCollection<Report>;
 Onyx.connect({
-    key: ONYXKEYS.COLLECTION.REPORT,
+    key: ONYXKEYS.COLLECTION.REPORT_DRAFT,
     waitForCollectionCallback: true,
-    callback: (value) => (allReports = value),
+    callback: (value) => (allReportsDraft = value),
 });
 
 let allPolicies: OnyxCollection<Policy>;
@@ -535,6 +554,7 @@ Onyx.connect({
 });
 
 let allTransactions: OnyxCollection<Transaction> = {};
+let reportsTransactions: Record<string, Transaction[]> = {};
 Onyx.connect({
     key: ONYXKEYS.COLLECTION.TRANSACTION,
     waitForCollectionCallback: true,
@@ -543,6 +563,20 @@ Onyx.connect({
             return;
         }
         allTransactions = Object.fromEntries(Object.entries(value).filter(([, transaction]) => transaction));
+
+        reportsTransactions = Object.values(value).reduce<Record<string, Transaction[]>>((all, transaction) => {
+            const reportsMap = all;
+            if (!transaction) {
+                return reportsMap;
+            }
+
+            if (!reportsMap[transaction.reportID]) {
+                reportsMap[transaction.reportID] = [];
+            }
+            reportsMap[transaction.reportID].push(transaction);
+
+            return all;
+        }, {});
     },
 });
 
@@ -558,63 +592,116 @@ Onyx.connect({
     },
 });
 
-let lastUpdatedReport: OnyxEntry<Report>;
+let allReportMetadata: OnyxCollection<ReportMetadata>;
+Onyx.connect({
+    key: ONYXKEYS.COLLECTION.REPORT_METADATA,
+    waitForCollectionCallback: true,
+    callback: (value) => {
+        if (!value) {
+            return;
+        }
+        allReportMetadata = value;
+    },
+});
+
+let allReportNameValuePair: OnyxCollection<ReportNameValuePairs>;
+Onyx.connect({
+    key: ONYXKEYS.COLLECTION.REPORT_NAME_VALUE_PAIRS,
+    waitForCollectionCallback: true,
+    callback: (value) => {
+        if (!value) {
+            return;
+        }
+        allReportNameValuePair = value;
+    },
+});
 
+let allReportsViolations: OnyxCollection<ReportViolations>;
 Onyx.connect({
-    key: ONYXKEYS.COLLECTION.REPORT,
+    key: ONYXKEYS.COLLECTION.REPORT_VIOLATIONS,
+    waitForCollectionCallback: true,
     callback: (value) => {
         if (!value) {
             return;
         }
+        allReportsViolations = value;
+    },
+});
 
-        lastUpdatedReport = value;
+let isFirstTimeNewExpensifyUser = false;
+Onyx.connect({
+    key: ONYXKEYS.NVP_IS_FIRST_TIME_NEW_EXPENSIFY_USER,
+    callback: (value) => {
+        isFirstTimeNewExpensifyUser = value ?? false;
     },
 });
 
-function getLastUpdatedReport(): OnyxEntry<Report> {
-    return lastUpdatedReport;
-}
+let onboarding: OnyxEntry<Onboarding | []>;
+Onyx.connect({
+    key: ONYXKEYS.NVP_ONBOARDING,
+    callback: (value) => (onboarding = value),
+});
 
-function getCurrentUserAvatarOrDefault(): UserUtils.AvatarSource {
-    return currentUserPersonalDetails?.avatar ?? UserUtils.getDefaultAvatarURL(currentUserAccountID);
+function getCurrentUserAvatar(): AvatarSource | undefined {
+    return currentUserPersonalDetails?.avatar;
 }
 
 function getCurrentUserDisplayNameOrEmail(): string | undefined {
     return currentUserPersonalDetails?.displayName ?? currentUserEmail;
 }
 
-function getChatType(report: OnyxEntry<Report> | Participant | EmptyObject): ValueOf<typeof CONST.REPORT.CHAT_TYPE> | undefined {
+function getChatType(report: OnyxInputOrEntry<Report> | Participant): ValueOf<typeof CONST.REPORT.CHAT_TYPE> | undefined {
     return report?.chatType;
 }
 
 /**
- * Get the report given a reportID
+ * Get the report or draft report given a reportID
  */
-function getReport(reportID: string | undefined): OnyxEntry<Report> {
-    if (!allReports) {
-        return null;
-    }
+function getReportOrDraftReport(reportID: string | undefined): OnyxEntry<Report> {
+    const allReports = ReportConnection.getAllReports();
+    return allReports?.[`${ONYXKEYS.COLLECTION.REPORT}${reportID}`] ?? allReportsDraft?.[`${ONYXKEYS.COLLECTION.REPORT_DRAFT}${reportID}`];
+}
+
+/**
+ * Check if a report is a draft report
+ */
+function isDraftReport(reportID: string | undefined): boolean {
+    const draftReport = allReportsDraft?.[`${ONYXKEYS.COLLECTION.REPORT_DRAFT}${reportID}`];
+
+    return !!draftReport;
+}
+
+/**
+ * Returns the report
+ */
+function getReport(reportID: string): OnyxEntry<Report> {
+    return ReportConnection.getAllReports()?.[`${ONYXKEYS.COLLECTION.REPORT}${reportID}`];
+}
 
-    return allReports?.[`${ONYXKEYS.COLLECTION.REPORT}${reportID}`];
+/**
+ * Returns the report
+ */
+function getReportNameValuePairs(reportID?: string): OnyxEntry<ReportNameValuePairs> {
+    return allReportNameValuePair?.[`${ONYXKEYS.COLLECTION.REPORT_NAME_VALUE_PAIRS}${reportID ?? -1}`];
 }
 
 /**
  * Returns the parentReport if the given report is a thread
  */
-function getParentReport(report: OnyxEntry<Report> | EmptyObject): OnyxEntry<Report> | EmptyObject {
+function getParentReport(report: OnyxEntry<Report>): OnyxEntry<Report> {
     if (!report?.parentReportID) {
-        return {};
+        return undefined;
     }
-    return allReports?.[`${ONYXKEYS.COLLECTION.REPORT}${report.parentReportID}`] ?? {};
+    return ReportConnection.getAllReports()?.[`${ONYXKEYS.COLLECTION.REPORT}${report.parentReportID}`];
 }
 
 /**
  * Returns the root parentReport if the given report is nested.
  * Uses recursion to iterate any depth of nested reports.
  */
-function getRootParentReport(report: OnyxEntry<Report> | undefined | EmptyObject): OnyxEntry<Report> | EmptyObject {
+function getRootParentReport(report: OnyxEntry<Report>): OnyxEntry<Report> {
     if (!report) {
-        return {};
+        return undefined;
     }
 
     // Returns the current report as the root report, because it does not have a parentReportID
@@ -622,41 +709,42 @@ function getRootParentReport(report: OnyxEntry<Report> | undefined | EmptyObject
         return report;
     }
 
-    const parentReport = getReport(report?.parentReportID);
+    const parentReport = getReportOrDraftReport(report?.parentReportID);
 
     // Runs recursion to iterate a parent report
-    return getRootParentReport(!isEmptyObject(parentReport) ? parentReport : null);
+    return getRootParentReport(!isEmptyObject(parentReport) ? parentReport : undefined);
 }
 
 /**
  * Returns the policy of the report
  */
-function getPolicy(policyID: string | undefined): Policy | EmptyObject {
+function getPolicy(policyID: string | undefined): OnyxEntry<Policy> {
     if (!allPolicies || !policyID) {
-        return {};
+        return undefined;
     }
-    return allPolicies[`${ONYXKEYS.COLLECTION.POLICY}${policyID}`] ?? {};
+    return allPolicies[`${ONYXKEYS.COLLECTION.POLICY}${policyID}`];
 }
 
 /**
  * Get the policy type from a given report
  * @param policies must have Onyxkey prefix (i.e 'policy_') for keys
  */
-function getPolicyType(report: OnyxEntry<Report>, policies: OnyxCollection<Policy>): string {
+function getPolicyType(report: OnyxInputOrEntry<Report>, policies: OnyxCollection<Policy>): string {
     return policies?.[`${ONYXKEYS.COLLECTION.POLICY}${report?.policyID}`]?.type ?? '';
 }
 
+const unavailableTranslation = Localize.translateLocal('workspace.common.unavailable');
 /**
  * Get the policy name from a given report
  */
-function getPolicyName(report: OnyxEntry<Report> | undefined | EmptyObject, returnEmptyIfNotFound = false, policy: OnyxEntry<Policy> | undefined = undefined): string {
-    const noPolicyFound = returnEmptyIfNotFound ? '' : Localize.translateLocal('workspace.common.unavailable');
+function getPolicyName(report: OnyxInputOrEntry<Report>, returnEmptyIfNotFound = false, policy?: OnyxInputOrEntry<Policy>): string {
+    const noPolicyFound = returnEmptyIfNotFound ? '' : unavailableTranslation;
     if (isEmptyObject(report)) {
         return noPolicyFound;
     }
 
     if ((!allPolicies || Object.keys(allPolicies).length === 0) && !report?.policyName) {
-        return Localize.translateLocal('workspace.common.unavailable');
+        return unavailableTranslation;
     }
     const finalPolicy = policy ?? allPolicies?.[`${ONYXKEYS.COLLECTION.POLICY}${report?.policyID}`];
 
@@ -681,39 +769,39 @@ function getReportParticipantsTitle(accountIDs: number[]): string {
 /**
  * Checks if a report is a chat report.
  */
-function isChatReport(report: OnyxEntry<Report> | EmptyObject): boolean {
+function isChatReport(report: OnyxEntry<Report>): boolean {
     return report?.type === CONST.REPORT.TYPE.CHAT;
 }
 
-function isInvoiceReport(report: OnyxEntry<Report> | EmptyObject): boolean {
+function isInvoiceReport(report: OnyxInputOrEntry<Report>): boolean {
     return report?.type === CONST.REPORT.TYPE.INVOICE;
 }
 
 /**
  * Checks if a report is an Expense report.
  */
-function isExpenseReport(report: OnyxEntry<Report> | EmptyObject): boolean {
+function isExpenseReport(report: OnyxInputOrEntry<Report>): boolean {
     return report?.type === CONST.REPORT.TYPE.EXPENSE;
 }
 
 /**
  * Checks if a report is an IOU report using report or reportID
  */
-function isIOUReport(reportOrID: OnyxEntry<Report> | string | EmptyObject): boolean {
-    const report = typeof reportOrID === 'string' ? allReports?.[`${ONYXKEYS.COLLECTION.REPORT}${reportOrID}`] ?? null : reportOrID;
+function isIOUReport(reportOrID: OnyxInputOrEntry<Report> | string): boolean {
+    const report = typeof reportOrID === 'string' ? ReportConnection.getAllReports()?.[`${ONYXKEYS.COLLECTION.REPORT}${reportOrID}`] ?? null : reportOrID;
     return report?.type === CONST.REPORT.TYPE.IOU;
 }
 
 /**
  * Checks if a report is an IOU report using report
  */
-function isIOUReportUsingReport(report: OnyxEntry<Report> | EmptyObject): report is Report {
+function isIOUReportUsingReport(report: OnyxEntry<Report>): report is Report {
     return report?.type === CONST.REPORT.TYPE.IOU;
 }
 /**
  * Checks if a report is a task report.
  */
-function isTaskReport(report: OnyxEntry<Report>): boolean {
+function isTaskReport(report: OnyxInputOrEntry<Report>): boolean {
     return report?.type === CONST.REPORT.TYPE.TASK;
 }
 
@@ -724,8 +812,8 @@ function isTaskReport(report: OnyxEntry<Report>): boolean {
  * 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
  */
-function isCanceledTaskReport(report: OnyxEntry<Report> | EmptyObject = {}, parentReportAction: OnyxEntry<ReportAction> | EmptyObject = {}): boolean {
-    if (!isEmptyObject(parentReportAction) && (parentReportAction?.message?.[0]?.isDeletedParentAction ?? false)) {
+function isCanceledTaskReport(report: OnyxInputOrEntry<Report>, parentReportAction: OnyxInputOrEntry<ReportAction> = null): boolean {
+    if (!isEmptyObject(parentReportAction) && (ReportActionsUtils.getReportActionMessage(parentReportAction)?.isDeletedParentAction ?? false)) {
         return true;
     }
 
@@ -741,7 +829,7 @@ function isCanceledTaskReport(report: OnyxEntry<Report> | EmptyObject = {}, pare
  *
  * @param parentReportAction - The parent report action of the report (Used to check if the task has been canceled)
  */
-function isOpenTaskReport(report: OnyxEntry<Report>, parentReportAction: OnyxEntry<ReportAction> | EmptyObject = {}): boolean {
+function isOpenTaskReport(report: OnyxInputOrEntry<Report>, parentReportAction: OnyxInputOrEntry<ReportAction> = null): boolean {
     return (
         isTaskReport(report) && !isCanceledTaskReport(report, parentReportAction) && report?.stateNum === CONST.REPORT.STATE_NUM.OPEN && report?.statusNum === CONST.REPORT.STATUS_NUM.OPEN
     );
@@ -758,21 +846,31 @@ function isCompletedTaskReport(report: OnyxEntry<Report>): boolean {
  * Checks if the current user is the manager of the supplied report
  */
 function isReportManager(report: OnyxEntry<Report>): boolean {
-    return Boolean(report && report.managerID === currentUserAccountID);
+    return !!(report && report.managerID === currentUserAccountID);
 }
 
 /**
  * Checks if the supplied report has been approved
  */
-function isReportApproved(reportOrID: OnyxEntry<Report> | string | EmptyObject): boolean {
-    const report = typeof reportOrID === 'string' ? allReports?.[`${ONYXKEYS.COLLECTION.REPORT}${reportOrID}`] ?? null : reportOrID;
+function isReportApproved(reportOrID: OnyxInputOrEntry<Report> | string, parentReportAction: OnyxEntry<ReportAction> = undefined): boolean {
+    const report = typeof reportOrID === 'string' ? ReportConnection.getAllReports()?.[`${ONYXKEYS.COLLECTION.REPORT}${reportOrID}`] ?? null : reportOrID;
+    if (!report) {
+        return parentReportAction?.childStateNum === CONST.REPORT.STATE_NUM.APPROVED && parentReportAction?.childStatusNum === CONST.REPORT.STATUS_NUM.APPROVED;
+    }
     return report?.stateNum === CONST.REPORT.STATE_NUM.APPROVED && report?.statusNum === CONST.REPORT.STATUS_NUM.APPROVED;
 }
 
+/**
+ * Checks if the supplied report has been manually reimbursed
+ */
+function isReportManuallyReimbursed(report: OnyxEntry<Report>): boolean {
+    return report?.stateNum === CONST.REPORT.STATE_NUM.APPROVED && report?.statusNum === CONST.REPORT.STATUS_NUM.REIMBURSED;
+}
+
 /**
  * Checks if the supplied report is an expense report in Open state and status.
  */
-function isOpenExpenseReport(report: OnyxEntry<Report> | EmptyObject): boolean {
+function isOpenExpenseReport(report: OnyxInputOrEntry<Report>): boolean {
     return isExpenseReport(report) && report?.stateNum === CONST.REPORT.STATE_NUM.OPEN && report?.statusNum === CONST.REPORT.STATUS_NUM.OPEN;
 }
 
@@ -799,10 +897,11 @@ function hasParticipantInArray(report: OnyxEntry<Report>, memberAccountIDs: numb
  * Whether the Money Request report is settled
  */
 function isSettled(reportID: string | undefined): boolean {
+    const allReports = ReportConnection.getAllReports();
     if (!allReports || !reportID) {
         return false;
     }
-    const report: Report | EmptyObject = allReports[`${ONYXKEYS.COLLECTION.REPORT}${reportID}`] ?? {};
+    const report = allReports[`${ONYXKEYS.COLLECTION.REPORT}${reportID}`] ?? null;
     if (isEmptyObject(report) || report.isWaitingOnBankAccount) {
         return false;
     }
@@ -820,11 +919,12 @@ function isSettled(reportID: string | undefined): boolean {
  * Whether the current user is the submitter of the report
  */
 function isCurrentUserSubmitter(reportID: string): boolean {
+    const allReports = ReportConnection.getAllReports();
     if (!allReports) {
         return false;
     }
     const report = allReports[`${ONYXKEYS.COLLECTION.REPORT}${reportID}`];
-    return Boolean(report && report.ownerAccountID === currentUserAccountID);
+    return !!(report && report.ownerAccountID === currentUserAccountID);
 }
 
 /**
@@ -872,7 +972,7 @@ function isUserCreatedPolicyRoom(report: OnyxEntry<Report>): boolean {
 /**
  * Whether the provided report is a Policy Expense chat.
  */
-function isPolicyExpenseChat(report: OnyxEntry<Report> | Participant | EmptyObject): boolean {
+function isPolicyExpenseChat(report: OnyxInputOrEntry<Report> | Participant): boolean {
     return getChatType(report) === CONST.REPORT.CHAT_TYPE.POLICY_EXPENSE_CHAT || (report?.isPolicyExpenseChat ?? false);
 }
 
@@ -880,11 +980,33 @@ function isInvoiceRoom(report: OnyxEntry<Report>): boolean {
     return getChatType(report) === CONST.REPORT.CHAT_TYPE.INVOICE;
 }
 
+function isInvoiceRoomWithID(reportID?: string): boolean {
+    // eslint-disable-next-line @typescript-eslint/prefer-nullish-coalescing
+    const report = ReportConnection.getAllReports()?.[`${ONYXKEYS.COLLECTION.REPORT}${reportID || -1}`];
+    return isInvoiceRoom(report);
+}
+
+/**
+ * Checks if a report is a completed task report.
+ */
+function isTripRoom(report: OnyxEntry<Report>): boolean {
+    return isChatReport(report) && getChatType(report) === CONST.REPORT.CHAT_TYPE.TRIP_ROOM;
+}
+
+function isIndividualInvoiceRoom(report: OnyxEntry<Report>): boolean {
+    return isInvoiceRoom(report) && report?.invoiceReceiver?.type === CONST.REPORT.INVOICE_RECEIVER_TYPE.INDIVIDUAL;
+}
+
 function isCurrentUserInvoiceReceiver(report: OnyxEntry<Report>): boolean {
     if (report?.invoiceReceiver?.type === CONST.REPORT.INVOICE_RECEIVER_TYPE.INDIVIDUAL) {
         return currentUserAccountID === report.invoiceReceiver.accountID;
     }
 
+    if (report?.invoiceReceiver?.type === CONST.REPORT.INVOICE_RECEIVER_TYPE.BUSINESS) {
+        const policy = PolicyUtils.getPolicy(report.invoiceReceiver.policyID);
+        return PolicyUtils.isPolicyAdmin(policy);
+    }
+
     return false;
 }
 
@@ -905,8 +1027,8 @@ function isGroupPolicy(policyType: string): boolean {
 /**
  * Whether the provided report belongs to a Free, Collect or Control policy
  */
-function isReportInGroupPolicy(report: OnyxEntry<Report>): boolean {
-    const policyType = getPolicyType(report, allPolicies);
+function isReportInGroupPolicy(report: OnyxInputOrEntry<Report>, policy?: OnyxInputOrEntry<Policy>): boolean {
+    const policyType = policy?.type ?? getPolicyType(report, allPolicies);
     return isGroupPolicy(policyType);
 }
 
@@ -942,7 +1064,7 @@ function isPaidGroupPolicyExpenseReport(report: OnyxEntry<Report>): boolean {
 /**
  * Checks if the supplied report is an invoice report in Open state and status.
  */
-function isOpenInvoiceReport(report: OnyxEntry<Report> | EmptyObject): boolean {
+function isOpenInvoiceReport(report: OnyxEntry<Report>): boolean {
     return isInvoiceReport(report) && report?.statusNum === CONST.REPORT.STATUS_NUM.OPEN;
 }
 
@@ -950,7 +1072,7 @@ function isOpenInvoiceReport(report: OnyxEntry<Report> | EmptyObject): boolean {
  * Whether the provided report is a chat room
  */
 function isChatRoom(report: OnyxEntry<Report>): boolean {
-    return isUserCreatedPolicyRoom(report) || isDefaultRoom(report) || isInvoiceRoom(report);
+    return isUserCreatedPolicyRoom(report) || isDefaultRoom(report) || isInvoiceRoom(report) || isTripRoom(report);
 }
 
 /**
@@ -989,21 +1111,21 @@ function isWorkspaceTaskReport(report: OnyxEntry<Report>): boolean {
     if (!isTaskReport(report)) {
         return false;
     }
-    const parentReport = allReports?.[`${ONYXKEYS.COLLECTION.REPORT}${report?.parentReportID}`] ?? null;
+    const parentReport = ReportConnection.getAllReports()?.[`${ONYXKEYS.COLLECTION.REPORT}${report?.parentReportID}`];
     return isPolicyExpenseChat(parentReport);
 }
 
 /**
  * Returns true if report has a parent
  */
-function isThread(report: OnyxEntry<Report>): boolean {
-    return Boolean(report?.parentReportID && report?.parentReportActionID);
+function isThread(report: OnyxInputOrEntry<Report>): boolean {
+    return !!(report?.parentReportID && report?.parentReportActionID);
 }
 
 /**
  * Returns true if report is of type chat and has a parent and is therefore a Thread.
  */
-function isChatThread(report: OnyxEntry<Report>): boolean {
+function isChatThread(report: OnyxInputOrEntry<Report>): boolean {
     return isThread(report) && report?.type === CONST.REPORT.TYPE.CHAT;
 }
 
@@ -1011,7 +1133,7 @@ function isDM(report: OnyxEntry<Report>): boolean {
     return isChatReport(report) && !getChatType(report) && !isThread(report);
 }
 
-function isSelfDM(report: OnyxEntry<Report>): boolean {
+function isSelfDM(report: OnyxInputOrEntry<Report>): boolean {
     return getChatType(report) === CONST.REPORT.CHAT_TYPE.SELF_DM;
 }
 
@@ -1019,18 +1141,32 @@ function isGroupChat(report: OnyxEntry<Report> | Partial<Report>): boolean {
     return getChatType(report) === CONST.REPORT.CHAT_TYPE.GROUP;
 }
 
+/**
+ * Only returns true if this is the Expensify DM report.
+ */
 function isSystemChat(report: OnyxEntry<Report>): boolean {
     return getChatType(report) === CONST.REPORT.CHAT_TYPE.SYSTEM;
 }
 
+const CONCIERGE_ACCOUNT_ID_STRING = CONST.ACCOUNT_ID.CONCIERGE.toString();
 /**
- * Only returns true if this is our main 1:1 DM report with Concierge
+ * Only returns true if this is our main 1:1 DM report with Concierge.
  */
-function isConciergeChatReport(report: OnyxEntry<Report>): boolean {
-    return report?.participantAccountIDs?.length === 1 && Number(report.participantAccountIDs?.[0]) === CONST.ACCOUNT_ID.CONCIERGE && !isChatThread(report);
+function isConciergeChatReport(report: OnyxInputOrEntry<Report>): boolean {
+    if (!report?.participants || isThread(report)) {
+        return false;
+    }
+
+    const participantAccountIDs = new Set(Object.keys(report.participants));
+    if (participantAccountIDs.size !== 2) {
+        return false;
+    }
+
+    return participantAccountIDs.has(CONCIERGE_ACCOUNT_ID_STRING);
 }
 
 function findSelfDMReportID(): string | undefined {
+    const allReports = ReportConnection.getAllReports();
     if (!allReports) {
         return;
     }
@@ -1044,37 +1180,21 @@ function findSelfDMReportID(): string | undefined {
  * In this case report and workspace members must be compared to determine whether the report belongs to the workspace.
  */
 function doesReportBelongToWorkspace(report: OnyxEntry<Report>, policyMemberAccountIDs: number[], policyID?: string) {
-    return (
-        isConciergeChatReport(report) ||
-        (report?.policyID === CONST.POLICY.ID_FAKE || !report?.policyID ? hasParticipantInArray(report, policyMemberAccountIDs) : report?.policyID === policyID)
-    );
+    const isPolicyRelatedReport = report?.policyID === policyID || !!(report?.invoiceReceiver && 'policyID' in report.invoiceReceiver && report.invoiceReceiver.policyID === policyID);
+    return isConciergeChatReport(report) || (report?.policyID === CONST.POLICY.ID_FAKE || !report?.policyID ? hasParticipantInArray(report, policyMemberAccountIDs) : isPolicyRelatedReport);
 }
 
 /**
  * Given an array of reports, return them filtered by a policyID and policyMemberAccountIDs.
  */
-function filterReportsByPolicyIDAndMemberAccountIDs(reports: Report[], policyMemberAccountIDs: number[] = [], policyID?: string) {
+function filterReportsByPolicyIDAndMemberAccountIDs(reports: Array<OnyxEntry<Report>>, policyMemberAccountIDs: number[] = [], policyID?: string) {
     return reports.filter((report) => !!report && doesReportBelongToWorkspace(report, policyMemberAccountIDs, policyID));
 }
 
-/**
- * Given an array of reports, return them sorted by the last read timestamp.
- */
-function sortReportsByLastRead(reports: Array<OnyxEntry<Report>>, reportMetadata: OnyxCollection<ReportMetadata>): Array<OnyxEntry<Report>> {
-    return reports
-        .filter((report) => !!report?.reportID && !!(reportMetadata?.[`${ONYXKEYS.COLLECTION.REPORT_METADATA}${report.reportID}`]?.lastVisitTime ?? report?.lastReadTime))
-        .sort((a, b) => {
-            const aTime = new Date(reportMetadata?.[`${ONYXKEYS.COLLECTION.REPORT_METADATA}${a?.reportID}`]?.lastVisitTime ?? a?.lastReadTime ?? '');
-            const bTime = new Date(reportMetadata?.[`${ONYXKEYS.COLLECTION.REPORT_METADATA}${b?.reportID}`]?.lastVisitTime ?? b?.lastReadTime ?? '');
-
-            return aTime.valueOf() - bTime.valueOf();
-        });
-}
-
 /**
  * Returns true if report is still being processed
  */
-function isProcessingReport(report: OnyxEntry<Report> | EmptyObject): boolean {
+function isProcessingReport(report: OnyxEntry<Report>): boolean {
     return report?.stateNum === CONST.REPORT.STATE_NUM.SUBMITTED && report?.statusNum === CONST.REPORT.STATUS_NUM.SUBMITTED;
 }
 
@@ -1083,12 +1203,13 @@ function isProcessingReport(report: OnyxEntry<Report> | EmptyObject): boolean {
  * and personal detail of participant is optimistic data
  */
 function shouldDisableDetailPage(report: OnyxEntry<Report>): boolean {
-    const participantAccountIDs = report?.participantAccountIDs ?? [];
-
     if (isChatRoom(report) || isPolicyExpenseChat(report) || isChatThread(report) || isTaskReport(report)) {
         return false;
     }
-    if (participantAccountIDs.length === 1) {
+    if (isOneOnOneChat(report)) {
+        const participantAccountIDs = Object.keys(report?.participants ?? {})
+            .map(Number)
+            .filter((accountID) => accountID !== currentUserAccountID);
         return isOptimisticPersonalDetail(participantAccountIDs[0]);
     }
     return false;
@@ -1098,8 +1219,10 @@ function shouldDisableDetailPage(report: OnyxEntry<Report>): boolean {
  * Returns true if this report has only one participant and it's an Expensify account.
  */
 function isExpensifyOnlyParticipantInReport(report: OnyxEntry<Report>): boolean {
-    const reportParticipants = report?.participantAccountIDs?.filter((accountID) => accountID !== currentUserAccountID) ?? [];
-    return reportParticipants.length === 1 && reportParticipants.some((accountID) => CONST.EXPENSIFY_ACCOUNT_IDS.includes(accountID));
+    const otherParticipants = Object.keys(report?.participants ?? {})
+        .map(Number)
+        .filter((accountID) => accountID !== currentUserAccountID);
+    return otherParticipants.length === 1 && otherParticipants.some((accountID) => CONST.EXPENSIFY_ACCOUNT_IDS.includes(accountID));
 }
 
 /**
@@ -1108,8 +1231,10 @@ function isExpensifyOnlyParticipantInReport(report: OnyxEntry<Report>): boolean
  *
  */
 function canCreateTaskInReport(report: OnyxEntry<Report>): boolean {
-    const otherReportParticipants = report?.participantAccountIDs?.filter((accountID) => accountID !== currentUserAccountID) ?? [];
-    const areExpensifyAccountsOnlyOtherParticipants = otherReportParticipants?.length >= 1 && otherReportParticipants?.every((accountID) => CONST.EXPENSIFY_ACCOUNT_IDS.includes(accountID));
+    const otherParticipants = Object.keys(report?.participants ?? {})
+        .map(Number)
+        .filter((accountID) => accountID !== currentUserAccountID);
+    const areExpensifyAccountsOnlyOtherParticipants = otherParticipants.length >= 1 && otherParticipants.every((accountID) => CONST.EXPENSIFY_ACCOUNT_IDS.includes(accountID));
     if (areExpensifyAccountsOnlyOtherParticipants && isDM(report)) {
         return false;
     }
@@ -1126,56 +1251,89 @@ function hasExpensifyGuidesEmails(accountIDs: number[]): boolean {
     return accountIDs.some((accountID) => Str.extractEmailDomain(allPersonalDetails?.[accountID]?.login ?? '') === CONST.EMAIL.GUIDES_DOMAIN);
 }
 
-function findLastAccessedReport(
-    reports: OnyxCollection<Report>,
-    ignoreDomainRooms: boolean,
-    policies: OnyxCollection<Policy>,
-    isFirstTimeNewExpensifyUser: boolean,
-    openOnAdminRoom = false,
-    reportMetadata: OnyxCollection<ReportMetadata> = {},
-    policyID?: string,
-    policyMemberAccountIDs: number[] = [],
-): OnyxEntry<Report> {
+function getMostRecentlyVisitedReport(reports: Array<OnyxEntry<Report>>, reportMetadata: OnyxCollection<ReportMetadata>): OnyxEntry<Report> {
+    const filteredReports = reports.filter((report) => {
+        const shouldKeep = !isChatThread(report) || report?.notificationPreference !== CONST.REPORT.NOTIFICATION_PREFERENCE.HIDDEN;
+        return shouldKeep && !!report?.reportID && !!(reportMetadata?.[`${ONYXKEYS.COLLECTION.REPORT_METADATA}${report.reportID}`]?.lastVisitTime ?? report?.lastReadTime);
+    });
+    return lodashMaxBy(filteredReports, (a) => new Date(reportMetadata?.[`${ONYXKEYS.COLLECTION.REPORT_METADATA}${a?.reportID}`]?.lastVisitTime ?? a?.lastReadTime ?? '').valueOf());
+}
+
+function findLastAccessedReport(ignoreDomainRooms: boolean, openOnAdminRoom = false, policyID?: string, excludeReportID?: string): OnyxEntry<Report> {
     // If it's the user's first time using New Expensify, then they could either have:
     //   - just a Concierge report, if so we'll return that
     //   - their Concierge report, and a separate report that must have deeplinked them to the app before they created their account.
     // If it's the latter, we'll use the deeplinked report over the Concierge report,
     // since the Concierge report would be incorrectly selected over the deep-linked report in the logic below.
 
-    let reportsValues = Object.values(reports ?? {}) as Report[];
+    const policyMemberAccountIDs = PolicyUtils.getPolicyEmployeeListByIdWithoutCurrentUser(allPolicies, policyID, currentUserAccountID);
+
+    const allReports = ReportConnection.getAllReports();
+    let reportsValues = Object.values(allReports ?? {});
 
     if (!!policyID || policyMemberAccountIDs.length > 0) {
         reportsValues = filterReportsByPolicyIDAndMemberAccountIDs(reportsValues, policyMemberAccountIDs, policyID);
     }
 
-    let sortedReports = sortReportsByLastRead(reportsValues, reportMetadata);
-
-    let adminReport: OnyxEntry<Report> | undefined;
+    let adminReport: OnyxEntry<Report>;
     if (openOnAdminRoom) {
-        adminReport = sortedReports.find((report) => {
+        adminReport = reportsValues.find((report) => {
             const chatType = getChatType(report);
             return chatType === CONST.REPORT.CHAT_TYPE.POLICY_ADMINS;
         });
     }
 
-    if (ignoreDomainRooms) {
-        // We allow public announce rooms, admins, and announce rooms through since we bypass the default rooms beta for them.
-        // Check where ReportUtils.findLastAccessedReport is called in MainDrawerNavigator.js for more context.
-        // Domain rooms are now the only type of default room that are on the defaultRooms beta.
-        sortedReports = sortedReports.filter(
-            (report) => !isDomainRoom(report) || getPolicyType(report, policies) === CONST.POLICY.TYPE.FREE || hasExpensifyGuidesEmails(report?.participantAccountIDs ?? []),
-        );
+    // if the user hasn't completed the onboarding flow, whether the user should be in the concierge chat or system chat
+    // should be consistent with what chat the user will land after onboarding flow
+    if (!getIsSmallScreenWidth() && !Array.isArray(onboarding) && !onboarding?.hasCompletedGuidedSetupFlow) {
+        return reportsValues.find(isChatUsedForOnboarding);
+    }
+
+    // eslint-disable-next-line @typescript-eslint/prefer-nullish-coalescing
+    const shouldFilter = excludeReportID || ignoreDomainRooms;
+    if (shouldFilter) {
+        reportsValues = reportsValues.filter((report) => {
+            if (excludeReportID && report?.reportID === excludeReportID) {
+                return false;
+            }
+
+            // We allow public announce rooms, admins, and announce rooms through since we bypass the default rooms beta for them.
+            // Check where ReportUtils.findLastAccessedReport is called in MainDrawerNavigator.js for more context.
+            // Domain rooms are now the only type of default room that are on the defaultRooms beta.
+            if (
+                ignoreDomainRooms &&
+                isDomainRoom(report) &&
+                getPolicyType(report, allPolicies) !== CONST.POLICY.TYPE.FREE &&
+                !hasExpensifyGuidesEmails(Object.keys(report?.participants ?? {}).map(Number))
+            ) {
+                return false;
+            }
+
+            return true;
+        });
     }
 
     if (isFirstTimeNewExpensifyUser) {
-        if (sortedReports.length === 1) {
-            return sortedReports[0];
+        // Filter out the systemChat report from the reports list, as we don't want to drop the user into that report over Concierge when they first log in
+        reportsValues = reportsValues.filter((report) => !isSystemChat(report)) ?? [];
+        if (reportsValues.length === 1) {
+            return reportsValues[0];
         }
 
-        return adminReport ?? sortedReports.find((report) => !isConciergeChatReport(report)) ?? null;
+        return adminReport ?? reportsValues.find((report) => !isConciergeChatReport(report));
+    }
+
+    // If we only have two reports and one of them is the system chat, filter it out so we don't
+    // overwrite showing the concierge chat
+    const hasSystemChat = reportsValues.find((report) => isSystemChat(report)) ?? false;
+    if (reportsValues.length === 2 && hasSystemChat) {
+        reportsValues = reportsValues.filter((report) => !isSystemChat(report)) ?? [];
     }
 
-    return adminReport ?? sortedReports.at(-1) ?? null;
+    // We are getting the last read report from the metadata of the report.
+    const lastRead = getMostRecentlyVisitedReport(reportsValues, allReportMetadata);
+
+    return adminReport ?? lastRead;
 }
 
 /**
@@ -1195,8 +1353,25 @@ function isClosedExpenseReportWithNoExpenses(report: OnyxEntry<Report>): boolean
 /**
  * Whether the provided report is an archived room
  */
-function isArchivedRoom(report: OnyxEntry<Report> | EmptyObject): boolean {
-    return report?.statusNum === CONST.REPORT.STATUS_NUM.CLOSED && report?.stateNum === CONST.REPORT.STATE_NUM.APPROVED;
+// eslint-disable-next-line @typescript-eslint/no-unused-vars
+function isArchivedRoom(report: OnyxInputOrEntry<Report>, reportNameValuePairs?: OnyxInputOrEntry<ReportNameValuePairs>): boolean {
+    return !!report?.private_isArchived;
+}
+
+/**
+ * Whether the report with the provided reportID is an archived room
+ */
+function isArchivedRoomWithID(reportID?: string) {
+    // eslint-disable-next-line @typescript-eslint/prefer-nullish-coalescing
+    const report = ReportConnection.getAllReports()?.[`${ONYXKEYS.COLLECTION.REPORT}${reportID || -1}`];
+    return isArchivedRoom(report, getReportNameValuePairs(reportID));
+}
+
+/**
+ * Whether the provided report is a closed report
+ */
+function isClosedReport(report: OnyxEntry<Report>): boolean {
+    return report?.statusNum === CONST.REPORT.STATUS_NUM.CLOSED;
 }
 
 /**
@@ -1211,7 +1386,7 @@ function isJoinRequestInAdminRoom(report: OnyxEntry<Report>): boolean {
     // since they are not a part of the company, and should not action it on their behalf.
     if (report.policyID) {
         const policy = getPolicy(report.policyID);
-        if (!PolicyUtils.isExpensifyTeam(policy.owner) && PolicyUtils.isExpensifyTeam(currentUserPersonalDetails?.login)) {
+        if (!PolicyUtils.isExpensifyTeam(policy?.owner) && PolicyUtils.isExpensifyTeam(currentUserPersonalDetails?.login)) {
             return false;
         }
     }
@@ -1223,7 +1398,7 @@ function isJoinRequestInAdminRoom(report: OnyxEntry<Report>): boolean {
  */
 function canWriteInReport(report: OnyxEntry<Report>): boolean {
     if (Array.isArray(report?.permissions) && report?.permissions.length > 0) {
-        return report?.permissions?.includes(CONST.REPORT.PERMISSIONS.WRITE);
+        return report?.permissions?.includes(CONST.REPORT.PERMISSIONS.WRITE) || (report?.permissions?.includes(CONST.REPORT.PERMISSIONS.AUDITOR) && isExpenseReport(report));
     }
 
     return true;
@@ -1277,18 +1452,11 @@ function isPolicyAdmin(policyID: string, policies: OnyxCollection<Policy>): bool
     return policyRole === CONST.POLICY.ROLE.ADMIN;
 }
 
-/**
- * Returns true if report has a single participant.
- */
-function hasSingleParticipant(report: OnyxEntry<Report>): boolean {
-    return report?.participantAccountIDs?.length === 1;
-}
-
 /**
  * Checks whether all the transactions linked to the IOU report are of the Distance Request type with pending routes
  */
 function hasOnlyTransactionsWithPendingRoutes(iouReportID: string | undefined): boolean {
-    const transactions = TransactionUtils.getAllReportTransactions(iouReportID);
+    const transactions = reportsTransactions[iouReportID ?? ''] ?? [];
 
     // Early return false in case not having any transaction
     if (!transactions || transactions.length === 0) {
@@ -1309,7 +1477,7 @@ function isWorkspaceThread(report: OnyxEntry<Report>): boolean {
 /**
  * Returns true if reportAction is the first chat preview of a Thread
  */
-function isThreadFirstChat(reportAction: OnyxEntry<ReportAction>, reportID: string): boolean {
+function isThreadFirstChat(reportAction: OnyxInputOrEntry<ReportAction>, reportID: string): boolean {
     return reportAction?.childReportID?.toString() === reportID;
 }
 
@@ -1324,10 +1492,10 @@ function isChildReport(report: OnyxEntry<Report>): boolean {
  * An Expense Request is a thread where the parent report is an Expense Report and
  * the parentReportAction is a transaction.
  */
-function isExpenseRequest(report: OnyxEntry<Report>): boolean {
+function isExpenseRequest(report: OnyxInputOrEntry<Report>): boolean {
     if (isThread(report)) {
         const parentReportAction = ReportActionsUtils.getParentReportAction(report);
-        const parentReport = allReports?.[`${ONYXKEYS.COLLECTION.REPORT}${report?.parentReportID}`] ?? null;
+        const parentReport = ReportConnection.getAllReports()?.[`${ONYXKEYS.COLLECTION.REPORT}${report?.parentReportID}`];
         return isExpenseReport(parentReport) && !isEmptyObject(parentReportAction) && ReportActionsUtils.isTransactionThread(parentReportAction);
     }
     return false;
@@ -1337,10 +1505,10 @@ function isExpenseRequest(report: OnyxEntry<Report>): boolean {
  * An IOU Request is a thread where the parent report is an IOU Report and
  * the parentReportAction is a transaction.
  */
-function isIOURequest(report: OnyxEntry<Report>): boolean {
+function isIOURequest(report: OnyxInputOrEntry<Report>): boolean {
     if (isThread(report)) {
         const parentReportAction = ReportActionsUtils.getParentReportAction(report);
-        const parentReport = allReports?.[`${ONYXKEYS.COLLECTION.REPORT}${report?.parentReportID}`] ?? null;
+        const parentReport = ReportConnection.getAllReports()?.[`${ONYXKEYS.COLLECTION.REPORT}${report?.parentReportID}`];
         return isIOUReport(parentReport) && !isEmptyObject(parentReportAction) && ReportActionsUtils.isTransactionThread(parentReportAction);
     }
     return false;
@@ -1350,7 +1518,7 @@ function isIOURequest(report: OnyxEntry<Report>): boolean {
  * A Track Expense Report is a thread where the parent the parentReportAction is a transaction, and
  * parentReportAction has type of track.
  */
-function isTrackExpenseReport(report: OnyxEntry<Report>): boolean {
+function isTrackExpenseReport(report: OnyxInputOrEntry<Report>): boolean {
     if (isThread(report)) {
         const parentReportAction = ReportActionsUtils.getParentReportAction(report);
         return !isEmptyObject(parentReportAction) && ReportActionsUtils.isTrackExpenseAction(parentReportAction);
@@ -1362,18 +1530,34 @@ function isTrackExpenseReport(report: OnyxEntry<Report>): boolean {
  * Checks if a report is an IOU or expense request.
  */
 function isMoneyRequest(reportOrID: OnyxEntry<Report> | string): boolean {
-    const report = typeof reportOrID === 'string' ? allReports?.[`${ONYXKEYS.COLLECTION.REPORT}${reportOrID}`] ?? null : reportOrID;
+    const report = typeof reportOrID === 'string' ? ReportConnection.getAllReports()?.[`${ONYXKEYS.COLLECTION.REPORT}${reportOrID}`] ?? null : reportOrID;
     return isIOURequest(report) || isExpenseRequest(report);
 }
 
 /**
  * Checks if a report is an IOU or expense report.
  */
-function isMoneyRequestReport(reportOrID: OnyxEntry<Report> | EmptyObject | string): boolean {
-    const report = typeof reportOrID === 'object' ? reportOrID : allReports?.[`${ONYXKEYS.COLLECTION.REPORT}${reportOrID}`] ?? null;
+function isMoneyRequestReport(reportOrID: OnyxInputOrEntry<Report> | string): boolean {
+    const report = typeof reportOrID === 'string' ? ReportConnection.getAllReports()?.[`${ONYXKEYS.COLLECTION.REPORT}${reportOrID}`] ?? null : reportOrID;
     return isIOUReport(report) || isExpenseReport(report);
 }
 
+/**
+ * Checks if a report contains only Non-Reimbursable transactions
+ */
+function hasOnlyNonReimbursableTransactions(iouReportID: string | undefined): boolean {
+    if (!iouReportID) {
+        return false;
+    }
+
+    const transactions = reportsTransactions[iouReportID ?? ''] ?? [];
+    if (!transactions || transactions.length === 0) {
+        return false;
+    }
+
+    return transactions.every((transaction) => !TransactionUtils.getReimbursable(transaction));
+}
+
 /**
  * Checks if a report has only one transaction associated with it
  */
@@ -1382,13 +1566,24 @@ function isOneTransactionReport(reportID: string): boolean {
     return ReportActionsUtils.getOneTransactionThreadReportID(reportID, reportActions) !== null;
 }
 
+/*
+ * Whether the report contains only one expense and the expense should be paid later
+ */
+function isPayAtEndExpenseReport(reportID: string, transactions: Transaction[] | undefined): boolean {
+    if ((!!transactions && transactions.length !== 1) || !isOneTransactionReport(reportID)) {
+        return false;
+    }
+
+    return TransactionUtils.isPayAtEndExpense(transactions?.[0] ?? TransactionUtils.getAllReportTransactions(reportID)[0]);
+}
+
 /**
  * Checks if a report is a transaction thread associated with a report that has only one transaction
  */
-function isOneTransactionThread(reportID: string, parentReportID: string): boolean {
+function isOneTransactionThread(reportID: string, parentReportID: string, threadParentReportAction: OnyxEntry<ReportAction>): boolean {
     const parentReportActions = allReportActions?.[`${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${parentReportID}`] ?? ([] as ReportAction[]);
     const transactionThreadReportID = ReportActionsUtils.getOneTransactionThreadReportID(parentReportID, parentReportActions);
-    return reportID === transactionThreadReportID;
+    return reportID === transactionThreadReportID && !ReportActionsUtils.isSentMoneyReportAction(threadParentReportAction);
 }
 
 /**
@@ -1396,17 +1591,13 @@ function isOneTransactionThread(reportID: string, parentReportID: string): boole
  *
  */
 function isOneOnOneChat(report: OnyxEntry<Report>): boolean {
-    const participantAccountIDs = report?.participantAccountIDs ?? [];
-    return (
-        !isChatRoom(report) &&
-        !isExpenseRequest(report) &&
-        !isMoneyRequestReport(report) &&
-        !isPolicyExpenseChat(report) &&
-        !isTaskReport(report) &&
-        isDM(report) &&
-        !isIOUReport(report) &&
-        participantAccountIDs.length === 1
-    );
+    const participants = report?.participants ?? {};
+    const isCurrentUserParticipant = participants[currentUserAccountID ?? 0] ? 1 : 0;
+    const participantAmount = Object.keys(participants).length - isCurrentUserParticipant;
+    if (participantAmount !== 1) {
+        return false;
+    }
+    return !isChatRoom(report) && !isExpenseRequest(report) && !isMoneyRequestReport(report) && !isPolicyExpenseChat(report) && !isTaskReport(report) && isDM(report) && !isIOUReport(report);
 }
 
 /**
@@ -1442,7 +1633,7 @@ function getReportNotificationPreference(report: OnyxEntry<Report>): string | nu
 /**
  * Checks if the current user is the action's author
  */
-function isActionCreator(reportAction: OnyxEntry<ReportAction> | Partial<ReportAction>): boolean {
+function isActionCreator(reportAction: OnyxInputOrEntry<ReportAction> | Partial<ReportAction>): boolean {
     return reportAction?.actorAccountID === currentUserAccountID;
 }
 
@@ -1450,7 +1641,7 @@ function isActionCreator(reportAction: OnyxEntry<ReportAction> | Partial<ReportA
  * Returns the notification preference of the action's child report if it exists.
  * Otherwise, calculates it based on the action's authorship.
  */
-function getChildReportNotificationPreference(reportAction: OnyxEntry<ReportAction> | Partial<ReportAction>): NotificationPreference {
+function getChildReportNotificationPreference(reportAction: OnyxInputOrEntry<ReportAction> | Partial<ReportAction>): NotificationPreference {
     const childReportNotificationPreference = reportAction?.childReportNotificationPreference ?? '';
     if (childReportNotificationPreference) {
         return childReportNotificationPreference;
@@ -1459,6 +1650,23 @@ function getChildReportNotificationPreference(reportAction: OnyxEntry<ReportActi
     return isActionCreator(reportAction) ? CONST.REPORT.NOTIFICATION_PREFERENCE.ALWAYS : CONST.REPORT.NOTIFICATION_PREFERENCE.HIDDEN;
 }
 
+function canAddOrDeleteTransactions(moneyRequestReport: OnyxEntry<Report>): boolean {
+    if (!isMoneyRequestReport(moneyRequestReport)) {
+        return false;
+    }
+
+    const policy = getPolicy(moneyRequestReport?.policyID);
+    if (PolicyUtils.isInstantSubmitEnabled(policy) && PolicyUtils.isSubmitAndClose(policy) && hasOnlyNonReimbursableTransactions(moneyRequestReport?.reportID)) {
+        return false;
+    }
+
+    if (isReportApproved(moneyRequestReport) || isSettled(moneyRequestReport?.reportID)) {
+        return false;
+    }
+
+    return true;
+}
+
 /**
  * Checks whether the supplied report supports adding more transactions to it.
  * Return true if:
@@ -1466,44 +1674,50 @@ function getChildReportNotificationPreference(reportAction: OnyxEntry<ReportActi
  * - report is a draft
  * - report is a processing expense report and its policy has Instant reporting frequency
  */
-function canAddOrDeleteTransactions(moneyRequestReport: OnyxEntry<Report>): boolean {
+function canAddTransaction(moneyRequestReport: OnyxEntry<Report>): boolean {
     if (!isMoneyRequestReport(moneyRequestReport)) {
         return false;
     }
 
-    if (isReportApproved(moneyRequestReport) || isSettled(moneyRequestReport?.reportID)) {
-        return false;
-    }
-
     if (isReportInGroupPolicy(moneyRequestReport) && isProcessingReport(moneyRequestReport) && !PolicyUtils.isInstantSubmitEnabled(getPolicy(moneyRequestReport?.policyID))) {
         return false;
     }
 
-    return true;
+    return canAddOrDeleteTransactions(moneyRequestReport);
+}
+
+/**
+ * Checks whether the supplied report supports deleting more transactions from it.
+ * Return true if:
+ * - report is a non-settled IOU
+ * - report is a non-approved IOU
+ */
+function canDeleteTransaction(moneyRequestReport: OnyxEntry<Report>): boolean {
+    return canAddOrDeleteTransactions(moneyRequestReport);
 }
 
 /**
  * Can only delete if the author is this user and the action is an ADD_COMMENT action or an IOU action in an unsettled report, or if the user is a
  * policy admin
  */
-function canDeleteReportAction(reportAction: OnyxEntry<ReportAction>, reportID: string): boolean {
-    const report = getReport(reportID);
+function canDeleteReportAction(reportAction: OnyxInputOrEntry<ReportAction>, reportID: string): boolean {
+    const report = getReportOrDraftReport(reportID);
 
     const isActionOwner = reportAction?.actorAccountID === currentUserAccountID;
     const policy = allPolicies?.[`${ONYXKEYS.COLLECTION.POLICY}${report?.policyID}`] ?? null;
 
-    if (reportAction?.actionName === CONST.REPORT.ACTIONS.TYPE.IOU) {
+    if (ReportActionsUtils.isMoneyRequestAction(reportAction)) {
         // For now, users cannot delete split actions
-        const isSplitAction = reportAction?.originalMessage?.type === CONST.IOU.REPORT_ACTION_TYPE.SPLIT;
+        const isSplitAction = ReportActionsUtils.getOriginalMessage(reportAction)?.type === CONST.IOU.REPORT_ACTION_TYPE.SPLIT;
 
         if (isSplitAction) {
             return false;
         }
 
-        const linkedReport = isThreadFirstChat(reportAction, reportID) ? getReport(report?.parentReportID) : report;
+        const linkedReport = isThreadFirstChat(reportAction, reportID) ? getReportOrDraftReport(report?.parentReportID) : report;
         if (isActionOwner) {
-            if (!isEmptyObject(linkedReport) && isMoneyRequestReport(linkedReport)) {
-                return canAddOrDeleteTransactions(linkedReport);
+            if (!isEmptyObject(linkedReport) && (isMoneyRequestReport(linkedReport) || isInvoiceReport(linkedReport))) {
+                return canDeleteTransaction(linkedReport);
             }
             return true;
         }
@@ -1523,45 +1737,12 @@ function canDeleteReportAction(reportAction: OnyxEntry<ReportAction>, reportID:
     return isActionOwner || isAdmin;
 }
 
-/**
- * Get welcome message based on room type
- */
-function getRoomWelcomeMessage(report: OnyxEntry<Report>, isUserPolicyAdmin: boolean): WelcomeMessage {
-    const welcomeMessage: WelcomeMessage = {showReportName: true};
-    const workspaceName = getPolicyName(report);
-
-    if (isArchivedRoom(report)) {
-        welcomeMessage.phrase1 = Localize.translateLocal('reportActionsView.beginningOfArchivedRoomPartOne');
-        welcomeMessage.phrase2 = Localize.translateLocal('reportActionsView.beginningOfArchivedRoomPartTwo');
-    } else if (isDomainRoom(report)) {
-        welcomeMessage.phrase1 = Localize.translateLocal('reportActionsView.beginningOfChatHistoryDomainRoomPartOne', {domainRoom: report?.reportName ?? ''});
-        welcomeMessage.phrase2 = Localize.translateLocal('reportActionsView.beginningOfChatHistoryDomainRoomPartTwo');
-    } else if (isAdminRoom(report)) {
-        welcomeMessage.phrase1 = Localize.translateLocal('reportActionsView.beginningOfChatHistoryAdminRoomPartOne', {workspaceName});
-        welcomeMessage.phrase2 = Localize.translateLocal('reportActionsView.beginningOfChatHistoryAdminRoomPartTwo');
-    } else if (isAdminsOnlyPostingRoom(report) && !isUserPolicyAdmin) {
-        welcomeMessage.phrase1 = Localize.translateLocal('reportActionsView.beginningOfChatHistoryAdminOnlyPostingRoom');
-        welcomeMessage.showReportName = false;
-    } else if (isAnnounceRoom(report)) {
-        welcomeMessage.phrase1 = Localize.translateLocal('reportActionsView.beginningOfChatHistoryAnnounceRoomPartOne', {workspaceName});
-        welcomeMessage.phrase2 = Localize.translateLocal('reportActionsView.beginningOfChatHistoryAnnounceRoomPartTwo', {workspaceName});
-    } else if (isInvoiceRoom(report)) {
-        welcomeMessage.showReportName = false;
-        welcomeMessage.phrase1 = Localize.translateLocal('reportActionsView.beginningOfChatHistoryInvoiceRoom');
-    } else {
-        // Message for user created rooms or other room types.
-        welcomeMessage.phrase1 = Localize.translateLocal('reportActionsView.beginningOfChatHistoryUserRoomPartOne');
-        welcomeMessage.phrase2 = Localize.translateLocal('reportActionsView.beginningOfChatHistoryUserRoomPartTwo');
-    }
-
-    return welcomeMessage;
-}
-
 /**
  * Returns true if Concierge is one of the chat participants (1:1 as well as group chats)
  */
 function chatIncludesConcierge(report: Partial<OnyxEntry<Report>>): boolean {
-    return Boolean(report?.participantAccountIDs?.length && report?.participantAccountIDs?.includes(CONST.ACCOUNT_ID.CONCIERGE));
+    const participantAccountIDs = Object.keys(report?.participants ?? {}).map(Number);
+    return participantAccountIDs.includes(CONST.ACCOUNT_ID.CONCIERGE);
 }
 
 /**
@@ -1576,48 +1757,50 @@ function getReportRecipientAccountIDs(report: OnyxEntry<Report>, currentLoginAcc
     // 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 = allReports?.[`${ONYXKEYS.COLLECTION.REPORT}${report?.parentReportID}`] ?? null;
-        if (hasSingleParticipant(parentReport)) {
+        const parentReport = ReportConnection.getAllReports()?.[`${ONYXKEYS.COLLECTION.REPORT}${report?.parentReportID}`];
+        if (isOneOnOneChat(parentReport)) {
             finalReport = parentReport;
         }
     }
 
-    let finalParticipantAccountIDs: number[] | undefined = [];
-    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
-        const defaultParticipantAccountIDs = finalReport?.participantAccountIDs ?? [];
-        const setOfParticipantAccountIDs = new Set<number>(report?.ownerAccountID ? [...defaultParticipantAccountIDs, report.ownerAccountID] : defaultParticipantAccountIDs);
-        finalParticipantAccountIDs = [...setOfParticipantAccountIDs];
-    } 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.
+    let finalParticipantAccountIDs: number[] = [];
+    if (isTaskReport(report)) {
+        // Task reports `managerID` will change when assignee is changed, in that case the old `managerID` is still present in `participants`
+        // along with the new one. We only need the `managerID` as a participant here.
         finalParticipantAccountIDs = report?.managerID ? [report?.managerID] : [];
     } else {
-        finalParticipantAccountIDs = finalReport?.participantAccountIDs;
+        finalParticipantAccountIDs = Object.keys(finalReport?.participants ?? {}).map(Number);
     }
 
-    const reportParticipants = finalParticipantAccountIDs?.filter((accountID) => accountID !== currentLoginAccountID) ?? [];
-    const participantsWithoutExpensifyAccountIDs = reportParticipants.filter((participant) => !CONST.EXPENSIFY_ACCOUNT_IDS.includes(participant ?? 0));
-    return participantsWithoutExpensifyAccountIDs;
+    const otherParticipantsWithoutExpensifyAccountIDs = finalParticipantAccountIDs.filter((accountID) => {
+        if (accountID === currentLoginAccountID) {
+            return false;
+        }
+        if (CONST.EXPENSIFY_ACCOUNT_IDS.includes(accountID)) {
+            return false;
+        }
+        return true;
+    });
+
+    return otherParticipantsWithoutExpensifyAccountIDs;
 }
 
 /**
  * Whether the time row should be shown for a report.
  */
-function canShowReportRecipientLocalTime(personalDetails: OnyxCollection<PersonalDetails>, report: OnyxEntry<Report>, accountID: number): boolean {
+function canShowReportRecipientLocalTime(personalDetails: OnyxEntry<PersonalDetailsList>, report: OnyxEntry<Report>, accountID: number): boolean {
     const reportRecipientAccountIDs = getReportRecipientAccountIDs(report, accountID);
     const hasMultipleParticipants = reportRecipientAccountIDs.length > 1;
     const reportRecipient = personalDetails?.[reportRecipientAccountIDs[0]];
     const reportRecipientTimezone = reportRecipient?.timezone ?? CONST.DEFAULT_TIME_ZONE;
     const isReportParticipantValidated = reportRecipient?.validated ?? false;
-    return Boolean(
+    return !!(
         !hasMultipleParticipants &&
-            !isChatRoom(report) &&
-            !isPolicyExpenseChat(getRootParentReport(report)) &&
-            reportRecipient &&
-            reportRecipientTimezone?.selected &&
-            isReportParticipantValidated,
+        !isChatRoom(report) &&
+        !isPolicyExpenseChat(getRootParentReport(report)) &&
+        reportRecipient &&
+        reportRecipientTimezone?.selected &&
+        isReportParticipantValidated
     );
 }
 
@@ -1628,13 +1811,13 @@ function formatReportLastMessageText(lastMessageText: string, isModifiedExpenseM
     if (isModifiedExpenseMessage) {
         return String(lastMessageText).trim().replace(CONST.REGEX.LINE_BREAK, '').trim();
     }
-    return String(lastMessageText).trim().replace(CONST.REGEX.LINE_BREAK, ' ').substring(0, CONST.REPORT.LAST_MESSAGE_TEXT_MAX_LENGTH).trim();
+    return StringUtils.lineBreaksToSpaces(String(lastMessageText).trim()).substring(0, CONST.REPORT.LAST_MESSAGE_TEXT_MAX_LENGTH).trim();
 }
 
 /**
  * Helper method to return the default avatar associated with the given login
  */
-function getDefaultWorkspaceAvatar(workspaceName?: string): IconAsset {
+function getDefaultWorkspaceAvatar(workspaceName?: string): React.FC<SvgProps> {
     if (!workspaceName) {
         return defaultWorkspaceAvatars.WorkspaceBuilding;
     }
@@ -1668,7 +1851,7 @@ function getDefaultWorkspaceAvatarTestID(workspaceName: string): string {
     return !alphaNumeric ? defaultAvatarBuildingIconTestID : `SvgDefaultAvatar_${alphaNumeric[0]} Icon`;
 }
 
-function getWorkspaceAvatar(report: OnyxEntry<Report>): UserUtils.AvatarSource {
+function getWorkspaceAvatar(report: OnyxEntry<Report>): AvatarSource {
     const workspaceName = getPolicyName(report, false, allPolicies?.[`${ONYXKEYS.COLLECTION.POLICY}${report?.policyID}`]);
     const avatar = allPolicies?.[`${ONYXKEYS.COLLECTION.POLICY}${report?.policyID}`]?.avatarURL ?? '';
     return !isEmpty(avatar) ? avatar : getDefaultWorkspaceAvatar(workspaceName);
@@ -1689,12 +1872,12 @@ function getDefaultGroupAvatar(reportID?: string): IconAsset {
  * Returns the appropriate icons for the given chat report using the stored personalDetails.
  * The Avatar sources can be URLs or Icon components according to the chat type.
  */
-function getIconsForParticipants(participants: number[], personalDetails: OnyxCollection<PersonalDetails>): Icon[] {
+function getIconsForParticipants(participants: number[], personalDetails: OnyxInputOrEntry<PersonalDetailsList>): Icon[] {
     const participantDetails: ParticipantDetails[] = [];
     const participantsList = participants || [];
 
     for (const accountID of participantsList) {
-        const avatarSource = UserUtils.getAvatar(personalDetails?.[accountID]?.avatar ?? '', accountID);
+        const avatarSource = personalDetails?.[accountID]?.avatar ?? FallbackAvatar;
         const displayNameLogin = personalDetails?.[accountID]?.displayName ? personalDetails?.[accountID]?.displayName : personalDetails?.[accountID]?.login;
         participantDetails.push([accountID, displayNameLogin ?? '', avatarSource, personalDetails?.[accountID]?.fallbackIcon ?? '']);
     }
@@ -1729,14 +1912,31 @@ function getIconsForParticipants(participants: number[], personalDetails: OnyxCo
     return avatars;
 }
 
+/**
+ * Cache the workspace icons
+ */
+const workSpaceIconsCache = new Map<string, {name: string; icon: Icon}>();
+
 /**
  * Given a report, return the associated workspace icon.
  */
-function getWorkspaceIcon(report: OnyxEntry<Report>, policy: OnyxEntry<Policy> = null): Icon {
+function getWorkspaceIcon(report: OnyxInputOrEntry<Report>, policy?: OnyxInputOrEntry<Policy>): Icon {
     const workspaceName = getPolicyName(report, false, policy);
-    const policyExpenseChatAvatarSource = allPolicies?.[`${ONYXKEYS.COLLECTION.POLICY}${report?.policyID}`]?.avatarURL
-        ? allPolicies?.[`${ONYXKEYS.COLLECTION.POLICY}${report?.policyID}`]?.avatarURL
-        : getDefaultWorkspaceAvatar(workspaceName);
+    const cacheKey = report?.policyID ?? workspaceName;
+    const iconFromCache = workSpaceIconsCache.get(cacheKey);
+    const avatarURL = allPolicies?.[`${ONYXKEYS.COLLECTION.POLICY}${report?.policyID}`]?.avatarURL;
+
+    const isSameAvatarURL = iconFromCache?.icon?.source === avatarURL;
+    const isDefaultWorkspaceAvatar = !avatarURL && typeof iconFromCache?.icon?.source !== 'string';
+    const hasWorkSpaceNameChanged = iconFromCache?.name !== workspaceName;
+    if (iconFromCache && (isSameAvatarURL || isDefaultWorkspaceAvatar) && !hasWorkSpaceNameChanged) {
+        return iconFromCache.icon;
+    }
+    // disabling to protect against empty strings
+    // eslint-disable-next-line @typescript-eslint/prefer-nullish-coalescing
+    const policyAvatarURL = report?.policyAvatar || allPolicies?.[`${ONYXKEYS.COLLECTION.POLICY}${report?.policyID}`]?.avatarURL;
+    // eslint-disable-next-line @typescript-eslint/prefer-nullish-coalescing
+    const policyExpenseChatAvatarSource = policyAvatarURL || getDefaultWorkspaceAvatar(workspaceName);
 
     const workspaceIcon: Icon = {
         source: policyExpenseChatAvatarSource ?? '',
@@ -1744,6 +1944,7 @@ function getWorkspaceIcon(report: OnyxEntry<Report>, policy: OnyxEntry<Policy> =
         name: workspaceName,
         id: report?.policyID,
     };
+    workSpaceIconsCache.set(cacheKey, {name: workspaceName, icon: workspaceIcon});
     return workspaceIcon;
 }
 
@@ -1751,29 +1952,62 @@ function getWorkspaceIcon(report: OnyxEntry<Report>, policy: OnyxEntry<Policy> =
  * Gets the personal details for a login by looking in the ONYXKEYS.PERSONAL_DETAILS_LIST Onyx key (stored in the local variable, allPersonalDetails). If it doesn't exist in Onyx,
  * then a default object is constructed.
  */
-function getPersonalDetailsForAccountID(accountID: number): Partial<PersonalDetails> {
+function getPersonalDetailsForAccountID(accountID: number, personalDetailsData?: Partial<PersonalDetailsList>): Partial<PersonalDetails> {
     if (!accountID) {
         return {};
     }
-    return (
-        allPersonalDetails?.[accountID] ?? {
-            avatar: UserUtils.getDefaultAvatar(accountID),
-            isOptimisticPersonalDetail: true,
-        }
-    );
+
+    const defaultDetails = {
+        isOptimisticPersonalDetail: true,
+    };
+
+    if (!personalDetailsData) {
+        return allPersonalDetails?.[accountID] ?? defaultDetails;
+    }
+
+    return personalDetailsData?.[accountID] ?? defaultDetails;
 }
 
+/**
+ * Returns the personal details or a default object if the personal details are not available.
+ */
+function getPersonalDetailsOrDefault(personalDetails: Partial<PersonalDetails> | undefined | null): Partial<PersonalDetails> {
+    return personalDetails ?? {isOptimisticPersonalDetail: true};
+}
+
+const hiddenTranslation = Localize.translateLocal('common.hidden');
+
+const phoneNumberCache: Record<string, string> = {};
+
 /**
  * Get the displayName for a single report participant.
  */
-function getDisplayNameForParticipant(accountID?: number, shouldUseShortForm = false, shouldFallbackToHidden = true, shouldAddCurrentUserPostfix = false): string {
+function getDisplayNameForParticipant(
+    accountID?: number,
+    shouldUseShortForm = false,
+    shouldFallbackToHidden = true,
+    shouldAddCurrentUserPostfix = false,
+    personalDetailsData?: Partial<PersonalDetailsList>,
+): string {
     if (!accountID) {
         return '';
     }
 
-    const personalDetails = getPersonalDetailsForAccountID(accountID);
-    // eslint-disable-next-line @typescript-eslint/prefer-nullish-coalescing
-    const formattedLogin = LocalePhoneNumber.formatPhoneNumber(personalDetails.login || '');
+    const personalDetails = getPersonalDetailsOrDefault(personalDetailsData?.[accountID] ?? allPersonalDetails?.[accountID]);
+    if (!personalDetails) {
+        return '';
+    }
+
+    const login = personalDetails.login ?? '';
+
+    // Check if the phone number is already cached
+    let formattedLogin = phoneNumberCache[login];
+    if (!formattedLogin) {
+        formattedLogin = LocalePhoneNumber.formatPhoneNumber(login);
+        // Store the formatted phone number in the cache
+        phoneNumberCache[login] = formattedLogin;
+    }
+
     // This is to check if account is an invite/optimistically created one
     // and prevent from falling back to 'Hidden', so a correct value is shown
     // when searching for a new user
@@ -1787,7 +2021,7 @@ function getDisplayNameForParticipant(accountID?: number, shouldUseShortForm = f
     const longName = PersonalDetailsUtils.getDisplayNameOrDefault(personalDetails, formattedLogin, shouldFallbackToHidden, shouldAddPostfix);
 
     // If the user's personal details (first name) should be hidden, make sure we return "hidden" instead of the short name
-    if (shouldFallbackToHidden && longName === Localize.translateLocal('common.hidden')) {
+    if (shouldFallbackToHidden && longName === hiddenTranslation) {
         return longName;
     }
 
@@ -1795,15 +2029,89 @@ function getDisplayNameForParticipant(accountID?: number, shouldUseShortForm = f
     return shouldUseShortForm ? shortName : longName;
 }
 
-function getParticipantAccountIDs(reportID: string) {
-    const report = getReport(reportID);
-    if (!report || !report.participants) {
-        return [];
+function getParticipantsAccountIDsForDisplay(report: OnyxEntry<Report>, shouldExcludeHidden = false, shouldExcludeDeleted = false): number[] {
+    const reportParticipants = report?.participants ?? {};
+    let participantsEntries = Object.entries(reportParticipants);
+
+    // We should not show participants that have an optimistic entry with the same login in the personal details
+    const nonOptimisticLoginMap: Record<string, boolean | undefined> = {};
+
+    for (const entry of participantsEntries) {
+        const [accountID] = entry;
+        const personalDetail = allPersonalDetails?.[accountID];
+        if (personalDetail?.login && !personalDetail.isOptimisticPersonalDetail) {
+            nonOptimisticLoginMap[personalDetail.login] = true;
+        }
     }
 
-    const accountIDStrings = Object.keys(report.participants);
-    return accountIDStrings.map((accountID) => Number(accountID));
-}
+    participantsEntries = participantsEntries.filter(([accountID]) => {
+        const personalDetail = allPersonalDetails?.[accountID];
+        if (personalDetail?.login && personalDetail.isOptimisticPersonalDetail) {
+            return !nonOptimisticLoginMap[personalDetail.login];
+        }
+        return true;
+    });
+
+    let participantsIds = participantsEntries.map(([accountID]) => Number(accountID));
+
+    // For 1:1 chat, we don't want to include the current user as a participant in order to not mark 1:1 chats as having multiple participants
+    // For system chat, we want to display Expensify as the only participant
+    const shouldExcludeCurrentUser = isOneOnOneChat(report) || isSystemChat(report);
+
+    if (shouldExcludeCurrentUser || shouldExcludeHidden || shouldExcludeDeleted) {
+        participantsIds = participantsIds.filter((accountID) => {
+            if (shouldExcludeCurrentUser && accountID === currentUserAccountID) {
+                return false;
+            }
+
+            if (shouldExcludeHidden && reportParticipants[accountID]?.hidden) {
+                return false;
+            }
+
+            if (
+                shouldExcludeDeleted &&
+                report?.pendingChatMembers?.findLast((member) => Number(member.accountID) === accountID)?.pendingAction === CONST.RED_BRICK_ROAD_PENDING_ACTION.DELETE
+            ) {
+                return false;
+            }
+
+            return true;
+        });
+    }
+
+    return participantsIds.filter((accountID) => isNumber(accountID));
+}
+
+function getParticipantsList(report: Report, personalDetails: OnyxEntry<PersonalDetailsList>, isRoomMembersList = false): number[] {
+    const isReportGroupChat = isGroupChat(report);
+    const isReportIOU = isIOUReport(report);
+    const shouldExcludeHiddenParticipants = !isReportGroupChat && !isReportIOU;
+    const chatParticipants = getParticipantsAccountIDsForDisplay(report, isRoomMembersList || shouldExcludeHiddenParticipants);
+
+    return chatParticipants.filter((accountID) => {
+        const details = personalDetails?.[accountID];
+
+        if (!isRoomMembersList) {
+            if (!details) {
+                Log.hmmm(`[ReportParticipantsPage] no personal details found for Group chat member with accountID: ${accountID}`);
+                return false;
+            }
+        } else {
+            // When adding a new member to a room (whose personal detail does not exist in Onyx), an optimistic personal detail
+            // is created. However, when the real personal detail is returned from the backend, a duplicate member may appear
+            // briefly before the optimistic personal detail is deleted. To address this, we filter out the optimistically created
+            // member here.
+            const isDuplicateOptimisticDetail =
+                details?.isOptimisticPersonalDetail && chatParticipants.some((accID) => accID !== accountID && details.login === personalDetails?.[accID]?.login);
+
+            if (!details || isDuplicateOptimisticDetail) {
+                Log.hmmm(`[RoomMembersPage] no personal details found for room member with accountID: ${accountID}`);
+                return false;
+            }
+        }
+        return true;
+    });
+}
 
 function buildParticipantsFromAccountIDs(accountIDs: number[]): Participants {
     const finalParticipants: Participants = {};
@@ -1817,50 +2125,34 @@ function buildParticipantsFromAccountIDs(accountIDs: number[]): Participants {
 /**
  * Returns the report name if the report is a group chat
  */
-function getGroupChatName(participantAccountIDs?: number[], shouldApplyLimit = false, reportID = ''): string | undefined {
-    // If we have a reportID always try to get the name from the report.
-    if (reportID) {
-        const reportKey = `${ONYXKEYS.COLLECTION.REPORT}${reportID}`;
-        const reportName = allReports?.[reportKey]?.reportName;
-        if (reportName) {
-            return reportName;
-        }
+function getGroupChatName(participants?: SelectedParticipant[], shouldApplyLimit = false, report?: OnyxEntry<Report>): string | undefined {
+    // If we have a report always try to get the name from the report.
+    if (report?.reportName) {
+        return report.reportName;
     }
 
-    // Get participantAccountIDs from participants object
-    let participants = participantAccountIDs ?? getParticipantAccountIDs(reportID);
+    let participantAccountIDs = participants?.map((participant) => participant.accountID) ?? Object.keys(report?.participants ?? {}).map(Number);
     if (shouldApplyLimit) {
-        participants = participants.slice(0, 5);
+        participantAccountIDs = participantAccountIDs.slice(0, 5);
     }
-    const isMultipleParticipantReport = participants.length > 1;
+    const isMultipleParticipantReport = participantAccountIDs.length > 1;
 
     if (isMultipleParticipantReport) {
-        return participants
-            .map((participant) => getDisplayNameForParticipant(participant, isMultipleParticipantReport))
+        return participantAccountIDs
+            .map(
+                (participantAccountID, index) =>
+                    getDisplayNameForParticipant(participantAccountID, isMultipleParticipantReport) || LocalePhoneNumber.formatPhoneNumber(participants?.[index]?.login ?? ''),
+            )
             .sort((first, second) => localeCompare(first ?? '', second ?? ''))
             .filter(Boolean)
             .join(', ');
     }
 
-    return Localize.translateLocal('groupChat.defaultReportName', {displayName: getDisplayNameForParticipant(participants[0], false)});
-}
-
-function getVisibleChatMemberAccountIDs(reportID: string): number[] {
-    const report = getReport(reportID);
-    if (!report || !report.participants) {
-        return [];
-    }
-    const visibleParticipantAccountIDs = Object.entries(report.participants).reduce<number[]>((accountIDs, [accountID, participant]) => {
-        if (participant && !participant.hidden) {
-            accountIDs.push(Number(accountID));
-        }
-        return accountIDs;
-    }, []);
-    return visibleParticipantAccountIDs;
+    return Localize.translateLocal('groupChat.defaultReportName', {displayName: getDisplayNameForParticipant(participantAccountIDs[0], false)});
 }
 
 function getParticipants(reportID: string) {
-    const report = getReport(reportID);
+    const report = getReportOrDraftReport(reportID);
     if (!report) {
         return {};
     }
@@ -1873,16 +2165,17 @@ function getParticipants(reportID: string) {
  * The Avatar sources can be URLs or Icon components according to the chat type.
  */
 function getIcons(
-    report: OnyxEntry<Report>,
-    personalDetails: OnyxCollection<PersonalDetails>,
-    defaultIcon: UserUtils.AvatarSource | null = null,
+    report: OnyxInputOrEntry<Report>,
+    personalDetails: OnyxInputOrEntry<PersonalDetailsList>,
+    defaultIcon: AvatarSource | null = null,
     defaultName = '',
     defaultAccountID = -1,
-    policy: OnyxEntry<Policy> = null,
+    policy?: OnyxInputOrEntry<Policy>,
+    invoiceReceiverPolicy?: OnyxInputOrEntry<Policy>,
 ): Icon[] {
     if (isEmptyObject(report)) {
         const fallbackIcon: Icon = {
-            source: defaultIcon ?? Expensicons.FallbackAvatar,
+            source: defaultIcon ?? FallbackAvatar,
             type: CONST.ICON_TYPE_AVATAR,
             name: defaultName,
             id: defaultAccountID,
@@ -1893,11 +2186,11 @@ function getIcons(
         const parentReportAction = ReportActionsUtils.getParentReportAction(report);
         const workspaceIcon = getWorkspaceIcon(report, policy);
         const memberIcon = {
-            source: UserUtils.getAvatar(personalDetails?.[parentReportAction.actorAccountID ?? -1]?.avatar ?? '', parentReportAction.actorAccountID ?? -1),
-            id: parentReportAction.actorAccountID,
+            source: personalDetails?.[parentReportAction?.actorAccountID ?? -1]?.avatar ?? FallbackAvatar,
+            id: parentReportAction?.actorAccountID,
             type: CONST.ICON_TYPE_AVATAR,
-            name: personalDetails?.[parentReportAction.actorAccountID ?? -1]?.displayName ?? '',
-            fallbackIcon: personalDetails?.[parentReportAction.actorAccountID ?? -1]?.fallbackIcon,
+            name: personalDetails?.[parentReportAction?.actorAccountID ?? -1]?.displayName ?? '',
+            fallbackIcon: personalDetails?.[parentReportAction?.actorAccountID ?? -1]?.fallbackIcon,
         };
 
         return [memberIcon, workspaceIcon];
@@ -1905,14 +2198,14 @@ function getIcons(
     if (isChatThread(report)) {
         const parentReportAction = ReportActionsUtils.getParentReportAction(report);
 
-        const actorAccountID = parentReportAction.actorAccountID;
+        const actorAccountID = getReportActionActorAccountID(parentReportAction, report);
         const actorDisplayName = PersonalDetailsUtils.getDisplayNameOrDefault(allPersonalDetails?.[actorAccountID ?? -1], '', false);
         const actorIcon = {
             id: actorAccountID,
-            source: UserUtils.getAvatar(personalDetails?.[actorAccountID ?? -1]?.avatar ?? '', actorAccountID ?? -1),
+            source: personalDetails?.[actorAccountID ?? -1]?.avatar ?? FallbackAvatar,
             name: actorDisplayName,
             type: CONST.ICON_TYPE_AVATAR,
-            fallbackIcon: personalDetails?.[parentReportAction.actorAccountID ?? -1]?.fallbackIcon,
+            fallbackIcon: personalDetails?.[parentReportAction?.actorAccountID ?? -1]?.fallbackIcon,
         };
 
         if (isWorkspaceThread(report)) {
@@ -1924,7 +2217,7 @@ function getIcons(
     if (isTaskReport(report)) {
         const ownerIcon = {
             id: report?.ownerAccountID,
-            source: UserUtils.getAvatar(personalDetails?.[report?.ownerAccountID ?? -1]?.avatar ?? '', report?.ownerAccountID ?? -1),
+            source: personalDetails?.[report?.ownerAccountID ?? -1]?.avatar ?? FallbackAvatar,
             type: CONST.ICON_TYPE_AVATAR,
             name: personalDetails?.[report?.ownerAccountID ?? -1]?.displayName ?? '',
             fallbackIcon: personalDetails?.[report?.ownerAccountID ?? -1]?.fallbackIcon,
@@ -1949,16 +2242,22 @@ function getIcons(
         };
         return [domainIcon];
     }
-    if (isAdminRoom(report) || isAnnounceRoom(report) || isChatRoom(report) || isArchivedRoom(report)) {
+    if (isAdminRoom(report) || isAnnounceRoom(report) || isChatRoom(report) || isArchivedRoom(report, getReportNameValuePairs(report?.reportID))) {
         const icons = [getWorkspaceIcon(report, policy)];
 
         if (isInvoiceRoom(report)) {
             if (report?.invoiceReceiver?.type === CONST.REPORT.INVOICE_RECEIVER_TYPE.INDIVIDUAL) {
                 icons.push(...getIconsForParticipants([report?.invoiceReceiver.accountID], personalDetails));
             } else {
-                const receiverPolicy = getPolicy(report?.invoiceReceiver?.policyID);
+                const receiverPolicyID = report?.invoiceReceiver?.policyID;
+                const receiverPolicy = invoiceReceiverPolicy ?? getPolicy(receiverPolicyID);
                 if (!isEmptyObject(receiverPolicy)) {
-                    icons.push(getWorkspaceIcon(report, receiverPolicy));
+                    icons.push({
+                        source: receiverPolicy?.avatarURL ?? getDefaultWorkspaceAvatar(receiverPolicy.name),
+                        type: CONST.ICON_TYPE_WORKSPACE,
+                        name: receiverPolicy.name,
+                        id: receiverPolicyID,
+                    });
                 }
             }
         }
@@ -1968,7 +2267,7 @@ function getIcons(
     if (isPolicyExpenseChat(report) || isExpenseReport(report)) {
         const workspaceIcon = getWorkspaceIcon(report, policy);
         const memberIcon = {
-            source: UserUtils.getAvatar(personalDetails?.[report?.ownerAccountID ?? -1]?.avatar ?? '', report?.ownerAccountID ?? -1),
+            source: personalDetails?.[report?.ownerAccountID ?? -1]?.avatar ?? FallbackAvatar,
             id: report?.ownerAccountID,
             type: CONST.ICON_TYPE_AVATAR,
             name: personalDetails?.[report?.ownerAccountID ?? -1]?.displayName ?? '',
@@ -1978,7 +2277,7 @@ function getIcons(
     }
     if (isIOUReport(report)) {
         const managerIcon = {
-            source: UserUtils.getAvatar(personalDetails?.[report?.managerID ?? -1]?.avatar ?? '', report?.managerID ?? -1),
+            source: personalDetails?.[report?.managerID ?? -1]?.avatar ?? FallbackAvatar,
             id: report?.managerID,
             type: CONST.ICON_TYPE_AVATAR,
             name: personalDetails?.[report?.managerID ?? -1]?.displayName ?? '',
@@ -1986,7 +2285,7 @@ function getIcons(
         };
         const ownerIcon = {
             id: report?.ownerAccountID,
-            source: UserUtils.getAvatar(personalDetails?.[report?.ownerAccountID ?? -1]?.avatar ?? '', report?.ownerAccountID ?? -1),
+            source: personalDetails?.[report?.ownerAccountID ?? -1]?.avatar ?? FallbackAvatar,
             type: CONST.ICON_TYPE_AVATAR,
             name: personalDetails?.[report?.ownerAccountID ?? -1]?.displayName ?? '',
             fallbackIcon: personalDetails?.[report?.ownerAccountID ?? -1]?.fallbackIcon,
@@ -1994,7 +2293,7 @@ function getIcons(
         const isManager = currentUserAccountID === report?.managerID;
 
         // For one transaction IOUs, display a simplified report icon
-        if (isOneTransactionReport(report?.reportID ?? '0')) {
+        if (isOneTransactionReport(report?.reportID ?? '-1')) {
             return [ownerIcon];
         }
 
@@ -2002,7 +2301,11 @@ function getIcons(
     }
 
     if (isSelfDM(report)) {
-        return getIconsForParticipants([currentUserAccountID ?? 0], personalDetails);
+        return getIconsForParticipants([currentUserAccountID ?? -1], personalDetails);
+    }
+
+    if (isSystemChat(report)) {
+        return getIconsForParticipants([CONST.ACCOUNT_ID.NOTIFICATIONS ?? 0], personalDetails);
     }
 
     if (isGroupChat(report)) {
@@ -2011,13 +2314,13 @@ function getIcons(
             source: report.avatarUrl || getDefaultGroupAvatar(report.reportID),
             id: -1,
             type: CONST.ICON_TYPE_AVATAR,
-            name: getGroupChatName(undefined, true, report.reportID ?? ''),
+            name: getGroupChatName(undefined, true, report),
         };
         return [groupChatIcon];
     }
 
     if (isInvoiceReport(report)) {
-        const invoiceRoomReport = getReport(report.chatReportID);
+        const invoiceRoomReport = getReportOrDraftReport(report.chatReportID);
         const icons = [getWorkspaceIcon(invoiceRoomReport, policy)];
 
         if (invoiceRoomReport?.invoiceReceiver?.type === CONST.REPORT.INVOICE_RECEIVER_TYPE.INDIVIDUAL) {
@@ -2026,21 +2329,35 @@ function getIcons(
             return icons;
         }
 
-        const receiverPolicy = getPolicy(invoiceRoomReport?.invoiceReceiver?.policyID);
+        const receiverPolicyID = invoiceRoomReport?.invoiceReceiver?.policyID;
+        const receiverPolicy = invoiceReceiverPolicy ?? getPolicy(receiverPolicyID);
 
         if (!isEmptyObject(receiverPolicy)) {
-            icons.push(getWorkspaceIcon(invoiceRoomReport, receiverPolicy));
+            icons.push({
+                source: receiverPolicy?.avatarURL ?? getDefaultWorkspaceAvatar(receiverPolicy.name),
+                type: CONST.ICON_TYPE_WORKSPACE,
+                name: receiverPolicy.name,
+                id: receiverPolicyID,
+            });
         }
 
         return icons;
     }
 
-    return getIconsForParticipants(report?.participantAccountIDs ?? [], personalDetails);
+    if (isOneOnOneChat(report)) {
+        const otherParticipantsAccountIDs = Object.keys(report.participants ?? {})
+            .map(Number)
+            .filter((accountID) => accountID !== currentUserAccountID);
+        return getIconsForParticipants(otherParticipantsAccountIDs, personalDetails);
+    }
+
+    const participantAccountIDs = Object.keys(report.participants ?? {}).map(Number);
+    return getIconsForParticipants(participantAccountIDs, personalDetails);
 }
 
 function getDisplayNamesWithTooltips(
     personalDetailsList: PersonalDetails[] | PersonalDetailsList | OptionData[],
-    isMultipleParticipantReport: boolean,
+    shouldUseShortForm: boolean,
     shouldFallbackToHidden = true,
     shouldAddCurrentUserPostfix = false,
 ): DisplayNameWithTooltips {
@@ -2050,8 +2367,8 @@ function getDisplayNamesWithTooltips(
         .map((user) => {
             const accountID = Number(user?.accountID);
             // eslint-disable-next-line @typescript-eslint/prefer-nullish-coalescing
-            const displayName = getDisplayNameForParticipant(accountID, isMultipleParticipantReport, shouldFallbackToHidden, shouldAddCurrentUserPostfix) || user?.login || '';
-            const avatar = UserUtils.getDefaultAvatar(accountID);
+            const displayName = getDisplayNameForParticipant(accountID, shouldUseShortForm, shouldFallbackToHidden, shouldAddCurrentUserPostfix) || user?.login || '';
+            const avatar = user && 'avatar' in user ? user.avatar : undefined;
 
             let pronouns = user?.pronouns ?? undefined;
             if (pronouns?.startsWith(CONST.PRONOUNS.PREFIX)) {
@@ -2106,9 +2423,14 @@ function getDeletedParentActionMessageForChatReport(reportAction: OnyxEntry<Repo
 /**
  * Returns the preview message for `REIMBURSEMENT_QUEUED` action
  */
-function getReimbursementQueuedActionMessage(reportAction: OnyxEntry<ReportAction>, report: OnyxEntry<Report>, shouldUseShortDisplayName = true): string {
+function getReimbursementQueuedActionMessage(
+    reportAction: OnyxEntry<ReportAction<typeof CONST.REPORT.ACTIONS.TYPE.REIMBURSEMENT_QUEUED>>,
+    reportOrID: OnyxEntry<Report> | string,
+    shouldUseShortDisplayName = true,
+): string {
+    const report = typeof reportOrID === 'string' ? ReportConnection.getAllReports()?.[`${ONYXKEYS.COLLECTION.REPORT}${reportOrID}`] : reportOrID;
     const submitterDisplayName = getDisplayNameForParticipant(report?.ownerAccountID, shouldUseShortDisplayName) ?? '';
-    const originalMessage = reportAction?.originalMessage as IOUMessage | undefined;
+    const originalMessage = ReportActionsUtils.getOriginalMessage(reportAction);
     let messageKey: TranslationPaths;
     if (originalMessage?.paymentType === CONST.IOU.PAYMENT_TYPE.EXPENSIFY) {
         messageKey = 'iou.waitingOnEnabledWallet';
@@ -2123,11 +2445,12 @@ function getReimbursementQueuedActionMessage(reportAction: OnyxEntry<ReportActio
  * Returns the preview message for `REIMBURSEMENT_DEQUEUED` action
  */
 function getReimbursementDeQueuedActionMessage(
-    reportAction: OnyxEntry<ReportActionBase & OriginalMessageReimbursementDequeued>,
-    report: OnyxEntry<Report> | EmptyObject,
+    reportAction: OnyxEntry<ReportAction<typeof CONST.REPORT.ACTIONS.TYPE.REIMBURSEMENT_DEQUEUED>>,
+    reportOrID: OnyxEntry<Report> | string,
     isLHNPreview = false,
 ): string {
-    const originalMessage = reportAction?.originalMessage as ReimbursementDeQueuedMessage | undefined;
+    const report = typeof reportOrID === 'string' ? ReportConnection.getAllReports()?.[`${ONYXKEYS.COLLECTION.REPORT}${reportOrID}`] : reportOrID;
+    const originalMessage = ReportActionsUtils.getOriginalMessage(reportAction);
     const amount = originalMessage?.amount;
     const currency = originalMessage?.currency;
     const formattedAmount = CurrencyUtils.convertToDisplayString(amount, currency);
@@ -2185,8 +2508,8 @@ function buildOptimisticCancelPaymentReportAction(expenseReportID: string, amoun
 
  */
 function getLastVisibleMessage(reportID: string | undefined, actionsToMerge: ReportActions = {}): LastVisibleMessage {
-    const report = getReport(reportID);
-    const lastVisibleAction = ReportActionsUtils.getLastVisibleAction(reportID ?? '', actionsToMerge);
+    const report = getReportOrDraftReport(reportID);
+    const lastVisibleAction = ReportActionsUtils.getLastVisibleAction(reportID ?? '-1', actionsToMerge);
 
     // For Chat Report with deleted parent actions, let us fetch the correct message
     if (ReportActionsUtils.isDeletedParentAction(lastVisibleAction) && !isEmptyObject(report) && isChatReport(report)) {
@@ -2197,7 +2520,7 @@ function getLastVisibleMessage(reportID: string | undefined, actionsToMerge: Rep
     }
 
     // Fetch the last visible message for report represented by reportID and based on actions to merge.
-    return ReportActionsUtils.getLastVisibleMessage(reportID ?? '', actionsToMerge);
+    return ReportActionsUtils.getLastVisibleMessage(reportID ?? '-1', actionsToMerge);
 }
 
 /**
@@ -2205,8 +2528,16 @@ function getLastVisibleMessage(reportID: string | undefined, actionsToMerge: Rep
  *
  * @param [parentReportAction] - The parent report action of the report (Used to check if the task has been canceled)
  */
-function isWaitingForAssigneeToCompleteTask(report: OnyxEntry<Report>, parentReportAction: OnyxEntry<ReportAction> | EmptyObject = {}): boolean {
-    return isTaskReport(report) && isReportManager(report) && isOpenTaskReport(report, parentReportAction);
+function isWaitingForAssigneeToCompleteTask(report: OnyxEntry<Report>, parentReportAction: OnyxEntry<ReportAction>): boolean {
+    if (report?.hasOutstandingChildTask) {
+        return true;
+    }
+
+    if (isOpenTaskReport(report, parentReportAction) && !report?.hasParentAccess && isReportManager(report)) {
+        return true;
+    }
+
+    return false;
 }
 
 function isUnreadWithMention(reportOrOption: OnyxEntry<Report> | OptionData): boolean {
@@ -2216,7 +2547,7 @@ function isUnreadWithMention(reportOrOption: OnyxEntry<Report> | OptionData): bo
     // lastMentionedTime and lastReadTime are both datetime strings and can be compared directly
     const lastMentionedTime = reportOrOption.lastMentionedTime ?? '';
     const lastReadTime = reportOrOption.lastReadTime ?? '';
-    return Boolean('isUnreadWithMention' in reportOrOption && reportOrOption.isUnreadWithMention) || lastReadTime < lastMentionedTime;
+    return !!('isUnreadWithMention' in reportOrOption && reportOrOption.isUnreadWithMention) || lastReadTime < lastMentionedTime;
 }
 
 /**
@@ -2224,11 +2555,12 @@ function isUnreadWithMention(reportOrOption: OnyxEntry<Report> | OptionData): bo
  *  - is unread and the user was mentioned in one of the unread comments
  *  - is for an outstanding task waiting on the user
  *  - has an outstanding child expense that is waiting for an action from the current user (e.g. pay, approve, add bank account)
+ *  - is either the system or concierge chat, the user free trial has ended and it didn't add a payment card yet
  *
  * @param option (report or optionItem)
  * @param parentReportAction (the report action the current report is a thread of)
  */
-function requiresAttentionFromCurrentUser(optionOrReport: OnyxEntry<Report> | OptionData, parentReportAction: EmptyObject | OnyxEntry<ReportAction> = {}) {
+function requiresAttentionFromCurrentUser(optionOrReport: OnyxEntry<Report> | OptionData, parentReportAction?: OnyxEntry<ReportAction>) {
     if (!optionOrReport) {
         return false;
     }
@@ -2237,7 +2569,10 @@ function requiresAttentionFromCurrentUser(optionOrReport: OnyxEntry<Report> | Op
         return true;
     }
 
-    if (isArchivedRoom(optionOrReport) || isArchivedRoom(getReport(optionOrReport.parentReportID))) {
+    if (
+        isArchivedRoom(optionOrReport, getReportNameValuePairs(optionOrReport?.reportID)) ||
+        isArchivedRoom(getReportOrDraftReport(optionOrReport.parentReportID), getReportNameValuePairs(optionOrReport?.reportID))
+    ) {
         return false;
     }
 
@@ -2262,12 +2597,12 @@ function requiresAttentionFromCurrentUser(optionOrReport: OnyxEntry<Report> | Op
  *
  */
 function hasNonReimbursableTransactions(iouReportID: string | undefined): boolean {
-    const transactions = TransactionUtils.getAllReportTransactions(iouReportID);
+    const transactions = reportsTransactions[iouReportID ?? ''] ?? [];
     return transactions.filter((transaction) => transaction.reimbursable === false).length > 0;
 }
 
-function getMoneyRequestSpendBreakdown(report: OnyxEntry<Report>, allReportsDict: OnyxCollection<Report> = null): SpendBreakdown {
-    const allAvailableReports = allReportsDict ?? allReports;
+function getMoneyRequestSpendBreakdown(report: OnyxInputOrEntry<Report>, allReportsDict?: OnyxCollection<Report>): SpendBreakdown {
+    const allAvailableReports = allReportsDict ?? ReportConnection.getAllReports();
     let moneyRequestReport;
     if (isMoneyRequestReport(report) || isInvoiceReport(report)) {
         moneyRequestReport = report;
@@ -2306,7 +2641,7 @@ function getMoneyRequestSpendBreakdown(report: OnyxEntry<Report>, allReportsDict
 /**
  * Get the title for a policy expense chat which depends on the role of the policy member seeing this report
  */
-function getPolicyExpenseChatName(report: OnyxEntry<Report>, policy: OnyxEntry<Policy> | undefined = undefined): string | undefined {
+function getPolicyExpenseChatName(report: OnyxEntry<Report>, policy?: OnyxEntry<Policy>): string | undefined {
     const ownerAccountID = report?.ownerAccountID;
     const personalDetails = allPersonalDetails?.[ownerAccountID ?? -1];
     const login = personalDetails ? personalDetails.login : null;
@@ -2326,9 +2661,9 @@ function getPolicyExpenseChatName(report: OnyxEntry<Report>, policy: OnyxEntry<P
 
     // If this user is not admin and this policy expense chat has been archived because of account merging, this must be an old workspace chat
     // of the account which was merged into the current user's account. Use the name of the policy as the name of the report.
-    if (isArchivedRoom(report)) {
-        const lastAction = ReportActionsUtils.getLastVisibleAction(report?.reportID ?? '');
-        const archiveReason = lastAction?.actionName === CONST.REPORT.ACTIONS.TYPE.CLOSED ? lastAction?.originalMessage?.reason : CONST.REPORT.ARCHIVE_REASON.DEFAULT;
+    if (isArchivedRoom(report, getReportNameValuePairs(report?.reportID))) {
+        const lastAction = ReportActionsUtils.getLastVisibleAction(report?.reportID ?? '-1');
+        const archiveReason = ReportActionsUtils.isClosedAction(lastAction) ? ReportActionsUtils.getOriginalMessage(lastAction)?.reason : CONST.REPORT.ARCHIVE_REASON.DEFAULT;
         if (archiveReason === CONST.REPORT.ARCHIVE_REASON.ACCOUNT_MERGED && policyExpenseChatRole !== CONST.POLICY.ROLE.ADMIN) {
             return getPolicyName(report, false, policy);
         }
@@ -2338,6 +2673,16 @@ function getPolicyExpenseChatName(report: OnyxEntry<Report>, policy: OnyxEntry<P
     return reportOwnerDisplayName;
 }
 
+function getArchiveReason(reportActions: OnyxEntry<ReportActions>): ValueOf<typeof CONST.REPORT.ARCHIVE_REASON> | undefined {
+    const lastClosedReportAction = ReportActionsUtils.getLastClosedReportAction(reportActions);
+
+    if (!lastClosedReportAction) {
+        return undefined;
+    }
+
+    return ReportActionsUtils.isClosedAction(lastClosedReportAction) ? ReportActionsUtils.getOriginalMessage(lastClosedReportAction)?.reason : CONST.REPORT.ARCHIVE_REASON.DEFAULT;
+}
+
 /**
  * Given a report field, check if the field is for the report title.
  */
@@ -2346,10 +2691,11 @@ function isReportFieldOfTypeTitle(reportField: OnyxEntry<PolicyReportField>): bo
 }
 
 /**
- * Check if report fields are available to use in a report
+ * Check if Report has any held expenses
  */
-function reportFieldsEnabled(report: Report) {
-    return Permissions.canUseReportFields(allBetas ?? []) && isPaidGroupPolicyExpenseReport(report);
+function isHoldCreator(transaction: OnyxEntry<Transaction>, reportID: string): boolean {
+    const holdReportAction = ReportActionsUtils.getReportAction(reportID, `${transaction?.comment?.hold ?? ''}`);
+    return isActionCreator(holdReportAction);
 }
 
 /**
@@ -2361,9 +2707,9 @@ function reportFieldsEnabled(report: Report) {
  */
 function isReportFieldDisabled(report: OnyxEntry<Report>, reportField: OnyxEntry<PolicyReportField>, policy: OnyxEntry<Policy>): boolean {
     const isReportSettled = isSettled(report?.reportID);
-    const isReportClosed = report?.statusNum === CONST.REPORT.STATUS_NUM.CLOSED;
+    const isReportClosed = isClosedReport(report);
     const isTitleField = isReportFieldOfTypeTitle(reportField);
-    const isAdmin = isPolicyAdmin(report?.policyID ?? '', {[`${ONYXKEYS.COLLECTION.POLICY}${policy?.id ?? ''}`]: policy});
+    const isAdmin = isPolicyAdmin(report?.policyID ?? '-1', {[`${ONYXKEYS.COLLECTION.POLICY}${policy?.id ?? '-1'}`]: policy});
     return isTitleField ? !reportField?.deletable : !isAdmin && (isReportSettled || isReportClosed);
 }
 
@@ -2448,18 +2794,28 @@ function getAvailableReportFields(report: Report, policyReportFields: PolicyRepo
 /**
  * Get the title for an IOU or expense chat which will be showing the payer and the amount
  */
-function getMoneyRequestReportName(report: OnyxEntry<Report>, policy: OnyxEntry<Policy> | undefined = undefined): string {
-    const isReportSettled = isSettled(report?.reportID ?? '');
-    const reportFields = isReportSettled ? report?.fieldList : getReportFieldsByPolicyID(report?.policyID ?? '');
+function getMoneyRequestReportName(report: OnyxEntry<Report>, policy?: OnyxEntry<Policy>, invoiceReceiverPolicy?: OnyxEntry<Policy>): string {
+    const isReportSettled = isSettled(report?.reportID ?? '-1');
+    const reportFields = isReportSettled ? report?.fieldList : getReportFieldsByPolicyID(report?.policyID ?? '-1');
     const titleReportField = getFormulaTypeReportField(reportFields ?? {});
 
-    if (titleReportField && report?.reportName && reportFieldsEnabled(report)) {
+    if (titleReportField && report?.reportName && isPaidGroupPolicyExpenseReport(report)) {
         return report.reportName;
     }
 
     const moneyRequestTotal = getMoneyRequestSpendBreakdown(report).totalDisplaySpend;
     const formattedAmount = CurrencyUtils.convertToDisplayString(moneyRequestTotal, report?.currency);
-    let payerOrApproverName = isExpenseReport(report) ? getPolicyName(report, false, policy) : getDisplayNameForParticipant(report?.managerID) ?? '';
+
+    let payerOrApproverName;
+    if (isExpenseReport(report)) {
+        payerOrApproverName = getPolicyName(report, false, policy);
+    } else if (isInvoiceReport(report)) {
+        const chatReport = getReportOrDraftReport(report?.chatReportID);
+        payerOrApproverName = getInvoicePayerName(chatReport, invoiceReceiverPolicy);
+    } else {
+        payerOrApproverName = getDisplayNameForParticipant(report?.managerID) ?? '';
+    }
+
     const payerPaidAmountMessage = Localize.translateLocal('iou.payerPaidAmount', {
         payer: payerOrApproverName,
         amount: formattedAmount,
@@ -2493,13 +2849,13 @@ function getMoneyRequestReportName(report: OnyxEntry<Report>, policy: OnyxEntry<
  * into a flat object. Used for displaying transactions and sending them in API commands
  */
 
-function getTransactionDetails(transaction: OnyxEntry<Transaction>, createdDateFormat: string = CONST.DATE.FNS_FORMAT_STRING): TransactionDetails | undefined {
+function getTransactionDetails(transaction: OnyxInputOrEntry<Transaction>, createdDateFormat: string = CONST.DATE.FNS_FORMAT_STRING): TransactionDetails | undefined {
     if (!transaction) {
         return;
     }
-    const report = getReport(transaction?.reportID);
+    const report = getReportOrDraftReport(transaction?.reportID);
     return {
-        created: TransactionUtils.getCreated(transaction, createdDateFormat),
+        created: TransactionUtils.getFormattedCreated(transaction, createdDateFormat),
         amount: TransactionUtils.getAmount(transaction, !isEmptyObject(report) && isExpenseReport(report)),
         taxAmount: TransactionUtils.getTaxAmount(transaction, !isEmptyObject(report) && isExpenseReport(report)),
         taxCode: TransactionUtils.getTaxCode(transaction),
@@ -2507,6 +2863,7 @@ function getTransactionDetails(transaction: OnyxEntry<Transaction>, createdDateF
         comment: TransactionUtils.getDescription(transaction),
         merchant: TransactionUtils.getMerchant(transaction),
         waypoints: TransactionUtils.getWaypoints(transaction),
+        customUnitRateID: TransactionUtils.getRateID(transaction),
         category: TransactionUtils.getCategory(transaction),
         billable: TransactionUtils.getBillable(transaction),
         tag: TransactionUtils.getTag(transaction),
@@ -2537,39 +2894,44 @@ function getTransactionCommentObject(transaction: OnyxEntry<Transaction>): Comme
  *    This is used in conjunction with canEditRestrictedField to control editing of specific fields like amount, currency, created, receipt, and distance.
  *    On its own, it only controls allowing/disallowing navigating to the editing pages or showing/hiding the 'Edit' icon on report actions
  */
-function canEditMoneyRequest(reportAction: OnyxEntry<ReportAction>): boolean {
+function canEditMoneyRequest(reportAction: OnyxInputOrEntry<ReportAction<typeof CONST.REPORT.ACTIONS.TYPE.IOU>>, linkedTransaction?: OnyxEntry<Transaction>): boolean {
     const isDeleted = ReportActionsUtils.isDeletedAction(reportAction);
 
     if (isDeleted) {
         return false;
     }
 
-    // If the report action is not IOU type, return true early
-    if (reportAction?.actionName !== CONST.REPORT.ACTIONS.TYPE.IOU) {
-        return true;
+    const allowedReportActionType: Array<ValueOf<typeof CONST.IOU.REPORT_ACTION_TYPE>> = [CONST.IOU.REPORT_ACTION_TYPE.TRACK, CONST.IOU.REPORT_ACTION_TYPE.CREATE];
+    const originalMessage = ReportActionsUtils.getOriginalMessage(reportAction);
+    const actionType = originalMessage?.type;
+
+    if (!actionType || !allowedReportActionType.includes(actionType)) {
+        return false;
     }
 
-    const allowedReportActionType: Array<ValueOf<typeof CONST.IOU.REPORT_ACTION_TYPE>> = [CONST.IOU.REPORT_ACTION_TYPE.TRACK, CONST.IOU.REPORT_ACTION_TYPE.CREATE];
+    const transaction = linkedTransaction ?? getLinkedTransaction(reportAction ?? undefined);
 
-    if (!allowedReportActionType.includes(reportAction.originalMessage.type)) {
+    // In case the transaction is failed to be created, we should disable editing the money request
+    if (!transaction?.transactionID || (transaction?.pendingAction === CONST.RED_BRICK_ROAD_PENDING_ACTION.ADD && !isEmptyObject(transaction.errors))) {
         return false;
     }
 
-    const moneyRequestReportID = reportAction?.originalMessage?.IOUReportID ?? 0;
+    const moneyRequestReportID = originalMessage?.IOUReportID ?? -1;
 
     if (!moneyRequestReportID) {
-        return reportAction.originalMessage.type === CONST.IOU.REPORT_ACTION_TYPE.TRACK;
+        return actionType === CONST.IOU.REPORT_ACTION_TYPE.TRACK;
     }
 
-    const moneyRequestReport = getReport(String(moneyRequestReportID));
+    const moneyRequestReport = getReportOrDraftReport(String(moneyRequestReportID));
     const isRequestor = currentUserAccountID === reportAction?.actorAccountID;
 
+    const isSubmitted = isProcessingReport(moneyRequestReport);
     if (isIOUReport(moneyRequestReport)) {
-        return isProcessingReport(moneyRequestReport) && isRequestor;
+        return isSubmitted && isRequestor;
     }
 
-    const policy = getPolicy(moneyRequestReport?.policyID ?? '');
-    const isAdmin = policy.role === CONST.POLICY.ROLE.ADMIN;
+    const policy = getPolicy(moneyRequestReport?.policyID ?? '-1');
+    const isAdmin = policy?.role === CONST.POLICY.ROLE.ADMIN;
     const isManager = currentUserAccountID === moneyRequestReport?.managerID;
 
     if (isInvoiceReport(moneyRequestReport) && isManager) {
@@ -2581,14 +2943,19 @@ function canEditMoneyRequest(reportAction: OnyxEntry<ReportAction>): boolean {
         return true;
     }
 
-    return !isReportApproved(moneyRequestReport) && !isSettled(moneyRequestReport?.reportID) && isRequestor;
+    if (policy?.type === CONST.POLICY.TYPE.CORPORATE && moneyRequestReport && isSubmitted && isCurrentUserSubmitter(moneyRequestReport.reportID)) {
+        const isForwarded = PolicyUtils.getSubmitToAccountID(policy, moneyRequestReport.ownerAccountID ?? -1) !== moneyRequestReport.managerID;
+        return !isForwarded;
+    }
+
+    return !isReportApproved(moneyRequestReport) && !isSettled(moneyRequestReport?.reportID) && !isClosedReport(moneyRequestReport) && isRequestor;
 }
 
 /**
  * Checks if the current user can edit the provided property of an expense
  *
  */
-function canEditFieldOfMoneyRequest(reportAction: OnyxEntry<ReportAction>, fieldToEdit: ValueOf<typeof CONST.EDIT_REQUEST_FIELD>): boolean {
+function canEditFieldOfMoneyRequest(reportAction: OnyxInputOrEntry<ReportAction>, fieldToEdit: ValueOf<typeof CONST.EDIT_REQUEST_FIELD>): boolean {
     // A list of fields that cannot be edited by anyone, once an expense has been settled
     const restrictedFields: string[] = [
         CONST.EDIT_REQUEST_FIELD.AMOUNT,
@@ -2597,9 +2964,10 @@ function canEditFieldOfMoneyRequest(reportAction: OnyxEntry<ReportAction>, field
         CONST.EDIT_REQUEST_FIELD.DATE,
         CONST.EDIT_REQUEST_FIELD.RECEIPT,
         CONST.EDIT_REQUEST_FIELD.DISTANCE,
+        CONST.EDIT_REQUEST_FIELD.DISTANCE_RATE,
     ];
 
-    if (!canEditMoneyRequest(reportAction)) {
+    if (!ReportActionsUtils.isMoneyRequestAction(reportAction) || !canEditMoneyRequest(reportAction)) {
         return false;
     }
 
@@ -2608,8 +2976,8 @@ function canEditFieldOfMoneyRequest(reportAction: OnyxEntry<ReportAction>, field
         return true;
     }
 
-    const iouMessage = reportAction?.originalMessage as IOUMessage;
-    const moneyRequestReport = allReports?.[`${ONYXKEYS.COLLECTION.REPORT}${iouMessage?.IOUReportID}`] ?? ({} as Report);
+    const iouMessage = ReportActionsUtils.getOriginalMessage(reportAction);
+    const moneyRequestReport = ReportConnection.getAllReports()?.[`${ONYXKEYS.COLLECTION.REPORT}${iouMessage?.IOUReportID}`] ?? ({} as Report);
     const transaction = allTransactions?.[`${ONYXKEYS.COLLECTION.TRANSACTION}${iouMessage?.IOUTransactionID}`] ?? ({} as Transaction);
 
     if (isSettled(String(moneyRequestReport.reportID)) || isReportApproved(String(moneyRequestReport.reportID))) {
@@ -2623,17 +2991,27 @@ function canEditFieldOfMoneyRequest(reportAction: OnyxEntry<ReportAction>, field
         return false;
     }
 
-    if ((fieldToEdit === CONST.EDIT_REQUEST_FIELD.AMOUNT || fieldToEdit === CONST.EDIT_REQUEST_FIELD.CURRENCY) && TransactionUtils.isDistanceRequest(transaction)) {
-        const policy = getPolicy(moneyRequestReport?.reportID ?? '');
-        const isAdmin = isExpenseReport(moneyRequestReport) && policy.role === CONST.POLICY.ROLE.ADMIN;
-        const isManager = isExpenseReport(moneyRequestReport) && currentUserAccountID === moneyRequestReport?.managerID;
+    const policy = getPolicy(moneyRequestReport?.policyID);
+    const isAdmin = isExpenseReport(moneyRequestReport) && policy?.role === CONST.POLICY.ROLE.ADMIN;
+    const isManager = isExpenseReport(moneyRequestReport) && currentUserAccountID === moneyRequestReport?.managerID;
 
+    if ((fieldToEdit === CONST.EDIT_REQUEST_FIELD.AMOUNT || fieldToEdit === CONST.EDIT_REQUEST_FIELD.CURRENCY) && TransactionUtils.isDistanceRequest(transaction)) {
         return isAdmin || isManager;
     }
 
     if (fieldToEdit === CONST.EDIT_REQUEST_FIELD.RECEIPT) {
         const isRequestor = currentUserAccountID === reportAction?.actorAccountID;
-        return !isInvoiceReport(moneyRequestReport) && !TransactionUtils.isReceiptBeingScanned(transaction) && !TransactionUtils.isDistanceRequest(transaction) && isRequestor;
+        return (
+            !isInvoiceReport(moneyRequestReport) &&
+            !TransactionUtils.isReceiptBeingScanned(transaction) &&
+            !TransactionUtils.isDistanceRequest(transaction) &&
+            (isAdmin || isManager || isRequestor)
+        );
+    }
+
+    if (fieldToEdit === CONST.EDIT_REQUEST_FIELD.DISTANCE_RATE) {
+        // The distance rate can be modified only on the distance expense reports
+        return isExpenseReport(moneyRequestReport) && TransactionUtils.isDistanceRequest(transaction);
     }
 
     return true;
@@ -2647,25 +3025,98 @@ function canEditFieldOfMoneyRequest(reportAction: OnyxEntry<ReportAction>, field
  * - It's an expense where conditions for editability are defined in canEditMoneyRequest method
  * - It's not pending deletion
  */
-function canEditReportAction(reportAction: OnyxEntry<ReportAction>): boolean {
+function canEditReportAction(reportAction: OnyxInputOrEntry<ReportAction>): boolean {
     const isCommentOrIOU = reportAction?.actionName === CONST.REPORT.ACTIONS.TYPE.ADD_COMMENT || reportAction?.actionName === CONST.REPORT.ACTIONS.TYPE.IOU;
+    const message = reportAction ? ReportActionsUtils.getReportActionMessage(reportAction) : undefined;
 
-    return Boolean(
+    return !!(
         reportAction?.actorAccountID === currentUserAccountID &&
-            isCommentOrIOU &&
-            canEditMoneyRequest(reportAction) && // Returns true for non-IOU actions
-            !ReportActionsUtils.isReportActionAttachment(reportAction) &&
-            !ReportActionsUtils.isDeletedAction(reportAction) &&
-            !ReportActionsUtils.isCreatedTaskReportAction(reportAction) &&
-            reportAction?.pendingAction !== CONST.RED_BRICK_ROAD_PENDING_ACTION.DELETE,
+        isCommentOrIOU &&
+        (!ReportActionsUtils.isMoneyRequestAction(reportAction) || canEditMoneyRequest(reportAction)) && // Returns true for non-IOU actions
+        !isReportMessageAttachment(message) &&
+        ((!reportAction.isAttachmentWithText && !reportAction.isAttachmentOnly) || !reportAction.isOptimisticAction) &&
+        !ReportActionsUtils.isDeletedAction(reportAction) &&
+        !ReportActionsUtils.isCreatedTaskReportAction(reportAction) &&
+        reportAction?.pendingAction !== CONST.RED_BRICK_ROAD_PENDING_ACTION.DELETE
     );
 }
 
+function canHoldUnholdReportAction(reportAction: OnyxInputOrEntry<ReportAction>): {canHoldRequest: boolean; canUnholdRequest: boolean} {
+    if (!ReportActionsUtils.isMoneyRequestAction(reportAction)) {
+        return {canHoldRequest: false, canUnholdRequest: false};
+    }
+
+    const moneyRequestReportID = ReportActionsUtils.getOriginalMessage(reportAction)?.IOUReportID ?? 0;
+    const moneyRequestReport = getReportOrDraftReport(String(moneyRequestReportID));
+
+    if (!moneyRequestReportID || !moneyRequestReport) {
+        return {canHoldRequest: false, canUnholdRequest: false};
+    }
+
+    const isRequestSettled = isSettled(moneyRequestReport?.reportID);
+    const isApproved = isReportApproved(moneyRequestReport);
+    const transactionID = moneyRequestReport ? ReportActionsUtils.getOriginalMessage(reportAction)?.IOUTransactionID : 0;
+    const transaction = allTransactions?.[`${ONYXKEYS.COLLECTION.TRANSACTION}${transactionID}`] ?? ({} as Transaction);
+
+    const parentReportAction = ReportActionsUtils.getParentReportAction(moneyRequestReport);
+
+    const isRequestIOU = isIOUReport(moneyRequestReport);
+    const isHoldActionCreator = isHoldCreator(transaction, reportAction.childReportID ?? '-1');
+
+    const isTrackExpenseMoneyReport = isTrackExpenseReport(moneyRequestReport);
+    const isActionOwner =
+        typeof parentReportAction?.actorAccountID === 'number' &&
+        typeof currentUserPersonalDetails?.accountID === 'number' &&
+        parentReportAction.actorAccountID === currentUserPersonalDetails?.accountID;
+    const isApprover = isMoneyRequestReport(moneyRequestReport) && moneyRequestReport?.managerID !== null && currentUserPersonalDetails?.accountID === moneyRequestReport?.managerID;
+    const isAdmin = isPolicyAdmin(moneyRequestReport.policyID ?? '-1', allPolicies);
+    const isOnHold = TransactionUtils.isOnHold(transaction);
+    const isScanning = TransactionUtils.hasReceipt(transaction) && TransactionUtils.isReceiptBeingScanned(transaction);
+    const isClosed = isClosedReport(moneyRequestReport);
+
+    const canModifyStatus = !isTrackExpenseMoneyReport && (isAdmin || isActionOwner || isApprover);
+    const canModifyUnholdStatus = !isTrackExpenseMoneyReport && (isAdmin || (isActionOwner && isHoldActionCreator) || isApprover);
+    const isDeletedParentAction = isEmptyObject(parentReportAction) || ReportActionsUtils.isDeletedAction(parentReportAction);
+
+    const canHoldOrUnholdRequest = !isRequestSettled && !isApproved && !isDeletedParentAction && !isClosed;
+    const canHoldRequest = canHoldOrUnholdRequest && !isOnHold && (isRequestIOU || canModifyStatus) && !isScanning && !!transaction?.reimbursable;
+    const canUnholdRequest =
+        !!(canHoldOrUnholdRequest && isOnHold && !TransactionUtils.isDuplicate(transaction.transactionID, true) && (isRequestIOU ? isHoldActionCreator : canModifyUnholdStatus)) &&
+        !!transaction?.reimbursable;
+
+    return {canHoldRequest, canUnholdRequest};
+}
+
+const changeMoneyRequestHoldStatus = (reportAction: OnyxEntry<ReportAction>, backTo?: string): void => {
+    if (!ReportActionsUtils.isMoneyRequestAction(reportAction)) {
+        return;
+    }
+    const moneyRequestReportID = ReportActionsUtils.getOriginalMessage(reportAction)?.IOUReportID ?? 0;
+
+    const moneyRequestReport = getReportOrDraftReport(String(moneyRequestReportID));
+    if (!moneyRequestReportID || !moneyRequestReport) {
+        return;
+    }
+
+    const transactionID = ReportActionsUtils.getOriginalMessage(reportAction)?.IOUTransactionID ?? '';
+    const transaction = allTransactions?.[`${ONYXKEYS.COLLECTION.TRANSACTION}${transactionID}`] ?? ({} as Transaction);
+    const isOnHold = TransactionUtils.isOnHold(transaction);
+    const policy = allPolicies?.[`${ONYXKEYS.COLLECTION.POLICY}${moneyRequestReport.policyID}`] ?? null;
+
+    if (isOnHold) {
+        IOU.unholdRequest(transactionID, reportAction.childReportID ?? '');
+    } else {
+        const activeRoute = encodeURIComponent(Navigation.getActiveRouteWithoutParams());
+        // eslint-disable-next-line @typescript-eslint/prefer-nullish-coalescing
+        Navigation.navigate(ROUTES.MONEY_REQUEST_HOLD_REASON.getRoute(policy?.type ?? CONST.POLICY.TYPE.PERSONAL, transactionID, reportAction.childReportID ?? '', backTo || activeRoute));
+    }
+};
+
 /**
  * Gets all transactions on an IOU report with a receipt
  */
 function getTransactionsWithReceipts(iouReportID: string | undefined): Transaction[] {
-    const transactions = TransactionUtils.getAllReportTransactions(iouReportID);
+    const transactions = reportsTransactions[iouReportID ?? ''] ?? [];
     return transactions.filter((transaction) => TransactionUtils.hasReceipt(transaction));
 }
 
@@ -2685,28 +3136,49 @@ function areAllRequestsBeingSmartScanned(iouReportID: string, reportPreviewActio
     return transactionsWithReceipts.every((transaction) => TransactionUtils.isReceiptBeingScanned(transaction));
 }
 
-/**
- * Check if any of the transactions in the report has required missing fields
- *
- */
-function hasMissingSmartscanFields(iouReportID: string): boolean {
-    return TransactionUtils.getAllReportTransactions(iouReportID).some((transaction) => TransactionUtils.hasMissingSmartscanFields(transaction));
-}
-
 /**
  * Get the transactions related to a report preview with receipts
  * Get the details linked to the IOU reportAction
  *
  * NOTE: This method is only meant to be used inside this action file. Do not export and use it elsewhere. Use withOnyx or Onyx.connect() instead.
  */
-function getLinkedTransaction(reportAction: OnyxEntry<ReportAction | OptimisticIOUReportAction>): Transaction | EmptyObject {
+function getLinkedTransaction(reportAction: OnyxEntry<ReportAction | OptimisticIOUReportAction>): OnyxEntry<Transaction> {
     let transactionID = '';
 
-    if (reportAction?.actionName === CONST.REPORT.ACTIONS.TYPE.IOU) {
-        transactionID = (reportAction?.originalMessage as IOUMessage)?.IOUTransactionID ?? '';
+    if (ReportActionsUtils.isMoneyRequestAction(reportAction)) {
+        transactionID = ReportActionsUtils.getOriginalMessage(reportAction)?.IOUTransactionID ?? '-1';
     }
 
-    return allTransactions?.[`${ONYXKEYS.COLLECTION.TRANSACTION}${transactionID}`] ?? {};
+    return allTransactions?.[`${ONYXKEYS.COLLECTION.TRANSACTION}${transactionID}`];
+}
+
+/**
+ * Check if any of the transactions in the report has required missing fields
+ */
+function hasMissingSmartscanFields(iouReportID: string): boolean {
+    const reportTransactions = reportsTransactions[iouReportID] ?? [];
+
+    return reportTransactions.some(TransactionUtils.hasMissingSmartscanFields);
+}
+
+/**
+ * Check if iouReportID has required missing fields
+ */
+function shouldShowRBRForMissingSmartscanFields(iouReportID: string): boolean {
+    const reportActions = Object.values(ReportActionsUtils.getAllReportActions(iouReportID));
+    return reportActions.some((action) => {
+        if (!ReportActionsUtils.isMoneyRequestAction(action)) {
+            return false;
+        }
+        const transaction = getLinkedTransaction(action);
+        if (isEmptyObject(transaction)) {
+            return false;
+        }
+        if (!ReportActionsUtils.wasActionTakenByCurrentUser(action)) {
+            return false;
+        }
+        return TransactionUtils.hasMissingSmartscanFields(transaction);
+    });
 }
 
 /**
@@ -2736,20 +3208,21 @@ function getTransactionReportName(reportAction: OnyxEntry<ReportAction | Optimis
         return Localize.translateLocal('iou.receiptMissingDetails');
     }
 
-    if (TransactionUtils.isFetchingWaypointsFromServer(transaction)) {
+    if (TransactionUtils.isFetchingWaypointsFromServer(transaction) && TransactionUtils.getMerchant(transaction) === Localize.translateLocal('iou.fieldPending')) {
         return Localize.translateLocal('iou.fieldPending');
     }
 
-    const transactionDetails = getTransactionDetails(transaction);
+    if (ReportActionsUtils.isSentMoneyReportAction(reportAction)) {
+        return getIOUReportActionDisplayMessage(reportAction as ReportAction, transaction);
+    }
 
-    const formattedAmount = CurrencyUtils.convertToDisplayString(transactionDetails?.amount ?? 0, transactionDetails?.currency) ?? '';
-    const comment = (!TransactionUtils.isMerchantMissing(transaction) ? transactionDetails?.merchant : transactionDetails?.comment) ?? '';
+    const report = getReportOrDraftReport(transaction?.reportID);
+    const amount = TransactionUtils.getAmount(transaction, !isEmptyObject(report) && isExpenseReport(report)) ?? 0;
+    const formattedAmount = CurrencyUtils.convertToDisplayString(amount, TransactionUtils.getCurrency(transaction)) ?? '';
+    const comment = (!TransactionUtils.isMerchantMissing(transaction) ? TransactionUtils.getMerchant(transaction) : TransactionUtils.getDescription(transaction)) ?? '';
     if (ReportActionsUtils.isTrackExpenseAction(reportAction)) {
         return Localize.translateLocal('iou.threadTrackReportName', {formattedAmount, comment});
     }
-    if (ReportActionsUtils.isSentMoneyReportAction(reportAction)) {
-        return Localize.translateLocal('iou.threadPaySomeoneReportName', {formattedAmount, comment});
-    }
     return Localize.translateLocal('iou.threadExpenseReportName', {formattedAmount, comment});
 }
 
@@ -2762,15 +3235,16 @@ function getTransactionReportName(reportAction: OnyxEntry<ReportAction | Optimis
  *     from a report preview action. Otherwise, it will be the same as `iouReportAction`.
  */
 function getReportPreviewMessage(
-    report: OnyxEntry<Report> | EmptyObject,
-    iouReportAction: OnyxEntry<ReportAction> | EmptyObject = {},
+    reportOrID: OnyxInputOrEntry<Report> | string,
+    iouReportAction: OnyxInputOrEntry<ReportAction> = null,
     shouldConsiderScanningReceiptOrPendingRoute = false,
     isPreviewMessageForParentChatReport = false,
-    policy: OnyxEntry<Policy> = null,
+    policy?: OnyxInputOrEntry<Policy>,
     isForListPreview = false,
-    originalReportAction: OnyxEntry<ReportAction> | EmptyObject = iouReportAction,
+    originalReportAction: OnyxInputOrEntry<ReportAction> = iouReportAction,
 ): string {
-    const reportActionMessage = iouReportAction?.message?.[0]?.html ?? '';
+    const report = typeof reportOrID === 'string' ? ReportConnection.getAllReports()?.[`${ONYXKEYS.COLLECTION.REPORT}${reportOrID}`] : reportOrID;
+    const reportActionMessage = ReportActionsUtils.getReportActionHtml(iouReportAction);
 
     if (isEmptyObject(report) || !report?.reportID) {
         // The iouReport is not found locally after SignIn because the OpenApp API won't return iouReports if they're settled
@@ -2794,9 +3268,9 @@ function getReportPreviewMessage(
                 return Localize.translateLocal('iou.receiptMissingDetails');
             }
 
-            const transactionDetails = getTransactionDetails(linkedTransaction);
-            const formattedAmount = CurrencyUtils.convertToDisplayString(transactionDetails?.amount ?? 0, transactionDetails?.currency ?? '');
-            return Localize.translateLocal('iou.didSplitAmount', {formattedAmount, comment: transactionDetails?.comment ?? ''});
+            const amount = TransactionUtils.getAmount(linkedTransaction, !isEmptyObject(report) && isExpenseReport(report)) ?? 0;
+            const formattedAmount = CurrencyUtils.convertToDisplayString(amount, TransactionUtils.getCurrency(linkedTransaction)) ?? '';
+            return Localize.translateLocal('iou.didSplitAmount', {formattedAmount, comment: TransactionUtils.getDescription(linkedTransaction) ?? ''});
         }
     }
 
@@ -2816,9 +3290,9 @@ function getReportPreviewMessage(
                 return Localize.translateLocal('iou.receiptMissingDetails');
             }
 
-            const transactionDetails = getTransactionDetails(linkedTransaction);
-            const formattedAmount = CurrencyUtils.convertToDisplayString(transactionDetails?.amount ?? 0, transactionDetails?.currency ?? '');
-            return Localize.translateLocal('iou.trackedAmount', {formattedAmount, comment: transactionDetails?.comment ?? ''});
+            const amount = TransactionUtils.getAmount(linkedTransaction, !isEmptyObject(report) && isExpenseReport(report)) ?? 0;
+            const formattedAmount = CurrencyUtils.convertToDisplayString(amount, TransactionUtils.getCurrency(linkedTransaction)) ?? '';
+            return Localize.translateLocal('iou.trackedAmount', {formattedAmount, comment: TransactionUtils.getDescription(linkedTransaction) ?? ''});
         }
     }
 
@@ -2850,7 +3324,7 @@ function getReportPreviewMessage(
         return Localize.translateLocal('iou.fieldPending');
     }
 
-    const originalMessage = iouReportAction?.originalMessage as IOUMessage | undefined;
+    const originalMessage = !isEmptyObject(iouReportAction) && ReportActionsUtils.isMoneyRequestAction(iouReportAction) ? ReportActionsUtils.getOriginalMessage(iouReportAction) : undefined;
 
     // Show Paid preview message if it's settled or if the amount is paid & stuck at receivers end for only chat reports.
     if (isSettled(report.reportID) || (report.isWaitingOnBankAccount && isPreviewMessageForParentChatReport)) {
@@ -2919,12 +3393,12 @@ function getReportPreviewMessage(
  * At the moment, we only allow changing one transaction field at a time.
  */
 function getModifiedExpenseOriginalMessage(
-    oldTransaction: OnyxEntry<Transaction>,
+    oldTransaction: OnyxInputOrEntry<Transaction>,
     transactionChanges: TransactionChanges,
     isFromExpenseReport: boolean,
-    policy: OnyxEntry<Policy>,
-): ExpenseOriginalMessage {
-    const originalMessage: ExpenseOriginalMessage = {};
+    policy: OnyxInputOrEntry<Policy>,
+): OriginalMessageModifiedExpense {
+    const originalMessage: OriginalMessageModifiedExpense = {};
     // Remark: Comment field is the only one which has new/old prefixes for the keys (newComment/ oldComment),
     // all others have old/- pattern such as oldCreated/created
     if ('comment' in transactionChanges) {
@@ -2932,7 +3406,7 @@ function getModifiedExpenseOriginalMessage(
         originalMessage.newComment = transactionChanges?.comment;
     }
     if ('created' in transactionChanges) {
-        originalMessage.oldCreated = TransactionUtils.getCreated(oldTransaction);
+        originalMessage.oldCreated = TransactionUtils.getFormattedCreated(oldTransaction);
         originalMessage.created = transactionChanges?.created;
     }
     if ('merchant' in transactionChanges) {
@@ -2942,7 +3416,8 @@ function getModifiedExpenseOriginalMessage(
 
     // The amount is always a combination of the currency and the number value so when one changes we need to store both
     // to match how we handle the modified expense action in oldDot
-    if ('amount' in transactionChanges || 'currency' in transactionChanges) {
+    const didAmountOrCurrencyChange = 'amount' in transactionChanges || 'currency' in transactionChanges;
+    if (didAmountOrCurrencyChange) {
         originalMessage.oldAmount = TransactionUtils.getAmount(oldTransaction, isFromExpenseReport);
         originalMessage.amount = transactionChanges?.amount ?? transactionChanges.oldAmount;
         originalMessage.oldCurrency = TransactionUtils.getCurrency(oldTransaction);
@@ -2959,23 +3434,41 @@ function getModifiedExpenseOriginalMessage(
         originalMessage.tag = transactionChanges?.tag;
     }
 
-    if ('taxAmount' in transactionChanges) {
+    // We only want to display a tax rate update system message when tax rate is updated by user.
+    // Tax rate can change as a result of currency update. In such cases, we want to skip displaying a system message, as discussed.
+    const didTaxCodeChange = 'taxCode' in transactionChanges;
+    if (didTaxCodeChange && !didAmountOrCurrencyChange) {
+        originalMessage.oldTaxRate = policy?.taxRates?.taxes[TransactionUtils.getTaxCode(oldTransaction)]?.value;
+        originalMessage.taxRate = transactionChanges?.taxCode && policy?.taxRates?.taxes[transactionChanges?.taxCode].value;
+    }
+
+    // We only want to display a tax amount update system message when tax amount is updated by user.
+    // Tax amount can change as a result of amount, currency or tax rate update. In such cases, we want to skip displaying a system message, as discussed.
+    if ('taxAmount' in transactionChanges && !(didAmountOrCurrencyChange || didTaxCodeChange)) {
         originalMessage.oldTaxAmount = TransactionUtils.getTaxAmount(oldTransaction, isFromExpenseReport);
         originalMessage.taxAmount = transactionChanges?.taxAmount;
         originalMessage.currency = TransactionUtils.getCurrency(oldTransaction);
     }
 
-    if ('taxCode' in transactionChanges) {
-        originalMessage.oldTaxRate = policy?.taxRates?.taxes[TransactionUtils.getTaxCode(oldTransaction)]?.value;
-        originalMessage.taxRate = transactionChanges?.taxCode && policy?.taxRates?.taxes[transactionChanges?.taxCode].value;
-    }
-
     if ('billable' in transactionChanges) {
         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();
     }
 
+    if ('customUnitRateID' in transactionChanges) {
+        originalMessage.oldAmount = TransactionUtils.getAmount(oldTransaction, isFromExpenseReport);
+        originalMessage.oldCurrency = TransactionUtils.getCurrency(oldTransaction);
+        originalMessage.oldMerchant = TransactionUtils.getMerchant(oldTransaction);
+
+        const modifiedDistanceFields = TransactionUtils.calculateAmountForUpdatedWaypointOrRate(oldTransaction, transactionChanges, policy, isFromExpenseReport);
+
+        // For the originalMessage, we should use the non-negative amount, similar to what TransactionUtils.getAmount does for oldAmount
+        originalMessage.amount = Math.abs(modifiedDistanceFields.modifiedAmount);
+        originalMessage.currency = modifiedDistanceFields.modifiedCurrency ?? CONST.CURRENCY.USD;
+        originalMessage.merchant = modifiedDistanceFields.modifiedMerchant;
+    }
+
     return originalMessage;
 }
 
@@ -2983,7 +3476,7 @@ function getModifiedExpenseOriginalMessage(
  * Check if original message is an object and can be used as a ChangeLog type
  * @param originalMessage
  */
-function isChangeLogObject(originalMessage?: ChangeLog): ChangeLog | undefined {
+function isChangeLogObject(originalMessage?: OriginalMessageChangeLog): OriginalMessageChangeLog | undefined {
     if (originalMessage && typeof originalMessage === 'object') {
         return originalMessage;
     }
@@ -2995,14 +3488,21 @@ function isChangeLogObject(originalMessage?: ChangeLog): ChangeLog | undefined {
  * @param parentReportAction
  * @param parentReportActionMessage
  */
-function getAdminRoomInvitedParticipants(parentReportAction: ReportAction | Record<string, never>, parentReportActionMessage: string) {
-    if (!parentReportAction?.originalMessage) {
+function getAdminRoomInvitedParticipants(parentReportAction: OnyxEntry<ReportAction>, parentReportActionMessage: string) {
+    if (isEmptyObject(parentReportAction)) {
+        return parentReportActionMessage || Localize.translateLocal('parentReportAction.deletedMessage');
+    }
+    if (!ReportActionsUtils.getOriginalMessage(parentReportAction)) {
+        return parentReportActionMessage || Localize.translateLocal('parentReportAction.deletedMessage');
+    }
+    if (!ReportActionsUtils.isPolicyChangeLogAction(parentReportAction) || !ReportActionsUtils.isRoomChangeLogAction(parentReportAction)) {
         return parentReportActionMessage || Localize.translateLocal('parentReportAction.deletedMessage');
     }
-    const originalMessage = isChangeLogObject(parentReportAction.originalMessage);
+
+    const originalMessage = isChangeLogObject(ReportActionsUtils.getOriginalMessage(parentReportAction));
     const participantAccountIDs = originalMessage?.targetAccountIDs ?? [];
 
-    const participants = participantAccountIDs.map((id) => {
+    const participants = participantAccountIDs.map((id: number) => {
         const name = getDisplayNameForParticipant(id);
         if (name && name?.length > 0) {
             return name;
@@ -3032,7 +3532,7 @@ function getAdminRoomInvitedParticipants(parentReportAction: ReportAction | Reco
  * - Individual - a receiver display name.
  * - Policy - a receiver policy name.
  */
-function getInvoicePayerName(report: OnyxEntry<Report>): string {
+function getInvoicePayerName(report: OnyxEntry<Report>, invoiceReceiverPolicy?: OnyxEntry<Policy>): string {
     const invoiceReceiver = report?.invoiceReceiver;
     const isIndividual = invoiceReceiver?.type === CONST.REPORT.INVOICE_RECEIVER_TYPE.INDIVIDUAL;
 
@@ -3040,35 +3540,89 @@ function getInvoicePayerName(report: OnyxEntry<Report>): string {
         return PersonalDetailsUtils.getDisplayNameOrDefault(allPersonalDetails?.[invoiceReceiver.accountID]);
     }
 
-    return getPolicyName(report, false, allPolicies?.[`${ONYXKEYS.COLLECTION.POLICY}${invoiceReceiver?.policyID}`]);
+    return getPolicyName(report, false, invoiceReceiverPolicy ?? allPolicies?.[`${ONYXKEYS.COLLECTION.POLICY}${invoiceReceiver?.policyID}`]);
+}
+
+/**
+ * Parse html of reportAction into text
+ */
+function parseReportActionHtmlToText(reportAction: OnyxEntry<ReportAction>, reportID: string, childReportID?: string): string {
+    if (!reportAction) {
+        return '';
+    }
+    const key = `${reportID}_${reportAction.reportActionID}_${reportAction.lastModified}`;
+    const cachedText = parsedReportActionMessageCache[key];
+    if (cachedText !== undefined) {
+        return cachedText;
+    }
+
+    const {html, text} = ReportActionsUtils.getReportActionMessage(reportAction) ?? {};
+
+    if (!html) {
+        return text ?? '';
+    }
+
+    const mentionReportRegex = /<mention-report reportID="(\d+)" *\/>/gi;
+    const matches = html.matchAll(mentionReportRegex);
+
+    const reportIDToName: Record<string, string> = {};
+    for (const match of matches) {
+        if (match[1] !== childReportID) {
+            // eslint-disable-next-line @typescript-eslint/no-use-before-define
+            reportIDToName[match[1]] = getReportName(getReportOrDraftReport(match[1])) ?? '';
+        }
+    }
+
+    const mentionUserRegex = /<mention-user accountID="(\d+)" *\/>/gi;
+    const accountIDToName: Record<string, string> = {};
+    const accountIDs = Array.from(html.matchAll(mentionUserRegex), (mention) => Number(mention[1]));
+    const logins = PersonalDetailsUtils.getLoginsByAccountIDs(accountIDs);
+    accountIDs.forEach((id, index) => (accountIDToName[id] = logins[index]));
+
+    const textMessage = Str.removeSMSDomain(Parser.htmlToText(html, {reportIDToName, accountIDToName}));
+    parsedReportActionMessageCache[key] = textMessage;
+
+    return textMessage;
 }
 
 /**
  * Get the report action message for a report action.
  */
-function getReportActionMessage(reportAction: ReportAction | EmptyObject, parentReportID?: string) {
+function getReportActionMessage(reportAction: OnyxEntry<ReportAction>, reportID?: string, childReportID?: string) {
     if (isEmptyObject(reportAction)) {
         return '';
     }
+    if (reportAction.actionName === CONST.REPORT.ACTIONS.TYPE.HOLD) {
+        return Localize.translateLocal('iou.heldExpense');
+    }
+
+    if (reportAction.actionName === CONST.REPORT.ACTIONS.TYPE.EXPORTED_TO_INTEGRATION) {
+        return ReportActionsUtils.getExportIntegrationLastMessageText(reportAction);
+    }
+
+    if (reportAction.actionName === CONST.REPORT.ACTIONS.TYPE.UNHOLD) {
+        return Localize.translateLocal('iou.unheldExpense');
+    }
     if (ReportActionsUtils.isApprovedOrSubmittedReportAction(reportAction)) {
         return ReportActionsUtils.getReportActionMessageText(reportAction);
     }
     if (ReportActionsUtils.isReimbursementQueuedAction(reportAction)) {
-        return getReimbursementQueuedActionMessage(reportAction, getReport(parentReportID), false);
+        return getReimbursementQueuedActionMessage(reportAction, getReportOrDraftReport(reportID), false);
     }
-    return Str.removeSMSDomain(reportAction?.message?.[0]?.text ?? '');
+
+    return parseReportActionHtmlToText(reportAction, reportID ?? '', childReportID);
 }
 
 /**
  * Get the title for an invoice room.
  */
-function getInvoicesChatName(report: OnyxEntry<Report>): string {
+function getInvoicesChatName(report: OnyxEntry<Report>, receiverPolicy: OnyxEntry<Policy>): string {
     const invoiceReceiver = report?.invoiceReceiver;
     const isIndividual = invoiceReceiver?.type === CONST.REPORT.INVOICE_RECEIVER_TYPE.INDIVIDUAL;
     const invoiceReceiverAccountID = isIndividual ? invoiceReceiver.accountID : -1;
-    const invoiceReceiverPolicyID = isIndividual ? '' : invoiceReceiver?.policyID ?? '';
-    const isCurrentUserReceiver =
-        (isIndividual && invoiceReceiverAccountID === currentUserAccountID) || (!isIndividual && PolicyUtils.isPolicyEmployee(invoiceReceiverPolicyID, allPolicies));
+    const invoiceReceiverPolicyID = isIndividual ? '' : invoiceReceiver?.policyID ?? '-1';
+    const invoiceReceiverPolicy = receiverPolicy ?? getPolicy(invoiceReceiverPolicyID);
+    const isCurrentUserReceiver = (isIndividual && invoiceReceiverAccountID === currentUserAccountID) || (!isIndividual && PolicyUtils.isPolicyAdmin(invoiceReceiverPolicy));
 
     if (isCurrentUserReceiver) {
         return getPolicyName(report);
@@ -3078,51 +3632,95 @@ function getInvoicesChatName(report: OnyxEntry<Report>): string {
         return PersonalDetailsUtils.getDisplayNameOrDefault(allPersonalDetails?.[invoiceReceiverAccountID]);
     }
 
-    // TODO: Check this flow in a scope of the Invoice V0.3
-    return getPolicyName(report, false, allPolicies?.[`${ONYXKEYS.COLLECTION.POLICY}${invoiceReceiverPolicyID}`]);
+    return getPolicyName(report, false, invoiceReceiverPolicy);
 }
 
+const reportNameCache = new Map<string, {lastVisibleActionCreated: string; reportName: string}>();
+
+/**
+ * Get a cache key for the report name.
+ */
+const getCacheKey = (report: OnyxEntry<Report>): string => `${report?.reportID}-${report?.lastVisibleActionCreated}-${report?.reportName}`;
+
 /**
  * Get the title for a report.
  */
-function getReportName(report: OnyxEntry<Report>, policy: OnyxEntry<Policy> = null): string {
+function getReportName(
+    report: OnyxEntry<Report>,
+    policy?: OnyxEntry<Policy>,
+    parentReportActionParam?: OnyxInputOrEntry<ReportAction>,
+    personalDetails?: Partial<PersonalDetailsList>,
+    invoiceReceiverPolicy?: OnyxEntry<Policy>,
+): string {
+    const reportID = report?.reportID;
+    const cacheKey = getCacheKey(report);
+
+    if (reportID) {
+        const reportNameFromCache = reportNameCache.get(cacheKey);
+
+        if (reportNameFromCache?.reportName && reportNameFromCache.reportName === report?.reportName) {
+            return reportNameFromCache.reportName;
+        }
+    }
+
     let formattedName: string | undefined;
-    const parentReportAction = ReportActionsUtils.getParentReportAction(report);
+    const parentReportAction = parentReportActionParam ?? ReportActionsUtils.getParentReportAction(report);
+    const parentReportActionMessage = ReportActionsUtils.getReportActionMessage(parentReportAction);
+
+    if (parentReportAction?.actionName === CONST.REPORT.ACTIONS.TYPE.SUBMITTED) {
+        return getIOUSubmittedMessage(parentReportAction);
+    }
+    if (parentReportAction?.actionName === CONST.REPORT.ACTIONS.TYPE.FORWARDED) {
+        return getIOUForwardedMessage(parentReportAction);
+    }
+    if (parentReportAction?.actionName === CONST.REPORT.ACTIONS.TYPE.APPROVED) {
+        return getIOUApprovedMessage(parentReportAction);
+    }
+
     if (isChatThread(report)) {
         if (!isEmptyObject(parentReportAction) && ReportActionsUtils.isTransactionThread(parentReportAction)) {
             formattedName = getTransactionReportName(parentReportAction);
-            if (isArchivedRoom(report)) {
+            if (isArchivedRoom(report, getReportNameValuePairs(report?.reportID))) {
                 formattedName += ` (${Localize.translateLocal('common.archived')})`;
             }
-            return formattedName;
+            return formatReportLastMessageText(formattedName);
+        }
+
+        if (!isEmptyObject(parentReportAction) && ReportActionsUtils.isOldDotReportAction(parentReportAction)) {
+            return ReportActionsUtils.getMessageOfOldDotReportAction(parentReportAction);
         }
 
-        if (parentReportAction?.message?.[0]?.isDeletedParentAction) {
+        if (parentReportActionMessage?.isDeletedParentAction) {
             return Localize.translateLocal('parentReportAction.deletedMessage');
         }
 
-        const isAttachment = ReportActionsUtils.isReportActionAttachment(!isEmptyObject(parentReportAction) ? parentReportAction : null);
-        const parentReportActionMessage = getReportActionMessage(parentReportAction, report?.parentReportID).replace(/(\r\n|\n|\r)/gm, ' ');
-        if (isAttachment && parentReportActionMessage) {
+        const isAttachment = ReportActionsUtils.isReportActionAttachment(!isEmptyObject(parentReportAction) ? parentReportAction : undefined);
+        const reportActionMessage = getReportActionMessage(parentReportAction, report?.parentReportID, report?.reportID ?? '').replace(/(\n+|\r\n|\n|\r)/gm, ' ');
+        if (isAttachment && reportActionMessage) {
             return `[${Localize.translateLocal('common.attachment')}]`;
         }
         if (
-            parentReportAction?.message?.[0]?.moderationDecision?.decision === CONST.MODERATION.MODERATOR_DECISION_PENDING_HIDE ||
-            parentReportAction?.message?.[0]?.moderationDecision?.decision === CONST.MODERATION.MODERATOR_DECISION_HIDDEN ||
-            parentReportAction?.message?.[0]?.moderationDecision?.decision === CONST.MODERATION.MODERATOR_DECISION_PENDING_REMOVE
+            parentReportActionMessage?.moderationDecision?.decision === CONST.MODERATION.MODERATOR_DECISION_PENDING_HIDE ||
+            parentReportActionMessage?.moderationDecision?.decision === CONST.MODERATION.MODERATOR_DECISION_HIDDEN ||
+            parentReportActionMessage?.moderationDecision?.decision === CONST.MODERATION.MODERATOR_DECISION_PENDING_REMOVE
         ) {
             return Localize.translateLocal('parentReportAction.hiddenMessage');
         }
         if (isAdminRoom(report) || isUserCreatedPolicyRoom(report)) {
-            return getAdminRoomInvitedParticipants(parentReportAction, parentReportActionMessage);
+            return getAdminRoomInvitedParticipants(parentReportAction, reportActionMessage);
         }
-        if (parentReportActionMessage && isArchivedRoom(report)) {
-            return `${parentReportActionMessage} (${Localize.translateLocal('common.archived')})`;
+        if (reportActionMessage && isArchivedRoom(report, getReportNameValuePairs(report?.reportID))) {
+            return `${reportActionMessage} (${Localize.translateLocal('common.archived')})`;
         }
-        if (ReportActionsUtils.isModifiedExpenseAction(parentReportAction)) {
+        if (!isEmptyObject(parentReportAction) && ReportActionsUtils.isModifiedExpenseAction(parentReportAction)) {
             return ModifiedExpenseMessage.getForReportAction(report?.reportID, parentReportAction);
         }
-        return parentReportActionMessage;
+
+        if (isTripRoom(report)) {
+            return report?.reportName ?? '';
+        }
+
+        return reportActionMessage;
     }
 
     if (isClosedExpenseReportWithNoExpenses(report)) {
@@ -3134,7 +3732,7 @@ function getReportName(report: OnyxEntry<Report>, policy: OnyxEntry<Policy> = nu
     }
 
     if (isGroupChat(report)) {
-        return getGroupChatName(undefined, true, report?.reportID) ?? '';
+        return getGroupChatName(undefined, true, report) ?? '';
     }
 
     if (isChatRoom(report) || isTaskReport(report)) {
@@ -3145,34 +3743,51 @@ function getReportName(report: OnyxEntry<Report>, policy: OnyxEntry<Policy> = nu
         formattedName = getPolicyExpenseChatName(report, policy);
     }
 
-    if (isMoneyRequestReport(report) || isInvoiceReport(report)) {
+    if (isMoneyRequestReport(report)) {
         formattedName = getMoneyRequestReportName(report, policy);
     }
 
-    if (isArchivedRoom(report)) {
-        formattedName += ` (${Localize.translateLocal('common.archived')})`;
+    if (isInvoiceReport(report)) {
+        formattedName = getMoneyRequestReportName(report, policy, invoiceReceiverPolicy);
     }
 
-    if (isSelfDM(report)) {
-        formattedName = getDisplayNameForParticipant(currentUserAccountID, undefined, undefined, true);
+    if (isInvoiceRoom(report)) {
+        formattedName = getInvoicesChatName(report, invoiceReceiverPolicy);
     }
 
-    if (isInvoiceRoom(report)) {
-        formattedName = getInvoicesChatName(report);
+    if (isArchivedRoom(report, getReportNameValuePairs(report?.reportID))) {
+        formattedName += ` (${Localize.translateLocal('common.archived')})`;
+    }
+
+    if (isSelfDM(report)) {
+        formattedName = getDisplayNameForParticipant(currentUserAccountID, undefined, undefined, true, personalDetails);
     }
 
     if (formattedName) {
-        return formattedName;
+        if (reportID) {
+            reportNameCache.set(cacheKey, {lastVisibleActionCreated: report?.lastVisibleActionCreated ?? '', reportName: formattedName});
+        }
+
+        return formatReportLastMessageText(formattedName);
     }
 
     // Not a room or PolicyExpenseChat, generate title from first 5 other participants
-    const participantAccountIDs = report?.participantAccountIDs?.slice(0, 6) ?? [];
-    const participantsWithoutCurrentUser = participantAccountIDs.filter((accountID) => accountID !== currentUserAccountID);
+    const participantsWithoutCurrentUser: number[] = [];
+    Object.keys(report?.participants ?? {}).forEach((accountID) => {
+        const accID = Number(accountID);
+        if (accID !== currentUserAccountID && participantsWithoutCurrentUser.length < 5) {
+            participantsWithoutCurrentUser.push(accID);
+        }
+    });
     const isMultipleParticipantReport = participantsWithoutCurrentUser.length > 1;
-    if (participantsWithoutCurrentUser.length > 5) {
-        participantsWithoutCurrentUser.pop();
+    const participantNames = participantsWithoutCurrentUser.map((accountID) => getDisplayNameForParticipant(accountID, isMultipleParticipantReport, true, false, personalDetails)).join(', ');
+    formattedName = participantNames;
+
+    if (reportID) {
+        reportNameCache.set(cacheKey, {lastVisibleActionCreated: report?.lastVisibleActionCreated ?? '', reportName: formattedName});
     }
-    return participantsWithoutCurrentUser.map((accountID) => getDisplayNameForParticipant(accountID, isMultipleParticipantReport)).join(', ');
+
+    return formattedName;
 }
 
 /**
@@ -3183,8 +3798,10 @@ function getPayeeName(report: OnyxEntry<Report>): string | undefined {
         return undefined;
     }
 
-    const participantAccountIDs = report?.participantAccountIDs ?? [];
-    const participantsWithoutCurrentUser = participantAccountIDs.filter((accountID) => accountID !== currentUserAccountID);
+    const participantsWithoutCurrentUser = Object.keys(report?.participants ?? {})
+        .map(Number)
+        .filter((accountID) => accountID !== currentUserAccountID);
+
     if (participantsWithoutCurrentUser.length === 0) {
         return undefined;
     }
@@ -3214,7 +3831,7 @@ function getChatRoomSubtitle(report: OnyxEntry<Report>): string | undefined {
     if ((isPolicyExpenseChat(report) && !!report?.isOwnPolicyExpenseChat) || isExpenseReport(report)) {
         return Localize.translateLocal('workspace.common.workspace');
     }
-    if (isArchivedRoom(report)) {
+    if (isArchivedRoom(report, getReportNameValuePairs(report?.reportID))) {
         return report?.oldPolicyName ?? '';
     }
     return getPolicyName(report);
@@ -3231,14 +3848,22 @@ function getPendingChatMembers(accountIDs: number[], previousPendingChatMembers:
 /**
  * Gets the parent navigation subtitle for the report
  */
-function getParentNavigationSubtitle(report: OnyxEntry<Report>): ParentNavigationSummaryParams {
+function getParentNavigationSubtitle(report: OnyxEntry<Report>, invoiceReceiverPolicy?: OnyxEntry<Policy>): ParentNavigationSummaryParams {
     const parentReport = getParentReport(report);
     if (isEmptyObject(parentReport)) {
         return {};
     }
 
     if (isInvoiceReport(report) || isInvoiceRoom(parentReport)) {
-        return {reportName: `${getPolicyName(parentReport)} & ${getInvoicePayerName(parentReport)}`};
+        let reportName = `${getPolicyName(parentReport)} & ${getInvoicePayerName(parentReport, invoiceReceiverPolicy)}`;
+
+        if (isArchivedRoom(parentReport, getReportNameValuePairs(parentReport?.reportID))) {
+            reportName += ` (${Localize.translateLocal('common.archived')})`;
+        }
+
+        return {
+            reportName,
+        };
     }
 
     return {
@@ -3251,17 +3876,15 @@ function getParentNavigationSubtitle(report: OnyxEntry<Report>): ParentNavigatio
  * Navigate to the details page of a given report
  */
 function navigateToDetailsPage(report: OnyxEntry<Report>) {
-    const participantAccountIDs = report?.participantAccountIDs ?? [];
+    const isSelfDMReport = isSelfDM(report);
+    const isOneOnOneChatReport = isOneOnOneChat(report);
+    const participantAccountID = getParticipantsAccountIDsForDisplay(report);
 
-    if (isSelfDM(report)) {
-        Navigation.navigate(ROUTES.PROFILE.getRoute(currentUserAccountID ?? 0));
+    if (isSelfDMReport || isOneOnOneChatReport) {
+        Navigation.navigate(ROUTES.PROFILE.getRoute(participantAccountID[0]));
         return;
     }
 
-    if (isOneOnOneChat(report)) {
-        Navigation.navigate(ROUTES.PROFILE.getRoute(participantAccountIDs[0]));
-        return;
-    }
     if (report?.reportID) {
         Navigation.navigate(ROUTES.REPORT_WITH_ID_DETAILS.getRoute(report?.reportID));
     }
@@ -3271,26 +3894,71 @@ function navigateToDetailsPage(report: OnyxEntry<Report>) {
  * Go back to the details page of a given report
  */
 function goBackToDetailsPage(report: OnyxEntry<Report>) {
-    if (isOneOnOneChat(report)) {
-        Navigation.goBack(ROUTES.PROFILE.getRoute(report?.participantAccountIDs?.[0] ?? ''));
+    const isOneOnOneChatReport = isOneOnOneChat(report);
+    const participantAccountID = getParticipantsAccountIDsForDisplay(report);
+
+    if (isOneOnOneChatReport) {
+        Navigation.navigate(ROUTES.PROFILE.getRoute(participantAccountID[0]));
         return;
     }
-    Navigation.goBack(ROUTES.REPORT_SETTINGS.getRoute(report?.reportID ?? ''));
+
+    Navigation.goBack(ROUTES.REPORT_SETTINGS.getRoute(report?.reportID ?? '-1'));
 }
 
-/**
- * Generate a random reportID up to 53 bits aka 9,007,199,254,740,991 (Number.MAX_SAFE_INTEGER).
- * There were approximately 98,000,000 reports with sequential IDs generated before we started using this approach, those make up roughly one billionth of the space for these numbers,
- * so we live with the 1 in a billion chance of a collision with an older ID until we can switch to 64-bit IDs.
- *
- * In a test of 500M reports (28 years of reports at our current max rate) we got 20-40 collisions meaning that
- * this is more than random enough for our needs.
- */
-function generateReportID(): string {
-    return (Math.floor(Math.random() * 2 ** 21) * 2 ** 32 + Math.floor(Math.random() * 2 ** 32)).toString();
+function navigateBackAfterDeleteTransaction(backRoute: Route | undefined, isFromRHP?: boolean) {
+    if (!backRoute) {
+        return;
+    }
+    const topmostCentralPaneRoute = Navigation.getTopMostCentralPaneRouteFromRootState();
+    if (topmostCentralPaneRoute?.name === SCREENS.SEARCH.CENTRAL_PANE) {
+        Navigation.dismissModal();
+        return;
+    }
+    if (isFromRHP) {
+        Navigation.dismissModal();
+    }
+    Navigation.isNavigationReady().then(() => {
+        Navigation.goBack(backRoute);
+    });
 }
 
-function hasReportNameError(report: OnyxEntry<Report>): boolean {
+/**
+ * Go back to the previous page from the edit private page of a given report
+ */
+function goBackFromPrivateNotes(report: OnyxEntry<Report>, session: OnyxEntry<Session>) {
+    if (isEmpty(report) || isEmpty(session) || !session.accountID) {
+        return;
+    }
+    const currentUserPrivateNote = report.privateNotes?.[session.accountID]?.note ?? '';
+    if (isEmpty(currentUserPrivateNote)) {
+        const participantAccountIDs = getParticipantsAccountIDsForDisplay(report);
+
+        if (isOneOnOneChat(report)) {
+            Navigation.goBack(ROUTES.PROFILE.getRoute(participantAccountIDs[0]));
+            return;
+        }
+
+        if (report?.reportID) {
+            Navigation.goBack(ROUTES.REPORT_WITH_ID_DETAILS.getRoute(report?.reportID));
+            return;
+        }
+    }
+    Navigation.goBack(ROUTES.PRIVATE_NOTES_LIST.getRoute(report.reportID));
+}
+
+/**
+ * Generate a random reportID up to 53 bits aka 9,007,199,254,740,991 (Number.MAX_SAFE_INTEGER).
+ * There were approximately 98,000,000 reports with sequential IDs generated before we started using this approach, those make up roughly one billionth of the space for these numbers,
+ * so we live with the 1 in a billion chance of a collision with an older ID until we can switch to 64-bit IDs.
+ *
+ * In a test of 500M reports (28 years of reports at our current max rate) we got 20-40 collisions meaning that
+ * this is more than random enough for our needs.
+ */
+function generateReportID(): string {
+    return (Math.floor(Math.random() * 2 ** 21) * 2 ** 32 + Math.floor(Math.random() * 2 ** 32)).toString();
+}
+
+function hasReportNameError(report: OnyxEntry<Report>): boolean {
     return !isEmptyObject(report?.errorFields?.reportName);
 }
 
@@ -3315,6 +3983,23 @@ function addDomainToShortMention(mention: string): string | undefined {
     return undefined;
 }
 
+/**
+ * Replaces all valid short mention found in a text to a full mention
+ *
+ * Example:
+ * "Hello \@example -> Hello \@example\@expensify.com"
+ */
+function completeShortMention(text: string): string {
+    return text.replace(CONST.REGEX.SHORT_MENTION, (match) => {
+        if (!Str.isValidMention(match)) {
+            return match;
+        }
+        const mention = match.substring(1);
+        const mentionWithDomain = addDomainToShortMention(mention);
+        return mentionWithDomain ? `@${mentionWithDomain}` : match;
+    });
+}
+
 /**
  * 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!!
@@ -3322,29 +4007,57 @@ function addDomainToShortMention(mention: string): string | undefined {
 function getParsedComment(text: string, parsingDetails?: ParsingDetails): string {
     let isGroupPolicyReport = false;
     if (parsingDetails?.reportID) {
-        const currentReport = getReport(parsingDetails?.reportID);
+        const currentReport = getReportOrDraftReport(parsingDetails?.reportID);
         isGroupPolicyReport = isReportInGroupPolicy(currentReport);
     }
 
-    const parser = new ExpensiMark();
-    const textWithMention = text.replace(CONST.REGEX.SHORT_MENTION, (match) => {
-        const mention = match.substring(1);
-        const mentionWithDomain = addDomainToShortMention(mention);
-        return mentionWithDomain ? `@${mentionWithDomain}` : match;
-    });
+    if (parsingDetails?.policyID) {
+        const policyType = getPolicy(parsingDetails?.policyID)?.type;
+        if (policyType) {
+            isGroupPolicyReport = isGroupPolicy(policyType);
+        }
+    }
+
+    const textWithMention = completeShortMention(text);
 
     return text.length <= CONST.MAX_MARKUP_LENGTH
-        ? parser.replace(textWithMention, {shouldEscapeText: parsingDetails?.shouldEscapeText, disabledRules: isGroupPolicyReport ? [] : ['reportMentions']})
+        ? Parser.replace(textWithMention, {shouldEscapeText: parsingDetails?.shouldEscapeText, disabledRules: isGroupPolicyReport ? [] : ['reportMentions']})
         : lodashEscape(text);
 }
 
+function getUploadingAttachmentHtml(file?: FileObject): string {
+    if (!file || typeof file.uri !== 'string') {
+        return '';
+    }
+
+    const dataAttributes = [
+        `${CONST.ATTACHMENT_OPTIMISTIC_SOURCE_ATTRIBUTE}="${file.uri}"`,
+        `${CONST.ATTACHMENT_SOURCE_ATTRIBUTE}="${file.uri}"`,
+        `${CONST.ATTACHMENT_ORIGINAL_FILENAME_ATTRIBUTE}="${file.name}"`,
+        'width' in file && `${CONST.ATTACHMENT_THUMBNAIL_WIDTH_ATTRIBUTE}="${file.width}"`,
+        'height' in file && `${CONST.ATTACHMENT_THUMBNAIL_HEIGHT_ATTRIBUTE}="${file.height}"`,
+    ]
+        .filter((x) => !!x)
+        .join(' ');
+
+    // file.type is a known mime type like image/png, image/jpeg, video/mp4 etc.
+    if (file.type?.startsWith('image')) {
+        return `<img src="${file.uri}" alt="${file.name}" ${dataAttributes} />`;
+    }
+    if (file.type?.startsWith('video')) {
+        return `<video src="${file.uri}" ${dataAttributes}>${file.name}</video>`;
+    }
+
+    // For all other types, we present a generic download link
+    return `<a href="${file.uri}" ${dataAttributes}>${file.name}</a>`;
+}
+
 function getReportDescriptionText(report: Report): string {
     if (!report.description) {
         return '';
     }
 
-    const parser = new ExpensiMark();
-    return parser.htmlToText(report.description);
+    return Parser.htmlToText(report.description);
 }
 
 function getPolicyDescriptionText(policy: OnyxEntry<Policy>): string {
@@ -3352,46 +4065,7 @@ function getPolicyDescriptionText(policy: OnyxEntry<Policy>): string {
         return '';
     }
 
-    const parser = new ExpensiMark();
-    return parser.htmlToText(policy.description);
-}
-
-/** Builds an optimistic reportAction for the invite message */
-function buildOptimisticInviteReportAction(invitedUserDisplayName: string, invitedUserID: number): OptimisticInviteReportAction {
-    const text = `${Localize.translateLocal('workspace.invite.invited')} ${invitedUserDisplayName}`;
-    const commentText = getParsedComment(text);
-    const parser = new ExpensiMark();
-    const currentUser = allPersonalDetails?.[currentUserAccountID ?? -1];
-
-    return {
-        reportActionID: NumberUtils.rand64(),
-        actionName: CONST.REPORT.ACTIONS.TYPE.ROOM_CHANGE_LOG.INVITE_TO_ROOM,
-        actorAccountID: currentUserAccountID,
-        person: [
-            {
-                style: 'strong',
-                text: currentUser?.displayName ?? currentUserEmail,
-                type: 'TEXT',
-            },
-        ],
-        automatic: false,
-        avatar: currentUser?.avatar ?? UserUtils.getDefaultAvatarURL(currentUserAccountID),
-        created: DateUtils.getDBTime(),
-        message: [
-            {
-                type: CONST.REPORT.MESSAGE.TYPE.COMMENT,
-                html: commentText,
-                text: parser.htmlToText(commentText),
-            },
-        ],
-        originalMessage: {
-            targetAccountIDs: [invitedUserID],
-        },
-        isFirstItem: false,
-        pendingAction: CONST.RED_BRICK_ROAD_PENDING_ACTION.ADD,
-        shouldShow: true,
-        isOptimisticAction: true,
-    };
+    return Parser.htmlToText(policy.description);
 }
 
 function buildOptimisticAddCommentReportAction(
@@ -3402,27 +4076,15 @@ function buildOptimisticAddCommentReportAction(
     shouldEscapeText?: boolean,
     reportID?: string,
 ): OptimisticReportAction {
-    const parser = new ExpensiMark();
     const commentText = getParsedComment(text ?? '', {shouldEscapeText, reportID});
-    const isAttachmentOnly = file && !text;
-    const isTextOnly = text && !file;
-
-    let htmlForNewComment;
-    let textForNewComment;
-    if (isAttachmentOnly) {
-        htmlForNewComment = CONST.ATTACHMENT_UPLOADING_MESSAGE_HTML;
-        textForNewComment = CONST.ATTACHMENT_UPLOADING_MESSAGE_HTML;
-    } else if (isTextOnly) {
-        htmlForNewComment = commentText;
-        textForNewComment = parser.htmlToText(htmlForNewComment);
-    } else {
-        htmlForNewComment = `${commentText}\n${CONST.ATTACHMENT_UPLOADING_MESSAGE_HTML}`;
-        textForNewComment = `${parser.htmlToText(commentText)}\n${CONST.ATTACHMENT_UPLOADING_MESSAGE_HTML}`;
-    }
+    const attachmentHtml = getUploadingAttachmentHtml(file);
+
+    const htmlForNewComment = `${commentText}${commentText && attachmentHtml ? '<br /><br />' : ''}${attachmentHtml}`;
+    const textForNewComment = Parser.htmlToText(htmlForNewComment);
 
-    const isAttachment = !text && file !== undefined;
-    const attachmentInfo = file ?? {};
-    const accountID = actorAccountID ?? currentUserAccountID;
+    const isAttachmentOnly = file && !text;
+    const isAttachmentWithText = !!text && file !== undefined;
+    const accountID = actorAccountID ?? currentUserAccountID ?? -1;
 
     // Remove HTML from text when applying optimistic offline comment
     return {
@@ -3434,12 +4096,12 @@ function buildOptimisticAddCommentReportAction(
             person: [
                 {
                     style: 'strong',
-                    text: allPersonalDetails?.[accountID ?? -1]?.displayName ?? currentUserEmail,
+                    text: allPersonalDetails?.[accountID]?.displayName ?? currentUserEmail,
                     type: 'TEXT',
                 },
             ],
             automatic: false,
-            avatar: allPersonalDetails?.[accountID ?? -1]?.avatar ?? UserUtils.getDefaultAvatarURL(accountID),
+            avatar: allPersonalDetails?.[accountID]?.avatar,
             created: DateUtils.getDBTimeWithSkew(Date.now() + createdOffset),
             message: [
                 {
@@ -3449,9 +4111,13 @@ function buildOptimisticAddCommentReportAction(
                     text: textForNewComment,
                 },
             ],
+            originalMessage: {
+                html: htmlForNewComment,
+                whisperedTo: [],
+            },
             isFirstItem: false,
-            isAttachment,
-            attachmentInfo,
+            isAttachmentOnly,
+            isAttachmentWithText,
             pendingAction: CONST.RED_BRICK_ROAD_PENDING_ACTION.ADD,
             shouldShow: true,
             isOptimisticAction: true,
@@ -3520,15 +4186,18 @@ function buildOptimisticTaskCommentReportAction(
     createdOffset = 0,
 ): OptimisticReportAction {
     const reportAction = buildOptimisticAddCommentReportAction(text, undefined, undefined, createdOffset, undefined, taskReportID);
-    if (reportAction.reportAction.message?.[0]) {
+    if (Array.isArray(reportAction.reportAction.message) && reportAction.reportAction.message?.[0]) {
         reportAction.reportAction.message[0].taskReportID = taskReportID;
+    } else if (!Array.isArray(reportAction.reportAction.message) && reportAction.reportAction.message) {
+        reportAction.reportAction.message.taskReportID = taskReportID;
     }
 
     // These parameters are not saved on the reportAction, but are used to display the task in the UI
     // Added when we fetch the reportActions on a report
     reportAction.reportAction.originalMessage = {
-        html: reportAction.reportAction.message?.[0]?.html,
-        taskReportID: reportAction.reportAction.message?.[0]?.taskReportID,
+        html: ReportActionsUtils.getReportActionHtml(reportAction.reportAction),
+        taskReportID: ReportActionsUtils.getReportActionMessage(reportAction.reportAction)?.taskReportID,
+        whisperedTo: [],
     };
     reportAction.reportAction.childReportID = taskReportID;
     reportAction.reportAction.parentReportID = parentReportID;
@@ -3560,9 +4229,13 @@ function buildOptimisticIOUReport(payeeAccountID: number, payerAccountID: number
     const formattedTotal = CurrencyUtils.convertToDisplayString(total, currency);
     const personalDetails = getPersonalDetailsForAccountID(payerAccountID);
     const payerEmail = 'login' in personalDetails ? personalDetails.login : '';
+    const policyID = getReport(chatReportID)?.policyID ?? '-1';
+    const policy = getPolicy(policyID);
 
-    // When creating a report the participantsAccountIDs and visibleChatMemberAccountIDs are the same
-    const participantsAccountIDs = [payeeAccountID, payerAccountID];
+    const participants: Participants = {
+        [payeeAccountID]: {hidden: true},
+        [payerAccountID]: {hidden: true},
+    };
 
     return {
         type: CONST.REPORT.TYPE.IOU,
@@ -3571,8 +4244,7 @@ function buildOptimisticIOUReport(payeeAccountID: number, payerAccountID: number
         currency,
         managerID: payerAccountID,
         ownerAccountID: payeeAccountID,
-        participantAccountIDs: participantsAccountIDs,
-        visibleChatMemberAccountIDs: participantsAccountIDs,
+        participants,
         reportID: generateReportID(),
         stateNum: isSendingMoney ? CONST.REPORT.STATE_NUM.APPROVED : CONST.REPORT.STATE_NUM.SUBMITTED,
         statusNum: isSendingMoney ? CONST.REPORT.STATUS_NUM.REIMBURSED : CONST.REPORT.STATE_NUM.SUBMITTED,
@@ -3583,6 +4255,7 @@ function buildOptimisticIOUReport(payeeAccountID: number, payerAccountID: number
         notificationPreference: CONST.REPORT.NOTIFICATION_PREFERENCE.HIDDEN,
         parentReportID: chatReportID,
         lastVisibleActionCreated: DateUtils.getDBTime(),
+        fieldList: policy?.fieldList,
     };
 }
 
@@ -3598,7 +4271,7 @@ function getHumanReadableStatus(statusNum: number): string {
  * If after all replacements the formula is empty, the original formula is returned.
  * See {@link https://help.expensify.com/articles/expensify-classic/insights-and-custom-reporting/Custom-Templates}
  */
-function populateOptimisticReportFormula(formula: string, report: OptimisticExpenseReport, policy: Policy | EmptyObject): string {
+function populateOptimisticReportFormula(formula: string, report: OptimisticExpenseReport, policy: OnyxEntry<Policy>): string {
     const createdDate = report.lastVisibleActionCreated ? new Date(report.lastVisibleActionCreated) : undefined;
     const result = formula
         // We don't translate because the server response is always in English
@@ -3606,7 +4279,7 @@ function populateOptimisticReportFormula(formula: string, report: OptimisticExpe
         .replaceAll('{report:startdate}', createdDate ? format(createdDate, CONST.DATE.FNS_FORMAT_STRING) : '')
         .replaceAll('{report:total}', report.total !== undefined ? CurrencyUtils.convertToDisplayString(Math.abs(report.total), report.currency).toString() : '')
         .replaceAll('{report:currency}', report.currency ?? '')
-        .replaceAll('{report:policyname}', policy.name ?? '')
+        .replaceAll('{report:policyname}', policy?.name ?? '')
         .replaceAll('{report:created}', createdDate ? format(createdDate, CONST.DATE.FNS_DATE_TIME_FORMAT_STRING) : '')
         .replaceAll('{report:created:yyyy-MM-dd}', createdDate ? format(createdDate, CONST.DATE.FNS_FORMAT_STRING) : '')
         .replaceAll('{report:status}', report.statusNum !== undefined ? getHumanReadableStatus(report.statusNum) : '')
@@ -3649,11 +4322,20 @@ function buildOptimisticInvoiceReport(chatReportID: string, policyID: string, re
  * @param total - Amount in cents
  * @param currency
  * @param reimbursable – Whether the expense is reimbursable
+ * @param parentReportActionID – The parent ReportActionID of the PolicyExpenseChat
  */
-function buildOptimisticExpenseReport(chatReportID: string, policyID: string, payeeAccountID: number, total: number, currency: string, reimbursable = true): OptimisticExpenseReport {
+function buildOptimisticExpenseReport(
+    chatReportID: string,
+    policyID: string,
+    payeeAccountID: number,
+    total: number,
+    currency: string,
+    reimbursable = true,
+    parentReportActionID?: string,
+): OptimisticExpenseReport {
     // The amount for Expense reports are stored as negative value in the database
     const storedTotal = total * -1;
-    const policyName = getPolicyName(allReports?.[`${ONYXKEYS.COLLECTION.REPORT}${chatReportID}`]);
+    const policyName = getPolicyName(ReportConnection.getAllReports()?.[`${ONYXKEYS.COLLECTION.REPORT}${chatReportID}`]);
     const formattedTotal = CurrencyUtils.convertToDisplayString(storedTotal, currency);
     const policy = getPolicy(policyID);
 
@@ -3678,6 +4360,7 @@ function buildOptimisticExpenseReport(chatReportID: string, policyID: string, pa
         notificationPreference: CONST.REPORT.NOTIFICATION_PREFERENCE.HIDDEN,
         parentReportID: chatReportID,
         lastVisibleActionCreated: DateUtils.getDBTime(),
+        parentReportActionID,
     };
 
     // Get the approver/manager for this report to properly display the optimistic data
@@ -3687,84 +4370,40 @@ function buildOptimisticExpenseReport(chatReportID: string, policyID: string, pa
     }
 
     const titleReportField = getTitleReportField(getReportFieldsByPolicyID(policyID) ?? {});
-    if (!!titleReportField && reportFieldsEnabled(expenseReport)) {
+    if (!!titleReportField && isPaidGroupPolicyExpenseReport(expenseReport)) {
         expenseReport.reportName = populateOptimisticReportFormula(titleReportField.defaultValue, expenseReport, policy);
     }
 
+    expenseReport.fieldList = policy?.fieldList;
+
     return expenseReport;
 }
 
-function getIOUSubmittedMessage(report: OnyxEntry<Report>) {
-    const policy = getPolicy(report?.policyID);
+function getFormattedAmount(reportAction: ReportAction) {
+    if (!ReportActionsUtils.isSubmittedAction(reportAction) && !ReportActionsUtils.isForwardedAction(reportAction) && !ReportActionsUtils.isApprovedAction(reportAction)) {
+        return '';
+    }
+    const originalMessage = ReportActionsUtils.getOriginalMessage(reportAction);
+    const formattedAmount = CurrencyUtils.convertToDisplayString(Math.abs(originalMessage?.amount ?? 0), originalMessage?.currency);
+    return formattedAmount;
+}
 
-    if (report?.ownerAccountID !== currentUserAccountID && policy.role === CONST.POLICY.ROLE.ADMIN) {
-        const ownerPersonalDetail = getPersonalDetailsForAccountID(report?.ownerAccountID ?? 0);
-        const ownerDisplayName = `${ownerPersonalDetail.displayName ?? ''}${ownerPersonalDetail.displayName !== ownerPersonalDetail.login ? ` (${ownerPersonalDetail.login})` : ''}`;
+function getIOUSubmittedMessage(reportAction: ReportAction) {
+    return Localize.translateLocal('iou.submittedAmount', {formattedAmount: getFormattedAmount(reportAction)});
+}
 
-        return [
-            {
-                style: 'normal',
-                text: 'You (on behalf of ',
-                type: CONST.REPORT.MESSAGE.TYPE.TEXT,
-            },
-            {
-                style: 'strong',
-                text: ownerDisplayName,
-                type: CONST.REPORT.MESSAGE.TYPE.TEXT,
-            },
-            {
-                style: 'normal',
-                text: ' via admin-submit)',
-                type: CONST.REPORT.MESSAGE.TYPE.TEXT,
-            },
-            {
-                style: 'normal',
-                text: ' submitted this report',
-                type: CONST.REPORT.MESSAGE.TYPE.TEXT,
-            },
-            {
-                style: 'normal',
-                text: ' to ',
-                type: CONST.REPORT.MESSAGE.TYPE.TEXT,
-            },
-            {
-                style: 'strong',
-                text: 'you',
-                type: CONST.REPORT.MESSAGE.TYPE.TEXT,
-            },
-        ];
-    }
+function getIOUApprovedMessage(reportAction: ReportAction) {
+    return Localize.translateLocal('iou.approvedAmount', {amount: getFormattedAmount(reportAction)});
+}
 
-    const submittedToPersonalDetail = getPersonalDetailsForAccountID(policy?.submitsTo ?? 0);
-    let submittedToDisplayName = `${submittedToPersonalDetail.displayName ?? ''}${
-        submittedToPersonalDetail.displayName !== submittedToPersonalDetail.login ? ` (${submittedToPersonalDetail.login})` : ''
-    }`;
-    if (submittedToPersonalDetail?.accountID === currentUserAccountID) {
-        submittedToDisplayName = 'yourself';
-    }
+function getIOUForwardedMessage(reportAction: ReportAction) {
+    return Localize.translateLocal('iou.forwardedAmount', {amount: getFormattedAmount(reportAction)});
+}
 
-    return [
-        {
-            type: CONST.REPORT.MESSAGE.TYPE.TEXT,
-            style: 'strong',
-            text: 'You',
-        },
-        {
-            type: CONST.REPORT.MESSAGE.TYPE.TEXT,
-            style: 'normal',
-            text: ' submitted this report',
-        },
-        {
-            type: CONST.REPORT.MESSAGE.TYPE.TEXT,
-            style: 'normal',
-            text: ' to ',
-        },
-        {
-            type: CONST.REPORT.MESSAGE.TYPE.TEXT,
-            style: 'strong',
-            text: submittedToDisplayName,
-        },
-    ];
+function getWorkspaceNameUpdatedMessage(action: ReportAction) {
+    const {oldName, newName} = ReportActionsUtils.getOriginalMessage(action as ReportAction<typeof CONST.REPORT.ACTIONS.TYPE.POLICY_CHANGE_LOG.UPDATE_NAME>) ?? {};
+    const message = oldName && newName ? Localize.translateLocal('workspaceActions.renamedWorkspaceNameAction', {oldName, newName}) : ReportActionsUtils.getReportActionText(action);
+    return message;
 }
 
 /**
@@ -3777,15 +4416,10 @@ function getIOUSubmittedMessage(report: OnyxEntry<Report>) {
  * @param isSettlingUp - Whether we are settling up an IOU
  */
 function getIOUReportActionMessage(iouReportID: string, type: string, total: number, comment: string, currency: string, paymentType = '', isSettlingUp = false): Message[] {
-    const report = getReport(iouReportID);
-
-    if (type === CONST.REPORT.ACTIONS.TYPE.SUBMITTED) {
-        return getIOUSubmittedMessage(!isEmptyObject(report) ? report : null);
-    }
-
+    const report = getReportOrDraftReport(iouReportID);
     const amount =
-        type === CONST.IOU.REPORT_ACTION_TYPE.PAY
-            ? CurrencyUtils.convertToDisplayString(getMoneyRequestSpendBreakdown(!isEmptyObject(report) ? report : null).totalDisplaySpend, currency)
+        type === CONST.IOU.REPORT_ACTION_TYPE.PAY && !isEmptyObject(report)
+            ? CurrencyUtils.convertToDisplayString(getMoneyRequestSpendBreakdown(report).totalDisplaySpend, currency)
             : CurrencyUtils.convertToDisplayString(total, currency);
 
     let paymentMethodMessage;
@@ -3804,6 +4438,12 @@ function getIOUReportActionMessage(iouReportID: string, type: string, total: num
         case CONST.REPORT.ACTIONS.TYPE.APPROVED:
             iouMessage = `approved ${amount}`;
             break;
+        case CONST.REPORT.ACTIONS.TYPE.FORWARDED:
+            iouMessage = Localize.translateLocal('iou.forwardedAmount', {amount});
+            break;
+        case CONST.REPORT.ACTIONS.TYPE.UNAPPROVED:
+            iouMessage = `unapproved ${amount}`;
+            break;
         case CONST.IOU.REPORT_ACTION_TYPE.CREATE:
             iouMessage = `submitted ${amount}${comment && ` for ${comment}`}`;
             break;
@@ -3819,6 +4459,9 @@ function getIOUReportActionMessage(iouReportID: string, type: string, total: num
         case CONST.IOU.REPORT_ACTION_TYPE.PAY:
             iouMessage = isSettlingUp ? `paid ${amount}${paymentMethodMessage}` : `sent ${amount}${comment && ` for ${comment}`}${paymentMethodMessage}`;
             break;
+        case CONST.REPORT.ACTIONS.TYPE.SUBMITTED:
+            iouMessage = Localize.translateLocal('iou.submittedAmount', {formattedAmount: amount});
+            break;
         default:
             break;
     }
@@ -3860,14 +4503,13 @@ function buildOptimisticIOUReportAction(
     iouReportID = '',
     isSettlingUp = false,
     isSendMoneyFlow = false,
-    receipt: Receipt = {},
     isOwnPolicyExpenseChat = false,
     created = DateUtils.getDBTime(),
-    linkedExpenseReportAction: ReportAction | EmptyObject = {},
+    linkedExpenseReportAction?: OnyxEntry<ReportAction>,
 ): OptimisticIOUReportAction {
     const IOUReportID = iouReportID || generateReportID();
 
-    const originalMessage: IOUMessage = {
+    const originalMessage: ReportAction<typeof CONST.REPORT.ACTIONS.TYPE.IOU>['originalMessage'] = {
         amount,
         comment,
         currency,
@@ -3912,8 +4554,8 @@ function buildOptimisticIOUReportAction(
         actionName: CONST.REPORT.ACTIONS.TYPE.IOU,
         actorAccountID: currentUserAccountID,
         automatic: false,
-        avatar: getCurrentUserAvatarOrDefault(),
-        isAttachment: false,
+        avatar: getCurrentUserAvatar(),
+        isAttachmentOnly: false,
         originalMessage,
         message: getIOUReportActionMessage(iouReportID, type, amount, comment, currency, paymentType, isSettlingUp),
         person: [
@@ -3927,7 +4569,6 @@ function buildOptimisticIOUReportAction(
         shouldShow: true,
         created,
         pendingAction: CONST.RED_BRICK_ROAD_PENDING_ACTION.ADD,
-        whisperedToAccountIDs: [CONST.IOU.RECEIPT_STATE.SCANREADY, CONST.IOU.RECEIPT_STATE.SCANNING].some((value) => value === receipt?.state) ? [currentUserAccountID ?? -1] : [],
     };
 }
 
@@ -3945,8 +4586,8 @@ function buildOptimisticApprovedReportAction(amount: number, currency: string, e
         actionName: CONST.REPORT.ACTIONS.TYPE.APPROVED,
         actorAccountID: currentUserAccountID,
         automatic: false,
-        avatar: getCurrentUserAvatarOrDefault(),
-        isAttachment: false,
+        avatar: getCurrentUserAvatar(),
+        isAttachmentOnly: false,
         originalMessage,
         message: getIOUReportActionMessage(expenseReportID, CONST.REPORT.ACTIONS.TYPE.APPROVED, Math.abs(amount), '', currency),
         person: [
@@ -3963,6 +4604,36 @@ function buildOptimisticApprovedReportAction(amount: number, currency: string, e
     };
 }
 
+/**
+ * Builds an optimistic APPROVED report action with a randomly generated reportActionID.
+ */
+function buildOptimisticUnapprovedReportAction(amount: number, currency: string, expenseReportID: string): OptimisticUnapprovedReportAction {
+    return {
+        actionName: CONST.REPORT.ACTIONS.TYPE.UNAPPROVED,
+        actorAccountID: currentUserAccountID,
+        automatic: false,
+        avatar: getCurrentUserAvatar(),
+        isAttachmentOnly: false,
+        originalMessage: {
+            amount,
+            currency,
+            expenseReportID,
+        },
+        message: getIOUReportActionMessage(expenseReportID, CONST.REPORT.ACTIONS.TYPE.UNAPPROVED, Math.abs(amount), '', currency),
+        person: [
+            {
+                style: 'strong',
+                text: getCurrentUserDisplayNameOrEmail(),
+                type: 'TEXT',
+            },
+        ],
+        reportActionID: NumberUtils.rand64(),
+        shouldShow: true,
+        created: DateUtils.getDBTime(),
+        pendingAction: CONST.RED_BRICK_ROAD_PENDING_ACTION.ADD,
+    };
+}
+
 /**
  * Builds an optimistic MOVED report action with a randomly generated reportActionID.
  * This action is used when we move reports across workspaces.
@@ -3987,8 +4658,8 @@ function buildOptimisticMovedReportAction(fromPolicyID: string, toPolicyID: stri
         actionName: CONST.REPORT.ACTIONS.TYPE.MOVED,
         actorAccountID: currentUserAccountID,
         automatic: false,
-        avatar: getCurrentUserAvatarOrDefault(),
-        isAttachment: false,
+        avatar: getCurrentUserAvatar(),
+        isAttachmentOnly: false,
         originalMessage,
         message: movedActionMessage,
         person: [
@@ -4021,8 +4692,8 @@ function buildOptimisticSubmittedReportAction(amount: number, currency: string,
         actorAccountID: currentUserAccountID,
         adminAccountID,
         automatic: false,
-        avatar: getCurrentUserAvatarOrDefault(),
-        isAttachment: false,
+        avatar: getCurrentUserAvatar(),
+        isAttachmentOnly: false,
         originalMessage,
         message: getIOUReportActionMessage(expenseReportID, CONST.REPORT.ACTIONS.TYPE.SUBMITTED, Math.abs(amount), '', currency),
         person: [
@@ -4046,14 +4717,21 @@ function buildOptimisticSubmittedReportAction(amount: number, currency: string,
  * @param iouReport
  * @param [comment] - User comment for the IOU.
  * @param [transaction] - optimistic first transaction of preview
+ * @param reportActionID
  */
-function buildOptimisticReportPreview(chatReport: OnyxEntry<Report>, iouReport: Report, comment = '', transaction: OnyxEntry<Transaction> = null, childReportID?: string): ReportAction {
+function buildOptimisticReportPreview(
+    chatReport: OnyxInputOrEntry<Report>,
+    iouReport: Report,
+    comment = '',
+    transaction: OnyxInputOrEntry<Transaction> = null,
+    childReportID?: string,
+    reportActionID?: string,
+): ReportAction<typeof CONST.REPORT.ACTIONS.TYPE.REPORT_PREVIEW> {
     const hasReceipt = TransactionUtils.hasReceipt(transaction);
-    const isReceiptBeingScanned = hasReceipt && TransactionUtils.isReceiptBeingScanned(transaction);
     const message = getReportPreviewMessage(iouReport);
     const created = DateUtils.getDBTime();
     return {
-        reportActionID: NumberUtils.rand64(),
+        reportActionID: reportActionID ?? NumberUtils.rand64(),
         reportID: chatReport?.reportID,
         actionName: CONST.REPORT.ACTIONS.TYPE.REPORT_PREVIEW,
         pendingAction: CONST.RED_BRICK_ROAD_PENDING_ACTION.ADD,
@@ -4069,14 +4747,51 @@ function buildOptimisticReportPreview(chatReport: OnyxEntry<Report>, iouReport:
             },
         ],
         created,
-        accountID: iouReport?.managerID ?? 0,
+        accountID: iouReport?.managerID ?? -1,
         // The preview is initially whispered if created with a receipt, so the actor is the current user as well
-        actorAccountID: hasReceipt ? currentUserAccountID : iouReport?.managerID ?? 0,
+        actorAccountID: hasReceipt ? currentUserAccountID : iouReport?.managerID ?? -1,
         childReportID: childReportID ?? iouReport?.reportID,
         childMoneyRequestCount: 1,
         childLastMoneyRequestComment: comment,
-        childRecentReceiptTransactionIDs: hasReceipt && !isEmptyObject(transaction) ? {[transaction?.transactionID ?? '']: created} : undefined,
-        whisperedToAccountIDs: isReceiptBeingScanned ? [currentUserAccountID ?? -1] : [],
+        childRecentReceiptTransactionIDs: hasReceipt && !isEmptyObject(transaction) ? {[transaction?.transactionID ?? '-1']: created} : undefined,
+    };
+}
+
+/**
+ * Builds an optimistic ACTIONABLETRACKEXPENSEWHISPER action with a randomly generated reportActionID.
+ */
+function buildOptimisticActionableTrackExpenseWhisper(iouAction: OptimisticIOUReportAction, transactionID: string): ReportAction {
+    const currentTime = DateUtils.getDBTime();
+    const targetEmail = CONST.EMAIL.CONCIERGE;
+    const actorAccountID = PersonalDetailsUtils.getAccountIDsByLogins([targetEmail])[0];
+    const reportActionID = NumberUtils.rand64();
+    return {
+        actionName: CONST.REPORT.ACTIONS.TYPE.ACTIONABLE_TRACK_EXPENSE_WHISPER,
+        actorAccountID,
+        avatar: UserUtils.getDefaultAvatarURL(actorAccountID),
+        created: DateUtils.addMillisecondsFromDateTime(currentTime, 1),
+        lastModified: DateUtils.addMillisecondsFromDateTime(currentTime, 1),
+        message: [
+            {
+                html: CONST.ACTIONABLE_TRACK_EXPENSE_WHISPER_MESSAGE,
+                text: CONST.ACTIONABLE_TRACK_EXPENSE_WHISPER_MESSAGE,
+                whisperedTo: [],
+                type: CONST.REPORT.MESSAGE.TYPE.COMMENT,
+            },
+        ],
+        originalMessage: {
+            lastModified: DateUtils.addMillisecondsFromDateTime(currentTime, 1),
+            transactionID,
+        },
+        person: [
+            {
+                text: CONST.DISPLAY_NAME.EXPENSIFY_CONCIERGE,
+                type: 'TEXT',
+            },
+        ],
+        reportActionID,
+        shouldShow: true,
+        pendingAction: CONST.RED_BRICK_ROAD_PENDING_ACTION.ADD,
     };
 }
 
@@ -4084,20 +4799,20 @@ function buildOptimisticReportPreview(chatReport: OnyxEntry<Report>, iouReport:
  * Builds an optimistic modified expense action with a randomly generated reportActionID.
  */
 function buildOptimisticModifiedExpenseReportAction(
-    transactionThread: OnyxEntry<Report>,
-    oldTransaction: OnyxEntry<Transaction>,
+    transactionThread: OnyxInputOrEntry<Report>,
+    oldTransaction: OnyxInputOrEntry<Transaction>,
     transactionChanges: TransactionChanges,
     isFromExpenseReport: boolean,
-    policy: OnyxEntry<Policy>,
+    policy: OnyxInputOrEntry<Policy>,
 ): OptimisticModifiedExpenseReportAction {
     const originalMessage = getModifiedExpenseOriginalMessage(oldTransaction, transactionChanges, isFromExpenseReport, policy);
     return {
         actionName: CONST.REPORT.ACTIONS.TYPE.MODIFIED_EXPENSE,
         actorAccountID: currentUserAccountID,
         automatic: false,
-        avatar: getCurrentUserAvatarOrDefault(),
+        avatar: getCurrentUserAvatar(),
         created: DateUtils.getDBTime(),
-        isAttachment: false,
+        isAttachmentOnly: false,
         message: [
             {
                 // Currently we are composing the message from the originalMessage and message is only used in OldDot and not in the App
@@ -4131,9 +4846,9 @@ function buildOptimisticMovedTrackedExpenseModifiedReportAction(transactionThrea
         actionName: CONST.REPORT.ACTIONS.TYPE.MODIFIED_EXPENSE,
         actorAccountID: currentUserAccountID,
         automatic: false,
-        avatar: getCurrentUserAvatarOrDefault(),
+        avatar: getCurrentUserAvatar(),
         created: DateUtils.getDBTime(),
-        isAttachment: false,
+        isAttachmentOnly: false,
         message: [
             {
                 // Currently we are composing the message from the originalMessage and message is only used in OldDot and not in the App
@@ -4166,7 +4881,13 @@ function buildOptimisticMovedTrackedExpenseModifiedReportAction(transactionThrea
  * @param [transaction] - optimistic newest transaction of a report preview
  *
  */
-function updateReportPreview(iouReport: OnyxEntry<Report>, reportPreviewAction: ReportAction, isPayRequest = false, comment = '', transaction: OnyxEntry<Transaction> = null): ReportAction {
+function updateReportPreview(
+    iouReport: OnyxEntry<Report>,
+    reportPreviewAction: ReportAction<typeof CONST.REPORT.ACTIONS.TYPE.REPORT_PREVIEW>,
+    isPayRequest = false,
+    comment = '',
+    transaction?: OnyxEntry<Transaction>,
+): ReportAction<typeof CONST.REPORT.ACTIONS.TYPE.REPORT_PREVIEW> {
     const hasReceipt = TransactionUtils.hasReceipt(transaction);
     const recentReceiptTransactions = reportPreviewAction?.childRecentReceiptTransactionIDs ?? {};
     const transactionsToKeep = TransactionUtils.getRecentTransactions(recentReceiptTransactions);
@@ -4182,6 +4903,7 @@ function updateReportPreview(iouReport: OnyxEntry<Report>, reportPreviewAction:
     }
 
     const message = getReportPreviewMessage(iouReport, reportPreviewAction);
+    const originalMessage = ReportActionsUtils.getOriginalMessage(reportPreviewAction);
     return {
         ...reportPreviewAction,
         message: [
@@ -4202,13 +4924,17 @@ function updateReportPreview(iouReport: OnyxEntry<Report>, reportPreviewAction:
             : recentReceiptTransactions,
         // As soon as we add a transaction without a receipt to the report, it will have ready expenses,
         // so we remove the whisper
-        whisperedToAccountIDs: hasReceipt ? reportPreviewAction?.whisperedToAccountIDs : [],
+        originalMessage: {
+            ...(originalMessage ?? {}),
+            whisperedTo: hasReceipt ? originalMessage?.whisperedTo : [],
+            linkedReportID: originalMessage?.linkedReportID ?? '0',
+        },
     };
 }
 
 function buildOptimisticTaskReportAction(
     taskReportID: string,
-    actionName: OriginalMessageActionName,
+    actionName: typeof CONST.REPORT.ACTIONS.TYPE.TASK_COMPLETED | typeof CONST.REPORT.ACTIONS.TYPE.TASK_REOPENED | typeof CONST.REPORT.ACTIONS.TYPE.TASK_CANCELLED,
     message = '',
     actorAccountID = currentUserAccountID,
     createdOffset = 0,
@@ -4217,13 +4943,15 @@ function buildOptimisticTaskReportAction(
         taskReportID,
         type: actionName,
         text: message,
+        html: message,
+        whisperedTo: [],
     };
     return {
         actionName,
         actorAccountID,
         automatic: false,
-        avatar: getCurrentUserAvatarOrDefault(),
-        isAttachment: false,
+        avatar: getCurrentUserAvatar(),
+        isAttachmentOnly: false,
         originalMessage,
         message: [
             {
@@ -4253,23 +4981,24 @@ function buildOptimisticTaskReportAction(
 function buildOptimisticChatReport(
     participantList: number[],
     reportName: string = CONST.REPORT.DEFAULT_REPORT_NAME,
-    chatType: ValueOf<typeof CONST.REPORT.CHAT_TYPE> | undefined = undefined,
+    chatType?: ValueOf<typeof CONST.REPORT.CHAT_TYPE>,
     policyID: string = CONST.POLICY.OWNER_EMAIL_FAKE,
     ownerAccountID: number = CONST.REPORT.OWNER_ACCOUNT_ID_FAKE,
     isOwnPolicyExpenseChat = false,
     oldPolicyName = '',
-    visibility: ValueOf<typeof CONST.REPORT.VISIBILITY> | undefined = undefined,
-    writeCapability: ValueOf<typeof CONST.REPORT.WRITE_CAPABILITIES> | undefined = undefined,
+    visibility?: ValueOf<typeof CONST.REPORT.VISIBILITY>,
+    writeCapability?: ValueOf<typeof CONST.REPORT.WRITE_CAPABILITIES>,
     notificationPreference: NotificationPreference = CONST.REPORT.NOTIFICATION_PREFERENCE.ALWAYS,
     parentReportActionID = '',
     parentReportID = '',
     description = '',
     avatarUrl = '',
     optimisticReportID = '',
+    shouldShowParticipants = true,
 ): OptimisticChatReport {
     const participants = participantList.reduce((reportParticipants: Participants, accountID: number) => {
         const participant: ReportParticipant = {
-            hidden: false,
+            hidden: !shouldShowParticipants,
             role: accountID === currentUserAccountID ? CONST.REPORT.ROLE.ADMIN : CONST.REPORT.ROLE.MEMBER,
         };
         // eslint-disable-next-line no-param-reassign
@@ -4283,7 +5012,7 @@ function buildOptimisticChatReport(
         type: CONST.REPORT.TYPE.CHAT,
         chatType,
         isOwnPolicyExpenseChat,
-        isPinned: reportName === CONST.REPORT.WORKSPACE_CHAT_ROOMS.ADMINS || isNewlyCreatedWorkspaceChat,
+        isPinned: isNewlyCreatedWorkspaceChat,
         lastActorAccountID: 0,
         lastMessageTranslationKey: '',
         lastMessageHtml: '',
@@ -4295,10 +5024,6 @@ function buildOptimisticChatReport(
         ownerAccountID: ownerAccountID || CONST.REPORT.OWNER_ACCOUNT_ID_FAKE,
         parentReportActionID,
         parentReportID,
-        // When creating a report the participantsAccountIDs and visibleChatMemberAccountIDs are the same
-        participantAccountIDs: participantList,
-        visibleChatMemberAccountIDs: participantList,
-        // For group chats we need to have participants object as we are migrating away from `participantAccountIDs` and `visibleChatMemberAccountIDs`. See https://github.com/Expensify/App/issues/34692
         participants,
         policyID,
         reportID: optimisticReportID || generateReportID(),
@@ -4322,7 +5047,13 @@ function buildOptimisticChatReport(
     return optimisticChatReport;
 }
 
-function buildOptimisticGroupChatReport(participantAccountIDs: number[], reportName: string, avatarUri: string, optimisticReportID?: string) {
+function buildOptimisticGroupChatReport(
+    participantAccountIDs: number[],
+    reportName: string,
+    avatarUri: string,
+    optimisticReportID?: string,
+    notificationPreference?: NotificationPreference,
+) {
     return buildOptimisticChatReport(
         participantAccountIDs,
         reportName,
@@ -4333,7 +5064,7 @@ function buildOptimisticGroupChatReport(participantAccountIDs: number[], reportN
         undefined,
         undefined,
         undefined,
-        CONST.REPORT.NOTIFICATION_PREFERENCE.HIDDEN,
+        notificationPreference,
         undefined,
         undefined,
         undefined,
@@ -4372,7 +5103,7 @@ function buildOptimisticCreatedReportAction(emailCreatingAction: string, created
             },
         ],
         automatic: false,
-        avatar: getCurrentUserAvatarOrDefault(),
+        avatar: getCurrentUserAvatar(),
         created,
         shouldShow: true,
     };
@@ -4414,12 +5145,44 @@ function buildOptimisticRenamedRoomReportAction(newName: string, oldName: string
             lastModified: now,
         },
         automatic: false,
-        avatar: getCurrentUserAvatarOrDefault(),
+        avatar: getCurrentUserAvatar(),
         created: now,
         shouldShow: true,
     };
 }
 
+/**
+ * Returns the necessary reportAction onyx data to indicate that the room description has been updated
+ */
+function buildOptimisticRoomDescriptionUpdatedReportAction(description: string): OptimisticRoomDescriptionUpdatedReportAction {
+    const now = DateUtils.getDBTime();
+    return {
+        reportActionID: NumberUtils.rand64(),
+        actionName: CONST.REPORT.ACTIONS.TYPE.ROOM_CHANGE_LOG.UPDATE_ROOM_DESCRIPTION,
+        pendingAction: CONST.RED_BRICK_ROAD_PENDING_ACTION.ADD,
+        actorAccountID: currentUserAccountID,
+        message: [
+            {
+                type: CONST.REPORT.MESSAGE.TYPE.COMMENT,
+                text: description ? `set the room description to: ${Parser.htmlToText(description)}` : 'cleared the room description',
+                html: description ? `<muted-text>set the room description to: ${description}</muted-text>` : '<muted-text>cleared the room description</muted-text>',
+            },
+        ],
+        person: [
+            {
+                type: CONST.REPORT.MESSAGE.TYPE.TEXT,
+                style: 'strong',
+                text: getCurrentUserDisplayNameOrEmail(),
+            },
+        ],
+        originalMessage: {
+            description,
+            lastModified: now,
+        },
+        created: now,
+    };
+}
+
 /**
  * Returns the necessary reportAction onyx data to indicate that the transaction has been put on hold optimistically
  * @param [created] - Action created time
@@ -4445,7 +5208,7 @@ function buildOptimisticHoldReportAction(created = DateUtils.getDBTime()): Optim
             },
         ],
         automatic: false,
-        avatar: getCurrentUserAvatarOrDefault(),
+        avatar: getCurrentUserAvatar(),
         created,
         shouldShow: true,
     };
@@ -4463,9 +5226,9 @@ function buildOptimisticHoldReportActionComment(comment: string, created = DateU
         actorAccountID: currentUserAccountID,
         message: [
             {
-                type: CONST.REPORT.MESSAGE.TYPE.TEXT,
-                style: 'normal',
+                type: CONST.REPORT.MESSAGE.TYPE.COMMENT,
                 text: comment,
+                html: comment, // as discussed on https://github.com/Expensify/App/pull/39452 we will not support HTML for now
             },
         ],
         person: [
@@ -4476,7 +5239,7 @@ function buildOptimisticHoldReportActionComment(comment: string, created = DateU
             },
         ],
         automatic: false,
-        avatar: getCurrentUserAvatarOrDefault(),
+        avatar: getCurrentUserAvatar(),
         created,
         shouldShow: true,
     };
@@ -4507,7 +5270,7 @@ function buildOptimisticUnHoldReportAction(created = DateUtils.getDBTime()): Opt
             },
         ],
         automatic: false,
-        avatar: getCurrentUserAvatarOrDefault(),
+        avatar: getCurrentUserAvatar(),
         created,
         shouldShow: true,
     };
@@ -4541,7 +5304,7 @@ function buildOptimisticEditedTaskFieldReportAction({title, description}: Task):
             {
                 type: CONST.REPORT.MESSAGE.TYPE.COMMENT,
                 text: changelog,
-                html: changelog,
+                html: description ? getParsedComment(changelog) : changelog,
             },
         ],
         person: [
@@ -4552,7 +5315,7 @@ function buildOptimisticEditedTaskFieldReportAction({title, description}: Task):
             },
         ],
         automatic: false,
-        avatar: getCurrentUserAvatarOrDefault(),
+        avatar: getCurrentUserAvatar(),
         created: DateUtils.getDBTime(),
         shouldShow: false,
     };
@@ -4568,7 +5331,7 @@ function buildOptimisticChangedTaskAssigneeReportAction(assigneeAccountID: numbe
             {
                 type: CONST.REPORT.MESSAGE.TYPE.COMMENT,
                 text: `assigned to ${getDisplayNameForParticipant(assigneeAccountID)}`,
-                html: `assigned to <mention-user accountID=${assigneeAccountID}></mention-user>`,
+                html: `assigned to <mention-user accountID="${assigneeAccountID}"/>`,
             },
         ],
         person: [
@@ -4579,7 +5342,7 @@ function buildOptimisticChangedTaskAssigneeReportAction(assigneeAccountID: numbe
             },
         ],
         automatic: false,
-        avatar: getCurrentUserAvatarOrDefault(),
+        avatar: getCurrentUserAvatar(),
         created: DateUtils.getDBTime(),
         shouldShow: false,
     };
@@ -4590,12 +5353,16 @@ function buildOptimisticChangedTaskAssigneeReportAction(assigneeAccountID: numbe
  *
  * @param reason - A reason why the chat has been archived
  */
-function buildOptimisticClosedReportAction(emailClosingReport: string, policyName: string, reason: string = CONST.REPORT.ARCHIVE_REASON.DEFAULT): OptimisticClosedReportAction {
+function buildOptimisticClosedReportAction(
+    emailClosingReport: string,
+    policyName: string,
+    reason: ValueOf<typeof CONST.REPORT.ARCHIVE_REASON> = CONST.REPORT.ARCHIVE_REASON.DEFAULT,
+): OptimisticClosedReportAction {
     return {
         actionName: CONST.REPORT.ACTIONS.TYPE.CLOSED,
         actorAccountID: currentUserAccountID,
         automatic: false,
-        avatar: getCurrentUserAvatarOrDefault(),
+        avatar: getCurrentUserAvatar(),
         created: DateUtils.getDBTime(),
         message: [
             {
@@ -4626,7 +5393,40 @@ function buildOptimisticClosedReportAction(emailClosingReport: string, policyNam
     };
 }
 
-function buildOptimisticWorkspaceChats(policyID: string, policyName: string): OptimisticWorkspaceChats {
+/**
+ * Returns an optimistic Dismissed Violation Report Action. Use the originalMessage customize this to the type of
+ * violation being dismissed.
+ */
+function buildOptimisticDismissedViolationReportAction(
+    originalMessage: ReportAction<typeof CONST.REPORT.ACTIONS.TYPE.DISMISSED_VIOLATION>['originalMessage'],
+): OptimisticDismissedViolationReportAction {
+    return {
+        actionName: CONST.REPORT.ACTIONS.TYPE.DISMISSED_VIOLATION,
+        actorAccountID: currentUserAccountID,
+        avatar: getCurrentUserAvatar(),
+        created: DateUtils.getDBTime(),
+        message: [
+            {
+                type: CONST.REPORT.MESSAGE.TYPE.TEXT,
+                style: 'normal',
+                text: ReportActionsUtils.getDismissedViolationMessageText(originalMessage),
+            },
+        ],
+        originalMessage,
+        pendingAction: CONST.RED_BRICK_ROAD_PENDING_ACTION.ADD,
+        person: [
+            {
+                type: CONST.REPORT.MESSAGE.TYPE.TEXT,
+                style: 'strong',
+                text: getCurrentUserDisplayNameOrEmail(),
+            },
+        ],
+        reportActionID: NumberUtils.rand64(),
+        shouldShow: true,
+    };
+}
+
+function buildOptimisticWorkspaceChats(policyID: string, policyName: string, expenseReportId?: string): OptimisticWorkspaceChats {
     const announceChatData = buildOptimisticChatReport(
         currentUserAccountID ? [currentUserAccountID] : [],
         CONST.REPORT.WORKSPACE_CHAT_ROOMS.ANNOUNCE,
@@ -4665,7 +5465,23 @@ function buildOptimisticWorkspaceChats(policyID: string, policyName: string): Op
         [adminsCreatedAction.reportActionID]: adminsCreatedAction,
     };
 
-    const expenseChatData = buildOptimisticChatReport([currentUserAccountID ?? -1], '', CONST.REPORT.CHAT_TYPE.POLICY_EXPENSE_CHAT, policyID, currentUserAccountID, true, policyName);
+    const expenseChatData = buildOptimisticChatReport(
+        [currentUserAccountID ?? -1],
+        '',
+        CONST.REPORT.CHAT_TYPE.POLICY_EXPENSE_CHAT,
+        policyID,
+        currentUserAccountID,
+        true,
+        policyName,
+        undefined,
+        undefined,
+        undefined,
+        undefined,
+        undefined,
+        undefined,
+        undefined,
+        expenseReportId,
+    );
     const expenseChatReportID = expenseChatData.reportID;
     const expenseReportCreatedAction = buildOptimisticCreatedReportAction(currentUserEmail ?? '');
     const expenseReportActionData = {
@@ -4706,18 +5522,24 @@ function buildOptimisticTaskReport(
     title?: string,
     description?: string,
     policyID: string = CONST.POLICY.OWNER_EMAIL_FAKE,
-    notificationPreference: NotificationPreference = CONST.REPORT.NOTIFICATION_PREFERENCE.ALWAYS,
+    notificationPreference: NotificationPreference = CONST.REPORT.NOTIFICATION_PREFERENCE.HIDDEN,
 ): OptimisticTaskReport {
-    // When creating a report the participantsAccountIDs and visibleChatMemberAccountIDs are the same
-    const participantsAccountIDs = assigneeAccountID && assigneeAccountID !== ownerAccountID ? [assigneeAccountID] : [];
+    const participants: Participants = {
+        [ownerAccountID]: {
+            hidden: false,
+        },
+    };
+
+    if (assigneeAccountID) {
+        participants[assigneeAccountID] = {hidden: false};
+    }
 
     return {
         reportID: generateReportID(),
         reportName: title,
-        description,
+        description: getParsedComment(description ?? ''),
         ownerAccountID,
-        participantAccountIDs: participantsAccountIDs,
-        visibleChatMemberAccountIDs: participantsAccountIDs,
+        participants,
         managerID: assigneeAccountID,
         type: CONST.REPORT.TYPE.TASK,
         parentReportID,
@@ -4726,6 +5548,41 @@ function buildOptimisticTaskReport(
         statusNum: CONST.REPORT.STATUS_NUM.OPEN,
         notificationPreference,
         lastVisibleActionCreated: DateUtils.getDBTime(),
+        hasParentAccess: true,
+    };
+}
+
+/**
+ * Builds an optimistic EXPORTED_TO_INTEGRATION report action
+ *
+ * @param integration - The connectionName of the integration
+ * @param markedManually - Whether the integration was marked as manually exported
+ */
+function buildOptimisticExportIntegrationAction(integration: ConnectionName, markedManually = false): OptimisticExportIntegrationAction {
+    const label = CONST.POLICY.CONNECTIONS.NAME_USER_FRIENDLY[integration];
+    return {
+        reportActionID: NumberUtils.rand64(),
+        actionName: CONST.REPORT.ACTIONS.TYPE.EXPORTED_TO_INTEGRATION,
+        pendingAction: CONST.RED_BRICK_ROAD_PENDING_ACTION.ADD,
+        actorAccountID: currentUserAccountID,
+        message: [],
+        person: [
+            {
+                type: CONST.REPORT.MESSAGE.TYPE.TEXT,
+                style: 'strong',
+                text: getCurrentUserDisplayNameOrEmail(),
+            },
+        ],
+        automatic: false,
+        avatar: getCurrentUserAvatar(),
+        created: DateUtils.getDBTime(),
+        shouldShow: true,
+        originalMessage: {
+            label,
+            lastModified: DateUtils.getDBTime(),
+            markedManually,
+            inProgress: true,
+        },
     };
 }
 
@@ -4741,7 +5598,7 @@ function buildTransactionThread(
     existingTransactionThreadReportID?: string,
 ): OptimisticChatReport {
     const participantAccountIDs = [...new Set([currentUserAccountID, Number(reportAction?.actorAccountID)])].filter(Boolean) as number[];
-    const existingTransactionThreadReport = getReport(existingTransactionThreadReportID);
+    const existingTransactionThreadReport = getReportOrDraftReport(existingTransactionThreadReportID);
 
     if (existingTransactionThreadReportID && existingTransactionThreadReport) {
         return {
@@ -4758,7 +5615,7 @@ function buildTransactionThread(
         participantAccountIDs,
         getTransactionReportName(reportAction),
         undefined,
-        moneyRequestReport?.policyID,
+        moneyRequestReport?.policyID ?? '-1',
         CONST.POLICY.OWNER_ACCOUNT_ID_FAKE,
         false,
         '',
@@ -4769,6 +5626,8 @@ function buildTransactionThread(
         moneyRequestReport?.reportID,
         '',
         '',
+        '',
+        false,
     );
 }
 
@@ -4793,12 +5652,11 @@ function buildOptimisticMoneyRequestEntities(
     paymentType?: PaymentMethodType,
     isSettlingUp = false,
     isSendMoneyFlow = false,
-    receipt: Receipt = {},
     isOwnPolicyExpenseChat = false,
     isPersonalTrackingExpense?: boolean,
     existingTransactionThreadReportID?: string,
     linkedTrackedExpenseReportAction?: ReportAction,
-): [OptimisticCreatedReportAction, OptimisticCreatedReportAction, OptimisticIOUReportAction, OptimisticChatReport, OptimisticCreatedReportAction | EmptyObject] {
+): [OptimisticCreatedReportAction, OptimisticCreatedReportAction, OptimisticIOUReportAction, OptimisticChatReport, OptimisticCreatedReportAction | null] {
     const createdActionForChat = buildOptimisticCreatedReportAction(payeeEmail);
 
     // The `CREATED` action must be optimistically generated before the IOU action so that it won't appear after the IOU action in the chat.
@@ -4816,7 +5674,6 @@ function buildOptimisticMoneyRequestEntities(
         isPersonalTrackingExpense ? '0' : iouReport.reportID,
         isSettlingUp,
         isSendMoneyFlow,
-        receipt,
         isOwnPolicyExpenseChat,
         iouActionCreationTime,
         linkedTrackedExpenseReportAction,
@@ -4824,7 +5681,7 @@ function buildOptimisticMoneyRequestEntities(
 
     // Create optimistic transactionThread and the `CREATED` action for it, if existingTransactionThreadReportID is undefined
     const transactionThread = buildTransactionThread(iouAction, iouReport, existingTransactionThreadReportID);
-    const createdActionForTransactionThread = existingTransactionThreadReportID ? {} : buildOptimisticCreatedReportAction(payeeEmail);
+    const createdActionForTransactionThread = existingTransactionThreadReportID ? null : buildOptimisticCreatedReportAction(payeeEmail);
 
     // The IOU action and the transactionThread are co-dependent as parent-child, so we need to link them together
     iouAction.childReportID = existingTransactionThreadReportID ?? transactionThread.reportID;
@@ -4832,11 +5689,28 @@ function buildOptimisticMoneyRequestEntities(
     return [createdActionForChat, createdActionForIOUReport, iouAction, transactionThread, createdActionForTransactionThread];
 }
 
+// Check if the report is empty, meaning it has no visible messages (i.e. only a "created" report action).
+function isEmptyReport(report: OnyxEntry<Report>): boolean {
+    if (!report) {
+        return true;
+    }
+
+    if (report.lastMessageText ?? report.lastMessageTranslationKey) {
+        return false;
+    }
+
+    const lastVisibleMessage = getLastVisibleMessage(report.reportID);
+    return !lastVisibleMessage.lastMessageText && !lastVisibleMessage.lastMessageTranslationKey;
+}
+
 function isUnread(report: OnyxEntry<Report>): boolean {
     if (!report) {
         return false;
     }
 
+    if (isEmptyReport(report) && !isSelfDM(report)) {
+        return false;
+    }
     // lastVisibleActionCreated and lastReadTime are both datetime strings and can be compared directly
     const lastVisibleActionCreated = report.lastVisibleActionCreated ?? '';
     const lastReadTime = report.lastReadTime ?? '';
@@ -4846,8 +5720,8 @@ function isUnread(report: OnyxEntry<Report>): boolean {
     return lastReadTime < lastVisibleActionCreated || lastReadTime < lastMentionedTime;
 }
 
-function isIOUOwnedByCurrentUser(report: OnyxEntry<Report>, allReportsDict: OnyxCollection<Report> = null): boolean {
-    const allAvailableReports = allReportsDict ?? allReports;
+function isIOUOwnedByCurrentUser(report: OnyxEntry<Report>, allReportsDict?: OnyxCollection<Report>): boolean {
+    const allAvailableReports = allReportsDict ?? ReportConnection.getAllReports();
     if (!report || !allAvailableReports) {
         return false;
     }
@@ -4869,7 +5743,7 @@ function isIOUOwnedByCurrentUser(report: OnyxEntry<Report>, allReportsDict: Onyx
  */
 function canSeeDefaultRoom(report: OnyxEntry<Report>, policies: OnyxCollection<Policy>, betas: OnyxEntry<Beta[]>): boolean {
     // Include archived rooms
-    if (isArchivedRoom(report)) {
+    if (isArchivedRoom(report, getReportNameValuePairs(report?.reportID))) {
         return true;
     }
 
@@ -4879,7 +5753,7 @@ function canSeeDefaultRoom(report: OnyxEntry<Report>, policies: OnyxCollection<P
     }
 
     // If the room has an assigned guide, it can be seen.
-    if (hasExpensifyGuidesEmails(report?.participantAccountIDs ?? [])) {
+    if (hasExpensifyGuidesEmails(Object.keys(report?.participants ?? {}).map(Number))) {
         return true;
     }
 
@@ -4905,25 +5779,34 @@ function canAccessReport(report: OnyxEntry<Report>, policies: OnyxCollection<Pol
     return true;
 }
 
+// eslint-disable-next-line rulesdir/no-negated-variables
+function isReportNotFound(report: OnyxEntry<Report>): boolean {
+    return !!report?.errorFields?.notFound;
+}
+
 /**
  * Check if the report is the parent report of the currently viewed report or at least one child report has report action
  */
 function shouldHideReport(report: OnyxEntry<Report>, currentReportId: string): boolean {
-    const currentReport = getReport(currentReportId);
-    const parentReport = getParentReport(!isEmptyObject(currentReport) ? currentReport : null);
+    const currentReport = getReportOrDraftReport(currentReportId);
+    const parentReport = getParentReport(!isEmptyObject(currentReport) ? currentReport : undefined);
     const reportActions = allReportActions?.[`${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${report?.reportID}`] ?? {};
     const isChildReportHasComment = Object.values(reportActions ?? {})?.some((reportAction) => (reportAction?.childVisibleActionCount ?? 0) > 0);
     return parentReport?.reportID !== report?.reportID && !isChildReportHasComment;
 }
 
 /**
- * Checks to see if a report's parentAction is an expense that contains a violation
+ * Checks to see if a report's parentAction is an expense that contains a violation type of either violation or warning
  */
-function doesTransactionThreadHaveViolations(report: OnyxEntry<Report>, transactionViolations: OnyxCollection<TransactionViolation[]>, parentReportAction: OnyxEntry<ReportAction>): boolean {
-    if (parentReportAction?.actionName !== CONST.REPORT.ACTIONS.TYPE.IOU) {
+function doesTransactionThreadHaveViolations(
+    report: OnyxInputOrEntry<Report>,
+    transactionViolations: OnyxCollection<TransactionViolation[]>,
+    parentReportAction: OnyxInputOrEntry<ReportAction>,
+): boolean {
+    if (!ReportActionsUtils.isMoneyRequestAction(parentReportAction)) {
         return false;
     }
-    const {IOUTransactionID, IOUReportID} = parentReportAction.originalMessage ?? {};
+    const {IOUTransactionID, IOUReportID} = ReportActionsUtils.getOriginalMessage(parentReportAction) ?? {};
     if (!IOUTransactionID || !IOUReportID) {
         return false;
     }
@@ -4933,7 +5816,11 @@ function doesTransactionThreadHaveViolations(report: OnyxEntry<Report>, transact
     if (report?.stateNum !== CONST.REPORT.STATE_NUM.OPEN && report?.stateNum !== CONST.REPORT.STATE_NUM.SUBMITTED) {
         return false;
     }
-    return TransactionUtils.hasViolation(IOUTransactionID, transactionViolations);
+    return (
+        TransactionUtils.hasViolation(IOUTransactionID, transactionViolations) ||
+        TransactionUtils.hasWarningTypeViolation(IOUTransactionID, transactionViolations) ||
+        TransactionUtils.hasModifiedAmountOrDateViolation(IOUTransactionID, transactionViolations)
+    );
 }
 
 /**
@@ -4944,8 +5831,11 @@ function shouldDisplayTransactionThreadViolations(
     transactionViolations: OnyxCollection<TransactionViolation[]>,
     parentReportAction: OnyxEntry<ReportAction>,
 ): boolean {
-    const {IOUReportID} = (parentReportAction?.originalMessage as IOUMessage) ?? {};
-    if (isSettled(IOUReportID)) {
+    if (!ReportActionsUtils.isMoneyRequestAction(parentReportAction)) {
+        return false;
+    }
+    const {IOUReportID} = ReportActionsUtils.getOriginalMessage(parentReportAction) ?? {};
+    if (isSettled(IOUReportID) || isReportApproved(IOUReportID?.toString())) {
         return false;
     }
     return doesTransactionThreadHaveViolations(report, transactionViolations, parentReportAction);
@@ -4955,10 +5845,37 @@ function shouldDisplayTransactionThreadViolations(
  * Checks to see if a report contains a violation
  */
 function hasViolations(reportID: string, transactionViolations: OnyxCollection<TransactionViolation[]>): boolean {
-    const transactions = TransactionUtils.getAllReportTransactions(reportID);
+    const transactions = reportsTransactions[reportID] ?? [];
     return transactions.some((transaction) => TransactionUtils.hasViolation(transaction.transactionID, transactionViolations));
 }
 
+/**
+ * Checks to see if a report contains a violation of type `warning`
+ */
+function hasWarningTypeViolations(reportID: string, transactionViolations: OnyxCollection<TransactionViolation[]>): boolean {
+    const transactions = reportsTransactions[reportID] ?? [];
+    return transactions.some((transaction) => TransactionUtils.hasWarningTypeViolation(transaction.transactionID, transactionViolations));
+}
+
+function hasReportViolations(reportID: string) {
+    const reportViolations = allReportsViolations?.[`${ONYXKEYS.COLLECTION.REPORT_VIOLATIONS}${reportID}`];
+    return Object.values(reportViolations ?? {}).some((violations) => !isEmptyObject(violations));
+}
+
+/**
+ * Checks if #admins room chan be shown
+ * We show #admin rooms when a) More than one admin exists or b) There exists policy audit log for review.
+ */
+function shouldAdminsRoomBeVisible(report: OnyxEntry<Report>): boolean {
+    const accountIDs = Object.entries(report?.participants ?? {}).map(([accountID]) => Number(accountID));
+    const adminAccounts = PersonalDetailsUtils.getLoginsByAccountIDs(accountIDs).filter((login) => !PolicyUtils.isExpensifyTeam(login));
+    const lastVisibleAction = ReportActionsUtils.getLastVisibleAction(report?.reportID ?? '');
+    if ((lastVisibleAction ? ReportActionsUtils.isCreatedAction(lastVisibleAction) : report?.lastActionType === CONST.REPORT.ACTIONS.TYPE.CREATED) && adminAccounts.length <= 1) {
+        return false;
+    }
+    return true;
+}
+
 /**
  * Takes several pieces of data from Onyx and evaluates if a report should be shown in the option list (either when searching
  * for reports or the reports shown in the LHN).
@@ -4969,55 +5886,69 @@ function hasViolations(reportID: string, transactionViolations: OnyxCollection<T
 function shouldReportBeInOptionList({
     report,
     currentReportId,
-    isInGSDMode,
+    isInFocusMode,
     betas,
     policies,
     excludeEmptyChats,
     doesReportHaveViolations,
     includeSelfDM = false,
+    login,
+    includeDomainEmail = false,
 }: {
     report: OnyxEntry<Report>;
     currentReportId: string;
-    isInGSDMode: boolean;
+    isInFocusMode: boolean;
     betas: OnyxEntry<Beta[]>;
     policies: OnyxCollection<Policy>;
     excludeEmptyChats: boolean;
     doesReportHaveViolations: boolean;
     includeSelfDM?: boolean;
+    login?: string;
+    includeDomainEmail?: boolean;
 }) {
-    const isInDefaultMode = !isInGSDMode;
+    const isInDefaultMode = !isInFocusMode;
     // Exclude reports that have no data because there wouldn't be anything to show in the option item.
     // This can happen if data is currently loading from the server or a report is in various stages of being created.
     // This can also happen for anyone accessing a public room or archived room for which they don't have access to the underlying policy.
     // Optionally exclude reports that do not belong to currently active workspace
 
+    const parentReportAction = ReportActionsUtils.getParentReportAction(report);
+
     if (
         !report?.reportID ||
         !report?.type ||
         report?.reportName === undefined ||
         // eslint-disable-next-line @typescript-eslint/prefer-nullish-coalescing
         report?.isHidden ||
-        // eslint-disable-next-line @typescript-eslint/prefer-nullish-coalescing
-        report?.participantAccountIDs?.includes(CONST.ACCOUNT_ID.NOTIFICATIONS) ||
-        (report?.participantAccountIDs?.length === 0 &&
+        (!report?.participants &&
+            // We omit sending back participants for chat rooms when searching for reports since they aren't needed to display the results and can get very large.
+            // So we allow showing rooms with no participants–in any other circumstances we should never have these reports with no participants in Onyx.
+            !isChatRoom(report) &&
             !isChatThread(report) &&
-            !isPublicRoom(report) &&
-            !isUserCreatedPolicyRoom(report) &&
-            !isArchivedRoom(report) &&
+            !isArchivedRoom(report, getReportNameValuePairs(report?.reportID)) &&
             !isMoneyRequestReport(report) &&
             !isTaskReport(report) &&
             !isSelfDM(report) &&
-            !isGroupChat(report) &&
-            !isInvoiceRoom(report))
+            !isSystemChat(report) &&
+            !isGroupChat(report))
     ) {
         return false;
     }
+
+    if (report?.participants?.[CONST.ACCOUNT_ID.NOTIFICATIONS] && (!currentUserAccountID || !AccountUtils.isAccountIDOddNumber(currentUserAccountID))) {
+        return false;
+    }
+
     if (!canAccessReport(report, policies, betas)) {
         return false;
     }
 
     // If this is a transaction thread associated with a report that only has one transaction, omit it
-    if (isOneTransactionThread(report.reportID, report.parentReportID ?? '0')) {
+    if (isOneTransactionThread(report.reportID, report.parentReportID ?? '-1', parentReportAction)) {
+        return false;
+    }
+
+    if ((Object.values(CONST.REPORT.UNSUPPORTED_TYPE) as string[]).includes(report?.type ?? '')) {
         return false;
     }
 
@@ -5036,8 +5967,8 @@ function shouldReportBeInOptionList({
     if (hasDraftComment || requiresAttentionFromCurrentUser(report)) {
         return true;
     }
-    const lastVisibleMessage = ReportActionsUtils.getLastVisibleMessage(report.reportID);
-    const isEmptyChat = !report.lastMessageText && !report.lastMessageTranslationKey && !lastVisibleMessage.lastMessageText && !lastVisibleMessage.lastMessageTranslationKey;
+
+    const isEmptyChat = isEmptyReport(report);
     const canHideReport = shouldHideReport(report, currentReportId);
 
     // Include reports if they are pinned
@@ -5057,6 +5988,11 @@ function shouldReportBeInOptionList({
         return false;
     }
 
+    // Show #admins room only when it has some value to the user.
+    if (isAdminRoom(report) && !shouldAdminsRoomBeVisible(report)) {
+        return false;
+    }
+
     // 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?.addWorkspaceRoom) {
@@ -5064,17 +6000,17 @@ function shouldReportBeInOptionList({
     }
 
     // All unread chats (even archived ones) in GSD mode will be shown. This is because GSD mode is specifically for focusing the user on the most relevant chats, primarily, the unread ones
-    if (isInGSDMode) {
+    if (isInFocusMode) {
         return isUnread(report) && report.notificationPreference !== CONST.REPORT.NOTIFICATION_PREFERENCE.MUTE;
     }
 
     // Archived reports should always be shown when in default (most recent) mode. This is because you should still be able to access and search for the chats to find them.
-    if (isInDefaultMode && isArchivedRoom(report)) {
+    if (isInDefaultMode && isArchivedRoom(report, getReportNameValuePairs(report?.reportID))) {
         return true;
     }
 
     // Hide chats between two users that haven't been commented on from the LNH
-    if (excludeEmptyChats && isEmptyChat && isChatReport(report) && !isChatRoom(report) && !isPolicyExpenseChat(report) && canHideReport) {
+    if (excludeEmptyChats && isEmptyChat && isChatReport(report) && !isChatRoom(report) && !isPolicyExpenseChat(report) && !isSystemChat(report) && !isGroupChat(report) && canHideReport) {
         return false;
     }
 
@@ -5082,83 +6018,107 @@ function shouldReportBeInOptionList({
         return includeSelfDM;
     }
 
+    if (Str.isDomainEmail(login ?? '') && !includeDomainEmail) {
+        return false;
+    }
+
+    // Hide chat threads where the parent message is pending removal
+    if (
+        !isEmptyObject(parentReportAction) &&
+        ReportActionsUtils.isPendingRemove(parentReportAction) &&
+        ReportActionsUtils.isThreadParentMessage(parentReportAction, report?.reportID ?? '')
+    ) {
+        return false;
+    }
+
     return true;
 }
 
+/**
+ * Returns the system report from the list of reports.
+ */
+function getSystemChat(): OnyxEntry<Report> {
+    const allReports = ReportConnection.getAllReports();
+    if (!allReports) {
+        return undefined;
+    }
+
+    return Object.values(allReports ?? {}).find((report) => report?.chatType === CONST.REPORT.CHAT_TYPE.SYSTEM);
+}
+
 /**
  * Attempts to find a report in onyx with the provided list of participants. Does not include threads, task, expense, room, and policy expense chat.
  */
-function getChatByParticipants(newParticipantList: number[], reports: OnyxCollection<Report> = allReports): OnyxEntry<Report> {
+function getChatByParticipants(newParticipantList: number[], reports: OnyxCollection<Report> = ReportConnection.getAllReports(), shouldIncludeGroupChats = false): OnyxEntry<Report> {
     const sortedNewParticipantList = newParticipantList.sort();
-    return (
-        Object.values(reports ?? {}).find((report) => {
-            // If the report has been deleted, or there are no participants (like an empty #admins room) then skip it
-            if (
-                !report ||
-                report.participantAccountIDs?.length === 0 ||
-                isChatThread(report) ||
-                isTaskReport(report) ||
-                isMoneyRequestReport(report) ||
-                isChatRoom(report) ||
-                isPolicyExpenseChat(report) ||
-                isGroupChat(report)
-            ) {
-                return false;
-            }
+    return Object.values(reports ?? {}).find((report) => {
+        const participantAccountIDs = Object.keys(report?.participants ?? {});
+
+        // Skip if it's not a 1:1 chat
+        if (!shouldIncludeGroupChats && !isOneOnOneChat(report) && !isSystemChat(report)) {
+            return false;
+        }
 
-            // Only return the chat if it has all the participants
-            return lodashIsEqual(sortedNewParticipantList, report.participantAccountIDs?.sort());
-        }) ?? null
-    );
+        // If we are looking for a group chat, then skip non-group chat report
+        if (shouldIncludeGroupChats && !isGroupChat(report)) {
+            return false;
+        }
+
+        const sortedParticipantsAccountIDs = participantAccountIDs.map(Number).sort();
+
+        // Only return the chat if it has all the participants
+        return lodashIsEqual(sortedNewParticipantList, sortedParticipantsAccountIDs);
+    });
 }
 
 /**
  * Attempts to find an invoice chat report in onyx with the provided policyID and receiverID.
  */
-function getInvoiceChatByParticipants(policyID: string, receiverID: string | number, reports: OnyxCollection<Report> = allReports): OnyxEntry<Report> {
-    return (
-        Object.values(reports ?? {}).find((report) => {
-            if (!report || !isInvoiceRoom(report)) {
-                return false;
-            }
+function getInvoiceChatByParticipants(policyID: string, receiverID: string | number, reports: OnyxCollection<Report> = ReportConnection.getAllReports()): OnyxEntry<Report> {
+    return Object.values(reports ?? {}).find((report) => {
+        if (!report || !isInvoiceRoom(report)) {
+            return false;
+        }
 
-            const isSameReceiver =
-                report.invoiceReceiver &&
-                (('accountID' in report.invoiceReceiver && report.invoiceReceiver.accountID === receiverID) ||
-                    ('policyID' in report.invoiceReceiver && report.invoiceReceiver.policyID === receiverID));
+        const isSameReceiver =
+            report.invoiceReceiver &&
+            (('accountID' in report.invoiceReceiver && report.invoiceReceiver.accountID === receiverID) ||
+                ('policyID' in report.invoiceReceiver && report.invoiceReceiver.policyID === receiverID));
 
-            return report.policyID === policyID && isSameReceiver;
-        }) ?? null
-    );
+        return report.policyID === policyID && isSameReceiver;
+    });
 }
 
 /**
- * Attempts to find a report in onyx with the provided list of participants in given policy
+ * Attempts to find a policy expense report in onyx that is owned by ownerAccountID in a given policy
  */
-function getChatByParticipantsAndPolicy(newParticipantList: number[], policyID: string): OnyxEntry<Report> {
-    newParticipantList.sort();
-    return (
-        Object.values(allReports ?? {}).find((report) => {
-            // If the report has been deleted, or there are no participants (like an empty #admins room) then skip it
-            if (!report?.participantAccountIDs) {
-                return false;
-            }
-            const sortedParticipantsAccountIDs = report.participantAccountIDs?.sort();
-            // Only return the room if it has all the participants and is not a policy room
-            return report.policyID === policyID && newParticipantList.every((newParticipant) => sortedParticipantsAccountIDs.includes(newParticipant));
-        }) ?? null
-    );
+function getPolicyExpenseChat(ownerAccountID: number, policyID: string): OnyxEntry<Report> {
+    return Object.values(ReportConnection.getAllReports() ?? {}).find((report: OnyxEntry<Report>) => {
+        // If the report has been deleted, then skip it
+        if (!report) {
+            return false;
+        }
+
+        return report.policyID === policyID && isPolicyExpenseChat(report) && report.ownerAccountID === ownerAccountID;
+    });
 }
 
 function getAllPolicyReports(policyID: string): Array<OnyxEntry<Report>> {
-    return Object.values(allReports ?? {}).filter((report) => report?.policyID === policyID);
+    return Object.values(ReportConnection.getAllReports() ?? {}).filter((report) => report?.policyID === policyID);
 }
 
 /**
  * Returns true if Chronos is one of the chat participants (1:1)
  */
-function chatIncludesChronos(report: OnyxEntry<Report> | EmptyObject): boolean {
-    return Boolean(report?.participantAccountIDs?.includes(CONST.ACCOUNT_ID.CHRONOS));
+function chatIncludesChronos(report: OnyxInputOrEntry<Report>): boolean {
+    const participantAccountIDs = Object.keys(report?.participants ?? {}).map(Number);
+    return participantAccountIDs.includes(CONST.ACCOUNT_ID.CHRONOS);
+}
+
+function chatIncludesChronosWithID(reportID?: string): boolean {
+    // eslint-disable-next-line @typescript-eslint/prefer-nullish-coalescing
+    const report = ReportConnection.getAllReports()?.[`${ONYXKEYS.COLLECTION.REPORT}${reportID || -1}`];
+    return chatIncludesChronos(report);
 }
 
 /**
@@ -5168,22 +6128,18 @@ function chatIncludesChronos(report: OnyxEntry<Report> | EmptyObject): boolean {
  * - It's a welcome message whisper
  * - It's an ADD_COMMENT that is not an attachment
  */
-function canFlagReportAction(reportAction: OnyxEntry<ReportAction>, reportID: string | undefined): boolean {
-    let report = getReport(reportID);
+function canFlagReportAction(reportAction: OnyxInputOrEntry<ReportAction>, reportID: string | undefined): boolean {
+    let report = getReportOrDraftReport(reportID);
 
     // If the childReportID exists in reportAction and is equal to the reportID,
     // the report action being evaluated is the parent report action in a thread, and we should get the parent report to evaluate instead.
     if (reportAction?.childReportID?.toString() === reportID?.toString()) {
-        report = getReport(report?.parentReportID);
+        report = getReportOrDraftReport(report?.parentReportID);
     }
     const isCurrentUserAction = reportAction?.actorAccountID === currentUserAccountID;
-    const isOriginalMessageHaveHtml =
-        reportAction?.actionName === CONST.REPORT.ACTIONS.TYPE.ADD_COMMENT ||
-        reportAction?.actionName === CONST.REPORT.ACTIONS.TYPE.RENAMED ||
-        reportAction?.actionName === CONST.REPORT.ACTIONS.TYPE.CHRONOS_OOO_LIST;
     if (ReportActionsUtils.isWhisperAction(reportAction)) {
-        // Allow flagging welcome message whispers as they can be set by any room creator
-        if (report?.description && !isCurrentUserAction && isOriginalMessageHaveHtml && reportAction?.originalMessage?.html === report.description) {
+        // Allow flagging whispers that are sent by other users
+        if (!isCurrentUserAction && reportAction?.actorAccountID !== CONST.ACCOUNT_ID.CONCIERGE) {
             return true;
         }
 
@@ -5191,24 +6147,24 @@ function canFlagReportAction(reportAction: OnyxEntry<ReportAction>, reportID: st
         return false;
     }
 
-    return Boolean(
+    return !!(
         !isCurrentUserAction &&
-            reportAction?.actionName === CONST.REPORT.ACTIONS.TYPE.ADD_COMMENT &&
-            !ReportActionsUtils.isDeletedAction(reportAction) &&
-            !ReportActionsUtils.isCreatedTaskReportAction(reportAction) &&
-            !isEmptyObject(report) &&
-            report &&
-            isAllowedToComment(report),
+        reportAction?.actionName === CONST.REPORT.ACTIONS.TYPE.ADD_COMMENT &&
+        !ReportActionsUtils.isDeletedAction(reportAction) &&
+        !ReportActionsUtils.isCreatedTaskReportAction(reportAction) &&
+        !isEmptyObject(report) &&
+        report &&
+        isAllowedToComment(report)
     );
 }
 
 /**
  * Whether flag comment page should show
  */
-function shouldShowFlagComment(reportAction: OnyxEntry<ReportAction>, report: OnyxEntry<Report>): boolean {
+function shouldShowFlagComment(reportAction: OnyxInputOrEntry<ReportAction>, report: OnyxInputOrEntry<Report>): boolean {
     return (
         canFlagReportAction(reportAction, report?.reportID) &&
-        !isArchivedRoom(report) &&
+        !isArchivedRoom(report, getReportNameValuePairs(report?.reportID)) &&
         !chatIncludesChronos(report) &&
         !isConciergeChatReport(report) &&
         reportAction?.actorAccountID !== CONST.ACCOUNT_ID.CONCIERGE
@@ -5283,6 +6239,7 @@ function parseReportRouteParams(route: string): ReportRouteParams {
     const pathSegments = parsingRoute.split('/');
 
     const reportIDSegment = pathSegments[1];
+    const hasRouteReportActionID = !Number.isNaN(Number(pathSegments[2]));
 
     // Check for "undefined" or any other unwanted string values
     if (!reportIDSegment || reportIDSegment === 'undefined') {
@@ -5291,7 +6248,7 @@ function parseReportRouteParams(route: string): ReportRouteParams {
 
     return {
         reportID: reportIDSegment,
-        isSubReportPageRoute: pathSegments.length > 2,
+        isSubReportPageRoute: pathSegments.length > 2 && !hasRouteReportActionID,
     };
 }
 
@@ -5305,19 +6262,12 @@ function getReportIDFromLink(url: string | null): string {
     return reportID;
 }
 
-/**
- * Get the report policyID given a reportID
- */
-function getReportPolicyID(reportID?: string): string | undefined {
-    return originalGetReportPolicyID(reportID);
-}
-
 /**
  * Check if the chat report is linked to an iou that is waiting for the current user to add a credit bank account.
  */
-function hasIOUWaitingOnCurrentUserBankAccount(chatReport: OnyxEntry<Report>): boolean {
+function hasIOUWaitingOnCurrentUserBankAccount(chatReport: OnyxInputOrEntry<Report>): boolean {
     if (chatReport?.iouReportID) {
-        const iouReport = allReports?.[`${ONYXKEYS.COLLECTION.REPORT}${chatReport?.iouReportID}`];
+        const iouReport = ReportConnection.getAllReports()?.[`${ONYXKEYS.COLLECTION.REPORT}${chatReport?.iouReportID}`];
         if (iouReport?.isWaitingOnBankAccount && iouReport?.ownerAccountID === currentUserAccountID) {
             return true;
         }
@@ -5352,7 +6302,7 @@ function canRequestMoney(report: OnyxEntry<Report>, policy: OnyxEntry<Policy>, o
 
     let isOwnPolicyExpenseChat = report?.isOwnPolicyExpenseChat ?? false;
     if (isExpenseReport(report) && getParentReport(report)) {
-        isOwnPolicyExpenseChat = Boolean(getParentReport(report)?.isOwnPolicyExpenseChat);
+        isOwnPolicyExpenseChat = !!getParentReport(report)?.isOwnPolicyExpenseChat;
     }
 
     // In case there are no other participants than the current user and it's not user's own policy expense chat, they can't submit expenses from such report
@@ -5360,10 +6310,15 @@ function canRequestMoney(report: OnyxEntry<Report>, policy: OnyxEntry<Policy>, o
         return false;
     }
 
+    // Current user must be a manager or owner of this IOU
+    if (isIOUReport(report) && currentUserAccountID !== report?.managerID && currentUserAccountID !== report?.ownerAccountID) {
+        return false;
+    }
+
     // User can submit expenses in any IOU report, unless paid, but the user can only submit expenses in an expense report
     // which is tied to their workspace chat.
     if (isMoneyRequestReport(report)) {
-        const canAddTransactions = canAddOrDeleteTransactions(report);
+        const canAddTransactions = canAddTransaction(report);
         return isReportInGroupPolicy(report) ? isOwnPolicyExpenseChat && canAddTransactions : canAddTransactions;
     }
 
@@ -5400,25 +6355,37 @@ function isGroupChatAdmin(report: OnyxEntry<Report>, accountID: number) {
  *    - Self DMs
  *    - own policy expense chats
  *    - open and processing expense reports tied to own policy expense chat
- *
+ * - Send invoice option should show for:
+ *    - invoice rooms if the user is an admin of the sender workspace
  * None of the options should show in chat threads or if there is some special Expensify account
  * as a participant of the report.
  */
-function getMoneyRequestOptions(report: OnyxEntry<Report>, policy: OnyxEntry<Policy>, reportParticipants: number[], canUseTrackExpense = true, filterDeprecatedTypes = false): IOUType[] {
+function getMoneyRequestOptions(report: OnyxEntry<Report>, policy: OnyxEntry<Policy>, reportParticipants: number[], filterDeprecatedTypes = false): IOUType[] {
     // In any thread or task report, we do not allow any new expenses yet
-    if (isChatThread(report) || isTaskReport(report) || (!canUseTrackExpense && isSelfDM(report)) || isInvoiceRoom(report) || isInvoiceReport(report)) {
+    if (isChatThread(report) || isTaskReport(report) || isInvoiceReport(report) || isSystemChat(report)) {
+        return [];
+    }
+
+    if (isInvoiceRoom(report)) {
+        // TODO: Uncomment the following line when the invoices screen is ready - https://github.com/Expensify/App/issues/45175.
+        // if (PolicyUtils.canSendInvoiceFromWorkspace(policy?.id) && isPolicyAdmin(report?.policyID ?? '-1', allPolicies)) {
+        if (isPolicyAdmin(report?.policyID ?? '-1', allPolicies)) {
+            return [CONST.IOU.TYPE.INVOICE];
+        }
         return [];
     }
 
     // We don't allow IOU actions if an Expensify account is a participant of the report, unless the policy that the report is on is owned by an Expensify account
     const doParticipantsIncludeExpensifyAccounts = lodashIntersection(reportParticipants, CONST.EXPENSIFY_ACCOUNT_IDS).length > 0;
-    const isPolicyOwnedByExpensifyAccounts = report?.policyID ? CONST.EXPENSIFY_ACCOUNT_IDS.includes(getPolicy(report?.policyID ?? '')?.ownerAccountID ?? 0) : false;
+    const isPolicyOwnedByExpensifyAccounts = report?.policyID ? CONST.EXPENSIFY_ACCOUNT_IDS.includes(getPolicy(report?.policyID ?? '-1')?.ownerAccountID ?? -1) : false;
     if (doParticipantsIncludeExpensifyAccounts && !isPolicyOwnedByExpensifyAccounts) {
         return [];
     }
 
-    const otherParticipants = reportParticipants.filter((accountID) => currentUserPersonalDetails?.accountID !== accountID);
-    const hasSingleOtherParticipantInReport = otherParticipants.length === 1;
+    const otherParticipants = reportParticipants.filter(
+        (accountID) => currentUserPersonalDetails?.accountID !== accountID && !PolicyUtils.isExpensifyTeam(allPersonalDetails?.[accountID]?.login),
+    );
+    const hasSingleParticipantInReport = otherParticipants.length === 1;
     let options: IOUType[] = [];
 
     if (isSelfDM(report)) {
@@ -5430,7 +6397,7 @@ function getMoneyRequestOptions(report: OnyxEntry<Report>, policy: OnyxEntry<Pol
     // DM chats will have the Split Expense option.
     // Your own workspace chats will have the split expense option.
     if (
-        (isChatRoom(report) && otherParticipants.length > 0) ||
+        (isChatRoom(report) && !isAnnounceRoom(report) && otherParticipants.length > 0) ||
         (isDM(report) && otherParticipants.length > 0) ||
         (isGroupChat(report) && otherParticipants.length > 0) ||
         (isPolicyExpenseChat(report) && report?.isOwnPolicyExpenseChat)
@@ -5445,13 +6412,13 @@ function getMoneyRequestOptions(report: OnyxEntry<Report>, policy: OnyxEntry<Pol
         }
 
         // If the user can request money from the workspace report, they can also track expenses
-        if (canUseTrackExpense && (isPolicyExpenseChat(report) || isExpenseReport(report))) {
+        if (isPolicyExpenseChat(report) || isExpenseReport(report)) {
             options = [...options, CONST.IOU.TYPE.TRACK];
         }
     }
 
     // Pay someone option should be visible only in 1:1 DMs
-    if (isDM(report) && hasSingleOtherParticipantInReport) {
+    if (isDM(report) && hasSingleParticipantInReport) {
         options = [...options, CONST.IOU.TYPE.PAY];
         if (!filterDeprecatedTypes) {
             options = [...options, CONST.IOU.TYPE.SEND];
@@ -5470,9 +6437,39 @@ function temporary_getMoneyRequestOptions(
     report: OnyxEntry<Report>,
     policy: OnyxEntry<Policy>,
     reportParticipants: number[],
-    canUseTrackExpense = true,
 ): Array<Exclude<IOUType, typeof CONST.IOU.TYPE.REQUEST | typeof CONST.IOU.TYPE.SEND>> {
-    return getMoneyRequestOptions(report, policy, reportParticipants, canUseTrackExpense, true) as Array<Exclude<IOUType, typeof CONST.IOU.TYPE.REQUEST | typeof CONST.IOU.TYPE.SEND>>;
+    return getMoneyRequestOptions(report, policy, reportParticipants, true) as Array<Exclude<IOUType, typeof CONST.IOU.TYPE.REQUEST | typeof CONST.IOU.TYPE.SEND>>;
+}
+
+/**
+ * Invoice sender, invoice receiver and auto-invited admins cannot leave
+ */
+function canLeaveInvoiceRoom(report: OnyxEntry<Report>): boolean {
+    if (!report || !report?.invoiceReceiver) {
+        return false;
+    }
+
+    if (report?.statusNum === CONST.REPORT.STATUS_NUM.CLOSED) {
+        return false;
+    }
+
+    const isSenderPolicyAdmin = getPolicy(report.policyID)?.role === CONST.POLICY.ROLE.ADMIN;
+
+    if (isSenderPolicyAdmin) {
+        return false;
+    }
+
+    if (report.invoiceReceiver.type === CONST.REPORT.INVOICE_RECEIVER_TYPE.INDIVIDUAL) {
+        return report?.invoiceReceiver?.accountID !== currentUserAccountID;
+    }
+
+    const isReceiverPolicyAdmin = getPolicy(report.invoiceReceiver.policyID)?.role === CONST.POLICY.ROLE.ADMIN;
+
+    if (isReceiverPolicyAdmin) {
+        return false;
+    }
+
+    return true;
 }
 
 /**
@@ -5490,7 +6487,11 @@ function temporary_getMoneyRequestOptions(
  */
 function canLeaveRoom(report: OnyxEntry<Report>, isPolicyEmployee: boolean): boolean {
     if (isInvoiceRoom(report)) {
-        const invoiceReport = getReport(report?.iouReportID ?? '');
+        if (isArchivedRoom(report, getReportNameValuePairs(report?.reportID))) {
+            return false;
+        }
+
+        const invoiceReport = getReportOrDraftReport(report?.iouReportID ?? '-1');
 
         if (invoiceReport?.ownerAccountID === currentUserAccountID) {
             return false;
@@ -5535,7 +6536,7 @@ function canLeaveRoom(report: OnyxEntry<Report>, isPolicyEmployee: boolean): boo
 }
 
 function isCurrentUserTheOnlyParticipant(participantAccountIDs?: number[]): boolean {
-    return Boolean(participantAccountIDs?.length === 1 && participantAccountIDs?.[0] === currentUserAccountID);
+    return !!(participantAccountIDs?.length === 1 && participantAccountIDs?.[0] === currentUserAccountID);
 }
 
 /**
@@ -5557,7 +6558,7 @@ function getWhisperDisplayNames(participantAccountIDs?: number[]): string | unde
  * Show subscript on workspace chats / threads and expense requests
  */
 function shouldReportShowSubscript(report: OnyxEntry<Report>): boolean {
-    if (isArchivedRoom(report) && !isWorkspaceThread(report)) {
+    if (isArchivedRoom(report, getReportNameValuePairs(report?.reportID)) && !isWorkspaceThread(report)) {
         return false;
     }
 
@@ -5573,7 +6574,7 @@ function shouldReportShowSubscript(report: OnyxEntry<Report>): boolean {
         return true;
     }
 
-    if (isExpenseReport(report) && isOneTransactionReport(report?.reportID ?? '')) {
+    if (isExpenseReport(report) && isOneTransactionReport(report?.reportID ?? '-1')) {
         return true;
     }
 
@@ -5596,6 +6597,7 @@ function shouldReportShowSubscript(report: OnyxEntry<Report>): boolean {
  * Return true if reports data exists
  */
 function isReportDataReady(): boolean {
+    const allReports = ReportConnection.getAllReports();
     return !isEmptyObject(allReports) && Object.keys(allReports ?? {}).some((key) => allReports?.[key]?.reportID);
 }
 
@@ -5603,7 +6605,7 @@ function isReportDataReady(): boolean {
  * Return true if reportID from path is valid
  */
 function isValidReportIDFromPath(reportIDFromPath: string): boolean {
-    return !['', 'null', '0'].includes(reportIDFromPath);
+    return !['', 'null', '0', '-1'].includes(reportIDFromPath);
 }
 
 /**
@@ -5618,12 +6620,13 @@ function getAddWorkspaceRoomOrChatReportErrors(report: OnyxEntry<Report>): Error
 /**
  * Return true if the expense report is marked for deletion.
  */
-function isMoneyRequestReportPendingDeletion(report: OnyxEntry<Report> | EmptyObject): boolean {
+function isMoneyRequestReportPendingDeletion(reportOrID: OnyxEntry<Report> | string): boolean {
+    const report = typeof reportOrID === 'string' ? ReportConnection.getAllReports()?.[`${ONYXKEYS.COLLECTION.REPORT}${reportOrID}`] : reportOrID;
     if (!isMoneyRequestReport(report)) {
         return false;
     }
 
-    const parentReportAction = ReportActionsUtils.getReportAction(report?.parentReportID ?? '', report?.parentReportActionID ?? '');
+    const parentReportAction = ReportActionsUtils.getReportAction(report?.parentReportID ?? '-1', report?.parentReportActionID ?? '-1');
     return parentReportAction?.pendingAction === CONST.RED_BRICK_ROAD_PENDING_ACTION.DELETE;
 }
 
@@ -5635,22 +6638,23 @@ function canUserPerformWriteAction(report: OnyxEntry<Report>) {
         return false;
     }
 
-    return !isArchivedRoom(report) && isEmptyObject(reportErrors) && report && isAllowedToComment(report) && !isAnonymousUser && canWriteInReport(report);
+    const reportNameValuePairs = getReportNameValuePairs(report?.reportID);
+    return !isArchivedRoom(report, reportNameValuePairs) && isEmptyObject(reportErrors) && report && isAllowedToComment(report) && !isAnonymousUser && canWriteInReport(report);
 }
 
 /**
  * Returns ID of the original report from which the given reportAction is first created.
  */
-function getOriginalReportID(reportID: string, reportAction: OnyxEntry<ReportAction>): string | undefined {
+function getOriginalReportID(reportID: string, reportAction: OnyxInputOrEntry<ReportAction>): string | undefined {
     const reportActions = allReportActions?.[`${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${reportID}`];
-    const currentReportAction = reportActions?.[reportAction?.reportActionID ?? ''] ?? null;
+    const currentReportAction = reportActions?.[reportAction?.reportActionID ?? '-1'] ?? null;
     const transactionThreadReportID = ReportActionsUtils.getOneTransactionThreadReportID(reportID, reportActions ?? ([] as ReportAction[]));
-    if (transactionThreadReportID !== null) {
-        return Object.keys(currentReportAction ?? {}).length === 0 ? transactionThreadReportID : reportID;
+    if (Object.keys(currentReportAction ?? {}).length === 0) {
+        return isThreadFirstChat(reportAction, reportID)
+            ? ReportConnection.getAllReports()?.[`${ONYXKEYS.COLLECTION.REPORT}${reportID}`]?.parentReportID
+            : transactionThreadReportID ?? reportID;
     }
-    return isThreadFirstChat(reportAction, reportID) && Object.keys(currentReportAction ?? {}).length === 0
-        ? allReports?.[`${ONYXKEYS.COLLECTION.REPORT}${reportID}`]?.parentReportID
-        : reportID;
+    return reportID;
 }
 
 /**
@@ -5673,8 +6677,8 @@ function getReportOfflinePendingActionAndErrors(report: OnyxEntry<Report>): Repo
 /**
  * Check if the report can create the expense with type is iouType
  */
-function canCreateRequest(report: OnyxEntry<Report>, policy: OnyxEntry<Policy>, iouType: (typeof CONST.IOU.TYPE)[keyof typeof CONST.IOU.TYPE]): boolean {
-    const participantAccountIDs = report?.participantAccountIDs ?? [];
+function canCreateRequest(report: OnyxEntry<Report>, policy: OnyxEntry<Policy>, iouType: ValueOf<typeof CONST.IOU.TYPE>): boolean {
+    const participantAccountIDs = Object.keys(report?.participants ?? {}).map(Number);
     if (!canUserPerformWriteAction(report)) {
         return false;
     }
@@ -5682,7 +6686,8 @@ function canCreateRequest(report: OnyxEntry<Report>, policy: OnyxEntry<Policy>,
 }
 
 function getWorkspaceChats(policyID: string, accountIDs: number[]): Array<OnyxEntry<Report>> {
-    return Object.values(allReports ?? {}).filter((report) => isPolicyExpenseChat(report) && (report?.policyID ?? '') === policyID && accountIDs.includes(report?.ownerAccountID ?? -1));
+    const allReports = ReportConnection.getAllReports();
+    return Object.values(allReports ?? {}).filter((report) => isPolicyExpenseChat(report) && (report?.policyID ?? '-1') === policyID && accountIDs.includes(report?.ownerAccountID ?? -1));
 }
 
 /**
@@ -5691,14 +6696,26 @@ function getWorkspaceChats(policyID: string, accountIDs: number[]): Array<OnyxEn
  * @param policyID - the workspace ID to get all associated reports
  */
 function getAllWorkspaceReports(policyID: string): Array<OnyxEntry<Report>> {
-    return Object.values(allReports ?? {}).filter((report) => (report?.policyID ?? '') === policyID);
+    const allReports = ReportConnection.getAllReports();
+    return Object.values(allReports ?? {}).filter((report) => (report?.policyID ?? '-1') === policyID);
 }
 
 /**
  * @param policy - the workspace the report is on, null if the user isn't a member of the workspace
  */
-function shouldDisableRename(report: OnyxEntry<Report>, policy: OnyxEntry<Policy>): boolean {
-    if (isDefaultRoom(report) || isArchivedRoom(report) || isThread(report) || isMoneyRequestReport(report) || isPolicyExpenseChat(report)) {
+function shouldDisableRename(report: OnyxEntry<Report>): boolean {
+    if (
+        isDefaultRoom(report) ||
+        isArchivedRoom(report, getReportNameValuePairs(report?.reportID)) ||
+        isPublicRoom(report) ||
+        isThread(report) ||
+        isMoneyRequest(report) ||
+        isMoneyRequestReport(report) ||
+        isPolicyExpenseChat(report) ||
+        isInvoiceRoom(report) ||
+        isInvoiceReport(report) ||
+        isSystemChat(report)
+    ) {
         return true;
     }
 
@@ -5706,13 +6723,10 @@ function shouldDisableRename(report: OnyxEntry<Report>, policy: OnyxEntry<Policy
         return false;
     }
 
-    // if the linked workspace is null, that means the person isn't a member of the workspace the report is in
-    // which means this has to be a public room we want to disable renaming for
-    if (!policy) {
+    if (isDeprecatedGroupDM(report) || isTaskReport(report)) {
         return true;
     }
 
-    // If there is a linked workspace, that means the user is a member of the workspace the report is in and is allowed to rename.
     return false;
 }
 
@@ -5720,14 +6734,14 @@ function shouldDisableRename(report: OnyxEntry<Report>, policy: OnyxEntry<Policy
  * @param policy - the workspace the report is on, null if the user isn't a member of the workspace
  */
 function canEditWriteCapability(report: OnyxEntry<Report>, policy: OnyxEntry<Policy>): boolean {
-    return PolicyUtils.isPolicyAdmin(policy) && !isAdminRoom(report) && !isArchivedRoom(report) && !isThread(report);
+    return PolicyUtils.isPolicyAdmin(policy) && !isAdminRoom(report) && !isArchivedRoom(report, getReportNameValuePairs(report?.reportID)) && !isThread(report) && !isInvoiceRoom(report);
 }
 
 /**
  * @param policy - the workspace the report is on, null if the user isn't a member of the workspace
  */
 function canEditRoomVisibility(report: OnyxEntry<Report>, policy: OnyxEntry<Policy>): boolean {
-    return PolicyUtils.isPolicyAdmin(policy) && !isArchivedRoom(report);
+    return PolicyUtils.isPolicyAdmin(policy) && !isArchivedRoom(report, getReportNameValuePairs(report?.reportID));
 }
 
 /**
@@ -5781,6 +6795,8 @@ function getTaskAssigneeChatOnyxData(
                     createChat: null,
                 },
                 isOptimisticReport: false,
+                // BE will send a different participant. We clear the optimistic one to avoid duplicated entries
+                participants: {[assigneeAccountID]: null},
             },
         });
 
@@ -5811,7 +6827,7 @@ function getTaskAssigneeChatOnyxData(
         // eslint-disable-next-line @typescript-eslint/prefer-nullish-coalescing
         const displayname = allPersonalDetails?.[assigneeAccountID]?.displayName || allPersonalDetails?.[assigneeAccountID]?.login || '';
         optimisticAssigneeAddComment = buildOptimisticTaskCommentReportAction(taskReportID, title, assigneeAccountID, `assigned to ${displayname}`, parentReportID);
-        const lastAssigneeCommentText = formatReportLastMessageText(optimisticAssigneeAddComment.reportAction.message?.[0]?.text ?? '');
+        const lastAssigneeCommentText = formatReportLastMessageText(ReportActionsUtils.getReportActionText(optimisticAssigneeAddComment.reportAction as ReportAction));
         const optimisticAssigneeReport = {
             lastVisibleActionCreated: currentTime,
             lastMessageText: lastAssigneeCommentText,
@@ -5823,7 +6839,7 @@ function getTaskAssigneeChatOnyxData(
             {
                 onyxMethod: Onyx.METHOD.MERGE,
                 key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${assigneeChatReportID}`,
-                value: {[optimisticAssigneeAddComment.reportAction.reportActionID ?? '']: optimisticAssigneeAddComment.reportAction as ReportAction},
+                value: {[optimisticAssigneeAddComment.reportAction.reportActionID ?? '-1']: optimisticAssigneeAddComment.reportAction as ReportAction},
             },
             {
                 onyxMethod: Onyx.METHOD.MERGE,
@@ -5834,12 +6850,12 @@ function getTaskAssigneeChatOnyxData(
         successData.push({
             onyxMethod: Onyx.METHOD.MERGE,
             key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${assigneeChatReportID}`,
-            value: {[optimisticAssigneeAddComment.reportAction.reportActionID ?? '']: {isOptimisticAction: null}},
+            value: {[optimisticAssigneeAddComment.reportAction.reportActionID ?? '-1']: {isOptimisticAction: null}},
         });
         failureData.push({
             onyxMethod: Onyx.METHOD.MERGE,
             key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${assigneeChatReportID}`,
-            value: {[optimisticAssigneeAddComment.reportAction.reportActionID ?? '']: {pendingAction: null}},
+            value: {[optimisticAssigneeAddComment.reportAction.reportActionID ?? '-1']: {pendingAction: null}},
         });
     }
 
@@ -5856,18 +6872,18 @@ function getTaskAssigneeChatOnyxData(
  * Return iou report action display message
  */
 function getIOUReportActionDisplayMessage(reportAction: OnyxEntry<ReportAction>, transaction?: OnyxEntry<Transaction>): string {
-    if (reportAction?.actionName !== CONST.REPORT.ACTIONS.TYPE.IOU) {
+    if (!ReportActionsUtils.isMoneyRequestAction(reportAction)) {
         return '';
     }
-    const originalMessage = reportAction.originalMessage;
-    const {IOUReportID} = originalMessage;
-    const iouReport = getReport(IOUReportID);
+    const originalMessage = ReportActionsUtils.getOriginalMessage(reportAction);
+    const {IOUReportID} = originalMessage ?? {};
+    const iouReport = getReportOrDraftReport(IOUReportID);
     let translationKey: TranslationPaths;
-    if (originalMessage.type === CONST.IOU.REPORT_ACTION_TYPE.PAY) {
+    if (originalMessage?.type === CONST.IOU.REPORT_ACTION_TYPE.PAY) {
         // The `REPORT_ACTION_TYPE.PAY` action type is used for both fulfilling existing requests and sending money. To
         // differentiate between these two scenarios, we check if the `originalMessage` contains the `IOUDetails`
         // property. If it does, it indicates that this is a 'Pay someone' action.
-        const {amount, currency} = originalMessage.IOUDetails ?? originalMessage;
+        const {amount, currency} = originalMessage?.IOUDetails ?? originalMessage ?? {};
         const formattedAmount = CurrencyUtils.convertToDisplayString(Math.abs(amount), currency) ?? '';
 
         switch (originalMessage.paymentType) {
@@ -5885,9 +6901,9 @@ function getIOUReportActionDisplayMessage(reportAction: OnyxEntry<ReportAction>,
         return Localize.translateLocal(translationKey, {amount: formattedAmount, payer: ''});
     }
 
-    const transactionDetails = getTransactionDetails(!isEmptyObject(transaction) ? transaction : null);
-    const formattedAmount = CurrencyUtils.convertToDisplayString(transactionDetails?.amount ?? 0, transactionDetails?.currency);
-    const isRequestSettled = isSettled(originalMessage.IOUReportID);
+    const amount = TransactionUtils.getAmount(transaction, !isEmptyObject(iouReport) && isExpenseReport(iouReport)) ?? 0;
+    const formattedAmount = CurrencyUtils.convertToDisplayString(amount, TransactionUtils.getCurrency(transaction)) ?? '';
+    const isRequestSettled = isSettled(originalMessage?.IOUReportID);
     const isApproved = isReportApproved(iouReport);
     if (isRequestSettled) {
         return Localize.translateLocal('iou.payerSettled', {
@@ -5908,7 +6924,7 @@ function getIOUReportActionDisplayMessage(reportAction: OnyxEntry<ReportAction>,
     }
     return Localize.translateLocal(translationKey, {
         formattedAmount,
-        comment: transactionDetails?.comment ?? '',
+        comment: TransactionUtils.getDescription(transaction) ?? '',
     });
 }
 
@@ -5925,23 +6941,32 @@ function getIOUReportActionDisplayMessage(reportAction: OnyxEntry<ReportAction>,
  *
  */
 function isDeprecatedGroupDM(report: OnyxEntry<Report>): boolean {
-    return Boolean(
+    return !!(
         report &&
-            !isChatThread(report) &&
-            !isTaskReport(report) &&
-            !isInvoiceReport(report) &&
-            !isMoneyRequestReport(report) &&
-            !isArchivedRoom(report) &&
-            !Object.values(CONST.REPORT.CHAT_TYPE).some((chatType) => chatType === getChatType(report)) &&
-            (report.participantAccountIDs?.length ?? 0) > 1,
+        !isChatThread(report) &&
+        !isTaskReport(report) &&
+        !isInvoiceReport(report) &&
+        !isMoneyRequestReport(report) &&
+        !isArchivedRoom(report, getReportNameValuePairs(report?.reportID)) &&
+        !Object.values(CONST.REPORT.CHAT_TYPE).some((chatType) => chatType === getChatType(report)) &&
+        Object.keys(report.participants ?? {})
+            .map(Number)
+            .filter((accountID) => accountID !== currentUserAccountID).length > 1
     );
 }
 
+/**
+ * A "root" group chat is the top level group chat and does not refer to any threads off of a Group Chat
+ */
+function isRootGroupChat(report: OnyxEntry<Report>): boolean {
+    return !isChatThread(report) && (isGroupChat(report) || isDeprecatedGroupDM(report));
+}
+
 /**
  * Assume any report without a reportID is unusable.
  */
 function isValidReport(report?: OnyxEntry<Report>): boolean {
-    return Boolean(report?.reportID);
+    return !!report?.reportID;
 }
 
 /**
@@ -5952,12 +6977,7 @@ function isReportParticipant(accountID: number, report: OnyxEntry<Report>): bool
         return false;
     }
 
-    // If we have a DM AND the accountID we are checking is the current user THEN we won't find them as a participant and must assume they are a participant
-    if (isDM(report) && accountID === currentUserAccountID) {
-        return true;
-    }
-
-    const possibleAccountIDs = report?.participantAccountIDs ?? [];
+    const possibleAccountIDs = Object.keys(report?.participants ?? {}).map(Number);
     if (report?.ownerAccountID) {
         possibleAccountIDs.push(report?.ownerAccountID);
     }
@@ -5967,24 +6987,31 @@ function isReportParticipant(accountID: number, report: OnyxEntry<Report>): bool
     return possibleAccountIDs.includes(accountID);
 }
 
+/**
+ * Check to see if the current user has access to view the report.
+ */
+function canCurrentUserOpenReport(report: OnyxEntry<Report>): boolean {
+    return (isReportParticipant(currentUserAccountID ?? 0, report) || isPublicRoom(report)) && canAccessReport(report, allPolicies, allBetas);
+}
+
 function shouldUseFullTitleToDisplay(report: OnyxEntry<Report>): boolean {
     return (
         isMoneyRequestReport(report) || isPolicyExpenseChat(report) || isChatRoom(report) || isChatThread(report) || isTaskReport(report) || isGroupChat(report) || isInvoiceReport(report)
     );
 }
 
-function getRoom(type: ValueOf<typeof CONST.REPORT.CHAT_TYPE>, policyID: string): OnyxEntry<Report> | undefined {
-    const room = Object.values(allReports ?? {}).find((report) => report?.policyID === policyID && report?.chatType === type && !isThread(report));
+function getRoom(type: ValueOf<typeof CONST.REPORT.CHAT_TYPE>, policyID: string): OnyxEntry<Report> {
+    const room = Object.values(ReportConnection.getAllReports() ?? {}).find((report) => report?.policyID === policyID && report?.chatType === type && !isThread(report));
     return room;
 }
 
 /**
  *  We only want policy members who are members of the report to be able to modify the report description, but not in thread chat.
  */
-function canEditReportDescription(report: OnyxEntry<Report>, policy: OnyxEntry<Policy> | undefined): boolean {
+function canEditReportDescription(report: OnyxEntry<Report>, policy: OnyxEntry<Policy>): boolean {
     return (
         !isMoneyRequestReport(report) &&
-        !isArchivedRoom(report) &&
+        !isArchivedRoom(report, getReportNameValuePairs(report?.reportID)) &&
         isChatRoom(report) &&
         !isChatThread(report) &&
         !isEmpty(policy) &&
@@ -6005,8 +7032,8 @@ function hasSmartscanError(reportActions: ReportAction[]) {
             return false;
         }
         const IOUReportID = ReportActionsUtils.getIOUReportIDFromReportActionPreview(action);
-        const isReportPreviewError = ReportActionsUtils.isReportPreviewAction(action) && hasMissingSmartscanFields(IOUReportID) && !isSettled(IOUReportID);
-        const transactionID = (action.originalMessage as IOUMessage).IOUTransactionID ?? '0';
+        const isReportPreviewError = ReportActionsUtils.isReportPreviewAction(action) && shouldShowRBRForMissingSmartscanFields(IOUReportID) && !isSettled(IOUReportID);
+        const transactionID = ReportActionsUtils.isMoneyRequestAction(action) ? ReportActionsUtils.getOriginalMessage(action)?.IOUTransactionID ?? '-1' : '-1';
         const transaction = allTransactions?.[`${ONYXKEYS.COLLECTION.TRANSACTION}${transactionID}`] ?? {};
         const isSplitBillError = ReportActionsUtils.isSplitBillAction(action) && TransactionUtils.hasMissingSmartscanFields(transaction as Transaction);
 
@@ -6046,19 +7073,11 @@ function navigateToPrivateNotes(report: OnyxEntry<Report>, session: OnyxEntry<Se
     Navigation.navigate(ROUTES.PRIVATE_NOTES_LIST.getRoute(report.reportID));
 }
 
-/**
- * Check if Report has any held expenses
- */
-function isHoldCreator(transaction: OnyxEntry<Transaction>, reportID: string): boolean {
-    const holdReportAction = ReportActionsUtils.getReportAction(reportID, `${transaction?.comment?.hold ?? ''}`);
-    return isActionCreator(holdReportAction);
-}
-
 /**
  * Get all held transactions of a iouReport
  */
-function getAllHeldTransactions(iouReportID: string): Transaction[] {
-    const transactions = TransactionUtils.getAllReportTransactions(iouReportID);
+function getAllHeldTransactions(iouReportID?: string): Transaction[] {
+    const transactions = reportsTransactions[iouReportID ?? ''] ?? [];
     return transactions.filter((transaction) => TransactionUtils.isOnHold(transaction));
 }
 
@@ -6066,7 +7085,7 @@ function getAllHeldTransactions(iouReportID: string): Transaction[] {
  * Check if Report has any held expenses
  */
 function hasHeldExpenses(iouReportID?: string): boolean {
-    const transactions = TransactionUtils.getAllReportTransactions(iouReportID);
+    const transactions = reportsTransactions[iouReportID ?? ''] ?? [];
     return transactions.some((transaction) => TransactionUtils.isOnHold(transaction));
 }
 
@@ -6074,14 +7093,14 @@ function hasHeldExpenses(iouReportID?: string): boolean {
  * Check if all expenses in the Report are on hold
  */
 function hasOnlyHeldExpenses(iouReportID: string): boolean {
-    const transactions = TransactionUtils.getAllReportTransactions(iouReportID);
-    return !transactions.some((transaction) => !TransactionUtils.isOnHold(transaction));
+    const reportTransactions = reportsTransactions[iouReportID ?? ''] ?? [];
+    return reportTransactions.length > 0 && !reportTransactions.some((transaction) => !TransactionUtils.isOnHold(transaction));
 }
 
 /**
  * Checks if thread replies should be displayed
  */
-function shouldDisplayThreadReplies(reportAction: OnyxEntry<ReportAction>, reportID: string): boolean {
+function shouldDisplayThreadReplies(reportAction: OnyxInputOrEntry<ReportAction>, reportID: string): boolean {
     const hasReplies = (reportAction?.childVisibleActionCount ?? 0) > 0;
     return hasReplies && !!reportAction?.childCommenterCount && !isThreadFirstChat(reportAction, reportID);
 }
@@ -6089,35 +7108,40 @@ function shouldDisplayThreadReplies(reportAction: OnyxEntry<ReportAction>, repor
 /**
  * Check if money report has any transactions updated optimistically
  */
-function hasUpdatedTotal(report: OnyxEntry<Report>, policy: OnyxEntry<Policy>): boolean {
+function hasUpdatedTotal(report: OnyxInputOrEntry<Report>, policy: OnyxInputOrEntry<Policy>): boolean {
     if (!report) {
         return true;
     }
 
-    const transactions = TransactionUtils.getAllReportTransactions(report.reportID);
-    const hasPendingTransaction = transactions.some((transaction) => !!transaction.pendingAction);
-    const hasTransactionWithDifferentCurrency = transactions.some((transaction) => transaction.currency !== report.currency);
+    const allReportTransactions = reportsTransactions[report.reportID] ?? [];
+
+    const hasPendingTransaction = allReportTransactions.some((transaction) => !!transaction.pendingAction);
+    const hasTransactionWithDifferentCurrency = allReportTransactions.some((transaction) => transaction.currency !== report.currency);
     const hasDifferentWorkspaceCurrency = report.pendingFields?.createChat && isExpenseReport(report) && report.currency !== policy?.outputCurrency;
+    const hasOptimisticHeldExpense = hasHeldExpenses(report.reportID) && report?.unheldTotal === undefined;
 
-    return !(hasPendingTransaction && (hasTransactionWithDifferentCurrency || hasDifferentWorkspaceCurrency)) && !(hasHeldExpenses(report.reportID) && report?.unheldTotal === undefined);
+    return !(hasPendingTransaction && (hasTransactionWithDifferentCurrency || hasDifferentWorkspaceCurrency)) && !hasOptimisticHeldExpense;
 }
 
 /**
  * Return held and full amount formatted with used currency
  */
 function getNonHeldAndFullAmount(iouReport: OnyxEntry<Report>, policy: OnyxEntry<Policy>): string[] {
-    const transactions = TransactionUtils.getAllReportTransactions(iouReport?.reportID ?? '');
-    const hasPendingTransaction = transactions.some((transaction) => !!transaction.pendingAction);
+    const reportTransactions = reportsTransactions[iouReport?.reportID ?? ''] ?? [];
+    const hasPendingTransaction = reportTransactions.some((transaction) => !!transaction.pendingAction);
+
+    // if the report is an expense report, the total amount should be negated
+    const coefficient = isExpenseReport(iouReport) ? -1 : 1;
 
     if (hasUpdatedTotal(iouReport, policy) && hasPendingTransaction) {
-        const unheldTotal = transactions.reduce((currentVal, transaction) => currentVal - (!TransactionUtils.isOnHold(transaction) ? transaction.amount : 0), 0);
+        const unheldTotal = reportTransactions.reduce((currentVal, transaction) => currentVal - (!TransactionUtils.isOnHold(transaction) ? transaction.amount : 0), 0);
 
-        return [CurrencyUtils.convertToDisplayString(unheldTotal, iouReport?.currency ?? ''), CurrencyUtils.convertToDisplayString((iouReport?.total ?? 0) * -1, iouReport?.currency ?? '')];
+        return [CurrencyUtils.convertToDisplayString(unheldTotal, iouReport?.currency), CurrencyUtils.convertToDisplayString((iouReport?.total ?? 0) * coefficient, iouReport?.currency)];
     }
 
     return [
-        CurrencyUtils.convertToDisplayString((iouReport?.unheldTotal ?? 0) * -1, iouReport?.currency ?? ''),
-        CurrencyUtils.convertToDisplayString((iouReport?.total ?? 0) * -1, iouReport?.currency ?? ''),
+        CurrencyUtils.convertToDisplayString((iouReport?.unheldTotal ?? 0) * coefficient, iouReport?.currency),
+        CurrencyUtils.convertToDisplayString((iouReport?.total ?? 0) * coefficient, iouReport?.currency),
     ];
 }
 
@@ -6131,13 +7155,13 @@ function getNonHeldAndFullAmount(iouReport: OnyxEntry<Report>, policy: OnyxEntry
  * - The action is a whisper action and it's neither a report preview nor IOU action
  * - The action is the thread's first chat
  */
-function shouldDisableThread(reportAction: OnyxEntry<ReportAction>, reportID: string): boolean {
+function shouldDisableThread(reportAction: OnyxInputOrEntry<ReportAction>, reportID: string): boolean {
     const isSplitBillAction = ReportActionsUtils.isSplitBillAction(reportAction);
     const isDeletedAction = ReportActionsUtils.isDeletedAction(reportAction);
     const isReportPreviewAction = ReportActionsUtils.isReportPreviewAction(reportAction);
     const isIOUAction = ReportActionsUtils.isMoneyRequestAction(reportAction);
     const isWhisperAction = ReportActionsUtils.isWhisperAction(reportAction) || ReportActionsUtils.isActionableTrackExpense(reportAction);
-    const isArchivedReport = isArchivedRoom(getReport(reportID));
+    const isArchivedReport = isArchivedRoom(getReportOrDraftReport(reportID), getReportNameValuePairs(reportID));
     const isActionDisabled = CONST.REPORT.ACTIONS.THREAD_DISABLED.some((action: string) => action === reportAction?.actionName);
 
     return (
@@ -6158,33 +7182,28 @@ function getAllAncestorReportActions(report: Report | null | undefined): Ancesto
     let parentReportID = report.parentReportID;
     let parentReportActionID = report.parentReportActionID;
 
-    // Store the child of parent report
-    let currentReport = report;
-
     while (parentReportID) {
-        const parentReport = getReport(parentReportID);
-        const parentReportAction = ReportActionsUtils.getReportAction(parentReportID, parentReportActionID ?? '0');
+        const parentReport = getReportOrDraftReport(parentReportID);
+        const parentReportAction = ReportActionsUtils.getReportAction(parentReportID, parentReportActionID ?? '-1');
 
-        if (!parentReportAction || ReportActionsUtils.isTransactionThread(parentReportAction)) {
+        if (
+            !parentReport ||
+            !parentReportAction ||
+            (ReportActionsUtils.isTransactionThread(parentReportAction) && !ReportActionsUtils.isSentMoneyReportAction(parentReportAction)) ||
+            ReportActionsUtils.isReportPreviewAction(parentReportAction)
+        ) {
             break;
         }
 
-        const isParentReportActionUnread = ReportActionsUtils.isCurrentActionUnread(parentReport ?? {}, parentReportAction);
+        const isParentReportActionUnread = ReportActionsUtils.isCurrentActionUnread(parentReport, parentReportAction);
         allAncestors.push({
-            report: currentReport,
+            report: parentReport,
             reportAction: parentReportAction,
             shouldDisplayNewMarker: isParentReportActionUnread,
         });
 
-        if (!parentReport) {
-            break;
-        }
-
         parentReportID = parentReport?.parentReportID;
         parentReportActionID = parentReport?.parentReportActionID;
-        if (!isEmptyObject(parentReport)) {
-            currentReport = parentReport;
-        }
     }
 
     return allAncestors.reverse();
@@ -6206,15 +7225,20 @@ function getAllAncestorReportActionIDs(report: Report | null | undefined, includ
     let parentReportActionID = report.parentReportActionID;
 
     while (parentReportID) {
-        const parentReport = getReport(parentReportID);
-        const parentReportAction = ReportActionsUtils.getReportAction(parentReportID, parentReportActionID ?? '0');
+        const parentReport = getReportOrDraftReport(parentReportID);
+        const parentReportAction = ReportActionsUtils.getReportAction(parentReportID, parentReportActionID ?? '-1');
 
-        if (!parentReportAction || (!includeTransactionThread && ReportActionsUtils.isTransactionThread(parentReportAction))) {
+        if (
+            !parentReportAction ||
+            (!includeTransactionThread &&
+                ((ReportActionsUtils.isTransactionThread(parentReportAction) && !ReportActionsUtils.isSentMoneyReportAction(parentReportAction)) ||
+                    ReportActionsUtils.isReportPreviewAction(parentReportAction)))
+        ) {
             break;
         }
 
-        allAncestorIDs.reportIDs.push(parentReportID ?? '');
-        allAncestorIDs.reportActionsIDs.push(parentReportActionID ?? '');
+        allAncestorIDs.reportIDs.push(parentReportID ?? '-1');
+        allAncestorIDs.reportActionsIDs.push(parentReportActionID ?? '-1');
 
         if (!parentReport) {
             break;
@@ -6233,8 +7257,8 @@ function getAllAncestorReportActionIDs(report: Report | null | undefined, includ
  * @param lastVisibleActionCreated Last visible action created of the child report
  * @param type The type of action in the child report
  */
-function getOptimisticDataForParentReportAction(reportID: string, lastVisibleActionCreated: string, type: string): Array<OnyxUpdate | EmptyObject> {
-    const report = getReport(reportID);
+function getOptimisticDataForParentReportAction(reportID: string, lastVisibleActionCreated: string, type: string): Array<OnyxUpdate | null> {
+    const report = getReportOrDraftReport(reportID);
 
     if (!report || isEmptyObject(report)) {
         return [];
@@ -6244,33 +7268,33 @@ function getOptimisticDataForParentReportAction(reportID: string, lastVisibleAct
     const totalAncestor = ancestors.reportIDs.length;
 
     return Array.from(Array(totalAncestor), (_, index) => {
-        const ancestorReport = getReport(ancestors.reportIDs[index]);
+        const ancestorReport = getReportOrDraftReport(ancestors.reportIDs[index]);
 
         if (!ancestorReport || isEmptyObject(ancestorReport)) {
-            return {} as EmptyObject;
+            return null;
         }
 
         const ancestorReportAction = ReportActionsUtils.getReportAction(ancestorReport.reportID, ancestors.reportActionsIDs[index]);
 
         if (!ancestorReportAction || isEmptyObject(ancestorReportAction)) {
-            return {} as EmptyObject;
+            return null;
         }
 
         return {
             onyxMethod: Onyx.METHOD.MERGE,
             key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${ancestorReport.reportID}`,
             value: {
-                [ancestorReportAction?.reportActionID ?? '']: updateOptimisticParentReportAction(ancestorReportAction, lastVisibleActionCreated, type),
+                [ancestorReportAction?.reportActionID ?? '-1']: updateOptimisticParentReportAction(ancestorReportAction, lastVisibleActionCreated, type),
             },
         };
     });
 }
 
-function canBeAutoReimbursed(report: OnyxEntry<Report>, policy: OnyxEntry<Policy> | EmptyObject): boolean {
+function canBeAutoReimbursed(report: OnyxInputOrEntry<Report>, policy: OnyxInputOrEntry<Policy>): boolean {
     if (isEmptyObject(policy)) {
         return false;
     }
-    type CurrencyType = (typeof CONST.DIRECT_REIMBURSEMENT_CURRENCIES)[number];
+    type CurrencyType = TupleToUnion<typeof CONST.DIRECT_REIMBURSEMENT_CURRENCIES>;
     const reimbursableTotal = getMoneyRequestSpendBreakdown(report).totalDisplaySpend;
     const autoReimbursementLimit = policy.autoReimbursementLimit ?? 0;
     const isAutoReimbursable =
@@ -6283,17 +7307,14 @@ function canBeAutoReimbursed(report: OnyxEntry<Report>, policy: OnyxEntry<Policy
 }
 
 /** Check if the current user is an owner of the report */
-function isReportOwner(report: OnyxEntry<Report>): boolean {
+function isReportOwner(report: OnyxInputOrEntry<Report>): boolean {
     return report?.ownerAccountID === currentUserPersonalDetails?.accountID;
 }
 
 function isAllowedToApproveExpenseReport(report: OnyxEntry<Report>, approverAccountID?: number): boolean {
     const policy = getPolicy(report?.policyID);
-    const {preventSelfApproval} = policy;
-
     const isOwner = (approverAccountID ?? currentUserAccountID) === report?.ownerAccountID;
-
-    return !(preventSelfApproval && isOwner);
+    return !(policy?.preventSelfApproval && isOwner);
 }
 
 function isAllowedToSubmitDraftExpenseReport(report: OnyxEntry<Report>): boolean {
@@ -6308,10 +7329,10 @@ function isAllowedToSubmitDraftExpenseReport(report: OnyxEntry<Report>): boolean
  */
 function getIndicatedMissingPaymentMethod(userWallet: OnyxEntry<UserWallet>, reportId: string, reportAction: ReportAction): MissingPaymentMethod | undefined {
     const isSubmitterOfUnsettledReport = isCurrentUserSubmitter(reportId) && !isSettled(reportId);
-    if (!isSubmitterOfUnsettledReport || reportAction.actionName !== CONST.REPORT.ACTIONS.TYPE.REIMBURSEMENT_QUEUED) {
+    if (!isSubmitterOfUnsettledReport || !ReportActionsUtils.isReimbursementQueuedAction(reportAction)) {
         return undefined;
     }
-    const paymentType = reportAction.originalMessage?.paymentType;
+    const paymentType = ReportActionsUtils.getOriginalMessage(reportAction)?.paymentType;
     if (paymentType === CONST.IOU.PAYMENT_TYPE.EXPENSIFY) {
         return isEmpty(userWallet) || userWallet.tierName === CONST.WALLET.TIER_NAME.SILVER ? 'wallet' : undefined;
     }
@@ -6324,18 +7345,31 @@ function getIndicatedMissingPaymentMethod(userWallet: OnyxEntry<UserWallet>, rep
  */
 function hasMissingPaymentMethod(userWallet: OnyxEntry<UserWallet>, iouReportID: string): boolean {
     const reportActions = allReportActions?.[`${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${iouReportID}`] ?? {};
-    return Object.values(reportActions).some((action) => getIndicatedMissingPaymentMethod(userWallet, iouReportID, action) !== undefined);
+    return Object.values(reportActions)
+        .filter(Boolean)
+        .some((action) => getIndicatedMissingPaymentMethod(userWallet, iouReportID, action) !== undefined);
 }
 
 /**
  * Used from expense actions to decide if we need to build an optimistic expense report.
-   Create a new report if:
-   - we don't have an iouReport set in the chatReport
-   - we have one, but it's waiting on the payee adding a bank account
-   - we have one but we can't add more transactions to it due to: report is approved or settled, or report is processing and policy isn't on Instant submit reporting frequency
+ * Create a new report if:
+ * - we don't have an iouReport set in the chatReport
+ * - we have one, but it's waiting on the payee adding a bank account
+ * - we have one, but we can't add more transactions to it due to: report is approved or settled, or report is processing and policy isn't on Instant submit reporting frequency
  */
-function shouldCreateNewMoneyRequestReport(existingIOUReport: OnyxEntry<Report> | undefined | null, chatReport: OnyxEntry<Report> | null): boolean {
-    return !existingIOUReport || hasIOUWaitingOnCurrentUserBankAccount(chatReport) || !canAddOrDeleteTransactions(existingIOUReport);
+function shouldCreateNewMoneyRequestReport(existingIOUReport: OnyxInputOrEntry<Report> | undefined, chatReport: OnyxInputOrEntry<Report>): boolean {
+    return !existingIOUReport || hasIOUWaitingOnCurrentUserBankAccount(chatReport) || !canAddTransaction(existingIOUReport);
+}
+
+function getTripTransactions(tripRoomReportID: string | undefined, reportFieldToCompare: 'parentReportID' | 'reportID' = 'parentReportID'): Transaction[] {
+    const tripTransactionReportIDs = Object.values(ReportConnection.getAllReports() ?? {})
+        .filter((report) => report && report?.[reportFieldToCompare] === tripRoomReportID)
+        .map((report) => report?.reportID);
+    return tripTransactionReportIDs.flatMap((reportID) => reportsTransactions[reportID ?? ''] ?? []);
+}
+
+function getTripIDFromTransactionParentReport(transactionParentReport: OnyxEntry<Report> | undefined | null): string | undefined {
+    return getReportOrDraftReport(transactionParentReport?.parentReportID)?.tripData?.tripID;
 }
 
 /**
@@ -6343,17 +7377,91 @@ function shouldCreateNewMoneyRequestReport(existingIOUReport: OnyxEntry<Report>
  */
 function hasActionsWithErrors(reportID: string): boolean {
     const reportActions = allReportActions?.[`${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${reportID}`] ?? {};
-    return Object.values(reportActions).some((action) => !isEmptyObject(action.errors));
+    return Object.values(reportActions)
+        .filter(Boolean)
+        .some((action) => !isEmptyObject(action.errors));
 }
 
-function canLeavePolicyExpenseChat(report: OnyxEntry<Report>, policy: OnyxEntry<Policy> | EmptyObject): boolean {
+function isNonAdminOrOwnerOfPolicyExpenseChat(report: OnyxInputOrEntry<Report>, policy: OnyxInputOrEntry<Policy>): boolean {
     return isPolicyExpenseChat(report) && !(PolicyUtils.isPolicyAdmin(policy) || PolicyUtils.isPolicyOwner(policy, currentUserAccountID ?? -1) || isReportOwner(report));
 }
 
-function getReportActionActorAccountID(reportAction: OnyxEntry<ReportAction>, iouReport: OnyxEntry<Report> | undefined): number | undefined {
+function isAdminOwnerApproverOrReportOwner(report: OnyxEntry<Report>, policy: OnyxEntry<Policy>): boolean {
+    const isApprover = isMoneyRequestReport(report) && report?.managerID !== null && currentUserPersonalDetails?.accountID === report?.managerID;
+
+    return PolicyUtils.isPolicyAdmin(policy) || PolicyUtils.isPolicyOwner(policy, currentUserAccountID ?? -1) || isReportOwner(report) || isApprover;
+}
+
+/**
+ * Whether the user can join a report
+ */
+function canJoinChat(report: OnyxInputOrEntry<Report>, parentReportAction: OnyxInputOrEntry<ReportAction>, policy: OnyxInputOrEntry<Policy>): boolean {
+    // We disabled thread functions for whisper action
+    // So we should not show join option for existing thread on whisper message that has already been left, or manually leave it
+    if (ReportActionsUtils.isWhisperAction(parentReportAction)) {
+        return false;
+    }
+
+    // If the notification preference of the chat is not hidden that means we have already joined the chat
+    if (report?.notificationPreference !== CONST.REPORT.NOTIFICATION_PREFERENCE.HIDDEN) {
+        return false;
+    }
+
+    const isExpenseChat = isMoneyRequestReport(report) || isMoneyRequest(report) || isInvoiceReport(report) || isTrackExpenseReport(report);
+    // Anyone viewing these chat types is already a participant and therefore cannot join
+    if (isRootGroupChat(report) || isSelfDM(report) || isInvoiceRoom(report) || isSystemChat(report) || isExpenseChat) {
+        return false;
+    }
+
+    // The user who is a member of the workspace has already joined the public announce room.
+    if (isPublicAnnounceRoom(report) && !isEmptyObject(policy)) {
+        return false;
+    }
+
+    return isChatThread(report) || isUserCreatedPolicyRoom(report) || isNonAdminOrOwnerOfPolicyExpenseChat(report, policy);
+}
+
+/**
+ * Whether the user can leave a report
+ */
+function canLeaveChat(report: OnyxEntry<Report>, policy: OnyxEntry<Policy>): boolean {
+    if (isRootGroupChat(report)) {
+        return true;
+    }
+
+    if (isPolicyExpenseChat(report) && !report?.isOwnPolicyExpenseChat && !PolicyUtils.isPolicyAdmin(policy)) {
+        return true;
+    }
+
+    if (isPublicRoom(report) && SessionUtils.isAnonymousUser()) {
+        return false;
+    }
+
+    if (report?.notificationPreference === CONST.REPORT.NOTIFICATION_PREFERENCE.HIDDEN) {
+        return false;
+    }
+
+    // Anyone viewing these chat types is already a participant and therefore cannot leave
+    if (isSelfDM(report)) {
+        return false;
+    }
+
+    // The user who is a member of the workspace cannot leave the public announce room.
+    if (isPublicAnnounceRoom(report) && !isEmptyObject(policy)) {
+        return false;
+    }
+
+    if (isInvoiceRoom(report)) {
+        return canLeaveInvoiceRoom(report);
+    }
+
+    return (isChatThread(report) && !!report?.notificationPreference?.length) || isUserCreatedPolicyRoom(report) || isNonAdminOrOwnerOfPolicyExpenseChat(report, policy);
+}
+
+function getReportActionActorAccountID(reportAction: OnyxInputOrEntry<ReportAction>, iouReport: OnyxInputOrEntry<Report> | undefined): number | undefined {
     switch (reportAction?.actionName) {
         case CONST.REPORT.ACTIONS.TYPE.REPORT_PREVIEW:
-            return iouReport ? iouReport.managerID : reportAction?.actorAccountID;
+            return !isEmptyObject(iouReport) ? iouReport.managerID : reportAction?.childManagerAccountID;
 
         case CONST.REPORT.ACTIONS.TYPE.SUBMITTED:
             return reportAction?.adminAccountID ?? reportAction?.actorAccountID;
@@ -6363,6 +7471,26 @@ function getReportActionActorAccountID(reportAction: OnyxEntry<ReportAction>, io
     }
 }
 
+function createDraftWorkspaceAndNavigateToConfirmationScreen(transactionID: string, actionName: IOUAction): void {
+    const isCategorizing = actionName === CONST.IOU.ACTION.CATEGORIZE;
+    const {expenseChatReportID, policyID, policyName} = PolicyActions.createDraftWorkspace();
+    IOU.setMoneyRequestParticipants(transactionID, [
+        {
+            selected: true,
+            accountID: 0,
+            isPolicyExpenseChat: true,
+            reportID: expenseChatReportID,
+            policyID,
+            searchText: policyName,
+        },
+    ]);
+    if (isCategorizing) {
+        Navigation.navigate(ROUTES.MONEY_REQUEST_STEP_CATEGORY.getRoute(actionName, CONST.IOU.TYPE.SUBMIT, transactionID, expenseChatReportID));
+    } else {
+        Navigation.navigate(ROUTES.MONEY_REQUEST_STEP_CONFIRMATION.getRoute(actionName, CONST.IOU.TYPE.SUBMIT, transactionID, expenseChatReportID, true));
+    }
+}
+
 function createDraftTransactionAndNavigateToParticipantSelector(transactionID: string, reportID: string, actionName: IOUAction, reportActionID: string): void {
     const transaction = allTransactions?.[`${ONYXKEYS.COLLECTION.TRANSACTION}${transactionID}`] ?? ({} as Transaction);
     const reportActions = allReportActions?.[`${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${reportID}`] ?? ([] as ReportAction[]);
@@ -6371,7 +7499,9 @@ function createDraftTransactionAndNavigateToParticipantSelector(transactionID: s
         return;
     }
 
-    const linkedTrackedExpenseReportAction = Object.values(reportActions).find((action) => (action.originalMessage as IOUMessage)?.IOUTransactionID === transactionID);
+    const linkedTrackedExpenseReportAction = Object.values(reportActions)
+        .filter(Boolean)
+        .find((action) => ReportActionsUtils.isMoneyRequestAction(action) && ReportActionsUtils.getOriginalMessage(action)?.IOUTransactionID === transactionID);
 
     const {created, amount, currency, merchant, mccGroup} = getTransactionDetails(transaction) ?? {};
     const comment = getTransactionCommentObject(transaction);
@@ -6382,15 +7512,17 @@ function createDraftTransactionAndNavigateToParticipantSelector(transactionID: s
         linkedTrackedExpenseReportAction,
         linkedTrackedExpenseReportID: reportID,
         created,
+        modifiedCreated: undefined,
         amount,
         currency,
         comment,
         merchant,
+        modifiedMerchant: '',
         mccGroup,
     } as Transaction);
 
     const filteredPolicies = Object.values(allPolicies ?? {}).filter(
-        (policy) => policy?.type !== CONST.POLICY.TYPE.PERSONAL && policy?.pendingAction !== CONST.RED_BRICK_ROAD_PENDING_ACTION.DELETE,
+        (policy) => policy && policy.type !== CONST.POLICY.TYPE.PERSONAL && policy.pendingAction !== CONST.RED_BRICK_ROAD_PENDING_ACTION.DELETE,
     );
 
     if (actionName === CONST.IOU.ACTION.SUBMIT || (allPolicies && filteredPolicies.length > 0)) {
@@ -6398,31 +7530,13 @@ function createDraftTransactionAndNavigateToParticipantSelector(transactionID: s
         return;
     }
 
-    const {expenseChatReportID, policyID, policyName} = PolicyActions.createWorkspace();
-    const isCategorizing = actionName === CONST.IOU.ACTION.CATEGORIZE;
-
-    IOU.setMoneyRequestParticipants(transactionID, [
-        {
-            selected: true,
-            accountID: 0,
-            isPolicyExpenseChat: true,
-            reportID: expenseChatReportID,
-            policyID,
-            searchText: policyName,
-        },
-    ]);
-    const iouConfirmationPageRoute = ROUTES.MONEY_REQUEST_STEP_CONFIRMATION.getRoute(actionName, CONST.IOU.TYPE.SUBMIT, transactionID, expenseChatReportID);
-    if (isCategorizing) {
-        Navigation.navigate(ROUTES.MONEY_REQUEST_STEP_CATEGORY.getRoute(actionName, CONST.IOU.TYPE.SUBMIT, transactionID, expenseChatReportID, iouConfirmationPageRoute));
-    } else {
-        Navigation.navigate(iouConfirmationPageRoute);
-    }
+    return createDraftWorkspaceAndNavigateToConfirmationScreen(transactionID, actionName);
 }
 
 /**
  * @returns the object to update `report.hasOutstandingChildRequest`
  */
-function getOutstandingChildRequest(iouReport: OnyxEntry<Report> | EmptyObject): OutstandingChildRequest {
+function getOutstandingChildRequest(iouReport: OnyxInputOrEntry<Report>): OutstandingChildRequest {
     if (!iouReport || isEmptyObject(iouReport)) {
         return {};
     }
@@ -6452,23 +7566,171 @@ function canReportBeMentionedWithinPolicy(report: OnyxEntry<Report>, policyID: s
         return false;
     }
 
-    return isChatRoom(report) && !isThread(report);
+    return isChatRoom(report) && !isInvoiceRoom(report) && !isThread(report);
 }
 
 function shouldShowMerchantColumn(transactions: Transaction[]) {
-    return transactions.some((transaction) => isExpenseReport(allReports?.[transaction.reportID] ?? {}));
+    const allReports = ReportConnection.getAllReports();
+    return transactions.some((transaction) => isExpenseReport(allReports?.[transaction.reportID] ?? null));
+}
+
+/**
+ * Whether the report is a system chat or concierge chat, depending on the onboarding report ID or fallbacking
+ * to the user's account ID (used for A/B testing purposes).
+ */
+function isChatUsedForOnboarding(optionOrReport: OnyxEntry<Report> | OptionData): boolean {
+    // onboarding can be an array for old accounts and accounts created from olddot
+    if (onboarding && !Array.isArray(onboarding) && onboarding.chatReportID) {
+        return onboarding.chatReportID === optionOrReport?.reportID;
+    }
+
+    return AccountUtils.isAccountIDOddNumber(currentUserAccountID ?? -1)
+        ? isSystemChat(optionOrReport)
+        : (optionOrReport as OptionData)?.isConciergeChat ?? isConciergeChatReport(optionOrReport);
+}
+
+/**
+ * Get the report (system or concierge chat) used for the user's onboarding process.
+ */
+function getChatUsedForOnboarding(): OnyxEntry<Report> {
+    return Object.values(ReportConnection.getAllReports() ?? {}).find(isChatUsedForOnboarding);
+}
+
+/**
+ * Checks if given field has any violations and returns name of the first encountered one
+ */
+function getFieldViolation(violations: OnyxEntry<ReportViolations>, reportField: PolicyReportField): ReportViolationName | undefined {
+    if (!violations || !reportField) {
+        return undefined;
+    }
+
+    return Object.values(CONST.REPORT_VIOLATIONS).find((violation) => !!violations[violation] && violations[violation][reportField.fieldID]);
+}
+
+/**
+ * Returns translation for given field violation
+ */
+function getFieldViolationTranslation(reportField: PolicyReportField, violation?: ReportViolationName): string {
+    if (!violation) {
+        return '';
+    }
+
+    switch (violation) {
+        case 'fieldRequired':
+            return Localize.translateLocal('reportViolations.fieldRequired', reportField.name);
+        default:
+            return '';
+    }
+}
+
+/**
+ * Returns all violations for report
+ */
+function getReportViolations(reportID: string): ReportViolations | undefined {
+    if (!allReportsViolations) {
+        return undefined;
+    }
+
+    return allReportsViolations[`${ONYXKEYS.COLLECTION.REPORT_VIOLATIONS}${reportID}`];
+}
+
+function findPolicyExpenseChatByPolicyID(policyID: string): OnyxEntry<Report> {
+    return Object.values(ReportConnection.getAllReports() ?? {}).find((report) => isPolicyExpenseChat(report) && report?.policyID === policyID);
+}
+
+/**
+ * A function to get the report last message. This is usually used to restore the report message preview in LHN after report actions change.
+ * @param reportID
+ * @param actionsToMerge
+ * @returns containing the calculated message preview data of the report
+ */
+function getReportLastMessage(reportID: string, actionsToMerge?: ReportActions) {
+    let result: Partial<Report> = {
+        lastMessageTranslationKey: '',
+        lastMessageText: '',
+        lastVisibleActionCreated: '',
+    };
+
+    const {lastMessageText = '', lastMessageTranslationKey = ''} = getLastVisibleMessage(reportID, actionsToMerge);
+
+    if (lastMessageText || lastMessageTranslationKey) {
+        const lastVisibleAction = ReportActionsUtils.getLastVisibleAction(reportID, actionsToMerge);
+        const lastVisibleActionCreated = lastVisibleAction?.created;
+        const lastActorAccountID = lastVisibleAction?.actorAccountID;
+        result = {
+            lastMessageTranslationKey,
+            lastMessageText,
+            lastVisibleActionCreated,
+            lastActorAccountID,
+        };
+    }
+
+    return result;
+}
+
+function getSourceIDFromReportAction(reportAction: OnyxEntry<ReportAction>): string {
+    const message = Array.isArray(reportAction?.message) ? reportAction?.message?.at(-1) ?? null : reportAction?.message ?? null;
+    const html = message?.html ?? '';
+    const {sourceURL} = getAttachmentDetails(html);
+    const sourceID = (sourceURL?.match(CONST.REGEX.ATTACHMENT_ID) ?? [])[1];
+    return sourceID;
+}
+
+function getIntegrationIcon(connectionName?: ConnectionName) {
+    if (connectionName === CONST.POLICY.CONNECTIONS.NAME.XERO) {
+        return XeroCircle;
+    }
+    if (connectionName === CONST.POLICY.CONNECTIONS.NAME.QBO) {
+        return QBOCircle;
+    }
+    return undefined;
+}
+
+function canBeExported(report: OnyxEntry<Report>) {
+    if (!report?.statusNum) {
+        return false;
+    }
+    const isCorrectState = [CONST.REPORT.STATUS_NUM.APPROVED, CONST.REPORT.STATUS_NUM.CLOSED, CONST.REPORT.STATUS_NUM.REIMBURSED].some((status) => status === report.statusNum);
+    return isExpenseReport(report) && isCorrectState;
+}
+
+function isExported(reportActions: OnyxEntry<ReportActions>) {
+    if (!reportActions) {
+        return false;
+    }
+    return Object.values(reportActions).some((action) => ReportActionsUtils.isExportIntegrationAction(action));
+}
+
+function getApprovalChain(policy: OnyxEntry<Policy>, employeeAccountID: number, reportTotal: number): string[] {
+    const approvalChain: string[] = [];
+
+    // If the policy is not on advanced approval mode, we should not use the approval chain even if it exists.
+    if (!PolicyUtils.isControlOnAdvancedApprovalMode(policy)) {
+        return approvalChain;
+    }
+
+    let nextApproverEmail = PolicyUtils.getSubmitToEmail(policy, employeeAccountID);
+
+    while (nextApproverEmail && !approvalChain.includes(nextApproverEmail)) {
+        approvalChain.push(nextApproverEmail);
+        nextApproverEmail = PolicyUtils.getForwardsToAccount(policy, nextApproverEmail, reportTotal);
+    }
+    return approvalChain;
 }
 
 export {
     addDomainToShortMention,
+    completeShortMention,
     areAllRequestsBeingSmartScanned,
     buildOptimisticAddCommentReportAction,
     buildOptimisticApprovedReportAction,
+    buildOptimisticUnapprovedReportAction,
     buildOptimisticCancelPaymentReportAction,
     buildOptimisticChangedTaskAssigneeReportAction,
     buildOptimisticChatReport,
     buildOptimisticClosedReportAction,
     buildOptimisticCreatedReportAction,
+    buildOptimisticDismissedViolationReportAction,
     buildOptimisticEditedTaskFieldReportAction,
     buildOptimisticExpenseReport,
     buildOptimisticGroupChatReport,
@@ -6481,7 +7743,9 @@ export {
     buildOptimisticMovedReportAction,
     buildOptimisticMovedTrackedExpenseModifiedReportAction,
     buildOptimisticRenamedRoomReportAction,
+    buildOptimisticRoomDescriptionUpdatedReportAction,
     buildOptimisticReportPreview,
+    buildOptimisticActionableTrackExpenseWhisper,
     buildOptimisticSubmittedReportAction,
     buildOptimisticTaskCommentReportAction,
     buildOptimisticTaskReport,
@@ -6491,11 +7755,15 @@ export {
     buildParticipantsFromAccountIDs,
     buildTransactionThread,
     canAccessReport,
-    canAddOrDeleteTransactions,
+    isReportNotFound,
+    canAddTransaction,
+    canDeleteTransaction,
     canBeAutoReimbursed,
     canCreateRequest,
     canCreateTaskInReport,
+    canCurrentUserOpenReport,
     canDeleteReportAction,
+    canHoldUnholdReportAction,
     canEditFieldOfMoneyRequest,
     canEditMoneyRequest,
     canEditPolicyDescription,
@@ -6504,14 +7772,17 @@ export {
     canEditRoomVisibility,
     canEditWriteCapability,
     canFlagReportAction,
-    canLeavePolicyExpenseChat,
+    isNonAdminOrOwnerOfPolicyExpenseChat,
     canLeaveRoom,
+    canJoinChat,
+    canLeaveChat,
     canReportBeMentionedWithinPolicy,
     canRequestMoney,
     canSeeDefaultRoom,
     canShowReportRecipientLocalTime,
     canUserPerformWriteAction,
     chatIncludesChronos,
+    chatIncludesChronosWithID,
     chatIncludesConcierge,
     createDraftTransactionAndNavigateToParticipantSelector,
     doesReportBelongToWorkspace,
@@ -6529,7 +7800,6 @@ export {
     getAvailableReportFields,
     getBankAccountRoute,
     getChatByParticipants,
-    getChatByParticipantsAndPolicy,
     getChatRoomSubtitle,
     getChildReportNotificationPreference,
     getCommentLength,
@@ -6542,10 +7812,13 @@ export {
     getGroupChatName,
     getIOUReportActionDisplayMessage,
     getIOUReportActionMessage,
+    getIOUApprovedMessage,
+    getIOUForwardedMessage,
+    getWorkspaceNameUpdatedMessage,
+    getIOUSubmittedMessage,
     getIcons,
     getIconsForParticipants,
     getIndicatedMissingPaymentMethod,
-    getLastUpdatedReport,
     getLastVisibleMessage,
     getMoneyRequestOptions,
     getMoneyRequestSpendBreakdown,
@@ -6556,16 +7829,17 @@ export {
     getOutstandingChildRequest,
     getParentNavigationSubtitle,
     getParsedComment,
-    getParticipantAccountIDs,
+    getParticipantsAccountIDsForDisplay,
+    getParticipantsList,
     getParticipants,
     getPendingChatMembers,
     getPersonalDetailsForAccountID,
     getPolicyDescriptionText,
+    getPolicyExpenseChat,
     getPolicyName,
     getPolicyType,
     getReimbursementDeQueuedActionMessage,
     getReimbursementQueuedActionMessage,
-    getReport,
     getReportActionActorAccountID,
     getReportDescriptionText,
     getReportFieldKey,
@@ -6574,24 +7848,24 @@ export {
     getReportNotificationPreference,
     getReportOfflinePendingActionAndErrors,
     getReportParticipantsTitle,
-    getReportPolicyID,
     getReportPreviewMessage,
     getReportRecipientAccountIDs,
+    getReportOrDraftReport,
     getRoom,
-    getRoomWelcomeMessage,
     getRootParentReport,
     getRouteFromLink,
+    getSystemChat,
     getTaskAssigneeChatOnyxData,
     getTransactionDetails,
     getTransactionReportName,
     getTransactionsWithReceipts,
     getUserDetailTooltipText,
-    getVisibleChatMemberAccountIDs,
     getWhisperDisplayNames,
     getWorkspaceAvatar,
     getWorkspaceChats,
     getWorkspaceIcon,
     goBackToDetailsPage,
+    goBackFromPrivateNotes,
     getInvoicePayerName,
     getInvoicesChatName,
     getPayeeName,
@@ -6606,10 +7880,10 @@ export {
     hasOnlyHeldExpenses,
     hasOnlyTransactionsWithPendingRoutes,
     hasReportNameError,
-    hasSingleParticipant,
     hasSmartscanError,
     hasUpdatedTotal,
     hasViolations,
+    hasWarningTypeViolations,
     isActionCreator,
     isAdminRoom,
     isAdminsOnlyPostingRoom,
@@ -6618,9 +7892,12 @@ export {
     isAllowedToSubmitDraftExpenseReport,
     isAnnounceRoom,
     isArchivedRoom,
+    isArchivedRoomWithID,
+    isClosedReport,
     isCanceledTaskReport,
     isChatReport,
     isChatRoom,
+    isTripRoom,
     isChatThread,
     isChildReport,
     isClosedExpenseReportWithNoExpenses,
@@ -6633,17 +7910,21 @@ export {
     isDM,
     isDefaultRoom,
     isDeprecatedGroupDM,
+    isEmptyReport,
+    isRootGroupChat,
     isExpenseReport,
     isExpenseRequest,
     isExpensifyOnlyParticipantInReport,
     isGroupChat,
     isGroupChatAdmin,
+    isGroupPolicy,
     isReportInGroupPolicy,
     isHoldCreator,
     isIOUOwnedByCurrentUser,
     isIOUReport,
     isIOUReportUsingReport,
     isJoinRequestInAdminRoom,
+    isDomainRoom,
     isMoneyRequest,
     isMoneyRequestReport,
     isMoneyRequestReportPendingDeletion,
@@ -6663,6 +7944,7 @@ export {
     isPublicAnnounceRoom,
     isPublicRoom,
     isReportApproved,
+    isReportManuallyReimbursed,
     isReportDataReady,
     isReportFieldDisabled,
     isReportFieldOfTypeTitle,
@@ -6684,13 +7966,15 @@ export {
     isValidReportIDFromPath,
     isWaitingForAssigneeToCompleteTask,
     isInvoiceRoom,
+    isInvoiceRoomWithID,
     isInvoiceReport,
     isOpenInvoiceReport,
     canWriteInReport,
     navigateToDetailsPage,
     navigateToPrivateNotes,
+    navigateBackAfterDeleteTransaction,
     parseReportRouteParams,
-    reportFieldsEnabled,
+    parseReportActionHtmlToText,
     requiresAttentionFromCurrentUser,
     shouldAutoFocusOnKeyPress,
     shouldCreateNewMoneyRequestReport,
@@ -6702,22 +7986,47 @@ export {
     shouldReportBeInOptionList,
     shouldReportShowSubscript,
     shouldShowFlagComment,
+    shouldShowRBRForMissingSmartscanFields,
     shouldUseFullTitleToDisplay,
-    sortReportsByLastRead,
     updateOptimisticParentReportAction,
     updateReportPreview,
     temporary_getMoneyRequestOptions,
+    getTripTransactions,
+    getTripIDFromTransactionParentReport,
     buildOptimisticInvoiceReport,
-    buildOptimisticInviteReportAction,
     getInvoiceChatByParticipants,
     shouldShowMerchantColumn,
     isCurrentUserInvoiceReceiver,
+    isDraftReport,
+    changeMoneyRequestHoldStatus,
+    isAdminOwnerApproverOrReportOwner,
+    createDraftWorkspaceAndNavigateToConfirmationScreen,
+    isChatUsedForOnboarding,
+    buildOptimisticExportIntegrationAction,
+    getChatUsedForOnboarding,
+    getFieldViolationTranslation,
+    getFieldViolation,
+    getReportViolations,
+    findPolicyExpenseChatByPolicyID,
+    getIntegrationIcon,
+    canBeExported,
+    isExported,
+    hasOnlyNonReimbursableTransactions,
+    getReportLastMessage,
+    getMostRecentlyVisitedReport,
+    getSourceIDFromReportAction,
+    getReport,
+    getReportNameValuePairs,
+    hasReportViolations,
+    isPayAtEndExpenseReport,
+    getArchiveReason,
+    getApprovalChain,
+    isIndividualInvoiceRoom,
 };
 
 export type {
     Ancestor,
     DisplayNameWithTooltips,
-    ExpenseOriginalMessage,
     OptimisticAddCommentReportAction,
     OptimisticChatReport,
     OptimisticClosedReportAction,
@@ -6726,6 +8035,6 @@ export type {
     OptimisticTaskReportAction,
     OptionData,
     TransactionDetails,
-    OptimisticInviteReportAction,
+    PartialReportAction,
     ParsingDetails,
 };
diff --git a/src/libs/SearchParser/searchParser.js b/src/libs/SearchParser/searchParser.js
new file mode 100644
index 000000000000..403e8442ed5b
--- /dev/null
+++ b/src/libs/SearchParser/searchParser.js
@@ -0,0 +1,1194 @@
+// @generated by Peggy 4.0.3.
+//
+// https://peggyjs.org/
+
+
+function peg$subclass(child, parent) {
+  function C() { this.constructor = child; }
+  C.prototype = parent.prototype;
+  child.prototype = new C();
+}
+
+function peg$SyntaxError(message, expected, found, location) {
+  var self = Error.call(this, message);
+  // istanbul ignore next Check is a necessary evil to support older environments
+  if (Object.setPrototypeOf) {
+    Object.setPrototypeOf(self, peg$SyntaxError.prototype);
+  }
+  self.expected = expected;
+  self.found = found;
+  self.location = location;
+  self.name = "SyntaxError";
+  return self;
+}
+
+peg$subclass(peg$SyntaxError, Error);
+
+function peg$padEnd(str, targetLength, padString) {
+  padString = padString || " ";
+  if (str.length > targetLength) { return str; }
+  targetLength -= str.length;
+  padString += padString.repeat(targetLength);
+  return str + padString.slice(0, targetLength);
+}
+
+peg$SyntaxError.prototype.format = function(sources) {
+  var str = "Error: " + this.message;
+  if (this.location) {
+    var src = null;
+    var k;
+    for (k = 0; k < sources.length; k++) {
+      if (sources[k].source === this.location.source) {
+        src = sources[k].text.split(/\r\n|\n|\r/g);
+        break;
+      }
+    }
+    var s = this.location.start;
+    var offset_s = (this.location.source && (typeof this.location.source.offset === "function"))
+      ? this.location.source.offset(s)
+      : s;
+    var loc = this.location.source + ":" + offset_s.line + ":" + offset_s.column;
+    if (src) {
+      var e = this.location.end;
+      var filler = peg$padEnd("", offset_s.line.toString().length, ' ');
+      var line = src[s.line - 1];
+      var last = s.line === e.line ? e.column : line.length + 1;
+      var hatLen = (last - s.column) || 1;
+      str += "\n --> " + loc + "\n"
+          + filler + " |\n"
+          + offset_s.line + " | " + line + "\n"
+          + filler + " | " + peg$padEnd("", s.column - 1, ' ')
+          + peg$padEnd("", hatLen, "^");
+    } else {
+      str += "\n at " + loc;
+    }
+  }
+  return str;
+};
+
+peg$SyntaxError.buildMessage = function(expected, found) {
+  var DESCRIBE_EXPECTATION_FNS = {
+    literal: function(expectation) {
+      return "\"" + literalEscape(expectation.text) + "\"";
+    },
+
+    class: function(expectation) {
+      var escapedParts = expectation.parts.map(function(part) {
+        return Array.isArray(part)
+          ? classEscape(part[0]) + "-" + classEscape(part[1])
+          : classEscape(part);
+      });
+
+      return "[" + (expectation.inverted ? "^" : "") + escapedParts.join("") + "]";
+    },
+
+    any: function() {
+      return "any character";
+    },
+
+    end: function() {
+      return "end of input";
+    },
+
+    other: function(expectation) {
+      return expectation.description;
+    }
+  };
+
+  function hex(ch) {
+    return ch.charCodeAt(0).toString(16).toUpperCase();
+  }
+
+  function literalEscape(s) {
+    return s
+      .replace(/\\/g, "\\\\")
+      .replace(/"/g,  "\\\"")
+      .replace(/\0/g, "\\0")
+      .replace(/\t/g, "\\t")
+      .replace(/\n/g, "\\n")
+      .replace(/\r/g, "\\r")
+      .replace(/[\x00-\x0F]/g,          function(ch) { return "\\x0" + hex(ch); })
+      .replace(/[\x10-\x1F\x7F-\x9F]/g, function(ch) { return "\\x"  + hex(ch); });
+  }
+
+  function classEscape(s) {
+    return s
+      .replace(/\\/g, "\\\\")
+      .replace(/\]/g, "\\]")
+      .replace(/\^/g, "\\^")
+      .replace(/-/g,  "\\-")
+      .replace(/\0/g, "\\0")
+      .replace(/\t/g, "\\t")
+      .replace(/\n/g, "\\n")
+      .replace(/\r/g, "\\r")
+      .replace(/[\x00-\x0F]/g,          function(ch) { return "\\x0" + hex(ch); })
+      .replace(/[\x10-\x1F\x7F-\x9F]/g, function(ch) { return "\\x"  + hex(ch); });
+  }
+
+  function describeExpectation(expectation) {
+    return DESCRIBE_EXPECTATION_FNS[expectation.type](expectation);
+  }
+
+  function describeExpected(expected) {
+    var descriptions = expected.map(describeExpectation);
+    var i, j;
+
+    descriptions.sort();
+
+    if (descriptions.length > 0) {
+      for (i = 1, j = 1; i < descriptions.length; i++) {
+        if (descriptions[i - 1] !== descriptions[i]) {
+          descriptions[j] = descriptions[i];
+          j++;
+        }
+      }
+      descriptions.length = j;
+    }
+
+    switch (descriptions.length) {
+      case 1:
+        return descriptions[0];
+
+      case 2:
+        return descriptions[0] + " or " + descriptions[1];
+
+      default:
+        return descriptions.slice(0, -1).join(", ")
+          + ", or "
+          + descriptions[descriptions.length - 1];
+    }
+  }
+
+  function describeFound(found) {
+    return found ? "\"" + literalEscape(found) + "\"" : "end of input";
+  }
+
+  return "Expected " + describeExpected(expected) + " but " + describeFound(found) + " found.";
+};
+
+function peg$parse(input, options) {
+  options = options !== undefined ? options : {};
+
+  var peg$FAILED = {};
+  var peg$source = options.grammarSource;
+
+  var peg$startRuleFunctions = { query: peg$parsequery };
+  var peg$startRuleFunction = peg$parsequery;
+
+  var peg$c0 = "!=";
+  var peg$c1 = ">";
+  var peg$c2 = ">=";
+  var peg$c3 = "<";
+  var peg$c4 = "<=";
+  var peg$c5 = "type";
+  var peg$c6 = "status";
+  var peg$c7 = "date";
+  var peg$c8 = "amount";
+  var peg$c9 = "expenseType";
+  var peg$c10 = "in";
+  var peg$c11 = "currency";
+  var peg$c12 = "merchant";
+  var peg$c13 = "description";
+  var peg$c14 = "from";
+  var peg$c15 = "to";
+  var peg$c16 = "category";
+  var peg$c17 = "tag";
+  var peg$c18 = "taxRate";
+  var peg$c19 = "cardID";
+  var peg$c20 = "reportID";
+  var peg$c21 = "keyword";
+  var peg$c22 = "sortBy";
+  var peg$c23 = "sortOrder";
+  var peg$c24 = "policyID";
+  var peg$c25 = "\"";
+
+  var peg$r0 = /^[:=]/;
+  var peg$r1 = /^[^"\r\n]/;
+  var peg$r2 = /^[A-Za-z0-9_@.\/#&+\-\\',;]/;
+  var peg$r3 = /^[ \t\r\n]/;
+
+  var peg$e0 = peg$classExpectation([":", "="], false, false);
+  var peg$e1 = peg$literalExpectation("!=", false);
+  var peg$e2 = peg$literalExpectation(">", false);
+  var peg$e3 = peg$literalExpectation(">=", false);
+  var peg$e4 = peg$literalExpectation("<", false);
+  var peg$e5 = peg$literalExpectation("<=", false);
+  var peg$e6 = peg$literalExpectation("type", false);
+  var peg$e7 = peg$literalExpectation("status", false);
+  var peg$e8 = peg$literalExpectation("date", false);
+  var peg$e9 = peg$literalExpectation("amount", false);
+  var peg$e10 = peg$literalExpectation("expenseType", false);
+  var peg$e11 = peg$literalExpectation("in", false);
+  var peg$e12 = peg$literalExpectation("currency", false);
+  var peg$e13 = peg$literalExpectation("merchant", false);
+  var peg$e14 = peg$literalExpectation("description", false);
+  var peg$e15 = peg$literalExpectation("from", false);
+  var peg$e16 = peg$literalExpectation("to", false);
+  var peg$e17 = peg$literalExpectation("category", false);
+  var peg$e18 = peg$literalExpectation("tag", false);
+  var peg$e19 = peg$literalExpectation("taxRate", false);
+  var peg$e20 = peg$literalExpectation("cardID", false);
+  var peg$e21 = peg$literalExpectation("reportID", false);
+  var peg$e22 = peg$literalExpectation("keyword", false);
+  var peg$e23 = peg$literalExpectation("sortBy", false);
+  var peg$e24 = peg$literalExpectation("sortOrder", false);
+  var peg$e25 = peg$literalExpectation("policyID", false);
+  var peg$e26 = peg$literalExpectation("\"", false);
+  var peg$e27 = peg$classExpectation(["\"", "\r", "\n"], true, false);
+  var peg$e28 = peg$classExpectation([["A", "Z"], ["a", "z"], ["0", "9"], "_", "@", ".", "/", "#", "&", "+", "-", "\\", "'", ",", ";"], false, false);
+  var peg$e29 = peg$otherExpectation("whitespace");
+  var peg$e30 = peg$classExpectation([" ", "\t", "\r", "\n"], false, false);
+
+  var peg$f0 = function(filters) {
+    const withDefaults = applyDefaults(filters);
+    if (defaultValues.policyID) {
+        return applyPolicyID(withDefaults);
+    }
+
+    return withDefaults;
+  };
+  var peg$f1 = function(head, tail) {
+      const allFilters = [head, ...tail.map(([_, filter]) => filter)].filter(filter => filter !== null);
+      if (!allFilters.length) {
+      	return null;
+      }
+     const keywords = allFilters.filter((filter) => filter.left === "keyword" || filter.right?.left === "keyword")
+     const nonKeywords = allFilters.filter((filter) => filter.left !== "keyword" && filter.right?.left !== "keyword")
+     if(!nonKeywords.length){
+     	return keywords.reduce((result, filter) => buildFilter("or", result, filter))
+     }
+     if(!keywords.length){
+     	return nonKeywords.reduce((result, filter) => buildFilter("and", result, filter))
+     }
+
+     return buildFilter("and", keywords.reduce((result, filter) => buildFilter("or", result, filter)), nonKeywords.reduce((result, filter) => buildFilter("and", result, filter)))
+
+      return allFilters.reduce((result, filter) => buildFilter("and", result, filter));
+    };
+  var peg$f2 = function(field, op, value) {
+      if (isDefaultField(field)) {
+        updateDefaultValues(field, value.trim());
+        return null;
+      }
+
+      if (isPolicyID(field)) {
+        updateDefaultValues(field, value.trim());
+        return null;
+      }
+
+      if (!field && !op) {
+        return buildFilter('eq', 'keyword', value.trim());
+      }
+
+      const values = value.split(',');
+      const operatorValue = op ?? 'eq';
+
+      return values.slice(1).reduce((acc, val) => buildFilter('or', acc, buildFilter(operatorValue, field, val.trim())), buildFilter(operatorValue, field, values[0]));
+    };
+  var peg$f3 = function() { return "eq"; };
+  var peg$f4 = function() { return "neq"; };
+  var peg$f5 = function() { return "gt"; };
+  var peg$f6 = function() { return "gte"; };
+  var peg$f7 = function() { return "lt"; };
+  var peg$f8 = function() { return "lte"; };
+  var peg$f9 = function() { return "type"; };
+  var peg$f10 = function() { return "status"; };
+  var peg$f11 = function() { return "date"; };
+  var peg$f12 = function() { return "amount"; };
+  var peg$f13 = function() { return "expenseType"; };
+  var peg$f14 = function() { return "in"; };
+  var peg$f15 = function() { return "currency"; };
+  var peg$f16 = function() { return "merchant"; };
+  var peg$f17 = function() { return "description"; };
+  var peg$f18 = function() { return "from"; };
+  var peg$f19 = function() { return "to"; };
+  var peg$f20 = function() { return "category"; };
+  var peg$f21 = function() { return "tag"; };
+  var peg$f22 = function() { return "taxRate"; };
+  var peg$f23 = function() { return "cardID"; };
+  var peg$f24 = function() { return "reportID"; };
+  var peg$f25 = function() { return "keyword"; };
+  var peg$f26 = function() { return "sortBy"; };
+  var peg$f27 = function() { return "sortOrder"; };
+  var peg$f28 = function() { return "policyID"; };
+  var peg$f29 = function(parts) { return parts.join(''); };
+  var peg$f30 = function(chars) { return chars.join(''); };
+  var peg$f31 = function(chars) { return chars.join(''); };
+  var peg$f32 = function() { return "and"; };
+  var peg$currPos = options.peg$currPos | 0;
+  var peg$savedPos = peg$currPos;
+  var peg$posDetailsCache = [{ line: 1, column: 1 }];
+  var peg$maxFailPos = peg$currPos;
+  var peg$maxFailExpected = options.peg$maxFailExpected || [];
+  var peg$silentFails = options.peg$silentFails | 0;
+
+  var peg$result;
+
+  if (options.startRule) {
+    if (!(options.startRule in peg$startRuleFunctions)) {
+      throw new Error("Can't start parsing from rule \"" + options.startRule + "\".");
+    }
+
+    peg$startRuleFunction = peg$startRuleFunctions[options.startRule];
+  }
+
+  function text() {
+    return input.substring(peg$savedPos, peg$currPos);
+  }
+
+  function offset() {
+    return peg$savedPos;
+  }
+
+  function range() {
+    return {
+      source: peg$source,
+      start: peg$savedPos,
+      end: peg$currPos
+    };
+  }
+
+  function location() {
+    return peg$computeLocation(peg$savedPos, peg$currPos);
+  }
+
+  function expected(description, location) {
+    location = location !== undefined
+      ? location
+      : peg$computeLocation(peg$savedPos, peg$currPos);
+
+    throw peg$buildStructuredError(
+      [peg$otherExpectation(description)],
+      input.substring(peg$savedPos, peg$currPos),
+      location
+    );
+  }
+
+  function error(message, location) {
+    location = location !== undefined
+      ? location
+      : peg$computeLocation(peg$savedPos, peg$currPos);
+
+    throw peg$buildSimpleError(message, location);
+  }
+
+  function peg$literalExpectation(text, ignoreCase) {
+    return { type: "literal", text: text, ignoreCase: ignoreCase };
+  }
+
+  function peg$classExpectation(parts, inverted, ignoreCase) {
+    return { type: "class", parts: parts, inverted: inverted, ignoreCase: ignoreCase };
+  }
+
+  function peg$anyExpectation() {
+    return { type: "any" };
+  }
+
+  function peg$endExpectation() {
+    return { type: "end" };
+  }
+
+  function peg$otherExpectation(description) {
+    return { type: "other", description: description };
+  }
+
+  function peg$computePosDetails(pos) {
+    var details = peg$posDetailsCache[pos];
+    var p;
+
+    if (details) {
+      return details;
+    } else {
+      if (pos >= peg$posDetailsCache.length) {
+        p = peg$posDetailsCache.length - 1;
+      } else {
+        p = pos;
+        while (!peg$posDetailsCache[--p]) {}
+      }
+
+      details = peg$posDetailsCache[p];
+      details = {
+        line: details.line,
+        column: details.column
+      };
+
+      while (p < pos) {
+        if (input.charCodeAt(p) === 10) {
+          details.line++;
+          details.column = 1;
+        } else {
+          details.column++;
+        }
+
+        p++;
+      }
+
+      peg$posDetailsCache[pos] = details;
+
+      return details;
+    }
+  }
+
+  function peg$computeLocation(startPos, endPos, offset) {
+    var startPosDetails = peg$computePosDetails(startPos);
+    var endPosDetails = peg$computePosDetails(endPos);
+
+    var res = {
+      source: peg$source,
+      start: {
+        offset: startPos,
+        line: startPosDetails.line,
+        column: startPosDetails.column
+      },
+      end: {
+        offset: endPos,
+        line: endPosDetails.line,
+        column: endPosDetails.column
+      }
+    };
+    if (offset && peg$source && (typeof peg$source.offset === "function")) {
+      res.start = peg$source.offset(res.start);
+      res.end = peg$source.offset(res.end);
+    }
+    return res;
+  }
+
+  function peg$fail(expected) {
+    if (peg$currPos < peg$maxFailPos) { return; }
+
+    if (peg$currPos > peg$maxFailPos) {
+      peg$maxFailPos = peg$currPos;
+      peg$maxFailExpected = [];
+    }
+
+    peg$maxFailExpected.push(expected);
+  }
+
+  function peg$buildSimpleError(message, location) {
+    return new peg$SyntaxError(message, null, null, location);
+  }
+
+  function peg$buildStructuredError(expected, found, location) {
+    return new peg$SyntaxError(
+      peg$SyntaxError.buildMessage(expected, found),
+      expected,
+      found,
+      location
+    );
+  }
+
+  function peg$parsequery() {
+    var s0, s1, s2, s3;
+
+    s0 = peg$currPos;
+    s1 = peg$parse_();
+    s2 = peg$parsefilterList();
+    if (s2 === peg$FAILED) {
+      s2 = null;
+    }
+    s3 = peg$parse_();
+    peg$savedPos = s0;
+    s0 = peg$f0(s2);
+
+    return s0;
+  }
+
+  function peg$parsefilterList() {
+    var s0, s1, s2, s3, s4, s5;
+
+    s0 = peg$currPos;
+    s1 = peg$parsefilter();
+    if (s1 !== peg$FAILED) {
+      s2 = [];
+      s3 = peg$currPos;
+      s4 = peg$parselogicalAnd();
+      s5 = peg$parsefilter();
+      if (s5 !== peg$FAILED) {
+        s4 = [s4, s5];
+        s3 = s4;
+      } else {
+        peg$currPos = s3;
+        s3 = peg$FAILED;
+      }
+      while (s3 !== peg$FAILED) {
+        s2.push(s3);
+        s3 = peg$currPos;
+        s4 = peg$parselogicalAnd();
+        s5 = peg$parsefilter();
+        if (s5 !== peg$FAILED) {
+          s4 = [s4, s5];
+          s3 = s4;
+        } else {
+          peg$currPos = s3;
+          s3 = peg$FAILED;
+        }
+      }
+      peg$savedPos = s0;
+      s0 = peg$f1(s1, s2);
+    } else {
+      peg$currPos = s0;
+      s0 = peg$FAILED;
+    }
+
+    return s0;
+  }
+
+  function peg$parsefilter() {
+    var s0, s1, s2, s3, s4, s5, s6;
+
+    s0 = peg$currPos;
+    s1 = peg$parse_();
+    s2 = peg$parsekey();
+    if (s2 === peg$FAILED) {
+      s2 = null;
+    }
+    s3 = peg$parse_();
+    s4 = peg$parseoperator();
+    if (s4 === peg$FAILED) {
+      s4 = null;
+    }
+    s5 = peg$parse_();
+    s6 = peg$parseidentifier();
+    if (s6 !== peg$FAILED) {
+      peg$savedPos = s0;
+      s0 = peg$f2(s2, s4, s6);
+    } else {
+      peg$currPos = s0;
+      s0 = peg$FAILED;
+    }
+
+    return s0;
+  }
+
+  function peg$parseoperator() {
+    var s0, s1;
+
+    s0 = peg$currPos;
+    s1 = input.charAt(peg$currPos);
+    if (peg$r0.test(s1)) {
+      peg$currPos++;
+    } else {
+      s1 = peg$FAILED;
+      if (peg$silentFails === 0) { peg$fail(peg$e0); }
+    }
+    if (s1 !== peg$FAILED) {
+      peg$savedPos = s0;
+      s1 = peg$f3();
+    }
+    s0 = s1;
+    if (s0 === peg$FAILED) {
+      s0 = peg$currPos;
+      if (input.substr(peg$currPos, 2) === peg$c0) {
+        s1 = peg$c0;
+        peg$currPos += 2;
+      } else {
+        s1 = peg$FAILED;
+        if (peg$silentFails === 0) { peg$fail(peg$e1); }
+      }
+      if (s1 !== peg$FAILED) {
+        peg$savedPos = s0;
+        s1 = peg$f4();
+      }
+      s0 = s1;
+      if (s0 === peg$FAILED) {
+        s0 = peg$currPos;
+        if (input.charCodeAt(peg$currPos) === 62) {
+          s1 = peg$c1;
+          peg$currPos++;
+        } else {
+          s1 = peg$FAILED;
+          if (peg$silentFails === 0) { peg$fail(peg$e2); }
+        }
+        if (s1 !== peg$FAILED) {
+          peg$savedPos = s0;
+          s1 = peg$f5();
+        }
+        s0 = s1;
+        if (s0 === peg$FAILED) {
+          s0 = peg$currPos;
+          if (input.substr(peg$currPos, 2) === peg$c2) {
+            s1 = peg$c2;
+            peg$currPos += 2;
+          } else {
+            s1 = peg$FAILED;
+            if (peg$silentFails === 0) { peg$fail(peg$e3); }
+          }
+          if (s1 !== peg$FAILED) {
+            peg$savedPos = s0;
+            s1 = peg$f6();
+          }
+          s0 = s1;
+          if (s0 === peg$FAILED) {
+            s0 = peg$currPos;
+            if (input.charCodeAt(peg$currPos) === 60) {
+              s1 = peg$c3;
+              peg$currPos++;
+            } else {
+              s1 = peg$FAILED;
+              if (peg$silentFails === 0) { peg$fail(peg$e4); }
+            }
+            if (s1 !== peg$FAILED) {
+              peg$savedPos = s0;
+              s1 = peg$f7();
+            }
+            s0 = s1;
+            if (s0 === peg$FAILED) {
+              s0 = peg$currPos;
+              if (input.substr(peg$currPos, 2) === peg$c4) {
+                s1 = peg$c4;
+                peg$currPos += 2;
+              } else {
+                s1 = peg$FAILED;
+                if (peg$silentFails === 0) { peg$fail(peg$e5); }
+              }
+              if (s1 !== peg$FAILED) {
+                peg$savedPos = s0;
+                s1 = peg$f8();
+              }
+              s0 = s1;
+            }
+          }
+        }
+      }
+    }
+
+    return s0;
+  }
+
+  function peg$parsekey() {
+    var s0, s1;
+
+    s0 = peg$currPos;
+    if (input.substr(peg$currPos, 4) === peg$c5) {
+      s1 = peg$c5;
+      peg$currPos += 4;
+    } else {
+      s1 = peg$FAILED;
+      if (peg$silentFails === 0) { peg$fail(peg$e6); }
+    }
+    if (s1 !== peg$FAILED) {
+      peg$savedPos = s0;
+      s1 = peg$f9();
+    }
+    s0 = s1;
+    if (s0 === peg$FAILED) {
+      s0 = peg$currPos;
+      if (input.substr(peg$currPos, 6) === peg$c6) {
+        s1 = peg$c6;
+        peg$currPos += 6;
+      } else {
+        s1 = peg$FAILED;
+        if (peg$silentFails === 0) { peg$fail(peg$e7); }
+      }
+      if (s1 !== peg$FAILED) {
+        peg$savedPos = s0;
+        s1 = peg$f10();
+      }
+      s0 = s1;
+      if (s0 === peg$FAILED) {
+        s0 = peg$currPos;
+        if (input.substr(peg$currPos, 4) === peg$c7) {
+          s1 = peg$c7;
+          peg$currPos += 4;
+        } else {
+          s1 = peg$FAILED;
+          if (peg$silentFails === 0) { peg$fail(peg$e8); }
+        }
+        if (s1 !== peg$FAILED) {
+          peg$savedPos = s0;
+          s1 = peg$f11();
+        }
+        s0 = s1;
+        if (s0 === peg$FAILED) {
+          s0 = peg$currPos;
+          if (input.substr(peg$currPos, 6) === peg$c8) {
+            s1 = peg$c8;
+            peg$currPos += 6;
+          } else {
+            s1 = peg$FAILED;
+            if (peg$silentFails === 0) { peg$fail(peg$e9); }
+          }
+          if (s1 !== peg$FAILED) {
+            peg$savedPos = s0;
+            s1 = peg$f12();
+          }
+          s0 = s1;
+          if (s0 === peg$FAILED) {
+            s0 = peg$currPos;
+            if (input.substr(peg$currPos, 11) === peg$c9) {
+              s1 = peg$c9;
+              peg$currPos += 11;
+            } else {
+              s1 = peg$FAILED;
+              if (peg$silentFails === 0) { peg$fail(peg$e10); }
+            }
+            if (s1 !== peg$FAILED) {
+              peg$savedPos = s0;
+              s1 = peg$f13();
+            }
+            s0 = s1;
+            if (s0 === peg$FAILED) {
+              s0 = peg$currPos;
+              if (input.substr(peg$currPos, 2) === peg$c10) {
+                s1 = peg$c10;
+                peg$currPos += 2;
+              } else {
+                s1 = peg$FAILED;
+                if (peg$silentFails === 0) { peg$fail(peg$e11); }
+              }
+              if (s1 !== peg$FAILED) {
+                peg$savedPos = s0;
+                s1 = peg$f14();
+              }
+              s0 = s1;
+              if (s0 === peg$FAILED) {
+                s0 = peg$currPos;
+                if (input.substr(peg$currPos, 8) === peg$c11) {
+                  s1 = peg$c11;
+                  peg$currPos += 8;
+                } else {
+                  s1 = peg$FAILED;
+                  if (peg$silentFails === 0) { peg$fail(peg$e12); }
+                }
+                if (s1 !== peg$FAILED) {
+                  peg$savedPos = s0;
+                  s1 = peg$f15();
+                }
+                s0 = s1;
+                if (s0 === peg$FAILED) {
+                  s0 = peg$currPos;
+                  if (input.substr(peg$currPos, 8) === peg$c12) {
+                    s1 = peg$c12;
+                    peg$currPos += 8;
+                  } else {
+                    s1 = peg$FAILED;
+                    if (peg$silentFails === 0) { peg$fail(peg$e13); }
+                  }
+                  if (s1 !== peg$FAILED) {
+                    peg$savedPos = s0;
+                    s1 = peg$f16();
+                  }
+                  s0 = s1;
+                  if (s0 === peg$FAILED) {
+                    s0 = peg$currPos;
+                    if (input.substr(peg$currPos, 11) === peg$c13) {
+                      s1 = peg$c13;
+                      peg$currPos += 11;
+                    } else {
+                      s1 = peg$FAILED;
+                      if (peg$silentFails === 0) { peg$fail(peg$e14); }
+                    }
+                    if (s1 !== peg$FAILED) {
+                      peg$savedPos = s0;
+                      s1 = peg$f17();
+                    }
+                    s0 = s1;
+                    if (s0 === peg$FAILED) {
+                      s0 = peg$currPos;
+                      if (input.substr(peg$currPos, 4) === peg$c14) {
+                        s1 = peg$c14;
+                        peg$currPos += 4;
+                      } else {
+                        s1 = peg$FAILED;
+                        if (peg$silentFails === 0) { peg$fail(peg$e15); }
+                      }
+                      if (s1 !== peg$FAILED) {
+                        peg$savedPos = s0;
+                        s1 = peg$f18();
+                      }
+                      s0 = s1;
+                      if (s0 === peg$FAILED) {
+                        s0 = peg$currPos;
+                        if (input.substr(peg$currPos, 2) === peg$c15) {
+                          s1 = peg$c15;
+                          peg$currPos += 2;
+                        } else {
+                          s1 = peg$FAILED;
+                          if (peg$silentFails === 0) { peg$fail(peg$e16); }
+                        }
+                        if (s1 !== peg$FAILED) {
+                          peg$savedPos = s0;
+                          s1 = peg$f19();
+                        }
+                        s0 = s1;
+                        if (s0 === peg$FAILED) {
+                          s0 = peg$currPos;
+                          if (input.substr(peg$currPos, 8) === peg$c16) {
+                            s1 = peg$c16;
+                            peg$currPos += 8;
+                          } else {
+                            s1 = peg$FAILED;
+                            if (peg$silentFails === 0) { peg$fail(peg$e17); }
+                          }
+                          if (s1 !== peg$FAILED) {
+                            peg$savedPos = s0;
+                            s1 = peg$f20();
+                          }
+                          s0 = s1;
+                          if (s0 === peg$FAILED) {
+                            s0 = peg$currPos;
+                            if (input.substr(peg$currPos, 3) === peg$c17) {
+                              s1 = peg$c17;
+                              peg$currPos += 3;
+                            } else {
+                              s1 = peg$FAILED;
+                              if (peg$silentFails === 0) { peg$fail(peg$e18); }
+                            }
+                            if (s1 !== peg$FAILED) {
+                              peg$savedPos = s0;
+                              s1 = peg$f21();
+                            }
+                            s0 = s1;
+                            if (s0 === peg$FAILED) {
+                              s0 = peg$currPos;
+                              if (input.substr(peg$currPos, 7) === peg$c18) {
+                                s1 = peg$c18;
+                                peg$currPos += 7;
+                              } else {
+                                s1 = peg$FAILED;
+                                if (peg$silentFails === 0) { peg$fail(peg$e19); }
+                              }
+                              if (s1 !== peg$FAILED) {
+                                peg$savedPos = s0;
+                                s1 = peg$f22();
+                              }
+                              s0 = s1;
+                              if (s0 === peg$FAILED) {
+                                s0 = peg$currPos;
+                                if (input.substr(peg$currPos, 6) === peg$c19) {
+                                  s1 = peg$c19;
+                                  peg$currPos += 6;
+                                } else {
+                                  s1 = peg$FAILED;
+                                  if (peg$silentFails === 0) { peg$fail(peg$e20); }
+                                }
+                                if (s1 !== peg$FAILED) {
+                                  peg$savedPos = s0;
+                                  s1 = peg$f23();
+                                }
+                                s0 = s1;
+                                if (s0 === peg$FAILED) {
+                                  s0 = peg$currPos;
+                                  if (input.substr(peg$currPos, 8) === peg$c20) {
+                                    s1 = peg$c20;
+                                    peg$currPos += 8;
+                                  } else {
+                                    s1 = peg$FAILED;
+                                    if (peg$silentFails === 0) { peg$fail(peg$e21); }
+                                  }
+                                  if (s1 !== peg$FAILED) {
+                                    peg$savedPos = s0;
+                                    s1 = peg$f24();
+                                  }
+                                  s0 = s1;
+                                  if (s0 === peg$FAILED) {
+                                    s0 = peg$currPos;
+                                    if (input.substr(peg$currPos, 7) === peg$c21) {
+                                      s1 = peg$c21;
+                                      peg$currPos += 7;
+                                    } else {
+                                      s1 = peg$FAILED;
+                                      if (peg$silentFails === 0) { peg$fail(peg$e22); }
+                                    }
+                                    if (s1 !== peg$FAILED) {
+                                      peg$savedPos = s0;
+                                      s1 = peg$f25();
+                                    }
+                                    s0 = s1;
+                                    if (s0 === peg$FAILED) {
+                                      s0 = peg$currPos;
+                                      if (input.substr(peg$currPos, 6) === peg$c22) {
+                                        s1 = peg$c22;
+                                        peg$currPos += 6;
+                                      } else {
+                                        s1 = peg$FAILED;
+                                        if (peg$silentFails === 0) { peg$fail(peg$e23); }
+                                      }
+                                      if (s1 !== peg$FAILED) {
+                                        peg$savedPos = s0;
+                                        s1 = peg$f26();
+                                      }
+                                      s0 = s1;
+                                      if (s0 === peg$FAILED) {
+                                        s0 = peg$currPos;
+                                        if (input.substr(peg$currPos, 9) === peg$c23) {
+                                          s1 = peg$c23;
+                                          peg$currPos += 9;
+                                        } else {
+                                          s1 = peg$FAILED;
+                                          if (peg$silentFails === 0) { peg$fail(peg$e24); }
+                                        }
+                                        if (s1 !== peg$FAILED) {
+                                          peg$savedPos = s0;
+                                          s1 = peg$f27();
+                                        }
+                                        s0 = s1;
+                                        if (s0 === peg$FAILED) {
+                                          s0 = peg$currPos;
+                                          if (input.substr(peg$currPos, 8) === peg$c24) {
+                                            s1 = peg$c24;
+                                            peg$currPos += 8;
+                                          } else {
+                                            s1 = peg$FAILED;
+                                            if (peg$silentFails === 0) { peg$fail(peg$e25); }
+                                          }
+                                          if (s1 !== peg$FAILED) {
+                                            peg$savedPos = s0;
+                                            s1 = peg$f28();
+                                          }
+                                          s0 = s1;
+                                        }
+                                      }
+                                    }
+                                  }
+                                }
+                              }
+                            }
+                          }
+                        }
+                      }
+                    }
+                  }
+                }
+              }
+            }
+          }
+        }
+      }
+    }
+
+    return s0;
+  }
+
+  function peg$parseidentifier() {
+    var s0, s1, s2;
+
+    s0 = peg$currPos;
+    s1 = [];
+    s2 = peg$parsequotedString();
+    if (s2 === peg$FAILED) {
+      s2 = peg$parsealphanumeric();
+    }
+    if (s2 !== peg$FAILED) {
+      while (s2 !== peg$FAILED) {
+        s1.push(s2);
+        s2 = peg$parsequotedString();
+        if (s2 === peg$FAILED) {
+          s2 = peg$parsealphanumeric();
+        }
+      }
+    } else {
+      s1 = peg$FAILED;
+    }
+    if (s1 !== peg$FAILED) {
+      peg$savedPos = s0;
+      s1 = peg$f29(s1);
+    }
+    s0 = s1;
+
+    return s0;
+  }
+
+  function peg$parsequotedString() {
+    var s0, s1, s2, s3;
+
+    s0 = peg$currPos;
+    if (input.charCodeAt(peg$currPos) === 34) {
+      s1 = peg$c25;
+      peg$currPos++;
+    } else {
+      s1 = peg$FAILED;
+      if (peg$silentFails === 0) { peg$fail(peg$e26); }
+    }
+    if (s1 !== peg$FAILED) {
+      s2 = [];
+      s3 = input.charAt(peg$currPos);
+      if (peg$r1.test(s3)) {
+        peg$currPos++;
+      } else {
+        s3 = peg$FAILED;
+        if (peg$silentFails === 0) { peg$fail(peg$e27); }
+      }
+      while (s3 !== peg$FAILED) {
+        s2.push(s3);
+        s3 = input.charAt(peg$currPos);
+        if (peg$r1.test(s3)) {
+          peg$currPos++;
+        } else {
+          s3 = peg$FAILED;
+          if (peg$silentFails === 0) { peg$fail(peg$e27); }
+        }
+      }
+      if (input.charCodeAt(peg$currPos) === 34) {
+        s3 = peg$c25;
+        peg$currPos++;
+      } else {
+        s3 = peg$FAILED;
+        if (peg$silentFails === 0) { peg$fail(peg$e26); }
+      }
+      if (s3 !== peg$FAILED) {
+        peg$savedPos = s0;
+        s0 = peg$f30(s2);
+      } else {
+        peg$currPos = s0;
+        s0 = peg$FAILED;
+      }
+    } else {
+      peg$currPos = s0;
+      s0 = peg$FAILED;
+    }
+
+    return s0;
+  }
+
+  function peg$parsealphanumeric() {
+    var s0, s1, s2;
+
+    s0 = peg$currPos;
+    s1 = [];
+    s2 = input.charAt(peg$currPos);
+    if (peg$r2.test(s2)) {
+      peg$currPos++;
+    } else {
+      s2 = peg$FAILED;
+      if (peg$silentFails === 0) { peg$fail(peg$e28); }
+    }
+    if (s2 !== peg$FAILED) {
+      while (s2 !== peg$FAILED) {
+        s1.push(s2);
+        s2 = input.charAt(peg$currPos);
+        if (peg$r2.test(s2)) {
+          peg$currPos++;
+        } else {
+          s2 = peg$FAILED;
+          if (peg$silentFails === 0) { peg$fail(peg$e28); }
+        }
+      }
+    } else {
+      s1 = peg$FAILED;
+    }
+    if (s1 !== peg$FAILED) {
+      peg$savedPos = s0;
+      s1 = peg$f31(s1);
+    }
+    s0 = s1;
+
+    return s0;
+  }
+
+  function peg$parselogicalAnd() {
+    var s0, s1;
+
+    s0 = peg$currPos;
+    s1 = peg$parse_();
+    peg$savedPos = s0;
+    s1 = peg$f32();
+    s0 = s1;
+
+    return s0;
+  }
+
+  function peg$parse_() {
+    var s0, s1;
+
+    peg$silentFails++;
+    s0 = [];
+    s1 = input.charAt(peg$currPos);
+    if (peg$r3.test(s1)) {
+      peg$currPos++;
+    } else {
+      s1 = peg$FAILED;
+      if (peg$silentFails === 0) { peg$fail(peg$e30); }
+    }
+    while (s1 !== peg$FAILED) {
+      s0.push(s1);
+      s1 = input.charAt(peg$currPos);
+      if (peg$r3.test(s1)) {
+        peg$currPos++;
+      } else {
+        s1 = peg$FAILED;
+        if (peg$silentFails === 0) { peg$fail(peg$e30); }
+      }
+    }
+    peg$silentFails--;
+    s1 = peg$FAILED;
+    if (peg$silentFails === 0) { peg$fail(peg$e29); }
+
+    return s0;
+  }
+
+
+  const defaultValues = {
+    "type": "expense",
+    "status": "all",
+    "sortBy": "date",
+    "sortOrder": "desc",
+  };
+
+  function buildFilter(operator, left, right) {
+    return { operator, left, right };
+  }
+
+  function applyDefaults(filters) {
+    return {
+      ...defaultValues,
+      filters
+    };
+  }
+
+  function applyPolicyID(filtersWithDefaults) {
+    return {
+      ...filtersWithDefaults,
+      policyID: filtersWithDefaults.policyID
+    };
+  }
+
+  function updateDefaultValues(field, value) {
+    defaultValues[field] = value;
+  }
+
+  function isDefaultField(field) {
+    return defaultValues.hasOwnProperty(field);
+  }
+
+  function isPolicyID(field) {
+    return field === 'policyID';
+  }
+
+  peg$result = peg$startRuleFunction();
+
+  if (options.peg$library) {
+    return /** @type {any} */ ({
+      peg$result,
+      peg$currPos,
+      peg$FAILED,
+      peg$maxFailExpected,
+      peg$maxFailPos
+    });
+  }
+  if (peg$result !== peg$FAILED && peg$currPos === input.length) {
+    return peg$result;
+  } else {
+    if (peg$result !== peg$FAILED && peg$currPos < input.length) {
+      peg$fail(peg$endExpectation());
+    }
+
+    throw peg$buildStructuredError(
+      peg$maxFailExpected,
+      peg$maxFailPos < input.length ? input.charAt(peg$maxFailPos) : null,
+      peg$maxFailPos < input.length
+        ? peg$computeLocation(peg$maxFailPos, peg$maxFailPos + 1)
+        : peg$computeLocation(peg$maxFailPos, peg$maxFailPos)
+    );
+  }
+}
+
+const peg$allowedStartRules = [
+  "query"
+];
+
+export {
+  peg$allowedStartRules as StartRules,
+  peg$SyntaxError as SyntaxError,
+  peg$parse as parse
+};
diff --git a/src/libs/SearchParser/searchParser.peggy b/src/libs/SearchParser/searchParser.peggy
new file mode 100644
index 000000000000..2f3efb39a6b1
--- /dev/null
+++ b/src/libs/SearchParser/searchParser.peggy
@@ -0,0 +1,151 @@
+// This files defines the grammar that's used by [Peggy](https://peggyjs.org/) to generate the searchParser.js file.
+// The searchParser is setup to parse our custom search syntax and output an AST with the filters.
+//
+// Here's a general grammar structure:
+//
+// query: entry point for the parser and rule to process the values returned by the filterList rule. Takes filters as an argument and returns the final AST output.
+// filterList: rule to process the array of filters returned by the filter rule. It takes head and tail as arguments, filters it for null values and builds the AST.
+// filter: rule to build the filter object. It takes field, operator and value as input and returns {operator, left: field, right: value} or null if the left value is a defaultValues
+// operator: rule to match pre-defined search syntax operators, e.g. !=, >, etc
+// key: rule to match pre-defined search syntax fields, e.g. amount, merchant, etc
+// identifier: composite rule to match patterns defined by the quotedString and alphanumeric rules
+// quotedString: rule to match a quoted string pattern, e.g. "this is a quoted string"
+// alphanumeric: rule to match unquoted alphanumeric characters, e.g. a-z, 0-9, _, @, etc
+// logicalAnd: rule to match whitespace and return it as a logical 'and' operator
+// whitespace: rule to match whitespaces
+
+{
+  const defaultValues = {
+    "type": "expense",
+    "status": "all",
+    "sortBy": "date",
+    "sortOrder": "desc",
+  };
+
+  function buildFilter(operator, left, right) {
+    return { operator, left, right };
+  }
+
+  function applyDefaults(filters) {
+    return {
+      ...defaultValues,
+      filters
+    };
+  }
+
+  function applyPolicyID(filtersWithDefaults) {
+    return {
+      ...filtersWithDefaults,
+      policyID: filtersWithDefaults.policyID
+    };
+  }
+
+  function updateDefaultValues(field, value) {
+    defaultValues[field] = value;
+  }
+
+  function isDefaultField(field) {
+    return defaultValues.hasOwnProperty(field);
+  }
+
+  function isPolicyID(field) {
+    return field === 'policyID';
+  }
+}
+
+query
+  = _ filters:filterList? _ {
+    const withDefaults = applyDefaults(filters);
+    if (defaultValues.policyID) {
+        return applyPolicyID(withDefaults);
+    }
+
+    return withDefaults;
+  }
+
+filterList
+  = head:filter tail:(logicalAnd filter)* {
+      const allFilters = [head, ...tail.map(([_, filter]) => filter)].filter(filter => filter !== null);
+      if (!allFilters.length) {
+      	return null;
+      }
+     const keywords = allFilters.filter((filter) => filter.left === "keyword" || filter.right?.left === "keyword")
+     const nonKeywords = allFilters.filter((filter) => filter.left !== "keyword" && filter.right?.left !== "keyword")
+     if(!nonKeywords.length){
+     	return keywords.reduce((result, filter) => buildFilter("or", result, filter))
+     }
+     if(!keywords.length){
+     	return nonKeywords.reduce((result, filter) => buildFilter("and", result, filter))
+     }
+
+     return buildFilter("and", keywords.reduce((result, filter) => buildFilter("or", result, filter)), nonKeywords.reduce((result, filter) => buildFilter("and", result, filter)))
+
+      return allFilters.reduce((result, filter) => buildFilter("and", result, filter));
+    }
+
+filter
+  = _ field:key? _ op:operator? _ value:identifier {
+      if (isDefaultField(field)) {
+        updateDefaultValues(field, value.trim());
+        return null;
+      }
+
+      if (isPolicyID(field)) {
+        updateDefaultValues(field, value.trim());
+        return null;
+      }
+
+      if (!field && !op) {
+        return buildFilter('eq', 'keyword', value.trim());
+      }
+
+      const values = value.split(',');
+      const operatorValue = op ?? 'eq';
+
+      return values.slice(1).reduce((acc, val) => buildFilter('or', acc, buildFilter(operatorValue, field, val.trim())), buildFilter(operatorValue, field, values[0]));
+    }
+
+operator
+  = (":" / "=") { return "eq"; }
+  / "!=" { return "neq"; }
+  / ">" { return "gt"; }
+  / ">=" { return "gte"; }
+  / "<" { return "lt"; }
+  / "<=" { return "lte"; }
+
+key
+  = "type" { return "type"; }
+  / "status" { return "status"; }
+  / "date" { return "date"; }
+  / "amount" { return "amount"; }
+  / "expenseType" { return "expenseType"; }
+  / "in" { return "in"; }
+  / "currency" { return "currency"; }
+  / "merchant" { return "merchant"; }
+  / "description" { return "description"; }
+  / "from" { return "from"; }
+  / "to" { return "to"; }
+  / "category" { return "category"; }
+  / "tag" { return "tag"; }
+  / "taxRate" { return "taxRate"; }
+  / "cardID" { return "cardID"; }
+  / "reportID" { return "reportID"; }
+  / "keyword" { return "keyword"; }
+  / "sortBy" { return "sortBy"; }
+  / "sortOrder" { return "sortOrder"; }
+  / "policyID" { return "policyID"; }
+
+identifier
+ = parts:(quotedString / alphanumeric)+ { return parts.join(''); }
+
+quotedString
+  = '"' chars:[^"\r\n]* '"' { return chars.join(''); }
+
+alphanumeric
+  = chars:[A-Za-z0-9_@./#&+\-\\',;]+ { return chars.join(''); }
+
+logicalAnd
+  = _ { return "and"; }
+
+_ "whitespace"
+  = [ \t\r\n]*
diff --git a/src/libs/SearchUtils.ts b/src/libs/SearchUtils.ts
index 570a8e780f5a..4a8864fef769 100644
--- a/src/libs/SearchUtils.ts
+++ b/src/libs/SearchUtils.ts
@@ -1,59 +1,591 @@
-import TransactionListItem from '@components/SelectionList/TransactionListItem';
+import type {ValueOf} from 'type-fest';
+import type {ASTNode, QueryFilter, QueryFilters, SearchColumnType, SearchQueryJSON, SearchQueryString, SearchStatus, SortOrder} from '@components/Search/types';
+import ReportListItem from '@components/SelectionList/Search/ReportListItem';
+import TransactionListItem from '@components/SelectionList/Search/TransactionListItem';
+import type {ListItem, ReportListItemType, TransactionListItemType} from '@components/SelectionList/types';
 import CONST from '@src/CONST';
+import type {TranslationPaths} from '@src/languages/types';
 import ONYXKEYS from '@src/ONYXKEYS';
+import SCREENS from '@src/SCREENS';
+import type {SearchAdvancedFiltersForm} from '@src/types/form';
+import FILTER_KEYS from '@src/types/form/SearchAdvancedFiltersForm';
 import type * as OnyxTypes from '@src/types/onyx';
-import type {SearchTransaction} from '@src/types/onyx/SearchResults';
+import type SearchResults from '@src/types/onyx/SearchResults';
+import type {ListItemDataType, ListItemType, SearchDataTypes, SearchPersonalDetails, SearchReport, SearchTransaction} from '@src/types/onyx/SearchResults';
+import * as CurrencyUtils from './CurrencyUtils';
+import DateUtils from './DateUtils';
+import {translateLocal} from './Localize';
+import navigationRef from './Navigation/navigationRef';
+import type {AuthScreensParamList, BottomTabNavigatorParamList, RootStackParamList, State} from './Navigation/types';
+import * as searchParser from './SearchParser/searchParser';
+import * as TransactionUtils from './TransactionUtils';
 import * as UserUtils from './UserUtils';
 
+type KeysOfFilterKeysObject = keyof typeof CONST.SEARCH.SYNTAX_FILTER_KEYS;
+
+const columnNamesToSortingProperty = {
+    [CONST.SEARCH.TABLE_COLUMNS.TO]: 'formattedTo' as const,
+    [CONST.SEARCH.TABLE_COLUMNS.FROM]: 'formattedFrom' as const,
+    [CONST.SEARCH.TABLE_COLUMNS.DATE]: 'date' as const,
+    [CONST.SEARCH.TABLE_COLUMNS.TAG]: 'tag' as const,
+    [CONST.SEARCH.TABLE_COLUMNS.MERCHANT]: 'formattedMerchant' as const,
+    [CONST.SEARCH.TABLE_COLUMNS.TOTAL_AMOUNT]: 'formattedTotal' as const,
+    [CONST.SEARCH.TABLE_COLUMNS.CATEGORY]: 'category' as const,
+    [CONST.SEARCH.TABLE_COLUMNS.TYPE]: 'transactionType' as const,
+    [CONST.SEARCH.TABLE_COLUMNS.ACTION]: 'action' as const,
+    [CONST.SEARCH.TABLE_COLUMNS.DESCRIPTION]: 'comment' as const,
+    [CONST.SEARCH.TABLE_COLUMNS.TAX_AMOUNT]: null,
+    [CONST.SEARCH.TABLE_COLUMNS.RECEIPT]: null,
+};
+
+// This map contains signs with spaces that match each operator
+const operatorToSignMap = {
+    [CONST.SEARCH.SYNTAX_OPERATORS.EQUAL_TO]: ':' as const,
+    [CONST.SEARCH.SYNTAX_OPERATORS.LOWER_THAN]: '<' as const,
+    [CONST.SEARCH.SYNTAX_OPERATORS.LOWER_THAN_OR_EQUAL_TO]: '<=' as const,
+    [CONST.SEARCH.SYNTAX_OPERATORS.GREATER_THAN]: '>' as const,
+    [CONST.SEARCH.SYNTAX_OPERATORS.GREATER_THAN_OR_EQUAL_TO]: '>=' as const,
+    [CONST.SEARCH.SYNTAX_OPERATORS.NOT_EQUAL_TO]: '!=' as const,
+    [CONST.SEARCH.SYNTAX_OPERATORS.AND]: ',' as const,
+    [CONST.SEARCH.SYNTAX_OPERATORS.OR]: ' ' as const,
+};
+
+/**
+ * @private
+ */
+function getTransactionItemCommonFormattedProperties(
+    transactionItem: SearchTransaction,
+    from: SearchPersonalDetails,
+    to: SearchPersonalDetails,
+): Pick<TransactionListItemType, 'formattedFrom' | 'formattedTo' | 'formattedTotal' | 'formattedMerchant' | 'date'> {
+    const isExpenseReport = transactionItem.reportType === CONST.REPORT.TYPE.EXPENSE;
+
+    const formattedFrom = from?.displayName ?? from?.login ?? '';
+    const formattedTo = to?.displayName ?? to?.login ?? '';
+    const formattedTotal = TransactionUtils.getAmount(transactionItem, isExpenseReport);
+    const date = transactionItem?.modifiedCreated ? transactionItem.modifiedCreated : transactionItem?.created;
+    const merchant = TransactionUtils.getMerchant(transactionItem);
+    const formattedMerchant = merchant === CONST.TRANSACTION.PARTIAL_TRANSACTION_MERCHANT || merchant === CONST.TRANSACTION.DEFAULT_MERCHANT ? '' : merchant;
+
+    return {
+        formattedFrom,
+        formattedTo,
+        date,
+        formattedTotal,
+        formattedMerchant,
+    };
+}
+
 function getShouldShowMerchant(data: OnyxTypes.SearchResults['data']): boolean {
     return Object.values(data).some((item) => {
         const merchant = item.modifiedMerchant ? item.modifiedMerchant : item.merchant ?? '';
-        return merchant !== CONST.TRANSACTION.PARTIAL_TRANSACTION_MERCHANT && merchant !== CONST.TRANSACTION.DEFAULT_MERCHANT;
+        return merchant !== '' && merchant !== CONST.TRANSACTION.PARTIAL_TRANSACTION_MERCHANT && merchant !== CONST.TRANSACTION.DEFAULT_MERCHANT;
     });
 }
 
-function getTransactionsSections(data: OnyxTypes.SearchResults['data']): SearchTransaction[] {
+const currentYear = new Date().getFullYear();
+
+function isReportListItemType(item: ListItem): item is ReportListItemType {
+    return 'transactions' in item;
+}
+
+function isTransactionListItemType(item: TransactionListItemType | ReportListItemType): item is TransactionListItemType {
+    const transactionListItem = item as TransactionListItemType;
+    return transactionListItem.transactionID !== undefined;
+}
+
+function shouldShowYear(data: TransactionListItemType[] | ReportListItemType[] | OnyxTypes.SearchResults['data']): boolean {
+    if (Array.isArray(data)) {
+        return data.some((item: TransactionListItemType | ReportListItemType) => {
+            if (isReportListItemType(item)) {
+                // If the item is a ReportListItemType, iterate over its transactions and check them
+                return item.transactions.some((transaction) => {
+                    const transactionYear = new Date(TransactionUtils.getCreated(transaction)).getFullYear();
+                    return transactionYear !== currentYear;
+                });
+            }
+
+            const createdYear = new Date(item?.modifiedCreated ? item.modifiedCreated : item?.created || '').getFullYear();
+            return createdYear !== currentYear;
+        });
+    }
+
+    for (const [key, transactionItem] of Object.entries(data)) {
+        if (key.startsWith(ONYXKEYS.COLLECTION.TRANSACTION)) {
+            const item = transactionItem as SearchTransaction;
+            const date = TransactionUtils.getCreated(item);
+
+            if (DateUtils.doesDateBelongToAPastYear(date)) {
+                return true;
+            }
+        }
+    }
+    return false;
+}
+
+function getTransactionsSections(data: OnyxTypes.SearchResults['data'], metadata: OnyxTypes.SearchResults['search']): TransactionListItemType[] {
     const shouldShowMerchant = getShouldShowMerchant(data);
+
+    const doesDataContainAPastYearTransaction = shouldShowYear(data);
+
     return Object.entries(data)
         .filter(([key]) => key.startsWith(ONYXKEYS.COLLECTION.TRANSACTION))
-        .map(([, value]) => {
-            const isExpenseReport = value.reportType === CONST.REPORT.TYPE.EXPENSE;
+        .map(([, transactionItem]) => {
+            const from = data.personalDetailsList?.[transactionItem.accountID];
+            const to = data.personalDetailsList?.[transactionItem.managerID];
+
+            const {formattedFrom, formattedTo, formattedTotal, formattedMerchant, date} = getTransactionItemCommonFormattedProperties(transactionItem, from, to);
+
             return {
-                ...value,
-                from: data.personalDetailsList?.[value.accountID],
-                to: isExpenseReport ? data[`${ONYXKEYS.COLLECTION.POLICY}${value.policyID}`] : data.personalDetailsList?.[value.managerID],
+                ...transactionItem,
+                from,
+                to,
+                formattedFrom,
+                formattedTo,
+                formattedTotal,
+                formattedMerchant,
+                date,
                 shouldShowMerchant,
-                keyForList: value.transactionID,
+                shouldShowCategory: metadata?.columnsToShow?.shouldShowCategoryColumn,
+                shouldShowTag: metadata?.columnsToShow?.shouldShowTagColumn,
+                shouldShowTax: metadata?.columnsToShow?.shouldShowTaxColumn,
+                keyForList: transactionItem.transactionID,
+                shouldShowYear: doesDataContainAPastYearTransaction,
             };
-        })
-        .sort((a, b) => {
-            const createdA = a.modifiedCreated ? a.modifiedCreated : a.created;
-            const createdB = b.modifiedCreated ? b.modifiedCreated : b.created;
-            return createdB > createdA ? 1 : -1;
         });
 }
 
-const searchTypeToItemMap = {
-    transaction: {
-        listItem: TransactionListItem,
-        getSections: getTransactionsSections,
-    },
-};
+function getIOUReportName(data: OnyxTypes.SearchResults['data'], reportItem: SearchReport) {
+    const payerPersonalDetails = data.personalDetailsList?.[reportItem.managerID ?? 0];
+    const payerName = payerPersonalDetails?.displayName ?? payerPersonalDetails?.login ?? translateLocal('common.hidden');
+    const formattedAmount = CurrencyUtils.convertToDisplayString(reportItem.total ?? 0, reportItem.currency ?? CONST.CURRENCY.USD);
+    if (reportItem.action === CONST.SEARCH.ACTION_TYPES.VIEW) {
+        return translateLocal('iou.payerOwesAmount', {
+            payer: payerName,
+            amount: formattedAmount,
+        });
+    }
+
+    if (reportItem.action === CONST.SEARCH.ACTION_TYPES.PAID) {
+        return translateLocal('iou.payerPaidAmount', {
+            payer: payerName,
+            amount: formattedAmount,
+        });
+    }
+
+    return reportItem.reportName;
+}
+
+function getReportSections(data: OnyxTypes.SearchResults['data'], metadata: OnyxTypes.SearchResults['search']): ReportListItemType[] {
+    const shouldShowMerchant = getShouldShowMerchant(data);
+
+    const doesDataContainAPastYearTransaction = shouldShowYear(data);
+
+    const reportIDToTransactions: Record<string, ReportListItemType> = {};
+    for (const key in data) {
+        if (key.startsWith(ONYXKEYS.COLLECTION.REPORT)) {
+            const reportItem = {...data[key]};
+            const reportKey = `${ONYXKEYS.COLLECTION.REPORT}${reportItem.reportID}`;
+            const transactions = reportIDToTransactions[reportKey]?.transactions ?? [];
+            const isIOUReport = reportItem.type === CONST.REPORT.TYPE.IOU;
+
+            reportIDToTransactions[reportKey] = {
+                ...reportItem,
+                keyForList: reportItem.reportID,
+                from: data.personalDetailsList?.[reportItem.accountID],
+                to: data.personalDetailsList?.[reportItem.managerID],
+                transactions,
+                reportName: isIOUReport ? getIOUReportName(data, reportItem) : reportItem.reportName,
+            };
+        } else if (key.startsWith(ONYXKEYS.COLLECTION.TRANSACTION)) {
+            const transactionItem = {...data[key]};
+            const reportKey = `${ONYXKEYS.COLLECTION.REPORT}${transactionItem.reportID}`;
+
+            const from = data.personalDetailsList?.[transactionItem.accountID];
+            const to = data.personalDetailsList?.[transactionItem.managerID];
+
+            const {formattedFrom, formattedTo, formattedTotal, formattedMerchant, date} = getTransactionItemCommonFormattedProperties(transactionItem, from, to);
+
+            const transaction = {
+                ...transactionItem,
+                from,
+                to,
+                formattedFrom,
+                formattedTo,
+                formattedTotal,
+                formattedMerchant,
+                date,
+                shouldShowMerchant,
+                shouldShowCategory: metadata?.columnsToShow?.shouldShowCategoryColumn,
+                shouldShowTag: metadata?.columnsToShow?.shouldShowTagColumn,
+                shouldShowTax: metadata?.columnsToShow?.shouldShowTaxColumn,
+                keyForList: transactionItem.transactionID,
+                shouldShowYear: doesDataContainAPastYearTransaction,
+            };
+            if (reportIDToTransactions[reportKey]?.transactions) {
+                reportIDToTransactions[reportKey].transactions.push(transaction);
+            } else if (reportIDToTransactions[reportKey]) {
+                reportIDToTransactions[reportKey].transactions = [transaction];
+            }
+        }
+    }
+
+    return Object.values(reportIDToTransactions);
+}
+
+function getListItem(status: SearchStatus): ListItemType<typeof status> {
+    return status === CONST.SEARCH.STATUS.EXPENSE.ALL ? TransactionListItem : ReportListItem;
+}
+
+function getSections(status: SearchStatus, data: OnyxTypes.SearchResults['data'], metadata: OnyxTypes.SearchResults['search']) {
+    return status === CONST.SEARCH.STATUS.EXPENSE.ALL ? getTransactionsSections(data, metadata) : getReportSections(data, metadata);
+}
+
+function getSortedSections(status: SearchStatus, data: ListItemDataType<typeof status>, sortBy?: SearchColumnType, sortOrder?: SortOrder) {
+    return status === CONST.SEARCH.STATUS.EXPENSE.ALL ? getSortedTransactionData(data as TransactionListItemType[], sortBy, sortOrder) : getSortedReportData(data as ReportListItemType[]);
+}
+
+function getSortedTransactionData(data: TransactionListItemType[], sortBy?: SearchColumnType, sortOrder?: SortOrder) {
+    if (!sortBy || !sortOrder) {
+        return data;
+    }
+
+    const sortingProperty = columnNamesToSortingProperty[sortBy];
+
+    if (!sortingProperty) {
+        return data;
+    }
+
+    return data.sort((a, b) => {
+        const aValue = sortingProperty === 'comment' ? a.comment?.comment : a[sortingProperty];
+        const bValue = sortingProperty === 'comment' ? b.comment?.comment : b[sortingProperty];
+
+        if (aValue === undefined || bValue === undefined) {
+            return 0;
+        }
+
+        // We are guaranteed that both a and b will be string or number at the same time
+        if (typeof aValue === 'string' && typeof bValue === 'string') {
+            return sortOrder === CONST.SEARCH.SORT_ORDER.ASC ? aValue.toLowerCase().localeCompare(bValue) : bValue.toLowerCase().localeCompare(aValue);
+        }
+
+        const aNum = aValue as number;
+        const bNum = bValue as number;
+
+        return sortOrder === CONST.SEARCH.SORT_ORDER.ASC ? aNum - bNum : bNum - aNum;
+    });
+}
+
+function getSortedReportData(data: ReportListItemType[]) {
+    return data.sort((a, b) => {
+        const aValue = a?.created;
+        const bValue = b?.created;
+
+        if (aValue === undefined || bValue === undefined) {
+            return 0;
+        }
+
+        return bValue.toLowerCase().localeCompare(aValue);
+    });
+}
+
+function getCurrentSearchParams() {
+    const rootState = navigationRef.getRootState() as State<RootStackParamList>;
+
+    const lastSearchCentralPaneRoute = rootState.routes.filter((route) => route.name === SCREENS.SEARCH.CENTRAL_PANE).at(-1);
+    const lastSearchBottomTabRoute = rootState.routes[0].state?.routes.filter((route) => route.name === SCREENS.SEARCH.BOTTOM_TAB).at(-1);
+
+    if (lastSearchCentralPaneRoute) {
+        return lastSearchCentralPaneRoute.params as AuthScreensParamList[typeof SCREENS.SEARCH.CENTRAL_PANE];
+    }
+
+    if (lastSearchBottomTabRoute) {
+        return lastSearchBottomTabRoute.params as BottomTabNavigatorParamList[typeof SCREENS.SEARCH.BOTTOM_TAB];
+    }
+}
+
+function isSearchResultsEmpty(searchResults: SearchResults) {
+    return !Object.keys(searchResults?.data).some((key) => key.startsWith(ONYXKEYS.COLLECTION.TRANSACTION));
+}
+
+function getQueryHashFromString(query: SearchQueryString): number {
+    return UserUtils.hashText(query, 2 ** 32);
+}
+
+function buildSearchQueryJSON(query: SearchQueryString) {
+    try {
+        const result = searchParser.parse(query) as SearchQueryJSON;
+
+        // Add the full input and hash to the results
+        result.inputQuery = query;
+        result.hash = getQueryHashFromString(query);
+        return result;
+    } catch (e) {
+        console.error(`Error when parsing SearchQuery: "${query}"`, e);
+    }
+}
+
+function buildSearchQueryString(queryJSON?: SearchQueryJSON) {
+    const queryParts: string[] = [];
+    const defaultQueryJSON = buildSearchQueryJSON('');
+
+    for (const [, key] of Object.entries(CONST.SEARCH.SYNTAX_ROOT_KEYS)) {
+        const existingFieldValue = queryJSON?.[key];
+        const queryFieldValue = existingFieldValue ?? defaultQueryJSON?.[key];
+
+        if (queryFieldValue) {
+            queryParts.push(`${key}:${queryFieldValue}`);
+        }
+    }
+
+    if (!queryJSON) {
+        return queryParts.join(' ');
+    }
+
+    const filters = getFilters(queryJSON);
+
+    for (const [, filterKey] of Object.entries(CONST.SEARCH.SYNTAX_FILTER_KEYS)) {
+        const queryFilter = filters[filterKey];
+
+        if (queryFilter) {
+            const filterValueString = buildFilterString(filterKey, queryFilter);
+            queryParts.push(filterValueString);
+        }
+    }
+
+    return queryParts.join(' ');
+}
+
+/**
+ * Update string query with all the default params that are set by parser
+ */
+function normalizeQuery(query: string) {
+    const normalizedQueryJSON = buildSearchQueryJSON(query);
+    return buildSearchQueryString(normalizedQueryJSON);
+}
+
+/**
+ * @private
+ * returns Date filter query string part, which needs special logic
+ */
+function buildDateFilterQuery(filterValues: Partial<SearchAdvancedFiltersForm>) {
+    const dateBefore = filterValues[FILTER_KEYS.DATE_BEFORE];
+    const dateAfter = filterValues[FILTER_KEYS.DATE_AFTER];
+
+    let dateFilter = '';
+    if (dateBefore) {
+        dateFilter += `${CONST.SEARCH.SYNTAX_FILTER_KEYS.DATE}<${dateBefore}`;
+    }
+    if (dateBefore && dateAfter) {
+        dateFilter += ' ';
+    }
+    if (dateAfter) {
+        dateFilter += `${CONST.SEARCH.SYNTAX_FILTER_KEYS.DATE}>${dateAfter}`;
+    }
+
+    return dateFilter;
+}
 
 /**
- * TODO: in future make this function generic and return specific item component based on type
- * For now only 1 search item type exists in the app so this function is simplified
+ * @private
+ * returns Date filter query string part, which needs special logic
  */
-function getListItem(): typeof TransactionListItem {
-    return searchTypeToItemMap.transaction.listItem;
+function buildAmountFilterQuery(filterValues: Partial<SearchAdvancedFiltersForm>) {
+    const lessThan = filterValues[FILTER_KEYS.LESS_THAN];
+    const greaterThan = filterValues[FILTER_KEYS.GREATER_THAN];
+
+    let amountFilter = '';
+    if (greaterThan) {
+        amountFilter += `${CONST.SEARCH.SYNTAX_FILTER_KEYS.AMOUNT}>${greaterThan}`;
+    }
+    if (lessThan && greaterThan) {
+        amountFilter += ' ';
+    }
+    if (lessThan) {
+        amountFilter += `${CONST.SEARCH.SYNTAX_FILTER_KEYS.AMOUNT}<${lessThan}`;
+    }
+
+    return amountFilter;
 }
 
-function getSections(data: OnyxTypes.SearchResults['data']): SearchTransaction[] {
-    return searchTypeToItemMap.transaction.getSections(data);
+function sanitizeString(str: string) {
+    if (str.includes(' ') || str.includes(',')) {
+        return `"${str}"`;
+    }
+    return str;
 }
 
-function getQueryHash(query: string): number {
-    return UserUtils.hashText(query, 2 ** 32);
+function getExpenseTypeTranslationKey(expenseType: ValueOf<typeof CONST.SEARCH.TRANSACTION_TYPE>): TranslationPaths {
+    // eslint-disable-next-line default-case
+    switch (expenseType) {
+        case CONST.SEARCH.TRANSACTION_TYPE.DISTANCE:
+            return 'common.distance';
+        case CONST.SEARCH.TRANSACTION_TYPE.CARD:
+            return 'common.card';
+        case CONST.SEARCH.TRANSACTION_TYPE.CASH:
+            return 'iou.cash';
+    }
 }
 
-export {getListItem, getQueryHash, getSections, getShouldShowMerchant};
+/**
+ * Given object with chosen search filters builds correct query string from them
+ */
+function buildQueryStringFromFilters(filterValues: Partial<SearchAdvancedFiltersForm>) {
+    const filtersString = Object.entries(filterValues).map(([filterKey, filterValue]) => {
+        if ((filterKey === FILTER_KEYS.MERCHANT || filterKey === FILTER_KEYS.DESCRIPTION || filterKey === FILTER_KEYS.REPORT_ID) && filterValue) {
+            const keyInCorrectForm = (Object.keys(CONST.SEARCH.SYNTAX_FILTER_KEYS) as KeysOfFilterKeysObject[]).find((key) => CONST.SEARCH.SYNTAX_FILTER_KEYS[key] === filterKey);
+            if (keyInCorrectForm) {
+                return `${CONST.SEARCH.SYNTAX_FILTER_KEYS[keyInCorrectForm]}:${sanitizeString(filterValue as string)}`;
+            }
+        }
+        if (filterKey === FILTER_KEYS.KEYWORD && filterValue) {
+            const keyInCorrectForm = (Object.keys(CONST.SEARCH.SYNTAX_FILTER_KEYS) as KeysOfFilterKeysObject[]).find((key) => CONST.SEARCH.SYNTAX_FILTER_KEYS[key] === filterKey);
+            if (keyInCorrectForm) {
+                return `${CONST.SEARCH.SYNTAX_FILTER_KEYS[keyInCorrectForm]}:${filterValue as string}`;
+            }
+        }
+
+        if (
+            (filterKey === FILTER_KEYS.CATEGORY ||
+                filterKey === FILTER_KEYS.CARD_ID ||
+                filterKey === FILTER_KEYS.TAX_RATE ||
+                filterKey === FILTER_KEYS.EXPENSE_TYPE ||
+                filterKey === FILTER_KEYS.TAG ||
+                filterKey === FILTER_KEYS.CURRENCY ||
+                filterKey === FILTER_KEYS.FROM ||
+                filterKey === FILTER_KEYS.TO) &&
+            Array.isArray(filterValue) &&
+            filterValue.length > 0
+        ) {
+            const filterValueArray = filterValues[filterKey] ?? [];
+            const keyInCorrectForm = (Object.keys(CONST.SEARCH.SYNTAX_FILTER_KEYS) as KeysOfFilterKeysObject[]).find((key) => CONST.SEARCH.SYNTAX_FILTER_KEYS[key] === filterKey);
+            if (keyInCorrectForm) {
+                return `${CONST.SEARCH.SYNTAX_FILTER_KEYS[keyInCorrectForm]}:${filterValueArray.map(sanitizeString).join(',')}`;
+            }
+        }
+
+        return undefined;
+    });
+
+    const dateFilter = buildDateFilterQuery(filterValues);
+    filtersString.push(dateFilter);
+
+    const amountFilter = buildAmountFilterQuery(filterValues);
+    filtersString.push(amountFilter);
+
+    return filtersString.filter(Boolean).join(' ');
+}
+
+function getFilters(queryJSON: SearchQueryJSON) {
+    const filters = {} as QueryFilters;
+    const filterKeys = Object.values(CONST.SEARCH.SYNTAX_FILTER_KEYS);
+
+    function traverse(node: ASTNode) {
+        if (!node.operator) {
+            return;
+        }
+
+        if (typeof node?.left === 'object' && node.left) {
+            traverse(node.left);
+        }
+
+        if (typeof node?.right === 'object' && node.right) {
+            traverse(node.right);
+        }
+
+        const nodeKey = node.left as ValueOf<typeof CONST.SEARCH.SYNTAX_FILTER_KEYS>;
+        if (!filterKeys.includes(nodeKey)) {
+            return;
+        }
+
+        if (!filters[nodeKey]) {
+            filters[nodeKey] = [];
+        }
+
+        // the "?? []" is added only for typescript because otherwise TS throws an error, in newer TS versions this should be fixed
+        const filterArray = filters[nodeKey] ?? [];
+        filterArray.push({
+            operator: node.operator,
+            value: node.right as string | number,
+        });
+    }
+
+    if (queryJSON.filters) {
+        traverse(queryJSON.filters);
+    }
+
+    return filters;
+}
+
+/**
+ * Given a SearchQueryJSON this function will try to find the value of policyID filter saved in query
+ * and return just the first policyID value from the filter.
+ *
+ * Note: `policyID` property can store multiple policy ids (just like many other search filters) as a comma separated value;
+ * however there are several places in the app (related to WorkspaceSwitcher) that will accept only a single policyID.
+ */
+function getPolicyIDFromSearchQuery(queryJSON: SearchQueryJSON) {
+    const policyIDFilter = queryJSON.policyID;
+
+    if (!policyIDFilter) {
+        return;
+    }
+
+    // policyID is a comma-separated value
+    const [policyID] = policyIDFilter.split(',');
+
+    return policyID;
+}
+
+function buildFilterString(filterName: string, queryFilters: QueryFilter[]) {
+    let filterValueString = '';
+    queryFilters.forEach((queryFilter, index) => {
+        // If the previous queryFilter has the same operator (this rule applies only to eq and neq operators) then append the current value
+        if ((queryFilter.operator === 'eq' && queryFilters[index - 1]?.operator === 'eq') || (queryFilter.operator === 'neq' && queryFilters[index - 1]?.operator === 'neq')) {
+            filterValueString += ` ${sanitizeString(queryFilter.value.toString())}`;
+        } else {
+            filterValueString += ` ${filterName}${operatorToSignMap[queryFilter.operator]}${queryFilter.value}`;
+        }
+    });
+
+    return filterValueString;
+}
+
+function getSearchHeaderTitle(queryJSON: SearchQueryJSON) {
+    const {type, status} = queryJSON;
+    const filters = getFilters(queryJSON) ?? {};
+
+    let title = `type:${type} status:${status}`;
+
+    Object.keys(filters).forEach((key) => {
+        const queryFilter = filters[key as ValueOf<typeof CONST.SEARCH.SYNTAX_FILTER_KEYS>] ?? [];
+        title += buildFilterString(key, queryFilter);
+    });
+
+    return title;
+}
+
+function buildCannedSearchQuery(type: SearchDataTypes = CONST.SEARCH.DATA_TYPES.EXPENSE, status: SearchStatus = CONST.SEARCH.STATUS.EXPENSE.ALL): SearchQueryString {
+    return normalizeQuery(`type:${type} status:${status}`);
+}
+
+export {
+    buildQueryStringFromFilters,
+    buildSearchQueryJSON,
+    buildSearchQueryString,
+    getCurrentSearchParams,
+    getFilters,
+    getPolicyIDFromSearchQuery,
+    getListItem,
+    getSearchHeaderTitle,
+    getSections,
+    getShouldShowMerchant,
+    getSortedSections,
+    isReportListItemType,
+    isSearchResultsEmpty,
+    isTransactionListItemType,
+    normalizeQuery,
+    shouldShowYear,
+    buildCannedSearchQuery,
+    getExpenseTypeTranslationKey,
+};
diff --git a/src/libs/SelectionScraper/index.ts b/src/libs/SelectionScraper/index.ts
index 8d7f3e7055fc..88726aa633b6 100644
--- a/src/libs/SelectionScraper/index.ts
+++ b/src/libs/SelectionScraper/index.ts
@@ -1,12 +1,12 @@
 import render from 'dom-serializer';
 import type {Node} from 'domhandler';
 import {DataNode, Element} from 'domhandler';
-import Str from 'expensify-common/lib/str';
+import {Str} from 'expensify-common';
 import {parseDocument} from 'htmlparser2';
 import CONST from '@src/CONST';
 import type GetCurrentSelection from './types';
 
-const markdownElements = ['h1', 'strong', 'em', 'del', 'blockquote', 'q', 'code', 'pre', 'a', 'br', 'li', 'ul', 'ol', 'b', 'i', 's'];
+const markdownElements = ['h1', 'strong', 'em', 'del', 'blockquote', 'q', 'code', 'pre', 'a', 'br', 'li', 'ul', 'ol', 'b', 'i', 's', 'mention-user'];
 const tagAttribute = 'data-testid';
 
 /**
diff --git a/src/libs/SessionUtils.ts b/src/libs/SessionUtils.ts
index 52521d5146cc..88c4f01e17d1 100644
--- a/src/libs/SessionUtils.ts
+++ b/src/libs/SessionUtils.ts
@@ -1,5 +1,7 @@
 import Onyx from 'react-native-onyx';
+import type {OnyxEntry} from 'react-native-onyx';
 import ONYXKEYS from '@src/ONYXKEYS';
+import type * as OnyxTypes from '@src/types/onyx';
 
 /**
  * Determine if the transitioning user is logging in as a new user.
@@ -26,12 +28,14 @@ function isLoggingInAsNewUser(transitionURL?: string, sessionEmail?: string): bo
 }
 
 let loggedInDuringSession: boolean | undefined;
+let currentSession: OnyxEntry<OnyxTypes.Session>;
 
 // 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) => {
+        currentSession = session;
         if (loggedInDuringSession) {
             return;
         }
@@ -50,7 +54,11 @@ function resetDidUserLogInDuringSession() {
 }
 
 function didUserLogInDuringSession() {
-    return Boolean(loggedInDuringSession);
+    return !!loggedInDuringSession;
 }
 
-export {isLoggingInAsNewUser, didUserLogInDuringSession, resetDidUserLogInDuringSession};
+function getSession() {
+    return currentSession;
+}
+
+export {isLoggingInAsNewUser, didUserLogInDuringSession, resetDidUserLogInDuringSession, getSession};
diff --git a/src/libs/SidebarUtils.ts b/src/libs/SidebarUtils.ts
index 74fab75dcc18..dedd608ce77d 100644
--- a/src/libs/SidebarUtils.ts
+++ b/src/libs/SidebarUtils.ts
@@ -1,12 +1,11 @@
-import Str from 'expensify-common/lib/str';
+import {Str} from 'expensify-common';
 import type {OnyxCollection, OnyxEntry} from 'react-native-onyx';
 import Onyx from 'react-native-onyx';
-import type {ChatReportSelector, PolicySelector, ReportActionsSelector} from '@hooks/useReportIDs';
+import type {PolicySelector, ReportActionsSelector} from '@hooks/useReportIDs';
 import CONST from '@src/CONST';
 import ONYXKEYS from '@src/ONYXKEYS';
 import type {PersonalDetails, PersonalDetailsList, ReportActions, TransactionViolation} from '@src/types/onyx';
 import type Beta from '@src/types/onyx/Beta';
-import type {ChangeLog} from '@src/types/onyx/OriginalMessage';
 import type Policy from '@src/types/onyx/Policy';
 import type PriorityMode from '@src/types/onyx/PriorityMode';
 import type Report from '@src/types/onyx/Report';
@@ -18,12 +17,22 @@ import localeCompare from './LocaleCompare';
 import * as LocalePhoneNumber from './LocalePhoneNumber';
 import * as Localize from './Localize';
 import * as OptionsListUtils from './OptionsListUtils';
+import Parser from './Parser';
+import * as PolicyUtils from './PolicyUtils';
 import * as ReportActionsUtils from './ReportActionsUtils';
 import * as ReportUtils from './ReportUtils';
 import * as TaskUtils from './TaskUtils';
-import * as UserUtils from './UserUtils';
+
+type WelcomeMessage = {showReportName: boolean; phrase1?: string; phrase2?: string; phrase3?: string; messageText?: string; messageHtml?: string};
 
 const visibleReportActionItems: ReportActions = {};
+let allPersonalDetails: OnyxEntry<PersonalDetailsList>;
+Onyx.connect({
+    key: ONYXKEYS.PERSONAL_DETAILS_LIST,
+    callback: (value) => {
+        allPersonalDetails = value ?? {};
+    },
+});
 Onyx.connect({
     key: ONYXKEYS.COLLECTION.REPORT_ACTIONS,
     callback: (actions, key) => {
@@ -36,7 +45,9 @@ Onyx.connect({
 
         // The report is only visible if it is the last action not deleted that
         // does not match a closed or created state.
-        const reportActionsForDisplay = actionsArray.filter((reportAction) => ReportActionsUtils.shouldReportActionBeVisibleAsLastAction(reportAction));
+        const reportActionsForDisplay = actionsArray.filter(
+            (reportAction) => ReportActionsUtils.shouldReportActionBeVisibleAsLastAction(reportAction) && reportAction.actionName !== CONST.REPORT.ACTIONS.TYPE.CREATED,
+        );
 
         visibleReportActionItems[reportID] = reportActionsForDisplay[reportActionsForDisplay.length - 1];
     },
@@ -52,12 +63,22 @@ function compareStringDates(a: string, b: string): 0 | 1 | -1 {
     return 0;
 }
 
+/**
+ * A mini report object that contains only the necessary information to sort reports.
+ * This is used to avoid copying the entire report object and only the necessary information.
+ */
+type MiniReport = {
+    reportID?: string;
+    displayName: string;
+    lastVisibleActionCreated?: string;
+};
+
 /**
  * @returns An array of reportIDs sorted in the proper order
  */
 function getOrderedReportIDs(
     currentReportId: string | null,
-    allReports: OnyxCollection<ChatReportSelector>,
+    allReports: OnyxCollection<Report>,
     betas: OnyxEntry<Beta[]>,
     policies: OnyxCollection<PolicySelector>,
     priorityMode: OnyxEntry<PriorityMode>,
@@ -66,59 +87,85 @@ function getOrderedReportIDs(
     currentPolicyID = '',
     policyMemberAccountIDs: number[] = [],
 ): string[] {
-    const isInGSDMode = priorityMode === CONST.PRIORITY_MODE.GSD;
-    const isInDefaultMode = !isInGSDMode;
+    const isInFocusMode = priorityMode === CONST.PRIORITY_MODE.GSD;
+    const isInDefaultMode = !isInFocusMode;
     const allReportsDictValues = Object.values(allReports ?? {});
 
     // Filter out all the reports that shouldn't be displayed
-    let reportsToDisplay = allReportsDictValues.filter((report) => {
+    let reportsToDisplay: Array<Report & {hasErrorsOtherThanFailedReceipt?: boolean}> = [];
+    allReportsDictValues.forEach((report) => {
         if (!report) {
-            return false;
+            return;
+        }
+        if ((Object.values(CONST.REPORT.UNSUPPORTED_TYPE) as string[]).includes(report?.type ?? '')) {
+            return;
         }
-
-        const parentReportActionsKey = `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${report.parentReportID}`;
-        const parentReportActions = allReportActions?.[parentReportActionsKey];
         const reportActions = allReportActions?.[`${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${report.reportID}`] ?? {};
-        const parentReportAction = parentReportActions?.find((action) => action && action?.reportActionID === report.parentReportActionID);
-        const doesReportHaveViolations = !!(
-            betas?.includes(CONST.BETAS.VIOLATIONS) &&
-            !!parentReportAction &&
-            ReportUtils.doesTransactionThreadHaveViolations(report, transactionViolations, parentReportAction as OnyxEntry<ReportAction>)
-        );
+        const parentReportAction = ReportActionsUtils.getReportAction(report?.parentReportID ?? '-1', report?.parentReportActionID ?? '-1');
+        const doesReportHaveViolations = OptionsListUtils.shouldShowViolations(report, transactionViolations);
         const isHidden = report.notificationPreference === CONST.REPORT.NOTIFICATION_PREFERENCE.HIDDEN;
         const isFocused = report.reportID === currentReportId;
         const allReportErrors = OptionsListUtils.getAllReportErrors(report, reportActions) ?? {};
-        const hasErrorsOtherThanFailedReceipt = doesReportHaveViolations || Object.values(allReportErrors).some((error) => error?.[0] !== 'report.genericSmartscanFailureMessage');
-        const shouldOverrideHidden = hasErrorsOtherThanFailedReceipt || isFocused || report.isPinned;
+        const transactionReportActions = ReportActionsUtils.getAllReportActions(report.reportID);
+        const oneTransactionThreadReportID = ReportActionsUtils.getOneTransactionThreadReportID(report.reportID, transactionReportActions, undefined);
+        let doesTransactionThreadReportHasViolations = false;
+        if (oneTransactionThreadReportID) {
+            const transactionReport = ReportUtils.getReport(oneTransactionThreadReportID);
+            doesTransactionThreadReportHasViolations = !!transactionReport && OptionsListUtils.shouldShowViolations(transactionReport, transactionViolations);
+        }
+        const hasErrorsOtherThanFailedReceipt =
+            doesTransactionThreadReportHasViolations ||
+            doesReportHaveViolations ||
+            Object.values(allReportErrors).some((error) => error?.[0] !== Localize.translateLocal('iou.error.genericSmartscanFailureMessage'));
+        const isReportInAccessible = report?.errorFields?.notFound;
+        if (ReportUtils.isOneTransactionThread(report.reportID, report.parentReportID ?? '0', parentReportAction)) {
+            return;
+        }
+        if (hasErrorsOtherThanFailedReceipt && !isReportInAccessible) {
+            reportsToDisplay.push({
+                ...report,
+                hasErrorsOtherThanFailedReceipt: true,
+            });
+            return;
+        }
+        const isSystemChat = ReportUtils.isSystemChat(report);
+        const shouldOverrideHidden = hasValidDraftComment(report.reportID) || hasErrorsOtherThanFailedReceipt || isFocused || isSystemChat || report.isPinned;
         if (isHidden && !shouldOverrideHidden) {
-            return false;
+            return;
         }
 
-        return ReportUtils.shouldReportBeInOptionList({
-            report,
-            currentReportId: currentReportId ?? '',
-            isInGSDMode,
-            betas,
-            policies: policies as OnyxCollection<Policy>,
-            excludeEmptyChats: true,
-            doesReportHaveViolations,
-            includeSelfDM: true,
-        });
+        if (
+            ReportUtils.shouldReportBeInOptionList({
+                report,
+                currentReportId: currentReportId ?? '-1',
+                isInFocusMode,
+                betas,
+                policies: policies as OnyxCollection<Policy>,
+                excludeEmptyChats: true,
+                doesReportHaveViolations,
+                includeSelfDM: true,
+            })
+        ) {
+            reportsToDisplay.push(report);
+        }
     });
 
-    // The LHN is split into four distinct groups, and each group is sorted a little differently. The groups will ALWAYS be in this order:
+    // The LHN is split into five distinct groups, and each group is sorted a little differently. The groups will ALWAYS be in this order:
     // 1. Pinned/GBR - Always sorted by reportDisplayName
-    // 2. Drafts - Always sorted by reportDisplayName
-    // 3. Non-archived reports and settled IOUs
+    // 2. Error reports - Always sorted by reportDisplayName
+    // 3. Drafts - Always sorted by reportDisplayName
+    // 4. Non-archived reports and settled IOUs
     //      - Sorted by lastVisibleActionCreated in default (most recent) view mode
     //      - Sorted by reportDisplayName in GSD (focus) view mode
-    // 4. Archived reports
+    // 5. Archived reports
     //      - Sorted by lastVisibleActionCreated in default (most recent) view mode
     //      - Sorted by reportDisplayName in GSD (focus) view mode
-    const pinnedAndGBRReports: Array<OnyxEntry<Report>> = [];
-    const draftReports: Array<OnyxEntry<Report>> = [];
-    const nonArchivedReports: Array<OnyxEntry<Report>> = [];
-    const archivedReports: Array<OnyxEntry<Report>> = [];
+
+    const pinnedAndGBRReports: MiniReport[] = [];
+    const errorReports: MiniReport[] = [];
+    const draftReports: MiniReport[] = [];
+    const nonArchivedReports: MiniReport[] = [];
+    const archivedReports: MiniReport[] = [];
 
     if (currentPolicyID || policyMemberAccountIDs.length > 0) {
         reportsToDisplay = reportsToDisplay.filter(
@@ -127,29 +174,32 @@ function getOrderedReportIDs(
     }
     // There are a few properties that need to be calculated for the report which are used when sorting reports.
     reportsToDisplay.forEach((reportToDisplay) => {
-        let report = reportToDisplay as OnyxEntry<Report>;
-        if (report) {
-            report = {
-                ...report,
-                displayName: ReportUtils.getReportName(report),
-            };
-        }
+        const report = reportToDisplay;
+        const miniReport: MiniReport = {
+            reportID: report?.reportID,
+            displayName: ReportUtils.getReportName(report),
+            lastVisibleActionCreated: report?.lastVisibleActionCreated,
+        };
 
         const isPinned = report?.isPinned ?? false;
-        const reportAction = ReportActionsUtils.getReportAction(report?.parentReportID ?? '', report?.parentReportActionID ?? '');
+        const reportAction = ReportActionsUtils.getReportAction(report?.parentReportID ?? '-1', report?.parentReportActionID ?? '-1');
+        const reportNameValuePairs = ReportUtils.getReportNameValuePairs(report?.reportID);
         if (isPinned || ReportUtils.requiresAttentionFromCurrentUser(report, reportAction)) {
-            pinnedAndGBRReports.push(report);
-        } else if (hasValidDraftComment(report?.reportID ?? '')) {
-            draftReports.push(report);
-        } else if (ReportUtils.isArchivedRoom(report)) {
-            archivedReports.push(report);
+            pinnedAndGBRReports.push(miniReport);
+        } else if (report?.hasErrorsOtherThanFailedReceipt) {
+            errorReports.push(miniReport);
+        } else if (hasValidDraftComment(report?.reportID ?? '-1')) {
+            draftReports.push(miniReport);
+        } else if (ReportUtils.isArchivedRoom(report, reportNameValuePairs)) {
+            archivedReports.push(miniReport);
         } else {
-            nonArchivedReports.push(report);
+            nonArchivedReports.push(miniReport);
         }
     });
 
     // Sort each group of reports accordingly
     pinnedAndGBRReports.sort((a, b) => (a?.displayName && b?.displayName ? localeCompare(a.displayName, b.displayName) : 0));
+    errorReports.sort((a, b) => (a?.displayName && b?.displayName ? localeCompare(a.displayName, b.displayName) : 0));
     draftReports.sort((a, b) => (a?.displayName && b?.displayName ? localeCompare(a.displayName, b.displayName) : 0));
 
     if (isInDefaultMode) {
@@ -170,7 +220,9 @@ function getOrderedReportIDs(
 
     // 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.
-    const LHNReports = [...pinnedAndGBRReports, ...draftReports, ...nonArchivedReports, ...archivedReports].map((report) => report?.reportID ?? '');
+
+    const LHNReports = [...pinnedAndGBRReports, ...errorReports, ...draftReports, ...nonArchivedReports, ...archivedReports].map((report) => report?.reportID ?? '-1');
+
     return LHNReports;
 }
 
@@ -185,6 +237,8 @@ function getOptionData({
     policy,
     parentReportAction,
     hasViolations,
+    transactionViolations,
+    invoiceReceiverPolicy,
 }: {
     report: OnyxEntry<Report>;
     reportActions: OnyxEntry<ReportActions>;
@@ -193,6 +247,8 @@ function getOptionData({
     policy: OnyxEntry<Policy> | undefined;
     parentReportAction: OnyxEntry<ReportAction> | undefined;
     hasViolations: boolean;
+    invoiceReceiverPolicy?: OnyxEntry<Policy>;
+    transactionViolations?: OnyxCollection<TransactionViolation[]>;
 }): ReportUtils.OptionData | undefined {
     // 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
@@ -219,6 +275,8 @@ function getOptionData({
         searchText: undefined,
         isPinned: false,
         hasOutstandingChildRequest: false,
+        hasOutstandingChildTask: false,
+        hasParentAccess: undefined,
         isIOUReportOwner: null,
         isChatRoom: false,
         isArchivedRoom: false,
@@ -229,14 +287,11 @@ function getOptionData({
         isWaitingOnBankAccount: false,
         isAllowedToComment: true,
         isDeletedParentAction: false,
+        isConciergeChat: false,
     };
 
-    let participantAccountIDs = report.participantAccountIDs ?? [];
-
-    // Currently, currentUser is not included in participantAccountIDs, so for selfDM we need to add the currentUser(report owner) as participants.
-    if (ReportUtils.isSelfDM(report)) {
-        participantAccountIDs = [report.ownerAccountID ?? 0];
-    }
+    const participantAccountIDs = ReportUtils.getParticipantsAccountIDsForDisplay(report);
+    const visibleParticipantAccountIDs = ReportUtils.getParticipantsAccountIDsForDisplay(report, true);
 
     const participantPersonalDetailList = Object.values(OptionsListUtils.getPersonalDetailsForAccountIDs(participantAccountIDs, personalDetails)) as PersonalDetails[];
     const personalDetail = participantPersonalDetailList[0] ?? {};
@@ -247,13 +302,28 @@ function getOptionData({
     result.isTaskReport = ReportUtils.isTaskReport(report);
     result.isInvoiceReport = ReportUtils.isInvoiceReport(report);
     result.parentReportAction = parentReportAction;
-    result.isArchivedRoom = ReportUtils.isArchivedRoom(report);
+    const reportNameValuePairs = ReportUtils.getReportNameValuePairs(report?.reportID);
+    result.isArchivedRoom = ReportUtils.isArchivedRoom(report, reportNameValuePairs);
     result.isPolicyExpenseChat = ReportUtils.isPolicyExpenseChat(report);
     result.isExpenseRequest = ReportUtils.isExpenseRequest(report);
     result.isMoneyRequestReport = ReportUtils.isMoneyRequestReport(report);
     result.shouldShowSubscript = ReportUtils.shouldReportShowSubscript(report);
     result.pendingAction = report.pendingFields?.addWorkspaceRoom ?? report.pendingFields?.createChat;
     result.brickRoadIndicator = hasErrors || hasViolations ? CONST.BRICK_ROAD_INDICATOR_STATUS.ERROR : '';
+    const oneTransactionThreadReportID = ReportActionsUtils.getOneTransactionThreadReportID(report.reportID, ReportActionsUtils.getAllReportActions(report.reportID));
+    if (oneTransactionThreadReportID) {
+        const oneTransactionThreadReport = ReportUtils.getReport(oneTransactionThreadReportID);
+
+        if (
+            ReportUtils.shouldDisplayTransactionThreadViolations(
+                oneTransactionThreadReport,
+                transactionViolations,
+                ReportActionsUtils.getAllReportActions(report.reportID)[oneTransactionThreadReport?.parentReportActionID ?? '-1'],
+            )
+        ) {
+            result.brickRoadIndicator = CONST.BRICK_ROAD_INDICATOR_STATUS.ERROR;
+        }
+    }
     result.ownerAccountID = report.ownerAccountID;
     result.managerID = report.managerID;
     result.reportID = report.reportID;
@@ -267,15 +337,18 @@ function getOptionData({
     result.isPinned = report.isPinned;
     result.iouReportID = report.iouReportID;
     result.keyForList = String(report.reportID);
-    result.tooltipText = ReportUtils.getReportParticipantsTitle(report.visibleChatMemberAccountIDs ?? []);
     result.hasOutstandingChildRequest = report.hasOutstandingChildRequest;
-    result.parentReportID = report.parentReportID ?? '';
+    result.parentReportID = report.parentReportID ?? '-1';
     result.isWaitingOnBankAccount = report.isWaitingOnBankAccount;
     result.notificationPreference = report.notificationPreference;
     result.isAllowedToComment = ReportUtils.canUserPerformWriteAction(report);
     result.chatType = report.chatType;
     result.isDeletedParentAction = report.isDeletedParentAction;
     result.isSelfDM = ReportUtils.isSelfDM(report);
+    result.tooltipText = ReportUtils.getReportParticipantsTitle(visibleParticipantAccountIDs);
+    result.hasOutstandingChildTask = report.hasOutstandingChildTask;
+    result.hasParentAccess = report.hasParentAccess;
+    result.isConciergeChat = ReportUtils.isConciergeChatReport(report);
 
     const hasMultipleParticipants = participantPersonalDetailList.length > 1 || result.isChatRoom || result.isPolicyExpenseChat || ReportUtils.isExpenseReport(report);
     const subtitle = ReportUtils.getChatRoomSubtitle(report);
@@ -321,18 +394,12 @@ function getOptionData({
     if ((result.isChatRoom || result.isPolicyExpenseChat || result.isThread || result.isTaskReport || isThreadMessage) && !result.isArchivedRoom) {
         const lastActionName = lastAction?.actionName ?? report.lastActionType;
 
-        if (lastAction?.actionName === CONST.REPORT.ACTIONS.TYPE.RENAMED) {
-            const newName = lastAction?.originalMessage?.newName ?? '';
-            result.alternateText = Localize.translate(preferredLocale, 'newRoomPage.roomRenamedTo', {newName});
+        if (ReportActionsUtils.isRenamedAction(lastAction)) {
+            result.alternateText = ReportActionsUtils.getRenamedAction(lastAction);
         } else if (ReportActionsUtils.isTaskAction(lastAction)) {
             result.alternateText = ReportUtils.formatReportLastMessageText(TaskUtils.getTaskReportActionMessage(lastAction).text);
-        } else if (
-            lastActionName === CONST.REPORT.ACTIONS.TYPE.ROOM_CHANGE_LOG.INVITE_TO_ROOM ||
-            lastActionName === CONST.REPORT.ACTIONS.TYPE.ROOM_CHANGE_LOG.REMOVE_FROM_ROOM ||
-            lastActionName === CONST.REPORT.ACTIONS.TYPE.POLICY_CHANGE_LOG.INVITE_TO_ROOM ||
-            lastActionName === CONST.REPORT.ACTIONS.TYPE.POLICY_CHANGE_LOG.REMOVE_FROM_ROOM
-        ) {
-            const lastActionOriginalMessage = lastAction?.actionName ? (lastAction?.originalMessage as ChangeLog) : null;
+        } else if (ReportActionsUtils.isInviteOrRemovedAction(lastAction)) {
+            const lastActionOriginalMessage = lastAction?.actionName ? ReportActionsUtils.getOriginalMessage(lastAction) : null;
             const targetAccountIDs = lastActionOriginalMessage?.targetAccountIDs ?? [];
             const targetAccountIDsLength = targetAccountIDs.length !== 0 ? targetAccountIDs.length : report.lastMessageHtml?.match(/<mention-user[^>]*><\/mention-user>/g)?.length ?? 0;
             const verb =
@@ -340,7 +407,7 @@ function getOptionData({
                     ? Localize.translate(preferredLocale, 'workspace.invite.invited')
                     : Localize.translate(preferredLocale, 'workspace.invite.removed');
             const users = Localize.translate(preferredLocale, targetAccountIDsLength > 1 ? 'workspace.invite.users' : 'workspace.invite.user');
-            result.alternateText = `${lastActorDisplayName} ${verb} ${targetAccountIDsLength} ${users}`.trim();
+            result.alternateText = ReportUtils.formatReportLastMessageText(`${lastActorDisplayName} ${verb} ${targetAccountIDsLength} ${users}`);
 
             const roomName = lastActionOriginalMessage?.roomName ?? '';
             if (roomName) {
@@ -350,46 +417,41 @@ function getOptionData({
                         : ` ${Localize.translate(preferredLocale, 'workspace.invite.from')}`;
                 result.alternateText += `${preposition} ${roomName}`;
             }
+        } else if (ReportActionsUtils.isActionOfType(lastAction, CONST.REPORT.ACTIONS.TYPE.ROOM_CHANGE_LOG.UPDATE_ROOM_DESCRIPTION)) {
+            result.alternateText = `${lastActorDisplayName} ${ReportActionsUtils.getUpdateRoomDescriptionMessage(lastAction)}`;
+        } else if (ReportActionsUtils.isActionOfType(lastAction, CONST.REPORT.ACTIONS.TYPE.POLICY_CHANGE_LOG.UPDATE_NAME)) {
+            result.alternateText = ReportUtils.getWorkspaceNameUpdatedMessage(lastAction);
         } else if (lastAction?.actionName === CONST.REPORT.ACTIONS.TYPE.POLICY_CHANGE_LOG.LEAVE_POLICY) {
             result.alternateText = Localize.translateLocal('workspace.invite.leftWorkspace');
         } else if (lastAction?.actionName !== CONST.REPORT.ACTIONS.TYPE.REPORT_PREVIEW && lastActorDisplayName && lastMessageTextFromReport) {
-            result.alternateText = `${lastActorDisplayName}: ${lastMessageText}`;
+            result.alternateText = ReportUtils.formatReportLastMessageText(Parser.htmlToText(`${lastActorDisplayName}: ${lastMessageText}`));
+        } else if (lastAction?.actionName === CONST.REPORT.ACTIONS.TYPE.POLICY_CHANGE_LOG.ADD_TAG) {
+            result.alternateText = PolicyUtils.getCleanedTagName(ReportActionsUtils.getReportActionMessage(lastAction)?.text ?? '');
+        } else if (lastAction && ReportActionsUtils.isOldDotReportAction(lastAction)) {
+            result.alternateText = ReportActionsUtils.getMessageOfOldDotReportAction(lastAction);
+        } else if (lastAction?.actionName === CONST.REPORT.ACTIONS.TYPE.POLICY_CHANGE_LOG.ADD_EMPLOYEE) {
+            result.alternateText = ReportActionsUtils.getPolicyChangeLogAddEmployeeMessage(lastAction);
+        } else if (lastAction?.actionName === CONST.REPORT.ACTIONS.TYPE.POLICY_CHANGE_LOG.UPDATE_EMPLOYEE) {
+            result.alternateText = ReportActionsUtils.getPolicyChangeLogChangeRoleMessage(lastAction);
+        } else if (lastAction?.actionName === CONST.REPORT.ACTIONS.TYPE.POLICY_CHANGE_LOG.DELETE_EMPLOYEE) {
+            result.alternateText = ReportActionsUtils.getPolicyChangeLogDeleteMemberMessage(lastAction);
         } else {
-            result.alternateText = lastMessageTextFromReport.length > 0 ? lastMessageText : ReportActionsUtils.getLastVisibleMessage(report.reportID, {}, lastAction)?.lastMessageText;
+            result.alternateText =
+                lastMessageTextFromReport.length > 0
+                    ? ReportUtils.formatReportLastMessageText(Parser.htmlToText(lastMessageText))
+                    : ReportActionsUtils.getLastVisibleMessage(report.reportID, {}, lastAction)?.lastMessageText;
             if (!result.alternateText) {
-                result.alternateText = Localize.translate(preferredLocale, 'report.noActivityYet');
+                result.alternateText = ReportUtils.formatReportLastMessageText(getWelcomeMessage(report, policy).messageText ?? Localize.translateLocal('report.noActivityYet'));
             }
         }
     } else {
         if (!lastMessageText) {
-            // Here we get the beginning of chat history message and append the display name for each user, adding pronouns if there are any.
-            // We also add a fullstop after the final name, the word "and" before the final name and commas between all previous names.
-            lastMessageText = ReportUtils.isSelfDM(report)
-                ? Localize.translate(preferredLocale, 'reportActionsView.beginningOfChatHistorySelfDM')
-                : Localize.translate(preferredLocale, 'reportActionsView.beginningOfChatHistory') +
-                  displayNamesWithTooltips
-                      .map(({displayName, pronouns}, index) => {
-                          const formattedText = !pronouns ? displayName : `${displayName} (${pronouns})`;
-
-                          if (index === displayNamesWithTooltips.length - 1) {
-                              return `${formattedText}.`;
-                          }
-                          if (index === displayNamesWithTooltips.length - 2) {
-                              return `${formattedText} ${Localize.translate(preferredLocale, 'common.and')}`;
-                          }
-                          if (index < displayNamesWithTooltips.length - 2) {
-                              return `${formattedText},`;
-                          }
-
-                          return '';
-                      })
-                      .join(' ');
+            lastMessageText = ReportUtils.formatReportLastMessageText(getWelcomeMessage(report, policy).messageText ?? Localize.translateLocal('report.noActivityYet'));
         }
-
         result.alternateText =
             (ReportUtils.isGroupChat(report) || ReportUtils.isDeprecatedGroupDM(report)) && lastActorDisplayName
-                ? `${lastActorDisplayName}: ${lastMessageText}`
-                : lastMessageText || formattedLogin;
+                ? ReportUtils.formatReportLastMessageText(Parser.htmlToText(`${lastActorDisplayName}: ${lastMessageText}`))
+                : ReportUtils.formatReportLastMessageText(Parser.htmlToText(lastMessageText)) || formattedLogin;
     }
 
     result.isIOUReportOwner = ReportUtils.isIOUOwnedByCurrentUser(result as Report);
@@ -406,14 +468,13 @@ function getOptionData({
         result.phoneNumber = personalDetail?.phoneNumber;
     }
 
-    const reportName = ReportUtils.getReportName(report, policy);
+    const reportName = ReportUtils.getReportName(report, policy, undefined, undefined, invoiceReceiverPolicy);
 
     result.text = reportName;
     result.subtitle = subtitle;
     result.participantsList = participantPersonalDetailList;
 
-    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.icons = ReportUtils.getIcons(report, personalDetails, personalDetail?.avatar, personalDetail?.login, personalDetail?.accountID, policy, invoiceReceiverPolicy);
     result.displayNamesWithTooltips = displayNamesWithTooltips;
 
     if (status) {
@@ -424,7 +485,113 @@ function getOptionData({
     return result;
 }
 
+function getWelcomeMessage(report: OnyxEntry<Report>, policy: OnyxEntry<Policy>): WelcomeMessage {
+    const welcomeMessage: WelcomeMessage = {showReportName: true};
+    if (ReportUtils.isChatThread(report) || ReportUtils.isTaskReport(report)) {
+        return welcomeMessage;
+    }
+
+    if (ReportUtils.isChatRoom(report)) {
+        return getRoomWelcomeMessage(report);
+    }
+
+    if (ReportUtils.isPolicyExpenseChat(report)) {
+        if (policy?.description) {
+            welcomeMessage.messageHtml = policy.description;
+            welcomeMessage.messageText = Parser.htmlToText(welcomeMessage.messageHtml);
+        } else {
+            welcomeMessage.phrase1 = Localize.translateLocal('reportActionsView.beginningOfChatHistoryPolicyExpenseChatPartOne');
+            welcomeMessage.phrase2 = Localize.translateLocal('reportActionsView.beginningOfChatHistoryPolicyExpenseChatPartTwo');
+            welcomeMessage.phrase3 = Localize.translateLocal('reportActionsView.beginningOfChatHistoryPolicyExpenseChatPartThree');
+            welcomeMessage.messageText = `${welcomeMessage.phrase1} ${ReportUtils.getDisplayNameForParticipant(report?.ownerAccountID)} ${welcomeMessage.phrase2} ${ReportUtils.getPolicyName(
+                report,
+            )} ${welcomeMessage.phrase3}`;
+        }
+        return welcomeMessage;
+    }
+
+    if (ReportUtils.isSelfDM(report)) {
+        welcomeMessage.phrase1 = Localize.translateLocal('reportActionsView.beginningOfChatHistorySelfDM');
+        welcomeMessage.messageText = welcomeMessage.phrase1;
+        return welcomeMessage;
+    }
+
+    if (ReportUtils.isSystemChat(report)) {
+        welcomeMessage.phrase1 = Localize.translateLocal('reportActionsView.beginningOfChatHistorySystemDM');
+        welcomeMessage.messageText = welcomeMessage.phrase1;
+        return welcomeMessage;
+    }
+
+    welcomeMessage.phrase1 = Localize.translateLocal('reportActionsView.beginningOfChatHistory');
+    const participantAccountIDs = ReportUtils.getParticipantsAccountIDsForDisplay(report);
+    const isMultipleParticipant = participantAccountIDs.length > 1;
+    const displayNamesWithTooltips = ReportUtils.getDisplayNamesWithTooltips(
+        OptionsListUtils.getPersonalDetailsForAccountIDs(participantAccountIDs, allPersonalDetails),
+        isMultipleParticipant,
+    );
+    const displayNamesWithTooltipsText = displayNamesWithTooltips
+        .map(({displayName, pronouns}, index) => {
+            const formattedText = !pronouns ? displayName : `${displayName} (${pronouns})`;
+
+            if (index === displayNamesWithTooltips.length - 1) {
+                return `${formattedText}.`;
+            }
+            if (index === displayNamesWithTooltips.length - 2) {
+                return `${formattedText} ${Localize.translateLocal('common.and')}`;
+            }
+            if (index < displayNamesWithTooltips.length - 2) {
+                return `${formattedText},`;
+            }
+
+            return '';
+        })
+        .join(' ');
+
+    welcomeMessage.messageText = `${welcomeMessage.phrase1} ${displayNamesWithTooltipsText}`;
+    return welcomeMessage;
+}
+
+/**
+ * Get welcome message based on room type
+ */
+function getRoomWelcomeMessage(report: OnyxEntry<Report>): WelcomeMessage {
+    const welcomeMessage: WelcomeMessage = {showReportName: true};
+    const workspaceName = ReportUtils.getPolicyName(report);
+
+    if (report?.description) {
+        welcomeMessage.messageHtml = report.description;
+        welcomeMessage.messageText = Parser.htmlToText(welcomeMessage.messageHtml);
+        return welcomeMessage;
+    }
+
+    const reportNameValuePairs = ReportUtils.getReportNameValuePairs(report?.reportID);
+    if (ReportUtils.isArchivedRoom(report, reportNameValuePairs)) {
+        welcomeMessage.phrase1 = Localize.translateLocal('reportActionsView.beginningOfArchivedRoomPartOne');
+        welcomeMessage.phrase2 = Localize.translateLocal('reportActionsView.beginningOfArchivedRoomPartTwo');
+    } else if (ReportUtils.isDomainRoom(report)) {
+        welcomeMessage.phrase1 = Localize.translateLocal('reportActionsView.beginningOfChatHistoryDomainRoomPartOne', {domainRoom: report?.reportName ?? ''});
+        welcomeMessage.phrase2 = Localize.translateLocal('reportActionsView.beginningOfChatHistoryDomainRoomPartTwo');
+    } else if (ReportUtils.isAdminRoom(report)) {
+        welcomeMessage.phrase1 = Localize.translateLocal('reportActionsView.beginningOfChatHistoryAdminRoomPartOne', {workspaceName});
+        welcomeMessage.phrase2 = Localize.translateLocal('reportActionsView.beginningOfChatHistoryAdminRoomPartTwo');
+    } else if (ReportUtils.isAnnounceRoom(report)) {
+        welcomeMessage.phrase1 = Localize.translateLocal('reportActionsView.beginningOfChatHistoryAnnounceRoomPartOne', {workspaceName});
+        welcomeMessage.phrase2 = Localize.translateLocal('reportActionsView.beginningOfChatHistoryAnnounceRoomPartTwo', {workspaceName});
+    } else if (ReportUtils.isInvoiceRoom(report)) {
+        welcomeMessage.showReportName = false;
+        welcomeMessage.phrase1 = Localize.translateLocal('reportActionsView.beginningOfChatHistoryInvoiceRoom');
+    } else {
+        // Message for user created rooms or other room types.
+        welcomeMessage.phrase1 = Localize.translateLocal('reportActionsView.beginningOfChatHistoryUserRoomPartOne');
+        welcomeMessage.phrase2 = Localize.translateLocal('reportActionsView.beginningOfChatHistoryUserRoomPartTwo');
+    }
+    welcomeMessage.messageText = `${welcomeMessage.phrase1} ${welcomeMessage.showReportName ? ReportUtils.getReportName(report) : ''} ${welcomeMessage.phrase2 ?? ''}`;
+
+    return welcomeMessage;
+}
+
 export default {
     getOptionData,
     getOrderedReportIDs,
+    getWelcomeMessage,
 };
diff --git a/src/libs/StringUtils.ts b/src/libs/StringUtils.ts
index 94cd04046ccc..5cc80a9a9005 100644
--- a/src/libs/StringUtils.ts
+++ b/src/libs/StringUtils.ts
@@ -63,6 +63,15 @@ function removeInvisibleCharacters(value: string): string {
     return result.trim();
 }
 
+/**
+ * Remove accents/diacritics
+ * @param text - The input string
+ * @returns The string with all accents/diacritics removed
+ */
+function normalizeAccents(text: string) {
+    return text.normalize('NFD').replace(/[\u0300-\u036f]/g, '');
+}
+
 /**
  *  Replace all CRLF with LF
  *  @param value - The input string
@@ -73,20 +82,19 @@ function normalizeCRLF(value?: string): string | undefined {
 }
 
 /**
- * Generates an acronym for a string.
- * @param string the string for which to produce the acronym
- * @returns the acronym
+ * Replace all line breaks with white spaces
+ */
+function lineBreaksToSpaces(text = '') {
+    return text.replace(CONST.REGEX.LINE_BREAK, ' ');
+}
+
+/**
+ * Get the first line of the string
  */
-function getAcronym(string: string): string {
-    let acronym = '';
-    const wordsInString = string.split(' ');
-    wordsInString.forEach((wordInString) => {
-        const splitByHyphenWords = wordInString.split('-');
-        splitByHyphenWords.forEach((splitByHyphenWord) => {
-            acronym += splitByHyphenWord.substring(0, 1);
-        });
-    });
-    return acronym;
+function getFirstLine(text = '') {
+    // Split the input string by newline characters and return the first element of the resulting array
+    const lines = text.split('\n');
+    return lines[0];
 }
 
-export default {sanitizeString, isEmptyString, removeInvisibleCharacters, normalizeCRLF, getAcronym};
+export default {sanitizeString, isEmptyString, removeInvisibleCharacters, normalizeAccents, normalizeCRLF, lineBreaksToSpaces, getFirstLine};
diff --git a/src/libs/SubscriptionUtils.ts b/src/libs/SubscriptionUtils.ts
new file mode 100644
index 000000000000..6df0b2f2c205
--- /dev/null
+++ b/src/libs/SubscriptionUtils.ts
@@ -0,0 +1,464 @@
+import {differenceInSeconds, fromUnixTime, isAfter, isBefore} from 'date-fns';
+import Onyx from 'react-native-onyx';
+import type {OnyxCollection, OnyxEntry} from 'react-native-onyx';
+import ONYXKEYS from '@src/ONYXKEYS';
+import type {BillingGraceEndPeriod, BillingStatus, Fund, FundList, Policy, StripeCustomerID} from '@src/types/onyx';
+import {isEmptyObject} from '@src/types/utils/EmptyObject';
+import * as PolicyUtils from './PolicyUtils';
+
+const PAYMENT_STATUS = {
+    POLICY_OWNER_WITH_AMOUNT_OWED: 'policy_owner_with_amount_owed',
+    POLICY_OWNER_WITH_AMOUNT_OWED_OVERDUE: 'policy_owner_with_amount_owed_overdue',
+    OWNER_OF_POLICY_UNDER_INVOICING: 'owner_of_policy_under_invoicing',
+    OWNER_OF_POLICY_UNDER_INVOICING_OVERDUE: 'owner_of_policy_under_invoicing_overdue',
+    BILLING_DISPUTE_PENDING: 'billing_dispute_pending',
+    CARD_AUTHENTICATION_REQUIRED: 'authentication_required',
+    INSUFFICIENT_FUNDS: 'insufficient_funds',
+    CARD_EXPIRED: 'expired_card',
+    CARD_EXPIRE_SOON: 'card_expire_soon',
+    RETRY_BILLING_SUCCESS: 'retry_billing_success',
+    RETRY_BILLING_ERROR: 'retry_billing_error',
+    GENERIC_API_ERROR: 'generic_api_error',
+} as const;
+
+let currentUserAccountID = -1;
+Onyx.connect({
+    key: ONYXKEYS.SESSION,
+    callback: (value) => {
+        currentUserAccountID = value?.accountID ?? -1;
+    },
+});
+
+let amountOwed: OnyxEntry<number>;
+Onyx.connect({
+    key: ONYXKEYS.NVP_PRIVATE_AMOUNT_OWED,
+    callback: (value) => (amountOwed = value),
+});
+
+let stripeCustomerId: OnyxEntry<StripeCustomerID>;
+Onyx.connect({
+    key: ONYXKEYS.NVP_PRIVATE_STRIPE_CUSTOMER_ID,
+    callback: (value) => {
+        if (!value) {
+            return;
+        }
+
+        stripeCustomerId = value;
+    },
+});
+
+let billingDisputePending: OnyxEntry<number>;
+Onyx.connect({
+    key: ONYXKEYS.NVP_PRIVATE_BILLING_DISPUTE_PENDING,
+    callback: (value) => (billingDisputePending = value),
+});
+
+let billingStatus: OnyxEntry<BillingStatus>;
+Onyx.connect({
+    key: ONYXKEYS.NVP_PRIVATE_BILLING_STATUS,
+    callback: (value) => (billingStatus = value),
+});
+
+let ownerBillingGraceEndPeriod: OnyxEntry<number>;
+Onyx.connect({
+    key: ONYXKEYS.NVP_PRIVATE_OWNER_BILLING_GRACE_PERIOD_END,
+    callback: (value) => (ownerBillingGraceEndPeriod = value),
+});
+
+let fundList: OnyxEntry<FundList>;
+Onyx.connect({
+    key: ONYXKEYS.FUND_LIST,
+    callback: (value) => {
+        if (!value) {
+            return;
+        }
+
+        fundList = value;
+    },
+});
+
+let retryBillingSuccessful: OnyxEntry<boolean>;
+Onyx.connect({
+    key: ONYXKEYS.SUBSCRIPTION_RETRY_BILLING_STATUS_SUCCESSFUL,
+    initWithStoredValues: false,
+    callback: (value) => {
+        if (value === undefined) {
+            return;
+        }
+
+        retryBillingSuccessful = value;
+    },
+});
+
+let retryBillingFailed: OnyxEntry<boolean>;
+Onyx.connect({
+    key: ONYXKEYS.SUBSCRIPTION_RETRY_BILLING_STATUS_FAILED,
+    callback: (value) => {
+        if (value === undefined) {
+            return;
+        }
+
+        retryBillingFailed = value;
+    },
+    initWithStoredValues: false,
+});
+
+let firstDayFreeTrial: OnyxEntry<string>;
+Onyx.connect({
+    key: ONYXKEYS.NVP_FIRST_DAY_FREE_TRIAL,
+    callback: (value) => (firstDayFreeTrial = value),
+});
+
+let lastDayFreeTrial: OnyxEntry<string>;
+Onyx.connect({
+    key: ONYXKEYS.NVP_LAST_DAY_FREE_TRIAL,
+    callback: (value) => (lastDayFreeTrial = value),
+});
+
+let userBillingFundID: OnyxEntry<number>;
+Onyx.connect({
+    key: ONYXKEYS.NVP_BILLING_FUND_ID,
+    callback: (value) => (userBillingFundID = value),
+});
+
+let userBillingGraceEndPeriodCollection: OnyxCollection<BillingGraceEndPeriod>;
+Onyx.connect({
+    key: ONYXKEYS.COLLECTION.SHARED_NVP_PRIVATE_USER_BILLING_GRACE_PERIOD_END,
+    callback: (value) => (userBillingGraceEndPeriodCollection = value),
+    waitForCollectionCallback: true,
+});
+
+let allPolicies: OnyxCollection<Policy>;
+Onyx.connect({
+    key: ONYXKEYS.COLLECTION.POLICY,
+    callback: (value) => (allPolicies = value),
+    waitForCollectionCallback: true,
+});
+
+/**
+ * @returns The date when the grace period ends.
+ */
+function getOverdueGracePeriodDate(): OnyxEntry<number> {
+    return ownerBillingGraceEndPeriod;
+}
+
+/**
+ * @returns Whether the workspace owner has an overdue grace period.
+ */
+function hasOverdueGracePeriod(): boolean {
+    return !!ownerBillingGraceEndPeriod ?? false;
+}
+
+/**
+ * @returns Whether the workspace owner's grace period is overdue.
+ */
+function hasGracePeriodOverdue(): boolean {
+    return !!ownerBillingGraceEndPeriod && Date.now() > new Date(ownerBillingGraceEndPeriod).getTime();
+}
+
+/**
+ * @returns The amount owed by the workspace owner.
+ */
+function getAmountOwed(): number {
+    return amountOwed ?? 0;
+}
+
+/**
+ * @returns Whether there is an amount owed by the workspace owner.
+ */
+function hasAmountOwed(): boolean {
+    return !!amountOwed;
+}
+
+/**
+ * @returns Whether there is a card authentication error.
+ */
+function hasCardAuthenticatedError() {
+    return stripeCustomerId?.status === 'authentication_required' && getAmountOwed() === 0;
+}
+
+/**
+ * @returns Whether there is a billing dispute pending.
+ */
+function hasBillingDisputePending() {
+    return !!billingDisputePending ?? false;
+}
+
+/**
+ * @returns Whether there is a card expired error.
+ */
+function hasCardExpiredError() {
+    return billingStatus?.declineReason === 'expired_card' && amountOwed !== 0;
+}
+
+/**
+ * @returns Whether there is an insufficient funds error.
+ */
+function hasInsufficientFundsError() {
+    return billingStatus?.declineReason === 'insufficient_funds' && amountOwed !== 0;
+}
+
+/**
+ * @returns The card to be used for subscription billing.
+ */
+function getCardForSubscriptionBilling(): Fund | undefined {
+    return Object.values(fundList ?? {}).find((card) => card?.accountData?.additionalData?.isBillingCard);
+}
+
+/**
+ * @returns Whether the card is due to expire soon.
+ */
+function hasCardExpiringSoon(): boolean {
+    if (!isEmptyObject(billingStatus)) {
+        return false;
+    }
+
+    const card = getCardForSubscriptionBilling();
+
+    if (!card) {
+        return false;
+    }
+
+    const cardYear = card?.accountData?.cardYear;
+    const cardMonth = card?.accountData?.cardMonth;
+    const currentYear = new Date().getFullYear();
+    const currentMonth = new Date().getMonth();
+
+    const isExpiringThisMonth = cardYear === currentYear && cardMonth === currentMonth;
+    const isExpiringNextMonth = cardYear === (currentMonth === 12 ? currentYear + 1 : currentYear) && cardMonth === (currentMonth === 12 ? 1 : currentMonth + 1);
+
+    return isExpiringThisMonth || isExpiringNextMonth;
+}
+
+/**
+ * @returns Whether there is a retry billing error.
+ */
+function hasRetryBillingError(): boolean {
+    return !!retryBillingFailed ?? false;
+}
+
+/**
+ * @returns Whether the retry billing was successful.
+ */
+function isRetryBillingSuccessful(): boolean {
+    return !!retryBillingSuccessful ?? false;
+}
+
+type SubscriptionStatus = {
+    status: string;
+    isError?: boolean;
+};
+
+/**
+ * @returns The subscription status.
+ */
+function getSubscriptionStatus(): SubscriptionStatus | undefined {
+    if (hasOverdueGracePeriod()) {
+        if (hasAmountOwed()) {
+            // 1. Policy owner with amount owed, within grace period
+            if (!hasGracePeriodOverdue()) {
+                return {
+                    status: PAYMENT_STATUS.POLICY_OWNER_WITH_AMOUNT_OWED,
+                    isError: true,
+                };
+            }
+
+            // 2. Policy owner with amount owed, overdue (past grace period)
+            if (hasGracePeriodOverdue()) {
+                return {
+                    status: PAYMENT_STATUS.POLICY_OWNER_WITH_AMOUNT_OWED_OVERDUE,
+                };
+            }
+        } else {
+            // 3. Owner of policy under invoicing, within grace period
+            if (!hasGracePeriodOverdue()) {
+                return {
+                    status: PAYMENT_STATUS.OWNER_OF_POLICY_UNDER_INVOICING,
+                };
+            }
+
+            // 4. Owner of policy under invoicing, overdue (past grace period)
+            if (hasGracePeriodOverdue()) {
+                return {
+                    status: PAYMENT_STATUS.OWNER_OF_POLICY_UNDER_INVOICING_OVERDUE,
+                };
+            }
+        }
+    }
+    // 5. Billing disputed by cardholder
+    if (hasBillingDisputePending()) {
+        return {
+            status: PAYMENT_STATUS.BILLING_DISPUTE_PENDING,
+        };
+    }
+
+    // 6. Card not authenticated
+    if (hasCardAuthenticatedError()) {
+        return {
+            status: PAYMENT_STATUS.CARD_AUTHENTICATION_REQUIRED,
+        };
+    }
+
+    // 7. Insufficient funds
+    if (hasInsufficientFundsError()) {
+        return {
+            status: PAYMENT_STATUS.INSUFFICIENT_FUNDS,
+        };
+    }
+
+    // 8. Card expired
+    if (hasCardExpiredError()) {
+        return {
+            status: PAYMENT_STATUS.CARD_EXPIRED,
+        };
+    }
+
+    // 9. Card due to expire soon
+    if (hasCardExpiringSoon()) {
+        return {
+            status: PAYMENT_STATUS.CARD_EXPIRE_SOON,
+        };
+    }
+
+    // 10. Retry billing success
+    if (isRetryBillingSuccessful()) {
+        return {
+            status: PAYMENT_STATUS.RETRY_BILLING_SUCCESS,
+            isError: false,
+        };
+    }
+
+    // 11. Retry billing error
+    if (hasRetryBillingError()) {
+        return {
+            status: PAYMENT_STATUS.RETRY_BILLING_ERROR,
+            isError: true,
+        };
+    }
+
+    return undefined;
+}
+
+/**
+ * @returns Whether there is a subscription red dot error.
+ */
+function hasSubscriptionRedDotError(): boolean {
+    return getSubscriptionStatus()?.isError ?? false;
+}
+
+/**
+ * @returns Whether there is a subscription green dot info.
+ */
+function hasSubscriptionGreenDotInfo(): boolean {
+    return getSubscriptionStatus()?.isError === false;
+}
+
+/**
+ * Calculates the remaining number of days of the workspace owner's free trial before it ends.
+ */
+function calculateRemainingFreeTrialDays(): number {
+    if (!lastDayFreeTrial) {
+        return 0;
+    }
+
+    const currentDate = new Date();
+    const lastDayFreeTrialDate = new Date(`${lastDayFreeTrial}Z`);
+    const diffInSeconds = differenceInSeconds(lastDayFreeTrialDate, currentDate);
+    const diffInDays = Math.ceil(diffInSeconds / 86400);
+
+    return diffInDays < 0 ? 0 : diffInDays;
+}
+
+/**
+ * Whether the workspace's owner is on its free trial period.
+ */
+function isUserOnFreeTrial(): boolean {
+    if (!firstDayFreeTrial || !lastDayFreeTrial) {
+        return false;
+    }
+
+    const currentDate = new Date();
+
+    // Free Trials are stored in UTC so the below code will convert the provided UTC datetime to local time
+    const firstDayFreeTrialDate = new Date(`${firstDayFreeTrial}Z`);
+    const lastDayFreeTrialDate = new Date(`${lastDayFreeTrial}Z`);
+
+    return isAfter(currentDate, firstDayFreeTrialDate) && isBefore(currentDate, lastDayFreeTrialDate);
+}
+
+/**
+ * Whether the workspace owner's free trial period has ended.
+ */
+function hasUserFreeTrialEnded(): boolean {
+    if (!lastDayFreeTrial) {
+        return false;
+    }
+
+    const currentDate = new Date();
+    const lastDayFreeTrialDate = new Date(`${lastDayFreeTrial}Z`);
+
+    return isAfter(currentDate, lastDayFreeTrialDate);
+}
+
+/**
+ * Whether the user has a payment card added to its account.
+ */
+function doesUserHavePaymentCardAdded(): boolean {
+    return userBillingFundID !== undefined;
+}
+
+/**
+ * Whether the user's billable actions should be restricted.
+ */
+function shouldRestrictUserBillableActions(policyID: string): boolean {
+    const currentDate = new Date();
+
+    const policy = allPolicies?.[`${ONYXKEYS.COLLECTION.POLICY}${policyID}`];
+
+    // This logic will be executed if the user is a workspace's non-owner (normal user or admin).
+    // We should restrict the workspace's non-owner actions if it's member of a workspace where the owner is
+    // past due and is past its grace period end.
+    for (const userBillingGraceEndPeriodEntry of Object.entries(userBillingGraceEndPeriodCollection ?? {})) {
+        const [entryKey, userBillingGracePeriodEnd] = userBillingGraceEndPeriodEntry;
+
+        if (userBillingGracePeriodEnd && isAfter(currentDate, fromUnixTime(userBillingGracePeriodEnd.value))) {
+            // Extracts the owner account ID from the collection member key.
+            const ownerAccountID = Number(entryKey.slice(ONYXKEYS.COLLECTION.SHARED_NVP_PRIVATE_USER_BILLING_GRACE_PERIOD_END.length));
+
+            if (PolicyUtils.isPolicyOwner(policy, ownerAccountID)) {
+                return true;
+            }
+        }
+    }
+
+    // If it reached here it means that the user is actually the workspace's owner.
+    // We should restrict the workspace's owner actions if it's past its grace period end date and it's owing some amount.
+    if (
+        PolicyUtils.isPolicyOwner(policy, currentUserAccountID) &&
+        ownerBillingGraceEndPeriod &&
+        amountOwed !== undefined &&
+        amountOwed > 0 &&
+        isAfter(currentDate, fromUnixTime(ownerBillingGraceEndPeriod))
+    ) {
+        return true;
+    }
+
+    return false;
+}
+
+export {
+    calculateRemainingFreeTrialDays,
+    doesUserHavePaymentCardAdded,
+    hasUserFreeTrialEnded,
+    isUserOnFreeTrial,
+    shouldRestrictUserBillableActions,
+    getSubscriptionStatus,
+    hasSubscriptionRedDotError,
+    getAmountOwed,
+    getOverdueGracePeriodDate,
+    getCardForSubscriptionBilling,
+    hasCardAuthenticatedError,
+    hasSubscriptionGreenDotInfo,
+    hasRetryBillingError,
+    PAYMENT_STATUS,
+};
diff --git a/src/libs/TaskUtils.ts b/src/libs/TaskUtils.ts
index 74dd059bf9d3..06745a49217b 100644
--- a/src/libs/TaskUtils.ts
+++ b/src/libs/TaskUtils.ts
@@ -1,20 +1,20 @@
-import type {OnyxCollection, OnyxEntry} from 'react-native-onyx';
-import Onyx from 'react-native-onyx';
+import type {OnyxEntry} from 'react-native-onyx';
 import CONST from '@src/CONST';
 import ONYXKEYS from '@src/ONYXKEYS';
-import type {Report} from '@src/types/onyx';
+import ROUTES from '@src/ROUTES';
 import type {Message} from '@src/types/onyx/ReportAction';
 import type ReportAction from '@src/types/onyx/ReportAction';
 import * as Localize from './Localize';
+import Navigation from './Navigation/Navigation';
+import {getReportActionHtml, getReportActionText} from './ReportActionsUtils';
+import * as ReportConnection from './ReportConnection';
 
-let allReports: OnyxCollection<Report> = {};
-Onyx.connect({
-    key: ONYXKEYS.COLLECTION.REPORT,
-    waitForCollectionCallback: true,
-    callback: (reports) => {
-        allReports = reports;
-    },
-});
+/**
+ * Check if the active route belongs to task edit flow.
+ */
+function isActiveTaskEditRoute(reportID: string): boolean {
+    return [ROUTES.TASK_TITLE, ROUTES.TASK_ASSIGNEE, ROUTES.REPORT_DESCRIPTION].map((route) => route.getRoute(reportID)).some(Navigation.isActiveRoute);
+}
 
 /**
  * Given the Task reportAction name, return the appropriate message to be displayed and copied to clipboard.
@@ -29,8 +29,8 @@ function getTaskReportActionMessage(action: OnyxEntry<ReportAction>): Pick<Messa
             return {text: Localize.translateLocal('task.messages.reopened')};
         case CONST.REPORT.ACTIONS.TYPE.TASK_EDITED:
             return {
-                text: action?.message?.[0]?.text ?? '',
-                html: action?.message?.[0]?.html,
+                text: getReportActionText(action),
+                html: getReportActionHtml(action),
             };
         default:
             return {text: Localize.translateLocal('task.task')};
@@ -38,7 +38,7 @@ function getTaskReportActionMessage(action: OnyxEntry<ReportAction>): Pick<Messa
 }
 
 function getTaskTitle(taskReportID: string, fallbackTitle = ''): string {
-    const taskReport = allReports?.[`${ONYXKEYS.COLLECTION.REPORT}${taskReportID}`] ?? {};
+    const taskReport = ReportConnection.getAllReports()?.[`${ONYXKEYS.COLLECTION.REPORT}${taskReportID}`] ?? {};
     // We need to check for reportID, not just reportName, because when a receiver opens the task for the first time,
     // an optimistic report is created with the only property – reportName: 'Chat report',
     // and it will be displayed as the task title without checking for reportID to be present.
@@ -46,9 +46,9 @@ function getTaskTitle(taskReportID: string, fallbackTitle = ''): string {
 }
 
 function getTaskCreatedMessage(reportAction: OnyxEntry<ReportAction>) {
-    const taskReportID = reportAction?.childReportID ?? '';
+    const taskReportID = reportAction?.childReportID ?? '-1';
     const taskTitle = getTaskTitle(taskReportID, reportAction?.childReportName);
     return taskTitle ? Localize.translateLocal('task.messages.created', {title: taskTitle}) : '';
 }
 
-export {getTaskReportActionMessage, getTaskTitle, getTaskCreatedMessage};
+export {isActiveTaskEditRoute, getTaskReportActionMessage, getTaskTitle, getTaskCreatedMessage};
diff --git a/src/libs/TooltipRefManager.tsx b/src/libs/TooltipRefManager.tsx
new file mode 100644
index 000000000000..b94e224f5024
--- /dev/null
+++ b/src/libs/TooltipRefManager.tsx
@@ -0,0 +1,16 @@
+import React from 'react';
+
+type TTooltipRef = {
+    hideTooltip: () => void;
+};
+
+const tooltipRef = React.createRef<TTooltipRef>();
+
+const TooltipRefManager = {
+    ref: tooltipRef,
+    hideTooltip: () => {
+        tooltipRef.current?.hideTooltip();
+    },
+};
+
+export default TooltipRefManager;
diff --git a/src/libs/TransactionUtils.ts b/src/libs/TransactionUtils.ts
deleted file mode 100644
index 36cbb4f1ecc5..000000000000
--- a/src/libs/TransactionUtils.ts
+++ /dev/null
@@ -1,731 +0,0 @@
-import lodashHas from 'lodash/has';
-import type {OnyxCollection, OnyxEntry} from 'react-native-onyx';
-import Onyx from 'react-native-onyx';
-import type {ValueOf} from 'type-fest';
-import CONST from '@src/CONST';
-import ONYXKEYS from '@src/ONYXKEYS';
-import type {RecentWaypoint, Report, TaxRate, TaxRates, TaxRatesWithDefault, Transaction, TransactionViolation} from '@src/types/onyx';
-import type {Comment, Receipt, TransactionChanges, TransactionPendingFieldsKey, Waypoint, WaypointCollection} from '@src/types/onyx/Transaction';
-import {isEmptyObject} from '@src/types/utils/EmptyObject';
-import type {IOURequestType} from './actions/IOU';
-import {isCorporateCard, isExpensifyCard} from './CardUtils';
-import DateUtils from './DateUtils';
-import * as Localize from './Localize';
-import * as NumberUtils from './NumberUtils';
-import {getCleanedTagName} from './PolicyUtils';
-
-let allTransactions: OnyxCollection<Transaction> = {};
-
-Onyx.connect({
-    key: ONYXKEYS.COLLECTION.TRANSACTION,
-    waitForCollectionCallback: true,
-    callback: (value) => {
-        if (!value) {
-            return;
-        }
-        allTransactions = Object.fromEntries(Object.entries(value).filter(([, transaction]) => !!transaction));
-    },
-});
-
-let allReports: OnyxCollection<Report>;
-Onyx.connect({
-    key: ONYXKEYS.COLLECTION.REPORT,
-    waitForCollectionCallback: true,
-    callback: (value) => (allReports = value),
-});
-
-function isDistanceRequest(transaction: OnyxEntry<Transaction>): boolean {
-    // This is used during the expense creation flow before the transaction has been saved to the server
-    if (lodashHas(transaction, 'iouRequestType')) {
-        return transaction?.iouRequestType === CONST.IOU.REQUEST_TYPE.DISTANCE;
-    }
-
-    // This is the case for transaction objects once they have been saved to the server
-    const type = transaction?.comment?.type;
-    const customUnitName = transaction?.comment?.customUnit?.name;
-    return type === CONST.TRANSACTION.TYPE.CUSTOM_UNIT && customUnitName === CONST.CUSTOM_UNITS.NAME_DISTANCE;
-}
-
-function isScanRequest(transaction: OnyxEntry<Transaction>): boolean {
-    // This is used during the expense creation flow before the transaction has been saved to the server
-    if (lodashHas(transaction, 'iouRequestType')) {
-        return transaction?.iouRequestType === CONST.IOU.REQUEST_TYPE.SCAN;
-    }
-
-    return Boolean(transaction?.receipt?.source);
-}
-
-function getRequestType(transaction: OnyxEntry<Transaction>): IOURequestType {
-    if (isDistanceRequest(transaction)) {
-        return CONST.IOU.REQUEST_TYPE.DISTANCE;
-    }
-    if (isScanRequest(transaction)) {
-        return CONST.IOU.REQUEST_TYPE.SCAN;
-    }
-
-    return CONST.IOU.REQUEST_TYPE.MANUAL;
-}
-
-function isManualRequest(transaction: Transaction): boolean {
-    // This is used during the expense creation flow before the transaction has been saved to the server
-    if (lodashHas(transaction, 'iouRequestType')) {
-        return transaction.iouRequestType === CONST.IOU.REQUEST_TYPE.MANUAL;
-    }
-
-    return getRequestType(transaction) === CONST.IOU.REQUEST_TYPE.MANUAL;
-}
-
-/**
- * Optimistically generate a transaction.
- *
- * @param amount – in cents
- * @param [existingTransactionID] When creating a distance expense, 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.
- */
-function buildOptimisticTransaction(
-    amount: number,
-    currency: string,
-    reportID: string,
-    comment = '',
-    created = '',
-    source = '',
-    originalTransactionID = '',
-    merchant = '',
-    receipt: Receipt = {},
-    filename = '',
-    existingTransactionID: string | null = null,
-    category = '',
-    tag = '',
-    billable = false,
-    pendingFields: Partial<{[K in TransactionPendingFieldsKey]: ValueOf<typeof CONST.RED_BRICK_ROAD_PENDING_ACTION>}> | undefined = undefined,
-    reimbursable = true,
-): Transaction {
-    // 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)
-    const transactionID = existingTransactionID ?? NumberUtils.rand64();
-
-    const commentJSON: Comment = {comment};
-    if (source) {
-        commentJSON.source = source;
-    }
-    if (originalTransactionID) {
-        commentJSON.originalTransactionID = originalTransactionID;
-    }
-
-    return {
-        ...(!isEmptyObject(pendingFields) ? {pendingFields} : {}),
-        transactionID,
-        amount,
-        currency,
-        reportID,
-        comment: commentJSON,
-        merchant: merchant || CONST.TRANSACTION.PARTIAL_TRANSACTION_MERCHANT,
-        created: created || DateUtils.getDBTime(),
-        pendingAction: CONST.RED_BRICK_ROAD_PENDING_ACTION.ADD,
-        receipt,
-        filename,
-        category,
-        tag,
-        billable,
-        reimbursable,
-    };
-}
-
-/**
- * Check if the transaction has an Ereceipt
- */
-function hasEReceipt(transaction: Transaction | undefined | null): boolean {
-    return !!transaction?.hasEReceipt;
-}
-
-function hasReceipt(transaction: OnyxEntry<Transaction> | undefined): boolean {
-    return !!transaction?.receipt?.state || hasEReceipt(transaction);
-}
-
-function isMerchantMissing(transaction: OnyxEntry<Transaction>) {
-    if (transaction?.modifiedMerchant && transaction.modifiedMerchant !== '') {
-        return transaction.modifiedMerchant === CONST.TRANSACTION.PARTIAL_TRANSACTION_MERCHANT;
-    }
-    const isMerchantEmpty = transaction?.merchant === CONST.TRANSACTION.PARTIAL_TRANSACTION_MERCHANT || transaction?.merchant === '';
-
-    return isMerchantEmpty;
-}
-
-/**
- * Check if the merchant is partial i.e. `(none)`
- */
-function isPartialMerchant(merchant: string): boolean {
-    return merchant === CONST.TRANSACTION.PARTIAL_TRANSACTION_MERCHANT;
-}
-
-function isAmountMissing(transaction: OnyxEntry<Transaction>) {
-    return transaction?.amount === 0 && (!transaction.modifiedAmount || transaction.modifiedAmount === 0);
-}
-
-function isCreatedMissing(transaction: OnyxEntry<Transaction>) {
-    return transaction?.created === '' && (!transaction.created || transaction.modifiedCreated === '');
-}
-
-function areRequiredFieldsEmpty(transaction: OnyxEntry<Transaction>): boolean {
-    const parentReport = allReports?.[`${ONYXKEYS.COLLECTION.REPORT}${transaction?.reportID}`] ?? null;
-    const isFromExpenseReport = parentReport?.type === CONST.REPORT.TYPE.EXPENSE;
-    const isSplitPolicyExpenseChat = !!transaction?.comment?.splits?.some((participant) => allReports?.[`${ONYXKEYS.COLLECTION.REPORT}${participant.chatReportID}`]?.isOwnPolicyExpenseChat);
-    const isMerchantRequired = isFromExpenseReport || isSplitPolicyExpenseChat;
-    return (isMerchantRequired && isMerchantMissing(transaction)) || isAmountMissing(transaction) || isCreatedMissing(transaction);
-}
-
-/**
- * Given the edit made to the expnse, return an updated transaction object.
- */
-function getUpdatedTransaction(transaction: Transaction, transactionChanges: TransactionChanges, isFromExpenseReport: boolean, shouldUpdateReceiptState = true): Transaction {
-    // Only changing the first level fields so no need for deep clone now
-    const updatedTransaction = {...transaction};
-    let shouldStopSmartscan = false;
-
-    // The comment property does not have its modifiedComment counterpart
-    if (Object.hasOwn(transactionChanges, 'comment')) {
-        updatedTransaction.comment = {
-            ...updatedTransaction.comment,
-            comment: transactionChanges.comment,
-        };
-    }
-    if (Object.hasOwn(transactionChanges, 'created')) {
-        updatedTransaction.modifiedCreated = transactionChanges.created;
-        shouldStopSmartscan = true;
-    }
-    if (Object.hasOwn(transactionChanges, 'amount') && typeof transactionChanges.amount === 'number') {
-        updatedTransaction.modifiedAmount = isFromExpenseReport ? -transactionChanges.amount : transactionChanges.amount;
-        shouldStopSmartscan = true;
-    }
-    if (Object.hasOwn(transactionChanges, 'currency')) {
-        updatedTransaction.modifiedCurrency = transactionChanges.currency;
-        shouldStopSmartscan = true;
-    }
-
-    if (Object.hasOwn(transactionChanges, 'merchant')) {
-        updatedTransaction.modifiedMerchant = transactionChanges.merchant;
-        shouldStopSmartscan = true;
-    }
-
-    if (Object.hasOwn(transactionChanges, 'waypoints')) {
-        updatedTransaction.modifiedWaypoints = transactionChanges.waypoints;
-        shouldStopSmartscan = true;
-    }
-
-    if (Object.hasOwn(transactionChanges, 'taxAmount') && typeof transactionChanges.taxAmount === 'number') {
-        updatedTransaction.taxAmount = isFromExpenseReport ? -transactionChanges.taxAmount : transactionChanges.taxAmount;
-    }
-
-    if (Object.hasOwn(transactionChanges, 'taxCode') && typeof transactionChanges.taxCode === 'string') {
-        updatedTransaction.taxCode = transactionChanges.taxCode;
-    }
-
-    if (Object.hasOwn(transactionChanges, 'billable') && typeof transactionChanges.billable === 'boolean') {
-        updatedTransaction.billable = transactionChanges.billable;
-    }
-
-    if (Object.hasOwn(transactionChanges, 'category') && typeof transactionChanges.category === 'string') {
-        updatedTransaction.category = transactionChanges.category;
-    }
-
-    if (Object.hasOwn(transactionChanges, 'tag') && typeof transactionChanges.tag === 'string') {
-        updatedTransaction.tag = transactionChanges.tag;
-    }
-
-    if (
-        shouldUpdateReceiptState &&
-        shouldStopSmartscan &&
-        transaction?.receipt &&
-        Object.keys(transaction.receipt).length > 0 &&
-        transaction?.receipt?.state !== CONST.IOU.RECEIPT_STATE.OPEN &&
-        updatedTransaction.receipt
-    ) {
-        updatedTransaction.receipt.state = CONST.IOU.RECEIPT_STATE.OPEN;
-    }
-
-    updatedTransaction.pendingFields = {
-        ...(Object.hasOwn(transactionChanges, 'comment') && {comment: CONST.RED_BRICK_ROAD_PENDING_ACTION.UPDATE}),
-        ...(Object.hasOwn(transactionChanges, 'created') && {created: CONST.RED_BRICK_ROAD_PENDING_ACTION.UPDATE}),
-        ...(Object.hasOwn(transactionChanges, 'amount') && {amount: CONST.RED_BRICK_ROAD_PENDING_ACTION.UPDATE}),
-        ...(Object.hasOwn(transactionChanges, 'currency') && {currency: CONST.RED_BRICK_ROAD_PENDING_ACTION.UPDATE}),
-        ...(Object.hasOwn(transactionChanges, 'merchant') && {merchant: CONST.RED_BRICK_ROAD_PENDING_ACTION.UPDATE}),
-        ...(Object.hasOwn(transactionChanges, 'waypoints') && {waypoints: CONST.RED_BRICK_ROAD_PENDING_ACTION.UPDATE}),
-        ...(Object.hasOwn(transactionChanges, 'billable') && {billable: CONST.RED_BRICK_ROAD_PENDING_ACTION.UPDATE}),
-        ...(Object.hasOwn(transactionChanges, 'category') && {category: CONST.RED_BRICK_ROAD_PENDING_ACTION.UPDATE}),
-        ...(Object.hasOwn(transactionChanges, 'tag') && {tag: CONST.RED_BRICK_ROAD_PENDING_ACTION.UPDATE}),
-        ...(Object.hasOwn(transactionChanges, 'taxAmount') && {taxAmount: CONST.RED_BRICK_ROAD_PENDING_ACTION.UPDATE}),
-        ...(Object.hasOwn(transactionChanges, 'taxCode') && {taxCode: CONST.RED_BRICK_ROAD_PENDING_ACTION.UPDATE}),
-    };
-
-    return updatedTransaction;
-}
-
-/**
- * Return the comment field (referred to as description in the App) from the transaction.
- * The comment does not have its modifiedComment counterpart.
- */
-function getDescription(transaction: OnyxEntry<Transaction>): string {
-    // Casting the description to string to avoid wrong data types (e.g. number) being returned from the API
-    return transaction?.comment?.comment?.toString() ?? '';
-}
-
-/**
- * Return the amount field from the transaction, return the modifiedAmount if present.
- */
-function getAmount(transaction: OnyxEntry<Transaction>, isFromExpenseReport = false, isFromTrackedExpense = false): number {
-    // IOU requests cannot have negative values, but they can be stored as negative values, let's return absolute value
-    if (!isFromExpenseReport || isFromTrackedExpense) {
-        const amount = transaction?.modifiedAmount ?? 0;
-        if (amount) {
-            return Math.abs(amount);
-        }
-        return Math.abs(transaction?.amount ?? 0);
-    }
-
-    // Expense report case:
-    // The amounts are stored using an opposite sign and negative values can be set,
-    // we need to return an opposite sign than is saved in the transaction object
-    let amount = transaction?.modifiedAmount ?? 0;
-    if (amount) {
-        return -amount;
-    }
-
-    // To avoid -0 being shown, lets only change the sign if the value is other than 0.
-    amount = transaction?.amount ?? 0;
-    return amount ? -amount : 0;
-}
-
-/**
- * Return the tax amount field from the transaction.
- */
-function getTaxAmount(transaction: OnyxEntry<Transaction>, isFromExpenseReport: boolean): number {
-    // IOU requests cannot have negative values but they can be stored as negative values, let's return absolute value
-    if (!isFromExpenseReport) {
-        return Math.abs(transaction?.taxAmount ?? 0);
-    }
-
-    // To avoid -0 being shown, lets only change the sign if the value is other than 0.
-    const amount = transaction?.taxAmount ?? 0;
-    return amount ? -amount : 0;
-}
-
-/**
- * Return the tax code from the transaction.
- */
-function getTaxCode(transaction: OnyxEntry<Transaction>): string {
-    return transaction?.taxCode ?? '';
-}
-
-/**
- * Return the currency field from the transaction, return the modifiedCurrency if present.
- */
-function getCurrency(transaction: OnyxEntry<Transaction>): string {
-    const currency = transaction?.modifiedCurrency ?? '';
-    if (currency) {
-        return currency;
-    }
-    return transaction?.currency ?? CONST.CURRENCY.USD;
-}
-
-/**
- * Return the original currency field from the transaction.
- */
-function getOriginalCurrency(transaction: Transaction): string {
-    return transaction?.originalCurrency ?? '';
-}
-
-/**
- * Return the absolute value of the original amount field from the transaction.
- */
-function getOriginalAmount(transaction: Transaction): number {
-    const amount = transaction?.originalAmount ?? 0;
-    return Math.abs(amount);
-}
-
-/**
- * Verify if the transaction is expecting the distance to be calculated on the server
- */
-function isFetchingWaypointsFromServer(transaction: OnyxEntry<Transaction>): boolean {
-    return !!transaction?.pendingFields?.waypoints;
-}
-
-/**
- * Return the merchant field from the transaction, return the modifiedMerchant if present.
- */
-function getMerchant(transaction: OnyxEntry<Transaction>): string {
-    return transaction?.modifiedMerchant ? transaction.modifiedMerchant : transaction?.merchant ?? '';
-}
-
-function getDistance(transaction: Transaction | null): number {
-    return transaction?.comment?.customUnit?.quantity ?? 0;
-}
-
-/**
- * Return the mccGroup field from the transaction, return the modifiedMCCGroup if present.
- */
-function getMCCGroup(transaction: Transaction): ValueOf<typeof CONST.MCC_GROUPS> | undefined {
-    return transaction?.modifiedMCCGroup ? transaction.modifiedMCCGroup : transaction?.mccGroup;
-}
-
-/**
- * Return the waypoints field from the transaction, return the modifiedWaypoints if present.
- */
-function getWaypoints(transaction: OnyxEntry<Transaction>): WaypointCollection | undefined {
-    return transaction?.modifiedWaypoints ?? transaction?.comment?.waypoints;
-}
-
-/**
- * Return the category from the transaction. This "category" field has no "modified" complement.
- */
-function getCategory(transaction: OnyxEntry<Transaction>): string {
-    return transaction?.category ?? '';
-}
-
-/**
- * Return the cardID from the transaction.
- */
-function getCardID(transaction: Transaction): number {
-    return transaction?.cardID ?? 0;
-}
-
-/**
- * Return the billable field from the transaction. This "billable" field has no "modified" complement.
- */
-function getBillable(transaction: OnyxEntry<Transaction>): boolean {
-    return transaction?.billable ?? false;
-}
-
-/**
- * Return a colon-delimited tag string as an array, considering escaped colons and double backslashes.
- */
-function getTagArrayFromName(tagName: string): string[] {
-    // WAIT!!!!!!!!!!!!!!!!!!
-    // You need to keep this in sync with TransactionUtils.php
-
-    // We need to be able to preserve double backslashes in the original string
-    // and not have it interfere with splitting on a colon (:).
-    // So, let's replace it with something absurd to begin with, do our split, and
-    // then replace the double backslashes in the end.
-    const tagWithoutDoubleSlashes = tagName.replace(/\\\\/g, '☠');
-    const tagWithoutEscapedColons = tagWithoutDoubleSlashes.replace(/\\:/g, '☢');
-
-    // Do our split
-    const matches = tagWithoutEscapedColons.split(':');
-    const newMatches: string[] = [];
-
-    for (const item of matches) {
-        const tagWithEscapedColons = item.replace(/☢/g, '\\:');
-        const tagWithDoubleSlashes = tagWithEscapedColons.replace(/☠/g, '\\\\');
-        newMatches.push(tagWithDoubleSlashes);
-    }
-
-    return newMatches;
-}
-
-/**
- * Return the tag from the transaction. When the tagIndex is passed, return the tag based on the index.
- * This "tag" field has no "modified" complement.
- */
-function getTag(transaction: OnyxEntry<Transaction>, tagIndex?: number): string {
-    if (tagIndex !== undefined) {
-        const tagsArray = getTagArrayFromName(transaction?.tag ?? '');
-        return tagsArray[tagIndex] ?? '';
-    }
-
-    return transaction?.tag ?? '';
-}
-
-function getTagForDisplay(transaction: OnyxEntry<Transaction>, tagIndex?: number): string {
-    return getCleanedTagName(getTag(transaction, tagIndex));
-}
-
-/**
- * Return the created field from the transaction, return the modifiedCreated if present.
- */
-function getCreated(transaction: OnyxEntry<Transaction>, dateFormat: string = CONST.DATE.FNS_FORMAT_STRING): string {
-    // eslint-disable-next-line @typescript-eslint/prefer-nullish-coalescing
-    const created = transaction?.modifiedCreated ? transaction.modifiedCreated : transaction?.created || '';
-
-    return DateUtils.formatWithUTCTimeZone(created, dateFormat);
-}
-
-/**
- * Determine whether a transaction is made with an Expensify card.
- */
-function isExpensifyCardTransaction(transaction: OnyxEntry<Transaction>): boolean {
-    if (!transaction?.cardID) {
-        return false;
-    }
-    return isExpensifyCard(transaction.cardID);
-}
-
-/**
- * Determine whether a transaction is made with a card (Expensify or Company Card).
- */
-function isCardTransaction(transaction: OnyxEntry<Transaction>): boolean {
-    const cardID = transaction?.cardID ?? 0;
-    return isCorporateCard(cardID);
-}
-
-/**
- * Check if the transaction status is set to Pending.
- */
-function isPending(transaction: OnyxEntry<Transaction>): boolean {
-    if (!transaction?.status) {
-        return false;
-    }
-    return transaction.status === CONST.TRANSACTION.STATUS.PENDING;
-}
-
-/**
- * Check if the transaction status is set to Posted.
- */
-function isPosted(transaction: Transaction): boolean {
-    if (!transaction.status) {
-        return false;
-    }
-    return transaction.status === CONST.TRANSACTION.STATUS.POSTED;
-}
-
-function isReceiptBeingScanned(transaction: OnyxEntry<Transaction>): boolean {
-    return [CONST.IOU.RECEIPT_STATE.SCANREADY, CONST.IOU.RECEIPT_STATE.SCANNING].some((value) => value === transaction?.receipt?.state);
-}
-
-function didRceiptScanSucceed(transaction: OnyxEntry<Transaction>): boolean {
-    return [CONST.IOU.RECEIPT_STATE.SCANCOMPLETE].some((value) => value === transaction?.receipt?.state);
-}
-
-/**
- * Check if the transaction has a non-smartscanning receipt and is missing required fields
- */
-function hasMissingSmartscanFields(transaction: OnyxEntry<Transaction>): boolean {
-    return Boolean(transaction && !isDistanceRequest(transaction) && !isReceiptBeingScanned(transaction) && areRequiredFieldsEmpty(transaction));
-}
-
-/**
- * Check if the transaction has a defined route
- */
-function hasRoute(transaction: OnyxEntry<Transaction>, isDistanceRequestType: boolean): boolean {
-    return !!transaction?.routes?.route0?.geometry?.coordinates || (isDistanceRequestType && !!transaction?.comment?.customUnit?.quantity);
-}
-
-function getAllReportTransactions(reportID?: string): Transaction[] {
-    // `reportID` from the `/CreateDistanceRequest` endpoint return's number instead of string for created `transaction`.
-    // For reference, https://github.com/Expensify/App/pull/26536#issuecomment-1703573277.
-    // We will update this in a follow-up Issue. According to this comment: https://github.com/Expensify/App/pull/26536#issuecomment-1703591019.
-    const transactions: Transaction[] = Object.values(allTransactions ?? {}).filter((transaction): transaction is Transaction => transaction !== null);
-    return transactions.filter((transaction) => `${transaction.reportID}` === `${reportID}`);
-}
-
-function waypointHasValidAddress(waypoint: RecentWaypoint | Waypoint): boolean {
-    return !!waypoint?.address?.trim();
-}
-
-/**
- * Converts the key of a waypoint to its index
- */
-function getWaypointIndex(key: string): number {
-    return Number(key.replace('waypoint', ''));
-}
-
-/**
- * Filters the waypoints which are valid and returns those
- */
-function getValidWaypoints(waypoints: WaypointCollection | undefined, reArrangeIndexes = false): WaypointCollection {
-    if (!waypoints) {
-        return {};
-    }
-
-    const sortedIndexes = Object.keys(waypoints)
-        .map(getWaypointIndex)
-        .sort((a, b) => a - b);
-    const waypointValues = sortedIndexes.map((index) => waypoints[`waypoint${index}`]);
-    // Ensure the number of waypoints is between 2 and 25
-    if (waypointValues.length < 2 || waypointValues.length > 25) {
-        return {};
-    }
-
-    let lastWaypointIndex = -1;
-    let waypointIndex = -1;
-
-    return waypointValues.reduce<WaypointCollection>((acc, currentWaypoint, index) => {
-        const previousWaypoint = waypointValues[lastWaypointIndex];
-
-        // Check if the waypoint has a valid address
-        if (!waypointHasValidAddress(currentWaypoint)) {
-            return acc;
-        }
-
-        // Check for adjacent waypoints with the same address
-        if (previousWaypoint && currentWaypoint?.address === previousWaypoint.address) {
-            return acc;
-        }
-
-        const validatedWaypoints: WaypointCollection = {...acc, [`waypoint${reArrangeIndexes ? waypointIndex + 1 : index}`]: currentWaypoint};
-
-        lastWaypointIndex = index;
-        waypointIndex += 1;
-
-        return validatedWaypoints;
-    }, {});
-}
-
-/**
- * Returns the most recent transactions in an object
- */
-function getRecentTransactions(transactions: Record<string, string>, size = 2): string[] {
-    return Object.keys(transactions)
-        .sort((transactionID1, transactionID2) => (new Date(transactions[transactionID1]) < new Date(transactions[transactionID2]) ? 1 : -1))
-        .slice(0, size);
-}
-
-/**
- * Check if transaction is on hold
- */
-function isOnHold(transaction: OnyxEntry<Transaction>): boolean {
-    if (!transaction) {
-        return false;
-    }
-
-    return !!transaction.comment?.hold;
-}
-
-/**
- * Check if transaction is on hold for the given transactionID
- */
-function isOnHoldByTransactionID(transactionID: string): boolean {
-    if (!transactionID) {
-        return false;
-    }
-
-    return isOnHold(allTransactions?.[`${ONYXKEYS.COLLECTION.TRANSACTION}${transactionID}`] ?? null);
-}
-
-/**
- * Checks if any violations for the provided transaction are of type 'violation'
- */
-function hasViolation(transactionID: string, transactionViolations: OnyxCollection<TransactionViolation[]>): boolean {
-    return Boolean(
-        transactionViolations?.[ONYXKEYS.COLLECTION.TRANSACTION_VIOLATIONS + transactionID]?.some((violation: TransactionViolation) => violation.type === CONST.VIOLATION_TYPES.VIOLATION),
-    );
-}
-
-/**
- * Checks if any violations for the provided transaction are of type 'notice'
- */
-function hasNoticeTypeViolation(transactionID: string, transactionViolations: OnyxCollection<TransactionViolation[]>): boolean {
-    return Boolean(transactionViolations?.[ONYXKEYS.COLLECTION.TRANSACTION_VIOLATIONS + transactionID]?.some((violation: TransactionViolation) => violation.type === 'notice'));
-}
-
-function getTransactionViolations(transactionID: string, transactionViolations: OnyxCollection<TransactionViolation[]>): TransactionViolation[] | null {
-    return transactionViolations?.[ONYXKEYS.COLLECTION.TRANSACTION_VIOLATIONS + transactionID] ?? null;
-}
-
-/**
- * this is the formulae to calculate tax
- */
-function calculateTaxAmount(percentage: string, amount: number) {
-    const divisor = Number(percentage.slice(0, -1)) / 100 + 1;
-    return Math.round(amount - amount / divisor) / 100;
-}
-
-/**
- * Calculates count of all tax enabled options
- */
-function getEnabledTaxRateCount(options: TaxRates) {
-    return Object.values(options).filter((option: TaxRate) => !option.isDisabled).length;
-}
-
-/**
- * Check if the customUnitRateID has a value default for P2P distance requests
- */
-function isCustomUnitRateIDForP2P(transaction: OnyxEntry<Transaction>): boolean {
-    return transaction?.comment?.customUnit?.customUnitRateID === CONST.CUSTOM_UNITS.FAKE_P2P_ID;
-}
-
-/**
- * Get rate ID from the transaction object
- */
-function getRateID(transaction: OnyxEntry<Transaction>): string | undefined {
-    return transaction?.comment?.customUnit?.customUnitRateID?.toString();
-}
-
-/**
- * Gets the default tax name
- */
-function getDefaultTaxName(taxRates: TaxRatesWithDefault, transaction?: Transaction) {
-    const defaultTaxKey = taxRates.defaultExternalID;
-    const defaultTaxName =
-        (defaultTaxKey && `${taxRates.taxes[defaultTaxKey]?.name} (${taxRates.taxes[defaultTaxKey]?.value}) ${CONST.DOT_SEPARATOR} ${Localize.translateLocal('common.default')}`) || '';
-    return transaction?.taxRate?.text ?? defaultTaxName;
-}
-
-/**
- * Gets the tax name
- */
-function getTaxName(taxes: TaxRates, transactionTaxCode: string) {
-    const taxName = taxes[transactionTaxCode]?.name ?? '';
-    const taxValue = taxes[transactionTaxCode]?.value ?? '';
-    return transactionTaxCode && taxName && taxValue ? `${taxName} (${taxValue})` : '';
-}
-
-export {
-    buildOptimisticTransaction,
-    calculateTaxAmount,
-    getTaxName,
-    getDefaultTaxName,
-    getEnabledTaxRateCount,
-    getUpdatedTransaction,
-    getDescription,
-    getRequestType,
-    isManualRequest,
-    isScanRequest,
-    getAmount,
-    getTaxAmount,
-    getTaxCode,
-    getCurrency,
-    getDistance,
-    getCardID,
-    getOriginalCurrency,
-    getOriginalAmount,
-    getMerchant,
-    getMCCGroup,
-    getCreated,
-    getCategory,
-    getBillable,
-    getTag,
-    getTagArrayFromName,
-    getTagForDisplay,
-    getTransactionViolations,
-    getAllReportTransactions,
-    hasReceipt,
-    hasEReceipt,
-    hasRoute,
-    isReceiptBeingScanned,
-    didRceiptScanSucceed,
-    getValidWaypoints,
-    isDistanceRequest,
-    isFetchingWaypointsFromServer,
-    isExpensifyCardTransaction,
-    isCardTransaction,
-    isPending,
-    isPosted,
-    isOnHold,
-    isOnHoldByTransactionID,
-    getWaypoints,
-    isAmountMissing,
-    isMerchantMissing,
-    isPartialMerchant,
-    isCreatedMissing,
-    areRequiredFieldsEmpty,
-    hasMissingSmartscanFields,
-    getWaypointIndex,
-    waypointHasValidAddress,
-    getRecentTransactions,
-    hasViolation,
-    hasNoticeTypeViolation,
-    isCustomUnitRateIDForP2P,
-    getRateID,
-};
-
-export type {TransactionChanges};
diff --git a/src/libs/TransactionUtils/getDistanceInMeters.ts b/src/libs/TransactionUtils/getDistanceInMeters.ts
new file mode 100644
index 000000000000..0efe72759d5d
--- /dev/null
+++ b/src/libs/TransactionUtils/getDistanceInMeters.ts
@@ -0,0 +1,21 @@
+import DistanceRequestUtils from '@libs/DistanceRequestUtils';
+import type {OnyxInputOrEntry, Transaction} from '@src/types/onyx';
+import type {Unit} from '@src/types/onyx/Policy';
+
+// Get the distance in meters from the transaction.
+// This function is placed in a separate file to avoid circular dependencies.
+function getDistanceInMeters(transaction: OnyxInputOrEntry<Transaction>, unit: Unit | undefined) {
+    // If we are creating a new distance request, the distance is available in routes.route0.distance and it's already in meters.
+    if (transaction?.routes?.route0?.distance) {
+        return transaction.routes.route0.distance;
+    }
+
+    // If the request is completed, transaction.routes is cleared and comment.customUnit.quantity holds the new distance in the selected unit.
+    // We need to convert it from the selected distance unit to meters.
+    if (transaction?.comment?.customUnit?.quantity && unit) {
+        return DistanceRequestUtils.convertToDistanceInMeters(transaction.comment.customUnit.quantity, unit);
+    }
+    return 0;
+}
+
+export default getDistanceInMeters;
diff --git a/src/libs/TransactionUtils/index.ts b/src/libs/TransactionUtils/index.ts
new file mode 100644
index 000000000000..e5bd5d9b0753
--- /dev/null
+++ b/src/libs/TransactionUtils/index.ts
@@ -0,0 +1,1131 @@
+import lodashHas from 'lodash/has';
+import lodashIsEqual from 'lodash/isEqual';
+import type {OnyxCollection, OnyxEntry} from 'react-native-onyx';
+import Onyx from 'react-native-onyx';
+import type {ValueOf} from 'type-fest';
+import type {TransactionMergeParams} from '@libs/API/parameters';
+import {getCurrencyDecimals} from '@libs/CurrencyUtils';
+import DateUtils from '@libs/DateUtils';
+import DistanceRequestUtils from '@libs/DistanceRequestUtils';
+import {toLocaleDigit} from '@libs/LocaleDigitUtils';
+import * as Localize from '@libs/Localize';
+import * as NumberUtils from '@libs/NumberUtils';
+import Permissions from '@libs/Permissions';
+import {getCleanedTagName, getCustomUnitRate} from '@libs/PolicyUtils';
+import * as PolicyUtils from '@libs/PolicyUtils';
+// eslint-disable-next-line import/no-cycle
+import * as ReportActionsUtils from '@libs/ReportActionsUtils';
+import * as ReportConnection from '@libs/ReportConnection';
+import type {IOURequestType} from '@userActions/IOU';
+import CONST from '@src/CONST';
+import ONYXKEYS from '@src/ONYXKEYS';
+import type {Beta, OnyxInputOrEntry, Policy, RecentWaypoint, ReviewDuplicates, TaxRate, TaxRates, Transaction, TransactionViolation, TransactionViolations} from '@src/types/onyx';
+import type {Comment, Receipt, TransactionChanges, TransactionPendingFieldsKey, Waypoint, WaypointCollection} from '@src/types/onyx/Transaction';
+import type DeepValueOf from '@src/types/utils/DeepValueOf';
+import {isEmptyObject} from '@src/types/utils/EmptyObject';
+import getDistanceInMeters from './getDistanceInMeters';
+
+let allTransactions: OnyxCollection<Transaction> = {};
+Onyx.connect({
+    key: ONYXKEYS.COLLECTION.TRANSACTION,
+    waitForCollectionCallback: true,
+    callback: (value) => {
+        if (!value) {
+            return;
+        }
+        allTransactions = Object.fromEntries(Object.entries(value).filter(([, transaction]) => !!transaction));
+    },
+});
+
+let allTransactionViolations: OnyxCollection<TransactionViolations> = {};
+Onyx.connect({
+    key: ONYXKEYS.COLLECTION.TRANSACTION_VIOLATIONS,
+    waitForCollectionCallback: true,
+    callback: (value) => (allTransactionViolations = value),
+});
+
+let preferredLocale: DeepValueOf<typeof CONST.LOCALES> = CONST.LOCALES.DEFAULT;
+Onyx.connect({
+    key: ONYXKEYS.NVP_PREFERRED_LOCALE,
+    callback: (value) => {
+        if (!value) {
+            return;
+        }
+        preferredLocale = value;
+    },
+});
+
+let currentUserEmail = '';
+let currentUserAccountID = -1;
+Onyx.connect({
+    key: ONYXKEYS.SESSION,
+    callback: (val) => {
+        currentUserEmail = val?.email ?? '';
+        currentUserAccountID = val?.accountID ?? -1;
+    },
+});
+
+let allBetas: OnyxEntry<Beta[]>;
+Onyx.connect({
+    key: ONYXKEYS.BETAS,
+    callback: (value) => (allBetas = value),
+});
+
+function isDistanceRequest(transaction: OnyxEntry<Transaction>): boolean {
+    // This is used during the expense creation flow before the transaction has been saved to the server
+    if (lodashHas(transaction, 'iouRequestType')) {
+        return transaction?.iouRequestType === CONST.IOU.REQUEST_TYPE.DISTANCE;
+    }
+
+    // This is the case for transaction objects once they have been saved to the server
+    const type = transaction?.comment?.type;
+    const customUnitName = transaction?.comment?.customUnit?.name;
+    return type === CONST.TRANSACTION.TYPE.CUSTOM_UNIT && customUnitName === CONST.CUSTOM_UNITS.NAME_DISTANCE;
+}
+
+function isScanRequest(transaction: OnyxEntry<Transaction>): boolean {
+    // This is used during the expense creation flow before the transaction has been saved to the server
+    if (lodashHas(transaction, 'iouRequestType')) {
+        return transaction?.iouRequestType === CONST.IOU.REQUEST_TYPE.SCAN;
+    }
+
+    return !!transaction?.receipt?.source && transaction?.amount === 0;
+}
+
+function getRequestType(transaction: OnyxEntry<Transaction>): IOURequestType {
+    if (isDistanceRequest(transaction)) {
+        return CONST.IOU.REQUEST_TYPE.DISTANCE;
+    }
+    if (isScanRequest(transaction)) {
+        return CONST.IOU.REQUEST_TYPE.SCAN;
+    }
+
+    return CONST.IOU.REQUEST_TYPE.MANUAL;
+}
+
+function isManualRequest(transaction: Transaction): boolean {
+    // This is used during the expense creation flow before the transaction has been saved to the server
+    if (lodashHas(transaction, 'iouRequestType')) {
+        return transaction.iouRequestType === CONST.IOU.REQUEST_TYPE.MANUAL;
+    }
+
+    return getRequestType(transaction) === CONST.IOU.REQUEST_TYPE.MANUAL;
+}
+
+/**
+ * Optimistically generate a transaction.
+ *
+ * @param amount – in cents
+ * @param [existingTransactionID] When creating a distance expense, 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.
+ */
+function buildOptimisticTransaction(
+    amount: number,
+    currency: string,
+    reportID: string,
+    comment = '',
+    created = '',
+    source = '',
+    originalTransactionID = '',
+    merchant = '',
+    receipt?: OnyxEntry<Receipt>,
+    filename = '',
+    existingTransactionID: string | null = null,
+    category = '',
+    tag = '',
+    taxCode = '',
+    taxAmount = 0,
+    billable = false,
+    pendingFields: Partial<{[K in TransactionPendingFieldsKey]: ValueOf<typeof CONST.RED_BRICK_ROAD_PENDING_ACTION>}> | undefined = undefined,
+    reimbursable = true,
+): Transaction {
+    // 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)
+    const transactionID = existingTransactionID ?? NumberUtils.rand64();
+
+    const commentJSON: Comment = {comment};
+    if (source) {
+        commentJSON.source = source;
+    }
+    if (originalTransactionID) {
+        commentJSON.originalTransactionID = originalTransactionID;
+    }
+
+    return {
+        ...(!isEmptyObject(pendingFields) ? {pendingFields} : {}),
+        transactionID,
+        amount,
+        currency,
+        reportID,
+        comment: commentJSON,
+        merchant: merchant || CONST.TRANSACTION.PARTIAL_TRANSACTION_MERCHANT,
+        created: created || DateUtils.getDBTime(),
+        pendingAction: CONST.RED_BRICK_ROAD_PENDING_ACTION.ADD,
+        receipt: receipt?.source ? {source: receipt.source, state: receipt.state ?? CONST.IOU.RECEIPT_STATE.SCANREADY} : {},
+        filename: (receipt?.source ? receipt?.name ?? filename : filename).toString(),
+        category,
+        tag,
+        taxCode,
+        taxAmount,
+        billable,
+        reimbursable,
+    };
+}
+
+/**
+ * Check if the transaction has an Ereceipt
+ */
+function hasEReceipt(transaction: Transaction | undefined | null): boolean {
+    return !!transaction?.hasEReceipt;
+}
+
+function hasReceipt(transaction: OnyxInputOrEntry<Transaction> | undefined): boolean {
+    return !!transaction?.receipt?.state || hasEReceipt(transaction);
+}
+
+function isMerchantMissing(transaction: OnyxEntry<Transaction>) {
+    if (transaction?.modifiedMerchant && transaction.modifiedMerchant !== '') {
+        return transaction.modifiedMerchant === CONST.TRANSACTION.PARTIAL_TRANSACTION_MERCHANT;
+    }
+    const isMerchantEmpty = transaction?.merchant === CONST.TRANSACTION.PARTIAL_TRANSACTION_MERCHANT || transaction?.merchant === '';
+
+    return isMerchantEmpty;
+}
+
+/**
+ * Check if the merchant is partial i.e. `(none)`
+ */
+function isPartialMerchant(merchant: string): boolean {
+    return merchant === CONST.TRANSACTION.PARTIAL_TRANSACTION_MERCHANT;
+}
+
+function isAmountMissing(transaction: OnyxEntry<Transaction>) {
+    return transaction?.amount === 0 && (!transaction.modifiedAmount || transaction.modifiedAmount === 0);
+}
+
+function isCreatedMissing(transaction: OnyxEntry<Transaction>) {
+    return transaction?.created === '' && (!transaction.created || transaction.modifiedCreated === '');
+}
+
+function areRequiredFieldsEmpty(transaction: OnyxEntry<Transaction>): boolean {
+    const allReports = ReportConnection.getAllReports();
+    const parentReport = allReports?.[`${ONYXKEYS.COLLECTION.REPORT}${transaction?.reportID}`] ?? null;
+    const isFromExpenseReport = parentReport?.type === CONST.REPORT.TYPE.EXPENSE;
+    const isSplitPolicyExpenseChat = !!transaction?.comment?.splits?.some((participant) => allReports?.[`${ONYXKEYS.COLLECTION.REPORT}${participant.chatReportID}`]?.isOwnPolicyExpenseChat);
+    const isMerchantRequired = isFromExpenseReport || isSplitPolicyExpenseChat;
+    return (isMerchantRequired && isMerchantMissing(transaction)) || isAmountMissing(transaction) || isCreatedMissing(transaction);
+}
+
+/**
+ * Given the edit made to the expense, return an updated transaction object.
+ */
+function getUpdatedTransaction(transaction: Transaction, transactionChanges: TransactionChanges, isFromExpenseReport: boolean, shouldUpdateReceiptState = true): Transaction {
+    // Only changing the first level fields so no need for deep clone now
+    const updatedTransaction = {...transaction};
+    let shouldStopSmartscan = false;
+
+    // The comment property does not have its modifiedComment counterpart
+    if (Object.hasOwn(transactionChanges, 'comment')) {
+        updatedTransaction.comment = {
+            ...updatedTransaction.comment,
+            comment: transactionChanges.comment,
+        };
+    }
+    if (Object.hasOwn(transactionChanges, 'created')) {
+        updatedTransaction.modifiedCreated = transactionChanges.created;
+        shouldStopSmartscan = true;
+    }
+    if (Object.hasOwn(transactionChanges, 'amount') && typeof transactionChanges.amount === 'number') {
+        updatedTransaction.modifiedAmount = isFromExpenseReport ? -transactionChanges.amount : transactionChanges.amount;
+        shouldStopSmartscan = true;
+    }
+    if (Object.hasOwn(transactionChanges, 'currency')) {
+        updatedTransaction.modifiedCurrency = transactionChanges.currency;
+        shouldStopSmartscan = true;
+    }
+
+    if (Object.hasOwn(transactionChanges, 'merchant')) {
+        updatedTransaction.modifiedMerchant = transactionChanges.merchant;
+        shouldStopSmartscan = true;
+    }
+
+    if (Object.hasOwn(transactionChanges, 'waypoints')) {
+        updatedTransaction.modifiedWaypoints = transactionChanges.waypoints;
+        shouldStopSmartscan = true;
+    }
+
+    if (Object.hasOwn(transactionChanges, 'customUnitRateID')) {
+        updatedTransaction.modifiedCustomUnitRateID = transactionChanges.customUnitRateID;
+        shouldStopSmartscan = true;
+    }
+
+    if (Object.hasOwn(transactionChanges, 'taxAmount') && typeof transactionChanges.taxAmount === 'number') {
+        updatedTransaction.taxAmount = isFromExpenseReport ? -transactionChanges.taxAmount : transactionChanges.taxAmount;
+    }
+
+    if (Object.hasOwn(transactionChanges, 'taxCode') && typeof transactionChanges.taxCode === 'string') {
+        updatedTransaction.taxCode = transactionChanges.taxCode;
+    }
+
+    if (Object.hasOwn(transactionChanges, 'billable') && typeof transactionChanges.billable === 'boolean') {
+        updatedTransaction.billable = transactionChanges.billable;
+    }
+
+    if (Object.hasOwn(transactionChanges, 'category') && typeof transactionChanges.category === 'string') {
+        updatedTransaction.category = transactionChanges.category;
+    }
+
+    if (Object.hasOwn(transactionChanges, 'tag') && typeof transactionChanges.tag === 'string') {
+        updatedTransaction.tag = transactionChanges.tag;
+    }
+
+    if (
+        shouldUpdateReceiptState &&
+        shouldStopSmartscan &&
+        transaction?.receipt &&
+        Object.keys(transaction.receipt).length > 0 &&
+        transaction?.receipt?.state !== CONST.IOU.RECEIPT_STATE.OPEN &&
+        updatedTransaction.receipt
+    ) {
+        updatedTransaction.receipt.state = CONST.IOU.RECEIPT_STATE.OPEN;
+    }
+
+    updatedTransaction.pendingFields = {
+        ...(Object.hasOwn(transactionChanges, 'comment') && {comment: CONST.RED_BRICK_ROAD_PENDING_ACTION.UPDATE}),
+        ...(Object.hasOwn(transactionChanges, 'created') && {created: CONST.RED_BRICK_ROAD_PENDING_ACTION.UPDATE}),
+        ...(Object.hasOwn(transactionChanges, 'amount') && {amount: CONST.RED_BRICK_ROAD_PENDING_ACTION.UPDATE}),
+        ...(Object.hasOwn(transactionChanges, 'currency') && {currency: CONST.RED_BRICK_ROAD_PENDING_ACTION.UPDATE}),
+        ...(Object.hasOwn(transactionChanges, 'merchant') && {merchant: CONST.RED_BRICK_ROAD_PENDING_ACTION.UPDATE}),
+        ...(Object.hasOwn(transactionChanges, 'waypoints') && {waypoints: CONST.RED_BRICK_ROAD_PENDING_ACTION.UPDATE}),
+        ...(Object.hasOwn(transactionChanges, 'billable') && {billable: CONST.RED_BRICK_ROAD_PENDING_ACTION.UPDATE}),
+        ...(Object.hasOwn(transactionChanges, 'category') && {category: CONST.RED_BRICK_ROAD_PENDING_ACTION.UPDATE}),
+        ...(Object.hasOwn(transactionChanges, 'tag') && {tag: CONST.RED_BRICK_ROAD_PENDING_ACTION.UPDATE}),
+        ...(Object.hasOwn(transactionChanges, 'taxAmount') && {taxAmount: CONST.RED_BRICK_ROAD_PENDING_ACTION.UPDATE}),
+        ...(Object.hasOwn(transactionChanges, 'taxCode') && {taxCode: CONST.RED_BRICK_ROAD_PENDING_ACTION.UPDATE}),
+    };
+
+    return updatedTransaction;
+}
+
+/**
+ * Return the comment field (referred to as description in the App) from the transaction.
+ * The comment does not have its modifiedComment counterpart.
+ */
+function getDescription(transaction: OnyxInputOrEntry<Transaction>): string {
+    // Casting the description to string to avoid wrong data types (e.g. number) being returned from the API
+    return transaction?.comment?.comment?.toString() ?? '';
+}
+
+/**
+ * Return the amount field from the transaction, return the modifiedAmount if present.
+ */
+function getAmount(transaction: OnyxInputOrEntry<Transaction>, isFromExpenseReport = false, isFromTrackedExpense = false): number {
+    // IOU requests cannot have negative values, but they can be stored as negative values, let's return absolute value
+    if (!isFromExpenseReport || isFromTrackedExpense) {
+        const amount = transaction?.modifiedAmount ?? 0;
+        if (amount) {
+            return Math.abs(amount);
+        }
+        return Math.abs(transaction?.amount ?? 0);
+    }
+
+    // Expense report case:
+    // The amounts are stored using an opposite sign and negative values can be set,
+    // we need to return an opposite sign than is saved in the transaction object
+    let amount = transaction?.modifiedAmount ?? 0;
+    if (amount) {
+        return -amount;
+    }
+
+    // To avoid -0 being shown, lets only change the sign if the value is other than 0.
+    amount = transaction?.amount ?? 0;
+    return amount ? -amount : 0;
+}
+
+/**
+ * Return the tax amount field from the transaction.
+ */
+function getTaxAmount(transaction: OnyxInputOrEntry<Transaction>, isFromExpenseReport: boolean): number {
+    // IOU requests cannot have negative values but they can be stored as negative values, let's return absolute value
+    if (!isFromExpenseReport) {
+        return Math.abs(transaction?.taxAmount ?? 0);
+    }
+
+    // To avoid -0 being shown, lets only change the sign if the value is other than 0.
+    const amount = transaction?.taxAmount ?? 0;
+    return amount ? -amount : 0;
+}
+
+/**
+ * Return the tax code from the transaction.
+ */
+function getTaxCode(transaction: OnyxInputOrEntry<Transaction>): string {
+    return transaction?.taxCode ?? '';
+}
+
+/**
+ * Return the currency field from the transaction, return the modifiedCurrency if present.
+ */
+function getCurrency(transaction: OnyxInputOrEntry<Transaction>): string {
+    const currency = transaction?.modifiedCurrency ?? '';
+    if (currency) {
+        return currency;
+    }
+    return transaction?.currency ?? CONST.CURRENCY.USD;
+}
+
+/**
+ * Return the original currency field from the transaction.
+ */
+function getOriginalCurrency(transaction: Transaction): string {
+    return transaction?.originalCurrency ?? '';
+}
+
+/**
+ * Return the absolute value of the original amount field from the transaction.
+ */
+function getOriginalAmount(transaction: Transaction): number {
+    const amount = transaction?.originalAmount ?? 0;
+    return Math.abs(amount);
+}
+
+/**
+ * Verify if the transaction is expecting the distance to be calculated on the server
+ */
+function isFetchingWaypointsFromServer(transaction: OnyxInputOrEntry<Transaction>): boolean {
+    return !!transaction?.pendingFields?.waypoints;
+}
+
+/**
+ * Return the merchant field from the transaction, return the modifiedMerchant if present.
+ */
+function getMerchant(transaction: OnyxInputOrEntry<Transaction>): string {
+    return transaction?.modifiedMerchant ? transaction.modifiedMerchant : transaction?.merchant ?? '';
+}
+
+/**
+ * Return the reimbursable value. Defaults to true to match BE logic.
+ */
+function getReimbursable(transaction: Transaction): boolean {
+    return transaction?.reimbursable ?? true;
+}
+
+/**
+ * Return the mccGroup field from the transaction, return the modifiedMCCGroup if present.
+ */
+function getMCCGroup(transaction: Transaction): ValueOf<typeof CONST.MCC_GROUPS> | undefined {
+    return transaction?.modifiedMCCGroup ? transaction.modifiedMCCGroup : transaction?.mccGroup;
+}
+
+/**
+ * Return the waypoints field from the transaction, return the modifiedWaypoints if present.
+ */
+function getWaypoints(transaction: OnyxEntry<Transaction>): WaypointCollection | undefined {
+    return transaction?.modifiedWaypoints ?? transaction?.comment?.waypoints;
+}
+
+/**
+ * Return the category from the transaction. This "category" field has no "modified" complement.
+ */
+function getCategory(transaction: OnyxInputOrEntry<Transaction>): string {
+    return transaction?.category ?? '';
+}
+
+/**
+ * Return the cardID from the transaction.
+ */
+function getCardID(transaction: Transaction): number {
+    return transaction?.cardID ?? -1;
+}
+
+/**
+ * Return the billable field from the transaction. This "billable" field has no "modified" complement.
+ */
+function getBillable(transaction: OnyxInputOrEntry<Transaction>): boolean {
+    return transaction?.billable ?? false;
+}
+
+/**
+ * Return a colon-delimited tag string as an array, considering escaped colons and double backslashes.
+ */
+function getTagArrayFromName(tagName: string): string[] {
+    // WAIT!!!!!!!!!!!!!!!!!!
+    // You need to keep this in sync with TransactionUtils.php
+
+    // We need to be able to preserve double backslashes in the original string
+    // and not have it interfere with splitting on a colon (:).
+    // So, let's replace it with something absurd to begin with, do our split, and
+    // then replace the double backslashes in the end.
+    const tagWithoutDoubleSlashes = tagName.replace(/\\\\/g, '☠');
+    const tagWithoutEscapedColons = tagWithoutDoubleSlashes.replace(/\\:/g, '☢');
+
+    // Do our split
+    const matches = tagWithoutEscapedColons.split(':');
+    const newMatches: string[] = [];
+
+    for (const item of matches) {
+        const tagWithEscapedColons = item.replace(/☢/g, '\\:');
+        const tagWithDoubleSlashes = tagWithEscapedColons.replace(/☠/g, '\\\\');
+        newMatches.push(tagWithDoubleSlashes);
+    }
+
+    return newMatches;
+}
+
+/**
+ * Return the tag from the transaction. When the tagIndex is passed, return the tag based on the index.
+ * This "tag" field has no "modified" complement.
+ */
+function getTag(transaction: OnyxInputOrEntry<Transaction>, tagIndex?: number): string {
+    if (tagIndex !== undefined) {
+        const tagsArray = getTagArrayFromName(transaction?.tag ?? '');
+        return tagsArray[tagIndex] ?? '';
+    }
+
+    return transaction?.tag ?? '';
+}
+
+function getTagForDisplay(transaction: OnyxEntry<Transaction>, tagIndex?: number): string {
+    return getCleanedTagName(getTag(transaction, tagIndex));
+}
+
+function getCreated(transaction: OnyxInputOrEntry<Transaction>): string {
+    // eslint-disable-next-line @typescript-eslint/prefer-nullish-coalescing
+    return transaction?.modifiedCreated ? transaction.modifiedCreated : transaction?.created || '';
+}
+
+/**
+ * Return the created field from the transaction, return the modifiedCreated if present.
+ */
+function getFormattedCreated(transaction: OnyxInputOrEntry<Transaction>, dateFormat: string = CONST.DATE.FNS_FORMAT_STRING): string {
+    const created = getCreated(transaction);
+    return DateUtils.formatWithUTCTimeZone(created, dateFormat);
+}
+
+/**
+ * Determine whether a transaction is made with an Expensify card.
+ */
+function isExpensifyCardTransaction(transaction: OnyxEntry<Transaction>): boolean {
+    return transaction?.bank === CONST.EXPENSIFY_CARD.BANK;
+}
+
+/**
+ * Determine whether a transaction is made with a card (Expensify or Company Card).
+ */
+function isCardTransaction(transaction: OnyxEntry<Transaction>): boolean {
+    return !!transaction?.managedCard;
+}
+
+function getCardName(transaction: OnyxEntry<Transaction>): string {
+    return transaction?.cardName ?? '';
+}
+
+/**
+ * Check if the transaction status is set to Pending.
+ */
+function isPending(transaction: OnyxEntry<Transaction>): boolean {
+    if (!transaction?.status) {
+        return false;
+    }
+    return transaction.status === CONST.TRANSACTION.STATUS.PENDING;
+}
+
+/**
+ * Check if the transaction status is set to Posted.
+ */
+function isPosted(transaction: Transaction): boolean {
+    if (!transaction.status) {
+        return false;
+    }
+    return transaction.status === CONST.TRANSACTION.STATUS.POSTED;
+}
+
+function isReceiptBeingScanned(transaction: OnyxInputOrEntry<Transaction>): boolean {
+    return [CONST.IOU.RECEIPT_STATE.SCANREADY, CONST.IOU.RECEIPT_STATE.SCANNING].some((value) => value === transaction?.receipt?.state);
+}
+
+function didReceiptScanSucceed(transaction: OnyxEntry<Transaction>): boolean {
+    return [CONST.IOU.RECEIPT_STATE.SCANCOMPLETE].some((value) => value === transaction?.receipt?.state);
+}
+
+/**
+ * Check if the transaction has a non-smartscanning receipt and is missing required fields
+ */
+function hasMissingSmartscanFields(transaction: OnyxInputOrEntry<Transaction>): boolean {
+    return !!(transaction && !isDistanceRequest(transaction) && !isReceiptBeingScanned(transaction) && areRequiredFieldsEmpty(transaction));
+}
+
+/**
+ * Get all transaction violations of the transaction with given tranactionID.
+ */
+function getTransactionViolations(transactionID: string, transactionViolations: OnyxCollection<TransactionViolations> | null): TransactionViolations | null {
+    return transactionViolations?.[ONYXKEYS.COLLECTION.TRANSACTION_VIOLATIONS + transactionID] ?? null;
+}
+
+/**
+ * Check if there is pending rter violation in transactionViolations.
+ */
+function hasPendingRTERViolation(transactionViolations?: TransactionViolations | null): boolean {
+    return !!transactionViolations?.some((transactionViolation: TransactionViolation) => transactionViolation.name === CONST.VIOLATIONS.RTER && transactionViolation.data?.pendingPattern);
+}
+
+/**
+ * Check if there is pending rter violation in all transactionViolations with given transactionIDs.
+ */
+function allHavePendingRTERViolation(transactionIds: string[]): boolean {
+    const transactionsWithRTERViolations = transactionIds.map((transactionId) => {
+        const transactionViolations = getTransactionViolations(transactionId, allTransactionViolations);
+        return hasPendingRTERViolation(transactionViolations);
+    });
+    return transactionsWithRTERViolations.length > 0 && transactionsWithRTERViolations.every((value) => value === true);
+}
+
+/**
+ * Check if the transaction is pending or has a pending rter violation.
+ */
+function hasPendingUI(transaction: OnyxEntry<Transaction>, transactionViolations?: TransactionViolations | null): boolean {
+    return isReceiptBeingScanned(transaction) || isPending(transaction) || (!!transaction && hasPendingRTERViolation(transactionViolations));
+}
+
+/**
+ * Check if the transaction has a defined route
+ */
+function hasRoute(transaction: OnyxEntry<Transaction>, isDistanceRequestType?: boolean): boolean {
+    return !!transaction?.routes?.route0?.geometry?.coordinates || (!!isDistanceRequestType && !!transaction?.comment?.customUnit?.quantity);
+}
+
+function getAllReportTransactions(reportID?: string, transactions?: OnyxCollection<Transaction>): Transaction[] {
+    const reportTransactions: Transaction[] = Object.values(transactions ?? allTransactions ?? {}).filter(
+        (transaction): transaction is Transaction => !!transaction && transaction.reportID === reportID,
+    );
+    return reportTransactions;
+}
+
+function waypointHasValidAddress(waypoint: RecentWaypoint | Waypoint): boolean {
+    return !!waypoint?.address?.trim();
+}
+
+/**
+ * Converts the key of a waypoint to its index
+ */
+function getWaypointIndex(key: string): number {
+    return Number(key.replace('waypoint', ''));
+}
+
+/**
+ * Filters the waypoints which are valid and returns those
+ */
+function getValidWaypoints(waypoints: WaypointCollection | undefined, reArrangeIndexes = false): WaypointCollection {
+    if (!waypoints) {
+        return {};
+    }
+
+    const sortedIndexes = Object.keys(waypoints)
+        .map(getWaypointIndex)
+        .sort((a, b) => a - b);
+    const waypointValues = sortedIndexes.map((index) => waypoints[`waypoint${index}`]);
+    // Ensure the number of waypoints is between 2 and 25
+    if (waypointValues.length < 2 || waypointValues.length > 25) {
+        return {};
+    }
+
+    let lastWaypointIndex = -1;
+    let waypointIndex = -1;
+
+    return waypointValues.reduce<WaypointCollection>((acc, currentWaypoint, index) => {
+        const previousWaypoint = waypointValues[lastWaypointIndex];
+
+        // Check if the waypoint has a valid address
+        if (!waypointHasValidAddress(currentWaypoint)) {
+            return acc;
+        }
+
+        // Check for adjacent waypoints with the same address
+        if (previousWaypoint && currentWaypoint?.address === previousWaypoint.address) {
+            return acc;
+        }
+
+        acc[`waypoint${reArrangeIndexes ? waypointIndex + 1 : index}`] = currentWaypoint;
+
+        lastWaypointIndex = index;
+        waypointIndex += 1;
+
+        return acc;
+    }, {});
+}
+
+/**
+ * Returns the most recent transactions in an object
+ */
+function getRecentTransactions(transactions: Record<string, string>, size = 2): string[] {
+    return Object.keys(transactions)
+        .sort((transactionID1, transactionID2) => (new Date(transactions[transactionID1]) < new Date(transactions[transactionID2]) ? 1 : -1))
+        .slice(0, size);
+}
+
+/**
+ * Check if transaction has duplicatedTransaction violation.
+ * @param transactionID - the transaction to check
+ * @param checkDismissed - whether to check if the violation has already been dismissed as well
+ */
+function isDuplicate(transactionID: string, checkDismissed = false): boolean {
+    if (!Permissions.canUseDupeDetection(allBetas ?? [])) {
+        return false;
+    }
+
+    const hasDuplicatedViolation = !!allTransactionViolations?.[`${ONYXKEYS.COLLECTION.TRANSACTION_VIOLATIONS}${transactionID}`]?.some(
+        (violation: TransactionViolation) => violation.name === CONST.VIOLATIONS.DUPLICATED_TRANSACTION,
+    );
+    if (!checkDismissed) {
+        return hasDuplicatedViolation;
+    }
+    const didDismissedViolation =
+        allTransactions?.[`${ONYXKEYS.COLLECTION.TRANSACTION}${transactionID}`]?.comment?.dismissedViolations?.duplicatedTransaction?.[currentUserEmail] === `${currentUserAccountID}`;
+    return hasDuplicatedViolation && !didDismissedViolation;
+}
+
+/**
+ * Check if transaction is on hold
+ */
+function isOnHold(transaction: OnyxEntry<Transaction>): boolean {
+    if (!transaction) {
+        return false;
+    }
+
+    return !!transaction.comment?.hold || isDuplicate(transaction.transactionID, true);
+}
+
+/**
+ * Check if transaction is on hold for the given transactionID
+ */
+function isOnHoldByTransactionID(transactionID: string): boolean {
+    if (!transactionID) {
+        return false;
+    }
+
+    return isOnHold(allTransactions?.[`${ONYXKEYS.COLLECTION.TRANSACTION}${transactionID}`]);
+}
+
+/**
+ * Checks if any violations for the provided transaction are of type 'violation'
+ */
+function hasViolation(transactionID: string, transactionViolations: OnyxCollection<TransactionViolations>): boolean {
+    return !!transactionViolations?.[ONYXKEYS.COLLECTION.TRANSACTION_VIOLATIONS + transactionID]?.some(
+        (violation: TransactionViolation) => violation.type === CONST.VIOLATION_TYPES.VIOLATION,
+    );
+}
+
+/**
+ * Checks if any violations for the provided transaction are of type 'notice'
+ */
+function hasNoticeTypeViolation(transactionID: string, transactionViolations: OnyxCollection<TransactionViolation[]>): boolean {
+    return !!transactionViolations?.[ONYXKEYS.COLLECTION.TRANSACTION_VIOLATIONS + transactionID]?.some((violation: TransactionViolation) => violation.type === CONST.VIOLATION_TYPES.NOTICE);
+}
+
+/**
+ * Checks if any violations for the provided transaction are of type 'warning'
+ */
+function hasWarningTypeViolation(transactionID: string, transactionViolations: OnyxCollection<TransactionViolation[]>): boolean {
+    if (!Permissions.canUseDupeDetection(allBetas ?? [])) {
+        return false;
+    }
+
+    return !!transactionViolations?.[ONYXKEYS.COLLECTION.TRANSACTION_VIOLATIONS + transactionID]?.some((violation: TransactionViolation) => violation.type === CONST.VIOLATION_TYPES.WARNING);
+}
+
+/**
+ * Checks if any violations for the provided transaction are of modifiedAmount or modifiedDate
+ */
+function hasModifiedAmountOrDateViolation(transactionID: string, transactionViolations: OnyxCollection<TransactionViolation[]>): boolean {
+    return !!transactionViolations?.[ONYXKEYS.COLLECTION.TRANSACTION_VIOLATIONS + transactionID]?.some(
+        (violation: TransactionViolation) => violation.name === CONST.VIOLATIONS.MODIFIED_AMOUNT || violation.name === CONST.VIOLATIONS.MODIFIED_DATE,
+    );
+}
+
+/**
+ * Calculates tax amount from the given expense amount and tax percentage
+ */
+function calculateTaxAmount(percentage: string, amount: number, currency: string) {
+    const divisor = Number(percentage.slice(0, -1)) / 100 + 1;
+    const taxAmount = (amount - amount / divisor) / 100;
+    const decimals = getCurrencyDecimals(currency);
+    return parseFloat(taxAmount.toFixed(decimals));
+}
+
+/**
+ * Calculates updated amount, currency, and merchant for a distance request with modified waypoints or customUnitRateID
+ */
+function calculateAmountForUpdatedWaypointOrRate(
+    transaction: OnyxInputOrEntry<Transaction>,
+    transactionChanges: TransactionChanges,
+    policy: OnyxInputOrEntry<Policy>,
+    isFromExpenseReport: boolean,
+) {
+    const hasModifiedRouteWithPendingWaypoints = !isEmptyObject(transactionChanges.waypoints) && isEmptyObject(transactionChanges?.routes?.route0?.geometry);
+    const hasModifiedRateWithPendingWaypoints = !!transactionChanges?.customUnitRateID && isFetchingWaypointsFromServer(transaction);
+    if (hasModifiedRouteWithPendingWaypoints || hasModifiedRateWithPendingWaypoints) {
+        return {
+            amount: CONST.IOU.DEFAULT_AMOUNT,
+            modifiedAmount: CONST.IOU.DEFAULT_AMOUNT,
+            modifiedMerchant: Localize.translateLocal('iou.fieldPending'),
+        };
+    }
+
+    const customUnitRateID = transactionChanges.customUnitRateID ?? getRateID(transaction) ?? '';
+    const mileageRates = DistanceRequestUtils.getMileageRates(policy, true);
+    const policyCurrency = policy?.outputCurrency ?? PolicyUtils.getPersonalPolicy()?.outputCurrency ?? CONST.CURRENCY.USD;
+    const mileageRate = isCustomUnitRateIDForP2P(transaction)
+        ? DistanceRequestUtils.getRateForP2P(policyCurrency)
+        : mileageRates?.[customUnitRateID] ?? DistanceRequestUtils.getDefaultMileageRate(policy);
+    const {unit, rate, currency} = mileageRate;
+
+    const distanceInMeters = getDistanceInMeters(transaction, unit);
+    const amount = DistanceRequestUtils.getDistanceRequestAmount(distanceInMeters, unit, rate ?? 0);
+    const updatedAmount = isFromExpenseReport ? -amount : amount;
+    const updatedCurrency = currency ?? CONST.CURRENCY.USD;
+    const updatedMerchant = DistanceRequestUtils.getDistanceMerchant(true, distanceInMeters, unit, rate, updatedCurrency, Localize.translateLocal, (digit) =>
+        toLocaleDigit(preferredLocale, digit),
+    );
+
+    return {
+        amount: updatedAmount,
+        modifiedAmount: updatedAmount,
+        modifiedMerchant: updatedMerchant,
+        modifiedCurrency: updatedCurrency,
+    };
+}
+
+/**
+ * Calculates count of all tax enabled options
+ */
+function getEnabledTaxRateCount(options: TaxRates) {
+    return Object.values(options).filter((option: TaxRate) => !option.isDisabled).length;
+}
+
+/**
+ * Check if the customUnitRateID has a value default for P2P distance requests
+ */
+function isCustomUnitRateIDForP2P(transaction: OnyxInputOrEntry<Transaction>): boolean {
+    return transaction?.comment?.customUnit?.customUnitRateID === CONST.CUSTOM_UNITS.FAKE_P2P_ID;
+}
+
+function hasReservationList(transaction: Transaction | undefined | null): boolean {
+    return !!transaction?.receipt?.reservationList && transaction?.receipt?.reservationList.length > 0;
+}
+
+/**
+ * Whether an expense is going to be paid later, either at checkout for hotels or drop off for car rental
+ */
+function isPayAtEndExpense(transaction: Transaction | undefined | null): boolean {
+    return !!transaction?.receipt?.reservationList?.some((reservation) => reservation.paymentType === 'PAY_AT_HOTEL' || reservation.paymentType === 'PAY_AT_VENDOR');
+}
+
+/**
+ * Get custom unit rate (distance rate) ID from the transaction object
+ */
+function getRateID(transaction: OnyxInputOrEntry<Transaction>): string | undefined {
+    return transaction?.modifiedCustomUnitRateID ?? transaction?.comment?.customUnit?.customUnitRateID?.toString();
+}
+
+/**
+ * Gets the tax code based on the type of transaction and selected currency.
+ * If it is distance request, then returns the tax code corresponding to the custom unit rate
+ * Else returns policy default tax rate if transaction is in policy default currency, otherwise foreign default tax rate
+ */
+function getDefaultTaxCode(policy: OnyxEntry<Policy>, transaction: OnyxEntry<Transaction>, currency?: string | undefined): string | undefined {
+    if (isDistanceRequest(transaction)) {
+        const customUnitRateID = getRateID(transaction) ?? '';
+        const customUnitRate = getCustomUnitRate(policy, customUnitRateID);
+        return customUnitRate?.attributes?.taxRateExternalID ?? '';
+    }
+    const defaultExternalID = policy?.taxRates?.defaultExternalID;
+    const foreignTaxDefault = policy?.taxRates?.foreignTaxDefault;
+    return policy?.outputCurrency === (currency ?? getCurrency(transaction)) ? defaultExternalID : foreignTaxDefault;
+}
+
+/**
+ * Transforms tax rates to a new object format - to add codes and new name with concatenated name and value.
+ *
+ * @param  policy - The policy which the user has access to and which the report is tied to.
+ * @returns The transformed tax rates object.g
+ */
+function transformedTaxRates(policy: OnyxEntry<Policy> | undefined, transaction?: OnyxEntry<Transaction>): Record<string, TaxRate> {
+    const taxRates = policy?.taxRates;
+    const defaultExternalID = taxRates?.defaultExternalID;
+
+    const defaultTaxCode = () => {
+        if (!transaction) {
+            return defaultExternalID;
+        }
+
+        return policy && getDefaultTaxCode(policy, transaction);
+    };
+
+    const getModifiedName = (data: TaxRate, code: string) =>
+        `${data.name} (${data.value})${defaultTaxCode() === code ? ` ${CONST.DOT_SEPARATOR} ${Localize.translateLocal('common.default')}` : ''}`;
+    const taxes = Object.fromEntries(Object.entries(taxRates?.taxes ?? {}).map(([code, data]) => [code, {...data, code, modifiedName: getModifiedName(data, code), name: data.name}]));
+    return taxes;
+}
+
+/**
+ * Gets the tax value of a selected tax
+ */
+function getTaxValue(policy: OnyxEntry<Policy>, transaction: OnyxEntry<Transaction>, taxCode: string) {
+    return Object.values(transformedTaxRates(policy, transaction)).find((taxRate) => taxRate.code === taxCode)?.value;
+}
+
+/**
+ * Gets the tax name for Workspace Taxes Settings
+ */
+function getWorkspaceTaxesSettingsName(policy: OnyxEntry<Policy>, taxCode: string) {
+    return Object.values(transformedTaxRates(policy)).find((taxRate) => taxRate.code === taxCode)?.modifiedName;
+}
+
+/**
+ * Gets the name corresponding to the taxCode that is displayed to the user
+ */
+function getTaxName(policy: OnyxEntry<Policy>, transaction: OnyxEntry<Transaction>) {
+    const defaultTaxCode = getDefaultTaxCode(policy, transaction);
+    return Object.values(transformedTaxRates(policy, transaction)).find((taxRate) => taxRate.code === (transaction?.taxCode ?? defaultTaxCode))?.modifiedName;
+}
+
+function getTransaction(transactionID: string): OnyxEntry<Transaction> {
+    return allTransactions?.[`${ONYXKEYS.COLLECTION.TRANSACTION}${transactionID}`];
+}
+
+type FieldsToCompare = Record<string, Array<keyof Transaction>>;
+type FieldsToChange = {
+    category?: Array<string | undefined>;
+    merchant?: Array<string | undefined>;
+    tag?: Array<string | undefined>;
+    description?: Array<Comment | undefined>;
+    taxCode?: Array<string | undefined>;
+    billable?: Array<boolean | undefined>;
+    reimbursable?: Array<boolean | undefined>;
+};
+
+/**
+ * This function compares fields of duplicate transactions and determines which fields should be kept and which should be changed.
+ *
+ * @returns An object with two properties: 'keep' and 'change'.
+ * 'keep' is an object where each key is a field name and the value is the value of that field in the transaction that should be kept.
+ * 'change' is an object where each key is a field name and the value is an array of different values of that field in the duplicate transactions.
+ *
+ * The function works as follows:
+ * 1. It fetches the transaction violations for the given transaction ID.
+ * 2. It finds the duplicate transactions.
+ * 3. It creates two empty objects, 'keep' and 'change'.
+ * 4. It defines the fields to compare in the transactions.
+ * 5. It iterates over the fields to compare. For each field:
+ *    - If the field is 'description', it checks if all comments are equal, exist, or are empty. If so, it keeps the first transaction's comment. Otherwise, it finds the different values and adds them to 'change'.
+ *    - For other fields, it checks if all fields are equal. If so, it keeps the first transaction's field value. Otherwise, it finds the different values and adds them to 'change'.
+ * 6. It returns the 'keep' and 'change' objects.
+ */
+
+function compareDuplicateTransactionFields(transactionID: string): {keep: Partial<ReviewDuplicates>; change: FieldsToChange} {
+    const transactionViolations = allTransactionViolations?.[`${ONYXKEYS.COLLECTION.TRANSACTION_VIOLATIONS}${transactionID}`];
+    const duplicates = transactionViolations?.find((violation) => violation.name === CONST.VIOLATIONS.DUPLICATED_TRANSACTION)?.data?.duplicates ?? [];
+    const transactions = [transactionID, ...duplicates].map((item) => getTransaction(item));
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
+    const keep: Record<string, any> = {};
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
+    const change: Record<string, any[]> = {};
+
+    const fieldsToCompare: FieldsToCompare = {
+        merchant: ['modifiedMerchant', 'merchant'],
+        category: ['category'],
+        tag: ['tag'],
+        description: ['comment'],
+        taxCode: ['taxCode'],
+        billable: ['billable'],
+        reimbursable: ['reimbursable'],
+    };
+
+    // Helper function thats create an array of different values for a given key in the transactions
+    function getDifferentValues(items: Array<OnyxEntry<Transaction>>, keys: Array<keyof Transaction>) {
+        return [
+            ...new Set(
+                items
+                    .map((item) => {
+                        // Prioritize modifiedMerchant over merchant
+                        if (keys.includes('modifiedMerchant' as keyof Transaction) && keys.includes('merchant' as keyof Transaction)) {
+                            // eslint-disable-next-line @typescript-eslint/prefer-nullish-coalescing
+                            return getMerchant(item);
+                        }
+                        return keys.map((key) => item?.[key]);
+                    })
+                    .flat(),
+            ),
+        ];
+    }
+
+    // Helper function to check if all comments are equal
+    function areAllCommentsEqual(items: Array<OnyxEntry<Transaction>>, firstTransaction: OnyxEntry<Transaction>) {
+        return items.every((item) => lodashIsEqual(item?.comment, firstTransaction?.comment));
+    }
+
+    // Helper function to check if all fields are equal for a given key
+    function areAllFieldsEqual(items: Array<OnyxEntry<Transaction>>, keyExtractor: (item: OnyxEntry<Transaction>) => string) {
+        const firstTransaction = transactions[0];
+        return items.every((item) => keyExtractor(item) === keyExtractor(firstTransaction));
+    }
+
+    // Helper function to process changes
+    function processChanges(fieldName: string, items: Array<OnyxEntry<Transaction>>, keys: Array<keyof Transaction>) {
+        const differentValues = getDifferentValues(items, keys);
+        if (differentValues.length > 0) {
+            change[fieldName] = differentValues;
+        }
+    }
+
+    for (const fieldName in fieldsToCompare) {
+        if (Object.prototype.hasOwnProperty.call(fieldsToCompare, fieldName)) {
+            const keys = fieldsToCompare[fieldName];
+            const firstTransaction = transactions[0];
+            const isFirstTransactionCommentEmptyObject = typeof firstTransaction?.comment === 'object' && firstTransaction?.comment?.comment === '';
+
+            if (fieldName === 'description') {
+                const allCommentsAreEqual = areAllCommentsEqual(transactions, firstTransaction);
+                const allCommentsAreEmpty = isFirstTransactionCommentEmptyObject && transactions.every((item) => item?.comment === undefined);
+
+                if (allCommentsAreEqual || allCommentsAreEmpty) {
+                    keep[fieldName] = firstTransaction?.comment?.comment ?? firstTransaction?.comment;
+                } else {
+                    processChanges(fieldName, transactions, keys);
+                }
+            } else if (fieldName === 'merchant') {
+                if (areAllFieldsEqual(transactions, getMerchant)) {
+                    keep[fieldName] = getMerchant(firstTransaction);
+                } else {
+                    processChanges(fieldName, transactions, keys);
+                }
+            } else if (areAllFieldsEqual(transactions, (item) => keys.map((key) => item?.[key]).join('|'))) {
+                keep[fieldName] = firstTransaction?.[keys[0]] ?? firstTransaction?.[keys[1]];
+            } else {
+                processChanges(fieldName, transactions, keys);
+            }
+        }
+    }
+
+    return {keep, change};
+}
+
+function getTransactionID(threadReportID: string): string {
+    const report = ReportConnection.getAllReports()?.[`${ONYXKEYS.COLLECTION.REPORT}${threadReportID}`] ?? null;
+    const parentReportAction = ReportActionsUtils.getReportAction(report?.parentReportID ?? '', report?.parentReportActionID ?? '');
+    const IOUTransactionID = ReportActionsUtils.isMoneyRequestAction(parentReportAction) ? ReportActionsUtils.getOriginalMessage(parentReportAction)?.IOUTransactionID ?? '-1' : '-1';
+
+    return IOUTransactionID;
+}
+
+function buildNewTransactionAfterReviewingDuplicates(reviewDuplicateTransaction: OnyxEntry<ReviewDuplicates>): Partial<Transaction> {
+    const originalTransaction = allTransactions?.[`${ONYXKEYS.COLLECTION.TRANSACTION}${reviewDuplicateTransaction?.transactionID}`] ?? undefined;
+    const {duplicates, ...restReviewDuplicateTransaction} = reviewDuplicateTransaction ?? {};
+
+    return {
+        ...originalTransaction,
+        ...restReviewDuplicateTransaction,
+        modifiedMerchant: reviewDuplicateTransaction?.merchant,
+        merchant: reviewDuplicateTransaction?.merchant,
+        comment: {comment: reviewDuplicateTransaction?.description},
+    };
+}
+
+function buildTransactionsMergeParams(reviewDuplicates: OnyxEntry<ReviewDuplicates>, originalTransaction: Partial<Transaction>): TransactionMergeParams {
+    return {
+        amount: -getAmount(originalTransaction as OnyxEntry<Transaction>, false),
+        reportID: originalTransaction?.reportID ?? '',
+        receiptID: originalTransaction?.receipt?.receiptID ?? 0,
+        currency: getCurrency(originalTransaction as OnyxEntry<Transaction>),
+        created: getFormattedCreated(originalTransaction as OnyxEntry<Transaction>),
+        transactionID: reviewDuplicates?.transactionID ?? '',
+        transactionIDList: reviewDuplicates?.duplicates ?? [],
+        billable: reviewDuplicates?.billable ?? false,
+        reimbursable: reviewDuplicates?.reimbursable ?? false,
+        category: reviewDuplicates?.category ?? '',
+        tag: reviewDuplicates?.tag ?? '',
+        merchant: reviewDuplicates?.merchant ?? '',
+        comment: reviewDuplicates?.description ?? '',
+    };
+}
+
+export {
+    buildOptimisticTransaction,
+    calculateTaxAmount,
+    calculateAmountForUpdatedWaypointOrRate,
+    getWorkspaceTaxesSettingsName,
+    getDefaultTaxCode,
+    transformedTaxRates,
+    getTaxValue,
+    getTaxName,
+    getEnabledTaxRateCount,
+    getUpdatedTransaction,
+    getDescription,
+    getRequestType,
+    isManualRequest,
+    isScanRequest,
+    getAmount,
+    getTaxAmount,
+    getTaxCode,
+    getCurrency,
+    getDistanceInMeters,
+    getCardID,
+    getOriginalCurrency,
+    getOriginalAmount,
+    getMerchant,
+    getMCCGroup,
+    getCreated,
+    getFormattedCreated,
+    getCategory,
+    getBillable,
+    getTag,
+    getTagArrayFromName,
+    getTagForDisplay,
+    getTransactionViolations,
+    getAllReportTransactions,
+    hasReceipt,
+    hasEReceipt,
+    hasRoute,
+    isReceiptBeingScanned,
+    didReceiptScanSucceed,
+    getValidWaypoints,
+    isDistanceRequest,
+    isFetchingWaypointsFromServer,
+    isExpensifyCardTransaction,
+    isCardTransaction,
+    isDuplicate,
+    isPending,
+    isPosted,
+    isOnHold,
+    isOnHoldByTransactionID,
+    getWaypoints,
+    isAmountMissing,
+    isMerchantMissing,
+    isPartialMerchant,
+    isCreatedMissing,
+    areRequiredFieldsEmpty,
+    hasMissingSmartscanFields,
+    hasPendingRTERViolation,
+    allHavePendingRTERViolation,
+    hasPendingUI,
+    getWaypointIndex,
+    waypointHasValidAddress,
+    getRecentTransactions,
+    hasReservationList,
+    hasViolation,
+    hasNoticeTypeViolation,
+    hasWarningTypeViolation,
+    hasModifiedAmountOrDateViolation,
+    isCustomUnitRateIDForP2P,
+    getRateID,
+    getTransaction,
+    compareDuplicateTransactionFields,
+    getTransactionID,
+    buildNewTransactionAfterReviewingDuplicates,
+    buildTransactionsMergeParams,
+    getReimbursable,
+    isPayAtEndExpense,
+    getCardName,
+};
+
+export type {TransactionChanges};
diff --git a/src/libs/Trie/index.ts b/src/libs/Trie/index.ts
index a82c90c15772..e1164d4e7606 100644
--- a/src/libs/Trie/index.ts
+++ b/src/libs/Trie/index.ts
@@ -50,7 +50,7 @@ class Trie<TMetaData extends MetaData> {
 
             newWord = newWord.substring(1);
         }
-        return node.children[newWord] && node.children[newWord].isEndOfWord ? node.children[newWord] : null;
+        return node.children[newWord]?.isEndOfWord ? node.children[newWord] : null;
     }
 
     /**
diff --git a/src/libs/TripReservationUtils.ts b/src/libs/TripReservationUtils.ts
new file mode 100644
index 000000000000..13bc3293cd9d
--- /dev/null
+++ b/src/libs/TripReservationUtils.ts
@@ -0,0 +1,41 @@
+import * as Expensicons from '@src/components/Icon/Expensicons';
+import CONST from '@src/CONST';
+import type {Reservation, ReservationType} from '@src/types/onyx/Transaction';
+import type Transaction from '@src/types/onyx/Transaction';
+import type IconAsset from '@src/types/utils/IconAsset';
+
+function getTripReservationIcon(reservationType: ReservationType): IconAsset {
+    switch (reservationType) {
+        case CONST.RESERVATION_TYPE.FLIGHT:
+            return Expensicons.Plane;
+        case CONST.RESERVATION_TYPE.HOTEL:
+            return Expensicons.Bed;
+        case CONST.RESERVATION_TYPE.CAR:
+            return Expensicons.CarWithKey;
+        default:
+            return Expensicons.Luggage;
+    }
+}
+
+function getReservationsFromTripTransactions(transactions: Transaction[]): Reservation[] {
+    return transactions
+        .map((item) => item?.receipt?.reservationList ?? [])
+        .filter((item) => item.length > 0)
+        .flat();
+}
+
+function getTripEReceiptIcon(transaction?: Transaction): IconAsset | undefined {
+    const reservationType = transaction ? transaction.receipt?.reservationList?.[0]?.type : '';
+
+    switch (reservationType) {
+        case CONST.RESERVATION_TYPE.FLIGHT:
+        case CONST.RESERVATION_TYPE.CAR:
+            return Expensicons.Plane;
+        case CONST.RESERVATION_TYPE.HOTEL:
+            return Expensicons.Bed;
+        default:
+            return undefined;
+    }
+}
+
+export {getTripReservationIcon, getReservationsFromTripTransactions, getTripEReceiptIcon};
diff --git a/src/libs/UnreadIndicatorUpdater/index.ts b/src/libs/UnreadIndicatorUpdater/index.ts
index b4f3cd34a8c4..d6a65ee85aac 100644
--- a/src/libs/UnreadIndicatorUpdater/index.ts
+++ b/src/libs/UnreadIndicatorUpdater/index.ts
@@ -1,25 +1,24 @@
+import debounce from 'lodash/debounce';
 import type {OnyxCollection} from 'react-native-onyx';
-import Onyx from 'react-native-onyx';
+import memoize from '@libs/memoize';
+import * as ReportConnection from '@libs/ReportConnection';
 import * as ReportUtils from '@libs/ReportUtils';
 import Navigation, {navigationRef} from '@navigation/Navigation';
 import CONST from '@src/CONST';
-import ONYXKEYS from '@src/ONYXKEYS';
 import type {Report} from '@src/types/onyx';
 import updateUnread from './updateUnread';
 
-let allReports: OnyxCollection<Report> = {};
-
-export default function getUnreadReportsForUnreadIndicator(reports: OnyxCollection<Report>, currentReportID: string) {
+function getUnreadReportsForUnreadIndicator(reports: OnyxCollection<Report>, currentReportID: string) {
     return Object.values(reports ?? {}).filter(
         (report) =>
             ReportUtils.isUnread(report) &&
             ReportUtils.shouldReportBeInOptionList({
                 report,
-                currentReportId: currentReportID ?? '',
+                currentReportId: currentReportID ?? '-1',
                 betas: [],
                 policies: {},
                 doesReportHaveViolations: false,
-                isInGSDMode: false,
+                isInFocusMode: false,
                 excludeEmptyChats: false,
             }) &&
             /**
@@ -35,23 +34,19 @@ export default function getUnreadReportsForUnreadIndicator(reports: OnyxCollecti
     );
 }
 
-const triggerUnreadUpdate = () => {
-    const currentReportID = navigationRef.isReady() ? Navigation.getTopmostReportId() ?? '' : '';
+const memoizedGetUnreadReportsForUnreadIndicator = memoize(getUnreadReportsForUnreadIndicator, {maxArgs: 1});
+
+const triggerUnreadUpdate = debounce(() => {
+    const currentReportID = navigationRef?.isReady?.() ? Navigation.getTopmostReportId() ?? '-1' : '-1';
 
     // We want to keep notification count consistent with what can be accessed from the LHN list
-    const unreadReports = getUnreadReportsForUnreadIndicator(allReports, currentReportID);
-    updateUnread(unreadReports.length);
-};
+    const unreadReports = memoizedGetUnreadReportsForUnreadIndicator(ReportConnection.getAllReports(), currentReportID);
 
-Onyx.connect({
-    key: ONYXKEYS.COLLECTION.REPORT,
-    waitForCollectionCallback: true,
-    callback: (reportsFromOnyx) => {
-        allReports = reportsFromOnyx;
-        triggerUnreadUpdate();
-    },
-});
+    updateUnread(unreadReports.length);
+}, CONST.TIMING.UNREAD_UPDATE_DEBOUNCE_TIME);
 
-navigationRef.addListener('state', () => {
+navigationRef?.addListener?.('state', () => {
     triggerUnreadUpdate();
 });
+
+export {triggerUnreadUpdate, getUnreadReportsForUnreadIndicator};
diff --git a/src/libs/Url.ts b/src/libs/Url.ts
index 80ca98c712cf..ef595c484bae 100644
--- a/src/libs/Url.ts
+++ b/src/libs/Url.ts
@@ -1,4 +1,6 @@
 import 'react-native-url-polyfill/auto';
+import CONST from '@src/CONST';
+import type {Route} from '@src/ROUTES';
 
 /**
  * Add / to the end of any URL if not present
@@ -10,6 +12,13 @@ function addTrailingForwardSlash(url: string): string {
     return url;
 }
 
+function addLeadingForwardSlash(url: string): string {
+    if (!url.startsWith('/')) {
+        return `/${url}`;
+    }
+    return url;
+}
+
 /**
  * Get path from URL string
  */
@@ -48,12 +57,12 @@ function appendParam(url: string, paramName: string, paramValue: string) {
     // If parameter exists, replace it
     if (url.includes(`${paramName}=`)) {
         const regex = new RegExp(`${paramName}=([^&]*)`);
-        return url.replace(regex, `${paramName}=${paramValue}`);
+        return url.replace(regex, `${paramName}=${paramValue}`) as Route;
     }
 
     // If parameter doesn't exist, append it
     const separator = url.includes('?') ? '&' : '?';
-    return `${url}${separator}${paramName}=${paramValue}`;
+    return `${url}${separator}${paramName}=${paramValue}` as Route;
 }
 
 function hasURL(text: string) {
@@ -62,4 +71,9 @@ function hasURL(text: string) {
     return urlPattern.test(text);
 }
 
-export {addTrailingForwardSlash, hasSameExpensifyOrigin, getPathFromURL, appendParam, hasURL};
+function extractUrlDomain(url: string): string | undefined {
+    const match = String(url).match(CONST.REGEX.DOMAIN_BASE);
+    return match?.[1];
+}
+
+export {addTrailingForwardSlash, hasSameExpensifyOrigin, getPathFromURL, appendParam, hasURL, addLeadingForwardSlash, extractUrlDomain};
diff --git a/src/libs/UserUtils.ts b/src/libs/UserUtils.ts
index ce7e4963afc7..c5291a2864d7 100644
--- a/src/libs/UserUtils.ts
+++ b/src/libs/UserUtils.ts
@@ -1,8 +1,8 @@
-import Str from 'expensify-common/lib/str';
+import {Str} from 'expensify-common';
 import type {OnyxEntry} from 'react-native-onyx';
 import type {ValueOf} from 'type-fest';
 import * as defaultAvatars from '@components/Icon/DefaultAvatars';
-import {ConciergeAvatar, FallbackAvatar, NotificationsAvatar} from '@components/Icon/Expensicons';
+import {ConciergeAvatar, NotificationsAvatar} from '@components/Icon/Expensicons';
 import CONST from '@src/CONST';
 import type {LoginList} from '@src/types/onyx';
 import type Login from '@src/types/onyx/Login';
@@ -79,33 +79,33 @@ function generateAccountID(searchValue: string): number {
 
 /**
  * Helper method to return the default avatar associated with the given accountID
- * @param [accountID]
- * @returns
  */
-function getDefaultAvatar(accountID = -1, avatarURL?: string): IconAsset {
-    if (accountID <= 0) {
-        return FallbackAvatar;
-    }
-    if (Number(accountID) === CONST.ACCOUNT_ID.CONCIERGE) {
+function getDefaultAvatar(accountID = -1, avatarURL?: string): IconAsset | undefined {
+    if (accountID === CONST.ACCOUNT_ID.CONCIERGE) {
         return ConciergeAvatar;
     }
-    if (Number(accountID) === CONST.ACCOUNT_ID.NOTIFICATIONS) {
+    if (accountID === CONST.ACCOUNT_ID.NOTIFICATIONS) {
         return NotificationsAvatar;
     }
 
     // There are 24 possible default avatars, so we choose which one this user has based
     // on a simple modulo operation of their login number. Note that Avatar count starts at 1.
 
-    // When creating a chat, we generate an avatar using an ID and the backend response will modify the ID to the actual user ID.
+    // When creating a chat the backend response will return the actual user ID.
     // But the avatar link still corresponds to the original ID-generated link. So we extract the SVG image number from the backend's link instead of using the user ID directly
-    let accountIDHashBucket: AvatarRange;
+    let accountIDHashBucket: AvatarRange | undefined;
     if (avatarURL) {
         const match = avatarURL.match(/(default-avatar_|avatar_)(\d+)(?=\.)/);
         const lastDigit = match && parseInt(match[2], 10);
         accountIDHashBucket = lastDigit as AvatarRange;
-    } else {
+    } else if (accountID > 0) {
         accountIDHashBucket = ((accountID % CONST.DEFAULT_AVATAR_COUNT) + 1) as AvatarRange;
     }
+
+    if (!accountIDHashBucket) {
+        return;
+    }
+
     return defaultAvatars[`Avatar${accountIDHashBucket}`];
 }
 
@@ -125,7 +125,7 @@ function getDefaultAvatarURL(accountID: string | number = ''): string {
 }
 
 /**
- * Given a user's avatar path, returns true if user doesn't have an avatar or if URL points to a default avatar
+ * * Given a user's avatar path, returns true if URL points to a default avatar, false otherwise
  * @param avatarSource - the avatar source from user's personalDetails
  */
 function isDefaultAvatar(avatarSource?: AvatarSource): avatarSource is string | undefined {
@@ -140,11 +140,6 @@ function isDefaultAvatar(avatarSource?: AvatarSource): avatarSource is string |
         }
     }
 
-    if (!avatarSource) {
-        // If source is undefined, we should also use a default avatar
-        return true;
-    }
-
     return false;
 }
 
@@ -155,7 +150,7 @@ function isDefaultAvatar(avatarSource?: AvatarSource): avatarSource is string |
  * @param avatarSource - the avatar source from user's personalDetails
  * @param accountID - the accountID of the user
  */
-function getAvatar(avatarSource?: AvatarSource, accountID?: number): AvatarSource {
+function getAvatar(avatarSource?: AvatarSource, accountID?: number): AvatarSource | undefined {
     return isDefaultAvatar(avatarSource) ? getDefaultAvatar(accountID, avatarSource) : avatarSource;
 }
 
@@ -163,7 +158,7 @@ function getAvatar(avatarSource?: AvatarSource, accountID?: number): AvatarSourc
  * Provided an avatar URL, if avatar is a default avatar, return NewDot default avatar URL.
  * Otherwise, return the URL pointing to a user-uploaded avatar.
  *
- * @param avatarURL - the avatar source from user's personalDetails
+ * @param avatarSource - the avatar source from user's personalDetails
  * @param accountID - the accountID of the user
  */
 function getAvatarUrl(avatarSource: AvatarSource | undefined, accountID: number): AvatarSource {
@@ -174,7 +169,7 @@ function getAvatarUrl(avatarSource: AvatarSource | undefined, accountID: number)
  * Avatars uploaded by users will have a _128 appended so that the asset server returns a small version.
  * This removes that part of the URL so the full version of the image can load.
  */
-function getFullSizeAvatar(avatarSource: AvatarSource | undefined, accountID?: number): AvatarSource {
+function getFullSizeAvatar(avatarSource: AvatarSource | undefined, accountID?: number): AvatarSource | undefined {
     const source = getAvatar(avatarSource, accountID);
     if (typeof source !== 'string') {
         return source;
@@ -186,7 +181,7 @@ function getFullSizeAvatar(avatarSource: AvatarSource | undefined, accountID?: n
  * Small sized avatars end with _128.<file-type>. This adds the _128 at the end of the
  * source URL (before the file type) if it doesn't exist there already.
  */
-function getSmallSizeAvatar(avatarSource: AvatarSource, accountID?: number): AvatarSource {
+function getSmallSizeAvatar(avatarSource?: AvatarSource, accountID?: number): AvatarSource | undefined {
     const source = getAvatar(avatarSource, accountID);
     if (typeof source !== 'string') {
         return source;
@@ -217,7 +212,6 @@ export {
     generateAccountID,
     getAvatar,
     getAvatarUrl,
-    getDefaultAvatar,
     getDefaultAvatarURL,
     getFullSizeAvatar,
     getLoginListBrickRoadIndicator,
diff --git a/src/libs/ValidationUtils.ts b/src/libs/ValidationUtils.ts
index d5a87fc07e28..80c765f0edf1 100644
--- a/src/libs/ValidationUtils.ts
+++ b/src/libs/ValidationUtils.ts
@@ -1,7 +1,5 @@
 import {addYears, endOfMonth, format, isAfter, isBefore, isSameDay, isValid, isWithinInterval, parse, parseISO, startOfDay, subYears} from 'date-fns';
-import Str from 'expensify-common/lib/str';
-import {URL_REGEX_WITH_REQUIRED_PROTOCOL} from 'expensify-common/lib/Url';
-import isDate from 'lodash/isDate';
+import {PUBLIC_DOMAINS, Str, Url} from 'expensify-common';
 import isEmpty from 'lodash/isEmpty';
 import isObject from 'lodash/isObject';
 import type {OnyxCollection} from 'react-native-onyx';
@@ -11,7 +9,7 @@ import type {OnyxFormKey} from '@src/ONYXKEYS';
 import type {Report, TaxRates} from '@src/types/onyx';
 import * as CardUtils from './CardUtils';
 import DateUtils from './DateUtils';
-import type {MaybePhraseKey} from './Localize';
+import * as Localize from './Localize';
 import * as LoginUtils from './LoginUtils';
 import {parsePhoneNumber} from './PhoneNumber';
 import StringUtils from './StringUtils';
@@ -90,13 +88,13 @@ function isRequiredFulfilled(value?: FormValue | number[] | string[] | Record<st
         return !StringUtils.isEmptyString(value);
     }
 
-    if (isDate(value)) {
+    if (DateUtils.isDate(value)) {
         return isValidDate(value);
     }
     if (Array.isArray(value) || isObject(value)) {
         return !isEmpty(value);
     }
-    return Boolean(value);
+    return !!value;
 }
 
 /**
@@ -112,7 +110,7 @@ function getFieldRequiredErrors<TFormID extends OnyxFormKey>(values: FormOnyxVal
             return;
         }
 
-        errors[fieldKey] = 'common.error.fieldRequired';
+        errors[fieldKey] = Localize.translateLocal('common.error.fieldRequired');
     });
 
     return errors;
@@ -191,12 +189,12 @@ function meetsMaximumAgeRequirement(date: string): boolean {
 /**
  * Validate that given date is in a specified range of years before now.
  */
-function getAgeRequirementError(date: string, minimumAge: number, maximumAge: number): MaybePhraseKey {
+function getAgeRequirementError(date: string, minimumAge: number, maximumAge: number): string {
     const currentDate = startOfDay(new Date());
     const testDate = parse(date, CONST.DATE.FNS_FORMAT_STRING, currentDate);
 
     if (!isValid(testDate)) {
-        return 'common.error.dateInvalid';
+        return Localize.translateLocal('common.error.dateInvalid');
     }
 
     const maximalDate = subYears(currentDate, minimumAge);
@@ -207,10 +205,10 @@ function getAgeRequirementError(date: string, minimumAge: number, maximumAge: nu
     }
 
     if (isSameDay(testDate, maximalDate) || isAfter(testDate, maximalDate)) {
-        return ['privatePersonalDetails.error.dateShouldBeBefore', {dateString: format(maximalDate, CONST.DATE.FNS_FORMAT_STRING)}];
+        return Localize.translateLocal('privatePersonalDetails.error.dateShouldBeBefore', {dateString: format(maximalDate, CONST.DATE.FNS_FORMAT_STRING)});
     }
 
-    return ['privatePersonalDetails.error.dateShouldBeAfter', {dateString: format(minimalDate, CONST.DATE.FNS_FORMAT_STRING)}];
+    return Localize.translateLocal('privatePersonalDetails.error.dateShouldBeAfter', {dateString: format(minimalDate, CONST.DATE.FNS_FORMAT_STRING)});
 }
 
 /**
@@ -222,14 +220,14 @@ function getDatePassedError(inputDate: string): string {
 
     // If input date is not valid, return an error
     if (!isValid(parsedDate)) {
-        return 'common.error.dateInvalid';
+        return Localize.translateLocal('common.error.dateInvalid');
     }
 
     // Clear time for currentDate so comparison is based solely on the date
     currentDate.setHours(0, 0, 0, 0);
 
     if (parsedDate < currentDate) {
-        return 'common.error.dateInvalid';
+        return Localize.translateLocal('common.error.dateInvalid');
     }
 
     return '';
@@ -241,7 +239,12 @@ function getDatePassedError(inputDate: string): string {
  */
 function isValidWebsite(url: string): boolean {
     const isLowerCase = url === url.toLowerCase();
-    return new RegExp(`^${URL_REGEX_WITH_REQUIRED_PROTOCOL}$`, 'i').test(url) && isLowerCase;
+    return new RegExp(`^${Url.URL_REGEX_WITH_REQUIRED_PROTOCOL}$`, 'i').test(url) && isLowerCase;
+}
+
+/** Checks if the domain is public */
+function isPublicDomain(domain: string): boolean {
+    return PUBLIC_DOMAINS.some((publicDomain) => publicDomain === domain.toLowerCase());
 }
 
 function validateIdentity(identity: Record<string, string>): Record<string, boolean> {
@@ -293,15 +296,15 @@ function isValidUSPhone(phoneNumber = '', isCountryCodeOptional?: boolean): bool
 }
 
 function isValidValidateCode(validateCode: string): boolean {
-    return Boolean(validateCode.match(CONST.VALIDATE_CODE_REGEX_STRING));
+    return !!validateCode.match(CONST.VALIDATE_CODE_REGEX_STRING);
 }
 
 function isValidRecoveryCode(recoveryCode: string): boolean {
-    return Boolean(recoveryCode.match(CONST.RECOVERY_CODE_REGEX_STRING));
+    return !!recoveryCode.match(CONST.RECOVERY_CODE_REGEX_STRING);
 }
 
 function isValidTwoFactorCode(code: string): boolean {
-    return Boolean(code.match(CONST.REGEX.CODE_2FA));
+    return !!code.match(CONST.REGEX.CODE_2FA);
 }
 
 /**
@@ -337,7 +340,7 @@ function isValidCompanyName(name: string) {
 }
 
 function isValidReportName(name: string) {
-    return name.trim().length < CONST.REPORT_NAME_LIMIT;
+    return new Blob([name.trim()]).size <= CONST.REPORT_NAME_LIMIT;
 }
 
 /**
@@ -351,8 +354,7 @@ function isValidDisplayName(name: string): boolean {
  * Checks that the provided legal name doesn't contain special characters
  */
 function isValidLegalName(name: string): boolean {
-    const hasAccentedChars = Boolean(name.match(CONST.REGEX.ACCENT_LATIN_CHARS));
-    return CONST.REGEX.ALPHABETIC_AND_LATIN_CHARS.test(name) && !hasAccentedChars;
+    return CONST.REGEX.ALPHABETIC_AND_LATIN_CHARS.test(name);
 }
 
 /**
@@ -409,7 +411,7 @@ function isNumeric(value: string): boolean {
     if (typeof value !== 'string') {
         return false;
     }
-    return /^\d*$/.test(value);
+    return CONST.REGEX.NUMBER.test(value);
 }
 
 /**
@@ -480,6 +482,19 @@ function isExistingTaxName(taxName: string, taxRates: TaxRates): boolean {
     return !!Object.values(taxRates).find((taxRate) => taxRate.name === trimmedTaxName);
 }
 
+function isExistingTaxCode(taxCode: string, taxRates: TaxRates): boolean {
+    const trimmedTaxCode = taxCode.trim();
+    return !!Object.keys(taxRates).find((taxID) => taxID === trimmedTaxCode);
+}
+
+/**
+ * Validates the given value if it is correct subscription size.
+ */
+function isValidSubscriptionSize(subscriptionSize: string): boolean {
+    const parsedSubscriptionSize = Number(subscriptionSize);
+    return !Number.isNaN(parsedSubscriptionSize) && parsedSubscriptionSize > 0 && parsedSubscriptionSize <= CONST.SUBSCRIPTION_SIZE_LIMIT && Number.isInteger(parsedSubscriptionSize);
+}
+
 export {
     meetsMinimumAgeRequirement,
     meetsMaximumAgeRequirement,
@@ -521,4 +536,7 @@ export {
     isValidPercentage,
     isValidReportName,
     isExistingTaxName,
+    isValidSubscriptionSize,
+    isExistingTaxCode,
+    isPublicDomain,
 };
diff --git a/src/libs/Violations/ViolationsUtils.ts b/src/libs/Violations/ViolationsUtils.ts
index 42f58be1d699..3ac01c704443 100644
--- a/src/libs/Violations/ViolationsUtils.ts
+++ b/src/libs/Violations/ViolationsUtils.ts
@@ -7,7 +7,7 @@ import * as TransactionUtils from '@libs/TransactionUtils';
 import CONST from '@src/CONST';
 import type {TranslationPaths} from '@src/languages/types';
 import ONYXKEYS from '@src/ONYXKEYS';
-import type {PolicyCategories, PolicyTagList, Transaction, TransactionViolation} from '@src/types/onyx';
+import type {PolicyCategories, PolicyTagLists, Transaction, TransactionViolation, ViolationName} from '@src/types/onyx';
 
 /**
  * Calculates tag out of policy and missing tag violations for the given transaction
@@ -16,7 +16,7 @@ function getTagViolationsForSingleLevelTags(
     updatedTransaction: Transaction,
     transactionViolations: TransactionViolation[],
     policyRequiresTags: boolean,
-    policyTagList: PolicyTagList,
+    policyTagList: PolicyTagLists,
 ): TransactionViolation[] {
     const policyTagKeys = Object.keys(policyTagList);
     const policyTagListName = policyTagKeys[0];
@@ -49,17 +49,41 @@ function getTagViolationsForSingleLevelTags(
 }
 
 /**
- * Calculates some tag levels required and missing tag violations for the given transaction
+ * Calculates missing tag violations for policies with dependent tags
  */
-function getTagViolationsForMultiLevelTags(
-    updatedTransaction: Transaction,
-    transactionViolations: TransactionViolation[],
-    policyRequiresTags: boolean,
-    policyTagList: PolicyTagList,
-): TransactionViolation[] {
+function getTagViolationsForDependentTags(policyTagList: PolicyTagLists, transactionViolations: TransactionViolation[], tagName: string) {
+    const tagViolations = [...transactionViolations];
+
+    if (!tagName) {
+        Object.values(policyTagList).forEach((tagList) =>
+            tagViolations.push({
+                name: CONST.VIOLATIONS.MISSING_TAG,
+                type: CONST.VIOLATION_TYPES.VIOLATION,
+                data: {tagName: tagList.name},
+            }),
+        );
+    } else {
+        const tags = TransactionUtils.getTagArrayFromName(tagName);
+        if (Object.keys(policyTagList).length !== tags.length || tags.includes('')) {
+            tagViolations.push({
+                name: CONST.VIOLATIONS.ALL_TAG_LEVELS_REQUIRED,
+                type: CONST.VIOLATION_TYPES.VIOLATION,
+                data: {},
+            });
+        }
+    }
+
+    return tagViolations;
+}
+
+/**
+ * Calculates missing tag violations for policies with independent tags
+ */
+function getTagViolationForIndependentTags(policyTagList: PolicyTagLists, transactionViolations: TransactionViolation[], transaction: Transaction) {
     const policyTagKeys = getSortedTagKeys(policyTagList);
-    const selectedTags = updatedTransaction.tag?.split(CONST.COLON) ?? [];
+    const selectedTags = transaction.tag?.split(CONST.COLON) ?? [];
     let newTransactionViolations = [...transactionViolations];
+
     newTransactionViolations = newTransactionViolations.filter(
         (violation) => violation.name !== CONST.VIOLATIONS.SOME_TAG_LEVELS_REQUIRED && violation.name !== CONST.VIOLATIONS.TAG_OUT_OF_POLICY,
     );
@@ -69,7 +93,7 @@ function getTagViolationsForMultiLevelTags(
     const errorIndexes = [];
     for (let i = 0; i < policyTagKeys.length; i++) {
         const isTagRequired = policyTagList[policyTagKeys[i]].required ?? true;
-        const isTagSelected = Boolean(selectedTags[i]);
+        const isTagSelected = !!selectedTags[i];
         if (isTagRequired && (!isTagSelected || (selectedTags.length === 1 && selectedTags[0] === ''))) {
             errorIndexes.push(i);
         }
@@ -87,8 +111,8 @@ function getTagViolationsForMultiLevelTags(
         for (let i = 0; i < policyTagKeys.length; i++) {
             const selectedTag = selectedTags[i];
             const tags = policyTagList[policyTagKeys[i]].tags;
-            const isTagInPolicy = Object.values(tags).some((tag) => tag.name === selectedTag && Boolean(tag.enabled));
-            if (!isTagInPolicy) {
+            const isTagInPolicy = Object.values(tags).some((tag) => tag.name === selectedTag && !!tag.enabled);
+            if (!isTagInPolicy && selectedTag) {
                 newTransactionViolations.push({
                     name: CONST.VIOLATIONS.TAG_OUT_OF_POLICY,
                     type: CONST.VIOLATION_TYPES.VIOLATION,
@@ -109,6 +133,30 @@ function getTagViolationsForMultiLevelTags(
     return newTransactionViolations;
 }
 
+/**
+ * Calculates tag violations for a transaction on a policy with multi level tags
+ */
+function getTagViolationsForMultiLevelTags(
+    updatedTransaction: Transaction,
+    transactionViolations: TransactionViolation[],
+    policyTagList: PolicyTagLists,
+    hasDependentTags: boolean,
+): TransactionViolation[] {
+    const tagViolations = [
+        CONST.VIOLATIONS.SOME_TAG_LEVELS_REQUIRED,
+        CONST.VIOLATIONS.TAG_OUT_OF_POLICY,
+        CONST.VIOLATIONS.MISSING_TAG,
+        CONST.VIOLATIONS.ALL_TAG_LEVELS_REQUIRED,
+    ] as ViolationName[];
+    const filteredTransactionViolations = transactionViolations.filter((violation) => !tagViolations.includes(violation.name));
+
+    if (hasDependentTags) {
+        return getTagViolationsForDependentTags(policyTagList, filteredTransactionViolations, updatedTransaction.tag ?? '');
+    }
+
+    return getTagViolationForIndependentTags(policyTagList, filteredTransactionViolations, updatedTransaction);
+}
+
 const ViolationsUtils = {
     /**
      * Checks a transaction for policy violations and returns an object with Onyx method, key and updated transaction
@@ -118,9 +166,10 @@ const ViolationsUtils = {
         updatedTransaction: Transaction,
         transactionViolations: TransactionViolation[],
         policyRequiresTags: boolean,
-        policyTagList: PolicyTagList,
+        policyTagList: PolicyTagLists,
         policyRequiresCategories: boolean,
         policyCategories: PolicyCategories,
+        hasDependentTags: boolean,
     ): OnyxUpdate {
         const isPartialTransaction = TransactionUtils.isPartialMerchant(TransactionUtils.getMerchant(updatedTransaction)) && TransactionUtils.isAmountMissing(updatedTransaction);
         if (isPartialTransaction) {
@@ -166,7 +215,7 @@ const ViolationsUtils = {
             newTransactionViolations =
                 Object.keys(policyTagList).length === 1
                     ? getTagViolationsForSingleLevelTags(updatedTransaction, newTransactionViolations, policyRequiresTags, policyTagList)
-                    : getTagViolationsForMultiLevelTags(updatedTransaction, newTransactionViolations, policyRequiresTags, policyTagList);
+                    : getTagViolationsForMultiLevelTags(updatedTransaction, newTransactionViolations, policyTagList, hasDependentTags);
         }
 
         return {
@@ -202,6 +251,7 @@ const ViolationsUtils = {
             maxAge = 0,
             tagName,
             taxName,
+            type,
         } = violation.data ?? {};
 
         switch (violation.name) {
@@ -239,7 +289,7 @@ const ViolationsUtils = {
             case 'missingTag':
                 return translate('violations.missingTag', {tagName});
             case 'modifiedAmount':
-                return translate('violations.modifiedAmount');
+                return translate('violations.modifiedAmount', {type, displayPercentVariance: violation.data?.displayPercentVariance});
             case 'modifiedDate':
                 return translate('violations.modifiedDate');
             case 'nonExpensiworksExpense':
@@ -280,6 +330,8 @@ const ViolationsUtils = {
                 return translate('violations.taxRateChanged');
             case 'taxRequired':
                 return translate('violations.taxRequired');
+            case 'hold':
+                return translate('violations.hold');
             default:
                 // The interpreter should never get here because the switch cases should be exhaustive.
                 // If typescript is showing an error on the assertion below it means the switch statement is out of
diff --git a/src/libs/Violations/propTypes.ts b/src/libs/Violations/propTypes.ts
deleted file mode 100644
index 4b5e84405cba..000000000000
--- a/src/libs/Violations/propTypes.ts
+++ /dev/null
@@ -1,32 +0,0 @@
-import PropTypes from 'prop-types';
-import CONST from '@src/CONST';
-
-const violationNames = Object.values(CONST.VIOLATIONS);
-
-const transactionViolationPropType = PropTypes.shape({
-    type: PropTypes.string.isRequired,
-    name: PropTypes.oneOf(violationNames).isRequired,
-    data: PropTypes.shape({
-        rejectedBy: PropTypes.string,
-        rejectReason: PropTypes.string,
-        amount: PropTypes.string,
-        surcharge: PropTypes.number,
-        invoiceMarkup: PropTypes.number,
-        maxAge: PropTypes.number,
-        tagName: PropTypes.string,
-        formattedLimitAmount: PropTypes.string,
-        categoryLimit: PropTypes.string,
-        limit: PropTypes.string,
-        category: PropTypes.string,
-        brokenBankConnection: PropTypes.bool,
-        isAdmin: PropTypes.bool,
-        email: PropTypes.string,
-        isTransactionOlderThan7Days: PropTypes.bool,
-        member: PropTypes.string,
-        taxName: PropTypes.string,
-    }),
-});
-
-const transactionViolationsPropType = PropTypes.objectOf(PropTypes.arrayOf(transactionViolationPropType));
-
-export {transactionViolationsPropType, transactionViolationPropType};
diff --git a/src/libs/WorkflowUtils.ts b/src/libs/WorkflowUtils.ts
new file mode 100644
index 000000000000..88e420dfaf7e
--- /dev/null
+++ b/src/libs/WorkflowUtils.ts
@@ -0,0 +1,217 @@
+import lodashMapKeys from 'lodash/mapKeys';
+import type {ValueOf} from 'type-fest';
+import CONST from '@src/CONST';
+import type {ApprovalWorkflowOnyx, Approver, Member} from '@src/types/onyx/ApprovalWorkflow';
+import type ApprovalWorkflow from '@src/types/onyx/ApprovalWorkflow';
+import type {PersonalDetailsList} from '@src/types/onyx/PersonalDetails';
+import type {PolicyEmployeeList} from '@src/types/onyx/PolicyEmployee';
+
+const INITIAL_APPROVAL_WORKFLOW: ApprovalWorkflowOnyx = {
+    members: [],
+    approvers: [],
+    availableMembers: [],
+    usedApproverEmails: [],
+    isDefault: false,
+    action: CONST.APPROVAL_WORKFLOW.ACTION.CREATE,
+    isLoading: false,
+};
+
+type GetApproversParams = {
+    /**
+     * List of employees in the policy
+     */
+    employees: PolicyEmployeeList;
+
+    /**
+     * Personal details of the employees where the key is the email
+     */
+    personalDetailsByEmail: PersonalDetailsList;
+
+    /**
+     * Email of the first approver
+     */
+    firstEmail: string;
+};
+
+/** Get the list of approvers for a given email */
+function calculateApprovers({employees, firstEmail, personalDetailsByEmail}: GetApproversParams): Approver[] {
+    const approvers: Approver[] = [];
+    // Keep track of approver emails to detect circular references
+    const currentApproverEmails = new Set<string>();
+
+    let nextEmail: string | undefined = firstEmail;
+    while (nextEmail) {
+        if (!employees[nextEmail]) {
+            break;
+        }
+
+        const isCircularReference = currentApproverEmails.has(nextEmail);
+        approvers.push({
+            email: nextEmail,
+            forwardsTo: employees[nextEmail].forwardsTo,
+            avatar: personalDetailsByEmail[nextEmail]?.avatar,
+            displayName: personalDetailsByEmail[nextEmail]?.displayName ?? nextEmail,
+            isCircularReference,
+        });
+
+        // If we've already seen this approver, break to prevent infinite loop
+        if (isCircularReference) {
+            break;
+        }
+        currentApproverEmails.add(nextEmail);
+
+        // If there is a forwardsTo, set the next approver to the forwardsTo
+        nextEmail = employees[nextEmail].forwardsTo;
+    }
+
+    return approvers;
+}
+
+type PolicyConversionParams = {
+    /**
+     * List of employees in the policy
+     */
+    employees: PolicyEmployeeList;
+
+    /**
+     * Personal details of the employees
+     */
+    personalDetails: PersonalDetailsList;
+
+    /**
+     * Email of the default approver for the policy
+     */
+    defaultApprover: string;
+
+    /**
+     * Email of the first approver in current edited workflow
+     */
+    firstApprover?: string;
+};
+
+type PolicyConversionResult = {
+    /**
+     * List of approval workflows
+     */
+    approvalWorkflows: ApprovalWorkflow[];
+
+    /**
+     * List of available members that can be selected in the workflow
+     */
+    availableMembers: Member[];
+
+    /**
+     * Emails that are used as approvers in currently configured workflows
+     */
+    usedApproverEmails: string[];
+};
+
+/** Convert a list of policy employees to a list of approval workflows */
+function convertPolicyEmployeesToApprovalWorkflows({employees, defaultApprover, personalDetails, firstApprover}: PolicyConversionParams): PolicyConversionResult {
+    const approvalWorkflows: Record<string, ApprovalWorkflow> = {};
+
+    // Keep track of used approver emails to display hints in the UI
+    const usedApproverEmails = new Set<string>();
+    const personalDetailsByEmail = lodashMapKeys(personalDetails, (value, key) => value?.login ?? key);
+
+    // Add each employee to the appropriate workflow
+    Object.values(employees).forEach((employee) => {
+        const {email, submitsTo} = employee;
+        if (!email || !submitsTo) {
+            return;
+        }
+
+        const member: Member = {email, avatar: personalDetailsByEmail[email]?.avatar, displayName: personalDetailsByEmail[email]?.displayName ?? email};
+        if (!approvalWorkflows[submitsTo]) {
+            const approvers = calculateApprovers({employees, firstEmail: submitsTo, personalDetailsByEmail});
+            if (submitsTo !== firstApprover) {
+                approvers.forEach((approver) => usedApproverEmails.add(approver.email));
+            }
+
+            approvalWorkflows[submitsTo] = {
+                members: [],
+                approvers,
+                isDefault: defaultApprover === submitsTo,
+            };
+        }
+        approvalWorkflows[submitsTo].members.push(member);
+    });
+
+    // Sort the workflows by the first approver's name (default workflow has priority)
+    const sortedApprovalWorkflows = Object.values(approvalWorkflows).sort((a, b) => {
+        if (a.isDefault) {
+            return -1;
+        }
+
+        if (b.isDefault) {
+            return 1;
+        }
+
+        return (a.approvers[0]?.displayName ?? '-1').localeCompare(b.approvers[0]?.displayName ?? '-1');
+    });
+
+    // Add a default workflow if one doesn't exist (no employees submit to the default approver)
+    const firstWorkflow = sortedApprovalWorkflows.at(0);
+    if (firstWorkflow && !firstWorkflow.isDefault) {
+        sortedApprovalWorkflows.unshift({
+            members: [],
+            approvers: calculateApprovers({employees, firstEmail: defaultApprover, personalDetailsByEmail}),
+            isDefault: true,
+        });
+    }
+
+    return {approvalWorkflows: sortedApprovalWorkflows, usedApproverEmails: [...usedApproverEmails], availableMembers: sortedApprovalWorkflows.at(0)?.members ?? []};
+}
+
+type ConvertApprovalWorkflowToPolicyEmployeesParams = {
+    /**
+     * Approval workflow to convert
+     */
+    approvalWorkflow: ApprovalWorkflow;
+
+    /**
+     * Members to remove from the approval workflow
+     */
+    membersToRemove?: Member[];
+
+    /**
+     * Mode to use when converting the approval workflow
+     */
+    type: ValueOf<typeof CONST.APPROVAL_WORKFLOW.TYPE>;
+};
+
+/** Convert an approval workflow to a list of policy employees */
+function convertApprovalWorkflowToPolicyEmployees({approvalWorkflow, membersToRemove, type}: ConvertApprovalWorkflowToPolicyEmployeesParams): PolicyEmployeeList {
+    const updatedEmployeeList: PolicyEmployeeList = {};
+    const firstApprover = approvalWorkflow.approvers.at(0);
+
+    if (!firstApprover) {
+        throw new Error('Approval workflow must have at least one approver');
+    }
+
+    approvalWorkflow.approvers.forEach((approver, index) => {
+        const nextApprover = approvalWorkflow.approvers.at(index + 1);
+        updatedEmployeeList[approver.email] = {
+            email: approver.email,
+            forwardsTo: type === CONST.APPROVAL_WORKFLOW.TYPE.REMOVE ? '' : nextApprover?.email ?? '',
+        };
+    });
+
+    approvalWorkflow.members.forEach(({email}) => {
+        updatedEmployeeList[email] = {
+            ...(updatedEmployeeList[email] ? updatedEmployeeList[email] : {email}),
+            submitsTo: type === CONST.APPROVAL_WORKFLOW.TYPE.REMOVE ? '' : firstApprover.email ?? '',
+        };
+    });
+
+    membersToRemove?.forEach(({email}) => {
+        updatedEmployeeList[email] = {
+            ...(updatedEmployeeList[email] ? updatedEmployeeList[email] : {email}),
+            submitsTo: '',
+        };
+    });
+
+    return updatedEmployeeList;
+}
+
+export {calculateApprovers, convertPolicyEmployeesToApprovalWorkflows, convertApprovalWorkflowToPolicyEmployees, INITIAL_APPROVAL_WORKFLOW};
diff --git a/src/libs/WorkspaceReportFieldUtils.ts b/src/libs/WorkspaceReportFieldUtils.ts
new file mode 100644
index 000000000000..b7d93b8dee3a
--- /dev/null
+++ b/src/libs/WorkspaceReportFieldUtils.ts
@@ -0,0 +1,89 @@
+import type {FormInputErrors} from '@components/Form/types';
+import CONST from '@src/CONST';
+import type {TranslationPaths} from '@src/languages/types';
+import type ONYXKEYS from '@src/ONYXKEYS';
+import type {InputID} from '@src/types/form/WorkspaceReportFieldForm';
+import type {PolicyReportField, PolicyReportFieldType} from '@src/types/onyx/Policy';
+import * as ErrorUtils from './ErrorUtils';
+import * as Localize from './Localize';
+import * as ValidationUtils from './ValidationUtils';
+
+/**
+ * Gets the translation key for the report field type.
+ */
+function getReportFieldTypeTranslationKey(reportFieldType: PolicyReportFieldType): TranslationPaths {
+    const typeTranslationKeysStrategy: Record<string, TranslationPaths> = {
+        [CONST.REPORT_FIELD_TYPES.TEXT]: 'workspace.reportFields.textType',
+        [CONST.REPORT_FIELD_TYPES.DATE]: 'workspace.reportFields.dateType',
+        [CONST.REPORT_FIELD_TYPES.LIST]: 'workspace.reportFields.dropdownType',
+    };
+
+    return typeTranslationKeysStrategy[reportFieldType];
+}
+
+/**
+ * Gets the translation key for the alternative text for the report field.
+ */
+function getReportFieldAlternativeTextTranslationKey(reportFieldType: PolicyReportFieldType): TranslationPaths {
+    const typeTranslationKeysStrategy: Record<string, TranslationPaths> = {
+        [CONST.REPORT_FIELD_TYPES.TEXT]: 'workspace.reportFields.textAlternateText',
+        [CONST.REPORT_FIELD_TYPES.DATE]: 'workspace.reportFields.dateAlternateText',
+        [CONST.REPORT_FIELD_TYPES.LIST]: 'workspace.reportFields.dropdownAlternateText',
+    };
+
+    return typeTranslationKeysStrategy[reportFieldType];
+}
+
+/**
+ * Validates the list value name.
+ */
+function validateReportFieldListValueName(
+    valueName: string,
+    priorValueName: string,
+    listValues: string[],
+    inputID: InputID,
+): FormInputErrors<typeof ONYXKEYS.FORMS.WORKSPACE_REPORT_FIELDS_FORM> {
+    const errors: FormInputErrors<typeof ONYXKEYS.FORMS.WORKSPACE_REPORT_FIELDS_FORM> = {};
+
+    if (!ValidationUtils.isRequiredFulfilled(valueName)) {
+        errors[inputID] = Localize.translateLocal('workspace.reportFields.listValueRequiredError');
+    } else if (priorValueName !== valueName && listValues.some((currentValueName) => currentValueName === valueName)) {
+        errors[inputID] = Localize.translateLocal('workspace.reportFields.existingListValueError');
+    } else if ([...valueName].length > CONST.WORKSPACE_REPORT_FIELD_POLICY_MAX_LENGTH) {
+        // Uses the spread syntax to count the number of Unicode code points instead of the number of UTF-16 code units.
+        ErrorUtils.addErrorMessage(
+            errors,
+            inputID,
+            Localize.translateLocal('common.error.characterLimitExceedCounter', {length: [...valueName].length, limit: CONST.WORKSPACE_REPORT_FIELD_POLICY_MAX_LENGTH}),
+        );
+    }
+
+    return errors;
+}
+/**
+ * Generates a field ID based on the field name.
+ */
+function generateFieldID(name: string) {
+    return `field_id_${name.replace(CONST.REGEX.ANY_SPACE, '_').toUpperCase()}`;
+}
+
+/**
+ * Gets the initial value for a report field.
+ */
+function getReportFieldInitialValue(reportField: PolicyReportField | null): string {
+    if (!reportField) {
+        return '';
+    }
+
+    if (reportField.type === CONST.REPORT_FIELD_TYPES.LIST) {
+        return reportField.defaultValue ?? '';
+    }
+
+    if (reportField.type === CONST.REPORT_FIELD_TYPES.DATE) {
+        return Localize.translateLocal('common.currentDate');
+    }
+
+    return reportField.value ?? reportField.defaultValue;
+}
+
+export {getReportFieldTypeTranslationKey, getReportFieldAlternativeTextTranslationKey, validateReportFieldListValueName, generateFieldID, getReportFieldInitialValue};
diff --git a/src/libs/WorkspacesSettingsUtils.ts b/src/libs/WorkspacesSettingsUtils.ts
index 6c57c2a6f99d..9b96c8404bf6 100644
--- a/src/libs/WorkspacesSettingsUtils.ts
+++ b/src/libs/WorkspacesSettingsUtils.ts
@@ -4,26 +4,20 @@ import type {ValueOf} from 'type-fest';
 import CONST from '@src/CONST';
 import type {TranslationPaths} from '@src/languages/types';
 import ONYXKEYS from '@src/ONYXKEYS';
-import type {Policy, ReimbursementAccount, Report, ReportActions} from '@src/types/onyx';
+import type {Policy, ReimbursementAccount, Report, ReportAction, ReportActions, TransactionViolations} from '@src/types/onyx';
 import type {Unit} from '@src/types/onyx/Policy';
 import * as CurrencyUtils from './CurrencyUtils';
 import type {Phrase, PhraseParameters} from './Localize';
 import * as OptionsListUtils from './OptionsListUtils';
-import {hasCustomUnitsError, hasEmployeeListError, hasPolicyError, hasTaxRateError} from './PolicyUtils';
+import {hasCustomUnitsError, hasEmployeeListError, hasPolicyError, hasSyncError, hasTaxRateError} from './PolicyUtils';
+import * as ReportActionsUtils from './ReportActionsUtils';
+import * as ReportConnection from './ReportConnection';
 import * as ReportUtils from './ReportUtils';
 
 type CheckingMethod = () => boolean;
 
-let allReports: OnyxCollection<Report>;
-
 type BrickRoad = ValueOf<typeof CONST.BRICK_ROAD_INDICATOR_STATUS> | undefined;
 
-Onyx.connect({
-    key: ONYXKEYS.COLLECTION.REPORT,
-    waitForCollectionCallback: true,
-    callback: (value) => (allReports = value),
-});
-
 let allPolicies: OnyxCollection<Policy>;
 
 Onyx.connect({
@@ -53,6 +47,20 @@ Onyx.connect({
     },
 });
 
+let allTransactionViolations: NonNullable<OnyxCollection<TransactionViolations>> = {};
+Onyx.connect({
+    key: ONYXKEYS.COLLECTION.TRANSACTION_VIOLATIONS,
+    waitForCollectionCallback: true,
+    callback: (value) => {
+        if (!value) {
+            allTransactionViolations = {};
+            return;
+        }
+
+        allTransactionViolations = value;
+    },
+});
+
 /**
  * @param altReportActions Replaces (local) allReportActions used within (local) function getWorkspacesBrickRoads
  * @returns BrickRoad for the policy passed as a param and optionally actionsByReport (if passed)
@@ -60,16 +68,32 @@ Onyx.connect({
 const getBrickRoadForPolicy = (report: Report, altReportActions?: OnyxCollection<ReportActions>): BrickRoad => {
     const reportActions = (altReportActions ?? allReportActions)?.[`${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${report.reportID}`] ?? {};
     const reportErrors = OptionsListUtils.getAllReportErrors(report, reportActions);
-    const doesReportContainErrors = Object.keys(reportErrors ?? {}).length !== 0 ? CONST.BRICK_ROAD_INDICATOR_STATUS.ERROR : undefined;
+    const oneTransactionThreadReportID = ReportActionsUtils.getOneTransactionThreadReportID(report.reportID, reportActions);
+    let doesReportContainErrors = Object.keys(reportErrors ?? {}).length !== 0 ? CONST.BRICK_ROAD_INDICATOR_STATUS.ERROR : undefined;
+
+    if (oneTransactionThreadReportID) {
+        const oneTransactionThreadReport = ReportUtils.getReport(oneTransactionThreadReportID);
+
+        if (
+            ReportUtils.shouldDisplayTransactionThreadViolations(
+                oneTransactionThreadReport,
+                allTransactionViolations,
+                reportActions[oneTransactionThreadReport?.parentReportActionID ?? '-1'],
+            )
+        ) {
+            doesReportContainErrors = CONST.BRICK_ROAD_INDICATOR_STATUS.ERROR;
+        }
+    }
+
     if (doesReportContainErrors) {
         return CONST.BRICK_ROAD_INDICATOR_STATUS.ERROR;
     }
 
     // To determine if the report requires attention from the current user, we need to load the parent report action
-    let itemParentReportAction = {};
+    let itemParentReportAction: OnyxEntry<ReportAction>;
     if (report.parentReportID) {
         const itemParentReportActions = allReportActions?.[`${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${report.parentReportID}`] ?? {};
-        itemParentReportAction = report.parentReportActionID ? itemParentReportActions[report.parentReportActionID] : {};
+        itemParentReportAction = report.parentReportActionID ? itemParentReportActions[report.parentReportActionID] : undefined;
     }
     const reportOption = {...report, isUnread: ReportUtils.isUnread(report), isUnreadWithMention: ReportUtils.isUnreadWithMention(report)};
     const shouldShowGreenDotIndicator = ReportUtils.requiresAttentionFromCurrentUser(reportOption, itemParentReportAction);
@@ -86,6 +110,7 @@ function hasGlobalWorkspaceSettingsRBR(policies: OnyxCollection<Policy>) {
         () => Object.values(cleanPolicies).some(hasCustomUnitsError),
         () => Object.values(cleanPolicies).some(hasTaxRateError),
         () => Object.values(cleanPolicies).some(hasEmployeeListError),
+        () => Object.values(cleanPolicies).some(hasSyncError),
         () => Object.keys(reimbursementAccount?.errors ?? {}).length > 0,
     ];
 
@@ -100,6 +125,7 @@ function hasWorkspaceSettingsRBR(policy: Policy) {
 }
 
 function getChatTabBrickRoad(policyID?: string): BrickRoad | undefined {
+    const allReports = ReportConnection.getAllReports();
     if (!allReports) {
         return undefined;
     }
diff --git a/src/libs/__mocks__/Permissions.ts b/src/libs/__mocks__/Permissions.ts
index 634626a507af..40fc9ea66317 100644
--- a/src/libs/__mocks__/Permissions.ts
+++ b/src/libs/__mocks__/Permissions.ts
@@ -1,3 +1,4 @@
+import type Permissions from '@libs/Permissions';
 import CONST from '@src/CONST';
 import type Beta from '@src/types/onyx/Beta';
 
@@ -9,7 +10,6 @@ import type Beta from '@src/types/onyx/Beta';
  */
 
 export default {
-    ...jest.requireActual('../Permissions'),
+    ...jest.requireActual<typeof Permissions>('../Permissions'),
     canUseDefaultRooms: (betas: Beta[]) => betas.includes(CONST.BETAS.DEFAULT_ROOMS),
-    canUseViolations: (betas: Beta[]) => betas.includes(CONST.BETAS.VIOLATIONS),
 };
diff --git a/src/libs/actions/App.ts b/src/libs/actions/App.ts
index ca145b73b32b..a0f60752913e 100644
--- a/src/libs/actions/App.ts
+++ b/src/libs/actions/App.ts
@@ -1,23 +1,16 @@
 // Issue - https://github.com/Expensify/App/issues/26719
-import Str from 'expensify-common/lib/str';
+import {Str} from 'expensify-common';
 import type {AppStateStatus} from 'react-native';
 import {AppState} from 'react-native';
 import type {OnyxCollection, OnyxEntry, OnyxUpdate} from 'react-native-onyx';
 import Onyx from 'react-native-onyx';
 import type {ValueOf} from 'type-fest';
+import {importEmojiLocale} from '@assets/emojis';
 import * as API from '@libs/API';
-import type {
-    GetMissingOnyxMessagesParams,
-    HandleRestrictedEventParams,
-    OpenAppParams,
-    OpenOldDotLinkParams,
-    OpenProfileParams,
-    ReconnectAppParams,
-    UpdatePreferredLocaleParams,
-} from '@libs/API/parameters';
+import type {GetMissingOnyxMessagesParams, HandleRestrictedEventParams, OpenAppParams, OpenOldDotLinkParams, ReconnectAppParams, UpdatePreferredLocaleParams} from '@libs/API/parameters';
 import {SIDE_EFFECT_REQUEST_COMMANDS, WRITE_COMMANDS} from '@libs/API/types';
 import * as Browser from '@libs/Browser';
-import DateUtils from '@libs/DateUtils';
+import {buildEmojisTrie} from '@libs/EmojiTrie';
 import Log from '@libs/Log';
 import getCurrentUrl from '@libs/Navigation/currentUrl';
 import Navigation from '@libs/Navigation/Navigation';
@@ -30,9 +23,8 @@ import type {OnyxKey} from '@src/ONYXKEYS';
 import type {Route} from '@src/ROUTES';
 import ROUTES from '@src/ROUTES';
 import type * as OnyxTypes from '@src/types/onyx';
-import type {SelectedTimezone} from '@src/types/onyx/PersonalDetails';
 import type {OnyxData} from '@src/types/onyx/Request';
-import * as Policy from './Policy';
+import * as Policy from './Policy/Policy';
 import * as Session from './Session';
 import Timing from './Timing';
 
@@ -42,30 +34,37 @@ type PolicyParamsForOpenOrReconnect = {
 
 type Locale = ValueOf<typeof CONST.LOCALES>;
 
-let currentUserAccountID: number | null;
+let currentUserAccountID: number | undefined;
 let currentUserEmail: string;
 Onyx.connect({
     key: ONYXKEYS.SESSION,
     callback: (val) => {
-        currentUserAccountID = val?.accountID ?? null;
+        currentUserAccountID = val?.accountID;
         currentUserEmail = val?.email ?? '';
     },
 });
 
-let isSidebarLoaded: boolean | null;
+let isSidebarLoaded: boolean | undefined;
 Onyx.connect({
     key: ONYXKEYS.IS_SIDEBAR_LOADED,
     callback: (val) => (isSidebarLoaded = val),
     initWithStoredValues: false,
 });
 
-let preferredLocale: string | null;
+let preferredLocale: string | undefined;
 Onyx.connect({
     key: ONYXKEYS.NVP_PREFERRED_LOCALE,
-    callback: (val) => (preferredLocale = val),
+    callback: (val) => {
+        preferredLocale = val;
+        if (preferredLocale) {
+            importEmojiLocale(preferredLocale as Locale).then(() => {
+                buildEmojisTrie(preferredLocale as Locale);
+            });
+        }
+    },
 });
 
-let priorityMode: ValueOf<typeof CONST.PRIORITY_MODE> | null;
+let priorityMode: ValueOf<typeof CONST.PRIORITY_MODE> | undefined;
 Onyx.connect({
     key: ONYXKEYS.NVP_PRIORITY_MODE,
     callback: (nextPriorityMode) => {
@@ -150,6 +149,10 @@ function setLocale(locale: Locale) {
         value: locale,
     };
 
+    importEmojiLocale(locale).then(() => {
+        buildEmojisTrie(locale);
+    });
+
     API.write(WRITE_COMMANDS.UPDATE_PREFERRED_LOCALE, parameters, {optimisticData});
 }
 
@@ -181,11 +184,11 @@ AppState.addEventListener('change', (nextAppState) => {
 function getPolicyParamsForOpenOrReconnect(): Promise<PolicyParamsForOpenOrReconnect> {
     return new Promise((resolve) => {
         isReadyToOpenApp.then(() => {
-            const connectionID = Onyx.connect({
+            const connection = Onyx.connect({
                 key: ONYXKEYS.COLLECTION.POLICY,
                 waitForCollectionCallback: true,
                 callback: (policies) => {
-                    Onyx.disconnect(connectionID);
+                    Onyx.disconnect(connection);
                     resolve({policyIDList: getNonOptimisticPolicyIDs(policies)});
                 },
             });
@@ -347,8 +350,9 @@ function endSignOnTransition() {
  * @param [policyName] Optional, custom policy name we will use for created workspace
  * @param [transitionFromOldDot] Optional, if the user is transitioning from old dot
  * @param [makeMeAdmin] Optional, leave the calling account as an admin on the policy
+ * @param [backTo] An optional return path. If provided, it will be URL-encoded and appended to the resulting URL.
  */
-function createWorkspaceWithPolicyDraftAndNavigateToIt(policyOwnerEmail = '', policyName = '', transitionFromOldDot = false, makeMeAdmin = false) {
+function createWorkspaceWithPolicyDraftAndNavigateToIt(policyOwnerEmail = '', policyName = '', transitionFromOldDot = false, makeMeAdmin = false, backTo = '') {
     const policyID = Policy.generatePolicyID();
     Policy.createDraftInitialWorkspace(policyOwnerEmail, policyName, policyID, makeMeAdmin);
 
@@ -358,7 +362,8 @@ function createWorkspaceWithPolicyDraftAndNavigateToIt(policyOwnerEmail = '', po
                 // We must call goBack() to remove the /transition route from history
                 Navigation.goBack();
             }
-            Navigation.navigate(ROUTES.WORKSPACE_INITIAL.getRoute(policyID));
+            savePolicyDraftByNewWorkspace(policyID, policyName, policyOwnerEmail, makeMeAdmin);
+            Navigation.navigate(ROUTES.WORKSPACE_INITIAL.getRoute(policyID, backTo));
         })
         .then(endSignOnTransition);
 }
@@ -396,7 +401,7 @@ function savePolicyDraftByNewWorkspace(policyID?: string, policyName?: string, p
  */
 function setUpPoliciesAndNavigate(session: OnyxEntry<OnyxTypes.Session>) {
     const currentUrl = getCurrentUrl();
-    if (!session || !currentUrl || !currentUrl.includes('exitTo')) {
+    if (!session || !currentUrl?.includes('exitTo')) {
         return;
     }
 
@@ -421,8 +426,6 @@ function setUpPoliciesAndNavigate(session: OnyxEntry<OnyxTypes.Session>) {
     if (!isLoggingInAsNewUser && exitTo) {
         Navigation.waitForProtectedRoutes()
             .then(() => {
-                // We must call goBack() to remove the /transition route from history
-                Navigation.goBack();
                 Navigation.navigate(exitTo);
             })
             .then(endSignOnTransition);
@@ -444,56 +447,10 @@ function redirectThirdPartyDesktopSignIn() {
     }
 }
 
-function openProfile(personalDetails: OnyxTypes.PersonalDetails) {
-    const oldTimezoneData = personalDetails.timezone ?? {};
-    let newTimezoneData = oldTimezoneData;
-
-    if (oldTimezoneData?.automatic ?? true) {
-        newTimezoneData = {
-            automatic: true,
-            selected: Intl.DateTimeFormat().resolvedOptions().timeZone as SelectedTimezone,
-        };
-    }
-
-    newTimezoneData = DateUtils.formatToSupportedTimezone(newTimezoneData);
-
-    const parameters: OpenProfileParams = {
-        timezone: JSON.stringify(newTimezoneData),
-    };
-
-    // We expect currentUserAccountID to be a number because it doesn't make sense to open profile if currentUserAccountID is not set
-    if (typeof currentUserAccountID === 'number') {
-        API.write(WRITE_COMMANDS.OPEN_PROFILE, parameters, {
-            optimisticData: [
-                {
-                    onyxMethod: Onyx.METHOD.MERGE,
-                    key: ONYXKEYS.PERSONAL_DETAILS_LIST,
-                    value: {
-                        [currentUserAccountID]: {
-                            timezone: newTimezoneData,
-                        },
-                    },
-                },
-            ],
-            failureData: [
-                {
-                    onyxMethod: Onyx.METHOD.MERGE,
-                    key: ONYXKEYS.PERSONAL_DETAILS_LIST,
-                    value: {
-                        [currentUserAccountID]: {
-                            timezone: oldTimezoneData,
-                        },
-                    },
-                },
-            ],
-        });
-    }
-}
-
 /**
  * @param shouldAuthenticateWithCurrentAccount Optional, indicates whether default authentication method (shortLivedAuthToken) should be used
  */
-function beginDeepLinkRedirect(shouldAuthenticateWithCurrentAccount = true) {
+function beginDeepLinkRedirect(shouldAuthenticateWithCurrentAccount = true, initialRoute?: string) {
     // There's no support for anonymous users on desktop
     if (Session.isAnonymousUser()) {
         return;
@@ -519,7 +476,7 @@ function beginDeepLinkRedirect(shouldAuthenticateWithCurrentAccount = true) {
             return;
         }
 
-        Browser.openRouteInDesktopApp(response.shortLivedAuthToken, currentUserEmail);
+        Browser.openRouteInDesktopApp(response.shortLivedAuthToken, currentUserEmail, initialRoute);
     });
 }
 
@@ -540,12 +497,15 @@ function updateLastVisitedPath(path: string) {
     Onyx.merge(ONYXKEYS.LAST_VISITED_PATH, path);
 }
 
+function updateLastRoute(screen: string) {
+    Onyx.set(ONYXKEYS.LAST_ROUTE, screen);
+}
+
 export {
     setLocale,
     setLocaleAndNavigate,
     setSidebarLoaded,
     setUpPoliciesAndNavigate,
-    openProfile,
     redirectThirdPartyDesktopSignIn,
     openApp,
     reconnectApp,
@@ -558,5 +518,6 @@ export {
     savePolicyDraftByNewWorkspace,
     createWorkspaceWithPolicyDraftAndNavigateToIt,
     updateLastVisitedPath,
+    updateLastRoute,
     KEYS_TO_PRESERVE,
 };
diff --git a/src/libs/actions/AppUpdate/updateApp/index.android.ts b/src/libs/actions/AppUpdate/updateApp/index.android.ts
index 7b0022b3e970..3f2cde77f466 100644
--- a/src/libs/actions/AppUpdate/updateApp/index.android.ts
+++ b/src/libs/actions/AppUpdate/updateApp/index.android.ts
@@ -1,6 +1,6 @@
-import {Linking} from 'react-native';
+import {Linking, NativeModules} from 'react-native';
 import CONST from '@src/CONST';
 
 export default function updateApp() {
-    Linking.openURL(CONST.APP_DOWNLOAD_LINKS.ANDROID);
+    Linking.openURL(NativeModules.HybridAppModule ? CONST.APP_DOWNLOAD_LINKS.OLD_DOT_ANDROID : CONST.APP_DOWNLOAD_LINKS.ANDROID);
 }
diff --git a/src/libs/actions/AppUpdate/updateApp/index.ios.ts b/src/libs/actions/AppUpdate/updateApp/index.ios.ts
index 59f25888de11..930a57881128 100644
--- a/src/libs/actions/AppUpdate/updateApp/index.ios.ts
+++ b/src/libs/actions/AppUpdate/updateApp/index.ios.ts
@@ -1,6 +1,6 @@
-import {Linking} from 'react-native';
+import {Linking, NativeModules} from 'react-native';
 import CONST from '@src/CONST';
 
 export default function updateApp() {
-    Linking.openURL(CONST.APP_DOWNLOAD_LINKS.IOS);
+    Linking.openURL(NativeModules.HybridAppModule ? CONST.APP_DOWNLOAD_LINKS.OLD_DOT_IOS : CONST.APP_DOWNLOAD_LINKS.IOS);
 }
diff --git a/src/libs/actions/BankAccounts.ts b/src/libs/actions/BankAccounts.ts
index cddb2c371a60..a7b4f6703f8f 100644
--- a/src/libs/actions/BankAccounts.ts
+++ b/src/libs/actions/BankAccounts.ts
@@ -1,4 +1,3 @@
-import type {OnyxEntry} from 'react-native-onyx';
 import Onyx from 'react-native-onyx';
 import type {FormInputErrors, FormOnyxValues} from '@components/Form/types';
 import type {OnfidoDataWithApplicantID} from '@components/Onfido/types';
@@ -14,6 +13,7 @@ import type {
 } from '@libs/API/parameters';
 import {READ_COMMANDS, WRITE_COMMANDS} from '@libs/API/types';
 import * as ErrorUtils from '@libs/ErrorUtils';
+import * as Localize from '@libs/Localize';
 import Navigation from '@libs/Navigation/Navigation';
 import CONST from '@src/CONST';
 import ONYXKEYS from '@src/ONYXKEYS';
@@ -22,7 +22,7 @@ import type {Route} from '@src/ROUTES';
 import type {PersonalBankAccountForm} from '@src/types/form';
 import type {ACHContractStepProps, BeneficialOwnersStepProps, CompanyStepProps, RequestorStepProps} from '@src/types/form/ReimbursementAccountForm';
 import type PlaidBankAccount from '@src/types/onyx/PlaidBankAccount';
-import type {BankAccountStep, BankAccountSubStep} from '@src/types/onyx/ReimbursementAccount';
+import type {BankAccountStep, ReimbursementAccountStep, ReimbursementAccountSubStep} from '@src/types/onyx/ReimbursementAccount';
 import type {OnyxData} from '@src/types/onyx/Request';
 import * as ReimbursementAccount from './ReimbursementAccount';
 
@@ -40,10 +40,6 @@ export {
 export {openPlaidBankAccountSelector, openPlaidBankLogin} from './Plaid';
 export {openOnfidoFlow, answerQuestionsForWallet, verifyIdentity, acceptWalletTerms} from './Wallet';
 
-type ReimbursementAccountStep = BankAccountStep | '';
-
-type ReimbursementAccountSubStep = BankAccountSubStep | '';
-
 type AccountFormValues = typeof ONYXKEYS.FORMS.PERSONAL_BANK_ACCOUNT_FORM | typeof ONYXKEYS.FORMS.REIMBURSEMENT_ACCOUNT_FORM;
 
 type BusinessAddress = {
@@ -70,7 +66,7 @@ function openPlaidView() {
     clearPlaid().then(() => ReimbursementAccount.setBankAccountSubStep(CONST.BANK_ACCOUNT.SETUP_TYPE.PLAID));
 }
 
-function setPlaidEvent(eventName: OnyxEntry<string>) {
+function setPlaidEvent(eventName: string | null) {
     Onyx.set(ONYXKEYS.PLAID_CURRENT_EVENT, eventName);
 }
 
@@ -87,10 +83,9 @@ function openPersonalBankAccountSetupView(exitReportID?: string) {
 }
 
 /**
- * TODO: remove the previous function and rename this function to openPersonalBankAccountSetupView after migrating to the new flow
- * Open the personal bank account setup flow, with an optional exitReportID to redirect to once the flow is finished.
+ * Open the personal bank account setup flow using Plaid, with an optional exitReportID to redirect to once the flow is finished.
  */
-function openPersonalBankAccountSetupViewRefactor(exitReportID?: string) {
+function openPersonalBankAccountSetupWithPlaid(exitReportID?: string) {
     clearPlaid().then(() => {
         if (exitReportID) {
             Onyx.merge(ONYXKEYS.PERSONAL_BANK_ACCOUNT, {exitReportID});
@@ -163,7 +158,7 @@ function getVBBADataForOnyx(currentStep?: BankAccountStep): OnyxData {
                 key: ONYXKEYS.REIMBURSEMENT_ACCOUNT,
                 value: {
                     isLoading: false,
-                    errors: ErrorUtils.getMicroSecondOnyxError('walletPage.addBankAccountFailure'),
+                    errors: ErrorUtils.getMicroSecondOnyxErrorWithTranslationKey('walletPage.addBankAccountFailure'),
                 },
             },
         ],
@@ -232,6 +227,13 @@ function addPersonalBankAccount(account: PlaidBankAccount) {
                     shouldShowSuccess: true,
                 },
             },
+            {
+                onyxMethod: Onyx.METHOD.MERGE,
+                key: ONYXKEYS.USER_WALLET,
+                value: {
+                    currentStep: CONST.WALLET.STEP.ADDITIONAL_DETAILS,
+                },
+            },
         ],
         failureData: [
             {
@@ -239,7 +241,7 @@ function addPersonalBankAccount(account: PlaidBankAccount) {
                 key: ONYXKEYS.PERSONAL_BANK_ACCOUNT,
                 value: {
                     isLoading: false,
-                    errors: ErrorUtils.getMicroSecondOnyxError('walletPage.addBankAccountFailure'),
+                    errors: ErrorUtils.getMicroSecondOnyxErrorWithTranslationKey('walletPage.addBankAccountFailure'),
                 },
             },
         ],
@@ -329,6 +331,7 @@ function validateBankAccount(bankAccountID: number, validateCode: string, policy
                 key: ONYXKEYS.REIMBURSEMENT_ACCOUNT,
                 value: {
                     isLoading: false,
+                    errors: ErrorUtils.getMicroSecondOnyxErrorWithTranslationKey('bankAccount.error.validationAmounts'),
                 },
             },
         ],
@@ -466,7 +469,7 @@ function verifyIdentityForBankAccount(bankAccountID: number, onfidoData: OnfidoD
     const parameters: VerifyIdentityForBankAccountParams = {
         bankAccountID,
         onfidoData: JSON.stringify(onfidoData),
-        policyID: policyID ?? '',
+        policyID: policyID ?? '-1',
     };
 
     API.write(WRITE_COMMANDS.VERIFY_IDENTITY_FOR_BANK_ACCOUNT, parameters, getVBBADataForOnyx());
@@ -532,7 +535,7 @@ function validatePlaidSelection(values: FormOnyxValues<AccountFormValues>): Form
     const errorFields: FormInputErrors<AccountFormValues> = {};
 
     if (!values.selectedPlaidAccountID) {
-        errorFields.selectedPlaidAccountID = 'bankAccount.error.youNeedToSelectAnOption';
+        errorFields.selectedPlaidAccountID = Localize.translateLocal('bankAccount.error.youNeedToSelectAnOption');
     }
 
     return errorFields;
@@ -562,7 +565,7 @@ export {
     validateBankAccount,
     verifyIdentityForBankAccount,
     setReimbursementAccountLoading,
-    openPersonalBankAccountSetupViewRefactor,
+    openPersonalBankAccountSetupWithPlaid,
     updateAddPersonalBankAccountDraft,
     clearPersonalBankAccountSetupType,
     validatePlaidSelection,
diff --git a/src/libs/actions/Card.ts b/src/libs/actions/Card.ts
index 756ef902d913..d9229cf4bae2 100644
--- a/src/libs/actions/Card.ts
+++ b/src/libs/actions/Card.ts
@@ -1,14 +1,41 @@
 import Onyx from 'react-native-onyx';
 import type {OnyxUpdate} from 'react-native-onyx';
+import type {ValueOf} from 'type-fest';
 import * as API from '@libs/API';
-import type {ActivatePhysicalExpensifyCardParams, ReportVirtualExpensifyCardFraudParams, RequestReplacementExpensifyCardParams, RevealExpensifyCardDetailsParams} from '@libs/API/parameters';
-import {SIDE_EFFECT_REQUEST_COMMANDS, WRITE_COMMANDS} from '@libs/API/types';
+import type {
+    ActivatePhysicalExpensifyCardParams,
+    CardDeactivateParams,
+    OpenCardDetailsPageParams,
+    ReportVirtualExpensifyCardFraudParams,
+    RequestReplacementExpensifyCardParams,
+    RevealExpensifyCardDetailsParams,
+    StartIssueNewCardFlowParams,
+    UpdateExpensifyCardLimitParams,
+    UpdateExpensifyCardLimitTypeParams,
+    UpdateExpensifyCardTitleParams,
+} from '@libs/API/parameters';
+import {READ_COMMANDS, SIDE_EFFECT_REQUEST_COMMANDS, WRITE_COMMANDS} from '@libs/API/types';
+import * as ErrorUtils from '@libs/ErrorUtils';
+import * as NetworkStore from '@libs/Network/NetworkStore';
 import CONST from '@src/CONST';
 import ONYXKEYS from '@src/ONYXKEYS';
-import type {Response} from '@src/types/onyx';
+import type {Card} from '@src/types/onyx';
+import type {CardLimitType, ExpensifyCardDetails, IssueNewCardData, IssueNewCardStep} from '@src/types/onyx/Card';
+import type {ConnectionName} from '@src/types/onyx/Policy';
 
 type ReplacementReason = 'damaged' | 'stolen';
 
+type IssueNewCardFlowData = {
+    /** Step to be set in Onyx */
+    step?: IssueNewCardStep;
+
+    /** Whether the user is editing step */
+    isEditing?: boolean;
+
+    /** Data required to be sent to issue a new card */
+    data?: Partial<IssueNewCardData>;
+};
+
 function reportVirtualExpensifyCardFraud(cardID: number) {
     const optimisticData: OnyxUpdate[] = [
         {
@@ -44,7 +71,11 @@ function reportVirtualExpensifyCardFraud(cardID: number) {
         cardID,
     };
 
-    API.write(WRITE_COMMANDS.REPORT_VIRTUAL_EXPENSIFY_CARD_FRAUD, parameters, {optimisticData, successData, failureData});
+    API.write(WRITE_COMMANDS.REPORT_VIRTUAL_EXPENSIFY_CARD_FRAUD, parameters, {
+        optimisticData,
+        successData,
+        failureData,
+    });
 }
 
 /**
@@ -89,7 +120,11 @@ function requestReplacementExpensifyCard(cardID: number, reason: ReplacementReas
         reason,
     };
 
-    API.write(WRITE_COMMANDS.REQUEST_REPLACEMENT_EXPENSIFY_CARD, parameters, {optimisticData, successData, failureData});
+    API.write(WRITE_COMMANDS.REQUEST_REPLACEMENT_EXPENSIFY_CARD, parameters, {
+        optimisticData,
+        successData,
+        failureData,
+    });
 }
 
 /**
@@ -158,7 +193,7 @@ function clearCardListErrors(cardID: number) {
  *
  * @returns promise with card details object
  */
-function revealVirtualCardDetails(cardID: number): Promise<Response> {
+function revealVirtualCardDetails(cardID: number): Promise<ExpensifyCardDetails> {
     return new Promise((resolve, reject) => {
         const parameters: RevealExpensifyCardDetailsParams = {cardID};
 
@@ -170,12 +205,476 @@ function revealVirtualCardDetails(cardID: number): Promise<Response> {
                     reject('cardPage.cardDetailsLoadingFailure');
                     return;
                 }
-                resolve(response);
+                resolve(response as ExpensifyCardDetails);
             })
             // eslint-disable-next-line prefer-promise-reject-errors
             .catch(() => reject('cardPage.cardDetailsLoadingFailure'));
     });
 }
 
-export {requestReplacementExpensifyCard, activatePhysicalExpensifyCard, clearCardListErrors, reportVirtualExpensifyCardFraud, revealVirtualCardDetails};
+function updateSettlementFrequency(workspaceAccountID: number, settlementFrequency: ValueOf<typeof CONST.EXPENSIFY_CARD.FREQUENCY_SETTING>, currentFrequency?: Date) {
+    const monthlySettlementDate = settlementFrequency === CONST.EXPENSIFY_CARD.FREQUENCY_SETTING.DAILY ? null : new Date();
+
+    const optimisticData: OnyxUpdate[] = [
+        {
+            onyxMethod: Onyx.METHOD.MERGE,
+            key: `${ONYXKEYS.COLLECTION.PRIVATE_EXPENSIFY_CARD_SETTINGS}${workspaceAccountID}`,
+            value: {
+                monthlySettlementDate,
+            },
+        },
+    ];
+
+    const successData: OnyxUpdate[] = [
+        {
+            onyxMethod: Onyx.METHOD.MERGE,
+            key: `${ONYXKEYS.COLLECTION.PRIVATE_EXPENSIFY_CARD_SETTINGS}${workspaceAccountID}`,
+            value: {
+                monthlySettlementDate,
+            },
+        },
+    ];
+
+    const failureData: OnyxUpdate[] = [
+        {
+            onyxMethod: Onyx.METHOD.MERGE,
+            key: `${ONYXKEYS.COLLECTION.PRIVATE_EXPENSIFY_CARD_SETTINGS}${workspaceAccountID}`,
+            value: {
+                monthlySettlementDate: currentFrequency,
+            },
+        },
+    ];
+
+    const parameters = {
+        workspaceAccountID,
+        settlementFrequency,
+    };
+
+    API.write(WRITE_COMMANDS.UPDATE_CARD_SETTLEMENT_FREQUENCY, parameters, {optimisticData, successData, failureData});
+}
+
+function updateSettlementAccount(workspaceAccountID: number, domainName: string, settlementBankAccountID?: number, currentSettlementBankAccountID?: number) {
+    if (!settlementBankAccountID) {
+        return;
+    }
+
+    const optimisticData: OnyxUpdate[] = [
+        {
+            onyxMethod: Onyx.METHOD.MERGE,
+            key: `${ONYXKEYS.COLLECTION.PRIVATE_EXPENSIFY_CARD_SETTINGS}${workspaceAccountID}`,
+            value: {
+                paymentBankAccountID: settlementBankAccountID,
+            },
+        },
+    ];
+
+    const successData: OnyxUpdate[] = [
+        {
+            onyxMethod: Onyx.METHOD.MERGE,
+            key: `${ONYXKEYS.COLLECTION.PRIVATE_EXPENSIFY_CARD_SETTINGS}${workspaceAccountID}`,
+            value: {
+                paymentBankAccountID: settlementBankAccountID,
+            },
+        },
+    ];
+
+    const failureData: OnyxUpdate[] = [
+        {
+            onyxMethod: Onyx.METHOD.MERGE,
+            key: `${ONYXKEYS.COLLECTION.PRIVATE_EXPENSIFY_CARD_SETTINGS}${workspaceAccountID}`,
+            value: {
+                paymentBankAccountID: currentSettlementBankAccountID,
+            },
+        },
+    ];
+
+    const parameters = {
+        domainName,
+        settlementBankAccountID,
+    };
+
+    API.write(WRITE_COMMANDS.UPDATE_CARD_SETTLEMENT_ACCOUNT, parameters, {optimisticData, successData, failureData});
+}
+
+function setIssueNewCardStepAndData({data, isEditing, step}: IssueNewCardFlowData) {
+    Onyx.merge(ONYXKEYS.ISSUE_NEW_EXPENSIFY_CARD, {data, isEditing, currentStep: step});
+}
+
+function clearIssueNewCardFlow() {
+    Onyx.set(ONYXKEYS.ISSUE_NEW_EXPENSIFY_CARD, {
+        currentStep: null,
+        data: {},
+    });
+}
+
+function updateExpensifyCardLimit(workspaceAccountID: number, cardID: number, newLimit: number, newAvailableSpend: number, oldLimit?: number, oldAvailableSpend?: number) {
+    const authToken = NetworkStore.getAuthToken();
+
+    if (!authToken) {
+        return;
+    }
+
+    const optimisticData: OnyxUpdate[] = [
+        {
+            onyxMethod: Onyx.METHOD.MERGE,
+            key: `${ONYXKEYS.COLLECTION.WORKSPACE_CARDS_LIST}${workspaceAccountID}_${CONST.EXPENSIFY_CARD.BANK}`,
+            value: {
+                [cardID]: {
+                    availableSpend: newAvailableSpend,
+                    nameValuePairs: {
+                        unapprovedExpenseLimit: newLimit,
+                    },
+                    isLoading: true,
+                    errors: null,
+                },
+            },
+        },
+    ];
+
+    const successData: OnyxUpdate[] = [
+        {
+            onyxMethod: Onyx.METHOD.MERGE,
+            key: `${ONYXKEYS.COLLECTION.WORKSPACE_CARDS_LIST}${workspaceAccountID}_${CONST.EXPENSIFY_CARD.BANK}`,
+            value: {
+                [cardID]: {
+                    isLoading: false,
+                },
+            },
+        },
+    ];
+
+    const failureData: OnyxUpdate[] = [
+        {
+            onyxMethod: Onyx.METHOD.MERGE,
+            key: `${ONYXKEYS.COLLECTION.WORKSPACE_CARDS_LIST}${workspaceAccountID}_${CONST.EXPENSIFY_CARD.BANK}`,
+            value: {
+                [cardID]: {
+                    availableSpend: oldAvailableSpend,
+                    nameValuePairs: {
+                        unapprovedExpenseLimit: oldLimit,
+                    },
+                    isLoading: false,
+                    errors: ErrorUtils.getMicroSecondOnyxErrorWithTranslationKey('common.genericErrorMessage'),
+                },
+            },
+        },
+    ];
+
+    const parameters: UpdateExpensifyCardLimitParams = {
+        authToken,
+        cardID,
+        limit: newLimit,
+    };
+
+    API.write(WRITE_COMMANDS.UPDATE_EXPENSIFY_CARD_LIMIT, parameters, {optimisticData, successData, failureData});
+}
+
+function updateExpensifyCardTitle(workspaceAccountID: number, cardID: number, newCardTitle: string, oldCardTitle?: string) {
+    const authToken = NetworkStore.getAuthToken();
+
+    if (!authToken) {
+        return;
+    }
+
+    const optimisticData: OnyxUpdate[] = [
+        {
+            onyxMethod: Onyx.METHOD.MERGE,
+            key: `${ONYXKEYS.COLLECTION.WORKSPACE_CARDS_LIST}${workspaceAccountID}_${CONST.EXPENSIFY_CARD.BANK}`,
+            value: {
+                [cardID]: {
+                    nameValuePairs: {
+                        cardTitle: newCardTitle,
+                    },
+                    isLoading: true,
+                    errors: null,
+                },
+            },
+        },
+    ];
+
+    const successData: OnyxUpdate[] = [
+        {
+            onyxMethod: Onyx.METHOD.MERGE,
+            key: `${ONYXKEYS.COLLECTION.WORKSPACE_CARDS_LIST}${workspaceAccountID}_${CONST.EXPENSIFY_CARD.BANK}`,
+            value: {
+                [cardID]: {
+                    isLoading: false,
+                },
+            },
+        },
+    ];
+
+    const failureData: OnyxUpdate[] = [
+        {
+            onyxMethod: Onyx.METHOD.MERGE,
+            key: `${ONYXKEYS.COLLECTION.WORKSPACE_CARDS_LIST}${workspaceAccountID}_${CONST.EXPENSIFY_CARD.BANK}`,
+            value: {
+                [cardID]: {
+                    nameValuePairs: {
+                        cardTitle: oldCardTitle,
+                    },
+                    isLoading: false,
+                    errors: ErrorUtils.getMicroSecondOnyxErrorWithTranslationKey('common.genericErrorMessage'),
+                },
+            },
+        },
+    ];
+
+    const parameters: UpdateExpensifyCardTitleParams = {
+        authToken,
+        cardID,
+        cardTitle: newCardTitle,
+    };
+
+    API.write(WRITE_COMMANDS.UPDATE_EXPENSIFY_CARD_TITLE, parameters, {optimisticData, successData, failureData});
+}
+
+function updateExpensifyCardLimitType(workspaceAccountID: number, cardID: number, newLimitType: CardLimitType, oldLimitType?: CardLimitType) {
+    const authToken = NetworkStore.getAuthToken();
+
+    if (!authToken) {
+        return;
+    }
+
+    const optimisticData: OnyxUpdate[] = [
+        {
+            onyxMethod: Onyx.METHOD.MERGE,
+            key: `${ONYXKEYS.COLLECTION.WORKSPACE_CARDS_LIST}${workspaceAccountID}_${CONST.EXPENSIFY_CARD.BANK}`,
+            value: {
+                [cardID]: {
+                    nameValuePairs: {
+                        limitType: newLimitType,
+                    },
+                    isLoading: true,
+                    errors: null,
+                },
+            },
+        },
+    ];
+
+    const successData: OnyxUpdate[] = [
+        {
+            onyxMethod: Onyx.METHOD.MERGE,
+            key: `${ONYXKEYS.COLLECTION.WORKSPACE_CARDS_LIST}${workspaceAccountID}_${CONST.EXPENSIFY_CARD.BANK}`,
+            value: {
+                [cardID]: {
+                    isLoading: false,
+                },
+            },
+        },
+    ];
+
+    const failureData: OnyxUpdate[] = [
+        {
+            onyxMethod: Onyx.METHOD.MERGE,
+            key: `${ONYXKEYS.COLLECTION.WORKSPACE_CARDS_LIST}${workspaceAccountID}_${CONST.EXPENSIFY_CARD.BANK}`,
+            value: {
+                [cardID]: {
+                    nameValuePairs: {
+                        limitType: oldLimitType,
+                    },
+                    isLoading: false,
+                    errors: ErrorUtils.getMicroSecondOnyxErrorWithTranslationKey('common.genericErrorMessage'),
+                },
+            },
+        },
+    ];
+
+    const parameters: UpdateExpensifyCardLimitTypeParams = {
+        authToken,
+        cardID,
+        limitType: newLimitType,
+    };
+
+    API.write(WRITE_COMMANDS.UPDATE_EXPENSIFY_CARD_LIMIT_TYPE, parameters, {optimisticData, successData, failureData});
+}
+
+function deactivateCard(workspaceAccountID: number, card?: Card) {
+    const authToken = NetworkStore.getAuthToken();
+    const cardID = card?.cardID ?? -1;
+
+    if (!authToken) {
+        return;
+    }
+
+    const optimisticData: OnyxUpdate[] = [
+        {
+            onyxMethod: Onyx.METHOD.MERGE,
+            key: `${ONYXKEYS.COLLECTION.WORKSPACE_CARDS_LIST}${workspaceAccountID}_${CONST.EXPENSIFY_CARD.BANK}`,
+            value: {
+                [cardID]: null,
+            },
+        },
+    ];
+
+    const failureData: OnyxUpdate[] = [
+        {
+            onyxMethod: Onyx.METHOD.MERGE,
+            key: `${ONYXKEYS.COLLECTION.WORKSPACE_CARDS_LIST}${workspaceAccountID}_${CONST.EXPENSIFY_CARD.BANK}`,
+            value: {
+                [cardID]: {
+                    ...card,
+                    errors: ErrorUtils.getMicroSecondOnyxErrorWithTranslationKey('common.genericErrorMessage'),
+                },
+            },
+        },
+    ];
+
+    const parameters: CardDeactivateParams = {
+        authToken,
+        cardID,
+    };
+
+    API.write(WRITE_COMMANDS.CARD_DEACTIVATE, parameters, {optimisticData, failureData});
+}
+
+function startIssueNewCardFlow(policyID: string) {
+    const parameters: StartIssueNewCardFlowParams = {
+        policyID,
+    };
+
+    API.read(READ_COMMANDS.START_ISSUE_NEW_CARD_FLOW, parameters);
+}
+
+function configureExpensifyCardsForPolicy(policyID: string, bankAccountID?: number) {
+    if (!bankAccountID) {
+        return;
+    }
+
+    const parameters = {
+        policyID,
+        bankAccountID,
+    };
+
+    API.write(WRITE_COMMANDS.CONFIGURE_EXPENSIFY_CARDS_FOR_POLICY, parameters);
+}
+
+function issueExpensifyCard(policyID: string, feedCountry: string, data?: IssueNewCardData) {
+    if (!data) {
+        return;
+    }
+
+    const {assigneeEmail, limit, limitType, cardTitle, cardType} = data;
+
+    const parameters = {
+        policyID,
+        assigneeEmail,
+        limit,
+        limitType,
+        cardTitle,
+    };
+
+    if (cardType === CONST.EXPENSIFY_CARD.CARD_TYPE.PHYSICAL) {
+        API.write(WRITE_COMMANDS.CREATE_EXPENSIFY_CARD, {...parameters, feedCountry});
+        return;
+    }
+
+    // eslint-disable-next-line rulesdir/no-multiple-api-calls
+    API.write(WRITE_COMMANDS.CREATE_ADMIN_ISSUED_VIRTUAL_CARD, parameters);
+}
+
+function openCardDetailsPage(cardID: number) {
+    const authToken = NetworkStore.getAuthToken();
+
+    if (!authToken) {
+        return;
+    }
+
+    const parameters: OpenCardDetailsPageParams = {
+        authToken,
+        cardID,
+    };
+
+    API.read(READ_COMMANDS.OPEN_CARD_DETAILS_PAGE, parameters);
+}
+
+function toggleContinuousReconciliation(workspaceAccountID: number, shouldUseContinuousReconciliation: boolean, connectionName: ConnectionName, oldConnectionName?: ConnectionName) {
+    const parameters = shouldUseContinuousReconciliation
+        ? {
+              workspaceAccountID,
+              shouldUseContinuousReconciliation,
+              expensifyCardContinuousReconciliationConnection: connectionName,
+          }
+        : {
+              workspaceAccountID,
+              shouldUseContinuousReconciliation,
+          };
+
+    const optimisticData: OnyxUpdate[] = [
+        {
+            onyxMethod: Onyx.METHOD.MERGE,
+            key: `${ONYXKEYS.COLLECTION.EXPENSIFY_CARD_USE_CONTINUOUS_RECONCILIATION}${workspaceAccountID}`,
+            value: shouldUseContinuousReconciliation,
+        },
+        {
+            onyxMethod: Onyx.METHOD.MERGE,
+            key: `${ONYXKEYS.COLLECTION.EXPENSIFY_CARD_CONTINUOUS_RECONCILIATION_CONNECTION}${workspaceAccountID}`,
+            value: connectionName,
+        },
+    ];
+
+    const successData: OnyxUpdate[] = [
+        {
+            onyxMethod: Onyx.METHOD.MERGE,
+            key: `${ONYXKEYS.COLLECTION.EXPENSIFY_CARD_USE_CONTINUOUS_RECONCILIATION}${workspaceAccountID}`,
+            value: shouldUseContinuousReconciliation,
+        },
+        {
+            onyxMethod: Onyx.METHOD.MERGE,
+            key: `${ONYXKEYS.COLLECTION.EXPENSIFY_CARD_CONTINUOUS_RECONCILIATION_CONNECTION}${workspaceAccountID}`,
+            value: connectionName,
+        },
+    ];
+
+    const failureData: OnyxUpdate[] = [
+        {
+            onyxMethod: Onyx.METHOD.MERGE,
+            key: `${ONYXKEYS.COLLECTION.EXPENSIFY_CARD_USE_CONTINUOUS_RECONCILIATION}${workspaceAccountID}`,
+            value: !shouldUseContinuousReconciliation,
+        },
+        {
+            onyxMethod: Onyx.METHOD.MERGE,
+            key: `${ONYXKEYS.COLLECTION.EXPENSIFY_CARD_CONTINUOUS_RECONCILIATION_CONNECTION}${workspaceAccountID}`,
+            value: oldConnectionName ?? null,
+        },
+    ];
+
+    API.write(WRITE_COMMANDS.TOGGLE_CARD_CONTINUOUS_RECONCILIATION, parameters, {
+        optimisticData,
+        successData,
+        failureData,
+    });
+}
+
+function updateSelectedFeed(feed: string, policyID: string) {
+    Onyx.update([
+        {
+            onyxMethod: Onyx.METHOD.MERGE,
+            key: `${ONYXKEYS.COLLECTION.LAST_SELECTED_FEED}${policyID}`,
+            value: feed,
+        },
+    ]);
+}
+
+export {
+    requestReplacementExpensifyCard,
+    activatePhysicalExpensifyCard,
+    clearCardListErrors,
+    reportVirtualExpensifyCardFraud,
+    revealVirtualCardDetails,
+    updateSettlementFrequency,
+    setIssueNewCardStepAndData,
+    clearIssueNewCardFlow,
+    updateExpensifyCardLimit,
+    updateExpensifyCardTitle,
+    updateSettlementAccount,
+    startIssueNewCardFlow,
+    configureExpensifyCardsForPolicy,
+    issueExpensifyCard,
+    openCardDetailsPage,
+    toggleContinuousReconciliation,
+    updateExpensifyCardLimitType,
+    updateSelectedFeed,
+    deactivateCard,
+};
 export type {ReplacementReason};
diff --git a/src/libs/actions/Console.ts b/src/libs/actions/Console.ts
index 79276d3307ac..6e585c6ad12d 100644
--- a/src/libs/actions/Console.ts
+++ b/src/libs/actions/Console.ts
@@ -2,6 +2,7 @@ import Onyx from 'react-native-onyx';
 import ONYXKEYS from '@src/ONYXKEYS';
 import type {Log} from '@src/types/onyx';
 
+let isNewAppLaunch = true;
 /**
  * Merge the new log into the existing logs in Onyx
  * @param log the log to add
@@ -28,4 +29,17 @@ function disableLoggingAndFlushLogs() {
     Onyx.set(ONYXKEYS.LOGS, null);
 }
 
-export {addLog, setShouldStoreLogs, disableLoggingAndFlushLogs};
+/**
+ * Clears the persisted logs on app launch,
+ * so that we have fresh logs for the new app session.
+ */
+function flushAllLogsOnAppLaunch() {
+    if (!isNewAppLaunch) {
+        return Promise.resolve();
+    }
+
+    isNewAppLaunch = false;
+    return Onyx.set(ONYXKEYS.LOGS, {});
+}
+
+export {addLog, setShouldStoreLogs, disableLoggingAndFlushLogs, flushAllLogsOnAppLaunch};
diff --git a/src/libs/actions/Delegate.ts b/src/libs/actions/Delegate.ts
new file mode 100644
index 000000000000..4797506d1a3c
--- /dev/null
+++ b/src/libs/actions/Delegate.ts
@@ -0,0 +1,159 @@
+import Onyx from 'react-native-onyx';
+import type {OnyxUpdate} from 'react-native-onyx';
+import * as API from '@libs/API';
+import {SIDE_EFFECT_REQUEST_COMMANDS} from '@libs/API/types';
+import Log from '@libs/Log';
+import * as NetworkStore from '@libs/Network/NetworkStore';
+import * as SequentialQueue from '@libs/Network/SequentialQueue';
+import ONYXKEYS from '@src/ONYXKEYS';
+import type {DelegatedAccess} from '@src/types/onyx/Account';
+import {confirmReadyToOpenApp, openApp} from './App';
+import updateSessionAuthTokens from './Session/updateSessionAuthTokens';
+
+let delegatedAccess: DelegatedAccess;
+Onyx.connect({
+    key: ONYXKEYS.ACCOUNT,
+    callback: (val) => {
+        delegatedAccess = val?.delegatedAccess ?? {};
+    },
+});
+
+const KEYS_TO_PRESERVE_DELEGATE_ACCESS = [ONYXKEYS.NVP_TRY_FOCUS_MODE, ONYXKEYS.PREFERRED_THEME, ONYXKEYS.NVP_PREFERRED_LOCALE, ONYXKEYS.SESSION];
+
+function connect(email: string) {
+    if (!delegatedAccess?.delegators) {
+        return;
+    }
+
+    const optimisticData: OnyxUpdate[] = [
+        {
+            onyxMethod: Onyx.METHOD.MERGE,
+            key: ONYXKEYS.ACCOUNT,
+            value: {
+                delegatedAccess: {
+                    delegators: delegatedAccess.delegators.map((delegator) => (delegator.email === email ? {...delegator, error: undefined} : delegator)),
+                },
+            },
+        },
+    ];
+
+    const successData: OnyxUpdate[] = [
+        {
+            onyxMethod: Onyx.METHOD.MERGE,
+            key: ONYXKEYS.ACCOUNT,
+            value: {
+                delegatedAccess: {
+                    delegators: delegatedAccess.delegators.map((delegator) => (delegator.email === email ? {...delegator, error: undefined} : delegator)),
+                },
+            },
+        },
+    ];
+
+    const failureData: OnyxUpdate[] = [
+        {
+            onyxMethod: Onyx.METHOD.MERGE,
+            key: ONYXKEYS.ACCOUNT,
+            value: {
+                delegatedAccess: {
+                    delegators: delegatedAccess.delegators.map((delegator) => (delegator.email === email ? {...delegator, error: 'delegate.genericError'} : delegator)),
+                },
+            },
+        },
+    ];
+
+    // We need to access the authToken directly from the response to update the session
+    // eslint-disable-next-line rulesdir/no-api-side-effects-method
+    API.makeRequestWithSideEffects(SIDE_EFFECT_REQUEST_COMMANDS.CONNECT_AS_DELEGATE, {to: email}, {optimisticData, successData, failureData})
+        .then((response) => {
+            if (!response?.restrictedToken || !response?.encryptedAuthToken) {
+                Log.alert('[Delegate] No auth token returned while connecting as a delegate');
+                Onyx.update(failureData);
+                return;
+            }
+            return SequentialQueue.waitForIdle()
+                .then(() => Onyx.clear(KEYS_TO_PRESERVE_DELEGATE_ACCESS))
+                .then(() => {
+                    // Update authToken in Onyx and in our local variables so that API requests will use the new authToken
+                    updateSessionAuthTokens(response?.restrictedToken, response?.encryptedAuthToken);
+
+                    NetworkStore.setAuthToken(response?.restrictedToken ?? null);
+                    confirmReadyToOpenApp();
+                    openApp();
+                });
+        })
+        .catch((error) => {
+            Log.alert('[Delegate] Error connecting as delegate', {error});
+            Onyx.update(failureData);
+        });
+}
+
+function disconnect() {
+    const optimisticData: OnyxUpdate[] = [
+        {
+            onyxMethod: Onyx.METHOD.MERGE,
+            key: ONYXKEYS.ACCOUNT,
+            value: {
+                delegatedAccess: {
+                    error: null,
+                },
+            },
+        },
+    ];
+
+    const successData: OnyxUpdate[] = [
+        {
+            onyxMethod: Onyx.METHOD.MERGE,
+            key: ONYXKEYS.ACCOUNT,
+            value: {
+                delegatedAccess: {
+                    error: null,
+                },
+            },
+        },
+    ];
+
+    const failureData: OnyxUpdate[] = [
+        {
+            onyxMethod: Onyx.METHOD.MERGE,
+            key: ONYXKEYS.ACCOUNT,
+            value: {
+                delegatedAccess: {
+                    error: 'delegate.genericError',
+                },
+            },
+        },
+    ];
+
+    // We need to access the authToken directly from the response to update the session
+    // eslint-disable-next-line rulesdir/no-api-side-effects-method
+    API.makeRequestWithSideEffects(SIDE_EFFECT_REQUEST_COMMANDS.DISCONNECT_AS_DELEGATE, {}, {optimisticData, successData, failureData})
+        .then((response) => {
+            if (!response?.authToken || !response?.encryptedAuthToken) {
+                Log.alert('[Delegate] No auth token returned while disconnecting as a delegate');
+                return;
+            }
+
+            return SequentialQueue.waitForIdle()
+                .then(() => Onyx.clear(KEYS_TO_PRESERVE_DELEGATE_ACCESS))
+                .then(() => {
+                    // Update authToken in Onyx and in our local variables so that API requests will use the new authToken
+                    updateSessionAuthTokens(response?.authToken, response?.encryptedAuthToken);
+
+                    NetworkStore.setAuthToken(response?.authToken ?? null);
+                    confirmReadyToOpenApp();
+                    openApp();
+                });
+        })
+        .catch((error) => {
+            Log.alert('[Delegate] Error disconnecting as a delegate', {error});
+        });
+}
+
+function clearDelegatorErrors() {
+    if (!delegatedAccess?.delegators) {
+        return;
+    }
+    Onyx.merge(ONYXKEYS.ACCOUNT, {delegatedAccess: {delegators: delegatedAccess.delegators.map((delegator) => ({...delegator, error: undefined}))}});
+}
+
+export {connect, clearDelegatorErrors, disconnect};
diff --git a/src/libs/actions/Device/generateDeviceID/index.android.ts b/src/libs/actions/Device/generateDeviceID/index.android.ts
index d662967a9f76..17563e039e6a 100644
--- a/src/libs/actions/Device/generateDeviceID/index.android.ts
+++ b/src/libs/actions/Device/generateDeviceID/index.android.ts
@@ -1,4 +1,4 @@
-import Str from 'expensify-common/lib/str';
+import {Str} from 'expensify-common';
 import DeviceInfo from 'react-native-device-info';
 import type GenerateDeviceID from './types';
 
diff --git a/src/libs/actions/Device/generateDeviceID/index.ts b/src/libs/actions/Device/generateDeviceID/index.ts
index 82ea72ba8180..a88457463f34 100644
--- a/src/libs/actions/Device/generateDeviceID/index.ts
+++ b/src/libs/actions/Device/generateDeviceID/index.ts
@@ -1,4 +1,4 @@
-import Str from 'expensify-common/lib/str';
+import {Str} from 'expensify-common';
 import type GenerateDeviceID from './types';
 
 const uniqueID = Str.guid();
diff --git a/src/libs/actions/Device/getDeviceInfo/getOSAndName/index.native.ts b/src/libs/actions/Device/getDeviceInfo/getOSAndName/index.native.ts
index 16a48348df71..06c425438053 100644
--- a/src/libs/actions/Device/getDeviceInfo/getOSAndName/index.native.ts
+++ b/src/libs/actions/Device/getDeviceInfo/getOSAndName/index.native.ts
@@ -1,4 +1,4 @@
-import Str from 'expensify-common/lib/str';
+import {Str} from 'expensify-common';
 import RNDeviceInfo from 'react-native-device-info';
 import type {GetOSAndName} from './types';
 
diff --git a/src/libs/actions/Device/getDeviceInfo/getOSAndName/index.ts b/src/libs/actions/Device/getDeviceInfo/getOSAndName/index.ts
index 29b004412f64..b31fbd6dea8b 100644
--- a/src/libs/actions/Device/getDeviceInfo/getOSAndName/index.ts
+++ b/src/libs/actions/Device/getDeviceInfo/getOSAndName/index.ts
@@ -1,4 +1,4 @@
 // Don't import this file with '* as Device'. It's known to make VSCode IntelliSense crash.
-import {getOSAndName} from 'expensify-common/lib/Device';
+import {getOSAndName} from 'expensify-common/dist/Device';
 
 export default getOSAndName;
diff --git a/src/libs/actions/Device/index.ts b/src/libs/actions/Device/index.ts
index e7c19d20e4fe..991f9ce6227b 100644
--- a/src/libs/actions/Device/index.ts
+++ b/src/libs/actions/Device/index.ts
@@ -16,12 +16,12 @@ function getDeviceID(): Promise<string | null> {
             return;
         }
 
-        const connectionID = Onyx.connect({
+        const connection = Onyx.connect({
             key: ONYXKEYS.DEVICE_ID,
             callback: (id) => {
-                Onyx.disconnect(connectionID);
-                deviceID = id;
-                return resolve(id);
+                Onyx.disconnect(connection);
+                deviceID = id ?? null;
+                return resolve(id ?? null);
             },
         });
     });
@@ -43,7 +43,7 @@ function setDeviceID() {
             Log.info('Got new deviceID', false, uniqueID);
             Onyx.set(ONYXKEYS.DEVICE_ID, uniqueID);
         })
-        .catch((err) => Log.info('Found existing deviceID', false, err.message));
+        .catch((error: Error) => Log.info('Found existing deviceID', false, error.message));
 }
 
 /**
diff --git a/src/libs/actions/Download.ts b/src/libs/actions/Download.ts
index e82744aa5d02..74db1bf9164e 100644
--- a/src/libs/actions/Download.ts
+++ b/src/libs/actions/Download.ts
@@ -9,11 +9,11 @@ function setDownload(sourceID: string, isDownloading: boolean): Promise<void | v
 }
 
 function clearDownloads() {
-    const connectionID = Onyx.connect({
+    const connection = Onyx.connect({
         key: ONYXKEYS.COLLECTION.DOWNLOAD,
         waitForCollectionCallback: true,
         callback: (records) => {
-            Onyx.disconnect(connectionID);
+            Onyx.disconnect(connection);
             const downloadsToDelete: Record<string, null> = {};
             Object.keys(records ?? {}).forEach((recordKey) => {
                 downloadsToDelete[recordKey] = null;
diff --git a/src/libs/actions/EmojiPickerAction.ts b/src/libs/actions/EmojiPickerAction.ts
index 787f105e4939..e6123733b0e8 100644
--- a/src/libs/actions/EmojiPickerAction.ts
+++ b/src/libs/actions/EmojiPickerAction.ts
@@ -16,7 +16,7 @@ type EmojiPopoverAnchor = MutableRefObject<View | HTMLDivElement | TextInput | n
 
 type OnWillShowPicker = (callback?: CloseContextMenuCallback) => void;
 
-type OnModalHideValue = () => void;
+type OnModalHideValue = (isNavigating?: boolean) => void;
 
 type EmojiPickerRef = {
     showEmojiPicker: (
diff --git a/src/libs/actions/ExitSurvey.ts b/src/libs/actions/ExitSurvey.ts
index ef3ecd6d3e31..12dc57f1dfde 100644
--- a/src/libs/actions/ExitSurvey.ts
+++ b/src/libs/actions/ExitSurvey.ts
@@ -1,6 +1,7 @@
 import type {OnyxUpdate} from 'react-native-onyx';
 import Onyx from 'react-native-onyx';
 import * as API from '@libs/API';
+import {SIDE_EFFECT_REQUEST_COMMANDS} from '@libs/API/types';
 import ONYXKEYS from '@src/ONYXKEYS';
 import REASON_INPUT_IDS from '@src/types/form/ExitSurveyReasonForm';
 import type {ExitReason} from '@src/types/form/ExitSurveyReasonForm';
@@ -65,8 +66,9 @@ function switchToOldDot() {
         },
     ];
 
-    API.write(
-        'SwitchToOldDot',
+    // eslint-disable-next-line rulesdir/no-api-side-effects-method
+    return API.makeRequestWithSideEffects(
+        SIDE_EFFECT_REQUEST_COMMANDS.SWITCH_TO_OLD_DOT,
         {
             reason: exitReason,
             surveyResponse: exitSurveyResponse,
diff --git a/src/libs/actions/FormActions.ts b/src/libs/actions/FormActions.ts
index 1fcf9bed6a55..5fe1705d8db3 100644
--- a/src/libs/actions/FormActions.ts
+++ b/src/libs/actions/FormActions.ts
@@ -24,7 +24,7 @@ function clearErrorFields(formID: OnyxFormKey) {
 }
 
 function setDraftValues(formID: OnyxFormKey, draftValues: NullishDeep<OnyxValue<OnyxFormDraftKey>>) {
-    Onyx.merge(`${formID}Draft`, draftValues);
+    Onyx.merge(`${formID}Draft`, draftValues ?? null);
 }
 
 function clearDraftValues(formID: OnyxFormKey) {
diff --git a/src/libs/actions/IOU.ts b/src/libs/actions/IOU.ts
index e0b406ad9c45..83e35f2fb420 100644
--- a/src/libs/actions/IOU.ts
+++ b/src/libs/actions/IOU.ts
@@ -1,27 +1,31 @@
 import {format} from 'date-fns';
-import fastMerge from 'expensify-common/lib/fastMerge';
-import Str from 'expensify-common/lib/str';
-import type {OnyxCollection, OnyxEntry, OnyxUpdate} from 'react-native-onyx';
+import {fastMerge, Str} from 'expensify-common';
+import type {NullishDeep, OnyxCollection, OnyxEntry, OnyxInputValue, OnyxUpdate} from 'react-native-onyx';
 import Onyx from 'react-native-onyx';
-import type {ValueOf} from 'type-fest';
+import type {PartialDeep, SetRequired, ValueOf} from 'type-fest';
 import ReceiptGeneric from '@assets/images/receipt-generic.png';
 import * as API from '@libs/API';
 import type {
     ApproveMoneyRequestParams,
     CompleteSplitBillParams,
     CreateDistanceRequestParams,
+    CreateWorkspaceParams,
     DeleteMoneyRequestParams,
     DetachReceiptParams,
     EditMoneyRequestParams,
+    PayInvoiceParams,
     PayMoneyRequestParams,
     ReplaceReceiptParams,
     RequestMoneyParams,
     SendInvoiceParams,
     SendMoneyParams,
+    SetNameValuePairParams,
     SplitBillParams,
     StartSplitBillParams,
     SubmitReportParams,
     TrackExpenseParams,
+    TransactionMergeParams,
+    UnapproveExpenseReportParams,
     UpdateMoneyRequestParams,
 } from '@libs/API/parameters';
 import {WRITE_COMMANDS} from '@libs/API/types';
@@ -33,17 +37,19 @@ import * as FileUtils from '@libs/fileDownload/FileUtils';
 import * as IOUUtils from '@libs/IOUUtils';
 import * as LocalePhoneNumber from '@libs/LocalePhoneNumber';
 import * as Localize from '@libs/Localize';
+import isSearchTopmostCentralPane from '@libs/Navigation/isSearchTopmostCentralPane';
 import Navigation from '@libs/Navigation/Navigation';
 import * as NextStepUtils from '@libs/NextStepUtils';
-import type {TaxRatesOption} from '@libs/OptionsListUtils';
-import Permissions from '@libs/Permissions';
+import {rand64} from '@libs/NumberUtils';
 import * as PhoneNumber from '@libs/PhoneNumber';
 import * as PolicyUtils from '@libs/PolicyUtils';
 import * as ReportActionsUtils from '@libs/ReportActionsUtils';
-import type {OptimisticChatReport, OptimisticCreatedReportAction, OptimisticInviteReportAction, OptimisticIOUReportAction, TransactionDetails} from '@libs/ReportUtils';
+import * as ReportConnection from '@libs/ReportConnection';
+import type {OptimisticChatReport, OptimisticCreatedReportAction, OptimisticIOUReportAction, TransactionDetails} from '@libs/ReportUtils';
 import * as ReportUtils from '@libs/ReportUtils';
+import * as SubscriptionUtils from '@libs/SubscriptionUtils';
 import * as TransactionUtils from '@libs/TransactionUtils';
-import * as UserUtils from '@libs/UserUtils';
+import {getCurrency, getTransaction} from '@libs/TransactionUtils';
 import ViolationsUtils from '@libs/Violations/ViolationsUtils';
 import type {IOUAction, IOUType} from '@src/CONST';
 import CONST from '@src/CONST';
@@ -52,14 +58,15 @@ import ROUTES from '@src/ROUTES';
 import type * as OnyxTypes from '@src/types/onyx';
 import type {Participant, Split} from '@src/types/onyx/IOU';
 import type {ErrorFields, Errors} from '@src/types/onyx/OnyxCommon';
-import type {IOUMessage, PaymentMethodType} from '@src/types/onyx/OriginalMessage';
+import type {PaymentMethodType} from '@src/types/onyx/OriginalMessage';
 import type ReportAction from '@src/types/onyx/ReportAction';
 import type {OnyxData} from '@src/types/onyx/Request';
-import type {Comment, Receipt, ReceiptSource, TransactionChanges, WaypointCollection} from '@src/types/onyx/Transaction';
-import type {EmptyObject} from '@src/types/utils/EmptyObject';
+import type {Comment, Receipt, ReceiptSource, Routes, SplitShares, TransactionChanges, WaypointCollection} from '@src/types/onyx/Transaction';
 import {isEmptyObject} from '@src/types/utils/EmptyObject';
 import * as CachedPDFPaths from './CachedPDFPaths';
-import * as Policy from './Policy';
+import * as Category from './Policy/Category';
+import * as Policy from './Policy/Policy';
+import * as Tag from './Policy/Tag';
 import * as Report from './Report';
 
 type IOURequestType = ValueOf<typeof CONST.IOU.REQUEST_TYPE>;
@@ -82,6 +89,7 @@ type MoneyRequestInformation = {
 };
 
 type TrackExpenseInformation = {
+    createdWorkspaceParams?: CreateWorkspaceParams;
     iouReport?: OnyxTypes.Report;
     chatReport: OnyxTypes.Report;
     transaction: OnyxTypes.Transaction;
@@ -91,18 +99,22 @@ type TrackExpenseInformation = {
     reportPreviewAction?: OnyxTypes.ReportAction;
     transactionThreadReportID: string;
     createdReportActionIDForThread: string;
+    actionableWhisperReportActionIDParam?: string;
     onyxData: OnyxData;
 };
 
 type SendInvoiceInformation = {
     senderWorkspaceID: string;
     receiver: Partial<OnyxTypes.PersonalDetails>;
-    invoiceRoomReportID: string;
+    invoiceRoom: OnyxTypes.Report;
     createdChatReportActionID: string;
     invoiceReportID: string;
     reportPreviewReportActionID: string;
     transactionID: string;
     transactionThreadReportID: string;
+    createdIOUReportActionID: string;
+    createdReportActionIDForThread: string;
+    reportActionID: string;
     onyxData: OnyxData;
 };
 
@@ -145,12 +157,6 @@ type GPSPoint = {
     long: number;
 };
 
-let betas: OnyxTypes.Beta[] = [];
-Onyx.connect({
-    key: ONYXKEYS.BETAS,
-    callback: (value) => (betas = value ?? []),
-});
-
 let allPersonalDetails: OnyxTypes.PersonalDetailsList = {};
 Onyx.connect({
     key: ONYXKEYS.PERSONAL_DETAILS_LIST,
@@ -159,13 +165,6 @@ Onyx.connect({
     },
 });
 
-let allReports: OnyxCollection<OnyxTypes.Report> = null;
-Onyx.connect({
-    key: ONYXKEYS.COLLECTION.REPORT,
-    waitForCollectionCallback: true,
-    callback: (value) => (allReports = value),
-});
-
 let allTransactions: NonNullable<OnyxCollection<OnyxTypes.Transaction>> = {};
 Onyx.connect({
     key: ONYXKEYS.COLLECTION.TRANSACTION,
@@ -231,11 +230,11 @@ Onyx.connect({
     },
 });
 
-let currentUserPersonalDetails: OnyxTypes.PersonalDetails | EmptyObject = {};
+let currentUserPersonalDetails: OnyxEntry<OnyxTypes.PersonalDetails>;
 Onyx.connect({
     key: ONYXKEYS.PERSONAL_DETAILS_LIST,
     callback: (value) => {
-        currentUserPersonalDetails = value?.[userAccountID] ?? {};
+        currentUserPersonalDetails = value?.[userAccountID] ?? undefined;
     },
 });
 
@@ -267,16 +266,23 @@ Onyx.connect({
     },
 });
 
+let activePolicyID: OnyxEntry<string>;
+Onyx.connect({
+    key: ONYXKEYS.NVP_ACTIVE_POLICY_ID,
+    callback: (value) => (activePolicyID = value),
+});
+
 /**
  * Find the report preview action from given chat report and iou report
  */
-function getReportPreviewAction(chatReportID: string, iouReportID: string): OnyxEntry<ReportAction> {
+function getReportPreviewAction(chatReportID: string, iouReportID: string): OnyxInputValue<ReportAction<typeof CONST.REPORT.ACTIONS.TYPE.REPORT_PREVIEW>> {
     const reportActions = allReportActions?.[`${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${chatReportID}`] ?? {};
 
     // Find the report preview action from the chat report
     return (
         Object.values(reportActions).find(
-            (reportAction) => reportAction && reportAction.actionName === CONST.REPORT.ACTIONS.TYPE.REPORT_PREVIEW && reportAction.originalMessage.linkedReportID === iouReportID,
+            (reportAction): reportAction is ReportAction<typeof CONST.REPORT.ACTIONS.TYPE.REPORT_PREVIEW> =>
+                reportAction && ReportActionsUtils.isReportPreviewAction(reportAction) && ReportActionsUtils.getOriginalMessage(reportAction)?.linkedReportID === iouReportID,
         ) ?? null
     );
 }
@@ -287,21 +293,38 @@ function getReportPreviewAction(chatReportID: string, iouReportID: string): Onyx
  * @param policy
  * @param isFromGlobalCreate
  * @param iouRequestType one of manual/scan/distance
- * @param skipConfirmation if true, skip confirmation step
  */
 function initMoneyRequest(reportID: string, policy: OnyxEntry<OnyxTypes.Policy>, isFromGlobalCreate: boolean, iouRequestType: IOURequestType = CONST.IOU.REQUEST_TYPE.MANUAL) {
     // Generate a brand new transactionID
     const newTransactionID = CONST.IOU.OPTIMISTIC_TRANSACTION_ID;
+    const currency = policy?.outputCurrency ?? currentUserPersonalDetails?.localCurrencyCode ?? CONST.CURRENCY.USD;
     // Disabling this line since currentDate can be an empty string
     // eslint-disable-next-line @typescript-eslint/prefer-nullish-coalescing
     const created = currentDate || format(new Date(), 'yyyy-MM-dd');
+
+    const currentTransaction = allTransactionDrafts?.[`${ONYXKEYS.COLLECTION.TRANSACTION_DRAFT}${newTransactionID}`];
+
+    // in case we have to re-init money request, but the IOU request type is the same with the old draft transaction,
+    // we should keep most of the existing data by using the ONYX MERGE operation
+    if (currentTransaction?.iouRequestType === iouRequestType) {
+        // so, we just need to update the reportID, isFromGlobalCreate, created, currency
+        Onyx.merge(`${ONYXKEYS.COLLECTION.TRANSACTION_DRAFT}${newTransactionID}`, {
+            reportID,
+            isFromGlobalCreate,
+            created,
+            currency,
+            transactionID: newTransactionID,
+        });
+        return;
+    }
+
     const comment: Comment = {};
 
     // Add initial empty waypoints when starting a distance expense
     if (iouRequestType === CONST.IOU.REQUEST_TYPE.DISTANCE) {
         comment.waypoints = {
-            waypoint0: {},
-            waypoint1: {},
+            waypoint0: {keyForList: 'start_waypoint'},
+            waypoint1: {keyForList: 'stop_waypoint'},
         };
         if (!isFromGlobalCreate) {
             const customUnitRateID = DistanceRequestUtils.getCustomUnitRateID(reportID);
@@ -315,13 +338,13 @@ function initMoneyRequest(reportID: string, policy: OnyxEntry<OnyxTypes.Policy>,
         amount: 0,
         comment,
         created,
-        currency: currentUserPersonalDetails.localCurrencyCode ?? CONST.CURRENCY.USD,
+        currency,
         iouRequestType,
         reportID,
         transactionID: newTransactionID,
         isFromGlobalCreate,
         merchant: CONST.TRANSACTION.PARTIAL_TRANSACTION_MERCHANT,
-        splitPayerAccountIDs: [currentUserPersonalDetails.accountID],
+        splitPayerAccountIDs: currentUserPersonalDetails ? [currentUserPersonalDetails.accountID] : undefined,
     });
 }
 
@@ -359,8 +382,8 @@ function startMoneyRequest(iouType: ValueOf<typeof CONST.IOU.TYPE>, reportID: st
     }
 }
 
-function setMoneyRequestAmount(transactionID: string, amount: number, currency: string) {
-    Onyx.merge(`${ONYXKEYS.COLLECTION.TRANSACTION_DRAFT}${transactionID}`, {amount, currency});
+function setMoneyRequestAmount(transactionID: string, amount: number, currency: string, shouldShowOriginalAmount = false) {
+    Onyx.merge(`${ONYXKEYS.COLLECTION.TRANSACTION_DRAFT}${transactionID}`, {amount, currency, shouldShowOriginalAmount});
 }
 
 function setMoneyRequestCreated(transactionID: string, created: string, isDraft: boolean) {
@@ -418,22 +441,55 @@ function setCustomUnitRateID(transactionID: string, customUnitRateID: string) {
     Onyx.merge(`${ONYXKEYS.COLLECTION.TRANSACTION_DRAFT}${transactionID}`, {comment: {customUnit: {customUnitRateID}}});
 }
 
-/** Update transaction distance rate */
-function updateDistanceRequestRate(transactionID: string, rateID: string, policyID: string) {
+/** Set the distance rate of a new  transaction */
+function setMoneyRequestDistanceRate(transactionID: string, rateID: string, policyID: string, isDraft: boolean) {
     Onyx.merge(ONYXKEYS.NVP_LAST_SELECTED_DISTANCE_RATES, {[policyID]: rateID});
-    Onyx.merge(`${ONYXKEYS.COLLECTION.TRANSACTION_DRAFT}${transactionID}`, {comment: {customUnit: {customUnitRateID: rateID}}});
+    Onyx.merge(`${isDraft ? ONYXKEYS.COLLECTION.TRANSACTION_DRAFT : ONYXKEYS.COLLECTION.TRANSACTION}${transactionID}`, {comment: {customUnit: {customUnitRateID: rateID}}});
 }
 
 /** Helper function to get the receipt error for expenses, or the generic error if there's no receipt */
-function getReceiptError(receipt?: Receipt, filename?: string, isScanRequest = true, errorKey?: number): Errors | ErrorFields {
+function getReceiptError(receipt: OnyxEntry<Receipt>, filename?: string, isScanRequest = true, errorKey?: number): Errors | ErrorFields {
     return isEmptyObject(receipt) || !isScanRequest
-        ? ErrorUtils.getMicroSecondOnyxError('iou.error.genericCreateFailureMessage', false, errorKey)
+        ? ErrorUtils.getMicroSecondOnyxErrorWithTranslationKey('iou.error.genericCreateFailureMessage', errorKey)
         : ErrorUtils.getMicroSecondOnyxErrorObject({error: CONST.IOU.RECEIPT_ERROR, source: receipt.source?.toString() ?? '', filename: filename ?? ''}, errorKey);
 }
 
+/** Helper function to get optimistic fields violations onyx data */
+function getFieldViolationsOnyxData(iouReport: OnyxTypes.Report): SetRequired<OnyxData, 'optimisticData' | 'failureData'> {
+    const missingFields: OnyxTypes.ReportFieldsViolations = {};
+    const excludedFields = Object.values(CONST.REPORT_VIOLATIONS_EXCLUDED_FIELDS) as string[];
+
+    Object.values(iouReport.fieldList ?? {}).forEach((field) => {
+        if (excludedFields.includes(field.fieldID) || !!field.value || !!field.defaultValue) {
+            return;
+        }
+        // in case of missing field violation the empty object is indicator.
+        missingFields[field.fieldID] = {};
+    });
+
+    return {
+        optimisticData: [
+            {
+                onyxMethod: Onyx.METHOD.SET,
+                key: `${ONYXKEYS.COLLECTION.REPORT_VIOLATIONS}${iouReport.reportID}`,
+                value: {
+                    fieldRequired: missingFields,
+                },
+            },
+        ],
+        failureData: [
+            {
+                onyxMethod: Onyx.METHOD.SET,
+                key: `${ONYXKEYS.COLLECTION.REPORT_VIOLATIONS}${iouReport.reportID}`,
+                value: null,
+            },
+        ],
+    };
+}
+
 /** Builds the Onyx data for an expense */
 function buildOnyxDataForMoneyRequest(
-    chatReport: OnyxEntry<OnyxTypes.Report>,
+    chatReport: OnyxTypes.OnyxInputOrEntry<OnyxTypes.Report>,
     iouReport: OnyxTypes.Report,
     transaction: OnyxTypes.Transaction,
     chatCreatedAction: OptimisticCreatedReportAction,
@@ -444,12 +500,12 @@ function buildOnyxDataForMoneyRequest(
     optimisticPolicyRecentlyUsedCategories: string[],
     optimisticPolicyRecentlyUsedTags: OnyxTypes.RecentlyUsedTags,
     isNewChatReport: boolean,
-    transactionThreadReport: OptimisticChatReport | EmptyObject,
-    transactionThreadCreatedReportAction: OptimisticCreatedReportAction | EmptyObject,
+    transactionThreadReport: OptimisticChatReport | null,
+    transactionThreadCreatedReportAction: OptimisticCreatedReportAction | null,
     shouldCreateNewMoneyRequestReport: boolean,
-    policy?: OnyxEntry<OnyxTypes.Policy>,
-    policyTagList?: OnyxEntry<OnyxTypes.PolicyTagList>,
-    policyCategories?: OnyxEntry<OnyxTypes.PolicyCategories>,
+    policy?: OnyxTypes.OnyxInputOrEntry<OnyxTypes.Policy>,
+    policyTagList?: OnyxTypes.OnyxInputOrEntry<OnyxTypes.PolicyTagLists>,
+    policyCategories?: OnyxTypes.OnyxInputOrEntry<OnyxTypes.PolicyCategories>,
     optimisticNextStep?: OnyxTypes.ReportNextStep | null,
     isOneOnOneSplit = false,
     existingTransactionThreadReportID?: string,
@@ -458,11 +514,12 @@ function buildOnyxDataForMoneyRequest(
     const outstandingChildRequest = ReportUtils.getOutstandingChildRequest(iouReport);
     const clearedPendingFields = Object.fromEntries(Object.keys(transaction.pendingFields ?? {}).map((key) => [key, null]));
     const optimisticData: OnyxUpdate[] = [];
+    const successData: OnyxUpdate[] = [];
     let newQuickAction: ValueOf<typeof CONST.QUICK_ACTIONS> = isScanRequest ? CONST.QUICK_ACTIONS.REQUEST_SCAN : CONST.QUICK_ACTIONS.REQUEST_MANUAL;
     if (TransactionUtils.isDistanceRequest(transaction)) {
         newQuickAction = CONST.QUICK_ACTIONS.REQUEST_DISTANCE;
     }
-    const existingTransactionThreadReport = allReports?.[`${ONYXKEYS.COLLECTION.REPORT}${existingTransactionThreadReportID}`] ?? null;
+    const existingTransactionThreadReport = ReportConnection.getAllReports()?.[`${ONYXKEYS.COLLECTION.REPORT}${existingTransactionThreadReportID}`] ?? null;
 
     if (chatReport) {
         optimisticData.push({
@@ -486,8 +543,9 @@ function buildOnyxDataForMoneyRequest(
             key: `${ONYXKEYS.COLLECTION.REPORT}${iouReport.reportID}`,
             value: {
                 ...iouReport,
-                lastMessageText: iouAction.message?.[0]?.text,
-                lastMessageHtml: iouAction.message?.[0]?.html,
+                lastMessageText: ReportActionsUtils.getReportActionText(iouAction),
+                lastMessageHtml: ReportActionsUtils.getReportActionHtml(iouAction),
+                lastVisibleActionCreated: iouAction.created,
                 pendingFields: {
                     ...(shouldCreateNewMoneyRequestReport ? {createChat: CONST.RED_BRICK_ROAD_PENDING_ACTION.ADD} : {preview: CONST.RED_BRICK_ROAD_PENDING_ACTION.UPDATE}),
                 },
@@ -532,7 +590,7 @@ function buildOnyxDataForMoneyRequest(
               },
         {
             onyxMethod: Onyx.METHOD.MERGE,
-            key: `${ONYXKEYS.COLLECTION.REPORT}${transactionThreadReport.reportID}`,
+            key: `${ONYXKEYS.COLLECTION.REPORT}${transactionThreadReport?.reportID}`,
             value: {
                 ...transactionThreadReport,
                 pendingFields: {createChat: CONST.RED_BRICK_ROAD_PENDING_ACTION.ADD},
@@ -549,7 +607,7 @@ function buildOnyxDataForMoneyRequest(
     if (!isEmptyObject(transactionThreadCreatedReportAction)) {
         optimisticData.push({
             onyxMethod: Onyx.METHOD.MERGE,
-            key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${transactionThreadReport.reportID}`,
+            key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${transactionThreadReport?.reportID}`,
             value: {
                 [transactionThreadCreatedReportAction.reportActionID]: transactionThreadCreatedReportAction,
             },
@@ -584,12 +642,27 @@ function buildOnyxDataForMoneyRequest(
         });
     }
 
+    const redundantParticipants: Record<number, null> = {};
     if (!isEmptyObject(optimisticPersonalDetailListAction)) {
+        const successPersonalDetailListAction: Record<number, null> = {};
+
+        // BE will send different participants. We clear the optimistic ones to avoid duplicated entries
+        Object.keys(optimisticPersonalDetailListAction).forEach((accountIDKey) => {
+            const accountID = Number(accountIDKey);
+            successPersonalDetailListAction[accountID] = null;
+            redundantParticipants[accountID] = null;
+        });
+
         optimisticData.push({
             onyxMethod: Onyx.METHOD.MERGE,
             key: ONYXKEYS.PERSONAL_DETAILS_LIST,
             value: optimisticPersonalDetailListAction,
         });
+        successData.push({
+            onyxMethod: Onyx.METHOD.MERGE,
+            key: ONYXKEYS.PERSONAL_DETAILS_LIST,
+            value: successPersonalDetailListAction,
+        });
     }
 
     if (!isEmptyObject(optimisticNextStep)) {
@@ -600,13 +673,12 @@ function buildOnyxDataForMoneyRequest(
         });
     }
 
-    const successData: OnyxUpdate[] = [];
-
     if (isNewChatReport) {
         successData.push({
             onyxMethod: Onyx.METHOD.MERGE,
             key: `${ONYXKEYS.COLLECTION.REPORT}${chatReport?.reportID}`,
             value: {
+                participants: redundantParticipants,
                 pendingFields: null,
                 errorFields: null,
                 isOptimisticReport: false,
@@ -619,16 +691,20 @@ function buildOnyxDataForMoneyRequest(
             onyxMethod: Onyx.METHOD.MERGE,
             key: `${ONYXKEYS.COLLECTION.REPORT}${iouReport.reportID}`,
             value: {
+                participants: redundantParticipants,
                 pendingFields: null,
                 errorFields: null,
+                isOptimisticReport: false,
             },
         },
         {
             onyxMethod: Onyx.METHOD.MERGE,
-            key: `${ONYXKEYS.COLLECTION.REPORT}${transactionThreadReport.reportID}`,
+            key: `${ONYXKEYS.COLLECTION.REPORT}${transactionThreadReport?.reportID}`,
             value: {
+                participants: redundantParticipants,
                 pendingFields: null,
                 errorFields: null,
+                isOptimisticReport: false,
             },
         },
         {
@@ -637,6 +713,10 @@ function buildOnyxDataForMoneyRequest(
             value: {
                 pendingAction: null,
                 pendingFields: clearedPendingFields,
+                // The routes contains the distance in meters. Clearing the routes ensures we use the distance
+                // in the correct unit stored under the transaction customUnit once the request is created.
+                // The route is also not saved in the backend, so we can't rely on it.
+                routes: null,
             },
         },
 
@@ -680,7 +760,7 @@ function buildOnyxDataForMoneyRequest(
     if (!isEmptyObject(transactionThreadCreatedReportAction)) {
         successData.push({
             onyxMethod: Onyx.METHOD.MERGE,
-            key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${transactionThreadReport.reportID}`,
+            key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${transactionThreadReport?.reportID}`,
             value: {
                 [transactionThreadCreatedReportAction.reportActionID]: {
                     pendingAction: null,
@@ -704,7 +784,7 @@ function buildOnyxDataForMoneyRequest(
                 ...(isNewChatReport
                     ? {
                           errorFields: {
-                              createChat: ErrorUtils.getMicroSecondOnyxError('report.genericCreateReportFailureMessage'),
+                              createChat: ErrorUtils.getMicroSecondOnyxErrorWithTranslationKey('report.genericCreateReportFailureMessage'),
                           },
                       }
                     : {}),
@@ -716,19 +796,19 @@ function buildOnyxDataForMoneyRequest(
             value: {
                 pendingFields: null,
                 errorFields: {
-                    ...(shouldCreateNewMoneyRequestReport ? {createChat: ErrorUtils.getMicroSecondOnyxError('report.genericCreateReportFailureMessage')} : {}),
+                    ...(shouldCreateNewMoneyRequestReport ? {createChat: ErrorUtils.getMicroSecondOnyxErrorWithTranslationKey('report.genericCreateReportFailureMessage')} : {}),
                 },
             },
         },
         {
             onyxMethod: Onyx.METHOD.MERGE,
-            key: `${ONYXKEYS.COLLECTION.REPORT}${transactionThreadReport.reportID}`,
+            key: `${ONYXKEYS.COLLECTION.REPORT}${transactionThreadReport?.reportID}`,
             value: {
                 pendingFields: null,
                 errorFields: existingTransactionThreadReport
                     ? null
                     : {
-                          createChat: ErrorUtils.getMicroSecondOnyxError('report.genericCreateReportFailureMessage'),
+                          createChat: ErrorUtils.getMicroSecondOnyxErrorWithTranslationKey('report.genericCreateReportFailureMessage'),
                       },
             },
         },
@@ -736,8 +816,9 @@ function buildOnyxDataForMoneyRequest(
             onyxMethod: Onyx.METHOD.MERGE,
             key: `${ONYXKEYS.COLLECTION.TRANSACTION}${transaction.transactionID}`,
             value: {
-                errors: ErrorUtils.getMicroSecondOnyxError('iou.error.genericCreateFailureMessage'),
-                pendingAction: null,
+                // Disabling this line since transaction.filename can be an empty string
+                // eslint-disable-next-line @typescript-eslint/prefer-nullish-coalescing
+                errors: getReceiptError(transaction.receipt, transaction.filename || transaction.receipt?.filename, isScanRequest, errorKey),
                 pendingFields: clearedPendingFields,
             },
         },
@@ -753,7 +834,7 @@ function buildOnyxDataForMoneyRequest(
                               errors: getReceiptError(transaction.receipt, transaction.filename || transaction.receipt?.filename, isScanRequest, errorKey),
                           },
                           [iouAction.reportActionID]: {
-                              errors: ErrorUtils.getMicroSecondOnyxError('iou.error.genericCreateFailureMessage'),
+                              errors: ErrorUtils.getMicroSecondOnyxErrorWithTranslationKey('iou.error.genericCreateFailureMessage'),
                           },
                       }
                     : {
@@ -770,10 +851,10 @@ function buildOnyxDataForMoneyRequest(
     if (!isEmptyObject(transactionThreadCreatedReportAction)) {
         failureData.push({
             onyxMethod: Onyx.METHOD.MERGE,
-            key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${transactionThreadReport.reportID}`,
+            key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${transactionThreadReport?.reportID}`,
             value: {
                 [transactionThreadCreatedReportAction.reportActionID]: {
-                    errors: ErrorUtils.getMicroSecondOnyxError('iou.error.genericCreateFailureMessage'),
+                    errors: ErrorUtils.getMicroSecondOnyxErrorWithTranslationKey('iou.error.genericCreateFailureMessage'),
                 },
             },
         });
@@ -784,7 +865,15 @@ function buildOnyxDataForMoneyRequest(
         return [optimisticData, successData, failureData];
     }
 
-    const violationsOnyxData = ViolationsUtils.getViolationsOnyxData(transaction, [], !!policy.requiresTag, policyTagList ?? {}, !!policy.requiresCategory, policyCategories ?? {});
+    const violationsOnyxData = ViolationsUtils.getViolationsOnyxData(
+        transaction,
+        [],
+        !!policy.requiresTag,
+        policyTagList ?? {},
+        !!policy.requiresCategory,
+        policyCategories ?? {},
+        PolicyUtils.hasDependentTags(policy, policyTagList ?? {}),
+    );
 
     if (violationsOnyxData) {
         optimisticData.push(violationsOnyxData);
@@ -795,6 +884,13 @@ function buildOnyxDataForMoneyRequest(
         });
     }
 
+    // Show field violations only for control policies
+    if (PolicyUtils.isControlPolicy(policy)) {
+        const {optimisticData: fieldViolationsOptimisticData, failureData: fieldViolationsFailureData} = getFieldViolationsOnyxData(iouReport);
+        optimisticData.push(...fieldViolationsOptimisticData);
+        failureData.push(...fieldViolationsFailureData);
+    }
+
     return [optimisticData, successData, failureData];
 }
 
@@ -812,11 +908,12 @@ function buildOnyxDataForInvoice(
     optimisticPolicyRecentlyUsedTags: OnyxTypes.RecentlyUsedTags,
     isNewChatReport: boolean,
     transactionThreadReport: OptimisticChatReport,
-    transactionThreadCreatedReportAction: OptimisticCreatedReportAction | EmptyObject,
-    inviteReportAction?: OptimisticInviteReportAction,
+    transactionThreadCreatedReportAction: OptimisticCreatedReportAction | null,
     policy?: OnyxEntry<OnyxTypes.Policy>,
-    policyTagList?: OnyxEntry<OnyxTypes.PolicyTagList>,
+    policyTagList?: OnyxEntry<OnyxTypes.PolicyTagLists>,
     policyCategories?: OnyxEntry<OnyxTypes.PolicyCategories>,
+    companyName?: string,
+    companyWebsite?: string,
 ): [OnyxUpdate[], OnyxUpdate[], OnyxUpdate[]] {
     const clearedPendingFields = Object.fromEntries(Object.keys(transaction.pendingFields ?? {}).map((key) => [key, null]));
     const optimisticData: OnyxUpdate[] = [
@@ -825,8 +922,8 @@ function buildOnyxDataForInvoice(
             key: `${ONYXKEYS.COLLECTION.REPORT}${iouReport.reportID}`,
             value: {
                 ...iouReport,
-                lastMessageText: iouAction.message?.[0]?.text,
-                lastMessageHtml: iouAction.message?.[0]?.html,
+                lastMessageText: ReportActionsUtils.getReportActionText(iouAction),
+                lastMessageHtml: ReportActionsUtils.getReportActionHtml(iouAction),
                 pendingFields: {
                     createChat: CONST.RED_BRICK_ROAD_PENDING_ACTION.ADD,
                 },
@@ -837,12 +934,11 @@ function buildOnyxDataForInvoice(
             key: `${ONYXKEYS.COLLECTION.TRANSACTION}${transaction.transactionID}`,
             value: transaction,
         },
-        isNewChatReport && inviteReportAction
+        isNewChatReport
             ? {
                   onyxMethod: Onyx.METHOD.SET,
                   key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${chatReport?.reportID}`,
                   value: {
-                      [inviteReportAction.reportActionID]: inviteReportAction as ReportAction,
                       [chatCreatedAction.reportActionID]: chatCreatedAction,
                       [reportPreviewAction.reportActionID]: reportPreviewAction,
                   },
@@ -871,7 +967,7 @@ function buildOnyxDataForInvoice(
             onyxMethod: Onyx.METHOD.MERGE,
             key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${transactionThreadReport.reportID}`,
             value: {
-                [transactionThreadCreatedReportAction.reportActionID]: transactionThreadCreatedReportAction,
+                [transactionThreadCreatedReportAction?.reportActionID ?? '-1']: transactionThreadCreatedReportAction,
             },
         },
         // Remove the temporary transaction used during the creation flow
@@ -881,6 +977,7 @@ function buildOnyxDataForInvoice(
             value: null,
         },
     ];
+    const successData: OnyxUpdate[] = [];
 
     if (chatReport) {
         optimisticData.push({
@@ -913,29 +1010,48 @@ function buildOnyxDataForInvoice(
         });
     }
 
+    const redundantParticipants: Record<number, null> = {};
     if (!isEmptyObject(optimisticPersonalDetailListAction)) {
+        const successPersonalDetailListAction: Record<number, null> = {};
+
+        // BE will send different participants. We clear the optimistic ones to avoid duplicated entries
+        Object.keys(optimisticPersonalDetailListAction).forEach((accountIDKey) => {
+            const accountID = Number(accountIDKey);
+            successPersonalDetailListAction[accountID] = null;
+            redundantParticipants[accountID] = null;
+        });
+
         optimisticData.push({
             onyxMethod: Onyx.METHOD.MERGE,
             key: ONYXKEYS.PERSONAL_DETAILS_LIST,
             value: optimisticPersonalDetailListAction,
         });
+        successData.push({
+            onyxMethod: Onyx.METHOD.MERGE,
+            key: ONYXKEYS.PERSONAL_DETAILS_LIST,
+            value: successPersonalDetailListAction,
+        });
     }
 
-    const successData: OnyxUpdate[] = [
+    successData.push(
         {
             onyxMethod: Onyx.METHOD.MERGE,
             key: `${ONYXKEYS.COLLECTION.REPORT}${iouReport.reportID}`,
             value: {
+                participants: redundantParticipants,
                 pendingFields: null,
                 errorFields: null,
+                isOptimisticReport: false,
             },
         },
         {
             onyxMethod: Onyx.METHOD.MERGE,
             key: `${ONYXKEYS.COLLECTION.REPORT}${transactionThreadReport.reportID}`,
             value: {
+                participants: redundantParticipants,
                 pendingFields: null,
                 errorFields: null,
+                isOptimisticReport: false,
             },
         },
         {
@@ -981,19 +1097,20 @@ function buildOnyxDataForInvoice(
             onyxMethod: Onyx.METHOD.MERGE,
             key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${transactionThreadReport.reportID}`,
             value: {
-                [transactionThreadCreatedReportAction.reportActionID]: {
+                [transactionThreadCreatedReportAction?.reportActionID ?? '-1']: {
                     pendingAction: null,
                     errors: null,
                 },
             },
         },
-    ];
+    );
 
     if (isNewChatReport) {
         successData.push({
             onyxMethod: Onyx.METHOD.MERGE,
             key: `${ONYXKEYS.COLLECTION.REPORT}${chatReport?.reportID}`,
             value: {
+                participants: redundantParticipants,
                 pendingFields: null,
                 errorFields: null,
                 isOptimisticReport: false,
@@ -1015,7 +1132,7 @@ function buildOnyxDataForInvoice(
                 ...(isNewChatReport
                     ? {
                           errorFields: {
-                              createChat: ErrorUtils.getMicroSecondOnyxError('report.genericCreateReportFailureMessage'),
+                              createChat: ErrorUtils.getMicroSecondOnyxErrorWithTranslationKey('report.genericCreateReportFailureMessage'),
                           },
                       }
                     : {}),
@@ -1027,7 +1144,7 @@ function buildOnyxDataForInvoice(
             value: {
                 pendingFields: null,
                 errorFields: {
-                    createChat: ErrorUtils.getMicroSecondOnyxError('report.genericCreateReportFailureMessage'),
+                    createChat: ErrorUtils.getMicroSecondOnyxErrorWithTranslationKey('report.genericCreateReportFailureMessage'),
                 },
             },
         },
@@ -1036,7 +1153,7 @@ function buildOnyxDataForInvoice(
             key: `${ONYXKEYS.COLLECTION.REPORT}${transactionThreadReport.reportID}`,
             value: {
                 errorFields: {
-                    createChat: ErrorUtils.getMicroSecondOnyxError('report.genericCreateReportFailureMessage'),
+                    createChat: ErrorUtils.getMicroSecondOnyxErrorWithTranslationKey('report.genericCreateReportFailureMessage'),
                 },
             },
         },
@@ -1044,7 +1161,7 @@ function buildOnyxDataForInvoice(
             onyxMethod: Onyx.METHOD.MERGE,
             key: `${ONYXKEYS.COLLECTION.TRANSACTION}${transaction.transactionID}`,
             value: {
-                errors: ErrorUtils.getMicroSecondOnyxError('iou.error.genericCreateInvoiceFailureMessage'),
+                errors: ErrorUtils.getMicroSecondOnyxErrorWithTranslationKey('iou.error.genericCreateInvoiceFailureMessage'),
                 pendingAction: null,
                 pendingFields: clearedPendingFields,
             },
@@ -1059,7 +1176,7 @@ function buildOnyxDataForInvoice(
                     errors: getReceiptError(transaction.receipt, transaction.filename || transaction.receipt?.filename, false, errorKey),
                 },
                 [iouAction.reportActionID]: {
-                    errors: ErrorUtils.getMicroSecondOnyxError('iou.error.genericCreateInvoiceFailureMessage'),
+                    errors: ErrorUtils.getMicroSecondOnyxErrorWithTranslationKey('iou.error.genericCreateInvoiceFailureMessage'),
                 },
             },
         },
@@ -1067,19 +1184,70 @@ function buildOnyxDataForInvoice(
             onyxMethod: Onyx.METHOD.MERGE,
             key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${transactionThreadReport.reportID}`,
             value: {
-                [transactionThreadCreatedReportAction.reportActionID]: {
-                    errors: ErrorUtils.getMicroSecondOnyxError('iou.error.genericCreateInvoiceFailureMessage', false, errorKey),
+                [transactionThreadCreatedReportAction?.reportActionID ?? '-1']: {
+                    errors: ErrorUtils.getMicroSecondOnyxErrorWithTranslationKey('iou.error.genericCreateInvoiceFailureMessage', errorKey),
                 },
             },
         },
     ];
 
+    if (companyName && companyWebsite) {
+        optimisticData.push({
+            onyxMethod: Onyx.METHOD.MERGE,
+            key: `${ONYXKEYS.COLLECTION.POLICY}${policy?.id}`,
+            value: {
+                invoice: {
+                    companyName,
+                    companyWebsite,
+                    pendingFields: {
+                        companyName: CONST.RED_BRICK_ROAD_PENDING_ACTION.UPDATE,
+                        companyWebsite: CONST.RED_BRICK_ROAD_PENDING_ACTION.UPDATE,
+                    },
+                },
+            },
+        });
+        successData.push({
+            onyxMethod: Onyx.METHOD.MERGE,
+            key: `${ONYXKEYS.COLLECTION.POLICY}${policy?.id}`,
+            value: {
+                invoice: {
+                    pendingFields: {
+                        companyName: null,
+                        companyWebsite: null,
+                    },
+                },
+            },
+        });
+        failureData.push({
+            onyxMethod: Onyx.METHOD.MERGE,
+            key: `${ONYXKEYS.COLLECTION.POLICY}${policy?.id}`,
+            value: {
+                invoice: {
+                    companyName: undefined,
+                    companyWebsite: undefined,
+                    pendingFields: {
+                        companyName: null,
+                        companyWebsite: null,
+                    },
+                },
+            },
+        });
+    }
+
     // We don't need to compute violations unless we're on a paid policy
     if (!policy || !PolicyUtils.isPaidGroupPolicy(policy)) {
         return [optimisticData, successData, failureData];
     }
 
-    const violationsOnyxData = ViolationsUtils.getViolationsOnyxData(transaction, [], !!policy.requiresTag, policyTagList ?? {}, !!policy.requiresCategory, policyCategories ?? {});
+    const violationsOnyxData = ViolationsUtils.getViolationsOnyxData(
+        transaction,
+        [],
+        !!policy.requiresTag,
+        policyTagList ?? {},
+        !!policy.requiresCategory,
+        policyCategories ?? {},
+        PolicyUtils.hasDependentTags(policy, policyTagList ?? {}),
+    );
 
     if (violationsOnyxData) {
         optimisticData.push(violationsOnyxData);
@@ -1095,31 +1263,35 @@ function buildOnyxDataForInvoice(
 
 /** Builds the Onyx data for track expense */
 function buildOnyxDataForTrackExpense(
-    chatReport: OnyxEntry<OnyxTypes.Report>,
-    iouReport: OnyxEntry<OnyxTypes.Report>,
+    chatReport: OnyxInputValue<OnyxTypes.Report>,
+    iouReport: OnyxInputValue<OnyxTypes.Report>,
     transaction: OnyxTypes.Transaction,
     iouCreatedAction: OptimisticCreatedReportAction,
     iouAction: OptimisticIOUReportAction,
-    reportPreviewAction: OnyxEntry<ReportAction>,
-    transactionThreadReport: OptimisticChatReport | EmptyObject,
-    transactionThreadCreatedReportAction: OptimisticCreatedReportAction | EmptyObject,
+    reportPreviewAction: OnyxInputValue<ReportAction>,
+    transactionThreadReport: OptimisticChatReport | null,
+    transactionThreadCreatedReportAction: OptimisticCreatedReportAction | null,
     shouldCreateNewMoneyRequestReport: boolean,
-    policy?: OnyxEntry<OnyxTypes.Policy>,
-    policyTagList?: OnyxEntry<OnyxTypes.PolicyTagList>,
-    policyCategories?: OnyxEntry<OnyxTypes.PolicyCategories>,
+    policy?: OnyxInputValue<OnyxTypes.Policy>,
+    policyTagList?: OnyxInputValue<OnyxTypes.PolicyTagLists>,
+    policyCategories?: OnyxInputValue<OnyxTypes.PolicyCategories>,
     existingTransactionThreadReportID?: string,
+    actionableTrackExpenseWhisper?: OnyxInputValue<OnyxTypes.ReportAction>,
 ): [OnyxUpdate[], OnyxUpdate[], OnyxUpdate[]] {
     const isScanRequest = TransactionUtils.isScanRequest(transaction);
     const isDistanceRequest = TransactionUtils.isDistanceRequest(transaction);
     const clearedPendingFields = Object.fromEntries(Object.keys(transaction.pendingFields ?? {}).map((key) => [key, null]));
     const optimisticData: OnyxUpdate[] = [];
+    const successData: OnyxUpdate[] = [];
+    const failureData: OnyxUpdate[] = [];
+
     let newQuickAction: ValueOf<typeof CONST.QUICK_ACTIONS> = CONST.QUICK_ACTIONS.TRACK_MANUAL;
     if (isScanRequest) {
         newQuickAction = CONST.QUICK_ACTIONS.TRACK_SCAN;
     } else if (isDistanceRequest) {
         newQuickAction = CONST.QUICK_ACTIONS.TRACK_DISTANCE;
     }
-    const existingTransactionThreadReport = allReports?.[`${ONYXKEYS.COLLECTION.REPORT}${existingTransactionThreadReportID}`] ?? null;
+    const existingTransactionThreadReport = ReportConnection.getAllReports()?.[`${ONYXKEYS.COLLECTION.REPORT}${existingTransactionThreadReportID}`] ?? null;
 
     if (chatReport) {
         optimisticData.push(
@@ -1128,8 +1300,8 @@ function buildOnyxDataForTrackExpense(
                 key: `${ONYXKEYS.COLLECTION.REPORT}${chatReport.reportID}`,
                 value: {
                     ...chatReport,
-                    lastMessageText: iouAction.message?.[0]?.text,
-                    lastMessageHtml: iouAction.message?.[0]?.html,
+                    lastMessageText: ReportActionsUtils.getReportActionText(iouAction),
+                    lastMessageHtml: ReportActionsUtils.getReportActionHtml(iouAction),
                     lastReadTime: DateUtils.getDBTime(),
                     iouReportID: iouReport?.reportID,
                 },
@@ -1144,6 +1316,36 @@ function buildOnyxDataForTrackExpense(
                 },
             },
         );
+
+        if (actionableTrackExpenseWhisper && !iouReport) {
+            optimisticData.push({
+                onyxMethod: Onyx.METHOD.MERGE,
+                key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${chatReport?.reportID}`,
+                value: {
+                    [actionableTrackExpenseWhisper.reportActionID]: actionableTrackExpenseWhisper,
+                },
+            });
+            optimisticData.push({
+                onyxMethod: Onyx.METHOD.MERGE,
+                key: `${ONYXKEYS.COLLECTION.REPORT}${chatReport.reportID}`,
+                value: {
+                    lastVisibleActionCreated: actionableTrackExpenseWhisper.created,
+                    lastMessageText: CONST.ACTIONABLE_TRACK_EXPENSE_WHISPER_MESSAGE,
+                },
+            });
+            successData.push({
+                onyxMethod: Onyx.METHOD.MERGE,
+                key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${chatReport?.reportID}`,
+                value: {
+                    [actionableTrackExpenseWhisper.reportActionID]: {pendingAction: null, errors: null},
+                },
+            });
+            failureData.push({
+                onyxMethod: Onyx.METHOD.SET,
+                key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${chatReport?.reportID}`,
+                value: {[actionableTrackExpenseWhisper.reportActionID]: {} as ReportAction},
+            });
+        }
     }
 
     if (iouReport) {
@@ -1153,8 +1355,8 @@ function buildOnyxDataForTrackExpense(
                 key: `${ONYXKEYS.COLLECTION.REPORT}${iouReport.reportID}`,
                 value: {
                     ...iouReport,
-                    lastMessageText: iouAction.message?.[0]?.text,
-                    lastMessageHtml: iouAction.message?.[0]?.html,
+                    lastMessageText: ReportActionsUtils.getReportActionText(iouAction),
+                    lastMessageHtml: ReportActionsUtils.getReportActionHtml(iouAction),
                     pendingFields: {
                         ...(shouldCreateNewMoneyRequestReport ? {createChat: CONST.RED_BRICK_ROAD_PENDING_ACTION.ADD} : {preview: CONST.RED_BRICK_ROAD_PENDING_ACTION.UPDATE}),
                     },
@@ -1202,7 +1404,7 @@ function buildOnyxDataForTrackExpense(
         },
         {
             onyxMethod: Onyx.METHOD.MERGE,
-            key: `${ONYXKEYS.COLLECTION.REPORT}${transactionThreadReport.reportID}`,
+            key: `${ONYXKEYS.COLLECTION.REPORT}${transactionThreadReport?.reportID}`,
             value: {
                 ...transactionThreadReport,
                 pendingFields: {createChat: CONST.RED_BRICK_ROAD_PENDING_ACTION.ADD},
@@ -1219,15 +1421,13 @@ function buildOnyxDataForTrackExpense(
     if (!isEmptyObject(transactionThreadCreatedReportAction)) {
         optimisticData.push({
             onyxMethod: Onyx.METHOD.MERGE,
-            key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${transactionThreadReport.reportID}`,
+            key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${transactionThreadReport?.reportID}`,
             value: {
                 [transactionThreadCreatedReportAction.reportActionID]: transactionThreadCreatedReportAction,
             },
         });
     }
 
-    const successData: OnyxUpdate[] = [];
-
     if (iouReport) {
         successData.push(
             {
@@ -1281,7 +1481,7 @@ function buildOnyxDataForTrackExpense(
     successData.push(
         {
             onyxMethod: Onyx.METHOD.MERGE,
-            key: `${ONYXKEYS.COLLECTION.REPORT}${transactionThreadReport.reportID}`,
+            key: `${ONYXKEYS.COLLECTION.REPORT}${transactionThreadReport?.reportID}`,
             value: {
                 pendingFields: null,
                 errorFields: null,
@@ -1293,6 +1493,7 @@ function buildOnyxDataForTrackExpense(
             value: {
                 pendingAction: null,
                 pendingFields: clearedPendingFields,
+                routes: null,
             },
         },
     );
@@ -1300,7 +1501,7 @@ function buildOnyxDataForTrackExpense(
     if (!isEmptyObject(transactionThreadCreatedReportAction)) {
         successData.push({
             onyxMethod: Onyx.METHOD.MERGE,
-            key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${transactionThreadReport.reportID}`,
+            key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${transactionThreadReport?.reportID}`,
             value: {
                 [transactionThreadCreatedReportAction.reportActionID]: {
                     pendingAction: null,
@@ -1310,12 +1511,10 @@ function buildOnyxDataForTrackExpense(
         });
     }
 
-    const failureData: OnyxUpdate[] = [];
-
     failureData.push({
         onyxMethod: Onyx.METHOD.SET,
         key: ONYXKEYS.NVP_QUICK_ACTION_GLOBAL_CREATE,
-        value: quickAction,
+        value: quickAction ?? null,
     });
 
     if (iouReport) {
@@ -1326,7 +1525,7 @@ function buildOnyxDataForTrackExpense(
                 value: {
                     pendingFields: null,
                     errorFields: {
-                        ...(shouldCreateNewMoneyRequestReport ? {createChat: ErrorUtils.getMicroSecondOnyxError('report.genericCreateReportFailureMessage')} : {}),
+                        ...(shouldCreateNewMoneyRequestReport ? {createChat: ErrorUtils.getMicroSecondOnyxErrorWithTranslationKey('report.genericCreateReportFailureMessage')} : {}),
                     },
                 },
             },
@@ -1342,7 +1541,7 @@ function buildOnyxDataForTrackExpense(
                                   errors: getReceiptError(transaction.receipt, transaction.filename || transaction.receipt?.filename, isScanRequest),
                               },
                               [iouAction.reportActionID]: {
-                                  errors: ErrorUtils.getMicroSecondOnyxError('iou.error.genericCreateFailureMessage'),
+                                  errors: ErrorUtils.getMicroSecondOnyxErrorWithTranslationKey('iou.error.genericCreateFailureMessage'),
                               },
                           }
                         : {
@@ -1381,13 +1580,13 @@ function buildOnyxDataForTrackExpense(
         },
         {
             onyxMethod: Onyx.METHOD.MERGE,
-            key: `${ONYXKEYS.COLLECTION.REPORT}${transactionThreadReport.reportID}`,
+            key: `${ONYXKEYS.COLLECTION.REPORT}${transactionThreadReport?.reportID}`,
             value: {
                 pendingFields: null,
                 errorFields: existingTransactionThreadReport
                     ? null
                     : {
-                          createChat: ErrorUtils.getMicroSecondOnyxError('report.genericCreateReportFailureMessage'),
+                          createChat: ErrorUtils.getMicroSecondOnyxErrorWithTranslationKey('report.genericCreateReportFailureMessage'),
                       },
             },
         },
@@ -1395,17 +1594,18 @@ function buildOnyxDataForTrackExpense(
             onyxMethod: Onyx.METHOD.MERGE,
             key: `${ONYXKEYS.COLLECTION.TRANSACTION}${transaction.transactionID}`,
             value: {
-                errors: ErrorUtils.getMicroSecondOnyxError('iou.error.genericCreateFailureMessage'),
-                pendingAction: null,
+                // Disabling this line since transaction.filename can be an empty string
+                // eslint-disable-next-line @typescript-eslint/prefer-nullish-coalescing
+                errors: getReceiptError(transaction.receipt, transaction.filename || transaction.receipt?.filename, isScanRequest),
                 pendingFields: clearedPendingFields,
             },
         },
         {
             onyxMethod: Onyx.METHOD.MERGE,
-            key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${transactionThreadReport.reportID}`,
+            key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${transactionThreadReport?.reportID}`,
             value: {
-                [transactionThreadCreatedReportAction.reportActionID]: {
-                    errors: ErrorUtils.getMicroSecondOnyxError('iou.error.genericCreateFailureMessage'),
+                [transactionThreadCreatedReportAction?.reportActionID ?? '-1']: {
+                    errors: ErrorUtils.getMicroSecondOnyxErrorWithTranslationKey('iou.error.genericCreateFailureMessage'),
                 },
             },
         },
@@ -1416,7 +1616,15 @@ function buildOnyxDataForTrackExpense(
         return [optimisticData, successData, failureData];
     }
 
-    const violationsOnyxData = ViolationsUtils.getViolationsOnyxData(transaction, [], !!policy.requiresTag, policyTagList ?? {}, !!policy.requiresCategory, policyCategories ?? {});
+    const violationsOnyxData = ViolationsUtils.getViolationsOnyxData(
+        transaction,
+        [],
+        !!policy.requiresTag,
+        policyTagList ?? {},
+        !!policy.requiresCategory,
+        policyCategories ?? {},
+        PolicyUtils.hasDependentTags(policy, policyTagList ?? {}),
+    );
 
     if (violationsOnyxData) {
         optimisticData.push(violationsOnyxData);
@@ -1427,6 +1635,13 @@ function buildOnyxDataForTrackExpense(
         });
     }
 
+    // Show field violations only for control policies
+    if (PolicyUtils.isControlPolicy(policy) && iouReport) {
+        const {optimisticData: fieldViolationsOptimisticData, failureData: fieldViolationsFailureData} = getFieldViolationsOnyxData(iouReport);
+        optimisticData.push(...fieldViolationsOptimisticData);
+        failureData.push(...fieldViolationsFailureData);
+    }
+
     return [optimisticData, successData, failureData];
 }
 
@@ -1436,7 +1651,10 @@ function getDeleteTrackExpenseInformation(
     reportAction: OnyxTypes.ReportAction,
     shouldDeleteTransactionFromOnyx = true,
     isMovingTransactionFromTrackExpense = false,
+    actionableWhisperReportActionID = '',
+    resolution = '',
 ) {
+    const allReports = ReportConnection.getAllReports();
     // STEP 1: Get all collections we're updating
     const chatReport = allReports?.[`${ONYXKEYS.COLLECTION.REPORT}${chatReportID}`] ?? null;
     const transaction = allTransactions[`${ONYXKEYS.COLLECTION.TRANSACTION}${transactionID}`];
@@ -1473,10 +1691,10 @@ function getDeleteTrackExpenseInformation(
             },
             errors: undefined,
         },
+        ...(actionableWhisperReportActionID && {[actionableWhisperReportActionID]: {originalMessage: {resolution}}}),
     } as OnyxTypes.ReportActions;
-
-    const lastVisibleAction = ReportActionsUtils.getLastVisibleAction(chatReport?.reportID ?? '', updatedReportAction);
-    const reportLastMessageText = ReportActionsUtils.getLastVisibleMessage(chatReport?.reportID ?? '', updatedReportAction).lastMessageText;
+    const lastVisibleAction = ReportActionsUtils.getLastVisibleAction(chatReport?.reportID ?? '-1', updatedReportAction);
+    const {lastMessageText = '', lastMessageHtml = ''} = ReportActionsUtils.getLastVisibleMessage(chatReport?.reportID ?? '-1', updatedReportAction);
 
     // STEP 4: Build Onyx data
     const optimisticData: OnyxUpdate[] = [];
@@ -1489,13 +1707,11 @@ function getDeleteTrackExpenseInformation(
         });
     }
 
-    if (Permissions.canUseViolations(betas)) {
-        optimisticData.push({
-            onyxMethod: Onyx.METHOD.SET,
-            key: `${ONYXKEYS.COLLECTION.TRANSACTION_VIOLATIONS}${transactionID}`,
-            value: null,
-        });
-    }
+    optimisticData.push({
+        onyxMethod: Onyx.METHOD.SET,
+        key: `${ONYXKEYS.COLLECTION.TRANSACTION_VIOLATIONS}${transactionID}`,
+        value: null,
+    });
 
     if (shouldDeleteTransactionThread) {
         optimisticData.push(
@@ -1522,8 +1738,9 @@ function getDeleteTrackExpenseInformation(
             onyxMethod: Onyx.METHOD.MERGE,
             key: `${ONYXKEYS.COLLECTION.REPORT}${chatReport?.reportID}`,
             value: {
-                lastMessageText: reportLastMessageText,
+                lastMessageText,
                 lastVisibleActionCreated: lastVisibleAction?.created,
+                lastMessageHtml: !lastMessageHtml ? lastMessageText : lastMessageHtml,
             },
         },
     );
@@ -1547,17 +1764,15 @@ function getDeleteTrackExpenseInformation(
         failureData.push({
             onyxMethod: Onyx.METHOD.SET,
             key: `${ONYXKEYS.COLLECTION.TRANSACTION}${transactionID}`,
-            value: transaction,
+            value: transaction ?? null,
         });
     }
 
-    if (Permissions.canUseViolations(betas)) {
-        failureData.push({
-            onyxMethod: Onyx.METHOD.SET,
-            key: `${ONYXKEYS.COLLECTION.TRANSACTION_VIOLATIONS}${transactionID}`,
-            value: transactionViolations,
-        });
-    }
+    failureData.push({
+        onyxMethod: Onyx.METHOD.SET,
+        key: `${ONYXKEYS.COLLECTION.TRANSACTION_VIOLATIONS}${transactionID}`,
+        value: transactionViolations ?? null,
+    });
 
     if (shouldDeleteTransactionThread) {
         failureData.push({
@@ -1567,6 +1782,22 @@ function getDeleteTrackExpenseInformation(
         });
     }
 
+    if (actionableWhisperReportActionID) {
+        const actionableWhisperReportAction = ReportActionsUtils.getReportAction(chatReportID, actionableWhisperReportActionID);
+        failureData.push({
+            onyxMethod: Onyx.METHOD.MERGE,
+            key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${chatReport?.reportID}`,
+            value: {
+                [actionableWhisperReportActionID]: {
+                    originalMessage: {
+                        resolution: ReportActionsUtils.isActionableTrackExpense(actionableWhisperReportAction)
+                            ? ReportActionsUtils.getOriginalMessage(actionableWhisperReportAction)?.resolution ?? null
+                            : null,
+                    },
+                },
+            },
+        });
+    }
     failureData.push(
         {
             onyxMethod: Onyx.METHOD.MERGE,
@@ -1575,7 +1806,7 @@ function getDeleteTrackExpenseInformation(
                 [reportAction.reportActionID]: {
                     ...reportAction,
                     pendingAction: null,
-                    errors: ErrorUtils.getMicroSecondOnyxError('iou.error.genericDeleteFailureMessage'),
+                    errors: ErrorUtils.getMicroSecondOnyxErrorWithTranslationKey('iou.error.genericDeleteFailureMessage'),
                 },
             },
         },
@@ -1601,14 +1832,16 @@ function getSendInvoiceInformation(
     invoiceChatReport?: OnyxEntry<OnyxTypes.Report>,
     receipt?: Receipt,
     policy?: OnyxEntry<OnyxTypes.Policy>,
-    policyTagList?: OnyxEntry<OnyxTypes.PolicyTagList>,
+    policyTagList?: OnyxEntry<OnyxTypes.PolicyTagLists>,
     policyCategories?: OnyxEntry<OnyxTypes.PolicyCategories>,
+    companyName?: string,
+    companyWebsite?: string,
 ): SendInvoiceInformation {
-    const {amount = 0, currency = '', created = '', merchant = '', category = '', tag = '', billable, comment, participants} = transaction ?? {};
+    const {amount = 0, currency = '', created = '', merchant = '', category = '', tag = '', taxCode = '', taxAmount = 0, billable, comment, participants} = transaction ?? {};
     const trimmedComment = (comment?.comment ?? '').trim();
-    const senderWorkspaceID = participants?.find((participant) => participant?.isSender)?.policyID ?? '';
-    const receiverParticipant = participants?.find((participant) => participant?.accountID);
-    const receiverAccountID = receiverParticipant?.accountID ?? -1;
+    const senderWorkspaceID = participants?.find((participant) => participant?.isSender)?.policyID ?? '-1';
+    const receiverParticipant = participants?.find((participant) => participant?.accountID) ?? invoiceChatReport?.invoiceReceiver;
+    const receiverAccountID = receiverParticipant && 'accountID' in receiverParticipant && receiverParticipant.accountID ? receiverParticipant.accountID : -1;
     let receiver = ReportUtils.getPersonalDetailsForAccountID(receiverAccountID);
     let optimisticPersonalDetailListAction = {};
 
@@ -1617,7 +1850,7 @@ function getSendInvoiceInformation(
     let chatReport = !isEmptyObject(invoiceChatReport) && invoiceChatReport?.reportID ? invoiceChatReport : null;
 
     if (!chatReport) {
-        chatReport = ReportUtils.getInvoiceChatByParticipants(senderWorkspaceID, receiverAccountID);
+        chatReport = ReportUtils.getInvoiceChatByParticipants(senderWorkspaceID, receiverAccountID) ?? null;
     }
 
     if (!chatReport) {
@@ -1650,20 +1883,22 @@ function getSendInvoiceInformation(
         undefined,
         category,
         tag,
+        taxCode,
+        taxAmount,
         billable,
     );
 
-    const optimisticPolicyRecentlyUsedCategories = Policy.buildOptimisticPolicyRecentlyUsedCategories(optimisticInvoiceReport.policyID, category);
-    const optimisticPolicyRecentlyUsedTags = Policy.buildOptimisticPolicyRecentlyUsedTags(optimisticInvoiceReport.policyID, tag);
+    const optimisticPolicyRecentlyUsedCategories = Category.buildOptimisticPolicyRecentlyUsedCategories(optimisticInvoiceReport.policyID, category);
+    const optimisticPolicyRecentlyUsedTags = Tag.buildOptimisticPolicyRecentlyUsedTags(optimisticInvoiceReport.policyID, tag);
 
     // STEP 4: Add optimistic personal details for participant
     const shouldCreateOptimisticPersonalDetails = isNewChatReport && !allPersonalDetails[receiverAccountID];
     if (shouldCreateOptimisticPersonalDetails) {
+        const receiverLogin = receiverParticipant && 'login' in receiverParticipant && receiverParticipant.login ? receiverParticipant.login : '';
         receiver = {
             accountID: receiverAccountID,
-            avatar: UserUtils.getDefaultAvatarURL(receiverAccountID),
-            displayName: LocalePhoneNumber.formatPhoneNumber(receiverParticipant?.login ?? ''),
-            login: receiverParticipant?.login,
+            displayName: LocalePhoneNumber.formatPhoneNumber(receiverLogin),
+            login: receiverLogin,
             isOptimisticPersonalDetail: true,
         };
 
@@ -1671,7 +1906,9 @@ function getSendInvoiceInformation(
     }
 
     // STEP 5: Build optimistic reportActions.
-    let inviteReportAction: OptimisticInviteReportAction | undefined;
+    const reportPreviewAction = ReportUtils.buildOptimisticReportPreview(chatReport, optimisticInvoiceReport, trimmedComment, optimisticTransaction);
+    optimisticInvoiceReport.parentReportActionID = reportPreviewAction.reportActionID;
+    chatReport.lastVisibleActionCreated = reportPreviewAction.created;
     const [optimisticCreatedActionForChat, optimisticCreatedActionForIOUReport, iouAction, optimisticTransactionThread, optimisticCreatedActionForTransactionThread] =
         ReportUtils.buildOptimisticMoneyRequestEntities(
             optimisticInvoiceReport,
@@ -1685,13 +1922,8 @@ function getSendInvoiceInformation(
             undefined,
             false,
             false,
-            receiptObject,
             false,
         );
-    if (isNewChatReport) {
-        inviteReportAction = ReportUtils.buildOptimisticInviteReportAction(receiver?.displayName ?? '', receiver.accountID ?? -1);
-    }
-    const reportPreviewAction = ReportUtils.buildOptimisticReportPreview(chatReport, optimisticInvoiceReport, trimmedComment, optimisticTransaction);
 
     // STEP 6: Build Onyx Data
     const [optimisticData, successData, failureData] = buildOnyxDataForInvoice(
@@ -1708,16 +1940,20 @@ function getSendInvoiceInformation(
         isNewChatReport,
         optimisticTransactionThread,
         optimisticCreatedActionForTransactionThread,
-        inviteReportAction,
         policy,
         policyTagList,
         policyCategories,
+        companyName,
+        companyWebsite,
     );
 
     return {
+        createdIOUReportActionID: optimisticCreatedActionForIOUReport.reportActionID,
+        createdReportActionIDForThread: optimisticCreatedActionForTransactionThread?.reportActionID ?? '-1',
+        reportActionID: iouAction.reportActionID,
         senderWorkspaceID,
         receiver,
-        invoiceRoomReportID: chatReport.reportID,
+        invoiceRoom: chatReport,
         createdChatReportActionID: optimisticCreatedActionForChat.reportActionID,
         invoiceReportID: optimisticInvoiceReport.reportID,
         reportPreviewReportActionID: reportPreviewAction.reportActionID,
@@ -1736,7 +1972,7 @@ function getSendInvoiceInformation(
  * it creates optimistic versions of them and uses those instead
  */
 function getMoneyRequestInformation(
-    parentChatReport: OnyxEntry<OnyxTypes.Report> | EmptyObject,
+    parentChatReport: OnyxEntry<OnyxTypes.Report>,
     participant: Participant,
     comment: string,
     amount: number,
@@ -1747,9 +1983,11 @@ function getMoneyRequestInformation(
     existingTransactionID: string | undefined,
     category: string | undefined,
     tag: string | undefined,
+    taxCode: string | undefined,
+    taxAmount: number | undefined,
     billable: boolean | undefined,
     policy: OnyxEntry<OnyxTypes.Policy> | undefined,
-    policyTagList: OnyxEntry<OnyxTypes.PolicyTagList> | undefined,
+    policyTagList: OnyxEntry<OnyxTypes.PolicyTagLists> | undefined,
     policyCategories: OnyxEntry<OnyxTypes.PolicyCategories> | undefined,
     payeeAccountID = userAccountID,
     payeeEmail = currentUserEmail,
@@ -1764,6 +2002,7 @@ function getMoneyRequestInformation(
     let isNewChatReport = false;
     let chatReport = !isEmptyObject(parentChatReport) && parentChatReport?.reportID ? parentChatReport : null;
 
+    const allReports = ReportConnection.getAllReports();
     // If this is a policyExpenseChat, the chatReport must exist and we can get it from Onyx.
     // report is null if the flow is initiated from the global create menu. However, participant always stores the reportID if it exists, which is the case for policyExpenseChats
     if (!chatReport && isPolicyExpenseChat) {
@@ -1771,18 +2010,18 @@ function getMoneyRequestInformation(
     }
 
     if (!chatReport) {
-        chatReport = ReportUtils.getChatByParticipants([payerAccountID]);
+        chatReport = ReportUtils.getChatByParticipants([payerAccountID, payeeAccountID]) ?? null;
     }
 
     // If we still don't have a report, it likely doens't exist and we need to build an optimistic one
     if (!chatReport) {
         isNewChatReport = true;
-        chatReport = ReportUtils.buildOptimisticChatReport([payerAccountID]);
+        chatReport = ReportUtils.buildOptimisticChatReport([payerAccountID, payeeAccountID]);
     }
 
     // STEP 2: Get the Expense/IOU report. If the moneyRequestReportID has been provided, we want to add the transaction to this specific report.
     // If no such reportID has been provided, let's use the chatReport.iouReportID property. In case that is not present, build a new optimistic Expense/IOU report.
-    let iouReport: OnyxEntry<OnyxTypes.Report> = null;
+    let iouReport: OnyxInputValue<OnyxTypes.Report> = null;
     if (moneyRequestReportID) {
         iouReport = allReports?.[`${ONYXKEYS.COLLECTION.REPORT}${moneyRequestReportID}`] ?? null;
     } else {
@@ -1793,7 +2032,7 @@ function getMoneyRequestInformation(
 
     if (!iouReport || shouldCreateNewMoneyRequestReport) {
         iouReport = isPolicyExpenseChat
-            ? ReportUtils.buildOptimisticExpenseReport(chatReport.reportID, chatReport.policyID ?? '', payeeAccountID, amount, currency)
+            ? ReportUtils.buildOptimisticExpenseReport(chatReport.reportID, chatReport.policyID ?? '-1', payeeAccountID, amount, currency)
             : ReportUtils.buildOptimisticIOUReport(payeeAccountID, payerAccountID, amount, chatReport.reportID, currency);
     } else if (isPolicyExpenseChat) {
         iouReport = {...iouReport};
@@ -1804,14 +2043,8 @@ function getMoneyRequestInformation(
     } else {
         iouReport = IOUUtils.updateIOUOwnerAndTotal(iouReport, payeeAccountID, amount, currency);
     }
-    // STEP 3: Build optimistic receipt and transaction
-    const receiptObject: Receipt = {};
-    let filename;
-    if (receipt?.source) {
-        receiptObject.source = receipt.source;
-        receiptObject.state = receipt.state ?? CONST.IOU.RECEIPT_STATE.SCANREADY;
-        filename = receipt.name;
-    }
+
+    // STEP 3: Build an optimistic transaction with the receipt
     const existingTransaction = allTransactionDrafts[`${ONYXKEYS.COLLECTION.TRANSACTION_DRAFT}${existingTransactionID ?? CONST.IOU.OPTIMISTIC_TRANSACTION_ID}`];
     const isDistanceRequest = existingTransaction && existingTransaction.iouRequestType === CONST.IOU.REQUEST_TYPE.DISTANCE;
     let optimisticTransaction = TransactionUtils.buildOptimisticTransaction(
@@ -1823,17 +2056,19 @@ function getMoneyRequestInformation(
         '',
         '',
         merchant,
-        receiptObject,
-        filename,
+        receipt,
+        '',
         existingTransactionID,
         category,
         tag,
+        taxCode,
+        ReportUtils.isExpenseReport(iouReport) ? -(taxAmount ?? 0) : taxAmount,
         billable,
         isDistanceRequest ? {waypoints: CONST.RED_BRICK_ROAD_PENDING_ACTION.ADD} : undefined,
     );
 
-    const optimisticPolicyRecentlyUsedCategories = Policy.buildOptimisticPolicyRecentlyUsedCategories(iouReport.policyID, category);
-    const optimisticPolicyRecentlyUsedTags = Policy.buildOptimisticPolicyRecentlyUsedTags(iouReport.policyID, tag);
+    const optimisticPolicyRecentlyUsedCategories = Category.buildOptimisticPolicyRecentlyUsedCategories(iouReport.policyID, category);
+    const optimisticPolicyRecentlyUsedTags = Tag.buildOptimisticPolicyRecentlyUsedTags(iouReport.policyID, tag);
 
     // 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
@@ -1864,7 +2099,6 @@ function getMoneyRequestInformation(
             undefined,
             false,
             false,
-            receiptObject,
             false,
             undefined,
             linkedTrackedExpenseReportAction?.childReportID,
@@ -1877,6 +2111,7 @@ function getMoneyRequestInformation(
         reportPreviewAction = ReportUtils.updateReportPreview(iouReport, reportPreviewAction, false, comment, optimisticTransaction);
     } else {
         reportPreviewAction = ReportUtils.buildOptimisticReportPreview(chatReport, iouReport, comment, optimisticTransaction);
+        chatReport.lastVisibleActionCreated = reportPreviewAction.created;
 
         // 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.
@@ -1889,7 +2124,6 @@ function getMoneyRequestInformation(
         ? {
               [payerAccountID]: {
                   accountID: payerAccountID,
-                  avatar: UserUtils.getDefaultAvatarURL(payerAccountID),
                   // Disabling this line since participant.displayName can be an empty string
                   // eslint-disable-next-line @typescript-eslint/prefer-nullish-coalescing
                   displayName: LocalePhoneNumber.formatPhoneNumber(participant.displayName || payerEmail),
@@ -1915,7 +2149,7 @@ function getMoneyRequestInformation(
         optimisticPolicyRecentlyUsedTags,
         isNewChatReport,
         optimisticTransactionThread ?? {},
-        optimisticCreatedActionForTransactionThread ?? {},
+        optimisticCreatedActionForTransactionThread,
         shouldCreateNewMoneyRequestReport,
         policy,
         policyTagList,
@@ -1930,11 +2164,11 @@ function getMoneyRequestInformation(
         chatReport,
         transaction: optimisticTransaction,
         iouAction,
-        createdChatReportActionID: isNewChatReport ? optimisticCreatedActionForChat.reportActionID : '0',
-        createdIOUReportActionID: shouldCreateNewMoneyRequestReport ? optimisticCreatedActionForIOUReport.reportActionID : '0',
+        createdChatReportActionID: isNewChatReport ? optimisticCreatedActionForChat.reportActionID : '-1',
+        createdIOUReportActionID: shouldCreateNewMoneyRequestReport ? optimisticCreatedActionForIOUReport.reportActionID : '-1',
         reportPreviewAction,
-        transactionThreadReportID: optimisticTransactionThread?.reportID ?? '0',
-        createdReportActionIDForThread: optimisticCreatedActionForTransactionThread?.reportActionID ?? '0',
+        transactionThreadReportID: optimisticTransactionThread?.reportID ?? '-1',
+        createdReportActionIDForThread: optimisticCreatedActionForTransactionThread?.reportActionID ?? '-1',
         onyxData: {
             optimisticData,
             successData,
@@ -1948,31 +2182,37 @@ function getMoneyRequestInformation(
  * it creates optimistic versions of them and uses those instead
  */
 function getTrackExpenseInformation(
-    parentChatReport: OnyxEntry<OnyxTypes.Report> | EmptyObject,
+    parentChatReport: OnyxEntry<OnyxTypes.Report>,
     participant: Participant,
     comment: string,
     amount: number,
     currency: string,
     created: string,
     merchant: string,
-    receipt: Receipt | undefined,
+    receipt: OnyxEntry<Receipt>,
     category: string | undefined,
     tag: string | undefined,
+    taxCode: string | undefined,
+    taxAmount: number | undefined,
     billable: boolean | undefined,
     policy: OnyxEntry<OnyxTypes.Policy> | undefined,
-    policyTagList: OnyxEntry<OnyxTypes.PolicyTagList> | undefined,
+    policyTagList: OnyxEntry<OnyxTypes.PolicyTagLists> | undefined,
     policyCategories: OnyxEntry<OnyxTypes.PolicyCategories> | undefined,
     payeeEmail = currentUserEmail,
     payeeAccountID = userAccountID,
     moneyRequestReportID = '',
     linkedTrackedExpenseReportAction?: OnyxTypes.ReportAction,
     existingTransactionID?: string,
-): TrackExpenseInformation | EmptyObject {
+): TrackExpenseInformation | null {
+    const optimisticData: OnyxUpdate[] = [];
+    const successData: OnyxUpdate[] = [];
+    const failureData: OnyxUpdate[] = [];
+
     const isPolicyExpenseChat = participant.isPolicyExpenseChat;
 
     // STEP 1: Get existing chat report
     let chatReport = !isEmptyObject(parentChatReport) && parentChatReport?.reportID ? parentChatReport : null;
-
+    const allReports = ReportConnection.getAllReports();
     // The chatReport always exists, and we can get it from Onyx if chatReport is null.
     if (!chatReport) {
         chatReport = allReports?.[`${ONYXKEYS.COLLECTION.REPORT}${participant.reportID}`] ?? null;
@@ -1981,14 +2221,27 @@ function getTrackExpenseInformation(
     // If we still don't have a report, it likely doesn't exist, and we will early return here as it should not happen
     // Maybe later, we can build an optimistic selfDM chat.
     if (!chatReport) {
-        return {};
+        return null;
+    }
+
+    // Check if the report is a draft
+    const isDraftReport = ReportUtils.isDraftReport(chatReport?.reportID);
+
+    let createdWorkspaceParams: CreateWorkspaceParams | undefined;
+
+    if (isDraftReport) {
+        const workspaceData = Policy.buildPolicyData(undefined, policy?.makeMeAdmin, policy?.name, policy?.id, chatReport?.reportID);
+        createdWorkspaceParams = workspaceData.params;
+        optimisticData.push(...workspaceData.optimisticData);
+        successData.push(...workspaceData.successData);
+        failureData.push(...workspaceData.failureData);
     }
 
     // STEP 2: If not in the self-DM flow, we need to use the expense report.
     // For this, first use the chatReport.iouReportID property. Build a new optimistic expense report if needed.
     const shouldUseMoneyReport = !!isPolicyExpenseChat;
 
-    let iouReport: OnyxEntry<OnyxTypes.Report> = null;
+    let iouReport: OnyxInputValue<OnyxTypes.Report> = null;
     let shouldCreateNewMoneyRequestReport = false;
 
     if (shouldUseMoneyReport) {
@@ -2000,7 +2253,7 @@ function getTrackExpenseInformation(
 
         shouldCreateNewMoneyRequestReport = ReportUtils.shouldCreateNewMoneyRequestReport(iouReport, chatReport);
         if (!iouReport || shouldCreateNewMoneyRequestReport) {
-            iouReport = ReportUtils.buildOptimisticExpenseReport(chatReport.reportID, chatReport.policyID ?? '', payeeAccountID, amount, currency, false);
+            iouReport = ReportUtils.buildOptimisticExpenseReport(chatReport.reportID, chatReport.policyID ?? '-1', payeeAccountID, amount, currency, false);
         } else {
             iouReport = {...iouReport};
             if (iouReport?.currency === currency && typeof iouReport.total === 'number' && typeof iouReport.nonReimbursableTotal === 'number') {
@@ -2023,11 +2276,14 @@ function getTrackExpenseInformation(
         filename = receipt.name;
     }
     const existingTransaction = allTransactionDrafts[`${ONYXKEYS.COLLECTION.TRANSACTION_DRAFT}${existingTransactionID ?? CONST.IOU.OPTIMISTIC_TRANSACTION_ID}`];
+    if (!filename) {
+        filename = existingTransaction?.filename;
+    }
     const isDistanceRequest = existingTransaction && existingTransaction.iouRequestType === CONST.IOU.REQUEST_TYPE.DISTANCE;
     let optimisticTransaction = TransactionUtils.buildOptimisticTransaction(
         ReportUtils.isExpenseReport(iouReport) ? -amount : amount,
         currency,
-        shouldUseMoneyReport && iouReport ? iouReport.reportID : '0',
+        shouldUseMoneyReport && iouReport ? iouReport.reportID : '-1',
         comment,
         created,
         '',
@@ -2038,6 +2294,8 @@ function getTrackExpenseInformation(
         existingTransactionID ?? null,
         category,
         tag,
+        taxCode,
+        taxAmount,
         billable,
         isDistanceRequest ? {waypoints: CONST.RED_BRICK_ROAD_PENDING_ACTION.ADD} : undefined,
         false,
@@ -2069,14 +2327,13 @@ function getTrackExpenseInformation(
         undefined,
         false,
         false,
-        receiptObject,
         false,
         !shouldUseMoneyReport,
         linkedTrackedExpenseReportAction?.childReportID,
         linkedTrackedExpenseReportAction,
     );
 
-    let reportPreviewAction: OnyxEntry<OnyxTypes.ReportAction> = null;
+    let reportPreviewAction: OnyxInputValue<OnyxTypes.ReportAction<typeof CONST.REPORT.ACTIONS.TYPE.REPORT_PREVIEW>> = null;
     if (shouldUseMoneyReport && iouReport) {
         reportPreviewAction = shouldCreateNewMoneyRequestReport ? null : getReportPreviewAction(chatReport.reportID, iouReport.reportID);
 
@@ -2090,8 +2347,13 @@ function getTrackExpenseInformation(
         }
     }
 
+    let actionableTrackExpenseWhisper: OnyxInputValue<OnyxTypes.ReportAction> = null;
+    if (!isPolicyExpenseChat) {
+        actionableTrackExpenseWhisper = ReportUtils.buildOptimisticActionableTrackExpenseWhisper(iouAction, optimisticTransaction.transactionID);
+    }
+
     // STEP 5: Build Onyx Data
-    const [optimisticData, successData, failureData] = buildOnyxDataForTrackExpense(
+    const trackExpenseOnyxData = buildOnyxDataForTrackExpense(
         chatReport,
         iouReport,
         optimisticTransaction,
@@ -2099,122 +2361,43 @@ function getTrackExpenseInformation(
         iouAction,
         reportPreviewAction,
         optimisticTransactionThread ?? {},
-        (optimisticCreatedActionForTransactionThread as OptimisticCreatedReportAction) ?? {}, // Add type assertion here
+        optimisticCreatedActionForTransactionThread,
         shouldCreateNewMoneyRequestReport,
         policy,
         policyTagList,
         policyCategories,
+        undefined,
+        actionableTrackExpenseWhisper,
     );
 
     return {
+        createdWorkspaceParams,
         chatReport,
         iouReport: iouReport ?? undefined,
         transaction: optimisticTransaction,
         iouAction,
-        createdChatReportActionID: '0',
-        createdIOUReportActionID: shouldCreateNewMoneyRequestReport ? optimisticCreatedActionForIOUReport.reportActionID : '0',
+        createdChatReportActionID: '-1',
+        createdIOUReportActionID: shouldCreateNewMoneyRequestReport ? optimisticCreatedActionForIOUReport.reportActionID : '-1',
         reportPreviewAction: reportPreviewAction ?? undefined,
         transactionThreadReportID: optimisticTransactionThread.reportID,
-        createdReportActionIDForThread: optimisticCreatedActionForTransactionThread.reportActionID,
+        createdReportActionIDForThread: optimisticCreatedActionForTransactionThread?.reportActionID ?? '-1',
+        actionableWhisperReportActionIDParam: actionableTrackExpenseWhisper?.reportActionID ?? '',
         onyxData: {
-            optimisticData,
-            successData,
-            failureData,
+            optimisticData: optimisticData.concat(trackExpenseOnyxData[0]),
+            successData: successData.concat(trackExpenseOnyxData[1]),
+            failureData: failureData.concat(trackExpenseOnyxData[2]),
         },
     };
 }
 
-/** Requests money based on a distance (e.g. mileage from a map) */
-function createDistanceRequest(
-    report: OnyxEntry<OnyxTypes.Report>,
-    participant: Participant,
-    comment: string,
-    created: string,
-    category: string | undefined,
-    tag: string | undefined,
-    amount: number,
-    currency: string,
-    merchant: string,
-    billable: boolean | undefined,
-    validWaypoints: WaypointCollection,
-    policy?: OnyxEntry<OnyxTypes.Policy>,
-    policyTagList?: OnyxEntry<OnyxTypes.PolicyTagList>,
-    policyCategories?: OnyxEntry<OnyxTypes.PolicyCategories>,
-    customUnitRateID?: string,
-) {
-    // If the report is an 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 moneyRequestReportID = isMoneyRequestReport ? report?.reportID : '';
-    const currentCreated = DateUtils.enrichMoneyRequestTimestamp(created);
-
-    const optimisticReceipt: Receipt = {
-        source: ReceiptGeneric as ReceiptSource,
-        state: CONST.IOU.RECEIPT_STATE.OPEN,
-    };
-    const {
-        iouReport,
-        chatReport,
-        transaction,
-        iouAction,
-        createdChatReportActionID,
-        createdIOUReportActionID,
-        reportPreviewAction,
-        transactionThreadReportID,
-        createdReportActionIDForThread,
-        payerEmail,
-        onyxData,
-    } = getMoneyRequestInformation(
-        currentChatReport,
-        participant,
-        comment,
-        amount,
-        currency,
-        currentCreated,
-        merchant,
-        optimisticReceipt,
-        undefined,
-        category,
-        tag,
-        billable,
-        policy,
-        policyTagList,
-        policyCategories,
-        userAccountID,
-        currentUserEmail,
-        moneyRequestReportID,
-    );
-
-    const activeReportID = isMoneyRequestReport ? report?.reportID ?? '' : chatReport.reportID;
-    const parameters: CreateDistanceRequestParams = {
-        comment,
-        iouReportID: iouReport.reportID,
-        chatReportID: chatReport.reportID,
-        transactionID: transaction.transactionID,
-        reportActionID: iouAction.reportActionID,
-        createdChatReportActionID,
-        createdIOUReportActionID,
-        reportPreviewReportActionID: reportPreviewAction.reportActionID,
-        waypoints: JSON.stringify(validWaypoints),
-        created: currentCreated,
-        category,
-        tag,
-        billable,
-        transactionThreadReportID,
-        createdReportActionIDForThread,
-        payerEmail,
-        customUnitRateID,
-    };
-
-    API.write(WRITE_COMMANDS.CREATE_DISTANCE_REQUEST, parameters, onyxData);
-    Navigation.dismissModal(activeReportID);
-    Report.notifyNewAction(activeReportID, userAccountID);
-}
-
 /**
  * Compute the diff amount when we update the transaction
  */
-function calculateDiffAmount(iouReport: OnyxEntry<OnyxTypes.Report>, updatedTransaction: OnyxEntry<OnyxTypes.Transaction>, transaction: OnyxEntry<OnyxTypes.Transaction>): number {
+function calculateDiffAmount(
+    iouReport: OnyxTypes.OnyxInputOrEntry<OnyxTypes.Report>,
+    updatedTransaction: OnyxTypes.OnyxInputOrEntry<OnyxTypes.Transaction>,
+    transaction: OnyxEntry<OnyxTypes.Transaction>,
+): number {
     if (!iouReport) {
         return 0;
     }
@@ -2258,9 +2441,9 @@ function getUpdateMoneyRequestParams(
     transactionID: string,
     transactionThreadReportID: string,
     transactionChanges: TransactionChanges,
-    policy: OnyxEntry<OnyxTypes.Policy>,
-    policyTagList: OnyxEntry<OnyxTypes.PolicyTagList>,
-    policyCategories: OnyxEntry<OnyxTypes.PolicyCategories>,
+    policy: OnyxTypes.OnyxInputOrEntry<OnyxTypes.Policy>,
+    policyTagList: OnyxTypes.OnyxInputOrEntry<OnyxTypes.PolicyTagLists>,
+    policyCategories: OnyxTypes.OnyxInputOrEntry<OnyxTypes.PolicyCategories>,
     onlyIncludeChangedFields: boolean,
 ): UpdateMoneyRequestData {
     const optimisticData: OnyxUpdate[] = [];
@@ -2272,6 +2455,7 @@ function getUpdateMoneyRequestParams(
     const clearedPendingFields = Object.fromEntries(Object.keys(transactionChanges).map((key) => [key, null]));
     const errorFields = Object.fromEntries(Object.keys(pendingFields).map((key) => [key, {[DateUtils.getMicroseconds()]: Localize.translateLocal('iou.error.genericEditFailureMessage')}]));
 
+    const allReports = ReportConnection.getAllReports();
     // Step 2: Get all the collections being updated
     const transactionThread = allReports?.[`${ONYXKEYS.COLLECTION.REPORT}${transactionThreadReportID}`] ?? null;
     const transaction = allTransactions?.[`${ONYXKEYS.COLLECTION.TRANSACTION}${transactionID}`];
@@ -2297,12 +2481,11 @@ function getUpdateMoneyRequestParams(
     };
 
     const hasPendingWaypoints = 'waypoints' in transactionChanges;
-    if (transaction && updatedTransaction && hasPendingWaypoints) {
+    const hasModifiedDistanceRate = 'customUnitRateID' in transactionChanges;
+    if (transaction && updatedTransaction && (hasPendingWaypoints || hasModifiedDistanceRate)) {
         updatedTransaction = {
             ...updatedTransaction,
-            amount: CONST.IOU.DEFAULT_AMOUNT,
-            modifiedAmount: CONST.IOU.DEFAULT_AMOUNT,
-            modifiedMerchant: Localize.translateLocal('iou.fieldPending'),
+            ...TransactionUtils.calculateAmountForUpdatedWaypointOrRate(transaction, transactionChanges, policy, ReportUtils.isExpenseReport(iouReport)),
         };
 
         // Delete the draft transaction when editing waypoints when the server responds successfully and there are no errors
@@ -2326,11 +2509,13 @@ function getUpdateMoneyRequestParams(
     }
 
     // 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
+    // We don't create a modified report action if:
+    // - we're updating the waypoints
+    // - we're updating the distance rate while the waypoints are still pending
+    // In these cases, there isn't a valid optimistic mileage data we can use,
+    // and the report action is created on the server with the distance-related response from the MapBox API
     const updatedReportAction = ReportUtils.buildOptimisticModifiedExpenseReportAction(transactionThread, transaction, transactionChanges, isFromExpenseReport, policy);
-    if (!hasPendingWaypoints) {
+    if (!hasPendingWaypoints && !(hasModifiedDistanceRate && TransactionUtils.isFetchingWaypointsFromServer(transaction))) {
         params.reportActionID = updatedReportAction.reportActionID;
 
         optimisticData.push({
@@ -2340,6 +2525,22 @@ function getUpdateMoneyRequestParams(
                 [updatedReportAction.reportActionID]: updatedReportAction as OnyxTypes.ReportAction,
             },
         });
+        optimisticData.push({
+            onyxMethod: Onyx.METHOD.MERGE,
+            key: `${ONYXKEYS.COLLECTION.REPORT}${transactionThread?.reportID}`,
+            value: {
+                lastVisibleActionCreated: updatedReportAction.created,
+                lastReadTime: updatedReportAction.created,
+            },
+        });
+        failureData.push({
+            onyxMethod: Onyx.METHOD.MERGE,
+            key: `${ONYXKEYS.COLLECTION.REPORT}${transactionThread?.reportID}`,
+            value: {
+                lastVisibleActionCreated: transactionThread?.lastVisibleActionCreated,
+                lastReadTime: transactionThread?.lastReadTime,
+            },
+        });
         successData.push({
             onyxMethod: Onyx.METHOD.MERGE,
             key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${transactionThread?.reportID}`,
@@ -2353,7 +2554,7 @@ function getUpdateMoneyRequestParams(
             value: {
                 [updatedReportAction.reportActionID]: {
                     ...(updatedReportAction as OnyxTypes.ReportAction),
-                    errors: ErrorUtils.getMicroSecondOnyxError('iou.error.genericEditFailureMessage'),
+                    errors: ErrorUtils.getMicroSecondOnyxErrorWithTranslationKey('iou.error.genericEditFailureMessage'),
                 },
             },
         });
@@ -2362,10 +2563,10 @@ function getUpdateMoneyRequestParams(
     // Step 4: Compute the IOU total and update the report preview message (and report header) so LHN amount owed is correct.
     const diff = calculateDiffAmount(iouReport, updatedTransaction, transaction);
 
-    let updatedMoneyRequestReport: OnyxTypes.Report | EmptyObject;
+    let updatedMoneyRequestReport: OnyxTypes.OnyxInputOrEntry<OnyxTypes.Report>;
     if (!iouReport) {
-        updatedMoneyRequestReport = {};
-    } else if (ReportUtils.isExpenseReport(iouReport) && typeof iouReport.total === 'number') {
+        updatedMoneyRequestReport = null;
+    } else if ((ReportUtils.isExpenseReport(iouReport) || ReportUtils.isInvoiceReport(iouReport)) && typeof iouReport.total === 'number') {
         // For expense report, the amount is negative, so we should subtract total from diff
         updatedMoneyRequestReport = {
             ...iouReport,
@@ -2378,7 +2579,9 @@ function getUpdateMoneyRequestParams(
         updatedMoneyRequestReport = IOUUtils.updateIOUOwnerAndTotal(iouReport, updatedReportAction.actorAccountID ?? -1, diff, TransactionUtils.getCurrency(transaction), false, true);
     }
 
-    updatedMoneyRequestReport.cachedTotal = CurrencyUtils.convertToDisplayString(updatedMoneyRequestReport.total, transactionDetails?.currency);
+    if (updatedMoneyRequestReport) {
+        updatedMoneyRequestReport.cachedTotal = CurrencyUtils.convertToDisplayString(updatedMoneyRequestReport.total, transactionDetails?.currency);
+    }
 
     optimisticData.push(
         {
@@ -2424,8 +2627,10 @@ function getUpdateMoneyRequestParams(
                 onyxMethod: Onyx.METHOD.MERGE,
                 key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${iouReport?.reportID}`,
                 value: {
-                    [transactionThread?.parentReportActionID ?? '']: {
-                        whisperedToAccountIDs: [],
+                    [transactionThread?.parentReportActionID ?? '-1']: {
+                        originalMessage: {
+                            whisperedTo: [],
+                        },
                     },
                 },
             },
@@ -2433,8 +2638,10 @@ function getUpdateMoneyRequestParams(
                 onyxMethod: Onyx.METHOD.MERGE,
                 key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${iouReport?.parentReportID}`,
                 value: {
-                    [iouReport?.parentReportActionID ?? '']: {
-                        whisperedToAccountIDs: [],
+                    [iouReport?.parentReportActionID ?? '-1']: {
+                        originalMessage: {
+                            whisperedTo: [],
+                        },
                     },
                 },
             },
@@ -2443,7 +2650,7 @@ function getUpdateMoneyRequestParams(
 
     // Update recently used categories if the category is changed
     if ('category' in transactionChanges) {
-        const optimisticPolicyRecentlyUsedCategories = Policy.buildOptimisticPolicyRecentlyUsedCategories(iouReport?.policyID, transactionChanges.category);
+        const optimisticPolicyRecentlyUsedCategories = Category.buildOptimisticPolicyRecentlyUsedCategories(iouReport?.policyID, transactionChanges.category);
         if (optimisticPolicyRecentlyUsedCategories.length) {
             optimisticData.push({
                 onyxMethod: Onyx.METHOD.SET,
@@ -2455,7 +2662,7 @@ function getUpdateMoneyRequestParams(
 
     // Update recently used categories if the tag is changed
     if ('tag' in transactionChanges) {
-        const optimisticPolicyRecentlyUsedTags = Policy.buildOptimisticPolicyRecentlyUsedTags(iouReport?.policyID, transactionChanges.tag);
+        const optimisticPolicyRecentlyUsedTags = Tag.buildOptimisticPolicyRecentlyUsedTags(iouReport?.policyID, transactionChanges.tag);
         if (!isEmptyObject(optimisticPolicyRecentlyUsedTags)) {
             optimisticData.push({
                 onyxMethod: Onyx.METHOD.MERGE,
@@ -2473,6 +2680,7 @@ function getUpdateMoneyRequestParams(
             pendingFields: clearedPendingFields,
             isLoading: false,
             errorFields: null,
+            routes: null,
         },
     });
 
@@ -2496,7 +2704,7 @@ function getUpdateMoneyRequestParams(
         });
     }
 
-    if (policy && PolicyUtils.isPaidGroupPolicy(policy) && updatedTransaction) {
+    if (policy && PolicyUtils.isPaidGroupPolicy(policy) && updatedTransaction && ('tag' in transactionChanges || 'category' in transactionChanges)) {
         const currentTransactionViolations = allTransactionViolations[`${ONYXKEYS.COLLECTION.TRANSACTION_VIOLATIONS}${transactionID}`] ?? [];
         optimisticData.push(
             ViolationsUtils.getViolationsOnyxData(
@@ -2506,6 +2714,7 @@ function getUpdateMoneyRequestParams(
                 policyTagList ?? {},
                 !!policy.requiresCategory,
                 policyCategories ?? {},
+                PolicyUtils.hasDependentTags(policy, policyTagList ?? {}),
             ),
         );
         failureData.push({
@@ -2544,7 +2753,7 @@ function getUpdateTrackExpenseParams(
     transactionThreadReportID: string,
     transactionChanges: TransactionChanges,
     onlyIncludeChangedFields: boolean,
-    policy: OnyxEntry<OnyxTypes.Policy>,
+    policy: OnyxTypes.OnyxInputOrEntry<OnyxTypes.Policy>,
 ): UpdateMoneyRequestData {
     const optimisticData: OnyxUpdate[] = [];
     const successData: OnyxUpdate[] = [];
@@ -2555,6 +2764,7 @@ function getUpdateTrackExpenseParams(
     const clearedPendingFields = Object.fromEntries(Object.keys(transactionChanges).map((key) => [key, null]));
     const errorFields = Object.fromEntries(Object.keys(pendingFields).map((key) => [key, {[DateUtils.getMicroseconds()]: Localize.translateLocal('iou.error.genericEditFailureMessage')}]));
 
+    const allReports = ReportConnection.getAllReports();
     // Step 2: Get all the collections being updated
     const transactionThread = allReports?.[`${ONYXKEYS.COLLECTION.REPORT}${transactionThreadReportID}`] ?? null;
     const transaction = allTransactions?.[`${ONYXKEYS.COLLECTION.TRANSACTION}${transactionID}`];
@@ -2579,12 +2789,11 @@ function getUpdateTrackExpenseParams(
     };
 
     const hasPendingWaypoints = 'waypoints' in transactionChanges;
-    if (transaction && updatedTransaction && hasPendingWaypoints) {
+    const hasModifiedDistanceRate = 'customUnitRateID' in transactionChanges;
+    if (transaction && updatedTransaction && (hasPendingWaypoints || hasModifiedDistanceRate)) {
         updatedTransaction = {
             ...updatedTransaction,
-            amount: CONST.IOU.DEFAULT_AMOUNT,
-            modifiedAmount: CONST.IOU.DEFAULT_AMOUNT,
-            modifiedMerchant: Localize.translateLocal('iou.fieldPending'),
+            ...TransactionUtils.calculateAmountForUpdatedWaypointOrRate(transaction, transactionChanges, policy, false),
         };
 
         // Delete the draft transaction when editing waypoints when the server responds successfully and there are no errors
@@ -2608,11 +2817,13 @@ function getUpdateTrackExpenseParams(
     }
 
     // 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
+    // We don't create a modified report action if:
+    // - we're updating the waypoints
+    // - we're updating the distance rate while the waypoints are still pending
+    // In these cases, there isn't a valid optimistic mileage data we can use,
+    // and the report action is created on the server with the distance-related response from the MapBox API
     const updatedReportAction = ReportUtils.buildOptimisticModifiedExpenseReportAction(transactionThread, transaction, transactionChanges, false, policy);
-    if (!hasPendingWaypoints) {
+    if (!hasPendingWaypoints && !(hasModifiedDistanceRate && TransactionUtils.isFetchingWaypointsFromServer(transaction))) {
         params.reportActionID = updatedReportAction.reportActionID;
 
         optimisticData.push({
@@ -2635,7 +2846,7 @@ function getUpdateTrackExpenseParams(
             value: {
                 [updatedReportAction.reportActionID]: {
                     ...(updatedReportAction as OnyxTypes.ReportAction),
-                    errors: ErrorUtils.getMicroSecondOnyxError('iou.error.genericEditFailureMessage'),
+                    errors: ErrorUtils.getMicroSecondOnyxErrorWithTranslationKey('iou.error.genericEditFailureMessage'),
                 },
             },
         });
@@ -2667,8 +2878,10 @@ function getUpdateTrackExpenseParams(
             onyxMethod: Onyx.METHOD.MERGE,
             key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${chatReport?.reportID}`,
             value: {
-                [transactionThread?.parentReportActionID ?? '']: {
-                    whisperedToAccountIDs: [],
+                [transactionThread?.parentReportActionID ?? '-1']: {
+                    originalMessage: {
+                        whisperedTo: [],
+                    },
                 },
             },
         });
@@ -2682,6 +2895,7 @@ function getUpdateTrackExpenseParams(
             pendingFields: clearedPendingFields,
             isLoading: false,
             errorFields: null,
+            routes: null,
         },
     });
 
@@ -2715,12 +2929,13 @@ function updateMoneyRequestDate(
     transactionThreadReportID: string,
     value: string,
     policy: OnyxEntry<OnyxTypes.Policy>,
-    policyTags: OnyxEntry<OnyxTypes.PolicyTagList>,
+    policyTags: OnyxEntry<OnyxTypes.PolicyTagLists>,
     policyCategories: OnyxEntry<OnyxTypes.PolicyCategories>,
 ) {
     const transactionChanges: TransactionChanges = {
         created: value,
     };
+    const allReports = ReportConnection.getAllReports();
     const transactionThreadReport = allReports?.[`${ONYXKEYS.COLLECTION.REPORT}${transactionThreadReportID}`] ?? null;
     const parentReport = allReports?.[`${ONYXKEYS.COLLECTION.REPORT}${transactionThreadReport?.parentReportID}`] ?? null;
     let data: UpdateMoneyRequestData;
@@ -2739,7 +2954,7 @@ function updateMoneyRequestBillable(
     transactionThreadReportID: string,
     value: boolean,
     policy: OnyxEntry<OnyxTypes.Policy>,
-    policyTagList: OnyxEntry<OnyxTypes.PolicyTagList>,
+    policyTagList: OnyxEntry<OnyxTypes.PolicyTagLists>,
     policyCategories: OnyxEntry<OnyxTypes.PolicyCategories>,
 ) {
     const transactionChanges: TransactionChanges = {
@@ -2755,12 +2970,13 @@ function updateMoneyRequestMerchant(
     transactionThreadReportID: string,
     value: string,
     policy: OnyxEntry<OnyxTypes.Policy>,
-    policyTagList: OnyxEntry<OnyxTypes.PolicyTagList>,
+    policyTagList: OnyxEntry<OnyxTypes.PolicyTagLists>,
     policyCategories: OnyxEntry<OnyxTypes.PolicyCategories>,
 ) {
     const transactionChanges: TransactionChanges = {
         merchant: value,
     };
+    const allReports = ReportConnection.getAllReports();
     const transactionThreadReport = allReports?.[`${ONYXKEYS.COLLECTION.REPORT}${transactionThreadReportID}`] ?? null;
     const parentReport = allReports?.[`${ONYXKEYS.COLLECTION.REPORT}${transactionThreadReport?.parentReportID}`] ?? null;
     let data: UpdateMoneyRequestData;
@@ -2779,7 +2995,7 @@ function updateMoneyRequestTag(
     transactionThreadReportID: string,
     tag: string,
     policy: OnyxEntry<OnyxTypes.Policy>,
-    policyTagList: OnyxEntry<OnyxTypes.PolicyTagList>,
+    policyTagList: OnyxEntry<OnyxTypes.PolicyTagLists>,
     policyCategories: OnyxEntry<OnyxTypes.PolicyCategories>,
 ) {
     const transactionChanges: TransactionChanges = {
@@ -2795,7 +3011,7 @@ function updateMoneyRequestTaxAmount(
     optimisticReportActionID: string,
     taxAmount: number,
     policy: OnyxEntry<OnyxTypes.Policy>,
-    policyTagList: OnyxEntry<OnyxTypes.PolicyTagList>,
+    policyTagList: OnyxEntry<OnyxTypes.PolicyTagLists>,
     policyCategories: OnyxEntry<OnyxTypes.PolicyCategories>,
 ) {
     const transactionChanges = {
@@ -2805,17 +3021,21 @@ function updateMoneyRequestTaxAmount(
     API.write('UpdateMoneyRequestTaxAmount', params, onyxData);
 }
 
+type UpdateMoneyRequestTaxRateParams = {
+    transactionID: string;
+    optimisticReportActionID: string;
+    taxCode: string;
+    taxAmount: number;
+    policy: OnyxEntry<OnyxTypes.Policy>;
+    policyTagList: OnyxEntry<OnyxTypes.PolicyTagLists>;
+    policyCategories: OnyxEntry<OnyxTypes.PolicyCategories>;
+};
+
 /** Updates the created tax rate of an expense */
-function updateMoneyRequestTaxRate(
-    transactionID: string,
-    optimisticReportActionID: string,
-    taxCode: string,
-    policy: OnyxEntry<OnyxTypes.Policy>,
-    policyTagList: OnyxEntry<OnyxTypes.PolicyTagList>,
-    policyCategories: OnyxEntry<OnyxTypes.PolicyCategories>,
-) {
+function updateMoneyRequestTaxRate({transactionID, optimisticReportActionID, taxCode, taxAmount, policy, policyTagList, policyCategories}: UpdateMoneyRequestTaxRateParams) {
     const transactionChanges = {
         taxCode,
+        taxAmount,
     };
     const {params, onyxData} = getUpdateMoneyRequestParams(transactionID, optimisticReportActionID, transactionChanges, policy, policyTagList, policyCategories, true);
     API.write('UpdateMoneyRequestTaxRate', params, onyxData);
@@ -2825,8 +3045,9 @@ type UpdateMoneyRequestDistanceParams = {
     transactionID: string;
     transactionThreadReportID: string;
     waypoints: WaypointCollection;
+    routes?: Routes;
     policy?: OnyxEntry<OnyxTypes.Policy>;
-    policyTagList?: OnyxEntry<OnyxTypes.PolicyTagList>;
+    policyTagList?: OnyxEntry<OnyxTypes.PolicyTagLists>;
     policyCategories?: OnyxEntry<OnyxTypes.PolicyCategories>;
 };
 
@@ -2835,13 +3056,16 @@ function updateMoneyRequestDistance({
     transactionID,
     transactionThreadReportID,
     waypoints,
+    routes = undefined,
     policy = {} as OnyxTypes.Policy,
     policyTagList = {},
     policyCategories = {},
 }: UpdateMoneyRequestDistanceParams) {
     const transactionChanges: TransactionChanges = {
         waypoints,
+        routes,
     };
+    const allReports = ReportConnection.getAllReports();
     const transactionThreadReport = allReports?.[`${ONYXKEYS.COLLECTION.REPORT}${transactionThreadReportID}`] ?? null;
     const parentReport = allReports?.[`${ONYXKEYS.COLLECTION.REPORT}${transactionThreadReport?.parentReportID}`] ?? null;
     let data: UpdateMoneyRequestData;
@@ -2860,7 +3084,7 @@ function updateMoneyRequestCategory(
     transactionThreadReportID: string,
     category: string,
     policy: OnyxEntry<OnyxTypes.Policy>,
-    policyTagList: OnyxEntry<OnyxTypes.PolicyTagList>,
+    policyTagList: OnyxEntry<OnyxTypes.PolicyTagLists>,
     policyCategories: OnyxEntry<OnyxTypes.PolicyCategories>,
 ) {
     const transactionChanges: TransactionChanges = {
@@ -2876,12 +3100,13 @@ function updateMoneyRequestDescription(
     transactionThreadReportID: string,
     comment: string,
     policy: OnyxEntry<OnyxTypes.Policy>,
-    policyTagList: OnyxEntry<OnyxTypes.PolicyTagList>,
+    policyTagList: OnyxEntry<OnyxTypes.PolicyTagLists>,
     policyCategories: OnyxEntry<OnyxTypes.PolicyCategories>,
 ) {
     const transactionChanges: TransactionChanges = {
         comment,
     };
+    const allReports = ReportConnection.getAllReports();
     const transactionThreadReport = allReports?.[`${ONYXKEYS.COLLECTION.REPORT}${transactionThreadReportID}`] ?? null;
     const parentReport = allReports?.[`${ONYXKEYS.COLLECTION.REPORT}${transactionThreadReport?.parentReportID}`] ?? null;
     let data: UpdateMoneyRequestData;
@@ -2894,13 +3119,38 @@ function updateMoneyRequestDescription(
     API.write(WRITE_COMMANDS.UPDATE_MONEY_REQUEST_DESCRIPTION, params, onyxData);
 }
 
+/** Updates the distance rate of an expense */
+function updateMoneyRequestDistanceRate(
+    transactionID: string,
+    transactionThreadReportID: string,
+    rateID: string,
+    policy: OnyxEntry<OnyxTypes.Policy>,
+    policyTagList: OnyxEntry<OnyxTypes.PolicyTagLists>,
+    policyCategories: OnyxEntry<OnyxTypes.PolicyCategories>,
+) {
+    const transactionChanges: TransactionChanges = {
+        customUnitRateID: rateID,
+    };
+    const allReports = ReportConnection.getAllReports();
+    const transactionThreadReport = allReports?.[`${ONYXKEYS.COLLECTION.REPORT}${transactionThreadReportID}`] ?? null;
+    const parentReport = allReports?.[`${ONYXKEYS.COLLECTION.REPORT}${transactionThreadReport?.parentReportID}`] ?? null;
+    let data: UpdateMoneyRequestData;
+    if (ReportUtils.isTrackExpenseReport(transactionThreadReport) && ReportUtils.isSelfDM(parentReport)) {
+        data = getUpdateTrackExpenseParams(transactionID, transactionThreadReportID, transactionChanges, true, policy);
+    } else {
+        data = getUpdateMoneyRequestParams(transactionID, transactionThreadReportID, transactionChanges, policy, policyTagList, policyCategories, true);
+    }
+    const {params, onyxData} = data;
+    API.write(WRITE_COMMANDS.UPDATE_MONEY_REQUEST_DISTANCE_RATE, params, onyxData);
+}
+
 /** Edits an existing distance expense */
 function updateDistanceRequest(
     transactionID: string,
     transactionThreadReportID: string,
     transactionChanges: TransactionChanges,
     policy: OnyxTypes.Policy,
-    policyTagList: OnyxTypes.PolicyTagList,
+    policyTagList: OnyxTypes.PolicyTagLists,
     policyCategories: OnyxTypes.PolicyCategories,
 ) {
     const {params, onyxData} = getUpdateMoneyRequestParams(transactionID, transactionThreadReportID, transactionChanges, policy, policyTagList, policyCategories, false);
@@ -2925,7 +3175,7 @@ const getConvertTrackedExpenseInformation = (
         optimisticData: deleteOptimisticData,
         successData: deleteSuccessData,
         failureData: deleteFailureData,
-    } = getDeleteTrackExpenseInformation(linkedTrackedExpenseReportID, transactionID, linkedTrackedExpenseReportAction, false, true);
+    } = getDeleteTrackExpenseInformation(linkedTrackedExpenseReportID, transactionID, linkedTrackedExpenseReportAction, false, true, actionableWhisperReportActionID, resolution);
 
     optimisticData?.push(...deleteOptimisticData);
     successData?.push(...deleteSuccessData);
@@ -2954,32 +3204,7 @@ const getConvertTrackedExpenseInformation = (
         value: {
             [modifiedExpenseReportAction.reportActionID]: {
                 ...(modifiedExpenseReportAction as OnyxTypes.ReportAction),
-                errors: ErrorUtils.getMicroSecondOnyxError('iou.error.genericEditFailureMessage'),
-            },
-        },
-    });
-
-    // Resolve actionable whisper message
-    optimisticData?.push({
-        onyxMethod: Onyx.METHOD.MERGE,
-        key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${linkedTrackedExpenseReportID}`,
-        value: {
-            [actionableWhisperReportActionID]: {
-                originalMessage: {
-                    resolution,
-                },
-            },
-        },
-    });
-
-    failureData?.push({
-        onyxMethod: Onyx.METHOD.MERGE,
-        key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${linkedTrackedExpenseReportID}`,
-        value: {
-            [actionableWhisperReportActionID]: {
-                originalMessage: {
-                    resolution: null,
-                },
+                errors: ErrorUtils.getMicroSecondOnyxErrorWithTranslationKey('iou.error.genericEditFailureMessage'),
             },
         },
     });
@@ -3064,7 +3289,7 @@ function categorizeTrackedExpense(
     linkedTrackedExpenseReportID: string,
     transactionThreadReportID: string,
     reportPreviewReportActionID: string,
-    onyxData: OnyxData,
+    onyxData: OnyxData | undefined,
     amount: number,
     currency: string,
     comment: string,
@@ -3076,8 +3301,9 @@ function categorizeTrackedExpense(
     taxAmount = 0,
     billable?: boolean,
     receipt?: Receipt,
+    createdWorkspaceParams?: CreateWorkspaceParams,
 ) {
-    const {optimisticData, successData, failureData} = onyxData;
+    const {optimisticData, successData, failureData} = onyxData ?? {};
 
     const {
         optimisticData: moveTransactionOptimisticData,
@@ -3118,6 +3344,12 @@ function categorizeTrackedExpense(
         billable,
         created,
         receipt,
+        policyExpenseChatReportID: createdWorkspaceParams?.expenseChatReportID,
+        policyExpenseCreatedReportActionID: createdWorkspaceParams?.expenseCreatedReportActionID,
+        announceChatReportID: createdWorkspaceParams?.announceChatReportID,
+        announceCreatedReportActionID: createdWorkspaceParams?.announceCreatedReportActionID,
+        adminsChatReportID: createdWorkspaceParams?.adminsChatReportID,
+        adminsCreatedReportActionID: createdWorkspaceParams?.adminsCreatedReportActionID,
     };
 
     API.write(WRITE_COMMANDS.CATEGORIZE_TRACKED_EXPENSE, parameters, {optimisticData, successData, failureData});
@@ -3134,7 +3366,7 @@ function shareTrackedExpense(
     linkedTrackedExpenseReportID: string,
     transactionThreadReportID: string,
     reportPreviewReportActionID: string,
-    onyxData: OnyxData,
+    onyxData: OnyxData | undefined,
     amount: number,
     currency: string,
     comment: string,
@@ -3146,8 +3378,9 @@ function shareTrackedExpense(
     taxAmount = 0,
     billable?: boolean,
     receipt?: Receipt,
+    createdWorkspaceParams?: CreateWorkspaceParams,
 ) {
-    const {optimisticData, successData, failureData} = onyxData;
+    const {optimisticData, successData, failureData} = onyxData ?? {};
 
     const {
         optimisticData: moveTransactionOptimisticData,
@@ -3188,6 +3421,12 @@ function shareTrackedExpense(
         taxAmount,
         billable,
         receipt,
+        policyExpenseChatReportID: createdWorkspaceParams?.expenseChatReportID,
+        policyExpenseCreatedReportActionID: createdWorkspaceParams?.expenseCreatedReportActionID,
+        announceChatReportID: createdWorkspaceParams?.announceChatReportID,
+        announceCreatedReportActionID: createdWorkspaceParams?.announceCreatedReportActionID,
+        adminsChatReportID: createdWorkspaceParams?.adminsChatReportID,
+        adminsCreatedReportActionID: createdWorkspaceParams?.adminsCreatedReportActionID,
     };
 
     API.write(WRITE_COMMANDS.SHARE_TRACKED_EXPENSE, parameters, {optimisticData, successData, failureData});
@@ -3213,19 +3452,19 @@ function requestMoney(
     taxAmount = 0,
     billable?: boolean,
     policy?: OnyxEntry<OnyxTypes.Policy>,
-    policyTagList?: OnyxEntry<OnyxTypes.PolicyTagList>,
+    policyTagList?: OnyxEntry<OnyxTypes.PolicyTagLists>,
     policyCategories?: OnyxEntry<OnyxTypes.PolicyCategories>,
     gpsPoints?: GPSPoint,
     action?: IOUAction,
     actionableWhisperReportActionID?: string,
     linkedTrackedExpenseReportAction?: OnyxTypes.ReportAction,
     linkedTrackedExpenseReportID?: string,
+    reimbursible?: boolean,
 ) {
     // 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 currentChatReport = isMoneyRequestReport ? ReportUtils.getReportOrDraftReport(report?.chatReportID) : report;
     const moneyRequestReportID = isMoneyRequestReport ? report?.reportID : '';
-    const currentCreated = DateUtils.enrichMoneyRequestTimestamp(created);
     const isMovingTransactionFromTrackExpense = IOUUtils.isMovingTransactionFromTrackExpense(action);
 
     const {
@@ -3242,17 +3481,21 @@ function requestMoney(
         createdReportActionIDForThread,
         onyxData,
     } = getMoneyRequestInformation(
-        isMovingTransactionFromTrackExpense ? {} : currentChatReport,
+        isMovingTransactionFromTrackExpense ? undefined : currentChatReport,
         participant,
         comment,
         amount,
         currency,
-        currentCreated,
+        created,
         merchant,
         receipt,
-        isMovingTransactionFromTrackExpense ? (linkedTrackedExpenseReportAction?.originalMessage as IOUMessage)?.IOUTransactionID : undefined,
+        isMovingTransactionFromTrackExpense && linkedTrackedExpenseReportAction && ReportActionsUtils.isMoneyRequestAction(linkedTrackedExpenseReportAction)
+            ? ReportActionsUtils.getOriginalMessage(linkedTrackedExpenseReportAction)?.IOUTransactionID
+            : undefined,
         category,
         tag,
+        taxCode,
+        taxAmount,
         billable,
         policy,
         policyTagList,
@@ -3289,7 +3532,7 @@ function requestMoney(
                 currency,
                 comment,
                 merchant,
-                currentCreated,
+                created,
                 receipt,
             );
             break;
@@ -3301,7 +3544,7 @@ function requestMoney(
                 amount,
                 currency,
                 comment,
-                created: currentCreated,
+                created,
                 merchant,
                 iouReportID: iouReport.reportID,
                 chatReportID: chatReport.reportID,
@@ -3321,6 +3564,7 @@ function requestMoney(
                 receiptGpsPoints: gpsPoints ? JSON.stringify(gpsPoints) : undefined,
                 transactionThreadReportID,
                 createdReportActionIDForThread,
+                reimbursible,
             };
 
             // eslint-disable-next-line rulesdir/no-multiple-api-calls
@@ -3328,7 +3572,7 @@ function requestMoney(
         }
     }
 
-    Navigation.dismissModal(activeReportID);
+    Navigation.dismissModal(isSearchTopmostCentralPane() ? undefined : activeReportID);
     if (activeReportID) {
         Report.notifyNewAction(activeReportID, payeeAccountID);
     }
@@ -3340,44 +3584,58 @@ function sendInvoice(
     invoiceChatReport?: OnyxEntry<OnyxTypes.Report>,
     receiptFile?: Receipt,
     policy?: OnyxEntry<OnyxTypes.Policy>,
-    policyTagList?: OnyxEntry<OnyxTypes.PolicyTagList>,
+    policyTagList?: OnyxEntry<OnyxTypes.PolicyTagLists>,
     policyCategories?: OnyxEntry<OnyxTypes.PolicyCategories>,
+    companyName?: string,
+    companyWebsite?: string,
 ) {
-    const {senderWorkspaceID, receiver, invoiceRoomReportID, createdChatReportActionID, invoiceReportID, reportPreviewReportActionID, transactionID, transactionThreadReportID, onyxData} =
-        getSendInvoiceInformation(transaction, currentUserAccountID, invoiceChatReport, receiptFile, policy, policyTagList, policyCategories);
+    const {
+        senderWorkspaceID,
+        receiver,
+        invoiceRoom,
+        createdChatReportActionID,
+        invoiceReportID,
+        reportPreviewReportActionID,
+        transactionID,
+        transactionThreadReportID,
+        createdIOUReportActionID,
+        createdReportActionIDForThread,
+        reportActionID,
+        onyxData,
+    } = getSendInvoiceInformation(transaction, currentUserAccountID, invoiceChatReport, receiptFile, policy, policyTagList, policyCategories, companyName, companyWebsite);
 
-    let parameters: SendInvoiceParams = {
+    const parameters: SendInvoiceParams = {
+        createdIOUReportActionID,
+        createdReportActionIDForThread,
+        reportActionID,
         senderWorkspaceID,
         accountID: currentUserAccountID,
         amount: transaction?.amount ?? 0,
         currency: transaction?.currency ?? '',
+        comment: transaction?.comment?.comment?.trim() ?? '',
         merchant: transaction?.merchant ?? '',
         category: transaction?.category,
         date: transaction?.created ?? '',
-        invoiceRoomReportID,
+        invoiceRoomReportID: invoiceRoom.reportID,
         createdChatReportActionID,
         invoiceReportID,
         reportPreviewReportActionID,
         transactionID,
         transactionThreadReportID,
+        companyName,
+        companyWebsite,
+        ...(invoiceChatReport?.reportID ? {receiverInvoiceRoomID: invoiceChatReport.reportID} : {receiverEmail: receiver.login ?? ''}),
     };
 
-    if (invoiceChatReport) {
-        parameters = {
-            ...parameters,
-            receiverInvoiceRoomID: invoiceChatReport.reportID,
-        };
+    API.write(WRITE_COMMANDS.SEND_INVOICE, parameters, onyxData);
+
+    if (isSearchTopmostCentralPane()) {
+        Navigation.dismissModal();
     } else {
-        parameters = {
-            ...parameters,
-            receiverEmail: receiver.login,
-        };
+        Navigation.dismissModalWithReport(invoiceRoom);
     }
 
-    API.write(WRITE_COMMANDS.SEND_INVOICE, parameters, onyxData);
-
-    Navigation.dismissModal(invoiceRoomReportID);
-    Report.notifyNewAction(invoiceRoomReportID, receiver.accountID);
+    Report.notifyNewAction(invoiceRoom.reportID, receiver.accountID);
 }
 
 /**
@@ -3400,7 +3658,7 @@ function trackExpense(
     taxAmount = 0,
     billable?: boolean,
     policy?: OnyxEntry<OnyxTypes.Policy>,
-    policyTagList?: OnyxEntry<OnyxTypes.PolicyTagList>,
+    policyTagList?: OnyxEntry<OnyxTypes.PolicyTagLists>,
     policyCategories?: OnyxEntry<OnyxTypes.PolicyCategories>,
     gpsPoints?: GPSPoint,
     validWaypoints?: WaypointCollection,
@@ -3410,12 +3668,15 @@ function trackExpense(
     linkedTrackedExpenseReportID?: string,
 ) {
     const isMoneyRequestReport = ReportUtils.isMoneyRequestReport(report);
-    const currentChatReport = isMoneyRequestReport ? ReportUtils.getReport(report.chatReportID) : report;
+    const currentChatReport = isMoneyRequestReport ? ReportUtils.getReportOrDraftReport(report.chatReportID) : report;
     const moneyRequestReportID = isMoneyRequestReport ? report.reportID : '';
     const isMovingTransactionFromTrackExpense = IOUUtils.isMovingTransactionFromTrackExpense(action);
 
-    const currentCreated = DateUtils.enrichMoneyRequestTimestamp(created);
+    // Pass an open receipt so the distance expense will show a map with the route optimistically
+    const trackedReceipt = validWaypoints ? {source: ReceiptGeneric as ReceiptSource, state: CONST.IOU.RECEIPT_STATE.OPEN} : receipt;
+
     const {
+        createdWorkspaceParams,
         iouReport,
         chatReport,
         transaction,
@@ -3425,29 +3686,35 @@ function trackExpense(
         reportPreviewAction,
         transactionThreadReportID,
         createdReportActionIDForThread,
+        actionableWhisperReportActionIDParam,
         onyxData,
-    } = getTrackExpenseInformation(
-        currentChatReport,
-        participant,
-        comment,
-        amount,
-        currency,
-        currentCreated,
-        merchant,
-        receipt,
-        category,
-        tag,
-        billable,
-        policy,
-        policyTagList,
-        policyCategories,
-        payeeEmail,
-        payeeAccountID,
-        moneyRequestReportID,
-        linkedTrackedExpenseReportAction,
-        isMovingTransactionFromTrackExpense ? (linkedTrackedExpenseReportAction?.originalMessage as IOUMessage)?.IOUTransactionID : undefined,
-    );
-    const activeReportID = isMoneyRequestReport ? report.reportID : chatReport.reportID;
+    } =
+        getTrackExpenseInformation(
+            currentChatReport,
+            participant,
+            comment,
+            amount,
+            currency,
+            created,
+            merchant,
+            trackedReceipt,
+            category,
+            tag,
+            taxCode,
+            taxAmount,
+            billable,
+            policy,
+            policyTagList,
+            policyCategories,
+            payeeEmail,
+            payeeAccountID,
+            moneyRequestReportID,
+            linkedTrackedExpenseReportAction,
+            isMovingTransactionFromTrackExpense && linkedTrackedExpenseReportAction && ReportActionsUtils.isMoneyRequestAction(linkedTrackedExpenseReportAction)
+                ? ReportActionsUtils.getOriginalMessage(linkedTrackedExpenseReportAction)?.IOUTransactionID
+                : undefined,
+        ) ?? {};
+    const activeReportID = isMoneyRequestReport ? report.reportID : chatReport?.reportID;
 
     switch (action) {
         case CONST.IOU.ACTION.CATEGORIZE: {
@@ -3455,28 +3722,29 @@ function trackExpense(
                 return;
             }
             categorizeTrackedExpense(
-                chatReport.policyID ?? '',
-                transaction.transactionID,
-                iouAction.reportActionID,
-                iouReport?.reportID ?? '',
-                createdIOUReportActionID ?? '',
+                chatReport?.policyID ?? '-1',
+                transaction?.transactionID ?? '-1',
+                iouAction?.reportActionID ?? '-1',
+                iouReport?.reportID ?? '-1',
+                createdIOUReportActionID ?? '-1',
                 actionableWhisperReportActionID,
                 linkedTrackedExpenseReportAction,
                 linkedTrackedExpenseReportID,
-                transactionThreadReportID,
-                reportPreviewAction?.reportActionID ?? '',
+                transactionThreadReportID ?? '-1',
+                reportPreviewAction?.reportActionID ?? '-1',
                 onyxData,
                 amount,
                 currency,
                 comment,
                 merchant,
-                currentCreated,
+                created,
                 category,
                 tag,
                 taxCode,
                 taxAmount,
                 billable,
-                receipt,
+                trackedReceipt,
+                createdWorkspaceParams,
             );
             break;
         }
@@ -3485,28 +3753,29 @@ function trackExpense(
                 return;
             }
             shareTrackedExpense(
-                chatReport.policyID ?? '',
-                transaction.transactionID,
-                iouAction.reportActionID,
-                iouReport?.reportID ?? '',
-                createdIOUReportActionID ?? '',
+                chatReport?.policyID ?? '-1',
+                transaction?.transactionID ?? '-1',
+                iouAction?.reportActionID ?? '-1',
+                iouReport?.reportID ?? '-1',
+                createdIOUReportActionID ?? '-1',
                 actionableWhisperReportActionID,
                 linkedTrackedExpenseReportAction,
                 linkedTrackedExpenseReportID,
-                transactionThreadReportID,
-                reportPreviewAction?.reportActionID ?? '',
+                transactionThreadReportID ?? '-1',
+                reportPreviewAction?.reportActionID ?? '-1',
                 onyxData,
                 amount,
                 currency,
                 comment,
                 merchant,
-                currentCreated,
+                created,
                 category,
                 tag,
                 taxCode,
                 taxAmount,
                 billable,
-                receipt,
+                trackedReceipt,
+                createdWorkspaceParams,
             );
             break;
         }
@@ -3515,17 +3784,17 @@ function trackExpense(
                 amount,
                 currency,
                 comment,
-                created: currentCreated,
+                created,
                 merchant,
                 iouReportID: iouReport?.reportID,
-                chatReportID: chatReport.reportID,
-                transactionID: transaction.transactionID,
-                reportActionID: iouAction.reportActionID,
-                createdChatReportActionID,
+                chatReportID: chatReport?.reportID ?? '-1',
+                transactionID: transaction?.transactionID ?? '-1',
+                reportActionID: iouAction?.reportActionID ?? '-1',
+                createdChatReportActionID: createdChatReportActionID ?? '-1',
                 createdIOUReportActionID,
                 reportPreviewReportActionID: reportPreviewAction?.reportActionID,
-                receipt,
-                receiptState: receipt?.state,
+                receipt: trackedReceipt,
+                receiptState: trackedReceipt?.state,
                 category,
                 tag,
                 taxCode,
@@ -3533,21 +3802,23 @@ function trackExpense(
                 billable,
                 // This needs to be a string of JSON because of limitations with the fetch() API and nested objects
                 receiptGpsPoints: gpsPoints ? JSON.stringify(gpsPoints) : undefined,
-                transactionThreadReportID,
-                createdReportActionIDForThread,
+                transactionThreadReportID: transactionThreadReportID ?? '-1',
+                createdReportActionIDForThread: createdReportActionIDForThread ?? '-1',
                 waypoints: validWaypoints ? JSON.stringify(validWaypoints) : undefined,
             };
-
+            if (actionableWhisperReportActionIDParam) {
+                parameters.actionableWhisperReportActionID = actionableWhisperReportActionIDParam;
+            }
             API.write(WRITE_COMMANDS.TRACK_EXPENSE, parameters, onyxData);
         }
     }
-    Navigation.dismissModal(activeReportID);
+    Navigation.dismissModal(isSearchTopmostCentralPane() ? undefined : activeReportID);
 
     if (action === CONST.IOU.ACTION.SHARE) {
-        Navigation.navigate(ROUTES.ROOM_INVITE.getRoute(activeReportID ?? '', CONST.IOU.SHARE.ROLE.ACCOUNTANT));
+        Navigation.navigate(ROUTES.ROOM_INVITE.getRoute(activeReportID ?? '-1', CONST.IOU.SHARE.ROLE.ACCOUNTANT));
     }
 
-    Report.notifyNewAction(activeReportID, payeeAccountID);
+    Report.notifyNewAction(activeReportID ?? '', payeeAccountID);
 }
 
 function getOrCreateOptimisticSplitChatReport(existingSplitChatReportID: string, participants: Participant[], participantAccountIDs: number[], currentUserAccountID: number) {
@@ -3555,12 +3826,11 @@ function getOrCreateOptimisticSplitChatReport(existingSplitChatReportID: string,
     const existingChatReportID = existingSplitChatReportID || participants[0].reportID;
 
     // Check if the report is available locally if we do have one
-    let existingSplitChatReport = allReports?.[`${ONYXKEYS.COLLECTION.REPORT}${existingChatReportID}`];
+    let existingSplitChatReport = existingChatReportID ? ReportConnection.getAllReports()?.[`${ONYXKEYS.COLLECTION.REPORT}${existingChatReportID}`] : null;
 
-    // If we do not have one locally then we will search for a chat with the same participants (only for 1:1 chats).
-    const shouldGetOrCreateOneOneDM = participants.length < 2;
-    if (!existingSplitChatReport && shouldGetOrCreateOneOneDM) {
-        existingSplitChatReport = ReportUtils.getChatByParticipants(participantAccountIDs);
+    const allParticipantsAccountIDs = [...participantAccountIDs, currentUserAccountID];
+    if (!existingSplitChatReport) {
+        existingSplitChatReport = ReportUtils.getChatByParticipants(allParticipantsAccountIDs, undefined, participantAccountIDs.length > 1);
     }
 
     // We found an existing chat report we are done...
@@ -3569,9 +3839,6 @@ function getOrCreateOptimisticSplitChatReport(existingSplitChatReportID: string,
         return {existingSplitChatReport, splitChatReport: existingSplitChatReport};
     }
 
-    // No existing chat by this point we need to create it
-    const allParticipantsAccountIDs = [...participantAccountIDs, currentUserAccountID];
-
     // Create a Group Chat if we have multiple participants
     if (participants.length > 1) {
         const splitChatReport = ReportUtils.buildOptimisticChatReport(
@@ -3590,7 +3857,7 @@ function getOrCreateOptimisticSplitChatReport(existingSplitChatReportID: string,
     }
 
     // Otherwise, create a new 1:1 chat report
-    const splitChatReport = ReportUtils.buildOptimisticChatReport(allParticipantsAccountIDs);
+    const splitChatReport = ReportUtils.buildOptimisticChatReport(participantAccountIDs);
     return {existingSplitChatReport: null, splitChatReport};
 }
 
@@ -3619,10 +3886,12 @@ function createSplitsAndOnyxData(
     created: string,
     category: string,
     tag: string,
+    splitShares: SplitShares = {},
     existingSplitChatReportID = '',
     billable = false,
     iouRequestType: IOURequestType = CONST.IOU.REQUEST_TYPE.MANUAL,
-    splitPayerAccountIDs: number[] = [],
+    taxCode = '',
+    taxAmount = 0,
 ): SplitsAndOnyxData {
     const currentUserEmailForIOUSplit = PhoneNumber.addSMSDomainIfPhoneNumber(currentUserLogin);
     const participantAccountIDs = participants.map((participant) => Number(participant.accountID));
@@ -3630,7 +3899,12 @@ function createSplitsAndOnyxData(
     const {splitChatReport, existingSplitChatReport} = getOrCreateOptimisticSplitChatReport(existingSplitChatReportID, participants, participantAccountIDs, currentUserAccountID);
     const isOwnPolicyExpenseChat = !!splitChatReport.isOwnPolicyExpenseChat;
 
-    const splitTransaction = TransactionUtils.buildOptimisticTransaction(
+    // Pass an open receipt so the distance expense will show a map with the route optimistically
+    const receipt: Receipt | undefined = iouRequestType === CONST.IOU.REQUEST_TYPE.DISTANCE ? {source: ReceiptGeneric as ReceiptSource, state: CONST.IOU.RECEIPT_STATE.OPEN} : undefined;
+
+    const existingTransaction = allTransactionDrafts[`${ONYXKEYS.COLLECTION.TRANSACTION_DRAFT}${CONST.IOU.OPTIMISTIC_TRANSACTION_ID}`];
+    const isDistanceRequest = existingTransaction && existingTransaction.iouRequestType === CONST.IOU.REQUEST_TYPE.DISTANCE;
+    let splitTransaction = TransactionUtils.buildOptimisticTransaction(
         amount,
         currency,
         CONST.REPORT.SPLIT_REPORTID,
@@ -3639,14 +3913,22 @@ function createSplitsAndOnyxData(
         '',
         '',
         merchant || Localize.translateLocal('iou.expense'),
-        undefined,
+        receipt,
         undefined,
         undefined,
         category,
         tag,
+        taxCode,
+        taxAmount,
         billable,
+        isDistanceRequest ? {waypoints: CONST.RED_BRICK_ROAD_PENDING_ACTION.ADD} : undefined,
     );
 
+    // Important data is set on the draft distance transaction, such as the iouRequestType marking it as a distance request, so merge it into the optimistic split transaction
+    if (isDistanceRequest) {
+        splitTransaction = fastMerge(existingTransaction, splitTransaction, false);
+    }
+
     // Note: The created action must be optimistically generated before the IOU action so there's no chance that the created action appears after the IOU action in the chat
     const splitCreatedReportAction = ReportUtils.buildOptimisticCreatedReportAction(currentUserEmailForIOUSplit);
     const splitIOUReportAction = ReportUtils.buildOptimisticIOUReportAction(
@@ -3660,13 +3942,14 @@ function createSplitsAndOnyxData(
         '',
         false,
         false,
-        {},
         isOwnPolicyExpenseChat,
     );
 
     splitChatReport.lastReadTime = DateUtils.getDBTime();
-    splitChatReport.lastMessageText = splitIOUReportAction.message?.[0]?.text;
-    splitChatReport.lastMessageHtml = splitIOUReportAction.message?.[0]?.html;
+    splitChatReport.lastMessageText = ReportActionsUtils.getReportActionText(splitIOUReportAction);
+    splitChatReport.lastMessageHtml = ReportActionsUtils.getReportActionHtml(splitIOUReportAction);
+    splitChatReport.lastActorAccountID = currentUserAccountID;
+    splitChatReport.lastVisibleActionCreated = splitIOUReportAction.created;
 
     let splitChatReportNotificationPreference = splitChatReport.notificationPreference;
     if (splitChatReportNotificationPreference === CONST.REPORT.NOTIFICATION_PREFERENCE.HIDDEN) {
@@ -3727,7 +4010,6 @@ function createSplitsAndOnyxData(
             value: null,
         },
     ];
-
     const successData: OnyxUpdate[] = [
         {
             onyxMethod: Onyx.METHOD.MERGE,
@@ -3740,15 +4022,16 @@ function createSplitsAndOnyxData(
         {
             onyxMethod: Onyx.METHOD.MERGE,
             key: `${ONYXKEYS.COLLECTION.TRANSACTION}${splitTransaction.transactionID}`,
-            value: {pendingAction: null},
+            value: {pendingAction: null, pendingFields: null},
         },
     ];
 
+    const redundantParticipants: Record<number, null> = {};
     if (!existingSplitChatReport) {
         successData.push({
             onyxMethod: Onyx.METHOD.MERGE,
             key: `${ONYXKEYS.COLLECTION.REPORT}${splitChatReport.reportID}`,
-            value: {pendingFields: {createChat: null}},
+            value: {pendingFields: {createChat: null}, participants: redundantParticipants},
         });
     }
 
@@ -3757,7 +4040,9 @@ function createSplitsAndOnyxData(
             onyxMethod: Onyx.METHOD.MERGE,
             key: `${ONYXKEYS.COLLECTION.TRANSACTION}${splitTransaction.transactionID}`,
             value: {
-                errors: ErrorUtils.getMicroSecondOnyxError('iou.error.genericCreateFailureMessage'),
+                errors: ErrorUtils.getMicroSecondOnyxErrorWithTranslationKey('iou.error.genericCreateFailureMessage'),
+                pendingAction: null,
+                pendingFields: null,
             },
         },
     ];
@@ -3768,7 +4053,7 @@ function createSplitsAndOnyxData(
             key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${splitChatReport.reportID}`,
             value: {
                 [splitIOUReportAction.reportActionID]: {
-                    errors: ErrorUtils.getMicroSecondOnyxError('iou.error.genericCreateFailureMessage'),
+                    errors: ErrorUtils.getMicroSecondOnyxErrorWithTranslationKey('iou.error.genericCreateFailureMessage'),
                 },
             },
         });
@@ -3779,7 +4064,7 @@ function createSplitsAndOnyxData(
                 key: `${ONYXKEYS.COLLECTION.REPORT}${splitChatReport.reportID}`,
                 value: {
                     errorFields: {
-                        createChat: ErrorUtils.getMicroSecondOnyxError('report.genericCreateReportFailureMessage'),
+                        createChat: ErrorUtils.getMicroSecondOnyxErrorWithTranslationKey('report.genericCreateReportFailureMessage'),
                     },
                 },
             },
@@ -3788,7 +4073,7 @@ function createSplitsAndOnyxData(
                 key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${splitChatReport.reportID}`,
                 value: {
                     [splitIOUReportAction.reportActionID]: {
-                        errors: ErrorUtils.getMicroSecondOnyxError('iou.error.genericCreateFailureMessage'),
+                        errors: ErrorUtils.getMicroSecondOnyxErrorWithTranslationKey('iou.error.genericCreateFailureMessage'),
                     },
                 },
             },
@@ -3796,19 +4081,23 @@ function createSplitsAndOnyxData(
     }
 
     // Loop through participants creating individual chats, iouReports and reportActionIDs as needed
-    const splits: Split[] = [
-        {
-            email: currentUserEmailForIOUSplit,
-            accountID: currentUserAccountID,
-            amount: IOUUtils.calculateAmount(participants.length, amount, currency, splitPayerAccountIDs.includes(currentUserAccountID)),
-        },
-    ];
+    const currentUserAmount = splitShares?.[currentUserAccountID]?.amount ?? IOUUtils.calculateAmount(participants.length, amount, currency, true);
+    const currentUserTaxAmount = IOUUtils.calculateAmount(participants.length, taxAmount, currency, true);
+
+    const splits: Split[] = [{email: currentUserEmailForIOUSplit, accountID: currentUserAccountID, amount: currentUserAmount, taxAmount: currentUserTaxAmount}];
 
     const hasMultipleParticipants = participants.length > 1;
     participants.forEach((participant) => {
-        const splitAmount = IOUUtils.calculateAmount(participants.length, amount, currency, splitPayerAccountIDs.includes(participant.accountID ?? 0));
         // In a case when a participant is a workspace, even when a current user is not an owner of the workspace
         const isPolicyExpenseChat = ReportUtils.isPolicyExpenseChat(participant);
+        const splitAmount = splitShares?.[participant.accountID ?? -1]?.amount ?? IOUUtils.calculateAmount(participants.length, amount, currency, false);
+        const splitTaxAmount = IOUUtils.calculateAmount(participants.length, taxAmount, currency, false);
+
+        // To exclude someone from a split, the amount can be 0. The scenario for this is when creating a split from a group chat, we have remove the option to deselect users to exclude them.
+        // We can input '0' next to someone we want to exclude.
+        if (splitAmount === 0) {
+            return;
+        }
 
         // In case the participant is a workspace, email & accountID should remain undefined and won't be used in the rest of this code
         // participant.login is undefined when the request is initiated from a group DM with an unknown user, so we need to add a default
@@ -3834,19 +4123,21 @@ function createSplitsAndOnyxData(
             oneOnOneChatReport = splitChatReport;
             shouldCreateOptimisticPersonalDetails = !existingSplitChatReport && !personalDetailExists;
         } else {
-            const existingChatReport = ReportUtils.getChatByParticipants([accountID]);
+            const existingChatReport = ReportUtils.getChatByParticipants([accountID, currentUserAccountID]);
             isNewOneOnOneChatReport = !existingChatReport;
             shouldCreateOptimisticPersonalDetails = isNewOneOnOneChatReport && !personalDetailExists;
-            oneOnOneChatReport = existingChatReport ?? ReportUtils.buildOptimisticChatReport([accountID]);
+            oneOnOneChatReport = existingChatReport ?? ReportUtils.buildOptimisticChatReport([accountID, currentUserAccountID]);
         }
 
         // STEP 2: Get existing IOU/Expense report and update its total OR build a new optimistic one
-        let oneOnOneIOUReport: OneOnOneIOUReport = oneOnOneChatReport.iouReportID ? allReports?.[`${ONYXKEYS.COLLECTION.REPORT}${oneOnOneChatReport.iouReportID}`] : null;
+        let oneOnOneIOUReport: OneOnOneIOUReport = oneOnOneChatReport.iouReportID
+            ? ReportConnection.getAllReports()?.[`${ONYXKEYS.COLLECTION.REPORT}${oneOnOneChatReport.iouReportID}`]
+            : null;
         const shouldCreateNewOneOnOneIOUReport = ReportUtils.shouldCreateNewMoneyRequestReport(oneOnOneIOUReport, oneOnOneChatReport);
 
         if (!oneOnOneIOUReport || shouldCreateNewOneOnOneIOUReport) {
             oneOnOneIOUReport = isOwnPolicyExpenseChat
-                ? ReportUtils.buildOptimisticExpenseReport(oneOnOneChatReport.reportID, oneOnOneChatReport.policyID ?? '', currentUserAccountID, splitAmount, currency)
+                ? ReportUtils.buildOptimisticExpenseReport(oneOnOneChatReport.reportID, oneOnOneChatReport.policyID ?? '-1', currentUserAccountID, splitAmount, currency)
                 : ReportUtils.buildOptimisticIOUReport(currentUserAccountID, accountID, splitAmount, oneOnOneChatReport.reportID, currency);
         } else if (isOwnPolicyExpenseChat) {
             if (typeof oneOnOneIOUReport?.total === 'number') {
@@ -3872,6 +4163,8 @@ function createSplitsAndOnyxData(
             undefined,
             category,
             tag,
+            taxCode,
+            ReportUtils.isExpenseReport(oneOnOneIOUReport) ? -splitTaxAmount : splitTaxAmount,
             billable,
         );
 
@@ -3898,7 +4191,6 @@ function createSplitsAndOnyxData(
             ? {
                   [accountID]: {
                       accountID,
-                      avatar: UserUtils.getDefaultAvatarURL(accountID),
                       // Disabling this line since participant.displayName can be an empty string
                       // eslint-disable-next-line @typescript-eslint/prefer-nullish-coalescing
                       displayName: LocalePhoneNumber.formatPhoneNumber(participant.displayName || email),
@@ -3908,6 +4200,11 @@ function createSplitsAndOnyxData(
               }
             : {};
 
+        if (shouldCreateOptimisticPersonalDetails) {
+            // BE will send different participants. We clear the optimistic ones to avoid duplicated entries
+            redundantParticipants[accountID] = null;
+        }
+
         let oneOnOneReportPreviewAction = getReportPreviewAction(oneOnOneChatReport.reportID, oneOnOneIOUReport.reportID);
         if (oneOnOneReportPreviewAction) {
             oneOnOneReportPreviewAction = ReportUtils.updateReportPreview(oneOnOneIOUReport, oneOnOneReportPreviewAction);
@@ -3916,10 +4213,10 @@ function createSplitsAndOnyxData(
         }
 
         // Add category to optimistic policy recently used categories when a participant is a workspace
-        const optimisticPolicyRecentlyUsedCategories = isPolicyExpenseChat ? Policy.buildOptimisticPolicyRecentlyUsedCategories(participant.policyID, category) : [];
+        const optimisticPolicyRecentlyUsedCategories = isPolicyExpenseChat ? Category.buildOptimisticPolicyRecentlyUsedCategories(participant.policyID, category) : [];
 
         // Add tag to optimistic policy recently used tags when a participant is a workspace
-        const optimisticPolicyRecentlyUsedTags = isPolicyExpenseChat ? Policy.buildOptimisticPolicyRecentlyUsedTags(participant.policyID, tag) : {};
+        const optimisticPolicyRecentlyUsedTags = isPolicyExpenseChat ? Tag.buildOptimisticPolicyRecentlyUsedTags(participant.policyID, tag) : {};
 
         // STEP 5: Build Onyx Data
         const [oneOnOneOptimisticData, oneOnOneSuccessData, oneOnOneFailureData] = buildOnyxDataForMoneyRequest(
@@ -3957,7 +4254,8 @@ function createSplitsAndOnyxData(
             createdIOUReportActionID: oneOnOneCreatedActionForIOU.reportActionID,
             reportPreviewReportActionID: oneOnOneReportPreviewAction.reportActionID,
             transactionThreadReportID: optimisticTransactionThread.reportID,
-            createdReportActionIDForThread: optimisticCreatedActionForTransactionThread.reportActionID,
+            createdReportActionIDForThread: optimisticCreatedActionForTransactionThread?.reportActionID,
+            taxAmount: splitTaxAmount,
         };
 
         splits.push(individualSplit);
@@ -3966,6 +4264,16 @@ function createSplitsAndOnyxData(
         failureData.push(...oneOnOneFailureData);
     });
 
+    optimisticData.push({
+        onyxMethod: Onyx.METHOD.MERGE,
+        key: `${ONYXKEYS.COLLECTION.TRANSACTION}${splitTransaction.transactionID}`,
+        value: {
+            comment: {
+                splits: splits.map((split) => ({accountID: split.accountID, amount: split.amount})),
+            },
+        },
+    });
+
     const splitData: SplitData = {
         chatReportID: splitChatReport.reportID,
         transactionID: splitTransaction.transactionID,
@@ -3999,7 +4307,10 @@ type SplitBillActionsParams = {
     billable?: boolean;
     iouRequestType?: IOURequestType;
     existingSplitChatReportID?: string;
+    splitShares?: SplitShares;
     splitPayerAccountIDs?: number[];
+    taxCode?: string;
+    taxAmount?: number;
 };
 
 /**
@@ -4020,9 +4331,11 @@ function splitBill({
     billable = false,
     iouRequestType = CONST.IOU.REQUEST_TYPE.MANUAL,
     existingSplitChatReportID = '',
+    splitShares = {},
     splitPayerAccountIDs = [],
+    taxCode = '',
+    taxAmount = 0,
 }: SplitBillActionsParams) {
-    const currentCreated = DateUtils.enrichMoneyRequestTimestamp(created);
     const {splitData, splits, onyxData} = createSplitsAndOnyxData(
         participants,
         currentUserLogin,
@@ -4031,13 +4344,15 @@ function splitBill({
         comment,
         currency,
         merchant,
-        currentCreated,
+        created,
         category,
         tag,
+        splitShares,
         existingSplitChatReportID,
         billable,
         iouRequestType,
-        splitPayerAccountIDs,
+        taxCode,
+        taxAmount,
     );
 
     const parameters: SplitBillParams = {
@@ -4048,7 +4363,7 @@ function splitBill({
         comment,
         category,
         merchant,
-        created: currentCreated,
+        created,
         tag,
         billable,
         transactionID: splitData.transactionID,
@@ -4057,11 +4372,13 @@ function splitBill({
         policyID: splitData.policyID,
         chatType: splitData.chatType,
         splitPayerAccountIDs,
+        taxCode,
+        taxAmount,
     };
 
     API.write(WRITE_COMMANDS.SPLIT_BILL, parameters, onyxData);
 
-    Navigation.dismissModal(existingSplitChatReportID);
+    Navigation.dismissModal(isSearchTopmostCentralPane() ? undefined : existingSplitChatReportID);
     Report.notifyNewAction(splitData.chatReportID, currentUserAccountID);
 }
 
@@ -4081,9 +4398,11 @@ function splitBillAndOpenReport({
     tag = '',
     billable = false,
     iouRequestType = CONST.IOU.REQUEST_TYPE.MANUAL,
+    splitShares = {},
     splitPayerAccountIDs = [],
+    taxCode = '',
+    taxAmount = 0,
 }: SplitBillActionsParams) {
-    const currentCreated = DateUtils.enrichMoneyRequestTimestamp(created);
     const {splitData, splits, onyxData} = createSplitsAndOnyxData(
         participants,
         currentUserLogin,
@@ -4092,13 +4411,15 @@ function splitBillAndOpenReport({
         comment,
         currency,
         merchant,
-        currentCreated,
+        created,
         category,
         tag,
+        splitShares,
         '',
         billable,
         iouRequestType,
-        splitPayerAccountIDs,
+        taxCode,
+        taxAmount,
     );
 
     const parameters: SplitBillParams = {
@@ -4107,7 +4428,7 @@ function splitBillAndOpenReport({
         splits: JSON.stringify(splits),
         currency,
         merchant,
-        created: currentCreated,
+        created,
         comment,
         category,
         tag,
@@ -4118,11 +4439,13 @@ function splitBillAndOpenReport({
         policyID: splitData.policyID,
         chatType: splitData.chatType,
         splitPayerAccountIDs,
+        taxCode,
+        taxAmount,
     };
 
     API.write(WRITE_COMMANDS.SPLIT_BILL_AND_OPEN_REPORT, parameters, onyxData);
 
-    Navigation.dismissModal(splitData.chatReportID);
+    Navigation.dismissModal(isSearchTopmostCentralPane() ? undefined : splitData.chatReportID);
     Report.notifyNewAction(splitData.chatReportID, currentUserAccountID);
 }
 
@@ -4137,6 +4460,8 @@ type StartSplitBilActionParams = {
     category: string | undefined;
     tag: string | undefined;
     currency: string;
+    taxCode: string;
+    taxAmount: number;
 };
 
 /** Used exclusively for starting a split expense request that contains a receipt, the split request will be completed once the receipt is scanned
@@ -4155,6 +4480,8 @@ function startSplitBill({
     category = '',
     tag = '',
     currency,
+    taxCode = '',
+    taxAmount = 0,
 }: StartSplitBilActionParams) {
     const currentUserEmailForIOUSplit = PhoneNumber.addSMSDomainIfPhoneNumber(currentUserLogin);
     const participantAccountIDs = participants.map((participant) => Number(participant.accountID));
@@ -4179,6 +4506,8 @@ function startSplitBill({
         undefined,
         category,
         tag,
+        taxCode,
+        taxAmount,
         billable,
     );
 
@@ -4195,13 +4524,12 @@ function startSplitBill({
         '',
         false,
         false,
-        receiptObject,
         isOwnPolicyExpenseChat,
     );
 
     splitChatReport.lastReadTime = DateUtils.getDBTime();
-    splitChatReport.lastMessageText = splitIOUReportAction.message?.[0]?.text;
-    splitChatReport.lastMessageHtml = splitIOUReportAction.message?.[0]?.html;
+    splitChatReport.lastMessageText = ReportActionsUtils.getReportActionText(splitIOUReportAction);
+    splitChatReport.lastMessageHtml = ReportActionsUtils.getReportActionHtml(splitIOUReportAction);
 
     // If we have an existing splitChatReport (group chat or workspace) use it's pending fields, otherwise indicate that we are adding a chat
     if (!existingSplitChatReport) {
@@ -4266,11 +4594,12 @@ function startSplitBill({
         },
     ];
 
+    const redundantParticipants: Record<number, null> = {};
     if (!existingSplitChatReport) {
         successData.push({
             onyxMethod: Onyx.METHOD.MERGE,
             key: `${ONYXKEYS.COLLECTION.REPORT}${splitChatReport.reportID}`,
-            value: {pendingFields: {createChat: null}},
+            value: {pendingFields: {createChat: null}, participants: redundantParticipants},
         });
     }
 
@@ -4279,7 +4608,7 @@ function startSplitBill({
             onyxMethod: Onyx.METHOD.MERGE,
             key: `${ONYXKEYS.COLLECTION.TRANSACTION}${splitTransaction.transactionID}`,
             value: {
-                errors: ErrorUtils.getMicroSecondOnyxError('iou.error.genericCreateFailureMessage'),
+                errors: ErrorUtils.getMicroSecondOnyxErrorWithTranslationKey('iou.error.genericCreateFailureMessage'),
             },
         },
     ];
@@ -4301,7 +4630,7 @@ function startSplitBill({
                 key: `${ONYXKEYS.COLLECTION.REPORT}${splitChatReport.reportID}`,
                 value: {
                     errorFields: {
-                        createChat: ErrorUtils.getMicroSecondOnyxError('report.genericCreateReportFailureMessage'),
+                        createChat: ErrorUtils.getMicroSecondOnyxErrorWithTranslationKey('report.genericCreateReportFailureMessage'),
                     },
                 },
             },
@@ -4310,7 +4639,7 @@ function startSplitBill({
                 key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${splitChatReport.reportID}`,
                 value: {
                     [splitChatCreatedReportAction.reportActionID]: {
-                        errors: ErrorUtils.getMicroSecondOnyxError('report.genericCreateReportFailureMessage'),
+                        errors: ErrorUtils.getMicroSecondOnyxErrorWithTranslationKey('report.genericCreateReportFailureMessage'),
                     },
                     [splitIOUReportAction.reportActionID]: {
                         errors: getReceiptError(receipt, filename),
@@ -4348,7 +4677,6 @@ function startSplitBill({
                 value: {
                     [accountID]: {
                         accountID,
-                        avatar: UserUtils.getDefaultAvatarURL(accountID),
                         // Disabling this line since participant.displayName can be an empty string
                         // eslint-disable-next-line @typescript-eslint/prefer-nullish-coalescing
                         displayName: LocalePhoneNumber.formatPhoneNumber(participant.displayName || email),
@@ -4359,6 +4687,8 @@ function startSplitBill({
                     },
                 },
             });
+            // BE will send different participants. We clear the optimistic ones to avoid duplicated entries
+            redundantParticipants[accountID] = null;
         }
 
         splits.push({
@@ -4373,8 +4703,8 @@ function startSplitBill({
             return;
         }
 
-        const optimisticPolicyRecentlyUsedCategories = Policy.buildOptimisticPolicyRecentlyUsedCategories(participant.policyID, category);
-        const optimisticPolicyRecentlyUsedTags = Policy.buildOptimisticPolicyRecentlyUsedTags(participant.policyID, tag);
+        const optimisticPolicyRecentlyUsedCategories = Category.buildOptimisticPolicyRecentlyUsedCategories(participant.policyID, category);
+        const optimisticPolicyRecentlyUsedTags = Tag.buildOptimisticPolicyRecentlyUsedTags(participant.policyID, tag);
 
         if (optimisticPolicyRecentlyUsedCategories.length > 0) {
             optimisticData.push({
@@ -4418,12 +4748,14 @@ function startSplitBill({
         billable,
         ...(existingSplitChatReport ? {} : {createdReportActionID: splitChatCreatedReportAction.reportActionID}),
         chatType: splitChatReport?.chatType,
+        taxCode,
+        taxAmount,
     };
 
     API.write(WRITE_COMMANDS.START_SPLIT_BILL, parameters, {optimisticData, successData, failureData});
 
     Navigation.dismissModalWithReport(splitChatReport);
-    Report.notifyNewAction(splitChatReport.chatReportID ?? '', currentUserAccountID);
+    Report.notifyNewAction(splitChatReport.reportID ?? '-1', currentUserAccountID);
 }
 
 /** Used for editing a split expense while it's still scanning or when SmartScan fails, it completes a split expense started by startSplitBill above.
@@ -4436,7 +4768,7 @@ function startSplitBill({
  */
 function completeSplitBill(chatReportID: string, reportAction: OnyxTypes.ReportAction, updatedTransaction: OnyxEntry<OnyxTypes.Transaction>, sessionAccountID: number, sessionEmail: string) {
     const currentUserEmailForIOUSplit = PhoneNumber.addSMSDomainIfPhoneNumber(sessionEmail);
-    const transactionID = updatedTransaction?.transactionID ?? '';
+    const transactionID = updatedTransaction?.transactionID ?? '-1';
     const unmodifiedTransaction = allTransactions[`${ONYXKEYS.COLLECTION.TRANSACTION}${transactionID}`];
 
     // Save optimistic updated transaction and action
@@ -4457,7 +4789,9 @@ function completeSplitBill(chatReportID: string, reportAction: OnyxTypes.ReportA
             value: {
                 [reportAction.reportActionID]: {
                     lastModified: DateUtils.getDBTime(),
-                    whisperedToAccountIDs: [],
+                    originalMessage: {
+                        whisperedTo: [],
+                    },
                 },
             },
         },
@@ -4482,7 +4816,7 @@ function completeSplitBill(chatReportID: string, reportAction: OnyxTypes.ReportA
             key: `${ONYXKEYS.COLLECTION.TRANSACTION}${transactionID}`,
             value: {
                 ...unmodifiedTransaction,
-                errors: ErrorUtils.getMicroSecondOnyxError('iou.error.genericCreateFailureMessage'),
+                errors: ErrorUtils.getMicroSecondOnyxErrorWithTranslationKey('iou.error.genericCreateFailureMessage'),
             },
         },
         {
@@ -4491,18 +4825,20 @@ function completeSplitBill(chatReportID: string, reportAction: OnyxTypes.ReportA
             value: {
                 [reportAction.reportActionID]: {
                     ...reportAction,
-                    errors: ErrorUtils.getMicroSecondOnyxError('iou.error.genericCreateFailureMessage'),
+                    errors: ErrorUtils.getMicroSecondOnyxErrorWithTranslationKey('iou.error.genericCreateFailureMessage'),
                 },
             },
         },
     ];
 
-    const splitParticipants: Split[] = updatedTransaction?.comment.splits ?? [];
+    const splitParticipants: Split[] = updatedTransaction?.comment?.splits ?? [];
     const amount = updatedTransaction?.modifiedAmount;
     const currency = updatedTransaction?.modifiedCurrency;
+    console.debug(updatedTransaction);
 
     // Exclude the current user when calculating the split amount, `calculateAmount` takes it into account
     const splitAmount = IOUUtils.calculateAmount(splitParticipants.length - 1, amount ?? 0, currency ?? '', false);
+    const splitTaxAmount = IOUUtils.calculateAmount(splitParticipants.length - 1, updatedTransaction?.taxAmount ?? 0, currency ?? '', false);
 
     const splits: Split[] = [{email: currentUserEmailForIOUSplit}];
     splitParticipants.forEach((participant) => {
@@ -4516,7 +4852,7 @@ function completeSplitBill(chatReportID: string, reportAction: OnyxTypes.ReportA
             // In case this is still the optimistic accountID saved in the splits array, return early as we cannot know
             // if there is an existing chat between the split creator and this participant
             // Instead, we will rely on Auth generating the report IDs and the user won't see any optimistic chats or reports created
-            const participantPersonalDetails: OnyxTypes.PersonalDetails | EmptyObject = allPersonalDetails[participant?.accountID ?? -1] ?? {};
+            const participantPersonalDetails: OnyxTypes.PersonalDetails | null = allPersonalDetails[participant?.accountID ?? -1];
             if (!participantPersonalDetails || participantPersonalDetails.isOptimisticPersonalDetail) {
                 splits.push({
                     email: participant.email,
@@ -4525,15 +4861,16 @@ function completeSplitBill(chatReportID: string, reportAction: OnyxTypes.ReportA
             }
         }
 
-        let oneOnOneChatReport: OnyxTypes.Report | null;
+        let oneOnOneChatReport: OnyxEntry<OnyxTypes.Report>;
         let isNewOneOnOneChatReport = false;
+        const allReports = ReportConnection.getAllReports();
         if (isPolicyExpenseChat) {
             // The workspace chat reportID is saved in the splits array when starting a split expense with a workspace
-            oneOnOneChatReport = allReports?.[`${ONYXKEYS.COLLECTION.REPORT}${participant.chatReportID}`] ?? null;
+            oneOnOneChatReport = allReports?.[`${ONYXKEYS.COLLECTION.REPORT}${participant.chatReportID}`];
         } else {
-            const existingChatReport = ReportUtils.getChatByParticipants(participant.accountID ? [participant.accountID] : []);
+            const existingChatReport = ReportUtils.getChatByParticipants(participant.accountID ? [participant.accountID, sessionAccountID] : []);
             isNewOneOnOneChatReport = !existingChatReport;
-            oneOnOneChatReport = existingChatReport ?? ReportUtils.buildOptimisticChatReport(participant.accountID ? [participant.accountID] : []);
+            oneOnOneChatReport = existingChatReport ?? ReportUtils.buildOptimisticChatReport(participant.accountID ? [participant.accountID, sessionAccountID] : []);
         }
 
         let oneOnOneIOUReport: OneOnOneIOUReport = oneOnOneChatReport?.iouReportID ? allReports?.[`${ONYXKEYS.COLLECTION.REPORT}${oneOnOneChatReport.iouReportID}`] : null;
@@ -4541,8 +4878,8 @@ function completeSplitBill(chatReportID: string, reportAction: OnyxTypes.ReportA
 
         if (!oneOnOneIOUReport || shouldCreateNewOneOnOneIOUReport) {
             oneOnOneIOUReport = isPolicyExpenseChat
-                ? ReportUtils.buildOptimisticExpenseReport(oneOnOneChatReport?.reportID ?? '', participant.policyID ?? '', sessionAccountID, splitAmount, currency ?? '')
-                : ReportUtils.buildOptimisticIOUReport(sessionAccountID, participant.accountID ?? -1, splitAmount, oneOnOneChatReport?.reportID ?? '', currency ?? '');
+                ? ReportUtils.buildOptimisticExpenseReport(oneOnOneChatReport?.reportID ?? '-1', participant.policyID ?? '-1', sessionAccountID, splitAmount, currency ?? '')
+                : ReportUtils.buildOptimisticIOUReport(sessionAccountID, participant.accountID ?? -1, splitAmount, oneOnOneChatReport?.reportID ?? '-1', currency ?? '');
         } else if (isPolicyExpenseChat) {
             if (typeof oneOnOneIOUReport?.total === 'number') {
                 // Because of the Expense reports are stored as negative values, we subtract the total from the amount
@@ -4555,8 +4892,8 @@ function completeSplitBill(chatReportID: string, reportAction: OnyxTypes.ReportA
         const oneOnOneTransaction = TransactionUtils.buildOptimisticTransaction(
             isPolicyExpenseChat ? -splitAmount : splitAmount,
             currency ?? '',
-            oneOnOneIOUReport?.reportID ?? '',
-            updatedTransaction?.comment.comment,
+            oneOnOneIOUReport?.reportID ?? '-1',
+            updatedTransaction?.comment?.comment,
             updatedTransaction?.modifiedCreated,
             CONST.IOU.TYPE.SPLIT,
             transactionID,
@@ -4566,6 +4903,8 @@ function completeSplitBill(chatReportID: string, reportAction: OnyxTypes.ReportA
             undefined,
             updatedTransaction?.category,
             updatedTransaction?.tag,
+            updatedTransaction?.taxCode,
+            isPolicyExpenseChat ? -splitTaxAmount : splitAmount,
             updatedTransaction?.billable,
         );
 
@@ -4575,14 +4914,14 @@ function completeSplitBill(chatReportID: string, reportAction: OnyxTypes.ReportA
                 CONST.IOU.REPORT_ACTION_TYPE.CREATE,
                 splitAmount,
                 currency ?? '',
-                updatedTransaction?.comment.comment ?? '',
+                updatedTransaction?.comment?.comment ?? '',
                 currentUserEmailForIOUSplit,
                 [participant],
                 oneOnOneTransaction.transactionID,
                 undefined,
             );
 
-        let oneOnOneReportPreviewAction = getReportPreviewAction(oneOnOneChatReport?.reportID ?? '', oneOnOneIOUReport?.reportID ?? '');
+        let oneOnOneReportPreviewAction = getReportPreviewAction(oneOnOneChatReport?.reportID ?? '-1', oneOnOneIOUReport?.reportID ?? '-1');
         if (oneOnOneReportPreviewAction) {
             oneOnOneReportPreviewAction = ReportUtils.updateReportPreview(oneOnOneIOUReport, oneOnOneReportPreviewAction);
         } else {
@@ -4623,7 +4962,7 @@ function completeSplitBill(chatReportID: string, reportAction: OnyxTypes.ReportA
             createdIOUReportActionID: oneOnOneCreatedActionForIOU.reportActionID,
             reportPreviewReportActionID: oneOnOneReportPreviewAction.reportActionID,
             transactionThreadReportID: optimisticTransactionThread.reportID,
-            createdReportActionIDForThread: optimisticCreatedActionForTransactionThread.reportActionID,
+            createdReportActionIDForThread: optimisticCreatedActionForTransactionThread?.reportActionID,
         });
 
         optimisticData.push(...oneOnOneOptimisticData);
@@ -4639,6 +4978,9 @@ function completeSplitBill(chatReportID: string, reportAction: OnyxTypes.ReportA
         comment: transactionComment,
         category: transactionCategory,
         tag: transactionTag,
+        taxCode: transactionTaxCode,
+        taxAmount: transactionTaxAmount,
+        billable: transactionBillable,
     } = ReportUtils.getTransactionDetails(updatedTransaction) ?? {};
 
     const parameters: CompleteSplitBillParams = {
@@ -4651,10 +4993,13 @@ function completeSplitBill(chatReportID: string, reportAction: OnyxTypes.ReportA
         category: transactionCategory,
         tag: transactionTag,
         splits: JSON.stringify(splits),
+        taxCode: transactionTaxCode,
+        taxAmount: transactionTaxAmount,
+        billable: transactionBillable,
     };
 
     API.write(WRITE_COMMANDS.COMPLETE_SPLIT_BILL, parameters, {optimisticData, successData, failureData});
-    Navigation.dismissModal(chatReportID);
+    Navigation.dismissModal(isSearchTopmostCentralPane() ? undefined : chatReportID);
     Report.notifyNewAction(chatReportID, sessionAccountID);
 }
 
@@ -4670,19 +5015,167 @@ function setDraftSplitTransaction(transactionID: string, transactionChanges: Tra
     Onyx.merge(`${ONYXKEYS.COLLECTION.SPLIT_TRANSACTION_DRAFT}${transactionID}`, updatedTransaction);
 }
 
-function editRegularMoneyRequest(
-    transactionID: string,
-    transactionThreadReportID: string,
-    transactionChanges: TransactionChanges,
-    policy: OnyxTypes.Policy,
-    policyTags: OnyxTypes.PolicyTagList,
-    policyCategories: OnyxTypes.PolicyCategories,
-) {
-    // STEP 1: Get all collections we're updating
-    const transactionThread = allReports?.[`${ONYXKEYS.COLLECTION.REPORT}${transactionThreadReportID}`] ?? null;
-    const transaction = allTransactions[`${ONYXKEYS.COLLECTION.TRANSACTION}${transactionID}`];
-    const iouReport = allReports?.[`${ONYXKEYS.COLLECTION.REPORT}${transactionThread?.parentReportID}`] ?? null;
-    const chatReport = allReports?.[`${ONYXKEYS.COLLECTION.REPORT}${iouReport?.chatReportID}`] ?? null;
+/** Requests money based on a distance (e.g. mileage from a map) */
+function createDistanceRequest(
+    report: OnyxEntry<OnyxTypes.Report>,
+    participants: Participant[],
+    comment: string,
+    created: string,
+    category: string | undefined,
+    tag: string | undefined,
+    taxCode: string | undefined,
+    taxAmount: number | undefined,
+    amount: number,
+    currency: string,
+    merchant: string,
+    billable: boolean | undefined,
+    validWaypoints: WaypointCollection,
+    policy?: OnyxEntry<OnyxTypes.Policy>,
+    policyTagList?: OnyxEntry<OnyxTypes.PolicyTagLists>,
+    policyCategories?: OnyxEntry<OnyxTypes.PolicyCategories>,
+    customUnitRateID = '',
+    currentUserLogin = '',
+    currentUserAccountID = -1,
+    splitShares: SplitShares = {},
+    iouType: ValueOf<typeof CONST.IOU.TYPE> = CONST.IOU.TYPE.SUBMIT,
+) {
+    // If the report is an 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.getReportOrDraftReport(report?.chatReportID) : report;
+    const moneyRequestReportID = isMoneyRequestReport ? report?.reportID : '';
+
+    const optimisticReceipt: Receipt = {
+        source: ReceiptGeneric as ReceiptSource,
+        state: CONST.IOU.RECEIPT_STATE.OPEN,
+    };
+
+    let parameters: CreateDistanceRequestParams;
+    let onyxData: OnyxData;
+    if (iouType === CONST.IOU.TYPE.SPLIT) {
+        const {
+            splitData,
+            splits,
+            onyxData: splitOnyxData,
+        } = createSplitsAndOnyxData(
+            participants,
+            currentUserLogin ?? '',
+            currentUserAccountID,
+            amount,
+            comment,
+            currency,
+            merchant,
+            created,
+            category ?? '',
+            tag ?? '',
+            splitShares,
+            report?.reportID ?? '',
+            billable,
+            CONST.IOU.REQUEST_TYPE.DISTANCE,
+            taxCode,
+            taxAmount,
+        );
+        onyxData = splitOnyxData;
+
+        // Splits don't use the IOU report param. The split transaction isn't linked to a report shown in the UI, it's linked to a special default reportID of -2.
+        // Therefore, any params related to the IOU report are irrelevant and omitted below.
+        parameters = {
+            transactionID: splitData.transactionID,
+            chatReportID: splitData.chatReportID,
+            createdChatReportActionID: splitData.createdReportActionID ?? '',
+            reportActionID: splitData.reportActionID,
+            waypoints: JSON.stringify(validWaypoints),
+            customUnitRateID,
+            comment,
+            created,
+            category,
+            tag,
+            taxCode,
+            taxAmount,
+            billable,
+            splits: JSON.stringify(splits),
+            chatType: splitData.chatType,
+        };
+    } else {
+        const participant = participants[0] ?? {};
+        const {
+            iouReport,
+            chatReport,
+            transaction,
+            iouAction,
+            createdChatReportActionID,
+            createdIOUReportActionID,
+            reportPreviewAction,
+            transactionThreadReportID,
+            createdReportActionIDForThread,
+            payerEmail,
+            onyxData: moneyRequestOnyxData,
+        } = getMoneyRequestInformation(
+            currentChatReport,
+            participant,
+            comment,
+            amount,
+            currency,
+            created,
+            merchant,
+            optimisticReceipt,
+            undefined,
+            category,
+            tag,
+            taxCode,
+            taxAmount,
+            billable,
+            policy,
+            policyTagList,
+            policyCategories,
+            userAccountID,
+            currentUserEmail,
+            moneyRequestReportID,
+        );
+        onyxData = moneyRequestOnyxData;
+
+        parameters = {
+            comment,
+            iouReportID: iouReport.reportID,
+            chatReportID: chatReport.reportID,
+            transactionID: transaction.transactionID,
+            reportActionID: iouAction.reportActionID,
+            createdChatReportActionID,
+            createdIOUReportActionID,
+            reportPreviewReportActionID: reportPreviewAction.reportActionID,
+            waypoints: JSON.stringify(validWaypoints),
+            created,
+            category,
+            tag,
+            taxCode,
+            taxAmount,
+            billable,
+            transactionThreadReportID,
+            createdReportActionIDForThread,
+            payerEmail,
+            customUnitRateID,
+        };
+    }
+
+    API.write(WRITE_COMMANDS.CREATE_DISTANCE_REQUEST, parameters, onyxData);
+    const activeReportID = isMoneyRequestReport ? report?.reportID ?? '-1' : parameters.chatReportID;
+    Navigation.dismissModal(isSearchTopmostCentralPane() ? undefined : activeReportID);
+    Report.notifyNewAction(activeReportID, userAccountID);
+}
+
+function editRegularMoneyRequest(
+    transactionID: string,
+    transactionThreadReportID: string,
+    transactionChanges: TransactionChanges,
+    policy: OnyxTypes.Policy,
+    policyTags: OnyxTypes.PolicyTagLists,
+    policyCategories: OnyxTypes.PolicyCategories,
+) {
+    const allReports = ReportConnection.getAllReports();
+    // STEP 1: Get all collections we're updating
+    const transactionThread = allReports?.[`${ONYXKEYS.COLLECTION.REPORT}${transactionThreadReportID}`] ?? null;
+    const transaction = allTransactions[`${ONYXKEYS.COLLECTION.TRANSACTION}${transactionID}`];
+    const iouReport = allReports?.[`${ONYXKEYS.COLLECTION.REPORT}${transactionThread?.parentReportID}`] ?? null;
+    const chatReport = allReports?.[`${ONYXKEYS.COLLECTION.REPORT}${iouReport?.chatReportID}`] ?? null;
     const isFromExpenseReport = ReportUtils.isExpenseReport(iouReport);
 
     // STEP 2: Build new modified expense report action.
@@ -4708,7 +5201,7 @@ function editRegularMoneyRequest(
 
         // Update the last message of the IOU report
         const lastMessage = ReportUtils.getIOUReportActionMessage(
-            iouReport?.reportID ?? '',
+            iouReport?.reportID ?? '-1',
             CONST.IOU.REPORT_ACTION_TYPE.CREATE,
             updatedMoneyRequestReport.total ?? 0,
             '',
@@ -4716,7 +5209,7 @@ function editRegularMoneyRequest(
             '',
             false,
         );
-        updatedMoneyRequestReport.lastMessageText = lastMessage[0].text;
+        updatedMoneyRequestReport.lastMessageText = ReportActionsUtils.getTextFromHtml(lastMessage[0].html);
         updatedMoneyRequestReport.lastMessageHtml = lastMessage[0].html;
 
         // Update the last message of the chat report
@@ -4772,8 +5265,10 @@ function editRegularMoneyRequest(
                 onyxMethod: Onyx.METHOD.MERGE,
                 key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${iouReport?.reportID}`,
                 value: {
-                    [transactionThread?.parentReportActionID ?? '']: {
-                        whisperedToAccountIDs: [],
+                    [transactionThread?.parentReportActionID ?? '-1']: {
+                        originalMessage: {
+                            whisperedTo: [],
+                        },
                     },
                 },
             },
@@ -4781,8 +5276,10 @@ function editRegularMoneyRequest(
                 onyxMethod: Onyx.METHOD.MERGE,
                 key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${iouReport?.parentReportID}`,
                 value: {
-                    [iouReport?.parentReportActionID ?? '']: {
-                        whisperedToAccountIDs: [],
+                    [iouReport?.parentReportActionID ?? '-1']: {
+                        originalMessage: {
+                            whisperedTo: [],
+                        },
                     },
                 },
             },
@@ -4791,7 +5288,7 @@ function editRegularMoneyRequest(
 
     // Update recently used categories if the category is changed
     if ('category' in transactionChanges) {
-        const optimisticPolicyRecentlyUsedCategories = Policy.buildOptimisticPolicyRecentlyUsedCategories(iouReport?.policyID, transactionChanges.category);
+        const optimisticPolicyRecentlyUsedCategories = Category.buildOptimisticPolicyRecentlyUsedCategories(iouReport?.policyID, transactionChanges.category);
         if (optimisticPolicyRecentlyUsedCategories.length) {
             optimisticData.push({
                 onyxMethod: Onyx.METHOD.SET,
@@ -4803,7 +5300,7 @@ function editRegularMoneyRequest(
 
     // Update recently used categories if the tag is changed
     if ('tag' in transactionChanges) {
-        const optimisticPolicyRecentlyUsedTags = Policy.buildOptimisticPolicyRecentlyUsedTags(iouReport?.policyID, transactionChanges.tag);
+        const optimisticPolicyRecentlyUsedTags = Tag.buildOptimisticPolicyRecentlyUsedTags(iouReport?.policyID, transactionChanges.tag);
         if (!isEmptyObject(optimisticPolicyRecentlyUsedTags)) {
             optimisticData.push({
                 onyxMethod: Onyx.METHOD.MERGE,
@@ -4850,7 +5347,7 @@ function editRegularMoneyRequest(
             key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${transactionThread?.reportID}`,
             value: {
                 [updatedReportAction.reportActionID]: {
-                    errors: ErrorUtils.getMicroSecondOnyxError('iou.error.genericEditFailureMessage'),
+                    errors: ErrorUtils.getMicroSecondOnyxErrorWithTranslationKey('iou.error.genericEditFailureMessage'),
                 },
             },
         },
@@ -4900,6 +5397,7 @@ function editRegularMoneyRequest(
             policyTags,
             !!policy.requiresCategory,
             policyCategories,
+            PolicyUtils.hasDependentTags(policy, policyTags),
         );
         optimisticData.push(updatedViolationsOnyxData);
         failureData.push({
@@ -4933,7 +5431,7 @@ function editMoneyRequest(
     transactionThreadReportID: string,
     transactionChanges: TransactionChanges,
     policy: OnyxTypes.Policy,
-    policyTags: OnyxTypes.PolicyTagList,
+    policyTags: OnyxTypes.PolicyTagLists,
     policyCategories: OnyxTypes.PolicyCategories,
 ) {
     if (TransactionUtils.isDistanceRequest(transaction)) {
@@ -4948,9 +5446,11 @@ type UpdateMoneyRequestAmountAndCurrencyParams = {
     transactionThreadReportID: string;
     currency: string;
     amount: number;
+    taxAmount: number;
     policy?: OnyxEntry<OnyxTypes.Policy>;
-    policyTagList?: OnyxEntry<OnyxTypes.PolicyTagList>;
+    policyTagList?: OnyxEntry<OnyxTypes.PolicyTagLists>;
     policyCategories?: OnyxEntry<OnyxTypes.PolicyCategories>;
+    taxCode: string;
 };
 
 /** Updates the amount and currency fields of an expense */
@@ -4959,14 +5459,19 @@ function updateMoneyRequestAmountAndCurrency({
     transactionThreadReportID,
     currency,
     amount,
+    taxAmount,
     policy,
     policyTagList,
     policyCategories,
+    taxCode,
 }: UpdateMoneyRequestAmountAndCurrencyParams) {
     const transactionChanges = {
         amount,
         currency,
+        taxCode,
+        taxAmount,
     };
+    const allReports = ReportConnection.getAllReports();
     const transactionThreadReport = allReports?.[`${ONYXKEYS.COLLECTION.REPORT}${transactionThreadReportID}`] ?? null;
     const parentReport = allReports?.[`${ONYXKEYS.COLLECTION.REPORT}${transactionThreadReport?.parentReportID}`] ?? null;
     let data: UpdateMoneyRequestData;
@@ -4979,12 +5484,21 @@ function updateMoneyRequestAmountAndCurrency({
     API.write(WRITE_COMMANDS.UPDATE_MONEY_REQUEST_AMOUNT_AND_CURRENCY, params, onyxData);
 }
 
-function deleteMoneyRequest(transactionID: string, reportAction: OnyxTypes.ReportAction, isSingleTransactionView = false) {
+/**
+ *
+ * @param transactionID  - The transactionID of IOU
+ * @param reportAction - The reportAction of the transaction in the IOU report
+ * @param isSingleTransactionView - whether we are in the transaction thread report
+ * @return the url to navigate back once the money request is deleted
+ */
+function prepareToCleanUpMoneyRequest(transactionID: string, reportAction: OnyxTypes.ReportAction, isSingleTransactionView = false) {
     // STEP 1: Get all collections we're updating
-    const iouReportID = reportAction?.actionName === CONST.REPORT.ACTIONS.TYPE.IOU ? reportAction.originalMessage.IOUReportID : '';
+    const allReports = ReportConnection.getAllReports();
+    const iouReportID = ReportActionsUtils.isMoneyRequestAction(reportAction) ? ReportActionsUtils.getOriginalMessage(reportAction)?.IOUReportID : '-1';
     const iouReport = allReports?.[`${ONYXKEYS.COLLECTION.REPORT}${iouReportID}`] ?? null;
     const chatReport = allReports?.[`${ONYXKEYS.COLLECTION.REPORT}${iouReport?.chatReportID}`];
-    const reportPreviewAction = getReportPreviewAction(iouReport?.chatReportID ?? '', iouReport?.reportID ?? '');
+    // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+    const reportPreviewAction = getReportPreviewAction(iouReport?.chatReportID ?? '-1', iouReport?.reportID ?? '-1')!;
     const transaction = allTransactions[`${ONYXKEYS.COLLECTION.TRANSACTION}${transactionID}`];
     const transactionViolations = allTransactionViolations[`${ONYXKEYS.COLLECTION.TRANSACTION_VIOLATIONS}${transactionID}`];
     const transactionThreadID = reportAction.childReportID;
@@ -5016,19 +5530,19 @@ function deleteMoneyRequest(transactionID: string, reportAction: OnyxTypes.Repor
             originalMessage: {
                 IOUTransactionID: null,
             },
-            errors: undefined,
+            errors: null,
         },
-    } as OnyxTypes.ReportActions;
+    } as Record<string, NullishDeep<OnyxTypes.ReportAction>>;
 
-    const lastVisibleAction = ReportActionsUtils.getLastVisibleAction(iouReport?.reportID ?? '', updatedReportAction);
-    const iouReportLastMessageText = ReportActionsUtils.getLastVisibleMessage(iouReport?.reportID ?? '', updatedReportAction).lastMessageText;
+    const lastVisibleAction = ReportActionsUtils.getLastVisibleAction(iouReport?.reportID ?? '-1', updatedReportAction);
+    const iouReportLastMessageText = ReportActionsUtils.getLastVisibleMessage(iouReport?.reportID ?? '-1', updatedReportAction).lastMessageText;
     const shouldDeleteIOUReport =
         iouReportLastMessageText.length === 0 && !ReportActionsUtils.isDeletedParentAction(lastVisibleAction) && (!transactionThreadID || shouldDeleteTransactionThread);
 
     // STEP 4: Update the iouReport and reportPreview with new totals and messages if it wasn't deleted
-    let updatedIOUReport: OnyxTypes.Report | null;
+    let updatedIOUReport: OnyxInputValue<OnyxTypes.Report>;
     const currency = TransactionUtils.getCurrency(transaction);
-    const updatedReportPreviewAction: OnyxTypes.ReportAction | EmptyObject = {...reportPreviewAction};
+    const updatedReportPreviewAction: OnyxTypes.ReportAction<typeof CONST.REPORT.ACTIONS.TYPE.REPORT_PREVIEW> = {...reportPreviewAction};
     updatedReportPreviewAction.pendingAction = shouldDeleteIOUReport ? CONST.RED_BRICK_ROAD_PENDING_ACTION.DELETE : CONST.RED_BRICK_ROAD_PENDING_ACTION.UPDATE;
     if (iouReport && ReportUtils.isExpenseReport(iouReport)) {
         updatedIOUReport = {...iouReport};
@@ -5057,32 +5571,225 @@ function deleteMoneyRequest(transactionID: string, reportAction: OnyxTypes.Repor
         amount: CurrencyUtils.convertToDisplayString(updatedIOUReport?.total, updatedIOUReport?.currency),
     });
 
-    if (updatedReportPreviewAction?.message?.[0]) {
-        updatedReportPreviewAction.message[0].text = messageText;
-        updatedReportPreviewAction.message[0].deleted = shouldDeleteIOUReport ? DateUtils.getDBTime() : '';
+    if (ReportActionsUtils.getReportActionMessage(updatedReportPreviewAction)) {
+        if (Array.isArray(updatedReportPreviewAction?.message) && updatedReportPreviewAction.message?.[0]) {
+            updatedReportPreviewAction.message[0].text = messageText;
+            updatedReportPreviewAction.message[0].deleted = shouldDeleteIOUReport ? DateUtils.getDBTime() : '';
+        } else if (!Array.isArray(updatedReportPreviewAction.message) && updatedReportPreviewAction.message) {
+            updatedReportPreviewAction.message.text = messageText;
+            updatedReportPreviewAction.message.deleted = shouldDeleteIOUReport ? DateUtils.getDBTime() : '';
+        }
     }
 
     if (updatedReportPreviewAction && reportPreviewAction?.childMoneyRequestCount && reportPreviewAction?.childMoneyRequestCount > 0) {
         updatedReportPreviewAction.childMoneyRequestCount = reportPreviewAction.childMoneyRequestCount - 1;
     }
 
-    // STEP 5: Build Onyx data
-    const optimisticData: OnyxUpdate[] = [
+    // STEP 5: Calculate the url that the user will be navigated back to
+    // This depends on which page they are on and which resources were deleted
+    let reportIDToNavigateBack: string | undefined;
+    if (iouReport && isSingleTransactionView && shouldDeleteTransactionThread && !shouldDeleteIOUReport) {
+        reportIDToNavigateBack = iouReport.reportID;
+    }
+
+    if (iouReport?.chatReportID && shouldDeleteIOUReport) {
+        reportIDToNavigateBack = iouReport.chatReportID;
+    }
+
+    const urlToNavigateBack = reportIDToNavigateBack ? ROUTES.REPORT_WITH_ID.getRoute(reportIDToNavigateBack) : undefined;
+
+    return {
+        shouldDeleteTransactionThread,
+        shouldDeleteIOUReport,
+        updatedReportAction,
+        updatedIOUReport,
+        updatedReportPreviewAction,
+        transactionThreadID,
+        transactionThread,
+        chatReport,
+        transaction,
+        transactionViolations,
+        reportPreviewAction,
+        iouReport,
+        urlToNavigateBack,
+    };
+}
+
+/**
+ *
+ * @param transactionID  - The transactionID of IOU
+ * @param reportAction - The reportAction of the transaction in the IOU report
+ * @param isSingleTransactionView - whether we are in the transaction thread report
+ * @return the url to navigate back once the money request is deleted
+ */
+function cleanUpMoneyRequest(transactionID: string, reportAction: OnyxTypes.ReportAction, isSingleTransactionView = false) {
+    const {
+        shouldDeleteTransactionThread,
+        shouldDeleteIOUReport,
+        updatedReportAction,
+        updatedIOUReport,
+        updatedReportPreviewAction,
+        transactionThreadID,
+        chatReport,
+        iouReport,
+        reportPreviewAction,
+        urlToNavigateBack,
+    } = prepareToCleanUpMoneyRequest(transactionID, reportAction, isSingleTransactionView);
+
+    // build Onyx data
+
+    // Onyx operations to delete the transaction, update the IOU report action and chat report action
+    const onyxUpdates: OnyxUpdate[] = [
         {
             onyxMethod: Onyx.METHOD.SET,
             key: `${ONYXKEYS.COLLECTION.TRANSACTION}${transactionID}`,
             value: null,
         },
+        {
+            onyxMethod: Onyx.METHOD.MERGE,
+            key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${iouReport?.reportID}`,
+            value: {
+                [reportAction.reportActionID]: shouldDeleteIOUReport
+                    ? null
+                    : {
+                          pendingAction: null,
+                      },
+            },
+        },
     ];
 
-    if (Permissions.canUseViolations(betas)) {
-        optimisticData.push({
-            onyxMethod: Onyx.METHOD.SET,
-            key: `${ONYXKEYS.COLLECTION.TRANSACTION_VIOLATIONS}${transactionID}`,
-            value: null,
+    if (reportPreviewAction?.reportActionID) {
+        onyxUpdates.push({
+            onyxMethod: Onyx.METHOD.MERGE,
+            key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${chatReport?.reportID}`,
+            value: {
+                [reportPreviewAction.reportActionID]: {
+                    ...updatedReportPreviewAction,
+                    pendingAction: null,
+                    errors: null,
+                },
+            },
+        });
+    }
+
+    // added the operation to delete associated transaction violations
+    onyxUpdates.push({
+        onyxMethod: Onyx.METHOD.SET,
+        key: `${ONYXKEYS.COLLECTION.TRANSACTION_VIOLATIONS}${transactionID}`,
+        value: null,
+    });
+
+    // added the operation to delete transaction thread
+    if (shouldDeleteTransactionThread) {
+        onyxUpdates.push(
+            {
+                onyxMethod: Onyx.METHOD.SET,
+                key: `${ONYXKEYS.COLLECTION.REPORT}${transactionThreadID}`,
+                value: null,
+            },
+            {
+                onyxMethod: Onyx.METHOD.SET,
+                key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${transactionThreadID}`,
+                value: null,
+            },
+        );
+    }
+
+    // added operations to update IOU report and chat report
+    onyxUpdates.push(
+        {
+            onyxMethod: Onyx.METHOD.MERGE,
+            key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${iouReport?.reportID}`,
+            value: updatedReportAction,
+        },
+        {
+            onyxMethod: Onyx.METHOD.MERGE,
+            key: `${ONYXKEYS.COLLECTION.REPORT}${iouReport?.reportID}`,
+            value: updatedIOUReport,
+        },
+        {
+            onyxMethod: Onyx.METHOD.MERGE,
+            key: `${ONYXKEYS.COLLECTION.REPORT}${chatReport?.reportID}`,
+            value: ReportUtils.getOutstandingChildRequest(updatedIOUReport),
+        },
+    );
+
+    if (!shouldDeleteIOUReport && updatedReportPreviewAction.childMoneyRequestCount === 0) {
+        onyxUpdates.push({
+            onyxMethod: Onyx.METHOD.MERGE,
+            key: `${ONYXKEYS.COLLECTION.REPORT}${chatReport?.reportID}`,
+            value: {
+                hasOutstandingChildRequest: false,
+            },
         });
     }
 
+    if (shouldDeleteIOUReport) {
+        onyxUpdates.push(
+            {
+                onyxMethod: Onyx.METHOD.MERGE,
+                key: `${ONYXKEYS.COLLECTION.REPORT}${chatReport?.reportID}`,
+                value: {
+                    hasOutstandingChildRequest: false,
+                    iouReportID: null,
+                    lastMessageText: ReportActionsUtils.getLastVisibleMessage(iouReport?.chatReportID ?? '-1', {[reportPreviewAction?.reportActionID ?? '-1']: null})?.lastMessageText,
+                    lastVisibleActionCreated: ReportActionsUtils.getLastVisibleAction(iouReport?.chatReportID ?? '-1', {[reportPreviewAction?.reportActionID ?? '-1']: null})?.created,
+                },
+            },
+            {
+                onyxMethod: Onyx.METHOD.SET,
+                key: `${ONYXKEYS.COLLECTION.REPORT}${iouReport?.reportID}`,
+                value: null,
+            },
+        );
+    }
+
+    Onyx.update(onyxUpdates);
+
+    return urlToNavigateBack;
+}
+
+/**
+ *
+ * @param transactionID  - The transactionID of IOU
+ * @param reportAction - The reportAction of the transaction in the IOU report
+ * @param isSingleTransactionView - whether we are in the transaction thread report
+ * @return the url to navigate back once the money request is deleted
+ */
+function deleteMoneyRequest(transactionID: string, reportAction: OnyxTypes.ReportAction, isSingleTransactionView = false) {
+    // STEP 1: Calculate and prepare the data
+    const {
+        shouldDeleteTransactionThread,
+        shouldDeleteIOUReport,
+        updatedReportAction,
+        updatedIOUReport,
+        updatedReportPreviewAction,
+        transactionThreadID,
+        transactionThread,
+        chatReport,
+        transaction,
+        transactionViolations,
+        iouReport,
+        reportPreviewAction,
+        urlToNavigateBack,
+    } = prepareToCleanUpMoneyRequest(transactionID, reportAction, isSingleTransactionView);
+
+    // STEP 2: Build Onyx data
+    // The logic mostly resembles the cleanUpMoneyRequest function
+    const optimisticData: OnyxUpdate[] = [
+        {
+            onyxMethod: Onyx.METHOD.SET,
+            key: `${ONYXKEYS.COLLECTION.TRANSACTION}${transactionID}`,
+            value: null,
+        },
+    ];
+
+    optimisticData.push({
+        onyxMethod: Onyx.METHOD.SET,
+        key: `${ONYXKEYS.COLLECTION.TRANSACTION_VIOLATIONS}${transactionID}`,
+        value: null,
+    });
+
     if (shouldDeleteTransactionThread) {
         optimisticData.push(
             {
@@ -5113,7 +5820,7 @@ function deleteMoneyRequest(transactionID: string, reportAction: OnyxTypes.Repor
             onyxMethod: Onyx.METHOD.MERGE,
             key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${chatReport?.reportID}`,
             value: {
-                [reportPreviewAction?.reportActionID ?? '']: updatedReportPreviewAction,
+                [reportPreviewAction?.reportActionID ?? '-1']: updatedReportPreviewAction,
             },
         },
         {
@@ -5123,7 +5830,7 @@ function deleteMoneyRequest(transactionID: string, reportAction: OnyxTypes.Repor
         },
     );
 
-    if (!shouldDeleteIOUReport && updatedReportPreviewAction.childMoneyRequestCount === 0) {
+    if (!shouldDeleteIOUReport && updatedReportPreviewAction?.childMoneyRequestCount === 0) {
         optimisticData.push({
             onyxMethod: Onyx.METHOD.MERGE,
             key: `${ONYXKEYS.COLLECTION.REPORT}${chatReport?.reportID}`,
@@ -5140,8 +5847,17 @@ function deleteMoneyRequest(transactionID: string, reportAction: OnyxTypes.Repor
             value: {
                 hasOutstandingChildRequest: false,
                 iouReportID: null,
-                lastMessageText: ReportActionsUtils.getLastVisibleMessage(iouReport?.chatReportID ?? '', {[reportPreviewAction?.reportActionID ?? '']: null})?.lastMessageText,
-                lastVisibleActionCreated: ReportActionsUtils.getLastVisibleAction(iouReport?.chatReportID ?? '', {[reportPreviewAction?.reportActionID ?? '']: null})?.created,
+                lastMessageText: ReportActionsUtils.getLastVisibleMessage(iouReport?.chatReportID ?? '-1', {[reportPreviewAction?.reportActionID ?? '-1']: null})?.lastMessageText,
+                lastVisibleActionCreated: ReportActionsUtils.getLastVisibleAction(iouReport?.chatReportID ?? '-1', {[reportPreviewAction?.reportActionID ?? '-1']: null})?.created,
+            },
+        });
+        optimisticData.push({
+            onyxMethod: Onyx.METHOD.MERGE,
+            key: `${ONYXKEYS.COLLECTION.REPORT}${iouReport?.reportID}`,
+            value: {
+                pendingFields: {
+                    preview: CONST.RED_BRICK_ROAD_PENDING_ACTION.DELETE,
+                },
             },
         });
     }
@@ -5162,7 +5878,7 @@ function deleteMoneyRequest(transactionID: string, reportAction: OnyxTypes.Repor
             onyxMethod: Onyx.METHOD.MERGE,
             key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${chatReport?.reportID}`,
             value: {
-                [reportPreviewAction?.reportActionID ?? '']: {
+                [reportPreviewAction?.reportActionID ?? '-1']: {
                     pendingAction: null,
                     errors: null,
                 },
@@ -5182,17 +5898,15 @@ function deleteMoneyRequest(transactionID: string, reportAction: OnyxTypes.Repor
         {
             onyxMethod: Onyx.METHOD.SET,
             key: `${ONYXKEYS.COLLECTION.TRANSACTION}${transactionID}`,
-            value: transaction,
+            value: transaction ?? null,
         },
     ];
 
-    if (Permissions.canUseViolations(betas)) {
-        failureData.push({
-            onyxMethod: Onyx.METHOD.SET,
-            key: `${ONYXKEYS.COLLECTION.TRANSACTION_VIOLATIONS}${transactionID}`,
-            value: transactionViolations,
-        });
-    }
+    failureData.push({
+        onyxMethod: Onyx.METHOD.SET,
+        key: `${ONYXKEYS.COLLECTION.TRANSACTION_VIOLATIONS}${transactionID}`,
+        value: transactionViolations ?? null,
+    });
 
     if (shouldDeleteTransactionThread) {
         failureData.push({
@@ -5213,7 +5927,7 @@ function deleteMoneyRequest(transactionID: string, reportAction: OnyxTypes.Repor
                     ...reportAction,
                     pendingAction: null,
                     errors: {
-                        [errorKey]: ['iou.error.genericDeleteFailureMessage', {isTranslated: false}],
+                        [errorKey]: Localize.translateLocal('iou.error.genericDeleteFailureMessage'),
                     },
                 },
             },
@@ -5233,11 +5947,11 @@ function deleteMoneyRequest(transactionID: string, reportAction: OnyxTypes.Repor
             onyxMethod: Onyx.METHOD.MERGE,
             key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${chatReport?.reportID}`,
             value: {
-                [reportPreviewAction?.reportActionID ?? '']: {
+                [reportPreviewAction?.reportActionID ?? '-1']: {
                     ...reportPreviewAction,
                     pendingAction: null,
                     errors: {
-                        [errorKey]: ['iou.error.genericDeleteFailureMessage', {isTranslated: false}],
+                        [errorKey]: Localize.translateLocal('iou.error.genericDeleteFailureMessage'),
                     },
                 },
             },
@@ -5252,7 +5966,7 @@ function deleteMoneyRequest(transactionID: string, reportAction: OnyxTypes.Repor
         });
     }
 
-    if (!shouldDeleteIOUReport && updatedReportPreviewAction.childMoneyRequestCount === 0) {
+    if (!shouldDeleteIOUReport && updatedReportPreviewAction?.childMoneyRequestCount === 0) {
         failureData.push({
             onyxMethod: Onyx.METHOD.MERGE,
             key: `${ONYXKEYS.COLLECTION.REPORT}${chatReport?.reportID}`,
@@ -5267,31 +5981,31 @@ function deleteMoneyRequest(transactionID: string, reportAction: OnyxTypes.Repor
         reportActionID: reportAction.reportActionID,
     };
 
-    // STEP 6: Make the API request
+    // STEP 3: Make the API request
     API.write(WRITE_COMMANDS.DELETE_MONEY_REQUEST, parameters, {optimisticData, successData, failureData});
     CachedPDFPaths.clearByKey(transactionID);
 
-    // STEP 7: Navigate the user depending on which page they are on and which resources were deleted
-    if (iouReport && isSingleTransactionView && shouldDeleteTransactionThread && !shouldDeleteIOUReport) {
-        // Pop the deleted report screen before navigating. This prevents navigating to the Concierge chat due to the missing report.
-        Navigation.goBack(ROUTES.REPORT_WITH_ID.getRoute(iouReport.reportID));
-        return;
-    }
-
-    if (iouReport?.chatReportID && shouldDeleteIOUReport) {
-        // Pop the deleted report screen before navigating. This prevents navigating to the Concierge chat due to the missing report.
-        Navigation.goBack(ROUTES.REPORT_WITH_ID.getRoute(iouReport.chatReportID));
-    }
+    return urlToNavigateBack;
 }
 
 function deleteTrackExpense(chatReportID: string, transactionID: string, reportAction: OnyxTypes.ReportAction, isSingleTransactionView = false) {
     // STEP 1: Get all collections we're updating
-    const chatReport = allReports?.[`${ONYXKEYS.COLLECTION.REPORT}${chatReportID}`] ?? null;
+    const chatReport = ReportConnection.getAllReports()?.[`${ONYXKEYS.COLLECTION.REPORT}${chatReportID}`] ?? null;
     if (!ReportUtils.isSelfDM(chatReport)) {
         return deleteMoneyRequest(transactionID, reportAction, isSingleTransactionView);
     }
 
-    const {parameters, optimisticData, successData, failureData, shouldDeleteTransactionThread} = getDeleteTrackExpenseInformation(chatReportID, transactionID, reportAction);
+    const whisperAction = ReportActionsUtils.getTrackExpenseActionableWhisper(transactionID, chatReportID);
+    const actionableWhisperReportActionID = whisperAction?.reportActionID;
+    const {parameters, optimisticData, successData, failureData, shouldDeleteTransactionThread} = getDeleteTrackExpenseInformation(
+        chatReportID,
+        transactionID,
+        reportAction,
+        undefined,
+        undefined,
+        actionableWhisperReportActionID,
+        CONST.REPORT.ACTIONABLE_TRACK_EXPENSE_WHISPER_RESOLUTION.NOTHING,
+    );
 
     // STEP 6: Make the API request
     API.write(WRITE_COMMANDS.DELETE_MONEY_REQUEST, parameters, {optimisticData, successData, failureData});
@@ -5300,7 +6014,7 @@ function deleteTrackExpense(chatReportID: string, transactionID: string, reportA
     // STEP 7: Navigate the user depending on which page they are on and which resources were deleted
     if (isSingleTransactionView && shouldDeleteTransactionThread) {
         // Pop the deleted report screen before navigating. This prevents navigating to the Concierge chat due to the missing report.
-        Navigation.goBack(ROUTES.REPORT_WITH_ID.getRoute(chatReport?.reportID ?? ''));
+        return ROUTES.REPORT_WITH_ID.getRoute(chatReport?.reportID ?? '-1');
     }
 }
 
@@ -5309,7 +6023,7 @@ function deleteTrackExpense(chatReportID: string, transactionID: string, reportA
  * @param recipient - The user receiving the money
  */
 function getSendMoneyParams(
-    report: OnyxEntry<OnyxTypes.Report> | EmptyObject,
+    report: OnyxEntry<OnyxTypes.Report>,
     amount: number,
     currency: string,
     comment: string,
@@ -5328,10 +6042,10 @@ function getSendMoneyParams(
         idempotencyKey: Str.guid(),
     });
 
-    let chatReport = !isEmptyObject(report) && report?.reportID ? report : ReportUtils.getChatByParticipants([recipientAccountID]);
+    let chatReport = !isEmptyObject(report) && report?.reportID ? report : ReportUtils.getChatByParticipants([recipientAccountID, managerID]);
     let isNewChat = false;
     if (!chatReport) {
-        chatReport = ReportUtils.buildOptimisticChatReport([recipientAccountID]);
+        chatReport = ReportUtils.buildOptimisticChatReport([recipientAccountID, managerID]);
         isNewChat = true;
     }
     const optimisticIOUReport = ReportUtils.buildOptimisticIOUReport(recipientAccountID, managerID, amount, chatReport.reportID, currency, true);
@@ -5397,8 +6111,8 @@ function getSendMoneyParams(
         key: `${ONYXKEYS.COLLECTION.REPORT}${optimisticIOUReport.reportID}`,
         value: {
             ...optimisticIOUReport,
-            lastMessageText: optimisticIOUReportAction.message?.[0]?.text,
-            lastMessageHtml: optimisticIOUReportAction.message?.[0]?.html,
+            lastMessageText: ReportActionsUtils.getReportActionText(optimisticIOUReportAction),
+            lastMessageHtml: ReportActionsUtils.getReportActionHtml(optimisticIOUReportAction),
         },
     };
     const optimisticTransactionThreadData: OnyxUpdate = {
@@ -5428,11 +6142,64 @@ function getSendMoneyParams(
         onyxMethod: Onyx.METHOD.MERGE,
         key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${optimisticTransactionThread.reportID}`,
         value: {
-            [optimisticCreatedActionForTransactionThread.reportActionID]: optimisticCreatedActionForTransactionThread,
+            [optimisticCreatedActionForTransactionThread?.reportActionID ?? '-1']: optimisticCreatedActionForTransactionThread,
         },
     };
 
-    const successData: OnyxUpdate[] = [
+    const successData: OnyxUpdate[] = [];
+
+    // Add optimistic personal details for recipient
+    let optimisticPersonalDetailListData: OnyxUpdate | null = null;
+    const optimisticPersonalDetailListAction = isNewChat
+        ? {
+              [recipientAccountID]: {
+                  accountID: recipientAccountID,
+                  // Disabling this line since participant.displayName can be an empty string
+                  // eslint-disable-next-line @typescript-eslint/prefer-nullish-coalescing
+                  displayName: recipient.displayName || recipient.login,
+                  login: recipient.login,
+              },
+          }
+        : {};
+
+    const redundantParticipants: Record<number, null> = {};
+    if (!isEmptyObject(optimisticPersonalDetailListAction)) {
+        const successPersonalDetailListAction: Record<number, null> = {};
+
+        // BE will send different participants. We clear the optimistic ones to avoid duplicated entries
+        Object.keys(optimisticPersonalDetailListAction).forEach((accountIDKey) => {
+            const accountID = Number(accountIDKey);
+            successPersonalDetailListAction[accountID] = null;
+            redundantParticipants[accountID] = null;
+        });
+
+        optimisticPersonalDetailListData = {
+            onyxMethod: Onyx.METHOD.MERGE,
+            key: ONYXKEYS.PERSONAL_DETAILS_LIST,
+            value: optimisticPersonalDetailListAction,
+        };
+        successData.push({
+            onyxMethod: Onyx.METHOD.MERGE,
+            key: ONYXKEYS.PERSONAL_DETAILS_LIST,
+            value: successPersonalDetailListAction,
+        });
+    }
+
+    successData.push(
+        {
+            onyxMethod: Onyx.METHOD.MERGE,
+            key: `${ONYXKEYS.COLLECTION.REPORT}${optimisticIOUReport.reportID}`,
+            value: {
+                participants: redundantParticipants,
+            },
+        },
+        {
+            onyxMethod: Onyx.METHOD.MERGE,
+            key: `${ONYXKEYS.COLLECTION.REPORT}${optimisticTransactionThread.reportID}`,
+            value: {
+                participants: redundantParticipants,
+            },
+        },
         {
             onyxMethod: Onyx.METHOD.MERGE,
             key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${optimisticIOUReport.reportID}`,
@@ -5460,19 +6227,19 @@ function getSendMoneyParams(
             onyxMethod: Onyx.METHOD.MERGE,
             key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${optimisticTransactionThread.reportID}`,
             value: {
-                [optimisticCreatedActionForTransactionThread.reportActionID]: {
+                [optimisticCreatedActionForTransactionThread?.reportActionID ?? '-1']: {
                     pendingAction: null,
                 },
             },
         },
-    ];
+    );
 
     const failureData: OnyxUpdate[] = [
         {
             onyxMethod: Onyx.METHOD.MERGE,
             key: `${ONYXKEYS.COLLECTION.TRANSACTION}${optimisticTransaction.transactionID}`,
             value: {
-                errors: ErrorUtils.getMicroSecondOnyxError('iou.error.other'),
+                errors: ErrorUtils.getMicroSecondOnyxErrorWithTranslationKey('iou.error.other'),
             },
         },
         {
@@ -5480,7 +6247,7 @@ function getSendMoneyParams(
             key: `${ONYXKEYS.COLLECTION.REPORT}${optimisticTransactionThread.reportID}`,
             value: {
                 errorFields: {
-                    createChat: ErrorUtils.getMicroSecondOnyxError('report.genericCreateReportFailureMessage'),
+                    createChat: ErrorUtils.getMicroSecondOnyxErrorWithTranslationKey('report.genericCreateReportFailureMessage'),
                 },
             },
         },
@@ -5488,21 +6255,19 @@ function getSendMoneyParams(
             onyxMethod: Onyx.METHOD.MERGE,
             key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${optimisticTransactionThread.reportID}`,
             value: {
-                [optimisticCreatedActionForTransactionThread.reportActionID]: {
-                    errors: ErrorUtils.getMicroSecondOnyxError('iou.error.genericCreateFailureMessage'),
+                [optimisticCreatedActionForTransactionThread?.reportActionID ?? '-1']: {
+                    errors: ErrorUtils.getMicroSecondOnyxErrorWithTranslationKey('iou.error.genericCreateFailureMessage'),
                 },
             },
         },
     ];
 
-    let optimisticPersonalDetailListData: OnyxUpdate | EmptyObject = {};
-
     // Now, let's add the data we need just when we are creating a new chat report
     if (isNewChat) {
         successData.push({
             onyxMethod: Onyx.METHOD.MERGE,
             key: `${ONYXKEYS.COLLECTION.REPORT}${chatReport.reportID}`,
-            value: {pendingFields: null},
+            value: {pendingFields: null, participants: redundantParticipants},
         });
         failureData.push(
             {
@@ -5510,7 +6275,7 @@ function getSendMoneyParams(
                 key: `${ONYXKEYS.COLLECTION.REPORT}${chatReport.reportID}`,
                 value: {
                     errorFields: {
-                        createChat: ErrorUtils.getMicroSecondOnyxError('report.genericCreateReportFailureMessage'),
+                        createChat: ErrorUtils.getMicroSecondOnyxErrorWithTranslationKey('report.genericCreateReportFailureMessage'),
                     },
                 },
             },
@@ -5519,28 +6284,12 @@ function getSendMoneyParams(
                 key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${optimisticIOUReport.reportID}`,
                 value: {
                     [optimisticIOUReportAction.reportActionID]: {
-                        errors: ErrorUtils.getMicroSecondOnyxError('iou.error.genericCreateFailureMessage'),
+                        errors: ErrorUtils.getMicroSecondOnyxErrorWithTranslationKey('iou.error.genericCreateFailureMessage'),
                     },
                 },
             },
         );
 
-        // Add optimistic personal details for recipient
-        optimisticPersonalDetailListData = {
-            onyxMethod: Onyx.METHOD.MERGE,
-            key: ONYXKEYS.PERSONAL_DETAILS_LIST,
-            value: {
-                [recipientAccountID]: {
-                    accountID: recipientAccountID,
-                    avatar: UserUtils.getDefaultAvatarURL(recipient.accountID),
-                    // Disabling this line since participant.displayName can be an empty string
-                    // eslint-disable-next-line @typescript-eslint/prefer-nullish-coalescing
-                    displayName: recipient.displayName || recipient.login,
-                    login: recipient.login,
-                },
-            },
-        };
-
         if (optimisticChatReportActionsData.value) {
             // Add an optimistic created action to the optimistic chat reportActions data
             optimisticChatReportActionsData.value[optimisticCreatedActionForChat.reportActionID] = optimisticCreatedActionForChat;
@@ -5551,7 +6300,7 @@ function getSendMoneyParams(
             key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${optimisticIOUReport.reportID}`,
             value: {
                 [optimisticIOUReportAction.reportActionID]: {
-                    errors: ErrorUtils.getMicroSecondOnyxError('iou.error.other'),
+                    errors: ErrorUtils.getMicroSecondOnyxErrorWithTranslationKey('iou.error.other'),
                 },
             },
         });
@@ -5580,11 +6329,11 @@ function getSendMoneyParams(
             paymentMethodType,
             transactionID: optimisticTransaction.transactionID,
             newIOUReportDetails,
-            createdReportActionID: isNewChat ? optimisticCreatedActionForChat.reportActionID : '0',
+            createdReportActionID: isNewChat ? optimisticCreatedActionForChat.reportActionID : '-1',
             reportPreviewReportActionID: reportPreviewAction.reportActionID,
             createdIOUReportActionID: optimisticCreatedActionForIOUReport.reportActionID,
             transactionThreadReportID: optimisticTransactionThread.reportID,
-            createdReportActionIDForThread: optimisticCreatedActionForTransactionThread.reportActionID,
+            createdReportActionIDForThread: optimisticCreatedActionForTransactionThread?.reportActionID ?? '-1',
         },
         optimisticData,
         successData,
@@ -5592,13 +6341,230 @@ function getSendMoneyParams(
     };
 }
 
-function getPayMoneyRequestParams(
+type OptimisticHoldReportExpenseActionID = {
+    optimisticReportActionID: string;
+    oldReportActionID: string;
+};
+
+function getHoldReportActionsAndTransactions(reportID: string) {
+    const iouReportActions = ReportActionsUtils.getAllReportActions(reportID);
+    const holdReportActions: Array<OnyxTypes.ReportAction<typeof CONST.REPORT.ACTIONS.TYPE.IOU>> = [];
+    const holdTransactions: OnyxTypes.Transaction[] = [];
+
+    Object.values(iouReportActions).forEach((action) => {
+        const transactionID = ReportActionsUtils.isMoneyRequestAction(action) ? ReportActionsUtils.getOriginalMessage(action)?.IOUTransactionID ?? null : null;
+        const transaction = getTransaction(transactionID ?? '-1');
+
+        if (transaction?.comment?.hold) {
+            holdReportActions.push(action as OnyxTypes.ReportAction<typeof CONST.REPORT.ACTIONS.TYPE.IOU>);
+            holdTransactions.push(transaction);
+        }
+    });
+
+    return {holdReportActions, holdTransactions};
+}
+
+function getReportFromHoldRequestsOnyxData(
     chatReport: OnyxTypes.Report,
     iouReport: OnyxTypes.Report,
     recipient: Participant,
+): {
+    optimisticHoldReportID: string;
+    optimisticHoldActionID: string;
+    optimisticHoldReportExpenseActionIDs: OptimisticHoldReportExpenseActionID[];
+    optimisticData: OnyxUpdate[];
+    failureData: OnyxUpdate[];
+} {
+    const {holdReportActions, holdTransactions} = getHoldReportActionsAndTransactions(iouReport.reportID);
+    const firstHoldTransaction = holdTransactions[0];
+    const newParentReportActionID = rand64();
+
+    const optimisticExpenseReport = ReportUtils.buildOptimisticExpenseReport(
+        chatReport.reportID,
+        chatReport.policyID ?? iouReport.policyID ?? '',
+        recipient.accountID ?? 1,
+        (firstHoldTransaction?.amount ?? 0) * -1,
+        getCurrency(firstHoldTransaction),
+        false,
+        newParentReportActionID,
+    );
+    const optimisticExpenseReportPreview = ReportUtils.buildOptimisticReportPreview(
+        chatReport,
+        optimisticExpenseReport,
+        '',
+        firstHoldTransaction,
+        optimisticExpenseReport.reportID,
+        newParentReportActionID,
+    );
+
+    const updateHeldReports: Record<string, Pick<OnyxTypes.Report, 'parentReportActionID' | 'parentReportID' | 'chatReportID'>> = {};
+    const addHoldReportActions: OnyxTypes.ReportActions = {};
+    const deleteHoldReportActions: Record<string, Pick<OnyxTypes.ReportAction, 'message'>> = {};
+    const optimisticHoldReportExpenseActionIDs: OptimisticHoldReportExpenseActionID[] = [];
+
+    holdReportActions.forEach((holdReportAction) => {
+        const originalMessage = ReportActionsUtils.getOriginalMessage(holdReportAction);
+
+        deleteHoldReportActions[holdReportAction.reportActionID] = {
+            message: [
+                {
+                    deleted: DateUtils.getDBTime(),
+                    type: CONST.REPORT.MESSAGE.TYPE.TEXT,
+                    text: '',
+                },
+            ],
+        };
+
+        const reportActionID = rand64();
+        addHoldReportActions[reportActionID] = {
+            ...holdReportAction,
+            reportActionID,
+            originalMessage: {
+                ...originalMessage,
+                IOUReportID: optimisticExpenseReport.reportID,
+            },
+            pendingAction: CONST.RED_BRICK_ROAD_PENDING_ACTION.ADD,
+        };
+
+        const heldReport = ReportUtils.getReportOrDraftReport(holdReportAction.childReportID);
+        if (heldReport) {
+            optimisticHoldReportExpenseActionIDs.push({optimisticReportActionID: reportActionID, oldReportActionID: holdReportAction.reportActionID});
+
+            updateHeldReports[`${ONYXKEYS.COLLECTION.REPORT}${heldReport.reportID}`] = {
+                parentReportActionID: reportActionID,
+                parentReportID: optimisticExpenseReport.reportID,
+                chatReportID: optimisticExpenseReport.reportID,
+            };
+        }
+    });
+
+    const updateHeldTransactions: Record<string, Pick<OnyxTypes.Transaction, 'reportID'>> = {};
+    holdTransactions.forEach((transaction) => {
+        updateHeldTransactions[`${ONYXKEYS.COLLECTION.TRANSACTION}${transaction.transactionID}`] = {
+            reportID: optimisticExpenseReport.reportID,
+        };
+    });
+
+    const optimisticData: OnyxUpdate[] = [
+        {
+            onyxMethod: Onyx.METHOD.MERGE,
+            key: `${ONYXKEYS.COLLECTION.REPORT}${chatReport.reportID}`,
+            value: {
+                iouReportID: optimisticExpenseReport.reportID,
+            },
+        },
+        // add new optimistic expense report
+        {
+            onyxMethod: Onyx.METHOD.MERGE,
+            key: `${ONYXKEYS.COLLECTION.REPORT}${optimisticExpenseReport.reportID}`,
+            value: optimisticExpenseReport,
+        },
+        // add preview report action to main chat
+        {
+            onyxMethod: Onyx.METHOD.MERGE,
+            key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${chatReport.reportID}`,
+            value: {
+                [optimisticExpenseReportPreview.reportActionID]: optimisticExpenseReportPreview,
+            },
+        },
+        // remove hold report actions from old iou report
+        {
+            onyxMethod: Onyx.METHOD.MERGE,
+            key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${iouReport.reportID}`,
+            value: deleteHoldReportActions,
+        },
+        // add hold report actions to new iou report
+        {
+            onyxMethod: Onyx.METHOD.MERGE,
+            key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${optimisticExpenseReport.reportID}`,
+            value: addHoldReportActions,
+        },
+        // update held reports with new parentReportActionID
+        {
+            onyxMethod: Onyx.METHOD.MERGE_COLLECTION,
+            key: `${ONYXKEYS.COLLECTION.REPORT}`,
+            value: updateHeldReports,
+        },
+        // update transactions with new iouReportID
+        {
+            onyxMethod: Onyx.METHOD.MERGE_COLLECTION,
+            key: `${ONYXKEYS.COLLECTION.TRANSACTION}`,
+            value: updateHeldTransactions,
+        },
+    ];
+
+    const bringReportActionsBack: Record<string, OnyxTypes.ReportAction> = {};
+    holdReportActions.forEach((reportAction) => {
+        bringReportActionsBack[reportAction.reportActionID] = reportAction;
+    });
+
+    const bringHeldTransactionsBack: Record<string, OnyxTypes.Transaction> = {};
+    holdTransactions.forEach((transaction) => {
+        bringHeldTransactionsBack[`${ONYXKEYS.COLLECTION.TRANSACTION}${transaction.transactionID}`] = transaction;
+    });
+
+    const failureData: OnyxUpdate[] = [
+        // remove added optimistic expense report
+        {
+            onyxMethod: Onyx.METHOD.MERGE,
+            key: `${ONYXKEYS.COLLECTION.REPORT}${optimisticExpenseReport.reportID}`,
+            value: null,
+        },
+        // remove preview report action from the main chat
+        {
+            onyxMethod: Onyx.METHOD.MERGE,
+            key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${chatReport.reportID}`,
+            value: {
+                [optimisticExpenseReportPreview.reportActionID]: null,
+            },
+        },
+        // add hold report actions back to old iou report
+        {
+            onyxMethod: Onyx.METHOD.MERGE,
+            key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${iouReport.reportID}`,
+            value: bringReportActionsBack,
+        },
+        // remove hold report actions from the new iou report
+        {
+            onyxMethod: Onyx.METHOD.MERGE,
+            key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${optimisticExpenseReport.reportID}`,
+            value: null,
+        },
+        // add hold transactions back to old iou report
+        {
+            onyxMethod: Onyx.METHOD.MERGE_COLLECTION,
+            key: `${ONYXKEYS.COLLECTION.TRANSACTION}`,
+            value: bringHeldTransactionsBack,
+        },
+    ];
+
+    return {
+        optimisticData,
+        optimisticHoldActionID: optimisticExpenseReportPreview.reportActionID,
+        failureData,
+        optimisticHoldReportID: optimisticExpenseReport.reportID,
+        optimisticHoldReportExpenseActionIDs,
+    };
+}
+
+function getPayMoneyRequestParams(
+    initialChatReport: OnyxTypes.Report,
+    iouReport: OnyxTypes.Report,
+    recipient: Participant,
     paymentMethodType: PaymentMethodType,
     full: boolean,
+    payAsBusiness?: boolean,
 ): PayMoneyRequestData {
+    const isInvoiceReport = ReportUtils.isInvoiceReport(iouReport);
+    let chatReport = initialChatReport;
+
+    if (ReportUtils.isIndividualInvoiceRoom(chatReport) && payAsBusiness && activePolicyID) {
+        const existingB2BInvoiceRoom = ReportUtils.getInvoiceChatByParticipants(chatReport.policyID ?? '', activePolicyID);
+        if (existingB2BInvoiceRoom) {
+            chatReport = existingB2BInvoiceRoom;
+        }
+    }
+
     let total = (iouReport.total ?? 0) - (iouReport.nonReimbursableTotal ?? 0);
     if (ReportUtils.hasHeldExpenses(iouReport.reportID) && !full && !!iouReport.unheldTotal) {
         total = iouReport.unheldTotal;
@@ -5623,23 +6589,34 @@ function getPayMoneyRequestParams(
     if (reportPreviewAction) {
         optimisticReportPreviewAction = ReportUtils.updateReportPreview(iouReport, reportPreviewAction, true);
     }
-
-    const currentNextStep = allNextSteps[`${ONYXKEYS.COLLECTION.NEXT_STEP}${iouReport.reportID}`] ?? null;
-    const optimisticNextStep = NextStepUtils.buildNextStep(iouReport, CONST.REPORT.STATUS_NUM.REIMBURSED, {isPaidWithExpensify: paymentMethodType === CONST.IOU.PAYMENT_TYPE.VBBA});
+    let currentNextStep = null;
+    let optimisticNextStep = null;
+    if (!isInvoiceReport) {
+        currentNextStep = allNextSteps[`${ONYXKEYS.COLLECTION.NEXT_STEP}${iouReport.reportID}`] ?? null;
+        optimisticNextStep = NextStepUtils.buildNextStep(iouReport, CONST.REPORT.STATUS_NUM.REIMBURSED);
+    }
+
+    const optimisticChatReport = {
+        ...chatReport,
+        lastReadTime: DateUtils.getDBTime(),
+        lastVisibleActionCreated: optimisticIOUReportAction.created,
+        hasOutstandingChildRequest: false,
+        iouReportID: null,
+        lastMessageText: ReportActionsUtils.getReportActionText(optimisticIOUReportAction),
+        lastMessageHtml: ReportActionsUtils.getReportActionHtml(optimisticIOUReportAction),
+    };
+    if (ReportUtils.isIndividualInvoiceRoom(chatReport) && payAsBusiness && activePolicyID) {
+        optimisticChatReport.invoiceReceiver = {
+            type: CONST.REPORT.INVOICE_RECEIVER_TYPE.BUSINESS,
+            policyID: activePolicyID,
+        };
+    }
 
     const optimisticData: OnyxUpdate[] = [
         {
             onyxMethod: Onyx.METHOD.MERGE,
             key: `${ONYXKEYS.COLLECTION.REPORT}${chatReport.reportID}`,
-            value: {
-                ...chatReport,
-                lastReadTime: DateUtils.getDBTime(),
-                lastVisibleActionCreated: optimisticIOUReportAction.created,
-                hasOutstandingChildRequest: false,
-                iouReportID: null,
-                lastMessageText: optimisticIOUReportAction.message?.[0]?.text,
-                lastMessageHtml: optimisticIOUReportAction.message?.[0]?.html,
-            },
+            value: optimisticChatReport,
         },
         {
             onyxMethod: Onyx.METHOD.MERGE,
@@ -5656,8 +6633,8 @@ function getPayMoneyRequestParams(
             key: `${ONYXKEYS.COLLECTION.REPORT}${iouReport.reportID}`,
             value: {
                 ...iouReport,
-                lastMessageText: optimisticIOUReportAction.message?.[0]?.text,
-                lastMessageHtml: optimisticIOUReportAction.message?.[0]?.html,
+                lastMessageText: ReportActionsUtils.getReportActionText(optimisticIOUReportAction),
+                lastMessageHtml: ReportActionsUtils.getReportActionHtml(optimisticIOUReportAction),
                 hasOutstandingChildRequest: false,
                 statusNum: CONST.REPORT.STATUS_NUM.REIMBURSED,
                 pendingFields: {
@@ -5670,7 +6647,7 @@ function getPayMoneyRequestParams(
         {
             onyxMethod: Onyx.METHOD.MERGE,
             key: ONYXKEYS.NVP_LAST_PAYMENT_METHOD,
-            value: {[iouReport.policyID ?? '']: paymentMethodType},
+            value: {[iouReport.policyID ?? '-1']: paymentMethodType},
         },
         {
             onyxMethod: Onyx.METHOD.MERGE,
@@ -5699,7 +6676,7 @@ function getPayMoneyRequestParams(
             key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${iouReport.reportID}`,
             value: {
                 [optimisticIOUReportAction.reportActionID]: {
-                    errors: ErrorUtils.getMicroSecondOnyxError('iou.error.other'),
+                    errors: ErrorUtils.getMicroSecondOnyxErrorWithTranslationKey('iou.error.other'),
                 },
             },
         },
@@ -5742,6 +6719,19 @@ function getPayMoneyRequestParams(
         });
     }
 
+    let optimisticHoldReportID;
+    let optimisticHoldActionID;
+    let optimisticHoldReportExpenseActionIDs;
+    if (!full) {
+        const holdReportOnyxData = getReportFromHoldRequestsOnyxData(chatReport, iouReport, recipient);
+
+        optimisticData.push(...holdReportOnyxData.optimisticData);
+        failureData.push(...holdReportOnyxData.failureData);
+        optimisticHoldReportID = holdReportOnyxData.optimisticHoldReportID;
+        optimisticHoldActionID = holdReportOnyxData.optimisticHoldActionID;
+        optimisticHoldReportExpenseActionIDs = JSON.stringify(holdReportOnyxData.optimisticHoldReportExpenseActionIDs);
+    }
+
     return {
         params: {
             iouReportID: iouReport.reportID,
@@ -5750,6 +6740,9 @@ function getPayMoneyRequestParams(
             paymentMethodType,
             full,
             amount: Math.abs(total),
+            optimisticHoldReportID,
+            optimisticHoldActionID,
+            optimisticHoldReportExpenseActionIDs,
         },
         optimisticData,
         successData,
@@ -5766,7 +6759,7 @@ function sendMoneyElsewhere(report: OnyxEntry<OnyxTypes.Report>, amount: number,
 
     API.write(WRITE_COMMANDS.SEND_MONEY_ELSEWHERE, params, {optimisticData, successData, failureData});
 
-    Navigation.dismissModal(params.chatReportID);
+    Navigation.dismissModal(isSearchTopmostCentralPane() ? undefined : params.chatReportID);
     Report.notifyNewAction(params.chatReportID, managerID);
 }
 
@@ -5779,40 +6772,43 @@ function sendMoneyWithWallet(report: OnyxEntry<OnyxTypes.Report>, amount: number
 
     API.write(WRITE_COMMANDS.SEND_MONEY_WITH_WALLET, params, {optimisticData, successData, failureData});
 
-    Navigation.dismissModal(params.chatReportID);
+    Navigation.dismissModal(isSearchTopmostCentralPane() ? undefined : params.chatReportID);
     Report.notifyNewAction(params.chatReportID, managerID);
 }
 
-function canApproveIOU(iouReport: OnyxEntry<OnyxTypes.Report> | EmptyObject, chatReport: OnyxEntry<OnyxTypes.Report> | EmptyObject, policy: OnyxEntry<OnyxTypes.Policy> | EmptyObject) {
-    if (isEmptyObject(chatReport)) {
-        return false;
-    }
-    const isPaidGroupPolicy = ReportUtils.isPaidGroupPolicyExpenseChat(chatReport);
+function canApproveIOU(iouReport: OnyxTypes.OnyxInputOrEntry<OnyxTypes.Report>, policy: OnyxTypes.OnyxInputOrEntry<OnyxTypes.Policy>) {
+    // Only expense reports can be approved
+    const isPaidGroupPolicy = policy && PolicyUtils.isPaidGroupPolicy(policy);
     if (!isPaidGroupPolicy) {
         return false;
     }
 
-    const isOnInstantSubmitPolicy = PolicyUtils.isInstantSubmitEnabled(policy);
     const isOnSubmitAndClosePolicy = PolicyUtils.isSubmitAndClose(policy);
-    if (isOnInstantSubmitPolicy && isOnSubmitAndClosePolicy) {
+    if (isOnSubmitAndClosePolicy) {
         return false;
     }
 
-    const managerID = iouReport?.managerID ?? 0;
+    const managerID = iouReport?.managerID ?? -1;
     const isCurrentUserManager = managerID === userAccountID;
-    const isPolicyExpenseChat = ReportUtils.isPolicyExpenseChat(chatReport);
-
-    const isOpenExpenseReport = isPolicyExpenseChat && ReportUtils.isOpenExpenseReport(iouReport);
+    const isOpenExpenseReport = ReportUtils.isOpenExpenseReport(iouReport);
     const isApproved = ReportUtils.isReportApproved(iouReport);
     const iouSettled = ReportUtils.isSettled(iouReport?.reportID);
-    const isArchivedReport = ReportUtils.isArchivedRoom(iouReport);
+    const reportNameValuePairs = ReportUtils.getReportNameValuePairs(iouReport?.reportID);
+    const isArchivedReport = ReportUtils.isArchivedRoom(iouReport, reportNameValuePairs);
 
     return isCurrentUserManager && !isOpenExpenseReport && !isApproved && !iouSettled && !isArchivedReport;
 }
 
-function canIOUBePaid(iouReport: OnyxEntry<OnyxTypes.Report> | EmptyObject, chatReport: OnyxEntry<OnyxTypes.Report> | EmptyObject, policy: OnyxEntry<OnyxTypes.Policy> | EmptyObject) {
+function canIOUBePaid(
+    iouReport: OnyxTypes.OnyxInputOrEntry<OnyxTypes.Report>,
+    chatReport: OnyxTypes.OnyxInputOrEntry<OnyxTypes.Report>,
+    policy: OnyxTypes.OnyxInputOrEntry<OnyxTypes.Policy>,
+    transactions?: OnyxTypes.Transaction[],
+) {
     const isPolicyExpenseChat = ReportUtils.isPolicyExpenseChat(chatReport);
-    const iouCanceled = ReportUtils.isArchivedRoom(chatReport);
+    const reportNameValuePairs = ReportUtils.getReportNameValuePairs(chatReport?.reportID);
+    const isChatReportArchived = ReportUtils.isArchivedRoom(chatReport, reportNameValuePairs);
+    const iouSettled = ReportUtils.isSettled(iouReport?.reportID);
 
     if (isEmptyObject(iouReport)) {
         return false;
@@ -5823,11 +6819,13 @@ function canIOUBePaid(iouReport: OnyxEntry<OnyxTypes.Report> | EmptyObject, chat
     }
 
     if (ReportUtils.isInvoiceReport(iouReport)) {
+        if (iouSettled) {
+            return false;
+        }
         if (chatReport?.invoiceReceiver?.type === CONST.REPORT.INVOICE_RECEIVER_TYPE.INDIVIDUAL) {
             return chatReport?.invoiceReceiver?.accountID === userAccountID;
         }
-
-        return PolicyUtils.getPolicy(chatReport?.invoiceReceiver?.policyID).role === CONST.POLICY.ROLE.ADMIN;
+        return PolicyUtils.getPolicy(chatReport?.invoiceReceiver?.policyID)?.role === CONST.POLICY.ROLE.ADMIN;
     }
 
     const isPayer = ReportUtils.isPayer(
@@ -5839,40 +6837,69 @@ function canIOUBePaid(iouReport: OnyxEntry<OnyxTypes.Report> | EmptyObject, chat
     );
 
     const isOpenExpenseReport = isPolicyExpenseChat && ReportUtils.isOpenExpenseReport(iouReport);
-    const iouSettled = ReportUtils.isSettled(iouReport?.reportID);
 
     const {reimbursableSpend} = ReportUtils.getMoneyRequestSpendBreakdown(iouReport);
     const isAutoReimbursable = policy?.reimbursementChoice === CONST.POLICY.REIMBURSEMENT_CHOICES.REIMBURSEMENT_YES ? false : ReportUtils.canBeAutoReimbursed(iouReport, policy);
-    const shouldBeApproved = canApproveIOU(iouReport, chatReport, policy);
+    const shouldBeApproved = canApproveIOU(iouReport, policy);
+
+    const isPayAtEndExpenseReport = ReportUtils.isPayAtEndExpenseReport(iouReport?.reportID, transactions);
 
-    return isPayer && !isOpenExpenseReport && !iouSettled && !iouReport?.isWaitingOnBankAccount && reimbursableSpend !== 0 && !iouCanceled && !isAutoReimbursable && !shouldBeApproved;
+    return (
+        isPayer &&
+        !isOpenExpenseReport &&
+        !iouSettled &&
+        !iouReport?.isWaitingOnBankAccount &&
+        reimbursableSpend !== 0 &&
+        !isChatReportArchived &&
+        !isAutoReimbursable &&
+        !shouldBeApproved &&
+        !isPayAtEndExpenseReport
+    );
 }
 
-function hasIOUToApproveOrPay(chatReport: OnyxEntry<OnyxTypes.Report> | EmptyObject, excludedIOUReportID: string): boolean {
+function hasIOUToApproveOrPay(chatReport: OnyxEntry<OnyxTypes.Report>, excludedIOUReportID: string): boolean {
     const chatReportActions = allReportActions?.[`${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${chatReport?.reportID}`] ?? {};
 
     return Object.values(chatReportActions).some((action) => {
-        const iouReport = ReportUtils.getReport(action.childReportID ?? '');
+        const iouReport = ReportUtils.getReportOrDraftReport(action.childReportID ?? '-1');
         const policy = PolicyUtils.getPolicy(iouReport?.policyID);
-        const shouldShowSettlementButton = canIOUBePaid(iouReport, chatReport, policy) || canApproveIOU(iouReport, chatReport, policy);
+        const shouldShowSettlementButton = canIOUBePaid(iouReport, chatReport, policy) || canApproveIOU(iouReport, policy);
         return action.childReportID?.toString() !== excludedIOUReportID && action.actionName === CONST.REPORT.ACTIONS.TYPE.REPORT_PREVIEW && shouldShowSettlementButton;
     });
 }
 
-function approveMoneyRequest(expenseReport: OnyxTypes.Report | EmptyObject, full?: boolean) {
-    const currentNextStep = allNextSteps[`${ONYXKEYS.COLLECTION.NEXT_STEP}${expenseReport.reportID}`] ?? null;
-    let total = expenseReport.total ?? 0;
-    const hasHeldExpenses = ReportUtils.hasHeldExpenses(expenseReport.reportID);
-    if (hasHeldExpenses && !full && !!expenseReport.unheldTotal) {
-        total = expenseReport.unheldTotal;
+function isLastApprover(approvalChain: string[]): boolean {
+    if (approvalChain.length === 0) {
+        return true;
+    }
+    return approvalChain[approvalChain.length - 1] === currentUserEmail;
+}
+
+function approveMoneyRequest(expenseReport: OnyxEntry<OnyxTypes.Report>, full?: boolean) {
+    if (expenseReport?.policyID && SubscriptionUtils.shouldRestrictUserBillableActions(expenseReport.policyID)) {
+        Navigation.navigate(ROUTES.RESTRICTED_ACTION.getRoute(expenseReport.policyID));
+        return;
+    }
+
+    const currentNextStep = allNextSteps[`${ONYXKEYS.COLLECTION.NEXT_STEP}${expenseReport?.reportID}`] ?? null;
+    let total = expenseReport?.total ?? 0;
+    const hasHeldExpenses = ReportUtils.hasHeldExpenses(expenseReport?.reportID);
+    if (hasHeldExpenses && !full && !!expenseReport?.unheldTotal) {
+        total = expenseReport?.unheldTotal;
     }
-    const optimisticApprovedReportAction = ReportUtils.buildOptimisticApprovedReportAction(total, expenseReport.currency ?? '', expenseReport.reportID);
-    const optimisticNextStep = NextStepUtils.buildNextStep(expenseReport, CONST.REPORT.STATUS_NUM.APPROVED);
-    const chatReport = ReportUtils.getReport(expenseReport.chatReportID);
+    const optimisticApprovedReportAction = ReportUtils.buildOptimisticApprovedReportAction(total, expenseReport?.currency ?? '', expenseReport?.reportID ?? '-1');
+
+    const approvalChain = ReportUtils.getApprovalChain(PolicyUtils.getPolicy(expenseReport?.policyID), expenseReport?.ownerAccountID ?? -1, expenseReport?.total ?? 0);
+
+    const predictedNextStatus = isLastApprover(approvalChain) ? CONST.REPORT.STATUS_NUM.APPROVED : CONST.REPORT.STATUS_NUM.SUBMITTED;
+    const predictedNextState = isLastApprover(approvalChain) ? CONST.REPORT.STATE_NUM.APPROVED : CONST.REPORT.STATE_NUM.SUBMITTED;
+
+    const optimisticNextStep = NextStepUtils.buildNextStep(expenseReport, predictedNextStatus);
+    const chatReport = ReportUtils.getReportOrDraftReport(expenseReport?.chatReportID);
 
     const optimisticReportActionsData: OnyxUpdate = {
         onyxMethod: Onyx.METHOD.MERGE,
-        key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${expenseReport.reportID}`,
+        key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${expenseReport?.reportID}`,
         value: {
             [optimisticApprovedReportAction.reportActionID]: {
                 ...(optimisticApprovedReportAction as OnyxTypes.ReportAction),
@@ -5882,13 +6909,13 @@ function approveMoneyRequest(expenseReport: OnyxTypes.Report | EmptyObject, full
     };
     const optimisticIOUReportData: OnyxUpdate = {
         onyxMethod: Onyx.METHOD.MERGE,
-        key: `${ONYXKEYS.COLLECTION.REPORT}${expenseReport.reportID}`,
+        key: `${ONYXKEYS.COLLECTION.REPORT}${expenseReport?.reportID}`,
         value: {
             ...expenseReport,
-            lastMessageText: optimisticApprovedReportAction.message?.[0]?.text,
-            lastMessageHtml: optimisticApprovedReportAction.message?.[0]?.html,
-            stateNum: CONST.REPORT.STATE_NUM.APPROVED,
-            statusNum: CONST.REPORT.STATUS_NUM.APPROVED,
+            lastMessageText: ReportActionsUtils.getReportActionText(optimisticApprovedReportAction),
+            lastMessageHtml: ReportActionsUtils.getReportActionHtml(optimisticApprovedReportAction),
+            stateNum: predictedNextState,
+            statusNum: predictedNextStatus,
             pendingFields: {
                 partial: full ? null : CONST.RED_BRICK_ROAD_PENDING_ACTION.UPDATE,
             },
@@ -5899,13 +6926,13 @@ function approveMoneyRequest(expenseReport: OnyxTypes.Report | EmptyObject, full
         onyxMethod: Onyx.METHOD.MERGE,
         key: `${ONYXKEYS.COLLECTION.REPORT}${expenseReport?.chatReportID}`,
         value: {
-            hasOutstandingChildRequest: hasIOUToApproveOrPay(chatReport, expenseReport?.reportID ?? ''),
+            hasOutstandingChildRequest: hasIOUToApproveOrPay(chatReport, expenseReport?.reportID ?? '-1'),
         },
     };
 
     const optimisticNextStepData: OnyxUpdate = {
         onyxMethod: Onyx.METHOD.MERGE,
-        key: `${ONYXKEYS.COLLECTION.NEXT_STEP}${expenseReport.reportID}`,
+        key: `${ONYXKEYS.COLLECTION.NEXT_STEP}${expenseReport?.reportID}`,
         value: optimisticNextStep,
     };
     const optimisticData: OnyxUpdate[] = [optimisticIOUReportData, optimisticReportActionsData, optimisticNextStepData, optimisticChatReportData];
@@ -5913,7 +6940,7 @@ function approveMoneyRequest(expenseReport: OnyxTypes.Report | EmptyObject, full
     const successData: OnyxUpdate[] = [
         {
             onyxMethod: Onyx.METHOD.MERGE,
-            key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${expenseReport.reportID}`,
+            key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${expenseReport?.reportID}`,
             value: {
                 [optimisticApprovedReportAction.reportActionID]: {
                     pendingAction: null,
@@ -5922,7 +6949,7 @@ function approveMoneyRequest(expenseReport: OnyxTypes.Report | EmptyObject, full
         },
         {
             onyxMethod: Onyx.METHOD.MERGE,
-            key: `${ONYXKEYS.COLLECTION.REPORT}${expenseReport.reportID}`,
+            key: `${ONYXKEYS.COLLECTION.REPORT}${expenseReport?.reportID}`,
             value: {
                 pendingFields: {
                     partial: null,
@@ -5934,16 +6961,16 @@ function approveMoneyRequest(expenseReport: OnyxTypes.Report | EmptyObject, full
     const failureData: OnyxUpdate[] = [
         {
             onyxMethod: Onyx.METHOD.MERGE,
-            key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${expenseReport.reportID}`,
+            key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${expenseReport?.reportID}`,
             value: {
                 [optimisticApprovedReportAction.reportActionID]: {
-                    errors: ErrorUtils.getMicroSecondOnyxError('iou.error.other'),
+                    errors: ErrorUtils.getMicroSecondOnyxErrorWithTranslationKey('iou.error.other'),
                 },
             },
         },
         {
             onyxMethod: Onyx.METHOD.MERGE,
-            key: `${ONYXKEYS.COLLECTION.REPORT}${expenseReport.chatReportID}`,
+            key: `${ONYXKEYS.COLLECTION.REPORT}${expenseReport?.chatReportID}`,
             value: {
                 hasOutstandingChildRequest: chatReport?.hasOutstandingChildRequest,
                 pendingFields: {
@@ -5953,14 +6980,14 @@ function approveMoneyRequest(expenseReport: OnyxTypes.Report | EmptyObject, full
         },
         {
             onyxMethod: Onyx.METHOD.MERGE,
-            key: `${ONYXKEYS.COLLECTION.NEXT_STEP}${expenseReport.reportID}`,
+            key: `${ONYXKEYS.COLLECTION.NEXT_STEP}${expenseReport?.reportID}`,
             value: currentNextStep,
         },
     ];
 
     // Clear hold reason of all transactions if we approve all requests
     if (full && hasHeldExpenses) {
-        const heldTransactions = ReportUtils.getAllHeldTransactions(expenseReport.reportID);
+        const heldTransactions = ReportUtils.getAllHeldTransactions(expenseReport?.reportID);
         heldTransactions.forEach((heldTransaction) => {
             optimisticData.push({
                 onyxMethod: Onyx.METHOD.MERGE,
@@ -5976,29 +7003,140 @@ function approveMoneyRequest(expenseReport: OnyxTypes.Report | EmptyObject, full
                 key: `${ONYXKEYS.COLLECTION.TRANSACTION}${heldTransaction.transactionID}`,
                 value: {
                     comment: {
-                        hold: heldTransaction.comment.hold,
+                        hold: heldTransaction.comment?.hold,
                     },
                 },
             });
         });
     }
 
+    let optimisticHoldReportID;
+    let optimisticHoldActionID;
+    let optimisticHoldReportExpenseActionIDs;
+    if (!full && !!chatReport && !!expenseReport) {
+        const holdReportOnyxData = getReportFromHoldRequestsOnyxData(chatReport, expenseReport, {accountID: expenseReport.ownerAccountID});
+
+        optimisticData.push(...holdReportOnyxData.optimisticData);
+        failureData.push(...holdReportOnyxData.failureData);
+        optimisticHoldReportID = holdReportOnyxData.optimisticHoldReportID;
+        optimisticHoldActionID = holdReportOnyxData.optimisticHoldActionID;
+        optimisticHoldReportExpenseActionIDs = JSON.stringify(holdReportOnyxData.optimisticHoldReportExpenseActionIDs);
+    }
+
     const parameters: ApproveMoneyRequestParams = {
-        reportID: expenseReport.reportID,
+        reportID: expenseReport?.reportID ?? '-1',
         approvedReportActionID: optimisticApprovedReportAction.reportActionID,
         full,
+        optimisticHoldReportID,
+        optimisticHoldActionID,
+        optimisticHoldReportExpenseActionIDs,
+        v2: PolicyUtils.isControlOnAdvancedApprovalMode(PolicyUtils.getPolicy(expenseReport?.policyID)),
     };
 
     API.write(WRITE_COMMANDS.APPROVE_MONEY_REQUEST, parameters, {optimisticData, successData, failureData});
 }
 
+function unapproveExpenseReport(expenseReport: OnyxEntry<OnyxTypes.Report>) {
+    if (isEmptyObject(expenseReport)) {
+        return;
+    }
+
+    const currentNextStep = allNextSteps[`${ONYXKEYS.COLLECTION.NEXT_STEP}${expenseReport.reportID}`] ?? null;
+
+    const optimisticUnapprovedReportAction = ReportUtils.buildOptimisticUnapprovedReportAction(expenseReport.total ?? 0, expenseReport.currency ?? '', expenseReport.reportID);
+    const optimisticNextStep = NextStepUtils.buildNextStep(expenseReport, CONST.REPORT.STATUS_NUM.SUBMITTED);
+
+    const optimisticReportActionData: OnyxUpdate = {
+        onyxMethod: Onyx.METHOD.MERGE,
+        key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${expenseReport.reportID}`,
+        value: {
+            [optimisticUnapprovedReportAction.reportActionID]: {
+                ...(optimisticUnapprovedReportAction as OnyxTypes.ReportAction),
+                pendingAction: CONST.RED_BRICK_ROAD_PENDING_ACTION.ADD,
+            },
+        },
+    };
+    const optimisticIOUReportData: OnyxUpdate = {
+        onyxMethod: Onyx.METHOD.MERGE,
+        key: `${ONYXKEYS.COLLECTION.REPORT}${expenseReport.reportID}`,
+        value: {
+            ...expenseReport,
+            lastMessageText: ReportActionsUtils.getReportActionText(optimisticUnapprovedReportAction),
+            lastMessageHtml: ReportActionsUtils.getReportActionHtml(optimisticUnapprovedReportAction),
+            stateNum: CONST.REPORT.STATE_NUM.SUBMITTED,
+            statusNum: CONST.REPORT.STATUS_NUM.SUBMITTED,
+            pendingFields: {
+                partial: CONST.RED_BRICK_ROAD_PENDING_ACTION.UPDATE,
+            },
+        },
+    };
+
+    const optimisticNextStepData: OnyxUpdate = {
+        onyxMethod: Onyx.METHOD.MERGE,
+        key: `${ONYXKEYS.COLLECTION.NEXT_STEP}${expenseReport.reportID}`,
+        value: optimisticNextStep,
+    };
+
+    const optimisticData: OnyxUpdate[] = [optimisticIOUReportData, optimisticReportActionData, optimisticNextStepData];
+
+    const successData: OnyxUpdate[] = [
+        {
+            onyxMethod: Onyx.METHOD.MERGE,
+            key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${expenseReport.reportID}`,
+            value: {
+                [optimisticUnapprovedReportAction.reportActionID]: {
+                    pendingAction: null,
+                },
+            },
+        },
+        {
+            onyxMethod: Onyx.METHOD.MERGE,
+            key: `${ONYXKEYS.COLLECTION.REPORT}${expenseReport.reportID}`,
+            value: {
+                pendingFields: {
+                    partial: null,
+                },
+            },
+        },
+    ];
+
+    const failureData: OnyxUpdate[] = [
+        {
+            onyxMethod: Onyx.METHOD.MERGE,
+            key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${expenseReport.reportID}`,
+            value: {
+                [optimisticUnapprovedReportAction.reportActionID]: {
+                    errors: ErrorUtils.getMicroSecondOnyxErrorWithTranslationKey('iou.error.other'),
+                },
+            },
+        },
+        {
+            onyxMethod: Onyx.METHOD.MERGE,
+            key: `${ONYXKEYS.COLLECTION.NEXT_STEP}${expenseReport.reportID}`,
+            value: currentNextStep,
+        },
+    ];
+
+    const parameters: UnapproveExpenseReportParams = {
+        reportID: expenseReport.reportID,
+        reportActionID: optimisticUnapprovedReportAction.reportActionID,
+    };
+
+    API.write(WRITE_COMMANDS.UNAPPROVE_EXPENSE_REPORT, parameters, {optimisticData, successData, failureData});
+}
+
 function submitReport(expenseReport: OnyxTypes.Report) {
+    if (expenseReport.policyID && SubscriptionUtils.shouldRestrictUserBillableActions(expenseReport.policyID)) {
+        Navigation.navigate(ROUTES.RESTRICTED_ACTION.getRoute(expenseReport.policyID));
+        return;
+    }
+
     const currentNextStep = allNextSteps[`${ONYXKEYS.COLLECTION.NEXT_STEP}${expenseReport.reportID}`] ?? null;
-    const parentReport = ReportUtils.getReport(expenseReport.parentReportID);
+    const parentReport = ReportUtils.getReportOrDraftReport(expenseReport.parentReportID);
     const policy = PolicyUtils.getPolicy(expenseReport.policyID);
-    const isCurrentUserManager = currentUserPersonalDetails.accountID === expenseReport.managerID;
+    const isCurrentUserManager = currentUserPersonalDetails?.accountID === expenseReport.managerID;
     const isSubmitAndClosePolicy = PolicyUtils.isSubmitAndClose(policy);
-    const adminAccountID = policy.role === CONST.POLICY.ROLE.ADMIN ? currentUserPersonalDetails.accountID : undefined;
+    const adminAccountID = policy?.role === CONST.POLICY.ROLE.ADMIN ? currentUserPersonalDetails?.accountID : undefined;
     const optimisticSubmittedReportAction = ReportUtils.buildOptimisticSubmittedReportAction(expenseReport?.total ?? 0, expenseReport.currency ?? '', expenseReport.reportID, adminAccountID);
     const optimisticNextStep = NextStepUtils.buildNextStep(expenseReport, isSubmitAndClosePolicy ? CONST.REPORT.STATUS_NUM.CLOSED : CONST.REPORT.STATUS_NUM.SUBMITTED);
 
@@ -6019,8 +7157,8 @@ function submitReport(expenseReport: OnyxTypes.Report) {
                   key: `${ONYXKEYS.COLLECTION.REPORT}${expenseReport.reportID}`,
                   value: {
                       ...expenseReport,
-                      lastMessageText: optimisticSubmittedReportAction.message?.[0]?.text ?? '',
-                      lastMessageHtml: optimisticSubmittedReportAction.message?.[0]?.html ?? '',
+                      lastMessageText: ReportActionsUtils.getReportActionText(optimisticSubmittedReportAction),
+                      lastMessageHtml: ReportActionsUtils.getReportActionHtml(optimisticSubmittedReportAction),
                       stateNum: CONST.REPORT.STATE_NUM.SUBMITTED,
                       statusNum: CONST.REPORT.STATUS_NUM.SUBMITTED,
                   },
@@ -6091,7 +7229,7 @@ function submitReport(expenseReport: OnyxTypes.Report) {
             key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${expenseReport.reportID}`,
             value: {
                 [optimisticSubmittedReportAction.reportActionID]: {
-                    errors: ErrorUtils.getMicroSecondOnyxError('iou.error.other'),
+                    errors: ErrorUtils.getMicroSecondOnyxErrorWithTranslationKey('iou.error.other'),
                 },
             },
         });
@@ -6117,11 +7255,15 @@ function submitReport(expenseReport: OnyxTypes.Report) {
     API.write(WRITE_COMMANDS.SUBMIT_REPORT, parameters, {optimisticData, successData, failureData});
 }
 
-function cancelPayment(expenseReport: OnyxTypes.Report, chatReport: OnyxTypes.Report) {
+function cancelPayment(expenseReport: OnyxEntry<OnyxTypes.Report>, chatReport: OnyxTypes.Report) {
+    if (isEmptyObject(expenseReport)) {
+        return;
+    }
+
     const optimisticReportAction = ReportUtils.buildOptimisticCancelPaymentReportAction(expenseReport.reportID, -(expenseReport.total ?? 0), expenseReport.currency ?? '');
     const policy = PolicyUtils.getPolicy(chatReport.policyID);
     const isFree = policy && policy.type === CONST.POLICY.TYPE.FREE;
-    const approvalMode = policy.approvalMode ?? CONST.POLICY.APPROVAL_MODE.BASIC;
+    const approvalMode = policy?.approvalMode ?? CONST.POLICY.APPROVAL_MODE.BASIC;
     let stateNum: ValueOf<typeof CONST.REPORT.STATE_NUM> = CONST.REPORT.STATE_NUM.SUBMITTED;
     let statusNum: ValueOf<typeof CONST.REPORT.STATUS_NUM> = CONST.REPORT.STATUS_NUM.SUBMITTED;
     if (!isFree) {
@@ -6145,8 +7287,8 @@ function cancelPayment(expenseReport: OnyxTypes.Report, chatReport: OnyxTypes.Re
             key: `${ONYXKEYS.COLLECTION.REPORT}${expenseReport.reportID}`,
             value: {
                 ...expenseReport,
-                lastMessageText: optimisticReportAction.message?.[0]?.text,
-                lastMessageHtml: optimisticReportAction.message?.[0]?.html,
+                lastMessageText: ReportActionsUtils.getReportActionText(optimisticReportAction),
+                lastMessageHtml: ReportActionsUtils.getReportActionHtml(optimisticReportAction),
                 stateNum,
                 statusNum,
             },
@@ -6178,8 +7320,8 @@ function cancelPayment(expenseReport: OnyxTypes.Report, chatReport: OnyxTypes.Re
             onyxMethod: Onyx.METHOD.MERGE,
             key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${expenseReport.reportID}`,
             value: {
-                [optimisticReportAction.reportActionID ?? '']: {
-                    errors: ErrorUtils.getMicroSecondOnyxError('iou.error.other'),
+                [optimisticReportAction.reportActionID ?? '-1']: {
+                    errors: ErrorUtils.getMicroSecondOnyxErrorWithTranslationKey('iou.error.other'),
                 },
             },
         },
@@ -6215,7 +7357,7 @@ function cancelPayment(expenseReport: OnyxTypes.Report, chatReport: OnyxTypes.Re
         {
             iouReportID: expenseReport.reportID,
             chatReportID: chatReport.reportID,
-            managerAccountID: expenseReport.managerID ?? 0,
+            managerAccountID: expenseReport.managerID ?? -1,
             reportActionID: optimisticReportAction.reportActionID,
         },
         {optimisticData, successData, failureData},
@@ -6223,6 +7365,11 @@ function cancelPayment(expenseReport: OnyxTypes.Report, chatReport: OnyxTypes.Re
 }
 
 function payMoneyRequest(paymentType: PaymentMethodType, chatReport: OnyxTypes.Report, iouReport: OnyxTypes.Report, full = true) {
+    if (chatReport.policyID && SubscriptionUtils.shouldRestrictUserBillableActions(chatReport.policyID)) {
+        Navigation.navigate(ROUTES.RESTRICTED_ACTION.getRoute(chatReport.policyID));
+        return;
+    }
+
     const recipient = {accountID: iouReport.ownerAccountID};
     const {params, optimisticData, successData, failureData} = getPayMoneyRequestParams(chatReport, iouReport, recipient, paymentType, full);
 
@@ -6231,12 +7378,38 @@ function payMoneyRequest(paymentType: PaymentMethodType, chatReport: OnyxTypes.R
     const apiCommand = paymentType === CONST.IOU.PAYMENT_TYPE.EXPENSIFY ? WRITE_COMMANDS.PAY_MONEY_REQUEST_WITH_WALLET : WRITE_COMMANDS.PAY_MONEY_REQUEST;
 
     API.write(apiCommand, params, {optimisticData, successData, failureData});
-    Navigation.dismissModalWithReport(chatReport);
+}
+
+function payInvoice(paymentMethodType: PaymentMethodType, chatReport: OnyxTypes.Report, invoiceReport: OnyxTypes.Report, payAsBusiness = false) {
+    const recipient = {accountID: invoiceReport.ownerAccountID};
+    const {
+        optimisticData,
+        successData,
+        failureData,
+        params: {reportActionID},
+    } = getPayMoneyRequestParams(chatReport, invoiceReport, recipient, paymentMethodType, true, payAsBusiness);
+
+    const params: PayInvoiceParams = {
+        reportID: invoiceReport.reportID,
+        reportActionID,
+        paymentMethodType,
+        payAsBusiness,
+    };
+
+    API.write(WRITE_COMMANDS.PAY_INVOICE, params, {optimisticData, successData, failureData});
 }
 
 function detachReceipt(transactionID: string) {
     const transaction = allTransactions[`${ONYXKEYS.COLLECTION.TRANSACTION}${transactionID}`];
-    const newTransaction = transaction ? {...transaction, filename: '', receipt: {}} : null;
+    const newTransaction = transaction
+        ? {
+              ...transaction,
+              filename: '',
+              receipt: {
+                  source: '',
+              },
+          }
+        : null;
 
     const optimisticData: OnyxUpdate[] = [
         {
@@ -6250,7 +7423,10 @@ function detachReceipt(transactionID: string) {
         {
             onyxMethod: Onyx.METHOD.MERGE,
             key: `${ONYXKEYS.COLLECTION.TRANSACTION}${transactionID}`,
-            value: transaction,
+            value: {
+                ...(transaction ?? null),
+                errors: ErrorUtils.getMicroSecondOnyxErrorWithTranslationKey('iou.error.receiptDeleteFailureError'),
+            },
         },
     ];
 
@@ -6277,13 +7453,12 @@ function replaceReceipt(transactionID: string, file: File, source: string) {
             },
         },
     ];
-
     const failureData: OnyxUpdate[] = [
         {
             onyxMethod: Onyx.METHOD.MERGE,
             key: `${ONYXKEYS.COLLECTION.TRANSACTION}${transactionID}`,
             value: {
-                receipt: oldReceipt,
+                receipt: !isEmptyObject(oldReceipt) ? oldReceipt : null,
                 filename: transaction?.filename,
                 errors: getReceiptError(receiptOptimistic, file.name),
             },
@@ -6305,26 +7480,27 @@ function replaceReceipt(transactionID: string, file: File, source: string) {
  */
 function setMoneyRequestParticipantsFromReport(transactionID: string, report: OnyxEntry<OnyxTypes.Report>): Participant[] {
     // 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;
-    const currentUserAccountID = currentUserPersonalDetails.accountID;
+    const chatReport = ReportUtils.isMoneyRequestReport(report) ? ReportUtils.getReportOrDraftReport(report?.chatReportID) : report;
+    const currentUserAccountID = currentUserPersonalDetails?.accountID;
     const shouldAddAsReport = !isEmptyObject(chatReport) && ReportUtils.isSelfDM(chatReport);
     let participants: Participant[] = [];
 
     if (ReportUtils.isPolicyExpenseChat(chatReport) || shouldAddAsReport) {
         participants = [{accountID: 0, reportID: chatReport?.reportID, isPolicyExpenseChat: ReportUtils.isPolicyExpenseChat(chatReport), selected: true}];
+    } else if (ReportUtils.isInvoiceRoom(chatReport)) {
+        participants = [
+            {reportID: chatReport?.reportID, selected: true},
+            {
+                policyID: chatReport?.policyID,
+                isSender: true,
+                selected: false,
+            },
+        ];
     } else {
-        participants = (chatReport?.participantAccountIDs ?? []).filter((accountID) => currentUserAccountID !== accountID).map((accountID) => ({accountID, selected: true}));
-
-        if (ReportUtils.isInvoiceRoom(chatReport)) {
-            participants = [
-                ...participants,
-                {
-                    policyID: chatReport?.policyID,
-                    isSender: true,
-                    selected: false,
-                },
-            ];
-        }
+        const chatReportOtherParticipants = Object.keys(chatReport?.participants ?? {})
+            .map(Number)
+            .filter((accountID) => accountID !== currentUserAccountID);
+        participants = chatReportOtherParticipants.map((accountID) => ({accountID, selected: true}));
     }
 
     Onyx.merge(`${ONYXKEYS.COLLECTION.TRANSACTION_DRAFT}${transactionID}`, {participants, participantsAutoAssigned: true});
@@ -6332,16 +7508,125 @@ function setMoneyRequestParticipantsFromReport(transactionID: string, report: On
     return participants;
 }
 
-function setMoneyRequestTaxRate(transactionID: string, taxRate: TaxRatesOption) {
-    Onyx.merge(`${ONYXKEYS.COLLECTION.TRANSACTION_DRAFT}${transactionID}`, {taxRate});
+function setMoneyRequestTaxRate(transactionID: string, taxCode: string) {
+    Onyx.merge(`${ONYXKEYS.COLLECTION.TRANSACTION_DRAFT}${transactionID}`, {taxCode});
+}
+
+function setMoneyRequestTaxAmount(transactionID: string, taxAmount: number | null) {
+    Onyx.merge(`${ONYXKEYS.COLLECTION.TRANSACTION_DRAFT}${transactionID}`, {taxAmount});
+}
+
+function dismissHoldUseExplanation() {
+    const parameters: SetNameValuePairParams = {
+        name: ONYXKEYS.NVP_DISMISSED_HOLD_USE_EXPLANATION,
+        value: true,
+    };
+
+    const optimisticData: OnyxUpdate[] = [
+        {
+            onyxMethod: Onyx.METHOD.MERGE,
+            key: ONYXKEYS.NVP_DISMISSED_HOLD_USE_EXPLANATION,
+            value: true,
+        },
+    ];
+
+    API.write(WRITE_COMMANDS.SET_NAME_VALUE_PAIR, parameters, {
+        optimisticData,
+    });
+}
+
+/**
+ * Sets the `splitShares` map that holds individual shares of a split bill
+ */
+function setSplitShares(transaction: OnyxEntry<OnyxTypes.Transaction>, amount: number, currency: string, newAccountIDs: number[]) {
+    if (!transaction) {
+        return;
+    }
+    const oldAccountIDs = Object.keys(transaction.splitShares ?? {}).map((key) => Number(key));
+
+    // Create an array containing unique IDs of the current transaction participants and the new ones
+    // The current userAccountID might not be included in newAccountIDs if this is called from the participants step using Global Create
+    // If this is called from an existing group chat, it'll be included. So we manually add them to account for both cases.
+    const accountIDs = [...new Set<number>([userAccountID, ...newAccountIDs, ...oldAccountIDs])];
+
+    const splitShares: SplitShares = accountIDs.reduce((acc: SplitShares, accountID): SplitShares => {
+        // We want to replace the contents of splitShares to contain only `newAccountIDs` entries
+        // In the case of going back to the participants page and removing a participant
+        // a simple merge will have the previous participant still present in the splitshares object
+        // So we manually set their entry to null
+        if (!newAccountIDs.includes(accountID) && accountID !== userAccountID) {
+            acc[accountID] = null;
+            return acc;
+        }
+
+        const isPayer = accountID === userAccountID;
+        const participantsLength = newAccountIDs.includes(userAccountID) ? newAccountIDs.length - 1 : newAccountIDs.length;
+        const splitAmount = IOUUtils.calculateAmount(participantsLength, amount, currency, isPayer);
+        acc[accountID] = {
+            amount: splitAmount,
+            isModified: false,
+        };
+        return acc;
+    }, {});
+
+    Onyx.merge(`${ONYXKEYS.COLLECTION.TRANSACTION_DRAFT}${transaction.transactionID}`, {splitShares});
+}
+
+function resetSplitShares(transaction: OnyxEntry<OnyxTypes.Transaction>, newAmount?: number, currency?: string) {
+    if (!transaction) {
+        return;
+    }
+    const accountIDs = Object.keys(transaction.splitShares ?? {}).map((key) => Number(key));
+    if (!accountIDs) {
+        return;
+    }
+    setSplitShares(transaction, newAmount ?? transaction.amount, currency ?? transaction.currency, accountIDs);
 }
 
-function setMoneyRequestTaxAmount(transactionID: string, taxAmount: number, isDraft: boolean) {
-    Onyx.merge(`${isDraft ? ONYXKEYS.COLLECTION.TRANSACTION_DRAFT : ONYXKEYS.COLLECTION.TRANSACTION}${transactionID}`, {taxAmount});
+/**
+ * Sets an individual split share of the participant accountID supplied
+ */
+function setIndividualShare(transactionID: string, participantAccountID: number, participantShare: number) {
+    Onyx.merge(`${ONYXKEYS.COLLECTION.TRANSACTION_DRAFT}${transactionID}`, {
+        splitShares: {
+            [participantAccountID]: {amount: participantShare, isModified: true},
+        },
+    });
 }
 
-function setShownHoldUseExplanation() {
-    Onyx.set(ONYXKEYS.NVP_HOLD_USE_EXPLAINED, true);
+/**
+ * Adjusts remaining unmodified shares when another share is modified
+ * E.g. if total bill is $100 and split between 3 participants, when the user changes the first share to $50, the remaining unmodified shares will become $25 each.
+ */
+function adjustRemainingSplitShares(transaction: NonNullable<OnyxTypes.Transaction>) {
+    const modifiedShares = Object.keys(transaction.splitShares ?? {}).filter((key: string) => transaction?.splitShares?.[Number(key)]?.isModified);
+
+    if (!modifiedShares.length) {
+        return;
+    }
+
+    const sumOfManualShares = modifiedShares
+        .map((key: string): number => transaction?.splitShares?.[Number(key)]?.amount ?? 0)
+        .reduce((prev: number, current: number): number => prev + current, 0);
+
+    const unmodifiedSharesAccountIDs = Object.keys(transaction.splitShares ?? {})
+        .filter((key: string) => !transaction?.splitShares?.[Number(key)]?.isModified)
+        .map((key: string) => Number(key));
+
+    const remainingTotal = transaction.amount - sumOfManualShares;
+    if (remainingTotal < 0) {
+        return;
+    }
+
+    const splitShares: SplitShares = unmodifiedSharesAccountIDs.reduce((acc: SplitShares, accountID: number, index: number): SplitShares => {
+        const splitAmount = IOUUtils.calculateAmount(unmodifiedSharesAccountIDs.length - 1, remainingTotal, transaction.currency, index === 0);
+        acc[accountID] = {
+            amount: splitAmount,
+        };
+        return acc;
+    }, {});
+
+    Onyx.merge(`${ONYXKEYS.COLLECTION.TRANSACTION_DRAFT}${transaction.transactionID}`, {splitShares});
 }
 
 /**
@@ -6351,7 +7636,9 @@ function putOnHold(transactionID: string, comment: string, reportID: string) {
     const currentTime = DateUtils.getDBTime();
     const createdReportAction = ReportUtils.buildOptimisticHoldReportAction(currentTime);
     const createdReportActionComment = ReportUtils.buildOptimisticHoldReportActionComment(comment, DateUtils.addMillisecondsFromDateTime(currentTime, 1));
-
+    const newViolation = {name: CONST.VIOLATIONS.HOLD, type: CONST.VIOLATION_TYPES.VIOLATION};
+    const transactionViolations = allTransactionViolations[`${ONYXKEYS.COLLECTION.TRANSACTION_VIOLATIONS}${transactionID}`] ?? [];
+    const updatedViolations = [...transactionViolations, newViolation];
     const optimisticData: OnyxUpdate[] = [
         {
             onyxMethod: Onyx.METHOD.MERGE,
@@ -6371,6 +7658,11 @@ function putOnHold(transactionID: string, comment: string, reportID: string) {
                 },
             },
         },
+        {
+            onyxMethod: Onyx.METHOD.MERGE,
+            key: `${ONYXKEYS.COLLECTION.TRANSACTION_VIOLATIONS}${transactionID}`,
+            value: updatedViolations,
+        },
     ];
 
     const successData: OnyxUpdate[] = [
@@ -6392,6 +7684,7 @@ function putOnHold(transactionID: string, comment: string, reportID: string) {
                 comment: {
                     hold: null,
                 },
+                errors: ErrorUtils.getMicroSecondOnyxErrorWithTranslationKey('iou.error.genericHoldExpenseFailureMessage'),
             },
         },
     ];
@@ -6413,6 +7706,7 @@ function putOnHold(transactionID: string, comment: string, reportID: string) {
  */
 function unholdRequest(transactionID: string, reportID: string) {
     const createdReportAction = ReportUtils.buildOptimisticUnHoldReportAction();
+    const transactionViolations = allTransactionViolations[`${ONYXKEYS.COLLECTION.TRANSACTION_VIOLATIONS}${transactionID}`];
 
     const optimisticData: OnyxUpdate[] = [
         {
@@ -6432,6 +7726,11 @@ function unholdRequest(transactionID: string, reportID: string) {
                 },
             },
         },
+        {
+            onyxMethod: Onyx.METHOD.SET,
+            key: `${ONYXKEYS.COLLECTION.TRANSACTION_VIOLATIONS}${transactionID}`,
+            value: transactionViolations?.filter((violation) => violation.name !== CONST.VIOLATIONS.HOLD) ?? [],
+        },
     ];
 
     const successData: OnyxUpdate[] = [
@@ -6453,8 +7752,14 @@ function unholdRequest(transactionID: string, reportID: string) {
             key: `${ONYXKEYS.COLLECTION.TRANSACTION}${transactionID}`,
             value: {
                 pendingAction: null,
+                errors: ErrorUtils.getMicroSecondOnyxErrorWithTranslationKey('iou.error.genericUnholdExpenseFailureMessage'),
             },
         },
+        {
+            onyxMethod: Onyx.METHOD.SET,
+            key: `${ONYXKEYS.COLLECTION.TRANSACTION_VIOLATIONS}${transactionID}`,
+            value: transactionViolations ?? null,
+        },
     ];
 
     API.write(
@@ -6501,14 +7806,172 @@ function savePreferredPaymentMethod(policyID: string, paymentMethod: PaymentMeth
 function getIOURequestPolicyID(transaction: OnyxEntry<OnyxTypes.Transaction>, report: OnyxEntry<OnyxTypes.Report>): string {
     // Workspace sender will exist for invoices
     const workspaceSender = transaction?.participants?.find((participant) => participant.isSender);
-    return workspaceSender?.policyID ?? report?.policyID ?? '0';
+    return workspaceSender?.policyID ?? report?.policyID ?? '-1';
+}
+
+/** Merge several transactions into one by updating the fields of the one we want to keep and deleting the rest */
+function mergeDuplicates(params: TransactionMergeParams) {
+    const originalSelectedTransaction = allTransactions[`${ONYXKEYS.COLLECTION.TRANSACTION}${params.transactionID}`];
+
+    const optimisticTransactionData: OnyxUpdate = {
+        onyxMethod: Onyx.METHOD.MERGE,
+        key: `${ONYXKEYS.COLLECTION.TRANSACTION}${params.transactionID}`,
+        value: {
+            ...originalSelectedTransaction,
+            billable: params.billable,
+            comment: {
+                comment: params.comment,
+            },
+            category: params.category,
+            created: params.created,
+            currency: params.currency,
+            modifiedMerchant: params.merchant,
+            reimbursable: params.reimbursable,
+            tag: params.tag,
+        },
+    };
+
+    const failureTransactionData: OnyxUpdate = {
+        onyxMethod: Onyx.METHOD.MERGE,
+        key: `${ONYXKEYS.COLLECTION.TRANSACTION}${params.transactionID}`,
+        // eslint-disable-next-line @typescript-eslint/non-nullable-type-assertion-style
+        value: originalSelectedTransaction as OnyxTypes.Transaction,
+    };
+
+    const optimisticTransactionDuplicatesData: OnyxUpdate[] = params.transactionIDList.map((id) => ({
+        onyxMethod: Onyx.METHOD.SET,
+        key: `${ONYXKEYS.COLLECTION.TRANSACTION}${id}`,
+        value: null,
+    }));
+
+    const failureTransactionDuplicatesData: OnyxUpdate[] = params.transactionIDList.map((id) => ({
+        onyxMethod: Onyx.METHOD.MERGE,
+        key: `${ONYXKEYS.COLLECTION.TRANSACTION}${id}`,
+        // eslint-disable-next-line @typescript-eslint/non-nullable-type-assertion-style
+        value: allTransactions[`${ONYXKEYS.COLLECTION.TRANSACTION}${id}`] as OnyxTypes.Transaction,
+    }));
+
+    const optimisticTransactionViolations: OnyxUpdate[] = [...params.transactionIDList, params.transactionID].map((id) => {
+        const violations = allTransactionViolations[`${ONYXKEYS.COLLECTION.TRANSACTION_VIOLATIONS}${id}`] ?? [];
+        return {
+            onyxMethod: Onyx.METHOD.MERGE,
+            key: `${ONYXKEYS.COLLECTION.TRANSACTION_VIOLATIONS}${id}`,
+            value: violations.filter((violation) => violation.name !== CONST.VIOLATIONS.DUPLICATED_TRANSACTION),
+        };
+    });
+
+    const failureTransactionViolations: OnyxUpdate[] = [...params.transactionIDList, params.transactionID].map((id) => {
+        const violations = allTransactionViolations[`${ONYXKEYS.COLLECTION.TRANSACTION_VIOLATIONS}${id}`] ?? [];
+        return {
+            onyxMethod: Onyx.METHOD.MERGE,
+            key: `${ONYXKEYS.COLLECTION.TRANSACTION_VIOLATIONS}${id}`,
+            value: violations,
+        };
+    });
+
+    const duplicateTransactionTotals = params.transactionIDList.reduce((total, id) => {
+        const duplicateTransaction = allTransactions[`${ONYXKEYS.COLLECTION.TRANSACTION}${id}`];
+        if (!duplicateTransaction) {
+            return total;
+        }
+        return total + duplicateTransaction.amount;
+    }, 0);
+
+    const expenseReport = ReportConnection.getAllReports()?.[`${ONYXKEYS.COLLECTION.REPORT}${params.reportID}`];
+    const expenseReportOptimisticData: OnyxUpdate = {
+        onyxMethod: Onyx.METHOD.MERGE,
+        key: `${ONYXKEYS.COLLECTION.REPORT}${params.reportID}`,
+        value: {
+            total: (expenseReport?.total ?? 0) - duplicateTransactionTotals,
+        },
+    };
+    const expenseReportFailureData: OnyxUpdate = {
+        onyxMethod: Onyx.METHOD.MERGE,
+        key: `${ONYXKEYS.COLLECTION.REPORT}${params.reportID}`,
+        value: {
+            total: expenseReport?.total,
+        },
+    };
+
+    const iouActionsToDelete = Object.values(allReportActions?.[`${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${params.reportID}`] ?? {})?.filter(
+        (reportAction): reportAction is ReportAction<typeof CONST.REPORT.ACTIONS.TYPE.IOU> => {
+            if (!ReportActionsUtils.isMoneyRequestAction(reportAction)) {
+                return false;
+            }
+            const message = ReportActionsUtils.getOriginalMessage(reportAction);
+            if (!message?.IOUTransactionID) {
+                return false;
+            }
+            return params.transactionIDList.includes(message.IOUTransactionID);
+        },
+    );
+
+    const deletedTime = DateUtils.getDBTime();
+    const expenseReportActionsOptimisticData: OnyxUpdate = {
+        onyxMethod: Onyx.METHOD.MERGE,
+        key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${params.reportID}`,
+        value: iouActionsToDelete.reduce<Record<string, PartialDeep<ReportAction<typeof CONST.REPORT.ACTIONS.TYPE.IOU>>>>((val, reportAction) => {
+            // eslint-disable-next-line no-param-reassign
+            val[reportAction.reportActionID] = {
+                originalMessage: {
+                    deleted: deletedTime,
+                },
+                ...(Array.isArray(reportAction.message) &&
+                    !!reportAction.message[0] && {
+                        message: [
+                            {
+                                ...reportAction.message[0],
+                                deleted: deletedTime,
+                            },
+                            ...reportAction.message.slice(1),
+                        ],
+                    }),
+                ...(!Array.isArray(reportAction.message) && {
+                    message: {
+                        deleted: deletedTime,
+                    },
+                }),
+            };
+            return val;
+        }, {}),
+    };
+    const expenseReportActionsFailureData: OnyxUpdate = {
+        onyxMethod: Onyx.METHOD.MERGE,
+        key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${params.reportID}`,
+        value: iouActionsToDelete.reduce<Record<string, NullishDeep<PartialDeep<ReportAction<typeof CONST.REPORT.ACTIONS.TYPE.IOU>>>>>((val, reportAction) => {
+            // eslint-disable-next-line no-param-reassign
+            val[reportAction.reportActionID] = {
+                originalMessage: {
+                    deleted: null,
+                },
+                message: reportAction.message,
+            };
+            return val;
+        }, {}),
+    };
+
+    const optimisticData: OnyxUpdate[] = [];
+    const failureData: OnyxUpdate[] = [];
+
+    optimisticData.push(
+        optimisticTransactionData,
+        ...optimisticTransactionDuplicatesData,
+        ...optimisticTransactionViolations,
+        expenseReportOptimisticData,
+        expenseReportActionsOptimisticData,
+    );
+    failureData.push(failureTransactionData, ...failureTransactionDuplicatesData, ...failureTransactionViolations, expenseReportFailureData, expenseReportActionsFailureData);
+
+    API.write(WRITE_COMMANDS.TRANSACTION_MERGE, params, {optimisticData, failureData});
 }
 
 export {
+    adjustRemainingSplitShares,
     approveMoneyRequest,
     canApproveIOU,
-    canIOUBePaid,
     cancelPayment,
+    canIOUBePaid,
+    cleanUpMoneyRequest,
     clearMoneyRequest,
     completeSplitBill,
     createDistanceRequest,
@@ -6516,53 +7979,60 @@ export {
     deleteMoneyRequest,
     deleteTrackExpense,
     detachReceipt,
+    dismissHoldUseExplanation,
     editMoneyRequest,
+    getIOURequestPolicyID,
     initMoneyRequest,
     navigateToStartStepIfScanFileCannotBeRead,
+    payInvoice,
     payMoneyRequest,
     putOnHold,
     replaceReceipt,
     requestMoney,
+    resetSplitShares,
     savePreferredPaymentMethod,
+    sendInvoice,
     sendMoneyElsewhere,
     sendMoneyWithWallet,
     setCustomUnitRateID,
     setDraftSplitTransaction,
+    setIndividualShare,
     setMoneyRequestAmount,
     setMoneyRequestBillable,
     setMoneyRequestCategory,
     setMoneyRequestCreated,
     setMoneyRequestCurrency,
     setMoneyRequestDescription,
+    setMoneyRequestDistanceRate,
     setMoneyRequestMerchant,
     setMoneyRequestParticipants,
     setMoneyRequestParticipantsFromReport,
     setMoneyRequestPendingFields,
     setMoneyRequestReceipt,
-    setSplitPayer,
     setMoneyRequestTag,
     setMoneyRequestTaxAmount,
     setMoneyRequestTaxRate,
-    setShownHoldUseExplanation,
+    setSplitPayer,
+    setSplitShares,
     splitBill,
     splitBillAndOpenReport,
     startMoneyRequest,
     startSplitBill,
     submitReport,
     trackExpense,
+    unapproveExpenseReport,
     unholdRequest,
-    updateDistanceRequestRate,
     updateMoneyRequestAmountAndCurrency,
     updateMoneyRequestBillable,
     updateMoneyRequestCategory,
     updateMoneyRequestDate,
     updateMoneyRequestDescription,
     updateMoneyRequestDistance,
+    updateMoneyRequestDistanceRate,
     updateMoneyRequestMerchant,
     updateMoneyRequestTag,
     updateMoneyRequestTaxAmount,
     updateMoneyRequestTaxRate,
-    sendInvoice,
-    getIOURequestPolicyID,
+    mergeDuplicates,
 };
 export type {GPSPoint as GpsPoint, IOURequestType};
diff --git a/src/libs/actions/Link.ts b/src/libs/actions/Link.ts
index c83c946aed46..50a4582dffc1 100644
--- a/src/libs/actions/Link.ts
+++ b/src/libs/actions/Link.ts
@@ -1,5 +1,7 @@
 import Onyx from 'react-native-onyx';
+import type {OnyxEntry} from 'react-native-onyx';
 import * as API from '@libs/API';
+import type {GenerateSpotnanaTokenParams} from '@libs/API/parameters';
 import {SIDE_EFFECT_REQUEST_COMMANDS} from '@libs/API/types';
 import asyncOpenURL from '@libs/asyncOpenURL';
 import * as Environment from '@libs/Environment/Environment';
@@ -19,9 +21,21 @@ Onyx.connect({
 });
 
 let currentUserEmail = '';
+let currentUserAccountID = -1;
 Onyx.connect({
     key: ONYXKEYS.SESSION,
-    callback: (value) => (currentUserEmail = value?.email ?? ''),
+    callback: (value) => {
+        currentUserEmail = value?.email ?? '';
+        currentUserAccountID = value?.accountID ?? -1;
+    },
+});
+
+let isTravelTestAccount = false;
+Onyx.connect({
+    key: ONYXKEYS.NVP_TRAVEL_SETTINGS,
+    callback: (value) => {
+        isTravelTestAccount = value?.testAccount ?? false;
+    },
 });
 
 function buildOldDotURL(url: string, shortLivedAuthToken?: string): Promise<string> {
@@ -64,6 +78,54 @@ function openOldDotLink(url: string) {
     );
 }
 
+function buildTravelDotURL(spotnanaToken: string, postLoginPath?: string): string {
+    const environmentURL = isTravelTestAccount ? CONST.STAGING_TRAVEL_DOT_URL : CONST.TRAVEL_DOT_URL;
+    const tmcID = isTravelTestAccount ? CONST.STAGING_SPOTNANA_TMC_ID : CONST.SPOTNANA_TMC_ID;
+
+    const authCode = `authCode=${spotnanaToken}`;
+    const tmcIDParam = `tmcId=${tmcID}`;
+    const redirectURL = postLoginPath ? `redirectUrl=${Url.addLeadingForwardSlash(postLoginPath)}` : '';
+
+    const paramsArray = [authCode, tmcIDParam, redirectURL];
+    const params = paramsArray.filter(Boolean).join('&');
+    const travelDotDomain = Url.addTrailingForwardSlash(environmentURL);
+    return `${travelDotDomain}auth/code?${params}`;
+}
+
+/**
+ * @param postLoginPath When provided, we will redirect the user to this path post login on travelDot. eg: 'trips/:tripID'
+ */
+function openTravelDotLink(policyID: OnyxEntry<string>, postLoginPath?: string) {
+    if (policyID === null || policyID === undefined) {
+        return;
+    }
+
+    const parameters: GenerateSpotnanaTokenParams = {
+        policyID,
+    };
+
+    return new Promise((_, reject) => {
+        const error = new Error('Failed to generate spotnana token.');
+
+        asyncOpenURL(
+            // eslint-disable-next-line rulesdir/no-api-side-effects-method
+            API.makeRequestWithSideEffects(SIDE_EFFECT_REQUEST_COMMANDS.GENERATE_SPOTNANA_TOKEN, parameters, {})
+                .then((response) => {
+                    if (!response?.spotnanaToken) {
+                        reject(error);
+                        throw error;
+                    }
+                    return buildTravelDotURL(response.spotnanaToken, postLoginPath);
+                })
+                .catch(() => {
+                    reject(error);
+                    throw error;
+                }),
+            (travelDotURL) => travelDotURL ?? '',
+        );
+    });
+}
+
 function getInternalNewExpensifyPath(href: string) {
     const attrPath = Url.getPathFromURL(href);
     return (Url.hasSameExpensifyOrigin(href, CONST.NEW_EXPENSIFY_URL) || Url.hasSameExpensifyOrigin(href, CONST.STAGING_NEW_EXPENSIFY_URL) || href.startsWith(CONST.DEV_NEW_EXPENSIFY_URL)) &&
@@ -95,7 +157,7 @@ function openLink(href: string, environmentURL: string, isAttachment = false) {
     // 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 && href.indexOf('newdotreport?reportID=') > -1) {
         const reportID = href.split('newdotreport?reportID=').pop();
-        const reportRoute = ROUTES.REPORT_WITH_ID.getRoute(reportID ?? '');
+        const reportRoute = ROUTES.REPORT_WITH_ID.getRoute(reportID ?? '-1');
         Navigation.navigate(reportRoute);
         return;
     }
@@ -121,4 +183,29 @@ function openLink(href: string, environmentURL: string, isAttachment = false) {
     openExternalLink(href);
 }
 
-export {buildOldDotURL, openOldDotLink, openExternalLink, openLink, getInternalNewExpensifyPath, getInternalExpensifyPath};
+function buildURLWithAuthToken(url: string, shortLivedAuthToken?: string) {
+    const authTokenParam = shortLivedAuthToken ? `shortLivedAuthToken=${shortLivedAuthToken}` : '';
+    const emailParam = `email=${encodeURIComponent(currentUserEmail)}`;
+    const exitTo = `exitTo=${url}`;
+    const accountID = `accountID=${currentUserAccountID}`;
+    const paramsArray = [accountID, emailParam, authTokenParam, exitTo];
+    const params = paramsArray.filter(Boolean).join('&');
+
+    return `${CONFIG.EXPENSIFY.NEW_EXPENSIFY_URL}transition?${params}`;
+}
+
+/**
+ * @param shouldSkipCustomSafariLogic When true, we will use `Linking.openURL` even if the browser is Safari.
+ */
+function openExternalLinkWithToken(url: string, shouldSkipCustomSafariLogic = false) {
+    asyncOpenURL(
+        // eslint-disable-next-line rulesdir/no-api-side-effects-method
+        API.makeRequestWithSideEffects(SIDE_EFFECT_REQUEST_COMMANDS.OPEN_OLD_DOT_LINK, {}, {})
+            .then((response) => (response ? buildURLWithAuthToken(url, response.shortLivedAuthToken) : buildURLWithAuthToken(url)))
+            .catch(() => buildURLWithAuthToken(url)),
+        (link) => link,
+        shouldSkipCustomSafariLogic,
+    );
+}
+
+export {buildOldDotURL, openOldDotLink, openExternalLink, openLink, getInternalNewExpensifyPath, getInternalExpensifyPath, openTravelDotLink, buildTravelDotURL, openExternalLinkWithToken};
diff --git a/src/libs/actions/MapboxToken.ts b/src/libs/actions/MapboxToken.ts
index 3b98f79698ba..259feadf1d59 100644
--- a/src/libs/actions/MapboxToken.ts
+++ b/src/libs/actions/MapboxToken.ts
@@ -1,6 +1,7 @@
 import {isAfter} from 'date-fns';
 import type {NativeEventSubscription} from 'react-native';
 import {AppState} from 'react-native';
+import type {Connection} from 'react-native-onyx';
 import Onyx from 'react-native-onyx';
 import * as ActiveClientManager from '@libs/ActiveClientManager';
 import * as API from '@libs/API';
@@ -9,18 +10,18 @@ import CONST from '@src/CONST';
 import ONYXKEYS from '@src/ONYXKEYS';
 import type {MapboxAccessToken, Network} from '@src/types/onyx';
 
-let authToken: string | null;
+let authToken: string | undefined;
 Onyx.connect({
     key: ONYXKEYS.SESSION,
     callback: (value) => {
-        authToken = value?.authToken ?? null;
+        authToken = value?.authToken;
     },
 });
 
-let connectionIDForToken: number | null;
-let connectionIDForNetwork: number | null;
+let tokenConnection: Connection | null;
+let networkConnection: Connection | null;
 let appStateSubscription: NativeEventSubscription | null;
-let currentToken: MapboxAccessToken | null;
+let currentToken: MapboxAccessToken | undefined;
 let refreshTimeoutID: NodeJS.Timeout | undefined;
 let isCurrentlyFetchingToken = false;
 const REFRESH_INTERVAL = 1000 * 60 * 25;
@@ -39,7 +40,7 @@ const setExpirationTimer = () => {
             return;
         }
         console.debug(`[MapboxToken] Fetching a new token after waiting ${REFRESH_INTERVAL / 1000 / 60} minutes`);
-        API.read(READ_COMMANDS.GET_MAPBOX_ACCESS_TOKEN, {}, {});
+        API.read(READ_COMMANDS.GET_MAPBOX_ACCESS_TOKEN, null, {});
     }, REFRESH_INTERVAL);
 };
 
@@ -52,18 +53,18 @@ const clearToken = () => {
 };
 
 const fetchToken = () => {
-    API.read(READ_COMMANDS.GET_MAPBOX_ACCESS_TOKEN, {}, {});
+    API.read(READ_COMMANDS.GET_MAPBOX_ACCESS_TOKEN, null, {});
     isCurrentlyFetchingToken = true;
 };
 
 const init = () => {
-    if (connectionIDForToken) {
+    if (tokenConnection) {
         console.debug('[MapboxToken] init() is already listening to Onyx so returning early');
         return;
     }
 
     // When the token changes in Onyx, the expiration needs to be checked so a new token can be retrieved.
-    connectionIDForToken = Onyx.connect({
+    tokenConnection = Onyx.connect({
         key: ONYXKEYS.MAPBOX_ACCESS_TOKEN,
         callback: (token) => {
             // Only the leader should be in charge of the mapbox token, or else when you have multiple tabs open, the Onyx connection fires multiple times
@@ -116,9 +117,9 @@ const init = () => {
         });
     }
 
-    if (!connectionIDForNetwork) {
-        let network: Network | null;
-        connectionIDForNetwork = Onyx.connect({
+    if (!networkConnection) {
+        let network: Network | undefined;
+        networkConnection = Onyx.connect({
             key: ONYXKEYS.NETWORK,
             callback: (value) => {
                 // When the network reconnects, check if the token has expired. If it has, then clearing the token will
@@ -139,13 +140,13 @@ const init = () => {
 
 const stop = () => {
     console.debug('[MapboxToken] Stopping all listeners and timers');
-    if (connectionIDForToken) {
-        Onyx.disconnect(connectionIDForToken);
-        connectionIDForToken = null;
+    if (tokenConnection) {
+        Onyx.disconnect(tokenConnection);
+        tokenConnection = null;
     }
-    if (connectionIDForNetwork) {
-        Onyx.disconnect(connectionIDForNetwork);
-        connectionIDForNetwork = null;
+    if (networkConnection) {
+        Onyx.disconnect(networkConnection);
+        networkConnection = null;
     }
     if (appStateSubscription) {
         appStateSubscription.remove();
diff --git a/src/libs/actions/MaskOnyx.ts b/src/libs/actions/MaskOnyx.ts
new file mode 100644
index 000000000000..f15f419f2eca
--- /dev/null
+++ b/src/libs/actions/MaskOnyx.ts
@@ -0,0 +1,11 @@
+import Onyx from 'react-native-onyx';
+import ONYXKEYS from '@src/ONYXKEYS';
+
+function setShouldMaskOnyxState(shouldMask: boolean) {
+    Onyx.set(ONYXKEYS.SHOULD_MASK_ONYX_STATE, shouldMask);
+}
+
+export {
+    // eslint-disable-next-line import/prefer-default-export
+    setShouldMaskOnyxState,
+};
diff --git a/src/libs/actions/MobileSelectionMode.ts b/src/libs/actions/MobileSelectionMode.ts
new file mode 100644
index 000000000000..65a51b834901
--- /dev/null
+++ b/src/libs/actions/MobileSelectionMode.ts
@@ -0,0 +1,12 @@
+import Onyx from 'react-native-onyx';
+import ONYXKEYS from '@src/ONYXKEYS';
+
+const turnOnMobileSelectionMode = () => {
+    Onyx.merge(ONYXKEYS.MOBILE_SELECTION_MODE, {isEnabled: true});
+};
+
+const turnOffMobileSelectionMode = () => {
+    Onyx.merge(ONYXKEYS.MOBILE_SELECTION_MODE, {isEnabled: false});
+};
+
+export {turnOnMobileSelectionMode, turnOffMobileSelectionMode};
diff --git a/src/libs/actions/Modal.ts b/src/libs/actions/Modal.ts
index 7de4548b92c9..9cba7a359537 100644
--- a/src/libs/actions/Modal.ts
+++ b/src/libs/actions/Modal.ts
@@ -85,4 +85,8 @@ function willAlertModalBecomeVisible(isVisible: boolean, isPopover = false) {
     Onyx.merge(ONYXKEYS.MODAL, {willAlertModalBecomeVisible: isVisible, isPopover});
 }
 
-export {setCloseModal, close, onModalDidClose, setModalVisibility, willAlertModalBecomeVisible, setDisableDismissOnEscape, closeTop};
+function areAllModalsHidden() {
+    return closeModals.length === 0;
+}
+
+export {setCloseModal, close, onModalDidClose, setModalVisibility, willAlertModalBecomeVisible, setDisableDismissOnEscape, closeTop, areAllModalsHidden};
diff --git a/src/libs/actions/Network.ts b/src/libs/actions/Network.ts
index afd18f801e8c..d8a87aff551d 100644
--- a/src/libs/actions/Network.ts
+++ b/src/libs/actions/Network.ts
@@ -1,8 +1,15 @@
 import Onyx from 'react-native-onyx';
+import Log from '@libs/Log';
 import type {NetworkStatus} from '@libs/NetworkConnection';
 import ONYXKEYS from '@src/ONYXKEYS';
 
-function setIsOffline(isOffline: boolean) {
+function setIsOffline(isOffline: boolean, reason = '') {
+    if (reason) {
+        let textToLog = '[Network] Client is';
+        textToLog += isOffline ? ' entering offline mode' : ' back online';
+        textToLog += ` because: ${reason}`;
+        Log.info(textToLog);
+    }
     Onyx.merge(ONYXKEYS.NETWORK, {isOffline});
 }
 
diff --git a/src/libs/actions/OnyxUpdateManager/index.ts b/src/libs/actions/OnyxUpdateManager/index.ts
index 8c6695379614..db00a55aa25b 100644
--- a/src/libs/actions/OnyxUpdateManager/index.ts
+++ b/src/libs/actions/OnyxUpdateManager/index.ts
@@ -5,10 +5,10 @@ import Log from '@libs/Log';
 import * as SequentialQueue from '@libs/Network/SequentialQueue';
 import * as App from '@userActions/App';
 import ONYXKEYS from '@src/ONYXKEYS';
-import type {OnyxUpdatesFromServer, Response} from '@src/types/onyx';
+import type {OnyxUpdatesFromServer} from '@src/types/onyx';
 import {isValidOnyxUpdateFromServer} from '@src/types/onyx/OnyxUpdatesFromServer';
 import * as OnyxUpdateManagerUtils from './utils';
-import deferredUpdatesProxy from './utils/deferredUpdates';
+import * as DeferredOnyxUpdates from './utils/DeferredOnyxUpdates';
 
 // 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
@@ -39,8 +39,6 @@ Onyx.connect({
     },
 });
 
-let queryPromise: Promise<Response | Response[] | void> | undefined;
-
 let resolveQueryPromiseWrapper: () => void;
 const createQueryPromiseWrapper = () =>
     new Promise<void>((resolve) => {
@@ -50,8 +48,7 @@ const createQueryPromiseWrapper = () =>
 let queryPromiseWrapper = createQueryPromiseWrapper();
 
 const resetDeferralLogicVariables = () => {
-    queryPromise = undefined;
-    deferredUpdatesProxy.deferredUpdates = {};
+    DeferredOnyxUpdates.clear({shouldUnpauseSequentialQueue: false});
 };
 
 // This function will reset the query variables, unpause the SequentialQueue and log an info to the user.
@@ -61,9 +58,7 @@ function finalizeUpdatesAndResumeQueue() {
     resolveQueryPromiseWrapper();
     queryPromiseWrapper = createQueryPromiseWrapper();
 
-    resetDeferralLogicVariables();
-    Onyx.set(ONYXKEYS.ONYX_UPDATES_FROM_SERVER, null);
-    SequentialQueue.unpause();
+    DeferredOnyxUpdates.clear();
 }
 
 /**
@@ -80,7 +75,7 @@ function handleOnyxUpdateGap(onyxUpdatesFromServer: OnyxEntry<OnyxUpdatesFromSer
         // When ONYX_UPDATES_FROM_SERVER is set, we pause the queue. Let's unpause
         // it so the app is not stuck forever without processing requests.
         SequentialQueue.unpause();
-        console.debug(`[OnyxUpdateManager] Ignoring Onyx updates while OpenApp hans't finished yet.`);
+        console.debug(`[OnyxUpdateManager] Ignoring Onyx updates while OpenApp hasn't finished yet.`);
         return;
     }
     // This key is shared across clients, thus every client/tab will have a copy and try to execute this method.
@@ -111,25 +106,24 @@ function handleOnyxUpdateGap(onyxUpdatesFromServer: OnyxEntry<OnyxUpdatesFromSer
     // The flow below is setting the promise to a reconnect app to address flow (1) explained above.
     if (!lastUpdateIDFromClient) {
         // If there is a ReconnectApp query in progress, we should not start another one.
-        if (queryPromise) {
+        if (DeferredOnyxUpdates.getMissingOnyxUpdatesQueryPromise()) {
             return;
         }
 
         Log.info('Client has not gotten reliable updates before so reconnecting the app to start the process');
 
         // Since this is a full reconnectApp, we'll not apply the updates we received - those will come in the reconnect app request.
-        queryPromise = App.finalReconnectAppAfterActivatingReliableUpdates();
+        DeferredOnyxUpdates.setMissingOnyxUpdatesQueryPromise(App.finalReconnectAppAfterActivatingReliableUpdates());
     } else {
         // The flow below is setting the promise to a getMissingOnyxUpdates to address flow (2) explained above.
 
-        // Get the number of deferred updates before adding the new one
-        const existingDeferredUpdatesCount = Object.keys(deferredUpdatesProxy.deferredUpdates).length;
+        const areDeferredUpdatesQueued = !DeferredOnyxUpdates.isEmpty();
 
         // Add the new update to the deferred updates
-        deferredUpdatesProxy.deferredUpdates[Number(updateParams.lastUpdateID)] = updateParams;
+        DeferredOnyxUpdates.enqueue(updateParams, {shouldPauseSequentialQueue: false});
 
         // If there are deferred updates already, we don't need to fetch the missing updates again.
-        if (existingDeferredUpdatesCount > 0) {
+        if (areDeferredUpdatesQueued) {
             return;
         }
 
@@ -142,10 +136,12 @@ function handleOnyxUpdateGap(onyxUpdatesFromServer: OnyxEntry<OnyxUpdatesFromSer
 
         // Get the missing Onyx updates from the server and afterwards validate and apply the deferred updates.
         // This will trigger recursive calls to "validateAndApplyDeferredUpdates" if there are gaps in the deferred updates.
-        queryPromise = App.getMissingOnyxUpdates(lastUpdateIDFromClient, previousUpdateIDFromServer).then(() => OnyxUpdateManagerUtils.validateAndApplyDeferredUpdates(clientLastUpdateID));
+        DeferredOnyxUpdates.setMissingOnyxUpdatesQueryPromise(
+            App.getMissingOnyxUpdates(lastUpdateIDFromClient, previousUpdateIDFromServer).then(() => OnyxUpdateManagerUtils.validateAndApplyDeferredUpdates(clientLastUpdateID)),
+        );
     }
 
-    queryPromise.finally(finalizeUpdatesAndResumeQueue);
+    DeferredOnyxUpdates.getMissingOnyxUpdatesQueryPromise()?.finally(finalizeUpdatesAndResumeQueue);
 }
 
 export default () => {
diff --git a/src/libs/actions/OnyxUpdateManager/utils/DeferredOnyxUpdates.ts b/src/libs/actions/OnyxUpdateManager/utils/DeferredOnyxUpdates.ts
new file mode 100644
index 000000000000..8a7b67db30c6
--- /dev/null
+++ b/src/libs/actions/OnyxUpdateManager/utils/DeferredOnyxUpdates.ts
@@ -0,0 +1,132 @@
+import Onyx from 'react-native-onyx';
+import type {DeferredUpdatesDictionary} from '@libs/actions/OnyxUpdateManager/types';
+import * as SequentialQueue from '@libs/Network/SequentialQueue';
+import ONYXKEYS from '@src/ONYXKEYS';
+import type {OnyxUpdatesFromServer, Response} from '@src/types/onyx';
+import {isValidOnyxUpdateFromServer} from '@src/types/onyx/OnyxUpdatesFromServer';
+// eslint-disable-next-line import/no-cycle
+import * as OnyxUpdateManagerUtils from '.';
+
+let missingOnyxUpdatesQueryPromise: Promise<Response | Response[] | void> | undefined;
+let deferredUpdates: DeferredUpdatesDictionary = {};
+
+/**
+ * Returns the promise that fetches the missing onyx updates
+ * @returns the promise
+ */
+function getMissingOnyxUpdatesQueryPromise() {
+    return missingOnyxUpdatesQueryPromise;
+}
+
+/**
+ * Sets the promise that fetches the missing onyx updates
+ */
+function setMissingOnyxUpdatesQueryPromise(promise: Promise<Response | Response[] | void>) {
+    missingOnyxUpdatesQueryPromise = promise;
+}
+
+type GetDeferredOnyxUpdatesOptiosn = {
+    minUpdateID?: number;
+};
+
+/**
+ * Returns the deferred updates that are currently in the queue
+ * @param minUpdateID An optional minimum update ID to filter the deferred updates by
+ * @returns
+ */
+function getUpdates(options?: GetDeferredOnyxUpdatesOptiosn) {
+    if (options?.minUpdateID == null) {
+        return deferredUpdates;
+    }
+
+    return Object.entries(deferredUpdates).reduce<DeferredUpdatesDictionary>((acc, [lastUpdateID, update]) => {
+        if (Number(lastUpdateID) > (options.minUpdateID ?? 0)) {
+            acc[Number(lastUpdateID)] = update;
+        }
+        return acc;
+    }, {});
+}
+
+/**
+ * Returns a boolean indicating whether the deferred updates queue is empty
+ * @returns a boolean indicating whether the deferred updates queue is empty
+ */
+function isEmpty() {
+    return Object.keys(deferredUpdates).length === 0;
+}
+
+/**
+ * Manually processes and applies the updates from the deferred updates queue. (used e.g. for push notifications)
+ */
+function process() {
+    if (missingOnyxUpdatesQueryPromise) {
+        missingOnyxUpdatesQueryPromise.finally(() => OnyxUpdateManagerUtils.validateAndApplyDeferredUpdates);
+    }
+
+    missingOnyxUpdatesQueryPromise = OnyxUpdateManagerUtils.validateAndApplyDeferredUpdates();
+}
+
+type EnqueueDeferredOnyxUpdatesOptions = {
+    shouldPauseSequentialQueue?: boolean;
+};
+
+/**
+ * Allows adding onyx updates to the deferred updates queue manually.
+ * @param updates The updates that should be applied (e.g. updates from push notifications)
+ * @param options additional flags to change the behaviour of this function
+ */
+function enqueue(updates: OnyxUpdatesFromServer | DeferredUpdatesDictionary, options?: EnqueueDeferredOnyxUpdatesOptions) {
+    if (options?.shouldPauseSequentialQueue ?? true) {
+        SequentialQueue.pause();
+    }
+
+    // We check here if the "updates" param is a single update.
+    // If so, we only need to insert one update into the deferred updates queue.
+    if (isValidOnyxUpdateFromServer(updates)) {
+        const lastUpdateID = Number(updates.lastUpdateID);
+        deferredUpdates[lastUpdateID] = updates;
+    } else {
+        // If the "updates" param is an object, we need to insert multiple updates into the deferred updates queue.
+        Object.entries(updates).forEach(([lastUpdateIDString, update]) => {
+            const lastUpdateID = Number(lastUpdateIDString);
+            if (deferredUpdates[lastUpdateID]) {
+                return;
+            }
+
+            deferredUpdates[lastUpdateID] = update;
+        });
+    }
+}
+
+/**
+ * Adds updates to the deferred updates queue and processes them immediately
+ * @param updates The updates that should be applied (e.g. updates from push notifications)
+ */
+function enqueueAndProcess(updates: OnyxUpdatesFromServer | DeferredUpdatesDictionary, options?: EnqueueDeferredOnyxUpdatesOptions) {
+    enqueue(updates, options);
+    process();
+}
+
+type ClearDeferredOnyxUpdatesOptions = {
+    shouldResetGetMissingOnyxUpdatesPromise?: boolean;
+    shouldUnpauseSequentialQueue?: boolean;
+};
+
+/**
+ * Clears the deferred updates queue and unpauses the SequentialQueue
+ * @param options additional flags to change the behaviour of this function
+ */
+function clear(options?: ClearDeferredOnyxUpdatesOptions) {
+    deferredUpdates = {};
+
+    if (options?.shouldResetGetMissingOnyxUpdatesPromise ?? true) {
+        missingOnyxUpdatesQueryPromise = undefined;
+    }
+
+    if (options?.shouldUnpauseSequentialQueue ?? true) {
+        Onyx.set(ONYXKEYS.ONYX_UPDATES_FROM_SERVER, null);
+        SequentialQueue.unpause();
+    }
+}
+
+export {getMissingOnyxUpdatesQueryPromise, setMissingOnyxUpdatesQueryPromise, getUpdates, isEmpty, process, enqueue, enqueueAndProcess, clear};
diff --git a/src/libs/actions/OnyxUpdateManager/utils/__mocks__/index.ts b/src/libs/actions/OnyxUpdateManager/utils/__mocks__/index.ts
index b4d97a4399db..f66e059ff7f6 100644
--- a/src/libs/actions/OnyxUpdateManager/utils/__mocks__/index.ts
+++ b/src/libs/actions/OnyxUpdateManager/utils/__mocks__/index.ts
@@ -3,7 +3,7 @@ import createProxyForObject from '@src/utils/createProxyForObject';
 import type * as OnyxUpdateManagerUtilsImport from '..';
 import {applyUpdates} from './applyUpdates';
 
-const UtilsImplementation: typeof OnyxUpdateManagerUtilsImport = jest.requireActual('@libs/actions/OnyxUpdateManager/utils');
+const UtilsImplementation = jest.requireActual<typeof OnyxUpdateManagerUtilsImport>('@libs/actions/OnyxUpdateManager/utils');
 
 type OnyxUpdateManagerUtilsMockValues = {
     onValidateAndApplyDeferredUpdates: ((clientLastUpdateID?: number) => Promise<void>) | undefined;
diff --git a/src/libs/actions/OnyxUpdateManager/utils/deferredUpdates.ts b/src/libs/actions/OnyxUpdateManager/utils/deferredUpdates.ts
deleted file mode 100644
index 838c27821aae..000000000000
--- a/src/libs/actions/OnyxUpdateManager/utils/deferredUpdates.ts
+++ /dev/null
@@ -1,8 +0,0 @@
-import type {DeferredUpdatesDictionary} from '@libs/actions/OnyxUpdateManager/types';
-import createProxyForObject from '@src/utils/createProxyForObject';
-
-const deferredUpdatesValue = {deferredUpdates: {} as DeferredUpdatesDictionary};
-
-const deferredUpdatesProxy = createProxyForObject(deferredUpdatesValue);
-
-export default deferredUpdatesProxy;
diff --git a/src/libs/actions/OnyxUpdateManager/utils/index.ts b/src/libs/actions/OnyxUpdateManager/utils/index.ts
index 4df22d292d19..bb5dd599480e 100644
--- a/src/libs/actions/OnyxUpdateManager/utils/index.ts
+++ b/src/libs/actions/OnyxUpdateManager/utils/index.ts
@@ -1,9 +1,11 @@
 import Onyx from 'react-native-onyx';
+import Log from '@libs/Log';
 import * as App from '@userActions/App';
 import type {DeferredUpdatesDictionary, DetectGapAndSplitResult} from '@userActions/OnyxUpdateManager/types';
 import ONYXKEYS from '@src/ONYXKEYS';
 import {applyUpdates} from './applyUpdates';
-import deferredUpdatesProxy from './deferredUpdates';
+// eslint-disable-next-line import/no-cycle
+import * as DeferredOnyxUpdates from './DeferredOnyxUpdates';
 
 let lastUpdateIDAppliedToClient = 0;
 Onyx.connect({
@@ -11,97 +13,126 @@ Onyx.connect({
     callback: (value) => (lastUpdateIDAppliedToClient = value ?? 0),
 });
 
-// In order for the deferred updates to be applied correctly in order,
-// we need to check if there are any gaps between deferred updates.
+/**
+ * In order for the deferred updates to be applied correctly in order,
+ * we need to check if there are any gaps between deferred updates.
+ * If there are gaps, we need to split the deferred updates into two parts:
+ * 1. The applicable updates that can be applied immediately
+ * 2. The updates after the gaps that need to be fetched and applied first
+ * @param updates The deferred updates to be checked for gaps
+ * @param lastUpdateIDFromClient An optional lastUpdateID passed to use instead of the lastUpdateIDAppliedToClient
+ * @returns
+ */
+function detectGapsAndSplit(lastUpdateIDFromClient: number): DetectGapAndSplitResult {
+    // We only want to apply deferred updates that are newer than the last update that was applied to the client.
+    // At this point, the missing updates from "GetMissingOnyxUpdates" have been applied already,
+    // so we can safely filter out any outdated deferred updates.
+    const pendingDeferredUpdates = DeferredOnyxUpdates.getUpdates({minUpdateID: lastUpdateIDFromClient});
 
-function detectGapsAndSplit(updates: DeferredUpdatesDictionary, clientLastUpdateID?: number): DetectGapAndSplitResult {
-    const lastUpdateIDFromClient = clientLastUpdateID ?? lastUpdateIDAppliedToClient ?? 0;
+    // If there are no remaining deferred updates after filtering out outdated updates,
+    // we don't need to iterate over the deferred updates and check for gaps.
+    if (Object.values(pendingDeferredUpdates).length === 0) {
+        return {applicableUpdates: {}, updatesAfterGaps: {}, latestMissingUpdateID: undefined};
+    }
 
-    const updateValues = Object.values(updates);
+    const updateValues = Object.values(pendingDeferredUpdates);
     const applicableUpdates: DeferredUpdatesDictionary = {};
 
     let gapExists = false;
-    let firstUpdateAfterGaps: number | undefined;
+    let firstUpdateIDAfterGaps: number | undefined;
     let latestMissingUpdateID: number | undefined;
 
     for (const [index, update] of updateValues.entries()) {
         const isFirst = index === 0;
 
-        // If any update's previousUpdateID doesn't match the lastUpdateID from the previous update, the deferred updates aren't chained and there's a gap.
-        // For the first update, we need to check that the previousUpdateID of the fetched update is the same as the lastUpdateIDAppliedToClient.
+        const lastUpdateID = Number(update.lastUpdateID);
+        const previousUpdateID = Number(update.previousUpdateID);
+
+        // Whether the previous update (of the current update) is outdated, because there was a newer update applied to the client.
+        const isPreviousUpdateAlreadyApplied = previousUpdateID <= lastUpdateIDFromClient;
+
+        // If any update's previousUpdateID doesn't match the lastUpdateID of the previous update,
+        // the deferred updates aren't chained and we detected a gap.
+        // For the first update, we need to check that the previousUpdateID of the current update is the same as the lastUpdateIDAppliedToClient.
         // For any other updates, we need to check if the previousUpdateID of the current update is found in the deferred updates.
         // If an update is chained, we can add it to the applicable updates.
-        const isChained = isFirst ? update.previousUpdateID === lastUpdateIDFromClient : !!updates[Number(update.previousUpdateID)];
-        if (isChained) {
-            // If a gap exists already, we will not add any more updates to the applicable updates.
-            // Instead, once there are two chained updates again, we can set "firstUpdateAfterGaps" to the first update after the current gap.
+        const isChainedToPreviousUpdate = isFirst ? isPreviousUpdateAlreadyApplied : !!pendingDeferredUpdates[previousUpdateID];
+        if (isChainedToPreviousUpdate) {
+            // If we found a gap in the deferred updates, we will not add any more updates to the applicable updates.
+            // Instead, if we find two chained updates, we can set "firstUpdateIDAfterGaps" to the first update after the gap.
             if (gapExists) {
-                // If "firstUpdateAfterGaps" hasn't been set yet and there was a gap, we need to set it to the first update after all gaps.
-                if (!firstUpdateAfterGaps) {
-                    firstUpdateAfterGaps = Number(update.previousUpdateID);
+                // If there was a gap, "firstUpdateIDAfterGaps" isn't set and we find two chained updates,
+                // we need to set "firstUpdateIDAfterGaps" to the first update after the gap.
+                if (!firstUpdateIDAfterGaps) {
+                    firstUpdateIDAfterGaps = previousUpdateID;
                 }
             } else {
                 // If no gap exists yet, we can add the update to the applicable updates
-                applicableUpdates[Number(update.lastUpdateID)] = update;
+                applicableUpdates[lastUpdateID] = update;
             }
         } else {
-            // When we find a (new) gap, we need to set "gapExists" to true and reset the "firstUpdateAfterGaps" variable,
-            // so that we can continue searching for the next update after all gaps
+            // If a previous update has already been applied to the client we should not detect a gap.
+            // This can cause a recursion loop, because "validateAndApplyDeferredUpdates" will refetch
+            // missing updates up to the previous update, which will then be applied again.
+            if (isPreviousUpdateAlreadyApplied) {
+                // eslint-disable-next-line no-continue
+                continue;
+            }
+
+            // When we find a (new) gap, we initially need to set "gapExists" to true
+            // and reset "firstUpdateIDAfterGaps" and continue searching the first update after all gaps.
             gapExists = true;
-            firstUpdateAfterGaps = undefined;
+            firstUpdateIDAfterGaps = undefined;
 
-            // If there is a gap, it means the previous update is the latest missing update.
-            latestMissingUpdateID = Number(update.previousUpdateID);
+            // We need to set update the latest missing update to the previous update of the current unchained update.
+            latestMissingUpdateID = previousUpdateID;
         }
     }
 
-    // When "firstUpdateAfterGaps" is not set yet, we need to set it to the last update in the list,
-    // because we will fetch all missing updates up to the previous one and can then always apply the last update in the deferred updates.
-    const firstUpdateAfterGapWithFallback = firstUpdateAfterGaps ?? Number(updateValues[updateValues.length - 1].lastUpdateID);
-
-    let updatesAfterGaps: DeferredUpdatesDictionary = {};
+    const updatesAfterGaps: DeferredUpdatesDictionary = {};
     if (gapExists) {
-        updatesAfterGaps = Object.entries(updates).reduce<DeferredUpdatesDictionary>(
-            (accUpdates, [lastUpdateID, update]) => ({
-                ...accUpdates,
-                // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
-                ...(Number(lastUpdateID) >= firstUpdateAfterGapWithFallback ? {[Number(lastUpdateID)]: update} : {}),
-            }),
-            {},
-        );
+        // If there is a gap and we didn't detect two chained updates, "firstUpdateToBeAppliedAfterGap" will always be the the last deferred update.
+        // We will fetch all missing updates up to the previous update and can always apply the last deferred update.
+        const firstUpdateToBeAppliedAfterGap = firstUpdateIDAfterGaps ?? Number(updateValues[updateValues.length - 1].lastUpdateID);
+
+        // Add all deferred updates after the gap(s) to "updatesAfterGaps".
+        // If "firstUpdateToBeAppliedAfterGap" is set to the last deferred update, the array will be empty.
+        Object.entries(pendingDeferredUpdates).forEach(([lastUpdateID, update]) => {
+            if (Number(lastUpdateID) < firstUpdateToBeAppliedAfterGap) {
+                return;
+            }
+
+            updatesAfterGaps[Number(lastUpdateID)] = update;
+        }, {});
     }
 
     return {applicableUpdates, updatesAfterGaps, latestMissingUpdateID};
 }
 
-// This function will check for gaps in the deferred updates and
-// apply the updates in order after the missing updates are fetched and applied
-function validateAndApplyDeferredUpdates(clientLastUpdateID?: number): Promise<void> {
+/**
+ * This function will check for gaps in the deferred updates and
+ * apply the updates in order after the missing updates are fetched and applied
+ */
+function validateAndApplyDeferredUpdates(clientLastUpdateID?: number, previousParams?: {newLastUpdateIDFromClient: number; latestMissingUpdateID: number}): Promise<void> {
     const lastUpdateIDFromClient = clientLastUpdateID ?? lastUpdateIDAppliedToClient ?? 0;
 
-    // We only want to apply deferred updates that are newer than the last update that was applied to the client.
-    // At this point, the missing updates from "GetMissingOnyxUpdates" have been applied already, so we can safely filter out.
-    const pendingDeferredUpdates = Object.entries(deferredUpdatesProxy.deferredUpdates).reduce<DeferredUpdatesDictionary>(
-        (accUpdates, [lastUpdateID, update]) => ({
-            ...accUpdates,
-            ...(Number(lastUpdateID) > lastUpdateIDFromClient ? {[Number(lastUpdateID)]: update} : {}),
-        }),
-        {},
-    );
-
-    // If there are no remaining deferred updates after filtering out outdated ones,
-    // we can just unpause the queue and return
-    if (Object.values(pendingDeferredUpdates).length === 0) {
+    Log.info('[DeferredUpdates] Processing deferred updates', false, {lastUpdateIDFromClient, previousParams});
+
+    const {applicableUpdates, updatesAfterGaps, latestMissingUpdateID} = detectGapsAndSplit(lastUpdateIDFromClient);
+
+    // If there are no applicable deferred updates and no missing deferred updates,
+    // we don't need to apply or re-fetch any updates. We can just unpause the queue by resolving.
+    if (Object.values(applicableUpdates).length === 0 && latestMissingUpdateID === undefined) {
         return Promise.resolve();
     }
 
-    const {applicableUpdates, updatesAfterGaps, latestMissingUpdateID} = detectGapsAndSplit(pendingDeferredUpdates, lastUpdateIDFromClient);
-
-    // If we detected a gap in the deferred updates, only apply the deferred updates before the gap,
-    // re-fetch the missing updates and then apply the remaining deferred updates after the gap
+    // If newer updates got applied, we don't need to refetch for missing updates
+    // and will re-trigger the "validateAndApplyDeferredUpdates" process
     if (latestMissingUpdateID) {
+        Log.info('[DeferredUpdates] Gap detected in deferred updates', false, {lastUpdateIDFromClient, latestMissingUpdateID});
+
         return new Promise((resolve, reject) => {
-            deferredUpdatesProxy.deferredUpdates = {};
+            DeferredOnyxUpdates.clear({shouldUnpauseSequentialQueue: false, shouldResetGetMissingOnyxUpdatesPromise: false});
 
             applyUpdates(applicableUpdates).then(() => {
                 // After we have applied the applicable updates, there might have been new deferred updates added.
@@ -111,19 +142,27 @@ function validateAndApplyDeferredUpdates(clientLastUpdateID?: number): Promise<v
 
                 const newLastUpdateIDFromClient = clientLastUpdateID ?? lastUpdateIDAppliedToClient ?? 0;
 
-                deferredUpdatesProxy.deferredUpdates = {...deferredUpdatesProxy.deferredUpdates, ...updatesAfterGaps};
+                DeferredOnyxUpdates.enqueue(updatesAfterGaps, {shouldPauseSequentialQueue: false});
 
-                // If lastUpdateIDAppliedToClient got updated in the meantime, we will just retrigger the validation and application of the current deferred updates.
+                // If lastUpdateIDAppliedToClient got updated, we will just retrigger the validation
+                // and application of the current deferred updates.
                 if (latestMissingUpdateID <= newLastUpdateIDFromClient) {
-                    validateAndApplyDeferredUpdates(clientLastUpdateID)
+                    validateAndApplyDeferredUpdates(undefined, {newLastUpdateIDFromClient, latestMissingUpdateID})
                         .then(() => resolve(undefined))
                         .catch(reject);
                     return;
                 }
 
+                // Prevent info loops of calls to GetMissingOnyxMessages
+                if (previousParams?.newLastUpdateIDFromClient === newLastUpdateIDFromClient && previousParams?.latestMissingUpdateID === latestMissingUpdateID) {
+                    Log.info('[DeferredUpdates] Aborting call to GetMissingOnyxMessages, repeated params', false, {lastUpdateIDFromClient, latestMissingUpdateID, previousParams});
+                    resolve(undefined);
+                    return;
+                }
+
                 // Then we can fetch the missing updates and apply them
                 App.getMissingOnyxUpdates(newLastUpdateIDFromClient, latestMissingUpdateID)
-                    .then(() => validateAndApplyDeferredUpdates(clientLastUpdateID))
+                    .then(() => validateAndApplyDeferredUpdates(undefined, {newLastUpdateIDFromClient, latestMissingUpdateID}))
                     .then(() => resolve(undefined))
                     .catch(reject);
             });
diff --git a/src/libs/actions/OnyxUpdates.ts b/src/libs/actions/OnyxUpdates.ts
index 04656f1adfec..672f325be58a 100644
--- a/src/libs/actions/OnyxUpdates.ts
+++ b/src/libs/actions/OnyxUpdates.ts
@@ -1,4 +1,4 @@
-import type {OnyxEntry, OnyxUpdate} from 'react-native-onyx';
+import type {OnyxUpdate} from 'react-native-onyx';
 import Onyx from 'react-native-onyx';
 import type {Merge} from 'type-fest';
 import Log from '@libs/Log';
@@ -13,7 +13,7 @@ import * as QueuedOnyxUpdates from './QueuedOnyxUpdates';
 
 // This key needs to be separate from ONYXKEYS.ONYX_UPDATES_FROM_SERVER so that it can be updated without triggering the callback when the server IDs are updated. If that
 // callback were triggered it would lead to duplicate processing of server updates.
-let lastUpdateIDAppliedToClient: OnyxEntry<number> = 0;
+let lastUpdateIDAppliedToClient: number | undefined = 0;
 Onyx.connect({
     key: ONYXKEYS.ONYX_UPDATES_LAST_UPDATE_ID_APPLIED_TO_CLIENT,
     callback: (val) => (lastUpdateIDAppliedToClient = val),
@@ -23,6 +23,8 @@ Onyx.connect({
 // even when such events are received over multiple separate pusher updates.
 let pusherEventsPromise = Promise.resolve();
 
+let airshipEventsPromise = Promise.resolve();
+
 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
@@ -33,7 +35,6 @@ function applyHTTPSOnyxUpdates(request: Request, response: Response) {
     // apply successData or failureData. This ensures that we do not update any pending, loading, or other UI states contained
     // in successData/failureData until after the component has received and API data.
     const onyxDataUpdatePromise = response.onyxData ? updateHandler(response.onyxData) : Promise.resolve();
-
     return onyxDataUpdatePromise
         .then(() => {
             // Handle the request's success/failure data (client-side data)
@@ -71,6 +72,20 @@ function applyPusherOnyxUpdates(updates: OnyxUpdateEvent[]) {
     return pusherEventsPromise;
 }
 
+function applyAirshipOnyxUpdates(updates: OnyxUpdateEvent[]) {
+    airshipEventsPromise = airshipEventsPromise.then(() => {
+        console.debug('[OnyxUpdateManager] Applying Airship updates');
+    });
+
+    airshipEventsPromise = updates
+        .reduce((promise, update) => promise.then(() => Onyx.update(update.data)), airshipEventsPromise)
+        .then(() => {
+            console.debug('[OnyxUpdateManager] Done applying Airship updates');
+        });
+
+    return airshipEventsPromise;
+}
+
 /**
  * @param [updateParams.request] Exists if updateParams.type === 'https'
  * @param [updateParams.response] Exists if updateParams.type === 'https'
@@ -102,15 +117,18 @@ function apply({lastUpdateID, type, request, response, updates}: OnyxUpdatesFrom
 
         return Promise.resolve();
     }
-    if (lastUpdateID && (lastUpdateIDAppliedToClient === null || Number(lastUpdateID) > lastUpdateIDAppliedToClient)) {
+    if (lastUpdateID && (lastUpdateIDAppliedToClient === undefined || Number(lastUpdateID) > lastUpdateIDAppliedToClient)) {
         Onyx.merge(ONYXKEYS.ONYX_UPDATES_LAST_UPDATE_ID_APPLIED_TO_CLIENT, Number(lastUpdateID));
     }
     if (type === CONST.ONYX_UPDATE_TYPES.HTTPS && request && response) {
         return applyHTTPSOnyxUpdates(request, response);
     }
-    if ((type === CONST.ONYX_UPDATE_TYPES.PUSHER || type === CONST.ONYX_UPDATE_TYPES.AIRSHIP) && updates) {
+    if (type === CONST.ONYX_UPDATE_TYPES.PUSHER && updates) {
         return applyPusherOnyxUpdates(updates);
     }
+    if (type === CONST.ONYX_UPDATE_TYPES.AIRSHIP && updates) {
+        return applyAirshipOnyxUpdates(updates);
+    }
 }
 
 /**
@@ -144,11 +162,16 @@ function doesClientNeedToBeUpdated(previousUpdateID = 0, clientLastUpdateID = 0)
 
     // If we don't have any value in lastUpdateIDFromClient, this is the first time we're receiving anything, so we need to do a last reconnectApp
     if (!lastUpdateIDFromClient) {
+        Log.info('We do not have lastUpdateIDFromClient, client needs updating');
+        return true;
+    }
+    if (lastUpdateIDFromClient < previousUpdateID) {
+        Log.info('lastUpdateIDFromClient is less than the previousUpdateID received, client needs updating', false, {lastUpdateIDFromClient, previousUpdateID});
         return true;
     }
 
-    return lastUpdateIDFromClient < previousUpdateID;
+    return false;
 }
 
 // eslint-disable-next-line import/prefer-default-export
-export {saveUpdateInformation, doesClientNeedToBeUpdated, apply};
+export {apply, doesClientNeedToBeUpdated, saveUpdateInformation};
diff --git a/src/libs/actions/PaymentMethods.ts b/src/libs/actions/PaymentMethods.ts
index c5a74bdc6ace..bac3739af810 100644
--- a/src/libs/actions/PaymentMethods.ts
+++ b/src/libs/actions/PaymentMethods.ts
@@ -3,16 +3,25 @@ import type {MutableRefObject} from 'react';
 import type {GestureResponderEvent} from 'react-native';
 import type {OnyxEntry, OnyxUpdate} from 'react-native-onyx';
 import Onyx from 'react-native-onyx';
+import type {ValueOf} from 'type-fest';
 import * as API from '@libs/API';
-import type {AddPaymentCardParams, DeletePaymentCardParams, MakeDefaultPaymentMethodParams, PaymentCardParams, TransferWalletBalanceParams} from '@libs/API/parameters';
-import {READ_COMMANDS, WRITE_COMMANDS} from '@libs/API/types';
+import type {
+    AddPaymentCardParams,
+    DeletePaymentCardParams,
+    MakeDefaultPaymentMethodParams,
+    PaymentCardParams,
+    TransferWalletBalanceParams,
+    UpdateBillingCurrencyParams,
+} from '@libs/API/parameters';
+import {READ_COMMANDS, SIDE_EFFECT_REQUEST_COMMANDS, WRITE_COMMANDS} from '@libs/API/types';
 import * as CardUtils from '@libs/CardUtils';
 import Navigation from '@libs/Navigation/Navigation';
 import CONST from '@src/CONST';
 import ONYXKEYS from '@src/ONYXKEYS';
 import type {Route} from '@src/ROUTES';
-import INPUT_IDS from '@src/types/form/AddDebitCardForm';
+import INPUT_IDS from '@src/types/form/AddPaymentCardForm';
 import type {BankAccountList, FundList} from '@src/types/onyx';
+import type {AccountData} from '@src/types/onyx/Fund';
 import type {PaymentMethodType} from '@src/types/onyx/OriginalMessage';
 import type PaymentMethod from '@src/types/onyx/PaymentMethod';
 import type {FilterMethodPaymentType} from '@src/types/onyx/WalletTransfer';
@@ -63,15 +72,11 @@ function openWalletPage() {
         },
     ];
 
-    return API.read(
-        READ_COMMANDS.OPEN_PAYMENTS_PAGE,
-        {},
-        {
-            optimisticData,
-            successData,
-            failureData,
-        },
-    );
+    return API.read(READ_COMMANDS.OPEN_PAYMENTS_PAGE, null, {
+        optimisticData,
+        successData,
+        failureData,
+    });
 }
 
 function getMakeDefaultPaymentOnyxData(
@@ -157,20 +162,20 @@ function addPaymentCard(params: PaymentCardParams) {
     const cardYear = CardUtils.getYearFromExpirationDateString(params.expirationDate);
 
     const parameters: AddPaymentCardParams = {
-        cardNumber: params.cardNumber,
+        cardNumber: CardUtils.getMCardNumberString(params.cardNumber),
         cardYear,
         cardMonth,
         cardCVV: params.securityCode,
         addressName: params.nameOnCard,
         addressZip: params.addressZipCode,
-        currency: CONST.CURRENCY.USD,
+        currency: CONST.PAYMENT_CARD_CURRENCY.USD,
         isP2PDebitCard: true,
     };
 
     const optimisticData: OnyxUpdate[] = [
         {
             onyxMethod: Onyx.METHOD.MERGE,
-            key: ONYXKEYS.FORMS.ADD_DEBIT_CARD_FORM,
+            key: ONYXKEYS.FORMS.ADD_PAYMENT_CARD_FORM,
             value: {isLoading: true},
         },
     ];
@@ -178,7 +183,7 @@ function addPaymentCard(params: PaymentCardParams) {
     const successData: OnyxUpdate[] = [
         {
             onyxMethod: Onyx.METHOD.MERGE,
-            key: ONYXKEYS.FORMS.ADD_DEBIT_CARD_FORM,
+            key: ONYXKEYS.FORMS.ADD_PAYMENT_CARD_FORM,
             value: {isLoading: false},
         },
     ];
@@ -186,7 +191,7 @@ function addPaymentCard(params: PaymentCardParams) {
     const failureData: OnyxUpdate[] = [
         {
             onyxMethod: Onyx.METHOD.MERGE,
-            key: ONYXKEYS.FORMS.ADD_DEBIT_CARD_FORM,
+            key: ONYXKEYS.FORMS.ADD_PAYMENT_CARD_FORM,
             value: {isLoading: false},
         },
     ];
@@ -199,10 +204,80 @@ function addPaymentCard(params: PaymentCardParams) {
 }
 
 /**
- * Resets the values for the add debit card form back to their initial states
+ * Calls the API to add a new card.
+ *
+ */
+function addSubscriptionPaymentCard(cardData: {
+    cardNumber: string;
+    cardYear: string;
+    cardMonth: string;
+    cardCVV: string;
+    addressName: string;
+    addressZip: string;
+    currency: ValueOf<typeof CONST.PAYMENT_CARD_CURRENCY>;
+}) {
+    const {cardNumber, cardYear, cardMonth, cardCVV, addressName, addressZip, currency} = cardData;
+
+    const parameters: AddPaymentCardParams = {
+        cardNumber,
+        cardYear,
+        cardMonth,
+        cardCVV,
+        addressName,
+        addressZip,
+        currency,
+        isP2PDebitCard: false,
+    };
+
+    const optimisticData: OnyxUpdate[] = [
+        {
+            onyxMethod: Onyx.METHOD.MERGE,
+            key: ONYXKEYS.FORMS.ADD_PAYMENT_CARD_FORM,
+            value: {isLoading: true},
+        },
+    ];
+
+    const successData: OnyxUpdate[] = [
+        {
+            onyxMethod: Onyx.METHOD.MERGE,
+            key: ONYXKEYS.FORMS.ADD_PAYMENT_CARD_FORM,
+            value: {isLoading: false},
+        },
+    ];
+
+    const failureData: OnyxUpdate[] = [
+        {
+            onyxMethod: Onyx.METHOD.MERGE,
+            key: ONYXKEYS.FORMS.ADD_PAYMENT_CARD_FORM,
+            value: {isLoading: false},
+        },
+    ];
+
+    if (currency === CONST.PAYMENT_CARD_CURRENCY.GBP) {
+        // eslint-disable-next-line rulesdir/no-api-side-effects-method
+        API.makeRequestWithSideEffects(SIDE_EFFECT_REQUEST_COMMANDS.ADD_PAYMENT_CARD_GBP, parameters, {optimisticData, successData, failureData}).then((response) => {
+            if (response?.jsonCode !== CONST.JSON_CODE.SUCCESS) {
+                return;
+            }
+
+            // We are using this onyx key to open Modal and preview iframe. Potentially we can save the whole object which come from side effect
+            Onyx.set(ONYXKEYS.VERIFY_3DS_SUBSCRIPTION, (response as {authenticationLink: string}).authenticationLink);
+        });
+    } else {
+        // eslint-disable-next-line rulesdir/no-multiple-api-calls
+        API.write(WRITE_COMMANDS.ADD_PAYMENT_CARD, parameters, {
+            optimisticData,
+            successData,
+            failureData,
+        });
+    }
+}
+
+/**
+ * Resets the values for the add payment card form back to their initial states
  */
-function clearDebitCardFormErrorAndSubmit() {
-    Onyx.set(ONYXKEYS.FORMS.ADD_DEBIT_CARD_FORM, {
+function clearPaymentCardFormErrorAndSubmit() {
+    Onyx.set(ONYXKEYS.FORMS.ADD_PAYMENT_CARD_FORM, {
         isLoading: false,
         errors: undefined,
         [INPUT_IDS.SETUP_COMPLETE]: false,
@@ -214,6 +289,33 @@ function clearDebitCardFormErrorAndSubmit() {
         [INPUT_IDS.ADDRESS_ZIP_CODE]: '',
         [INPUT_IDS.ADDRESS_STATE]: '',
         [INPUT_IDS.ACCEPT_TERMS]: '',
+        [INPUT_IDS.CURRENCY]: CONST.PAYMENT_CARD_CURRENCY.USD,
+    });
+}
+
+/**
+ * Clear 3ds flow - when verification will be finished
+ *
+ */
+function clearPaymentCard3dsVerification() {
+    Onyx.set(ONYXKEYS.VERIFY_3DS_SUBSCRIPTION, '');
+}
+
+/**
+ * Properly updates the nvp_privateStripeCustomerID onyx data for 3DS payment
+ *
+ */
+function verifySetupIntent(accountID: number, isVerifying = true) {
+    API.write(WRITE_COMMANDS.VERIFY_SETUP_INTENT, {accountID, isVerifying});
+}
+
+/**
+ * Set currency for payments
+ *
+ */
+function setPaymentMethodCurrency(currency: ValueOf<typeof CONST.PAYMENT_CARD_CURRENCY>) {
+    Onyx.merge(ONYXKEYS.FORMS.ADD_PAYMENT_CARD_FORM, {
+        [INPUT_IDS.CURRENCY]: currency,
     });
 }
 
@@ -366,6 +468,69 @@ function deletePaymentCard(fundID: number) {
     });
 }
 
+/**
+ * Call the API to change billing currency.
+ *
+ */
+function updateBillingCurrency(currency: ValueOf<typeof CONST.PAYMENT_CARD_CURRENCY>, cardCVV: string) {
+    const parameters: UpdateBillingCurrencyParams = {
+        cardCVV,
+        currency,
+    };
+
+    const optimisticData: OnyxUpdate[] = [
+        {
+            onyxMethod: Onyx.METHOD.MERGE,
+            key: ONYXKEYS.FORMS.CHANGE_BILLING_CURRENCY_FORM,
+            value: {
+                isLoading: true,
+                errors: null,
+            },
+        },
+    ];
+
+    const successData: OnyxUpdate[] = [
+        {
+            onyxMethod: Onyx.METHOD.MERGE,
+            key: ONYXKEYS.FORMS.CHANGE_BILLING_CURRENCY_FORM,
+            value: {
+                isLoading: false,
+            },
+        },
+    ];
+
+    const failureData: OnyxUpdate[] = [
+        {
+            onyxMethod: Onyx.METHOD.MERGE,
+            key: ONYXKEYS.FORMS.CHANGE_BILLING_CURRENCY_FORM,
+            value: {
+                isLoading: false,
+            },
+        },
+    ];
+
+    API.write(WRITE_COMMANDS.UPDATE_BILLING_CARD_CURRENCY, parameters, {
+        optimisticData,
+        successData,
+        failureData,
+    });
+}
+
+/**
+ * Set payment card form with API data
+ *
+ */
+function setPaymentCardForm(values: AccountData) {
+    Onyx.merge(ONYXKEYS.FORMS.ADD_PAYMENT_CARD_FORM, {
+        [INPUT_IDS.CARD_NUMBER]: values.cardNumber,
+        [INPUT_IDS.EXPIRATION_DATE]: `${values.cardMonth}${values.cardYear?.toString()?.substring(2)}`,
+        [INPUT_IDS.ADDRESS_STREET]: values.addressStreet,
+        [INPUT_IDS.ADDRESS_ZIP_CODE]: values.addressZip?.toString(),
+        [INPUT_IDS.ADDRESS_STATE]: values.addressState,
+        [INPUT_IDS.CURRENCY]: values.currency,
+    });
+}
+
 export {
     deletePaymentCard,
     addPaymentCard,
@@ -373,15 +538,21 @@ export {
     makeDefaultPaymentMethod,
     kycWallRef,
     continueSetup,
-    clearDebitCardFormErrorAndSubmit,
+    addSubscriptionPaymentCard,
+    clearPaymentCardFormErrorAndSubmit,
     dismissSuccessfulTransferBalancePage,
     transferWalletBalance,
     resetWalletTransferData,
     saveWalletTransferAccountTypeAndID,
     saveWalletTransferMethodType,
     hasPaymentMethodError,
+    updateBillingCurrency,
     clearDeletePaymentMethodError,
     clearAddPaymentMethodError,
     clearWalletError,
+    setPaymentMethodCurrency,
+    clearPaymentCard3dsVerification,
     clearWalletTermsError,
+    setPaymentCardForm,
+    verifySetupIntent,
 };
diff --git a/src/libs/actions/PersonalDetails.ts b/src/libs/actions/PersonalDetails.ts
index b9cea5c9447c..09fe790811cf 100644
--- a/src/libs/actions/PersonalDetails.ts
+++ b/src/libs/actions/PersonalDetails.ts
@@ -23,9 +23,8 @@ import CONST from '@src/CONST';
 import ONYXKEYS from '@src/ONYXKEYS';
 import ROUTES from '@src/ROUTES';
 import type {DateOfBirthForm} from '@src/types/form';
-import type {PersonalDetails, PersonalDetailsList} from '@src/types/onyx';
+import type {PersonalDetails, PersonalDetailsList, PrivatePersonalDetails} from '@src/types/onyx';
 import type {SelectedTimezone, Timezone} from '@src/types/onyx/PersonalDetails';
-import * as Session from './Session';
 
 let currentUserEmail = '';
 let currentUserAccountID = -1;
@@ -37,12 +36,18 @@ Onyx.connect({
     },
 });
 
-let allPersonalDetails: OnyxEntry<PersonalDetailsList> = null;
+let allPersonalDetails: OnyxEntry<PersonalDetailsList>;
 Onyx.connect({
     key: ONYXKEYS.PERSONAL_DETAILS_LIST,
     callback: (val) => (allPersonalDetails = val),
 });
 
+let privatePersonalDetails: OnyxEntry<PrivatePersonalDetails>;
+Onyx.connect({
+    key: ONYXKEYS.PRIVATE_PERSONAL_DETAILS,
+    callback: (val) => (privatePersonalDetails = val),
+});
+
 function updatePronouns(pronouns: string) {
     if (!currentUserAccountID) {
         return;
@@ -171,13 +176,17 @@ function updateAddress(street: string, street2: string, city: string, state: str
                 onyxMethod: Onyx.METHOD.MERGE,
                 key: ONYXKEYS.PRIVATE_PERSONAL_DETAILS,
                 value: {
-                    address: {
-                        street: PersonalDetailsUtils.getFormattedStreet(street, street2),
-                        city,
-                        state,
-                        zip,
-                        country,
-                    },
+                    addresses: [
+                        ...(privatePersonalDetails?.addresses ?? []),
+                        {
+                            street: PersonalDetailsUtils.getFormattedStreet(street, street2),
+                            city,
+                            state,
+                            zip,
+                            country,
+                            current: true,
+                        },
+                    ],
                 },
             },
         ],
@@ -191,10 +200,6 @@ function updateAddress(street: string, street2: string, city: string, state: str
  * selected timezone if set to automatically update.
  */
 function updateAutomaticTimezone(timezone: Timezone) {
-    if (Session.isAnonymousUser()) {
-        return;
-    }
-
     if (!currentUserAccountID) {
         return;
     }
@@ -397,7 +402,7 @@ function deleteAvatar() {
         },
     ];
 
-    API.write(WRITE_COMMANDS.DELETE_USER_AVATAR, {}, {optimisticData, failureData});
+    API.write(WRITE_COMMANDS.DELETE_USER_AVATAR, null, {optimisticData, failureData});
 }
 
 /**
diff --git a/src/libs/actions/Policy.ts b/src/libs/actions/Policy.ts
deleted file mode 100644
index 2c08dd321b11..000000000000
--- a/src/libs/actions/Policy.ts
+++ /dev/null
@@ -1,5173 +0,0 @@
-import {PUBLIC_DOMAINS} from 'expensify-common/lib/CONST';
-import ExpensiMark from 'expensify-common/lib/ExpensiMark';
-import Str from 'expensify-common/lib/str';
-import {escapeRegExp} from 'lodash';
-import lodashClone from 'lodash/clone';
-import lodashUnion from 'lodash/union';
-import type {NullishDeep, OnyxCollection, OnyxEntry, OnyxUpdate} from 'react-native-onyx';
-import Onyx from 'react-native-onyx';
-import type {ValueOf} from 'type-fest';
-import * as API from '@libs/API';
-import type {
-    AddBillingCardAndRequestWorkspaceOwnerChangeParams,
-    AddMembersToWorkspaceParams,
-    CreatePolicyDistanceRateParams,
-    CreateWorkspaceFromIOUPaymentParams,
-    CreateWorkspaceParams,
-    DeleteMembersFromWorkspaceParams,
-    DeletePolicyDistanceRatesParams,
-    DeleteWorkspaceAvatarParams,
-    DeleteWorkspaceParams,
-    EnablePolicyCategoriesParams,
-    EnablePolicyConnectionsParams,
-    EnablePolicyDistanceRatesParams,
-    EnablePolicyReportFieldsParams,
-    EnablePolicyTagsParams,
-    EnablePolicyTaxesParams,
-    EnablePolicyWorkflowsParams,
-    LeavePolicyParams,
-    OpenDraftWorkspaceRequestParams,
-    OpenPolicyCategoriesPageParams,
-    OpenPolicyDistanceRatesPageParams,
-    OpenPolicyMoreFeaturesPageParams,
-    OpenPolicyTagsPageParams,
-    OpenPolicyTaxesPageParams,
-    OpenPolicyWorkflowsPageParams,
-    OpenWorkspaceInvitePageParams,
-    OpenWorkspaceMembersPageParams,
-    OpenWorkspaceParams,
-    OpenWorkspaceReimburseViewParams,
-    RequestWorkspaceOwnerChangeParams,
-    SetPolicyDistanceRatesDefaultCategoryParams,
-    SetPolicyDistanceRatesEnabledParams,
-    SetPolicyDistanceRatesUnitParams,
-    SetWorkspaceApprovalModeParams,
-    SetWorkspaceAutoReportingFrequencyParams,
-    SetWorkspaceAutoReportingMonthlyOffsetParams,
-    SetWorkspaceAutoReportingParams,
-    SetWorkspacePayerParams,
-    SetWorkspaceReimbursementParams,
-    UpdatePolicyDistanceRateValueParams,
-    UpdateWorkspaceAvatarParams,
-    UpdateWorkspaceCustomUnitAndRateParams,
-    UpdateWorkspaceDescriptionParams,
-    UpdateWorkspaceGeneralSettingsParams,
-    UpdateWorkspaceMembersRoleParams,
-} from '@libs/API/parameters';
-import type UpdatePolicyAddressParams from '@libs/API/parameters/UpdatePolicyAddressParams';
-import {READ_COMMANDS, WRITE_COMMANDS} from '@libs/API/types';
-import DateUtils from '@libs/DateUtils';
-import * as ErrorUtils from '@libs/ErrorUtils';
-import getIsNarrowLayout from '@libs/getIsNarrowLayout';
-import Log from '@libs/Log';
-import Navigation from '@libs/Navigation/Navigation';
-import * as NumberUtils from '@libs/NumberUtils';
-import * as OptionsListUtils from '@libs/OptionsListUtils';
-import * as PersonalDetailsUtils from '@libs/PersonalDetailsUtils';
-import * as PhoneNumber from '@libs/PhoneNumber';
-import * as PolicyUtils from '@libs/PolicyUtils';
-import * as ReportActionsUtils from '@libs/ReportActionsUtils';
-import * as ReportUtils from '@libs/ReportUtils';
-import * as TransactionUtils from '@libs/TransactionUtils';
-import type {PolicySelector} from '@pages/home/sidebar/SidebarScreen/FloatingActionButtonAndPopover';
-import CONST from '@src/CONST';
-import ONYXKEYS from '@src/ONYXKEYS';
-import type {Route} from '@src/ROUTES';
-import ROUTES from '@src/ROUTES';
-import type {
-    InvitedEmailsToAccountIDs,
-    PersonalDetailsList,
-    Policy,
-    PolicyCategories,
-    PolicyCategory,
-    PolicyEmployee,
-    PolicyOwnershipChangeChecks,
-    PolicyTag,
-    PolicyTagList,
-    PolicyTags,
-    RecentlyUsedCategories,
-    RecentlyUsedTags,
-    ReimbursementAccount,
-    Report,
-    ReportAction,
-    TaxRatesWithDefault,
-    Transaction,
-} from '@src/types/onyx';
-import type {ErrorFields, Errors, OnyxValueWithOfflineFeedback, PendingAction} from '@src/types/onyx/OnyxCommon';
-import type {OriginalMessageJoinPolicyChangeLog} from '@src/types/onyx/OriginalMessage';
-import type {Attributes, CompanyAddress, CustomUnit, Rate, Unit} from '@src/types/onyx/Policy';
-import type {OnyxData} from '@src/types/onyx/Request';
-import type {EmptyObject} from '@src/types/utils/EmptyObject';
-import {isEmptyObject} from '@src/types/utils/EmptyObject';
-
-type AnnounceRoomMembersOnyxData = {
-    onyxOptimisticData: OnyxUpdate[];
-    onyxSuccessData: OnyxUpdate[];
-    onyxFailureData: OnyxUpdate[];
-};
-
-type ReportCreationData = Record<
-    string,
-    {
-        reportID: string;
-        reportActionID?: string;
-    }
->;
-
-type WorkspaceMembersChats = {
-    onyxSuccessData: OnyxUpdate[];
-    onyxOptimisticData: OnyxUpdate[];
-    onyxFailureData: OnyxUpdate[];
-    reportCreationData: ReportCreationData;
-};
-
-type OptimisticCustomUnits = {
-    customUnits: Record<string, CustomUnit>;
-    customUnitID: string;
-    customUnitRateID: string;
-    outputCurrency: string;
-};
-
-type PoliciesRecord = Record<string, OnyxEntry<Policy>>;
-
-type NewCustomUnit = {
-    customUnitID: string;
-    name: string;
-    attributes: Attributes;
-    rates: Rate;
-};
-
-type WorkspaceMembersRoleData = {
-    accountID: number;
-    email: string;
-    role: typeof CONST.POLICY.ROLE.ADMIN | typeof CONST.POLICY.ROLE.USER;
-};
-
-const allPolicies: OnyxCollection<Policy> = {};
-Onyx.connect({
-    key: ONYXKEYS.COLLECTION.POLICY,
-    callback: (val, key) => {
-        if (!key) {
-            return;
-        }
-        if (val === null || val === undefined) {
-            // If we are deleting a policy, we have to check every report linked to that policy
-            // and unset the draft indicator (pencil icon) alongside removing any draft comments. Clearing these values will keep the newly archived chats from being displayed in the LHN.
-            // More info: https://github.com/Expensify/App/issues/14260
-            const policyID = key.replace(ONYXKEYS.COLLECTION.POLICY, '');
-            const policyReports = ReportUtils.getAllPolicyReports(policyID);
-            const cleanUpMergeQueries: Record<`${typeof ONYXKEYS.COLLECTION.REPORT}${string}`, NullishDeep<Report>> = {};
-            const cleanUpSetQueries: Record<`${typeof ONYXKEYS.COLLECTION.REPORT_DRAFT_COMMENT}${string}` | `${typeof ONYXKEYS.COLLECTION.REPORT_ACTIONS_DRAFTS}${string}`, null> = {};
-            policyReports.forEach((policyReport) => {
-                if (!policyReport) {
-                    return;
-                }
-                const {reportID} = policyReport;
-                cleanUpSetQueries[`${ONYXKEYS.COLLECTION.REPORT_DRAFT_COMMENT}${reportID}`] = null;
-                cleanUpSetQueries[`${ONYXKEYS.COLLECTION.REPORT_ACTIONS_DRAFTS}${reportID}`] = null;
-            });
-            Onyx.mergeCollection(ONYXKEYS.COLLECTION.REPORT, cleanUpMergeQueries);
-            Onyx.multiSet(cleanUpSetQueries);
-            delete allPolicies[key];
-            return;
-        }
-
-        allPolicies[key] = val;
-    },
-});
-
-let allReports: OnyxCollection<Report> = null;
-Onyx.connect({
-    key: ONYXKEYS.COLLECTION.REPORT,
-    waitForCollectionCallback: true,
-    callback: (value) => (allReports = value),
-});
-
-let lastAccessedWorkspacePolicyID: OnyxEntry<string> = null;
-Onyx.connect({
-    key: ONYXKEYS.LAST_ACCESSED_WORKSPACE_POLICY_ID,
-    callback: (value) => (lastAccessedWorkspacePolicyID = value),
-});
-
-let sessionEmail = '';
-let sessionAccountID = 0;
-Onyx.connect({
-    key: ONYXKEYS.SESSION,
-    callback: (val) => {
-        sessionEmail = val?.email ?? '';
-        sessionAccountID = val?.accountID ?? -1;
-    },
-});
-
-let allPersonalDetails: OnyxEntry<PersonalDetailsList>;
-Onyx.connect({
-    key: ONYXKEYS.PERSONAL_DETAILS_LIST,
-    callback: (val) => (allPersonalDetails = val),
-});
-
-let reimbursementAccount: OnyxEntry<ReimbursementAccount>;
-Onyx.connect({
-    key: ONYXKEYS.REIMBURSEMENT_ACCOUNT,
-    callback: (val) => (reimbursementAccount = val),
-});
-
-let allRecentlyUsedCategories: OnyxCollection<RecentlyUsedCategories> = {};
-Onyx.connect({
-    key: ONYXKEYS.COLLECTION.POLICY_RECENTLY_USED_CATEGORIES,
-    waitForCollectionCallback: true,
-    callback: (val) => (allRecentlyUsedCategories = val),
-});
-
-let allPolicyTags: OnyxCollection<PolicyTagList> = {};
-Onyx.connect({
-    key: ONYXKEYS.COLLECTION.POLICY_TAGS,
-    waitForCollectionCallback: true,
-    callback: (value) => {
-        if (!value) {
-            allPolicyTags = {};
-            return;
-        }
-
-        allPolicyTags = value;
-    },
-});
-
-let allRecentlyUsedTags: OnyxCollection<RecentlyUsedTags> = {};
-Onyx.connect({
-    key: ONYXKEYS.COLLECTION.POLICY_RECENTLY_USED_TAGS,
-    waitForCollectionCallback: true,
-    callback: (val) => (allRecentlyUsedTags = val),
-});
-
-let allPolicyCategories: OnyxCollection<PolicyCategories> = {};
-Onyx.connect({
-    key: ONYXKEYS.COLLECTION.POLICY_CATEGORIES,
-    waitForCollectionCallback: true,
-    callback: (val) => (allPolicyCategories = val),
-});
-
-let policyOwnershipChecks: Record<string, PolicyOwnershipChangeChecks>;
-Onyx.connect({
-    key: ONYXKEYS.POLICY_OWNERSHIP_CHANGE_CHECKS,
-    callback: (value) => {
-        policyOwnershipChecks = value ?? {};
-    },
-});
-
-/**
- * Stores in Onyx the policy ID of the last workspace that was accessed by the user
- */
-function updateLastAccessedWorkspace(policyID: OnyxEntry<string>) {
-    Onyx.set(ONYXKEYS.LAST_ACCESSED_WORKSPACE_POLICY_ID, policyID);
-}
-
-/**
- * Checks if the currency is supported for direct reimbursement
- * USD currency is the only one supported in NewDot for now
- */
-function isCurrencySupportedForDirectReimbursement(currency: string) {
-    return currency === CONST.CURRENCY.USD;
-}
-
-/**
- * Returns the policy of the report
- */
-function getPolicy(policyID: string | undefined): Policy | EmptyObject {
-    if (!allPolicies || !policyID) {
-        return {};
-    }
-    return allPolicies[`${ONYXKEYS.COLLECTION.POLICY}${policyID}`] ?? {};
-}
-
-/**
- * Returns a primary policy for the user
- */
-function getPrimaryPolicy(activePolicyID?: string): Policy | undefined {
-    const activeAdminWorkspaces = PolicyUtils.getActiveAdminWorkspaces(allPolicies);
-    const primaryPolicy: Policy | null | undefined = allPolicies?.[activePolicyID ?? ''];
-
-    return primaryPolicy ?? activeAdminWorkspaces[0];
-}
-
-/**
- * Check if the user has any active free policies (aka workspaces)
- */
-function hasActiveChatEnabledPolicies(policies: Array<OnyxEntry<PolicySelector>> | OnyxCollection<PolicySelector>, includeOnlyFreePolicies = false): boolean {
-    const adminChatEnabledPolicies = Object.values(policies ?? {}).filter(
-        (policy) =>
-            policy &&
-            ((policy.type === CONST.POLICY.TYPE.FREE && policy.role === CONST.POLICY.ROLE.ADMIN) ||
-                (!includeOnlyFreePolicies && policy.type !== CONST.POLICY.TYPE.PERSONAL && policy.role === CONST.POLICY.ROLE.ADMIN && policy.isPolicyExpenseChatEnabled)),
-    );
-
-    if (adminChatEnabledPolicies.length === 0) {
-        return false;
-    }
-
-    if (adminChatEnabledPolicies.some((policy) => !policy?.pendingAction)) {
-        return true;
-    }
-
-    if (adminChatEnabledPolicies.some((policy) => policy?.pendingAction === CONST.RED_BRICK_ROAD_PENDING_ACTION.ADD)) {
-        return true;
-    }
-
-    if (adminChatEnabledPolicies.some((policy) => policy?.pendingAction === CONST.RED_BRICK_ROAD_PENDING_ACTION.DELETE)) {
-        return false;
-    }
-
-    // If there are no add or delete pending actions the only option left is an update
-    // pendingAction, in which case we should return true.
-    return true;
-}
-
-/**
- * Delete the workspace
- */
-function deleteWorkspace(policyID: string, policyName: string) {
-    if (!allPolicies) {
-        return;
-    }
-
-    const filteredPolicies = Object.values(allPolicies).filter((policy): policy is Policy => policy?.id !== policyID);
-    const optimisticData: OnyxUpdate[] = [
-        {
-            onyxMethod: Onyx.METHOD.MERGE,
-            key: `${ONYXKEYS.COLLECTION.POLICY}${policyID}`,
-            value: {
-                avatarURL: '',
-                pendingAction: CONST.RED_BRICK_ROAD_PENDING_ACTION.DELETE,
-                errors: null,
-            },
-        },
-        ...(!hasActiveChatEnabledPolicies(filteredPolicies, true)
-            ? [
-                  {
-                      onyxMethod: Onyx.METHOD.MERGE,
-                      key: ONYXKEYS.REIMBURSEMENT_ACCOUNT,
-                      value: {
-                          errors: null,
-                      },
-                  },
-              ]
-            : []),
-    ];
-
-    const reportsToArchive = Object.values(allReports ?? {}).filter(
-        (report) => report?.policyID === policyID && (ReportUtils.isChatRoom(report) || ReportUtils.isPolicyExpenseChat(report) || ReportUtils.isTaskReport(report)),
-    );
-    const finallyData: OnyxUpdate[] = [];
-    reportsToArchive.forEach((report) => {
-        const {reportID, ownerAccountID} = report ?? {};
-        optimisticData.push({
-            onyxMethod: Onyx.METHOD.MERGE,
-            key: `${ONYXKEYS.COLLECTION.REPORT}${reportID}`,
-            value: {
-                stateNum: CONST.REPORT.STATE_NUM.APPROVED,
-                statusNum: CONST.REPORT.STATUS_NUM.CLOSED,
-                oldPolicyName: allPolicies?.[`${ONYXKEYS.COLLECTION.POLICY}${policyID}`]?.name ?? '',
-                policyName: '',
-            },
-        });
-
-        optimisticData.push({
-            onyxMethod: Onyx.METHOD.SET,
-            key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS_DRAFTS}${reportID}`,
-            value: null,
-        });
-
-        // Add closed actions to all chat reports linked to this policy
-        // Announce & admin chats have FAKE owners, but workspace chats w/ users do have owners.
-        let emailClosingReport: string = CONST.POLICY.OWNER_EMAIL_FAKE;
-        if (!!ownerAccountID && ownerAccountID !== CONST.POLICY.OWNER_ACCOUNT_ID_FAKE) {
-            emailClosingReport = allPersonalDetails?.[ownerAccountID]?.login ?? '';
-        }
-        const optimisticClosedReportAction = ReportUtils.buildOptimisticClosedReportAction(emailClosingReport, policyName, CONST.REPORT.ARCHIVE_REASON.POLICY_DELETED);
-        optimisticData.push({
-            onyxMethod: Onyx.METHOD.MERGE,
-            key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${reportID}`,
-            value: {
-                [optimisticClosedReportAction.reportActionID]: optimisticClosedReportAction as ReportAction,
-            },
-        });
-
-        // We are temporarily adding this workaround because 'DeleteWorkspace' doesn't
-        // support receiving the optimistic reportActions' ids for the moment.
-        finallyData.push({
-            onyxMethod: Onyx.METHOD.MERGE,
-            key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${reportID}`,
-            value: {
-                [optimisticClosedReportAction.reportActionID]: null,
-            },
-        });
-    });
-
-    // Restore the old report stateNum and statusNum
-    const failureData: OnyxUpdate[] = [
-        {
-            onyxMethod: Onyx.METHOD.MERGE,
-            key: ONYXKEYS.REIMBURSEMENT_ACCOUNT,
-            value: {
-                errors: reimbursementAccount?.errors ?? null,
-            },
-        },
-    ];
-
-    reportsToArchive.forEach((report) => {
-        const {reportID, stateNum, statusNum, oldPolicyName} = report ?? {};
-        failureData.push({
-            onyxMethod: Onyx.METHOD.MERGE,
-            key: `${ONYXKEYS.COLLECTION.REPORT}${reportID}`,
-            value: {
-                stateNum,
-                statusNum,
-                oldPolicyName,
-                policyName: report?.policyName,
-            },
-        });
-    });
-
-    const params: DeleteWorkspaceParams = {policyID};
-
-    API.write(WRITE_COMMANDS.DELETE_WORKSPACE, params, {optimisticData, finallyData, failureData});
-
-    // Reset the lastAccessedWorkspacePolicyID
-    if (policyID === lastAccessedWorkspacePolicyID) {
-        updateLastAccessedWorkspace(null);
-    }
-}
-
-/**
- * Is the user an admin of a free policy (aka workspace)?
- */
-function isAdminOfFreePolicy(policies?: PoliciesRecord): boolean {
-    return Object.values(policies ?? {}).some((policy) => policy && policy.type === CONST.POLICY.TYPE.FREE && policy.role === CONST.POLICY.ROLE.ADMIN);
-}
-
-/**
- * Build optimistic data for adding members to the announcement room
- */
-function buildAnnounceRoomMembersOnyxData(policyID: string, accountIDs: number[]): AnnounceRoomMembersOnyxData {
-    const announceReport = ReportUtils.getRoom(CONST.REPORT.CHAT_TYPE.POLICY_ANNOUNCE, policyID);
-    const announceRoomMembers: AnnounceRoomMembersOnyxData = {
-        onyxOptimisticData: [],
-        onyxFailureData: [],
-        onyxSuccessData: [],
-    };
-
-    if (!announceReport) {
-        return announceRoomMembers;
-    }
-
-    if (announceReport?.participantAccountIDs) {
-        // Everyone in special policy rooms is visible
-        const participantAccountIDs = [...announceReport.participantAccountIDs, ...accountIDs];
-        const pendingChatMembers = ReportUtils.getPendingChatMembers(accountIDs, announceReport?.pendingChatMembers ?? [], CONST.RED_BRICK_ROAD_PENDING_ACTION.ADD);
-
-        announceRoomMembers.onyxOptimisticData.push({
-            onyxMethod: Onyx.METHOD.MERGE,
-            key: `${ONYXKEYS.COLLECTION.REPORT}${announceReport?.reportID}`,
-            value: {
-                participants: ReportUtils.buildParticipantsFromAccountIDs(participantAccountIDs),
-                participantAccountIDs,
-                visibleChatMemberAccountIDs: participantAccountIDs,
-                pendingChatMembers,
-            },
-        });
-    }
-
-    announceRoomMembers.onyxFailureData.push({
-        onyxMethod: Onyx.METHOD.MERGE,
-        key: `${ONYXKEYS.COLLECTION.REPORT}${announceReport?.reportID}`,
-        value: {
-            participants: announceReport?.participants,
-            participantAccountIDs: announceReport?.participantAccountIDs,
-            visibleChatMemberAccountIDs: announceReport?.visibleChatMemberAccountIDs,
-            pendingChatMembers: announceReport?.pendingChatMembers ?? null,
-        },
-    });
-    announceRoomMembers.onyxSuccessData.push({
-        onyxMethod: Onyx.METHOD.MERGE,
-        key: `${ONYXKEYS.COLLECTION.REPORT}${announceReport?.reportID}`,
-        value: {
-            pendingChatMembers: announceReport?.pendingChatMembers ?? null,
-        },
-    });
-    return announceRoomMembers;
-}
-
-function setWorkspaceAutoReporting(policyID: string, enabled: boolean, frequency: ValueOf<typeof CONST.POLICY.AUTO_REPORTING_FREQUENCIES>) {
-    const policy = getPolicy(policyID);
-    const optimisticData: OnyxUpdate[] = [
-        {
-            onyxMethod: Onyx.METHOD.MERGE,
-            key: `${ONYXKEYS.COLLECTION.POLICY}${policyID}`,
-            value: {
-                autoReporting: enabled,
-                harvesting: {
-                    enabled,
-                },
-                autoReportingFrequency: frequency,
-                pendingFields: {autoReporting: CONST.RED_BRICK_ROAD_PENDING_ACTION.UPDATE},
-            },
-        },
-    ];
-
-    const failureData: OnyxUpdate[] = [
-        {
-            onyxMethod: Onyx.METHOD.MERGE,
-            key: `${ONYXKEYS.COLLECTION.POLICY}${policyID}`,
-            value: {
-                autoReporting: policy.autoReporting ?? null,
-                harvesting: {
-                    enabled: policy.harvesting?.enabled ?? null,
-                },
-                autoReportingFrequency: policy.autoReportingFrequency ?? null,
-                pendingFields: {autoReporting: null},
-                errorFields: {autoReporting: ErrorUtils.getMicroSecondOnyxError('workflowsDelayedSubmissionPage.autoReportingErrorMessage')},
-            },
-        },
-    ];
-
-    const successData: OnyxUpdate[] = [
-        {
-            onyxMethod: Onyx.METHOD.MERGE,
-            key: `${ONYXKEYS.COLLECTION.POLICY}${policyID}`,
-            value: {
-                pendingFields: {autoReporting: null},
-            },
-        },
-    ];
-
-    const params: SetWorkspaceAutoReportingParams = {policyID, enabled};
-
-    API.write(WRITE_COMMANDS.SET_WORKSPACE_AUTO_REPORTING, params, {optimisticData, failureData, successData});
-}
-
-function setWorkspaceAutoReportingFrequency(policyID: string, frequency: ValueOf<typeof CONST.POLICY.AUTO_REPORTING_FREQUENCIES>) {
-    const policy = getPolicy(policyID);
-
-    const optimisticData: OnyxUpdate[] = [
-        {
-            onyxMethod: Onyx.METHOD.MERGE,
-            key: `${ONYXKEYS.COLLECTION.POLICY}${policyID}`,
-            value: {
-                autoReportingFrequency: frequency,
-                pendingFields: {autoReportingFrequency: CONST.RED_BRICK_ROAD_PENDING_ACTION.UPDATE},
-            },
-        },
-    ];
-
-    const failureData: OnyxUpdate[] = [
-        {
-            onyxMethod: Onyx.METHOD.MERGE,
-            key: `${ONYXKEYS.COLLECTION.POLICY}${policyID}`,
-            value: {
-                autoReportingFrequency: policy.autoReportingFrequency ?? null,
-                pendingFields: {autoReportingFrequency: null},
-                errorFields: {autoReportingFrequency: ErrorUtils.getMicroSecondOnyxError('workflowsDelayedSubmissionPage.autoReportingFrequencyErrorMessage')},
-            },
-        },
-    ];
-
-    const successData: OnyxUpdate[] = [
-        {
-            onyxMethod: Onyx.METHOD.MERGE,
-            key: `${ONYXKEYS.COLLECTION.POLICY}${policyID}`,
-            value: {
-                pendingFields: {autoReportingFrequency: null},
-            },
-        },
-    ];
-
-    const params: SetWorkspaceAutoReportingFrequencyParams = {policyID, frequency};
-    API.write(WRITE_COMMANDS.SET_WORKSPACE_AUTO_REPORTING_FREQUENCY, params, {optimisticData, failureData, successData});
-}
-
-function setWorkspaceAutoReportingMonthlyOffset(policyID: string, autoReportingOffset: number | ValueOf<typeof CONST.POLICY.AUTO_REPORTING_OFFSET>) {
-    const value = JSON.stringify({autoReportingOffset: autoReportingOffset.toString()});
-    const policy = getPolicy(policyID);
-
-    const optimisticData: OnyxUpdate[] = [
-        {
-            onyxMethod: Onyx.METHOD.MERGE,
-            key: `${ONYXKEYS.COLLECTION.POLICY}${policyID}`,
-            value: {
-                autoReportingOffset,
-                pendingFields: {autoReportingOffset: CONST.RED_BRICK_ROAD_PENDING_ACTION.UPDATE},
-            },
-        },
-    ];
-
-    const failureData: OnyxUpdate[] = [
-        {
-            onyxMethod: Onyx.METHOD.MERGE,
-            key: `${ONYXKEYS.COLLECTION.POLICY}${policyID}`,
-            value: {
-                autoReportingOffset: policy.autoReportingOffset ?? null,
-                pendingFields: {autoReportingOffset: null},
-                errorFields: {autoReportingOffset: ErrorUtils.getMicroSecondOnyxError('workflowsDelayedSubmissionPage.monthlyOffsetErrorMessage')},
-            },
-        },
-    ];
-
-    const successData: OnyxUpdate[] = [
-        {
-            onyxMethod: Onyx.METHOD.MERGE,
-            key: `${ONYXKEYS.COLLECTION.POLICY}${policyID}`,
-            value: {
-                pendingFields: {autoReportingOffset: null},
-            },
-        },
-    ];
-
-    const params: SetWorkspaceAutoReportingMonthlyOffsetParams = {policyID, value};
-    API.write(WRITE_COMMANDS.SET_WORKSPACE_AUTO_REPORTING_MONTHLY_OFFSET, params, {optimisticData, failureData, successData});
-}
-
-function setWorkspaceApprovalMode(policyID: string, approver: string, approvalMode: ValueOf<typeof CONST.POLICY.APPROVAL_MODE>) {
-    const policy = getPolicy(policyID);
-
-    const value = {
-        approver,
-        approvalMode,
-    };
-
-    const optimisticData: OnyxUpdate[] = [
-        {
-            onyxMethod: Onyx.METHOD.MERGE,
-            key: `${ONYXKEYS.COLLECTION.POLICY}${policyID}`,
-            value: {
-                ...value,
-                pendingFields: {approvalMode: CONST.RED_BRICK_ROAD_PENDING_ACTION.UPDATE},
-            },
-        },
-    ];
-
-    const failureData: OnyxUpdate[] = [
-        {
-            onyxMethod: Onyx.METHOD.MERGE,
-            key: `${ONYXKEYS.COLLECTION.POLICY}${policyID}`,
-            value: {
-                approver: policy.approver ?? null,
-                approvalMode: policy.approvalMode ?? null,
-                pendingFields: {approvalMode: null},
-                errorFields: {approvalMode: ErrorUtils.getMicroSecondOnyxError('workflowsApprovalPage.genericErrorMessage')},
-            },
-        },
-    ];
-
-    const successData: OnyxUpdate[] = [
-        {
-            onyxMethod: Onyx.METHOD.MERGE,
-            key: `${ONYXKEYS.COLLECTION.POLICY}${policyID}`,
-            value: {
-                pendingFields: {approvalMode: null},
-            },
-        },
-    ];
-
-    const params: SetWorkspaceApprovalModeParams = {
-        policyID,
-        value: JSON.stringify({
-            ...value,
-            // This property should now be set to false for all Collect policies
-            isAutoApprovalEnabled: false,
-        }),
-    };
-    API.write(WRITE_COMMANDS.SET_WORKSPACE_APPROVAL_MODE, params, {optimisticData, failureData, successData});
-}
-
-function setWorkspacePayer(policyID: string, reimburserEmail: string) {
-    const policy = getPolicy(policyID);
-
-    const optimisticData: OnyxUpdate[] = [
-        {
-            onyxMethod: Onyx.METHOD.MERGE,
-            key: `${ONYXKEYS.COLLECTION.POLICY}${policyID}`,
-            value: {
-                achAccount: {reimburser: reimburserEmail},
-                errorFields: {reimburser: null},
-                pendingFields: {reimburser: CONST.RED_BRICK_ROAD_PENDING_ACTION.UPDATE},
-            },
-        },
-    ];
-
-    const successData: OnyxUpdate[] = [
-        {
-            onyxMethod: Onyx.METHOD.MERGE,
-            key: `${ONYXKEYS.COLLECTION.POLICY}${policyID}`,
-            value: {
-                errorFields: {reimburser: null},
-                pendingFields: {reimburser: null},
-            },
-        },
-    ];
-
-    const failureData: OnyxUpdate[] = [
-        {
-            onyxMethod: Onyx.METHOD.MERGE,
-            key: `${ONYXKEYS.COLLECTION.POLICY}${policyID}`,
-            value: {
-                achAccount: {reimburser: policy.achAccount?.reimburser ?? null},
-                errorFields: {reimburser: ErrorUtils.getMicroSecondOnyxError('workflowsPayerPage.genericErrorMessage')},
-                pendingFields: {reimburser: null},
-            },
-        },
-    ];
-
-    const params: SetWorkspacePayerParams = {policyID, reimburserEmail};
-
-    API.write(WRITE_COMMANDS.SET_WORKSPACE_PAYER, params, {optimisticData, failureData, successData});
-}
-
-function clearPolicyErrorField(policyID: string, fieldName: string) {
-    Onyx.merge(`${ONYXKEYS.COLLECTION.POLICY}${policyID}`, {errorFields: {[fieldName]: null}});
-}
-
-function clearQBOErrorField(policyID: string, fieldName: string) {
-    Onyx.merge(`${ONYXKEYS.COLLECTION.POLICY}${policyID}`, {connections: {quickbooksOnline: {config: {errorFields: {[fieldName]: null}}}}});
-}
-
-function clearXeroErrorField(policyID: string, fieldName: string) {
-    Onyx.merge(`${ONYXKEYS.COLLECTION.POLICY}${policyID}`, {connections: {xero: {config: {errorFields: {[fieldName]: null}}}}});
-}
-
-function setWorkspaceReimbursement(policyID: string, reimbursementChoice: ValueOf<typeof CONST.POLICY.REIMBURSEMENT_CHOICES>, reimburserEmail: string) {
-    const policy = getPolicy(policyID);
-
-    const optimisticData: OnyxUpdate[] = [
-        {
-            onyxMethod: Onyx.METHOD.MERGE,
-            key: `${ONYXKEYS.COLLECTION.POLICY}${policyID}`,
-            value: {
-                reimbursementChoice,
-                achAccount: {reimburser: reimburserEmail},
-                errorFields: {reimbursementChoice: null},
-                pendingFields: {reimbursementChoice: CONST.RED_BRICK_ROAD_PENDING_ACTION.UPDATE},
-            },
-        },
-    ];
-
-    const successData: OnyxUpdate[] = [
-        {
-            onyxMethod: Onyx.METHOD.MERGE,
-            key: `${ONYXKEYS.COLLECTION.POLICY}${policyID}`,
-            value: {
-                errorFields: {reimbursementChoice: null},
-                pendingFields: {reimbursementChoice: null},
-            },
-        },
-    ];
-
-    const failureData: OnyxUpdate[] = [
-        {
-            onyxMethod: Onyx.METHOD.MERGE,
-            key: `${ONYXKEYS.COLLECTION.POLICY}${policyID}`,
-            value: {
-                reimbursementChoice: policy.reimbursementChoice ?? null,
-                achAccount: {reimburser: policy.achAccount?.reimburser ?? null},
-                errorFields: {reimbursementChoice: ErrorUtils.getMicroSecondOnyxError('common.genericErrorMessage')},
-                pendingFields: {reimbursementChoice: null},
-            },
-        },
-    ];
-
-    const params: SetWorkspaceReimbursementParams = {policyID, reimbursementChoice};
-
-    API.write(WRITE_COMMANDS.SET_WORKSPACE_REIMBURSEMENT, params, {optimisticData, failureData, successData});
-}
-
-function clearWorkspaceReimbursementErrors(policyID: string) {
-    Onyx.merge(`${ONYXKEYS.COLLECTION.POLICY}${policyID}`, {errorFields: {reimbursementChoice: null}});
-}
-
-/**
- * Build optimistic data for removing users from the announcement room
- */
-function removeOptimisticAnnounceRoomMembers(policyID: string, policyName: string, accountIDs: number[]): AnnounceRoomMembersOnyxData {
-    const announceReport = ReportUtils.getRoom(CONST.REPORT.CHAT_TYPE.POLICY_ANNOUNCE, policyID);
-    const announceRoomMembers: AnnounceRoomMembersOnyxData = {
-        onyxOptimisticData: [],
-        onyxFailureData: [],
-        onyxSuccessData: [],
-    };
-
-    if (!announceReport) {
-        return announceRoomMembers;
-    }
-
-    if (announceReport?.participantAccountIDs) {
-        const pendingChatMembers = ReportUtils.getPendingChatMembers(accountIDs, announceReport?.pendingChatMembers ?? [], CONST.RED_BRICK_ROAD_PENDING_ACTION.DELETE);
-
-        announceRoomMembers.onyxOptimisticData.push({
-            onyxMethod: Onyx.METHOD.MERGE,
-            key: `${ONYXKEYS.COLLECTION.REPORT}${announceReport.reportID}`,
-            value: {
-                pendingChatMembers,
-                ...(accountIDs.includes(sessionAccountID)
-                    ? {
-                          statusNum: CONST.REPORT.STATUS_NUM.CLOSED,
-                          stateNum: CONST.REPORT.STATE_NUM.APPROVED,
-                          oldPolicyName: policyName,
-                      }
-                    : {}),
-            },
-        });
-        announceRoomMembers.onyxFailureData.push({
-            onyxMethod: Onyx.METHOD.MERGE,
-            key: `${ONYXKEYS.COLLECTION.REPORT}${announceReport.reportID}`,
-            value: {
-                pendingChatMembers: announceReport?.pendingChatMembers ?? null,
-                ...(accountIDs.includes(sessionAccountID)
-                    ? {
-                          statusNum: announceReport.statusNum,
-                          stateNum: announceReport.stateNum,
-                          oldPolicyName: announceReport.oldPolicyName,
-                      }
-                    : {}),
-            },
-        });
-        announceRoomMembers.onyxSuccessData.push({
-            onyxMethod: Onyx.METHOD.MERGE,
-            key: `${ONYXKEYS.COLLECTION.REPORT}${announceReport.reportID}`,
-            value: {
-                pendingChatMembers: announceReport?.pendingChatMembers ?? null,
-            },
-        });
-    }
-
-    return announceRoomMembers;
-}
-
-/**
- * Remove the passed members from the policy employeeList
- * Please see https://github.com/Expensify/App/blob/main/README.md#Security for more details
- */
-function removeMembers(accountIDs: number[], policyID: string) {
-    // In case user selects only themselves (admin), their email will be filtered out and the members
-    // array passed will be empty, prevent the function from proceeding in that case as there is no one to remove
-    if (accountIDs.length === 0) {
-        return;
-    }
-
-    const policyKey = `${ONYXKEYS.COLLECTION.POLICY}${policyID}` as const;
-    const policy = getPolicy(policyID);
-
-    const workspaceChats = ReportUtils.getWorkspaceChats(policyID, accountIDs);
-    const emailList = accountIDs.map((accountID) => allPersonalDetails?.[accountID]?.login).filter((login) => !!login) as string[];
-    const optimisticClosedReportActions = workspaceChats.map(() => ReportUtils.buildOptimisticClosedReportAction(sessionEmail, policy.name, CONST.REPORT.ARCHIVE_REASON.REMOVED_FROM_POLICY));
-
-    const announceRoomMembers = removeOptimisticAnnounceRoomMembers(policy.id, policy.name, accountIDs);
-
-    const optimisticMembersState: OnyxCollection<PolicyEmployee> = {};
-    const successMembersState: OnyxCollection<PolicyEmployee> = {};
-    const failureMembersState: OnyxCollection<PolicyEmployee> = {};
-    emailList.forEach((email) => {
-        optimisticMembersState[email] = {pendingAction: CONST.RED_BRICK_ROAD_PENDING_ACTION.DELETE};
-        successMembersState[email] = null;
-        failureMembersState[email] = {errors: ErrorUtils.getMicroSecondOnyxError('workspace.people.error.genericRemove')};
-    });
-
-    const optimisticData: OnyxUpdate[] = [
-        {
-            onyxMethod: Onyx.METHOD.MERGE,
-            key: policyKey,
-            value: {employeeList: optimisticMembersState},
-        },
-        ...announceRoomMembers.onyxOptimisticData,
-    ];
-
-    const successData: OnyxUpdate[] = [
-        {
-            onyxMethod: Onyx.METHOD.MERGE,
-            key: policyKey,
-            value: {employeeList: successMembersState},
-        },
-        ...announceRoomMembers.onyxSuccessData,
-    ];
-
-    const failureData: OnyxUpdate[] = [
-        {
-            onyxMethod: Onyx.METHOD.MERGE,
-            key: policyKey,
-            value: {employeeList: failureMembersState},
-        },
-        ...announceRoomMembers.onyxFailureData,
-    ];
-
-    const pendingChatMembers = ReportUtils.getPendingChatMembers(accountIDs, [], CONST.RED_BRICK_ROAD_PENDING_ACTION.DELETE);
-
-    workspaceChats.forEach((report) => {
-        optimisticData.push({
-            onyxMethod: Onyx.METHOD.MERGE,
-            key: `${ONYXKEYS.COLLECTION.REPORT}${report?.reportID}`,
-            value: {
-                statusNum: CONST.REPORT.STATUS_NUM.CLOSED,
-                stateNum: CONST.REPORT.STATE_NUM.APPROVED,
-                oldPolicyName: policy.name,
-                pendingChatMembers,
-            },
-        });
-        successData.push({
-            onyxMethod: Onyx.METHOD.MERGE,
-            key: `${ONYXKEYS.COLLECTION.REPORT}${report?.reportID}`,
-            value: {
-                pendingChatMembers: null,
-            },
-        });
-        failureData.push({
-            onyxMethod: Onyx.METHOD.MERGE,
-            key: `${ONYXKEYS.COLLECTION.REPORT}${report?.reportID}`,
-            value: {
-                pendingChatMembers: null,
-            },
-        });
-    });
-    // comment out for time this issue would be resolved https://github.com/Expensify/App/issues/35952
-    // optimisticClosedReportActions.forEach((reportAction, index) => {
-    //     optimisticData.push({
-    //         onyxMethod: Onyx.METHOD.MERGE,
-    //         key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${workspaceChats?.[index]?.reportID}`,
-    //         value: {[reportAction.reportActionID]: reportAction as ReportAction},
-    //     });
-    // });
-
-    // If the policy has primaryLoginsInvited, then it displays informative messages on the members page about which primary logins were added by secondary logins.
-    // If we delete all these logins then we should clear the informative messages since they are no longer relevant.
-    if (!isEmptyObject(policy?.primaryLoginsInvited ?? {})) {
-        // Take the current policy members and remove them optimistically
-        const employeeListEmails = Object.keys(allPolicies?.[`${ONYXKEYS.COLLECTION.POLICY}${policyID}`]?.employeeList ?? {});
-        const remainingLogins = employeeListEmails.filter((email) => !emailList.includes(email));
-        const invitedPrimaryToSecondaryLogins: Record<string, string> = {};
-
-        if (policy.primaryLoginsInvited) {
-            Object.keys(policy.primaryLoginsInvited).forEach((key) => (invitedPrimaryToSecondaryLogins[policy.primaryLoginsInvited?.[key] ?? ''] = key));
-        }
-
-        // Then, if no remaining members exist that were invited by a secondary login, clear the informative messages
-        if (!remainingLogins.some((remainingLogin) => !!invitedPrimaryToSecondaryLogins[remainingLogin])) {
-            optimisticData.push({
-                onyxMethod: Onyx.METHOD.MERGE,
-                key: policyKey,
-                value: {
-                    primaryLoginsInvited: null,
-                },
-            });
-        }
-    }
-
-    const filteredWorkspaceChats = workspaceChats.filter((report): report is Report => report !== null);
-
-    filteredWorkspaceChats.forEach(({reportID, stateNum, statusNum, oldPolicyName = null}) => {
-        failureData.push({
-            onyxMethod: Onyx.METHOD.MERGE,
-            key: `${ONYXKEYS.COLLECTION.REPORT}${reportID}`,
-            value: {
-                stateNum,
-                statusNum,
-                oldPolicyName,
-            },
-        });
-    });
-    optimisticClosedReportActions.forEach((reportAction, index) => {
-        failureData.push({
-            onyxMethod: Onyx.METHOD.MERGE,
-            key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${workspaceChats?.[index]?.reportID}`,
-            value: {[reportAction.reportActionID]: null},
-        });
-    });
-
-    const params: DeleteMembersFromWorkspaceParams = {
-        emailList: emailList.join(','),
-        policyID,
-    };
-
-    API.write(WRITE_COMMANDS.DELETE_MEMBERS_FROM_WORKSPACE, params, {optimisticData, successData, failureData});
-}
-
-function leaveWorkspace(policyID: string) {
-    const policy = allPolicies?.[`${ONYXKEYS.COLLECTION.POLICY}${policyID}`];
-    const workspaceChats = ReportUtils.getAllWorkspaceReports(policyID);
-
-    const optimisticData: OnyxUpdate[] = [
-        {
-            onyxMethod: Onyx.METHOD.MERGE,
-            key: `${ONYXKEYS.COLLECTION.POLICY}${policyID}`,
-            value: {
-                pendingAction: CONST.RED_BRICK_ROAD_PENDING_ACTION.DELETE,
-                employeeList: {
-                    [sessionEmail]: {
-                        pendingAction: CONST.RED_BRICK_ROAD_PENDING_ACTION.DELETE,
-                    },
-                },
-            },
-        },
-    ];
-
-    const successData: OnyxUpdate[] = [
-        {
-            onyxMethod: Onyx.METHOD.MERGE,
-            key: `${ONYXKEYS.COLLECTION.POLICY}${policyID}`,
-            value: {
-                pendingAction: CONST.RED_BRICK_ROAD_PENDING_ACTION.DELETE,
-                employeeList: {
-                    [sessionEmail]: null,
-                },
-            },
-        },
-    ];
-    const failureData: OnyxUpdate[] = [
-        {
-            onyxMethod: Onyx.METHOD.MERGE,
-            key: `${ONYXKEYS.COLLECTION.POLICY}${policyID}`,
-            value: {
-                pendingAction: policy?.pendingAction,
-                employeeList: {
-                    [sessionEmail]: {
-                        errors: ErrorUtils.getMicroSecondOnyxError('workspace.people.error.genericRemove'),
-                    },
-                },
-            },
-        },
-    ];
-
-    const pendingChatMembers = ReportUtils.getPendingChatMembers([sessionAccountID], [], CONST.RED_BRICK_ROAD_PENDING_ACTION.DELETE);
-
-    workspaceChats.forEach((report) => {
-        const parentReport = ReportUtils.getRootParentReport(report);
-        const reportToCheckOwner = isEmptyObject(parentReport) ? report : parentReport;
-
-        if (ReportUtils.isPolicyExpenseChat(report) && !ReportUtils.isReportOwner(reportToCheckOwner)) {
-            return;
-        }
-
-        optimisticData.push({
-            onyxMethod: Onyx.METHOD.MERGE,
-            key: `${ONYXKEYS.COLLECTION.REPORT}${report?.reportID}`,
-            value: {
-                statusNum: CONST.REPORT.STATUS_NUM.CLOSED,
-                stateNum: CONST.REPORT.STATE_NUM.APPROVED,
-                oldPolicyName: policy?.name ?? '',
-                pendingChatMembers,
-            },
-        });
-        successData.push({
-            onyxMethod: Onyx.METHOD.MERGE,
-            key: `${ONYXKEYS.COLLECTION.REPORT}${report?.reportID}`,
-            value: {
-                pendingChatMembers: null,
-            },
-        });
-        failureData.push({
-            onyxMethod: Onyx.METHOD.MERGE,
-            key: `${ONYXKEYS.COLLECTION.REPORT}${report?.reportID}`,
-            value: {
-                pendingChatMembers: null,
-            },
-        });
-    });
-
-    const params: LeavePolicyParams = {
-        policyID,
-        email: sessionEmail,
-    };
-    API.write(WRITE_COMMANDS.LEAVE_POLICY, params, {optimisticData, successData, failureData});
-}
-
-function updateWorkspaceMembersRole(policyID: string, accountIDs: number[], newRole: typeof CONST.POLICY.ROLE.ADMIN | typeof CONST.POLICY.ROLE.USER) {
-    const previousEmployeeList = {...allPolicies?.[policyID]?.employeeList};
-    const memberRoles: WorkspaceMembersRoleData[] = accountIDs.reduce((result: WorkspaceMembersRoleData[], accountID: number) => {
-        if (!allPersonalDetails?.[accountID]?.login) {
-            return result;
-        }
-
-        result.push({
-            accountID,
-            email: allPersonalDetails?.[accountID]?.login ?? '',
-            role: newRole,
-        });
-
-        return result;
-    }, []);
-
-    const optimisticData: OnyxUpdate[] = [
-        {
-            onyxMethod: Onyx.METHOD.MERGE,
-            key: `${ONYXKEYS.COLLECTION.POLICY}${policyID}`,
-            value: {
-                employeeList: {
-                    ...memberRoles.reduce((member: Record<string, {role: string; pendingAction: PendingAction}>, current) => {
-                        // eslint-disable-next-line no-param-reassign
-                        member[current.email] = {role: current?.role, pendingAction: CONST.RED_BRICK_ROAD_PENDING_ACTION.UPDATE};
-                        return member;
-                    }, {}),
-                },
-                errors: null,
-            },
-        },
-    ];
-
-    const successData: OnyxUpdate[] = [
-        {
-            onyxMethod: Onyx.METHOD.MERGE,
-            key: `${ONYXKEYS.COLLECTION.POLICY}${policyID}`,
-            value: {
-                employeeList: {
-                    ...memberRoles.reduce((member: Record<string, {role: string; pendingAction: PendingAction}>, current) => {
-                        // eslint-disable-next-line no-param-reassign
-                        member[current.email] = {role: current?.role, pendingAction: null};
-                        return member;
-                    }, {}),
-                },
-                errors: null,
-            },
-        },
-    ];
-
-    const failureData: OnyxUpdate[] = [
-        {
-            onyxMethod: Onyx.METHOD.MERGE,
-            key: `${ONYXKEYS.COLLECTION.POLICY}${policyID}`,
-            value: {
-                employeeList: previousEmployeeList,
-                errors: ErrorUtils.getMicroSecondOnyxError('workspace.editor.genericFailureMessage'),
-            },
-        },
-    ];
-
-    const params: UpdateWorkspaceMembersRoleParams = {
-        policyID,
-        employees: JSON.stringify(memberRoles.map((item) => ({email: item.email, role: item.role}))),
-    };
-
-    API.write(WRITE_COMMANDS.UPDATE_WORKSPACE_MEMBERS_ROLE, params, {optimisticData, successData, failureData});
-}
-
-function requestWorkspaceOwnerChange(policyID: string) {
-    const policy = getPolicy(policyID);
-    const ownershipChecks = {...policyOwnershipChecks?.[policyID]} ?? {};
-
-    const changeOwnerErrors = Object.keys(policy?.errorFields?.changeOwner ?? {});
-
-    if (changeOwnerErrors && changeOwnerErrors.length > 0) {
-        const currentError = changeOwnerErrors[0];
-        if (currentError === CONST.POLICY.OWNERSHIP_ERRORS.AMOUNT_OWED) {
-            ownershipChecks.shouldClearOutstandingBalance = true;
-        }
-
-        if (currentError === CONST.POLICY.OWNERSHIP_ERRORS.OWNER_OWES_AMOUNT) {
-            ownershipChecks.shouldTransferAmountOwed = true;
-        }
-
-        if (currentError === CONST.POLICY.OWNERSHIP_ERRORS.SUBSCRIPTION) {
-            ownershipChecks.shouldTransferSubscription = true;
-        }
-
-        if (currentError === CONST.POLICY.OWNERSHIP_ERRORS.DUPLICATE_SUBSCRIPTION) {
-            ownershipChecks.shouldTransferSingleSubscription = true;
-        }
-
-        Onyx.merge(ONYXKEYS.POLICY_OWNERSHIP_CHANGE_CHECKS, {
-            [policyID]: ownershipChecks,
-        });
-    }
-
-    const optimisticData: OnyxUpdate[] = [
-        {
-            onyxMethod: Onyx.METHOD.MERGE,
-            key: `${ONYXKEYS.COLLECTION.POLICY}${policyID}`,
-            value: {
-                errorFields: null,
-                isLoading: true,
-                isChangeOwnerSuccessful: false,
-                isChangeOwnerFailed: false,
-            },
-        },
-    ];
-
-    const successData: OnyxUpdate[] = [
-        {
-            onyxMethod: Onyx.METHOD.MERGE,
-            key: `${ONYXKEYS.COLLECTION.POLICY}${policyID}`,
-            value: {
-                isLoading: false,
-                isChangeOwnerSuccessful: true,
-                isChangeOwnerFailed: false,
-                owner: sessionEmail,
-                ownerAccountID: sessionAccountID,
-            },
-        },
-    ];
-
-    const failureData: OnyxUpdate[] = [
-        {
-            onyxMethod: Onyx.METHOD.MERGE,
-            key: `${ONYXKEYS.COLLECTION.POLICY}${policyID}`,
-            value: {
-                isLoading: false,
-                isChangeOwnerSuccessful: false,
-                isChangeOwnerFailed: true,
-            },
-        },
-    ];
-
-    const params: RequestWorkspaceOwnerChangeParams = {
-        policyID,
-        ...ownershipChecks,
-    };
-
-    API.write(WRITE_COMMANDS.REQUEST_WORKSPACE_OWNER_CHANGE, params, {optimisticData, successData, failureData});
-}
-
-function clearWorkspaceOwnerChangeFlow(policyID: string) {
-    Onyx.merge(ONYXKEYS.POLICY_OWNERSHIP_CHANGE_CHECKS, null);
-    Onyx.merge(`${ONYXKEYS.COLLECTION.POLICY}${policyID}`, {
-        errorFields: null,
-        isLoading: false,
-        isChangeOwnerSuccessful: false,
-        isChangeOwnerFailed: false,
-    });
-}
-
-function addBillingCardAndRequestPolicyOwnerChange(
-    policyID: string,
-    cardData: {
-        cardNumber: string;
-        cardYear: string;
-        cardMonth: string;
-        cardCVV: string;
-        addressName: string;
-        addressZip: string;
-        currency: string;
-    },
-) {
-    const {cardNumber, cardYear, cardMonth, cardCVV, addressName, addressZip, currency} = cardData;
-
-    const optimisticData: OnyxUpdate[] = [
-        {
-            onyxMethod: Onyx.METHOD.MERGE,
-            key: `${ONYXKEYS.COLLECTION.POLICY}${policyID}`,
-            value: {
-                errorFields: null,
-                isLoading: true,
-                isChangeOwnerSuccessful: false,
-                isChangeOwnerFailed: false,
-            },
-        },
-    ];
-
-    const successData: OnyxUpdate[] = [
-        {
-            onyxMethod: Onyx.METHOD.MERGE,
-            key: `${ONYXKEYS.COLLECTION.POLICY}${policyID}`,
-            value: {
-                isLoading: false,
-                isChangeOwnerSuccessful: true,
-                isChangeOwnerFailed: false,
-                owner: sessionEmail,
-                ownerAccountID: sessionAccountID,
-            },
-        },
-    ];
-
-    const failureData: OnyxUpdate[] = [
-        {
-            onyxMethod: Onyx.METHOD.MERGE,
-            key: `${ONYXKEYS.COLLECTION.POLICY}${policyID}`,
-            value: {
-                isLoading: false,
-                isChangeOwnerSuccessful: false,
-                isChangeOwnerFailed: true,
-            },
-        },
-    ];
-
-    const params: AddBillingCardAndRequestWorkspaceOwnerChangeParams = {
-        policyID,
-        cardNumber,
-        cardYear,
-        cardMonth,
-        cardCVV,
-        addressName,
-        addressZip,
-        currency,
-    };
-
-    API.write(WRITE_COMMANDS.ADD_BILLING_CARD_AND_REQUEST_WORKSPACE_OWNER_CHANGE, params, {optimisticData, successData, failureData});
-}
-
-/**
- * Optimistically create a chat for each member of the workspace, creates both optimistic and success data for onyx.
- *
- * @returns - object with onyxSuccessData, onyxOptimisticData, and optimisticReportIDs (map login to reportID)
- */
-function createPolicyExpenseChats(policyID: string, invitedEmailsToAccountIDs: InvitedEmailsToAccountIDs, hasOutstandingChildRequest = false): WorkspaceMembersChats {
-    const workspaceMembersChats: WorkspaceMembersChats = {
-        onyxSuccessData: [],
-        onyxOptimisticData: [],
-        onyxFailureData: [],
-        reportCreationData: {},
-    };
-
-    Object.keys(invitedEmailsToAccountIDs).forEach((email) => {
-        const accountID = invitedEmailsToAccountIDs[email];
-        const cleanAccountID = Number(accountID);
-        const login = PhoneNumber.addSMSDomainIfPhoneNumber(email);
-
-        const oldChat = ReportUtils.getChatByParticipantsAndPolicy([sessionAccountID, cleanAccountID], policyID);
-
-        // If the chat already exists, we don't want to create a new one - just make sure it's not archived
-        if (oldChat) {
-            workspaceMembersChats.reportCreationData[login] = {
-                reportID: oldChat.reportID,
-            };
-            workspaceMembersChats.onyxOptimisticData.push({
-                onyxMethod: Onyx.METHOD.MERGE,
-                key: `${ONYXKEYS.COLLECTION.REPORT}${oldChat.reportID}`,
-                value: {
-                    stateNum: CONST.REPORT.STATE_NUM.OPEN,
-                    statusNum: CONST.REPORT.STATUS_NUM.OPEN,
-                },
-            });
-            return;
-        }
-        const optimisticReport = ReportUtils.buildOptimisticChatReport([sessionAccountID, cleanAccountID], undefined, CONST.REPORT.CHAT_TYPE.POLICY_EXPENSE_CHAT, policyID, cleanAccountID);
-        const optimisticCreatedAction = ReportUtils.buildOptimisticCreatedReportAction(login);
-
-        workspaceMembersChats.reportCreationData[login] = {
-            reportID: optimisticReport.reportID,
-            reportActionID: optimisticCreatedAction.reportActionID,
-        };
-
-        workspaceMembersChats.onyxOptimisticData.push({
-            onyxMethod: Onyx.METHOD.SET,
-            key: `${ONYXKEYS.COLLECTION.REPORT}${optimisticReport.reportID}`,
-            value: {
-                ...optimisticReport,
-                pendingFields: {
-                    createChat: CONST.RED_BRICK_ROAD_PENDING_ACTION.ADD,
-                },
-                isOptimisticReport: true,
-                hasOutstandingChildRequest,
-                pendingChatMembers: [
-                    {
-                        accountID: accountID.toString(),
-                        pendingAction: CONST.RED_BRICK_ROAD_PENDING_ACTION.ADD,
-                    },
-                ],
-            },
-        });
-        workspaceMembersChats.onyxOptimisticData.push({
-            onyxMethod: Onyx.METHOD.SET,
-            key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${optimisticReport.reportID}`,
-            value: {[optimisticCreatedAction.reportActionID]: optimisticCreatedAction},
-        });
-
-        workspaceMembersChats.onyxSuccessData.push({
-            onyxMethod: Onyx.METHOD.MERGE,
-            key: `${ONYXKEYS.COLLECTION.REPORT}${optimisticReport.reportID}`,
-            value: {
-                pendingFields: {
-                    createChat: null,
-                },
-                errorFields: {
-                    createChat: null,
-                },
-                isOptimisticReport: false,
-                pendingChatMembers: null,
-            },
-        });
-        workspaceMembersChats.onyxSuccessData.push({
-            onyxMethod: Onyx.METHOD.MERGE,
-            key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${optimisticReport.reportID}`,
-            value: {[optimisticCreatedAction.reportActionID]: {pendingAction: null}},
-        });
-
-        workspaceMembersChats.onyxFailureData.push({
-            onyxMethod: Onyx.METHOD.MERGE,
-            key: `${ONYXKEYS.COLLECTION.REPORT_METADATA}${optimisticReport.reportID}`,
-            value: {
-                isLoadingInitialReportActions: false,
-            },
-        });
-    });
-    return workspaceMembersChats;
-}
-
-/**
- * Adds members to the specified workspace/policyID
- * Please see https://github.com/Expensify/App/blob/main/README.md#Security for more details
- */
-function addMembersToWorkspace(invitedEmailsToAccountIDs: InvitedEmailsToAccountIDs, welcomeNote: string, policyID: string) {
-    const policyKey = `${ONYXKEYS.COLLECTION.POLICY}${policyID}` as const;
-    const logins = Object.keys(invitedEmailsToAccountIDs).map((memberLogin) => PhoneNumber.addSMSDomainIfPhoneNumber(memberLogin));
-    const accountIDs = Object.values(invitedEmailsToAccountIDs);
-
-    const {newAccountIDs, newLogins} = PersonalDetailsUtils.getNewAccountIDsAndLogins(logins, accountIDs);
-    const newPersonalDetailsOnyxData = PersonalDetailsUtils.getPersonalDetailsOnyxDataForOptimisticUsers(newLogins, newAccountIDs);
-
-    const announceRoomMembers = buildAnnounceRoomMembersOnyxData(policyID, accountIDs);
-
-    // create onyx data for policy expense chats for each new member
-    const membersChats = createPolicyExpenseChats(policyID, invitedEmailsToAccountIDs);
-
-    const optimisticMembersState: OnyxCollection<PolicyEmployee> = {};
-    const successMembersState: OnyxCollection<PolicyEmployee> = {};
-    const failureMembersState: OnyxCollection<PolicyEmployee> = {};
-    Object.keys(invitedEmailsToAccountIDs).forEach((email) => {
-        optimisticMembersState[email] = {pendingAction: CONST.RED_BRICK_ROAD_PENDING_ACTION.ADD, role: CONST.POLICY.ROLE.USER};
-        successMembersState[email] = {pendingAction: null};
-        failureMembersState[email] = {
-            errors: ErrorUtils.getMicroSecondOnyxError('workspace.people.error.genericAdd'),
-        };
-    });
-
-    const optimisticData: OnyxUpdate[] = [
-        {
-            onyxMethod: Onyx.METHOD.MERGE,
-            key: policyKey,
-
-            // Convert to object with each key containing {pendingAction: ‘add’}
-            value: {
-                employeeList: optimisticMembersState,
-            },
-        },
-        ...newPersonalDetailsOnyxData.optimisticData,
-        ...membersChats.onyxOptimisticData,
-        ...announceRoomMembers.onyxOptimisticData,
-    ];
-
-    const successData: OnyxUpdate[] = [
-        {
-            onyxMethod: Onyx.METHOD.MERGE,
-            key: policyKey,
-            value: {
-                employeeList: successMembersState,
-            },
-        },
-        ...newPersonalDetailsOnyxData.finallyData,
-        ...membersChats.onyxSuccessData,
-        ...announceRoomMembers.onyxSuccessData,
-    ];
-
-    const failureData: OnyxUpdate[] = [
-        {
-            onyxMethod: Onyx.METHOD.MERGE,
-            key: policyKey,
-
-            // Convert to object with each key containing the error. We don’t
-            // need to remove the members since that is handled by onClose of OfflineWithFeedback.
-            value: failureMembersState,
-        },
-        ...membersChats.onyxFailureData,
-        ...announceRoomMembers.onyxFailureData,
-    ];
-
-    const params: AddMembersToWorkspaceParams = {
-        employees: JSON.stringify(logins.map((login) => ({email: login}))),
-        welcomeNote: new ExpensiMark().replace(welcomeNote),
-        policyID,
-    };
-    if (!isEmptyObject(membersChats.reportCreationData)) {
-        params.reportCreationData = JSON.stringify(membersChats.reportCreationData);
-    }
-    API.write(WRITE_COMMANDS.ADD_MEMBERS_TO_WORKSPACE, params, {optimisticData, successData, failureData});
-}
-
-/**
- * Invite member to the specified policyID
- * Please see https://github.com/Expensify/App/blob/main/README.md#Security for more details
- */
-function inviteMemberToWorkspace(policyID: string, inviterEmail: string) {
-    const memberJoinKey = `${ONYXKEYS.COLLECTION.POLICY_JOIN_MEMBER}${policyID}` as const;
-
-    const optimisticMembersState = {policyID, inviterEmail};
-    const failureMembersState = {policyID, inviterEmail};
-
-    const optimisticData: OnyxUpdate[] = [
-        {
-            onyxMethod: Onyx.METHOD.MERGE,
-            key: memberJoinKey,
-            value: optimisticMembersState,
-        },
-    ];
-
-    const failureData: OnyxUpdate[] = [
-        {
-            onyxMethod: Onyx.METHOD.MERGE,
-            key: memberJoinKey,
-            value: {...failureMembersState, errors: ErrorUtils.getMicroSecondOnyxError('common.genericEditFailureMessage')},
-        },
-    ];
-
-    const params = {policyID, inviterEmail};
-
-    API.write(WRITE_COMMANDS.JOIN_POLICY_VIA_INVITE_LINK, params, {optimisticData, failureData});
-}
-
-/**
- * Updates a workspace avatar image
- */
-function updateWorkspaceAvatar(policyID: string, file: File) {
-    const optimisticData: OnyxUpdate[] = [
-        {
-            onyxMethod: Onyx.METHOD.MERGE,
-            key: `${ONYXKEYS.COLLECTION.POLICY}${policyID}`,
-            value: {
-                avatarURL: file.uri,
-                originalFileName: file.name,
-                errorFields: {
-                    avatarURL: null,
-                },
-                pendingFields: {
-                    avatarURL: CONST.RED_BRICK_ROAD_PENDING_ACTION.UPDATE,
-                },
-            },
-        },
-    ];
-    const finallyData: OnyxUpdate[] = [
-        {
-            onyxMethod: Onyx.METHOD.MERGE,
-            key: `${ONYXKEYS.COLLECTION.POLICY}${policyID}`,
-            value: {
-                pendingFields: {
-                    avatarURL: null,
-                },
-            },
-        },
-    ];
-    const failureData: OnyxUpdate[] = [
-        {
-            onyxMethod: Onyx.METHOD.MERGE,
-            key: `${ONYXKEYS.COLLECTION.POLICY}${policyID}`,
-            value: {
-                avatarURL: allPolicies?.[`${ONYXKEYS.COLLECTION.POLICY}${policyID}`]?.avatarURL,
-            },
-        },
-    ];
-
-    const params: UpdateWorkspaceAvatarParams = {
-        policyID,
-        file,
-    };
-
-    API.write(WRITE_COMMANDS.UPDATE_WORKSPACE_AVATAR, params, {optimisticData, finallyData, failureData});
-}
-
-/**
- * Deletes the avatar image for the workspace
- */
-function deleteWorkspaceAvatar(policyID: string) {
-    const optimisticData: OnyxUpdate[] = [
-        {
-            onyxMethod: Onyx.METHOD.MERGE,
-            key: `${ONYXKEYS.COLLECTION.POLICY}${policyID}`,
-            value: {
-                pendingFields: {
-                    avatarURL: CONST.RED_BRICK_ROAD_PENDING_ACTION.UPDATE,
-                },
-                errorFields: {
-                    avatarURL: null,
-                },
-                avatarURL: '',
-            },
-        },
-    ];
-    const finallyData: OnyxUpdate[] = [
-        {
-            onyxMethod: Onyx.METHOD.MERGE,
-            key: `${ONYXKEYS.COLLECTION.POLICY}${policyID}`,
-            value: {
-                pendingFields: {
-                    avatarURL: null,
-                },
-            },
-        },
-    ];
-    const failureData: OnyxUpdate[] = [
-        {
-            onyxMethod: Onyx.METHOD.MERGE,
-            key: `${ONYXKEYS.COLLECTION.POLICY}${policyID}`,
-            value: {
-                errorFields: {
-                    avatarURL: ErrorUtils.getMicroSecondOnyxError('avatarWithImagePicker.deleteWorkspaceError'),
-                },
-            },
-        },
-    ];
-
-    const params: DeleteWorkspaceAvatarParams = {policyID};
-
-    API.write(WRITE_COMMANDS.DELETE_WORKSPACE_AVATAR, params, {optimisticData, finallyData, failureData});
-}
-
-/**
- * Clear error and pending fields for the workspace avatar
- */
-function clearAvatarErrors(policyID: string) {
-    Onyx.merge(`${ONYXKEYS.COLLECTION.POLICY}${policyID}`, {
-        errorFields: {
-            avatarURL: null,
-        },
-        pendingFields: {
-            avatarURL: null,
-        },
-    });
-}
-
-/**
- * Optimistically update the general settings. Set the general settings as pending until the response succeeds.
- * If the response fails set a general error message. Clear the error message when updating.
- */
-function updateGeneralSettings(policyID: string, name: string, currency: string) {
-    const policy = allPolicies?.[`${ONYXKEYS.COLLECTION.POLICY}${policyID}`];
-    const distanceUnit = Object.values(policy?.customUnits ?? {}).find((unit) => unit.name === CONST.CUSTOM_UNITS.NAME_DISTANCE);
-    const customUnitID = distanceUnit?.customUnitID;
-
-    if (!policy) {
-        return;
-    }
-
-    const currentRates = distanceUnit?.rates ?? {};
-    const optimisticRates: Record<string, Rate> = {};
-    const finallyRates: Record<string, Rate> = {};
-    const failureRates: Record<string, Rate> = {};
-
-    if (customUnitID) {
-        for (const rateID of Object.keys(currentRates)) {
-            optimisticRates[rateID] = {
-                ...currentRates[rateID],
-                pendingFields: {currency: CONST.RED_BRICK_ROAD_PENDING_ACTION.UPDATE},
-                currency,
-            };
-            finallyRates[rateID] = {
-                ...currentRates[rateID],
-                pendingFields: {currency: null},
-                currency,
-            };
-            failureRates[rateID] = {
-                ...currentRates[rateID],
-                pendingFields: {currency: null},
-                errorFields: {currency: ErrorUtils.getMicroSecondOnyxError('common.genericErrorMessage')},
-            };
-        }
-    }
-
-    const optimisticData: OnyxUpdate[] = [
-        {
-            // We use SET because it's faster than merge and avoids a race condition when setting the currency and navigating the user to the Bank account page in confirmCurrencyChangeAndHideModal
-            onyxMethod: Onyx.METHOD.SET,
-            key: `${ONYXKEYS.COLLECTION.POLICY}${policyID}`,
-            value: {
-                ...policy,
-
-                pendingFields: {
-                    ...policy.pendingFields,
-                    generalSettings: CONST.RED_BRICK_ROAD_PENDING_ACTION.UPDATE,
-                },
-
-                // Clear errorFields in case the user didn't dismiss the general settings error
-                errorFields: {
-                    generalSettings: null,
-                },
-                name,
-                outputCurrency: currency,
-                ...(customUnitID && {
-                    customUnits: {
-                        [customUnitID]: {
-                            ...distanceUnit,
-                            rates: optimisticRates,
-                        },
-                    },
-                }),
-            },
-        },
-    ];
-    const finallyData: OnyxUpdate[] = [
-        {
-            onyxMethod: Onyx.METHOD.MERGE,
-            key: `${ONYXKEYS.COLLECTION.POLICY}${policyID}`,
-            value: {
-                pendingFields: {
-                    generalSettings: null,
-                },
-                ...(customUnitID && {
-                    customUnits: {
-                        [customUnitID]: {
-                            ...distanceUnit,
-                            rates: finallyRates,
-                        },
-                    },
-                }),
-            },
-        },
-    ];
-
-    const failureData: OnyxUpdate[] = [
-        {
-            onyxMethod: Onyx.METHOD.MERGE,
-            key: `${ONYXKEYS.COLLECTION.POLICY}${policyID}`,
-            value: {
-                errorFields: {
-                    generalSettings: ErrorUtils.getMicroSecondOnyxError('workspace.editor.genericFailureMessage'),
-                },
-                ...(customUnitID && {
-                    customUnits: {
-                        [customUnitID]: {
-                            ...distanceUnit,
-                            rates: failureRates,
-                        },
-                    },
-                }),
-            },
-        },
-    ];
-
-    const params: UpdateWorkspaceGeneralSettingsParams = {
-        policyID,
-        workspaceName: name,
-        currency,
-    };
-
-    API.write(WRITE_COMMANDS.UPDATE_WORKSPACE_GENERAL_SETTINGS, params, {
-        optimisticData,
-        finallyData,
-        failureData,
-    });
-}
-
-function updateWorkspaceDescription(policyID: string, description: string, currentDescription: string) {
-    if (description === currentDescription) {
-        return;
-    }
-    const parsedDescription = ReportUtils.getParsedComment(description);
-
-    const optimisticData: OnyxUpdate[] = [
-        {
-            onyxMethod: Onyx.METHOD.MERGE,
-            key: `${ONYXKEYS.COLLECTION.POLICY}${policyID}`,
-            value: {
-                description: parsedDescription,
-                pendingFields: {
-                    description: CONST.RED_BRICK_ROAD_PENDING_ACTION.UPDATE,
-                },
-                errorFields: {
-                    description: null,
-                },
-            },
-        },
-    ];
-    const finallyData: OnyxUpdate[] = [
-        {
-            onyxMethod: Onyx.METHOD.MERGE,
-            key: `${ONYXKEYS.COLLECTION.POLICY}${policyID}`,
-            value: {
-                pendingFields: {
-                    description: null,
-                },
-            },
-        },
-    ];
-    const failureData: OnyxUpdate[] = [
-        {
-            onyxMethod: Onyx.METHOD.MERGE,
-            key: `${ONYXKEYS.COLLECTION.POLICY}${policyID}`,
-            value: {
-                errorFields: {
-                    description: ErrorUtils.getMicroSecondOnyxError('workspace.editor.genericFailureMessage'),
-                },
-            },
-        },
-    ];
-
-    const params: UpdateWorkspaceDescriptionParams = {
-        policyID,
-        description: parsedDescription,
-    };
-
-    API.write(WRITE_COMMANDS.UPDATE_WORKSPACE_DESCRIPTION, params, {
-        optimisticData,
-        finallyData,
-        failureData,
-    });
-}
-
-function clearWorkspaceGeneralSettingsErrors(policyID: string) {
-    Onyx.merge(`${ONYXKEYS.COLLECTION.POLICY}${policyID}`, {
-        errorFields: {
-            generalSettings: null,
-        },
-    });
-}
-
-function setWorkspaceErrors(policyID: string, errors: Errors) {
-    if (!allPolicies?.[policyID]) {
-        return;
-    }
-
-    Onyx.merge(`${ONYXKEYS.COLLECTION.POLICY}${policyID}`, {errors: null});
-    Onyx.merge(`${ONYXKEYS.COLLECTION.POLICY}${policyID}`, {errors});
-}
-
-function clearCustomUnitErrors(policyID: string, customUnitID: string, customUnitRateID: string) {
-    Onyx.merge(`${ONYXKEYS.COLLECTION.POLICY}${policyID}`, {
-        customUnits: {
-            [customUnitID]: {
-                errors: null,
-                pendingAction: null,
-                rates: {
-                    [customUnitRateID]: {
-                        errors: null,
-                        pendingAction: null,
-                    },
-                },
-            },
-        },
-    });
-}
-
-function hideWorkspaceAlertMessage(policyID: string) {
-    if (!allPolicies?.[policyID]) {
-        return;
-    }
-
-    Onyx.merge(`${ONYXKEYS.COLLECTION.POLICY}${policyID}`, {alertMessage: ''});
-}
-
-function updateAddress(policyID: string, newAddress: CompanyAddress) {
-    // TODO: Change API endpoint parameters format to make it possible to follow naming-convention
-    const parameters: UpdatePolicyAddressParams = {
-        policyID,
-        // eslint-disable-next-line @typescript-eslint/naming-convention
-        'data[addressStreet]': newAddress.addressStreet,
-        // eslint-disable-next-line @typescript-eslint/naming-convention
-        'data[city]': newAddress.city,
-        // eslint-disable-next-line @typescript-eslint/naming-convention
-        'data[country]': newAddress.country,
-        // eslint-disable-next-line @typescript-eslint/naming-convention
-        'data[state]': newAddress.state,
-        // eslint-disable-next-line @typescript-eslint/naming-convention
-        'data[zipCode]': newAddress.zipCode,
-    };
-
-    const optimisticData: OnyxUpdate[] = [
-        {
-            onyxMethod: Onyx.METHOD.MERGE,
-            key: `${ONYXKEYS.COLLECTION.POLICY}${policyID}`,
-            value: {
-                address: newAddress,
-            },
-        },
-    ];
-
-    API.write(WRITE_COMMANDS.UPDATE_POLICY_ADDRESS, parameters, {
-        optimisticData,
-    });
-}
-
-function updateWorkspaceCustomUnitAndRate(policyID: string, currentCustomUnit: CustomUnit, newCustomUnit: NewCustomUnit, lastModified?: string) {
-    if (!currentCustomUnit.customUnitID || !newCustomUnit?.customUnitID || !newCustomUnit.rates?.customUnitRateID) {
-        return;
-    }
-
-    const optimisticData: OnyxUpdate[] = [
-        {
-            onyxMethod: Onyx.METHOD.MERGE,
-            key: `${ONYXKEYS.COLLECTION.POLICY}${policyID}`,
-            value: {
-                customUnits: {
-                    [newCustomUnit.customUnitID]: {
-                        ...newCustomUnit,
-                        rates: {
-                            [newCustomUnit.rates.customUnitRateID]: {
-                                ...newCustomUnit.rates,
-                                errors: null,
-                                pendingAction: CONST.RED_BRICK_ROAD_PENDING_ACTION.UPDATE,
-                            },
-                        },
-                        pendingAction: CONST.RED_BRICK_ROAD_PENDING_ACTION.UPDATE,
-                    },
-                },
-            },
-        },
-    ];
-
-    const successData: OnyxUpdate[] = [
-        {
-            onyxMethod: Onyx.METHOD.MERGE,
-            key: `${ONYXKEYS.COLLECTION.POLICY}${policyID}`,
-            value: {
-                customUnits: {
-                    [newCustomUnit.customUnitID]: {
-                        pendingAction: null,
-                        errors: null,
-                        rates: {
-                            [newCustomUnit.rates.customUnitRateID]: {
-                                pendingAction: null,
-                            },
-                        },
-                    },
-                },
-            },
-        },
-    ];
-
-    const failureData: OnyxUpdate[] = [
-        {
-            onyxMethod: Onyx.METHOD.MERGE,
-            key: `${ONYXKEYS.COLLECTION.POLICY}${policyID}`,
-            value: {
-                customUnits: {
-                    [currentCustomUnit.customUnitID]: {
-                        customUnitID: currentCustomUnit.customUnitID,
-                        rates: {
-                            [newCustomUnit.rates.customUnitRateID]: {
-                                ...currentCustomUnit.rates,
-                                errors: ErrorUtils.getMicroSecondOnyxError('workspace.reimburse.updateCustomUnitError'),
-                            },
-                        },
-                    },
-                },
-            },
-        },
-    ];
-
-    const newCustomUnitParam = lodashClone(newCustomUnit);
-    const {pendingAction, errors, ...newRates} = newCustomUnitParam.rates ?? {};
-    newCustomUnitParam.rates = newRates;
-
-    const params: UpdateWorkspaceCustomUnitAndRateParams = {
-        policyID,
-        lastModified,
-        customUnit: JSON.stringify(newCustomUnitParam),
-        customUnitRate: JSON.stringify(newCustomUnitParam.rates),
-    };
-
-    API.write(WRITE_COMMANDS.UPDATE_WORKSPACE_CUSTOM_UNIT_AND_RATE, params, {optimisticData, successData, failureData});
-}
-
-/**
- * Removes an error after trying to delete a member
- */
-function clearDeleteMemberError(policyID: string, accountID: number) {
-    const email = allPersonalDetails?.[accountID]?.login ?? '';
-    Onyx.merge(`${ONYXKEYS.COLLECTION.POLICY}${policyID}`, {
-        employeeList: {
-            [email]: {
-                pendingAction: null,
-                errors: null,
-            },
-        },
-    });
-}
-
-/**
- * Removes an error after trying to add a member
- */
-function clearAddMemberError(policyID: string, accountID: number) {
-    const email = allPersonalDetails?.[accountID]?.login ?? '';
-    Onyx.merge(`${ONYXKEYS.COLLECTION.POLICY}${policyID}`, {
-        employeeList: {
-            [email]: null,
-        },
-    });
-    Onyx.merge(`${ONYXKEYS.PERSONAL_DETAILS_LIST}`, {
-        [accountID]: null,
-    });
-}
-
-/**
- * Removes an error after trying to delete a workspace
- */
-function clearDeleteWorkspaceError(policyID: string) {
-    Onyx.merge(`${ONYXKEYS.COLLECTION.POLICY}${policyID}`, {
-        pendingAction: null,
-        errors: null,
-    });
-}
-
-/**
- * Removes the workspace after failure to create.
- */
-function removeWorkspace(policyID: string) {
-    Onyx.set(`${ONYXKEYS.COLLECTION.POLICY}${policyID}`, null);
-}
-
-/**
- * Generate a policy name based on an email and policy list.
- * @param [email] the email to base the workspace name on. If not passed, will use the logged-in user's email instead
- */
-function generateDefaultWorkspaceName(email = ''): string {
-    const emailParts = email ? email.split('@') : sessionEmail.split('@');
-    let defaultWorkspaceName = '';
-    if (!emailParts || emailParts.length !== 2) {
-        return defaultWorkspaceName;
-    }
-    const username = emailParts[0];
-    const domain = emailParts[1];
-
-    if (PUBLIC_DOMAINS.some((publicDomain) => publicDomain === domain.toLowerCase())) {
-        defaultWorkspaceName = `${Str.UCFirst(username)}'s Workspace`;
-    } else {
-        defaultWorkspaceName = `${Str.UCFirst(domain.split('.')[0])}'s Workspace`;
-    }
-
-    if (`@${domain.toLowerCase()}` === CONST.SMS.DOMAIN) {
-        defaultWorkspaceName = 'My Group Workspace';
-    }
-
-    if (isEmptyObject(allPolicies)) {
-        return defaultWorkspaceName;
-    }
-
-    // find default named workspaces and increment the last number
-    const numberRegEx = new RegExp(`${escapeRegExp(defaultWorkspaceName)} ?(\\d*)`, 'i');
-    const parsedWorkspaceNumbers = Object.values(allPolicies ?? {})
-        .filter((policy) => policy?.name && numberRegEx.test(policy.name))
-        .map((policy) => Number(numberRegEx.exec(policy?.name ?? '')?.[1] ?? '1')); // parse the number at the end
-    const lastWorkspaceNumber = Math.max(...parsedWorkspaceNumbers);
-    return lastWorkspaceNumber !== -Infinity ? `${defaultWorkspaceName} ${lastWorkspaceNumber + 1}` : defaultWorkspaceName;
-}
-
-/**
- * Returns a client generated 16 character hexadecimal value for the policyID
- */
-function generatePolicyID(): string {
-    return NumberUtils.generateHexadecimalValue(16);
-}
-
-/**
- * Returns a client generated 13 character hexadecimal value for a custom unit ID
- */
-function generateCustomUnitID(): string {
-    return NumberUtils.generateHexadecimalValue(13);
-}
-
-function buildOptimisticCustomUnits(): OptimisticCustomUnits {
-    const currency = allPersonalDetails?.[sessionAccountID]?.localCurrencyCode ?? CONST.CURRENCY.USD;
-    const customUnitID = generateCustomUnitID();
-    const customUnitRateID = generateCustomUnitID();
-
-    const customUnits: Record<string, CustomUnit> = {
-        [customUnitID]: {
-            customUnitID,
-            name: CONST.CUSTOM_UNITS.NAME_DISTANCE,
-            attributes: {
-                unit: CONST.CUSTOM_UNITS.DISTANCE_UNIT_MILES,
-            },
-            rates: {
-                [customUnitRateID]: {
-                    customUnitRateID,
-                    name: CONST.CUSTOM_UNITS.DEFAULT_RATE,
-                    rate: CONST.CUSTOM_UNITS.MILEAGE_IRS_RATE * CONST.POLICY.CUSTOM_UNIT_RATE_BASE_OFFSET,
-                    currency,
-                },
-            },
-        },
-    };
-
-    return {
-        customUnits,
-        customUnitID,
-        customUnitRateID,
-        outputCurrency: currency,
-    };
-}
-
-/**
- * Optimistically creates a Policy Draft for a new workspace
- *
- * @param [policyOwnerEmail] the email of the account to make the owner of the policy
- * @param [policyName] custom policy name we will use for created workspace
- * @param [policyID] custom policy id we will use for created workspace
- * @param [makeMeAdmin] leave the calling account as an admin on the policy
- */
-function createDraftInitialWorkspace(policyOwnerEmail = '', policyName = '', policyID = generatePolicyID(), makeMeAdmin = false) {
-    const workspaceName = policyName || generateDefaultWorkspaceName(policyOwnerEmail);
-    const {customUnits, outputCurrency} = buildOptimisticCustomUnits();
-
-    const optimisticData: OnyxUpdate[] = [
-        {
-            onyxMethod: Onyx.METHOD.SET,
-            key: `${ONYXKEYS.COLLECTION.POLICY_DRAFTS}${policyID}`,
-            value: {
-                id: policyID,
-                type: CONST.POLICY.TYPE.TEAM,
-                name: workspaceName,
-                role: CONST.POLICY.ROLE.ADMIN,
-                owner: sessionEmail,
-                ownerAccountID: sessionAccountID,
-                isPolicyExpenseChatEnabled: true,
-                outputCurrency,
-                pendingAction: CONST.RED_BRICK_ROAD_PENDING_ACTION.ADD,
-                customUnits,
-                makeMeAdmin,
-                autoReporting: true,
-                employeeList: {
-                    [sessionEmail]: {
-                        role: CONST.POLICY.ROLE.ADMIN,
-                        errors: {},
-                    },
-                },
-                approvalMode: CONST.POLICY.APPROVAL_MODE.OPTIONAL,
-                harvesting: {
-                    enabled: true,
-                },
-            },
-        },
-    ];
-
-    Onyx.update(optimisticData);
-}
-
-function buildOptimisticPolicyCategories(policyID: string, categories: readonly string[]) {
-    const optimisticCategoryMap = categories.reduce(
-        (acc, category) => ({
-            ...acc,
-            [category]: {
-                name: category,
-                enabled: true,
-                errors: null,
-                pendingAction: CONST.RED_BRICK_ROAD_PENDING_ACTION.ADD,
-            },
-        }),
-        {},
-    );
-
-    const successCategoryMap = categories.reduce(
-        (acc, category) => ({
-            ...acc,
-            [category]: {
-                errors: null,
-                pendingAction: null,
-            },
-        }),
-        {},
-    );
-
-    const failureCategoryMap = categories.reduce(
-        (acc, category) => ({
-            ...acc,
-            [category]: {
-                errors: ErrorUtils.getMicroSecondOnyxError('workspace.categories.createFailureMessage'),
-                pendingAction: null,
-            },
-        }),
-        {},
-    );
-
-    const onyxData: OnyxData = {
-        optimisticData: [
-            {
-                onyxMethod: Onyx.METHOD.MERGE,
-                key: `${ONYXKEYS.COLLECTION.POLICY_CATEGORIES}${policyID}`,
-                value: optimisticCategoryMap,
-            },
-        ],
-        successData: [
-            {
-                onyxMethod: Onyx.METHOD.MERGE,
-                key: `${ONYXKEYS.COLLECTION.POLICY_CATEGORIES}${policyID}`,
-                value: successCategoryMap,
-            },
-        ],
-        failureData: [
-            {
-                onyxMethod: Onyx.METHOD.MERGE,
-                key: `${ONYXKEYS.COLLECTION.POLICY_CATEGORIES}${policyID}`,
-                value: failureCategoryMap,
-            },
-        ],
-    };
-
-    return onyxData;
-}
-
-/**
- * Optimistically creates a new workspace and default workspace chats
- *
- * @param [policyOwnerEmail] the email of the account to make the owner of the policy
- * @param [makeMeAdmin] leave the calling account as an admin on the policy
- * @param [policyName] custom policy name we will use for created workspace
- * @param [policyID] custom policy id we will use for created workspace
- */
-function createWorkspace(policyOwnerEmail = '', makeMeAdmin = false, policyName = '', policyID = generatePolicyID()): CreateWorkspaceParams {
-    const workspaceName = policyName || generateDefaultWorkspaceName(policyOwnerEmail);
-
-    const {customUnits, customUnitID, customUnitRateID, outputCurrency} = buildOptimisticCustomUnits();
-
-    const {
-        announceChatReportID,
-        announceChatData,
-        announceReportActionData,
-        announceCreatedReportActionID,
-        adminsChatReportID,
-        adminsChatData,
-        adminsReportActionData,
-        adminsCreatedReportActionID,
-        expenseChatReportID,
-        expenseChatData,
-        expenseReportActionData,
-        expenseCreatedReportActionID,
-    } = ReportUtils.buildOptimisticWorkspaceChats(policyID, workspaceName);
-
-    const optimisticCategoriesData = buildOptimisticPolicyCategories(policyID, CONST.POLICY.DEFAULT_CATEGORIES);
-
-    const optimisticData: OnyxUpdate[] = [
-        {
-            onyxMethod: Onyx.METHOD.SET,
-            key: `${ONYXKEYS.COLLECTION.POLICY}${policyID}`,
-            value: {
-                id: policyID,
-                type: CONST.POLICY.TYPE.TEAM,
-                name: workspaceName,
-                role: CONST.POLICY.ROLE.ADMIN,
-                owner: sessionEmail,
-                ownerAccountID: sessionAccountID,
-                isPolicyExpenseChatEnabled: true,
-                outputCurrency,
-                pendingAction: CONST.RED_BRICK_ROAD_PENDING_ACTION.ADD,
-                autoReporting: true,
-                approvalMode: CONST.POLICY.APPROVAL_MODE.OPTIONAL,
-                harvesting: {
-                    enabled: true,
-                },
-                customUnits,
-                areCategoriesEnabled: true,
-                areTagsEnabled: false,
-                areDistanceRatesEnabled: false,
-                areWorkflowsEnabled: false,
-                areReportFieldsEnabled: false,
-                areConnectionsEnabled: false,
-                employeeList: {
-                    [sessionEmail]: {
-                        role: CONST.POLICY.ROLE.ADMIN,
-                        errors: {},
-                    },
-                },
-                chatReportIDAdmins: makeMeAdmin ? Number(adminsChatReportID) : undefined,
-            },
-        },
-        {
-            onyxMethod: Onyx.METHOD.SET,
-            key: `${ONYXKEYS.COLLECTION.REPORT}${announceChatReportID}`,
-            value: {
-                pendingFields: {
-                    addWorkspaceRoom: CONST.RED_BRICK_ROAD_PENDING_ACTION.ADD,
-                },
-                ...announceChatData,
-            },
-        },
-        {
-            onyxMethod: Onyx.METHOD.SET,
-            key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${announceChatReportID}`,
-            value: announceReportActionData,
-        },
-        {
-            onyxMethod: Onyx.METHOD.SET,
-            key: `${ONYXKEYS.COLLECTION.REPORT}${adminsChatReportID}`,
-            value: {
-                pendingFields: {
-                    addWorkspaceRoom: CONST.RED_BRICK_ROAD_PENDING_ACTION.ADD,
-                },
-                ...adminsChatData,
-            },
-        },
-        {
-            onyxMethod: Onyx.METHOD.SET,
-            key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${adminsChatReportID}`,
-            value: adminsReportActionData,
-        },
-        {
-            onyxMethod: Onyx.METHOD.SET,
-            key: `${ONYXKEYS.COLLECTION.REPORT}${expenseChatReportID}`,
-            value: {
-                pendingFields: {
-                    addWorkspaceRoom: CONST.RED_BRICK_ROAD_PENDING_ACTION.ADD,
-                },
-                ...expenseChatData,
-            },
-        },
-        {
-            onyxMethod: Onyx.METHOD.SET,
-            key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${expenseChatReportID}`,
-            value: expenseReportActionData,
-        },
-        {
-            onyxMethod: Onyx.METHOD.SET,
-            key: `${ONYXKEYS.COLLECTION.POLICY_DRAFTS}${policyID}`,
-            value: null,
-        },
-    ];
-
-    const successData: OnyxUpdate[] = [
-        {
-            onyxMethod: Onyx.METHOD.MERGE,
-            key: `${ONYXKEYS.COLLECTION.POLICY}${policyID}`,
-            value: {pendingAction: null},
-        },
-        {
-            onyxMethod: Onyx.METHOD.MERGE,
-            key: `${ONYXKEYS.COLLECTION.REPORT}${announceChatReportID}`,
-            value: {
-                pendingFields: {
-                    addWorkspaceRoom: null,
-                },
-                pendingAction: null,
-            },
-        },
-        {
-            onyxMethod: Onyx.METHOD.MERGE,
-            key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${announceChatReportID}`,
-            value: {
-                [announceCreatedReportActionID]: {
-                    pendingAction: null,
-                },
-            },
-        },
-        {
-            onyxMethod: Onyx.METHOD.MERGE,
-            key: `${ONYXKEYS.COLLECTION.REPORT}${adminsChatReportID}`,
-            value: {
-                pendingFields: {
-                    addWorkspaceRoom: null,
-                },
-                pendingAction: null,
-                pendingChatMembers: [],
-            },
-        },
-        {
-            onyxMethod: Onyx.METHOD.MERGE,
-            key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${adminsChatReportID}`,
-            value: {
-                [adminsCreatedReportActionID]: {
-                    pendingAction: null,
-                },
-            },
-        },
-        {
-            onyxMethod: Onyx.METHOD.MERGE,
-            key: `${ONYXKEYS.COLLECTION.REPORT}${expenseChatReportID}`,
-            value: {
-                pendingFields: {
-                    addWorkspaceRoom: null,
-                },
-                pendingAction: null,
-            },
-        },
-        {
-            onyxMethod: Onyx.METHOD.MERGE,
-            key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${expenseChatReportID}`,
-            value: {
-                [expenseCreatedReportActionID]: {
-                    pendingAction: null,
-                },
-            },
-        },
-    ];
-
-    const failureData: OnyxUpdate[] = [
-        {
-            onyxMethod: Onyx.METHOD.MERGE,
-            key: `${ONYXKEYS.COLLECTION.POLICY}${policyID}`,
-            value: {employeeList: null},
-        },
-        {
-            onyxMethod: Onyx.METHOD.SET,
-            key: `${ONYXKEYS.COLLECTION.REPORT}${announceChatReportID}`,
-            value: null,
-        },
-        {
-            onyxMethod: Onyx.METHOD.SET,
-            key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${announceChatReportID}`,
-            value: null,
-        },
-        {
-            onyxMethod: Onyx.METHOD.SET,
-            key: `${ONYXKEYS.COLLECTION.REPORT}${adminsChatReportID}`,
-            value: null,
-        },
-        {
-            onyxMethod: Onyx.METHOD.SET,
-            key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${adminsChatReportID}`,
-            value: null,
-        },
-        {
-            onyxMethod: Onyx.METHOD.SET,
-            key: `${ONYXKEYS.COLLECTION.REPORT}${expenseChatReportID}`,
-            value: null,
-        },
-        {
-            onyxMethod: Onyx.METHOD.SET,
-            key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${expenseChatReportID}`,
-            value: null,
-        },
-    ];
-
-    if (optimisticCategoriesData.optimisticData) {
-        optimisticData.push(...optimisticCategoriesData.optimisticData);
-    }
-
-    if (optimisticCategoriesData.failureData) {
-        failureData.push(...optimisticCategoriesData.failureData);
-    }
-
-    if (optimisticCategoriesData.successData) {
-        successData.push(...optimisticCategoriesData.successData);
-    }
-
-    const params: CreateWorkspaceParams = {
-        policyID,
-        announceChatReportID,
-        adminsChatReportID,
-        expenseChatReportID,
-        ownerEmail: policyOwnerEmail,
-        makeMeAdmin,
-        policyName: workspaceName,
-        type: CONST.POLICY.TYPE.TEAM,
-        announceCreatedReportActionID,
-        adminsCreatedReportActionID,
-        expenseCreatedReportActionID,
-        customUnitID,
-        customUnitRateID,
-    };
-
-    API.write(WRITE_COMMANDS.CREATE_WORKSPACE, params, {optimisticData, successData, failureData});
-
-    return params;
-}
-
-function openWorkspaceReimburseView(policyID: string) {
-    if (!policyID) {
-        Log.warn('openWorkspaceReimburseView invalid params', {policyID});
-        return;
-    }
-
-    const successData: OnyxUpdate[] = [
-        {
-            onyxMethod: Onyx.METHOD.MERGE,
-            key: ONYXKEYS.REIMBURSEMENT_ACCOUNT,
-            value: {
-                isLoading: false,
-            },
-        },
-    ];
-
-    const failureData: OnyxUpdate[] = [
-        {
-            onyxMethod: Onyx.METHOD.MERGE,
-            key: ONYXKEYS.REIMBURSEMENT_ACCOUNT,
-            value: {
-                isLoading: false,
-            },
-        },
-    ];
-
-    const params: OpenWorkspaceReimburseViewParams = {policyID};
-
-    API.read(READ_COMMANDS.OPEN_WORKSPACE_REIMBURSE_VIEW, params, {successData, failureData});
-}
-
-function openPolicyWorkflowsPage(policyID: string) {
-    if (!policyID) {
-        Log.warn('openPolicyWorkflowsPage invalid params', {policyID});
-        return;
-    }
-
-    const onyxData: OnyxData = {
-        optimisticData: [
-            {
-                onyxMethod: Onyx.METHOD.MERGE,
-                key: `${ONYXKEYS.COLLECTION.POLICY}${policyID}`,
-                value: {
-                    isLoading: true,
-                },
-            },
-        ],
-        successData: [
-            {
-                onyxMethod: Onyx.METHOD.MERGE,
-                key: `${ONYXKEYS.COLLECTION.POLICY}${policyID}`,
-                value: {
-                    isLoading: false,
-                },
-            },
-        ],
-        failureData: [
-            {
-                onyxMethod: Onyx.METHOD.MERGE,
-                key: `${ONYXKEYS.COLLECTION.POLICY}${policyID}`,
-                value: {
-                    isLoading: false,
-                },
-            },
-        ],
-    };
-
-    const params: OpenPolicyWorkflowsPageParams = {policyID};
-
-    API.read(READ_COMMANDS.OPEN_POLICY_WORKFLOWS_PAGE, params, onyxData);
-}
-
-function setPolicyIDForReimburseView(policyID: string) {
-    Onyx.merge(ONYXKEYS.WORKSPACE_RATE_AND_UNIT, {policyID, rate: null, unit: null});
-}
-
-function clearOnyxDataForReimburseView() {
-    Onyx.merge(ONYXKEYS.WORKSPACE_RATE_AND_UNIT, null);
-}
-
-function setRateForReimburseView(rate: string) {
-    Onyx.merge(ONYXKEYS.WORKSPACE_RATE_AND_UNIT, {rate});
-}
-
-function setUnitForReimburseView(unit: Unit) {
-    Onyx.merge(ONYXKEYS.WORKSPACE_RATE_AND_UNIT, {unit});
-}
-
-/**
- * Returns the accountIDs of the members of the policy whose data is passed in the parameters
- */
-function openWorkspace(policyID: string, clientMemberAccountIDs: number[]) {
-    if (!policyID || !clientMemberAccountIDs) {
-        Log.warn('openWorkspace invalid params', {policyID, clientMemberAccountIDs});
-        return;
-    }
-
-    const params: OpenWorkspaceParams = {
-        policyID,
-        clientMemberAccountIDs: JSON.stringify(clientMemberAccountIDs),
-    };
-
-    API.read(READ_COMMANDS.OPEN_WORKSPACE, params);
-}
-
-function openWorkspaceMembersPage(policyID: string, clientMemberEmails: string[]) {
-    if (!policyID || !clientMemberEmails) {
-        Log.warn('openWorkspaceMembersPage invalid params', {policyID, clientMemberEmails});
-        return;
-    }
-
-    const params: OpenWorkspaceMembersPageParams = {
-        policyID,
-        clientMemberEmails: JSON.stringify(clientMemberEmails),
-    };
-
-    API.read(READ_COMMANDS.OPEN_WORKSPACE_MEMBERS_PAGE, params);
-}
-
-function openPolicyCategoriesPage(policyID: string) {
-    if (!policyID) {
-        Log.warn('openPolicyCategoriesPage invalid params', {policyID});
-        return;
-    }
-
-    const params: OpenPolicyCategoriesPageParams = {
-        policyID,
-    };
-
-    API.read(READ_COMMANDS.OPEN_POLICY_CATEGORIES_PAGE, params);
-}
-
-function openPolicyTagsPage(policyID: string) {
-    if (!policyID) {
-        Log.warn('openPolicyTasgPage invalid params', {policyID});
-        return;
-    }
-
-    const params: OpenPolicyTagsPageParams = {
-        policyID,
-    };
-
-    API.read(READ_COMMANDS.OPEN_POLICY_TAGS_PAGE, params);
-}
-
-function openPolicyTaxesPage(policyID: string) {
-    if (!policyID) {
-        Log.warn('openPolicyTaxesPage invalid params', {policyID});
-        return;
-    }
-
-    const params: OpenPolicyTaxesPageParams = {
-        policyID,
-    };
-
-    API.read(READ_COMMANDS.OPEN_POLICY_TAXES_PAGE, params);
-}
-
-function openWorkspaceInvitePage(policyID: string, clientMemberEmails: string[]) {
-    if (!policyID || !clientMemberEmails) {
-        Log.warn('openWorkspaceInvitePage invalid params', {policyID, clientMemberEmails});
-        return;
-    }
-
-    const params: OpenWorkspaceInvitePageParams = {
-        policyID,
-        clientMemberEmails: JSON.stringify(clientMemberEmails),
-    };
-
-    API.read(READ_COMMANDS.OPEN_WORKSPACE_INVITE_PAGE, params);
-}
-
-function openDraftWorkspaceRequest(policyID: string) {
-    const params: OpenDraftWorkspaceRequestParams = {policyID};
-
-    API.read(READ_COMMANDS.OPEN_DRAFT_WORKSPACE_REQUEST, params);
-}
-
-function setWorkspaceInviteMembersDraft(policyID: string, invitedEmailsToAccountIDs: InvitedEmailsToAccountIDs) {
-    Onyx.set(`${ONYXKEYS.COLLECTION.WORKSPACE_INVITE_MEMBERS_DRAFT}${policyID}`, invitedEmailsToAccountIDs);
-}
-
-function setWorkspaceInviteMessageDraft(policyID: string, message: string | null) {
-    Onyx.set(`${ONYXKEYS.COLLECTION.WORKSPACE_INVITE_MESSAGE_DRAFT}${policyID}`, message);
-}
-
-function clearErrors(policyID: string) {
-    setWorkspaceErrors(policyID, {});
-    hideWorkspaceAlertMessage(policyID);
-}
-
-/**
- * Dismiss the informative messages about which policy members were added with primary logins when invited with their secondary login.
- */
-function dismissAddedWithPrimaryLoginMessages(policyID: string) {
-    Onyx.merge(`${ONYXKEYS.COLLECTION.POLICY}${policyID}`, {primaryLoginsInvited: null});
-}
-
-function buildOptimisticPolicyRecentlyUsedCategories(policyID?: string, category?: string) {
-    if (!policyID || !category) {
-        return [];
-    }
-
-    const policyRecentlyUsedCategories = allRecentlyUsedCategories?.[`${ONYXKEYS.COLLECTION.POLICY_RECENTLY_USED_CATEGORIES}${policyID}`] ?? [];
-
-    return lodashUnion([category], policyRecentlyUsedCategories);
-}
-
-function buildOptimisticPolicyRecentlyUsedTags(policyID?: string, transactionTags?: string): RecentlyUsedTags {
-    if (!policyID || !transactionTags) {
-        return {};
-    }
-
-    const policyTags = allPolicyTags?.[`${ONYXKEYS.COLLECTION.POLICY_TAGS}${policyID}`] ?? {};
-    const policyTagKeys = PolicyUtils.getSortedTagKeys(policyTags);
-    const policyRecentlyUsedTags = allRecentlyUsedTags?.[`${ONYXKEYS.COLLECTION.POLICY_RECENTLY_USED_TAGS}${policyID}`] ?? {};
-    const newOptimisticPolicyRecentlyUsedTags: RecentlyUsedTags = {};
-
-    TransactionUtils.getTagArrayFromName(transactionTags).forEach((tag, index) => {
-        if (!tag) {
-            return;
-        }
-
-        const tagListKey = policyTagKeys[index];
-        newOptimisticPolicyRecentlyUsedTags[tagListKey] = [...new Set([tag, ...(policyRecentlyUsedTags[tagListKey] ?? [])])];
-    });
-
-    return newOptimisticPolicyRecentlyUsedTags;
-}
-
-/**
- * This flow is used for bottom up flow converting IOU report to an expense report. When user takes this action,
- * we create a Collect type workspace when the person taking the action becomes an owner and an admin, while we
- * add a new member to the workspace as an employee and convert the IOU report passed as a param into an expense report.
- *
- * @returns policyID of the workspace we have created
- */
-function createWorkspaceFromIOUPayment(iouReport: Report | EmptyObject): string | undefined {
-    // This flow only works for IOU reports
-    if (!ReportUtils.isIOUReportUsingReport(iouReport)) {
-        return;
-    }
-
-    // Generate new variables for the policy
-    const policyID = generatePolicyID();
-    const workspaceName = generateDefaultWorkspaceName(sessionEmail);
-    const employeeAccountID = iouReport.ownerAccountID;
-    const employeeEmail = iouReport.ownerEmail ?? '';
-    const {customUnits, customUnitID, customUnitRateID} = buildOptimisticCustomUnits();
-    const oldPersonalPolicyID = iouReport.policyID;
-    const iouReportID = iouReport.reportID;
-
-    const {
-        announceChatReportID,
-        announceChatData,
-        announceReportActionData,
-        announceCreatedReportActionID,
-        adminsChatReportID,
-        adminsChatData,
-        adminsReportActionData,
-        adminsCreatedReportActionID,
-        expenseChatReportID: workspaceChatReportID,
-        expenseChatData: workspaceChatData,
-        expenseReportActionData: workspaceChatReportActionData,
-        expenseCreatedReportActionID: workspaceChatCreatedReportActionID,
-    } = ReportUtils.buildOptimisticWorkspaceChats(policyID, workspaceName);
-
-    if (!employeeAccountID) {
-        return;
-    }
-
-    // Create the workspace chat for the employee whose IOU is being paid
-    const employeeWorkspaceChat = createPolicyExpenseChats(policyID, {[employeeEmail]: employeeAccountID}, true);
-    const newWorkspace = {
-        id: policyID,
-
-        // We are creating a collect policy in this case
-        type: CONST.POLICY.TYPE.TEAM,
-        name: workspaceName,
-        role: CONST.POLICY.ROLE.ADMIN,
-        owner: sessionEmail,
-        ownerAccountID: sessionAccountID,
-        isPolicyExpenseChatEnabled: true,
-
-        // Setting the currency to USD as we can only add the VBBA for this policy currency right now
-        outputCurrency: CONST.CURRENCY.USD,
-        pendingAction: CONST.RED_BRICK_ROAD_PENDING_ACTION.ADD,
-        autoReporting: true,
-        approvalMode: CONST.POLICY.APPROVAL_MODE.OPTIONAL,
-        harvesting: {
-            enabled: true,
-        },
-        customUnits,
-        areCategoriesEnabled: true,
-        areTagsEnabled: false,
-        areDistanceRatesEnabled: false,
-        areWorkflowsEnabled: false,
-        areReportFieldsEnabled: false,
-        areConnectionsEnabled: false,
-        employeeList: {
-            [sessionEmail]: {
-                role: CONST.POLICY.ROLE.ADMIN,
-                errors: {},
-            },
-            [employeeEmail]: {
-                role: CONST.POLICY.ROLE.USER,
-                errors: {},
-            },
-        },
-    };
-
-    const optimisticData: OnyxUpdate[] = [
-        {
-            onyxMethod: Onyx.METHOD.SET,
-            key: `${ONYXKEYS.COLLECTION.POLICY}${policyID}`,
-            value: newWorkspace,
-        },
-        {
-            onyxMethod: Onyx.METHOD.SET,
-            key: `${ONYXKEYS.COLLECTION.REPORT}${announceChatReportID}`,
-            value: {
-                pendingFields: {
-                    addWorkspaceRoom: CONST.RED_BRICK_ROAD_PENDING_ACTION.ADD,
-                },
-                ...announceChatData,
-            },
-        },
-        {
-            onyxMethod: Onyx.METHOD.SET,
-            key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${announceChatReportID}`,
-            value: announceReportActionData,
-        },
-        {
-            onyxMethod: Onyx.METHOD.SET,
-            key: `${ONYXKEYS.COLLECTION.REPORT}${adminsChatReportID}`,
-            value: {
-                pendingFields: {
-                    addWorkspaceRoom: CONST.RED_BRICK_ROAD_PENDING_ACTION.ADD,
-                },
-                ...adminsChatData,
-            },
-        },
-        {
-            onyxMethod: Onyx.METHOD.SET,
-            key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${adminsChatReportID}`,
-            value: adminsReportActionData,
-        },
-        {
-            onyxMethod: Onyx.METHOD.SET,
-            key: `${ONYXKEYS.COLLECTION.REPORT}${workspaceChatReportID}`,
-            value: {
-                pendingFields: {
-                    addWorkspaceRoom: CONST.RED_BRICK_ROAD_PENDING_ACTION.ADD,
-                },
-                ...workspaceChatData,
-            },
-        },
-        {
-            onyxMethod: Onyx.METHOD.SET,
-            key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${workspaceChatReportID}`,
-            value: workspaceChatReportActionData,
-        },
-        {
-            onyxMethod: Onyx.METHOD.MERGE,
-            key: `${ONYXKEYS.COLLECTION.POLICY_DRAFTS}${policyID}`,
-            value: {
-                pendingFields: {
-                    addWorkspaceRoom: null,
-                },
-                pendingAction: null,
-            },
-        },
-        ...employeeWorkspaceChat.onyxOptimisticData,
-    ];
-
-    const successData: OnyxUpdate[] = [
-        {
-            onyxMethod: Onyx.METHOD.MERGE,
-            key: `${ONYXKEYS.COLLECTION.POLICY}${policyID}`,
-            value: {pendingAction: null},
-        },
-        {
-            onyxMethod: Onyx.METHOD.MERGE,
-            key: `${ONYXKEYS.COLLECTION.REPORT}${announceChatReportID}`,
-            value: {
-                pendingFields: {
-                    addWorkspaceRoom: null,
-                },
-                pendingAction: null,
-            },
-        },
-        {
-            onyxMethod: Onyx.METHOD.MERGE,
-            key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${announceChatReportID}`,
-            value: {
-                [Object.keys(announceChatData)[0]]: {
-                    pendingAction: null,
-                },
-            },
-        },
-        {
-            onyxMethod: Onyx.METHOD.MERGE,
-            key: `${ONYXKEYS.COLLECTION.REPORT}${adminsChatReportID}`,
-            value: {
-                pendingFields: {
-                    addWorkspaceRoom: null,
-                },
-                pendingAction: null,
-            },
-        },
-        {
-            onyxMethod: Onyx.METHOD.MERGE,
-            key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${adminsChatReportID}`,
-            value: {
-                [Object.keys(adminsChatData)[0]]: {
-                    pendingAction: null,
-                },
-            },
-        },
-        {
-            onyxMethod: Onyx.METHOD.MERGE,
-            key: `${ONYXKEYS.COLLECTION.REPORT}${workspaceChatReportID}`,
-            value: {
-                pendingFields: {
-                    addWorkspaceRoom: null,
-                },
-                pendingAction: null,
-            },
-        },
-        {
-            onyxMethod: Onyx.METHOD.MERGE,
-            key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${workspaceChatReportID}`,
-            value: {
-                [Object.keys(workspaceChatData)[0]]: {
-                    pendingAction: null,
-                },
-            },
-        },
-        ...employeeWorkspaceChat.onyxSuccessData,
-    ];
-
-    const failureData: OnyxUpdate[] = [
-        {
-            onyxMethod: Onyx.METHOD.MERGE,
-            key: `${ONYXKEYS.COLLECTION.REPORT}${announceChatReportID}`,
-            value: {
-                pendingFields: {
-                    addWorkspaceRoom: null,
-                },
-                pendingAction: null,
-            },
-        },
-        {
-            onyxMethod: Onyx.METHOD.MERGE,
-            key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${announceChatReportID}`,
-            value: {
-                pendingAction: null,
-            },
-        },
-        {
-            onyxMethod: Onyx.METHOD.MERGE,
-            key: `${ONYXKEYS.COLLECTION.REPORT}${adminsChatReportID}`,
-            value: {
-                pendingFields: {
-                    addWorkspaceRoom: null,
-                },
-                pendingAction: null,
-            },
-        },
-        {
-            onyxMethod: Onyx.METHOD.MERGE,
-            key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${adminsChatReportID}`,
-            value: {
-                pendingAction: null,
-            },
-        },
-        {
-            onyxMethod: Onyx.METHOD.MERGE,
-            key: `${ONYXKEYS.COLLECTION.REPORT}${workspaceChatReportID}`,
-            value: {
-                pendingFields: {
-                    addWorkspaceRoom: null,
-                },
-                pendingAction: null,
-            },
-        },
-        {
-            onyxMethod: Onyx.METHOD.MERGE,
-            key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${workspaceChatReportID}`,
-            value: {
-                pendingAction: null,
-            },
-        },
-    ];
-
-    // Compose the memberData object which is used to add the employee to the workspace and
-    // optimistically create the workspace chat for them.
-    const memberData = {
-        accountID: Number(employeeAccountID),
-        email: employeeEmail,
-        workspaceChatReportID: employeeWorkspaceChat.reportCreationData[employeeEmail].reportID,
-        workspaceChatCreatedReportActionID: employeeWorkspaceChat.reportCreationData[employeeEmail].reportActionID,
-    };
-
-    const oldChatReportID = iouReport.chatReportID;
-
-    // Next we need to convert the IOU report to Expense report.
-    // We need to change:
-    // - report type
-    // - change the sign of the report total
-    // - update its policyID and policyName
-    // - update the chatReportID to point to the new workspace chat
-    const expenseReport = {
-        ...iouReport,
-        chatReportID: memberData.workspaceChatReportID,
-        policyID,
-        policyName: workspaceName,
-        type: CONST.REPORT.TYPE.EXPENSE,
-        total: -(iouReport?.total ?? 0),
-    };
-    optimisticData.push({
-        onyxMethod: Onyx.METHOD.MERGE,
-        key: `${ONYXKEYS.COLLECTION.REPORT}${iouReportID}`,
-        value: expenseReport,
-    });
-    failureData.push({
-        onyxMethod: Onyx.METHOD.MERGE,
-        key: `${ONYXKEYS.COLLECTION.REPORT}${iouReportID}`,
-        value: iouReport,
-    });
-
-    // The expense report transactions need to have the amount reversed to negative values
-    const reportTransactions = TransactionUtils.getAllReportTransactions(iouReportID);
-
-    // For performance reasons, we are going to compose a merge collection data for transactions
-    const transactionsOptimisticData: Record<string, Transaction> = {};
-    const transactionFailureData: Record<string, Transaction> = {};
-    reportTransactions.forEach((transaction) => {
-        transactionsOptimisticData[`${ONYXKEYS.COLLECTION.TRANSACTION}${transaction.transactionID}`] = {
-            ...transaction,
-            amount: -transaction.amount,
-            modifiedAmount: transaction.modifiedAmount ? -transaction.modifiedAmount : 0,
-        };
-
-        transactionFailureData[`${ONYXKEYS.COLLECTION.TRANSACTION}${transaction.transactionID}`] = transaction;
-    });
-
-    optimisticData.push({
-        onyxMethod: Onyx.METHOD.MERGE_COLLECTION,
-        key: `${ONYXKEYS.COLLECTION.TRANSACTION}`,
-        value: transactionsOptimisticData,
-    });
-    failureData.push({
-        onyxMethod: Onyx.METHOD.MERGE_COLLECTION,
-        key: `${ONYXKEYS.COLLECTION.TRANSACTION}`,
-        value: transactionFailureData,
-    });
-
-    // We need to move the report preview action from the DM to the workspace chat.
-    const reportPreview = ReportActionsUtils.getParentReportAction(iouReport);
-    optimisticData.push({
-        onyxMethod: Onyx.METHOD.MERGE,
-        key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${oldChatReportID}`,
-        value: {[reportPreview.reportActionID]: null},
-    });
-    failureData.push({
-        onyxMethod: Onyx.METHOD.MERGE,
-        key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${oldChatReportID}`,
-        value: {[reportPreview.reportActionID]: reportPreview},
-    });
-
-    // To optimistically remove the GBR from the DM we need to update the hasOutstandingChildRequest param to false
-    optimisticData.push({
-        onyxMethod: Onyx.METHOD.MERGE,
-        key: `${ONYXKEYS.COLLECTION.REPORT}${oldChatReportID}`,
-        value: {
-            hasOutstandingChildRequest: false,
-        },
-    });
-    failureData.push({
-        onyxMethod: Onyx.METHOD.MERGE,
-        key: `${ONYXKEYS.COLLECTION.REPORT}${oldChatReportID}`,
-        value: {
-            hasOutstandingChildRequest: true,
-        },
-    });
-
-    if (reportPreview?.reportActionID) {
-        // Update the created timestamp of the report preview action to be after the workspace chat created timestamp.
-        optimisticData.push({
-            onyxMethod: Onyx.METHOD.MERGE,
-            key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${memberData.workspaceChatReportID}`,
-            value: {
-                [reportPreview.reportActionID]: {
-                    ...reportPreview,
-                    message: [
-                        {
-                            type: CONST.REPORT.MESSAGE.TYPE.TEXT,
-                            text: ReportUtils.getReportPreviewMessage(expenseReport, {}, false, false, newWorkspace),
-                        },
-                    ],
-                    created: DateUtils.getDBTime(),
-                },
-            },
-        });
-    }
-
-    failureData.push({
-        onyxMethod: Onyx.METHOD.MERGE,
-        key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${memberData.workspaceChatReportID}`,
-        value: {[reportPreview.reportActionID]: null},
-    });
-
-    // Create the MOVED report action and add it to the DM chat which indicates to the user where the report has been moved
-    const movedReportAction = ReportUtils.buildOptimisticMovedReportAction(oldPersonalPolicyID ?? '', policyID, memberData.workspaceChatReportID, iouReportID, workspaceName);
-    optimisticData.push({
-        onyxMethod: Onyx.METHOD.MERGE,
-        key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${oldChatReportID}`,
-        value: {[movedReportAction.reportActionID]: movedReportAction},
-    });
-    successData.push({
-        onyxMethod: Onyx.METHOD.MERGE,
-        key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${oldChatReportID}`,
-        value: {
-            [movedReportAction.reportActionID]: {
-                ...movedReportAction,
-                pendingAction: null,
-            },
-        },
-    });
-    failureData.push({
-        onyxMethod: Onyx.METHOD.MERGE,
-        key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${oldChatReportID}`,
-        value: {[movedReportAction.reportActionID]: null},
-    });
-
-    const params: CreateWorkspaceFromIOUPaymentParams = {
-        policyID,
-        announceChatReportID,
-        adminsChatReportID,
-        expenseChatReportID: workspaceChatReportID,
-        ownerEmail: '',
-        makeMeAdmin: false,
-        policyName: workspaceName,
-        type: CONST.POLICY.TYPE.TEAM,
-        announceCreatedReportActionID,
-        adminsCreatedReportActionID,
-        expenseCreatedReportActionID: workspaceChatCreatedReportActionID,
-        customUnitID,
-        customUnitRateID,
-        iouReportID,
-        memberData: JSON.stringify(memberData),
-        reportActionID: movedReportAction.reportActionID,
-    };
-
-    API.write(WRITE_COMMANDS.CREATE_WORKSPACE_FROM_IOU_PAYMENT, params, {optimisticData, successData, failureData});
-
-    return policyID;
-}
-
-function setWorkspaceCategoryEnabled(policyID: string, categoriesToUpdate: Record<string, {name: string; enabled: boolean}>) {
-    const policyCategories = allPolicyCategories?.[`${ONYXKEYS.COLLECTION.POLICY_CATEGORIES}${policyID}`] ?? {};
-    const policy = allPolicies?.[`${ONYXKEYS.COLLECTION.POLICY}${policyID}`];
-    const optimisticPolicyCategoriesData = {
-        ...Object.keys(categoriesToUpdate).reduce<PolicyCategories>((acc, key) => {
-            acc[key] = {
-                ...policyCategories[key],
-                ...categoriesToUpdate[key],
-                errors: null,
-                pendingFields: {
-                    enabled: CONST.RED_BRICK_ROAD_PENDING_ACTION.UPDATE,
-                },
-                pendingAction: CONST.RED_BRICK_ROAD_PENDING_ACTION.UPDATE,
-            };
-
-            return acc;
-        }, {}),
-    };
-    const shouldDisableRequiresCategory = !OptionsListUtils.hasEnabledOptions({...policyCategories, ...optimisticPolicyCategoriesData});
-    const onyxData: OnyxData = {
-        optimisticData: [
-            {
-                onyxMethod: Onyx.METHOD.MERGE,
-                key: `${ONYXKEYS.COLLECTION.POLICY_CATEGORIES}${policyID}`,
-                value: optimisticPolicyCategoriesData,
-            },
-        ],
-        successData: [
-            {
-                onyxMethod: Onyx.METHOD.MERGE,
-                key: `${ONYXKEYS.COLLECTION.POLICY_CATEGORIES}${policyID}`,
-                value: {
-                    ...Object.keys(categoriesToUpdate).reduce<PolicyCategories>((acc, key) => {
-                        acc[key] = {
-                            ...policyCategories[key],
-                            ...categoriesToUpdate[key],
-                            errors: null,
-                            pendingFields: {
-                                enabled: null,
-                            },
-                            pendingAction: null,
-                        };
-
-                        return acc;
-                    }, {}),
-                },
-            },
-        ],
-        failureData: [
-            {
-                onyxMethod: Onyx.METHOD.MERGE,
-                key: `${ONYXKEYS.COLLECTION.POLICY_CATEGORIES}${policyID}`,
-                value: {
-                    ...Object.keys(categoriesToUpdate).reduce<PolicyCategories>((acc, key) => {
-                        acc[key] = {
-                            ...policyCategories[key],
-                            ...categoriesToUpdate[key],
-                            errors: ErrorUtils.getMicroSecondOnyxError('workspace.categories.updateFailureMessage'),
-                            pendingFields: {
-                                enabled: null,
-                            },
-                            pendingAction: null,
-                        };
-
-                        return acc;
-                    }, {}),
-                },
-            },
-        ],
-    };
-    if (shouldDisableRequiresCategory) {
-        onyxData.optimisticData?.push({
-            onyxMethod: Onyx.METHOD.MERGE,
-            key: `${ONYXKEYS.COLLECTION.POLICY}${policyID}`,
-            value: {
-                requiresCategory: false,
-                pendingFields: {
-                    requiresCategory: CONST.RED_BRICK_ROAD_PENDING_ACTION.UPDATE,
-                },
-            },
-        });
-        onyxData.successData?.push({
-            onyxMethod: Onyx.METHOD.MERGE,
-            key: `${ONYXKEYS.COLLECTION.POLICY}${policyID}`,
-            value: {
-                pendingFields: {
-                    requiresCategory: null,
-                },
-            },
-        });
-        onyxData.failureData?.push({
-            onyxMethod: Onyx.METHOD.MERGE,
-            key: `${ONYXKEYS.COLLECTION.POLICY}${policyID}`,
-            value: {
-                requiresCategory: policy?.requiresCategory,
-                pendingFields: {
-                    requiresCategory: null,
-                },
-            },
-        });
-    }
-
-    const parameters = {
-        policyID,
-        categories: JSON.stringify(Object.keys(categoriesToUpdate).map((key) => categoriesToUpdate[key])),
-    };
-
-    API.write(WRITE_COMMANDS.SET_WORKSPACE_CATEGORIES_ENABLED, parameters, onyxData);
-}
-
-function createPolicyCategory(policyID: string, categoryName: string) {
-    const onyxData = buildOptimisticPolicyCategories(policyID, [categoryName]);
-
-    const parameters = {
-        policyID,
-        categories: JSON.stringify([{name: categoryName}]),
-    };
-
-    API.write(WRITE_COMMANDS.CREATE_WORKSPACE_CATEGORIES, parameters, onyxData);
-}
-
-function renamePolicyCategory(policyID: string, policyCategory: {oldName: string; newName: string}) {
-    const policyCategoryToUpdate = allPolicyCategories?.[`${ONYXKEYS.COLLECTION.POLICY_CATEGORIES}${policyID}`]?.[policyCategory.oldName] ?? {};
-
-    const onyxData: OnyxData = {
-        optimisticData: [
-            {
-                onyxMethod: Onyx.METHOD.MERGE,
-                key: `${ONYXKEYS.COLLECTION.POLICY_CATEGORIES}${policyID}`,
-                value: {
-                    [policyCategory.oldName]: null,
-                    [policyCategory.newName]: {
-                        ...policyCategoryToUpdate,
-                        name: policyCategory.newName,
-                        unencodedName: decodeURIComponent(policyCategory.newName),
-                        pendingAction: CONST.RED_BRICK_ROAD_PENDING_ACTION.UPDATE,
-                        pendingFields: {
-                            name: CONST.RED_BRICK_ROAD_PENDING_ACTION.UPDATE,
-                        },
-                    },
-                },
-            },
-        ],
-        successData: [
-            {
-                onyxMethod: Onyx.METHOD.MERGE,
-                key: `${ONYXKEYS.COLLECTION.POLICY_CATEGORIES}${policyID}`,
-                value: {
-                    [policyCategory.oldName]: null,
-                    [policyCategory.newName]: {
-                        ...policyCategoryToUpdate,
-                        name: policyCategory.newName,
-                        unencodedName: decodeURIComponent(policyCategory.newName),
-                        errors: null,
-                        pendingAction: null,
-                        pendingFields: {
-                            name: null,
-                        },
-                    },
-                },
-            },
-        ],
-        failureData: [
-            {
-                onyxMethod: Onyx.METHOD.MERGE,
-                key: `${ONYXKEYS.COLLECTION.POLICY_CATEGORIES}${policyID}`,
-                value: {
-                    [policyCategory.newName]: null,
-                    [policyCategory.oldName]: {
-                        ...policyCategoryToUpdate,
-                        name: policyCategory.oldName,
-                        unencodedName: decodeURIComponent(policyCategory.oldName),
-                        errors: ErrorUtils.getMicroSecondOnyxError('workspace.categories.updateFailureMessage'),
-                        pendingAction: null,
-                    },
-                },
-            },
-        ],
-    };
-
-    const parameters = {
-        policyID,
-        categories: JSON.stringify({[policyCategory.oldName]: policyCategory.newName}),
-    };
-
-    API.write(WRITE_COMMANDS.RENAME_WORKSPACE_CATEGORY, parameters, onyxData);
-}
-
-function createPolicyTag(policyID: string, tagName: string) {
-    const policyTag = PolicyUtils.getTagLists(allPolicyTags?.[`${ONYXKEYS.COLLECTION.POLICY_TAGS}${policyID}`] ?? {})?.[0] ?? {};
-
-    const onyxData: OnyxData = {
-        optimisticData: [
-            {
-                onyxMethod: Onyx.METHOD.MERGE,
-                key: `${ONYXKEYS.COLLECTION.POLICY_TAGS}${policyID}`,
-                value: {
-                    [policyTag.name]: {
-                        tags: {
-                            [tagName]: {
-                                name: tagName,
-                                enabled: true,
-                                errors: null,
-                                pendingAction: CONST.RED_BRICK_ROAD_PENDING_ACTION.ADD,
-                            },
-                        },
-                    },
-                },
-            },
-        ],
-        successData: [
-            {
-                onyxMethod: Onyx.METHOD.MERGE,
-                key: `${ONYXKEYS.COLLECTION.POLICY_TAGS}${policyID}`,
-                value: {
-                    [policyTag.name]: {
-                        tags: {
-                            [tagName]: {
-                                errors: null,
-                                pendingAction: null,
-                            },
-                        },
-                    },
-                },
-            },
-        ],
-        failureData: [
-            {
-                onyxMethod: Onyx.METHOD.MERGE,
-                key: `${ONYXKEYS.COLLECTION.POLICY_TAGS}${policyID}`,
-                value: {
-                    [policyTag.name]: {
-                        tags: {
-                            [tagName]: {
-                                errors: ErrorUtils.getMicroSecondOnyxError('workspace.tags.genericFailureMessage'),
-                            },
-                        },
-                    },
-                },
-            },
-        ],
-    };
-
-    const parameters = {
-        policyID,
-        tags: JSON.stringify([{name: tagName}]),
-    };
-
-    API.write(WRITE_COMMANDS.CREATE_POLICY_TAG, parameters, onyxData);
-}
-
-function setWorkspaceTagEnabled(policyID: string, tagsToUpdate: Record<string, {name: string; enabled: boolean}>) {
-    const policyTag = PolicyUtils.getTagLists(allPolicyTags?.[`${ONYXKEYS.COLLECTION.POLICY_TAGS}${policyID}`] ?? {})?.[0] ?? {};
-
-    const onyxData: OnyxData = {
-        optimisticData: [
-            {
-                onyxMethod: Onyx.METHOD.MERGE,
-                key: `${ONYXKEYS.COLLECTION.POLICY_TAGS}${policyID}`,
-                value: {
-                    [policyTag.name]: {
-                        tags: {
-                            ...Object.keys(tagsToUpdate).reduce<PolicyTags>((acc, key) => {
-                                acc[key] = {
-                                    ...policyTag.tags[key],
-                                    ...tagsToUpdate[key],
-                                    errors: null,
-                                    pendingFields: {
-                                        enabled: CONST.RED_BRICK_ROAD_PENDING_ACTION.UPDATE,
-                                    },
-                                    pendingAction: CONST.RED_BRICK_ROAD_PENDING_ACTION.UPDATE,
-                                };
-
-                                return acc;
-                            }, {}),
-                        },
-                    },
-                },
-            },
-        ],
-        successData: [
-            {
-                onyxMethod: Onyx.METHOD.MERGE,
-                key: `${ONYXKEYS.COLLECTION.POLICY_TAGS}${policyID}`,
-                value: {
-                    [policyTag.name]: {
-                        tags: {
-                            ...Object.keys(tagsToUpdate).reduce<PolicyTags>((acc, key) => {
-                                acc[key] = {
-                                    ...policyTag.tags[key],
-                                    ...tagsToUpdate[key],
-                                    errors: null,
-                                    pendingFields: {
-                                        enabled: null,
-                                    },
-                                    pendingAction: null,
-                                };
-
-                                return acc;
-                            }, {}),
-                        },
-                    },
-                },
-            },
-        ],
-        failureData: [
-            {
-                onyxMethod: Onyx.METHOD.MERGE,
-                key: `${ONYXKEYS.COLLECTION.POLICY_TAGS}${policyID}`,
-                value: {
-                    [policyTag.name]: {
-                        tags: {
-                            ...Object.keys(tagsToUpdate).reduce<PolicyTags>((acc, key) => {
-                                acc[key] = {
-                                    ...policyTag.tags[key],
-                                    ...tagsToUpdate[key],
-                                    errors: ErrorUtils.getMicroSecondOnyxError('workspace.tags.genericFailureMessage'),
-                                    pendingFields: {
-                                        enabled: null,
-                                    },
-                                    pendingAction: null,
-                                };
-
-                                return acc;
-                            }, {}),
-                        },
-                    },
-                },
-            },
-        ],
-    };
-
-    const parameters = {
-        policyID,
-        tags: JSON.stringify(Object.keys(tagsToUpdate).map((key) => tagsToUpdate[key])),
-    };
-
-    API.write(WRITE_COMMANDS.SET_POLICY_TAGS_ENABLED, parameters, onyxData);
-}
-
-function deletePolicyTags(policyID: string, tagsToDelete: string[]) {
-    const policyTag = PolicyUtils.getTagLists(allPolicyTags?.[`${ONYXKEYS.COLLECTION.POLICY_TAGS}${policyID}`] ?? {})?.[0] ?? {};
-
-    const onyxData: OnyxData = {
-        optimisticData: [
-            {
-                onyxMethod: Onyx.METHOD.MERGE,
-                key: `${ONYXKEYS.COLLECTION.POLICY_TAGS}${policyID}`,
-                value: {
-                    [policyTag.name]: {
-                        tags: {
-                            ...tagsToDelete.reduce<Record<string, Partial<OnyxValueWithOfflineFeedback<PolicyTag>>>>((acc, tagName) => {
-                                acc[tagName] = {pendingAction: CONST.RED_BRICK_ROAD_PENDING_ACTION.DELETE};
-                                return acc;
-                            }, {}),
-                        },
-                    },
-                },
-            },
-        ],
-        successData: [
-            {
-                onyxMethod: Onyx.METHOD.MERGE,
-                key: `${ONYXKEYS.COLLECTION.POLICY_TAGS}${policyID}`,
-                value: {
-                    [policyTag.name]: {
-                        tags: {
-                            ...tagsToDelete.reduce<Record<string, null | Partial<OnyxValueWithOfflineFeedback<PolicyTag>>>>((acc, tagName) => {
-                                acc[tagName] = null;
-                                return acc;
-                            }, {}),
-                        },
-                    },
-                },
-            },
-        ],
-        failureData: [
-            {
-                onyxMethod: Onyx.METHOD.MERGE,
-                key: `${ONYXKEYS.COLLECTION.POLICY_TAGS}${policyID}`,
-                value: {
-                    [policyTag.name]: {
-                        tags: {
-                            ...tagsToDelete.reduce<Record<string, Partial<OnyxValueWithOfflineFeedback<PolicyTag>>>>((acc, tagName) => {
-                                acc[tagName] = {pendingAction: null, errors: ErrorUtils.getMicroSecondOnyxError('workspace.tags.deleteFailureMessage')};
-                                return acc;
-                            }, {}),
-                        },
-                    },
-                },
-            },
-        ],
-    };
-
-    const parameters = {
-        policyID,
-        tags: JSON.stringify(tagsToDelete),
-    };
-
-    API.write(WRITE_COMMANDS.DELETE_POLICY_TAGS, parameters, onyxData);
-}
-
-function clearPolicyTagErrors(policyID: string, tagName: string) {
-    const tagListName = Object.keys(allPolicyTags?.[`${ONYXKEYS.COLLECTION.POLICY_TAGS}${policyID}`] ?? {})[0];
-    const tag = allPolicyTags?.[`${ONYXKEYS.COLLECTION.POLICY_TAGS}${policyID}`]?.[tagListName].tags?.[tagName];
-    if (!tag) {
-        return;
-    }
-
-    if (tag.pendingAction === CONST.RED_BRICK_ROAD_PENDING_ACTION.ADD) {
-        Onyx.merge(`${ONYXKEYS.COLLECTION.POLICY_TAGS}${policyID}`, {
-            [tagListName]: {
-                tags: {
-                    [tagName]: null,
-                },
-            },
-        });
-        return;
-    }
-
-    Onyx.merge(`${ONYXKEYS.COLLECTION.POLICY_TAGS}${policyID}`, {
-        [tagListName]: {
-            tags: {
-                [tagName]: {
-                    errors: null,
-                    pendingAction: null,
-                },
-            },
-        },
-    });
-}
-
-function renamePolicyTag(policyID: string, policyTag: {oldName: string; newName: string}) {
-    const tagListName = Object.keys(allPolicyTags?.[`${ONYXKEYS.COLLECTION.POLICY_TAGS}${policyID}`] ?? {})[0];
-    const oldTag = allPolicyTags?.[`${ONYXKEYS.COLLECTION.POLICY_TAGS}${policyID}`]?.[tagListName]?.tags?.[policyTag.oldName] ?? {};
-    const onyxData: OnyxData = {
-        optimisticData: [
-            {
-                onyxMethod: Onyx.METHOD.MERGE,
-                key: `${ONYXKEYS.COLLECTION.POLICY_TAGS}${policyID}`,
-                value: {
-                    [tagListName]: {
-                        tags: {
-                            [policyTag.oldName]: null,
-                            [policyTag.newName]: {
-                                ...oldTag,
-                                name: policyTag.newName,
-                                pendingAction: CONST.RED_BRICK_ROAD_PENDING_ACTION.UPDATE,
-                                pendingFields: {
-                                    name: CONST.RED_BRICK_ROAD_PENDING_ACTION.UPDATE,
-                                },
-                            },
-                        },
-                    },
-                },
-            },
-        ],
-        successData: [
-            {
-                onyxMethod: Onyx.METHOD.MERGE,
-                key: `${ONYXKEYS.COLLECTION.POLICY_TAGS}${policyID}`,
-                value: {
-                    [tagListName]: {
-                        tags: {
-                            [policyTag.newName]: {
-                                errors: null,
-                                pendingAction: null,
-                                pendingFields: {
-                                    name: null,
-                                },
-                            },
-                        },
-                    },
-                },
-            },
-        ],
-        failureData: [
-            {
-                onyxMethod: Onyx.METHOD.MERGE,
-                key: `${ONYXKEYS.COLLECTION.POLICY_TAGS}${policyID}`,
-                value: {
-                    [tagListName]: {
-                        tags: {
-                            [policyTag.newName]: null,
-                            [policyTag.oldName]: {
-                                ...oldTag,
-                                errors: ErrorUtils.getMicroSecondOnyxError('workspace.tags.genericFailureMessage'),
-                            },
-                        },
-                    },
-                },
-            },
-        ],
-    };
-
-    const parameters = {
-        policyID,
-        oldName: policyTag.oldName,
-        newName: policyTag.newName,
-    };
-
-    API.write(WRITE_COMMANDS.RENAME_POLICY_TAG, parameters, onyxData);
-}
-
-function setWorkspaceRequiresCategory(policyID: string, requiresCategory: boolean) {
-    const onyxData: OnyxData = {
-        optimisticData: [
-            {
-                onyxMethod: Onyx.METHOD.MERGE,
-                key: `${ONYXKEYS.COLLECTION.POLICY}${policyID}`,
-                value: {
-                    requiresCategory,
-                    errors: {
-                        requiresCategory: null,
-                    },
-                    pendingFields: {
-                        requiresCategory: CONST.RED_BRICK_ROAD_PENDING_ACTION.UPDATE,
-                    },
-                },
-            },
-        ],
-        successData: [
-            {
-                onyxMethod: Onyx.METHOD.MERGE,
-                key: `${ONYXKEYS.COLLECTION.POLICY}${policyID}`,
-                value: {
-                    errors: {
-                        requiresCategory: null,
-                    },
-                    pendingFields: {
-                        requiresCategory: null,
-                    },
-                },
-            },
-        ],
-        failureData: [
-            {
-                onyxMethod: Onyx.METHOD.MERGE,
-                key: `${ONYXKEYS.COLLECTION.POLICY}${policyID}`,
-                value: {
-                    requiresCategory: !requiresCategory,
-                    errors: ErrorUtils.getMicroSecondOnyxError('workspace.categories.updateFailureMessage'),
-                    pendingFields: {
-                        requiresCategory: null,
-                    },
-                },
-            },
-        ],
-    };
-
-    const parameters = {
-        policyID,
-        requiresCategory,
-    };
-
-    API.write(WRITE_COMMANDS.SET_WORKSPACE_REQUIRES_CATEGORY, parameters, onyxData);
-}
-
-function clearCategoryErrors(policyID: string, categoryName: string) {
-    const category = allPolicyCategories?.[`${ONYXKEYS.COLLECTION.POLICY_CATEGORIES}${policyID}`]?.[categoryName];
-
-    if (!category) {
-        return;
-    }
-
-    Onyx.merge(`${ONYXKEYS.COLLECTION.POLICY_CATEGORIES}${policyID}`, {
-        [category.name]: {
-            errors: null,
-        },
-    });
-}
-
-function deleteWorkspaceCategories(policyID: string, categoryNamesToDelete: string[]) {
-    const policy = allPolicies?.[`${ONYXKEYS.COLLECTION.POLICY}${policyID}`];
-    const policyCategories = allPolicyCategories?.[`${ONYXKEYS.COLLECTION.POLICY_CATEGORIES}${policyID}`] ?? {};
-    const optimisticPolicyCategoriesData = categoryNamesToDelete.reduce<Record<string, Partial<PolicyCategory>>>((acc, categoryName) => {
-        acc[categoryName] = {pendingAction: CONST.RED_BRICK_ROAD_PENDING_ACTION.DELETE};
-        return acc;
-    }, {});
-    const shouldDisableRequiresCategory = !OptionsListUtils.hasEnabledOptions(
-        Object.values(policyCategories).filter((category) => !categoryNamesToDelete.includes(category.name) && category.pendingAction !== CONST.RED_BRICK_ROAD_PENDING_ACTION.DELETE),
-    );
-    const onyxData: OnyxData = {
-        optimisticData: [
-            {
-                onyxMethod: Onyx.METHOD.MERGE,
-                key: `${ONYXKEYS.COLLECTION.POLICY_CATEGORIES}${policyID}`,
-                value: optimisticPolicyCategoriesData,
-            },
-        ],
-        successData: [
-            {
-                onyxMethod: Onyx.METHOD.MERGE,
-                key: `${ONYXKEYS.COLLECTION.POLICY_CATEGORIES}${policyID}`,
-                value: categoryNamesToDelete.reduce<Record<string, null>>((acc, categoryName) => {
-                    acc[categoryName] = null;
-                    return acc;
-                }, {}),
-            },
-        ],
-        failureData: [
-            {
-                onyxMethod: Onyx.METHOD.MERGE,
-                key: `${ONYXKEYS.COLLECTION.POLICY_CATEGORIES}${policyID}`,
-                value: categoryNamesToDelete.reduce<Record<string, Partial<PolicyCategory>>>((acc, categoryName) => {
-                    acc[categoryName] = {
-                        pendingAction: null,
-                        errors: ErrorUtils.getMicroSecondOnyxError('workspace.categories.deleteFailureMessage'),
-                    };
-                    return acc;
-                }, {}),
-            },
-        ],
-    };
-    if (shouldDisableRequiresCategory) {
-        onyxData.optimisticData?.push({
-            onyxMethod: Onyx.METHOD.MERGE,
-            key: `${ONYXKEYS.COLLECTION.POLICY}${policyID}`,
-            value: {
-                requiresCategory: false,
-                pendingFields: {
-                    requiresCategory: CONST.RED_BRICK_ROAD_PENDING_ACTION.UPDATE,
-                },
-            },
-        });
-        onyxData.successData?.push({
-            onyxMethod: Onyx.METHOD.MERGE,
-            key: `${ONYXKEYS.COLLECTION.POLICY}${policyID}`,
-            value: {
-                pendingFields: {
-                    requiresCategory: null,
-                },
-            },
-        });
-        onyxData.failureData?.push({
-            onyxMethod: Onyx.METHOD.MERGE,
-            key: `${ONYXKEYS.COLLECTION.POLICY}${policyID}`,
-            value: {
-                requiresCategory: policy?.requiresCategory,
-                pendingFields: {
-                    requiresCategory: null,
-                },
-            },
-        });
-    }
-
-    const parameters = {
-        policyID,
-        categories: JSON.stringify(categoryNamesToDelete),
-    };
-
-    API.write(WRITE_COMMANDS.DELETE_WORKSPACE_CATEGORIES, parameters, onyxData);
-}
-
-/**
- * Accept user join request to a workspace
- */
-function acceptJoinRequest(reportID: string, reportAction: OnyxEntry<ReportAction>) {
-    const choice = CONST.REPORT.ACTIONABLE_MENTION_JOIN_WORKSPACE_RESOLUTION.ACCEPT;
-    if (!reportAction) {
-        return;
-    }
-
-    const optimisticData: OnyxUpdate[] = [
-        {
-            onyxMethod: Onyx.METHOD.MERGE,
-            key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${reportID}`,
-            value: {
-                [reportAction.reportActionID]: {
-                    originalMessage: {choice},
-                    pendingAction: CONST.RED_BRICK_ROAD_PENDING_ACTION.UPDATE,
-                },
-            },
-        },
-    ];
-
-    const successData: OnyxUpdate[] = [
-        {
-            onyxMethod: Onyx.METHOD.MERGE,
-            key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${reportID}`,
-            value: {
-                [reportAction.reportActionID]: {
-                    originalMessage: {choice},
-                    pendingAction: null,
-                },
-            },
-        },
-    ];
-
-    const failureData: OnyxUpdate[] = [
-        {
-            onyxMethod: Onyx.METHOD.MERGE,
-            key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${reportID}`,
-            value: {
-                [reportAction.reportActionID]: {
-                    originalMessage: {choice: ''},
-                    pendingAction: null,
-                },
-            },
-        },
-    ];
-
-    const parameters = {
-        requests: JSON.stringify({
-            [(reportAction.originalMessage as OriginalMessageJoinPolicyChangeLog['originalMessage']).policyID]: {
-                requests: [{accountID: reportAction?.actorAccountID, adminsRoomMessageReportActionID: reportAction.reportActionID}],
-            },
-        }),
-    };
-
-    API.write(WRITE_COMMANDS.ACCEPT_JOIN_REQUEST, parameters, {optimisticData, failureData, successData});
-}
-
-/**
- * Decline user join request to a workspace
- */
-function declineJoinRequest(reportID: string, reportAction: OnyxEntry<ReportAction>) {
-    if (!reportAction) {
-        return;
-    }
-    const choice = CONST.REPORT.ACTIONABLE_MENTION_JOIN_WORKSPACE_RESOLUTION.DECLINE;
-    const optimisticData: OnyxUpdate[] = [
-        {
-            onyxMethod: Onyx.METHOD.MERGE,
-            key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${reportID}`,
-            value: {
-                [reportAction.reportActionID]: {
-                    originalMessage: {choice},
-                    pendingAction: CONST.RED_BRICK_ROAD_PENDING_ACTION.UPDATE,
-                },
-            },
-        },
-    ];
-
-    const successData: OnyxUpdate[] = [
-        {
-            onyxMethod: Onyx.METHOD.MERGE,
-            key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${reportID}`,
-            value: {
-                [reportAction.reportActionID]: {
-                    originalMessage: {choice},
-                    pendingAction: null,
-                },
-            },
-        },
-    ];
-
-    const failureData: OnyxUpdate[] = [
-        {
-            onyxMethod: Onyx.METHOD.MERGE,
-            key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${reportID}`,
-            value: {
-                [reportAction.reportActionID]: {
-                    originalMessage: {choice: ''},
-                    pendingAction: null,
-                },
-            },
-        },
-    ];
-
-    const parameters = {
-        requests: JSON.stringify({
-            [(reportAction.originalMessage as OriginalMessageJoinPolicyChangeLog['originalMessage']).policyID]: {
-                requests: [{accountID: reportAction?.actorAccountID, adminsRoomMessageReportActionID: reportAction.reportActionID}],
-            },
-        }),
-    };
-
-    API.write(WRITE_COMMANDS.DECLINE_JOIN_REQUEST, parameters, {optimisticData, failureData, successData});
-}
-
-function openPolicyDistanceRatesPage(policyID?: string) {
-    if (!policyID) {
-        return;
-    }
-
-    const params: OpenPolicyDistanceRatesPageParams = {policyID};
-
-    API.read(READ_COMMANDS.OPEN_POLICY_DISTANCE_RATES_PAGE, params);
-}
-
-function navigateWhenEnableFeature(policyID: string, featureRoute: Route) {
-    const isNarrowLayout = getIsNarrowLayout();
-    if (isNarrowLayout) {
-        setTimeout(() => {
-            Navigation.navigate(ROUTES.WORKSPACE_INITIAL.getRoute(policyID));
-        }, 1000);
-        return;
-    }
-
-    /**
-     * The app needs to set a navigation action to the microtask queue, it guarantees to execute Onyx.update first, then the navigation action.
-     * More details - https://github.com/Expensify/App/issues/37785#issuecomment-1989056726.
-     */
-    new Promise<void>((resolve) => {
-        resolve();
-    }).then(() => {
-        requestAnimationFrame(() => {
-            Navigation.navigate(featureRoute);
-        });
-    });
-}
-
-function enablePolicyCategories(policyID: string, enabled: boolean) {
-    const onyxData: OnyxData = {
-        optimisticData: [
-            {
-                onyxMethod: Onyx.METHOD.MERGE,
-                key: `${ONYXKEYS.COLLECTION.POLICY}${policyID}`,
-                value: {
-                    areCategoriesEnabled: enabled,
-                    pendingFields: {
-                        areCategoriesEnabled: CONST.RED_BRICK_ROAD_PENDING_ACTION.UPDATE,
-                    },
-                },
-            },
-        ],
-        successData: [
-            {
-                onyxMethod: Onyx.METHOD.MERGE,
-                key: `${ONYXKEYS.COLLECTION.POLICY}${policyID}`,
-                value: {
-                    pendingFields: {
-                        areCategoriesEnabled: null,
-                    },
-                },
-            },
-        ],
-        failureData: [
-            {
-                onyxMethod: Onyx.METHOD.MERGE,
-                key: `${ONYXKEYS.COLLECTION.POLICY}${policyID}`,
-                value: {
-                    areCategoriesEnabled: !enabled,
-                    pendingFields: {
-                        areCategoriesEnabled: null,
-                    },
-                },
-            },
-        ],
-    };
-
-    const parameters: EnablePolicyCategoriesParams = {policyID, enabled};
-
-    API.write(WRITE_COMMANDS.ENABLE_POLICY_CATEGORIES, parameters, onyxData);
-
-    if (enabled) {
-        navigateWhenEnableFeature(policyID, ROUTES.WORKSPACE_CATEGORIES.getRoute(policyID));
-    }
-}
-
-function enablePolicyConnections(policyID: string, enabled: boolean) {
-    const onyxData: OnyxData = {
-        optimisticData: [
-            {
-                onyxMethod: Onyx.METHOD.MERGE,
-                key: `${ONYXKEYS.COLLECTION.POLICY}${policyID}`,
-                value: {
-                    areConnectionsEnabled: enabled,
-                    pendingFields: {
-                        areConnectionsEnabled: CONST.RED_BRICK_ROAD_PENDING_ACTION.UPDATE,
-                    },
-                },
-            },
-        ],
-        successData: [
-            {
-                onyxMethod: Onyx.METHOD.MERGE,
-                key: `${ONYXKEYS.COLLECTION.POLICY}${policyID}`,
-                value: {
-                    pendingFields: {
-                        areConnectionsEnabled: null,
-                    },
-                },
-            },
-        ],
-        failureData: [
-            {
-                onyxMethod: Onyx.METHOD.MERGE,
-                key: `${ONYXKEYS.COLLECTION.POLICY}${policyID}`,
-                value: {
-                    areConnectionsEnabled: !enabled,
-                    pendingFields: {
-                        areConnectionsEnabled: null,
-                    },
-                },
-            },
-        ],
-    };
-
-    const parameters: EnablePolicyConnectionsParams = {policyID, enabled};
-
-    API.write(WRITE_COMMANDS.ENABLE_POLICY_CONNECTIONS, parameters, onyxData);
-}
-
-function enablePolicyDistanceRates(policyID: string, enabled: boolean) {
-    const onyxData: OnyxData = {
-        optimisticData: [
-            {
-                onyxMethod: Onyx.METHOD.MERGE,
-                key: `${ONYXKEYS.COLLECTION.POLICY}${policyID}`,
-                value: {
-                    areDistanceRatesEnabled: enabled,
-                    pendingFields: {
-                        areDistanceRatesEnabled: CONST.RED_BRICK_ROAD_PENDING_ACTION.UPDATE,
-                    },
-                },
-            },
-        ],
-        successData: [
-            {
-                onyxMethod: Onyx.METHOD.MERGE,
-                key: `${ONYXKEYS.COLLECTION.POLICY}${policyID}`,
-                value: {
-                    pendingFields: {
-                        areDistanceRatesEnabled: null,
-                    },
-                },
-            },
-        ],
-        failureData: [
-            {
-                onyxMethod: Onyx.METHOD.MERGE,
-                key: `${ONYXKEYS.COLLECTION.POLICY}${policyID}`,
-                value: {
-                    areDistanceRatesEnabled: !enabled,
-                    pendingFields: {
-                        areDistanceRatesEnabled: null,
-                    },
-                },
-            },
-        ],
-    };
-
-    const parameters: EnablePolicyDistanceRatesParams = {policyID, enabled};
-
-    API.write(WRITE_COMMANDS.ENABLE_POLICY_DISTANCE_RATES, parameters, onyxData);
-
-    if (enabled) {
-        navigateWhenEnableFeature(policyID, ROUTES.WORKSPACE_DISTANCE_RATES.getRoute(policyID));
-    }
-}
-
-function enablePolicyReportFields(policyID: string, enabled: boolean) {
-    const onyxData: OnyxData = {
-        optimisticData: [
-            {
-                onyxMethod: Onyx.METHOD.MERGE,
-                key: `${ONYXKEYS.COLLECTION.POLICY}${policyID}`,
-                value: {
-                    areReportFieldsEnabled: enabled,
-                    pendingFields: {
-                        areReportFieldsEnabled: CONST.RED_BRICK_ROAD_PENDING_ACTION.UPDATE,
-                    },
-                },
-            },
-        ],
-        successData: [
-            {
-                onyxMethod: Onyx.METHOD.MERGE,
-                key: `${ONYXKEYS.COLLECTION.POLICY}${policyID}`,
-                value: {
-                    pendingFields: {
-                        areReportFieldsEnabled: null,
-                    },
-                },
-            },
-        ],
-        failureData: [
-            {
-                onyxMethod: Onyx.METHOD.MERGE,
-                key: `${ONYXKEYS.COLLECTION.POLICY}${policyID}`,
-                value: {
-                    areReportFieldsEnabled: !enabled,
-                    pendingFields: {
-                        areReportFieldsEnabled: null,
-                    },
-                },
-            },
-        ],
-    };
-
-    const parameters: EnablePolicyReportFieldsParams = {policyID, enabled};
-
-    API.write(WRITE_COMMANDS.ENABLE_POLICY_REPORT_FIELDS, parameters, onyxData);
-}
-
-function enablePolicyTags(policyID: string, enabled: boolean) {
-    const onyxData: OnyxData = {
-        optimisticData: [
-            {
-                onyxMethod: Onyx.METHOD.MERGE,
-                key: `${ONYXKEYS.COLLECTION.POLICY}${policyID}`,
-                value: {
-                    areTagsEnabled: enabled,
-                    pendingFields: {
-                        areTagsEnabled: CONST.RED_BRICK_ROAD_PENDING_ACTION.UPDATE,
-                    },
-                },
-            },
-        ],
-        successData: [
-            {
-                onyxMethod: Onyx.METHOD.MERGE,
-                key: `${ONYXKEYS.COLLECTION.POLICY}${policyID}`,
-                value: {
-                    pendingFields: {
-                        areTagsEnabled: null,
-                    },
-                },
-            },
-        ],
-        failureData: [
-            {
-                onyxMethod: Onyx.METHOD.MERGE,
-                key: `${ONYXKEYS.COLLECTION.POLICY}${policyID}`,
-                value: {
-                    areTagsEnabled: !enabled,
-                    pendingFields: {
-                        areTagsEnabled: null,
-                    },
-                },
-            },
-        ],
-    };
-
-    const parameters: EnablePolicyTagsParams = {policyID, enabled};
-
-    API.write(WRITE_COMMANDS.ENABLE_POLICY_TAGS, parameters, onyxData);
-
-    if (enabled) {
-        navigateWhenEnableFeature(policyID, ROUTES.WORKSPACE_TAGS.getRoute(policyID));
-    }
-}
-
-function enablePolicyTaxes(policyID: string, enabled: boolean) {
-    const defaultTaxRates: TaxRatesWithDefault = CONST.DEFAULT_TAX;
-    const taxRatesData: OnyxData = {
-        optimisticData: [
-            {
-                onyxMethod: Onyx.METHOD.MERGE,
-                key: `${ONYXKEYS.COLLECTION.POLICY}${policyID}`,
-                value: {
-                    taxRates: {
-                        ...defaultTaxRates,
-                        taxes: {
-                            ...Object.keys(defaultTaxRates.taxes).reduce(
-                                (prevTaxesData, taxKey) => ({
-                                    ...prevTaxesData,
-                                    [taxKey]: {
-                                        ...defaultTaxRates.taxes[taxKey],
-                                        pendingAction: CONST.RED_BRICK_ROAD_PENDING_ACTION.ADD,
-                                    },
-                                }),
-                                {},
-                            ),
-                        },
-                    },
-                },
-            },
-        ],
-        successData: [
-            {
-                onyxMethod: Onyx.METHOD.MERGE,
-                key: `${ONYXKEYS.COLLECTION.POLICY}${policyID}`,
-                value: {
-                    taxRates: {
-                        taxes: {
-                            ...Object.keys(defaultTaxRates.taxes).reduce(
-                                (prevTaxesData, taxKey) => ({
-                                    ...prevTaxesData,
-                                    [taxKey]: {pendingAction: null},
-                                }),
-                                {},
-                            ),
-                        },
-                    },
-                },
-            },
-        ],
-        failureData: [
-            {
-                onyxMethod: Onyx.METHOD.MERGE,
-                key: `${ONYXKEYS.COLLECTION.POLICY}${policyID}`,
-                value: {
-                    taxRates: undefined,
-                },
-            },
-        ],
-    };
-    const policy = getPolicy(policyID);
-    const shouldAddDefaultTaxRatesData = (!policy?.taxRates || isEmptyObject(policy.taxRates)) && enabled;
-    const onyxData: OnyxData = {
-        optimisticData: [
-            {
-                onyxMethod: Onyx.METHOD.MERGE,
-                key: `${ONYXKEYS.COLLECTION.POLICY}${policyID}`,
-                value: {
-                    tax: {
-                        trackingEnabled: enabled,
-                    },
-                    pendingFields: {
-                        tax: CONST.RED_BRICK_ROAD_PENDING_ACTION.UPDATE,
-                    },
-                },
-            },
-            ...(shouldAddDefaultTaxRatesData ? taxRatesData.optimisticData ?? [] : []),
-        ],
-        successData: [
-            {
-                onyxMethod: Onyx.METHOD.MERGE,
-                key: `${ONYXKEYS.COLLECTION.POLICY}${policyID}`,
-                value: {
-                    pendingFields: {
-                        tax: null,
-                    },
-                },
-            },
-            ...(shouldAddDefaultTaxRatesData ? taxRatesData.successData ?? [] : []),
-        ],
-        failureData: [
-            {
-                onyxMethod: Onyx.METHOD.MERGE,
-                key: `${ONYXKEYS.COLLECTION.POLICY}${policyID}`,
-                value: {
-                    tax: {
-                        trackingEnabled: !enabled,
-                    },
-                    pendingFields: {
-                        tax: null,
-                    },
-                },
-            },
-            ...(shouldAddDefaultTaxRatesData ? taxRatesData.failureData ?? [] : []),
-        ],
-    };
-
-    const parameters: EnablePolicyTaxesParams = {policyID, enabled};
-    if (shouldAddDefaultTaxRatesData) {
-        parameters.taxFields = JSON.stringify(defaultTaxRates);
-    }
-    API.write(WRITE_COMMANDS.ENABLE_POLICY_TAXES, parameters, onyxData);
-
-    if (enabled) {
-        navigateWhenEnableFeature(policyID, ROUTES.WORKSPACE_TAXES.getRoute(policyID));
-    }
-}
-
-function enablePolicyWorkflows(policyID: string, enabled: boolean) {
-    const policy = getPolicy(policyID);
-    const onyxData: OnyxData = {
-        optimisticData: [
-            {
-                onyxMethod: Onyx.METHOD.MERGE,
-                key: `${ONYXKEYS.COLLECTION.POLICY}${policyID}`,
-                value: {
-                    areWorkflowsEnabled: enabled,
-                    ...(!enabled
-                        ? {
-                              approvalMode: CONST.POLICY.APPROVAL_MODE.OPTIONAL,
-                              autoReporting: false,
-                              harvesting: {
-                                  enabled: false,
-                              },
-                              reimbursementChoice: CONST.POLICY.REIMBURSEMENT_CHOICES.REIMBURSEMENT_NO,
-                          }
-                        : {}),
-                    pendingFields: {
-                        areWorkflowsEnabled: CONST.RED_BRICK_ROAD_PENDING_ACTION.UPDATE,
-                        ...(!enabled
-                            ? {
-                                  approvalMode: CONST.RED_BRICK_ROAD_PENDING_ACTION.UPDATE,
-                                  autoReporting: CONST.RED_BRICK_ROAD_PENDING_ACTION.UPDATE,
-                                  harvesting: CONST.RED_BRICK_ROAD_PENDING_ACTION.UPDATE,
-                                  reimbursementChoice: CONST.RED_BRICK_ROAD_PENDING_ACTION.UPDATE,
-                              }
-                            : {}),
-                    },
-                },
-            },
-        ],
-        successData: [
-            {
-                onyxMethod: Onyx.METHOD.MERGE,
-                key: `${ONYXKEYS.COLLECTION.POLICY}${policyID}`,
-                value: {
-                    pendingFields: {
-                        areWorkflowsEnabled: null,
-                        ...(!enabled
-                            ? {
-                                  approvalMode: null,
-                                  autoReporting: null,
-                                  harvesting: null,
-                                  reimbursementChoice: null,
-                              }
-                            : {}),
-                    },
-                },
-            },
-        ],
-        failureData: [
-            {
-                onyxMethod: Onyx.METHOD.MERGE,
-                key: `${ONYXKEYS.COLLECTION.POLICY}${policyID}`,
-                value: {
-                    areWorkflowsEnabled: !enabled,
-                    ...(!enabled
-                        ? {
-                              approvalMode: policy.approvalMode,
-                              autoReporting: policy.autoReporting,
-                              harvesting: policy.harvesting,
-                              reimbursementChoice: policy.reimbursementChoice,
-                          }
-                        : {}),
-                    pendingFields: {
-                        areWorkflowsEnabled: null,
-                        ...(!enabled
-                            ? {
-                                  approvalMode: null,
-                                  autoReporting: null,
-                                  harvesting: null,
-                                  reimbursementChoice: null,
-                              }
-                            : {}),
-                    },
-                },
-            },
-        ],
-    };
-
-    const parameters: EnablePolicyWorkflowsParams = {policyID, enabled};
-
-    API.write(WRITE_COMMANDS.ENABLE_POLICY_WORKFLOWS, parameters, onyxData);
-
-    if (enabled) {
-        navigateWhenEnableFeature(policyID, ROUTES.WORKSPACE_WORKFLOWS.getRoute(policyID));
-    }
-}
-
-function renamePolicyTaglist(policyID: string, policyTagListName: {oldName: string; newName: string}, policyTags: OnyxEntry<PolicyTagList>) {
-    const newName = policyTagListName.newName;
-    const oldName = policyTagListName.oldName;
-    const oldPolicyTags = policyTags?.[oldName] ?? {};
-    const onyxData: OnyxData = {
-        optimisticData: [
-            {
-                onyxMethod: Onyx.METHOD.MERGE,
-                key: `${ONYXKEYS.COLLECTION.POLICY_TAGS}${policyID}`,
-                value: {
-                    [newName]: {...oldPolicyTags, name: newName, pendingAction: CONST.RED_BRICK_ROAD_PENDING_ACTION.ADD},
-                    [oldName]: null,
-                },
-            },
-        ],
-        successData: [
-            {
-                onyxMethod: Onyx.METHOD.MERGE,
-                key: `${ONYXKEYS.COLLECTION.POLICY_TAGS}${policyID}`,
-                value: {
-                    [newName]: {pendingAction: null},
-                    [oldName]: null,
-                },
-            },
-        ],
-        failureData: [
-            {
-                onyxMethod: Onyx.METHOD.MERGE,
-                key: `${ONYXKEYS.COLLECTION.POLICY_TAGS}${policyID}`,
-                value: {
-                    errors: {
-                        [oldName]: oldName,
-                        [newName]: ErrorUtils.getMicroSecondOnyxError('workspace.tags.genericFailureMessage'),
-                    },
-                    [newName]: null,
-                    [oldName]: oldPolicyTags,
-                },
-            },
-        ],
-    };
-    const parameters = {
-        policyID,
-        oldName,
-        newName,
-    };
-
-    API.write(WRITE_COMMANDS.RENAME_POLICY_TAG_LIST, parameters, onyxData);
-}
-
-function setPolicyRequiresTag(policyID: string, requiresTag: boolean) {
-    const onyxData: OnyxData = {
-        optimisticData: [
-            {
-                onyxMethod: Onyx.METHOD.MERGE,
-                key: `${ONYXKEYS.COLLECTION.POLICY}${policyID}`,
-                value: {
-                    requiresTag,
-                    errors: {requiresTag: null},
-                    pendingFields: {
-                        requiresTag: CONST.RED_BRICK_ROAD_PENDING_ACTION.UPDATE,
-                    },
-                },
-            },
-        ],
-        successData: [
-            {
-                onyxMethod: Onyx.METHOD.MERGE,
-                key: `${ONYXKEYS.COLLECTION.POLICY}${policyID}`,
-                value: {
-                    errors: {
-                        requiresTag: null,
-                    },
-                    pendingFields: {
-                        requiresTag: null,
-                    },
-                },
-            },
-        ],
-        failureData: [
-            {
-                onyxMethod: Onyx.METHOD.MERGE,
-                key: `${ONYXKEYS.COLLECTION.POLICY}${policyID}`,
-                value: {
-                    requiresTag: !requiresTag,
-                    errors: ErrorUtils.getMicroSecondOnyxError('workspace.tags.genericFailureMessage'),
-                    pendingFields: {
-                        requiresTag: null,
-                    },
-                },
-            },
-        ],
-    };
-
-    const parameters = {
-        policyID,
-        requiresTag,
-    };
-
-    API.write(WRITE_COMMANDS.SET_POLICY_REQUIRES_TAG, parameters, onyxData);
-}
-
-function openPolicyMoreFeaturesPage(policyID: string) {
-    const params: OpenPolicyMoreFeaturesPageParams = {policyID};
-
-    API.read(READ_COMMANDS.OPEN_POLICY_MORE_FEATURES_PAGE, params);
-}
-
-function createPolicyDistanceRate(policyID: string, customUnitID: string, customUnitRate: Rate) {
-    const optimisticData: OnyxUpdate[] = [
-        {
-            onyxMethod: Onyx.METHOD.MERGE,
-            key: `${ONYXKEYS.COLLECTION.POLICY}${policyID}`,
-            value: {
-                customUnits: {
-                    [customUnitID]: {
-                        rates: {
-                            [customUnitRate.customUnitRateID ?? '']: {
-                                ...customUnitRate,
-                                pendingAction: CONST.RED_BRICK_ROAD_PENDING_ACTION.ADD,
-                            },
-                        },
-                    },
-                },
-            },
-        },
-    ];
-
-    const successData: OnyxUpdate[] = [
-        {
-            onyxMethod: Onyx.METHOD.MERGE,
-            key: `${ONYXKEYS.COLLECTION.POLICY}${policyID}`,
-            value: {
-                customUnits: {
-                    [customUnitID]: {
-                        rates: {
-                            [customUnitRate.customUnitRateID ?? '']: {
-                                pendingAction: null,
-                            },
-                        },
-                    },
-                },
-            },
-        },
-    ];
-
-    const failureData: OnyxUpdate[] = [
-        {
-            onyxMethod: Onyx.METHOD.MERGE,
-            key: `${ONYXKEYS.COLLECTION.POLICY}${policyID}`,
-            value: {
-                customUnits: {
-                    [customUnitID]: {
-                        rates: {
-                            [customUnitRate.customUnitRateID ?? '']: {
-                                errors: ErrorUtils.getMicroSecondOnyxError('common.genericErrorMessage'),
-                            },
-                        },
-                    },
-                },
-            },
-        },
-    ];
-
-    const params: CreatePolicyDistanceRateParams = {
-        policyID,
-        customUnitID,
-        customUnitRate: JSON.stringify(customUnitRate),
-    };
-
-    API.write(WRITE_COMMANDS.CREATE_POLICY_DISTANCE_RATE, params, {optimisticData, successData, failureData});
-}
-
-function clearCreateDistanceRateItemAndError(policyID: string, customUnitID: string, customUnitRateIDToClear: string) {
-    Onyx.merge(`${ONYXKEYS.COLLECTION.POLICY}${policyID}`, {
-        customUnits: {
-            [customUnitID]: {
-                rates: {
-                    [customUnitRateIDToClear]: null,
-                },
-            },
-        },
-    });
-}
-
-function clearPolicyDistanceRatesErrorFields(policyID: string, customUnitID: string, updatedErrorFields: ErrorFields) {
-    Onyx.merge(`${ONYXKEYS.COLLECTION.POLICY}${policyID}`, {
-        customUnits: {
-            [customUnitID]: {
-                errorFields: updatedErrorFields,
-            },
-        },
-    });
-}
-
-function clearDeleteDistanceRateError(policyID: string, customUnitID: string, rateID: string) {
-    Onyx.merge(`${ONYXKEYS.COLLECTION.POLICY}${policyID}`, {
-        customUnits: {
-            [customUnitID]: {
-                rates: {
-                    [rateID]: {
-                        errors: null,
-                    },
-                },
-            },
-        },
-    });
-}
-
-function clearPolicyDistanceRateErrorFields(policyID: string, customUnitID: string, rateID: string, updatedErrorFields: ErrorFields) {
-    Onyx.merge(`${ONYXKEYS.COLLECTION.POLICY}${policyID}`, {
-        customUnits: {
-            [customUnitID]: {
-                rates: {
-                    [rateID]: {
-                        errorFields: updatedErrorFields,
-                    },
-                },
-            },
-        },
-    });
-}
-
-/**
- * Takes removes pendingFields and errorFields from a customUnit
- */
-function removePendingFieldsFromCustomUnit(customUnit: CustomUnit): CustomUnit {
-    const cleanedCustomUnit = {...customUnit};
-
-    delete cleanedCustomUnit.pendingFields;
-    delete cleanedCustomUnit.errorFields;
-
-    return cleanedCustomUnit;
-}
-
-function setPolicyDistanceRatesUnit(policyID: string, currentCustomUnit: CustomUnit, newCustomUnit: CustomUnit) {
-    const optimisticData: OnyxUpdate[] = [
-        {
-            onyxMethod: Onyx.METHOD.MERGE,
-            key: `${ONYXKEYS.COLLECTION.POLICY}${policyID}`,
-            value: {
-                customUnits: {
-                    [newCustomUnit.customUnitID]: {
-                        ...newCustomUnit,
-                        pendingFields: {attributes: CONST.RED_BRICK_ROAD_PENDING_ACTION.UPDATE},
-                    },
-                },
-            },
-        },
-    ];
-
-    const successData: OnyxUpdate[] = [
-        {
-            onyxMethod: Onyx.METHOD.MERGE,
-            key: `${ONYXKEYS.COLLECTION.POLICY}${policyID}`,
-            value: {
-                customUnits: {
-                    [newCustomUnit.customUnitID]: {
-                        pendingFields: {attributes: null},
-                    },
-                },
-            },
-        },
-    ];
-
-    const failureData: OnyxUpdate[] = [
-        {
-            onyxMethod: Onyx.METHOD.MERGE,
-            key: `${ONYXKEYS.COLLECTION.POLICY}${policyID}`,
-            value: {
-                customUnits: {
-                    [currentCustomUnit.customUnitID]: {
-                        ...currentCustomUnit,
-                        errorFields: {attributes: ErrorUtils.getMicroSecondOnyxError('common.genericErrorMessage')},
-                        pendingFields: {attributes: null},
-                    },
-                },
-            },
-        },
-    ];
-
-    const params: SetPolicyDistanceRatesUnitParams = {
-        policyID,
-        customUnit: JSON.stringify(removePendingFieldsFromCustomUnit(newCustomUnit)),
-    };
-
-    API.write(WRITE_COMMANDS.SET_POLICY_DISTANCE_RATES_UNIT, params, {optimisticData, successData, failureData});
-}
-
-function setPolicyDistanceRatesDefaultCategory(policyID: string, currentCustomUnit: CustomUnit, newCustomUnit: CustomUnit) {
-    const optimisticData: OnyxUpdate[] = [
-        {
-            onyxMethod: Onyx.METHOD.MERGE,
-            key: `${ONYXKEYS.COLLECTION.POLICY}${policyID}`,
-            value: {
-                customUnits: {
-                    [newCustomUnit.customUnitID]: {
-                        ...newCustomUnit,
-                        pendingFields: {defaultCategory: CONST.RED_BRICK_ROAD_PENDING_ACTION.UPDATE},
-                    },
-                },
-            },
-        },
-    ];
-
-    const successData: OnyxUpdate[] = [
-        {
-            onyxMethod: Onyx.METHOD.MERGE,
-            key: `${ONYXKEYS.COLLECTION.POLICY}${policyID}`,
-            value: {
-                customUnits: {
-                    [newCustomUnit.customUnitID]: {
-                        pendingFields: {defaultCategory: null},
-                    },
-                },
-            },
-        },
-    ];
-
-    const failureData: OnyxUpdate[] = [
-        {
-            onyxMethod: Onyx.METHOD.MERGE,
-            key: `${ONYXKEYS.COLLECTION.POLICY}${policyID}`,
-            value: {
-                customUnits: {
-                    [currentCustomUnit.customUnitID]: {
-                        ...currentCustomUnit,
-                        errorFields: {defaultCategory: ErrorUtils.getMicroSecondOnyxError('common.genericErrorMessage')},
-                        pendingFields: {defaultCategory: null},
-                    },
-                },
-            },
-        },
-    ];
-
-    const params: SetPolicyDistanceRatesDefaultCategoryParams = {
-        policyID,
-        customUnit: JSON.stringify(removePendingFieldsFromCustomUnit(newCustomUnit)),
-    };
-
-    API.write(WRITE_COMMANDS.SET_POLICY_DISTANCE_RATES_DEFAULT_CATEGORY, params, {optimisticData, successData, failureData});
-}
-
-/**
- * Takes array of customUnitRates and removes pendingFields and errorFields from each rate - we don't want to send those via API
- */
-function prepareCustomUnitRatesArray(customUnitRates: Rate[]): Rate[] {
-    const customUnitRateArray: Rate[] = [];
-    customUnitRates.forEach((rate) => {
-        const cleanedRate = {...rate};
-        delete cleanedRate.pendingFields;
-        delete cleanedRate.errorFields;
-        customUnitRateArray.push(cleanedRate);
-    });
-
-    return customUnitRateArray;
-}
-
-function updatePolicyDistanceRateValue(policyID: string, customUnit: CustomUnit, customUnitRates: Rate[]) {
-    const currentRates = customUnit.rates;
-    const optimisticRates: Record<string, Rate> = {};
-    const successRates: Record<string, Rate> = {};
-    const failureRates: Record<string, Rate> = {};
-    const rateIDs = customUnitRates.map((rate) => rate.customUnitRateID);
-
-    for (const rateID of Object.keys(customUnit.rates)) {
-        if (rateIDs.includes(rateID)) {
-            const foundRate = customUnitRates.find((rate) => rate.customUnitRateID === rateID);
-            optimisticRates[rateID] = {...foundRate, pendingFields: {rate: CONST.RED_BRICK_ROAD_PENDING_ACTION.UPDATE}};
-            successRates[rateID] = {...foundRate, pendingFields: {rate: null}};
-            failureRates[rateID] = {
-                ...currentRates[rateID],
-                pendingFields: {rate: null},
-                errorFields: {rate: ErrorUtils.getMicroSecondOnyxError('common.genericErrorMessage')},
-            };
-        }
-    }
-
-    const optimisticData: OnyxUpdate[] = [
-        {
-            onyxMethod: Onyx.METHOD.MERGE,
-            key: `${ONYXKEYS.COLLECTION.POLICY}${policyID}`,
-            value: {
-                customUnits: {
-                    [customUnit.customUnitID]: {
-                        rates: optimisticRates,
-                    },
-                },
-            },
-        },
-    ];
-
-    const successData: OnyxUpdate[] = [
-        {
-            onyxMethod: Onyx.METHOD.MERGE,
-            key: `${ONYXKEYS.COLLECTION.POLICY}${policyID}`,
-            value: {
-                customUnits: {
-                    [customUnit.customUnitID]: {
-                        rates: successRates,
-                    },
-                },
-            },
-        },
-    ];
-
-    const failureData: OnyxUpdate[] = [
-        {
-            onyxMethod: Onyx.METHOD.MERGE,
-            key: `${ONYXKEYS.COLLECTION.POLICY}${policyID}`,
-            value: {
-                customUnits: {
-                    [customUnit.customUnitID]: {
-                        rates: failureRates,
-                    },
-                },
-            },
-        },
-    ];
-
-    const params: UpdatePolicyDistanceRateValueParams = {
-        policyID,
-        customUnitID: customUnit.customUnitID,
-        customUnitRateArray: JSON.stringify(prepareCustomUnitRatesArray(customUnitRates)),
-    };
-
-    API.write(WRITE_COMMANDS.UPDATE_POLICY_DISTANCE_RATE_VALUE, params, {optimisticData, successData, failureData});
-}
-
-function setPolicyDistanceRatesEnabled(policyID: string, customUnit: CustomUnit, customUnitRates: Rate[]) {
-    const currentRates = customUnit.rates;
-    const optimisticRates: Record<string, Rate> = {};
-    const successRates: Record<string, Rate> = {};
-    const failureRates: Record<string, Rate> = {};
-    const rateIDs = customUnitRates.map((rate) => rate.customUnitRateID);
-
-    for (const rateID of Object.keys(currentRates)) {
-        if (rateIDs.includes(rateID)) {
-            const foundRate = customUnitRates.find((rate) => rate.customUnitRateID === rateID);
-            optimisticRates[rateID] = {...foundRate, pendingFields: {enabled: CONST.RED_BRICK_ROAD_PENDING_ACTION.UPDATE}};
-            successRates[rateID] = {...foundRate, pendingFields: {enabled: null}};
-            failureRates[rateID] = {
-                ...currentRates[rateID],
-                pendingFields: {enabled: null},
-                errorFields: {enabled: ErrorUtils.getMicroSecondOnyxError('common.genericErrorMessage')},
-            };
-        }
-    }
-
-    const optimisticData: OnyxUpdate[] = [
-        {
-            onyxMethod: Onyx.METHOD.MERGE,
-            key: `${ONYXKEYS.COLLECTION.POLICY}${policyID}`,
-            value: {
-                customUnits: {
-                    [customUnit.customUnitID]: {
-                        rates: optimisticRates,
-                    },
-                },
-            },
-        },
-    ];
-
-    const successData: OnyxUpdate[] = [
-        {
-            onyxMethod: Onyx.METHOD.MERGE,
-            key: `${ONYXKEYS.COLLECTION.POLICY}${policyID}`,
-            value: {
-                customUnits: {
-                    [customUnit.customUnitID]: {
-                        rates: successRates,
-                    },
-                },
-            },
-        },
-    ];
-
-    const failureData: OnyxUpdate[] = [
-        {
-            onyxMethod: Onyx.METHOD.MERGE,
-            key: `${ONYXKEYS.COLLECTION.POLICY}${policyID}`,
-            value: {
-                customUnits: {
-                    [customUnit.customUnitID]: {
-                        rates: failureRates,
-                    },
-                },
-            },
-        },
-    ];
-
-    const params: SetPolicyDistanceRatesEnabledParams = {
-        policyID,
-        customUnitID: customUnit.customUnitID,
-        customUnitRateArray: JSON.stringify(prepareCustomUnitRatesArray(customUnitRates)),
-    };
-
-    API.write(WRITE_COMMANDS.SET_POLICY_DISTANCE_RATES_ENABLED, params, {optimisticData, successData, failureData});
-}
-
-function deletePolicyDistanceRates(policyID: string, customUnit: CustomUnit, rateIDsToDelete: string[]) {
-    const currentRates = customUnit.rates;
-    const optimisticRates: Record<string, Rate> = {};
-    const successRates: Record<string, Rate> = {};
-    const failureRates: Record<string, Rate> = {};
-
-    for (const rateID of Object.keys(currentRates)) {
-        if (rateIDsToDelete.includes(rateID)) {
-            optimisticRates[rateID] = {
-                ...currentRates[rateID],
-                pendingAction: CONST.RED_BRICK_ROAD_PENDING_ACTION.DELETE,
-            };
-            failureRates[rateID] = {
-                ...currentRates[rateID],
-                pendingAction: null,
-                errors: ErrorUtils.getMicroSecondOnyxError('common.genericErrorMessage'),
-            };
-        } else {
-            optimisticRates[rateID] = currentRates[rateID];
-            successRates[rateID] = currentRates[rateID];
-        }
-    }
-
-    const optimisticData: OnyxUpdate[] = [
-        {
-            onyxMethod: Onyx.METHOD.MERGE,
-            key: `${ONYXKEYS.COLLECTION.POLICY}${policyID}`,
-            value: {
-                customUnits: {
-                    [customUnit.customUnitID]: {
-                        rates: optimisticRates,
-                    },
-                },
-            },
-        },
-    ];
-
-    const successData: OnyxUpdate[] = [
-        {
-            onyxMethod: Onyx.METHOD.MERGE,
-            key: `${ONYXKEYS.COLLECTION.POLICY}${policyID}`,
-            value: {
-                customUnits: {
-                    [customUnit.customUnitID]: {
-                        rates: successRates,
-                    },
-                },
-            },
-        },
-    ];
-
-    const failureData: OnyxUpdate[] = [
-        {
-            onyxMethod: Onyx.METHOD.MERGE,
-            key: `${ONYXKEYS.COLLECTION.POLICY}${policyID}`,
-            value: {
-                customUnits: {
-                    [customUnit.customUnitID]: {
-                        rates: failureRates,
-                    },
-                },
-            },
-        },
-    ];
-
-    const params: DeletePolicyDistanceRatesParams = {
-        policyID,
-        customUnitID: customUnit.customUnitID,
-        customUnitRateID: rateIDsToDelete,
-    };
-
-    API.write(WRITE_COMMANDS.DELETE_POLICY_DISTANCE_RATES, params, {optimisticData, successData, failureData});
-}
-
-function setPolicyCustomTaxName(policyID: string, customTaxName: string) {
-    const policy = getPolicy(policyID);
-    const originalCustomTaxName = policy?.taxRates?.name;
-    const onyxData: OnyxData = {
-        optimisticData: [
-            {
-                onyxMethod: Onyx.METHOD.MERGE,
-                key: `${ONYXKEYS.COLLECTION.POLICY}${policyID}`,
-                value: {
-                    taxRates: {
-                        name: customTaxName,
-                        pendingFields: {name: CONST.RED_BRICK_ROAD_PENDING_ACTION.UPDATE},
-                        errorFields: null,
-                    },
-                },
-            },
-        ],
-        successData: [
-            {
-                onyxMethod: Onyx.METHOD.MERGE,
-                key: `${ONYXKEYS.COLLECTION.POLICY}${policyID}`,
-                value: {
-                    taxRates: {
-                        pendingFields: {name: null},
-                        errorFields: null,
-                    },
-                },
-            },
-        ],
-        failureData: [
-            {
-                onyxMethod: Onyx.METHOD.MERGE,
-                key: `${ONYXKEYS.COLLECTION.POLICY}${policyID}`,
-                value: {
-                    taxRates: {
-                        name: originalCustomTaxName,
-                        pendingFields: {name: null},
-                        errorFields: {name: ErrorUtils.getMicroSecondOnyxError('common.genericErrorMessage')},
-                    },
-                },
-            },
-        ],
-    };
-
-    const parameters = {
-        policyID,
-        customTaxName,
-    };
-
-    API.write(WRITE_COMMANDS.SET_POLICY_CUSTOM_TAX_NAME, parameters, onyxData);
-}
-
-function setWorkspaceCurrencyDefault(policyID: string, taxCode: string) {
-    const policy = getPolicy(policyID);
-    const originalDefaultExternalID = policy?.taxRates?.defaultExternalID;
-    const onyxData: OnyxData = {
-        optimisticData: [
-            {
-                onyxMethod: Onyx.METHOD.MERGE,
-                key: `${ONYXKEYS.COLLECTION.POLICY}${policyID}`,
-                value: {
-                    taxRates: {
-                        defaultExternalID: taxCode,
-                        pendingFields: {defaultExternalID: CONST.RED_BRICK_ROAD_PENDING_ACTION.UPDATE},
-                        errorFields: null,
-                    },
-                },
-            },
-        ],
-        successData: [
-            {
-                onyxMethod: Onyx.METHOD.MERGE,
-                key: `${ONYXKEYS.COLLECTION.POLICY}${policyID}`,
-                value: {
-                    taxRates: {
-                        pendingFields: {defaultExternalID: null},
-                        errorFields: null,
-                    },
-                },
-            },
-        ],
-        failureData: [
-            {
-                onyxMethod: Onyx.METHOD.MERGE,
-                key: `${ONYXKEYS.COLLECTION.POLICY}${policyID}`,
-                value: {
-                    taxRates: {
-                        defaultExternalID: originalDefaultExternalID,
-                        pendingFields: {defaultExternalID: null},
-                        errorFields: {defaultExternalID: ErrorUtils.getMicroSecondOnyxError('common.genericErrorMessage')},
-                    },
-                },
-            },
-        ],
-    };
-
-    const parameters = {
-        policyID,
-        taxCode,
-    };
-
-    API.write(WRITE_COMMANDS.SET_POLICY_TAXES_CURRENCY_DEFAULT, parameters, onyxData);
-}
-
-function setForeignCurrencyDefault(policyID: string, taxCode: string) {
-    const policy = getPolicy(policyID);
-    const originalDefaultForeignCurrencyID = policy?.taxRates?.foreignTaxDefault;
-    const onyxData: OnyxData = {
-        optimisticData: [
-            {
-                onyxMethod: Onyx.METHOD.MERGE,
-                key: `${ONYXKEYS.COLLECTION.POLICY}${policyID}`,
-                value: {
-                    taxRates: {
-                        foreignTaxDefault: taxCode,
-                        pendingFields: {foreignTaxDefault: CONST.RED_BRICK_ROAD_PENDING_ACTION.UPDATE},
-                        errorFields: null,
-                    },
-                },
-            },
-        ],
-        successData: [
-            {
-                onyxMethod: Onyx.METHOD.MERGE,
-                key: `${ONYXKEYS.COLLECTION.POLICY}${policyID}`,
-                value: {
-                    taxRates: {
-                        pendingFields: {foreignTaxDefault: null},
-                        errorFields: null,
-                    },
-                },
-            },
-        ],
-        failureData: [
-            {
-                onyxMethod: Onyx.METHOD.MERGE,
-                key: `${ONYXKEYS.COLLECTION.POLICY}${policyID}`,
-                value: {
-                    taxRates: {
-                        foreignTaxDefault: originalDefaultForeignCurrencyID,
-                        pendingFields: {foreignTaxDefault: null},
-                        errorFields: {foreignTaxDefault: ErrorUtils.getMicroSecondOnyxError('common.genericErrorMessage')},
-                    },
-                },
-            },
-        ],
-    };
-
-    const parameters = {
-        policyID,
-        taxCode,
-    };
-
-    API.write(WRITE_COMMANDS.SET_POLICY_TAXES_FOREIGN_CURRENCY_DEFAULT, parameters, onyxData);
-}
-
-export {
-    removeMembers,
-    leaveWorkspace,
-    updateWorkspaceMembersRole,
-    requestWorkspaceOwnerChange,
-    clearWorkspaceOwnerChangeFlow,
-    addBillingCardAndRequestPolicyOwnerChange,
-    addMembersToWorkspace,
-    isAdminOfFreePolicy,
-    hasActiveChatEnabledPolicies,
-    setWorkspaceErrors,
-    clearCustomUnitErrors,
-    hideWorkspaceAlertMessage,
-    deleteWorkspace,
-    updateAddress,
-    updateWorkspaceCustomUnitAndRate,
-    updateLastAccessedWorkspace,
-    clearDeleteMemberError,
-    clearAddMemberError,
-    clearDeleteWorkspaceError,
-    openWorkspaceReimburseView,
-    setPolicyIDForReimburseView,
-    clearOnyxDataForReimburseView,
-    setRateForReimburseView,
-    setUnitForReimburseView,
-    generateDefaultWorkspaceName,
-    updateGeneralSettings,
-    clearWorkspaceGeneralSettingsErrors,
-    deleteWorkspaceAvatar,
-    updateWorkspaceAvatar,
-    clearAvatarErrors,
-    generatePolicyID,
-    createWorkspace,
-    openWorkspaceMembersPage,
-    openPolicyCategoriesPage,
-    openPolicyTagsPage,
-    openPolicyTaxesPage,
-    openWorkspaceInvitePage,
-    openWorkspace,
-    removeWorkspace,
-    createWorkspaceFromIOUPayment,
-    setWorkspaceInviteMembersDraft,
-    clearErrors,
-    dismissAddedWithPrimaryLoginMessages,
-    openDraftWorkspaceRequest,
-    buildOptimisticPolicyRecentlyUsedCategories,
-    buildOptimisticPolicyRecentlyUsedTags,
-    createDraftInitialWorkspace,
-    setWorkspaceInviteMessageDraft,
-    setWorkspaceAutoReporting,
-    setWorkspaceApprovalMode,
-    setWorkspaceAutoReportingFrequency,
-    setWorkspaceAutoReportingMonthlyOffset,
-    updateWorkspaceDescription,
-    setWorkspaceCategoryEnabled,
-    setWorkspaceRequiresCategory,
-    inviteMemberToWorkspace,
-    acceptJoinRequest,
-    declineJoinRequest,
-    createPolicyCategory,
-    renamePolicyCategory,
-    clearCategoryErrors,
-    setWorkspacePayer,
-    setWorkspaceReimbursement,
-    openPolicyWorkflowsPage,
-    setPolicyRequiresTag,
-    renamePolicyTaglist,
-    enablePolicyCategories,
-    enablePolicyConnections,
-    enablePolicyDistanceRates,
-    enablePolicyReportFields,
-    enablePolicyTags,
-    enablePolicyTaxes,
-    enablePolicyWorkflows,
-    openPolicyDistanceRatesPage,
-    openPolicyMoreFeaturesPage,
-    generateCustomUnitID,
-    createPolicyDistanceRate,
-    clearCreateDistanceRateItemAndError,
-    clearDeleteDistanceRateError,
-    setPolicyDistanceRatesUnit,
-    setPolicyDistanceRatesDefaultCategory,
-    createPolicyTag,
-    renamePolicyTag,
-    clearPolicyTagErrors,
-    clearQBOErrorField,
-    clearXeroErrorField,
-    clearWorkspaceReimbursementErrors,
-    deleteWorkspaceCategories,
-    deletePolicyTags,
-    setWorkspaceTagEnabled,
-    setWorkspaceCurrencyDefault,
-    setForeignCurrencyDefault,
-    setPolicyCustomTaxName,
-    clearPolicyErrorField,
-    isCurrencySupportedForDirectReimbursement,
-    clearPolicyDistanceRatesErrorFields,
-    clearPolicyDistanceRateErrorFields,
-    updatePolicyDistanceRateValue,
-    setPolicyDistanceRatesEnabled,
-    deletePolicyDistanceRates,
-    getPrimaryPolicy,
-};
-
-export type {NewCustomUnit};
diff --git a/src/libs/actions/Policy/Category.ts b/src/libs/actions/Policy/Category.ts
new file mode 100644
index 000000000000..a1828c92216d
--- /dev/null
+++ b/src/libs/actions/Policy/Category.ts
@@ -0,0 +1,766 @@
+import lodashUnion from 'lodash/union';
+import type {NullishDeep, OnyxCollection, OnyxUpdate} from 'react-native-onyx';
+import Onyx from 'react-native-onyx';
+import * as API from '@libs/API';
+import type {EnablePolicyCategoriesParams, OpenPolicyCategoriesPageParams, SetPolicyDistanceRatesDefaultCategoryParams, UpdatePolicyCategoryGLCodeParams} from '@libs/API/parameters';
+import {READ_COMMANDS, WRITE_COMMANDS} from '@libs/API/types';
+import * as ErrorUtils from '@libs/ErrorUtils';
+import getIsNarrowLayout from '@libs/getIsNarrowLayout';
+import Log from '@libs/Log';
+import * as OptionsListUtils from '@libs/OptionsListUtils';
+import {navigateWhenEnableFeature, removePendingFieldsFromCustomUnit} from '@libs/PolicyUtils';
+import * as ReportUtils from '@libs/ReportUtils';
+import CONST from '@src/CONST';
+import ONYXKEYS from '@src/ONYXKEYS';
+import type {Policy, PolicyCategories, PolicyCategory, RecentlyUsedCategories, Report} from '@src/types/onyx';
+import type {CustomUnit} from '@src/types/onyx/Policy';
+import type {OnyxData} from '@src/types/onyx/Request';
+
+const allPolicies: OnyxCollection<Policy> = {};
+Onyx.connect({
+    key: ONYXKEYS.COLLECTION.POLICY,
+    callback: (val, key) => {
+        if (!key) {
+            return;
+        }
+        if (val === null || val === undefined) {
+            // If we are deleting a policy, we have to check every report linked to that policy
+            // and unset the draft indicator (pencil icon) alongside removing any draft comments. Clearing these values will keep the newly archived chats from being displayed in the LHN.
+            // More info: https://github.com/Expensify/App/issues/14260
+            const policyID = key.replace(ONYXKEYS.COLLECTION.POLICY, '');
+            const policyReports = ReportUtils.getAllPolicyReports(policyID);
+            const cleanUpMergeQueries: Record<`${typeof ONYXKEYS.COLLECTION.REPORT}${string}`, NullishDeep<Report>> = {};
+            const cleanUpSetQueries: Record<`${typeof ONYXKEYS.COLLECTION.REPORT_DRAFT_COMMENT}${string}` | `${typeof ONYXKEYS.COLLECTION.REPORT_ACTIONS_DRAFTS}${string}`, null> = {};
+            policyReports.forEach((policyReport) => {
+                if (!policyReport) {
+                    return;
+                }
+                const {reportID} = policyReport;
+                cleanUpSetQueries[`${ONYXKEYS.COLLECTION.REPORT_DRAFT_COMMENT}${reportID}`] = null;
+                cleanUpSetQueries[`${ONYXKEYS.COLLECTION.REPORT_ACTIONS_DRAFTS}${reportID}`] = null;
+            });
+            Onyx.mergeCollection(ONYXKEYS.COLLECTION.REPORT, cleanUpMergeQueries);
+            Onyx.multiSet(cleanUpSetQueries);
+            delete allPolicies[key];
+            return;
+        }
+
+        allPolicies[key] = val;
+    },
+});
+
+let allRecentlyUsedCategories: OnyxCollection<RecentlyUsedCategories> = {};
+Onyx.connect({
+    key: ONYXKEYS.COLLECTION.POLICY_RECENTLY_USED_CATEGORIES,
+    waitForCollectionCallback: true,
+    callback: (val) => (allRecentlyUsedCategories = val),
+});
+
+let allPolicyCategories: OnyxCollection<PolicyCategories> = {};
+Onyx.connect({
+    key: ONYXKEYS.COLLECTION.POLICY_CATEGORIES,
+    waitForCollectionCallback: true,
+    callback: (val) => (allPolicyCategories = val),
+});
+
+function buildOptimisticPolicyCategories(policyID: string, categories: readonly string[]) {
+    const optimisticCategoryMap = categories.reduce<Record<string, Partial<PolicyCategory>>>((acc, category) => {
+        acc[category] = {
+            name: category,
+            enabled: true,
+            errors: null,
+            pendingAction: CONST.RED_BRICK_ROAD_PENDING_ACTION.ADD,
+        };
+        return acc;
+    }, {});
+
+    const successCategoryMap = categories.reduce<Record<string, Partial<PolicyCategory>>>((acc, category) => {
+        acc[category] = {
+            errors: null,
+            pendingAction: null,
+        };
+        return acc;
+    }, {});
+
+    const failureCategoryMap = categories.reduce<Record<string, Partial<PolicyCategory>>>((acc, category) => {
+        acc[category] = {
+            errors: ErrorUtils.getMicroSecondOnyxErrorWithTranslationKey('workspace.categories.createFailureMessage'),
+            pendingAction: null,
+        };
+        return acc;
+    }, {});
+
+    const onyxData: OnyxData = {
+        optimisticData: [
+            {
+                onyxMethod: Onyx.METHOD.MERGE,
+                key: `${ONYXKEYS.COLLECTION.POLICY_CATEGORIES}${policyID}`,
+                value: optimisticCategoryMap,
+            },
+            {
+                onyxMethod: Onyx.METHOD.SET,
+                key: `${ONYXKEYS.COLLECTION.POLICY_CATEGORIES_DRAFT}${policyID}`,
+                value: null,
+            },
+        ],
+        successData: [
+            {
+                onyxMethod: Onyx.METHOD.MERGE,
+                key: `${ONYXKEYS.COLLECTION.POLICY_CATEGORIES}${policyID}`,
+                value: successCategoryMap,
+            },
+        ],
+        failureData: [
+            {
+                onyxMethod: Onyx.METHOD.MERGE,
+                key: `${ONYXKEYS.COLLECTION.POLICY_CATEGORIES}${policyID}`,
+                value: failureCategoryMap,
+            },
+        ],
+    };
+
+    return onyxData;
+}
+
+function openPolicyCategoriesPage(policyID: string) {
+    if (!policyID) {
+        Log.warn('openPolicyCategoriesPage invalid params', {policyID});
+        return;
+    }
+
+    const params: OpenPolicyCategoriesPageParams = {
+        policyID,
+    };
+
+    API.read(READ_COMMANDS.OPEN_POLICY_CATEGORIES_PAGE, params);
+}
+
+function buildOptimisticPolicyRecentlyUsedCategories(policyID?: string, category?: string) {
+    if (!policyID || !category) {
+        return [];
+    }
+
+    const policyRecentlyUsedCategories = allRecentlyUsedCategories?.[`${ONYXKEYS.COLLECTION.POLICY_RECENTLY_USED_CATEGORIES}${policyID}`] ?? [];
+
+    return lodashUnion([category], policyRecentlyUsedCategories);
+}
+
+function setWorkspaceCategoryEnabled(policyID: string, categoriesToUpdate: Record<string, {name: string; enabled: boolean}>) {
+    const policyCategories = allPolicyCategories?.[`${ONYXKEYS.COLLECTION.POLICY_CATEGORIES}${policyID}`] ?? {};
+    const policy = allPolicies?.[`${ONYXKEYS.COLLECTION.POLICY}${policyID}`];
+    const optimisticPolicyCategoriesData = {
+        ...Object.keys(categoriesToUpdate).reduce<PolicyCategories>((acc, key) => {
+            acc[key] = {
+                ...policyCategories[key],
+                ...categoriesToUpdate[key],
+                errors: null,
+                pendingFields: {
+                    enabled: CONST.RED_BRICK_ROAD_PENDING_ACTION.UPDATE,
+                },
+                pendingAction: CONST.RED_BRICK_ROAD_PENDING_ACTION.UPDATE,
+            };
+
+            return acc;
+        }, {}),
+    };
+    const shouldDisableRequiresCategory = !OptionsListUtils.hasEnabledOptions({...policyCategories, ...optimisticPolicyCategoriesData});
+    const onyxData: OnyxData = {
+        optimisticData: [
+            {
+                onyxMethod: Onyx.METHOD.MERGE,
+                key: `${ONYXKEYS.COLLECTION.POLICY_CATEGORIES}${policyID}`,
+                value: optimisticPolicyCategoriesData,
+            },
+        ],
+        successData: [
+            {
+                onyxMethod: Onyx.METHOD.MERGE,
+                key: `${ONYXKEYS.COLLECTION.POLICY_CATEGORIES}${policyID}`,
+                value: {
+                    ...Object.keys(categoriesToUpdate).reduce<PolicyCategories>((acc, key) => {
+                        acc[key] = {
+                            ...policyCategories[key],
+                            ...categoriesToUpdate[key],
+                            errors: null,
+                            pendingFields: {
+                                enabled: null,
+                            },
+                            pendingAction: null,
+                        };
+
+                        return acc;
+                    }, {}),
+                },
+            },
+        ],
+        failureData: [
+            {
+                onyxMethod: Onyx.METHOD.MERGE,
+                key: `${ONYXKEYS.COLLECTION.POLICY_CATEGORIES}${policyID}`,
+                value: {
+                    ...Object.keys(categoriesToUpdate).reduce<PolicyCategories>((acc, key) => {
+                        acc[key] = {
+                            ...policyCategories[key],
+                            ...categoriesToUpdate[key],
+                            errors: ErrorUtils.getMicroSecondOnyxErrorWithTranslationKey('workspace.categories.updateFailureMessage'),
+                            pendingFields: {
+                                enabled: null,
+                            },
+                            pendingAction: null,
+                        };
+
+                        return acc;
+                    }, {}),
+                },
+            },
+        ],
+    };
+    if (shouldDisableRequiresCategory) {
+        onyxData.optimisticData?.push({
+            onyxMethod: Onyx.METHOD.MERGE,
+            key: `${ONYXKEYS.COLLECTION.POLICY}${policyID}`,
+            value: {
+                requiresCategory: false,
+                pendingFields: {
+                    requiresCategory: CONST.RED_BRICK_ROAD_PENDING_ACTION.UPDATE,
+                },
+            },
+        });
+        onyxData.successData?.push({
+            onyxMethod: Onyx.METHOD.MERGE,
+            key: `${ONYXKEYS.COLLECTION.POLICY}${policyID}`,
+            value: {
+                pendingFields: {
+                    requiresCategory: null,
+                },
+            },
+        });
+        onyxData.failureData?.push({
+            onyxMethod: Onyx.METHOD.MERGE,
+            key: `${ONYXKEYS.COLLECTION.POLICY}${policyID}`,
+            value: {
+                requiresCategory: policy?.requiresCategory,
+                pendingFields: {
+                    requiresCategory: null,
+                },
+            },
+        });
+    }
+
+    const parameters = {
+        policyID,
+        categories: JSON.stringify(Object.keys(categoriesToUpdate).map((key) => categoriesToUpdate[key])),
+    };
+
+    API.write(WRITE_COMMANDS.SET_WORKSPACE_CATEGORIES_ENABLED, parameters, onyxData);
+}
+
+function createPolicyCategory(policyID: string, categoryName: string) {
+    const onyxData = buildOptimisticPolicyCategories(policyID, [categoryName]);
+
+    const parameters = {
+        policyID,
+        categories: JSON.stringify([{name: categoryName}]),
+    };
+
+    API.write(WRITE_COMMANDS.CREATE_WORKSPACE_CATEGORIES, parameters, onyxData);
+}
+
+function renamePolicyCategory(policyID: string, policyCategory: {oldName: string; newName: string}) {
+    const policyCategoryToUpdate = allPolicyCategories?.[`${ONYXKEYS.COLLECTION.POLICY_CATEGORIES}${policyID}`]?.[policyCategory.oldName];
+
+    const onyxData: OnyxData = {
+        optimisticData: [
+            {
+                onyxMethod: Onyx.METHOD.MERGE,
+                key: `${ONYXKEYS.COLLECTION.POLICY_CATEGORIES}${policyID}`,
+                value: {
+                    [policyCategory.oldName]: null,
+                    [policyCategory.newName]: {
+                        ...policyCategoryToUpdate,
+                        name: policyCategory.newName,
+                        pendingAction: CONST.RED_BRICK_ROAD_PENDING_ACTION.UPDATE,
+                        pendingFields: {
+                            ...(policyCategoryToUpdate?.pendingFields ?? {}),
+                            name: CONST.RED_BRICK_ROAD_PENDING_ACTION.UPDATE,
+                        },
+                        previousCategoryName: policyCategory.oldName,
+                    },
+                },
+            },
+        ],
+        successData: [
+            {
+                onyxMethod: Onyx.METHOD.MERGE,
+                key: `${ONYXKEYS.COLLECTION.POLICY_CATEGORIES}${policyID}`,
+                value: {
+                    [policyCategory.oldName]: null,
+                    [policyCategory.newName]: {
+                        ...policyCategoryToUpdate,
+                        name: policyCategory.newName,
+                        errors: null,
+                        pendingAction: null,
+                        pendingFields: {
+                            ...(policyCategoryToUpdate?.pendingFields ?? {}),
+                            name: null,
+                        },
+                    },
+                },
+            },
+        ],
+        failureData: [
+            {
+                onyxMethod: Onyx.METHOD.MERGE,
+                key: `${ONYXKEYS.COLLECTION.POLICY_CATEGORIES}${policyID}`,
+                value: {
+                    [policyCategory.newName]: null,
+                    [policyCategory.oldName]: {
+                        ...policyCategoryToUpdate,
+                        name: policyCategory.oldName,
+                        errors: ErrorUtils.getMicroSecondOnyxErrorWithTranslationKey('workspace.categories.updateFailureMessage'),
+                        pendingAction: null,
+                    },
+                },
+            },
+        ],
+    };
+
+    const parameters = {
+        policyID,
+        categories: JSON.stringify({[policyCategory.oldName]: policyCategory.newName}),
+    };
+
+    API.write(WRITE_COMMANDS.RENAME_WORKSPACE_CATEGORY, parameters, onyxData);
+}
+
+function setPolicyCategoryPayrollCode(policyID: string, categoryName: string, payrollCode: string) {
+    const policyCategoryToUpdate = allPolicyCategories?.[`${ONYXKEYS.COLLECTION.POLICY_CATEGORIES}${policyID}`]?.[categoryName] ?? {};
+
+    const onyxData: OnyxData = {
+        optimisticData: [
+            {
+                onyxMethod: Onyx.METHOD.MERGE,
+                key: `${ONYXKEYS.COLLECTION.POLICY_CATEGORIES}${policyID}`,
+                value: {
+                    [categoryName]: {
+                        ...policyCategoryToUpdate,
+                        pendingAction: CONST.RED_BRICK_ROAD_PENDING_ACTION.UPDATE,
+                        pendingFields: {
+                            // eslint-disable-next-line @typescript-eslint/naming-convention
+                            'Payroll Code': CONST.RED_BRICK_ROAD_PENDING_ACTION.UPDATE,
+                        },
+                        // eslint-disable-next-line @typescript-eslint/naming-convention
+                        'Payroll Code': payrollCode,
+                    },
+                },
+            },
+        ],
+        successData: [
+            {
+                onyxMethod: Onyx.METHOD.MERGE,
+                key: `${ONYXKEYS.COLLECTION.POLICY_CATEGORIES}${policyID}`,
+                value: {
+                    [categoryName]: {
+                        ...policyCategoryToUpdate,
+                        pendingAction: null,
+                        pendingFields: {
+                            // eslint-disable-next-line @typescript-eslint/naming-convention
+                            'Payroll Code': null,
+                        },
+                        // eslint-disable-next-line @typescript-eslint/naming-convention
+                        'Payroll Code': payrollCode,
+                    },
+                },
+            },
+        ],
+        failureData: [
+            {
+                onyxMethod: Onyx.METHOD.MERGE,
+                key: `${ONYXKEYS.COLLECTION.POLICY_CATEGORIES}${policyID}`,
+                value: {
+                    [categoryName]: {
+                        ...policyCategoryToUpdate,
+                        errors: ErrorUtils.getMicroSecondOnyxErrorWithTranslationKey('workspace.categories.updatePayrollCodeFailureMessage'),
+                        pendingAction: null,
+                        pendingFields: {
+                            // eslint-disable-next-line @typescript-eslint/naming-convention
+                            'Payroll Code': null,
+                        },
+                    },
+                },
+            },
+        ],
+    };
+
+    const parameters = {
+        policyID,
+        categoryName,
+        payrollCode,
+    };
+
+    API.write(WRITE_COMMANDS.UPDATE_POLICY_CATEGORY_PAYROLL_CODE, parameters, onyxData);
+}
+
+function setPolicyCategoryGLCode(policyID: string, categoryName: string, glCode: string) {
+    const policyCategoryToUpdate = allPolicyCategories?.[`${ONYXKEYS.COLLECTION.POLICY_CATEGORIES}${policyID}`]?.[categoryName] ?? {};
+
+    const onyxData: OnyxData = {
+        optimisticData: [
+            {
+                onyxMethod: Onyx.METHOD.MERGE,
+                key: `${ONYXKEYS.COLLECTION.POLICY_CATEGORIES}${policyID}`,
+                value: {
+                    [categoryName]: {
+                        ...policyCategoryToUpdate,
+                        pendingAction: CONST.RED_BRICK_ROAD_PENDING_ACTION.UPDATE,
+                        pendingFields: {
+                            // eslint-disable-next-line @typescript-eslint/naming-convention
+                            'GL Code': CONST.RED_BRICK_ROAD_PENDING_ACTION.UPDATE,
+                        },
+                        // eslint-disable-next-line @typescript-eslint/naming-convention
+                        'GL Code': glCode,
+                    },
+                },
+            },
+        ],
+        successData: [
+            {
+                onyxMethod: Onyx.METHOD.MERGE,
+                key: `${ONYXKEYS.COLLECTION.POLICY_CATEGORIES}${policyID}`,
+                value: {
+                    [categoryName]: {
+                        ...policyCategoryToUpdate,
+                        pendingAction: null,
+                        pendingFields: {
+                            // eslint-disable-next-line @typescript-eslint/naming-convention
+                            'GL Code': null,
+                        },
+                        // eslint-disable-next-line @typescript-eslint/naming-convention
+                        'GL Code': glCode,
+                    },
+                },
+            },
+        ],
+        failureData: [
+            {
+                onyxMethod: Onyx.METHOD.MERGE,
+                key: `${ONYXKEYS.COLLECTION.POLICY_CATEGORIES}${policyID}`,
+                value: {
+                    [categoryName]: {
+                        ...policyCategoryToUpdate,
+                        errors: ErrorUtils.getMicroSecondOnyxErrorWithTranslationKey('workspace.categories.updateGLCodeFailureMessage'),
+                        pendingAction: null,
+                        pendingFields: {
+                            // eslint-disable-next-line @typescript-eslint/naming-convention
+                            'GL Code': null,
+                        },
+                    },
+                },
+            },
+        ],
+    };
+
+    const parameters: UpdatePolicyCategoryGLCodeParams = {
+        policyID,
+        categoryName,
+        glCode,
+    };
+
+    API.write(WRITE_COMMANDS.UPDATE_POLICY_CATEGORY_GL_CODE, parameters, onyxData);
+}
+
+function setWorkspaceRequiresCategory(policyID: string, requiresCategory: boolean) {
+    const onyxData: OnyxData = {
+        optimisticData: [
+            {
+                onyxMethod: Onyx.METHOD.MERGE,
+                key: `${ONYXKEYS.COLLECTION.POLICY}${policyID}`,
+                value: {
+                    requiresCategory,
+                    errors: {
+                        requiresCategory: null,
+                    },
+                    pendingFields: {
+                        requiresCategory: CONST.RED_BRICK_ROAD_PENDING_ACTION.UPDATE,
+                    },
+                },
+            },
+        ],
+        successData: [
+            {
+                onyxMethod: Onyx.METHOD.MERGE,
+                key: `${ONYXKEYS.COLLECTION.POLICY}${policyID}`,
+                value: {
+                    errors: {
+                        requiresCategory: null,
+                    },
+                    pendingFields: {
+                        requiresCategory: null,
+                    },
+                },
+            },
+        ],
+        failureData: [
+            {
+                onyxMethod: Onyx.METHOD.MERGE,
+                key: `${ONYXKEYS.COLLECTION.POLICY}${policyID}`,
+                value: {
+                    requiresCategory: !requiresCategory,
+                    errors: ErrorUtils.getMicroSecondOnyxErrorWithTranslationKey('workspace.categories.updateFailureMessage'),
+                    pendingFields: {
+                        requiresCategory: null,
+                    },
+                },
+            },
+        ],
+    };
+
+    const parameters = {
+        policyID,
+        requiresCategory,
+    };
+
+    API.write(WRITE_COMMANDS.SET_WORKSPACE_REQUIRES_CATEGORY, parameters, onyxData);
+}
+
+function clearCategoryErrors(policyID: string, categoryName: string) {
+    const category = allPolicyCategories?.[`${ONYXKEYS.COLLECTION.POLICY_CATEGORIES}${policyID}`]?.[categoryName];
+
+    if (!category) {
+        return;
+    }
+
+    Onyx.merge(`${ONYXKEYS.COLLECTION.POLICY_CATEGORIES}${policyID}`, {
+        [category.name]: {
+            errors: null,
+        },
+    });
+}
+
+function deleteWorkspaceCategories(policyID: string, categoryNamesToDelete: string[]) {
+    const policy = allPolicies?.[`${ONYXKEYS.COLLECTION.POLICY}${policyID}`];
+    const policyCategories = allPolicyCategories?.[`${ONYXKEYS.COLLECTION.POLICY_CATEGORIES}${policyID}`] ?? {};
+    const optimisticPolicyCategoriesData = categoryNamesToDelete.reduce<Record<string, Partial<PolicyCategory>>>((acc, categoryName) => {
+        acc[categoryName] = {pendingAction: CONST.RED_BRICK_ROAD_PENDING_ACTION.DELETE};
+        return acc;
+    }, {});
+    const shouldDisableRequiresCategory = !OptionsListUtils.hasEnabledOptions(
+        Object.values(policyCategories).filter((category) => !categoryNamesToDelete.includes(category.name) && category.pendingAction !== CONST.RED_BRICK_ROAD_PENDING_ACTION.DELETE),
+    );
+    const onyxData: OnyxData = {
+        optimisticData: [
+            {
+                onyxMethod: Onyx.METHOD.MERGE,
+                key: `${ONYXKEYS.COLLECTION.POLICY_CATEGORIES}${policyID}`,
+                value: optimisticPolicyCategoriesData,
+            },
+        ],
+        successData: [
+            {
+                onyxMethod: Onyx.METHOD.MERGE,
+                key: `${ONYXKEYS.COLLECTION.POLICY_CATEGORIES}${policyID}`,
+                value: categoryNamesToDelete.reduce<Record<string, null>>((acc, categoryName) => {
+                    acc[categoryName] = null;
+                    return acc;
+                }, {}),
+            },
+        ],
+        failureData: [
+            {
+                onyxMethod: Onyx.METHOD.MERGE,
+                key: `${ONYXKEYS.COLLECTION.POLICY_CATEGORIES}${policyID}`,
+                value: categoryNamesToDelete.reduce<Record<string, Partial<PolicyCategory>>>((acc, categoryName) => {
+                    acc[categoryName] = {
+                        pendingAction: null,
+                        errors: ErrorUtils.getMicroSecondOnyxErrorWithTranslationKey('workspace.categories.deleteFailureMessage'),
+                    };
+                    return acc;
+                }, {}),
+            },
+        ],
+    };
+    if (shouldDisableRequiresCategory) {
+        onyxData.optimisticData?.push({
+            onyxMethod: Onyx.METHOD.MERGE,
+            key: `${ONYXKEYS.COLLECTION.POLICY}${policyID}`,
+            value: {
+                requiresCategory: false,
+                pendingFields: {
+                    requiresCategory: CONST.RED_BRICK_ROAD_PENDING_ACTION.UPDATE,
+                },
+            },
+        });
+        onyxData.successData?.push({
+            onyxMethod: Onyx.METHOD.MERGE,
+            key: `${ONYXKEYS.COLLECTION.POLICY}${policyID}`,
+            value: {
+                pendingFields: {
+                    requiresCategory: null,
+                },
+            },
+        });
+        onyxData.failureData?.push({
+            onyxMethod: Onyx.METHOD.MERGE,
+            key: `${ONYXKEYS.COLLECTION.POLICY}${policyID}`,
+            value: {
+                requiresCategory: policy?.requiresCategory,
+                pendingFields: {
+                    requiresCategory: null,
+                },
+            },
+        });
+    }
+
+    const parameters = {
+        policyID,
+        categories: JSON.stringify(categoryNamesToDelete),
+    };
+
+    API.write(WRITE_COMMANDS.DELETE_WORKSPACE_CATEGORIES, parameters, onyxData);
+}
+
+function enablePolicyCategories(policyID: string, enabled: boolean) {
+    const onyxUpdatesToDisableCategories: OnyxUpdate[] = [];
+    if (!enabled) {
+        onyxUpdatesToDisableCategories.push(
+            {
+                onyxMethod: Onyx.METHOD.MERGE,
+                key: `${ONYXKEYS.COLLECTION.POLICY_CATEGORIES}${policyID}`,
+                value: Object.fromEntries(
+                    Object.entries(allPolicyCategories?.[`${ONYXKEYS.COLLECTION.POLICY_CATEGORIES}${policyID}`] ?? {}).map(([categoryName]) => [
+                        categoryName,
+                        {
+                            enabled: false,
+                        },
+                    ]),
+                ),
+            },
+            {
+                onyxMethod: Onyx.METHOD.MERGE,
+                key: `${ONYXKEYS.COLLECTION.POLICY}${policyID}`,
+                value: {
+                    requiresCategory: false,
+                },
+            },
+        );
+    }
+    const onyxData: OnyxData = {
+        optimisticData: [
+            {
+                onyxMethod: Onyx.METHOD.MERGE,
+                key: `${ONYXKEYS.COLLECTION.POLICY}${policyID}`,
+                value: {
+                    areCategoriesEnabled: enabled,
+                    pendingFields: {
+                        areCategoriesEnabled: CONST.RED_BRICK_ROAD_PENDING_ACTION.UPDATE,
+                    },
+                },
+            },
+        ],
+        successData: [
+            {
+                onyxMethod: Onyx.METHOD.MERGE,
+                key: `${ONYXKEYS.COLLECTION.POLICY}${policyID}`,
+                value: {
+                    pendingFields: {
+                        areCategoriesEnabled: null,
+                    },
+                },
+            },
+        ],
+        failureData: [
+            {
+                onyxMethod: Onyx.METHOD.MERGE,
+                key: `${ONYXKEYS.COLLECTION.POLICY}${policyID}`,
+                value: {
+                    areCategoriesEnabled: !enabled,
+                    pendingFields: {
+                        areCategoriesEnabled: null,
+                    },
+                },
+            },
+        ],
+    };
+
+    if (onyxUpdatesToDisableCategories.length > 0) {
+        onyxData.optimisticData?.push(...onyxUpdatesToDisableCategories);
+    }
+
+    const parameters: EnablePolicyCategoriesParams = {policyID, enabled};
+
+    API.write(WRITE_COMMANDS.ENABLE_POLICY_CATEGORIES, parameters, onyxData);
+
+    if (enabled && getIsNarrowLayout()) {
+        navigateWhenEnableFeature(policyID);
+    }
+}
+
+function setPolicyDistanceRatesDefaultCategory(policyID: string, currentCustomUnit: CustomUnit, newCustomUnit: CustomUnit) {
+    const optimisticData: OnyxUpdate[] = [
+        {
+            onyxMethod: Onyx.METHOD.MERGE,
+            key: `${ONYXKEYS.COLLECTION.POLICY}${policyID}`,
+            value: {
+                customUnits: {
+                    [newCustomUnit.customUnitID]: {
+                        ...newCustomUnit,
+                        pendingFields: {defaultCategory: CONST.RED_BRICK_ROAD_PENDING_ACTION.UPDATE},
+                    },
+                },
+            },
+        },
+    ];
+
+    const successData: OnyxUpdate[] = [
+        {
+            onyxMethod: Onyx.METHOD.MERGE,
+            key: `${ONYXKEYS.COLLECTION.POLICY}${policyID}`,
+            value: {
+                customUnits: {
+                    [newCustomUnit.customUnitID]: {
+                        pendingFields: {defaultCategory: null},
+                    },
+                },
+            },
+        },
+    ];
+
+    const failureData: OnyxUpdate[] = [
+        {
+            onyxMethod: Onyx.METHOD.MERGE,
+            key: `${ONYXKEYS.COLLECTION.POLICY}${policyID}`,
+            value: {
+                customUnits: {
+                    [currentCustomUnit.customUnitID]: {
+                        ...currentCustomUnit,
+                        errorFields: {defaultCategory: ErrorUtils.getMicroSecondOnyxErrorWithTranslationKey('common.genericErrorMessage')},
+                        pendingFields: {defaultCategory: null},
+                    },
+                },
+            },
+        },
+    ];
+
+    const params: SetPolicyDistanceRatesDefaultCategoryParams = {
+        policyID,
+        customUnit: JSON.stringify(removePendingFieldsFromCustomUnit(newCustomUnit)),
+    };
+
+    API.write(WRITE_COMMANDS.SET_POLICY_DISTANCE_RATES_DEFAULT_CATEGORY, params, {optimisticData, successData, failureData});
+}
+
+export {
+    openPolicyCategoriesPage,
+    buildOptimisticPolicyRecentlyUsedCategories,
+    setWorkspaceCategoryEnabled,
+    setWorkspaceRequiresCategory,
+    setPolicyCategoryPayrollCode,
+    createPolicyCategory,
+    renamePolicyCategory,
+    setPolicyCategoryGLCode,
+    clearCategoryErrors,
+    enablePolicyCategories,
+    setPolicyDistanceRatesDefaultCategory,
+    deleteWorkspaceCategories,
+    buildOptimisticPolicyCategories,
+};
diff --git a/src/libs/actions/Policy/DistanceRate.ts b/src/libs/actions/Policy/DistanceRate.ts
new file mode 100644
index 000000000000..b81b180cca52
--- /dev/null
+++ b/src/libs/actions/Policy/DistanceRate.ts
@@ -0,0 +1,715 @@
+import type {NullishDeep, OnyxCollection, OnyxUpdate} from 'react-native-onyx';
+import Onyx from 'react-native-onyx';
+import * as API from '@libs/API';
+import type {
+    CreatePolicyDistanceRateParams,
+    DeletePolicyDistanceRatesParams,
+    EnablePolicyDistanceRatesParams,
+    OpenPolicyDistanceRatesPageParams,
+    SetPolicyDistanceRatesEnabledParams,
+    SetPolicyDistanceRatesUnitParams,
+    UpdatePolicyDistanceRateValueParams,
+} from '@libs/API/parameters';
+import {READ_COMMANDS, WRITE_COMMANDS} from '@libs/API/types';
+import * as ErrorUtils from '@libs/ErrorUtils';
+import getIsNarrowLayout from '@libs/getIsNarrowLayout';
+import {navigateWhenEnableFeature, removePendingFieldsFromCustomUnit} from '@libs/PolicyUtils';
+import * as ReportUtils from '@libs/ReportUtils';
+import CONST from '@src/CONST';
+import ONYXKEYS from '@src/ONYXKEYS';
+import type {Policy, Report} from '@src/types/onyx';
+import type {ErrorFields} from '@src/types/onyx/OnyxCommon';
+import type {Attributes, CustomUnit, Rate} from '@src/types/onyx/Policy';
+import type {OnyxData} from '@src/types/onyx/Request';
+
+type NewCustomUnit = {
+    customUnitID: string;
+    name: string;
+    attributes: Attributes;
+    rates: Rate;
+};
+
+const allPolicies: OnyxCollection<Policy> = {};
+Onyx.connect({
+    key: ONYXKEYS.COLLECTION.POLICY,
+    callback: (val, key) => {
+        if (!key) {
+            return;
+        }
+        if (val === null || val === undefined) {
+            // If we are deleting a policy, we have to check every report linked to that policy
+            // and unset the draft indicator (pencil icon) alongside removing any draft comments. Clearing these values will keep the newly archived chats from being displayed in the LHN.
+            // More info: https://github.com/Expensify/App/issues/14260
+            const policyID = key.replace(ONYXKEYS.COLLECTION.POLICY, '');
+            const policyReports = ReportUtils.getAllPolicyReports(policyID);
+            const cleanUpMergeQueries: Record<`${typeof ONYXKEYS.COLLECTION.REPORT}${string}`, NullishDeep<Report>> = {};
+            const cleanUpSetQueries: Record<`${typeof ONYXKEYS.COLLECTION.REPORT_DRAFT_COMMENT}${string}` | `${typeof ONYXKEYS.COLLECTION.REPORT_ACTIONS_DRAFTS}${string}`, null> = {};
+            policyReports.forEach((policyReport) => {
+                if (!policyReport) {
+                    return;
+                }
+                const {reportID} = policyReport;
+                cleanUpSetQueries[`${ONYXKEYS.COLLECTION.REPORT_DRAFT_COMMENT}${reportID}`] = null;
+                cleanUpSetQueries[`${ONYXKEYS.COLLECTION.REPORT_ACTIONS_DRAFTS}${reportID}`] = null;
+            });
+            Onyx.mergeCollection(ONYXKEYS.COLLECTION.REPORT, cleanUpMergeQueries);
+            Onyx.multiSet(cleanUpSetQueries);
+            delete allPolicies[key];
+            return;
+        }
+
+        allPolicies[key] = val;
+    },
+});
+
+/**
+ * Takes array of customUnitRates and removes pendingFields and errorFields from each rate - we don't want to send those via API
+ */
+function prepareCustomUnitRatesArray(customUnitRates: Rate[]): Rate[] {
+    const customUnitRateArray: Rate[] = [];
+    customUnitRates.forEach((rate) => {
+        const cleanedRate = {...rate};
+        delete cleanedRate.pendingFields;
+        delete cleanedRate.errorFields;
+        customUnitRateArray.push(cleanedRate);
+    });
+
+    return customUnitRateArray;
+}
+
+function openPolicyDistanceRatesPage(policyID?: string) {
+    if (!policyID) {
+        return;
+    }
+
+    const params: OpenPolicyDistanceRatesPageParams = {policyID};
+
+    API.read(READ_COMMANDS.OPEN_POLICY_DISTANCE_RATES_PAGE, params);
+}
+
+function enablePolicyDistanceRates(policyID: string, enabled: boolean) {
+    const onyxData: OnyxData = {
+        optimisticData: [
+            {
+                onyxMethod: Onyx.METHOD.MERGE,
+                key: `${ONYXKEYS.COLLECTION.POLICY}${policyID}`,
+                value: {
+                    areDistanceRatesEnabled: enabled,
+                    pendingFields: {
+                        areDistanceRatesEnabled: CONST.RED_BRICK_ROAD_PENDING_ACTION.UPDATE,
+                    },
+                },
+            },
+        ],
+        successData: [
+            {
+                onyxMethod: Onyx.METHOD.MERGE,
+                key: `${ONYXKEYS.COLLECTION.POLICY}${policyID}`,
+                value: {
+                    pendingFields: {
+                        areDistanceRatesEnabled: null,
+                    },
+                },
+            },
+        ],
+        failureData: [
+            {
+                onyxMethod: Onyx.METHOD.MERGE,
+                key: `${ONYXKEYS.COLLECTION.POLICY}${policyID}`,
+                value: {
+                    areDistanceRatesEnabled: !enabled,
+                    pendingFields: {
+                        areDistanceRatesEnabled: null,
+                    },
+                },
+            },
+        ],
+    };
+
+    if (!enabled) {
+        const policy = allPolicies?.[`${ONYXKEYS.COLLECTION.POLICY}${policyID}`];
+        const customUnitID = Object.keys(policy?.customUnits ?? {})[0];
+        const customUnit = customUnitID ? policy?.customUnits?.[customUnitID] : undefined;
+
+        const rateEntries = Object.entries(customUnit?.rates ?? {});
+        // find the rate to be enabled after disabling the distance rate feature
+        const rateEntryToBeEnabled = rateEntries[0];
+
+        onyxData.optimisticData?.push({
+            onyxMethod: Onyx.METHOD.MERGE,
+            key: `${ONYXKEYS.COLLECTION.POLICY}${policyID}`,
+            value: {
+                customUnits: {
+                    [customUnitID]: {
+                        rates: Object.fromEntries(
+                            rateEntries.map((rateEntry) => {
+                                const [rateID, rate] = rateEntry;
+                                return [
+                                    rateID,
+                                    {
+                                        ...rate,
+                                        enabled: rateID === rateEntryToBeEnabled[0],
+                                    },
+                                ];
+                            }),
+                        ),
+                    },
+                },
+            },
+        });
+    }
+
+    const parameters: EnablePolicyDistanceRatesParams = {policyID, enabled};
+
+    API.write(WRITE_COMMANDS.ENABLE_POLICY_DISTANCE_RATES, parameters, onyxData);
+
+    if (enabled && getIsNarrowLayout()) {
+        navigateWhenEnableFeature(policyID);
+    }
+}
+
+function createPolicyDistanceRate(policyID: string, customUnitID: string, customUnitRate: Rate) {
+    const optimisticData: OnyxUpdate[] = [
+        {
+            onyxMethod: Onyx.METHOD.MERGE,
+            key: `${ONYXKEYS.COLLECTION.POLICY}${policyID}`,
+            value: {
+                customUnits: {
+                    [customUnitID]: {
+                        rates: {
+                            [customUnitRate.customUnitRateID ?? '']: {
+                                ...customUnitRate,
+                                pendingAction: CONST.RED_BRICK_ROAD_PENDING_ACTION.ADD,
+                            },
+                        },
+                    },
+                },
+            },
+        },
+    ];
+
+    const successData: OnyxUpdate[] = [
+        {
+            onyxMethod: Onyx.METHOD.MERGE,
+            key: `${ONYXKEYS.COLLECTION.POLICY}${policyID}`,
+            value: {
+                customUnits: {
+                    [customUnitID]: {
+                        rates: {
+                            [customUnitRate.customUnitRateID ?? '']: {
+                                pendingAction: null,
+                            },
+                        },
+                    },
+                },
+            },
+        },
+    ];
+
+    const failureData: OnyxUpdate[] = [
+        {
+            onyxMethod: Onyx.METHOD.MERGE,
+            key: `${ONYXKEYS.COLLECTION.POLICY}${policyID}`,
+            value: {
+                customUnits: {
+                    [customUnitID]: {
+                        rates: {
+                            [customUnitRate.customUnitRateID ?? '']: {
+                                errors: ErrorUtils.getMicroSecondOnyxErrorWithTranslationKey('common.genericErrorMessage'),
+                            },
+                        },
+                    },
+                },
+            },
+        },
+    ];
+
+    const params: CreatePolicyDistanceRateParams = {
+        policyID,
+        customUnitID,
+        customUnitRate: JSON.stringify(customUnitRate),
+    };
+
+    API.write(WRITE_COMMANDS.CREATE_POLICY_DISTANCE_RATE, params, {optimisticData, successData, failureData});
+}
+
+function clearCreateDistanceRateItemAndError(policyID: string, customUnitID: string, customUnitRateIDToClear: string) {
+    Onyx.merge(`${ONYXKEYS.COLLECTION.POLICY}${policyID}`, {
+        customUnits: {
+            [customUnitID]: {
+                rates: {
+                    [customUnitRateIDToClear]: null,
+                },
+            },
+        },
+    });
+}
+
+function clearPolicyDistanceRatesErrorFields(policyID: string, customUnitID: string, updatedErrorFields: ErrorFields) {
+    Onyx.merge(`${ONYXKEYS.COLLECTION.POLICY}${policyID}`, {
+        customUnits: {
+            [customUnitID]: {
+                errorFields: updatedErrorFields,
+            },
+        },
+    });
+}
+
+function clearDeleteDistanceRateError(policyID: string, customUnitID: string, rateID: string) {
+    Onyx.merge(`${ONYXKEYS.COLLECTION.POLICY}${policyID}`, {
+        customUnits: {
+            [customUnitID]: {
+                rates: {
+                    [rateID]: {
+                        errors: null,
+                    },
+                },
+            },
+        },
+    });
+}
+
+function clearPolicyDistanceRateErrorFields(policyID: string, customUnitID: string, rateID: string, updatedErrorFields: ErrorFields) {
+    Onyx.merge(`${ONYXKEYS.COLLECTION.POLICY}${policyID}`, {
+        customUnits: {
+            [customUnitID]: {
+                rates: {
+                    [rateID]: {
+                        errorFields: updatedErrorFields,
+                    },
+                },
+            },
+        },
+    });
+}
+
+function setPolicyDistanceRatesUnit(policyID: string, currentCustomUnit: CustomUnit, newCustomUnit: CustomUnit) {
+    const optimisticData: OnyxUpdate[] = [
+        {
+            onyxMethod: Onyx.METHOD.MERGE,
+            key: `${ONYXKEYS.COLLECTION.POLICY}${policyID}`,
+            value: {
+                customUnits: {
+                    [newCustomUnit.customUnitID]: {
+                        ...newCustomUnit,
+                        pendingFields: {attributes: CONST.RED_BRICK_ROAD_PENDING_ACTION.UPDATE},
+                    },
+                },
+            },
+        },
+    ];
+
+    const successData: OnyxUpdate[] = [
+        {
+            onyxMethod: Onyx.METHOD.MERGE,
+            key: `${ONYXKEYS.COLLECTION.POLICY}${policyID}`,
+            value: {
+                customUnits: {
+                    [newCustomUnit.customUnitID]: {
+                        pendingFields: {attributes: null},
+                    },
+                },
+            },
+        },
+    ];
+
+    const failureData: OnyxUpdate[] = [
+        {
+            onyxMethod: Onyx.METHOD.MERGE,
+            key: `${ONYXKEYS.COLLECTION.POLICY}${policyID}`,
+            value: {
+                customUnits: {
+                    [currentCustomUnit.customUnitID]: {
+                        ...currentCustomUnit,
+                        errorFields: {attributes: ErrorUtils.getMicroSecondOnyxErrorWithTranslationKey('common.genericErrorMessage')},
+                        pendingFields: {attributes: null},
+                    },
+                },
+            },
+        },
+    ];
+
+    const params: SetPolicyDistanceRatesUnitParams = {
+        policyID,
+        customUnit: JSON.stringify(removePendingFieldsFromCustomUnit(newCustomUnit)),
+    };
+
+    API.write(WRITE_COMMANDS.SET_POLICY_DISTANCE_RATES_UNIT, params, {optimisticData, successData, failureData});
+}
+
+function updatePolicyDistanceRateValue(policyID: string, customUnit: CustomUnit, customUnitRates: Rate[]) {
+    const currentRates = customUnit.rates;
+    const optimisticRates: Record<string, Rate> = {};
+    const successRates: Record<string, Rate> = {};
+    const failureRates: Record<string, Rate> = {};
+    const rateIDs = customUnitRates.map((rate) => rate.customUnitRateID);
+
+    for (const rateID of Object.keys(customUnit.rates)) {
+        if (rateIDs.includes(rateID)) {
+            const foundRate = customUnitRates.find((rate) => rate.customUnitRateID === rateID);
+            optimisticRates[rateID] = {...foundRate, pendingFields: {rate: CONST.RED_BRICK_ROAD_PENDING_ACTION.UPDATE}};
+            successRates[rateID] = {...foundRate, pendingFields: {rate: null}};
+            failureRates[rateID] = {
+                ...currentRates[rateID],
+                pendingFields: {rate: null},
+                errorFields: {rate: ErrorUtils.getMicroSecondOnyxErrorWithTranslationKey('common.genericErrorMessage')},
+            };
+        }
+    }
+
+    const optimisticData: OnyxUpdate[] = [
+        {
+            onyxMethod: Onyx.METHOD.MERGE,
+            key: `${ONYXKEYS.COLLECTION.POLICY}${policyID}`,
+            value: {
+                customUnits: {
+                    [customUnit.customUnitID]: {
+                        rates: optimisticRates,
+                    },
+                },
+            },
+        },
+    ];
+
+    const successData: OnyxUpdate[] = [
+        {
+            onyxMethod: Onyx.METHOD.MERGE,
+            key: `${ONYXKEYS.COLLECTION.POLICY}${policyID}`,
+            value: {
+                customUnits: {
+                    [customUnit.customUnitID]: {
+                        rates: successRates,
+                    },
+                },
+            },
+        },
+    ];
+
+    const failureData: OnyxUpdate[] = [
+        {
+            onyxMethod: Onyx.METHOD.MERGE,
+            key: `${ONYXKEYS.COLLECTION.POLICY}${policyID}`,
+            value: {
+                customUnits: {
+                    [customUnit.customUnitID]: {
+                        rates: failureRates,
+                    },
+                },
+            },
+        },
+    ];
+
+    const params: UpdatePolicyDistanceRateValueParams = {
+        policyID,
+        customUnitID: customUnit.customUnitID,
+        customUnitRateArray: JSON.stringify(prepareCustomUnitRatesArray(customUnitRates)),
+    };
+
+    API.write(WRITE_COMMANDS.UPDATE_POLICY_DISTANCE_RATE_VALUE, params, {optimisticData, successData, failureData});
+}
+
+function setPolicyDistanceRatesEnabled(policyID: string, customUnit: CustomUnit, customUnitRates: Rate[]) {
+    const currentRates = customUnit.rates;
+    const optimisticRates: Record<string, Rate> = {};
+    const successRates: Record<string, Rate> = {};
+    const failureRates: Record<string, Rate> = {};
+    const rateIDs = customUnitRates.map((rate) => rate.customUnitRateID);
+
+    for (const rateID of Object.keys(currentRates)) {
+        if (rateIDs.includes(rateID)) {
+            const foundRate = customUnitRates.find((rate) => rate.customUnitRateID === rateID);
+            optimisticRates[rateID] = {...foundRate, pendingFields: {enabled: CONST.RED_BRICK_ROAD_PENDING_ACTION.UPDATE}};
+            successRates[rateID] = {...foundRate, pendingFields: {enabled: null}};
+            failureRates[rateID] = {
+                ...currentRates[rateID],
+                pendingFields: {enabled: null},
+                errorFields: {enabled: ErrorUtils.getMicroSecondOnyxErrorWithTranslationKey('common.genericErrorMessage')},
+            };
+        }
+    }
+
+    const optimisticData: OnyxUpdate[] = [
+        {
+            onyxMethod: Onyx.METHOD.MERGE,
+            key: `${ONYXKEYS.COLLECTION.POLICY}${policyID}`,
+            value: {
+                customUnits: {
+                    [customUnit.customUnitID]: {
+                        rates: optimisticRates,
+                    },
+                },
+            },
+        },
+    ];
+
+    const successData: OnyxUpdate[] = [
+        {
+            onyxMethod: Onyx.METHOD.MERGE,
+            key: `${ONYXKEYS.COLLECTION.POLICY}${policyID}`,
+            value: {
+                customUnits: {
+                    [customUnit.customUnitID]: {
+                        rates: successRates,
+                    },
+                },
+            },
+        },
+    ];
+
+    const failureData: OnyxUpdate[] = [
+        {
+            onyxMethod: Onyx.METHOD.MERGE,
+            key: `${ONYXKEYS.COLLECTION.POLICY}${policyID}`,
+            value: {
+                customUnits: {
+                    [customUnit.customUnitID]: {
+                        rates: failureRates,
+                    },
+                },
+            },
+        },
+    ];
+
+    const params: SetPolicyDistanceRatesEnabledParams = {
+        policyID,
+        customUnitID: customUnit.customUnitID,
+        customUnitRateArray: JSON.stringify(prepareCustomUnitRatesArray(customUnitRates)),
+    };
+
+    API.write(WRITE_COMMANDS.SET_POLICY_DISTANCE_RATES_ENABLED, params, {optimisticData, successData, failureData});
+}
+
+function deletePolicyDistanceRates(policyID: string, customUnit: CustomUnit, rateIDsToDelete: string[]) {
+    const currentRates = customUnit.rates;
+    const optimisticRates: Record<string, Rate> = {};
+    const successRates: Record<string, Rate> = {};
+    const failureRates: Record<string, Rate> = {};
+
+    for (const rateID of Object.keys(currentRates)) {
+        if (rateIDsToDelete.includes(rateID)) {
+            optimisticRates[rateID] = {
+                ...currentRates[rateID],
+                enabled: false,
+                pendingAction: CONST.RED_BRICK_ROAD_PENDING_ACTION.DELETE,
+            };
+            failureRates[rateID] = {
+                ...currentRates[rateID],
+                pendingAction: null,
+                errors: ErrorUtils.getMicroSecondOnyxErrorWithTranslationKey('common.genericErrorMessage'),
+            };
+        } else {
+            optimisticRates[rateID] = currentRates[rateID];
+            successRates[rateID] = currentRates[rateID];
+        }
+    }
+
+    const optimisticData: OnyxUpdate[] = [
+        {
+            onyxMethod: Onyx.METHOD.MERGE,
+            key: `${ONYXKEYS.COLLECTION.POLICY}${policyID}`,
+            value: {
+                customUnits: {
+                    [customUnit.customUnitID]: {
+                        rates: optimisticRates,
+                    },
+                },
+            },
+        },
+    ];
+
+    const successData: OnyxUpdate[] = [
+        {
+            onyxMethod: Onyx.METHOD.MERGE,
+            key: `${ONYXKEYS.COLLECTION.POLICY}${policyID}`,
+            value: {
+                customUnits: {
+                    [customUnit.customUnitID]: {
+                        rates: successRates,
+                    },
+                },
+            },
+        },
+    ];
+
+    const failureData: OnyxUpdate[] = [
+        {
+            onyxMethod: Onyx.METHOD.MERGE,
+            key: `${ONYXKEYS.COLLECTION.POLICY}${policyID}`,
+            value: {
+                customUnits: {
+                    [customUnit.customUnitID]: {
+                        rates: failureRates,
+                    },
+                },
+            },
+        },
+    ];
+
+    const params: DeletePolicyDistanceRatesParams = {
+        policyID,
+        customUnitID: customUnit.customUnitID,
+        customUnitRateID: rateIDsToDelete,
+    };
+
+    API.write(WRITE_COMMANDS.DELETE_POLICY_DISTANCE_RATES, params, {optimisticData, successData, failureData});
+}
+
+function updateDistanceTaxClaimableValue(policyID: string, customUnit: CustomUnit, customUnitRates: Rate[]) {
+    const currentRates = customUnit.rates;
+    const optimisticRates: Record<string, Rate> = {};
+    const successRates: Record<string, Rate> = {};
+    const failureRates: Record<string, Rate> = {};
+    const rateIDs = customUnitRates.map((rate) => rate.customUnitRateID);
+
+    for (const rateID of Object.keys(customUnit.rates)) {
+        if (rateIDs.includes(rateID)) {
+            const foundRate = customUnitRates.find((rate) => rate.customUnitRateID === rateID);
+            optimisticRates[rateID] = {...foundRate, pendingFields: {taxClaimablePercentage: CONST.RED_BRICK_ROAD_PENDING_ACTION.UPDATE}};
+            successRates[rateID] = {...foundRate, pendingFields: {taxClaimablePercentage: null}};
+            failureRates[rateID] = {
+                ...currentRates[rateID],
+                pendingFields: {taxClaimablePercentage: null},
+                errorFields: {taxClaimablePercentage: ErrorUtils.getMicroSecondOnyxErrorWithTranslationKey('common.genericErrorMessage')},
+            };
+        }
+    }
+
+    const optimisticData: OnyxUpdate[] = [
+        {
+            onyxMethod: Onyx.METHOD.MERGE,
+            key: `${ONYXKEYS.COLLECTION.POLICY}${policyID}`,
+            value: {
+                customUnits: {
+                    [customUnit.customUnitID]: {
+                        rates: optimisticRates,
+                    },
+                },
+            },
+        },
+    ];
+
+    const successData: OnyxUpdate[] = [
+        {
+            onyxMethod: Onyx.METHOD.MERGE,
+            key: `${ONYXKEYS.COLLECTION.POLICY}${policyID}`,
+            value: {
+                customUnits: {
+                    [customUnit.customUnitID]: {
+                        rates: successRates,
+                    },
+                },
+            },
+        },
+    ];
+
+    const failureData: OnyxUpdate[] = [
+        {
+            onyxMethod: Onyx.METHOD.MERGE,
+            key: `${ONYXKEYS.COLLECTION.POLICY}${policyID}`,
+            value: {
+                customUnits: {
+                    [customUnit.customUnitID]: {
+                        rates: failureRates,
+                    },
+                },
+            },
+        },
+    ];
+
+    const params: UpdatePolicyDistanceRateValueParams = {
+        policyID,
+        customUnitID: customUnit.customUnitID,
+        customUnitRateArray: JSON.stringify(prepareCustomUnitRatesArray(customUnitRates)),
+    };
+
+    API.write(WRITE_COMMANDS.UPDATE_DISTANCE_TAX_CLAIMABLE_VALUE, params, {optimisticData, successData, failureData});
+}
+
+function updateDistanceTaxRate(policyID: string, customUnit: CustomUnit, customUnitRates: Rate[]) {
+    const currentRates = customUnit.rates;
+    const optimisticRates: Record<string, Rate> = {};
+    const successRates: Record<string, Rate> = {};
+    const failureRates: Record<string, Rate> = {};
+    const rateIDs = customUnitRates.map((rate) => rate.customUnitRateID);
+
+    for (const rateID of Object.keys(customUnit.rates)) {
+        if (rateIDs.includes(rateID)) {
+            const foundRate = customUnitRates.find((rate) => rate.customUnitRateID === rateID);
+            optimisticRates[rateID] = {...foundRate, pendingFields: {taxRateExternalID: CONST.RED_BRICK_ROAD_PENDING_ACTION.UPDATE}};
+            successRates[rateID] = {...foundRate, pendingFields: {taxRateExternalID: null}};
+            failureRates[rateID] = {
+                ...currentRates[rateID],
+                pendingFields: {taxRateExternalID: null},
+                errorFields: {taxRateExternalID: ErrorUtils.getMicroSecondOnyxErrorWithTranslationKey('common.genericErrorMessage')},
+            };
+        }
+    }
+
+    const optimisticData: OnyxUpdate[] = [
+        {
+            onyxMethod: Onyx.METHOD.MERGE,
+            key: `${ONYXKEYS.COLLECTION.POLICY}${policyID}`,
+            value: {
+                customUnits: {
+                    [customUnit.customUnitID]: {
+                        rates: optimisticRates,
+                    },
+                },
+            },
+        },
+    ];
+
+    const successData: OnyxUpdate[] = [
+        {
+            onyxMethod: Onyx.METHOD.MERGE,
+            key: `${ONYXKEYS.COLLECTION.POLICY}${policyID}`,
+            value: {
+                customUnits: {
+                    [customUnit.customUnitID]: {
+                        rates: successRates,
+                    },
+                },
+            },
+        },
+    ];
+
+    const failureData: OnyxUpdate[] = [
+        {
+            onyxMethod: Onyx.METHOD.MERGE,
+            key: `${ONYXKEYS.COLLECTION.POLICY}${policyID}`,
+            value: {
+                customUnits: {
+                    [customUnit.customUnitID]: {
+                        rates: failureRates,
+                    },
+                },
+            },
+        },
+    ];
+
+    const params: UpdatePolicyDistanceRateValueParams = {
+        policyID,
+        customUnitID: customUnit.customUnitID,
+        customUnitRateArray: JSON.stringify(prepareCustomUnitRatesArray(customUnitRates)),
+    };
+
+    API.write(WRITE_COMMANDS.UPDATE_POLICY_DISTANCE_TAX_RATE_VALUE, params, {optimisticData, successData, failureData});
+}
+
+export {
+    enablePolicyDistanceRates,
+    openPolicyDistanceRatesPage,
+    createPolicyDistanceRate,
+    clearCreateDistanceRateItemAndError,
+    clearDeleteDistanceRateError,
+    setPolicyDistanceRatesUnit,
+    clearPolicyDistanceRatesErrorFields,
+    clearPolicyDistanceRateErrorFields,
+    updatePolicyDistanceRateValue,
+    setPolicyDistanceRatesEnabled,
+    deletePolicyDistanceRates,
+    updateDistanceTaxClaimableValue,
+    updateDistanceTaxRate,
+};
+
+export type {NewCustomUnit};
diff --git a/src/libs/actions/Policy/Member.ts b/src/libs/actions/Policy/Member.ts
new file mode 100644
index 000000000000..1b881f65c831
--- /dev/null
+++ b/src/libs/actions/Policy/Member.ts
@@ -0,0 +1,854 @@
+import type {NullishDeep, OnyxCollection, OnyxCollectionInputValue, OnyxEntry, OnyxUpdate} from 'react-native-onyx';
+import Onyx from 'react-native-onyx';
+import * as API from '@libs/API';
+import type {
+    AddMembersToWorkspaceParams,
+    DeleteMembersFromWorkspaceParams,
+    OpenWorkspaceMembersPageParams,
+    RequestWorkspaceOwnerChangeParams,
+    UpdateWorkspaceMembersRoleParams,
+} from '@libs/API/parameters';
+import {READ_COMMANDS, WRITE_COMMANDS} from '@libs/API/types';
+import * as ErrorUtils from '@libs/ErrorUtils';
+import Log from '@libs/Log';
+import Parser from '@libs/Parser';
+import * as PersonalDetailsUtils from '@libs/PersonalDetailsUtils';
+import * as PhoneNumber from '@libs/PhoneNumber';
+import * as ReportActionsUtils from '@libs/ReportActionsUtils';
+import * as ReportUtils from '@libs/ReportUtils';
+import CONST from '@src/CONST';
+import ONYXKEYS from '@src/ONYXKEYS';
+import type {InvitedEmailsToAccountIDs, PersonalDetailsList, Policy, PolicyEmployee, PolicyOwnershipChangeChecks, Report, ReportAction} from '@src/types/onyx';
+import type {PendingAction} from '@src/types/onyx/OnyxCommon';
+import type {JoinWorkspaceResolution} from '@src/types/onyx/OriginalMessage';
+import type {Attributes, Rate} from '@src/types/onyx/Policy';
+import {isEmptyObject} from '@src/types/utils/EmptyObject';
+import {createPolicyExpenseChats} from './Policy';
+
+type AnnounceRoomMembersOnyxData = {
+    onyxOptimisticData: OnyxUpdate[];
+    onyxSuccessData: OnyxUpdate[];
+    onyxFailureData: OnyxUpdate[];
+};
+
+type NewCustomUnit = {
+    customUnitID: string;
+    name: string;
+    attributes: Attributes;
+    rates: Rate;
+};
+
+type WorkspaceMembersRoleData = {
+    accountID: number;
+    email: string;
+    role: typeof CONST.POLICY.ROLE.ADMIN | typeof CONST.POLICY.ROLE.USER;
+};
+
+const allPolicies: OnyxCollection<Policy> = {};
+Onyx.connect({
+    key: ONYXKEYS.COLLECTION.POLICY,
+    callback: (val, key) => {
+        if (!key) {
+            return;
+        }
+        if (val === null || val === undefined) {
+            // If we are deleting a policy, we have to check every report linked to that policy
+            // and unset the draft indicator (pencil icon) alongside removing any draft comments. Clearing these values will keep the newly archived chats from being displayed in the LHN.
+            // More info: https://github.com/Expensify/App/issues/14260
+            const policyID = key.replace(ONYXKEYS.COLLECTION.POLICY, '');
+            const policyReports = ReportUtils.getAllPolicyReports(policyID);
+            const cleanUpMergeQueries: Record<`${typeof ONYXKEYS.COLLECTION.REPORT}${string}`, NullishDeep<Report>> = {};
+            const cleanUpSetQueries: Record<`${typeof ONYXKEYS.COLLECTION.REPORT_DRAFT_COMMENT}${string}` | `${typeof ONYXKEYS.COLLECTION.REPORT_ACTIONS_DRAFTS}${string}`, null> = {};
+            policyReports.forEach((policyReport) => {
+                if (!policyReport) {
+                    return;
+                }
+                const {reportID} = policyReport;
+                cleanUpSetQueries[`${ONYXKEYS.COLLECTION.REPORT_DRAFT_COMMENT}${reportID}`] = null;
+                cleanUpSetQueries[`${ONYXKEYS.COLLECTION.REPORT_ACTIONS_DRAFTS}${reportID}`] = null;
+            });
+            Onyx.mergeCollection(ONYXKEYS.COLLECTION.REPORT, cleanUpMergeQueries);
+            Onyx.multiSet(cleanUpSetQueries);
+            delete allPolicies[key];
+            return;
+        }
+
+        allPolicies[key] = val;
+    },
+});
+
+let sessionEmail = '';
+let sessionAccountID = 0;
+Onyx.connect({
+    key: ONYXKEYS.SESSION,
+    callback: (val) => {
+        sessionEmail = val?.email ?? '';
+        sessionAccountID = val?.accountID ?? -1;
+    },
+});
+
+let allPersonalDetails: OnyxEntry<PersonalDetailsList>;
+Onyx.connect({
+    key: ONYXKEYS.PERSONAL_DETAILS_LIST,
+    callback: (val) => (allPersonalDetails = val),
+});
+
+let policyOwnershipChecks: Record<string, PolicyOwnershipChangeChecks>;
+Onyx.connect({
+    key: ONYXKEYS.POLICY_OWNERSHIP_CHANGE_CHECKS,
+    callback: (value) => {
+        policyOwnershipChecks = value ?? {};
+    },
+});
+
+/** Check if the passed employee is an approver in the policy's employeeList */
+function isApprover(policy: OnyxEntry<Policy>, employeeAccountID: number) {
+    const employeeLogin = allPersonalDetails?.[employeeAccountID]?.login;
+    if (policy?.approver === employeeLogin) {
+        return true;
+    }
+    return Object.values(policy?.employeeList ?? {}).some(
+        (employee) => employee?.submitsTo === employeeLogin || employee?.forwardsTo === employeeLogin || employee?.overLimitForwardsTo === employeeLogin,
+    );
+}
+
+/**
+ * Returns the policy of the report
+ */
+function getPolicy(policyID: string | undefined): OnyxEntry<Policy> {
+    if (!allPolicies || !policyID) {
+        return undefined;
+    }
+    return allPolicies[`${ONYXKEYS.COLLECTION.POLICY}${policyID}`];
+}
+
+/**
+ * Build optimistic data for adding members to the announcement room
+ */
+function buildAnnounceRoomMembersOnyxData(policyID: string, accountIDs: number[]): AnnounceRoomMembersOnyxData {
+    const announceReport = ReportUtils.getRoom(CONST.REPORT.CHAT_TYPE.POLICY_ANNOUNCE, policyID);
+    const announceRoomMembers: AnnounceRoomMembersOnyxData = {
+        onyxOptimisticData: [],
+        onyxFailureData: [],
+        onyxSuccessData: [],
+    };
+
+    if (!announceReport) {
+        return announceRoomMembers;
+    }
+
+    const participantAccountIDs = [...Object.keys(announceReport.participants ?? {}).map(Number), ...accountIDs];
+    const pendingChatMembers = ReportUtils.getPendingChatMembers(accountIDs, announceReport?.pendingChatMembers ?? [], CONST.RED_BRICK_ROAD_PENDING_ACTION.ADD);
+
+    announceRoomMembers.onyxOptimisticData.push({
+        onyxMethod: Onyx.METHOD.MERGE,
+        key: `${ONYXKEYS.COLLECTION.REPORT}${announceReport?.reportID}`,
+        value: {
+            participants: ReportUtils.buildParticipantsFromAccountIDs(participantAccountIDs),
+            pendingChatMembers,
+        },
+    });
+
+    announceRoomMembers.onyxFailureData.push({
+        onyxMethod: Onyx.METHOD.MERGE,
+        key: `${ONYXKEYS.COLLECTION.REPORT}${announceReport?.reportID}`,
+        value: {
+            participants: announceReport?.participants ?? null,
+            pendingChatMembers: announceReport?.pendingChatMembers ?? null,
+        },
+    });
+    announceRoomMembers.onyxSuccessData.push({
+        onyxMethod: Onyx.METHOD.MERGE,
+        key: `${ONYXKEYS.COLLECTION.REPORT}${announceReport?.reportID}`,
+        value: {
+            pendingChatMembers: announceReport?.pendingChatMembers ?? null,
+        },
+    });
+    return announceRoomMembers;
+}
+
+/**
+ * Build optimistic data for removing users from the announcement room
+ */
+function removeOptimisticAnnounceRoomMembers(policyID: string, policyName: string, accountIDs: number[]): AnnounceRoomMembersOnyxData {
+    const announceReport = ReportUtils.getRoom(CONST.REPORT.CHAT_TYPE.POLICY_ANNOUNCE, policyID);
+    const announceRoomMembers: AnnounceRoomMembersOnyxData = {
+        onyxOptimisticData: [],
+        onyxFailureData: [],
+        onyxSuccessData: [],
+    };
+
+    if (!announceReport) {
+        return announceRoomMembers;
+    }
+
+    const pendingChatMembers = ReportUtils.getPendingChatMembers(accountIDs, announceReport?.pendingChatMembers ?? [], CONST.RED_BRICK_ROAD_PENDING_ACTION.DELETE);
+
+    announceRoomMembers.onyxOptimisticData.push({
+        onyxMethod: Onyx.METHOD.MERGE,
+        key: `${ONYXKEYS.COLLECTION.REPORT}${announceReport.reportID}`,
+        value: {
+            pendingChatMembers,
+            ...(accountIDs.includes(sessionAccountID)
+                ? {
+                      statusNum: CONST.REPORT.STATUS_NUM.CLOSED,
+                      stateNum: CONST.REPORT.STATE_NUM.APPROVED,
+                      oldPolicyName: policyName,
+                  }
+                : {}),
+        },
+    });
+    announceRoomMembers.onyxFailureData.push({
+        onyxMethod: Onyx.METHOD.MERGE,
+        key: `${ONYXKEYS.COLLECTION.REPORT}${announceReport.reportID}`,
+        value: {
+            pendingChatMembers: announceReport?.pendingChatMembers ?? null,
+            ...(accountIDs.includes(sessionAccountID)
+                ? {
+                      statusNum: announceReport.statusNum,
+                      stateNum: announceReport.stateNum,
+                      oldPolicyName: announceReport.oldPolicyName,
+                  }
+                : {}),
+        },
+    });
+    announceRoomMembers.onyxSuccessData.push({
+        onyxMethod: Onyx.METHOD.MERGE,
+        key: `${ONYXKEYS.COLLECTION.REPORT}${announceReport.reportID}`,
+        value: {
+            pendingChatMembers: announceReport?.pendingChatMembers ?? null,
+        },
+    });
+
+    return announceRoomMembers;
+}
+
+/**
+ * Remove the passed members from the policy employeeList
+ * Please see https://github.com/Expensify/App/blob/main/README.md#Security for more details
+ */
+function removeMembers(accountIDs: number[], policyID: string) {
+    // In case user selects only themselves (admin), their email will be filtered out and the members
+    // array passed will be empty, prevent the function from proceeding in that case as there is no one to remove
+    if (accountIDs.length === 0) {
+        return;
+    }
+
+    const policyKey = `${ONYXKEYS.COLLECTION.POLICY}${policyID}` as const;
+    const policy = getPolicy(policyID);
+
+    const workspaceChats = ReportUtils.getWorkspaceChats(policyID, accountIDs);
+    const emailList = accountIDs.map((accountID) => allPersonalDetails?.[accountID]?.login).filter((login) => !!login) as string[];
+    const optimisticClosedReportActions = workspaceChats.map(() =>
+        ReportUtils.buildOptimisticClosedReportAction(sessionEmail, policy?.name ?? '', CONST.REPORT.ARCHIVE_REASON.REMOVED_FROM_POLICY),
+    );
+
+    const announceRoomMembers = removeOptimisticAnnounceRoomMembers(policy?.id ?? '-1', policy?.name ?? '', accountIDs);
+
+    const optimisticMembersState: OnyxCollectionInputValue<PolicyEmployee> = {};
+    const successMembersState: OnyxCollectionInputValue<PolicyEmployee> = {};
+    const failureMembersState: OnyxCollectionInputValue<PolicyEmployee> = {};
+    emailList.forEach((email) => {
+        optimisticMembersState[email] = {pendingAction: CONST.RED_BRICK_ROAD_PENDING_ACTION.DELETE};
+        successMembersState[email] = null;
+        failureMembersState[email] = {errors: ErrorUtils.getMicroSecondOnyxErrorWithTranslationKey('workspace.people.error.genericRemove')};
+    });
+
+    Object.keys(policy?.employeeList ?? {}).forEach((employeeEmail) => {
+        const employee = policy?.employeeList?.[employeeEmail];
+        optimisticMembersState[employeeEmail] = optimisticMembersState[employeeEmail] ?? {};
+        failureMembersState[employeeEmail] = failureMembersState[employeeEmail] ?? {};
+        if (employee?.submitsTo && emailList.includes(employee?.submitsTo)) {
+            optimisticMembersState[employeeEmail] = {
+                ...optimisticMembersState[employeeEmail],
+                submitsTo: policy?.owner,
+            };
+            failureMembersState[employeeEmail] = {
+                ...failureMembersState[employeeEmail],
+                submitsTo: employee?.submitsTo,
+            };
+        }
+        if (employee?.forwardsTo && emailList.includes(employee?.forwardsTo)) {
+            optimisticMembersState[employeeEmail] = {
+                ...optimisticMembersState[employeeEmail],
+                forwardsTo: policy?.owner,
+            };
+            failureMembersState[employeeEmail] = {
+                ...failureMembersState[employeeEmail],
+                forwardsTo: employee?.forwardsTo,
+            };
+        }
+        if (employee?.overLimitForwardsTo && emailList.includes(employee?.overLimitForwardsTo)) {
+            optimisticMembersState[employeeEmail] = {
+                ...optimisticMembersState[employeeEmail],
+                overLimitForwardsTo: policy?.owner,
+            };
+            failureMembersState[employeeEmail] = {
+                ...failureMembersState[employeeEmail],
+                overLimitForwardsTo: employee?.overLimitForwardsTo,
+            };
+        }
+    });
+
+    const optimisticData: OnyxUpdate[] = [
+        {
+            onyxMethod: Onyx.METHOD.MERGE,
+            key: policyKey,
+            value: {employeeList: optimisticMembersState, approver: emailList.includes(policy?.approver ?? '') ? policy?.owner : policy?.approver},
+        },
+    ];
+    optimisticData.push(...announceRoomMembers.onyxOptimisticData);
+
+    const successData: OnyxUpdate[] = [
+        {
+            onyxMethod: Onyx.METHOD.MERGE,
+            key: policyKey,
+            value: {employeeList: successMembersState},
+        },
+    ];
+    successData.push(...announceRoomMembers.onyxSuccessData);
+
+    const failureData: OnyxUpdate[] = [
+        {
+            onyxMethod: Onyx.METHOD.MERGE,
+            key: policyKey,
+            value: {employeeList: failureMembersState, approver: policy?.approver},
+        },
+    ];
+    failureData.push(...announceRoomMembers.onyxFailureData);
+
+    const pendingChatMembers = ReportUtils.getPendingChatMembers(accountIDs, [], CONST.RED_BRICK_ROAD_PENDING_ACTION.DELETE);
+
+    workspaceChats.forEach((report) => {
+        optimisticData.push({
+            onyxMethod: Onyx.METHOD.MERGE,
+            key: `${ONYXKEYS.COLLECTION.REPORT}${report?.reportID}`,
+            value: {
+                statusNum: CONST.REPORT.STATUS_NUM.CLOSED,
+                stateNum: CONST.REPORT.STATE_NUM.APPROVED,
+                oldPolicyName: policy?.name,
+                pendingChatMembers,
+            },
+        });
+        successData.push({
+            onyxMethod: Onyx.METHOD.MERGE,
+            key: `${ONYXKEYS.COLLECTION.REPORT}${report?.reportID}`,
+            value: {
+                pendingChatMembers: null,
+            },
+        });
+        failureData.push({
+            onyxMethod: Onyx.METHOD.MERGE,
+            key: `${ONYXKEYS.COLLECTION.REPORT}${report?.reportID}`,
+            value: {
+                pendingChatMembers: null,
+            },
+        });
+    });
+    // comment out for time this issue would be resolved https://github.com/Expensify/App/issues/35952
+    // optimisticClosedReportActions.forEach((reportAction, index) => {
+    //     optimisticData.push({
+    //         onyxMethod: Onyx.METHOD.MERGE,
+    //         key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${workspaceChats?.[index]?.reportID}`,
+    //         value: {[reportAction.reportActionID]: reportAction as ReportAction},
+    //     });
+    // });
+
+    // If the policy has primaryLoginsInvited, then it displays informative messages on the members page about which primary logins were added by secondary logins.
+    // If we delete all these logins then we should clear the informative messages since they are no longer relevant.
+    if (!isEmptyObject(policy?.primaryLoginsInvited ?? {})) {
+        // Take the current policy members and remove them optimistically
+        const employeeListEmails = Object.keys(allPolicies?.[`${ONYXKEYS.COLLECTION.POLICY}${policyID}`]?.employeeList ?? {});
+        const remainingLogins = employeeListEmails.filter((email) => !emailList.includes(email));
+        const invitedPrimaryToSecondaryLogins: Record<string, string> = {};
+
+        if (policy?.primaryLoginsInvited) {
+            Object.keys(policy.primaryLoginsInvited).forEach((key) => (invitedPrimaryToSecondaryLogins[policy.primaryLoginsInvited?.[key] ?? ''] = key));
+        }
+
+        // Then, if no remaining members exist that were invited by a secondary login, clear the informative messages
+        if (!remainingLogins.some((remainingLogin) => !!invitedPrimaryToSecondaryLogins[remainingLogin])) {
+            optimisticData.push({
+                onyxMethod: Onyx.METHOD.MERGE,
+                key: policyKey,
+                value: {
+                    primaryLoginsInvited: null,
+                },
+            });
+        }
+    }
+
+    const filteredWorkspaceChats = workspaceChats.filter((report): report is Report => report !== null);
+
+    filteredWorkspaceChats.forEach(({reportID, stateNum, statusNum, oldPolicyName = null}) => {
+        failureData.push({
+            onyxMethod: Onyx.METHOD.MERGE,
+            key: `${ONYXKEYS.COLLECTION.REPORT}${reportID}`,
+            value: {
+                stateNum,
+                statusNum,
+                oldPolicyName,
+            },
+        });
+    });
+    optimisticClosedReportActions.forEach((reportAction, index) => {
+        failureData.push({
+            onyxMethod: Onyx.METHOD.MERGE,
+            key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${workspaceChats?.[index]?.reportID}`,
+            value: {[reportAction.reportActionID]: null},
+        });
+    });
+
+    const params: DeleteMembersFromWorkspaceParams = {
+        emailList: emailList.join(','),
+        policyID,
+    };
+
+    API.write(WRITE_COMMANDS.DELETE_MEMBERS_FROM_WORKSPACE, params, {optimisticData, successData, failureData});
+}
+
+function updateWorkspaceMembersRole(policyID: string, accountIDs: number[], newRole: typeof CONST.POLICY.ROLE.ADMIN | typeof CONST.POLICY.ROLE.USER) {
+    const previousEmployeeList = {...allPolicies?.[policyID]?.employeeList};
+    const memberRoles: WorkspaceMembersRoleData[] = accountIDs.reduce((result: WorkspaceMembersRoleData[], accountID: number) => {
+        if (!allPersonalDetails?.[accountID]?.login) {
+            return result;
+        }
+
+        result.push({
+            accountID,
+            email: allPersonalDetails?.[accountID]?.login ?? '',
+            role: newRole,
+        });
+
+        return result;
+    }, []);
+
+    const optimisticData: OnyxUpdate[] = [
+        {
+            onyxMethod: Onyx.METHOD.MERGE,
+            key: `${ONYXKEYS.COLLECTION.POLICY}${policyID}`,
+            value: {
+                employeeList: {
+                    ...memberRoles.reduce((member: Record<string, {role: string; pendingAction: PendingAction}>, current) => {
+                        // eslint-disable-next-line no-param-reassign
+                        member[current.email] = {role: current?.role, pendingAction: CONST.RED_BRICK_ROAD_PENDING_ACTION.UPDATE};
+                        return member;
+                    }, {}),
+                },
+                errors: null,
+            },
+        },
+    ];
+
+    const successData: OnyxUpdate[] = [
+        {
+            onyxMethod: Onyx.METHOD.MERGE,
+            key: `${ONYXKEYS.COLLECTION.POLICY}${policyID}`,
+            value: {
+                employeeList: {
+                    ...memberRoles.reduce((member: Record<string, {role: string; pendingAction: PendingAction}>, current) => {
+                        // eslint-disable-next-line no-param-reassign
+                        member[current.email] = {role: current?.role, pendingAction: null};
+                        return member;
+                    }, {}),
+                },
+                errors: null,
+            },
+        },
+    ];
+
+    const failureData: OnyxUpdate[] = [
+        {
+            onyxMethod: Onyx.METHOD.MERGE,
+            key: `${ONYXKEYS.COLLECTION.POLICY}${policyID}`,
+            value: {
+                employeeList: previousEmployeeList,
+                errors: ErrorUtils.getMicroSecondOnyxErrorWithTranslationKey('workspace.editor.genericFailureMessage'),
+            },
+        },
+    ];
+
+    const params: UpdateWorkspaceMembersRoleParams = {
+        policyID,
+        employees: JSON.stringify(memberRoles.map((item) => ({email: item.email, role: item.role}))),
+    };
+
+    API.write(WRITE_COMMANDS.UPDATE_WORKSPACE_MEMBERS_ROLE, params, {optimisticData, successData, failureData});
+}
+
+function requestWorkspaceOwnerChange(policyID: string) {
+    const policy = getPolicy(policyID);
+    const ownershipChecks = {...policyOwnershipChecks?.[policyID]} ?? {};
+
+    const changeOwnerErrors = Object.keys(policy?.errorFields?.changeOwner ?? {});
+
+    if (changeOwnerErrors && changeOwnerErrors.length > 0) {
+        const currentError = changeOwnerErrors[0];
+        if (currentError === CONST.POLICY.OWNERSHIP_ERRORS.AMOUNT_OWED) {
+            ownershipChecks.shouldClearOutstandingBalance = true;
+        }
+
+        if (currentError === CONST.POLICY.OWNERSHIP_ERRORS.OWNER_OWES_AMOUNT) {
+            ownershipChecks.shouldTransferAmountOwed = true;
+        }
+
+        if (currentError === CONST.POLICY.OWNERSHIP_ERRORS.SUBSCRIPTION) {
+            ownershipChecks.shouldTransferSubscription = true;
+        }
+
+        if (currentError === CONST.POLICY.OWNERSHIP_ERRORS.DUPLICATE_SUBSCRIPTION) {
+            ownershipChecks.shouldTransferSingleSubscription = true;
+        }
+
+        Onyx.merge(ONYXKEYS.POLICY_OWNERSHIP_CHANGE_CHECKS, {
+            [policyID]: ownershipChecks,
+        });
+    }
+
+    const optimisticData: OnyxUpdate[] = [
+        {
+            onyxMethod: Onyx.METHOD.MERGE,
+            key: `${ONYXKEYS.COLLECTION.POLICY}${policyID}`,
+            value: {
+                errorFields: null,
+                isLoading: true,
+                isChangeOwnerSuccessful: false,
+                isChangeOwnerFailed: false,
+            },
+        },
+    ];
+
+    const successData: OnyxUpdate[] = [
+        {
+            onyxMethod: Onyx.METHOD.MERGE,
+            key: `${ONYXKEYS.COLLECTION.POLICY}${policyID}`,
+            value: {
+                isLoading: false,
+                isChangeOwnerSuccessful: true,
+                isChangeOwnerFailed: false,
+                owner: sessionEmail,
+                ownerAccountID: sessionAccountID,
+            },
+        },
+    ];
+
+    const failureData: OnyxUpdate[] = [
+        {
+            onyxMethod: Onyx.METHOD.MERGE,
+            key: `${ONYXKEYS.COLLECTION.POLICY}${policyID}`,
+            value: {
+                isLoading: false,
+                isChangeOwnerSuccessful: false,
+                isChangeOwnerFailed: true,
+            },
+        },
+    ];
+
+    const params: RequestWorkspaceOwnerChangeParams = {
+        policyID,
+        ...ownershipChecks,
+    };
+
+    API.write(WRITE_COMMANDS.REQUEST_WORKSPACE_OWNER_CHANGE, params, {optimisticData, successData, failureData});
+}
+
+function clearWorkspaceOwnerChangeFlow(policyID: string) {
+    Onyx.merge(ONYXKEYS.POLICY_OWNERSHIP_CHANGE_CHECKS, null);
+    Onyx.merge(`${ONYXKEYS.COLLECTION.POLICY}${policyID}`, {
+        errorFields: null,
+        isLoading: false,
+        isChangeOwnerSuccessful: false,
+        isChangeOwnerFailed: false,
+    });
+}
+
+/**
+ * Adds members to the specified workspace/policyID
+ * Please see https://github.com/Expensify/App/blob/main/README.md#Security for more details
+ */
+function addMembersToWorkspace(invitedEmailsToAccountIDs: InvitedEmailsToAccountIDs, welcomeNote: string, policyID: string) {
+    const policyKey = `${ONYXKEYS.COLLECTION.POLICY}${policyID}` as const;
+    const logins = Object.keys(invitedEmailsToAccountIDs).map((memberLogin) => PhoneNumber.addSMSDomainIfPhoneNumber(memberLogin));
+    const accountIDs = Object.values(invitedEmailsToAccountIDs);
+
+    const {newAccountIDs, newLogins} = PersonalDetailsUtils.getNewAccountIDsAndLogins(logins, accountIDs);
+    const newPersonalDetailsOnyxData = PersonalDetailsUtils.getPersonalDetailsOnyxDataForOptimisticUsers(newLogins, newAccountIDs);
+
+    const announceRoomMembers = buildAnnounceRoomMembersOnyxData(policyID, accountIDs);
+
+    // create onyx data for policy expense chats for each new member
+    const membersChats = createPolicyExpenseChats(policyID, invitedEmailsToAccountIDs);
+
+    const optimisticMembersState: OnyxCollectionInputValue<PolicyEmployee> = {};
+    const successMembersState: OnyxCollectionInputValue<PolicyEmployee> = {};
+    const failureMembersState: OnyxCollectionInputValue<PolicyEmployee> = {};
+    logins.forEach((email) => {
+        optimisticMembersState[email] = {pendingAction: CONST.RED_BRICK_ROAD_PENDING_ACTION.ADD, role: CONST.POLICY.ROLE.USER};
+        successMembersState[email] = {pendingAction: null};
+        failureMembersState[email] = {
+            errors: ErrorUtils.getMicroSecondOnyxErrorWithTranslationKey('workspace.people.error.genericAdd'),
+        };
+    });
+
+    const optimisticData: OnyxUpdate[] = [
+        {
+            onyxMethod: Onyx.METHOD.MERGE,
+            key: policyKey,
+
+            // Convert to object with each key containing {pendingAction: ‘add’}
+            value: {
+                employeeList: optimisticMembersState,
+            },
+        },
+    ];
+    optimisticData.push(...newPersonalDetailsOnyxData.optimisticData, ...membersChats.onyxOptimisticData, ...announceRoomMembers.onyxOptimisticData);
+
+    const successData: OnyxUpdate[] = [
+        {
+            onyxMethod: Onyx.METHOD.MERGE,
+            key: policyKey,
+            value: {
+                employeeList: successMembersState,
+            },
+        },
+    ];
+    successData.push(...newPersonalDetailsOnyxData.finallyData, ...membersChats.onyxSuccessData, ...announceRoomMembers.onyxSuccessData);
+
+    const failureData: OnyxUpdate[] = [
+        {
+            onyxMethod: Onyx.METHOD.MERGE,
+            key: policyKey,
+
+            // Convert to object with each key containing the error. We don’t
+            // need to remove the members since that is handled by onClose of OfflineWithFeedback.
+            value: {
+                employeeList: failureMembersState,
+            },
+        },
+    ];
+    failureData.push(...membersChats.onyxFailureData, ...announceRoomMembers.onyxFailureData);
+
+    const params: AddMembersToWorkspaceParams = {
+        employees: JSON.stringify(logins.map((login) => ({email: login}))),
+        welcomeNote: Parser.replace(welcomeNote),
+        policyID,
+    };
+    if (!isEmptyObject(membersChats.reportCreationData)) {
+        params.reportCreationData = JSON.stringify(membersChats.reportCreationData);
+    }
+    API.write(WRITE_COMMANDS.ADD_MEMBERS_TO_WORKSPACE, params, {optimisticData, successData, failureData});
+}
+
+/**
+ * Invite member to the specified policyID
+ * Please see https://github.com/Expensify/App/blob/main/README.md#Security for more details
+ */
+function inviteMemberToWorkspace(policyID: string, inviterEmail: string) {
+    const memberJoinKey = `${ONYXKEYS.COLLECTION.POLICY_JOIN_MEMBER}${policyID}` as const;
+
+    const optimisticMembersState = {policyID, inviterEmail};
+    const failureMembersState = {policyID, inviterEmail};
+
+    const optimisticData: OnyxUpdate[] = [
+        {
+            onyxMethod: Onyx.METHOD.MERGE,
+            key: memberJoinKey,
+            value: optimisticMembersState,
+        },
+    ];
+
+    const failureData: OnyxUpdate[] = [
+        {
+            onyxMethod: Onyx.METHOD.MERGE,
+            key: memberJoinKey,
+            value: {...failureMembersState, errors: ErrorUtils.getMicroSecondOnyxErrorWithTranslationKey('iou.error.genericEditFailureMessage')},
+        },
+    ];
+
+    const params = {policyID, inviterEmail};
+
+    API.write(WRITE_COMMANDS.JOIN_POLICY_VIA_INVITE_LINK, params, {optimisticData, failureData});
+}
+
+/**
+ * Removes an error after trying to delete a member
+ */
+function clearDeleteMemberError(policyID: string, accountID: number) {
+    const email = allPersonalDetails?.[accountID]?.login ?? '';
+    Onyx.merge(`${ONYXKEYS.COLLECTION.POLICY}${policyID}`, {
+        employeeList: {
+            [email]: {
+                pendingAction: null,
+                errors: null,
+            },
+        },
+    });
+}
+
+/**
+ * Removes an error after trying to add a member
+ */
+function clearAddMemberError(policyID: string, accountID: number) {
+    const email = allPersonalDetails?.[accountID]?.login ?? '';
+    Onyx.merge(`${ONYXKEYS.COLLECTION.POLICY}${policyID}`, {
+        employeeList: {
+            [email]: null,
+        },
+    });
+    Onyx.merge(`${ONYXKEYS.PERSONAL_DETAILS_LIST}`, {
+        [accountID]: null,
+    });
+}
+
+function openWorkspaceMembersPage(policyID: string, clientMemberEmails: string[]) {
+    if (!policyID || !clientMemberEmails) {
+        Log.warn('openWorkspaceMembersPage invalid params', {policyID, clientMemberEmails});
+        return;
+    }
+
+    const params: OpenWorkspaceMembersPageParams = {
+        policyID,
+        clientMemberEmails: JSON.stringify(clientMemberEmails),
+    };
+
+    API.read(READ_COMMANDS.OPEN_WORKSPACE_MEMBERS_PAGE, params);
+}
+
+function setWorkspaceInviteMembersDraft(policyID: string, invitedEmailsToAccountIDs: InvitedEmailsToAccountIDs) {
+    Onyx.set(`${ONYXKEYS.COLLECTION.WORKSPACE_INVITE_MEMBERS_DRAFT}${policyID}`, invitedEmailsToAccountIDs);
+}
+
+/**
+ * Accept user join request to a workspace
+ */
+function acceptJoinRequest(reportID: string, reportAction: OnyxEntry<ReportAction>) {
+    const choice = CONST.REPORT.ACTIONABLE_MENTION_JOIN_WORKSPACE_RESOLUTION.ACCEPT;
+    if (!reportAction) {
+        return;
+    }
+
+    const optimisticData: OnyxUpdate[] = [
+        {
+            onyxMethod: Onyx.METHOD.MERGE,
+            key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${reportID}`,
+            value: {
+                [reportAction.reportActionID]: {
+                    originalMessage: {choice},
+                    pendingAction: CONST.RED_BRICK_ROAD_PENDING_ACTION.UPDATE,
+                },
+            },
+        },
+    ];
+
+    const successData: OnyxUpdate[] = [
+        {
+            onyxMethod: Onyx.METHOD.MERGE,
+            key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${reportID}`,
+            value: {
+                [reportAction.reportActionID]: {
+                    originalMessage: {choice},
+                    pendingAction: null,
+                },
+            },
+        },
+    ];
+
+    const failureData: OnyxUpdate[] = [
+        {
+            onyxMethod: Onyx.METHOD.MERGE,
+            key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${reportID}`,
+            value: {
+                [reportAction.reportActionID]: {
+                    originalMessage: {choice: '' as JoinWorkspaceResolution},
+                    pendingAction: null,
+                },
+            },
+        },
+    ];
+
+    const parameters = {
+        requests: JSON.stringify({
+            [ReportActionsUtils.isActionableJoinRequest(reportAction) ? ReportActionsUtils.getOriginalMessage(reportAction)?.policyID ?? 0 : 0]: {
+                requests: [{accountID: reportAction?.actorAccountID, adminsRoomMessageReportActionID: reportAction.reportActionID}],
+            },
+        }),
+    };
+
+    API.write(WRITE_COMMANDS.ACCEPT_JOIN_REQUEST, parameters, {optimisticData, failureData, successData});
+}
+
+/**
+ * Decline user join request to a workspace
+ */
+function declineJoinRequest(reportID: string, reportAction: OnyxEntry<ReportAction>) {
+    if (!reportAction) {
+        return;
+    }
+    const choice = CONST.REPORT.ACTIONABLE_MENTION_JOIN_WORKSPACE_RESOLUTION.DECLINE;
+    const optimisticData: OnyxUpdate[] = [
+        {
+            onyxMethod: Onyx.METHOD.MERGE,
+            key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${reportID}`,
+            value: {
+                [reportAction.reportActionID]: {
+                    originalMessage: {choice},
+                    pendingAction: CONST.RED_BRICK_ROAD_PENDING_ACTION.UPDATE,
+                },
+            },
+        },
+    ];
+
+    const successData: OnyxUpdate[] = [
+        {
+            onyxMethod: Onyx.METHOD.MERGE,
+            key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${reportID}`,
+            value: {
+                [reportAction.reportActionID]: {
+                    originalMessage: {choice},
+                    pendingAction: null,
+                },
+            },
+        },
+    ];
+
+    const failureData: OnyxUpdate[] = [
+        {
+            onyxMethod: Onyx.METHOD.MERGE,
+            key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${reportID}`,
+            value: {
+                [reportAction.reportActionID]: {
+                    originalMessage: {choice: '' as JoinWorkspaceResolution},
+                    pendingAction: null,
+                },
+            },
+        },
+    ];
+
+    const parameters = {
+        requests: JSON.stringify({
+            [ReportActionsUtils.isActionableJoinRequest(reportAction) ? ReportActionsUtils.getOriginalMessage(reportAction)?.policyID ?? 0 : 0]: {
+                requests: [{accountID: reportAction?.actorAccountID, adminsRoomMessageReportActionID: reportAction.reportActionID}],
+            },
+        }),
+    };
+
+    API.write(WRITE_COMMANDS.DECLINE_JOIN_REQUEST, parameters, {optimisticData, failureData, successData});
+}
+
+export {
+    removeMembers,
+    updateWorkspaceMembersRole,
+    requestWorkspaceOwnerChange,
+    clearWorkspaceOwnerChangeFlow,
+    addMembersToWorkspace,
+    clearDeleteMemberError,
+    clearAddMemberError,
+    openWorkspaceMembersPage,
+    setWorkspaceInviteMembersDraft,
+    inviteMemberToWorkspace,
+    acceptJoinRequest,
+    declineJoinRequest,
+    isApprover,
+};
+
+export type {NewCustomUnit};
diff --git a/src/libs/actions/Policy/Policy.ts b/src/libs/actions/Policy/Policy.ts
new file mode 100644
index 000000000000..87998f780641
--- /dev/null
+++ b/src/libs/actions/Policy/Policy.ts
@@ -0,0 +1,3831 @@
+import {PUBLIC_DOMAINS, Str} from 'expensify-common';
+import {escapeRegExp} from 'lodash';
+import lodashClone from 'lodash/clone';
+import type {NullishDeep, OnyxCollection, OnyxEntry, OnyxUpdate} from 'react-native-onyx';
+import Onyx from 'react-native-onyx';
+import type {ValueOf} from 'type-fest';
+import type {ReportExportType} from '@components/ButtonWithDropdownMenu/types';
+import * as API from '@libs/API';
+import type {
+    AddBillingCardAndRequestWorkspaceOwnerChangeParams,
+    CreateWorkspaceFromIOUPaymentParams,
+    CreateWorkspaceParams,
+    DeleteWorkspaceAvatarParams,
+    DeleteWorkspaceParams,
+    EnablePolicyCompanyCardsParams,
+    EnablePolicyConnectionsParams,
+    EnablePolicyExpensifyCardsParams,
+    EnablePolicyInvoicingParams,
+    EnablePolicyReportFieldsParams,
+    EnablePolicyTaxesParams,
+    EnablePolicyWorkflowsParams,
+    LeavePolicyParams,
+    OpenDraftWorkspaceRequestParams,
+    OpenPolicyEditCardLimitTypePageParams,
+    OpenPolicyExpensifyCardsPageParams,
+    OpenPolicyInitialPageParams,
+    OpenPolicyMoreFeaturesPageParams,
+    OpenPolicyProfilePageParams,
+    OpenPolicyTaxesPageParams,
+    OpenPolicyWorkflowsPageParams,
+    OpenWorkspaceInvitePageParams,
+    OpenWorkspaceParams,
+    OpenWorkspaceReimburseViewParams,
+    RequestExpensifyCardLimitIncreaseParams,
+    SetWorkspaceApprovalModeParams,
+    SetWorkspaceAutoReportingFrequencyParams,
+    SetWorkspaceAutoReportingMonthlyOffsetParams,
+    SetWorkspacePayerParams,
+    SetWorkspaceReimbursementParams,
+    UpdateWorkspaceAvatarParams,
+    UpdateWorkspaceCustomUnitAndRateParams,
+    UpdateWorkspaceDescriptionParams,
+    UpdateWorkspaceGeneralSettingsParams,
+    UpgradeToCorporateParams,
+} from '@libs/API/parameters';
+import type SetPolicyRulesEnabledParams from '@libs/API/parameters/SetPolicyRulesEnabledParams';
+import type UpdatePolicyAddressParams from '@libs/API/parameters/UpdatePolicyAddressParams';
+import {READ_COMMANDS, WRITE_COMMANDS} from '@libs/API/types';
+import * as CurrencyUtils from '@libs/CurrencyUtils';
+import DateUtils from '@libs/DateUtils';
+import * as ErrorUtils from '@libs/ErrorUtils';
+import getIsNarrowLayout from '@libs/getIsNarrowLayout';
+import Log from '@libs/Log';
+import * as NetworkStore from '@libs/Network/NetworkStore';
+import * as NumberUtils from '@libs/NumberUtils';
+import * as PersonalDetailsUtils from '@libs/PersonalDetailsUtils';
+import * as PhoneNumber from '@libs/PhoneNumber';
+import * as PolicyUtils from '@libs/PolicyUtils';
+import {navigateWhenEnableFeature} from '@libs/PolicyUtils';
+import * as ReportActionsUtils from '@libs/ReportActionsUtils';
+import * as ReportConnection from '@libs/ReportConnection';
+import * as ReportUtils from '@libs/ReportUtils';
+import * as TransactionUtils from '@libs/TransactionUtils';
+import type {PolicySelector} from '@pages/home/sidebar/SidebarScreen/FloatingActionButtonAndPopover';
+import * as PersistedRequests from '@userActions/PersistedRequests';
+import CONST from '@src/CONST';
+import ONYXKEYS from '@src/ONYXKEYS';
+import type {
+    InvitedEmailsToAccountIDs,
+    PersonalDetailsList,
+    Policy,
+    PolicyCategory,
+    ReimbursementAccount,
+    Report,
+    ReportAction,
+    Request,
+    TaxRatesWithDefault,
+    Transaction,
+} from '@src/types/onyx';
+import type {Errors} from '@src/types/onyx/OnyxCommon';
+import type {Attributes, CompanyAddress, CustomUnit, Rate, TaxRate, Unit} from '@src/types/onyx/Policy';
+import type {OnyxData} from '@src/types/onyx/Request';
+import {isEmptyObject} from '@src/types/utils/EmptyObject';
+import {buildOptimisticPolicyCategories} from './Category';
+
+type ReportCreationData = Record<
+    string,
+    {
+        reportID: string;
+        reportActionID?: string;
+    }
+>;
+
+type WorkspaceMembersChats = {
+    onyxSuccessData: OnyxUpdate[];
+    onyxOptimisticData: OnyxUpdate[];
+    onyxFailureData: OnyxUpdate[];
+    reportCreationData: ReportCreationData;
+};
+
+type OptimisticCustomUnits = {
+    customUnits: Record<string, CustomUnit>;
+    customUnitID: string;
+    customUnitRateID: string;
+    outputCurrency: string;
+};
+
+type NewCustomUnit = {
+    customUnitID: string;
+    name: string;
+    attributes: Attributes;
+    rates: Rate;
+};
+
+type WorkspaceFromIOUCreationData = {
+    policyID: string;
+    workspaceChatReportID: string;
+    reportPreviewReportActionID?: string;
+};
+
+const allPolicies: OnyxCollection<Policy> = {};
+Onyx.connect({
+    key: ONYXKEYS.COLLECTION.POLICY,
+    callback: (val, key) => {
+        if (!key) {
+            return;
+        }
+        if (val === null || val === undefined) {
+            // If we are deleting a policy, we have to check every report linked to that policy
+            // and unset the draft indicator (pencil icon) alongside removing any draft comments. Clearing these values will keep the newly archived chats from being displayed in the LHN.
+            // More info: https://github.com/Expensify/App/issues/14260
+            const policyID = key.replace(ONYXKEYS.COLLECTION.POLICY, '');
+            const policyReports = ReportUtils.getAllPolicyReports(policyID);
+            const cleanUpMergeQueries: Record<`${typeof ONYXKEYS.COLLECTION.REPORT}${string}`, NullishDeep<Report>> = {};
+            const cleanUpSetQueries: Record<`${typeof ONYXKEYS.COLLECTION.REPORT_DRAFT_COMMENT}${string}` | `${typeof ONYXKEYS.COLLECTION.REPORT_ACTIONS_DRAFTS}${string}`, null> = {};
+            policyReports.forEach((policyReport) => {
+                if (!policyReport) {
+                    return;
+                }
+                const {reportID} = policyReport;
+                cleanUpSetQueries[`${ONYXKEYS.COLLECTION.REPORT_DRAFT_COMMENT}${reportID}`] = null;
+                cleanUpSetQueries[`${ONYXKEYS.COLLECTION.REPORT_ACTIONS_DRAFTS}${reportID}`] = null;
+            });
+            Onyx.mergeCollection(ONYXKEYS.COLLECTION.REPORT, cleanUpMergeQueries);
+            Onyx.multiSet(cleanUpSetQueries);
+            delete allPolicies[key];
+            return;
+        }
+
+        allPolicies[key] = val;
+    },
+});
+
+let lastAccessedWorkspacePolicyID: OnyxEntry<string>;
+Onyx.connect({
+    key: ONYXKEYS.LAST_ACCESSED_WORKSPACE_POLICY_ID,
+    callback: (value) => (lastAccessedWorkspacePolicyID = value),
+});
+
+let sessionEmail = '';
+let sessionAccountID = 0;
+Onyx.connect({
+    key: ONYXKEYS.SESSION,
+    callback: (val) => {
+        sessionEmail = val?.email ?? '';
+        sessionAccountID = val?.accountID ?? -1;
+    },
+});
+
+let allPersonalDetails: OnyxEntry<PersonalDetailsList>;
+Onyx.connect({
+    key: ONYXKEYS.PERSONAL_DETAILS_LIST,
+    callback: (val) => (allPersonalDetails = val),
+});
+
+let reimbursementAccount: OnyxEntry<ReimbursementAccount>;
+Onyx.connect({
+    key: ONYXKEYS.REIMBURSEMENT_ACCOUNT,
+    callback: (val) => (reimbursementAccount = val),
+});
+
+/**
+ * Stores in Onyx the policy ID of the last workspace that was accessed by the user
+ */
+function updateLastAccessedWorkspace(policyID: OnyxEntry<string>) {
+    Onyx.set(ONYXKEYS.LAST_ACCESSED_WORKSPACE_POLICY_ID, policyID ?? null);
+}
+
+/**
+ * Checks if the currency is supported for direct reimbursement
+ * USD currency is the only one supported in NewDot for now
+ */
+function isCurrencySupportedForDirectReimbursement(currency: string) {
+    return currency === CONST.CURRENCY.USD;
+}
+
+/**
+ * Returns the policy of the report
+ */
+function getPolicy(policyID: string | undefined): OnyxEntry<Policy> {
+    if (!allPolicies || !policyID) {
+        return undefined;
+    }
+    return allPolicies[`${ONYXKEYS.COLLECTION.POLICY}${policyID}`];
+}
+
+/**
+ * Returns a primary policy for the user
+ */
+// TODO: Use getInvoicePrimaryWorkspace when the invoices screen is ready - https://github.com/Expensify/App/issues/45175.
+function getPrimaryPolicy(activePolicyID?: OnyxEntry<string>): Policy | undefined {
+    const activeAdminWorkspaces = PolicyUtils.getActiveAdminWorkspaces(allPolicies);
+    const primaryPolicy: Policy | null | undefined = activeAdminWorkspaces.find((policy) => policy.id === activePolicyID);
+    return primaryPolicy ?? activeAdminWorkspaces[0];
+}
+
+/** Check if the policy has invoicing company details */
+// eslint-disable-next-line react/no-unused-prop-types,@typescript-eslint/no-unused-vars
+function hasInvoicingDetails(policy: OnyxEntry<Policy>): boolean {
+    // TODO: uncomment when invoicing details inside a policy are supported.
+    // return !!policy.invoice.companyName && !!policy.invoice.companyWebsite;
+    return true;
+}
+
+/**
+ * Returns a primary invoice workspace for the user
+ */
+function getInvoicePrimaryWorkspace(activePolicyID?: OnyxEntry<string>): Policy | undefined {
+    if (PolicyUtils.canSendInvoiceFromWorkspace(activePolicyID)) {
+        return allPolicies?.[`${ONYXKEYS.COLLECTION.POLICY}${activePolicyID ?? '-1'}`];
+    }
+    const activeAdminWorkspaces = PolicyUtils.getActiveAdminWorkspaces(allPolicies);
+    return activeAdminWorkspaces.find((policy) => PolicyUtils.canSendInvoiceFromWorkspace(policy.id));
+}
+
+/**
+ * Check if the user has any active free policies (aka workspaces)
+ */
+function hasActiveChatEnabledPolicies(policies: Array<OnyxEntry<PolicySelector>> | OnyxCollection<PolicySelector>, includeOnlyAdminPolicies = false): boolean {
+    const chatEnabledPolicies = Object.values(policies ?? {}).filter(
+        (policy) => policy?.isPolicyExpenseChatEnabled && (!includeOnlyAdminPolicies || policy.role === CONST.POLICY.ROLE.ADMIN),
+    );
+
+    if (chatEnabledPolicies.length === 0) {
+        return false;
+    }
+
+    if (chatEnabledPolicies.some((policy) => !policy?.pendingAction)) {
+        return true;
+    }
+
+    if (chatEnabledPolicies.some((policy) => policy?.pendingAction === CONST.RED_BRICK_ROAD_PENDING_ACTION.ADD)) {
+        return true;
+    }
+
+    if (chatEnabledPolicies.some((policy) => policy?.pendingAction === CONST.RED_BRICK_ROAD_PENDING_ACTION.DELETE)) {
+        return false;
+    }
+
+    // If there are no add or delete pending actions the only option left is an update
+    // pendingAction, in which case we should return true.
+    return true;
+}
+
+/**
+ * Delete the workspace
+ */
+function deleteWorkspace(policyID: string, policyName: string) {
+    if (!allPolicies) {
+        return;
+    }
+
+    const filteredPolicies = Object.values(allPolicies).filter((policy): policy is Policy => policy?.id !== policyID);
+    const optimisticData: OnyxUpdate[] = [
+        {
+            onyxMethod: Onyx.METHOD.MERGE,
+            key: `${ONYXKEYS.COLLECTION.POLICY}${policyID}`,
+            value: {
+                avatarURL: '',
+                pendingAction: CONST.RED_BRICK_ROAD_PENDING_ACTION.DELETE,
+                errors: null,
+            },
+        },
+        ...(!hasActiveChatEnabledPolicies(filteredPolicies, true)
+            ? [
+                  {
+                      onyxMethod: Onyx.METHOD.MERGE,
+                      key: ONYXKEYS.REIMBURSEMENT_ACCOUNT,
+                      value: {
+                          errors: null,
+                      },
+                  },
+              ]
+            : []),
+    ];
+
+    const reportsToArchive = Object.values(ReportConnection.getAllReports() ?? {}).filter(
+        (report) => report?.policyID === policyID && (ReportUtils.isChatRoom(report) || ReportUtils.isPolicyExpenseChat(report) || ReportUtils.isTaskReport(report)),
+    );
+    const finallyData: OnyxUpdate[] = [];
+    const currentTime = DateUtils.getDBTime();
+    reportsToArchive.forEach((report) => {
+        const {reportID, ownerAccountID} = report ?? {};
+        optimisticData.push({
+            onyxMethod: Onyx.METHOD.MERGE,
+            key: `${ONYXKEYS.COLLECTION.REPORT}${reportID}`,
+            value: {
+                stateNum: CONST.REPORT.STATE_NUM.APPROVED,
+                statusNum: CONST.REPORT.STATUS_NUM.CLOSED,
+                oldPolicyName: allPolicies?.[`${ONYXKEYS.COLLECTION.POLICY}${policyID}`]?.name ?? '',
+                policyName: '',
+                // eslint-disable-next-line @typescript-eslint/naming-convention
+                private_isArchived: currentTime,
+            },
+        });
+
+        optimisticData.push({
+            onyxMethod: Onyx.METHOD.SET,
+            key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS_DRAFTS}${reportID}`,
+            value: null,
+        });
+
+        // Add closed actions to all chat reports linked to this policy
+        // Announce & admin chats have FAKE owners, but workspace chats w/ users do have owners.
+        let emailClosingReport: string = CONST.POLICY.OWNER_EMAIL_FAKE;
+        if (!!ownerAccountID && ownerAccountID !== CONST.POLICY.OWNER_ACCOUNT_ID_FAKE) {
+            emailClosingReport = allPersonalDetails?.[ownerAccountID]?.login ?? '';
+        }
+        const optimisticClosedReportAction = ReportUtils.buildOptimisticClosedReportAction(emailClosingReport, policyName, CONST.REPORT.ARCHIVE_REASON.POLICY_DELETED);
+        optimisticData.push({
+            onyxMethod: Onyx.METHOD.MERGE,
+            key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${reportID}`,
+            value: {
+                [optimisticClosedReportAction.reportActionID]: optimisticClosedReportAction as ReportAction,
+            },
+        });
+
+        // We are temporarily adding this workaround because 'DeleteWorkspace' doesn't
+        // support receiving the optimistic reportActions' ids for the moment.
+        finallyData.push({
+            onyxMethod: Onyx.METHOD.MERGE,
+            key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${reportID}`,
+            value: {
+                [optimisticClosedReportAction.reportActionID]: null,
+            },
+        });
+    });
+
+    const policy = getPolicy(policyID);
+    // Restore the old report stateNum and statusNum
+    const failureData: OnyxUpdate[] = [
+        {
+            onyxMethod: Onyx.METHOD.MERGE,
+            key: ONYXKEYS.REIMBURSEMENT_ACCOUNT,
+            value: {
+                errors: reimbursementAccount?.errors ?? null,
+            },
+        },
+        {
+            onyxMethod: Onyx.METHOD.MERGE,
+            key: `${ONYXKEYS.COLLECTION.POLICY}${policyID}`,
+            value: {
+                avatarURL: policy?.avatarURL,
+            },
+        },
+    ];
+
+    reportsToArchive.forEach((report) => {
+        const {reportID, stateNum, statusNum, oldPolicyName} = report ?? {};
+        failureData.push({
+            onyxMethod: Onyx.METHOD.MERGE,
+            key: `${ONYXKEYS.COLLECTION.REPORT}${reportID}`,
+            value: {
+                stateNum,
+                statusNum,
+                oldPolicyName,
+                policyName: report?.policyName,
+            },
+        });
+    });
+
+    const params: DeleteWorkspaceParams = {policyID};
+
+    API.write(WRITE_COMMANDS.DELETE_WORKSPACE, params, {optimisticData, finallyData, failureData});
+
+    // Reset the lastAccessedWorkspacePolicyID
+    if (policyID === lastAccessedWorkspacePolicyID) {
+        updateLastAccessedWorkspace(undefined);
+    }
+}
+
+function setWorkspaceAutoReportingFrequency(policyID: string, frequency: ValueOf<typeof CONST.POLICY.AUTO_REPORTING_FREQUENCIES>) {
+    const policy = getPolicy(policyID);
+
+    const wasPolicyOnManualReporting = PolicyUtils.getCorrectedAutoReportingFrequency(policy) === CONST.POLICY.AUTO_REPORTING_FREQUENCIES.MANUAL;
+
+    const optimisticData: OnyxUpdate[] = [
+        {
+            onyxMethod: Onyx.METHOD.MERGE,
+            key: `${ONYXKEYS.COLLECTION.POLICY}${policyID}`,
+            value: {
+                // Recall that the "daily" and "manual" frequencies don't actually exist in Onyx or the DB (see PolicyUtils.getCorrectedAutoReportingFrequency)
+                autoReportingFrequency: frequency === CONST.POLICY.AUTO_REPORTING_FREQUENCIES.MANUAL ? CONST.POLICY.AUTO_REPORTING_FREQUENCIES.IMMEDIATE : frequency,
+                pendingFields: {autoReportingFrequency: CONST.RED_BRICK_ROAD_PENDING_ACTION.UPDATE},
+
+                // To set the frequency to "manual", we really must set it to "immediate" with harvesting disabled
+                ...(frequency === CONST.POLICY.AUTO_REPORTING_FREQUENCIES.MANUAL && {
+                    harvesting: {
+                        enabled: false,
+                    },
+                }),
+
+                // If the policy was on manual reporting before, and now will be auto-reported,
+                // then we must re-enable harvesting
+                ...(wasPolicyOnManualReporting &&
+                    frequency !== CONST.POLICY.AUTO_REPORTING_FREQUENCIES.MANUAL && {
+                        harvesting: {
+                            enabled: true,
+                        },
+                    }),
+            },
+        },
+    ];
+
+    const failureData: OnyxUpdate[] = [
+        {
+            onyxMethod: Onyx.METHOD.MERGE,
+            key: `${ONYXKEYS.COLLECTION.POLICY}${policyID}`,
+            value: {
+                autoReportingFrequency: policy?.autoReportingFrequency ?? null,
+                harvesting: policy?.harvesting ?? null,
+                pendingFields: {autoReportingFrequency: null},
+                errorFields: {autoReportingFrequency: ErrorUtils.getMicroSecondOnyxErrorWithTranslationKey('workflowsDelayedSubmissionPage.autoReportingFrequencyErrorMessage')},
+            },
+        },
+    ];
+
+    const successData: OnyxUpdate[] = [
+        {
+            onyxMethod: Onyx.METHOD.MERGE,
+            key: `${ONYXKEYS.COLLECTION.POLICY}${policyID}`,
+            value: {
+                pendingFields: {autoReportingFrequency: null},
+            },
+        },
+    ];
+
+    const params: SetWorkspaceAutoReportingFrequencyParams = {policyID, frequency};
+    API.write(WRITE_COMMANDS.SET_WORKSPACE_AUTO_REPORTING_FREQUENCY, params, {optimisticData, failureData, successData});
+}
+
+function setWorkspaceAutoReportingMonthlyOffset(policyID: string, autoReportingOffset: number | ValueOf<typeof CONST.POLICY.AUTO_REPORTING_OFFSET>) {
+    const value = JSON.stringify({autoReportingOffset});
+    const policy = getPolicy(policyID);
+
+    const optimisticData: OnyxUpdate[] = [
+        {
+            onyxMethod: Onyx.METHOD.MERGE,
+            key: `${ONYXKEYS.COLLECTION.POLICY}${policyID}`,
+            value: {
+                autoReportingOffset,
+                pendingFields: {autoReportingOffset: CONST.RED_BRICK_ROAD_PENDING_ACTION.UPDATE},
+            },
+        },
+    ];
+
+    const failureData: OnyxUpdate[] = [
+        {
+            onyxMethod: Onyx.METHOD.MERGE,
+            key: `${ONYXKEYS.COLLECTION.POLICY}${policyID}`,
+            value: {
+                autoReportingOffset: policy?.autoReportingOffset ?? null,
+                pendingFields: {autoReportingOffset: null},
+                errorFields: {autoReportingOffset: ErrorUtils.getMicroSecondOnyxErrorWithTranslationKey('workflowsDelayedSubmissionPage.monthlyOffsetErrorMessage')},
+            },
+        },
+    ];
+
+    const successData: OnyxUpdate[] = [
+        {
+            onyxMethod: Onyx.METHOD.MERGE,
+            key: `${ONYXKEYS.COLLECTION.POLICY}${policyID}`,
+            value: {
+                pendingFields: {autoReportingOffset: null},
+            },
+        },
+    ];
+
+    const params: SetWorkspaceAutoReportingMonthlyOffsetParams = {policyID, value};
+    API.write(WRITE_COMMANDS.SET_WORKSPACE_AUTO_REPORTING_MONTHLY_OFFSET, params, {optimisticData, failureData, successData});
+}
+
+function setWorkspaceApprovalMode(policyID: string, approver: string, approvalMode: ValueOf<typeof CONST.POLICY.APPROVAL_MODE>) {
+    const policy = getPolicy(policyID);
+
+    const value = {
+        approver,
+        approvalMode,
+    };
+
+    const optimisticData: OnyxUpdate[] = [
+        {
+            onyxMethod: Onyx.METHOD.MERGE,
+            key: `${ONYXKEYS.COLLECTION.POLICY}${policyID}`,
+            value: {
+                ...value,
+                pendingFields: {approvalMode: CONST.RED_BRICK_ROAD_PENDING_ACTION.UPDATE},
+            },
+        },
+    ];
+
+    const failureData: OnyxUpdate[] = [
+        {
+            onyxMethod: Onyx.METHOD.MERGE,
+            key: `${ONYXKEYS.COLLECTION.POLICY}${policyID}`,
+            value: {
+                approver: policy?.approver,
+                approvalMode: policy?.approvalMode,
+                pendingFields: {approvalMode: null},
+                errorFields: {approvalMode: ErrorUtils.getMicroSecondOnyxErrorWithTranslationKey('workflowsApproverPage.genericErrorMessage')},
+            },
+        },
+    ];
+
+    const successData: OnyxUpdate[] = [
+        {
+            onyxMethod: Onyx.METHOD.MERGE,
+            key: `${ONYXKEYS.COLLECTION.POLICY}${policyID}`,
+            value: {
+                pendingFields: {approvalMode: null},
+            },
+        },
+    ];
+
+    const params: SetWorkspaceApprovalModeParams = {
+        policyID,
+        value: JSON.stringify({
+            ...value,
+            // This property should now be set to false for all Collect policies
+            isAutoApprovalEnabled: false,
+        }),
+    };
+    API.write(WRITE_COMMANDS.SET_WORKSPACE_APPROVAL_MODE, params, {optimisticData, failureData, successData});
+}
+
+function setWorkspacePayer(policyID: string, reimburserEmail: string) {
+    const policy = getPolicy(policyID);
+
+    const optimisticData: OnyxUpdate[] = [
+        {
+            onyxMethod: Onyx.METHOD.MERGE,
+            key: `${ONYXKEYS.COLLECTION.POLICY}${policyID}`,
+            value: {
+                achAccount: {reimburser: reimburserEmail},
+                errorFields: {reimburser: null},
+                pendingFields: {reimburser: CONST.RED_BRICK_ROAD_PENDING_ACTION.UPDATE},
+            },
+        },
+    ];
+
+    const successData: OnyxUpdate[] = [
+        {
+            onyxMethod: Onyx.METHOD.MERGE,
+            key: `${ONYXKEYS.COLLECTION.POLICY}${policyID}`,
+            value: {
+                errorFields: {reimburser: null},
+                pendingFields: {reimburser: null},
+            },
+        },
+    ];
+
+    const failureData: OnyxUpdate[] = [
+        {
+            onyxMethod: Onyx.METHOD.MERGE,
+            key: `${ONYXKEYS.COLLECTION.POLICY}${policyID}`,
+            value: {
+                achAccount: {reimburser: policy?.achAccount?.reimburser ?? null},
+                errorFields: {reimburser: ErrorUtils.getMicroSecondOnyxErrorWithTranslationKey('workflowsPayerPage.genericErrorMessage')},
+                pendingFields: {reimburser: null},
+            },
+        },
+    ];
+
+    const params: SetWorkspacePayerParams = {policyID, reimburserEmail};
+
+    API.write(WRITE_COMMANDS.SET_WORKSPACE_PAYER, params, {optimisticData, failureData, successData});
+}
+
+function clearPolicyErrorField(policyID: string, fieldName: string) {
+    Onyx.merge(`${ONYXKEYS.COLLECTION.POLICY}${policyID}`, {errorFields: {[fieldName]: null}});
+}
+
+function clearQBOErrorField(policyID: string, fieldName: string) {
+    Onyx.merge(`${ONYXKEYS.COLLECTION.POLICY}${policyID}`, {connections: {quickbooksOnline: {config: {errorFields: {[fieldName]: null}}}}});
+}
+
+function clearXeroErrorField(policyID: string, fieldName: string) {
+    Onyx.merge(`${ONYXKEYS.COLLECTION.POLICY}${policyID}`, {connections: {xero: {config: {errorFields: {[fieldName]: null}}}}});
+}
+
+function clearNetSuiteErrorField(policyID: string, fieldName: string) {
+    Onyx.merge(`${ONYXKEYS.COLLECTION.POLICY}${policyID}`, {connections: {netsuite: {options: {config: {errorFields: {[fieldName]: null}}}}}});
+}
+
+function clearSageIntacctErrorField(policyID: string, fieldName: string) {
+    Onyx.merge(`${ONYXKEYS.COLLECTION.POLICY}${policyID}`, {connections: {intacct: {config: {errorFields: {[fieldName]: null}}}}});
+}
+
+function clearNetSuiteAutoSyncErrorField(policyID: string) {
+    Onyx.merge(`${ONYXKEYS.COLLECTION.POLICY}${policyID}`, {connections: {netsuite: {config: {errorFields: {autoSync: null}}}}});
+}
+
+function setWorkspaceReimbursement(policyID: string, reimbursementChoice: ValueOf<typeof CONST.POLICY.REIMBURSEMENT_CHOICES>, reimburserEmail: string) {
+    const policy = getPolicy(policyID);
+
+    const optimisticData: OnyxUpdate[] = [
+        {
+            onyxMethod: Onyx.METHOD.MERGE,
+            key: `${ONYXKEYS.COLLECTION.POLICY}${policyID}`,
+            value: {
+                reimbursementChoice,
+                isLoadingWorkspaceReimbursement: true,
+                achAccount: {reimburser: reimburserEmail},
+                errorFields: {reimbursementChoice: null},
+                pendingFields: {reimbursementChoice: CONST.RED_BRICK_ROAD_PENDING_ACTION.UPDATE},
+            },
+        },
+    ];
+
+    const successData: OnyxUpdate[] = [
+        {
+            onyxMethod: Onyx.METHOD.MERGE,
+            key: `${ONYXKEYS.COLLECTION.POLICY}${policyID}`,
+            value: {
+                isLoadingWorkspaceReimbursement: false,
+                errorFields: {reimbursementChoice: null},
+                pendingFields: {reimbursementChoice: null},
+            },
+        },
+    ];
+
+    const failureData: OnyxUpdate[] = [
+        {
+            onyxMethod: Onyx.METHOD.MERGE,
+            key: `${ONYXKEYS.COLLECTION.POLICY}${policyID}`,
+            value: {
+                isLoadingWorkspaceReimbursement: false,
+                reimbursementChoice: policy?.reimbursementChoice ?? null,
+                achAccount: {reimburser: policy?.achAccount?.reimburser ?? null},
+                errorFields: {reimbursementChoice: ErrorUtils.getMicroSecondOnyxErrorWithTranslationKey('common.genericErrorMessage')},
+                pendingFields: {reimbursementChoice: null},
+            },
+        },
+    ];
+
+    const params: SetWorkspaceReimbursementParams = {policyID, reimbursementChoice};
+
+    API.write(WRITE_COMMANDS.SET_WORKSPACE_REIMBURSEMENT, params, {optimisticData, failureData, successData});
+}
+
+function clearWorkspaceReimbursementErrors(policyID: string) {
+    Onyx.merge(`${ONYXKEYS.COLLECTION.POLICY}${policyID}`, {errorFields: {reimbursementChoice: null}});
+}
+
+function leaveWorkspace(policyID: string) {
+    const policy = allPolicies?.[`${ONYXKEYS.COLLECTION.POLICY}${policyID}`];
+    const workspaceChats = ReportUtils.getAllWorkspaceReports(policyID);
+
+    const optimisticData: OnyxUpdate[] = [
+        {
+            onyxMethod: Onyx.METHOD.MERGE,
+            key: `${ONYXKEYS.COLLECTION.POLICY}${policyID}`,
+            value: {
+                pendingAction: CONST.RED_BRICK_ROAD_PENDING_ACTION.DELETE,
+                employeeList: {
+                    [sessionEmail]: {
+                        pendingAction: CONST.RED_BRICK_ROAD_PENDING_ACTION.DELETE,
+                    },
+                },
+            },
+        },
+    ];
+
+    const successData: OnyxUpdate[] = [
+        {
+            onyxMethod: Onyx.METHOD.MERGE,
+            key: `${ONYXKEYS.COLLECTION.POLICY}${policyID}`,
+            value: null,
+        },
+    ];
+    const failureData: OnyxUpdate[] = [
+        {
+            onyxMethod: Onyx.METHOD.MERGE,
+            key: `${ONYXKEYS.COLLECTION.POLICY}${policyID}`,
+            value: {
+                pendingAction: policy?.pendingAction,
+                employeeList: {
+                    [sessionEmail]: {
+                        errors: ErrorUtils.getMicroSecondOnyxErrorWithTranslationKey('workspace.people.error.genericRemove'),
+                    },
+                },
+            },
+        },
+    ];
+
+    const pendingChatMembers = ReportUtils.getPendingChatMembers([sessionAccountID], [], CONST.RED_BRICK_ROAD_PENDING_ACTION.DELETE);
+
+    workspaceChats.forEach((report) => {
+        const parentReport = ReportUtils.getRootParentReport(report);
+        const reportToCheckOwner = isEmptyObject(parentReport) ? report : parentReport;
+
+        if (ReportUtils.isPolicyExpenseChat(report) && !ReportUtils.isReportOwner(reportToCheckOwner)) {
+            return;
+        }
+
+        optimisticData.push({
+            onyxMethod: Onyx.METHOD.MERGE,
+            key: `${ONYXKEYS.COLLECTION.REPORT}${report?.reportID}`,
+            value: {
+                statusNum: CONST.REPORT.STATUS_NUM.CLOSED,
+                stateNum: CONST.REPORT.STATE_NUM.APPROVED,
+                oldPolicyName: policy?.name ?? '',
+                pendingChatMembers,
+            },
+        });
+        successData.push({
+            onyxMethod: Onyx.METHOD.MERGE,
+            key: `${ONYXKEYS.COLLECTION.REPORT}${report?.reportID}`,
+            value: {
+                pendingChatMembers: null,
+            },
+        });
+        failureData.push({
+            onyxMethod: Onyx.METHOD.MERGE,
+            key: `${ONYXKEYS.COLLECTION.REPORT}${report?.reportID}`,
+            value: {
+                pendingChatMembers: null,
+            },
+        });
+    });
+
+    const params: LeavePolicyParams = {
+        policyID,
+        email: sessionEmail,
+    };
+    API.write(WRITE_COMMANDS.LEAVE_POLICY, params, {optimisticData, successData, failureData});
+}
+
+function addBillingCardAndRequestPolicyOwnerChange(
+    policyID: string,
+    cardData: {
+        cardNumber: string;
+        cardYear: string;
+        cardMonth: string;
+        cardCVV: string;
+        addressName: string;
+        addressZip: string;
+        currency: string;
+    },
+) {
+    const {cardNumber, cardYear, cardMonth, cardCVV, addressName, addressZip, currency} = cardData;
+
+    const optimisticData: OnyxUpdate[] = [
+        {
+            onyxMethod: Onyx.METHOD.MERGE,
+            key: `${ONYXKEYS.COLLECTION.POLICY}${policyID}`,
+            value: {
+                errorFields: null,
+                isLoading: true,
+                isChangeOwnerSuccessful: false,
+                isChangeOwnerFailed: false,
+            },
+        },
+    ];
+
+    const successData: OnyxUpdate[] = [
+        {
+            onyxMethod: Onyx.METHOD.MERGE,
+            key: `${ONYXKEYS.COLLECTION.POLICY}${policyID}`,
+            value: {
+                isLoading: false,
+                isChangeOwnerSuccessful: true,
+                isChangeOwnerFailed: false,
+                owner: sessionEmail,
+                ownerAccountID: sessionAccountID,
+            },
+        },
+    ];
+
+    const failureData: OnyxUpdate[] = [
+        {
+            onyxMethod: Onyx.METHOD.MERGE,
+            key: `${ONYXKEYS.COLLECTION.POLICY}${policyID}`,
+            value: {
+                isLoading: false,
+                isChangeOwnerSuccessful: false,
+                isChangeOwnerFailed: true,
+            },
+        },
+    ];
+
+    const params: AddBillingCardAndRequestWorkspaceOwnerChangeParams = {
+        policyID,
+        cardNumber,
+        cardYear,
+        cardMonth,
+        cardCVV,
+        addressName,
+        addressZip,
+        currency,
+    };
+
+    API.write(WRITE_COMMANDS.ADD_BILLING_CARD_AND_REQUEST_WORKSPACE_OWNER_CHANGE, params, {optimisticData, successData, failureData});
+}
+
+/**
+ * Optimistically create a chat for each member of the workspace, creates both optimistic and success data for onyx.
+ *
+ * @returns - object with onyxSuccessData, onyxOptimisticData, and optimisticReportIDs (map login to reportID)
+ */
+function createPolicyExpenseChats(policyID: string, invitedEmailsToAccountIDs: InvitedEmailsToAccountIDs, hasOutstandingChildRequest = false): WorkspaceMembersChats {
+    const workspaceMembersChats: WorkspaceMembersChats = {
+        onyxSuccessData: [],
+        onyxOptimisticData: [],
+        onyxFailureData: [],
+        reportCreationData: {},
+    };
+
+    Object.keys(invitedEmailsToAccountIDs).forEach((email) => {
+        const accountID = invitedEmailsToAccountIDs[email];
+        const cleanAccountID = Number(accountID);
+        const login = PhoneNumber.addSMSDomainIfPhoneNumber(email);
+
+        const oldChat = ReportUtils.getPolicyExpenseChat(cleanAccountID, policyID);
+
+        // If the chat already exists, we don't want to create a new one - just make sure it's not archived
+        if (oldChat) {
+            workspaceMembersChats.reportCreationData[login] = {
+                reportID: oldChat.reportID,
+            };
+            workspaceMembersChats.onyxOptimisticData.push({
+                onyxMethod: Onyx.METHOD.MERGE,
+                key: `${ONYXKEYS.COLLECTION.REPORT}${oldChat.reportID}`,
+                value: {
+                    stateNum: CONST.REPORT.STATE_NUM.OPEN,
+                    statusNum: CONST.REPORT.STATUS_NUM.OPEN,
+                },
+            });
+            return;
+        }
+        const optimisticReport = ReportUtils.buildOptimisticChatReport([sessionAccountID, cleanAccountID], undefined, CONST.REPORT.CHAT_TYPE.POLICY_EXPENSE_CHAT, policyID, cleanAccountID);
+        const optimisticCreatedAction = ReportUtils.buildOptimisticCreatedReportAction(login);
+
+        workspaceMembersChats.reportCreationData[login] = {
+            reportID: optimisticReport.reportID,
+            reportActionID: optimisticCreatedAction.reportActionID,
+        };
+
+        workspaceMembersChats.onyxOptimisticData.push({
+            onyxMethod: Onyx.METHOD.SET,
+            key: `${ONYXKEYS.COLLECTION.REPORT}${optimisticReport.reportID}`,
+            value: {
+                ...optimisticReport,
+                pendingFields: {
+                    createChat: CONST.RED_BRICK_ROAD_PENDING_ACTION.ADD,
+                },
+                isOptimisticReport: true,
+                hasOutstandingChildRequest,
+                pendingChatMembers: [
+                    {
+                        accountID: accountID.toString(),
+                        pendingAction: CONST.RED_BRICK_ROAD_PENDING_ACTION.ADD,
+                    },
+                ],
+            },
+        });
+        workspaceMembersChats.onyxOptimisticData.push({
+            onyxMethod: Onyx.METHOD.SET,
+            key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${optimisticReport.reportID}`,
+            value: {[optimisticCreatedAction.reportActionID]: optimisticCreatedAction},
+        });
+
+        workspaceMembersChats.onyxSuccessData.push({
+            onyxMethod: Onyx.METHOD.MERGE,
+            key: `${ONYXKEYS.COLLECTION.REPORT}${optimisticReport.reportID}`,
+            value: {
+                pendingFields: {
+                    createChat: null,
+                },
+                errorFields: {
+                    createChat: null,
+                },
+                isOptimisticReport: false,
+                pendingChatMembers: null,
+                participants: {
+                    [accountID]: allPersonalDetails && allPersonalDetails[accountID] ? {} : null,
+                },
+            },
+        });
+        workspaceMembersChats.onyxSuccessData.push({
+            onyxMethod: Onyx.METHOD.MERGE,
+            key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${optimisticReport.reportID}`,
+            value: {[optimisticCreatedAction.reportActionID]: {pendingAction: null}},
+        });
+
+        workspaceMembersChats.onyxFailureData.push({
+            onyxMethod: Onyx.METHOD.MERGE,
+            key: `${ONYXKEYS.COLLECTION.REPORT_METADATA}${optimisticReport.reportID}`,
+            value: {
+                isLoadingInitialReportActions: false,
+            },
+        });
+    });
+    return workspaceMembersChats;
+}
+
+/**
+ * Updates a workspace avatar image
+ */
+function updateWorkspaceAvatar(policyID: string, file: File) {
+    const optimisticData: OnyxUpdate[] = [
+        {
+            onyxMethod: Onyx.METHOD.MERGE,
+            key: `${ONYXKEYS.COLLECTION.POLICY}${policyID}`,
+            value: {
+                avatarURL: file.uri,
+                originalFileName: file.name,
+                errorFields: {
+                    avatarURL: null,
+                },
+                pendingFields: {
+                    avatarURL: CONST.RED_BRICK_ROAD_PENDING_ACTION.UPDATE,
+                },
+            },
+        },
+    ];
+    const finallyData: OnyxUpdate[] = [
+        {
+            onyxMethod: Onyx.METHOD.MERGE,
+            key: `${ONYXKEYS.COLLECTION.POLICY}${policyID}`,
+            value: {
+                pendingFields: {
+                    avatarURL: null,
+                },
+            },
+        },
+    ];
+    const failureData: OnyxUpdate[] = [
+        {
+            onyxMethod: Onyx.METHOD.MERGE,
+            key: `${ONYXKEYS.COLLECTION.POLICY}${policyID}`,
+            value: {
+                avatarURL: allPolicies?.[`${ONYXKEYS.COLLECTION.POLICY}${policyID}`]?.avatarURL,
+            },
+        },
+    ];
+
+    const params: UpdateWorkspaceAvatarParams = {
+        policyID,
+        file,
+    };
+
+    API.write(WRITE_COMMANDS.UPDATE_WORKSPACE_AVATAR, params, {optimisticData, finallyData, failureData});
+}
+
+/**
+ * Deletes the avatar image for the workspace
+ */
+function deleteWorkspaceAvatar(policyID: string) {
+    const optimisticData: OnyxUpdate[] = [
+        {
+            onyxMethod: Onyx.METHOD.MERGE,
+            key: `${ONYXKEYS.COLLECTION.POLICY}${policyID}`,
+            value: {
+                pendingFields: {
+                    avatarURL: CONST.RED_BRICK_ROAD_PENDING_ACTION.UPDATE,
+                },
+                errorFields: {
+                    avatarURL: null,
+                },
+                avatarURL: '',
+            },
+        },
+    ];
+    const finallyData: OnyxUpdate[] = [
+        {
+            onyxMethod: Onyx.METHOD.MERGE,
+            key: `${ONYXKEYS.COLLECTION.POLICY}${policyID}`,
+            value: {
+                pendingFields: {
+                    avatarURL: null,
+                },
+            },
+        },
+    ];
+    const failureData: OnyxUpdate[] = [
+        {
+            onyxMethod: Onyx.METHOD.MERGE,
+            key: `${ONYXKEYS.COLLECTION.POLICY}${policyID}`,
+            value: {
+                errorFields: {
+                    avatarURL: ErrorUtils.getMicroSecondOnyxErrorWithTranslationKey('avatarWithImagePicker.deleteWorkspaceError'),
+                },
+            },
+        },
+    ];
+
+    const params: DeleteWorkspaceAvatarParams = {policyID};
+
+    API.write(WRITE_COMMANDS.DELETE_WORKSPACE_AVATAR, params, {optimisticData, finallyData, failureData});
+}
+
+/**
+ * Clear error and pending fields for the workspace avatar
+ */
+function clearAvatarErrors(policyID: string) {
+    Onyx.merge(`${ONYXKEYS.COLLECTION.POLICY}${policyID}`, {
+        errorFields: {
+            avatarURL: null,
+        },
+        pendingFields: {
+            avatarURL: null,
+        },
+    });
+}
+
+/**
+ * Optimistically update the general settings. Set the general settings as pending until the response succeeds.
+ * If the response fails set a general error message. Clear the error message when updating.
+ */
+function updateGeneralSettings(policyID: string, name: string, currencyValue?: string) {
+    const policy = allPolicies?.[`${ONYXKEYS.COLLECTION.POLICY}${policyID}`];
+    if (!policy) {
+        return;
+    }
+
+    const distanceUnit = PolicyUtils.getCustomUnit(policy);
+    const customUnitID = distanceUnit?.customUnitID;
+    const currency = currencyValue ?? policy?.outputCurrency ?? CONST.CURRENCY.USD;
+
+    const currencyPendingAction = currency !== policy?.outputCurrency ? CONST.RED_BRICK_ROAD_PENDING_ACTION.UPDATE : undefined;
+    const namePendingAction = name !== policy?.name ? CONST.RED_BRICK_ROAD_PENDING_ACTION.UPDATE : undefined;
+
+    const currentRates = distanceUnit?.rates ?? {};
+    const optimisticRates: Record<string, Rate> = {};
+    const finallyRates: Record<string, Rate> = {};
+    const failureRates: Record<string, Rate> = {};
+
+    if (customUnitID) {
+        for (const rateID of Object.keys(currentRates)) {
+            optimisticRates[rateID] = {
+                ...currentRates[rateID],
+                pendingFields: {currency: CONST.RED_BRICK_ROAD_PENDING_ACTION.UPDATE},
+                currency,
+            };
+            finallyRates[rateID] = {
+                ...currentRates[rateID],
+                pendingFields: {currency: null},
+                currency,
+            };
+            failureRates[rateID] = {
+                ...currentRates[rateID],
+                pendingFields: {currency: null},
+                errorFields: {currency: ErrorUtils.getMicroSecondOnyxErrorWithTranslationKey('common.genericErrorMessage')},
+            };
+        }
+    }
+
+    const optimisticData: OnyxUpdate[] = [
+        {
+            // We use SET because it's faster than merge and avoids a race condition when setting the currency and navigating the user to the Bank account page in confirmCurrencyChangeAndHideModal
+            onyxMethod: Onyx.METHOD.SET,
+            key: `${ONYXKEYS.COLLECTION.POLICY}${policyID}`,
+            value: {
+                ...policy,
+
+                pendingFields: {
+                    ...policy.pendingFields,
+                    ...(namePendingAction !== undefined && {name: namePendingAction}),
+                    ...(currencyPendingAction !== undefined && {outputCurrency: currencyPendingAction}),
+                },
+
+                // Clear errorFields in case the user didn't dismiss the general settings error
+                errorFields: {
+                    name: null,
+                    outputCurrency: null,
+                },
+                name,
+                outputCurrency: currency,
+                ...(customUnitID && {
+                    customUnits: {
+                        [customUnitID]: {
+                            ...distanceUnit,
+                            rates: optimisticRates,
+                        },
+                    },
+                }),
+            },
+        },
+    ];
+    const finallyData: OnyxUpdate[] = [
+        {
+            onyxMethod: Onyx.METHOD.MERGE,
+            key: `${ONYXKEYS.COLLECTION.POLICY}${policyID}`,
+            value: {
+                pendingFields: {
+                    name: null,
+                    outputCurrency: null,
+                },
+                ...(customUnitID && {
+                    customUnits: {
+                        [customUnitID]: {
+                            ...distanceUnit,
+                            rates: finallyRates,
+                        },
+                    },
+                }),
+            },
+        },
+    ];
+
+    const errorFields: Policy['errorFields'] = {
+        name: namePendingAction && ErrorUtils.getMicroSecondOnyxErrorWithTranslationKey('workspace.editor.genericFailureMessage'),
+    };
+
+    if (!errorFields.name && currencyPendingAction) {
+        errorFields.outputCurrency = ErrorUtils.getMicroSecondOnyxErrorWithTranslationKey('workspace.editor.genericFailureMessage');
+    }
+
+    const failureData: OnyxUpdate[] = [
+        {
+            onyxMethod: Onyx.METHOD.MERGE,
+            key: `${ONYXKEYS.COLLECTION.POLICY}${policyID}`,
+            value: {
+                errorFields,
+                ...(customUnitID && {
+                    customUnits: {
+                        [customUnitID]: {
+                            ...distanceUnit,
+                            rates: failureRates,
+                        },
+                    },
+                }),
+            },
+        },
+    ];
+
+    const params: UpdateWorkspaceGeneralSettingsParams = {
+        policyID,
+        workspaceName: name,
+        currency,
+    };
+
+    const persistedRequests = PersistedRequests.getAll();
+    const createWorkspaceRequestChangedIndex = persistedRequests.findIndex(
+        (request) => request.data?.policyID === policyID && request.command === WRITE_COMMANDS.CREATE_WORKSPACE && request.data?.policyName !== name,
+    );
+
+    const createWorkspaceRequest = persistedRequests[createWorkspaceRequestChangedIndex];
+    if (createWorkspaceRequest) {
+        const workspaceRequest: Request = {
+            ...createWorkspaceRequest,
+            data: {
+                ...createWorkspaceRequest.data,
+                policyName: name,
+            },
+        };
+        Onyx.merge(`${ONYXKEYS.COLLECTION.POLICY}${policyID}`, {
+            name,
+        });
+
+        PersistedRequests.update(createWorkspaceRequestChangedIndex, workspaceRequest);
+        return;
+    }
+
+    API.write(WRITE_COMMANDS.UPDATE_WORKSPACE_GENERAL_SETTINGS, params, {
+        optimisticData,
+        finallyData,
+        failureData,
+    });
+}
+
+function updateWorkspaceDescription(policyID: string, description: string, currentDescription: string) {
+    if (description === currentDescription) {
+        return;
+    }
+    const parsedDescription = ReportUtils.getParsedComment(description);
+
+    const optimisticData: OnyxUpdate[] = [
+        {
+            onyxMethod: Onyx.METHOD.MERGE,
+            key: `${ONYXKEYS.COLLECTION.POLICY}${policyID}`,
+            value: {
+                description: parsedDescription,
+                pendingFields: {
+                    description: CONST.RED_BRICK_ROAD_PENDING_ACTION.UPDATE,
+                },
+                errorFields: {
+                    description: null,
+                },
+            },
+        },
+    ];
+    const finallyData: OnyxUpdate[] = [
+        {
+            onyxMethod: Onyx.METHOD.MERGE,
+            key: `${ONYXKEYS.COLLECTION.POLICY}${policyID}`,
+            value: {
+                pendingFields: {
+                    description: null,
+                },
+            },
+        },
+    ];
+    const failureData: OnyxUpdate[] = [
+        {
+            onyxMethod: Onyx.METHOD.MERGE,
+            key: `${ONYXKEYS.COLLECTION.POLICY}${policyID}`,
+            value: {
+                errorFields: {
+                    description: ErrorUtils.getMicroSecondOnyxErrorWithTranslationKey('workspace.editor.genericFailureMessage'),
+                },
+            },
+        },
+    ];
+
+    const params: UpdateWorkspaceDescriptionParams = {
+        policyID,
+        description: parsedDescription,
+    };
+
+    API.write(WRITE_COMMANDS.UPDATE_WORKSPACE_DESCRIPTION, params, {
+        optimisticData,
+        finallyData,
+        failureData,
+    });
+}
+
+function setWorkspaceErrors(policyID: string, errors: Errors) {
+    if (!allPolicies?.[policyID]) {
+        return;
+    }
+
+    Onyx.merge(`${ONYXKEYS.COLLECTION.POLICY}${policyID}`, {errors: null});
+    Onyx.merge(`${ONYXKEYS.COLLECTION.POLICY}${policyID}`, {errors});
+}
+
+function clearCustomUnitErrors(policyID: string, customUnitID: string, customUnitRateID: string) {
+    Onyx.merge(`${ONYXKEYS.COLLECTION.POLICY}${policyID}`, {
+        customUnits: {
+            [customUnitID]: {
+                errors: null,
+                pendingAction: null,
+                rates: {
+                    [customUnitRateID]: {
+                        errors: null,
+                        pendingAction: null,
+                    },
+                },
+            },
+        },
+    });
+}
+
+function hideWorkspaceAlertMessage(policyID: string) {
+    if (!allPolicies?.[policyID]) {
+        return;
+    }
+
+    Onyx.merge(`${ONYXKEYS.COLLECTION.POLICY}${policyID}`, {alertMessage: ''});
+}
+
+function updateAddress(policyID: string, newAddress: CompanyAddress) {
+    // TODO: Change API endpoint parameters format to make it possible to follow naming-convention
+    const parameters: UpdatePolicyAddressParams = {
+        policyID,
+        // eslint-disable-next-line @typescript-eslint/naming-convention
+        'data[addressStreet]': newAddress.addressStreet,
+        // eslint-disable-next-line @typescript-eslint/naming-convention
+        'data[city]': newAddress.city,
+        // eslint-disable-next-line @typescript-eslint/naming-convention
+        'data[country]': newAddress.country,
+        // eslint-disable-next-line @typescript-eslint/naming-convention
+        'data[state]': newAddress.state,
+        // eslint-disable-next-line @typescript-eslint/naming-convention
+        'data[zipCode]': newAddress.zipCode,
+    };
+
+    const optimisticData: OnyxUpdate[] = [
+        {
+            onyxMethod: Onyx.METHOD.MERGE,
+            key: `${ONYXKEYS.COLLECTION.POLICY}${policyID}`,
+            value: {
+                address: newAddress,
+                pendingFields: {
+                    address: CONST.RED_BRICK_ROAD_PENDING_ACTION.UPDATE,
+                },
+            },
+        },
+    ];
+
+    const finallyData: OnyxUpdate[] = [
+        {
+            onyxMethod: Onyx.METHOD.MERGE,
+            key: `${ONYXKEYS.COLLECTION.POLICY}${policyID}`,
+            value: {
+                address: newAddress,
+                pendingFields: {
+                    address: null,
+                },
+            },
+        },
+    ];
+
+    API.write(WRITE_COMMANDS.UPDATE_POLICY_ADDRESS, parameters, {
+        optimisticData,
+        finallyData,
+    });
+}
+
+function updateWorkspaceCustomUnitAndRate(policyID: string, currentCustomUnit: CustomUnit, newCustomUnit: NewCustomUnit, lastModified?: string) {
+    if (!currentCustomUnit.customUnitID || !newCustomUnit?.customUnitID || !newCustomUnit.rates?.customUnitRateID) {
+        return;
+    }
+
+    const optimisticData: OnyxUpdate[] = [
+        {
+            onyxMethod: Onyx.METHOD.MERGE,
+            key: `${ONYXKEYS.COLLECTION.POLICY}${policyID}`,
+            value: {
+                customUnits: {
+                    [newCustomUnit.customUnitID]: {
+                        ...newCustomUnit,
+                        rates: {
+                            [newCustomUnit.rates.customUnitRateID]: {
+                                ...newCustomUnit.rates,
+                                errors: null,
+                                pendingAction: CONST.RED_BRICK_ROAD_PENDING_ACTION.UPDATE,
+                            },
+                        },
+                        pendingAction: CONST.RED_BRICK_ROAD_PENDING_ACTION.UPDATE,
+                    },
+                },
+            },
+        },
+    ];
+
+    const successData: OnyxUpdate[] = [
+        {
+            onyxMethod: Onyx.METHOD.MERGE,
+            key: `${ONYXKEYS.COLLECTION.POLICY}${policyID}`,
+            value: {
+                customUnits: {
+                    [newCustomUnit.customUnitID]: {
+                        pendingAction: null,
+                        errors: null,
+                        rates: {
+                            [newCustomUnit.rates.customUnitRateID]: {
+                                pendingAction: null,
+                            },
+                        },
+                    },
+                },
+            },
+        },
+    ];
+
+    const failureData: OnyxUpdate[] = [
+        {
+            onyxMethod: Onyx.METHOD.MERGE,
+            key: `${ONYXKEYS.COLLECTION.POLICY}${policyID}`,
+            value: {
+                customUnits: {
+                    [currentCustomUnit.customUnitID]: {
+                        customUnitID: currentCustomUnit.customUnitID,
+                        rates: {
+                            [newCustomUnit.rates.customUnitRateID]: {
+                                ...currentCustomUnit.rates,
+                                errors: ErrorUtils.getMicroSecondOnyxErrorWithTranslationKey('workspace.reimburse.updateCustomUnitError'),
+                            },
+                        },
+                    },
+                },
+            },
+        },
+    ];
+
+    const newCustomUnitParam = lodashClone(newCustomUnit);
+    const {pendingAction, errors, ...newRates} = newCustomUnitParam.rates ?? {};
+    newCustomUnitParam.rates = newRates;
+
+    const params: UpdateWorkspaceCustomUnitAndRateParams = {
+        policyID,
+        lastModified,
+        customUnit: JSON.stringify(newCustomUnitParam),
+        customUnitRate: JSON.stringify(newCustomUnitParam.rates),
+    };
+
+    API.write(WRITE_COMMANDS.UPDATE_WORKSPACE_CUSTOM_UNIT_AND_RATE, params, {optimisticData, successData, failureData});
+}
+
+/**
+ * Removes an error after trying to delete a workspace
+ */
+function clearDeleteWorkspaceError(policyID: string) {
+    Onyx.merge(`${ONYXKEYS.COLLECTION.POLICY}${policyID}`, {
+        pendingAction: null,
+        errors: null,
+    });
+}
+
+/**
+ * Removes the workspace after failure to create.
+ */
+function removeWorkspace(policyID: string) {
+    Onyx.set(`${ONYXKEYS.COLLECTION.POLICY}${policyID}`, null);
+}
+
+/**
+ * Generate a policy name based on an email and policy list.
+ * @param [email] the email to base the workspace name on. If not passed, will use the logged-in user's email instead
+ */
+function generateDefaultWorkspaceName(email = ''): string {
+    const emailParts = email ? email.split('@') : sessionEmail.split('@');
+    let defaultWorkspaceName = '';
+    if (!emailParts || emailParts.length !== 2) {
+        return defaultWorkspaceName;
+    }
+    const username = emailParts[0];
+    const domain = emailParts[1];
+    const userDetails = PersonalDetailsUtils.getPersonalDetailByEmail(sessionEmail);
+    const displayName = userDetails?.displayName?.trim();
+
+    if (!PUBLIC_DOMAINS.some((publicDomain) => publicDomain === domain.toLowerCase())) {
+        defaultWorkspaceName = `${Str.UCFirst(domain.split('.')[0])}'s Workspace`;
+    } else if (displayName) {
+        defaultWorkspaceName = `${Str.UCFirst(displayName)}'s Workspace`;
+    } else if (PUBLIC_DOMAINS.some((publicDomain) => publicDomain === domain.toLowerCase())) {
+        defaultWorkspaceName = `${Str.UCFirst(username)}'s Workspace`;
+    } else {
+        defaultWorkspaceName = userDetails?.phoneNumber ?? '';
+    }
+
+    if (`@${domain.toLowerCase()}` === CONST.SMS.DOMAIN) {
+        defaultWorkspaceName = 'My Group Workspace';
+    }
+
+    if (isEmptyObject(allPolicies)) {
+        return defaultWorkspaceName;
+    }
+
+    // find default named workspaces and increment the last number
+    const numberRegEx = new RegExp(`${escapeRegExp(defaultWorkspaceName)} ?(\\d*)`, 'i');
+    const parsedWorkspaceNumbers = Object.values(allPolicies ?? {})
+        .filter((policy) => policy?.name && numberRegEx.test(policy.name))
+        .map((policy) => Number(numberRegEx.exec(policy?.name ?? '')?.[1] ?? '1')); // parse the number at the end
+    const lastWorkspaceNumber = Math.max(...parsedWorkspaceNumbers);
+    return lastWorkspaceNumber !== -Infinity ? `${defaultWorkspaceName} ${lastWorkspaceNumber + 1}` : defaultWorkspaceName;
+}
+
+/**
+ * Returns a client generated 16 character hexadecimal value for the policyID
+ */
+function generatePolicyID(): string {
+    return NumberUtils.generateHexadecimalValue(16);
+}
+
+/**
+ * Returns a client generated 13 character hexadecimal value for a custom unit ID
+ */
+function generateCustomUnitID(): string {
+    return NumberUtils.generateHexadecimalValue(13);
+}
+
+function buildOptimisticCustomUnits(reportCurrency?: string): OptimisticCustomUnits {
+    const currency = reportCurrency ?? allPersonalDetails?.[sessionAccountID]?.localCurrencyCode ?? CONST.CURRENCY.USD;
+    const customUnitID = generateCustomUnitID();
+    const customUnitRateID = generateCustomUnitID();
+
+    const customUnits: Record<string, CustomUnit> = {
+        [customUnitID]: {
+            customUnitID,
+            name: CONST.CUSTOM_UNITS.NAME_DISTANCE,
+            attributes: {
+                unit: CONST.CUSTOM_UNITS.DISTANCE_UNIT_MILES,
+            },
+            rates: {
+                [customUnitRateID]: {
+                    customUnitRateID,
+                    name: CONST.CUSTOM_UNITS.DEFAULT_RATE,
+                    rate: CONST.CUSTOM_UNITS.MILEAGE_IRS_RATE * CONST.POLICY.CUSTOM_UNIT_RATE_BASE_OFFSET,
+                    enabled: true,
+                    currency,
+                },
+            },
+        },
+    };
+
+    return {
+        customUnits,
+        customUnitID,
+        customUnitRateID,
+        outputCurrency: currency,
+    };
+}
+
+/**
+ * Optimistically creates a Policy Draft for a new workspace
+ *
+ * @param [policyOwnerEmail] the email of the account to make the owner of the policy
+ * @param [policyName] custom policy name we will use for created workspace
+ * @param [policyID] custom policy id we will use for created workspace
+ * @param [makeMeAdmin] leave the calling account as an admin on the policy
+ */
+function createDraftInitialWorkspace(policyOwnerEmail = '', policyName = '', policyID = generatePolicyID(), makeMeAdmin = false) {
+    const workspaceName = policyName || generateDefaultWorkspaceName(policyOwnerEmail);
+    const {customUnits, outputCurrency} = buildOptimisticCustomUnits();
+
+    const optimisticData: OnyxUpdate[] = [
+        {
+            onyxMethod: Onyx.METHOD.SET,
+            key: `${ONYXKEYS.COLLECTION.POLICY_DRAFTS}${policyID}`,
+            value: {
+                id: policyID,
+                type: CONST.POLICY.TYPE.TEAM,
+                name: workspaceName,
+                role: CONST.POLICY.ROLE.ADMIN,
+                owner: sessionEmail,
+                ownerAccountID: sessionAccountID,
+                isPolicyExpenseChatEnabled: true,
+                areCategoriesEnabled: true,
+                outputCurrency,
+                pendingAction: CONST.RED_BRICK_ROAD_PENDING_ACTION.ADD,
+                customUnits,
+                makeMeAdmin,
+                autoReporting: true,
+                autoReportingFrequency: CONST.POLICY.AUTO_REPORTING_FREQUENCIES.INSTANT,
+                employeeList: {
+                    [sessionEmail]: {
+                        role: CONST.POLICY.ROLE.ADMIN,
+                        errors: {},
+                    },
+                },
+                approvalMode: CONST.POLICY.APPROVAL_MODE.OPTIONAL,
+                harvesting: {
+                    enabled: true,
+                },
+                pendingFields: {
+                    autoReporting: CONST.RED_BRICK_ROAD_PENDING_ACTION.ADD,
+                    approvalMode: CONST.RED_BRICK_ROAD_PENDING_ACTION.ADD,
+                    reimbursementChoice: CONST.RED_BRICK_ROAD_PENDING_ACTION.ADD,
+                },
+            },
+        },
+    ];
+
+    Onyx.update(optimisticData);
+}
+
+/**
+ * Generates onyx data for creating a new workspace
+ *
+ * @param [policyOwnerEmail] the email of the account to make the owner of the policy
+ * @param [makeMeAdmin] leave the calling account as an admin on the policy
+ * @param [policyName] custom policy name we will use for created workspace
+ * @param [policyID] custom policy id we will use for created workspace
+ * @param [expenseReportId] the reportID of the expense report that is being used to create the workspace
+ */
+function buildPolicyData(policyOwnerEmail = '', makeMeAdmin = false, policyName = '', policyID = generatePolicyID(), expenseReportId?: string) {
+    const workspaceName = policyName || generateDefaultWorkspaceName(policyOwnerEmail);
+
+    const {customUnits, customUnitID, customUnitRateID, outputCurrency} = buildOptimisticCustomUnits();
+
+    const {
+        announceChatReportID,
+        announceChatData,
+        announceReportActionData,
+        announceCreatedReportActionID,
+        adminsChatReportID,
+        adminsChatData,
+        adminsReportActionData,
+        adminsCreatedReportActionID,
+        expenseChatReportID,
+        expenseChatData,
+        expenseReportActionData,
+        expenseCreatedReportActionID,
+    } = ReportUtils.buildOptimisticWorkspaceChats(policyID, workspaceName, expenseReportId);
+
+    const optimisticCategoriesData = buildOptimisticPolicyCategories(policyID, CONST.POLICY.DEFAULT_CATEGORIES);
+
+    const optimisticData: OnyxUpdate[] = [
+        {
+            onyxMethod: Onyx.METHOD.SET,
+            key: `${ONYXKEYS.COLLECTION.POLICY}${policyID}`,
+            value: {
+                id: policyID,
+                type: CONST.POLICY.TYPE.TEAM,
+                name: workspaceName,
+                role: CONST.POLICY.ROLE.ADMIN,
+                owner: sessionEmail,
+                ownerAccountID: sessionAccountID,
+                isPolicyExpenseChatEnabled: true,
+                outputCurrency,
+                pendingAction: CONST.RED_BRICK_ROAD_PENDING_ACTION.ADD,
+                autoReporting: true,
+                autoReportingFrequency: CONST.POLICY.AUTO_REPORTING_FREQUENCIES.INSTANT,
+                approvalMode: CONST.POLICY.APPROVAL_MODE.OPTIONAL,
+                harvesting: {
+                    enabled: true,
+                },
+                customUnits,
+                areCategoriesEnabled: true,
+                areTagsEnabled: false,
+                areDistanceRatesEnabled: false,
+                areWorkflowsEnabled: false,
+                areReportFieldsEnabled: false,
+                areConnectionsEnabled: false,
+                employeeList: {
+                    [sessionEmail]: {
+                        role: CONST.POLICY.ROLE.ADMIN,
+                        errors: {},
+                    },
+                },
+                chatReportIDAdmins: makeMeAdmin ? Number(adminsChatReportID) : undefined,
+                pendingFields: {
+                    autoReporting: CONST.RED_BRICK_ROAD_PENDING_ACTION.ADD,
+                    approvalMode: CONST.RED_BRICK_ROAD_PENDING_ACTION.ADD,
+                    reimbursementChoice: CONST.RED_BRICK_ROAD_PENDING_ACTION.ADD,
+                    name: CONST.RED_BRICK_ROAD_PENDING_ACTION.ADD,
+                    outputCurrency: CONST.RED_BRICK_ROAD_PENDING_ACTION.ADD,
+                    address: CONST.RED_BRICK_ROAD_PENDING_ACTION.ADD,
+                    description: CONST.RED_BRICK_ROAD_PENDING_ACTION.ADD,
+                },
+            },
+        },
+        {
+            onyxMethod: Onyx.METHOD.SET,
+            key: `${ONYXKEYS.COLLECTION.REPORT}${announceChatReportID}`,
+            value: {
+                pendingFields: {
+                    addWorkspaceRoom: CONST.RED_BRICK_ROAD_PENDING_ACTION.ADD,
+                },
+                ...announceChatData,
+            },
+        },
+        {
+            onyxMethod: Onyx.METHOD.SET,
+            key: `${ONYXKEYS.COLLECTION.REPORT_DRAFT}${announceChatReportID}`,
+            value: null,
+        },
+        {
+            onyxMethod: Onyx.METHOD.SET,
+            key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${announceChatReportID}`,
+            value: announceReportActionData,
+        },
+        {
+            onyxMethod: Onyx.METHOD.SET,
+            key: `${ONYXKEYS.COLLECTION.REPORT}${adminsChatReportID}`,
+            value: {
+                pendingFields: {
+                    addWorkspaceRoom: CONST.RED_BRICK_ROAD_PENDING_ACTION.ADD,
+                },
+                ...adminsChatData,
+            },
+        },
+        {
+            onyxMethod: Onyx.METHOD.SET,
+            key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${adminsChatReportID}`,
+            value: adminsReportActionData,
+        },
+        {
+            onyxMethod: Onyx.METHOD.SET,
+            key: `${ONYXKEYS.COLLECTION.REPORT}${expenseChatReportID}`,
+            value: {
+                pendingFields: {
+                    addWorkspaceRoom: CONST.RED_BRICK_ROAD_PENDING_ACTION.ADD,
+                },
+                ...expenseChatData,
+            },
+        },
+        {
+            onyxMethod: Onyx.METHOD.SET,
+            key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${expenseChatReportID}`,
+            value: expenseReportActionData,
+        },
+        {
+            onyxMethod: Onyx.METHOD.SET,
+            key: `${ONYXKEYS.COLLECTION.POLICY_DRAFTS}${policyID}`,
+            value: null,
+        },
+        {
+            onyxMethod: Onyx.METHOD.SET,
+            key: `${ONYXKEYS.COLLECTION.REPORT_DRAFT}${expenseChatReportID}`,
+            value: null,
+        },
+    ];
+
+    const successData: OnyxUpdate[] = [
+        {
+            onyxMethod: Onyx.METHOD.MERGE,
+            key: `${ONYXKEYS.COLLECTION.POLICY}${policyID}`,
+            value: {
+                pendingAction: null,
+                pendingFields: {
+                    autoReporting: null,
+                    approvalMode: null,
+                    reimbursementChoice: null,
+                    name: null,
+                    outputCurrency: null,
+                    address: null,
+                },
+            },
+        },
+        {
+            onyxMethod: Onyx.METHOD.MERGE,
+            key: `${ONYXKEYS.COLLECTION.REPORT}${announceChatReportID}`,
+            value: {
+                pendingFields: {
+                    addWorkspaceRoom: null,
+                },
+                pendingAction: null,
+                isOptimisticReport: false,
+            },
+        },
+        {
+            onyxMethod: Onyx.METHOD.MERGE,
+            key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${announceChatReportID}`,
+            value: {
+                [announceCreatedReportActionID]: {
+                    pendingAction: null,
+                },
+            },
+        },
+        {
+            onyxMethod: Onyx.METHOD.MERGE,
+            key: `${ONYXKEYS.COLLECTION.REPORT}${adminsChatReportID}`,
+            value: {
+                pendingFields: {
+                    addWorkspaceRoom: null,
+                },
+                pendingAction: null,
+                pendingChatMembers: [],
+                isOptimisticReport: false,
+            },
+        },
+        {
+            onyxMethod: Onyx.METHOD.MERGE,
+            key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${adminsChatReportID}`,
+            value: {
+                [adminsCreatedReportActionID]: {
+                    pendingAction: null,
+                },
+            },
+        },
+        {
+            onyxMethod: Onyx.METHOD.MERGE,
+            key: `${ONYXKEYS.COLLECTION.REPORT}${expenseChatReportID}`,
+            value: {
+                pendingFields: {
+                    addWorkspaceRoom: null,
+                },
+                pendingAction: null,
+                isOptimisticReport: false,
+            },
+        },
+        {
+            onyxMethod: Onyx.METHOD.MERGE,
+            key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${expenseChatReportID}`,
+            value: {
+                [expenseCreatedReportActionID]: {
+                    pendingAction: null,
+                },
+            },
+        },
+    ];
+
+    const failureData: OnyxUpdate[] = [
+        {
+            onyxMethod: Onyx.METHOD.MERGE,
+            key: `${ONYXKEYS.COLLECTION.POLICY}${policyID}`,
+            value: {employeeList: null},
+        },
+        {
+            onyxMethod: Onyx.METHOD.SET,
+            key: `${ONYXKEYS.COLLECTION.REPORT}${announceChatReportID}`,
+            value: null,
+        },
+        {
+            onyxMethod: Onyx.METHOD.SET,
+            key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${announceChatReportID}`,
+            value: null,
+        },
+        {
+            onyxMethod: Onyx.METHOD.SET,
+            key: `${ONYXKEYS.COLLECTION.REPORT}${adminsChatReportID}`,
+            value: null,
+        },
+        {
+            onyxMethod: Onyx.METHOD.SET,
+            key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${adminsChatReportID}`,
+            value: null,
+        },
+        {
+            onyxMethod: Onyx.METHOD.SET,
+            key: `${ONYXKEYS.COLLECTION.REPORT}${expenseChatReportID}`,
+            value: null,
+        },
+        {
+            onyxMethod: Onyx.METHOD.SET,
+            key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${expenseChatReportID}`,
+            value: null,
+        },
+    ];
+
+    if (optimisticCategoriesData.optimisticData) {
+        optimisticData.push(...optimisticCategoriesData.optimisticData);
+    }
+
+    if (optimisticCategoriesData.failureData) {
+        failureData.push(...optimisticCategoriesData.failureData);
+    }
+
+    if (optimisticCategoriesData.successData) {
+        successData.push(...optimisticCategoriesData.successData);
+    }
+
+    const params: CreateWorkspaceParams = {
+        policyID,
+        announceChatReportID,
+        adminsChatReportID,
+        expenseChatReportID,
+        ownerEmail: policyOwnerEmail,
+        makeMeAdmin,
+        policyName: workspaceName,
+        type: CONST.POLICY.TYPE.TEAM,
+        announceCreatedReportActionID,
+        adminsCreatedReportActionID,
+        expenseCreatedReportActionID,
+        customUnitID,
+        customUnitRateID,
+    };
+
+    return {successData, optimisticData, failureData, params};
+}
+
+/**
+ * Optimistically creates a new workspace and default workspace chats
+ *
+ * @param [policyOwnerEmail] the email of the account to make the owner of the policy
+ * @param [makeMeAdmin] leave the calling account as an admin on the policy
+ * @param [policyName] custom policy name we will use for created workspace
+ * @param [policyID] custom policy id we will use for created workspace
+ */
+function createWorkspace(policyOwnerEmail = '', makeMeAdmin = false, policyName = '', policyID = generatePolicyID()): CreateWorkspaceParams {
+    const {optimisticData, failureData, successData, params} = buildPolicyData(policyOwnerEmail, makeMeAdmin, policyName, policyID);
+    API.write(WRITE_COMMANDS.CREATE_WORKSPACE, params, {optimisticData, successData, failureData});
+
+    return params;
+}
+
+/**
+ * Creates a draft workspace for various money request flows
+ *
+ * @param [policyOwnerEmail] the email of the account to make the owner of the policy
+ * @param [makeMeAdmin] leave the calling account as an admin on the policy
+ * @param [policyName] custom policy name we will use for created workspace
+ * @param [policyID] custom policy id we will use for created workspace
+ */
+function createDraftWorkspace(policyOwnerEmail = '', makeMeAdmin = false, policyName = '', policyID = generatePolicyID()): CreateWorkspaceParams {
+    const workspaceName = policyName || generateDefaultWorkspaceName(policyOwnerEmail);
+
+    const {customUnits, customUnitID, customUnitRateID, outputCurrency} = buildOptimisticCustomUnits();
+
+    const {expenseChatData, announceChatReportID, announceCreatedReportActionID, adminsChatReportID, adminsCreatedReportActionID, expenseChatReportID, expenseCreatedReportActionID} =
+        ReportUtils.buildOptimisticWorkspaceChats(policyID, workspaceName);
+
+    const optimisticData: OnyxUpdate[] = [
+        {
+            onyxMethod: Onyx.METHOD.SET,
+            key: `${ONYXKEYS.COLLECTION.POLICY_DRAFTS}${policyID}`,
+            value: {
+                id: policyID,
+                type: CONST.POLICY.TYPE.TEAM,
+                name: workspaceName,
+                role: CONST.POLICY.ROLE.ADMIN,
+                owner: sessionEmail,
+                ownerAccountID: sessionAccountID,
+                isPolicyExpenseChatEnabled: true,
+                outputCurrency,
+                pendingAction: CONST.RED_BRICK_ROAD_PENDING_ACTION.ADD,
+                autoReporting: true,
+                autoReportingFrequency: CONST.POLICY.AUTO_REPORTING_FREQUENCIES.INSTANT,
+                approvalMode: CONST.POLICY.APPROVAL_MODE.OPTIONAL,
+                harvesting: {
+                    enabled: true,
+                },
+                customUnits,
+                areCategoriesEnabled: true,
+                areTagsEnabled: false,
+                areDistanceRatesEnabled: false,
+                areWorkflowsEnabled: false,
+                areReportFieldsEnabled: false,
+                areConnectionsEnabled: false,
+                employeeList: {
+                    [sessionEmail]: {
+                        role: CONST.POLICY.ROLE.ADMIN,
+                        errors: {},
+                    },
+                },
+                chatReportIDAdmins: makeMeAdmin ? Number(adminsChatReportID) : undefined,
+                pendingFields: {
+                    autoReporting: CONST.RED_BRICK_ROAD_PENDING_ACTION.ADD,
+                    approvalMode: CONST.RED_BRICK_ROAD_PENDING_ACTION.ADD,
+                    reimbursementChoice: CONST.RED_BRICK_ROAD_PENDING_ACTION.ADD,
+                },
+            },
+        },
+        {
+            onyxMethod: Onyx.METHOD.SET,
+            key: `${ONYXKEYS.COLLECTION.REPORT_DRAFT}${expenseChatReportID}`,
+            value: expenseChatData,
+        },
+        {
+            onyxMethod: Onyx.METHOD.SET,
+            key: `${ONYXKEYS.COLLECTION.POLICY_CATEGORIES_DRAFT}${policyID}`,
+            value: CONST.POLICY.DEFAULT_CATEGORIES.reduce<Record<string, PolicyCategory>>((acc, category) => {
+                acc[category] = {
+                    name: category,
+                    enabled: true,
+                    errors: null,
+                };
+                return acc;
+            }, {}),
+        },
+    ];
+
+    const params: CreateWorkspaceParams = {
+        policyID,
+        announceChatReportID,
+        adminsChatReportID,
+        expenseChatReportID,
+        ownerEmail: policyOwnerEmail,
+        makeMeAdmin,
+        policyName: workspaceName,
+        type: CONST.POLICY.TYPE.TEAM,
+        announceCreatedReportActionID,
+        adminsCreatedReportActionID,
+        expenseCreatedReportActionID,
+        customUnitID,
+        customUnitRateID,
+    };
+
+    Onyx.update(optimisticData);
+
+    return params;
+}
+
+function openWorkspaceReimburseView(policyID: string) {
+    if (!policyID) {
+        Log.warn('openWorkspaceReimburseView invalid params', {policyID});
+        return;
+    }
+
+    const successData: OnyxUpdate[] = [
+        {
+            onyxMethod: Onyx.METHOD.MERGE,
+            key: ONYXKEYS.REIMBURSEMENT_ACCOUNT,
+            value: {
+                isLoading: false,
+            },
+        },
+    ];
+
+    const failureData: OnyxUpdate[] = [
+        {
+            onyxMethod: Onyx.METHOD.MERGE,
+            key: ONYXKEYS.REIMBURSEMENT_ACCOUNT,
+            value: {
+                isLoading: false,
+            },
+        },
+    ];
+
+    const params: OpenWorkspaceReimburseViewParams = {policyID};
+
+    API.read(READ_COMMANDS.OPEN_WORKSPACE_REIMBURSE_VIEW, params, {successData, failureData});
+}
+
+function openPolicyWorkflowsPage(policyID: string) {
+    if (!policyID) {
+        Log.warn('openPolicyWorkflowsPage invalid params', {policyID});
+        return;
+    }
+
+    const onyxData: OnyxData = {
+        optimisticData: [
+            {
+                onyxMethod: Onyx.METHOD.MERGE,
+                key: `${ONYXKEYS.COLLECTION.POLICY}${policyID}`,
+                value: {
+                    isLoading: true,
+                },
+            },
+        ],
+        successData: [
+            {
+                onyxMethod: Onyx.METHOD.MERGE,
+                key: `${ONYXKEYS.COLLECTION.POLICY}${policyID}`,
+                value: {
+                    isLoading: false,
+                },
+            },
+        ],
+        failureData: [
+            {
+                onyxMethod: Onyx.METHOD.MERGE,
+                key: `${ONYXKEYS.COLLECTION.POLICY}${policyID}`,
+                value: {
+                    isLoading: false,
+                },
+            },
+        ],
+    };
+
+    const params: OpenPolicyWorkflowsPageParams = {policyID};
+
+    API.read(READ_COMMANDS.OPEN_POLICY_WORKFLOWS_PAGE, params, onyxData);
+}
+
+function setPolicyIDForReimburseView(policyID: string) {
+    Onyx.merge(ONYXKEYS.WORKSPACE_RATE_AND_UNIT, {policyID, rate: null, unit: null});
+}
+
+function clearOnyxDataForReimburseView() {
+    Onyx.merge(ONYXKEYS.WORKSPACE_RATE_AND_UNIT, null);
+}
+
+function setRateForReimburseView(rate: string) {
+    Onyx.merge(ONYXKEYS.WORKSPACE_RATE_AND_UNIT, {rate});
+}
+
+function setUnitForReimburseView(unit: Unit) {
+    Onyx.merge(ONYXKEYS.WORKSPACE_RATE_AND_UNIT, {unit});
+}
+
+/**
+ * Returns the accountIDs of the members of the policy whose data is passed in the parameters
+ */
+function openWorkspace(policyID: string, clientMemberAccountIDs: number[]) {
+    if (!policyID || !clientMemberAccountIDs) {
+        Log.warn('openWorkspace invalid params', {policyID, clientMemberAccountIDs});
+        return;
+    }
+
+    const params: OpenWorkspaceParams = {
+        policyID,
+        clientMemberAccountIDs: JSON.stringify(clientMemberAccountIDs),
+    };
+
+    API.read(READ_COMMANDS.OPEN_WORKSPACE, params);
+}
+
+function openPolicyTaxesPage(policyID: string) {
+    if (!policyID) {
+        Log.warn('openPolicyTaxesPage invalid params', {policyID});
+        return;
+    }
+
+    const params: OpenPolicyTaxesPageParams = {
+        policyID,
+    };
+
+    API.read(READ_COMMANDS.OPEN_POLICY_TAXES_PAGE, params);
+}
+
+function openPolicyExpensifyCardsPage(policyID: string, workspaceAccountID: number) {
+    const authToken = NetworkStore.getAuthToken();
+
+    const optimisticData: OnyxUpdate[] = [
+        {
+            onyxMethod: Onyx.METHOD.MERGE,
+            key: `${ONYXKEYS.COLLECTION.PRIVATE_EXPENSIFY_CARD_SETTINGS}${workspaceAccountID}`,
+            value: {
+                isLoading: true,
+            },
+        },
+    ];
+
+    const successData: OnyxUpdate[] = [
+        {
+            onyxMethod: Onyx.METHOD.MERGE,
+            key: `${ONYXKEYS.COLLECTION.PRIVATE_EXPENSIFY_CARD_SETTINGS}${workspaceAccountID}`,
+            value: {
+                isLoading: false,
+            },
+        },
+    ];
+
+    const failureData: OnyxUpdate[] = [
+        {
+            onyxMethod: Onyx.METHOD.MERGE,
+            key: `${ONYXKEYS.COLLECTION.PRIVATE_EXPENSIFY_CARD_SETTINGS}${workspaceAccountID}`,
+            value: {
+                isLoading: false,
+            },
+        },
+    ];
+
+    const params: OpenPolicyExpensifyCardsPageParams = {
+        policyID,
+        authToken,
+    };
+
+    API.read(READ_COMMANDS.OPEN_POLICY_EXPENSIFY_CARDS_PAGE, params, {optimisticData, successData, failureData});
+}
+
+function openPolicyEditCardLimitTypePage(policyID: string, cardID: number) {
+    const authToken = NetworkStore.getAuthToken();
+
+    const params: OpenPolicyEditCardLimitTypePageParams = {
+        policyID,
+        authToken,
+        cardID,
+    };
+
+    API.read(READ_COMMANDS.OPEN_POLICY_EDIT_CARD_LIMIT_TYPE_PAGE, params);
+}
+
+function openWorkspaceInvitePage(policyID: string, clientMemberEmails: string[]) {
+    if (!policyID || !clientMemberEmails) {
+        Log.warn('openWorkspaceInvitePage invalid params', {policyID, clientMemberEmails});
+        return;
+    }
+
+    const params: OpenWorkspaceInvitePageParams = {
+        policyID,
+        clientMemberEmails: JSON.stringify(clientMemberEmails),
+    };
+
+    API.read(READ_COMMANDS.OPEN_WORKSPACE_INVITE_PAGE, params);
+}
+
+function openDraftWorkspaceRequest(policyID: string) {
+    const params: OpenDraftWorkspaceRequestParams = {policyID};
+
+    API.read(READ_COMMANDS.OPEN_DRAFT_WORKSPACE_REQUEST, params);
+}
+
+function requestExpensifyCardLimitIncrease(settlementBankAccountID: string) {
+    const authToken = NetworkStore.getAuthToken();
+
+    const params: RequestExpensifyCardLimitIncreaseParams = {
+        authToken,
+        settlementBankAccountID,
+    };
+
+    API.write(WRITE_COMMANDS.REQUEST_EXPENSIFY_CARD_LIMIT_INCREASE, params);
+}
+
+function setWorkspaceInviteMessageDraft(policyID: string, message: string | null) {
+    Onyx.set(`${ONYXKEYS.COLLECTION.WORKSPACE_INVITE_MESSAGE_DRAFT}${policyID}`, message);
+}
+
+function clearErrors(policyID: string) {
+    Onyx.merge(`${ONYXKEYS.COLLECTION.POLICY}${policyID}`, {errors: null});
+    hideWorkspaceAlertMessage(policyID);
+}
+
+/**
+ * Dismiss the informative messages about which policy members were added with primary logins when invited with their secondary login.
+ */
+function dismissAddedWithPrimaryLoginMessages(policyID: string) {
+    Onyx.merge(`${ONYXKEYS.COLLECTION.POLICY}${policyID}`, {primaryLoginsInvited: null});
+}
+
+/**
+ * This flow is used for bottom up flow converting IOU report to an expense report. When user takes this action,
+ * we create a Collect type workspace when the person taking the action becomes an owner and an admin, while we
+ * add a new member to the workspace as an employee and convert the IOU report passed as a param into an expense report.
+ *
+ * @returns policyID of the workspace we have created
+ */
+function createWorkspaceFromIOUPayment(iouReport: OnyxEntry<Report>): WorkspaceFromIOUCreationData | undefined {
+    // This flow only works for IOU reports
+    if (!ReportUtils.isIOUReportUsingReport(iouReport)) {
+        return;
+    }
+
+    // Generate new variables for the policy
+    const policyID = generatePolicyID();
+    const workspaceName = generateDefaultWorkspaceName(sessionEmail);
+    const employeeAccountID = iouReport.ownerAccountID;
+    const employeeEmail = iouReport.ownerEmail ?? '';
+    const {customUnits, customUnitID, customUnitRateID} = buildOptimisticCustomUnits(iouReport.currency);
+    const oldPersonalPolicyID = iouReport.policyID;
+    const iouReportID = iouReport.reportID;
+
+    const {
+        announceChatReportID,
+        announceChatData,
+        announceReportActionData,
+        announceCreatedReportActionID,
+        adminsChatReportID,
+        adminsChatData,
+        adminsReportActionData,
+        adminsCreatedReportActionID,
+        expenseChatReportID: workspaceChatReportID,
+        expenseChatData: workspaceChatData,
+        expenseReportActionData: workspaceChatReportActionData,
+        expenseCreatedReportActionID: workspaceChatCreatedReportActionID,
+    } = ReportUtils.buildOptimisticWorkspaceChats(policyID, workspaceName);
+
+    if (!employeeAccountID) {
+        return;
+    }
+
+    // Create the workspace chat for the employee whose IOU is being paid
+    const employeeWorkspaceChat = createPolicyExpenseChats(policyID, {[employeeEmail]: employeeAccountID}, true);
+    const newWorkspace = {
+        id: policyID,
+
+        // We are creating a collect policy in this case
+        type: CONST.POLICY.TYPE.TEAM,
+        name: workspaceName,
+        role: CONST.POLICY.ROLE.ADMIN,
+        owner: sessionEmail,
+        ownerAccountID: sessionAccountID,
+        isPolicyExpenseChatEnabled: true,
+
+        // Setting the currency to USD as we can only add the VBBA for this policy currency right now
+        outputCurrency: CONST.CURRENCY.USD,
+        pendingAction: CONST.RED_BRICK_ROAD_PENDING_ACTION.ADD,
+        autoReporting: true,
+        autoReportingFrequency: CONST.POLICY.AUTO_REPORTING_FREQUENCIES.INSTANT,
+        approvalMode: CONST.POLICY.APPROVAL_MODE.OPTIONAL,
+        harvesting: {
+            enabled: true,
+        },
+        customUnits,
+        areCategoriesEnabled: true,
+        areTagsEnabled: false,
+        areDistanceRatesEnabled: false,
+        areWorkflowsEnabled: false,
+        areReportFieldsEnabled: false,
+        areConnectionsEnabled: false,
+        employeeList: {
+            [sessionEmail]: {
+                role: CONST.POLICY.ROLE.ADMIN,
+                errors: {},
+            },
+            [employeeEmail]: {
+                role: CONST.POLICY.ROLE.USER,
+                errors: {},
+            },
+        },
+        pendingFields: {
+            autoReporting: CONST.RED_BRICK_ROAD_PENDING_ACTION.ADD,
+            approvalMode: CONST.RED_BRICK_ROAD_PENDING_ACTION.ADD,
+            reimbursementChoice: CONST.RED_BRICK_ROAD_PENDING_ACTION.ADD,
+        },
+    };
+
+    const optimisticData: OnyxUpdate[] = [
+        {
+            onyxMethod: Onyx.METHOD.SET,
+            key: `${ONYXKEYS.COLLECTION.POLICY}${policyID}`,
+            value: newWorkspace,
+        },
+        {
+            onyxMethod: Onyx.METHOD.SET,
+            key: `${ONYXKEYS.COLLECTION.REPORT}${announceChatReportID}`,
+            value: {
+                pendingFields: {
+                    addWorkspaceRoom: CONST.RED_BRICK_ROAD_PENDING_ACTION.ADD,
+                },
+                ...announceChatData,
+            },
+        },
+        {
+            onyxMethod: Onyx.METHOD.SET,
+            key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${announceChatReportID}`,
+            value: announceReportActionData,
+        },
+        {
+            onyxMethod: Onyx.METHOD.SET,
+            key: `${ONYXKEYS.COLLECTION.REPORT}${adminsChatReportID}`,
+            value: {
+                pendingFields: {
+                    addWorkspaceRoom: CONST.RED_BRICK_ROAD_PENDING_ACTION.ADD,
+                },
+                ...adminsChatData,
+            },
+        },
+        {
+            onyxMethod: Onyx.METHOD.SET,
+            key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${adminsChatReportID}`,
+            value: adminsReportActionData,
+        },
+        {
+            onyxMethod: Onyx.METHOD.SET,
+            key: `${ONYXKEYS.COLLECTION.REPORT}${workspaceChatReportID}`,
+            value: {
+                pendingFields: {
+                    addWorkspaceRoom: CONST.RED_BRICK_ROAD_PENDING_ACTION.ADD,
+                },
+                ...workspaceChatData,
+            },
+        },
+        {
+            onyxMethod: Onyx.METHOD.SET,
+            key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${workspaceChatReportID}`,
+            value: workspaceChatReportActionData,
+        },
+        {
+            onyxMethod: Onyx.METHOD.MERGE,
+            key: `${ONYXKEYS.COLLECTION.POLICY_DRAFTS}${policyID}`,
+            value: {
+                pendingFields: {
+                    addWorkspaceRoom: null,
+                },
+                pendingAction: null,
+            },
+        },
+    ];
+    optimisticData.push(...employeeWorkspaceChat.onyxOptimisticData);
+
+    const successData: OnyxUpdate[] = [
+        {
+            onyxMethod: Onyx.METHOD.MERGE,
+            key: `${ONYXKEYS.COLLECTION.POLICY}${policyID}`,
+            value: {
+                pendingAction: null,
+                pendingFields: {
+                    autoReporting: null,
+                    approvalMode: null,
+                    reimbursementChoice: null,
+                },
+            },
+        },
+        {
+            onyxMethod: Onyx.METHOD.MERGE,
+            key: `${ONYXKEYS.COLLECTION.REPORT}${announceChatReportID}`,
+            value: {
+                pendingFields: {
+                    addWorkspaceRoom: null,
+                },
+                pendingAction: null,
+            },
+        },
+        {
+            onyxMethod: Onyx.METHOD.MERGE,
+            key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${announceChatReportID}`,
+            value: {
+                [Object.keys(announceChatData)[0]]: {
+                    pendingAction: null,
+                },
+            },
+        },
+        {
+            onyxMethod: Onyx.METHOD.MERGE,
+            key: `${ONYXKEYS.COLLECTION.REPORT}${adminsChatReportID}`,
+            value: {
+                pendingFields: {
+                    addWorkspaceRoom: null,
+                },
+                pendingAction: null,
+            },
+        },
+        {
+            onyxMethod: Onyx.METHOD.MERGE,
+            key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${adminsChatReportID}`,
+            value: {
+                [Object.keys(adminsChatData)[0]]: {
+                    pendingAction: null,
+                },
+            },
+        },
+        {
+            onyxMethod: Onyx.METHOD.MERGE,
+            key: `${ONYXKEYS.COLLECTION.REPORT}${workspaceChatReportID}`,
+            value: {
+                pendingFields: {
+                    addWorkspaceRoom: null,
+                },
+                pendingAction: null,
+            },
+        },
+        {
+            onyxMethod: Onyx.METHOD.MERGE,
+            key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${workspaceChatReportID}`,
+            value: {
+                [Object.keys(workspaceChatData)[0]]: {
+                    pendingAction: null,
+                },
+            },
+        },
+    ];
+    successData.push(...employeeWorkspaceChat.onyxSuccessData);
+
+    const failureData: OnyxUpdate[] = [
+        {
+            onyxMethod: Onyx.METHOD.MERGE,
+            key: `${ONYXKEYS.COLLECTION.REPORT}${announceChatReportID}`,
+            value: {
+                pendingFields: {
+                    addWorkspaceRoom: null,
+                },
+                pendingAction: null,
+            },
+        },
+        {
+            onyxMethod: Onyx.METHOD.MERGE,
+            key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${announceChatReportID}`,
+            value: {
+                pendingAction: null,
+            },
+        },
+        {
+            onyxMethod: Onyx.METHOD.MERGE,
+            key: `${ONYXKEYS.COLLECTION.REPORT}${adminsChatReportID}`,
+            value: {
+                pendingFields: {
+                    addWorkspaceRoom: null,
+                },
+                pendingAction: null,
+            },
+        },
+        {
+            onyxMethod: Onyx.METHOD.MERGE,
+            key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${adminsChatReportID}`,
+            value: {
+                pendingAction: null,
+            },
+        },
+        {
+            onyxMethod: Onyx.METHOD.MERGE,
+            key: `${ONYXKEYS.COLLECTION.REPORT}${workspaceChatReportID}`,
+            value: {
+                pendingFields: {
+                    addWorkspaceRoom: null,
+                },
+                pendingAction: null,
+            },
+        },
+        {
+            onyxMethod: Onyx.METHOD.MERGE,
+            key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${workspaceChatReportID}`,
+            value: {
+                pendingAction: null,
+            },
+        },
+    ];
+
+    // Compose the memberData object which is used to add the employee to the workspace and
+    // optimistically create the workspace chat for them.
+    const memberData = {
+        accountID: Number(employeeAccountID),
+        email: employeeEmail,
+        workspaceChatReportID: employeeWorkspaceChat.reportCreationData[employeeEmail].reportID,
+        workspaceChatCreatedReportActionID: employeeWorkspaceChat.reportCreationData[employeeEmail].reportActionID,
+    };
+
+    const oldChatReportID = iouReport.chatReportID;
+
+    // Next we need to convert the IOU report to Expense report.
+    // We need to change:
+    // - report type
+    // - change the sign of the report total
+    // - update its policyID and policyName
+    // - update the chatReportID to point to the new workspace chat
+    const expenseReport = {
+        ...iouReport,
+        chatReportID: memberData.workspaceChatReportID,
+        policyID,
+        policyName: workspaceName,
+        type: CONST.REPORT.TYPE.EXPENSE,
+        total: -(iouReport?.total ?? 0),
+    };
+    optimisticData.push({
+        onyxMethod: Onyx.METHOD.MERGE,
+        key: `${ONYXKEYS.COLLECTION.REPORT}${iouReportID}`,
+        value: expenseReport,
+    });
+    failureData.push({
+        onyxMethod: Onyx.METHOD.MERGE,
+        key: `${ONYXKEYS.COLLECTION.REPORT}${iouReportID}`,
+        value: iouReport,
+    });
+
+    // The expense report transactions need to have the amount reversed to negative values
+    const reportTransactions = TransactionUtils.getAllReportTransactions(iouReportID);
+
+    // For performance reasons, we are going to compose a merge collection data for transactions
+    const transactionsOptimisticData: Record<string, Transaction> = {};
+    const transactionFailureData: Record<string, Transaction> = {};
+    reportTransactions.forEach((transaction) => {
+        transactionsOptimisticData[`${ONYXKEYS.COLLECTION.TRANSACTION}${transaction.transactionID}`] = {
+            ...transaction,
+            amount: -transaction.amount,
+            modifiedAmount: transaction.modifiedAmount ? -transaction.modifiedAmount : 0,
+        };
+
+        transactionFailureData[`${ONYXKEYS.COLLECTION.TRANSACTION}${transaction.transactionID}`] = transaction;
+    });
+
+    optimisticData.push({
+        onyxMethod: Onyx.METHOD.MERGE_COLLECTION,
+        key: `${ONYXKEYS.COLLECTION.TRANSACTION}`,
+        value: transactionsOptimisticData,
+    });
+    failureData.push({
+        onyxMethod: Onyx.METHOD.MERGE_COLLECTION,
+        key: `${ONYXKEYS.COLLECTION.TRANSACTION}`,
+        value: transactionFailureData,
+    });
+
+    // We need to move the report preview action from the DM to the workspace chat.
+    const reportPreview = ReportActionsUtils.getParentReportAction(iouReport);
+    optimisticData.push({
+        onyxMethod: Onyx.METHOD.MERGE,
+        key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${oldChatReportID}`,
+        value: {[reportPreview?.reportActionID ?? '-1']: null},
+    });
+    failureData.push({
+        onyxMethod: Onyx.METHOD.MERGE,
+        key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${oldChatReportID}`,
+        value: {[reportPreview?.reportActionID ?? '-1']: reportPreview},
+    });
+
+    // To optimistically remove the GBR from the DM we need to update the hasOutstandingChildRequest param to false
+    optimisticData.push({
+        onyxMethod: Onyx.METHOD.MERGE,
+        key: `${ONYXKEYS.COLLECTION.REPORT}${oldChatReportID}`,
+        value: {
+            hasOutstandingChildRequest: false,
+        },
+    });
+    failureData.push({
+        onyxMethod: Onyx.METHOD.MERGE,
+        key: `${ONYXKEYS.COLLECTION.REPORT}${oldChatReportID}`,
+        value: {
+            hasOutstandingChildRequest: true,
+        },
+    });
+
+    if (reportPreview?.reportActionID) {
+        // Update the created timestamp of the report preview action to be after the workspace chat created timestamp.
+        optimisticData.push({
+            onyxMethod: Onyx.METHOD.MERGE,
+            key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${memberData.workspaceChatReportID}`,
+            value: {
+                [reportPreview.reportActionID]: {
+                    ...reportPreview,
+                    message: [
+                        {
+                            type: CONST.REPORT.MESSAGE.TYPE.TEXT,
+                            text: ReportUtils.getReportPreviewMessage(expenseReport, null, false, false, newWorkspace),
+                        },
+                    ],
+                    created: DateUtils.getDBTime(),
+                },
+            },
+        });
+    }
+
+    failureData.push({
+        onyxMethod: Onyx.METHOD.MERGE,
+        key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${memberData.workspaceChatReportID}`,
+        value: {[reportPreview?.reportActionID ?? '-1']: null},
+    });
+
+    // Create the MOVED report action and add it to the DM chat which indicates to the user where the report has been moved
+    const movedReportAction = ReportUtils.buildOptimisticMovedReportAction(oldPersonalPolicyID ?? '-1', policyID, memberData.workspaceChatReportID, iouReportID, workspaceName);
+    optimisticData.push({
+        onyxMethod: Onyx.METHOD.MERGE,
+        key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${oldChatReportID}`,
+        value: {[movedReportAction.reportActionID]: movedReportAction},
+    });
+    successData.push({
+        onyxMethod: Onyx.METHOD.MERGE,
+        key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${oldChatReportID}`,
+        value: {
+            [movedReportAction.reportActionID]: {
+                ...movedReportAction,
+                pendingAction: null,
+            },
+        },
+    });
+    failureData.push({
+        onyxMethod: Onyx.METHOD.MERGE,
+        key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${oldChatReportID}`,
+        value: {[movedReportAction.reportActionID]: null},
+    });
+
+    // We know that this new workspace has no BankAccount yet, so we can set
+    // the reimbursement account to be immediately in the setup state for a new bank account:
+    optimisticData.push({
+        onyxMethod: Onyx.METHOD.MERGE,
+        key: `${ONYXKEYS.REIMBURSEMENT_ACCOUNT}`,
+        value: {
+            isLoading: false,
+            achData: {
+                currentStep: CONST.BANK_ACCOUNT.STEP.BANK_ACCOUNT,
+                policyID,
+                subStep: '',
+            },
+        },
+    });
+    failureData.push({
+        onyxMethod: Onyx.METHOD.SET,
+        key: `${ONYXKEYS.REIMBURSEMENT_ACCOUNT}`,
+        value: CONST.REIMBURSEMENT_ACCOUNT.DEFAULT_DATA,
+    });
+
+    const params: CreateWorkspaceFromIOUPaymentParams = {
+        policyID,
+        announceChatReportID,
+        adminsChatReportID,
+        expenseChatReportID: workspaceChatReportID,
+        ownerEmail: '',
+        makeMeAdmin: false,
+        policyName: workspaceName,
+        type: CONST.POLICY.TYPE.TEAM,
+        announceCreatedReportActionID,
+        adminsCreatedReportActionID,
+        expenseCreatedReportActionID: workspaceChatCreatedReportActionID,
+        customUnitID,
+        customUnitRateID,
+        iouReportID,
+        memberData: JSON.stringify(memberData),
+        reportActionID: movedReportAction.reportActionID,
+    };
+
+    API.write(WRITE_COMMANDS.CREATE_WORKSPACE_FROM_IOU_PAYMENT, params, {optimisticData, successData, failureData});
+
+    return {policyID, workspaceChatReportID: memberData.workspaceChatReportID, reportPreviewReportActionID: reportPreview?.reportActionID};
+}
+
+function enablePolicyConnections(policyID: string, enabled: boolean) {
+    const onyxData: OnyxData = {
+        optimisticData: [
+            {
+                onyxMethod: Onyx.METHOD.MERGE,
+                key: `${ONYXKEYS.COLLECTION.POLICY}${policyID}`,
+                value: {
+                    areConnectionsEnabled: enabled,
+                    pendingFields: {
+                        areConnectionsEnabled: CONST.RED_BRICK_ROAD_PENDING_ACTION.UPDATE,
+                    },
+                },
+            },
+        ],
+        successData: [
+            {
+                onyxMethod: Onyx.METHOD.MERGE,
+                key: `${ONYXKEYS.COLLECTION.POLICY}${policyID}`,
+                value: {
+                    pendingFields: {
+                        areConnectionsEnabled: null,
+                    },
+                },
+            },
+        ],
+        failureData: [
+            {
+                onyxMethod: Onyx.METHOD.MERGE,
+                key: `${ONYXKEYS.COLLECTION.POLICY}${policyID}`,
+                value: {
+                    areConnectionsEnabled: !enabled,
+                    pendingFields: {
+                        areConnectionsEnabled: null,
+                    },
+                },
+            },
+        ],
+    };
+
+    const parameters: EnablePolicyConnectionsParams = {policyID, enabled};
+
+    API.write(WRITE_COMMANDS.ENABLE_POLICY_CONNECTIONS, parameters, onyxData);
+
+    if (enabled && getIsNarrowLayout()) {
+        navigateWhenEnableFeature(policyID);
+    }
+}
+
+/** Save the preferred export method for a policy */
+function savePreferredExportMethod(policyID: string, exportMethod: ReportExportType) {
+    Onyx.merge(`${ONYXKEYS.LAST_EXPORT_METHOD}`, {[policyID]: exportMethod});
+}
+
+function enableExpensifyCard(policyID: string, enabled: boolean) {
+    const authToken = NetworkStore.getAuthToken();
+    if (!authToken) {
+        return;
+    }
+    const onyxData: OnyxData = {
+        optimisticData: [
+            {
+                onyxMethod: Onyx.METHOD.MERGE,
+                key: `${ONYXKEYS.COLLECTION.POLICY}${policyID}`,
+                value: {
+                    areExpensifyCardsEnabled: enabled,
+                    pendingFields: {
+                        areExpensifyCardsEnabled: CONST.RED_BRICK_ROAD_PENDING_ACTION.UPDATE,
+                    },
+                },
+            },
+        ],
+        successData: [
+            {
+                onyxMethod: Onyx.METHOD.MERGE,
+                key: `${ONYXKEYS.COLLECTION.POLICY}${policyID}`,
+                value: {
+                    pendingFields: {
+                        areExpensifyCardsEnabled: null,
+                    },
+                },
+            },
+        ],
+        failureData: [
+            {
+                onyxMethod: Onyx.METHOD.MERGE,
+                key: `${ONYXKEYS.COLLECTION.POLICY}${policyID}`,
+                value: {
+                    areExpensifyCardsEnabled: !enabled,
+                    pendingFields: {
+                        areExpensifyCardsEnabled: null,
+                    },
+                },
+            },
+        ],
+    };
+
+    const parameters: EnablePolicyExpensifyCardsParams = {authToken, policyID, enabled};
+
+    API.write(WRITE_COMMANDS.ENABLE_POLICY_EXPENSIFY_CARDS, parameters, onyxData);
+
+    if (enabled && getIsNarrowLayout()) {
+        navigateWhenEnableFeature(policyID);
+    }
+}
+
+function enableCompanyCards(policyID: string, enabled: boolean) {
+    const authToken = NetworkStore.getAuthToken();
+
+    const onyxData: OnyxData = {
+        optimisticData: [
+            {
+                onyxMethod: Onyx.METHOD.MERGE,
+                key: `${ONYXKEYS.COLLECTION.POLICY}${policyID}`,
+                value: {
+                    areCompanyCardsEnabled: enabled,
+                    pendingFields: {
+                        areCompanyCardsEnabled: CONST.RED_BRICK_ROAD_PENDING_ACTION.UPDATE,
+                    },
+                },
+            },
+        ],
+        successData: [
+            {
+                onyxMethod: Onyx.METHOD.MERGE,
+                key: `${ONYXKEYS.COLLECTION.POLICY}${policyID}`,
+                value: {
+                    pendingFields: {
+                        areCompanyCardsEnabled: null,
+                    },
+                },
+            },
+        ],
+        failureData: [
+            {
+                onyxMethod: Onyx.METHOD.MERGE,
+                key: `${ONYXKEYS.COLLECTION.POLICY}${policyID}`,
+                value: {
+                    areCompanyCardsEnabled: !enabled,
+                    pendingFields: {
+                        areCompanyCardsEnabled: null,
+                    },
+                },
+            },
+        ],
+    };
+
+    const parameters: EnablePolicyCompanyCardsParams = {authToken, policyID, enabled};
+
+    API.write(WRITE_COMMANDS.ENABLE_POLICY_COMPANY_CARDS, parameters, onyxData);
+
+    if (enabled && getIsNarrowLayout()) {
+        navigateWhenEnableFeature(policyID);
+    }
+}
+
+function enablePolicyReportFields(policyID: string, enabled: boolean, disableRedirect = false) {
+    const onyxData: OnyxData = {
+        optimisticData: [
+            {
+                onyxMethod: Onyx.METHOD.MERGE,
+                key: `${ONYXKEYS.COLLECTION.POLICY}${policyID}`,
+                value: {
+                    areReportFieldsEnabled: enabled,
+                    pendingFields: {
+                        areReportFieldsEnabled: CONST.RED_BRICK_ROAD_PENDING_ACTION.UPDATE,
+                    },
+                },
+            },
+        ],
+        successData: [
+            {
+                onyxMethod: Onyx.METHOD.MERGE,
+                key: `${ONYXKEYS.COLLECTION.POLICY}${policyID}`,
+                value: {
+                    pendingFields: {
+                        areReportFieldsEnabled: null,
+                    },
+                },
+            },
+        ],
+        failureData: [
+            {
+                onyxMethod: Onyx.METHOD.MERGE,
+                key: `${ONYXKEYS.COLLECTION.POLICY}${policyID}`,
+                value: {
+                    areReportFieldsEnabled: !enabled,
+                    pendingFields: {
+                        areReportFieldsEnabled: null,
+                    },
+                },
+            },
+        ],
+    };
+
+    const parameters: EnablePolicyReportFieldsParams = {policyID, enabled};
+
+    API.write(WRITE_COMMANDS.ENABLE_POLICY_REPORT_FIELDS, parameters, onyxData);
+
+    if (enabled && getIsNarrowLayout() && !disableRedirect) {
+        navigateWhenEnableFeature(policyID);
+    }
+}
+
+function enablePolicyTaxes(policyID: string, enabled: boolean) {
+    const defaultTaxRates: TaxRatesWithDefault = CONST.DEFAULT_TAX;
+    const taxRatesData: OnyxData = {
+        optimisticData: [
+            {
+                onyxMethod: Onyx.METHOD.MERGE,
+                key: `${ONYXKEYS.COLLECTION.POLICY}${policyID}`,
+                value: {
+                    taxRates: {
+                        ...defaultTaxRates,
+                        taxes: {
+                            ...Object.keys(defaultTaxRates.taxes).reduce((acc, taxKey) => {
+                                acc[taxKey] = {
+                                    ...defaultTaxRates.taxes[taxKey],
+                                    pendingAction: CONST.RED_BRICK_ROAD_PENDING_ACTION.ADD,
+                                };
+                                return acc;
+                            }, {} as Record<string, TaxRate & {pendingAction: typeof CONST.RED_BRICK_ROAD_PENDING_ACTION.ADD}>),
+                        },
+                    },
+                },
+            },
+        ],
+        successData: [
+            {
+                onyxMethod: Onyx.METHOD.MERGE,
+                key: `${ONYXKEYS.COLLECTION.POLICY}${policyID}`,
+                value: {
+                    taxRates: {
+                        taxes: {
+                            ...Object.keys(defaultTaxRates.taxes).reduce((acc, taxKey) => {
+                                acc[taxKey] = {pendingAction: null};
+                                return acc;
+                            }, {} as Record<string, {pendingAction: null}>),
+                        },
+                    },
+                },
+            },
+        ],
+        failureData: [
+            {
+                onyxMethod: Onyx.METHOD.MERGE,
+                key: `${ONYXKEYS.COLLECTION.POLICY}${policyID}`,
+                value: {
+                    taxRates: undefined,
+                },
+            },
+        ],
+    };
+    const policy = getPolicy(policyID);
+    const shouldAddDefaultTaxRatesData = (!policy?.taxRates || isEmptyObject(policy.taxRates)) && enabled;
+
+    const optimisticData: OnyxUpdate[] = [
+        {
+            onyxMethod: Onyx.METHOD.MERGE,
+            key: `${ONYXKEYS.COLLECTION.POLICY}${policyID}`,
+            value: {
+                tax: {
+                    trackingEnabled: enabled,
+                },
+                pendingFields: {
+                    tax: CONST.RED_BRICK_ROAD_PENDING_ACTION.UPDATE,
+                },
+            },
+        },
+    ];
+    optimisticData.push(...(shouldAddDefaultTaxRatesData ? taxRatesData.optimisticData ?? [] : []));
+
+    const successData: OnyxUpdate[] = [
+        {
+            onyxMethod: Onyx.METHOD.MERGE,
+            key: `${ONYXKEYS.COLLECTION.POLICY}${policyID}`,
+            value: {
+                pendingFields: {
+                    tax: null,
+                },
+            },
+        },
+    ];
+    successData.push(...(shouldAddDefaultTaxRatesData ? taxRatesData.successData ?? [] : []));
+
+    const failureData: OnyxUpdate[] = [
+        {
+            onyxMethod: Onyx.METHOD.MERGE,
+            key: `${ONYXKEYS.COLLECTION.POLICY}${policyID}`,
+            value: {
+                tax: {
+                    trackingEnabled: !enabled,
+                },
+                pendingFields: {
+                    tax: null,
+                },
+            },
+        },
+    ];
+    failureData.push(...(shouldAddDefaultTaxRatesData ? taxRatesData.failureData ?? [] : []));
+
+    const onyxData: OnyxData = {
+        optimisticData,
+        successData,
+        failureData,
+    };
+
+    const parameters: EnablePolicyTaxesParams = {policyID, enabled};
+    if (shouldAddDefaultTaxRatesData) {
+        parameters.taxFields = JSON.stringify(defaultTaxRates);
+    }
+    API.write(WRITE_COMMANDS.ENABLE_POLICY_TAXES, parameters, onyxData);
+
+    if (enabled && getIsNarrowLayout()) {
+        navigateWhenEnableFeature(policyID);
+    }
+}
+
+function enablePolicyWorkflows(policyID: string, enabled: boolean) {
+    const policy = getPolicy(policyID);
+    const onyxData: OnyxData = {
+        optimisticData: [
+            {
+                onyxMethod: Onyx.METHOD.MERGE,
+                key: `${ONYXKEYS.COLLECTION.POLICY}${policyID}`,
+                value: {
+                    areWorkflowsEnabled: enabled,
+                    ...(!enabled
+                        ? {
+                              approvalMode: CONST.POLICY.APPROVAL_MODE.OPTIONAL,
+                              autoReporting: false,
+                              harvesting: {
+                                  enabled: false,
+                              },
+                              reimbursementChoice: CONST.POLICY.REIMBURSEMENT_CHOICES.REIMBURSEMENT_NO,
+                          }
+                        : {}),
+                    pendingFields: {
+                        areWorkflowsEnabled: CONST.RED_BRICK_ROAD_PENDING_ACTION.UPDATE,
+                        ...(!enabled
+                            ? {
+                                  approvalMode: CONST.RED_BRICK_ROAD_PENDING_ACTION.UPDATE,
+                                  autoReporting: CONST.RED_BRICK_ROAD_PENDING_ACTION.UPDATE,
+                                  harvesting: CONST.RED_BRICK_ROAD_PENDING_ACTION.UPDATE,
+                                  reimbursementChoice: CONST.RED_BRICK_ROAD_PENDING_ACTION.UPDATE,
+                              }
+                            : {}),
+                    },
+                },
+            },
+        ],
+        successData: [
+            {
+                onyxMethod: Onyx.METHOD.MERGE,
+                key: `${ONYXKEYS.COLLECTION.POLICY}${policyID}`,
+                value: {
+                    pendingFields: {
+                        areWorkflowsEnabled: null,
+                        ...(!enabled
+                            ? {
+                                  approvalMode: null,
+                                  autoReporting: null,
+                                  harvesting: null,
+                                  reimbursementChoice: null,
+                              }
+                            : {}),
+                    },
+                },
+            },
+        ],
+        failureData: [
+            {
+                onyxMethod: Onyx.METHOD.MERGE,
+                key: `${ONYXKEYS.COLLECTION.POLICY}${policyID}`,
+                value: {
+                    areWorkflowsEnabled: !enabled,
+                    ...(!enabled
+                        ? {
+                              approvalMode: policy?.approvalMode,
+                              autoReporting: policy?.autoReporting,
+                              harvesting: policy?.harvesting,
+                              reimbursementChoice: policy?.reimbursementChoice,
+                          }
+                        : {}),
+                    pendingFields: {
+                        areWorkflowsEnabled: null,
+                        ...(!enabled
+                            ? {
+                                  approvalMode: null,
+                                  autoReporting: null,
+                                  harvesting: null,
+                                  reimbursementChoice: null,
+                              }
+                            : {}),
+                    },
+                },
+            },
+        ],
+    };
+
+    const parameters: EnablePolicyWorkflowsParams = {policyID, enabled};
+
+    API.write(WRITE_COMMANDS.ENABLE_POLICY_WORKFLOWS, parameters, onyxData);
+
+    if (enabled && getIsNarrowLayout()) {
+        navigateWhenEnableFeature(policyID);
+    }
+}
+
+const DISABLED_MAX_EXPENSE_VALUES: Pick<Policy, 'maxExpenseAmountNoReceipt' | 'maxExpenseAmount' | 'maxExpenseAge'> = {
+    maxExpenseAmountNoReceipt: CONST.DISABLED_MAX_EXPENSE_VALUE,
+    maxExpenseAmount: CONST.DISABLED_MAX_EXPENSE_VALUE,
+    maxExpenseAge: CONST.DISABLED_MAX_EXPENSE_VALUE,
+};
+
+function enablePolicyRules(policyID: string, enabled: boolean, disableRedirect = false) {
+    const policy = getPolicy(policyID);
+    const onyxData: OnyxData = {
+        optimisticData: [
+            {
+                onyxMethod: Onyx.METHOD.MERGE,
+                key: `${ONYXKEYS.COLLECTION.POLICY}${policyID}`,
+                value: {
+                    areRulesEnabled: enabled,
+                    ...(!enabled ? DISABLED_MAX_EXPENSE_VALUES : {}),
+                    pendingFields: {
+                        areRulesEnabled: CONST.RED_BRICK_ROAD_PENDING_ACTION.UPDATE,
+                    },
+                },
+            },
+        ],
+        successData: [
+            {
+                onyxMethod: Onyx.METHOD.MERGE,
+                key: `${ONYXKEYS.COLLECTION.POLICY}${policyID}`,
+                value: {
+                    pendingFields: {
+                        areRulesEnabled: null,
+                    },
+                },
+            },
+        ],
+        failureData: [
+            {
+                onyxMethod: Onyx.METHOD.MERGE,
+                key: `${ONYXKEYS.COLLECTION.POLICY}${policyID}`,
+                value: {
+                    areRulesEnabled: !enabled,
+                    ...(!enabled
+                        ? {
+                              maxExpenseAmountNoReceipt: policy?.maxExpenseAmountNoReceipt,
+                              maxExpenseAmount: policy?.maxExpenseAmount,
+                              maxExpenseAge: policy?.maxExpenseAge,
+                          }
+                        : {}),
+                    pendingFields: {
+                        areRulesEnabled: null,
+                    },
+                },
+            },
+        ],
+    };
+
+    const parameters: SetPolicyRulesEnabledParams = {policyID, enabled};
+    API.write(WRITE_COMMANDS.SET_POLICY_RULES_ENABLED, parameters, onyxData);
+
+    if (enabled && getIsNarrowLayout() && !disableRedirect) {
+        navigateWhenEnableFeature(policyID);
+    }
+}
+
+function enableDistanceRequestTax(policyID: string, customUnitName: string, customUnitID: string, attributes: Attributes) {
+    const policy = getPolicy(policyID);
+    const onyxData: OnyxData = {
+        optimisticData: [
+            {
+                onyxMethod: Onyx.METHOD.MERGE,
+                key: `${ONYXKEYS.COLLECTION.POLICY}${policyID}`,
+                value: {
+                    customUnits: {
+                        [customUnitID]: {
+                            attributes,
+                            pendingFields: {
+                                taxEnabled: CONST.RED_BRICK_ROAD_PENDING_ACTION.UPDATE,
+                            },
+                        },
+                    },
+                },
+            },
+        ],
+        successData: [
+            {
+                onyxMethod: Onyx.METHOD.MERGE,
+                key: `${ONYXKEYS.COLLECTION.POLICY}${policyID}`,
+                value: {
+                    customUnits: {
+                        [customUnitID]: {
+                            pendingFields: {
+                                taxEnabled: null,
+                            },
+                        },
+                    },
+                },
+            },
+        ],
+        failureData: [
+            {
+                onyxMethod: Onyx.METHOD.MERGE,
+                key: `${ONYXKEYS.COLLECTION.POLICY}${policyID}`,
+                value: {
+                    customUnits: {
+                        [customUnitID]: {
+                            attributes: policy?.customUnits ? policy?.customUnits[customUnitID].attributes : null,
+                            errorFields: {
+                                taxEnabled: ErrorUtils.getMicroSecondOnyxErrorWithTranslationKey('common.genericErrorMessage'),
+                            },
+                        },
+                    },
+                },
+            },
+        ],
+    };
+
+    const params = {
+        policyID,
+        customUnit: JSON.stringify({
+            customUnitName,
+            customUnitID,
+            attributes,
+        }),
+    };
+    API.write(WRITE_COMMANDS.ENABLE_DISTANCE_REQUEST_TAX, params, onyxData);
+}
+
+function enablePolicyInvoicing(policyID: string, enabled: boolean) {
+    const onyxData: OnyxData = {
+        optimisticData: [
+            {
+                onyxMethod: Onyx.METHOD.MERGE,
+                key: `${ONYXKEYS.COLLECTION.POLICY}${policyID}`,
+                value: {
+                    areInvoicesEnabled: enabled,
+                    pendingFields: {
+                        areInvoicesEnabled: CONST.RED_BRICK_ROAD_PENDING_ACTION.UPDATE,
+                    },
+                },
+            },
+        ],
+        successData: [
+            {
+                onyxMethod: Onyx.METHOD.MERGE,
+                key: `${ONYXKEYS.COLLECTION.POLICY}${policyID}`,
+                value: {
+                    pendingFields: {
+                        areInvoicesEnabled: null,
+                    },
+                },
+            },
+        ],
+        failureData: [
+            {
+                onyxMethod: Onyx.METHOD.MERGE,
+                key: `${ONYXKEYS.COLLECTION.POLICY}${policyID}`,
+                value: {
+                    areInvoicesEnabled: !enabled,
+                    pendingFields: {
+                        areInvoicesEnabled: null,
+                    },
+                },
+            },
+        ],
+    };
+
+    const parameters: EnablePolicyInvoicingParams = {policyID, enabled};
+
+    API.write(WRITE_COMMANDS.ENABLE_POLICY_INVOICING, parameters, onyxData);
+
+    // TODO: Uncomment the following line when the invoices screen is ready - https://github.com/Expensify/App/issues/45175.
+    // if (enabled && getIsNarrowLayout()) {
+    //     navigateWhenEnableFeature(policyID);
+    // }
+}
+
+function openPolicyMoreFeaturesPage(policyID: string) {
+    const params: OpenPolicyMoreFeaturesPageParams = {policyID};
+
+    API.read(READ_COMMANDS.OPEN_POLICY_MORE_FEATURES_PAGE, params);
+}
+
+function openPolicyProfilePage(policyID: string) {
+    const params: OpenPolicyProfilePageParams = {policyID};
+
+    API.read(READ_COMMANDS.OPEN_POLICY_PROFILE_PAGE, params);
+}
+
+function openPolicyInitialPage(policyID: string) {
+    const params: OpenPolicyInitialPageParams = {policyID};
+
+    API.read(READ_COMMANDS.OPEN_POLICY_INITIAL_PAGE, params);
+}
+
+function setPolicyCustomTaxName(policyID: string, customTaxName: string) {
+    const policy = getPolicy(policyID);
+    const originalCustomTaxName = policy?.taxRates?.name;
+    const onyxData: OnyxData = {
+        optimisticData: [
+            {
+                onyxMethod: Onyx.METHOD.MERGE,
+                key: `${ONYXKEYS.COLLECTION.POLICY}${policyID}`,
+                value: {
+                    taxRates: {
+                        name: customTaxName,
+                        pendingFields: {name: CONST.RED_BRICK_ROAD_PENDING_ACTION.UPDATE},
+                        errorFields: null,
+                    },
+                },
+            },
+        ],
+        successData: [
+            {
+                onyxMethod: Onyx.METHOD.MERGE,
+                key: `${ONYXKEYS.COLLECTION.POLICY}${policyID}`,
+                value: {
+                    taxRates: {
+                        pendingFields: {name: null},
+                        errorFields: null,
+                    },
+                },
+            },
+        ],
+        failureData: [
+            {
+                onyxMethod: Onyx.METHOD.MERGE,
+                key: `${ONYXKEYS.COLLECTION.POLICY}${policyID}`,
+                value: {
+                    taxRates: {
+                        name: originalCustomTaxName,
+                        pendingFields: {name: null},
+                        errorFields: {name: ErrorUtils.getMicroSecondOnyxErrorWithTranslationKey('common.genericErrorMessage')},
+                    },
+                },
+            },
+        ],
+    };
+
+    const parameters = {
+        policyID,
+        customTaxName,
+    };
+
+    API.write(WRITE_COMMANDS.SET_POLICY_CUSTOM_TAX_NAME, parameters, onyxData);
+}
+
+function setWorkspaceCurrencyDefault(policyID: string, taxCode: string) {
+    const policy = getPolicy(policyID);
+    const originalDefaultExternalID = policy?.taxRates?.defaultExternalID;
+    const onyxData: OnyxData = {
+        optimisticData: [
+            {
+                onyxMethod: Onyx.METHOD.MERGE,
+                key: `${ONYXKEYS.COLLECTION.POLICY}${policyID}`,
+                value: {
+                    taxRates: {
+                        defaultExternalID: taxCode,
+                        pendingFields: {defaultExternalID: CONST.RED_BRICK_ROAD_PENDING_ACTION.UPDATE},
+                        errorFields: null,
+                    },
+                },
+            },
+        ],
+        successData: [
+            {
+                onyxMethod: Onyx.METHOD.MERGE,
+                key: `${ONYXKEYS.COLLECTION.POLICY}${policyID}`,
+                value: {
+                    taxRates: {
+                        pendingFields: {defaultExternalID: null},
+                        errorFields: null,
+                    },
+                },
+            },
+        ],
+        failureData: [
+            {
+                onyxMethod: Onyx.METHOD.MERGE,
+                key: `${ONYXKEYS.COLLECTION.POLICY}${policyID}`,
+                value: {
+                    taxRates: {
+                        defaultExternalID: originalDefaultExternalID,
+                        pendingFields: {defaultExternalID: null},
+                        errorFields: {defaultExternalID: ErrorUtils.getMicroSecondOnyxErrorWithTranslationKey('common.genericErrorMessage')},
+                    },
+                },
+            },
+        ],
+    };
+
+    const parameters = {
+        policyID,
+        taxCode,
+    };
+
+    API.write(WRITE_COMMANDS.SET_POLICY_TAXES_CURRENCY_DEFAULT, parameters, onyxData);
+}
+
+function setForeignCurrencyDefault(policyID: string, taxCode: string) {
+    const policy = getPolicy(policyID);
+    const originalDefaultForeignCurrencyID = policy?.taxRates?.foreignTaxDefault;
+    const onyxData: OnyxData = {
+        optimisticData: [
+            {
+                onyxMethod: Onyx.METHOD.MERGE,
+                key: `${ONYXKEYS.COLLECTION.POLICY}${policyID}`,
+                value: {
+                    taxRates: {
+                        foreignTaxDefault: taxCode,
+                        pendingFields: {foreignTaxDefault: CONST.RED_BRICK_ROAD_PENDING_ACTION.UPDATE},
+                        errorFields: null,
+                    },
+                },
+            },
+        ],
+        successData: [
+            {
+                onyxMethod: Onyx.METHOD.MERGE,
+                key: `${ONYXKEYS.COLLECTION.POLICY}${policyID}`,
+                value: {
+                    taxRates: {
+                        pendingFields: {foreignTaxDefault: null},
+                        errorFields: null,
+                    },
+                },
+            },
+        ],
+        failureData: [
+            {
+                onyxMethod: Onyx.METHOD.MERGE,
+                key: `${ONYXKEYS.COLLECTION.POLICY}${policyID}`,
+                value: {
+                    taxRates: {
+                        foreignTaxDefault: originalDefaultForeignCurrencyID,
+                        pendingFields: {foreignTaxDefault: null},
+                        errorFields: {foreignTaxDefault: ErrorUtils.getMicroSecondOnyxErrorWithTranslationKey('common.genericErrorMessage')},
+                    },
+                },
+            },
+        ],
+    };
+
+    const parameters = {
+        policyID,
+        taxCode,
+    };
+
+    API.write(WRITE_COMMANDS.SET_POLICY_TAXES_FOREIGN_CURRENCY_DEFAULT, parameters, onyxData);
+}
+
+function upgradeToCorporate(policyID: string, featureName: string) {
+    const policy = getPolicy(policyID);
+    const optimisticData: OnyxUpdate[] = [
+        {
+            onyxMethod: Onyx.METHOD.MERGE,
+            key: `policy_${policyID}`,
+            value: {
+                isPendingUpgrade: true,
+                type: CONST.POLICY.TYPE.CORPORATE,
+                maxExpenseAge: CONST.POLICY.DEFAULT_MAX_EXPENSE_AGE,
+                maxExpenseAmount: CONST.POLICY.DEFAULT_MAX_EXPENSE_AMOUNT,
+                maxExpenseAmountNoReceipt: CONST.POLICY.DEFAULT_MAX_AMOUNT_NO_RECEIPT,
+                glCodes: true,
+                ...(PolicyUtils.isInstantSubmitEnabled(policy) && {
+                    autoReporting: true,
+                    autoReportingFrequency: CONST.POLICY.AUTO_REPORTING_FREQUENCIES.IMMEDIATE,
+                }),
+                harvesting: {
+                    enabled: false,
+                },
+            },
+        },
+    ];
+
+    const successData: OnyxUpdate[] = [
+        {
+            onyxMethod: Onyx.METHOD.MERGE,
+            key: `policy_${policyID}`,
+            value: {
+                isPendingUpgrade: false,
+            },
+        },
+    ];
+
+    const failureData: OnyxUpdate[] = [
+        {
+            onyxMethod: Onyx.METHOD.MERGE,
+            key: `policy_${policyID}`,
+            value: {
+                isPendingUpgrade: false,
+                type: policy?.type,
+                maxExpenseAge: policy?.maxExpenseAge ?? null,
+                maxExpenseAmount: policy?.maxExpenseAmount ?? null,
+                maxExpenseAmountNoReceipt: policy?.maxExpenseAmountNoReceipt ?? null,
+                glCodes: policy?.glCodes ?? null,
+                autoReporting: policy?.autoReporting ?? null,
+                autoReportingFrequency: policy?.autoReportingFrequency ?? null,
+                harvesting: policy?.harvesting ?? null,
+            },
+        },
+    ];
+
+    const parameters: UpgradeToCorporateParams = {policyID, featureName};
+
+    API.write(WRITE_COMMANDS.UPGRADE_TO_CORPORATE, parameters, {optimisticData, successData, failureData});
+}
+
+/**
+ * Call the API to set the receipt required amount for the given policy
+ * @param policyID - id of the policy to set the receipt required amount
+ * @param maxExpenseAmountNoReceipt - new value of the receipt required amount
+ */
+function setPolicyMaxExpenseAmountNoReceipt(policyID: string, maxExpenseAmountNoReceipt: string) {
+    const policy = getPolicy(policyID);
+    const parsedMaxExpenseAmountNoReceipt = maxExpenseAmountNoReceipt === '' ? CONST.DISABLED_MAX_EXPENSE_VALUE : CurrencyUtils.convertToBackendAmount(parseFloat(maxExpenseAmountNoReceipt));
+    const originalMaxExpenseAmountNoReceipt = policy?.maxExpenseAmountNoReceipt;
+
+    const onyxData: OnyxData = {
+        optimisticData: [
+            {
+                onyxMethod: Onyx.METHOD.MERGE,
+                key: `${ONYXKEYS.COLLECTION.POLICY}${policyID}`,
+                value: {
+                    maxExpenseAmountNoReceipt: parsedMaxExpenseAmountNoReceipt,
+                    pendingFields: {
+                        maxExpenseAmountNoReceipt: CONST.RED_BRICK_ROAD_PENDING_ACTION.UPDATE,
+                    },
+                },
+            },
+        ],
+        successData: [
+            {
+                onyxMethod: Onyx.METHOD.MERGE,
+                key: `${ONYXKEYS.COLLECTION.POLICY}${policyID}`,
+                value: {
+                    pendingFields: {maxExpenseAmountNoReceipt: null},
+                    errorFields: null,
+                },
+            },
+        ],
+        failureData: [
+            {
+                onyxMethod: Onyx.METHOD.MERGE,
+                key: `${ONYXKEYS.COLLECTION.POLICY}${policyID}`,
+                value: {
+                    maxExpenseAmountNoReceipt: originalMaxExpenseAmountNoReceipt,
+                    pendingFields: {maxExpenseAmountNoReceipt: null},
+                    errorFields: {maxExpenseAmountNoReceipt: ErrorUtils.getMicroSecondOnyxErrorWithTranslationKey('common.genericErrorMessage')},
+                },
+            },
+        ],
+    };
+
+    const parameters = {
+        policyID,
+        maxExpenseAmountNoReceipt: parsedMaxExpenseAmountNoReceipt,
+    };
+
+    API.write(WRITE_COMMANDS.SET_POLICY_EXPENSE_MAX_AMOUNT_NO_RECEIPT, parameters, onyxData);
+}
+
+/**
+ * Call the API to set the max expense amount for the given policy
+ * @param policyID - id of the policy to set the max expense amount
+ * @param maxExpenseAmount - new value of the max expense amount
+ */
+function setPolicyMaxExpenseAmount(policyID: string, maxExpenseAmount: string) {
+    const policy = getPolicy(policyID);
+    const parsedMaxExpenseAmount = maxExpenseAmount === '' ? CONST.DISABLED_MAX_EXPENSE_VALUE : CurrencyUtils.convertToBackendAmount(parseFloat(maxExpenseAmount));
+    const originalMaxExpenseAmount = policy?.maxExpenseAmount;
+
+    const onyxData: OnyxData = {
+        optimisticData: [
+            {
+                onyxMethod: Onyx.METHOD.MERGE,
+                key: `${ONYXKEYS.COLLECTION.POLICY}${policyID}`,
+                value: {
+                    maxExpenseAmount: parsedMaxExpenseAmount,
+                    pendingFields: {
+                        maxExpenseAmount: CONST.RED_BRICK_ROAD_PENDING_ACTION.UPDATE,
+                    },
+                },
+            },
+        ],
+        successData: [
+            {
+                onyxMethod: Onyx.METHOD.MERGE,
+                key: `${ONYXKEYS.COLLECTION.POLICY}${policyID}`,
+                value: {
+                    pendingFields: {maxExpenseAmount: null},
+                    errorFields: null,
+                },
+            },
+        ],
+        failureData: [
+            {
+                onyxMethod: Onyx.METHOD.MERGE,
+                key: `${ONYXKEYS.COLLECTION.POLICY}${policyID}`,
+                value: {
+                    maxExpenseAmount: originalMaxExpenseAmount,
+                    pendingFields: {maxExpenseAmount: null},
+                    errorFields: {maxExpenseAmount: ErrorUtils.getMicroSecondOnyxErrorWithTranslationKey('common.genericErrorMessage')},
+                },
+            },
+        ],
+    };
+
+    const parameters = {
+        policyID,
+        maxExpenseAmount: parsedMaxExpenseAmount,
+    };
+
+    API.write(WRITE_COMMANDS.SET_POLICY_EXPENSE_MAX_AMOUNT, parameters, onyxData);
+}
+
+/**
+ * Call the API to set the max expense age for the given policy
+ * @param policyID - id of the policy to set the max expense age
+ * @param maxExpenseAge - the max expense age value given in days
+ */
+function setPolicyMaxExpenseAge(policyID: string, maxExpenseAge: string) {
+    const policy = getPolicy(policyID);
+    const parsedMaxExpenseAge = maxExpenseAge === '' ? CONST.DISABLED_MAX_EXPENSE_VALUE : parseInt(maxExpenseAge, 10);
+    const originalMaxExpenseAge = policy?.maxExpenseAge;
+
+    const onyxData: OnyxData = {
+        optimisticData: [
+            {
+                onyxMethod: Onyx.METHOD.MERGE,
+                key: `${ONYXKEYS.COLLECTION.POLICY}${policyID}`,
+                value: {
+                    maxExpenseAge: parsedMaxExpenseAge,
+                    pendingFields: {
+                        maxExpenseAge: CONST.RED_BRICK_ROAD_PENDING_ACTION.UPDATE,
+                    },
+                },
+            },
+        ],
+        successData: [
+            {
+                onyxMethod: Onyx.METHOD.MERGE,
+                key: `${ONYXKEYS.COLLECTION.POLICY}${policyID}`,
+                value: {
+                    pendingFields: {
+                        maxExpenseAge: null,
+                    },
+                },
+            },
+        ],
+        failureData: [
+            {
+                onyxMethod: Onyx.METHOD.MERGE,
+                key: `${ONYXKEYS.COLLECTION.POLICY}${policyID}`,
+                value: {
+                    maxExpenseAge: originalMaxExpenseAge,
+                    pendingFields: {maxExpenseAge: null},
+                    errorFields: {maxExpenseAge: ErrorUtils.getMicroSecondOnyxErrorWithTranslationKey('common.genericErrorMessage')},
+                },
+            },
+        ],
+    };
+
+    const parameters = {
+        policyID,
+        maxExpenseAge: parsedMaxExpenseAge,
+    };
+
+    API.write(WRITE_COMMANDS.SET_POLICY_EXPENSE_MAX_AGE, parameters, onyxData);
+}
+
+/**
+ * Call the API to enable or disable the billable mode for the given policy
+ * @param policyID - id of the policy to enable or disable the bilable mode
+ * @param defaultBillable - whether the billable mode is enabled in the given policy
+ */
+function setPolicyBillableMode(policyID: string, defaultBillable: boolean) {
+    const policy = getPolicy(policyID);
+
+    const originalDefaultBillable = policy?.defaultBillable;
+    const originalDefaultBillableDisabled = policy?.disabledFields?.defaultBillable;
+
+    const onyxData: OnyxData = {
+        optimisticData: [
+            {
+                onyxMethod: Onyx.METHOD.MERGE,
+                key: `${ONYXKEYS.COLLECTION.POLICY}${policyID}`,
+                value: {
+                    defaultBillable,
+                    disabledFields: {
+                        defaultBillable: false,
+                    },
+                    pendingFields: {
+                        defaultBillable: CONST.RED_BRICK_ROAD_PENDING_ACTION.UPDATE,
+                    },
+                },
+            },
+        ],
+        successData: [
+            {
+                onyxMethod: Onyx.METHOD.MERGE,
+                key: `${ONYXKEYS.COLLECTION.POLICY}${policyID}`,
+                value: {
+                    pendingFields: {
+                        defaultBillable: null,
+                    },
+                    errorFields: null,
+                },
+            },
+        ],
+        failureData: [
+            {
+                onyxMethod: Onyx.METHOD.MERGE,
+                key: `${ONYXKEYS.COLLECTION.POLICY}${policyID}`,
+                value: {
+                    disabledFields: {defaultBillable: originalDefaultBillableDisabled},
+                    defaultBillable: originalDefaultBillable,
+                    pendingFields: {defaultBillable: null},
+                    errorFields: {defaultBillable: ErrorUtils.getMicroSecondOnyxErrorWithTranslationKey('common.genericErrorMessage')},
+                },
+            },
+        ],
+    };
+
+    const parameters = {
+        policyID,
+        defaultBillable,
+        disabledFields: JSON.stringify({
+            defaultBillable: false,
+        }),
+    };
+
+    API.write(WRITE_COMMANDS.SET_POLICY_BILLABLE_MODE, parameters, onyxData);
+}
+
+function setWorkspaceEReceiptsEnabled(policyID: string, eReceipts: boolean) {
+    const policy = getPolicy(policyID);
+
+    const originalEReceipts = policy?.eReceipts;
+
+    const onyxData: OnyxData = {
+        optimisticData: [
+            {
+                onyxMethod: Onyx.METHOD.MERGE,
+                key: `${ONYXKEYS.COLLECTION.POLICY}${policyID}`,
+                value: {
+                    eReceipts,
+                    pendingFields: {
+                        eReceipts: CONST.RED_BRICK_ROAD_PENDING_ACTION.UPDATE,
+                    },
+                },
+            },
+        ],
+        successData: [
+            {
+                onyxMethod: Onyx.METHOD.MERGE,
+                key: `${ONYXKEYS.COLLECTION.POLICY}${policyID}`,
+                value: {
+                    pendingFields: {
+                        eReceipts: null,
+                    },
+                    errorFields: null,
+                },
+            },
+        ],
+        failureData: [
+            {
+                onyxMethod: Onyx.METHOD.MERGE,
+                key: `${ONYXKEYS.COLLECTION.POLICY}${policyID}`,
+                value: {
+                    eReceipts: originalEReceipts,
+                    pendingFields: {defaultBillable: null},
+                    errorFields: {defaultBillable: ErrorUtils.getMicroSecondOnyxErrorWithTranslationKey('common.genericErrorMessage')},
+                },
+            },
+        ],
+    };
+
+    const parameters = {
+        policyID,
+        eReceipts,
+    };
+
+    API.write(WRITE_COMMANDS.SET_WORKSPACE_ERECEIPTS_ENABLED, parameters, onyxData);
+}
+
+function getAdminPoliciesConnectedToSageIntacct(): Policy[] {
+    return Object.values(allPolicies ?? {}).filter<Policy>((policy): policy is Policy => !!policy && policy.role === CONST.POLICY.ROLE.ADMIN && !!policy?.connections?.intacct);
+}
+
+function getAdminPoliciesConnectedToNetSuite(): Policy[] {
+    return Object.values(allPolicies ?? {}).filter<Policy>((policy): policy is Policy => !!policy && policy.role === CONST.POLICY.ROLE.ADMIN && !!policy?.connections?.netsuite);
+}
+
+function clearAllPolicies() {
+    if (!allPolicies) {
+        return;
+    }
+    Object.keys(allPolicies).forEach((key) => delete allPolicies[key]);
+}
+
+export {
+    leaveWorkspace,
+    addBillingCardAndRequestPolicyOwnerChange,
+    hasActiveChatEnabledPolicies,
+    setWorkspaceErrors,
+    clearCustomUnitErrors,
+    hideWorkspaceAlertMessage,
+    deleteWorkspace,
+    updateAddress,
+    updateWorkspaceCustomUnitAndRate,
+    updateLastAccessedWorkspace,
+    clearDeleteWorkspaceError,
+    openWorkspaceReimburseView,
+    setPolicyIDForReimburseView,
+    clearOnyxDataForReimburseView,
+    setRateForReimburseView,
+    setUnitForReimburseView,
+    generateDefaultWorkspaceName,
+    updateGeneralSettings,
+    deleteWorkspaceAvatar,
+    updateWorkspaceAvatar,
+    clearAvatarErrors,
+    generatePolicyID,
+    createWorkspace,
+    openPolicyTaxesPage,
+    openWorkspaceInvitePage,
+    openWorkspace,
+    removeWorkspace,
+    createWorkspaceFromIOUPayment,
+    clearErrors,
+    dismissAddedWithPrimaryLoginMessages,
+    openDraftWorkspaceRequest,
+    createDraftInitialWorkspace,
+    setWorkspaceInviteMessageDraft,
+    setWorkspaceApprovalMode,
+    setWorkspaceAutoReportingFrequency,
+    setWorkspaceAutoReportingMonthlyOffset,
+    updateWorkspaceDescription,
+    setWorkspacePayer,
+    setWorkspaceReimbursement,
+    openPolicyWorkflowsPage,
+    enableCompanyCards,
+    enablePolicyConnections,
+    enablePolicyReportFields,
+    enablePolicyTaxes,
+    enablePolicyWorkflows,
+    enableDistanceRequestTax,
+    enablePolicyInvoicing,
+    openPolicyMoreFeaturesPage,
+    openPolicyProfilePage,
+    openPolicyInitialPage,
+    generateCustomUnitID,
+    clearQBOErrorField,
+    clearXeroErrorField,
+    clearSageIntacctErrorField,
+    clearNetSuiteErrorField,
+    clearNetSuiteAutoSyncErrorField,
+    clearWorkspaceReimbursementErrors,
+    setWorkspaceCurrencyDefault,
+    setForeignCurrencyDefault,
+    setPolicyCustomTaxName,
+    clearPolicyErrorField,
+    isCurrencySupportedForDirectReimbursement,
+    getPrimaryPolicy,
+    getInvoicePrimaryWorkspace,
+    createDraftWorkspace,
+    savePreferredExportMethod,
+    buildPolicyData,
+    enableExpensifyCard,
+    createPolicyExpenseChats,
+    upgradeToCorporate,
+    openPolicyExpensifyCardsPage,
+    openPolicyEditCardLimitTypePage,
+    requestExpensifyCardLimitIncrease,
+    getAdminPoliciesConnectedToNetSuite,
+    getAdminPoliciesConnectedToSageIntacct,
+    hasInvoicingDetails,
+    clearAllPolicies,
+    enablePolicyRules,
+    setPolicyMaxExpenseAmountNoReceipt,
+    setPolicyMaxExpenseAmount,
+    setPolicyMaxExpenseAge,
+    setPolicyBillableMode,
+    setWorkspaceEReceiptsEnabled,
+};
+
+export type {NewCustomUnit};
diff --git a/src/libs/actions/Policy/ReportField.ts b/src/libs/actions/Policy/ReportField.ts
new file mode 100644
index 000000000000..9a56c719fd73
--- /dev/null
+++ b/src/libs/actions/Policy/ReportField.ts
@@ -0,0 +1,511 @@
+import cloneDeep from 'lodash/cloneDeep';
+import type {NullishDeep, OnyxCollection, OnyxUpdate} from 'react-native-onyx';
+import Onyx from 'react-native-onyx';
+import * as API from '@libs/API';
+import type {
+    CreateWorkspaceReportFieldListValueParams,
+    CreateWorkspaceReportFieldParams,
+    DeletePolicyReportField,
+    EnableWorkspaceReportFieldListValueParams,
+    OpenPolicyReportFieldsPageParams,
+    RemoveWorkspaceReportFieldListValueParams,
+    UpdateWorkspaceReportFieldInitialValueParams,
+} from '@libs/API/parameters';
+import {READ_COMMANDS, WRITE_COMMANDS} from '@libs/API/types';
+import * as ErrorUtils from '@libs/ErrorUtils';
+import Log from '@libs/Log';
+import * as ReportConnection from '@libs/ReportConnection';
+import * as ReportUtils from '@libs/ReportUtils';
+import * as WorkspaceReportFieldUtils from '@libs/WorkspaceReportFieldUtils';
+import CONST from '@src/CONST';
+import ONYXKEYS from '@src/ONYXKEYS';
+import type {WorkspaceReportFieldForm} from '@src/types/form/WorkspaceReportFieldForm';
+import INPUT_IDS from '@src/types/form/WorkspaceReportFieldForm';
+import type {Policy, PolicyReportField, Report} from '@src/types/onyx';
+import type {OnyxValueWithOfflineFeedback} from '@src/types/onyx/OnyxCommon';
+import type {OnyxData} from '@src/types/onyx/Request';
+
+let listValues: string[];
+let disabledListValues: boolean[];
+Onyx.connect({
+    key: ONYXKEYS.FORMS.WORKSPACE_REPORT_FIELDS_FORM_DRAFT,
+    callback: (value) => {
+        if (!value) {
+            return;
+        }
+
+        listValues = value[INPUT_IDS.LIST_VALUES] ?? [];
+        disabledListValues = value[INPUT_IDS.DISABLED_LIST_VALUES] ?? [];
+    },
+});
+
+const allPolicies: OnyxCollection<Policy> = {};
+Onyx.connect({
+    key: ONYXKEYS.COLLECTION.POLICY,
+    callback: (value, key) => {
+        if (!key) {
+            return;
+        }
+        if (value === null || value === undefined) {
+            // If we are deleting a policy, we have to check every report linked to that policy
+            // and unset the draft indicator (pencil icon) alongside removing any draft comments. Clearing these values will keep the newly archived chats from being displayed in the LHN.
+            // More info: https://github.com/Expensify/App/issues/14260
+            const policyID = key.replace(ONYXKEYS.COLLECTION.POLICY, '');
+            const policyReports = ReportUtils.getAllPolicyReports(policyID);
+            const cleanUpMergeQueries: Record<`${typeof ONYXKEYS.COLLECTION.REPORT}${string}`, NullishDeep<Report>> = {};
+            const cleanUpSetQueries: Record<`${typeof ONYXKEYS.COLLECTION.REPORT_DRAFT_COMMENT}${string}` | `${typeof ONYXKEYS.COLLECTION.REPORT_ACTIONS_DRAFTS}${string}`, null> = {};
+            policyReports.forEach((policyReport) => {
+                if (!policyReport) {
+                    return;
+                }
+                const {reportID} = policyReport;
+                cleanUpSetQueries[`${ONYXKEYS.COLLECTION.REPORT_DRAFT_COMMENT}${reportID}`] = null;
+                cleanUpSetQueries[`${ONYXKEYS.COLLECTION.REPORT_ACTIONS_DRAFTS}${reportID}`] = null;
+            });
+            Onyx.mergeCollection(ONYXKEYS.COLLECTION.REPORT, cleanUpMergeQueries);
+            Onyx.multiSet(cleanUpSetQueries);
+            delete allPolicies[key];
+            return;
+        }
+
+        allPolicies[key] = value;
+    },
+});
+
+function openPolicyReportFieldsPage(policyID: string) {
+    if (!policyID) {
+        Log.warn('openPolicyReportFieldsPage invalid params', {policyID});
+        return;
+    }
+
+    const params: OpenPolicyReportFieldsPageParams = {
+        policyID,
+    };
+
+    API.read(READ_COMMANDS.OPEN_POLICY_REPORT_FIELDS_PAGE, params);
+}
+
+/**
+ * Sets the initial form values for the workspace report fields form.
+ */
+function setInitialCreateReportFieldsForm() {
+    Onyx.set(ONYXKEYS.FORMS.WORKSPACE_REPORT_FIELDS_FORM_DRAFT, {
+        [INPUT_IDS.INITIAL_VALUE]: '',
+    });
+}
+
+/**
+ * Creates a new list value in the workspace report fields form.
+ */
+function createReportFieldsListValue(valueName: string) {
+    Onyx.merge(ONYXKEYS.FORMS.WORKSPACE_REPORT_FIELDS_FORM_DRAFT, {
+        [INPUT_IDS.LIST_VALUES]: [...listValues, valueName],
+        [INPUT_IDS.DISABLED_LIST_VALUES]: [...disabledListValues, false],
+    });
+}
+
+/**
+ * Renames a list value in the workspace report fields form.
+ */
+function renameReportFieldsListValue(valueIndex: number, newValueName: string) {
+    const listValuesCopy = [...listValues];
+    listValuesCopy[valueIndex] = newValueName;
+
+    Onyx.merge(ONYXKEYS.FORMS.WORKSPACE_REPORT_FIELDS_FORM_DRAFT, {
+        [INPUT_IDS.LIST_VALUES]: listValuesCopy,
+    });
+}
+
+/**
+ * Sets the enabled state of a list value in the workspace report fields form.
+ */
+function setReportFieldsListValueEnabled(valueIndexes: number[], enabled: boolean) {
+    const disabledListValuesCopy = [...disabledListValues];
+
+    valueIndexes.forEach((valueIndex) => {
+        disabledListValuesCopy[valueIndex] = !enabled;
+    });
+
+    Onyx.merge(ONYXKEYS.FORMS.WORKSPACE_REPORT_FIELDS_FORM_DRAFT, {
+        [INPUT_IDS.DISABLED_LIST_VALUES]: disabledListValuesCopy,
+    });
+}
+
+/**
+ * Deletes a list value from the workspace report fields form.
+ */
+function deleteReportFieldsListValue(valueIndexes: number[]) {
+    const listValuesCopy = [...listValues];
+    const disabledListValuesCopy = [...disabledListValues];
+
+    valueIndexes
+        .sort((a, b) => b - a)
+        .forEach((valueIndex) => {
+            listValuesCopy.splice(valueIndex, 1);
+            disabledListValuesCopy.splice(valueIndex, 1);
+        });
+
+    Onyx.merge(ONYXKEYS.FORMS.WORKSPACE_REPORT_FIELDS_FORM_DRAFT, {
+        [INPUT_IDS.LIST_VALUES]: listValuesCopy,
+        [INPUT_IDS.DISABLED_LIST_VALUES]: disabledListValuesCopy,
+    });
+}
+
+type CreateReportFieldArguments = Pick<WorkspaceReportFieldForm, 'name' | 'type' | 'initialValue'>;
+
+/**
+ * Creates a new report field.
+ */
+function createReportField(policyID: string, {name, type, initialValue}: CreateReportFieldArguments) {
+    const previousFieldList = allPolicies?.[`${ONYXKEYS.COLLECTION.POLICY}${policyID}`]?.fieldList ?? {};
+    const fieldID = WorkspaceReportFieldUtils.generateFieldID(name);
+    const fieldKey = ReportUtils.getReportFieldKey(fieldID);
+    const newReportField: Omit<OnyxValueWithOfflineFeedback<PolicyReportField>, 'value'> = {
+        name,
+        type,
+        defaultValue: initialValue,
+        values: listValues,
+        disabledOptions: disabledListValues,
+        fieldID,
+        orderWeight: Object.keys(previousFieldList).length + 1,
+        deletable: false,
+        keys: [],
+        externalIDs: [],
+        isTax: false,
+    };
+
+    const optimisticReportFieldDataForPolicy: OnyxValueWithOfflineFeedback<PolicyReportField> = {
+        ...newReportField,
+        value: type === CONST.REPORT_FIELD_TYPES.LIST ? CONST.REPORT_FIELD_TYPES.LIST : null,
+    };
+
+    const policyExpenseReports = Object.values(ReportConnection.getAllReports() ?? {}).filter(
+        (report) => report?.policyID === policyID && report.type === CONST.REPORT.TYPE.EXPENSE,
+    ) as Report[];
+
+    const optimisticData = [
+        {
+            key: `${ONYXKEYS.COLLECTION.POLICY}${policyID}`,
+            onyxMethod: Onyx.METHOD.MERGE,
+            value: {
+                fieldList: {
+                    [fieldKey]: {...optimisticReportFieldDataForPolicy, pendingAction: CONST.RED_BRICK_ROAD_PENDING_ACTION.ADD},
+                },
+                errorFields: null,
+            },
+        },
+        ...policyExpenseReports.map((report) => ({
+            key: `${ONYXKEYS.COLLECTION.REPORT}${report.reportID}`,
+            onyxMethod: Onyx.METHOD.MERGE,
+            value: {
+                fieldList: {
+                    [fieldKey]: {...newReportField, pendingAction: CONST.RED_BRICK_ROAD_PENDING_ACTION.ADD},
+                },
+            },
+        })),
+    ] as OnyxUpdate[];
+
+    const failureData = [
+        {
+            key: `${ONYXKEYS.COLLECTION.POLICY}${policyID}`,
+            onyxMethod: Onyx.METHOD.MERGE,
+            value: {
+                fieldList: {
+                    [fieldKey]: null,
+                },
+                errorFields: {
+                    [fieldKey]: ErrorUtils.getMicroSecondOnyxErrorWithTranslationKey('workspace.reportFields.genericFailureMessage'),
+                },
+            },
+        },
+        ...policyExpenseReports.map((report) => ({
+            key: `${ONYXKEYS.COLLECTION.REPORT}${report.reportID}`,
+            onyxMethod: Onyx.METHOD.MERGE,
+            value: {
+                fieldList: {
+                    [fieldKey]: null,
+                },
+            },
+        })),
+    ] as OnyxUpdate[];
+
+    const onyxData: OnyxData = {
+        optimisticData,
+        successData: [
+            {
+                key: `${ONYXKEYS.COLLECTION.POLICY}${policyID}`,
+                onyxMethod: Onyx.METHOD.MERGE,
+                value: {
+                    fieldList: {
+                        [fieldKey]: {pendingAction: null},
+                    },
+                    errorFields: null,
+                },
+            },
+        ],
+        failureData,
+    };
+
+    const parameters: CreateWorkspaceReportFieldParams = {
+        policyID,
+        reportFields: JSON.stringify([newReportField]),
+    };
+
+    API.write(WRITE_COMMANDS.CREATE_WORKSPACE_REPORT_FIELD, parameters, onyxData);
+}
+
+function deleteReportFields(policyID: string, reportFieldsToUpdate: string[]) {
+    const policy = allPolicies?.[`${ONYXKEYS.COLLECTION.POLICY}${policyID}`];
+    const allReportFields = policy?.fieldList ?? {};
+
+    const updatedReportFields = Object.fromEntries(Object.entries(allReportFields).filter(([key]) => !reportFieldsToUpdate.includes(key)));
+    const optimisticReportFields = reportFieldsToUpdate.reduce<Record<string, Partial<OnyxValueWithOfflineFeedback<PolicyReportField>>>>((acc, reportFieldKey) => {
+        acc[reportFieldKey] = {pendingAction: CONST.RED_BRICK_ROAD_PENDING_ACTION.DELETE};
+        return acc;
+    }, {});
+
+    const successReportFields = reportFieldsToUpdate.reduce<Record<string, null>>((acc, reportFieldKey) => {
+        acc[reportFieldKey] = null;
+        return acc;
+    }, {});
+
+    const failureReportFields = reportFieldsToUpdate.reduce<Record<string, Partial<OnyxValueWithOfflineFeedback<PolicyReportField>>>>((acc, reportFieldKey) => {
+        acc[reportFieldKey] = {pendingAction: null};
+        return acc;
+    }, {});
+
+    const onyxData: OnyxData = {
+        optimisticData: [
+            {
+                onyxMethod: Onyx.METHOD.MERGE,
+                key: `${ONYXKEYS.COLLECTION.POLICY}${policyID}`,
+                value: {
+                    fieldList: optimisticReportFields,
+                },
+            },
+        ],
+        successData: [
+            {
+                onyxMethod: Onyx.METHOD.MERGE,
+                key: `${ONYXKEYS.COLLECTION.POLICY}${policyID}`,
+                value: {
+                    fieldList: successReportFields,
+                    errorFields: null,
+                },
+            },
+        ],
+        failureData: [
+            {
+                onyxMethod: Onyx.METHOD.MERGE,
+                key: `${ONYXKEYS.COLLECTION.POLICY}${policyID}`,
+                value: {
+                    fieldList: failureReportFields,
+                    errorFields: {
+                        fieldList: ErrorUtils.getMicroSecondOnyxErrorWithTranslationKey('common.genericErrorMessage'),
+                    },
+                },
+            },
+        ],
+    };
+
+    const parameters: DeletePolicyReportField = {
+        policyID,
+        reportFields: JSON.stringify(Object.values(updatedReportFields)),
+    };
+
+    API.write(WRITE_COMMANDS.DELETE_POLICY_REPORT_FIELD, parameters, onyxData);
+}
+
+/**
+ * Updates the initial value of a report field.
+ */
+function updateReportFieldInitialValue(policyID: string, reportFieldID: string, newInitialValue: string) {
+    const previousFieldList = allPolicies?.[`${ONYXKEYS.COLLECTION.POLICY}${policyID}`]?.fieldList ?? {};
+    const fieldKey = ReportUtils.getReportFieldKey(reportFieldID);
+    const updatedReportField: PolicyReportField = {
+        ...previousFieldList[fieldKey],
+        defaultValue: newInitialValue,
+    };
+    const onyxData: OnyxData = {
+        optimisticData: [
+            {
+                key: `${ONYXKEYS.COLLECTION.POLICY}${policyID}`,
+                onyxMethod: Onyx.METHOD.MERGE,
+                value: {
+                    fieldList: {
+                        [fieldKey]: {...updatedReportField, pendingAction: CONST.RED_BRICK_ROAD_PENDING_ACTION.UPDATE},
+                    },
+                    errorFields: null,
+                },
+            },
+        ],
+        successData: [
+            {
+                key: `${ONYXKEYS.COLLECTION.POLICY}${policyID}`,
+                onyxMethod: Onyx.METHOD.MERGE,
+                value: {
+                    fieldList: {
+                        [fieldKey]: {pendingAction: null},
+                    },
+                    errorFields: null,
+                },
+            },
+        ],
+        failureData: [
+            {
+                key: `${ONYXKEYS.COLLECTION.POLICY}${policyID}`,
+                onyxMethod: Onyx.METHOD.MERGE,
+                value: {
+                    fieldList: {
+                        [fieldKey]: {...previousFieldList[fieldKey], pendingAction: null},
+                    },
+                    errorFields: {
+                        [fieldKey]: ErrorUtils.getMicroSecondOnyxErrorWithTranslationKey('workspace.reportFields.genericFailureMessage'),
+                    },
+                },
+            },
+        ],
+    };
+    const parameters: UpdateWorkspaceReportFieldInitialValueParams = {
+        policyID,
+        reportFields: JSON.stringify([updatedReportField]),
+    };
+
+    API.write(WRITE_COMMANDS.UPDATE_WORKSPACE_REPORT_FIELD_INITIAL_VALUE, parameters, onyxData);
+}
+
+function updateReportFieldListValueEnabled(policyID: string, reportFieldID: string, valueIndexes: number[], enabled: boolean) {
+    const previousFieldList = allPolicies?.[`${ONYXKEYS.COLLECTION.POLICY}${policyID}`]?.fieldList ?? {};
+    const fieldKey = ReportUtils.getReportFieldKey(reportFieldID);
+    const reportField = previousFieldList[fieldKey];
+
+    const updatedReportField = cloneDeep(reportField);
+
+    valueIndexes.forEach((valueIndex) => {
+        updatedReportField.disabledOptions[valueIndex] = !enabled;
+        const shouldResetDefaultValue = !enabled && reportField.defaultValue === reportField.values[valueIndex];
+
+        if (shouldResetDefaultValue) {
+            updatedReportField.defaultValue = '';
+        }
+    });
+
+    // We are using the offline pattern A (optimistic without feedback)
+    const onyxData: OnyxData = {
+        optimisticData: [
+            {
+                key: `${ONYXKEYS.COLLECTION.POLICY}${policyID}`,
+                onyxMethod: Onyx.METHOD.MERGE,
+                value: {
+                    fieldList: {
+                        [fieldKey]: updatedReportField,
+                    },
+                },
+            },
+        ],
+    };
+
+    const parameters: EnableWorkspaceReportFieldListValueParams = {
+        policyID,
+        reportFields: JSON.stringify([updatedReportField]),
+    };
+
+    API.write(WRITE_COMMANDS.ENABLE_WORKSPACE_REPORT_FIELD_LIST_VALUE, parameters, onyxData);
+}
+
+/**
+ * Adds a new option to the list type report field on a workspace.
+ */
+function addReportFieldListValue(policyID: string, reportFieldID: string, valueName: string) {
+    const previousFieldList = allPolicies?.[`${ONYXKEYS.COLLECTION.POLICY}${policyID}`]?.fieldList ?? {};
+    const reportFieldKey = ReportUtils.getReportFieldKey(reportFieldID);
+    const reportField = previousFieldList[reportFieldKey];
+    const updatedReportField = cloneDeep(reportField);
+
+    updatedReportField.values.push(valueName);
+    updatedReportField.disabledOptions.push(false);
+
+    // We are using the offline pattern A (optimistic without feedback)
+    const onyxData: OnyxData = {
+        optimisticData: [
+            {
+                key: `${ONYXKEYS.COLLECTION.POLICY}${policyID}`,
+                onyxMethod: Onyx.METHOD.MERGE,
+                value: {
+                    fieldList: {
+                        [reportFieldKey]: updatedReportField,
+                    },
+                },
+            },
+        ],
+    };
+
+    const parameters: CreateWorkspaceReportFieldListValueParams = {
+        policyID,
+        reportFields: JSON.stringify([updatedReportField]),
+    };
+
+    API.write(WRITE_COMMANDS.CREATE_WORKSPACE_REPORT_FIELD_LIST_VALUE, parameters, onyxData);
+}
+
+/**
+ * Removes a list value from the workspace report fields.
+ */
+function removeReportFieldListValue(policyID: string, reportFieldID: string, valueIndexes: number[]) {
+    const previousFieldList = allPolicies?.[`${ONYXKEYS.COLLECTION.POLICY}${policyID}`]?.fieldList ?? {};
+    const reportFieldKey = ReportUtils.getReportFieldKey(reportFieldID);
+    const reportField = previousFieldList[reportFieldKey];
+    const updatedReportField = cloneDeep(reportField);
+
+    valueIndexes
+        .sort((a, b) => b - a)
+        .forEach((valueIndex) => {
+            const shouldResetDefaultValue = reportField.defaultValue === reportField.values[valueIndex];
+
+            if (shouldResetDefaultValue) {
+                updatedReportField.defaultValue = '';
+            }
+
+            updatedReportField.values.splice(valueIndex, 1);
+            updatedReportField.disabledOptions.splice(valueIndex, 1);
+        });
+
+    // We are using the offline pattern A (optimistic without feedback)
+    const onyxData: OnyxData = {
+        optimisticData: [
+            {
+                key: `${ONYXKEYS.COLLECTION.POLICY}${policyID}`,
+                onyxMethod: Onyx.METHOD.MERGE,
+                value: {
+                    fieldList: {
+                        [reportFieldKey]: updatedReportField,
+                    },
+                },
+            },
+        ],
+    };
+
+    const parameters: RemoveWorkspaceReportFieldListValueParams = {
+        policyID,
+        reportFields: JSON.stringify([updatedReportField]),
+    };
+
+    API.write(WRITE_COMMANDS.REMOVE_WORKSPACE_REPORT_FIELD_LIST_VALUE, parameters, onyxData);
+}
+
+export type {CreateReportFieldArguments};
+
+export {
+    setInitialCreateReportFieldsForm,
+    createReportFieldsListValue,
+    renameReportFieldsListValue,
+    setReportFieldsListValueEnabled,
+    deleteReportFieldsListValue,
+    createReportField,
+    deleteReportFields,
+    updateReportFieldInitialValue,
+    updateReportFieldListValueEnabled,
+    openPolicyReportFieldsPage,
+    addReportFieldListValue,
+    removeReportFieldListValue,
+};
diff --git a/src/libs/actions/Policy/Tag.ts b/src/libs/actions/Policy/Tag.ts
new file mode 100644
index 000000000000..49a285c12bbe
--- /dev/null
+++ b/src/libs/actions/Policy/Tag.ts
@@ -0,0 +1,866 @@
+import type {NullishDeep, OnyxCollection, OnyxEntry, OnyxUpdate} from 'react-native-onyx';
+import Onyx from 'react-native-onyx';
+import * as API from '@libs/API';
+import type {
+    EnablePolicyTagsParams,
+    OpenPolicyTagsPageParams,
+    RenamePolicyTaglistParams,
+    RenamePolicyTagsParams,
+    SetPolicyTagsEnabled,
+    SetPolicyTagsRequired,
+    UpdatePolicyTagGLCodeParams,
+} from '@libs/API/parameters';
+import {READ_COMMANDS, WRITE_COMMANDS} from '@libs/API/types';
+import * as ErrorUtils from '@libs/ErrorUtils';
+import getIsNarrowLayout from '@libs/getIsNarrowLayout';
+import Log from '@libs/Log';
+import * as OptionsListUtils from '@libs/OptionsListUtils';
+import * as PolicyUtils from '@libs/PolicyUtils';
+import {navigateWhenEnableFeature} from '@libs/PolicyUtils';
+import * as ReportUtils from '@libs/ReportUtils';
+import * as TransactionUtils from '@libs/TransactionUtils';
+import CONST from '@src/CONST';
+import ONYXKEYS from '@src/ONYXKEYS';
+import type {Policy, PolicyTag, PolicyTagLists, PolicyTags, RecentlyUsedTags, Report} from '@src/types/onyx';
+import type {OnyxValueWithOfflineFeedback} from '@src/types/onyx/OnyxCommon';
+import type {Attributes, Rate} from '@src/types/onyx/Policy';
+import type {OnyxData} from '@src/types/onyx/Request';
+
+type NewCustomUnit = {
+    customUnitID: string;
+    name: string;
+    attributes: Attributes;
+    rates: Rate;
+};
+
+const allPolicies: OnyxCollection<Policy> = {};
+Onyx.connect({
+    key: ONYXKEYS.COLLECTION.POLICY,
+    callback: (val, key) => {
+        if (!key) {
+            return;
+        }
+        if (val === null || val === undefined) {
+            // If we are deleting a policy, we have to check every report linked to that policy
+            // and unset the draft indicator (pencil icon) alongside removing any draft comments. Clearing these values will keep the newly archived chats from being displayed in the LHN.
+            // More info: https://github.com/Expensify/App/issues/14260
+            const policyID = key.replace(ONYXKEYS.COLLECTION.POLICY, '');
+            const policyReports = ReportUtils.getAllPolicyReports(policyID);
+            const cleanUpMergeQueries: Record<`${typeof ONYXKEYS.COLLECTION.REPORT}${string}`, NullishDeep<Report>> = {};
+            const cleanUpSetQueries: Record<`${typeof ONYXKEYS.COLLECTION.REPORT_DRAFT_COMMENT}${string}` | `${typeof ONYXKEYS.COLLECTION.REPORT_ACTIONS_DRAFTS}${string}`, null> = {};
+            policyReports.forEach((policyReport) => {
+                if (!policyReport) {
+                    return;
+                }
+                const {reportID} = policyReport;
+                cleanUpSetQueries[`${ONYXKEYS.COLLECTION.REPORT_DRAFT_COMMENT}${reportID}`] = null;
+                cleanUpSetQueries[`${ONYXKEYS.COLLECTION.REPORT_ACTIONS_DRAFTS}${reportID}`] = null;
+            });
+            Onyx.mergeCollection(ONYXKEYS.COLLECTION.REPORT, cleanUpMergeQueries);
+            Onyx.multiSet(cleanUpSetQueries);
+            delete allPolicies[key];
+            return;
+        }
+
+        allPolicies[key] = val;
+    },
+});
+
+let allPolicyTags: OnyxCollection<PolicyTagLists> = {};
+Onyx.connect({
+    key: ONYXKEYS.COLLECTION.POLICY_TAGS,
+    waitForCollectionCallback: true,
+    callback: (value) => {
+        if (!value) {
+            allPolicyTags = {};
+            return;
+        }
+
+        allPolicyTags = value;
+    },
+});
+
+let allRecentlyUsedTags: OnyxCollection<RecentlyUsedTags> = {};
+Onyx.connect({
+    key: ONYXKEYS.COLLECTION.POLICY_RECENTLY_USED_TAGS,
+    waitForCollectionCallback: true,
+    callback: (val) => (allRecentlyUsedTags = val),
+});
+
+function openPolicyTagsPage(policyID: string) {
+    if (!policyID) {
+        Log.warn('openPolicyTasgPage invalid params', {policyID});
+        return;
+    }
+
+    const params: OpenPolicyTagsPageParams = {
+        policyID,
+    };
+
+    API.read(READ_COMMANDS.OPEN_POLICY_TAGS_PAGE, params);
+}
+
+function buildOptimisticPolicyRecentlyUsedTags(policyID?: string, transactionTags?: string): RecentlyUsedTags {
+    if (!policyID || !transactionTags) {
+        return {};
+    }
+
+    const policyTags = allPolicyTags?.[`${ONYXKEYS.COLLECTION.POLICY_TAGS}${policyID}`] ?? {};
+    const policyTagKeys = PolicyUtils.getSortedTagKeys(policyTags);
+    const policyRecentlyUsedTags = allRecentlyUsedTags?.[`${ONYXKEYS.COLLECTION.POLICY_RECENTLY_USED_TAGS}${policyID}`] ?? {};
+    const newOptimisticPolicyRecentlyUsedTags: RecentlyUsedTags = {};
+
+    TransactionUtils.getTagArrayFromName(transactionTags).forEach((tag, index) => {
+        if (!tag) {
+            return;
+        }
+
+        const tagListKey = policyTagKeys[index];
+        newOptimisticPolicyRecentlyUsedTags[tagListKey] = [...new Set([tag, ...(policyRecentlyUsedTags[tagListKey] ?? [])])];
+    });
+
+    return newOptimisticPolicyRecentlyUsedTags;
+}
+
+function createPolicyTag(policyID: string, tagName: string) {
+    const policyTag = PolicyUtils.getTagLists(allPolicyTags?.[`${ONYXKEYS.COLLECTION.POLICY_TAGS}${policyID}`] ?? {})?.[0] ?? {};
+    const newTagName = PolicyUtils.escapeTagName(tagName);
+
+    const onyxData: OnyxData = {
+        optimisticData: [
+            {
+                onyxMethod: Onyx.METHOD.MERGE,
+                key: `${ONYXKEYS.COLLECTION.POLICY_TAGS}${policyID}`,
+                value: {
+                    [policyTag.name]: {
+                        tags: {
+                            [newTagName]: {
+                                name: newTagName,
+                                enabled: true,
+                                errors: null,
+                                pendingAction: CONST.RED_BRICK_ROAD_PENDING_ACTION.ADD,
+                            },
+                        },
+                    },
+                },
+            },
+        ],
+        successData: [
+            {
+                onyxMethod: Onyx.METHOD.MERGE,
+                key: `${ONYXKEYS.COLLECTION.POLICY_TAGS}${policyID}`,
+                value: {
+                    [policyTag.name]: {
+                        tags: {
+                            [newTagName]: {
+                                errors: null,
+                                pendingAction: null,
+                            },
+                        },
+                    },
+                },
+            },
+        ],
+        failureData: [
+            {
+                onyxMethod: Onyx.METHOD.MERGE,
+                key: `${ONYXKEYS.COLLECTION.POLICY_TAGS}${policyID}`,
+                value: {
+                    [policyTag.name]: {
+                        tags: {
+                            [newTagName]: {
+                                errors: ErrorUtils.getMicroSecondOnyxErrorWithTranslationKey('workspace.tags.genericFailureMessage'),
+                                pendingAction: null,
+                            },
+                        },
+                    },
+                },
+            },
+        ],
+    };
+
+    const parameters = {
+        policyID,
+        tags: JSON.stringify([{name: newTagName}]),
+    };
+
+    API.write(WRITE_COMMANDS.CREATE_POLICY_TAG, parameters, onyxData);
+}
+
+function setWorkspaceTagEnabled(policyID: string, tagsToUpdate: Record<string, {name: string; enabled: boolean}>, tagListIndex: number) {
+    const policyTag = PolicyUtils.getTagLists(allPolicyTags?.[`${ONYXKEYS.COLLECTION.POLICY_TAGS}${policyID}`] ?? {})?.[tagListIndex] ?? {};
+
+    const optimisticPolicyTagsData = {
+        ...Object.keys(tagsToUpdate).reduce<PolicyTags>((acc, key) => {
+            acc[key] = {
+                ...policyTag.tags[key],
+                ...tagsToUpdate[key],
+                errors: null,
+                pendingFields: {
+                    ...policyTag.tags[key].pendingFields,
+                    enabled: CONST.RED_BRICK_ROAD_PENDING_ACTION.UPDATE,
+                },
+                pendingAction: CONST.RED_BRICK_ROAD_PENDING_ACTION.UPDATE,
+            };
+
+            return acc;
+        }, {}),
+    };
+    const shouldDisableRequiredTag = !OptionsListUtils.hasEnabledOptions({...policyTag.tags, ...optimisticPolicyTagsData});
+
+    const onyxData: OnyxData = {
+        optimisticData: [
+            {
+                onyxMethod: Onyx.METHOD.MERGE,
+                key: `${ONYXKEYS.COLLECTION.POLICY_TAGS}${policyID}`,
+                value: {
+                    [policyTag.name]: {
+                        ...(shouldDisableRequiredTag ? {required: false, pendingFields: {required: CONST.RED_BRICK_ROAD_PENDING_ACTION.UPDATE}} : {}),
+                        tags: optimisticPolicyTagsData,
+                    },
+                },
+            },
+        ],
+        successData: [
+            {
+                onyxMethod: Onyx.METHOD.MERGE,
+                key: `${ONYXKEYS.COLLECTION.POLICY_TAGS}${policyID}`,
+                value: {
+                    [policyTag.name]: {
+                        ...(shouldDisableRequiredTag ? {pendingFields: {required: null}} : {}),
+                        tags: {
+                            ...Object.keys(tagsToUpdate).reduce<PolicyTags>((acc, key) => {
+                                acc[key] = {
+                                    ...policyTag.tags[key],
+                                    ...tagsToUpdate[key],
+                                    errors: null,
+                                    pendingFields: {
+                                        ...policyTag.tags[key].pendingFields,
+                                        enabled: null,
+                                    },
+                                    pendingAction: null,
+                                };
+
+                                return acc;
+                            }, {}),
+                        },
+                    },
+                },
+            },
+        ],
+        failureData: [
+            {
+                onyxMethod: Onyx.METHOD.MERGE,
+                key: `${ONYXKEYS.COLLECTION.POLICY_TAGS}${policyID}`,
+                value: {
+                    [policyTag.name]: {
+                        ...(shouldDisableRequiredTag ? {pendingFields: {required: null}, required: policyTag.required} : {}),
+                        tags: {
+                            ...Object.keys(tagsToUpdate).reduce<PolicyTags>((acc, key) => {
+                                acc[key] = {
+                                    ...policyTag.tags[key],
+                                    ...tagsToUpdate[key],
+                                    errors: ErrorUtils.getMicroSecondOnyxErrorWithTranslationKey('workspace.tags.genericFailureMessage'),
+                                    pendingFields: {
+                                        ...policyTag.tags[key].pendingFields,
+                                        enabled: null,
+                                    },
+                                    pendingAction: null,
+                                };
+
+                                return acc;
+                            }, {}),
+                        },
+                    },
+                },
+            },
+        ],
+    };
+
+    const parameters: SetPolicyTagsEnabled = {
+        policyID,
+        tags: JSON.stringify(Object.keys(tagsToUpdate).map((key) => tagsToUpdate[key])),
+        tagListIndex,
+    };
+
+    API.write(WRITE_COMMANDS.SET_POLICY_TAGS_ENABLED, parameters, onyxData);
+}
+
+function deletePolicyTags(policyID: string, tagsToDelete: string[]) {
+    const policyTag = PolicyUtils.getTagLists(allPolicyTags?.[`${ONYXKEYS.COLLECTION.POLICY_TAGS}${policyID}`] ?? {})?.[0] ?? {};
+
+    const onyxData: OnyxData = {
+        optimisticData: [
+            {
+                onyxMethod: Onyx.METHOD.MERGE,
+                key: `${ONYXKEYS.COLLECTION.POLICY_TAGS}${policyID}`,
+                value: {
+                    [policyTag.name]: {
+                        tags: {
+                            ...tagsToDelete.reduce<Record<string, Partial<OnyxValueWithOfflineFeedback<PolicyTag>>>>((acc, tagName) => {
+                                acc[tagName] = {pendingAction: CONST.RED_BRICK_ROAD_PENDING_ACTION.DELETE};
+                                return acc;
+                            }, {}),
+                        },
+                    },
+                },
+            },
+        ],
+        successData: [
+            {
+                onyxMethod: Onyx.METHOD.MERGE,
+                key: `${ONYXKEYS.COLLECTION.POLICY_TAGS}${policyID}`,
+                value: {
+                    [policyTag.name]: {
+                        tags: {
+                            ...tagsToDelete.reduce<Record<string, null | Partial<OnyxValueWithOfflineFeedback<PolicyTag>>>>((acc, tagName) => {
+                                acc[tagName] = null;
+                                return acc;
+                            }, {}),
+                        },
+                    },
+                },
+            },
+        ],
+        failureData: [
+            {
+                onyxMethod: Onyx.METHOD.MERGE,
+                key: `${ONYXKEYS.COLLECTION.POLICY_TAGS}${policyID}`,
+                value: {
+                    [policyTag.name]: {
+                        tags: {
+                            ...tagsToDelete.reduce<Record<string, Partial<OnyxValueWithOfflineFeedback<PolicyTag>>>>((acc, tagName) => {
+                                acc[tagName] = {pendingAction: null, errors: ErrorUtils.getMicroSecondOnyxErrorWithTranslationKey('workspace.tags.deleteFailureMessage')};
+                                return acc;
+                            }, {}),
+                        },
+                    },
+                },
+            },
+        ],
+    };
+
+    const parameters = {
+        policyID,
+        tags: JSON.stringify(tagsToDelete),
+    };
+
+    API.write(WRITE_COMMANDS.DELETE_POLICY_TAGS, parameters, onyxData);
+}
+
+function clearPolicyTagErrors(policyID: string, tagName: string, tagListIndex: number) {
+    const tagListName = PolicyUtils.getTagListName(allPolicyTags?.[`${ONYXKEYS.COLLECTION.POLICY_TAGS}${policyID}`], tagListIndex);
+    const tag = allPolicyTags?.[`${ONYXKEYS.COLLECTION.POLICY_TAGS}${policyID}`]?.[tagListName].tags?.[tagName];
+    if (!tag) {
+        return;
+    }
+
+    if (tag.pendingAction === CONST.RED_BRICK_ROAD_PENDING_ACTION.ADD) {
+        Onyx.merge(`${ONYXKEYS.COLLECTION.POLICY_TAGS}${policyID}`, {
+            [tagListName]: {
+                tags: {
+                    [tagName]: null,
+                },
+            },
+        });
+        return;
+    }
+
+    Onyx.merge(`${ONYXKEYS.COLLECTION.POLICY_TAGS}${policyID}`, {
+        [tagListName]: {
+            tags: {
+                [tagName]: {
+                    errors: null,
+                    pendingAction: null,
+                },
+            },
+        },
+    });
+}
+
+function clearPolicyTagListErrorField(policyID: string, tagListIndex: number, errorField: string) {
+    const policyTag = PolicyUtils.getTagLists(allPolicyTags?.[`${ONYXKEYS.COLLECTION.POLICY_TAGS}${policyID}`] ?? {})?.[tagListIndex] ?? {};
+
+    if (!policyTag.name) {
+        return;
+    }
+
+    Onyx.merge(`${ONYXKEYS.COLLECTION.POLICY_TAGS}${policyID}`, {
+        [policyTag.name]: {
+            errorFields: {
+                [errorField]: null,
+            },
+        },
+    });
+}
+
+function clearPolicyTagListErrors(policyID: string, tagListIndex: number) {
+    const policyTag = PolicyUtils.getTagLists(allPolicyTags?.[`${ONYXKEYS.COLLECTION.POLICY_TAGS}${policyID}`] ?? {})?.[tagListIndex] ?? {};
+
+    if (!policyTag.name) {
+        return;
+    }
+
+    Onyx.merge(`${ONYXKEYS.COLLECTION.POLICY_TAGS}${policyID}`, {
+        [policyTag.name]: {
+            errors: null,
+        },
+    });
+}
+
+function renamePolicyTag(policyID: string, policyTag: {oldName: string; newName: string}, tagListIndex: number) {
+    const tagList = PolicyUtils.getTagLists(allPolicyTags?.[`${ONYXKEYS.COLLECTION.POLICY_TAGS}${policyID}`] ?? {})?.[tagListIndex] ?? {};
+    const tag = tagList.tags?.[policyTag.oldName];
+    const oldTagName = policyTag.oldName;
+    const newTagName = PolicyUtils.escapeTagName(policyTag.newName);
+    const onyxData: OnyxData = {
+        optimisticData: [
+            {
+                onyxMethod: Onyx.METHOD.MERGE,
+                key: `${ONYXKEYS.COLLECTION.POLICY_TAGS}${policyID}`,
+                value: {
+                    [tagList.name]: {
+                        tags: {
+                            [oldTagName]: null,
+                            [newTagName]: {
+                                ...tag,
+                                name: newTagName,
+                                pendingAction: CONST.RED_BRICK_ROAD_PENDING_ACTION.UPDATE,
+                                pendingFields: {
+                                    ...tag.pendingFields,
+                                    name: CONST.RED_BRICK_ROAD_PENDING_ACTION.UPDATE,
+                                },
+                                previousTagName: oldTagName,
+                                errors: null,
+                            },
+                        },
+                    },
+                },
+            },
+        ],
+        successData: [
+            {
+                onyxMethod: Onyx.METHOD.MERGE,
+                key: `${ONYXKEYS.COLLECTION.POLICY_TAGS}${policyID}`,
+                value: {
+                    [tagList.name]: {
+                        tags: {
+                            [newTagName]: {
+                                pendingAction: null,
+                                pendingFields: {
+                                    ...tag.pendingFields,
+                                    name: null,
+                                },
+                            },
+                        },
+                    },
+                },
+            },
+        ],
+        failureData: [
+            {
+                onyxMethod: Onyx.METHOD.MERGE,
+                key: `${ONYXKEYS.COLLECTION.POLICY_TAGS}${policyID}`,
+                value: {
+                    [tagList.name]: {
+                        tags: {
+                            [newTagName]: null,
+                            [oldTagName]: {
+                                ...tag,
+                                pendingAction: null,
+                                pendingFields: {
+                                    ...tag.pendingFields,
+                                    name: null,
+                                },
+                                errors: ErrorUtils.getMicroSecondOnyxErrorWithTranslationKey('workspace.tags.genericFailureMessage'),
+                            },
+                        },
+                    },
+                },
+            },
+        ],
+    };
+
+    const parameters: RenamePolicyTagsParams = {
+        policyID,
+        oldName: oldTagName,
+        newName: newTagName,
+        tagListIndex,
+    };
+
+    API.write(WRITE_COMMANDS.RENAME_POLICY_TAG, parameters, onyxData);
+}
+
+function enablePolicyTags(policyID: string, enabled: boolean) {
+    const onyxData: OnyxData = {
+        optimisticData: [
+            {
+                onyxMethod: Onyx.METHOD.MERGE,
+                key: `${ONYXKEYS.COLLECTION.POLICY}${policyID}`,
+                value: {
+                    areTagsEnabled: enabled,
+                    pendingFields: {
+                        areTagsEnabled: CONST.RED_BRICK_ROAD_PENDING_ACTION.UPDATE,
+                    },
+                },
+            },
+        ],
+        successData: [
+            {
+                onyxMethod: Onyx.METHOD.MERGE,
+                key: `${ONYXKEYS.COLLECTION.POLICY}${policyID}`,
+                value: {
+                    pendingFields: {
+                        areTagsEnabled: null,
+                    },
+                },
+            },
+        ],
+        failureData: [
+            {
+                onyxMethod: Onyx.METHOD.MERGE,
+                key: `${ONYXKEYS.COLLECTION.POLICY}${policyID}`,
+                value: {
+                    areTagsEnabled: !enabled,
+                    pendingFields: {
+                        areTagsEnabled: null,
+                    },
+                },
+            },
+        ],
+    };
+
+    const policyTagList = allPolicyTags?.[`${ONYXKEYS.COLLECTION.POLICY_TAGS}${policyID}`];
+    if (!policyTagList) {
+        const defaultTagList: PolicyTagLists = {
+            Tag: {
+                name: 'Tag',
+                orderWeight: 0,
+                required: false,
+                tags: {},
+            },
+        };
+        onyxData.optimisticData?.push({
+            onyxMethod: Onyx.METHOD.SET,
+            key: `${ONYXKEYS.COLLECTION.POLICY_TAGS}${policyID}`,
+            value: defaultTagList,
+        });
+        onyxData.failureData?.push({
+            onyxMethod: Onyx.METHOD.SET,
+            key: `${ONYXKEYS.COLLECTION.POLICY_TAGS}${policyID}`,
+            value: null,
+        });
+    } else if (!enabled) {
+        const policyTag = PolicyUtils.getTagLists(policyTagList)[0];
+        onyxData.optimisticData?.push(
+            {
+                onyxMethod: Onyx.METHOD.MERGE,
+                key: `${ONYXKEYS.COLLECTION.POLICY_TAGS}${policyID}`,
+                value: {
+                    [policyTag.name]: {
+                        tags: Object.fromEntries(
+                            Object.keys(policyTag.tags).map((tagName) => [
+                                tagName,
+                                {
+                                    enabled: false,
+                                },
+                            ]),
+                        ),
+                    },
+                },
+            },
+            {
+                onyxMethod: Onyx.METHOD.MERGE,
+                key: `${ONYXKEYS.COLLECTION.POLICY}${policyID}`,
+                value: {
+                    requiresTag: false,
+                },
+            },
+        );
+    }
+
+    const parameters: EnablePolicyTagsParams = {policyID, enabled};
+
+    API.write(WRITE_COMMANDS.ENABLE_POLICY_TAGS, parameters, onyxData);
+
+    if (enabled && getIsNarrowLayout()) {
+        navigateWhenEnableFeature(policyID);
+    }
+}
+
+function renamePolicyTaglist(policyID: string, policyTagListName: {oldName: string; newName: string}, policyTags: OnyxEntry<PolicyTagLists>, tagListIndex: number) {
+    const newName = policyTagListName.newName;
+    const oldName = policyTagListName.oldName;
+    const oldPolicyTags = policyTags?.[oldName] ?? {};
+    const onyxData: OnyxData = {
+        optimisticData: [
+            {
+                onyxMethod: Onyx.METHOD.MERGE,
+                key: `${ONYXKEYS.COLLECTION.POLICY_TAGS}${policyID}`,
+                value: {
+                    [newName]: {...oldPolicyTags, name: newName, pendingAction: CONST.RED_BRICK_ROAD_PENDING_ACTION.ADD, errors: null},
+                    [oldName]: null,
+                },
+            },
+        ],
+        successData: [
+            {
+                onyxMethod: Onyx.METHOD.MERGE,
+                key: `${ONYXKEYS.COLLECTION.POLICY_TAGS}${policyID}`,
+                value: {
+                    [newName]: {pendingAction: null},
+                    [oldName]: null,
+                },
+            },
+        ],
+        failureData: [
+            {
+                onyxMethod: Onyx.METHOD.MERGE,
+                key: `${ONYXKEYS.COLLECTION.POLICY_TAGS}${policyID}`,
+                value: {
+                    [newName]: null,
+                    [oldName]: {
+                        ...oldPolicyTags,
+                        pendingAction: null,
+                        errors: ErrorUtils.getMicroSecondOnyxErrorWithTranslationKey('workspace.tags.genericFailureMessage'),
+                    },
+                },
+            },
+        ],
+    };
+    const parameters: RenamePolicyTaglistParams = {
+        policyID,
+        oldName,
+        newName,
+        tagListIndex,
+    };
+
+    API.write(WRITE_COMMANDS.RENAME_POLICY_TAG_LIST, parameters, onyxData);
+}
+
+function setPolicyRequiresTag(policyID: string, requiresTag: boolean) {
+    const policyTags = allPolicyTags?.[`${ONYXKEYS.COLLECTION.POLICY_TAGS}${policyID}`] ?? {};
+    const isMultiLevelTags = PolicyUtils.isMultiLevelTags(policyTags);
+
+    const onyxData: OnyxData = {
+        optimisticData: [
+            {
+                onyxMethod: Onyx.METHOD.MERGE,
+                key: `${ONYXKEYS.COLLECTION.POLICY}${policyID}`,
+                value: {
+                    requiresTag,
+                    errors: {requiresTag: null},
+                    pendingFields: {
+                        requiresTag: CONST.RED_BRICK_ROAD_PENDING_ACTION.UPDATE,
+                    },
+                },
+            },
+        ],
+        successData: [
+            {
+                onyxMethod: Onyx.METHOD.MERGE,
+                key: `${ONYXKEYS.COLLECTION.POLICY}${policyID}`,
+                value: {
+                    errors: {
+                        requiresTag: null,
+                    },
+                    pendingFields: {
+                        requiresTag: null,
+                    },
+                },
+            },
+        ],
+        failureData: [
+            {
+                onyxMethod: Onyx.METHOD.MERGE,
+                key: `${ONYXKEYS.COLLECTION.POLICY}${policyID}`,
+                value: {
+                    requiresTag: !requiresTag,
+                    errors: ErrorUtils.getMicroSecondOnyxErrorWithTranslationKey('workspace.tags.genericFailureMessage'),
+                    pendingFields: {
+                        requiresTag: null,
+                    },
+                },
+            },
+        ],
+    };
+
+    if (isMultiLevelTags) {
+        const getUpdatedTagsData = (required: boolean): OnyxUpdate => ({
+            key: `${ONYXKEYS.COLLECTION.POLICY_TAGS}${policyID}`,
+            onyxMethod: Onyx.METHOD.MERGE,
+            value: {
+                ...Object.keys(policyTags).reduce<PolicyTagLists>((acc, key) => {
+                    acc[key] = {
+                        ...acc[key],
+                        required,
+                    };
+                    return acc;
+                }, {}),
+            },
+        });
+
+        onyxData.optimisticData?.push(getUpdatedTagsData(requiresTag));
+        onyxData.failureData?.push(getUpdatedTagsData(!requiresTag));
+        onyxData.successData?.push(getUpdatedTagsData(requiresTag));
+    }
+
+    const parameters = {
+        policyID,
+        requiresTag,
+    };
+
+    API.write(WRITE_COMMANDS.SET_POLICY_REQUIRES_TAG, parameters, onyxData);
+}
+
+function setPolicyTagsRequired(policyID: string, requiresTag: boolean, tagListIndex: number) {
+    const policyTag = PolicyUtils.getTagLists(allPolicyTags?.[`${ONYXKEYS.COLLECTION.POLICY_TAGS}${policyID}`] ?? {})?.[tagListIndex] ?? {};
+
+    if (!policyTag.name) {
+        return;
+    }
+
+    const onyxData: OnyxData = {
+        optimisticData: [
+            {
+                onyxMethod: Onyx.METHOD.MERGE,
+                key: `${ONYXKEYS.COLLECTION.POLICY_TAGS}${policyID}`,
+                value: {
+                    [policyTag.name]: {
+                        required: requiresTag,
+                        pendingFields: {required: CONST.RED_BRICK_ROAD_PENDING_ACTION.UPDATE},
+                        errorFields: {required: null},
+                    },
+                },
+            },
+        ],
+        successData: [
+            {
+                onyxMethod: Onyx.METHOD.MERGE,
+                key: `${ONYXKEYS.COLLECTION.POLICY_TAGS}${policyID}`,
+                value: {
+                    [policyTag.name]: {
+                        pendingFields: {required: null},
+                    },
+                },
+            },
+        ],
+        failureData: [
+            {
+                onyxMethod: Onyx.METHOD.MERGE,
+                key: `${ONYXKEYS.COLLECTION.POLICY_TAGS}${policyID}`,
+                value: {
+                    [policyTag.name]: {
+                        required: policyTag.required,
+                        pendingFields: {required: null},
+                        errorFields: {
+                            required: ErrorUtils.getMicroSecondOnyxErrorWithTranslationKey('workspace.tags.genericFailureMessage'),
+                        },
+                    },
+                },
+            },
+        ],
+    };
+
+    const parameters: SetPolicyTagsRequired = {
+        policyID,
+        tagListIndex,
+        requireTagList: requiresTag,
+    };
+
+    API.write(WRITE_COMMANDS.SET_POLICY_TAGS_REQUIRED, parameters, onyxData);
+}
+
+function setPolicyTagGLCode(policyID: string, tagName: string, tagListIndex: number, glCode: string) {
+    const tagListName = PolicyUtils.getTagListName(allPolicyTags?.[`${ONYXKEYS.COLLECTION.POLICY_TAGS}${policyID}`], tagListIndex);
+    const policyTagToUpdate = allPolicyTags?.[`${ONYXKEYS.COLLECTION.POLICY_TAGS}${policyID}`]?.[tagListName]?.tags?.[tagName] ?? {};
+    const onyxData: OnyxData = {
+        optimisticData: [
+            {
+                onyxMethod: Onyx.METHOD.MERGE,
+                key: `${ONYXKEYS.COLLECTION.POLICY_TAGS}${policyID}`,
+                value: {
+                    [tagListName]: {
+                        tags: {
+                            [tagName]: {
+                                ...policyTagToUpdate,
+                                pendingAction: CONST.RED_BRICK_ROAD_PENDING_ACTION.UPDATE,
+                                pendingFields: {
+                                    // eslint-disable-next-line @typescript-eslint/naming-convention
+                                    'GL Code': CONST.RED_BRICK_ROAD_PENDING_ACTION.UPDATE,
+                                },
+                                // eslint-disable-next-line @typescript-eslint/naming-convention
+                                'GL Code': glCode,
+                            },
+                        },
+                    },
+                },
+            },
+        ],
+        successData: [
+            {
+                onyxMethod: Onyx.METHOD.MERGE,
+                key: `${ONYXKEYS.COLLECTION.POLICY_TAGS}${policyID}`,
+                value: {
+                    [tagListName]: {
+                        tags: {
+                            [tagName]: {
+                                errors: null,
+                                pendingAction: null,
+                                pendingFields: {
+                                    // eslint-disable-next-line @typescript-eslint/naming-convention
+                                    'GL Code': null,
+                                },
+                            },
+                        },
+                    },
+                },
+            },
+        ],
+        failureData: [
+            {
+                onyxMethod: Onyx.METHOD.MERGE,
+                key: `${ONYXKEYS.COLLECTION.POLICY_TAGS}${policyID}`,
+                value: {
+                    [tagListName]: {
+                        tags: {
+                            [tagName]: {
+                                ...policyTagToUpdate,
+                                errors: ErrorUtils.getMicroSecondOnyxErrorWithTranslationKey('workspace.tags.updateGLCodeFailureMessage'),
+                            },
+                        },
+                    },
+                },
+            },
+        ],
+    };
+
+    const parameters: UpdatePolicyTagGLCodeParams = {
+        policyID,
+        tagName,
+        tagListName,
+        tagListIndex,
+        glCode,
+    };
+
+    API.write(WRITE_COMMANDS.UPDATE_POLICY_TAG_GL_CODE, parameters, onyxData);
+}
+
+export {
+    buildOptimisticPolicyRecentlyUsedTags,
+    setPolicyRequiresTag,
+    setPolicyTagsRequired,
+    createPolicyTag,
+    clearPolicyTagErrors,
+    clearPolicyTagListErrors,
+    clearPolicyTagListErrorField,
+    deletePolicyTags,
+    enablePolicyTags,
+    openPolicyTagsPage,
+    renamePolicyTag,
+    renamePolicyTaglist,
+    setWorkspaceTagEnabled,
+    setPolicyTagGLCode,
+};
+
+export type {NewCustomUnit};
diff --git a/src/libs/actions/PolicyConnections.ts b/src/libs/actions/PolicyConnections.ts
index 4ea65a79352b..27df8f792cb3 100644
--- a/src/libs/actions/PolicyConnections.ts
+++ b/src/libs/actions/PolicyConnections.ts
@@ -8,13 +8,6 @@ import ONYXKEYS from '@src/ONYXKEYS';
 function openPolicyAccountingPage(policyID: string) {
     const hasConnectionsDataBeenFetchedKey = `${ONYXKEYS.COLLECTION.POLICY_HAS_CONNECTIONS_DATA_BEEN_FETCHED}${policyID}` as const;
 
-    const optimisticData: OnyxUpdate[] = [
-        {
-            onyxMethod: Onyx.METHOD.MERGE,
-            key: hasConnectionsDataBeenFetchedKey,
-            value: false,
-        },
-    ];
     const successData: OnyxUpdate[] = [
         {
             onyxMethod: Onyx.METHOD.MERGE,
@@ -35,7 +28,6 @@ function openPolicyAccountingPage(policyID: string) {
     };
 
     API.read(READ_COMMANDS.OPEN_POLICY_ACCOUNTING_PAGE, parameters, {
-        optimisticData,
         successData,
         failureData,
     });
diff --git a/src/libs/actions/PriorityMode.ts b/src/libs/actions/PriorityMode.ts
index 77347967b6cd..beec327a2e40 100644
--- a/src/libs/actions/PriorityMode.ts
+++ b/src/libs/actions/PriorityMode.ts
@@ -1,11 +1,10 @@
 import debounce from 'lodash/debounce';
-import type {OnyxCollection} from 'react-native-onyx';
 import Onyx from 'react-native-onyx';
 import Log from '@libs/Log';
+import * as ReportConnection from '@libs/ReportConnection';
 import * as ReportUtils from '@libs/ReportUtils';
 import CONST from '@src/CONST';
 import ONYXKEYS from '@src/ONYXKEYS';
-import type {Report} from '@src/types/onyx';
 
 /**
  * This actions file is used to automatically switch a user into #focus mode when they exceed a certain number of reports. We do this primarily for performance reasons.
@@ -21,7 +20,7 @@ let isReadyPromise = new Promise((resolve) => {
     resolveIsReadyPromise = resolve;
 });
 
-let currentUserAccountID: number | undefined | null;
+let currentUserAccountID: number | undefined;
 Onyx.connect({
     key: ONYXKEYS.SESSION,
     callback: (val) => {
@@ -35,18 +34,6 @@ Onyx.connect({
 // eslint-disable-next-line @typescript-eslint/no-use-before-define
 const autoSwitchToFocusMode = debounce(tryFocusModeUpdate, 300, {leading: true});
 
-let allReports: OnyxCollection<Report> | undefined = {};
-Onyx.connect({
-    key: ONYXKEYS.COLLECTION.REPORT,
-    waitForCollectionCallback: true,
-    callback: (reports) => {
-        allReports = reports;
-
-        // Each time a new report is added we will check to see if the user should be switched
-        autoSwitchToFocusMode();
-    },
-});
-
 let isLoadingReportData = true;
 Onyx.connect({
     key: ONYXKEYS.IS_LOADING_REPORT_DATA,
@@ -70,11 +57,11 @@ Onyx.connect({
     },
 });
 
-let hasTriedFocusMode: boolean | undefined | null;
+let hasTriedFocusMode: boolean | null | undefined;
 Onyx.connect({
     key: ONYXKEYS.NVP_TRY_FOCUS_MODE,
     callback: (val) => {
-        hasTriedFocusMode = val;
+        hasTriedFocusMode = val ?? null;
 
         // eslint-disable-next-line @typescript-eslint/no-use-before-define
         checkRequiredData();
@@ -87,11 +74,10 @@ function resetHasReadRequiredDataFromStorage() {
         resolveIsReadyPromise = resolve;
     });
     isLoadingReportData = true;
-    allReports = {};
 }
 
 function checkRequiredData() {
-    if (allReports === undefined || hasTriedFocusMode === undefined || isInFocusMode === undefined || isLoadingReportData) {
+    if (ReportConnection.getAllReports() === undefined || hasTriedFocusMode === undefined || isInFocusMode === undefined || isLoadingReportData) {
         return;
     }
 
@@ -112,13 +98,14 @@ function tryFocusModeUpdate() {
         }
 
         const validReports = [];
+        const allReports = ReportConnection.getAllReports();
         Object.keys(allReports ?? {}).forEach((key) => {
             const report = allReports?.[key];
             if (!report) {
                 return;
             }
 
-            if (!ReportUtils.isValidReport(report) || !ReportUtils.isReportParticipant(currentUserAccountID ?? 0, report)) {
+            if (!ReportUtils.isValidReport(report) || !ReportUtils.isReportParticipant(currentUserAccountID ?? -1, report)) {
                 return;
             }
 
diff --git a/src/libs/actions/PushNotification.ts b/src/libs/actions/PushNotification.ts
index bc4d4eb05c5a..d4caf7925d4c 100644
--- a/src/libs/actions/PushNotification.ts
+++ b/src/libs/actions/PushNotification.ts
@@ -8,7 +8,7 @@ let isUserOptedInToPushNotifications = false;
 Onyx.connect({
     key: ONYXKEYS.PUSH_NOTIFICATIONS_ENABLED,
     callback: (value) => {
-        if (value === null) {
+        if (value === undefined) {
             return;
         }
         isUserOptedInToPushNotifications = value;
@@ -35,7 +35,7 @@ function setPushNotificationOptInStatus(isOptingIn: boolean) {
                 value: isUserOptedInToPushNotifications,
             },
         ];
-        API.write(commandName, {deviceID}, {optimisticData, failureData});
+        API.write(commandName, {deviceID: deviceID ?? null}, {optimisticData, failureData});
     });
 }
 
diff --git a/src/libs/actions/ReimbursementAccount/resetFreePlanBankAccount.ts b/src/libs/actions/ReimbursementAccount/resetFreePlanBankAccount.ts
index 3ad8b9ffe599..5bb51f22d64a 100644
--- a/src/libs/actions/ReimbursementAccount/resetFreePlanBankAccount.ts
+++ b/src/libs/actions/ReimbursementAccount/resetFreePlanBankAccount.ts
@@ -2,7 +2,6 @@ import type {OnyxCollection, OnyxEntry} from 'react-native-onyx';
 import Onyx from 'react-native-onyx';
 import * as API from '@libs/API';
 import {WRITE_COMMANDS} from '@libs/API/types';
-import {getDefaultCompanyWebsite} from '@libs/BankAccountUtils';
 import CONST from '@src/CONST';
 import ONYXKEYS from '@src/ONYXKEYS';
 import INPUT_IDS from '@src/types/form/ReimbursementAccountForm';
@@ -18,7 +17,7 @@ Onyx.connect({
 /**
  * Reset user's reimbursement account. This will delete the bank account.
  */
-function resetFreePlanBankAccount(bankAccountID: number | undefined, session: OnyxEntry<OnyxTypes.Session>, policyID: string, user: OnyxEntry<OnyxTypes.User>) {
+function resetFreePlanBankAccount(bankAccountID: number | undefined, session: OnyxEntry<OnyxTypes.Session>, policyID: string) {
     if (!bankAccountID) {
         throw new Error('Missing bankAccountID when attempting to reset free plan bank account');
     }
@@ -76,7 +75,6 @@ function resetFreePlanBankAccount(bankAccountID: number | undefined, session: On
                     key: ONYXKEYS.PLAID_LINK_TOKEN,
                     value: '',
                 },
-                // @ts-expect-error: ONYXKEYS.REIMBURSEMENT_ACCOUNT is conflicting with ONYXKEYS.FORMS.REIMBURSEMENT
                 {
                     onyxMethod: Onyx.METHOD.SET,
                     key: ONYXKEYS.REIMBURSEMENT_ACCOUNT,
@@ -99,7 +97,7 @@ function resetFreePlanBankAccount(bankAccountID: number | undefined, session: On
                         [INPUT_IDS.BUSINESS_INFO_STEP.STATE]: '',
                         [INPUT_IDS.BUSINESS_INFO_STEP.ZIP_CODE]: '',
                         [INPUT_IDS.BUSINESS_INFO_STEP.COMPANY_PHONE]: '',
-                        [INPUT_IDS.BUSINESS_INFO_STEP.COMPANY_WEBSITE]: getDefaultCompanyWebsite(session, user),
+                        [INPUT_IDS.BUSINESS_INFO_STEP.COMPANY_WEBSITE]: undefined,
                         [INPUT_IDS.BUSINESS_INFO_STEP.COMPANY_TAX_ID]: '',
                         [INPUT_IDS.BUSINESS_INFO_STEP.INCORPORATION_TYPE]: '',
                         [INPUT_IDS.BUSINESS_INFO_STEP.INCORPORATION_DATE]: '',
diff --git a/src/libs/actions/ReimbursementAccount/store.ts b/src/libs/actions/ReimbursementAccount/store.ts
index c82843020f66..644fcbdf4def 100644
--- a/src/libs/actions/ReimbursementAccount/store.ts
+++ b/src/libs/actions/ReimbursementAccount/store.ts
@@ -4,7 +4,7 @@ import BankAccount from '@libs/models/BankAccount';
 import ONYXKEYS from '@src/ONYXKEYS';
 import type * as OnyxTypes from '@src/types/onyx';
 
-let bankAccountList: OnyxEntry<OnyxTypes.BankAccountList> = null;
+let bankAccountList: OnyxEntry<OnyxTypes.BankAccountList>;
 Onyx.connect({
     key: ONYXKEYS.BANK_ACCOUNT_LIST,
     callback: (val) => {
diff --git a/src/libs/actions/Report.ts b/src/libs/actions/Report.ts
index 0172b137d8ca..edded7a4c4c6 100644
--- a/src/libs/actions/Report.ts
+++ b/src/libs/actions/Report.ts
@@ -1,6 +1,6 @@
+import {findFocusedRoute} from '@react-navigation/native';
 import {format as timezoneFormat, utcToZonedTime} from 'date-fns-tz';
-import ExpensiMark from 'expensify-common/lib/ExpensiMark';
-import Str from 'expensify-common/lib/str';
+import {Str} from 'expensify-common';
 import isEmpty from 'lodash/isEmpty';
 import {DeviceEventEmitter, InteractionManager, Linking} from 'react-native';
 import type {NullishDeep, OnyxCollection, OnyxEntry, OnyxUpdate} from 'react-native-onyx';
@@ -8,13 +8,13 @@ import Onyx from 'react-native-onyx';
 import type {PartialDeep, ValueOf} from 'type-fest';
 import type {Emoji} from '@assets/emojis/types';
 import type {FileObject} from '@components/AttachmentModal';
+import AccountUtils from '@libs/AccountUtils';
 import * as ActiveClientManager from '@libs/ActiveClientManager';
 import * as API from '@libs/API';
 import type {
     AddCommentOrAttachementParams,
     AddEmojiReactionParams,
     AddWorkspaceRoomParams,
-    CompleteEngagementModalParams,
     CompleteGuidedSetupParams,
     DeleteCommentParams,
     ExpandURLPreviewParams,
@@ -25,6 +25,7 @@ import type {
     InviteToGroupChatParams,
     InviteToRoomParams,
     LeaveRoomParams,
+    MarkAsExportedParams,
     MarkAsUnreadParams,
     OpenReportParams,
     OpenRoomMembersPageParams,
@@ -32,10 +33,11 @@ import type {
     RemoveEmojiReactionParams,
     RemoveFromGroupChatParams,
     RemoveFromRoomParams,
+    ReportExportParams,
     ResolveActionableMentionWhisperParams,
+    ResolveActionableReportMentionWhisperParams,
     SearchForReportsParams,
     SearchForRoomsToMentionParams,
-    SetNameValuePairParams,
     TogglePinnedChatParams,
     UpdateCommentParams,
     UpdateGroupChatAvatarParams,
@@ -56,11 +58,17 @@ import {prepareDraftComment} from '@libs/DraftCommentUtils';
 import * as EmojiUtils from '@libs/EmojiUtils';
 import * as Environment from '@libs/Environment/Environment';
 import * as ErrorUtils from '@libs/ErrorUtils';
+import hasCompletedGuidedSetupFlowSelector from '@libs/hasCompletedGuidedSetupFlowSelector';
+import HttpUtils from '@libs/HttpUtils';
+import isPublicScreenRoute from '@libs/isPublicScreenRoute';
+import * as Localize from '@libs/Localize';
 import Log from '@libs/Log';
-import * as LoginUtils from '@libs/LoginUtils';
-import Navigation from '@libs/Navigation/Navigation';
+import {registerPaginationConfig} from '@libs/Middleware/Pagination';
+import Navigation, {navigationRef} from '@libs/Navigation/Navigation';
+import {isOnboardingFlowName} from '@libs/NavigationUtils';
 import type {NetworkStatus} from '@libs/NetworkConnection';
 import LocalNotification from '@libs/Notification/LocalNotification';
+import Parser from '@libs/Parser';
 import * as PersonalDetailsUtils from '@libs/PersonalDetailsUtils';
 import * as PhoneNumber from '@libs/PhoneNumber';
 import getPolicyEmployeeAccountIDs from '@libs/PolicyEmployeeListUtils';
@@ -68,11 +76,11 @@ import {extractPolicyIDFromPath} from '@libs/PolicyUtils';
 import processReportIDDeeplink from '@libs/processReportIDDeeplink';
 import * as Pusher from '@libs/Pusher/pusher';
 import * as ReportActionsUtils from '@libs/ReportActionsUtils';
+import * as ReportConnection from '@libs/ReportConnection';
+import type {OptimisticAddCommentReportAction} from '@libs/ReportUtils';
 import * as ReportUtils from '@libs/ReportUtils';
 import {doesReportBelongToWorkspace} from '@libs/ReportUtils';
-import type {OptimisticAddCommentReportAction} from '@libs/ReportUtils';
 import shouldSkipDeepLinkNavigation from '@libs/shouldSkipDeepLinkNavigation';
-import * as UserUtils from '@libs/UserUtils';
 import Visibility from '@libs/Visibility';
 import CONFIG from '@src/CONFIG';
 import type {OnboardingPurposeType} from '@src/CONST';
@@ -84,24 +92,23 @@ import INPUT_IDS from '@src/types/form/NewRoomForm';
 import type {
     InvitedEmailsToAccountIDs,
     NewGroupChatDraft,
-    PersonalDetails,
     PersonalDetailsList,
     PolicyReportField,
     QuickAction,
     RecentlyUsedReportFields,
     ReportAction,
     ReportActionReactions,
-    ReportMetadata,
     ReportUserIsTyping,
 } from '@src/types/onyx';
-import type {Decision, OriginalMessageIOU} from '@src/types/onyx/OriginalMessage';
+import type {Decision} from '@src/types/onyx/OriginalMessage';
+import type {ConnectionName} from '@src/types/onyx/Policy';
 import type {NotificationPreference, Participants, Participant as ReportParticipant, RoomVisibility, WriteCapability} from '@src/types/onyx/Report';
 import type Report from '@src/types/onyx/Report';
-import type {Message, ReportActionBase, ReportActions} from '@src/types/onyx/ReportAction';
-import type {EmptyObject} from '@src/types/utils/EmptyObject';
+import type {Message, ReportActions} from '@src/types/onyx/ReportAction';
 import {isEmptyObject} from '@src/types/utils/EmptyObject';
 import * as CachedPDFPaths from './CachedPDFPaths';
 import * as Modal from './Modal';
+import navigateFromNotification from './navigateFromNotification';
 import * as Session from './Session';
 import * as Welcome from './Welcome';
 
@@ -148,6 +155,10 @@ type GuidedSetupData = Array<
           AddCommentOrAttachementParams)
 >;
 
+type ReportError = {
+    type?: string;
+};
+
 let conciergeChatReportID: string | undefined;
 let currentUserAccountID = -1;
 let currentUserEmail: string | undefined;
@@ -164,14 +175,6 @@ Onyx.connect({
     },
 });
 
-let guideCalendarLink: string | undefined;
-Onyx.connect({
-    key: ONYXKEYS.ACCOUNT,
-    callback: (value) => {
-        guideCalendarLink = value?.guideCalendarLink ?? undefined;
-    },
-});
-
 let preferredSkinTone: number = CONST.EMOJI_DEFAULT_SKIN_TONE;
 Onyx.connect({
     key: ONYXKEYS.PREFERRED_EMOJI_SKIN_TONE,
@@ -194,20 +197,6 @@ Onyx.connect({
     },
 });
 
-const currentReportData: OnyxCollection<Report> = {};
-Onyx.connect({
-    key: ONYXKEYS.COLLECTION.REPORT,
-    callback: (report, key) => {
-        if (!key || !report) {
-            return;
-        }
-        const reportID = CollectionUtils.extractCollectionItemID(key);
-        currentReportData[reportID] = report;
-        // eslint-disable-next-line @typescript-eslint/no-use-before-define
-        handleReportChanged(report);
-    },
-});
-
 let isNetworkOffline = false;
 let networkStatus: NetworkStatus;
 Onyx.connect({
@@ -239,14 +228,6 @@ Onyx.connect({
     },
 });
 
-let reportMetadata: OnyxCollection<ReportMetadata> = {};
-Onyx.connect({
-    key: ONYXKEYS.COLLECTION.REPORT_METADATA,
-    waitForCollectionCallback: true,
-    callback: (value) => (reportMetadata = value),
-});
-
-const allReports: OnyxCollection<Report> = {};
 const typingWatchTimers: Record<string, NodeJS.Timeout> = {};
 
 let reportIDDeeplinkedFromOldDot: string | undefined;
@@ -277,6 +258,25 @@ Onyx.connect({
     callback: (val) => (quickAction = val),
 });
 
+let allReportDraftComments: Record<string, string | undefined> = {};
+
+Onyx.connect({
+    key: ONYXKEYS.COLLECTION.REPORT_DRAFT_COMMENT,
+    waitForCollectionCallback: true,
+    callback: (value) => (allReportDraftComments = value),
+});
+
+registerPaginationConfig({
+    initialCommand: WRITE_COMMANDS.OPEN_REPORT,
+    previousCommand: READ_COMMANDS.GET_OLDER_ACTIONS,
+    nextCommand: READ_COMMANDS.GET_NEWER_ACTIONS,
+    resourceCollectionKey: ONYXKEYS.COLLECTION.REPORT_ACTIONS,
+    pageCollectionKey: ONYXKEYS.COLLECTION.REPORT_ACTIONS_PAGES,
+    sortItems: (reportActions) => ReportActionsUtils.getSortedReportActionsForDisplay(reportActions, true),
+    getItemID: (reportAction) => reportAction.reportActionID,
+    isLastItem: (reportAction) => reportAction.actionName === CONST.REPORT.ACTIONS.TYPE.CREATED,
+});
+
 function clearGroupChat() {
     Onyx.set(ONYXKEYS.NEW_GROUP_CHAT_DRAFT, null);
 }
@@ -349,7 +349,7 @@ function subscribeToReportTypingEvents(reportID: string) {
             Onyx.merge(`${ONYXKEYS.COLLECTION.REPORT_USER_IS_TYPING}${reportID}`, typingStoppedStatus);
             delete typingWatchTimers[reportUserIdentifier];
         }, 1500);
-    }).catch((error) => {
+    }).catch((error: ReportError) => {
         Log.hmmm('[Report] Failed to initially subscribe to Pusher channel', {errorType: error.type, pusherChannelName});
     });
 }
@@ -380,7 +380,7 @@ function subscribeToReportLeavingEvents(reportID: string) {
         }
 
         Onyx.merge(`${ONYXKEYS.COLLECTION.REPORT_USER_IS_LEAVING_ROOM}${reportID}`, true);
-    }).catch((error) => {
+    }).catch((error: ReportError) => {
         Log.hmmm('[Report] Failed to initially subscribe to Pusher channel', {errorType: error.type, pusherChannelName});
     });
 }
@@ -474,11 +474,11 @@ function addActions(reportID: string, text = '', file?: FileObject) {
     // Always prefer the file as the last action over text
     const lastAction = attachmentAction ?? reportCommentAction;
     const currentTime = DateUtils.getDBTimeWithSkew();
-    const lastComment = lastAction?.message?.[0];
+    const lastComment = ReportActionsUtils.getReportActionMessage(lastAction);
     const lastCommentText = ReportUtils.formatReportLastMessageText(lastComment?.text ?? '');
 
     const optimisticReport: Partial<Report> = {
-        lastVisibleActionCreated: currentTime,
+        lastVisibleActionCreated: lastAction?.created,
         lastMessageTranslationKey: lastComment?.translationKey ?? '',
         lastMessageText: lastCommentText,
         lastMessageHtml: lastCommentText,
@@ -486,9 +486,10 @@ function addActions(reportID: string, text = '', file?: FileObject) {
         lastReadTime: currentTime,
     };
 
-    const report = ReportUtils.getReport(reportID);
+    const report = ReportConnection.getAllReports()?.[`${ONYXKEYS.COLLECTION.REPORT}${reportID}`];
+    const shouldUpdateNotificationPrefernece = !isEmptyObject(report) && ReportUtils.getReportNotificationPreference(report) === CONST.REPORT.NOTIFICATION_PREFERENCE.HIDDEN;
 
-    if (!isEmptyObject(report) && ReportUtils.getReportNotificationPreference(report) === CONST.REPORT.NOTIFICATION_PREFERENCE.HIDDEN) {
+    if (shouldUpdateNotificationPrefernece) {
         optimisticReport.notificationPreference = CONST.REPORT.NOTIFICATION_PREFERENCE.ALWAYS;
     }
 
@@ -512,7 +513,7 @@ function addActions(reportID: string, text = '', file?: FileObject) {
         clientCreatedTime: file ? attachmentAction?.created : reportCommentAction?.created,
     };
 
-    if (reportIDDeeplinkedFromOldDot === reportID && report?.participantAccountIDs?.length === 1 && Number(report.participantAccountIDs?.[0]) === CONST.ACCOUNT_ID.CONCIERGE) {
+    if (reportIDDeeplinkedFromOldDot === reportID && ReportUtils.isConciergeChatReport(report)) {
         parameters.isOldDotConciergeChat = true;
     }
 
@@ -543,6 +544,17 @@ function addActions(reportID: string, text = '', file?: FileObject) {
         },
     ];
 
+    if (shouldUpdateNotificationPrefernece) {
+        // optimisticReport.notificationPreference = CONST.REPORT.NOTIFICATION_PREFERENCE.ALWAYS;
+        successData.push({
+            onyxMethod: Onyx.METHOD.MERGE,
+            key: `${ONYXKEYS.COLLECTION.REPORT}${reportID}`,
+            value: {
+                notificationPreference: CONST.REPORT.NOTIFICATION_PREFERENCE.ALWAYS,
+            },
+        });
+    }
+
     let failureReport: Partial<Report> = {
         lastMessageTranslationKey: '',
         lastMessageText: '',
@@ -567,7 +579,7 @@ function addActions(reportID: string, text = '', file?: FileObject) {
         failureReportActions[actionKey] = {
             // eslint-disable-next-line @typescript-eslint/non-nullable-type-assertion-style
             ...(action as OptimisticAddCommentReportAction),
-            errors: ErrorUtils.getMicroSecondOnyxError('report.genericAddCommentFailureMessage'),
+            errors: ErrorUtils.getMicroSecondOnyxErrorWithTranslationKey('report.genericAddCommentFailureMessage'),
         };
     });
 
@@ -632,11 +644,43 @@ function updateGroupChatName(reportID: string, reportName: string) {
         {
             onyxMethod: Onyx.METHOD.MERGE,
             key: `${ONYXKEYS.COLLECTION.REPORT}${reportID}`,
-            value: {reportName},
+            value: {
+                reportName,
+                pendingFields: {
+                    reportName: CONST.RED_BRICK_ROAD_PENDING_ACTION.UPDATE,
+                },
+                errorFields: {
+                    reportName: null,
+                },
+            },
+        },
+    ];
+
+    const successData: OnyxUpdate[] = [
+        {
+            onyxMethod: Onyx.METHOD.MERGE,
+            key: `${ONYXKEYS.COLLECTION.REPORT}${reportID}`,
+            value: {
+                pendingFields: {
+                    reportName: null,
+                },
+            },
+        },
+    ];
+    const failureData: OnyxUpdate[] = [
+        {
+            onyxMethod: Onyx.METHOD.MERGE,
+            key: `${ONYXKEYS.COLLECTION.REPORT}${reportID}`,
+            value: {
+                reportName: ReportConnection.getAllReports()?.[`${ONYXKEYS.COLLECTION.REPORT}${reportID}`]?.reportName ?? null,
+                pendingFields: {
+                    reportName: null,
+                },
+            },
         },
     ];
     const parameters: UpdateGroupChatNameParams = {reportName, reportID};
-    API.write(WRITE_COMMANDS.UPDATE_GROUP_CHAT_NAME, parameters, {optimisticData});
+    API.write(WRITE_COMMANDS.UPDATE_GROUP_CHAT_NAME, parameters, {optimisticData, successData, failureData});
 }
 
 function updateGroupChatAvatar(reportID: string, file?: File | CustomRNImageManipulatorResult) {
@@ -662,7 +706,7 @@ function updateGroupChatAvatar(reportID: string, file?: File | CustomRNImageMani
             onyxMethod: Onyx.METHOD.MERGE,
             key: `${ONYXKEYS.COLLECTION.REPORT}${reportID}`,
             value: {
-                avatarUrl: currentReportData?.[reportID]?.avatarUrl ?? null,
+                avatarUrl: ReportConnection.getAllReports()?.[`${ONYXKEYS.COLLECTION.REPORT}${reportID}`]?.avatarUrl ?? null,
                 pendingFields: {
                     avatar: null,
                 },
@@ -712,8 +756,8 @@ function openReport(
     reportID: string,
     reportActionID?: string,
     participantLoginList: string[] = [],
-    newReportObject: Partial<Report> = {},
-    parentReportActionID = '0',
+    newReportObject?: ReportUtils.OptimisticChatReport,
+    parentReportActionID = '-1',
     isFromDeepLink = false,
     participantAccountIDList: number[] = [],
     avatar?: File | CustomRNImageManipulatorResult,
@@ -725,7 +769,7 @@ function openReport(
     const optimisticReport = reportActionsExist(reportID)
         ? {}
         : {
-              reportName: allReports?.[reportID]?.reportName ?? CONST.REPORT.DEFAULT_REPORT_NAME,
+              reportName: ReportConnection.getAllReports()?.[`${ONYXKEYS.COLLECTION.REPORT}${reportID}`]?.reportName ?? CONST.REPORT.DEFAULT_REPORT_NAME,
           };
 
     const optimisticData: OnyxUpdate[] = [
@@ -740,7 +784,9 @@ function openReport(
             value: {
                 isLoadingInitialReportActions: true,
                 isLoadingOlderReportActions: false,
+                hasLoadingOlderReportActionsError: false,
                 isLoadingNewerReportActions: false,
+                hasLoadingNewerReportActionsError: false,
                 lastVisitTime: DateUtils.getDBTime(),
             },
         },
@@ -786,8 +832,8 @@ function openReport(
     if (ReportUtils.isGroupChat(newReportObject)) {
         parameters.chatType = CONST.REPORT.CHAT_TYPE.GROUP;
         parameters.groupChatAdminLogins = currentUserEmail;
-        parameters.optimisticAccountIDList = Object.keys(newReportObject.participants ?? {}).join(',');
-        parameters.reportName = newReportObject.reportName ?? '';
+        parameters.optimisticAccountIDList = Object.keys(newReportObject?.participants ?? {}).join(',');
+        parameters.reportName = newReportObject?.reportName ?? '';
 
         // If we have an avatar then include it with the parameters
         if (avatar) {
@@ -801,13 +847,6 @@ function openReport(
         parameters.shouldRetry = false;
     }
 
-    const report = ReportUtils.getReport(reportID);
-    // 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 (isEmptyObject(report)) {
-        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
     const isCreatingNewReport = !isEmptyObject(newReportObject);
     if (isCreatingNewReport) {
@@ -834,46 +873,50 @@ function openReport(
             key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${reportID}`,
             value: {[optimisticCreatedAction.reportActionID]: optimisticCreatedAction},
         });
-        successData.push(
-            {
-                onyxMethod: Onyx.METHOD.MERGE,
-                key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${reportID}`,
-                value: {[optimisticCreatedAction.reportActionID]: {pendingAction: null}},
-            },
-            {
-                onyxMethod: Onyx.METHOD.MERGE,
-                key: `${ONYXKEYS.COLLECTION.REPORT}${reportID}`,
-                value: {
-                    pendingFields: {
-                        createChat: null,
-                    },
-                    errorFields: {
-                        createChat: null,
-                    },
-                    isOptimisticReport: false,
-                },
-            },
-        );
+        successData.push({
+            onyxMethod: Onyx.METHOD.MERGE,
+            key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${reportID}`,
+            value: {[optimisticCreatedAction.reportActionID]: {pendingAction: null}},
+        });
 
         // Add optimistic personal details for new participants
-        const optimisticPersonalDetails: OnyxCollection<PersonalDetails> = {};
-        const settledPersonalDetails: OnyxCollection<PersonalDetails> = {};
+        const optimisticPersonalDetails: OnyxEntry<PersonalDetailsList> = {};
+        const settledPersonalDetails: OnyxEntry<PersonalDetailsList> = {};
+        const redundantParticipants: Record<number, null> = {};
+        const participantAccountIDs = PersonalDetailsUtils.getAccountIDsByLogins(participantLoginList);
         participantLoginList.forEach((login, index) => {
-            const accountID = newReportObject?.participantAccountIDs?.[index];
+            const accountID = participantAccountIDs[index];
+            const isOptimisticAccount = !allPersonalDetails?.[accountID];
 
-            if (!accountID) {
+            if (!isOptimisticAccount) {
                 return;
             }
 
-            optimisticPersonalDetails[accountID] = allPersonalDetails?.[accountID] ?? {
+            optimisticPersonalDetails[accountID] = {
                 login,
                 accountID,
-                avatar: UserUtils.getDefaultAvatarURL(accountID),
                 displayName: login,
                 isOptimisticPersonalDetail: true,
             };
+            settledPersonalDetails[accountID] = null;
+
+            // BE will send different participants. We clear the optimistic ones to avoid duplicated entries
+            redundantParticipants[accountID] = null;
+        });
 
-            settledPersonalDetails[accountID] = allPersonalDetails?.[accountID] ?? null;
+        successData.push({
+            onyxMethod: Onyx.METHOD.MERGE,
+            key: `${ONYXKEYS.COLLECTION.REPORT}${reportID}`,
+            value: {
+                participants: redundantParticipants,
+                pendingFields: {
+                    createChat: null,
+                },
+                errorFields: {
+                    createChat: null,
+                },
+                isOptimisticReport: false,
+            },
         });
 
         optimisticData.push({
@@ -905,21 +948,31 @@ function openReport(
             failureData.push({
                 onyxMethod: Onyx.METHOD.MERGE,
                 key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${newReportObject.parentReportID}`,
-                value: {[parentReportActionID]: {childReportID: '0', childType: ''}},
+                value: {[parentReportActionID]: {childReportID: '-1', childType: ''}},
             });
         }
     }
 
-    parameters.clientLastReadTime = currentReportData?.[reportID]?.lastReadTime ?? '';
+    parameters.clientLastReadTime = ReportConnection.getAllReports()?.[`${ONYXKEYS.COLLECTION.REPORT}${reportID}`]?.lastReadTime ?? '';
+
+    const paginationConfig = {
+        resourceID: reportID,
+        cursorID: reportActionID,
+    };
 
     if (isFromDeepLink) {
-        // eslint-disable-next-line rulesdir/no-api-side-effects-method
-        API.makeRequestWithSideEffects(SIDE_EFFECT_REQUEST_COMMANDS.OPEN_REPORT, parameters, {optimisticData, successData, failureData}).finally(() => {
+        API.paginate(
+            CONST.API_REQUEST_TYPE.MAKE_REQUEST_WITH_SIDE_EFFECTS,
+            SIDE_EFFECT_REQUEST_COMMANDS.OPEN_REPORT,
+            parameters,
+            {optimisticData, successData, failureData},
+            paginationConfig,
+        ).finally(() => {
             Onyx.set(ONYXKEYS.IS_CHECKING_PUBLIC_ROOM, false);
         });
     } else {
         // eslint-disable-next-line rulesdir/no-multiple-api-calls
-        API.write(WRITE_COMMANDS.OPEN_REPORT, parameters, {optimisticData, successData, failureData});
+        API.paginate(CONST.API_REQUEST_TYPE.WRITE, WRITE_COMMANDS.OPEN_REPORT, parameters, {optimisticData, successData, failureData}, paginationConfig);
     }
 }
 
@@ -932,37 +985,50 @@ function openReport(
 function navigateToAndOpenReport(
     userLogins: string[],
     shouldDismissModal = true,
+    actionType?: string,
     reportName?: string,
     avatarUri?: string,
     avatarFile?: File | CustomRNImageManipulatorResult | undefined,
     optimisticReportID?: string,
+    isGroupChat = false,
 ) {
-    let newChat: ReportUtils.OptimisticChatReport | EmptyObject = {};
-    let chat: OnyxEntry<Report> | EmptyObject = {};
+    let newChat: ReportUtils.OptimisticChatReport | undefined;
+    let chat: OnyxEntry<Report>;
     const participantAccountIDs = PersonalDetailsUtils.getAccountIDsByLogins(userLogins);
-    const isGroupChat = participantAccountIDs.length > 1;
 
     // If we are not creating a new Group Chat then we are creating a 1:1 DM and will look for an existing chat
     if (!isGroupChat) {
-        chat = ReportUtils.getChatByParticipants(participantAccountIDs);
+        chat = ReportUtils.getChatByParticipants([...participantAccountIDs, currentUserAccountID]);
     }
 
     if (isEmptyObject(chat)) {
         if (isGroupChat) {
-            newChat = ReportUtils.buildOptimisticGroupChatReport(participantAccountIDs, reportName ?? '', avatarUri ?? '', optimisticReportID);
+            // If we are creating a group chat then participantAccountIDs is expected to contain currentUserAccountID
+            newChat = ReportUtils.buildOptimisticGroupChatReport(participantAccountIDs, reportName ?? '', avatarUri ?? '', optimisticReportID, CONST.REPORT.NOTIFICATION_PREFERENCE.HIDDEN);
         } else {
-            newChat = ReportUtils.buildOptimisticChatReport(participantAccountIDs);
+            newChat = ReportUtils.buildOptimisticChatReport(
+                [...participantAccountIDs, currentUserAccountID],
+                undefined,
+                undefined,
+                undefined,
+                undefined,
+                undefined,
+                undefined,
+                undefined,
+                undefined,
+                CONST.REPORT.NOTIFICATION_PREFERENCE.HIDDEN,
+            );
         }
     }
     const report = isEmptyObject(chat) ? newChat : chat;
 
     // We want to pass newChat here because if anything is passed in that param (even an existing chat), we will try to create a chat on the server
-    openReport(report.reportID, '', userLogins, newChat, undefined, undefined, undefined, avatarFile);
+    openReport(report?.reportID ?? '', '', userLogins, newChat, undefined, undefined, undefined, avatarFile);
     if (shouldDismissModal) {
         Navigation.dismissModalWithReport(report);
     } else {
         Navigation.navigateWithSwitchPolicyID({route: ROUTES.HOME});
-        Navigation.navigate(ROUTES.REPORT_WITH_ID.getRoute(report.reportID));
+        Navigation.navigate(ROUTES.REPORT_WITH_ID.getRoute(report?.reportID ?? '-1'), actionType);
     }
 }
 
@@ -972,15 +1038,15 @@ function navigateToAndOpenReport(
  * @param participantAccountIDs of user logins to start a chat report with.
  */
 function navigateToAndOpenReportWithAccountIDs(participantAccountIDs: number[]) {
-    let newChat: ReportUtils.OptimisticChatReport | EmptyObject = {};
-    const chat = ReportUtils.getChatByParticipants(participantAccountIDs);
+    let newChat: ReportUtils.OptimisticChatReport | undefined;
+    const chat = ReportUtils.getChatByParticipants([...participantAccountIDs, currentUserAccountID]);
     if (!chat) {
-        newChat = ReportUtils.buildOptimisticChatReport(participantAccountIDs);
+        newChat = ReportUtils.buildOptimisticChatReport([...participantAccountIDs, currentUserAccountID]);
     }
     const report = chat ?? newChat;
 
     // We want to pass newChat here because if anything is passed in that param (even an existing chat), we will try to create a chat on the server
-    openReport(report.reportID, '', [], newChat, '0', false, participantAccountIDs);
+    openReport(report?.reportID ?? '', '', [], newChat, '0', false, participantAccountIDs);
     Navigation.dismissModalWithReport(report);
 }
 
@@ -991,18 +1057,17 @@ function navigateToAndOpenReportWithAccountIDs(participantAccountIDs: number[])
  * @param parentReportAction the parent comment of a thread
  * @param parentReportID The reportID of the parent
  */
-function navigateToAndOpenChildReport(childReportID = '0', parentReportAction: Partial<ReportAction> = {}, parentReportID = '0') {
-    if (childReportID !== '0') {
-        openReport(childReportID);
+function navigateToAndOpenChildReport(childReportID = '-1', parentReportAction: Partial<ReportAction> = {}, parentReportID = '0') {
+    if (childReportID !== '-1' && childReportID !== '0') {
         Navigation.navigate(ROUTES.REPORT_WITH_ID.getRoute(childReportID));
     } else {
         const participantAccountIDs = [...new Set([currentUserAccountID, Number(parentReportAction.actorAccountID)])];
-        const parentReport = allReports?.[parentReportID];
+        const parentReport = ReportConnection.getAllReports()?.[`${ONYXKEYS.COLLECTION.REPORT}${parentReportID}`];
         // Threads from DMs and selfDMs don't have a chatType. All other threads inherit the chatType from their parent
         const childReportChatType = parentReport && ReportUtils.isSelfDM(parentReport) ? undefined : parentReport?.chatType;
         const newChat = ReportUtils.buildOptimisticChatReport(
             participantAccountIDs,
-            parentReportAction?.message?.[0]?.text,
+            ReportActionsUtils.getReportActionText(parentReportAction),
             childReportChatType,
             parentReport?.policyID ?? CONST.POLICY.OWNER_EMAIL_FAKE,
             CONST.POLICY.OWNER_ACCOUNT_ID_FAKE,
@@ -1015,7 +1080,7 @@ function navigateToAndOpenChildReport(childReportID = '0', parentReportAction: P
             parentReportID,
         );
 
-        const participantLogins = PersonalDetailsUtils.getLoginsByAccountIDs(newChat?.participantAccountIDs ?? []);
+        const participantLogins = PersonalDetailsUtils.getLoginsByAccountIDs(Object.keys(newChat.participants ?? {}).map(Number));
         openReport(newChat.reportID, '', participantLogins, newChat, parentReportAction.reportActionID);
         Navigation.navigate(ROUTES.REPORT_WITH_ID.getRoute(newChat.reportID));
     }
@@ -1032,6 +1097,7 @@ function getOlderActions(reportID: string, reportActionID: string) {
             key: `${ONYXKEYS.COLLECTION.REPORT_METADATA}${reportID}`,
             value: {
                 isLoadingOlderReportActions: true,
+                hasLoadingOlderReportActionsError: false,
             },
         },
     ];
@@ -1052,6 +1118,7 @@ function getOlderActions(reportID: string, reportActionID: string) {
             key: `${ONYXKEYS.COLLECTION.REPORT_METADATA}${reportID}`,
             value: {
                 isLoadingOlderReportActions: false,
+                hasLoadingOlderReportActionsError: true,
             },
         },
     ];
@@ -1061,7 +1128,16 @@ function getOlderActions(reportID: string, reportActionID: string) {
         reportActionID,
     };
 
-    API.read(READ_COMMANDS.GET_OLDER_ACTIONS, parameters, {optimisticData, successData, failureData});
+    API.paginate(
+        CONST.API_REQUEST_TYPE.READ,
+        READ_COMMANDS.GET_OLDER_ACTIONS,
+        parameters,
+        {optimisticData, successData, failureData},
+        {
+            resourceID: reportID,
+            cursorID: reportActionID,
+        },
+    );
 }
 
 /**
@@ -1075,6 +1151,7 @@ function getNewerActions(reportID: string, reportActionID: string) {
             key: `${ONYXKEYS.COLLECTION.REPORT_METADATA}${reportID}`,
             value: {
                 isLoadingNewerReportActions: true,
+                hasLoadingNewerReportActionsError: false,
             },
         },
     ];
@@ -1095,6 +1172,7 @@ function getNewerActions(reportID: string, reportActionID: string) {
             key: `${ONYXKEYS.COLLECTION.REPORT_METADATA}${reportID}`,
             value: {
                 isLoadingNewerReportActions: false,
+                hasLoadingNewerReportActionsError: true,
             },
         },
     ];
@@ -1104,7 +1182,16 @@ function getNewerActions(reportID: string, reportActionID: string) {
         reportActionID,
     };
 
-    API.read(READ_COMMANDS.GET_NEWER_ACTIONS, parameters, {optimisticData, successData, failureData});
+    API.paginate(
+        CONST.API_REQUEST_TYPE.READ,
+        READ_COMMANDS.GET_NEWER_ACTIONS,
+        parameters,
+        {optimisticData, successData, failureData},
+        {
+            resourceID: reportID,
+            cursorID: reportActionID,
+        },
+    );
 }
 
 /**
@@ -1119,8 +1206,11 @@ function expandURLPreview(reportID: string, reportActionID: string) {
     API.read(READ_COMMANDS.EXPAND_URL_PREVIEW, parameters);
 }
 
-/** Marks the new report actions as read */
-function readNewestAction(reportID: string) {
+/** Marks the new report actions as read
+ * @param shouldResetUnreadMarker Indicates whether the unread indicator should be reset.
+ * Currently, the unread indicator needs to be reset only when users mark a report as read.
+ */
+function readNewestAction(reportID: string, shouldResetUnreadMarker = false) {
     const lastReadTime = DateUtils.getDBTime();
 
     const optimisticData: OnyxUpdate[] = [
@@ -1139,13 +1229,20 @@ function readNewestAction(reportID: string) {
     };
 
     API.write(WRITE_COMMANDS.READ_NEWEST_ACTION, parameters, {optimisticData});
-    DeviceEventEmitter.emit(`readNewestAction_${reportID}`, lastReadTime);
+    if (shouldResetUnreadMarker) {
+        DeviceEventEmitter.emit(`readNewestAction_${reportID}`, lastReadTime);
+    }
 }
 
 /**
  * Sets the last read time on a report
  */
 function markCommentAsUnread(reportID: string, reportActionCreated: string) {
+    if (reportID === '-1') {
+        Log.warn('7339cd6c-3263-4f89-98e5-730f0be15784 Invalid report passed to MarkCommentAsUnread. Not calling the API because it wil fail.');
+        return;
+    }
+
     const reportActions = allReportActions?.[reportID];
 
     // Find the latest report actions from other users
@@ -1162,7 +1259,9 @@ function markCommentAsUnread(reportID: string, reportActionCreated: string) {
     }, null);
 
     // If no action created date is provided, use the last action's from other user
-    const actionCreationTime = reportActionCreated || (latestReportActionFromOtherUsers?.created ?? allReports?.[reportID]?.lastVisibleActionCreated ?? DateUtils.getDBTime(0));
+    const actionCreationTime =
+        reportActionCreated ||
+        (latestReportActionFromOtherUsers?.created ?? ReportConnection.getAllReports()?.[`${ONYXKEYS.COLLECTION.REPORT}${reportID}`]?.lastVisibleActionCreated ?? DateUtils.getDBTime(0));
 
     // We subtract 1 millisecond so that the lastReadTime is updated to just before a given reportAction's created date
     // For example, if we want to mark a report action with ID 100 and created date '2014-04-01 16:07:02.999' unread, we set the lastReadTime to '2014-04-01 16:07:02.998'
@@ -1214,8 +1313,8 @@ function togglePinnedState(reportID: string, isPinnedChat: boolean) {
  * tab, refresh etc without worrying about loosing what they typed out.
  * When empty string or null is passed, it will delete the draft comment from Onyx store.
  */
-function saveReportDraftComment(reportID: string, comment: string | null) {
-    Onyx.merge(`${ONYXKEYS.COLLECTION.REPORT_DRAFT_COMMENT}${reportID}`, prepareDraftComment(comment));
+function saveReportDraftComment(reportID: string, comment: string | null, callback: () => void = () => {}) {
+    Onyx.merge(`${ONYXKEYS.COLLECTION.REPORT_DRAFT_COMMENT}${reportID}`, prepareDraftComment(comment)).then(callback);
 }
 
 /** Broadcasts whether or not a user is typing on a report over the report's private pusher channel. */
@@ -1246,19 +1345,42 @@ function handleReportChanged(report: OnyxEntry<Report>) {
     // In this case, the API will let us know by returning a preexistingReportID.
     // We should clear out the optimistically created report and re-route the user to the preexisting report.
     if (report?.reportID && report.preexistingReportID) {
-        Onyx.set(`${ONYXKEYS.COLLECTION.REPORT}${report.reportID}`, null);
-
+        let callback = () => {
+            Onyx.set(`${ONYXKEYS.COLLECTION.REPORT}${report.reportID}`, null);
+            Onyx.set(`${ONYXKEYS.COLLECTION.REPORT_DRAFT_COMMENT}${report.reportID}`, null);
+        };
         // 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.REPORT_WITH_ID.getRoute(report.preexistingReportID), CONST.NAVIGATION.TYPE.FORCED_UP);
+            const currCallback = callback;
+            callback = () => {
+                currCallback();
+                Navigation.navigate(ROUTES.REPORT_WITH_ID.getRoute(report.preexistingReportID ?? '-1'), CONST.NAVIGATION.TYPE.UP);
+            };
+
+            // The report screen will listen to this event and transfer the draft comment to the existing report
+            // This will allow the newest draft comment to be transferred to the existing report
+            DeviceEventEmitter.emit(`switchToPreExistingReport_${report.reportID}`, {
+                preexistingReportID: report.preexistingReportID,
+                callback,
+            });
+
+            return;
+        }
+
+        // In case the user is not on the report screen, we will transfer the report draft comment directly to the existing report
+        // after that clear the optimistically created report
+        const draftReportComment = allReportDraftComments?.[`${ONYXKEYS.COLLECTION.REPORT_DRAFT_COMMENT}${report.reportID}`];
+        if (!draftReportComment) {
+            callback();
+            return;
         }
+
+        saveReportDraftComment(report.preexistingReportID ?? '-1', draftReportComment, callback);
+
         return;
     }
 
-    if (allReports && report?.reportID) {
-        allReports[report.reportID] = report;
-
+    if (report?.reportID) {
         if (ReportUtils.isConciergeChatReport(report)) {
             conciergeChatReportID = report.reportID;
         }
@@ -1314,7 +1436,15 @@ function deleteReportComment(reportID: string, reportAction: ReportAction) {
             lastActorAccountID,
         };
     }
-
+    const report = ReportConnection.getAllReports()?.[`${ONYXKEYS.COLLECTION.REPORT}${reportID}`];
+    const didCommentMentionCurrentUser = ReportActionsUtils.didMessageMentionCurrentUser(reportAction);
+    if (didCommentMentionCurrentUser && reportAction.created === report?.lastMentionedTime) {
+        const reportActionsForReport = allReportActions?.[reportID];
+        const latestMentioneReportAction = Object.values(reportActionsForReport ?? {}).find(
+            (action) => action.reportActionID !== reportAction.reportActionID && ReportActionsUtils.didMessageMentionCurrentUser(action),
+        );
+        optimisticReport.lastMentionedTime = latestMentioneReportAction?.created ?? null;
+    }
     // If the API call fails we must show the original message again, so we revert the message content back to how it was
     // and and remove the pendingAction so the strike-through clears
     const failureData: OnyxUpdate[] = [
@@ -1411,20 +1541,24 @@ function removeLinksFromHtml(html: string, links: string[]): string {
  *
  * @param newCommentText text of the comment after editing.
  * @param originalCommentMarkdown original markdown of the comment before editing.
+ * @param videoAttributeCache cache of video attributes ([videoSource]: videoAttributes)
  */
-function handleUserDeletedLinksInHtml(newCommentText: string, originalCommentMarkdown: string): string {
-    const parser = new ExpensiMark();
+function handleUserDeletedLinksInHtml(newCommentText: string, originalCommentMarkdown: string, videoAttributeCache?: Record<string, string>): string {
     if (newCommentText.length > CONST.MAX_MARKUP_LENGTH) {
         return newCommentText;
     }
-    const htmlForNewComment = parser.replace(newCommentText);
-    const removedLinks = parser.getRemovedMarkdownLinks(originalCommentMarkdown, newCommentText);
+
+    const textWithMention = ReportUtils.completeShortMention(newCommentText);
+
+    const htmlForNewComment = Parser.replace(textWithMention, {
+        extras: {videoAttributeCache},
+    });
+    const removedLinks = Parser.getRemovedMarkdownLinks(originalCommentMarkdown, textWithMention);
     return removeLinksFromHtml(htmlForNewComment, removedLinks);
 }
 
 /** Saves a new message for a comment. Marks the comment as edited, which will be reflected in the UI. */
-function editReportComment(reportID: string, originalReportAction: OnyxEntry<ReportAction>, textForNewComment: string) {
-    const parser = new ExpensiMark();
+function editReportComment(reportID: string, originalReportAction: OnyxEntry<ReportAction>, textForNewComment: string, videoAttributeCache?: Record<string, string>) {
     const originalReportID = ReportUtils.getOriginalReportID(reportID, originalReportAction);
 
     if (!originalReportID || !originalReportAction) {
@@ -1434,23 +1568,23 @@ function editReportComment(reportID: string, originalReportAction: OnyxEntry<Rep
     // Do not autolink if someone explicitly tries to remove a link from message.
     // https://github.com/Expensify/App/issues/9090
     // https://github.com/Expensify/App/issues/13221
-    const originalCommentHTML = originalReportAction.message?.[0]?.html;
-    const originalCommentMarkdown = parser.htmlToMarkdown(originalCommentHTML ?? '').trim();
+    const originalCommentHTML = ReportActionsUtils.getReportActionHtml(originalReportAction);
+    const originalCommentMarkdown = Parser.htmlToMarkdown(originalCommentHTML ?? '').trim();
 
     // Skip the Edit if draft is not changed
     if (originalCommentMarkdown === textForNewComment) {
         return;
     }
+    const htmlForNewComment = handleUserDeletedLinksInHtml(textForNewComment, originalCommentMarkdown, videoAttributeCache);
 
-    const htmlForNewComment = handleUserDeletedLinksInHtml(textForNewComment, originalCommentMarkdown);
-    const reportComment = parser.htmlToText(htmlForNewComment);
+    const reportComment = Parser.htmlToText(htmlForNewComment);
 
     // 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) {
-        const autolinkFilter = {filterRules: parser.rules.map((rule) => rule.name).filter((name) => name !== 'autolink')};
-        parsedOriginalCommentHTML = parser.replace(originalCommentMarkdown, autolinkFilter);
+        const autolinkFilter = {filterRules: Parser.rules.map((rule) => rule.name).filter((name) => name !== 'autolink')};
+        parsedOriginalCommentHTML = Parser.replace(originalCommentMarkdown, autolinkFilter);
     }
 
     //  Delete the comment if it's empty
@@ -1466,7 +1600,7 @@ function editReportComment(reportID: string, originalReportAction: OnyxEntry<Rep
 
     // Optimistically update the reportAction with the new message
     const reportActionID = originalReportAction.reportActionID;
-    const originalMessage = originalReportAction?.message?.[0];
+    const originalMessage = ReportActionsUtils.getReportActionMessage(originalReportAction);
     const optimisticReportActions: PartialDeep<ReportActions> = {
         [reportActionID]: {
             pendingAction: CONST.RED_BRICK_ROAD_PENDING_ACTION.UPDATE,
@@ -1479,6 +1613,7 @@ function editReportComment(reportID: string, originalReportAction: OnyxEntry<Rep
                     text: reportComment,
                 },
             ],
+            lastModified: DateUtils.getDBTime(),
         },
     };
 
@@ -1557,7 +1692,8 @@ function updateNotificationPreference(
     navigate: boolean,
     parentReportID?: string,
     parentReportActionID?: string,
-    report: OnyxEntry<Report> | EmptyObject = {},
+    report?: OnyxEntry<Report>,
+    isJoiningRoom?: boolean,
 ) {
     if (previousValue === newValue) {
         if (navigate && !isEmptyObject(report) && report.reportID) {
@@ -1595,6 +1731,20 @@ function updateNotificationPreference(
         });
     }
 
+    if (isJoiningRoom) {
+        optimisticData.push({
+            onyxMethod: Onyx.METHOD.MERGE,
+            key: `${ONYXKEYS.COLLECTION.REPORT}${reportID}`,
+            value: {
+                participants: {
+                    [currentUserAccountID]: {
+                        hidden: false,
+                    },
+                },
+            },
+        });
+    }
+
     const parameters: UpdateReportNotificationPreferenceParams = {reportID, notificationPreference: newValue};
 
     API.write(WRITE_COMMANDS.UPDATE_REPORT_NOTIFICATION_PREFERENCE, parameters, {optimisticData, failureData});
@@ -1603,11 +1753,8 @@ function updateNotificationPreference(
     }
 }
 
-function updateRoomVisibility(reportID: string, previousValue: RoomVisibility | undefined, newValue: RoomVisibility, navigate: boolean, report: OnyxEntry<Report> | EmptyObject = {}) {
+function updateRoomVisibility(reportID: string, previousValue: RoomVisibility | undefined, newValue: RoomVisibility) {
     if (previousValue === newValue) {
-        if (navigate && !isEmptyObject(report) && report.reportID) {
-            ReportUtils.goBackToDetailsPage(report);
-        }
         return;
     }
 
@@ -1630,9 +1777,6 @@ function updateRoomVisibility(reportID: string, previousValue: RoomVisibility |
     const parameters: UpdateRoomVisibilityParams = {reportID, visibility: newValue};
 
     API.write(WRITE_COMMANDS.UPDATE_ROOM_VISIBILITY, parameters, {optimisticData, failureData});
-    if (navigate && !isEmptyObject(report)) {
-        ReportUtils.goBackToDetailsPage(report);
-    }
 }
 
 /**
@@ -1643,10 +1787,10 @@ function updateRoomVisibility(reportID: string, previousValue: RoomVisibility |
  * @param parentReportID The reportID of the parent
  * @param prevNotificationPreference The previous notification preference for the child report
  */
-function toggleSubscribeToChildReport(childReportID = '0', parentReportAction: Partial<ReportAction> = {}, parentReportID = '0', prevNotificationPreference?: NotificationPreference) {
-    if (childReportID !== '0') {
+function toggleSubscribeToChildReport(childReportID = '-1', parentReportAction: Partial<ReportAction> = {}, parentReportID = '-1', prevNotificationPreference?: NotificationPreference) {
+    if (childReportID !== '-1') {
         openReport(childReportID);
-        const parentReportActionID = parentReportAction?.reportActionID ?? '0';
+        const parentReportActionID = parentReportAction?.reportActionID ?? '-1';
         if (!prevNotificationPreference || prevNotificationPreference === CONST.REPORT.NOTIFICATION_PREFERENCE.HIDDEN) {
             updateNotificationPreference(childReportID, prevNotificationPreference, CONST.REPORT.NOTIFICATION_PREFERENCE.ALWAYS, false, parentReportID, parentReportActionID);
         } else {
@@ -1654,10 +1798,10 @@ function toggleSubscribeToChildReport(childReportID = '0', parentReportAction: P
         }
     } else {
         const participantAccountIDs = [...new Set([currentUserAccountID, Number(parentReportAction?.actorAccountID)])];
-        const parentReport = allReports?.[parentReportID];
+        const parentReport = ReportConnection.getAllReports()?.[`${ONYXKEYS.COLLECTION.REPORT}${parentReportID}`];
         const newChat = ReportUtils.buildOptimisticChatReport(
             participantAccountIDs,
-            parentReportAction?.message?.[0]?.text,
+            ReportActionsUtils.getReportActionText(parentReportAction),
             parentReport?.chatType,
             parentReport?.policyID ?? CONST.POLICY.OWNER_EMAIL_FAKE,
             CONST.POLICY.OWNER_ACCOUNT_ID_FAKE,
@@ -1701,7 +1845,7 @@ function updateReportName(reportID: string, value: string, previousValue: string
                     reportName: null,
                 },
                 errorFields: {
-                    reportName: ErrorUtils.getMicroSecondOnyxError('report.genericUpdateReporNameEditFailureMessage'),
+                    reportName: ErrorUtils.getMicroSecondOnyxErrorWithTranslationKey('report.genericUpdateReporNameEditFailureMessage'),
                 },
             },
         },
@@ -1730,8 +1874,7 @@ function updateReportName(reportID: string, value: string, previousValue: string
     API.write(WRITE_COMMANDS.SET_REPORT_NAME, parameters, {optimisticData, failureData, successData});
 }
 
-function clearReportFieldErrors(reportID: string, reportField: PolicyReportField) {
-    const fieldKey = ReportUtils.getReportFieldKey(reportField.fieldID);
+function clearReportFieldKeyErrors(reportID: string, fieldKey: string) {
     Onyx.merge(`${ONYXKEYS.COLLECTION.REPORT}${reportID}`, {
         pendingFields: {
             [fieldKey]: null,
@@ -1744,6 +1887,8 @@ function clearReportFieldErrors(reportID: string, reportField: PolicyReportField
 
 function updateReportField(reportID: string, reportField: PolicyReportField, previousReportField: PolicyReportField) {
     const fieldKey = ReportUtils.getReportFieldKey(reportField.fieldID);
+    const reportViolations = ReportUtils.getReportViolations(reportID);
+    const fieldViolation = ReportUtils.getFieldViolation(reportViolations, reportField);
     const recentlyUsedValues = allRecentlyUsedReportFields?.[fieldKey] ?? [];
 
     const optimisticData: OnyxUpdate[] = [
@@ -1761,6 +1906,18 @@ function updateReportField(reportID: string, reportField: PolicyReportField, pre
         },
     ];
 
+    if (fieldViolation) {
+        optimisticData.push({
+            onyxMethod: Onyx.METHOD.MERGE,
+            key: `${ONYXKEYS.COLLECTION.REPORT_VIOLATIONS}${reportID}`,
+            value: {
+                [fieldViolation]: {
+                    [reportField.fieldID]: null,
+                },
+            },
+        });
+    }
+
     if (reportField.type === 'dropdown' && reportField.value) {
         optimisticData.push({
             onyxMethod: Onyx.METHOD.MERGE,
@@ -1783,7 +1940,7 @@ function updateReportField(reportID: string, reportField: PolicyReportField, pre
                     [fieldKey]: null,
                 },
                 errorFields: {
-                    [fieldKey]: ErrorUtils.getMicroSecondOnyxError('report.genericUpdateReportFieldFailureMessage'),
+                    [fieldKey]: ErrorUtils.getMicroSecondOnyxErrorWithTranslationKey('report.genericUpdateReportFieldFailureMessage'),
                 },
             },
         },
@@ -1852,7 +2009,7 @@ function deleteReportField(reportID: string, reportField: PolicyReportField) {
                     [fieldKey]: null,
                 },
                 errorFields: {
-                    [fieldKey]: ErrorUtils.getMicroSecondOnyxError('report.genericUpdateReportFieldFailureMessage'),
+                    [fieldKey]: ErrorUtils.getMicroSecondOnyxErrorWithTranslationKey('report.genericUpdateReportFieldFailureMessage'),
                 },
             },
         },
@@ -1889,19 +2046,47 @@ function updateDescription(reportID: string, previousValue: string, newValue: st
     }
 
     const parsedDescription = ReportUtils.getParsedComment(newValue, {reportID});
+    const optimisticDescriptionUpdatedReportAction = ReportUtils.buildOptimisticRoomDescriptionUpdatedReportAction(parsedDescription);
+    const report = ReportUtils.getReport(reportID);
 
     const optimisticData: OnyxUpdate[] = [
         {
             onyxMethod: Onyx.METHOD.MERGE,
             key: `${ONYXKEYS.COLLECTION.REPORT}${reportID}`,
-            value: {description: parsedDescription, pendingFields: {description: CONST.RED_BRICK_ROAD_PENDING_ACTION.UPDATE}},
+            value: {
+                description: parsedDescription,
+                pendingFields: {description: CONST.RED_BRICK_ROAD_PENDING_ACTION.UPDATE},
+                lastActorAccountID: currentUserAccountID,
+                lastVisibleActionCreated: optimisticDescriptionUpdatedReportAction.created,
+                lastMessageText: (optimisticDescriptionUpdatedReportAction?.message as Message[])?.[0]?.text,
+            },
+        },
+        {
+            onyxMethod: Onyx.METHOD.MERGE,
+            key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${reportID}`,
+            value: {
+                [optimisticDescriptionUpdatedReportAction.reportActionID]: optimisticDescriptionUpdatedReportAction,
+            },
         },
     ];
     const failureData: OnyxUpdate[] = [
         {
             onyxMethod: Onyx.METHOD.MERGE,
             key: `${ONYXKEYS.COLLECTION.REPORT}${reportID}`,
-            value: {description: previousValue, pendingFields: {description: null}},
+            value: {
+                description: previousValue,
+                pendingFields: {description: null},
+                lastActorAccountID: report?.lastActorAccountID,
+                lastVisibleActionCreated: report?.lastVisibleActionCreated,
+                lastMessageText: report?.lastMessageText,
+            },
+        },
+        {
+            onyxMethod: Onyx.METHOD.MERGE,
+            key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${reportID}`,
+            value: {
+                [optimisticDescriptionUpdatedReportAction.reportActionID]: null,
+            },
         },
     ];
     const successData: OnyxUpdate[] = [
@@ -1910,9 +2095,16 @@ function updateDescription(reportID: string, previousValue: string, newValue: st
             key: `${ONYXKEYS.COLLECTION.REPORT}${reportID}`,
             value: {pendingFields: {description: null}},
         },
+        {
+            onyxMethod: Onyx.METHOD.MERGE,
+            key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${reportID}`,
+            value: {
+                [optimisticDescriptionUpdatedReportAction.reportActionID]: {pendingAction: null},
+            },
+        },
     ];
 
-    const parameters: UpdateRoomDescriptionParams = {reportID, description: parsedDescription};
+    const parameters: UpdateRoomDescriptionParams = {reportID, description: parsedDescription, reportActionID: optimisticDescriptionUpdatedReportAction.reportActionID};
 
     API.write(WRITE_COMMANDS.UPDATE_ROOM_DESCRIPTION, parameters, {optimisticData, failureData, successData});
     Navigation.goBack(ROUTES.REPORT_WITH_ID_DETAILS.getRoute(reportID));
@@ -1949,7 +2141,7 @@ function updateWriteCapabilityAndNavigate(report: Report, newValue: WriteCapabil
 /**
  * Navigates to the 1:1 report with Concierge
  */
-function navigateToConciergeChat(shouldDismissModal = false, checkIfCurrentPageActive = () => true) {
+function navigateToConciergeChat(shouldDismissModal = false, checkIfCurrentPageActive = () => true, actionType?: string) {
     // If conciergeChatReportID contains a concierge report ID, we navigate to the concierge chat using the stored report ID.
     // Otherwise, we would find the concierge chat and navigate to it.
     if (!conciergeChatReportID) {
@@ -1960,12 +2152,23 @@ function navigateToConciergeChat(shouldDismissModal = false, checkIfCurrentPageA
             if (!checkIfCurrentPageActive()) {
                 return;
             }
-            navigateToAndOpenReport([CONST.EMAIL.CONCIERGE], shouldDismissModal);
+            navigateToAndOpenReport([CONST.EMAIL.CONCIERGE], shouldDismissModal, actionType);
         });
     } else if (shouldDismissModal) {
         Navigation.dismissModal(conciergeChatReportID);
     } else {
-        Navigation.navigate(ROUTES.REPORT_WITH_ID.getRoute(conciergeChatReportID));
+        Navigation.navigate(ROUTES.REPORT_WITH_ID.getRoute(conciergeChatReportID), actionType);
+    }
+}
+
+/**
+ * Navigates to the 1:1 system chat
+ */
+function navigateToSystemChat() {
+    const systemChatReport = ReportUtils.getSystemChat();
+
+    if (systemChatReport?.reportID) {
+        Navigation.navigate(ROUTES.REPORT_WITH_ID.getRoute(systemChatReport.reportID));
     }
 }
 
@@ -2029,7 +2232,7 @@ function addPolicyReport(policyReport: ReportUtils.OptimisticChatReport) {
             key: `${ONYXKEYS.COLLECTION.REPORT}${policyReport.reportID}`,
             value: {
                 errorFields: {
-                    addWorkspaceRoom: ErrorUtils.getMicroSecondOnyxError('report.genericCreateReportFailureMessage'),
+                    addWorkspaceRoom: ErrorUtils.getMicroSecondOnyxErrorWithTranslationKey('report.genericCreateReportFailureMessage'),
                 },
             },
         },
@@ -2055,8 +2258,8 @@ function addPolicyReport(policyReport: ReportUtils.OptimisticChatReport) {
 }
 
 /** Deletes a report, along with its reportActions, any linked reports, and any linked IOU report. */
-function deleteReport(reportID: string) {
-    const report = currentReportData?.[reportID];
+function deleteReport(reportID: string, shouldDeleteChildReports = false) {
+    const report = ReportConnection.getAllReports()?.[`${ONYXKEYS.COLLECTION.REPORT}${reportID}`];
     const onyxData: Record<string, null> = {
         [`${ONYXKEYS.COLLECTION.REPORT}${reportID}`]: null,
         [`${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${reportID}`]: null,
@@ -2066,8 +2269,8 @@ function deleteReport(reportID: string) {
     const reportActionsForReport = allReportActions?.[reportID];
 
     const transactionIDs = Object.values(reportActionsForReport ?? {})
-        .filter((reportAction): reportAction is ReportActionBase & OriginalMessageIOU => reportAction.actionName === CONST.REPORT.ACTIONS.TYPE.IOU)
-        .map((reportAction) => reportAction.originalMessage.IOUTransactionID);
+        .filter((reportAction): reportAction is ReportAction<typeof CONST.REPORT.ACTIONS.TYPE.IOU> => ReportActionsUtils.isMoneyRequestAction(reportAction))
+        .map((reportAction) => ReportActionsUtils.getOriginalMessage(reportAction)?.IOUTransactionID);
 
     [...new Set(transactionIDs)].forEach((transactionID) => {
         onyxData[`${ONYXKEYS.COLLECTION.TRANSACTION}${transactionID}`] = null;
@@ -2075,20 +2278,34 @@ function deleteReport(reportID: string) {
 
     Onyx.multiSet(onyxData);
 
+    if (shouldDeleteChildReports) {
+        Object.values(reportActionsForReport ?? {}).forEach((reportAction) => {
+            if (!reportAction.childReportID) {
+                return;
+            }
+            deleteReport(reportAction.childReportID, shouldDeleteChildReports);
+        });
+    }
+
     // Delete linked IOU report
     if (report?.iouReportID) {
-        deleteReport(report.iouReportID);
+        deleteReport(report.iouReportID, shouldDeleteChildReports);
     }
 }
 
 /**
  * @param reportID The reportID of the policy report (workspace room)
  */
-function navigateToConciergeChatAndDeleteReport(reportID: string) {
+function navigateToConciergeChatAndDeleteReport(reportID: string, shouldPopToTop = false, shouldDeleteChildReports = false) {
     // Dismiss the current report screen and replace it with Concierge Chat
-    Navigation.goBack();
+    if (shouldPopToTop) {
+        Navigation.setShouldPopAllStateOnUP(true);
+    }
+    Navigation.goBack(undefined, undefined, shouldPopToTop);
     navigateToConciergeChat();
-    deleteReport(reportID);
+    InteractionManager.runAfterInteractions(() => {
+        deleteReport(reportID, shouldDeleteChildReports);
+    });
 }
 
 /**
@@ -2184,18 +2401,6 @@ function clearPolicyRoomNameErrors(reportID: string) {
     });
 }
 
-/**
- * @param reportID The reportID of the report.
- */
-// eslint-disable-next-line rulesdir/no-negated-variables
-function clearReportNotFoundErrors(reportID: string) {
-    Onyx.merge(`${ONYXKEYS.COLLECTION.REPORT}${reportID}`, {
-        errorFields: {
-            notFound: null,
-        },
-    });
-}
-
 function setIsComposerFullSize(reportID: string, isComposerFullSize: boolean) {
     Onyx.merge(`${ONYXKEYS.COLLECTION.REPORT_IS_COMPOSER_FULL_SIZE}${reportID}`, isComposerFullSize);
 }
@@ -2220,7 +2425,7 @@ function shouldShowReportActionNotification(reportID: string, action: ReportActi
     }
 
     // We don't want to send a local notification if the user preference is daily, mute or hidden.
-    const notificationPreference = allReports?.[reportID]?.notificationPreference ?? CONST.REPORT.NOTIFICATION_PREFERENCE.ALWAYS;
+    const notificationPreference = ReportConnection.getAllReports()?.[`${ONYXKEYS.COLLECTION.REPORT}${reportID}`]?.notificationPreference ?? CONST.REPORT.NOTIFICATION_PREFERENCE.ALWAYS;
     if (notificationPreference !== CONST.REPORT.NOTIFICATION_PREFERENCE.ALWAYS) {
         Log.info(`${tag} No notification because user preference is to be notified: ${notificationPreference}`);
         return false;
@@ -2238,7 +2443,7 @@ function shouldShowReportActionNotification(reportID: string, action: ReportActi
         return false;
     }
 
-    const report = currentReportData?.[reportID];
+    const report = ReportConnection.getAllReports()?.[`${ONYXKEYS.COLLECTION.REPORT}${reportID}`];
     if (!report || (report && report.pendingAction === CONST.RED_BRICK_ROAD_PENDING_ACTION.DELETE)) {
         Log.info(`${tag} No notification because the report does not exist or is pending deleted`, false);
         return false;
@@ -2257,7 +2462,7 @@ function shouldShowReportActionNotification(reportID: string, action: ReportActi
     }
 
     // Only show notifications for supported types of report actions
-    if (!ReportActionsUtils.isNotifiableReportAction(action)) {
+    if (action && !ReportActionsUtils.isNotifiableReportAction(action)) {
         Log.info(`${tag} No notification because this action type is not supported`, false, {actionName: action?.actionName});
         return false;
     }
@@ -2272,9 +2477,10 @@ function showReportActionNotification(reportID: string, reportAction: ReportActi
 
     Log.info('[LocalNotification] Creating notification');
 
-    const report = allReports?.[reportID] ?? null;
+    const localReportID = `${ONYXKEYS.COLLECTION.REPORT}${reportID}`;
+    const report = ReportConnection.getAllReports()?.[localReportID] ?? null;
     if (!report) {
-        Log.hmmm("[LocalNotification] couldn't show report action notification because the report wasn't found", {reportID, reportActionID: reportAction.reportActionID});
+        Log.hmmm("[LocalNotification] couldn't show report action notification because the report wasn't found", {localReportID, reportActionID: reportAction.reportActionID});
         return;
     }
 
@@ -2286,7 +2492,7 @@ function showReportActionNotification(reportID: string, reportAction: ReportActi
             if (!reportBelongsToWorkspace) {
                 Navigation.navigateWithSwitchPolicyID({route: ROUTES.HOME});
             }
-            Navigation.navigate(ROUTES.REPORT_WITH_ID.getRoute(reportID));
+            navigateFromNotification(reportID);
         });
 
     if (reportAction.actionName === CONST.REPORT.ACTIONS.TYPE.MODIFIED_EXPENSE) {
@@ -2406,6 +2612,7 @@ function toggleEmojiReaction(
     reactionObject: Emoji,
     existingReactions: OnyxEntry<ReportActionReactions>,
     paramSkinTone: number = preferredSkinTone,
+    ignoreSkinToneOnCompare = false,
 ) {
     const originalReportID = ReportUtils.getOriginalReportID(reportID, reportAction);
 
@@ -2427,7 +2634,7 @@ function toggleEmojiReaction(
     // Only use skin tone if emoji supports it
     const skinTone = emoji.types === undefined ? -1 : paramSkinTone;
 
-    if (existingReactionObject && EmojiUtils.hasAccountIDEmojiReacted(currentUserAccountID, existingReactionObject.users, skinTone)) {
+    if (existingReactionObject && EmojiUtils.hasAccountIDEmojiReacted(currentUserAccountID, existingReactionObject.users, ignoreSkinToneOnCompare ? undefined : skinTone)) {
         removeEmojiReaction(originalReportID, reportAction.reportActionID, emoji);
         return;
     }
@@ -2437,10 +2644,11 @@ function toggleEmojiReaction(
 
 function openReportFromDeepLink(url: string) {
     const reportID = ReportUtils.getReportIDFromLink(url);
+    const isAuthenticated = Session.hasAuthToken();
 
-    if (reportID && !Session.hasAuthToken()) {
+    if (reportID && !isAuthenticated) {
         // Call the OpenReport command to check in the server if it's a public room. If so, we'll open it as an anonymous user
-        openReport(reportID, '', [], {}, '0', true);
+        openReport(reportID, '', [], undefined, '0', true);
 
         // Show the sign-in page if the app is offline
         if (networkStatus === CONST.NETWORK.NETWORK_STATUS.OFFLINE) {
@@ -2451,29 +2659,64 @@ function openReportFromDeepLink(url: string) {
         Onyx.set(ONYXKEYS.IS_CHECKING_PUBLIC_ROOM, false);
     }
 
+    const route = ReportUtils.getRouteFromLink(url);
+
+    // If we are not authenticated and are navigating to a public screen, we don't want to navigate again to the screen after sign-in/sign-up
+    if (!isAuthenticated && isPublicScreenRoute(route)) {
+        return;
+    }
+
     // Navigate to the report after sign-in/sign-up.
     InteractionManager.runAfterInteractions(() => {
         Session.waitForUserSignIn().then(() => {
-            Navigation.waitForProtectedRoutes().then(() => {
-                const route = ReportUtils.getRouteFromLink(url);
-
-                if (route && Session.isAnonymousUser() && !Session.canAnonymousUserAccessRoute(route)) {
-                    Session.signOutAndRedirectToSignIn(true);
-                    return;
-                }
-
-                // We don't want to navigate to the exitTo route when creating a new workspace from a deep link,
-                // because we already handle creating the optimistic policy and navigating to it in App.setUpPoliciesAndNavigate,
-                // which is already called when AuthScreens mounts.
-                if (new URL(url).searchParams.get('exitTo') === ROUTES.WORKSPACE_NEW) {
-                    return;
-                }
-
-                if (shouldSkipDeepLinkNavigation(route)) {
-                    return;
-                }
-
-                Navigation.navigate(route as Route, CONST.NAVIGATION.ACTION_TYPE.PUSH);
+            const connection = Onyx.connect({
+                key: ONYXKEYS.NVP_ONBOARDING,
+                callback: (onboarding) => {
+                    if (onboarding) {
+                        // Once the onboarding data is available, we want to disconnect the connection
+                        // so it won't trigger the deeplink again every time the data is changed, for example, when relogin.
+                        Onyx.disconnect(connection);
+                    }
+
+                    Navigation.waitForProtectedRoutes().then(() => {
+                        if (route && Session.isAnonymousUser() && !Session.canAnonymousUserAccessRoute(route)) {
+                            Session.signOutAndRedirectToSignIn(true);
+                            return;
+                        }
+
+                        // We don't want to navigate to the exitTo route when creating a new workspace from a deep link,
+                        // because we already handle creating the optimistic policy and navigating to it in App.setUpPoliciesAndNavigate,
+                        // which is already called when AuthScreens mounts.
+                        if (new URL(url).searchParams.get('exitTo') === ROUTES.WORKSPACE_NEW) {
+                            return;
+                        }
+
+                        if (shouldSkipDeepLinkNavigation(route)) {
+                            return;
+                        }
+
+                        const state = navigationRef.getRootState();
+                        const currentFocusedRoute = findFocusedRoute(state);
+                        const hasCompletedGuidedSetupFlow = hasCompletedGuidedSetupFlowSelector(onboarding);
+
+                        // We need skip deeplinking if the user hasn't completed the guided setup flow.
+                        if (!hasCompletedGuidedSetupFlow) {
+                            Welcome.isOnboardingFlowCompleted({onNotCompleted: () => Navigation.navigate(ROUTES.ONBOARDING_ROOT.getRoute())});
+                            return;
+                        }
+
+                        if (isOnboardingFlowName(currentFocusedRoute?.name)) {
+                            Welcome.setOnboardingErrorMessage(Localize.translateLocal('onboarding.purpose.errorBackButton'));
+                            return;
+                        }
+
+                        if (isAuthenticated) {
+                            return;
+                        }
+
+                        Navigation.navigate(route as Route, CONST.NAVIGATION.ACTION_TYPE.PUSH);
+                    });
+                },
             });
         });
     });
@@ -2484,50 +2727,46 @@ function getCurrentUserAccountID(): number {
 }
 
 function navigateToMostRecentReport(currentReport: OnyxEntry<Report>) {
-    const reportID = currentReport?.reportID;
-    const sortedReportsByLastRead = ReportUtils.sortReportsByLastRead(Object.values(allReports ?? {}) as Report[], reportMetadata);
-
-    // We want to filter out the current report, hidden reports and empty chats
-    const filteredReportsByLastRead = sortedReportsByLastRead.filter(
-        (sortedReport) =>
-            sortedReport?.reportID !== reportID &&
-            sortedReport?.notificationPreference !== CONST.REPORT.NOTIFICATION_PREFERENCE.HIDDEN &&
-            ReportUtils.shouldReportBeInOptionList({
-                report: sortedReport,
-                currentReportId: '',
-                isInGSDMode: false,
-                betas: [],
-                policies: {},
-                excludeEmptyChats: true,
-                doesReportHaveViolations: false,
-                includeSelfDM: true,
-            }),
-    );
-    const lastAccessedReportID = filteredReportsByLastRead.at(-1)?.reportID;
-    const isChatThread = ReportUtils.isChatThread(currentReport);
+    const lastAccessedReportID = ReportUtils.findLastAccessedReport(false, false, undefined, currentReport?.reportID)?.reportID;
+
     if (lastAccessedReportID) {
-        const lastAccessedReportRoute = ROUTES.REPORT_WITH_ID.getRoute(lastAccessedReportID ?? '');
-        // If it is not a chat thread we should call Navigation.goBack to pop the current route first before navigating to last accessed report.
-        if (!isChatThread) {
-            // Fallback to the lastAccessedReportID route, if this is first route in the navigator
-            Navigation.goBack(lastAccessedReportRoute);
-        }
-        Navigation.navigate(lastAccessedReportRoute, CONST.NAVIGATION.TYPE.FORCED_UP);
+        const lastAccessedReportRoute = ROUTES.REPORT_WITH_ID.getRoute(lastAccessedReportID ?? '-1');
+        Navigation.goBack(lastAccessedReportRoute);
     } else {
-        const participantAccountIDs = PersonalDetailsUtils.getAccountIDsByLogins([CONST.EMAIL.CONCIERGE]);
-        const chat = ReportUtils.getChatByParticipants(participantAccountIDs);
-        if (chat?.reportID) {
-            // If it is not a chat thread we should call Navigation.goBack to pop the current route first before navigating to Concierge.
-            if (!isChatThread) {
-                Navigation.goBack();
-            }
-            Navigation.navigate(ROUTES.REPORT_WITH_ID.getRoute(chat?.reportID), CONST.NAVIGATION.TYPE.FORCED_UP);
+        const isChatThread = ReportUtils.isChatThread(currentReport);
+
+        // If it is not a chat thread we should call Navigation.goBack to pop the current route first before navigating to Concierge.
+        if (!isChatThread) {
+            Navigation.goBack();
         }
+
+        navigateToConciergeChat(false, () => true, CONST.NAVIGATION.TYPE.UP);
+    }
+}
+
+function getMostRecentReportID(currentReport: OnyxEntry<Report>) {
+    const lastAccessedReportID = ReportUtils.findLastAccessedReport(false, false, undefined, currentReport?.reportID)?.reportID;
+    return lastAccessedReportID ?? conciergeChatReportID;
+}
+
+function joinRoom(report: OnyxEntry<Report>) {
+    if (!report) {
+        return;
     }
+    updateNotificationPreference(
+        report.reportID,
+        report.notificationPreference,
+        CONST.REPORT.NOTIFICATION_PREFERENCE.ALWAYS,
+        false,
+        report.parentReportID,
+        report.parentReportActionID,
+        report,
+        true,
+    );
 }
 
 function leaveGroupChat(reportID: string) {
-    const report = ReportUtils.getReport(reportID);
+    const report = ReportConnection.getAllReports()?.[`${ONYXKEYS.COLLECTION.REPORT}${reportID}`];
     if (!report) {
         Log.warn('Attempting to leave Group Chat that does not existing locally');
         return;
@@ -2555,7 +2794,7 @@ function leaveGroupChat(reportID: string) {
 
 /** Leave a report by setting the state to submitted and closed */
 function leaveRoom(reportID: string, isWorkspaceMemberLeavingWorkspaceRoom = false) {
-    const report = currentReportData?.[reportID];
+    const report = ReportConnection.getAllReports()?.[`${ONYXKEYS.COLLECTION.REPORT}${reportID}`];
 
     if (!report) {
         return;
@@ -2578,6 +2817,11 @@ function leaveRoom(reportID: string, isWorkspaceMemberLeavingWorkspaceRoom = fal
                 isWorkspaceMemberLeavingWorkspaceRoom || isChatThread
                     ? {
                           notificationPreference: CONST.REPORT.NOTIFICATION_PREFERENCE.HIDDEN,
+                          participants: {
+                              [currentUserAccountID]: {
+                                  hidden: true,
+                              },
+                          },
                       }
                     : {
                           reportID: null,
@@ -2633,24 +2877,28 @@ function leaveRoom(reportID: string, isWorkspaceMemberLeavingWorkspaceRoom = fal
     };
 
     API.write(WRITE_COMMANDS.LEAVE_ROOM, parameters, {optimisticData, successData, failureData});
+
+    // If this is the leave action from a workspace room, simply dismiss the modal, i.e., allow the user to view the room and join again immediately.
+    // If this is the leave action from a chat thread (even if the chat thread is in a room), do not allow the user to stay in the thread after leaving.
+    if (isWorkspaceMemberLeavingWorkspaceRoom && !isChatThread) {
+        return;
+    }
+    // In other cases, the report is deleted and we should move the user to another report.
     navigateToMostRecentReport(report);
 }
 
 /** Invites people to a room */
 function inviteToRoom(reportID: string, inviteeEmailsToAccountIDs: InvitedEmailsToAccountIDs) {
-    const report = currentReportData?.[reportID];
+    const report = ReportConnection.getAllReports()?.[`${ONYXKEYS.COLLECTION.REPORT}${reportID}`];
     if (!report) {
         return;
     }
 
     const inviteeEmails = Object.keys(inviteeEmailsToAccountIDs);
     const inviteeAccountIDs = Object.values(inviteeEmailsToAccountIDs);
-    const participantAccountIDsAfterInvitation = [...new Set([...(report?.participantAccountIDs ?? []), ...inviteeAccountIDs])].filter(
-        (accountID): accountID is number => typeof accountID === 'number',
-    );
-    const visibleMemberAccountIDsAfterInvitation = [...new Set([...(report?.visibleChatMemberAccountIDs ?? []), ...inviteeAccountIDs])].filter(
-        (accountID): accountID is number => typeof accountID === 'number',
-    );
+
+    const logins = inviteeEmails.map((memberLogin) => PhoneNumber.addSMSDomainIfPhoneNumber(memberLogin));
+    const {newAccountIDs, newLogins} = PersonalDetailsUtils.getNewAccountIDsAndLogins(logins, inviteeAccountIDs);
 
     const participantsAfterInvitation = inviteeAccountIDs.reduce(
         (reportParticipants: Participants, accountID: number) => {
@@ -2665,51 +2913,61 @@ function inviteToRoom(reportID: string, inviteeEmailsToAccountIDs: InvitedEmails
         {...report.participants},
     );
 
-    const logins = inviteeEmails.map((memberLogin) => PhoneNumber.addSMSDomainIfPhoneNumber(memberLogin));
-    const {newAccountIDs, newLogins} = PersonalDetailsUtils.getNewAccountIDsAndLogins(logins, inviteeAccountIDs);
     const newPersonalDetailsOnyxData = PersonalDetailsUtils.getPersonalDetailsOnyxDataForOptimisticUsers(newLogins, newAccountIDs);
     const pendingChatMembers = ReportUtils.getPendingChatMembers(inviteeAccountIDs, report?.pendingChatMembers ?? [], CONST.RED_BRICK_ROAD_PENDING_ACTION.ADD);
 
+    const newParticipantAccountCleanUp = newAccountIDs.reduce<Record<number, null>>((participantCleanUp, newAccountID) => {
+        // eslint-disable-next-line no-param-reassign
+        participantCleanUp[newAccountID] = null;
+        return participantCleanUp;
+    }, {});
+
     const optimisticData: OnyxUpdate[] = [
         {
             onyxMethod: Onyx.METHOD.MERGE,
             key: `${ONYXKEYS.COLLECTION.REPORT}${reportID}`,
             value: {
-                participantAccountIDs: participantAccountIDsAfterInvitation,
-                visibleChatMemberAccountIDs: visibleMemberAccountIDsAfterInvitation,
                 participants: participantsAfterInvitation,
                 pendingChatMembers,
             },
         },
-        ...newPersonalDetailsOnyxData.optimisticData,
     ];
+    optimisticData.push(...newPersonalDetailsOnyxData.optimisticData);
 
+    const successPendingChatMembers = report?.pendingChatMembers
+        ? report?.pendingChatMembers?.filter(
+              (pendingMember) => !(inviteeAccountIDs.includes(Number(pendingMember.accountID)) && pendingMember.pendingAction === CONST.RED_BRICK_ROAD_PENDING_ACTION.DELETE),
+          )
+        : null;
     const successData: OnyxUpdate[] = [
         {
             onyxMethod: Onyx.METHOD.MERGE,
             key: `${ONYXKEYS.COLLECTION.REPORT}${reportID}`,
             value: {
-                pendingChatMembers: report?.pendingChatMembers ?? null,
+                pendingChatMembers: successPendingChatMembers,
+                participants: newParticipantAccountCleanUp,
             },
         },
-        ...newPersonalDetailsOnyxData.finallyData,
     ];
+    successData.push(...newPersonalDetailsOnyxData.finallyData);
+
     const failureData: OnyxUpdate[] = [
         {
             onyxMethod: Onyx.METHOD.MERGE,
             key: `${ONYXKEYS.COLLECTION.REPORT}${reportID}`,
             value: {
-                participantAccountIDs: report.participantAccountIDs,
-                visibleChatMemberAccountIDs: report.visibleChatMemberAccountIDs,
-                participants: inviteeAccountIDs.reduce((revertedParticipants: Record<number, null>, accountID) => {
-                    // eslint-disable-next-line no-param-reassign
-                    revertedParticipants[accountID] = null;
-                    return revertedParticipants;
-                }, {}),
-                pendingChatMembers: report?.pendingChatMembers ?? null,
+                pendingChatMembers:
+                    pendingChatMembers.map((pendingChatMember) => {
+                        if (!inviteeAccountIDs.includes(Number(pendingChatMember.accountID))) {
+                            return pendingChatMember;
+                        }
+                        return {
+                            ...pendingChatMember,
+                            errors: ErrorUtils.getMicroSecondOnyxErrorWithTranslationKey('roomMembersPage.error.genericAdd'),
+                        };
+                    }) ?? null,
             },
         },
-        ...newPersonalDetailsOnyxData.finallyData,
     ];
 
     if (ReportUtils.isGroupChat(report)) {
@@ -2726,31 +2984,65 @@ function inviteToRoom(reportID: string, inviteeEmailsToAccountIDs: InvitedEmails
     const parameters: InviteToRoomParams = {
         reportID,
         inviteeEmails,
+        accountIDList: newAccountIDs.join(),
     };
 
     // eslint-disable-next-line rulesdir/no-multiple-api-calls
     API.write(WRITE_COMMANDS.INVITE_TO_ROOM, parameters, {optimisticData, successData, failureData});
 }
 
+function clearAddRoomMemberError(reportID: string, invitedAccountID: string) {
+    const report = ReportConnection.getAllReports()?.[`${ONYXKEYS.COLLECTION.REPORT}${reportID}`];
+    Onyx.merge(`${ONYXKEYS.COLLECTION.REPORT}${reportID}`, {
+        pendingChatMembers: report?.pendingChatMembers?.filter((pendingChatMember) => pendingChatMember.accountID !== invitedAccountID),
+        participants: {
+            [invitedAccountID]: null,
+        },
+    });
+    Onyx.merge(ONYXKEYS.PERSONAL_DETAILS_LIST, {
+        [invitedAccountID]: null,
+    });
+}
+
 function updateGroupChatMemberRoles(reportID: string, accountIDList: number[], role: ValueOf<typeof CONST.REPORT.ROLE>) {
-    const participants: Participants = {};
     const memberRoles: Record<number, string> = {};
+    const optimisticParticipants: Participants = {};
+    const successParticipants: Participants = {};
+
     accountIDList.forEach((accountID) => {
         memberRoles[accountID] = role;
-        participants[accountID] = {role};
+        optimisticParticipants[accountID] = {
+            role,
+            pendingFields: {
+                role: CONST.RED_BRICK_ROAD_PENDING_ACTION.UPDATE,
+            },
+            pendingAction: CONST.RED_BRICK_ROAD_PENDING_ACTION.UPDATE,
+        };
+        successParticipants[accountID] = {
+            pendingFields: {
+                role: null,
+            },
+            pendingAction: null,
+        };
     });
 
     const optimisticData: OnyxUpdate[] = [
         {
             onyxMethod: Onyx.METHOD.MERGE,
             key: `${ONYXKEYS.COLLECTION.REPORT}${reportID}`,
-            value: {
-                participants,
-            },
+            value: {participants: optimisticParticipants},
+        },
+    ];
+
+    const successData: OnyxUpdate[] = [
+        {
+            onyxMethod: Onyx.METHOD.MERGE,
+            key: `${ONYXKEYS.COLLECTION.REPORT}${reportID}`,
+            value: {participants: successParticipants},
         },
     ];
     const parameters: UpdateGroupChatMemberRolesParams = {reportID, memberRoles: JSON.stringify(memberRoles)};
-    API.write(WRITE_COMMANDS.UPDATE_GROUP_CHAT_MEMBER_ROLES, parameters, {optimisticData});
+    API.write(WRITE_COMMANDS.UPDATE_GROUP_CHAT_MEMBER_ROLES, parameters, {optimisticData, successData});
 }
 
 /** Invites people to a group chat */
@@ -2762,30 +3054,12 @@ function inviteToGroupChat(reportID: string, inviteeEmailsToAccountIDs: InvitedE
  *  Please see https://github.com/Expensify/App/blob/main/README.md#Security for more details
  */
 function removeFromRoom(reportID: string, targetAccountIDs: number[]) {
-    const report = currentReportData?.[reportID];
+    const report = ReportConnection.getAllReports()?.[`${ONYXKEYS.COLLECTION.REPORT}${reportID}`];
     if (!report) {
         return;
     }
 
     const removeParticipantsData: Record<number, null> = {};
-    const currentParticipants = ReportUtils.getParticipants(reportID);
-    if (!currentParticipants) {
-        return;
-    }
-
-    const currentParticipantAccountIDs = ReportUtils.getParticipantAccountIDs(reportID);
-    const participantAccountIDsAfterRemoval: number[] = [];
-    const visibleChatMemberAccountIDsAfterRemoval: number[] = [];
-    currentParticipantAccountIDs.forEach((participantAccountID: number) => {
-        const participant = currentParticipants[participantAccountID];
-        if (!targetAccountIDs.includes(participantAccountID)) {
-            participantAccountIDsAfterRemoval.push(participantAccountID);
-            if (!participant.hidden) {
-                visibleChatMemberAccountIDsAfterRemoval.push(participantAccountID);
-            }
-        }
-    });
-
     targetAccountIDs.forEach((accountID) => {
         removeParticipantsData[accountID] = null;
     });
@@ -2819,8 +3093,6 @@ function removeFromRoom(reportID: string, targetAccountIDs: number[]) {
             key: `${ONYXKEYS.COLLECTION.REPORT}${reportID}`,
             value: {
                 participants: removeParticipantsData,
-                participantAccountIDs: participantAccountIDsAfterRemoval,
-                visibleChatMemberAccountIDs: visibleChatMemberAccountIDsAfterRemoval,
                 pendingChatMembers: report?.pendingChatMembers ?? null,
             },
         },
@@ -2863,9 +3135,9 @@ function openLastOpenedPublicRoom(lastOpenedPublicRoomID: string) {
 /** Flag a comment as offensive */
 function flagComment(reportID: string, reportAction: OnyxEntry<ReportAction>, severity: string) {
     const originalReportID = ReportUtils.getOriginalReportID(reportID, reportAction);
-    const message = reportAction?.message?.[0];
+    const message = ReportActionsUtils.getReportActionMessage(reportAction);
 
-    if (!message) {
+    if (!message || !reportAction) {
         return;
     }
 
@@ -2984,7 +3256,7 @@ const updatePrivateNotes = (reportID: string, accountID: number, note: string) =
             value: {
                 privateNotes: {
                     [accountID]: {
-                        errors: ErrorUtils.getMicroSecondOnyxError('privateNotes.error.genericFailureMessage'),
+                        errors: ErrorUtils.getMicroSecondOnyxErrorWithTranslationKey('privateNotes.error.genericFailureMessage'),
                     },
                 },
             },
@@ -3045,29 +3317,32 @@ function completeOnboarding(
     engagementChoice: OnboardingPurposeType,
     data: ValueOf<typeof CONST.ONBOARDING_MESSAGES>,
     {
-        login,
         firstName,
         lastName,
     }: {
-        login: string;
         firstName: string;
         lastName: string;
     },
     adminsChatReportID?: string,
+    onboardingPolicyID?: string,
 ) {
-    const targetEmail = CONST.EMAIL.CONCIERGE;
+    const isAccountIDOdd = AccountUtils.isAccountIDOddNumber(currentUserAccountID ?? 0);
+    const targetEmail = isAccountIDOdd ? CONST.EMAIL.NOTIFICATIONS : CONST.EMAIL.CONCIERGE;
+
+    // If the target report isn't opened, the permission field will not exist. So we should add the fallback permission for task report
+    const fallbackPermission = isAccountIDOdd ? [CONST.REPORT.PERMISSIONS.READ] : [CONST.REPORT.PERMISSIONS.READ, CONST.REPORT.PERMISSIONS.WRITE];
+
     const actorAccountID = PersonalDetailsUtils.getAccountIDsByLogins([targetEmail])[0];
-    const targetChatReport = ReportUtils.getChatByParticipants([actorAccountID]);
+    const targetChatReport = ReportUtils.getChatByParticipants([actorAccountID, currentUserAccountID]);
     const {reportID: targetChatReportID = '', policyID: targetChatPolicyID = ''} = targetChatReport ?? {};
 
-    // Mention message
-    const mentionHandle = LoginUtils.isEmailPublicDomain(login) ? login : login.split('@')[0];
-    const mentionComment = ReportUtils.buildOptimisticAddCommentReportAction(`Hey @${mentionHandle} 👋`, undefined, actorAccountID);
-    const mentionCommentAction: OptimisticAddCommentReportAction = mentionComment.reportAction;
-    const mentionMessage: AddCommentOrAttachementParams = {
+    // Introductory message
+    const introductionComment = ReportUtils.buildOptimisticAddCommentReportAction(CONST.ONBOARDING_INTRODUCTION, undefined, actorAccountID);
+    const introductionCommentAction: OptimisticAddCommentReportAction = introductionComment.reportAction;
+    const introductionMessage: AddCommentOrAttachementParams = {
         reportID: targetChatReportID,
-        reportActionID: mentionCommentAction.reportActionID,
-        reportComment: mentionComment.commentText,
+        reportActionID: introductionCommentAction.reportActionID,
+        reportComment: introductionComment.commentText,
     };
 
     // Text message
@@ -3095,13 +3370,13 @@ function completeOnboarding(
         const taskDescription =
             typeof task.description === 'function'
                 ? task.description({
-                      adminsRoomLink: `${CONFIG.EXPENSIFY.NEW_EXPENSIFY_URL}${ROUTES.REPORT_WITH_ID.getRoute(adminsChatReportID ?? '')}`,
-                      guideCalendarLink: guideCalendarLink ?? CONFIG.EXPENSIFY.NEW_EXPENSIFY_URL,
+                      adminsRoomLink: `${CONFIG.EXPENSIFY.NEW_EXPENSIFY_URL}${ROUTES.REPORT_WITH_ID.getRoute(adminsChatReportID ?? '-1')}`,
+                      workspaceLink: `${CONFIG.EXPENSIFY.NEW_EXPENSIFY_URL}${ROUTES.WORKSPACE_INITIAL.getRoute(onboardingPolicyID ?? '-1')}`,
                   })
                 : task.description;
         const currentTask = ReportUtils.buildOptimisticTaskReport(
             actorAccountID,
-            undefined,
+            currentUserAccountID,
             targetChatReportID,
             task.title,
             taskDescription,
@@ -3118,6 +3393,7 @@ function completeOnboarding(
             actorAccountID,
             index + 3,
         );
+        currentTask.parentReportActionID = taskReportAction.reportAction.reportActionID;
 
         const completedTaskReportAction = task.autoCompleted
             ? ReportUtils.buildOptimisticTaskReportAction(currentTask.reportID, CONST.REPORT.ACTIONS.TYPE.TASK_COMPLETED, 'marked as complete', actorAccountID, 2)
@@ -3128,7 +3404,7 @@ function completeOnboarding(
             currentTask,
             taskCreatedAction,
             taskReportAction,
-            taskDescription,
+            taskDescription: currentTask.description,
             completedTaskReportAction,
         };
     });
@@ -3137,18 +3413,19 @@ function completeOnboarding(
         type: 'task',
         task: task.type,
         taskReportID: currentTask.reportID,
-        parentReportID: currentTask.parentReportID ?? '',
+        parentReportID: currentTask.parentReportID ?? '-1',
         parentReportActionID: taskReportAction.reportAction.reportActionID,
         assigneeChatReportID: '',
         createdTaskReportActionID: taskCreatedAction.reportActionID,
         completedTaskReportActionID: completedTaskReportAction?.reportActionID ?? undefined,
         title: currentTask.reportName ?? '',
-        description: taskDescription,
+        description: taskDescription ?? '',
     }));
 
+    const hasOutstandingChildTask = tasksData.some((task) => !task.completedTaskReportAction);
+
     const tasksForOptimisticData = tasksData.reduce<OnyxUpdate[]>((acc, {currentTask, taskCreatedAction, taskReportAction, taskDescription, completedTaskReportAction}) => {
-        const tasksForOptimisticDataAcc: OnyxUpdate[] = [
-            ...acc,
+        acc.push(
             {
                 onyxMethod: Onyx.METHOD.MERGE,
                 key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${targetChatReportID}`,
@@ -3169,6 +3446,8 @@ function completeOnboarding(
                         managerID: CONST.RED_BRICK_ROAD_PENDING_ACTION.ADD,
                     },
                     isOptimisticReport: true,
+                    managerID: currentUserAccountID,
+                    permissions: targetChatReport?.permissions ?? fallbackPermission,
                 },
             },
             {
@@ -3178,10 +3457,10 @@ function completeOnboarding(
                     [taskCreatedAction.reportActionID]: taskCreatedAction as ReportAction,
                 },
             },
-        ];
+        );
 
         if (completedTaskReportAction) {
-            tasksForOptimisticDataAcc.push({
+            acc.push({
                 onyxMethod: Onyx.METHOD.MERGE,
                 key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${currentTask.reportID}`,
                 value: {
@@ -3189,28 +3468,28 @@ function completeOnboarding(
                 },
             });
 
-            tasksForOptimisticDataAcc.push({
+            acc.push({
                 onyxMethod: Onyx.METHOD.MERGE,
                 key: `${ONYXKEYS.COLLECTION.REPORT}${currentTask.reportID}`,
                 value: {
                     stateNum: CONST.REPORT.STATE_NUM.APPROVED,
                     statusNum: CONST.REPORT.STATUS_NUM.APPROVED,
+                    managerID: currentUserAccountID,
                 },
             });
         }
 
-        return tasksForOptimisticDataAcc;
+        return acc;
     }, []);
 
     const tasksForFailureData = tasksData.reduce<OnyxUpdate[]>((acc, {currentTask, taskReportAction}) => {
-        const tasksForFailureDataAcc: OnyxUpdate[] = [
-            ...acc,
+        acc.push(
             {
                 onyxMethod: Onyx.METHOD.MERGE,
                 key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${targetChatReportID}`,
                 value: {
                     [taskReportAction.reportAction.reportActionID]: {
-                        errors: ErrorUtils.getMicroSecondOnyxError('report.genericAddCommentFailureMessage'),
+                        errors: ErrorUtils.getMicroSecondOnyxErrorWithTranslationKey('report.genericAddCommentFailureMessage'),
                     } as ReportAction,
                 },
             },
@@ -3224,25 +3503,70 @@ function completeOnboarding(
                 key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${currentTask.reportID}`,
                 value: null,
             },
-        ];
+        );
 
-        return tasksForFailureDataAcc;
+        return acc;
     }, []);
 
-    const optimisticData: OnyxUpdate[] = [
-        ...tasksForOptimisticData,
+    const tasksForSuccessData = tasksData.reduce<OnyxUpdate[]>((acc, {currentTask, taskCreatedAction, taskReportAction, completedTaskReportAction}) => {
+        acc.push(
+            {
+                onyxMethod: Onyx.METHOD.MERGE,
+                key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${targetChatReportID}`,
+                value: {
+                    [taskReportAction.reportAction.reportActionID]: {pendingAction: null},
+                },
+            },
+            {
+                onyxMethod: Onyx.METHOD.MERGE,
+                key: `${ONYXKEYS.COLLECTION.REPORT}${currentTask.reportID}`,
+                value: {
+                    pendingFields: {
+                        createChat: null,
+                        reportName: null,
+                        description: null,
+                        managerID: null,
+                    },
+                    isOptimisticReport: false,
+                },
+            },
+            {
+                onyxMethod: Onyx.METHOD.MERGE,
+                key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${currentTask.reportID}`,
+                value: {
+                    [taskCreatedAction.reportActionID]: {pendingAction: null},
+                },
+            },
+        );
+
+        if (completedTaskReportAction) {
+            acc.push({
+                onyxMethod: Onyx.METHOD.MERGE,
+                key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${currentTask.reportID}`,
+                value: {
+                    [completedTaskReportAction.reportActionID]: {pendingAction: null},
+                },
+            });
+        }
+
+        return acc;
+    }, []);
+
+    const optimisticData: OnyxUpdate[] = [...tasksForOptimisticData];
+    optimisticData.push(
         {
             onyxMethod: Onyx.METHOD.MERGE,
             key: `${ONYXKEYS.COLLECTION.REPORT}${targetChatReportID}`,
             value: {
                 lastMentionedTime: DateUtils.getDBTime(),
+                hasOutstandingChildTask,
             },
         },
         {
             onyxMethod: Onyx.METHOD.MERGE,
             key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${targetChatReportID}`,
             value: {
-                [mentionCommentAction.reportActionID]: mentionCommentAction as ReportAction,
+                [introductionCommentAction.reportActionID]: introductionCommentAction as ReportAction,
                 [textCommentAction.reportActionID]: textCommentAction as ReportAction,
             },
         },
@@ -3251,21 +3575,23 @@ function completeOnboarding(
             key: ONYXKEYS.NVP_INTRO_SELECTED,
             value: {choice: engagementChoice},
         },
-    ];
-    const successData: OnyxUpdate[] = [
-        {
-            onyxMethod: Onyx.METHOD.MERGE,
-            key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${targetChatReportID}`,
-            value: {
-                [mentionCommentAction.reportActionID]: {pendingAction: null},
-                [textCommentAction.reportActionID]: {pendingAction: null},
-            },
+    );
+
+    const successData: OnyxUpdate[] = [...tasksForSuccessData];
+    successData.push({
+        onyxMethod: Onyx.METHOD.MERGE,
+        key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${targetChatReportID}`,
+        value: {
+            [introductionCommentAction.reportActionID]: {pendingAction: null},
+            [textCommentAction.reportActionID]: {pendingAction: null},
         },
-    ];
+    });
+
     let failureReport: Partial<Report> = {
         lastMessageTranslationKey: '',
         lastMessageText: '',
         lastVisibleActionCreated: '',
+        hasOutstandingChildTask: false,
     };
     const {lastMessageText = '', lastMessageTranslationKey = ''} = ReportActionsUtils.getLastVisibleMessage(targetChatReportID);
     if (lastMessageText || lastMessageTranslationKey) {
@@ -3280,8 +3606,8 @@ function completeOnboarding(
         };
     }
 
-    const failureData: OnyxUpdate[] = [
-        ...tasksForFailureData,
+    const failureData: OnyxUpdate[] = [...tasksForFailureData];
+    failureData.push(
         {
             onyxMethod: Onyx.METHOD.MERGE,
             key: `${ONYXKEYS.COLLECTION.REPORT}${targetChatReportID}`,
@@ -3291,11 +3617,11 @@ function completeOnboarding(
             onyxMethod: Onyx.METHOD.MERGE,
             key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${targetChatReportID}`,
             value: {
-                [mentionCommentAction.reportActionID]: {
-                    errors: ErrorUtils.getMicroSecondOnyxError('report.genericAddCommentFailureMessage'),
+                [introductionCommentAction.reportActionID]: {
+                    errors: ErrorUtils.getMicroSecondOnyxErrorWithTranslationKey('report.genericAddCommentFailureMessage'),
                 } as ReportAction,
                 [textCommentAction.reportActionID]: {
-                    errors: ErrorUtils.getMicroSecondOnyxError('report.genericAddCommentFailureMessage'),
+                    errors: ErrorUtils.getMicroSecondOnyxErrorWithTranslationKey('report.genericAddCommentFailureMessage'),
                 } as ReportAction,
             },
         },
@@ -3304,10 +3630,10 @@ function completeOnboarding(
             key: ONYXKEYS.NVP_INTRO_SELECTED,
             value: {choice: null},
         },
-    ];
+    );
 
     const guidedSetupData: GuidedSetupData = [
-        {type: 'message', ...mentionMessage},
+        {type: 'message', ...introductionMessage},
         {type: 'message', ...textMessage},
     ];
 
@@ -3333,7 +3659,7 @@ function completeOnboarding(
             key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${targetChatReportID}`,
             value: {
                 [videoCommentAction.reportActionID]: {
-                    errors: ErrorUtils.getMicroSecondOnyxError('report.genericAddCommentFailureMessage'),
+                    errors: ErrorUtils.getMicroSecondOnyxErrorWithTranslationKey('report.genericAddCommentFailureMessage'),
                 } as ReportAction,
             },
         });
@@ -3347,132 +3673,13 @@ function completeOnboarding(
         engagementChoice,
         firstName,
         lastName,
+        actorAccountID,
         guidedSetupData: JSON.stringify(guidedSetupData),
     };
 
     API.write(WRITE_COMMANDS.COMPLETE_GUIDED_SETUP, parameters, {optimisticData, successData, failureData});
 }
 
-/**
- * Completes the engagement modal that new NewDot users see when they first sign up/log in by doing the following:
- *
- * - Sets the introSelected NVP to the choice the user made
- * - Creates an optimistic report comment from concierge
- */
-function completeEngagementModal(choice: OnboardingPurposeType, text?: string) {
-    const conciergeAccountID = PersonalDetailsUtils.getAccountIDsByLogins([CONST.EMAIL.CONCIERGE])[0];
-
-    // We do not need to send any message for some choices
-    if (!text) {
-        const parameters: CompleteEngagementModalParams = {
-            reportID: conciergeChatReportID ?? '',
-            engagementChoice: choice,
-        };
-
-        const optimisticData: OnyxUpdate[] = [
-            {
-                onyxMethod: Onyx.METHOD.MERGE,
-                key: ONYXKEYS.NVP_INTRO_SELECTED,
-                value: {choice},
-            },
-        ];
-        API.write(WRITE_COMMANDS.COMPLETE_ENGAGEMENT_MODAL, parameters, {
-            optimisticData,
-        });
-        return;
-    }
-
-    const reportComment = ReportUtils.buildOptimisticAddCommentReportAction(text, undefined, conciergeAccountID);
-    const reportCommentAction: OptimisticAddCommentReportAction = reportComment.reportAction;
-    const lastComment = reportCommentAction?.message?.[0];
-    const lastCommentText = ReportUtils.formatReportLastMessageText(lastComment?.text ?? '');
-    const reportCommentText = reportComment.commentText;
-    const currentTime = DateUtils.getDBTime();
-
-    const optimisticReport: Partial<Report> = {
-        lastVisibleActionCreated: currentTime,
-        lastMessageTranslationKey: lastComment?.translationKey ?? '',
-        lastMessageText: lastCommentText,
-        lastMessageHtml: lastCommentText,
-        lastActorAccountID: currentUserAccountID,
-        lastReadTime: currentTime,
-    };
-
-    const conciergeChatReport = ReportUtils.getChatByParticipants([conciergeAccountID]);
-    conciergeChatReportID = conciergeChatReport?.reportID;
-
-    const report = ReportUtils.getReport(conciergeChatReportID);
-
-    if (!isEmptyObject(report) && ReportUtils.getReportNotificationPreference(report) === CONST.REPORT.NOTIFICATION_PREFERENCE.HIDDEN) {
-        optimisticReport.notificationPreference = CONST.REPORT.NOTIFICATION_PREFERENCE.ALWAYS;
-    }
-
-    // Optimistically add the new actions to the store before waiting to save them to the server
-    const optimisticReportActions: OnyxCollection<OptimisticAddCommentReportAction> = {};
-    if (reportCommentAction?.reportActionID) {
-        optimisticReportActions[reportCommentAction.reportActionID] = reportCommentAction;
-    }
-
-    const parameters: CompleteEngagementModalParams = {
-        reportID: conciergeChatReportID ?? '',
-        reportActionID: reportCommentAction.reportActionID,
-        reportComment: reportCommentText,
-        engagementChoice: choice,
-    };
-
-    const optimisticData: OnyxUpdate[] = [
-        {
-            onyxMethod: Onyx.METHOD.MERGE,
-            key: `${ONYXKEYS.COLLECTION.REPORT}${conciergeChatReportID}`,
-            value: optimisticReport,
-        },
-        {
-            onyxMethod: Onyx.METHOD.MERGE,
-            key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${conciergeChatReportID}`,
-            value: optimisticReportActions as ReportActions,
-        },
-        {
-            onyxMethod: Onyx.METHOD.MERGE,
-            key: ONYXKEYS.NVP_INTRO_SELECTED,
-            value: {choice},
-        },
-    ];
-
-    const successData: OnyxUpdate[] = [
-        {
-            onyxMethod: Onyx.METHOD.MERGE,
-            key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${conciergeChatReportID}`,
-            value: {[reportCommentAction.reportActionID ?? '']: {pendingAction: null}},
-        },
-    ];
-
-    // eslint-disable-next-line rulesdir/no-multiple-api-calls
-    API.write(WRITE_COMMANDS.COMPLETE_ENGAGEMENT_MODAL, parameters, {
-        optimisticData,
-        successData,
-    });
-    notifyNewAction(conciergeChatReportID ?? '', reportCommentAction.actorAccountID, reportCommentAction.reportActionID);
-}
-
-function dismissEngagementModal() {
-    const parameters: SetNameValuePairParams = {
-        name: ONYXKEYS.NVP_HAS_DISMISSED_IDLE_PANEL,
-        value: true,
-    };
-
-    const optimisticData: OnyxUpdate[] = [
-        {
-            onyxMethod: Onyx.METHOD.MERGE,
-            key: ONYXKEYS.NVP_HAS_DISMISSED_IDLE_PANEL,
-            value: true,
-        },
-    ];
-
-    API.write(WRITE_COMMANDS.SET_NAME_VALUE_PAIR, parameters, {
-        optimisticData,
-    });
-}
-
 /** Loads necessary data for rendering the RoomMembersPage */
 function openRoomMembersPage(reportID: string) {
     const parameters: OpenRoomMembersPageParams = {reportID};
@@ -3530,8 +3737,13 @@ function searchForReports(searchInput: string, policyID?: string) {
         },
     ];
 
-    const searchForRoomToMentionParams: SearchForRoomsToMentionParams = {query: searchInput, policyID: policyID ?? ''};
-    const searchForReportsParams: SearchForReportsParams = {searchInput};
+    const searchForRoomToMentionParams: SearchForRoomsToMentionParams = {query: searchInput, policyID: policyID ?? '-1'};
+    const searchForReportsParams: SearchForReportsParams = {searchInput, canCancel: true};
+
+    // We want to cancel all pending SearchForReports API calls before making another one
+    if (!policyID) {
+        HttpUtils.cancelPendingRequests(READ_COMMANDS.SEARCH_FOR_REPORTS);
+    }
 
     API.read(policyID ? READ_COMMANDS.SEARCH_FOR_ROOMS_TO_MENTION : READ_COMMANDS.SEARCH_FOR_REPORTS, policyID ? searchForRoomToMentionParams : searchForReportsParams, {
         successData,
@@ -3559,6 +3771,13 @@ function updateLastVisitTime(reportID: string) {
     Onyx.merge(`${ONYXKEYS.COLLECTION.REPORT_METADATA}${reportID}`, {lastVisitTime: DateUtils.getDBTime()});
 }
 
+function updateLoadingInitialReportAction(reportID: string) {
+    if (!ReportUtils.isValidReportIDFromPath(reportID)) {
+        return;
+    }
+    Onyx.merge(`${ONYXKEYS.COLLECTION.REPORT_METADATA}${reportID}`, {isLoadingInitialReportActions: false});
+}
+
 function clearNewRoomFormError() {
     Onyx.set(ONYXKEYS.FORMS.NEW_ROOM_FORM, {
         isLoading: false,
@@ -3573,8 +3792,8 @@ function clearNewRoomFormError() {
 }
 
 function resolveActionableMentionWhisper(reportId: string, reportAction: OnyxEntry<ReportAction>, resolution: ValueOf<typeof CONST.REPORT.ACTIONABLE_MENTION_WHISPER_RESOLUTION>) {
-    const message = reportAction?.message?.[0];
-    if (!message) {
+    const message = ReportActionsUtils.getReportActionMessage(reportAction);
+    if (!message || !reportAction) {
         return;
     }
 
@@ -3583,6 +3802,24 @@ function resolveActionableMentionWhisper(reportId: string, reportAction: OnyxEnt
         resolution,
     };
 
+    const optimisticReportActions = {
+        [reportAction.reportActionID]: {
+            originalMessage: {
+                resolution,
+            },
+        },
+    };
+
+    const reportUpdateDataWithPreviousLastMessage = ReportUtils.getReportLastMessage(reportId, optimisticReportActions as ReportActions);
+
+    const report = ReportConnection.getAllReports()?.[`${ONYXKEYS.COLLECTION.REPORT}${reportId}`];
+    const reportUpdateDataWithCurrentLastMessage = {
+        lastMessageTranslationKey: report?.lastMessageTranslationKey,
+        lastMessageText: report?.lastMessageText,
+        lastVisibleActionCreated: report?.lastVisibleActionCreated,
+        lastActorAccountID: report?.lastActorAccountID,
+    };
+
     const optimisticData: OnyxUpdate[] = [
         {
             onyxMethod: Onyx.METHOD.MERGE,
@@ -3596,6 +3833,11 @@ function resolveActionableMentionWhisper(reportId: string, reportAction: OnyxEnt
                 },
             },
         },
+        {
+            onyxMethod: Onyx.METHOD.MERGE,
+            key: `${ONYXKEYS.COLLECTION.REPORT}${reportId}`,
+            value: reportUpdateDataWithPreviousLastMessage,
+        },
     ];
 
     const failureData: OnyxUpdate[] = [
@@ -3611,6 +3853,11 @@ function resolveActionableMentionWhisper(reportId: string, reportAction: OnyxEnt
                 },
             },
         },
+        {
+            onyxMethod: Onyx.METHOD.MERGE,
+            key: `${ONYXKEYS.COLLECTION.REPORT}${reportId}`,
+            value: reportUpdateDataWithCurrentLastMessage, // revert back to the current report last message data in case of failure
+        },
     ];
 
     const parameters: ResolveActionableMentionWhisperParams = {
@@ -3621,9 +3868,83 @@ function resolveActionableMentionWhisper(reportId: string, reportAction: OnyxEnt
     API.write(WRITE_COMMANDS.RESOLVE_ACTIONABLE_MENTION_WHISPER, parameters, {optimisticData, failureData});
 }
 
+function resolveActionableReportMentionWhisper(
+    reportId: string,
+    reportAction: OnyxEntry<ReportAction>,
+    resolution: ValueOf<typeof CONST.REPORT.ACTIONABLE_REPORT_MENTION_WHISPER_RESOLUTION>,
+) {
+    if (!reportAction) {
+        return;
+    }
+
+    const optimisticReportActions = {
+        [reportAction.reportActionID]: {
+            originalMessage: {
+                resolution,
+            },
+        },
+    };
+
+    const reportUpdateDataWithPreviousLastMessage = ReportUtils.getReportLastMessage(reportId, optimisticReportActions as ReportActions);
+
+    const report = ReportConnection.getAllReports()?.[`${ONYXKEYS.COLLECTION.REPORT}${reportId}`];
+    const reportUpdateDataWithCurrentLastMessage = {
+        lastMessageTranslationKey: report?.lastMessageTranslationKey,
+        lastMessageText: report?.lastMessageText,
+        lastVisibleActionCreated: report?.lastVisibleActionCreated,
+        lastActorAccountID: report?.lastActorAccountID,
+    };
+
+    const optimisticData: OnyxUpdate[] = [
+        {
+            onyxMethod: Onyx.METHOD.MERGE,
+            key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${reportId}`,
+            value: {
+                [reportAction.reportActionID]: {
+                    originalMessage: {
+                        resolution,
+                    },
+                },
+            } as ReportActions,
+        },
+        {
+            onyxMethod: Onyx.METHOD.MERGE,
+            key: `${ONYXKEYS.COLLECTION.REPORT}${reportId}`,
+            value: reportUpdateDataWithPreviousLastMessage,
+        },
+    ];
+
+    const failureData: OnyxUpdate[] = [
+        {
+            onyxMethod: Onyx.METHOD.MERGE,
+            key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${reportId}`,
+            value: {
+                [reportAction.reportActionID]: {
+                    originalMessage: {
+                        resolution: null,
+                    },
+                },
+            },
+        },
+        {
+            onyxMethod: Onyx.METHOD.MERGE,
+            key: `${ONYXKEYS.COLLECTION.REPORT}${reportId}`,
+            value: reportUpdateDataWithCurrentLastMessage, // revert back to the current report last message data in case of failure
+        },
+    ];
+
+    const parameters: ResolveActionableReportMentionWhisperParams = {
+        reportActionID: reportAction.reportActionID,
+        resolution,
+    };
+
+    API.write(WRITE_COMMANDS.RESOLVE_ACTIONABLE_REPORT_MENTION_WHISPER, parameters, {optimisticData, failureData});
+}
+
 function dismissTrackExpenseActionableWhisper(reportID: string, reportAction: OnyxEntry<ReportAction>): void {
-    const message = reportAction?.message?.[0];
-    if (!message) {
+    const isArrayMessage = Array.isArray(reportAction?.message);
+    const message = ReportActionsUtils.getReportActionMessage(reportAction);
+    if (!message || !reportAction) {
         return;
     }
 
@@ -3638,7 +3959,7 @@ function dismissTrackExpenseActionableWhisper(reportID: string, reportAction: On
             key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${reportID}`,
             value: {
                 [reportAction.reportActionID]: {
-                    message: [updatedMessage],
+                    message: isArrayMessage ? [updatedMessage] : updatedMessage,
                     originalMessage: {
                         resolution: CONST.REPORT.ACTIONABLE_TRACK_EXPENSE_WHISPER_RESOLUTION.NOTHING,
                     },
@@ -3673,6 +3994,97 @@ function setGroupDraft(newGroupDraft: Partial<NewGroupChatDraft>) {
     Onyx.merge(ONYXKEYS.NEW_GROUP_CHAT_DRAFT, newGroupDraft);
 }
 
+function exportToIntegration(reportID: string, connectionName: ConnectionName) {
+    const action = ReportUtils.buildOptimisticExportIntegrationAction(connectionName);
+    const optimisticReportActionID = action.reportActionID;
+
+    const optimisticData: OnyxUpdate[] = [
+        {
+            onyxMethod: Onyx.METHOD.MERGE,
+            key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${reportID}`,
+            value: {
+                [optimisticReportActionID]: action,
+            },
+        },
+    ];
+
+    const failureData: OnyxUpdate[] = [
+        {
+            onyxMethod: Onyx.METHOD.MERGE,
+            key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${reportID}`,
+            value: {
+                [optimisticReportActionID]: {
+                    errors: ErrorUtils.getMicroSecondOnyxErrorWithTranslationKey('common.genericErrorMessage'),
+                },
+            },
+        },
+    ];
+
+    const params = {
+        reportIDList: reportID,
+        connectionName,
+        type: 'MANUAL',
+        optimisticReportActions: JSON.stringify({
+            [reportID]: optimisticReportActionID,
+        }),
+    } satisfies ReportExportParams;
+
+    API.write(WRITE_COMMANDS.REPORT_EXPORT, params, {optimisticData, failureData});
+}
+
+function markAsManuallyExported(reportID: string, connectionName: ConnectionName) {
+    const action = ReportUtils.buildOptimisticExportIntegrationAction(connectionName, true);
+    const label = CONST.POLICY.CONNECTIONS.NAME_USER_FRIENDLY[connectionName];
+    const optimisticReportActionID = action.reportActionID;
+
+    const optimisticData: OnyxUpdate[] = [
+        {
+            onyxMethod: Onyx.METHOD.MERGE,
+            key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${reportID}`,
+            value: {
+                [optimisticReportActionID]: action,
+            },
+        },
+    ];
+
+    const successData: OnyxUpdate[] = [
+        {
+            onyxMethod: Onyx.METHOD.MERGE,
+            key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${reportID}`,
+            value: {
+                [optimisticReportActionID]: {
+                    pendingAction: null,
+                },
+            },
+        },
+    ];
+
+    const failureData: OnyxUpdate[] = [
+        {
+            onyxMethod: Onyx.METHOD.MERGE,
+            key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${reportID}`,
+            value: {
+                [optimisticReportActionID]: {
+                    errors: ErrorUtils.getMicroSecondOnyxErrorWithTranslationKey('common.genericErrorMessage'),
+                },
+            },
+        },
+    ];
+
+    const params = {
+        markedManually: true,
+        data: JSON.stringify([
+            {
+                reportID,
+                label,
+                optimisticReportActionID,
+            },
+        ]),
+    } satisfies MarkAsExportedParams;
+
+    API.write(WRITE_COMMANDS.MARK_AS_EXPORTED, params, {optimisticData, successData, failureData});
+}
+
 export {
     searchInServer,
     addComment,
@@ -3694,6 +4106,7 @@ export {
     saveReportActionDraft,
     deleteReportComment,
     navigateToConciergeChat,
+    navigateToSystemChat,
     addPolicyReport,
     deleteReport,
     navigateToConciergeChatAndDeleteReport,
@@ -3709,13 +4122,14 @@ export {
     toggleSubscribeToChildReport,
     updatePolicyRoomNameAndNavigate,
     clearPolicyRoomNameErrors,
-    clearReportNotFoundErrors,
     clearIOUError,
     subscribeToNewActionEvent,
     notifyNewAction,
     showReportActionNotification,
     toggleEmojiReaction,
     shouldShowReportActionNotification,
+    getMostRecentReportID,
+    joinRoom,
     leaveRoom,
     inviteToRoom,
     inviteToGroupChat,
@@ -3730,8 +4144,6 @@ export {
     hasErrorInPrivateNotes,
     getOlderActions,
     getNewerActions,
-    completeEngagementModal,
-    dismissEngagementModal,
     openRoomMembersPage,
     savePrivateNotesDraft,
     getDraftPrivateNote,
@@ -3740,8 +4152,9 @@ export {
     updateReportField,
     updateReportName,
     deleteReportField,
-    clearReportFieldErrors,
+    clearReportFieldKeyErrors,
     resolveActionableMentionWhisper,
+    resolveActionableReportMentionWhisper,
     updateRoomVisibility,
     dismissTrackExpenseActionableWhisper,
     setGroupDraft,
@@ -3753,5 +4166,10 @@ export {
     leaveGroupChat,
     removeFromGroupChat,
     updateGroupChatMemberRoles,
+    updateLoadingInitialReportAction,
+    clearAddRoomMemberError,
     clearAvatarErrors,
+    exportToIntegration,
+    markAsManuallyExported,
+    handleReportChanged,
 };
diff --git a/src/libs/actions/ReportActions.ts b/src/libs/actions/ReportActions.ts
index 217dd0b12100..ed8d4886659c 100644
--- a/src/libs/actions/ReportActions.ts
+++ b/src/libs/actions/ReportActions.ts
@@ -1,15 +1,23 @@
 import type {OnyxCollection} from 'react-native-onyx';
 import Onyx from 'react-native-onyx';
 import * as ReportActionUtils from '@libs/ReportActionsUtils';
+import * as ReportConnection from '@libs/ReportConnection';
 import * as ReportUtils from '@libs/ReportUtils';
 import CONST from '@src/CONST';
 import ONYXKEYS from '@src/ONYXKEYS';
-import type {ReportActions} from '@src/types/onyx/ReportAction';
+import type {ReportActions} from '@src/types/onyx';
 import type ReportAction from '@src/types/onyx/ReportAction';
 import * as Report from './Report';
 
 type IgnoreDirection = 'parent' | 'child';
 
+let allReportActions: OnyxCollection<ReportActions>;
+Onyx.connect({
+    key: ONYXKEYS.COLLECTION.REPORT_ACTIONS,
+    waitForCollectionCallback: true,
+    callback: (value) => (allReportActions = value),
+});
+
 function clearReportActionErrors(reportID: string, reportAction: ReportAction, keys?: string[]) {
     const originalReportID = ReportUtils.getOriginalReportID(reportID, reportAction);
 
@@ -24,13 +32,14 @@ function clearReportActionErrors(reportID: string, reportAction: ReportAction, k
         });
 
         // If there's a linked transaction, delete that too
-        const linkedTransactionID = ReportActionUtils.getLinkedTransactionID(reportAction.reportActionID, originalReportID ?? '');
+        // eslint-disable-next-line @typescript-eslint/prefer-nullish-coalescing
+        const linkedTransactionID = ReportActionUtils.getLinkedTransactionID(reportAction.reportActionID, originalReportID || '-1');
         if (linkedTransactionID) {
             Onyx.set(`${ONYXKEYS.COLLECTION.TRANSACTION}${linkedTransactionID}`, null);
         }
 
         // Delete the failed task report too
-        const taskReportID = reportAction.message?.[0]?.taskReportID;
+        const taskReportID = ReportActionUtils.getReportActionMessage(reportAction)?.taskReportID;
         if (taskReportID && ReportActionUtils.isCreatedTaskReportAction(reportAction)) {
             Report.deleteReport(taskReportID);
         }
@@ -58,24 +67,12 @@ function clearReportActionErrors(reportID: string, reportAction: ReportAction, k
     });
 }
 
-let allReportActions: OnyxCollection<ReportActions>;
-Onyx.connect({
-    key: ONYXKEYS.COLLECTION.REPORT_ACTIONS,
-    waitForCollectionCallback: true,
-    callback: (actions) => {
-        if (!actions) {
-            return;
-        }
-        allReportActions = actions;
-    },
-});
-
 /**
- * 
+ *
 ignore: `undefined` means we want to check both parent and children report actions
 ignore: `parent` or `child` means we want to ignore checking parent or child report actions because they've been previously checked
  */
-function clearAllRelatedReportActionErrors(reportID: string, reportAction: ReportAction | null, ignore?: IgnoreDirection, keys?: string[]) {
+function clearAllRelatedReportActionErrors(reportID: string, reportAction: ReportAction | null | undefined, ignore?: IgnoreDirection, keys?: string[]) {
     const errorKeys = keys ?? Object.keys(reportAction?.errors ?? {});
     if (!reportAction || errorKeys.length === 0) {
         return;
@@ -83,7 +80,7 @@ function clearAllRelatedReportActionErrors(reportID: string, reportAction: Repor
 
     clearReportActionErrors(reportID, reportAction, keys);
 
-    const report = ReportUtils.getReport(reportID);
+    const report = ReportConnection.getAllReports()?.[`${ONYXKEYS.COLLECTION.REPORT}${reportID}`];
     if (report?.parentReportID && report?.parentReportActionID && ignore !== 'parent') {
         const parentReportAction = ReportActionUtils.getReportAction(report.parentReportID, report.parentReportActionID);
         const parentErrorKeys = Object.keys(parentReportAction?.errors ?? {}).filter((err) => errorKeys.includes(err));
@@ -95,7 +92,7 @@ function clearAllRelatedReportActionErrors(reportID: string, reportAction: Repor
         const childActions = allReportActions?.[`${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${reportAction.childReportID}`] ?? {};
         Object.values(childActions).forEach((action) => {
             const childErrorKeys = Object.keys(action.errors ?? {}).filter((err) => errorKeys.includes(err));
-            clearAllRelatedReportActionErrors(reportAction.childReportID ?? '', action, 'parent', childErrorKeys);
+            clearAllRelatedReportActionErrors(reportAction.childReportID ?? '-1', action, 'parent', childErrorKeys);
         });
     }
 }
diff --git a/src/libs/actions/Search.ts b/src/libs/actions/Search.ts
index 03179fae93cc..020fc1bd2c30 100644
--- a/src/libs/actions/Search.ts
+++ b/src/libs/actions/Search.ts
@@ -1,13 +1,144 @@
+import Onyx from 'react-native-onyx';
+import type {OnyxUpdate} from 'react-native-onyx';
+import type {FormOnyxValues} from '@components/Form/types';
+import type {SearchQueryJSON} from '@components/Search/types';
 import * as API from '@libs/API';
-import {READ_COMMANDS} from '@libs/API/types';
-import * as SearchUtils from '@libs/SearchUtils';
+import type {ExportSearchItemsToCSVParams} from '@libs/API/parameters';
+import {READ_COMMANDS, WRITE_COMMANDS} from '@libs/API/types';
+import * as ApiUtils from '@libs/ApiUtils';
+import fileDownload from '@libs/fileDownload';
+import enhanceParameters from '@libs/Network/enhanceParameters';
+import CONST from '@src/CONST';
+import ONYXKEYS from '@src/ONYXKEYS';
+import type {SearchTransaction} from '@src/types/onyx/SearchResults';
+import * as Report from './Report';
 
-function search(query: string) {
-    const hash = SearchUtils.getQueryHash(query);
-    API.read(READ_COMMANDS.SEARCH, {query, hash});
+let currentUserEmail: string;
+Onyx.connect({
+    key: ONYXKEYS.SESSION,
+    callback: (val) => {
+        currentUserEmail = val?.email ?? '';
+    },
+});
+
+function getOnyxLoadingData(hash: number): {optimisticData: OnyxUpdate[]; finallyData: OnyxUpdate[]} {
+    const optimisticData: OnyxUpdate[] = [
+        {
+            onyxMethod: Onyx.METHOD.MERGE,
+            key: `${ONYXKEYS.COLLECTION.SNAPSHOT}${hash}`,
+            value: {
+                search: {
+                    isLoading: true,
+                },
+            },
+        },
+    ];
+
+    const finallyData: OnyxUpdate[] = [
+        {
+            onyxMethod: Onyx.METHOD.MERGE,
+            key: `${ONYXKEYS.COLLECTION.SNAPSHOT}${hash}`,
+            value: {
+                search: {
+                    isLoading: false,
+                },
+            },
+        },
+    ];
+
+    return {optimisticData, finallyData};
+}
+
+function search({queryJSON, offset}: {queryJSON: SearchQueryJSON; offset?: number}) {
+    const {optimisticData, finallyData} = getOnyxLoadingData(queryJSON.hash);
+
+    const queryWithOffset = {
+        ...queryJSON,
+        offset,
+    };
+    const jsonQuery = JSON.stringify(queryWithOffset);
+
+    API.read(READ_COMMANDS.SEARCH, {hash: queryJSON.hash, jsonQuery}, {optimisticData, finallyData});
+}
+
+/**
+ * It's possible that we return legacy transactions that don't have a transaction thread created yet.
+ * In that case, when users select the search result row, we need to create the transaction thread on the fly and update the search result with the new transactionThreadReport
+ */
+function createTransactionThread(hash: number, transactionID: string, reportID: string, moneyRequestReportActionID: string) {
+    Report.openReport(reportID, '', [currentUserEmail], undefined, moneyRequestReportActionID);
+
+    const onyxUpdate: Record<string, Record<string, Partial<SearchTransaction>>> = {
+        data: {
+            [`${ONYXKEYS.COLLECTION.TRANSACTION}${transactionID}`]: {
+                transactionThreadReportID: reportID,
+            },
+        },
+    };
+    Onyx.merge(`${ONYXKEYS.COLLECTION.SNAPSHOT}${hash}`, onyxUpdate);
+}
+
+function holdMoneyRequestOnSearch(hash: number, transactionIDList: string[], comment: string) {
+    const {optimisticData, finallyData} = getOnyxLoadingData(hash);
+
+    API.write(WRITE_COMMANDS.HOLD_MONEY_REQUEST_ON_SEARCH, {hash, transactionIDList, comment}, {optimisticData, finallyData});
+}
+
+function unholdMoneyRequestOnSearch(hash: number, transactionIDList: string[]) {
+    const {optimisticData, finallyData} = getOnyxLoadingData(hash);
+
+    API.write(WRITE_COMMANDS.UNHOLD_MONEY_REQUEST_ON_SEARCH, {hash, transactionIDList}, {optimisticData, finallyData});
+}
+
+function deleteMoneyRequestOnSearch(hash: number, transactionIDList: string[]) {
+    const {optimisticData, finallyData} = getOnyxLoadingData(hash);
+    API.write(WRITE_COMMANDS.DELETE_MONEY_REQUEST_ON_SEARCH, {hash, transactionIDList}, {optimisticData, finallyData});
+}
+
+type Params = Record<string, ExportSearchItemsToCSVParams>;
+
+function exportSearchItemsToCSV({query, jsonQuery, reportIDList, transactionIDList, policyIDs}: ExportSearchItemsToCSVParams, onDownloadFailed: () => void) {
+    const finalParameters = enhanceParameters(WRITE_COMMANDS.EXPORT_SEARCH_ITEMS_TO_CSV, {
+        query,
+        jsonQuery,
+        reportIDList,
+        transactionIDList,
+        policyIDs,
+    }) as Params;
+
+    const formData = new FormData();
+    Object.entries(finalParameters).forEach(([key, value]) => {
+        if (Array.isArray(value)) {
+            formData.append(key, value.join(','));
+        } else {
+            formData.append(key, String(value));
+        }
+    });
+
+    fileDownload(ApiUtils.getCommandURL({command: WRITE_COMMANDS.EXPORT_SEARCH_ITEMS_TO_CSV}), 'Expensify.csv', '', false, formData, CONST.NETWORK.METHOD.POST, onDownloadFailed);
+}
+
+/**
+ * Updates the form values for the advanced filters search form.
+ */
+function updateAdvancedFilters(values: Partial<FormOnyxValues<typeof ONYXKEYS.FORMS.SEARCH_ADVANCED_FILTERS_FORM>>) {
+    Onyx.merge(ONYXKEYS.FORMS.SEARCH_ADVANCED_FILTERS_FORM, values);
+}
+
+/**
+ * Clears all values for the advanced filters search form.
+ */
+function clearAdvancedFilters() {
+    Onyx.set(ONYXKEYS.FORMS.SEARCH_ADVANCED_FILTERS_FORM, null);
 }
 
 export {
-    // eslint-disable-next-line import/prefer-default-export
     search,
+    createTransactionThread,
+    deleteMoneyRequestOnSearch,
+    holdMoneyRequestOnSearch,
+    unholdMoneyRequestOnSearch,
+    exportSearchItemsToCSV,
+    updateAdvancedFilters,
+    clearAdvancedFilters,
 };
diff --git a/src/libs/actions/Session/index.ts b/src/libs/actions/Session/index.ts
index 9fc1485cd6e5..b687abd61bb9 100644
--- a/src/libs/actions/Session/index.ts
+++ b/src/libs/actions/Session/index.ts
@@ -16,6 +16,7 @@ import type {
     RequestNewValidateCodeParams,
     RequestUnlinkValidationLinkParams,
     SignInUserWithLinkParams,
+    SignUpUserParams,
     UnlinkLoginParams,
     ValidateTwoFactorAuthParams,
 } from '@libs/API/parameters';
@@ -23,6 +24,7 @@ import type SignInUserParams from '@libs/API/parameters/SignInUserParams';
 import {READ_COMMANDS, SIDE_EFFECT_REQUEST_COMMANDS, WRITE_COMMANDS} from '@libs/API/types';
 import * as Authentication from '@libs/Authentication';
 import * as ErrorUtils from '@libs/ErrorUtils';
+import Fullstory from '@libs/Fullstory';
 import HttpUtils from '@libs/HttpUtils';
 import Log from '@libs/Log';
 import Navigation from '@libs/Navigation/Navigation';
@@ -35,6 +37,7 @@ import * as ReportUtils from '@libs/ReportUtils';
 import * as SessionUtils from '@libs/SessionUtils';
 import Timers from '@libs/Timers';
 import {hideContextMenu} from '@pages/home/report/ContextMenu/ReportActionContextMenu';
+import {KEYS_TO_PRESERVE, openApp} from '@userActions/App';
 import * as Device from '@userActions/Device';
 import * as PriorityMode from '@userActions/PriorityMode';
 import redirectToSignIn from '@userActions/SignInRedirect';
@@ -50,6 +53,7 @@ import type Credentials from '@src/types/onyx/Credentials';
 import type {AutoAuthState} from '@src/types/onyx/Session';
 import type Session from '@src/types/onyx/Session';
 import clearCache from './clearCache';
+import updateSessionAuthTokens from './updateSessionAuthTokens';
 
 let session: Session = {};
 let authPromiseResolver: ((value: boolean) => void) | null = null;
@@ -64,6 +68,11 @@ Onyx.connect({
     },
 });
 
+Onyx.connect({
+    key: ONYXKEYS.USER_METADATA,
+    callback: Fullstory.consentAndIdentify,
+});
+
 let stashedSession: Session = {};
 Onyx.connect({
     key: ONYXKEYS.STASHED_SESSION,
@@ -85,7 +94,7 @@ Onyx.connect({
 let preferredLocale: ValueOf<typeof CONST.LOCALES> | null = null;
 Onyx.connect({
     key: ONYXKEYS.NVP_PREFERRED_LOCALE,
-    callback: (val) => (preferredLocale = val),
+    callback: (val) => (preferredLocale = val ?? null),
 });
 
 function isSupportAuthToken(): boolean {
@@ -163,7 +172,7 @@ function signOut() {
     Log.info('Flushing logs before signing out', true, {}, true);
     const params = {
         // Send current authToken because we will immediately clear it once triggering this command
-        authToken: NetworkStore.getAuthToken(),
+        authToken: NetworkStore.getAuthToken() ?? null,
         partnerUserID: credentials?.autoGeneratedLogin ?? '',
         partnerName: CONFIG.EXPENSIFY.PARTNER_NAME,
         partnerPassword: CONFIG.EXPENSIFY.PARTNER_PASSWORD,
@@ -181,7 +190,7 @@ function isAnonymousUser(sessionParam?: OnyxEntry<Session>): boolean {
 }
 
 function hasStashedSession(): boolean {
-    return Boolean(stashedSession.authToken && stashedCredentials.autoGeneratedLogin && stashedCredentials.autoGeneratedLogin !== '');
+    return !!(stashedSession.authToken && stashedCredentials.autoGeneratedLogin && stashedCredentials.autoGeneratedLogin !== '');
 }
 
 /**
@@ -191,10 +200,15 @@ function hasAuthToken(): boolean {
     return !!session.authToken;
 }
 
-function signOutAndRedirectToSignIn(shouldResetToHome?: boolean, shouldStashSession?: boolean) {
+function signOutAndRedirectToSignIn(shouldResetToHome?: boolean, shouldStashSession?: boolean, killHybridApp = true) {
     Log.info('Redirecting to Sign In because signOut() was called');
     hideContextMenu(false);
     if (!isAnonymousUser()) {
+        // In the HybridApp, we want the Old Dot to handle the sign out process
+        if (NativeModules.HybridAppModule && killHybridApp) {
+            NativeModules.HybridAppModule.closeReactNativeApp(true);
+            return;
+        }
         // We'll only call signOut if we're not stashing the session and this is not a supportal session,
         // otherwise we'll call the API to invalidate the autogenerated credentials used for infinite
         // session.
@@ -386,7 +400,7 @@ function signInAttemptState(): OnyxData {
                 value: {
                     isLoading: false,
                     loadingForm: null,
-                    errors: ErrorUtils.getMicroSecondOnyxError('loginForm.cannotGetAccountDetails'),
+                    errors: ErrorUtils.getMicroSecondOnyxErrorWithTranslationKey('loginForm.cannotGetAccountDetails'),
                 },
             },
         ],
@@ -404,6 +418,47 @@ function beginSignIn(email: string) {
     API.read(READ_COMMANDS.BEGIN_SIGNIN, params, {optimisticData, successData, failureData});
 }
 
+/**
+ * Creates an account for the new user and signs them into the application with the newly created account.
+ *
+ */
+function signUpUser() {
+    const optimisticData: OnyxUpdate[] = [
+        {
+            onyxMethod: Onyx.METHOD.MERGE,
+            key: ONYXKEYS.ACCOUNT,
+            value: {
+                ...CONST.DEFAULT_ACCOUNT_DATA,
+                isLoading: true,
+            },
+        },
+    ];
+
+    const successData: OnyxUpdate[] = [
+        {
+            onyxMethod: Onyx.METHOD.MERGE,
+            key: ONYXKEYS.ACCOUNT,
+            value: {
+                isLoading: false,
+            },
+        },
+    ];
+
+    const failureData: OnyxUpdate[] = [
+        {
+            onyxMethod: Onyx.METHOD.MERGE,
+            key: ONYXKEYS.ACCOUNT,
+            value: {
+                isLoading: false,
+            },
+        },
+    ];
+
+    const params: SignUpUserParams = {email: credentials.login, preferredLocale};
+
+    API.write(WRITE_COMMANDS.SIGN_UP_USER, params, {optimisticData, successData, failureData});
+}
+
 /**
  * Given an idToken from Sign in with Apple, checks the API to see if an account
  * exists for that email address and signs the user in if so.
@@ -622,7 +677,7 @@ function clearSignInData() {
  */
 function resetHomeRouteParams() {
     Navigation.isNavigationReady().then(() => {
-        const routes = navigationRef.current?.getState().routes;
+        const routes = navigationRef.current?.getState()?.routes;
         const homeRoute = routes?.find((route) => route.name === SCREENS.HOME);
 
         const emptyParams: Record<string, undefined> = {};
@@ -667,7 +722,7 @@ function clearAccountMessages() {
 }
 
 function setAccountError(error: string) {
-    Onyx.merge(ONYXKEYS.ACCOUNT, {errors: ErrorUtils.getMicroSecondOnyxError(error, true)});
+    Onyx.merge(ONYXKEYS.ACCOUNT, {errors: ErrorUtils.getMicroSecondOnyxErrorWithMessage(error)});
 }
 
 // It's necessary to throttle requests to reauthenticate since calling this multiple times will cause Pusher to
@@ -720,7 +775,7 @@ function authenticatePusher(socketID: string, channelName: string, callback: Cha
             Log.info('[PusherAuthorizer] Pusher authenticated successfully', false, {channelName});
             callback(null, response as ChannelAuthorizationData);
         })
-        .catch((error) => {
+        .catch((error: unknown) => {
             Log.hmmm('[PusherAuthorizer] Unhandled error: ', {channelName, error});
             callback(new Error('AuthenticatePusher request failed'), {auth: ''});
         });
@@ -853,10 +908,22 @@ function toggleTwoFactorAuth(enable: boolean) {
         },
     ];
 
-    API.write(enable ? WRITE_COMMANDS.ENABLE_TWO_FACTOR_AUTH : WRITE_COMMANDS.DISABLE_TWO_FACTOR_AUTH, {}, {optimisticData, successData, failureData});
+    API.write(enable ? WRITE_COMMANDS.ENABLE_TWO_FACTOR_AUTH : WRITE_COMMANDS.DISABLE_TWO_FACTOR_AUTH, null, {optimisticData, successData, failureData});
 }
 
-function validateTwoFactorAuth(twoFactorAuthCode: string) {
+function updateAuthTokenAndOpenApp(authToken?: string, encryptedAuthToken?: string) {
+    // Update authToken in Onyx and in our local variables so that API requests will use the new authToken
+    updateSessionAuthTokens(authToken, encryptedAuthToken);
+
+    // Note: It is important to manually set the authToken that is in the store here since
+    // reconnectApp will immediate post and use the local authToken. Onyx updates subscribers lately so it is not
+    // enough to do the updateSessionAuthTokens() call above.
+    NetworkStore.setAuthToken(authToken ?? null);
+
+    openApp();
+}
+
+function validateTwoFactorAuth(twoFactorAuthCode: string, shouldClearData: boolean) {
     const optimisticData = [
         {
             onyxMethod: Onyx.METHOD.MERGE,
@@ -889,7 +956,21 @@ function validateTwoFactorAuth(twoFactorAuthCode: string) {
 
     const params: ValidateTwoFactorAuthParams = {twoFactorAuthCode};
 
-    API.write(WRITE_COMMANDS.TWO_FACTOR_AUTH_VALIDATE, params, {optimisticData, successData, failureData});
+    // eslint-disable-next-line rulesdir/no-api-side-effects-method
+    API.makeRequestWithSideEffects(SIDE_EFFECT_REQUEST_COMMANDS.TWO_FACTOR_AUTH_VALIDATE, params, {optimisticData, successData, failureData}).then((response) => {
+        if (!response?.authToken) {
+            return;
+        }
+
+        // Clear onyx data if the user has just signed in and is forced to add 2FA
+        if (shouldClearData) {
+            const keysToPreserveWithPrivatePersonalDetails = [...KEYS_TO_PRESERVE, ONYXKEYS.PRIVATE_PERSONAL_DETAILS];
+            Onyx.clear(keysToPreserveWithPrivatePersonalDetails).then(() => updateAuthTokenAndOpenApp(response.authToken, response.encryptedAuthToken));
+            return;
+        }
+
+        updateAuthTokenAndOpenApp(response.authToken, response.encryptedAuthToken);
+    });
 }
 
 /**
@@ -920,6 +1001,7 @@ function handleExitToNavigation(exitTo: Route | HybridAppRoute) {
         waitForUserSignIn().then(() => {
             Navigation.waitForProtectedRoutes().then(() => {
                 const url = NativeModules.HybridAppModule ? Navigation.parseHybridAppUrl(exitTo) : (exitTo as Route);
+                Navigation.goBack();
                 Navigation.navigate(url);
             });
         });
@@ -998,4 +1080,5 @@ export {
     signInWithSupportAuthToken,
     isSupportAuthToken,
     hasStashedSession,
+    signUpUser,
 };
diff --git a/src/libs/actions/SignInRedirect.ts b/src/libs/actions/SignInRedirect.ts
index c6d4ffcaa30f..4d8b60265f29 100644
--- a/src/libs/actions/SignInRedirect.ts
+++ b/src/libs/actions/SignInRedirect.ts
@@ -2,6 +2,7 @@ import Onyx from 'react-native-onyx';
 import * as ErrorUtils from '@libs/ErrorUtils';
 import type {OnyxKey} from '@src/ONYXKEYS';
 import ONYXKEYS from '@src/ONYXKEYS';
+import * as Policy from './Policy/Policy';
 
 let currentIsOffline: boolean | undefined;
 let currentShouldForceOffline: boolean | undefined;
@@ -29,12 +30,13 @@ function clearStorageAndRedirect(errorMessage?: string): Promise<void> {
     }
 
     return Onyx.clear(keysToPreserve).then(() => {
+        Policy.clearAllPolicies();
         if (!errorMessage) {
             return;
         }
 
         // `Onyx.clear` reinitializes the Onyx instance with initial values so use `Onyx.merge` instead of `Onyx.set`
-        Onyx.merge(ONYXKEYS.SESSION, {errors: ErrorUtils.getMicroSecondOnyxError(errorMessage)});
+        Onyx.merge(ONYXKEYS.SESSION, {errors: ErrorUtils.getMicroSecondOnyxErrorWithMessage(errorMessage)});
     });
 }
 
diff --git a/src/libs/actions/Subscription.ts b/src/libs/actions/Subscription.ts
new file mode 100644
index 000000000000..0b431d5f36ed
--- /dev/null
+++ b/src/libs/actions/Subscription.ts
@@ -0,0 +1,305 @@
+import type {OnyxUpdate} from 'react-native-onyx';
+import Onyx from 'react-native-onyx';
+import * as API from '@libs/API';
+import type {CancelBillingSubscriptionParams, UpdateSubscriptionAddNewUsersAutomaticallyParams, UpdateSubscriptionAutoRenewParams, UpdateSubscriptionTypeParams} from '@libs/API/parameters';
+import {READ_COMMANDS, WRITE_COMMANDS} from '@libs/API/types';
+import CONST from '@src/CONST';
+import type {FeedbackSurveyOptionID, SubscriptionType} from '@src/CONST';
+import ONYXKEYS from '@src/ONYXKEYS';
+import type {OnyxData} from '@src/types/onyx/Request';
+
+/**
+ * Fetches data when the user opens the SubscriptionSettingsPage
+ */
+function openSubscriptionPage() {
+    API.read(READ_COMMANDS.OPEN_SUBSCRIPTION_PAGE, null);
+}
+
+function updateSubscriptionType(type: SubscriptionType) {
+    const optimisticData: OnyxUpdate[] = [
+        {
+            onyxMethod: Onyx.METHOD.MERGE,
+            key: ONYXKEYS.NVP_PRIVATE_SUBSCRIPTION,
+            value: {
+                type,
+                pendingFields: {
+                    type: CONST.RED_BRICK_ROAD_PENDING_ACTION.UPDATE,
+                },
+                errors: null,
+            },
+        },
+    ];
+
+    const successData: OnyxUpdate[] = [
+        {
+            onyxMethod: Onyx.METHOD.MERGE,
+            key: ONYXKEYS.NVP_PRIVATE_SUBSCRIPTION,
+            value: {
+                type,
+                pendingFields: {
+                    type: null,
+                },
+                errors: null,
+            },
+        },
+    ];
+
+    const failureData: OnyxUpdate[] = [
+        {
+            onyxMethod: Onyx.METHOD.MERGE,
+            key: ONYXKEYS.NVP_PRIVATE_SUBSCRIPTION,
+            value: {
+                type: type === CONST.SUBSCRIPTION.TYPE.ANNUAL ? CONST.SUBSCRIPTION.TYPE.PAYPERUSE : CONST.SUBSCRIPTION.TYPE.ANNUAL,
+                pendingFields: {
+                    type: null,
+                },
+            },
+        },
+    ];
+
+    const parameters: UpdateSubscriptionTypeParams = {
+        type,
+    };
+
+    API.write(WRITE_COMMANDS.UPDATE_SUBSCRIPTION_TYPE, parameters, {
+        optimisticData,
+        successData,
+        failureData,
+    });
+}
+
+function updateSubscriptionAutoRenew(autoRenew: boolean, disableAutoRenewReason?: FeedbackSurveyOptionID, disableAutoRenewAdditionalNote?: string) {
+    const optimisticData: OnyxUpdate[] = [
+        {
+            onyxMethod: Onyx.METHOD.MERGE,
+            key: ONYXKEYS.NVP_PRIVATE_SUBSCRIPTION,
+            value: {
+                autoRenew,
+                pendingFields: {
+                    autoRenew: CONST.RED_BRICK_ROAD_PENDING_ACTION.UPDATE,
+                },
+                errors: null,
+            },
+        },
+    ];
+
+    const successData: OnyxUpdate[] = [
+        {
+            onyxMethod: Onyx.METHOD.MERGE,
+            key: ONYXKEYS.NVP_PRIVATE_SUBSCRIPTION,
+            value: {
+                pendingFields: {
+                    autoRenew: null,
+                },
+                errors: null,
+            },
+        },
+    ];
+
+    const failureData: OnyxUpdate[] = [
+        {
+            onyxMethod: Onyx.METHOD.MERGE,
+            key: ONYXKEYS.NVP_PRIVATE_SUBSCRIPTION,
+            value: {
+                autoRenew: !autoRenew,
+                pendingFields: {
+                    autoRenew: null,
+                },
+            },
+        },
+    ];
+
+    const parameters: UpdateSubscriptionAutoRenewParams = {
+        autoRenew,
+        disableAutoRenewReason,
+        disableAutoRenewAdditionalNote,
+    };
+
+    API.write(WRITE_COMMANDS.UPDATE_SUBSCRIPTION_AUTO_RENEW, parameters, {
+        optimisticData,
+        successData,
+        failureData,
+    });
+}
+
+function updateSubscriptionAddNewUsersAutomatically(addNewUsersAutomatically: boolean) {
+    const optimisticData: OnyxUpdate[] = [
+        {
+            onyxMethod: Onyx.METHOD.MERGE,
+            key: ONYXKEYS.NVP_PRIVATE_SUBSCRIPTION,
+            value: {
+                addNewUsersAutomatically,
+                pendingFields: {
+                    addNewUsersAutomatically: CONST.RED_BRICK_ROAD_PENDING_ACTION.UPDATE,
+                },
+                errors: null,
+            },
+        },
+    ];
+
+    const successData: OnyxUpdate[] = [
+        {
+            onyxMethod: Onyx.METHOD.MERGE,
+            key: ONYXKEYS.NVP_PRIVATE_SUBSCRIPTION,
+            value: {
+                pendingFields: {
+                    addNewUsersAutomatically: null,
+                },
+                errors: null,
+            },
+        },
+    ];
+
+    const failureData: OnyxUpdate[] = [
+        {
+            onyxMethod: Onyx.METHOD.MERGE,
+            key: ONYXKEYS.NVP_PRIVATE_SUBSCRIPTION,
+            value: {
+                addNewUsersAutomatically: !addNewUsersAutomatically,
+                pendingFields: {
+                    addNewUsersAutomatically: null,
+                },
+            },
+        },
+    ];
+
+    const parameters: UpdateSubscriptionAddNewUsersAutomaticallyParams = {
+        addNewUsersAutomatically,
+    };
+
+    API.write(WRITE_COMMANDS.UPDATE_SUBSCRIPTION_ADD_NEW_USERS_AUTOMATICALLY, parameters, {
+        optimisticData,
+        successData,
+        failureData,
+    });
+}
+
+function updateSubscriptionSize(newSubscriptionSize: number, currentSubscriptionSize: number) {
+    const onyxData: OnyxData = {
+        optimisticData: [
+            {
+                onyxMethod: Onyx.METHOD.MERGE,
+                key: ONYXKEYS.NVP_PRIVATE_SUBSCRIPTION,
+                value: {
+                    userCount: newSubscriptionSize,
+                    errorFields: {
+                        userCount: null,
+                    },
+                    pendingFields: {
+                        userCount: CONST.RED_BRICK_ROAD_PENDING_ACTION.UPDATE,
+                    },
+                },
+            },
+        ],
+        successData: [
+            {
+                onyxMethod: Onyx.METHOD.MERGE,
+                key: ONYXKEYS.NVP_PRIVATE_SUBSCRIPTION,
+                value: {
+                    userCount: newSubscriptionSize,
+                    errorFields: {
+                        userCount: null,
+                    },
+                    pendingFields: {
+                        userCount: null,
+                    },
+                },
+            },
+        ],
+        failureData: [
+            {
+                onyxMethod: Onyx.METHOD.MERGE,
+                key: ONYXKEYS.NVP_PRIVATE_SUBSCRIPTION,
+                value: {
+                    userCount: currentSubscriptionSize,
+                    pendingFields: {
+                        userCount: null,
+                    },
+                },
+            },
+        ],
+    };
+
+    API.write(WRITE_COMMANDS.UPDATE_SUBSCRIPTION_SIZE, {userCount: newSubscriptionSize}, onyxData);
+}
+
+function clearUpdateSubscriptionSizeError() {
+    Onyx.merge(ONYXKEYS.NVP_PRIVATE_SUBSCRIPTION, {
+        errorFields: {
+            userCount: null,
+        },
+    });
+}
+
+function clearOutstandingBalance() {
+    const onyxData: OnyxData = {
+        optimisticData: [
+            {
+                onyxMethod: Onyx.METHOD.MERGE,
+                key: ONYXKEYS.SUBSCRIPTION_RETRY_BILLING_STATUS_PENDING,
+                value: true,
+            },
+        ],
+        successData: [
+            {
+                onyxMethod: Onyx.METHOD.MERGE,
+                key: ONYXKEYS.SUBSCRIPTION_RETRY_BILLING_STATUS_PENDING,
+                value: false,
+            },
+            {
+                onyxMethod: Onyx.METHOD.MERGE,
+                key: ONYXKEYS.SUBSCRIPTION_RETRY_BILLING_STATUS_SUCCESSFUL,
+                value: true,
+            },
+            {
+                onyxMethod: Onyx.METHOD.MERGE,
+                key: ONYXKEYS.SUBSCRIPTION_RETRY_BILLING_STATUS_FAILED,
+                value: false,
+            },
+        ],
+        failureData: [
+            {
+                onyxMethod: Onyx.METHOD.MERGE,
+                key: ONYXKEYS.SUBSCRIPTION_RETRY_BILLING_STATUS_PENDING,
+                value: false,
+            },
+            {
+                onyxMethod: Onyx.METHOD.MERGE,
+                key: ONYXKEYS.SUBSCRIPTION_RETRY_BILLING_STATUS_SUCCESSFUL,
+                value: false,
+            },
+            {
+                onyxMethod: Onyx.METHOD.MERGE,
+                key: ONYXKEYS.SUBSCRIPTION_RETRY_BILLING_STATUS_FAILED,
+                value: true,
+            },
+        ],
+    };
+
+    API.write(WRITE_COMMANDS.CLEAR_OUTSTANDING_BALANCE, null, onyxData);
+}
+
+function cancelBillingSubscription(cancellationReason: FeedbackSurveyOptionID, cancellationNote: string) {
+    const parameters: CancelBillingSubscriptionParams = {
+        cancellationReason,
+        cancellationNote,
+    };
+
+    API.write(WRITE_COMMANDS.CANCEL_BILLING_SUBSCRIPTION, parameters);
+}
+
+function requestTaxExempt() {
+    API.write(WRITE_COMMANDS.REQUEST_TAX_EXEMPTION, null);
+}
+
+export {
+    openSubscriptionPage,
+    updateSubscriptionAutoRenew,
+    updateSubscriptionAddNewUsersAutomatically,
+    updateSubscriptionSize,
+    clearUpdateSubscriptionSizeError,
+    updateSubscriptionType,
+    clearOutstandingBalance,
+    cancelBillingSubscription,
+    requestTaxExempt,
+};
diff --git a/src/libs/actions/Task.ts b/src/libs/actions/Task.ts
index 329119d688c9..001245717e12 100644
--- a/src/libs/actions/Task.ts
+++ b/src/libs/actions/Task.ts
@@ -1,4 +1,4 @@
-import type {OnyxCollection, OnyxEntry, OnyxUpdate} from 'react-native-onyx';
+import type {NullishDeep, OnyxCollection, OnyxEntry, OnyxUpdate} from 'react-native-onyx';
 import Onyx from 'react-native-onyx';
 import type {ValueOf} from 'type-fest';
 import * as Expensicons from '@components/Icon/Expensicons';
@@ -12,9 +12,9 @@ import Navigation from '@libs/Navigation/Navigation';
 import * as OptionsListUtils from '@libs/OptionsListUtils';
 import * as PersonalDetailsUtils from '@libs/PersonalDetailsUtils';
 import * as ReportActionsUtils from '@libs/ReportActionsUtils';
+import * as ReportConnection from '@libs/ReportConnection';
 import * as ReportUtils from '@libs/ReportUtils';
 import playSound, {SOUNDS} from '@libs/Sound';
-import * as UserUtils from '@libs/UserUtils';
 import CONST from '@src/CONST';
 import ONYXKEYS from '@src/ONYXKEYS';
 import ROUTES from '@src/ROUTES';
@@ -23,10 +23,9 @@ import type {Icon} from '@src/types/onyx/OnyxCommon';
 import type {ReportActions} from '@src/types/onyx/ReportAction';
 import type ReportAction from '@src/types/onyx/ReportAction';
 import {isEmptyObject} from '@src/types/utils/EmptyObject';
-import type {EmptyObject} from '@src/types/utils/EmptyObject';
 import * as Report from './Report';
 
-type OptimisticReport = Pick<OnyxTypes.Report, 'reportName' | 'managerID' | 'participantAccountIDs' | 'notificationPreference' | 'pendingFields' | 'visibleChatMemberAccountIDs'>;
+type OptimisticReport = Pick<OnyxTypes.Report, 'reportName' | 'managerID' | 'notificationPreference' | 'pendingFields' | 'participants'>;
 type Assignee = {
     icons: Icon[];
     displayName: string;
@@ -79,13 +78,6 @@ Onyx.connect({
     },
 });
 
-let allReports: OnyxCollection<OnyxTypes.Report>;
-Onyx.connect({
-    key: ONYXKEYS.COLLECTION.REPORT,
-    waitForCollectionCallback: true,
-    callback: (value) => (allReports = value),
-});
-
 /**
  * Clears out the task info from the store
  */
@@ -118,12 +110,12 @@ function createTaskAndNavigate(
     description: string,
     assigneeEmail: string,
     assigneeAccountID = 0,
-    assigneeChatReport: OnyxEntry<OnyxTypes.Report> = null,
+    assigneeChatReport?: OnyxEntry<OnyxTypes.Report>,
     policyID: string = CONST.POLICY.OWNER_EMAIL_FAKE,
 ) {
     const optimisticTaskReport = ReportUtils.buildOptimisticTaskReport(currentUserAccountID, assigneeAccountID, parentReportID, title, description, policyID);
 
-    const assigneeChatReportID = assigneeChatReport?.reportID ?? '';
+    const assigneeChatReportID = assigneeChatReport?.reportID ?? '-1';
     const taskReportID = optimisticTaskReport.reportID;
     let assigneeChatReportOnyxData;
 
@@ -132,14 +124,16 @@ function createTaskAndNavigate(
     const optimisticAddCommentReport = ReportUtils.buildOptimisticTaskCommentReportAction(taskReportID, title, assigneeAccountID, `task for ${title}`, parentReportID);
     optimisticTaskReport.parentReportActionID = optimisticAddCommentReport.reportAction.reportActionID;
 
-    const currentTime = DateUtils.getDBTime();
-    const lastCommentText = ReportUtils.formatReportLastMessageText(optimisticAddCommentReport?.reportAction?.message?.[0]?.text ?? '');
+    const currentTime = DateUtils.getDBTimeWithSkew();
+    const lastCommentText = ReportUtils.formatReportLastMessageText(ReportActionsUtils.getReportActionText(optimisticAddCommentReport.reportAction));
+    const parentReport = ReportUtils.getReport(parentReportID);
     const optimisticParentReport = {
-        lastVisibleActionCreated: currentTime,
+        lastVisibleActionCreated: optimisticAddCommentReport.reportAction.created,
         lastMessageText: lastCommentText,
         lastActorAccountID: currentUserAccountID,
         lastReadTime: currentTime,
         lastMessageTranslationKey: '',
+        hasOutstandingChildTask: assigneeAccountID === currentUserAccountID ? true : parentReport?.hasOutstandingChildTask,
     };
 
     // We're only setting onyx data for the task report here because it's possible for the parent report to not exist yet (if you're assigning a task to someone you haven't chatted with before)
@@ -180,6 +174,8 @@ function createTaskAndNavigate(
                     managerID: null,
                 },
                 isOptimisticReport: false,
+                // BE will send a different participant. We clear the optimistic one to avoid duplicated entries
+                participants: {[assigneeAccountID]: null},
             },
         },
         {
@@ -268,10 +264,17 @@ function createTaskAndNavigate(
         key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${parentReportID}`,
         value: {
             [optimisticAddCommentReport.reportAction.reportActionID]: {
-                errors: ErrorUtils.getMicroSecondOnyxError('task.genericCreateTaskFailureMessage'),
+                errors: ErrorUtils.getMicroSecondOnyxErrorWithTranslationKey('task.genericCreateTaskFailureMessage'),
             },
         },
     });
+    failureData.push({
+        onyxMethod: Onyx.METHOD.MERGE,
+        key: `${ONYXKEYS.COLLECTION.REPORT}${parentReportID}`,
+        value: {
+            hasOutstandingChildTask: parentReport?.hasOutstandingChildTask,
+        },
+    });
 
     clearOutTaskInfo();
 
@@ -295,14 +298,37 @@ function createTaskAndNavigate(
     Report.notifyNewAction(parentReportID, currentUserAccountID);
 }
 
+/**
+ * @returns the object to update `report.hasOutstandingChildTask`
+ */
+function getOutstandingChildTask(taskReport: OnyxEntry<OnyxTypes.Report>) {
+    const parentReportActions = allReportActions?.[`${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${taskReport?.parentReportID}`] ?? {};
+    return Object.values(parentReportActions).some((reportAction) => {
+        if (String(reportAction.childReportID) === String(taskReport?.reportID)) {
+            return false;
+        }
+
+        if (
+            reportAction.childType === CONST.REPORT.TYPE.TASK &&
+            reportAction?.childStateNum === CONST.REPORT.STATE_NUM.OPEN &&
+            reportAction?.childStatusNum === CONST.REPORT.STATUS_NUM.OPEN &&
+            ReportActionsUtils.getReportActionMessage(reportAction)?.isDeletedParentAction
+        ) {
+            return true;
+        }
+
+        return false;
+    });
+}
+
 /**
  * Complete a task
  */
 function completeTask(taskReport: OnyxEntry<OnyxTypes.Report>) {
-    const taskReportID = taskReport?.reportID ?? '';
+    const taskReportID = taskReport?.reportID ?? '-1';
     const message = `marked as complete`;
     const completedTaskReportAction = ReportUtils.buildOptimisticTaskReportAction(taskReportID, CONST.REPORT.ACTIONS.TYPE.TASK_COMPLETED, message);
-
+    const parentReport = getParentReport(taskReport);
     const optimisticData: OnyxUpdate[] = [
         {
             onyxMethod: Onyx.METHOD.MERGE,
@@ -310,9 +336,9 @@ function completeTask(taskReport: OnyxEntry<OnyxTypes.Report>) {
             value: {
                 stateNum: CONST.REPORT.STATE_NUM.APPROVED,
                 statusNum: CONST.REPORT.STATUS_NUM.APPROVED,
+                lastReadTime: DateUtils.getDBTime(),
             },
         },
-
         {
             onyxMethod: Onyx.METHOD.MERGE,
             key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${taskReportID}`,
@@ -339,6 +365,7 @@ function completeTask(taskReport: OnyxEntry<OnyxTypes.Report>) {
             value: {
                 stateNum: CONST.REPORT.STATE_NUM.OPEN,
                 statusNum: CONST.REPORT.STATUS_NUM.OPEN,
+                lastReadTime: taskReport?.lastReadTime ?? null,
             },
         },
         {
@@ -346,12 +373,30 @@ function completeTask(taskReport: OnyxEntry<OnyxTypes.Report>) {
             key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${taskReportID}`,
             value: {
                 [completedTaskReportAction.reportActionID]: {
-                    errors: ErrorUtils.getMicroSecondOnyxError('task.messages.error'),
+                    errors: ErrorUtils.getMicroSecondOnyxErrorWithTranslationKey('task.messages.error'),
                 },
             },
         },
     ];
 
+    if (parentReport?.hasOutstandingChildTask) {
+        const hasOutstandingChildTask = getOutstandingChildTask(taskReport);
+        optimisticData.push({
+            onyxMethod: Onyx.METHOD.MERGE,
+            key: `${ONYXKEYS.COLLECTION.REPORT}${taskReport?.parentReportID}`,
+            value: {
+                hasOutstandingChildTask,
+            },
+        });
+        failureData.push({
+            onyxMethod: Onyx.METHOD.MERGE,
+            key: `${ONYXKEYS.COLLECTION.REPORT}${taskReport?.parentReportID}`,
+            value: {
+                hasOutstandingChildTask: parentReport?.hasOutstandingChildTask,
+            },
+        });
+    }
+
     const parameters: CompleteTaskParams = {
         taskReportID,
         completedTaskReportActionID: completedTaskReportAction.reportActionID,
@@ -366,9 +411,11 @@ function completeTask(taskReport: OnyxEntry<OnyxTypes.Report>) {
  * Reopen a closed task
  */
 function reopenTask(taskReport: OnyxEntry<OnyxTypes.Report>) {
-    const taskReportID = taskReport?.reportID ?? '';
+    const taskReportID = taskReport?.reportID ?? '-1';
     const message = `marked as incomplete`;
     const reopenedTaskReportAction = ReportUtils.buildOptimisticTaskReportAction(taskReportID, CONST.REPORT.ACTIONS.TYPE.TASK_REOPENED, message);
+    const parentReport = getParentReport(taskReport);
+    const hasOutstandingChildTask = taskReport?.managerID === currentUserAccountID ? true : parentReport?.hasOutstandingChildTask;
 
     const optimisticData: OnyxUpdate[] = [
         {
@@ -383,6 +430,13 @@ function reopenTask(taskReport: OnyxEntry<OnyxTypes.Report>) {
                 lastReadTime: reopenedTaskReportAction.created,
             },
         },
+        {
+            onyxMethod: Onyx.METHOD.MERGE,
+            key: `${ONYXKEYS.COLLECTION.REPORT}${taskReport?.parentReportID}`,
+            value: {
+                hasOutstandingChildTask,
+            },
+        },
         {
             onyxMethod: Onyx.METHOD.MERGE,
             key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${taskReportID}`,
@@ -410,12 +464,19 @@ function reopenTask(taskReport: OnyxEntry<OnyxTypes.Report>) {
                 statusNum: CONST.REPORT.STATUS_NUM.APPROVED,
             },
         },
+        {
+            onyxMethod: Onyx.METHOD.MERGE,
+            key: `${ONYXKEYS.COLLECTION.REPORT}${taskReport?.parentReportID}`,
+            value: {
+                hasOutstandingChildTask: taskReport?.hasOutstandingChildTask,
+            },
+        },
         {
             onyxMethod: Onyx.METHOD.MERGE,
             key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${taskReportID}`,
             value: {
                 [reopenedTaskReportAction.reportActionID]: {
-                    errors: ErrorUtils.getMicroSecondOnyxError('task.messages.error'),
+                    errors: ErrorUtils.getMicroSecondOnyxErrorWithTranslationKey('task.messages.error'),
                 },
             },
         },
@@ -438,7 +499,8 @@ function editTask(report: OnyxTypes.Report, {title, description}: OnyxTypes.Task
     const reportName = (title ?? report?.reportName)?.trim();
 
     // Description can be unset, so we default to an empty string if so
-    const reportDescription = (description ?? report.description ?? '').trim();
+    const newDescription = description ? ReportUtils.getParsedComment(description) : report.description;
+    const reportDescription = (newDescription ?? '').trim();
 
     const optimisticData: OnyxUpdate[] = [
         {
@@ -506,19 +568,13 @@ function editTask(report: OnyxTypes.Report, {title, description}: OnyxTypes.Task
     Report.notifyNewAction(report.reportID, currentUserAccountID);
 }
 
-function editTaskAssignee(
-    report: OnyxTypes.Report,
-    ownerAccountID: number,
-    assigneeEmail: string,
-    assigneeAccountID: number | null = 0,
-    assigneeChatReport: OnyxEntry<OnyxTypes.Report> = null,
-) {
+function editTaskAssignee(report: OnyxTypes.Report, ownerAccountID: number, assigneeEmail: string, assigneeAccountID: number | null = 0, assigneeChatReport?: OnyxEntry<OnyxTypes.Report>) {
     // Create the EditedReportAction on the task
     const editTaskReportAction = ReportUtils.buildOptimisticChangedTaskAssigneeReportAction(assigneeAccountID ?? 0);
     const reportName = report.reportName?.trim();
 
     let assigneeChatReportOnyxData;
-    const assigneeChatReportID = assigneeChatReport ? assigneeChatReport.reportID : '0';
+    const assigneeChatReportID = assigneeChatReport ? assigneeChatReport.reportID : '-1';
     const optimisticReport: OptimisticReport = {
         reportName,
         managerID: assigneeAccountID ?? report.managerID,
@@ -529,6 +585,7 @@ function editTaskAssignee(
             ? CONST.REPORT.NOTIFICATION_PREFERENCE.ALWAYS
             : CONST.REPORT.NOTIFICATION_PREFERENCE.HIDDEN,
     };
+    const successReport: NullishDeep<OnyxTypes.Report> = {pendingFields: {...(assigneeAccountID && {managerID: null})}};
 
     const optimisticData: OnyxUpdate[] = [
         {
@@ -552,7 +609,7 @@ function editTaskAssignee(
         {
             onyxMethod: Onyx.METHOD.MERGE,
             key: `${ONYXKEYS.COLLECTION.REPORT}${report.reportID}`,
-            value: {pendingFields: {...(assigneeAccountID && {managerID: null})}},
+            value: successReport,
         },
     ];
 
@@ -569,26 +626,59 @@ function editTaskAssignee(
         },
     ];
 
+    if (currentUserAccountID === assigneeAccountID) {
+        const parentReport = getParentReport(report);
+        if (!isEmptyObject(parentReport)) {
+            optimisticData.push({
+                onyxMethod: Onyx.METHOD.MERGE,
+                key: `${ONYXKEYS.COLLECTION.REPORT}${parentReport.reportID}`,
+                value: {hasOutstandingChildTask: true},
+            });
+            failureData.push({
+                onyxMethod: Onyx.METHOD.MERGE,
+                key: `${ONYXKEYS.COLLECTION.REPORT}${parentReport.reportID}`,
+                value: {hasOutstandingChildTask: parentReport?.hasOutstandingChildTask},
+            });
+        }
+    }
+
+    if (report.managerID === currentUserAccountID) {
+        const hasOutstandingChildTask = getOutstandingChildTask(report);
+        const parentReport = getParentReport(report);
+        if (!isEmptyObject(parentReport)) {
+            optimisticData.push({
+                onyxMethod: Onyx.METHOD.MERGE,
+                key: `${ONYXKEYS.COLLECTION.REPORT}${parentReport.reportID}`,
+                value: {hasOutstandingChildTask},
+            });
+            failureData.push({
+                onyxMethod: Onyx.METHOD.MERGE,
+                key: `${ONYXKEYS.COLLECTION.REPORT}${parentReport.reportID}`,
+                value: {hasOutstandingChildTask: parentReport?.hasOutstandingChildTask},
+            });
+        }
+    }
+
     // If we make a change to the assignee, we want to add a comment to the assignee's chat
     // Check if the assignee actually changed
     if (assigneeAccountID && assigneeAccountID !== report.managerID && assigneeAccountID !== ownerAccountID && assigneeChatReport) {
-        const participants = report?.participantAccountIDs ?? [];
-        const visibleMembers = report.visibleChatMemberAccountIDs ?? [];
-        if (!visibleMembers.includes(assigneeAccountID)) {
-            optimisticReport.participantAccountIDs = [...participants, assigneeAccountID];
-            optimisticReport.visibleChatMemberAccountIDs = [...visibleMembers, assigneeAccountID];
-        }
+        optimisticReport.participants = {[assigneeAccountID]: {hidden: false}};
 
         assigneeChatReportOnyxData = ReportUtils.getTaskAssigneeChatOnyxData(
             currentUserAccountID,
             assigneeAccountID,
             report.reportID,
-            assigneeChatReportID ?? '',
-            report.parentReportID ?? '',
+            assigneeChatReportID ?? '-1',
+            report.parentReportID ?? '-1',
             reportName ?? '',
             assigneeChatReport,
         );
 
+        if (assigneeChatReport?.isOptimisticReport && assigneeChatReport.pendingFields?.createChat !== CONST.RED_BRICK_ROAD_PENDING_ACTION.ADD) {
+            // BE will send a different participant. We clear the optimistic one to avoid duplicated entries
+            successReport.participants = {[assigneeAccountID]: null};
+        }
+
         optimisticData.push(...assigneeChatReportOnyxData.optimisticData);
         successData.push(...assigneeChatReportOnyxData.successData);
         failureData.push(...assigneeChatReportOnyxData.failureData);
@@ -651,7 +741,7 @@ function setAssigneeChatReport(chatReport: OnyxTypes.Report) {
 }
 
 function setNewOptimisticAssignee(assigneeLogin: string, assigneeAccountID: number) {
-    const report: ReportUtils.OptimisticChatReport = ReportUtils.buildOptimisticChatReport([assigneeAccountID]);
+    const report: ReportUtils.OptimisticChatReport = ReportUtils.buildOptimisticChatReport([assigneeAccountID, currentUserAccountID]);
 
     // When assigning a task to a new user, by default we share the task in their DM
     // However, the DM doesn't exist yet - and will be created optimistically once the task is created
@@ -662,7 +752,7 @@ function setNewOptimisticAssignee(assigneeLogin: string, assigneeAccountID: numb
 
     const optimisticPersonalDetailsListAction: OnyxTypes.PersonalDetails = {
         accountID: assigneeAccountID,
-        avatar: allPersonalDetails?.[assigneeAccountID]?.avatar ?? UserUtils.getDefaultAvatarURL(assigneeAccountID),
+        avatar: allPersonalDetails?.[assigneeAccountID]?.avatar,
         displayName: allPersonalDetails?.[assigneeAccountID]?.displayName ?? assigneeLogin,
         login: assigneeLogin,
     };
@@ -681,12 +771,20 @@ function setAssigneeValue(
     shareToReportID?: string,
     chatReport?: OnyxEntry<OnyxTypes.Report>,
     isCurrentUser = false,
+    skipShareDestination = false,
 ): OnyxEntry<OnyxTypes.Report> | undefined {
     let report: OnyxEntry<OnyxTypes.Report> | undefined = chatReport;
-    if (!isCurrentUser) {
+    if (isCurrentUser) {
+        const selfDMReportID = ReportUtils.findSelfDMReportID();
+        // If there is no share destination set, automatically set it to the assignee chat report
+        // This allows for a much quicker process when creating a new task and is likely the desired share destination most times
+        if (!shareToReportID && !skipShareDestination) {
+            setShareDestinationValue(selfDMReportID ?? '-1');
+        }
+    } else {
         // Check for the chatReport by participants IDs
         if (!report) {
-            report = ReportUtils.getChatByParticipants([assigneeAccountID]);
+            report = ReportUtils.getChatByParticipants([assigneeAccountID, currentUserAccountID]);
         }
         // If chat report is still not found we need to build new optimistic chat report
         if (!report) {
@@ -704,8 +802,8 @@ function setAssigneeValue(
 
         // If there is no share destination set, automatically set it to the assignee chat report
         // This allows for a much quicker process when creating a new task and is likely the desired share destination most times
-        if (!shareToReportID) {
-            setShareDestinationValue(report?.reportID ?? '');
+        if (!shareToReportID && !skipShareDestination) {
+            setShareDestinationValue(report?.reportID ?? '-1');
         }
     }
 
@@ -736,11 +834,22 @@ function clearOutTaskInfoAndNavigate(reportID?: string, chatReport?: OnyxEntry<O
     }
     if (accountID > 0) {
         const accountLogin = allPersonalDetails?.[accountID]?.login ?? '';
-        setAssigneeValue(accountLogin, accountID, reportID, chatReport);
+        setAssigneeValue(accountLogin, accountID, reportID, chatReport, accountID === currentUserAccountID, skipConfirmation);
     }
     Navigation.navigate(ROUTES.NEW_TASK_DETAILS);
 }
 
+/**
+ * Start out create task action quick action step
+ */
+function startOutCreateTaskQuickAction(reportID: string, targetAccountID: number) {
+    // The second parameter of clearOutTaskInfoAndNavigate is the chat report or DM report
+    // between the user and the person to whom the task is assigned.
+    // Since chatReportID isn't stored in NVP_QUICK_ACTION_GLOBAL_CREATE, we set
+    // it to undefined. This will make setAssigneeValue to search for the correct report.
+    clearOutTaskInfoAndNavigate(reportID, undefined, targetAccountID, true);
+}
+
 /**
  * Get the assignee data
  */
@@ -766,15 +875,18 @@ function getAssignee(assigneeAccountID: number, personalDetails: OnyxEntry<OnyxT
  * Get the share destination data
  * */
 function getShareDestination(reportID: string, reports: OnyxCollection<OnyxTypes.Report>, personalDetails: OnyxEntry<OnyxTypes.PersonalDetailsList>): ShareDestination {
-    const report = reports?.[`report_${reportID}`] ?? null;
+    const report = reports?.[`report_${reportID}`];
+
+    const isOneOnOneChat = ReportUtils.isOneOnOneChat(report);
 
-    const participantAccountIDs = report?.participantAccountIDs ?? [];
-    const isMultipleParticipant = participantAccountIDs.length > 1;
-    const displayNamesWithTooltips = ReportUtils.getDisplayNamesWithTooltips(OptionsListUtils.getPersonalDetailsForAccountIDs(participantAccountIDs, personalDetails), isMultipleParticipant);
+    const participants = ReportUtils.getParticipantsAccountIDsForDisplay(report);
+
+    const isMultipleParticipant = participants.length > 1;
+    const displayNamesWithTooltips = ReportUtils.getDisplayNamesWithTooltips(OptionsListUtils.getPersonalDetailsForAccountIDs(participants, personalDetails), isMultipleParticipant);
 
     let subtitle = '';
-    if (ReportUtils.isChatReport(report) && ReportUtils.isDM(report) && ReportUtils.hasSingleParticipant(report)) {
-        const participantAccountID = report?.participantAccountIDs?.[0] ?? -1;
+    if (isOneOnOneChat) {
+        const participantAccountID = participants[0] ?? -1;
 
         const displayName = personalDetails?.[participantAccountID]?.displayName ?? '';
         const login = personalDetails?.[participantAccountID]?.login ?? '';
@@ -794,22 +906,22 @@ function getShareDestination(reportID: string, reports: OnyxCollection<OnyxTypes
 /**
  * Returns the parentReportAction if the given report is a thread/task.
  */
-function getParentReportAction(report: OnyxEntry<OnyxTypes.Report>): ReportAction | Record<string, never> {
+function getParentReportAction(report: OnyxEntry<OnyxTypes.Report>): OnyxEntry<ReportAction> {
     // If the report is not a thread report, then it won't have a parent and an empty object can be returned.
     if (!report?.parentReportID || !report.parentReportActionID) {
-        return {};
+        return undefined;
     }
-    return allReportActions?.[`${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${report.parentReportID}`]?.[report.parentReportActionID] ?? {};
+    return allReportActions?.[`${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${report.parentReportID}`]?.[report.parentReportActionID];
 }
 
 /**
  * Returns the parentReport if the given report is a thread
  */
-function getParentReport(report: OnyxEntry<OnyxTypes.Report> | EmptyObject): OnyxEntry<OnyxTypes.Report> | EmptyObject {
+function getParentReport(report: OnyxEntry<OnyxTypes.Report>): OnyxEntry<OnyxTypes.Report> {
     if (!report?.parentReportID) {
-        return {};
+        return undefined;
     }
-    return allReports?.[`${ONYXKEYS.COLLECTION.REPORT}${report.parentReportID}`] ?? {};
+    return ReportConnection.getAllReports()?.[`${ONYXKEYS.COLLECTION.REPORT}${report.parentReportID}`];
 }
 
 /**
@@ -820,16 +932,16 @@ function deleteTask(report: OnyxEntry<OnyxTypes.Report>) {
         return;
     }
     const message = `deleted task: ${report.reportName}`;
-    const optimisticCancelReportAction = ReportUtils.buildOptimisticTaskReportAction(report.reportID ?? '', CONST.REPORT.ACTIONS.TYPE.TASK_CANCELLED, message);
+    const optimisticCancelReportAction = ReportUtils.buildOptimisticTaskReportAction(report.reportID ?? '-1', CONST.REPORT.ACTIONS.TYPE.TASK_CANCELLED, message);
     const optimisticReportActionID = optimisticCancelReportAction.reportActionID;
     const parentReportAction = getParentReportAction(report);
     const parentReport = getParentReport(report);
 
     // If the task report is the last visible action in the parent report, we should navigate back to the parent report
-    const shouldDeleteTaskReport = !ReportActionsUtils.doesReportHaveVisibleActions(report.reportID ?? '');
+    const shouldDeleteTaskReport = !ReportActionsUtils.doesReportHaveVisibleActions(report.reportID ?? '-1');
     const optimisticReportAction: Partial<ReportUtils.OptimisticTaskReportAction> = {
-        pendingAction: CONST.RED_BRICK_ROAD_PENDING_ACTION.UPDATE,
-        previousMessage: parentReportAction.message,
+        pendingAction: shouldDeleteTaskReport ? CONST.RED_BRICK_ROAD_PENDING_ACTION.DELETE : CONST.RED_BRICK_ROAD_PENDING_ACTION.UPDATE,
+        previousMessage: parentReportAction?.message,
         message: [
             {
                 translationKey: '',
@@ -844,8 +956,9 @@ function deleteTask(report: OnyxEntry<OnyxTypes.Report>) {
         linkMetadata: [],
     };
     const optimisticReportActions = {
-        [parentReportAction.reportActionID]: optimisticReportAction,
+        [parentReportAction?.reportActionID ?? '-1']: optimisticReportAction,
     };
+    const hasOutstandingChildTask = getOutstandingChildTask(report);
 
     const optimisticData: OnyxUpdate[] = [
         {
@@ -862,8 +975,9 @@ function deleteTask(report: OnyxEntry<OnyxTypes.Report>) {
             onyxMethod: Onyx.METHOD.MERGE,
             key: `${ONYXKEYS.COLLECTION.REPORT}${parentReport?.reportID}`,
             value: {
-                lastMessageText: ReportActionsUtils.getLastVisibleMessage(parentReport?.reportID ?? '', optimisticReportActions as OnyxTypes.ReportActions).lastMessageText ?? '',
-                lastVisibleActionCreated: ReportActionsUtils.getLastVisibleAction(parentReport?.reportID ?? '', optimisticReportActions as OnyxTypes.ReportActions)?.created,
+                lastMessageText: ReportActionsUtils.getLastVisibleMessage(parentReport?.reportID ?? '-1', optimisticReportActions as OnyxTypes.ReportActions).lastMessageText ?? '',
+                lastVisibleActionCreated: ReportActionsUtils.getLastVisibleAction(parentReport?.reportID ?? '-1', optimisticReportActions as OnyxTypes.ReportActions)?.created,
+                hasOutstandingChildTask,
             },
         },
         {
@@ -884,7 +998,7 @@ function deleteTask(report: OnyxEntry<OnyxTypes.Report>) {
     const childVisibleActionCount = parentReportAction?.childVisibleActionCount ?? 0;
     if (childVisibleActionCount === 0) {
         const optimisticParentReportData = ReportUtils.getOptimisticDataForParentReportAction(
-            parentReport?.reportID ?? '',
+            parentReport?.reportID ?? '-1',
             parentReport?.lastVisibleActionCreated ?? '',
             CONST.RED_BRICK_ROAD_PENDING_ACTION.DELETE,
         );
@@ -910,7 +1024,7 @@ function deleteTask(report: OnyxEntry<OnyxTypes.Report>) {
             onyxMethod: Onyx.METHOD.MERGE,
             key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${parentReport?.reportID}`,
             value: {
-                [parentReportAction.reportActionID]: {
+                [parentReportAction?.reportActionID ?? '-1']: {
                     pendingAction: null,
                 },
             },
@@ -926,6 +1040,13 @@ function deleteTask(report: OnyxEntry<OnyxTypes.Report>) {
                 statusNum: report.statusNum ?? '',
             } as OnyxTypes.Report,
         },
+        {
+            onyxMethod: Onyx.METHOD.MERGE,
+            key: `${ONYXKEYS.COLLECTION.REPORT}${parentReport?.reportID}`,
+            value: {
+                hasOutstandingChildTask: parentReport?.hasOutstandingChildTask,
+            },
+        },
         {
             onyxMethod: Onyx.METHOD.MERGE,
             key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${report.reportID}`,
@@ -937,7 +1058,7 @@ function deleteTask(report: OnyxEntry<OnyxTypes.Report>) {
             onyxMethod: Onyx.METHOD.MERGE,
             key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${parentReport?.reportID}`,
             value: {
-                [parentReportAction.reportActionID]: {
+                [parentReportAction?.reportActionID ?? '-1']: {
                     pendingAction: null,
                 },
             },
@@ -953,7 +1074,13 @@ function deleteTask(report: OnyxEntry<OnyxTypes.Report>) {
     Report.notifyNewAction(report.reportID, currentUserAccountID);
 
     if (shouldDeleteTaskReport) {
-        Navigation.goBack(ROUTES.REPORT_WITH_ID.getRoute(parentReport?.reportID ?? ''));
+        if (parentReport?.reportID) {
+            return ROUTES.REPORT_WITH_ID.getRoute(parentReport.reportID);
+        }
+        const mostRecentReportID = Report.getMostRecentReportID(report);
+        if (mostRecentReportID) {
+            return ROUTES.REPORT_WITH_ID.getRoute(mostRecentReportID);
+        }
     }
 }
 
@@ -978,7 +1105,7 @@ function getTaskAssigneeAccountID(taskReport: OnyxEntry<OnyxTypes.Report>): numb
     }
 
     const reportAction = getParentReportAction(taskReport);
-    return reportAction.childManagerAccountID;
+    return reportAction?.childManagerAccountID;
 }
 
 /**
@@ -997,7 +1124,8 @@ function canModifyTask(taskReport: OnyxEntry<OnyxTypes.Report>, sessionAccountID
     }
 
     const parentReport = getParentReport(taskReport);
-    if (ReportUtils.isArchivedRoom(parentReport)) {
+    const reportNameValuePairs = ReportUtils.getReportNameValuePairs(parentReport?.reportID);
+    if (ReportUtils.isArchivedRoom(parentReport, reportNameValuePairs)) {
         return false;
     }
 
@@ -1005,7 +1133,7 @@ function canModifyTask(taskReport: OnyxEntry<OnyxTypes.Report>, sessionAccountID
         return true;
     }
 
-    if (!ReportUtils.canWriteInReport(ReportUtils.getReport(taskReport?.reportID))) {
+    if (!ReportUtils.canWriteInReport(taskReport)) {
         return false;
     }
 
@@ -1013,12 +1141,12 @@ function canModifyTask(taskReport: OnyxEntry<OnyxTypes.Report>, sessionAccountID
 }
 
 function clearTaskErrors(reportID: string) {
-    const report = ReportUtils.getReport(reportID);
+    const report = ReportConnection.getAllReports()?.[`${ONYXKEYS.COLLECTION.REPORT}${reportID}`];
 
     // Delete the task preview in the parent report
     if (report?.pendingFields?.createChat === CONST.RED_BRICK_ROAD_PENDING_ACTION.ADD) {
         Onyx.merge(`${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${report.parentReportID}`, {
-            [report.parentReportActionID ?? 0]: null,
+            [report.parentReportActionID ?? -1]: null,
         });
 
         Report.navigateToConciergeChatAndDeleteReport(reportID);
@@ -1045,6 +1173,7 @@ export {
     reopenTask,
     completeTask,
     clearOutTaskInfoAndNavigate,
+    startOutCreateTaskQuickAction,
     getAssignee,
     getShareDestination,
     deleteTask,
diff --git a/src/libs/actions/TaxRate.ts b/src/libs/actions/TaxRate.ts
index f8425cd0c40c..55ea058865cf 100644
--- a/src/libs/actions/TaxRate.ts
+++ b/src/libs/actions/TaxRate.ts
@@ -2,13 +2,23 @@ import type {OnyxCollection} from 'react-native-onyx';
 import Onyx from 'react-native-onyx';
 import type {FormOnyxValues} from '@components/Form/types';
 import * as API from '@libs/API';
-import type {CreatePolicyTaxParams, DeletePolicyTaxesParams, RenamePolicyTaxParams, SetPolicyTaxesEnabledParams, UpdatePolicyTaxValueParams} from '@libs/API/parameters';
+import type {
+    CreatePolicyTaxParams,
+    DeletePolicyTaxesParams,
+    RenamePolicyTaxParams,
+    SetPolicyTaxesEnabledParams,
+    UpdatePolicyTaxCodeParams,
+    UpdatePolicyTaxValueParams,
+} from '@libs/API/parameters';
 import {WRITE_COMMANDS} from '@libs/API/types';
+import {translateLocal} from '@libs/Localize';
 import * as ValidationUtils from '@libs/ValidationUtils';
 import CONST from '@src/CONST';
 import * as ErrorUtils from '@src/libs/ErrorUtils';
 import ONYXKEYS from '@src/ONYXKEYS';
 import INPUT_IDS from '@src/types/form/WorkspaceNewTaxForm';
+// eslint-disable-next-line import/no-named-default
+import {default as INPUT_IDS_TAX_CODE} from '@src/types/form/WorkspaceTaxCodeForm';
 import type {Policy, TaxRate, TaxRates} from '@src/types/onyx';
 import type * as OnyxCommon from '@src/types/onyx/OnyxCommon';
 import type {OnyxData} from '@src/types/onyx/Request';
@@ -39,7 +49,18 @@ const validateTaxName = (policy: Policy, values: FormOnyxValues<typeof ONYXKEYS.
 
     const name = values[INPUT_IDS.NAME];
     if (policy?.taxRates?.taxes && ValidationUtils.isExistingTaxName(name, policy.taxRates.taxes)) {
-        errors[INPUT_IDS.NAME] = 'workspace.taxes.error.taxRateAlreadyExists';
+        errors[INPUT_IDS.NAME] = translateLocal('workspace.taxes.error.taxRateAlreadyExists');
+    }
+
+    return errors;
+};
+
+const validateTaxCode = (policy: Policy, values: FormOnyxValues<typeof ONYXKEYS.FORMS.WORKSPACE_TAX_CODE_FORM>) => {
+    const errors = ValidationUtils.getFieldRequiredErrors(values, [INPUT_IDS_TAX_CODE.TAX_CODE]);
+
+    const taxCode = values[INPUT_IDS_TAX_CODE.TAX_CODE];
+    if (policy?.taxRates?.taxes && ValidationUtils.isExistingTaxCode(taxCode, policy.taxRates.taxes)) {
+        errors[INPUT_IDS_TAX_CODE.TAX_CODE] = translateLocal('workspace.taxes.error.taxCodeAlreadyExists');
     }
 
     return errors;
@@ -53,7 +74,7 @@ const validateTaxValue = (values: FormOnyxValues<typeof ONYXKEYS.FORMS.WORKSPACE
 
     const value = values[INPUT_IDS.VALUE];
     if (!ValidationUtils.isValidPercentage(value)) {
-        errors[INPUT_IDS.VALUE] = 'workspace.taxes.error.valuePercentageRange';
+        errors[INPUT_IDS.VALUE] = translateLocal('workspace.taxes.error.valuePercentageRange');
     }
 
     return errors;
@@ -123,7 +144,7 @@ function createPolicyTax(policyID: string, taxRate: TaxRate) {
                     taxRates: {
                         taxes: {
                             [taxRate.code]: {
-                                errors: ErrorUtils.getMicroSecondOnyxError('workspace.taxes.error.createFailureMessage'),
+                                errors: ErrorUtils.getMicroSecondOnyxErrorWithTranslationKey('workspace.taxes.error.createFailureMessage'),
                             },
                         },
                     },
@@ -199,6 +220,7 @@ function setPolicyTaxesEnabled(policyID: string, taxesIDsToUpdate: string[], isE
                             acc[taxID] = {
                                 isDisabled: !isEnabled,
                                 pendingFields: {isDisabled: CONST.RED_BRICK_ROAD_PENDING_ACTION.UPDATE},
+                                pendingAction: CONST.RED_BRICK_ROAD_PENDING_ACTION.UPDATE,
                                 errorFields: {isDisabled: null},
                             };
                             return acc;
@@ -214,7 +236,7 @@ function setPolicyTaxesEnabled(policyID: string, taxesIDsToUpdate: string[], isE
                 value: {
                     taxRates: {
                         taxes: taxesIDsToUpdate.reduce<TaxRateEnabledMap>((acc, taxID) => {
-                            acc[taxID] = {pendingFields: {isDisabled: null}, errorFields: {isDisabled: null}};
+                            acc[taxID] = {pendingFields: {isDisabled: null}, errorFields: {isDisabled: null}, pendingAction: null};
                             return acc;
                         }, {}),
                     },
@@ -231,7 +253,8 @@ function setPolicyTaxesEnabled(policyID: string, taxesIDsToUpdate: string[], isE
                             acc[taxID] = {
                                 isDisabled: !!originalTaxes[taxID].isDisabled,
                                 pendingFields: {isDisabled: null},
-                                errorFields: {isDisabled: ErrorUtils.getMicroSecondOnyxError('workspace.taxes.error.updateFailureMessage')},
+                                pendingAction: null,
+                                errorFields: {isDisabled: ErrorUtils.getMicroSecondOnyxErrorWithTranslationKey('workspace.taxes.error.updateFailureMessage')},
                             };
                             return acc;
                         }, {}),
@@ -312,7 +335,7 @@ function deletePolicyTaxes(policyID: string, taxesToDelete: string[]) {
                         taxes: taxesToDelete.reduce<TaxRateDeleteMap>((acc, taxID) => {
                             acc[taxID] = {
                                 pendingAction: null,
-                                errors: ErrorUtils.getMicroSecondOnyxError('workspace.taxes.error.deleteFailureMessage'),
+                                errors: ErrorUtils.getMicroSecondOnyxErrorWithTranslationKey('workspace.taxes.error.deleteFailureMessage'),
                             };
                             return acc;
                         }, {}),
@@ -346,6 +369,7 @@ function updatePolicyTaxValue(policyID: string, taxID: string, taxValue: number)
                             [taxID]: {
                                 value: stringTaxValue,
                                 pendingFields: {value: CONST.RED_BRICK_ROAD_PENDING_ACTION.UPDATE},
+                                pendingAction: CONST.RED_BRICK_ROAD_PENDING_ACTION.UPDATE,
                                 errorFields: {value: null},
                             },
                         },
@@ -360,7 +384,7 @@ function updatePolicyTaxValue(policyID: string, taxID: string, taxValue: number)
                 value: {
                     taxRates: {
                         taxes: {
-                            [taxID]: {pendingFields: {value: null}, errorFields: {value: null}},
+                            [taxID]: {pendingFields: {value: null}, pendingAction: null, errorFields: {value: null}},
                         },
                     },
                 },
@@ -376,7 +400,8 @@ function updatePolicyTaxValue(policyID: string, taxID: string, taxValue: number)
                             [taxID]: {
                                 value: originalTaxRate.value,
                                 pendingFields: {value: null},
-                                errorFields: {value: ErrorUtils.getMicroSecondOnyxError('workspace.taxes.error.updateFailureMessage')},
+                                pendingAction: null,
+                                errorFields: {value: ErrorUtils.getMicroSecondOnyxErrorWithTranslationKey('workspace.taxes.error.updateFailureMessage')},
                             },
                         },
                     },
@@ -408,6 +433,7 @@ function renamePolicyTax(policyID: string, taxID: string, newName: string) {
                             [taxID]: {
                                 name: newName,
                                 pendingFields: {name: CONST.RED_BRICK_ROAD_PENDING_ACTION.UPDATE},
+                                pendingAction: CONST.RED_BRICK_ROAD_PENDING_ACTION.UPDATE,
                                 errorFields: {name: null},
                             },
                         },
@@ -422,7 +448,7 @@ function renamePolicyTax(policyID: string, taxID: string, newName: string) {
                 value: {
                     taxRates: {
                         taxes: {
-                            [taxID]: {pendingFields: {name: null}, errorFields: {name: null}},
+                            [taxID]: {pendingFields: {name: null}, pendingAction: null, errorFields: {name: null}},
                         },
                     },
                 },
@@ -438,7 +464,8 @@ function renamePolicyTax(policyID: string, taxID: string, newName: string) {
                             [taxID]: {
                                 name: originalTaxRate.name,
                                 pendingFields: {name: null},
-                                errorFields: {name: ErrorUtils.getMicroSecondOnyxError('workspace.taxes.error.updateFailureMessage')},
+                                pendingAction: null,
+                                errorFields: {name: ErrorUtils.getMicroSecondOnyxErrorWithTranslationKey('workspace.taxes.error.updateFailureMessage')},
                             },
                         },
                     },
@@ -456,6 +483,90 @@ function renamePolicyTax(policyID: string, taxID: string, newName: string) {
     API.write(WRITE_COMMANDS.RENAME_POLICY_TAX, parameters, onyxData);
 }
 
+function setPolicyTaxCode(policyID: string, oldTaxCode: string, newTaxCode: string) {
+    const policy = allPolicies?.[`${ONYXKEYS.COLLECTION.POLICY}${policyID}`];
+    const originalTaxRate = {...policy?.taxRates?.taxes[oldTaxCode]};
+    const oldDefaultExternalID = policy?.taxRates?.defaultExternalID;
+    const oldForeignTaxDefault = policy?.taxRates?.foreignTaxDefault;
+    const onyxData: OnyxData = {
+        optimisticData: [
+            {
+                onyxMethod: Onyx.METHOD.MERGE,
+                key: `${ONYXKEYS.COLLECTION.POLICY}${policyID}`,
+                value: {
+                    taxRates: {
+                        defaultExternalID: oldTaxCode === oldDefaultExternalID ? newTaxCode : oldDefaultExternalID,
+                        foreignTaxDefault: oldTaxCode === oldForeignTaxDefault ? newTaxCode : oldForeignTaxDefault,
+                        taxes: {
+                            [oldTaxCode]: null,
+                            [newTaxCode]: {
+                                ...originalTaxRate,
+                                pendingFields: {...originalTaxRate.pendingFields, code: CONST.RED_BRICK_ROAD_PENDING_ACTION.UPDATE},
+                                pendingAction: CONST.RED_BRICK_ROAD_PENDING_ACTION.UPDATE,
+                                errorFields: {code: null},
+                                previousTaxCode: oldTaxCode,
+                            },
+                        },
+                    },
+                },
+            },
+        ],
+        successData: [
+            {
+                onyxMethod: Onyx.METHOD.MERGE,
+                key: `${ONYXKEYS.COLLECTION.POLICY}${policyID}`,
+                value: {
+                    taxRates: {
+                        defaultExternalID: oldTaxCode === oldDefaultExternalID ? newTaxCode : oldDefaultExternalID,
+                        foreignTaxDefault: oldTaxCode === oldForeignTaxDefault ? newTaxCode : oldForeignTaxDefault,
+                        taxes: {
+                            [oldTaxCode]: null,
+                            [newTaxCode]: {
+                                ...originalTaxRate,
+                                code: newTaxCode,
+                                pendingFields: {...originalTaxRate.pendingFields, code: null},
+                                pendingAction: null,
+                                errorFields: {code: null},
+                            },
+                        },
+                    },
+                },
+            },
+        ],
+        failureData: [
+            {
+                onyxMethod: Onyx.METHOD.MERGE,
+                key: `${ONYXKEYS.COLLECTION.POLICY}${policyID}`,
+                value: {
+                    taxRates: {
+                        defaultExternalID: oldDefaultExternalID,
+                        foreignTaxDefault: oldForeignTaxDefault,
+                        taxes: {
+                            [newTaxCode]: null,
+                            [oldTaxCode]: {
+                                ...originalTaxRate,
+                                code: originalTaxRate.code,
+                                pendingFields: {...originalTaxRate.pendingFields, code: null},
+                                pendingAction: null,
+                                errorFields: {code: ErrorUtils.getMicroSecondOnyxErrorWithTranslationKey('workspace.taxes.error.updateFailureMessage')},
+                            },
+                        },
+                    },
+                },
+            },
+        ],
+    };
+
+    const parameters: UpdatePolicyTaxCodeParams = {
+        policyID,
+        oldTaxCode,
+        newTaxCode,
+        taxID: originalTaxRate.name ?? '',
+    };
+
+    API.write(WRITE_COMMANDS.UPDATE_POLICY_TAX_CODE, parameters, onyxData);
+}
+
 export {
     createPolicyTax,
     getNextTaxCode,
@@ -464,8 +575,10 @@ export {
     getTaxValueWithPercentage,
     setPolicyTaxesEnabled,
     validateTaxName,
+    validateTaxCode,
     validateTaxValue,
     deletePolicyTaxes,
     updatePolicyTaxValue,
     renamePolicyTax,
+    setPolicyTaxCode,
 };
diff --git a/src/libs/actions/TeachersUnite.ts b/src/libs/actions/TeachersUnite.ts
index 36fd9d340aeb..ba67e579e95a 100644
--- a/src/libs/actions/TeachersUnite.ts
+++ b/src/libs/actions/TeachersUnite.ts
@@ -5,6 +5,7 @@ import type {AddSchoolPrincipalParams, ReferTeachersUniteVolunteerParams} from '
 import {WRITE_COMMANDS} from '@libs/API/types';
 import Navigation from '@libs/Navigation/Navigation';
 import * as PhoneNumber from '@libs/PhoneNumber';
+import {getPolicy} from '@libs/PolicyUtils';
 import * as ReportUtils from '@libs/ReportUtils';
 import type {OptimisticCreatedReportAction} from '@libs/ReportUtils';
 import CONST from '@src/CONST';
@@ -26,7 +27,7 @@ Onyx.connect({
     key: ONYXKEYS.SESSION,
     callback: (value) => {
         sessionEmail = value?.email ?? '';
-        sessionAccountID = value?.accountID ?? 0;
+        sessionAccountID = value?.accountID ?? -1;
     },
 });
 
@@ -95,7 +96,7 @@ function addSchoolPrincipal(firstName: string, partnerUserID: string, lastName:
                 name: policyName,
                 role: CONST.POLICY.ROLE.USER,
                 owner: sessionEmail,
-                outputCurrency: allPersonalDetails?.[sessionAccountID]?.localCurrencyCode ?? CONST.CURRENCY.USD,
+                outputCurrency: getPolicy(policyID)?.outputCurrency ?? allPersonalDetails?.[sessionAccountID]?.localCurrencyCode ?? CONST.CURRENCY.USD,
                 employeeList: {
                     [sessionEmail]: {
                         role: CONST.POLICY.ROLE.USER,
diff --git a/src/libs/actions/Timing.ts b/src/libs/actions/Timing.ts
index 28ffdd92ffba..6244ab2a609b 100644
--- a/src/libs/actions/Timing.ts
+++ b/src/libs/actions/Timing.ts
@@ -19,7 +19,7 @@ let timestampData: Record<string, TimestampData> = {};
  * @param eventName
  * @param shouldUseFirebase - adds an additional trace in Firebase
  */
-function start(eventName: string, shouldUseFirebase = false) {
+function start(eventName: string, shouldUseFirebase = true) {
     timestampData[eventName] = {startTime: Date.now(), shouldUseFirebase};
 
     if (!shouldUseFirebase) {
diff --git a/src/libs/actions/Transaction.ts b/src/libs/actions/Transaction.ts
index a95bf9a825f0..d7223524b32b 100644
--- a/src/libs/actions/Transaction.ts
+++ b/src/libs/actions/Transaction.ts
@@ -1,16 +1,19 @@
+import {getUnixTime} from 'date-fns';
 import {isEqual} from 'lodash';
 import lodashClone from 'lodash/clone';
 import lodashHas from 'lodash/has';
-import type {OnyxEntry} from 'react-native-onyx';
+import type {OnyxCollection, OnyxEntry, OnyxUpdate} from 'react-native-onyx';
 import Onyx from 'react-native-onyx';
 import * as API from '@libs/API';
-import type {GetRouteParams} from '@libs/API/parameters';
-import {READ_COMMANDS} from '@libs/API/types';
+import type {DismissViolationParams, GetRouteParams, MarkAsCashParams} from '@libs/API/parameters';
+import {READ_COMMANDS, WRITE_COMMANDS} from '@libs/API/types';
 import * as CollectionUtils from '@libs/CollectionUtils';
+import * as ReportActionsUtils from '@libs/ReportActionsUtils';
+import {buildOptimisticDismissedViolationReportAction, buildOptimisticUnHoldReportAction, isCurrentUserSubmitter} from '@libs/ReportUtils';
 import * as TransactionUtils from '@libs/TransactionUtils';
 import CONST from '@src/CONST';
 import ONYXKEYS from '@src/ONYXKEYS';
-import type {RecentWaypoint, Transaction} from '@src/types/onyx';
+import type {PersonalDetails, RecentWaypoint, ReportAction, ReportActions, ReviewDuplicates, Transaction, TransactionViolation, TransactionViolations} from '@src/types/onyx';
 import type {OnyxData} from '@src/types/onyx/Request';
 import type {WaypointCollection} from '@src/types/onyx/Transaction';
 
@@ -32,6 +35,24 @@ Onyx.connect({
     },
 });
 
+const allTransactionViolation: OnyxCollection<TransactionViolation[]> = {};
+Onyx.connect({
+    key: ONYXKEYS.COLLECTION.TRANSACTION_VIOLATIONS,
+    callback: (transactionViolation, key) => {
+        if (!key || !transactionViolation) {
+            return;
+        }
+        const transactionID = CollectionUtils.extractCollectionItemID(key);
+        allTransactionViolation[transactionID] = transactionViolation;
+    },
+});
+
+let allTransactionViolations: TransactionViolations = [];
+Onyx.connect({
+    key: ONYXKEYS.COLLECTION.TRANSACTION_VIOLATIONS,
+    callback: (val) => (allTransactionViolations = val ?? []),
+});
+
 function createInitialWaypoints(transactionID: string) {
     Onyx.merge(`${ONYXKEYS.COLLECTION.TRANSACTION}${transactionID}`, {
         comment: {
@@ -66,6 +87,9 @@ function saveWaypoint(transactionID: string, index: string, waypoint: RecentWayp
             waypoints: {
                 [`waypoint${index}`]: waypoint,
             },
+            customUnit: {
+                quantity: null,
+            },
         },
         // We want to reset the amount only for draft transactions (when creating the expense).
         // When modifying an existing transaction, the amount will be updated on the actual IOU update operation.
@@ -103,7 +127,7 @@ function saveWaypoint(transactionID: string, index: string, waypoint: RecentWayp
     if (!recentWaypointAlreadyExists && waypoint !== null) {
         const clonedWaypoints = lodashClone(recentWaypoints);
         clonedWaypoints.unshift(waypoint);
-        Onyx.merge(ONYXKEYS.NVP_RECENT_WAYPOINTS, clonedWaypoints.slice(0, 5));
+        Onyx.merge(ONYXKEYS.NVP_RECENT_WAYPOINTS, clonedWaypoints.slice(0, CONST.RECENT_WAYPOINTS_NUMBER));
     }
 }
 
@@ -140,6 +164,10 @@ function removeWaypoint(transaction: OnyxEntry<Transaction>, currentIndex: strin
         comment: {
             ...transaction?.comment,
             waypoints: reIndexedWaypoints,
+            customUnit: {
+                ...transaction?.comment?.customUnit,
+                quantity: null,
+            },
         },
         // We want to reset the amount only for draft transactions (when creating the expense).
         // When modifying an existing transaction, the amount will be updated on the actual IOU update operation.
@@ -260,8 +288,196 @@ function updateWaypoints(transactionID: string, waypoints: WaypointCollection, i
     });
 }
 
+/**
+ * Dismisses the duplicate transaction violation for the provided transactionIDs
+ * and updates the transaction to include the dismissed violation in the comment.
+ */
+function dismissDuplicateTransactionViolation(transactionIDs: string[], dissmissedPersonalDetails: PersonalDetails) {
+    const currentTransactionViolations = transactionIDs.map((id) => ({transactionID: id, violations: allTransactionViolation?.[id] ?? []}));
+    const currentTransactions = transactionIDs.map((id) => allTransactions?.[id]);
+    const transactionsReportActions = currentTransactions.map((transaction) => ReportActionsUtils.getIOUActionForReportID(transaction.reportID ?? '', transaction.transactionID ?? ''));
+    const isSubmitter = currentTransactions.every((transaction) => isCurrentUserSubmitter(transaction.reportID ?? ''));
+    const optimisticDissmidedViolationReportActions = transactionsReportActions.map(() => {
+        if (isSubmitter) {
+            return buildOptimisticUnHoldReportAction();
+        }
+        return buildOptimisticDismissedViolationReportAction({reason: 'manual', violationName: CONST.VIOLATIONS.DUPLICATED_TRANSACTION});
+    });
+
+    const optimisticData: OnyxUpdate[] = [];
+    const failureData: OnyxUpdate[] = [];
+
+    const optimisticReportActions: OnyxUpdate[] = transactionsReportActions.map((action, index) => ({
+        onyxMethod: Onyx.METHOD.MERGE,
+        key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${action?.childReportID ?? '-1'}`,
+        value: {
+            [optimisticDissmidedViolationReportActions[index].reportActionID]: optimisticDissmidedViolationReportActions[index] as ReportAction,
+        },
+    }));
+    const optimisticDataTransactionViolations: OnyxUpdate[] = currentTransactionViolations.map((transactionViolations) => ({
+        onyxMethod: Onyx.METHOD.MERGE,
+        key: `${ONYXKEYS.COLLECTION.TRANSACTION_VIOLATIONS}${transactionViolations.transactionID}`,
+        value: transactionViolations.violations?.filter((violation) => violation.name !== CONST.VIOLATIONS.DUPLICATED_TRANSACTION),
+    }));
+
+    optimisticData.push(...optimisticDataTransactionViolations);
+    optimisticData.push(...optimisticReportActions);
+
+    const optimisticDataTransactions: OnyxUpdate[] = currentTransactions.map((transaction) => ({
+        onyxMethod: Onyx.METHOD.MERGE,
+        key: `${ONYXKEYS.COLLECTION.TRANSACTION}${transaction.transactionID}`,
+        value: {
+            ...transaction,
+            comment: {
+                ...transaction.comment,
+                dismissedViolations: {
+                    duplicatedTransaction: {
+                        [dissmissedPersonalDetails.login ?? '']: getUnixTime(new Date()),
+                    },
+                },
+            },
+        },
+    }));
+
+    optimisticData.push(...optimisticDataTransactions);
+
+    const failureDataTransactionViolations: OnyxUpdate[] = currentTransactionViolations.map((transactionViolations) => ({
+        onyxMethod: Onyx.METHOD.MERGE,
+        key: `${ONYXKEYS.COLLECTION.TRANSACTION_VIOLATIONS}${transactionViolations.transactionID}`,
+        value: transactionViolations.violations?.map((violation) => violation),
+    }));
+
+    const failureDataTransaction: OnyxUpdate[] = currentTransactions.map((transaction) => ({
+        onyxMethod: Onyx.METHOD.MERGE,
+        key: `${ONYXKEYS.COLLECTION.TRANSACTION}${transaction.transactionID}`,
+        value: {
+            ...transaction,
+        },
+    }));
+
+    const failureReportActions: OnyxUpdate[] = transactionsReportActions.map((action, index) => ({
+        onyxMethod: Onyx.METHOD.MERGE,
+        key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${action?.childReportID ?? '-1'}`,
+        value: {
+            [optimisticDissmidedViolationReportActions[index].reportActionID]: null,
+        },
+    }));
+
+    failureData.push(...failureDataTransactionViolations);
+    failureData.push(...failureDataTransaction);
+    failureData.push(...failureReportActions);
+
+    const successData: OnyxUpdate[] = transactionsReportActions.map((action, index) => ({
+        onyxMethod: Onyx.METHOD.MERGE,
+        key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${action?.childReportID ?? '-1'}`,
+        value: {
+            [optimisticDissmidedViolationReportActions[index].reportActionID]: {
+                pendingAction: null,
+            },
+        },
+    }));
+
+    const params: DismissViolationParams = {
+        name: CONST.VIOLATIONS.DUPLICATED_TRANSACTION,
+        transactionIDList: transactionIDs.join(','),
+        reportActionIDList: optimisticDissmidedViolationReportActions.map((action) => action.reportActionID).join(','),
+    };
+
+    API.write(WRITE_COMMANDS.DISMISS_VIOLATION, params, {
+        optimisticData,
+        successData,
+        failureData,
+    });
+}
+
+function setReviewDuplicatesKey(values: Partial<ReviewDuplicates>) {
+    Onyx.merge(`${ONYXKEYS.REVIEW_DUPLICATES}`, {
+        ...values,
+    });
+}
+
+function abandonReviewDuplicateTransactions() {
+    Onyx.set(ONYXKEYS.REVIEW_DUPLICATES, null);
+}
+
 function clearError(transactionID: string) {
-    Onyx.merge(`${ONYXKEYS.COLLECTION.TRANSACTION}${transactionID}`, {errors: null});
+    Onyx.merge(`${ONYXKEYS.COLLECTION.TRANSACTION}${transactionID}`, {errors: null, errorFields: {route: null}});
+}
+
+function markAsCash(transactionID: string, transactionThreadReportID: string) {
+    const optimisticReportAction = buildOptimisticDismissedViolationReportAction({
+        reason: 'manual',
+        violationName: CONST.VIOLATIONS.RTER,
+    });
+    const optimisticReportActions = {
+        [optimisticReportAction.reportActionID]: optimisticReportAction,
+    };
+    const onyxData: OnyxData = {
+        optimisticData: [
+            // Optimistically dismissing the violation, removing it from the list of violations
+            {
+                onyxMethod: Onyx.METHOD.MERGE,
+                key: `${ONYXKEYS.COLLECTION.TRANSACTION_VIOLATIONS}${transactionID}`,
+                value: allTransactionViolations.filter((violation: TransactionViolation) => violation.name !== CONST.VIOLATIONS.RTER),
+            },
+            // Optimistically adding the system message indicating we dismissed the violation
+            {
+                onyxMethod: Onyx.METHOD.MERGE,
+                key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${transactionThreadReportID}`,
+                value: optimisticReportActions as ReportActions,
+            },
+        ],
+        failureData: [
+            // Rolling back the dismissal of the violation
+            {
+                onyxMethod: Onyx.METHOD.MERGE,
+                key: `${ONYXKEYS.COLLECTION.TRANSACTION_VIOLATIONS}${transactionID}`,
+                value: allTransactionViolations,
+            },
+            {
+                onyxMethod: Onyx.METHOD.MERGE,
+                key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${transactionThreadReportID}`,
+                value: {
+                    [optimisticReportAction.reportActionID]: null,
+                },
+            },
+        ],
+    };
+
+    const parameters: MarkAsCashParams = {
+        transactionID,
+        reportActionID: optimisticReportAction.reportActionID,
+    };
+
+    return API.write(WRITE_COMMANDS.MARK_AS_CASH, parameters, onyxData);
+}
+
+function openDraftDistanceExpense() {
+    const onyxData: OnyxData = {
+        optimisticData: [
+            {
+                onyxMethod: Onyx.METHOD.SET,
+                key: ONYXKEYS.NVP_RECENT_WAYPOINTS,
+
+                // By optimistically setting the recent waypoints to an empty array, no further loading attempts will be made
+                value: [],
+            },
+        ],
+    };
+    API.read(READ_COMMANDS.OPEN_DRAFT_DISTANCE_EXPENSE, null, onyxData);
 }
 
-export {addStop, createInitialWaypoints, saveWaypoint, removeWaypoint, getRoute, updateWaypoints, clearError};
+export {
+    addStop,
+    createInitialWaypoints,
+    saveWaypoint,
+    removeWaypoint,
+    getRoute,
+    updateWaypoints,
+    clearError,
+    markAsCash,
+    dismissDuplicateTransactionViolation,
+    setReviewDuplicatesKey,
+    abandonReviewDuplicateTransactions,
+    openDraftDistanceExpense,
+};
diff --git a/src/libs/actions/TransactionEdit.ts b/src/libs/actions/TransactionEdit.ts
index 970b34591103..a76cb8f25b75 100644
--- a/src/libs/actions/TransactionEdit.ts
+++ b/src/libs/actions/TransactionEdit.ts
@@ -1,8 +1,10 @@
 import Onyx from 'react-native-onyx';
-import type {OnyxEntry} from 'react-native-onyx';
+import type {Connection, OnyxEntry} from 'react-native-onyx';
 import ONYXKEYS from '@src/ONYXKEYS';
 import type {Transaction} from '@src/types/onyx';
 
+let connection: Connection;
+
 /**
  * Makes a backup copy of a transaction object that can be restored when the user cancels editing a transaction.
  */
@@ -11,6 +13,10 @@ function createBackupTransaction(transaction: OnyxEntry<Transaction>) {
         return;
     }
 
+    // In Strict Mode, the backup logic useEffect is triggered twice on mount. The restore logic is delayed because we need to connect to the onyx first,
+    // so it's possible that the restore logic is executed after creating the backup for the 2nd time which will completely clear the backup.
+    // To avoid that, we need to cancel the pending connection.
+    Onyx.disconnect(connection);
     const newTransaction = {
         ...transaction,
     };
@@ -27,13 +33,13 @@ function removeBackupTransaction(transactionID: string) {
 }
 
 function restoreOriginalTransactionFromBackup(transactionID: string, isDraft: boolean) {
-    const connectionID = Onyx.connect({
+    connection = Onyx.connect({
         key: `${ONYXKEYS.COLLECTION.TRANSACTION_BACKUP}${transactionID}`,
         callback: (backupTransaction) => {
-            Onyx.disconnect(connectionID);
+            Onyx.disconnect(connection);
 
             // Use set to completely overwrite the original transaction
-            Onyx.set(`${isDraft ? ONYXKEYS.COLLECTION.TRANSACTION_DRAFT : ONYXKEYS.COLLECTION.TRANSACTION}${transactionID}`, backupTransaction);
+            Onyx.set(`${isDraft ? ONYXKEYS.COLLECTION.TRANSACTION_DRAFT : ONYXKEYS.COLLECTION.TRANSACTION}${transactionID}`, backupTransaction ?? null);
             removeBackupTransaction(transactionID);
         },
     });
diff --git a/src/libs/actions/Travel.ts b/src/libs/actions/Travel.ts
index 02affae0fe67..f63d73fc27eb 100644
--- a/src/libs/actions/Travel.ts
+++ b/src/libs/actions/Travel.ts
@@ -1,25 +1,58 @@
 import type {OnyxUpdate} from 'react-native-onyx';
 import * as API from '@libs/API';
-import {WRITE_COMMANDS} from '@libs/API/types';
+import {SIDE_EFFECT_REQUEST_COMMANDS} from '@libs/API/types';
+import asyncOpenURL from '@libs/asyncOpenURL';
 import ONYXKEYS from '@src/ONYXKEYS';
+import {buildTravelDotURL} from './Link';
 
 /**
  * Accept Spotnana terms and conditions to receive a proper token used for authenticating further actions
  */
 function acceptSpotnanaTerms() {
-    const successData: OnyxUpdate[] = [
+    const optimisticData: OnyxUpdate[] = [
         {
             onyxMethod: 'merge',
-            key: ONYXKEYS.ACCOUNT,
+            key: ONYXKEYS.NVP_TRAVEL_SETTINGS,
             value: {
-                travelSettings: {
-                    hasAcceptedTerms: true,
-                },
+                hasAcceptedTerms: true,
+                isLoading: true,
             },
         },
     ];
 
-    API.write(WRITE_COMMANDS.ACCEPT_SPOTNANA_TERMS, {}, {successData});
+    const finallyData: OnyxUpdate[] = [
+        {
+            onyxMethod: 'merge',
+            key: ONYXKEYS.NVP_TRAVEL_SETTINGS,
+            value: {
+                isLoading: false,
+            },
+        },
+    ];
+
+    const error = new Error('Failed to generate spotnana token.');
+
+    return new Promise((resolve, reject) => {
+        asyncOpenURL(
+            // eslint-disable-next-line rulesdir/no-api-side-effects-method
+            API.makeRequestWithSideEffects(SIDE_EFFECT_REQUEST_COMMANDS.ACCEPT_SPOTNANA_TERMS, null, {optimisticData, finallyData})
+                .then((response) => {
+                    if (!response?.spotnanaToken) {
+                        reject(error);
+                        throw error;
+                    }
+                    return buildTravelDotURL(response.spotnanaToken);
+                })
+                .catch(() => {
+                    reject(error);
+                    throw error;
+                }),
+            (travelDotURL) => {
+                resolve(travelDotURL);
+                return travelDotURL ?? '';
+            },
+        );
+    });
 }
 
 // eslint-disable-next-line import/prefer-default-export
diff --git a/src/libs/actions/User.ts b/src/libs/actions/User.ts
index f7e90f775b65..773cc0c9373c 100644
--- a/src/libs/actions/User.ts
+++ b/src/libs/actions/User.ts
@@ -13,7 +13,6 @@ import type {
     SetContactMethodAsDefaultParams,
     SetNameValuePairParams,
     UpdateChatPriorityModeParams,
-    UpdateFrequentlyUsedEmojisParams,
     UpdateNewsletterSubscriptionParams,
     UpdatePreferredEmojiSkinToneParams,
     UpdateStatusParams,
@@ -22,6 +21,7 @@ import type {
     ValidateSecondaryLoginParams,
 } from '@libs/API/parameters';
 import {READ_COMMANDS, WRITE_COMMANDS} from '@libs/API/types';
+import DateUtils from '@libs/DateUtils';
 import * as ErrorUtils from '@libs/ErrorUtils';
 import Log from '@libs/Log';
 import Navigation from '@libs/Navigation/Navigation';
@@ -36,15 +36,13 @@ import Visibility from '@libs/Visibility';
 import CONST from '@src/CONST';
 import ONYXKEYS from '@src/ONYXKEYS';
 import ROUTES from '@src/ROUTES';
-import type {BlockedFromConcierge, CustomStatusDraft, FrequentlyUsedEmoji, Policy} from '@src/types/onyx';
+import type {BlockedFromConcierge, CustomStatusDraft, LoginList, Policy} from '@src/types/onyx';
 import type Login from '@src/types/onyx/Login';
 import type {OnyxServerUpdate} from '@src/types/onyx/OnyxUpdatesFromServer';
 import type OnyxPersonalDetails from '@src/types/onyx/PersonalDetails';
 import type {Status} from '@src/types/onyx/PersonalDetails';
 import type ReportAction from '@src/types/onyx/ReportAction';
-import type {OriginalMessage} from '@src/types/onyx/ReportAction';
 import {isEmptyObject} from '@src/types/utils/EmptyObject';
-import type {EmptyObject} from '@src/types/utils/EmptyObject';
 import applyOnyxUpdatesReliably from './applyOnyxUpdatesReliably';
 import * as Link from './Link';
 import * as Report from './Report';
@@ -60,7 +58,7 @@ Onyx.connect({
     },
 });
 
-let myPersonalDetails: OnyxEntry<OnyxPersonalDetails> | EmptyObject = {};
+let myPersonalDetails: OnyxEntry<OnyxPersonalDetails>;
 Onyx.connect({
     key: ONYXKEYS.PERSONAL_DETAILS_LIST,
     callback: (value) => {
@@ -68,10 +66,17 @@ Onyx.connect({
             return;
         }
 
-        myPersonalDetails = value[currentUserAccountID];
+        myPersonalDetails = value[currentUserAccountID] ?? undefined;
     },
 });
 
+let allPolicies: OnyxCollection<Policy>;
+Onyx.connect({
+    key: ONYXKEYS.COLLECTION.POLICY,
+    waitForCollectionCallback: true,
+    callback: (value) => (allPolicies = value),
+});
+
 /**
  * Attempt to close the user's accountt
  */
@@ -156,7 +161,7 @@ function requestContactMethodValidateCode(contactMethod: string) {
                 [contactMethod]: {
                     validateCodeSent: false,
                     errorFields: {
-                        validateCodeSent: ErrorUtils.getMicroSecondOnyxError('contacts.genericFailureMessages.requestContactMethodValidateCode'),
+                        validateCodeSent: ErrorUtils.getMicroSecondOnyxErrorWithTranslationKey('contacts.genericFailureMessages.requestContactMethodValidateCode'),
                     },
                     pendingFields: {
                         validateCodeSent: null,
@@ -203,7 +208,7 @@ function updateNewsletterSubscription(isSubscribed: boolean) {
  * @param contactMethod - the contact method being deleted
  * @param loginList
  */
-function deleteContactMethod(contactMethod: string, loginList: Record<string, Login>) {
+function deleteContactMethod(contactMethod: string, loginList: Record<string, Login>, backTo?: string) {
     const oldLoginData = loginList[contactMethod];
 
     const optimisticData: OnyxUpdate[] = [
@@ -239,7 +244,7 @@ function deleteContactMethod(contactMethod: string, loginList: Record<string, Lo
                     ...oldLoginData,
                     errorFields: {
                         ...oldLoginData?.errorFields,
-                        deletedLogin: ErrorUtils.getMicroSecondOnyxError('contacts.genericFailureMessages.deleteContactMethod'),
+                        deletedLogin: ErrorUtils.getMicroSecondOnyxErrorWithTranslationKey('contacts.genericFailureMessages.deleteContactMethod'),
                     },
                     pendingFields: {
                         deletedLogin: null,
@@ -252,7 +257,7 @@ function deleteContactMethod(contactMethod: string, loginList: Record<string, Lo
     const parameters: DeleteContactMethodParams = {partnerUserID: contactMethod};
 
     API.write(WRITE_COMMANDS.DELETE_CONTACT_METHOD, parameters, {optimisticData, successData, failureData});
-    Navigation.goBack(ROUTES.SETTINGS_CONTACT_METHODS.route);
+    Navigation.goBack(ROUTES.SETTINGS_CONTACT_METHODS.getRoute(backTo));
 }
 
 /**
@@ -287,7 +292,7 @@ function resetContactMethodValidateCodeSentState(contactMethod: string) {
 /**
  * Adds a secondary login to a user's account
  */
-function addNewContactMethodAndNavigate(contactMethod: string) {
+function addNewContactMethodAndNavigate(contactMethod: string, backTo?: string) {
     const optimisticData: OnyxUpdate[] = [
         {
             onyxMethod: Onyx.METHOD.MERGE,
@@ -326,7 +331,7 @@ function addNewContactMethodAndNavigate(contactMethod: string) {
             value: {
                 [contactMethod]: {
                     errorFields: {
-                        addedLogin: ErrorUtils.getMicroSecondOnyxError('contacts.genericFailureMessages.addContactMethod'),
+                        addedLogin: ErrorUtils.getMicroSecondOnyxErrorWithTranslationKey('contacts.genericFailureMessages.addContactMethod'),
                     },
                     pendingFields: {
                         addedLogin: null,
@@ -339,7 +344,7 @@ function addNewContactMethodAndNavigate(contactMethod: string) {
     const parameters: AddNewContactMethodParams = {partnerUserID: contactMethod};
 
     API.write(WRITE_COMMANDS.ADD_NEW_CONTACT_METHOD, parameters, {optimisticData, successData, failureData});
-    Navigation.goBack(ROUTES.SETTINGS_CONTACT_METHODS.route);
+    Navigation.goBack(ROUTES.SETTINGS_CONTACT_METHODS.getRoute(backTo));
 }
 
 /**
@@ -367,7 +372,7 @@ function validateLogin(accountID: number, validateCode: string) {
 /**
  * Validates a secondary login / contact method
  */
-function validateSecondaryLogin(contactMethod: string, validateCode: string) {
+function validateSecondaryLogin(loginList: OnyxEntry<LoginList>, contactMethod: string, validateCode: string) {
     const optimisticData: OnyxUpdate[] = [
         {
             onyxMethod: Onyx.METHOD.MERGE,
@@ -399,6 +404,7 @@ function validateSecondaryLogin(contactMethod: string, validateCode: string) {
             key: ONYXKEYS.LOGIN_LIST,
             value: {
                 [contactMethod]: {
+                    validatedDate: DateUtils.getDBTime(),
                     pendingFields: {
                         validateLogin: null,
                     },
@@ -413,7 +419,78 @@ function validateSecondaryLogin(contactMethod: string, validateCode: string) {
             key: ONYXKEYS.ACCOUNT,
             value: {isLoading: false},
         },
+        {
+            onyxMethod: Onyx.METHOD.MERGE,
+            key: ONYXKEYS.USER,
+            value: {
+                validated: true,
+            },
+        },
     ];
+    // If the primary login isn't validated yet, set the secondary login as the primary login
+    if (!loginList?.[currentEmail].validatedDate) {
+        successData.push(
+            ...[
+                {
+                    onyxMethod: Onyx.METHOD.MERGE,
+                    key: ONYXKEYS.ACCOUNT,
+                    value: {
+                        primaryLogin: contactMethod,
+                    },
+                },
+                {
+                    onyxMethod: Onyx.METHOD.MERGE,
+                    key: ONYXKEYS.SESSION,
+                    value: {
+                        email: contactMethod,
+                    },
+                },
+                {
+                    onyxMethod: Onyx.METHOD.MERGE,
+                    key: ONYXKEYS.PERSONAL_DETAILS_LIST,
+                    value: {
+                        [currentUserAccountID]: {
+                            login: contactMethod,
+                            displayName: PersonalDetailsUtils.createDisplayName(contactMethod, myPersonalDetails),
+                        },
+                    },
+                },
+            ],
+        );
+
+        Object.values(allPolicies ?? {}).forEach((policy) => {
+            if (!policy) {
+                return;
+            }
+
+            let optimisticPolicyDataValue;
+
+            if (policy.employeeList) {
+                const currentEmployee = policy.employeeList[currentEmail];
+                optimisticPolicyDataValue = {
+                    employeeList: {
+                        [currentEmail]: null,
+                        [contactMethod]: currentEmployee,
+                    },
+                };
+            }
+
+            if (policy.ownerAccountID === currentUserAccountID) {
+                optimisticPolicyDataValue = {
+                    ...optimisticPolicyDataValue,
+                    owner: contactMethod,
+                };
+            }
+
+            if (optimisticPolicyDataValue) {
+                successData.push({
+                    onyxMethod: Onyx.METHOD.MERGE,
+                    key: `${ONYXKEYS.COLLECTION.POLICY}${policy.id}`,
+                    value: optimisticPolicyDataValue,
+                });
+            }
+        });
+    }
 
     const failureData: OnyxUpdate[] = [
         {
@@ -422,7 +499,7 @@ function validateSecondaryLogin(contactMethod: string, validateCode: string) {
             value: {
                 [contactMethod]: {
                     errorFields: {
-                        validateLogin: ErrorUtils.getMicroSecondOnyxError('contacts.genericFailureMessages.validateSecondaryLogin'),
+                        validateLogin: ErrorUtils.getMicroSecondOnyxErrorWithTranslationKey('contacts.genericFailureMessages.validateSecondaryLogin'),
                         validateCodeSent: null,
                     },
                     pendingFields: {
@@ -475,10 +552,10 @@ function triggerNotifications(onyxUpdates: OnyxServerUpdate[]) {
 
 const isChannelMuted = (reportId: string) =>
     new Promise((resolve) => {
-        const connectionId = Onyx.connect({
+        const connection = Onyx.connect({
             key: `${ONYXKEYS.COLLECTION.REPORT}${reportId}`,
             callback: (report) => {
-                Onyx.disconnect(connectionId);
+                Onyx.disconnect(connection);
 
                 resolve(
                     !report?.notificationPreference ||
@@ -523,9 +600,13 @@ function playSoundForMessageType(pushJSON: OnyxServerUpdate[]) {
                 }
             }
 
-            const types = flatten.map((data) => data?.originalMessage).filter(Boolean) as OriginalMessage[];
+            const types = flatten.map((data) => ReportActionsUtils.getOriginalMessage(data)).filter(Boolean);
 
             for (const message of types) {
+                if (!message) {
+                    return;
+                }
+
                 // Pay someone flow
                 if ('IOUDetails' in message) {
                     return playSound(SOUNDS.SUCCESS);
@@ -644,23 +725,6 @@ function updatePreferredSkinTone(skinTone: number) {
     API.write(WRITE_COMMANDS.UPDATE_PREFERRED_EMOJI_SKIN_TONE, parameters, {optimisticData});
 }
 
-/**
- * Sync frequentlyUsedEmojis with Onyx and Server
- */
-function updateFrequentlyUsedEmojis(frequentlyUsedEmojis: FrequentlyUsedEmoji[]) {
-    const optimisticData: OnyxUpdate[] = [
-        {
-            onyxMethod: Onyx.METHOD.SET,
-            key: ONYXKEYS.FREQUENTLY_USED_EMOJIS,
-            value: frequentlyUsedEmojis,
-        },
-    ];
-
-    const parameters: UpdateFrequentlyUsedEmojisParams = {value: JSON.stringify(frequentlyUsedEmojis)};
-
-    API.write(WRITE_COMMANDS.UPDATE_FREQUENTLY_USED_EMOJIS, parameters, {optimisticData});
-}
-
 /**
  * Sync user chat priority mode with Onyx and Server
  * @param mode
@@ -772,7 +836,7 @@ function generateStatementPDF(period: string) {
 /**
  * Sets a contact method / secondary login as the user's "Default" contact method.
  */
-function setContactMethodAsDefault(newDefaultContactMethod: string, policies: OnyxCollection<Pick<Policy, 'id' | 'ownerAccountID' | 'owner'>>) {
+function setContactMethodAsDefault(newDefaultContactMethod: string, backTo?: string) {
     const oldDefaultContactMethod = currentEmail;
     const optimisticData: OnyxUpdate[] = [
         {
@@ -851,7 +915,7 @@ function setContactMethodAsDefault(newDefaultContactMethod: string, policies: On
                         defaultLogin: null,
                     },
                     errorFields: {
-                        defaultLogin: ErrorUtils.getMicroSecondOnyxError('contacts.genericFailureMessages.setDefaultContactMethod'),
+                        defaultLogin: ErrorUtils.getMicroSecondOnyxErrorWithTranslationKey('contacts.genericFailureMessages.setDefaultContactMethod'),
                     },
                 },
             },
@@ -865,24 +929,53 @@ function setContactMethodAsDefault(newDefaultContactMethod: string, policies: On
         },
     ];
 
-    Object.values(policies ?? {}).forEach((policy) => {
-        if (policy?.ownerAccountID !== currentUserAccountID) {
+    Object.values(allPolicies ?? {}).forEach((policy) => {
+        if (!policy) {
             return;
         }
-        optimisticData.push({
-            onyxMethod: Onyx.METHOD.MERGE,
-            key: `${ONYXKEYS.COLLECTION.POLICY}${policy.id}`,
-            value: {
+
+        let optimisticPolicyDataValue;
+        let failurePolicyDataValue;
+
+        if (policy.employeeList) {
+            const currentEmployee = policy.employeeList[oldDefaultContactMethod];
+            optimisticPolicyDataValue = {
+                employeeList: {
+                    [oldDefaultContactMethod]: null,
+                    [newDefaultContactMethod]: currentEmployee,
+                },
+            };
+            failurePolicyDataValue = {
+                employeeList: {
+                    [oldDefaultContactMethod]: currentEmployee,
+                    [newDefaultContactMethod]: null,
+                },
+            };
+        }
+
+        if (policy.ownerAccountID === currentUserAccountID) {
+            optimisticPolicyDataValue = {
+                ...optimisticPolicyDataValue,
                 owner: newDefaultContactMethod,
-            },
-        });
-        failureData.push({
-            onyxMethod: Onyx.METHOD.MERGE,
-            key: `${ONYXKEYS.COLLECTION.POLICY}${policy.id}`,
-            value: {
+            };
+            failurePolicyDataValue = {
+                ...failurePolicyDataValue,
                 owner: policy.owner,
-            },
-        });
+            };
+        }
+
+        if (optimisticPolicyDataValue && failurePolicyDataValue) {
+            optimisticData.push({
+                onyxMethod: Onyx.METHOD.MERGE,
+                key: `${ONYXKEYS.COLLECTION.POLICY}${policy.id}`,
+                value: optimisticPolicyDataValue,
+            });
+            failureData.push({
+                onyxMethod: Onyx.METHOD.MERGE,
+                key: `${ONYXKEYS.COLLECTION.POLICY}${policy.id}`,
+                value: failurePolicyDataValue,
+            });
+        }
     });
     const parameters: SetContactMethodAsDefaultParams = {
         partnerUserID: newDefaultContactMethod,
@@ -893,7 +986,7 @@ function setContactMethodAsDefault(newDefaultContactMethod: string, policies: On
         successData,
         failureData,
     });
-    Navigation.goBack(ROUTES.SETTINGS_CONTACT_METHODS.route);
+    Navigation.goBack(ROUTES.SETTINGS_CONTACT_METHODS.getRoute(backTo));
 }
 
 function updateTheme(theme: ValueOf<typeof CONST.THEME>) {
@@ -952,7 +1045,7 @@ function clearCustomStatus() {
             },
         },
     ];
-    API.write(WRITE_COMMANDS.CLEAR_STATUS, {}, {optimisticData});
+    API.write(WRITE_COMMANDS.CLEAR_STATUS, null, {optimisticData});
 }
 
 /**
@@ -1011,11 +1104,20 @@ function dismissTrackTrainingModal() {
     });
 }
 
+function dismissWorkspaceTooltip() {
+    Onyx.merge(ONYXKEYS.NVP_WORKSPACE_TOOLTIP, {shouldShow: false});
+}
+
+function requestRefund() {
+    API.write(WRITE_COMMANDS.REQUEST_REFUND, null);
+}
+
 export {
     clearFocusModeNotification,
     closeAccount,
     dismissReferralBanner,
     dismissTrackTrainingModal,
+    dismissWorkspaceTooltip,
     resendValidateCode,
     requestContactMethodValidateCode,
     updateNewsletterSubscription,
@@ -1030,7 +1132,6 @@ export {
     setShouldUseStagingServer,
     setMuteAllSounds,
     clearUserErrorMessage,
-    updateFrequentlyUsedEmojis,
     joinScreenShare,
     clearScreenShareRequest,
     generateStatementPDF,
@@ -1042,4 +1143,5 @@ export {
     clearCustomStatus,
     updateDraftCustomStatus,
     clearDraftCustomStatus,
+    requestRefund,
 };
diff --git a/src/libs/actions/UserLocation.ts b/src/libs/actions/UserLocation.ts
index 699b701904e4..52c9b96127dd 100644
--- a/src/libs/actions/UserLocation.ts
+++ b/src/libs/actions/UserLocation.ts
@@ -9,4 +9,8 @@ function setUserLocation({longitude, latitude}: UserLocation) {
     Onyx.set(ONYXKEYS.USER_LOCATION, {longitude, latitude});
 }
 
-export default setUserLocation;
+function clearUserLocation() {
+    Onyx.set(ONYXKEYS.USER_LOCATION, null);
+}
+
+export {setUserLocation, clearUserLocation};
diff --git a/src/libs/actions/Wallet.ts b/src/libs/actions/Wallet.ts
index 045cc34f39ef..b1f97421eea0 100644
--- a/src/libs/actions/Wallet.ts
+++ b/src/libs/actions/Wallet.ts
@@ -11,6 +11,7 @@ import type {
 } from '@libs/API/parameters';
 import {READ_COMMANDS, WRITE_COMMANDS} from '@libs/API/types';
 import type {PrivatePersonalDetails} from '@libs/GetPhysicalCardUtils';
+import * as PersonalDetailsUtils from '@libs/PersonalDetailsUtils';
 import type CONST from '@src/CONST';
 import ONYXKEYS from '@src/ONYXKEYS';
 import type {WalletAdditionalQuestionDetails} from '@src/types/onyx';
@@ -49,7 +50,7 @@ function openOnfidoFlow() {
         },
     ];
 
-    API.read(READ_COMMANDS.OPEN_ONFIDO_FLOW, {}, {optimisticData, finallyData});
+    API.read(READ_COMMANDS.OPEN_ONFIDO_FLOW, null, {optimisticData, finallyData});
 }
 
 function setAdditionalDetailsQuestions(questions: WalletAdditionalQuestionDetails[] | null, idNumber?: string) {
@@ -61,10 +62,6 @@ function setAdditionalDetailsErrors(errorFields: OnyxCommon.ErrorFields) {
     Onyx.merge(ONYXKEYS.WALLET_ADDITIONAL_DETAILS, {errorFields});
 }
 
-function setAdditionalDetailsErrorMessage(additionalErrorMessage: string) {
-    Onyx.merge(ONYXKEYS.WALLET_ADDITIONAL_DETAILS, {additionalErrorMessage});
-}
-
 /**
  * Save the source that triggered the KYC wall and optionally the chat report ID associated with the IOU
  */
@@ -212,17 +209,17 @@ function acceptWalletTerms(parameters: AcceptWalletTermsParams) {
  * Fetches data when the user opens the InitialSettingsPage
  */
 function openInitialSettingsPage() {
-    API.read(READ_COMMANDS.OPEN_INITIAL_SETTINGS_PAGE, {});
+    API.read(READ_COMMANDS.OPEN_INITIAL_SETTINGS_PAGE, null);
 }
 
 /**
  * Fetches data when the user opens the EnablePaymentsPage
  */
 function openEnablePaymentsPage() {
-    API.read(READ_COMMANDS.OPEN_ENABLE_PAYMENTS_PAGE, {});
+    API.read(READ_COMMANDS.OPEN_ENABLE_PAYMENTS_PAGE, null);
 }
 
-function updateCurrentStep(currentStep: ValueOf<typeof CONST.WALLET.STEP>) {
+function updateCurrentStep(currentStep: ValueOf<typeof CONST.WALLET.STEP> | null) {
     Onyx.merge(ONYXKEYS.USER_WALLET, {currentStep});
 }
 
@@ -261,7 +258,8 @@ function answerQuestionsForWallet(answers: WalletQuestionAnswer[], idNumber: str
 }
 
 function requestPhysicalExpensifyCard(cardID: number, authToken: string, privatePersonalDetails: PrivatePersonalDetails) {
-    const {legalFirstName = '', legalLastName = '', phoneNumber = '', address: {city = '', country = '', state = '', street = '', zip = ''} = {}} = privatePersonalDetails;
+    const {legalFirstName = '', legalLastName = '', phoneNumber = ''} = privatePersonalDetails;
+    const {city = '', country = '', state = '', street = '', zip = ''} = PersonalDetailsUtils.getCurrentAddress(privatePersonalDetails) ?? {};
 
     const requestParams: RequestPhysicalExpensifyCardParams = {
         authToken,
@@ -304,7 +302,6 @@ export {
     openInitialSettingsPage,
     openEnablePaymentsPage,
     setAdditionalDetailsErrors,
-    setAdditionalDetailsErrorMessage,
     setAdditionalDetailsQuestions,
     updateCurrentStep,
     answerQuestionsForWallet,
diff --git a/src/libs/actions/Welcome.ts b/src/libs/actions/Welcome.ts
index 3f4c50924e9a..d54314ae6f05 100644
--- a/src/libs/actions/Welcome.ts
+++ b/src/libs/actions/Welcome.ts
@@ -1,30 +1,47 @@
-import type {OnyxCollection} from 'react-native-onyx';
+import {NativeModules} from 'react-native';
+import type {OnyxUpdate} from 'react-native-onyx';
 import Onyx from 'react-native-onyx';
+import * as API from '@libs/API';
+import {WRITE_COMMANDS} from '@libs/API/types';
+import Navigation from '@libs/Navigation/Navigation';
+import variables from '@styles/variables';
 import type {OnboardingPurposeType} from '@src/CONST';
 import ONYXKEYS from '@src/ONYXKEYS';
+import ROUTES from '@src/ROUTES';
 import type Onboarding from '@src/types/onyx/Onboarding';
-import type OnyxPolicy from '@src/types/onyx/Policy';
-import type {EmptyObject} from '@src/types/utils/EmptyObject';
+import type TryNewDot from '@src/types/onyx/TryNewDot';
+
+type OnboardingData = Onboarding | [] | undefined;
 
-let onboarding: Onboarding | [] | undefined;
-let hasDismissedModal: boolean | undefined;
 let isLoadingReportData = true;
+let tryNewDotData: TryNewDot | undefined;
+let onboarding: OnboardingData;
 
 type HasCompletedOnboardingFlowProps = {
     onCompleted?: () => void;
     onNotCompleted?: () => void;
 };
 
+type HasOpenedForTheFirstTimeFromHybridAppProps = {
+    onFirstTimeInHybridApp?: () => void;
+    onSubsequentRuns?: () => void;
+};
+
 let resolveIsReadyPromise: (value?: Promise<void>) => void | undefined;
 let isServerDataReadyPromise = new Promise<void>((resolve) => {
     resolveIsReadyPromise = resolve;
 });
 
-let resolveOnboardingFlowStatus: (value?: Promise<void>) => void | undefined;
+let resolveOnboardingFlowStatus: () => void;
 let isOnboardingFlowStatusKnownPromise = new Promise<void>((resolve) => {
     resolveOnboardingFlowStatus = resolve;
 });
 
+let resolveTryNewDotStatus: (value?: Promise<void>) => void | undefined;
+const tryNewDotStatusPromise = new Promise<void>((resolve) => {
+    resolveTryNewDotStatus = resolve;
+});
+
 function onServerDataReady(): Promise<void> {
     return isServerDataReadyPromise;
 }
@@ -44,59 +61,133 @@ function isOnboardingFlowCompleted({onCompleted, onNotCompleted}: HasCompletedOn
 }
 
 /**
- * Check if onboarding data is ready in order to check if the user has completed onboarding or not
+ * Determines whether the application is being launched for the first time by a hybrid app user,
+ * and executes corresponding callback functions.
  */
-function checkOnboardingDataReady() {
-    if (onboarding === undefined) {
+function isFirstTimeHybridAppUser({onFirstTimeInHybridApp, onSubsequentRuns}: HasOpenedForTheFirstTimeFromHybridAppProps) {
+    tryNewDotStatusPromise.then(() => {
+        let completedHybridAppOnboarding = tryNewDotData?.classicRedirect?.completedHybridAppOnboarding;
+        // Backend might return strings instead of booleans
+        if (typeof completedHybridAppOnboarding === 'string') {
+            completedHybridAppOnboarding = completedHybridAppOnboarding === 'true';
+        }
+
+        if (NativeModules.HybridAppModule && !completedHybridAppOnboarding) {
+            onFirstTimeInHybridApp?.();
+            return;
+        }
+
+        onSubsequentRuns?.();
+    });
+}
+
+/**
+ * Handles HybridApp onboarding flow if it's possible and necessary.
+ */
+function handleHybridAppOnboarding() {
+    if (!NativeModules.HybridAppModule) {
         return;
     }
 
-    resolveOnboardingFlowStatus?.();
+    isFirstTimeHybridAppUser({
+        // When user opens New Expensify for the first time from HybridApp we always want to show explanation modal first.
+        onFirstTimeInHybridApp: () => Navigation.navigate(ROUTES.EXPLANATION_MODAL_ROOT),
+        // In other scenarios we need to check if onboarding was completed.
+        onSubsequentRuns: () =>
+            isOnboardingFlowCompleted({
+                onNotCompleted: () =>
+                    setTimeout(() => {
+                        Navigation.navigate(ROUTES.ONBOARDING_ROOT.route);
+                    }, variables.explanationModalDelay),
+            }),
+    });
 }
 
 /**
- * Check if user dismissed modal and if report data are loaded
+ * Check if report data are loaded
  */
 function checkServerDataReady() {
-    if (isLoadingReportData || hasDismissedModal === undefined) {
+    if (isLoadingReportData) {
         return;
     }
 
     resolveIsReadyPromise?.();
 }
 
+/**
+ * Check if user completed HybridApp onboarding
+ */
+function checkTryNewDotDataReady() {
+    if (tryNewDotData === undefined) {
+        return;
+    }
+
+    resolveTryNewDotStatus?.();
+}
+
+/**
+ * Check if the onboarding data is loaded
+ */
+function checkOnboardingDataReady() {
+    if (onboarding === undefined) {
+        return;
+    }
+
+    resolveOnboardingFlowStatus();
+}
+
 function setOnboardingPurposeSelected(value: OnboardingPurposeType) {
     Onyx.set(ONYXKEYS.ONBOARDING_PURPOSE_SELECTED, value ?? null);
 }
 
+function setOnboardingErrorMessage(value: string) {
+    Onyx.set(ONYXKEYS.ONBOARDING_ERROR_MESSAGE, value ?? null);
+}
+
 function setOnboardingAdminsChatReportID(adminsChatReportID?: string) {
     Onyx.set(ONYXKEYS.ONBOARDING_ADMINS_CHAT_REPORT_ID, adminsChatReportID ?? null);
 }
 
+function setOnboardingPolicyID(policyID?: string) {
+    Onyx.set(ONYXKEYS.ONBOARDING_POLICY_ID, policyID ?? null);
+}
+
+function completeHybridAppOnboarding() {
+    const optimisticData: OnyxUpdate[] = [
+        {
+            onyxMethod: Onyx.METHOD.MERGE,
+            key: ONYXKEYS.NVP_TRYNEWDOT,
+            value: {
+                classicRedirect: {
+                    completedHybridAppOnboarding: true,
+                },
+            },
+        },
+    ];
+
+    const failureData: OnyxUpdate[] = [
+        {
+            onyxMethod: Onyx.METHOD.MERGE,
+            key: ONYXKEYS.NVP_TRYNEWDOT,
+            value: {
+                classicRedirect: {
+                    completedHybridAppOnboarding: false,
+                },
+            },
+        },
+    ];
+
+    API.write(WRITE_COMMANDS.COMPLETE_HYBRID_APP_ONBOARDING, {}, {optimisticData, failureData});
+}
+
 Onyx.connect({
     key: ONYXKEYS.NVP_ONBOARDING,
-    initWithStoredValues: false,
     callback: (value) => {
-        if (value === null) {
-            return;
-        }
-
         onboarding = value;
-
         checkOnboardingDataReady();
     },
 });
 
-Onyx.connect({
-    key: ONYXKEYS.NVP_HAS_DISMISSED_IDLE_PANEL,
-    initWithStoredValues: true,
-    callback: (value) => {
-        hasDismissedModal = value ?? false;
-
-        checkServerDataReady();
-    },
-});
-
 Onyx.connect({
     key: ONYXKEYS.IS_LOADING_REPORT_DATA,
     initWithStoredValues: false,
@@ -106,20 +197,11 @@ Onyx.connect({
     },
 });
 
-const allPolicies: OnyxCollection<OnyxPolicy> | EmptyObject = {};
 Onyx.connect({
-    key: ONYXKEYS.COLLECTION.POLICY,
-    callback: (val, key) => {
-        if (!key) {
-            return;
-        }
-
-        if (val === null || val === undefined) {
-            delete allPolicies[key];
-            return;
-        }
-
-        allPolicies[key] = {...allPolicies[key], ...val};
+    key: ONYXKEYS.NVP_TRYNEWDOT,
+    callback: (value) => {
+        tryNewDotData = value;
+        checkTryNewDotDataReady();
     },
 });
 
@@ -127,11 +209,20 @@ function resetAllChecks() {
     isServerDataReadyPromise = new Promise((resolve) => {
         resolveIsReadyPromise = resolve;
     });
-    isOnboardingFlowStatusKnownPromise = new Promise((resolve) => {
+    isOnboardingFlowStatusKnownPromise = new Promise<void>((resolve) => {
         resolveOnboardingFlowStatus = resolve;
     });
-    onboarding = undefined;
     isLoadingReportData = true;
 }
 
-export {onServerDataReady, isOnboardingFlowCompleted, setOnboardingPurposeSelected, resetAllChecks, setOnboardingAdminsChatReportID};
+export {
+    onServerDataReady,
+    isOnboardingFlowCompleted,
+    setOnboardingPurposeSelected,
+    resetAllChecks,
+    setOnboardingAdminsChatReportID,
+    setOnboardingPolicyID,
+    completeHybridAppOnboarding,
+    handleHybridAppOnboarding,
+    setOnboardingErrorMessage,
+};
diff --git a/src/libs/actions/Workflow.ts b/src/libs/actions/Workflow.ts
new file mode 100644
index 000000000000..946d7682675d
--- /dev/null
+++ b/src/libs/actions/Workflow.ts
@@ -0,0 +1,375 @@
+import lodashDropRightWhile from 'lodash/dropRightWhile';
+import lodashMapKeys from 'lodash/mapKeys';
+import type {NullishDeep, OnyxCollection, OnyxUpdate} from 'react-native-onyx';
+import Onyx from 'react-native-onyx';
+import * as API from '@libs/API';
+import type {CreateWorkspaceApprovalParams, RemoveWorkspaceApprovalParams, UpdateWorkspaceApprovalParams} from '@libs/API/parameters';
+import {WRITE_COMMANDS} from '@libs/API/types';
+import {calculateApprovers, convertApprovalWorkflowToPolicyEmployees} from '@libs/WorkflowUtils';
+import CONST from '@src/CONST';
+import type {TranslationPaths} from '@src/languages/types';
+import ONYXKEYS from '@src/ONYXKEYS';
+import type {ApprovalWorkflowOnyx, PersonalDetailsList, Policy} from '@src/types/onyx';
+import type {Approver, Member} from '@src/types/onyx/ApprovalWorkflow';
+import type ApprovalWorkflow from '@src/types/onyx/ApprovalWorkflow';
+import {isEmptyObject} from '@src/types/utils/EmptyObject';
+
+let currentApprovalWorkflow: ApprovalWorkflowOnyx | undefined;
+Onyx.connect({
+    key: ONYXKEYS.APPROVAL_WORKFLOW,
+    callback: (approvalWorkflow) => {
+        currentApprovalWorkflow = approvalWorkflow;
+    },
+});
+
+let allPolicies: OnyxCollection<Policy>;
+Onyx.connect({
+    key: ONYXKEYS.COLLECTION.POLICY,
+    waitForCollectionCallback: true,
+    callback: (value) => (allPolicies = value),
+});
+
+let authToken: string | undefined;
+Onyx.connect({
+    key: ONYXKEYS.SESSION,
+    callback: (value) => {
+        authToken = value?.authToken;
+    },
+});
+
+let personalDetails: PersonalDetailsList | undefined;
+Onyx.connect({
+    key: ONYXKEYS.PERSONAL_DETAILS_LIST,
+    callback: (value) => {
+        personalDetails = value;
+    },
+});
+
+function createApprovalWorkflow(policyID: string, approvalWorkflow: ApprovalWorkflow) {
+    const policy = allPolicies?.[`${ONYXKEYS.COLLECTION.POLICY}${policyID}`];
+
+    if (!authToken || !policy) {
+        return;
+    }
+
+    const previousEmployeeList = {...policy.employeeList};
+    const previousApprovalMode = policy.approvalMode;
+    const updatedEmployees = convertApprovalWorkflowToPolicyEmployees({approvalWorkflow, type: CONST.APPROVAL_WORKFLOW.TYPE.CREATE});
+
+    const optimisticData: OnyxUpdate[] = [
+        {
+            onyxMethod: Onyx.METHOD.MERGE,
+            key: ONYXKEYS.APPROVAL_WORKFLOW,
+            value: {
+                isLoading: true,
+            },
+        },
+        {
+            onyxMethod: Onyx.METHOD.MERGE,
+            key: `${ONYXKEYS.COLLECTION.POLICY}${policyID}`,
+            value: {
+                employeeList: updatedEmployees,
+                approvalMode: CONST.POLICY.APPROVAL_MODE.ADVANCED,
+                pendingFields: {employeeList: CONST.RED_BRICK_ROAD_PENDING_ACTION.ADD},
+            },
+        },
+    ];
+
+    const failureData: OnyxUpdate[] = [
+        {
+            onyxMethod: Onyx.METHOD.MERGE,
+            key: ONYXKEYS.APPROVAL_WORKFLOW,
+            value: {...approvalWorkflow, isLoading: false},
+        },
+        {
+            onyxMethod: Onyx.METHOD.MERGE,
+            key: `${ONYXKEYS.COLLECTION.POLICY}${policyID}`,
+            value: {
+                employeeList: previousEmployeeList,
+                approvalMode: previousApprovalMode,
+                pendingFields: {employeeList: null},
+            },
+        },
+    ];
+
+    const successData: OnyxUpdate[] = [
+        {
+            onyxMethod: Onyx.METHOD.SET,
+            key: ONYXKEYS.APPROVAL_WORKFLOW,
+            value: null,
+        },
+        {
+            onyxMethod: Onyx.METHOD.MERGE,
+            key: `${ONYXKEYS.COLLECTION.POLICY}${policyID}`,
+            value: {
+                pendingFields: {employeeList: null},
+            },
+        },
+    ];
+
+    const parameters: CreateWorkspaceApprovalParams = {policyID, authToken, employees: JSON.stringify(Object.values(updatedEmployees))};
+    API.write(WRITE_COMMANDS.CREATE_WORKSPACE_APPROVAL, parameters, {optimisticData, failureData, successData});
+}
+
+function updateApprovalWorkflow(policyID: string, approvalWorkflow: ApprovalWorkflow, membersToRemove: Member[]) {
+    const policy = allPolicies?.[`${ONYXKEYS.COLLECTION.POLICY}${policyID}`];
+
+    if (!authToken || !policy) {
+        return;
+    }
+
+    const previousDefaultApprover = policy.approver ?? policy.owner;
+    const newDefaultApprover = approvalWorkflow.isDefault ? approvalWorkflow.approvers[0].email : undefined;
+    const previousEmployeeList = {...policy.employeeList};
+    const updatedEmployees = convertApprovalWorkflowToPolicyEmployees({approvalWorkflow, type: CONST.APPROVAL_WORKFLOW.TYPE.UPDATE, membersToRemove});
+
+    const optimisticData: OnyxUpdate[] = [
+        {
+            onyxMethod: Onyx.METHOD.MERGE,
+            key: ONYXKEYS.APPROVAL_WORKFLOW,
+            value: {
+                isLoading: true,
+            },
+        },
+        {
+            onyxMethod: Onyx.METHOD.MERGE,
+            key: `${ONYXKEYS.COLLECTION.POLICY}${policyID}`,
+            value: {
+                employeeList: updatedEmployees,
+                pendingFields: {employeeList: CONST.RED_BRICK_ROAD_PENDING_ACTION.UPDATE},
+                ...(newDefaultApprover ? {approver: newDefaultApprover} : {}),
+            },
+        },
+    ];
+
+    const failureData: OnyxUpdate[] = [
+        {
+            onyxMethod: Onyx.METHOD.MERGE,
+            key: ONYXKEYS.APPROVAL_WORKFLOW,
+            value: {...approvalWorkflow, isLoading: false},
+        },
+        {
+            onyxMethod: Onyx.METHOD.MERGE,
+            key: `${ONYXKEYS.COLLECTION.POLICY}${policyID}`,
+            value: {
+                employeeList: previousEmployeeList,
+                pendingFields: {employeeList: null},
+                ...(newDefaultApprover ? {approver: previousDefaultApprover} : {}),
+            },
+        },
+    ];
+
+    const successData: OnyxUpdate[] = [
+        {
+            onyxMethod: Onyx.METHOD.SET,
+            key: ONYXKEYS.APPROVAL_WORKFLOW,
+            value: null,
+        },
+        {
+            onyxMethod: Onyx.METHOD.MERGE,
+            key: `${ONYXKEYS.COLLECTION.POLICY}${policyID}`,
+            value: {
+                pendingFields: {employeeList: null},
+            },
+        },
+    ];
+
+    const parameters: UpdateWorkspaceApprovalParams = {
+        policyID,
+        authToken,
+        employees: JSON.stringify(Object.values(updatedEmployees)),
+        defaultApprover: newDefaultApprover,
+    };
+    API.write(WRITE_COMMANDS.UPDATE_WORKSPACE_APPROVAL, parameters, {optimisticData, failureData, successData});
+}
+
+function removeApprovalWorkflow(policyID: string, approvalWorkflow: ApprovalWorkflow) {
+    const policy = allPolicies?.[`${ONYXKEYS.COLLECTION.POLICY}${policyID}`];
+
+    if (!authToken || !policy) {
+        return;
+    }
+
+    const previousEmployeeList = {...policy.employeeList};
+    const updatedEmployees = convertApprovalWorkflowToPolicyEmployees({approvalWorkflow, type: CONST.APPROVAL_WORKFLOW.TYPE.REMOVE});
+    const updatedEmployeeList = {...previousEmployeeList, ...updatedEmployees};
+
+    const defaultApprover = policy.approver ?? policy.owner;
+    // If there is more than one workflow, we need to keep the advanced approval mode (first workflow is the default)
+    const hasMoreThanOneWorkflow = Object.values(updatedEmployeeList).some((employee) => !!employee.submitsTo && employee.submitsTo !== defaultApprover);
+
+    const optimisticData: OnyxUpdate[] = [
+        {
+            onyxMethod: Onyx.METHOD.MERGE,
+            key: ONYXKEYS.APPROVAL_WORKFLOW,
+            value: {
+                isLoading: true,
+            },
+        },
+        {
+            onyxMethod: Onyx.METHOD.MERGE,
+            key: `${ONYXKEYS.COLLECTION.POLICY}${policyID}`,
+            value: {
+                employeeList: updatedEmployees,
+                approvalMode: hasMoreThanOneWorkflow ? CONST.POLICY.APPROVAL_MODE.ADVANCED : CONST.POLICY.APPROVAL_MODE.BASIC,
+                pendingFields: {employeeList: CONST.RED_BRICK_ROAD_PENDING_ACTION.UPDATE},
+            },
+        },
+    ];
+
+    const failureData: OnyxUpdate[] = [
+        {
+            onyxMethod: Onyx.METHOD.MERGE,
+            key: ONYXKEYS.APPROVAL_WORKFLOW,
+            value: {...approvalWorkflow, isLoading: false},
+        },
+        {
+            onyxMethod: Onyx.METHOD.MERGE,
+            key: `${ONYXKEYS.COLLECTION.POLICY}${policyID}`,
+            value: {
+                employeeList: previousEmployeeList,
+                approvalMode: CONST.POLICY.APPROVAL_MODE.ADVANCED,
+            },
+        },
+        {
+            onyxMethod: Onyx.METHOD.MERGE,
+            key: `${ONYXKEYS.COLLECTION.POLICY}${policyID}`,
+            value: {
+                pendingFields: {employeeList: null},
+            },
+        },
+    ];
+
+    const successData: OnyxUpdate[] = [
+        {
+            onyxMethod: Onyx.METHOD.SET,
+            key: ONYXKEYS.APPROVAL_WORKFLOW,
+            value: null,
+        },
+        {
+            onyxMethod: Onyx.METHOD.MERGE,
+            key: `${ONYXKEYS.COLLECTION.POLICY}${policyID}`,
+            value: {
+                pendingFields: {employeeList: null},
+            },
+        },
+    ];
+
+    const parameters: RemoveWorkspaceApprovalParams = {policyID, authToken, employees: JSON.stringify(Object.values(updatedEmployees))};
+    API.write(WRITE_COMMANDS.REMOVE_WORKSPACE_APPROVAL, parameters, {optimisticData, failureData, successData});
+}
+
+function setApprovalWorkflowMembers(members: Member[]) {
+    Onyx.merge(ONYXKEYS.APPROVAL_WORKFLOW, {members, errors: null});
+}
+
+/**
+ * Set the approver at the specified index in the current approval workflow
+ * @param approver - The new approver to set
+ * @param approverIndex - The index of the approver to set
+ * @param policyID - The ID of the policy
+ */
+function setApprovalWorkflowApprover(approver: Approver, approverIndex: number, policyID: string) {
+    const policy = allPolicies?.[`${ONYXKEYS.COLLECTION.POLICY}${policyID}`];
+
+    if (!currentApprovalWorkflow || !policy?.employeeList) {
+        return;
+    }
+
+    const approvers: Array<Approver | undefined> = [...currentApprovalWorkflow.approvers];
+    approvers[approverIndex] = approver;
+
+    // Check if the approver forwards to other approvers and add them to the list
+    if (policy.employeeList[approver.email]?.forwardsTo) {
+        const personalDetailsByEmail = lodashMapKeys(personalDetails, (value, key) => value?.login ?? key);
+        const additionalApprovers = calculateApprovers({employees: policy.employeeList, firstEmail: approver.email, personalDetailsByEmail});
+        approvers.splice(approverIndex, approvers.length, ...additionalApprovers);
+    }
+
+    const errors: Record<string, TranslationPaths | null> = {additionalApprover: null};
+    // Check for circular references and reset errors
+    const updatedApprovers = approvers.map((existingApprover, index) => {
+        if (!existingApprover) {
+            return;
+        }
+
+        const hasCircularReference = approvers.slice(0, index).some((previousApprover) => existingApprover.email === previousApprover?.email);
+        if (hasCircularReference) {
+            errors[`approver-${index}`] = 'workflowsPage.approverCircularReference';
+        } else {
+            errors[`approver-${index}`] = null;
+        }
+
+        return {
+            ...existingApprover,
+            isCircularReference: hasCircularReference,
+        };
+    });
+
+    Onyx.merge(ONYXKEYS.APPROVAL_WORKFLOW, {approvers: updatedApprovers, errors});
+}
+
+function clearApprovalWorkflowApprover(approverIndex: number) {
+    if (!currentApprovalWorkflow) {
+        return;
+    }
+
+    const approvers: Array<Approver | undefined> = [...currentApprovalWorkflow.approvers];
+    approvers[approverIndex] = undefined;
+
+    Onyx.merge(ONYXKEYS.APPROVAL_WORKFLOW, {approvers: lodashDropRightWhile(approvers, (approver) => !approver), errors: null});
+}
+
+function clearApprovalWorkflowApprovers() {
+    Onyx.merge(ONYXKEYS.APPROVAL_WORKFLOW, {approvers: []});
+}
+
+function setApprovalWorkflow(approvalWorkflow: NullishDeep<ApprovalWorkflowOnyx>) {
+    Onyx.merge(ONYXKEYS.APPROVAL_WORKFLOW, approvalWorkflow);
+}
+
+function clearApprovalWorkflow() {
+    Onyx.set(ONYXKEYS.APPROVAL_WORKFLOW, null);
+}
+
+type ApprovalWorkflowOnyxValidated = Omit<ApprovalWorkflowOnyx, 'approvers'> & {approvers: Approver[]};
+
+function validateApprovalWorkflow(approvalWorkflow: ApprovalWorkflowOnyx): approvalWorkflow is ApprovalWorkflowOnyxValidated {
+    const errors: Record<string, TranslationPaths> = {};
+
+    approvalWorkflow.approvers.forEach((approver, approverIndex) => {
+        if (!approver) {
+            errors[`approver-${approverIndex}`] = 'common.error.fieldRequired';
+        }
+
+        if (approver?.isCircularReference) {
+            errors[`approver-${approverIndex}`] = 'workflowsPage.approverCircularReference';
+        }
+    });
+
+    if (!approvalWorkflow.members.length && !approvalWorkflow.isDefault) {
+        errors.members = 'common.error.fieldRequired';
+    }
+
+    if (!approvalWorkflow.approvers.length) {
+        errors.additionalApprover = 'common.error.fieldRequired';
+    }
+
+    Onyx.merge(ONYXKEYS.APPROVAL_WORKFLOW, {errors});
+
+    // Return false if there are errors
+    return isEmptyObject(errors);
+}
+
+export {
+    createApprovalWorkflow,
+    updateApprovalWorkflow,
+    removeApprovalWorkflow,
+    setApprovalWorkflowMembers,
+    setApprovalWorkflowApprover,
+    setApprovalWorkflow,
+    clearApprovalWorkflowApprover,
+    clearApprovalWorkflowApprovers,
+    clearApprovalWorkflow,
+    validateApprovalWorkflow,
+};
diff --git a/src/libs/actions/__mocks__/App.ts b/src/libs/actions/__mocks__/App.ts
index 3d2b5814684b..09fd553a87f3 100644
--- a/src/libs/actions/__mocks__/App.ts
+++ b/src/libs/actions/__mocks__/App.ts
@@ -5,13 +5,12 @@ import ONYXKEYS from '@src/ONYXKEYS';
 import type {OnyxUpdatesFromServer} from '@src/types/onyx';
 import createProxyForObject from '@src/utils/createProxyForObject';
 
-const AppImplementation: typeof AppImport = jest.requireActual('@libs/actions/App');
+const AppImplementation = jest.requireActual<typeof AppImport>('@libs/actions/App');
 const {
     setLocale,
     setLocaleAndNavigate,
     setSidebarLoaded,
     setUpPoliciesAndNavigate,
-    openProfile,
     redirectThirdPartyDesktopSignIn,
     openApp,
     reconnectApp,
@@ -40,7 +39,7 @@ const mockValues: AppMockValues = {
 };
 const mockValuesProxy = createProxyForObject(mockValues);
 
-const ApplyUpdatesImplementation: typeof ApplyUpdatesImport = jest.requireActual('@libs/actions/OnyxUpdateManager/utils/applyUpdates');
+const ApplyUpdatesImplementation = jest.requireActual<typeof ApplyUpdatesImport>('@libs/actions/OnyxUpdateManager/utils/applyUpdates');
 const getMissingOnyxUpdates = jest.fn((_fromID: number, toID: number) => {
     if (mockValuesProxy.missingOnyxUpdatesToBeApplied === undefined) {
         return Onyx.set(ONYXKEYS.ONYX_UPDATES_LAST_UPDATE_ID_APPLIED_TO_CLIENT, toID);
@@ -59,7 +58,6 @@ export {
     setLocaleAndNavigate,
     setSidebarLoaded,
     setUpPoliciesAndNavigate,
-    openProfile,
     redirectThirdPartyDesktopSignIn,
     openApp,
     reconnectApp,
diff --git a/src/libs/actions/connections/ConnectToXero.ts b/src/libs/actions/connections/ConnectToXero.ts
deleted file mode 100644
index b5e8d7ab3298..000000000000
--- a/src/libs/actions/connections/ConnectToXero.ts
+++ /dev/null
@@ -1,11 +0,0 @@
-import type {ConnectPolicyToAccountingIntegrationParams} from '@libs/API/parameters';
-import {READ_COMMANDS} from '@libs/API/types';
-import {getCommandURL} from '@libs/ApiUtils';
-
-const getXeroSetupLink = (policyID: string) => {
-    const params: ConnectPolicyToAccountingIntegrationParams = {policyID};
-    const commandURL = getCommandURL({command: READ_COMMANDS.CONNECT_POLICY_TO_XERO, shouldSkipWebProxy: true});
-    return commandURL + new URLSearchParams(params).toString();
-};
-
-export default getXeroSetupLink;
diff --git a/src/libs/actions/connections/NetSuiteCommands.ts b/src/libs/actions/connections/NetSuiteCommands.ts
new file mode 100644
index 000000000000..8be8d2cb077a
--- /dev/null
+++ b/src/libs/actions/connections/NetSuiteCommands.ts
@@ -0,0 +1,1005 @@
+import type {OnyxUpdate} from 'react-native-onyx';
+import Onyx from 'react-native-onyx';
+import type {ValueOf} from 'type-fest';
+import * as API from '@libs/API';
+import type {ConnectPolicyToNetSuiteParams} from '@libs/API/parameters';
+import {WRITE_COMMANDS} from '@libs/API/types';
+import * as ErrorUtils from '@libs/ErrorUtils';
+import CONST from '@src/CONST';
+import ONYXKEYS from '@src/ONYXKEYS';
+import type {Connections, NetSuiteCustomFormID, NetSuiteCustomList, NetSuiteCustomSegment, NetSuiteMappingValues} from '@src/types/onyx/Policy';
+import type {OnyxData} from '@src/types/onyx/Request';
+
+type SubsidiaryParam = {
+    subsidiaryID: string;
+    subsidiary: string;
+};
+
+function connectPolicyToNetSuite(policyID: string, credentials: Omit<ConnectPolicyToNetSuiteParams, 'policyID'>) {
+    const optimisticData: OnyxUpdate[] = [
+        {
+            onyxMethod: Onyx.METHOD.MERGE,
+            key: `${ONYXKEYS.COLLECTION.POLICY_CONNECTION_SYNC_PROGRESS}${policyID}`,
+            value: {
+                stageInProgress: CONST.POLICY.CONNECTIONS.SYNC_STAGE_NAME.NETSUITE_SYNC_CONNECTION,
+                connectionName: CONST.POLICY.CONNECTIONS.NAME.NETSUITE,
+                timestamp: new Date().toISOString(),
+            },
+        },
+    ];
+    const parameters: ConnectPolicyToNetSuiteParams = {
+        policyID,
+        ...credentials,
+    };
+    API.write(WRITE_COMMANDS.CONNECT_POLICY_TO_NETSUITE, parameters, {optimisticData});
+}
+
+function updateNetSuiteOnyxData<TSettingName extends keyof Connections['netsuite']['options']['config']>(
+    policyID: string,
+    settingName: TSettingName,
+    settingValue: Partial<Connections['netsuite']['options']['config'][TSettingName]>,
+    oldSettingValue: Partial<Connections['netsuite']['options']['config'][TSettingName]>,
+) {
+    const optimisticData: OnyxUpdate[] = [
+        {
+            onyxMethod: Onyx.METHOD.MERGE,
+            key: `${ONYXKEYS.COLLECTION.POLICY}${policyID}`,
+            value: {
+                connections: {
+                    netsuite: {
+                        options: {
+                            config: {
+                                [settingName]: settingValue ?? null,
+                                pendingFields: {
+                                    [settingName]: CONST.RED_BRICK_ROAD_PENDING_ACTION.UPDATE,
+                                },
+                                errorFields: {
+                                    [settingName]: null,
+                                },
+                            },
+                        },
+                    },
+                },
+            },
+        },
+    ];
+
+    const failureData: OnyxUpdate[] = [
+        {
+            onyxMethod: Onyx.METHOD.MERGE,
+            key: `${ONYXKEYS.COLLECTION.POLICY}${policyID}`,
+            value: {
+                connections: {
+                    netsuite: {
+                        options: {
+                            config: {
+                                [settingName]: oldSettingValue ?? null,
+                                pendingFields: {
+                                    [settingName]: null,
+                                },
+                                errorFields: {
+                                    [settingName]: ErrorUtils.getMicroSecondOnyxErrorWithTranslationKey('common.genericErrorMessage'),
+                                },
+                            },
+                        },
+                    },
+                },
+            },
+        },
+    ];
+
+    const successData: OnyxUpdate[] = [
+        {
+            onyxMethod: Onyx.METHOD.MERGE,
+            key: `${ONYXKEYS.COLLECTION.POLICY}${policyID}`,
+            value: {
+                connections: {
+                    netsuite: {
+                        options: {
+                            config: {
+                                [settingName]: settingValue ?? null,
+                                pendingFields: {
+                                    [settingName]: null,
+                                },
+                                errorFields: {
+                                    [settingName]: null,
+                                },
+                            },
+                        },
+                    },
+                },
+            },
+        },
+    ];
+    return {optimisticData, failureData, successData};
+}
+
+function updateNetSuiteSyncOptionsOnyxData<TSettingName extends keyof Connections['netsuite']['options']['config']['syncOptions']>(
+    policyID: string,
+    settingName: TSettingName,
+    settingValue: Partial<Connections['netsuite']['options']['config']['syncOptions'][TSettingName]>,
+    oldSettingValue: Partial<Connections['netsuite']['options']['config']['syncOptions'][TSettingName]>,
+) {
+    const optimisticData: OnyxUpdate[] = [
+        {
+            onyxMethod: Onyx.METHOD.MERGE,
+            key: `${ONYXKEYS.COLLECTION.POLICY}${policyID}`,
+            value: {
+                connections: {
+                    netsuite: {
+                        options: {
+                            config: {
+                                syncOptions: {
+                                    [settingName]: settingValue ?? null,
+                                    pendingFields: {
+                                        [settingName]: CONST.RED_BRICK_ROAD_PENDING_ACTION.UPDATE,
+                                    },
+                                },
+                                errorFields: {
+                                    [settingName]: null,
+                                },
+                            },
+                        },
+                    },
+                },
+            },
+        },
+    ];
+
+    const failureData: OnyxUpdate[] = [
+        {
+            onyxMethod: Onyx.METHOD.MERGE,
+            key: `${ONYXKEYS.COLLECTION.POLICY}${policyID}`,
+            value: {
+                connections: {
+                    netsuite: {
+                        options: {
+                            config: {
+                                syncOptions: {
+                                    [settingName]: oldSettingValue ?? null,
+                                    pendingFields: {
+                                        [settingName]: null,
+                                    },
+                                },
+                                errorFields: {
+                                    [settingName]: ErrorUtils.getMicroSecondOnyxErrorWithTranslationKey('common.genericErrorMessage'),
+                                },
+                            },
+                        },
+                    },
+                },
+            },
+        },
+    ];
+
+    const successData: OnyxUpdate[] = [
+        {
+            onyxMethod: Onyx.METHOD.MERGE,
+            key: `${ONYXKEYS.COLLECTION.POLICY}${policyID}`,
+            value: {
+                connections: {
+                    netsuite: {
+                        options: {
+                            config: {
+                                syncOptions: {
+                                    [settingName]: settingValue ?? null,
+                                    pendingFields: {
+                                        [settingName]: null,
+                                    },
+                                },
+                                errorFields: {
+                                    [settingName]: null,
+                                },
+                            },
+                        },
+                    },
+                },
+            },
+        },
+    ];
+    return {optimisticData, failureData, successData};
+}
+
+function updateNetSuiteSubsidiary(policyID: string, newSubsidiary: SubsidiaryParam, oldSubsidiary: SubsidiaryParam) {
+    const onyxData: OnyxData = {
+        optimisticData: [
+            {
+                onyxMethod: Onyx.METHOD.MERGE,
+                key: `${ONYXKEYS.COLLECTION.POLICY}${policyID}`,
+                value: {
+                    connections: {
+                        netsuite: {
+                            options: {
+                                config: {
+                                    subsidiary: newSubsidiary.subsidiary,
+                                    subsidiaryID: newSubsidiary.subsidiaryID,
+                                    pendingFields: {
+                                        subsidiary: CONST.RED_BRICK_ROAD_PENDING_ACTION.UPDATE,
+                                    },
+                                    errorFields: {
+                                        subsidiary: null,
+                                    },
+                                },
+                            },
+                        },
+                    },
+                },
+            },
+        ],
+        successData: [
+            {
+                onyxMethod: Onyx.METHOD.MERGE,
+                key: `${ONYXKEYS.COLLECTION.POLICY}${policyID}`,
+                value: {
+                    connections: {
+                        netsuite: {
+                            options: {
+                                config: {
+                                    subsidiary: newSubsidiary.subsidiary,
+                                    subsidiaryID: newSubsidiary.subsidiaryID,
+                                    errorFields: {
+                                        subsidiary: null,
+                                    },
+                                    pendingFields: {
+                                        subsidiary: null,
+                                    },
+                                },
+                            },
+                        },
+                    },
+                },
+            },
+        ],
+        failureData: [
+            {
+                onyxMethod: Onyx.METHOD.MERGE,
+                key: `${ONYXKEYS.COLLECTION.POLICY}${policyID}`,
+                value: {
+                    connections: {
+                        netsuite: {
+                            options: {
+                                config: {
+                                    subsidiary: oldSubsidiary.subsidiary,
+                                    subsidiaryID: oldSubsidiary.subsidiaryID,
+                                    errorFields: {
+                                        subsidiary: ErrorUtils.getMicroSecondOnyxErrorWithTranslationKey('common.genericErrorMessage'),
+                                    },
+                                    pendingFields: {
+                                        subsidiary: null,
+                                    },
+                                },
+                            },
+                        },
+                    },
+                },
+            },
+        ],
+    };
+
+    const params = {
+        policyID,
+        ...newSubsidiary,
+    };
+    API.write(WRITE_COMMANDS.UPDATE_NETSUITE_SUBSIDIARY, params, onyxData);
+}
+
+function updateNetSuiteImportMapping<TMappingName extends keyof Connections['netsuite']['options']['config']['syncOptions']['mapping']>(
+    policyID: string,
+    mappingName: TMappingName,
+    mappingValue: ValueOf<typeof CONST.INTEGRATION_ENTITY_MAP_TYPES>,
+    oldMappingValue?: ValueOf<typeof CONST.INTEGRATION_ENTITY_MAP_TYPES>,
+) {
+    const onyxData: OnyxData = {
+        optimisticData: [
+            {
+                onyxMethod: Onyx.METHOD.MERGE,
+                key: `${ONYXKEYS.COLLECTION.POLICY}${policyID}`,
+                value: {
+                    connections: {
+                        netsuite: {
+                            options: {
+                                config: {
+                                    syncOptions: {
+                                        mapping: {
+                                            [mappingName]: mappingValue,
+                                            pendingFields: {
+                                                [mappingName]: CONST.RED_BRICK_ROAD_PENDING_ACTION.UPDATE,
+                                            },
+                                        },
+                                    },
+                                    errorFields: {
+                                        [mappingName]: null,
+                                    },
+                                },
+                            },
+                        },
+                    },
+                },
+            },
+        ],
+        successData: [
+            {
+                onyxMethod: Onyx.METHOD.MERGE,
+                key: `${ONYXKEYS.COLLECTION.POLICY}${policyID}`,
+                value: {
+                    connections: {
+                        netsuite: {
+                            options: {
+                                config: {
+                                    syncOptions: {
+                                        mapping: {
+                                            [mappingName]: mappingValue,
+                                            pendingFields: {
+                                                [mappingName]: null,
+                                            },
+                                        },
+                                    },
+                                    errorFields: {
+                                        [mappingName]: null,
+                                    },
+                                },
+                            },
+                        },
+                    },
+                },
+            },
+        ],
+        failureData: [
+            {
+                onyxMethod: Onyx.METHOD.MERGE,
+                key: `${ONYXKEYS.COLLECTION.POLICY}${policyID}`,
+                value: {
+                    connections: {
+                        netsuite: {
+                            options: {
+                                config: {
+                                    syncOptions: {
+                                        mapping: {
+                                            [mappingName]: oldMappingValue,
+                                            pendingFields: {
+                                                [mappingName]: null,
+                                            },
+                                        },
+                                    },
+                                    errorFields: {
+                                        [mappingName]: ErrorUtils.getMicroSecondOnyxErrorWithTranslationKey('common.genericErrorMessage'),
+                                    },
+                                },
+                            },
+                        },
+                    },
+                },
+            },
+        ],
+    };
+
+    const params = {
+        policyID,
+        mapping: mappingValue,
+    };
+
+    let commandName;
+    switch (mappingName) {
+        case 'departments':
+            commandName = WRITE_COMMANDS.UPDATE_NETSUITE_DEPARTMENTS_MAPPING;
+            break;
+        case 'classes':
+            commandName = WRITE_COMMANDS.UPDATE_NETSUITE_CLASSES_MAPPING;
+            break;
+        case 'locations':
+            commandName = WRITE_COMMANDS.UPDATE_NETSUITE_LOCATIONS_MAPPING;
+            break;
+        case 'customers':
+            commandName = WRITE_COMMANDS.UPDATE_NETSUITE_CUSTOMERS_MAPPING;
+            break;
+        case 'jobs':
+            commandName = WRITE_COMMANDS.UPDATE_NETSUITE_JOBS_MAPPING;
+            break;
+        default:
+            return;
+    }
+
+    API.write(commandName, params, onyxData);
+}
+
+function updateNetSuiteCustomersJobsMapping(
+    policyID: string,
+    mappingValue: {
+        customersMapping: NetSuiteMappingValues;
+        jobsMapping: NetSuiteMappingValues;
+    },
+    oldMappingValue: {
+        customersMapping?: NetSuiteMappingValues;
+        jobsMapping?: NetSuiteMappingValues;
+    },
+) {
+    const onyxData: OnyxData = {
+        optimisticData: [
+            {
+                onyxMethod: Onyx.METHOD.MERGE,
+                key: `${ONYXKEYS.COLLECTION.POLICY}${policyID}`,
+                value: {
+                    connections: {
+                        netsuite: {
+                            options: {
+                                config: {
+                                    syncOptions: {
+                                        mapping: {
+                                            customers: mappingValue.customersMapping,
+                                            jobs: mappingValue.jobsMapping,
+                                            pendingFields: {
+                                                customers: CONST.RED_BRICK_ROAD_PENDING_ACTION.UPDATE,
+                                                jobs: CONST.RED_BRICK_ROAD_PENDING_ACTION.UPDATE,
+                                            },
+                                        },
+                                    },
+                                    errorFields: {
+                                        customers: null,
+                                        jobs: null,
+                                    },
+                                },
+                            },
+                        },
+                    },
+                },
+            },
+        ],
+        successData: [
+            {
+                onyxMethod: Onyx.METHOD.MERGE,
+                key: `${ONYXKEYS.COLLECTION.POLICY}${policyID}`,
+                value: {
+                    connections: {
+                        netsuite: {
+                            options: {
+                                config: {
+                                    syncOptions: {
+                                        mapping: {
+                                            customers: mappingValue.customersMapping,
+                                            jobs: mappingValue.jobsMapping,
+                                            pendingFields: {
+                                                customers: null,
+                                                jobs: null,
+                                            },
+                                        },
+                                    },
+                                    errorFields: {
+                                        customers: null,
+                                        jobs: null,
+                                    },
+                                },
+                            },
+                        },
+                    },
+                },
+            },
+        ],
+        failureData: [
+            {
+                onyxMethod: Onyx.METHOD.MERGE,
+                key: `${ONYXKEYS.COLLECTION.POLICY}${policyID}`,
+                value: {
+                    connections: {
+                        netsuite: {
+                            options: {
+                                config: {
+                                    syncOptions: {
+                                        mapping: {
+                                            customers: oldMappingValue.customersMapping,
+                                            jobs: oldMappingValue.jobsMapping,
+                                            pendingFields: {
+                                                customers: null,
+                                                jobs: null,
+                                            },
+                                        },
+                                    },
+                                    errorFields: {
+                                        customers: ErrorUtils.getMicroSecondOnyxErrorWithTranslationKey('common.genericErrorMessage'),
+                                        jobs: ErrorUtils.getMicroSecondOnyxErrorWithTranslationKey('common.genericErrorMessage'),
+                                    },
+                                },
+                            },
+                        },
+                    },
+                },
+            },
+        ],
+    };
+
+    const params = {
+        policyID,
+        ...mappingValue,
+    };
+
+    API.write(WRITE_COMMANDS.UPDATE_NETSUITE_CUSTOMERS_JOBS_MAPPING, params, onyxData);
+}
+
+function updateNetSuiteSyncTaxConfiguration(policyID: string, isSyncTaxEnabled: boolean) {
+    const onyxData = updateNetSuiteSyncOptionsOnyxData(policyID, CONST.NETSUITE_CONFIG.SYNC_OPTIONS.SYNC_TAX, isSyncTaxEnabled, !isSyncTaxEnabled);
+
+    const params = {
+        policyID,
+        enabled: isSyncTaxEnabled,
+    };
+    API.write(WRITE_COMMANDS.UPDATE_NETSUITE_SYNC_TAX_CONFIGURATION, params, onyxData);
+}
+
+function updateNetSuiteCrossSubsidiaryCustomersConfiguration(policyID: string, isCrossSubsidiaryCustomersEnabled: boolean) {
+    const onyxData = updateNetSuiteSyncOptionsOnyxData(
+        policyID,
+        CONST.NETSUITE_CONFIG.SYNC_OPTIONS.CROSS_SUBSIDIARY_CUSTOMERS,
+        isCrossSubsidiaryCustomersEnabled,
+        !isCrossSubsidiaryCustomersEnabled,
+    );
+
+    const params = {
+        policyID,
+        enabled: isCrossSubsidiaryCustomersEnabled,
+    };
+    API.write(WRITE_COMMANDS.UPDATE_NETSUITE_CROSS_SUBSIDIARY_CUSTOMER_CONFIGURATION, params, onyxData);
+}
+
+function updateNetSuiteCustomSegments(policyID: string, records: NetSuiteCustomSegment[], oldRecords: NetSuiteCustomSegment[]) {
+    const onyxData = updateNetSuiteSyncOptionsOnyxData(policyID, CONST.NETSUITE_CONFIG.IMPORT_CUSTOM_FIELDS.CUSTOM_SEGMENTS, records, oldRecords);
+
+    API.write(
+        WRITE_COMMANDS.UPDATE_NETSUITE_CUSTOM_SEGMENTS,
+        {
+            policyID,
+            customSegments: JSON.stringify(records),
+        },
+        onyxData,
+    );
+}
+
+function updateNetSuiteCustomLists(policyID: string, records: NetSuiteCustomList[], oldRecords: NetSuiteCustomList[]) {
+    const onyxData = updateNetSuiteSyncOptionsOnyxData(policyID, CONST.NETSUITE_CONFIG.IMPORT_CUSTOM_FIELDS.CUSTOM_LISTS, records, oldRecords);
+    API.write(
+        WRITE_COMMANDS.UPDATE_NETSUITE_CUSTOM_LISTS,
+        {
+            policyID,
+            customLists: JSON.stringify(records),
+        },
+        onyxData,
+    );
+}
+
+function updateNetSuiteExporter(policyID: string, exporter: string, oldExporter: string) {
+    const onyxData = updateNetSuiteOnyxData(policyID, CONST.NETSUITE_CONFIG.EXPORTER, exporter, oldExporter);
+
+    const parameters = {
+        policyID,
+        email: exporter,
+    };
+    API.write(WRITE_COMMANDS.UPDATE_NETSUITE_EXPORTER, parameters, onyxData);
+}
+
+function updateNetSuiteExportDate(policyID: string, date: ValueOf<typeof CONST.NETSUITE_EXPORT_DATE>, oldDate?: ValueOf<typeof CONST.NETSUITE_EXPORT_DATE>) {
+    const onyxData = updateNetSuiteOnyxData(policyID, CONST.NETSUITE_CONFIG.EXPORT_DATE, date, oldDate);
+
+    const parameters = {
+        policyID,
+        value: date,
+    };
+    API.write(WRITE_COMMANDS.UPDATE_NETSUITE_EXPORT_DATE, parameters, onyxData);
+}
+
+function updateNetSuiteReimbursableExpensesExportDestination(
+    policyID: string,
+    destination: ValueOf<typeof CONST.NETSUITE_EXPORT_DESTINATION>,
+    oldDestination: ValueOf<typeof CONST.NETSUITE_EXPORT_DESTINATION>,
+) {
+    const onyxData = updateNetSuiteOnyxData(policyID, CONST.NETSUITE_CONFIG.REIMBURSABLE_EXPENSES_EXPORT_DESTINATION, destination, oldDestination);
+
+    const parameters = {
+        policyID,
+        value: destination,
+    };
+    API.write(WRITE_COMMANDS.UPDATE_NETSUITE_REIMBURSABLE_EXPENSES_EXPORT_DESTINATION, parameters, onyxData);
+}
+
+function updateNetSuiteNonReimbursableExpensesExportDestination(
+    policyID: string,
+    destination: ValueOf<typeof CONST.NETSUITE_EXPORT_DESTINATION>,
+    oldDestination: ValueOf<typeof CONST.NETSUITE_EXPORT_DESTINATION>,
+) {
+    const onyxData = updateNetSuiteOnyxData(policyID, CONST.NETSUITE_CONFIG.NON_REIMBURSABLE_EXPENSES_EXPORT_DESTINATION, destination, oldDestination);
+
+    const parameters = {
+        policyID,
+        value: destination,
+    };
+    API.write(WRITE_COMMANDS.UPDATE_NETSUITE_NONREIMBURSABLE_EXPENSES_EXPORT_DESTINATION, parameters, onyxData);
+}
+
+function updateNetSuiteDefaultVendor(policyID: string, vendorID: string, oldVendorID?: string) {
+    const onyxData = updateNetSuiteOnyxData(policyID, CONST.NETSUITE_CONFIG.DEFAULT_VENDOR, vendorID, oldVendorID);
+
+    const parameters = {
+        policyID,
+        vendorID,
+    };
+    API.write(WRITE_COMMANDS.UPDATE_NETSUITE_DEFAULT_VENDOR, parameters, onyxData);
+}
+
+function updateNetSuiteReimbursablePayableAccount(policyID: string, bankAccountID: string, oldBankAccountID: string) {
+    const onyxData = updateNetSuiteOnyxData(policyID, CONST.NETSUITE_CONFIG.REIMBURSABLE_PAYABLE_ACCOUNT, bankAccountID, oldBankAccountID);
+
+    const parameters = {
+        policyID,
+        bankAccountID,
+    };
+    API.write(WRITE_COMMANDS.UPDATE_NETSUITE_REIMBURSABLE_PAYABLE_ACCOUNT, parameters, onyxData);
+}
+
+function updateNetSuitePayableAcct(policyID: string, bankAccountID: string, oldBankAccountID: string) {
+    const onyxData = updateNetSuiteOnyxData(policyID, CONST.NETSUITE_CONFIG.PAYABLE_ACCT, bankAccountID, oldBankAccountID);
+
+    const parameters = {
+        policyID,
+        bankAccountID,
+    };
+    API.write(WRITE_COMMANDS.UPDATE_NETSUITE_PAYABLE_ACCT, parameters, onyxData);
+}
+
+function updateNetSuiteJournalPostingPreference(
+    policyID: string,
+    postingPreference: ValueOf<typeof CONST.NETSUITE_JOURNAL_POSTING_PREFERENCE>,
+    oldPostingPreference?: ValueOf<typeof CONST.NETSUITE_JOURNAL_POSTING_PREFERENCE>,
+) {
+    const onyxData = updateNetSuiteOnyxData(policyID, CONST.NETSUITE_CONFIG.JOURNAL_POSTING_PREFERENCE, postingPreference, oldPostingPreference);
+
+    const parameters = {
+        policyID,
+        value: postingPreference,
+    };
+    API.write(WRITE_COMMANDS.UPDATE_NETSUITE_JOURNAL_POSTING_PREFERENCE, parameters, onyxData);
+}
+
+function updateNetSuiteReceivableAccount(policyID: string, bankAccountID: string, oldBankAccountID?: string) {
+    const onyxData = updateNetSuiteOnyxData(policyID, CONST.NETSUITE_CONFIG.RECEIVABLE_ACCOUNT, bankAccountID, oldBankAccountID);
+
+    const parameters = {
+        policyID,
+        bankAccountID,
+    };
+    API.write(WRITE_COMMANDS.UPDATE_NETSUITE_RECEIVABLE_ACCOUNT, parameters, onyxData);
+}
+
+function updateNetSuiteInvoiceItemPreference(
+    policyID: string,
+    value: ValueOf<typeof CONST.NETSUITE_INVOICE_ITEM_PREFERENCE>,
+    oldValue?: ValueOf<typeof CONST.NETSUITE_INVOICE_ITEM_PREFERENCE>,
+) {
+    const onyxData = updateNetSuiteOnyxData(policyID, CONST.NETSUITE_CONFIG.INVOICE_ITEM_PREFERENCE, value, oldValue);
+
+    const parameters = {
+        policyID,
+        value,
+    };
+    API.write(WRITE_COMMANDS.UPDATE_NETSUITE_INVOICE_ITEM_PREFERENCE, parameters, onyxData);
+}
+
+function updateNetSuiteInvoiceItem(policyID: string, itemID: string, oldItemID?: string) {
+    const onyxData = updateNetSuiteOnyxData(policyID, CONST.NETSUITE_CONFIG.INVOICE_ITEM, itemID, oldItemID);
+
+    const parameters = {
+        policyID,
+        itemID,
+    };
+    API.write(WRITE_COMMANDS.UPDATE_NETSUITE_INVOICE_ITEM, parameters, onyxData);
+}
+
+function updateNetSuiteTaxPostingAccount(policyID: string, bankAccountID: string, oldBankAccountID?: string) {
+    const onyxData = updateNetSuiteOnyxData(policyID, CONST.NETSUITE_CONFIG.TAX_POSTING_ACCOUNT, bankAccountID, oldBankAccountID);
+
+    const parameters = {
+        policyID,
+        bankAccountID,
+    };
+    API.write(WRITE_COMMANDS.UPDATE_NETSUITE_TAX_POSTING_ACCOUNT, parameters, onyxData);
+}
+
+function updateNetSuiteProvincialTaxPostingAccount(policyID: string, bankAccountID: string, oldBankAccountID?: string) {
+    const onyxData = updateNetSuiteOnyxData(policyID, CONST.NETSUITE_CONFIG.PROVINCIAL_TAX_POSTING_ACCOUNT, bankAccountID, oldBankAccountID);
+
+    const parameters = {
+        policyID,
+        bankAccountID,
+    };
+    API.write(WRITE_COMMANDS.UPDATE_NETSUITE_PROVINCIAL_TAX_POSTING_ACCOUNT, parameters, onyxData);
+}
+
+function updateNetSuiteAllowForeignCurrency(policyID: string, value: boolean, oldValue?: boolean) {
+    const onyxData = updateNetSuiteOnyxData(policyID, CONST.NETSUITE_CONFIG.ALLOW_FOREIGN_CURRENCY, value, oldValue);
+
+    const parameters = {
+        policyID,
+        enabled: value,
+    };
+    API.write(WRITE_COMMANDS.UPDATE_NETSUITE_ALLOW_FOREIGN_CURRENCY, parameters, onyxData);
+}
+
+function updateNetSuiteExportToNextOpenPeriod(policyID: string, value: boolean, oldValue: boolean) {
+    const onyxData = updateNetSuiteOnyxData(policyID, CONST.NETSUITE_CONFIG.EXPORT_TO_NEXT_OPEN_PERIOD, value, oldValue);
+
+    const parameters = {
+        policyID,
+        enabled: value,
+    };
+    API.write(WRITE_COMMANDS.UPDATE_NETSUITE_EXPORT_TO_NEXT_OPEN_PERIOD, parameters, onyxData);
+}
+
+function updateNetSuiteAutoSync(policyID: string, value: boolean) {
+    const optimisticData: OnyxUpdate[] = [
+        {
+            onyxMethod: Onyx.METHOD.MERGE,
+            key: `${ONYXKEYS.COLLECTION.POLICY}${policyID}`,
+            value: {
+                connections: {
+                    netsuite: {
+                        config: {
+                            autoSync: {
+                                enabled: value,
+                            },
+                            pendingFields: {
+                                autoSync: CONST.RED_BRICK_ROAD_PENDING_ACTION.UPDATE,
+                            },
+                            errorFields: {
+                                autoSync: null,
+                            },
+                        },
+                    },
+                },
+            },
+        },
+    ];
+
+    const failureData: OnyxUpdate[] = [
+        {
+            onyxMethod: Onyx.METHOD.MERGE,
+            key: `${ONYXKEYS.COLLECTION.POLICY}${policyID}`,
+            value: {
+                connections: {
+                    netsuite: {
+                        config: {
+                            autoSync: {
+                                enabled: !value,
+                            },
+                            pendingFields: {
+                                autoSync: null,
+                            },
+                            errorFields: {
+                                autoSync: ErrorUtils.getMicroSecondOnyxErrorWithTranslationKey('common.genericErrorMessage'),
+                            },
+                        },
+                    },
+                },
+            },
+        },
+    ];
+
+    const successData: OnyxUpdate[] = [
+        {
+            onyxMethod: Onyx.METHOD.MERGE,
+            key: `${ONYXKEYS.COLLECTION.POLICY}${policyID}`,
+            value: {
+                connections: {
+                    netsuite: {
+                        config: {
+                            autoSync: {
+                                enabled: value,
+                            },
+                            pendingFields: {
+                                autoSync: null,
+                            },
+                            errorFields: {
+                                autoSync: null,
+                            },
+                        },
+                    },
+                },
+            },
+        },
+    ];
+
+    const parameters = {
+        policyID,
+        enabled: value,
+    };
+    API.write(WRITE_COMMANDS.UPDATE_NETSUITE_AUTO_SYNC, parameters, {optimisticData, failureData, successData});
+}
+
+function updateNetSuiteSyncReimbursedReports(policyID: string, value: boolean) {
+    const onyxData = updateNetSuiteSyncOptionsOnyxData(policyID, CONST.NETSUITE_CONFIG.SYNC_OPTIONS.SYNC_REIMBURSED_REPORTS, value, !value);
+
+    const parameters = {
+        policyID,
+        enabled: value,
+    };
+    API.write(WRITE_COMMANDS.UPDATE_NETSUITE_SYNC_REIMBURSED_REPORTS, parameters, onyxData);
+}
+
+function updateNetSuiteSyncPeople(policyID: string, value: boolean) {
+    const onyxData = updateNetSuiteSyncOptionsOnyxData(policyID, CONST.NETSUITE_CONFIG.SYNC_OPTIONS.SYNC_PEOPLE, value, !value);
+
+    const parameters = {
+        policyID,
+        enabled: value,
+    };
+    API.write(WRITE_COMMANDS.UPDATE_NETSUITE_SYNC_PEOPLE, parameters, onyxData);
+}
+
+function updateNetSuiteAutoCreateEntities(policyID: string, value: boolean) {
+    const onyxData = updateNetSuiteOnyxData(policyID, CONST.NETSUITE_CONFIG.AUTO_CREATE_ENTITIES, value, !value);
+
+    const parameters = {
+        policyID,
+        enabled: value,
+    };
+    API.write(WRITE_COMMANDS.UPDATE_NETSUITE_AUTO_CREATE_ENTITIES, parameters, onyxData);
+}
+
+function updateNetSuiteEnableNewCategories(policyID: string, value: boolean) {
+    const onyxData = updateNetSuiteSyncOptionsOnyxData(policyID, CONST.NETSUITE_CONFIG.SYNC_OPTIONS.ENABLE_NEW_CATEGORIES, value, !value);
+
+    const parameters = {
+        policyID,
+        enabled: value,
+    };
+    API.write(WRITE_COMMANDS.UPDATE_NETSUITE_ENABLE_NEW_CATEGORIES, parameters, onyxData);
+}
+
+function updateNetSuiteCustomFormIDOptionsEnabled(policyID: string, value: boolean) {
+    const data = {
+        enabled: value,
+    };
+    const oldData = {
+        enabled: !value,
+    };
+    const onyxData = updateNetSuiteOnyxData(policyID, CONST.NETSUITE_CONFIG.CUSTOM_FORM_ID_OPTIONS, data, oldData);
+
+    const parameters = {
+        policyID,
+        enabled: value,
+    };
+    API.write(WRITE_COMMANDS.UPDATE_NETSUITE_CUSTOM_FORM_ID_OPTIONS_ENABLED, parameters, onyxData);
+}
+
+function updateNetSuiteReimbursementAccountID(policyID: string, bankAccountID: string, oldBankAccountID?: string) {
+    const onyxData = updateNetSuiteOnyxData(policyID, CONST.NETSUITE_CONFIG.REIMBURSEMENT_ACCOUNT_ID, bankAccountID, oldBankAccountID);
+
+    const parameters = {
+        policyID,
+        bankAccountID,
+    };
+    API.write(WRITE_COMMANDS.UPDATE_NETSUITE_REIMBURSEMENT_ACCOUNT_ID, parameters, onyxData);
+}
+
+function updateNetSuiteCollectionAccount(policyID: string, bankAccountID: string, oldBankAccountID?: string) {
+    const onyxData = updateNetSuiteOnyxData(policyID, CONST.NETSUITE_CONFIG.COLLECTION_ACCOUNT, bankAccountID, oldBankAccountID);
+
+    const parameters = {
+        policyID,
+        bankAccountID,
+    };
+    API.write(WRITE_COMMANDS.UPDATE_NETSUITE_COLLECTION_ACCOUNT, parameters, onyxData);
+}
+
+function updateNetSuiteExportReportsTo(
+    policyID: string,
+    approvalLevel: ValueOf<typeof CONST.NETSUITE_REPORTS_APPROVAL_LEVEL>,
+    oldApprovalLevel: ValueOf<typeof CONST.NETSUITE_REPORTS_APPROVAL_LEVEL>,
+) {
+    const onyxData = updateNetSuiteSyncOptionsOnyxData(policyID, CONST.NETSUITE_CONFIG.SYNC_OPTIONS.EXPORT_REPORTS_TO, approvalLevel, oldApprovalLevel);
+
+    const parameters = {
+        policyID,
+        value: approvalLevel,
+    };
+    API.write(WRITE_COMMANDS.UPDATE_NETSUITE_EXPORT_REPORTS_TO, parameters, onyxData);
+}
+
+function updateNetSuiteExportVendorBillsTo(
+    policyID: string,
+    approvalLevel: ValueOf<typeof CONST.NETSUITE_VENDOR_BILLS_APPROVAL_LEVEL>,
+    oldApprovalLevel: ValueOf<typeof CONST.NETSUITE_VENDOR_BILLS_APPROVAL_LEVEL>,
+) {
+    const onyxData = updateNetSuiteSyncOptionsOnyxData(policyID, CONST.NETSUITE_CONFIG.SYNC_OPTIONS.EXPORT_VENDOR_BILLS_TO, approvalLevel, oldApprovalLevel);
+
+    const parameters = {
+        policyID,
+        value: approvalLevel,
+    };
+    API.write(WRITE_COMMANDS.UPDATE_NETSUITE_VENDOR_BILLS_TO, parameters, onyxData);
+}
+
+function updateNetSuiteExportJournalsTo(
+    policyID: string,
+    approvalLevel: ValueOf<typeof CONST.NETSUITE_JOURNALS_APPROVAL_LEVEL>,
+    oldApprovalLevel: ValueOf<typeof CONST.NETSUITE_JOURNALS_APPROVAL_LEVEL>,
+) {
+    const onyxData = updateNetSuiteSyncOptionsOnyxData(policyID, CONST.NETSUITE_CONFIG.SYNC_OPTIONS.EXPORT_JOURNALS_TO, approvalLevel, oldApprovalLevel);
+
+    const parameters = {
+        policyID,
+        value: approvalLevel,
+    };
+    API.write(WRITE_COMMANDS.UPDATE_NETSUITE_JOURNALS_TO, parameters, onyxData);
+}
+
+function updateNetSuiteApprovalAccount(policyID: string, value: string, oldValue: string) {
+    const onyxData = updateNetSuiteOnyxData(policyID, CONST.NETSUITE_CONFIG.APPROVAL_ACCOUNT, value, oldValue);
+
+    const parameters = {
+        policyID,
+        value,
+    };
+    API.write(WRITE_COMMANDS.UPDATE_NETSUITE_APPROVAL_ACCOUNT, parameters, onyxData);
+}
+
+function updateNetSuiteCustomFormIDOptions(
+    policyID: string,
+    value: string,
+    isReimbursable: boolean,
+    exportDestination: ValueOf<typeof CONST.NETSUITE_EXPORT_DESTINATION>,
+    oldCustomFormID?: NetSuiteCustomFormID,
+) {
+    const customFormIDKey = isReimbursable ? CONST.NETSUITE_CONFIG.CUSTOM_FORM_ID_TYPE.REIMBURSABLE : CONST.NETSUITE_CONFIG.CUSTOM_FORM_ID_TYPE.NON_REIMBURSABLE;
+    const data = {
+        [customFormIDKey]: {
+            [CONST.NETSUITE_MAP_EXPORT_DESTINATION[exportDestination]]: value,
+        },
+    };
+    const oldData = {
+        [customFormIDKey]: oldCustomFormID?.[customFormIDKey] ?? null,
+    };
+    const onyxData = updateNetSuiteOnyxData(policyID, CONST.NETSUITE_CONFIG.CUSTOM_FORM_ID_OPTIONS, data, oldData);
+
+    const commandName = isReimbursable ? WRITE_COMMANDS.UPDATE_NETSUITE_CUSTOM_FORM_ID_OPTIONS_REIMBURSABLE : WRITE_COMMANDS.UPDATE_NETSUITE_CUSTOM_FORM_ID_OPTIONS_NON_REIMBURSABLE;
+    const parameters = {
+        policyID,
+        formType: CONST.NETSUITE_MAP_EXPORT_DESTINATION[exportDestination],
+        formID: value,
+    };
+    API.write(commandName, parameters, onyxData);
+}
+
+export {
+    connectPolicyToNetSuite,
+    updateNetSuiteSubsidiary,
+    updateNetSuiteSyncTaxConfiguration,
+    updateNetSuiteExporter,
+    updateNetSuiteExportDate,
+    updateNetSuiteReimbursableExpensesExportDestination,
+    updateNetSuiteNonReimbursableExpensesExportDestination,
+    updateNetSuiteDefaultVendor,
+    updateNetSuiteReimbursablePayableAccount,
+    updateNetSuitePayableAcct,
+    updateNetSuiteJournalPostingPreference,
+    updateNetSuiteReceivableAccount,
+    updateNetSuiteInvoiceItemPreference,
+    updateNetSuiteInvoiceItem,
+    updateNetSuiteTaxPostingAccount,
+    updateNetSuiteProvincialTaxPostingAccount,
+    updateNetSuiteAllowForeignCurrency,
+    updateNetSuiteExportToNextOpenPeriod,
+    updateNetSuiteImportMapping,
+    updateNetSuiteCrossSubsidiaryCustomersConfiguration,
+    updateNetSuiteCustomSegments,
+    updateNetSuiteCustomLists,
+    updateNetSuiteAutoSync,
+    updateNetSuiteSyncReimbursedReports,
+    updateNetSuiteSyncPeople,
+    updateNetSuiteAutoCreateEntities,
+    updateNetSuiteEnableNewCategories,
+    updateNetSuiteCustomFormIDOptionsEnabled,
+    updateNetSuiteReimbursementAccountID,
+    updateNetSuiteCollectionAccount,
+    updateNetSuiteExportReportsTo,
+    updateNetSuiteExportVendorBillsTo,
+    updateNetSuiteExportJournalsTo,
+    updateNetSuiteApprovalAccount,
+    updateNetSuiteCustomFormIDOptions,
+    updateNetSuiteCustomersJobsMapping,
+};
diff --git a/src/libs/actions/connections/QuickBooksOnline.ts b/src/libs/actions/connections/QuickBooksOnline.ts
deleted file mode 100644
index f507758e8d38..000000000000
--- a/src/libs/actions/connections/QuickBooksOnline.ts
+++ /dev/null
@@ -1,41 +0,0 @@
-import type {OnyxUpdate} from 'react-native-onyx';
-import Onyx from 'react-native-onyx';
-import * as API from '@libs/API';
-import type {ConnectPolicyToAccountingIntegrationParams, SyncPolicyToQuickbooksOnlineParams} from '@libs/API/parameters';
-import {READ_COMMANDS} from '@libs/API/types';
-import {getCommandURL} from '@libs/ApiUtils';
-import CONST from '@src/CONST';
-import ONYXKEYS from '@src/ONYXKEYS';
-
-function getQuickBooksOnlineSetupLink(policyID: string) {
-    const params: ConnectPolicyToAccountingIntegrationParams = {policyID};
-    const commandURL = getCommandURL({command: READ_COMMANDS.CONNECT_POLICY_TO_QUICKBOOKS_ONLINE, shouldSkipWebProxy: true});
-    return commandURL + new URLSearchParams(params).toString();
-}
-
-function syncConnection(policyID: string) {
-    const optimisticData: OnyxUpdate[] = [
-        {
-            onyxMethod: Onyx.METHOD.MERGE,
-            key: `${ONYXKEYS.COLLECTION.POLICY_CONNECTION_SYNC_PROGRESS}${policyID}`,
-            value: {
-                stageInProgress: CONST.POLICY.CONNECTIONS.SYNC_STAGE_NAME.STARTING_IMPORT,
-                connectionName: CONST.POLICY.CONNECTIONS.NAME.QBO,
-            },
-        },
-    ];
-    const failureData: OnyxUpdate[] = [
-        {
-            onyxMethod: Onyx.METHOD.SET,
-            key: `${ONYXKEYS.COLLECTION.POLICY_CONNECTION_SYNC_PROGRESS}${policyID}`,
-            value: null,
-        },
-    ];
-    const parameters: SyncPolicyToQuickbooksOnlineParams = {
-        policyID,
-        idempotencyKey: policyID,
-    };
-    API.read(READ_COMMANDS.SYNC_POLICY_TO_QUICKBOOKS_ONLINE, parameters, {optimisticData, failureData});
-}
-
-export {getQuickBooksOnlineSetupLink, syncConnection};
diff --git a/src/libs/actions/connections/QuickbooksOnline.ts b/src/libs/actions/connections/QuickbooksOnline.ts
new file mode 100644
index 000000000000..a3216378add3
--- /dev/null
+++ b/src/libs/actions/connections/QuickbooksOnline.ts
@@ -0,0 +1,252 @@
+import type {OnyxUpdate} from 'react-native-onyx';
+import Onyx from 'react-native-onyx';
+import * as API from '@libs/API';
+import type {ConnectPolicyToAccountingIntegrationParams} from '@libs/API/parameters';
+import type UpdateQuickbooksOnlineGenericTypeParams from '@libs/API/parameters/UpdateQuickbooksOnlineGenericTypeParams';
+import {READ_COMMANDS, WRITE_COMMANDS} from '@libs/API/types';
+import {getCommandURL} from '@libs/ApiUtils';
+import * as ErrorUtils from '@libs/ErrorUtils';
+import CONST from '@src/CONST';
+import ONYXKEYS from '@src/ONYXKEYS';
+import type {ConnectionName, Connections} from '@src/types/onyx/Policy';
+
+type ConnectionNameExceptNetSuite = Exclude<ConnectionName, typeof CONST.POLICY.CONNECTIONS.NAME.NETSUITE>;
+
+function getQuickbooksOnlineSetupLink(policyID: string) {
+    const params: ConnectPolicyToAccountingIntegrationParams = {policyID};
+    const commandURL = getCommandURL({
+        command: READ_COMMANDS.CONNECT_POLICY_TO_QUICKBOOKS_ONLINE,
+        shouldSkipWebProxy: true,
+    });
+    return commandURL + new URLSearchParams(params).toString();
+}
+
+function updateQuickbooksOnlineEnableNewCategories(policyID: string, settingValue: boolean) {
+    const optimisticData: OnyxUpdate[] = [
+        {
+            onyxMethod: Onyx.METHOD.MERGE,
+            key: `${ONYXKEYS.COLLECTION.POLICY}${policyID}`,
+            value: {
+                connections: {
+                    [CONST.POLICY.CONNECTIONS.NAME.QBO]: {
+                        config: {
+                            [CONST.QUICK_BOOKS_CONFIG.ENABLE_NEW_CATEGORIES]: settingValue ?? null,
+                            pendingFields: {
+                                [CONST.QUICK_BOOKS_CONFIG.ENABLE_NEW_CATEGORIES]: CONST.RED_BRICK_ROAD_PENDING_ACTION.UPDATE,
+                            },
+                            errorFields: {
+                                [CONST.QUICK_BOOKS_CONFIG.ENABLE_NEW_CATEGORIES]: null,
+                            },
+                        },
+                    },
+                },
+            },
+        },
+    ];
+
+    const failureData: OnyxUpdate[] = [
+        {
+            onyxMethod: Onyx.METHOD.MERGE,
+            key: `${ONYXKEYS.COLLECTION.POLICY}${policyID}`,
+            value: {
+                connections: {
+                    [CONST.POLICY.CONNECTIONS.NAME.QBO]: {
+                        config: {
+                            [CONST.QUICK_BOOKS_CONFIG.ENABLE_NEW_CATEGORIES]: settingValue ?? null,
+                            pendingFields: {
+                                [CONST.QUICK_BOOKS_CONFIG.ENABLE_NEW_CATEGORIES]: null,
+                            },
+                            errorFields: {
+                                [CONST.QUICK_BOOKS_CONFIG.ENABLE_NEW_CATEGORIES]: ErrorUtils.getMicroSecondOnyxErrorWithTranslationKey('common.genericErrorMessage'),
+                            },
+                        },
+                    },
+                },
+            },
+        },
+    ];
+
+    const successData: OnyxUpdate[] = [
+        {
+            onyxMethod: Onyx.METHOD.MERGE,
+            key: `${ONYXKEYS.COLLECTION.POLICY}${policyID}`,
+            value: {
+                connections: {
+                    [CONST.POLICY.CONNECTIONS.NAME.QBO]: {
+                        config: {
+                            [CONST.QUICK_BOOKS_CONFIG.ENABLE_NEW_CATEGORIES]: settingValue ?? null,
+                            pendingFields: {
+                                [CONST.QUICK_BOOKS_CONFIG.ENABLE_NEW_CATEGORIES]: null,
+                            },
+                            errorFields: {
+                                [CONST.QUICK_BOOKS_CONFIG.ENABLE_NEW_CATEGORIES]: null,
+                            },
+                        },
+                    },
+                },
+            },
+        },
+    ];
+
+    const parameters: UpdateQuickbooksOnlineGenericTypeParams = {
+        policyID,
+        settingValue: JSON.stringify(settingValue),
+        idempotencyKey: String(CONST.QUICK_BOOKS_CONFIG.ENABLE_NEW_CATEGORIES),
+    };
+    API.write(WRITE_COMMANDS.UPDATE_QUICKBOOKS_ONLINE_ENABLE_NEW_CATEGORIES, parameters, {optimisticData, failureData, successData});
+}
+
+function updateQuickbooksOnlineAutoCreateVendor(policyID: string, settingValue: boolean) {
+    const optimisticData: OnyxUpdate[] = [
+        {
+            onyxMethod: Onyx.METHOD.MERGE,
+            key: `${ONYXKEYS.COLLECTION.POLICY}${policyID}`,
+            value: {
+                connections: {
+                    [CONST.POLICY.CONNECTIONS.NAME.QBO]: {
+                        config: {
+                            [CONST.QUICK_BOOKS_CONFIG.AUTO_CREATE_VENDOR]: settingValue ?? null,
+                            pendingFields: {
+                                [CONST.QUICK_BOOKS_CONFIG.AUTO_CREATE_VENDOR]: CONST.RED_BRICK_ROAD_PENDING_ACTION.UPDATE,
+                            },
+                            errorFields: {
+                                [CONST.QUICK_BOOKS_CONFIG.AUTO_CREATE_VENDOR]: null,
+                            },
+                        },
+                    },
+                },
+            },
+        },
+    ];
+
+    const failureData: OnyxUpdate[] = [
+        {
+            onyxMethod: Onyx.METHOD.MERGE,
+            key: `${ONYXKEYS.COLLECTION.POLICY}${policyID}`,
+            value: {
+                connections: {
+                    [CONST.POLICY.CONNECTIONS.NAME.QBO]: {
+                        config: {
+                            [CONST.QUICK_BOOKS_CONFIG.AUTO_CREATE_VENDOR]: settingValue ?? null,
+                            pendingFields: {
+                                [CONST.QUICK_BOOKS_CONFIG.AUTO_CREATE_VENDOR]: null,
+                            },
+                            errorFields: {
+                                [CONST.QUICK_BOOKS_CONFIG.AUTO_CREATE_VENDOR]: ErrorUtils.getMicroSecondOnyxErrorWithTranslationKey('common.genericErrorMessage'),
+                            },
+                        },
+                    },
+                },
+            },
+        },
+    ];
+
+    const successData: OnyxUpdate[] = [
+        {
+            onyxMethod: Onyx.METHOD.MERGE,
+            key: `${ONYXKEYS.COLLECTION.POLICY}${policyID}`,
+            value: {
+                connections: {
+                    [CONST.POLICY.CONNECTIONS.NAME.QBO]: {
+                        config: {
+                            [CONST.QUICK_BOOKS_CONFIG.AUTO_CREATE_VENDOR]: settingValue ?? null,
+                            pendingFields: {
+                                [CONST.QUICK_BOOKS_CONFIG.AUTO_CREATE_VENDOR]: null,
+                            },
+                            errorFields: {
+                                [CONST.QUICK_BOOKS_CONFIG.AUTO_CREATE_VENDOR]: null,
+                            },
+                        },
+                    },
+                },
+            },
+        },
+    ];
+
+    const parameters: UpdateQuickbooksOnlineGenericTypeParams = {
+        policyID,
+        settingValue: JSON.stringify(settingValue),
+        idempotencyKey: String(CONST.QUICK_BOOKS_CONFIG.AUTO_CREATE_VENDOR),
+    };
+    API.write(WRITE_COMMANDS.UPDATE_QUICKBOOKS_ONLINE_AUTO_CREATE_VENDOR, parameters, {optimisticData, failureData, successData});
+}
+
+function updateQuickbooksOnlineReimbursableExpensesAccount<TConnectionName extends ConnectionNameExceptNetSuite, TSettingName extends keyof Connections[TConnectionName]['config']>(
+    policyID: string,
+    settingValue: Partial<Connections[TConnectionName]['config'][TSettingName]>,
+) {
+    const optimisticData: OnyxUpdate[] = [
+        {
+            onyxMethod: Onyx.METHOD.MERGE,
+            key: `${ONYXKEYS.COLLECTION.POLICY}${policyID}`,
+            value: {
+                connections: {
+                    [CONST.POLICY.CONNECTIONS.NAME.QBO]: {
+                        config: {
+                            [CONST.QUICK_BOOKS_CONFIG.REIMBURSABLE_EXPENSES_ACCOUNT]: settingValue ?? null,
+                            pendingFields: {
+                                [CONST.QUICK_BOOKS_CONFIG.REIMBURSABLE_EXPENSES_ACCOUNT]: CONST.RED_BRICK_ROAD_PENDING_ACTION.UPDATE,
+                            },
+                            errorFields: {
+                                [CONST.QUICK_BOOKS_CONFIG.REIMBURSABLE_EXPENSES_ACCOUNT]: null,
+                            },
+                        },
+                    },
+                },
+            },
+        },
+    ];
+
+    const failureData: OnyxUpdate[] = [
+        {
+            onyxMethod: Onyx.METHOD.MERGE,
+            key: `${ONYXKEYS.COLLECTION.POLICY}${policyID}`,
+            value: {
+                connections: {
+                    [CONST.POLICY.CONNECTIONS.NAME.QBO]: {
+                        config: {
+                            [CONST.QUICK_BOOKS_CONFIG.REIMBURSABLE_EXPENSES_ACCOUNT]: settingValue ?? null,
+                            pendingFields: {
+                                [CONST.QUICK_BOOKS_CONFIG.REIMBURSABLE_EXPENSES_ACCOUNT]: null,
+                            },
+                            errorFields: {
+                                [CONST.QUICK_BOOKS_CONFIG.REIMBURSABLE_EXPENSES_ACCOUNT]: ErrorUtils.getMicroSecondOnyxErrorWithTranslationKey('common.genericErrorMessage'),
+                            },
+                        },
+                    },
+                },
+            },
+        },
+    ];
+
+    const successData: OnyxUpdate[] = [
+        {
+            onyxMethod: Onyx.METHOD.MERGE,
+            key: `${ONYXKEYS.COLLECTION.POLICY}${policyID}`,
+            value: {
+                connections: {
+                    [CONST.POLICY.CONNECTIONS.NAME.QBO]: {
+                        config: {
+                            [CONST.QUICK_BOOKS_CONFIG.REIMBURSABLE_EXPENSES_ACCOUNT]: settingValue ?? null,
+                            pendingFields: {
+                                [CONST.QUICK_BOOKS_CONFIG.REIMBURSABLE_EXPENSES_ACCOUNT]: null,
+                            },
+                            errorFields: {
+                                [CONST.QUICK_BOOKS_CONFIG.REIMBURSABLE_EXPENSES_ACCOUNT]: null,
+                            },
+                        },
+                    },
+                },
+            },
+        },
+    ];
+
+    const parameters: UpdateQuickbooksOnlineGenericTypeParams = {
+        policyID,
+        settingValue: JSON.stringify(settingValue),
+        idempotencyKey: String(CONST.QUICK_BOOKS_CONFIG.REIMBURSABLE_EXPENSES_ACCOUNT),
+    };
+    API.write(WRITE_COMMANDS.UPDATE_QUICKBOOKS_ONLINE_REIMBURSABLE_EXPENSES_ACCOUNT, parameters, {optimisticData, failureData, successData});
+}
+
+export {getQuickbooksOnlineSetupLink, updateQuickbooksOnlineEnableNewCategories, updateQuickbooksOnlineAutoCreateVendor, updateQuickbooksOnlineReimbursableExpensesAccount};
diff --git a/src/libs/actions/connections/SageIntacct.ts b/src/libs/actions/connections/SageIntacct.ts
new file mode 100644
index 000000000000..8cc554b7ec79
--- /dev/null
+++ b/src/libs/actions/connections/SageIntacct.ts
@@ -0,0 +1,852 @@
+import type {OnyxUpdate} from 'react-native-onyx';
+import Onyx from 'react-native-onyx';
+import type {ValueOf} from 'type-fest';
+import * as API from '@libs/API';
+import type {ConnectPolicyToSageIntacctParams} from '@libs/API/parameters';
+import {WRITE_COMMANDS} from '@libs/API/types';
+import * as ErrorUtils from '@libs/ErrorUtils';
+import CONST from '@src/CONST';
+import ONYXKEYS from '@src/ONYXKEYS';
+import type * as OnyxCommon from '@src/types/onyx/OnyxCommon';
+import type {
+    Connections,
+    SageIntacctConnectionsConfig,
+    SageIntacctDimension,
+    SageIntacctExportConfig,
+    SageIntacctMappingName,
+    SageIntacctMappingType,
+    SageIntacctMappingValue,
+    SageIntacctOfflineStateKeys,
+} from '@src/types/onyx/Policy';
+
+type SageIntacctCredentials = {companyID: string; userID: string; password: string};
+
+function connectToSageIntacct(policyID: string, credentials: SageIntacctCredentials) {
+    const parameters: ConnectPolicyToSageIntacctParams = {
+        policyID,
+        intacctCompanyID: credentials.companyID,
+        intacctUserID: credentials.userID,
+        intacctPassword: credentials.password,
+    };
+    API.write(WRITE_COMMANDS.CONNECT_POLICY_TO_SAGE_INTACCT, parameters, {});
+}
+
+function prepareOnyxDataForMappingUpdate(
+    policyID: string,
+    mappingName: keyof SageIntacctMappingType,
+    mappingValue: boolean | SageIntacctMappingValue,
+    oldMappingValue?: boolean | SageIntacctMappingValue,
+) {
+    const optimisticData: OnyxUpdate[] = [
+        {
+            onyxMethod: Onyx.METHOD.MERGE,
+            key: `${ONYXKEYS.COLLECTION.POLICY}${policyID}`,
+            value: {
+                connections: {
+                    intacct: {
+                        config: {
+                            mappings: {
+                                [mappingName]: mappingValue,
+                            },
+                            pendingFields: {
+                                [mappingName]: CONST.RED_BRICK_ROAD_PENDING_ACTION.UPDATE,
+                            },
+                            errorFields: {
+                                [mappingName]: null,
+                            },
+                        },
+                    },
+                },
+            },
+        },
+    ];
+
+    const failureData: OnyxUpdate[] = [
+        {
+            onyxMethod: Onyx.METHOD.MERGE,
+            key: `${ONYXKEYS.COLLECTION.POLICY}${policyID}`,
+            value: {
+                connections: {
+                    intacct: {
+                        config: {
+                            mappings: {
+                                [mappingName]: oldMappingValue ?? null,
+                            },
+                            pendingFields: {
+                                [mappingName]: null,
+                            },
+                            errorFields: {
+                                [mappingName]: ErrorUtils.getMicroSecondOnyxErrorWithTranslationKey('common.genericErrorMessage'),
+                            },
+                        },
+                    },
+                },
+            },
+        },
+    ];
+
+    const successData: OnyxUpdate[] = [
+        {
+            onyxMethod: Onyx.METHOD.MERGE,
+            key: `${ONYXKEYS.COLLECTION.POLICY}${policyID}`,
+            value: {
+                connections: {
+                    intacct: {
+                        config: {
+                            pendingFields: {
+                                [mappingName]: null,
+                            },
+                            errorFields: {
+                                [mappingName]: undefined,
+                            },
+                        },
+                    },
+                },
+            },
+        },
+    ];
+
+    return {optimisticData, failureData, successData};
+}
+
+function updateSageIntacctBillable(policyID: string, enabled: boolean) {
+    const parameters = {
+        policyID,
+        enabled,
+    };
+    API.write(WRITE_COMMANDS.UPDATE_SAGE_INTACCT_BILLABLE, parameters, prepareOnyxDataForMappingUpdate(policyID, CONST.SAGE_INTACCT_CONFIG.SYNC_ITEMS, enabled, !enabled));
+}
+
+function getCommandForMapping(mappingName: ValueOf<typeof CONST.SAGE_INTACCT_CONFIG.MAPPINGS>) {
+    switch (mappingName) {
+        case CONST.SAGE_INTACCT_CONFIG.MAPPINGS.DEPARTMENTS:
+            return WRITE_COMMANDS.UPDATE_SAGE_INTACCT_DEPARTMENT_MAPPING;
+        case CONST.SAGE_INTACCT_CONFIG.MAPPINGS.CLASSES:
+            return WRITE_COMMANDS.UPDATE_SAGE_INTACCT_CLASSES_MAPPING;
+        case CONST.SAGE_INTACCT_CONFIG.MAPPINGS.LOCATIONS:
+            return WRITE_COMMANDS.UPDATE_SAGE_INTACCT_LOCATIONS_MAPPING;
+        case CONST.SAGE_INTACCT_CONFIG.MAPPINGS.CUSTOMERS:
+            return WRITE_COMMANDS.UPDATE_SAGE_INTACCT_CUSTOMERS_MAPPING;
+        case CONST.SAGE_INTACCT_CONFIG.MAPPINGS.PROJECTS:
+            return WRITE_COMMANDS.UPDATE_SAGE_INTACCT_PROJECTS_MAPPING;
+        default:
+            return undefined;
+    }
+}
+
+function updateSageIntacctMappingValue(policyID: string, mappingName: SageIntacctMappingName, mappingValue: SageIntacctMappingValue, oldMappingValue?: SageIntacctMappingValue) {
+    const command = getCommandForMapping(mappingName);
+    if (!command) {
+        return;
+    }
+
+    const onyxData = prepareOnyxDataForMappingUpdate(policyID, mappingName, mappingValue, oldMappingValue);
+    API.write(
+        command,
+        {
+            policyID,
+            mapping: mappingValue,
+        },
+        onyxData,
+    );
+}
+
+function changeMappingsValueFromDefaultToTag(policyID: string, mappings?: SageIntacctMappingType) {
+    if (mappings?.departments === CONST.SAGE_INTACCT_MAPPING_VALUE.DEFAULT) {
+        updateSageIntacctMappingValue(policyID, CONST.SAGE_INTACCT_CONFIG.MAPPINGS.DEPARTMENTS, CONST.SAGE_INTACCT_MAPPING_VALUE.TAG, CONST.SAGE_INTACCT_MAPPING_VALUE.DEFAULT);
+    }
+    if (mappings?.classes === CONST.SAGE_INTACCT_MAPPING_VALUE.DEFAULT) {
+        updateSageIntacctMappingValue(policyID, CONST.SAGE_INTACCT_CONFIG.MAPPINGS.CLASSES, CONST.SAGE_INTACCT_MAPPING_VALUE.TAG, CONST.SAGE_INTACCT_MAPPING_VALUE.DEFAULT);
+    }
+    if (mappings?.locations === CONST.SAGE_INTACCT_MAPPING_VALUE.DEFAULT) {
+        updateSageIntacctMappingValue(policyID, CONST.SAGE_INTACCT_CONFIG.MAPPINGS.LOCATIONS, CONST.SAGE_INTACCT_MAPPING_VALUE.TAG, CONST.SAGE_INTACCT_MAPPING_VALUE.DEFAULT);
+    }
+}
+
+function updateSageIntacctSyncTaxConfiguration(policyID: string, enabled: boolean) {
+    const optimisticData: OnyxUpdate[] = [
+        {
+            onyxMethod: Onyx.METHOD.MERGE,
+            key: `${ONYXKEYS.COLLECTION.POLICY}${policyID}`,
+            value: {
+                connections: {
+                    intacct: {
+                        config: {
+                            tax: {
+                                syncTax: enabled,
+                            },
+                            pendingFields: {
+                                tax: CONST.RED_BRICK_ROAD_PENDING_ACTION.UPDATE,
+                            },
+                            errorFields: {
+                                tax: null,
+                            },
+                        },
+                    },
+                },
+            },
+        },
+    ];
+
+    const failureData: OnyxUpdate[] = [
+        {
+            onyxMethod: Onyx.METHOD.MERGE,
+            key: `${ONYXKEYS.COLLECTION.POLICY}${policyID}`,
+            value: {
+                connections: {
+                    intacct: {
+                        config: {
+                            tax: {
+                                syncTax: !enabled,
+                            },
+                            pendingFields: {
+                                tax: null,
+                            },
+                            errorFields: {
+                                tax: ErrorUtils.getMicroSecondOnyxErrorWithTranslationKey('common.genericErrorMessage'),
+                            },
+                        },
+                    },
+                },
+            },
+        },
+    ];
+
+    const successData: OnyxUpdate[] = [
+        {
+            onyxMethod: Onyx.METHOD.MERGE,
+            key: `${ONYXKEYS.COLLECTION.POLICY}${policyID}`,
+            value: {
+                connections: {
+                    intacct: {
+                        config: {
+                            pendingFields: {
+                                tax: null,
+                            },
+                            errorFields: {
+                                tax: undefined,
+                            },
+                        },
+                    },
+                },
+            },
+        },
+    ];
+    API.write(WRITE_COMMANDS.UPDATE_SAGE_INTACCT_SYNC_TAX_CONFIGURATION, {policyID, enabled}, {optimisticData, failureData, successData});
+}
+
+function prepareOnyxDataForUserDimensionUpdate(
+    policyID: string,
+    dimensionName: string,
+    newDimensions: SageIntacctDimension[],
+    oldDimensions: SageIntacctDimension[],
+    oldDimensionName: string,
+    pendingAction: OnyxCommon.PendingAction,
+) {
+    const optimisticData: OnyxUpdate[] = [
+        {
+            onyxMethod: Onyx.METHOD.MERGE,
+            key: `${ONYXKEYS.COLLECTION.POLICY}${policyID}`,
+            value: {
+                connections: {
+                    intacct: {
+                        config: {
+                            mappings: {
+                                dimensions: newDimensions,
+                            },
+                            pendingFields: {[`${CONST.SAGE_INTACCT_CONFIG.DIMENSION_PREFIX}${dimensionName}`]: pendingAction},
+                            errorFields: {[`${CONST.SAGE_INTACCT_CONFIG.DIMENSION_PREFIX}${dimensionName}`]: null},
+                        },
+                    },
+                },
+            },
+        },
+    ];
+
+    const pendingActionAfterFailure = pendingAction === CONST.RED_BRICK_ROAD_PENDING_ACTION.ADD ? pendingAction : null;
+
+    const failureData: OnyxUpdate[] = [
+        {
+            onyxMethod: Onyx.METHOD.MERGE,
+            key: `${ONYXKEYS.COLLECTION.POLICY}${policyID}`,
+            value: {
+                connections: {
+                    intacct: {
+                        config: {
+                            mappings: {
+                                dimensions: oldDimensions,
+                            },
+                            pendingFields: {[`${CONST.SAGE_INTACCT_CONFIG.DIMENSION_PREFIX}${oldDimensionName}`]: pendingActionAfterFailure},
+                            errorFields: {
+                                [`${CONST.SAGE_INTACCT_CONFIG.DIMENSION_PREFIX}${oldDimensionName}`]: ErrorUtils.getMicroSecondOnyxErrorWithTranslationKey('common.genericErrorMessage'),
+                            },
+                        },
+                    },
+                },
+            },
+        },
+    ];
+
+    const successData: OnyxUpdate[] = [
+        {
+            onyxMethod: Onyx.METHOD.MERGE,
+            key: `${ONYXKEYS.COLLECTION.POLICY}${policyID}`,
+            value: {
+                connections: {
+                    intacct: {
+                        config: {
+                            mappings: {
+                                dimensions: newDimensions,
+                            },
+                            pendingFields: {[`${CONST.SAGE_INTACCT_CONFIG.DIMENSION_PREFIX}${dimensionName}`]: null},
+                            errorFields: {[`${CONST.SAGE_INTACCT_CONFIG.DIMENSION_PREFIX}${dimensionName}`]: null},
+                        },
+                    },
+                },
+            },
+        },
+    ];
+
+    return {optimisticData, failureData, successData};
+}
+
+function addSageIntacctUserDimensions(
+    policyID: string,
+    dimensionName: string,
+    mapping: typeof CONST.SAGE_INTACCT_MAPPING_VALUE.TAG | typeof CONST.SAGE_INTACCT_MAPPING_VALUE.REPORT_FIELD,
+    existingUserDimensions: SageIntacctDimension[],
+) {
+    const newDimensions = [...existingUserDimensions, {mapping, dimension: dimensionName}];
+
+    API.write(
+        WRITE_COMMANDS.UPDATE_SAGE_INTACCT_USER_DIMENSION,
+        {policyID, dimensions: JSON.stringify(newDimensions)},
+        prepareOnyxDataForUserDimensionUpdate(policyID, dimensionName, newDimensions, newDimensions, dimensionName, CONST.RED_BRICK_ROAD_PENDING_ACTION.ADD),
+    );
+}
+
+function editSageIntacctUserDimensions(
+    policyID: string,
+    previousName: string,
+    name: string,
+    mapping: typeof CONST.SAGE_INTACCT_MAPPING_VALUE.TAG | typeof CONST.SAGE_INTACCT_MAPPING_VALUE.REPORT_FIELD,
+    existingUserDimensions: SageIntacctDimension[],
+) {
+    const newDimensions = existingUserDimensions.map((userDimension) => {
+        if (userDimension.dimension === previousName) {
+            return {dimension: name, mapping};
+        }
+        return userDimension;
+    });
+
+    API.write(
+        WRITE_COMMANDS.UPDATE_SAGE_INTACCT_USER_DIMENSION,
+        {policyID, dimensions: JSON.stringify(newDimensions)},
+        prepareOnyxDataForUserDimensionUpdate(policyID, name, newDimensions, existingUserDimensions, previousName, CONST.RED_BRICK_ROAD_PENDING_ACTION.UPDATE),
+    );
+}
+
+function removeSageIntacctUserDimensions(policyID: string, dimensionName: string, existingUserDimensions: SageIntacctDimension[]) {
+    const newDimensions = existingUserDimensions.filter((userDimension) => dimensionName !== userDimension.dimension);
+
+    API.write(
+        WRITE_COMMANDS.UPDATE_SAGE_INTACCT_USER_DIMENSION,
+        {policyID, dimensions: JSON.stringify(newDimensions)},
+        prepareOnyxDataForUserDimensionUpdate(policyID, dimensionName, newDimensions, existingUserDimensions, dimensionName, CONST.RED_BRICK_ROAD_PENDING_ACTION.DELETE),
+    );
+}
+
+function prepareOnyxDataForExportUpdate(policyID: string, settingName: keyof SageIntacctExportConfig, settingValue: string | null, oldSettingValue?: string | null) {
+    const optimisticData: OnyxUpdate[] = [
+        {
+            onyxMethod: Onyx.METHOD.MERGE,
+            key: `${ONYXKEYS.COLLECTION.POLICY}${policyID}`,
+            value: {
+                connections: {
+                    intacct: {
+                        config: {
+                            export: {
+                                [settingName]: settingValue,
+                            },
+                            pendingFields: {
+                                [settingName]: CONST.RED_BRICK_ROAD_PENDING_ACTION.UPDATE,
+                            },
+                            errorFields: {
+                                [settingName]: null,
+                            },
+                        },
+                    },
+                },
+            },
+        },
+    ];
+
+    const failureData: OnyxUpdate[] = [
+        {
+            onyxMethod: Onyx.METHOD.MERGE,
+            key: `${ONYXKEYS.COLLECTION.POLICY}${policyID}`,
+            value: {
+                connections: {
+                    intacct: {
+                        config: {
+                            export: {
+                                [settingName]: oldSettingValue ?? null,
+                            },
+                            pendingFields: {
+                                [settingName]: null,
+                            },
+                            errorFields: {
+                                [settingName]: ErrorUtils.getMicroSecondOnyxErrorWithTranslationKey('common.genericErrorMessage'),
+                            },
+                        },
+                    },
+                },
+            },
+        },
+    ];
+
+    const successData: OnyxUpdate[] = [
+        {
+            onyxMethod: Onyx.METHOD.MERGE,
+            key: `${ONYXKEYS.COLLECTION.POLICY}${policyID}`,
+            value: {
+                connections: {
+                    intacct: {
+                        config: {
+                            pendingFields: {
+                                [settingName]: null,
+                            },
+                            errorFields: {
+                                [settingName]: null,
+                            },
+                        },
+                    },
+                },
+            },
+        },
+    ];
+
+    return {optimisticData, failureData, successData};
+}
+
+function updateSageIntacctExporter(policyID: string, exporter: string, oldExporter?: string) {
+    const {optimisticData, failureData, successData} = prepareOnyxDataForExportUpdate(policyID, CONST.SAGE_INTACCT_CONFIG.EXPORTER, exporter, oldExporter);
+    const parameters = {
+        policyID,
+        email: exporter,
+    };
+
+    API.write(WRITE_COMMANDS.UPDATE_SAGE_INTACCT_EXPORTER, parameters, {optimisticData, failureData, successData});
+}
+
+function updateSageIntacctExportDate(policyID: string, date: ValueOf<typeof CONST.SAGE_INTACCT_EXPORT_DATE>, oldDate?: ValueOf<typeof CONST.SAGE_INTACCT_EXPORT_DATE>) {
+    const {optimisticData, failureData, successData} = prepareOnyxDataForExportUpdate(policyID, CONST.SAGE_INTACCT_CONFIG.EXPORT_DATE, date, oldDate);
+    const parameters = {
+        policyID,
+        value: date,
+    };
+
+    API.write(WRITE_COMMANDS.UPDATE_SAGE_INTACCT_EXPORT_DATE, parameters, {optimisticData, failureData, successData});
+}
+
+function updateSageIntacctReimbursableExpensesExportDestination(
+    policyID: string,
+    reimbursable: ValueOf<typeof CONST.SAGE_INTACCT_REIMBURSABLE_EXPENSE_TYPE>,
+    oldReimbursable?: ValueOf<typeof CONST.SAGE_INTACCT_REIMBURSABLE_EXPENSE_TYPE>,
+) {
+    const {optimisticData, failureData, successData} = prepareOnyxDataForExportUpdate(policyID, CONST.SAGE_INTACCT_CONFIG.REIMBURSABLE, reimbursable, oldReimbursable);
+    const parameters = {
+        policyID,
+        value: reimbursable,
+    };
+
+    API.write(WRITE_COMMANDS.UPDATE_SAGE_INTACCT_REIMBURSABLE_EXPENSES_EXPORT_DESTINATION, parameters, {optimisticData, failureData, successData});
+}
+
+function updateSageIntacctNonreimbursableExpensesExportDestination(
+    policyID: string,
+    nonReimbursable: ValueOf<typeof CONST.SAGE_INTACCT_NON_REIMBURSABLE_EXPENSE_TYPE>,
+    oldNonReimbursable?: ValueOf<typeof CONST.SAGE_INTACCT_NON_REIMBURSABLE_EXPENSE_TYPE>,
+) {
+    const {optimisticData, failureData, successData} = prepareOnyxDataForExportUpdate(policyID, CONST.SAGE_INTACCT_CONFIG.NON_REIMBURSABLE, nonReimbursable, oldNonReimbursable);
+    const parameters = {
+        policyID,
+        value: nonReimbursable,
+    };
+
+    API.write(WRITE_COMMANDS.UPDATE_SAGE_INTACCT_NON_REIMBURSABLE_EXPENSES_EXPORT_DESTINATION, parameters, {optimisticData, failureData, successData});
+}
+
+function updateSageIntacctReimbursableExpensesReportExportDefaultVendor(policyID: string, vendor: string, oldVendor?: string) {
+    const {optimisticData, failureData, successData} = prepareOnyxDataForExportUpdate(policyID, CONST.SAGE_INTACCT_CONFIG.REIMBURSABLE_VENDOR, vendor, oldVendor);
+    const parameters = {
+        policyID,
+        vendorID: vendor,
+    };
+
+    API.write(WRITE_COMMANDS.UPDATE_SAGE_INTACCT_REIMBURSABLE_EXPENSES_REPORT_EXPORT_DEFAULT_VENDOR, parameters, {optimisticData, failureData, successData});
+}
+
+function updateSageIntacctNonreimbursableExpensesCreditCardChargeExportDefaultVendor(policyID: string, vendor: string, oldVendor?: string) {
+    const {optimisticData, failureData, successData} = prepareOnyxDataForExportUpdate(policyID, CONST.SAGE_INTACCT_CONFIG.NON_REIMBURSABLE_CREDIT_CARD_VENDOR, vendor, oldVendor);
+    const parameters = {
+        policyID,
+        vendorID: vendor,
+    };
+
+    API.write(WRITE_COMMANDS.UPDATE_SAGE_INTACCT_NON_REIMBURSABLE_EXPENSES_CREDIT_CARD_CHARGE_EXPORT_DEFAULT_VENDOR, parameters, {optimisticData, failureData, successData});
+}
+
+function updateSageIntacctNonreimbursableExpensesExportAccount(policyID: string, nonReimbursableAccount: string, oldReimbursableAccount?: string) {
+    const {optimisticData, failureData, successData} = prepareOnyxDataForExportUpdate(
+        policyID,
+        CONST.SAGE_INTACCT_CONFIG.NON_REIMBURSABLE_ACCOUNT,
+        nonReimbursableAccount,
+        oldReimbursableAccount,
+    );
+    const parameters = {
+        policyID,
+        creditCardAccountID: nonReimbursableAccount,
+    };
+
+    API.write(WRITE_COMMANDS.UPDATE_SAGE_INTACCT_NON_REIMBURSABLE_EXPENSES_EXPORT_ACCOUNT, parameters, {optimisticData, failureData, successData});
+}
+
+function updateSageIntacctNonreimbursableExpensesExportVendor(policyID: string, vendor: string, oldVendor?: string) {
+    const {optimisticData, failureData, successData} = prepareOnyxDataForExportUpdate(policyID, CONST.SAGE_INTACCT_CONFIG.NON_REIMBURSABLE_VENDOR, vendor, oldVendor);
+    const parameters = {
+        policyID,
+        vendorID: vendor,
+    };
+
+    API.write(WRITE_COMMANDS.UPDATE_SAGE_INTACCT_NON_REIMBURSABLE_EXPENSES_EXPORT_VENDOR, parameters, {optimisticData, failureData, successData});
+}
+
+function updateSageIntacctDefaultVendor(policyID: string, settingName: keyof SageIntacctExportConfig, vendor: string, oldVendor?: string) {
+    if (settingName === CONST.SAGE_INTACCT_CONFIG.REIMBURSABLE_VENDOR) {
+        updateSageIntacctReimbursableExpensesReportExportDefaultVendor(policyID, vendor, oldVendor);
+    } else if (settingName === CONST.SAGE_INTACCT_CONFIG.NON_REIMBURSABLE_CREDIT_CARD_VENDOR) {
+        updateSageIntacctNonreimbursableExpensesCreditCardChargeExportDefaultVendor(policyID, vendor, oldVendor);
+    } else if (settingName === CONST.SAGE_INTACCT_CONFIG.NON_REIMBURSABLE_VENDOR) {
+        updateSageIntacctNonreimbursableExpensesExportVendor(policyID, vendor, oldVendor);
+    }
+}
+
+function clearSageIntacctErrorField(policyID: string, key: SageIntacctOfflineStateKeys | keyof SageIntacctConnectionsConfig) {
+    Onyx.merge(`${ONYXKEYS.COLLECTION.POLICY}${policyID}`, {connections: {intacct: {config: {errorFields: {[key]: null}}}}});
+}
+
+function clearSageIntacctPendingField(policyID: string, key: SageIntacctOfflineStateKeys | keyof SageIntacctConnectionsConfig) {
+    Onyx.merge(`${ONYXKEYS.COLLECTION.POLICY}${policyID}`, {connections: {intacct: {config: {pendingFields: {[key]: null}}}}});
+}
+
+function removeSageIntacctUserDimensionsByName(dimensions: SageIntacctDimension[], policyID: string, dimensionName: string) {
+    const Dimensions = dimensions.filter((dimension) => dimension.dimension !== dimensionName);
+    Onyx.merge(`${ONYXKEYS.COLLECTION.POLICY}${policyID}`, {connections: {intacct: {config: {mappings: {dimensions: Dimensions}}}}});
+}
+
+function prepareOnyxDataForConfigUpdate(policyID: string, settingName: keyof SageIntacctConnectionsConfig, settingValue: string | boolean | null, oldSettingValue?: string | boolean | null) {
+    const optimisticData: OnyxUpdate[] = [
+        {
+            onyxMethod: Onyx.METHOD.MERGE,
+            key: `${ONYXKEYS.COLLECTION.POLICY}${policyID}`,
+            value: {
+                connections: {
+                    intacct: {
+                        config: {
+                            [settingName]: settingValue,
+                            pendingFields: {
+                                [settingName]: CONST.RED_BRICK_ROAD_PENDING_ACTION.UPDATE,
+                            },
+                            errorFields: {
+                                [settingName]: null,
+                            },
+                        },
+                    },
+                },
+            },
+        },
+    ];
+
+    const failureData: OnyxUpdate[] = [
+        {
+            onyxMethod: Onyx.METHOD.MERGE,
+            key: `${ONYXKEYS.COLLECTION.POLICY}${policyID}`,
+            value: {
+                connections: {
+                    intacct: {
+                        config: {
+                            [settingName]: oldSettingValue ?? null,
+                            pendingFields: {
+                                [settingName]: null,
+                            },
+                            errorFields: {
+                                [settingName]: ErrorUtils.getMicroSecondOnyxErrorWithTranslationKey('common.genericErrorMessage'),
+                            },
+                        },
+                    },
+                },
+            },
+        },
+    ];
+
+    const successData: OnyxUpdate[] = [
+        {
+            onyxMethod: Onyx.METHOD.MERGE,
+            key: `${ONYXKEYS.COLLECTION.POLICY}${policyID}`,
+            value: {
+                connections: {
+                    intacct: {
+                        config: {
+                            pendingFields: {
+                                [settingName]: null,
+                            },
+                            errorFields: {
+                                [settingName]: null,
+                            },
+                        },
+                    },
+                },
+            },
+        },
+    ];
+
+    return {optimisticData, failureData, successData};
+}
+
+function prepareOnyxDataForSyncUpdate(policyID: string, settingName: keyof Connections['intacct']['config']['sync'], settingValue: string | boolean, oldSettingValue?: string | boolean) {
+    const optimisticData: OnyxUpdate[] = [
+        {
+            onyxMethod: Onyx.METHOD.MERGE,
+            key: `${ONYXKEYS.COLLECTION.POLICY}${policyID}`,
+            value: {
+                connections: {
+                    intacct: {
+                        config: {
+                            sync: {
+                                [settingName]: settingValue,
+                            },
+                            pendingFields: {
+                                [settingName]: CONST.RED_BRICK_ROAD_PENDING_ACTION.UPDATE,
+                            },
+                            errorFields: {
+                                [settingName]: null,
+                            },
+                        },
+                    },
+                },
+            },
+        },
+    ];
+
+    const failureData: OnyxUpdate[] = [
+        {
+            onyxMethod: Onyx.METHOD.MERGE,
+            key: `${ONYXKEYS.COLLECTION.POLICY}${policyID}`,
+            value: {
+                connections: {
+                    intacct: {
+                        config: {
+                            sync: {
+                                [settingName]: oldSettingValue ?? null,
+                            },
+                            pendingFields: {
+                                [settingName]: null,
+                            },
+                            errorFields: {
+                                [settingName]: ErrorUtils.getMicroSecondOnyxErrorWithTranslationKey('common.genericErrorMessage'),
+                            },
+                        },
+                    },
+                },
+            },
+        },
+    ];
+
+    const successData: OnyxUpdate[] = [
+        {
+            onyxMethod: Onyx.METHOD.MERGE,
+            key: `${ONYXKEYS.COLLECTION.POLICY}${policyID}`,
+            value: {
+                connections: {
+                    intacct: {
+                        config: {
+                            pendingFields: {
+                                [settingName]: null,
+                            },
+                            errorFields: {
+                                [settingName]: null,
+                            },
+                        },
+                    },
+                },
+            },
+        },
+    ];
+
+    return {optimisticData, failureData, successData};
+}
+
+function prepareOnyxDataForAutoSyncUpdate(policyID: string, settingName: keyof Connections['intacct']['config']['autoSync'], settingValue: boolean) {
+    const optimisticData: OnyxUpdate[] = [
+        {
+            onyxMethod: Onyx.METHOD.MERGE,
+            key: `${ONYXKEYS.COLLECTION.POLICY}${policyID}`,
+            value: {
+                connections: {
+                    intacct: {
+                        config: {
+                            autoSync: {
+                                [settingName]: settingValue,
+                            },
+                            pendingFields: {
+                                [settingName]: CONST.RED_BRICK_ROAD_PENDING_ACTION.UPDATE,
+                            },
+                            errorFields: {
+                                [settingName]: null,
+                            },
+                        },
+                    },
+                },
+            },
+        },
+    ];
+
+    const failureData: OnyxUpdate[] = [
+        {
+            onyxMethod: Onyx.METHOD.MERGE,
+            key: `${ONYXKEYS.COLLECTION.POLICY}${policyID}`,
+            value: {
+                connections: {
+                    intacct: {
+                        config: {
+                            autoSync: {
+                                [settingName]: !settingValue,
+                            },
+                            pendingFields: {
+                                [settingName]: null,
+                            },
+                            errorFields: {
+                                [settingName]: ErrorUtils.getMicroSecondOnyxErrorWithTranslationKey('common.genericErrorMessage'),
+                            },
+                        },
+                    },
+                },
+            },
+        },
+    ];
+
+    const successData: OnyxUpdate[] = [
+        {
+            onyxMethod: Onyx.METHOD.MERGE,
+            key: `${ONYXKEYS.COLLECTION.POLICY}${policyID}`,
+            value: {
+                connections: {
+                    intacct: {
+                        config: {
+                            pendingFields: {
+                                [settingName]: null,
+                            },
+                            errorFields: {
+                                [settingName]: null,
+                            },
+                        },
+                    },
+                },
+            },
+        },
+    ];
+
+    return {optimisticData, failureData, successData};
+}
+
+function updateSageIntacctAutoSync(policyID: string, enabled: boolean) {
+    const {optimisticData, failureData, successData} = prepareOnyxDataForAutoSyncUpdate(policyID, CONST.SAGE_INTACCT_CONFIG.AUTO_SYNC_ENABLED, enabled);
+    const parameters = {
+        policyID,
+        enabled,
+    };
+
+    API.write(WRITE_COMMANDS.UPDATE_SAGE_INTACCT_AUTO_SYNC, parameters, {optimisticData, failureData, successData});
+}
+
+function updateSageIntacctImportEmployees(policyID: string, enabled: boolean) {
+    const {optimisticData, failureData, successData} = prepareOnyxDataForConfigUpdate(policyID, CONST.SAGE_INTACCT_CONFIG.IMPORT_EMPLOYEES, enabled, !enabled);
+    const parameters = {
+        policyID,
+        enabled,
+    };
+
+    API.write(WRITE_COMMANDS.UPDATE_SAGE_INTACCT_IMPORT_EMPLOYEES, parameters, {optimisticData, failureData, successData});
+}
+
+function updateSageIntacctApprovalMode(policyID: string, enabled: boolean) {
+    const approvalModeSettingValue = enabled ? CONST.SAGE_INTACCT.APPROVAL_MODE.APPROVAL_MANUAL : '';
+    const oldApprovalModeSettingValue = enabled ? '' : CONST.SAGE_INTACCT.APPROVAL_MODE.APPROVAL_MANUAL;
+    const {optimisticData, failureData, successData} = prepareOnyxDataForConfigUpdate(
+        policyID,
+        CONST.SAGE_INTACCT_CONFIG.APPROVAL_MODE,
+        approvalModeSettingValue,
+        oldApprovalModeSettingValue,
+    );
+    const parameters = {
+        policyID,
+        value: approvalModeSettingValue,
+    };
+
+    API.write(WRITE_COMMANDS.UPDATE_SAGE_INTACCT_APPROVAL_MODE, parameters, {optimisticData, failureData, successData});
+}
+
+function updateSageIntacctSyncReimbursedReports(policyID: string, enabled: boolean) {
+    const {optimisticData, failureData, successData} = prepareOnyxDataForSyncUpdate(policyID, CONST.SAGE_INTACCT_CONFIG.SYNC_REIMBURSED_REPORTS, enabled, !enabled);
+    const parameters = {
+        policyID,
+        enabled,
+    };
+
+    API.write(WRITE_COMMANDS.UPDATE_SAGE_INTACCT_SYNC_REIMBURSED_REPORTS, parameters, {optimisticData, failureData, successData});
+}
+
+function updateSageIntacctSyncReimbursementAccountID(policyID: string, vendorID: string, oldVendorID?: string) {
+    const {optimisticData, failureData, successData} = prepareOnyxDataForSyncUpdate(policyID, CONST.SAGE_INTACCT_CONFIG.REIMBURSEMENT_ACCOUNT_ID, vendorID, oldVendorID);
+    const parameters = {
+        policyID,
+        vendorID,
+    };
+
+    API.write(WRITE_COMMANDS.UPDATE_SAGE_INTACCT_SYNC_REIMBURSEMENT_ACCOUNT_ID, parameters, {optimisticData, failureData, successData});
+}
+
+function updateSageIntacctEntity(policyID: string, entity: string, oldEntity: string) {
+    const parameters = {
+        policyID,
+        entity,
+    };
+    API.write(WRITE_COMMANDS.UPDATE_SAGE_INTACCT_ENTITY, parameters, prepareOnyxDataForConfigUpdate(policyID, CONST.SAGE_INTACCT_CONFIG.ENTITY, entity, oldEntity));
+}
+
+export {
+    connectToSageIntacct,
+    updateSageIntacctBillable,
+    updateSageIntacctSyncTaxConfiguration,
+    addSageIntacctUserDimensions,
+    updateSageIntacctMappingValue,
+    editSageIntacctUserDimensions,
+    removeSageIntacctUserDimensions,
+    removeSageIntacctUserDimensionsByName,
+    updateSageIntacctExporter,
+    clearSageIntacctErrorField,
+    clearSageIntacctPendingField,
+    updateSageIntacctExportDate,
+    updateSageIntacctReimbursableExpensesExportDestination,
+    updateSageIntacctNonreimbursableExpensesExportDestination,
+    updateSageIntacctNonreimbursableExpensesExportAccount,
+    updateSageIntacctDefaultVendor,
+    updateSageIntacctAutoSync,
+    updateSageIntacctImportEmployees,
+    updateSageIntacctApprovalMode,
+    updateSageIntacctSyncReimbursedReports,
+    updateSageIntacctSyncReimbursementAccountID,
+    updateSageIntacctEntity,
+    changeMappingsValueFromDefaultToTag,
+};
diff --git a/src/libs/actions/connections/Xero.ts b/src/libs/actions/connections/Xero.ts
new file mode 100644
index 000000000000..fa08dec2e391
--- /dev/null
+++ b/src/libs/actions/connections/Xero.ts
@@ -0,0 +1,188 @@
+import isObject from 'lodash/isObject';
+import type {OnyxEntry, OnyxUpdate} from 'react-native-onyx';
+import Onyx from 'react-native-onyx';
+import * as API from '@libs/API';
+import type {ConnectPolicyToAccountingIntegrationParams, UpdateXeroGenericTypeParams} from '@libs/API/parameters';
+import {READ_COMMANDS, WRITE_COMMANDS} from '@libs/API/types';
+import {getCommandURL} from '@libs/ApiUtils';
+import * as ErrorUtils from '@libs/ErrorUtils';
+import CONST from '@src/CONST';
+import ONYXKEYS from '@src/ONYXKEYS';
+import type * as OnyxTypes from '@src/types/onyx';
+import type * as OnyxCommon from '@src/types/onyx/OnyxCommon';
+import type {Connections, XeroTrackingCategory} from '@src/types/onyx/Policy';
+
+const getXeroSetupLink = (policyID: string) => {
+    const params: ConnectPolicyToAccountingIntegrationParams = {policyID};
+    const commandURL = getCommandURL({command: READ_COMMANDS.CONNECT_POLICY_TO_XERO, shouldSkipWebProxy: true});
+    return commandURL + new URLSearchParams(params).toString();
+};
+
+const getTrackingCategories = (policy: OnyxEntry<OnyxTypes.Policy>): Array<XeroTrackingCategory & {value: string}> => {
+    const {trackingCategories} = policy?.connections?.xero?.data ?? {};
+    const {mappings} = policy?.connections?.xero?.config ?? {};
+
+    if (!trackingCategories) {
+        return [];
+    }
+
+    return trackingCategories.map((category) => ({
+        ...category,
+        value: mappings?.[`${CONST.XERO_CONFIG.TRACKING_CATEGORY_PREFIX}${category.id}`] ?? '',
+    }));
+};
+
+function createXeroPendingFields<TSettingName extends keyof Connections['xero']['config']>(
+    settingName: TSettingName,
+    settingValue: Partial<Connections['xero']['config'][TSettingName]>,
+    pendingValue: OnyxCommon.PendingAction,
+) {
+    if (!isObject(settingValue)) {
+        return {[settingName]: pendingValue};
+    }
+
+    return Object.keys(settingValue).reduce<Record<string, OnyxCommon.PendingAction>>((acc, setting) => {
+        acc[setting] = pendingValue;
+        return acc;
+    }, {});
+}
+
+function createXeroErrorFields<TSettingName extends keyof Connections['xero']['config']>(
+    settingName: TSettingName,
+    settingValue: Partial<Connections['xero']['config'][TSettingName]>,
+    errorValue: OnyxCommon.Errors | null,
+) {
+    if (!isObject(settingValue)) {
+        return {[settingName]: errorValue};
+    }
+
+    return Object.keys(settingValue).reduce<OnyxCommon.ErrorFields>((acc, setting) => {
+        acc[setting] = errorValue;
+        return acc;
+    }, {});
+}
+
+function prepareXeroOptimisticData<TSettingName extends keyof Connections['xero']['config']>(
+    policyID: string,
+    settingName: TSettingName,
+    settingValue: Partial<Connections['xero']['config'][TSettingName]>,
+    oldSettingValue?: Partial<Connections['xero']['config'][TSettingName]> | null,
+) {
+    const optimisticData: OnyxUpdate[] = [
+        {
+            onyxMethod: Onyx.METHOD.MERGE,
+            key: `${ONYXKEYS.COLLECTION.POLICY}${policyID}`,
+            value: {
+                connections: {
+                    xero: {
+                        config: {
+                            [settingName]: settingValue ?? null,
+                            pendingFields: createXeroPendingFields(settingName, settingValue, CONST.RED_BRICK_ROAD_PENDING_ACTION.UPDATE),
+                            errorFields: createXeroErrorFields(settingName, settingValue, null),
+                        },
+                    },
+                },
+            },
+        },
+    ];
+
+    const failureData: OnyxUpdate[] = [
+        {
+            onyxMethod: Onyx.METHOD.MERGE,
+            key: `${ONYXKEYS.COLLECTION.POLICY}${policyID}`,
+            value: {
+                connections: {
+                    xero: {
+                        config: {
+                            [settingName]: oldSettingValue ?? null,
+                            pendingFields: createXeroPendingFields(settingName, settingValue, null),
+                            errorFields: createXeroErrorFields(settingName, settingValue, ErrorUtils.getMicroSecondOnyxErrorWithTranslationKey('common.genericErrorMessage')),
+                        },
+                    },
+                },
+            },
+        },
+    ];
+
+    const successData: OnyxUpdate[] = [
+        {
+            onyxMethod: Onyx.METHOD.MERGE,
+            key: `${ONYXKEYS.COLLECTION.POLICY}${policyID}`,
+            value: {
+                connections: {
+                    xero: {
+                        config: {
+                            pendingFields: createXeroPendingFields(settingName, settingValue, null),
+                            errorFields: createXeroErrorFields(settingName, settingValue, null),
+                        },
+                    },
+                },
+            },
+        },
+    ];
+
+    return {optimisticData, failureData, successData};
+}
+
+function updateXeroImportTrackingCategories(
+    policyID: string,
+    importTrackingCategories: Partial<Connections['xero']['config']['importTrackingCategories']>,
+    oldImportTrackingCategories?: Partial<Connections['xero']['config']['importTrackingCategories']>,
+) {
+    const parameters: UpdateXeroGenericTypeParams = {
+        policyID,
+        settingValue: JSON.stringify(importTrackingCategories),
+        idempotencyKey: String(CONST.XERO_CONFIG.IMPORT_TRACKING_CATEGORIES),
+    };
+
+    const {optimisticData, failureData, successData} = prepareXeroOptimisticData(
+        policyID,
+        CONST.XERO_CONFIG.IMPORT_TRACKING_CATEGORIES,
+        importTrackingCategories,
+        oldImportTrackingCategories,
+    );
+
+    API.write(WRITE_COMMANDS.UPDATE_XERO_IMPORT_TRACKING_CATEGORIES, parameters, {optimisticData, failureData, successData});
+}
+
+function updateXeroImportTaxRates(
+    policyID: string,
+    importTaxesRate: Partial<Connections['xero']['config']['importTaxRates']>,
+    oldImportTaxesRate?: Partial<Connections['xero']['config']['importTaxRates']>,
+) {
+    const parameters: UpdateXeroGenericTypeParams = {
+        policyID,
+        settingValue: JSON.stringify(importTaxesRate),
+        idempotencyKey: String(CONST.XERO_CONFIG.IMPORT_TAX_RATES),
+    };
+
+    const {optimisticData, failureData, successData} = prepareXeroOptimisticData(policyID, CONST.XERO_CONFIG.IMPORT_TAX_RATES, importTaxesRate, oldImportTaxesRate);
+
+    API.write(WRITE_COMMANDS.UPDATE_XERO_IMPORT_TAX_RATES, parameters, {optimisticData, failureData, successData});
+}
+
+function updateXeroTenantID(policyID: string, settingValue: string, oldSettingValue?: string) {
+    const parameters: UpdateXeroGenericTypeParams = {
+        policyID,
+        settingValue: JSON.stringify(settingValue),
+        idempotencyKey: String(CONST.XERO_CONFIG.TENANT_ID),
+    };
+
+    const {optimisticData, successData, failureData} = prepareXeroOptimisticData(policyID, CONST.XERO_CONFIG.TENANT_ID, settingValue, oldSettingValue);
+
+    API.write(WRITE_COMMANDS.UPDATE_XERO_TENANT_ID, parameters, {optimisticData, successData, failureData});
+}
+
+function updateXeroMappings(policyID: string, mappingValue: Partial<Connections['xero']['config']['mappings']>, oldMappingValue?: Partial<Connections['xero']['config']['mappings']>) {
+    const parameters: UpdateXeroGenericTypeParams = {
+        policyID,
+        settingValue: JSON.stringify(mappingValue),
+        idempotencyKey: String(CONST.XERO_CONFIG.MAPPINGS),
+    };
+
+    const {optimisticData, failureData, successData} = prepareXeroOptimisticData(policyID, CONST.XERO_CONFIG.MAPPINGS, mappingValue, oldMappingValue);
+
+    API.write(WRITE_COMMANDS.UPDATE_XERO_MAPPING, parameters, {optimisticData, failureData, successData});
+}
+
+export {getXeroSetupLink, getTrackingCategories, updateXeroImportTrackingCategories, updateXeroImportTaxRates, updateXeroTenantID, updateXeroMappings};
diff --git a/src/libs/actions/connections/index.ts b/src/libs/actions/connections/index.ts
index f9d16692aedd..fa2e274204a2 100644
--- a/src/libs/actions/connections/index.ts
+++ b/src/libs/actions/connections/index.ts
@@ -1,12 +1,23 @@
+import isObject from 'lodash/isObject';
+import type {OnyxEntry, OnyxUpdate} from 'react-native-onyx';
 import Onyx from 'react-native-onyx';
-import type {OnyxUpdate} from 'react-native-onyx';
 import * as API from '@libs/API';
-import type {RemovePolicyConnectionParams, UpdatePolicyConnectionConfigParams} from '@libs/API/parameters';
-import {WRITE_COMMANDS} from '@libs/API/types';
+import type {RemovePolicyConnectionParams, UpdateManyPolicyConnectionConfigurationsParams, UpdatePolicyConnectionConfigParams} from '@libs/API/parameters';
+import {READ_COMMANDS, WRITE_COMMANDS} from '@libs/API/types';
 import * as ErrorUtils from '@libs/ErrorUtils';
+import * as Localize from '@libs/Localize';
 import CONST from '@src/CONST';
 import ONYXKEYS from '@src/ONYXKEYS';
+import type * as OnyxCommon from '@src/types/onyx/OnyxCommon';
 import type {ConnectionName, Connections, PolicyConnectionName} from '@src/types/onyx/Policy';
+import type Policy from '@src/types/onyx/Policy';
+import {isEmptyObject} from '@src/types/utils/EmptyObject';
+
+type ConnectionNameExceptNetSuite = Exclude<ConnectionName, typeof CONST.POLICY.CONNECTIONS.NAME.NETSUITE>;
+
+type Nullable<T> = {
+    [P in keyof T]: T[P] | null;
+};
 
 function removePolicyConnection(policyID: string, connectionName: PolicyConnectionName) {
     const optimisticData: OnyxUpdate[] = [
@@ -32,7 +43,108 @@ function removePolicyConnection(policyID: string, connectionName: PolicyConnecti
     };
     API.write(WRITE_COMMANDS.REMOVE_POLICY_CONNECTION, parameters, {optimisticData});
 }
-function updatePolicyConnectionConfig<TConnectionName extends ConnectionName, TSettingName extends keyof Connections[TConnectionName]['config']>(
+
+function createPendingFields<TConnectionName extends ConnectionNameExceptNetSuite, TSettingName extends keyof Connections[TConnectionName]['config']>(
+    settingName: TSettingName,
+    settingValue: Partial<Connections[TConnectionName]['config'][TSettingName]>,
+    pendingValue: OnyxCommon.PendingAction,
+) {
+    if (!isObject(settingValue)) {
+        return {[settingName]: pendingValue};
+    }
+
+    return Object.keys(settingValue).reduce<Record<string, OnyxCommon.PendingAction>>((acc, setting) => {
+        acc[setting] = pendingValue;
+        return acc;
+    }, {});
+}
+
+function createErrorFields<TConnectionName extends ConnectionNameExceptNetSuite, TSettingName extends keyof Connections[TConnectionName]['config']>(
+    settingName: TSettingName,
+    settingValue: Partial<Connections[TConnectionName]['config'][TSettingName]>,
+    errorValue: OnyxCommon.Errors | null,
+) {
+    if (!isObject(settingValue)) {
+        return {[settingName]: errorValue};
+    }
+
+    return Object.keys(settingValue).reduce<OnyxCommon.ErrorFields>((acc, setting) => {
+        acc[setting] = errorValue;
+        return acc;
+    }, {});
+}
+
+function updatePolicyXeroConnectionConfig<TConnectionName extends ConnectionNameExceptNetSuite, TSettingName extends keyof Connections[TConnectionName]['config']>(
+    policyID: string,
+    connectionName: TConnectionName,
+    settingName: TSettingName,
+    settingValue: Partial<Connections[TConnectionName]['config'][TSettingName]>,
+    oldSettingValue?: Nullable<Partial<Connections[TConnectionName]['config'][TSettingName]>>,
+) {
+    const optimisticData: OnyxUpdate[] = [
+        {
+            onyxMethod: Onyx.METHOD.MERGE,
+            key: `${ONYXKEYS.COLLECTION.POLICY}${policyID}`,
+            value: {
+                connections: {
+                    [connectionName]: {
+                        config: {
+                            [settingName]: settingValue ?? null,
+                            pendingFields: createPendingFields(settingName, settingValue, CONST.RED_BRICK_ROAD_PENDING_ACTION.UPDATE),
+                            errorFields: createErrorFields(settingName, settingValue, null),
+                        },
+                    },
+                },
+            },
+        },
+    ];
+
+    const failureData: OnyxUpdate[] = [
+        {
+            onyxMethod: Onyx.METHOD.MERGE,
+            key: `${ONYXKEYS.COLLECTION.POLICY}${policyID}`,
+            value: {
+                connections: {
+                    [connectionName]: {
+                        config: {
+                            [settingName]: oldSettingValue ?? null,
+                            pendingFields: createPendingFields(settingName, settingValue, null),
+                            errorFields: createErrorFields(settingName, settingValue, ErrorUtils.getMicroSecondOnyxErrorWithTranslationKey('common.genericErrorMessage')),
+                        },
+                    },
+                },
+            },
+        },
+    ];
+
+    const successData: OnyxUpdate[] = [
+        {
+            onyxMethod: Onyx.METHOD.MERGE,
+            key: `${ONYXKEYS.COLLECTION.POLICY}${policyID}`,
+            value: {
+                connections: {
+                    [connectionName]: {
+                        config: {
+                            pendingFields: createPendingFields(settingName, settingValue, null),
+                            errorFields: createErrorFields(settingName, settingValue, null),
+                        },
+                    },
+                },
+            },
+        },
+    ];
+
+    const parameters: UpdatePolicyConnectionConfigParams = {
+        policyID,
+        connectionName,
+        settingName: String(settingName),
+        settingValue: JSON.stringify(settingValue),
+        idempotencyKey: String(settingName),
+    };
+    API.write(WRITE_COMMANDS.UPDATE_POLICY_CONNECTION_CONFIG, parameters, {optimisticData, failureData, successData});
+}
+
+function updatePolicyConnectionConfig<TConnectionName extends ConnectionNameExceptNetSuite, TSettingName extends keyof Connections[TConnectionName]['config']>(
     policyID: string,
     connectionName: TConnectionName,
     settingName: TSettingName,
@@ -73,7 +185,7 @@ function updatePolicyConnectionConfig<TConnectionName extends ConnectionName, TS
                                 [settingName]: null,
                             },
                             errorFields: {
-                                [settingName]: ErrorUtils.getMicroSecondOnyxError('common.genericErrorMessage'),
+                                [settingName]: ErrorUtils.getMicroSecondOnyxErrorWithTranslationKey('common.genericErrorMessage'),
                             },
                         },
                     },
@@ -114,4 +226,236 @@ function updatePolicyConnectionConfig<TConnectionName extends ConnectionName, TS
     API.write(WRITE_COMMANDS.UPDATE_POLICY_CONNECTION_CONFIG, parameters, {optimisticData, failureData, successData});
 }
 
-export {removePolicyConnection, updatePolicyConnectionConfig};
+/**
+ * This method returns read command and stage in progres for a given accounting integration.
+ *
+ * @param policyID - ID of the policy for which the sync is needed
+ * @param connectionName - Name of the connection, QBO/Xero
+ */
+function getSyncConnectionParameters(connectionName: PolicyConnectionName) {
+    switch (connectionName) {
+        case CONST.POLICY.CONNECTIONS.NAME.QBO: {
+            return {readCommand: READ_COMMANDS.SYNC_POLICY_TO_QUICKBOOKS_ONLINE, stageInProgress: CONST.POLICY.CONNECTIONS.SYNC_STAGE_NAME.STARTING_IMPORT_QBO};
+        }
+        case CONST.POLICY.CONNECTIONS.NAME.XERO: {
+            return {readCommand: READ_COMMANDS.SYNC_POLICY_TO_XERO, stageInProgress: CONST.POLICY.CONNECTIONS.SYNC_STAGE_NAME.STARTING_IMPORT_XERO};
+        }
+        case CONST.POLICY.CONNECTIONS.NAME.NETSUITE: {
+            return {readCommand: READ_COMMANDS.SYNC_POLICY_TO_NETSUITE, stageInProgress: CONST.POLICY.CONNECTIONS.SYNC_STAGE_NAME.NETSUITE_SYNC_CONNECTION};
+        }
+        case CONST.POLICY.CONNECTIONS.NAME.SAGE_INTACCT: {
+            return {readCommand: READ_COMMANDS.SYNC_POLICY_TO_SAGE_INTACCT, stageInProgress: CONST.POLICY.CONNECTIONS.SYNC_STAGE_NAME.SAGE_INTACCT_SYNC_CHECK_CONNECTION};
+        }
+        default:
+            return undefined;
+    }
+}
+
+/**
+ * This method helps in syncing policy to the connected accounting integration.
+ *
+ * @param policyID - ID of the policy for which the sync is needed
+ * @param connectionName - Name of the connection, QBO/Xero
+ */
+function syncConnection(policyID: string, connectionName: PolicyConnectionName | undefined) {
+    if (!connectionName) {
+        return;
+    }
+    const syncConnectionData = getSyncConnectionParameters(connectionName);
+
+    if (!syncConnectionData) {
+        return;
+    }
+    const optimisticData: OnyxUpdate[] = [
+        {
+            onyxMethod: Onyx.METHOD.MERGE,
+            key: `${ONYXKEYS.COLLECTION.POLICY_CONNECTION_SYNC_PROGRESS}${policyID}`,
+            value: {
+                stageInProgress: syncConnectionData?.stageInProgress,
+                connectionName,
+                timestamp: new Date().toISOString(),
+            },
+        },
+    ];
+
+    const failureData: OnyxUpdate[] = [
+        {
+            onyxMethod: Onyx.METHOD.SET,
+            key: `${ONYXKEYS.COLLECTION.POLICY_CONNECTION_SYNC_PROGRESS}${policyID}`,
+            value: null,
+        },
+    ];
+
+    API.read(
+        syncConnectionData.readCommand,
+        {
+            policyID,
+            idempotencyKey: policyID,
+        },
+        {
+            optimisticData,
+            failureData,
+        },
+    );
+}
+
+function updateManyPolicyConnectionConfigs<TConnectionName extends ConnectionNameExceptNetSuite, TConfigUpdate extends Partial<Connections[TConnectionName]['config']>>(
+    policyID: string,
+    connectionName: TConnectionName,
+    configUpdate: TConfigUpdate,
+    configCurrentData: TConfigUpdate,
+) {
+    const optimisticData: OnyxUpdate[] = [
+        {
+            onyxMethod: Onyx.METHOD.MERGE,
+            key: `${ONYXKEYS.COLLECTION.POLICY}${policyID}`,
+            value: {
+                connections: {
+                    [connectionName]: {
+                        config: {
+                            ...configUpdate,
+                            pendingFields: Object.fromEntries(Object.keys(configUpdate).map((settingName) => [settingName, CONST.RED_BRICK_ROAD_PENDING_ACTION.UPDATE])),
+                            errorFields: Object.fromEntries(Object.keys(configUpdate).map((settingName) => [settingName, null])),
+                        },
+                    },
+                },
+            },
+        },
+    ];
+
+    const failureData: OnyxUpdate[] = [
+        {
+            onyxMethod: Onyx.METHOD.MERGE,
+            key: `${ONYXKEYS.COLLECTION.POLICY}${policyID}`,
+            value: {
+                connections: {
+                    [connectionName]: {
+                        config: {
+                            ...configCurrentData,
+                            pendingFields: Object.fromEntries(Object.keys(configUpdate).map((settingName) => [settingName, null])),
+                            errorFields: Object.fromEntries(
+                                Object.keys(configUpdate).map((settingName) => [settingName, ErrorUtils.getMicroSecondOnyxErrorWithTranslationKey('common.genericErrorMessage')]),
+                            ),
+                        },
+                    },
+                },
+            },
+        },
+    ];
+
+    const successData: OnyxUpdate[] = [
+        {
+            onyxMethod: Onyx.METHOD.MERGE,
+            key: `${ONYXKEYS.COLLECTION.POLICY}${policyID}`,
+            value: {
+                connections: {
+                    [connectionName]: {
+                        config: {
+                            pendingFields: Object.fromEntries(Object.keys(configUpdate).map((settingName) => [settingName, null])),
+                            errorFields: Object.fromEntries(Object.keys(configUpdate).map((settingName) => [settingName, null])),
+                        },
+                    },
+                },
+            },
+        },
+    ];
+
+    const parameters: UpdateManyPolicyConnectionConfigurationsParams = {
+        policyID,
+        connectionName,
+        configUpdate: JSON.stringify(configUpdate),
+        idempotencyKey: Object.keys(configUpdate).join(','),
+    };
+    API.write(WRITE_COMMANDS.UPDATE_MANY_POLICY_CONNECTION_CONFIGS, parameters, {optimisticData, failureData, successData});
+}
+
+function getSynchronizationErrorMessage(policy: OnyxEntry<Policy>, connectionName: PolicyConnectionName, isSyncInProgress: boolean): string | undefined {
+    const syncError = Localize.translateLocal('workspace.accounting.syncError', connectionName);
+    // NetSuite does not use the conventional lastSync object, so we need to check for lastErrorSyncDate
+    if (connectionName === CONST.POLICY.CONNECTIONS.NAME.NETSUITE) {
+        if (
+            !isSyncInProgress &&
+            (!!policy?.connections?.[CONST.POLICY.CONNECTIONS.NAME.NETSUITE].lastErrorSyncDate || policy?.connections?.[CONST.POLICY.CONNECTIONS.NAME.NETSUITE]?.verified === false)
+        ) {
+            return syncError;
+        }
+        return;
+    }
+
+    const connection = policy?.connections?.[connectionName];
+    if (isSyncInProgress || isEmptyObject(connection?.lastSync) || connection?.lastSync?.isSuccessful) {
+        return;
+    }
+    return `${syncError} ("${connection?.lastSync?.errorMessage}")`;
+}
+
+function isAuthenticationError(policy: OnyxEntry<Policy>, connectionName: PolicyConnectionName) {
+    if (connectionName === CONST.POLICY.CONNECTIONS.NAME.NETSUITE) {
+        return false;
+    }
+    const connection = policy?.connections?.[connectionName];
+    return connection?.lastSync?.isAuthenticationError === true;
+}
+
+function isConnectionUnverified(policy: OnyxEntry<Policy>, connectionName: PolicyConnectionName): boolean {
+    // A verified connection is one that has been successfully synced at least once
+    // We'll always err on the side of considering a connection as verified connected even if we can't find a lastSync property saying as such
+    // i.e. this is a property that is explicitly set to false, not just missing
+    if (connectionName === CONST.POLICY.CONNECTIONS.NAME.NETSUITE) {
+        return !(policy?.connections?.[CONST.POLICY.CONNECTIONS.NAME.NETSUITE]?.verified ?? true);
+    }
+
+    // If the connection has no lastSync property, we'll consider it unverified
+    if (isEmptyObject(policy?.connections?.[connectionName]?.lastSync)) {
+        return true;
+    }
+
+    return !(policy?.connections?.[connectionName]?.lastSync?.isConnected ?? true);
+}
+
+function copyExistingPolicyConnection(connectedPolicyID: string, targetPolicyID: string, connectionName: ConnectionName) {
+    let stageInProgress;
+    switch (connectionName) {
+        case CONST.POLICY.CONNECTIONS.NAME.NETSUITE:
+            stageInProgress = CONST.POLICY.CONNECTIONS.SYNC_STAGE_NAME.NETSUITE_SYNC_CONNECTION;
+            break;
+        case CONST.POLICY.CONNECTIONS.NAME.SAGE_INTACCT:
+            stageInProgress = CONST.POLICY.CONNECTIONS.SYNC_STAGE_NAME.SAGE_INTACCT_SYNC_CHECK_CONNECTION;
+            break;
+        default:
+            stageInProgress = null;
+    }
+
+    const optimisticData: OnyxUpdate[] = [
+        {
+            onyxMethod: Onyx.METHOD.MERGE,
+            key: `${ONYXKEYS.COLLECTION.POLICY_CONNECTION_SYNC_PROGRESS}${targetPolicyID}`,
+            value: {
+                stageInProgress,
+                connectionName,
+                timestamp: new Date().toISOString(),
+            },
+        },
+    ];
+    API.write(
+        WRITE_COMMANDS.COPY_EXISTING_POLICY_CONNECTION,
+        {
+            policyID: connectedPolicyID,
+            targetPolicyID,
+            connectionName,
+        },
+        {optimisticData},
+    );
+}
+
+export {
+    removePolicyConnection,
+    updatePolicyConnectionConfig,
+    updatePolicyXeroConnectionConfig,
+    updateManyPolicyConnectionConfigs,
+    getSynchronizationErrorMessage,
+    isAuthenticationError,
+    syncConnection,
+    copyExistingPolicyConnection,
+    isConnectionUnverified,
+};
diff --git a/src/libs/actions/navigateFromNotification/index.native.ts b/src/libs/actions/navigateFromNotification/index.native.ts
new file mode 100644
index 000000000000..488ec8ac74e8
--- /dev/null
+++ b/src/libs/actions/navigateFromNotification/index.native.ts
@@ -0,0 +1,8 @@
+import Navigation from '@libs/Navigation/Navigation';
+import ROUTES from '@src/ROUTES';
+
+const navigateFromNotification = (reportID: string) => {
+    Navigation.navigate(ROUTES.REPORT_WITH_ID.getRoute(reportID));
+};
+
+export default navigateFromNotification;
diff --git a/src/libs/actions/navigateFromNotification/index.ts b/src/libs/actions/navigateFromNotification/index.ts
new file mode 100644
index 000000000000..f710a16a3e70
--- /dev/null
+++ b/src/libs/actions/navigateFromNotification/index.ts
@@ -0,0 +1,9 @@
+import Navigation from '@libs/Navigation/Navigation';
+import CONST from '@src/CONST';
+import ROUTES from '@src/ROUTES';
+
+const navigateFromNotification = (reportID: string) => {
+    Navigation.navigate(ROUTES.REPORT_WITH_ID.getRoute(reportID, undefined, CONST.REFERRER.NOTIFICATION));
+};
+
+export default navigateFromNotification;
diff --git a/src/libs/asyncOpenURL/index.ts b/src/libs/asyncOpenURL/index.ts
index 8fca6891e9d6..5aff101933af 100644
--- a/src/libs/asyncOpenURL/index.ts
+++ b/src/libs/asyncOpenURL/index.ts
@@ -1,4 +1,5 @@
 import {Linking} from 'react-native';
+import Log from '@libs/Log';
 import type AsyncOpenURL from './types';
 
 const asyncOpenURL: AsyncOpenURL = (promise, url) => {
@@ -6,9 +7,13 @@ const asyncOpenURL: AsyncOpenURL = (promise, url) => {
         return;
     }
 
-    promise.then((params) => {
-        Linking.openURL(typeof url === 'string' ? url : url(params));
-    });
+    promise
+        .then((params) => {
+            Linking.openURL(typeof url === 'string' ? url : url(params));
+        })
+        .catch(() => {
+            Log.warn('[asyncOpenURL] error occured while opening URL', {url});
+        });
 };
 
 export default asyncOpenURL;
diff --git a/src/libs/asyncOpenURL/index.website.ts b/src/libs/asyncOpenURL/index.website.ts
index b781c4f605cb..4f6d95b76b8b 100644
--- a/src/libs/asyncOpenURL/index.website.ts
+++ b/src/libs/asyncOpenURL/index.website.ts
@@ -1,4 +1,5 @@
 import {Linking} from 'react-native';
+import Log from '@libs/Log';
 import type AsyncOpenURL from './types';
 
 /**
@@ -13,9 +14,13 @@ const asyncOpenURL: AsyncOpenURL = (promise, url, shouldSkipCustomSafariLogic) =
     const isSafari = /^((?!chrome|android).)*safari/i.test(navigator.userAgent);
 
     if (!isSafari || shouldSkipCustomSafariLogic) {
-        promise.then((params) => {
-            Linking.openURL(typeof url === 'string' ? url : url(params));
-        });
+        promise
+            .then((params) => {
+                Linking.openURL(typeof url === 'string' ? url : url(params));
+            })
+            .catch(() => {
+                Log.warn('[asyncOpenURL] error occured while opening URL', {url});
+            });
     } else {
         const windowRef = window.open();
         promise
@@ -25,7 +30,10 @@ const asyncOpenURL: AsyncOpenURL = (promise, url, shouldSkipCustomSafariLogic) =
                 }
                 windowRef.location = typeof url === 'string' ? url : url(params);
             })
-            .catch(() => windowRef?.close());
+            .catch(() => {
+                windowRef?.close();
+                Log.warn('[asyncOpenURL] error occured while opening URL', {url});
+            });
     }
 };
 
diff --git a/src/libs/compose.ts b/src/libs/compose.ts
deleted file mode 100644
index dadc586d0f0d..000000000000
--- a/src/libs/compose.ts
+++ /dev/null
@@ -1,71 +0,0 @@
-/* eslint-disable @typescript-eslint/ban-types */
-/* eslint-disable import/export */
-
-/**
- * This is a utility function taken directly from Redux. (We don't want to add Redux as a dependency)
- * It enables functional composition, useful for the chaining/composition of HOCs.
- *
- * For example, instead of:
- *
- * export default hoc1(config1, hoc2(config2, hoc3(config3)))(Component);
- *
- * Use this instead:
- *
- * export default compose(
- *     hoc1(config1),
- *     hoc2(config2),
- *     hoc3(config3),
- * )(Component)
- */
-export default function compose(): <R>(a: R) => R;
-
-export default function compose<F extends Function>(f: F): F;
-
-/* two functions */
-export default function compose<A extends unknown[], R1, R2>(f1: (...args: A) => R1, f2: (a: R1) => R2): (...args: A) => R2;
-
-/* three functions */
-export default function compose<A extends unknown[], R1, R2, R3>(f1: (...args: A) => R1, f2: (a: R1) => R2, f3: (a: R2) => R3): (...args: A) => R3;
-
-/* four functions */
-export default function compose<A extends unknown[], R1, R2, R3, R4>(f1: (...args: A) => R1, f2: (a: R1) => R2, f3: (a: R2) => R3, f4: (a: R3) => R4): (...args: A) => R4;
-
-/* five functions */
-export default function compose<A extends unknown[], R1, R2, R3, R4, R5>(
-    f1: (...args: A) => R1,
-    f2: (a: R1) => R2,
-    f3: (a: R2) => R3,
-    f4: (a: R3) => R4,
-    f5: (a: R4) => R5,
-): (...args: A) => R5;
-
-/* six functions */
-export default function compose<A extends unknown[], R1, R2, R3, R4, R5, R6>(
-    f1: (...args: A) => R1,
-    f2: (a: R1) => R2,
-    f3: (a: R2) => R3,
-    f4: (a: R3) => R4,
-    f5: (a: R4) => R5,
-    f6: (a: R5) => R6,
-): (...args: A) => R6;
-
-/* rest */
-export default function compose<R>(f1: (a: unknown) => R, ...funcs: Function[]): (...args: unknown[]) => R;
-
-export default function compose(...funcs: Function[]): Function {
-    if (funcs.length === 0) {
-        // infer the argument type so it is usable in inference down the line
-        return <T>(arg: T) => arg;
-    }
-
-    if (funcs.length === 1) {
-        return funcs[0];
-    }
-
-    return funcs.reduce(
-        (a, b) =>
-            (...args: unknown[]) =>
-                // eslint-disable-next-line @typescript-eslint/no-unsafe-return
-                a(b(...args)),
-    );
-}
diff --git a/src/libs/fileDownload/DownloadUtils.ts b/src/libs/fileDownload/DownloadUtils.ts
new file mode 100644
index 000000000000..a09b0aa38c75
--- /dev/null
+++ b/src/libs/fileDownload/DownloadUtils.ts
@@ -0,0 +1,73 @@
+import * as ApiUtils from '@libs/ApiUtils';
+import tryResolveUrlFromApiRoot from '@libs/tryResolveUrlFromApiRoot';
+import * as Link from '@userActions/Link';
+import CONST from '@src/CONST';
+import * as FileUtils from './FileUtils';
+import type {FileDownload} from './types';
+
+const createDownloadLink = (href: string, fileName: string) => {
+    // creating anchor tag to initiate download
+    const link = document.createElement('a');
+    // adding href to anchor
+    link.href = href;
+    link.style.display = 'none';
+
+    // eslint-disable-next-line @typescript-eslint/prefer-nullish-coalescing -- Disabling this line for safeness as nullish coalescing works only if the value is undefined or null, and since fileName can be an empty string we want to default to `FileUtils.getFileName(url)`
+    link.download = fileName;
+
+    // Append to html link element page
+    document.body.appendChild(link);
+
+    // Start download
+    link.click();
+
+    // Clean up and remove the link
+    URL.revokeObjectURL(link.href);
+    link.parentNode?.removeChild(link);
+};
+
+/**
+ * The function downloads an attachment on web/desktop platforms.
+ */
+// eslint-disable-next-line @typescript-eslint/no-unused-vars
+const fetchFileDownload: FileDownload = (url, fileName, successMessage = '', shouldOpenExternalLink = false, formData = undefined, requestType = 'get', onDownloadFailed?: () => void) => {
+    const resolvedUrl = tryResolveUrlFromApiRoot(url);
+
+    const isApiUrl = resolvedUrl.startsWith(ApiUtils.getApiRoot());
+    const isAttachmentUrl = CONST.ATTACHMENT_LOCAL_URL_PREFIX.some((prefix) => resolvedUrl.startsWith(prefix));
+    const isSageUrl = url === CONST.EXPENSIFY_PACKAGE_FOR_SAGE_INTACCT;
+    if (
+        // We have two file download cases that we should allow: 1. downloading attachments 2. downloading Expensify package for Sage Intacct
+        shouldOpenExternalLink ||
+        (!isApiUrl && !isAttachmentUrl && !isSageUrl)
+    ) {
+        // Different origin URLs might pose a CORS issue during direct downloads.
+        // Opening in a new tab avoids this limitation, letting the browser handle the download.
+        Link.openExternalLink(url);
+        return Promise.resolve();
+    }
+
+    const fetchOptions: RequestInit = {
+        method: requestType,
+        body: formData,
+    };
+
+    return fetch(url, fetchOptions)
+        .then((response) => response.blob())
+        .then((blob) => {
+            // Create blob link to download
+            const href = URL.createObjectURL(new Blob([blob]));
+            const completeFileName = FileUtils.appendTimeToFileName(fileName ?? FileUtils.getFileName(url));
+            createDownloadLink(href, completeFileName);
+        })
+        .catch(() => {
+            if (onDownloadFailed) {
+                onDownloadFailed();
+            } else {
+                // file could not be downloaded, open sourceURL in new tab
+                Link.openExternalLink(url);
+            }
+        });
+};
+
+export default fetchFileDownload;
diff --git a/src/libs/fileDownload/FileUtils.ts b/src/libs/fileDownload/FileUtils.ts
index 6517a7a28642..05f29390ca14 100644
--- a/src/libs/fileDownload/FileUtils.ts
+++ b/src/libs/fileDownload/FileUtils.ts
@@ -1,11 +1,14 @@
-import Str from 'expensify-common/lib/str';
+import {Str} from 'expensify-common';
 import {Alert, Linking, Platform} from 'react-native';
 import ImageSize from 'react-native-image-size';
 import type {FileObject} from '@components/AttachmentModal';
 import DateUtils from '@libs/DateUtils';
 import * as Localize from '@libs/Localize';
 import Log from '@libs/Log';
+import saveLastRoute from '@libs/saveLastRoute';
 import CONST from '@src/CONST';
+import getImageManipulator from './getImageManipulator';
+import getImageResolution from './getImageResolution';
 import type {ReadFileAsync, SplitExtensionFromFileName} from './types';
 
 /**
@@ -15,7 +18,9 @@ import type {ReadFileAsync, SplitExtensionFromFileName} from './types';
 function showSuccessAlert(successMessage?: string) {
     Alert.alert(
         Localize.translateLocal('fileDownload.success.title'),
-        successMessage ?? Localize.translateLocal('fileDownload.success.message'),
+        // successMessage can be an empty string and we want to default to `Localize.translateLocal('fileDownload.success.message')`
+        // eslint-disable-next-line @typescript-eslint/prefer-nullish-coalescing
+        successMessage || Localize.translateLocal('fileDownload.success.message'),
         [
             {
                 text: Localize.translateLocal('common.ok'),
@@ -72,6 +77,9 @@ function showCameraPermissionsAlert() {
                 text: Localize.translateLocal('common.settings'),
                 onPress: () => {
                     Linking.openSettings();
+                    // In the case of ios, the App reloads when we update camera permission from settings
+                    // we are saving last route so we can navigate to it after app reload
+                    saveLastRoute();
                 },
             },
         ],
@@ -241,7 +249,7 @@ function base64ToFile(base64: string, filename: string): File {
     return file;
 }
 
-function validateImageForCorruption(file: FileObject): Promise<void> {
+function validateImageForCorruption(file: FileObject): Promise<{width: number; height: number} | void> {
     if (!Str.isImage(file.name ?? '') || !file.uri) {
         return Promise.resolve();
     }
@@ -252,6 +260,69 @@ function validateImageForCorruption(file: FileObject): Promise<void> {
     });
 }
 
+/** Verify file format based on the magic bytes of the file - some formats might be identified by multiple signatures */
+function verifyFileFormat({fileUri, formatSignatures}: {fileUri: string; formatSignatures: readonly string[]}) {
+    return fetch(fileUri)
+        .then((file) => file.arrayBuffer())
+        .then((arrayBuffer) => {
+            const uintArray = new Uint8Array(arrayBuffer, 4, 12);
+
+            const hexString = Array.from(uintArray)
+                .map((b) => b.toString(16).padStart(2, '0'))
+                .join('');
+
+            return hexString;
+        })
+        .then((hexSignature) => {
+            return formatSignatures.some((signature) => hexSignature.startsWith(signature));
+        });
+}
+
+function isLocalFile(receiptUri?: string | number): boolean {
+    if (!receiptUri) {
+        return false;
+    }
+    return typeof receiptUri === 'number' || receiptUri?.startsWith('blob:') || receiptUri?.startsWith('file:') || receiptUri?.startsWith('/');
+}
+
+function getFileResolution(targetFile: FileObject | undefined): Promise<{width: number; height: number} | null> {
+    if (!targetFile) {
+        return Promise.resolve(null);
+    }
+
+    // If the file already has width and height, return them directly
+    if ('width' in targetFile && 'height' in targetFile) {
+        return Promise.resolve({width: targetFile.width ?? 0, height: targetFile.height ?? 0});
+    }
+
+    // Otherwise, attempt to get the image resolution
+    return getImageResolution(targetFile)
+        .then(({width, height}) => ({width, height}))
+        .catch((error: Error) => {
+            Log.hmmm('Failed to get image resolution:', error);
+            return null;
+        });
+}
+
+function isHighResolutionImage(resolution: {width: number; height: number} | null): boolean {
+    return resolution !== null && (resolution.width > CONST.IMAGE_HIGH_RESOLUTION_THRESHOLD || resolution.height > CONST.IMAGE_HIGH_RESOLUTION_THRESHOLD);
+}
+
+const getImageDimensionsAfterResize = (file: FileObject) =>
+    ImageSize.getSize(file.uri ?? '').then(({width, height}) => {
+        const scaleFactor = CONST.MAX_IMAGE_DIMENSION / (width < height ? height : width);
+        const newWidth = Math.max(1, width * scaleFactor);
+        const newHeight = Math.max(1, height * scaleFactor);
+
+        return {width: newWidth, height: newHeight};
+    });
+
+const resizeImageIfNeeded = (file: FileObject) => {
+    if (!file || !Str.isImage(file.name ?? '') || (file?.size ?? 0) <= CONST.API_ATTACHMENT_VALIDATIONS.MAX_SIZE) {
+        return Promise.resolve(file);
+    }
+    return getImageDimensionsAfterResize(file).then(({width, height}) => getImageManipulator({fileUri: file.uri ?? '', width, height, fileName: file.name ?? '', type: file.type}));
+};
 export {
     showGeneralErrorAlert,
     showSuccessAlert,
@@ -264,5 +335,12 @@ export {
     appendTimeToFileName,
     readFileAsync,
     base64ToFile,
+    isLocalFile,
     validateImageForCorruption,
+    isImage,
+    getFileResolution,
+    isHighResolutionImage,
+    verifyFileFormat,
+    getImageDimensionsAfterResize,
+    resizeImageIfNeeded,
 };
diff --git a/src/libs/fileDownload/getAttachmentDetails.ts b/src/libs/fileDownload/getAttachmentDetails.ts
index 5787979a3795..1b0abc73a50d 100644
--- a/src/libs/fileDownload/getAttachmentDetails.ts
+++ b/src/libs/fileDownload/getAttachmentDetails.ts
@@ -10,7 +10,7 @@ const getAttachmentDetails: GetAttachmentDetails = (html) => {
     const IS_IMAGE_TAG = /<img([\w\W]+?)\/>/i.test(html);
     const PREVIEW_SOURCE_REGEX = new RegExp(`${CONST.ATTACHMENT_PREVIEW_ATTRIBUTE}*=*"(.+?)"`, 'i');
     const SOURCE_REGEX = new RegExp(`${CONST.ATTACHMENT_SOURCE_ATTRIBUTE}*=*"(.+?)"`, 'i');
-    const ORIGINAL_FILENAME_REGEX = IS_IMAGE_TAG ? new RegExp(`${CONST.ATTACHMENT_ORIGINAL_FILENAME_ATTRIBUTE}*=*"(.+?)"`, 'i') : new RegExp('<a[^>]*>([^<]+)</a>', 'i');
+    const ORIGINAL_FILENAME_REGEX = IS_IMAGE_TAG ? new RegExp(`${CONST.ATTACHMENT_ORIGINAL_FILENAME_ATTRIBUTE}*=*"(.+?)"`, 'i') : new RegExp('<(?:a|video)[^>]*>([^<]+)</(?:a|video)>', 'i');
     if (!html) {
         return {
             previewSourceURL: null,
diff --git a/src/libs/fileDownload/getImageManipulator/index.native.ts b/src/libs/fileDownload/getImageManipulator/index.native.ts
new file mode 100644
index 000000000000..07b97d2e375b
--- /dev/null
+++ b/src/libs/fileDownload/getImageManipulator/index.native.ts
@@ -0,0 +1,13 @@
+import {manipulateAsync} from 'expo-image-manipulator';
+import type {FileObject} from '@components/AttachmentModal';
+import type ImageManipulatorConfig from './type';
+
+export default function getImageManipulator({fileUri, width, height, type, fileName}: ImageManipulatorConfig): Promise<FileObject> {
+    return manipulateAsync(fileUri ?? '', [{resize: {width, height}}]).then((result) => ({
+        uri: result.uri,
+        width: result.width,
+        height: result.height,
+        type,
+        name: fileName,
+    }));
+}
diff --git a/src/libs/fileDownload/getImageManipulator/index.ts b/src/libs/fileDownload/getImageManipulator/index.ts
new file mode 100644
index 000000000000..87319978caa8
--- /dev/null
+++ b/src/libs/fileDownload/getImageManipulator/index.ts
@@ -0,0 +1,14 @@
+import {manipulateAsync} from 'expo-image-manipulator';
+import type ImageManipulatorConfig from './type';
+
+export default function getImageManipulator({fileUri, width, height, fileName}: ImageManipulatorConfig): Promise<File> {
+    return manipulateAsync(fileUri ?? '', [{resize: {width, height}}]).then((result) =>
+        fetch(result.uri)
+            .then((res) => res.blob())
+            .then((blob) => {
+                const resizedFile = new File([blob], `${fileName}.jpeg`, {type: 'image/jpeg'});
+                resizedFile.uri = URL.createObjectURL(resizedFile);
+                return resizedFile;
+            }),
+    );
+}
diff --git a/src/libs/fileDownload/getImageManipulator/type.ts b/src/libs/fileDownload/getImageManipulator/type.ts
new file mode 100644
index 000000000000..e976b1eff477
--- /dev/null
+++ b/src/libs/fileDownload/getImageManipulator/type.ts
@@ -0,0 +1,9 @@
+type ImageManipulatorConfig = {
+    fileUri: string;
+    fileName: string;
+    width: number;
+    height: number;
+    type?: string;
+};
+
+export default ImageManipulatorConfig;
diff --git a/src/libs/fileDownload/getPhotoSource/index.android.ts b/src/libs/fileDownload/getPhotoSource/index.android.ts
new file mode 100644
index 000000000000..2d44d7fbf2db
--- /dev/null
+++ b/src/libs/fileDownload/getPhotoSource/index.android.ts
@@ -0,0 +1,5 @@
+function getPhotoSource(filePath: string): string {
+    return `file://${filePath}`;
+}
+
+export default getPhotoSource;
diff --git a/src/libs/fileDownload/getPhotoSource/index.ts b/src/libs/fileDownload/getPhotoSource/index.ts
new file mode 100644
index 000000000000..efbdeb54a063
--- /dev/null
+++ b/src/libs/fileDownload/getPhotoSource/index.ts
@@ -0,0 +1,5 @@
+function getPhotoSource(filePath: string): string {
+    return filePath;
+}
+
+export default getPhotoSource;
diff --git a/src/libs/fileDownload/index.android.ts b/src/libs/fileDownload/index.android.ts
index abd116565922..83255231d26b 100644
--- a/src/libs/fileDownload/index.android.ts
+++ b/src/libs/fileDownload/index.android.ts
@@ -1,6 +1,8 @@
 import {PermissionsAndroid, Platform} from 'react-native';
 import type {FetchBlobResponse} from 'react-native-blob-util';
 import RNFetchBlob from 'react-native-blob-util';
+import RNFS from 'react-native-fs';
+import CONST from '@src/CONST';
 import * as FileUtils from './FileUtils';
 import type {FileDownload} from './types';
 
@@ -94,14 +96,59 @@ function handleDownload(url: string, fileName?: string, successMessage?: string)
     });
 }
 
+const postDownloadFile = (url: string, fileName?: string, formData?: FormData, onDownloadFailed?: () => void): Promise<void> => {
+    const fetchOptions: RequestInit = {
+        method: 'POST',
+        body: formData,
+    };
+
+    return fetch(url, fetchOptions)
+        .then((response) => {
+            if (!response.ok) {
+                throw new Error('Failed to download file');
+            }
+            return response.text();
+        })
+        .then((fileData) => {
+            const finalFileName = FileUtils.appendTimeToFileName(fileName ?? 'Expensify');
+            const downloadPath = `${RNFS.DownloadDirectoryPath}/Expensify/${finalFileName}`;
+
+            return RNFS.writeFile(downloadPath, fileData, 'utf8').then(() => downloadPath);
+        })
+        .then((downloadPath) =>
+            RNFetchBlob.MediaCollection.copyToMediaStore(
+                {
+                    name: FileUtils.getFileName(downloadPath),
+                    parentFolder: 'Expensify',
+                    mimeType: null,
+                },
+                'Download',
+                downloadPath,
+            ).then(() => downloadPath),
+        )
+        .then((downloadPath) => {
+            RNFetchBlob.fs.unlink(downloadPath);
+            FileUtils.showSuccessAlert();
+        })
+        .catch(() => {
+            if (!onDownloadFailed) {
+                FileUtils.showGeneralErrorAlert();
+            }
+            onDownloadFailed?.();
+        });
+};
+
 /**
  * Checks permission and downloads the file for Android
  */
-const fileDownload: FileDownload = (url, fileName, successMessage) =>
+const fileDownload: FileDownload = (url, fileName, successMessage, _, formData, requestType, onDownloadFailed) =>
     new Promise((resolve) => {
         hasAndroidPermission()
             .then((hasPermission) => {
                 if (hasPermission) {
+                    if (requestType === CONST.NETWORK.METHOD.POST) {
+                        return postDownloadFile(url, fileName, formData, onDownloadFailed);
+                    }
                     return handleDownload(url, fileName, successMessage);
                 }
                 FileUtils.showPermissionErrorAlert();
diff --git a/src/libs/fileDownload/index.desktop.ts b/src/libs/fileDownload/index.desktop.ts
new file mode 100644
index 000000000000..de000f61b41b
--- /dev/null
+++ b/src/libs/fileDownload/index.desktop.ts
@@ -0,0 +1,43 @@
+import ELECTRON_EVENTS from '@desktop/ELECTRON_EVENTS';
+import type Options from '@desktop/electronDownloadManagerType';
+import CONST from '@src/CONST';
+import fetchFileDownload from './DownloadUtils';
+import type {FileDownload} from './types';
+
+/**
+ * The function downloads an attachment on desktop platforms.
+ */
+const fileDownload: FileDownload = (url, fileName, successMessage, shouldOpenExternalLink, formData, requestType) => {
+    if (requestType === CONST.NETWORK.METHOD.POST) {
+        window.electron.send(ELECTRON_EVENTS.DOWNLOAD);
+        return fetchFileDownload(url, fileName, successMessage, shouldOpenExternalLink, formData, requestType);
+    }
+
+    const options: Options = {
+        filename: fileName,
+        saveAs: true,
+    };
+    window.electron.send(ELECTRON_EVENTS.DOWNLOAD, {url, options});
+    return new Promise((resolve) => {
+        // This sets a timeout that will resolve the promise after 5 seconds to prevent indefinite hanging
+        const downloadTimeout = setTimeout(() => {
+            resolve();
+        }, CONST.DOWNLOADS_TIMEOUT);
+
+        const handleDownloadStatus = (...args: unknown[]) => {
+            const arg = Array.isArray(args) ? args[0] : null;
+            const eventUrl = arg && typeof arg === 'object' && 'url' in arg ? arg.url : null;
+
+            if (eventUrl === url) {
+                clearTimeout(downloadTimeout);
+                resolve();
+            }
+        };
+
+        window.electron.on(ELECTRON_EVENTS.DOWNLOAD_COMPLETED, handleDownloadStatus);
+        window.electron.on(ELECTRON_EVENTS.DOWNLOAD_FAILED, handleDownloadStatus);
+        window.electron.on(ELECTRON_EVENTS.DOWNLOAD_CANCELED, handleDownloadStatus);
+    });
+};
+
+export default fileDownload;
diff --git a/src/libs/fileDownload/index.ios.ts b/src/libs/fileDownload/index.ios.ts
index 45e6a5027994..1fff9fb998e6 100644
--- a/src/libs/fileDownload/index.ios.ts
+++ b/src/libs/fileDownload/index.ios.ts
@@ -1,6 +1,7 @@
 import {CameraRoll} from '@react-native-camera-roll/camera-roll';
 import type {PhotoIdentifier} from '@react-native-camera-roll/camera-roll';
 import RNFetchBlob from 'react-native-blob-util';
+import RNFS from 'react-native-fs';
 import CONST from '@src/CONST';
 import * as FileUtils from './FileUtils';
 import type {FileDownload} from './types';
@@ -26,6 +27,39 @@ function downloadFile(fileUrl: string, fileName: string) {
     }).fetch('GET', fileUrl);
 }
 
+const postDownloadFile = (url: string, fileName?: string, formData?: FormData, onDownloadFailed?: () => void) => {
+    const fetchOptions: RequestInit = {
+        method: 'POST',
+        body: formData,
+    };
+
+    return fetch(url, fetchOptions)
+        .then((response) => {
+            if (!response.ok) {
+                throw new Error('Failed to download file');
+            }
+            return response.text();
+        })
+        .then((fileData) => {
+            const finalFileName = FileUtils.appendTimeToFileName(fileName ?? 'Expensify');
+            const expensifyDir = `${RNFS.DocumentDirectoryPath}/Expensify`;
+
+            return RNFS.mkdir(expensifyDir).then(() => {
+                const localPath = `${expensifyDir}/${finalFileName}`;
+                return RNFS.writeFile(localPath, fileData, 'utf8').then(() => localPath);
+            });
+        })
+        .then(() => {
+            FileUtils.showSuccessAlert();
+        })
+        .catch(() => {
+            if (!onDownloadFailed) {
+                FileUtils.showGeneralErrorAlert();
+            }
+            onDownloadFailed?.();
+        });
+};
+
 /**
  * Download the image to photo lib in iOS
  */
@@ -44,7 +78,7 @@ function downloadVideo(fileUrl: string, fileName: string): Promise<PhotoIdentifi
         // Because CameraRoll doesn't allow direct downloads of video with remote URIs, we first download as documents, then copy to photo lib and unlink the original file.
         downloadFile(fileUrl, fileName)
             .then((attachment) => {
-                documentPathUri = attachment.data;
+                documentPathUri = attachment.data as string | null;
                 if (!documentPathUri) {
                     throw new Error('Error downloading video');
                 }
@@ -67,7 +101,7 @@ function downloadVideo(fileUrl: string, fileName: string): Promise<PhotoIdentifi
 /**
  * Download the file based on type(image, video, other file types)for iOS
  */
-const fileDownload: FileDownload = (fileUrl, fileName, successMessage) =>
+const fileDownload: FileDownload = (fileUrl, fileName, successMessage, _, formData, requestType, onDownloadFailed) =>
     new Promise((resolve) => {
         let fileDownloadPromise;
         const fileType = FileUtils.getFileType(fileUrl);
@@ -82,6 +116,11 @@ const fileDownload: FileDownload = (fileUrl, fileName, successMessage) =>
                 fileDownloadPromise = downloadVideo(fileUrl, attachmentName);
                 break;
             default:
+                if (requestType === CONST.NETWORK.METHOD.POST) {
+                    fileDownloadPromise = postDownloadFile(fileUrl, fileName, formData, onDownloadFailed);
+                    break;
+                }
+
                 fileDownloadPromise = downloadFile(fileUrl, attachmentName);
                 break;
         }
@@ -94,7 +133,7 @@ const fileDownload: FileDownload = (fileUrl, fileName, successMessage) =>
 
                 FileUtils.showSuccessAlert(successMessage);
             })
-            .catch((err) => {
+            .catch((err: Error) => {
                 // iOS shows permission popup only once. Subsequent request will only throw an error.
                 // We catch the error and show a redirection link to the settings screen
                 if (err.message === CONST.IOS_CAMERAROLL_ACCESS_ERROR) {
diff --git a/src/libs/fileDownload/index.ts b/src/libs/fileDownload/index.ts
index 1e12a5ca321b..fc1ea6f74d9b 100644
--- a/src/libs/fileDownload/index.ts
+++ b/src/libs/fileDownload/index.ts
@@ -1,51 +1,10 @@
-import * as ApiUtils from '@libs/ApiUtils';
-import tryResolveUrlFromApiRoot from '@libs/tryResolveUrlFromApiRoot';
-import * as Link from '@userActions/Link';
-import CONST from '@src/CONST';
-import * as FileUtils from './FileUtils';
+import fetchFileDownload from './DownloadUtils';
 import type {FileDownload} from './types';
 
 /**
  * The function downloads an attachment on web/desktop platforms.
  */
-const fileDownload: FileDownload = (url, fileName) => {
-    const resolvedUrl = tryResolveUrlFromApiRoot(url);
-    if (!resolvedUrl.startsWith(ApiUtils.getApiRoot()) && !CONST.ATTACHMENT_LOCAL_URL_PREFIX.some((prefix) => resolvedUrl.startsWith(prefix))) {
-        // Different origin URLs might pose a CORS issue during direct downloads.
-        // Opening in a new tab avoids this limitation, letting the browser handle the download.
-        Link.openExternalLink(url);
-        return Promise.resolve();
-    }
-
-    return fetch(url)
-        .then((response) => response.blob())
-        .then((blob) => {
-            // Create blob link to download
-            const href = URL.createObjectURL(new Blob([blob]));
-
-            // creating anchor tag to initiate download
-            const link = document.createElement('a');
-
-            // adding href to anchor
-            link.href = href;
-            link.style.display = 'none';
-            // eslint-disable-next-line @typescript-eslint/prefer-nullish-coalescing -- Disabling this line for safeness as nullish coalescing works only if the value is undefined or null, and since fileName can be an empty string we want to default to `FileUtils.getFileName(url)`
-            link.download = FileUtils.appendTimeToFileName(fileName || FileUtils.getFileName(url));
-
-            // Append to html link element page
-            document.body.appendChild(link);
-
-            // Start download
-            link.click();
-
-            // Clean up and remove the link
-            URL.revokeObjectURL(link.href);
-            link.parentNode?.removeChild(link);
-        })
-        .catch(() => {
-            // file could not be downloaded, open sourceURL in new tab
-            Link.openExternalLink(url);
-        });
-};
+const fileDownload: FileDownload = (url, fileName, successMessage = '', shouldOpenExternalLink = false, formData = undefined, requestType = 'get', onDownloadFailed?: () => void) =>
+    fetchFileDownload(url, fileName, successMessage, shouldOpenExternalLink, formData, requestType, onDownloadFailed);
 
 export default fileDownload;
diff --git a/src/libs/fileDownload/types.ts b/src/libs/fileDownload/types.ts
index b59a656d0ac2..6b8c1fe6be72 100644
--- a/src/libs/fileDownload/types.ts
+++ b/src/libs/fileDownload/types.ts
@@ -1,7 +1,15 @@
 import type {Asset} from 'react-native-image-picker';
+import type {RequestType} from '@src/types/onyx/Request';
 
-type FileDownload = (url: string, fileName?: string, successMessage?: string) => Promise<void>;
-
+type FileDownload = (
+    url: string,
+    fileName?: string,
+    successMessage?: string,
+    shouldOpenExternalLink?: boolean,
+    formData?: FormData,
+    requestType?: RequestType,
+    onDownloadFailed?: () => void,
+) => Promise<void>;
 type ImageResolution = {width: number; height: number};
 type GetImageResolution = (url: File | Asset) => Promise<ImageResolution>;
 
diff --git a/src/libs/filterArrayByMatch.ts b/src/libs/filterArrayByMatch.ts
index 3abf82b6afab..fc4c3e1e6a47 100644
--- a/src/libs/filterArrayByMatch.ts
+++ b/src/libs/filterArrayByMatch.ts
@@ -3,15 +3,13 @@
    Use `threshold` option with one of the rankings defined below to control the strictness of the match.
 */
 import type {ValueOf} from 'type-fest';
-import StringUtils from './StringUtils';
 
 const MATCH_RANK = {
-    CASE_SENSITIVE_EQUAL: 7,
-    EQUAL: 6,
-    STARTS_WITH: 5,
-    WORD_STARTS_WITH: 4,
-    CONTAINS: 3,
-    ACRONYM: 2,
+    CASE_SENSITIVE_EQUAL: 6,
+    EQUAL: 5,
+    STARTS_WITH: 4,
+    WORD_STARTS_WITH: 3,
+    CONTAINS: 2,
     MATCHES: 1,
     NO_MATCH: 0,
 } as const;
@@ -62,11 +60,6 @@ function getMatchRanking(testString: string, stringToRank: string): Ranking {
         return MATCH_RANK.NO_MATCH;
     }
 
-    // acronym
-    if (StringUtils.getAcronym(lowercaseTestString).includes(lowercaseStringToRank)) {
-        return MATCH_RANK.ACRONYM;
-    }
-
     // will return a number between rankings.MATCHES and rankings.MATCHES + 1 depending  on how close of a match it is.
     let matchingInOrderCharCount = 0;
     let charNumber = 0;
diff --git a/src/libs/focusComposerWithDelay/types.ts b/src/libs/focusComposerWithDelay/types.ts
index 4cd2f785f2bc..97a1298e8c7a 100644
--- a/src/libs/focusComposerWithDelay/types.ts
+++ b/src/libs/focusComposerWithDelay/types.ts
@@ -3,6 +3,8 @@ import type {TextInput} from 'react-native';
 type Selection = {
     start: number;
     end: number;
+    positionX?: number;
+    positionY?: number;
 };
 
 type FocusComposerWithDelay = (shouldDelay?: boolean, forcedSelectionRange?: Selection) => void;
diff --git a/src/libs/focusTextInputAfterAnimation/types.ts b/src/libs/focusTextInputAfterAnimation/types.ts
index bfe29317c1ef..ce5086328b33 100644
--- a/src/libs/focusTextInputAfterAnimation/types.ts
+++ b/src/libs/focusTextInputAfterAnimation/types.ts
@@ -1,5 +1,5 @@
 import type {TextInput} from 'react-native';
 
-type FocusTextInputAfterAnimation = (inputRef: TextInput | HTMLInputElement | undefined, animationLength: number) => void;
+type FocusTextInputAfterAnimation = (inputRef: TextInput | HTMLElement | undefined, animationLength: number) => void;
 
 export default FocusTextInputAfterAnimation;
diff --git a/src/libs/freezeScreenWithLazyLoading.tsx b/src/libs/freezeScreenWithLazyLoading.tsx
new file mode 100644
index 000000000000..21a2681b08c1
--- /dev/null
+++ b/src/libs/freezeScreenWithLazyLoading.tsx
@@ -0,0 +1,21 @@
+import React from 'react';
+import memoize from './memoize';
+import FreezeWrapper from './Navigation/FreezeWrapper';
+
+function FrozenScreen<TProps extends React.JSX.IntrinsicAttributes>(WrappedComponent: React.ComponentType<TProps>) {
+    return (props: TProps) => (
+        <FreezeWrapper>
+            <WrappedComponent
+                // eslint-disable-next-line react/jsx-props-no-spreading
+                {...props}
+            />
+        </FreezeWrapper>
+    );
+}
+
+export default function freezeScreenWithLazyLoading(lazyComponent: () => React.ComponentType) {
+    return memoize(() => {
+        const Component = lazyComponent();
+        return FrozenScreen(Component);
+    });
+}
diff --git a/src/libs/getBase62ReportID.ts b/src/libs/getBase62ReportID.ts
new file mode 100644
index 000000000000..5a457e0aef2a
--- /dev/null
+++ b/src/libs/getBase62ReportID.ts
@@ -0,0 +1,19 @@
+/**
+ * Take an integer reportID and convert it to a string representing a Base-62 report ID.
+ *
+ * This is in it's own module to prevent a dependency cycle between libs/ReportUtils.ts and libs/ReportActionUtils.ts
+ *
+ * @return string The reportID in base 62-format, always 12 characters beginning with `R`.
+ */
+export default function getBase62ReportID(reportID: number): string {
+    const alphabet = '0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz';
+    let result = '';
+    let remainder = reportID;
+    while (remainder > 0) {
+        const currentVal = remainder % 62;
+        result = alphabet[currentVal] + result;
+        remainder = Math.floor(remainder / 62);
+    }
+
+    return `R${result.padStart(11, '0')}`;
+}
diff --git a/src/libs/getCurrentPosition/getCurrentPosition.types.ts b/src/libs/getCurrentPosition/getCurrentPosition.types.ts
index 67a510efa97f..fba39e30c0b9 100644
--- a/src/libs/getCurrentPosition/getCurrentPosition.types.ts
+++ b/src/libs/getCurrentPosition/getCurrentPosition.types.ts
@@ -15,7 +15,7 @@ type GeolocationSuccessCallback = (position: {
 
 type GeolocationErrorCodeType = ValueOf<typeof GeolocationErrorCode> | null;
 
-type GeolocationErrorCallback = (error: {
+type GeolocationErrorCallback = (error?: {
     code: GeolocationErrorCodeType;
     message: string;
     PERMISSION_DENIED: typeof GeolocationErrorCode.PERMISSION_DENIED;
diff --git a/src/libs/getReportPolicyID.ts b/src/libs/getReportPolicyID.ts
deleted file mode 100644
index 12124f24fbe7..000000000000
--- a/src/libs/getReportPolicyID.ts
+++ /dev/null
@@ -1,33 +0,0 @@
-import type {OnyxCollection, OnyxEntry} from 'react-native-onyx';
-import Onyx from 'react-native-onyx';
-import ONYXKEYS from '@src/ONYXKEYS';
-import type {Report} from '@src/types/onyx';
-import type {EmptyObject} from '@src/types/utils/EmptyObject';
-
-let allReports: OnyxCollection<Report>;
-Onyx.connect({
-    key: ONYXKEYS.COLLECTION.REPORT,
-    waitForCollectionCallback: true,
-    callback: (value) => (allReports = value),
-});
-
-/**
- * Get the report given a reportID
- */
-function getReport(reportID: string | undefined): OnyxEntry<Report> | EmptyObject {
-    if (!allReports) {
-        return {};
-    }
-
-    return allReports?.[`${ONYXKEYS.COLLECTION.REPORT}${reportID}`] ?? {};
-}
-
-/**
- * Get the report policyID given a reportID.
- * We need to define this method in a separate file to avoid cyclic dependency.
- */
-function getReportPolicyID(reportID?: string): string | undefined {
-    return getReport(reportID)?.policyID;
-}
-
-export default getReportPolicyID;
diff --git a/src/libs/getSplashBackgroundColor/index.native.ts b/src/libs/getSplashBackgroundColor/index.native.ts
deleted file mode 100644
index 1d21b7a004e1..000000000000
--- a/src/libs/getSplashBackgroundColor/index.native.ts
+++ /dev/null
@@ -1,7 +0,0 @@
-import colors from '@styles/theme/colors';
-
-function getSplashBackgroundColor() {
-    return colors.green400;
-}
-
-export default getSplashBackgroundColor;
diff --git a/src/libs/getSplashBackgroundColor/index.ts b/src/libs/getSplashBackgroundColor/index.ts
deleted file mode 100644
index 97484d49163e..000000000000
--- a/src/libs/getSplashBackgroundColor/index.ts
+++ /dev/null
@@ -1,7 +0,0 @@
-import colors from '@styles/theme/colors';
-
-function getSplashBackgroundColor() {
-    return colors.productDark100;
-}
-
-export default getSplashBackgroundColor;
diff --git a/src/libs/getUAForWebView/index.android.ts b/src/libs/getUAForWebView/index.android.ts
new file mode 100644
index 000000000000..f12a2963200b
--- /dev/null
+++ b/src/libs/getUAForWebView/index.android.ts
@@ -0,0 +1,8 @@
+import type GetUAForWebView from './types';
+
+/**
+ * Android WebView is built on top of Chromium which is not supported by Xero causing the site to show warning.
+ */
+const getUAForWebView: GetUAForWebView = () => 'Mozilla/5.0 (Linux; Android 14) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/124.0.6367.159 Mobile Safari/537.36';
+
+export default getUAForWebView;
diff --git a/src/libs/getUAForWebView/index.ts b/src/libs/getUAForWebView/index.ts
new file mode 100644
index 000000000000..16bf5b86ffb3
--- /dev/null
+++ b/src/libs/getUAForWebView/index.ts
@@ -0,0 +1,5 @@
+import type GetUAForWebView from './types';
+
+const getUAForWebView: GetUAForWebView = () => undefined;
+
+export default getUAForWebView;
diff --git a/src/libs/getUAForWebView/types.ts b/src/libs/getUAForWebView/types.ts
new file mode 100644
index 000000000000..b93f89bb049e
--- /dev/null
+++ b/src/libs/getUAForWebView/types.ts
@@ -0,0 +1,3 @@
+type GetUAForWebView = () => string | undefined;
+
+export default GetUAForWebView;
diff --git a/src/libs/hasCompletedGuidedSetupFlowSelector.ts b/src/libs/hasCompletedGuidedSetupFlowSelector.ts
new file mode 100644
index 000000000000..83cde0a0be8c
--- /dev/null
+++ b/src/libs/hasCompletedGuidedSetupFlowSelector.ts
@@ -0,0 +1,12 @@
+import type {OnyxValue} from 'react-native-onyx';
+import type ONYXKEYS from '@src/ONYXKEYS';
+
+function hasCompletedGuidedSetupFlowSelector(onboarding: OnyxValue<typeof ONYXKEYS.NVP_ONBOARDING>): boolean {
+    // onboarding is an array for old accounts and accounts created from olddot
+    if (Array.isArray(onboarding)) {
+        return true;
+    }
+    return onboarding?.hasCompletedGuidedSetupFlow ?? false;
+}
+
+export default hasCompletedGuidedSetupFlowSelector;
diff --git a/src/libs/isIllustrationLottieAnimation.ts b/src/libs/isIllustrationLottieAnimation.ts
new file mode 100644
index 000000000000..74748f5f7d6c
--- /dev/null
+++ b/src/libs/isIllustrationLottieAnimation.ts
@@ -0,0 +1,12 @@
+import type DotLottieAnimation from '@components/LottieAnimations/types';
+import type IconAsset from '@src/types/utils/IconAsset';
+
+function isIllustrationLottieAnimation(illustration: DotLottieAnimation | IconAsset | undefined): illustration is DotLottieAnimation {
+    if (typeof illustration === 'number' || !illustration) {
+        return false;
+    }
+
+    return 'file' in illustration && 'w' in illustration && 'h' in illustration;
+}
+
+export default isIllustrationLottieAnimation;
diff --git a/src/libs/isPdfFilePasswordProtected/index.tsx b/src/libs/isPdfFilePasswordProtected/index.tsx
new file mode 100644
index 000000000000..f62e080a2a8d
--- /dev/null
+++ b/src/libs/isPdfFilePasswordProtected/index.tsx
@@ -0,0 +1,39 @@
+import * as pdfjsLib from 'pdfjs-dist';
+import type {FileObject} from '@components/AttachmentModal';
+
+const isPdfFilePasswordProtected = (file: FileObject): Promise<boolean> =>
+    new Promise((resolve) => {
+        const reader = new FileReader();
+
+        reader.onload = (event) => {
+            const arrayBuffer = event.target?.result;
+            if (!arrayBuffer) {
+                resolve(false);
+                return;
+            }
+            try {
+                const loadingTask = pdfjsLib.getDocument({data: arrayBuffer});
+                loadingTask.promise.then(
+                    () => {
+                        resolve(false);
+                    },
+                    (error: Error) => {
+                        if (error.name === 'PasswordException') {
+                            resolve(true);
+                            return;
+                        }
+                        resolve(false);
+                    },
+                );
+            } catch (error) {
+                resolve(false);
+            }
+        };
+
+        reader.onerror = () => {
+            resolve(false);
+        };
+
+        reader.readAsArrayBuffer(file as Blob);
+    });
+export default isPdfFilePasswordProtected;
diff --git a/src/libs/isPublicScreenRoute.ts b/src/libs/isPublicScreenRoute.ts
new file mode 100644
index 000000000000..e2c5ca5944eb
--- /dev/null
+++ b/src/libs/isPublicScreenRoute.ts
@@ -0,0 +1,8 @@
+import {PUBLIC_SCREENS_ROUTES} from '@src/ROUTES';
+
+export default function isPublicScreenRoute(route: string) {
+    return Object.values(PUBLIC_SCREENS_ROUTES).some((screenRoute) => {
+        const routeRegex = new RegExp(`^${screenRoute.replace(/:\w+/g, '\\w+')}$`);
+        return routeRegex.test(route);
+    });
+}
diff --git a/src/libs/isReportMessageAttachment.ts b/src/libs/isReportMessageAttachment.ts
index 330ba4470097..229e9c1653f9 100644
--- a/src/libs/isReportMessageAttachment.ts
+++ b/src/libs/isReportMessageAttachment.ts
@@ -1,22 +1,35 @@
-import Str from 'expensify-common/lib/str';
+import {Str} from 'expensify-common';
 import CONST from '@src/CONST';
 import type {Message} from '@src/types/onyx/ReportAction';
 
+const attachmentRegex = new RegExp(` ${CONST.ATTACHMENT_SOURCE_ATTRIBUTE}="(.*)"`, 'i');
+
 /**
  * Check whether a report action is Attachment or not.
  * Ignore messages containing [Attachment] as the main content. Attachments are actions with only text as [Attachment].
  *
- * @param reportActionMessage report action's message as text, html and translationKey
+ * @param message report action's message as text, html and translationKey
  */
 export default function isReportMessageAttachment(message: Message | undefined): boolean {
     if (!message?.text || !message.html) {
         return false;
     }
 
-    if (message.translationKey && message.text === CONST.ATTACHMENT_MESSAGE_TEXT) {
-        return message?.translationKey === CONST.TRANSLATION_KEYS.ATTACHMENT;
+    if (message.translationKey) {
+        return message.text === CONST.ATTACHMENT_MESSAGE_TEXT && message.translationKey === CONST.TRANSLATION_KEYS.ATTACHMENT;
+    }
+
+    const hasAttachmentHtml = attachmentRegex.test(message.html);
+
+    if (!hasAttachmentHtml) {
+        return false;
+    }
+
+    const isAttachmentMessageText = message.text === CONST.ATTACHMENT_MESSAGE_TEXT;
+
+    if (isAttachmentMessageText) {
+        return true;
     }
 
-    const regex = new RegExp(` ${CONST.ATTACHMENT_SOURCE_ATTRIBUTE}="(.*)"`, 'i');
-    return (message.text === CONST.ATTACHMENT_MESSAGE_TEXT || !!Str.isVideo(message.text)) && (!!message.html.match(regex) || message.html === CONST.ATTACHMENT_UPLOADING_MESSAGE_HTML);
+    return Str.isVideo(message.text);
 }
diff --git a/src/libs/markAllPolicyReportsAsRead.ts b/src/libs/markAllPolicyReportsAsRead.ts
index 49001a851cf5..259a5e426d89 100644
--- a/src/libs/markAllPolicyReportsAsRead.ts
+++ b/src/libs/markAllPolicyReportsAsRead.ts
@@ -1,32 +1,21 @@
-import Onyx from 'react-native-onyx';
-import ONYXKEYS from '@src/ONYXKEYS';
 import type {Report} from '@src/types/onyx';
 import * as ReportActionFile from './actions/Report';
+import * as ReportConnection from './ReportConnection';
 import * as ReportUtils from './ReportUtils';
 
 export default function markAllPolicyReportsAsRead(policyID: string) {
-    const connectionID = Onyx.connect({
-        key: ONYXKEYS.COLLECTION.REPORT,
-        waitForCollectionCallback: true,
-        callback: (allReports) => {
-            if (!allReports) {
-                return;
-            }
+    let delay = 0;
+    const allReports = ReportConnection.getAllReports() ?? {};
+    Object.keys(allReports).forEach((key: string) => {
+        const report: Report | null | undefined = allReports[key];
+        if (report?.policyID !== policyID || !ReportUtils.isUnread(report)) {
+            return;
+        }
 
-            let delay = 0;
-            Object.keys(allReports).forEach((key: string) => {
-                const report: Report | null | undefined = allReports[key];
-                if (report?.policyID !== policyID || !ReportUtils.isUnread(report)) {
-                    return;
-                }
+        setTimeout(() => {
+            ReportActionFile.readNewestAction(report?.reportID);
+        }, delay);
 
-                setTimeout(() => {
-                    ReportActionFile.readNewestAction(report?.reportID);
-                }, delay);
-
-                delay += 1000;
-            });
-            Onyx.disconnect(connectionID);
-        },
+        delay += 1000;
     });
 }
diff --git a/src/libs/memoize/cache/ArrayCache.ts b/src/libs/memoize/cache/ArrayCache.ts
new file mode 100644
index 000000000000..058efefdb1aa
--- /dev/null
+++ b/src/libs/memoize/cache/ArrayCache.ts
@@ -0,0 +1,85 @@
+import type {Cache, CacheConfig} from './types';
+
+/**
+ * Builder of the cache using `Array` primitive under the hood. It is an LRU cache, where the most recently accessed elements are at the end of the array, and the least recently accessed elements are at the front.
+ * @param config - Cache configuration, check `CacheConfig` type for more details.
+ * @returns
+ */
+function ArrayCache<K, V>(config: CacheConfig<K>): Cache<K, V> {
+    const cache: Array<[K, V]> = [];
+
+    const {maxSize, keyComparator} = config;
+
+    /**
+     * Returns the index of the key in the cache array.
+     * We search the array backwards because the most recently added entries are at the end, and our heuristic follows the principles of an LRU cache - that the most recently added entries are most likely to be used again.
+     */
+    function getKeyIndex(key: K): number {
+        for (let i = cache.length - 1; i >= 0; i--) {
+            if (keyComparator(cache[i][0], key)) {
+                return i;
+            }
+        }
+        return -1;
+    }
+
+    return {
+        get(key) {
+            const index = getKeyIndex(key);
+
+            if (index === -1) {
+                return undefined;
+            }
+
+            const [entry] = cache.splice(index, 1);
+            cache.push(entry);
+            return {value: entry[1]};
+        },
+
+        set(key, value) {
+            const index = getKeyIndex(key);
+
+            if (index !== -1) {
+                cache.splice(index, 1);
+            }
+
+            cache.push([key, value]);
+
+            if (cache.length > maxSize) {
+                cache.shift();
+            }
+        },
+
+        getSet(key, valueProducer) {
+            const index = getKeyIndex(key);
+
+            if (index !== -1) {
+                const [entry] = cache.splice(index, 1);
+                cache.push(entry);
+                return {value: entry[1]};
+            }
+
+            const value = valueProducer();
+
+            cache.push([key, value]);
+
+            if (cache.length > maxSize) {
+                cache.shift();
+            }
+
+            return {value};
+        },
+
+        snapshot: {
+            keys: () => cache.map((entry) => entry[0]),
+            values: () => cache.map((entry) => entry[1]),
+            entries: () => [...cache],
+        },
+
+        get size() {
+            return cache.length;
+        },
+    };
+}
+
+export default ArrayCache;
diff --git a/src/libs/memoize/cache/types.ts b/src/libs/memoize/cache/types.ts
new file mode 100644
index 000000000000..fef88c7bc36b
--- /dev/null
+++ b/src/libs/memoize/cache/types.ts
@@ -0,0 +1,26 @@
+type CacheConfig<K> = {
+    maxSize: number;
+    keyComparator: (k1: K, k2: K) => boolean;
+};
+
+type BoxedValue<V> = {value: V};
+
+type Cache<K, V> = {
+    get: (key: K) => BoxedValue<V> | undefined;
+    set: (key: K, value: V) => void;
+    /**
+     * Get the value for the key if it exists, otherwise set the value to the result of the valueProducer and return it.
+     * @param key The key to get or set
+     * @param valueProducer The function to produce the value if the key does not exist
+     * @returns The value for the key
+     */
+    getSet: (key: K, valueProducer: () => V) => BoxedValue<V>;
+    snapshot: {
+        keys: () => K[];
+        values: () => V[];
+        entries: () => Array<[K, V]>;
+    };
+    size: number;
+};
+
+export type {CacheConfig, Cache, BoxedValue};
diff --git a/src/libs/memoize/const.ts b/src/libs/memoize/const.ts
new file mode 100644
index 000000000000..a9e255131db4
--- /dev/null
+++ b/src/libs/memoize/const.ts
@@ -0,0 +1,10 @@
+import type {Options} from './types';
+
+const DEFAULT_OPTIONS = {
+    maxSize: Infinity,
+    equality: 'deep',
+    monitor: false,
+    cache: 'array',
+} satisfies Options<() => unknown, number, unknown>;
+
+export default DEFAULT_OPTIONS;
diff --git a/src/libs/memoize/index.ts b/src/libs/memoize/index.ts
new file mode 100644
index 000000000000..e14606618953
--- /dev/null
+++ b/src/libs/memoize/index.ts
@@ -0,0 +1,102 @@
+/* eslint-disable @typescript-eslint/no-unsafe-return */
+import type NonPartial from '@src/types/utils/NonPartial';
+import type {TakeFirst} from '@src/types/utils/TupleOperations';
+import ArrayCache from './cache/ArrayCache';
+import {MemoizeStats} from './stats';
+import type {Callable, ClientOptions, Constructable, IsomorphicFn, IsomorphicParameters, IsomorphicReturnType, MemoizedFn, Stats} from './types';
+import {getEqualityComparator, mergeOptions, truncateArgs} from './utils';
+
+/**
+ * Global memoization class. Use it to orchestrate memoization (e.g. start/stop global monitoring).
+ */
+class Memoize {
+    static isMonitoringEnabled = false;
+
+    private static memoizedList: Array<{id: string; memoized: Stats}> = [];
+
+    static registerMemoized(id: string, memoized: Stats) {
+        this.memoizedList.push({id, memoized});
+    }
+
+    static startMonitoring() {
+        if (this.isMonitoringEnabled) {
+            return;
+        }
+        this.isMonitoringEnabled = true;
+        Memoize.memoizedList.forEach(({memoized}) => {
+            memoized.startMonitoring();
+        });
+    }
+
+    static stopMonitoring() {
+        if (!this.isMonitoringEnabled) {
+            return;
+        }
+        this.isMonitoringEnabled = false;
+        return Memoize.memoizedList.map(({id, memoized}) => ({id, stats: memoized.stopMonitoring()}));
+    }
+}
+
+/**
+ * Wraps a function with a memoization layer. Useful for caching expensive calculations.
+ * @param fn - Function to memoize
+ * @param opts - Options for the memoization layer, for more details see `ClientOptions` type.
+ * @returns Memoized function with a cache API attached to it.
+ */
+function memoize<Fn extends IsomorphicFn, MaxArgs extends number = NonPartial<IsomorphicParameters<Fn>>['length'], Key = TakeFirst<IsomorphicParameters<Fn>, MaxArgs>>(
+    fn: Fn,
+    opts?: ClientOptions<Fn, MaxArgs, Key>,
+) {
+    const options = mergeOptions<Fn, MaxArgs, Key>(opts);
+
+    const cache = ArrayCache<Key, IsomorphicReturnType<Fn>>({maxSize: options.maxSize, keyComparator: getEqualityComparator(options)});
+
+    const stats = new MemoizeStats(options.monitor || Memoize.isMonitoringEnabled);
+
+    const memoized = function memoized(...args: IsomorphicParameters<Fn>): IsomorphicReturnType<Fn> {
+        // Detect if memoized function was called with `new` keyword. If so we need to call the original function as constructor.
+        const constructable = !!new.target;
+
+        const truncatedArgs = truncateArgs(args, options.maxArgs);
+
+        const key = options.transformKey ? options.transformKey(truncatedArgs) : (truncatedArgs as Key);
+
+        const statsEntry = stats.createEntry();
+        statsEntry.track('didHit', true);
+
+        const retrievalTimeStart = performance.now();
+        const cached = cache.getSet(key, () => {
+            const fnTimeStart = performance.now();
+
+            const result = (constructable ? new (fn as Constructable)(...args) : (fn as Callable)(...args)) as IsomorphicReturnType<Fn>;
+
+            statsEntry.trackTime('fnTime', fnTimeStart);
+            statsEntry.track('didHit', false);
+
+            return result;
+        });
+        // Subtract the time it took to run the function from the total retrieval time
+        statsEntry.trackTime('cacheRetrievalTime', retrievalTimeStart + (statsEntry.get('fnTime') ?? 0));
+
+        statsEntry.track('cacheSize', cache.size);
+        statsEntry.save();
+
+        return cached.value;
+    } as MemoizedFn<Fn, Key>;
+
+    /**
+     * Cache API attached to the memoized function. Currently there is an issue with typing cache keys, but the functionality works as expected.
+     */
+    memoized.cache = cache;
+
+    memoized.startMonitoring = () => stats.startMonitoring();
+    memoized.stopMonitoring = () => stats.stopMonitoring();
+
+    Memoize.registerMemoized(options.monitoringName ?? fn.name, memoized);
+
+    return memoized;
+}
+
+export default memoize;
+
+export {Memoize};
diff --git a/src/libs/memoize/stats.ts b/src/libs/memoize/stats.ts
new file mode 100644
index 000000000000..043ecc92b216
--- /dev/null
+++ b/src/libs/memoize/stats.ts
@@ -0,0 +1,114 @@
+import Log from '@libs/Log';
+
+type MemoizeStatsEntry = {
+    didHit: boolean;
+    cacheRetrievalTime: number;
+    fnTime?: number;
+    cacheSize: number;
+};
+
+// eslint-disable-next-line @typescript-eslint/no-explicit-any
+function isMemoizeStatsEntry(entry: any): entry is MemoizeStatsEntry {
+    // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
+    return entry.didHit !== undefined && entry.cacheRetrievalTime !== undefined;
+}
+
+class MemoizeStats {
+    private calls = 0;
+
+    private hits = 0;
+
+    private avgCacheRetrievalTime = 0;
+
+    private avgFnTime = 0;
+
+    private cacheSize = 0;
+
+    isEnabled = false;
+
+    constructor(enabled: boolean) {
+        this.isEnabled = enabled;
+    }
+
+    // See https://en.wikipedia.org/wiki/Moving_average#Cumulative_average
+    private calculateCumulativeAvg(avg: number, length: number, value: number) {
+        const result = (avg * (length - 1) + value) / length;
+        // If the length is 0, we return the average. For example, when calculating average cache retrieval time, hits may be 0, and in that case we want to return the current average cache retrieval time
+        return Number.isFinite(result) ? result : avg;
+    }
+
+    private cumulateEntry(entry: MemoizeStatsEntry) {
+        this.calls++;
+        this.hits += entry.didHit ? 1 : 0;
+
+        this.cacheSize = entry.cacheSize;
+
+        this.avgCacheRetrievalTime = this.calculateCumulativeAvg(this.avgCacheRetrievalTime, this.hits, entry.cacheRetrievalTime);
+
+        if (entry.fnTime !== undefined) {
+            this.avgFnTime = this.calculateCumulativeAvg(this.avgFnTime, this.calls - this.hits, entry.fnTime);
+        }
+    }
+
+    private saveEntry(entry: Partial<MemoizeStatsEntry>) {
+        if (!this.isEnabled) {
+            return;
+        }
+
+        if (!isMemoizeStatsEntry(entry)) {
+            Log.warn('MemoizeStats:saveEntry: Invalid entry', entry);
+            return;
+        }
+
+        return this.cumulateEntry(entry);
+    }
+
+    createEntry() {
+        // If monitoring is disabled, return a dummy object that does nothing
+        if (!this.isEnabled) {
+            return {
+                track: () => {},
+                get: () => {},
+                save: () => {},
+                trackTime: () => {},
+            };
+        }
+
+        const entry: Partial<MemoizeStatsEntry> = {};
+
+        return {
+            track: <P extends keyof MemoizeStatsEntry>(cacheProp: P, value: MemoizeStatsEntry[P]) => {
+                entry[cacheProp] = value;
+            },
+            trackTime: <P extends keyof Pick<MemoizeStatsEntry, 'cacheRetrievalTime' | 'fnTime'>>(cacheProp: P, startTime: number, endTime = performance.now()) => {
+                entry[cacheProp] = endTime - startTime;
+            },
+            get: <P extends keyof MemoizeStatsEntry>(cacheProp: P) => entry[cacheProp],
+            save: () => this.saveEntry(entry),
+        };
+    }
+
+    startMonitoring() {
+        this.isEnabled = true;
+        this.calls = 0;
+        this.hits = 0;
+        this.avgCacheRetrievalTime = 0;
+        this.avgFnTime = 0;
+        this.cacheSize = 0;
+    }
+
+    stopMonitoring() {
+        this.isEnabled = false;
+
+        return {
+            calls: this.calls,
+            hits: this.hits,
+            avgCacheRetrievalTime: this.avgCacheRetrievalTime,
+            avgFnTime: this.avgFnTime,
+            cacheSize: this.cacheSize,
+        };
+    }
+}
+
+export type {MemoizeStatsEntry};
+export {MemoizeStats};
diff --git a/src/libs/memoize/types.ts b/src/libs/memoize/types.ts
new file mode 100644
index 000000000000..80a6b4c55507
--- /dev/null
+++ b/src/libs/memoize/types.ts
@@ -0,0 +1,46 @@
+import type {TakeFirst} from '@src/types/utils/TupleOperations';
+import type {Cache} from './cache/types';
+import type {MemoizeStats} from './stats';
+
+// eslint-disable-next-line @typescript-eslint/no-explicit-any
+type Callable = (...args: any[]) => any;
+// eslint-disable-next-line @typescript-eslint/no-explicit-any
+type Constructable = new (...args: any[]) => any;
+
+type IsomorphicFn = Callable | Constructable;
+
+type IsomorphicParameters<Fn extends IsomorphicFn> = Fn extends Callable ? Parameters<Fn> : Fn extends Constructable ? ConstructorParameters<Fn> : never;
+
+type IsomorphicReturnType<Fn extends IsomorphicFn> = Fn extends Callable ? ReturnType<Fn> : Fn extends Constructable ? Fn : never;
+
+type KeyComparator<Key> = (k1: Key, k2: Key) => boolean;
+
+type InternalOptions = {
+    cache: 'array';
+};
+
+type Options<Fn extends IsomorphicFn, MaxArgs extends number, Key> = {
+    maxSize: number;
+    equality: 'deep' | 'shallow' | KeyComparator<Key>;
+    monitor: boolean;
+    maxArgs?: MaxArgs;
+    monitoringName?: string;
+    /**
+     * Function to transform the arguments into a key, which is used to reference the result in the cache.
+     * When called with constructable (e.g. class, `new` keyword) functions, it won't get proper types for `truncatedArgs`
+     * Any viable fixes are welcome!
+     * @param truncatedArgs - Tuple of arguments passed to the memoized function (truncated to `maxArgs`). Does not work with constructable (see description).
+     * @returns - Key to use for caching
+     */
+    transformKey?: (truncatedArgs: TakeFirst<IsomorphicParameters<Fn>, MaxArgs>) => Key;
+} & InternalOptions;
+
+type ClientOptions<Fn extends IsomorphicFn, MaxArgs extends number, Key> = Partial<Omit<Options<Fn, MaxArgs, Key>, keyof InternalOptions>>;
+
+type Stats = Pick<MemoizeStats, 'startMonitoring' | 'stopMonitoring'>;
+
+type MemoizedFn<Fn extends IsomorphicFn, Key> = Fn & {
+    cache: Cache<Key, IsomorphicReturnType<Fn>>;
+} & Stats;
+
+export type {Options, ClientOptions, IsomorphicFn, IsomorphicParameters, IsomorphicReturnType, Stats, KeyComparator, MemoizedFn, Callable, Constructable};
diff --git a/src/libs/memoize/utils.ts b/src/libs/memoize/utils.ts
new file mode 100644
index 000000000000..01a9e1b3abf8
--- /dev/null
+++ b/src/libs/memoize/utils.ts
@@ -0,0 +1,55 @@
+import {deepEqual, shallowEqual} from 'fast-equals';
+import type {TakeFirst} from '@src/types/utils/TupleOperations';
+import DEFAULT_OPTIONS from './const';
+import type {ClientOptions, IsomorphicFn, KeyComparator, Options} from './types';
+
+function getEqualityComparator<Fn extends IsomorphicFn, MaxArgs extends number, Key>(opts: Options<Fn, MaxArgs, Key>): KeyComparator<Key> {
+    // Use the custom equality comparator if it is provided
+    if (typeof opts.equality === 'function') {
+        return opts.equality;
+    }
+
+    if (opts.equality === 'shallow') {
+        return shallowEqual;
+    }
+
+    return deepEqual;
+}
+
+function mergeOptions<Fn extends IsomorphicFn, MaxArgs extends number, Key>(options?: ClientOptions<Fn, MaxArgs, Key>): Options<Fn, MaxArgs, Key> {
+    if (!options) {
+        return DEFAULT_OPTIONS;
+    }
+    return {...DEFAULT_OPTIONS, ...options};
+}
+function truncateArgs<T extends unknown[], MaxArgs extends number = T['length']>(args: T, maxArgs?: MaxArgs): TakeFirst<T, MaxArgs> {
+    // Hot paths are declared explicitly to avoid the overhead of the slice method
+
+    if (maxArgs === undefined) {
+        return args as unknown as TakeFirst<T, MaxArgs>;
+    }
+
+    if (maxArgs >= args.length) {
+        return args as unknown as TakeFirst<T, MaxArgs>;
+    }
+
+    if (maxArgs === 0) {
+        return [] as unknown as TakeFirst<T, MaxArgs>;
+    }
+
+    if (maxArgs === 1) {
+        return [args[0]] as unknown as TakeFirst<T, MaxArgs>;
+    }
+
+    if (maxArgs === 2) {
+        return [args[0], args[1]] as unknown as TakeFirst<T, MaxArgs>;
+    }
+
+    if (maxArgs === 3) {
+        return [args[0], args[1], args[2]] as unknown as TakeFirst<T, MaxArgs>;
+    }
+
+    return args.slice(0, maxArgs) as unknown as TakeFirst<T, MaxArgs>;
+}
+
+export {mergeOptions, getEqualityComparator, truncateArgs};
diff --git a/src/libs/migrateOnyx.ts b/src/libs/migrateOnyx.ts
index 3b0829ad9ba3..423b5e7c0017 100644
--- a/src/libs/migrateOnyx.ts
+++ b/src/libs/migrateOnyx.ts
@@ -1,5 +1,4 @@
 import Log from './Log';
-import CheckForPreviousReportActionID from './migrations/CheckForPreviousReportActionID';
 import KeyReportActionsDraftByReportActionID from './migrations/KeyReportActionsDraftByReportActionID';
 import NVPMigration from './migrations/NVPMigration';
 import PronounsMigration from './migrations/PronounsMigration';
@@ -16,7 +15,6 @@ export default function () {
         // Add all migrations to an array so they are executed in order
         const migrationPromises = [
             RenameCardIsVirtual,
-            CheckForPreviousReportActionID,
             RenameReceiptFilename,
             KeyReportActionsDraftByReportActionID,
             TransactionBackupsToCollection,
diff --git a/src/libs/migrations/CheckForPreviousReportActionID.ts b/src/libs/migrations/CheckForPreviousReportActionID.ts
deleted file mode 100644
index 7e4bbe9ffb3e..000000000000
--- a/src/libs/migrations/CheckForPreviousReportActionID.ts
+++ /dev/null
@@ -1,65 +0,0 @@
-import type {OnyxCollection} from 'react-native-onyx';
-import Onyx from 'react-native-onyx';
-import Log from '@libs/Log';
-import ONYXKEYS from '@src/ONYXKEYS';
-import type * as OnyxTypes from '@src/types/onyx';
-
-function getReportActionsFromOnyx(): Promise<OnyxCollection<OnyxTypes.ReportActions>> {
-    return new Promise((resolve) => {
-        const connectionID = Onyx.connect({
-            key: ONYXKEYS.COLLECTION.REPORT_ACTIONS,
-            waitForCollectionCallback: true,
-            callback: (allReportActions) => {
-                Onyx.disconnect(connectionID);
-                return resolve(allReportActions);
-            },
-        });
-    });
-}
-
-/**
- * This migration checks for the 'previousReportActionID' key in the first valid reportAction of a report in Onyx.
- * If the key is not found then all reportActions for all reports are removed from Onyx.
- */
-export default function (): Promise<void | void[]> {
-    return getReportActionsFromOnyx().then((allReportActions) => {
-        if (Object.keys(allReportActions ?? {}).length === 0) {
-            Log.info(`[Migrate Onyx] Skipped migration CheckForPreviousReportActionID because there were no reportActions`);
-            return;
-        }
-
-        let firstValidValue: OnyxTypes.ReportAction | undefined;
-
-        Object.values(allReportActions ?? {}).some((reportActions) =>
-            Object.values(reportActions ?? {}).some((reportActionData) => {
-                if ('reportActionID' in reportActionData) {
-                    firstValidValue = reportActionData;
-                    return true;
-                }
-
-                return false;
-            }),
-        );
-
-        if (!firstValidValue) {
-            Log.info(`[Migrate Onyx] Skipped migration CheckForPreviousReportActionID because there were no valid reportActions`);
-            return;
-        }
-
-        if (firstValidValue.previousReportActionID) {
-            Log.info(`[Migrate Onyx] CheckForPreviousReportActionID Migration: previousReportActionID found. Migration complete`);
-            return;
-        }
-
-        // If previousReportActionID not found:
-        Log.info(`[Migrate Onyx] CheckForPreviousReportActionID Migration: removing all reportActions because previousReportActionID not found in the first valid reportAction`);
-
-        const onyxData: OnyxCollection<OnyxTypes.ReportActions> = {};
-
-        Object.keys(allReportActions ?? {}).forEach((onyxKey) => {
-            onyxData[onyxKey] = {};
-        });
-
-        return Onyx.multiSet(onyxData as Record<`${typeof ONYXKEYS.COLLECTION.REPORT_ACTIONS}`, Record<string, never>>);
-    });
-}
diff --git a/src/libs/migrations/KeyReportActionsDraftByReportActionID.ts b/src/libs/migrations/KeyReportActionsDraftByReportActionID.ts
index 193fdfe5f1eb..a6f9a3aa8ae6 100644
--- a/src/libs/migrations/KeyReportActionsDraftByReportActionID.ts
+++ b/src/libs/migrations/KeyReportActionsDraftByReportActionID.ts
@@ -1,4 +1,4 @@
-import type {OnyxEntry} from 'react-native-onyx';
+import type {OnyxInputValue} from 'react-native-onyx';
 import Onyx from 'react-native-onyx';
 import Log from '@libs/Log';
 import ONYXKEYS from '@src/ONYXKEYS';
@@ -15,19 +15,19 @@ type ReportActionsDraftsKey = `${typeof ONYXKEYS.COLLECTION.REPORT_ACTIONS_DRAFT
  */
 export default function () {
     return new Promise<void | void[]>((resolve) => {
-        const connectionID = Onyx.connect({
+        const connection = Onyx.connect({
             key: ONYXKEYS.COLLECTION.REPORT_ACTIONS_DRAFTS,
             waitForCollectionCallback: true,
             // eslint-disable-next-line @typescript-eslint/no-misused-promises
             callback: (allReportActionsDrafts) => {
-                Onyx.disconnect(connectionID);
+                Onyx.disconnect(connection);
 
                 if (!allReportActionsDrafts) {
                     Log.info('[Migrate Onyx] Skipped migration KeyReportActionsDraftByReportActionID because there were no reportActionsDrafts');
                     return resolve();
                 }
 
-                const newReportActionsDrafts: Record<ReportActionsDraftsKey, OnyxEntry<ReportActionsDrafts>> = {};
+                const newReportActionsDrafts: Record<ReportActionsDraftsKey, OnyxInputValue<ReportActionsDrafts>> = {};
                 Object.entries(allReportActionsDrafts).forEach(([onyxKey, reportActionDraft]) => {
                     if (typeof reportActionDraft !== 'string') {
                         return;
diff --git a/src/libs/migrations/NVPMigration.ts b/src/libs/migrations/NVPMigration.ts
index 9ab774328f78..20f3d0a86495 100644
--- a/src/libs/migrations/NVPMigration.ts
+++ b/src/libs/migrations/NVPMigration.ts
@@ -1,6 +1,9 @@
 import after from 'lodash/after';
 import Onyx from 'react-native-onyx';
+import type {KeyValueMapping, OnyxEntry} from 'react-native-onyx';
+import type {Account} from 'src/types/onyx';
 import ONYXKEYS from '@src/ONYXKEYS';
+import type {OnyxKey} from '@src/ONYXKEYS';
 
 // These are the oldKeyName: newKeyName of the NVPs we can migrate without any processing
 const migrations = {
@@ -16,7 +19,6 @@ const migrations = {
     private_pushNotificationID: ONYXKEYS.NVP_PRIVATE_PUSH_NOTIFICATION_ID,
     tryFocusMode: ONYXKEYS.NVP_TRY_FOCUS_MODE,
     introSelected: ONYXKEYS.NVP_INTRO_SELECTED,
-    hasDismissedIdlePanel: ONYXKEYS.NVP_HAS_DISMISSED_IDLE_PANEL,
 };
 
 // This migration changes the keys of all the NVP related keys so that they are standardized
@@ -26,36 +28,31 @@ export default function () {
         const resolveWhenDone = after(Object.entries(migrations).length + 2, () => resolve());
 
         for (const [oldKey, newKey] of Object.entries(migrations)) {
-            const connectionID = Onyx.connect({
-                // @ts-expect-error oldKey is a variable
-                key: oldKey,
+            const connection = Onyx.connect({
+                key: oldKey as OnyxKey,
                 callback: (value) => {
-                    Onyx.disconnect(connectionID);
-                    if (value === null) {
+                    Onyx.disconnect(connection);
+                    if (value === undefined) {
                         resolveWhenDone();
                         return;
                     }
-                    // @ts-expect-error These keys are variables, so we can't check the type
                     Onyx.multiSet({
                         [newKey]: value,
                         [oldKey]: null,
-                    }).then(resolveWhenDone);
+                    } as KeyValueMapping).then(resolveWhenDone);
                 },
             });
         }
-        const connectionIDAccount = Onyx.connect({
+        const accountConnection = Onyx.connect({
             key: ONYXKEYS.ACCOUNT,
-            callback: (value) => {
-                Onyx.disconnect(connectionIDAccount);
-                // @ts-expect-error we are removing this property, so it is not in the type anymore
+            callback: (value: OnyxEntry<Account & {activePolicyID?: string}>) => {
+                Onyx.disconnect(accountConnection);
                 if (!value?.activePolicyID) {
                     resolveWhenDone();
                     return;
                 }
-                // @ts-expect-error we are removing this property, so it is not in the type anymore
                 const activePolicyID = value.activePolicyID;
                 const newValue = {...value};
-                // @ts-expect-error we are removing this property, so it is not in the type anymore
                 delete newValue.activePolicyID;
                 Onyx.multiSet({
                     [ONYXKEYS.NVP_ACTIVE_POLICY_ID]: activePolicyID,
@@ -63,23 +60,21 @@ export default function () {
                 }).then(resolveWhenDone);
             },
         });
-        const connectionIDRecentlyUsedTags = Onyx.connect({
+        const recentlyUsedTagsConnection = Onyx.connect({
             key: ONYXKEYS.COLLECTION.OLD_POLICY_RECENTLY_USED_TAGS,
             waitForCollectionCallback: true,
             callback: (value) => {
-                Onyx.disconnect(connectionIDRecentlyUsedTags);
+                Onyx.disconnect(recentlyUsedTagsConnection);
                 if (!value) {
                     resolveWhenDone();
                     return;
                 }
-                const newValue = {};
+                const newValue = {} as Record<string, unknown>;
                 for (const key of Object.keys(value)) {
-                    // @ts-expect-error We have no fixed types here
                     newValue[`nvp_${key}`] = value[key];
-                    // @ts-expect-error We have no fixed types here
                     newValue[key] = null;
                 }
-                Onyx.multiSet(newValue).then(resolveWhenDone);
+                Onyx.multiSet(newValue as KeyValueMapping).then(resolveWhenDone);
             },
         });
     });
diff --git a/src/libs/migrations/PronounsMigration.ts b/src/libs/migrations/PronounsMigration.ts
index 5fe911ae7f98..f4970d42c604 100644
--- a/src/libs/migrations/PronounsMigration.ts
+++ b/src/libs/migrations/PronounsMigration.ts
@@ -7,22 +7,22 @@ import type {PersonalDetails as TPersonalDetails} from '@src/types/onyx';
 
 function getCurrentUserAccountIDFromOnyx(): Promise<number> {
     return new Promise((resolve) => {
-        const connectionID = Onyx.connect({
+        const connection = Onyx.connect({
             key: ONYXKEYS.SESSION,
             callback: (val) => {
-                Onyx.disconnect(connectionID);
+                Onyx.disconnect(connection);
                 return resolve(val?.accountID ?? -1);
             },
         });
     });
 }
 
-function getCurrentUserPersonalDetailsFromOnyx(currentUserAccountID: number): Promise<OnyxEntry<TPersonalDetails>> {
+function getCurrentUserPersonalDetailsFromOnyx(currentUserAccountID: number): Promise<NonNullable<OnyxEntry<TPersonalDetails>> | null> {
     return new Promise((resolve) => {
-        const connectionID = Onyx.connect({
+        const connection = Onyx.connect({
             key: ONYXKEYS.PERSONAL_DETAILS_LIST,
             callback: (val) => {
-                Onyx.disconnect(connectionID);
+                Onyx.disconnect(connection);
                 return resolve(val?.[currentUserAccountID] ?? null);
             },
         });
@@ -35,7 +35,7 @@ function getCurrentUserPersonalDetailsFromOnyx(currentUserAccountID: number): Pr
 export default function (): Promise<void | void[]> {
     return getCurrentUserAccountIDFromOnyx()
         .then(getCurrentUserPersonalDetailsFromOnyx)
-        .then((currentUserPersonalDetails: OnyxEntry<TPersonalDetails>) => {
+        .then((currentUserPersonalDetails) => {
             if (!currentUserPersonalDetails) {
                 return;
             }
diff --git a/src/libs/migrations/RemoveEmptyReportActionsDrafts.ts b/src/libs/migrations/RemoveEmptyReportActionsDrafts.ts
index 48493a82d641..ce2f8de77634 100644
--- a/src/libs/migrations/RemoveEmptyReportActionsDrafts.ts
+++ b/src/libs/migrations/RemoveEmptyReportActionsDrafts.ts
@@ -1,5 +1,5 @@
 import _ from 'lodash';
-import type {OnyxEntry} from 'react-native-onyx';
+import type {OnyxInputValue} from 'react-native-onyx';
 import Onyx from 'react-native-onyx';
 import Log from '@libs/Log';
 import ONYXKEYS from '@src/ONYXKEYS';
@@ -13,18 +13,18 @@ type ReportActionsDraftsKey = `${typeof ONYXKEYS.COLLECTION.REPORT_ACTIONS_DRAFT
  */
 export default function (): Promise<void> {
     return new Promise<void>((resolve) => {
-        const connectionID = Onyx.connect({
+        const connection = Onyx.connect({
             key: ONYXKEYS.COLLECTION.REPORT_ACTIONS_DRAFTS,
             waitForCollectionCallback: true,
             callback: (allReportActionsDrafts) => {
-                Onyx.disconnect(connectionID);
+                Onyx.disconnect(connection);
 
                 if (!allReportActionsDrafts) {
                     Log.info('[Migrate Onyx] Skipped migration RemoveEmptyReportActionsDrafts because there were no reportActionsDrafts');
                     return resolve();
                 }
 
-                const newReportActionsDrafts: Record<ReportActionsDraftsKey, OnyxEntry<ReportActionsDrafts>> = {};
+                const newReportActionsDrafts: Record<ReportActionsDraftsKey, OnyxInputValue<ReportActionsDrafts>> = {};
                 Object.entries(allReportActionsDrafts).forEach(([onyxKey, reportActionDrafts]) => {
                     const newReportActionsDraftsForReport: Record<string, ReportActionsDraft> = {};
 
diff --git a/src/libs/migrations/RenameCardIsVirtual.ts b/src/libs/migrations/RenameCardIsVirtual.ts
index 5929b39dfe72..2d12f30dcf21 100644
--- a/src/libs/migrations/RenameCardIsVirtual.ts
+++ b/src/libs/migrations/RenameCardIsVirtual.ts
@@ -10,10 +10,10 @@ type OldCard = Card & {isVirtual?: boolean};
 // This migration changes the property name on each card from card list from isVirtual to nameValuePairs.isVirtual
 export default function () {
     return new Promise<void>((resolve) => {
-        const connectionID = Onyx.connect({
+        const connection = Onyx.connect({
             key: ONYXKEYS.CARD_LIST,
             callback: (cardList: OnyxEntry<Record<string, OldCard>>) => {
-                Onyx.disconnect(connectionID);
+                Onyx.disconnect(connection);
 
                 if (!cardList || isEmptyObject(cardList)) {
                     Log.info('[Migrate Onyx] Skipped migration RenameCardIsVirtual because there are no cards linked to the account');
@@ -26,20 +26,20 @@ export default function () {
                 }
 
                 Log.info('[Migrate Onyx] Running  RenameCardIsVirtual migration');
-                const dataToSave: Record<string, NullishDeep<OldCard>> = cardsWithIsVirtualProp.reduce((result, card) => {
+                const dataToSave = cardsWithIsVirtualProp.reduce((acc, card) => {
                     if (!card) {
-                        return result;
+                        return acc;
                     }
-                    return {
-                        ...result,
-                        [card.cardID]: {
-                            nameValuePairs: {
-                                isVirtual: card?.nameValuePairs?.isVirtual,
-                            },
-                            isVirtual: undefined,
+
+                    acc[card.cardID] = {
+                        nameValuePairs: {
+                            isVirtual: card?.nameValuePairs?.isVirtual,
                         },
+                        isVirtual: undefined,
                     };
-                }, {});
+
+                    return acc;
+                }, {} as Record<string, NullishDeep<OldCard>>);
 
                 // eslint-disable-next-line rulesdir/prefer-actions-set-data
                 Onyx.merge(ONYXKEYS.CARD_LIST, dataToSave).then(() => {
diff --git a/src/libs/migrations/RenameReceiptFilename.ts b/src/libs/migrations/RenameReceiptFilename.ts
index b867024fc74e..4ace549b49e0 100644
--- a/src/libs/migrations/RenameReceiptFilename.ts
+++ b/src/libs/migrations/RenameReceiptFilename.ts
@@ -1,5 +1,5 @@
 import Onyx from 'react-native-onyx';
-import type {NullishDeep, OnyxCollection} from 'react-native-onyx';
+import type {NullishDeep, OnyxCollection, OnyxEntry} from 'react-native-onyx';
 import Log from '@libs/Log';
 import ONYXKEYS from '@src/ONYXKEYS';
 import type Transaction from '@src/types/onyx/Transaction';
@@ -13,36 +13,34 @@ export default function () {
     return new Promise<void>((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({
+        const connection = Onyx.connect({
             key: ONYXKEYS.COLLECTION.TRANSACTION,
             waitForCollectionCallback: true,
             callback: (transactions: OnyxCollection<OldTransaction>) => {
-                Onyx.disconnect(connectionID);
+                Onyx.disconnect(connection);
 
                 if (!transactions || isEmptyObject(transactions)) {
                     Log.info('[Migrate Onyx] Skipped migration RenameReceiptFilename because there are no transactions');
                     return resolve();
                 }
 
-                const transactionsWithReceipt: Array<OldTransaction | null> = Object.values(transactions).filter((transaction) => transaction?.receiptFilename);
+                const transactionsWithReceipt: Array<OnyxEntry<OldTransaction>> = Object.values(transactions).filter((transaction) => transaction?.receiptFilename);
                 if (!transactionsWithReceipt?.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: Record<TransactionKey, NullishDeep<OldTransaction>> = transactionsWithReceipt?.reduce((result, transaction) => {
+                const dataToSave = transactionsWithReceipt?.reduce((acc, transaction) => {
                     if (!transaction) {
-                        return result;
+                        return acc;
                     }
                     Log.info(`[Migrate Onyx] Renaming receiptFilename ${transaction.receiptFilename} to filename`);
-                    return {
-                        ...result,
-                        [`${ONYXKEYS.COLLECTION.TRANSACTION}${transaction.transactionID}`]: {
-                            filename: transaction.receiptFilename,
-                            receiptFilename: null,
-                        },
+                    acc[`${ONYXKEYS.COLLECTION.TRANSACTION}${transaction.transactionID}`] = {
+                        filename: transaction.receiptFilename,
+                        receiptFilename: null,
                     };
-                }, {});
+                    return acc;
+                }, {} as Record<TransactionKey, NullishDeep<OldTransaction>>);
 
                 // eslint-disable-next-line rulesdir/prefer-actions-set-data
                 Onyx.mergeCollection(ONYXKEYS.COLLECTION.TRANSACTION, dataToSave).then(() => {
diff --git a/src/libs/migrations/TransactionBackupsToCollection.ts b/src/libs/migrations/TransactionBackupsToCollection.ts
index a7167492007a..addbcb02cc02 100644
--- a/src/libs/migrations/TransactionBackupsToCollection.ts
+++ b/src/libs/migrations/TransactionBackupsToCollection.ts
@@ -1,4 +1,4 @@
-import type {OnyxCollection} from 'react-native-onyx';
+import type {OnyxCollection, OnyxCollectionInputValue, OnyxEntry} from 'react-native-onyx';
 import Onyx from 'react-native-onyx';
 import Log from '@libs/Log';
 import ONYXKEYS from '@src/ONYXKEYS';
@@ -7,18 +7,18 @@ import type {Transaction} from '@src/types/onyx';
 /**
  * This migration moves all the transaction backups stored in the transaction collection, ONYXKEYS.COLLECTION.TRANSACTION, to a reserved collection that only
  * stores draft transactions, ONYXKEYS.COLLECTION.TRANSACTION_DRAFT. The purpose of the migration is that there is a possibility that transaction backups are
- * not filtered by most functions, e.g, getAllReportTransactions (src/libs/TransactionUtils.ts). One problem that arose from storing transaction backups with
+ * not filtered by most functions, e.g, getAllReportTransactions (src/libs/TransactionUtils/index.ts). One problem that arose from storing transaction backups with
  * the other transactions is that for every distance expense which have their waypoints updated offline, we expect the ReportPreview component to display the
  * default image of a pending map. However, due to the presence of the transaction backup, the previous map image will be displayed alongside the pending map.
  * The problem was further discussed in this PR. https://github.com/Expensify/App/pull/30232#issuecomment-178110172
  */
 export default function (): Promise<void> {
     return new Promise<void>((resolve) => {
-        const connectionID = Onyx.connect({
+        const connection = Onyx.connect({
             key: ONYXKEYS.COLLECTION.TRANSACTION,
             waitForCollectionCallback: true,
             callback: (transactions: OnyxCollection<Transaction>) => {
-                Onyx.disconnect(connectionID);
+                Onyx.disconnect(connection);
 
                 // Determine whether any transactions were stored
                 if (!transactions || Object.keys(transactions).length === 0) {
@@ -26,11 +26,11 @@ export default function (): Promise<void> {
                     return resolve();
                 }
 
-                const onyxData: OnyxCollection<Transaction> = {};
+                const onyxData: OnyxCollectionInputValue<Transaction> = {};
 
                 // Find all the transaction backups available
                 Object.keys(transactions).forEach((transactionOnyxKey: string) => {
-                    const transaction: Transaction | null = transactions[transactionOnyxKey];
+                    const transaction: OnyxEntry<Transaction> = transactions[transactionOnyxKey];
 
                     // Determine whether or not the transaction is a backup
                     if (transactionOnyxKey.endsWith('-backup') && transaction) {
diff --git a/src/libs/models/BankAccount.ts b/src/libs/models/BankAccount.ts
index 611d77c99927..a86a30b57e86 100644
--- a/src/libs/models/BankAccount.ts
+++ b/src/libs/models/BankAccount.ts
@@ -1,7 +1,7 @@
-import Str from 'expensify-common/lib/str';
+import {Str} from 'expensify-common';
 import type {ValueOf} from 'type-fest';
 import CONST from '@src/CONST';
-import type {AdditionalData} from '@src/types/onyx/BankAccount';
+import type {BankAccountAdditionalData} from '@src/types/onyx/BankAccount';
 import type BankAccountJSON from '@src/types/onyx/BankAccount';
 
 type State = ValueOf<typeof BankAccount.STATE>;
@@ -153,7 +153,7 @@ class BankAccount {
      * Return whether this bank account has been risk checked
      */
     isRiskChecked() {
-        return Boolean(this.json.accountData?.riskChecked);
+        return !!this.json.accountData?.riskChecked;
     }
 
     /**
@@ -194,7 +194,7 @@ class BankAccount {
     /**
      * Get the additional data of a bankAccount
      */
-    getAdditionalData(): Partial<AdditionalData> {
+    getAdditionalData(): Partial<BankAccountAdditionalData> {
         return this.json.accountData?.additionalData ?? {};
     }
 
diff --git a/src/libs/navigateAfterJoinRequest/index.desktop.ts b/src/libs/navigateAfterJoinRequest/index.desktop.ts
index 47180c6a1368..cf6d009291c8 100644
--- a/src/libs/navigateAfterJoinRequest/index.desktop.ts
+++ b/src/libs/navigateAfterJoinRequest/index.desktop.ts
@@ -1,8 +1,12 @@
+import getIsSmallScreenWidth from '@libs/getIsSmallScreenWidth';
 import Navigation from '@navigation/Navigation';
 import ROUTES from '@src/ROUTES';
 
 const navigateAfterJoinRequest = () => {
     Navigation.goBack(undefined, false, true);
+    if (getIsSmallScreenWidth()) {
+        Navigation.navigate(ROUTES.SETTINGS);
+    }
     Navigation.navigate(ROUTES.SETTINGS_WORKSPACES);
 };
 export default navigateAfterJoinRequest;
diff --git a/src/libs/navigateAfterJoinRequest/index.ts b/src/libs/navigateAfterJoinRequest/index.ts
index b53c59d678c9..42e91d18c6ba 100644
--- a/src/libs/navigateAfterJoinRequest/index.ts
+++ b/src/libs/navigateAfterJoinRequest/index.ts
@@ -3,7 +3,7 @@ import ROUTES from '@src/ROUTES';
 
 const navigateAfterJoinRequest = () => {
     Navigation.goBack(undefined, false, true);
-    Navigation.navigate(ROUTES.ALL_SETTINGS);
+    Navigation.navigate(ROUTES.SETTINGS);
     Navigation.navigate(ROUTES.SETTINGS_WORKSPACES);
 };
 export default navigateAfterJoinRequest;
diff --git a/src/libs/navigateAfterJoinRequest/index.web.ts b/src/libs/navigateAfterJoinRequest/index.web.ts
index 47180c6a1368..cf6d009291c8 100644
--- a/src/libs/navigateAfterJoinRequest/index.web.ts
+++ b/src/libs/navigateAfterJoinRequest/index.web.ts
@@ -1,8 +1,12 @@
+import getIsSmallScreenWidth from '@libs/getIsSmallScreenWidth';
 import Navigation from '@navigation/Navigation';
 import ROUTES from '@src/ROUTES';
 
 const navigateAfterJoinRequest = () => {
     Navigation.goBack(undefined, false, true);
+    if (getIsSmallScreenWidth()) {
+        Navigation.navigate(ROUTES.SETTINGS);
+    }
     Navigation.navigate(ROUTES.SETTINGS_WORKSPACES);
 };
 export default navigateAfterJoinRequest;
diff --git a/src/libs/onyxSubscribe.ts b/src/libs/onyxSubscribe.ts
index afb8818ced40..76a33c1fa137 100644
--- a/src/libs/onyxSubscribe.ts
+++ b/src/libs/onyxSubscribe.ts
@@ -9,8 +9,8 @@ import type {OnyxCollectionKey, OnyxKey} from '@src/ONYXKEYS';
  * @return Unsubscribe callback
  */
 function onyxSubscribe<TKey extends OnyxKey | `${OnyxCollectionKey}${string}`>(mapping: ConnectOptions<TKey>) {
-    const connectionId = Onyx.connect(mapping);
-    return () => Onyx.disconnect(connectionId);
+    const connection = Onyx.connect(mapping);
+    return () => Onyx.disconnect(connection);
 }
 
 export default onyxSubscribe;
diff --git a/src/libs/saveLastRoute/index.ios.ts b/src/libs/saveLastRoute/index.ios.ts
new file mode 100644
index 000000000000..12107937800b
--- /dev/null
+++ b/src/libs/saveLastRoute/index.ios.ts
@@ -0,0 +1,6 @@
+import {updateLastRoute} from '@libs/actions/App';
+import Navigation from '@libs/Navigation/Navigation';
+
+export default function saveLastRoute() {
+    updateLastRoute(Navigation.getActiveRoute());
+}
diff --git a/src/libs/saveLastRoute/index.ts b/src/libs/saveLastRoute/index.ts
new file mode 100644
index 000000000000..4b532cf6ee75
--- /dev/null
+++ b/src/libs/saveLastRoute/index.ts
@@ -0,0 +1,3 @@
+const saveLastRoute = () => {};
+
+export default saveLastRoute;
diff --git a/src/libs/setCrashlyticsUserId/index.native.ts b/src/libs/setCrashlyticsUserId/index.native.ts
new file mode 100644
index 000000000000..70c73a244088
--- /dev/null
+++ b/src/libs/setCrashlyticsUserId/index.native.ts
@@ -0,0 +1,7 @@
+import crashlytics from '@react-native-firebase/crashlytics';
+
+const setCrashlyticsUserId = (accountID: string | number) => {
+    crashlytics().setUserId(accountID.toString());
+};
+
+export default setCrashlyticsUserId;
diff --git a/src/libs/setCrashlyticsUserId/index.ts b/src/libs/setCrashlyticsUserId/index.ts
new file mode 100644
index 000000000000..312d62a6d308
--- /dev/null
+++ b/src/libs/setCrashlyticsUserId/index.ts
@@ -0,0 +1,3 @@
+// eslint-disable-next-line @typescript-eslint/no-unused-vars
+const setCrashlyticsUserId = (_: string | number) => {};
+export default setCrashlyticsUserId;
diff --git a/src/libs/shouldIgnoreSelectionWhenUpdatedManually/index.android.tsx b/src/libs/shouldIgnoreSelectionWhenUpdatedManually/index.android.tsx
new file mode 100644
index 000000000000..289c56ad69be
--- /dev/null
+++ b/src/libs/shouldIgnoreSelectionWhenUpdatedManually/index.android.tsx
@@ -0,0 +1,5 @@
+import type ShouldIgnoreSelectionWhenUpdatedManually from './types';
+
+const shouldIgnoreSelectionWhenUpdatedManually: ShouldIgnoreSelectionWhenUpdatedManually = true;
+
+export default shouldIgnoreSelectionWhenUpdatedManually;
diff --git a/src/libs/shouldIgnoreSelectionWhenUpdatedManually/index.tsx b/src/libs/shouldIgnoreSelectionWhenUpdatedManually/index.tsx
new file mode 100644
index 000000000000..744a94aa1f32
--- /dev/null
+++ b/src/libs/shouldIgnoreSelectionWhenUpdatedManually/index.tsx
@@ -0,0 +1,5 @@
+import type ShouldIgnoreSelectionWhenUpdatedManually from './types';
+
+const shouldIgnoreSelectionWhenUpdatedManually: ShouldIgnoreSelectionWhenUpdatedManually = false;
+
+export default shouldIgnoreSelectionWhenUpdatedManually;
diff --git a/src/libs/shouldIgnoreSelectionWhenUpdatedManually/types.ts b/src/libs/shouldIgnoreSelectionWhenUpdatedManually/types.ts
new file mode 100644
index 000000000000..56394183ef7d
--- /dev/null
+++ b/src/libs/shouldIgnoreSelectionWhenUpdatedManually/types.ts
@@ -0,0 +1,3 @@
+type ShouldIgnoreSelectionWhenUpdatedManually = boolean;
+
+export default ShouldIgnoreSelectionWhenUpdatedManually;
diff --git a/src/libs/shouldRenderAppPaymentCard/index.native.ts b/src/libs/shouldRenderAppPaymentCard/index.native.ts
new file mode 100644
index 000000000000..74137a6f7cdc
--- /dev/null
+++ b/src/libs/shouldRenderAppPaymentCard/index.native.ts
@@ -0,0 +1,5 @@
+import type ShouldRenderAddPaymentCard from './types';
+
+const shouldRenderAddPaymentCard: ShouldRenderAddPaymentCard = () => false;
+
+export default shouldRenderAddPaymentCard;
diff --git a/src/libs/shouldRenderAppPaymentCard/index.ts b/src/libs/shouldRenderAppPaymentCard/index.ts
new file mode 100644
index 000000000000..9b2ee6082e02
--- /dev/null
+++ b/src/libs/shouldRenderAppPaymentCard/index.ts
@@ -0,0 +1,5 @@
+import type ShouldRenderAddPaymentCard from './types';
+
+const shouldRenderAddPaymentCard: ShouldRenderAddPaymentCard = () => true;
+
+export default shouldRenderAddPaymentCard;
diff --git a/src/libs/shouldRenderAppPaymentCard/types.ts b/src/libs/shouldRenderAppPaymentCard/types.ts
new file mode 100644
index 000000000000..80e934badab2
--- /dev/null
+++ b/src/libs/shouldRenderAppPaymentCard/types.ts
@@ -0,0 +1,3 @@
+type ShouldRenderAddPaymentCard = () => boolean;
+
+export default ShouldRenderAddPaymentCard;
diff --git a/src/libs/shouldShowSubscriptionsMenu/index.native.ts b/src/libs/shouldShowSubscriptionsMenu/index.native.ts
deleted file mode 100644
index c98302e9a87d..000000000000
--- a/src/libs/shouldShowSubscriptionsMenu/index.native.ts
+++ /dev/null
@@ -1,8 +0,0 @@
-import type ShouldShowSubscriptionsMenu from './types';
-
-/**
- * Indicates whether the subscription menu should show in the all settings screen
- */
-const shouldShowSubscriptionsMenu: ShouldShowSubscriptionsMenu = false;
-
-export default shouldShowSubscriptionsMenu;
diff --git a/src/libs/shouldShowSubscriptionsMenu/index.ts b/src/libs/shouldShowSubscriptionsMenu/index.ts
deleted file mode 100644
index 2f2b7f17c2c5..000000000000
--- a/src/libs/shouldShowSubscriptionsMenu/index.ts
+++ /dev/null
@@ -1,8 +0,0 @@
-import type ShouldShowSubscriptionsMenu from './types';
-
-/**
- * Indicates whether the subscription menu should show in the all settings screen
- */
-const shouldShowSubscriptionsMenu: ShouldShowSubscriptionsMenu = true;
-
-export default shouldShowSubscriptionsMenu;
diff --git a/src/libs/shouldShowSubscriptionsMenu/types.tsx b/src/libs/shouldShowSubscriptionsMenu/types.tsx
deleted file mode 100644
index e72b55234639..000000000000
--- a/src/libs/shouldShowSubscriptionsMenu/types.tsx
+++ /dev/null
@@ -1,3 +0,0 @@
-type ShouldShowSubscriptionsMenu = boolean;
-
-export default ShouldShowSubscriptionsMenu;
diff --git a/src/libs/shouldUseNewPager/index.android.ts b/src/libs/shouldUseNewPager/index.android.ts
new file mode 100644
index 000000000000..c6de457c3f1a
--- /dev/null
+++ b/src/libs/shouldUseNewPager/index.android.ts
@@ -0,0 +1,3 @@
+export default function shouldUseNewPager() {
+    return true;
+}
diff --git a/src/libs/shouldUseNewPager/index.ts b/src/libs/shouldUseNewPager/index.ts
new file mode 100644
index 000000000000..e4a7458dcdbb
--- /dev/null
+++ b/src/libs/shouldUseNewPager/index.ts
@@ -0,0 +1,4 @@
+export default function shouldUseNewPager() {
+    // false on all other platforms
+    return false;
+}
diff --git a/src/libs/testCrash/index.native.ts b/src/libs/testCrash/index.native.ts
new file mode 100644
index 000000000000..367a1c886ea4
--- /dev/null
+++ b/src/libs/testCrash/index.native.ts
@@ -0,0 +1,6 @@
+import crashlytics from '@react-native-firebase/crashlytics';
+
+const testCrash = () => {
+    crashlytics().crash();
+};
+export default testCrash;
diff --git a/src/libs/testCrash/index.ts b/src/libs/testCrash/index.ts
new file mode 100644
index 000000000000..928c792af05b
--- /dev/null
+++ b/src/libs/testCrash/index.ts
@@ -0,0 +1,2 @@
+const testCrash = () => {};
+export default testCrash;
diff --git a/src/libs/updateMultilineInputRange/index.ts b/src/libs/updateMultilineInputRange/index.ts
index f5d71c5e2038..32a890a8d93f 100644
--- a/src/libs/updateMultilineInputRange/index.ts
+++ b/src/libs/updateMultilineInputRange/index.ts
@@ -1,4 +1,3 @@
-import * as Browser from '@libs/Browser';
 import type UpdateMultilineInputRange from './types';
 
 /**
@@ -15,15 +14,10 @@ const updateMultilineInputRange: UpdateMultilineInputRange = (input, shouldAutoF
         return;
     }
 
-    if ('value' in input && input.value && input.setSelectionRange) {
+    if ('value' in input && typeof input.value === 'string' && input.setSelectionRange) {
         const length = input.value.length;
-
-        // 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.
-        const shouldSetSelection = !(Browser.isMobileSafari() && !shouldAutoFocus);
-        if (shouldSetSelection) {
-            input.setSelectionRange(length, length);
+        if (shouldAutoFocus) {
+            (input as HTMLInputElement).setSelectionRange(length, length);
         }
         // eslint-disable-next-line no-param-reassign
         input.scrollTop = input.scrollHeight;
diff --git a/src/pages/AddPersonalBankAccountPage.tsx b/src/pages/AddPersonalBankAccountPage.tsx
index 5cd0f3ef8026..04cce885bd07 100644
--- a/src/pages/AddPersonalBankAccountPage.tsx
+++ b/src/pages/AddPersonalBankAccountPage.tsx
@@ -1,9 +1,11 @@
 import React, {useCallback, useEffect, useState} from 'react';
-import {withOnyx} from 'react-native-onyx';
+import {useOnyx, withOnyx} from 'react-native-onyx';
 import type {OnyxEntry} from 'react-native-onyx';
 import AddPlaidBankAccount from '@components/AddPlaidBankAccount';
+import FullPageNotFoundView from '@components/BlockingViews/FullPageNotFoundView';
 import ConfirmationPage from '@components/ConfirmationPage';
 import FormProvider from '@components/Form/FormProvider';
+import InputWrapper from '@components/Form/InputWrapper';
 import HeaderWithBackButton from '@components/HeaderWithBackButton';
 import ScreenWrapper from '@components/ScreenWrapper';
 import useLocalize from '@hooks/useLocalize';
@@ -13,6 +15,7 @@ import Navigation from '@libs/Navigation/Navigation';
 import * as BankAccounts from '@userActions/BankAccounts';
 import * as PaymentMethods from '@userActions/PaymentMethods';
 import ONYXKEYS from '@src/ONYXKEYS';
+import INPUT_IDS from '@src/types/form/ReimbursementAccountForm';
 import type {PersonalBankAccount, PlaidData} from '@src/types/onyx';
 
 type AddPersonalBankAccountPageWithOnyxProps = {
@@ -27,10 +30,9 @@ function AddPersonalBankAccountPage({personalBankAccount, plaidData}: AddPersona
     const styles = useThemeStyles();
     const {translate} = useLocalize();
     const [selectedPlaidAccountId, setSelectedPlaidAccountId] = useState('');
+    const [isUserValidated] = useOnyx(ONYXKEYS.USER, {selector: (user) => !!user?.validated});
     const shouldShowSuccess = personalBankAccount?.shouldShowSuccess ?? false;
 
-    const validateBankAccountForm = () => ({});
-
     const submitBankAccountForm = useCallback(() => {
         const bankAccounts = plaidData?.bankAccounts ?? [];
         const selectedPlaidBankAccount = bankAccounts.find((bankAccount) => bankAccount.plaidAccountID === selectedPlaidAccountId);
@@ -65,37 +67,43 @@ function AddPersonalBankAccountPage({personalBankAccount, plaidData}: AddPersona
             shouldShowOfflineIndicator={false}
             testID={AddPersonalBankAccountPage.displayName}
         >
-            <HeaderWithBackButton
-                title={translate('bankAccount.addBankAccount')}
-                onBackButtonPress={exitFlow}
-            />
-            {shouldShowSuccess ? (
-                <ConfirmationPage
-                    heading={translate('addPersonalBankAccountPage.successTitle')}
-                    description={translate('addPersonalBankAccountPage.successMessage')}
-                    shouldShowButton
-                    buttonText={translate('common.continue')}
-                    onButtonPress={() => exitFlow(true)}
+            <FullPageNotFoundView shouldShow={!isUserValidated}>
+                <HeaderWithBackButton
+                    title={translate('bankAccount.addBankAccount')}
+                    onBackButtonPress={exitFlow}
                 />
-            ) : (
-                <FormProvider
-                    formID={ONYXKEYS.FORMS.PERSONAL_BANK_ACCOUNT_FORM}
-                    isSubmitButtonVisible={Boolean(selectedPlaidAccountId)}
-                    submitButtonText={translate('common.saveAndContinue')}
-                    scrollContextEnabled
-                    onSubmit={submitBankAccountForm}
-                    validate={validateBankAccountForm}
-                    style={[styles.mh5, styles.flex1]}
-                >
-                    <AddPlaidBankAccount
-                        onSelect={setSelectedPlaidAccountId}
-                        plaidData={plaidData}
-                        onExitPlaid={() => Navigation.goBack()}
-                        receivedRedirectURI={getPlaidOAuthReceivedRedirectURI()}
-                        selectedPlaidAccountID={selectedPlaidAccountId}
+                {shouldShowSuccess ? (
+                    <ConfirmationPage
+                        heading={translate('addPersonalBankAccountPage.successTitle')}
+                        description={translate('addPersonalBankAccountPage.successMessage')}
+                        shouldShowButton
+                        buttonText={translate('common.continue')}
+                        onButtonPress={() => exitFlow(true)}
                     />
-                </FormProvider>
-            )}
+                ) : (
+                    <FormProvider
+                        formID={ONYXKEYS.FORMS.PERSONAL_BANK_ACCOUNT_FORM}
+                        isSubmitButtonVisible={(plaidData?.bankAccounts ?? []).length > 0}
+                        submitButtonText={translate('common.saveAndContinue')}
+                        scrollContextEnabled
+                        onSubmit={submitBankAccountForm}
+                        validate={BankAccounts.validatePlaidSelection}
+                        style={[styles.mh5, styles.flex1]}
+                    >
+                        <InputWrapper
+                            inputID={INPUT_IDS.BANK_INFO_STEP.SELECTED_PLAID_ACCOUNT_ID}
+                            InputComponent={AddPlaidBankAccount}
+                            onSelect={setSelectedPlaidAccountId}
+                            text={translate('walletPage.chooseAccountBody')}
+                            plaidData={plaidData}
+                            isDisplayedInWalletFlow
+                            onExitPlaid={() => Navigation.goBack()}
+                            receivedRedirectURI={getPlaidOAuthReceivedRedirectURI()}
+                            selectedPlaidAccountID={selectedPlaidAccountId}
+                        />
+                    </FormProvider>
+                )}
+            </FullPageNotFoundView>
         </ScreenWrapper>
     );
 }
diff --git a/src/pages/AddressPage.tsx b/src/pages/AddressPage.tsx
new file mode 100644
index 000000000000..efd924270bea
--- /dev/null
+++ b/src/pages/AddressPage.tsx
@@ -0,0 +1,110 @@
+import React, {useCallback, useEffect, useState} from 'react';
+import type {OnyxEntry} from 'react-native-onyx';
+import AddressForm from '@components/AddressForm';
+import FullscreenLoadingIndicator from '@components/FullscreenLoadingIndicator';
+import HeaderWithBackButton from '@components/HeaderWithBackButton';
+import ScreenWrapper from '@components/ScreenWrapper';
+import useLocalize from '@hooks/useLocalize';
+import useThemeStyles from '@hooks/useThemeStyles';
+import Navigation from '@libs/Navigation/Navigation';
+import type {FormOnyxValues} from '@src/components/Form/types';
+import type {Country} from '@src/CONST';
+import ONYXKEYS from '@src/ONYXKEYS';
+import INPUT_IDS from '@src/types/form/HomeAddressForm';
+import type {Address} from '@src/types/onyx/PrivatePersonalDetails';
+
+type AddressPageProps = {
+    /** User's private personal details */
+    address?: Address;
+    /** Whether app is loading */
+    isLoadingApp: OnyxEntry<boolean>;
+    /** Function to call when address form is submitted */
+    updateAddress: (values: FormOnyxValues<typeof ONYXKEYS.FORMS.HOME_ADDRESS_FORM>) => void;
+    /** Title of address page */
+    title: string;
+};
+
+function AddressPage({title, address, updateAddress, isLoadingApp = true}: AddressPageProps) {
+    const styles = useThemeStyles();
+    const {translate} = useLocalize();
+
+    // Check if country is valid
+    const {street} = address ?? {};
+    const [street1, street2] = street ? street.split('\n') : [undefined, undefined];
+    const [currentCountry, setCurrentCountry] = useState(address?.country);
+    const [state, setState] = useState(address?.state);
+    const [city, setCity] = useState(address?.city);
+    const [zipcode, setZipcode] = useState(address?.zip);
+
+    useEffect(() => {
+        if (!address) {
+            return;
+        }
+        setState(address.state);
+        setCurrentCountry(address.country);
+        setCity(address.city);
+        setZipcode(address.zip);
+        // eslint-disable-next-line react-compiler/react-compiler, react-hooks/exhaustive-deps
+    }, [address?.state, address?.country, address?.city, address?.zip]);
+
+    const handleAddressChange = useCallback((value: unknown, key: unknown) => {
+        const addressPart = value as string;
+        const addressPartKey = key as keyof Address;
+
+        if (addressPartKey !== INPUT_IDS.COUNTRY && addressPartKey !== INPUT_IDS.STATE && addressPartKey !== INPUT_IDS.CITY && addressPartKey !== INPUT_IDS.ZIP_POST_CODE) {
+            return;
+        }
+        if (addressPartKey === INPUT_IDS.COUNTRY) {
+            setCurrentCountry(addressPart as Country | '');
+            setState('');
+            setCity('');
+            setZipcode('');
+            return;
+        }
+        if (addressPartKey === INPUT_IDS.STATE) {
+            setState(addressPart);
+            setCity('');
+            setZipcode('');
+            return;
+        }
+        if (addressPartKey === INPUT_IDS.CITY) {
+            setCity(addressPart);
+            setZipcode('');
+            return;
+        }
+        setZipcode(addressPart);
+    }, []);
+
+    return (
+        <ScreenWrapper
+            includeSafeAreaPaddingBottom={false}
+            testID={AddressPage.displayName}
+        >
+            <HeaderWithBackButton
+                title={title}
+                shouldShowBackButton
+                onBackButtonPress={() => Navigation.goBack()}
+            />
+            {isLoadingApp ? (
+                <FullscreenLoadingIndicator style={[styles.flex1, styles.pRelative]} />
+            ) : (
+                <AddressForm
+                    formID={ONYXKEYS.FORMS.HOME_ADDRESS_FORM}
+                    onSubmit={updateAddress}
+                    submitButtonText={translate('common.save')}
+                    city={city}
+                    country={currentCountry}
+                    onAddressChanged={handleAddressChange}
+                    state={state}
+                    street1={street1}
+                    street2={street2}
+                    zip={zipcode}
+                />
+            )}
+        </ScreenWrapper>
+    );
+}
+
+AddressPage.displayName = 'AddressPage';
+
+export default AddressPage;
diff --git a/src/pages/ChatFinderPage/index.tsx b/src/pages/ChatFinderPage/index.tsx
index 21ca18df9263..aabf881a8bed 100644
--- a/src/pages/ChatFinderPage/index.tsx
+++ b/src/pages/ChatFinderPage/index.tsx
@@ -1,6 +1,6 @@
 import type {StackScreenProps} from '@react-navigation/stack';
 import isEmpty from 'lodash/isEmpty';
-import React, {useEffect, useMemo, useState} from 'react';
+import React, {useCallback, useEffect, useMemo, useState} from 'react';
 import type {OnyxEntry} from 'react-native-onyx';
 import {withOnyx} from 'react-native-onyx';
 import HeaderWithBackButton from '@components/HeaderWithBackButton';
@@ -8,12 +8,11 @@ import {useOptionsList} from '@components/OptionListContextProvider';
 import ScreenWrapper from '@components/ScreenWrapper';
 import SelectionList from '@components/SelectionList';
 import UserListItem from '@components/SelectionList/UserListItem';
+import useCancelSearchOnModalClose from '@hooks/useCancelSearchOnModalClose';
 import useDebouncedState from '@hooks/useDebouncedState';
 import useDismissedReferralBanners from '@hooks/useDismissedReferralBanners';
 import useLocalize from '@hooks/useLocalize';
 import useNetwork from '@hooks/useNetwork';
-import useThemeStyles from '@hooks/useThemeStyles';
-import type {MaybePhraseKey} from '@libs/Localize';
 import Navigation from '@libs/Navigation/Navigation';
 import type {RootStackParamList} from '@libs/Navigation/types';
 import * as OptionsListUtils from '@libs/OptionsListUtils';
@@ -23,6 +22,7 @@ import * as Report from '@userActions/Report';
 import Timing from '@userActions/Timing';
 import CONST from '@src/CONST';
 import ONYXKEYS from '@src/ONYXKEYS';
+import ROUTES from '@src/ROUTES';
 import type SCREENS from '@src/SCREENS';
 import type * as OnyxTypes from '@src/types/onyx';
 import ChatFinderPageFooter from './ChatFinderPageFooter';
@@ -35,7 +35,7 @@ type ChatFinderPageOnyxProps = {
     isSearchingForReports: OnyxEntry<boolean>;
 };
 
-type ChatFinderPageProps = ChatFinderPageOnyxProps & StackScreenProps<RootStackParamList, typeof SCREENS.CHAT_FINDER_ROOT>;
+type ChatFinderPageProps = ChatFinderPageOnyxProps & StackScreenProps<RootStackParamList, typeof SCREENS.LEFT_MODAL.CHAT_FINDER>;
 
 type ChatFinderPageSectionItem = {
     data: OptionData[];
@@ -53,25 +53,28 @@ const ChatFinderPageFooterInstance = <ChatFinderPageFooter />;
 
 function ChatFinderPage({betas, isSearchingForReports, navigation}: ChatFinderPageProps) {
     const [isScreenTransitionEnd, setIsScreenTransitionEnd] = useState(false);
-    const themeStyles = useThemeStyles();
     const {translate} = useLocalize();
     const {isOffline} = useNetwork();
     const {options, areOptionsInitialized} = useOptionsList({
         shouldInitialize: isScreenTransitionEnd,
     });
 
-    const offlineMessage: MaybePhraseKey = isOffline ? [`${translate('common.youAppearToBeOffline')} ${translate('search.resultsAreLimited')}`, {isTranslated: true}] : '';
+    const offlineMessage: string = isOffline ? `${translate('common.youAppearToBeOffline')} ${translate('search.resultsAreLimited')}` : '';
 
     const [searchValue, debouncedSearchValue, setSearchValue] = useDebouncedState('');
+    const [, debouncedSearchValueInServer, setSearchValueInServer] = useDebouncedState('', 500);
+    const updateSearchValue = useCallback(
+        (value: string) => {
+            setSearchValue(value);
+            setSearchValueInServer(value);
+        },
+        [setSearchValue, setSearchValueInServer],
+    );
+    useCancelSearchOnModalClose();
 
     useEffect(() => {
-        Timing.start(CONST.TIMING.CHAT_FINDER_RENDER);
-        Performance.markStart(CONST.TIMING.CHAT_FINDER_RENDER);
-    }, []);
-
-    useEffect(() => {
-        Report.searchInServer(debouncedSearchValue.trim());
-    }, [debouncedSearchValue]);
+        Report.searchInServer(debouncedSearchValueInServer.trim());
+    }, [debouncedSearchValueInServer]);
 
     const searchOptions = useMemo(() => {
         if (!areOptionsInitialized || !isScreenTransitionEnd) {
@@ -87,7 +90,7 @@ function ChatFinderPage({betas, isSearchingForReports, navigation}: ChatFinderPa
             };
         }
         const optionList = OptionsListUtils.getSearchOptions(options, '', betas ?? []);
-        const header = OptionsListUtils.getHeaderMessage(optionList.recentReports.length + optionList.personalDetails.length !== 0, Boolean(optionList.userToInvite), '');
+        const header = OptionsListUtils.getHeaderMessage(optionList.recentReports.length + optionList.personalDetails.length !== 0, !!optionList.userToInvite, '');
         return {...optionList, headerMessage: header};
     }, [areOptionsInitialized, betas, isScreenTransitionEnd, options]);
 
@@ -101,7 +104,10 @@ function ChatFinderPage({betas, isSearchingForReports, navigation}: ChatFinderPa
             };
         }
 
-        const newOptions = OptionsListUtils.filterOptions(searchOptions, debouncedSearchValue, betas);
+        Timing.start(CONST.TIMING.SEARCH_FILTER_OPTIONS);
+        const newOptions = OptionsListUtils.filterOptions(searchOptions, debouncedSearchValue, {sortByReportTypeInSearch: true, preferChatroomsOverThreads: true});
+        Timing.end(CONST.TIMING.SEARCH_FILTER_OPTIONS);
+
         const header = OptionsListUtils.getHeaderMessage(newOptions.recentReports.length + Number(!!newOptions.userToInvite) > 0, false, debouncedSearchValue);
         return {
             recentReports: newOptions.recentReports,
@@ -109,7 +115,7 @@ function ChatFinderPage({betas, isSearchingForReports, navigation}: ChatFinderPa
             userToInvite: newOptions.userToInvite,
             headerMessage: header,
         };
-    }, [debouncedSearchValue, searchOptions, betas]);
+    }, [debouncedSearchValue, searchOptions]);
 
     const {recentReports, personalDetails: localPersonalDetails, userToInvite, headerMessage} = debouncedSearchValue.trim() !== '' ? filteredOptions : searchOptions;
 
@@ -118,7 +124,7 @@ function ChatFinderPage({betas, isSearchingForReports, navigation}: ChatFinderPa
 
         if (recentReports?.length > 0) {
             newSections.push({
-                data: recentReports.map((report) => ({...report, isBold: report.isUnread})),
+                data: recentReports,
                 shouldShow: true,
             });
         }
@@ -146,8 +152,7 @@ function ChatFinderPage({betas, isSearchingForReports, navigation}: ChatFinderPa
         }
 
         if (option.reportID) {
-            setSearchValue('');
-            Navigation.dismissModal(option.reportID);
+            Navigation.closeAndNavigate(ROUTES.REPORT_WITH_ID.getRoute(option.reportID));
         } else {
             Report.navigateToAndOpenReport(option.login ? [option.login] : []);
         }
@@ -175,16 +180,17 @@ function ChatFinderPage({betas, isSearchingForReports, navigation}: ChatFinderPa
                 sections={areOptionsInitialized ? sections : CONST.EMPTY_ARRAY}
                 ListItem={UserListItem}
                 textInputValue={searchValue}
-                textInputLabel={translate('optionsSelector.nameEmailOrPhoneNumber')}
+                textInputLabel={translate('selectionList.nameEmailOrPhoneNumber')}
                 textInputHint={offlineMessage}
-                onChangeText={setSearchValue}
+                onChangeText={updateSearchValue}
                 headerMessage={headerMessage}
-                headerMessageStyle={headerMessage === translate('common.noResultsFound') ? [themeStyles.ph4, themeStyles.pb5] : undefined}
                 onLayout={setPerformanceTimersEnd}
                 onSelectRow={selectReport}
+                shouldSingleExecuteRowSelect
                 showLoadingPlaceholder={!areOptionsInitialized || !isScreenTransitionEnd}
                 footerContent={!isDismissed && ChatFinderPageFooterInstance}
                 isLoadingNewOptions={!!isSearchingForReports}
+                shouldDelayFocus={false}
             />
         </ScreenWrapper>
     );
diff --git a/src/pages/ConciergePage.tsx b/src/pages/ConciergePage.tsx
index 10040a6c3146..46f17e76c083 100644
--- a/src/pages/ConciergePage.tsx
+++ b/src/pages/ConciergePage.tsx
@@ -7,6 +7,7 @@ import {withOnyx} from 'react-native-onyx';
 import ReportActionsSkeletonView from '@components/ReportActionsSkeletonView';
 import ReportHeaderSkeletonView from '@components/ReportHeaderSkeletonView';
 import ScreenWrapper from '@components/ScreenWrapper';
+import useResponsiveLayout from '@hooks/useResponsiveLayout';
 import useThemeStyles from '@hooks/useThemeStyles';
 import Navigation from '@libs/Navigation/Navigation';
 import type {AuthScreensParamList} from '@libs/Navigation/types';
@@ -31,6 +32,7 @@ type ConciergePageProps = ConciergePageOnyxProps & StackScreenProps<AuthScreensP
 function ConciergePage({session}: ConciergePageProps) {
     const styles = useThemeStyles();
     const isUnmounted = useRef(false);
+    const {shouldUseNarrowLayout} = useResponsiveLayout();
 
     useFocusEffect(() => {
         if (session && 'authToken' in session) {
@@ -47,16 +49,16 @@ function ConciergePage({session}: ConciergePageProps) {
         }
     });
 
-    useEffect(
-        () => () => {
+    useEffect(() => {
+        isUnmounted.current = false;
+        return () => {
             isUnmounted.current = true;
-        },
-        [],
-    );
+        };
+    }, []);
 
     return (
         <ScreenWrapper testID={ConciergePage.displayName}>
-            <View style={[styles.borderBottom]}>
+            <View style={[styles.borderBottom, styles.appContentHeader, !shouldUseNarrowLayout && styles.headerBarDesktopHeight]}>
                 <ReportHeaderSkeletonView onBackButtonPress={Navigation.goBack} />
             </View>
             <ReportActionsSkeletonView />
diff --git a/src/pages/DetailsPage.tsx b/src/pages/DetailsPage.tsx
deleted file mode 100755
index 49b3e856c65d..000000000000
--- a/src/pages/DetailsPage.tsx
+++ /dev/null
@@ -1,189 +0,0 @@
-import type {StackScreenProps} from '@react-navigation/stack';
-import Str from 'expensify-common/lib/str';
-import React from 'react';
-import {View} from 'react-native';
-import {withOnyx} from 'react-native-onyx';
-import type {OnyxEntry} from 'react-native-onyx';
-import AttachmentModal from '@components/AttachmentModal';
-import AutoUpdateTime from '@components/AutoUpdateTime';
-import Avatar from '@components/Avatar';
-import FullPageNotFoundView from '@components/BlockingViews/FullPageNotFoundView';
-import CommunicationsLink from '@components/CommunicationsLink';
-import HeaderWithBackButton from '@components/HeaderWithBackButton';
-import * as Expensicons from '@components/Icon/Expensicons';
-import MenuItem from '@components/MenuItem';
-import OfflineWithFeedback from '@components/OfflineWithFeedback';
-import PressableWithoutFocus from '@components/Pressable/PressableWithoutFocus';
-import ScreenWrapper from '@components/ScreenWrapper';
-import ScrollView from '@components/ScrollView';
-import Text from '@components/Text';
-import UserDetailsTooltip from '@components/UserDetailsTooltip';
-import useLocalize from '@hooks/useLocalize';
-import useThemeStyles from '@hooks/useThemeStyles';
-import * as PersonalDetailsUtils from '@libs/PersonalDetailsUtils';
-import {parsePhoneNumber} from '@libs/PhoneNumber';
-import * as ReportUtils from '@libs/ReportUtils';
-import * as UserUtils from '@libs/UserUtils';
-import type {DetailsNavigatorParamList} from '@navigation/types';
-import * as Report from '@userActions/Report';
-import CONST from '@src/CONST';
-import type {TranslationPaths} from '@src/languages/types';
-import ONYXKEYS from '@src/ONYXKEYS';
-import type SCREENS from '@src/SCREENS';
-import type {PersonalDetails, PersonalDetailsList, Session} from '@src/types/onyx';
-
-type DetailsPageOnyxProps = {
-    /** The personal details of the person who is logged in */
-    personalDetails: OnyxEntry<PersonalDetailsList>;
-
-    /** Session info for the currently logged in user. */
-    session: OnyxEntry<Session>;
-};
-
-type DetailsPageProps = DetailsPageOnyxProps & StackScreenProps<DetailsNavigatorParamList, typeof SCREENS.DETAILS_ROOT>;
-
-/**
- * Gets the phone number to display for SMS logins
- */
-const getPhoneNumber = ({login = '', displayName = ''}: PersonalDetails): string | undefined => {
-    // If the user hasn't set a displayName, it is set to their phone number, so use that
-    const parsedPhoneNumber = parsePhoneNumber(displayName);
-    if (parsedPhoneNumber.possible) {
-        return parsedPhoneNumber?.number?.e164;
-    }
-
-    // If the user has set a displayName, get the phone number from the SMS login
-    return login ? Str.removeSMSDomain(login) : '';
-};
-
-function DetailsPage({personalDetails, route, session}: DetailsPageProps) {
-    const styles = useThemeStyles();
-    const {translate, formatPhoneNumber} = useLocalize();
-    const login = route.params?.login ?? '';
-    const sessionAccountID = session?.accountID ?? 0;
-
-    let details = Object.values(personalDetails ?? {}).find((personalDetail) => personalDetail?.login === login.toLowerCase());
-
-    if (!details) {
-        const optimisticAccountID = UserUtils.generateAccountID(login);
-        details = {
-            accountID: optimisticAccountID,
-            login,
-            displayName: login,
-            avatar: UserUtils.getDefaultAvatar(optimisticAccountID),
-        };
-    }
-
-    const isSMSLogin = details.login ? Str.isSMSLogin(details.login) : false;
-
-    const shouldShowLocalTime = !ReportUtils.hasAutomatedExpensifyAccountIDs([details.accountID]) && details.timezone;
-    let pronouns = details.pronouns;
-
-    if (pronouns && pronouns.startsWith(CONST.PRONOUNS.PREFIX)) {
-        const localeKey = pronouns.replace(CONST.PRONOUNS.PREFIX, '');
-        pronouns = translate(`pronouns.${localeKey}` as TranslationPaths);
-    }
-
-    const phoneNumber = getPhoneNumber(details);
-    const phoneOrEmail = isSMSLogin ? getPhoneNumber(details) : details.login;
-    const displayName = PersonalDetailsUtils.getDisplayNameOrDefault(details, '', false);
-
-    const isCurrentUser = sessionAccountID === details.accountID;
-
-    return (
-        <ScreenWrapper testID={DetailsPage.displayName}>
-            <FullPageNotFoundView shouldShow={!login || CONST.RESTRICTED_EMAILS.includes(login)}>
-                <HeaderWithBackButton title={translate('common.details')} />
-                <View style={[styles.containerWithSpaceBetween, styles.pointerEventsBoxNone]}>
-                    {details ? (
-                        <ScrollView>
-                            <View style={styles.avatarSectionWrapper}>
-                                <AttachmentModal
-                                    headerTitle={displayName}
-                                    source={UserUtils.getFullSizeAvatar(details?.avatar, details.accountID)}
-                                    originalFileName={details.originalFileName}
-                                    maybeIcon
-                                >
-                                    {({show}) => (
-                                        <PressableWithoutFocus
-                                            style={styles.noOutline}
-                                            onPress={show}
-                                            accessibilityLabel={translate('common.details')}
-                                            accessibilityRole={CONST.ACCESSIBILITY_ROLE.IMAGEBUTTON}
-                                        >
-                                            <OfflineWithFeedback pendingAction={details?.pendingFields?.avatar}>
-                                                <Avatar
-                                                    containerStyles={[styles.avatarLarge, styles.mb3]}
-                                                    imageStyles={[styles.avatarLarge]}
-                                                    source={UserUtils.getAvatar(details?.avatar, details?.accountID)}
-                                                    size={CONST.AVATAR_SIZE.LARGE}
-                                                    fallbackIcon={details?.fallbackIcon}
-                                                />
-                                            </OfflineWithFeedback>
-                                        </PressableWithoutFocus>
-                                    )}
-                                </AttachmentModal>
-                                {Boolean(displayName) && (
-                                    <Text
-                                        style={[styles.textHeadline, styles.mb6, styles.pre]}
-                                        numberOfLines={1}
-                                    >
-                                        {displayName}
-                                    </Text>
-                                )}
-                                {details.login ? (
-                                    <View style={[styles.mb6, styles.detailsPageSectionContainer, styles.w100]}>
-                                        <Text
-                                            style={[styles.textLabelSupporting, styles.mb1]}
-                                            numberOfLines={1}
-                                        >
-                                            {translate(isSMSLogin ? 'common.phoneNumber' : 'common.email')}
-                                        </Text>
-                                        <CommunicationsLink value={phoneOrEmail ?? ''}>
-                                            <UserDetailsTooltip accountID={details.accountID}>
-                                                <Text numberOfLines={1}>{isSMSLogin ? formatPhoneNumber(phoneNumber ?? '') : details.login}</Text>
-                                            </UserDetailsTooltip>
-                                        </CommunicationsLink>
-                                    </View>
-                                ) : null}
-                                {pronouns ? (
-                                    <View style={[styles.mb6, styles.detailsPageSectionContainer]}>
-                                        <Text
-                                            style={[styles.textLabelSupporting, styles.mb1]}
-                                            numberOfLines={1}
-                                        >
-                                            {translate('profilePage.preferredPronouns')}
-                                        </Text>
-                                        <Text numberOfLines={1}>{pronouns}</Text>
-                                    </View>
-                                ) : null}
-                                {shouldShowLocalTime && <AutoUpdateTime timezone={details?.timezone ?? {}} />}
-                            </View>
-                            {!isCurrentUser && (
-                                <MenuItem
-                                    title={`${translate('common.message')}${displayName}`}
-                                    titleStyle={styles.flex1}
-                                    icon={Expensicons.ChatBubble}
-                                    onPress={() => Report.navigateToAndOpenReport([login])}
-                                    wrapperStyle={styles.breakAll}
-                                    shouldShowRightIcon
-                                />
-                            )}
-                        </ScrollView>
-                    ) : null}
-                </View>
-            </FullPageNotFoundView>
-        </ScreenWrapper>
-    );
-}
-
-DetailsPage.displayName = 'DetailsPage';
-
-export default withOnyx<DetailsPageProps, DetailsPageOnyxProps>({
-    personalDetails: {
-        key: ONYXKEYS.PERSONAL_DETAILS_LIST,
-    },
-    session: {
-        key: ONYXKEYS.SESSION,
-    },
-})(DetailsPage);
diff --git a/src/pages/EditReportFieldDate.tsx b/src/pages/EditReportFieldDate.tsx
index e7021f9123d6..06ba24f780ec 100644
--- a/src/pages/EditReportFieldDate.tsx
+++ b/src/pages/EditReportFieldDate.tsx
@@ -24,7 +24,7 @@ type EditReportFieldDatePageProps = {
     isRequired: boolean;
 
     /** Callback to fire when the Save button is pressed  */
-    onSubmit: (form: FormOnyxValues<typeof ONYXKEYS.FORMS.REPORT_FIELD_EDIT_FORM>) => void;
+    onSubmit: (form: FormOnyxValues<typeof ONYXKEYS.FORMS.REPORT_FIELDS_EDIT_FORM>) => void;
 };
 
 function EditReportFieldDatePage({fieldName, isRequired, onSubmit, fieldValue, fieldKey}: EditReportFieldDatePageProps) {
@@ -33,20 +33,20 @@ function EditReportFieldDatePage({fieldName, isRequired, onSubmit, fieldValue, f
     const inputRef = useRef<AnimatedTextInputRef>(null);
 
     const validate = useCallback(
-        (value: FormOnyxValues<typeof ONYXKEYS.FORMS.REPORT_FIELD_EDIT_FORM>) => {
-            const errors: FormInputErrors<typeof ONYXKEYS.FORMS.REPORT_FIELD_EDIT_FORM> = {};
+        (value: FormOnyxValues<typeof ONYXKEYS.FORMS.REPORT_FIELDS_EDIT_FORM>) => {
+            const errors: FormInputErrors<typeof ONYXKEYS.FORMS.REPORT_FIELDS_EDIT_FORM> = {};
             if (isRequired && value[fieldKey].trim() === '') {
-                errors[fieldKey] = 'common.error.fieldRequired';
+                errors[fieldKey] = translate('common.error.fieldRequired');
             }
             return errors;
         },
-        [fieldKey, isRequired],
+        [fieldKey, isRequired, translate],
     );
 
     return (
         <FormProvider
             style={[styles.flexGrow1, styles.ph5]}
-            formID={ONYXKEYS.FORMS.REPORT_FIELD_EDIT_FORM}
+            formID={ONYXKEYS.FORMS.REPORT_FIELDS_EDIT_FORM}
             onSubmit={onSubmit}
             validate={validate}
             submitButtonText={translate('common.save')}
diff --git a/src/pages/EditReportFieldDropdown.tsx b/src/pages/EditReportFieldDropdown.tsx
index 225051238e2b..ba6828eca782 100644
--- a/src/pages/EditReportFieldDropdown.tsx
+++ b/src/pages/EditReportFieldDropdown.tsx
@@ -9,7 +9,9 @@ import type {ListItem} from '@components/SelectionList/types';
 import useDebouncedState from '@hooks/useDebouncedState';
 import useLocalize from '@hooks/useLocalize';
 import useTheme from '@hooks/useTheme';
+import localeCompare from '@libs/LocaleCompare';
 import * as OptionsListUtils from '@libs/OptionsListUtils';
+import CONST from '@src/CONST';
 import ONYXKEYS from '@src/ONYXKEYS';
 import type {RecentlyUsedReportFields} from '@src/types/onyx';
 
@@ -41,7 +43,7 @@ function EditReportFieldDropdownPage({onSubmit, fieldKey, fieldValue, fieldOptio
     const [searchValue, debouncedSearchValue, setSearchValue] = useDebouncedState('');
     const theme = useTheme();
     const {translate} = useLocalize();
-    const recentlyUsedOptions = useMemo(() => recentlyUsedReportFields?.[fieldKey] ?? [], [recentlyUsedReportFields, fieldKey]);
+    const recentlyUsedOptions = useMemo(() => recentlyUsedReportFields?.[fieldKey]?.sort(localeCompare) ?? [], [recentlyUsedReportFields, fieldKey]);
 
     const itemRightSideComponent = useCallback(
         (item: ListItem) => {
@@ -60,7 +62,7 @@ function EditReportFieldDropdownPage({onSubmit, fieldKey, fieldValue, fieldOptio
     );
 
     const [sections, headerMessage] = useMemo(() => {
-        const validFieldOptions = fieldOptions?.filter((option) => !!option);
+        const validFieldOptions = fieldOptions?.filter((option) => !!option)?.sort(localeCompare);
 
         const {policyReportFieldOptions} = OptionsListUtils.getFilteredOptions(
             [],
@@ -86,6 +88,7 @@ function EditReportFieldDropdownPage({onSubmit, fieldKey, fieldValue, fieldOptio
             false,
             false,
             undefined,
+            CONST.IOU.MAX_RECENT_REPORTS_TO_SHOW,
             undefined,
             undefined,
             true,
diff --git a/src/pages/EditReportFieldPage.tsx b/src/pages/EditReportFieldPage.tsx
index 6cc93d05ebbc..9922eeb2a430 100644
--- a/src/pages/EditReportFieldPage.tsx
+++ b/src/pages/EditReportFieldPage.tsx
@@ -1,4 +1,4 @@
-import Str from 'expensify-common/lib/str';
+import {Str} from 'expensify-common';
 import React, {useState} from 'react';
 import {withOnyx} from 'react-native-onyx';
 import type {OnyxEntry} from 'react-native-onyx';
@@ -12,6 +12,7 @@ import ScreenWrapper from '@components/ScreenWrapper';
 import useLocalize from '@hooks/useLocalize';
 import useThemeStyles from '@hooks/useThemeStyles';
 import useWindowDimensions from '@hooks/useWindowDimensions';
+import isSearchTopmostCentralPane from '@libs/Navigation/isSearchTopmostCentralPane';
 import Navigation from '@libs/Navigation/Navigation';
 import * as ReportUtils from '@libs/ReportUtils';
 import * as ReportActions from '@src/libs/actions/Report';
@@ -51,11 +52,13 @@ function EditReportFieldPage({route, policy, report}: EditReportFieldPageProps)
     const styles = useThemeStyles();
     const fieldKey = ReportUtils.getReportFieldKey(route.params.fieldID);
     const reportField = report?.fieldList?.[fieldKey] ?? policy?.fieldList?.[fieldKey];
-    const isDisabled = ReportUtils.isReportFieldDisabled(report, reportField ?? null, policy);
+    const isDisabled = ReportUtils.isReportFieldDisabled(report, reportField, policy);
     const [isDeleteModalVisible, setIsDeleteModalVisible] = useState(false);
     const {translate} = useLocalize();
+    const isReportFieldTitle = ReportUtils.isReportFieldOfTypeTitle(reportField);
+    const reportFieldsEnabled = (ReportUtils.isPaidGroupPolicyExpenseReport(report) && !!policy?.areReportFieldsEnabled) || isReportFieldTitle;
 
-    if (!reportField || !report || isDisabled) {
+    if (!reportFieldsEnabled || !reportField || !report || isDisabled) {
         return (
             <ScreenWrapper
                 includeSafeAreaPaddingBottom={false}
@@ -71,22 +74,21 @@ function EditReportFieldPage({route, policy, report}: EditReportFieldPageProps)
         );
     }
 
-    const isReportFieldTitle = ReportUtils.isReportFieldOfTypeTitle(reportField);
-
-    const handleReportFieldChange = (form: FormOnyxValues<typeof ONYXKEYS.FORMS.REPORT_FIELD_EDIT_FORM>) => {
+    const handleReportFieldChange = (form: FormOnyxValues<typeof ONYXKEYS.FORMS.REPORT_FIELDS_EDIT_FORM>) => {
         const value = form[fieldKey];
         if (isReportFieldTitle) {
             ReportActions.updateReportName(report.reportID, value, report.reportName ?? '');
+            Navigation.goBack();
         } else {
             ReportActions.updateReportField(report.reportID, {...reportField, value: value === '' ? null : value}, reportField);
+            Navigation.dismissModal(isSearchTopmostCentralPane() ? undefined : report?.reportID);
         }
-
-        Navigation.dismissModal(report?.reportID);
     };
 
     const handleReportFieldDelete = () => {
         ReportActions.deleteReportField(report.reportID, reportField);
-        Navigation.dismissModal(report?.reportID);
+        setIsDeleteModalVisible(false);
+        Navigation.dismissModal(isSearchTopmostCentralPane() ? undefined : report?.reportID);
     };
 
     const fieldValue = isReportFieldTitle ? report.reportName ?? '' : reportField.value ?? reportField.defaultValue;
@@ -123,6 +125,7 @@ function EditReportFieldPage({route, policy, report}: EditReportFieldPageProps)
                 confirmText={translate('common.delete')}
                 cancelText={translate('common.cancel')}
                 danger
+                shouldEnableNewFocusManagement
             />
 
             {(reportField.type === 'text' || isReportFieldTitle) && (
@@ -130,7 +133,7 @@ function EditReportFieldPage({route, policy, report}: EditReportFieldPageProps)
                     fieldName={Str.UCFirst(reportField.name)}
                     fieldKey={fieldKey}
                     fieldValue={fieldValue}
-                    isRequired={!reportField.deletable}
+                    isRequired={!isReportFieldDeletable}
                     onSubmit={handleReportFieldChange}
                 />
             )}
@@ -147,7 +150,7 @@ function EditReportFieldPage({route, policy, report}: EditReportFieldPageProps)
 
             {reportField.type === 'dropdown' && (
                 <EditReportFieldDropdown
-                    policyID={report.policyID ?? ''}
+                    policyID={report.policyID ?? '-1'}
                     fieldKey={fieldKey}
                     fieldValue={fieldValue}
                     fieldOptions={reportField.values.filter((_value: string, index: number) => !reportField.disabledOptions[index])}
diff --git a/src/pages/EditReportFieldText.tsx b/src/pages/EditReportFieldText.tsx
index 0649d59cd2ee..b855acf3e1c0 100644
--- a/src/pages/EditReportFieldText.tsx
+++ b/src/pages/EditReportFieldText.tsx
@@ -24,7 +24,7 @@ type EditReportFieldTextPageProps = {
     isRequired: boolean;
 
     /** Callback to fire when the Save button is pressed  */
-    onSubmit: (form: FormOnyxValues<typeof ONYXKEYS.FORMS.REPORT_FIELD_EDIT_FORM>) => void;
+    onSubmit: (form: FormOnyxValues<typeof ONYXKEYS.FORMS.REPORT_FIELDS_EDIT_FORM>) => void;
 };
 
 function EditReportFieldTextPage({fieldName, onSubmit, fieldValue, isRequired, fieldKey}: EditReportFieldTextPageProps) {
@@ -33,20 +33,20 @@ function EditReportFieldTextPage({fieldName, onSubmit, fieldValue, isRequired, f
     const {inputCallbackRef} = useAutoFocusInput();
 
     const validate = useCallback(
-        (values: FormOnyxValues<typeof ONYXKEYS.FORMS.REPORT_FIELD_EDIT_FORM>) => {
-            const errors: FormInputErrors<typeof ONYXKEYS.FORMS.REPORT_FIELD_EDIT_FORM> = {};
+        (values: FormOnyxValues<typeof ONYXKEYS.FORMS.REPORT_FIELDS_EDIT_FORM>) => {
+            const errors: FormInputErrors<typeof ONYXKEYS.FORMS.REPORT_FIELDS_EDIT_FORM> = {};
             if (isRequired && values[fieldKey].trim() === '') {
-                errors[fieldKey] = 'common.error.fieldRequired';
+                errors[fieldKey] = translate('common.error.fieldRequired');
             }
             return errors;
         },
-        [fieldKey, isRequired],
+        [fieldKey, isRequired, translate],
     );
 
     return (
         <FormProvider
             style={[styles.flexGrow1, styles.ph5]}
-            formID={ONYXKEYS.FORMS.REPORT_FIELD_EDIT_FORM}
+            formID={ONYXKEYS.FORMS.REPORT_FIELDS_EDIT_FORM}
             onSubmit={onSubmit}
             validate={validate}
             submitButtonText={translate('common.save')}
diff --git a/src/pages/EnablePayments/ActivateStep.tsx b/src/pages/EnablePayments/ActivateStep.tsx
index e0bea7488140..41a9bce2a0cc 100644
--- a/src/pages/EnablePayments/ActivateStep.tsx
+++ b/src/pages/EnablePayments/ActivateStep.tsx
@@ -39,7 +39,7 @@ function ActivateStep({userWallet, walletTerms}: ActivateStepProps) {
         <>
             <HeaderWithBackButton title={translate('activateStep.headerTitle')} />
             <ConfirmationPage
-                animation={animation}
+                illustration={animation}
                 heading={translate(`activateStep.${isActivatedWallet ? 'activated' : 'checkBackLater'}Title`)}
                 description={translate(`activateStep.${isActivatedWallet ? 'activated' : 'checkBackLater'}Message`)}
                 shouldShowButton={isActivatedWallet}
diff --git a/src/pages/EnablePayments/AddBankAccount/AddBankAccount.tsx b/src/pages/EnablePayments/AddBankAccount/AddBankAccount.tsx
index 79c91af178c3..a274990ea6a7 100644
--- a/src/pages/EnablePayments/AddBankAccount/AddBankAccount.tsx
+++ b/src/pages/EnablePayments/AddBankAccount/AddBankAccount.tsx
@@ -1,4 +1,4 @@
-import React, {useCallback, useEffect} from 'react';
+import React, {useCallback} from 'react';
 import {View} from 'react-native';
 import {withOnyx} from 'react-native-onyx';
 import type {OnyxEntry} from 'react-native-onyx';
@@ -12,6 +12,7 @@ import useThemeStyles from '@hooks/useThemeStyles';
 import Navigation from '@navigation/Navigation';
 import * as BankAccounts from '@userActions/BankAccounts';
 import * as PaymentMethods from '@userActions/PaymentMethods';
+import * as Wallet from '@userActions/Wallet';
 import CONST from '@src/CONST';
 import ONYXKEYS from '@src/ONYXKEYS';
 import ROUTES from '@src/ROUTES';
@@ -44,7 +45,6 @@ function AddBankAccount({personalBankAccount, plaidData, personalBankAccountDraf
 
         if (selectedPlaidBankAccount) {
             BankAccounts.addPersonalBankAccount(selectedPlaidBankAccount);
-            Navigation.navigate(ROUTES.SETTINGS_ENABLE_PAYMENTS);
         }
     }, [personalBankAccountDraft?.plaidAccountID, plaidData?.bankAccounts]);
 
@@ -54,7 +54,6 @@ function AddBankAccount({personalBankAccount, plaidData, personalBankAccountDraf
 
     const exitFlow = (shouldContinue = false) => {
         const exitReportID = personalBankAccount?.exitReportID;
-        // TODO: https://github.com/Expensify/App/issues/36648 This should be updated to the correct route once the refactor is complete
         const onSuccessFallbackRoute = personalBankAccount?.onSuccessFallbackRoute ?? '';
 
         if (exitReportID) {
@@ -75,18 +74,19 @@ function AddBankAccount({personalBankAccount, plaidData, personalBankAccountDraf
         }
         if (screenIndex === 0) {
             BankAccounts.clearPersonalBankAccount();
+            Wallet.updateCurrentStep(null);
+            Navigation.goBack(ROUTES.SETTINGS_WALLET);
             return;
         }
         prevScreen();
     };
 
-    useEffect(() => BankAccounts.clearPersonalBankAccount, []);
-
     return (
         <ScreenWrapper
             testID={AddBankAccount.displayName}
             includeSafeAreaPaddingBottom={false}
             shouldEnablePickerAvoiding={false}
+            shouldShowOfflineIndicator
         >
             <HeaderWithBackButton
                 shouldShowBackButton
diff --git a/src/pages/EnablePayments/AddBankAccount/SetupMethod.tsx b/src/pages/EnablePayments/AddBankAccount/SetupMethod.tsx
index e70d5979e92e..ed06d1aa1ed6 100644
--- a/src/pages/EnablePayments/AddBankAccount/SetupMethod.tsx
+++ b/src/pages/EnablePayments/AddBankAccount/SetupMethod.tsx
@@ -12,7 +12,7 @@ import useLocalize from '@hooks/useLocalize';
 import useThemeStyles from '@hooks/useThemeStyles';
 import getPlaidDesktopMessage from '@libs/getPlaidDesktopMessage';
 import * as BankAccounts from '@userActions/BankAccounts';
-import CONFIG from '@src/CONFIG';
+import * as Link from '@userActions/Link';
 import ONYXKEYS from '@src/ONYXKEYS';
 import ROUTES from '@src/ROUTES';
 import type {User} from '@src/types/onyx';
@@ -28,7 +28,6 @@ type SetupMethodOnyxProps = {
 type SetupMethodProps = SetupMethodOnyxProps;
 
 const plaidDesktopMessage = getPlaidDesktopMessage();
-const bankAccountRoute = `${CONFIG.EXPENSIFY.NEW_EXPENSIFY_URL}${ROUTES.SETTINGS_ADD_BANK_ACCOUNT_REFACTOR}`;
 
 function SetupMethod({isPlaidDisabled, user}: SetupMethodProps) {
     const styles = useThemeStyles();
@@ -46,14 +45,14 @@ function SetupMethod({isPlaidDisabled, user}: SetupMethodProps) {
                 </View>
                 {!!plaidDesktopMessage && (
                     <View style={[styles.mv3, styles.flexRow, styles.justifyContentBetween]}>
-                        <TextLink href={bankAccountRoute}>{translate(plaidDesktopMessage)}</TextLink>
+                        <TextLink onPress={() => Link.openExternalLinkWithToken(ROUTES.SETTINGS_ENABLE_PAYMENTS)}>{translate(plaidDesktopMessage)}</TextLink>
                     </View>
                 )}
                 <Button
                     icon={Expensicons.Bank}
                     text={translate('bankAccount.addBankAccount')}
-                    onPress={() => BankAccounts.openPersonalBankAccountSetupViewRefactor()}
-                    isDisabled={isPlaidDisabled ?? !user?.validated}
+                    onPress={() => BankAccounts.openPersonalBankAccountSetupWithPlaid()}
+                    isDisabled={!!isPlaidDisabled || !user?.validated}
                     style={[styles.mt4, styles.mb2]}
                     iconStyles={styles.buttonCTAIcon}
                     shouldShowRightIcon
diff --git a/src/pages/EnablePayments/AddBankAccount/substeps/ConfirmationStep.tsx b/src/pages/EnablePayments/AddBankAccount/substeps/ConfirmationStep.tsx
index f274c0646c1a..b8bf26edcad8 100644
--- a/src/pages/EnablePayments/AddBankAccount/substeps/ConfirmationStep.tsx
+++ b/src/pages/EnablePayments/AddBankAccount/substeps/ConfirmationStep.tsx
@@ -16,17 +16,14 @@ import CONST from '@src/CONST';
 import ONYXKEYS from '@src/ONYXKEYS';
 import type {PersonalBankAccountForm} from '@src/types/form';
 import INPUT_IDS from '@src/types/form/PersonalBankAccountForm';
-import type {PlaidData, UserWallet} from '@src/types/onyx';
+import type {PersonalBankAccount} from '@src/types/onyx';
 
 type ConfirmationOnyxProps = {
     /** The draft values of the bank account being setup */
     personalBankAccountDraft: OnyxEntry<PersonalBankAccountForm>;
 
-    /** Contains plaid data */
-    plaidData: OnyxEntry<PlaidData>;
-
-    /** The user's wallet */
-    userWallet: OnyxEntry<UserWallet>;
+    /** The user's bank account */
+    personalBankAccount: OnyxEntry<PersonalBankAccount>;
 };
 
 type ConfirmationStepProps = ConfirmationOnyxProps & SubStepProps;
@@ -34,13 +31,13 @@ type ConfirmationStepProps = ConfirmationOnyxProps & SubStepProps;
 const BANK_INFO_STEP_KEYS = INPUT_IDS.BANK_INFO_STEP;
 const BANK_INFO_STEP_INDEXES = CONST.WALLET.SUBSTEP_INDEXES.BANK_ACCOUNT;
 
-function ConfirmationStep({personalBankAccountDraft, plaidData, onNext, onMove, userWallet}: ConfirmationStepProps) {
+function ConfirmationStep({personalBankAccount, personalBankAccountDraft, onNext, onMove}: ConfirmationStepProps) {
     const {translate} = useLocalize();
     const styles = useThemeStyles();
     const {isOffline} = useNetwork();
 
-    const isLoading = plaidData?.isLoading ?? false;
-    const error = ErrorUtils.getLatestErrorMessage(userWallet ?? {});
+    const isLoading = personalBankAccount?.isLoading ?? false;
+    const error = ErrorUtils.getLatestErrorMessage(personalBankAccount ?? {});
 
     const handleModifyAccountNumbers = () => {
         onMove(BANK_INFO_STEP_INDEXES.ACCOUNT_NUMBERS);
@@ -84,12 +81,13 @@ function ConfirmationStep({personalBankAccountDraft, plaidData, onNext, onMove,
 ConfirmationStep.displayName = 'ConfirmationStep';
 
 export default withOnyx<ConfirmationStepProps, ConfirmationOnyxProps>({
-    plaidData: {
-        key: ONYXKEYS.PLAID_DATA,
-    },
     personalBankAccountDraft: {
         key: ONYXKEYS.FORMS.PERSONAL_BANK_ACCOUNT_FORM_DRAFT,
     },
+    // @ts-expect-error: ONYXKEYS.PERSONAL_BANK_ACCOUNT is conflicting with ONYXKEYS.FORMS.PERSONAL_BANK_ACCOUNT_FORM
+    personalBankAccount: {
+        key: ONYXKEYS.PERSONAL_BANK_ACCOUNT,
+    },
     userWallet: {
         key: ONYXKEYS.USER_WALLET,
     },
diff --git a/src/pages/EnablePayments/AdditionalDetailsStep.tsx b/src/pages/EnablePayments/AdditionalDetailsStep.tsx
index 867bbadf9ea7..cc41738fa581 100644
--- a/src/pages/EnablePayments/AdditionalDetailsStep.tsx
+++ b/src/pages/EnablePayments/AdditionalDetailsStep.tsx
@@ -76,32 +76,32 @@ function AdditionalDetailsStep({walletAdditionalDetails = DEFAULT_WALLET_ADDITIO
 
         if (values.dob) {
             if (!ValidationUtils.isValidPastDate(values.dob) || !ValidationUtils.meetsMaximumAgeRequirement(values.dob)) {
-                errors.dob = 'bankAccount.error.dob';
+                errors.dob = translate('bankAccount.error.dob');
             } else if (!ValidationUtils.meetsMinimumAgeRequirement(values.dob)) {
-                errors.dob = 'bankAccount.error.age';
+                errors.dob = translate('bankAccount.error.age');
             }
         }
 
         if (values.addressStreet && !ValidationUtils.isValidAddress(values.addressStreet)) {
-            errors.addressStreet = 'bankAccount.error.addressStreet';
+            errors.addressStreet = translate('bankAccount.error.addressStreet');
         }
 
         if (values.addressZipCode && !ValidationUtils.isValidZipCode(values.addressZipCode)) {
-            errors.addressZipCode = 'bankAccount.error.zipCode';
+            errors.addressZipCode = translate('bankAccount.error.zipCode');
         }
 
         if (values.phoneNumber && !ValidationUtils.isValidUSPhone(values.phoneNumber, true)) {
-            errors.phoneNumber = 'bankAccount.error.phoneNumber';
+            errors.phoneNumber = translate('bankAccount.error.phoneNumber');
         }
 
         // walletAdditionalDetails stores errors returned by the server. If the server returns an SSN error
         // then the user needs to provide the full 9 digit SSN.
         if (walletAdditionalDetails?.errorCode === CONST.WALLET.ERROR.SSN) {
             if (values.ssn && !ValidationUtils.isValidSSNFullNine(values.ssn)) {
-                errors.ssn = 'additionalDetailsStep.ssnFull9Error';
+                errors.ssn = translate('additionalDetailsStep.ssnFull9Error');
             }
         } else if (values.ssn && !ValidationUtils.isValidSSNLastFour(values.ssn)) {
-            errors.ssn = 'bankAccount.error.ssnLast4';
+            errors.ssn = translate('bankAccount.error.ssnLast4');
         }
 
         return errors;
@@ -206,8 +206,7 @@ function AdditionalDetailsStep({walletAdditionalDetails = DEFAULT_WALLET_ADDITIO
                         placeholder={translate('common.phoneNumberPlaceholder')}
                         shouldSaveDraft
                     />
-                    {/* @ts-expect-error TODO: Remove this once DatePicker (https://github.com/Expensify/App/issues/25148) is migrated to TypeScript. */}
-                    <InputWrapper<unknown>
+                    <InputWrapper
                         InputComponent={DatePicker}
                         inputID="dob"
                         containerStyles={[styles.mt4]}
diff --git a/src/pages/EnablePayments/EnablePayments.tsx b/src/pages/EnablePayments/EnablePayments.tsx
new file mode 100644
index 000000000000..742202e43bb3
--- /dev/null
+++ b/src/pages/EnablePayments/EnablePayments.tsx
@@ -0,0 +1,75 @@
+import React, {useEffect} from 'react';
+import {useOnyx} from 'react-native-onyx';
+import FullScreenLoadingIndicator from '@components/FullscreenLoadingIndicator';
+import HeaderWithBackButton from '@components/HeaderWithBackButton';
+import ScreenWrapper from '@components/ScreenWrapper';
+import useLocalize from '@hooks/useLocalize';
+import useNetwork from '@hooks/useNetwork';
+import Navigation from '@libs/Navigation/Navigation';
+import * as Wallet from '@userActions/Wallet';
+import CONST from '@src/CONST';
+import ONYXKEYS from '@src/ONYXKEYS';
+import ROUTES from '@src/ROUTES';
+import {isEmptyObject} from '@src/types/utils/EmptyObject';
+import AddBankAccount from './AddBankAccount/AddBankAccount';
+import FailedKYC from './FailedKYC';
+import FeesAndTerms from './FeesAndTerms/FeesAndTerms';
+import PersonalInfo from './PersonalInfo/PersonalInfo';
+import VerifyIdentity from './VerifyIdentity/VerifyIdentity';
+
+function EnablePaymentsPage() {
+    const {translate} = useLocalize();
+    const {isOffline} = useNetwork();
+    const [userWallet] = useOnyx(ONYXKEYS.USER_WALLET);
+    const [bankAccountList] = useOnyx(ONYXKEYS.BANK_ACCOUNT_LIST);
+
+    useEffect(() => {
+        if (isOffline) {
+            return;
+        }
+
+        if (isEmptyObject(userWallet)) {
+            Wallet.openEnablePaymentsPage();
+        }
+    }, [isOffline, userWallet]);
+
+    if (isEmptyObject(userWallet)) {
+        return <FullScreenLoadingIndicator />;
+    }
+
+    if (userWallet?.errorCode === CONST.WALLET.ERROR.KYC) {
+        return (
+            <ScreenWrapper
+                testID={EnablePaymentsPage.displayName}
+                includeSafeAreaPaddingBottom={false}
+                shouldEnablePickerAvoiding={false}
+            >
+                <HeaderWithBackButton
+                    title={translate('personalInfoStep.personalInfo')}
+                    onBackButtonPress={() => Navigation.goBack(ROUTES.SETTINGS_WALLET)}
+                />
+                <FailedKYC />
+            </ScreenWrapper>
+        );
+    }
+
+    const currentStep = isEmptyObject(bankAccountList) ? CONST.WALLET.STEP.ADD_BANK_ACCOUNT : userWallet?.currentStep || CONST.WALLET.STEP.ADDITIONAL_DETAILS;
+
+    switch (currentStep) {
+        case CONST.WALLET.STEP.ADD_BANK_ACCOUNT:
+            return <AddBankAccount />;
+        case CONST.WALLET.STEP.ADDITIONAL_DETAILS:
+        case CONST.WALLET.STEP.ADDITIONAL_DETAILS_KBA:
+            return <PersonalInfo />;
+        case CONST.WALLET.STEP.ONFIDO:
+            return <VerifyIdentity />;
+        case CONST.WALLET.STEP.TERMS:
+            return <FeesAndTerms />;
+        default:
+            return null;
+    }
+}
+
+EnablePaymentsPage.displayName = 'EnablePaymentsPage';
+
+export default EnablePaymentsPage;
diff --git a/src/pages/EnablePayments/FeesAndTerms/FeesAndTerms.tsx b/src/pages/EnablePayments/FeesAndTerms/FeesAndTerms.tsx
new file mode 100644
index 000000000000..512abc57a990
--- /dev/null
+++ b/src/pages/EnablePayments/FeesAndTerms/FeesAndTerms.tsx
@@ -0,0 +1,74 @@
+import React from 'react';
+import {View} from 'react-native';
+import {useOnyx} from 'react-native-onyx';
+import HeaderWithBackButton from '@components/HeaderWithBackButton';
+import InteractiveStepSubHeader from '@components/InteractiveStepSubHeader';
+import ScreenWrapper from '@components/ScreenWrapper';
+import useLocalize from '@hooks/useLocalize';
+import useSubStep from '@hooks/useSubStep';
+import type {SubStepProps} from '@hooks/useSubStep/types';
+import useThemeStyles from '@hooks/useThemeStyles';
+import Navigation from '@navigation/Navigation';
+import * as BankAccounts from '@userActions/BankAccounts';
+import * as Wallet from '@userActions/Wallet';
+import CONST from '@src/CONST';
+import ONYXKEYS from '@src/ONYXKEYS';
+import ROUTES from '@src/ROUTES';
+import FeesStep from './substeps/FeesStep';
+import TermsStep from './substeps/TermsStep';
+
+const termsAndFeesSubsteps: Array<React.ComponentType<SubStepProps>> = [FeesStep, TermsStep];
+
+function FeesAndTerms() {
+    const {translate} = useLocalize();
+    const styles = useThemeStyles();
+    const [walletTerms] = useOnyx(ONYXKEYS.WALLET_TERMS);
+
+    const submit = () => {
+        BankAccounts.acceptWalletTerms({
+            hasAcceptedTerms: true,
+            reportID: walletTerms?.chatReportID ?? '',
+        });
+        BankAccounts.clearPersonalBankAccount();
+        Wallet.resetWalletAdditionalDetailsDraft();
+        Navigation.navigate(ROUTES.SETTINGS_WALLET);
+    };
+    const {componentToRender: SubStep, isEditing, screenIndex, nextScreen, prevScreen, moveTo} = useSubStep({bodyContent: termsAndFeesSubsteps, startFrom: 0, onFinished: submit});
+
+    const handleBackButtonPress = () => {
+        if (screenIndex === 0) {
+            Wallet.updateCurrentStep(CONST.WALLET.STEP.ONFIDO);
+            return;
+        }
+        prevScreen();
+    };
+
+    return (
+        <ScreenWrapper
+            testID={FeesAndTerms.displayName}
+            includeSafeAreaPaddingBottom={false}
+            shouldEnablePickerAvoiding={false}
+            shouldEnableMaxHeight
+        >
+            <HeaderWithBackButton
+                title={translate('termsStep.headerTitleRefactor')}
+                onBackButtonPress={handleBackButtonPress}
+            />
+            <View style={[styles.ph5, styles.mb5, styles.mt3, {height: CONST.BANK_ACCOUNT.STEPS_HEADER_HEIGHT}]}>
+                <InteractiveStepSubHeader
+                    startStepIndex={3}
+                    stepNames={CONST.WALLET.STEP_NAMES}
+                />
+            </View>
+            <SubStep
+                isEditing={isEditing}
+                onNext={nextScreen}
+                onMove={moveTo}
+            />
+        </ScreenWrapper>
+    );
+}
+
+FeesAndTerms.displayName = 'TermsAndFees';
+
+export default FeesAndTerms;
diff --git a/src/pages/EnablePayments/FeesAndTerms/substeps/FeesStep.tsx b/src/pages/EnablePayments/FeesAndTerms/substeps/FeesStep.tsx
new file mode 100644
index 000000000000..645abec9e750
--- /dev/null
+++ b/src/pages/EnablePayments/FeesAndTerms/substeps/FeesStep.tsx
@@ -0,0 +1,37 @@
+import React from 'react';
+import {View} from 'react-native';
+import {useOnyx} from 'react-native-onyx';
+import Button from '@components/Button';
+import ScrollView from '@components/ScrollView';
+import Text from '@components/Text';
+import useLocalize from '@hooks/useLocalize';
+import type {SubStepProps} from '@hooks/useSubStep/types';
+import useThemeStyles from '@hooks/useThemeStyles';
+import LongTermsForm from '@pages/EnablePayments/TermsPage/LongTermsForm';
+import ShortTermsForm from '@pages/EnablePayments/TermsPage/ShortTermsForm';
+import ONYXKEYS from '@src/ONYXKEYS';
+
+function FeesStep({onNext}: SubStepProps) {
+    const styles = useThemeStyles();
+    const {translate} = useLocalize();
+    const [userWallet] = useOnyx(ONYXKEYS.USER_WALLET);
+
+    return (
+        <ScrollView style={styles.flex1}>
+            <Text style={[styles.textHeadlineLineHeightXXL, styles.ph5, styles.mb3]}>{translate('termsStep.reviewTheFees')}</Text>
+            <View style={[styles.ph5]}>
+                <ShortTermsForm userWallet={userWallet} />
+                <LongTermsForm />
+                <Button
+                    success
+                    large
+                    style={[styles.w100, styles.mv5]}
+                    onPress={onNext}
+                    text={translate('common.next')}
+                />
+            </View>
+        </ScrollView>
+    );
+}
+
+export default FeesStep;
diff --git a/src/pages/EnablePayments/FeesAndTerms/substeps/TermsStep.tsx b/src/pages/EnablePayments/FeesAndTerms/substeps/TermsStep.tsx
new file mode 100644
index 000000000000..7998d9511b0d
--- /dev/null
+++ b/src/pages/EnablePayments/FeesAndTerms/substeps/TermsStep.tsx
@@ -0,0 +1,109 @@
+import React, {useEffect, useState} from 'react';
+import {View} from 'react-native';
+import {useOnyx} from 'react-native-onyx';
+import CheckboxWithLabel from '@components/CheckboxWithLabel';
+import FormAlertWithSubmitButton from '@components/FormAlertWithSubmitButton';
+import Text from '@components/Text';
+import TextLink from '@components/TextLink';
+import useLocalize from '@hooks/useLocalize';
+import type {SubStepProps} from '@hooks/useSubStep/types';
+import useThemeStyles from '@hooks/useThemeStyles';
+import * as ErrorUtils from '@libs/ErrorUtils';
+import CONST from '@src/CONST';
+import ONYXKEYS from '@src/ONYXKEYS';
+
+function HaveReadAndAgreeLabel() {
+    const {translate} = useLocalize();
+
+    return (
+        <Text>
+            {`${translate('termsStep.haveReadAndAgree')}`}
+            <TextLink href={CONST.ELECTRONIC_DISCLOSURES_URL}>{`${translate('termsStep.electronicDisclosures')}.`}</TextLink>
+        </Text>
+    );
+}
+
+function AgreeToTheLabel() {
+    const {translate} = useLocalize();
+    const [userWallet] = useOnyx(ONYXKEYS.USER_WALLET);
+
+    const walletAgreementUrl =
+        userWallet?.walletProgramID && userWallet?.walletProgramID === CONST.WALLET.BANCORP_WALLET_PROGRAM_ID ? CONST.BANCORP_WALLET_AGREEMENT_URL : CONST.WALLET_AGREEMENT_URL;
+
+    return (
+        <Text>
+            {`${translate('termsStep.agreeToThe')} `}
+            <TextLink href={CONST.PRIVACY_URL}>{`${translate('common.privacy')} `}</TextLink>
+            {`${translate('common.and')} `}
+            <TextLink href={walletAgreementUrl}>{`${translate('termsStep.walletAgreement')}.`}</TextLink>
+        </Text>
+    );
+}
+
+function TermsStep({onNext}: SubStepProps) {
+    const styles = useThemeStyles();
+    const [hasAcceptedDisclosure, setHasAcceptedDisclosure] = useState(false);
+    const [hasAcceptedPrivacyPolicyAndWalletAgreement, setHasAcceptedPrivacyPolicyAndWalletAgreement] = useState(false);
+    const [error, setError] = useState(false);
+    const {translate} = useLocalize();
+
+    const [walletTerms] = useOnyx(ONYXKEYS.WALLET_TERMS);
+
+    const errorMessage = error ? translate('common.error.acceptTerms') : ErrorUtils.getLatestErrorMessage(walletTerms ?? {}) ?? '';
+
+    const toggleDisclosure = () => {
+        setHasAcceptedDisclosure(!hasAcceptedDisclosure);
+    };
+
+    const togglePrivacyPolicy = () => {
+        setHasAcceptedPrivacyPolicyAndWalletAgreement(!hasAcceptedPrivacyPolicyAndWalletAgreement);
+    };
+
+    const submit = () => {
+        if (!hasAcceptedDisclosure || !hasAcceptedPrivacyPolicyAndWalletAgreement) {
+            setError(true);
+            return;
+        }
+        setError(false);
+        onNext();
+    };
+
+    /** clear error */
+    useEffect(() => {
+        if (!hasAcceptedDisclosure || !hasAcceptedPrivacyPolicyAndWalletAgreement) {
+            return;
+        }
+
+        setError(false);
+    }, [hasAcceptedDisclosure, hasAcceptedPrivacyPolicyAndWalletAgreement]);
+
+    return (
+        <View style={[styles.flexGrow1, styles.ph5]}>
+            <Text style={[styles.textHeadlineLineHeightXXL]}>{translate('termsStep.checkTheBoxes')}</Text>
+            <Text style={[styles.mt3, styles.mb3, styles.textSupporting]}>{translate('termsStep.agreeToTerms')}</Text>
+            <View style={styles.flex1}>
+                <CheckboxWithLabel
+                    accessibilityLabel={translate('termsStep.haveReadAndAgree')}
+                    style={[styles.mb4, styles.mt4]}
+                    onInputChange={toggleDisclosure}
+                    LabelComponent={HaveReadAndAgreeLabel}
+                />
+                <CheckboxWithLabel
+                    accessibilityLabel={translate('termsStep.agreeToThe')}
+                    onInputChange={togglePrivacyPolicy}
+                    LabelComponent={AgreeToTheLabel}
+                />
+            </View>
+            <FormAlertWithSubmitButton
+                buttonText={translate('termsStep.enablePayments')}
+                onSubmit={submit}
+                message={errorMessage}
+                isAlertVisible={error || !!errorMessage}
+                isLoading={!!walletTerms?.isLoading}
+                containerStyles={[styles.mh0, styles.mv5]}
+            />
+        </View>
+    );
+}
+
+export default TermsStep;
diff --git a/src/pages/EnablePayments/IdologyQuestions.tsx b/src/pages/EnablePayments/IdologyQuestions.tsx
index 6baea2158613..b9b0ac4eca34 100644
--- a/src/pages/EnablePayments/IdologyQuestions.tsx
+++ b/src/pages/EnablePayments/IdologyQuestions.tsx
@@ -1,18 +1,21 @@
 import React, {useState} from 'react';
 import {View} from 'react-native';
-import type {WalletAdditionalQuestionDetails} from 'src/types/onyx';
 import FormProvider from '@components/Form/FormProvider';
 import InputWrapper from '@components/Form/InputWrapper';
 import type {FormInputErrors, FormOnyxValues} from '@components/Form/types';
+import Icon from '@components/Icon';
+import * as Expensicons from '@components/Icon/Expensicons';
 import type {Choice} from '@components/RadioButtons';
 import SingleChoiceQuestion from '@components/SingleChoiceQuestion';
 import Text from '@components/Text';
 import TextLink from '@components/TextLink';
 import useLocalize from '@hooks/useLocalize';
+import useTheme from '@hooks/useTheme';
 import useThemeStyles from '@hooks/useThemeStyles';
 import * as BankAccounts from '@userActions/BankAccounts';
 import CONST from '@src/CONST';
 import ONYXKEYS from '@src/ONYXKEYS';
+import type {WalletAdditionalQuestionDetails} from '@src/types/onyx';
 import type {Errors} from '@src/types/onyx/OnyxCommon';
 
 const MAX_SKIP = 1;
@@ -34,6 +37,7 @@ type Answer = {
 
 function IdologyQuestions({questions, idNumber}: IdologyQuestionsProps) {
     const styles = useThemeStyles();
+    const theme = useTheme();
     const {translate} = useLocalize();
 
     const [currentQuestionIndex, setCurrentQuestionIndex] = useState(0);
@@ -103,13 +107,7 @@ function IdologyQuestions({questions, idNumber}: IdologyQuestionsProps) {
     return (
         <View style={styles.flex1}>
             <View style={styles.ph5}>
-                <Text style={styles.mb3}>{translate('additionalDetailsStep.helpTextIdologyQuestions')}</Text>
-                <TextLink
-                    style={styles.mb3}
-                    href={CONST.HELP_LINK_URL}
-                >
-                    {translate('additionalDetailsStep.helpLink')}
-                </TextLink>
+                <Text style={[styles.textHeadlineLineHeightXXL, styles.mb3]}>{translate('additionalDetailsStep.helpTextIdologyQuestions')}</Text>
             </View>
             <FormProvider
                 formID={ONYXKEYS.FORMS.WALLET_ADDITIONAL_DETAILS}
@@ -121,17 +119,33 @@ function IdologyQuestions({questions, idNumber}: IdologyQuestionsProps) {
                 submitButtonText={translate('common.saveAndContinue')}
                 shouldHideFixErrorsAlert
             >
-                <InputWrapper
-                    InputComponent={SingleChoiceQuestion}
-                    inputID="answer"
-                    prompt={currentQuestion.prompt}
-                    possibleAnswers={possibleAnswers}
-                    currentQuestionIndex={currentQuestionIndex}
-                    onValueChange={(value) => {
-                        chooseAnswer(String(value));
-                    }}
-                    onInputChange={() => {}}
-                />
+                <>
+                    <InputWrapper
+                        InputComponent={SingleChoiceQuestion}
+                        inputID="answer"
+                        prompt={currentQuestion.prompt}
+                        possibleAnswers={possibleAnswers}
+                        currentQuestionIndex={currentQuestionIndex}
+                        onValueChange={(value) => {
+                            chooseAnswer(String(value));
+                        }}
+                        onInputChange={() => {}}
+                    />
+                    <View style={[styles.flexRow, styles.alignItemsCenter, styles.mt6]}>
+                        <Icon
+                            src={Expensicons.QuestionMark}
+                            width={12}
+                            height={12}
+                            fill={theme.icon}
+                        />
+                        <TextLink
+                            style={[styles.textMicro, styles.ml2]}
+                            href={CONST.HELP_LINK_URL}
+                        >
+                            {translate('additionalDetailsStep.helpLink')}
+                        </TextLink>
+                    </View>
+                </>
             </FormProvider>
         </View>
     );
diff --git a/src/pages/EnablePayments/OnfidoPrivacy.tsx b/src/pages/EnablePayments/OnfidoPrivacy.tsx
index cf6e6837df16..ace91f315e32 100644
--- a/src/pages/EnablePayments/OnfidoPrivacy.tsx
+++ b/src/pages/EnablePayments/OnfidoPrivacy.tsx
@@ -72,7 +72,7 @@ function OnfidoPrivacy({walletOnfidoData = DEFAULT_WALLET_ONFIDO_DATA}: OnfidoPr
                     </FormScrollView>
                     <FixedFooter>
                         <FormAlertWithSubmitButton
-                            isAlertVisible={Boolean(onfidoError)}
+                            isAlertVisible={!!onfidoError}
                             onSubmit={openOnfidoFlow}
                             onFixTheErrorsLinkPressed={() => {
                                 formRef.current?.scrollTo({y: 0, animated: true});
diff --git a/src/pages/EnablePayments/PersonalInfo/PersonalInfo.tsx b/src/pages/EnablePayments/PersonalInfo/PersonalInfo.tsx
index c23b8bcb12fa..55d369b4a2c5 100644
--- a/src/pages/EnablePayments/PersonalInfo/PersonalInfo.tsx
+++ b/src/pages/EnablePayments/PersonalInfo/PersonalInfo.tsx
@@ -9,15 +9,13 @@ import useLocalize from '@hooks/useLocalize';
 import useSubStep from '@hooks/useSubStep';
 import type {SubStepProps} from '@hooks/useSubStep/types';
 import useThemeStyles from '@hooks/useThemeStyles';
-// TODO: uncomment after connecting steps https://github.com/Expensify/App/issues/36648
-// import {parsePhoneNumber} from '@libs/PhoneNumber';
-import Navigation from '@navigation/Navigation';
+import {parsePhoneNumber} from '@libs/PhoneNumber';
+import IdologyQuestions from '@pages/EnablePayments/IdologyQuestions';
 import getInitialSubstepForPersonalInfo from '@pages/EnablePayments/utils/getInitialSubstepForPersonalInfo';
 import getSubstepValues from '@pages/EnablePayments/utils/getSubstepValues';
 import * as Wallet from '@userActions/Wallet';
 import CONST from '@src/CONST';
 import ONYXKEYS from '@src/ONYXKEYS';
-import ROUTES from '@src/ROUTES';
 import type {WalletAdditionalDetailsForm} from '@src/types/form';
 import INPUT_IDS from '@src/types/form/WalletAdditionalDetailsForm';
 import type {WalletAdditionalDetailsRefactor} from '@src/types/onyx/WalletAdditionalDetails';
@@ -44,25 +42,23 @@ const bodyContent: Array<React.ComponentType<SubStepProps>> = [FullName, DateOfB
 function PersonalInfoPage({walletAdditionalDetails, walletAdditionalDetailsDraft}: PersonalInfoPageProps) {
     const {translate} = useLocalize();
     const styles = useThemeStyles();
+    const showIdologyQuestions = walletAdditionalDetails?.questions && walletAdditionalDetails?.questions.length > 0;
 
     const values = useMemo(() => getSubstepValues(PERSONAL_INFO_STEP_KEYS, walletAdditionalDetailsDraft, walletAdditionalDetails), [walletAdditionalDetails, walletAdditionalDetailsDraft]);
     const submit = () => {
-        // TODO: uncomment after connecting steps https://github.com/Expensify/App/issues/36648
-        // const personalDetails = {
-        //     phoneNumber: (values.phoneNumber && parsePhoneNumber(values.phoneNumber, {regionCode: CONST.COUNTRY.US}).number?.significant) ?? '',
-        //     legalFirstName: values?.[PERSONAL_INFO_STEP_KEYS.FIRST_NAME] ?? '',
-        //     legalLastName: values?.[PERSONAL_INFO_STEP_KEYS.LAST_NAME] ?? '',
-        //     addressStreet: values?.[PERSONAL_INFO_STEP_KEYS.STREET] ?? '',
-        //     addressCity: values?.[PERSONAL_INFO_STEP_KEYS.CITY] ?? '',
-        //     addressState: values?.[PERSONAL_INFO_STEP_KEYS.STATE] ?? '',
-        //     addressZip: values?.[PERSONAL_INFO_STEP_KEYS.ZIP_CODE] ?? '',
-        //     dob: values?.[PERSONAL_INFO_STEP_KEYS.DOB] ?? '',
-        //     ssn: values?.[PERSONAL_INFO_STEP_KEYS.SSN_LAST_4] ?? '',
-        // };
+        const personalDetails = {
+            phoneNumber: (values.phoneNumber && parsePhoneNumber(values.phoneNumber, {regionCode: CONST.COUNTRY.US}).number?.significant) ?? '',
+            legalFirstName: values?.[PERSONAL_INFO_STEP_KEYS.FIRST_NAME] ?? '',
+            legalLastName: values?.[PERSONAL_INFO_STEP_KEYS.LAST_NAME] ?? '',
+            addressStreet: values?.[PERSONAL_INFO_STEP_KEYS.STREET] ?? '',
+            addressCity: values?.[PERSONAL_INFO_STEP_KEYS.CITY] ?? '',
+            addressState: values?.[PERSONAL_INFO_STEP_KEYS.STATE] ?? '',
+            addressZip: values?.[PERSONAL_INFO_STEP_KEYS.ZIP_CODE] ?? '',
+            dob: values?.[PERSONAL_INFO_STEP_KEYS.DOB] ?? '',
+            ssn: values?.[PERSONAL_INFO_STEP_KEYS.SSN_LAST_4] ?? '',
+        };
         // Attempt to set the personal details
-        // Wallet.updatePersonalDetails(personalDetails);
-        Navigation.goBack(ROUTES.SETTINGS_WALLET);
-        Wallet.resetWalletAdditionalDetailsDraft();
+        Wallet.updatePersonalDetails(personalDetails);
     };
 
     const startFrom = useMemo(() => getInitialSubstepForPersonalInfo(values), [values]);
@@ -82,14 +78,16 @@ function PersonalInfoPage({walletAdditionalDetails, walletAdditionalDetailsDraft
     });
 
     const handleBackButtonPress = () => {
-        // TODO: connect to the fist step of the wallet setup https://github.com/Expensify/App/issues/36648
         if (isEditing) {
             goToTheLastStep();
             return;
         }
         if (screenIndex === 0) {
-            Navigation.goBack(ROUTES.SETTINGS_WALLET);
-            Wallet.resetWalletAdditionalDetailsDraft();
+            Wallet.updateCurrentStep(CONST.WALLET.STEP.ADD_BANK_ACCOUNT);
+            return;
+        }
+        if (showIdologyQuestions) {
+            Wallet.setAdditionalDetailsQuestions(null, '');
             return;
         }
         prevScreen();
@@ -110,11 +108,18 @@ function PersonalInfoPage({walletAdditionalDetails, walletAdditionalDetailsDraft
                     stepNames={CONST.WALLET.STEP_NAMES}
                 />
             </View>
-            <SubStep
-                isEditing={isEditing}
-                onNext={nextScreen}
-                onMove={moveTo}
-            />
+            {showIdologyQuestions ? (
+                <IdologyQuestions
+                    questions={walletAdditionalDetails?.questions ?? []}
+                    idNumber={walletAdditionalDetails?.idNumber ?? ''}
+                />
+            ) : (
+                <SubStep
+                    isEditing={isEditing}
+                    onNext={nextScreen}
+                    onMove={moveTo}
+                />
+            )}
         </ScreenWrapper>
     );
 }
diff --git a/src/pages/EnablePayments/PersonalInfo/substeps/AddressStep.tsx b/src/pages/EnablePayments/PersonalInfo/substeps/AddressStep.tsx
index ad490fa2d7c9..0f9819f31c66 100644
--- a/src/pages/EnablePayments/PersonalInfo/substeps/AddressStep.tsx
+++ b/src/pages/EnablePayments/PersonalInfo/substeps/AddressStep.tsx
@@ -1,4 +1,4 @@
-import React from 'react';
+import React, {useCallback} from 'react';
 import {View} from 'react-native';
 import {useOnyx} from 'react-native-onyx';
 import FormProvider from '@components/Form/FormProvider';
@@ -25,20 +25,6 @@ const INPUT_KEYS = {
 
 const STEP_FIELDS = [PERSONAL_INFO_STEP_KEY.STREET, PERSONAL_INFO_STEP_KEY.CITY, PERSONAL_INFO_STEP_KEY.STATE, PERSONAL_INFO_STEP_KEY.ZIP_CODE];
 
-const validate = (values: FormOnyxValues<typeof ONYXKEYS.FORMS.WALLET_ADDITIONAL_DETAILS>): FormInputErrors<typeof ONYXKEYS.FORMS.WALLET_ADDITIONAL_DETAILS> => {
-    const errors = ValidationUtils.getFieldRequiredErrors(values, STEP_FIELDS);
-
-    if (values.addressStreet && !ValidationUtils.isValidAddress(values.addressStreet)) {
-        errors.addressStreet = 'bankAccount.error.addressStreet';
-    }
-
-    if (values.addressZipCode && !ValidationUtils.isValidZipCode(values.addressZipCode)) {
-        errors.addressZipCode = 'bankAccount.error.zipCode';
-    }
-
-    return errors;
-};
-
 function AddressStep({onNext, isEditing}: SubStepProps) {
     const {translate} = useLocalize();
     const styles = useThemeStyles();
@@ -52,6 +38,23 @@ function AddressStep({onNext, isEditing}: SubStepProps) {
         zipCode: walletAdditionalDetails?.[PERSONAL_INFO_STEP_KEY.ZIP_CODE] ?? '',
     };
 
+    const validate = useCallback(
+        (values: FormOnyxValues<typeof ONYXKEYS.FORMS.WALLET_ADDITIONAL_DETAILS>): FormInputErrors<typeof ONYXKEYS.FORMS.WALLET_ADDITIONAL_DETAILS> => {
+            const errors = ValidationUtils.getFieldRequiredErrors(values, STEP_FIELDS);
+
+            if (values.addressStreet && !ValidationUtils.isValidAddress(values.addressStreet)) {
+                errors.addressStreet = translate('bankAccount.error.addressStreet');
+            }
+
+            if (values.addressZipCode && !ValidationUtils.isValidZipCode(values.addressZipCode)) {
+                errors.addressZipCode = translate('bankAccount.error.zipCode');
+            }
+
+            return errors;
+        },
+        [translate],
+    );
+
     const handleSubmit = useWalletAdditionalDetailsStepFormSubmit({
         fieldIds: STEP_FIELDS,
         onNext,
@@ -68,7 +71,7 @@ function AddressStep({onNext, isEditing}: SubStepProps) {
         >
             <View>
                 <Text style={[styles.textHeadlineLineHeightXXL, styles.mb3]}>{translate('personalInfoStep.whatsYourAddress')}</Text>
-                <Text style={[styles.textSupporting]}>{translate('common.noPO')}</Text>
+                <Text style={[styles.textSupporting]}>{translate('personalInfoStep.noPOBoxesPlease')}</Text>
                 <AddressFormFields
                     inputKeys={INPUT_KEYS}
                     streetTranslationKey="common.streetAddress"
diff --git a/src/pages/EnablePayments/PersonalInfo/substeps/ConfirmationStep.tsx b/src/pages/EnablePayments/PersonalInfo/substeps/ConfirmationStep.tsx
index b24400face07..71450b7ebf24 100644
--- a/src/pages/EnablePayments/PersonalInfo/substeps/ConfirmationStep.tsx
+++ b/src/pages/EnablePayments/PersonalInfo/substeps/ConfirmationStep.tsx
@@ -29,9 +29,10 @@ function ConfirmationStep({onNext, onMove}: SubStepProps) {
     const [walletAdditionalDetails] = useOnyx(ONYXKEYS.WALLET_ADDITIONAL_DETAILS);
     const [walletAdditionalDetailsDraft] = useOnyx(ONYXKEYS.FORMS.WALLET_ADDITIONAL_DETAILS_DRAFT);
 
-    const isLoading = walletAdditionalDetailsDraft?.isLoading ?? false;
+    const isLoading = walletAdditionalDetails?.isLoading ?? false;
     const error = ErrorUtils.getLatestErrorMessage(walletAdditionalDetails ?? {});
     const values = useMemo(() => getSubstepValues(PERSONAL_INFO_STEP_KEYS, walletAdditionalDetailsDraft, walletAdditionalDetails), [walletAdditionalDetails, walletAdditionalDetailsDraft]);
+    const shouldAskForFullSSN = walletAdditionalDetails?.errorCode === CONST.WALLET.ERROR.SSN;
 
     return (
         <SafeAreaConsumer>
@@ -76,7 +77,7 @@ function ConfirmationStep({onNext, onMove}: SubStepProps) {
                         }}
                     />
                     <MenuItemWithTopDescription
-                        description={translate('personalInfoStep.last4SSN')}
+                        description={translate(shouldAskForFullSSN ? 'common.ssnFull9' : 'personalInfoStep.last4SSN')}
                         title={values[PERSONAL_INFO_STEP_KEYS.SSN_LAST_4]}
                         shouldShowRightIcon
                         onPress={() => {
diff --git a/src/pages/EnablePayments/PersonalInfo/substeps/DateOfBirthStep.tsx b/src/pages/EnablePayments/PersonalInfo/substeps/DateOfBirthStep.tsx
index cfd0f4c5e3f7..d476fdcc5c86 100644
--- a/src/pages/EnablePayments/PersonalInfo/substeps/DateOfBirthStep.tsx
+++ b/src/pages/EnablePayments/PersonalInfo/substeps/DateOfBirthStep.tsx
@@ -1,5 +1,5 @@
 import {subYears} from 'date-fns';
-import React from 'react';
+import React, {useCallback} from 'react';
 import {useOnyx} from 'react-native-onyx';
 import DatePicker from '@components/DatePicker';
 import FormProvider from '@components/Form/FormProvider';
@@ -19,20 +19,6 @@ import INPUT_IDS from '@src/types/form/WalletAdditionalDetailsForm';
 const PERSONAL_INFO_DOB_KEY = INPUT_IDS.PERSONAL_INFO_STEP.DOB;
 const STEP_FIELDS = [PERSONAL_INFO_DOB_KEY];
 
-const validate = (values: FormOnyxValues<typeof ONYXKEYS.FORMS.WALLET_ADDITIONAL_DETAILS>): FormInputErrors<typeof ONYXKEYS.FORMS.WALLET_ADDITIONAL_DETAILS> => {
-    const errors = ValidationUtils.getFieldRequiredErrors(values, STEP_FIELDS);
-
-    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';
-        }
-    }
-
-    return errors;
-};
-
 const minDate = subYears(new Date(), CONST.DATE_BIRTH.MAX_AGE);
 const maxDate = subYears(new Date(), CONST.DATE_BIRTH.MIN_AGE_FOR_PAYMENT);
 
@@ -40,6 +26,23 @@ function DateOfBirthStep({onNext, isEditing}: SubStepProps) {
     const {translate} = useLocalize();
     const styles = useThemeStyles();
 
+    const validate = useCallback(
+        (values: FormOnyxValues<typeof ONYXKEYS.FORMS.WALLET_ADDITIONAL_DETAILS>): FormInputErrors<typeof ONYXKEYS.FORMS.WALLET_ADDITIONAL_DETAILS> => {
+            const errors = ValidationUtils.getFieldRequiredErrors(values, STEP_FIELDS);
+
+            if (values.dob) {
+                if (!ValidationUtils.isValidPastDate(values.dob) || !ValidationUtils.meetsMaximumAgeRequirement(values.dob)) {
+                    errors.dob = translate('bankAccount.error.dob');
+                } else if (!ValidationUtils.meetsMinimumAgeRequirement(values.dob)) {
+                    errors.dob = translate('bankAccount.error.age');
+                }
+            }
+
+            return errors;
+        },
+        [translate],
+    );
+
     const [walletAdditionalDetails] = useOnyx(ONYXKEYS.WALLET_ADDITIONAL_DETAILS);
 
     const dobDefaultValue = walletAdditionalDetails?.[PERSONAL_INFO_DOB_KEY] ?? walletAdditionalDetails?.[PERSONAL_INFO_DOB_KEY] ?? '';
diff --git a/src/pages/EnablePayments/PersonalInfo/substeps/FullNameStep.tsx b/src/pages/EnablePayments/PersonalInfo/substeps/FullNameStep.tsx
index f63d5ef84879..b40fb2202943 100644
--- a/src/pages/EnablePayments/PersonalInfo/substeps/FullNameStep.tsx
+++ b/src/pages/EnablePayments/PersonalInfo/substeps/FullNameStep.tsx
@@ -1,4 +1,4 @@
-import React from 'react';
+import React, {useCallback} from 'react';
 import {View} from 'react-native';
 import {useOnyx} from 'react-native-onyx';
 import FormProvider from '@components/Form/FormProvider';
@@ -19,18 +19,6 @@ import INPUT_IDS from '@src/types/form/WalletAdditionalDetailsForm';
 const PERSONAL_INFO_STEP_KEY = INPUT_IDS.PERSONAL_INFO_STEP;
 const STEP_FIELDS = [PERSONAL_INFO_STEP_KEY.FIRST_NAME, PERSONAL_INFO_STEP_KEY.LAST_NAME];
 
-const validate = (values: FormOnyxValues<typeof ONYXKEYS.FORMS.WALLET_ADDITIONAL_DETAILS>): FormInputErrors<typeof ONYXKEYS.FORMS.WALLET_ADDITIONAL_DETAILS> => {
-    const errors = ValidationUtils.getFieldRequiredErrors(values, STEP_FIELDS);
-    if (values.legalFirstName && !ValidationUtils.isValidLegalName(values.legalFirstName)) {
-        errors.legalFirstName = 'bankAccount.error.firstName';
-    }
-
-    if (values.legalLastName && !ValidationUtils.isValidLegalName(values.legalLastName)) {
-        errors.legalLastName = 'bankAccount.error.lastName';
-    }
-    return errors;
-};
-
 function FullNameStep({onNext, isEditing}: SubStepProps) {
     const {translate} = useLocalize();
     const styles = useThemeStyles();
@@ -42,6 +30,21 @@ function FullNameStep({onNext, isEditing}: SubStepProps) {
         lastName: walletAdditionalDetails?.[PERSONAL_INFO_STEP_KEY.LAST_NAME] ?? '',
     };
 
+    const validate = useCallback(
+        (values: FormOnyxValues<typeof ONYXKEYS.FORMS.WALLET_ADDITIONAL_DETAILS>): FormInputErrors<typeof ONYXKEYS.FORMS.WALLET_ADDITIONAL_DETAILS> => {
+            const errors = ValidationUtils.getFieldRequiredErrors(values, STEP_FIELDS);
+            if (values.legalFirstName && !ValidationUtils.isValidLegalName(values.legalFirstName)) {
+                errors.legalFirstName = translate('bankAccount.error.firstName');
+            }
+
+            if (values.legalLastName && !ValidationUtils.isValidLegalName(values.legalLastName)) {
+                errors.legalLastName = translate('bankAccount.error.lastName');
+            }
+            return errors;
+        },
+        [translate],
+    );
+
     const handleSubmit = useWalletAdditionalDetailsStepFormSubmit({
         fieldIds: STEP_FIELDS,
         onNext,
diff --git a/src/pages/EnablePayments/PersonalInfo/substeps/PhoneNumberStep.tsx b/src/pages/EnablePayments/PersonalInfo/substeps/PhoneNumberStep.tsx
index 86b6a40948fc..60bfa431ca78 100644
--- a/src/pages/EnablePayments/PersonalInfo/substeps/PhoneNumberStep.tsx
+++ b/src/pages/EnablePayments/PersonalInfo/substeps/PhoneNumberStep.tsx
@@ -1,4 +1,4 @@
-import React from 'react';
+import React, {useCallback} from 'react';
 import {View} from 'react-native';
 import {useOnyx} from 'react-native-onyx';
 import FormProvider from '@components/Form/FormProvider';
@@ -19,14 +19,6 @@ import INPUT_IDS from '@src/types/form/WalletAdditionalDetailsForm';
 const PERSONAL_INFO_STEP_KEY = INPUT_IDS.PERSONAL_INFO_STEP;
 const STEP_FIELDS = [PERSONAL_INFO_STEP_KEY.PHONE_NUMBER];
 
-const validate = (values: FormOnyxValues<typeof ONYXKEYS.FORMS.WALLET_ADDITIONAL_DETAILS>): FormInputErrors<typeof ONYXKEYS.FORMS.WALLET_ADDITIONAL_DETAILS> => {
-    const errors = ValidationUtils.getFieldRequiredErrors(values, STEP_FIELDS);
-
-    if (values.phoneNumber && !ValidationUtils.isValidUSPhone(values.phoneNumber, true)) {
-        errors.phoneNumber = 'bankAccount.error.phoneNumber';
-    }
-    return errors;
-};
 function PhoneNumberStep({onNext, isEditing}: SubStepProps) {
     const {translate} = useLocalize();
     const styles = useThemeStyles();
@@ -35,6 +27,18 @@ function PhoneNumberStep({onNext, isEditing}: SubStepProps) {
 
     const defaultPhoneNumber = walletAdditionalDetails?.[PERSONAL_INFO_STEP_KEY.PHONE_NUMBER] ?? '';
 
+    const validate = useCallback(
+        (values: FormOnyxValues<typeof ONYXKEYS.FORMS.WALLET_ADDITIONAL_DETAILS>): FormInputErrors<typeof ONYXKEYS.FORMS.WALLET_ADDITIONAL_DETAILS> => {
+            const errors = ValidationUtils.getFieldRequiredErrors(values, STEP_FIELDS);
+
+            if (values.phoneNumber && !ValidationUtils.isValidUSPhone(values.phoneNumber, true)) {
+                errors.phoneNumber = translate('bankAccount.error.phoneNumber');
+            }
+            return errors;
+        },
+        [translate],
+    );
+
     const handleSubmit = useWalletAdditionalDetailsStepFormSubmit({
         fieldIds: STEP_FIELDS,
         onNext,
diff --git a/src/pages/EnablePayments/PersonalInfo/substeps/SocialSecurityNumberStep.tsx b/src/pages/EnablePayments/PersonalInfo/substeps/SocialSecurityNumberStep.tsx
index 4c366c5a1873..c12f90db072e 100644
--- a/src/pages/EnablePayments/PersonalInfo/substeps/SocialSecurityNumberStep.tsx
+++ b/src/pages/EnablePayments/PersonalInfo/substeps/SocialSecurityNumberStep.tsx
@@ -1,4 +1,4 @@
-import React from 'react';
+import React, {useCallback} from 'react';
 import {View} from 'react-native';
 import {useOnyx} from 'react-native-onyx';
 import FormProvider from '@components/Form/FormProvider';
@@ -19,20 +19,29 @@ import INPUT_IDS from '@src/types/form/WalletAdditionalDetailsForm';
 const PERSONAL_INFO_STEP_KEY = INPUT_IDS.PERSONAL_INFO_STEP;
 const STEP_FIELDS = [PERSONAL_INFO_STEP_KEY.SSN_LAST_4];
 
-const validate = (values: FormOnyxValues<typeof ONYXKEYS.FORMS.WALLET_ADDITIONAL_DETAILS>): FormInputErrors<typeof ONYXKEYS.FORMS.WALLET_ADDITIONAL_DETAILS> => {
-    const errors = ValidationUtils.getFieldRequiredErrors(values, STEP_FIELDS);
-
-    if (values.ssn && !ValidationUtils.isValidSSNLastFour(values.ssn)) {
-        errors.ssn = 'bankAccount.error.ssnLast4';
-    }
-
-    return errors;
-};
 function SocialSecurityNumberStep({onNext, isEditing}: SubStepProps) {
     const {translate} = useLocalize();
     const styles = useThemeStyles();
 
     const [walletAdditionalDetails] = useOnyx(ONYXKEYS.WALLET_ADDITIONAL_DETAILS);
+    const shouldAskForFullSSN = walletAdditionalDetails?.errorCode === CONST.WALLET.ERROR.SSN;
+
+    const validate = useCallback(
+        (values: FormOnyxValues<typeof ONYXKEYS.FORMS.WALLET_ADDITIONAL_DETAILS>): FormInputErrors<typeof ONYXKEYS.FORMS.WALLET_ADDITIONAL_DETAILS> => {
+            const errors = ValidationUtils.getFieldRequiredErrors(values, STEP_FIELDS);
+
+            if (shouldAskForFullSSN) {
+                if (values.ssn && !ValidationUtils.isValidSSNFullNine(values.ssn)) {
+                    errors.ssn = translate('additionalDetailsStep.ssnFull9Error');
+                }
+            } else if (values.ssn && !ValidationUtils.isValidSSNLastFour(values.ssn)) {
+                errors.ssn = translate('bankAccount.error.ssnLast4');
+            }
+
+            return errors;
+        },
+        [translate, shouldAskForFullSSN],
+    );
 
     const defaultSsnLast4 = walletAdditionalDetails?.[PERSONAL_INFO_STEP_KEY.SSN_LAST_4] ?? '';
 
@@ -57,13 +66,13 @@ function SocialSecurityNumberStep({onNext, isEditing}: SubStepProps) {
                     <InputWrapper
                         InputComponent={TextInput}
                         inputID={PERSONAL_INFO_STEP_KEY.SSN_LAST_4}
-                        label={translate('personalInfoStep.last4SSN')}
-                        aria-label={translate('personalInfoStep.last4SSN')}
+                        label={translate(shouldAskForFullSSN ? 'common.ssnFull9' : 'personalInfoStep.last4SSN')}
+                        aria-label={translate(shouldAskForFullSSN ? 'common.ssnFull9' : 'personalInfoStep.last4SSN')}
                         role={CONST.ROLE.PRESENTATION}
                         containerStyles={[styles.mt6]}
                         inputMode={CONST.INPUT_MODE.NUMERIC}
                         defaultValue={defaultSsnLast4}
-                        maxLength={CONST.BANK_ACCOUNT.MAX_LENGTH.SSN}
+                        maxLength={shouldAskForFullSSN ? CONST.BANK_ACCOUNT.MAX_LENGTH.FULL_SSN : CONST.BANK_ACCOUNT.MAX_LENGTH.SSN}
                         shouldSaveDraft={!isEditing}
                     />
                 </View>
diff --git a/src/pages/EnablePayments/TermsPage/LongTermsForm.tsx b/src/pages/EnablePayments/TermsPage/LongTermsForm.tsx
index e1b6a0ff3365..760bd0c03b88 100644
--- a/src/pages/EnablePayments/TermsPage/LongTermsForm.tsx
+++ b/src/pages/EnablePayments/TermsPage/LongTermsForm.tsx
@@ -71,11 +71,11 @@ function LongTermsForm() {
                 <View style={[styles.longTermsRow]}>
                     <View style={[styles.flex4]}>
                         <Text>{section.title}</Text>
-                        {Boolean(section.subTitle) && <Text style={[styles.textMicroSupporting, styles.mt1]}>{section.subTitle}</Text>}
+                        {!!section.subTitle && <Text style={[styles.textMicroSupporting, styles.mt1]}>{section.subTitle}</Text>}
                     </View>
                     <View style={[styles.flex1, styles.termsCenterRight]}>
                         <Text style={[styles.textStrong, styles.textAlignRight]}>{section.rightText}</Text>
-                        {Boolean(section.subRightText) && <Text style={[styles.textMicroSupporting, styles.mt1, styles.textAlignRight]}>{section.subRightText}</Text>}
+                        {!!section.subRightText && <Text style={[styles.textMicroSupporting, styles.mt1, styles.textAlignRight]}>{section.subRightText}</Text>}
                     </View>
                 </View>
                 <Text style={[styles.textLabelSupporting, styles.mt2]}>{section.details}</Text>
diff --git a/src/pages/EnablePayments/TermsPage/ShortTermsForm.tsx b/src/pages/EnablePayments/TermsPage/ShortTermsForm.tsx
index f4db904c07f3..e324d203934b 100644
--- a/src/pages/EnablePayments/TermsPage/ShortTermsForm.tsx
+++ b/src/pages/EnablePayments/TermsPage/ShortTermsForm.tsx
@@ -19,12 +19,12 @@ function ShortTermsForm(props: ShortTermsFormProps) {
     const {translate, numberFormat} = useLocalize();
     return (
         <>
-            <Text style={styles.mb5}>
+            <Text style={[styles.mb5, styles.textSupporting]}>
                 {translate('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,
+                        props.userWallet && props.userWallet?.walletProgramID === CONST.WALLET.BANCORP_WALLET_PROGRAM_ID
+                            ? CONST.WALLET.PROGRAM_ISSUERS.BANCORP_BANK
+                            : CONST.WALLET.PROGRAM_ISSUERS.EXPENSIFY_PAYMENTS,
                 })}
             </Text>
 
@@ -32,7 +32,7 @@ function ShortTermsForm(props: ShortTermsFormProps) {
                 <View style={[styles.shortTermsRow, styles.mb4]}>
                     <View style={[styles.flex2]}>
                         <View style={[styles.flexRow, styles.mb1]}>
-                            <Text style={styles.textLarge}>{translate('termsStep.monthlyFee')}</Text>
+                            <Text style={styles.mutedNormalTextLabel}>{translate('termsStep.monthlyFee')}</Text>
                         </View>
                         <View style={styles.flexRow}>
                             <Text style={styles.shortTermsHeadline}>{CurrencyUtils.convertToDisplayString(0, 'USD')}</Text>
@@ -41,7 +41,7 @@ function ShortTermsForm(props: ShortTermsFormProps) {
                     <View style={[styles.flex2]}>
                         <View style={[styles.flex2]}>
                             <View style={[styles.flexRow, styles.mb1]}>
-                                <Text style={styles.textLarge}>{translate('termsStep.shortTermsForm.perPurchase')}</Text>
+                                <Text style={styles.mutedNormalTextLabel}>{translate('termsStep.shortTermsForm.perPurchase')}</Text>
                             </View>
                             <View style={styles.flexRow}>
                                 <Text style={styles.shortTermsHeadline}>{CurrencyUtils.convertToDisplayString(0, 'USD')}</Text>
@@ -51,27 +51,27 @@ function ShortTermsForm(props: ShortTermsFormProps) {
                 </View>
 
                 <View style={[styles.shortTermsRow, styles.mb6]}>
-                    <View style={[styles.flex2]}>
+                    <View style={styles.flex2}>
                         <View style={[styles.flexRow, styles.mb1]}>
-                            <Text style={styles.textLarge}>{translate('termsStep.shortTermsForm.atmWithdrawal')}</Text>
+                            <Text style={styles.mutedNormalTextLabel}>{translate('termsStep.shortTermsForm.atmWithdrawal')}</Text>
                         </View>
                         <View style={styles.flexRow}>
                             <Text style={styles.shortTermsHeadline}>{translate('common.na')}</Text>
                         </View>
                         <View style={styles.flexRow}>
-                            <Text style={styles.textLabelSupporting}>{translate('termsStep.shortTermsForm.inNetwork')}</Text>
+                            <Text style={styles.textMicroSupporting}>{translate('termsStep.shortTermsForm.inNetwork')}</Text>
                         </View>
                         <View style={[styles.flexRow, styles.mt4]}>
                             <Text style={styles.shortTermsHeadline}>{translate('common.na')}</Text>
                         </View>
                         <View style={styles.flexRow}>
-                            <Text style={styles.textLabelSupporting}>{translate('termsStep.shortTermsForm.outOfNetwork')}</Text>
+                            <Text style={styles.textMicroSupporting}>{translate('termsStep.shortTermsForm.outOfNetwork')}</Text>
                         </View>
                     </View>
                     <View style={[styles.flex2]}>
                         <View style={[styles.flex2]}>
                             <View style={[styles.flexRow, styles.mb1]}>
-                                <Text style={styles.textLarge}>{translate('termsStep.shortTermsForm.cashReload')}</Text>
+                                <Text style={styles.mutedNormalTextLabel}>{translate('termsStep.shortTermsForm.cashReload')}</Text>
                             </View>
                             <View style={styles.flexRow}>
                                 <Text style={styles.shortTermsHeadline}>{translate('common.na')}</Text>
diff --git a/src/pages/EnablePayments/TermsStep.tsx b/src/pages/EnablePayments/TermsStep.tsx
index 916a5200a2e0..09bf0da163bc 100644
--- a/src/pages/EnablePayments/TermsStep.tsx
+++ b/src/pages/EnablePayments/TermsStep.tsx
@@ -58,7 +58,7 @@ function TermsStep(props: TermsStepProps) {
     const [error, setError] = useState(false);
     const {translate} = useLocalize();
 
-    const errorMessage = error ? 'common.error.acceptTerms' : ErrorUtils.getLatestErrorMessage(props.walletTerms ?? {}) ?? '';
+    const errorMessage = error ? translate('common.error.acceptTerms') : ErrorUtils.getLatestErrorMessage(props.walletTerms ?? {}) ?? '';
 
     const toggleDisclosure = () => {
         setHasAcceptedDisclosure(!hasAcceptedDisclosure);
@@ -109,11 +109,11 @@ function TermsStep(props: TermsStepProps) {
                         setError(false);
                         BankAccounts.acceptWalletTerms({
                             hasAcceptedTerms: hasAcceptedDisclosure && hasAcceptedPrivacyPolicyAndWalletAgreement,
-                            reportID: props.walletTerms?.chatReportID ?? '',
+                            reportID: props.walletTerms?.chatReportID ?? '-1',
                         });
                     }}
                     message={errorMessage}
-                    isAlertVisible={error || Boolean(errorMessage)}
+                    isAlertVisible={error || !!errorMessage}
                     isLoading={!!props.walletTerms?.isLoading}
                     containerStyles={[styles.mh0, styles.mv4]}
                 />
diff --git a/src/pages/EnablePayments/VerifyIdentity/VerifyIdentity.tsx b/src/pages/EnablePayments/VerifyIdentity/VerifyIdentity.tsx
new file mode 100644
index 000000000000..5b2eb962226c
--- /dev/null
+++ b/src/pages/EnablePayments/VerifyIdentity/VerifyIdentity.tsx
@@ -0,0 +1,111 @@
+import React, {useCallback} from 'react';
+import {View} from 'react-native';
+import {useOnyx} from 'react-native-onyx';
+import FullPageOfflineBlockingView from '@components/BlockingViews/FullPageOfflineBlockingView';
+import FixedFooter from '@components/FixedFooter';
+import FormAlertWithSubmitButton from '@components/FormAlertWithSubmitButton';
+import HeaderWithBackButton from '@components/HeaderWithBackButton';
+import Icon from '@components/Icon';
+import * as Illustrations from '@components/Icon/Illustrations';
+import InteractiveStepSubHeader from '@components/InteractiveStepSubHeader';
+import Onfido from '@components/Onfido';
+import type {OnfidoData} from '@components/Onfido/types';
+import ScreenWrapper from '@components/ScreenWrapper';
+import ScrollView from '@components/ScrollView';
+import Text from '@components/Text';
+import useLocalize from '@hooks/useLocalize';
+import useThemeStyles from '@hooks/useThemeStyles';
+import * as ErrorUtils from '@libs/ErrorUtils';
+import Growl from '@libs/Growl';
+import * as BankAccounts from '@userActions/BankAccounts';
+import * as Wallet from '@userActions/Wallet';
+import CONST from '@src/CONST';
+import ONYXKEYS from '@src/ONYXKEYS';
+
+const ONFIDO_ERROR_DISPLAY_DURATION = 10000;
+
+function VerifyIdentity() {
+    const styles = useThemeStyles();
+    const {translate} = useLocalize();
+    const [walletOnfidoData] = useOnyx(ONYXKEYS.WALLET_ONFIDO, {initWithStoredValues: false});
+
+    const openOnfidoFlow = () => {
+        BankAccounts.openOnfidoFlow();
+    };
+
+    const handleOnfidoSuccess = useCallback(
+        (onfidoData: OnfidoData) => {
+            BankAccounts.verifyIdentity({
+                onfidoData: JSON.stringify({
+                    ...onfidoData,
+                    applicantID: walletOnfidoData?.applicantID,
+                }),
+            });
+            BankAccounts.updateAddPersonalBankAccountDraft({isOnfidoSetupComplete: true});
+        },
+        [walletOnfidoData?.applicantID],
+    );
+
+    const onfidoError = ErrorUtils.getLatestErrorMessage(walletOnfidoData) ?? '';
+
+    const handleOnfidoError = () => {
+        Growl.error(translate('onfidoStep.genericError'), ONFIDO_ERROR_DISPLAY_DURATION);
+    };
+
+    const goBack = () => {
+        Wallet.updateCurrentStep(CONST.WALLET.STEP.ADDITIONAL_DETAILS);
+    };
+
+    return (
+        <ScreenWrapper testID={VerifyIdentity.displayName}>
+            <HeaderWithBackButton
+                title={translate('onfidoStep.verifyIdentity')}
+                onBackButtonPress={goBack}
+            />
+            <View style={[styles.ph5, styles.mt3, {height: CONST.BANK_ACCOUNT.STEPS_HEADER_HEIGHT}]}>
+                <InteractiveStepSubHeader
+                    startStepIndex={2}
+                    stepNames={CONST.WALLET.STEP_NAMES}
+                />
+            </View>
+            <FullPageOfflineBlockingView>
+                <ScrollView contentContainerStyle={styles.flex1}>
+                    {walletOnfidoData?.hasAcceptedPrivacyPolicy ? (
+                        <Onfido
+                            sdkToken={walletOnfidoData?.sdkToken ?? ''}
+                            onUserExit={goBack}
+                            onError={handleOnfidoError}
+                            onSuccess={handleOnfidoSuccess}
+                        />
+                    ) : (
+                        <>
+                            <View style={[styles.flex1, styles.alignItemsCenter, styles.justifyContentCenter, styles.m5, styles.ph5]}>
+                                <Icon
+                                    src={Illustrations.ToddBehindCloud}
+                                    width={100}
+                                    height={100}
+                                />
+                                <Text style={[styles.textHeadline, styles.mb2]}>{translate('onfidoStep.letsVerifyIdentity')}</Text>
+                                <Text style={[styles.textAlignCenter, styles.textSupporting]}>{translate('onfidoStep.butFirst')}</Text>
+                            </View>
+                            <FixedFooter>
+                                <FormAlertWithSubmitButton
+                                    isAlertVisible={!!onfidoError}
+                                    onSubmit={openOnfidoFlow}
+                                    message={onfidoError}
+                                    isLoading={walletOnfidoData?.isLoading}
+                                    buttonText={onfidoError ? translate('onfidoStep.tryAgain') : translate('common.continue')}
+                                    containerStyles={[styles.mh0, styles.mv0, styles.mb0]}
+                                />
+                            </FixedFooter>
+                        </>
+                    )}
+                </ScrollView>
+            </FullPageOfflineBlockingView>
+        </ScreenWrapper>
+    );
+}
+
+VerifyIdentity.displayName = 'VerifyIdentity';
+
+export default VerifyIdentity;
diff --git a/src/pages/EnablePayments/utils/getSubstepValues.ts b/src/pages/EnablePayments/utils/getSubstepValues.ts
index d1fdda5fcbc1..2eb80ed1b2ee 100644
--- a/src/pages/EnablePayments/utils/getSubstepValues.ts
+++ b/src/pages/EnablePayments/utils/getSubstepValues.ts
@@ -7,14 +7,11 @@ function getSubstepValues<T extends keyof WalletAdditionalDetailsForm>(
     inputKeys: Record<string, T>,
     walletAdditionalDetailsDraft: OnyxEntry<WalletAdditionalDetailsForm>,
     walletAdditionalDetails: OnyxEntry<WalletAdditionalDetailsRefactor>,
-): {[K in T]: WalletAdditionalDetailsForm[K]} {
-    return Object.entries(inputKeys).reduce(
-        (acc, [, value]) => ({
-            ...acc,
-            [value]: walletAdditionalDetailsDraft?.[value] ?? walletAdditionalDetails?.[value as keyof PersonalInfoStepProps] ?? '',
-        }),
-        {} as {[K in T]: WalletAdditionalDetailsForm[K]},
-    );
+): {[K in T]: WalletAdditionalDetailsForm[K] | string} {
+    return Object.entries(inputKeys).reduce((acc, [, value]) => {
+        acc[value] = walletAdditionalDetailsDraft?.[value] ?? walletAdditionalDetails?.[value as keyof PersonalInfoStepProps] ?? '';
+        return acc;
+    }, {} as {[K in T]: WalletAdditionalDetailsForm[K] | string});
 }
 
 export default getSubstepValues;
diff --git a/src/pages/ErrorPage/UpdateRequiredView.tsx b/src/pages/ErrorPage/UpdateRequiredView.tsx
index 2a73215d2293..494ff4899887 100644
--- a/src/pages/ErrorPage/UpdateRequiredView.tsx
+++ b/src/pages/ErrorPage/UpdateRequiredView.tsx
@@ -7,10 +7,10 @@ import Lottie from '@components/Lottie';
 import LottieAnimations from '@components/LottieAnimations';
 import Text from '@components/Text';
 import useLocalize from '@hooks/useLocalize';
+import useResponsiveLayout from '@hooks/useResponsiveLayout';
 import useSafeAreaInsets from '@hooks/useSafeAreaInsets';
 import useStyleUtils from '@hooks/useStyleUtils';
 import useThemeStyles from '@hooks/useThemeStyles';
-import useWindowDimensions from '@hooks/useWindowDimensions';
 import * as AppUpdate from '@libs/actions/AppUpdate';
 
 function UpdateRequiredView() {
@@ -18,19 +18,19 @@ function UpdateRequiredView() {
     const styles = useThemeStyles();
     const StyleUtils = useStyleUtils();
     const {translate} = useLocalize();
-    const {isSmallScreenWidth} = useWindowDimensions();
+    const {shouldUseNarrowLayout} = useResponsiveLayout();
     return (
         <View style={[styles.appBG, styles.h100, StyleUtils.getSafeAreaPadding(insets)]}>
             <HeaderGap />
             <View style={[styles.pt5, styles.ph5, styles.updateRequiredViewHeader]}>
                 <Header title={translate('updateRequiredView.updateRequired')} />
             </View>
-            <View style={[styles.flex1, StyleUtils.getUpdateRequiredViewStyles(isSmallScreenWidth)]}>
+            <View style={[styles.flex1, StyleUtils.getUpdateRequiredViewStyles(shouldUseNarrowLayout)]}>
                 <Lottie
                     source={LottieAnimations.Update}
                     // For small screens it looks better to have the arms from the animation come in from the edges of the screen.
-                    style={isSmallScreenWidth ? styles.w100 : styles.updateAnimation}
-                    webStyle={isSmallScreenWidth ? styles.w100 : styles.updateAnimation}
+                    style={shouldUseNarrowLayout ? styles.w100 : styles.updateAnimation}
+                    webStyle={shouldUseNarrowLayout ? styles.w100 : styles.updateAnimation}
                     autoPlay
                     loop
                 />
diff --git a/src/pages/FlagCommentPage.tsx b/src/pages/FlagCommentPage.tsx
index 53aac0ce2a8b..022d590f289a 100644
--- a/src/pages/FlagCommentPage.tsx
+++ b/src/pages/FlagCommentPage.tsx
@@ -19,7 +19,6 @@ import * as ReportUtils from '@libs/ReportUtils';
 import * as Report from '@userActions/Report';
 import * as Session from '@userActions/Session';
 import CONST from '@src/CONST';
-import ROUTES from '@src/ROUTES';
 import type SCREENS from '@src/SCREENS';
 import type * as OnyxTypes from '@src/types/onyx';
 import withReportAndReportActionOrNotFound from './home/report/withReportAndReportActionOrNotFound';
@@ -134,7 +133,7 @@ function FlagCommentPage({parentReportAction, route, report, parentReport, repor
         }
 
         if (reportAction && ReportUtils.canFlagReportAction(reportAction, reportID)) {
-            Report.flagComment(reportID ?? '', reportAction, severity);
+            Report.flagComment(reportID ?? '-1', reportAction, severity);
         }
 
         Navigation.dismissModal();
@@ -160,14 +159,7 @@ function FlagCommentPage({parentReportAction, route, report, parentReport, repor
         >
             {({safeAreaPaddingBottomStyle}) => (
                 <FullPageNotFoundView shouldShow={!ReportUtils.shouldShowFlagComment(getActionToFlag(), report)}>
-                    <HeaderWithBackButton
-                        title={translate('reportActionContextMenu.flagAsOffensive')}
-                        shouldNavigateToTopMostReport
-                        onBackButtonPress={() => {
-                            Navigation.goBack();
-                            Navigation.navigate(ROUTES.REPORT_WITH_ID.getRoute(report?.reportID ?? ''));
-                        }}
-                    />
+                    <HeaderWithBackButton title={translate('reportActionContextMenu.flagAsOffensive')} />
                     <ScrollView
                         contentContainerStyle={safeAreaPaddingBottomStyle}
                         style={styles.settingsPageBackground}
diff --git a/src/pages/GetAssistancePage.tsx b/src/pages/GetAssistancePage.tsx
index 3d2aac1f7870..90b7ccbb28d8 100644
--- a/src/pages/GetAssistancePage.tsx
+++ b/src/pages/GetAssistancePage.tsx
@@ -12,6 +12,7 @@ import ScrollView from '@components/ScrollView';
 import Section from '@components/Section';
 import Text from '@components/Text';
 import useLocalize from '@hooks/useLocalize';
+import useResponsiveLayout from '@hooks/useResponsiveLayout';
 import useThemeStyles from '@hooks/useThemeStyles';
 import Navigation from '@libs/Navigation/Navigation';
 import type {SettingsNavigatorParamList} from '@libs/Navigation/types';
@@ -34,10 +35,11 @@ function GetAssistancePage({route, account}: GetAssistancePageProps) {
     const styles = useThemeStyles();
     const {translate} = useLocalize();
     const navigateBackTo = route?.params.backTo || ROUTES.SETTINGS_CONTACT_METHODS.getRoute();
+    const {isLargeScreenWidth} = useResponsiveLayout();
     const menuItems: MenuItemWithLink[] = [
         {
             title: translate('getAssistancePage.chatWithConcierge'),
-            onPress: () => Report.navigateToConciergeChat(true),
+            onPress: () => Report.navigateToConciergeChat(isLargeScreenWidth),
             icon: Expensicons.ChatBubble,
             shouldShowRightIcon: true,
             wrapperStyle: [styles.cardMenuItem],
diff --git a/src/pages/GroupChatNameEditPage.tsx b/src/pages/GroupChatNameEditPage.tsx
index 87218fbb89cd..425e8a421cb2 100644
--- a/src/pages/GroupChatNameEditPage.tsx
+++ b/src/pages/GroupChatNameEditPage.tsx
@@ -1,5 +1,6 @@
 import type {StackScreenProps} from '@react-navigation/stack';
 import React, {useCallback, useMemo} from 'react';
+import type {OnyxEntry} from 'react-native-onyx';
 import {withOnyx} from 'react-native-onyx';
 import FormProvider from '@components/Form/FormProvider';
 import InputWrapper from '@components/Form/InputWrapper';
@@ -11,42 +12,42 @@ import useAutoFocusInput from '@hooks/useAutoFocusInput';
 import useLocalize from '@hooks/useLocalize';
 import useThemeStyles from '@hooks/useThemeStyles';
 import Navigation from '@libs/Navigation/Navigation';
+import type {NewChatNavigatorParamList} from '@libs/Navigation/types';
 import * as ReportUtils from '@libs/ReportUtils';
 import * as ValidationUtils from '@libs/ValidationUtils';
-import type {NewChatNavigatorParamList} from '@navigation/types';
 import * as Report from '@userActions/Report';
 import CONST from '@src/CONST';
 import ONYXKEYS from '@src/ONYXKEYS';
 import ROUTES from '@src/ROUTES';
 import type SCREENS from '@src/SCREENS';
 import INPUT_IDS from '@src/types/form/NewChatNameForm';
+import type {Report as ReportOnyxType} from '@src/types/onyx';
 import type NewGroupChatDraft from '@src/types/onyx/NewGroupChatDraft';
 import type {Errors} from '@src/types/onyx/OnyxCommon';
 
 type GroupChatNameEditPageOnyxProps = {
-    groupChatDraft: NewGroupChatDraft | null;
+    groupChatDraft: OnyxEntry<NewGroupChatDraft>;
 };
 
-type GroupChatNameEditPageProps = StackScreenProps<NewChatNavigatorParamList, typeof SCREENS.NEW_CHAT.NEW_CHAT_EDIT_NAME> & GroupChatNameEditPageOnyxProps;
+type GroupChatNameEditPageProps = GroupChatNameEditPageOnyxProps &
+    Partial<StackScreenProps<NewChatNavigatorParamList, typeof SCREENS.NEW_CHAT.NEW_CHAT_EDIT_NAME>> & {
+        report?: ReportOnyxType;
+    };
 
-function GroupChatNameEditPage({groupChatDraft, route}: GroupChatNameEditPageProps) {
-    // If we have a reportID this means we are using this page to update an existing Group Chat name
-    const reportID = route.params?.reportID ?? '';
-    const isUpdatingExistingReport = Boolean(reportID);
+function GroupChatNameEditPage({groupChatDraft, report}: GroupChatNameEditPageProps) {
+    // If we have a report this means we are using this page to update an existing Group Chat name
+    // In this case its better to use empty string as the reportID if there is no reportID
+    const reportID = report?.reportID ?? '';
+    const isUpdatingExistingReport = !!reportID;
 
     const styles = useThemeStyles();
     const {translate} = useLocalize();
     const {inputCallbackRef} = useAutoFocusInput();
 
-    // We will try to get the chatName from the report or draft depending on what flow we are in
-    const participantAccountIDs = useMemo(() => {
-        if (reportID) {
-            return ReportUtils.getParticipantAccountIDs(reportID);
-        }
-
-        return (groupChatDraft?.participants ?? []).map((participant) => participant.accountID);
-    }, [groupChatDraft, reportID]);
-    const existingReportName = useMemo(() => ReportUtils.getGroupChatName(participantAccountIDs, false, reportID), [participantAccountIDs, reportID]);
+    const existingReportName = useMemo(
+        () => (report ? ReportUtils.getGroupChatName(undefined, false, report) : ReportUtils.getGroupChatName(groupChatDraft?.participants)),
+        [groupChatDraft?.participants, report],
+    );
     // eslint-disable-next-line @typescript-eslint/prefer-nullish-coalescing
     const currentChatName = reportID ? existingReportName : groupChatDraft?.reportName || existingReportName;
 
@@ -88,7 +89,7 @@ function GroupChatNameEditPage({groupChatDraft, route}: GroupChatNameEditPagePro
         >
             <HeaderWithBackButton
                 title={translate('groupConfirmPage.groupName')}
-                onBackButtonPress={() => Navigation.goBack(isUpdatingExistingReport ? ROUTES.REPORT_SETTINGS.getRoute(reportID) : ROUTES.NEW_CHAT_CONFIRM)}
+                onBackButtonPress={() => Navigation.goBack(isUpdatingExistingReport ? ROUTES.REPORT_WITH_ID_DETAILS.getRoute(reportID) : ROUTES.NEW_CHAT_CONFIRM)}
             />
             <FormProvider
                 formID={ONYXKEYS.FORMS.NEW_CHAT_NAME_FORM}
diff --git a/src/pages/InviteReportParticipantsPage.tsx b/src/pages/InviteReportParticipantsPage.tsx
index da97ef26414b..7f5ec7ec5fef 100644
--- a/src/pages/InviteReportParticipantsPage.tsx
+++ b/src/pages/InviteReportParticipantsPage.tsx
@@ -1,6 +1,5 @@
 import React, {useCallback, useEffect, useMemo, useState} from 'react';
 import type {SectionListData} from 'react-native';
-import {View} from 'react-native';
 import type {OnyxEntry} from 'react-native-onyx';
 import {withOnyx} from 'react-native-onyx';
 import FormAlertWithSubmitButton from '@components/FormAlertWithSubmitButton';
@@ -12,6 +11,7 @@ import InviteMemberListItem from '@components/SelectionList/InviteMemberListItem
 import type {Section} from '@components/SelectionList/types';
 import withNavigationTransitionEnd from '@components/withNavigationTransitionEnd';
 import type {WithNavigationTransitionEndProps} from '@components/withNavigationTransitionEnd';
+import useDebouncedState from '@hooks/useDebouncedState';
 import useLocalize from '@hooks/useLocalize';
 import useThemeStyles from '@hooks/useThemeStyles';
 import * as DeviceCapabilities from '@libs/DeviceCapabilities';
@@ -45,18 +45,29 @@ function InviteReportParticipantsPage({betas, personalDetails, report, didScreen
 
     const styles = useThemeStyles();
     const {translate} = useLocalize();
-    const [searchTerm, setSearchTerm] = useState('');
+    const [searchTerm, debouncedSearchTerm, setSearchTerm] = useDebouncedState('');
     const [selectedOptions, setSelectedOptions] = useState<ReportUtils.OptionData[]>([]);
-    const [invitePersonalDetails, setInvitePersonalDetails] = useState<ReportUtils.OptionData[]>([]);
-    const [recentReports, setRecentReports] = useState<ReportUtils.OptionData[]>([]);
-    const [userToInvite, setUserToInvite] = useState<ReportUtils.OptionData | null>(null);
 
     // Any existing participants and Expensify emails should not be eligible for invitation
-    const excludedUsers = useMemo(() => [...PersonalDetailsUtils.getLoginsByAccountIDs(ReportUtils.getParticipantAccountIDs(report?.reportID ?? '')), ...CONST.EXPENSIFY_EMAILS], [report]);
+    const excludedUsers = useMemo(
+        () => [...PersonalDetailsUtils.getLoginsByAccountIDs(ReportUtils.getParticipantsAccountIDsForDisplay(report, false, true)), ...CONST.EXPENSIFY_EMAILS],
+        [report],
+    );
 
-    useEffect(() => {
-        const inviteOptions = OptionsListUtils.getMemberInviteOptions(options.personalDetails, betas ?? [], searchTerm, excludedUsers, false, options.reports, true);
+    const defaultOptions = useMemo(() => {
+        if (!areOptionsInitialized) {
+            return OptionsListUtils.getEmptyOptions();
+        }
+
+        return OptionsListUtils.getMemberInviteOptions(options.personalDetails, betas ?? [], '', excludedUsers, false, options.reports, true);
+    }, [areOptionsInitialized, betas, excludedUsers, options.personalDetails, options.reports]);
+
+    const inviteOptions = useMemo(
+        () => OptionsListUtils.filterOptions(defaultOptions, debouncedSearchTerm, {excludeLogins: excludedUsers}),
+        [debouncedSearchTerm, defaultOptions, excludedUsers],
+    );
 
+    useEffect(() => {
         // Update selectedOptions with the latest personalDetails information
         const detailsMap: Record<string, OptionsListUtils.MemberForList> = {};
         inviteOptions.personalDetails.forEach((detail) => {
@@ -70,12 +81,9 @@ function InviteReportParticipantsPage({betas, personalDetails, report, didScreen
             newSelectedOptions.push(option.login && option.login in detailsMap ? {...detailsMap[option.login], isSelected: true} : option);
         });
 
-        setUserToInvite(inviteOptions.userToInvite);
-        setInvitePersonalDetails(inviteOptions.personalDetails);
-        setRecentReports(inviteOptions.recentReports);
         setSelectedOptions(newSelectedOptions);
-        // eslint-disable-next-line react-hooks/exhaustive-deps -- we don't want to recalculate when selectedOptions change
-    }, [personalDetails, betas, searchTerm, excludedUsers, options]);
+        // eslint-disable-next-line react-compiler/react-compiler, react-hooks/exhaustive-deps -- we don't want to recalculate when selectedOptions change
+    }, [personalDetails, betas, debouncedSearchTerm, excludedUsers, options]);
 
     const sections = useMemo(() => {
         const sectionsArr: Sections = [];
@@ -86,11 +94,11 @@ function InviteReportParticipantsPage({betas, personalDetails, report, didScreen
 
         // Filter all options that is a part of the search term or in the personal details
         let filterSelectedOptions = selectedOptions;
-        if (searchTerm !== '') {
+        if (debouncedSearchTerm !== '') {
             filterSelectedOptions = selectedOptions.filter((option) => {
                 const accountID = option?.accountID;
-                const isOptionInPersonalDetails = invitePersonalDetails.some((personalDetail) => accountID && personalDetail?.accountID === accountID);
-                const searchValue = OptionsListUtils.getSearchValueForPhoneOrEmail(searchTerm);
+                const isOptionInPersonalDetails = inviteOptions.personalDetails.some((personalDetail) => accountID && personalDetail?.accountID === accountID);
+                const searchValue = OptionsListUtils.getSearchValueForPhoneOrEmail(debouncedSearchTerm);
                 const isPartOfSearchTerm = !!option.text?.toLowerCase().includes(searchValue) || !!option.login?.toLowerCase().includes(searchValue);
                 return isPartOfSearchTerm || isOptionInPersonalDetails;
             });
@@ -104,11 +112,11 @@ function InviteReportParticipantsPage({betas, personalDetails, report, didScreen
 
         // Filtering out selected users from the search results
         const selectedLogins = selectedOptions.map(({login}) => login);
-        const recentReportsWithoutSelected = recentReports.filter(({login}) => !selectedLogins.includes(login));
+        const recentReportsWithoutSelected = inviteOptions.recentReports.filter(({login}) => !selectedLogins.includes(login));
         const recentReportsFormatted = recentReportsWithoutSelected.map((reportOption) => OptionsListUtils.formatMemberForList(reportOption));
-        const personalDetailsWithoutSelected = invitePersonalDetails.filter(({login}) => !selectedLogins.includes(login));
+        const personalDetailsWithoutSelected = inviteOptions.personalDetails.filter(({login}) => !selectedLogins.includes(login));
         const personalDetailsFormatted = personalDetailsWithoutSelected.map((personalDetail) => OptionsListUtils.formatMemberForList(personalDetail));
-        const hasUnselectedUserToInvite = userToInvite && !selectedLogins.includes(userToInvite.login);
+        const hasUnselectedUserToInvite = inviteOptions.userToInvite && !selectedLogins.includes(inviteOptions.userToInvite.login);
 
         sectionsArr.push({
             title: translate('common.recents'),
@@ -123,12 +131,12 @@ function InviteReportParticipantsPage({betas, personalDetails, report, didScreen
         if (hasUnselectedUserToInvite) {
             sectionsArr.push({
                 title: undefined,
-                data: [OptionsListUtils.formatMemberForList(userToInvite)],
+                data: inviteOptions.userToInvite ? [OptionsListUtils.formatMemberForList(inviteOptions.userToInvite)] : [],
             });
         }
 
         return sectionsArr;
-    }, [invitePersonalDetails, searchTerm, selectedOptions, translate, userToInvite, areOptionsInitialized, recentReports]);
+    }, [areOptionsInitialized, selectedOptions, debouncedSearchTerm, inviteOptions.recentReports, inviteOptions.personalDetails, inviteOptions.userToInvite, translate]);
 
     const toggleOption = useCallback(
         (option: OptionsListUtils.MemberForList) => {
@@ -150,7 +158,7 @@ function InviteReportParticipantsPage({betas, personalDetails, report, didScreen
 
     const reportID = report.reportID;
     const backRoute = useMemo(() => ROUTES.REPORT_PARTICIPANTS.getRoute(reportID), [reportID]);
-    const reportName = useMemo(() => ReportUtils.getGroupChatName(undefined, true, report?.reportID ?? ''), [report]);
+    const reportName = useMemo(() => ReportUtils.getGroupChatName(undefined, true, report), [report]);
     const inviteUsers = useCallback(() => {
         if (!validate()) {
             return;
@@ -169,13 +177,13 @@ function InviteReportParticipantsPage({betas, personalDetails, report, didScreen
     }, [selectedOptions, backRoute, reportID, validate]);
 
     const headerMessage = useMemo(() => {
-        const searchValue = searchTerm.trim().toLowerCase();
+        const searchValue = debouncedSearchTerm.trim().toLowerCase();
         const expensifyEmails = CONST.EXPENSIFY_EMAILS as string[];
-        if (!userToInvite && expensifyEmails.includes(searchValue)) {
+        if (!inviteOptions.userToInvite && expensifyEmails.includes(searchValue)) {
             return translate('messages.errorMessageInvalidEmail');
         }
         if (
-            !userToInvite &&
+            !inviteOptions.userToInvite &&
             excludedUsers.includes(
                 PhoneNumber.parsePhoneNumber(LoginUtils.appendCountryCode(searchValue)).possible
                     ? PhoneNumber.addSMSDomainIfPhoneNumber(LoginUtils.appendCountryCode(searchValue))
@@ -184,13 +192,27 @@ function InviteReportParticipantsPage({betas, personalDetails, report, didScreen
         ) {
             return translate('messages.userIsAlreadyMember', {login: searchValue, name: reportName ?? ''});
         }
-        return OptionsListUtils.getHeaderMessage(invitePersonalDetails.length !== 0, Boolean(userToInvite), searchValue);
-    }, [searchTerm, userToInvite, excludedUsers, invitePersonalDetails, translate, reportName]);
+        return OptionsListUtils.getHeaderMessage(inviteOptions.recentReports.length + inviteOptions.personalDetails.length !== 0, !!inviteOptions.userToInvite, searchValue);
+    }, [debouncedSearchTerm, inviteOptions.userToInvite, inviteOptions.recentReports.length, inviteOptions.personalDetails.length, excludedUsers, translate, reportName]);
+
+    const footerContent = useMemo(
+        () => (
+            <FormAlertWithSubmitButton
+                isDisabled={!selectedOptions.length}
+                buttonText={translate('common.invite')}
+                onSubmit={inviteUsers}
+                containerStyles={[styles.flexReset, styles.flexGrow0, styles.flexShrink0, styles.flexBasisAuto]}
+                enabledWhenOffline
+            />
+        ),
+        [selectedOptions.length, inviteUsers, translate, styles],
+    );
 
     return (
         <ScreenWrapper
             shouldEnableMaxHeight
             testID={InviteReportParticipantsPage.displayName}
+            includeSafeAreaPaddingBottom={false}
         >
             <HeaderWithBackButton
                 title={translate('workspace.invite.members')}
@@ -199,32 +221,22 @@ function InviteReportParticipantsPage({betas, personalDetails, report, didScreen
                     Navigation.goBack(backRoute);
                 }}
             />
-            <View style={[styles.flex1, styles.p1]}>
-                <SelectionList
-                    canSelectMultiple
-                    sections={sections}
-                    ListItem={InviteMemberListItem}
-                    textInputLabel={translate('optionsSelector.nameEmailOrPhoneNumber')}
-                    textInputValue={searchTerm}
-                    onChangeText={setSearchTerm}
-                    headerMessage={headerMessage}
-                    onSelectRow={toggleOption}
-                    onConfirm={inviteUsers}
-                    showScrollIndicator
-                    shouldPreventDefaultFocusOnSelectRow={!DeviceCapabilities.canUseTouchScreen()}
-                    showLoadingPlaceholder={!didScreenTransitionEnd || !OptionsListUtils.isPersonalDetailsReady(personalDetails)}
-                />
-            </View>
-            <View style={[styles.flexShrink0, styles.p5]}>
-                <FormAlertWithSubmitButton
-                    isDisabled={!selectedOptions.length}
-                    buttonText={translate('common.invite')}
-                    onSubmit={inviteUsers}
-                    containerStyles={[styles.flexReset, styles.flexGrow0, styles.flexShrink0, styles.flexBasisAuto, styles.mb5]}
-                    enabledWhenOffline
-                    disablePressOnEnter
-                />
-            </View>
+
+            <SelectionList
+                canSelectMultiple
+                sections={sections}
+                ListItem={InviteMemberListItem}
+                textInputLabel={translate('selectionList.nameEmailOrPhoneNumber')}
+                textInputValue={searchTerm}
+                onChangeText={setSearchTerm}
+                headerMessage={headerMessage}
+                onSelectRow={toggleOption}
+                onConfirm={inviteUsers}
+                showScrollIndicator
+                shouldPreventDefaultFocusOnSelectRow={!DeviceCapabilities.canUseTouchScreen()}
+                showLoadingPlaceholder={!didScreenTransitionEnd || !OptionsListUtils.isPersonalDetailsReady(personalDetails)}
+                footerContent={footerContent}
+            />
         </ScreenWrapper>
     );
 }
diff --git a/src/pages/LogInWithShortLivedAuthTokenPage.tsx b/src/pages/LogInWithShortLivedAuthTokenPage.tsx
index 72425e0e2ca6..6eb6a6cc7161 100644
--- a/src/pages/LogInWithShortLivedAuthTokenPage.tsx
+++ b/src/pages/LogInWithShortLivedAuthTokenPage.tsx
@@ -62,14 +62,14 @@ function LogInWithShortLivedAuthTokenPage({route, account}: LogInWithShortLivedA
             Session.setAccountError(error);
         }
 
-        if (exitTo) {
+        // For HybridApp we have separate logic to handle transitions.
+        if (!NativeModules.HybridAppModule && exitTo) {
             Navigation.isNavigationReady().then(() => {
-                const url = NativeModules.HybridAppModule ? Navigation.parseHybridAppUrl(exitTo) : (exitTo as Route);
-                Navigation.navigate(url);
+                Navigation.navigate(exitTo as Route);
             });
         }
         // The only dependencies of the effect are based on props.route
-        // eslint-disable-next-line react-hooks/exhaustive-deps
+        // eslint-disable-next-line react-compiler/react-compiler, react-hooks/exhaustive-deps
     }, [route]);
 
     if (account?.isLoading) {
diff --git a/src/pages/LogOutPreviousUserPage.tsx b/src/pages/LogOutPreviousUserPage.tsx
index c80b26bbb9e7..f5b96e2d57c5 100644
--- a/src/pages/LogOutPreviousUserPage.tsx
+++ b/src/pages/LogOutPreviousUserPage.tsx
@@ -32,6 +32,7 @@ type LogOutPreviousUserPageProps = LogOutPreviousUserPageOnyxProps & StackScreen
 // This component should not do any other navigation as that handled in App.setUpPoliciesAndNavigate
 function LogOutPreviousUserPage({session, route, isAccountLoading}: LogOutPreviousUserPageProps) {
     const initialURL = useContext(InitialURLContext);
+
     useEffect(() => {
         const sessionEmail = session?.email;
         const transitionURL = NativeModules.HybridAppModule ? `${CONST.DEEPLINK_BASE_URL}${initialURL ?? ''}` : initialURL;
@@ -39,7 +40,8 @@ function LogOutPreviousUserPage({session, route, isAccountLoading}: LogOutPrevio
         const isSupportalLogin = route.params.authTokenType === CONST.AUTH_TOKEN_TYPES.SUPPORT;
 
         if (isLoggingInAsNewUser) {
-            SessionActions.signOutAndRedirectToSignIn(false, isSupportalLogin);
+            // We don't want to close react-native app in this particular case.
+            SessionActions.signOutAndRedirectToSignIn(false, isSupportalLogin, false);
             return;
         }
 
@@ -64,7 +66,7 @@ function LogOutPreviousUserPage({session, route, isAccountLoading}: LogOutPrevio
             SessionActions.signInWithShortLivedAuthToken(email, shortLivedAuthToken);
         }
         // We only want to run this effect once on mount (when the page first loads after transitioning from OldDot)
-        // eslint-disable-next-line react-hooks/exhaustive-deps
+        // eslint-disable-next-line react-compiler/react-compiler, react-hooks/exhaustive-deps
     }, [initialURL]);
 
     useEffect(() => {
@@ -75,15 +77,15 @@ function LogOutPreviousUserPage({session, route, isAccountLoading}: LogOutPrevio
         // We don't want to navigate to the exitTo route when creating a new workspace from a deep link,
         // because we already handle creating the optimistic policy and navigating to it in App.setUpPoliciesAndNavigate,
         // which is already called when AuthScreens mounts.
-        if (exitTo && exitTo !== ROUTES.WORKSPACE_NEW && !isAccountLoading && !isLoggingInAsNewUser) {
+        // For HybridApp we have separate logic to handle transitions.
+        if (!NativeModules.HybridAppModule && exitTo && exitTo !== ROUTES.WORKSPACE_NEW && !isAccountLoading && !isLoggingInAsNewUser) {
             Navigation.isNavigationReady().then(() => {
                 // remove this screen and navigate to exit route
-                const exitUrl = NativeModules.HybridAppModule ? Navigation.parseHybridAppUrl(exitTo) : exitTo;
                 Navigation.goBack();
-                Navigation.navigate(exitUrl);
+                Navigation.navigate(exitTo);
             });
         }
-        // eslint-disable-next-line react-hooks/exhaustive-deps
+        // eslint-disable-next-line react-compiler/react-compiler, react-hooks/exhaustive-deps
     }, [initialURL, isAccountLoading]);
 
     return <FullScreenLoadingIndicator />;
diff --git a/src/pages/NewChatConfirmPage.tsx b/src/pages/NewChatConfirmPage.tsx
index f25233f9f568..d6b199def243 100644
--- a/src/pages/NewChatConfirmPage.tsx
+++ b/src/pages/NewChatConfirmPage.tsx
@@ -1,4 +1,4 @@
-import React, {useMemo, useRef} from 'react';
+import React, {useCallback, useEffect, useMemo, useRef, useState} from 'react';
 import {View} from 'react-native';
 import {withOnyx} from 'react-native-onyx';
 import type {OnyxEntry} from 'react-native-onyx';
@@ -15,6 +15,7 @@ import useCurrentUserPersonalDetails from '@hooks/useCurrentUserPersonalDetails'
 import useLocalize from '@hooks/useLocalize';
 import useThemeStyles from '@hooks/useThemeStyles';
 import type {CustomRNImageManipulatorResult} from '@libs/cropOrRotateImage/types';
+import * as FileUtils from '@libs/fileDownload/FileUtils';
 import Navigation from '@libs/Navigation/Navigation';
 import * as OptionsListUtils from '@libs/OptionsListUtils';
 import * as ReportUtils from '@libs/ReportUtils';
@@ -35,13 +36,20 @@ type NewChatConfirmPageOnyxProps = {
 
 type NewChatConfirmPageProps = NewChatConfirmPageOnyxProps;
 
+function navigateBack() {
+    Navigation.goBack(ROUTES.NEW_CHAT);
+}
+
+function navigateToEditChatName() {
+    Navigation.navigate(ROUTES.NEW_CHAT_EDIT_NAME);
+}
+
 function NewChatConfirmPage({newGroupDraft, allPersonalDetails}: NewChatConfirmPageProps) {
     const optimisticReportID = useRef<string>(ReportUtils.generateReportID());
-    const fileRef = useRef<File | CustomRNImageManipulatorResult | undefined>();
+    const [avatarFile, setAvatarFile] = useState<File | CustomRNImageManipulatorResult | undefined>();
     const {translate} = useLocalize();
     const styles = useThemeStyles();
     const personalData = useCurrentUserPersonalDetails();
-    const participantAccountIDs = (newGroupDraft?.participants ?? []).map((participant) => participant.accountID);
     const selectedOptions = useMemo((): Participant[] => {
         if (!newGroupDraft?.participants) {
             return [];
@@ -52,7 +60,7 @@ function NewChatConfirmPage({newGroupDraft, allPersonalDetails}: NewChatConfirmP
         return options;
     }, [allPersonalDetails, newGroupDraft?.participants]);
 
-    const groupName = newGroupDraft?.reportName ? newGroupDraft?.reportName : ReportUtils.getGroupChatName(participantAccountIDs ?? []);
+    const groupName = newGroupDraft?.reportName ? newGroupDraft?.reportName : ReportUtils.getGroupChatName(newGroupDraft?.participants);
     const sections: ListItem[] = useMemo(
         () =>
             selectedOptions
@@ -79,32 +87,50 @@ function NewChatConfirmPage({newGroupDraft, allPersonalDetails}: NewChatConfirmP
     /**
      * Removes a selected option from list if already selected.
      */
-    const unselectOption = (option: ListItem) => {
+    const unselectOption = useCallback(
+        (option: ListItem) => {
+            if (!newGroupDraft) {
+                return;
+            }
+            const newSelectedParticipants = (newGroupDraft.participants ?? []).filter((participant) => participant.login !== option.login);
+            Report.setGroupDraft({participants: newSelectedParticipants});
+        },
+        [newGroupDraft],
+    );
+
+    const createGroup = useCallback(() => {
         if (!newGroupDraft) {
             return;
         }
-        const newSelectedParticipants = (newGroupDraft.participants ?? []).filter((participant) => participant.login !== option.login);
-        Report.setGroupDraft({participants: newSelectedParticipants});
-    };
 
-    const createGroup = () => {
-        if (!newGroupDraft) {
+        const logins: string[] = (newGroupDraft.participants ?? []).map((participant) => participant.login);
+        Report.navigateToAndOpenReport(logins, true, undefined, newGroupDraft.reportName ?? '', newGroupDraft.avatarUri ?? '', avatarFile, optimisticReportID.current, true);
+    }, [newGroupDraft, avatarFile]);
+
+    const stashedLocalAvatarImage = newGroupDraft?.avatarUri;
+
+    useEffect(() => {
+        if (!stashedLocalAvatarImage) {
             return;
         }
 
-        const logins: string[] = (newGroupDraft.participants ?? []).map((participant) => participant.login);
-        Report.navigateToAndOpenReport(logins, true, newGroupDraft.reportName ?? '', newGroupDraft.avatarUri ?? '', fileRef.current, optimisticReportID.current);
-    };
+        const onSuccess = (file: File) => {
+            setAvatarFile(file);
+        };
 
-    const navigateBack = () => {
-        Navigation.goBack(ROUTES.NEW_CHAT);
-    };
+        const onFailure = () => {
+            setAvatarFile(undefined);
+            Report.setGroupDraft({avatarUri: null, avatarFileName: null, avatarFileType: null});
+        };
 
-    const navigateToEditChatName = () => {
-        Navigation.navigate(ROUTES.NEW_CHAT_EDIT_NAME);
-    };
+        // If the user navigates back to the member selection page and then returns to the confirmation page, the component will re-mount, causing avatarFile to be null.
+        // To handle this, we re-read the avatar image file from disk whenever the component re-mounts.
+        FileUtils.readFileAsync(stashedLocalAvatarImage, newGroupDraft?.avatarFileName ?? '', onSuccess, onFailure, newGroupDraft?.avatarFileType ?? '');
+
+        // we only need to run this when the component re-mounted
+        // eslint-disable-next-line react-compiler/react-compiler, react-hooks/exhaustive-deps
+    }, []);
 
-    const stashedLocalAvatarImage = newGroupDraft?.avatarUri;
     return (
         <ScreenWrapper testID={NewChatConfirmPage.displayName}>
             <HeaderWithBackButton
@@ -116,18 +142,20 @@ function NewChatConfirmPage({newGroupDraft, allPersonalDetails}: NewChatConfirmP
                     isUsingDefaultAvatar={!stashedLocalAvatarImage}
                     source={stashedLocalAvatarImage ?? ReportUtils.getDefaultGroupAvatar(optimisticReportID.current)}
                     onImageSelected={(image) => {
-                        fileRef.current = image;
-                        Report.setGroupDraft({avatarUri: image?.uri ?? ''});
+                        setAvatarFile(image);
+                        Report.setGroupDraft({avatarUri: image.uri ?? '', avatarFileName: image.name ?? '', avatarFileType: image.type});
                     }}
                     onImageRemoved={() => {
-                        fileRef.current = undefined;
-                        Report.setGroupDraft({avatarUri: null});
+                        setAvatarFile(undefined);
+                        Report.setGroupDraft({avatarUri: null, avatarFileName: null, avatarFileType: null});
                     }}
                     size={CONST.AVATAR_SIZE.XLARGE}
                     avatarStyle={styles.avatarXLarge}
                     shouldDisableViewPhoto
                     editIcon={Expensicons.Camera}
                     editIconStyle={styles.smallEditIconAccount}
+                    shouldUseStyleUtilityForAnchorPosition
+                    style={styles.w100}
                 />
             </View>
             <MenuItemWithTopDescription
@@ -144,9 +172,9 @@ function NewChatConfirmPage({newGroupDraft, allPersonalDetails}: NewChatConfirmP
                     sections={[{title: translate('common.members'), data: sections}]}
                     ListItem={InviteMemberListItem}
                     onSelectRow={unselectOption}
-                    showConfirmButton={selectedOptions.length > 1}
+                    showConfirmButton={!!selectedOptions.length}
                     confirmButtonText={translate('newChatPage.startGroup')}
-                    onConfirm={selectedOptions.length > 1 ? createGroup : undefined}
+                    onConfirm={createGroup}
                     shouldHideListOnInitialRender={false}
                 />
             </View>
diff --git a/src/pages/NewChatPage.tsx b/src/pages/NewChatPage.tsx
index 37f0c30fe5cb..b11e92e2f4ca 100755
--- a/src/pages/NewChatPage.tsx
+++ b/src/pages/NewChatPage.tsx
@@ -1,6 +1,6 @@
 import isEmpty from 'lodash/isEmpty';
 import reject from 'lodash/reject';
-import React, {useCallback, useEffect, useMemo, useState} from 'react';
+import React, {useCallback, useEffect, useMemo, useRef, useState} from 'react';
 import {useOnyx} from 'react-native-onyx';
 import Button from '@components/Button';
 import KeyboardAvoidingView from '@components/KeyboardAvoidingView';
@@ -11,16 +11,16 @@ import ReferralProgramCTA from '@components/ReferralProgramCTA';
 import ScreenWrapper from '@components/ScreenWrapper';
 import SelectCircle from '@components/SelectCircle';
 import SelectionList from '@components/SelectionList';
-import type {ListItem} from '@components/SelectionList/types';
+import type {ListItem, SelectionListHandle} from '@components/SelectionList/types';
 import UserListItem from '@components/SelectionList/UserListItem';
 import useCurrentUserPersonalDetails from '@hooks/useCurrentUserPersonalDetails';
 import useDebouncedState from '@hooks/useDebouncedState';
 import useLocalize from '@hooks/useLocalize';
 import useNetwork from '@hooks/useNetwork';
+import useResponsiveLayout from '@hooks/useResponsiveLayout';
 import useScreenWrapperTranstionStatus from '@hooks/useScreenWrapperTransitionStatus';
 import useStyledSafeAreaInsets from '@hooks/useStyledSafeAreaInsets';
 import useThemeStyles from '@hooks/useThemeStyles';
-import useWindowDimensions from '@hooks/useWindowDimensions';
 import * as DeviceCapabilities from '@libs/DeviceCapabilities';
 import Log from '@libs/Log';
 import Navigation from '@libs/Navigation/Navigation';
@@ -45,18 +45,17 @@ function useOptions({isGroupChat}: NewChatPageProps) {
     const [betas] = useOnyx(ONYXKEYS.BETAS);
     const [newGroupDraft] = useOnyx(ONYXKEYS.NEW_GROUP_CHAT_DRAFT);
     const personalData = useCurrentUserPersonalDetails();
-    const [personalDetails] = useOnyx(ONYXKEYS.PERSONAL_DETAILS_LIST);
     const {didScreenTransitionEnd} = useScreenWrapperTranstionStatus();
     const {options: listOptions, areOptionsInitialized} = useOptionsList({
         shouldInitialize: didScreenTransitionEnd,
     });
 
-    const options = useMemo(() => {
+    const defaultOptions = useMemo(() => {
         const filteredOptions = OptionsListUtils.getFilteredOptions(
             listOptions.reports ?? [],
             listOptions.personalDetails ?? [],
             betas ?? [],
-            debouncedSearchTerm,
+            '',
             selectedOptions,
             isGroupChat ? excludedGroupEmails : [],
             false,
@@ -70,18 +69,31 @@ function useOptions({isGroupChat}: NewChatPageProps) {
             true,
             undefined,
             undefined,
+            0,
             undefined,
             true,
         );
+        return filteredOptions;
+    }, [betas, isGroupChat, listOptions.personalDetails, listOptions.reports, selectedOptions]);
 
-        const headerMessage = OptionsListUtils.getHeaderMessage(
-            filteredOptions.personalDetails.length + filteredOptions.recentReports.length !== 0,
-            Boolean(filteredOptions.userToInvite),
+    const options = useMemo(() => {
+        const filteredOptions = OptionsListUtils.filterOptions(defaultOptions, debouncedSearchTerm, {
+            selectedOptions,
+            excludeLogins: isGroupChat ? excludedGroupEmails : [],
+            maxRecentReportsToShow: CONST.IOU.MAX_RECENT_REPORTS_TO_SHOW,
+        });
+
+        return filteredOptions;
+    }, [debouncedSearchTerm, defaultOptions, isGroupChat, selectedOptions]);
+    const cleanSearchTerm = useMemo(() => debouncedSearchTerm.trim().toLowerCase(), [debouncedSearchTerm]);
+    const headerMessage = useMemo(() => {
+        return OptionsListUtils.getHeaderMessage(
+            options.personalDetails.length + options.recentReports.length !== 0,
+            !!options.userToInvite,
             debouncedSearchTerm.trim(),
-            selectedOptions.some((participant) => participant?.searchText?.toLowerCase?.().includes(debouncedSearchTerm.trim().toLowerCase())),
+            selectedOptions.some((participant) => OptionsListUtils.getPersonalDetailSearchTerms(participant).join(' ').toLowerCase?.().includes(cleanSearchTerm)),
         );
-        return {...filteredOptions, headerMessage};
-    }, [betas, debouncedSearchTerm, isGroupChat, listOptions.personalDetails, listOptions.reports, selectedOptions]);
+    }, [cleanSearchTerm, debouncedSearchTerm, options.personalDetails.length, options.recentReports.length, options.userToInvite, selectedOptions]);
 
     useEffect(() => {
         if (!debouncedSearchTerm.length) {
@@ -95,25 +107,49 @@ function useOptions({isGroupChat}: NewChatPageProps) {
         if (!newGroupDraft?.participants) {
             return;
         }
-        const selectedParticipants = newGroupDraft.participants.filter((participant) => participant.accountID !== personalData.accountID);
-        const newSelectedOptions = selectedParticipants.map((participant): OptionData => {
-            const baseOption = OptionsListUtils.getParticipantsOption({accountID: participant.accountID, login: participant.login, reportID: ''}, personalDetails);
-            return {...baseOption, reportID: baseOption.reportID ?? '', isSelected: true};
+        const newSelectedOptions: OptionData[] = [];
+        newGroupDraft.participants.forEach((participant) => {
+            if (participant.accountID === personalData.accountID) {
+                return;
+            }
+            let participantOption: OptionData | undefined | null = listOptions.personalDetails.find((option) => option.accountID === participant.accountID);
+            if (!participantOption) {
+                participantOption = OptionsListUtils.getUserToInviteOption({
+                    searchValue: participant.login,
+                });
+            }
+            if (!participantOption) {
+                return;
+            }
+            newSelectedOptions.push({
+                ...participantOption,
+                isSelected: true,
+            });
         });
         setSelectedOptions(newSelectedOptions);
-    }, [newGroupDraft, personalData, personalDetails]);
-
-    return {...options, searchTerm, debouncedSearchTerm, setSearchTerm, areOptionsInitialized: areOptionsInitialized && didScreenTransitionEnd, selectedOptions, setSelectedOptions};
+    }, [newGroupDraft?.participants, listOptions.personalDetails, personalData.accountID]);
+
+    return {
+        ...options,
+        searchTerm,
+        debouncedSearchTerm,
+        setSearchTerm,
+        areOptionsInitialized: areOptionsInitialized && didScreenTransitionEnd,
+        selectedOptions,
+        setSelectedOptions,
+        headerMessage,
+    };
 }
 
 function NewChatPage({isGroupChat}: NewChatPageProps) {
     const {translate} = useLocalize();
     const {isOffline} = useNetwork();
-    const {isSmallScreenWidth} = useWindowDimensions();
+    const {isSmallScreenWidth} = useResponsiveLayout();
     const styles = useThemeStyles();
     const personalData = useCurrentUserPersonalDetails();
     const {insets} = useStyledSafeAreaInsets();
     const [isSearchingForReports] = useOnyx(ONYXKEYS.IS_SEARCHING_FOR_REPORTS, {initWithStoredValues: false});
+    const selectionListRef = useRef<SelectionListHandle>(null);
 
     const {headerMessage, searchTerm, debouncedSearchTerm, setSearchTerm, selectedOptions, setSelectedOptions, recentReports, personalDetails, userToInvite, areOptionsInitialized} =
         useOptions({
@@ -190,7 +226,7 @@ function NewChatPage({isGroupChat}: NewChatPageProps) {
     );
 
     const itemRightSideComponent = useCallback(
-        (item: ListItem & OptionsListUtils.Option) => {
+        (item: ListItem & OptionsListUtils.Option, isFocused?: boolean) => {
             if (item.isSelfDM) {
                 return null;
             }
@@ -206,9 +242,11 @@ function NewChatPage({isGroupChat}: NewChatPageProps) {
                 if (isOptionInList) {
                     newSelectedOptions = reject(selectedOptions, (selectedOption) => selectedOption.login === option.login);
                 } else {
-                    newSelectedOptions = [...selectedOptions, {...option, isSelected: true, selected: true, reportID: option.reportID ?? ''}];
+                    newSelectedOptions = [...selectedOptions, {...option, isSelected: true, selected: true, reportID: option.reportID ?? '-1'}];
                 }
 
+                selectionListRef?.current?.clearInputAfterSelect?.();
+
                 setSelectedOptions(newSelectedOptions);
             }
 
@@ -217,20 +255,21 @@ function NewChatPage({isGroupChat}: NewChatPageProps) {
                     <PressableWithFeedback
                         onPress={() => toggleOption(item)}
                         disabled={item.isDisabled}
-                        role={CONST.ACCESSIBILITY_ROLE.CHECKBOX}
-                        accessibilityLabel={CONST.ACCESSIBILITY_ROLE.CHECKBOX}
+                        role={CONST.ROLE.BUTTON}
+                        accessibilityLabel={CONST.ROLE.BUTTON}
                         style={[styles.flexRow, styles.alignItemsCenter, styles.ml3]}
                     >
                         <SelectCircle isChecked={item.isSelected} />
                     </PressableWithFeedback>
                 );
             }
-
+            const buttonInnerStyles = isFocused ? styles.buttonDefaultHovered : {};
             return (
                 <Button
                     onPress={() => toggleOption(item)}
                     style={[styles.pl2]}
                     text={translate('newChatPage.addToGroup')}
+                    innerStyles={buttonInnerStyles}
                     small
                 />
             );
@@ -278,6 +317,8 @@ function NewChatPage({isGroupChat}: NewChatPageProps) {
             includePaddingTop={false}
             shouldEnablePickerAvoiding={false}
             testID={NewChatPage.displayName}
+            // Disable the focus trap of this page to activate the parent focus trap in `NewChatSelectorPage`.
+            focusTrapSettings={{active: false}}
         >
             <KeyboardAvoidingView
                 style={styles.flex1}
@@ -287,14 +328,16 @@ function NewChatPage({isGroupChat}: NewChatPageProps) {
                 keyboardVerticalOffset={variables.contentHeaderHeight + (insets?.top ?? 0) + variables.tabSelectorButtonHeight + variables.tabSelectorButtonPadding}
             >
                 <SelectionList<OptionsListUtils.Option & ListItem>
+                    ref={selectionListRef}
                     ListItem={UserListItem}
                     sections={areOptionsInitialized ? sections : CONST.EMPTY_ARRAY}
                     textInputValue={searchTerm}
                     textInputHint={isOffline ? `${translate('common.youAppearToBeOffline')} ${translate('search.resultsAreLimited')}` : ''}
                     onChangeText={setSearchTerm}
-                    textInputLabel={translate('optionsSelector.nameEmailOrPhoneNumber')}
+                    textInputLabel={translate('selectionList.nameEmailOrPhoneNumber')}
                     headerMessage={headerMessage}
                     onSelectRow={createChat}
+                    shouldSingleExecuteRowSelect
                     onConfirm={(e, option) => (selectedOptions.length > 0 ? createGroup() : createChat(option))}
                     rightHandSideComponent={itemRightSideComponent}
                     footerContent={footerContent}
diff --git a/src/pages/NewChatSelectorPage.tsx b/src/pages/NewChatSelectorPage.tsx
index 6919dce33474..9e167c2d51a7 100755
--- a/src/pages/NewChatSelectorPage.tsx
+++ b/src/pages/NewChatSelectorPage.tsx
@@ -1,17 +1,33 @@
 import {useNavigation} from '@react-navigation/native';
-import React from 'react';
+import React, {useCallback, useMemo, useState} from 'react';
+import FocusTrapContainerElement from '@components/FocusTrap/FocusTrapContainerElement';
 import HeaderWithBackButton from '@components/HeaderWithBackButton';
 import ScreenWrapper from '@components/ScreenWrapper';
 import TabSelector from '@components/TabSelector/TabSelector';
 import useLocalize from '@hooks/useLocalize';
-import OnyxTabNavigator, {TopTab} from '@libs/Navigation/OnyxTabNavigator';
+import useThemeStyles from '@hooks/useThemeStyles';
+import OnyxTabNavigator, {TabScreenWithFocusTrapWrapper, TopTab} from '@libs/Navigation/OnyxTabNavigator';
 import CONST from '@src/CONST';
 import NewChatPage from './NewChatPage';
 import WorkspaceNewRoomPage from './workspace/WorkspaceNewRoomPage';
 
 function NewChatSelectorPage() {
     const {translate} = useLocalize();
+    const styles = useThemeStyles();
     const navigation = useNavigation();
+    // The focus trap container elements of the header and back button, tab bar, and active tab
+    const [headerWithBackBtnContainerElement, setHeaderWithBackButtonContainerElement] = useState<HTMLElement | null>(null);
+    const [tabBarContainerElement, setTabBarContainerElement] = useState<HTMLElement | null>(null);
+    const [activeTabContainerElement, setActiveTabContainerElement] = useState<HTMLElement | null>(null);
+
+    // Theoretically, the focus trap container element can be null (due to component unmount/remount), so we filter out the null elements
+    const containerElements = useMemo(() => {
+        return [headerWithBackBtnContainerElement, tabBarContainerElement, activeTabContainerElement].filter((element) => !!element) as HTMLElement[];
+    }, [headerWithBackBtnContainerElement, tabBarContainerElement, activeTabContainerElement]);
+
+    const onTabFocusTrapContainerElementChanged = useCallback((activeTabElement?: HTMLElement | null) => {
+        setActiveTabContainerElement(activeTabElement ?? null);
+    }, []);
 
     return (
         <ScreenWrapper
@@ -20,23 +36,38 @@ function NewChatSelectorPage() {
             shouldShowOfflineIndicator={false}
             shouldEnableMaxHeight
             testID={NewChatSelectorPage.displayName}
+            focusTrapSettings={{containerElements}}
         >
-            <HeaderWithBackButton
-                title={translate('sidebarScreen.fabNewChat')}
-                onBackButtonPress={navigation.goBack}
-            />
+            <FocusTrapContainerElement
+                onContainerElementChanged={setHeaderWithBackButtonContainerElement}
+                style={[styles.w100]}
+            >
+                <HeaderWithBackButton
+                    title={translate('sidebarScreen.fabNewChat')}
+                    onBackButtonPress={navigation.goBack}
+                />
+            </FocusTrapContainerElement>
+
             <OnyxTabNavigator
                 id={CONST.TAB.NEW_CHAT_TAB_ID}
                 tabBar={TabSelector}
+                onTabBarFocusTrapContainerElementChanged={setTabBarContainerElement}
+                onActiveTabFocusTrapContainerElementChanged={onTabFocusTrapContainerElementChanged}
             >
-                <TopTab.Screen
-                    name={CONST.TAB.NEW_CHAT}
-                    component={NewChatPage}
-                />
-                <TopTab.Screen
-                    name={CONST.TAB.NEW_ROOM}
-                    component={WorkspaceNewRoomPage}
-                />
+                <TopTab.Screen name={CONST.TAB.NEW_CHAT}>
+                    {() => (
+                        <TabScreenWithFocusTrapWrapper>
+                            <NewChatPage />
+                        </TabScreenWithFocusTrapWrapper>
+                    )}
+                </TopTab.Screen>
+                <TopTab.Screen name={CONST.TAB.NEW_ROOM}>
+                    {() => (
+                        <TabScreenWithFocusTrapWrapper>
+                            <WorkspaceNewRoomPage />
+                        </TabScreenWithFocusTrapWrapper>
+                    )}
+                </TopTab.Screen>
             </OnyxTabNavigator>
         </ScreenWrapper>
     );
diff --git a/src/pages/OnboardingPersonalDetails/BaseOnboardingPersonalDetails.tsx b/src/pages/OnboardingPersonalDetails/BaseOnboardingPersonalDetails.tsx
index 7fcb5c1c5de6..67a520ab7267 100644
--- a/src/pages/OnboardingPersonalDetails/BaseOnboardingPersonalDetails.tsx
+++ b/src/pages/OnboardingPersonalDetails/BaseOnboardingPersonalDetails.tsx
@@ -1,43 +1,52 @@
-import React, {useCallback, useState} from 'react';
+import React, {useCallback, useEffect, useState} from 'react';
 import {View} from 'react-native';
 import {withOnyx} from 'react-native-onyx';
 import FormProvider from '@components/Form/FormProvider';
 import InputWrapper from '@components/Form/InputWrapper';
 import type {FormOnyxValues} from '@components/Form/types';
 import HeaderWithBackButton from '@components/HeaderWithBackButton';
-import KeyboardAvoidingView from '@components/KeyboardAvoidingView';
 import OfflineIndicator from '@components/OfflineIndicator';
+import {useSession} from '@components/OnyxProvider';
+import ScreenWrapper from '@components/ScreenWrapper';
 import Text from '@components/Text';
 import TextInput from '@components/TextInput';
 import withCurrentUserPersonalDetails from '@components/withCurrentUserPersonalDetails';
 import useAutoFocusInput from '@hooks/useAutoFocusInput';
-import useDisableModalDismissOnEscape from '@hooks/useDisableModalDismissOnEscape';
 import useLocalize from '@hooks/useLocalize';
 import useOnboardingLayout from '@hooks/useOnboardingLayout';
 import useThemeStyles from '@hooks/useThemeStyles';
 import useWindowDimensions from '@hooks/useWindowDimensions';
+import AccountUtils from '@libs/AccountUtils';
 import * as ErrorUtils from '@libs/ErrorUtils';
 import Navigation from '@libs/Navigation/Navigation';
 import * as ValidationUtils from '@libs/ValidationUtils';
-import variables from '@styles/variables';
 import * as PersonalDetails from '@userActions/PersonalDetails';
 import * as Report from '@userActions/Report';
 import * as Welcome from '@userActions/Welcome';
 import CONST from '@src/CONST';
 import ONYXKEYS from '@src/ONYXKEYS';
-import ROUTES from '@src/ROUTES';
 import INPUT_IDS from '@src/types/form/DisplayNameForm';
 import type {BaseOnboardingPersonalDetailsOnyxProps, BaseOnboardingPersonalDetailsProps} from './types';
 
-function BaseOnboardingPersonalDetails({currentUserPersonalDetails, shouldUseNativeStyles, onboardingPurposeSelected, onboardingAdminsChatReportID}: BaseOnboardingPersonalDetailsProps) {
+function BaseOnboardingPersonalDetails({
+    currentUserPersonalDetails,
+    shouldUseNativeStyles,
+    onboardingPurposeSelected,
+    onboardingAdminsChatReportID,
+    onboardingPolicyID,
+    route,
+}: BaseOnboardingPersonalDetailsProps) {
     const styles = useThemeStyles();
     const {translate} = useLocalize();
     const {isSmallScreenWidth} = useWindowDimensions();
-    const {shouldUseNarrowLayout} = useOnboardingLayout();
+    const {isMediumOrLargerScreenWidth} = useOnboardingLayout();
     const {inputCallbackRef} = useAutoFocusInput();
     const [shouldValidateOnChange, setShouldValidateOnChange] = useState(false);
+    const {accountID} = useSession();
 
-    useDisableModalDismissOnEscape();
+    useEffect(() => {
+        Welcome.setOnboardingErrorMessage('');
+    }, []);
 
     const completeEngagement = useCallback(
         (values: FormOnyxValues<'onboardingPersonalDetailsForm'>) => {
@@ -54,32 +63,29 @@ function BaseOnboardingPersonalDetails({currentUserPersonalDetails, shouldUseNat
                 onboardingPurposeSelected,
                 CONST.ONBOARDING_MESSAGES[onboardingPurposeSelected],
                 {
-                    login: currentUserPersonalDetails.login ?? '',
                     firstName,
                     lastName,
                 },
                 onboardingAdminsChatReportID ?? undefined,
+                onboardingPolicyID,
             );
 
             Welcome.setOnboardingAdminsChatReportID();
+            Welcome.setOnboardingPolicyID();
 
             Navigation.dismissModal();
 
             // Only navigate to concierge chat when central pane is visible
             // Otherwise stay on the chats screen.
-            if (isSmallScreenWidth) {
-                Navigation.navigate(ROUTES.HOME);
-            } else {
-                Report.navigateToConciergeChat();
+            if (!isSmallScreenWidth && !route.params?.backTo) {
+                if (AccountUtils.isAccountIDOddNumber(accountID ?? 0)) {
+                    Report.navigateToSystemChat();
+                } else {
+                    Report.navigateToConciergeChat();
+                }
             }
-
-            // Small delay purely due to design considerations,
-            // no special technical reasons behind that.
-            setTimeout(() => {
-                Navigation.navigate(ROUTES.WELCOME_VIDEO_ROOT);
-            }, variables.welcomeVideoDelay);
         },
-        [currentUserPersonalDetails.login, isSmallScreenWidth, onboardingPurposeSelected, onboardingAdminsChatReportID],
+        [onboardingPurposeSelected, onboardingAdminsChatReportID, onboardingPolicyID, isSmallScreenWidth, route.params?.backTo, accountID],
     );
 
     const validate = (values: FormOnyxValues<'onboardingPersonalDetailsForm'>) => {
@@ -91,25 +97,25 @@ function BaseOnboardingPersonalDetails({currentUserPersonalDetails, shouldUseNat
 
         // First we validate the first name field
         if (values.firstName.replace(CONST.REGEX.ANY_SPACE, '').length === 0) {
-            ErrorUtils.addErrorMessage(errors, 'firstName', 'onboarding.error.requiredFirstName');
+            ErrorUtils.addErrorMessage(errors, 'firstName', translate('onboarding.error.requiredFirstName'));
         }
         if (!ValidationUtils.isValidDisplayName(values.firstName)) {
-            ErrorUtils.addErrorMessage(errors, 'firstName', 'personalDetails.error.hasInvalidCharacter');
+            ErrorUtils.addErrorMessage(errors, 'firstName', translate('personalDetails.error.hasInvalidCharacter'));
         } else if (values.firstName.length > CONST.DISPLAY_NAME.MAX_LENGTH) {
-            ErrorUtils.addErrorMessage(errors, 'firstName', ['common.error.characterLimitExceedCounter', {length: values.firstName.length, limit: CONST.DISPLAY_NAME.MAX_LENGTH}]);
+            ErrorUtils.addErrorMessage(errors, 'firstName', translate('common.error.characterLimitExceedCounter', {length: values.firstName.length, limit: CONST.DISPLAY_NAME.MAX_LENGTH}));
         }
         if (ValidationUtils.doesContainReservedWord(values.firstName, CONST.DISPLAY_NAME.RESERVED_NAMES)) {
-            ErrorUtils.addErrorMessage(errors, 'firstName', 'personalDetails.error.containsReservedWord');
+            ErrorUtils.addErrorMessage(errors, 'firstName', translate('personalDetails.error.containsReservedWord'));
         }
 
         // Then we validate the last name field
         if (!ValidationUtils.isValidDisplayName(values.lastName)) {
-            ErrorUtils.addErrorMessage(errors, 'lastName', 'personalDetails.error.hasInvalidCharacter');
+            ErrorUtils.addErrorMessage(errors, 'lastName', translate('personalDetails.error.hasInvalidCharacter'));
         } else if (values.lastName.length > CONST.DISPLAY_NAME.MAX_LENGTH) {
-            ErrorUtils.addErrorMessage(errors, 'lastName', ['common.error.characterLimitExceedCounter', {length: values.lastName.length, limit: CONST.DISPLAY_NAME.MAX_LENGTH}]);
+            ErrorUtils.addErrorMessage(errors, 'lastName', translate('common.error.characterLimitExceedCounter', {length: values.lastName.length, limit: CONST.DISPLAY_NAME.MAX_LENGTH}));
         }
         if (ValidationUtils.doesContainReservedWord(values.lastName, CONST.DISPLAY_NAME.RESERVED_NAMES)) {
-            ErrorUtils.addErrorMessage(errors, 'lastName', 'personalDetails.error.containsReservedWord');
+            ErrorUtils.addErrorMessage(errors, 'lastName', translate('personalDetails.error.containsReservedWord'));
         }
 
         return errors;
@@ -118,18 +124,19 @@ function BaseOnboardingPersonalDetails({currentUserPersonalDetails, shouldUseNat
     const PersonalDetailsFooterInstance = <OfflineIndicator />;
 
     return (
-        <View style={[styles.h100, styles.defaultModalContainer, shouldUseNativeStyles && styles.pt8]}>
-            <HeaderWithBackButton
-                shouldShowBackButton
-                progressBarPercentage={75}
-                onBackButtonPress={Navigation.goBack}
-            />
-            <KeyboardAvoidingView
-                style={[styles.flex1, styles.dFlex]}
-                behavior="padding"
-            >
+        <ScreenWrapper
+            includeSafeAreaPaddingBottom={false}
+            shouldEnableMaxHeight
+            testID="BaseOnboardingPersonalDetails"
+        >
+            <View style={[styles.h100, styles.defaultModalContainer, shouldUseNativeStyles && styles.pt8]}>
+                <HeaderWithBackButton
+                    shouldShowBackButton
+                    progressBarPercentage={75}
+                    onBackButtonPress={Navigation.goBack}
+                />
                 <FormProvider
-                    style={[styles.flexGrow1, shouldUseNarrowLayout && styles.mt5, styles.mb5, shouldUseNarrowLayout ? styles.mh8 : styles.mh5]}
+                    style={[styles.flexGrow1, isMediumOrLargerScreenWidth && styles.mt5, isMediumOrLargerScreenWidth ? styles.mh8 : styles.mh5]}
                     formID={ONYXKEYS.FORMS.ONBOARDING_PERSONAL_DETAILS_FORM}
                     footerContent={isSmallScreenWidth && PersonalDetailsFooterInstance}
                     validate={validate}
@@ -141,7 +148,7 @@ function BaseOnboardingPersonalDetails({currentUserPersonalDetails, shouldUseNat
                     shouldValidateOnChange={shouldValidateOnChange}
                     shouldTrimValues={false}
                 >
-                    <View style={[shouldUseNarrowLayout ? styles.flexRow : styles.flexColumn, styles.mb5]}>
+                    <View style={[isMediumOrLargerScreenWidth ? styles.flexRow : styles.flexColumn, styles.mb5]}>
                         <Text style={styles.textHeadlineH1}>{translate('onboarding.whatsYourName')}</Text>
                     </View>
                     <View style={styles.mb4}>
@@ -174,8 +181,8 @@ function BaseOnboardingPersonalDetails({currentUserPersonalDetails, shouldUseNat
                         />
                     </View>
                 </FormProvider>
-            </KeyboardAvoidingView>
-        </View>
+            </View>
+        </ScreenWrapper>
     );
 }
 
@@ -189,5 +196,8 @@ export default withCurrentUserPersonalDetails(
         onboardingAdminsChatReportID: {
             key: ONYXKEYS.ONBOARDING_ADMINS_CHAT_REPORT_ID,
         },
+        onboardingPolicyID: {
+            key: ONYXKEYS.ONBOARDING_POLICY_ID,
+        },
     })(BaseOnboardingPersonalDetails),
 );
diff --git a/src/pages/OnboardingPersonalDetails/index.native.tsx b/src/pages/OnboardingPersonalDetails/index.native.tsx
index b5a4d42f0de1..624d2dd30587 100644
--- a/src/pages/OnboardingPersonalDetails/index.native.tsx
+++ b/src/pages/OnboardingPersonalDetails/index.native.tsx
@@ -2,7 +2,7 @@ import React from 'react';
 import BaseOnboardingPersonalDetails from './BaseOnboardingPersonalDetails';
 import type {OnboardingPersonalDetailsProps} from './types';
 
-function OnboardingPersonalDetails({...rest}: Omit<OnboardingPersonalDetailsProps, 'shouldUseNativeStyles'>) {
+function OnboardingPersonalDetails({...rest}: OnboardingPersonalDetailsProps) {
     return (
         <BaseOnboardingPersonalDetails
             shouldUseNativeStyles
diff --git a/src/pages/OnboardingPersonalDetails/index.tsx b/src/pages/OnboardingPersonalDetails/index.tsx
index d6a408ee7381..4cccf5dc1186 100644
--- a/src/pages/OnboardingPersonalDetails/index.tsx
+++ b/src/pages/OnboardingPersonalDetails/index.tsx
@@ -1,14 +1,23 @@
 import React from 'react';
+import {View} from 'react-native';
+import FocusTrapForScreens from '@components/FocusTrap/FocusTrapForScreen';
+import useThemeStyles from '@hooks/useThemeStyles';
 import BaseOnboardingPersonalDetails from './BaseOnboardingPersonalDetails';
 import type {OnboardingPersonalDetailsProps} from './types';
 
-function OnboardingPersonalDetails({...rest}: Omit<OnboardingPersonalDetailsProps, 'shouldUseNativeStyles'>) {
+function OnboardingPersonalDetails({...rest}: OnboardingPersonalDetailsProps) {
+    const styles = useThemeStyles();
+
     return (
-        <BaseOnboardingPersonalDetails
-            shouldUseNativeStyles={false}
-            // eslint-disable-next-line react/jsx-props-no-spreading
-            {...rest}
-        />
+        <FocusTrapForScreens>
+            <View style={styles.h100}>
+                <BaseOnboardingPersonalDetails
+                    shouldUseNativeStyles={false}
+                    // eslint-disable-next-line react/jsx-props-no-spreading
+                    {...rest}
+                />
+            </View>
+        </FocusTrapForScreens>
     );
 }
 
diff --git a/src/pages/OnboardingPersonalDetails/types.ts b/src/pages/OnboardingPersonalDetails/types.ts
index a89fe5ff8df7..5371f289e743 100644
--- a/src/pages/OnboardingPersonalDetails/types.ts
+++ b/src/pages/OnboardingPersonalDetails/types.ts
@@ -1,8 +1,12 @@
+import type {RouteProp} from '@react-navigation/native';
+import type {StackScreenProps} from '@react-navigation/stack';
 import type {OnyxEntry} from 'react-native-onyx';
 import type {WithCurrentUserPersonalDetailsProps} from '@components/withCurrentUserPersonalDetails';
+import type {OnboardingModalNavigatorParamList} from '@libs/Navigation/types';
 import type {OnboardingPurposeType} from '@src/CONST';
+import type SCREENS from '@src/SCREENS';
 
-type OnboardingPersonalDetailsProps = Record<string, unknown>;
+type OnboardingPersonalDetailsProps = Record<string, unknown> & StackScreenProps<OnboardingModalNavigatorParamList, typeof SCREENS.ONBOARDING.PERSONAL_DETAILS>;
 
 type BaseOnboardingPersonalDetailsOnyxProps = {
     /** Saved onboarding purpose selected by the user */
@@ -10,12 +14,17 @@ type BaseOnboardingPersonalDetailsOnyxProps = {
 
     /** Saved onboarding admin chat report ID */
     onboardingAdminsChatReportID: OnyxEntry<string>;
+
+    /** Saved onboarding policy ID */
+    onboardingPolicyID: OnyxEntry<string>;
 };
 
 type BaseOnboardingPersonalDetailsProps = WithCurrentUserPersonalDetailsProps &
     BaseOnboardingPersonalDetailsOnyxProps & {
         /* Whether to use native styles tailored for native devices */
         shouldUseNativeStyles: boolean;
+
+        route: RouteProp<OnboardingModalNavigatorParamList, typeof SCREENS.ONBOARDING.PERSONAL_DETAILS>;
     };
 
 export type {OnboardingPersonalDetailsProps, BaseOnboardingPersonalDetailsOnyxProps, BaseOnboardingPersonalDetailsProps};
diff --git a/src/pages/OnboardingPurpose/BaseOnboardingPurpose.tsx b/src/pages/OnboardingPurpose/BaseOnboardingPurpose.tsx
index fd328cc26cda..a9c89705d913 100644
--- a/src/pages/OnboardingPurpose/BaseOnboardingPurpose.tsx
+++ b/src/pages/OnboardingPurpose/BaseOnboardingPurpose.tsx
@@ -1,31 +1,32 @@
-import React, {useCallback, useEffect, useMemo, useState} from 'react';
+import {useIsFocused} from '@react-navigation/native';
+import React, {useCallback, useImperativeHandle, useRef} from 'react';
 import {View} from 'react-native';
 import {ScrollView} from 'react-native-gesture-handler';
-import {withOnyx} from 'react-native-onyx';
-import FormAlertWithSubmitButton from '@components/FormAlertWithSubmitButton';
+import {useOnyx} from 'react-native-onyx';
+import FormHelpMessage from '@components/FormHelpMessage';
 import HeaderWithBackButton from '@components/HeaderWithBackButton';
-import Icon from '@components/Icon';
-import * as Expensicons from '@components/Icon/Expensicons';
 import * as Illustrations from '@components/Icon/Illustrations';
 import type {MenuItemProps} from '@components/MenuItem';
 import MenuItemList from '@components/MenuItemList';
 import OfflineIndicator from '@components/OfflineIndicator';
 import SafeAreaConsumer from '@components/SafeAreaConsumer';
 import Text from '@components/Text';
-import useDisableModalDismissOnEscape from '@hooks/useDisableModalDismissOnEscape';
 import useLocalize from '@hooks/useLocalize';
 import useOnboardingLayout from '@hooks/useOnboardingLayout';
+import useResponsiveLayout from '@hooks/useResponsiveLayout';
 import useTheme from '@hooks/useTheme';
 import useThemeStyles from '@hooks/useThemeStyles';
 import useWindowDimensions from '@hooks/useWindowDimensions';
 import Navigation from '@libs/Navigation/Navigation';
+import OnboardingRefManager from '@libs/OnboardingRefManager';
+import type {TOnboardingRef} from '@libs/OnboardingRefManager';
 import variables from '@styles/variables';
 import * as Welcome from '@userActions/Welcome';
-import type {OnboardingPurposeType} from '@src/CONST';
 import CONST from '@src/CONST';
 import ONYXKEYS from '@src/ONYXKEYS';
 import ROUTES from '@src/ROUTES';
-import type {BaseOnboardingPurposeOnyxProps, BaseOnboardingPurposeProps} from './types';
+import isLoadingOnyxValue from '@src/types/utils/isLoadingOnyxValue';
+import type {BaseOnboardingPurposeProps} from './types';
 
 const menuIcons = {
     [CONST.ONBOARDING_CHOICES.EMPLOYER]: Illustrations.ReceiptUpload,
@@ -35,57 +36,21 @@ const menuIcons = {
     [CONST.ONBOARDING_CHOICES.LOOKING_AROUND]: Illustrations.Binoculars,
 };
 
-function BaseOnboardingPurpose({shouldUseNativeStyles, shouldEnableMaxHeight, onboardingPurposeSelected}: BaseOnboardingPurposeProps) {
+function BaseOnboardingPurpose({shouldUseNativeStyles, shouldEnableMaxHeight, route}: BaseOnboardingPurposeProps) {
     const styles = useThemeStyles();
     const {translate} = useLocalize();
-    const {shouldUseNarrowLayout} = useOnboardingLayout();
-    const [selectedPurpose, setSelectedPurpose] = useState<OnboardingPurposeType | undefined>(undefined);
-    const {isSmallScreenWidth, windowHeight} = useWindowDimensions();
-    const [error, setError] = useState(false);
-    const theme = useTheme();
-
-    useDisableModalDismissOnEscape();
-
-    const PurposeFooterInstance = <OfflineIndicator />;
-
-    useEffect(() => {
-        setSelectedPurpose(onboardingPurposeSelected ?? undefined);
-    }, [onboardingPurposeSelected]);
+    const {isMediumOrLargerScreenWidth} = useOnboardingLayout();
+    const {windowHeight} = useWindowDimensions();
+    const {isSmallScreenWidth} = useResponsiveLayout();
 
-    const errorMessage = error ? 'onboarding.purpose.error' : '';
+    const theme = useTheme();
+    const [onboardingErrorMessage, onboardingErrorMessageResult] = useOnyx(ONYXKEYS.ONBOARDING_ERROR_MESSAGE);
 
     const maxHeight = shouldEnableMaxHeight ? windowHeight : undefined;
-
-    const paddingHorizontal = shouldUseNarrowLayout ? styles.ph8 : styles.ph5;
-
-    const selectedCheckboxIcon = useMemo(
-        () => (
-            <View style={[styles.popoverMenuIcon, styles.pointerEventsAuto]}>
-                <Icon
-                    src={Expensicons.Checkmark}
-                    fill={theme.success}
-                />
-            </View>
-        ),
-        [styles.pointerEventsAuto, styles.popoverMenuIcon, theme.success],
-    );
-
-    const saveAndNavigate = useCallback(() => {
-        if (selectedPurpose === undefined) {
-            return;
-        }
-
-        if (selectedPurpose === CONST.ONBOARDING_CHOICES.MANAGE_TEAM) {
-            Navigation.navigate(ROUTES.ONBOARDING_WORK);
-            return;
-        }
-
-        Navigation.navigate(ROUTES.ONBOARDING_PERSONAL_DETAILS);
-    }, [selectedPurpose]);
+    const paddingHorizontal = isMediumOrLargerScreenWidth ? styles.ph8 : styles.ph5;
 
     const menuItems: MenuItemProps[] = Object.values(CONST.ONBOARDING_CHOICES).map((choice) => {
         const translationKey = `onboarding.purpose.${choice}` as const;
-        const isSelected = selectedPurpose === choice;
         return {
             key: translationKey,
             title: translate(translationKey),
@@ -94,31 +59,47 @@ function BaseOnboardingPurpose({shouldUseNativeStyles, shouldEnableMaxHeight, on
             iconWidth: variables.menuIconSize,
             iconHeight: variables.menuIconSize,
             iconStyles: [styles.mh3],
-            wrapperStyle: [styles.purposeMenuItem, isSelected && styles.purposeMenuItemSelected],
+            wrapperStyle: [styles.purposeMenuItem],
             hoverAndPressStyle: [styles.purposeMenuItemSelected],
-            rightComponent: selectedCheckboxIcon,
-            shouldShowRightComponent: isSelected,
+            numberOfLinesTitle: 0,
             onPress: () => {
                 Welcome.setOnboardingPurposeSelected(choice);
-                setError(false);
+                Welcome.setOnboardingErrorMessage('');
+
+                if (choice === CONST.ONBOARDING_CHOICES.MANAGE_TEAM) {
+                    Navigation.navigate(ROUTES.ONBOARDING_WORK.getRoute(route.params?.backTo));
+                    return;
+                }
+                Navigation.navigate(ROUTES.ONBOARDING_PERSONAL_DETAILS.getRoute(route.params?.backTo));
             },
         };
     });
+    const isFocused = useIsFocused();
 
+    const handleOuterClick = useCallback(() => {
+        Welcome.setOnboardingErrorMessage(translate('onboarding.purpose.errorSelection'));
+    }, [translate]);
+
+    const onboardingLocalRef = useRef<TOnboardingRef>(null);
+    useImperativeHandle(isFocused ? OnboardingRefManager.ref : onboardingLocalRef, () => ({handleOuterClick}), [handleOuterClick]);
+
+    if (isLoadingOnyxValue(onboardingErrorMessageResult)) {
+        return null;
+    }
     return (
         <SafeAreaConsumer>
             {({safeAreaPaddingBottomStyle}) => (
                 <View style={[{maxHeight}, styles.h100, styles.defaultModalContainer, shouldUseNativeStyles && styles.pt8, safeAreaPaddingBottomStyle]}>
-                    <View style={shouldUseNarrowLayout && styles.mh3}>
+                    <View style={isMediumOrLargerScreenWidth && styles.mh3}>
                         <HeaderWithBackButton
                             shouldShowBackButton={false}
                             iconFill={theme.iconColorfulBackground}
                             progressBarPercentage={25}
                         />
                     </View>
-                    <ScrollView style={[styles.flex1, styles.flexGrow1, shouldUseNarrowLayout && styles.mt5, paddingHorizontal]}>
+                    <ScrollView style={[styles.flex1, styles.flexGrow1, isMediumOrLargerScreenWidth && styles.mt5, paddingHorizontal]}>
                         <View style={styles.flex1}>
-                            <View style={[shouldUseNarrowLayout ? styles.flexRow : styles.flexColumn, styles.mb5]}>
+                            <View style={[isMediumOrLargerScreenWidth ? styles.flexRow : styles.flexColumn, styles.mb5]}>
                                 <Text style={styles.textHeadlineH1}>{translate('onboarding.purpose.title')} </Text>
                             </View>
                             <MenuItemList
@@ -127,22 +108,10 @@ function BaseOnboardingPurpose({shouldUseNativeStyles, shouldEnableMaxHeight, on
                             />
                         </View>
                     </ScrollView>
-                    <FormAlertWithSubmitButton
-                        enabledWhenOffline
-                        footerContent={isSmallScreenWidth && PurposeFooterInstance}
-                        buttonText={translate('common.continue')}
-                        onSubmit={() => {
-                            if (!selectedPurpose) {
-                                setError(true);
-                                return;
-                            }
-                            setError(false);
-                            saveAndNavigate();
-                        }}
-                        message={errorMessage}
-                        isAlertVisible={error || Boolean(errorMessage)}
-                        containerStyles={[styles.w100, styles.mb5, styles.mh0, paddingHorizontal]}
-                    />
+                    <View style={[styles.w100, styles.mb5, styles.mh0, paddingHorizontal]}>
+                        <FormHelpMessage message={onboardingErrorMessage} />
+                    </View>
+                    {isSmallScreenWidth && <OfflineIndicator />}
                 </View>
             )}
         </SafeAreaConsumer>
@@ -151,10 +120,6 @@ function BaseOnboardingPurpose({shouldUseNativeStyles, shouldEnableMaxHeight, on
 
 BaseOnboardingPurpose.displayName = 'BaseOnboardingPurpose';
 
-export default withOnyx<BaseOnboardingPurposeProps, BaseOnboardingPurposeOnyxProps>({
-    onboardingPurposeSelected: {
-        key: ONYXKEYS.ONBOARDING_PURPOSE_SELECTED,
-    },
-})(BaseOnboardingPurpose);
+export default BaseOnboardingPurpose;
 
 export type {BaseOnboardingPurposeProps};
diff --git a/src/pages/OnboardingPurpose/index.native.tsx b/src/pages/OnboardingPurpose/index.native.tsx
index c13245038629..02f8cf84a80f 100644
--- a/src/pages/OnboardingPurpose/index.native.tsx
+++ b/src/pages/OnboardingPurpose/index.native.tsx
@@ -1,8 +1,22 @@
-import React from 'react';
+import {useFocusEffect} from '@react-navigation/native';
+import React, {useCallback} from 'react';
+import {BackHandler} from 'react-native';
 import BaseOnboardingPurpose from './BaseOnboardingPurpose';
 import type {OnboardingPurposeProps} from './types';
 
 function OnboardingPurpose({...rest}: OnboardingPurposeProps) {
+    // To block android native back button behavior
+    useFocusEffect(
+        useCallback(() => {
+            // Return true to indicate that the back button press is handled here
+            const backAction = () => true;
+
+            const backHandler = BackHandler.addEventListener('hardwareBackPress', backAction);
+
+            return () => backHandler.remove();
+        }, []),
+    );
+
     return (
         <BaseOnboardingPurpose
             shouldUseNativeStyles
diff --git a/src/pages/OnboardingPurpose/index.tsx b/src/pages/OnboardingPurpose/index.tsx
index d7abedacbb85..bbe698e0970c 100644
--- a/src/pages/OnboardingPurpose/index.tsx
+++ b/src/pages/OnboardingPurpose/index.tsx
@@ -1,15 +1,24 @@
 import React from 'react';
+import {View} from 'react-native';
+import FocusTrapForScreens from '@components/FocusTrap/FocusTrapForScreen';
+import useThemeStyles from '@hooks/useThemeStyles';
 import BaseOnboardingPurpose from './BaseOnboardingPurpose';
 import type {OnboardingPurposeProps} from './types';
 
 function OnboardingPurpose({...rest}: OnboardingPurposeProps) {
+    const styles = useThemeStyles();
+
     return (
-        <BaseOnboardingPurpose
-            shouldUseNativeStyles={false}
-            shouldEnableMaxHeight={false}
-            // eslint-disable-next-line react/jsx-props-no-spreading
-            {...rest}
-        />
+        <FocusTrapForScreens>
+            <View style={styles.h100}>
+                <BaseOnboardingPurpose
+                    shouldUseNativeStyles={false}
+                    shouldEnableMaxHeight={false}
+                    // eslint-disable-next-line react/jsx-props-no-spreading
+                    {...rest}
+                />
+            </View>
+        </FocusTrapForScreens>
     );
 }
 
diff --git a/src/pages/OnboardingPurpose/types.ts b/src/pages/OnboardingPurpose/types.ts
index 8c8f11503f1a..7a61196fd328 100644
--- a/src/pages/OnboardingPurpose/types.ts
+++ b/src/pages/OnboardingPurpose/types.ts
@@ -1,20 +1,15 @@
-import type {OnyxEntry} from 'react-native-onyx';
-import type {OnboardingPurposeType} from '@src/CONST';
+import type {StackScreenProps} from '@react-navigation/stack';
+import type {OnboardingModalNavigatorParamList} from '@libs/Navigation/types';
+import type SCREENS from '@src/SCREENS';
 
-type OnboardingPurposeProps = Record<string, unknown>;
+type OnboardingPurposeProps = Record<string, unknown> & StackScreenProps<OnboardingModalNavigatorParamList, typeof SCREENS.ONBOARDING.PURPOSE>;
 
-type BaseOnboardingPurposeOnyxProps = {
-    /** Saved onboarding purpose selected by the user */
-    onboardingPurposeSelected: OnyxEntry<OnboardingPurposeType>;
-};
-
-type BaseOnboardingPurposeProps = OnboardingPurposeProps &
-    BaseOnboardingPurposeOnyxProps & {
-        /* Whether to use native styles tailored for native devices */
-        shouldUseNativeStyles: boolean;
+type BaseOnboardingPurposeProps = OnboardingPurposeProps & {
+    /* Whether to use native styles tailored for native devices */
+    shouldUseNativeStyles: boolean;
 
-        /** Whether to use the maxHeight (true) or use the 100% of the height (false) */
-        shouldEnableMaxHeight: boolean;
-    };
+    /** Whether to use the maxHeight (true) or use the 100% of the height (false) */
+    shouldEnableMaxHeight: boolean;
+};
 
-export type {BaseOnboardingPurposeOnyxProps, BaseOnboardingPurposeProps, OnboardingPurposeProps};
+export type {BaseOnboardingPurposeProps, OnboardingPurposeProps};
diff --git a/src/pages/OnboardingWork/BaseOnboardingWork.tsx b/src/pages/OnboardingWork/BaseOnboardingWork.tsx
index 8fdbed73111e..cf0809c8fb99 100644
--- a/src/pages/OnboardingWork/BaseOnboardingWork.tsx
+++ b/src/pages/OnboardingWork/BaseOnboardingWork.tsx
@@ -5,19 +5,19 @@ import FormProvider from '@components/Form/FormProvider';
 import InputWrapper from '@components/Form/InputWrapper';
 import type {FormInputErrors, FormOnyxValues} from '@components/Form/types';
 import HeaderWithBackButton from '@components/HeaderWithBackButton';
-import KeyboardAvoidingView from '@components/KeyboardAvoidingView';
 import OfflineIndicator from '@components/OfflineIndicator';
+import ScreenWrapper from '@components/ScreenWrapper';
 import Text from '@components/Text';
 import TextInput from '@components/TextInput';
-import useDisableModalDismissOnEscape from '@hooks/useDisableModalDismissOnEscape';
+import useAutoFocusInput from '@hooks/useAutoFocusInput';
 import useLocalize from '@hooks/useLocalize';
 import useOnboardingLayout from '@hooks/useOnboardingLayout';
+import useResponsiveLayout from '@hooks/useResponsiveLayout';
 import useThemeStyles from '@hooks/useThemeStyles';
-import useWindowDimensions from '@hooks/useWindowDimensions';
 import * as ErrorUtils from '@libs/ErrorUtils';
 import Navigation from '@libs/Navigation/Navigation';
 import * as ValidationUtils from '@libs/ValidationUtils';
-import * as Policy from '@userActions/Policy';
+import * as Policy from '@userActions/Policy/Policy';
 import * as Welcome from '@userActions/Welcome';
 import CONST from '@src/CONST';
 import ONYXKEYS from '@src/ONYXKEYS';
@@ -27,13 +27,12 @@ import type {BaseOnboardingWorkOnyxProps, BaseOnboardingWorkProps} from './types
 
 const OPEN_WORK_PAGE_PURPOSES = [CONST.ONBOARDING_CHOICES.MANAGE_TEAM];
 
-function BaseOnboardingWork({shouldUseNativeStyles, onboardingPurposeSelected}: BaseOnboardingWorkProps) {
+function BaseOnboardingWork({shouldUseNativeStyles, onboardingPurposeSelected, onboardingPolicyID, route}: BaseOnboardingWorkProps) {
     const styles = useThemeStyles();
     const {translate} = useLocalize();
-    const {isSmallScreenWidth} = useWindowDimensions();
-    const {shouldUseNarrowLayout} = useOnboardingLayout();
-
-    useDisableModalDismissOnEscape();
+    const {shouldUseNarrowLayout} = useResponsiveLayout();
+    const {isMediumOrLargerScreenWidth} = useOnboardingLayout();
+    const {inputCallbackRef} = useAutoFocusInput();
 
     const completeEngagement = useCallback(
         (values: FormOnyxValues<'onboardingWorkForm'>) => {
@@ -41,11 +40,17 @@ function BaseOnboardingWork({shouldUseNativeStyles, onboardingPurposeSelected}:
                 return;
             }
             const work = values.work.trim();
-            const {adminsChatReportID} = Policy.createWorkspace(undefined, true, work);
-            Welcome.setOnboardingAdminsChatReportID(adminsChatReportID);
-            Navigation.navigate(ROUTES.ONBOARDING_PERSONAL_DETAILS);
+            if (!onboardingPolicyID) {
+                const {adminsChatReportID, policyID} = Policy.createWorkspace(undefined, true, work);
+                Welcome.setOnboardingAdminsChatReportID(adminsChatReportID);
+                Welcome.setOnboardingPolicyID(policyID);
+            } else {
+                Policy.updateGeneralSettings(onboardingPolicyID, work);
+            }
+
+            Navigation.navigate(ROUTES.ONBOARDING_PERSONAL_DETAILS.getRoute(route.params?.backTo));
         },
-        [onboardingPurposeSelected],
+        [onboardingPurposeSelected, onboardingPolicyID, route.params?.backTo],
     );
 
     const validate = (values: FormOnyxValues<'onboardingWorkForm'>) => {
@@ -53,11 +58,11 @@ function BaseOnboardingWork({shouldUseNativeStyles, onboardingPurposeSelected}:
         const work = values.work.trim();
 
         if (!ValidationUtils.isRequiredFulfilled(work)) {
-            errors.work = 'workspace.editor.nameIsRequiredError';
+            errors.work = translate('workspace.editor.nameIsRequiredError');
         } else if ([...work].length > CONST.TITLE_CHARACTER_LIMIT) {
             // Uses the spread syntax to count the number of Unicode code points instead of the number of UTF-16
             // code units.
-            ErrorUtils.addErrorMessage(errors, 'work', ['common.error.characterLimitExceedCounter', {length: [...work].length, limit: CONST.TITLE_CHARACTER_LIMIT}]);
+            ErrorUtils.addErrorMessage(errors, 'work', translate('common.error.characterLimitExceedCounter', {length: [...work].length, limit: CONST.TITLE_CHARACTER_LIMIT}));
         }
 
         return errors;
@@ -66,20 +71,22 @@ function BaseOnboardingWork({shouldUseNativeStyles, onboardingPurposeSelected}:
     const WorkFooterInstance = <OfflineIndicator />;
 
     return (
-        <View style={[styles.h100, styles.defaultModalContainer, shouldUseNativeStyles && styles.pt8]}>
-            <HeaderWithBackButton
-                shouldShowBackButton
-                progressBarPercentage={OPEN_WORK_PAGE_PURPOSES.includes(onboardingPurposeSelected ?? '') ? 50 : 75}
-                onBackButtonPress={Navigation.goBack}
-            />
-            <KeyboardAvoidingView
-                style={[styles.flex1, styles.dFlex]}
-                behavior="padding"
-            >
+        <ScreenWrapper
+            includeSafeAreaPaddingBottom={false}
+            shouldEnableMaxHeight
+            shouldEnableKeyboardAvoidingView
+            testID="BaseOnboardingWork"
+        >
+            <View style={[styles.h100, styles.defaultModalContainer, shouldUseNativeStyles && styles.pt8]}>
+                <HeaderWithBackButton
+                    shouldShowBackButton
+                    progressBarPercentage={OPEN_WORK_PAGE_PURPOSES.includes(onboardingPurposeSelected ?? '') ? 50 : 75}
+                    onBackButtonPress={Navigation.goBack}
+                />
                 <FormProvider
-                    style={[styles.flexGrow1, shouldUseNarrowLayout && styles.mt5, styles.mb5, shouldUseNarrowLayout ? styles.mh8 : styles.mh5]}
+                    style={[styles.flexGrow1, isMediumOrLargerScreenWidth && styles.mt5, isMediumOrLargerScreenWidth ? styles.mh8 : styles.mh5]}
                     formID={ONYXKEYS.FORMS.ONBOARDING_PERSONAL_WORK}
-                    footerContent={isSmallScreenWidth && WorkFooterInstance}
+                    footerContent={shouldUseNarrowLayout && WorkFooterInstance}
                     validate={validate}
                     onSubmit={completeEngagement}
                     submitButtonText={translate('common.continue')}
@@ -89,12 +96,13 @@ function BaseOnboardingWork({shouldUseNativeStyles, onboardingPurposeSelected}:
                     shouldValidateOnChange
                     shouldTrimValues={false}
                 >
-                    <View style={[shouldUseNarrowLayout ? styles.flexRow : styles.flexColumn, styles.mb5]}>
+                    <View style={[isMediumOrLargerScreenWidth ? styles.flexRow : styles.flexColumn, styles.mb5]}>
                         <Text style={[styles.textHeadlineH1, styles.textXXLarge]}>{translate('onboarding.whereYouWork')}</Text>
                     </View>
                     <View style={styles.mb4}>
                         <InputWrapper
                             InputComponent={TextInput}
+                            ref={inputCallbackRef}
                             inputID={INPUT_IDS.WORK}
                             name="fwork"
                             label={translate('common.businessName')}
@@ -107,8 +115,8 @@ function BaseOnboardingWork({shouldUseNativeStyles, onboardingPurposeSelected}:
                         />
                     </View>
                 </FormProvider>
-            </KeyboardAvoidingView>
-        </View>
+            </View>
+        </ScreenWrapper>
     );
 }
 
@@ -118,4 +126,7 @@ export default withOnyx<BaseOnboardingWorkProps, BaseOnboardingWorkOnyxProps>({
     onboardingPurposeSelected: {
         key: ONYXKEYS.ONBOARDING_PURPOSE_SELECTED,
     },
+    onboardingPolicyID: {
+        key: ONYXKEYS.ONBOARDING_POLICY_ID,
+    },
 })(BaseOnboardingWork);
diff --git a/src/pages/OnboardingWork/index.tsx b/src/pages/OnboardingWork/index.tsx
index ba1b8aaeb106..4323ad1c2ab5 100644
--- a/src/pages/OnboardingWork/index.tsx
+++ b/src/pages/OnboardingWork/index.tsx
@@ -1,14 +1,22 @@
 import React from 'react';
+import {View} from 'react-native';
+import FocusTrapForScreens from '@components/FocusTrap/FocusTrapForScreen';
+import useThemeStyles from '@hooks/useThemeStyles';
 import BaseOnboardingWork from './BaseOnboardingWork';
 import type {OnboardingWorkProps} from './types';
 
 function OnboardingWork({...rest}: Omit<OnboardingWorkProps, 'shouldUseNativeStyles'>) {
+    const styles = useThemeStyles();
     return (
-        <BaseOnboardingWork
-            shouldUseNativeStyles={false}
-            // eslint-disable-next-line react/jsx-props-no-spreading
-            {...rest}
-        />
+        <FocusTrapForScreens>
+            <View style={styles.h100}>
+                <BaseOnboardingWork
+                    shouldUseNativeStyles={false}
+                    // eslint-disable-next-line react/jsx-props-no-spreading
+                    {...rest}
+                />
+            </View>
+        </FocusTrapForScreens>
     );
 }
 
diff --git a/src/pages/OnboardingWork/types.ts b/src/pages/OnboardingWork/types.ts
index 954c8c15b31d..d87843944cd6 100644
--- a/src/pages/OnboardingWork/types.ts
+++ b/src/pages/OnboardingWork/types.ts
@@ -1,16 +1,23 @@
+import type {StackScreenProps} from '@react-navigation/stack';
 import type {OnyxEntry} from 'react-native-onyx';
+import type {OnboardingModalNavigatorParamList} from '@libs/Navigation/types';
 import type {OnboardingPurposeType} from '@src/CONST';
+import type SCREENS from '@src/SCREENS';
 
-type OnboardingWorkProps = Record<string, unknown>;
+type OnboardingWorkProps = Record<string, unknown> & StackScreenProps<OnboardingModalNavigatorParamList, typeof SCREENS.ONBOARDING.WORK>;
 
 type BaseOnboardingWorkOnyxProps = {
     /** Saved onboarding purpose selected by the user */
     onboardingPurposeSelected: OnyxEntry<OnboardingPurposeType>;
-};
 
-type BaseOnboardingWorkProps = BaseOnboardingWorkOnyxProps & {
-    /* Whether to use native styles tailored for native devices */
-    shouldUseNativeStyles: boolean;
+    /** Saved onboarding purpose selected by the user */
+    onboardingPolicyID: OnyxEntry<string>;
 };
 
+type BaseOnboardingWorkProps = OnboardingWorkProps &
+    BaseOnboardingWorkOnyxProps & {
+        /* Whether to use native styles tailored for native devices */
+        shouldUseNativeStyles: boolean;
+    };
+
 export type {OnboardingWorkProps, BaseOnboardingWorkOnyxProps, BaseOnboardingWorkProps};
diff --git a/src/pages/PrivateNotes/PrivateNotesEditPage.tsx b/src/pages/PrivateNotes/PrivateNotesEditPage.tsx
index f9560edf7486..1779fe8e085e 100644
--- a/src/pages/PrivateNotes/PrivateNotesEditPage.tsx
+++ b/src/pages/PrivateNotes/PrivateNotesEditPage.tsx
@@ -1,11 +1,10 @@
 import {useFocusEffect} from '@react-navigation/native';
 import type {StackScreenProps} from '@react-navigation/stack';
-import ExpensiMark from 'expensify-common/lib/ExpensiMark';
-import Str from 'expensify-common/lib/str';
+import {Str} from 'expensify-common';
 import lodashDebounce from 'lodash/debounce';
 import React, {useCallback, useMemo, useRef, useState} from 'react';
 import {Keyboard} from 'react-native';
-import type {OnyxCollection} from 'react-native-onyx';
+import type {OnyxEntry} from 'react-native-onyx';
 import {withOnyx} from 'react-native-onyx';
 import FormProvider from '@components/Form/FormProvider';
 import InputWrapper from '@components/Form/InputWrapper';
@@ -20,6 +19,7 @@ import useLocalize from '@hooks/useLocalize';
 import useThemeStyles from '@hooks/useThemeStyles';
 import Navigation from '@libs/Navigation/Navigation';
 import type {PrivateNotesNavigatorParamList} from '@libs/Navigation/types';
+import Parser from '@libs/Parser';
 import * as ReportUtils from '@libs/ReportUtils';
 import updateMultilineInputRange from '@libs/updateMultilineInputRange';
 import type {WithReportAndPrivateNotesOrNotFoundProps} from '@pages/home/report/withReportAndPrivateNotesOrNotFound';
@@ -31,12 +31,12 @@ import ONYXKEYS from '@src/ONYXKEYS';
 import ROUTES from '@src/ROUTES';
 import type SCREENS from '@src/SCREENS';
 import INPUT_IDS from '@src/types/form/PrivateNotesForm';
-import type {PersonalDetails, Report} from '@src/types/onyx';
+import type {PersonalDetailsList, Report} from '@src/types/onyx';
 import type {Note} from '@src/types/onyx/Report';
 
 type PrivateNotesEditPageOnyxProps = {
     /** All of the personal details for everyone */
-    personalDetailsList: OnyxCollection<PersonalDetails>;
+    personalDetailsList: OnyxEntry<PersonalDetailsList>;
 };
 
 type PrivateNotesEditPageProps = WithReportAndPrivateNotesOrNotFoundProps &
@@ -46,14 +46,13 @@ type PrivateNotesEditPageProps = WithReportAndPrivateNotesOrNotFoundProps &
         report: Report;
     };
 
-function PrivateNotesEditPage({route, personalDetailsList, report}: PrivateNotesEditPageProps) {
+function PrivateNotesEditPage({route, personalDetailsList, report, session}: PrivateNotesEditPageProps) {
     const styles = useThemeStyles();
     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(
-        () => ReportActions.getDraftPrivateNote(report.reportID).trim() || parser.htmlToMarkdown(report?.privateNotes?.[Number(route.params.accountID)]?.note ?? '').trim(),
+        () => ReportActions.getDraftPrivateNote(report.reportID).trim() || Parser.htmlToMarkdown(report?.privateNotes?.[Number(route.params.accountID)]?.note ?? '').trim(),
     );
 
     /**
@@ -94,7 +93,7 @@ function PrivateNotesEditPage({route, personalDetailsList, report}: PrivateNotes
         const originalNote = report?.privateNotes?.[Number(route.params.accountID)]?.note ?? '';
         let editedNote = '';
         if (privateNote.trim() !== originalNote.trim()) {
-            editedNote = ReportActions.handleUserDeletedLinksInHtml(privateNote.trim(), parser.htmlToMarkdown(originalNote).trim());
+            editedNote = ReportActions.handleUserDeletedLinksInHtml(privateNote.trim(), Parser.htmlToMarkdown(originalNote).trim());
             ReportActions.updatePrivateNotes(report.reportID, Number(route.params.accountID), editedNote);
         }
 
@@ -117,7 +116,7 @@ function PrivateNotesEditPage({route, personalDetailsList, report}: PrivateNotes
         >
             <HeaderWithBackButton
                 title={translate('privateNotes.title')}
-                onBackButtonPress={() => Navigation.goBack(ROUTES.PRIVATE_NOTES_LIST.getRoute(report.reportID))}
+                onBackButtonPress={() => ReportUtils.goBackFromPrivateNotes(report, session)}
                 shouldShowBackButton
                 onCloseButtonPress={() => Navigation.dismissModal()}
             />
@@ -163,8 +162,10 @@ function PrivateNotesEditPage({route, personalDetailsList, report}: PrivateNotes
                             if (!el) {
                                 return;
                             }
+                            if (!privateNotesInput.current) {
+                                updateMultilineInputRange(el);
+                            }
                             privateNotesInput.current = el;
-                            updateMultilineInputRange(privateNotesInput.current);
                         }}
                         isMarkdownEnabled
                     />
diff --git a/src/pages/PrivateNotes/PrivateNotesListPage.tsx b/src/pages/PrivateNotes/PrivateNotesListPage.tsx
index 1893f81da2fe..055bba42c552 100644
--- a/src/pages/PrivateNotes/PrivateNotesListPage.tsx
+++ b/src/pages/PrivateNotes/PrivateNotesListPage.tsx
@@ -1,7 +1,8 @@
-import React, {useMemo} from 'react';
+import React, {useCallback, useMemo} from 'react';
+import type {OnyxEntry} from 'react-native-onyx';
 import {withOnyx} from 'react-native-onyx';
-import type {OnyxCollection} from 'react-native-onyx';
 import type {ValueOf} from 'type-fest';
+import {AttachmentContext} from '@components/AttachmentContext';
 import HeaderWithBackButton from '@components/HeaderWithBackButton';
 import MenuItemWithTopDescription from '@components/MenuItemWithTopDescription';
 import ScreenWrapper from '@components/ScreenWrapper';
@@ -15,11 +16,11 @@ import withReportAndPrivateNotesOrNotFound from '@pages/home/report/withReportAn
 import CONST from '@src/CONST';
 import ONYXKEYS from '@src/ONYXKEYS';
 import ROUTES from '@src/ROUTES';
-import type {PersonalDetails, Report} from '@src/types/onyx';
+import type {PersonalDetailsList, Report} from '@src/types/onyx';
 
 type PrivateNotesListPageOnyxProps = {
     /** All of the personal details for everyone */
-    personalDetailsList: OnyxCollection<PersonalDetails>;
+    personalDetailsList: OnyxEntry<PersonalDetailsList>;
 };
 
 type PrivateNotesListPageProps = WithReportAndPrivateNotesOrNotFoundProps &
@@ -34,29 +35,34 @@ type NoteListItem = {
     brickRoadIndicator: ValueOf<typeof CONST.BRICK_ROAD_INDICATOR_STATUS> | undefined;
     note: string;
     disabled: boolean;
+    reportID: string;
+    accountID: string;
 };
 
 function PrivateNotesListPage({report, personalDetailsList, session}: PrivateNotesListPageProps) {
     const styles = useThemeStyles();
     const {translate} = useLocalize();
+    const getAttachmentValue = useCallback((item: NoteListItem) => ({reportID: item.reportID, accountID: Number(item.accountID), type: CONST.ATTACHMENT_TYPE.NOTE}), []);
 
     /**
      * Gets the menu item for each workspace
      */
     function getMenuItem(item: NoteListItem) {
         return (
-            <MenuItemWithTopDescription
-                key={item.title}
-                description={item.title}
-                title={item.note}
-                onPress={item.action}
-                shouldShowRightIcon={!item.disabled}
-                numberOfLinesTitle={0}
-                shouldRenderAsHTML
-                brickRoadIndicator={item.brickRoadIndicator}
-                disabled={item.disabled}
-                shouldGreyOutWhenDisabled={false}
-            />
+            <AttachmentContext.Provider value={getAttachmentValue(item)}>
+                <MenuItemWithTopDescription
+                    key={item.title}
+                    description={item.title}
+                    title={item.note}
+                    onPress={item.action}
+                    shouldShowRightIcon={!item.disabled}
+                    numberOfLinesTitle={0}
+                    shouldRenderAsHTML
+                    brickRoadIndicator={item.brickRoadIndicator}
+                    disabled={item.disabled}
+                    shouldGreyOutWhenDisabled={false}
+                />
+            </AttachmentContext.Provider>
         );
     }
 
@@ -68,6 +74,8 @@ function PrivateNotesListPage({report, personalDetailsList, session}: PrivateNot
         return Object.keys(report.privateNotes ?? {}).map((accountID: string) => {
             const privateNote = report.privateNotes?.[Number(accountID)];
             return {
+                reportID: report.reportID,
+                accountID,
                 title: Number(session?.accountID) === Number(accountID) ? translate('privateNotes.myNote') : personalDetailsList?.[accountID]?.login ?? '',
                 action: () => Navigation.navigate(ROUTES.PRIVATE_NOTES_EDIT.getRoute(report.reportID, accountID)),
                 brickRoadIndicator: privateNoteBrickRoadIndicator(Number(accountID)),
diff --git a/src/pages/ProcessMoneyRequestHoldPage.tsx b/src/pages/ProcessMoneyRequestHoldPage.tsx
index ad04ada569bb..8872c251be3f 100644
--- a/src/pages/ProcessMoneyRequestHoldPage.tsx
+++ b/src/pages/ProcessMoneyRequestHoldPage.tsx
@@ -1,5 +1,6 @@
-import React, {useCallback, useMemo} from 'react';
-import {View} from 'react-native';
+import {useFocusEffect} from '@react-navigation/native';
+import React, {useCallback, useMemo, useRef} from 'react';
+import {InteractionManager, View} from 'react-native';
 import Button from '@components/Button';
 import HeaderPageLayout from '@components/HeaderPageLayout';
 import HoldMenuSectionList from '@components/HoldMenuSectionList';
@@ -7,15 +8,29 @@ import Text from '@components/Text';
 import TextPill from '@components/TextPill';
 import useLocalize from '@hooks/useLocalize';
 import useThemeStyles from '@hooks/useThemeStyles';
+import blurActiveElement from '@libs/Accessibility/blurActiveElement';
 import Navigation from '@libs/Navigation/Navigation';
 import * as IOU from '@userActions/IOU';
+import CONST from '@src/CONST';
 
 function ProcessMoneyRequestHoldPage() {
     const styles = useThemeStyles();
     const {translate} = useLocalize();
 
+    const focusTimeoutRef = useRef<NodeJS.Timeout | null>(null);
+    useFocusEffect(
+        useCallback(() => {
+            focusTimeoutRef.current = setTimeout(() => {
+                InteractionManager.runAfterInteractions(() => {
+                    blurActiveElement();
+                });
+            }, CONST.ANIMATED_TRANSITION);
+            return () => focusTimeoutRef.current && clearTimeout(focusTimeoutRef.current);
+        }, []),
+    );
+
     const onConfirm = useCallback(() => {
-        IOU.setShownHoldUseExplanation();
+        IOU.dismissHoldUseExplanation();
         Navigation.goBack();
     }, []);
 
@@ -26,6 +41,7 @@ function ProcessMoneyRequestHoldPage() {
                 text={translate('common.buttonConfirm')}
                 onPress={onConfirm}
                 large
+                pressOnEnter
             />
         ),
         [onConfirm, translate],
@@ -41,7 +57,7 @@ function ProcessMoneyRequestHoldPage() {
             <View style={[styles.mh5, styles.flex1]}>
                 <View style={[styles.flexRow, styles.alignItemsCenter, styles.mb5]}>
                     <Text style={[styles.textHeadline, styles.mr2]}>{translate('iou.holdEducationalTitle')}</Text>
-                    <TextPill textStyles={styles.holdRequestInline}>{translate('iou.hold')}</TextPill>
+                    <TextPill textStyles={styles.holdRequestInline}>{translate('violations.hold')}</TextPill>
                 </View>
                 <HoldMenuSectionList />
             </View>
diff --git a/src/pages/ProfilePage.tsx b/src/pages/ProfilePage.tsx
index f8f88e9cc3cf..8b12ae4b63ab 100755
--- a/src/pages/ProfilePage.tsx
+++ b/src/pages/ProfilePage.tsx
@@ -1,5 +1,5 @@
 import type {StackScreenProps} from '@react-navigation/stack';
-import Str from 'expensify-common/lib/str';
+import {Str} from 'expensify-common';
 import React, {useEffect, useMemo} from 'react';
 import {View} from 'react-native';
 import type {OnyxEntry} from 'react-native-onyx';
@@ -15,6 +15,8 @@ import MenuItem from '@components/MenuItem';
 import MenuItemWithTopDescription from '@components/MenuItemWithTopDescription';
 import OfflineWithFeedback from '@components/OfflineWithFeedback';
 import PressableWithoutFocus from '@components/Pressable/PressableWithoutFocus';
+import type {PromotedAction} from '@components/PromotedActionsBar';
+import PromotedActionsBar, {PromotedActions} from '@components/PromotedActionsBar';
 import ScreenWrapper from '@components/ScreenWrapper';
 import ScrollView from '@components/ScrollView';
 import Text from '@components/Text';
@@ -28,6 +30,7 @@ import * as ReportUtils from '@libs/ReportUtils';
 import * as UserUtils from '@libs/UserUtils';
 import * as ValidationUtils from '@libs/ValidationUtils';
 import type {ProfileNavigatorParamList} from '@navigation/types';
+import * as LinkActions from '@userActions/Link';
 import * as PersonalDetailsActions from '@userActions/PersonalDetails';
 import * as ReportActions from '@userActions/Report';
 import * as SessionActions from '@userActions/Session';
@@ -37,7 +40,6 @@ import ONYXKEYS from '@src/ONYXKEYS';
 import ROUTES from '@src/ROUTES';
 import type SCREENS from '@src/SCREENS';
 import type {PersonalDetails, Report} from '@src/types/onyx';
-import type {EmptyObject} from '@src/types/utils/EmptyObject';
 import {isEmptyObject} from '@src/types/utils/EmptyObject';
 
 type ProfilePageProps = StackScreenProps<ProfileNavigatorParamList, typeof SCREENS.PROFILE_ROOT>;
@@ -45,7 +47,8 @@ type ProfilePageProps = StackScreenProps<ProfileNavigatorParamList, typeof SCREE
 /**
  * Gets the phone number to display for SMS logins
  */
-const getPhoneNumber = ({login = '', displayName = ''}: PersonalDetails | EmptyObject): string | undefined => {
+const getPhoneNumber = (details: OnyxEntry<PersonalDetails>): string | undefined => {
+    const {login = '', displayName = ''} = details ?? {};
     // If the user hasn't set a displayName, it is set to their phone number
     const parsedPhoneNumber = parsePhoneNumber(displayName);
 
@@ -58,13 +61,13 @@ const getPhoneNumber = ({login = '', displayName = ''}: PersonalDetails | EmptyO
 };
 
 /**
- * This function narrow down the data from Onyx to just the properties that we want to trigger a re-render of the component. This helps minimize re-rendering
+ * This function narrows down the data from Onyx to just the properties that we want to trigger a re-render of the component. This helps minimize re-rendering
  * and makes the entire component more performant because it's not re-rendering when a bunch of properties change which aren't ever used in the UI.
  */
 const chatReportSelector = (report: OnyxEntry<Report>): OnyxEntry<Report> =>
     report && {
         reportID: report.reportID,
-        participantAccountIDs: report.participantAccountIDs,
+        participants: report.participants,
         parentReportID: report.parentReportID,
         parentReportActionID: report.parentReportActionID,
         type: report.type,
@@ -77,27 +80,51 @@ function ProfilePage({route}: ProfilePageProps) {
     const [personalDetails] = useOnyx(ONYXKEYS.PERSONAL_DETAILS_LIST);
     const [personalDetailsMetadata] = useOnyx(ONYXKEYS.PERSONAL_DETAILS_METADATA);
     const [session] = useOnyx(ONYXKEYS.SESSION);
+    const [guideCalendarLink] = useOnyx(ONYXKEYS.ACCOUNT, {
+        selector: (account) => account?.guideCalendarLink,
+    });
 
+    const accountID = Number(route.params?.accountID ?? -1);
+    const isCurrentUser = session?.accountID === accountID;
     const reportKey = useMemo(() => {
-        const accountID = Number(route.params?.accountID ?? 0);
-        const reportID = ReportUtils.getChatByParticipants([accountID], reports)?.reportID ?? '';
+        const reportID = isCurrentUser
+            ? ReportUtils.findSelfDMReportID()
+            : ReportUtils.getChatByParticipants(session?.accountID ? [accountID, session.accountID] : [], reports)?.reportID ?? '-1';
 
-        if ((Boolean(session) && Number(session?.accountID) === accountID) || SessionActions.isAnonymousUser() || !reportID) {
+        if (SessionActions.isAnonymousUser() || !reportID) {
             return `${ONYXKEYS.COLLECTION.REPORT}0` as const;
         }
         return `${ONYXKEYS.COLLECTION.REPORT}${reportID}` as const;
-    }, [reports, route.params?.accountID, session]);
+    }, [accountID, isCurrentUser, reports, session]);
     const [report] = useOnyx(reportKey);
 
     const styles = useThemeStyles();
     const {translate, formatPhoneNumber} = useLocalize();
-    const accountID = Number(route.params?.accountID ?? 0);
-    const isCurrentUser = session?.accountID === accountID;
-    const details: PersonalDetails | EmptyObject = personalDetails?.[accountID] ?? (ValidationUtils.isValidAccountRoute(accountID) ? {} : {accountID: 0, avatar: ''});
+
+    const isValidAccountID = ValidationUtils.isValidAccountRoute(accountID);
+    const loginParams = route.params?.login;
+
+    const details = useMemo((): OnyxEntry<PersonalDetails> => {
+        // Check if we have the personal details already in Onyx
+        if (personalDetails?.[accountID]) {
+            return personalDetails?.[accountID] ?? undefined;
+        }
+        // Check if we have the login param
+        if (!loginParams) {
+            return isValidAccountID ? undefined : {accountID: 0};
+        }
+        // Look up the personal details by login
+        const foundDetails = Object.values(personalDetails ?? {}).find((personalDetail) => personalDetail?.login === loginParams?.toLowerCase());
+        if (foundDetails) {
+            return foundDetails;
+        }
+        // If we don't have the personal details in Onyx, we can create an optimistic account
+        const optimisticAccountID = UserUtils.generateAccountID(loginParams);
+        return {accountID: optimisticAccountID, login: loginParams, displayName: loginParams};
+    }, [personalDetails, accountID, loginParams, isValidAccountID]);
 
     const displayName = PersonalDetailsUtils.getDisplayNameOrDefault(details, undefined, undefined, isCurrentUser);
     // eslint-disable-next-line @typescript-eslint/prefer-nullish-coalescing
-    const avatar = details?.avatar || UserUtils.getDefaultAvatar(); // we can have an empty string and in this case, we need to show the default avatar
     const fallbackIcon = details?.fallbackIcon ?? '';
     const login = details?.login ?? '';
     const timezone = details?.timezone;
@@ -117,11 +144,9 @@ function ProfilePage({route}: ProfilePageProps) {
     const phoneNumber = getPhoneNumber(details);
     const phoneOrEmail = isSMSLogin ? getPhoneNumber(details) : login;
 
-    const hasMinimumDetails = !isEmptyObject(details.avatar);
-    const isLoading = Boolean(personalDetailsMetadata?.[accountID]?.isLoading) || isEmptyObject(details);
-
-    // If the API returns an error for some reason there won't be any details and isLoading will get set to false, so we want to show a blocking screen
-    const shouldShowBlockingView = !hasMinimumDetails && !isLoading;
+    const hasAvatar = !!details?.avatar;
+    const isLoading = !!personalDetailsMetadata?.[accountID]?.isLoading || isEmptyObject(details);
+    const shouldShowBlockingView = (!isValidAccountID && !isLoading) || CONST.RESTRICTED_ACCOUNT_IDS.includes(accountID);
 
     const statusEmojiCode = details?.status?.emojiCode ?? '';
     const statusText = details?.status?.text ?? '';
@@ -138,120 +163,144 @@ function ProfilePage({route}: ProfilePageProps) {
 
     // eslint-disable-next-line rulesdir/prefer-early-return
     useEffect(() => {
-        if (ValidationUtils.isValidAccountRoute(accountID)) {
+        if (ValidationUtils.isValidAccountRoute(accountID) && !loginParams) {
             PersonalDetailsActions.openPublicProfilePage(accountID);
         }
-    }, [accountID]);
+    }, [accountID, loginParams]);
+
+    const promotedActions = useMemo(() => {
+        const result: PromotedAction[] = [];
+        if (report) {
+            result.push(PromotedActions.pin(report));
+        }
+
+        // If it's a self DM, we only want to show the Message button if the self DM report exists because we don't want to optimistically create a report for self DM
+        if ((!isCurrentUser || report) && !SessionActions.isAnonymousUser()) {
+            result.push(PromotedActions.message({reportID: report?.reportID, accountID, login: loginParams}));
+        }
+        return result;
+    }, [accountID, isCurrentUser, loginParams, report]);
+
+    const isConcierge = ReportUtils.isConciergeChatReport(report);
 
     return (
         <ScreenWrapper testID={ProfilePage.displayName}>
-            <FullPageNotFoundView shouldShow={shouldShowBlockingView || CONST.RESTRICTED_ACCOUNT_IDS.includes(accountID)}>
+            <FullPageNotFoundView shouldShow={shouldShowBlockingView}>
                 <HeaderWithBackButton
                     title={translate('common.profile')}
                     onBackButtonPress={() => Navigation.goBack(navigateBackTo)}
                 />
                 <View style={[styles.containerWithSpaceBetween, styles.pointerEventsBoxNone]}>
-                    {hasMinimumDetails && (
-                        <ScrollView>
-                            <View style={styles.avatarSectionWrapper}>
-                                <PressableWithoutFocus
-                                    style={[styles.noOutline]}
-                                    onPress={() => Navigation.navigate(ROUTES.PROFILE_AVATAR.getRoute(String(accountID)))}
-                                    accessibilityLabel={translate('common.profile')}
-                                    accessibilityRole={CONST.ACCESSIBILITY_ROLE.IMAGEBUTTON}
+                    <ScrollView>
+                        <View style={[styles.avatarSectionWrapper, styles.pb0]}>
+                            <PressableWithoutFocus
+                                style={[styles.noOutline, styles.mb4]}
+                                onPress={() => Navigation.navigate(ROUTES.PROFILE_AVATAR.getRoute(String(accountID)))}
+                                accessibilityLabel={translate('common.profile')}
+                                accessibilityRole={CONST.ROLE.BUTTON}
+                                disabled={!hasAvatar}
+                            >
+                                <OfflineWithFeedback pendingAction={details?.pendingFields?.avatar}>
+                                    <Avatar
+                                        containerStyles={[styles.avatarXLarge]}
+                                        imageStyles={[styles.avatarXLarge]}
+                                        source={details?.avatar}
+                                        avatarID={accountID}
+                                        type={CONST.ICON_TYPE_AVATAR}
+                                        size={CONST.AVATAR_SIZE.XLARGE}
+                                        fallbackIcon={fallbackIcon}
+                                    />
+                                </OfflineWithFeedback>
+                            </PressableWithoutFocus>
+                            {!!displayName && (
+                                <Text
+                                    style={[styles.textHeadline, styles.pre, styles.mb8, styles.w100, styles.textAlignCenter]}
+                                    numberOfLines={1}
                                 >
-                                    <OfflineWithFeedback pendingAction={details?.pendingFields?.avatar}>
-                                        <Avatar
-                                            containerStyles={[styles.avatarXLarge, styles.mb3]}
-                                            imageStyles={[styles.avatarXLarge]}
-                                            source={UserUtils.getAvatar(avatar, accountID)}
-                                            size={CONST.AVATAR_SIZE.XLARGE}
-                                            fallbackIcon={fallbackIcon}
-                                        />
-                                    </OfflineWithFeedback>
-                                </PressableWithoutFocus>
-                                {Boolean(displayName) && (
+                                    {displayName}
+                                </Text>
+                            )}
+                            <PromotedActionsBar
+                                promotedActions={promotedActions}
+                                containerStyle={[styles.ph0, styles.mb8]}
+                            />
+                            {hasStatus && (
+                                <View style={[styles.mb6, styles.detailsPageSectionContainer, styles.mw100]}>
                                     <Text
-                                        style={[styles.textHeadline, styles.pre, styles.mb6, styles.w100, styles.textAlignCenter]}
+                                        style={[styles.textLabelSupporting, styles.mb1]}
                                         numberOfLines={1}
                                     >
-                                        {displayName}
+                                        {translate('statusPage.status')}
                                     </Text>
-                                )}
-                                {hasStatus && (
-                                    <View style={[styles.mb6, styles.detailsPageSectionContainer, styles.mw100]}>
-                                        <Text
-                                            style={[styles.textLabelSupporting, styles.mb1]}
-                                            numberOfLines={1}
-                                        >
-                                            {translate('statusPage.status')}
-                                        </Text>
-                                        <Text>{statusContent}</Text>
-                                    </View>
-                                )}
-
-                                {/* Don't display email if current user is anonymous */}
-                                {!(isCurrentUser && SessionActions.isAnonymousUser()) && login ? (
-                                    <View style={[styles.mb6, styles.detailsPageSectionContainer, styles.w100]}>
-                                        <Text
-                                            style={[styles.textLabelSupporting, styles.mb1]}
-                                            numberOfLines={1}
-                                        >
-                                            {translate(isSMSLogin ? 'common.phoneNumber' : 'common.email')}
-                                        </Text>
-                                        <CommunicationsLink value={phoneOrEmail ?? ''}>
-                                            <UserDetailsTooltip accountID={details.accountID}>
-                                                <Text numberOfLines={1}>{isSMSLogin ? formatPhoneNumber(phoneNumber ?? '') : login}</Text>
-                                            </UserDetailsTooltip>
-                                        </CommunicationsLink>
-                                    </View>
-                                ) : null}
-                                {pronouns ? (
-                                    <View style={[styles.mb6, styles.detailsPageSectionContainer]}>
-                                        <Text
-                                            style={[styles.textLabelSupporting, styles.mb1]}
-                                            numberOfLines={1}
-                                        >
-                                            {translate('profilePage.preferredPronouns')}
-                                        </Text>
-                                        <Text numberOfLines={1}>{pronouns}</Text>
-                                    </View>
-                                ) : null}
-                                {shouldShowLocalTime && <AutoUpdateTime timezone={timezone} />}
-                            </View>
-                            {shouldShowNotificationPreference && (
-                                <MenuItemWithTopDescription
-                                    shouldShowRightIcon
-                                    title={notificationPreference}
-                                    description={translate('notificationPreferencesPage.label')}
-                                    onPress={() => Navigation.navigate(ROUTES.REPORT_SETTINGS_NOTIFICATION_PREFERENCES.getRoute(report.reportID))}
-                                    wrapperStyle={[styles.mtn6, styles.mb5]}
-                                />
-                            )}
-                            {!isCurrentUser && !SessionActions.isAnonymousUser() && (
-                                <MenuItem
-                                    title={`${translate('common.message')}${displayName}`}
-                                    titleStyle={styles.flex1}
-                                    icon={Expensicons.ChatBubble}
-                                    onPress={() => ReportActions.navigateToAndOpenReportWithAccountIDs([accountID])}
-                                    wrapperStyle={styles.breakAll}
-                                    shouldShowRightIcon
-                                />
-                            )}
-                            {!isEmptyObject(report) && report.reportID && !isCurrentUser && (
-                                <MenuItem
-                                    title={`${translate('privateNotes.title')}`}
-                                    titleStyle={styles.flex1}
-                                    icon={Expensicons.Pencil}
-                                    onPress={() => ReportUtils.navigateToPrivateNotes(report, session)}
-                                    wrapperStyle={styles.breakAll}
-                                    shouldShowRightIcon
-                                    brickRoadIndicator={ReportActions.hasErrorInPrivateNotes(report) ? CONST.BRICK_ROAD_INDICATOR_STATUS.ERROR : undefined}
-                                />
+                                    <Text>{statusContent}</Text>
+                                </View>
                             )}
-                        </ScrollView>
-                    )}
-                    {!hasMinimumDetails && isLoading && <FullScreenLoadingIndicator style={styles.flex1} />}
+
+                            {/* Don't display email if current user is anonymous */}
+                            {!(isCurrentUser && SessionActions.isAnonymousUser()) && login ? (
+                                <View style={[styles.mb6, styles.detailsPageSectionContainer, styles.w100]}>
+                                    <Text
+                                        style={[styles.textLabelSupporting, styles.mb1]}
+                                        numberOfLines={1}
+                                    >
+                                        {translate(isSMSLogin ? 'common.phoneNumber' : 'common.email')}
+                                    </Text>
+                                    <CommunicationsLink value={phoneOrEmail ?? ''}>
+                                        <UserDetailsTooltip accountID={details?.accountID ?? -1}>
+                                            <Text
+                                                numberOfLines={1}
+                                                style={styles.w100}
+                                            >
+                                                {isSMSLogin ? formatPhoneNumber(phoneNumber ?? '') : login}
+                                            </Text>
+                                        </UserDetailsTooltip>
+                                    </CommunicationsLink>
+                                </View>
+                            ) : null}
+                            {pronouns ? (
+                                <View style={[styles.mb6, styles.detailsPageSectionContainer]}>
+                                    <Text
+                                        style={[styles.textLabelSupporting, styles.mb1]}
+                                        numberOfLines={1}
+                                    >
+                                        {translate('profilePage.preferredPronouns')}
+                                    </Text>
+                                    <Text numberOfLines={1}>{pronouns}</Text>
+                                </View>
+                            ) : null}
+                            {shouldShowLocalTime && <AutoUpdateTime timezone={timezone} />}
+                        </View>
+                        {shouldShowNotificationPreference && (
+                            <MenuItemWithTopDescription
+                                shouldShowRightIcon
+                                title={notificationPreference}
+                                description={translate('notificationPreferencesPage.label')}
+                                onPress={() => Navigation.navigate(ROUTES.REPORT_SETTINGS_NOTIFICATION_PREFERENCES.getRoute(report.reportID))}
+                            />
+                        )}
+                        {!isEmptyObject(report) && report.reportID && !isCurrentUser && (
+                            <MenuItem
+                                title={`${translate('privateNotes.title')}`}
+                                titleStyle={styles.flex1}
+                                icon={Expensicons.Pencil}
+                                onPress={() => ReportUtils.navigateToPrivateNotes(report, session)}
+                                wrapperStyle={styles.breakAll}
+                                shouldShowRightIcon
+                                brickRoadIndicator={ReportActions.hasErrorInPrivateNotes(report) ? CONST.BRICK_ROAD_INDICATOR_STATUS.ERROR : undefined}
+                            />
+                        )}
+                        {isConcierge && guideCalendarLink && (
+                            <MenuItem
+                                title={translate('videoChatButtonAndMenu.tooltip')}
+                                icon={Expensicons.Phone}
+                                isAnonymousAction={false}
+                                onPress={SessionActions.checkIfActionIsAllowed(() => {
+                                    LinkActions.openExternalLink(guideCalendarLink);
+                                })}
+                            />
+                        )}
+                    </ScrollView>
+                    {!hasAvatar && isLoading && <FullScreenLoadingIndicator style={styles.flex1} />}
                 </View>
             </FullPageNotFoundView>
         </ScreenWrapper>
diff --git a/src/pages/ReimbursementAccount/AddressFormFields.tsx b/src/pages/ReimbursementAccount/AddressFormFields.tsx
index 48af00cd4925..a863d3cc5952 100644
--- a/src/pages/ReimbursementAccount/AddressFormFields.tsx
+++ b/src/pages/ReimbursementAccount/AddressFormFields.tsx
@@ -52,7 +52,7 @@ function AddressFormFields({shouldSaveDraft = false, defaultValues, values, erro
                     value={values?.street}
                     defaultValue={defaultValues?.street}
                     onInputChange={onFieldChange}
-                    errorText={errors?.street ? 'bankAccount.error.addressStreet' : ''}
+                    errorText={errors?.street ? translate('bankAccount.error.addressStreet') : ''}
                     renamedInputKeys={inputKeys}
                     maxInputLength={CONST.FORM_CHARACTER_LIMIT}
                     isLimitedToUSA
@@ -68,7 +68,7 @@ function AddressFormFields({shouldSaveDraft = false, defaultValues, values, erro
                 value={values?.city}
                 defaultValue={defaultValues?.city}
                 onChangeText={(value) => onFieldChange?.({city: value})}
-                errorText={errors?.city ? 'bankAccount.error.addressCity' : ''}
+                errorText={errors?.city ? translate('bankAccount.error.addressCity') : ''}
                 containerStyles={styles.mt6}
             />
 
@@ -80,7 +80,7 @@ function AddressFormFields({shouldSaveDraft = false, defaultValues, values, erro
                     value={values?.state as State}
                     defaultValue={defaultValues?.state}
                     onInputChange={(value) => onFieldChange?.({state: value})}
-                    errorText={errors?.state ? 'bankAccount.error.addressState' : ''}
+                    errorText={errors?.state ? translate('bankAccount.error.addressState') : ''}
                 />
             </View>
             <InputWrapper
@@ -94,9 +94,9 @@ function AddressFormFields({shouldSaveDraft = false, defaultValues, values, erro
                 value={values?.zipCode}
                 defaultValue={defaultValues?.zipCode}
                 onChangeText={(value) => onFieldChange?.({zipCode: value})}
-                errorText={errors?.zipCode ? 'bankAccount.error.zipCode' : ''}
+                errorText={errors?.zipCode ? translate('bankAccount.error.zipCode') : ''}
                 maxLength={CONST.BANK_ACCOUNT.MAX_LENGTH.ZIP_CODE}
-                hint={['common.zipCodeExampleFormat', {zipSampleFormat: CONST.COUNTRY_ZIP_REGEX_DATA.US.samples}]}
+                hint={translate('common.zipCodeExampleFormat', {zipSampleFormat: CONST.COUNTRY_ZIP_REGEX_DATA.US.samples})}
                 containerStyles={styles.mt3}
             />
         </>
diff --git a/src/pages/ReimbursementAccount/BankAccountStep.tsx b/src/pages/ReimbursementAccount/BankAccountStep.tsx
index d2fe7199a4c6..69e605878725 100644
--- a/src/pages/ReimbursementAccount/BankAccountStep.tsx
+++ b/src/pages/ReimbursementAccount/BankAccountStep.tsx
@@ -14,16 +14,14 @@ import ScrollView from '@components/ScrollView';
 import Section from '@components/Section';
 import Text from '@components/Text';
 import TextLink from '@components/TextLink';
+import ValidateAccountMessage from '@components/ValidateAccountMessage';
 import useLocalize from '@hooks/useLocalize';
 import useTheme from '@hooks/useTheme';
 import useThemeStyles from '@hooks/useThemeStyles';
 import getPlaidDesktopMessage from '@libs/getPlaidDesktopMessage';
-import variables from '@styles/variables';
 import * as BankAccounts from '@userActions/BankAccounts';
 import * as Link from '@userActions/Link';
 import * as ReimbursementAccount from '@userActions/ReimbursementAccount';
-import * as Session from '@userActions/Session';
-import CONFIG from '@src/CONFIG';
 import CONST from '@src/CONST';
 import ONYXKEYS from '@src/ONYXKEYS';
 import ROUTES from '@src/ROUTES';
@@ -81,7 +79,7 @@ function BankAccountStep({
         subStep = CONST.BANK_ACCOUNT.SETUP_TYPE.PLAID;
     }
     const plaidDesktopMessage = getPlaidDesktopMessage();
-    const bankAccountRoute = `${CONFIG.EXPENSIFY.NEW_EXPENSIFY_URL}${ROUTES.BANK_ACCOUNT_WITH_STEP_TO_OPEN.getRoute('new', policyID, ROUTES.WORKSPACE_INITIAL.getRoute(policyID))}`;
+    const bankAccountRoute = `${ROUTES.BANK_ACCOUNT_WITH_STEP_TO_OPEN.getRoute('new', policyID, ROUTES.WORKSPACE_INITIAL.getRoute(policyID))}`;
 
     const removeExistingBankAccountDetails = () => {
         const bankAccountData: Partial<ReimbursementAccountForm> = {
@@ -129,7 +127,7 @@ function BankAccountStep({
                         </View>
                         {!!plaidDesktopMessage && (
                             <View style={[styles.mv3, styles.flexRow, styles.justifyContentBetween]}>
-                                <TextLink href={bankAccountRoute}>{translate(plaidDesktopMessage)}</TextLink>
+                                <TextLink onPress={() => Link.openExternalLinkWithToken(bankAccountRoute)}>{translate(plaidDesktopMessage)}</TextLink>
                             </View>
                         )}
                         <Button
@@ -163,25 +161,7 @@ function BankAccountStep({
                             />
                         </View>
                     </Section>
-                    {!user?.validated && (
-                        <View style={[styles.flexRow, styles.alignItemsCenter, styles.m4]}>
-                            <Icon
-                                src={Expensicons.Exclamation}
-                                fill={theme.danger}
-                            />
-
-                            <Text style={[styles.mutedTextLabel, styles.ml4, styles.flex1]}>
-                                {translate('bankAccount.validateAccountError.phrase1')}
-                                <TextLink
-                                    fontSize={variables.fontSizeLabel}
-                                    onPress={() => Session.signOutAndRedirectToSignIn()}
-                                >
-                                    {translate('bankAccount.validateAccountError.phrase2')}
-                                </TextLink>
-                                .
-                            </Text>
-                        </View>
-                    )}
+                    {!user?.validated && <ValidateAccountMessage />}
                     <View style={[styles.mv0, styles.mh5, styles.flexRow, styles.justifyContentBetween]}>
                         <TextLink href={CONST.PRIVACY_URL}>{translate('common.privacy')}</TextLink>
                         <PressableWithoutFeedback
diff --git a/src/pages/ReimbursementAccount/BankInfo/BankInfo.tsx b/src/pages/ReimbursementAccount/BankInfo/BankInfo.tsx
index b7b4ec171db9..3e45b14253f3 100644
--- a/src/pages/ReimbursementAccount/BankInfo/BankInfo.tsx
+++ b/src/pages/ReimbursementAccount/BankInfo/BankInfo.tsx
@@ -60,7 +60,7 @@ function BankInfo({reimbursementAccount, reimbursementAccountDraft, plaidLinkTok
         setupType = CONST.BANK_ACCOUNT.SETUP_TYPE.PLAID;
     }
 
-    const bankAccountID = Number(reimbursementAccount?.achData?.bankAccountID ?? '0');
+    const bankAccountID = Number(reimbursementAccount?.achData?.bankAccountID ?? '-1');
     const submit = useCallback(() => {
         if (setupType === CONST.BANK_ACCOUNT.SETUP_TYPE.MANUAL) {
             BankAccounts.connectBankAccountManually(
diff --git a/src/pages/ReimbursementAccount/BankInfo/substeps/Confirmation.tsx b/src/pages/ReimbursementAccount/BankInfo/substeps/Confirmation.tsx
index f3ba4c07acf0..fb72054303ae 100644
--- a/src/pages/ReimbursementAccount/BankInfo/substeps/Confirmation.tsx
+++ b/src/pages/ReimbursementAccount/BankInfo/substeps/Confirmation.tsx
@@ -40,7 +40,7 @@ function Confirmation({reimbursementAccount, reimbursementAccountDraft, onNext,
 
     const isLoading = reimbursementAccount?.isLoading ?? false;
     const setupType = reimbursementAccount?.achData?.subStep ?? '';
-    const bankAccountID = Number(reimbursementAccount?.achData?.bankAccountID ?? '0');
+    const bankAccountID = Number(reimbursementAccount?.achData?.bankAccountID ?? '-1');
     const values = useMemo(() => getSubstepValues(BANK_INFO_STEP_KEYS, reimbursementAccountDraft, reimbursementAccount ?? {}), [reimbursementAccount, reimbursementAccountDraft]);
     const error = ErrorUtils.getLatestErrorMessage(reimbursementAccount ?? {});
 
diff --git a/src/pages/ReimbursementAccount/BankInfo/substeps/Manual.tsx b/src/pages/ReimbursementAccount/BankInfo/substeps/Manual.tsx
index 3f58d7a2073e..1111bd8fcc47 100644
--- a/src/pages/ReimbursementAccount/BankInfo/substeps/Manual.tsx
+++ b/src/pages/ReimbursementAccount/BankInfo/substeps/Manual.tsx
@@ -8,6 +8,7 @@ import Text from '@components/Text';
 import TextInput from '@components/TextInput';
 import useAutoFocusInput from '@hooks/useAutoFocusInput';
 import useLocalize from '@hooks/useLocalize';
+import useReimbursementAccountStepFormSubmit from '@hooks/useReimbursementAccountStepFormSubmit';
 import type {SubStepProps} from '@hooks/useSubStep/types';
 import useThemeStyles from '@hooks/useThemeStyles';
 import * as ValidationUtils from '@libs/ValidationUtils';
@@ -37,32 +38,41 @@ function Manual({reimbursementAccount, onNext}: ManualProps) {
         [BANK_INFO_STEP_KEYS.ACCOUNT_NUMBER]: reimbursementAccount?.achData?.[BANK_INFO_STEP_KEYS.ACCOUNT_NUMBER] ?? '',
     };
 
-    const validate = useCallback((values: FormOnyxValues<typeof ONYXKEYS.FORMS.REIMBURSEMENT_ACCOUNT_FORM>): FormInputErrors<typeof ONYXKEYS.FORMS.REIMBURSEMENT_ACCOUNT_FORM> => {
-        const errors = ValidationUtils.getFieldRequiredErrors(values, STEP_FIELDS);
-        const routingNumber = values.routingNumber?.trim();
+    const validate = useCallback(
+        (values: FormOnyxValues<typeof ONYXKEYS.FORMS.REIMBURSEMENT_ACCOUNT_FORM>): FormInputErrors<typeof ONYXKEYS.FORMS.REIMBURSEMENT_ACCOUNT_FORM> => {
+            const errors = ValidationUtils.getFieldRequiredErrors(values, STEP_FIELDS);
+            const routingNumber = values.routingNumber?.trim();
 
-        if (
-            values.accountNumber &&
-            !CONST.BANK_ACCOUNT.REGEX.US_ACCOUNT_NUMBER.test(values.accountNumber.trim()) &&
-            !CONST.BANK_ACCOUNT.REGEX.MASKED_US_ACCOUNT_NUMBER.test(values.accountNumber.trim())
-        ) {
-            errors.accountNumber = 'bankAccount.error.accountNumber';
-        } else if (values.accountNumber && values.accountNumber === routingNumber) {
-            errors.accountNumber = 'bankAccount.error.routingAndAccountNumberCannotBeSame';
-        }
-        if (routingNumber && (!CONST.BANK_ACCOUNT.REGEX.SWIFT_BIC.test(routingNumber) || !ValidationUtils.isValidRoutingNumber(routingNumber))) {
-            errors.routingNumber = 'bankAccount.error.routingNumber';
-        }
+            if (
+                values.accountNumber &&
+                !CONST.BANK_ACCOUNT.REGEX.US_ACCOUNT_NUMBER.test(values.accountNumber.trim()) &&
+                !CONST.BANK_ACCOUNT.REGEX.MASKED_US_ACCOUNT_NUMBER.test(values.accountNumber.trim())
+            ) {
+                errors.accountNumber = translate('bankAccount.error.accountNumber');
+            } else if (values.accountNumber && values.accountNumber === routingNumber) {
+                errors.accountNumber = translate('bankAccount.error.routingAndAccountNumberCannotBeSame');
+            }
+            if (routingNumber && (!CONST.BANK_ACCOUNT.REGEX.SWIFT_BIC.test(routingNumber) || !ValidationUtils.isValidRoutingNumber(routingNumber))) {
+                errors.routingNumber = translate('bankAccount.error.routingNumber');
+            }
 
-        return errors;
-    }, []);
+            return errors;
+        },
+        [translate],
+    );
 
     const shouldDisableInputs = !!(reimbursementAccount?.achData?.bankAccountID ?? '');
 
+    const handleSubmit = useReimbursementAccountStepFormSubmit({
+        fieldIds: STEP_FIELDS,
+        onNext,
+        shouldSaveDraft: true,
+    });
+
     return (
         <FormProvider
             formID={ONYXKEYS.FORMS.REIMBURSEMENT_ACCOUNT_FORM}
-            onSubmit={onNext}
+            onSubmit={handleSubmit}
             validate={validate}
             submitButtonText={translate('common.next')}
             style={[styles.mh5, styles.flexGrow1]}
diff --git a/src/pages/ReimbursementAccount/BankInfo/substeps/Plaid.tsx b/src/pages/ReimbursementAccount/BankInfo/substeps/Plaid.tsx
index c58c2f40aa07..e9d14b45a8ed 100644
--- a/src/pages/ReimbursementAccount/BankInfo/substeps/Plaid.tsx
+++ b/src/pages/ReimbursementAccount/BankInfo/substeps/Plaid.tsx
@@ -55,7 +55,7 @@ function Plaid({reimbursementAccount, reimbursementAccountDraft, onNext, plaidDa
         onNext();
     }, [plaidData, reimbursementAccountDraft, onNext]);
 
-    const bankAccountID = Number(reimbursementAccount?.achData?.bankAccountID ?? '0');
+    const bankAccountID = Number(reimbursementAccount?.achData?.bankAccountID ?? '-1');
 
     useEffect(() => {
         const plaidBankAccounts = plaidData?.bankAccounts ?? [];
@@ -88,7 +88,6 @@ function Plaid({reimbursementAccount, reimbursementAccountDraft, onNext, plaidDa
                 allowDebit
                 bankAccountID={bankAccountID}
                 selectedPlaidAccountID={selectedPlaidAccountID}
-                isDisplayedInNewVBBA
                 inputID={BANK_INFO_STEP_KEYS.SELECTED_PLAID_ACCOUNT_ID}
                 defaultValue={selectedPlaidAccountID}
             />
diff --git a/src/pages/ReimbursementAccount/BeneficialOwnerInfo/substeps/BeneficialOwnerCheckUBO.tsx b/src/pages/ReimbursementAccount/BeneficialOwnerInfo/substeps/BeneficialOwnerCheckUBO.tsx
index fc98ee21aff2..438551cf4044 100644
--- a/src/pages/ReimbursementAccount/BeneficialOwnerInfo/substeps/BeneficialOwnerCheckUBO.tsx
+++ b/src/pages/ReimbursementAccount/BeneficialOwnerInfo/substeps/BeneficialOwnerCheckUBO.tsx
@@ -47,7 +47,7 @@ function BeneficialOwnerCheckUBO({title, onSelectedValue, defaultValue}: Benefic
             submitButtonText={translate('common.confirm')}
             onSubmit={handleSubmit}
             style={[styles.mh5, styles.flexGrow1]}
-            submitButtonStyles={[styles.pb5, styles.mb0]}
+            submitButtonStyles={[styles.mb0]}
         >
             <Text style={[styles.textHeadlineLineHeightXXL]}>{title}</Text>
             <Text style={[styles.pv3, styles.textSupporting]}>{translate('beneficialOwnerInfoStep.regulationRequiresUsToVerifyTheIdentity')}</Text>
diff --git a/src/pages/ReimbursementAccount/BeneficialOwnerInfo/substeps/BeneficialOwnerDetailsFormSubsteps/AddressUBO.tsx b/src/pages/ReimbursementAccount/BeneficialOwnerInfo/substeps/BeneficialOwnerDetailsFormSubsteps/AddressUBO.tsx
index c49f26abf80c..1b03432b7f3e 100644
--- a/src/pages/ReimbursementAccount/BeneficialOwnerInfo/substeps/BeneficialOwnerDetailsFormSubsteps/AddressUBO.tsx
+++ b/src/pages/ReimbursementAccount/BeneficialOwnerInfo/substeps/BeneficialOwnerDetailsFormSubsteps/AddressUBO.tsx
@@ -47,11 +47,11 @@ function AddressUBO({reimbursementAccountDraft, onNext, isEditing, beneficialOwn
         const errors = ValidationUtils.getFieldRequiredErrors(values, stepFields);
 
         if (values[inputKeys.street] && !ValidationUtils.isValidAddress(values[inputKeys.street])) {
-            errors[inputKeys.street] = 'bankAccount.error.addressStreet';
+            errors[inputKeys.street] = translate('bankAccount.error.addressStreet');
         }
 
         if (values[inputKeys.zipCode] && !ValidationUtils.isValidZipCode(values[inputKeys.zipCode])) {
-            errors[inputKeys.zipCode] = 'bankAccount.error.zipCode';
+            errors[inputKeys.zipCode] = translate('bankAccount.error.zipCode');
         }
 
         return errors;
@@ -69,7 +69,7 @@ function AddressUBO({reimbursementAccountDraft, onNext, isEditing, beneficialOwn
             submitButtonText={translate(isEditing ? 'common.confirm' : 'common.next')}
             validate={validate}
             onSubmit={handleSubmit}
-            submitButtonStyles={[styles.mb0, styles.pb5]}
+            submitButtonStyles={[styles.mb0]}
             style={[styles.mh5, styles.flexGrow1]}
         >
             <Text style={[styles.textHeadlineLineHeightXXL, styles.mb3]}>{translate('beneficialOwnerInfoStep.enterTheOwnersAddress')}</Text>
diff --git a/src/pages/ReimbursementAccount/BeneficialOwnerInfo/substeps/BeneficialOwnerDetailsFormSubsteps/DateOfBirthUBO.tsx b/src/pages/ReimbursementAccount/BeneficialOwnerInfo/substeps/BeneficialOwnerDetailsFormSubsteps/DateOfBirthUBO.tsx
index b60b19193dbc..b5a4a6a94bed 100644
--- a/src/pages/ReimbursementAccount/BeneficialOwnerInfo/substeps/BeneficialOwnerDetailsFormSubsteps/DateOfBirthUBO.tsx
+++ b/src/pages/ReimbursementAccount/BeneficialOwnerInfo/substeps/BeneficialOwnerDetailsFormSubsteps/DateOfBirthUBO.tsx
@@ -40,9 +40,9 @@ function DateOfBirthUBO({reimbursementAccountDraft, onNext, isEditing, beneficia
 
         if (values[dobInputID]) {
             if (!ValidationUtils.isValidPastDate(values[dobInputID]) || !ValidationUtils.meetsMaximumAgeRequirement(values[dobInputID])) {
-                errors[dobInputID] = 'bankAccount.error.dob';
+                errors[dobInputID] = translate('bankAccount.error.dob');
             } else if (!ValidationUtils.meetsMinimumAgeRequirement(values[dobInputID])) {
-                errors[dobInputID] = 'bankAccount.error.age';
+                errors[dobInputID] = translate('bankAccount.error.age');
             }
         }
 
@@ -62,11 +62,10 @@ function DateOfBirthUBO({reimbursementAccountDraft, onNext, isEditing, beneficia
             validate={validate}
             onSubmit={handleSubmit}
             style={[styles.mh5, styles.flexGrow2, styles.justifyContentBetween]}
-            submitButtonStyles={[styles.pb5, styles.mb0]}
+            submitButtonStyles={[styles.mb0]}
         >
             <Text style={[styles.textHeadlineLineHeightXXL]}>{translate('beneficialOwnerInfoStep.enterTheDateOfBirthOfTheOwner')}</Text>
-            {/* @ts-expect-error TODO: Remove this once DatePicker (https://github.com/Expensify/App/issues/25148) is migrated to TypeScript. */}
-            <InputWrapper<unknown>
+            <InputWrapper
                 InputComponent={DatePicker}
                 inputID={dobInputID}
                 label={translate('common.dob')}
diff --git a/src/pages/ReimbursementAccount/BeneficialOwnerInfo/substeps/BeneficialOwnerDetailsFormSubsteps/LegalNameUBO.tsx b/src/pages/ReimbursementAccount/BeneficialOwnerInfo/substeps/BeneficialOwnerDetailsFormSubsteps/LegalNameUBO.tsx
index 0fc7ab10d133..b17bf641eca5 100644
--- a/src/pages/ReimbursementAccount/BeneficialOwnerInfo/substeps/BeneficialOwnerDetailsFormSubsteps/LegalNameUBO.tsx
+++ b/src/pages/ReimbursementAccount/BeneficialOwnerInfo/substeps/BeneficialOwnerDetailsFormSubsteps/LegalNameUBO.tsx
@@ -50,7 +50,7 @@ function LegalNameUBO({reimbursementAccountDraft, onNext, isEditing, beneficialO
             validate={validate}
             onSubmit={handleSubmit}
             style={[styles.mh5, styles.flexGrow1]}
-            submitButtonStyles={[styles.pb5, styles.mb0]}
+            submitButtonStyles={[styles.mb0]}
         >
             <Text style={[styles.textHeadlineLineHeightXXL]}>{translate('beneficialOwnerInfoStep.enterLegalFirstAndLastName')}</Text>
             <InputWrapper
diff --git a/src/pages/ReimbursementAccount/BeneficialOwnerInfo/substeps/BeneficialOwnerDetailsFormSubsteps/SocialSecurityNumberUBO.tsx b/src/pages/ReimbursementAccount/BeneficialOwnerInfo/substeps/BeneficialOwnerDetailsFormSubsteps/SocialSecurityNumberUBO.tsx
index 7c0c5ac0c057..483d2750f399 100644
--- a/src/pages/ReimbursementAccount/BeneficialOwnerInfo/substeps/BeneficialOwnerDetailsFormSubsteps/SocialSecurityNumberUBO.tsx
+++ b/src/pages/ReimbursementAccount/BeneficialOwnerInfo/substeps/BeneficialOwnerDetailsFormSubsteps/SocialSecurityNumberUBO.tsx
@@ -36,7 +36,7 @@ function SocialSecurityNumberUBO({reimbursementAccountDraft, onNext, isEditing,
     const validate = (values: FormOnyxValues<typeof ONYXKEYS.FORMS.REIMBURSEMENT_ACCOUNT_FORM>): FormInputErrors<typeof ONYXKEYS.FORMS.REIMBURSEMENT_ACCOUNT_FORM> => {
         const errors = ValidationUtils.getFieldRequiredErrors(values, stepFields);
         if (values[ssnLast4InputID] && !ValidationUtils.isValidSSNLastFour(values[ssnLast4InputID])) {
-            errors[ssnLast4InputID] = 'bankAccount.error.ssnLast4';
+            errors[ssnLast4InputID] = translate('bankAccount.error.ssnLast4');
         }
         return errors;
     };
@@ -54,7 +54,7 @@ function SocialSecurityNumberUBO({reimbursementAccountDraft, onNext, isEditing,
             validate={validate}
             onSubmit={handleSubmit}
             style={[styles.mh5, styles.flexGrow1]}
-            submitButtonStyles={[styles.pb5, styles.mb0]}
+            submitButtonStyles={[styles.mb0]}
         >
             <View>
                 <Text style={[styles.textHeadlineLineHeightXXL, styles.mb3]}>{translate('beneficialOwnerInfoStep.enterTheLast4')}</Text>
diff --git a/src/pages/ReimbursementAccount/BeneficialOwnerInfo/substeps/CompanyOwnersListUBO.tsx b/src/pages/ReimbursementAccount/BeneficialOwnerInfo/substeps/CompanyOwnersListUBO.tsx
index 542d3d0cf6d0..16cbfef2a994 100644
--- a/src/pages/ReimbursementAccount/BeneficialOwnerInfo/substeps/CompanyOwnersListUBO.tsx
+++ b/src/pages/ReimbursementAccount/BeneficialOwnerInfo/substeps/CompanyOwnersListUBO.tsx
@@ -74,7 +74,7 @@ function CompanyOwnersListUBO({
     const {isOffline} = useNetwork();
 
     const isLoading = reimbursementAccount?.isLoading ?? false;
-    const requestorData = getSubstepValues(REQUESTOR_PERSONAL_INFO_KEYS, null, reimbursementAccount);
+    const requestorData = getSubstepValues(REQUESTOR_PERSONAL_INFO_KEYS, undefined, reimbursementAccount);
     const error = ErrorUtils.getLatestErrorMessage(reimbursementAccount);
 
     const extraBeneficialOwners =
@@ -120,6 +120,7 @@ function CompanyOwnersListUBO({
                                 description={`${requestorData.requestorAddressStreet}, ${requestorData.requestorAddressCity}, ${requestorData.requestorAddressState} ${requestorData.requestorAddressZipCode}`}
                                 wrapperStyle={[styles.ph5]}
                                 icon={Expensicons.FallbackAvatar}
+                                iconType={CONST.ICON_TYPE_AVATAR}
                                 iconWidth={40}
                                 iconHeight={40}
                                 interactive={false}
diff --git a/src/pages/ReimbursementAccount/BeneficialOwnersStep.tsx b/src/pages/ReimbursementAccount/BeneficialOwnersStep.tsx
index 10b05e58deb7..ae0fded74347 100644
--- a/src/pages/ReimbursementAccount/BeneficialOwnersStep.tsx
+++ b/src/pages/ReimbursementAccount/BeneficialOwnersStep.tsx
@@ -1,4 +1,4 @@
-import Str from 'expensify-common/lib/str';
+import {Str} from 'expensify-common';
 import React, {useState} from 'react';
 import {View} from 'react-native';
 import type {OnyxEntry} from 'react-native-onyx';
@@ -47,7 +47,7 @@ function BeneficialOwnersStep({reimbursementAccount, reimbursementAccountDraft,
     const {translate} = useLocalize();
     const styles = useThemeStyles();
     const companyName = reimbursementAccount?.achData?.companyName ?? '';
-    const policyID = reimbursementAccount?.achData?.policyID ?? '';
+    const policyID = reimbursementAccount?.achData?.policyID ?? '-1';
     const defaultValues = {
         ownsMoreThan25Percent: reimbursementAccount?.achData?.ownsMoreThan25Percent ?? reimbursementAccountDraft?.ownsMoreThan25Percent ?? false,
         hasOtherBeneficialOwners: reimbursementAccount?.achData?.hasOtherBeneficialOwners ?? reimbursementAccountDraft?.hasOtherBeneficialOwners ?? false,
@@ -68,17 +68,14 @@ function BeneficialOwnersStep({reimbursementAccount, reimbursementAccountDraft,
     const submit = () => {
         const beneficialOwnerFields = ['firstName', 'lastName', 'dob', 'ssnLast4', 'street', 'city', 'state', 'zipCode'];
         const beneficialOwners = beneficialOwnerKeys.map((ownerKey) =>
-            beneficialOwnerFields.reduce(
-                (acc, fieldName) => ({
-                    ...acc,
-                    [fieldName]: reimbursementAccountDraft ? reimbursementAccountDraft[`beneficialOwner_${ownerKey}_${fieldName}`] : undefined,
-                }),
-                {},
-            ),
+            beneficialOwnerFields.reduce((acc, fieldName) => {
+                acc[fieldName] = reimbursementAccountDraft ? reimbursementAccountDraft[`beneficialOwner_${ownerKey}_${fieldName}`] : undefined;
+                return acc;
+            }, {} as Record<string, string | undefined>),
         );
 
         BankAccounts.updateBeneficialOwnersForBankAccount(
-            Number(reimbursementAccount?.achData?.bankAccountID ?? '0'),
+            Number(reimbursementAccount?.achData?.bankAccountID ?? '-1'),
             {
                 ownsMoreThan25Percent: isUserUBO,
                 beneficialOwners: JSON.stringify(beneficialOwners),
diff --git a/src/pages/ReimbursementAccount/BusinessInfo/BusinessInfo.tsx b/src/pages/ReimbursementAccount/BusinessInfo/BusinessInfo.tsx
index 593408b60589..814db3536973 100644
--- a/src/pages/ReimbursementAccount/BusinessInfo/BusinessInfo.tsx
+++ b/src/pages/ReimbursementAccount/BusinessInfo/BusinessInfo.tsx
@@ -68,13 +68,13 @@ function BusinessInfo({reimbursementAccount, reimbursementAccountDraft, onBackBu
         [reimbursementAccount, reimbursementAccountDraft],
     );
 
-    const policyID = reimbursementAccount?.achData?.policyID ?? '';
+    const policyID = reimbursementAccount?.achData?.policyID ?? '-1';
     const values = useMemo(() => getSubstepValues(BUSINESS_INFO_STEP_KEYS, reimbursementAccountDraft, reimbursementAccount), [reimbursementAccount, reimbursementAccountDraft]);
 
     const submit = useCallback(
         (isConfirmPage: boolean) => {
             BankAccounts.updateCompanyInformationForBankAccount(
-                Number(reimbursementAccount?.achData?.bankAccountID ?? '0'),
+                Number(reimbursementAccount?.achData?.bankAccountID ?? '-1'),
                 {
                     ...values,
                     ...getBankAccountFields(['routingNumber', 'accountNumber', 'bankName', 'plaidAccountID', 'plaidAccessToken', 'isSavings']),
diff --git a/src/pages/ReimbursementAccount/BusinessInfo/substeps/AddressBusiness.tsx b/src/pages/ReimbursementAccount/BusinessInfo/substeps/AddressBusiness.tsx
index cca9e5619d59..37a4db5eb146 100644
--- a/src/pages/ReimbursementAccount/BusinessInfo/substeps/AddressBusiness.tsx
+++ b/src/pages/ReimbursementAccount/BusinessInfo/substeps/AddressBusiness.tsx
@@ -1,4 +1,4 @@
-import React from 'react';
+import React, {useCallback} from 'react';
 import type {OnyxEntry} from 'react-native-onyx';
 import {withOnyx} from 'react-native-onyx';
 import FormProvider from '@components/Form/FormProvider';
@@ -32,27 +32,30 @@ const INPUT_KEYS = {
 
 const STEP_FIELDS = [COMPANY_BUSINESS_INFO_KEY.STREET, COMPANY_BUSINESS_INFO_KEY.CITY, COMPANY_BUSINESS_INFO_KEY.STATE, COMPANY_BUSINESS_INFO_KEY.ZIP_CODE];
 
-const validate = (values: FormOnyxValues<typeof ONYXKEYS.FORMS.REIMBURSEMENT_ACCOUNT_FORM>): FormInputErrors<typeof ONYXKEYS.FORMS.REIMBURSEMENT_ACCOUNT_FORM> => {
-    const errors = ValidationUtils.getFieldRequiredErrors(values, STEP_FIELDS);
+function AddressBusiness({reimbursementAccount, onNext, isEditing}: AddressBusinessProps) {
+    const {translate} = useLocalize();
+    const styles = useThemeStyles();
 
-    if (values.addressStreet && !ValidationUtils.isValidAddress(values.addressStreet)) {
-        errors.addressStreet = 'bankAccount.error.addressStreet';
-    }
+    const validate = useCallback(
+        (values: FormOnyxValues<typeof ONYXKEYS.FORMS.REIMBURSEMENT_ACCOUNT_FORM>): FormInputErrors<typeof ONYXKEYS.FORMS.REIMBURSEMENT_ACCOUNT_FORM> => {
+            const errors = ValidationUtils.getFieldRequiredErrors(values, STEP_FIELDS);
 
-    if (values.addressCity && !ValidationUtils.isValidAddress(values.addressCity)) {
-        errors.addressCity = 'bankAccount.error.addressCity';
-    }
+            if (values.addressStreet && !ValidationUtils.isValidAddress(values.addressStreet)) {
+                errors.addressStreet = translate('bankAccount.error.addressStreet');
+            }
 
-    if (values.addressZipCode && !ValidationUtils.isValidZipCode(values.addressZipCode)) {
-        errors.addressZipCode = 'bankAccount.error.zipCode';
-    }
+            if (values.addressCity && !ValidationUtils.isValidAddress(values.addressCity)) {
+                errors.addressCity = translate('bankAccount.error.addressCity');
+            }
 
-    return errors;
-};
+            if (values.addressZipCode && !ValidationUtils.isValidZipCode(values.addressZipCode)) {
+                errors.addressZipCode = translate('bankAccount.error.zipCode');
+            }
 
-function AddressBusiness({reimbursementAccount, onNext, isEditing}: AddressBusinessProps) {
-    const {translate} = useLocalize();
-    const styles = useThemeStyles();
+            return errors;
+        },
+        [translate],
+    );
 
     const defaultValues = {
         street: reimbursementAccount?.achData?.addressStreet ?? '',
@@ -73,11 +76,11 @@ function AddressBusiness({reimbursementAccount, onNext, isEditing}: AddressBusin
             submitButtonText={translate(isEditing ? 'common.confirm' : 'common.next')}
             validate={validate}
             onSubmit={handleSubmit}
-            submitButtonStyles={[styles.mb0, styles.pb5]}
+            submitButtonStyles={[styles.mb0]}
             style={[styles.mh5, styles.flexGrow1]}
         >
             <Text style={[styles.textHeadlineLineHeightXXL]}>{translate('businessInfoStep.enterYourCompanysAddress')}</Text>
-            <Text>{translate('common.noPO')}</Text>
+            <Text style={[styles.pv3, styles.textSupporting]}>{translate('common.noPO')}</Text>
             <AddressFormFields
                 inputKeys={INPUT_KEYS}
                 shouldSaveDraft={!isEditing}
diff --git a/src/pages/ReimbursementAccount/BusinessInfo/substeps/ConfirmationBusiness.tsx b/src/pages/ReimbursementAccount/BusinessInfo/substeps/ConfirmationBusiness.tsx
index 6311a63a4059..23b59d76ffa7 100644
--- a/src/pages/ReimbursementAccount/BusinessInfo/substeps/ConfirmationBusiness.tsx
+++ b/src/pages/ReimbursementAccount/BusinessInfo/substeps/ConfirmationBusiness.tsx
@@ -1,5 +1,5 @@
-import type {CONST as COMMON_CONST} from 'expensify-common/lib/CONST';
-import React, {useMemo} from 'react';
+import type {CONST as COMMON_CONST} from 'expensify-common';
+import React, {useCallback, useMemo} from 'react';
 import type {OnyxEntry} from 'react-native-onyx';
 import {withOnyx} from 'react-native-onyx';
 import CheckboxWithLabel from '@components/CheckboxWithLabel';
@@ -37,16 +37,6 @@ type States = keyof typeof COMMON_CONST.STATES;
 const BUSINESS_INFO_STEP_KEYS = INPUT_IDS.BUSINESS_INFO_STEP;
 const BUSINESS_INFO_STEP_INDEXES = CONST.REIMBURSEMENT_ACCOUNT.SUBSTEP_INDEX.BUSINESS_INFO;
 
-const validate = (values: FormOnyxValues<typeof ONYXKEYS.FORMS.REIMBURSEMENT_ACCOUNT_FORM>): FormInputErrors<typeof ONYXKEYS.FORMS.REIMBURSEMENT_ACCOUNT_FORM> => {
-    const errors = ValidationUtils.getFieldRequiredErrors(values, [BUSINESS_INFO_STEP_KEYS.HAS_NO_CONNECTION_TO_CANNABIS]);
-
-    if (!values.hasNoConnectionToCannabis) {
-        errors.hasNoConnectionToCannabis = 'bankAccount.error.restrictedBusiness';
-    }
-
-    return errors;
-};
-
 function ConfirmCompanyLabel() {
     const {translate} = useLocalize();
 
@@ -62,6 +52,19 @@ function ConfirmationBusiness({reimbursementAccount, reimbursementAccountDraft,
     const {translate} = useLocalize();
     const styles = useThemeStyles();
 
+    const validate = useCallback(
+        (values: FormOnyxValues<typeof ONYXKEYS.FORMS.REIMBURSEMENT_ACCOUNT_FORM>): FormInputErrors<typeof ONYXKEYS.FORMS.REIMBURSEMENT_ACCOUNT_FORM> => {
+            const errors = ValidationUtils.getFieldRequiredErrors(values, [BUSINESS_INFO_STEP_KEYS.HAS_NO_CONNECTION_TO_CANNABIS]);
+
+            if (!values.hasNoConnectionToCannabis) {
+                errors.hasNoConnectionToCannabis = translate('bankAccount.error.restrictedBusiness');
+            }
+
+            return errors;
+        },
+        [translate],
+    );
+
     const values = useMemo(() => getSubstepValues(BUSINESS_INFO_STEP_KEYS, reimbursementAccountDraft, reimbursementAccount), [reimbursementAccount, reimbursementAccountDraft]);
 
     const defaultCheckboxState = reimbursementAccountDraft?.[BUSINESS_INFO_STEP_KEYS.HAS_NO_CONNECTION_TO_CANNABIS] ?? false;
diff --git a/src/pages/ReimbursementAccount/BusinessInfo/substeps/IncorporationDateBusiness.tsx b/src/pages/ReimbursementAccount/BusinessInfo/substeps/IncorporationDateBusiness.tsx
index 1f6b341cb261..168cb02fd925 100644
--- a/src/pages/ReimbursementAccount/BusinessInfo/substeps/IncorporationDateBusiness.tsx
+++ b/src/pages/ReimbursementAccount/BusinessInfo/substeps/IncorporationDateBusiness.tsx
@@ -1,4 +1,4 @@
-import React from 'react';
+import React, {useCallback} from 'react';
 import type {OnyxEntry} from 'react-native-onyx';
 import {withOnyx} from 'react-native-onyx';
 import DatePicker from '@components/DatePicker';
@@ -29,22 +29,25 @@ type IncorporationDateBusinessProps = IncorporationDateBusinessOnyxProps & SubSt
 const COMPANY_INCORPORATION_DATE_KEY = INPUT_IDS.BUSINESS_INFO_STEP.INCORPORATION_DATE;
 const STEP_FIELDS = [COMPANY_INCORPORATION_DATE_KEY];
 
-const validate = (values: FormOnyxValues<typeof ONYXKEYS.FORMS.REIMBURSEMENT_ACCOUNT_FORM>): FormInputErrors<typeof ONYXKEYS.FORMS.REIMBURSEMENT_ACCOUNT_FORM> => {
-    const errors = ValidationUtils.getFieldRequiredErrors(values, STEP_FIELDS);
-
-    if (values.incorporationDate && !ValidationUtils.isValidDate(values.incorporationDate)) {
-        errors.incorporationDate = 'common.error.dateInvalid';
-    } else if (values.incorporationDate && !ValidationUtils.isValidPastDate(values.incorporationDate)) {
-        errors.incorporationDate = 'bankAccount.error.incorporationDateFuture';
-    }
-
-    return errors;
-};
-
 function IncorporationDateBusiness({reimbursementAccount, reimbursementAccountDraft, onNext, isEditing}: IncorporationDateBusinessProps) {
     const {translate} = useLocalize();
     const styles = useThemeStyles();
 
+    const validate = useCallback(
+        (values: FormOnyxValues<typeof ONYXKEYS.FORMS.REIMBURSEMENT_ACCOUNT_FORM>): FormInputErrors<typeof ONYXKEYS.FORMS.REIMBURSEMENT_ACCOUNT_FORM> => {
+            const errors = ValidationUtils.getFieldRequiredErrors(values, STEP_FIELDS);
+
+            if (values.incorporationDate && !ValidationUtils.isValidDate(values.incorporationDate)) {
+                errors.incorporationDate = translate('common.error.dateInvalid');
+            } else if (values.incorporationDate && !ValidationUtils.isValidPastDate(values.incorporationDate)) {
+                errors.incorporationDate = translate('bankAccount.error.incorporationDateFuture');
+            }
+
+            return errors;
+        },
+        [translate],
+    );
+
     const defaultCompanyIncorporationDate = reimbursementAccount?.achData?.incorporationDate ?? reimbursementAccountDraft?.incorporationDate ?? '';
 
     const handleSubmit = useReimbursementAccountStepFormSubmit({
@@ -60,11 +63,10 @@ function IncorporationDateBusiness({reimbursementAccount, reimbursementAccountDr
             validate={validate}
             onSubmit={handleSubmit}
             style={[styles.mh5, styles.flexGrow1]}
-            submitButtonStyles={[styles.pb5, styles.mb0]}
+            submitButtonStyles={[styles.mb0]}
         >
             <Text style={[styles.textHeadlineLineHeightXXL]}>{translate('businessInfoStep.selectYourCompanysIncorporationDate')}</Text>
-            {/* @ts-expect-error TODO: Remove this once DatePicker (https://github.com/Expensify/App/issues/25148) is migrated to TypeScript. */}
-            <InputWrapper<unknown>
+            <InputWrapper
                 InputComponent={DatePicker}
                 inputID={COMPANY_INCORPORATION_DATE_KEY}
                 label={translate('businessInfoStep.incorporationDate')}
diff --git a/src/pages/ReimbursementAccount/BusinessInfo/substeps/IncorporationStateBusiness.tsx b/src/pages/ReimbursementAccount/BusinessInfo/substeps/IncorporationStateBusiness.tsx
index 52855c4f5c2e..75a032b1568b 100644
--- a/src/pages/ReimbursementAccount/BusinessInfo/substeps/IncorporationStateBusiness.tsx
+++ b/src/pages/ReimbursementAccount/BusinessInfo/substeps/IncorporationStateBusiness.tsx
@@ -46,7 +46,7 @@ function IncorporationStateBusiness({reimbursementAccount, onNext, isEditing}: I
             validate={validate}
             onSubmit={handleSubmit}
             style={[styles.mh0, styles.flexGrow1]}
-            submitButtonStyles={[styles.p5, styles.mb0]}
+            submitButtonStyles={[styles.ph5, styles.mb0]}
         >
             <Text style={[styles.textHeadlineLineHeightXXL, styles.ph5]}>{translate('businessInfoStep.pleaseSelectTheStateYourCompanyWasIncorporatedIn')}</Text>
             <InputWrapper
diff --git a/src/pages/ReimbursementAccount/BusinessInfo/substeps/NameBusiness.tsx b/src/pages/ReimbursementAccount/BusinessInfo/substeps/NameBusiness.tsx
index 377fbf9782ae..0d29f4718a36 100644
--- a/src/pages/ReimbursementAccount/BusinessInfo/substeps/NameBusiness.tsx
+++ b/src/pages/ReimbursementAccount/BusinessInfo/substeps/NameBusiness.tsx
@@ -1,4 +1,4 @@
-import React from 'react';
+import React, {useCallback} from 'react';
 import type {OnyxEntry} from 'react-native-onyx';
 import {withOnyx} from 'react-native-onyx';
 import FormProvider from '@components/Form/FormProvider';
@@ -26,25 +26,28 @@ type NameBusinessProps = NameBusinessOnyxProps & SubStepProps;
 const COMPANY_NAME_KEY = INPUT_IDS.BUSINESS_INFO_STEP.COMPANY_NAME;
 const STEP_FIELDS = [COMPANY_NAME_KEY];
 
-const validate = (values: FormOnyxValues<typeof ONYXKEYS.FORMS.REIMBURSEMENT_ACCOUNT_FORM>): FormInputErrors<typeof ONYXKEYS.FORMS.REIMBURSEMENT_ACCOUNT_FORM> => {
-    const errors = ValidationUtils.getFieldRequiredErrors(values, STEP_FIELDS);
-
-    if (values.companyName && !ValidationUtils.isValidCompanyName(values.companyName)) {
-        errors.companyName = 'bankAccount.error.companyName';
-    }
-
-    return errors;
-};
-
 function NameBusiness({reimbursementAccount, onNext, isEditing}: NameBusinessProps) {
     const {translate} = useLocalize();
     const styles = useThemeStyles();
 
     const defaultCompanyName = reimbursementAccount?.achData?.companyName ?? '';
-    const bankAccountID = reimbursementAccount?.achData?.bankAccountID ?? 0;
+    const bankAccountID = reimbursementAccount?.achData?.bankAccountID ?? -1;
 
     const shouldDisableCompanyName = !!(bankAccountID && defaultCompanyName && reimbursementAccount?.achData?.state !== 'SETUP');
 
+    const validate = useCallback(
+        (values: FormOnyxValues<typeof ONYXKEYS.FORMS.REIMBURSEMENT_ACCOUNT_FORM>): FormInputErrors<typeof ONYXKEYS.FORMS.REIMBURSEMENT_ACCOUNT_FORM> => {
+            const errors = ValidationUtils.getFieldRequiredErrors(values, STEP_FIELDS);
+
+            if (values.companyName && !ValidationUtils.isValidCompanyName(values.companyName)) {
+                errors.companyName = translate('bankAccount.error.companyName');
+            }
+
+            return errors;
+        },
+        [translate],
+    );
+
     const handleSubmit = useReimbursementAccountStepFormSubmit({
         fieldIds: STEP_FIELDS,
         onNext,
@@ -58,7 +61,7 @@ function NameBusiness({reimbursementAccount, onNext, isEditing}: NameBusinessPro
             validate={validate}
             onSubmit={handleSubmit}
             style={[styles.mh5, styles.flexGrow1]}
-            submitButtonStyles={[styles.pb5, styles.mb0]}
+            submitButtonStyles={[styles.mb0]}
         >
             <Text style={[styles.textHeadlineLineHeightXXL]}>{translate('businessInfoStep.enterTheNameOfYourBusiness')}</Text>
             <InputWrapper
diff --git a/src/pages/ReimbursementAccount/BusinessInfo/substeps/PhoneNumberBusiness.tsx b/src/pages/ReimbursementAccount/BusinessInfo/substeps/PhoneNumberBusiness.tsx
index 018922610080..4dc6fc37b4f4 100644
--- a/src/pages/ReimbursementAccount/BusinessInfo/substeps/PhoneNumberBusiness.tsx
+++ b/src/pages/ReimbursementAccount/BusinessInfo/substeps/PhoneNumberBusiness.tsx
@@ -1,4 +1,4 @@
-import React from 'react';
+import React, {useCallback} from 'react';
 import type {OnyxEntry} from 'react-native-onyx';
 import {withOnyx} from 'react-native-onyx';
 import FormProvider from '@components/Form/FormProvider';
@@ -26,21 +26,24 @@ type PhoneNumberBusinessProps = PhoneNumberBusinessOnyxProps & SubStepProps;
 const COMPANY_PHONE_NUMBER_KEY = INPUT_IDS.BUSINESS_INFO_STEP.COMPANY_PHONE;
 const STEP_FIELDS = [COMPANY_PHONE_NUMBER_KEY];
 
-const validate = (values: FormOnyxValues<typeof ONYXKEYS.FORMS.REIMBURSEMENT_ACCOUNT_FORM>): FormInputErrors<typeof ONYXKEYS.FORMS.REIMBURSEMENT_ACCOUNT_FORM> => {
-    const errors = ValidationUtils.getFieldRequiredErrors(values, STEP_FIELDS);
-
-    if (values.companyPhone && !ValidationUtils.isValidUSPhone(values.companyPhone, true)) {
-        errors.companyPhone = 'bankAccount.error.phoneNumber';
-    }
-
-    return errors;
-};
-
 function PhoneNumberBusiness({reimbursementAccount, onNext, isEditing}: PhoneNumberBusinessProps) {
     const {translate} = useLocalize();
     const styles = useThemeStyles();
     const defaultCompanyPhoneNumber = reimbursementAccount?.achData?.companyPhone ?? '';
 
+    const validate = useCallback(
+        (values: FormOnyxValues<typeof ONYXKEYS.FORMS.REIMBURSEMENT_ACCOUNT_FORM>): FormInputErrors<typeof ONYXKEYS.FORMS.REIMBURSEMENT_ACCOUNT_FORM> => {
+            const errors = ValidationUtils.getFieldRequiredErrors(values, STEP_FIELDS);
+
+            if (values.companyPhone && !ValidationUtils.isValidUSPhone(values.companyPhone, true)) {
+                errors.companyPhone = translate('bankAccount.error.phoneNumber');
+            }
+
+            return errors;
+        },
+        [translate],
+    );
+
     const handleSubmit = useReimbursementAccountStepFormSubmit({
         fieldIds: STEP_FIELDS,
         onNext,
@@ -55,7 +58,7 @@ function PhoneNumberBusiness({reimbursementAccount, onNext, isEditing}: PhoneNum
             validate={validate}
             onSubmit={handleSubmit}
             style={[styles.mh5, styles.flexGrow1]}
-            submitButtonStyles={[styles.pb5, styles.mb0]}
+            submitButtonStyles={[styles.mb0]}
         >
             <Text style={[styles.textHeadlineLineHeightXXL]}>{translate('businessInfoStep.enterYourCompanysPhoneNumber')}</Text>
             <InputWrapper
diff --git a/src/pages/ReimbursementAccount/BusinessInfo/substeps/TaxIdBusiness.tsx b/src/pages/ReimbursementAccount/BusinessInfo/substeps/TaxIdBusiness.tsx
index cabf0fc01576..2c55a0b8c251 100644
--- a/src/pages/ReimbursementAccount/BusinessInfo/substeps/TaxIdBusiness.tsx
+++ b/src/pages/ReimbursementAccount/BusinessInfo/substeps/TaxIdBusiness.tsx
@@ -1,4 +1,4 @@
-import React from 'react';
+import React, {useCallback} from 'react';
 import type {OnyxEntry} from 'react-native-onyx';
 import {withOnyx} from 'react-native-onyx';
 import FormProvider from '@components/Form/FormProvider';
@@ -25,17 +25,6 @@ type TaxIdBusinessProps = TaxIdBusinessOnyxProps & SubStepProps;
 
 const COMPANY_TAX_ID_KEY = INPUT_IDS.BUSINESS_INFO_STEP.COMPANY_TAX_ID;
 const STEP_FIELDS = [COMPANY_TAX_ID_KEY];
-
-const validate = (values: FormOnyxValues<typeof ONYXKEYS.FORMS.REIMBURSEMENT_ACCOUNT_FORM>): FormInputErrors<typeof ONYXKEYS.FORMS.REIMBURSEMENT_ACCOUNT_FORM> => {
-    const errors = ValidationUtils.getFieldRequiredErrors(values, STEP_FIELDS);
-
-    if (values.companyTaxID && !ValidationUtils.isValidTaxID(values.companyTaxID)) {
-        errors.companyTaxID = 'bankAccount.error.taxID';
-    }
-
-    return errors;
-};
-
 function TaxIdBusiness({reimbursementAccount, onNext, isEditing}: TaxIdBusinessProps) {
     const {translate} = useLocalize();
     const styles = useThemeStyles();
@@ -43,6 +32,19 @@ function TaxIdBusiness({reimbursementAccount, onNext, isEditing}: TaxIdBusinessP
     const bankAccountID = reimbursementAccount?.achData?.bankAccountID ?? 0;
     const shouldDisableCompanyTaxID = !!(bankAccountID && defaultCompanyTaxId && reimbursementAccount?.achData?.state !== 'SETUP');
 
+    const validate = useCallback(
+        (values: FormOnyxValues<typeof ONYXKEYS.FORMS.REIMBURSEMENT_ACCOUNT_FORM>): FormInputErrors<typeof ONYXKEYS.FORMS.REIMBURSEMENT_ACCOUNT_FORM> => {
+            const errors = ValidationUtils.getFieldRequiredErrors(values, STEP_FIELDS);
+
+            if (values.companyTaxID && !ValidationUtils.isValidTaxID(values.companyTaxID)) {
+                errors.companyTaxID = translate('bankAccount.error.taxID');
+            }
+
+            return errors;
+        },
+        [translate],
+    );
+
     const handleSubmit = useReimbursementAccountStepFormSubmit({
         fieldIds: STEP_FIELDS,
         onNext,
@@ -56,7 +58,7 @@ function TaxIdBusiness({reimbursementAccount, onNext, isEditing}: TaxIdBusinessP
             validate={validate}
             onSubmit={handleSubmit}
             style={[styles.mh5, styles.flexGrow1]}
-            submitButtonStyles={[styles.pb5, styles.mb0]}
+            submitButtonStyles={[styles.mb0]}
         >
             <Text style={[styles.textHeadlineLineHeightXXL]}>{translate('businessInfoStep.enterYourCompanysTaxIdNumber')}</Text>
             <InputWrapper
diff --git a/src/pages/ReimbursementAccount/BusinessInfo/substeps/TypeBusiness/BusinessTypePicker/BusinessTypeSelectorModal.tsx b/src/pages/ReimbursementAccount/BusinessInfo/substeps/TypeBusiness/BusinessTypePicker/BusinessTypeSelectorModal.tsx
index 0f85b58bf10a..45db53a23286 100644
--- a/src/pages/ReimbursementAccount/BusinessInfo/substeps/TypeBusiness/BusinessTypePicker/BusinessTypeSelectorModal.tsx
+++ b/src/pages/ReimbursementAccount/BusinessInfo/substeps/TypeBusiness/BusinessTypePicker/BusinessTypeSelectorModal.tsx
@@ -65,6 +65,7 @@ function BusinessTypeSelectorModal({isVisible, currentBusinessType, onBusinessTy
                     sections={[{data: incorporationTypes}]}
                     initiallyFocusedOptionKey={currentBusinessType}
                     onSelectRow={onBusinessTypeSelected}
+                    shouldSingleExecuteRowSelect
                     shouldStopPropagation
                     shouldUseDynamicMaxToRenderPerBatch
                     ListItem={RadioListItem}
diff --git a/src/pages/ReimbursementAccount/BusinessInfo/substeps/TypeBusiness/BusinessTypePicker/index.tsx b/src/pages/ReimbursementAccount/BusinessInfo/substeps/TypeBusiness/BusinessTypePicker/index.tsx
index 60b73efd8305..2bd4df609da4 100644
--- a/src/pages/ReimbursementAccount/BusinessInfo/substeps/TypeBusiness/BusinessTypePicker/index.tsx
+++ b/src/pages/ReimbursementAccount/BusinessInfo/substeps/TypeBusiness/BusinessTypePicker/index.tsx
@@ -1,10 +1,10 @@
 import React, {useState} from 'react';
 import type {StyleProp, ViewStyle} from 'react-native';
 import {View} from 'react-native';
-import FormHelpMessage from '@components/FormHelpMessage';
 import MenuItemWithTopDescription from '@components/MenuItemWithTopDescription';
 import useLocalize from '@hooks/useLocalize';
 import useThemeStyles from '@hooks/useThemeStyles';
+import CONST from '@src/CONST';
 import BusinessTypeSelectorModal from './BusinessTypeSelectorModal';
 import type {BusinessTypeItemType, IncorporationType} from './types';
 
@@ -65,11 +65,10 @@ function BusinessTypePicker({errorText = '', value = '', wrapperStyle, onInputCh
                 description={label}
                 descriptionTextStyle={descStyle}
                 onPress={showPickerModal}
+                brickRoadIndicator={errorText ? CONST.BRICK_ROAD_INDICATOR_STATUS.ERROR : undefined}
+                errorText={errorText}
                 wrapperStyle={wrapperStyle}
             />
-            <View style={styles.ml5}>
-                <FormHelpMessage message={errorText} />
-            </View>
             <BusinessTypeSelectorModal
                 isVisible={isPickerVisible}
                 currentBusinessType={value}
diff --git a/src/pages/ReimbursementAccount/BusinessInfo/substeps/TypeBusiness/TypeBusiness.tsx b/src/pages/ReimbursementAccount/BusinessInfo/substeps/TypeBusiness/TypeBusiness.tsx
index 0ee629ae5e21..3b4e89588044 100644
--- a/src/pages/ReimbursementAccount/BusinessInfo/substeps/TypeBusiness/TypeBusiness.tsx
+++ b/src/pages/ReimbursementAccount/BusinessInfo/substeps/TypeBusiness/TypeBusiness.tsx
@@ -46,7 +46,7 @@ function TypeBusiness({reimbursementAccount, onNext, isEditing}: TypeBusinessPro
             validate={validate}
             onSubmit={handleSubmit}
             style={[styles.flexGrow1]}
-            submitButtonStyles={[styles.p5, styles.mb0]}
+            submitButtonStyles={[styles.ph5, styles.mb0]}
         >
             <Text style={[styles.textHeadlineLineHeightXXL, styles.ph5]}>{translate('businessInfoStep.selectYourCompanysType')}</Text>
             <InputWrapper
diff --git a/src/pages/ReimbursementAccount/BusinessInfo/substeps/WebsiteBusiness.tsx b/src/pages/ReimbursementAccount/BusinessInfo/substeps/WebsiteBusiness.tsx
index e06c4d9d575e..a2d1f245152f 100644
--- a/src/pages/ReimbursementAccount/BusinessInfo/substeps/WebsiteBusiness.tsx
+++ b/src/pages/ReimbursementAccount/BusinessInfo/substeps/WebsiteBusiness.tsx
@@ -1,4 +1,4 @@
-import React, {useEffect, useMemo} from 'react';
+import React, {useCallback, useMemo} from 'react';
 import type {OnyxEntry} from 'react-native-onyx';
 import {withOnyx} from 'react-native-onyx';
 import FormProvider from '@components/Form/FormProvider';
@@ -12,7 +12,6 @@ import type {SubStepProps} from '@hooks/useSubStep/types';
 import useThemeStyles from '@hooks/useThemeStyles';
 import {getDefaultCompanyWebsite} from '@libs/BankAccountUtils';
 import * as ValidationUtils from '@libs/ValidationUtils';
-import * as BankAccounts from '@userActions/BankAccounts';
 import CONST from '@src/CONST';
 import ONYXKEYS from '@src/ONYXKEYS';
 import INPUT_IDS from '@src/types/form/ReimbursementAccountForm';
@@ -34,16 +33,6 @@ type WebsiteBusinessProps = WebsiteBusinessOnyxProps & SubStepProps;
 const COMPANY_WEBSITE_KEY = INPUT_IDS.BUSINESS_INFO_STEP.COMPANY_WEBSITE;
 const STEP_FIELDS = [COMPANY_WEBSITE_KEY];
 
-const validate = (values: FormOnyxValues<typeof ONYXKEYS.FORMS.REIMBURSEMENT_ACCOUNT_FORM>): FormInputErrors<typeof ONYXKEYS.FORMS.REIMBURSEMENT_ACCOUNT_FORM> => {
-    const errors = ValidationUtils.getFieldRequiredErrors(values, STEP_FIELDS);
-
-    if (values.website && !ValidationUtils.isValidWebsite(values.website)) {
-        errors.website = 'bankAccount.error.website';
-    }
-
-    return errors;
-};
-
 function WebsiteBusiness({reimbursementAccount, user, session, onNext, isEditing}: WebsiteBusinessProps) {
     const {translate} = useLocalize();
     const styles = useThemeStyles();
@@ -51,16 +40,24 @@ function WebsiteBusiness({reimbursementAccount, user, session, onNext, isEditing
     const defaultWebsiteExample = useMemo(() => getDefaultCompanyWebsite(session, user), [session, user]);
     const defaultCompanyWebsite = reimbursementAccount?.achData?.website ?? defaultWebsiteExample;
 
+    const validate = useCallback(
+        (values: FormOnyxValues<typeof ONYXKEYS.FORMS.REIMBURSEMENT_ACCOUNT_FORM>): FormInputErrors<typeof ONYXKEYS.FORMS.REIMBURSEMENT_ACCOUNT_FORM> => {
+            const errors = ValidationUtils.getFieldRequiredErrors(values, STEP_FIELDS);
+
+            if (values.website && !ValidationUtils.isValidWebsite(values.website)) {
+                errors.website = translate('bankAccount.error.website');
+            }
+
+            return errors;
+        },
+        [translate],
+    );
     const handleSubmit = useReimbursementAccountStepFormSubmit({
         fieldIds: STEP_FIELDS,
         onNext,
         shouldSaveDraft: isEditing,
     });
 
-    useEffect(() => {
-        BankAccounts.addBusinessWebsiteForDraft(defaultCompanyWebsite);
-    }, [defaultCompanyWebsite]);
-
     return (
         <FormProvider
             formID={ONYXKEYS.FORMS.REIMBURSEMENT_ACCOUNT_FORM}
@@ -68,7 +65,7 @@ function WebsiteBusiness({reimbursementAccount, user, session, onNext, isEditing
             validate={validate}
             onSubmit={handleSubmit}
             style={[styles.mh5, styles.flexGrow1]}
-            submitButtonStyles={[styles.pb5, styles.mb0]}
+            submitButtonStyles={[styles.mb0]}
         >
             <Text style={[styles.textHeadlineLineHeightXXL]}>{translate('businessInfoStep.enterYourCompanysWebsite')}</Text>
             <Text style={[styles.label, styles.textSupporting]}>{translate('common.websiteExample')}</Text>
diff --git a/src/pages/ReimbursementAccount/CompleteVerification/CompleteVerification.tsx b/src/pages/ReimbursementAccount/CompleteVerification/CompleteVerification.tsx
index 1c440a52644c..900ca7207f59 100644
--- a/src/pages/ReimbursementAccount/CompleteVerification/CompleteVerification.tsx
+++ b/src/pages/ReimbursementAccount/CompleteVerification/CompleteVerification.tsx
@@ -40,11 +40,11 @@ function CompleteVerification({reimbursementAccount, reimbursementAccountDraft,
     const styles = useThemeStyles();
 
     const values = useMemo(() => getSubstepValues(COMPLETE_VERIFICATION_KEYS, reimbursementAccountDraft, reimbursementAccount), [reimbursementAccount, reimbursementAccountDraft]);
-    const policyID = reimbursementAccount?.achData?.policyID ?? '';
+    const policyID = reimbursementAccount?.achData?.policyID ?? '-1';
 
     const submit = useCallback(() => {
         BankAccounts.acceptACHContractForBankAccount(
-            Number(reimbursementAccount?.achData?.bankAccountID ?? '0'),
+            Number(reimbursementAccount?.achData?.bankAccountID ?? '-1'),
             {
                 isAuthorizedToUseBankAccount: values.isAuthorizedToUseBankAccount,
                 certifyTrueInformation: values.certifyTrueInformation,
diff --git a/src/pages/ReimbursementAccount/CompleteVerification/substeps/ConfirmAgreements.tsx b/src/pages/ReimbursementAccount/CompleteVerification/substeps/ConfirmAgreements.tsx
index 03a178f186ee..71d7a80ab58b 100644
--- a/src/pages/ReimbursementAccount/CompleteVerification/substeps/ConfirmAgreements.tsx
+++ b/src/pages/ReimbursementAccount/CompleteVerification/substeps/ConfirmAgreements.tsx
@@ -1,4 +1,4 @@
-import React from 'react';
+import React, {useCallback} from 'react';
 import {withOnyx} from 'react-native-onyx';
 import type {OnyxEntry} from 'react-native-onyx';
 import CheckboxWithLabel from '@components/CheckboxWithLabel';
@@ -30,24 +30,6 @@ const STEP_FIELDS = [
     INPUT_IDS.COMPLETE_VERIFICATION.CERTIFY_TRUE_INFORMATION,
 ];
 
-const validate = (values: FormOnyxValues<typeof ONYXKEYS.FORMS.REIMBURSEMENT_ACCOUNT_FORM>): FormInputErrors<typeof ONYXKEYS.FORMS.REIMBURSEMENT_ACCOUNT_FORM> => {
-    const errors = ValidationUtils.getFieldRequiredErrors(values, STEP_FIELDS);
-
-    if (!ValidationUtils.isRequiredFulfilled(values.acceptTermsAndConditions)) {
-        errors.acceptTermsAndConditions = 'common.error.acceptTerms';
-    }
-
-    if (!ValidationUtils.isRequiredFulfilled(values.certifyTrueInformation)) {
-        errors.certifyTrueInformation = 'completeVerificationStep.certifyTrueAndAccurateError';
-    }
-
-    if (!ValidationUtils.isRequiredFulfilled(values.isAuthorizedToUseBankAccount)) {
-        errors.isAuthorizedToUseBankAccount = 'completeVerificationStep.isAuthorizedToUseBankAccountError';
-    }
-
-    return errors;
-};
-
 function IsAuthorizedToUseBankAccountLabel() {
     const {translate} = useLocalize();
     return <Text>{translate('completeVerificationStep.isAuthorizedToUseBankAccount')}</Text>;
@@ -76,6 +58,26 @@ function ConfirmAgreements({onNext, reimbursementAccount}: ConfirmAgreementsProp
         certifyTrueInformation: reimbursementAccount?.achData?.certifyTrueInformation ?? false,
         acceptTermsAndConditions: reimbursementAccount?.achData?.acceptTermsAndConditions ?? false,
     };
+    const validate = useCallback(
+        (values: FormOnyxValues<typeof ONYXKEYS.FORMS.REIMBURSEMENT_ACCOUNT_FORM>): FormInputErrors<typeof ONYXKEYS.FORMS.REIMBURSEMENT_ACCOUNT_FORM> => {
+            const errors = ValidationUtils.getFieldRequiredErrors(values, STEP_FIELDS);
+
+            if (!ValidationUtils.isRequiredFulfilled(values.acceptTermsAndConditions)) {
+                errors.acceptTermsAndConditions = translate('common.error.acceptTerms');
+            }
+
+            if (!ValidationUtils.isRequiredFulfilled(values.certifyTrueInformation)) {
+                errors.certifyTrueInformation = translate('completeVerificationStep.certifyTrueAndAccurateError');
+            }
+
+            if (!ValidationUtils.isRequiredFulfilled(values.isAuthorizedToUseBankAccount)) {
+                errors.isAuthorizedToUseBankAccount = translate('completeVerificationStep.isAuthorizedToUseBankAccountError');
+            }
+
+            return errors;
+        },
+        [translate],
+    );
 
     return (
         <FormProvider
diff --git a/src/pages/ReimbursementAccount/ConnectBankAccount/components/BankAccountValidationForm.tsx b/src/pages/ReimbursementAccount/ConnectBankAccount/components/BankAccountValidationForm.tsx
index a83e18d119c9..6d9894f5308c 100644
--- a/src/pages/ReimbursementAccount/ConnectBankAccount/components/BankAccountValidationForm.tsx
+++ b/src/pages/ReimbursementAccount/ConnectBankAccount/components/BankAccountValidationForm.tsx
@@ -1,6 +1,7 @@
-import Str from 'expensify-common/lib/str';
+import {Str} from 'expensify-common';
 import React, {useCallback} from 'react';
 import {View} from 'react-native';
+import type {OnyxEntry} from 'react-native-onyx';
 import FormProvider from '@components/Form/FormProvider';
 import InputWrapper from '@components/Form/InputWrapper';
 import type {FormInputErrors, FormOnyxValues} from '@components/Form/types';
@@ -26,7 +27,7 @@ type BankAccountValidationFormProps = {
     requiresTwoFactorAuth: boolean;
 
     /** The policy which the user has access to and which the report is tied to */
-    policy: Policy | null;
+    policy: OnyxEntry<Policy>;
 };
 
 type AmountValues = {
@@ -58,7 +59,7 @@ function BankAccountValidationForm({requiresTwoFactorAuth, reimbursementAccount,
     const {translate, toLocaleDigit} = useLocalize();
     const styles = useThemeStyles();
 
-    const policyID = reimbursementAccount?.achData?.policyID ?? '';
+    const policyID = reimbursementAccount?.achData?.policyID ?? '-1';
     const decimalSeparator = toLocaleDigit('.');
     const permittedDecimalSeparator = getPermittedDecimalSeparator(decimalSeparator);
     const validate = (values: FormOnyxValues<typeof ONYXKEYS.FORMS.REIMBURSEMENT_ACCOUNT_FORM>): FormInputErrors<typeof ONYXKEYS.FORMS.REIMBURSEMENT_ACCOUNT_FORM> => {
@@ -73,7 +74,7 @@ function BankAccountValidationForm({requiresTwoFactorAuth, reimbursementAccount,
             if (ValidationUtils.isRequiredFulfilled(filteredValue.toString())) {
                 return;
             }
-            errors[key as keyof AmountValues] = 'common.error.invalidAmount';
+            errors[key as keyof AmountValues] = translate('common.error.invalidAmount');
         });
 
         return errors;
@@ -88,7 +89,7 @@ function BankAccountValidationForm({requiresTwoFactorAuth, reimbursementAccount,
             const validateCode = [amount1, amount2, amount3].join(',');
 
             // Send valid amounts to BankAccountAPI::validateBankAccount in Web-Expensify
-            const bankAccountID = Number(reimbursementAccount?.achData?.bankAccountID ?? '0');
+            const bankAccountID = Number(reimbursementAccount?.achData?.bankAccountID ?? '-1');
             if (bankAccountID) {
                 BankAccounts.validateBankAccount(bankAccountID, validateCode, policyID);
             }
diff --git a/src/pages/ReimbursementAccount/ConnectBankAccount/components/FinishChatCard.tsx b/src/pages/ReimbursementAccount/ConnectBankAccount/components/FinishChatCard.tsx
index 5f5786fd51c7..e6250c9767f8 100644
--- a/src/pages/ReimbursementAccount/ConnectBankAccount/components/FinishChatCard.tsx
+++ b/src/pages/ReimbursementAccount/ConnectBankAccount/components/FinishChatCard.tsx
@@ -25,7 +25,7 @@ type FinishChatCardProps = {
 function FinishChatCard({requiresTwoFactorAuth, reimbursementAccount}: FinishChatCardProps) {
     const {translate} = useLocalize();
     const styles = useThemeStyles();
-    const policyID = reimbursementAccount?.achData?.policyID ?? '';
+    const policyID = reimbursementAccount?.achData?.policyID ?? '-1';
     const shouldShowResetModal = reimbursementAccount.shouldShowResetModal ?? false;
     const handleNavigateToConciergeChat = () => Report.navigateToConciergeChat(true);
 
diff --git a/src/pages/ReimbursementAccount/EnableBankAccount/EnableBankAccount.tsx b/src/pages/ReimbursementAccount/EnableBankAccount/EnableBankAccount.tsx
index 8687ff89ba62..599a7a1cf6f1 100644
--- a/src/pages/ReimbursementAccount/EnableBankAccount/EnableBankAccount.tsx
+++ b/src/pages/ReimbursementAccount/EnableBankAccount/EnableBankAccount.tsx
@@ -42,7 +42,7 @@ function EnableBankAccount({reimbursementAccount, user, onBackButtonPress}: Enab
     const achData = reimbursementAccount?.achData ?? {};
     const {icon, iconSize} = getBankIcon({bankName: achData.bankName, styles});
     const isUsingExpensifyCard = user?.isUsingExpensifyCard;
-    const formattedBankAccountNumber = achData.accountNumber ? `${translate('paymentMethodList.accountLastFour')} ${achData.accountNumber.slice(-4)}` : '';
+    const formattedBankAccountNumber = achData.accountNumber ? `${translate('bankAccount.accountEnding')} ${achData.accountNumber.slice(-4)}` : '';
     const bankAccountOwnerName = achData.addressName;
     const errors = reimbursementAccount?.errors ?? {};
     const pendingAction = reimbursementAccount?.pendingAction;
diff --git a/src/pages/ReimbursementAccount/PersonalInfo/PersonalInfo.tsx b/src/pages/ReimbursementAccount/PersonalInfo/PersonalInfo.tsx
index 0ce1ae048d17..1aa7e519416e 100644
--- a/src/pages/ReimbursementAccount/PersonalInfo/PersonalInfo.tsx
+++ b/src/pages/ReimbursementAccount/PersonalInfo/PersonalInfo.tsx
@@ -44,9 +44,9 @@ function PersonalInfo({reimbursementAccount, reimbursementAccountDraft, onBackBu
     const {translate} = useLocalize();
     const styles = useThemeStyles();
 
-    const policyID = reimbursementAccount?.achData?.policyID ?? '';
+    const policyID = reimbursementAccount?.achData?.policyID ?? '-1';
     const values = useMemo(() => getSubstepValues(PERSONAL_INFO_STEP_KEYS, reimbursementAccountDraft, reimbursementAccount), [reimbursementAccount, reimbursementAccountDraft]);
-    const bankAccountID = Number(reimbursementAccount?.achData?.bankAccountID ?? '0');
+    const bankAccountID = Number(reimbursementAccount?.achData?.bankAccountID ?? '-1');
     const submit = useCallback(
         (isConfirmPage: boolean) => {
             BankAccounts.updatePersonalInformationForBankAccount(bankAccountID, {...values}, policyID, isConfirmPage);
diff --git a/src/pages/ReimbursementAccount/PersonalInfo/substeps/Address.tsx b/src/pages/ReimbursementAccount/PersonalInfo/substeps/Address.tsx
index a0ec8220ce3e..b37dd207ea37 100644
--- a/src/pages/ReimbursementAccount/PersonalInfo/substeps/Address.tsx
+++ b/src/pages/ReimbursementAccount/PersonalInfo/substeps/Address.tsx
@@ -1,4 +1,4 @@
-import React from 'react';
+import React, {useCallback} from 'react';
 import {View} from 'react-native';
 import type {OnyxEntry} from 'react-native-onyx';
 import {withOnyx} from 'react-native-onyx';
@@ -34,20 +34,6 @@ const INPUT_KEYS = {
 
 const STEP_FIELDS = [PERSONAL_INFO_STEP_KEY.STREET, PERSONAL_INFO_STEP_KEY.CITY, PERSONAL_INFO_STEP_KEY.STATE, PERSONAL_INFO_STEP_KEY.ZIP_CODE];
 
-const validate = (values: FormOnyxValues<typeof ONYXKEYS.FORMS.REIMBURSEMENT_ACCOUNT_FORM>): FormInputErrors<typeof ONYXKEYS.FORMS.REIMBURSEMENT_ACCOUNT_FORM> => {
-    const errors = ValidationUtils.getFieldRequiredErrors(values, STEP_FIELDS);
-
-    if (values.requestorAddressStreet && !ValidationUtils.isValidAddress(values.requestorAddressStreet)) {
-        errors.requestorAddressStreet = 'bankAccount.error.addressStreet';
-    }
-
-    if (values.requestorAddressZipCode && !ValidationUtils.isValidZipCode(values.requestorAddressZipCode)) {
-        errors.requestorAddressZipCode = 'bankAccount.error.zipCode';
-    }
-
-    return errors;
-};
-
 function Address({reimbursementAccount, onNext, isEditing}: AddressProps) {
     const {translate} = useLocalize();
     const styles = useThemeStyles();
@@ -59,6 +45,23 @@ function Address({reimbursementAccount, onNext, isEditing}: AddressProps) {
         zipCode: reimbursementAccount?.achData?.[PERSONAL_INFO_STEP_KEY.ZIP_CODE] ?? '',
     };
 
+    const validate = useCallback(
+        (values: FormOnyxValues<typeof ONYXKEYS.FORMS.REIMBURSEMENT_ACCOUNT_FORM>): FormInputErrors<typeof ONYXKEYS.FORMS.REIMBURSEMENT_ACCOUNT_FORM> => {
+            const errors = ValidationUtils.getFieldRequiredErrors(values, STEP_FIELDS);
+
+            if (values.requestorAddressStreet && !ValidationUtils.isValidAddress(values.requestorAddressStreet)) {
+                errors.requestorAddressStreet = translate('bankAccount.error.addressStreet');
+            }
+
+            if (values.requestorAddressZipCode && !ValidationUtils.isValidZipCode(values.requestorAddressZipCode)) {
+                errors.requestorAddressZipCode = translate('bankAccount.error.zipCode');
+            }
+
+            return errors;
+        },
+        [translate],
+    );
+
     const handleSubmit = useReimbursementAccountStepFormSubmit({
         fieldIds: STEP_FIELDS,
         onNext,
@@ -71,7 +74,7 @@ function Address({reimbursementAccount, onNext, isEditing}: AddressProps) {
             submitButtonText={translate(isEditing ? 'common.confirm' : 'common.next')}
             validate={validate}
             onSubmit={handleSubmit}
-            submitButtonStyles={[styles.mb0, styles.pb5]}
+            submitButtonStyles={[styles.mb0]}
             style={[styles.mh5, styles.flexGrow1]}
         >
             <View>
diff --git a/src/pages/ReimbursementAccount/PersonalInfo/substeps/DateOfBirth.tsx b/src/pages/ReimbursementAccount/PersonalInfo/substeps/DateOfBirth.tsx
index b02a56403641..8c68380d6e55 100644
--- a/src/pages/ReimbursementAccount/PersonalInfo/substeps/DateOfBirth.tsx
+++ b/src/pages/ReimbursementAccount/PersonalInfo/substeps/DateOfBirth.tsx
@@ -1,5 +1,5 @@
 import {subYears} from 'date-fns';
-import React from 'react';
+import React, {useCallback} from 'react';
 import type {OnyxEntry} from 'react-native-onyx';
 import {withOnyx} from 'react-native-onyx';
 import DatePicker from '@components/DatePicker';
@@ -32,24 +32,27 @@ type DateOfBirthProps = DateOfBirthOnyxProps & SubStepProps;
 const PERSONAL_INFO_DOB_KEY = INPUT_IDS.PERSONAL_INFO_STEP.DOB;
 const STEP_FIELDS = [PERSONAL_INFO_DOB_KEY];
 
-const validate = (values: FormOnyxValues<typeof ONYXKEYS.FORMS.REIMBURSEMENT_ACCOUNT_FORM>): FormInputErrors<typeof ONYXKEYS.FORMS.REIMBURSEMENT_ACCOUNT_FORM> => {
-    const errors = ValidationUtils.getFieldRequiredErrors(values, STEP_FIELDS);
-
-    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';
-        }
-    }
-
-    return errors;
-};
-
 function DateOfBirth({reimbursementAccount, reimbursementAccountDraft, onNext, isEditing}: DateOfBirthProps) {
     const {translate} = useLocalize();
     const styles = useThemeStyles();
 
+    const validate = useCallback(
+        (values: FormOnyxValues<typeof ONYXKEYS.FORMS.REIMBURSEMENT_ACCOUNT_FORM>): FormInputErrors<typeof ONYXKEYS.FORMS.REIMBURSEMENT_ACCOUNT_FORM> => {
+            const errors = ValidationUtils.getFieldRequiredErrors(values, STEP_FIELDS);
+
+            if (values.dob) {
+                if (!ValidationUtils.isValidPastDate(values.dob) || !ValidationUtils.meetsMaximumAgeRequirement(values.dob)) {
+                    errors.dob = translate('bankAccount.error.dob');
+                } else if (!ValidationUtils.meetsMinimumAgeRequirement(values.dob)) {
+                    errors.dob = translate('bankAccount.error.age');
+                }
+            }
+
+            return errors;
+        },
+        [translate],
+    );
+
     const dobDefaultValue = reimbursementAccount?.achData?.[PERSONAL_INFO_DOB_KEY] ?? reimbursementAccountDraft?.[PERSONAL_INFO_DOB_KEY] ?? '';
 
     const minDate = subYears(new Date(), CONST.DATE_BIRTH.MAX_AGE);
@@ -68,11 +71,10 @@ function DateOfBirth({reimbursementAccount, reimbursementAccountDraft, onNext, i
             validate={validate}
             onSubmit={handleSubmit}
             style={[styles.mh5, styles.flexGrow2, styles.justifyContentBetween]}
-            submitButtonStyles={[styles.pb5, styles.mb0]}
+            submitButtonStyles={[styles.mb0]}
         >
             <Text style={[styles.textHeadlineLineHeightXXL, styles.mb5]}>{translate('personalInfoStep.enterYourDateOfBirth')}</Text>
-            {/* @ts-expect-error TODO: Remove this once DatePicker (https://github.com/Expensify/App/issues/25148) is migrated to TypeScript. */}
-            <InputWrapper<unknown>
+            <InputWrapper
                 InputComponent={DatePicker}
                 inputID={PERSONAL_INFO_DOB_KEY}
                 label={translate('common.dob')}
diff --git a/src/pages/ReimbursementAccount/PersonalInfo/substeps/FullName.tsx b/src/pages/ReimbursementAccount/PersonalInfo/substeps/FullName.tsx
index 1d225c1c32f2..15c4114432da 100644
--- a/src/pages/ReimbursementAccount/PersonalInfo/substeps/FullName.tsx
+++ b/src/pages/ReimbursementAccount/PersonalInfo/substeps/FullName.tsx
@@ -1,4 +1,4 @@
-import React from 'react';
+import React, {useCallback} from 'react';
 import {View} from 'react-native';
 import type {OnyxEntry} from 'react-native-onyx';
 import {withOnyx} from 'react-native-onyx';
@@ -27,19 +27,6 @@ type FullNameProps = FullNameOnyxProps & SubStepProps;
 
 const PERSONAL_INFO_STEP_KEY = INPUT_IDS.PERSONAL_INFO_STEP;
 const STEP_FIELDS = [PERSONAL_INFO_STEP_KEY.FIRST_NAME, PERSONAL_INFO_STEP_KEY.LAST_NAME];
-
-const validate = (values: FormOnyxValues<typeof ONYXKEYS.FORMS.REIMBURSEMENT_ACCOUNT_FORM>): FormInputErrors<typeof ONYXKEYS.FORMS.REIMBURSEMENT_ACCOUNT_FORM> => {
-    const errors = ValidationUtils.getFieldRequiredErrors(values, STEP_FIELDS);
-    if (values.firstName && !ValidationUtils.isValidLegalName(values.firstName)) {
-        errors.firstName = 'bankAccount.error.firstName';
-    }
-
-    if (values.lastName && !ValidationUtils.isValidLegalName(values.lastName)) {
-        errors.lastName = 'bankAccount.error.lastName';
-    }
-    return errors;
-};
-
 function FullName({reimbursementAccount, onNext, isEditing}: FullNameProps) {
     const {translate} = useLocalize();
     const styles = useThemeStyles();
@@ -49,6 +36,21 @@ function FullName({reimbursementAccount, onNext, isEditing}: FullNameProps) {
         lastName: reimbursementAccount?.achData?.[PERSONAL_INFO_STEP_KEY.LAST_NAME] ?? '',
     };
 
+    const validate = useCallback(
+        (values: FormOnyxValues<typeof ONYXKEYS.FORMS.REIMBURSEMENT_ACCOUNT_FORM>): FormInputErrors<typeof ONYXKEYS.FORMS.REIMBURSEMENT_ACCOUNT_FORM> => {
+            const errors = ValidationUtils.getFieldRequiredErrors(values, STEP_FIELDS);
+            if (values.firstName && !ValidationUtils.isValidPersonName(values.firstName)) {
+                errors.firstName = translate('bankAccount.error.firstName');
+            }
+
+            if (values.lastName && !ValidationUtils.isValidPersonName(values.lastName)) {
+                errors.lastName = translate('bankAccount.error.lastName');
+            }
+            return errors;
+        },
+        [translate],
+    );
+
     const handleSubmit = useReimbursementAccountStepFormSubmit({
         fieldIds: STEP_FIELDS,
         onNext,
@@ -62,7 +64,7 @@ function FullName({reimbursementAccount, onNext, isEditing}: FullNameProps) {
             validate={validate}
             onSubmit={handleSubmit}
             style={[styles.mh5, styles.flexGrow1]}
-            submitButtonStyles={[styles.pb5, styles.mb0]}
+            submitButtonStyles={[styles.mb0]}
         >
             <View>
                 <Text style={[styles.textHeadlineLineHeightXXL, styles.mb6]}>{translate('personalInfoStep.enterYourLegalFirstAndLast')}</Text>
diff --git a/src/pages/ReimbursementAccount/PersonalInfo/substeps/SocialSecurityNumber.tsx b/src/pages/ReimbursementAccount/PersonalInfo/substeps/SocialSecurityNumber.tsx
index e647fd768fb1..2f08980f2bd0 100644
--- a/src/pages/ReimbursementAccount/PersonalInfo/substeps/SocialSecurityNumber.tsx
+++ b/src/pages/ReimbursementAccount/PersonalInfo/substeps/SocialSecurityNumber.tsx
@@ -1,4 +1,4 @@
-import React from 'react';
+import React, {useCallback} from 'react';
 import {View} from 'react-native';
 import type {OnyxEntry} from 'react-native-onyx';
 import {withOnyx} from 'react-native-onyx';
@@ -28,21 +28,25 @@ type SocialSecurityNumberProps = SocialSecurityNumberOnyxProps & SubStepProps;
 const PERSONAL_INFO_STEP_KEY = INPUT_IDS.PERSONAL_INFO_STEP;
 const STEP_FIELDS = [PERSONAL_INFO_STEP_KEY.SSN_LAST_4];
 
-const validate = (values: FormOnyxValues<typeof ONYXKEYS.FORMS.REIMBURSEMENT_ACCOUNT_FORM>): FormInputErrors<typeof ONYXKEYS.FORMS.REIMBURSEMENT_ACCOUNT_FORM> => {
-    const errors = ValidationUtils.getFieldRequiredErrors(values, STEP_FIELDS);
-
-    if (values.ssnLast4 && !ValidationUtils.isValidSSNLastFour(values.ssnLast4)) {
-        errors.ssnLast4 = 'bankAccount.error.ssnLast4';
-    }
-
-    return errors;
-};
 function SocialSecurityNumber({reimbursementAccount, onNext, isEditing}: SocialSecurityNumberProps) {
     const {translate} = useLocalize();
     const styles = useThemeStyles();
 
     const defaultSsnLast4 = reimbursementAccount?.achData?.[PERSONAL_INFO_STEP_KEY.SSN_LAST_4] ?? '';
 
+    const validate = useCallback(
+        (values: FormOnyxValues<typeof ONYXKEYS.FORMS.REIMBURSEMENT_ACCOUNT_FORM>): FormInputErrors<typeof ONYXKEYS.FORMS.REIMBURSEMENT_ACCOUNT_FORM> => {
+            const errors = ValidationUtils.getFieldRequiredErrors(values, STEP_FIELDS);
+
+            if (values.ssnLast4 && !ValidationUtils.isValidSSNLastFour(values.ssnLast4)) {
+                errors.ssnLast4 = translate('bankAccount.error.ssnLast4');
+            }
+
+            return errors;
+        },
+        [translate],
+    );
+
     const handleSubmit = useReimbursementAccountStepFormSubmit({
         fieldIds: STEP_FIELDS,
         onNext,
@@ -56,7 +60,7 @@ function SocialSecurityNumber({reimbursementAccount, onNext, isEditing}: SocialS
             validate={validate}
             onSubmit={handleSubmit}
             style={[styles.mh5, styles.flexGrow1]}
-            submitButtonStyles={[styles.pb5, styles.mb0]}
+            submitButtonStyles={[styles.mb0]}
         >
             <View>
                 <Text style={[styles.textHeadlineLineHeightXXL, styles.mb3]}>{translate('personalInfoStep.enterTheLast4')}</Text>
diff --git a/src/pages/ReimbursementAccount/ReimbursementAccountPage.tsx b/src/pages/ReimbursementAccount/ReimbursementAccountPage.tsx
index 8c59e98f7218..4b42aff1fc1d 100644
--- a/src/pages/ReimbursementAccount/ReimbursementAccountPage.tsx
+++ b/src/pages/ReimbursementAccount/ReimbursementAccountPage.tsx
@@ -1,6 +1,6 @@
 import type {RouteProp} from '@react-navigation/native';
 import type {StackScreenProps} from '@react-navigation/stack';
-import Str from 'expensify-common/lib/str';
+import {Str} from 'expensify-common';
 import lodashPick from 'lodash/pick';
 import React, {useEffect, useRef, useState} from 'react';
 import {View} from 'react-native';
@@ -31,7 +31,7 @@ import ROUTES from '@src/ROUTES';
 import type SCREENS from '@src/SCREENS';
 import type {InputID} from '@src/types/form/ReimbursementAccountForm';
 import type * as OnyxTypes from '@src/types/onyx';
-import type {ACHData, BankAccountStep as TBankAccountStep} from '@src/types/onyx/ReimbursementAccount';
+import type {ACHDataReimbursementAccount, BankAccountStep as TBankAccountStep} from '@src/types/onyx/ReimbursementAccount';
 import {isEmptyObject} from '@src/types/utils/EmptyObject';
 import ACHContractStep from './ACHContractStep';
 import BankAccountStep from './BankAccountStep';
@@ -144,7 +144,7 @@ function ReimbursementAccountPage({
     */
     const achData = reimbursementAccount?.achData;
 
-    function getBankAccountFields<T extends InputID>(fieldNames: T[]): Pick<ACHData, T> {
+    function getBankAccountFields<T extends InputID>(fieldNames: T[]): Pick<ACHDataReimbursementAccount, T> {
         return {
             ...lodashPick(reimbursementAccount?.achData, ...fieldNames),
         };
@@ -199,19 +199,25 @@ function ReimbursementAccountPage({
     /**
         When this page is first opened, `reimbursementAccount` prop might not yet be fully loaded from Onyx.
         Calculating `shouldShowContinueSetupButton` immediately on initial render doesn't make sense as
-        it relies on complete data. Thus, we should wait to calculate it until we have received
+        it relies on incomplete data. Thus, we should wait to calculate it until we have received
         the full `reimbursementAccount` data from the server. This logic is handled within the useEffect hook,
         which acts similarly to `componentDidUpdate` when the `reimbursementAccount` dependency changes.
      */
     const [hasACHDataBeenLoaded, setHasACHDataBeenLoaded] = useState(reimbursementAccount !== CONST.REIMBURSEMENT_ACCOUNT.DEFAULT_DATA);
 
     const [shouldShowContinueSetupButton, setShouldShowContinueSetupButton] = useState(hasACHDataBeenLoaded ? getShouldShowContinueSetupButtonInitialValue() : false);
-    const [isReimbursementAccountLoading, setIsReimbursementAccountLoading] = useState(true);
+    const [isReimbursementAccountLoading, setIsReimbursementAccountLoading] = useState(() => {
+        // By default return true (loading), if there are already loaded data we can skip the loading state
+        if (hasACHDataBeenLoaded && typeof reimbursementAccount?.isLoading === 'boolean' && !reimbursementAccount?.isLoading) {
+            return false;
+        }
+        return true;
+    });
 
     // eslint-disable-next-line  @typescript-eslint/prefer-nullish-coalescing
     const currentStep = achData?.currentStep || CONST.BANK_ACCOUNT.STEP.BANK_ACCOUNT;
     const policyName = policy?.name ?? '';
-    const policyIDParam = route.params?.policyID ?? '';
+    const policyIDParam = route.params?.policyID ?? '-1';
     const styles = useThemeStyles();
     const {translate} = useLocalize();
     const {isOffline} = useNetwork();
@@ -238,6 +244,10 @@ function ReimbursementAccountPage({
     }
 
     useEffect(() => {
+        if (!isReimbursementAccountLoading) {
+            return;
+        }
+
         // If the step to open is empty, we want to clear the sub step, so the connect option view is shown to the user
         const isStepToOpenEmpty = getStepToOpenFromRouteParams(route) === '';
         if (isStepToOpenEmpty) {
@@ -245,7 +255,7 @@ function ReimbursementAccountPage({
             BankAccounts.setPlaidEvent(null);
         }
         fetchData(false, isStepToOpenEmpty);
-        // eslint-disable-next-line react-hooks/exhaustive-deps
+        // eslint-disable-next-line react-compiler/react-compiler, react-hooks/exhaustive-deps
     }, []); // The empty dependency array ensures this runs only once after the component mounts.
 
     useEffect(() => {
@@ -311,7 +321,7 @@ function ReimbursementAccountPage({
 
             Navigation.navigate(ROUTES.BANK_ACCOUNT_WITH_STEP_TO_OPEN.getRoute(getRouteForCurrentStep(currentStep), policyID, backTo));
         },
-        // eslint-disable-next-line react-hooks/exhaustive-deps
+        // eslint-disable-next-line react-compiler/react-compiler, react-hooks/exhaustive-deps
         [isOffline, reimbursementAccount, route, hasACHDataBeenLoaded, shouldShowContinueSetupButton],
     );
 
@@ -469,7 +479,7 @@ function ReimbursementAccountPage({
         return (
             <RequestorStep
                 ref={requestorStepRef}
-                shouldShowOnfido={Boolean(shouldShowOnfido)}
+                shouldShowOnfido={!!shouldShowOnfido}
                 onBackButtonPress={goBack}
             />
         );
diff --git a/src/pages/ReimbursementAccount/RequestorOnfidoStep.tsx b/src/pages/ReimbursementAccount/RequestorOnfidoStep.tsx
index da111380d751..26197abd5f6c 100644
--- a/src/pages/ReimbursementAccount/RequestorOnfidoStep.tsx
+++ b/src/pages/ReimbursementAccount/RequestorOnfidoStep.tsx
@@ -39,9 +39,9 @@ function RequestorOnfidoStep({onBackButtonPress, reimbursementAccount, onfidoTok
     const {translate} = useLocalize();
 
     const submitOnfidoData = (onfidoData: OnfidoData) => {
-        BankAccounts.verifyIdentityForBankAccount(reimbursementAccount.achData?.bankAccountID ?? 0, {
+        BankAccounts.verifyIdentityForBankAccount(reimbursementAccount.achData?.bankAccountID ?? -1, {
             ...onfidoData,
-            applicantID: onfidoApplicantID ?? '',
+            applicantID: onfidoApplicantID ?? '-1',
         });
         BankAccounts.updateReimbursementAccountDraft({isOnfidoSetupComplete: true});
     };
diff --git a/src/pages/ReimbursementAccount/VerifyIdentity/VerifyIdentity.tsx b/src/pages/ReimbursementAccount/VerifyIdentity/VerifyIdentity.tsx
index 77bc26609bcd..cabaf543a756 100644
--- a/src/pages/ReimbursementAccount/VerifyIdentity/VerifyIdentity.tsx
+++ b/src/pages/ReimbursementAccount/VerifyIdentity/VerifyIdentity.tsx
@@ -39,10 +39,10 @@ function VerifyIdentity({reimbursementAccount, onBackButtonPress, onfidoApplican
     const styles = useThemeStyles();
     const {translate} = useLocalize();
 
-    const policyID = reimbursementAccount?.achData?.policyID ?? '';
+    const policyID = reimbursementAccount?.achData?.policyID ?? '-1';
     const handleOnfidoSuccess = useCallback(
         (onfidoData: OnfidoData) => {
-            BankAccounts.verifyIdentityForBankAccount(Number(reimbursementAccount?.achData?.bankAccountID ?? '0'), {...onfidoData, applicantID: onfidoApplicantID}, policyID);
+            BankAccounts.verifyIdentityForBankAccount(Number(reimbursementAccount?.achData?.bankAccountID ?? '-1'), {...onfidoData, applicantID: onfidoApplicantID}, policyID);
             BankAccounts.updateReimbursementAccountDraft({isOnfidoSetupComplete: true});
         },
         [reimbursementAccount, onfidoApplicantID, policyID],
@@ -66,7 +66,7 @@ function VerifyIdentity({reimbursementAccount, onBackButtonPress, onfidoApplican
                 title={translate('onfidoStep.verifyIdentity')}
                 onBackButtonPress={onBackButtonPress}
             />
-            <View style={[styles.ph5, styles.mt3, {height: CONST.BANK_ACCOUNT.STEPS_HEADER_HEIGHT}]}>
+            <View style={[styles.ph5, styles.mb5, styles.mt3, {height: CONST.BANK_ACCOUNT.STEPS_HEADER_HEIGHT}]}>
                 <InteractiveStepSubHeader
                     startStepIndex={2}
                     stepNames={CONST.BANK_ACCOUNT.STEP_NAMES}
diff --git a/src/pages/ReimbursementAccount/utils/getInitialSubstepForBusinessInfo.ts b/src/pages/ReimbursementAccount/utils/getInitialSubstepForBusinessInfo.ts
index b7c2bedde10f..099eacaa690f 100644
--- a/src/pages/ReimbursementAccount/utils/getInitialSubstepForBusinessInfo.ts
+++ b/src/pages/ReimbursementAccount/utils/getInitialSubstepForBusinessInfo.ts
@@ -1,3 +1,4 @@
+import * as ValidationUtils from '@libs/ValidationUtils';
 import INPUT_IDS from '@src/types/form/ReimbursementAccountForm';
 import type {CompanyStepProps} from '@src/types/form/ReimbursementAccountForm';
 
@@ -15,7 +16,7 @@ function getInitialSubstepForBusinessInfo(data: CompanyStepProps): number {
         return 1;
     }
 
-    if (data[businessInfoStepKeys.COMPANY_WEBSITE] === '') {
+    if (!ValidationUtils.isValidWebsite(data[businessInfoStepKeys.COMPANY_WEBSITE])) {
         return 2;
     }
 
diff --git a/src/pages/ReimbursementAccount/utils/getSubstepValues.ts b/src/pages/ReimbursementAccount/utils/getSubstepValues.ts
index 8007218b41bb..f89625c613f7 100644
--- a/src/pages/ReimbursementAccount/utils/getSubstepValues.ts
+++ b/src/pages/ReimbursementAccount/utils/getSubstepValues.ts
@@ -3,18 +3,19 @@ import type {ReimbursementAccountForm} from '@src/types/form';
 import type {ReimbursementAccount} from '@src/types/onyx';
 import type {ACHData} from '@src/types/onyx/ReimbursementAccount';
 
-function getSubstepValues<T extends keyof ReimbursementAccountForm>(
-    inputKeys: Record<string, T>,
+type SubstepValues<TProps extends keyof ReimbursementAccountForm> = {
+    [TKey in TProps]: ReimbursementAccountForm[TKey];
+};
+
+function getSubstepValues<TProps extends keyof ReimbursementAccountForm>(
+    inputKeys: Record<string, TProps>,
     reimbursementAccountDraft: OnyxEntry<ReimbursementAccountForm>,
     reimbursementAccount: OnyxEntry<ReimbursementAccount>,
-): {[K in T]: ReimbursementAccountForm[K]} {
-    return Object.entries(inputKeys).reduce(
-        (acc, [, value]) => ({
-            ...acc,
-            [value]: reimbursementAccountDraft?.[value] ?? reimbursementAccount?.achData?.[value as keyof ACHData] ?? '',
-        }),
-        {} as {[K in T]: ReimbursementAccountForm[K]},
-    );
+): SubstepValues<TProps> {
+    return Object.entries(inputKeys).reduce((acc, [, value]) => {
+        acc[value] = (reimbursementAccountDraft?.[value] ?? reimbursementAccount?.achData?.[value as keyof ACHData] ?? '') as ReimbursementAccountForm[TProps];
+        return acc;
+    }, {} as SubstepValues<TProps>);
 }
 
 export default getSubstepValues;
diff --git a/src/pages/ReimbursementAccount/utils/getValuesForBeneficialOwner.ts b/src/pages/ReimbursementAccount/utils/getValuesForBeneficialOwner.ts
index 3733a6727c54..b564b8f325ee 100644
--- a/src/pages/ReimbursementAccount/utils/getValuesForBeneficialOwner.ts
+++ b/src/pages/ReimbursementAccount/utils/getValuesForBeneficialOwner.ts
@@ -1,3 +1,4 @@
+import type {OnyxEntry} from 'react-native-onyx';
 import CONST from '@src/CONST';
 import type {ReimbursementAccountForm} from '@src/types/form';
 
@@ -12,7 +13,7 @@ type BeneficialOwnerValues = {
     zipCode: string;
 };
 
-function getValuesForBeneficialOwner(beneficialOwnerBeingModifiedID: string, reimbursementAccountDraft: ReimbursementAccountForm | null): BeneficialOwnerValues {
+function getValuesForBeneficialOwner(beneficialOwnerBeingModifiedID: string, reimbursementAccountDraft: OnyxEntry<ReimbursementAccountForm>): BeneficialOwnerValues {
     if (!reimbursementAccountDraft) {
         return {
             firstName: '',
diff --git a/src/pages/ReportAvatar.tsx b/src/pages/ReportAvatar.tsx
index 121b238012bf..eeb6829e7fc0 100644
--- a/src/pages/ReportAvatar.tsx
+++ b/src/pages/ReportAvatar.tsx
@@ -20,8 +20,9 @@ type ReportAvatarOnyxProps = {
 
 type ReportAvatarProps = ReportAvatarOnyxProps & StackScreenProps<AuthScreensParamList, typeof SCREENS.REPORT_AVATAR>;
 
-function ReportAvatar({report = {} as Report, policies, isLoadingApp = true}: ReportAvatarProps) {
-    const policy = policies?.[`${ONYXKEYS.COLLECTION.POLICY}${report?.policyID ?? '0'}`];
+function ReportAvatar({report = {} as Report, route, policies, isLoadingApp = true}: ReportAvatarProps) {
+    const policyID = route.params.policyID ?? '-1';
+    const policy = policies?.[`${ONYXKEYS.COLLECTION.POLICY}${policyID}`];
     const policyName = ReportUtils.getPolicyName(report, false, policy);
     const avatarURL = ReportUtils.getWorkspaceAvatar(report);
 
@@ -31,11 +32,12 @@ function ReportAvatar({report = {} as Report, policies, isLoadingApp = true}: Re
             defaultOpen
             source={UserUtils.getFullSizeAvatar(avatarURL, 0)}
             onModalClose={() => {
-                Navigation.goBack(ROUTES.REPORT_WITH_ID_DETAILS.getRoute(report?.reportID ?? ''));
+                Navigation.goBack(ROUTES.REPORT_WITH_ID_DETAILS.getRoute(report?.reportID ?? '-1'));
             }}
             isWorkspaceAvatar
             maybeIcon
-            originalFileName={policy?.originalFileName ?? policyName}
+            // In the case of default workspace avatar, originalFileName prop takes policyID as value to get the color of the avatar
+            originalFileName={policy?.originalFileName ?? policy?.id ?? report?.policyID}
             shouldShowNotFoundPage={!report?.reportID && !isLoadingApp}
             isLoading={(!report?.reportID || !policy?.id) && !!isLoadingApp}
         />
@@ -46,7 +48,7 @@ ReportAvatar.displayName = 'ReportAvatar';
 
 export default withOnyx<ReportAvatarProps, ReportAvatarOnyxProps>({
     report: {
-        key: ({route}) => `${ONYXKEYS.COLLECTION.REPORT}${route.params.reportID ?? ''}`,
+        key: ({route}) => `${ONYXKEYS.COLLECTION.REPORT}${route.params.reportID ?? '-1'}`,
     },
     isLoadingApp: {
         key: ONYXKEYS.IS_LOADING_APP,
diff --git a/src/pages/ReportDetailsPage.tsx b/src/pages/ReportDetailsPage.tsx
index 4fb85123df8a..de93ed7a3ced 100644
--- a/src/pages/ReportDetailsPage.tsx
+++ b/src/pages/ReportDetailsPage.tsx
@@ -1,13 +1,12 @@
-import {useRoute} from '@react-navigation/native';
 import type {StackScreenProps} from '@react-navigation/stack';
-import React, {useCallback, useEffect, useMemo, useState} from 'react';
+import {Str} from 'expensify-common';
+import React, {useCallback, useEffect, useMemo, useRef, useState} from 'react';
 import {View} from 'react-native';
-import type {OnyxCollection, OnyxEntry} from 'react-native-onyx';
-import {withOnyx} from 'react-native-onyx';
+import type {OnyxEntry} from 'react-native-onyx';
+import {useOnyx, withOnyx} from 'react-native-onyx';
 import type {ValueOf} from 'type-fest';
 import AvatarWithImagePicker from '@components/AvatarWithImagePicker';
 import FullPageNotFoundView from '@components/BlockingViews/FullPageNotFoundView';
-import ChatDetailsQuickActionsBar from '@components/ChatDetailsQuickActionsBar';
 import DisplayNames from '@components/DisplayNames';
 import HeaderWithBackButton from '@components/HeaderWithBackButton';
 import * as Expensicons from '@components/Icon/Expensicons';
@@ -17,22 +16,32 @@ import MultipleAvatars from '@components/MultipleAvatars';
 import OfflineWithFeedback from '@components/OfflineWithFeedback';
 import ParentNavigationSubtitle from '@components/ParentNavigationSubtitle';
 import PressableWithoutFeedback from '@components/Pressable/PressableWithoutFeedback';
+import type {PromotedAction} from '@components/PromotedActionsBar';
+import PromotedActionsBar, {PromotedActions} from '@components/PromotedActionsBar';
 import RoomHeaderAvatars from '@components/RoomHeaderAvatars';
 import ScreenWrapper from '@components/ScreenWrapper';
 import ScrollView from '@components/ScrollView';
+import Text from '@components/Text';
 import useLocalize from '@hooks/useLocalize';
 import useNetwork from '@hooks/useNetwork';
+import usePaginatedReportActions from '@hooks/usePaginatedReportActions';
 import useThemeStyles from '@hooks/useThemeStyles';
 import Navigation from '@libs/Navigation/Navigation';
 import type {ReportDetailsNavigatorParamList} from '@libs/Navigation/types';
 import * as OptionsListUtils from '@libs/OptionsListUtils';
 import * as PolicyUtils from '@libs/PolicyUtils';
+import * as ReportActionsUtils from '@libs/ReportActionsUtils';
 import * as ReportUtils from '@libs/ReportUtils';
+import StringUtils from '@libs/StringUtils';
+import * as IOU from '@userActions/IOU';
 import * as Report from '@userActions/Report';
+import * as Session from '@userActions/Session';
+import * as Task from '@userActions/Task';
 import ConfirmModal from '@src/components/ConfirmModal';
 import CONST from '@src/CONST';
 import type {TranslationPaths} from '@src/languages/types';
 import ONYXKEYS from '@src/ONYXKEYS';
+import type {Route} from '@src/ROUTES';
 import ROUTES from '@src/ROUTES';
 import type SCREENS from '@src/SCREENS';
 import type * as OnyxTypes from '@src/types/onyx';
@@ -55,60 +64,152 @@ type ReportDetailsPageMenuItem = {
 
 type ReportDetailsPageOnyxProps = {
     /** Personal details of all the users */
-    personalDetails: OnyxCollection<OnyxTypes.PersonalDetails>;
+    personalDetails: OnyxEntry<OnyxTypes.PersonalDetailsList>;
 
     /** Session info for the currently logged in user. */
     session: OnyxEntry<OnyxTypes.Session>;
 };
 type ReportDetailsPageProps = ReportDetailsPageOnyxProps & WithReportOrNotFoundProps & StackScreenProps<ReportDetailsNavigatorParamList, typeof SCREENS.REPORT_DETAILS.ROOT>;
 
+const CASES = {
+    DEFAULT: 'default',
+    MONEY_REQUEST: 'money_request',
+    MONEY_REPORT: 'money_report',
+};
+
+type CaseID = ValueOf<typeof CASES>;
+
 function ReportDetailsPage({policies, report, session, personalDetails}: ReportDetailsPageProps) {
     const {translate} = useLocalize();
     const {isOffline} = useNetwork();
     const styles = useThemeStyles();
-    const route = useRoute();
+
+    // The app would crash due to subscribing to the entire report collection if parentReportID is an empty string. So we should have a fallback ID here.
+    /* eslint-disable @typescript-eslint/prefer-nullish-coalescing */
+    const [parentReport] = useOnyx(`${ONYXKEYS.COLLECTION.REPORT}${report.parentReportID || '-1'}`);
+    const [reportNameValuePairs] = useOnyx(`${ONYXKEYS.COLLECTION.REPORT_NAME_VALUE_PAIRS}${report?.reportID || '-1'}`);
+    const [parentReportNameValuePairs] = useOnyx(`${ONYXKEYS.COLLECTION.REPORT_NAME_VALUE_PAIRS}${report?.parentReportID || '-1'}`);
+    const {reportActions} = usePaginatedReportActions(report.reportID || '-1');
+    /* eslint-enable @typescript-eslint/prefer-nullish-coalescing */
+
+    const transactionThreadReportID = useMemo(
+        () => ReportActionsUtils.getOneTransactionThreadReportID(report.reportID, reportActions ?? [], isOffline),
+        [report.reportID, reportActions, isOffline],
+    );
+
+    const [transactionThreadReport] = useOnyx(`${ONYXKEYS.COLLECTION.REPORT}${transactionThreadReportID}`);
+
     const [isLastMemberLeavingGroupModalVisible, setIsLastMemberLeavingGroupModalVisible] = useState(false);
-    const policy = useMemo(() => policies?.[`${ONYXKEYS.COLLECTION.POLICY}${report?.policyID ?? ''}`], [policies, report?.policyID]);
-    const isPolicyAdmin = useMemo(() => PolicyUtils.isPolicyAdmin(policy ?? null), [policy]);
-    const isPolicyEmployee = useMemo(() => PolicyUtils.isPolicyEmployee(report?.policyID ?? '', policies), [report?.policyID, policies]);
+    const [isDeleteModalVisible, setIsDeleteModalVisible] = useState(false);
+    const [isUnapproveModalVisible, setIsUnapproveModalVisible] = useState(false);
+    const [isConfirmModalVisible, setIsConfirmModalVisible] = useState(false);
+    const policy = useMemo(() => policies?.[`${ONYXKEYS.COLLECTION.POLICY}${report?.policyID ?? '-1'}`], [policies, report?.policyID]);
+    const isPolicyAdmin = useMemo(() => PolicyUtils.isPolicyAdmin(policy), [policy]);
+    const isPolicyEmployee = useMemo(() => PolicyUtils.isPolicyEmployee(report?.policyID ?? '-1', policies), [report?.policyID, policies]);
+    const isPolicyExpenseChat = useMemo(() => ReportUtils.isPolicyExpenseChat(report), [report]);
     const shouldUseFullTitle = useMemo(() => ReportUtils.shouldUseFullTitleToDisplay(report), [report]);
-    const isPolicyExpenseChat = ReportUtils.isPolicyExpenseChat(report);
     const isChatRoom = useMemo(() => ReportUtils.isChatRoom(report), [report]);
     const isUserCreatedPolicyRoom = useMemo(() => ReportUtils.isUserCreatedPolicyRoom(report), [report]);
     const isDefaultRoom = useMemo(() => ReportUtils.isDefaultRoom(report), [report]);
     const isChatThread = useMemo(() => ReportUtils.isChatThread(report), [report]);
-    const isArchivedRoom = useMemo(() => ReportUtils.isArchivedRoom(report), [report]);
+    const isArchivedRoom = useMemo(() => ReportUtils.isArchivedRoom(report, reportNameValuePairs), [report, reportNameValuePairs]);
     const isMoneyRequestReport = useMemo(() => ReportUtils.isMoneyRequestReport(report), [report]);
+    const isMoneyRequest = useMemo(() => ReportUtils.isMoneyRequest(report), [report]);
     const isInvoiceReport = useMemo(() => ReportUtils.isInvoiceReport(report), [report]);
+    const isInvoiceRoom = useMemo(() => ReportUtils.isInvoiceRoom(report), [report]);
+    const isTaskReport = useMemo(() => ReportUtils.isTaskReport(report), [report]);
+    const isSelfDM = useMemo(() => ReportUtils.isSelfDM(report), [report]);
+    const isTrackExpenseReport = ReportUtils.isTrackExpenseReport(report);
+    const parentReportAction = ReportActionsUtils.getReportAction(report?.parentReportID ?? '', report?.parentReportActionID ?? '');
+    const isCanceledTaskReport = ReportUtils.isCanceledTaskReport(report, parentReportAction);
     const canEditReportDescription = useMemo(() => ReportUtils.canEditReportDescription(report, policy), [report, policy]);
     const shouldShowReportDescription = isChatRoom && (canEditReportDescription || report.description !== '');
-    const canLeaveRoom = ReportUtils.canLeaveRoom(report, isPolicyEmployee);
-    const canLeavePolicyExpenseChat = ReportUtils.canLeavePolicyExpenseChat(report, policy ?? {});
-
-    // eslint-disable-next-line react-hooks/exhaustive-deps -- policy is a dependency because `getChatRoomSubtitle` calls `getPolicyName` which in turn retrieves the value from the `policy` value stored in Onyx
-    const chatRoomSubtitle = useMemo(() => ReportUtils.getChatRoomSubtitle(report), [report, policy]);
+    const isExpenseReport = isMoneyRequestReport || isInvoiceReport || isMoneyRequest;
+    const isSingleTransactionView = isMoneyRequest || isTrackExpenseReport;
+    const isSelfDMTrackExpenseReport = isTrackExpenseReport && ReportUtils.isSelfDM(parentReport);
+    const shouldDisableRename = useMemo(() => ReportUtils.shouldDisableRename(report), [report]);
     const parentNavigationSubtitleData = ReportUtils.getParentNavigationSubtitle(report);
+    // eslint-disable-next-line react-compiler/react-compiler, react-hooks/exhaustive-deps -- policy is a dependency because `getChatRoomSubtitle` calls `getPolicyName` which in turn retrieves the value from the `policy` value stored in Onyx
+    const chatRoomSubtitle = useMemo(() => ReportUtils.getChatRoomSubtitle(report), [report, policy]);
+    const isSystemChat = useMemo(() => ReportUtils.isSystemChat(report), [report]);
     const isGroupChat = useMemo(() => ReportUtils.isGroupChat(report), [report]);
+    const isRootGroupChat = useMemo(() => ReportUtils.isRootGroupChat(report), [report]);
     const isThread = useMemo(() => ReportUtils.isThread(report), [report]);
+    const shouldOpenRoomMembersPage = isUserCreatedPolicyRoom || isChatThread || (isPolicyExpenseChat && isPolicyAdmin);
     const participants = useMemo(() => {
-        if (isGroupChat) {
-            return ReportUtils.getParticipantAccountIDs(report.reportID ?? '');
-        }
-
-        return ReportUtils.getVisibleChatMemberAccountIDs(report.reportID ?? '');
-    }, [report, isGroupChat]);
+        return ReportUtils.getParticipantsList(report, personalDetails, shouldOpenRoomMembersPage);
+    }, [report, personalDetails, shouldOpenRoomMembersPage]);
+    const connectedIntegration = PolicyUtils.getConnectedIntegration(policy);
 
     // Get the active chat members by filtering out the pending members with delete action
     const activeChatMembers = participants.flatMap((accountID) => {
         const pendingMember = report?.pendingChatMembers?.findLast((member) => member.accountID === accountID.toString());
+        const detail = personalDetails?.[accountID];
+        if (!detail) {
+            return [];
+        }
         return !pendingMember || pendingMember.pendingAction !== CONST.RED_BRICK_ROAD_PENDING_ACTION.DELETE ? accountID : [];
     });
 
+    const caseID = useMemo((): CaseID => {
+        // 3. MoneyReportHeader
+        if (isMoneyRequestReport || isInvoiceReport) {
+            return CASES.MONEY_REPORT;
+        }
+        // 2. MoneyRequestHeader
+        if (isSingleTransactionView) {
+            return CASES.MONEY_REQUEST;
+        }
+        // 1. HeaderView
+        return CASES.DEFAULT;
+    }, [isInvoiceReport, isMoneyRequestReport, isSingleTransactionView]);
     const isPrivateNotesFetchTriggered = report?.isLoadingPrivateNotes !== undefined;
 
-    const isSelfDM = useMemo(() => ReportUtils.isSelfDM(report), [report]);
-    const canLeave =
-        !isSelfDM && (isChatThread || isUserCreatedPolicyRoom || canLeaveRoom || canLeavePolicyExpenseChat) && report.notificationPreference !== CONST.REPORT.NOTIFICATION_PREFERENCE.HIDDEN;
+    const requestParentReportAction = useMemo(() => {
+        // 2. MoneyReport case
+        if (caseID === CASES.MONEY_REPORT) {
+            if (!reportActions || !transactionThreadReport?.parentReportActionID) {
+                return undefined;
+            }
+            return reportActions.find((action) => action.reportActionID === transactionThreadReport.parentReportActionID);
+        }
+        return parentReportAction;
+    }, [caseID, parentReportAction, reportActions, transactionThreadReport?.parentReportActionID]);
+
+    const isActionOwner =
+        typeof requestParentReportAction?.actorAccountID === 'number' && typeof session?.accountID === 'number' && requestParentReportAction.actorAccountID === session?.accountID;
+    const isDeletedParentAction = ReportActionsUtils.isDeletedAction(requestParentReportAction);
+
+    const moneyRequestReport: OnyxEntry<OnyxTypes.Report> = useMemo(() => {
+        if (caseID === CASES.MONEY_REQUEST) {
+            return parentReport;
+        }
+        return report;
+    }, [caseID, parentReport, report]);
+
+    const moneyRequestAction = transactionThreadReportID ? requestParentReportAction : parentReportAction;
+
+    const canModifyTask = Task.canModifyTask(report, session?.accountID ?? -1);
+    const shouldShowTaskDeleteButton =
+        isTaskReport &&
+        !isCanceledTaskReport &&
+        ReportUtils.canWriteInReport(report) &&
+        report.stateNum !== CONST.REPORT.STATE_NUM.APPROVED &&
+        !ReportUtils.isClosedReport(report) &&
+        canModifyTask;
+    const canDeleteRequest = isActionOwner && (ReportUtils.canDeleteTransaction(moneyRequestReport) || isSelfDMTrackExpenseReport) && !isDeletedParentAction;
+    const shouldShowDeleteButton = shouldShowTaskDeleteButton || canDeleteRequest;
+
+    const canUnapproveRequest =
+        ReportUtils.isExpenseReport(report) && (ReportUtils.isReportManager(report) || isPolicyAdmin) && ReportUtils.isReportApproved(report) && !PolicyUtils.isSubmitAndClose(policy);
+
+    useEffect(() => {
+        if (canDeleteRequest) {
+            return;
+        }
+
+        setIsDeleteModalVisible(false);
+    }, [canDeleteRequest]);
 
     useEffect(() => {
         // Do not fetch private notes if isLoadingPrivateNotes is already defined, or if the network is offline, or if the report is a self DM.
@@ -116,17 +217,69 @@ function ReportDetailsPage({policies, report, session, personalDetails}: ReportD
             return;
         }
 
-        Report.getReportPrivateNote(report?.reportID ?? '');
+        Report.getReportPrivateNote(report?.reportID ?? '-1');
     }, [report?.reportID, isOffline, isPrivateNotesFetchTriggered, isSelfDM]);
 
     const leaveChat = useCallback(() => {
-        if (isChatRoom) {
+        Navigation.dismissModal();
+        Navigation.isNavigationReady().then(() => {
+            if (isRootGroupChat) {
+                Report.leaveGroupChat(report.reportID);
+                return;
+            }
             const isWorkspaceMemberLeavingWorkspaceRoom = (report.visibility === CONST.REPORT.VISIBILITY.RESTRICTED || isPolicyExpenseChat) && isPolicyEmployee;
             Report.leaveRoom(report.reportID, isWorkspaceMemberLeavingWorkspaceRoom);
+        });
+    }, [isPolicyEmployee, isPolicyExpenseChat, isRootGroupChat, report.reportID, report.visibility]);
+
+    const [moneyRequestReportActions] = useOnyx(`${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${moneyRequestReport?.reportID}`);
+    const isMoneyRequestExported = ReportUtils.isExported(moneyRequestReportActions);
+
+    const unapproveExpenseReportOrShowModal = useCallback(() => {
+        if (isMoneyRequestExported) {
+            setIsUnapproveModalVisible(true);
+            return;
+        }
+        Navigation.dismissModal();
+        IOU.unapproveExpenseReport(moneyRequestReport);
+    }, [isMoneyRequestExported, moneyRequestReport]);
+
+    const shouldShowLeaveButton = ReportUtils.canLeaveChat(report, policy);
+
+    const reportName = ReportUtils.isDeprecatedGroupDM(report) || isGroupChat ? ReportUtils.getGroupChatName(undefined, false, report) : ReportUtils.getReportName(report);
+
+    const additionalRoomDetails =
+        (isPolicyExpenseChat && !!report?.isOwnPolicyExpenseChat) || ReportUtils.isExpenseReport(report) || isPolicyExpenseChat || isInvoiceRoom
+            ? chatRoomSubtitle
+            : `${translate('threads.in')} ${chatRoomSubtitle}`;
+
+    let roomDescription;
+    if (caseID === CASES.MONEY_REQUEST) {
+        roomDescription = translate('common.name');
+    } else if (isGroupChat) {
+        roomDescription = translate('groupConfirmPage.groupName');
+    } else {
+        roomDescription = translate('newRoomPage.roomName');
+    }
+
+    const shouldShowNotificationPref = !isMoneyRequestReport && report?.notificationPreference !== CONST.REPORT.NOTIFICATION_PREFERENCE.HIDDEN;
+    const shouldShowWriteCapability = !isMoneyRequestReport;
+    const shouldShowMenuItem = shouldShowNotificationPref || shouldShowWriteCapability || (!!report?.visibility && report.chatType !== CONST.REPORT.CHAT_TYPE.INVOICE);
+
+    const isPayer = ReportUtils.isPayer(session, moneyRequestReport);
+    const isSettled = ReportUtils.isSettled(moneyRequestReport?.reportID ?? '-1');
+
+    const shouldShowCancelPaymentButton = caseID === CASES.MONEY_REPORT && isPayer && isSettled && ReportUtils.isExpenseReport(moneyRequestReport);
+    const [chatReport] = useOnyx(`${ONYXKEYS.COLLECTION.REPORT}${moneyRequestReport?.chatReportID ?? '-1'}`);
+
+    const cancelPayment = useCallback(() => {
+        if (!chatReport) {
             return;
         }
-        Report.leaveGroupChat(report.reportID);
-    }, [isChatRoom, isPolicyEmployee, isPolicyExpenseChat, report.reportID, report.visibility]);
+
+        IOU.cancelPayment(moneyRequestReport, chatReport);
+        setIsConfirmModalVisible(false);
+    }, [moneyRequestReport, chatReport]);
 
     const menuItems: ReportDetailsPageMenuItem[] = useMemo(() => {
         const items: ReportDetailsPageMenuItem[] = [];
@@ -148,7 +301,8 @@ function ReportDetailsPage({policies, report, session, personalDetails}: ReportD
                 (isDefaultRoom && isChatThread && isPolicyEmployee) ||
                 (!isUserCreatedPolicyRoom && participants.length) ||
                 (isUserCreatedPolicyRoom && (isPolicyEmployee || (isChatThread && !ReportUtils.isPublicRoom(report))))) &&
-            !ReportUtils.isConciergeChatReport(report)
+            !ReportUtils.isConciergeChatReport(report) &&
+            !isSystemChat
         ) {
             items.push({
                 key: CONST.REPORT_DETAILS_MENU_ITEM.MEMBERS,
@@ -156,60 +310,88 @@ function ReportDetailsPage({policies, report, session, personalDetails}: ReportD
                 icon: Expensicons.Users,
                 subtitle: activeChatMembers.length,
                 isAnonymousAction: false,
+                shouldShowRightIcon: true,
                 action: () => {
-                    if (isUserCreatedPolicyRoom || isChatThread) {
-                        Navigation.navigate(ROUTES.ROOM_MEMBERS.getRoute(report?.reportID ?? ''));
+                    if (shouldOpenRoomMembersPage) {
+                        Navigation.navigate(ROUTES.ROOM_MEMBERS.getRoute(report?.reportID ?? '-1'));
                     } else {
-                        Navigation.navigate(ROUTES.REPORT_PARTICIPANTS.getRoute(report?.reportID ?? ''));
+                        Navigation.navigate(ROUTES.REPORT_PARTICIPANTS.getRoute(report?.reportID ?? '-1'));
                     }
                 },
             });
-        } else if (
-            (isUserCreatedPolicyRoom && (!participants.length || !isPolicyEmployee)) ||
-            ((isDefaultRoom || ReportUtils.isPolicyExpenseChat(report)) && isChatThread && !isPolicyEmployee)
-        ) {
+        } else if ((isUserCreatedPolicyRoom && (!participants.length || !isPolicyEmployee)) || ((isDefaultRoom || isPolicyExpenseChat) && isChatThread && !isPolicyEmployee)) {
             items.push({
                 key: CONST.REPORT_DETAILS_MENU_ITEM.INVITE,
                 translationKey: 'common.invite',
                 icon: Expensicons.Users,
                 isAnonymousAction: false,
+                shouldShowRightIcon: true,
                 action: () => {
-                    Navigation.navigate(ROUTES.ROOM_INVITE.getRoute(report?.reportID ?? ''));
+                    Navigation.navigate(ROUTES.ROOM_INVITE.getRoute(report?.reportID ?? '-1'));
                 },
             });
         }
 
-        items.push({
-            key: CONST.REPORT_DETAILS_MENU_ITEM.SETTINGS,
-            translationKey: 'common.settings',
-            icon: Expensicons.Gear,
-            isAnonymousAction: false,
-            action: () => {
-                Navigation.navigate(ROUTES.REPORT_SETTINGS.getRoute(report?.reportID ?? ''));
-            },
-        });
+        if (shouldShowMenuItem) {
+            items.push({
+                key: CONST.REPORT_DETAILS_MENU_ITEM.SETTINGS,
+                translationKey: 'common.settings',
+                icon: Expensicons.Gear,
+                isAnonymousAction: false,
+                shouldShowRightIcon: true,
+                action: () => {
+                    Navigation.navigate(ROUTES.REPORT_SETTINGS.getRoute(report?.reportID ?? '-1'));
+                },
+            });
+        }
 
         // Prevent displaying private notes option for threads and task reports
-        if (!isChatThread && !isMoneyRequestReport && !isInvoiceReport && !ReportUtils.isTaskReport(report)) {
+        if (!isChatThread && !isMoneyRequestReport && !isInvoiceReport && !isTaskReport) {
             items.push({
                 key: CONST.REPORT_DETAILS_MENU_ITEM.PRIVATE_NOTES,
                 translationKey: 'privateNotes.title',
                 icon: Expensicons.Pencil,
                 isAnonymousAction: false,
+                shouldShowRightIcon: true,
                 action: () => ReportUtils.navigateToPrivateNotes(report, session),
                 brickRoadIndicator: Report.hasErrorInPrivateNotes(report) ? CONST.BRICK_ROAD_INDICATOR_STATUS.ERROR : undefined,
             });
         }
 
-        if (isGroupChat || (isChatRoom && canLeave)) {
+        // Show actions related to Task Reports
+        if (isTaskReport && !isCanceledTaskReport) {
+            if (ReportUtils.isCompletedTaskReport(report) && canModifyTask) {
+                items.push({
+                    key: CONST.REPORT_DETAILS_MENU_ITEM.MARK_AS_INCOMPLETE,
+                    icon: Expensicons.Checkmark,
+                    translationKey: 'task.markAsIncomplete',
+                    isAnonymousAction: false,
+                    action: Session.checkIfActionIsAllowed(() => {
+                        Navigation.dismissModal();
+                        Task.reopenTask(report);
+                    }),
+                });
+            }
+        }
+
+        if (shouldShowCancelPaymentButton) {
+            items.push({
+                key: CONST.REPORT_DETAILS_MENU_ITEM.CANCEL_PAYMENT,
+                icon: Expensicons.Trashcan,
+                translationKey: 'iou.cancelPayment',
+                isAnonymousAction: false,
+                action: () => setIsConfirmModalVisible(true),
+            });
+        }
+
+        if (shouldShowLeaveButton) {
             items.push({
                 key: CONST.REPORT_DETAILS_MENU_ITEM.LEAVE_ROOM,
                 translationKey: 'common.leave',
                 icon: Expensicons.Exit,
                 isAnonymousAction: true,
-                shouldShowRightIcon: false,
                 action: () => {
-                    if (Object.keys(report?.participants ?? {}).length === 1 && isGroupChat) {
+                    if (ReportUtils.getParticipantsAccountIDsForDisplay(report, false, true).length === 1 && isRootGroupChat) {
                         setIsLastMemberLeavingGroupModalVisible(true);
                         return;
                     }
@@ -219,24 +401,60 @@ function ReportDetailsPage({policies, report, session, personalDetails}: ReportD
             });
         }
 
+        if (policy && connectedIntegration && isPolicyAdmin && !isSingleTransactionView && isExpenseReport) {
+            items.push({
+                key: CONST.REPORT_DETAILS_MENU_ITEM.EXPORT,
+                translationKey: 'common.export',
+                icon: Expensicons.Upload,
+                isAnonymousAction: false,
+                action: () => {
+                    Navigation.navigate(ROUTES.REPORT_WITH_ID_DETAILS_EXPORT.getRoute(report?.reportID ?? '', connectedIntegration));
+                },
+            });
+        }
+
+        if (canUnapproveRequest) {
+            items.push({
+                key: CONST.REPORT_DETAILS_MENU_ITEM.UNAPPROVE,
+                icon: Expensicons.CircularArrowBackwards,
+                translationKey: 'iou.unapprove',
+                isAnonymousAction: false,
+                action: () => unapproveExpenseReportOrShowModal(),
+            });
+        }
         return items;
     }, [
         isSelfDM,
         isArchivedRoom,
         isGroupChat,
+        isRootGroupChat,
         isDefaultRoom,
         isChatThread,
         isPolicyEmployee,
         isUserCreatedPolicyRoom,
         participants.length,
         report,
+        isSystemChat,
+        isPolicyExpenseChat,
         isMoneyRequestReport,
-        isChatRoom,
-        canLeave,
+        isInvoiceReport,
+        policy,
+        connectedIntegration,
+        isPolicyAdmin,
+        isSingleTransactionView,
+        canModifyTask,
+        shouldShowMenuItem,
+        isTaskReport,
+        isCanceledTaskReport,
+        shouldShowLeaveButton,
         activeChatMembers.length,
+        shouldOpenRoomMembersPage,
+        shouldShowCancelPaymentButton,
         session,
         leaveChat,
-        isInvoiceReport,
+        canUnapproveRequest,
+        unapproveExpenseReportOrShowModal,
+        isExpenseReport,
     ]);
 
     const displayNamesWithTooltips = useMemo(() => {
@@ -256,127 +474,290 @@ function ReportDetailsPage({policies, report, session, personalDetails}: ReportD
         />
     ) : null;
 
-    const renderAvatar =
-        isGroupChat && !isThread ? (
-            <AvatarWithImagePicker
-                source={icons[0].source}
-                isUsingDefaultAvatar={!report.avatarUrl}
-                size={CONST.AVATAR_SIZE.XLARGE}
-                avatarStyle={styles.avatarXLarge}
-                shouldDisableViewPhoto
-                onImageRemoved={() => {
-                    // Calling this without a file will remove the avatar
-                    Report.updateGroupChatAvatar(report.reportID ?? '');
-                }}
-                onImageSelected={(file) => Report.updateGroupChatAvatar(report.reportID ?? '', file)}
-                editIcon={Expensicons.Camera}
-                editIconStyle={styles.smallEditIconAccount}
-                pendingAction={report.pendingFields?.avatar ?? undefined}
-                errors={report.errorFields?.avatar ?? null}
-                errorRowStyles={styles.mt6}
-                onErrorClose={() => Report.clearAvatarErrors(report.reportID ?? '')}
-            />
-        ) : (
-            <RoomHeaderAvatars
-                icons={icons}
-                reportID={report?.reportID}
-            />
+    const connectedIntegrationName = connectedIntegration ? translate('workspace.accounting.connectionName', connectedIntegration) : '';
+    const unapproveWarningText = (
+        <Text>
+            <Text style={[styles.textStrong, styles.noWrap]}>{translate('iou.headsUp')}</Text> <Text>{translate('iou.unapproveWithIntegrationWarning', connectedIntegrationName)}</Text>
+        </Text>
+    );
+
+    const renderedAvatar = useMemo(() => {
+        if (isMoneyRequestReport || isInvoiceReport) {
+            return (
+                <View style={styles.mb3}>
+                    <MultipleAvatars
+                        icons={icons}
+                        size={CONST.AVATAR_SIZE.LARGE}
+                    />
+                </View>
+            );
+        }
+        if (isGroupChat && !isThread) {
+            return (
+                <AvatarWithImagePicker
+                    source={icons[0].source}
+                    avatarID={icons[0].id}
+                    isUsingDefaultAvatar={!report.avatarUrl}
+                    size={CONST.AVATAR_SIZE.XLARGE}
+                    avatarStyle={styles.avatarXLarge}
+                    shouldDisableViewPhoto
+                    onImageRemoved={() => {
+                        // Calling this without a file will remove the avatar
+                        Report.updateGroupChatAvatar(report.reportID ?? '');
+                    }}
+                    onImageSelected={(file) => Report.updateGroupChatAvatar(report.reportID ?? '-1', file)}
+                    editIcon={Expensicons.Camera}
+                    editIconStyle={styles.smallEditIconAccount}
+                    pendingAction={report.pendingFields?.avatar ?? undefined}
+                    errors={report.errorFields?.avatar ?? null}
+                    errorRowStyles={styles.mt6}
+                    onErrorClose={() => Report.clearAvatarErrors(report.reportID ?? '-1')}
+                    shouldUseStyleUtilityForAnchorPosition
+                    style={[styles.w100, styles.mb3]}
+                />
+            );
+        }
+        return (
+            <View style={styles.mb3}>
+                <RoomHeaderAvatars
+                    icons={icons}
+                    reportID={report?.reportID}
+                />
+            </View>
         );
+    }, [report, icons, isMoneyRequestReport, isInvoiceReport, isGroupChat, isThread, styles]);
+
+    const iouTransactionID = ReportActionsUtils.isMoneyRequestAction(requestParentReportAction)
+        ? ReportActionsUtils.getOriginalMessage(requestParentReportAction)?.IOUTransactionID ?? ''
+        : '';
+
+    const canHoldUnholdReportAction = ReportUtils.canHoldUnholdReportAction(moneyRequestAction);
+    const shouldShowHoldAction =
+        caseID !== CASES.DEFAULT &&
+        (canHoldUnholdReportAction.canHoldRequest || canHoldUnholdReportAction.canUnholdRequest) &&
+        !ReportUtils.isArchivedRoom(transactionThreadReportID ? report : parentReport, parentReportNameValuePairs);
+
+    const canJoin = ReportUtils.canJoinChat(report, parentReportAction, policy);
+
+    const promotedActions = useMemo(() => {
+        const result: PromotedAction[] = [];
+
+        if (canJoin) {
+            result.push(PromotedActions.join(report));
+        }
+
+        if (isExpenseReport && shouldShowHoldAction) {
+            result.push(
+                PromotedActions.hold({
+                    isTextHold: canHoldUnholdReportAction.canHoldRequest,
+                    reportAction: moneyRequestAction,
+                    reportID: transactionThreadReportID ? report.reportID : moneyRequestAction?.childReportID ?? '-1',
+                }),
+            );
+        }
+
+        if (report) {
+            result.push(PromotedActions.pin(report));
+        }
+
+        result.push(PromotedActions.share(report));
+
+        return result;
+    }, [report, moneyRequestAction, canJoin, isExpenseReport, shouldShowHoldAction, canHoldUnholdReportAction.canHoldRequest, transactionThreadReportID]);
+
+    const nameSectionExpenseIOU = (
+        <View style={[styles.reportDetailsRoomInfo, styles.mw100]}>
+            {shouldDisableRename && (
+                <>
+                    <View style={[styles.alignSelfCenter, styles.w100, styles.mt1]}>
+                        <DisplayNames
+                            fullTitle={reportName ?? ''}
+                            displayNamesWithTooltips={displayNamesWithTooltips}
+                            tooltipEnabled
+                            numberOfLines={isChatRoom && !isChatThread ? 0 : 1}
+                            textStyles={[styles.textHeadline, styles.textAlignCenter, isChatRoom && !isChatThread ? undefined : styles.pre]}
+                            shouldUseFullTitle={shouldUseFullTitle}
+                        />
+                    </View>
+                    {isPolicyAdmin ? (
+                        <PressableWithoutFeedback
+                            style={[styles.w100]}
+                            disabled={policy?.pendingAction === CONST.RED_BRICK_ROAD_PENDING_ACTION.DELETE}
+                            role={CONST.ROLE.BUTTON}
+                            accessibilityLabel={chatRoomSubtitle ?? ''}
+                            accessible
+                            onPress={() => {
+                                Navigation.navigate(ROUTES.WORKSPACE_INITIAL.getRoute(report?.policyID ?? ''));
+                            }}
+                        >
+                            {chatRoomSubtitleText}
+                        </PressableWithoutFeedback>
+                    ) : (
+                        chatRoomSubtitleText
+                    )}
+                </>
+            )}
+            {!isEmptyObject(parentNavigationSubtitleData) && (isMoneyRequestReport || isInvoiceReport || isMoneyRequest || isTaskReport) && (
+                <ParentNavigationSubtitle
+                    parentNavigationSubtitleData={parentNavigationSubtitleData}
+                    parentReportID={report?.parentReportID}
+                    parentReportActionID={report?.parentReportActionID}
+                    pressableStyles={[styles.mt1, styles.mw100]}
+                />
+            )}
+        </View>
+    );
+
+    const nameSectionGroupWorkspace = (
+        <OfflineWithFeedback
+            pendingAction={report?.pendingFields?.reportName}
+            errors={report?.errorFields?.reportName}
+            errorRowStyles={[styles.ph5]}
+            onClose={() => Report.clearPolicyRoomNameErrors(report?.reportID)}
+        >
+            <View style={[styles.flex1, !shouldDisableRename && styles.mt3]}>
+                <MenuItemWithTopDescription
+                    shouldShowRightIcon={!shouldDisableRename}
+                    interactive={!shouldDisableRename}
+                    title={StringUtils.lineBreaksToSpaces(reportName)}
+                    titleStyle={styles.newKansasLarge}
+                    titleContainerStyle={shouldDisableRename && styles.alignItemsCenter}
+                    shouldCheckActionAllowedOnPress={false}
+                    description={!shouldDisableRename ? roomDescription : ''}
+                    furtherDetails={chatRoomSubtitle && !isGroupChat ? additionalRoomDetails : ''}
+                    onPress={() => Navigation.navigate(ROUTES.REPORT_SETTINGS_NAME.getRoute(report.reportID))}
+                />
+            </View>
+        </OfflineWithFeedback>
+    );
+
+    const titleField = useMemo<OnyxTypes.PolicyReportField | undefined>((): OnyxTypes.PolicyReportField | undefined => {
+        const fields = ReportUtils.getAvailableReportFields(report, Object.values(policy?.fieldList ?? {}));
+        return fields.find((reportField) => ReportUtils.isReportFieldOfTypeTitle(reportField));
+    }, [report, policy?.fieldList]);
+    const fieldKey = ReportUtils.getReportFieldKey(titleField?.fieldID ?? '-1');
+    const isFieldDisabled = ReportUtils.isReportFieldDisabled(report, titleField, policy);
+
+    const shouldShowTitleField = caseID !== CASES.MONEY_REQUEST && !isFieldDisabled && ReportUtils.isAdminOwnerApproverOrReportOwner(report, policy);
+
+    const nameSectionFurtherDetailsContent = (
+        <ParentNavigationSubtitle
+            parentNavigationSubtitleData={parentNavigationSubtitleData}
+            parentReportID={report?.parentReportID}
+            parentReportActionID={report?.parentReportActionID}
+            pressableStyles={[styles.mt1, styles.mw100]}
+        />
+    );
+
+    const nameSectionTitleField = titleField && (
+        <OfflineWithFeedback
+            pendingAction={report.pendingFields?.[fieldKey] ?? report.pendingFields?.reportName}
+            errors={report.errorFields?.[fieldKey] ?? report.errorFields?.reportName}
+            errorRowStyles={styles.ph5}
+            key={`menuItem-${fieldKey}`}
+            onClose={() => {
+                if (report.errorFields?.reportName) {
+                    Report.clearPolicyRoomNameErrors(report.reportID);
+                }
+                Report.clearReportFieldKeyErrors(report.reportID, fieldKey);
+            }}
+        >
+            <View style={[styles.flex1]}>
+                <MenuItemWithTopDescription
+                    shouldShowRightIcon={!isFieldDisabled}
+                    interactive={!isFieldDisabled}
+                    title={reportName}
+                    titleStyle={styles.newKansasLarge}
+                    shouldCheckActionAllowedOnPress={false}
+                    description={Str.UCFirst(titleField.name)}
+                    onPress={() => Navigation.navigate(ROUTES.EDIT_REPORT_FIELD_REQUEST.getRoute(report.reportID, report.policyID ?? '-1', titleField.fieldID ?? '-1'))}
+                    furtherDetailsComponent={nameSectionFurtherDetailsContent}
+                />
+            </View>
+        </OfflineWithFeedback>
+    );
+
+    // A flag to indicate whether the user choose to delete the transaction or not
+    const isTransactionDeleted = useRef<boolean>(false);
+    // Where to go back after deleting the transaction and its report. It's empty if the transaction report isn't deleted.
+    const navigateBackToAfterDelete = useRef<Route>();
+
+    const deleteTransaction = useCallback(() => {
+        setIsDeleteModalVisible(false);
+
+        if (caseID === CASES.DEFAULT) {
+            navigateBackToAfterDelete.current = Task.deleteTask(report);
+            return;
+        }
+
+        if (!requestParentReportAction) {
+            return;
+        }
 
-    const reportName =
-        ReportUtils.isDeprecatedGroupDM(report) || ReportUtils.isGroupChat(report)
-            ? ReportUtils.getGroupChatName(undefined, false, report.reportID ?? '')
-            : ReportUtils.getReportName(report);
+        if (ReportActionsUtils.isTrackExpenseAction(requestParentReportAction)) {
+            navigateBackToAfterDelete.current = IOU.deleteTrackExpense(moneyRequestReport?.reportID ?? '', iouTransactionID, requestParentReportAction, isSingleTransactionView);
+        } else {
+            navigateBackToAfterDelete.current = IOU.deleteMoneyRequest(iouTransactionID, requestParentReportAction, isSingleTransactionView);
+        }
+
+        isTransactionDeleted.current = true;
+    }, [caseID, iouTransactionID, moneyRequestReport?.reportID, report, requestParentReportAction, isSingleTransactionView]);
     return (
         <ScreenWrapper testID={ReportDetailsPage.displayName}>
             <FullPageNotFoundView shouldShow={isEmptyObject(report)}>
-                <HeaderWithBackButton
-                    title={translate('common.details')}
-                    onBackButtonPress={Navigation.goBack}
-                    shouldNavigateToTopMostReport={!(route.params && 'backTo' in route.params)}
-                />
+                <HeaderWithBackButton title={translate('common.details')} />
                 <ScrollView style={[styles.flex1]}>
-                    <View style={styles.reportDetailsTitleContainer}>
-                        <View style={styles.mb3}>
-                            {isMoneyRequestReport || isInvoiceReport ? (
-                                <MultipleAvatars
-                                    icons={icons}
-                                    size={CONST.AVATAR_SIZE.LARGE}
-                                />
-                            ) : (
-                                renderAvatar
-                            )}
-                        </View>
-                        <View style={[styles.reportDetailsRoomInfo, styles.mw100]}>
-                            <View style={[styles.alignSelfCenter, styles.w100, styles.mt1]}>
-                                <DisplayNames
-                                    fullTitle={reportName ?? ''}
-                                    displayNamesWithTooltips={displayNamesWithTooltips}
-                                    tooltipEnabled
-                                    numberOfLines={isChatRoom && !isChatThread ? 0 : 1}
-                                    textStyles={[styles.textHeadline, styles.textAlignCenter, isChatRoom && !isChatThread ? undefined : styles.pre]}
-                                    shouldUseFullTitle={shouldUseFullTitle}
-                                />
-                            </View>
-                            {isPolicyAdmin ? (
-                                <PressableWithoutFeedback
-                                    style={[styles.w100]}
-                                    disabled={policy?.pendingAction === CONST.RED_BRICK_ROAD_PENDING_ACTION.DELETE}
-                                    role={CONST.ROLE.BUTTON}
-                                    accessibilityLabel={chatRoomSubtitle ?? ''}
-                                    accessible
-                                    onPress={() => {
-                                        Navigation.navigate(ROUTES.WORKSPACE_INITIAL.getRoute(report?.policyID ?? ''));
-                                    }}
-                                >
-                                    {chatRoomSubtitleText}
-                                </PressableWithoutFeedback>
-                            ) : (
-                                chatRoomSubtitleText
-                            )}
-                            {!isEmptyObject(parentNavigationSubtitleData) && (isMoneyRequestReport || isInvoiceReport) && (
-                                <ParentNavigationSubtitle
-                                    parentNavigationSubtitleData={parentNavigationSubtitleData}
-                                    parentReportID={report?.parentReportID}
-                                    parentReportActionID={report?.parentReportActionID}
-                                    pressableStyles={[styles.mt1, styles.mw100]}
-                                />
-                            )}
-                        </View>
+                    <View style={[styles.reportDetailsTitleContainer, styles.pb0]}>
+                        {renderedAvatar}
+                        {isExpenseReport && (!shouldShowTitleField || !titleField) && nameSectionExpenseIOU}
                     </View>
+
+                    {isExpenseReport && shouldShowTitleField && titleField && nameSectionTitleField}
+
+                    {!isExpenseReport && nameSectionGroupWorkspace}
+
                     {shouldShowReportDescription && (
-                        <OfflineWithFeedback
-                            pendingAction={report.pendingFields?.description}
-                            style={styles.mb5}
-                        >
+                        <OfflineWithFeedback pendingAction={report.pendingFields?.description}>
                             <MenuItemWithTopDescription
-                                shouldShowRightIcon={canEditReportDescription}
-                                interactive={canEditReportDescription}
+                                shouldShowRightIcon
+                                interactive
                                 title={report.description}
                                 shouldRenderAsHTML
+                                shouldTruncateTitle
+                                characterLimit={100}
                                 shouldCheckActionAllowedOnPress={false}
                                 description={translate('reportDescriptionPage.roomDescription')}
                                 onPress={() => Navigation.navigate(ROUTES.REPORT_DESCRIPTION.getRoute(report.reportID))}
                             />
                         </OfflineWithFeedback>
                     )}
-                    {(isGroupChat || isChatRoom) && <ChatDetailsQuickActionsBar report={report} />}
-                    {menuItems.map((item) => {
-                        const brickRoadIndicator =
-                            ReportUtils.hasReportNameError(report) && item.key === CONST.REPORT_DETAILS_MENU_ITEM.SETTINGS ? CONST.BRICK_ROAD_INDICATOR_STATUS.ERROR : undefined;
-                        return (
-                            <MenuItem
-                                key={item.key}
-                                title={translate(item.translationKey)}
-                                subtitle={item.subtitle}
-                                icon={item.icon}
-                                onPress={item.action}
-                                isAnonymousAction={item.isAnonymousAction}
-                                shouldShowRightIcon={item.shouldShowRightIcon ?? true}
-                                brickRoadIndicator={brickRoadIndicator ?? item.brickRoadIndicator}
-                            />
-                        );
-                    })}
+
+                    <PromotedActionsBar
+                        containerStyle={styles.mt5}
+                        promotedActions={promotedActions}
+                    />
+
+                    {menuItems.map((item) => (
+                        <MenuItem
+                            key={item.key}
+                            title={translate(item.translationKey)}
+                            subtitle={item.subtitle}
+                            icon={item.icon}
+                            onPress={item.action}
+                            isAnonymousAction={item.isAnonymousAction}
+                            shouldShowRightIcon={item.shouldShowRightIcon}
+                            brickRoadIndicator={item.brickRoadIndicator}
+                        />
+                    ))}
+
+                    {shouldShowDeleteButton && (
+                        <MenuItem
+                            key={CONST.REPORT_DETAILS_MENU_ITEM.DELETE}
+                            icon={Expensicons.Trashcan}
+                            title={caseID === CASES.DEFAULT ? translate('common.delete') : translate('reportActionContextMenu.deleteAction', {action: requestParentReportAction})}
+                            onPress={() => setIsDeleteModalVisible(true)}
+                        />
+                    )}
                 </ScrollView>
                 <ConfirmModal
                     danger
@@ -384,13 +765,68 @@ function ReportDetailsPage({policies, report, session, personalDetails}: ReportD
                     isVisible={isLastMemberLeavingGroupModalVisible}
                     onConfirm={() => {
                         setIsLastMemberLeavingGroupModalVisible(false);
-                        Report.leaveGroupChat(report.reportID);
+                        leaveChat();
                     }}
                     onCancel={() => setIsLastMemberLeavingGroupModalVisible(false)}
                     prompt={translate('groupChat.lastMemberWarning')}
                     confirmText={translate('common.leave')}
                     cancelText={translate('common.cancel')}
                 />
+                <ConfirmModal
+                    title={translate('iou.cancelPayment')}
+                    isVisible={isConfirmModalVisible}
+                    onConfirm={cancelPayment}
+                    onCancel={() => setIsConfirmModalVisible(false)}
+                    prompt={translate('iou.cancelPaymentConfirmation')}
+                    confirmText={translate('iou.cancelPayment')}
+                    cancelText={translate('common.dismiss')}
+                    danger
+                    shouldEnableNewFocusManagement
+                />
+                <ConfirmModal
+                    title={caseID === CASES.DEFAULT ? translate('task.deleteTask') : translate('iou.deleteExpense')}
+                    isVisible={isDeleteModalVisible}
+                    onConfirm={deleteTransaction}
+                    onCancel={() => setIsDeleteModalVisible(false)}
+                    onModalHide={() => {
+                        // We use isTransactionDeleted to know if the modal hides because the user deletes the transaction.
+                        if (!isTransactionDeleted.current) {
+                            if (caseID === CASES.DEFAULT) {
+                                if (navigateBackToAfterDelete.current) {
+                                    Navigation.goBack(navigateBackToAfterDelete.current);
+                                } else {
+                                    Navigation.dismissModal();
+                                }
+                            }
+                            return;
+                        }
+
+                        if (!navigateBackToAfterDelete.current) {
+                            Navigation.dismissModal();
+                        } else {
+                            ReportUtils.navigateBackAfterDeleteTransaction(navigateBackToAfterDelete.current, true);
+                        }
+                    }}
+                    prompt={caseID === CASES.DEFAULT ? translate('task.deleteConfirmation') : translate('iou.deleteConfirmation')}
+                    confirmText={translate('common.delete')}
+                    cancelText={translate('common.cancel')}
+                    danger
+                    shouldEnableNewFocusManagement
+                />
+                <ConfirmModal
+                    title={translate('iou.unapproveReport')}
+                    isVisible={isUnapproveModalVisible}
+                    danger
+                    confirmText={translate('iou.unapproveReport')}
+                    onConfirm={() => {
+                        setIsUnapproveModalVisible(false);
+                        Navigation.dismissModal();
+                        IOU.unapproveExpenseReport(moneyRequestReport);
+                    }}
+                    cancelText={translate('common.cancel')}
+                    onCancel={() => setIsUnapproveModalVisible(false)}
+                    prompt={unapproveWarningText}
+                />
             </FullPageNotFoundView>
         </ScreenWrapper>
     );
diff --git a/src/pages/ReportParticipantDetailsPage.tsx b/src/pages/ReportParticipantDetailsPage.tsx
index 2b1411641faa..f03b2475d5a7 100644
--- a/src/pages/ReportParticipantDetailsPage.tsx
+++ b/src/pages/ReportParticipantDetailsPage.tsx
@@ -10,6 +10,7 @@ import HeaderWithBackButton from '@components/HeaderWithBackButton';
 import * as Expensicons from '@components/Icon/Expensicons';
 import MenuItem from '@components/MenuItem';
 import MenuItemWithTopDescription from '@components/MenuItemWithTopDescription';
+import OfflineWithFeedback from '@components/OfflineWithFeedback';
 import ScreenWrapper from '@components/ScreenWrapper';
 import Text from '@components/Text';
 import useCurrentUserPersonalDetails from '@hooks/useCurrentUserPersonalDetails';
@@ -18,7 +19,6 @@ import useStyleUtils from '@hooks/useStyleUtils';
 import useThemeStyles from '@hooks/useThemeStyles';
 import * as Report from '@libs/actions/Report';
 import * as ReportUtils from '@libs/ReportUtils';
-import * as UserUtils from '@libs/UserUtils';
 import Navigation from '@navigation/Navigation';
 import type {ParticipantsNavigatorParamList} from '@navigation/types';
 import CONST from '@src/CONST';
@@ -26,6 +26,7 @@ import ONYXKEYS from '@src/ONYXKEYS';
 import ROUTES from '@src/ROUTES';
 import type SCREENS from '@src/SCREENS';
 import type {PersonalDetails, PersonalDetailsList} from '@src/types/onyx';
+import NotFoundPage from './ErrorPage/NotFoundPage';
 import withReportOrNotFound from './home/report/withReportOrNotFound';
 import type {WithReportOrNotFoundProps} from './home/report/withReportOrNotFound';
 
@@ -47,11 +48,10 @@ function ReportParticipantDetails({personalDetails, report, route}: ReportPartic
     const [isRemoveMemberConfirmModalVisible, setIsRemoveMemberConfirmModalVisible] = React.useState(false);
 
     const accountID = Number(route.params.accountID);
-    const backTo = ROUTES.REPORT_PARTICIPANTS.getRoute(report?.reportID ?? '');
+    const backTo = ROUTES.REPORT_PARTICIPANTS.getRoute(report?.reportID ?? '-1');
 
     const member = report?.participants?.[accountID];
     const details = personalDetails?.[accountID] ?? ({} as PersonalDetails);
-    const avatar = details.avatar ?? UserUtils.getDefaultAvatar();
     const fallbackIcon = details.fallbackIcon ?? '';
     const displayName = details.displayName ?? '';
     const isCurrentUserAdmin = ReportUtils.isGroupChatAdmin(report, currentUserPersonalDetails?.accountID);
@@ -70,6 +70,10 @@ function ReportParticipantDetails({personalDetails, report, route}: ReportPartic
         Navigation.navigate(ROUTES.REPORT_PARTICIPANTS_ROLE_SELECTION.getRoute(report.reportID, accountID));
     }, [accountID, report.reportID]);
 
+    if (!member) {
+        return <NotFoundPage />;
+    }
+
     return (
         <ScreenWrapper testID={ReportParticipantDetails.displayName}>
             <HeaderWithBackButton
@@ -81,11 +85,13 @@ function ReportParticipantDetails({personalDetails, report, route}: ReportPartic
                     <Avatar
                         containerStyles={[styles.avatarXLarge, styles.mv5, styles.noOutline]}
                         imageStyles={[styles.avatarXLarge]}
-                        source={UserUtils.getAvatar(avatar, accountID)}
+                        source={details.avatar}
+                        avatarID={accountID}
+                        type={CONST.ICON_TYPE_AVATAR}
                         size={CONST.AVATAR_SIZE.XLARGE}
                         fallbackIcon={fallbackIcon}
                     />
-                    {Boolean(details.displayName ?? '') && (
+                    {!!(details.displayName ?? '') && (
                         <Text
                             style={[styles.textHeadline, styles.pre, styles.mb6, styles.w100, styles.textAlignCenter]}
                             numberOfLines={1}
@@ -119,13 +125,15 @@ function ReportParticipantDetails({personalDetails, report, route}: ReportPartic
                 </View>
                 <View style={styles.w100}>
                     {isCurrentUserAdmin && (
-                        <MenuItemWithTopDescription
-                            disabled={isSelectedMemberCurrentUser}
-                            title={member?.role === CONST.REPORT.ROLE.ADMIN ? translate('common.admin') : translate('common.member')}
-                            description={translate('common.role')}
-                            shouldShowRightIcon
-                            onPress={openRoleSelectionModal}
-                        />
+                        <OfflineWithFeedback pendingAction={member?.pendingFields?.role ?? null}>
+                            <MenuItemWithTopDescription
+                                disabled={isSelectedMemberCurrentUser}
+                                title={member?.role === CONST.REPORT.ROLE.ADMIN ? translate('common.admin') : translate('common.member')}
+                                description={translate('common.role')}
+                                shouldShowRightIcon
+                                onPress={openRoleSelectionModal}
+                            />
+                        </OfflineWithFeedback>
                     )}
                     <MenuItem
                         title={translate('common.profile')}
diff --git a/src/pages/ReportParticipantRoleSelectionPage.tsx b/src/pages/ReportParticipantRoleSelectionPage.tsx
index 6d8c5d951064..d2fb5ca365a0 100644
--- a/src/pages/ReportParticipantRoleSelectionPage.tsx
+++ b/src/pages/ReportParticipantRoleSelectionPage.tsx
@@ -29,8 +29,8 @@ function ReportParticipantRoleSelectionPage({report, route}: ReportParticipantRo
     const {translate} = useLocalize();
     const styles = useThemeStyles();
 
-    const accountID = Number(route?.params?.accountID) ?? 0;
-    const backTo = ROUTES.REPORT_PARTICIPANTS_DETAILS.getRoute(report?.reportID ?? '', accountID);
+    const accountID = Number(route?.params?.accountID) ?? -1;
+    const backTo = ROUTES.REPORT_PARTICIPANTS_DETAILS.getRoute(report?.reportID ?? '-1', accountID);
     const member = report.participants?.[accountID];
 
     if (!member) {
@@ -68,6 +68,7 @@ function ReportParticipantRoleSelectionPage({report, route}: ReportParticipantRo
                     sections={[{data: items}]}
                     ListItem={RadioListItem}
                     onSelectRow={changeRole}
+                    shouldSingleExecuteRowSelect
                     initiallyFocusedOptionKey={items.find((item) => item.isSelected)?.keyForList}
                 />
             </View>
diff --git a/src/pages/ReportParticipantsPage.tsx b/src/pages/ReportParticipantsPage.tsx
index 63b1a924fe29..8280ead49525 100755
--- a/src/pages/ReportParticipantsPage.tsx
+++ b/src/pages/ReportParticipantsPage.tsx
@@ -2,8 +2,7 @@ import {useIsFocused} from '@react-navigation/native';
 import React, {useCallback, useEffect, useMemo, useRef, useState} from 'react';
 import {InteractionManager, View} from 'react-native';
 import type {TextInput} from 'react-native';
-import type {OnyxEntry} from 'react-native-onyx';
-import {withOnyx} from 'react-native-onyx';
+import {useOnyx} from 'react-native-onyx';
 import type {ValueOf} from 'type-fest';
 import Badge from '@components/Badge';
 import FullPageNotFoundView from '@components/BlockingViews/FullPageNotFoundView';
@@ -14,52 +13,45 @@ import ConfirmModal from '@components/ConfirmModal';
 import HeaderWithBackButton from '@components/HeaderWithBackButton';
 import * as Expensicons from '@components/Icon/Expensicons';
 import ScreenWrapper from '@components/ScreenWrapper';
-import SelectionList from '@components/SelectionList';
 import TableListItem from '@components/SelectionList/TableListItem';
 import type {ListItem, SelectionListHandle} from '@components/SelectionList/types';
+import SelectionListWithModal from '@components/SelectionListWithModal';
 import Text from '@components/Text';
 import useLocalize from '@hooks/useLocalize';
+import useResponsiveLayout from '@hooks/useResponsiveLayout';
 import useStyleUtils from '@hooks/useStyleUtils';
 import useThemeStyles from '@hooks/useThemeStyles';
-import useWindowDimensions from '@hooks/useWindowDimensions';
+import {turnOffMobileSelectionMode} from '@libs/actions/MobileSelectionMode';
 import * as Report from '@libs/actions/Report';
-import Log from '@libs/Log';
 import Navigation from '@libs/Navigation/Navigation';
 import * as PersonalDetailsUtils from '@libs/PersonalDetailsUtils';
 import * as ReportUtils from '@libs/ReportUtils';
-import * as UserUtils from '@libs/UserUtils';
 import CONST from '@src/CONST';
 import ONYXKEYS from '@src/ONYXKEYS';
 import ROUTES from '@src/ROUTES';
-import type {PersonalDetailsList, Session} from '@src/types/onyx';
 import type {WithReportOrNotFoundProps} from './home/report/withReportOrNotFound';
 import withReportOrNotFound from './home/report/withReportOrNotFound';
 
-type ReportParticipantsPageOnyxProps = {
-    /** Personal details of all the users */
-    personalDetails: OnyxEntry<PersonalDetailsList>;
-
-    /** Session info for the currently logged in user. */
-    session: OnyxEntry<Session>;
-};
-
-type ReportParticipantsPageProps = ReportParticipantsPageOnyxProps & WithReportOrNotFoundProps;
-
 type MemberOption = Omit<ListItem, 'accountID'> & {accountID: number};
 
-function ReportParticipantsPage({report, personalDetails, session}: ReportParticipantsPageProps) {
+function ReportParticipantsPage({report}: WithReportOrNotFoundProps) {
     const [selectedMembers, setSelectedMembers] = useState<number[]>([]);
     const [removeMembersConfirmModalVisible, setRemoveMembersConfirmModalVisible] = useState(false);
     const {translate, formatPhoneNumber} = useLocalize();
     const styles = useThemeStyles();
     const StyleUtils = useStyleUtils();
-    const {isSmallScreenWidth} = useWindowDimensions();
+    const {shouldUseNarrowLayout, isSmallScreenWidth} = useResponsiveLayout();
     const selectionListRef = useRef<SelectionListHandle>(null);
     const textInputRef = useRef<TextInput>(null);
+    const [reportNameValuePairs] = useOnyx(`${ONYXKEYS.COLLECTION.REPORT_NAME_VALUE_PAIRS}${report?.reportID ?? -1}`);
+    const [selectionMode] = useOnyx(ONYXKEYS.MOBILE_SELECTION_MODE);
+    const [session] = useOnyx(ONYXKEYS.SESSION);
+    const [personalDetails] = useOnyx(ONYXKEYS.PERSONAL_DETAILS_LIST);
     const currentUserAccountID = Number(session?.accountID);
     const isCurrentUserAdmin = ReportUtils.isGroupChatAdmin(report, currentUserAccountID);
     const isGroupChat = useMemo(() => ReportUtils.isGroupChat(report), [report]);
     const isFocused = useIsFocused();
+    const canSelectMultiple = isGroupChat && isCurrentUserAdmin && (isSmallScreenWidth ? selectionMode?.isEnabled : true);
 
     useEffect(() => {
         if (isFocused) {
@@ -70,36 +62,34 @@ function ReportParticipantsPage({report, personalDetails, session}: ReportPartic
 
     const getUsers = useCallback((): MemberOption[] => {
         let result: MemberOption[] = [];
-        const chatParticipants = isGroupChat ? ReportUtils.getParticipantAccountIDs(report.reportID) : ReportUtils.getVisibleChatMemberAccountIDs(report.reportID);
+        const chatParticipants = ReportUtils.getParticipantsList(report, personalDetails);
         chatParticipants.forEach((accountID) => {
             const role = report.participants?.[accountID].role;
             const details = personalDetails?.[accountID];
-            if (!details) {
-                Log.hmmm(`[ReportParticipantsPage] no personal details found for Group chat member with accountID: ${accountID}`);
-                return;
-            }
 
             const pendingChatMember = report?.pendingChatMembers?.findLast((member) => member.accountID === accountID.toString());
-            const isSelected = selectedMembers.includes(accountID);
+            const isSelected = selectedMembers.includes(accountID) && canSelectMultiple;
             const isAdmin = role === CONST.REPORT.ROLE.ADMIN;
             let roleBadge = null;
             if (isAdmin) {
                 roleBadge = <Badge text={translate('common.admin')} />;
             }
 
+            const pendingAction = pendingChatMember?.pendingAction ?? report.participants?.[accountID]?.pendingAction;
+
             result.push({
                 keyForList: `${accountID}`,
                 accountID,
                 isSelected,
                 isDisabledCheckbox: accountID === currentUserAccountID,
-                isDisabled: pendingChatMember?.pendingAction === CONST.RED_BRICK_ROAD_PENDING_ACTION.DELETE,
+                isDisabled: pendingChatMember?.pendingAction === CONST.RED_BRICK_ROAD_PENDING_ACTION.DELETE || details?.isOptimisticPersonalDetail,
                 text: formatPhoneNumber(PersonalDetailsUtils.getDisplayNameOrDefault(details)),
                 alternateText: formatPhoneNumber(details?.login ?? ''),
                 rightElement: roleBadge,
-                pendingAction: pendingChatMember?.pendingAction,
+                pendingAction,
                 icons: [
                     {
-                        source: UserUtils.getAvatar(details?.avatar, accountID),
+                        source: details?.avatar ?? Expensicons.FallbackAvatar,
                         name: formatPhoneNumber(details?.login ?? ''),
                         type: CONST.ICON_TYPE_AVATAR,
                         id: accountID,
@@ -110,7 +100,7 @@ function ReportParticipantsPage({report, personalDetails, session}: ReportPartic
 
         result = result.sort((a, b) => (a.text ?? '').toLowerCase().localeCompare((b.text ?? '').toLowerCase()));
         return result;
-    }, [formatPhoneNumber, personalDetails, report, selectedMembers, currentUserAccountID, translate, isGroupChat]);
+    }, [formatPhoneNumber, personalDetails, report, selectedMembers, currentUserAccountID, translate, canSelectMultiple]);
 
     const participants = useMemo(() => getUsers(), [getUsers]);
 
@@ -176,15 +166,19 @@ function ReportParticipantsPage({report, personalDetails, session}: ReportPartic
      * Toggle user from the selectedMembers list
      */
     const toggleUser = useCallback(
-        (accountID: number) => {
+        (user: MemberOption) => {
+            if (user.accountID === currentUserAccountID) {
+                return;
+            }
+
             // Add or remove the user if the checkbox is enabled
-            if (selectedMembers.includes(accountID)) {
-                removeUser(accountID);
+            if (selectedMembers.includes(user.accountID)) {
+                removeUser(user.accountID);
             } else {
-                addUser(accountID);
+                addUser(user.accountID);
             }
         },
-        [selectedMembers, addUser, removeUser],
+        [selectedMembers, addUser, removeUser, currentUserAccountID],
     );
 
     const headerContent = useMemo(() => {
@@ -211,12 +205,12 @@ function ReportParticipantsPage({report, personalDetails, session}: ReportPartic
             </View>
         );
 
-        if (isCurrentUserAdmin) {
+        if (canSelectMultiple) {
             return header;
         }
 
         return <View style={[styles.peopleRow, styles.userSelectNone, styles.ph9, styles.pb5]}>{header}</View>;
-    }, [styles, translate, isGroupChat, isCurrentUserAdmin, StyleUtils]);
+    }, [styles, translate, isGroupChat, isCurrentUserAdmin, StyleUtils, canSelectMultiple]);
 
     const bulkActionsButtonOptions = useMemo(() => {
         const options: Array<DropdownOption<WorkspaceMemberBulkActionType>> = [
@@ -234,7 +228,7 @@ function ReportParticipantsPage({report, personalDetails, session}: ReportPartic
             options.push({
                 text: translate('workspace.people.makeMember'),
                 value: CONST.POLICY.MEMBERS_BULK_ACTION_TYPES.MAKE_MEMBER,
-                icon: Expensicons.MakeAdmin,
+                icon: Expensicons.User,
                 onSelected: () => changeUserRole(CONST.REPORT.ROLE.MEMBER),
             });
         }
@@ -260,7 +254,7 @@ function ReportParticipantsPage({report, personalDetails, session}: ReportPartic
 
         return (
             <View style={styles.w100}>
-                {selectedMembers.length > 0 ? (
+                {(isSmallScreenWidth ? canSelectMultiple : selectedMembers.length > 0) ? (
                     <ButtonWithDropdownMenu<WorkspaceMemberBulkActionType>
                         shouldAlwaysShowDropdownMenu
                         pressOnEnter
@@ -268,7 +262,8 @@ function ReportParticipantsPage({report, personalDetails, session}: ReportPartic
                         buttonSize={CONST.DROPDOWN_BUTTON_SIZE.MEDIUM}
                         onPress={() => null}
                         options={bulkActionsButtonOptions}
-                        style={[isSmallScreenWidth && styles.flexGrow1]}
+                        style={[shouldUseNarrowLayout && styles.flexGrow1]}
+                        isDisabled={!selectedMembers.length}
                     />
                 ) : (
                     <Button
@@ -277,13 +272,13 @@ function ReportParticipantsPage({report, personalDetails, session}: ReportPartic
                         onPress={inviteUser}
                         text={translate('workspace.invite.member')}
                         icon={Expensicons.Plus}
-                        innerStyles={[isSmallScreenWidth && styles.alignItemsCenter]}
-                        style={[isSmallScreenWidth && styles.flexGrow1]}
+                        innerStyles={[shouldUseNarrowLayout && styles.alignItemsCenter]}
+                        style={[shouldUseNarrowLayout && styles.flexGrow1]}
                     />
                 )}
             </View>
         );
-    }, [bulkActionsButtonOptions, inviteUser, isSmallScreenWidth, selectedMembers, styles, translate, isGroupChat]);
+    }, [bulkActionsButtonOptions, inviteUser, isSmallScreenWidth, selectedMembers, styles, translate, isGroupChat, canSelectMultiple, shouldUseNarrowLayout]);
 
     /** Opens the member details page */
     const openMemberDetails = useCallback(
@@ -309,17 +304,29 @@ function ReportParticipantsPage({report, personalDetails, session}: ReportPartic
         }
         return translate('common.details');
     }, [report, translate, isGroupChat]);
+
+    const selectionModeHeader = selectionMode?.isEnabled && isSmallScreenWidth;
+
     return (
         <ScreenWrapper
             includeSafeAreaPaddingBottom={false}
             style={[styles.defaultModalContainer]}
             testID={ReportParticipantsPage.displayName}
         >
-            <FullPageNotFoundView shouldShow={!report || ReportUtils.isArchivedRoom(report) || ReportUtils.isSelfDM(report)}>
+            <FullPageNotFoundView shouldShow={!report || ReportUtils.isArchivedRoom(report, reportNameValuePairs) || ReportUtils.isSelfDM(report)}>
                 <HeaderWithBackButton
-                    title={headerTitle}
-                    onBackButtonPress={report ? () => Navigation.goBack(ROUTES.REPORT_WITH_ID_DETAILS.getRoute(report.reportID)) : undefined}
-                    shouldShowBackButton
+                    title={selectionModeHeader ? translate('common.selectMultiple') : headerTitle}
+                    onBackButtonPress={() => {
+                        if (selectionMode?.isEnabled) {
+                            setSelectedMembers([]);
+                            turnOffMobileSelectionMode();
+                            return;
+                        }
+
+                        if (report) {
+                            Navigation.goBack(ROUTES.REPORT_WITH_ID_DETAILS.getRoute(report.reportID));
+                        }
+                    }}
                     guidesCallTaskID={CONST.GUIDES_CALL_TASK_IDS.WORKSPACE_MEMBERS}
                 />
                 <View style={[styles.pl5, styles.pr5]}>{headerButtons}</View>
@@ -342,14 +349,17 @@ function ReportParticipantsPage({report, personalDetails, session}: ReportPartic
                     }}
                 />
                 <View style={[styles.w100, styles.flex1]}>
-                    <SelectionList
+                    <SelectionListWithModal
                         ref={selectionListRef}
-                        canSelectMultiple={isGroupChat && isCurrentUserAdmin}
+                        canSelectMultiple={canSelectMultiple}
+                        turnOnSelectionModeOnLongPress={isCurrentUserAdmin && isGroupChat}
+                        onTurnOnSelectionMode={(item) => item && toggleUser(item)}
                         sections={[{data: participants}]}
                         ListItem={TableListItem}
                         headerContent={headerContent}
                         onSelectRow={openMemberDetails}
-                        onCheckboxPress={(item) => toggleUser(item.accountID)}
+                        shouldSingleExecuteRowSelect={!(isGroupChat && isCurrentUserAdmin)}
+                        onCheckboxPress={(item) => toggleUser(item)}
                         onSelectAll={() => toggleAllUsers(participants)}
                         showScrollIndicator
                         textInputRef={textInputRef}
@@ -364,13 +374,4 @@ function ReportParticipantsPage({report, personalDetails, session}: ReportPartic
 
 ReportParticipantsPage.displayName = 'ReportParticipantsPage';
 
-export default withReportOrNotFound()(
-    withOnyx<ReportParticipantsPageProps, ReportParticipantsPageOnyxProps>({
-        personalDetails: {
-            key: ONYXKEYS.PERSONAL_DETAILS_LIST,
-        },
-        session: {
-            key: ONYXKEYS.SESSION,
-        },
-    })(ReportParticipantsPage),
-);
+export default withReportOrNotFound()(ReportParticipantsPage);
diff --git a/src/pages/RestrictedAction/Workspace/WorkspaceAdminRestrictedAction.tsx b/src/pages/RestrictedAction/Workspace/WorkspaceAdminRestrictedAction.tsx
new file mode 100644
index 000000000000..89b5dcdd8a2b
--- /dev/null
+++ b/src/pages/RestrictedAction/Workspace/WorkspaceAdminRestrictedAction.tsx
@@ -0,0 +1,72 @@
+import React, {useCallback} from 'react';
+import {View} from 'react-native';
+import Button from '@components/Button';
+import HeaderWithBackButton from '@components/HeaderWithBackButton';
+import * as Illustrations from '@components/Icon/Illustrations';
+import ImageSVG from '@components/ImageSVG';
+import ScreenWrapper from '@components/ScreenWrapper';
+import ScrollView from '@components/ScrollView';
+import Text from '@components/Text';
+import useLocalize from '@hooks/useLocalize';
+import usePolicy from '@hooks/usePolicy';
+import useThemeStyles from '@hooks/useThemeStyles';
+import Navigation from '@libs/Navigation/Navigation';
+import * as PolicyUtils from '@libs/PolicyUtils';
+import variables from '@styles/variables';
+import ROUTES from '@src/ROUTES';
+
+type WorkspaceAdminRestrictedActionProps = {
+    policyID: string;
+};
+
+function WorkspaceAdminRestrictedAction({policyID}: WorkspaceAdminRestrictedActionProps) {
+    const {translate} = useLocalize();
+    const policy = usePolicy(policyID);
+    const styles = useThemeStyles();
+
+    const openAdminsReport = useCallback(() => {
+        const reportID = `${PolicyUtils.getPolicy(policyID)?.chatReportIDAdmins}` ?? '-1';
+        Navigation.closeRHPFlow();
+        Navigation.navigate(ROUTES.REPORT_WITH_ID.getRoute(reportID));
+    }, [policyID]);
+
+    return (
+        <ScreenWrapper
+            includeSafeAreaPaddingBottom
+            testID={WorkspaceAdminRestrictedAction.displayName}
+        >
+            <HeaderWithBackButton
+                title={translate('workspace.restrictedAction.restricted')}
+                onBackButtonPress={Navigation.goBack}
+            />
+            <ScrollView
+                style={[styles.p5, styles.pt0]}
+                contentContainerStyle={styles.flexGrow1}
+            >
+                <View style={[styles.flex1, styles.alignItemsCenter, styles.justifyContentCenter, styles.mb15]}>
+                    <ImageSVG
+                        src={Illustrations.LockClosedOrange}
+                        width={variables.restrictedActionIllustrationHeight}
+                        height={variables.restrictedActionIllustrationHeight}
+                    />
+                    <Text style={[styles.textHeadlineH1, styles.textAlignCenter]}>
+                        {translate('workspace.restrictedAction.actionsAreCurrentlyRestricted', {workspaceName: policy?.name})}
+                    </Text>
+                    <Text style={[styles.textLabelSupportingEmptyValue, styles.textAlignCenter, styles.lh20, styles.mt2]}>
+                        {translate('workspace.restrictedAction.workspaceOwnerWillNeedToAddOrUpdatePaymentCard', {workspaceOwnerName: policy?.owner})}
+                    </Text>
+                </View>
+                <Button
+                    text={translate('workspace.restrictedAction.chatInAdmins')}
+                    onPress={openAdminsReport}
+                    success
+                    large
+                />
+            </ScrollView>
+        </ScreenWrapper>
+    );
+}
+
+WorkspaceAdminRestrictedAction.displayName = 'WorkspaceAdminRestrictedAction';
+
+export default WorkspaceAdminRestrictedAction;
diff --git a/src/pages/RestrictedAction/Workspace/WorkspaceOwnerRestrictedAction.tsx b/src/pages/RestrictedAction/Workspace/WorkspaceOwnerRestrictedAction.tsx
new file mode 100644
index 000000000000..94462c92f17c
--- /dev/null
+++ b/src/pages/RestrictedAction/Workspace/WorkspaceOwnerRestrictedAction.tsx
@@ -0,0 +1,67 @@
+import React from 'react';
+import {View} from 'react-native';
+import Badge from '@components/Badge';
+import Button from '@components/Button';
+import HeaderWithBackButton from '@components/HeaderWithBackButton';
+import Icon from '@components/Icon';
+import * as Expensicons from '@components/Icon/Expensicons';
+import * as Illustrations from '@components/Icon/Illustrations';
+import ScreenWrapper from '@components/ScreenWrapper';
+import ScrollView from '@components/ScrollView';
+import Text from '@components/Text';
+import useLocalize from '@hooks/useLocalize';
+import useThemeStyles from '@hooks/useThemeStyles';
+import Navigation from '@libs/Navigation/Navigation';
+import variables from '@styles/variables';
+import ROUTES from '@src/ROUTES';
+
+function WorkspaceOwnerRestrictedAction() {
+    const {translate} = useLocalize();
+    const styles = useThemeStyles();
+
+    const addPaymentCard = () => {
+        Navigation.closeRHPFlow();
+        Navigation.navigate(ROUTES.SETTINGS_SUBSCRIPTION_ADD_PAYMENT_CARD);
+    };
+
+    return (
+        <ScreenWrapper
+            includeSafeAreaPaddingBottom
+            testID={WorkspaceOwnerRestrictedAction.displayName}
+        >
+            <HeaderWithBackButton
+                title={translate('workspace.restrictedAction.restricted')}
+                onBackButtonPress={Navigation.goBack}
+            />
+            <ScrollView contentContainerStyle={[styles.ph5, styles.pt3]}>
+                <View style={[styles.cardSectionContainer, styles.p5, styles.mb0, styles.mh0]}>
+                    <View style={[styles.flexRow, styles.justifyContentBetween, styles.alignItemsStart, styles.mb3]}>
+                        <Icon
+                            src={Illustrations.LockClosedOrange}
+                            height={variables.iconHeader}
+                            width={variables.iconHeader}
+                        />
+                        <Badge
+                            icon={Expensicons.Unlock}
+                            success
+                            text={translate('workspace.restrictedAction.addPaymentCardToUnlock')}
+                            badgeStyles={styles.alignSelfStart}
+                        />
+                    </View>
+                    <Text style={[styles.textHeadlineH1, styles.mb4]}>{translate('workspace.restrictedAction.addPaymentCardToContinueUsingWorkspace')}</Text>
+                    <Text style={[styles.textLabelSupportingEmptyValue, styles.mb5]}>{translate('workspace.restrictedAction.youWillNeedToAddOrUpdatePaymentCard')}</Text>
+                    <Button
+                        text={translate('workspace.restrictedAction.addPaymentCard')}
+                        onPress={addPaymentCard}
+                        success
+                        large
+                    />
+                </View>
+            </ScrollView>
+        </ScreenWrapper>
+    );
+}
+
+WorkspaceOwnerRestrictedAction.displayName = 'WorkspaceOwnerRestrictedAction';
+
+export default WorkspaceOwnerRestrictedAction;
diff --git a/src/pages/RestrictedAction/Workspace/WorkspaceRestrictedActionPage.tsx b/src/pages/RestrictedAction/Workspace/WorkspaceRestrictedActionPage.tsx
new file mode 100644
index 000000000000..a9cee3236ad0
--- /dev/null
+++ b/src/pages/RestrictedAction/Workspace/WorkspaceRestrictedActionPage.tsx
@@ -0,0 +1,44 @@
+import type {StackScreenProps} from '@react-navigation/stack';
+import React from 'react';
+import {useOnyx} from 'react-native-onyx';
+import usePolicy from '@hooks/usePolicy';
+import type {RestrictedActionParamList} from '@libs/Navigation/types';
+import * as PolicyUtils from '@libs/PolicyUtils';
+import NotFoundPage from '@pages/ErrorPage/NotFoundPage';
+import ONYXKEYS from '@src/ONYXKEYS';
+import type SCREENS from '@src/SCREENS';
+import WorkspaceAdminRestrictedAction from './WorkspaceAdminRestrictedAction';
+import WorkspaceOwnerRestrictedAction from './WorkspaceOwnerRestrictedAction';
+import WorkspaceUserRestrictedAction from './WorkspaceUserRestrictedAction';
+
+type WorkspaceRestrictedActionPageProps = StackScreenProps<RestrictedActionParamList, typeof SCREENS.RESTRICTED_ACTION_ROOT>;
+
+function WorkspaceRestrictedActionPage({
+    route: {
+        params: {policyID},
+    },
+}: WorkspaceRestrictedActionPageProps) {
+    const [session] = useOnyx(ONYXKEYS.SESSION);
+    const policy = usePolicy(policyID);
+
+    // Workspace Owner
+    if (PolicyUtils.isPolicyOwner(policy, session?.accountID ?? -1)) {
+        return <WorkspaceOwnerRestrictedAction />;
+    }
+
+    // Workspace Admin
+    if (PolicyUtils.isPolicyAdmin(policy, session?.email)) {
+        return <WorkspaceAdminRestrictedAction policyID={policyID} />;
+    }
+
+    // Workspace User
+    if (PolicyUtils.isPolicyUser(policy, session?.email)) {
+        return <WorkspaceUserRestrictedAction policyID={policyID} />;
+    }
+
+    return <NotFoundPage />;
+}
+
+WorkspaceRestrictedActionPage.displayName = 'WorkspaceRestrictedActionPage';
+
+export default WorkspaceRestrictedActionPage;
diff --git a/src/pages/RestrictedAction/Workspace/WorkspaceUserRestrictedAction.tsx b/src/pages/RestrictedAction/Workspace/WorkspaceUserRestrictedAction.tsx
new file mode 100644
index 000000000000..386dd96523ed
--- /dev/null
+++ b/src/pages/RestrictedAction/Workspace/WorkspaceUserRestrictedAction.tsx
@@ -0,0 +1,72 @@
+import React, {useCallback} from 'react';
+import {View} from 'react-native';
+import Button from '@components/Button';
+import HeaderWithBackButton from '@components/HeaderWithBackButton';
+import * as Illustrations from '@components/Icon/Illustrations';
+import ImageSVG from '@components/ImageSVG';
+import ScreenWrapper from '@components/ScreenWrapper';
+import ScrollView from '@components/ScrollView';
+import Text from '@components/Text';
+import useLocalize from '@hooks/useLocalize';
+import usePolicy from '@hooks/usePolicy';
+import useThemeStyles from '@hooks/useThemeStyles';
+import Navigation from '@libs/Navigation/Navigation';
+import * as ReportUtils from '@libs/ReportUtils';
+import variables from '@styles/variables';
+import ROUTES from '@src/ROUTES';
+
+type WorkspaceUserRestrictedActionProps = {
+    policyID: string;
+};
+
+function WorkspaceUserRestrictedAction({policyID}: WorkspaceUserRestrictedActionProps) {
+    const {translate} = useLocalize();
+    const policy = usePolicy(policyID);
+    const styles = useThemeStyles();
+
+    const openPolicyExpenseReport = useCallback(() => {
+        const reportID = ReportUtils.findPolicyExpenseChatByPolicyID(policyID)?.reportID ?? '-1';
+        Navigation.closeRHPFlow();
+        Navigation.navigate(ROUTES.REPORT_WITH_ID.getRoute(reportID));
+    }, [policyID]);
+
+    return (
+        <ScreenWrapper
+            includeSafeAreaPaddingBottom
+            testID={WorkspaceUserRestrictedAction.displayName}
+        >
+            <HeaderWithBackButton
+                title={translate('workspace.restrictedAction.restricted')}
+                onBackButtonPress={Navigation.goBack}
+            />
+            <ScrollView
+                style={[styles.p5, styles.pt0]}
+                contentContainerStyle={styles.flexGrow1}
+            >
+                <View style={[styles.flex1, styles.alignItemsCenter, styles.justifyContentCenter, styles.mb15]}>
+                    <ImageSVG
+                        src={Illustrations.LockClosedOrange}
+                        width={variables.restrictedActionIllustrationHeight}
+                        height={variables.restrictedActionIllustrationHeight}
+                    />
+                    <Text style={[styles.textHeadlineH1, styles.textAlignCenter]}>
+                        {translate('workspace.restrictedAction.actionsAreCurrentlyRestricted', {workspaceName: policy?.name})}
+                    </Text>
+                    <Text style={[styles.textLabelSupportingEmptyValue, styles.textAlignCenter, styles.lh20, styles.mt2]}>
+                        {translate('workspace.restrictedAction.pleaseReachOutToYourWorkspaceAdmin')}
+                    </Text>
+                </View>
+                <Button
+                    text={translate('workspace.restrictedAction.chatWithYourAdmin')}
+                    onPress={openPolicyExpenseReport}
+                    success
+                    large
+                />
+            </ScrollView>
+        </ScreenWrapper>
+    );
+}
+
+WorkspaceUserRestrictedAction.displayName = 'WorkspaceUserRestrictedAction';
+
+export default WorkspaceUserRestrictedAction;
diff --git a/src/pages/RoomDescriptionPage.tsx b/src/pages/RoomDescriptionPage.tsx
index 3992dff188e2..6589a73c88e8 100644
--- a/src/pages/RoomDescriptionPage.tsx
+++ b/src/pages/RoomDescriptionPage.tsx
@@ -1,18 +1,19 @@
 import {useFocusEffect} from '@react-navigation/native';
-import ExpensiMark from 'expensify-common/lib/ExpensiMark';
 import React, {useCallback, useRef, useState} from 'react';
 import {View} from 'react-native';
 import type {OnyxCollection} from 'react-native-onyx';
-import FullPageNotFoundView from '@components/BlockingViews/FullPageNotFoundView';
 import FormProvider from '@components/Form/FormProvider';
 import InputWrapper from '@components/Form/InputWrapper';
 import HeaderWithBackButton from '@components/HeaderWithBackButton';
+import RenderHTML from '@components/RenderHTML';
 import ScreenWrapper from '@components/ScreenWrapper';
+import ScrollView from '@components/ScrollView';
 import Text from '@components/Text';
 import TextInput from '@components/TextInput';
 import type {BaseTextInputRef} from '@components/TextInput/BaseTextInput/types';
 import useLocalize from '@hooks/useLocalize';
 import useThemeStyles from '@hooks/useThemeStyles';
+import Parser from '@libs/Parser';
 import * as ReportUtils from '@libs/ReportUtils';
 import updateMultilineInputRange from '@libs/updateMultilineInputRange';
 import variables from '@styles/variables';
@@ -32,8 +33,7 @@ type RoomDescriptionPageProps = {
 
 function RoomDescriptionPage({report, policies}: RoomDescriptionPageProps) {
     const styles = useThemeStyles();
-    const parser = new ExpensiMark();
-    const [description, setDescription] = useState(() => parser.htmlToMarkdown(report?.description ?? ''));
+    const [description, setDescription] = useState(() => Parser.htmlToMarkdown(report?.description ?? ''));
     const reportDescriptionInputRef = useRef<BaseTextInputRef | null>(null);
     const focusTimeoutRef = useRef<ReturnType<typeof setTimeout> | null>(null);
     const {translate} = useLocalize();
@@ -61,14 +61,15 @@ function RoomDescriptionPage({report, policies}: RoomDescriptionPageProps) {
         }, []),
     );
 
+    const canEdit = ReportUtils.canEditReportDescription(report, policy);
     return (
         <ScreenWrapper
             shouldEnableMaxHeight
             includeSafeAreaPaddingBottom={false}
             testID={RoomDescriptionPage.displayName}
         >
-            <FullPageNotFoundView shouldShow={!ReportUtils.canEditReportDescription(report, policy)}>
-                <HeaderWithBackButton title={translate('reportDescriptionPage.roomDescription')} />
+            <HeaderWithBackButton title={translate('reportDescriptionPage.roomDescription')} />
+            {canEdit && (
                 <FormProvider
                     style={[styles.flexGrow1, styles.ph5]}
                     formID={ONYXKEYS.FORMS.REPORT_DESCRIPTION_FORM}
@@ -91,16 +92,24 @@ function RoomDescriptionPage({report, policies}: RoomDescriptionPageProps) {
                                 if (!el) {
                                     return;
                                 }
+                                if (!reportDescriptionInputRef.current) {
+                                    updateMultilineInputRange(el);
+                                }
                                 reportDescriptionInputRef.current = el;
-                                updateMultilineInputRange(el);
                             }}
                             value={description}
                             onChangeText={handleReportDescriptionChange}
                             autoCapitalize="none"
+                            isMarkdownEnabled
                         />
                     </View>
                 </FormProvider>
-            </FullPageNotFoundView>
+            )}
+            {!canEdit && (
+                <ScrollView style={[styles.flexGrow1, styles.ph5, styles.mb5]}>
+                    <RenderHTML html={Parser.replace(description)} />
+                </ScrollView>
+            )}
         </ScreenWrapper>
     );
 }
diff --git a/src/pages/RoomInvitePage.tsx b/src/pages/RoomInvitePage.tsx
index 139406249a5e..17239e6d4fb5 100644
--- a/src/pages/RoomInvitePage.tsx
+++ b/src/pages/RoomInvitePage.tsx
@@ -1,5 +1,5 @@
 import type {StackScreenProps} from '@react-navigation/stack';
-import Str from 'expensify-common/lib/str';
+import {Str} from 'expensify-common';
 import React, {useCallback, useEffect, useMemo, useState} from 'react';
 import type {SectionListData} from 'react-native';
 import {View} from 'react-native';
@@ -18,7 +18,9 @@ import useDebouncedState from '@hooks/useDebouncedState';
 import useLocalize from '@hooks/useLocalize';
 import useThemeStyles from '@hooks/useThemeStyles';
 import * as ReportActions from '@libs/actions/Report';
+import {READ_COMMANDS} from '@libs/API/types';
 import * as DeviceCapabilities from '@libs/DeviceCapabilities';
+import HttpUtils from '@libs/HttpUtils';
 import * as LoginUtils from '@libs/LoginUtils';
 import Navigation from '@libs/Navigation/Navigation';
 import * as OptionsListUtils from '@libs/OptionsListUtils';
@@ -53,28 +55,30 @@ function RoomInvitePage({
     const {translate} = useLocalize();
     const [searchTerm, debouncedSearchTerm, setSearchTerm] = useDebouncedState('');
     const [selectedOptions, setSelectedOptions] = useState<ReportUtils.OptionData[]>([]);
-    const [invitePersonalDetails, setInvitePersonalDetails] = useState<ReportUtils.OptionData[]>([]);
-    const [userToInvite, setUserToInvite] = useState<ReportUtils.OptionData | null>(null);
     const [isSearchingForReports] = useOnyx(ONYXKEYS.IS_SEARCHING_FOR_REPORTS, {initWithStoredValues: false});
     const {options, areOptionsInitialized} = useOptionsList();
 
     useEffect(() => {
         setSearchTerm(SearchInputManager.searchInput);
-        // eslint-disable-next-line react-hooks/exhaustive-deps
+        // eslint-disable-next-line react-compiler/react-compiler, react-hooks/exhaustive-deps
     }, []);
 
     // Any existing participants and Expensify emails should not be eligible for invitation
-    const excludedUsers = useMemo(
-        () =>
-            [...PersonalDetailsUtils.getLoginsByAccountIDs(report?.visibleChatMemberAccountIDs ?? []), ...CONST.EXPENSIFY_EMAILS].map((participant) =>
-                PhoneNumber.addSMSDomainIfPhoneNumber(participant),
-            ),
-        [report],
-    );
+    const excludedUsers = useMemo(() => {
+        const visibleParticipantAccountIDs = Object.entries(report.participants ?? {})
+            .filter(([, participant]) => participant && !participant.hidden)
+            .map(([accountID]) => Number(accountID));
+        return [...PersonalDetailsUtils.getLoginsByAccountIDs(visibleParticipantAccountIDs), ...CONST.EXPENSIFY_EMAILS].map((participant) =>
+            PhoneNumber.addSMSDomainIfPhoneNumber(participant),
+        );
+    }, [report.participants]);
 
-    useEffect(() => {
-        const inviteOptions = OptionsListUtils.getMemberInviteOptions(options.personalDetails, betas ?? [], debouncedSearchTerm, excludedUsers);
+    const defaultOptions = useMemo(() => {
+        if (!areOptionsInitialized) {
+            return {recentReports: [], personalDetails: [], userToInvite: null, currentUserOption: null, categoryOptions: [], tagOptions: [], taxRatesOptions: []};
+        }
 
+        const inviteOptions = OptionsListUtils.getMemberInviteOptions(options.personalDetails, betas ?? [], '', excludedUsers);
         // Update selectedOptions with the latest personalDetails information
         const detailsMap: Record<string, OptionsListUtils.MemberForList> = {};
         inviteOptions.personalDetails.forEach((detail) => {
@@ -88,15 +92,31 @@ function RoomInvitePage({
             newSelectedOptions.push(option.login && option.login in detailsMap ? {...detailsMap[option.login], isSelected: true} : option);
         });
 
-        setUserToInvite(inviteOptions.userToInvite);
-        setInvitePersonalDetails(inviteOptions.personalDetails);
-        setSelectedOptions(newSelectedOptions);
-        // eslint-disable-next-line react-hooks/exhaustive-deps -- we don't want to recalculate when selectedOptions change
-    }, [betas, debouncedSearchTerm, excludedUsers, options.personalDetails]);
+        return {
+            userToInvite: inviteOptions.userToInvite,
+            personalDetails: inviteOptions.personalDetails,
+            selectedOptions: newSelectedOptions,
+            recentReports: [],
+            currentUserOption: null,
+            categoryOptions: [],
+            tagOptions: [],
+            taxRatesOptions: [],
+        };
+    }, [areOptionsInitialized, betas, excludedUsers, options.personalDetails, selectedOptions]);
+
+    const inviteOptions = useMemo(() => {
+        if (debouncedSearchTerm.trim() === '') {
+            return defaultOptions;
+        }
+        const filteredOptions = OptionsListUtils.filterOptions(defaultOptions, debouncedSearchTerm, {excludeLogins: excludedUsers});
+
+        return filteredOptions;
+    }, [debouncedSearchTerm, defaultOptions, excludedUsers]);
 
     const sections = useMemo(() => {
         const sectionsArr: Sections = [];
 
+        const {personalDetails, userToInvite} = inviteOptions;
         if (!areOptionsInitialized) {
             return [];
         }
@@ -106,7 +126,7 @@ function RoomInvitePage({
         if (debouncedSearchTerm !== '') {
             filterSelectedOptions = selectedOptions.filter((option) => {
                 const accountID = option?.accountID;
-                const isOptionInPersonalDetails = invitePersonalDetails.some((personalDetail) => accountID && personalDetail?.accountID === accountID);
+                const isOptionInPersonalDetails = personalDetails ? personalDetails.some((personalDetail) => accountID && personalDetail?.accountID === accountID) : false;
                 const parsedPhoneNumber = PhoneNumber.parsePhoneNumber(LoginUtils.appendCountryCode(Str.removeSMSDomain(debouncedSearchTerm)));
                 const searchValue = parsedPhoneNumber.possible && parsedPhoneNumber.number ? parsedPhoneNumber.number.e164 : debouncedSearchTerm.toLowerCase();
                 const isPartOfSearchTerm = (option.text?.toLowerCase() ?? '').includes(searchValue) || (option.login?.toLowerCase() ?? '').includes(searchValue);
@@ -122,7 +142,7 @@ function RoomInvitePage({
 
         // Filtering out selected users from the search results
         const selectedLogins = selectedOptions.map(({login}) => login);
-        const personalDetailsWithoutSelected = invitePersonalDetails.filter(({login}) => !selectedLogins.includes(login));
+        const personalDetailsWithoutSelected = personalDetails ? personalDetails.filter(({login}) => !selectedLogins.includes(login)) : [];
         const personalDetailsFormatted = personalDetailsWithoutSelected.map((personalDetail) => OptionsListUtils.formatMemberForList(personalDetail));
         const hasUnselectedUserToInvite = userToInvite && !selectedLogins.includes(userToInvite.login);
 
@@ -139,7 +159,7 @@ function RoomInvitePage({
         }
 
         return sectionsArr;
-    }, [areOptionsInitialized, selectedOptions, debouncedSearchTerm, invitePersonalDetails, userToInvite, translate]);
+    }, [inviteOptions, areOptionsInitialized, selectedOptions, debouncedSearchTerm, translate]);
 
     const toggleOption = useCallback(
         (option: OptionsListUtils.MemberForList) => {
@@ -170,6 +190,8 @@ function RoomInvitePage({
     }, [isPolicyEmployee, reportID, role]);
     const reportName = useMemo(() => ReportUtils.getReportName(report), [report]);
     const inviteUsers = useCallback(() => {
+        HttpUtils.cancelPendingRequests(READ_COMMANDS.SEARCH_FOR_REPORTS);
+
         if (!validate()) {
             return;
         }
@@ -200,11 +222,11 @@ function RoomInvitePage({
     const headerMessage = useMemo(() => {
         const searchValue = debouncedSearchTerm.trim().toLowerCase();
         const expensifyEmails = CONST.EXPENSIFY_EMAILS as string[];
-        if (!userToInvite && expensifyEmails.includes(searchValue)) {
+        if (!inviteOptions.userToInvite && expensifyEmails.includes(searchValue)) {
             return translate('messages.errorMessageInvalidEmail');
         }
         if (
-            !userToInvite &&
+            !inviteOptions.userToInvite &&
             excludedUsers.includes(
                 PhoneNumber.parsePhoneNumber(LoginUtils.appendCountryCode(searchValue)).possible
                     ? PhoneNumber.addSMSDomainIfPhoneNumber(LoginUtils.appendCountryCode(searchValue))
@@ -213,8 +235,8 @@ function RoomInvitePage({
         ) {
             return translate('messages.userIsAlreadyMember', {login: searchValue, name: reportName});
         }
-        return OptionsListUtils.getHeaderMessage(invitePersonalDetails.length !== 0, Boolean(userToInvite), searchValue);
-    }, [debouncedSearchTerm, userToInvite, excludedUsers, invitePersonalDetails, translate, reportName]);
+        return OptionsListUtils.getHeaderMessage((inviteOptions.personalDetails ?? []).length !== 0, !!inviteOptions.userToInvite, debouncedSearchTerm);
+    }, [debouncedSearchTerm, inviteOptions.userToInvite, inviteOptions.personalDetails, excludedUsers, translate, reportName]);
 
     useEffect(() => {
         ReportActions.searchInServer(debouncedSearchTerm);
@@ -240,7 +262,7 @@ function RoomInvitePage({
                     canSelectMultiple
                     sections={sections}
                     ListItem={UserListItem}
-                    textInputLabel={translate('optionsSelector.nameEmailOrPhoneNumber')}
+                    textInputLabel={translate('selectionList.nameEmailOrPhoneNumber')}
                     textInputValue={searchTerm}
                     onChangeText={(value) => {
                         SearchInputManager.searchInput = value;
@@ -261,7 +283,6 @@ function RoomInvitePage({
                         onSubmit={inviteUsers}
                         containerStyles={[styles.flexReset, styles.flexGrow0, styles.flexShrink0, styles.flexBasisAuto, styles.mb5, styles.ph5]}
                         enabledWhenOffline
-                        disablePressOnEnter
                         isAlertVisible={false}
                     />
                 </View>
diff --git a/src/pages/RoomMembersPage.tsx b/src/pages/RoomMembersPage.tsx
index 488bde658c3f..886ebabe9885 100644
--- a/src/pages/RoomMembersPage.tsx
+++ b/src/pages/RoomMembersPage.tsx
@@ -8,6 +8,7 @@ import FullPageNotFoundView from '@components/BlockingViews/FullPageNotFoundView
 import Button from '@components/Button';
 import ConfirmModal from '@components/ConfirmModal';
 import HeaderWithBackButton from '@components/HeaderWithBackButton';
+import {FallbackAvatar} from '@components/Icon/Expensicons';
 import {usePersonalDetails} from '@components/OnyxProvider';
 import ScreenWrapper from '@components/ScreenWrapper';
 import SelectionList from '@components/SelectionList';
@@ -19,14 +20,13 @@ import useLocalize from '@hooks/useLocalize';
 import useThemeStyles from '@hooks/useThemeStyles';
 import * as DeviceCapabilities from '@libs/DeviceCapabilities';
 import localeCompare from '@libs/LocaleCompare';
-import Log from '@libs/Log';
 import Navigation from '@libs/Navigation/Navigation';
 import type {RoomMembersNavigatorParamList} from '@libs/Navigation/types';
 import * as OptionsListUtils from '@libs/OptionsListUtils';
 import * as PersonalDetailsUtils from '@libs/PersonalDetailsUtils';
 import * as PolicyUtils from '@libs/PolicyUtils';
 import * as ReportUtils from '@libs/ReportUtils';
-import * as UserUtils from '@libs/UserUtils';
+import StringUtils from '@libs/StringUtils';
 import * as Report from '@userActions/Report';
 import CONST from '@src/CONST';
 import ONYXKEYS from '@src/ONYXKEYS';
@@ -55,6 +55,8 @@ function RoomMembersPage({report, session, policies}: RoomMembersPageProps) {
     const [searchValue, setSearchValue] = useState('');
     const [didLoadRoomMembers, setDidLoadRoomMembers] = useState(false);
     const personalDetails = usePersonalDetails() || CONST.EMPTY_OBJECT;
+    const policy = useMemo(() => policies?.[`${ONYXKEYS.COLLECTION.POLICY}${report?.policyID ?? ''}`], [policies, report?.policyID]);
+    const isPolicyExpenseChat = useMemo(() => ReportUtils.isPolicyExpenseChat(report), [report]);
 
     const isFocusedScreen = useIsFocused();
 
@@ -82,7 +84,7 @@ function RoomMembersPage({report, session, policies}: RoomMembersPageProps) {
 
     useEffect(() => {
         getRoomMembers();
-        // eslint-disable-next-line react-hooks/exhaustive-deps
+        // eslint-disable-next-line react-compiler/react-compiler, react-hooks/exhaustive-deps
     }, []);
 
     /**
@@ -167,55 +169,40 @@ function RoomMembersPage({report, session, policies}: RoomMembersPageProps) {
     const getMemberOptions = (): ListItem[] => {
         let result: ListItem[] = [];
 
-        report?.visibleChatMemberAccountIDs?.forEach((accountID) => {
-            const details = personalDetails[accountID];
+        const participants = ReportUtils.getParticipantsList(report, personalDetails, true);
 
-            if (!details) {
-                Log.hmmm(`[RoomMembersPage] no personal details found for room member with accountID: ${accountID}`);
-                return;
-            }
+        participants.forEach((accountID) => {
+            const details = personalDetails[accountID];
 
             // If search value is provided, filter out members that don't match the search value
-            if (searchValue.trim()) {
-                let memberDetails = '';
-                if (details.login) {
-                    memberDetails += ` ${details.login.toLowerCase()}`;
-                }
-                if (details.firstName) {
-                    memberDetails += ` ${details.firstName.toLowerCase()}`;
-                }
-                if (details.lastName) {
-                    memberDetails += ` ${details.lastName.toLowerCase()}`;
-                }
-                if (details.displayName) {
-                    memberDetails += ` ${PersonalDetailsUtils.getDisplayNameOrDefault(details).toLowerCase()}`;
-                }
-                if (details.phoneNumber) {
-                    memberDetails += ` ${details.phoneNumber.toLowerCase()}`;
-                }
-
-                if (!OptionsListUtils.isSearchStringMatch(searchValue.trim(), memberDetails)) {
-                    return;
-                }
+            if (!details || (searchValue.trim() && !OptionsListUtils.isSearchStringMatchUserDetails(details, searchValue))) {
+                return;
             }
             const pendingChatMember = report?.pendingChatMembers?.findLast((member) => member.accountID === accountID.toString());
+            const isAdmin = !!(policy && policy.employeeList && details.login && policy.employeeList[details.login]?.role === CONST.POLICY.ROLE.ADMIN);
+            const isDisabled =
+                (isPolicyExpenseChat && isAdmin) ||
+                accountID === session?.accountID ||
+                pendingChatMember?.pendingAction === CONST.RED_BRICK_ROAD_PENDING_ACTION.DELETE ||
+                details.accountID === report.ownerAccountID;
 
             result.push({
                 keyForList: String(accountID),
                 accountID,
                 isSelected: selectedMembers.includes(accountID),
-                isDisabled: accountID === session?.accountID || pendingChatMember?.pendingAction === CONST.RED_BRICK_ROAD_PENDING_ACTION.DELETE,
+                isDisabled,
                 text: formatPhoneNumber(PersonalDetailsUtils.getDisplayNameOrDefault(details)),
                 alternateText: details?.login ? formatPhoneNumber(details.login) : '',
                 icons: [
                     {
-                        source: UserUtils.getAvatar(details.avatar, accountID),
+                        source: details.avatar ?? FallbackAvatar,
                         name: details.login ?? '',
                         type: CONST.ICON_TYPE_AVATAR,
-                        id: Number(accountID),
+                        id: accountID,
                     },
                 ],
                 pendingAction: pendingChatMember?.pendingAction,
+                errors: pendingChatMember?.errors,
             });
         });
 
@@ -224,6 +211,13 @@ function RoomMembersPage({report, session, policies}: RoomMembersPageProps) {
         return result;
     };
 
+    const dismissError = useCallback(
+        (item: ListItem) => {
+            Report.clearAddRoomMemberError(report.reportID, String(item.accountID ?? '-1'));
+        },
+        [report.reportID],
+    );
+
     const isPolicyEmployee = useMemo(() => {
         if (!report?.policyID || policies === null) {
             return false;
@@ -249,7 +243,7 @@ function RoomMembersPage({report, session, policies}: RoomMembersPageProps) {
             >
                 <HeaderWithBackButton
                     title={translate('workspace.common.members')}
-                    subtitle={ReportUtils.getReportName(report)}
+                    subtitle={StringUtils.lineBreaksToSpaces(ReportUtils.getReportName(report))}
                     onBackButtonPress={() => {
                         setSearchValue('');
                         Navigation.goBack(ROUTES.REPORT_WITH_ID_DETAILS.getRoute(report.reportID));
@@ -286,7 +280,7 @@ function RoomMembersPage({report, session, policies}: RoomMembersPageProps) {
                         <SelectionList
                             canSelectMultiple
                             sections={[{data, isDisabled: false}]}
-                            textInputLabel={translate('optionsSelector.findMember')}
+                            textInputLabel={translate('selectionList.findMember')}
                             disableKeyboardShortcuts={removeMembersConfirmModalVisible}
                             textInputValue={searchValue}
                             onChangeText={(value) => {
@@ -300,6 +294,7 @@ function RoomMembersPage({report, session, policies}: RoomMembersPageProps) {
                             showScrollIndicator
                             shouldPreventDefaultFocusOnSelectRow={!DeviceCapabilities.canUseTouchScreen()}
                             ListItem={UserListItem}
+                            onDismissError={dismissError}
                         />
                     </View>
                 </View>
diff --git a/src/pages/Search/AdvancedSearchFilters.tsx b/src/pages/Search/AdvancedSearchFilters.tsx
new file mode 100644
index 000000000000..baebe821d101
--- /dev/null
+++ b/src/pages/Search/AdvancedSearchFilters.tsx
@@ -0,0 +1,261 @@
+import {Str} from 'expensify-common';
+import React, {useMemo} from 'react';
+import {View} from 'react-native';
+import {useOnyx} from 'react-native-onyx';
+import FormAlertWithSubmitButton from '@components/FormAlertWithSubmitButton';
+import type {LocaleContextProps} from '@components/LocaleContextProvider';
+import MenuItemWithTopDescription from '@components/MenuItemWithTopDescription';
+import {usePersonalDetails} from '@components/OnyxProvider';
+import ScrollView from '@components/ScrollView';
+import type {AdvancedFiltersKeys} from '@components/Search/types';
+import useLocalize from '@hooks/useLocalize';
+import useSingleExecution from '@hooks/useSingleExecution';
+import useThemeStyles from '@hooks/useThemeStyles';
+import useWaitForNavigation from '@hooks/useWaitForNavigation';
+import {convertToDisplayStringWithoutCurrency} from '@libs/CurrencyUtils';
+import Navigation from '@libs/Navigation/Navigation';
+import * as PersonalDetailsUtils from '@libs/PersonalDetailsUtils';
+import {getAllTaxRates} from '@libs/PolicyUtils';
+import * as SearchUtils from '@libs/SearchUtils';
+import * as SearchActions from '@userActions/Search';
+import CONST from '@src/CONST';
+import ONYXKEYS from '@src/ONYXKEYS';
+import ROUTES from '@src/ROUTES';
+import type {SearchAdvancedFiltersForm} from '@src/types/form';
+import type {CardList, PersonalDetailsList} from '@src/types/onyx';
+
+function getFilterCardDisplayTitle(filters: Partial<SearchAdvancedFiltersForm>, cards: CardList) {
+    const filterValue = filters[CONST.SEARCH.SYNTAX_FILTER_KEYS.CARD_ID];
+    return filterValue
+        ? Object.values(cards)
+              .filter((card) => filterValue.includes(card.cardID.toString()))
+              .map((card) => card.bank)
+              .join(', ')
+        : undefined;
+}
+
+function getFilterParticipantDisplayTitle(accountIDs: string[], personalDetails: PersonalDetailsList) {
+    const selectedPersonalDetails = accountIDs.map((id) => personalDetails[id]);
+
+    return selectedPersonalDetails
+        .map((personalDetail) => {
+            if (!personalDetail) {
+                return '';
+            }
+
+            return PersonalDetailsUtils.createDisplayName(personalDetail.login ?? '', personalDetail);
+        })
+        .join(', ');
+}
+
+function getFilterDisplayTitle(filters: Partial<SearchAdvancedFiltersForm>, fieldName: AdvancedFiltersKeys, translate: LocaleContextProps['translate']) {
+    if (fieldName === CONST.SEARCH.SYNTAX_FILTER_KEYS.DATE) {
+        // the value of date filter is a combination of dateBefore + dateAfter values
+        const {dateAfter, dateBefore} = filters;
+        let dateValue = '';
+        if (dateBefore) {
+            dateValue = translate('search.filters.date.before', dateBefore);
+        }
+        if (dateBefore && dateAfter) {
+            dateValue += ', ';
+        }
+        if (dateAfter) {
+            dateValue += translate('search.filters.date.after', dateAfter);
+        }
+
+        return dateValue;
+    }
+
+    if (fieldName === CONST.SEARCH.SYNTAX_FILTER_KEYS.AMOUNT) {
+        const {lessThan, greaterThan} = filters;
+        if (lessThan && greaterThan) {
+            return translate('search.filters.amount.between', convertToDisplayStringWithoutCurrency(Number(greaterThan)), convertToDisplayStringWithoutCurrency(Number(lessThan)));
+        }
+        if (lessThan) {
+            return translate('search.filters.amount.lessThan', convertToDisplayStringWithoutCurrency(Number(lessThan)));
+        }
+        if (greaterThan) {
+            return translate('search.filters.amount.greaterThan', convertToDisplayStringWithoutCurrency(Number(greaterThan)));
+        }
+    }
+
+    if (
+        (fieldName === CONST.SEARCH.SYNTAX_FILTER_KEYS.CATEGORY || fieldName === CONST.SEARCH.SYNTAX_FILTER_KEYS.CURRENCY || fieldName === CONST.SEARCH.SYNTAX_FILTER_KEYS.TAG) &&
+        filters[fieldName]
+    ) {
+        const filterArray = filters[fieldName] ?? [];
+        return filterArray.join(', ');
+    }
+
+    if (fieldName === CONST.SEARCH.SYNTAX_FILTER_KEYS.DESCRIPTION) {
+        return filters[fieldName];
+    }
+
+    // Todo Once all Advanced filters are implemented this line can be cleaned up. See: https://github.com/Expensify/App/issues/45026
+    // @ts-expect-error this property access is temporarily an error, because not every SYNTAX_FILTER_KEYS is handled by form.
+    // When all filters are updated here: src/types/form/SearchAdvancedFiltersForm.ts this line comment + type cast can be removed.
+    const filterValue = filters[fieldName] as string;
+    return filterValue ? Str.recapitalize(filterValue) : undefined;
+}
+
+function getFilterTaxRateDisplayTitle(filters: Partial<SearchAdvancedFiltersForm>, taxRates: Record<string, string[]>) {
+    const selectedTaxRateKeys = filters[CONST.SEARCH.SYNTAX_FILTER_KEYS.TAX_RATE];
+    if (!selectedTaxRateKeys) {
+        return undefined;
+    }
+
+    const result: string[] = [];
+    Object.entries(taxRates).forEach(([taxRateName, taxRateKeys]) => {
+        if (!taxRateKeys.some((taxRateKey) => selectedTaxRateKeys.includes(taxRateKey)) || result.includes(taxRateName)) {
+            return;
+        }
+        result.push(taxRateName);
+    });
+
+    return result.join(', ');
+}
+
+function getExpenseTypeDisplayTitle(filters: Partial<SearchAdvancedFiltersForm>, translate: LocaleContextProps['translate']) {
+    const filterValue = filters[CONST.SEARCH.SYNTAX_FILTER_KEYS.EXPENSE_TYPE];
+    return filterValue
+        ? Object.values(CONST.SEARCH.TRANSACTION_TYPE)
+              .filter((expenseType) => filterValue.includes(expenseType))
+              .map((expenseType) => translate(SearchUtils.getExpenseTypeTranslationKey(expenseType)))
+              .join(', ')
+        : undefined;
+}
+
+function AdvancedSearchFilters() {
+    const {translate} = useLocalize();
+    const styles = useThemeStyles();
+    const {singleExecution} = useSingleExecution();
+    const waitForNavigate = useWaitForNavigation();
+
+    const [searchAdvancedFilters = {} as SearchAdvancedFiltersForm] = useOnyx(ONYXKEYS.FORMS.SEARCH_ADVANCED_FILTERS_FORM);
+    const [cardList = {}] = useOnyx(ONYXKEYS.CARD_LIST);
+    const taxRates = getAllTaxRates();
+    const personalDetails = usePersonalDetails();
+
+    const advancedFilters = useMemo(
+        () => [
+            {
+                title: getFilterDisplayTitle(searchAdvancedFilters, CONST.SEARCH.SYNTAX_FILTER_KEYS.DATE, translate),
+                description: 'common.date' as const,
+                route: ROUTES.SEARCH_ADVANCED_FILTERS_DATE,
+            },
+            {
+                title: getFilterDisplayTitle(searchAdvancedFilters, CONST.SEARCH.SYNTAX_FILTER_KEYS.CURRENCY, translate),
+                description: 'common.currency' as const,
+                route: ROUTES.SEARCH_ADVANCED_FILTERS_CURRENCY,
+            },
+            {
+                title: getFilterDisplayTitle(searchAdvancedFilters, CONST.SEARCH.SYNTAX_FILTER_KEYS.MERCHANT, translate),
+                description: 'common.merchant' as const,
+                route: ROUTES.SEARCH_ADVANCED_FILTERS_MERCHANT,
+            },
+            {
+                title: getFilterDisplayTitle(searchAdvancedFilters, CONST.SEARCH.SYNTAX_FILTER_KEYS.DESCRIPTION, translate),
+                description: 'common.description' as const,
+                route: ROUTES.SEARCH_ADVANCED_FILTERS_DESCRIPTION,
+            },
+            {
+                title: getFilterDisplayTitle(searchAdvancedFilters, CONST.SEARCH.SYNTAX_FILTER_KEYS.REPORT_ID, translate),
+                description: 'common.reportID' as const,
+                route: ROUTES.SEARCH_ADVANCED_FILTERS_REPORT_ID,
+            },
+            {
+                title: getFilterDisplayTitle(searchAdvancedFilters, CONST.SEARCH.SYNTAX_FILTER_KEYS.AMOUNT, translate),
+                description: 'common.total' as const,
+                route: ROUTES.SEARCH_ADVANCED_FILTERS_AMOUNT,
+            },
+            {
+                title: getFilterDisplayTitle(searchAdvancedFilters, CONST.SEARCH.SYNTAX_FILTER_KEYS.CATEGORY, translate),
+                description: 'common.category' as const,
+                route: ROUTES.SEARCH_ADVANCED_FILTERS_CATEGORY,
+            },
+            {
+                title: getFilterDisplayTitle(searchAdvancedFilters, CONST.SEARCH.SYNTAX_FILTER_KEYS.KEYWORD, translate),
+                description: 'search.filters.hasKeywords' as const,
+                route: ROUTES.SEARCH_ADVANCED_FILTERS_KEYWORD,
+            },
+            {
+                title: getFilterCardDisplayTitle(searchAdvancedFilters, cardList),
+                description: 'common.card' as const,
+                route: ROUTES.SEARCH_ADVANCED_FILTERS_CARD,
+                shouldHide: Object.keys(cardList).length === 0,
+            },
+            {
+                title: getFilterTaxRateDisplayTitle(searchAdvancedFilters, taxRates),
+                description: 'workspace.taxes.taxRate' as const,
+                route: ROUTES.SEARCH_ADVANCED_FILTERS_TAX_RATE,
+            },
+            {
+                title: getExpenseTypeDisplayTitle(searchAdvancedFilters, translate),
+                description: 'search.expenseType' as const,
+                route: ROUTES.SEARCH_ADVANCED_FILTERS_EXPENSE_TYPE,
+            },
+            {
+                title: getFilterDisplayTitle(searchAdvancedFilters, CONST.SEARCH.SYNTAX_FILTER_KEYS.TAG, translate),
+                description: 'common.tag' as const,
+                route: ROUTES.SEARCH_ADVANCED_FILTERS_TAG,
+            },
+            {
+                title: getFilterParticipantDisplayTitle(searchAdvancedFilters.from ?? [], personalDetails),
+                description: 'common.from' as const,
+                route: ROUTES.SEARCH_ADVANCED_FILTERS_FROM,
+            },
+            {
+                title: getFilterParticipantDisplayTitle(searchAdvancedFilters.to ?? [], personalDetails),
+                description: 'common.to' as const,
+                route: ROUTES.SEARCH_ADVANCED_FILTERS_TO,
+            },
+        ],
+        [searchAdvancedFilters, translate, cardList, taxRates, personalDetails],
+    );
+
+    const onFormSubmit = () => {
+        const query = SearchUtils.buildQueryStringFromFilters(searchAdvancedFilters);
+        SearchActions.clearAdvancedFilters();
+        Navigation.dismissModal();
+        Navigation.navigate(
+            ROUTES.SEARCH_CENTRAL_PANE.getRoute({
+                query,
+                isCustomQuery: true,
+            }),
+        );
+    };
+
+    return (
+        <>
+            <ScrollView contentContainerStyle={[styles.flexGrow1, styles.justifyContentBetween]}>
+                <View>
+                    {advancedFilters.map((item) => {
+                        const onPress = singleExecution(waitForNavigate(() => Navigation.navigate(item.route)));
+                        if (item.shouldHide) {
+                            return undefined;
+                        }
+                        return (
+                            <MenuItemWithTopDescription
+                                key={item.description}
+                                title={item.title}
+                                description={translate(item.description)}
+                                shouldShowRightIcon
+                                onPress={onPress}
+                            />
+                        );
+                    })}
+                </View>
+            </ScrollView>
+            <FormAlertWithSubmitButton
+                buttonText={translate('search.viewResults')}
+                containerStyles={[styles.m4, styles.mb5]}
+                onSubmit={onFormSubmit}
+                enabledWhenOffline
+            />
+        </>
+    );
+}
+
+AdvancedSearchFilters.displayName = 'AdvancedSearchFilters';
+
+export default AdvancedSearchFilters;
diff --git a/src/pages/Search/EmptySearchView.tsx b/src/pages/Search/EmptySearchView.tsx
index bfeb46f06298..88b2a38b3603 100644
--- a/src/pages/Search/EmptySearchView.tsx
+++ b/src/pages/Search/EmptySearchView.tsx
@@ -1,16 +1,63 @@
-import React from 'react';
+import React, {useMemo} from 'react';
+import EmptyStateComponent from '@components/EmptyStateComponent';
 import * as Illustrations from '@components/Icon/Illustrations';
-import WorkspaceEmptyStateSection from '@components/WorkspaceEmptyStateSection';
+import SearchRowSkeleton from '@components/Skeletons/SearchRowSkeleton';
 import useLocalize from '@hooks/useLocalize';
+import useStyleUtils from '@hooks/useStyleUtils';
+import useTheme from '@hooks/useTheme';
+import Navigation from '@libs/Navigation/Navigation';
+import variables from '@styles/variables';
+import CONST from '@src/CONST';
+import ROUTES from '@src/ROUTES';
+import type {SearchDataTypes} from '@src/types/onyx/SearchResults';
 
-function EmptySearchView() {
+type EmptySearchViewProps = {
+    type: SearchDataTypes;
+};
+
+function EmptySearchView({type}: EmptySearchViewProps) {
+    const theme = useTheme();
+    const StyleUtils = useStyleUtils();
     const {translate} = useLocalize();
 
+    const content = useMemo(() => {
+        switch (type) {
+            case CONST.SEARCH.DATA_TYPES.TRIP:
+                return {
+                    headerMedia: Illustrations.EmptyStateTravel,
+                    headerStyles: StyleUtils.getBackgroundColorStyle(theme.travelBG),
+                    headerContentStyles: StyleUtils.getWidthAndHeightStyle(variables.w191, variables.h172),
+                    title: translate('search.searchResults.emptyTripResults.title'),
+                    subtitle: translate('search.searchResults.emptyTripResults.subtitle'),
+                    buttonText: translate('search.searchResults.emptyTripResults.buttonText'),
+                    buttonAction: () => Navigation.navigate(ROUTES.TRAVEL_MY_TRIPS),
+                };
+            case CONST.SEARCH.DATA_TYPES.EXPENSE:
+            case CONST.SEARCH.DATA_TYPES.INVOICE:
+            default:
+                return {
+                    headerMedia: Illustrations.EmptyState,
+                    headerStyles: StyleUtils.getBackgroundColorStyle(theme.emptyFolderBG),
+                    headerContentStyles: StyleUtils.getWidthAndHeightStyle(variables.w184, variables.h112),
+                    title: translate('search.searchResults.emptyResults.title'),
+                    subtitle: translate('search.searchResults.emptyResults.subtitle'),
+                    buttonText: undefined,
+                    buttonAction: undefined,
+                };
+        }
+    }, [type, StyleUtils, translate, theme]);
+
     return (
-        <WorkspaceEmptyStateSection
-            icon={Illustrations.EmptyStateExpenses}
-            title={translate('search.searchResults.emptyResults.title')}
-            subtitle={translate('search.searchResults.emptyResults.subtitle')}
+        <EmptyStateComponent
+            SkeletonComponent={SearchRowSkeleton}
+            headerMediaType={CONST.EMPTY_STATE_MEDIA.ILLUSTRATION}
+            headerMedia={content.headerMedia}
+            headerStyles={content.headerStyles}
+            headerContentStyles={content.headerContentStyles}
+            title={content.title}
+            subtitle={content.subtitle}
+            buttonText={content.buttonText}
+            buttonAction={content.buttonAction}
         />
     );
 }
diff --git a/src/pages/Search/SearchAdvancedFiltersPage.tsx b/src/pages/Search/SearchAdvancedFiltersPage.tsx
new file mode 100644
index 000000000000..28241b143a9f
--- /dev/null
+++ b/src/pages/Search/SearchAdvancedFiltersPage.tsx
@@ -0,0 +1,27 @@
+import React from 'react';
+import HeaderWithBackButton from '@components/HeaderWithBackButton';
+import ScreenWrapper from '@components/ScreenWrapper';
+import useLocalize from '@hooks/useLocalize';
+import useThemeStyles from '@hooks/useThemeStyles';
+import AdvancedSearchFilters from './AdvancedSearchFilters';
+
+function SearchAdvancedFiltersPage() {
+    const styles = useThemeStyles();
+    const {translate} = useLocalize();
+
+    return (
+        <ScreenWrapper
+            testID={SearchAdvancedFiltersPage.displayName}
+            shouldShowOfflineIndicatorInWideScreen
+            offlineIndicatorStyle={styles.mtAuto}
+            includeSafeAreaPaddingBottom={false}
+        >
+            <HeaderWithBackButton title={translate('search.filtersHeader')} />
+            <AdvancedSearchFilters />
+        </ScreenWrapper>
+    );
+}
+
+SearchAdvancedFiltersPage.displayName = 'SearchAdvancedFiltersPage';
+
+export default SearchAdvancedFiltersPage;
diff --git a/src/pages/Search/SearchAdvancedFiltersPage/SearchFiltersAmountPage.tsx b/src/pages/Search/SearchAdvancedFiltersPage/SearchFiltersAmountPage.tsx
new file mode 100644
index 000000000000..56eb3dce4350
--- /dev/null
+++ b/src/pages/Search/SearchAdvancedFiltersPage/SearchFiltersAmountPage.tsx
@@ -0,0 +1,92 @@
+import React from 'react';
+import {View} from 'react-native';
+import {useOnyx} from 'react-native-onyx';
+import AmountWithoutCurrencyForm from '@components/AmountWithoutCurrencyForm';
+import FormProvider from '@components/Form/FormProvider';
+import InputWrapper from '@components/Form/InputWrapper';
+import type {FormOnyxValues} from '@components/Form/types';
+import HeaderWithBackButton from '@components/HeaderWithBackButton';
+import ScreenWrapper from '@components/ScreenWrapper';
+import useAutoFocusInput from '@hooks/useAutoFocusInput';
+import useLocalize from '@hooks/useLocalize';
+import useThemeStyles from '@hooks/useThemeStyles';
+import {updateAdvancedFilters} from '@libs/actions/Search';
+import {convertToBackendAmount, convertToFrontendAmountAsString} from '@libs/CurrencyUtils';
+import Navigation from '@libs/Navigation/Navigation';
+import CONST from '@src/CONST';
+import ONYXKEYS from '@src/ONYXKEYS';
+import ROUTES from '@src/ROUTES';
+import INPUT_IDS from '@src/types/form/SearchAdvancedFiltersForm';
+
+function SearchFiltersAmountPage() {
+    const styles = useThemeStyles();
+    const {translate} = useLocalize();
+
+    const [searchAdvancedFiltersForm] = useOnyx(ONYXKEYS.FORMS.SEARCH_ADVANCED_FILTERS_FORM);
+    const greaterThan = searchAdvancedFiltersForm?.[INPUT_IDS.GREATER_THAN];
+    const greaterThanFormattedAmount = greaterThan ? convertToFrontendAmountAsString(Number(greaterThan)) : undefined;
+    const lessThan = searchAdvancedFiltersForm?.[INPUT_IDS.LESS_THAN];
+    const lessThanFormattedAmount = lessThan ? convertToFrontendAmountAsString(Number(lessThan)) : undefined;
+    const {inputCallbackRef} = useAutoFocusInput();
+
+    const updateAmountFilter = (values: FormOnyxValues<typeof ONYXKEYS.FORMS.SEARCH_ADVANCED_FILTERS_FORM>) => {
+        const greater = values[INPUT_IDS.GREATER_THAN];
+        const greaterThanBackendAmount = greater ? convertToBackendAmount(Number(greater)) : '';
+        const less = values[INPUT_IDS.LESS_THAN];
+        const lessThanBackendAmount = less ? convertToBackendAmount(Number(less)) : '';
+        updateAdvancedFilters({greaterThan: greaterThanBackendAmount?.toString(), lessThan: lessThanBackendAmount?.toString()});
+        Navigation.goBack(ROUTES.SEARCH_ADVANCED_FILTERS);
+    };
+
+    return (
+        <ScreenWrapper
+            testID={SearchFiltersAmountPage.displayName}
+            shouldShowOfflineIndicatorInWideScreen
+            offlineIndicatorStyle={styles.mtAuto}
+            includeSafeAreaPaddingBottom={false}
+            shouldEnableMaxHeight
+        >
+            <HeaderWithBackButton
+                title={translate('common.total')}
+                onBackButtonPress={() => {
+                    Navigation.goBack(ROUTES.SEARCH_ADVANCED_FILTERS);
+                }}
+            />
+            <FormProvider
+                style={[styles.flex1, styles.ph5]}
+                formID={ONYXKEYS.FORMS.SEARCH_ADVANCED_FILTERS_FORM}
+                onSubmit={updateAmountFilter}
+                submitButtonText={translate('common.save')}
+                enabledWhenOffline
+            >
+                <View style={styles.mb5}>
+                    <InputWrapper
+                        InputComponent={AmountWithoutCurrencyForm}
+                        inputID={INPUT_IDS.GREATER_THAN}
+                        name={INPUT_IDS.GREATER_THAN}
+                        defaultValue={greaterThanFormattedAmount}
+                        label={translate('search.filters.amount.greaterThan')}
+                        accessibilityLabel={translate('search.filters.amount.greaterThan')}
+                        role={CONST.ROLE.PRESENTATION}
+                        ref={inputCallbackRef}
+                    />
+                </View>
+                <View style={styles.mb5}>
+                    <InputWrapper
+                        InputComponent={AmountWithoutCurrencyForm}
+                        inputID={INPUT_IDS.LESS_THAN}
+                        name={INPUT_IDS.LESS_THAN}
+                        defaultValue={lessThanFormattedAmount}
+                        label={translate('search.filters.amount.lessThan')}
+                        accessibilityLabel={translate('search.filters.amount.lessThan')}
+                        role={CONST.ROLE.PRESENTATION}
+                    />
+                </View>
+            </FormProvider>
+        </ScreenWrapper>
+    );
+}
+
+SearchFiltersAmountPage.displayName = 'SearchFiltersAmountPage';
+
+export default SearchFiltersAmountPage;
diff --git a/src/pages/Search/SearchAdvancedFiltersPage/SearchFiltersCardPage.tsx b/src/pages/Search/SearchAdvancedFiltersPage/SearchFiltersCardPage.tsx
new file mode 100644
index 000000000000..b759e5eaa517
--- /dev/null
+++ b/src/pages/Search/SearchAdvancedFiltersPage/SearchFiltersCardPage.tsx
@@ -0,0 +1,117 @@
+import React, {useCallback, useMemo, useState} from 'react';
+import {View} from 'react-native';
+import {useOnyx} from 'react-native-onyx';
+import Button from '@components/Button';
+import HeaderWithBackButton from '@components/HeaderWithBackButton';
+import getBankIcon from '@components/Icon/BankIcons';
+import type {BankName} from '@components/Icon/BankIconsUtils';
+import ScreenWrapper from '@components/ScreenWrapper';
+import SelectionList from '@components/SelectionList';
+import CardListItem from '@components/SelectionList/CardListItem';
+import useLocalize from '@hooks/useLocalize';
+import useThemeStyles from '@hooks/useThemeStyles';
+import type {CategorySection} from '@libs/OptionsListUtils';
+import type {OptionData} from '@libs/ReportUtils';
+import Navigation from '@navigation/Navigation';
+import * as SearchActions from '@userActions/Search';
+import ONYXKEYS from '@src/ONYXKEYS';
+import ROUTES from '@src/ROUTES';
+
+function SearchFiltersCardPage() {
+    const styles = useThemeStyles();
+    const {translate} = useLocalize();
+
+    const [cardList] = useOnyx(ONYXKEYS.CARD_LIST);
+    const [searchAdvancedFiltersForm] = useOnyx(ONYXKEYS.FORMS.SEARCH_ADVANCED_FILTERS_FORM);
+    const currentCards = searchAdvancedFiltersForm?.cardID;
+    const [newCards, setNewCards] = useState(currentCards ?? []);
+
+    const sections = useMemo(() => {
+        const newSections: CategorySection[] = [];
+        const cards = Object.values(cardList ?? {})
+            .sort((a, b) => a.bank.localeCompare(b.bank))
+            .map((card) => {
+                const icon = getBankIcon({bankName: card.bank as BankName, isCard: true, styles});
+
+                return {
+                    lastFourPAN: card.lastFourPAN,
+                    text: card.bank,
+                    keyForList: card.cardID.toString(),
+                    isSelected: newCards.includes(card.cardID.toString()),
+                    bankIcon: icon,
+                };
+            });
+        newSections.push({
+            title: undefined,
+            data: cards,
+            shouldShow: cards.length > 0,
+        });
+        return newSections;
+    }, [cardList, styles, newCards]);
+
+    const handleConfirmSelection = useCallback(() => {
+        SearchActions.updateAdvancedFilters({
+            cardID: newCards,
+        });
+
+        Navigation.goBack(ROUTES.SEARCH_ADVANCED_FILTERS);
+    }, [newCards]);
+
+    const updateNewCards = useCallback(
+        (item: Partial<OptionData>) => {
+            if (!item.keyForList) {
+                return;
+            }
+            if (item.isSelected) {
+                setNewCards(newCards.filter((card) => card !== item.keyForList));
+            } else {
+                setNewCards([...newCards, item.keyForList]);
+            }
+        },
+        [newCards],
+    );
+
+    const footerContent = useMemo(
+        () => (
+            <Button
+                success
+                text={translate('common.save')}
+                pressOnEnter
+                onPress={handleConfirmSelection}
+                large
+            />
+        ),
+        [translate, handleConfirmSelection],
+    );
+
+    return (
+        <ScreenWrapper
+            testID={SearchFiltersCardPage.displayName}
+            shouldShowOfflineIndicatorInWideScreen
+            offlineIndicatorStyle={styles.mtAuto}
+            shouldEnableMaxHeight
+        >
+            <HeaderWithBackButton
+                title={translate('common.card')}
+                onBackButtonPress={() => {
+                    Navigation.goBack(ROUTES.SEARCH_ADVANCED_FILTERS);
+                }}
+            />
+            <View style={[styles.flex1]}>
+                <SelectionList
+                    sections={sections}
+                    onSelectRow={updateNewCards}
+                    footerContent={footerContent}
+                    shouldStopPropagation
+                    shouldShowTooltips
+                    canSelectMultiple
+                    ListItem={CardListItem}
+                />
+            </View>
+        </ScreenWrapper>
+    );
+}
+
+SearchFiltersCardPage.displayName = 'SearchFiltersCardPage';
+
+export default SearchFiltersCardPage;
diff --git a/src/pages/Search/SearchAdvancedFiltersPage/SearchFiltersCategoryPage.tsx b/src/pages/Search/SearchAdvancedFiltersPage/SearchFiltersCategoryPage.tsx
new file mode 100644
index 000000000000..1e37cdc60296
--- /dev/null
+++ b/src/pages/Search/SearchAdvancedFiltersPage/SearchFiltersCategoryPage.tsx
@@ -0,0 +1,65 @@
+import React, {useCallback, useMemo} from 'react';
+import {View} from 'react-native';
+import {useOnyx} from 'react-native-onyx';
+import HeaderWithBackButton from '@components/HeaderWithBackButton';
+import ScreenWrapper from '@components/ScreenWrapper';
+import SearchMultipleSelectionPicker from '@components/Search/SearchMultipleSelectionPicker';
+import useLocalize from '@hooks/useLocalize';
+import useSafePaddingBottomStyle from '@hooks/useSafePaddingBottomStyle';
+import useThemeStyles from '@hooks/useThemeStyles';
+import Navigation from '@libs/Navigation/Navigation';
+import * as SearchActions from '@userActions/Search';
+import ONYXKEYS from '@src/ONYXKEYS';
+import ROUTES from '@src/ROUTES';
+
+function SearchFiltersCategoryPage() {
+    const styles = useThemeStyles();
+    const {translate} = useLocalize();
+
+    const [searchAdvancedFiltersForm] = useOnyx(ONYXKEYS.FORMS.SEARCH_ADVANCED_FILTERS_FORM);
+    const selectedCategoriesItems = searchAdvancedFiltersForm?.category?.map((category) => ({name: category, value: category}));
+    const policyID = searchAdvancedFiltersForm?.policyID ?? '-1';
+    const [allPolicyIDCategories] = useOnyx(ONYXKEYS.COLLECTION.POLICY_CATEGORIES);
+    const singlePolicyCategories = allPolicyIDCategories?.[`${ONYXKEYS.COLLECTION.POLICY_CATEGORIES}${policyID}`];
+
+    const categoryItems = useMemo(() => {
+        if (!singlePolicyCategories) {
+            const uniqueCategoryNames = new Set<string>();
+            Object.values(allPolicyIDCategories ?? {}).map((policyCategories) => Object.values(policyCategories ?? {}).forEach((category) => uniqueCategoryNames.add(category.name)));
+            return Array.from(uniqueCategoryNames).map((categoryName) => ({name: categoryName, value: categoryName}));
+        }
+        return Object.values(singlePolicyCategories ?? {}).map((category) => ({name: category.name, value: category.name}));
+    }, [allPolicyIDCategories, singlePolicyCategories]);
+
+    const onSaveSelection = useCallback((values: string[]) => SearchActions.updateAdvancedFilters({category: values}), []);
+    const safePaddingBottomStyle = useSafePaddingBottomStyle();
+
+    return (
+        <ScreenWrapper
+            testID={SearchFiltersCategoryPage.displayName}
+            shouldShowOfflineIndicatorInWideScreen
+            offlineIndicatorStyle={styles.mtAuto}
+            includeSafeAreaPaddingBottom={false}
+            shouldEnableMaxHeight
+        >
+            <HeaderWithBackButton
+                title={translate('common.category')}
+                onBackButtonPress={() => {
+                    Navigation.goBack(ROUTES.SEARCH_ADVANCED_FILTERS);
+                }}
+            />
+            <View style={[styles.flex1, safePaddingBottomStyle]}>
+                <SearchMultipleSelectionPicker
+                    pickerTitle={translate('common.category')}
+                    items={categoryItems}
+                    initiallySelectedItems={selectedCategoriesItems}
+                    onSaveSelection={onSaveSelection}
+                />
+            </View>
+        </ScreenWrapper>
+    );
+}
+
+SearchFiltersCategoryPage.displayName = 'SearchFiltersCategoryPage';
+
+export default SearchFiltersCategoryPage;
diff --git a/src/pages/Search/SearchAdvancedFiltersPage/SearchFiltersCurrencyPage.tsx b/src/pages/Search/SearchAdvancedFiltersPage/SearchFiltersCurrencyPage.tsx
new file mode 100644
index 000000000000..b503a27b76fe
--- /dev/null
+++ b/src/pages/Search/SearchAdvancedFiltersPage/SearchFiltersCurrencyPage.tsx
@@ -0,0 +1,71 @@
+import React, {useMemo} from 'react';
+import {View} from 'react-native';
+import {useOnyx} from 'react-native-onyx';
+import HeaderWithBackButton from '@components/HeaderWithBackButton';
+import ScreenWrapper from '@components/ScreenWrapper';
+import SearchMultipleSelectionPicker from '@components/Search/SearchMultipleSelectionPicker';
+import type {SearchMultipleSelectionPickerItem} from '@components/Search/SearchMultipleSelectionPicker';
+import useLocalize from '@hooks/useLocalize';
+import useThemeStyles from '@hooks/useThemeStyles';
+import * as SearchActions from '@libs/actions/Search';
+import * as CurrencyUtils from '@libs/CurrencyUtils';
+import Navigation from '@libs/Navigation/Navigation';
+import ONYXKEYS from '@src/ONYXKEYS';
+import ROUTES from '@src/ROUTES';
+
+function SearchFiltersCurrencyPage() {
+    const styles = useThemeStyles();
+    const {translate} = useLocalize();
+    const [currencyList] = useOnyx(ONYXKEYS.CURRENCY_LIST);
+    const [searchAdvancedFiltersForm] = useOnyx(ONYXKEYS.FORMS.SEARCH_ADVANCED_FILTERS_FORM);
+    const selectedCurrenciesCodes = searchAdvancedFiltersForm?.currency;
+
+    const {selectedCurrenciesItems, currencyItems} = useMemo(() => {
+        const selectedCurrencies: SearchMultipleSelectionPickerItem[] = [];
+        const currencies: SearchMultipleSelectionPickerItem[] = [];
+
+        Object.keys(currencyList ?? {}).forEach((currencyCode) => {
+            if (selectedCurrenciesCodes?.includes(currencyCode) && !selectedCurrencies.some((currencyItem) => currencyItem.value === currencyCode)) {
+                selectedCurrencies.push({name: `${currencyCode} - ${CurrencyUtils.getCurrencySymbol(currencyCode)}`, value: currencyCode});
+            }
+
+            if (!currencies.some((item) => item.value === currencyCode)) {
+                currencies.push({name: `${currencyCode} - ${CurrencyUtils.getCurrencySymbol(currencyCode)}`, value: currencyCode});
+            }
+        });
+
+        return {selectedCurrenciesItems: selectedCurrencies, currencyItems: currencies};
+    }, [currencyList, selectedCurrenciesCodes]);
+    const handleOnSubmit = (values: string[]) => {
+        SearchActions.updateAdvancedFilters({currency: values});
+    };
+
+    return (
+        <ScreenWrapper
+            testID={SearchFiltersCurrencyPage.displayName}
+            shouldShowOfflineIndicatorInWideScreen
+            offlineIndicatorStyle={styles.mtAuto}
+            includeSafeAreaPaddingBottom={false}
+            shouldEnableMaxHeight
+        >
+            <HeaderWithBackButton
+                title={translate('search.filters.currency')}
+                onBackButtonPress={() => {
+                    Navigation.goBack(ROUTES.SEARCH_ADVANCED_FILTERS);
+                }}
+            />
+            <View style={[styles.flex1]}>
+                <SearchMultipleSelectionPicker
+                    pickerTitle={translate('search.filters.currency')}
+                    items={currencyItems}
+                    initiallySelectedItems={selectedCurrenciesItems}
+                    onSaveSelection={handleOnSubmit}
+                />
+            </View>
+        </ScreenWrapper>
+    );
+}
+
+SearchFiltersCurrencyPage.displayName = 'SearchFiltersCurrencyPage';
+
+export default SearchFiltersCurrencyPage;
diff --git a/src/pages/Search/SearchAdvancedFiltersPage/SearchFiltersDatePage.tsx b/src/pages/Search/SearchAdvancedFiltersPage/SearchFiltersDatePage.tsx
new file mode 100644
index 000000000000..b019a6995cec
--- /dev/null
+++ b/src/pages/Search/SearchAdvancedFiltersPage/SearchFiltersDatePage.tsx
@@ -0,0 +1,75 @@
+import React from 'react';
+import {useOnyx} from 'react-native-onyx';
+import DatePicker from '@components/DatePicker';
+import FormProvider from '@components/Form/FormProvider';
+import InputWrapper from '@components/Form/InputWrapper';
+import type {FormOnyxValues} from '@components/Form/types';
+import HeaderWithBackButton from '@components/HeaderWithBackButton';
+import ScreenWrapper from '@components/ScreenWrapper';
+import useLocalize from '@hooks/useLocalize';
+import useThemeStyles from '@hooks/useThemeStyles';
+import {updateAdvancedFilters} from '@libs/actions/Search';
+import Navigation from '@libs/Navigation/Navigation';
+import CONST from '@src/CONST';
+import ONYXKEYS from '@src/ONYXKEYS';
+import ROUTES from '@src/ROUTES';
+import FILTER_KEYS from '@src/types/form/SearchAdvancedFiltersForm';
+
+function SearchFiltersDatePage() {
+    const styles = useThemeStyles();
+    const {translate} = useLocalize();
+
+    const [searchAdvancedFiltersForm] = useOnyx(ONYXKEYS.FORMS.SEARCH_ADVANCED_FILTERS_FORM);
+    const dateAfter = searchAdvancedFiltersForm?.[FILTER_KEYS.DATE_AFTER];
+    const dateBefore = searchAdvancedFiltersForm?.[FILTER_KEYS.DATE_BEFORE];
+
+    const updateDateFilter = (values: FormOnyxValues<typeof ONYXKEYS.FORMS.SEARCH_ADVANCED_FILTERS_FORM>) => {
+        updateAdvancedFilters(values);
+        Navigation.goBack(ROUTES.SEARCH_ADVANCED_FILTERS);
+    };
+
+    return (
+        <ScreenWrapper
+            testID={SearchFiltersDatePage.displayName}
+            shouldShowOfflineIndicatorInWideScreen
+            offlineIndicatorStyle={styles.mtAuto}
+            includeSafeAreaPaddingBottom={false}
+            shouldEnableMaxHeight
+        >
+            <HeaderWithBackButton
+                title={translate('common.date')}
+                onBackButtonPress={() => {
+                    Navigation.goBack(ROUTES.SEARCH_ADVANCED_FILTERS);
+                }}
+            />
+            <FormProvider
+                style={[styles.flex1, styles.ph5]}
+                formID={ONYXKEYS.FORMS.SEARCH_ADVANCED_FILTERS_FORM}
+                onSubmit={updateDateFilter}
+                submitButtonText={translate('common.save')}
+                enabledWhenOffline
+            >
+                <InputWrapper
+                    InputComponent={DatePicker}
+                    inputID={FILTER_KEYS.DATE_AFTER}
+                    label={translate('search.filters.date.after')}
+                    defaultValue={dateAfter}
+                    maxDate={CONST.CALENDAR_PICKER.MAX_DATE}
+                    minDate={CONST.CALENDAR_PICKER.MIN_DATE}
+                />
+                <InputWrapper
+                    InputComponent={DatePicker}
+                    inputID={FILTER_KEYS.DATE_BEFORE}
+                    label={translate('search.filters.date.before')}
+                    defaultValue={dateBefore}
+                    maxDate={CONST.CALENDAR_PICKER.MAX_DATE}
+                    minDate={CONST.CALENDAR_PICKER.MIN_DATE}
+                />
+            </FormProvider>
+        </ScreenWrapper>
+    );
+}
+
+SearchFiltersDatePage.displayName = 'SearchFiltersDatePage';
+
+export default SearchFiltersDatePage;
diff --git a/src/pages/Search/SearchAdvancedFiltersPage/SearchFiltersDescriptionPage.tsx b/src/pages/Search/SearchAdvancedFiltersPage/SearchFiltersDescriptionPage.tsx
new file mode 100644
index 000000000000..bebcfe587cc2
--- /dev/null
+++ b/src/pages/Search/SearchAdvancedFiltersPage/SearchFiltersDescriptionPage.tsx
@@ -0,0 +1,74 @@
+import React from 'react';
+import {View} from 'react-native';
+import {useOnyx} from 'react-native-onyx';
+import FormProvider from '@components/Form/FormProvider';
+import InputWrapper from '@components/Form/InputWrapper';
+import type {FormOnyxValues} from '@components/Form/types';
+import HeaderWithBackButton from '@components/HeaderWithBackButton';
+import ScreenWrapper from '@components/ScreenWrapper';
+import TextInput from '@components/TextInput';
+import useAutoFocusInput from '@hooks/useAutoFocusInput';
+import useLocalize from '@hooks/useLocalize';
+import useThemeStyles from '@hooks/useThemeStyles';
+import {updateAdvancedFilters} from '@libs/actions/Search';
+import Navigation from '@libs/Navigation/Navigation';
+import CONST from '@src/CONST';
+import ONYXKEYS from '@src/ONYXKEYS';
+import ROUTES from '@src/ROUTES';
+import FILTER_KEYS from '@src/types/form/SearchAdvancedFiltersForm';
+
+function SearchFiltersDescriptionPage() {
+    const styles = useThemeStyles();
+    const {translate} = useLocalize();
+
+    const [searchAdvancedFiltersForm] = useOnyx(ONYXKEYS.FORMS.SEARCH_ADVANCED_FILTERS_FORM);
+    const description = searchAdvancedFiltersForm?.[FILTER_KEYS.DESCRIPTION];
+    const {inputCallbackRef} = useAutoFocusInput();
+
+    const updateDescriptionFilter = (values: FormOnyxValues<typeof ONYXKEYS.FORMS.SEARCH_ADVANCED_FILTERS_FORM>) => {
+        updateAdvancedFilters(values);
+        Navigation.goBack(ROUTES.SEARCH_ADVANCED_FILTERS);
+    };
+
+    return (
+        <ScreenWrapper
+            testID={SearchFiltersDescriptionPage.displayName}
+            shouldShowOfflineIndicatorInWideScreen
+            offlineIndicatorStyle={styles.mtAuto}
+            includeSafeAreaPaddingBottom={false}
+            shouldEnableMaxHeight
+        >
+            <HeaderWithBackButton
+                title={translate('common.description')}
+                onBackButtonPress={() => {
+                    Navigation.goBack(ROUTES.SEARCH_ADVANCED_FILTERS);
+                }}
+            />
+            <FormProvider
+                style={[styles.flex1, styles.ph5]}
+                formID={ONYXKEYS.FORMS.SEARCH_ADVANCED_FILTERS_FORM}
+                onSubmit={updateDescriptionFilter}
+                submitButtonText={translate('common.save')}
+                enabledWhenOffline
+            >
+                <View style={styles.mb5}>
+                    <InputWrapper
+                        InputComponent={TextInput}
+                        inputID={FILTER_KEYS.DESCRIPTION}
+                        name={FILTER_KEYS.DESCRIPTION}
+                        defaultValue={description}
+                        maxLength={CONST.DESCRIPTION_LIMIT}
+                        label={translate('common.description')}
+                        accessibilityLabel={translate('common.description')}
+                        role={CONST.ROLE.PRESENTATION}
+                        ref={inputCallbackRef}
+                    />
+                </View>
+            </FormProvider>
+        </ScreenWrapper>
+    );
+}
+
+SearchFiltersDescriptionPage.displayName = 'SearchFiltersDescriptionPage';
+
+export default SearchFiltersDescriptionPage;
diff --git a/src/pages/Search/SearchAdvancedFiltersPage/SearchFiltersExpenseTypePage.tsx b/src/pages/Search/SearchAdvancedFiltersPage/SearchFiltersExpenseTypePage.tsx
new file mode 100644
index 000000000000..96984029142b
--- /dev/null
+++ b/src/pages/Search/SearchAdvancedFiltersPage/SearchFiltersExpenseTypePage.tsx
@@ -0,0 +1,66 @@
+import React, {useCallback, useMemo} from 'react';
+import {View} from 'react-native';
+import {useOnyx} from 'react-native-onyx';
+import type {ValueOf} from 'type-fest';
+import HeaderWithBackButton from '@components/HeaderWithBackButton';
+import ScreenWrapper from '@components/ScreenWrapper';
+import SearchMultipleSelectionPicker from '@components/Search/SearchMultipleSelectionPicker';
+import useLocalize from '@hooks/useLocalize';
+import useThemeStyles from '@hooks/useThemeStyles';
+import Navigation from '@libs/Navigation/Navigation';
+import {getExpenseTypeTranslationKey} from '@libs/SearchUtils';
+import * as SearchActions from '@userActions/Search';
+import CONST from '@src/CONST';
+import ONYXKEYS from '@src/ONYXKEYS';
+import ROUTES from '@src/ROUTES';
+
+function SearchFiltersExpenseTypePage() {
+    const styles = useThemeStyles();
+    const {translate} = useLocalize();
+
+    const [searchAdvancedFiltersForm] = useOnyx(ONYXKEYS.FORMS.SEARCH_ADVANCED_FILTERS_FORM);
+    const selectedExpenseTypes = searchAdvancedFiltersForm?.expenseType?.map((expenseType) => {
+        const expenseTypeName = translate(getExpenseTypeTranslationKey(expenseType as ValueOf<typeof CONST.SEARCH.TRANSACTION_TYPE>));
+        return {name: expenseTypeName, value: expenseType};
+    });
+    const allExpenseTypes = Object.values(CONST.SEARCH.TRANSACTION_TYPE);
+
+    const expenseTypesItems = useMemo(() => {
+        return allExpenseTypes.map((expenseType) => {
+            const expenseTypeName = translate(getExpenseTypeTranslationKey(expenseType));
+            return {name: expenseTypeName, value: expenseType};
+        });
+    }, [allExpenseTypes, translate]);
+
+    const updateExpenseTypeFilter = useCallback((values: string[]) => SearchActions.updateAdvancedFilters({expenseType: values}), []);
+
+    return (
+        <ScreenWrapper
+            testID={SearchFiltersExpenseTypePage.displayName}
+            shouldShowOfflineIndicatorInWideScreen
+            offlineIndicatorStyle={styles.mtAuto}
+            includeSafeAreaPaddingBottom={false}
+            shouldEnableMaxHeight
+        >
+            <HeaderWithBackButton
+                title={translate('search.expenseType')}
+                onBackButtonPress={() => {
+                    Navigation.goBack(ROUTES.SEARCH_ADVANCED_FILTERS);
+                }}
+            />
+            <View style={[styles.flex1]}>
+                <SearchMultipleSelectionPicker
+                    pickerTitle={translate('search.expenseType')}
+                    items={expenseTypesItems}
+                    initiallySelectedItems={selectedExpenseTypes}
+                    onSaveSelection={updateExpenseTypeFilter}
+                    shouldShowTextInput={false}
+                />
+            </View>
+        </ScreenWrapper>
+    );
+}
+
+SearchFiltersExpenseTypePage.displayName = 'SearchFiltersCategoryPage';
+
+export default SearchFiltersExpenseTypePage;
diff --git a/src/pages/Search/SearchAdvancedFiltersPage/SearchFiltersFromPage.tsx b/src/pages/Search/SearchAdvancedFiltersPage/SearchFiltersFromPage.tsx
new file mode 100644
index 000000000000..71918a8ee1de
--- /dev/null
+++ b/src/pages/Search/SearchAdvancedFiltersPage/SearchFiltersFromPage.tsx
@@ -0,0 +1,43 @@
+import React from 'react';
+import {View} from 'react-native';
+import {useOnyx} from 'react-native-onyx';
+import HeaderWithBackButton from '@components/HeaderWithBackButton';
+import ScreenWrapper from '@components/ScreenWrapper';
+import SearchFiltersParticipantsSelector from '@components/Search/SearchFiltersParticipantsSelector';
+import useLocalize from '@hooks/useLocalize';
+import useThemeStyles from '@hooks/useThemeStyles';
+import * as SearchActions from '@userActions/Search';
+import ONYXKEYS from '@src/ONYXKEYS';
+
+function SearchFiltersFromPage() {
+    const styles = useThemeStyles();
+    const {translate} = useLocalize();
+
+    const [searchAdvancedFiltersForm] = useOnyx(ONYXKEYS.FORMS.SEARCH_ADVANCED_FILTERS_FORM);
+
+    return (
+        <ScreenWrapper
+            testID={SearchFiltersFromPage.displayName}
+            includeSafeAreaPaddingBottom={false}
+            shouldShowOfflineIndicatorInWideScreen
+            offlineIndicatorStyle={styles.mtAuto}
+            shouldEnableMaxHeight
+        >
+            <HeaderWithBackButton title={translate('common.from')} />
+            <View style={[styles.flex1]}>
+                <SearchFiltersParticipantsSelector
+                    initialAccountIDs={searchAdvancedFiltersForm?.from ?? []}
+                    onFiltersUpdate={(selectedAccountIDs) => {
+                        SearchActions.updateAdvancedFilters({
+                            from: selectedAccountIDs,
+                        });
+                    }}
+                />
+            </View>
+        </ScreenWrapper>
+    );
+}
+
+SearchFiltersFromPage.displayName = 'SearchFiltersFromPage';
+
+export default SearchFiltersFromPage;
diff --git a/src/pages/Search/SearchAdvancedFiltersPage/SearchFiltersKeywordPage.tsx b/src/pages/Search/SearchAdvancedFiltersPage/SearchFiltersKeywordPage.tsx
new file mode 100644
index 000000000000..41b1bcbc943b
--- /dev/null
+++ b/src/pages/Search/SearchAdvancedFiltersPage/SearchFiltersKeywordPage.tsx
@@ -0,0 +1,75 @@
+import React from 'react';
+import {View} from 'react-native';
+import {useOnyx} from 'react-native-onyx';
+import FullPageNotFoundView from '@components/BlockingViews/FullPageNotFoundView';
+import FormProvider from '@components/Form/FormProvider';
+import InputWrapper from '@components/Form/InputWrapper';
+import type {FormOnyxValues} from '@components/Form/types';
+import HeaderWithBackButton from '@components/HeaderWithBackButton';
+import ScreenWrapper from '@components/ScreenWrapper';
+import TextInput from '@components/TextInput';
+import useAutoFocusInput from '@hooks/useAutoFocusInput';
+import useLocalize from '@hooks/useLocalize';
+import useThemeStyles from '@hooks/useThemeStyles';
+import {updateAdvancedFilters} from '@libs/actions/Search';
+import Navigation from '@libs/Navigation/Navigation';
+import CONST from '@src/CONST';
+import ONYXKEYS from '@src/ONYXKEYS';
+import ROUTES from '@src/ROUTES';
+import FILTER_KEYS from '@src/types/form/SearchAdvancedFiltersForm';
+
+function SearchFiltersKeywordPage() {
+    const styles = useThemeStyles();
+    const {translate} = useLocalize();
+
+    const [searchAdvancedFiltersForm] = useOnyx(ONYXKEYS.FORMS.SEARCH_ADVANCED_FILTERS_FORM);
+    const keyword = searchAdvancedFiltersForm?.[FILTER_KEYS.KEYWORD];
+    const {inputCallbackRef} = useAutoFocusInput();
+
+    const updateKeywordFilter = (values: FormOnyxValues<typeof ONYXKEYS.FORMS.SEARCH_ADVANCED_FILTERS_FORM>) => {
+        updateAdvancedFilters(values);
+        Navigation.goBack(ROUTES.SEARCH_ADVANCED_FILTERS);
+    };
+
+    return (
+        <ScreenWrapper
+            testID={SearchFiltersKeywordPage.displayName}
+            shouldShowOfflineIndicatorInWideScreen
+            offlineIndicatorStyle={styles.mtAuto}
+            shouldEnableMaxHeight
+        >
+            <FullPageNotFoundView shouldShow={false}>
+                <HeaderWithBackButton
+                    title={translate('search.filters.keyword')}
+                    onBackButtonPress={() => {
+                        Navigation.goBack(ROUTES.SEARCH_ADVANCED_FILTERS);
+                    }}
+                />
+                <FormProvider
+                    style={[styles.flex1, styles.ph5]}
+                    formID={ONYXKEYS.FORMS.SEARCH_ADVANCED_FILTERS_FORM}
+                    onSubmit={updateKeywordFilter}
+                    submitButtonText={translate('common.save')}
+                    enabledWhenOffline
+                >
+                    <View style={styles.mb4}>
+                        <InputWrapper
+                            InputComponent={TextInput}
+                            inputID={FILTER_KEYS.KEYWORD}
+                            name={FILTER_KEYS.KEYWORD}
+                            defaultValue={keyword}
+                            label={translate('search.filters.keyword')}
+                            accessibilityLabel={translate('search.filters.keyword')}
+                            role={CONST.ROLE.PRESENTATION}
+                            ref={inputCallbackRef}
+                        />
+                    </View>
+                </FormProvider>
+            </FullPageNotFoundView>
+        </ScreenWrapper>
+    );
+}
+
+SearchFiltersKeywordPage.displayName = 'SearchFiltersKeywordPage';
+
+export default SearchFiltersKeywordPage;
diff --git a/src/pages/Search/SearchAdvancedFiltersPage/SearchFiltersMerchantPage.tsx b/src/pages/Search/SearchAdvancedFiltersPage/SearchFiltersMerchantPage.tsx
new file mode 100644
index 000000000000..257e9f18177e
--- /dev/null
+++ b/src/pages/Search/SearchAdvancedFiltersPage/SearchFiltersMerchantPage.tsx
@@ -0,0 +1,74 @@
+import React from 'react';
+import {View} from 'react-native';
+import {useOnyx} from 'react-native-onyx';
+import FormProvider from '@components/Form/FormProvider';
+import InputWrapper from '@components/Form/InputWrapper';
+import type {FormOnyxValues} from '@components/Form/types';
+import HeaderWithBackButton from '@components/HeaderWithBackButton';
+import ScreenWrapper from '@components/ScreenWrapper';
+import TextInput from '@components/TextInput';
+import useAutoFocusInput from '@hooks/useAutoFocusInput';
+import useLocalize from '@hooks/useLocalize';
+import useThemeStyles from '@hooks/useThemeStyles';
+import {updateAdvancedFilters} from '@libs/actions/Search';
+import Navigation from '@libs/Navigation/Navigation';
+import CONST from '@src/CONST';
+import ONYXKEYS from '@src/ONYXKEYS';
+import ROUTES from '@src/ROUTES';
+import FILTER_KEYS from '@src/types/form/SearchAdvancedFiltersForm';
+
+function SearchFiltersMerchantPage() {
+    const styles = useThemeStyles();
+    const {translate} = useLocalize();
+
+    const [searchAdvancedFiltersForm] = useOnyx(ONYXKEYS.FORMS.SEARCH_ADVANCED_FILTERS_FORM);
+    const merchant = searchAdvancedFiltersForm?.[FILTER_KEYS.MERCHANT];
+    const {inputCallbackRef} = useAutoFocusInput();
+
+    const updateMerchantFilter = (values: FormOnyxValues<typeof ONYXKEYS.FORMS.SEARCH_ADVANCED_FILTERS_FORM>) => {
+        updateAdvancedFilters(values);
+        Navigation.goBack(ROUTES.SEARCH_ADVANCED_FILTERS);
+    };
+
+    return (
+        <ScreenWrapper
+            testID={SearchFiltersMerchantPage.displayName}
+            shouldShowOfflineIndicatorInWideScreen
+            offlineIndicatorStyle={styles.mtAuto}
+            includeSafeAreaPaddingBottom={false}
+            shouldEnableMaxHeight
+        >
+            <HeaderWithBackButton
+                title={translate('common.merchant')}
+                onBackButtonPress={() => {
+                    Navigation.goBack(ROUTES.SEARCH_ADVANCED_FILTERS);
+                }}
+            />
+            <FormProvider
+                style={[styles.flex1, styles.ph5]}
+                formID={ONYXKEYS.FORMS.SEARCH_ADVANCED_FILTERS_FORM}
+                onSubmit={updateMerchantFilter}
+                submitButtonText={translate('common.save')}
+                enabledWhenOffline
+            >
+                <View style={styles.mb5}>
+                    <InputWrapper
+                        InputComponent={TextInput}
+                        inputID={FILTER_KEYS.MERCHANT}
+                        name={FILTER_KEYS.MERCHANT}
+                        defaultValue={merchant}
+                        maxLength={CONST.MERCHANT_NAME_MAX_LENGTH}
+                        label={translate('common.merchant')}
+                        accessibilityLabel={translate('common.merchant')}
+                        role={CONST.ROLE.PRESENTATION}
+                        ref={inputCallbackRef}
+                    />
+                </View>
+            </FormProvider>
+        </ScreenWrapper>
+    );
+}
+
+SearchFiltersMerchantPage.displayName = 'SearchFiltersMerchantPage';
+
+export default SearchFiltersMerchantPage;
diff --git a/src/pages/Search/SearchAdvancedFiltersPage/SearchFiltersReportIDPage.tsx b/src/pages/Search/SearchAdvancedFiltersPage/SearchFiltersReportIDPage.tsx
new file mode 100644
index 000000000000..052490890cf7
--- /dev/null
+++ b/src/pages/Search/SearchAdvancedFiltersPage/SearchFiltersReportIDPage.tsx
@@ -0,0 +1,73 @@
+import React from 'react';
+import {View} from 'react-native';
+import {useOnyx} from 'react-native-onyx';
+import FormProvider from '@components/Form/FormProvider';
+import InputWrapper from '@components/Form/InputWrapper';
+import type {FormOnyxValues} from '@components/Form/types';
+import HeaderWithBackButton from '@components/HeaderWithBackButton';
+import ScreenWrapper from '@components/ScreenWrapper';
+import TextInput from '@components/TextInput';
+import useAutoFocusInput from '@hooks/useAutoFocusInput';
+import useLocalize from '@hooks/useLocalize';
+import useThemeStyles from '@hooks/useThemeStyles';
+import {updateAdvancedFilters} from '@libs/actions/Search';
+import Navigation from '@libs/Navigation/Navigation';
+import CONST from '@src/CONST';
+import ONYXKEYS from '@src/ONYXKEYS';
+import ROUTES from '@src/ROUTES';
+import FILTER_KEYS from '@src/types/form/SearchAdvancedFiltersForm';
+
+function SearchFiltersReportIDPage() {
+    const styles = useThemeStyles();
+    const {translate} = useLocalize();
+
+    const [searchAdvancedFiltersForm] = useOnyx(ONYXKEYS.FORMS.SEARCH_ADVANCED_FILTERS_FORM);
+    const reportID = searchAdvancedFiltersForm?.[FILTER_KEYS.REPORT_ID];
+    const {inputCallbackRef} = useAutoFocusInput();
+
+    const updateReportIDFilter = (values: FormOnyxValues<typeof ONYXKEYS.FORMS.SEARCH_ADVANCED_FILTERS_FORM>) => {
+        updateAdvancedFilters(values);
+        Navigation.goBack(ROUTES.SEARCH_ADVANCED_FILTERS);
+    };
+
+    return (
+        <ScreenWrapper
+            testID={SearchFiltersReportIDPage.displayName}
+            shouldShowOfflineIndicatorInWideScreen
+            offlineIndicatorStyle={styles.mtAuto}
+            includeSafeAreaPaddingBottom={false}
+            shouldEnableMaxHeight
+        >
+            <HeaderWithBackButton
+                title={translate('common.reportID')}
+                onBackButtonPress={() => {
+                    Navigation.goBack(ROUTES.SEARCH_ADVANCED_FILTERS);
+                }}
+            />
+            <FormProvider
+                style={[styles.flex1, styles.ph5]}
+                formID={ONYXKEYS.FORMS.SEARCH_ADVANCED_FILTERS_FORM}
+                onSubmit={updateReportIDFilter}
+                submitButtonText={translate('common.save')}
+                enabledWhenOffline
+            >
+                <View style={styles.mb5}>
+                    <InputWrapper
+                        InputComponent={TextInput}
+                        inputID={FILTER_KEYS.REPORT_ID}
+                        name={FILTER_KEYS.REPORT_ID}
+                        defaultValue={reportID}
+                        label={translate('common.reportID')}
+                        accessibilityLabel={translate('common.reportID')}
+                        role={CONST.ROLE.PRESENTATION}
+                        ref={inputCallbackRef}
+                    />
+                </View>
+            </FormProvider>
+        </ScreenWrapper>
+    );
+}
+
+SearchFiltersReportIDPage.displayName = 'SearchFiltersReportIDPage';
+
+export default SearchFiltersReportIDPage;
diff --git a/src/pages/Search/SearchAdvancedFiltersPage/SearchFiltersTagPage.tsx b/src/pages/Search/SearchAdvancedFiltersPage/SearchFiltersTagPage.tsx
new file mode 100644
index 000000000000..d0b0b2e234f7
--- /dev/null
+++ b/src/pages/Search/SearchAdvancedFiltersPage/SearchFiltersTagPage.tsx
@@ -0,0 +1,71 @@
+import React, {useCallback, useMemo} from 'react';
+import {View} from 'react-native';
+import {useOnyx} from 'react-native-onyx';
+import HeaderWithBackButton from '@components/HeaderWithBackButton';
+import ScreenWrapper from '@components/ScreenWrapper';
+import SearchMultipleSelectionPicker from '@components/Search/SearchMultipleSelectionPicker';
+import useLocalize from '@hooks/useLocalize';
+import useThemeStyles from '@hooks/useThemeStyles';
+import Navigation from '@libs/Navigation/Navigation';
+import {getTagNamesFromTagsLists} from '@libs/PolicyUtils';
+import * as SearchActions from '@userActions/Search';
+import ONYXKEYS from '@src/ONYXKEYS';
+import ROUTES from '@src/ROUTES';
+import type {PolicyTagLists} from '@src/types/onyx';
+
+function SearchFiltersTagPage() {
+    const styles = useThemeStyles();
+    const {translate} = useLocalize();
+
+    const [searchAdvancedFiltersForm] = useOnyx(ONYXKEYS.FORMS.SEARCH_ADVANCED_FILTERS_FORM);
+    const selectedTagsItems = searchAdvancedFiltersForm?.tag?.map((tag) => ({name: tag, value: tag}));
+    const policyID = searchAdvancedFiltersForm?.policyID ?? '-1';
+    const [allPoliciesTagsLists] = useOnyx(ONYXKEYS.COLLECTION.POLICY_TAGS);
+    const singlePolicyTagsList: PolicyTagLists | undefined = allPoliciesTagsLists?.[`${ONYXKEYS.COLLECTION.POLICY_TAGS}${policyID}`];
+
+    const tagItems = useMemo(() => {
+        if (!singlePolicyTagsList) {
+            const uniqueTagNames = new Set<string>();
+            const tagListsUnpacked = Object.values(allPoliciesTagsLists ?? {}).filter((item) => !!item) as PolicyTagLists[];
+            tagListsUnpacked
+                .map((policyTagLists) => {
+                    return getTagNamesFromTagsLists(policyTagLists);
+                })
+                .flat()
+                .forEach((tag) => uniqueTagNames.add(tag));
+            return Array.from(uniqueTagNames).map((tagName) => ({name: tagName, value: tagName}));
+        }
+        return getTagNamesFromTagsLists(singlePolicyTagsList).map((name) => ({name, value: name}));
+    }, [allPoliciesTagsLists, singlePolicyTagsList]);
+
+    const updateTagFilter = useCallback((values: string[]) => SearchActions.updateAdvancedFilters({tag: values}), []);
+
+    return (
+        <ScreenWrapper
+            testID={SearchFiltersTagPage.displayName}
+            shouldShowOfflineIndicatorInWideScreen
+            offlineIndicatorStyle={styles.mtAuto}
+            includeSafeAreaPaddingBottom={false}
+            shouldEnableMaxHeight
+        >
+            <HeaderWithBackButton
+                title={translate('common.tag')}
+                onBackButtonPress={() => {
+                    Navigation.goBack(ROUTES.SEARCH_ADVANCED_FILTERS);
+                }}
+            />
+            <View style={[styles.flex1]}>
+                <SearchMultipleSelectionPicker
+                    pickerTitle={translate('common.tag')}
+                    items={tagItems}
+                    initiallySelectedItems={selectedTagsItems}
+                    onSaveSelection={updateTagFilter}
+                />
+            </View>
+        </ScreenWrapper>
+    );
+}
+
+SearchFiltersTagPage.displayName = 'SearchFiltersTagPage';
+
+export default SearchFiltersTagPage;
diff --git a/src/pages/Search/SearchAdvancedFiltersPage/SearchFiltersTaxRatePage.tsx b/src/pages/Search/SearchAdvancedFiltersPage/SearchFiltersTaxRatePage.tsx
new file mode 100644
index 000000000000..713e9f5110b2
--- /dev/null
+++ b/src/pages/Search/SearchAdvancedFiltersPage/SearchFiltersTaxRatePage.tsx
@@ -0,0 +1,72 @@
+import React, {useCallback, useMemo} from 'react';
+import {View} from 'react-native';
+import {useOnyx} from 'react-native-onyx';
+import HeaderWithBackButton from '@components/HeaderWithBackButton';
+import ScreenWrapper from '@components/ScreenWrapper';
+import SearchMultipleSelectionPicker from '@components/Search/SearchMultipleSelectionPicker';
+import type {SearchMultipleSelectionPickerItem} from '@components/Search/SearchMultipleSelectionPicker';
+import useLocalize from '@hooks/useLocalize';
+import useThemeStyles from '@hooks/useThemeStyles';
+import Navigation from '@libs/Navigation/Navigation';
+import {getAllTaxRates} from '@libs/PolicyUtils';
+import * as SearchActions from '@userActions/Search';
+import ONYXKEYS from '@src/ONYXKEYS';
+import ROUTES from '@src/ROUTES';
+
+function SearchFiltersTaxRatePage() {
+    const styles = useThemeStyles();
+    const {translate} = useLocalize();
+
+    const [searchAdvancedFiltersForm] = useOnyx(ONYXKEYS.FORMS.SEARCH_ADVANCED_FILTERS_FORM);
+    const allTaxRates = getAllTaxRates();
+    const selectedTaxesItems: SearchMultipleSelectionPickerItem[] = [];
+    Object.entries(allTaxRates).forEach(([taxRateName, taxRateKeys]) => {
+        searchAdvancedFiltersForm?.taxRate?.forEach((taxRateKey) => {
+            if (!taxRateKeys.includes(taxRateKey) || selectedTaxesItems.some((item) => item.name === taxRateName)) {
+                return;
+            }
+            selectedTaxesItems.push({name: taxRateName, value: taxRateKeys});
+        });
+    });
+    const policyID = searchAdvancedFiltersForm?.policyID ?? '-1';
+    const [policy] = useOnyx(`${ONYXKEYS.COLLECTION.POLICY}${policyID}`);
+    const singlePolicyTaxRates = policy?.taxRates?.taxes;
+
+    const taxItems = useMemo(() => {
+        if (!singlePolicyTaxRates) {
+            return Object.entries(allTaxRates).map(([taxRateName, taxRateKeys]) => ({name: taxRateName, value: taxRateKeys}));
+        }
+        return Object.entries(singlePolicyTaxRates).map(([taxRatekey, taxRate]) => ({name: taxRate.name, value: [taxRatekey]}));
+    }, [allTaxRates, singlePolicyTaxRates]);
+
+    const updateTaxRateFilters = useCallback((values: string[]) => SearchActions.updateAdvancedFilters({taxRate: values}), []);
+
+    return (
+        <ScreenWrapper
+            testID={SearchFiltersTaxRatePage.displayName}
+            shouldShowOfflineIndicatorInWideScreen
+            offlineIndicatorStyle={styles.mtAuto}
+            includeSafeAreaPaddingBottom={false}
+            shouldEnableMaxHeight
+        >
+            <HeaderWithBackButton
+                title={translate('workspace.taxes.taxRate')}
+                onBackButtonPress={() => {
+                    Navigation.goBack(ROUTES.SEARCH_ADVANCED_FILTERS);
+                }}
+            />
+            <View style={[styles.flex1]}>
+                <SearchMultipleSelectionPicker
+                    pickerTitle={translate('workspace.taxes.taxRate')}
+                    items={taxItems}
+                    initiallySelectedItems={selectedTaxesItems}
+                    onSaveSelection={updateTaxRateFilters}
+                />
+            </View>
+        </ScreenWrapper>
+    );
+}
+
+SearchFiltersTaxRatePage.displayName = 'SearchFiltersCategoryPage';
+
+export default SearchFiltersTaxRatePage;
diff --git a/src/pages/Search/SearchAdvancedFiltersPage/SearchFiltersToPage.tsx b/src/pages/Search/SearchAdvancedFiltersPage/SearchFiltersToPage.tsx
new file mode 100644
index 000000000000..7c7ad1119b68
--- /dev/null
+++ b/src/pages/Search/SearchAdvancedFiltersPage/SearchFiltersToPage.tsx
@@ -0,0 +1,43 @@
+import React from 'react';
+import {View} from 'react-native';
+import {useOnyx} from 'react-native-onyx';
+import HeaderWithBackButton from '@components/HeaderWithBackButton';
+import ScreenWrapper from '@components/ScreenWrapper';
+import SearchFiltersParticipantsSelector from '@components/Search/SearchFiltersParticipantsSelector';
+import useLocalize from '@hooks/useLocalize';
+import useThemeStyles from '@hooks/useThemeStyles';
+import * as SearchActions from '@userActions/Search';
+import ONYXKEYS from '@src/ONYXKEYS';
+
+function SearchFiltersToPage() {
+    const styles = useThemeStyles();
+    const {translate} = useLocalize();
+
+    const [searchAdvancedFiltersForm] = useOnyx(ONYXKEYS.FORMS.SEARCH_ADVANCED_FILTERS_FORM);
+
+    return (
+        <ScreenWrapper
+            testID={SearchFiltersToPage.displayName}
+            includeSafeAreaPaddingBottom={false}
+            shouldShowOfflineIndicatorInWideScreen
+            offlineIndicatorStyle={styles.mtAuto}
+            shouldEnableMaxHeight
+        >
+            <HeaderWithBackButton title={translate('common.to')} />
+            <View style={[styles.flex1]}>
+                <SearchFiltersParticipantsSelector
+                    initialAccountIDs={searchAdvancedFiltersForm?.to ?? []}
+                    onFiltersUpdate={(selectedAccountIDs) => {
+                        SearchActions.updateAdvancedFilters({
+                            to: selectedAccountIDs,
+                        });
+                    }}
+                />
+            </View>
+        </ScreenWrapper>
+    );
+}
+
+SearchFiltersToPage.displayName = 'SearchFiltersToPage';
+
+export default SearchFiltersToPage;
diff --git a/src/pages/Search/SearchFilters.tsx b/src/pages/Search/SearchFilters.tsx
deleted file mode 100644
index 06611db61824..000000000000
--- a/src/pages/Search/SearchFilters.tsx
+++ /dev/null
@@ -1,78 +0,0 @@
-import React from 'react';
-import {View} from 'react-native';
-import MenuItem from '@components/MenuItem';
-import useLocalize from '@hooks/useLocalize';
-import useSingleExecution from '@hooks/useSingleExecution';
-import useThemeStyles from '@hooks/useThemeStyles';
-import useWindowDimensions from '@hooks/useWindowDimensions';
-import Navigation from '@libs/Navigation/Navigation';
-import variables from '@styles/variables';
-import * as Expensicons from '@src/components/Icon/Expensicons';
-import CONST from '@src/CONST';
-import type {Route} from '@src/ROUTES';
-import ROUTES from '@src/ROUTES';
-import type IconAsset from '@src/types/utils/IconAsset';
-
-type SearchFiltersProps = {
-    query: string;
-};
-
-type SearchMenuFilterItem = {
-    title: string;
-    query: string;
-    icon: IconAsset;
-    route: Route;
-};
-
-function SearchFilters({query}: SearchFiltersProps) {
-    const styles = useThemeStyles();
-    const {isSmallScreenWidth} = useWindowDimensions();
-    const {singleExecution} = useSingleExecution();
-    const {translate} = useLocalize();
-
-    const filterItems: SearchMenuFilterItem[] = [
-        {
-            title: translate('common.expenses'),
-            query: CONST.TAB_SEARCH.ALL,
-            icon: Expensicons.Receipt,
-            route: ROUTES.SEARCH.getRoute(CONST.TAB_SEARCH.ALL),
-        },
-    ];
-    const activeItemIndex = filterItems.findIndex((item) => item.query === query);
-
-    // We're not showing the filters on mobile yet since there's only one search option.
-    // We'll introduce the filters as part of https://github.com/Expensify/App/issues/39878
-    if (isSmallScreenWidth) {
-        return;
-    }
-
-    return (
-        <View style={[styles.pb4, styles.mh3, styles.mt3]}>
-            {filterItems.map((item, index) => {
-                const onPress = singleExecution(() => Navigation.navigate(item.route));
-
-                return (
-                    <MenuItem
-                        key={item.title}
-                        disabled={false}
-                        interactive
-                        title={item.title}
-                        icon={item.icon}
-                        iconWidth={variables.iconSizeLarge}
-                        iconHeight={variables.iconSizeLarge}
-                        wrapperStyle={styles.sectionMenuItem}
-                        focused={index === activeItemIndex}
-                        hoverAndPressStyle={styles.hoveredComponentBG}
-                        onPress={onPress}
-                        isPaneMenu
-                    />
-                );
-            })}
-        </View>
-    );
-}
-
-SearchFilters.displayName = 'SearchFilters';
-
-export default SearchFilters;
-export type {SearchMenuFilterItem};
diff --git a/src/pages/Search/SearchFiltersNarrow.tsx b/src/pages/Search/SearchFiltersNarrow.tsx
deleted file mode 100644
index e890432df7f1..000000000000
--- a/src/pages/Search/SearchFiltersNarrow.tsx
+++ /dev/null
@@ -1,82 +0,0 @@
-import React, {useRef, useState} from 'react';
-import {Animated, View} from 'react-native';
-import Icon from '@components/Icon';
-import PopoverMenu from '@components/PopoverMenu';
-import PressableWithFeedback from '@components/Pressable/PressableWithFeedback';
-import Text from '@components/Text';
-import useSingleExecution from '@hooks/useSingleExecution';
-import useTheme from '@hooks/useTheme';
-import useThemeStyles from '@hooks/useThemeStyles';
-import useWindowDimensions from '@hooks/useWindowDimensions';
-import Navigation from '@libs/Navigation/Navigation';
-import * as Expensicons from '@src/components/Icon/Expensicons';
-import type {SearchMenuFilterItem} from './SearchFilters';
-
-type SearchFiltersNarrowProps = {
-    filterItems: SearchMenuFilterItem[];
-    activeItemIndex: number;
-};
-
-function SearchFiltersNarrow({filterItems, activeItemIndex}: SearchFiltersNarrowProps) {
-    const theme = useTheme();
-    const styles = useThemeStyles();
-    const {singleExecution} = useSingleExecution();
-    const {windowHeight} = useWindowDimensions();
-
-    const [isPopoverVisible, setIsPopoverVisible] = useState(false);
-    const buttonRef = useRef<HTMLDivElement>(null);
-
-    const openMenu = () => setIsPopoverVisible(true);
-    const closeMenu = () => setIsPopoverVisible(false);
-
-    const popoverMenuItems = filterItems.map((item, index) => ({
-        text: item.title,
-        onSelected: singleExecution(() => Navigation.navigate(item.route)),
-        icon: item.icon,
-        iconFill: index === activeItemIndex ? theme.iconSuccessFill : theme.icon,
-        iconRight: Expensicons.Checkmark,
-        shouldShowRightIcon: index === activeItemIndex,
-        success: index === activeItemIndex,
-        containerStyle: index === activeItemIndex ? [{backgroundColor: theme.border}] : undefined,
-    }));
-
-    return (
-        <View style={[styles.pb4]}>
-            <PressableWithFeedback
-                accessible
-                accessibilityLabel={popoverMenuItems[activeItemIndex]?.text ?? ''}
-                ref={buttonRef}
-                style={[styles.tabSelectorButton, styles.ph5]}
-                onPress={openMenu}
-            >
-                {({hovered}) => (
-                    <Animated.View style={[styles.tabSelectorButton, styles.tabBackground(hovered, true, theme.border), styles.w100, styles.mh3]}>
-                        <View style={[styles.flexRow]}>
-                            <Icon
-                                src={popoverMenuItems[activeItemIndex]?.icon ?? Expensicons.Receipt}
-                                fill={theme.icon}
-                            />
-                            <Text style={[styles.mh1, styles.textStrong]}>{popoverMenuItems[activeItemIndex]?.text}</Text>
-                            <Icon
-                                src={Expensicons.DownArrow}
-                                fill={theme.icon}
-                            />
-                        </View>
-                    </Animated.View>
-                )}
-            </PressableWithFeedback>
-            <PopoverMenu
-                menuItems={popoverMenuItems}
-                isVisible={isPopoverVisible}
-                anchorPosition={styles.createMenuPositionSidebar(windowHeight)}
-                onClose={closeMenu}
-                onItemSelected={closeMenu}
-                anchorRef={buttonRef}
-            />
-        </View>
-    );
-}
-
-SearchFiltersNarrow.displayName = 'SearchFiltersNarrow';
-
-export default SearchFiltersNarrow;
diff --git a/src/pages/Search/SearchHoldReasonPage.tsx b/src/pages/Search/SearchHoldReasonPage.tsx
new file mode 100644
index 000000000000..7ea22421737d
--- /dev/null
+++ b/src/pages/Search/SearchHoldReasonPage.tsx
@@ -0,0 +1,67 @@
+import type {RouteProp} from '@react-navigation/native';
+import React, {useCallback, useEffect} from 'react';
+import type {FormInputErrors, FormOnyxValues} from '@components/Form/types';
+import {useSearchContext} from '@components/Search/SearchContext';
+import useLocalize from '@hooks/useLocalize';
+import Navigation from '@libs/Navigation/Navigation';
+import * as ValidationUtils from '@libs/ValidationUtils';
+import HoldReasonFormView from '@pages/iou/HoldReasonFormView';
+import * as FormActions from '@userActions/FormActions';
+import * as SearchActions from '@src/libs/actions/Search';
+import ONYXKEYS from '@src/ONYXKEYS';
+import type {Route} from '@src/ROUTES';
+import INPUT_IDS from '@src/types/form/MoneyRequestHoldReasonForm';
+
+type SearchHoldReasonPageRouteParams = {
+    /** Link to previous page */
+    backTo: Route;
+};
+
+type SearchHoldReasonPageProps = {
+    /** Navigation route context info provided by react navigation */
+    route: RouteProp<{params?: SearchHoldReasonPageRouteParams}>;
+};
+
+function SearchHoldReasonPage({route}: SearchHoldReasonPageProps) {
+    const {translate} = useLocalize();
+
+    const {currentSearchHash, selectedTransactions, clearSelectedTransactions} = useSearchContext();
+    const {backTo = ''} = route.params ?? {};
+
+    const selectedTransactionIDs = Object.keys(selectedTransactions);
+    const onSubmit = (values: FormOnyxValues<typeof ONYXKEYS.FORMS.MONEY_REQUEST_HOLD_FORM>) => {
+        SearchActions.holdMoneyRequestOnSearch(currentSearchHash, selectedTransactionIDs, values.comment);
+        clearSelectedTransactions();
+        Navigation.goBack();
+    };
+
+    const validate = useCallback(
+        (values: FormOnyxValues<typeof ONYXKEYS.FORMS.MONEY_REQUEST_HOLD_FORM>) => {
+            const errors: FormInputErrors<typeof ONYXKEYS.FORMS.MONEY_REQUEST_HOLD_FORM> = ValidationUtils.getFieldRequiredErrors(values, [INPUT_IDS.COMMENT]);
+
+            if (!values.comment) {
+                errors.comment = translate('common.error.fieldRequired');
+            }
+
+            return errors;
+        },
+        [translate],
+    );
+
+    useEffect(() => {
+        FormActions.clearErrors(ONYXKEYS.FORMS.MONEY_REQUEST_HOLD_FORM);
+        FormActions.clearErrorFields(ONYXKEYS.FORMS.MONEY_REQUEST_HOLD_FORM);
+    }, []);
+
+    return (
+        <HoldReasonFormView
+            onSubmit={onSubmit}
+            validate={validate}
+            backTo={backTo}
+        />
+    );
+}
+
+SearchHoldReasonPage.displayName = 'SearchHoldReasonPage';
+
+export default SearchHoldReasonPage;
diff --git a/src/pages/Search/SearchPage.tsx b/src/pages/Search/SearchPage.tsx
index 499b09fd4eb9..37735cddce3f 100644
--- a/src/pages/Search/SearchPage.tsx
+++ b/src/pages/Search/SearchPage.tsx
@@ -1,42 +1,50 @@
 import type {StackScreenProps} from '@react-navigation/stack';
-import React from 'react';
+import React, {useMemo} from 'react';
 import FullPageNotFoundView from '@components/BlockingViews/FullPageNotFoundView';
-import HeaderWithBackButton from '@components/HeaderWithBackButton';
-import * as Illustrations from '@components/Icon/Illustrations';
 import ScreenWrapper from '@components/ScreenWrapper';
 import Search from '@components/Search';
-import useLocalize from '@hooks/useLocalize';
+import useResponsiveLayout from '@hooks/useResponsiveLayout';
+import useThemeStyles from '@hooks/useThemeStyles';
 import Navigation from '@libs/Navigation/Navigation';
-import type {CentralPaneNavigatorParamList} from '@libs/Navigation/types';
-import CONST from '@src/CONST';
+import type {AuthScreensParamList} from '@libs/Navigation/types';
+import * as SearchUtils from '@libs/SearchUtils';
 import ROUTES from '@src/ROUTES';
 import type SCREENS from '@src/SCREENS';
-import type {SearchQuery} from '@src/types/onyx/SearchResults';
 
-type SearchPageProps = StackScreenProps<CentralPaneNavigatorParamList, typeof SCREENS.SEARCH.CENTRAL_PANE>;
+type SearchPageProps = StackScreenProps<AuthScreensParamList, typeof SCREENS.SEARCH.CENTRAL_PANE>;
 
 function SearchPage({route}: SearchPageProps) {
-    const {translate} = useLocalize();
-    const currentQuery = route?.params && 'query' in route.params ? route?.params?.query : '';
-    const query = currentQuery as SearchQuery;
-    const isValidQuery = Object.values(CONST.TAB_SEARCH).includes(query);
+    const {shouldUseNarrowLayout} = useResponsiveLayout();
+    const styles = useThemeStyles();
+    const {q, isCustomQuery} = route.params;
 
-    const handleOnBackButtonPress = () => Navigation.goBack(ROUTES.SEARCH.getRoute(CONST.TAB_SEARCH.ALL));
+    const queryJSON = useMemo(() => SearchUtils.buildSearchQueryJSON(q), [q]);
+    const handleOnBackButtonPress = () => Navigation.goBack(ROUTES.SEARCH_CENTRAL_PANE.getRoute({query: SearchUtils.buildCannedSearchQuery()}));
+
+    // On small screens this page is not displayed, the configuration is in the file: src/libs/Navigation/AppNavigator/createCustomStackNavigator/index.tsx
+    // To avoid calling hooks in the Search component when this page isn't visible, we return null here.
+    if (shouldUseNarrowLayout) {
+        return null;
+    }
 
     return (
-        <ScreenWrapper testID={Search.displayName}>
+        <ScreenWrapper
+            testID={Search.displayName}
+            shouldShowOfflineIndicatorInWideScreen
+            offlineIndicatorStyle={styles.mtAuto}
+        >
             <FullPageNotFoundView
                 shouldForceFullScreen
-                shouldShow={!isValidQuery}
+                shouldShow={!queryJSON}
                 onBackButtonPress={handleOnBackButtonPress}
                 shouldShowLink={false}
             >
-                <HeaderWithBackButton
-                    title={translate('common.expenses')}
-                    icon={Illustrations.MoneyReceipts}
-                    shouldShowBackButton={false}
-                />
-                <Search query={query} />
+                {queryJSON && (
+                    <Search
+                        isCustomQuery={isCustomQuery}
+                        queryJSON={queryJSON}
+                    />
+                )}
             </FullPageNotFoundView>
         </ScreenWrapper>
     );
diff --git a/src/pages/Search/SearchPageBottomTab.tsx b/src/pages/Search/SearchPageBottomTab.tsx
index 3d2ee267b7a9..8b03da81456e 100644
--- a/src/pages/Search/SearchPageBottomTab.tsx
+++ b/src/pages/Search/SearchPageBottomTab.tsx
@@ -1,46 +1,87 @@
-import React from 'react';
+import React, {useMemo} from 'react';
+import {useOnyx} from 'react-native-onyx';
 import FullPageNotFoundView from '@components/BlockingViews/FullPageNotFoundView';
+import HeaderWithBackButton from '@components/HeaderWithBackButton';
 import ScreenWrapper from '@components/ScreenWrapper';
 import Search from '@components/Search';
-import useActiveRoute from '@hooks/useActiveRoute';
+import {useSearchContext} from '@components/Search/SearchContext';
+import useActiveCentralPaneRoute from '@hooks/useActiveCentralPaneRoute';
 import useLocalize from '@hooks/useLocalize';
+import useResponsiveLayout from '@hooks/useResponsiveLayout';
 import useThemeStyles from '@hooks/useThemeStyles';
-import useWindowDimensions from '@hooks/useWindowDimensions';
+import {turnOffMobileSelectionMode} from '@libs/actions/MobileSelectionMode';
 import Navigation from '@libs/Navigation/Navigation';
+import type {AuthScreensParamList} from '@libs/Navigation/types';
+import * as SearchUtils from '@libs/SearchUtils';
 import TopBar from '@navigation/AppNavigator/createCustomBottomTabNavigator/TopBar';
-import CONST from '@src/CONST';
+import ONYXKEYS from '@src/ONYXKEYS';
 import ROUTES from '@src/ROUTES';
-import type {SearchQuery} from '@src/types/onyx/SearchResults';
-import SearchFilters from './SearchFilters';
+import SCREENS from '@src/SCREENS';
+import SearchTypeMenu from './SearchTypeMenu';
 
 function SearchPageBottomTab() {
     const {translate} = useLocalize();
-    const {isSmallScreenWidth} = useWindowDimensions();
-    const activeRoute = useActiveRoute();
+    const {shouldUseNarrowLayout} = useResponsiveLayout();
+    const activeCentralPaneRoute = useActiveCentralPaneRoute();
     const styles = useThemeStyles();
+    const {clearSelectedTransactions} = useSearchContext();
+    const [selectionMode] = useOnyx(ONYXKEYS.MOBILE_SELECTION_MODE);
 
-    const currentQuery = activeRoute?.params && 'query' in activeRoute.params ? activeRoute?.params?.query : '';
-    const query = currentQuery as SearchQuery;
-    const isValidQuery = Object.values(CONST.TAB_SEARCH).includes(query);
+    const {queryJSON, policyID, isCustomQuery} = useMemo(() => {
+        if (activeCentralPaneRoute?.name !== SCREENS.SEARCH.CENTRAL_PANE) {
+            return {queryJSON: undefined, policyID: undefined, isCustomQuery: undefined};
+        }
 
-    const handleOnBackButtonPress = () => Navigation.goBack(ROUTES.SEARCH.getRoute(CONST.TAB_SEARCH.ALL));
+        const searchParams = activeCentralPaneRoute?.params as AuthScreensParamList[typeof SCREENS.SEARCH.CENTRAL_PANE];
+        const parsedQuery = SearchUtils.buildSearchQueryJSON(searchParams?.q);
+
+        return {
+            queryJSON: parsedQuery,
+            policyID: parsedQuery && SearchUtils.getPolicyIDFromSearchQuery(parsedQuery),
+            isCustomQuery: searchParams.isCustomQuery,
+        };
+    }, [activeCentralPaneRoute]);
+
+    const handleOnBackButtonPress = () => Navigation.goBack(ROUTES.SEARCH_CENTRAL_PANE.getRoute({query: SearchUtils.buildCannedSearchQuery()}));
 
     return (
         <ScreenWrapper
             testID={SearchPageBottomTab.displayName}
             style={styles.pv0}
+            offlineIndicatorStyle={styles.mtAuto}
         >
             <FullPageNotFoundView
-                shouldShow={!isValidQuery}
+                shouldShow={!queryJSON}
                 onBackButtonPress={handleOnBackButtonPress}
                 shouldShowLink={false}
             >
-                <TopBar
-                    breadcrumbLabel={translate('common.search')}
-                    shouldDisplaySearch={false}
-                />
-                <SearchFilters query={query} />
-                {isSmallScreenWidth && <Search query={query} />}
+                {!selectionMode?.isEnabled && queryJSON ? (
+                    <>
+                        <TopBar
+                            activeWorkspaceID={policyID}
+                            breadcrumbLabel={translate('common.search')}
+                            shouldDisplaySearch={false}
+                        />
+                        <SearchTypeMenu
+                            isCustomQuery={isCustomQuery}
+                            queryJSON={queryJSON}
+                        />
+                    </>
+                ) : (
+                    <HeaderWithBackButton
+                        title={translate('common.selectMultiple')}
+                        onBackButtonPress={() => {
+                            clearSelectedTransactions();
+                            turnOffMobileSelectionMode();
+                        }}
+                    />
+                )}
+                {shouldUseNarrowLayout && queryJSON && (
+                    <Search
+                        queryJSON={queryJSON}
+                        isCustomQuery={isCustomQuery}
+                    />
+                )}
             </FullPageNotFoundView>
         </ScreenWrapper>
     );
diff --git a/src/pages/Search/SearchSelectedNarrow.tsx b/src/pages/Search/SearchSelectedNarrow.tsx
new file mode 100644
index 000000000000..1cc34d6bf53a
--- /dev/null
+++ b/src/pages/Search/SearchSelectedNarrow.tsx
@@ -0,0 +1,84 @@
+import React, {useRef, useState} from 'react';
+import {View} from 'react-native';
+import Button from '@components/Button';
+import type {DropdownOption} from '@components/ButtonWithDropdownMenu/types';
+import MenuItem from '@components/MenuItem';
+import Modal from '@components/Modal';
+import type {SearchHeaderOptionValue} from '@components/Search/SearchPageHeader';
+import useLocalize from '@hooks/useLocalize';
+import useThemeStyles from '@hooks/useThemeStyles';
+import * as Expensicons from '@src/components/Icon/Expensicons';
+import CONST from '@src/CONST';
+
+type SearchSelectedNarrowProps = {options: Array<DropdownOption<SearchHeaderOptionValue>>; itemsLength: number};
+
+function SearchSelectedNarrow({options, itemsLength}: SearchSelectedNarrowProps) {
+    const styles = useThemeStyles();
+    const {translate} = useLocalize();
+    const selectedOptionIndexRef = useRef(-1);
+
+    const [isModalVisible, setIsModalVisible] = useState(false);
+    const buttonRef = useRef<View>(null);
+
+    const openMenu = () => setIsModalVisible(true);
+    const closeMenu = () => setIsModalVisible(false);
+
+    const handleOnModalHide = () => {
+        if (selectedOptionIndexRef.current === -1) {
+            return;
+        }
+        options[selectedOptionIndexRef.current]?.onSelected?.();
+    };
+
+    const handleOnMenuItemPress = (option: DropdownOption<SearchHeaderOptionValue>, index: number) => {
+        if (option?.shouldCloseModalOnSelect) {
+            selectedOptionIndexRef.current = index;
+            closeMenu();
+            return;
+        }
+        option?.onSelected?.();
+    };
+
+    const handleOnCloseMenu = () => {
+        selectedOptionIndexRef.current = -1;
+        closeMenu();
+    };
+
+    return (
+        <View style={[styles.pb4]}>
+            <Button
+                onPress={openMenu}
+                ref={buttonRef}
+                style={[styles.w100, styles.ph5]}
+                text={translate('workspace.common.selected', {selectedNumber: itemsLength})}
+                isContentCentered
+                iconRight={Expensicons.DownArrow}
+                isDisabled={options.length === 0}
+                shouldShowRightIcon={options.length !== 0}
+            />
+
+            <Modal
+                isVisible={isModalVisible}
+                type={CONST.MODAL.MODAL_TYPE.BOTTOM_DOCKED}
+                onClose={handleOnCloseMenu}
+                onModalHide={handleOnModalHide}
+            >
+                {options.map((option, index) => (
+                    <MenuItem
+                        // eslint-disable-next-line react/jsx-props-no-spreading
+                        {...option}
+                        title={option.text}
+                        titleStyle={option.titleStyle}
+                        icon={option.icon}
+                        onPress={() => handleOnMenuItemPress(option, index)}
+                        key={option.value}
+                    />
+                ))}
+            </Modal>
+        </View>
+    );
+}
+
+SearchSelectedNarrow.displayName = 'SearchSelectedNarrow';
+
+export default SearchSelectedNarrow;
diff --git a/src/pages/Search/SearchTypeMenu.tsx b/src/pages/Search/SearchTypeMenu.tsx
new file mode 100644
index 000000000000..a2d84209114b
--- /dev/null
+++ b/src/pages/Search/SearchTypeMenu.tsx
@@ -0,0 +1,102 @@
+import React from 'react';
+import {View} from 'react-native';
+import MenuItem from '@components/MenuItem';
+import type {SearchQueryJSON} from '@components/Search/types';
+import useLocalize from '@hooks/useLocalize';
+import useResponsiveLayout from '@hooks/useResponsiveLayout';
+import useSingleExecution from '@hooks/useSingleExecution';
+import useThemeStyles from '@hooks/useThemeStyles';
+import Navigation from '@libs/Navigation/Navigation';
+import * as SearchUtils from '@libs/SearchUtils';
+import variables from '@styles/variables';
+import * as Expensicons from '@src/components/Icon/Expensicons';
+import CONST from '@src/CONST';
+import type {Route} from '@src/ROUTES';
+import ROUTES from '@src/ROUTES';
+import type {SearchDataTypes} from '@src/types/onyx/SearchResults';
+import type IconAsset from '@src/types/utils/IconAsset';
+import SearchTypeMenuNarrow from './SearchTypeMenuNarrow';
+
+type SearchTypeMenuProps = {
+    queryJSON: SearchQueryJSON;
+    isCustomQuery: boolean;
+};
+
+type SearchTypeMenuItem = {
+    title: string;
+    type: SearchDataTypes;
+    icon: IconAsset;
+    route?: Route;
+};
+
+function SearchTypeMenu({queryJSON, isCustomQuery}: SearchTypeMenuProps) {
+    const {type} = queryJSON;
+    const styles = useThemeStyles();
+    const {shouldUseNarrowLayout} = useResponsiveLayout();
+    const {singleExecution} = useSingleExecution();
+    const {translate} = useLocalize();
+
+    const typeMenuItems: SearchTypeMenuItem[] = [
+        {
+            title: translate('common.expenses'),
+            type: CONST.SEARCH.DATA_TYPES.EXPENSE,
+            icon: Expensicons.Receipt,
+            route: ROUTES.SEARCH_CENTRAL_PANE.getRoute({query: SearchUtils.buildCannedSearchQuery()}),
+        },
+        {
+            title: translate('workspace.common.invoices'),
+            type: CONST.SEARCH.DATA_TYPES.INVOICE,
+            icon: Expensicons.InvoiceGeneric,
+            route: ROUTES.SEARCH_CENTRAL_PANE.getRoute({query: SearchUtils.buildCannedSearchQuery(CONST.SEARCH.DATA_TYPES.INVOICE, CONST.SEARCH.STATUS.INVOICE.ALL)}),
+        },
+        {
+            title: translate('travel.trips'),
+            type: CONST.SEARCH.DATA_TYPES.TRIP,
+            icon: Expensicons.Suitcase,
+            route: ROUTES.SEARCH_CENTRAL_PANE.getRoute({query: SearchUtils.buildCannedSearchQuery(CONST.SEARCH.DATA_TYPES.TRIP, CONST.SEARCH.STATUS.TRIP.ALL)}),
+        },
+    ];
+    const activeItemIndex = typeMenuItems.findIndex((item) => item.type === type);
+
+    if (shouldUseNarrowLayout) {
+        const title = isCustomQuery ? SearchUtils.getSearchHeaderTitle(queryJSON) : undefined;
+
+        return (
+            <SearchTypeMenuNarrow
+                typeMenuItems={typeMenuItems}
+                activeItemIndex={activeItemIndex}
+                title={title}
+            />
+        );
+    }
+
+    return (
+        <View style={[styles.pb4, styles.mh3, styles.mt3]}>
+            {typeMenuItems.map((item, index) => {
+                const onPress = singleExecution(() => Navigation.navigate(item.route));
+
+                return (
+                    <MenuItem
+                        key={item.title}
+                        disabled={false}
+                        interactive
+                        title={item.title}
+                        icon={item.icon}
+                        iconWidth={variables.iconSizeNormal}
+                        iconHeight={variables.iconSizeNormal}
+                        wrapperStyle={styles.sectionMenuItem}
+                        focused={index === activeItemIndex}
+                        hoverAndPressStyle={styles.hoveredComponentBG}
+                        onPress={onPress}
+                        isPaneMenu
+                    />
+                );
+            })}
+        </View>
+    );
+}
+
+SearchTypeMenu.displayName = 'SearchTypeMenu';
+
+export default SearchTypeMenu;
+export type {SearchTypeMenuItem};
diff --git a/src/pages/Search/SearchTypeMenuNarrow.tsx b/src/pages/Search/SearchTypeMenuNarrow.tsx
new file mode 100644
index 000000000000..0aa01dbb9fe4
--- /dev/null
+++ b/src/pages/Search/SearchTypeMenuNarrow.tsx
@@ -0,0 +1,115 @@
+import React, {useMemo, useRef, useState} from 'react';
+import {Animated, View} from 'react-native';
+import Button from '@components/Button';
+import Icon from '@components/Icon';
+import PopoverMenu from '@components/PopoverMenu';
+import PressableWithFeedback from '@components/Pressable/PressableWithFeedback';
+import Text from '@components/Text';
+import useSingleExecution from '@hooks/useSingleExecution';
+import useTheme from '@hooks/useTheme';
+import useThemeStyles from '@hooks/useThemeStyles';
+import useWindowDimensions from '@hooks/useWindowDimensions';
+import Navigation from '@libs/Navigation/Navigation';
+import * as Expensicons from '@src/components/Icon/Expensicons';
+import ROUTES from '@src/ROUTES';
+import type {SearchTypeMenuItem} from './SearchTypeMenu';
+
+type SearchTypeMenuNarrowProps = {
+    typeMenuItems: SearchTypeMenuItem[];
+    activeItemIndex: number;
+    title?: string;
+};
+
+function SearchTypeMenuNarrow({typeMenuItems, activeItemIndex, title}: SearchTypeMenuNarrowProps) {
+    const theme = useTheme();
+    const styles = useThemeStyles();
+    const {singleExecution} = useSingleExecution();
+    const {windowHeight} = useWindowDimensions();
+
+    const [isPopoverVisible, setIsPopoverVisible] = useState(false);
+    const buttonRef = useRef<HTMLDivElement>(null);
+
+    const openMenu = () => setIsPopoverVisible(true);
+    const closeMenu = () => setIsPopoverVisible(false);
+
+    const popoverMenuItems = typeMenuItems.map((item, index) => {
+        const isSelected = title ? false : index === activeItemIndex;
+
+        return {
+            text: item.title,
+            onSelected: singleExecution(() => Navigation.navigate(item.route)),
+            icon: item.icon,
+            iconFill: isSelected ? theme.iconSuccessFill : theme.icon,
+            iconRight: Expensicons.Checkmark,
+            shouldShowRightIcon: isSelected,
+            success: isSelected,
+            containerStyle: isSelected ? [{backgroundColor: theme.border}] : undefined,
+        };
+    });
+
+    if (title) {
+        popoverMenuItems.push({
+            text: title,
+            onSelected: closeMenu,
+            icon: Expensicons.Filters,
+            iconFill: theme.iconSuccessFill,
+            success: true,
+            containerStyle: [{backgroundColor: theme.border}],
+            iconRight: Expensicons.Checkmark,
+            shouldShowRightIcon: false,
+        });
+    }
+
+    const menuIcon = useMemo(() => (title ? Expensicons.Filters : popoverMenuItems[activeItemIndex]?.icon ?? Expensicons.Receipt), [activeItemIndex, popoverMenuItems, title]);
+    const menuTitle = useMemo(() => title ?? popoverMenuItems[activeItemIndex]?.text, [activeItemIndex, popoverMenuItems, title]);
+    const titleViewStyles = title ? {...styles.flex1, ...styles.justifyContentCenter} : {};
+
+    return (
+        <View style={[styles.pb4, styles.flexRow, styles.alignItemsCenter, styles.justifyContentBetween, styles.ph5, styles.gap2]}>
+            <PressableWithFeedback
+                accessible
+                accessibilityLabel={popoverMenuItems[activeItemIndex]?.text ?? ''}
+                ref={buttonRef}
+                wrapperStyle={styles.flex1}
+                onPress={openMenu}
+            >
+                {({hovered}) => (
+                    <Animated.View style={[styles.tabSelectorButton, styles.tabBackground(hovered, true, theme.border), styles.w100]}>
+                        <View style={[styles.flexRow, styles.gap2, styles.alignItemsCenter, titleViewStyles]}>
+                            <Icon
+                                src={menuIcon}
+                                fill={theme.icon}
+                            />
+                            <Text
+                                numberOfLines={1}
+                                style={[styles.textStrong, styles.flexShrink1]}
+                            >
+                                {menuTitle}
+                            </Text>
+                            <Icon
+                                src={Expensicons.DownArrow}
+                                fill={theme.icon}
+                            />
+                        </View>
+                    </Animated.View>
+                )}
+            </PressableWithFeedback>
+            <Button
+                icon={Expensicons.Filters}
+                onPress={() => Navigation.navigate(ROUTES.SEARCH_ADVANCED_FILTERS)}
+            />
+            <PopoverMenu
+                menuItems={popoverMenuItems}
+                isVisible={isPopoverVisible}
+                anchorPosition={styles.createMenuPositionSidebar(windowHeight)}
+                onClose={closeMenu}
+                onItemSelected={closeMenu}
+                anchorRef={buttonRef}
+            />
+        </View>
+    );
+}
+
+SearchTypeMenuNarrow.displayName = 'SearchTypeMenuNarrow';
+
+export default SearchTypeMenuNarrow;
diff --git a/src/pages/Search/useCustomBackHandler/index.android.ts b/src/pages/Search/useCustomBackHandler/index.android.ts
deleted file mode 100644
index f168cb0b9008..000000000000
--- a/src/pages/Search/useCustomBackHandler/index.android.ts
+++ /dev/null
@@ -1,34 +0,0 @@
-import {StackActions, useFocusEffect} from '@react-navigation/native';
-import {useCallback} from 'react';
-import {BackHandler} from 'react-native';
-import getTopmostCentralPaneRoute from '@libs/Navigation/getTopmostCentralPaneRoute';
-import navigationRef from '@libs/Navigation/navigationRef';
-import type {RootStackParamList, State} from '@libs/Navigation/types';
-import NAVIGATORS from '@src/NAVIGATORS';
-import SCREENS from '@src/SCREENS';
-
-// We need to make sure that the central pane screen and bottom tab won't be desynchronized after using the physical back button on Android.
-// To achieve that we will call additional POP on the bottom tab navigator if the search page would disappear from the central pane.
-function useCustomBackHandler() {
-    useFocusEffect(
-        useCallback(() => {
-            const onBackPress = () => {
-                const rootState = navigationRef.getRootState();
-
-                const bottomTabRoute = rootState.routes.find((route) => route.name === NAVIGATORS.BOTTOM_TAB_NAVIGATOR);
-                const centralPaneRouteAfterPop = getTopmostCentralPaneRoute({routes: [rootState.routes.at(-2)]} as State<RootStackParamList>);
-
-                if (bottomTabRoute && bottomTabRoute.state && (!centralPaneRouteAfterPop || centralPaneRouteAfterPop.name !== SCREENS.SEARCH.CENTRAL_PANE)) {
-                    navigationRef.dispatch({...StackActions.pop(), target: bottomTabRoute.state.key});
-                }
-                return false;
-            };
-
-            const subscription = BackHandler.addEventListener('hardwareBackPress', onBackPress);
-
-            return () => subscription.remove();
-        }, []),
-    );
-}
-
-export default useCustomBackHandler;
diff --git a/src/pages/Search/useCustomBackHandler/index.ts b/src/pages/Search/useCustomBackHandler/index.ts
deleted file mode 100644
index be753de818a6..000000000000
--- a/src/pages/Search/useCustomBackHandler/index.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-function useCustomBackHandler() {}
-
-export default useCustomBackHandler;
diff --git a/src/pages/ShareCodePage.tsx b/src/pages/ShareCodePage.tsx
index 2e2d7b10d758..e11e99a6e852 100644
--- a/src/pages/ShareCodePage.tsx
+++ b/src/pages/ShareCodePage.tsx
@@ -2,6 +2,7 @@ import React, {useMemo, useRef} from 'react';
 import {View} from 'react-native';
 import type {ImageSourcePropType} from 'react-native';
 import type {OnyxEntry} from 'react-native-onyx';
+import type {SvgProps} from 'react-native-svg';
 import expensifyLogo from '@assets/images/expensify-logo-round-transparent.png';
 import ContextMenuItem from '@components/ContextMenuItem';
 import HeaderWithBackButton from '@components/HeaderWithBackButton';
@@ -14,6 +15,7 @@ import ScrollView from '@components/ScrollView';
 import useCurrentUserPersonalDetails from '@hooks/useCurrentUserPersonalDetails';
 import useEnvironment from '@hooks/useEnvironment';
 import useLocalize from '@hooks/useLocalize';
+import useStyleUtils from '@hooks/useStyleUtils';
 import useThemeStyles from '@hooks/useThemeStyles';
 import Clipboard from '@libs/Clipboard';
 import Navigation from '@libs/Navigation/Navigation';
@@ -22,17 +24,38 @@ import * as Url from '@libs/Url';
 import * as UserUtils from '@libs/UserUtils';
 import CONST from '@src/CONST';
 import ROUTES from '@src/ROUTES';
-import type {Report} from '@src/types/onyx';
+import type {Policy, Report} from '@src/types/onyx';
 
 type ShareCodePageOnyxProps = {
     /** The report currently being looked at */
     report?: OnyxEntry<Report>;
+
+    /** The policy for the report currently being looked at */
+    policy?: OnyxEntry<Policy>;
 };
 
 type ShareCodePageProps = ShareCodePageOnyxProps;
 
-function ShareCodePage({report}: ShareCodePageProps) {
+/**
+ * When sharing a policy (workspace) only return user avatar that is user defined. Default ws avatars have separate logic.
+ * In any other case default to expensify logo
+ */
+
+function getLogoForWorkspace(report: OnyxEntry<Report>, policy?: OnyxEntry<Policy>): ImageSourcePropType | undefined {
+    if (!policy || !policy.id || report?.type !== 'chat') {
+        return expensifyLogo;
+    }
+
+    if (!policy.avatarURL) {
+        return undefined;
+    }
+
+    return policy.avatarURL as ImageSourcePropType;
+}
+
+function ShareCodePage({report, policy}: ShareCodePageProps) {
     const themeStyles = useThemeStyles();
+    const StyleUtils = useStyleUtils();
     const {translate} = useLocalize();
     const {environmentURL} = useEnvironment();
     const qrCodeRef = useRef<QRShareHandle>(null);
@@ -47,7 +70,7 @@ function ShareCodePage({report}: ShareCodePageProps) {
             }
             if (ReportUtils.isMoneyRequestReport(report)) {
                 // generate subtitle from participants
-                return ReportUtils.getVisibleChatMemberAccountIDs(report.reportID)
+                return ReportUtils.getParticipantsAccountIDsForDisplay(report, true)
                     .map((accountID) => ReportUtils.getDisplayNameForParticipant(accountID))
                     .join(' & ');
             }
@@ -62,13 +85,28 @@ function ShareCodePage({report}: ShareCodePageProps) {
     const urlWithTrailingSlash = Url.addTrailingForwardSlash(environmentURL);
     const url = isReport
         ? `${urlWithTrailingSlash}${ROUTES.REPORT_WITH_ID.getRoute(report.reportID)}`
-        : `${urlWithTrailingSlash}${ROUTES.PROFILE.getRoute(currentUserPersonalDetails.accountID ?? '')}`;
+        : `${urlWithTrailingSlash}${ROUTES.PROFILE.getRoute(currentUserPersonalDetails.accountID ?? '-1')}`;
+
+    const logo = isReport ? getLogoForWorkspace(report, policy) : (UserUtils.getAvatarUrl(currentUserPersonalDetails?.avatar, currentUserPersonalDetails?.accountID) as ImageSourcePropType);
+
+    // Default logos (avatars) are SVG and they require some special logic to display correctly
+    let svgLogo: React.FC<SvgProps> | undefined;
+    let logoBackgroundColor: string | undefined;
+    let svgLogoFillColor: string | undefined;
+
+    if (!logo && policy && !policy.avatarURL) {
+        svgLogo = ReportUtils.getDefaultWorkspaceAvatar(policy.name) || Expensicons.FallbackAvatar;
+
+        const defaultWorkspaceAvatarColors = StyleUtils.getDefaultWorkspaceAvatarColor(policy.id ?? '');
+        logoBackgroundColor = defaultWorkspaceAvatarColors.backgroundColor?.toString();
+        svgLogoFillColor = defaultWorkspaceAvatarColors.fill;
+    }
 
     return (
         <ScreenWrapper testID={ShareCodePage.displayName}>
             <HeaderWithBackButton
                 title={translate('common.shareCode')}
-                onBackButtonPress={() => Navigation.goBack(isReport ? ROUTES.REPORT_WITH_ID_DETAILS.getRoute(report.reportID) : undefined)}
+                onBackButtonPress={() => Navigation.goBack(isReport ? ROUTES.REPORT_WITH_ID_DETAILS.getRoute(report?.reportID) : undefined)}
                 shouldShowBackButton
             />
             <ScrollView style={[themeStyles.flex1, themeStyles.pt3]}>
@@ -85,9 +123,12 @@ function ShareCodePage({report}: ShareCodePageProps) {
                         url={url}
                         title={title}
                         subtitle={subtitle}
-                        logo={isReport ? expensifyLogo : (UserUtils.getAvatarUrl(currentUserPersonalDetails?.avatar, currentUserPersonalDetails?.accountID) as ImageSourcePropType)}
-                        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}
+                        logo={logo}
+                        svgLogo={svgLogo}
+                        logoBackgroundColor={logoBackgroundColor}
+                        svgLogoFillColor={svgLogoFillColor}
+                        logoRatio={CONST.QR.DEFAULT_LOGO_SIZE_RATIO}
+                        logoMarginRatio={CONST.QR.DEFAULT_LOGO_MARGIN_RATIO}
                     />
                 </View>
 
diff --git a/src/pages/SubmitExpensePage.tsx b/src/pages/SubmitExpensePage.tsx
new file mode 100644
index 000000000000..f4f6ea623c34
--- /dev/null
+++ b/src/pages/SubmitExpensePage.tsx
@@ -0,0 +1,56 @@
+import {useFocusEffect} from '@react-navigation/native';
+import React, {useEffect, useRef} from 'react';
+import {View} from 'react-native';
+import ReportActionsSkeletonView from '@components/ReportActionsSkeletonView';
+import ReportHeaderSkeletonView from '@components/ReportHeaderSkeletonView';
+import ScreenWrapper from '@components/ScreenWrapper';
+import useThemeStyles from '@hooks/useThemeStyles';
+import interceptAnonymousUser from '@libs/interceptAnonymousUser';
+import Navigation from '@libs/Navigation/Navigation';
+import * as ReportUtils from '@libs/ReportUtils';
+import * as App from '@userActions/App';
+import * as IOU from '@userActions/IOU';
+import CONST from '@src/CONST';
+
+/*
+ * This is a "utility page", that does this:
+ *     - If the user is authenticated, start Submit Expense
+ *     - Else re-route to the login page
+ */
+function SubmitExpensePage() {
+    const styles = useThemeStyles();
+    const isUnmounted = useRef(false);
+
+    useFocusEffect(() => {
+        interceptAnonymousUser(() => {
+            App.confirmReadyToOpenApp();
+            Navigation.isNavigationReady().then(() => {
+                if (isUnmounted.current) {
+                    return;
+                }
+                Navigation.goBack();
+                IOU.startMoneyRequest(CONST.IOU.TYPE.SUBMIT, ReportUtils.generateReportID());
+            });
+        });
+    });
+
+    useEffect(
+        () => () => {
+            isUnmounted.current = true;
+        },
+        [],
+    );
+
+    return (
+        <ScreenWrapper testID={SubmitExpensePage.displayName}>
+            <View style={[styles.borderBottom]}>
+                <ReportHeaderSkeletonView onBackButtonPress={Navigation.goBack} />
+            </View>
+            <ReportActionsSkeletonView />
+        </ScreenWrapper>
+    );
+}
+
+SubmitExpensePage.displayName = 'SubmitExpensePage';
+
+export default SubmitExpensePage;
diff --git a/src/pages/TeachersUnite/ImTeacherUpdateEmailPage.tsx b/src/pages/TeachersUnite/ImTeacherUpdateEmailPage.tsx
index 58d011949e86..de41c2708bce 100644
--- a/src/pages/TeachersUnite/ImTeacherUpdateEmailPage.tsx
+++ b/src/pages/TeachersUnite/ImTeacherUpdateEmailPage.tsx
@@ -14,7 +14,6 @@ import ROUTES from '@src/ROUTES';
 function ImTeacherUpdateEmailPage() {
     const styles = useThemeStyles();
     const {translate} = useLocalize();
-    const activeRoute = Navigation.getActiveRouteWithoutParams();
 
     return (
         <ScreenWrapper testID={ImTeacherUpdateEmailPage.displayName}>
@@ -29,7 +28,7 @@ function ImTeacherUpdateEmailPage() {
                 title={translate('teachersUnitePage.updateYourEmail')}
                 subtitle={translate('teachersUnitePage.schoolMailAsDefault')}
                 linkKey="teachersUnitePage.contactMethods"
-                onLinkPress={() => Navigation.navigate(ROUTES.SETTINGS_CONTACT_METHODS.getRoute(activeRoute))}
+                onLinkPress={() => Navigation.navigate(ROUTES.SETTINGS_CONTACT_METHODS.getRoute(Navigation.getActiveRouteWithoutParams()))}
                 iconWidth={variables.signInLogoWidthLargeScreen}
                 iconHeight={variables.signInLogoHeightLargeScreen}
             />
@@ -39,7 +38,7 @@ function ImTeacherUpdateEmailPage() {
                     large
                     accessibilityLabel={translate('teachersUnitePage.updateEmail')}
                     text={translate('teachersUnitePage.updateEmail')}
-                    onPress={() => Navigation.navigate(ROUTES.SETTINGS_CONTACT_METHODS.getRoute(activeRoute))}
+                    onPress={() => Navigation.navigate(ROUTES.SETTINGS_CONTACT_METHODS.getRoute(Navigation.getActiveRouteWithoutParams()))}
                 />
             </FixedFooter>
         </ScreenWrapper>
diff --git a/src/pages/TeachersUnite/IntroSchoolPrincipalPage.tsx b/src/pages/TeachersUnite/IntroSchoolPrincipalPage.tsx
index 6e8c3b340f4e..ca48cf807276 100644
--- a/src/pages/TeachersUnite/IntroSchoolPrincipalPage.tsx
+++ b/src/pages/TeachersUnite/IntroSchoolPrincipalPage.tsx
@@ -1,4 +1,4 @@
-import Str from 'expensify-common/lib/str';
+import {Str} from 'expensify-common';
 import React, {useCallback} from 'react';
 import {View} from 'react-native';
 import {withOnyx} from 'react-native-onyx';
@@ -50,27 +50,27 @@ function IntroSchoolPrincipalPage(props: IntroSchoolPrincipalPageProps) {
             const errors: FormInputErrors<typeof ONYXKEYS.FORMS.INTRO_SCHOOL_PRINCIPAL_FORM> = {};
 
             if (!values.firstName || !ValidationUtils.isValidPersonName(values.firstName)) {
-                ErrorUtils.addErrorMessage(errors, 'firstName', 'bankAccount.error.firstName');
+                ErrorUtils.addErrorMessage(errors, 'firstName', translate('bankAccount.error.firstName'));
             }
             if (!values.lastName || !ValidationUtils.isValidPersonName(values.lastName)) {
-                ErrorUtils.addErrorMessage(errors, 'lastName', 'bankAccount.error.lastName');
+                ErrorUtils.addErrorMessage(errors, 'lastName', translate('bankAccount.error.lastName'));
             }
             if (!values.partnerUserID) {
-                ErrorUtils.addErrorMessage(errors, 'partnerUserID', 'teachersUnitePage.error.enterEmail');
+                ErrorUtils.addErrorMessage(errors, 'partnerUserID', translate('teachersUnitePage.error.enterEmail'));
             }
             if (values.partnerUserID && props.loginList?.[values.partnerUserID.toLowerCase()]) {
-                ErrorUtils.addErrorMessage(errors, 'partnerUserID', 'teachersUnitePage.error.tryDifferentEmail');
+                ErrorUtils.addErrorMessage(errors, 'partnerUserID', translate('teachersUnitePage.error.tryDifferentEmail'));
             }
             if (values.partnerUserID && !Str.isValidEmail(values.partnerUserID)) {
-                ErrorUtils.addErrorMessage(errors, 'partnerUserID', 'teachersUnitePage.error.enterValidEmail');
+                ErrorUtils.addErrorMessage(errors, 'partnerUserID', translate('teachersUnitePage.error.enterValidEmail'));
             }
             if (values.partnerUserID && LoginUtils.isEmailPublicDomain(values.partnerUserID)) {
-                ErrorUtils.addErrorMessage(errors, 'partnerUserID', 'teachersUnitePage.error.tryDifferentEmail');
+                ErrorUtils.addErrorMessage(errors, 'partnerUserID', translate('teachersUnitePage.error.tryDifferentEmail'));
             }
 
             return errors;
         },
-        [props.loginList],
+        [props.loginList, translate],
     );
 
     return (
diff --git a/src/pages/TeachersUnite/KnowATeacherPage.tsx b/src/pages/TeachersUnite/KnowATeacherPage.tsx
index cb58009c40f0..449f05763bb6 100644
--- a/src/pages/TeachersUnite/KnowATeacherPage.tsx
+++ b/src/pages/TeachersUnite/KnowATeacherPage.tsx
@@ -1,4 +1,4 @@
-import Str from 'expensify-common/lib/str';
+import {Str} from 'expensify-common';
 import React, {useCallback} from 'react';
 import {View} from 'react-native';
 import {withOnyx} from 'react-native-onyx';
@@ -58,25 +58,25 @@ function KnowATeacherPage(props: KnowATeacherPageProps) {
             const phoneLogin = LoginUtils.getPhoneLogin(values.partnerUserID);
             const validateIfNumber = LoginUtils.validateNumber(phoneLogin);
 
-            if (!values.firstName || !ValidationUtils.isValidPersonName(values.firstName)) {
-                ErrorUtils.addErrorMessage(errors, 'firstName', 'bankAccount.error.firstName');
+            if (!values.firstName || !ValidationUtils.isValidDisplayName(values.firstName)) {
+                ErrorUtils.addErrorMessage(errors, 'firstName', translate('personalDetails.error.hasInvalidCharacter'));
             }
-            if (!values.lastName || !ValidationUtils.isValidPersonName(values.lastName)) {
-                ErrorUtils.addErrorMessage(errors, 'lastName', 'bankAccount.error.lastName');
+            if (!values.lastName || !ValidationUtils.isValidDisplayName(values.lastName)) {
+                ErrorUtils.addErrorMessage(errors, 'lastName', translate('personalDetails.error.hasInvalidCharacter'));
             }
             if (!values.partnerUserID) {
-                ErrorUtils.addErrorMessage(errors, 'partnerUserID', 'teachersUnitePage.error.enterPhoneEmail');
+                ErrorUtils.addErrorMessage(errors, 'partnerUserID', translate('teachersUnitePage.error.enterPhoneEmail'));
             }
             if (values.partnerUserID && props.loginList?.[validateIfNumber || values.partnerUserID.toLowerCase()]) {
-                ErrorUtils.addErrorMessage(errors, 'partnerUserID', 'teachersUnitePage.error.tryDifferentEmail');
+                ErrorUtils.addErrorMessage(errors, 'partnerUserID', translate('teachersUnitePage.error.tryDifferentEmail'));
             }
             if (values.partnerUserID && !(validateIfNumber || Str.isValidEmail(values.partnerUserID))) {
-                ErrorUtils.addErrorMessage(errors, 'partnerUserID', 'contacts.genericFailureMessages.invalidContactMethod');
+                ErrorUtils.addErrorMessage(errors, 'partnerUserID', translate('contacts.genericFailureMessages.invalidContactMethod'));
             }
 
             return errors;
         },
-        [props.loginList],
+        [props.loginList, translate],
     );
 
     return (
diff --git a/src/pages/TeachersUnite/SaveTheWorldPage.tsx b/src/pages/TeachersUnite/SaveTheWorldPage.tsx
index cc414315e725..b4f850981c92 100644
--- a/src/pages/TeachersUnite/SaveTheWorldPage.tsx
+++ b/src/pages/TeachersUnite/SaveTheWorldPage.tsx
@@ -8,10 +8,10 @@ import ScreenWrapper from '@components/ScreenWrapper';
 import ScrollView from '@components/ScrollView';
 import Section from '@components/Section';
 import useLocalize from '@hooks/useLocalize';
+import useResponsiveLayout from '@hooks/useResponsiveLayout';
 import useTheme from '@hooks/useTheme';
 import useThemeStyles from '@hooks/useThemeStyles';
 import useWaitForNavigation from '@hooks/useWaitForNavigation';
-import useWindowDimensions from '@hooks/useWindowDimensions';
 import Navigation from '@libs/Navigation/Navigation';
 import type {TranslationPaths} from '@src/languages/types';
 import ROUTES from '@src/ROUTES';
@@ -21,7 +21,7 @@ function SaveTheWorldPage() {
     const styles = useThemeStyles();
     const {translate} = useLocalize();
     const waitForNavigate = useWaitForNavigation();
-    const {isSmallScreenWidth} = useWindowDimensions();
+    const {shouldUseNarrowLayout} = useResponsiveLayout();
     const theme = useTheme();
 
     const menuItems = useMemo(() => {
@@ -55,12 +55,12 @@ function SaveTheWorldPage() {
         >
             <HeaderWithBackButton
                 title={translate('sidebarScreen.saveTheWorld')}
-                shouldShowBackButton={isSmallScreenWidth}
+                shouldShowBackButton={shouldUseNarrowLayout}
                 onBackButtonPress={() => Navigation.goBack()}
                 icon={Illustrations.TeachersUnite}
             />
             <ScrollView contentContainerStyle={styles.pt3}>
-                <View style={[styles.flex1, isSmallScreenWidth ? styles.workspaceSectionMobile : styles.workspaceSection]}>
+                <View style={[styles.flex1, shouldUseNarrowLayout ? styles.workspaceSectionMobile : styles.workspaceSection]}>
                     <Section
                         title={translate('teachersUnitePage.teachersUnite')}
                         subtitle={translate('teachersUnitePage.joinExpensifyOrg')}
diff --git a/src/pages/TrackExpensePage.tsx b/src/pages/TrackExpensePage.tsx
new file mode 100644
index 000000000000..2e08c49721be
--- /dev/null
+++ b/src/pages/TrackExpensePage.tsx
@@ -0,0 +1,74 @@
+import {useFocusEffect} from '@react-navigation/native';
+import React, {useEffect, useRef} from 'react';
+import {View} from 'react-native';
+import {useOnyx} from 'react-native-onyx';
+import ReportActionsSkeletonView from '@components/ReportActionsSkeletonView';
+import ReportHeaderSkeletonView from '@components/ReportHeaderSkeletonView';
+import ScreenWrapper from '@components/ScreenWrapper';
+import useNetwork from '@hooks/useNetwork';
+import useThemeStyles from '@hooks/useThemeStyles';
+import interceptAnonymousUser from '@libs/interceptAnonymousUser';
+import Navigation from '@libs/Navigation/Navigation';
+import * as ReportUtils from '@libs/ReportUtils';
+import * as App from '@userActions/App';
+import * as IOU from '@userActions/IOU';
+import CONST from '@src/CONST';
+import ONYXKEYS from '@src/ONYXKEYS';
+import ROUTES from '@src/ROUTES';
+import isLoadingOnyxValue from '@src/types/utils/isLoadingOnyxValue';
+
+/*
+ * This is a "utility page", that does this:
+ *     - If the user is authenticated, find their self DM and and start a Track Expense
+ *     - Else re-route to the login page
+ */
+function TrackExpensePage() {
+    const styles = useThemeStyles();
+    const isUnmounted = useRef(false);
+    const {isOffline} = useNetwork();
+    const [hasSeenTrackTraining, hasSeenTrackTrainingResult] = useOnyx(ONYXKEYS.NVP_HAS_SEEN_TRACK_TRAINING);
+    const isLoadingHasSeenTrackTraining = isLoadingOnyxValue(hasSeenTrackTrainingResult);
+
+    useFocusEffect(() => {
+        interceptAnonymousUser(() => {
+            App.confirmReadyToOpenApp();
+            Navigation.isNavigationReady().then(() => {
+                if (isUnmounted.current || isLoadingHasSeenTrackTraining) {
+                    return;
+                }
+                Navigation.goBack();
+                IOU.startMoneyRequest(
+                    CONST.IOU.TYPE.TRACK,
+                    // eslint-disable-next-line @typescript-eslint/prefer-nullish-coalescing
+                    ReportUtils.findSelfDMReportID() || ReportUtils.generateReportID(),
+                );
+
+                if (!hasSeenTrackTraining && !isOffline) {
+                    setTimeout(() => {
+                        Navigation.navigate(ROUTES.TRACK_TRAINING_MODAL);
+                    }, CONST.ANIMATED_TRANSITION);
+                }
+            });
+        });
+    });
+
+    useEffect(
+        () => () => {
+            isUnmounted.current = true;
+        },
+        [],
+    );
+
+    return (
+        <ScreenWrapper testID={TrackExpensePage.displayName}>
+            <View style={[styles.borderBottom]}>
+                <ReportHeaderSkeletonView onBackButtonPress={Navigation.goBack} />
+            </View>
+            <ReportActionsSkeletonView />
+        </ScreenWrapper>
+    );
+}
+
+TrackExpensePage.displayName = 'TrackExpensePage';
+
+export default TrackExpensePage;
diff --git a/src/pages/TransactionDuplicate/Confirmation.tsx b/src/pages/TransactionDuplicate/Confirmation.tsx
new file mode 100644
index 000000000000..96b32006675e
--- /dev/null
+++ b/src/pages/TransactionDuplicate/Confirmation.tsx
@@ -0,0 +1,124 @@
+import type {RouteProp} from '@react-navigation/native';
+import {useRoute} from '@react-navigation/native';
+import React, {useCallback, useMemo} from 'react';
+import {View} from 'react-native';
+import type {OnyxEntry} from 'react-native-onyx';
+import {useOnyx} from 'react-native-onyx';
+import FullPageNotFoundView from '@components/BlockingViews/FullPageNotFoundView';
+import Button from '@components/Button';
+import FixedFooter from '@components/FixedFooter';
+import FullScreenLoadingIndicator from '@components/FullscreenLoadingIndicator';
+import HeaderWithBackButton from '@components/HeaderWithBackButton';
+import MoneyRequestView from '@components/ReportActionItem/MoneyRequestView';
+import ScreenWrapper from '@components/ScreenWrapper';
+import ScrollView from '@components/ScrollView';
+import {ShowContextMenuContext} from '@components/ShowContextMenuContext';
+import Text from '@components/Text';
+import useLocalize from '@hooks/useLocalize';
+import useThemeStyles from '@hooks/useThemeStyles';
+import Navigation from '@libs/Navigation/Navigation';
+import type {TransactionDuplicateNavigatorParamList} from '@libs/Navigation/types';
+import variables from '@styles/variables';
+import * as IOU from '@src/libs/actions/IOU';
+import * as ReportActionsUtils from '@src/libs/ReportActionsUtils';
+import * as ReportUtils from '@src/libs/ReportUtils';
+import * as TransactionUtils from '@src/libs/TransactionUtils';
+import ONYXKEYS from '@src/ONYXKEYS';
+import ROUTES from '@src/ROUTES';
+import type SCREENS from '@src/SCREENS';
+import type {Transaction} from '@src/types/onyx';
+import {isEmptyObject} from '@src/types/utils/EmptyObject';
+import isLoadingOnyxValue from '@src/types/utils/isLoadingOnyxValue';
+
+function Confirmation() {
+    const styles = useThemeStyles();
+    const {translate} = useLocalize();
+    const route = useRoute<RouteProp<TransactionDuplicateNavigatorParamList, typeof SCREENS.TRANSACTION_DUPLICATE.REVIEW>>();
+    const [reviewDuplicates, reviewDuplicatesResult] = useOnyx(ONYXKEYS.REVIEW_DUPLICATES);
+    const transaction = useMemo(() => TransactionUtils.buildNewTransactionAfterReviewingDuplicates(reviewDuplicates), [reviewDuplicates]);
+    const [report, reportResult] = useOnyx(`${ONYXKEYS.COLLECTION.REPORT}${route.params.threadReportID}`);
+    const [reportActions] = useOnyx(`${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${transaction?.reportID}`);
+    const reportAction = Object.values(reportActions ?? {}).find(
+        (action) => ReportActionsUtils.isMoneyRequestAction(action) && ReportActionsUtils.getOriginalMessage(action)?.IOUTransactionID === reviewDuplicates?.transactionID,
+    );
+
+    const transactionsMergeParams = useMemo(() => TransactionUtils.buildTransactionsMergeParams(reviewDuplicates, transaction), [reviewDuplicates, transaction]);
+    const mergeDuplicates = useCallback(() => {
+        IOU.mergeDuplicates(transactionsMergeParams);
+        Navigation.navigate(ROUTES.REPORT_WITH_ID.getRoute(reportAction?.childReportID ?? '-1'));
+    }, [reportAction?.childReportID, transactionsMergeParams]);
+
+    const contextValue = useMemo(
+        () => ({
+            transactionThreadReport: report,
+            action: reportAction,
+            report,
+            checkIfContextMenuActive: () => {},
+            reportNameValuePairs: undefined,
+            anchor: null,
+        }),
+        [report, reportAction],
+    );
+
+    const reportTransactionID = TransactionUtils.getTransactionID(report?.reportID ?? '');
+    const doesTransactionBelongToReport = reviewDuplicates?.transactionID === reportTransactionID || reviewDuplicates?.duplicates.includes(reportTransactionID);
+
+    // eslint-disable-next-line rulesdir/no-negated-variables
+    const shouldShowNotFoundPage =
+        isEmptyObject(report) ||
+        !ReportUtils.isValidReport(report) ||
+        ReportUtils.isReportNotFound(report) ||
+        (reviewDuplicatesResult.status === 'loaded' && (!transaction?.transactionID || !doesTransactionBelongToReport));
+
+    if (isLoadingOnyxValue(reviewDuplicatesResult, reportResult)) {
+        return <FullScreenLoadingIndicator />;
+    }
+
+    return (
+        <ScreenWrapper
+            testID={Confirmation.displayName}
+            shouldShowOfflineIndicator
+        >
+            {({safeAreaPaddingBottomStyle}) => (
+                <FullPageNotFoundView shouldShow={shouldShowNotFoundPage}>
+                    <View style={[styles.flex1, safeAreaPaddingBottomStyle]}>
+                        <HeaderWithBackButton title={translate('iou.reviewDuplicates')} />
+                        <ScrollView>
+                            <View style={[styles.ph5, styles.pb8]}>
+                                <Text
+                                    family="EXP_NEW_KANSAS_MEDIUM"
+                                    fontSize={variables.fontSizeLarge}
+                                    style={styles.pb5}
+                                >
+                                    {translate('violations.confirmDetails')}
+                                </Text>
+                                <Text>{translate('violations.confirmDuplicatesInfo')}</Text>
+                            </View>
+                            {/* We need that provider here becuase MoneyRequestView component requires that */}
+                            <ShowContextMenuContext.Provider value={contextValue}>
+                                <MoneyRequestView
+                                    report={report}
+                                    shouldShowAnimatedBackground={false}
+                                    readonly
+                                    updatedTransaction={transaction as OnyxEntry<Transaction>}
+                                />
+                            </ShowContextMenuContext.Provider>
+                        </ScrollView>
+                        <FixedFooter style={styles.mtAuto}>
+                            <Button
+                                text={translate('common.confirm')}
+                                success
+                                onPress={mergeDuplicates}
+                                large
+                            />
+                        </FixedFooter>
+                    </View>
+                </FullPageNotFoundView>
+            )}
+        </ScreenWrapper>
+    );
+}
+
+Confirmation.displayName = 'Confirmation';
+
+export default Confirmation;
diff --git a/src/pages/TransactionDuplicate/DuplicateTransactionItem.tsx b/src/pages/TransactionDuplicate/DuplicateTransactionItem.tsx
new file mode 100644
index 000000000000..398ea8ae336b
--- /dev/null
+++ b/src/pages/TransactionDuplicate/DuplicateTransactionItem.tsx
@@ -0,0 +1,50 @@
+import React from 'react';
+import {View} from 'react-native';
+import type {OnyxEntry} from 'react-native-onyx';
+import {useOnyx} from 'react-native-onyx';
+import useThemeStyles from '@hooks/useThemeStyles';
+import * as ReportActionsUtils from '@libs/ReportActionsUtils';
+import ReportActionItem from '@pages/home/report/ReportActionItem';
+import ONYXKEYS from '@src/ONYXKEYS';
+import type {Transaction} from '@src/types/onyx';
+
+type DuplicateTransactionItemProps = {
+    transaction: OnyxEntry<Transaction>;
+    index: number;
+};
+
+function DuplicateTransactionItem(props: DuplicateTransactionItemProps) {
+    const styles = useThemeStyles();
+    const [report] = useOnyx(`${ONYXKEYS.COLLECTION.REPORT}${props.transaction?.reportID}`);
+    const [reportActions] = useOnyx(`${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${report?.reportID}`);
+
+    // eslint-disable-next-line @typescript-eslint/no-non-null-assertion, @typescript-eslint/non-nullable-type-assertion-style
+    const action = Object.values(reportActions ?? {})?.find((reportAction) => {
+        const IOUTransactionID = ReportActionsUtils.isMoneyRequestAction(reportAction) ? ReportActionsUtils.getOriginalMessage(reportAction)?.IOUTransactionID : -1;
+        return IOUTransactionID === props.transaction?.transactionID;
+    });
+
+    if (!action || !report) {
+        return null;
+    }
+
+    return (
+        <View style={styles.pb2}>
+            <ReportActionItem
+                action={action}
+                report={report}
+                parentReportAction={ReportActionsUtils.getReportAction(report?.parentReportID ?? '', report?.parentReportActionID ?? '')}
+                index={props.index}
+                reportActions={Object.values(reportActions ?? {})}
+                displayAsGroup={false}
+                shouldDisplayNewMarker={false}
+                isMostRecentIOUReportAction={false}
+                isFirstVisibleReportAction={false}
+                shouldDisplayContextMenu={false}
+            />
+        </View>
+    );
+}
+
+DuplicateTransactionItem.displayName = 'DuplicateTransactionItem';
+export default DuplicateTransactionItem;
diff --git a/src/pages/TransactionDuplicate/DuplicateTransactionsList.tsx b/src/pages/TransactionDuplicate/DuplicateTransactionsList.tsx
new file mode 100644
index 000000000000..00b80fecf824
--- /dev/null
+++ b/src/pages/TransactionDuplicate/DuplicateTransactionsList.tsx
@@ -0,0 +1,41 @@
+import React from 'react';
+import type {FlatListProps, ScrollViewProps} from 'react-native';
+import type {OnyxEntry} from 'react-native-onyx';
+import FlatList from '@components/FlatList';
+import useThemeStyles from '@hooks/useThemeStyles';
+import type {Transaction} from '@src/types/onyx';
+import DuplicateTransactionItem from './DuplicateTransactionItem';
+
+type DuplicateTransactionsListProps = {
+    transactions: Array<OnyxEntry<Transaction>>;
+};
+
+const keyExtractor: FlatListProps<OnyxEntry<Transaction>>['keyExtractor'] = (item, index) => `${item?.transactionID}+${index}`;
+
+const renderItem: FlatListProps<OnyxEntry<Transaction>>['renderItem'] = ({item, index}) => (
+    <DuplicateTransactionItem
+        transaction={item}
+        index={index}
+    />
+);
+
+const maintainVisibleContentPosition: ScrollViewProps['maintainVisibleContentPosition'] = {
+    minIndexForVisible: 1,
+};
+
+function DuplicateTransactionsList({transactions}: DuplicateTransactionsListProps) {
+    const styles = useThemeStyles();
+
+    return (
+        <FlatList
+            data={transactions}
+            renderItem={renderItem}
+            keyExtractor={keyExtractor}
+            maintainVisibleContentPosition={maintainVisibleContentPosition}
+            contentContainerStyle={styles.pt5}
+        />
+    );
+}
+
+DuplicateTransactionsList.displayName = 'DuplicateTransactionsList';
+export default DuplicateTransactionsList;
diff --git a/src/pages/TransactionDuplicate/Review.tsx b/src/pages/TransactionDuplicate/Review.tsx
new file mode 100644
index 000000000000..fc6af1f273e5
--- /dev/null
+++ b/src/pages/TransactionDuplicate/Review.tsx
@@ -0,0 +1,62 @@
+import type {RouteProp} from '@react-navigation/native';
+import {useRoute} from '@react-navigation/native';
+import React, {useMemo} from 'react';
+import {View} from 'react-native';
+import {useOnyx} from 'react-native-onyx';
+import FullPageNotFoundView from '@components/BlockingViews/FullPageNotFoundView';
+import Button from '@components/Button';
+import HeaderWithBackButton from '@components/HeaderWithBackButton';
+import ScreenWrapper from '@components/ScreenWrapper';
+import useCurrentUserPersonalDetails from '@hooks/useCurrentUserPersonalDetails';
+import useLocalize from '@hooks/useLocalize';
+import useThemeStyles from '@hooks/useThemeStyles';
+import Navigation from '@libs/Navigation/Navigation';
+import type {TransactionDuplicateNavigatorParamList} from '@libs/Navigation/types';
+import * as ReportActionsUtils from '@libs/ReportActionsUtils';
+import * as TransactionUtils from '@libs/TransactionUtils';
+import * as Transaction from '@userActions/Transaction';
+import CONST from '@src/CONST';
+import ONYXKEYS from '@src/ONYXKEYS';
+import type SCREENS from '@src/SCREENS';
+import DuplicateTransactionsList from './DuplicateTransactionsList';
+
+function TransactionDuplicateReview() {
+    const styles = useThemeStyles();
+    const {translate} = useLocalize();
+    const route = useRoute<RouteProp<TransactionDuplicateNavigatorParamList, typeof SCREENS.TRANSACTION_DUPLICATE.REVIEW>>();
+    const currentPersonalDetails = useCurrentUserPersonalDetails();
+    const [report] = useOnyx(`${ONYXKEYS.COLLECTION.REPORT}${route.params.threadReportID}`);
+    const reportAction = ReportActionsUtils.getReportAction(report?.parentReportID ?? '-1', report?.parentReportActionID ?? '-1');
+    const transactionID = ReportActionsUtils.getLinkedTransactionID(reportAction, report?.reportID ?? '-1') ?? '-1';
+    const [transactionViolations] = useOnyx(`${ONYXKEYS.COLLECTION.TRANSACTION_VIOLATIONS}${transactionID}`);
+    const duplicateTransactionIDs = useMemo(
+        () => transactionViolations?.find((violation) => violation.name === CONST.VIOLATIONS.DUPLICATED_TRANSACTION)?.data?.duplicates ?? [],
+        [transactionViolations],
+    );
+    const transactionIDs = [transactionID, ...duplicateTransactionIDs];
+
+    const transactions = transactionIDs.map((item) => TransactionUtils.getTransaction(item)).sort((a, b) => new Date(a?.created ?? '').getTime() - new Date(b?.created ?? '').getTime());
+
+    const keepAll = () => {
+        Transaction.dismissDuplicateTransactionViolation(transactionIDs, currentPersonalDetails);
+        Navigation.goBack();
+    };
+
+    return (
+        <ScreenWrapper testID={TransactionDuplicateReview.displayName}>
+            <FullPageNotFoundView shouldShow={transactionID === '-1'}>
+                <HeaderWithBackButton title={translate('iou.reviewDuplicates')} />
+                <View style={[styles.justifyContentCenter, styles.ph5, styles.pb3, styles.borderBottom]}>
+                    <Button
+                        text={translate('iou.keepAll')}
+                        onPress={keepAll}
+                    />
+                </View>
+                <DuplicateTransactionsList transactions={transactions} />
+            </FullPageNotFoundView>
+        </ScreenWrapper>
+    );
+}
+
+TransactionDuplicateReview.displayName = 'TransactionDuplicateReview';
+export default TransactionDuplicateReview;
diff --git a/src/pages/TransactionDuplicate/ReviewBillable.tsx b/src/pages/TransactionDuplicate/ReviewBillable.tsx
new file mode 100644
index 000000000000..4cb2b130aea1
--- /dev/null
+++ b/src/pages/TransactionDuplicate/ReviewBillable.tsx
@@ -0,0 +1,54 @@
+import type {RouteProp} from '@react-navigation/native';
+import {useRoute} from '@react-navigation/native';
+import React, {useMemo} from 'react';
+import HeaderWithBackButton from '@components/HeaderWithBackButton';
+import ScreenWrapper from '@components/ScreenWrapper';
+import useLocalize from '@hooks/useLocalize';
+import useReviewDuplicatesNavigation from '@hooks/useReviewDuplicatesNavigation';
+import {setReviewDuplicatesKey} from '@libs/actions/Transaction';
+import type {TransactionDuplicateNavigatorParamList} from '@libs/Navigation/types';
+import * as TransactionUtils from '@libs/TransactionUtils';
+import type SCREENS from '@src/SCREENS';
+import type {FieldItemType} from './ReviewFields';
+import ReviewFields from './ReviewFields';
+
+function ReviewBillable() {
+    const route = useRoute<RouteProp<TransactionDuplicateNavigatorParamList, typeof SCREENS.TRANSACTION_DUPLICATE.TAG>>();
+    const {translate} = useLocalize();
+    const transactionID = TransactionUtils.getTransactionID(route.params.threadReportID ?? '');
+    const compareResult = TransactionUtils.compareDuplicateTransactionFields(transactionID);
+    const stepNames = Object.keys(compareResult.change ?? {}).map((key, index) => (index + 1).toString());
+    const {currentScreenIndex, navigateToNextScreen} = useReviewDuplicatesNavigation(Object.keys(compareResult.change ?? {}), 'billable', route.params.threadReportID ?? '');
+    const options = useMemo(
+        () =>
+            compareResult.change.billable?.map((billable) => ({
+                text: billable ? translate('common.yes') : translate('common.no'),
+                value: billable ?? false,
+            })),
+        [compareResult.change.billable, translate],
+    );
+
+    const setBillable = (data: FieldItemType<'billable'>) => {
+        if (data.value !== undefined) {
+            setReviewDuplicatesKey({billable: data.value});
+        }
+        navigateToNextScreen();
+    };
+
+    return (
+        <ScreenWrapper testID={ReviewBillable.displayName}>
+            <HeaderWithBackButton title={translate('iou.reviewDuplicates')} />
+            <ReviewFields<'billable'>
+                stepNames={stepNames}
+                label={translate('violations.isTransactionBillable')}
+                options={options}
+                index={currentScreenIndex}
+                onSelectRow={setBillable}
+            />
+        </ScreenWrapper>
+    );
+}
+
+ReviewBillable.displayName = 'ReviewBillable';
+
+export default ReviewBillable;
diff --git a/src/pages/TransactionDuplicate/ReviewCategory.tsx b/src/pages/TransactionDuplicate/ReviewCategory.tsx
new file mode 100644
index 000000000000..12a5968e2c43
--- /dev/null
+++ b/src/pages/TransactionDuplicate/ReviewCategory.tsx
@@ -0,0 +1,58 @@
+import type {RouteProp} from '@react-navigation/native';
+import {useRoute} from '@react-navigation/native';
+import React, {useMemo} from 'react';
+import HeaderWithBackButton from '@components/HeaderWithBackButton';
+import ScreenWrapper from '@components/ScreenWrapper';
+import useLocalize from '@hooks/useLocalize';
+import useReviewDuplicatesNavigation from '@hooks/useReviewDuplicatesNavigation';
+import {setReviewDuplicatesKey} from '@libs/actions/Transaction';
+import type {TransactionDuplicateNavigatorParamList} from '@libs/Navigation/types';
+import * as TransactionUtils from '@libs/TransactionUtils';
+import type SCREENS from '@src/SCREENS';
+import type {FieldItemType} from './ReviewFields';
+import ReviewFields from './ReviewFields';
+
+function ReviewCategory() {
+    const route = useRoute<RouteProp<TransactionDuplicateNavigatorParamList, typeof SCREENS.TRANSACTION_DUPLICATE.CATEGORY>>();
+    const {translate} = useLocalize();
+    const transactionID = TransactionUtils.getTransactionID(route.params.threadReportID ?? '');
+    const compareResult = TransactionUtils.compareDuplicateTransactionFields(transactionID);
+    const stepNames = Object.keys(compareResult.change ?? {}).map((key, index) => (index + 1).toString());
+    const {currentScreenIndex, navigateToNextScreen} = useReviewDuplicatesNavigation(Object.keys(compareResult.change ?? {}), 'category', route.params.threadReportID ?? '');
+    const options = useMemo(
+        () =>
+            compareResult.change.category?.map((category) =>
+                !category
+                    ? {text: translate('violations.none'), value: ''}
+                    : {
+                          text: category,
+                          value: category,
+                      },
+            ),
+        [compareResult.change.category, translate],
+    );
+
+    const setCategory = (data: FieldItemType<'category'>) => {
+        if (data.value !== undefined) {
+            setReviewDuplicatesKey({category: data.value});
+        }
+        navigateToNextScreen();
+    };
+
+    return (
+        <ScreenWrapper testID={ReviewCategory.displayName}>
+            <HeaderWithBackButton title={translate('iou.reviewDuplicates')} />
+            <ReviewFields<'category'>
+                stepNames={stepNames}
+                label={translate('violations.categoryToKeep')}
+                options={options}
+                index={currentScreenIndex}
+                onSelectRow={setCategory}
+            />
+        </ScreenWrapper>
+    );
+}
+
+ReviewCategory.displayName = 'ReviewCategory';
+
+export default ReviewCategory;
diff --git a/src/pages/TransactionDuplicate/ReviewDescription.tsx b/src/pages/TransactionDuplicate/ReviewDescription.tsx
new file mode 100644
index 000000000000..e6229afe48ac
--- /dev/null
+++ b/src/pages/TransactionDuplicate/ReviewDescription.tsx
@@ -0,0 +1,57 @@
+import type {RouteProp} from '@react-navigation/native';
+import {useRoute} from '@react-navigation/native';
+import React, {useMemo} from 'react';
+import HeaderWithBackButton from '@components/HeaderWithBackButton';
+import ScreenWrapper from '@components/ScreenWrapper';
+import useLocalize from '@hooks/useLocalize';
+import useReviewDuplicatesNavigation from '@hooks/useReviewDuplicatesNavigation';
+import {setReviewDuplicatesKey} from '@libs/actions/Transaction';
+import type {TransactionDuplicateNavigatorParamList} from '@libs/Navigation/types';
+import * as TransactionUtils from '@libs/TransactionUtils';
+import type SCREENS from '@src/SCREENS';
+import type {FieldItemType} from './ReviewFields';
+import ReviewFields from './ReviewFields';
+
+function ReviewDescription() {
+    const route = useRoute<RouteProp<TransactionDuplicateNavigatorParamList, typeof SCREENS.TRANSACTION_DUPLICATE.DESCRIPTION>>();
+    const {translate} = useLocalize();
+    const transactionID = TransactionUtils.getTransactionID(route.params.threadReportID ?? '');
+    const compareResult = TransactionUtils.compareDuplicateTransactionFields(transactionID);
+    const stepNames = Object.keys(compareResult.change ?? {}).map((key, index) => (index + 1).toString());
+    const {currentScreenIndex, navigateToNextScreen} = useReviewDuplicatesNavigation(Object.keys(compareResult.change ?? {}), 'description', route.params.threadReportID ?? '');
+    const options = useMemo(
+        () =>
+            compareResult.change.description?.map((description) =>
+                !description?.comment
+                    ? {text: translate('violations.none'), value: ''}
+                    : {
+                          text: description.comment,
+                          value: description.comment,
+                      },
+            ),
+        [compareResult.change.description, translate],
+    );
+    const setDescription = (data: FieldItemType<'description'>) => {
+        if (data.value !== undefined) {
+            setReviewDuplicatesKey({description: data.value});
+        }
+        navigateToNextScreen();
+    };
+
+    return (
+        <ScreenWrapper testID={ReviewDescription.displayName}>
+            <HeaderWithBackButton title={translate('iou.reviewDuplicates')} />
+            <ReviewFields<'description'>
+                stepNames={stepNames}
+                label={translate('violations.descriptionToKeep')}
+                options={options}
+                index={currentScreenIndex}
+                onSelectRow={setDescription}
+            />
+        </ScreenWrapper>
+    );
+}
+
+ReviewDescription.displayName = 'ReviewDescription';
+
+export default ReviewDescription;
diff --git a/src/pages/TransactionDuplicate/ReviewFields.tsx b/src/pages/TransactionDuplicate/ReviewFields.tsx
new file mode 100644
index 000000000000..a3f0c73120ce
--- /dev/null
+++ b/src/pages/TransactionDuplicate/ReviewFields.tsx
@@ -0,0 +1,92 @@
+import React, {useMemo} from 'react';
+import {View} from 'react-native';
+import InteractiveStepSubHeader from '@components/InteractiveStepSubHeader';
+import SelectionList from '@components/SelectionList';
+import RadioListItem from '@components/SelectionList/RadioListItem';
+import Text from '@components/Text';
+import useLocalize from '@hooks/useLocalize';
+import useThemeStyles from '@hooks/useThemeStyles';
+import variables from '@styles/variables';
+import CONST from '@src/CONST';
+import type {ReviewDuplicates} from '@src/types/onyx';
+
+type FieldItemType<T extends keyof ReviewDuplicates> = {
+    text: string;
+    value: ReviewDuplicates[T];
+    keyForList: string;
+};
+
+type ReviewFieldsProps<K extends keyof ReviewDuplicates> = {
+    /* Step Names which are displayed in stepper */
+    stepNames: string[];
+
+    /* Label which is displyed to describe current step  */
+    label: string;
+
+    /* Values to choose from */
+    options: Array<{text: string; value: ReviewDuplicates[K]}> | undefined;
+
+    /* Current index */
+    index: number;
+
+    /* Callback to what should happen after selecting row */
+    onSelectRow: (item: FieldItemType<K>) => void;
+};
+
+function ReviewFields<K extends keyof ReviewDuplicates>({stepNames, label, options, index, onSelectRow}: ReviewFieldsProps<K>) {
+    const styles = useThemeStyles();
+    const {translate} = useLocalize();
+
+    let falsyCount = 0;
+    const filteredOptions = options?.filter((name) => {
+        if (name.text !== translate('violations.none')) {
+            return true;
+        }
+        falsyCount++;
+        return falsyCount <= 1;
+    });
+
+    const sections = useMemo(
+        () =>
+            filteredOptions?.map((option) => ({
+                text: option.text,
+                keyForList: option.text,
+                value: option.value,
+            })),
+        [filteredOptions],
+    );
+
+    return (
+        <View
+            key={index}
+            style={styles.flex1}
+        >
+            {stepNames.length > 1 && (
+                <View style={[styles.w100, styles.ph5, styles.mb5, styles.mt3, {height: CONST.BANK_ACCOUNT.STEPS_HEADER_HEIGHT}]}>
+                    <InteractiveStepSubHeader
+                        stepNames={stepNames}
+                        startStepIndex={index}
+                    />
+                </View>
+            )}
+
+            <Text
+                family="EXP_NEW_KANSAS_MEDIUM"
+                fontSize={variables.fontSizeLarge}
+                style={[styles.pb5, styles.ph5, stepNames.length < 1 && styles.mt3]}
+            >
+                {label}
+            </Text>
+            <SelectionList
+                sections={[{data: sections ?? []}]}
+                ListItem={RadioListItem}
+                onSelectRow={onSelectRow}
+            />
+        </View>
+    );
+}
+
+ReviewFields.displayName = 'ReviewFields';
+
+export default ReviewFields;
+export type {FieldItemType};
diff --git a/src/pages/TransactionDuplicate/ReviewMerchant.tsx b/src/pages/TransactionDuplicate/ReviewMerchant.tsx
new file mode 100644
index 000000000000..80ae43a0d338
--- /dev/null
+++ b/src/pages/TransactionDuplicate/ReviewMerchant.tsx
@@ -0,0 +1,58 @@
+import type {RouteProp} from '@react-navigation/native';
+import {useRoute} from '@react-navigation/native';
+import React, {useMemo} from 'react';
+import HeaderWithBackButton from '@components/HeaderWithBackButton';
+import ScreenWrapper from '@components/ScreenWrapper';
+import useLocalize from '@hooks/useLocalize';
+import useReviewDuplicatesNavigation from '@hooks/useReviewDuplicatesNavigation';
+import {setReviewDuplicatesKey} from '@libs/actions/Transaction';
+import type {TransactionDuplicateNavigatorParamList} from '@libs/Navigation/types';
+import * as TransactionUtils from '@libs/TransactionUtils';
+import type SCREENS from '@src/SCREENS';
+import type {FieldItemType} from './ReviewFields';
+import ReviewFields from './ReviewFields';
+
+function ReviewMerchant() {
+    const route = useRoute<RouteProp<TransactionDuplicateNavigatorParamList, typeof SCREENS.TRANSACTION_DUPLICATE.TAG>>();
+    const {translate} = useLocalize();
+    const transactionID = TransactionUtils.getTransactionID(route.params.threadReportID ?? '');
+    const compareResult = TransactionUtils.compareDuplicateTransactionFields(transactionID);
+    const stepNames = Object.keys(compareResult.change ?? {}).map((key, index) => (index + 1).toString());
+    const {currentScreenIndex, navigateToNextScreen} = useReviewDuplicatesNavigation(Object.keys(compareResult.change ?? {}), 'merchant', route.params.threadReportID ?? '');
+    const options = useMemo(
+        () =>
+            compareResult.change.merchant?.map((merchant) =>
+                !merchant
+                    ? {text: translate('violations.none'), value: ''}
+                    : {
+                          text: merchant,
+                          value: merchant,
+                      },
+            ),
+        [compareResult.change.merchant, translate],
+    );
+
+    const setMerchant = (data: FieldItemType<'merchant'>) => {
+        if (data.value !== undefined) {
+            setReviewDuplicatesKey({merchant: data.value});
+        }
+        navigateToNextScreen();
+    };
+
+    return (
+        <ScreenWrapper testID={ReviewMerchant.displayName}>
+            <HeaderWithBackButton title={translate('iou.reviewDuplicates')} />
+            <ReviewFields<'merchant'>
+                stepNames={stepNames}
+                label={translate('violations.merchantToKeep')}
+                options={options}
+                index={currentScreenIndex}
+                onSelectRow={setMerchant}
+            />
+        </ScreenWrapper>
+    );
+}
+
+ReviewMerchant.displayName = 'ReviewMerchant';
+
+export default ReviewMerchant;
diff --git a/src/pages/TransactionDuplicate/ReviewReimbursable.tsx b/src/pages/TransactionDuplicate/ReviewReimbursable.tsx
new file mode 100644
index 000000000000..fbf7e43a2013
--- /dev/null
+++ b/src/pages/TransactionDuplicate/ReviewReimbursable.tsx
@@ -0,0 +1,54 @@
+import type {RouteProp} from '@react-navigation/native';
+import {useRoute} from '@react-navigation/native';
+import React, {useMemo} from 'react';
+import HeaderWithBackButton from '@components/HeaderWithBackButton';
+import ScreenWrapper from '@components/ScreenWrapper';
+import useLocalize from '@hooks/useLocalize';
+import useReviewDuplicatesNavigation from '@hooks/useReviewDuplicatesNavigation';
+import {setReviewDuplicatesKey} from '@libs/actions/Transaction';
+import type {TransactionDuplicateNavigatorParamList} from '@libs/Navigation/types';
+import * as TransactionUtils from '@libs/TransactionUtils';
+import type SCREENS from '@src/SCREENS';
+import type {FieldItemType} from './ReviewFields';
+import ReviewFields from './ReviewFields';
+
+function ReviewReimbursable() {
+    const route = useRoute<RouteProp<TransactionDuplicateNavigatorParamList, typeof SCREENS.TRANSACTION_DUPLICATE.TAG>>();
+    const {translate} = useLocalize();
+    const transactionID = TransactionUtils.getTransactionID(route.params.threadReportID ?? '');
+    const compareResult = TransactionUtils.compareDuplicateTransactionFields(transactionID);
+    const stepNames = Object.keys(compareResult.change ?? {}).map((key, index) => (index + 1).toString());
+    const {currentScreenIndex, navigateToNextScreen} = useReviewDuplicatesNavigation(Object.keys(compareResult.change ?? {}), 'reimbursable', route.params.threadReportID ?? '');
+    const options = useMemo(
+        () =>
+            compareResult.change.reimbursable?.map((reimbursable) => ({
+                text: reimbursable ? translate('common.yes') : translate('common.no'),
+                value: reimbursable ?? false,
+            })),
+        [compareResult.change.reimbursable, translate],
+    );
+
+    const setReimbursable = (data: FieldItemType<'reimbursable'>) => {
+        if (data.value !== undefined) {
+            setReviewDuplicatesKey({reimbursable: data.value});
+        }
+        navigateToNextScreen();
+    };
+
+    return (
+        <ScreenWrapper testID={ReviewReimbursable.displayName}>
+            <HeaderWithBackButton title={translate('iou.reviewDuplicates')} />
+            <ReviewFields<'reimbursable'>
+                stepNames={stepNames}
+                label={translate('violations.isTransactionReimbursable')}
+                options={options}
+                index={currentScreenIndex}
+                onSelectRow={setReimbursable}
+            />
+        </ScreenWrapper>
+    );
+}
+
+ReviewReimbursable.displayName = 'ReviewReimbursable';
+
+export default ReviewReimbursable;
diff --git a/src/pages/TransactionDuplicate/ReviewTag.tsx b/src/pages/TransactionDuplicate/ReviewTag.tsx
new file mode 100644
index 000000000000..abab4d3e03f3
--- /dev/null
+++ b/src/pages/TransactionDuplicate/ReviewTag.tsx
@@ -0,0 +1,58 @@
+import type {RouteProp} from '@react-navigation/native';
+import {useRoute} from '@react-navigation/native';
+import React, {useMemo} from 'react';
+import HeaderWithBackButton from '@components/HeaderWithBackButton';
+import ScreenWrapper from '@components/ScreenWrapper';
+import useLocalize from '@hooks/useLocalize';
+import useReviewDuplicatesNavigation from '@hooks/useReviewDuplicatesNavigation';
+import {setReviewDuplicatesKey} from '@libs/actions/Transaction';
+import type {TransactionDuplicateNavigatorParamList} from '@libs/Navigation/types';
+import * as TransactionUtils from '@libs/TransactionUtils';
+import type SCREENS from '@src/SCREENS';
+import type {FieldItemType} from './ReviewFields';
+import ReviewFields from './ReviewFields';
+
+function ReviewTag() {
+    const route = useRoute<RouteProp<TransactionDuplicateNavigatorParamList, typeof SCREENS.TRANSACTION_DUPLICATE.TAG>>();
+    const {translate} = useLocalize();
+    const transactionID = TransactionUtils.getTransactionID(route.params.threadReportID ?? '');
+
+    const compareResult = TransactionUtils.compareDuplicateTransactionFields(transactionID);
+    const stepNames = Object.keys(compareResult.change ?? {}).map((key, index) => (index + 1).toString());
+    const {currentScreenIndex, navigateToNextScreen} = useReviewDuplicatesNavigation(Object.keys(compareResult.change ?? {}), 'tag', route.params.threadReportID ?? '');
+    const options = useMemo(
+        () =>
+            compareResult.change.tag?.map((tag) =>
+                !tag
+                    ? {text: translate('violations.none'), value: ''}
+                    : {
+                          text: tag,
+                          value: tag,
+                      },
+            ),
+        [compareResult.change.tag, translate],
+    );
+    const setTag = (data: FieldItemType<'tag'>) => {
+        if (data.value !== undefined) {
+            setReviewDuplicatesKey({tag: data.value});
+        }
+        navigateToNextScreen();
+    };
+
+    return (
+        <ScreenWrapper testID={ReviewTag.displayName}>
+            <HeaderWithBackButton title={translate('iou.reviewDuplicates')} />
+            <ReviewFields<'tag'>
+                stepNames={stepNames}
+                label={translate('violations.tagToKeep')}
+                options={options}
+                index={currentScreenIndex}
+                onSelectRow={setTag}
+            />
+        </ScreenWrapper>
+    );
+}
+
+ReviewTag.displayName = 'ReviewTag';
+
+export default ReviewTag;
diff --git a/src/pages/TransactionDuplicate/ReviewTaxCode.tsx b/src/pages/TransactionDuplicate/ReviewTaxCode.tsx
new file mode 100644
index 000000000000..aa598bff8fcd
--- /dev/null
+++ b/src/pages/TransactionDuplicate/ReviewTaxCode.tsx
@@ -0,0 +1,76 @@
+import type {RouteProp} from '@react-navigation/native';
+import {useRoute} from '@react-navigation/native';
+import React, {useCallback, useMemo} from 'react';
+import {useOnyx} from 'react-native-onyx';
+import HeaderWithBackButton from '@components/HeaderWithBackButton';
+import ScreenWrapper from '@components/ScreenWrapper';
+import useLocalize from '@hooks/useLocalize';
+import useReviewDuplicatesNavigation from '@hooks/useReviewDuplicatesNavigation';
+import {setReviewDuplicatesKey} from '@libs/actions/Transaction';
+import * as CurrencyUtils from '@libs/CurrencyUtils';
+import type {TransactionDuplicateNavigatorParamList} from '@libs/Navigation/types';
+import * as PolicyUtils from '@libs/PolicyUtils';
+import * as TransactionUtils from '@libs/TransactionUtils';
+import ONYXKEYS from '@src/ONYXKEYS';
+import type SCREENS from '@src/SCREENS';
+import ReviewDescription from './ReviewDescription';
+import type {FieldItemType} from './ReviewFields';
+import ReviewFields from './ReviewFields';
+
+function ReviewTaxRate() {
+    const route = useRoute<RouteProp<TransactionDuplicateNavigatorParamList, typeof SCREENS.TRANSACTION_DUPLICATE.TAX_CODE>>();
+    const {translate} = useLocalize();
+    const [report] = useOnyx(`${ONYXKEYS.COLLECTION.REPORT}${route.params.threadReportID}`);
+    const policy = PolicyUtils.getPolicy(report?.policyID ?? '');
+    const transactionID = TransactionUtils.getTransactionID(route.params.threadReportID ?? '');
+    const compareResult = TransactionUtils.compareDuplicateTransactionFields(transactionID);
+    const stepNames = Object.keys(compareResult.change ?? {}).map((key, index) => (index + 1).toString());
+    const {currentScreenIndex, navigateToNextScreen} = useReviewDuplicatesNavigation(Object.keys(compareResult.change ?? {}), 'taxCode', route.params.threadReportID ?? '');
+    const transaction = TransactionUtils.getTransaction(transactionID);
+    const options = useMemo(
+        () =>
+            compareResult.change.taxCode?.map((taxID) =>
+                !taxID
+                    ? {text: translate('violations.none'), value: TransactionUtils.getDefaultTaxCode(policy, transaction) ?? ''}
+                    : {
+                          text: PolicyUtils.getTaxByID(policy, taxID)?.name ?? '',
+                          value: taxID,
+                      },
+            ),
+        [compareResult.change.taxCode, policy, transaction, translate],
+    );
+    const getTaxAmount = useCallback(
+        (taxID: string) => {
+            const taxPercentage = TransactionUtils.getTaxValue(policy, transaction, taxID);
+            return CurrencyUtils.convertToBackendAmount(TransactionUtils.calculateTaxAmount(taxPercentage ?? '', TransactionUtils.getAmount(transaction), transaction?.currency ?? ''));
+        },
+        [policy, transaction],
+    );
+
+    const setTaxCode = useCallback(
+        (data: FieldItemType<'taxCode'>) => {
+            if (data.value !== undefined) {
+                setReviewDuplicatesKey({taxCode: data.value, taxAmount: getTaxAmount(data.value)});
+            }
+            navigateToNextScreen();
+        },
+        [getTaxAmount, navigateToNextScreen],
+    );
+
+    return (
+        <ScreenWrapper testID={ReviewDescription.displayName}>
+            <HeaderWithBackButton title={translate('iou.reviewDuplicates')} />
+            <ReviewFields<'taxCode'>
+                stepNames={stepNames}
+                label={translate('violations.taxCodeToKeep')}
+                options={options}
+                index={currentScreenIndex}
+                onSelectRow={setTaxCode}
+            />
+        </ScreenWrapper>
+    );
+}
+
+ReviewTaxRate.displayName = 'ReviewTaxRate';
+
+export default ReviewTaxRate;
diff --git a/src/pages/TransactionReceiptPage.tsx b/src/pages/TransactionReceiptPage.tsx
index 7a2df49e287a..9a59c15b589c 100644
--- a/src/pages/TransactionReceiptPage.tsx
+++ b/src/pages/TransactionReceiptPage.tsx
@@ -31,8 +31,9 @@ function TransactionReceipt({transaction, report, reportMetadata = {isLoadingIni
     const imageSource = tryResolveUrlFromApiRoot(receiptURIs.image ?? '');
 
     const isLocalFile = receiptURIs.isLocalFile;
+    const readonly = route.params.readonly ?? false;
 
-    const parentReportAction = ReportActionUtils.getReportAction(report?.parentReportID ?? '', report?.parentReportActionID ?? '');
+    const parentReportAction = ReportActionUtils.getReportAction(report?.parentReportID ?? '-1', report?.parentReportActionID ?? '-1');
     const canEditReceipt = ReportUtils.canEditFieldOfMoneyRequest(parentReportAction, CONST.EDIT_REQUEST_FIELD.RECEIPT);
     const isEReceipt = transaction && TransactionUtils.hasEReceipt(transaction);
     const isTrackExpenseAction = ReportActionUtils.isTrackExpenseAction(parentReportAction);
@@ -43,14 +44,14 @@ function TransactionReceipt({transaction, report, reportMetadata = {isLoadingIni
         }
         ReportActions.openReport(route.params.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
+        // eslint-disable-next-line react-compiler/react-compiler, react-hooks/exhaustive-deps
     }, []);
 
     const moneyRequestReportID = ReportUtils.isMoneyRequestReport(report) ? report?.reportID : report?.parentReportID;
     const isTrackExpenseReport = ReportUtils.isTrackExpenseReport(report);
 
     // eslint-disable-next-line rulesdir/no-negated-variables
-    const shouldShowNotFoundPage = isTrackExpenseReport ? !transaction : (moneyRequestReportID ?? '') !== transaction?.reportID;
+    const shouldShowNotFoundPage = isTrackExpenseReport || transaction?.reportID === CONST.REPORT.SPLIT_REPORTID ? !transaction : (moneyRequestReportID ?? '-1') !== transaction?.reportID;
 
     return (
         <AttachmentModal
@@ -58,13 +59,13 @@ function TransactionReceipt({transaction, report, reportMetadata = {isLoadingIni
             isAuthTokenRequired={!isLocalFile}
             report={report}
             isReceiptAttachment
-            canEditReceipt={canEditReceipt}
+            canEditReceipt={canEditReceipt && !readonly}
             allowDownload={!isEReceipt}
             isTrackExpenseAction={isTrackExpenseAction}
             originalFileName={receiptURIs?.filename}
             defaultOpen
             onModalClose={() => {
-                Navigation.goBack(ROUTES.REPORT_WITH_ID_DETAILS.getRoute(report?.reportID ?? ''));
+                Navigation.goBack(ROUTES.REPORT_WITH_ID.getRoute(report?.reportID ?? '-1'));
             }}
             isLoading={!transaction && reportMetadata?.isLoadingInitialReportActions}
             shouldShowNotFoundPage={shouldShowNotFoundPage}
@@ -76,12 +77,12 @@ TransactionReceipt.displayName = 'TransactionReceipt';
 
 export default withOnyx<TransactionReceiptProps, TransactionReceiptOnyxProps>({
     report: {
-        key: ({route}) => `${ONYXKEYS.COLLECTION.REPORT}${route.params.reportID ?? '0'}`,
+        key: ({route}) => `${ONYXKEYS.COLLECTION.REPORT}${route.params.reportID ?? '-1'}`,
     },
     transaction: {
-        key: ({route}) => `${ONYXKEYS.COLLECTION.TRANSACTION}${route.params.transactionID ?? '0'}`,
+        key: ({route}) => `${ONYXKEYS.COLLECTION.TRANSACTION}${route.params.transactionID ?? '-1'}`,
     },
     reportMetadata: {
-        key: ({route}) => `${ONYXKEYS.COLLECTION.REPORT_METADATA}${route.params.reportID ?? '0'}`,
+        key: ({route}) => `${ONYXKEYS.COLLECTION.REPORT_METADATA}${route.params.reportID ?? '-1'}`,
     },
 })(TransactionReceipt);
diff --git a/src/pages/Travel/ManageTrips.tsx b/src/pages/Travel/ManageTrips.tsx
index 401f06277b5e..c61166f10c6d 100644
--- a/src/pages/Travel/ManageTrips.tsx
+++ b/src/pages/Travel/ManageTrips.tsx
@@ -1,17 +1,22 @@
-import React from 'react';
-import {View} from 'react-native';
+import React, {useState} from 'react';
+import {Linking, View} from 'react-native';
+import {useOnyx} from 'react-native-onyx';
 import type {FeatureListItem} from '@components/FeatureList';
 import FeatureList from '@components/FeatureList';
+import FullScreenLoadingIndicator from '@components/FullscreenLoadingIndicator';
 import * as Illustrations from '@components/Icon/Illustrations';
-import LottieAnimations from '@components/LottieAnimations';
 import ScrollView from '@components/ScrollView';
 import useLocalize from '@hooks/useLocalize';
+import usePolicy from '@hooks/usePolicy';
+import useResponsiveLayout from '@hooks/useResponsiveLayout';
 import useThemeStyles from '@hooks/useThemeStyles';
-import useWindowDimensions from '@hooks/useWindowDimensions';
 import Navigation from '@libs/Navigation/Navigation';
 import colors from '@styles/theme/colors';
+import * as Link from '@userActions/Link';
+import CONST from '@src/CONST';
+import ONYXKEYS from '@src/ONYXKEYS';
 import ROUTES from '@src/ROUTES';
-import getTripIllustrationStyle from './getTripIllustrationStyle';
+import {isEmptyObject} from '@src/types/utils/EmptyObject';
 
 const tripsFeatures: FeatureListItem[] = [
     {
@@ -26,13 +31,28 @@ const tripsFeatures: FeatureListItem[] = [
 
 function ManageTrips() {
     const styles = useThemeStyles();
-    const {isSmallScreenWidth} = useWindowDimensions();
+    const {shouldUseNarrowLayout} = useResponsiveLayout();
     const {translate} = useLocalize();
-    const illustrationStyle = getTripIllustrationStyle();
+    const [travelSettings] = useOnyx(ONYXKEYS.NVP_TRAVEL_SETTINGS);
+    const [activePolicyID] = useOnyx(ONYXKEYS.NVP_ACTIVE_POLICY_ID);
+    const policy = usePolicy(activePolicyID);
+
+    const [ctaErrorMessage, setCtaErrorMessage] = useState('');
+
+    if (isEmptyObject(policy)) {
+        return <FullScreenLoadingIndicator />;
+    }
+
+    const hasAcceptedTravelTerms = travelSettings?.hasAcceptedTerms;
+    const hasPolicyAddress = !isEmptyObject(policy?.address);
+
+    const navigateToBookTravelDemo = () => {
+        Linking.openURL(CONST.BOOK_TRAVEL_DEMO_URL);
+    };
 
     return (
         <ScrollView contentContainerStyle={styles.pt3}>
-            <View style={[styles.flex1, isSmallScreenWidth ? styles.workspaceSectionMobile : styles.workspaceSection]}>
+            <View style={[styles.flex1, shouldUseNarrowLayout ? styles.workspaceSectionMobile : styles.workspaceSection]}>
                 <FeatureList
                     menuItems={tripsFeatures}
                     title={translate('travel.title')}
@@ -40,10 +60,27 @@ function ManageTrips() {
                     ctaText={translate('travel.bookTravel')}
                     ctaAccessibilityLabel={translate('travel.bookTravel')}
                     onCtaPress={() => {
-                        Navigation.navigate(ROUTES.TRAVEL_TCS);
+                        if (!hasPolicyAddress) {
+                            Navigation.navigate(ROUTES.WORKSPACE_PROFILE_ADDRESS.getRoute(activePolicyID ?? '-1'));
+                            return;
+                        }
+                        if (!hasAcceptedTravelTerms) {
+                            Navigation.navigate(ROUTES.TRAVEL_TCS);
+                            return;
+                        }
+                        if (ctaErrorMessage) {
+                            setCtaErrorMessage('');
+                        }
+                        Link.openTravelDotLink(activePolicyID)?.catch(() => {
+                            setCtaErrorMessage(translate('travel.errorMessage'));
+                        });
                     }}
-                    illustration={LottieAnimations.Plane}
-                    illustrationStyle={illustrationStyle}
+                    ctaErrorMessage={ctaErrorMessage}
+                    illustration={Illustrations.EmptyStateTravel}
+                    illustrationStyle={[styles.mv4, styles.tripIllustrationSize]}
+                    secondaryButtonText={translate('travel.bookDemo')}
+                    secondaryButtonAccessibilityLabel={translate('travel.bookDemo')}
+                    onSecondaryButtonPress={navigateToBookTravelDemo}
                     illustrationBackgroundColor={colors.blue600}
                     titleStyles={styles.textHeadlineH1}
                     contentPaddingOnLargeScreens={styles.p5}
diff --git a/src/pages/Travel/TravelTerms.tsx b/src/pages/Travel/TravelTerms.tsx
index 468ca9b8082a..f33ab9965d4a 100644
--- a/src/pages/Travel/TravelTerms.tsx
+++ b/src/pages/Travel/TravelTerms.tsx
@@ -1,6 +1,7 @@
 import React, {useCallback, useEffect, useState} from 'react';
 import {View} from 'react-native';
 import {ScrollView} from 'react-native-gesture-handler';
+import {useOnyx} from 'react-native-onyx';
 import FullPageNotFoundView from '@components/BlockingViews/FullPageNotFoundView';
 import CheckboxWithLabel from '@components/CheckboxWithLabel';
 import FormAlertWithSubmitButton from '@components/FormAlertWithSubmitButton';
@@ -15,15 +16,16 @@ import useThemeStyles from '@hooks/useThemeStyles';
 import Navigation from '@libs/Navigation/Navigation';
 import * as Travel from '@userActions/Travel';
 import CONST from '@src/CONST';
+import ONYXKEYS from '@src/ONYXKEYS';
 
 function TravelTerms() {
     const styles = useThemeStyles();
     const {translate} = useLocalize();
     const {canUseSpotnanaTravel} = usePermissions();
     const [hasAcceptedTravelTerms, setHasAcceptedTravelTerms] = useState(false);
-    const [error, setError] = useState(false);
-
-    const errorMessage = error ? 'travel.termsAndConditions.error' : '';
+    const [errorMessage, setErrorMessage] = useState('');
+    const [travelSettings] = useOnyx(ONYXKEYS.NVP_TRAVEL_SETTINGS);
+    const isLoading = travelSettings?.isLoading;
 
     const toggleTravelTerms = () => {
         setHasAcceptedTravelTerms(!hasAcceptedTravelTerms);
@@ -34,7 +36,7 @@ function TravelTerms() {
             return;
         }
 
-        setError(false);
+        setErrorMessage('');
     }, [hasAcceptedTravelTerms]);
 
     const AgreeToTheLabel = useCallback(
@@ -86,17 +88,21 @@ function TravelTerms() {
                                 isDisabled={!hasAcceptedTravelTerms}
                                 onSubmit={() => {
                                     if (!hasAcceptedTravelTerms) {
-                                        setError(true);
+                                        setErrorMessage(translate('travel.termsAndConditions.error'));
                                         return;
                                     }
+                                    if (errorMessage) {
+                                        setErrorMessage('');
+                                    }
 
-                                    Travel.acceptSpotnanaTerms();
-                                    setError(false);
-                                    Navigation.resetToHome();
+                                    Travel.acceptSpotnanaTerms()
+                                        .then(() => Navigation.goBack())
+                                        .catch(() => setErrorMessage(translate('travel.errorMessage')));
                                 }}
                                 message={errorMessage}
-                                isAlertVisible={error || Boolean(errorMessage)}
+                                isAlertVisible={!!errorMessage}
                                 containerStyles={[styles.mh0, styles.mt5]}
+                                isLoading={isLoading}
                             />
                         </ScrollView>
                     )}
diff --git a/src/pages/Travel/getTripIllustrationStyle/index.native.ts b/src/pages/Travel/getTripIllustrationStyle/index.native.ts
deleted file mode 100644
index e5b0a1381d7e..000000000000
--- a/src/pages/Travel/getTripIllustrationStyle/index.native.ts
+++ /dev/null
@@ -1,8 +0,0 @@
-import type {ViewStyle} from 'react-native';
-
-// Styling lottie animations for the ManageTrips component requires different margin values depending on the platform.
-export default function getTripIllustrationStyle(): ViewStyle {
-    return {
-        marginVertical: 20,
-    };
-}
diff --git a/src/pages/Travel/getTripIllustrationStyle/index.ts b/src/pages/Travel/getTripIllustrationStyle/index.ts
deleted file mode 100644
index a2a141022d73..000000000000
--- a/src/pages/Travel/getTripIllustrationStyle/index.ts
+++ /dev/null
@@ -1,9 +0,0 @@
-import type {ViewStyle} from 'react-native';
-
-// Styling lottie animations for the ManageTrips component requires different margin values depending on the platform.
-export default function getTripIllustrationStyle(): ViewStyle {
-    return {
-        marginTop: 20,
-        marginBottom: -20,
-    };
-}
diff --git a/src/pages/UnlinkLoginPage.tsx b/src/pages/UnlinkLoginPage.tsx
index 326d09df3143..9869e4a70e68 100644
--- a/src/pages/UnlinkLoginPage.tsx
+++ b/src/pages/UnlinkLoginPage.tsx
@@ -26,7 +26,7 @@ function UnlinkLoginPage({route, account}: UnlinkLoginPageProps) {
     useEffect(() => {
         Session.unlinkLogin(Number(accountID), validateCode);
         // We only want this to run on mount
-        // eslint-disable-next-line react-hooks/exhaustive-deps
+        // eslint-disable-next-line react-compiler/react-compiler, react-hooks/exhaustive-deps
     }, []);
 
     useEffect(() => {
diff --git a/src/pages/ValidateLoginPage/index.tsx b/src/pages/ValidateLoginPage/index.tsx
index d7e975890186..faf12194ca62 100644
--- a/src/pages/ValidateLoginPage/index.tsx
+++ b/src/pages/ValidateLoginPage/index.tsx
@@ -28,7 +28,7 @@ function ValidateLoginPage({
                 Session.signInWithValidateCodeAndNavigate(Number(accountID), validateCode, '', exitTo);
             }
         });
-        // eslint-disable-next-line react-hooks/exhaustive-deps
+        // eslint-disable-next-line react-compiler/react-compiler, react-hooks/exhaustive-deps
     }, []);
 
     useEffect(() => {
diff --git a/src/pages/ValidateLoginPage/index.website.tsx b/src/pages/ValidateLoginPage/index.website.tsx
index b8e8709215e8..13f636867852 100644
--- a/src/pages/ValidateLoginPage/index.website.tsx
+++ b/src/pages/ValidateLoginPage/index.website.tsx
@@ -24,9 +24,11 @@ function ValidateLoginPage({
     const isSignedIn = !!session?.authToken && session?.authTokenType !== CONST.AUTH_TOKEN_TYPES.ANONYMOUS;
     const is2FARequired = !!account?.requiresTwoFactorAuth;
     const cachedAccountID = credentials?.accountID;
+    const isUserClickedSignIn = !login && isSignedIn && (autoAuthState === CONST.AUTO_AUTH_STATE.SIGNING_IN || autoAuthState === CONST.AUTO_AUTH_STATE.JUST_SIGNED_IN);
+    const shouldStartSignInWithValidateCode = !isUserClickedSignIn && !isSignedIn && (!!login || !!exitTo);
 
     useEffect(() => {
-        if (!login && isSignedIn && (autoAuthState === CONST.AUTO_AUTH_STATE.SIGNING_IN || autoAuthState === CONST.AUTO_AUTH_STATE.JUST_SIGNED_IN)) {
+        if (isUserClickedSignIn) {
             // The user clicked the option to sign in the current tab
             Navigation.isNavigationReady().then(() => {
                 Navigation.goBack();
@@ -35,7 +37,7 @@ function ValidateLoginPage({
         }
         Session.initAutoAuthState(autoAuthState);
 
-        if (isSignedIn || (!login && !exitTo)) {
+        if (!shouldStartSignInWithValidateCode) {
             if (exitTo) {
                 Session.handleExitToNavigation(exitTo);
             }
@@ -49,7 +51,7 @@ function ValidateLoginPage({
         // we need to `popToTop` the stack after `signInWithValidateCode` in order to
         // perform login for both 2FA and non-2FA accounts.
         desktopLoginRedirect(autoAuthState, isSignedIn);
-        // eslint-disable-next-line react-hooks/exhaustive-deps
+        // eslint-disable-next-line react-compiler/react-compiler, react-hooks/exhaustive-deps
     }, []);
 
     useEffect(() => {
@@ -69,15 +71,16 @@ function ValidateLoginPage({
     return (
         <>
             {autoAuthState === CONST.AUTO_AUTH_STATE.FAILED && <ExpiredValidateCodeModal />}
-            {autoAuthState === CONST.AUTO_AUTH_STATE.JUST_SIGNED_IN && is2FARequired && !isSignedIn && <JustSignedInModal is2FARequired />}
-            {autoAuthState === CONST.AUTO_AUTH_STATE.JUST_SIGNED_IN && isSignedIn && !exitTo && <JustSignedInModal is2FARequired={false} />}
-            {autoAuthState === CONST.AUTO_AUTH_STATE.NOT_STARTED && !exitTo && (
+            {autoAuthState === CONST.AUTO_AUTH_STATE.JUST_SIGNED_IN && is2FARequired && !isSignedIn && login && <JustSignedInModal is2FARequired />}
+            {autoAuthState === CONST.AUTO_AUTH_STATE.JUST_SIGNED_IN && isSignedIn && !exitTo && login && <JustSignedInModal is2FARequired={false} />}
+            {/* If session.autoAuthState isn't available yet, we use shouldStartSignInWithValidateCode to conditionally render the component instead of local autoAuthState which contains a default value of NOT_STARTED */}
+            {(!session?.autoAuthState ? !shouldStartSignInWithValidateCode : autoAuthState === CONST.AUTO_AUTH_STATE.NOT_STARTED) && !exitTo && (
                 <ValidateCodeModal
                     accountID={Number(accountID)}
                     code={validateCode}
                 />
             )}
-            {autoAuthState === CONST.AUTO_AUTH_STATE.SIGNING_IN && <FullScreenLoadingIndicator />}
+            {(!session?.autoAuthState ? shouldStartSignInWithValidateCode : autoAuthState === CONST.AUTO_AUTH_STATE.SIGNING_IN) && <FullScreenLoadingIndicator />}
         </>
     );
 }
diff --git a/src/pages/WorkspaceSwitcherPage/WorkspacesSectionHeader.tsx b/src/pages/WorkspaceSwitcherPage/WorkspacesSectionHeader.tsx
index 85e13ba4c0a5..18c3be9678c4 100644
--- a/src/pages/WorkspaceSwitcherPage/WorkspacesSectionHeader.tsx
+++ b/src/pages/WorkspaceSwitcherPage/WorkspacesSectionHeader.tsx
@@ -19,7 +19,7 @@ function WorkspacesSectionHeader() {
     const {translate} = useLocalize();
 
     return (
-        <View style={[styles.mh4, styles.mt6, styles.flexRow, styles.justifyContentBetween, styles.alignItemsCenter, styles.mb1]}>
+        <View style={[styles.ph5, styles.flexRow, styles.justifyContentBetween, styles.alignItemsCenter, styles.mv2]}>
             <View>
                 <Text
                     style={styles.label}
@@ -33,8 +33,8 @@ function WorkspacesSectionHeader() {
                     accessible={false}
                     role={CONST.ROLE.BUTTON}
                     onPress={() => {
-                        Navigation.goBack();
-                        interceptAnonymousUser(() => App.createWorkspaceWithPolicyDraftAndNavigateToIt());
+                        const activeRoute = Navigation.getActiveRouteWithoutParams();
+                        interceptAnonymousUser(() => App.createWorkspaceWithPolicyDraftAndNavigateToIt('', '', false, false, activeRoute));
                     }}
                 >
                     {({hovered}) => (
diff --git a/src/pages/WorkspaceSwitcherPage/index.tsx b/src/pages/WorkspaceSwitcherPage/index.tsx
index b01a78b65317..562f11aa5bc5 100644
--- a/src/pages/WorkspaceSwitcherPage/index.tsx
+++ b/src/pages/WorkspaceSwitcherPage/index.tsx
@@ -1,4 +1,5 @@
 import React, {useCallback, useMemo} from 'react';
+import {View} from 'react-native';
 import {useOnyx} from 'react-native-onyx';
 import HeaderWithBackButton from '@components/HeaderWithBackButton';
 import * as Expensicons from '@components/Icon/Expensicons';
@@ -6,12 +7,16 @@ import ScreenWrapper from '@components/ScreenWrapper';
 import SelectionList from '@components/SelectionList';
 import type {ListItem, SectionListDataType} from '@components/SelectionList/types';
 import UserListItem from '@components/SelectionList/UserListItem';
+import Text from '@components/Text';
 import useActiveWorkspace from '@hooks/useActiveWorkspace';
 import useDebouncedState from '@hooks/useDebouncedState';
 import useLocalize from '@hooks/useLocalize';
 import useNetwork from '@hooks/useNetwork';
+import useTheme from '@hooks/useTheme';
+import useThemeStyles from '@hooks/useThemeStyles';
 import Navigation from '@libs/Navigation/Navigation';
 import * as PolicyUtils from '@libs/PolicyUtils';
+import {sortWorkspacesBySelected} from '@libs/PolicyUtils';
 import * as ReportUtils from '@libs/ReportUtils';
 import {getWorkspacesBrickRoads, getWorkspacesUnreadStatuses} from '@libs/WorkspacesSettingsUtils';
 import type {BrickRoad} from '@libs/WorkspacesSettingsUtils';
@@ -23,24 +28,16 @@ import WorkspacesSectionHeader from './WorkspacesSectionHeader';
 
 type WorkspaceListItem = {
     text: string;
-    policyID: string;
+    policyID?: string;
     isPolicyAdmin?: boolean;
     brickRoadIndicator?: BrickRoad;
 } & ListItem;
 
-const sortWorkspacesBySelected = (workspace1: WorkspaceListItem, workspace2: WorkspaceListItem, selectedWorkspaceID: string | undefined): number => {
-    if (workspace1.policyID === selectedWorkspaceID) {
-        return -1;
-    }
-    if (workspace2.policyID === selectedWorkspaceID) {
-        return 1;
-    }
-    return workspace1.text?.toLowerCase().localeCompare(workspace2.text?.toLowerCase() ?? '') ?? 0;
-};
-
 const WorkspaceCardCreateAWorkspaceInstance = <WorkspaceCardCreateAWorkspace />;
 
 function WorkspaceSwitcherPage() {
+    const styles = useThemeStyles();
+    const theme = useTheme();
     const {isOffline} = useNetwork();
     const [searchTerm, debouncedSearchTerm, setSearchTerm] = useDebouncedState('');
     const {translate} = useLocalize();
@@ -48,7 +45,7 @@ function WorkspaceSwitcherPage() {
 
     const [reports] = useOnyx(ONYXKEYS.COLLECTION.REPORT);
     const [reportActions] = useOnyx(ONYXKEYS.COLLECTION.REPORT_ACTIONS);
-    const [policies] = useOnyx(ONYXKEYS.COLLECTION.POLICY);
+    const [policies, fetchStatus] = useOnyx(ONYXKEYS.COLLECTION.POLICY);
 
     const brickRoadsForPolicies = useMemo(() => getWorkspacesBrickRoads(reports, policies, reportActions), [reports, policies, reportActions]);
     const unreadStatusesForPolicies = useMemo(() => getWorkspacesUnreadStatuses(reports), [reports]);
@@ -110,7 +107,7 @@ function WorkspaceSwitcherPage() {
             .filter((policy) => PolicyUtils.shouldShowPolicy(policy, !!isOffline) && !policy?.isJoinRequestPending)
             .map((policy) => ({
                 text: policy?.name ?? '',
-                policyID: policy?.id ?? '',
+                policyID: policy?.id ?? '-1',
                 brickRoadIndicator: getIndicatorTypeForPolicy(policy?.id),
                 icons: [
                     {
@@ -132,61 +129,75 @@ function WorkspaceSwitcherPage() {
         () =>
             usersWorkspaces
                 .filter((policy) => policy.text?.toLowerCase().includes(debouncedSearchTerm?.toLowerCase() ?? ''))
-                .sort((policy1, policy2) => sortWorkspacesBySelected(policy1, policy2, activeWorkspaceID)),
+                .sort((policy1, policy2) => sortWorkspacesBySelected({policyID: policy1.policyID, name: policy1.text}, {policyID: policy2.policyID, name: policy2.text}, activeWorkspaceID)),
         [debouncedSearchTerm, usersWorkspaces, activeWorkspaceID],
     );
 
     const sections = useMemo(() => {
         const options: Array<SectionListDataType<WorkspaceListItem>> = [
             {
-                title: translate('workspace.switcher.everythingSection'),
+                data: filteredAndSortedUserWorkspaces,
                 shouldShow: true,
-                indexOffset: 0,
-                data: [
-                    {
-                        text: CONST.WORKSPACE_SWITCHER.NAME,
-                        policyID: '',
-                        icons: [{source: Expensicons.ExpensifyAppIcon, name: CONST.WORKSPACE_SWITCHER.NAME, type: CONST.ICON_TYPE_AVATAR}],
-                        brickRoadIndicator: getIndicatorTypeForPolicy(undefined),
-                        isSelected: activeWorkspaceID === undefined,
-                        keyForList: CONST.WORKSPACE_SWITCHER.NAME,
-                    },
-                ],
+                indexOffset: 1,
             },
         ];
-        options.push({
-            CustomSectionHeader: WorkspacesSectionHeader,
-            data: filteredAndSortedUserWorkspaces,
-            shouldShow: true,
-            indexOffset: 1,
-        });
         return options;
-    }, [activeWorkspaceID, filteredAndSortedUserWorkspaces, getIndicatorTypeForPolicy, translate]);
+    }, [filteredAndSortedUserWorkspaces]);
 
     const headerMessage = filteredAndSortedUserWorkspaces.length === 0 && usersWorkspaces.length ? translate('common.noResultsFound') : '';
     const shouldShowCreateWorkspace = usersWorkspaces.length === 0;
 
+    const defaultPolicy = {
+        text: CONST.WORKSPACE_SWITCHER.NAME,
+        icons: [{source: Expensicons.ExpensifyAppIcon, name: CONST.WORKSPACE_SWITCHER.NAME, type: CONST.ICON_TYPE_AVATAR}],
+        brickRoadIndicator: getIndicatorTypeForPolicy(undefined),
+        keyForList: CONST.WORKSPACE_SWITCHER.NAME,
+        isSelected: activeWorkspaceID === undefined,
+    };
+
     return (
         <ScreenWrapper
             testID={WorkspaceSwitcherPage.displayName}
             includeSafeAreaPaddingBottom={false}
         >
-            <HeaderWithBackButton
-                title={translate('workspace.switcher.headerTitle')}
-                onBackButtonPress={Navigation.goBack}
-            />
-            <SelectionList<WorkspaceListItem>
-                ListItem={UserListItem}
-                sections={sections}
-                onSelectRow={selectPolicy}
-                textInputLabel={usersWorkspaces.length >= CONST.WORKSPACE_SWITCHER.MINIMUM_WORKSPACES_TO_SHOW_SEARCH ? translate('common.search') : undefined}
-                textInputValue={searchTerm}
-                onChangeText={setSearchTerm}
-                headerMessage={headerMessage}
-                listFooterContent={shouldShowCreateWorkspace ? WorkspaceCardCreateAWorkspaceInstance : null}
-                initiallyFocusedOptionKey={activeWorkspaceID ?? CONST.WORKSPACE_SWITCHER.NAME}
-                showLoadingPlaceholder
-            />
+            {({didScreenTransitionEnd}) => (
+                <>
+                    <HeaderWithBackButton
+                        title={translate('workspace.switcher.headerTitle')}
+                        onBackButtonPress={Navigation.goBack}
+                    />
+                    <View style={[styles.ph5, styles.flexRow, styles.justifyContentBetween, styles.alignItemsCenter, styles.mb1]}>
+                        <Text
+                            style={styles.label}
+                            color={theme.textSupporting}
+                        >
+                            {translate('workspace.switcher.everythingSection')}
+                        </Text>
+                    </View>
+                    <UserListItem
+                        item={defaultPolicy}
+                        isFocused={activeWorkspaceID === undefined}
+                        showTooltip={false}
+                        onSelectRow={() => selectPolicy(defaultPolicy)}
+                        pressableStyle={styles.flexRow}
+                        shouldSyncFocus={false}
+                    />
+                    <WorkspacesSectionHeader />
+                    <SelectionList<WorkspaceListItem>
+                        ListItem={UserListItem}
+                        sections={sections}
+                        onSelectRow={selectPolicy}
+                        textInputLabel={usersWorkspaces.length >= CONST.WORKSPACE_SWITCHER.MINIMUM_WORKSPACES_TO_SHOW_SEARCH ? translate('common.search') : undefined}
+                        textInputValue={searchTerm}
+                        onChangeText={setSearchTerm}
+                        headerMessage={headerMessage}
+                        listEmptyContent={WorkspaceCardCreateAWorkspaceInstance}
+                        shouldShowListEmptyContent={shouldShowCreateWorkspace}
+                        initiallyFocusedOptionKey={activeWorkspaceID ?? CONST.WORKSPACE_SWITCHER.NAME}
+                        showLoadingPlaceholder={fetchStatus.status === 'loading' || !didScreenTransitionEnd}
+                    />
+                </>
+            )}
         </ScreenWrapper>
     );
 }
diff --git a/src/pages/home/HeaderView.tsx b/src/pages/home/HeaderView.tsx
index 935572a1e7dd..2ca54d3a54d7 100644
--- a/src/pages/home/HeaderView.tsx
+++ b/src/pages/home/HeaderView.tsx
@@ -1,32 +1,31 @@
-import React, {memo, useMemo} from 'react';
+import React, {memo} from 'react';
 import {View} from 'react-native';
 import type {OnyxEntry} from 'react-native-onyx';
-import {withOnyx} from 'react-native-onyx';
+import {useOnyx} from 'react-native-onyx';
+import Badge from '@components/Badge';
 import Button from '@components/Button';
+import CaretWrapper from '@components/CaretWrapper';
 import ConfirmModal from '@components/ConfirmModal';
 import DisplayNames from '@components/DisplayNames';
-import type {ThreeDotsMenuItem} from '@components/HeaderWithBackButton/types';
 import Icon from '@components/Icon';
 import * as Expensicons from '@components/Icon/Expensicons';
 import MultipleAvatars from '@components/MultipleAvatars';
+import OfflineWithFeedback from '@components/OfflineWithFeedback';
 import ParentNavigationSubtitle from '@components/ParentNavigationSubtitle';
 import PressableWithoutFeedback from '@components/Pressable/PressableWithoutFeedback';
 import ReportHeaderSkeletonView from '@components/ReportHeaderSkeletonView';
 import SubscriptAvatar from '@components/SubscriptAvatar';
 import TaskHeaderActionButton from '@components/TaskHeaderActionButton';
 import Text from '@components/Text';
-import ThreeDotsMenu from '@components/ThreeDotsMenu';
 import Tooltip from '@components/Tooltip';
 import useLocalize from '@hooks/useLocalize';
+import usePolicy from '@hooks/usePolicy';
 import useTheme from '@hooks/useTheme';
 import useThemeStyles from '@hooks/useThemeStyles';
-import useWindowDimensions from '@hooks/useWindowDimensions';
-import * as HeaderUtils from '@libs/HeaderUtils';
 import Navigation from '@libs/Navigation/Navigation';
 import * as OptionsListUtils from '@libs/OptionsListUtils';
-import * as ReportActionsUtils from '@libs/ReportActionsUtils';
 import * as ReportUtils from '@libs/ReportUtils';
-import * as Link from '@userActions/Link';
+import * as SubscriptionUtils from '@libs/SubscriptionUtils';
 import * as Report from '@userActions/Report';
 import * as Session from '@userActions/Session';
 import * as Task from '@userActions/Task';
@@ -36,24 +35,7 @@ import ROUTES from '@src/ROUTES';
 import type * as OnyxTypes from '@src/types/onyx';
 import {isEmptyObject} from '@src/types/utils/EmptyObject';
 
-type HeaderViewOnyxProps = {
-    /** URL to the assigned guide's appointment booking calendar */
-    guideCalendarLink: OnyxEntry<string>;
-
-    /** Current user session */
-    session: OnyxEntry<OnyxTypes.Session>;
-
-    /** Personal details of all the users */
-    personalDetails: OnyxEntry<OnyxTypes.PersonalDetailsList>;
-
-    /** Parent report */
-    parentReport: OnyxEntry<OnyxTypes.Report>;
-
-    /** The current policy of the report */
-    policy: OnyxEntry<OnyxTypes.Policy>;
-};
-
-type HeaderViewProps = HeaderViewOnyxProps & {
+type HeaderViewProps = {
     /** Toggles the navigationMenu open and closed */
     onNavigationMenuButtonClicked: () => void;
 
@@ -61,7 +43,7 @@ type HeaderViewProps = HeaderViewOnyxProps & {
     report: OnyxTypes.Report;
 
     /** The report action the transaction is tied to from the parent report */
-    parentReportAction: OnyxEntry<OnyxTypes.ReportAction>;
+    parentReportAction: OnyxEntry<OnyxTypes.ReportAction> | null;
 
     /** The reportID of the current report */
     reportID: string;
@@ -70,29 +52,24 @@ type HeaderViewProps = HeaderViewOnyxProps & {
     shouldUseNarrowLayout?: boolean;
 };
 
-function HeaderView({
-    report,
-    personalDetails,
-    parentReport,
-    parentReportAction,
-    policy,
-    session,
-    reportID,
-    guideCalendarLink,
-    onNavigationMenuButtonClicked,
-    shouldUseNarrowLayout = false,
-}: HeaderViewProps) {
+function HeaderView({report, parentReportAction, reportID, onNavigationMenuButtonClicked, shouldUseNarrowLayout = false}: HeaderViewProps) {
     const [isDeleteTaskConfirmModalVisible, setIsDeleteTaskConfirmModalVisible] = React.useState(false);
-    const {windowWidth} = useWindowDimensions();
+    const [invoiceReceiverPolicy] = useOnyx(`${ONYXKEYS.COLLECTION.POLICY}${report.invoiceReceiver && 'policyID' in report.invoiceReceiver ? report.invoiceReceiver.policyID : -1}`);
+    // eslint-disable-next-line @typescript-eslint/prefer-nullish-coalescing
+    const [parentReport] = useOnyx(`${ONYXKEYS.COLLECTION.REPORT}${report.parentReportID || report?.reportID || '-1'}`);
+    const policy = usePolicy(report?.policyID);
+    const [personalDetails] = useOnyx(ONYXKEYS.PERSONAL_DETAILS_LIST);
+
     const {translate} = useLocalize();
     const theme = useTheme();
     const styles = useThemeStyles();
     const isSelfDM = ReportUtils.isSelfDM(report);
     const isGroupChat = ReportUtils.isGroupChat(report) || ReportUtils.isDeprecatedGroupDM(report);
-    // Currently, currentUser is not included in participantAccountIDs, so for selfDM, we need to add the currentUser as participants.
-    const participants = isSelfDM ? [session?.accountID ?? -1] : (report?.participantAccountIDs ?? []).slice(0, 5);
-    const participantPersonalDetails = OptionsListUtils.getPersonalDetailsForAccountIDs(participants, personalDetails);
+
+    const participants = ReportUtils.getParticipantsAccountIDsForDisplay(report).slice(0, 5);
     const isMultipleParticipant = participants.length > 1;
+
+    const participantPersonalDetails = OptionsListUtils.getPersonalDetailsForAccountIDs(participants, personalDetails);
     const displayNamesWithTooltips = ReportUtils.getDisplayNamesWithTooltips(participantPersonalDetails, isMultipleParticipant, undefined, isSelfDM);
 
     const isChatThread = ReportUtils.isChatThread(report);
@@ -101,18 +78,11 @@ function HeaderView({
     const isTaskReport = ReportUtils.isTaskReport(report);
     const reportHeaderData = !isTaskReport && !isChatThread && report.parentReportID ? parentReport : report;
     // Use sorted display names for the title for group chats on native small screen widths
-    const title = ReportUtils.getReportName(reportHeaderData);
+    const title = ReportUtils.getReportName(reportHeaderData, undefined, parentReportAction, personalDetails, invoiceReceiverPolicy);
     const subtitle = ReportUtils.getChatRoomSubtitle(reportHeaderData);
     const parentNavigationSubtitleData = ReportUtils.getParentNavigationSubtitle(reportHeaderData);
-    const isConcierge = ReportUtils.hasSingleParticipant(report) && participants.includes(CONST.ACCOUNT_ID.CONCIERGE);
-    const isCanceledTaskReport = ReportUtils.isCanceledTaskReport(report, parentReportAction);
-    const isWhisperAction = ReportActionsUtils.isWhisperAction(parentReportAction);
-    const isUserCreatedPolicyRoom = ReportUtils.isUserCreatedPolicyRoom(report);
-    const isPolicyEmployee = useMemo(() => !isEmptyObject(policy), [policy]);
-    const canLeaveRoom = ReportUtils.canLeaveRoom(report, isPolicyEmployee);
     const reportDescription = ReportUtils.getReportDescriptionText(report);
     const policyName = ReportUtils.getPolicyName(report, true);
-    const canLeavePolicyExpenseChat = ReportUtils.canLeavePolicyExpenseChat(report, policy);
     const policyDescription = ReportUtils.getPolicyDescriptionText(policy);
     const isPersonalExpenseChat = isPolicyExpenseChat && ReportUtils.isCurrentUserSubmitter(report.reportID);
     const shouldShowSubtitle = () => {
@@ -128,52 +98,9 @@ function HeaderView({
         return true;
     };
 
-    // 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 threeDotMenuItems: ThreeDotsMenuItem[] = [];
-    if (isTaskReport && !isCanceledTaskReport) {
-        const canModifyTask = Task.canModifyTask(report, session?.accountID ?? -1);
-
-        // Task is marked as completed
-        if (ReportUtils.isCompletedTaskReport(report) && canModifyTask) {
-            threeDotMenuItems.push({
-                icon: Expensicons.Checkmark,
-                text: translate('task.markAsIncomplete'),
-                onSelected: Session.checkIfActionIsAllowed(() => Task.reopenTask(report)),
-            });
-        }
-
-        // Task is not closed
-        if (ReportUtils.canWriteInReport(report) && report.stateNum !== CONST.REPORT.STATE_NUM.APPROVED && report.statusNum !== CONST.REPORT.STATUS_NUM.CLOSED && canModifyTask) {
-            threeDotMenuItems.push({
-                icon: Expensicons.Trashcan,
-                text: translate('common.delete'),
-                onSelected: Session.checkIfActionIsAllowed(() => setIsDeleteTaskConfirmModalVisible(true)),
-            });
-        }
-    }
-
-    const join = Session.checkIfActionIsAllowed(() =>
-        Report.updateNotificationPreference(reportID, report.notificationPreference, CONST.REPORT.NOTIFICATION_PREFERENCE.ALWAYS, false, report.parentReportID, report.parentReportActionID),
-    );
+    const join = Session.checkIfActionIsAllowed(() => Report.joinRoom(report));
 
-    const canJoinOrLeave = !isSelfDM && !isGroupChat && (isChatThread || isUserCreatedPolicyRoom || canLeaveRoom || canLeavePolicyExpenseChat);
-    const canJoin = canJoinOrLeave && !isWhisperAction && report.notificationPreference === CONST.REPORT.NOTIFICATION_PREFERENCE.HIDDEN;
-    const canLeave = canJoinOrLeave && ((isChatThread && !!report.notificationPreference?.length) || isUserCreatedPolicyRoom || canLeaveRoom || canLeavePolicyExpenseChat);
-    if (canJoin) {
-        threeDotMenuItems.push({
-            icon: Expensicons.ChatBubbles,
-            text: translate('common.join'),
-            onSelected: join,
-        });
-    } else if (canLeave) {
-        const isWorkspaceMemberLeavingWorkspaceRoom = !isChatThread && (report.visibility === CONST.REPORT.VISIBILITY.RESTRICTED || isPolicyExpenseChat) && isPolicyEmployee;
-        threeDotMenuItems.push({
-            icon: Expensicons.ChatBubbles,
-            text: translate('common.leave'),
-            onSelected: Session.checkIfActionIsAllowed(() => Report.leaveRoom(reportID, isWorkspaceMemberLeavingWorkspaceRoom)),
-        });
-    }
+    const canJoin = ReportUtils.canJoinChat(report, parentReportAction, policy);
 
     const joinButton = (
         <Button
@@ -190,29 +117,15 @@ function HeaderView({
         }
         return (
             <>
-                <Text style={[styles.sidebarLinkText, styles.textLabelSupporting, styles.fontWeightNormal]}> {translate('threads.in')} </Text>
+                <Text style={[styles.sidebarLinkText, styles.textLabelSupporting]}> {translate('threads.in')} </Text>
                 <Text style={[styles.sidebarLinkText, styles.textLabelSupporting, styles.textStrong]}>{policyName}</Text>
             </>
         );
     };
 
-    threeDotMenuItems.push(HeaderUtils.getPinMenuItem(report));
-
-    if (isConcierge && guideCalendarLink) {
-        threeDotMenuItems.push({
-            icon: Expensicons.Phone,
-            text: translate('videoChatButtonAndMenu.tooltip'),
-            onSelected: Session.checkIfActionIsAllowed(() => {
-                Link.openExternalLink(guideCalendarLink);
-            }),
-        });
-    }
-
-    const shouldShowThreeDotsButton = !!threeDotMenuItems.length;
-
     const shouldShowSubscript = ReportUtils.shouldReportShowSubscript(report);
     const defaultSubscriptSize = ReportUtils.isExpenseRequest(report) ? CONST.AVATAR_SIZE.SMALL_NORMAL : CONST.AVATAR_SIZE.DEFAULT;
-    const icons = ReportUtils.getIcons(reportHeaderData, personalDetails);
+    const icons = ReportUtils.getIcons(reportHeaderData, personalDetails, null, '', -1, undefined, invoiceReceiverPolicy);
     const brickRoadIndicator = ReportUtils.hasReportNameError(report) ? CONST.BRICK_ROAD_INDICATOR_STATUS.ERROR : '';
     const shouldShowBorderBottom = !isTaskReport || !shouldUseNarrowLayout;
     const shouldDisableDetailPage = ReportUtils.shouldDisableDetailPage(report);
@@ -225,53 +138,58 @@ function HeaderView({
             dataSet={{dragArea: true}}
         >
             <View style={[styles.appContentHeader, !shouldUseNarrowLayout && styles.headerBarDesktopHeight]}>
-                <View style={[styles.appContentHeaderTitle, !shouldUseNarrowLayout && !isLoading && styles.pl5]}>
-                    {isLoading ? (
-                        <ReportHeaderSkeletonView onBackButtonPress={onNavigationMenuButtonClicked} />
-                    ) : (
-                        <>
-                            {shouldUseNarrowLayout && (
-                                <PressableWithoutFeedback
-                                    onPress={onNavigationMenuButtonClicked}
-                                    style={styles.LHNToggle}
-                                    accessibilityHint={translate('accessibilityHints.navigateToChatsList')}
-                                    accessibilityLabel={translate('common.back')}
-                                    role={CONST.ROLE.BUTTON}
+                {isLoading ? (
+                    <ReportHeaderSkeletonView onBackButtonPress={onNavigationMenuButtonClicked} />
+                ) : (
+                    <View style={[styles.appContentHeaderTitle, !shouldUseNarrowLayout && !isLoading && styles.pl5]}>
+                        {shouldUseNarrowLayout && (
+                            <PressableWithoutFeedback
+                                onPress={onNavigationMenuButtonClicked}
+                                style={styles.LHNToggle}
+                                accessibilityHint={translate('accessibilityHints.navigateToChatsList')}
+                                accessibilityLabel={translate('common.back')}
+                                role={CONST.ROLE.BUTTON}
+                            >
+                                <Tooltip
+                                    text={translate('common.back')}
+                                    shiftVertical={4}
                                 >
-                                    <Tooltip
-                                        text={translate('common.back')}
-                                        shiftVertical={4}
-                                    >
-                                        <View>
-                                            <Icon
-                                                src={Expensicons.BackArrow}
-                                                fill={theme.icon}
-                                            />
-                                        </View>
-                                    </Tooltip>
-                                </PressableWithoutFeedback>
-                            )}
-                            <View style={[styles.flex1, styles.flexRow, styles.alignItemsCenter, styles.justifyContentBetween]}>
-                                <PressableWithoutFeedback
-                                    onPress={() => ReportUtils.navigateToDetailsPage(report)}
-                                    style={[styles.flexRow, styles.alignItemsCenter, styles.flex1]}
-                                    disabled={shouldDisableDetailPage}
-                                    accessibilityLabel={title}
-                                    role={CONST.ROLE.BUTTON}
-                                >
-                                    {shouldShowSubscript ? (
-                                        <SubscriptAvatar
-                                            mainAvatar={icons[0]}
-                                            secondaryAvatar={icons[1]}
-                                            size={defaultSubscriptSize}
+                                    <View>
+                                        <Icon
+                                            src={Expensicons.BackArrow}
+                                            fill={theme.icon}
                                         />
-                                    ) : (
+                                    </View>
+                                </Tooltip>
+                            </PressableWithoutFeedback>
+                        )}
+                        <View style={[styles.flex1, styles.flexRow, styles.alignItemsCenter, styles.justifyContentBetween]}>
+                            <PressableWithoutFeedback
+                                onPress={() => ReportUtils.navigateToDetailsPage(report)}
+                                style={[styles.flexRow, styles.alignItemsCenter, styles.flex1]}
+                                disabled={shouldDisableDetailPage}
+                                accessibilityLabel={title}
+                                role={CONST.ROLE.BUTTON}
+                            >
+                                {shouldShowSubscript ? (
+                                    <SubscriptAvatar
+                                        mainAvatar={icons[0]}
+                                        secondaryAvatar={icons[1]}
+                                        size={defaultSubscriptSize}
+                                    />
+                                ) : (
+                                    <OfflineWithFeedback pendingAction={report.pendingFields?.avatar}>
                                         <MultipleAvatars
                                             icons={icons}
                                             shouldShowTooltip={!isChatRoom || isChatThread}
                                         />
-                                    )}
-                                    <View style={[styles.flex1, styles.flexColumn]}>
+                                    </OfflineWithFeedback>
+                                )}
+                                <View
+                                    fsClass="fs-unmask"
+                                    style={[styles.flex1, styles.flexColumn]}
+                                >
+                                    <CaretWrapper>
                                         <DisplayNames
                                             fullTitle={title}
                                             displayNamesWithTooltips={displayNamesWithTooltips}
@@ -281,100 +199,100 @@ function HeaderView({
                                             shouldUseFullTitle={isChatRoom || isPolicyExpenseChat || isChatThread || isTaskReport || shouldUseGroupTitle}
                                             renderAdditionalText={renderAdditionalText}
                                         />
-                                        {!isEmptyObject(parentNavigationSubtitleData) && (
-                                            <ParentNavigationSubtitle
-                                                parentNavigationSubtitleData={parentNavigationSubtitleData}
-                                                parentReportID={report.parentReportID}
-                                                parentReportActionID={report.parentReportActionID}
-                                                pressableStyles={[styles.alignSelfStart, styles.mw100]}
-                                            />
-                                        )}
-                                        {shouldShowSubtitle() && (
+                                    </CaretWrapper>
+                                    {!isEmptyObject(parentNavigationSubtitleData) && (
+                                        <ParentNavigationSubtitle
+                                            parentNavigationSubtitleData={parentNavigationSubtitleData}
+                                            parentReportID={report.parentReportID}
+                                            parentReportActionID={report.parentReportActionID}
+                                            pressableStyles={[styles.alignSelfStart, styles.mw100]}
+                                        />
+                                    )}
+                                    {shouldShowSubtitle() && (
+                                        <Text
+                                            style={[styles.sidebarLinkText, styles.optionAlternateText, styles.textLabelSupporting]}
+                                            numberOfLines={1}
+                                        >
+                                            {subtitle}
+                                        </Text>
+                                    )}
+                                    {isChatRoom && !!reportDescription && isEmptyObject(parentNavigationSubtitleData) && (
+                                        <PressableWithoutFeedback
+                                            onPress={() => {
+                                                if (ReportUtils.canEditReportDescription(report, policy)) {
+                                                    Navigation.navigate(ROUTES.REPORT_DESCRIPTION.getRoute(reportID));
+                                                    return;
+                                                }
+                                                Navigation.navigate(ROUTES.REPORT_WITH_ID_DETAILS.getRoute(reportID));
+                                            }}
+                                            style={[styles.alignSelfStart, styles.mw100]}
+                                            accessibilityLabel={translate('reportDescriptionPage.roomDescription')}
+                                        >
                                             <Text
                                                 style={[styles.sidebarLinkText, styles.optionAlternateText, styles.textLabelSupporting]}
                                                 numberOfLines={1}
                                             >
-                                                {subtitle}
+                                                {reportDescription}
                                             </Text>
-                                        )}
-                                        {isChatRoom && !!reportDescription && isEmptyObject(parentNavigationSubtitleData) && (
-                                            <PressableWithoutFeedback
-                                                onPress={() => {
-                                                    if (ReportUtils.canEditReportDescription(report, policy)) {
-                                                        Navigation.navigate(ROUTES.REPORT_DESCRIPTION.getRoute(reportID));
-                                                        return;
-                                                    }
-                                                    Navigation.navigate(ROUTES.REPORT_WITH_ID_DETAILS.getRoute(reportID));
-                                                }}
-                                                style={[styles.alignSelfStart, styles.mw100]}
-                                                accessibilityLabel={translate('reportDescriptionPage.roomDescription')}
-                                            >
-                                                <Text
-                                                    style={[styles.sidebarLinkText, styles.optionAlternateText, styles.textLabelSupporting]}
-                                                    numberOfLines={1}
-                                                >
-                                                    {reportDescription}
-                                                </Text>
-                                            </PressableWithoutFeedback>
-                                        )}
-                                        {isPolicyExpenseChat && !!policyDescription && isEmptyObject(parentNavigationSubtitleData) && (
-                                            <PressableWithoutFeedback
-                                                onPress={() => {
-                                                    if (ReportUtils.canEditPolicyDescription(policy)) {
-                                                        Navigation.navigate(ROUTES.WORKSPACE_PROFILE_DESCRIPTION.getRoute(report.policyID ?? ''));
-                                                        return;
-                                                    }
-                                                    Navigation.navigate(ROUTES.REPORT_WITH_ID_DETAILS.getRoute(reportID));
-                                                }}
-                                                style={[styles.alignSelfStart, styles.mw100]}
-                                                accessibilityLabel={translate('workspace.editor.descriptionInputLabel')}
-                                            >
-                                                <Text
-                                                    style={[styles.sidebarLinkText, styles.optionAlternateText, styles.textLabelSupporting]}
-                                                    numberOfLines={1}
-                                                >
-                                                    {policyDescription}
-                                                </Text>
-                                            </PressableWithoutFeedback>
-                                        )}
-                                    </View>
-                                    {brickRoadIndicator === CONST.BRICK_ROAD_INDICATOR_STATUS.ERROR && (
-                                        <View style={[styles.alignItemsCenter, styles.justifyContentCenter]}>
-                                            <Icon
-                                                src={Expensicons.DotIndicator}
-                                                fill={theme.danger}
-                                            />
-                                        </View>
+                                        </PressableWithoutFeedback>
                                     )}
-                                </PressableWithoutFeedback>
-                                <View style={[styles.reportOptions, styles.flexRow, styles.alignItemsCenter]}>
-                                    {isTaskReport && !shouldUseNarrowLayout && ReportUtils.isOpenTaskReport(report, parentReportAction) && <TaskHeaderActionButton report={report} />}
-                                    {canJoin && !shouldUseNarrowLayout && joinButton}
-                                    {shouldShowThreeDotsButton && (
-                                        <ThreeDotsMenu
-                                            anchorPosition={styles.threeDotsPopoverOffset(windowWidth)}
-                                            menuItems={threeDotMenuItems}
-                                            shouldSetModalVisibility={false}
-                                        />
+                                    {isPolicyExpenseChat && !!policyDescription && isEmptyObject(parentNavigationSubtitleData) && (
+                                        <PressableWithoutFeedback
+                                            onPress={() => {
+                                                if (ReportUtils.canEditPolicyDescription(policy)) {
+                                                    Navigation.navigate(ROUTES.WORKSPACE_PROFILE_DESCRIPTION.getRoute(report.policyID ?? '-1'));
+                                                    return;
+                                                }
+                                                Navigation.navigate(ROUTES.REPORT_WITH_ID_DETAILS.getRoute(reportID));
+                                            }}
+                                            style={[styles.alignSelfStart, styles.mw100]}
+                                            accessibilityLabel={translate('workspace.editor.descriptionInputLabel')}
+                                        >
+                                            <Text
+                                                style={[styles.sidebarLinkText, styles.optionAlternateText, styles.textLabelSupporting]}
+                                                numberOfLines={1}
+                                            >
+                                                {policyDescription}
+                                            </Text>
+                                        </PressableWithoutFeedback>
                                     )}
                                 </View>
+                                {brickRoadIndicator === CONST.BRICK_ROAD_INDICATOR_STATUS.ERROR && (
+                                    <View style={[styles.alignItemsCenter, styles.justifyContentCenter]}>
+                                        <Icon
+                                            src={Expensicons.DotIndicator}
+                                            fill={theme.danger}
+                                        />
+                                    </View>
+                                )}
+                            </PressableWithoutFeedback>
+                            <View style={[styles.reportOptions, styles.flexRow, styles.alignItemsCenter]}>
+                                {ReportUtils.isChatUsedForOnboarding(report) && SubscriptionUtils.isUserOnFreeTrial() && (
+                                    <Badge
+                                        success
+                                        text={translate('subscription.badge.freeTrial', {numOfDays: SubscriptionUtils.calculateRemainingFreeTrialDays()})}
+                                    />
+                                )}
+                                {isTaskReport && !shouldUseNarrowLayout && ReportUtils.isOpenTaskReport(report, parentReportAction) && <TaskHeaderActionButton report={report} />}
+                                {canJoin && !shouldUseNarrowLayout && joinButton}
                             </View>
-                            <ConfirmModal
-                                isVisible={isDeleteTaskConfirmModalVisible}
-                                onConfirm={() => {
-                                    setIsDeleteTaskConfirmModalVisible(false);
-                                    Task.deleteTask(report);
-                                }}
-                                onCancel={() => setIsDeleteTaskConfirmModalVisible(false)}
-                                title={translate('task.deleteTask')}
-                                prompt={translate('task.deleteConfirmation')}
-                                confirmText={translate('common.delete')}
-                                cancelText={translate('common.cancel')}
-                                danger
-                            />
-                        </>
-                    )}
-                </View>
+                        </View>
+                        <ConfirmModal
+                            isVisible={isDeleteTaskConfirmModalVisible}
+                            onConfirm={() => {
+                                setIsDeleteTaskConfirmModalVisible(false);
+                                Task.deleteTask(report);
+                            }}
+                            onCancel={() => setIsDeleteTaskConfirmModalVisible(false)}
+                            title={translate('task.deleteTask')}
+                            prompt={translate('task.deleteConfirmation')}
+                            confirmText={translate('common.delete')}
+                            cancelText={translate('common.cancel')}
+                            danger
+                            shouldEnableNewFocusManagement
+                        />
+                    </View>
+                )}
             </View>
             {!isLoading && canJoin && shouldUseNarrowLayout && <View style={[styles.ph5, styles.pb2]}>{joinButton}</View>}
         </View>
@@ -383,24 +301,4 @@ function HeaderView({
 
 HeaderView.displayName = 'HeaderView';
 
-export default memo(
-    withOnyx<HeaderViewProps, HeaderViewOnyxProps>({
-        guideCalendarLink: {
-            key: ONYXKEYS.ACCOUNT,
-            selector: (account) => account?.guideCalendarLink ?? null,
-            initialValue: null,
-        },
-        parentReport: {
-            key: ({report}) => `${ONYXKEYS.COLLECTION.REPORT}${report.parentReportID ?? report?.reportID}`,
-        },
-        session: {
-            key: ONYXKEYS.SESSION,
-        },
-        policy: {
-            key: ({report}) => `${ONYXKEYS.COLLECTION.POLICY}${report ? report.policyID : '0'}`,
-        },
-        personalDetails: {
-            key: ONYXKEYS.PERSONAL_DETAILS_LIST,
-        },
-    })(HeaderView),
-);
+export default memo(HeaderView);
diff --git a/src/pages/home/ReportScreen.tsx b/src/pages/home/ReportScreen.tsx
index b82137756a28..4222d9e7b809 100644
--- a/src/pages/home/ReportScreen.tsx
+++ b/src/pages/home/ReportScreen.tsx
@@ -1,17 +1,15 @@
+import {PortalHost} from '@gorhom/portal';
 import {useIsFocused} from '@react-navigation/native';
 import type {StackScreenProps} from '@react-navigation/stack';
 import lodashIsEqual from 'lodash/isEqual';
-import React, {memo, useCallback, useEffect, useLayoutEffect, useMemo, useRef, useState} from 'react';
+import React, {memo, useCallback, useEffect, useMemo, useRef, useState} from 'react';
 import type {FlatList, ViewStyle} from 'react-native';
 import {InteractionManager, View} from 'react-native';
-import type {OnyxCollection, OnyxEntry} from 'react-native-onyx';
-import {withOnyx} from 'react-native-onyx';
-import type {LayoutChangeEvent} from 'react-native/Libraries/Types/CoreEventTypes';
+import type {OnyxEntry} from 'react-native-onyx';
+import {useOnyx} from 'react-native-onyx';
 import Banner from '@components/Banner';
-import BlockingView from '@components/BlockingViews/BlockingView';
 import FullPageNotFoundView from '@components/BlockingViews/FullPageNotFoundView';
 import DragAndDropProvider from '@components/DragAndDrop/Provider';
-import * as Illustrations from '@components/Icon/Illustrations';
 import MoneyReportHeader from '@components/MoneyReportHeader';
 import MoneyRequestHeader from '@components/MoneyRequestHeader';
 import OfflineWithFeedback from '@components/OfflineWithFeedback';
@@ -20,14 +18,17 @@ import ScreenWrapper from '@components/ScreenWrapper';
 import TaskHeaderActionButton from '@components/TaskHeaderActionButton';
 import type {CurrentReportIDContextValue} from '@components/withCurrentReportID';
 import withCurrentReportID from '@components/withCurrentReportID';
+import useActiveWorkspace from '@hooks/useActiveWorkspace';
 import useAppFocusEvent from '@hooks/useAppFocusEvent';
-import useIsReportOpenInRHP from '@hooks/useIsReportOpenInRHP';
+import useDeepCompareRef from '@hooks/useDeepCompareRef';
 import useLocalize from '@hooks/useLocalize';
 import useNetwork from '@hooks/useNetwork';
+import usePaginatedReportActions from '@hooks/usePaginatedReportActions';
+import usePermissions from '@hooks/usePermissions';
 import usePrevious from '@hooks/usePrevious';
+import useResponsiveLayout from '@hooks/useResponsiveLayout';
 import useThemeStyles from '@hooks/useThemeStyles';
 import useViewportOffsetTop from '@hooks/useViewportOffsetTop';
-import useWindowDimensions from '@hooks/useWindowDimensions';
 import Timing from '@libs/actions/Timing';
 import Log from '@libs/Log';
 import Navigation from '@libs/Navigation/Navigation';
@@ -37,8 +38,8 @@ import * as PersonalDetailsUtils from '@libs/PersonalDetailsUtils';
 import * as ReportActionsUtils from '@libs/ReportActionsUtils';
 import * as ReportUtils from '@libs/ReportUtils';
 import shouldFetchReport from '@libs/shouldFetchReport';
-import type {CentralPaneNavigatorParamList} from '@navigation/types';
-import variables from '@styles/variables';
+import * as ValidationUtils from '@libs/ValidationUtils';
+import type {AuthScreensParamList} from '@navigation/types';
 import * as ComposerActions from '@userActions/Composer';
 import * as Report from '@userActions/Report';
 import CONST from '@src/CONST';
@@ -47,60 +48,26 @@ import ROUTES from '@src/ROUTES';
 import type SCREENS from '@src/SCREENS';
 import type * as OnyxTypes from '@src/types/onyx';
 import {isEmptyObject} from '@src/types/utils/EmptyObject';
+import isLoadingOnyxValue from '@src/types/utils/isLoadingOnyxValue';
 import HeaderView from './HeaderView';
+import ReportActionsListItemRenderer from './report/ReportActionsListItemRenderer';
 import ReportActionsView from './report/ReportActionsView';
 import ReportFooter from './report/ReportFooter';
 import type {ActionListContextType, ReactionListRef, ScrollPosition} from './ReportScreenContext';
 import {ActionListContext, ReactionListContext} from './ReportScreenContext';
 
-type ReportScreenOnyxPropsWithoutParentReportAction = {
-    /** Get modal status */
-    modal: OnyxEntry<OnyxTypes.Modal>;
+type ReportScreenNavigationProps = StackScreenProps<AuthScreensParamList, typeof SCREENS.REPORT>;
 
-    /** Tells us if the sidebar has rendered */
-    isSidebarLoaded: OnyxEntry<boolean>;
+type ReportScreenProps = CurrentReportIDContextValue & ReportScreenNavigationProps;
 
-    /** Beta features list */
-    betas: OnyxEntry<OnyxTypes.Beta[]>;
-
-    /** The policies which the user has access to */
-    policies: OnyxCollection<OnyxTypes.Policy>;
-
-    /** The account manager report ID */
-    accountManagerReportID: OnyxEntry<string>;
-
-    /** Whether user is leaving the current report */
-    userLeavingStatus: OnyxEntry<boolean>;
-
-    /** Whether the composer is full size */
-    isComposerFullSize: OnyxEntry<boolean>;
-
-    /** An array containing all report actions related to this report, sorted based on a date criterion */
-    sortedAllReportActions: OnyxTypes.ReportAction[];
-
-    /** The report currently being looked at */
-    report: OnyxEntry<OnyxTypes.Report>;
-
-    /** The report metadata loading states */
-    reportMetadata: OnyxEntry<OnyxTypes.ReportMetadata>;
-};
-
-type OnyxHOCProps = {
-    /** Onyx function that marks the component ready for hydration */
-    markReadyForHydration?: () => void;
-};
-
-type ReportScreenNavigationProps = StackScreenProps<CentralPaneNavigatorParamList, typeof SCREENS.REPORT>;
-
-type ReportScreenPropsWithoutParentReportAction = OnyxHOCProps & CurrentReportIDContextValue & ReportScreenOnyxPropsWithoutParentReportAction & ReportScreenNavigationProps;
-
-type ReportScreenParentReportActionOnyxProps = {
-    /** The report's parentReportActions */
-    parentReportActions: OnyxEntry<OnyxTypes.ReportActions>;
+const defaultReportMetadata = {
+    isLoadingInitialReportActions: true,
+    isLoadingOlderReportActions: false,
+    hasLoadingOlderReportActionsError: false,
+    isLoadingNewerReportActions: false,
+    hasLoadingNewerReportActionsError: false,
 };
 
-type ReportScreenProps = ReportScreenPropsWithoutParentReportAction & ReportScreenParentReportActionOnyxProps;
-
 /** Get the currently viewed report ID as number */
 function getReportID(route: ReportScreenNavigationProps['route']): string {
     // The report ID is used in an onyx key. If it's an empty string, onyx will return
@@ -124,32 +91,12 @@ function isEmpty(report: OnyxTypes.Report): boolean {
 
 function getParentReportAction(parentReportActions: OnyxEntry<OnyxTypes.ReportActions>, parentReportActionID: string | undefined): OnyxEntry<OnyxTypes.ReportAction> {
     if (!parentReportActions || !parentReportActionID) {
-        return null;
+        return;
     }
     return parentReportActions[parentReportActionID ?? '0'];
 }
 
-function ReportScreen({
-    betas = [],
-    route,
-    report: reportProp,
-    sortedAllReportActions,
-    reportMetadata = {
-        isLoadingInitialReportActions: true,
-        isLoadingOlderReportActions: false,
-        isLoadingNewerReportActions: false,
-    },
-    parentReportActions,
-    accountManagerReportID,
-    markReadyForHydration,
-    policies = {},
-    isSidebarLoaded = false,
-    modal,
-    isComposerFullSize = false,
-    userLeavingStatus = false,
-    currentReportID = '',
-    navigation,
-}: ReportScreenProps) {
+function ReportScreen({route, currentReportID = '', navigation}: ReportScreenProps) {
     const styles = useThemeStyles();
     const {translate} = useLocalize();
     const reportIDFromRoute = getReportID(route);
@@ -158,11 +105,59 @@ function ReportScreen({
     const prevIsFocused = usePrevious(isFocused);
     const firstRenderRef = useRef(true);
     const flatListRef = useRef<FlatList>(null);
+    const {canUseDefaultRooms} = usePermissions();
     const reactionListRef = useRef<ReactionListRef>(null);
     const {isOffline} = useNetwork();
-    const isReportOpenInRHP = useIsReportOpenInRHP();
-    const {isSmallScreenWidth} = useWindowDimensions();
-    const shouldUseNarrowLayout = isSmallScreenWidth || isReportOpenInRHP;
+    const {shouldUseNarrowLayout, isInNarrowPaneModal} = useResponsiveLayout();
+    const {activeWorkspaceID} = useActiveWorkspace();
+
+    const [modal] = useOnyx(ONYXKEYS.MODAL);
+    const [isComposerFullSize] = useOnyx(`${ONYXKEYS.COLLECTION.REPORT_IS_COMPOSER_FULL_SIZE}${reportIDFromRoute}`, {initialValue: false});
+    const [accountManagerReportID] = useOnyx(ONYXKEYS.ACCOUNT_MANAGER_REPORT_ID, {initialValue: ''});
+    const [userLeavingStatus] = useOnyx(`${ONYXKEYS.COLLECTION.REPORT_USER_IS_LEAVING_ROOM}${reportIDFromRoute}`, {initialValue: false});
+    const [reportOnyx, reportResult] = useOnyx(`${ONYXKEYS.COLLECTION.REPORT}${reportIDFromRoute}`, {allowStaleData: true});
+    const [reportMetadata = defaultReportMetadata] = useOnyx(`${ONYXKEYS.COLLECTION.REPORT_METADATA}${reportIDFromRoute}`, {initialValue: defaultReportMetadata});
+    const [isSidebarLoaded] = useOnyx(ONYXKEYS.IS_SIDEBAR_LOADED, {initialValue: false});
+    const [policies] = useOnyx(ONYXKEYS.COLLECTION.POLICY, {allowStaleData: true, initialValue: {}});
+    const [betas] = useOnyx(ONYXKEYS.BETAS);
+    // eslint-disable-next-line @typescript-eslint/prefer-nullish-coalescing
+    const [parentReportAction] = useOnyx(`${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${reportOnyx?.parentReportID || 0}`, {
+        canEvict: false,
+        selector: (parentReportActions) => getParentReportAction(parentReportActions, reportOnyx?.parentReportActionID ?? ''),
+    });
+    const [isLoadingApp] = useOnyx(ONYXKEYS.IS_LOADING_APP);
+    const [workspaceTooltip] = useOnyx(ONYXKEYS.NVP_WORKSPACE_TOOLTIP);
+    const wasLoadingApp = usePrevious(isLoadingApp);
+    const finishedLoadingApp = wasLoadingApp && !isLoadingApp;
+    const isDeletedParentAction = ReportActionsUtils.isDeletedParentAction(parentReportAction);
+    const prevIsDeletedParentAction = usePrevious(isDeletedParentAction);
+
+    const isLoadingReportOnyx = isLoadingOnyxValue(reportResult);
+    const permissions = useDeepCompareRef(reportOnyx?.permissions);
+
+    useEffect(() => {
+        // Don't update if there is a reportID in the params already
+        if (route.params.reportID) {
+            const reportActionID = route?.params?.reportActionID;
+            const isValidReportActionID = ValidationUtils.isNumeric(reportActionID);
+            if (reportActionID && !isValidReportActionID) {
+                navigation.setParams({reportActionID: ''});
+            }
+            return;
+        }
+
+        const lastAccessedReportID = ReportUtils.findLastAccessedReport(!canUseDefaultRooms, !!route.params.openOnAdminRoom, activeWorkspaceID)?.reportID;
+
+        // It's possible that reports aren't fully loaded yet
+        // in that case the reportID is undefined
+        if (!lastAccessedReportID) {
+            return;
+        }
+
+        Log.info(`[ReportScreen] no reportID found in params, setting it to lastAccessedReportID: ${lastAccessedReportID}`);
+        navigation.setParams({reportID: lastAccessedReportID});
+    }, [activeWorkspaceID, canUseDefaultRooms, navigation, route, finishedLoadingApp]);
+
     /**
      * Create a lightweight Report so as to keep the re-rendering as light as possible by
      * passing in only the required props.
@@ -173,110 +168,102 @@ function ReportScreen({
      */
     const report = useMemo(
         (): OnyxTypes.Report => ({
-            lastReadTime: reportProp?.lastReadTime,
-            reportID: reportProp?.reportID ?? '',
-            policyID: reportProp?.policyID,
-            lastVisibleActionCreated: reportProp?.lastVisibleActionCreated,
-            statusNum: reportProp?.statusNum,
-            stateNum: reportProp?.stateNum,
-            writeCapability: reportProp?.writeCapability,
-            type: reportProp?.type,
-            errorFields: reportProp?.errorFields,
-            isPolicyExpenseChat: reportProp?.isPolicyExpenseChat,
-            parentReportID: reportProp?.parentReportID,
-            parentReportActionID: reportProp?.parentReportActionID,
-            chatType: reportProp?.chatType,
-            pendingFields: reportProp?.pendingFields,
-            isDeletedParentAction: reportProp?.isDeletedParentAction,
-            reportName: reportProp?.reportName,
-            description: reportProp?.description,
-            managerID: reportProp?.managerID,
-            total: reportProp?.total,
-            nonReimbursableTotal: reportProp?.nonReimbursableTotal,
-            fieldList: reportProp?.fieldList,
-            ownerAccountID: reportProp?.ownerAccountID,
-            currency: reportProp?.currency,
-            unheldTotal: reportProp?.unheldTotal,
-            participantAccountIDs: reportProp?.participantAccountIDs,
-            isWaitingOnBankAccount: reportProp?.isWaitingOnBankAccount,
-            iouReportID: reportProp?.iouReportID,
-            isOwnPolicyExpenseChat: reportProp?.isOwnPolicyExpenseChat,
-            notificationPreference: reportProp?.notificationPreference,
-            isPinned: reportProp?.isPinned,
-            chatReportID: reportProp?.chatReportID,
-            visibility: reportProp?.visibility,
-            oldPolicyName: reportProp?.oldPolicyName,
-            policyName: reportProp?.policyName,
-            isOptimisticReport: reportProp?.isOptimisticReport,
-            lastMentionedTime: reportProp?.lastMentionedTime,
-            avatarUrl: reportProp?.avatarUrl,
-            permissions: reportProp?.permissions,
-            invoiceReceiver: reportProp?.invoiceReceiver,
+            lastReadTime: reportOnyx?.lastReadTime,
+            reportID: reportOnyx?.reportID ?? '',
+            policyID: reportOnyx?.policyID,
+            lastVisibleActionCreated: reportOnyx?.lastVisibleActionCreated,
+            statusNum: reportOnyx?.statusNum,
+            stateNum: reportOnyx?.stateNum,
+            writeCapability: reportOnyx?.writeCapability,
+            type: reportOnyx?.type,
+            errorFields: reportOnyx?.errorFields,
+            isPolicyExpenseChat: reportOnyx?.isPolicyExpenseChat,
+            parentReportID: reportOnyx?.parentReportID,
+            parentReportActionID: reportOnyx?.parentReportActionID,
+            chatType: reportOnyx?.chatType,
+            pendingFields: reportOnyx?.pendingFields,
+            isDeletedParentAction: reportOnyx?.isDeletedParentAction,
+            reportName: reportOnyx?.reportName,
+            description: reportOnyx?.description,
+            managerID: reportOnyx?.managerID,
+            total: reportOnyx?.total,
+            nonReimbursableTotal: reportOnyx?.nonReimbursableTotal,
+            fieldList: reportOnyx?.fieldList,
+            ownerAccountID: reportOnyx?.ownerAccountID,
+            currency: reportOnyx?.currency,
+            unheldTotal: reportOnyx?.unheldTotal,
+            participants: reportOnyx?.participants,
+            isWaitingOnBankAccount: reportOnyx?.isWaitingOnBankAccount,
+            iouReportID: reportOnyx?.iouReportID,
+            isOwnPolicyExpenseChat: reportOnyx?.isOwnPolicyExpenseChat,
+            notificationPreference: reportOnyx?.notificationPreference,
+            isPinned: reportOnyx?.isPinned,
+            chatReportID: reportOnyx?.chatReportID,
+            visibility: reportOnyx?.visibility,
+            oldPolicyName: reportOnyx?.oldPolicyName,
+            policyName: reportOnyx?.policyName,
+            // eslint-disable-next-line @typescript-eslint/naming-convention
+            private_isArchived: reportOnyx?.private_isArchived,
+            isOptimisticReport: reportOnyx?.isOptimisticReport,
+            lastMentionedTime: reportOnyx?.lastMentionedTime,
+            avatarUrl: reportOnyx?.avatarUrl,
+            permissions,
+            invoiceReceiver: reportOnyx?.invoiceReceiver,
+            policyAvatar: reportOnyx?.policyAvatar,
         }),
         [
-            reportProp?.lastReadTime,
-            reportProp?.reportID,
-            reportProp?.policyID,
-            reportProp?.lastVisibleActionCreated,
-            reportProp?.statusNum,
-            reportProp?.stateNum,
-            reportProp?.writeCapability,
-            reportProp?.type,
-            reportProp?.errorFields,
-            reportProp?.isPolicyExpenseChat,
-            reportProp?.parentReportID,
-            reportProp?.parentReportActionID,
-            reportProp?.chatType,
-            reportProp?.pendingFields,
-            reportProp?.isDeletedParentAction,
-            reportProp?.reportName,
-            reportProp?.description,
-            reportProp?.managerID,
-            reportProp?.total,
-            reportProp?.nonReimbursableTotal,
-            reportProp?.fieldList,
-            reportProp?.ownerAccountID,
-            reportProp?.currency,
-            reportProp?.unheldTotal,
-            reportProp?.participantAccountIDs,
-            reportProp?.isWaitingOnBankAccount,
-            reportProp?.iouReportID,
-            reportProp?.isOwnPolicyExpenseChat,
-            reportProp?.notificationPreference,
-            reportProp?.isPinned,
-            reportProp?.chatReportID,
-            reportProp?.visibility,
-            reportProp?.oldPolicyName,
-            reportProp?.policyName,
-            reportProp?.isOptimisticReport,
-            reportProp?.lastMentionedTime,
-            reportProp?.avatarUrl,
-            reportProp?.permissions,
-            reportProp?.invoiceReceiver,
+            reportOnyx?.lastReadTime,
+            reportOnyx?.reportID,
+            reportOnyx?.policyID,
+            reportOnyx?.lastVisibleActionCreated,
+            reportOnyx?.statusNum,
+            reportOnyx?.stateNum,
+            reportOnyx?.writeCapability,
+            reportOnyx?.type,
+            reportOnyx?.errorFields,
+            reportOnyx?.isPolicyExpenseChat,
+            reportOnyx?.parentReportID,
+            reportOnyx?.parentReportActionID,
+            reportOnyx?.chatType,
+            reportOnyx?.pendingFields,
+            reportOnyx?.isDeletedParentAction,
+            reportOnyx?.reportName,
+            reportOnyx?.description,
+            reportOnyx?.managerID,
+            reportOnyx?.total,
+            reportOnyx?.nonReimbursableTotal,
+            reportOnyx?.fieldList,
+            reportOnyx?.ownerAccountID,
+            reportOnyx?.currency,
+            reportOnyx?.unheldTotal,
+            reportOnyx?.participants,
+            reportOnyx?.isWaitingOnBankAccount,
+            reportOnyx?.iouReportID,
+            reportOnyx?.isOwnPolicyExpenseChat,
+            reportOnyx?.notificationPreference,
+            reportOnyx?.isPinned,
+            reportOnyx?.chatReportID,
+            reportOnyx?.visibility,
+            reportOnyx?.oldPolicyName,
+            reportOnyx?.policyName,
+            reportOnyx?.private_isArchived,
+            reportOnyx?.isOptimisticReport,
+            reportOnyx?.lastMentionedTime,
+            reportOnyx?.avatarUrl,
+            permissions,
+            reportOnyx?.invoiceReceiver,
+            reportOnyx?.policyAvatar,
         ],
     );
 
-    const parentReportAction = useMemo(() => getParentReportAction(parentReportActions, report?.parentReportActionID), [parentReportActions, report.parentReportActionID]);
-
     const prevReport = usePrevious(report);
     const prevUserLeavingStatus = usePrevious(userLeavingStatus);
     const [isLinkingToMessage, setIsLinkingToMessage] = useState(!!reportActionIDFromRoute);
-    const reportActions = useMemo(() => {
-        if (!sortedAllReportActions.length) {
-            return [];
-        }
-        return ReportActionsUtils.getContinuousReportActionChain(sortedAllReportActions, reportActionIDFromRoute);
-    }, [reportActionIDFromRoute, sortedAllReportActions]);
 
-    // Define here because reportActions are recalculated before mount, allowing data to display faster than useEffect can trigger.
-    // If we have cached reportActions, they will be shown immediately.
-    // We aim to display a loader first, then fetch relevant reportActions, and finally show them.
-    useLayoutEffect(() => {
-        setIsLinkingToMessage(!!reportActionIDFromRoute);
-    }, [route, reportActionIDFromRoute]);
+    const [currentUserAccountID = -1] = useOnyx(ONYXKEYS.SESSION, {selector: (value) => value?.accountID});
+    const {reportActions, linkedAction, sortedAllReportActions} = usePaginatedReportActions(report.reportID, reportActionIDFromRoute);
 
     const [isBannerVisible, setIsBannerVisible] = useState(true);
-    const [listHeight, setListHeight] = useState(0);
     const [scrollPosition, setScrollPosition] = useState<ScrollPosition>({});
 
     const wasReportAccessibleRef = useRef(false);
@@ -290,26 +277,32 @@ function ReportScreen({
 
     const {reportPendingAction, reportErrors} = ReportUtils.getReportOfflinePendingActionAndErrors(report);
     const screenWrapperStyle: ViewStyle[] = [styles.appContent, styles.flex1, {marginTop: viewportOffsetTop}];
-    const isEmptyChat = useMemo((): boolean => reportActions.length === 0, [reportActions]);
+    const isEmptyChat = useMemo(() => ReportUtils.isEmptyReport(report), [report]);
     const isOptimisticDelete = report.statusNum === CONST.REPORT.STATUS_NUM.CLOSED;
-    const isLinkedMessageAvailable = useMemo(
-        (): boolean => sortedAllReportActions.findIndex((obj) => String(obj.reportActionID) === String(reportActionIDFromRoute)) > -1,
-        [sortedAllReportActions, reportActionIDFromRoute],
+    const indexOfLinkedMessage = useMemo(
+        (): number => reportActions.findIndex((obj) => String(obj.reportActionID) === String(reportActionIDFromRoute)),
+        [reportActions, reportActionIDFromRoute],
     );
 
+    const isPendingActionExist = !!reportActions.at(0)?.pendingAction;
+    const doesCreatedActionExists = useCallback(() => !!sortedAllReportActions?.findLast((action) => ReportActionsUtils.isCreatedAction(action)), [sortedAllReportActions]);
+    const isLinkedMessageAvailable = useMemo(() => indexOfLinkedMessage > -1, [indexOfLinkedMessage]);
+
+    // The linked report actions should have at least 15 messages (counting as 1 page) above them to fill the screen.
+    // If the count is too high (equal to or exceeds the web pagination size / 50) and there are no cached messages in the report,
+    // OpenReport will be called each time the user scrolls up the report a bit, clicks on report preview, and then goes back."
+    const isLinkedMessagePageReady = isLinkedMessageAvailable && (reportActions.length - indexOfLinkedMessage >= CONST.REPORT.MIN_INITIAL_REPORT_ACTION_COUNT || doesCreatedActionExists());
+
     // If there's a non-404 error for the report we should show it instead of blocking the screen
     const hasHelpfulErrors = Object.keys(report?.errorFields ?? {}).some((key) => key !== 'notFound');
     const shouldHideReport = !hasHelpfulErrors && !ReportUtils.canAccessReport(report, policies, betas);
 
-    const lastReportAction: OnyxEntry<OnyxTypes.ReportAction> = useMemo(
-        () =>
-            reportActions.length
-                ? [...reportActions, parentReportAction].find((action) => ReportUtils.canEditReportAction(action) && !ReportActionsUtils.isMoneyRequestAction(action)) ?? null
-                : null,
-        [reportActions, parentReportAction],
-    );
+    const transactionThreadReportID = ReportActionsUtils.getOneTransactionThreadReportID(report.reportID, reportActions ?? [], isOffline);
+    const [transactionThreadReportActions = {}] = useOnyx(`${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${transactionThreadReportID}`);
+    const combinedReportActions = ReportActionsUtils.getCombinedReportActions(reportActions, transactionThreadReportID ?? null, Object.values(transactionThreadReportActions));
+    const lastReportAction = [...combinedReportActions, parentReportAction].find((action) => ReportUtils.canEditReportAction(action) && !ReportActionsUtils.isMoneyRequestAction(action));
     const isSingleTransactionView = ReportUtils.isMoneyRequest(report) || ReportUtils.isTrackExpenseReport(report);
-    const policy = policies?.[`${ONYXKEYS.COLLECTION.POLICY}${report.policyID}`] ?? null;
+    const policy = policies?.[`${ONYXKEYS.COLLECTION.POLICY}${report.policyID}`];
     const isTopMostReportId = currentReportID === reportIDFromRoute;
     const didSubscribeToReportLeavingEvents = useRef(false);
 
@@ -321,14 +314,18 @@ function ReportScreen({
         wasReportAccessibleRef.current = true;
     }, [shouldHideReport, report]);
 
-    const goBack = useCallback(() => {
+    const onBackButtonPress = useCallback(() => {
+        if (isInNarrowPaneModal) {
+            Navigation.dismissModal();
+            return;
+        }
         Navigation.goBack(undefined, false, true);
-    }, []);
+    }, [isInNarrowPaneModal]);
 
     let headerView = (
         <HeaderView
             reportID={reportIDFromRoute}
-            onNavigationMenuButtonClicked={goBack}
+            onNavigationMenuButtonClicked={onBackButtonPress}
             report={report}
             parentReportAction={parentReportAction}
             shouldUseNarrowLayout={shouldUseNarrowLayout}
@@ -342,21 +339,17 @@ function ReportScreen({
                 policy={policy}
                 parentReportAction={parentReportAction}
                 shouldUseNarrowLayout={shouldUseNarrowLayout}
+                onBackButtonPress={onBackButtonPress}
             />
         );
     }
 
-    const transactionThreadReportID = useMemo(
-        () => ReportActionsUtils.getOneTransactionThreadReportID(report.reportID, reportActions ?? [], false, isOffline),
-        [report.reportID, reportActions, isOffline],
-    );
-
     useEffect(() => {
-        if (!transactionThreadReportID || !route.params.reportActionID) {
+        if (!transactionThreadReportID || !route?.params?.reportActionID || !ReportUtils.isOneTransactionThread(linkedAction?.childReportID ?? '-1', report.reportID, linkedAction)) {
             return;
         }
-        Navigation.navigate(ROUTES.REPORT_WITH_ID.getRoute(route.params.reportID));
-    }, [transactionThreadReportID, route.params.reportActionID, route.params.reportID]);
+        Navigation.navigate(ROUTES.REPORT_WITH_ID.getRoute(route?.params?.reportID));
+    }, [transactionThreadReportID, route?.params?.reportActionID, route?.params?.reportID, linkedAction, report.reportID]);
 
     if (ReportUtils.isMoneyRequestReport(report) || ReportUtils.isInvoiceReport(report)) {
         headerView = (
@@ -366,6 +359,7 @@ function ReportScreen({
                 transactionThreadReportID={transactionThreadReportID}
                 reportActions={reportActions}
                 shouldUseNarrowLayout={shouldUseNarrowLayout}
+                onBackButtonPress={onBackButtonPress}
             />
         );
     }
@@ -379,38 +373,80 @@ function ReportScreen({
         return reportIDFromRoute !== '' && !!report.reportID && !isTransitioning;
     }, [report, reportIDFromRoute]);
 
-    const isLoading = !reportIDFromRoute || (!isSidebarLoaded && !isReportOpenInRHP) || PersonalDetailsUtils.isPersonalDetailsEmpty();
+    const isInitialPageReady = isOffline
+        ? reportActions.length > 0
+        : reportActions.length >= CONST.REPORT.MIN_INITIAL_REPORT_ACTION_COUNT || isPendingActionExist || (doesCreatedActionExists() && reportActions.length > 0);
+
+    const isLinkedActionDeleted = useMemo(() => !!linkedAction && !ReportActionsUtils.shouldReportActionBeVisible(linkedAction, linkedAction.reportActionID), [linkedAction]);
+    const prevIsLinkedActionDeleted = usePrevious(linkedAction ? isLinkedActionDeleted : undefined);
+    const isLinkedActionInaccessibleWhisper = useMemo(
+        () => !!linkedAction && ReportActionsUtils.isWhisperAction(linkedAction) && !(linkedAction?.whisperedToAccountIDs ?? []).includes(currentUserAccountID),
+        [currentUserAccountID, linkedAction],
+    );
+
+    /**
+     * Using logical OR operator because with nullish coalescing operator, when `isLoadingApp` is false, the right hand side of the operator
+     * is not evaluated. This causes issues where we have `isLoading` set to false and later set to true and then set to false again.
+     * Ideally, `isLoading` should be set initially to true and then set to false. We can achieve this by using logical OR operator.
+     */
+    // eslint-disable-next-line @typescript-eslint/prefer-nullish-coalescing
+    const isLoading = isLoadingApp || !reportIDFromRoute || (!isSidebarLoaded && !isInNarrowPaneModal) || PersonalDetailsUtils.isPersonalDetailsEmpty();
     const shouldShowSkeleton =
-        !isLinkedMessageAvailable &&
-        (isLinkingToMessage ||
-            !isCurrentReportLoadedFromOnyx ||
-            (reportActions.length === 0 && !!reportMetadata?.isLoadingInitialReportActions) ||
-            isLoading ||
-            (!!reportActionIDFromRoute && reportMetadata?.isLoadingInitialReportActions));
-    const shouldShowReportActionList = isCurrentReportLoadedFromOnyx && !isLoading;
+        (isLinkingToMessage && !isLinkedMessagePageReady) || (!isLinkingToMessage && !isInitialPageReady) || isLoadingReportOnyx || !isCurrentReportLoadedFromOnyx || isLoading;
+
+    // eslint-disable-next-line rulesdir/no-negated-variables
+    const shouldShowNotFoundLinkedAction =
+        (!isLinkedActionInaccessibleWhisper && isLinkedActionDeleted && !!prevIsLinkedActionDeleted) ||
+        (shouldShowSkeleton &&
+            !reportMetadata.isLoadingInitialReportActions &&
+            !!reportActionIDFromRoute &&
+            !!sortedAllReportActions &&
+            sortedAllReportActions?.length > 0 &&
+            reportActions.length === 0 &&
+            !isLinkingToMessage);
+
     const currentReportIDFormRoute = route.params?.reportID;
+
     // eslint-disable-next-line rulesdir/no-negated-variables
-    const shouldShowNotFoundPage = useMemo(
-        (): boolean =>
-            (!wasReportAccessibleRef.current && !firstRenderRef.current && !report.reportID && !isOptimisticDelete && !reportMetadata?.isLoadingInitialReportActions && !userLeavingStatus) ||
-            shouldHideReport ||
-            (!!currentReportIDFormRoute && !ReportUtils.isValidReportIDFromPath(currentReportIDFormRoute)),
-        [report.reportID, isOptimisticDelete, reportMetadata?.isLoadingInitialReportActions, userLeavingStatus, shouldHideReport, currentReportIDFormRoute],
-    );
+    const shouldShowNotFoundPage = useMemo((): boolean => {
+        if (shouldShowNotFoundLinkedAction) {
+            return true;
+        }
 
-    const fetchReport = useCallback(() => {
-        Report.openReport(reportIDFromRoute, reportActionIDFromRoute);
-    }, [reportIDFromRoute, reportActionIDFromRoute]);
+        // Wait until we're sure the app is done loading (needs to be a strict equality check since it's undefined initially)
+        if (isLoadingApp !== false) {
+            return false;
+        }
 
-    useEffect(() => {
-        if (!report.reportID) {
-            return;
+        // If we just finished loading the app, we still need to try fetching the report. Wait until that's done before
+        // showing the Not Found page
+        if (finishedLoadingApp) {
+            return false;
         }
 
-        if (report?.errorFields?.notFound) {
-            Report.clearReportNotFoundErrors(report.reportID);
+        if (!wasReportAccessibleRef.current && !firstRenderRef.current && !report.reportID && !isOptimisticDelete && !reportMetadata?.isLoadingInitialReportActions && !userLeavingStatus) {
+            return true;
         }
-    }, [report?.errorFields?.notFound, report.reportID]);
+
+        if (shouldHideReport) {
+            return true;
+        }
+        return !!currentReportIDFormRoute && !ReportUtils.isValidReportIDFromPath(currentReportIDFormRoute);
+    }, [
+        shouldShowNotFoundLinkedAction,
+        isLoadingApp,
+        finishedLoadingApp,
+        report.reportID,
+        isOptimisticDelete,
+        reportMetadata?.isLoadingInitialReportActions,
+        userLeavingStatus,
+        shouldHideReport,
+        currentReportIDFormRoute,
+    ]);
+
+    const fetchReport = useCallback(() => {
+        Report.openReport(reportIDFromRoute, reportActionIDFromRoute);
+    }, [reportIDFromRoute, reportActionIDFromRoute]);
 
     useEffect(() => {
         if (!report.reportID || !isFocused) {
@@ -426,19 +462,24 @@ function ReportScreen({
             return;
         }
 
-        // It is 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 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 === reportIDFromRoute && !reportMetadata?.isLoadingInitialReportActions) {
+        /**
+         * Since OpenReport is a write, the response from OpenReport will get dropped while the app is
+         * still loading. This usually happens when signing in and deeplinking to a report. Instead,
+         * we'll fetch the report after the app finishes loading.
+         *
+         * This needs to be a strict equality check since isLoadingApp is initially undefined until the
+         * value is loaded from Onyx
+         */
+        if (isLoadingApp !== false) {
             return;
         }
 
-        if (!shouldFetchReport(report)) {
+        if (!shouldFetchReport(report) && (isInitialPageReady || isLinkedMessagePageReady)) {
             return;
         }
 
         fetchReport();
-    }, [report, reportMetadata?.isLoadingInitialReportActions, fetchReport, reportIDFromRoute]);
+    }, [report, fetchReport, reportIDFromRoute, isLoadingApp, isInitialPageReady, isLinkedMessagePageReady]);
 
     const dismissBanner = useCallback(() => {
         setIsBannerVisible(false);
@@ -465,7 +506,6 @@ function ReportScreen({
         Timing.end(CONST.TIMING.CHAT_RENDER);
         Performance.markEnd(CONST.TIMING.CHAT_RENDER);
 
-        fetchReportIfNeeded();
         const interactionTask = InteractionManager.runAfterInteractions(() => {
             ComposerActions.setShouldShowComposeInput(true);
         });
@@ -479,20 +519,49 @@ function ReportScreen({
         };
 
         // 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
+        // eslint-disable-next-line react-compiler/react-compiler, react-hooks/exhaustive-deps
     }, []);
 
+    useEffect(() => {
+        // Call OpenReport only if we are not linking to a message or the report is not available yet
+        if (isLoadingReportOnyx || (reportActionIDFromRoute && report.reportID && isLinkedMessagePageReady)) {
+            return;
+        }
+
+        fetchReportIfNeeded();
+        // eslint-disable-next-line react-compiler/react-compiler, react-hooks/exhaustive-deps
+    }, [isLoadingReportOnyx]);
+
+    useEffect(() => {
+        if (isLoadingReportOnyx || !reportActionIDFromRoute || isLinkedMessagePageReady) {
+            return;
+        }
+
+        // This function is triggered when a user clicks on a link to navigate to a report.
+        // For each link click, we retrieve the report data again, even though it may already be cached.
+        // There should be only one openReport execution per page start or navigating
+        fetchReportIfNeeded();
+        // eslint-disable-next-line react-compiler/react-compiler, react-hooks/exhaustive-deps
+    }, [route, isLinkedMessagePageReady, isLoadingReportOnyx, reportActionIDFromRoute]);
+
     // If a user has chosen to leave a thread, and then returns to it (e.g. with the back button), we need to call `openReport` again in order to allow the user to rejoin and to receive real-time updates
     useEffect(() => {
-        if (!shouldUseNarrowLayout || !isFocused || prevIsFocused || !ReportUtils.isChatThread(report) || report.notificationPreference !== CONST.REPORT.NOTIFICATION_PREFERENCE.HIDDEN) {
+        if (
+            !shouldUseNarrowLayout ||
+            !isFocused ||
+            prevIsFocused ||
+            !ReportUtils.isChatThread(report) ||
+            report.notificationPreference !== CONST.REPORT.NOTIFICATION_PREFERENCE.HIDDEN ||
+            isSingleTransactionView
+        ) {
             return;
         }
         Report.openReport(report.reportID);
 
         // We don't want to run this useEffect every time `report` is changed
         // Excluding shouldUseNarrowLayout from the dependency list to prevent re-triggering on screen resize events.
-        // eslint-disable-next-line react-hooks/exhaustive-deps
-    }, [prevIsFocused, report.notificationPreference, isFocused]);
+        // eslint-disable-next-line react-compiler/react-compiler, react-hooks/exhaustive-deps
+    }, [prevIsFocused, report.notificationPreference, isFocused, isSingleTransactionView]);
 
     useEffect(() => {
         // We don't want this effect to run on the first render.
@@ -510,29 +579,34 @@ function ReportScreen({
         const didReportClose = wasReportRemoved && prevReport.statusNum === CONST.REPORT.STATUS_NUM.OPEN && report.statusNum === CONST.REPORT.STATUS_NUM.CLOSED;
         const isTopLevelPolicyRoomWithNoStatus = !report.statusNum && !prevReport.parentReportID && prevReport.chatType === CONST.REPORT.CHAT_TYPE.POLICY_ROOM;
         const isClosedTopLevelPolicyRoom = wasReportRemoved && prevReport.statusNum === CONST.REPORT.STATUS_NUM.OPEN && isTopLevelPolicyRoomWithNoStatus;
-
         // Navigate to the Concierge chat if the room was removed from another device (e.g. user leaving a room or removed from a room)
         if (
             // non-optimistic case
             (!prevUserLeavingStatus && !!userLeavingStatus) ||
             didReportClose ||
             isRemovalExpectedForReportType ||
-            isClosedTopLevelPolicyRoom
+            isClosedTopLevelPolicyRoom ||
+            (prevIsDeletedParentAction && !isDeletedParentAction)
         ) {
+            // Early return if the report we're passing isn't in a focused state. We only want to navigate to Concierge if the user leaves the room from another device or gets removed from the room while the report is in a focused state.
+            // Prevent auto navigation for report in RHP
+            if (!isFocused || isInNarrowPaneModal) {
+                return;
+            }
             Navigation.dismissModal();
             if (Navigation.getTopmostReportId() === prevOnyxReportID) {
-                Navigation.setShouldPopAllStateOnUP();
+                Navigation.setShouldPopAllStateOnUP(true);
                 Navigation.goBack(undefined, false, true);
             }
             if (prevReport.parentReportID) {
                 // Prevent navigation to the IOU/Expense Report if it is pending deletion.
-                const parentReport = ReportUtils.getReport(prevReport.parentReportID);
-                if (ReportUtils.isMoneyRequestReportPendingDeletion(parentReport)) {
+                if (ReportUtils.isMoneyRequestReportPendingDeletion(prevReport.parentReportID)) {
                     return;
                 }
                 Navigation.navigate(ROUTES.REPORT_WITH_ID.getRoute(prevReport.parentReportID));
                 return;
             }
+
             Report.navigateToConciergeChat();
             return;
         }
@@ -547,6 +621,7 @@ function ReportScreen({
 
         fetchReportIfNeeded();
         ComposerActions.setShouldShowComposeInput(true);
+        // eslint-disable-next-line react-compiler/react-compiler, react-hooks/exhaustive-deps
     }, [
         route,
         report,
@@ -560,6 +635,9 @@ function ReportScreen({
         prevReport.chatType,
         prevReport,
         reportIDFromRoute,
+        isFocused,
+        isDeletedParentAction,
+        prevIsDeletedParentAction,
     ]);
 
     useEffect(() => {
@@ -590,16 +668,6 @@ function ReportScreen({
         };
     }, [report, didSubscribeToReportLeavingEvents, reportIDFromRoute]);
 
-    const onListLayout = useCallback((event: LayoutChangeEvent) => {
-        setListHeight((prev) => event.nativeEvent?.layout?.height ?? prev);
-        if (!markReadyForHydration) {
-            return;
-        }
-
-        markReadyForHydration();
-        // eslint-disable-next-line react-hooks/exhaustive-deps
-    }, []);
-
     const actionListValue = useMemo((): ActionListContextType => ({flatListRef, scrollPosition, setScrollPosition}), [flatListRef, scrollPosition, setScrollPosition]);
 
     // This helps in tracking from the moment 'route' triggers useMemo until isLoadingInitialReportActions becomes true. It prevents blinking when loading reportActions from cache.
@@ -609,44 +677,62 @@ function ReportScreen({
         });
     }, [reportMetadata?.isLoadingInitialReportActions]);
 
+    // If we deeplinked to the report after signing in, we need to fetch the report after the app is done loading
+    useEffect(() => {
+        if (!finishedLoadingApp) {
+            return;
+        }
+
+        fetchReportIfNeeded();
+
+        // This should only run once when the app is done loading
+        // eslint-disable-next-line react-compiler/react-compiler, react-hooks/exhaustive-deps
+    }, [finishedLoadingApp]);
+
     const navigateToEndOfReport = useCallback(() => {
         Navigation.setParams({reportActionID: ''});
         fetchReport();
     }, [fetchReport]);
 
-    const isLinkedReportActionDeleted = useMemo(() => {
-        if (!reportActionIDFromRoute || !sortedAllReportActions) {
-            return false;
+    useEffect(() => {
+        // If the linked action is previously available but now deleted,
+        // remove the reportActionID from the params to not link to the deleted action.
+        const isLinkedActionBecomesDeleted = prevIsLinkedActionDeleted !== undefined && !prevIsLinkedActionDeleted && isLinkedActionDeleted;
+        if (!isLinkedActionBecomesDeleted) {
+            return;
         }
-        const action = sortedAllReportActions.find((item) => item.reportActionID === reportActionIDFromRoute);
-        return action && !ReportActionsUtils.shouldReportActionBeVisible(action, action.reportActionID);
-    }, [reportActionIDFromRoute, sortedAllReportActions]);
-
-    if (isLinkedReportActionDeleted ?? (!shouldShowSkeleton && reportActionIDFromRoute && reportActions?.length === 0 && !isLinkingToMessage)) {
-        return (
-            <BlockingView
-                icon={Illustrations.ToddBehindCloud}
-                iconWidth={variables.modalTopIconWidth}
-                iconHeight={variables.modalTopIconHeight}
-                title={translate('notFound.notHere')}
-                shouldShowLink
-                linkKey="notFound.noAccess"
-                onLinkPress={navigateToEndOfReport}
-            />
-        );
-    }
+        Navigation.setParams({reportActionID: ''});
+    }, [prevIsLinkedActionDeleted, isLinkedActionDeleted]);
 
-    Log.client(
-        `[ReportScreen] Debug render state - ${JSON.stringify({
-            reportMetadata,
-            shouldShowReportActionList,
-            isLoading,
-            shouldShowSkeleton,
-            isCurrentReportLoadedFromOnyx,
-            reportID: report.reportID,
-            reportIDFromRoute,
-        })}`,
-    );
+    // If user redirects to an inaccessible whisper via a deeplink, on a report they have access to,
+    // then we set reportActionID as empty string, so we display them the report and not the "Not found page".
+    useEffect(() => {
+        if (!isLinkedActionInaccessibleWhisper) {
+            return;
+        }
+        Navigation.isNavigationReady().then(() => {
+            Navigation.setParams({reportActionID: ''});
+        });
+    }, [isLinkedActionInaccessibleWhisper]);
+
+    useEffect(() => {
+        if (!!report.lastReadTime || !ReportUtils.isTaskReport(report)) {
+            return;
+        }
+        // After creating the task report then navigating to task detail we don't have any report actions and the last read time is empty so We need to update the initial last read time when opening the task report detail.
+        Report.readNewestAction(report.reportID);
+    }, [report]);
+    const firstReportAction = reportActions[0];
+
+    const lastRoute = usePrevious(route);
+    const lastReportActionIDFromRoute = usePrevious(reportActionIDFromRoute);
+    // Define here because reportActions are recalculated before mount, allowing data to display faster than useEffect can trigger.
+    // If we have cached reportActions, they will be shown immediately.
+    // We aim to display a loader first, then fetch relevant reportActions, and finally show them.
+    if ((lastRoute !== route || lastReportActionIDFromRoute !== reportActionIDFromRoute) && isLinkingToMessage !== !!reportActionIDFromRoute) {
+        setIsLinkingToMessage(!!reportActionIDFromRoute);
+        return null;
+    }
 
     return (
         <ActionListContext.Provider value={actionListValue}>
@@ -654,15 +740,17 @@ function ReportScreen({
                 <ScreenWrapper
                     navigation={navigation}
                     style={screenWrapperStyle}
-                    shouldEnableKeyboardAvoidingView={isTopMostReportId}
-                    testID={ReportScreen.displayName}
+                    shouldEnableKeyboardAvoidingView={isTopMostReportId || isInNarrowPaneModal}
+                    testID={`report-screen-${report.reportID}`}
                 >
                     <FullPageNotFoundView
                         shouldShow={shouldShowNotFoundPage}
-                        subtitleKey="notFound.noAccess"
+                        subtitleKey={shouldShowNotFoundLinkedAction ? '' : 'notFound.noAccess'}
                         shouldShowBackButton={shouldUseNarrowLayout}
-                        onBackButtonPress={Navigation.goBack}
-                        shouldShowLink={false}
+                        onBackButtonPress={shouldShowNotFoundLinkedAction ? navigateToEndOfReport : Navigation.goBack}
+                        shouldShowLink={shouldShowNotFoundLinkedAction}
+                        linkKey="notFound.noAccess"
+                        onLinkPress={navigateToEndOfReport}
                     >
                         <OfflineWithFeedback
                             pendingAction={reportPendingAction}
@@ -694,17 +782,18 @@ function ReportScreen({
                         <DragAndDropProvider isDisabled={!isCurrentReportLoadedFromOnyx || !ReportUtils.canUserPerformWriteAction(report)}>
                             <View
                                 style={[styles.flex1, styles.justifyContentEnd, styles.overflowHidden]}
-                                onLayout={onListLayout}
+                                testID="report-actions-view-wrapper"
                             >
-                                {shouldShowReportActionList && (
+                                {!shouldShowSkeleton && (
                                     <ReportActionsView
                                         reportActions={reportActions}
                                         report={report}
                                         parentReportAction={parentReportAction}
                                         isLoadingInitialReportActions={reportMetadata?.isLoadingInitialReportActions}
                                         isLoadingNewerReportActions={reportMetadata?.isLoadingNewerReportActions}
+                                        hasLoadingNewerReportActionsError={reportMetadata?.hasLoadingNewerReportActionsError}
                                         isLoadingOlderReportActions={reportMetadata?.isLoadingOlderReportActions}
-                                        isReadyForCommentLinking={!shouldShowSkeleton}
+                                        hasLoadingOlderReportActionsError={reportMetadata?.hasLoadingOlderReportActionsError}
                                         transactionThreadReportID={transactionThreadReportID}
                                     />
                                 )}
@@ -712,21 +801,45 @@ function ReportScreen({
                                 {/* 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. */}
-                                {shouldShowSkeleton && <ReportActionsSkeletonView />}
+                                {shouldShowSkeleton && (
+                                    <>
+                                        <ReportActionsSkeletonView />
+                                        {!!firstReportAction && (
+                                            <ReportActionsListItemRenderer
+                                                reportAction={firstReportAction}
+                                                reportActions={reportActions}
+                                                parentReportAction={parentReportAction}
+                                                parentReportActionForTransactionThread={undefined}
+                                                transactionThreadReport={undefined}
+                                                index={0}
+                                                report={report}
+                                                displayAsGroup={false}
+                                                shouldHideThreadDividerLine
+                                                shouldDisplayNewMarker={false}
+                                                shouldDisplayReplyDivider={false}
+                                                isFirstVisibleReportAction
+                                                shouldUseThreadDividerLine={false}
+                                            />
+                                        )}
+                                    </>
+                                )}
 
                                 {isCurrentReportLoadedFromOnyx ? (
                                     <ReportFooter
                                         onComposerFocus={() => setIsComposerFocus(true)}
                                         onComposerBlur={() => setIsComposerFocus(false)}
                                         report={report}
+                                        reportMetadata={reportMetadata}
+                                        policy={policy}
                                         pendingAction={reportPendingAction}
                                         isComposerFullSize={!!isComposerFullSize}
-                                        listHeight={listHeight}
                                         isEmptyChat={isEmptyChat}
                                         lastReportAction={lastReportAction}
+                                        workspaceTooltip={workspaceTooltip}
                                     />
                                 ) : null}
                             </View>
+                            <PortalHost name="suggestions" />
                         </DragAndDropProvider>
                     </FullPageNotFoundView>
                 </ScreenWrapper>
@@ -736,80 +849,4 @@ function ReportScreen({
 }
 
 ReportScreen.displayName = 'ReportScreen';
-
-export default withCurrentReportID(
-    withOnyx<ReportScreenPropsWithoutParentReportAction, ReportScreenOnyxPropsWithoutParentReportAction>(
-        {
-            modal: {
-                key: ONYXKEYS.MODAL,
-            },
-            isSidebarLoaded: {
-                key: ONYXKEYS.IS_SIDEBAR_LOADED,
-            },
-            sortedAllReportActions: {
-                key: ({route}) => `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${getReportID(route)}`,
-                canEvict: false,
-                selector: (allReportActions: OnyxEntry<OnyxTypes.ReportActions>) => ReportActionsUtils.getSortedReportActionsForDisplay(allReportActions, true),
-            },
-            report: {
-                key: ({route}) => `${ONYXKEYS.COLLECTION.REPORT}${getReportID(route)}`,
-                allowStaleData: true,
-            },
-            reportMetadata: {
-                key: ({route}) => `${ONYXKEYS.COLLECTION.REPORT_METADATA}${getReportID(route)}`,
-                initialValue: {
-                    isLoadingInitialReportActions: true,
-                    isLoadingOlderReportActions: false,
-                    isLoadingNewerReportActions: 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,
-            },
-            userLeavingStatus: {
-                key: ({route}) => `${ONYXKEYS.COLLECTION.REPORT_USER_IS_LEAVING_ROOM}${getReportID(route)}`,
-                initialValue: false,
-            },
-        },
-        true,
-    )(
-        withOnyx<ReportScreenProps, ReportScreenParentReportActionOnyxProps>({
-            parentReportActions: {
-                key: ({report}) => `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${report ? report.parentReportID : 0}`,
-                canEvict: false,
-            },
-        })(
-            memo(ReportScreen, (prevProps, nextProps) => {
-                const prevParentReportAction = getParentReportAction(prevProps.parentReportActions, prevProps.report?.parentReportActionID);
-                const nextParentReportAction = getParentReportAction(nextProps.parentReportActions, nextProps.report?.parentReportActionID);
-                return (
-                    prevProps.isSidebarLoaded === nextProps.isSidebarLoaded &&
-                    lodashIsEqual(prevProps.sortedAllReportActions, nextProps.sortedAllReportActions) &&
-                    lodashIsEqual(prevProps.reportMetadata, nextProps.reportMetadata) &&
-                    prevProps.isComposerFullSize === nextProps.isComposerFullSize &&
-                    lodashIsEqual(prevProps.betas, nextProps.betas) &&
-                    lodashIsEqual(prevProps.policies, nextProps.policies) &&
-                    prevProps.accountManagerReportID === nextProps.accountManagerReportID &&
-                    prevProps.userLeavingStatus === nextProps.userLeavingStatus &&
-                    prevProps.currentReportID === nextProps.currentReportID &&
-                    lodashIsEqual(prevProps.modal, nextProps.modal) &&
-                    lodashIsEqual(prevParentReportAction, nextParentReportAction) &&
-                    lodashIsEqual(prevProps.route, nextProps.route) &&
-                    lodashIsEqual(prevProps.report, nextProps.report)
-                );
-            }),
-        ),
-    ),
-);
+export default withCurrentReportID(memo(ReportScreen, (prevProps, nextProps) => prevProps.currentReportID === nextProps.currentReportID && lodashIsEqual(prevProps.route, nextProps.route)));
diff --git a/src/pages/home/report/AnimatedEmptyStateBackground.tsx b/src/pages/home/report/AnimatedEmptyStateBackground.tsx
index 7ddbdaef687b..d277862ebf2c 100644
--- a/src/pages/home/report/AnimatedEmptyStateBackground.tsx
+++ b/src/pages/home/report/AnimatedEmptyStateBackground.tsx
@@ -1,25 +1,58 @@
 import React from 'react';
-import {Image} from 'react-native';
+import {View} from 'react-native';
+import Animated, {clamp, SensorType, useAnimatedSensor, useAnimatedStyle, useReducedMotion, useSharedValue, withSpring} from 'react-native-reanimated';
+import useResponsiveLayout from '@hooks/useResponsiveLayout';
 import useStyleUtils from '@hooks/useStyleUtils';
 import useThemeIllustrations from '@hooks/useThemeIllustrations';
 import useWindowDimensions from '@hooks/useWindowDimensions';
 import variables from '@styles/variables';
 import CONST from '@src/CONST';
 
+// Maximum horizontal and vertical shift in pixels on sensor value change
+const IMAGE_OFFSET_X = 30;
+const IMAGE_OFFSET_Y = 20;
+
 function AnimatedEmptyStateBackground() {
     const StyleUtils = useStyleUtils();
-    const {windowWidth, isSmallScreenWidth} = useWindowDimensions();
+    const {windowWidth} = useWindowDimensions();
+    const {shouldUseNarrowLayout} = useResponsiveLayout();
     const illustrations = useThemeIllustrations();
-
     // If window width is greater than the max background width, repeat the background image
     const maxBackgroundWidth = variables.sideBarWidth + CONST.EMPTY_STATE_BACKGROUND.ASPECT_RATIO * CONST.EMPTY_STATE_BACKGROUND.WIDE_SCREEN.IMAGE_HEIGHT;
 
+    // Get data from phone rotation sensor and prep other variables for animation
+    const animatedSensor = useAnimatedSensor(SensorType.GYROSCOPE);
+    const xOffset = useSharedValue(0);
+    const yOffset = useSharedValue(0);
+    const isReducedMotionEnabled = useReducedMotion();
+
+    // Apply data to create style object
+    const animatedStyles = useAnimatedStyle(() => {
+        if (!shouldUseNarrowLayout || isReducedMotionEnabled) {
+            return {};
+        }
+        /*
+         * We use x and y gyroscope velocity and add it to position offset to move background based on device movements.
+         * Position the phone was in while entering the screen is the initial position for background image.
+         */
+        const {x, y} = animatedSensor.sensor.value;
+        // The x vs y here seems wrong but is the way to make it feel right to the user
+        // eslint-disable-next-line react-compiler/react-compiler
+        xOffset.value = clamp(xOffset.value + y * CONST.ANIMATION_GYROSCOPE_VALUE, -IMAGE_OFFSET_X, IMAGE_OFFSET_X);
+        yOffset.value = clamp(yOffset.value - x * CONST.ANIMATION_GYROSCOPE_VALUE, -IMAGE_OFFSET_Y, IMAGE_OFFSET_Y);
+        return {
+            transform: [{translateX: withSpring(xOffset.value)}, {translateY: withSpring(yOffset.value, {overshootClamping: true})}, {scale: 1.15}],
+        };
+    }, [isReducedMotionEnabled]);
+
     return (
-        <Image
-            source={illustrations.EmptyStateBackgroundImage}
-            style={StyleUtils.getReportWelcomeBackgroundImageStyle(isSmallScreenWidth)}
-            resizeMode={windowWidth > maxBackgroundWidth ? 'repeat' : 'cover'}
-        />
+        <View style={StyleUtils.getReportWelcomeBackgroundContainerStyle()}>
+            <Animated.Image
+                source={illustrations.EmptyStateBackgroundImage}
+                style={[StyleUtils.getReportWelcomeBackgroundImageStyle(shouldUseNarrowLayout), animatedStyles]}
+                resizeMode={windowWidth > maxBackgroundWidth ? 'repeat' : 'cover'}
+            />
+        </View>
     );
 }
 
diff --git a/src/pages/home/report/ContextMenu/BaseReportActionContextMenu.tsx b/src/pages/home/report/ContextMenu/BaseReportActionContextMenu.tsx
index 46ebdd751762..58e361d74293 100755
--- a/src/pages/home/report/ContextMenu/BaseReportActionContextMenu.tsx
+++ b/src/pages/home/report/ContextMenu/BaseReportActionContextMenu.tsx
@@ -5,15 +5,18 @@ import {InteractionManager, View} from 'react-native';
 // eslint-disable-next-line no-restricted-imports
 import type {GestureResponderEvent, Text as RNText, View as ViewType} from 'react-native';
 import type {OnyxEntry} from 'react-native-onyx';
-import {withOnyx} from 'react-native-onyx';
+import {useOnyx, withOnyx} from 'react-native-onyx';
 import type {ContextMenuItemHandle} from '@components/ContextMenuItem';
 import ContextMenuItem from '@components/ContextMenuItem';
+import FocusTrapForModal from '@components/FocusTrap/FocusTrapForModal';
 import useArrowKeyFocusManager from '@hooks/useArrowKeyFocusManager';
+import useEnvironment from '@hooks/useEnvironment';
 import useKeyboardShortcut from '@hooks/useKeyboardShortcut';
 import useLocalize from '@hooks/useLocalize';
 import useNetwork from '@hooks/useNetwork';
+import usePaginatedReportActions from '@hooks/usePaginatedReportActions';
+import useResponsiveLayout from '@hooks/useResponsiveLayout';
 import useStyleUtils from '@hooks/useStyleUtils';
-import useWindowDimensions from '@hooks/useWindowDimensions';
 import * as ReportActionsUtils from '@libs/ReportActionsUtils';
 import * as ReportUtils from '@libs/ReportUtils';
 import * as Session from '@userActions/Session';
@@ -120,25 +123,83 @@ function BaseReportActionContextMenu({
 }: BaseReportActionContextMenuProps) {
     const StyleUtils = useStyleUtils();
     const {translate} = useLocalize();
-    const {isSmallScreenWidth} = useWindowDimensions();
+    const {shouldUseNarrowLayout} = useResponsiveLayout();
     const menuItemRefs = useRef<MenuItemRefs>({});
     const [shouldKeepOpen, setShouldKeepOpen] = useState(false);
-    const wrapperStyle = StyleUtils.getReportActionContextMenuStyles(isMini, isSmallScreenWidth);
+    const wrapperStyle = StyleUtils.getReportActionContextMenuStyles(isMini, shouldUseNarrowLayout);
     const {isOffline} = useNetwork();
+    const {isProduction} = useEnvironment();
     const threedotRef = useRef<View>(null);
 
     const reportAction: OnyxEntry<ReportAction> = useMemo(() => {
-        if (isEmptyObject(reportActions) || reportActionID === '0') {
-            return null;
+        if (isEmptyObject(reportActions) || reportActionID === '0' || reportActionID === '-1') {
+            return;
         }
-        return reportActions[reportActionID] ?? null;
+        return reportActions[reportActionID];
     }, [reportActions, reportActionID]);
 
+    const sourceID = ReportUtils.getSourceIDFromReportAction(reportAction);
+
+    const [download] = useOnyx(`${ONYXKEYS.COLLECTION.DOWNLOAD}${sourceID}`);
+
+    const childReport = ReportUtils.getReport(reportAction?.childReportID ?? '-1');
+    const parentReportAction = ReportActionsUtils.getReportAction(childReport?.parentReportID ?? '', childReport?.parentReportActionID ?? '');
+    const {reportActions: paginatedReportActions} = usePaginatedReportActions(childReport?.reportID ?? '-1');
+
+    const transactionThreadReportID = useMemo(
+        () => ReportActionsUtils.getOneTransactionThreadReportID(childReport?.reportID ?? '-1', paginatedReportActions ?? [], isOffline),
+        [childReport?.reportID, paginatedReportActions, isOffline],
+    );
+
+    const [transactionThreadReport] = useOnyx(`${ONYXKEYS.COLLECTION.REPORT}${transactionThreadReportID}`);
+
+    const isMoneyRequestReport = useMemo(() => ReportUtils.isMoneyRequestReport(childReport), [childReport]);
+    const isInvoiceReport = useMemo(() => ReportUtils.isInvoiceReport(childReport), [childReport]);
+
+    const requestParentReportAction = useMemo(() => {
+        if (isMoneyRequestReport || isInvoiceReport) {
+            if (!paginatedReportActions || !transactionThreadReport?.parentReportActionID) {
+                return undefined;
+            }
+            return paginatedReportActions.find((action) => action.reportActionID === transactionThreadReport.parentReportActionID);
+        }
+        return parentReportAction;
+    }, [parentReportAction, isMoneyRequestReport, isInvoiceReport, paginatedReportActions, transactionThreadReport?.parentReportActionID]);
+
+    const moneyRequestAction = transactionThreadReportID ? requestParentReportAction : parentReportAction;
+
+    const [parentReportNameValuePairs] = useOnyx(`${ONYXKEYS.COLLECTION.REPORT_NAME_VALUE_PAIRS}${childReport?.parentReportID ?? '-1'}`);
+    const parentReport = ReportUtils.getReport(childReport?.parentReportID ?? '-1');
+
+    const isMoneyRequest = useMemo(() => ReportUtils.isMoneyRequest(childReport), [childReport]);
+    const isTrackExpenseReport = ReportUtils.isTrackExpenseReport(childReport);
+    const isSingleTransactionView = isMoneyRequest || isTrackExpenseReport;
+    const isMoneyRequestOrReport = isMoneyRequestReport || isInvoiceReport || isSingleTransactionView;
+
+    const areHoldRequirementsMet = isMoneyRequestOrReport && !ReportUtils.isArchivedRoom(transactionThreadReportID ? childReport : parentReport, parentReportNameValuePairs);
+
+    const originalReportID = useMemo(() => ReportUtils.getOriginalReportID(reportID, reportAction), [reportID, reportAction]);
+
     const shouldEnableArrowNavigation = !isMini && (isVisible || shouldKeepOpen);
     let filteredContextMenuActions = ContextMenuActions.filter(
         (contextAction) =>
             !disabledActions.includes(contextAction) &&
-            contextAction.shouldShow(type, reportAction, isArchivedRoom, betas, anchor, isChronosReport, reportID, isPinnedChat, isUnreadChat, !!isOffline, isMini),
+            contextAction.shouldShow(
+                type,
+                reportAction,
+                isArchivedRoom,
+                betas,
+                anchor,
+                isChronosReport,
+                reportID,
+                isPinnedChat,
+                isUnreadChat,
+                !!isOffline,
+                isMini,
+                isProduction,
+                moneyRequestAction,
+                areHoldRequirementsMet,
+            ),
     );
 
     if (isMini) {
@@ -196,12 +257,10 @@ function BaseReportActionContextMenu({
             menuItemRefs.current[focusedIndex]?.triggerPressAndUpdateSuccess?.();
             setFocusedIndex(-1);
         },
-        {isActive: shouldEnableArrowNavigation},
+        {isActive: shouldEnableArrowNavigation, shouldPreventDefault: false},
     );
 
     const openOverflowMenu = (event: GestureResponderEvent | MouseEvent, anchorRef: MutableRefObject<View | null>) => {
-        const originalReportID = ReportUtils.getOriginalReportID(reportID, reportAction);
-        const originalReport = ReportUtils.getReport(originalReportID);
         showContextMenu(
             CONST.CONTEXT_MENU_TYPES.REPORT_ACTION,
             event,
@@ -216,8 +275,8 @@ function BaseReportActionContextMenu({
                 checkIfContextMenuActive?.();
                 setShouldKeepOpen(false);
             },
-            ReportUtils.isArchivedRoom(originalReport),
-            ReportUtils.chatIncludesChronos(originalReport),
+            ReportUtils.isArchivedRoomWithID(originalReportID),
+            ReportUtils.chatIncludesChronosWithID(originalReportID),
             undefined,
             undefined,
             filteredContextMenuActions,
@@ -229,64 +288,71 @@ function BaseReportActionContextMenu({
 
     return (
         (isVisible || shouldKeepOpen) && (
-            <View
-                ref={contentRef}
-                style={wrapperStyle}
-            >
-                {filteredContextMenuActions.map((contextAction, index) => {
-                    const closePopup = !isMini;
-                    const payload: ContextMenuActionPayload = {
-                        reportAction: reportAction as ReportAction,
-                        reportID,
-                        draftMessage,
-                        selection,
-                        close: () => setShouldKeepOpen(false),
-                        openContextMenu: () => setShouldKeepOpen(true),
-                        interceptAnonymousUser,
-                        openOverflowMenu,
-                        setIsEmojiPickerActive,
-                    };
-
-                    if ('renderContent' in contextAction) {
-                        return contextAction.renderContent(closePopup, payload);
-                    }
-
-                    const {textTranslateKey} = contextAction;
-                    const isKeyInActionUpdateKeys =
-                        textTranslateKey === 'reportActionContextMenu.editAction' ||
-                        textTranslateKey === 'reportActionContextMenu.deleteAction' ||
-                        textTranslateKey === 'reportActionContextMenu.deleteConfirmation';
-                    const text = textTranslateKey && (isKeyInActionUpdateKeys ? translate(textTranslateKey, {action: reportAction}) : translate(textTranslateKey));
-                    const transactionPayload = textTranslateKey === 'reportActionContextMenu.copyToClipboard' && transaction && {transaction};
-                    const isMenuAction = textTranslateKey === 'reportActionContextMenu.menu';
-
-                    return (
-                        <ContextMenuItem
-                            ref={(ref) => {
-                                menuItemRefs.current[index] = ref;
-                            }}
-                            buttonRef={isMenuAction ? threedotRef : {current: null}}
-                            icon={contextAction.icon}
-                            text={text ?? ''}
-                            successIcon={contextAction.successIcon}
-                            successText={contextAction.successTextTranslateKey ? translate(contextAction.successTextTranslateKey) : undefined}
-                            isMini={isMini}
-                            key={contextAction.textTranslateKey}
-                            onPress={(event) =>
-                                interceptAnonymousUser(
-                                    () => contextAction.onPress?.(closePopup, {...payload, ...transactionPayload, event, ...(isMenuAction ? {anchorRef: threedotRef} : {})}),
-                                    contextAction.isAnonymousAction,
-                                )
-                            }
-                            description={contextAction.getDescription?.(selection) ?? ''}
-                            isAnonymousAction={contextAction.isAnonymousAction}
-                            isFocused={focusedIndex === index}
-                            shouldPreventDefaultFocusOnPress={contextAction.shouldPreventDefaultFocusOnPress}
-                            onFocus={() => setFocusedIndex(index)}
-                        />
-                    );
-                })}
-            </View>
+            <FocusTrapForModal active={!isMini}>
+                <View
+                    ref={contentRef}
+                    style={wrapperStyle}
+                >
+                    {filteredContextMenuActions.map((contextAction, index) => {
+                        const closePopup = !isMini;
+                        const payload: ContextMenuActionPayload = {
+                            // eslint-disable-next-line @typescript-eslint/non-nullable-type-assertion-style
+                            reportAction: (reportAction ?? null) as ReportAction,
+                            reportID,
+                            draftMessage,
+                            selection,
+                            close: () => setShouldKeepOpen(false),
+                            openContextMenu: () => setShouldKeepOpen(true),
+                            interceptAnonymousUser,
+                            openOverflowMenu,
+                            setIsEmojiPickerActive,
+                            moneyRequestAction,
+                        };
+
+                        if ('renderContent' in contextAction) {
+                            return contextAction.renderContent(closePopup, payload);
+                        }
+
+                        const {textTranslateKey} = contextAction;
+                        const isKeyInActionUpdateKeys =
+                            textTranslateKey === 'reportActionContextMenu.editAction' ||
+                            textTranslateKey === 'reportActionContextMenu.deleteAction' ||
+                            textTranslateKey === 'reportActionContextMenu.deleteConfirmation';
+                        const text = textTranslateKey && (isKeyInActionUpdateKeys ? translate(textTranslateKey, {action: reportAction}) : translate(textTranslateKey));
+                        const transactionPayload = textTranslateKey === 'reportActionContextMenu.copyToClipboard' && transaction && {transaction};
+                        const isMenuAction = textTranslateKey === 'reportActionContextMenu.menu';
+
+                        return (
+                            <ContextMenuItem
+                                ref={(ref) => {
+                                    menuItemRefs.current[index] = ref;
+                                }}
+                                buttonRef={isMenuAction ? threedotRef : {current: null}}
+                                icon={contextAction.icon}
+                                text={text ?? ''}
+                                successIcon={contextAction.successIcon}
+                                successText={contextAction.successTextTranslateKey ? translate(contextAction.successTextTranslateKey) : undefined}
+                                isMini={isMini}
+                                key={contextAction.textTranslateKey}
+                                onPress={(event) =>
+                                    interceptAnonymousUser(
+                                        () => contextAction.onPress?.(closePopup, {...payload, ...transactionPayload, event, ...(isMenuAction ? {anchorRef: threedotRef} : {})}),
+                                        contextAction.isAnonymousAction,
+                                    )
+                                }
+                                description={contextAction.getDescription?.(selection) ?? ''}
+                                isAnonymousAction={contextAction.isAnonymousAction}
+                                isFocused={focusedIndex === index}
+                                shouldPreventDefaultFocusOnPress={contextAction.shouldPreventDefaultFocusOnPress}
+                                onFocus={() => setFocusedIndex(index)}
+                                onBlur={() => (index === filteredContextMenuActions.length - 1 || index === 1) && setFocusedIndex(-1)}
+                                disabled={contextAction?.shouldDisable ? contextAction?.shouldDisable(download) : false}
+                                shouldShowLoadingSpinnerIcon={contextAction?.shouldDisable ? contextAction?.shouldDisable(download) : false}
+                            />
+                        );
+                    })}
+                </View>
+            </FocusTrapForModal>
         )
     );
 }
@@ -302,7 +368,7 @@ export default withOnyx<BaseReportActionContextMenuProps, BaseReportActionContex
     transaction: {
         key: ({reportActions, reportActionID}) => {
             const reportAction = reportActions?.[reportActionID];
-            return `${ONYXKEYS.COLLECTION.TRANSACTION}${(reportAction && ReportActionsUtils.getLinkedTransactionID(reportAction)) ?? 0}`;
+            return `${ONYXKEYS.COLLECTION.TRANSACTION}${(reportAction && ReportActionsUtils.getLinkedTransactionID(reportAction)) ?? -1}`;
         },
     },
 })(
diff --git a/src/pages/home/report/ContextMenu/ContextMenuActions.tsx b/src/pages/home/report/ContextMenu/ContextMenuActions.tsx
index 013bc484fc63..db7e482a0457 100644
--- a/src/pages/home/report/ContextMenu/ContextMenuActions.tsx
+++ b/src/pages/home/report/ContextMenu/ContextMenuActions.tsx
@@ -1,5 +1,4 @@
-import ExpensiMark from 'expensify-common/lib/ExpensiMark';
-import Str from 'expensify-common/lib/str';
+import {Str} from 'expensify-common';
 import type {MutableRefObject} from 'react';
 import React from 'react';
 import {InteractionManager} from 'react-native';
@@ -11,6 +10,7 @@ import * as Expensicons from '@components/Icon/Expensicons';
 import MiniQuickEmojiReactions from '@components/Reactions/MiniQuickEmojiReactions';
 import QuickEmojiReactions from '@components/Reactions/QuickEmojiReactions';
 import addEncryptedAuthTokenToURL from '@libs/addEncryptedAuthTokenToURL';
+import * as Browser from '@libs/Browser';
 import Clipboard from '@libs/Clipboard';
 import EmailUtils from '@libs/EmailUtils';
 import * as Environment from '@libs/Environment/Environment';
@@ -19,33 +19,37 @@ import getAttachmentDetails from '@libs/fileDownload/getAttachmentDetails';
 import * as Localize from '@libs/Localize';
 import ModifiedExpenseMessage from '@libs/ModifiedExpenseMessage';
 import Navigation from '@libs/Navigation/Navigation';
+import Parser from '@libs/Parser';
 import ReportActionComposeFocusManager from '@libs/ReportActionComposeFocusManager';
 import * as ReportActionsUtils from '@libs/ReportActionsUtils';
+import * as ReportConnection from '@libs/ReportConnection';
 import * as ReportUtils from '@libs/ReportUtils';
 import * as TaskUtils from '@libs/TaskUtils';
 import * as Download from '@userActions/Download';
 import * as Report from '@userActions/Report';
 import CONST from '@src/CONST';
 import type {TranslationPaths} from '@src/languages/types';
+import ONYXKEYS from '@src/ONYXKEYS';
 import ROUTES from '@src/ROUTES';
-import type {Beta, ReportAction, ReportActionReactions, Transaction} from '@src/types/onyx';
+import type {Beta, Download as DownloadOnyx, OnyxInputOrEntry, ReportAction, ReportActionReactions, Transaction} from '@src/types/onyx';
 import type IconAsset from '@src/types/utils/IconAsset';
 import type {ContextMenuAnchor} from './ReportActionContextMenu';
 import {hideContextMenu, showDeleteModal} from './ReportActionContextMenu';
 
 /** Gets the HTML version of the message in an action */
-function getActionHtml(reportAction: OnyxEntry<ReportAction>): string {
-    const message = reportAction?.message?.at(-1) ?? null;
+function getActionHtml(reportAction: OnyxInputOrEntry<ReportAction>): string {
+    const message = Array.isArray(reportAction?.message) ? reportAction?.message?.at(-1) ?? null : reportAction?.message ?? null;
     return message?.html ?? '';
 }
 
 /** Sets the HTML string to Clipboard */
 function setClipboardMessage(content: string) {
-    const parser = new ExpensiMark();
     if (!Clipboard.canSetHtml()) {
-        Clipboard.setString(parser.htmlToMarkdown(content));
+        Clipboard.setString(Parser.htmlToMarkdown(content));
     } else {
-        const plainText = parser.htmlToText(content);
+        const anchorRegex = CONST.REGEX_LINK_IN_ANCHOR;
+        const isAnchorTag = anchorRegex.test(content);
+        const plainText = isAnchorTag ? Parser.htmlToMarkdown(content) : Parser.htmlToText(content);
         Clipboard.setHtml(content, plainText);
     }
 }
@@ -62,6 +66,9 @@ type ShouldShow = (
     isUnreadChat: boolean,
     isOffline: boolean,
     isMini: boolean,
+    isProduction: boolean,
+    moneyRequestAction: ReportAction | undefined,
+    areHoldRequirementsMet: boolean,
 ) => boolean;
 
 type ContextMenuActionPayload = {
@@ -79,6 +86,7 @@ type ContextMenuActionPayload = {
     event?: GestureResponderEvent | MouseEvent | KeyboardEvent;
     setIsEmojiPickerActive?: (state: boolean) => void;
     anchorRef?: MutableRefObject<View | null>;
+    moneyRequestAction: ReportAction | undefined;
 };
 
 type OnPress = (closePopover: boolean, payload: ContextMenuActionPayload, selection?: string, reportID?: string, draftMessage?: string) => void;
@@ -104,6 +112,7 @@ type ContextMenuAction = (ContextMenuActionWithContent | ContextMenuActionWithIc
     isAnonymousAction: boolean;
     shouldShow: ShouldShow;
     shouldPreventDefaultFocusOnPress?: boolean;
+    shouldDisable?: (download: OnyxEntry<DownloadOnyx>) => boolean;
 };
 
 // A list of all the context actions in this menu.
@@ -182,11 +191,11 @@ const ContextMenuActions: ContextMenuAction[] = [
                         // is false, so we need to pass true here to override this condition.
                         ReportActionComposeFocusManager.focus(true);
                     });
-                    Report.navigateToAndOpenChildReport(reportAction?.childReportID ?? '0', reportAction, originalReportID);
+                    Report.navigateToAndOpenChildReport(reportAction?.childReportID ?? '-1', reportAction, originalReportID);
                 });
                 return;
             }
-            Report.navigateToAndOpenChildReport(reportAction?.childReportID ?? '0', reportAction, originalReportID);
+            Report.navigateToAndOpenChildReport(reportAction?.childReportID ?? '-1', reportAction, originalReportID);
         },
         getDescription: () => {},
     },
@@ -198,7 +207,7 @@ const ContextMenuActions: ContextMenuAction[] = [
         shouldShow: (type, reportAction, isArchivedRoom, betas, menuTarget, isChronosReport, reportID, isPinnedChat, isUnreadChat) =>
             type === CONST.CONTEXT_MENU_TYPES.REPORT_ACTION || (type === CONST.CONTEXT_MENU_TYPES.REPORT && !isUnreadChat),
         onPress: (closePopover, {reportAction, reportID}) => {
-            const originalReportID = ReportUtils.getOriginalReportID(reportID, reportAction) ?? '';
+            const originalReportID = ReportUtils.getOriginalReportID(reportID, reportAction) ?? '-1';
             Report.markCommentAsUnread(originalReportID, reportAction?.created);
             if (closePopover) {
                 hideContextMenu(true, ReportActionComposeFocusManager.focus);
@@ -214,7 +223,7 @@ const ContextMenuActions: ContextMenuAction[] = [
         shouldShow: (type, reportAction, isArchivedRoom, betas, menuTarget, isChronosReport, reportID, isPinnedChat, isUnreadChat) =>
             type === CONST.CONTEXT_MENU_TYPES.REPORT && isUnreadChat,
         onPress: (closePopover, {reportID}) => {
-            Report.readNewestAction(reportID);
+            Report.readNewestAction(reportID, true);
             if (closePopover) {
                 hideContextMenu(true, ReportActionComposeFocusManager.focus);
             }
@@ -230,15 +239,14 @@ const ContextMenuActions: ContextMenuAction[] = [
         onPress: (closePopover, {reportID, reportAction, draftMessage}) => {
             if (ReportActionsUtils.isMoneyRequestAction(reportAction)) {
                 hideContextMenu(false);
-                const childReportID = reportAction?.childReportID ?? '0';
+                const childReportID = reportAction?.childReportID ?? '-1';
                 Report.openReport(childReportID);
                 Navigation.navigate(ROUTES.REPORT_WITH_ID.getRoute(childReportID));
                 return;
             }
             const editAction = () => {
                 if (!draftMessage) {
-                    const parser = new ExpensiMark();
-                    Report.saveReportActionDraft(reportID, reportAction, parser.htmlToMarkdown(getActionHtml(reportAction)));
+                    Report.saveReportActionDraft(reportID, reportAction, Parser.htmlToMarkdown(getActionHtml(reportAction)));
                 } else {
                     Report.deleteReportActionDraft(reportID, reportAction);
                 }
@@ -255,6 +263,68 @@ const ContextMenuActions: ContextMenuAction[] = [
         },
         getDescription: () => {},
     },
+    {
+        isAnonymousAction: false,
+        textTranslateKey: 'iou.unhold',
+        icon: Expensicons.Stopwatch,
+        shouldShow: (
+            type,
+            reportAction,
+            isArchivedRoom,
+            betas,
+            anchor,
+            isChronosReport,
+            reportID,
+            isPinnedChat,
+            isUnreadChat,
+            isOffline,
+            isMini,
+            isProduction,
+            moneyRequestAction,
+            areHoldRequirementsMet,
+        ) => type === CONST.CONTEXT_MENU_TYPES.REPORT_ACTION && areHoldRequirementsMet && ReportUtils.canHoldUnholdReportAction(moneyRequestAction).canUnholdRequest,
+        onPress: (closePopover, {moneyRequestAction}) => {
+            if (closePopover) {
+                hideContextMenu(false, () => ReportUtils.changeMoneyRequestHoldStatus(moneyRequestAction));
+                return;
+            }
+
+            // No popover to hide, call changeMoneyRequestHoldStatus immediately
+            ReportUtils.changeMoneyRequestHoldStatus(moneyRequestAction);
+        },
+        getDescription: () => {},
+    },
+    {
+        isAnonymousAction: false,
+        textTranslateKey: 'iou.hold',
+        icon: Expensicons.Stopwatch,
+        shouldShow: (
+            type,
+            reportAction,
+            isArchivedRoom,
+            betas,
+            anchor,
+            isChronosReport,
+            reportID,
+            isPinnedChat,
+            isUnreadChat,
+            isOffline,
+            isMini,
+            isProduction,
+            moneyRequestAction,
+            areHoldRequirementsMet,
+        ) => type === CONST.CONTEXT_MENU_TYPES.REPORT_ACTION && areHoldRequirementsMet && ReportUtils.canHoldUnholdReportAction(moneyRequestAction).canHoldRequest,
+        onPress: (closePopover, {moneyRequestAction}) => {
+            if (closePopover) {
+                hideContextMenu(false, () => ReportUtils.changeMoneyRequestHoldStatus(moneyRequestAction));
+                return;
+            }
+
+            // No popover to hide, call changeMoneyRequestHoldStatus immediately
+            ReportUtils.changeMoneyRequestHoldStatus(moneyRequestAction);
+        },
+        getDescription: () => {},
+    },
     {
         isAnonymousAction: false,
         textTranslateKey: 'reportActionContextMenu.joinThread',
@@ -264,22 +334,24 @@ const ContextMenuActions: ContextMenuAction[] = [
             const isDeletedAction = ReportActionsUtils.isDeletedAction(reportAction);
             const shouldDisplayThreadReplies = ReportUtils.shouldDisplayThreadReplies(reportAction, reportID);
             const subscribed = childReportNotificationPreference !== 'hidden';
-            const isCommentAction = reportAction?.actionName === CONST.REPORT.ACTIONS.TYPE.ADD_COMMENT && !ReportUtils.isThreadFirstChat(reportAction, reportID);
-            const isWhisperAction = ReportActionsUtils.isWhisperAction(reportAction);
-            return !subscribed && !isWhisperAction && isCommentAction && (!isDeletedAction || shouldDisplayThreadReplies);
+            const isThreadFirstChat = ReportUtils.isThreadFirstChat(reportAction, reportID);
+            const isWhisperAction = ReportActionsUtils.isWhisperAction(reportAction) || ReportActionsUtils.isActionableTrackExpense(reportAction);
+            const isExpenseReportAction = ReportActionsUtils.isMoneyRequestAction(reportAction) || ReportActionsUtils.isReportPreviewAction(reportAction);
+            return !subscribed && !isWhisperAction && !isExpenseReportAction && !isThreadFirstChat && (shouldDisplayThreadReplies || (!isDeletedAction && !isArchivedRoom));
         },
         onPress: (closePopover, {reportAction, reportID}) => {
             const childReportNotificationPreference = ReportUtils.getChildReportNotificationPreference(reportAction);
+            const originalReportID = ReportUtils.getOriginalReportID(reportID, reportAction);
             if (closePopover) {
                 hideContextMenu(false, () => {
                     ReportActionComposeFocusManager.focus();
-                    Report.toggleSubscribeToChildReport(reportAction?.childReportID ?? '0', reportAction, reportID, childReportNotificationPreference);
+                    Report.toggleSubscribeToChildReport(reportAction?.childReportID ?? '-1', reportAction, originalReportID, childReportNotificationPreference);
                 });
                 return;
             }
 
             ReportActionComposeFocusManager.focus();
-            Report.toggleSubscribeToChildReport(reportAction?.childReportID ?? '0', reportAction, reportID, childReportNotificationPreference);
+            Report.toggleSubscribeToChildReport(reportAction?.childReportID ?? '-1', reportAction, originalReportID, childReportNotificationPreference);
         },
         getDescription: () => {},
     },
@@ -316,7 +388,10 @@ const ContextMenuActions: ContextMenuAction[] = [
         successTextTranslateKey: 'reportActionContextMenu.copied',
         successIcon: Expensicons.Checkmark,
         shouldShow: (type, reportAction) =>
-            type === CONST.CONTEXT_MENU_TYPES.REPORT_ACTION && !ReportActionsUtils.isReportActionAttachment(reportAction) && !ReportActionsUtils.isMessageDeleted(reportAction),
+            type === CONST.CONTEXT_MENU_TYPES.REPORT_ACTION &&
+            !ReportActionsUtils.isReportActionAttachment(reportAction) &&
+            !ReportActionsUtils.isMessageDeleted(reportAction) &&
+            !ReportActionsUtils.isTripPreview(reportAction),
 
         // If return value is true, we switch the `text` and `icon` on
         // `ContextMenuItem` with `successText` and `successIcon` which will fall back to
@@ -330,19 +405,19 @@ const ContextMenuActions: ContextMenuAction[] = [
             if (!isAttachment) {
                 const content = selection || messageHtml;
                 if (isReportPreviewAction) {
-                    const iouReport = ReportUtils.getReport(ReportActionsUtils.getIOUReportIDFromReportActionPreview(reportAction));
-                    const displayMessage = ReportUtils.getReportPreviewMessage(iouReport, reportAction);
+                    const iouReportID = ReportActionsUtils.getIOUReportIDFromReportActionPreview(reportAction);
+                    const displayMessage = ReportUtils.getReportPreviewMessage(iouReportID, reportAction);
                     Clipboard.setString(displayMessage);
                 } else if (ReportActionsUtils.isTaskAction(reportAction)) {
-                    const displayMessage = TaskUtils.getTaskReportActionMessage(reportAction).text;
-                    Clipboard.setString(displayMessage);
+                    const {text, html} = TaskUtils.getTaskReportActionMessage(reportAction);
+                    const displayMessage = html ?? text;
+                    setClipboardMessage(displayMessage);
                 } else if (ReportActionsUtils.isModifiedExpenseAction(reportAction)) {
                     const modifyExpenseMessage = ModifiedExpenseMessage.getForReportAction(reportID, reportAction);
                     Clipboard.setString(modifyExpenseMessage);
                 } else if (ReportActionsUtils.isReimbursementDeQueuedAction(reportAction)) {
-                    const {expenseReportID} = reportAction.originalMessage;
-                    const expenseReport = ReportUtils.getReport(expenseReportID);
-                    const displayMessage = ReportUtils.getReimbursementDeQueuedActionMessage(reportAction, expenseReport);
+                    const {expenseReportID} = ReportActionsUtils.getOriginalMessage(reportAction) ?? {};
+                    const displayMessage = ReportUtils.getReimbursementDeQueuedActionMessage(reportAction, expenseReportID);
                     Clipboard.setString(displayMessage);
                 } else if (ReportActionsUtils.isMoneyRequestAction(reportAction)) {
                     const displayMessage = ReportUtils.getIOUReportActionDisplayMessage(reportAction, transaction);
@@ -353,20 +428,54 @@ const ContextMenuActions: ContextMenuAction[] = [
                 } else if (ReportActionsUtils.isMemberChangeAction(reportAction)) {
                     const logMessage = ReportActionsUtils.getMemberChangeMessageFragment(reportAction).html ?? '';
                     setClipboardMessage(logMessage);
+                } else if (reportAction.actionName === CONST.REPORT.ACTIONS.TYPE.POLICY_CHANGE_LOG.UPDATE_NAME) {
+                    Clipboard.setString(ReportUtils.getWorkspaceNameUpdatedMessage(reportAction));
                 } else if (ReportActionsUtils.isReimbursementQueuedAction(reportAction)) {
-                    Clipboard.setString(ReportUtils.getReimbursementQueuedActionMessage(reportAction, ReportUtils.getReport(reportID), false));
+                    Clipboard.setString(ReportUtils.getReimbursementQueuedActionMessage(reportAction, reportID, false));
                 } else if (ReportActionsUtils.isActionableMentionWhisper(reportAction)) {
                     const mentionWhisperMessage = ReportActionsUtils.getActionableMentionWhisperMessage(reportAction);
                     setClipboardMessage(mentionWhisperMessage);
                 } else if (ReportActionsUtils.isActionableTrackExpense(reportAction)) {
-                    setClipboardMessage('What would you like to do with this expense?');
+                    setClipboardMessage(CONST.ACTIONABLE_TRACK_EXPENSE_WHISPER_MESSAGE);
+                } else if (ReportActionsUtils.isRenamedAction(reportAction)) {
+                    setClipboardMessage(ReportActionsUtils.getRenamedAction(reportAction));
+                } else if (reportAction?.actionName === CONST.REPORT.ACTIONS.TYPE.SUBMITTED) {
+                    const displayMessage = ReportUtils.getIOUSubmittedMessage(reportAction);
+                    Clipboard.setString(displayMessage);
+                } else if (reportAction?.actionName === CONST.REPORT.ACTIONS.TYPE.APPROVED) {
+                    const displayMessage = ReportUtils.getIOUApprovedMessage(reportAction);
+                    Clipboard.setString(displayMessage);
+                } else if (reportAction?.actionName === CONST.REPORT.ACTIONS.TYPE.FORWARDED) {
+                    const displayMessage = ReportUtils.getIOUForwardedMessage(reportAction);
+                    Clipboard.setString(displayMessage);
                 } else if (reportAction?.actionName === CONST.REPORT.ACTIONS.TYPE.HOLD) {
                     Clipboard.setString(Localize.translateLocal('iou.heldExpense'));
                 } else if (reportAction?.actionName === CONST.REPORT.ACTIONS.TYPE.UNHOLD) {
                     Clipboard.setString(Localize.translateLocal('iou.unheldExpense'));
+                } else if (ReportActionsUtils.isOldDotReportAction(reportAction)) {
+                    const oldDotActionMessage = ReportActionsUtils.getMessageOfOldDotReportAction(reportAction);
+                    Clipboard.setString(oldDotActionMessage);
+                } else if (reportAction?.actionName === CONST.REPORT.ACTIONS.TYPE.DISMISSED_VIOLATION) {
+                    const originalMessage = ReportActionsUtils.getOriginalMessage(reportAction) as ReportAction<typeof CONST.REPORT.ACTIONS.TYPE.DISMISSED_VIOLATION>['originalMessage'];
+                    const reason = originalMessage?.reason;
+                    const violationName = originalMessage?.violationName;
+                    Clipboard.setString(Localize.translateLocal(`violationDismissal.${violationName}.${reason}` as TranslationPaths));
+                } else if (reportAction?.actionName === CONST.REPORT.ACTIONS.TYPE.EXPORTED_TO_INTEGRATION) {
+                    setClipboardMessage(ReportActionsUtils.getExportIntegrationMessageHTML(reportAction));
+                } else if (reportAction?.actionName === CONST.REPORT.ACTIONS.TYPE.ROOM_CHANGE_LOG.UPDATE_ROOM_DESCRIPTION) {
+                    setClipboardMessage(ReportActionsUtils.getUpdateRoomDescriptionMessage(reportAction));
+                } else if (reportAction?.actionName === CONST.REPORT.ACTIONS.TYPE.POLICY_CHANGE_LOG.ADD_EMPLOYEE) {
+                    setClipboardMessage(ReportActionsUtils.getPolicyChangeLogAddEmployeeMessage(reportAction));
+                } else if (reportAction?.actionName === CONST.REPORT.ACTIONS.TYPE.POLICY_CHANGE_LOG.UPDATE_EMPLOYEE) {
+                    setClipboardMessage(ReportActionsUtils.getPolicyChangeLogChangeRoleMessage(reportAction));
+                } else if (reportAction?.actionName === CONST.REPORT.ACTIONS.TYPE.POLICY_CHANGE_LOG.DELETE_EMPLOYEE) {
+                    setClipboardMessage(ReportActionsUtils.getPolicyChangeLogDeleteMemberMessage(reportAction));
+                } else if (ReportActionsUtils.isActionOfType(reportAction, CONST.REPORT.ACTIONS.TYPE.INTEGRATION_SYNC_FAILED)) {
+                    const {label, errorMessage} = ReportActionsUtils.getOriginalMessage(reportAction) ?? {label: '', errorMessage: ''};
+                    setClipboardMessage(Localize.translateLocal('report.actions.type.integrationSyncFailed', label, errorMessage));
                 } else if (content) {
                     setClipboardMessage(
-                        content.replace(/(<mention-user>)(.*?)(<\/mention-user>)/gi, (match, openTag, innerContent, closeTag): string => {
+                        content.replace(/(<mention-user>)(.*?)(<\/mention-user>)/gi, (match, openTag: string, innerContent: string, closeTag: string): string => {
                             const modifiedContent = Str.removeSMSDomain(innerContent) || '';
                             return openTag + modifiedContent + closeTag || '';
                         }),
@@ -396,9 +505,10 @@ const ContextMenuActions: ContextMenuAction[] = [
             return type === CONST.CONTEXT_MENU_TYPES.REPORT_ACTION && !isAttachmentTarget && !ReportActionsUtils.isMessageDeleted(reportAction);
         },
         onPress: (closePopover, {reportAction, reportID}) => {
+            const originalReportID = ReportUtils.getOriginalReportID(reportID, reportAction);
             Environment.getEnvironmentURL().then((environmentURL) => {
                 const reportActionID = reportAction?.reportActionID;
-                Clipboard.setString(`${environmentURL}/r/${reportID}/${reportActionID}`);
+                Clipboard.setString(`${environmentURL}/r/${originalReportID}/${reportActionID}`);
             });
             hideContextMenu(true, ReportActionComposeFocusManager.focus);
         },
@@ -458,10 +568,9 @@ const ContextMenuActions: ContextMenuAction[] = [
         successIcon: Expensicons.Download,
         shouldShow: (type, reportAction, isArchivedRoom, betas, menuTarget, isChronosReport, reportID, isPinnedChat, isUnreadChat, isOffline): reportAction is ReportAction => {
             const isAttachment = ReportActionsUtils.isReportActionAttachment(reportAction);
-            const messageHtml = getActionHtml(reportAction);
-            return (
-                isAttachment && messageHtml !== CONST.ATTACHMENT_UPLOADING_MESSAGE_HTML && !!reportAction?.reportActionID && !ReportActionsUtils.isMessageDeleted(reportAction) && !isOffline
-            );
+            const html = getActionHtml(reportAction);
+            const isUploading = html.includes(CONST.ATTACHMENT_OPTIMISTIC_SOURCE_ATTRIBUTE);
+            return isAttachment && !isUploading && !!reportAction?.reportActionID && !ReportActionsUtils.isMessageDeleted(reportAction) && !isOffline;
         },
         onPress: (closePopover, {reportAction}) => {
             const html = getActionHtml(reportAction);
@@ -469,12 +578,29 @@ const ContextMenuActions: ContextMenuAction[] = [
             const sourceURLWithAuth = addEncryptedAuthTokenToURL(sourceURL ?? '');
             const sourceID = (sourceURL?.match(CONST.REGEX.ATTACHMENT_ID) ?? [])[1];
             Download.setDownload(sourceID, true);
-            fileDownload(sourceURLWithAuth, originalFileName ?? '').then(() => Download.setDownload(sourceID, false));
+            const anchorRegex = CONST.REGEX_LINK_IN_ANCHOR;
+            const isAnchorTag = anchorRegex.test(html);
+            fileDownload(sourceURLWithAuth, originalFileName ?? '', '', isAnchorTag && Browser.isMobileSafari()).then(() => Download.setDownload(sourceID, false));
             if (closePopover) {
                 hideContextMenu(true, ReportActionComposeFocusManager.focus);
             }
         },
         getDescription: () => {},
+        shouldDisable: (download) => download?.isDownloading ?? false,
+    },
+    {
+        isAnonymousAction: true,
+        textTranslateKey: 'reportActionContextMenu.copyOnyxData',
+        icon: Expensicons.Copy,
+        successTextTranslateKey: 'reportActionContextMenu.copied',
+        successIcon: Expensicons.Checkmark,
+        shouldShow: (type, isProduction) => type === CONST.CONTEXT_MENU_TYPES.REPORT && !isProduction,
+        onPress: (closePopover, {reportID}) => {
+            const report = ReportConnection.getAllReports()?.[`${ONYXKEYS.COLLECTION.REPORT}${reportID}`];
+            Clipboard.setString(JSON.stringify(report, null, 4));
+            hideContextMenu(true, ReportActionComposeFocusManager.focus);
+        },
+        getDescription: () => {},
     },
     {
         isAnonymousAction: false,
@@ -514,7 +640,6 @@ const ContextMenuActions: ContextMenuAction[] = [
 ];
 
 const restrictedReadOnlyActions: TranslationPaths[] = [
-    'common.download',
     'reportActionContextMenu.replyInThread',
     'reportActionContextMenu.editAction',
     'reportActionContextMenu.joinThread',
diff --git a/src/pages/home/report/ContextMenu/PopoverReportActionContextMenu.tsx b/src/pages/home/report/ContextMenu/PopoverReportActionContextMenu.tsx
index 6cb688ff2558..ded25ee1f215 100644
--- a/src/pages/home/report/ContextMenu/PopoverReportActionContextMenu.tsx
+++ b/src/pages/home/report/ContextMenu/PopoverReportActionContextMenu.tsx
@@ -32,11 +32,11 @@ function extractPointerEvent(event: GestureResponderEvent | MouseEvent): MouseEv
 
 function PopoverReportActionContextMenu(_props: unknown, ref: ForwardedRef<ReportActionContextMenu>) {
     const {translate} = useLocalize();
-    const reportIDRef = useRef('0');
+    const reportIDRef = useRef('-1');
     const typeRef = useRef<ContextMenuType>();
-    const reportActionRef = useRef<OnyxEntry<ReportAction>>(null);
-    const reportActionIDRef = useRef('0');
-    const originalReportIDRef = useRef('0');
+    const reportActionRef = useRef<NonNullable<OnyxEntry<ReportAction>> | null>(null);
+    const reportActionIDRef = useRef('-1');
+    const originalReportIDRef = useRef('-1');
     const selectionRef = useRef('');
     const reportActionDraftMessageRef = useRef<string>();
 
@@ -130,7 +130,7 @@ function PopoverReportActionContextMenu(_props: unknown, ref: ForwardedRef<Repor
         !!actionID && (reportActionIDRef.current === actionID || reportActionRef.current?.reportActionID === actionID);
 
     const clearActiveReportAction = () => {
-        reportActionIDRef.current = '0';
+        reportActionIDRef.current = '-1';
         reportActionRef.current = null;
     };
 
@@ -180,14 +180,13 @@ function PopoverReportActionContextMenu(_props: unknown, ref: ForwardedRef<Repor
         } else {
             anchorRef.current = null;
         }
-        setInstanceID(Math.random().toString(36).substr(2, 5));
 
         onPopoverShow.current = onShow;
         onPopoverHide.current = onHide;
         onEmojiPickerToggle.current = setIsEmojiPickerActive;
 
         new Promise<void>((resolve) => {
-            if (Boolean(!pageX && !pageY && contextMenuAnchorRef.current) || isOverflowMenu) {
+            if (!!(!pageX && !pageY && contextMenuAnchorRef.current) || isOverflowMenu) {
                 calculateAnchorPosition(contextMenuAnchorRef.current).then((position) => {
                     popoverAnchorPosition.current = {horizontal: position.horizontal, vertical: position.vertical};
                     contextMenuDimensions.current = {width: position.vertical, height: position.height};
@@ -209,9 +208,10 @@ function PopoverReportActionContextMenu(_props: unknown, ref: ForwardedRef<Repor
         }).then(() => {
             setDisabledActions(disabledOptions);
             typeRef.current = type;
-            reportIDRef.current = reportID ?? '0';
-            reportActionIDRef.current = reportActionID ?? '0';
-            originalReportIDRef.current = originalReportID ?? '0';
+            reportIDRef.current = reportID ?? '-1';
+            reportActionIDRef.current = reportActionID ?? '-1';
+            // eslint-disable-next-line @typescript-eslint/prefer-nullish-coalescing
+            originalReportIDRef.current = originalReportID || '-1';
             selectionRef.current = selection;
             setIsPopoverVisible(true);
             reportActionDraftMessageRef.current = draftMessage;
@@ -225,6 +225,7 @@ function PopoverReportActionContextMenu(_props: unknown, ref: ForwardedRef<Repor
 
     /** After Popover shows, call the registered onPopoverShow callback and reset it */
     const runAndResetOnPopoverShow = () => {
+        setInstanceID(Math.random().toString(36).substr(2, 5));
         onPopoverShow.current();
 
         // After we have called the action, reset it.
@@ -239,9 +240,10 @@ function PopoverReportActionContextMenu(_props: unknown, ref: ForwardedRef<Repor
 
     /** After Popover hides, call the registered onPopoverHide & onPopoverHideActionCallback callback and reset it */
     const runAndResetOnPopoverHide = () => {
-        reportIDRef.current = '0';
-        reportActionIDRef.current = '0';
-        originalReportIDRef.current = '0';
+        reportIDRef.current = '-1';
+        reportActionIDRef.current = '-1';
+        originalReportIDRef.current = '-1';
+        setInstanceID('');
 
         onPopoverHide.current = runAndResetCallback(onPopoverHide.current);
         onPopoverHideActionCallback.current = runAndResetCallback(onPopoverHideActionCallback.current);
@@ -265,10 +267,11 @@ function PopoverReportActionContextMenu(_props: unknown, ref: ForwardedRef<Repor
         callbackWhenDeleteModalHide.current = () => (onComfirmDeleteModal.current = runAndResetCallback(onComfirmDeleteModal.current));
         const reportAction = reportActionRef.current;
         if (ReportActionsUtils.isMoneyRequestAction(reportAction)) {
+            const originalMessage = ReportActionsUtils.getOriginalMessage(reportAction);
             if (ReportActionsUtils.isTrackExpenseAction(reportAction)) {
-                IOU.deleteTrackExpense(reportIDRef.current, reportAction?.originalMessage?.IOUTransactionID ?? '', reportAction);
+                IOU.deleteTrackExpense(reportIDRef.current, originalMessage?.IOUTransactionID ?? '-1', reportAction);
             } else {
-                IOU.deleteMoneyRequest(reportAction?.originalMessage?.IOUTransactionID ?? '', reportAction);
+                IOU.deleteMoneyRequest(originalMessage?.IOUTransactionID ?? '-1', reportAction);
             }
         } else if (reportAction) {
             Report.deleteReportComment(reportIDRef.current, reportAction);
@@ -294,7 +297,7 @@ function PopoverReportActionContextMenu(_props: unknown, ref: ForwardedRef<Repor
         onComfirmDeleteModal.current = onConfirm;
 
         reportIDRef.current = reportID;
-        reportActionRef.current = reportAction;
+        reportActionRef.current = reportAction ?? null;
 
         setShouldSetModalVisibilityForDeleteConfirmation(shouldSetModalVisibility);
         setIsDeleteCommentConfirmModalVisible(true);
diff --git a/src/pages/home/report/ContextMenu/ReportActionContextMenu.ts b/src/pages/home/report/ContextMenu/ReportActionContextMenu.ts
index f984e88b85b2..df500a967cfd 100644
--- a/src/pages/home/report/ContextMenu/ReportActionContextMenu.ts
+++ b/src/pages/home/report/ContextMenu/ReportActionContextMenu.ts
@@ -105,9 +105,9 @@ function showContextMenu(
     event: GestureResponderEvent | MouseEvent,
     selection: string,
     contextMenuAnchor: ContextMenuAnchor,
-    reportID = '0',
-    reportActionID = '0',
-    originalReportID = '0',
+    reportID = '-1',
+    reportActionID = '-1',
+    originalReportID = '-1',
     draftMessage: string | undefined = undefined,
     onShow = () => {},
     onHide = () => {},
@@ -123,33 +123,37 @@ function showContextMenu(
     if (!contextMenuRef.current) {
         return;
     }
+    const show = () => {
+        contextMenuRef.current?.showContextMenu(
+            type,
+            event,
+            selection,
+            contextMenuAnchor,
+            reportID,
+            reportActionID,
+            originalReportID,
+            draftMessage,
+            onShow,
+            onHide,
+            isArchivedRoom,
+            isChronosReport,
+            isPinnedChat,
+            isUnreadChat,
+            disabledActions,
+            shouldCloseOnTarget,
+            setIsEmojiPickerActive,
+            isOverflowMenu,
+        );
+    };
+
     // If there is an already open context menu, close it first before opening
     // a new one.
     if (contextMenuRef.current.instanceID) {
-        hideContextMenu();
-        contextMenuRef.current.runAndResetOnPopoverHide();
+        hideContextMenu(false, show);
+        return;
     }
 
-    contextMenuRef.current.showContextMenu(
-        type,
-        event,
-        selection,
-        contextMenuAnchor,
-        reportID,
-        reportActionID,
-        originalReportID,
-        draftMessage,
-        onShow,
-        onHide,
-        isArchivedRoom,
-        isChronosReport,
-        isPinnedChat,
-        isUnreadChat,
-        disabledActions,
-        shouldCloseOnTarget,
-        setIsEmojiPickerActive,
-        isOverflowMenu,
-    );
+    show();
 }
 
 /**
diff --git a/src/pages/home/report/ListBoundaryLoader.tsx b/src/pages/home/report/ListBoundaryLoader.tsx
index a359606b9ed5..8081e18bb668 100644
--- a/src/pages/home/report/ListBoundaryLoader.tsx
+++ b/src/pages/home/report/ListBoundaryLoader.tsx
@@ -1,7 +1,10 @@
-import React from 'react';
+import React, {useEffect} from 'react';
 import {ActivityIndicator, View} from 'react-native';
 import type {ValueOf} from 'type-fest';
+import Button from '@components/Button';
 import ReportActionsSkeletonView from '@components/ReportActionsSkeletonView';
+import Text from '@components/Text';
+import useLocalize from '@hooks/useLocalize';
 import useNetwork from '@hooks/useNetwork';
 import useTheme from '@hooks/useTheme';
 import useThemeStyles from '@hooks/useThemeStyles';
@@ -22,6 +25,12 @@ type ListBoundaryLoaderProps = {
 
     /** Name of the last report action */
     lastReportActionName?: string;
+
+    /** Shows if there was an error when loading report actions */
+    hasError?: boolean;
+
+    /** Function to retry if there was an error */
+    onRetry?: () => void;
 };
 
 function ListBoundaryLoader({
@@ -30,11 +39,47 @@ function ListBoundaryLoader({
     isLoadingInitialReportActions = false,
     lastReportActionName = '',
     isLoadingNewerReportActions = false,
+    hasError = false,
+    onRetry,
 }: ListBoundaryLoaderProps) {
     const theme = useTheme();
     const styles = useThemeStyles();
     const {isOffline} = useNetwork();
+    const {translate} = useLocalize();
+
+    // When retrying we want to show the loading state in the retry button so we
+    // have this separate state to handle that.
+    const [isRetrying, setIsRetrying] = React.useState(false);
+
+    const retry = () => {
+        setIsRetrying(true);
+        onRetry?.();
+    };
+
+    // Reset the retrying state once loading is done.
+    useEffect(() => {
+        if (isLoadingNewerReportActions || isLoadingOlderReportActions) {
+            return;
+        }
 
+        setIsRetrying(false);
+    }, [isLoadingNewerReportActions, isLoadingOlderReportActions]);
+
+    if (hasError || isRetrying) {
+        return (
+            <View style={[styles.alignItemsCenter, styles.justifyContentCenter, styles.listBoundaryError]}>
+                <Text style={styles.listBoundaryErrorText}>{translate('listBoundary.errorMessage')}</Text>
+                {!isOffline && (
+                    <Button
+                        small
+                        onPress={retry}
+                        text={translate('listBoundary.tryAgain')}
+                        isLoading={isRetrying}
+                    />
+                )}
+            </View>
+        );
+    }
     // We use two different loading components for the header and footer
     // to reduce the jumping effect when the user is scrolling to the newer report actions
     if (type === CONST.LIST_COMPONENTS.FOOTER) {
@@ -55,7 +100,7 @@ function ListBoundaryLoader({
         // applied for a header of the list, i.e. when you scroll to the bottom of the list
         // the styles for android and the rest components are different that's why we use two different components
         return (
-            <View style={[styles.alignItemsCenter, styles.justifyContentCenter, styles.chatBottomLoader]}>
+            <View style={[styles.alignItemsCenter, styles.justifyContentCenter, styles.listBoundaryLoader]}>
                 <ActivityIndicator
                     color={theme.spinner}
                     size="small"
diff --git a/src/pages/home/report/ReactionList/BaseReactionList.tsx b/src/pages/home/report/ReactionList/BaseReactionList.tsx
index 6f56f8f09632..105c7f8f3651 100755
--- a/src/pages/home/report/ReactionList/BaseReactionList.tsx
+++ b/src/pages/home/report/ReactionList/BaseReactionList.tsx
@@ -1,12 +1,12 @@
-import Str from 'expensify-common/lib/str';
+import {Str} from 'expensify-common';
 import React from 'react';
 import {FlatList} from 'react-native';
 import type {FlatListProps} from 'react-native';
+import {FallbackAvatar} from '@components/Icon/Expensicons';
 import OptionRow from '@components/OptionRow';
+import useResponsiveLayout from '@hooks/useResponsiveLayout';
 import useThemeStyles from '@hooks/useThemeStyles';
-import useWindowDimensions from '@hooks/useWindowDimensions';
 import Navigation from '@libs/Navigation/Navigation';
-import * as UserUtils from '@libs/UserUtils';
 import variables from '@styles/variables';
 import CONST from '@src/CONST';
 import ROUTES from '@src/ROUTES';
@@ -40,7 +40,7 @@ const getItemLayout = (data: ArrayLike<PersonalDetails> | null | undefined, inde
 });
 
 function BaseReactionList({hasUserReacted = false, users, isVisible = false, emojiCodes, emojiCount, emojiName, onClose}: BaseReactionListProps) {
-    const {isSmallScreenWidth} = useWindowDimensions();
+    const {shouldUseNarrowLayout} = useResponsiveLayout();
     const {hoveredComponentBG, reactionListContainer, reactionListContainerFixedWidth, pv2} = useThemeStyles();
 
     if (!isVisible) {
@@ -71,7 +71,7 @@ function BaseReactionList({hasUserReacted = false, users, isVisible = false, emo
                 icons: [
                     {
                         id: item.accountID,
-                        source: UserUtils.getAvatar(item.avatar, item.accountID),
+                        source: item.avatar ?? FallbackAvatar,
                         name: item.login ?? '',
                         type: CONST.ICON_TYPE_AVATAR,
                     },
@@ -95,7 +95,7 @@ function BaseReactionList({hasUserReacted = false, users, isVisible = false, emo
                 keyExtractor={keyExtractor}
                 getItemLayout={getItemLayout}
                 contentContainerStyle={pv2}
-                style={[reactionListContainer, !isSmallScreenWidth && reactionListContainerFixedWidth]}
+                style={[reactionListContainer, !shouldUseNarrowLayout && reactionListContainerFixedWidth]}
             />
         </>
     );
diff --git a/src/pages/home/report/ReactionList/HeaderReactionList.tsx b/src/pages/home/report/ReactionList/HeaderReactionList.tsx
index 9766894c275b..db6cfbe75df3 100644
--- a/src/pages/home/report/ReactionList/HeaderReactionList.tsx
+++ b/src/pages/home/report/ReactionList/HeaderReactionList.tsx
@@ -2,9 +2,9 @@ import React from 'react';
 import {View} from 'react-native';
 import Text from '@components/Text';
 import useLocalize from '@hooks/useLocalize';
+import useResponsiveLayout from '@hooks/useResponsiveLayout';
 import useStyleUtils from '@hooks/useStyleUtils';
 import useThemeStyles from '@hooks/useThemeStyles';
-import useWindowDimensions from '@hooks/useWindowDimensions';
 import * as EmojiUtils from '@libs/EmojiUtils';
 import type ReactionListProps from './types';
 
@@ -27,10 +27,10 @@ function HeaderReactionList({emojiCodes, emojiCount, emojiName, hasUserReacted =
     } = useThemeStyles();
     const {getEmojiReactionBubbleStyle, getEmojiReactionBubbleTextStyle, getEmojiReactionCounterTextStyle} = useStyleUtils();
     const {preferredLocale} = useLocalize();
-    const {isSmallScreenWidth} = useWindowDimensions();
+    const {shouldUseNarrowLayout} = useResponsiveLayout();
 
     return (
-        <View style={[flexRow, justifyContentBetween, alignItemsCenter, emojiReactionListHeader, !isSmallScreenWidth && pt4]}>
+        <View style={[flexRow, justifyContentBetween, alignItemsCenter, emojiReactionListHeader, !shouldUseNarrowLayout && pt4]}>
             <View style={flexRow}>
                 <View style={[emojiReactionListHeaderBubble, getEmojiReactionBubbleStyle(false, hasUserReacted)]}>
                     <Text style={[miniQuickEmojiReactionText, getEmojiReactionBubbleTextStyle(true)]}>{emojiCodes.join('')}</Text>
diff --git a/src/pages/home/report/ReactionList/PopoverReactionList/BasePopoverReactionList.tsx b/src/pages/home/report/ReactionList/PopoverReactionList/BasePopoverReactionList.tsx
index 9f024ac92846..f9ef4041ba38 100644
--- a/src/pages/home/report/ReactionList/PopoverReactionList/BasePopoverReactionList.tsx
+++ b/src/pages/home/report/ReactionList/PopoverReactionList/BasePopoverReactionList.tsx
@@ -21,13 +21,12 @@ function BasePopoverReactionList(props: BasePopoverReactionListPropsWithLocalWit
         preferredLocale,
     });
     // Get the reaction information
-    const {emojiCodes, reactionCount, hasUserReacted, users} = getReactionInformation();
-
+    const {emojiCodes, reactionCount, hasUserReacted, users, isReady} = getReactionInformation();
     useImperativeHandle(ref, () => ({hideReactionList, showReactionList}));
 
     return (
         <PopoverWithMeasuredContent
-            isVisible={isPopoverVisible}
+            isVisible={isPopoverVisible && isReady}
             onClose={hideReactionList}
             anchorPosition={popoverAnchorPosition}
             animationIn="fadeIn"
diff --git a/src/pages/home/report/ReactionList/PopoverReactionList/index.tsx b/src/pages/home/report/ReactionList/PopoverReactionList/index.tsx
index 2cdcac65feae..c5e72ebc5095 100644
--- a/src/pages/home/report/ReactionList/PopoverReactionList/index.tsx
+++ b/src/pages/home/report/ReactionList/PopoverReactionList/index.tsx
@@ -19,14 +19,10 @@ function PopoverReactionList(props: unknown, ref: ForwardedRef<ReactionListRef>)
         innerReactionListRef.current?.hideReactionList();
     };
 
-    const isActiveReportAction = (actionID: number | string) => Boolean(actionID) && reactionListReportActionID === actionID;
+    const isActiveReportAction = (actionID: number | string) => !!actionID && reactionListReportActionID === actionID;
 
     useImperativeHandle(ref, () => ({showReactionList, hideReactionList, isActiveReportAction}));
 
-    if (reactionListReportActionID === '' || reactionListEmojiName === '') {
-        return null;
-    }
-
     return (
         <BasePopoverReactionList
             ref={innerReactionListRef}
diff --git a/src/pages/home/report/RepliesDivider.tsx b/src/pages/home/report/RepliesDivider.tsx
index deac38596c99..d6d5e1d3cfc8 100644
--- a/src/pages/home/report/RepliesDivider.tsx
+++ b/src/pages/home/report/RepliesDivider.tsx
@@ -7,6 +7,7 @@ import useLocalize from '@hooks/useLocalize';
 import useTheme from '@hooks/useTheme';
 import useThemeStyles from '@hooks/useThemeStyles';
 import variables from '@styles/variables';
+import CONST from '@src/CONST';
 
 type RepliesDividerProps = {
     /** Whether we should hide thread divider line */
@@ -19,14 +20,17 @@ function RepliesDivider({shouldHideThreadDividerLine}: RepliesDividerProps) {
     const {translate} = useLocalize();
 
     return (
-        <View style={[styles.flexRow, styles.alignItemsCenter, styles.ml5, styles.mt3, styles.mb1]}>
+        <View
+            style={[styles.flexRow, styles.alignItemsCenter, styles.ml5, styles.mt3, styles.mb1, styles.userSelectNone]}
+            dataSet={{[CONST.SELECTION_SCRAPER_HIDDEN_ELEMENT]: true}}
+        >
             <Icon
                 src={Expensicons.Thread}
                 fill={theme.icon}
                 width={variables.iconSizeExtraSmall}
                 height={variables.iconSizeExtraSmall}
             />
-            <Text style={[styles.threadDividerText, styles.textSupporting, styles.ml1]}>{translate('threads.replies')}</Text>
+            <Text style={[styles.threadDividerText, styles.textSupporting, styles.ml1, styles.userSelectNone]}>{translate('threads.replies')}</Text>
             {!shouldHideThreadDividerLine && <View style={[styles.threadDividerLine]} />}
         </View>
     );
diff --git a/src/pages/home/report/ReportActionCompose/AttachmentPickerWithMenuItems.tsx b/src/pages/home/report/ReportActionCompose/AttachmentPickerWithMenuItems.tsx
index 07de62b1eabd..9c61e0178a54 100644
--- a/src/pages/home/report/ReportActionCompose/AttachmentPickerWithMenuItems.tsx
+++ b/src/pages/home/report/ReportActionCompose/AttachmentPickerWithMenuItems.tsx
@@ -7,26 +7,30 @@ import type {FileObject} from '@components/AttachmentModal';
 import AttachmentPicker from '@components/AttachmentPicker';
 import Icon from '@components/Icon';
 import * as Expensicons from '@components/Icon/Expensicons';
+import {usePersonalDetails} from '@components/OnyxProvider';
 import type {PopoverMenuItem} from '@components/PopoverMenu';
 import PopoverMenu from '@components/PopoverMenu';
 import PressableWithFeedback from '@components/Pressable/PressableWithFeedback';
 import Tooltip from '@components/Tooltip/PopoverAnchorTooltip';
-import useIsReportOpenInRHP from '@hooks/useIsReportOpenInRHP';
 import useLocalize from '@hooks/useLocalize';
-import usePermissions from '@hooks/usePermissions';
 import usePrevious from '@hooks/usePrevious';
+import useResponsiveLayout from '@hooks/useResponsiveLayout';
 import useTheme from '@hooks/useTheme';
 import useThemeStyles from '@hooks/useThemeStyles';
 import useWindowDimensions from '@hooks/useWindowDimensions';
 import * as Browser from '@libs/Browser';
 import getIconForAction from '@libs/getIconForAction';
+import Navigation from '@libs/Navigation/Navigation';
 import * as ReportUtils from '@libs/ReportUtils';
+import * as SubscriptionUtils from '@libs/SubscriptionUtils';
 import * as IOU from '@userActions/IOU';
+import * as Modal from '@userActions/Modal';
 import * as Report from '@userActions/Report';
 import * as Task from '@userActions/Task';
 import type {IOUType} from '@src/CONST';
 import CONST from '@src/CONST';
 import ONYXKEYS from '@src/ONYXKEYS';
+import ROUTES from '@src/ROUTES';
 import type * as OnyxTypes from '@src/types/onyx';
 
 type MoneyRequestOptions = Record<Exclude<IOUType, typeof CONST.IOU.TYPE.REQUEST | typeof CONST.IOU.TYPE.SEND>, PopoverMenuItem>;
@@ -118,47 +122,55 @@ function AttachmentPickerWithMenuItems({
     const styles = useThemeStyles();
     const {translate} = useLocalize();
     const {windowHeight, windowWidth} = useWindowDimensions();
-    const {canUseTrackExpense} = usePermissions();
-    const {isSmallScreenWidth} = useWindowDimensions();
-    const isReportOpenInRHP = useIsReportOpenInRHP();
-    const shouldUseNarrowLayout = isReportOpenInRHP || isSmallScreenWidth;
+    const {shouldUseNarrowLayout} = useResponsiveLayout();
+    const allPersonalDetails = usePersonalDetails();
 
     /**
      * Returns the list of IOU Options
      */
     const moneyRequestOptions = useMemo(() => {
+        const selectOption = (onSelected: () => void, shouldRestrictAction: boolean) => {
+            if (shouldRestrictAction && policy && SubscriptionUtils.shouldRestrictUserBillableActions(policy.id)) {
+                Navigation.navigate(ROUTES.RESTRICTED_ACTION.getRoute(policy.id));
+                return;
+            }
+
+            onSelected();
+        };
+
         const options: MoneyRequestOptions = {
             [CONST.IOU.TYPE.SPLIT]: {
                 icon: Expensicons.Transfer,
                 text: translate('iou.splitExpense'),
-                onSelected: () => IOU.startMoneyRequest(CONST.IOU.TYPE.SPLIT, report?.reportID ?? ''),
+                onSelected: () => selectOption(() => IOU.startMoneyRequest(CONST.IOU.TYPE.SPLIT, report?.reportID ?? '-1'), true),
             },
             [CONST.IOU.TYPE.SUBMIT]: {
                 icon: getIconForAction(CONST.IOU.TYPE.REQUEST),
                 text: translate('iou.submitExpense'),
-                onSelected: () => IOU.startMoneyRequest(CONST.IOU.TYPE.SUBMIT, report?.reportID ?? ''),
+                onSelected: () => selectOption(() => IOU.startMoneyRequest(CONST.IOU.TYPE.SUBMIT, report?.reportID ?? '-1'), true),
             },
             [CONST.IOU.TYPE.PAY]: {
                 icon: getIconForAction(CONST.IOU.TYPE.SEND),
                 text: translate('iou.paySomeone', {name: ReportUtils.getPayeeName(report)}),
-                onSelected: () => IOU.startMoneyRequest(CONST.IOU.TYPE.PAY, report?.reportID ?? ''),
+                onSelected: () => selectOption(() => IOU.startMoneyRequest(CONST.IOU.TYPE.PAY, report?.reportID ?? '-1'), false),
             },
             [CONST.IOU.TYPE.TRACK]: {
                 icon: getIconForAction(CONST.IOU.TYPE.TRACK),
                 text: translate('iou.trackExpense'),
-                onSelected: () => IOU.startMoneyRequest(CONST.IOU.TYPE.TRACK, report?.reportID ?? ''),
+                onSelected: () => selectOption(() => IOU.startMoneyRequest(CONST.IOU.TYPE.TRACK, report?.reportID ?? '-1'), true),
             },
             [CONST.IOU.TYPE.INVOICE]: {
-                icon: Expensicons.Invoice,
+                icon: Expensicons.InvoiceGeneric,
                 text: translate('workspace.invoices.sendInvoice'),
-                onSelected: () => IOU.startMoneyRequest(CONST.IOU.TYPE.INVOICE, report?.reportID ?? ''),
+                onSelected: () => selectOption(() => IOU.startMoneyRequest(CONST.IOU.TYPE.INVOICE, report?.reportID ?? '-1'), false),
             },
         };
 
-        return ReportUtils.temporary_getMoneyRequestOptions(report, policy, reportParticipantIDs ?? [], canUseTrackExpense).map((option) => ({
+        return ReportUtils.temporary_getMoneyRequestOptions(report, policy, reportParticipantIDs ?? []).map((option) => ({
             ...options[option],
         }));
-    }, [translate, report, policy, reportParticipantIDs, canUseTrackExpense]);
+        // eslint-disable-next-line react-compiler/react-compiler, react-hooks/exhaustive-deps
+    }, [translate, report, policy, reportParticipantIDs, allPersonalDetails]);
 
     /**
      * Determines if we can show the task option
@@ -216,12 +228,13 @@ function AttachmentPickerWithMenuItems({
                     {
                         icon: Expensicons.Paperclip,
                         text: translate('reportActionCompose.addAttachment'),
-                        onSelected: () => {
-                            if (Browser.isSafari()) {
-                                return;
-                            }
-                            triggerAttachmentPicker();
-                        },
+                        onSelected: () =>
+                            Modal.close(() => {
+                                if (Browser.isSafari()) {
+                                    return;
+                                }
+                                triggerAttachmentPicker();
+                            }),
                     },
                 ];
                 return (
@@ -330,5 +343,6 @@ AttachmentPickerWithMenuItems.displayName = 'AttachmentPickerWithMenuItems';
 export default withOnyx<AttachmentPickerWithMenuItemsProps, AttachmentPickerWithMenuItemsOnyxProps>({
     policy: {
         key: ({report}) => `${ONYXKEYS.COLLECTION.POLICY}${report?.policyID}`,
+        initialValue: {} as OnyxTypes.Policy,
     },
 })(AttachmentPickerWithMenuItems);
diff --git a/src/pages/home/report/ReportActionCompose/ComposerWithSuggestions/ComposerWithSuggestions.tsx b/src/pages/home/report/ReportActionCompose/ComposerWithSuggestions/ComposerWithSuggestions.tsx
index 469a7300a84f..82482e1c0590 100644
--- a/src/pages/home/report/ReportActionCompose/ComposerWithSuggestions/ComposerWithSuggestions.tsx
+++ b/src/pages/home/report/ReportActionCompose/ComposerWithSuggestions/ComposerWithSuggestions.tsx
@@ -1,5 +1,4 @@
 import {useIsFocused, useNavigation} from '@react-navigation/native';
-import ExpensiMark from 'expensify-common/lib/ExpensiMark';
 import lodashDebounce from 'lodash/debounce';
 import type {ForwardedRef, MutableRefObject, RefAttributes, RefObject} from 'react';
 import React, {forwardRef, memo, useCallback, useEffect, useImperativeHandle, useMemo, useRef, useState} from 'react';
@@ -10,24 +9,28 @@ import type {
     TextInput,
     TextInputFocusEventData,
     TextInputKeyPressEventData,
-    TextInputSelectionChangeEventData,
+    TextInputScrollEventData,
 } from 'react-native';
-import {findNodeHandle, InteractionManager, NativeModules, View} from 'react-native';
+import {DeviceEventEmitter, findNodeHandle, InteractionManager, NativeModules, View} from 'react-native';
+import {useFocusedInputHandler} from 'react-native-keyboard-controller';
 import type {OnyxEntry} from 'react-native-onyx';
 import {withOnyx} from 'react-native-onyx';
-import type {useAnimatedRef} from 'react-native-reanimated';
+import {useAnimatedRef, useSharedValue} from 'react-native-reanimated';
 import type {Emoji} from '@assets/emojis/types';
 import type {FileObject} from '@components/AttachmentModal';
+import type {MeasureParentContainerAndCursorCallback} from '@components/AutoCompleteSuggestions/types';
 import Composer from '@components/Composer';
+import type {CustomSelectionChangeEvent, TextSelection} from '@components/Composer/types';
 import useKeyboardState from '@hooks/useKeyboardState';
 import useLocalize from '@hooks/useLocalize';
 import usePrevious from '@hooks/usePrevious';
+import useResponsiveLayout from '@hooks/useResponsiveLayout';
 import useStyleUtils from '@hooks/useStyleUtils';
 import useTheme from '@hooks/useTheme';
 import useThemeStyles from '@hooks/useThemeStyles';
-import useWindowDimensions from '@hooks/useWindowDimensions';
 import * as Browser from '@libs/Browser';
 import canFocusInputOnScreenFocus from '@libs/canFocusInputOnScreenFocus';
+import {forceClearInput} from '@libs/ComponentUtils';
 import * as ComposerUtils from '@libs/ComposerUtils';
 import convertToLTRForComposer from '@libs/convertToLTRForComposer';
 import {getDraftComment} from '@libs/DraftCommentUtils';
@@ -35,20 +38,21 @@ import * as EmojiUtils from '@libs/EmojiUtils';
 import focusComposerWithDelay from '@libs/focusComposerWithDelay';
 import getPlatform from '@libs/getPlatform';
 import * as KeyDownListener from '@libs/KeyboardShortcut/KeyDownPressListener';
+import Parser from '@libs/Parser';
 import ReportActionComposeFocusManager from '@libs/ReportActionComposeFocusManager';
 import * as ReportActionsUtils from '@libs/ReportActionsUtils';
 import * as ReportUtils from '@libs/ReportUtils';
-import * as SuggestionUtils from '@libs/SuggestionUtils';
 import updateMultilineInputRange from '@libs/updateMultilineInputRange';
 import willBlurTextInputOnTapOutsideFunc from '@libs/willBlurTextInputOnTapOutside';
+import getCursorPosition from '@pages/home/report/ReportActionCompose/getCursorPosition';
+import getScrollPosition from '@pages/home/report/ReportActionCompose/getScrollPosition';
 import type {ComposerRef, SuggestionsRef} from '@pages/home/report/ReportActionCompose/ReportActionCompose';
 import SilentCommentUpdater from '@pages/home/report/ReportActionCompose/SilentCommentUpdater';
 import Suggestions from '@pages/home/report/ReportActionCompose/Suggestions';
-import variables from '@styles/variables';
 import * as EmojiPickerActions from '@userActions/EmojiPickerAction';
 import * as InputFocus from '@userActions/InputFocus';
+import * as Modal from '@userActions/Modal';
 import * as Report from '@userActions/Report';
-import * as User from '@userActions/User';
 import CONST from '@src/CONST';
 import ONYXKEYS from '@src/ONYXKEYS';
 import type * as OnyxTypes from '@src/types/onyx';
@@ -59,8 +63,6 @@ type SyncSelection = {
     value: string;
 };
 
-type AnimatedRef = ReturnType<typeof useAnimatedRef>;
-
 type NewlyAddedChars = {startIndex: number; endIndex: number; diff: string};
 
 type ComposerWithSuggestionsOnyxProps = {
@@ -91,6 +93,9 @@ type ComposerWithSuggestionsProps = ComposerWithSuggestionsOnyxProps &
         /** Callback to update the value of the composer */
         onValueChange: (value: string) => void;
 
+        /** Callback when the composer got cleared on the UI thread */
+        onCleared?: (text: string) => void;
+
         /** Whether the composer is full size */
         isComposerFullSize: boolean;
 
@@ -103,12 +108,6 @@ type ComposerWithSuggestionsProps = ComposerWithSuggestionsOnyxProps &
         /** Function to display a file in a modal */
         displayFileInModal: (file: FileObject) => void;
 
-        /** Whether the text input should clear */
-        textInputShouldClear: boolean;
-
-        /** Function to set the text input should clear */
-        setTextInputShouldClear: (shouldClear: boolean) => void;
-
         /** Whether the user is blocked from concierge */
         isBlockedFromConcierge: boolean;
 
@@ -133,9 +132,6 @@ type ComposerWithSuggestionsProps = ComposerWithSuggestionsOnyxProps &
         /** Function to measure the parent container */
         measureParentContainer: (callback: MeasureInWindowOnSuccessCallback) => void;
 
-        /** The height of the list */
-        listHeight: number;
-
         /** Whether the scroll is likely to trigger a layout */
         isScrollLikelyLayoutTriggered: RefObject<boolean>;
 
@@ -145,9 +141,6 @@ type ComposerWithSuggestionsProps = ComposerWithSuggestionsOnyxProps &
         /** The ref to the suggestions */
         suggestionsRef: React.RefObject<SuggestionsRef>;
 
-        /** The ref to the animated input */
-        animatedRef: AnimatedRef;
-
         /** The ref to the next modal will open */
         isNextModalWillOpenRef: MutableRefObject<boolean | null>;
 
@@ -177,6 +170,11 @@ type ComposerWithSuggestionsProps = ComposerWithSuggestionsOnyxProps &
         policyID: string;
     };
 
+type SwitchToCurrentReportProps = {
+    preexistingReportID: string;
+    callback: () => void;
+};
+
 const {RNTextInputReset} = NativeModules;
 
 const isIOSNative = getPlatform() === CONST.PLATFORM.IOS;
@@ -233,8 +231,6 @@ function ComposerWithSuggestions(
         isMenuVisible,
         inputPlaceholder,
         displayFileInModal,
-        textInputShouldClear,
-        setTextInputShouldClear,
         isBlockedFromConcierge,
         disabled,
         isFullComposerAvailable,
@@ -243,13 +239,12 @@ function ComposerWithSuggestions(
         handleSendMessage,
         shouldShowComposeInput,
         measureParentContainer = () => {},
-        listHeight,
         isScrollLikelyLayoutTriggered,
         raiseIsScrollLikelyLayoutTriggered,
+        onCleared = () => {},
 
         // Refs
         suggestionsRef,
-        animatedRef,
         isNextModalWillOpenRef,
         editFocused,
 
@@ -266,6 +261,9 @@ function ComposerWithSuggestions(
     const isFocused = useIsFocused();
     const navigation = useNavigation();
     const emojisPresentBefore = useRef<Emoji[]>([]);
+    const mobileInputScrollPosition = useRef(0);
+    const cursorPositionValue = useSharedValue({x: 0, y: 0});
+    const tag = useSharedValue(-1);
     const draftComment = getDraftComment(reportID) ?? '';
     const [value, setValue] = useState(() => {
         if (draftComment) {
@@ -274,51 +272,43 @@ function ComposerWithSuggestions(
         return draftComment;
     });
     const commentRef = useRef(value);
+
     const lastTextRef = useRef(value);
+    useEffect(() => {
+        lastTextRef.current = value;
+    }, [value]);
 
-    const {isSmallScreenWidth} = useWindowDimensions();
-    const maxComposerLines = isSmallScreenWidth ? CONST.COMPOSER.MAX_LINES_SMALL_SCREEN : CONST.COMPOSER.MAX_LINES;
+    const {shouldUseNarrowLayout} = useResponsiveLayout();
+    const maxComposerLines = shouldUseNarrowLayout ? CONST.COMPOSER.MAX_LINES_SMALL_SCREEN : CONST.COMPOSER.MAX_LINES;
 
-    const parentReportAction = parentReportActions?.[parentReportActionID ?? ''] ?? null;
+    const parentReportAction = parentReportActions?.[parentReportActionID ?? '-1'];
     const shouldAutoFocus =
-        !modal?.isVisible && isFocused && (shouldFocusInputOnScreenFocus || (isEmptyChat && !ReportActionsUtils.isTransactionThread(parentReportAction))) && shouldShowComposeInput;
+        !modal?.isVisible &&
+        Modal.areAllModalsHidden() &&
+        isFocused &&
+        (shouldFocusInputOnScreenFocus || (isEmptyChat && !ReportActionsUtils.isTransactionThread(parentReportAction))) &&
+        shouldShowComposeInput;
 
     const valueRef = useRef(value);
     valueRef.current = value;
 
-    const [selection, setSelection] = useState(() => ({start: 0, end: 0}));
+    const [selection, setSelection] = useState<TextSelection>(() => ({start: value.length, end: value.length, positionX: 0, positionY: 0}));
 
     const [composerHeight, setComposerHeight] = useState(0);
 
     const textInputRef = useRef<TextInput | null>(null);
-    const insertedEmojisRef = useRef<Emoji[]>([]);
 
     const syncSelectionWithOnChangeTextRef = useRef<SyncSelection | null>(null);
 
-    const suggestions = suggestionsRef.current?.getSuggestions() ?? [];
-
-    const hasEnoughSpaceForLargeSuggestion = SuggestionUtils.hasEnoughSpaceForLargeSuggestionMenu(listHeight, composerHeight, suggestions?.length ?? 0);
-
-    const isAutoSuggestionPickerLarge = !isSmallScreenWidth || (isSmallScreenWidth && hasEnoughSpaceForLargeSuggestion);
-
     // The ref to check whether the comment saving is in progress
     const isCommentPendingSaved = useRef(false);
 
-    /**
-     * Update frequently used emojis list. We debounce this method in the constructor so that UpdateFrequentlyUsedEmojis
-     * API is not called too often.
-     */
-    const debouncedUpdateFrequentlyUsedEmojis = useCallback(() => {
-        User.updateFrequentlyUsedEmojis(EmojiUtils.getFrequentlyUsedEmojis(insertedEmojisRef.current));
-        insertedEmojisRef.current = [];
-    }, []);
-
+    const animatedRef = useAnimatedRef();
     /**
      * Set the TextInput Ref
      */
     const setTextInputRef = useCallback(
         (el: TextInput) => {
-            // @ts-expect-error need to reassign this ref
             ReportActionComposeFocusManager.composerRef.current = el;
             textInputRef.current = el;
             if (typeof animatedRef === 'function') {
@@ -337,13 +327,27 @@ function ComposerWithSuggestions(
 
     const debouncedSaveReportComment = useMemo(
         () =>
-            lodashDebounce((selectedReportID, newComment) => {
+            lodashDebounce((selectedReportID: string, newComment: string | null) => {
                 Report.saveReportDraftComment(selectedReportID, newComment);
                 isCommentPendingSaved.current = false;
             }, 1000),
         [],
     );
 
+    useEffect(() => {
+        const switchToCurrentReport = DeviceEventEmitter.addListener(`switchToPreExistingReport_${reportID}`, ({preexistingReportID, callback}: SwitchToCurrentReportProps) => {
+            if (!commentRef.current) {
+                callback();
+                return;
+            }
+            Report.saveReportDraftComment(preexistingReportID, commentRef.current, callback);
+        });
+
+        return () => {
+            switchToCurrentReport.remove();
+        };
+    }, [reportID]);
+
     /**
      * Find the newly added characters between the previous text and the new text based on the selection.
      *
@@ -367,9 +371,9 @@ function ComposerWithSuggestions(
 
             if (currentIndex < newText.length) {
                 startIndex = currentIndex;
-                const commonSuffixLength = ComposerUtils.findCommonSuffixLength(prevText, newText, selection.end);
+                const commonSuffixLength = ComposerUtils.findCommonSuffixLength(prevText, newText, selection?.end ?? 0);
                 // if text is getting pasted over find length of common suffix and subtract it from new text length
-                if (commonSuffixLength > 0 || selection.end - selection.start > 0) {
+                if (commonSuffixLength > 0 || (selection?.end ?? 0) - selection.start > 0) {
                     endIndex = newText.length - commonSuffixLength;
                 } else {
                     endIndex = currentIndex + newText.length;
@@ -392,11 +396,8 @@ function ComposerWithSuggestions(
             raiseIsScrollLikelyLayoutTriggered();
             const {startIndex, endIndex, diff} = findNewlyAddedChars(lastTextRef.current, commentValue);
             const isEmojiInserted = diff.length && endIndex > startIndex && diff.trim() === diff && EmojiUtils.containsOnlyEmojis(diff);
-            const {
-                text: newComment,
-                emojis,
-                cursorPosition,
-            } = EmojiUtils.replaceAndExtractEmojis(isEmojiInserted ? ComposerUtils.insertWhiteSpaceAtIndex(commentValue, endIndex) : commentValue, preferredSkinTone, preferredLocale);
+            const commentWithSpaceInserted = isEmojiInserted ? ComposerUtils.insertWhiteSpaceAtIndex(commentValue, endIndex) : commentValue;
+            const {text: newComment, emojis, cursorPosition} = EmojiUtils.replaceAndExtractEmojis(commentWithSpaceInserted, preferredSkinTone, preferredLocale);
             if (emojis.length) {
                 const newEmojis = EmojiUtils.getAddedEmojis(emojis, emojisPresentBefore.current);
                 if (newEmojis.length) {
@@ -404,8 +405,6 @@ function ComposerWithSuggestions(
                     if (suggestionsRef.current) {
                         suggestionsRef.current.resetSuggestions();
                     }
-                    insertedEmojisRef.current = [...insertedEmojisRef.current, ...newEmojis];
-                    debouncedUpdateFrequentlyUsedEmojis();
                 }
             }
             const newCommentConverted = convertToLTRForComposer(newComment);
@@ -417,18 +416,21 @@ function ComposerWithSuggestions(
                 setIsCommentEmpty(isNewCommentEmpty);
             }
             emojisPresentBefore.current = emojis;
+
             setValue(newCommentConverted);
             if (commentValue !== newComment) {
-                const position = Math.max(selection.end + (newComment.length - commentRef.current.length), cursorPosition ?? 0);
+                const position = Math.max((selection.end ?? 0) + (newComment.length - commentRef.current.length), cursorPosition ?? 0);
 
-                if (isIOSNative) {
+                if (commentWithSpaceInserted !== newComment && isIOSNative) {
                     syncSelectionWithOnChangeTextRef.current = {position, value: newComment};
                 }
 
-                setSelection({
+                setSelection((prevSelection) => ({
                     start: position,
                     end: position,
-                });
+                    positionX: prevSelection.positionX,
+                    positionY: prevSelection.positionY,
+                }));
             }
 
             commentRef.current = newCommentConverted;
@@ -442,50 +444,17 @@ function ComposerWithSuggestions(
                 debouncedBroadcastUserIsTyping(reportID);
             }
         },
-        [
-            debouncedUpdateFrequentlyUsedEmojis,
-            findNewlyAddedChars,
-            preferredLocale,
-            preferredSkinTone,
-            reportID,
-            setIsCommentEmpty,
-            suggestionsRef,
-            raiseIsScrollLikelyLayoutTriggered,
-            debouncedSaveReportComment,
-            selection.end,
-        ],
+        [findNewlyAddedChars, preferredLocale, preferredSkinTone, reportID, setIsCommentEmpty, suggestionsRef, raiseIsScrollLikelyLayoutTriggered, debouncedSaveReportComment, selection.end],
     );
 
-    const prepareCommentAndResetComposer = useCallback((): string => {
-        const trimmedComment = commentRef.current.trim();
-        const commentLength = ReportUtils.getCommentLength(trimmedComment, {reportID});
-
-        // Don't submit empty comments or comments that exceed the character limit
-        if (!commentLength || commentLength > CONST.MAX_COMMENT_LENGTH) {
-            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();
-        isCommentPendingSaved.current = false;
-
-        updateComment('');
-        setTextInputShouldClear(true);
-        if (isComposerFullSize) {
-            Report.setIsComposerFullSize(reportID, false);
-        }
-        setIsFullComposerAvailable(false);
-        return trimmedComment;
-    }, [updateComment, setTextInputShouldClear, isComposerFullSize, setIsFullComposerAvailable, reportID, debouncedSaveReportComment]);
-
     /**
      * Callback to add whatever text is chosen into the main input (used f.e as callback for the emoji picker)
      */
     const replaceSelectionWithText = useCallback(
         (text: string) => {
-            updateComment(ComposerUtils.insertText(commentRef.current, selection, text));
+            // selection replacement should be debounced to avoid conflicts with text typing
+            // (f.e. when emoji is being picked and 1 second still did not pass after user finished typing)
+            updateComment(ComposerUtils.insertText(commentRef.current, selection, text), true);
         },
         [selection, updateComment],
     );
@@ -493,7 +462,7 @@ function ComposerWithSuggestions(
     const triggerHotkeyActions = useCallback(
         (event: NativeSyntheticEvent<TextInputKeyPressEventData>) => {
             const webEvent = event as unknown as KeyboardEvent;
-            if (!webEvent || ComposerUtils.canSkipTriggerHotkeys(isSmallScreenWidth, isKeyboardShown)) {
+            if (!webEvent || ComposerUtils.canSkipTriggerHotkeys(shouldUseNarrowLayout, isKeyboardShown)) {
                 return;
             }
 
@@ -520,12 +489,12 @@ function ComposerWithSuggestions(
             ) {
                 event.preventDefault();
                 if (lastReportAction) {
-                    const parser = new ExpensiMark();
-                    Report.saveReportActionDraft(reportID, lastReportAction, parser.htmlToMarkdown(lastReportAction.message?.at(-1)?.html ?? ''));
+                    const message = Array.isArray(lastReportAction?.message) ? lastReportAction?.message?.at(-1) ?? null : lastReportAction?.message ?? null;
+                    Report.saveReportActionDraft(reportID, lastReportAction, Parser.htmlToMarkdown(message?.html ?? ''));
                 }
             }
         },
-        [isSmallScreenWidth, isKeyboardShown, suggestionsRef, includeChronos, handleSendMessage, lastReportAction, reportID],
+        [shouldUseNarrowLayout, isKeyboardShown, suggestionsRef, includeChronos, handleSendMessage, lastReportAction, reportID],
     );
 
     const onChangeText = useCallback(
@@ -548,22 +517,27 @@ function ComposerWithSuggestions(
     );
 
     const onSelectionChange = useCallback(
-        (e: NativeSyntheticEvent<TextInputSelectionChangeEventData>) => {
-            if (textInputRef.current?.isFocused() && suggestionsRef.current?.onSelectionChange?.(e)) {
+        (e: CustomSelectionChangeEvent) => {
+            if (!textInputRef.current?.isFocused()) {
                 return;
             }
+            suggestionsRef.current?.onSelectionChange?.(e);
 
             setSelection(e.nativeEvent.selection);
         },
         [suggestionsRef],
     );
 
-    const hideSuggestionMenu = useCallback(() => {
-        if (!suggestionsRef.current || isScrollLikelyLayoutTriggered.current) {
-            return;
-        }
-        suggestionsRef.current.updateShouldShowSuggestionMenuToFalse(false);
-    }, [suggestionsRef, isScrollLikelyLayoutTriggered]);
+    const hideSuggestionMenu = useCallback(
+        (e: NativeSyntheticEvent<TextInputScrollEventData>) => {
+            mobileInputScrollPosition.current = e?.nativeEvent?.contentOffset?.y ?? 0;
+            if (!suggestionsRef.current || isScrollLikelyLayoutTriggered.current) {
+                return;
+            }
+            suggestionsRef.current.updateShouldShowSuggestionMenuToFalse(false);
+        },
+        [suggestionsRef, isScrollLikelyLayoutTriggered],
+    );
 
     const setShouldBlockSuggestionCalcToFalse = useCallback(() => {
         if (!suggestionsRef.current) {
@@ -588,7 +562,7 @@ function ComposerWithSuggestions(
                 return;
             }
 
-            focus(false);
+            focus(true);
         }, true);
     }, [focus, isFocused]);
 
@@ -630,12 +604,21 @@ function ComposerWithSuggestions(
         textInputRef.current.blur();
     }, []);
 
+    const clear = useCallback(() => {
+        'worklet';
+
+        forceClearInput(animatedRef, textInputRef);
+    }, [animatedRef]);
+
+    const getCurrentText = useCallback(() => {
+        return commentRef.current;
+    }, []);
+
     useEffect(() => {
         const unsubscribeNavigationBlur = navigation.addListener('blur', () => KeyDownListener.removeKeyDownPressListener(focusComposerOnKeyPress));
         const unsubscribeNavigationFocus = navigation.addListener('focus', () => {
             KeyDownListener.addKeyDownPressListener(focusComposerOnKeyPress);
             // The report isn't unmounted and can be focused again after going back from another report so we should update the composerRef again
-            // @ts-expect-error need to reassign this ref
             ReportActionComposeFocusManager.composerRef.current = textInputRef.current;
             setUpComposeFocusManager();
         });
@@ -656,9 +639,15 @@ function ComposerWithSuggestions(
     const prevIsFocused = usePrevious(isFocused);
     useEffect(() => {
         if (modal?.isVisible && !prevIsModalVisible) {
-            // eslint-disable-next-line no-param-reassign
+            // eslint-disable-next-line react-compiler/react-compiler, no-param-reassign
             isNextModalWillOpenRef.current = false;
         }
+
+        // We want to blur the input immediately when a screen is out of focus.
+        if (!isFocused) {
+            textInputRef.current?.blur();
+        }
+
         // We want to focus or refocus the input when a modal has been closed or the underlying screen is refocused.
         // We avoid doing this on native platforms since the software keyboard popping
         // open creates a jarring and broken UX.
@@ -676,7 +665,7 @@ function ComposerWithSuggestions(
     useEffect(() => {
         // Scrolls the composer to the bottom and sets the selection to the end, so that longer drafts are easier to edit
         updateMultilineInputRange(textInputRef.current, !!shouldAutoFocus);
-        // eslint-disable-next-line react-hooks/exhaustive-deps
+        // eslint-disable-next-line react-compiler/react-compiler, react-hooks/exhaustive-deps
     }, []);
     useImperativeHandle(
         ref,
@@ -684,16 +673,13 @@ function ComposerWithSuggestions(
             blur,
             focus,
             replaceSelectionWithText,
-            prepareCommentAndResetComposer,
             isFocused: () => !!textInputRef.current?.isFocused(),
+            clear,
+            getCurrentText,
         }),
-        [blur, focus, prepareCommentAndResetComposer, replaceSelectionWithText],
+        [blur, clear, focus, replaceSelectionWithText, getCurrentText],
     );
 
-    useEffect(() => {
-        lastTextRef.current = value;
-    }, [value]);
-
     useEffect(() => {
         onValueChange(value);
     }, [onValueChange, value]);
@@ -709,15 +695,54 @@ function ComposerWithSuggestions(
         [composerHeight],
     );
 
-    const onClear = useCallback(() => {
-        setTextInputShouldClear(false);
-        // eslint-disable-next-line react-hooks/exhaustive-deps
-    }, []);
+    const onClear = useCallback(
+        (text: string) => {
+            mobileInputScrollPosition.current = 0;
+            // Note: use the value when the clear happened, not the current value which might have changed already
+            onCleared(text);
+            updateComment('', true);
+        },
+        [onCleared, updateComment],
+    );
 
-    const isOnlyEmojiLineHeight = useMemo(() => {
-        const isOnlyEmoji = EmojiUtils.containsOnlyEmojis(value);
-        return isOnlyEmoji ? {lineHeight: variables.fontSizeOnlyEmojisHeight} : {};
-    }, [value]);
+    useEffect(() => {
+        // We use the tag to store the native ID of the text input. Later, we use it in onSelectionChange to pick up the proper text input data.
+
+        tag.value = findNodeHandle(textInputRef.current) ?? -1;
+        // eslint-disable-next-line react-compiler/react-compiler, react-hooks/exhaustive-deps
+    }, []);
+    useFocusedInputHandler(
+        {
+            onSelectionChange: (event) => {
+                'worklet';
+
+                if (event.target === tag.value) {
+                    cursorPositionValue.value = {
+                        x: event.selection.end.x,
+                        y: event.selection.end.y,
+                    };
+                }
+            },
+        },
+        [],
+    );
+    const measureParentContainerAndReportCursor = useCallback(
+        (callback: MeasureParentContainerAndCursorCallback) => {
+            const {scrollValue} = getScrollPosition({mobileInputScrollPosition, textInputRef});
+            const {x: xPosition, y: yPosition} = getCursorPosition({positionOnMobile: cursorPositionValue.value, positionOnWeb: selection});
+            measureParentContainer((x, y, width, height) => {
+                callback({
+                    x,
+                    y,
+                    width,
+                    height,
+                    scrollValue,
+                    cursorCoordinates: {x: xPosition, y: yPosition},
+                });
+            });
+        },
+        [measureParentContainer, cursorPositionValue, selection],
+    );
 
     return (
         <>
@@ -732,13 +757,15 @@ function ComposerWithSuggestions(
                     onChangeText={onChangeText}
                     onKeyPress={triggerHotkeyActions}
                     textAlignVertical="top"
-                    style={[styles.textInputCompose, isComposerFullSize ? styles.textInputFullCompose : styles.textInputCollapseCompose, isOnlyEmojiLineHeight]}
+                    style={[styles.textInputCompose, isComposerFullSize ? styles.textInputFullCompose : styles.textInputCollapseCompose]}
                     maxLines={maxComposerLines}
                     onFocus={onFocus}
                     onBlur={onBlur}
                     onClick={setShouldBlockSuggestionCalcToFalse}
-                    onPasteFile={displayFileInModal}
-                    shouldClear={textInputShouldClear}
+                    onPasteFile={(file) => {
+                        textInputRef.current?.blur();
+                        displayFileInModal(file);
+                    }}
                     onClear={onClear}
                     isDisabled={isBlockedFromConcierge || disabled}
                     isReportActionCompose
@@ -753,22 +780,19 @@ function ComposerWithSuggestions(
                     onLayout={onLayout}
                     onScroll={hideSuggestionMenu}
                     shouldContainScroll={Browser.isMobileSafari()}
+                    isGroupPolicyReport={isGroupPolicyReport}
                 />
             </View>
 
             <Suggestions
                 ref={suggestionsRef}
-                isComposerFullSize={isComposerFullSize}
                 isComposerFocused={textInputRef.current?.isFocused()}
                 updateComment={updateComment}
-                composerHeight={composerHeight}
-                measureParentContainer={measureParentContainer}
-                isAutoSuggestionPickerLarge={isAutoSuggestionPickerLarge}
+                measureParentContainerAndReportCursor={measureParentContainerAndReportCursor}
                 isGroupPolicyReport={isGroupPolicyReport}
                 policyID={policyID}
                 // Input
                 value={value}
-                setValue={setValue}
                 selection={selection}
                 setSelection={setSelection}
                 resetKeyboardInput={resetKeyboardInput}
diff --git a/src/pages/home/report/ReportActionCompose/ComposerWithSuggestions/index.e2e.tsx b/src/pages/home/report/ReportActionCompose/ComposerWithSuggestions/index.e2e.tsx
index 7f169ef15918..c698cefe3349 100644
--- a/src/pages/home/report/ReportActionCompose/ComposerWithSuggestions/index.e2e.tsx
+++ b/src/pages/home/report/ReportActionCompose/ComposerWithSuggestions/index.e2e.tsx
@@ -1,5 +1,6 @@
 import type {ForwardedRef} from 'react';
-import React, {forwardRef, useEffect} from 'react';
+import React, {forwardRef, useEffect, useRef} from 'react';
+import {Keyboard} from 'react-native';
 import E2EClient from '@libs/E2E/client';
 import type {ComposerRef} from '@pages/home/report/ReportActionCompose/ReportActionCompose';
 import type {ComposerWithSuggestionsProps} from './ComposerWithSuggestions';
@@ -17,6 +18,14 @@ function IncrementRenderCount() {
 }
 
 function ComposerWithSuggestionsE2e(props: ComposerWithSuggestionsProps, ref: ForwardedRef<ComposerRef>) {
+    'use no memo';
+
+    // we rely on waterfall rendering in react, so we intentionally disable compiler
+    // for this component. This file is only used for e2e tests, so it's okay to
+    // disable compiler for this file.
+
+    const textInputRef = useRef<ComposerRef | null>();
+
     // Eventually Auto focus on e2e tests
     useEffect(() => {
         const testConfig = E2EClient.getCurrentActiveTestConfig();
@@ -26,19 +35,40 @@ function ComposerWithSuggestionsE2e(props: ComposerWithSuggestionsProps, ref: Fo
 
         // We need to wait for the component to be mounted before focusing
         setTimeout(() => {
-            if (!(ref && 'current' in ref)) {
-                return;
-            }
+            const setFocus = () => {
+                if (!(textInputRef && 'current' in textInputRef)) {
+                    return;
+                }
+
+                textInputRef.current?.focus(true);
 
-            ref.current?.focus(true);
+                setTimeout(() => {
+                    // and actually let's verify that the keyboard is visible
+                    if (Keyboard.isVisible()) {
+                        return;
+                    }
+
+                    textInputRef.current?.blur();
+                    setFocus();
+                    // 1000ms is enough time for any keyboard to open
+                }, 1000);
+            };
+
+            setFocus();
         }, 1);
-    }, [ref]);
+    }, [textInputRef]);
 
     return (
         <ComposerWithSuggestions
             // eslint-disable-next-line react/jsx-props-no-spreading
             {...props}
-            ref={ref}
+            ref={(composerRef) => {
+                textInputRef.current = composerRef;
+
+                if (typeof ref === 'function') {
+                    ref(composerRef);
+                }
+            }}
         >
             {/* Important: 
                     this has to be a child, as this container might not
diff --git a/src/pages/home/report/ReportActionCompose/ReportActionCompose.tsx b/src/pages/home/report/ReportActionCompose/ReportActionCompose.tsx
index 5bfa2475ee23..72e89c8de013 100644
--- a/src/pages/home/report/ReportActionCompose/ReportActionCompose.tsx
+++ b/src/pages/home/report/ReportActionCompose/ReportActionCompose.tsx
@@ -1,38 +1,45 @@
-import {PortalHost} from '@gorhom/portal';
-import type {SyntheticEvent} from 'react';
+import {useNavigation} from '@react-navigation/native';
+import noop from 'lodash/noop';
 import React, {memo, useCallback, useEffect, useMemo, useRef, useState} from 'react';
 import type {MeasureInWindowOnSuccessCallback, NativeSyntheticEvent, TextInputFocusEventData, TextInputSelectionChangeEventData} from 'react-native';
 import {View} from 'react-native';
 import type {OnyxEntry} from 'react-native-onyx';
 import {withOnyx} from 'react-native-onyx';
-import {runOnJS, setNativeProps, useAnimatedRef} from 'react-native-reanimated';
+import {runOnUI, useSharedValue} from 'react-native-reanimated';
 import type {Emoji} from '@assets/emojis/types';
 import type {FileObject} from '@components/AttachmentModal';
 import AttachmentModal from '@components/AttachmentModal';
 import EmojiPickerButton from '@components/EmojiPicker/EmojiPickerButton';
 import ExceededCommentLength from '@components/ExceededCommentLength';
+import Icon from '@components/Icon';
+import * as Expensicons from '@components/Icon/Expensicons';
 import type {Mention} from '@components/MentionSuggestions';
 import OfflineIndicator from '@components/OfflineIndicator';
 import OfflineWithFeedback from '@components/OfflineWithFeedback';
 import {usePersonalDetails} from '@components/OnyxProvider';
+import Text from '@components/Text';
+import EducationalTooltip from '@components/Tooltip/EducationalTooltip';
 import type {WithCurrentUserPersonalDetailsProps} from '@components/withCurrentUserPersonalDetails';
 import withCurrentUserPersonalDetails from '@components/withCurrentUserPersonalDetails';
 import useDebounce from '@hooks/useDebounce';
 import useHandleExceedMaxCommentLength from '@hooks/useHandleExceedMaxCommentLength';
 import useLocalize from '@hooks/useLocalize';
 import useNetwork from '@hooks/useNetwork';
+import useResponsiveLayout from '@hooks/useResponsiveLayout';
+import useTheme from '@hooks/useTheme';
 import useThemeStyles from '@hooks/useThemeStyles';
-import useWindowDimensions from '@hooks/useWindowDimensions';
 import canFocusInputOnScreenFocus from '@libs/canFocusInputOnScreenFocus';
 import * as DeviceCapabilities from '@libs/DeviceCapabilities';
 import {getDraftComment} from '@libs/DraftCommentUtils';
 import getModalState from '@libs/getModalState';
+import Performance from '@libs/Performance';
 import * as ReportUtils from '@libs/ReportUtils';
 import playSound, {SOUNDS} from '@libs/Sound';
 import willBlurTextInputOnTapOutsideFunc from '@libs/willBlurTextInputOnTapOutside';
 import ParticipantLocalTime from '@pages/home/report/ParticipantLocalTime';
 import ReportDropUI from '@pages/home/report/ReportDropUI';
 import ReportTypingIndicator from '@pages/home/report/ReportTypingIndicator';
+import variables from '@styles/variables';
 import * as EmojiPickerActions from '@userActions/EmojiPickerAction';
 import * as Report from '@userActions/Report';
 import * as User from '@userActions/User';
@@ -49,9 +56,14 @@ import SendButton from './SendButton';
 type ComposerRef = {
     blur: () => void;
     focus: (shouldDelay?: boolean) => void;
-    replaceSelectionWithText: (text: string, shouldAddTrailSpace: boolean) => void;
-    prepareCommentAndResetComposer: () => string;
+    replaceSelectionWithText: EmojiPickerActions.OnEmojiSelected;
+    getCurrentText: () => string;
     isFocused: () => boolean;
+    /**
+     * Calling clear will immediately clear the input on the UI thread (its a worklet).
+     * Once the composer ahs cleared onCleared will be called with the value that was cleared.
+     */
+    clear: () => void;
 };
 
 type SuggestionsRef = {
@@ -61,6 +73,7 @@ type SuggestionsRef = {
     updateShouldShowSuggestionMenuToFalse: (shouldShowSuggestionMenu?: boolean) => void;
     setShouldBlockSuggestionCalc: (shouldBlock: boolean) => void;
     getSuggestions: () => Mention[] | Emoji[];
+    getIsSuggestionsMenuVisible: () => boolean;
 };
 
 type ReportActionComposeOnyxProps = {
@@ -73,9 +86,9 @@ type ReportActionComposeOnyxProps = {
 
 type ReportActionComposeProps = ReportActionComposeOnyxProps &
     WithCurrentUserPersonalDetailsProps &
-    Pick<ComposerWithSuggestionsProps, 'reportID' | 'isEmptyChat' | 'isComposerFullSize' | 'disabled' | 'listHeight' | 'lastReportAction'> & {
+    Pick<ComposerWithSuggestionsProps, 'reportID' | 'isEmptyChat' | 'isComposerFullSize' | 'lastReportAction'> & {
         /** A method to call when the form is submitted */
-        onSubmit: (newComment: string | undefined) => void;
+        onSubmit: (newComment: string) => void;
 
         /** The report currently being looked at */
         report: OnyxEntry<OnyxTypes.Report>;
@@ -91,6 +104,12 @@ type ReportActionComposeProps = ReportActionComposeOnyxProps &
 
         /** A method to call when the input is blur */
         onComposerBlur?: () => void;
+
+        /** Should the input be disabled  */
+        disabled?: boolean;
+
+        /** Should show educational tooltip */
+        shouldShowEducationalTooltip?: boolean;
     };
 
 // We want consistent auto focus behavior on input between native and mWeb so we have some auto focus management code that will
@@ -99,30 +118,34 @@ const shouldFocusInputOnScreenFocus = canFocusInputOnScreenFocus();
 
 const willBlurTextInputOnTapOutside = willBlurTextInputOnTapOutsideFunc();
 
+// eslint-disable-next-line import/no-mutable-exports
+let onSubmitAction = noop;
+
 function ReportActionCompose({
     blockedFromConcierge,
-    currentUserPersonalDetails = {},
-    disabled,
+    currentUserPersonalDetails,
+    disabled = false,
     isComposerFullSize = false,
     onSubmit,
     pendingAction,
     report,
     reportID,
-    listHeight = 0,
     shouldShowComposeInput = true,
     isReportReadyForDisplay = true,
     isEmptyChat,
     lastReportAction,
+    shouldShowEducationalTooltip,
     onComposerFocus,
     onComposerBlur,
 }: ReportActionComposeProps) {
+    const theme = useTheme();
     const styles = useThemeStyles();
     const {translate} = useLocalize();
-    const {isMediumScreenWidth, isSmallScreenWidth} = useWindowDimensions();
+    const {isSmallScreenWidth, isMediumScreenWidth, shouldUseNarrowLayout} = useResponsiveLayout();
     const {isOffline} = useNetwork();
-    const animatedRef = useAnimatedRef();
     const actionButtonRef = useRef<View | HTMLDivElement | null>(null);
     const personalDetails = usePersonalDetails() || CONST.EMPTY_OBJECT;
+    const navigation = useNavigation();
 
     /**
      * Updates the Highlight state of the composer
@@ -132,6 +155,7 @@ function ReportActionCompose({
         return shouldFocusInputOnScreenFocus && shouldShowComposeInput && !initialModalState?.isVisible && !initialModalState?.willAlertModalBecomeVisible;
     });
     const [isFullComposerAvailable, setIsFullComposerAvailable] = useState(isComposerFullSize);
+    const [shouldHideEducationalTooltip, setShouldHideEducationalTooltip] = useState(false);
 
     // 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);
@@ -153,10 +177,6 @@ function ReportActionCompose({
         debouncedLowerIsScrollLikelyLayoutTriggered();
     }, [debouncedLowerIsScrollLikelyLayoutTriggered]);
 
-    /**
-     * Updates the should clear state of the composer
-     */
-    const [textInputShouldClear, setTextInputShouldClear] = useState(false);
     const [isCommentEmpty, setIsCommentEmpty] = useState(() => {
         const draftComment = getDraftComment(reportID);
         return !draftComment || !!draftComment.match(/^(\s)*$/);
@@ -175,11 +195,13 @@ function ReportActionCompose({
     const {hasExceededMaxCommentLength, validateCommentMaxLength} = useHandleExceedMaxCommentLength();
 
     const suggestionsRef = useRef<SuggestionsRef>(null);
-    const composerRef = useRef<ComposerRef>(null);
-
+    const composerRef = useRef<ComposerRef>();
     const reportParticipantIDs = useMemo(
-        () => report?.participantAccountIDs?.filter((accountID) => accountID !== currentUserPersonalDetails.accountID),
-        [currentUserPersonalDetails.accountID, report],
+        () =>
+            Object.keys(report?.participants ?? {})
+                .map(Number)
+                .filter((accountID) => accountID !== currentUserPersonalDetails.accountID),
+        [currentUserPersonalDetails.accountID, report?.participants],
     );
 
     const shouldShowReportRecipientLocalTime = useMemo(
@@ -187,14 +209,14 @@ function ReportActionCompose({
         [personalDetails, report, currentUserPersonalDetails.accountID, isComposerFullSize],
     );
 
-    const includesConcierge = useMemo(() => ReportUtils.chatIncludesConcierge({participantAccountIDs: report?.participantAccountIDs}), [report?.participantAccountIDs]);
+    const includesConcierge = useMemo(() => ReportUtils.chatIncludesConcierge({participants: report?.participants}), [report?.participants]);
     const userBlockedFromConcierge = useMemo(() => User.isBlockedFromConcierge(blockedFromConcierge), [blockedFromConcierge]);
     const isBlockedFromConcierge = useMemo(() => includesConcierge && userBlockedFromConcierge, [includesConcierge, userBlockedFromConcierge]);
 
     // If we are on a small width device then don't show last 3 items from conciergePlaceholderOptions
     const conciergePlaceholderRandomIndex = useMemo(
-        () => Math.floor(Math.random() * (translate('reportActionCompose.conciergePlaceholderOptions').length - (isSmallScreenWidth ? 4 : 1) + 1)),
-        // eslint-disable-next-line react-hooks/exhaustive-deps
+        () => Math.floor(Math.random() * (translate('reportActionCompose.conciergePlaceholderOptions').length - (shouldUseNarrowLayout ? 4 : 1) + 1)),
+        // eslint-disable-next-line react-compiler/react-compiler, react-hooks/exhaustive-deps
         [],
     );
 
@@ -215,7 +237,7 @@ function ReportActionCompose({
         if (composerRef.current === null) {
             return;
         }
-        composerRef.current.focus(true);
+        composerRef.current?.focus(true);
     };
 
     const isKeyboardVisibleWhenShowingModalRef = useRef(false);
@@ -237,7 +259,7 @@ function ReportActionCompose({
             containerRef.current.measureInWindow(callback);
         },
         // We added isComposerFullSize in dependencies so that when this value changes, we recalculate the position of the popup
-        // eslint-disable-next-line react-hooks/exhaustive-deps
+        // eslint-disable-next-line react-compiler/react-compiler, react-hooks/exhaustive-deps
         [isComposerFullSize],
     );
 
@@ -259,15 +281,16 @@ function ReportActionCompose({
         suggestionsRef.current.updateShouldShowSuggestionMenuToFalse(false);
     }, []);
 
-    const addAttachment = useCallback(
-        (file: FileObject) => {
-            playSound(SOUNDS.DONE);
-            const newComment = composerRef?.current?.prepareCommentAndResetComposer();
-            Report.addAttachment(reportID, file, newComment);
-            setTextInputShouldClear(false);
-        },
-        [reportID],
-    );
+    const attachmentFileRef = useRef<FileObject | null>(null);
+    const addAttachment = useCallback((file: FileObject) => {
+        attachmentFileRef.current = file;
+        const clear = composerRef.current?.clear;
+        if (!clear) {
+            throw new Error('The composerRef.clear function is not set yet. This should never happen, and indicates a developer error.');
+        }
+
+        runOnUI(clear)();
+    }, []);
 
     /**
      * Event handler to update the state after the attachment preview is closed.
@@ -282,18 +305,20 @@ function ReportActionCompose({
      * Add a new comment to this chat
      */
     const submitForm = useCallback(
-        (event?: SyntheticEvent) => {
-            event?.preventDefault();
+        (newComment: string) => {
+            playSound(SOUNDS.DONE);
 
-            const newComment = composerRef.current?.prepareCommentAndResetComposer();
-            if (!newComment) {
-                return;
-            }
+            const newCommentTrimmed = newComment.trim();
 
-            playSound(SOUNDS.DONE);
-            onSubmit(newComment);
+            if (attachmentFileRef.current) {
+                Report.addAttachment(reportID, attachmentFileRef.current, newCommentTrimmed);
+                attachmentFileRef.current = null;
+            } else {
+                Performance.markStart(CONST.TIMING.MESSAGE_SENT, {message: newCommentTrimmed});
+                onSubmit(newCommentTrimmed);
+            }
         },
-        [onSubmit],
+        [onSubmit, reportID],
     );
 
     const onTriggerAttachmentPicker = useCallback(() => {
@@ -321,27 +346,25 @@ function ReportActionCompose({
         onComposerFocus?.();
     }, [onComposerFocus]);
 
-    // resets the composer to normal size when
-    // the send button is pressed.
-    const resetFullComposerSize = useCallback(() => {
-        if (isComposerFullSize) {
-            Report.setIsComposerFullSize(reportID, false);
-        }
-        setIsFullComposerAvailable(false);
-    }, [isComposerFullSize, reportID]);
-
     // We are returning a callback here as we want to incoke the method on unmount only
     useEffect(
         () => () => {
-            if (!EmojiPickerActions.isActive(report?.reportID ?? '')) {
+            if (!EmojiPickerActions.isActive(report?.reportID ?? '-1')) {
                 return;
             }
             EmojiPickerActions.hideEmojiPicker();
         },
-        // eslint-disable-next-line react-hooks/exhaustive-deps
+        // eslint-disable-next-line react-compiler/react-compiler, react-hooks/exhaustive-deps
         [],
     );
 
+    useEffect(() => {
+        const unsubscribe = navigation.addListener('blur', () => {
+            setShouldHideEducationalTooltip(true);
+        });
+        return unsubscribe;
+    }, [navigation]);
+
     // When we invite someone to a room they don't have the policy object, but we still want them to be able to mention other reports they are members of, so we only check if the policyID in the report is from a workspace
     const isGroupPolicyReport = useMemo(() => !!report?.policyID && report.policyID !== CONST.POLICY.ID_FAKE, [report]);
     const reportRecipientAcountIDs = ReportUtils.getReportRecipientAccountIDs(report, currentUserPersonalDetails.accountID);
@@ -352,19 +375,29 @@ function ReportActionCompose({
 
     const isSendDisabled = isCommentEmpty || isBlockedFromConcierge || !!disabled || hasExceededMaxCommentLength;
 
+    // Note: using JS refs is not well supported in reanimated, thus we need to store the function in a shared value
+    // useSharedValue on web doesn't support functions, so we need to wrap it in an object.
+    const composerRefShared = useSharedValue<{
+        clear: (() => void) | undefined;
+    }>({clear: undefined});
     const handleSendMessage = useCallback(() => {
         'worklet';
 
+        const clearComposer = composerRefShared.value.clear;
+        if (!clearComposer) {
+            throw new Error('The composerRefShared.clear function is not set yet. This should never happen, and indicates a developer error.');
+        }
+
         if (isSendDisabled || !isReportReadyForDisplay) {
             return;
         }
 
-        // We are setting the isCommentEmpty flag to true so the status of it will be in sync of the native text input state
-        runOnJS(setIsCommentEmpty)(true);
-        runOnJS(resetFullComposerSize)();
-        setNativeProps(animatedRef, {text: ''}); // clears native text input on the UI thread
-        runOnJS(submitForm)();
-    }, [isSendDisabled, resetFullComposerSize, submitForm, animatedRef, isReportReadyForDisplay]);
+        // This will cause onCleared to be triggered where we actually send the message
+        clearComposer();
+    }, [isSendDisabled, isReportReadyForDisplay, composerRefShared]);
+
+    // eslint-disable-next-line react-compiler/react-compiler
+    onSubmitAction = handleSendMessage;
 
     const emojiShiftVertical = useMemo(() => {
         const chatItemComposeSecondaryRowHeight = styles.chatItemComposeSecondaryRow.height + styles.chatItemComposeSecondaryRow.marginTop + styles.chatItemComposeSecondaryRow.marginBottom;
@@ -373,124 +406,176 @@ function ReportActionCompose({
         return reportActionComposeHeight - emojiOffsetWithComposeBox - CONST.MENU_POSITION_REPORT_ACTION_COMPOSE_BOTTOM;
     }, [styles]);
 
+    const renderWorkspaceChatTooltip = useCallback(
+        () => (
+            <View style={[styles.alignItemsCenter, styles.flexRow, styles.justifyContentCenter, styles.flexWrap, styles.textAlignCenter, styles.gap1]}>
+                <Icon
+                    src={Expensicons.Lightbulb}
+                    fill={theme.tooltipHighlightText}
+                    medium
+                />
+                <Text>
+                    <Text style={styles.quickActionTooltipTitle}>{translate('reportActionCompose.tooltip.title')}</Text>
+                    <Text style={styles.quickActionTooltipSubtitle}>{translate('reportActionCompose.tooltip.subtitle')}</Text>
+                </Text>
+            </View>
+        ),
+        [
+            styles.alignItemsCenter,
+            styles.flexRow,
+            styles.justifyContentCenter,
+            styles.flexWrap,
+            styles.textAlignCenter,
+            styles.gap1,
+            styles.quickActionTooltipTitle,
+            styles.quickActionTooltipSubtitle,
+            theme.tooltipHighlightText,
+            translate,
+        ],
+    );
+
     return (
         <View style={[shouldShowReportRecipientLocalTime && !isOffline && styles.chatItemComposeWithFirstRow, isComposerFullSize && styles.chatItemFullComposeRow]}>
             <OfflineWithFeedback pendingAction={pendingAction}>
                 {shouldShowReportRecipientLocalTime && hasReportRecipient && <ParticipantLocalTime participant={reportRecipient} />}
             </OfflineWithFeedback>
             <View style={isComposerFullSize ? styles.flex1 : {}}>
-                <PortalHost name="suggestions" />
                 <OfflineWithFeedback
+                    shouldDisableOpacity
                     pendingAction={pendingAction}
                     style={isComposerFullSize ? styles.chatItemFullComposeRow : {}}
                     contentContainerStyle={isComposerFullSize ? styles.flex1 : {}}
                 >
-                    <View
-                        ref={containerRef}
-                        style={[
-                            shouldUseFocusedColor ? styles.chatItemComposeBoxFocusedColor : styles.chatItemComposeBoxColor,
-                            styles.flexRow,
-                            styles.chatItemComposeBox,
-                            isComposerFullSize && styles.chatItemFullComposeBox,
-                            hasExceededMaxCommentLength && styles.borderColorDanger,
-                        ]}
+                    <EducationalTooltip
+                        shouldRender={!shouldHideEducationalTooltip && shouldShowEducationalTooltip}
+                        renderTooltipContent={renderWorkspaceChatTooltip}
+                        shouldUseOverlay
+                        onPressOverlay={() => User.dismissWorkspaceTooltip()}
+                        anchorAlignment={{
+                            horizontal: CONST.MODAL.ANCHOR_ORIGIN_HORIZONTAL.LEFT,
+                            vertical: CONST.MODAL.ANCHOR_ORIGIN_VERTICAL.BOTTOM,
+                        }}
+                        wrapperStyle={styles.reportActionComposeTooltipWrapper}
+                        shiftHorizontal={variables.composerTooltipShiftHorizontal}
+                        shiftVertical={variables.composerTooltipShiftVertical}
                     >
-                        <AttachmentModal
-                            headerTitle={translate('reportActionCompose.sendAttachment')}
-                            onConfirm={addAttachment}
-                            onModalShow={() => setIsAttachmentPreviewActive(true)}
-                            onModalHide={onAttachmentPreviewClose}
+                        <View
+                            ref={containerRef}
+                            style={[
+                                shouldUseFocusedColor ? styles.chatItemComposeBoxFocusedColor : styles.chatItemComposeBoxColor,
+                                styles.flexRow,
+                                styles.chatItemComposeBox,
+                                isComposerFullSize && styles.chatItemFullComposeBox,
+                                hasExceededMaxCommentLength && styles.borderColorDanger,
+                            ]}
                         >
-                            {({displayFileInModal}) => (
-                                <>
-                                    <AttachmentPickerWithMenuItems
-                                        displayFileInModal={displayFileInModal}
-                                        reportID={reportID}
-                                        report={report}
-                                        reportParticipantIDs={reportParticipantIDs}
-                                        isFullComposerAvailable={isFullComposerAvailable}
-                                        isComposerFullSize={isComposerFullSize}
-                                        isBlockedFromConcierge={isBlockedFromConcierge}
-                                        disabled={!!disabled}
-                                        setMenuVisibility={setMenuVisibility}
-                                        isMenuVisible={isMenuVisible}
-                                        onTriggerAttachmentPicker={onTriggerAttachmentPicker}
-                                        raiseIsScrollLikelyLayoutTriggered={raiseIsScrollLikelyLayoutTriggered}
-                                        onCanceledAttachmentPicker={() => {
-                                            isNextModalWillOpenRef.current = false;
-                                            restoreKeyboardState();
-                                        }}
-                                        onMenuClosed={restoreKeyboardState}
-                                        onAddActionPressed={onAddActionPressed}
-                                        onItemSelected={onItemSelected}
-                                        actionButtonRef={actionButtonRef}
-                                    />
-                                    <ComposerWithSuggestions
-                                        ref={composerRef}
-                                        animatedRef={animatedRef}
-                                        suggestionsRef={suggestionsRef}
-                                        isNextModalWillOpenRef={isNextModalWillOpenRef}
-                                        isScrollLikelyLayoutTriggered={isScrollLikelyLayoutTriggered}
-                                        raiseIsScrollLikelyLayoutTriggered={raiseIsScrollLikelyLayoutTriggered}
-                                        reportID={reportID}
-                                        policyID={report?.policyID ?? ''}
-                                        parentReportID={report?.parentReportID}
-                                        parentReportActionID={report?.parentReportActionID}
-                                        includeChronos={ReportUtils.chatIncludesChronos(report)}
-                                        isGroupPolicyReport={isGroupPolicyReport}
-                                        isEmptyChat={isEmptyChat}
-                                        lastReportAction={lastReportAction}
-                                        isMenuVisible={isMenuVisible}
-                                        inputPlaceholder={inputPlaceholder}
-                                        isComposerFullSize={isComposerFullSize}
-                                        displayFileInModal={displayFileInModal}
-                                        textInputShouldClear={textInputShouldClear}
-                                        setTextInputShouldClear={setTextInputShouldClear}
-                                        isBlockedFromConcierge={isBlockedFromConcierge}
-                                        disabled={!!disabled}
-                                        isFullComposerAvailable={isFullComposerAvailable}
-                                        setIsFullComposerAvailable={setIsFullComposerAvailable}
-                                        setIsCommentEmpty={setIsCommentEmpty}
-                                        handleSendMessage={handleSendMessage}
-                                        shouldShowComposeInput={shouldShowComposeInput}
-                                        onFocus={onFocus}
-                                        onBlur={onBlur}
-                                        measureParentContainer={measureContainer}
-                                        listHeight={listHeight}
-                                        onValueChange={(value) => {
-                                            if (value.length === 0 && isComposerFullSize) {
-                                                Report.setIsComposerFullSize(reportID, false);
-                                            }
-                                            validateCommentMaxLength(value, {reportID});
-                                        }}
-                                    />
-                                    <ReportDropUI
-                                        onDrop={(event: DragEvent) => {
-                                            if (isAttachmentPreviewActive) {
-                                                return;
-                                            }
-                                            const data = event.dataTransfer?.items[0];
-                                            displayFileInModal(data as unknown as FileObject);
-                                        }}
-                                    />
-                                </>
+                            <AttachmentModal
+                                headerTitle={translate('reportActionCompose.sendAttachment')}
+                                onConfirm={addAttachment}
+                                onModalShow={() => setIsAttachmentPreviewActive(true)}
+                                onModalHide={onAttachmentPreviewClose}
+                            >
+                                {({displayFileInModal}) => (
+                                    <>
+                                        <AttachmentPickerWithMenuItems
+                                            displayFileInModal={displayFileInModal}
+                                            reportID={reportID}
+                                            report={report}
+                                            reportParticipantIDs={reportParticipantIDs}
+                                            isFullComposerAvailable={isFullComposerAvailable}
+                                            isComposerFullSize={isComposerFullSize}
+                                            isBlockedFromConcierge={isBlockedFromConcierge}
+                                            disabled={!!disabled}
+                                            setMenuVisibility={setMenuVisibility}
+                                            isMenuVisible={isMenuVisible}
+                                            onTriggerAttachmentPicker={onTriggerAttachmentPicker}
+                                            raiseIsScrollLikelyLayoutTriggered={raiseIsScrollLikelyLayoutTriggered}
+                                            onCanceledAttachmentPicker={() => {
+                                                isNextModalWillOpenRef.current = false;
+                                                restoreKeyboardState();
+                                            }}
+                                            onMenuClosed={restoreKeyboardState}
+                                            onAddActionPressed={onAddActionPressed}
+                                            onItemSelected={onItemSelected}
+                                            actionButtonRef={actionButtonRef}
+                                        />
+                                        <ComposerWithSuggestions
+                                            ref={(ref) => {
+                                                composerRef.current = ref ?? undefined;
+                                                // eslint-disable-next-line react-compiler/react-compiler
+                                                composerRefShared.value = {
+                                                    clear: ref?.clear,
+                                                };
+                                            }}
+                                            suggestionsRef={suggestionsRef}
+                                            isNextModalWillOpenRef={isNextModalWillOpenRef}
+                                            isScrollLikelyLayoutTriggered={isScrollLikelyLayoutTriggered}
+                                            raiseIsScrollLikelyLayoutTriggered={raiseIsScrollLikelyLayoutTriggered}
+                                            reportID={reportID}
+                                            policyID={report?.policyID ?? '-1'}
+                                            parentReportID={report?.parentReportID}
+                                            parentReportActionID={report?.parentReportActionID}
+                                            includeChronos={ReportUtils.chatIncludesChronos(report)}
+                                            isGroupPolicyReport={isGroupPolicyReport}
+                                            isEmptyChat={isEmptyChat}
+                                            lastReportAction={lastReportAction}
+                                            isMenuVisible={isMenuVisible}
+                                            inputPlaceholder={inputPlaceholder}
+                                            isComposerFullSize={isComposerFullSize}
+                                            displayFileInModal={displayFileInModal}
+                                            onCleared={submitForm}
+                                            isBlockedFromConcierge={isBlockedFromConcierge}
+                                            disabled={!!disabled}
+                                            isFullComposerAvailable={isFullComposerAvailable}
+                                            setIsFullComposerAvailable={setIsFullComposerAvailable}
+                                            setIsCommentEmpty={setIsCommentEmpty}
+                                            handleSendMessage={handleSendMessage}
+                                            shouldShowComposeInput={shouldShowComposeInput}
+                                            onFocus={onFocus}
+                                            onBlur={onBlur}
+                                            measureParentContainer={measureContainer}
+                                            onValueChange={(value) => {
+                                                if (value.length === 0 && isComposerFullSize) {
+                                                    Report.setIsComposerFullSize(reportID, false);
+                                                }
+                                                validateCommentMaxLength(value, {reportID});
+                                            }}
+                                        />
+                                        <ReportDropUI
+                                            onDrop={(event: DragEvent) => {
+                                                if (isAttachmentPreviewActive) {
+                                                    return;
+                                                }
+                                                const data = event.dataTransfer?.files[0];
+                                                if (data) {
+                                                    data.uri = URL.createObjectURL(data);
+                                                    displayFileInModal(data);
+                                                }
+                                            }}
+                                        />
+                                    </>
+                                )}
+                            </AttachmentModal>
+                            {DeviceCapabilities.canUseTouchScreen() && isMediumScreenWidth ? null : (
+                                <EmojiPickerButton
+                                    isDisabled={isBlockedFromConcierge || disabled}
+                                    onModalHide={(isNavigating) => {
+                                        if (isNavigating) {
+                                            return;
+                                        }
+                                        focus();
+                                    }}
+                                    onEmojiSelected={(...args) => composerRef.current?.replaceSelectionWithText(...args)}
+                                    emojiPickerID={report?.reportID}
+                                    shiftVertical={emojiShiftVertical}
+                                />
                             )}
-                        </AttachmentModal>
-                        {DeviceCapabilities.canUseTouchScreen() && isMediumScreenWidth ? null : (
-                            <EmojiPickerButton
-                                isDisabled={isBlockedFromConcierge || disabled}
-                                onModalHide={focus}
-                                //  @ts-expect-error TODO: Remove this once EmojiPickerButton (https://github.com/Expensify/App/issues/25155) is migrated to TypeScript.
-                                onEmojiSelected={(...args) => composerRef.current?.replaceSelectionWithText(...args)}
-                                emojiPickerID={report?.reportID}
-                                shiftVertical={emojiShiftVertical}
+                            <SendButton
+                                isDisabled={isSendDisabled}
+                                handleSendMessage={handleSendMessage}
                             />
-                        )}
-                        <SendButton
-                            isDisabled={isSendDisabled}
-                            handleSendMessage={handleSendMessage}
-                        />
-                    </View>
+                        </View>
+                    </EducationalTooltip>
                     <View
                         style={[
                             styles.flexRow,
@@ -499,7 +584,7 @@ function ReportActionCompose({
                             (!isSmallScreenWidth || (isSmallScreenWidth && !isOffline)) && styles.chatItemComposeSecondaryRow,
                         ]}
                     >
-                        {!isSmallScreenWidth && <OfflineIndicator containerStyles={[styles.chatItemComposeSecondaryRow]} />}
+                        {!shouldUseNarrowLayout && <OfflineIndicator containerStyles={[styles.chatItemComposeSecondaryRow]} />}
                         <ReportTypingIndicator reportID={reportID} />
                         {hasExceededMaxCommentLength && <ExceededCommentLength />}
                     </View>
@@ -521,5 +606,5 @@ export default withCurrentUserPersonalDetails(
         },
     })(memo(ReportActionCompose)),
 );
-
+export {onSubmitAction};
 export type {SuggestionsRef, ComposerRef};
diff --git a/src/pages/home/report/ReportActionCompose/SendButton.tsx b/src/pages/home/report/ReportActionCompose/SendButton.tsx
index c505eb0e32e7..e49f85b730e2 100644
--- a/src/pages/home/report/ReportActionCompose/SendButton.tsx
+++ b/src/pages/home/report/ReportActionCompose/SendButton.tsx
@@ -6,6 +6,7 @@ import * as Expensicons from '@components/Icon/Expensicons';
 import PressableWithFeedback from '@components/Pressable/PressableWithFeedback';
 import Tooltip from '@components/Tooltip';
 import useLocalize from '@hooks/useLocalize';
+import useResponsiveLayout from '@hooks/useResponsiveLayout';
 import useTheme from '@hooks/useTheme';
 import useThemeStyles from '@hooks/useThemeStyles';
 import CONST from '@src/CONST';
@@ -22,7 +23,7 @@ function SendButton({isDisabled: isDisabledProp, handleSendMessage}: SendButtonP
     const theme = useTheme();
     const styles = useThemeStyles();
     const {translate} = useLocalize();
-
+    const {isSmallScreenWidth} = useResponsiveLayout();
     const Tap = Gesture.Tap().onEnd(() => {
         handleSendMessage();
     });
@@ -33,25 +34,32 @@ function SendButton({isDisabled: isDisabledProp, handleSendMessage}: SendButtonP
             // Keep focus on the composer when Send message is clicked.
             onMouseDown={(e) => e.preventDefault()}
         >
-            <GestureDetector gesture={Tap}>
-                <Tooltip text={translate('common.send')}>
-                    <PressableWithFeedback
-                        style={({pressed, isDisabled}) => [
-                            styles.chatItemSubmitButton,
-                            isDisabledProp || pressed || isDisabled ? undefined : styles.buttonSuccess,
-                            isDisabledProp ? styles.cursorDisabled : undefined,
-                        ]}
-                        role={CONST.ROLE.BUTTON}
-                        accessibilityLabel={translate('common.send')}
-                    >
-                        {({pressed}) => (
-                            <Icon
-                                src={Expensicons.Send}
-                                fill={isDisabledProp || pressed ? theme.icon : theme.textLight}
-                            />
-                        )}
-                    </PressableWithFeedback>
-                </Tooltip>
+            <GestureDetector
+                // A new GestureDetector instance must be created when switching from a large screen to a small screen
+                // if not, the GestureDetector may not function correctly.
+                key={`send-button-${isSmallScreenWidth ? 'small-screen' : 'normal-screen'}`}
+                gesture={Tap}
+            >
+                <View collapsable={false}>
+                    <Tooltip text={translate('common.send')}>
+                        <PressableWithFeedback
+                            style={({pressed, isDisabled}) => [
+                                styles.chatItemSubmitButton,
+                                isDisabledProp || pressed || isDisabled ? undefined : styles.buttonSuccess,
+                                isDisabledProp ? styles.cursorDisabled : undefined,
+                            ]}
+                            role={CONST.ROLE.BUTTON}
+                            accessibilityLabel={translate('common.send')}
+                        >
+                            {({pressed}) => (
+                                <Icon
+                                    src={Expensicons.Send}
+                                    fill={isDisabledProp || pressed ? theme.icon : theme.textLight}
+                                />
+                            )}
+                        </PressableWithFeedback>
+                    </Tooltip>
+                </View>
             </GestureDetector>
         </View>
     );
diff --git a/src/pages/home/report/ReportActionCompose/SilentCommentUpdater/index.android.tsx b/src/pages/home/report/ReportActionCompose/SilentCommentUpdater/index.android.tsx
index a3eafd3bf128..8df4ba4a0c26 100644
--- a/src/pages/home/report/ReportActionCompose/SilentCommentUpdater/index.android.tsx
+++ b/src/pages/home/report/ReportActionCompose/SilentCommentUpdater/index.android.tsx
@@ -16,7 +16,7 @@ import type {SilentCommentUpdaterOnyxProps, SilentCommentUpdaterProps} from './t
 function SilentCommentUpdater({comment, updateComment}: SilentCommentUpdaterProps) {
     useEffect(() => {
         updateComment(comment ?? '');
-        // eslint-disable-next-line react-hooks/exhaustive-deps -- We need to run this on mount
+        // eslint-disable-next-line react-compiler/react-compiler, react-hooks/exhaustive-deps -- We need to run this on mount
     }, []);
 
     return null;
diff --git a/src/pages/home/report/ReportActionCompose/SilentCommentUpdater/index.tsx b/src/pages/home/report/ReportActionCompose/SilentCommentUpdater/index.tsx
index e1185e17722d..6cce050710c7 100644
--- a/src/pages/home/report/ReportActionCompose/SilentCommentUpdater/index.tsx
+++ b/src/pages/home/report/ReportActionCompose/SilentCommentUpdater/index.tsx
@@ -19,7 +19,7 @@ function SilentCommentUpdater({comment, commentRef, reportID, value, updateComme
     useEffect(() => {
         updateComment(comment ?? '');
 
-        // eslint-disable-next-line react-hooks/exhaustive-deps -- We need to run this on mount
+        // eslint-disable-next-line react-compiler/react-compiler, react-hooks/exhaustive-deps -- We need to run this on mount
     }, []);
 
     useEffect(() => {
diff --git a/src/pages/home/report/ReportActionCompose/SuggestionEmoji.tsx b/src/pages/home/report/ReportActionCompose/SuggestionEmoji.tsx
index b23c0be72592..3051bfb1689e 100644
--- a/src/pages/home/report/ReportActionCompose/SuggestionEmoji.tsx
+++ b/src/pages/home/report/ReportActionCompose/SuggestionEmoji.tsx
@@ -1,6 +1,5 @@
 import type {ForwardedRef, RefAttributes} from 'react';
 import React, {forwardRef, useCallback, useEffect, useImperativeHandle, useRef, useState} from 'react';
-import type {NativeSyntheticEvent, TextInputSelectionChangeEventData} from 'react-native';
 import {withOnyx} from 'react-native-onyx';
 import type {Emoji} from '@assets/emojis/types';
 import EmojiSuggestions from '@components/EmojiSuggestions';
@@ -55,12 +54,14 @@ function SuggestionEmoji(
         updateComment,
         isAutoSuggestionPickerLarge,
         resetKeyboardInput,
-        measureParentContainer,
+        measureParentContainerAndReportCursor,
         isComposerFocused,
     }: SuggestionEmojiProps,
     ref: ForwardedRef<SuggestionsRef>,
 ) {
     const [suggestionValues, setSuggestionValues] = useState(defaultSuggestionsValues);
+    const suggestionValuesRef = useRef(suggestionValues);
+    suggestionValuesRef.current = suggestionValues;
 
     const isEmojiSuggestionsMenuVisible = suggestionValues.suggestedEmojis.length > 0 && suggestionValues.shouldShowSuggestionMenu;
 
@@ -150,15 +151,15 @@ function SuggestionEmoji(
      * Calculates and cares about the content of an Emoji Suggester
      */
     const calculateEmojiSuggestion = useCallback(
-        (selectionEnd: number) => {
-            if (shouldBlockCalc.current || !value) {
+        (newValue: string, selectionStart?: number, selectionEnd?: number) => {
+            if (selectionStart !== selectionEnd || !selectionEnd || shouldBlockCalc.current || !newValue || (selectionStart === 0 && selectionEnd === 0)) {
                 shouldBlockCalc.current = false;
                 resetSuggestions();
                 return;
             }
-            const leftString = value.substring(0, selectionEnd);
+            const leftString = newValue.substring(0, selectionEnd);
             const colonIndex = leftString.lastIndexOf(':');
-            const isCurrentlyShowingEmojiSuggestion = isEmojiCode(value, selectionEnd);
+            const isCurrentlyShowingEmojiSuggestion = isEmojiCode(newValue, selectionEnd);
 
             const nextState: SuggestionsValue = {
                 suggestedEmojis: [],
@@ -172,30 +173,25 @@ function SuggestionEmoji(
                 nextState.shouldShowSuggestionMenu = !isEmptyObject(newSuggestedEmojis);
             }
 
+            // Early return if there is no update
+            const currentState = suggestionValuesRef.current;
+            if (nextState.suggestedEmojis.length === 0 && currentState.suggestedEmojis.length === 0) {
+                return;
+            }
+
             setSuggestionValues((prevState) => ({...prevState, ...nextState}));
             setHighlightedEmojiIndex(0);
         },
-        [value, preferredLocale, setHighlightedEmojiIndex, resetSuggestions],
+        [preferredLocale, setHighlightedEmojiIndex, resetSuggestions],
     );
 
     useEffect(() => {
         if (!isComposerFocused) {
             return;
         }
-        calculateEmojiSuggestion(selection.end);
-    }, [selection, calculateEmojiSuggestion, isComposerFocused]);
-
-    const onSelectionChange = useCallback(
-        (e: NativeSyntheticEvent<TextInputSelectionChangeEventData>) => {
-            /**
-             * we pass here e.nativeEvent.selection.end directly to calculateEmojiSuggestion
-             * because in other case calculateEmojiSuggestion will have an old calculation value
-             * of suggestion instead of current one
-             */
-            calculateEmojiSuggestion(e.nativeEvent.selection.end);
-        },
-        [calculateEmojiSuggestion],
-    );
+
+        calculateEmojiSuggestion(value, selection.start, selection.end);
+    }, [value, selection, calculateEmojiSuggestion, isComposerFocused]);
 
     const setShouldBlockSuggestionCalc = useCallback(
         (shouldBlockSuggestionCalc: boolean) => {
@@ -206,17 +202,19 @@ function SuggestionEmoji(
 
     const getSuggestions = useCallback(() => suggestionValues.suggestedEmojis, [suggestionValues]);
 
+    const getIsSuggestionsMenuVisible = useCallback(() => isEmojiSuggestionsMenuVisible, [isEmojiSuggestionsMenuVisible]);
+
     useImperativeHandle(
         ref,
         () => ({
             resetSuggestions,
-            onSelectionChange,
             triggerHotkeyActions,
             setShouldBlockSuggestionCalc,
             updateShouldShowSuggestionMenuToFalse,
             getSuggestions,
+            getIsSuggestionsMenuVisible,
         }),
-        [onSelectionChange, resetSuggestions, setShouldBlockSuggestionCalc, triggerHotkeyActions, updateShouldShowSuggestionMenuToFalse, getSuggestions],
+        [resetSuggestions, setShouldBlockSuggestionCalc, triggerHotkeyActions, updateShouldShowSuggestionMenuToFalse, getSuggestions, getIsSuggestionsMenuVisible],
     );
 
     if (!isEmojiSuggestionsMenuVisible) {
@@ -231,7 +229,8 @@ function SuggestionEmoji(
             onSelect={insertSelectedEmoji}
             preferredSkinToneIndex={preferredSkinTone}
             isEmojiPickerLarge={!!isAutoSuggestionPickerLarge}
-            measureParentContainer={measureParentContainer}
+            measureParentContainerAndReportCursor={measureParentContainerAndReportCursor}
+            resetSuggestions={resetSuggestions}
         />
     );
 }
diff --git a/src/pages/home/report/ReportActionCompose/SuggestionMention.tsx b/src/pages/home/report/ReportActionCompose/SuggestionMention.tsx
index 05e1163da200..8d37a1915cbd 100644
--- a/src/pages/home/report/ReportActionCompose/SuggestionMention.tsx
+++ b/src/pages/home/report/ReportActionCompose/SuggestionMention.tsx
@@ -1,27 +1,30 @@
-import Str from 'expensify-common/lib/str';
+import {Str} from 'expensify-common';
+import lodashMapValues from 'lodash/mapValues';
 import lodashSortBy from 'lodash/sortBy';
 import type {ForwardedRef} from 'react';
-import React, {forwardRef, useCallback, useEffect, useImperativeHandle, useRef, useState} from 'react';
-import {useOnyx} from 'react-native-onyx';
+import React, {forwardRef, useCallback, useEffect, useImperativeHandle, useMemo, useRef, useState} from 'react';
 import type {OnyxCollection} from 'react-native-onyx';
+import {useOnyx} from 'react-native-onyx';
 import * as Expensicons from '@components/Icon/Expensicons';
 import type {Mention} from '@components/MentionSuggestions';
 import MentionSuggestions from '@components/MentionSuggestions';
 import {usePersonalDetails} from '@components/OnyxProvider';
 import useArrowKeyFocusManager from '@hooks/useArrowKeyFocusManager';
+import useCurrentReportID from '@hooks/useCurrentReportID';
 import useCurrentUserPersonalDetails from '@hooks/useCurrentUserPersonalDetails';
 import useDebounce from '@hooks/useDebounce';
 import useLocalize from '@hooks/useLocalize';
+import localeCompare from '@libs/LocaleCompare';
 import * as LoginUtils from '@libs/LoginUtils';
 import * as PersonalDetailsUtils from '@libs/PersonalDetailsUtils';
+import getPolicyEmployeeAccountIDs from '@libs/PolicyEmployeeListUtils';
 import * as ReportUtils from '@libs/ReportUtils';
 import * as SuggestionsUtils from '@libs/SuggestionUtils';
-import * as UserUtils from '@libs/UserUtils';
 import {isValidRoomName} from '@libs/ValidationUtils';
 import * as ReportUserActions from '@userActions/Report';
 import CONST from '@src/CONST';
 import ONYXKEYS from '@src/ONYXKEYS';
-import type {PersonalDetailsList, Report} from '@src/types/onyx';
+import type {PersonalDetails, PersonalDetailsList, Report} from '@src/types/onyx';
 import type {SuggestionsRef} from './ReportActionCompose';
 import type {SuggestionProps} from './Suggestions';
 
@@ -46,19 +49,83 @@ const defaultSuggestionsValues: SuggestionValues = {
     prefixType: '',
 };
 
+type SuggestionPersonalDetailsList = Record<
+    string,
+    | (PersonalDetails & {
+          weight: number;
+      })
+    | null
+>;
+
+function getDisplayName(details: PersonalDetails) {
+    const displayNameFromAccountID = ReportUtils.getDisplayNameForParticipant(details.accountID);
+    if (!displayNameFromAccountID) {
+        return details.login?.length ? details.login : '';
+    }
+    return displayNameFromAccountID;
+}
+
+/**
+ * Comparison function to sort users. It compares weights, display names, and accountIDs in that order
+ */
+function compareUserInList(first: PersonalDetails & {weight: number}, second: PersonalDetails & {weight: number}) {
+    if (first.weight !== second.weight) {
+        return first.weight - second.weight;
+    }
+
+    const displayNameLoginOrder = localeCompare(getDisplayName(first), getDisplayName(second));
+    if (displayNameLoginOrder !== 0) {
+        return displayNameLoginOrder;
+    }
+
+    return first.accountID - second.accountID;
+}
+
 function SuggestionMention(
-    {value, selection, setSelection, updateComment, isAutoSuggestionPickerLarge, measureParentContainer, isComposerFocused, isGroupPolicyReport, policyID}: SuggestionProps,
+    {value, selection, setSelection, updateComment, isAutoSuggestionPickerLarge, measureParentContainerAndReportCursor, isComposerFocused, isGroupPolicyReport, policyID}: SuggestionProps,
     ref: ForwardedRef<SuggestionsRef>,
 ) {
     const personalDetails = usePersonalDetails() ?? CONST.EMPTY_OBJECT;
     const {translate, formatPhoneNumber} = useLocalize();
     const [suggestionValues, setSuggestionValues] = useState(defaultSuggestionsValues);
+    const suggestionValuesRef = useRef(suggestionValues);
+    suggestionValuesRef.current = suggestionValues;
 
     const [reports] = useOnyx(ONYXKEYS.COLLECTION.REPORT);
 
     const currentUserPersonalDetails = useCurrentUserPersonalDetails();
     const isMentionSuggestionsMenuVisible = !!suggestionValues.suggestedMentions.length && suggestionValues.shouldShowSuggestionMenu;
 
+    const currentReportID = useCurrentReportID();
+    const currentReport = reports?.[`${ONYXKEYS.COLLECTION.REPORT}${currentReportID?.currentReportID}`];
+    // Smaller weight means higher order in suggestion list
+    const getPersonalDetailsWeight = useCallback(
+        (detail: PersonalDetails, policyEmployeeAccountIDs: number[]): number => {
+            if (ReportUtils.isReportParticipant(detail.accountID, currentReport)) {
+                return 0;
+            }
+            if (policyEmployeeAccountIDs.includes(detail.accountID)) {
+                return 1;
+            }
+            return 2;
+        },
+        [currentReport],
+    );
+    const weightedPersonalDetails: PersonalDetailsList | SuggestionPersonalDetailsList = useMemo(() => {
+        const policyEmployeeAccountIDs = getPolicyEmployeeAccountIDs(policyID);
+        if (!ReportUtils.isGroupChat(currentReport) && !ReportUtils.doesReportBelongToWorkspace(currentReport, policyEmployeeAccountIDs, policyID)) {
+            return personalDetails;
+        }
+        return lodashMapValues(personalDetails, (detail) =>
+            detail
+                ? {
+                      ...detail,
+                      weight: getPersonalDetailsWeight(detail, policyEmployeeAccountIDs),
+                  }
+                : null,
+        );
+    }, [policyID, currentReport, personalDetails, getPersonalDetailsWeight]);
+
     const [highlightedMentionIndex, setHighlightedMentionIndex] = useArrowKeyFocusManager({
         isActive: isMentionSuggestionsMenuVisible,
         maxIndex: suggestionValues.suggestedMentions.length - 1,
@@ -191,7 +258,7 @@ function SuggestionMention(
     );
 
     const getUserMentionOptions = useCallback(
-        (personalDetailsParam: PersonalDetailsList, searchValue = ''): Mention[] => {
+        (personalDetailsParam: PersonalDetailsList | SuggestionPersonalDetailsList, searchValue = ''): Mention[] => {
             const suggestions = [];
 
             if (CONST.AUTO_COMPLETE_SUGGESTER.HERE_TEXT.includes(searchValue.toLowerCase())) {
@@ -230,10 +297,11 @@ function SuggestionMention(
                 }
 
                 return true;
-            });
+            }) as Array<PersonalDetails & {weight: number}>;
+
+            // At this point we are sure that the details are not null, since empty user details have been filtered in the previous step
+            const sortedPersonalDetails = filteredPersonalDetails.sort(compareUserInList);
 
-            // eslint-disable-next-line @typescript-eslint/prefer-nullish-coalescing -- nullish coalescing cannot be used if left side can be empty string
-            const sortedPersonalDetails = lodashSortBy(filteredPersonalDetails, (detail) => detail?.displayName || detail?.login);
             sortedPersonalDetails.slice(0, CONST.AUTO_COMPLETE_SUGGESTER.MAX_AMOUNT_OF_SUGGESTIONS - suggestions.length).forEach((detail) => {
                 suggestions.push({
                     text: formatLoginPrivateDomain(PersonalDetailsUtils.getDisplayNameOrDefault(detail), detail?.login),
@@ -242,9 +310,10 @@ function SuggestionMention(
                     icons: [
                         {
                             name: detail?.login,
-                            source: UserUtils.getAvatar(detail?.avatar, detail?.accountID),
+                            source: detail?.avatar ?? Expensicons.FallbackAvatar,
                             type: CONST.ICON_TYPE_AVATAR,
                             fallbackIcon: detail?.fallbackIcon,
+                            id: detail?.accountID,
                         },
                     ],
                 });
@@ -259,7 +328,7 @@ function SuggestionMention(
         (searchTerm: string, reportBatch: OnyxCollection<Report>): Mention[] => {
             const filteredRoomMentions: Mention[] = [];
             Object.values(reportBatch ?? {}).forEach((report) => {
-                if (!ReportUtils.canReportBeMentionedWithinPolicy(report, policyID ?? '')) {
+                if (!ReportUtils.canReportBeMentionedWithinPolicy(report, policyID ?? '-1')) {
                     return;
                 }
                 if (report?.reportName?.toLowerCase().includes(searchTerm.toLowerCase())) {
@@ -277,15 +346,15 @@ function SuggestionMention(
     );
 
     const calculateMentionSuggestion = useCallback(
-        (selectionEnd: number) => {
-            if (shouldBlockCalc.current || selectionEnd < 1 || !isComposerFocused) {
+        (newValue: string, selectionStart?: number, selectionEnd?: number) => {
+            if (selectionEnd !== selectionStart || !selectionEnd || shouldBlockCalc.current || selectionEnd < 1 || !isComposerFocused) {
                 shouldBlockCalc.current = false;
                 resetSuggestions();
                 return;
             }
 
-            const afterLastBreakLineIndex = value.lastIndexOf('\n', selectionEnd - 1) + 1;
-            const leftString = value.substring(afterLastBreakLineIndex, selectionEnd);
+            const afterLastBreakLineIndex = newValue.lastIndexOf('\n', selectionEnd - 1) + 1;
+            const leftString = newValue.substring(afterLastBreakLineIndex, selectionEnd);
             const words = leftString.split(CONST.REGEX.SPACE_OR_EMOJI);
             const lastWord: string = words.at(-1) ?? '';
             const secondToLastWord = words[words.length - 3];
@@ -320,7 +389,7 @@ function SuggestionMention(
             };
 
             if (isMentionCode(suggestionWord) && prefixType === '@') {
-                const suggestions = getUserMentionOptions(personalDetails, prefix);
+                const suggestions = getUserMentionOptions(weightedPersonalDetails, prefix);
                 nextState.suggestedMentions = suggestions;
                 nextState.shouldShowSuggestionMenu = !!suggestions.length;
             }
@@ -334,18 +403,24 @@ function SuggestionMention(
                 nextState.shouldShowSuggestionMenu = true;
             }
 
+            // Early return if there is no update
+            const currentState = suggestionValuesRef.current;
+            if (currentState.suggestedMentions.length === 0 && nextState.suggestedMentions?.length === 0) {
+                return;
+            }
+
             setSuggestionValues((prevState) => ({
                 ...prevState,
                 ...nextState,
             }));
             setHighlightedMentionIndex(0);
         },
-        [isComposerFocused, value, isGroupPolicyReport, setHighlightedMentionIndex, resetSuggestions, getUserMentionOptions, personalDetails, getRoomMentionOptions, reports],
+        [isComposerFocused, isGroupPolicyReport, setHighlightedMentionIndex, resetSuggestions, getUserMentionOptions, weightedPersonalDetails, getRoomMentionOptions, reports],
     );
 
     useEffect(() => {
-        calculateMentionSuggestion(selection.end);
-    }, [selection, calculateMentionSuggestion]);
+        calculateMentionSuggestion(value, selection.start, selection.end);
+    }, [value, selection, calculateMentionSuggestion]);
 
     useEffect(() => {
         debouncedSearchInServer();
@@ -368,6 +443,7 @@ function SuggestionMention(
     );
 
     const getSuggestions = useCallback(() => suggestionValues.suggestedMentions, [suggestionValues]);
+    const getIsSuggestionsMenuVisible = useCallback(() => isMentionSuggestionsMenuVisible, [isMentionSuggestionsMenuVisible]);
 
     useImperativeHandle(
         ref,
@@ -377,8 +453,9 @@ function SuggestionMention(
             setShouldBlockSuggestionCalc,
             updateShouldShowSuggestionMenuToFalse,
             getSuggestions,
+            getIsSuggestionsMenuVisible,
         }),
-        [resetSuggestions, setShouldBlockSuggestionCalc, triggerHotkeyActions, updateShouldShowSuggestionMenuToFalse, getSuggestions],
+        [resetSuggestions, setShouldBlockSuggestionCalc, triggerHotkeyActions, updateShouldShowSuggestionMenuToFalse, getSuggestions, getIsSuggestionsMenuVisible],
     );
 
     if (!isMentionSuggestionsMenuVisible) {
@@ -392,7 +469,8 @@ function SuggestionMention(
             prefix={suggestionValues.mentionPrefix}
             onSelect={insertSelectedMention}
             isMentionPickerLarge={!!isAutoSuggestionPickerLarge}
-            measureParentContainer={measureParentContainer}
+            measureParentContainerAndReportCursor={measureParentContainerAndReportCursor}
+            resetSuggestions={resetSuggestions}
         />
     );
 }
@@ -400,3 +478,5 @@ function SuggestionMention(
 SuggestionMention.displayName = 'SuggestionMention';
 
 export default forwardRef(SuggestionMention);
+
+export {compareUserInList};
diff --git a/src/pages/home/report/ReportActionCompose/Suggestions.tsx b/src/pages/home/report/ReportActionCompose/Suggestions.tsx
index 8ebd52f62428..8b7171340b63 100644
--- a/src/pages/home/report/ReportActionCompose/Suggestions.tsx
+++ b/src/pages/home/report/ReportActionCompose/Suggestions.tsx
@@ -1,39 +1,30 @@
 import type {ForwardedRef} from 'react';
 import React, {forwardRef, useCallback, useContext, useEffect, useImperativeHandle, useRef} from 'react';
-import type {MeasureInWindowOnSuccessCallback, NativeSyntheticEvent, TextInputSelectionChangeEventData} from 'react-native';
+import type {NativeSyntheticEvent, TextInputSelectionChangeEventData} from 'react-native';
 import {View} from 'react-native';
+import type {MeasureParentContainerAndCursorCallback} from '@components/AutoCompleteSuggestions/types';
+import type {TextSelection} from '@components/Composer/types';
 import {DragAndDropContext} from '@components/DragAndDrop/Provider';
 import usePrevious from '@hooks/usePrevious';
 import type {SuggestionsRef} from './ReportActionCompose';
 import SuggestionEmoji from './SuggestionEmoji';
 import SuggestionMention from './SuggestionMention';
 
-type Selection = {
-    start: number;
-    end: number;
-};
-
 type SuggestionProps = {
     /** The current input value */
     value: string;
 
-    /** Callback to update the current input value */
-    setValue: (newValue: string) => void;
-
     /** The current selection value */
-    selection: Selection;
+    selection: TextSelection;
 
     /** Callback to update the current selection */
-    setSelection: (newSelection: Selection) => void;
+    setSelection: (newSelection: TextSelection) => void;
 
     /** Callback to update the comment draft */
     updateComment: (newComment: string, shouldDebounceSaveComment?: boolean) => void;
 
-    /** Meaures the parent container's position and dimensions. */
-    measureParentContainer: (callback: MeasureInWindowOnSuccessCallback) => void;
-
-    /** Whether the composer is expanded */
-    isComposerFullSize: boolean;
+    /** Measures the parent container's position and dimensions. Also add cursor coordinates */
+    measureParentContainerAndReportCursor: (callback: MeasureParentContainerAndCursorCallback) => void;
 
     /** Report composer focus state */
     isComposerFocused?: boolean;
@@ -61,15 +52,12 @@ type SuggestionProps = {
  */
 function Suggestions(
     {
-        isComposerFullSize,
         value,
-        setValue,
         selection,
         setSelection,
         updateComment,
-        composerHeight,
         resetKeyboardInput,
-        measureParentContainer,
+        measureParentContainerAndReportCursor,
         isAutoSuggestionPickerLarge = true,
         isComposerFocused,
         isGroupPolicyReport,
@@ -119,6 +107,7 @@ function Suggestions(
 
     const onSelectionChange = useCallback((e: NativeSyntheticEvent<TextInputSelectionChangeEventData>) => {
         const emojiHandler = suggestionEmojiRef.current?.onSelectionChange?.(e);
+        suggestionMentionRef.current?.onSelectionChange?.(e);
         return emojiHandler;
     }, []);
 
@@ -131,6 +120,11 @@ function Suggestions(
         suggestionEmojiRef.current?.setShouldBlockSuggestionCalc(shouldBlock);
         suggestionMentionRef.current?.setShouldBlockSuggestionCalc(shouldBlock);
     }, []);
+    const getIsSuggestionsMenuVisible = useCallback((): boolean => {
+        const isEmojiVisible = suggestionEmojiRef.current?.getIsSuggestionsMenuVisible() ?? false;
+        const isSuggestionVisible = suggestionMentionRef.current?.getIsSuggestionsMenuVisible() ?? false;
+        return isEmojiVisible || isSuggestionVisible;
+    }, []);
 
     useImperativeHandle(
         ref,
@@ -141,8 +135,9 @@ function Suggestions(
             updateShouldShowSuggestionMenuToFalse,
             setShouldBlockSuggestionCalc,
             getSuggestions,
+            getIsSuggestionsMenuVisible,
         }),
-        [onSelectionChange, resetSuggestions, setShouldBlockSuggestionCalc, triggerHotkeyActions, updateShouldShowSuggestionMenuToFalse, getSuggestions],
+        [onSelectionChange, resetSuggestions, setShouldBlockSuggestionCalc, triggerHotkeyActions, updateShouldShowSuggestionMenuToFalse, getSuggestions, getIsSuggestionsMenuVisible],
     );
 
     useEffect(() => {
@@ -154,14 +149,11 @@ function Suggestions(
 
     const baseProps = {
         value,
-        setValue,
         setSelection,
         selection,
-        isComposerFullSize,
         updateComment,
-        composerHeight,
         isAutoSuggestionPickerLarge,
-        measureParentContainer,
+        measureParentContainerAndReportCursor,
         isComposerFocused,
         isGroupPolicyReport,
         policyID,
diff --git a/src/pages/home/report/ReportActionCompose/getCursorPosition/index.native.ts b/src/pages/home/report/ReportActionCompose/getCursorPosition/index.native.ts
new file mode 100644
index 000000000000..5107e2c37362
--- /dev/null
+++ b/src/pages/home/report/ReportActionCompose/getCursorPosition/index.native.ts
@@ -0,0 +1,10 @@
+import type {CursorPositionParamsType, PositionType} from './types';
+
+function getCursorPosition({positionOnMobile}: CursorPositionParamsType): PositionType {
+    return {
+        x: positionOnMobile?.x ?? 0,
+        y: positionOnMobile?.y ?? 0,
+    };
+}
+
+export default getCursorPosition;
diff --git a/src/pages/home/report/ReportActionCompose/getCursorPosition/index.ts b/src/pages/home/report/ReportActionCompose/getCursorPosition/index.ts
new file mode 100644
index 000000000000..e1619b4cd45c
--- /dev/null
+++ b/src/pages/home/report/ReportActionCompose/getCursorPosition/index.ts
@@ -0,0 +1,9 @@
+import type {CursorPositionParamsType, PositionType} from './types';
+
+function getCursorPosition({positionOnWeb}: CursorPositionParamsType): PositionType {
+    const x = positionOnWeb?.positionX ?? 0;
+    const y = positionOnWeb?.positionY ?? 0;
+    return {x, y};
+}
+
+export default getCursorPosition;
diff --git a/src/pages/home/report/ReportActionCompose/getCursorPosition/types.ts b/src/pages/home/report/ReportActionCompose/getCursorPosition/types.ts
new file mode 100644
index 000000000000..424e71377ecd
--- /dev/null
+++ b/src/pages/home/report/ReportActionCompose/getCursorPosition/types.ts
@@ -0,0 +1,13 @@
+type PositionType = {
+    x: number;
+    y: number;
+};
+
+type CursorPositionParamsType = {
+    positionOnMobile?: PositionType;
+    positionOnWeb?: {positionX?: number; positionY?: number};
+};
+
+type GetCursorPositionType = (params: CursorPositionParamsType) => PositionType;
+
+export type {PositionType, CursorPositionParamsType, GetCursorPositionType};
diff --git a/src/pages/home/report/ReportActionCompose/getScrollPosition/index.native.ts b/src/pages/home/report/ReportActionCompose/getScrollPosition/index.native.ts
new file mode 100644
index 000000000000..2045549959b8
--- /dev/null
+++ b/src/pages/home/report/ReportActionCompose/getScrollPosition/index.native.ts
@@ -0,0 +1,14 @@
+import type {GetScrollPositionType, TextInputScrollProps} from './types';
+
+function getScrollPosition({mobileInputScrollPosition}: TextInputScrollProps): GetScrollPositionType {
+    if (!mobileInputScrollPosition.current) {
+        return {
+            scrollValue: 0,
+        };
+    }
+    return {
+        scrollValue: mobileInputScrollPosition.current,
+    };
+}
+
+export default getScrollPosition;
diff --git a/src/pages/home/report/ReportActionCompose/getScrollPosition/index.ts b/src/pages/home/report/ReportActionCompose/getScrollPosition/index.ts
new file mode 100644
index 000000000000..0d9fb701cabd
--- /dev/null
+++ b/src/pages/home/report/ReportActionCompose/getScrollPosition/index.ts
@@ -0,0 +1,13 @@
+import type {GetScrollPositionType, TextInputScrollProps} from './types';
+
+function getScrollPosition({textInputRef}: TextInputScrollProps): GetScrollPositionType {
+    let scrollValue = 0;
+    if (textInputRef?.current) {
+        if ('scrollTop' in textInputRef.current) {
+            scrollValue = textInputRef.current.scrollTop;
+        }
+    }
+    return {scrollValue};
+}
+
+export default getScrollPosition;
diff --git a/src/pages/home/report/ReportActionCompose/getScrollPosition/types.ts b/src/pages/home/report/ReportActionCompose/getScrollPosition/types.ts
new file mode 100644
index 000000000000..abb48e2cc079
--- /dev/null
+++ b/src/pages/home/report/ReportActionCompose/getScrollPosition/types.ts
@@ -0,0 +1,10 @@
+import type {TextInput} from 'react-native';
+
+type TextInputScrollProps = {
+    mobileInputScrollPosition: React.RefObject<number>;
+    textInputRef: React.RefObject<HTMLDivElement | TextInput>;
+};
+
+type GetScrollPositionType = {scrollValue: number};
+
+export type {TextInputScrollProps, GetScrollPositionType};
diff --git a/src/pages/home/report/ReportActionItem.tsx b/src/pages/home/report/ReportActionItem.tsx
index 5697807ca825..bd19dff42038 100644
--- a/src/pages/home/report/ReportActionItem.tsx
+++ b/src/pages/home/report/ReportActionItem.tsx
@@ -2,9 +2,10 @@ import lodashIsEqual from 'lodash/isEqual';
 import React, {memo, useCallback, useContext, useEffect, useMemo, useRef, useState} from 'react';
 import type {GestureResponderEvent, TextInput} from 'react-native';
 import {InteractionManager, View} from 'react-native';
-import type {OnyxCollection, OnyxEntry} from 'react-native-onyx';
-import {withOnyx} from 'react-native-onyx';
+import type {OnyxEntry} from 'react-native-onyx';
+import {useOnyx, withOnyx} from 'react-native-onyx';
 import type {Emoji} from '@assets/emojis/types';
+import {AttachmentContext} from '@components/AttachmentContext';
 import Button from '@components/Button';
 import DisplayNames from '@components/DisplayNames';
 import Hoverable from '@components/Hoverable';
@@ -13,32 +14,30 @@ import * as Expensicons from '@components/Icon/Expensicons';
 import InlineSystemMessage from '@components/InlineSystemMessage';
 import KYCWall from '@components/KYCWall';
 import OfflineWithFeedback from '@components/OfflineWithFeedback';
-import {useBlockedFromConcierge, usePersonalDetails, useReportActionsDrafts} from '@components/OnyxProvider';
+import {useBlockedFromConcierge, usePersonalDetails} from '@components/OnyxProvider';
 import PressableWithSecondaryInteraction from '@components/PressableWithSecondaryInteraction';
 import ReportActionItemEmojiReactions from '@components/Reactions/ReportActionItemEmojiReactions';
 import RenderHTML from '@components/RenderHTML';
 import type {ActionableItem} from '@components/ReportActionItem/ActionableItemButtons';
 import ActionableItemButtons from '@components/ReportActionItem/ActionableItemButtons';
 import ChronosOOOListActions from '@components/ReportActionItem/ChronosOOOListActions';
-import MoneyReportView from '@components/ReportActionItem/MoneyReportView';
+import ExportIntegration from '@components/ReportActionItem/ExportIntegration';
+import IssueCardMessage from '@components/ReportActionItem/IssueCardMessage';
 import MoneyRequestAction from '@components/ReportActionItem/MoneyRequestAction';
-import MoneyRequestView from '@components/ReportActionItem/MoneyRequestView';
-import RenameAction from '@components/ReportActionItem/RenameAction';
 import ReportPreview from '@components/ReportActionItem/ReportPreview';
 import TaskAction from '@components/ReportActionItem/TaskAction';
 import TaskPreview from '@components/ReportActionItem/TaskPreview';
-import TaskView from '@components/ReportActionItem/TaskView';
+import TripRoomPreview from '@components/ReportActionItem/TripRoomPreview';
 import {ShowContextMenuContext} from '@components/ShowContextMenuContext';
-import SpacerView from '@components/SpacerView';
 import Text from '@components/Text';
 import UnreadActionIndicator from '@components/UnreadActionIndicator';
 import useLocalize from '@hooks/useLocalize';
 import usePrevious from '@hooks/usePrevious';
 import useReportScrollManager from '@hooks/useReportScrollManager';
+import useResponsiveLayout from '@hooks/useResponsiveLayout';
 import useStyleUtils from '@hooks/useStyleUtils';
 import useTheme from '@hooks/useTheme';
 import useThemeStyles from '@hooks/useThemeStyles';
-import useWindowDimensions from '@hooks/useWindowDimensions';
 import ControlSelection from '@libs/ControlSelection';
 import * as DeviceCapabilities from '@libs/DeviceCapabilities';
 import * as ErrorUtils from '@libs/ErrorUtils';
@@ -47,33 +46,34 @@ import ModifiedExpenseMessage from '@libs/ModifiedExpenseMessage';
 import Navigation from '@libs/Navigation/Navigation';
 import Permissions from '@libs/Permissions';
 import * as PersonalDetailsUtils from '@libs/PersonalDetailsUtils';
+import * as PolicyUtils from '@libs/PolicyUtils';
 import * as ReportActionsUtils from '@libs/ReportActionsUtils';
 import * as ReportUtils from '@libs/ReportUtils';
 import SelectionScraper from '@libs/SelectionScraper';
-import * as TransactionUtils from '@libs/TransactionUtils';
+import shouldRenderAddPaymentCard from '@libs/shouldRenderAppPaymentCard';
 import {ReactionListContext} from '@pages/home/ReportScreenContext';
 import * as BankAccounts from '@userActions/BankAccounts';
 import * as EmojiPickerAction from '@userActions/EmojiPickerAction';
-import * as Policy from '@userActions/Policy';
+import * as Member from '@userActions/Policy/Member';
 import * as Report from '@userActions/Report';
 import * as ReportActions from '@userActions/ReportActions';
 import * as Session from '@userActions/Session';
+import * as Transaction from '@userActions/Transaction';
 import * as User from '@userActions/User';
 import CONST from '@src/CONST';
-import type {TranslationPaths} from '@src/languages/types';
 import ONYXKEYS from '@src/ONYXKEYS';
 import ROUTES from '@src/ROUTES';
 import type * as OnyxTypes from '@src/types/onyx';
-import type {OriginalMessageActionableMentionWhisper, OriginalMessageActionableTrackedExpenseWhisper, OriginalMessageJoinPolicyChangeLog} from '@src/types/onyx/OriginalMessage';
+import type {Errors} from '@src/types/onyx/OnyxCommon';
+import type {JoinWorkspaceResolution} from '@src/types/onyx/OriginalMessage';
 import {isEmptyObject} from '@src/types/utils/EmptyObject';
-import AnimatedEmptyStateBackground from './AnimatedEmptyStateBackground';
 import {RestrictedReadOnlyContextMenuActions} from './ContextMenu/ContextMenuActions';
 import MiniReportActionContextMenu from './ContextMenu/MiniReportActionContextMenu';
 import * as ReportActionContextMenu from './ContextMenu/ReportActionContextMenu';
 import {hideContextMenu} from './ContextMenu/ReportActionContextMenu';
 import LinkPreviewer from './LinkPreviewer';
 import ReportActionItemBasicMessage from './ReportActionItemBasicMessage';
-import ReportActionItemCreated from './ReportActionItemCreated';
+import ReportActionItemContentCreated from './ReportActionItemContentCreated';
 import ReportActionItemDraft from './ReportActionItemDraft';
 import ReportActionItemGrouped from './ReportActionItemGrouped';
 import ReportActionItemMessage from './ReportActionItemMessage';
@@ -82,17 +82,7 @@ import ReportActionItemSingle from './ReportActionItemSingle';
 import ReportActionItemThread from './ReportActionItemThread';
 import ReportAttachmentsContext from './ReportAttachmentsContext';
 
-const getDraftMessage = (drafts: OnyxCollection<OnyxTypes.ReportActionsDrafts>, reportID: string, action: OnyxTypes.ReportAction): string | undefined => {
-    const originalReportID = ReportUtils.getOriginalReportID(reportID, action);
-    const draftKey = `${ONYXKEYS.COLLECTION.REPORT_ACTIONS_DRAFTS}${originalReportID}`;
-    const draftMessage = drafts?.[draftKey]?.[action.reportActionID];
-    return typeof draftMessage === 'string' ? draftMessage : draftMessage?.message;
-};
-
 type ReportActionItemOnyxProps = {
-    /** Stores user's preferred skin tone */
-    preferredSkinTone: OnyxEntry<string | number>;
-
     /** IOU report for this action, if any */
     iouReport: OnyxEntry<OnyxTypes.Report>;
 
@@ -101,11 +91,8 @@ type ReportActionItemOnyxProps = {
     /** The user's wallet account */
     userWallet: OnyxEntry<OnyxTypes.UserWallet>;
 
-    /** The policy which the user has access to and which the report is tied to */
-    policy: OnyxEntry<OnyxTypes.Policy>;
-
-    /** Transaction associated with this report, if any */
-    transaction: OnyxEntry<OnyxTypes.Transaction>;
+    /** The transaction (linked with the report action) route error */
+    linkedTransactionRouteError: NonNullable<OnyxEntry<Errors>> | null;
 };
 
 type ReportActionItemProps = {
@@ -113,7 +100,7 @@ type ReportActionItemProps = {
     report: OnyxTypes.Report;
 
     /** The transaction thread report associated with the report for this action, if any */
-    transactionThreadReport: OnyxEntry<OnyxTypes.Report>;
+    transactionThreadReport?: OnyxEntry<OnyxTypes.Report>;
 
     /** Array of report actions for the report for this action */
     // eslint-disable-next-line react/no-unused-prop-types
@@ -158,10 +145,12 @@ type ReportActionItemProps = {
 
     /** IF the thread divider line will be used */
     shouldUseThreadDividerLine?: boolean;
-} & ReportActionItemOnyxProps;
 
-const isIOUReport = (actionObj: OnyxEntry<OnyxTypes.ReportAction>): actionObj is OnyxTypes.ReportActionBase & OnyxTypes.OriginalMessageIOU =>
-    actionObj?.actionName === CONST.REPORT.ACTIONS.TYPE.IOU;
+    hideThreadReplies?: boolean;
+
+    /** Whether context menu should be displayed */
+    shouldDisplayContextMenu?: boolean;
+} & ReportActionItemOnyxProps;
 
 function ReportActionItem({
     action,
@@ -174,42 +163,55 @@ function ReportActionItem({
     iouReport,
     isMostRecentIOUReportAction,
     parentReportAction,
-    preferredSkinTone = CONST.EMOJI_DEFAULT_SKIN_TONE,
     shouldDisplayNewMarker,
     userWallet,
     shouldHideThreadDividerLine = false,
     shouldShowSubscriptAvatar = false,
-    policy,
-    transaction,
     onPress = undefined,
     isFirstVisibleReportAction = false,
     shouldUseThreadDividerLine = false,
+    linkedTransactionRouteError,
+    hideThreadReplies = false,
+    shouldDisplayContextMenu = true,
+    parentReportActionForTransactionThread,
 }: ReportActionItemProps) {
     const {translate} = useLocalize();
-    const {isSmallScreenWidth} = useWindowDimensions();
+    const {shouldUseNarrowLayout} = useResponsiveLayout();
     const blockedFromConcierge = useBlockedFromConcierge();
-    const reportActionDrafts = useReportActionsDrafts();
-    const draftMessage = useMemo(() => getDraftMessage(reportActionDrafts, report.reportID, action), [action, report.reportID, reportActionDrafts]);
+    // eslint-disable-next-line @typescript-eslint/prefer-nullish-coalescing
+    const originalReportID = useMemo(() => ReportUtils.getOriginalReportID(report.reportID, action) || '-1', [report.reportID, action]);
+    const [draftMessage] = useOnyx(`${ONYXKEYS.COLLECTION.REPORT_ACTIONS_DRAFTS}${originalReportID}`, {
+        selector: (draftMessagesForReport) => {
+            const matchingDraftMessage = draftMessagesForReport?.[action.reportActionID];
+            return typeof matchingDraftMessage === 'string' ? matchingDraftMessage : matchingDraftMessage?.message;
+        },
+    });
     const theme = useTheme();
     const styles = useThemeStyles();
+    const [reportNameValuePairs] = useOnyx(`${ONYXKEYS.COLLECTION.REPORT_NAME_VALUE_PAIRS}${report?.reportID ?? -1}`);
     const StyleUtils = useStyleUtils();
     const personalDetails = usePersonalDetails() || CONST.EMPTY_OBJECT;
     const [isContextMenuActive, setIsContextMenuActive] = useState(() => ReportActionContextMenu.isActiveReportAction(action.reportActionID));
     const [isEmojiPickerActive, setIsEmojiPickerActive] = useState<boolean | undefined>();
+    const [isPaymentMethodPopoverActive, setIsPaymentMethodPopoverActive] = useState<boolean | undefined>();
 
     const [isHidden, setIsHidden] = useState(false);
     const [moderationDecision, setModerationDecision] = useState<OnyxTypes.DecisionName>(CONST.MODERATION.MODERATOR_DECISION_APPROVED);
     const reactionListRef = useContext(ReactionListContext);
     const {updateHiddenAttachments} = useContext(ReportAttachmentsContext);
-    const textInputRef = useRef<TextInput & HTMLTextAreaElement>();
+    const textInputRef = useRef<TextInput | HTMLTextAreaElement>();
     const popoverAnchorRef = useRef<Exclude<ReportActionContextMenu.ContextMenuAnchor, TextInput>>(null);
     const downloadedPreviews = useRef<string[]>([]);
     const prevDraftMessage = usePrevious(draftMessage);
-    const originalReportID = ReportUtils.getOriginalReportID(report.reportID, action);
-    const originalReport = report.reportID === originalReportID ? report : ReportUtils.getReport(originalReportID);
+
+    // The app would crash due to subscribing to the entire report collection if parentReportID is an empty string. So we should have a fallback ID here.
+    // eslint-disable-next-line @typescript-eslint/prefer-nullish-coalescing
+    const [parentReport] = useOnyx(`${ONYXKEYS.COLLECTION.REPORT}${report.parentReportID || -1}`);
     const isReportActionLinked = linkedReportActionID && action.reportActionID && linkedReportActionID === action.reportActionID;
-    const transactionCurrency = TransactionUtils.getCurrency(transaction);
     const reportScrollManager = useReportScrollManager();
+    const isActionableWhisper =
+        ReportActionsUtils.isActionableMentionWhisper(action) || ReportActionsUtils.isActionableTrackExpense(action) || ReportActionsUtils.isActionableReportMentionWhisper(action);
+    const originalMessage = ReportActionsUtils.getOriginalMessage(action);
 
     const highlightedBackgroundColorIfNeeded = useMemo(
         () => (isReportActionLinked ? StyleUtils.getBackgroundColorStyle(theme.messageHighlightBG) : {}),
@@ -217,15 +219,21 @@ function ReportActionItem({
     );
 
     const isDeletedParentAction = ReportActionsUtils.isDeletedParentAction(action);
-    const prevActionResolution = usePrevious(ReportActionsUtils.isActionableMentionWhisper(action) ? action.originalMessage.resolution : null);
+    const isOriginalMessageAnObject = originalMessage && typeof originalMessage === 'object';
+    const hasResolutionInOriginalMessage = isOriginalMessageAnObject && 'resolution' in originalMessage;
+    const prevActionResolution = usePrevious(isActionableWhisper && hasResolutionInOriginalMessage ? originalMessage?.resolution : null);
 
     // IOUDetails only exists when we are sending money
-    const isSendingMoney = isIOUReport(action) && action.originalMessage.type === CONST.IOU.REPORT_ACTION_TYPE.PAY && action.originalMessage.IOUDetails;
+    const isSendingMoney =
+        ReportActionsUtils.isMoneyRequestAction(action) &&
+        ReportActionsUtils.getOriginalMessage(action)?.type === CONST.IOU.REPORT_ACTION_TYPE.PAY &&
+        ReportActionsUtils.getOriginalMessage(action)?.IOUDetails;
 
     const updateHiddenState = useCallback(
         (isHiddenValue: boolean) => {
             setIsHidden(isHiddenValue);
-            const isAttachment = ReportUtils.isReportMessageAttachment(action.message?.at(-1));
+            const message = Array.isArray(action.message) ? action.message?.at(-1) : action.message;
+            const isAttachment = ReportUtils.isReportMessageAttachment(message);
             if (!isAttachment) {
                 return;
             }
@@ -292,7 +300,7 @@ function ReportActionItem({
 
     // Hide the message if it is being moderated for a higher offense, or is hidden by a moderator
     // Removed messages should not be shown anyway and should not need this flow
-    const latestDecision = action.message?.[0]?.moderationDecision?.decision ?? '';
+    const latestDecision = ReportActionsUtils.getReportActionMessage(action)?.moderationDecision?.decision ?? '';
     useEffect(() => {
         if (action.actionName !== CONST.REPORT.ACTIONS.TYPE.ADD_COMMENT) {
             return;
@@ -320,6 +328,9 @@ function ReportActionItem({
         setIsContextMenuActive(ReportActionContextMenu.isActiveReportAction(action.reportActionID));
     }, [action.reportActionID]);
 
+    const isArchivedRoom = ReportUtils.isArchivedRoomWithID(originalReportID);
+    const disabledActions = useMemo(() => (!ReportUtils.canWriteInReport(report) ? RestrictedReadOnlyContextMenuActions : []), [report]);
+    const isChronosReport = ReportUtils.chatIncludesChronosWithID(originalReportID);
     /**
      * Show the ReportActionContextMenu modal popover.
      *
@@ -328,7 +339,7 @@ function ReportActionItem({
     const showPopover = useCallback(
         (event: GestureResponderEvent | MouseEvent) => {
             // Block menu on the message being Edited or if the report action item has errors
-            if (draftMessage !== undefined || !isEmptyObject(action.errors)) {
+            if (draftMessage !== undefined || !isEmptyObject(action.errors) || !shouldDisplayContextMenu) {
                 return;
             }
 
@@ -345,34 +356,33 @@ function ReportActionItem({
                 draftMessage ?? '',
                 () => setIsContextMenuActive(true),
                 toggleContextMenuFromActiveReportAction,
-                ReportUtils.isArchivedRoom(originalReport),
-                ReportUtils.chatIncludesChronos(originalReport),
+                isArchivedRoom,
+                isChronosReport,
                 false,
                 false,
-                [],
+                disabledActions,
                 false,
                 setIsEmojiPickerActive as () => void,
             );
         },
-        [draftMessage, action, report.reportID, toggleContextMenuFromActiveReportAction, originalReport, originalReportID],
+        [draftMessage, action, report.reportID, toggleContextMenuFromActiveReportAction, originalReportID, shouldDisplayContextMenu, disabledActions, isArchivedRoom, isChronosReport],
     );
 
     // Handles manual scrolling to the bottom of the chat when the last message is an actionable whisper and it's resolved.
     // This fixes an issue where InvertedFlatList fails to auto scroll down and results in an empty space at the bottom of the chat in IOS.
     useEffect(() => {
-        const isActionableWhisper = ReportActionsUtils.isActionableMentionWhisper(action) || ReportActionsUtils.isActionableTrackExpense(action);
         if (index !== 0 || !isActionableWhisper) {
             return;
         }
 
-        if (ReportActionsUtils.isActionableMentionWhisper(action) && prevActionResolution !== (action.originalMessage.resolution ?? null)) {
+        if (prevActionResolution !== (hasResolutionInOriginalMessage ? originalMessage.resolution : null)) {
             reportScrollManager.scrollToIndex(index);
         }
-    }, [index, action, prevActionResolution, reportScrollManager]);
+    }, [index, originalMessage, prevActionResolution, reportScrollManager, isActionableWhisper, hasResolutionInOriginalMessage]);
 
     const toggleReaction = useCallback(
-        (emoji: Emoji) => {
-            Report.toggleEmojiReaction(report.reportID, action, emoji, emojiReactions);
+        (emoji: Emoji, ignoreSkinToneOnCompare?: boolean) => {
+            Report.toggleEmojiReaction(report.reportID, action, emoji, emojiReactions, undefined, ignoreSkinToneOnCompare);
         },
         [report, action, emojiReactions],
     );
@@ -381,34 +391,43 @@ function ReportActionItem({
         () => ({
             anchor: popoverAnchorRef.current,
             report,
+            reportNameValuePairs,
             action,
             transactionThreadReport,
             checkIfContextMenuActive: toggleContextMenuFromActiveReportAction,
         }),
-        [report, action, toggleContextMenuFromActiveReportAction, transactionThreadReport],
+        [report, action, toggleContextMenuFromActiveReportAction, transactionThreadReport, reportNameValuePairs],
     );
 
+    const attachmentContextValue = useMemo(() => ({reportID: report.reportID, type: CONST.ATTACHMENT_TYPE.REPORT}), [report.reportID]);
+
     const actionableItemButtons: ActionableItem[] = useMemo(() => {
-        const isWhisperResolution = (action?.originalMessage as OriginalMessageActionableMentionWhisper['originalMessage'])?.resolution !== null;
-        const isJoinChoice = (action?.originalMessage as OriginalMessageJoinPolicyChangeLog['originalMessage'])?.choice === '';
+        if (ReportActionsUtils.isActionableAddPaymentCard(action) && shouldRenderAddPaymentCard()) {
+            return [
+                {
+                    text: 'subscription.cardSection.addCardButton',
+                    key: `${action.reportActionID}-actionableAddPaymentCard-submit`,
+                    onPress: () => {
+                        Navigation.navigate(ROUTES.SETTINGS_SUBSCRIPTION_ADD_PAYMENT_CARD);
+                    },
+                    isMediumSized: true,
+                    isPrimary: true,
+                },
+            ];
+        }
 
-        if (
-            !(
-                ((ReportActionsUtils.isActionableMentionWhisper(action) || ReportActionsUtils.isActionableTrackExpense(action)) && isWhisperResolution) ||
-                (ReportActionsUtils.isActionableJoinRequest(action) && isJoinChoice)
-            )
-        ) {
+        if (!isActionableWhisper && (!ReportActionsUtils.isActionableJoinRequest(action) || ReportActionsUtils.getOriginalMessage(action)?.choice !== ('' as JoinWorkspaceResolution))) {
             return [];
         }
 
         if (ReportActionsUtils.isActionableTrackExpense(action)) {
-            const transactionID = (action?.originalMessage as OriginalMessageActionableTrackedExpenseWhisper['originalMessage'])?.transactionID;
+            const transactionID = ReportActionsUtils.getOriginalMessage(action)?.transactionID;
             return [
                 {
                     text: 'actionableMentionTrackExpense.submit',
                     key: `${action.reportActionID}-actionableMentionTrackExpense-submit`,
                     onPress: () => {
-                        ReportUtils.createDraftTransactionAndNavigateToParticipantSelector(transactionID, report.reportID, CONST.IOU.ACTION.SUBMIT, action.reportActionID);
+                        ReportUtils.createDraftTransactionAndNavigateToParticipantSelector(transactionID ?? '0', report.reportID, CONST.IOU.ACTION.SUBMIT, action.reportActionID);
                     },
                     isMediumSized: true,
                 },
@@ -416,7 +435,7 @@ function ReportActionItem({
                     text: 'actionableMentionTrackExpense.categorize',
                     key: `${action.reportActionID}-actionableMentionTrackExpense-categorize`,
                     onPress: () => {
-                        ReportUtils.createDraftTransactionAndNavigateToParticipantSelector(transactionID, report.reportID, CONST.IOU.ACTION.CATEGORIZE, action.reportActionID);
+                        ReportUtils.createDraftTransactionAndNavigateToParticipantSelector(transactionID ?? '0', report.reportID, CONST.IOU.ACTION.CATEGORIZE, action.reportActionID);
                     },
                     isMediumSized: true,
                 },
@@ -424,7 +443,7 @@ function ReportActionItem({
                     text: 'actionableMentionTrackExpense.share',
                     key: `${action.reportActionID}-actionableMentionTrackExpense-share`,
                     onPress: () => {
-                        ReportUtils.createDraftTransactionAndNavigateToParticipantSelector(transactionID, report.reportID, CONST.IOU.ACTION.SHARE, action.reportActionID);
+                        ReportUtils.createDraftTransactionAndNavigateToParticipantSelector(transactionID ?? '0', report.reportID, CONST.IOU.ACTION.SHARE, action.reportActionID);
                     },
                     isMediumSized: true,
                 },
@@ -444,16 +463,33 @@ function ReportActionItem({
                 {
                     text: 'actionableMentionJoinWorkspaceOptions.accept',
                     key: `${action.reportActionID}-actionableMentionJoinWorkspace-${CONST.REPORT.ACTIONABLE_MENTION_JOIN_WORKSPACE_RESOLUTION.ACCEPT}`,
-                    onPress: () => Policy.acceptJoinRequest(report.reportID, action),
+                    onPress: () => Member.acceptJoinRequest(report.reportID, action),
                     isPrimary: true,
                 },
                 {
                     text: 'actionableMentionJoinWorkspaceOptions.decline',
                     key: `${action.reportActionID}-actionableMentionJoinWorkspace-${CONST.REPORT.ACTIONABLE_MENTION_JOIN_WORKSPACE_RESOLUTION.DECLINE}`,
-                    onPress: () => Policy.declineJoinRequest(report.reportID, action),
+                    onPress: () => Member.declineJoinRequest(report.reportID, action),
+                },
+            ];
+        }
+
+        if (ReportActionsUtils.isActionableReportMentionWhisper(action)) {
+            return [
+                {
+                    text: 'common.yes',
+                    key: `${action.reportActionID}-actionableReportMentionWhisper-${CONST.REPORT.ACTIONABLE_REPORT_MENTION_WHISPER_RESOLUTION.CREATE}`,
+                    onPress: () => Report.resolveActionableReportMentionWhisper(report.reportID, action, CONST.REPORT.ACTIONABLE_REPORT_MENTION_WHISPER_RESOLUTION.CREATE),
+                    isPrimary: true,
+                },
+                {
+                    text: 'common.no',
+                    key: `${action.reportActionID}-actionableReportMentionWhisper-${CONST.REPORT.ACTIONABLE_REPORT_MENTION_WHISPER_RESOLUTION.NOTHING}`,
+                    onPress: () => Report.resolveActionableReportMentionWhisper(report.reportID, action, CONST.REPORT.ACTIONABLE_REPORT_MENTION_WHISPER_RESOLUTION.NOTHING),
                 },
             ];
         }
+
         return [
             {
                 text: 'actionableMentionWhisperOptions.invite',
@@ -467,23 +503,7 @@ function ReportActionItem({
                 onPress: () => Report.resolveActionableMentionWhisper(report.reportID, action, CONST.REPORT.ACTIONABLE_MENTION_WHISPER_RESOLUTION.NOTHING),
             },
         ];
-    }, [action, report.reportID]);
-
-    const renderThreadDivider = useMemo(
-        () =>
-            shouldHideThreadDividerLine ? (
-                <UnreadActionIndicator
-                    reportActionID={report.reportID}
-                    shouldHideThreadDividerLine={shouldHideThreadDividerLine}
-                />
-            ) : (
-                <SpacerView
-                    shouldShow={!shouldHideThreadDividerLine}
-                    style={[!shouldHideThreadDividerLine ? styles.reportHorizontalRule : {}]}
-                />
-            ),
-        [shouldHideThreadDividerLine, styles.reportHorizontalRule, report.reportID],
-    );
+    }, [action, isActionableWhisper, report.reportID]);
 
     /**
      * Get the content of ReportActionItem
@@ -497,20 +517,19 @@ function ReportActionItem({
 
         // Show the MoneyRequestPreview for when expense is present
         if (
-            isIOUReport(action) &&
-            action.originalMessage &&
+            ReportActionsUtils.isMoneyRequestAction(action) &&
+            ReportActionsUtils.getOriginalMessage(action) &&
             // For the pay flow, we only want to show MoneyRequestAction when sending money. When paying, we display a regular system message
-            (action.originalMessage.type === CONST.IOU.REPORT_ACTION_TYPE.CREATE ||
-                action.originalMessage.type === CONST.IOU.REPORT_ACTION_TYPE.SPLIT ||
-                action.originalMessage.type === CONST.IOU.REPORT_ACTION_TYPE.TRACK ||
-                isSendingMoney)
+            (ReportActionsUtils.getOriginalMessage(action)?.type === CONST.IOU.REPORT_ACTION_TYPE.CREATE ||
+                ReportActionsUtils.getOriginalMessage(action)?.type === CONST.IOU.REPORT_ACTION_TYPE.SPLIT ||
+                ReportActionsUtils.getOriginalMessage(action)?.type === CONST.IOU.REPORT_ACTION_TYPE.TRACK)
         ) {
             // There is no single iouReport for bill splits, so only 1:1 requests require an iouReportID
-            const iouReportID = action.originalMessage.IOUReportID ? action.originalMessage.IOUReportID.toString() : '0';
+            const iouReportID = ReportActionsUtils.getOriginalMessage(action)?.IOUReportID ? ReportActionsUtils.getOriginalMessage(action)?.IOUReportID?.toString() ?? '-1' : '-1';
             children = (
                 <MoneyRequestAction
                     // If originalMessage.iouReportID is set, this is a 1:1 IOU expense in a DM chat whose reportID is report.chatReportID
-                    chatReportID={action.originalMessage.IOUReportID ? report.chatReportID ?? '' : report.reportID}
+                    chatReportID={ReportActionsUtils.getOriginalMessage(action)?.IOUReportID ? report.chatReportID ?? '' : report.reportID}
                     requestReportID={iouReportID}
                     reportID={report.reportID}
                     action={action}
@@ -520,6 +539,18 @@ function ReportActionItem({
                     checkIfContextMenuActive={toggleContextMenuFromActiveReportAction}
                     style={displayAsGroup ? [] : [styles.mt2]}
                     isWhisper={isWhisper}
+                    shouldDisplayContextMenu={shouldDisplayContextMenu}
+                />
+            );
+        } else if (ReportActionsUtils.isTripPreview(action)) {
+            children = (
+                <TripRoomPreview
+                    action={action}
+                    chatReportID={ReportActionsUtils.getOriginalMessage(action)?.linkedReportID ?? '-1'}
+                    isHovered={hovered}
+                    contextMenuAnchor={popoverAnchorRef.current}
+                    containerStyles={displayAsGroup ? [] : [styles.mt2]}
+                    checkIfContextMenuActive={toggleContextMenuFromActiveReportAction}
                 />
             );
         } else if (action.actionName === CONST.REPORT.ACTIONS.TYPE.REPORT_PREVIEW) {
@@ -529,12 +560,14 @@ function ReportActionItem({
                 <ReportPreview
                     iouReportID={ReportActionsUtils.getIOUReportIDFromReportActionPreview(action)}
                     chatReportID={report.reportID}
-                    policyID={report.policyID ?? ''}
+                    policyID={report.policyID ?? '-1'}
                     containerStyles={displayAsGroup ? [] : [styles.mt2]}
                     action={action}
                     isHovered={hovered}
                     contextMenuAnchor={popoverAnchorRef.current}
                     checkIfContextMenuActive={toggleContextMenuFromActiveReportAction}
+                    onPaymentOptionsShow={() => setIsPaymentMethodPopoverActive(true)}
+                    onPaymentOptionsHide={() => setIsPaymentMethodPopoverActive(false)}
                     isWhisper={isWhisper}
                 />
             );
@@ -544,22 +577,22 @@ function ReportActionItem({
             children = (
                 <ShowContextMenuContext.Provider value={contextValue}>
                     <TaskPreview
-                        taskReportID={action.actionName === CONST.REPORT.ACTIONS.TYPE.ADD_COMMENT ? action.originalMessage.taskReportID?.toString() ?? '' : ''}
+                        taskReportID={ReportActionsUtils.isAddCommentAction(action) ? ReportActionsUtils.getOriginalMessage(action)?.taskReportID?.toString() ?? '-1' : '-1'}
                         chatReportID={report.reportID}
                         action={action}
                         isHovered={hovered}
                         contextMenuAnchor={popoverAnchorRef.current}
                         checkIfContextMenuActive={toggleContextMenuFromActiveReportAction}
-                        policyID={report.policyID ?? ''}
+                        policyID={report.policyID ?? '-1'}
                     />
                 </ShowContextMenuContext.Provider>
             );
-        } else if (action.actionName === CONST.REPORT.ACTIONS.TYPE.REIMBURSEMENT_QUEUED) {
-            const linkedReport = ReportUtils.isChatThread(report) ? ReportUtils.getReport(report.parentReportID) : report;
+        } else if (ReportActionsUtils.isReimbursementQueuedAction(action)) {
+            const linkedReport = ReportUtils.isChatThread(report) ? parentReport : report;
             const submitterDisplayName = PersonalDetailsUtils.getDisplayNameOrDefault(personalDetails[linkedReport?.ownerAccountID ?? -1]);
-            const paymentType = action.originalMessage.paymentType ?? '';
+            const paymentType = ReportActionsUtils.getOriginalMessage(action)?.paymentType ?? '';
 
-            const missingPaymentMethod = ReportUtils.getIndicatedMissingPaymentMethod(userWallet, linkedReport?.reportID ?? '', action);
+            const missingPaymentMethod = ReportUtils.getIndicatedMissingPaymentMethod(userWallet, linkedReport?.reportID ?? '-1', action);
             children = (
                 <ReportActionItemBasicMessage
                     message={translate(paymentType === CONST.IOU.PAYMENT_TYPE.EXPENSIFY ? 'iou.waitingOnEnabledWallet' : 'iou.waitingOnBankAccount', {submitterDisplayName})}
@@ -599,81 +632,110 @@ function ReportActionItem({
                     </>
                 </ReportActionItemBasicMessage>
             );
-        } else if (action.actionName === CONST.REPORT.ACTIONS.TYPE.REIMBURSEMENT_DEQUEUED) {
+        } else if (ReportActionsUtils.isReimbursementDeQueuedAction(action)) {
             children = <ReportActionItemBasicMessage message={ReportUtils.getReimbursementDeQueuedActionMessage(action, report)} />;
         } else if (action.actionName === CONST.REPORT.ACTIONS.TYPE.MODIFIED_EXPENSE) {
             children = <ReportActionItemBasicMessage message={ModifiedExpenseMessage.getForReportAction(report.reportID, action)} />;
-        } else if (ReportActionsUtils.isOldDotReportAction(action)) {
-            // This handles all historical actions from OldDot that we just want to display the message text
-            children = <ReportActionItemBasicMessage message={ReportActionsUtils.getMessageOfOldDotReportAction(action)} />;
+        } else if (action.actionName === CONST.REPORT.ACTIONS.TYPE.SUBMITTED) {
+            children = <ReportActionItemBasicMessage message={ReportUtils.getIOUSubmittedMessage(action)} />;
+        } else if (action.actionName === CONST.REPORT.ACTIONS.TYPE.APPROVED) {
+            children = <ReportActionItemBasicMessage message={ReportUtils.getIOUApprovedMessage(action)} />;
+        } else if (action.actionName === CONST.REPORT.ACTIONS.TYPE.FORWARDED) {
+            children = <ReportActionItemBasicMessage message={ReportUtils.getIOUForwardedMessage(action)} />;
         } else if (action.actionName === CONST.REPORT.ACTIONS.TYPE.HOLD) {
             children = <ReportActionItemBasicMessage message={translate('iou.heldExpense')} />;
         } else if (action.actionName === CONST.REPORT.ACTIONS.TYPE.HOLD_COMMENT) {
-            children = <ReportActionItemBasicMessage message={action.message?.[0]?.text ?? ''} />;
+            children = <ReportActionItemBasicMessage message={ReportActionsUtils.getReportActionText(action)} />;
         } else if (action.actionName === CONST.REPORT.ACTIONS.TYPE.UNHOLD) {
             children = <ReportActionItemBasicMessage message={translate('iou.unheldExpense')} />;
         } else if (action.actionName === CONST.REPORT.ACTIONS.TYPE.MERGED_WITH_CASH_TRANSACTION) {
             children = <ReportActionItemBasicMessage message={translate('systemMessage.mergedWithCashTransaction')} />;
-        } else if (action.actionName === CONST.REPORT.ACTIONS.TYPE.DISMISSED_VIOLATION) {
-            children = <ReportActionItemBasicMessage message={ReportActionsUtils.getDismissedViolationMessageText(action.originalMessage)} />;
+        } else if (ReportActionsUtils.isActionOfType(action, CONST.REPORT.ACTIONS.TYPE.DISMISSED_VIOLATION)) {
+            children = <ReportActionItemBasicMessage message={ReportActionsUtils.getDismissedViolationMessageText(ReportActionsUtils.getOriginalMessage(action))} />;
+        } else if (action.actionName === CONST.REPORT.ACTIONS.TYPE.POLICY_CHANGE_LOG.ADD_TAG) {
+            children = <ReportActionItemBasicMessage message={PolicyUtils.getCleanedTagName(ReportActionsUtils.getReportActionMessage(action)?.text ?? '')} />;
+        } else if (action.actionName === CONST.REPORT.ACTIONS.TYPE.POLICY_CHANGE_LOG.UPDATE_NAME) {
+            children = <ReportActionItemBasicMessage message={ReportUtils.getWorkspaceNameUpdatedMessage(action)} />;
+        } else if (action.actionName === CONST.REPORT.ACTIONS.TYPE.POLICY_CHANGE_LOG.ADD_EMPLOYEE) {
+            children = <ReportActionItemBasicMessage message={ReportActionsUtils.getPolicyChangeLogAddEmployeeMessage(action)} />;
+        } else if (action.actionName === CONST.REPORT.ACTIONS.TYPE.POLICY_CHANGE_LOG.UPDATE_EMPLOYEE) {
+            children = <ReportActionItemBasicMessage message={ReportActionsUtils.getPolicyChangeLogChangeRoleMessage(action)} />;
+        } else if (action.actionName === CONST.REPORT.ACTIONS.TYPE.POLICY_CHANGE_LOG.DELETE_EMPLOYEE) {
+            children = <ReportActionItemBasicMessage message={ReportActionsUtils.getPolicyChangeLogDeleteMemberMessage(action)} />;
+        } else if (
+            ReportActionsUtils.isActionOfType(action, CONST.REPORT.ACTIONS.TYPE.CARD_ISSUED, CONST.REPORT.ACTIONS.TYPE.CARD_ISSUED_VIRTUAL, CONST.REPORT.ACTIONS.TYPE.CARD_MISSING_ADDRESS)
+        ) {
+            children = <IssueCardMessage action={action} />;
+        } else if (ReportActionsUtils.isActionOfType(action, CONST.REPORT.ACTIONS.TYPE.EXPORTED_TO_INTEGRATION)) {
+            children = <ExportIntegration action={action} />;
+        } else if (ReportActionsUtils.isRenamedAction(action)) {
+            const message = ReportActionsUtils.getRenamedAction(action);
+            children = <ReportActionItemBasicMessage message={message} />;
+        } else if (ReportActionsUtils.isActionOfType(action, CONST.REPORT.ACTIONS.TYPE.INTEGRATION_SYNC_FAILED)) {
+            const {label, errorMessage} = ReportActionsUtils.getOriginalMessage(action) ?? {label: '', errorMessage: ''};
+            children = <ReportActionItemBasicMessage message={translate('report.actions.type.integrationSyncFailed', label, errorMessage)} />;
         } else {
             const hasBeenFlagged =
                 ![CONST.MODERATION.MODERATOR_DECISION_APPROVED, CONST.MODERATION.MODERATOR_DECISION_PENDING].some((item) => item === moderationDecision) &&
                 !ReportActionsUtils.isPendingRemove(action);
             children = (
                 <ShowContextMenuContext.Provider value={contextValue}>
-                    {draftMessage === undefined ? (
-                        <View style={displayAsGroup && hasBeenFlagged ? styles.blockquote : {}}>
-                            <ReportActionItemMessage
-                                reportID={report.reportID}
-                                action={action}
-                                displayAsGroup={displayAsGroup}
-                                isHidden={isHidden}
-                            />
-                            {hasBeenFlagged && (
-                                <Button
-                                    small
-                                    style={[styles.mt2, styles.alignSelfStart]}
-                                    onPress={() => updateHiddenState(!isHidden)}
-                                >
-                                    <Text
-                                        style={[styles.buttonSmallText, styles.userSelectNone]}
-                                        dataSet={{[CONST.SELECTION_SCRAPER_HIDDEN_ELEMENT]: true}}
+                    <AttachmentContext.Provider value={attachmentContextValue}>
+                        {draftMessage === undefined ? (
+                            <View style={displayAsGroup && hasBeenFlagged ? styles.blockquote : {}}>
+                                <ReportActionItemMessage
+                                    reportID={report.reportID}
+                                    action={action}
+                                    displayAsGroup={displayAsGroup}
+                                    isHidden={isHidden}
+                                />
+                                {hasBeenFlagged && (
+                                    <Button
+                                        small
+                                        style={[styles.mt2, styles.alignSelfStart]}
+                                        onPress={() => updateHiddenState(!isHidden)}
                                     >
-                                        {isHidden ? translate('moderation.revealMessage') : translate('moderation.hideMessage')}
-                                    </Text>
-                                </Button>
-                            )}
-                            {/**
+                                        <Text
+                                            style={[styles.buttonSmallText, styles.userSelectNone]}
+                                            dataSet={{[CONST.SELECTION_SCRAPER_HIDDEN_ELEMENT]: true}}
+                                        >
+                                            {isHidden ? translate('moderation.revealMessage') : translate('moderation.hideMessage')}
+                                        </Text>
+                                    </Button>
+                                )}
+                                {/**
                                 These are the actionable buttons that appear at the bottom of a Concierge message
                                 for example: Invite a user mentioned but not a member of the room
                                 https://github.com/Expensify/App/issues/32741
                             */}
-                            {actionableItemButtons.length > 0 && (
-                                <ActionableItemButtons
-                                    items={actionableItemButtons}
-                                    layout={ReportActionsUtils.isActionableTrackExpense(action) ? 'vertical' : 'horizontal'}
-                                />
-                            )}
-                        </View>
-                    ) : (
-                        <ReportActionItemMessageEdit
-                            action={action}
-                            draftMessage={draftMessage}
-                            reportID={report.reportID}
-                            index={index}
-                            ref={textInputRef}
-                            // Avoid defining within component due to an existing Onyx bug
-                            preferredSkinTone={preferredSkinTone}
-                            shouldDisableEmojiPicker={(ReportUtils.chatIncludesConcierge(report) && User.isBlockedFromConcierge(blockedFromConcierge)) || ReportUtils.isArchivedRoom(report)}
-                        />
-                    )}
+                                {actionableItemButtons.length > 0 && (
+                                    <ActionableItemButtons
+                                        items={actionableItemButtons}
+                                        layout={ReportActionsUtils.isActionableTrackExpense(action) ? 'vertical' : 'horizontal'}
+                                    />
+                                )}
+                            </View>
+                        ) : (
+                            <ReportActionItemMessageEdit
+                                action={action}
+                                draftMessage={draftMessage}
+                                reportID={report.reportID}
+                                index={index}
+                                ref={textInputRef}
+                                shouldDisableEmojiPicker={
+                                    (ReportUtils.chatIncludesConcierge(report) && User.isBlockedFromConcierge(blockedFromConcierge)) ||
+                                    ReportUtils.isArchivedRoom(report, reportNameValuePairs)
+                                }
+                                isGroupPolicyReport={!!report?.policyID && report.policyID !== CONST.POLICY.ID_FAKE}
+                            />
+                        )}
+                    </AttachmentContext.Provider>
                 </ShowContextMenuContext.Provider>
             );
         }
         const numberOfThreadReplies = action.childVisibleActionCount ?? 0;
 
-        const shouldDisplayThreadReplies = ReportUtils.shouldDisplayThreadReplies(action, report.reportID);
+        const shouldDisplayThreadReplies = !hideThreadReplies && ReportUtils.shouldDisplayThreadReplies(action, report.reportID);
         const oldestFourAccountIDs =
             action.childOldestFourAccountIDs
                 ?.split(',')
@@ -695,7 +757,7 @@ function ReportActionItem({
                             reportAction={action}
                             emojiReactions={emojiReactions}
                             shouldBlockReactions={hasErrors}
-                            toggleReaction={(emoji) => {
+                            toggleReaction={(emoji, ignoreSkinToneOnCompare) => {
                                 if (Session.isAnonymousUser()) {
                                     hideContextMenu(false);
 
@@ -703,7 +765,7 @@ function ReportActionItem({
                                         Session.signOutAndRedirectToSignIn();
                                     });
                                 } else {
-                                    toggleReaction(emoji);
+                                    toggleReaction(emoji, ignoreSkinToneOnCompare);
                                 }
                             }}
                             setIsEmojiPickerActive={setIsEmojiPickerActive}
@@ -734,6 +796,7 @@ function ReportActionItem({
      * @param hasErrors whether the report action has any errors
      * @returns report action item
      */
+
     const renderReportActionItem = (hovered: boolean, isWhisper: boolean, hasErrors: boolean): React.JSX.Element => {
         const content = renderItemContent(hovered || isContextMenuActive || isEmojiPickerActive, isWhisper, hasErrors);
 
@@ -765,123 +828,21 @@ function ReportActionItem({
     };
 
     if (action.actionName === CONST.REPORT.ACTIONS.TYPE.CREATED) {
-        if (ReportActionsUtils.isTransactionThread(parentReportAction)) {
-            const isReversedTransaction = ReportActionsUtils.isReversedTransaction(parentReportAction);
-            if (ReportActionsUtils.isDeletedParentAction(parentReportAction) || isReversedTransaction) {
-                let message: TranslationPaths;
-                if (isReversedTransaction) {
-                    message = 'parentReportAction.reversedTransaction';
-                } else {
-                    message = 'parentReportAction.deletedExpense';
-                }
-                return (
-                    <View>
-                        <AnimatedEmptyStateBackground />
-                        <View style={[StyleUtils.getReportWelcomeTopMarginStyle(isSmallScreenWidth)]}>
-                            <OfflineWithFeedback pendingAction={parentReportAction?.pendingAction ?? null}>
-                                <ReportActionItemSingle
-                                    action={parentReportAction}
-                                    showHeader
-                                    report={report}
-                                >
-                                    <RenderHTML html={`<comment>${translate(message)}</comment>`} />
-                                </ReportActionItemSingle>
-                                <View style={styles.threadDividerLine} />
-                            </OfflineWithFeedback>
-                        </View>
-                    </View>
-                );
-            }
-            return (
-                <ShowContextMenuContext.Provider value={contextValue}>
-                    <View>
-                        <MoneyRequestView
-                            report={report}
-                            shouldShowAnimatedBackground
-                        />
-                        {renderThreadDivider}
-                    </View>
-                </ShowContextMenuContext.Provider>
-            );
-        }
-        if (ReportUtils.isTaskReport(report)) {
-            if (ReportUtils.isCanceledTaskReport(report, parentReportAction)) {
-                return (
-                    <View>
-                        <AnimatedEmptyStateBackground />
-                        <View style={[StyleUtils.getReportWelcomeTopMarginStyle(isSmallScreenWidth)]}>
-                            <OfflineWithFeedback pendingAction={parentReportAction?.pendingAction}>
-                                <ReportActionItemSingle
-                                    action={parentReportAction}
-                                    showHeader={draftMessage === undefined}
-                                    report={report}
-                                >
-                                    <RenderHTML html={`<comment>${translate('parentReportAction.deletedTask')}</comment>`} />
-                                </ReportActionItemSingle>
-                            </OfflineWithFeedback>
-                            <View style={styles.reportHorizontalRule} />
-                        </View>
-                    </View>
-                );
-            }
-            return (
-                <View>
-                    <AnimatedEmptyStateBackground />
-                    <View style={[StyleUtils.getReportWelcomeTopMarginStyle(isSmallScreenWidth)]}>
-                        <TaskView report={report} />
-                        {renderThreadDivider}
-                    </View>
-                </View>
-            );
-        }
-        if (ReportUtils.isExpenseReport(report) || ReportUtils.isIOUReport(report) || ReportUtils.isInvoiceReport(report)) {
-            return (
-                <OfflineWithFeedback pendingAction={action.pendingAction}>
-                    {transactionThreadReport && !isEmptyObject(transactionThreadReport) ? (
-                        <>
-                            {transactionCurrency !== report.currency && (
-                                <>
-                                    <MoneyReportView
-                                        report={report}
-                                        policy={policy}
-                                    />
-                                    {renderThreadDivider}
-                                </>
-                            )}
-                            <ShowContextMenuContext.Provider value={contextValue}>
-                                <View>
-                                    <MoneyRequestView
-                                        report={transactionThreadReport}
-                                        shouldShowAnimatedBackground={transactionCurrency === report.currency}
-                                    />
-                                    {renderThreadDivider}
-                                </View>
-                            </ShowContextMenuContext.Provider>
-                        </>
-                    ) : (
-                        <>
-                            <MoneyReportView
-                                report={report}
-                                policy={policy}
-                            />
-                            {renderThreadDivider}
-                        </>
-                    )}
-                </OfflineWithFeedback>
-            );
-        }
+        const transactionID = ReportActionsUtils.isMoneyRequestAction(parentReportActionForTransactionThread)
+            ? ReportActionsUtils.getOriginalMessage(parentReportActionForTransactionThread)?.IOUTransactionID
+            : '-1';
 
         return (
-            <ReportActionItemCreated
-                reportID={report.reportID}
-                policyID={report.policyID}
+            <ReportActionItemContentCreated
+                contextValue={contextValue}
+                parentReportAction={parentReportAction}
+                transactionID={transactionID}
+                draftMessage={draftMessage}
+                shouldHideThreadDividerLine={shouldHideThreadDividerLine}
             />
         );
     }
-    if (action.actionName === CONST.REPORT.ACTIONS.TYPE.RENAMED) {
-        return <RenameAction action={action} />;
-    }
-    if (action.actionName === CONST.REPORT.ACTIONS.TYPE.CHRONOS_OOO_LIST) {
+    if (ReportActionsUtils.isChronosOOOListAction(action)) {
         return (
             <ChronosOOOListActions
                 action={action}
@@ -892,17 +853,17 @@ function ReportActionItem({
 
     // For the `pay` IOU action on non-pay expense flow, we don't want to render anything if `isWaitingOnBankAccount` is true
     // Otherwise, we will see two system messages informing the payee needs to add a bank account or wallet
-    if (isIOUReport(action) && !!report?.isWaitingOnBankAccount && action.originalMessage.type === CONST.IOU.REPORT_ACTION_TYPE.PAY && !isSendingMoney) {
+    if (
+        ReportActionsUtils.isMoneyRequestAction(action) &&
+        !!report?.isWaitingOnBankAccount &&
+        ReportActionsUtils.getOriginalMessage(action)?.type === CONST.IOU.REPORT_ACTION_TYPE.PAY &&
+        !isSendingMoney
+    ) {
         return null;
     }
 
-    // if action is actionable mention whisper and resolved by user, then we don't want to render anything
-    if (ReportActionsUtils.isActionableMentionWhisper(action) && (action.originalMessage.resolution ?? null)) {
-        return null;
-    }
-
-    // if action is actionable track expense whisper and resolved by user, then we don't want to render anything
-    if (ReportActionsUtils.isActionableTrackExpense(action) && (action.originalMessage as OriginalMessageActionableTrackedExpenseWhisper['originalMessage']).resolution) {
+    // If action is actionable whisper and resolved by user, then we don't want to render anything
+    if (isActionableWhisper && (hasResolutionInOriginalMessage ? originalMessage.resolution : null)) {
         return null;
     }
 
@@ -914,21 +875,27 @@ function ReportActionItem({
     }
 
     const hasErrors = !isEmptyObject(action.errors);
-    const whisperedToAccountIDs = action.whisperedToAccountIDs ?? [];
-    const isWhisper = whisperedToAccountIDs.length > 0;
-    const isMultipleParticipant = whisperedToAccountIDs.length > 1;
-    const isWhisperOnlyVisibleByUser = isWhisper && ReportUtils.isCurrentUserTheOnlyParticipant(whisperedToAccountIDs);
+    const whisperedTo = ReportActionsUtils.getWhisperedTo(action);
+    const isMultipleParticipant = whisperedTo.length > 1;
+
+    const iouReportID =
+        ReportActionsUtils.isMoneyRequestAction(action) && ReportActionsUtils.getOriginalMessage(action)?.IOUReportID
+            ? (ReportActionsUtils.getOriginalMessage(action)?.IOUReportID ?? '').toString()
+            : '-1';
+    const transactionsWithReceipts = ReportUtils.getTransactionsWithReceipts(iouReportID);
+    const isWhisper = whisperedTo.length > 0 && transactionsWithReceipts.length === 0;
     const whisperedToPersonalDetails = isWhisper
-        ? (Object.values(personalDetails ?? {}).filter((details) => whisperedToAccountIDs.includes(details?.accountID ?? -1)) as OnyxTypes.PersonalDetails[])
+        ? (Object.values(personalDetails ?? {}).filter((details) => whisperedTo.includes(details?.accountID ?? -1)) as OnyxTypes.PersonalDetails[])
         : [];
+    const isWhisperOnlyVisibleByUser = isWhisper && ReportUtils.isCurrentUserTheOnlyParticipant(whisperedTo);
     const displayNamesWithTooltips = isWhisper ? ReportUtils.getDisplayNamesWithTooltips(whisperedToPersonalDetails, isMultipleParticipant) : [];
 
     return (
         <PressableWithSecondaryInteraction
             ref={popoverAnchorRef}
             onPress={draftMessage === undefined ? onPress : undefined}
-            style={[action.pendingAction === CONST.RED_BRICK_ROAD_PENDING_ACTION.DELETE ? styles.pointerEventsNone : styles.pointerEventsAuto]}
-            onPressIn={() => isSmallScreenWidth && DeviceCapabilities.canUseTouchScreen() && ControlSelection.block()}
+            style={[action.pendingAction === CONST.RED_BRICK_ROAD_PENDING_ACTION.DELETE && !isDeletedParentAction ? styles.pointerEventsNone : styles.pointerEventsAuto]}
+            onPressIn={() => shouldUseNarrowLayout && DeviceCapabilities.canUseTouchScreen() && ControlSelection.block()}
             onPressOut={() => ControlSelection.unblock()}
             onSecondaryInteraction={showPopover}
             preventDefaultContextMenu={draftMessage === undefined && !hasErrors}
@@ -943,29 +910,42 @@ function ReportActionItem({
                 {(hovered) => (
                     <View style={highlightedBackgroundColorIfNeeded}>
                         {shouldDisplayNewMarker && (!shouldUseThreadDividerLine || !isFirstVisibleReportAction) && <UnreadActionIndicator reportActionID={action.reportActionID} />}
-                        <MiniReportActionContextMenu
-                            reportID={report.reportID}
-                            reportActionID={action.reportActionID}
-                            anchor={popoverAnchorRef}
-                            originalReportID={originalReportID ?? ''}
-                            isArchivedRoom={ReportUtils.isArchivedRoom(report)}
-                            displayAsGroup={displayAsGroup}
-                            disabledActions={!ReportUtils.canWriteInReport(report) ? RestrictedReadOnlyContextMenuActions : []}
-                            isVisible={hovered && draftMessage === undefined && !hasErrors}
-                            draftMessage={draftMessage}
-                            isChronosReport={ReportUtils.chatIncludesChronos(originalReport)}
-                            checkIfContextMenuActive={toggleContextMenuFromActiveReportAction}
-                            setIsEmojiPickerActive={setIsEmojiPickerActive}
-                        />
-                        <View style={StyleUtils.getReportActionItemStyle(hovered || isWhisper || isContextMenuActive || !!isEmojiPickerActive || draftMessage !== undefined, !!onPress)}>
+                        {shouldDisplayContextMenu && (
+                            <MiniReportActionContextMenu
+                                reportID={report.reportID}
+                                reportActionID={action.reportActionID}
+                                anchor={popoverAnchorRef}
+                                originalReportID={originalReportID}
+                                isArchivedRoom={isArchivedRoom}
+                                displayAsGroup={displayAsGroup}
+                                disabledActions={disabledActions}
+                                isVisible={hovered && draftMessage === undefined && !hasErrors}
+                                draftMessage={draftMessage}
+                                isChronosReport={isChronosReport}
+                                checkIfContextMenuActive={toggleContextMenuFromActiveReportAction}
+                                setIsEmojiPickerActive={setIsEmojiPickerActive}
+                            />
+                        )}
+                        <View
+                            style={StyleUtils.getReportActionItemStyle(
+                                hovered || isWhisper || isContextMenuActive || !!isEmojiPickerActive || draftMessage !== undefined || isPaymentMethodPopoverActive,
+                                draftMessage === undefined && !!onPress,
+                            )}
+                        >
                             <OfflineWithFeedback
-                                onClose={() => ReportActions.clearAllRelatedReportActionErrors(report.reportID, action)}
+                                onClose={() => {
+                                    const transactionID = ReportActionsUtils.isMoneyRequestAction(action) ? ReportActionsUtils.getOriginalMessage(action)?.IOUTransactionID : undefined;
+                                    if (transactionID) {
+                                        Transaction.clearError(transactionID);
+                                    }
+                                    ReportActions.clearAllRelatedReportActionErrors(report.reportID, action);
+                                }}
                                 // eslint-disable-next-line @typescript-eslint/prefer-nullish-coalescing
                                 pendingAction={
                                     draftMessage !== undefined ? undefined : action.pendingAction ?? (action.isOptimisticAction ? CONST.RED_BRICK_ROAD_PENDING_ACTION.ADD : undefined)
                                 }
                                 shouldHideOnDelete={!ReportActionsUtils.isThreadParentMessage(action, report.reportID)}
-                                errors={ErrorUtils.getLatestErrorMessageField(action as ErrorUtils.OnyxDataWithErrors)}
+                                errors={linkedTransactionRouteError ?? ErrorUtils.getLatestErrorMessageField(action as ErrorUtils.OnyxDataWithErrors)}
                                 errorRowStyles={[styles.ml10, styles.mr2]}
                                 needsOffscreenAlphaCompositing={ReportActionsUtils.isMoneyRequestAction(action)}
                                 shouldDisableStrikeThrough
@@ -984,7 +964,7 @@ function ReportActionItem({
                                             &nbsp;
                                         </Text>
                                         <DisplayNames
-                                            fullTitle={ReportUtils.getWhisperDisplayNames(whisperedToAccountIDs) ?? ''}
+                                            fullTitle={ReportUtils.getWhisperDisplayNames(whisperedTo) ?? ''}
                                             displayNamesWithTooltips={displayNamesWithTooltips}
                                             tooltipEnabled
                                             numberOfLines={1}
@@ -1007,21 +987,13 @@ function ReportActionItem({
 }
 
 export default withOnyx<ReportActionItemProps, ReportActionItemOnyxProps>({
-    preferredSkinTone: {
-        key: ONYXKEYS.PREFERRED_EMOJI_SKIN_TONE,
-        initialValue: CONST.EMOJI_DEFAULT_SKIN_TONE,
-    },
     iouReport: {
         key: ({action}) => {
             const iouReportID = ReportActionsUtils.getIOUReportIDFromReportActionPreview(action);
-            return `${ONYXKEYS.COLLECTION.REPORT}${iouReportID ?? 0}`;
+            return `${ONYXKEYS.COLLECTION.REPORT}${iouReportID ?? -1}`;
         },
         initialValue: {} as OnyxTypes.Report,
     },
-    policy: {
-        key: ({report}) => `${ONYXKEYS.COLLECTION.POLICY}${report.policyID ?? 0}`,
-        initialValue: {} as OnyxTypes.Policy,
-    },
     emojiReactions: {
         key: ({action}) => `${ONYXKEYS.COLLECTION.REPORT_ACTIONS_REACTIONS}${action.reportActionID}`,
         initialValue: {},
@@ -1029,13 +1001,10 @@ export default withOnyx<ReportActionItemProps, ReportActionItemOnyxProps>({
     userWallet: {
         key: ONYXKEYS.USER_WALLET,
     },
-    transaction: {
-        key: ({parentReportActionForTransactionThread}) => {
-            const transactionID = (parentReportActionForTransactionThread as OnyxTypes.OriginalMessageIOU)?.originalMessage.IOUTransactionID
-                ? (parentReportActionForTransactionThread as OnyxTypes.OriginalMessageIOU).originalMessage.IOUTransactionID
-                : 0;
-            return `${ONYXKEYS.COLLECTION.TRANSACTION}${transactionID}`;
-        },
+    linkedTransactionRouteError: {
+        key: ({action}) =>
+            `${ONYXKEYS.COLLECTION.TRANSACTION}${ReportActionsUtils.isMoneyRequestAction(action) ? ReportActionsUtils.getOriginalMessage(action)?.IOUTransactionID ?? -1 : -1}`,
+        selector: (transaction: OnyxEntry<OnyxTypes.Transaction>) => transaction?.errorFields?.route ?? null,
     },
 })(
     memo(ReportActionItem, (prevProps, nextProps) => {
@@ -1067,10 +1036,9 @@ export default withOnyx<ReportActionItemProps, ReportActionItemOnyxProps>({
             prevProps.report?.nonReimbursableTotal === nextProps.report?.nonReimbursableTotal &&
             prevProps.linkedReportActionID === nextProps.linkedReportActionID &&
             lodashIsEqual(prevProps.report.fieldList, nextProps.report.fieldList) &&
-            lodashIsEqual(prevProps.policy, nextProps.policy) &&
             lodashIsEqual(prevProps.transactionThreadReport, nextProps.transactionThreadReport) &&
             lodashIsEqual(prevProps.reportActions, nextProps.reportActions) &&
-            lodashIsEqual(prevProps.transaction, nextProps.transaction) &&
+            lodashIsEqual(prevProps.linkedTransactionRouteError, nextProps.linkedTransactionRouteError) &&
             lodashIsEqual(prevParentReportAction, nextParentReportAction)
         );
     }),
diff --git a/src/pages/home/report/ReportActionItemBasicMessage.tsx b/src/pages/home/report/ReportActionItemBasicMessage.tsx
index a28f2af24448..20098933b02e 100644
--- a/src/pages/home/report/ReportActionItemBasicMessage.tsx
+++ b/src/pages/home/report/ReportActionItemBasicMessage.tsx
@@ -1,4 +1,4 @@
-import Str from 'expensify-common/lib/str';
+import {Str} from 'expensify-common';
 import React from 'react';
 import {View} from 'react-native';
 import Text from '@components/Text';
diff --git a/src/pages/home/report/ReportActionItemContentCreated.tsx b/src/pages/home/report/ReportActionItemContentCreated.tsx
new file mode 100644
index 000000000000..0c052fcb17d9
--- /dev/null
+++ b/src/pages/home/report/ReportActionItemContentCreated.tsx
@@ -0,0 +1,200 @@
+import lodashIsEqual from 'lodash/isEqual';
+import React, {memo, useMemo} from 'react';
+import {View} from 'react-native';
+import {useOnyx} from 'react-native-onyx';
+import type {OnyxEntry} from 'react-native-onyx';
+import OfflineWithFeedback from '@components/OfflineWithFeedback';
+import RenderHTML from '@components/RenderHTML';
+import MoneyReportView from '@components/ReportActionItem/MoneyReportView';
+import MoneyRequestView from '@components/ReportActionItem/MoneyRequestView';
+import TaskView from '@components/ReportActionItem/TaskView';
+import {ShowContextMenuContext} from '@components/ShowContextMenuContext';
+import type {ShowContextMenuContextProps} from '@components/ShowContextMenuContext';
+import SpacerView from '@components/SpacerView';
+import UnreadActionIndicator from '@components/UnreadActionIndicator';
+import useLocalize from '@hooks/useLocalize';
+import usePolicy from '@hooks/usePolicy';
+import useThemeStyles from '@hooks/useThemeStyles';
+import * as ReportActionsUtils from '@libs/ReportActionsUtils';
+import * as ReportUtils from '@libs/ReportUtils';
+import * as TransactionUtils from '@libs/TransactionUtils';
+import CONST from '@src/CONST';
+import type {TranslationPaths} from '@src/languages/types';
+import ONYXKEYS from '@src/ONYXKEYS';
+import type * as OnyxTypes from '@src/types/onyx';
+import {isEmptyObject} from '@src/types/utils/EmptyObject';
+import AnimatedEmptyStateBackground from './AnimatedEmptyStateBackground';
+import ReportActionItemCreated from './ReportActionItemCreated';
+import ReportActionItemSingle from './ReportActionItemSingle';
+
+type ReportActionItemContentCreatedProps = {
+    /**  The context value containing the report and action data, along with the show context menu props */
+    contextValue: ShowContextMenuContextProps & {
+        report: OnyxTypes.Report;
+        action: OnyxTypes.ReportAction;
+    };
+
+    /** Report action belonging to the report's parent */
+    parentReportAction: OnyxEntry<OnyxTypes.ReportAction>;
+
+    /** The transaction ID */
+    transactionID: string | undefined;
+
+    /** The draft message */
+    draftMessage: string | undefined;
+
+    /** Flag to show, hide the thread divider line */
+    shouldHideThreadDividerLine: boolean;
+};
+
+function ReportActionItemContentCreated({contextValue, parentReportAction, transactionID, draftMessage, shouldHideThreadDividerLine}: ReportActionItemContentCreatedProps) {
+    const styles = useThemeStyles();
+    const {translate} = useLocalize();
+
+    const {report, action, transactionThreadReport} = contextValue;
+
+    const policy = usePolicy(report.policyID === CONST.POLICY.OWNER_EMAIL_FAKE ? '-1' : report.policyID ?? '-1');
+    const [transaction] = useOnyx(`${ONYXKEYS.COLLECTION.TRANSACTION}${transactionID ?? '-1'}`);
+
+    const transactionCurrency = TransactionUtils.getCurrency(transaction);
+
+    const renderThreadDivider = useMemo(
+        () =>
+            shouldHideThreadDividerLine ? (
+                <UnreadActionIndicator
+                    reportActionID={report.reportID}
+                    shouldHideThreadDividerLine={shouldHideThreadDividerLine}
+                />
+            ) : (
+                <SpacerView
+                    shouldShow={!shouldHideThreadDividerLine}
+                    style={[!shouldHideThreadDividerLine ? styles.reportHorizontalRule : {}]}
+                />
+            ),
+        [shouldHideThreadDividerLine, report.reportID, styles.reportHorizontalRule],
+    );
+
+    if (ReportActionsUtils.isTransactionThread(parentReportAction)) {
+        const isReversedTransaction = ReportActionsUtils.isReversedTransaction(parentReportAction);
+
+        if (ReportActionsUtils.isMessageDeleted(parentReportAction) || isReversedTransaction) {
+            let message: TranslationPaths;
+
+            if (isReversedTransaction) {
+                message = 'parentReportAction.reversedTransaction';
+            } else {
+                message = 'parentReportAction.deletedExpense';
+            }
+
+            return (
+                <View style={[styles.pRelative]}>
+                    <AnimatedEmptyStateBackground />
+                    <OfflineWithFeedback pendingAction={parentReportAction?.pendingAction ?? null}>
+                        <ReportActionItemSingle
+                            action={parentReportAction}
+                            showHeader
+                            report={report}
+                        >
+                            <RenderHTML html={`<comment>${translate(message)}</comment>`} />
+                        </ReportActionItemSingle>
+                        <View style={styles.threadDividerLine} />
+                    </OfflineWithFeedback>
+                </View>
+            );
+        }
+
+        return (
+            <ShowContextMenuContext.Provider value={contextValue}>
+                <View>
+                    <MoneyRequestView
+                        report={report}
+                        shouldShowAnimatedBackground
+                    />
+                    {renderThreadDivider}
+                </View>
+            </ShowContextMenuContext.Provider>
+        );
+    }
+
+    if (ReportUtils.isTaskReport(report)) {
+        if (ReportUtils.isCanceledTaskReport(report, parentReportAction)) {
+            return (
+                <View style={[styles.pRelative]}>
+                    <AnimatedEmptyStateBackground />
+                    <OfflineWithFeedback pendingAction={parentReportAction?.pendingAction}>
+                        <ReportActionItemSingle
+                            action={parentReportAction}
+                            showHeader={draftMessage === undefined}
+                            report={report}
+                        >
+                            <RenderHTML html={`<comment>${translate('parentReportAction.deletedTask')}</comment>`} />
+                        </ReportActionItemSingle>
+                    </OfflineWithFeedback>
+                    <View style={styles.reportHorizontalRule} />
+                </View>
+            );
+        }
+
+        return (
+            <View style={[styles.pRelative]}>
+                <AnimatedEmptyStateBackground />
+                <View>
+                    <TaskView report={report} />
+                    {renderThreadDivider}
+                </View>
+            </View>
+        );
+    }
+
+    if (ReportUtils.isExpenseReport(report) || ReportUtils.isIOUReport(report) || ReportUtils.isInvoiceReport(report)) {
+        return (
+            <OfflineWithFeedback pendingAction={action.pendingAction}>
+                {transactionThreadReport && !isEmptyObject(transactionThreadReport) ? (
+                    <>
+                        <MoneyReportView
+                            report={report}
+                            policy={policy}
+                            isCombinedReport
+                            shouldShowTotal={transaction ? transactionCurrency !== report.currency : false}
+                            shouldHideThreadDividerLine={shouldHideThreadDividerLine}
+                        />
+                        <ShowContextMenuContext.Provider value={contextValue}>
+                            <View>
+                                <MoneyRequestView
+                                    report={transactionThreadReport}
+                                    shouldShowAnimatedBackground={false}
+                                />
+                                {renderThreadDivider}
+                            </View>
+                        </ShowContextMenuContext.Provider>
+                    </>
+                ) : (
+                    <MoneyReportView
+                        report={report}
+                        policy={policy}
+                        shouldHideThreadDividerLine={shouldHideThreadDividerLine}
+                    />
+                )}
+            </OfflineWithFeedback>
+        );
+    }
+
+    return (
+        <ReportActionItemCreated
+            reportID={report.reportID}
+            policyID={report.policyID}
+        />
+    );
+}
+
+ReportActionItemContentCreated.displayName = 'ReportActionItemContentCreated';
+
+export default memo(
+    ReportActionItemContentCreated,
+    (prevProps, nextProps) =>
+        lodashIsEqual(prevProps.contextValue, nextProps.contextValue) &&
+        lodashIsEqual(prevProps.parentReportAction, nextProps.parentReportAction) &&
+        prevProps.transactionID === nextProps.transactionID &&
+        prevProps.draftMessage === nextProps.draftMessage &&
+        prevProps.shouldHideThreadDividerLine === nextProps.shouldHideThreadDividerLine,
+);
diff --git a/src/pages/home/report/ReportActionItemCreated.tsx b/src/pages/home/report/ReportActionItemCreated.tsx
index f446c38fb1e9..ec9f5ea9915f 100644
--- a/src/pages/home/report/ReportActionItemCreated.tsx
+++ b/src/pages/home/report/ReportActionItemCreated.tsx
@@ -1,15 +1,15 @@
+import lodashIsEqual from 'lodash/isEqual';
 import React, {memo} from 'react';
 import {View} from 'react-native';
 import type {OnyxEntry} from 'react-native-onyx';
-import {withOnyx} from 'react-native-onyx';
+import {useOnyx, withOnyx} from 'react-native-onyx';
 import MultipleAvatars from '@components/MultipleAvatars';
 import OfflineWithFeedback from '@components/OfflineWithFeedback';
 import PressableWithoutFeedback from '@components/Pressable/PressableWithoutFeedback';
 import ReportWelcomeText from '@components/ReportWelcomeText';
 import useLocalize from '@hooks/useLocalize';
-import useStyleUtils from '@hooks/useStyleUtils';
+import useResponsiveLayout from '@hooks/useResponsiveLayout';
 import useThemeStyles from '@hooks/useThemeStyles';
-import useWindowDimensions from '@hooks/useWindowDimensions';
 import * as ReportUtils from '@libs/ReportUtils';
 import {navigateToConciergeChatAndDeleteReport} from '@userActions/Report';
 import CONST from '@src/CONST';
@@ -36,57 +36,58 @@ type ReportActionItemCreatedProps = ReportActionItemCreatedOnyxProps & {
     // eslint-disable-next-line react/no-unused-prop-types
     policyID: string | undefined;
 };
-function ReportActionItemCreated(props: ReportActionItemCreatedProps) {
+function ReportActionItemCreated({report, personalDetails, policy, reportID}: ReportActionItemCreatedProps) {
     const styles = useThemeStyles();
-    const StyleUtils = useStyleUtils();
 
     const {translate} = useLocalize();
-    const {isSmallScreenWidth, isLargeScreenWidth} = useWindowDimensions();
+    const {shouldUseNarrowLayout, isLargeScreenWidth} = useResponsiveLayout();
+    const [invoiceReceiverPolicy] = useOnyx(`${ONYXKEYS.COLLECTION.POLICY}${report?.invoiceReceiver && 'policyID' in report.invoiceReceiver ? report.invoiceReceiver.policyID : -1}`);
 
-    if (!ReportUtils.isChatReport(props.report)) {
+    if (!ReportUtils.isChatReport(report)) {
         return null;
     }
 
-    let icons = ReportUtils.getIcons(props.report, props.personalDetails);
-    const shouldDisableDetailPage = ReportUtils.shouldDisableDetailPage(props.report);
+    let icons = ReportUtils.getIcons(report, personalDetails, null, '', -1, undefined, invoiceReceiverPolicy);
+    const shouldDisableDetailPage = ReportUtils.shouldDisableDetailPage(report);
 
-    if (ReportUtils.isInvoiceRoom(props.report) && ReportUtils.isCurrentUserInvoiceReceiver(props.report)) {
+    if (ReportUtils.isInvoiceRoom(report) && ReportUtils.isCurrentUserInvoiceReceiver(report)) {
         icons = [...icons].reverse();
     }
 
     return (
         <OfflineWithFeedback
-            pendingAction={props.report?.pendingFields?.addWorkspaceRoom ?? props.report?.pendingFields?.createChat}
-            errors={props.report?.errorFields?.addWorkspaceRoom ?? props.report?.errorFields?.createChat}
+            pendingAction={report?.pendingFields?.addWorkspaceRoom ?? report?.pendingFields?.createChat}
+            errors={report?.errorFields?.addWorkspaceRoom ?? report?.errorFields?.createChat}
             errorRowStyles={[styles.ml10, styles.mr2]}
-            onClose={() => navigateToConciergeChatAndDeleteReport(props.report?.reportID ?? props.reportID)}
-            needsOffscreenAlphaCompositing
+            onClose={() => navigateToConciergeChatAndDeleteReport(report?.reportID ?? reportID, undefined, true)}
         >
-            <View style={StyleUtils.getReportWelcomeContainerStyle(isSmallScreenWidth)}>
+            <View style={[styles.pRelative]}>
                 <AnimatedEmptyStateBackground />
                 <View
                     accessibilityLabel={translate('accessibilityHints.chatWelcomeMessage')}
-                    style={[styles.p5, StyleUtils.getReportWelcomeTopMarginStyle(isSmallScreenWidth)]}
+                    style={[styles.p5]}
                 >
-                    <PressableWithoutFeedback
-                        onPress={() => ReportUtils.navigateToDetailsPage(props.report)}
-                        style={[styles.mh5, styles.mb3, styles.alignSelfStart]}
-                        accessibilityLabel={translate('common.details')}
-                        role={CONST.ROLE.BUTTON}
-                        disabled={shouldDisableDetailPage}
-                    >
-                        <MultipleAvatars
-                            icons={icons}
-                            size={isLargeScreenWidth || (icons && icons.length < 3) ? CONST.AVATAR_SIZE.LARGE : CONST.AVATAR_SIZE.MEDIUM}
-                            shouldStackHorizontally
-                            shouldDisplayAvatarsInRows={isSmallScreenWidth}
-                            maxAvatarsInRow={isSmallScreenWidth ? CONST.AVATAR_ROW_SIZE.DEFAULT : CONST.AVATAR_ROW_SIZE.LARGE_SCREEN}
-                        />
-                    </PressableWithoutFeedback>
+                    <OfflineWithFeedback pendingAction={report?.pendingFields?.avatar}>
+                        <PressableWithoutFeedback
+                            onPress={() => ReportUtils.navigateToDetailsPage(report)}
+                            style={[styles.mh5, styles.mb3, styles.alignSelfStart, shouldDisableDetailPage && styles.cursorDefault]}
+                            accessibilityLabel={translate('common.details')}
+                            role={CONST.ROLE.BUTTON}
+                            disabled={shouldDisableDetailPage}
+                        >
+                            <MultipleAvatars
+                                icons={icons}
+                                size={isLargeScreenWidth || (icons && icons.length < 3) ? CONST.AVATAR_SIZE.LARGE : CONST.AVATAR_SIZE.MEDIUM}
+                                shouldStackHorizontally
+                                shouldDisplayAvatarsInRows={shouldUseNarrowLayout}
+                                maxAvatarsInRow={shouldUseNarrowLayout ? CONST.AVATAR_ROW_SIZE.DEFAULT : CONST.AVATAR_ROW_SIZE.LARGE_SCREEN}
+                            />
+                        </PressableWithoutFeedback>
+                    </OfflineWithFeedback>
                     <View style={[styles.ph5]}>
                         <ReportWelcomeText
-                            report={props.report}
-                            policy={props.policy}
+                            report={report}
+                            policy={policy}
                         />
                     </View>
                 </View>
@@ -123,6 +124,7 @@ export default withOnyx<ReportActionItemCreatedProps, ReportActionItemCreatedOny
             prevProps.policy?.description === nextProps.policy?.description &&
             prevProps.report?.reportName === nextProps.report?.reportName &&
             prevProps.report?.avatarUrl === nextProps.report?.avatarUrl &&
+            lodashIsEqual(prevProps.report?.invoiceReceiver, nextProps.report?.invoiceReceiver) &&
             prevProps.report?.errorFields === nextProps.report?.errorFields,
     ),
 );
diff --git a/src/pages/home/report/ReportActionItemFragment.tsx b/src/pages/home/report/ReportActionItemFragment.tsx
index de9e0b6a6ece..787904d72b81 100644
--- a/src/pages/home/report/ReportActionItemFragment.tsx
+++ b/src/pages/home/report/ReportActionItemFragment.tsx
@@ -10,8 +10,9 @@ import convertToLTR from '@libs/convertToLTR';
 import * as ReportUtils from '@libs/ReportUtils';
 import CONST from '@src/CONST';
 import type * as OnyxCommon from '@src/types/onyx/OnyxCommon';
-import type {ActionName, DecisionName, OriginalMessageSource} from '@src/types/onyx/OriginalMessage';
+import type {DecisionName, OriginalMessageSource} from '@src/types/onyx/OriginalMessage';
 import type {Message} from '@src/types/onyx/ReportAction';
+import type ReportActionName from '@src/types/onyx/ReportActionName';
 import AttachmentCommentFragment from './comment/AttachmentCommentFragment';
 import TextCommentFragment from './comment/TextCommentFragment';
 
@@ -59,7 +60,7 @@ type ReportActionItemFragmentProps = {
     pendingAction?: OnyxCommon.PendingAction;
 
     /** The report action name */
-    actionName?: ActionName;
+    actionName?: ReportActionName;
 
     moderationDecision?: DecisionName;
 };
@@ -68,9 +69,11 @@ const MUTED_ACTIONS = [
     ...Object.values(CONST.REPORT.ACTIONS.TYPE.POLICY_CHANGE_LOG),
     CONST.REPORT.ACTIONS.TYPE.IOU,
     CONST.REPORT.ACTIONS.TYPE.APPROVED,
+    CONST.REPORT.ACTIONS.TYPE.FORWARDED,
+    CONST.REPORT.ACTIONS.TYPE.UNAPPROVED,
     CONST.REPORT.ACTIONS.TYPE.MOVED,
     CONST.REPORT.ACTIONS.TYPE.ACTIONABLE_JOIN_REQUEST,
-] as ActionName[];
+] as ReportActionName[];
 
 function ReportActionItemFragment({
     pendingAction,
@@ -82,7 +85,7 @@ function ReportActionItemFragment({
     source = '',
     style = [],
     delegateAccountID = 0,
-    actorIcon = {},
+    actorIcon,
     isThreadParentMessage = false,
     isApprovedOrSubmittedReportAction = false,
     isHoldReportAction = false,
diff --git a/src/pages/home/report/ReportActionItemMessage.tsx b/src/pages/home/report/ReportActionItemMessage.tsx
index 35bf2507ba64..d88a6792f7c9 100644
--- a/src/pages/home/report/ReportActionItemMessage.tsx
+++ b/src/pages/home/report/ReportActionItemMessage.tsx
@@ -12,7 +12,6 @@ import * as ReportUtils from '@libs/ReportUtils';
 import CONST from '@src/CONST';
 import ONYXKEYS from '@src/ONYXKEYS';
 import type {ReportAction, Transaction} from '@src/types/onyx';
-import type {OriginalMessageAddComment} from '@src/types/onyx/OriginalMessage';
 import TextCommentFragment from './comment/TextCommentFragment';
 import ReportActionItemFragment from './ReportActionItemFragment';
 
@@ -42,7 +41,7 @@ function ReportActionItemMessage({action, transaction, displayAsGroup, reportID,
     const styles = useThemeStyles();
     const {translate} = useLocalize();
 
-    const fragments = (action.previousMessage ?? action.message ?? []).filter((item) => !!item);
+    const fragments = ReportActionsUtils.getReportActionMessageFragments(action);
     const isIOUReport = ReportActionsUtils.isMoneyRequestAction(action);
 
     if (ReportActionsUtils.isMemberChangeAction(action)) {
@@ -61,9 +60,24 @@ function ReportActionItemMessage({action, transaction, displayAsGroup, reportID,
         );
     }
 
+    if (action.actionName === CONST.REPORT.ACTIONS.TYPE.ROOM_CHANGE_LOG.UPDATE_ROOM_DESCRIPTION) {
+        const fragment = ReportActionsUtils.getUpdateRoomDescriptionFragment(action);
+        return (
+            <View style={[styles.chatItemMessage, style]}>
+                <TextCommentFragment
+                    fragment={fragment}
+                    displayAsGroup={displayAsGroup}
+                    style={style}
+                    source=""
+                    styleAsDeleted={false}
+                />
+            </View>
+        );
+    }
+
     let iouMessage: string | undefined;
     if (isIOUReport) {
-        const originalMessage = action.actionName === CONST.REPORT.ACTIONS.TYPE.IOU ? action.originalMessage : null;
+        const originalMessage = action.actionName === CONST.REPORT.ACTIONS.TYPE.IOU ? ReportActionsUtils.getOriginalMessage(action) : null;
         const iouReportID = originalMessage?.IOUReportID;
         if (iouReportID) {
             iouMessage = ReportUtils.getIOUReportActionDisplayMessage(action, transaction);
@@ -89,8 +103,8 @@ function ReportActionItemMessage({action, transaction, displayAsGroup, reportID,
                 isThreadParentMessage={ReportActionsUtils.isThreadParentMessage(action, reportID)}
                 pendingAction={action.pendingAction}
                 actionName={action.actionName}
-                source={(action.originalMessage as OriginalMessageAddComment['originalMessage'])?.source}
-                accountID={action.actorAccountID ?? 0}
+                source={ReportActionsUtils.isAddCommentAction(action) ? ReportActionsUtils.getOriginalMessage(action)?.source : ''}
+                accountID={action.actorAccountID ?? -1}
                 style={style}
                 displayAsGroup={displayAsGroup}
                 isApprovedOrSubmittedReportAction={isApprovedOrSubmittedReportAction}
@@ -100,7 +114,7 @@ function ReportActionItemMessage({action, transaction, displayAsGroup, reportID,
                 // to decide if the fragment should be from left to right for RTL display names e.g. Arabic for proper
                 // formatting.
                 isFragmentContainingDisplayName={index === 0}
-                moderationDecision={action.message?.[0]?.moderationDecision?.decision}
+                moderationDecision={ReportActionsUtils.getReportActionMessage(action)?.moderationDecision?.decision}
             />
         ));
 
@@ -125,6 +139,6 @@ ReportActionItemMessage.displayName = 'ReportActionItemMessage';
 
 export default withOnyx<ReportActionItemMessageProps, ReportActionItemMessageOnyxProps>({
     transaction: {
-        key: ({action}) => `${ONYXKEYS.COLLECTION.TRANSACTION}${ReportActionsUtils.getLinkedTransactionID(action) ?? 0}`,
+        key: ({action}) => `${ONYXKEYS.COLLECTION.TRANSACTION}${ReportActionsUtils.getLinkedTransactionID(action) ?? -1}`,
     },
 })(ReportActionItemMessage);
diff --git a/src/pages/home/report/ReportActionItemMessageEdit.tsx b/src/pages/home/report/ReportActionItemMessageEdit.tsx
index 5fb23be145fb..15b901689ddc 100644
--- a/src/pages/home/report/ReportActionItemMessageEdit.tsx
+++ b/src/pages/home/report/ReportActionItemMessageEdit.tsx
@@ -1,12 +1,15 @@
-import ExpensiMark from 'expensify-common/lib/ExpensiMark';
 import lodashDebounce from 'lodash/debounce';
 import type {ForwardedRef} from 'react';
 import React, {forwardRef, useCallback, useEffect, useMemo, useRef, useState} from 'react';
-import {Keyboard, View} from 'react-native';
-import type {NativeSyntheticEvent, TextInput, TextInputFocusEventData, TextInputKeyPressEventData} from 'react-native';
-import type {OnyxEntry} from 'react-native-onyx';
+import {findNodeHandle, InteractionManager, Keyboard, View} from 'react-native';
+import type {MeasureInWindowOnSuccessCallback, NativeSyntheticEvent, TextInput, TextInputFocusEventData, TextInputKeyPressEventData, TextInputScrollEventData} from 'react-native';
+import {useFocusedInputHandler} from 'react-native-keyboard-controller';
+import {useOnyx} from 'react-native-onyx';
+import {useSharedValue} from 'react-native-reanimated';
 import type {Emoji} from '@assets/emojis/types';
+import type {MeasureParentContainerAndCursorCallback} from '@components/AutoCompleteSuggestions/types';
 import Composer from '@components/Composer';
+import type {TextSelection} from '@components/Composer/types';
 import EmojiPickerButton from '@components/EmojiPicker/EmojiPickerButton';
 import ExceededCommentLength from '@components/ExceededCommentLength';
 import Icon from '@components/Icon';
@@ -18,18 +21,19 @@ import useKeyboardState from '@hooks/useKeyboardState';
 import useLocalize from '@hooks/useLocalize';
 import usePrevious from '@hooks/usePrevious';
 import useReportScrollManager from '@hooks/useReportScrollManager';
+import useResponsiveLayout from '@hooks/useResponsiveLayout';
 import useStyleUtils from '@hooks/useStyleUtils';
 import useTheme from '@hooks/useTheme';
 import useThemeStyles from '@hooks/useThemeStyles';
-import useWindowDimensions from '@hooks/useWindowDimensions';
-import * as Browser from '@libs/Browser';
 import * as ComposerUtils from '@libs/ComposerUtils';
 import * as EmojiUtils from '@libs/EmojiUtils';
 import focusComposerWithDelay from '@libs/focusComposerWithDelay';
 import type {Selection} from '@libs/focusComposerWithDelay/types';
 import focusEditAfterCancelDelete from '@libs/focusEditAfterCancelDelete';
 import onyxSubscribe from '@libs/onyxSubscribe';
+import Parser from '@libs/Parser';
 import ReportActionComposeFocusManager from '@libs/ReportActionComposeFocusManager';
+import reportActionItemEventHandler from '@libs/ReportActionItemEventHandler';
 import * as ReportActionsUtils from '@libs/ReportActionsUtils';
 import * as ReportUtils from '@libs/ReportUtils';
 import setShouldShowComposeInputKeyboardAware from '@libs/setShouldShowComposeInputKeyboardAware';
@@ -37,11 +41,14 @@ import * as ComposerActions from '@userActions/Composer';
 import * as EmojiPickerAction from '@userActions/EmojiPickerAction';
 import * as InputFocus from '@userActions/InputFocus';
 import * as Report from '@userActions/Report';
-import * as User from '@userActions/User';
 import CONST from '@src/CONST';
 import ONYXKEYS from '@src/ONYXKEYS';
 import type * as OnyxTypes from '@src/types/onyx';
 import * as ReportActionContextMenu from './ContextMenu/ReportActionContextMenu';
+import getCursorPosition from './ReportActionCompose/getCursorPosition';
+import getScrollPosition from './ReportActionCompose/getScrollPosition';
+import type {SuggestionsRef} from './ReportActionCompose/ReportActionCompose';
+import Suggestions from './ReportActionCompose/Suggestions';
 import shouldUseEmojiPickerSelection from './shouldUseEmojiPickerSelection';
 
 type ReportActionItemMessageEditProps = {
@@ -60,38 +67,38 @@ type ReportActionItemMessageEditProps = {
     /** Whether or not the emoji picker is disabled */
     shouldDisableEmojiPicker?: boolean;
 
-    /** Stores user's preferred skin tone */
-    preferredSkinTone?: OnyxEntry<string | number>;
+    /** Whether report is from group policy */
+    isGroupPolicyReport?: boolean;
 };
 
 // native ids
 const emojiButtonID = 'emojiButton';
 const messageEditInput = 'messageEditInput';
 
-const isMobileSafari = Browser.isMobileSafari();
 const shouldUseForcedSelectionRange = shouldUseEmojiPickerSelection();
 
+// video source -> video attributes
+const draftMessageVideoAttributeCache = new Map<string, string>();
+
 function ReportActionItemMessageEdit(
-    {action, draftMessage, reportID, index, shouldDisableEmojiPicker = false, preferredSkinTone = CONST.EMOJI_DEFAULT_SKIN_TONE}: ReportActionItemMessageEditProps,
-    forwardedRef: ForwardedRef<(TextInput & HTMLTextAreaElement) | undefined>,
+    {action, draftMessage, reportID, index, isGroupPolicyReport, shouldDisableEmojiPicker = false}: ReportActionItemMessageEditProps,
+    forwardedRef: ForwardedRef<TextInput | HTMLTextAreaElement | undefined>,
 ) {
+    const [preferredSkinTone] = useOnyx(ONYXKEYS.PREFERRED_EMOJI_SKIN_TONE, {initialValue: CONST.EMOJI_DEFAULT_SKIN_TONE});
     const theme = useTheme();
     const styles = useThemeStyles();
     const StyleUtils = useStyleUtils();
+    const containerRef = useRef<View>(null);
     const reportScrollManager = useReportScrollManager();
     const {translate, preferredLocale} = useLocalize();
     const {isKeyboardShown} = useKeyboardState();
-    const {isSmallScreenWidth} = useWindowDimensions();
+    const {shouldUseNarrowLayout} = useResponsiveLayout();
     const prevDraftMessage = usePrevious(draftMessage);
-
-    const getInitialSelection = () => {
-        if (isMobileSafari) {
-            return {start: 0, end: 0};
-        }
-
-        const length = draftMessage.length;
-        return {start: length, end: length};
-    };
+    const suggestionsRef = useRef<SuggestionsRef>(null);
+    const mobileInputScrollPosition = useRef(0);
+    const cursorPositionValue = useSharedValue({x: 0, y: 0});
+    const tag = useSharedValue(-1);
+    const isInitialMount = useRef(true);
     const emojisPresentBefore = useRef<Emoji[]>([]);
     const [draft, setDraft] = useState(() => {
         if (draftMessage) {
@@ -99,7 +106,7 @@ function ReportActionItemMessageEdit(
         }
         return draftMessage;
     });
-    const [selection, setSelection] = useState<Selection>(getInitialSelection);
+    const [selection, setSelection] = useState<TextSelection>({start: draft.length, end: draft.length, positionX: 0, positionY: 0});
     const [isFocused, setIsFocused] = useState<boolean>(false);
     const {hasExceededMaxCommentLength, validateCommentMaxLength} = useHandleExceedMaxCommentLength();
     const [modal, setModal] = useState<OnyxTypes.Modal>({
@@ -110,30 +117,23 @@ function ReportActionItemMessageEdit(
 
     const textInputRef = useRef<(HTMLTextAreaElement & TextInput) | null>(null);
     const isFocusedRef = useRef<boolean>(false);
-    const insertedEmojis = useRef<Emoji[]>([]);
     const draftRef = useRef(draft);
     const emojiPickerSelectionRef = useRef<Selection | undefined>(undefined);
     // The ref to check whether the comment saving is in progress
     const isCommentPendingSaved = useRef(false);
 
     useEffect(() => {
-        const parser = new ExpensiMark();
-        const originalMessage = parser.htmlToMarkdown(action.message?.[0]?.html ?? '');
-        if (
-            ReportActionsUtils.isDeletedAction(action) ||
-            Boolean(action.message && draftMessage === originalMessage) ||
-            Boolean(prevDraftMessage === draftMessage || isCommentPendingSaved.current)
-        ) {
+        draftMessageVideoAttributeCache.clear();
+
+        const originalMessage = Parser.htmlToMarkdown(ReportActionsUtils.getReportActionHtml(action), {
+            cacheVideoAttributes: (videoSource, attrs) => draftMessageVideoAttributeCache.set(videoSource, attrs),
+        });
+        if (ReportActionsUtils.isDeletedAction(action) || !!(action.message && draftMessage === originalMessage) || !!(prevDraftMessage === draftMessage || isCommentPendingSaved.current)) {
             return;
         }
         setDraft(draftMessage);
     }, [draftMessage, action, prevDraftMessage]);
 
-    useEffect(() => {
-        // required for keeping last state of isFocused variable
-        isFocusedRef.current = isFocused;
-    }, [isFocused]);
-
     useEffect(() => {
         InputFocus.composerFocusKeepFocusOn(textInputRef.current as HTMLElement, isFocused, modal, onyxFocused);
     }, [isFocused, modal, onyxFocused]);
@@ -142,7 +142,7 @@ function ReportActionItemMessageEdit(
         const unsubscribeOnyxModal = onyxSubscribe({
             key: ONYXKEYS.MODAL,
             callback: (modalArg) => {
-                if (modalArg === null) {
+                if (modalArg === undefined) {
                     return;
                 }
                 setModal(modalArg);
@@ -152,7 +152,7 @@ function ReportActionItemMessageEdit(
         const unsubscribeOnyxFocused = onyxSubscribe({
             key: ONYXKEYS.INPUT_FOCUSED,
             callback: (modalArg) => {
-                if (modalArg === null) {
+                if (modalArg === undefined) {
                     return;
                 }
                 setOnyxFocused(modalArg);
@@ -170,47 +170,37 @@ function ReportActionItemMessageEdit(
         [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.
-        if (isMobileSafari) {
-            setDraft((prevDraft) => {
-                setSelection({
-                    start: prevDraft.length,
-                    end: prevDraft.length,
-                });
-                return prevDraft;
-            });
-
-            // Scroll content of textInputRef to bottom
-            if (textInputRef.current) {
-                textInputRef.current.scrollTop = textInputRef.current.scrollHeight;
+    useEffect(
+        () => {
+            if (isInitialMount.current) {
+                isInitialMount.current = false;
+                return;
             }
-        }
 
-        return () => {
-            InputFocus.callback(() => setIsFocused(false));
-            InputFocus.inputFocusChange(false);
+            return () => {
+                InputFocus.callback(() => setIsFocused(false));
+                InputFocus.inputFocusChange(false);
 
-            // Skip if the current report action is not active
-            if (!isActive()) {
-                return;
-            }
+                // Skip if the current report action is not active
+                if (!isActive()) {
+                    return;
+                }
 
-            if (EmojiPickerAction.isActive(action.reportActionID)) {
-                EmojiPickerAction.clearActive();
-            }
-            if (ReportActionContextMenu.isActiveReportAction(action.reportActionID)) {
-                ReportActionContextMenu.clearActiveReportAction();
-            }
+                if (EmojiPickerAction.isActive(action.reportActionID)) {
+                    EmojiPickerAction.clearActive();
+                }
+                if (ReportActionContextMenu.isActiveReportAction(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.
-            setShouldShowComposeInputKeyboardAware(true);
-        };
-        // eslint-disable-next-line react-hooks/exhaustive-deps -- this cleanup needs to be called only on unmount
-    }, [action.reportActionID]);
+                // Show the main composer when the focused message is deleted from another client
+                // to prevent the main composer stays hidden until we switch to another chat.
+                setShouldShowComposeInputKeyboardAware(true);
+            };
+        },
+        // eslint-disable-next-line react-compiler/react-compiler, react-hooks/exhaustive-deps -- this cleanup needs to be called only on unmount
+        [action.reportActionID],
+    );
 
     // show the composer after editing is complete for devices that hide the composer during editing.
     useEffect(() => () => ComposerActions.setShouldShowComposeInput(true), []);
@@ -237,19 +227,6 @@ function ReportActionItemMessageEdit(
         [debouncedSaveDraft],
     );
 
-    /**
-     * Update frequently used emojis list. We debounce this method in the constructor so that UpdateFrequentlyUsedEmojis
-     * API is not called too often.
-     */
-    const debouncedUpdateFrequentlyUsedEmojis = useMemo(
-        () =>
-            lodashDebounce(() => {
-                User.updateFrequentlyUsedEmojis(EmojiUtils.getFrequentlyUsedEmojis(insertedEmojis.current));
-                insertedEmojis.current = [];
-            }, 1000),
-        [],
-    );
-
     /**
      * Update the value of the draft in Onyx
      *
@@ -259,22 +236,17 @@ function ReportActionItemMessageEdit(
         (newDraftInput: string) => {
             const {text: newDraft, emojis, cursorPosition} = EmojiUtils.replaceAndExtractEmojis(newDraftInput, preferredSkinTone, preferredLocale);
 
-            if (emojis?.length > 0) {
-                const newEmojis = EmojiUtils.getAddedEmojis(emojis, emojisPresentBefore.current);
-                if (newEmojis?.length > 0) {
-                    insertedEmojis.current = [...insertedEmojis.current, ...newEmojis];
-                    debouncedUpdateFrequentlyUsedEmojis();
-                }
-            }
             emojisPresentBefore.current = emojis;
 
             setDraft(newDraft);
 
             if (newDraftInput !== newDraft) {
-                const position = Math.max(selection.end + (newDraft.length - draftRef.current.length), cursorPosition ?? 0);
+                const position = Math.max((selection?.end ?? 0) + (newDraft.length - draftRef.current.length), cursorPosition ?? 0);
                 setSelection({
                     start: position,
                     end: position,
+                    positionX: 0,
+                    positionY: 0,
                 });
             }
 
@@ -284,12 +256,12 @@ function ReportActionItemMessageEdit(
             debouncedSaveDraft(newDraft);
             isCommentPendingSaved.current = true;
         },
-        [debouncedSaveDraft, debouncedUpdateFrequentlyUsedEmojis, preferredSkinTone, preferredLocale, selection.end],
+        [debouncedSaveDraft, preferredSkinTone, preferredLocale, selection.end],
     );
 
     useEffect(() => {
         updateDraft(draft);
-        // eslint-disable-next-line react-hooks/exhaustive-deps -- run this only when language is changed
+        // eslint-disable-next-line react-compiler/react-compiler, react-hooks/exhaustive-deps -- run this only when language is changed
     }, [action.reportActionID, preferredLocale]);
 
     /**
@@ -330,7 +302,7 @@ function ReportActionItemMessageEdit(
             ReportActionContextMenu.showDeleteModal(reportID, action, true, deleteDraft, () => focusEditAfterCancelDelete(textInputRef.current));
             return;
         }
-        Report.editReportComment(reportID, action, trimmedNewDraft);
+        Report.editReportComment(reportID, action, trimmedNewDraft, Object.fromEntries(draftMessageVideoAttributeCache));
         deleteDraft();
     }, [action, deleteDraft, draft, reportID]);
 
@@ -341,6 +313,8 @@ function ReportActionItemMessageEdit(
         const newSelection = {
             start: selection.start + emoji.length + CONST.SPACE_LENGTH,
             end: selection.start + emoji.length + CONST.SPACE_LENGTH,
+            positionX: 0,
+            positionY: 0,
         };
         setSelection(newSelection);
 
@@ -352,6 +326,21 @@ function ReportActionItemMessageEdit(
         updateDraft(ComposerUtils.insertText(draft, selection, `${emoji} `));
     };
 
+    const hideSuggestionMenu = useCallback(() => {
+        if (!suggestionsRef.current) {
+            return;
+        }
+        suggestionsRef.current.updateShouldShowSuggestionMenuToFalse(false);
+    }, [suggestionsRef]);
+    const onSaveScrollAndHideSuggestionMenu = useCallback(
+        (e: NativeSyntheticEvent<TextInputScrollEventData>) => {
+            mobileInputScrollPosition.current = e?.nativeEvent?.contentOffset?.y ?? 0;
+
+            hideSuggestionMenu();
+        },
+        [hideSuggestionMenu],
+    );
+
     /**
      * Key event handlers that short cut to saving/canceling.
      *
@@ -359,10 +348,21 @@ function ReportActionItemMessageEdit(
      */
     const triggerSaveOrCancel = useCallback(
         (e: NativeSyntheticEvent<TextInputKeyPressEventData> | KeyboardEvent) => {
-            if (!e || ComposerUtils.canSkipTriggerHotkeys(isSmallScreenWidth, isKeyboardShown)) {
+            if (!e || ComposerUtils.canSkipTriggerHotkeys(shouldUseNarrowLayout, isKeyboardShown)) {
                 return;
             }
             const keyEvent = e as KeyboardEvent;
+            const isSuggestionsMenuVisible = suggestionsRef.current?.getIsSuggestionsMenuVisible();
+
+            if (isSuggestionsMenuVisible) {
+                suggestionsRef.current?.triggerHotkeyActions(keyEvent);
+                return;
+            }
+            if (keyEvent.key === CONST.KEYBOARD_SHORTCUTS.ESCAPE.shortcutKey && isSuggestionsMenuVisible) {
+                e.preventDefault();
+                hideSuggestionMenu();
+                return;
+            }
             if (keyEvent.key === CONST.KEYBOARD_SHORTCUTS.ENTER.shortcutKey && !keyEvent.shiftKey) {
                 e.preventDefault();
                 publishDraft();
@@ -371,7 +371,54 @@ function ReportActionItemMessageEdit(
                 deleteDraft();
             }
         },
-        [deleteDraft, isKeyboardShown, isSmallScreenWidth, publishDraft],
+        [deleteDraft, hideSuggestionMenu, isKeyboardShown, shouldUseNarrowLayout, publishDraft],
+    );
+
+    const measureContainer = useCallback((callback: MeasureInWindowOnSuccessCallback) => {
+        if (!containerRef.current) {
+            return;
+        }
+        containerRef.current.measureInWindow(callback);
+    }, []);
+
+    const measureParentContainerAndReportCursor = useCallback(
+        (callback: MeasureParentContainerAndCursorCallback) => {
+            const {scrollValue} = getScrollPosition({mobileInputScrollPosition, textInputRef});
+            const {x: xPosition, y: yPosition} = getCursorPosition({positionOnMobile: cursorPositionValue.value, positionOnWeb: selection});
+            measureContainer((x, y, width, height) => {
+                callback({
+                    x,
+                    y,
+                    width,
+                    height,
+                    scrollValue,
+                    cursorCoordinates: {x: xPosition, y: yPosition},
+                });
+            });
+        },
+        [cursorPositionValue.value, measureContainer, selection],
+    );
+
+    useEffect(() => {
+        // We use the tag to store the native ID of the text input. Later, we use it in onSelectionChange to pick up the proper text input data.
+
+        // eslint-disable-next-line react-compiler/react-compiler
+        tag.value = findNodeHandle(textInputRef.current) ?? -1;
+    }, [tag]);
+    useFocusedInputHandler(
+        {
+            onSelectionChange: (event) => {
+                'worklet';
+
+                if (event.target === tag.value) {
+                    cursorPositionValue.value = {
+                        x: event.selection.end.x,
+                        y: event.selection.end.y,
+                    };
+                }
+            },
+        },
+        [],
     );
 
     /**
@@ -383,9 +430,21 @@ function ReportActionItemMessageEdit(
         validateCommentMaxLength(draft, {reportID});
     }, [draft, reportID, validateCommentMaxLength]);
 
+    useEffect(() => {
+        // required for keeping last state of isFocused variable
+        isFocusedRef.current = isFocused;
+
+        if (!isFocused) {
+            hideSuggestionMenu();
+        }
+    }, [isFocused, hideSuggestionMenu]);
+
     return (
         <>
-            <View style={[styles.chatItemMessage, styles.flexRow]}>
+            <View
+                style={[styles.chatItemMessage, styles.flexRow]}
+                ref={containerRef}
+            >
                 <View
                     style={[
                         isFocused ? styles.chatItemComposeBoxFocusedColor : styles.chatItemComposeBoxColor,
@@ -431,11 +490,15 @@ function ReportActionItemMessageEdit(
                             onChangeText={updateDraft} // Debounced saveDraftComment
                             onKeyPress={triggerSaveOrCancel}
                             value={draft}
-                            maxLines={isSmallScreenWidth ? CONST.COMPOSER.MAX_LINES_SMALL_SCREEN : CONST.COMPOSER.MAX_LINES} // This is the same that slack has
+                            maxLines={shouldUseNarrowLayout ? CONST.COMPOSER.MAX_LINES_SMALL_SCREEN : CONST.COMPOSER.MAX_LINES} // This is the same that slack has
                             style={[styles.textInputCompose, styles.flex1, styles.bgTransparent]}
                             onFocus={() => {
                                 setIsFocused(true);
-                                reportScrollManager.scrollToIndex(index, true);
+                                InteractionManager.runAfterInteractions(() => {
+                                    requestAnimationFrame(() => {
+                                        reportScrollManager.scrollToIndex(index, true);
+                                    });
+                                });
                                 setShouldShowComposeInputKeyboardAware(false);
 
                                 // Clear active report action when another action gets focused
@@ -448,17 +511,33 @@ function ReportActionItemMessageEdit(
                             }}
                             onBlur={(event: NativeSyntheticEvent<TextInputFocusEventData>) => {
                                 setIsFocused(false);
-                                // @ts-expect-error TODO: TextInputFocusEventData doesn't contain relatedTarget.
                                 const relatedTargetId = event.nativeEvent?.relatedTarget?.id;
+                                // eslint-disable-next-line @typescript-eslint/prefer-nullish-coalescing
                                 if ((relatedTargetId && [messageEditInput, emojiButtonID].includes(relatedTargetId)) || EmojiPickerAction.isEmojiPickerVisible()) {
                                     return;
                                 }
                                 setShouldShowComposeInputKeyboardAware(true);
                             }}
+                            onLayout={reportActionItemEventHandler.handleComposerLayoutChange(reportScrollManager, index)}
                             selection={selection}
                             onSelectionChange={(e) => setSelection(e.nativeEvent.selection)}
+                            isGroupPolicyReport={isGroupPolicyReport}
+                            shouldCalculateCaretPosition
+                            onScroll={onSaveScrollAndHideSuggestionMenu}
                         />
                     </View>
+
+                    <Suggestions
+                        ref={suggestionsRef}
+                        isComposerFocused={textInputRef.current?.isFocused()}
+                        updateComment={updateDraft}
+                        measureParentContainerAndReportCursor={measureParentContainerAndReportCursor}
+                        isGroupPolicyReport={false}
+                        value={draft}
+                        selection={selection}
+                        setSelection={setSelection}
+                    />
+
                     <View style={styles.editChatItemEmojiWrapper}>
                         <EmojiPickerButton
                             isDisabled={shouldDisableEmojiPicker}
diff --git a/src/pages/home/report/ReportActionItemParentAction.tsx b/src/pages/home/report/ReportActionItemParentAction.tsx
index 5de85eb5f43f..41943485f171 100644
--- a/src/pages/home/report/ReportActionItemParentAction.tsx
+++ b/src/pages/home/report/ReportActionItemParentAction.tsx
@@ -2,10 +2,9 @@ import React, {useEffect, useRef, useState} from 'react';
 import {View} from 'react-native';
 import type {OnyxEntry} from 'react-native-onyx';
 import OfflineWithFeedback from '@components/OfflineWithFeedback';
+import TripDetailsView from '@components/ReportActionItem/TripDetailsView';
 import useNetwork from '@hooks/useNetwork';
-import useStyleUtils from '@hooks/useStyleUtils';
 import useThemeStyles from '@hooks/useThemeStyles';
-import useWindowDimensions from '@hooks/useWindowDimensions';
 import Navigation from '@libs/Navigation/Navigation';
 import onyxSubscribe from '@libs/onyxSubscribe';
 import * as ReportActionsUtils from '@libs/ReportActionsUtils';
@@ -64,9 +63,8 @@ function ReportActionItemParentAction({
     shouldUseThreadDividerLine = false,
 }: ReportActionItemParentActionProps) {
     const styles = useThemeStyles();
-    const StyleUtils = useStyleUtils();
-    const {isSmallScreenWidth} = useWindowDimensions();
     const ancestorIDs = useRef(ReportUtils.getAllAncestorReportActionIDs(report));
+    const ancestorReports = useRef<Record<string, OnyxEntry<OnyxTypes.Report>>>({});
     const [allAncestors, setAllAncestors] = useState<ReportUtils.Ancestor[]>([]);
     const {isOffline} = useNetwork();
 
@@ -77,7 +75,8 @@ function ReportActionItemParentAction({
             unsubscribeReports.push(
                 onyxSubscribe({
                     key: `${ONYXKEYS.COLLECTION.REPORT}${ancestorReportID}`,
-                    callback: () => {
+                    callback: (val) => {
+                        ancestorReports.current[ancestorReportID] = val;
                         setAllAncestors(ReportUtils.getAllAncestorReportActions(report));
                     },
                 }),
@@ -96,45 +95,61 @@ function ReportActionItemParentAction({
             unsubscribeReports.forEach((unsubscribeReport) => unsubscribeReport());
             unsubscribeReportActions.forEach((unsubscribeReportAction) => unsubscribeReportAction());
         };
-        // eslint-disable-next-line react-hooks/exhaustive-deps
+        // eslint-disable-next-line react-compiler/react-compiler, react-hooks/exhaustive-deps
     }, []);
 
     return (
-        <View style={[StyleUtils.getReportWelcomeContainerStyle(isSmallScreenWidth)]}>
+        <View style={[styles.pRelative]}>
             <AnimatedEmptyStateBackground />
-            <View style={[StyleUtils.getReportWelcomeTopMarginStyle(isSmallScreenWidth)]} />
             {allAncestors.map((ancestor) => (
                 <OfflineWithFeedback
                     key={ancestor.reportAction.reportActionID}
-                    shouldDisableOpacity={Boolean(ancestor.reportAction?.pendingAction)}
+                    shouldDisableOpacity={!!ancestor.reportAction?.pendingAction}
                     pendingAction={ancestor.report?.pendingFields?.addWorkspaceRoom ?? ancestor.report?.pendingFields?.createChat}
                     errors={ancestor.report?.errorFields?.addWorkspaceRoom ?? ancestor.report?.errorFields?.createChat}
                     errorRowStyles={[styles.ml10, styles.mr2]}
                     onClose={() => Report.navigateToConciergeChatAndDeleteReport(ancestor.report.reportID)}
                 >
-                    <ThreadDivider ancestor={ancestor} />
-                    <ReportActionItem
-                        onPress={() => {
-                            const isVisibleAction = ReportActionsUtils.shouldReportActionBeVisible(ancestor.reportAction, ancestor.reportAction.reportActionID ?? '');
-                            // Pop the thread report screen before navigating to the chat report.
-                            Navigation.goBack(ROUTES.REPORT_WITH_ID.getRoute(ancestor.report.parentReportID ?? ''));
-                            if (isVisibleAction && !isOffline) {
-                                // Pop the chat report screen before navigating to the linked report action.
-                                Navigation.goBack(ROUTES.REPORT_WITH_ID.getRoute(ancestor.report.parentReportID ?? '', ancestor.reportAction.reportActionID));
-                            }
-                        }}
-                        parentReportAction={parentReportAction}
-                        report={ancestor.report}
-                        reportActions={reportActions}
-                        transactionThreadReport={transactionThreadReport}
-                        action={ancestor.reportAction}
-                        displayAsGroup={false}
-                        isMostRecentIOUReportAction={false}
-                        shouldDisplayNewMarker={ancestor.shouldDisplayNewMarker}
-                        index={index}
-                        isFirstVisibleReportAction={isFirstVisibleReportAction}
-                        shouldUseThreadDividerLine={shouldUseThreadDividerLine}
+                    <ThreadDivider
+                        ancestor={ancestor}
+                        isLinkDisabled={!ReportUtils.canCurrentUserOpenReport(ancestorReports.current?.[ancestor?.report?.reportID ?? '-1'])}
                     />
+                    {ReportActionsUtils.isTripPreview(ancestor?.reportAction) ? (
+                        <OfflineWithFeedback pendingAction={ancestor.reportAction.pendingAction}>
+                            <TripDetailsView
+                                tripRoomReportID={ReportActionsUtils.getOriginalMessage(ancestor.reportAction)?.linkedReportID ?? '-1'}
+                                shouldShowHorizontalRule={false}
+                            />
+                        </OfflineWithFeedback>
+                    ) : (
+                        <ReportActionItem
+                            onPress={
+                                ReportUtils.canCurrentUserOpenReport(ancestorReports.current?.[ancestor?.report?.parentReportID ?? '-1'])
+                                    ? () => {
+                                          const isVisibleAction = ReportActionsUtils.shouldReportActionBeVisible(ancestor.reportAction, ancestor.reportAction.reportActionID ?? '-1');
+                                          // Pop the thread report screen before navigating to the chat report.
+                                          Navigation.goBack(ROUTES.REPORT_WITH_ID.getRoute(ancestor.report.parentReportID ?? '-1'));
+                                          if (isVisibleAction && !isOffline) {
+                                              // Pop the chat report screen before navigating to the linked report action.
+                                              Navigation.goBack(ROUTES.REPORT_WITH_ID.getRoute(ancestor.report.parentReportID ?? '-1', ancestor.reportAction.reportActionID));
+                                          }
+                                      }
+                                    : undefined
+                            }
+                            parentReportAction={parentReportAction}
+                            report={ancestor.report}
+                            reportActions={reportActions}
+                            transactionThreadReport={transactionThreadReport}
+                            action={ancestor.reportAction}
+                            displayAsGroup={false}
+                            isMostRecentIOUReportAction={false}
+                            shouldDisplayNewMarker={ancestor.shouldDisplayNewMarker}
+                            index={index}
+                            isFirstVisibleReportAction={isFirstVisibleReportAction}
+                            shouldUseThreadDividerLine={shouldUseThreadDividerLine}
+                            hideThreadReplies
+                        />
+                    )}
                 </OfflineWithFeedback>
             ))}
             {shouldDisplayReplyDivider && <RepliesDivider shouldHideThreadDividerLine={shouldHideThreadDividerLine} />}
diff --git a/src/pages/home/report/ReportActionItemSingle.tsx b/src/pages/home/report/ReportActionItemSingle.tsx
index 234147a30bd5..95a7332f0606 100644
--- a/src/pages/home/report/ReportActionItemSingle.tsx
+++ b/src/pages/home/report/ReportActionItemSingle.tsx
@@ -2,7 +2,9 @@ import React, {useCallback, useMemo} from 'react';
 import type {StyleProp, ViewStyle} from 'react-native';
 import {View} from 'react-native';
 import type {OnyxEntry} from 'react-native-onyx';
+import {useOnyx} from 'react-native-onyx';
 import Avatar from '@components/Avatar';
+import {FallbackAvatar} from '@components/Icon/Expensicons';
 import MultipleAvatars from '@components/MultipleAvatars';
 import OfflineWithFeedback from '@components/OfflineWithFeedback';
 import {usePersonalDetails} from '@components/OnyxProvider';
@@ -18,9 +20,10 @@ import useThemeStyles from '@hooks/useThemeStyles';
 import ControlSelection from '@libs/ControlSelection';
 import DateUtils from '@libs/DateUtils';
 import Navigation from '@libs/Navigation/Navigation';
+import {getReportActionMessage} from '@libs/ReportActionsUtils';
 import * as ReportUtils from '@libs/ReportUtils';
-import * as UserUtils from '@libs/UserUtils';
 import CONST from '@src/CONST';
+import ONYXKEYS from '@src/ONYXKEYS';
 import ROUTES from '@src/ROUTES';
 import type {Report, ReportAction} from '@src/types/onyx';
 import type {Icon} from '@src/types/onyx/OnyxCommon';
@@ -79,20 +82,26 @@ function ReportActionItemSingle({
     const {translate} = useLocalize();
     const personalDetails = usePersonalDetails() ?? CONST.EMPTY_OBJECT;
     const actorAccountID = ReportUtils.getReportActionActorAccountID(action, iouReport);
+    const [invoiceReceiverPolicy] = useOnyx(`${ONYXKEYS.COLLECTION.POLICY}${report.invoiceReceiver && 'policyID' in report.invoiceReceiver ? report.invoiceReceiver.policyID : -1}`);
 
     let displayName = ReportUtils.getDisplayNameForParticipant(actorAccountID);
     const {avatar, login, pendingFields, status, fallbackIcon} = personalDetails[actorAccountID ?? -1] ?? {};
     // eslint-disable-next-line @typescript-eslint/prefer-nullish-coalescing
     let actorHint = (login || (displayName ?? '')).replace(CONST.REGEX.MERGED_ACCOUNT_PREFIX, '');
-    const displayAllActors = useMemo(() => action?.actionName === CONST.REPORT.ACTIONS.TYPE.REPORT_PREVIEW && iouReport, [action?.actionName, iouReport]);
-    const isInvoiceReport = ReportUtils.isInvoiceReport(iouReport ?? {});
+    const isTripRoom = ReportUtils.isTripRoom(report);
+    const isReportPreviewAction = action?.actionName === CONST.REPORT.ACTIONS.TYPE.REPORT_PREVIEW;
+    const displayAllActors = isReportPreviewAction && !isTripRoom;
+    const isInvoiceReport = ReportUtils.isInvoiceReport(iouReport ?? null);
     const isWorkspaceActor = isInvoiceReport || (ReportUtils.isPolicyExpenseChat(report) && (!actorAccountID || displayAllActors));
-    let avatarSource = UserUtils.getAvatar(avatar ?? '', actorAccountID);
+    const ownerAccountID = iouReport?.ownerAccountID ?? action?.childOwnerAccountID;
+    let avatarSource = avatar;
+    let avatarId: number | string | undefined = actorAccountID;
 
     if (isWorkspaceActor) {
         displayName = ReportUtils.getPolicyName(report);
         actorHint = displayName;
         avatarSource = ReportUtils.getWorkspaceAvatar(report);
+        avatarId = report.policyID;
     } else if (action?.delegateAccountID && personalDetails[action?.delegateAccountID]) {
         // We replace the actor's email, name, and avatar with the Copilot manually for now. And only if we have their
         // details. This will be improved upon when the Copilot feature is implemented.
@@ -100,28 +109,38 @@ function ReportActionItemSingle({
         const delegateDisplayName = delegateDetails?.displayName;
         actorHint = `${delegateDisplayName} (${translate('reportAction.asCopilot')} ${displayName})`;
         displayName = actorHint;
-        avatarSource = UserUtils.getAvatar(delegateDetails?.avatar ?? '', Number(action.delegateAccountID));
+        avatarSource = delegateDetails?.avatar;
+        avatarId = action.delegateAccountID;
+    } else if (isReportPreviewAction && isTripRoom) {
+        displayName = report?.reportName ?? '';
     }
 
     // If this is a report preview, display names and avatars of both people involved
     let secondaryAvatar: Icon;
     const primaryDisplayName = displayName;
     if (displayAllActors) {
-        // The ownerAccountID and actorAccountID can be the same if the a user submits an expense back from the IOU's original creator, in that case we need to use managerID to avoid displaying the same user twice
-        const secondaryAccountId = iouReport?.ownerAccountID === actorAccountID || isInvoiceReport ? iouReport?.managerID : iouReport?.ownerAccountID;
-        const secondaryUserAvatar = personalDetails?.[secondaryAccountId ?? -1]?.avatar ?? '';
-        const secondaryDisplayName = ReportUtils.getDisplayNameForParticipant(secondaryAccountId);
+        if (ReportUtils.isInvoiceRoom(report) && !ReportUtils.isIndividualInvoiceRoom(report)) {
+            const secondaryPolicyAvatar = invoiceReceiverPolicy?.avatarURL ?? ReportUtils.getDefaultWorkspaceAvatar(invoiceReceiverPolicy?.name);
 
-        if (!isInvoiceReport) {
-            displayName = `${primaryDisplayName} & ${secondaryDisplayName}`;
-        }
+            secondaryAvatar = {
+                source: secondaryPolicyAvatar,
+                type: CONST.ICON_TYPE_WORKSPACE,
+                name: invoiceReceiverPolicy?.name,
+                id: invoiceReceiverPolicy?.id,
+            };
+        } else {
+            // The ownerAccountID and actorAccountID can be the same if a user submits an expense back from the IOU's original creator, in that case we need to use managerID to avoid displaying the same user twice
+            const secondaryAccountId = ownerAccountID === actorAccountID || isInvoiceReport ? actorAccountID : ownerAccountID;
+            const secondaryUserAvatar = personalDetails?.[secondaryAccountId ?? -1]?.avatar ?? FallbackAvatar;
+            const secondaryDisplayName = ReportUtils.getDisplayNameForParticipant(secondaryAccountId);
 
-        secondaryAvatar = {
-            source: UserUtils.getAvatar(secondaryUserAvatar, secondaryAccountId),
-            type: CONST.ICON_TYPE_AVATAR,
-            name: secondaryDisplayName ?? '',
-            id: secondaryAccountId,
-        };
+            secondaryAvatar = {
+                source: secondaryUserAvatar,
+                type: CONST.ICON_TYPE_AVATAR,
+                name: secondaryDisplayName ?? '',
+                id: secondaryAccountId,
+            };
+        }
     } else if (!isWorkspaceActor) {
         // eslint-disable-next-line @typescript-eslint/prefer-nullish-coalescing
         const avatarIconIndex = report.isOwnPolicyExpenseChat || ReportUtils.isPolicyExpenseChat(report) ? 0 : 1;
@@ -132,10 +151,10 @@ function ReportActionItemSingle({
         secondaryAvatar = {name: '', source: '', type: 'avatar'};
     }
     const icon = {
-        source: avatarSource,
+        source: avatarSource ?? FallbackAvatar,
         type: isWorkspaceActor ? CONST.ICON_TYPE_WORKSPACE : CONST.ICON_TYPE_AVATAR,
         name: primaryDisplayName ?? '',
-        id: isWorkspaceActor ? '' : actorAccountID,
+        id: avatarId,
     };
 
     // Since the display name for a report action message is delivered with the report history as an array of fragments
@@ -168,7 +187,7 @@ function ReportActionItemSingle({
 
     const shouldDisableDetailPage = useMemo(
         () =>
-            CONST.RESTRICTED_ACCOUNT_IDS.includes(actorAccountID ?? 0) ||
+            CONST.RESTRICTED_ACCOUNT_IDS.includes(actorAccountID ?? -1) ||
             (!isWorkspaceActor && ReportUtils.isOptimisticPersonalDetail(action?.delegateAccountID ? Number(action.delegateAccountID) : actorAccountID ?? -1)),
         [action, isWorkspaceActor, actorAccountID],
     );
@@ -195,8 +214,8 @@ function ReportActionItemSingle({
         }
         return (
             <UserDetailsTooltip
-                accountID={Number(actorAccountID ?? 0)}
-                delegateAccountID={Number(action?.delegateAccountID ?? 0)}
+                accountID={Number(actorAccountID ?? -1)}
+                delegateAccountID={Number(action?.delegateAccountID ?? -1)}
                 icon={icon}
             >
                 <View>
@@ -205,7 +224,7 @@ function ReportActionItemSingle({
                         source={icon.source}
                         type={icon.type}
                         name={icon.name}
-                        accountID={icon.id}
+                        avatarID={icon.id}
                         fallbackIcon={fallbackIcon}
                     />
                 </View>
@@ -246,16 +265,16 @@ function ReportActionItemSingle({
                                 <ReportActionItemFragment
                                     // eslint-disable-next-line react/no-array-index-key
                                     key={`person-${action?.reportActionID}-${index}`}
-                                    accountID={actorAccountID ?? 0}
+                                    accountID={actorAccountID ?? -1}
                                     fragment={{...fragment, type: fragment.type ?? '', text: fragment.text ?? ''}}
                                     delegateAccountID={action?.delegateAccountID}
                                     isSingleLine
                                     actorIcon={icon}
-                                    moderationDecision={action?.message?.[0]?.moderationDecision?.decision}
+                                    moderationDecision={getReportActionMessage(action)?.moderationDecision?.decision}
                                 />
                             ))}
                         </PressableWithoutFeedback>
-                        {Boolean(hasEmojiStatus) && (
+                        {!!hasEmojiStatus && (
                             <Tooltip text={statusTooltipText}>
                                 <Text
                                     style={styles.userReportStatusEmoji}
diff --git a/src/pages/home/report/ReportActionItemThread.tsx b/src/pages/home/report/ReportActionItemThread.tsx
index c0dbe2a3825d..94a8592d9607 100644
--- a/src/pages/home/report/ReportActionItemThread.tsx
+++ b/src/pages/home/report/ReportActionItemThread.tsx
@@ -6,6 +6,7 @@ import PressableWithSecondaryInteraction from '@components/PressableWithSecondar
 import Text from '@components/Text';
 import useLocalize from '@hooks/useLocalize';
 import useThemeStyles from '@hooks/useThemeStyles';
+import Timing from '@libs/actions/Timing';
 import * as Report from '@userActions/Report';
 import CONST from '@src/CONST';
 import type {Icon} from '@src/types/onyx/OnyxCommon';
@@ -45,6 +46,7 @@ function ReportActionItemThread({numberOfReplies, icons, mostRecentReply, childR
             <PressableWithSecondaryInteraction
                 onPress={() => {
                     Report.navigateToAndOpenChildReport(childReportID);
+                    Timing.start(CONST.TIMING.OPEN_REPORT_THREAD);
                 }}
                 role={CONST.ROLE.BUTTON}
                 accessibilityLabel={`${numberOfReplies} ${replyText}`}
diff --git a/src/pages/home/report/ReportActionsList.tsx b/src/pages/home/report/ReportActionsList.tsx
index fd41185242bb..676c27ec5971 100644
--- a/src/pages/home/report/ReportActionsList.tsx
+++ b/src/pages/home/report/ReportActionsList.tsx
@@ -5,6 +5,7 @@ import type {DebouncedFunc} from 'lodash';
 import React, {memo, useCallback, useEffect, useMemo, useRef, useState} from 'react';
 import {DeviceEventEmitter, InteractionManager} from 'react-native';
 import type {LayoutChangeEvent, NativeScrollEvent, NativeSyntheticEvent, StyleProp, ViewStyle} from 'react-native';
+import {useOnyx} from 'react-native-onyx';
 import type {OnyxEntry} from 'react-native-onyx';
 import Animated, {useAnimatedStyle, useSharedValue, withTiming} from 'react-native-reanimated';
 import InvertedFlatList from '@components/InvertedFlatList';
@@ -15,6 +16,7 @@ import type {WithCurrentUserPersonalDetailsProps} from '@components/withCurrentU
 import useLocalize from '@hooks/useLocalize';
 import useNetwork from '@hooks/useNetwork';
 import useReportScrollManager from '@hooks/useReportScrollManager';
+import useResponsiveLayout from '@hooks/useResponsiveLayout';
 import useThemeStyles from '@hooks/useThemeStyles';
 import useWindowDimensions from '@hooks/useWindowDimensions';
 import DateUtils from '@libs/DateUtils';
@@ -22,14 +24,14 @@ import Navigation from '@libs/Navigation/Navigation';
 import * as ReportActionsUtils from '@libs/ReportActionsUtils';
 import * as ReportUtils from '@libs/ReportUtils';
 import Visibility from '@libs/Visibility';
-import type {CentralPaneNavigatorParamList} from '@navigation/types';
+import type {AuthScreensParamList} from '@navigation/types';
 import variables from '@styles/variables';
 import * as Report from '@userActions/Report';
 import CONST from '@src/CONST';
+import ONYXKEYS from '@src/ONYXKEYS';
 import ROUTES from '@src/ROUTES';
 import type SCREENS from '@src/SCREENS';
 import type * as OnyxTypes from '@src/types/onyx';
-import type {EmptyObject} from '@src/types/utils/EmptyObject';
 import FloatingMessageCounter from './FloatingMessageCounter';
 import getInitialNumToRender from './getInitialNumReportActionsToRender';
 import ListBoundaryLoader from './ListBoundaryLoader';
@@ -65,9 +67,15 @@ type ReportActionsListProps = WithCurrentUserPersonalDetailsProps & {
     /** Are we loading more report actions? */
     isLoadingOlderReportActions?: boolean;
 
+    /** Was there an error when loading older report actions? */
+    hasLoadingOlderReportActionsError?: boolean;
+
     /** Are we loading newer report actions? */
     isLoadingNewerReportActions?: boolean;
 
+    /** Was there an error when loading newer report actions? */
+    hasLoadingNewerReportActionsError?: boolean;
+
     /** Callback executed on list layout */
     onLayout: (event: LayoutChangeEvent) => void;
 
@@ -75,10 +83,10 @@ type ReportActionsListProps = WithCurrentUserPersonalDetailsProps & {
     onScroll?: (event: NativeSyntheticEvent<NativeScrollEvent>) => void;
 
     /** Function to load more chats */
-    loadOlderChats: () => void;
+    loadOlderChats: (force?: boolean) => void;
 
     /** Function to load newer chats */
-    loadNewerChats: () => void;
+    loadNewerChats: (force?: boolean) => void;
 
     /** Whether the composer is in full size */
     isComposerFullSize?: boolean;
@@ -102,13 +110,6 @@ const MSG_VISIBLE_THRESHOLD = 250;
 // the subscriptions could otherwise be conflicting.
 const newActionUnsubscribeMap: Record<string, () => void> = {};
 
-// Caching the reportID and reportActionID for unread markers ensures persistent tracking
-// across multiple reports, preserving the green line placement and allowing retrieval
-// of the relevant reportActionID for displaying the green line.
-// We need to persist it across reports because there are at least 3 ReportScreen components created so the
-// internal states are resetted or recreated.
-const cacheUnreadMarkers = new Map<string, string>();
-
 // Seems that there is an architecture issue that prevents us from using the reportID with useRef
 // the useRef value gets reset when the reportID changes, so we use a global variable to keep track
 let prevReportID: string | null = null;
@@ -139,7 +140,9 @@ function ReportActionsList({
     parentReportAction,
     isLoadingInitialReportActions = false,
     isLoadingOlderReportActions = false,
+    hasLoadingOlderReportActionsError = false,
     isLoadingNewerReportActions = false,
+    hasLoadingNewerReportActionsError = false,
     sortedReportActions,
     onScroll,
     mostRecentIOUReportActionID = '',
@@ -156,17 +159,22 @@ function ReportActionsList({
     const personalDetailsList = usePersonalDetails() || CONST.EMPTY_OBJECT;
     const styles = useThemeStyles();
     const {translate} = useLocalize();
-    const {isSmallScreenWidth, windowHeight} = useWindowDimensions();
+    const {windowHeight} = useWindowDimensions();
+    const {shouldUseNarrowLayout} = useResponsiveLayout();
+
     const {isOffline} = useNetwork();
-    const route = useRoute<RouteProp<CentralPaneNavigatorParamList, typeof SCREENS.REPORT>>();
+    const route = useRoute<RouteProp<AuthScreensParamList, typeof SCREENS.REPORT>>();
     const opacity = useSharedValue(0);
     const reportScrollManager = useReportScrollManager();
-    const userActiveSince = useRef<string | null>(null);
+    const userActiveSince = useRef<string>(DateUtils.getDBTime());
     const lastMessageTime = useRef<string | null>(null);
-
-    const [isVisible, setIsVisible] = useState(false);
+    const [isVisible, setIsVisible] = useState(Visibility.isVisible());
+    const [messageManuallyMarkedUnread, setMessageManuallyMarkedUnread] = useState(0);
     const isFocused = useIsFocused();
 
+    const [reportNameValuePairs] = useOnyx(`${ONYXKEYS.COLLECTION.REPORT_NAME_VALUE_PAIRS}${report?.reportID ?? -1}`);
+    const [accountID] = useOnyx(ONYXKEYS.SESSION, {selector: (session) => session?.accountID ?? 0});
+
     useEffect(() => {
         const unsubscriber = Visibility.onVisibilityChange(() => {
             setIsVisible(Visibility.isVisible());
@@ -175,48 +183,129 @@ function ReportActionsList({
         return unsubscriber;
     }, []);
 
-    const markerInit = () => {
-        if (!cacheUnreadMarkers.has(report.reportID)) {
-            return null;
-        }
-        return cacheUnreadMarkers.get(report.reportID);
-    };
-    const [currentUnreadMarker, setCurrentUnreadMarker] = useState(markerInit);
     const scrollingVerticalOffset = useRef(0);
     const readActionSkipped = useRef(false);
     const hasHeaderRendered = useRef(false);
     const hasFooterRendered = useRef(false);
-    const lastVisibleActionCreatedRef = useRef(report.lastVisibleActionCreated);
-    const lastReadTimeRef = useRef(report.lastReadTime);
+    const linkedReportActionID = route?.params?.reportActionID ?? '-1';
 
     const sortedVisibleReportActions = useMemo(
         () =>
             sortedReportActions.filter(
                 (reportAction) =>
-                    (isOffline || reportAction.pendingAction !== CONST.RED_BRICK_ROAD_PENDING_ACTION.DELETE || reportAction.errors) &&
+                    (isOffline ||
+                        ReportActionsUtils.isDeletedParentAction(reportAction) ||
+                        reportAction.pendingAction !== CONST.RED_BRICK_ROAD_PENDING_ACTION.DELETE ||
+                        reportAction.errors) &&
                     ReportActionsUtils.shouldReportActionBeVisible(reportAction, reportAction.reportActionID),
             ),
         [sortedReportActions, isOffline],
     );
+
+    /**
+     * The timestamp for the unread marker.
+     *
+     * This should ONLY be updated when the user
+     * - switches reports
+     * - marks a message as read/unread
+     * - reads a new message as it is received
+     */
+    const [unreadMarkerTime, setUnreadMarkerTime] = useState(report.lastReadTime ?? '');
+    useEffect(() => {
+        setUnreadMarkerTime(report.lastReadTime ?? '');
+        setMessageManuallyMarkedUnread(0);
+
+        // eslint-disable-next-line react-compiler/react-compiler, react-hooks/exhaustive-deps
+    }, [report.reportID]);
+
+    /**
+     * The reportActionID the unread marker should display above
+     */
+    const unreadMarkerReportActionID = useMemo(() => {
+        const shouldDisplayNewMarker = (reportAction: OnyxTypes.ReportAction, index: number): boolean => {
+            const nextMessage = sortedVisibleReportActions[index + 1];
+            const isCurrentMessageUnread = isMessageUnread(reportAction, unreadMarkerTime);
+            const isNextMessageRead = !nextMessage || !isMessageUnread(nextMessage, unreadMarkerTime);
+            let shouldDisplay = isCurrentMessageUnread && isNextMessageRead && !ReportActionsUtils.shouldHideNewMarker(reportAction);
+
+            if (shouldDisplay && !messageManuallyMarkedUnread) {
+                // Prevent displaying a new marker line when report action is of type "REPORT_PREVIEW" and last actor is the current user
+                const isFromCurrentUser = accountID === (ReportActionsUtils.isReportPreviewAction(reportAction) ? !reportAction.childLastActorAccountID : reportAction.actorAccountID);
+                const isWithinVisibleThreshold = scrollingVerticalOffset.current < MSG_VISIBLE_THRESHOLD ? reportAction.created < (userActiveSince.current ?? '') : true;
+                shouldDisplay = !isFromCurrentUser && isWithinVisibleThreshold;
+            }
+
+            return shouldDisplay;
+        };
+
+        // Scan through each visible report action until we find the appropriate action to show the unread marker
+        for (let index = 0; index < sortedVisibleReportActions.length; index++) {
+            const reportAction = sortedVisibleReportActions[index];
+            if (shouldDisplayNewMarker(reportAction, index)) {
+                return reportAction.reportActionID;
+            }
+        }
+
+        return null;
+    }, [accountID, sortedVisibleReportActions, unreadMarkerTime, messageManuallyMarkedUnread]);
+
+    /**
+     * Subscribe to read/unread events and update our unreadMarkerTime
+     */
+    useEffect(() => {
+        const unreadActionSubscription = DeviceEventEmitter.addListener(`unreadAction_${report.reportID}`, (newLastReadTime: string) => {
+            setUnreadMarkerTime(newLastReadTime);
+            setMessageManuallyMarkedUnread(new Date().getTime());
+        });
+        const readNewestActionSubscription = DeviceEventEmitter.addListener(`readNewestAction_${report.reportID}`, (newLastReadTime: string) => {
+            setUnreadMarkerTime(newLastReadTime);
+            setMessageManuallyMarkedUnread(0);
+        });
+
+        return () => {
+            unreadActionSubscription.remove();
+            readNewestActionSubscription.remove();
+        };
+    }, [report.reportID]);
+
+    /**
+     * When the user reads a new message as it is received, we'll push the unreadMarkerTime down to the timestamp of
+     * the latest report action. When new report actions are received and the user is not viewing them (they're above
+     * the MSG_VISIBLE_THRESHOLD), the unread marker will display over those new messages rather than the initial
+     * lastReadTime.
+     */
+    useEffect(() => {
+        if (unreadMarkerReportActionID) {
+            return;
+        }
+
+        const mostRecentReportActionCreated = sortedVisibleReportActions[0]?.created ?? '';
+        if (mostRecentReportActionCreated <= unreadMarkerTime) {
+            return;
+        }
+
+        setUnreadMarkerTime(mostRecentReportActionCreated);
+        setMessageManuallyMarkedUnread(0);
+
+        // eslint-disable-next-line react-compiler/react-compiler, react-hooks/exhaustive-deps
+    }, [sortedVisibleReportActions]);
+
     const lastActionIndex = sortedVisibleReportActions[0]?.reportActionID;
     const reportActionSize = useRef(sortedVisibleReportActions.length);
-    const hasNewestReportAction = sortedVisibleReportActions?.[0]?.created === report.lastVisibleActionCreated;
+    const hasNewestReportAction = sortedVisibleReportActions[0]?.created === report.lastVisibleActionCreated;
     const hasNewestReportActionRef = useRef(hasNewestReportAction);
     hasNewestReportActionRef.current = hasNewestReportAction;
     const previousLastIndex = useRef(lastActionIndex);
 
     const isLastPendingActionIsDelete = sortedReportActions?.[0]?.pendingAction === CONST.RED_BRICK_ROAD_PENDING_ACTION.DELETE;
-    const linkedReportActionID = route.params?.reportActionID ?? '';
 
-    // 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,
     }));
 
     useEffect(() => {
+        // eslint-disable-next-line react-compiler/react-compiler
         opacity.value = withTiming(1, {duration: 100});
     }, [opacity]);
 
@@ -234,84 +323,31 @@ function ReportActionsList({
     }, [lastActionIndex, sortedVisibleReportActions, reportScrollManager, hasNewestReportAction, linkedReportActionID]);
 
     useEffect(() => {
-        // If the reportID changes, we reset the userActiveSince to null, we need to do it because
-        // the parent component is sending the previous reportID even when the user isn't active
-        // on the report
-        if (userActiveSince.current && prevReportID && prevReportID !== report.reportID) {
-            userActiveSince.current = null;
-        } else {
-            userActiveSince.current = DateUtils.getDBTime();
-        }
+        userActiveSince.current = DateUtils.getDBTime();
         prevReportID = report.reportID;
     }, [report.reportID]);
 
     useEffect(() => {
-        if (!userActiveSince.current || report.reportID !== prevReportID) {
+        if (report.reportID !== prevReportID) {
             return;
         }
 
         if (ReportUtils.isUnread(report)) {
-            if (Visibility.isVisible() && scrollingVerticalOffset.current < MSG_VISIBLE_THRESHOLD) {
+            // On desktop, when the notification center is displayed, isVisible will return false.
+            // Currently, there's no programmatic way to dismiss the notification center panel.
+            // To handle this, we use the 'referrer' parameter to check if the current navigation is triggered from a notification.
+            const isFromNotification = route?.params?.referrer === CONST.REFERRER.NOTIFICATION;
+            if ((isVisible || isFromNotification) && scrollingVerticalOffset.current < MSG_VISIBLE_THRESHOLD) {
                 Report.readNewestAction(report.reportID);
+                if (isFromNotification) {
+                    Navigation.setParams({referrer: undefined});
+                }
             } else {
                 readActionSkipped.current = true;
             }
         }
-
-        if (!!currentUnreadMarker || lastVisibleActionCreatedRef.current === report.lastVisibleActionCreated) {
-            return;
-        }
-
-        cacheUnreadMarkers.delete(report.reportID);
-        lastVisibleActionCreatedRef.current = report.lastVisibleActionCreated;
-        setCurrentUnreadMarker(null);
-        // eslint-disable-next-line react-hooks/exhaustive-deps
-    }, [report.lastVisibleActionCreated, report.reportID]);
-
-    useEffect(() => {
-        if (!userActiveSince.current || report.reportID !== prevReportID) {
-            return;
-        }
-        if (!messageManuallyMarkedUnread && (lastReadTimeRef.current ?? '') < (report.lastReadTime ?? '')) {
-            cacheUnreadMarkers.delete(report.reportID);
-        }
-        lastReadTimeRef.current = report.lastReadTime;
-        setMessageManuallyMarkedUnread(0);
-
-        // eslint-disable-next-line react-hooks/exhaustive-deps
-    }, [report.lastReadTime, report.reportID]);
-
-    useEffect(() => {
-        const resetUnreadMarker = (newLastReadTime: string) => {
-            cacheUnreadMarkers.delete(report.reportID);
-            lastReadTimeRef.current = newLastReadTime;
-            setCurrentUnreadMarker(null);
-        };
-
-        const unreadActionSubscription = DeviceEventEmitter.addListener(`unreadAction_${report.reportID}`, (newLastReadTime) => {
-            resetUnreadMarker(newLastReadTime);
-            setMessageManuallyMarkedUnread(new Date().getTime());
-        });
-
-        const readNewestActionSubscription = DeviceEventEmitter.addListener(`readNewestAction_${report.reportID}`, (newLastReadTime) => {
-            resetUnreadMarker(newLastReadTime);
-            setMessageManuallyMarkedUnread(0);
-        });
-
-        const deletedReportActionSubscription = DeviceEventEmitter.addListener(`deletedReportAction_${report.reportID}`, (reportActionID) => {
-            if (cacheUnreadMarkers.get(report.reportID) !== reportActionID) {
-                return;
-            }
-
-            setMessageManuallyMarkedUnread(new Date().getTime());
-        });
-
-        return () => {
-            unreadActionSubscription.remove();
-            readNewestActionSubscription.remove();
-            deletedReportActionSubscription.remove();
-        };
-    }, [report.reportID]);
+        // eslint-disable-next-line react-compiler/react-compiler, react-hooks/exhaustive-deps
+    }, [report.lastVisibleActionCreated, report.reportID, isVisible]);
 
     useEffect(() => {
         if (linkedReportActionID) {
@@ -320,19 +356,23 @@ function ReportActionsList({
         InteractionManager.runAfterInteractions(() => {
             reportScrollManager.scrollToBottom();
         });
-        // eslint-disable-next-line react-hooks/exhaustive-deps
+        // eslint-disable-next-line react-compiler/react-compiler, react-hooks/exhaustive-deps
     }, []);
 
     const scrollToBottomForCurrentUserAction = useCallback(
         (isFromCurrentUser: boolean) => {
             // 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 || !hasNewestReportActionRef.current) {
+            if (!isFromCurrentUser) {
+                return;
+            }
+            if (!hasNewestReportActionRef.current) {
+                Navigation.navigate(ROUTES.REPORT_WITH_ID.getRoute(report.reportID));
                 return;
             }
             InteractionManager.runAfterInteractions(() => reportScrollManager.scrollToBottom());
         },
-        [reportScrollManager],
+        [reportScrollManager, report.reportID],
     );
     useEffect(() => {
         // Why are we doing this, when in the cleanup of the useEffect we are already calling the unsubscribe function?
@@ -362,14 +402,14 @@ function ReportActionsList({
 
         return cleanup;
 
-        // eslint-disable-next-line react-hooks/exhaustive-deps
+        // eslint-disable-next-line react-compiler/react-compiler, 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) {
+        if (scrollingVerticalOffset.current > VERTICAL_OFFSET_THRESHOLD && !isFloatingMessageCounterVisible && !!unreadMarkerReportActionID) {
             setIsFloatingMessageCounterVisible(true);
         }
 
@@ -418,41 +458,12 @@ function ReportActionsList({
      * This is so that it will not be conflicting with header's separator line.
      */
     const shouldHideThreadDividerLine = useMemo(
-        (): boolean => ReportActionsUtils.getFirstVisibleReportActionID(sortedReportActions, isOffline) === currentUnreadMarker,
-        [sortedReportActions, isOffline, currentUnreadMarker],
+        (): boolean => ReportActionsUtils.getFirstVisibleReportActionID(sortedReportActions, isOffline) === unreadMarkerReportActionID,
+        [sortedReportActions, isOffline, unreadMarkerReportActionID],
     );
 
     const firstVisibleReportActionID = useMemo(() => ReportActionsUtils.getFirstVisibleReportActionID(sortedReportActions, isOffline), [sortedReportActions, isOffline]);
 
-    /**
-     * Evaluate new unread marker visibility for each of the report actions.
-     */
-    const shouldDisplayNewMarker = useCallback(
-        (reportAction: OnyxTypes.ReportAction, index: number): boolean => {
-            let shouldDisplay = false;
-            if (!currentUnreadMarker) {
-                const nextMessage = sortedVisibleReportActions[index + 1];
-                const isCurrentMessageUnread = isMessageUnread(reportAction, lastReadTimeRef.current);
-                shouldDisplay = isCurrentMessageUnread && (!nextMessage || !isMessageUnread(nextMessage, lastReadTimeRef.current)) && !ReportActionsUtils.shouldHideNewMarker(reportAction);
-                if (shouldDisplay && !messageManuallyMarkedUnread) {
-                    const isWithinVisibleThreshold = scrollingVerticalOffset.current < MSG_VISIBLE_THRESHOLD ? reportAction.created < (userActiveSince.current ?? '') : true;
-                    // Prevent displaying a new marker line when report action is of type "REPORT_PREVIEW" and last actor is the current user
-                    shouldDisplay =
-                        (ReportActionsUtils.isReportPreviewAction(reportAction) ? !reportAction.childLastActorAccountID : reportAction.actorAccountID) !== Report.getCurrentUserAccountID() &&
-                        isWithinVisibleThreshold;
-                }
-                if (shouldDisplay) {
-                    cacheUnreadMarkers.set(report.reportID, reportAction.reportActionID);
-                }
-            } else {
-                shouldDisplay = reportAction.reportActionID === currentUnreadMarker;
-            }
-
-            return shouldDisplay;
-        },
-        [currentUnreadMarker, sortedVisibleReportActions, report.reportID, messageManuallyMarkedUnread],
-    );
-
     const shouldUseThreadDividerLine = useMemo(() => {
         const topReport = sortedVisibleReportActions.length > 0 ? sortedVisibleReportActions[sortedVisibleReportActions.length - 1] : null;
 
@@ -468,35 +479,11 @@ function ReportActionsList({
             return !ReportUtils.isCanceledTaskReport(report, parentReportAction);
         }
 
-        return ReportUtils.isExpenseReport(report) || ReportUtils.isIOUReport(report);
+        return ReportUtils.isExpenseReport(report) || ReportUtils.isIOUReport(report) || ReportUtils.isInvoiceReport(report);
     }, [parentReportAction, report, sortedVisibleReportActions]);
 
-    const calculateUnreadMarker = useCallback(() => {
-        // Iterate through the report actions and set appropriate unread marker.
-        // This is to avoid a warning of:
-        // Cannot update a component (ReportActionsList) while rendering a different component (CellRenderer).
-        let markerFound = false;
-        sortedVisibleReportActions.forEach((reportAction, index) => {
-            if (!shouldDisplayNewMarker(reportAction, index)) {
-                return;
-            }
-            markerFound = true;
-            if (!currentUnreadMarker && currentUnreadMarker !== reportAction.reportActionID) {
-                cacheUnreadMarkers.set(report.reportID, reportAction.reportActionID);
-                setCurrentUnreadMarker(reportAction.reportActionID);
-            }
-        });
-        if (!markerFound && !linkedReportActionID) {
-            setCurrentUnreadMarker(null);
-        }
-    }, [sortedVisibleReportActions, report.reportID, shouldDisplayNewMarker, currentUnreadMarker, linkedReportActionID]);
-
-    useEffect(() => {
-        calculateUnreadMarker();
-    }, [calculateUnreadMarker, report.lastReadTime, messageManuallyMarkedUnread]);
-
     useEffect(() => {
-        if (!userActiveSince.current || report.reportID !== prevReportID) {
+        if (report.reportID !== prevReportID) {
             return;
         }
 
@@ -511,33 +498,28 @@ function ReportActionsList({
         // show marker based on report.lastReadTime
         const newMessageTimeReference = lastMessageTime.current && report.lastReadTime && lastMessageTime.current > report.lastReadTime ? userActiveSince.current : report.lastReadTime;
         lastMessageTime.current = null;
-        if (
-            scrollingVerticalOffset.current >= MSG_VISIBLE_THRESHOLD ||
-            !(
-                sortedVisibleReportActions &&
-                sortedVisibleReportActions.some(
-                    (reportAction) =>
-                        newMessageTimeReference &&
-                        newMessageTimeReference < reportAction.created &&
-                        (ReportActionsUtils.isReportPreviewAction(reportAction) ? reportAction.childLastActorAccountID : reportAction.actorAccountID) !== Report.getCurrentUserAccountID(),
-                )
-            )
-        ) {
+
+        const isArchivedReport = ReportUtils.isArchivedRoom(report);
+        const hasNewMessagesInView = scrollingVerticalOffset.current < MSG_VISIBLE_THRESHOLD;
+        const hasUnreadReportAction = sortedVisibleReportActions.some(
+            (reportAction) =>
+                newMessageTimeReference &&
+                newMessageTimeReference < reportAction.created &&
+                (ReportActionsUtils.isReportPreviewAction(reportAction) ? reportAction.childLastActorAccountID : reportAction.actorAccountID) !== Report.getCurrentUserAccountID(),
+        );
+
+        if (!isArchivedReport && (!hasNewMessagesInView || !hasUnreadReportAction)) {
             return;
         }
 
         Report.readNewestAction(report.reportID);
         userActiveSince.current = DateUtils.getDBTime();
-        lastReadTimeRef.current = newMessageTimeReference;
-        setCurrentUnreadMarker(null);
-        cacheUnreadMarkers.delete(report.reportID);
-        calculateUnreadMarker();
 
         // This effect logic to `mark as read` will only run when the report focused has new messages and the App visibility
         //  is changed to visible(meaning user switched to app/web, while user was previously using different tab or application).
         // We will mark the report as read in the above case which marks the LHN report item as read while showing the new message
         // marker for the chat messages received while the user wasn't focused on the report or on another browser tab for web.
-        // eslint-disable-next-line react-hooks/exhaustive-deps
+        // eslint-disable-next-line react-compiler/react-compiler, react-hooks/exhaustive-deps
     }, [isFocused, isVisible]);
 
     const renderItem = useCallback(
@@ -554,8 +536,8 @@ function ReportActionsList({
                 displayAsGroup={ReportActionsUtils.isConsecutiveActionMadeByPreviousActor(sortedVisibleReportActions, index)}
                 mostRecentIOUReportActionID={mostRecentIOUReportActionID}
                 shouldHideThreadDividerLine={shouldHideThreadDividerLine}
-                shouldDisplayNewMarker={shouldDisplayNewMarker(reportAction, index)}
-                shouldDisplayReplyDivider={sortedReportActions.length > 1}
+                shouldDisplayNewMarker={reportAction.reportActionID === unreadMarkerReportActionID}
+                shouldDisplayReplyDivider={sortedVisibleReportActions.length > 1}
                 isFirstVisibleReportAction={firstVisibleReportActionID === reportAction.reportActionID}
                 shouldUseThreadDividerLine={shouldUseThreadDividerLine}
             />
@@ -564,38 +546,45 @@ function ReportActionsList({
             report,
             linkedReportActionID,
             sortedVisibleReportActions,
-            sortedReportActions.length,
             mostRecentIOUReportActionID,
             shouldHideThreadDividerLine,
-            shouldDisplayNewMarker,
             parentReportAction,
             reportActions,
             transactionThreadReport,
             parentReportActionForTransactionThread,
             shouldUseThreadDividerLine,
             firstVisibleReportActionID,
+            unreadMarkerReportActionID,
         ],
     );
 
     // 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 = useMemo(() => [isSmallScreenWidth ? currentUnreadMarker : undefined, ReportUtils.isArchivedRoom(report)], [currentUnreadMarker, isSmallScreenWidth, report]);
+    const extraData = useMemo(
+        () => [shouldUseNarrowLayout ? unreadMarkerReportActionID : undefined, ReportUtils.isArchivedRoom(report, reportNameValuePairs)],
+        [unreadMarkerReportActionID, shouldUseNarrowLayout, report, reportNameValuePairs],
+    );
     const hideComposer = !ReportUtils.canUserPerformWriteAction(report);
     const shouldShowReportRecipientLocalTime = ReportUtils.canShowReportRecipientLocalTime(personalDetailsList, report, currentUserPersonalDetails.accountID) && !isComposerFullSize;
-    const canShowHeader = !isOffline && !hasHeaderRendered.current && scrollingVerticalOffset.current > VERTICAL_OFFSET_THRESHOLD;
+    const canShowHeader = isOffline || hasHeaderRendered.current;
 
     const contentContainerStyle: StyleProp<ViewStyle> = useMemo(
         () => [styles.chatContentScrollView, isLoadingNewerReportActions && canShowHeader ? styles.chatContentScrollViewWithHeaderLoader : {}],
         [isLoadingNewerReportActions, styles.chatContentScrollView, styles.chatContentScrollViewWithHeaderLoader, canShowHeader],
     );
 
-    const lastReportAction: OnyxTypes.ReportAction | EmptyObject = useMemo(() => sortedReportActions.at(-1) ?? {}, [sortedReportActions]);
+    const lastReportAction: OnyxTypes.ReportAction | undefined = useMemo(() => sortedReportActions.at(-1) ?? undefined, [sortedReportActions]);
+
+    const retryLoadOlderChatsError = useCallback(() => {
+        loadOlderChats(true);
+    }, [loadOlderChats]);
 
-    const listFooterComponent = useCallback(() => {
+    const listFooterComponent = useMemo(() => {
         // Skip this hook on the first render (when online), as we are not sure if more actions are going to be loaded,
         // Therefore showing the skeleton on footer might be misleading.
-        // When offline, there should be no second render, so we should show the skeleton if the corresponding loading prop is present
-        if (!isOffline && !hasFooterRendered.current) {
+        // When offline, there should be no second render, so we should show the skeleton if the corresponding loading prop is present.
+        // In case of an error we want to display the footer no matter what.
+        if (!isOffline && !hasFooterRendered.current && !hasLoadingOlderReportActionsError) {
             hasFooterRendered.current = true;
             return null;
         }
@@ -605,10 +594,12 @@ function ReportActionsList({
                 type={CONST.LIST_COMPONENTS.FOOTER}
                 isLoadingOlderReportActions={isLoadingOlderReportActions}
                 isLoadingInitialReportActions={isLoadingInitialReportActions}
-                lastReportActionName={lastReportAction.actionName}
+                lastReportActionName={lastReportAction?.actionName}
+                hasError={hasLoadingOlderReportActionsError}
+                onRetry={retryLoadOlderChatsError}
             />
         );
-    }, [isLoadingInitialReportActions, isLoadingOlderReportActions, lastReportAction.actionName, isOffline]);
+    }, [isLoadingInitialReportActions, isLoadingOlderReportActions, lastReportAction?.actionName, isOffline, hasLoadingOlderReportActionsError, retryLoadOlderChatsError]);
 
     const onLayoutInner = useCallback(
         (event: LayoutChangeEvent) => {
@@ -623,8 +614,13 @@ function ReportActionsList({
         [onContentSizeChange],
     );
 
-    const listHeaderComponent = useCallback(() => {
-        if (!canShowHeader) {
+    const retryLoadNewerChatsError = useCallback(() => {
+        loadNewerChats(true);
+    }, [loadNewerChats]);
+
+    const listHeaderComponent = useMemo(() => {
+        // In case of an error we want to display the header no matter what.
+        if (!canShowHeader && !hasLoadingNewerReportActionsError) {
             hasHeaderRendered.current = true;
             return null;
         }
@@ -633,9 +629,19 @@ function ReportActionsList({
             <ListBoundaryLoader
                 type={CONST.LIST_COMPONENTS.HEADER}
                 isLoadingNewerReportActions={isLoadingNewerReportActions}
+                hasError={hasLoadingNewerReportActionsError}
+                onRetry={retryLoadNewerChatsError}
             />
         );
-    }, [isLoadingNewerReportActions, canShowHeader]);
+    }, [isLoadingNewerReportActions, canShowHeader, hasLoadingNewerReportActionsError, retryLoadNewerChatsError]);
+
+    const onStartReached = useCallback(() => {
+        loadNewerChats(false);
+    }, [loadNewerChats]);
+
+    const onEndReached = useCallback(() => {
+        loadOlderChats(false);
+    }, [loadOlderChats]);
 
     // When performing comment linking, initially 25 items are added to the list. Subsequent fetches add 15 items from the cache or 50 items from the server.
     // This is to ensure that the user is able to see the 'scroll to newer comments' button when they do comment linking and have not reached the end of the list yet.
@@ -643,7 +649,7 @@ function ReportActionsList({
     return (
         <>
             <FloatingMessageCounter
-                isActive={(isFloatingMessageCounterVisible && !!currentUnreadMarker) || canScrollToNewerComments}
+                isActive={(isFloatingMessageCounterVisible && !!unreadMarkerReportActionID) || canScrollToNewerComments}
                 onClick={scrollToBottomAndMarkReportAsRead}
             />
             <Animated.View style={[animatedStyles, styles.flex1, !shouldShowReportRecipientLocalTime && !hideComposer ? styles.pb4 : {}]}>
@@ -657,9 +663,9 @@ function ReportActionsList({
                     contentContainerStyle={contentContainerStyle}
                     keyExtractor={keyExtractor}
                     initialNumToRender={initialNumToRender}
-                    onEndReached={loadOlderChats}
+                    onEndReached={onEndReached}
                     onEndReachedThreshold={0.75}
-                    onStartReached={loadNewerChats}
+                    onStartReached={onStartReached}
                     onStartReachedThreshold={0.75}
                     ListFooterComponent={listFooterComponent}
                     ListHeaderComponent={listHeaderComponent}
diff --git a/src/pages/home/report/ReportActionsListItemRenderer.tsx b/src/pages/home/report/ReportActionsListItemRenderer.tsx
index 8782d6dbce55..48c578fd743a 100644
--- a/src/pages/home/report/ReportActionsListItemRenderer.tsx
+++ b/src/pages/home/report/ReportActionsListItemRenderer.tsx
@@ -72,7 +72,9 @@ function ReportActionsListItemRenderer({
     parentReportActionForTransactionThread,
 }: ReportActionsListItemRendererProps) {
     const shouldDisplayParentAction =
-        reportAction.actionName === CONST.REPORT.ACTIONS.TYPE.CREATED && ReportUtils.isChatThread(report) && !ReportActionsUtils.isTransactionThread(parentReportAction);
+        reportAction.actionName === CONST.REPORT.ACTIONS.TYPE.CREATED &&
+        ReportUtils.isChatThread(report) &&
+        (!ReportActionsUtils.isTransactionThread(parentReportAction) || ReportActionsUtils.isSentMoneyReportAction(parentReportAction));
 
     /**
      * Create a lightweight ReportAction so as to keep the re-rendering as light as possible by
@@ -86,12 +88,11 @@ function ReportActionsListItemRenderer({
                 pendingAction: reportAction.pendingAction,
                 actionName: reportAction.actionName,
                 errors: reportAction.errors,
-                originalMessage: reportAction.originalMessage,
+                originalMessage: reportAction?.originalMessage,
                 childCommenterCount: reportAction.childCommenterCount,
                 linkMetadata: reportAction.linkMetadata,
                 childReportID: reportAction.childReportID,
                 childLastVisibleActionCreated: reportAction.childLastVisibleActionCreated,
-                whisperedToAccountIDs: reportAction.whisperedToAccountIDs,
                 error: reportAction.error,
                 created: reportAction.created,
                 actorAccountID: reportAction.actorAccountID,
@@ -103,12 +104,13 @@ function ReportActionsListItemRenderer({
                 isOptimisticAction: reportAction.isOptimisticAction,
                 delegateAccountID: reportAction.delegateAccountID,
                 previousMessage: reportAction.previousMessage,
-                attachmentInfo: reportAction.attachmentInfo,
+                isAttachmentWithText: reportAction.isAttachmentWithText,
                 childStateNum: reportAction.childStateNum,
                 childStatusNum: reportAction.childStatusNum,
                 childReportName: reportAction.childReportName,
                 childManagerAccountID: reportAction.childManagerAccountID,
                 childMoneyRequestCount: reportAction.childMoneyRequestCount,
+                childOwnerAccountID: reportAction.childOwnerAccountID,
             } as ReportAction),
         [
             reportAction.reportActionID,
@@ -116,12 +118,11 @@ function ReportActionsListItemRenderer({
             reportAction.pendingAction,
             reportAction.actionName,
             reportAction.errors,
-            reportAction.originalMessage,
+            reportAction?.originalMessage,
             reportAction.childCommenterCount,
             reportAction.linkMetadata,
             reportAction.childReportID,
             reportAction.childLastVisibleActionCreated,
-            reportAction.whisperedToAccountIDs,
             reportAction.error,
             reportAction.created,
             reportAction.actorAccountID,
@@ -133,12 +134,13 @@ function ReportActionsListItemRenderer({
             reportAction.isOptimisticAction,
             reportAction.delegateAccountID,
             reportAction.previousMessage,
-            reportAction.attachmentInfo,
+            reportAction.isAttachmentWithText,
             reportAction.childStateNum,
             reportAction.childStatusNum,
             reportAction.childReportName,
             reportAction.childManagerAccountID,
             reportAction.childMoneyRequestCount,
+            reportAction.childOwnerAccountID,
         ],
     );
 
@@ -169,9 +171,13 @@ function ReportActionsListItemRenderer({
             shouldDisplayNewMarker={shouldDisplayNewMarker}
             shouldShowSubscriptAvatar={
                 ReportUtils.isPolicyExpenseChat(report) &&
-                [CONST.REPORT.ACTIONS.TYPE.IOU, CONST.REPORT.ACTIONS.TYPE.REPORT_PREVIEW, CONST.REPORT.ACTIONS.TYPE.SUBMITTED, CONST.REPORT.ACTIONS.TYPE.APPROVED].some(
-                    (type) => type === reportAction.actionName,
-                )
+                [
+                    CONST.REPORT.ACTIONS.TYPE.IOU,
+                    CONST.REPORT.ACTIONS.TYPE.REPORT_PREVIEW,
+                    CONST.REPORT.ACTIONS.TYPE.SUBMITTED,
+                    CONST.REPORT.ACTIONS.TYPE.APPROVED,
+                    CONST.REPORT.ACTIONS.TYPE.FORWARDED,
+                ].some((type) => type === reportAction.actionName)
             }
             isMostRecentIOUReportAction={reportAction.reportActionID === mostRecentIOUReportActionID}
             index={index}
diff --git a/src/pages/home/report/ReportActionsView.tsx b/src/pages/home/report/ReportActionsView.tsx
index 02008a464859..d502446d9d18 100755
--- a/src/pages/home/report/ReportActionsView.tsx
+++ b/src/pages/home/report/ReportActionsView.tsx
@@ -9,11 +9,10 @@ import useCopySelectionHelper from '@hooks/useCopySelectionHelper';
 import useInitialValue from '@hooks/useInitialValue';
 import useNetwork from '@hooks/useNetwork';
 import usePrevious from '@hooks/usePrevious';
-import useWindowDimensions from '@hooks/useWindowDimensions';
+import useResponsiveLayout from '@hooks/useResponsiveLayout';
 import DateUtils from '@libs/DateUtils';
 import getIsReportFullyVisible from '@libs/getIsReportFullyVisible';
-import Log from '@libs/Log';
-import type {CentralPaneNavigatorParamList} from '@libs/Navigation/types';
+import type {AuthScreensParamList} from '@libs/Navigation/types';
 import * as NumberUtils from '@libs/NumberUtils';
 import {generateNewRandomInt} from '@libs/NumberUtils';
 import Performance from '@libs/Performance';
@@ -62,20 +61,20 @@ type ReportActionsViewProps = ReportActionsViewOnyxProps & {
     /** The report actions are loading more data */
     isLoadingOlderReportActions?: boolean;
 
+    /** There an error when loading older report actions */
+    hasLoadingOlderReportActionsError?: boolean;
+
     /** The report actions are loading newer data */
     isLoadingNewerReportActions?: boolean;
 
-    /** Whether the report is ready for comment linking */
-    isReadyForCommentLinking?: boolean;
+    /** There an error when loading newer report actions */
+    hasLoadingNewerReportActionsError?: boolean;
 
     /** The reportID of the transaction thread report associated with this current report, if any */
     // eslint-disable-next-line react/no-unused-prop-types
     transactionThreadReportID?: string | null;
 };
 
-const DIFF_BETWEEN_SCREEN_HEIGHT_AND_LIST = 120;
-const SPACER = 16;
-
 let listOldID = Math.round(Math.random() * 100);
 
 function ReportActionsView({
@@ -87,14 +86,20 @@ function ReportActionsView({
     transactionThreadReportActions = [],
     isLoadingInitialReportActions = false,
     isLoadingOlderReportActions = false,
+    hasLoadingOlderReportActionsError = false,
     isLoadingNewerReportActions = false,
-    isReadyForCommentLinking = false,
+    hasLoadingNewerReportActionsError = false,
+    transactionThreadReportID,
 }: ReportActionsViewProps) {
     useCopySelectionHelper();
     const reactionListRef = useContext(ReactionListContext);
-    const route = useRoute<RouteProp<CentralPaneNavigatorParamList, typeof SCREENS.REPORT>>();
+    const route = useRoute<RouteProp<AuthScreensParamList, typeof SCREENS.REPORT>>();
     const reportActionID = route?.params?.reportActionID;
+    const prevReportActionID = usePrevious(reportActionID);
     const didLayout = useRef(false);
+    const didLoadOlderChats = useRef(false);
+    const didLoadNewerChats = useRef(false);
+    const {isOffline} = useNetwork();
 
     // triggerListID is used when navigating to a chat with messages loaded from LHN. Typically, these include thread actions, task actions, etc. Since these messages aren't the latest,we don't maintain their position and instead trigger a recalculation of their positioning in the list.
     // we don't set currentReportActionID on initial render as linkedID as it should trigger visibleReportActions after linked message was positioned
@@ -102,14 +107,13 @@ function ReportActionsView({
     const isFirstLinkedActionRender = useRef(true);
 
     const network = useNetwork();
-    const {isSmallScreenWidth, windowHeight} = useWindowDimensions();
+    const {shouldUseNarrowLayout} = useResponsiveLayout();
     const contentListHeight = useRef(0);
     const isFocused = useIsFocused();
     const prevAuthTokenType = usePrevious(session?.authTokenType);
     const [isNavigatingToLinkedMessage, setNavigatingToLinkedMessage] = useState(!!reportActionID);
-    const prevIsSmallScreenWidthRef = useRef(isSmallScreenWidth);
+    const prevShouldUseNarrowLayoutRef = useRef(shouldUseNarrowLayout);
     const reportID = report.reportID;
-    const isLoading = (!!reportActionID && isLoadingInitialReportActions) || !isReadyForCommentLinking;
     const isReportFullyVisible = useMemo((): boolean => getIsReportFullyVisible(isFocused), [isFocused]);
     const openReportIfNecessary = () => {
         if (!shouldFetchReport(report)) {
@@ -119,34 +123,103 @@ function ReportActionsView({
         Report.openReport(reportID, reportActionID);
     };
 
+    useEffect(() => {
+        // When we linked to message - we do not need to wait for initial actions - they already exists
+        if (!reportActionID || !isOffline) {
+            return;
+        }
+        Report.updateLoadingInitialReportAction(report.reportID);
+    }, [isOffline, report.reportID, reportActionID]);
+
     useLayoutEffect(() => {
         setCurrentReportActionID('');
     }, [route]);
 
     // Change the list ID only for comment linking to get the positioning right
     const listID = useMemo(() => {
-        if (!reportActionID) {
+        if (!reportActionID && !prevReportActionID) {
             // Keep the old list ID since we're not in the Comment Linking flow
             return listOldID;
         }
         isFirstLinkedActionRender.current = true;
         const newID = generateNewRandomInt(listOldID, 1, Number.MAX_SAFE_INTEGER);
+        // eslint-disable-next-line react-compiler/react-compiler
         listOldID = newID;
         return newID;
-        // eslint-disable-next-line react-hooks/exhaustive-deps
-    }, [route, isLoadingInitialReportActions, reportActionID]);
+        // eslint-disable-next-line react-compiler/react-compiler, react-hooks/exhaustive-deps
+    }, [route, reportActionID]);
+
+    // When we are offline before opening an IOU/Expense report,
+    // the total of the report and sometimes the expense aren't displayed because these actions aren't returned until `OpenReport` API is complete.
+    // We generate a fake created action here if it doesn't exist to display the total whenever possible because the total just depends on report data
+    // and we also generate an expense action if the number of expenses in allReportActions is less than the total number of expenses
+    // to display at least one expense action to match the total data.
+    const reportActionsToDisplay = useMemo(() => {
+        if (!ReportUtils.isMoneyRequestReport(report) || !allReportActions.length) {
+            return allReportActions;
+        }
+
+        const actions = [...allReportActions];
+        const lastAction = allReportActions[allReportActions.length - 1];
+
+        if (!ReportActionsUtils.isCreatedAction(lastAction)) {
+            const optimisticCreatedAction = ReportUtils.buildOptimisticCreatedReportAction(String(report?.ownerAccountID), DateUtils.subtractMillisecondsFromDateTime(lastAction.created, 1));
+            optimisticCreatedAction.pendingAction = null;
+            actions.push(optimisticCreatedAction);
+        }
+
+        const reportPreviewAction = ReportActionsUtils.getReportPreviewAction(report.chatReportID ?? '', report.reportID);
+        const moneyRequestActions = allReportActions.filter((action) => {
+            const originalMessage = ReportActionsUtils.isMoneyRequestAction(action) ? ReportActionsUtils.getOriginalMessage(action) : undefined;
+            return (
+                ReportActionsUtils.isMoneyRequestAction(action) &&
+                originalMessage &&
+                (originalMessage?.type === CONST.IOU.REPORT_ACTION_TYPE.CREATE ||
+                    !!(originalMessage?.type === CONST.IOU.REPORT_ACTION_TYPE.PAY && originalMessage?.IOUDetails) ||
+                    originalMessage?.type === CONST.IOU.REPORT_ACTION_TYPE.TRACK)
+            );
+        });
+
+        if (report.total && moneyRequestActions.length < (reportPreviewAction?.childMoneyRequestCount ?? 0) && isEmptyObject(transactionThreadReport)) {
+            const optimisticIOUAction = ReportUtils.buildOptimisticIOUReportAction(
+                CONST.IOU.REPORT_ACTION_TYPE.CREATE,
+                0,
+                CONST.CURRENCY.USD,
+                '',
+                [],
+                NumberUtils.rand64(),
+                undefined,
+                report.reportID,
+                false,
+                false,
+                false,
+                DateUtils.subtractMillisecondsFromDateTime(actions[actions.length - 1].created, 1),
+            ) as OnyxTypes.ReportAction;
+            moneyRequestActions.push(optimisticIOUAction);
+            actions.splice(actions.length - 1, 0, optimisticIOUAction);
+        }
+
+        // Update pending action of created action if we have some requests that are pending
+        // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+        const createdAction = actions.pop()!;
+        if (moneyRequestActions.filter((action) => !!action.pendingAction).length > 0) {
+            createdAction.pendingAction = CONST.RED_BRICK_ROAD_PENDING_ACTION.UPDATE;
+        }
+
+        return [...actions, createdAction];
+    }, [allReportActions, report, transactionThreadReport]);
 
     // Get a sorted array of reportActions for both the current report and the transaction thread report associated with this report (if there is one)
     // so that we display transaction-level and report-level report actions in order in the one-transaction view
     const combinedReportActions = useMemo(
-        () => ReportActionsUtils.getCombinedReportActions(allReportActions, transactionThreadReportActions),
-        [allReportActions, transactionThreadReportActions],
+        () => ReportActionsUtils.getCombinedReportActions(reportActionsToDisplay, transactionThreadReportID ?? null, transactionThreadReportActions),
+        [reportActionsToDisplay, transactionThreadReportActions, transactionThreadReportID],
     );
 
     const parentReportActionForTransactionThread = useMemo(
         () =>
             isEmptyObject(transactionThreadReportActions)
-                ? null
+                ? undefined
                 : (allReportActions.find((action) => action.reportActionID === transactionThreadReport?.parentReportActionID) as OnyxEntry<OnyxTypes.ReportAction>),
         [allReportActions, transactionThreadReportActions, transactionThreadReport?.parentReportActionID],
     );
@@ -162,7 +235,7 @@ function ReportActionsView({
         if (!reportActionID) {
             return combinedReportActions;
         }
-        if (isLoading || indexOfLinkedAction === -1) {
+        if (indexOfLinkedAction === -1) {
             return [];
         }
 
@@ -173,8 +246,8 @@ function ReportActionsView({
         return combinedReportActions.slice(Math.max(indexOfLinkedAction - paginationSize, 0));
 
         // currentReportActionID is needed to trigger batching once the report action has been positioned
-        // eslint-disable-next-line react-hooks/exhaustive-deps
-    }, [reportActionID, combinedReportActions, indexOfLinkedAction, isLoading, currentReportActionID]);
+        // eslint-disable-next-line react-compiler/react-compiler, react-hooks/exhaustive-deps
+    }, [reportActionID, combinedReportActions, indexOfLinkedAction, currentReportActionID]);
 
     const reportActionIDMap = useMemo(() => {
         const reportActionIDs = allReportActions.map((action) => action.reportActionID);
@@ -190,7 +263,7 @@ function ReportActionsView({
      */
     const fetchNewerAction = useCallback(
         (newestReportAction: OnyxTypes.ReportAction) => {
-            if (isLoadingNewerReportActions || isLoadingInitialReportActions) {
+            if (isLoadingNewerReportActions || isLoadingInitialReportActions || (reportActionID && isOffline)) {
                 return;
             }
 
@@ -198,182 +271,152 @@ function ReportActionsView({
             if (!isEmptyObject(transactionThreadReport)) {
                 // Get newer actions based on the newest reportAction for the current report
                 const newestActionCurrentReport = reportActionIDMap.find((item) => item.reportID === reportID);
-                Report.getNewerActions(newestActionCurrentReport?.reportID ?? '0', newestActionCurrentReport?.reportActionID ?? '0');
+                Report.getNewerActions(newestActionCurrentReport?.reportID ?? '-1', newestActionCurrentReport?.reportActionID ?? '-1');
 
                 // Get newer actions based on the newest reportAction for the transaction thread report
                 const newestActionTransactionThreadReport = reportActionIDMap.find((item) => item.reportID === transactionThreadReport.reportID);
-                Report.getNewerActions(newestActionTransactionThreadReport?.reportID ?? '0', newestActionTransactionThreadReport?.reportActionID ?? '0');
+                Report.getNewerActions(newestActionTransactionThreadReport?.reportID ?? '-1', newestActionTransactionThreadReport?.reportActionID ?? '-1');
             } else {
                 Report.getNewerActions(reportID, newestReportAction.reportActionID);
             }
         },
-        [isLoadingNewerReportActions, isLoadingInitialReportActions, reportID, transactionThreadReport, reportActionIDMap],
+        [isLoadingNewerReportActions, isLoadingInitialReportActions, reportActionID, isOffline, transactionThreadReport, reportActionIDMap, reportID],
     );
 
     const hasMoreCached = reportActions.length < combinedReportActions.length;
     const newestReportAction = useMemo(() => reportActions?.[0], [reportActions]);
-    const handleReportActionPagination = useCallback(
-        ({firstReportActionID}: {firstReportActionID: string}) => {
-            // This function is a placeholder as the actual pagination is handled by visibleReportActions
-            if (!hasMoreCached) {
-                isFirstLinkedActionRender.current = false;
-                fetchNewerAction(newestReportAction);
-            }
-            if (isFirstLinkedActionRender.current) {
-                isFirstLinkedActionRender.current = false;
-            }
-            setCurrentReportActionID(firstReportActionID);
-        },
-        [fetchNewerAction, hasMoreCached, newestReportAction],
-    );
-
     const mostRecentIOUReportActionID = useMemo(() => ReportActionsUtils.getMostRecentIOURequestActionID(reportActions), [reportActions]);
     const hasCachedActionOnFirstRender = useInitialValue(() => reportActions.length > 0);
     const hasNewestReportAction = reportActions[0]?.created === report.lastVisibleActionCreated || reportActions[0]?.created === transactionThreadReport?.lastVisibleActionCreated;
     const oldestReportAction = useMemo(() => reportActions?.at(-1), [reportActions]);
     const hasCreatedAction = oldestReportAction?.actionName === CONST.REPORT.ACTIONS.TYPE.CREATED;
 
-    useEffect(() => {
-        if (reportActionID) {
-            return;
-        }
-
-        const interactionTask = InteractionManager.runAfterInteractions(() => {
-            openReportIfNecessary();
-        });
-        // eslint-disable-next-line @typescript-eslint/no-misused-promises
-        if (interactionTask) {
-            return () => {
-                interactionTask.cancel();
-            };
-        }
-
-        // eslint-disable-next-line react-hooks/exhaustive-deps
-    }, []);
-
-    useEffect(() => {
-        if (!reportActionID || indexOfLinkedAction > -1) {
-            return;
-        }
-
-        // This function is triggered when a user clicks on a link to navigate to a report.
-        // For each link click, we retrieve the report data again, even though it may already be cached.
-        // There should be only one openReport execution per page start or navigating
-        Report.openReport(reportID, reportActionID);
-        // eslint-disable-next-line react-hooks/exhaustive-deps
-    }, [route, indexOfLinkedAction]);
-
     useEffect(() => {
         const wasLoginChangedDetected = prevAuthTokenType === CONST.AUTH_TOKEN_TYPES.ANONYMOUS && !session?.authTokenType;
         if (wasLoginChangedDetected && didUserLogInDuringSession() && isUserCreatedPolicyRoom(report)) {
             openReportIfNecessary();
         }
-        // eslint-disable-next-line react-hooks/exhaustive-deps
+        // eslint-disable-next-line react-compiler/react-compiler, react-hooks/exhaustive-deps
     }, [session, report]);
 
     useEffect(() => {
-        const prevIsSmallScreenWidth = prevIsSmallScreenWidthRef.current;
+        const prevShouldUseNarrowLayout = prevShouldUseNarrowLayoutRef.current;
         // If the view is expanded from mobile to desktop layout
         // we update the new marker position, mark the report as read, and fetch new report actions
-        const didScreenSizeIncrease = prevIsSmallScreenWidth && !isSmallScreenWidth;
+        const didScreenSizeIncrease = prevShouldUseNarrowLayout && !shouldUseNarrowLayout;
         const didReportBecomeVisible = isReportFullyVisible && didScreenSizeIncrease;
         if (didReportBecomeVisible) {
             openReportIfNecessary();
         }
         // update ref with current state
-        prevIsSmallScreenWidthRef.current = isSmallScreenWidth;
-        // eslint-disable-next-line react-hooks/exhaustive-deps
-    }, [isSmallScreenWidth, reportActions, isReportFullyVisible]);
+        prevShouldUseNarrowLayoutRef.current = shouldUseNarrowLayout;
+        // eslint-disable-next-line react-compiler/react-compiler, react-hooks/exhaustive-deps
+    }, [shouldUseNarrowLayout, reportActions, isReportFullyVisible]);
 
     const onContentSizeChange = useCallback((w: number, h: number) => {
         contentListHeight.current = h;
     }, []);
 
-    const checkIfContentSmallerThanList = useCallback(() => windowHeight - DIFF_BETWEEN_SCREEN_HEIGHT_AND_LIST - SPACER > contentListHeight.current, [windowHeight]);
+    const handleReportActionPagination = useCallback(
+        ({firstReportActionID}: {firstReportActionID: string}) => {
+            // This function is a placeholder as the actual pagination is handled by visibleReportActions
+            if (!hasMoreCached && !hasNewestReportAction) {
+                isFirstLinkedActionRender.current = false;
+                fetchNewerAction(newestReportAction);
+            }
+            if (isFirstLinkedActionRender.current) {
+                isFirstLinkedActionRender.current = false;
+            }
+            setCurrentReportActionID(firstReportActionID);
+        },
+        [fetchNewerAction, hasMoreCached, newestReportAction, hasNewestReportAction],
+    );
 
     /**
      * Retrieves the next set of report actions for the chat once we are nearing the end of what we are currently
      * displaying.
      */
-    const loadOlderChats = useCallback(() => {
-        Log.info(
-            `[ReportActionsView] loadOlderChats ${JSON.stringify({
-                isOffline: network.isOffline,
-                isLoadingOlderReportActions,
-                isLoadingInitialReportActions,
-                oldestReportActionID: oldestReportAction?.reportActionID,
-                hasCreatedAction,
-                isTransactionThread: !isEmptyObject(transactionThreadReport),
-            })}`,
-        );
-
-        // Only fetch more if we are neither already fetching (so that we don't initiate duplicate requests) nor offline.
-        if (!!network.isOffline || isLoadingOlderReportActions || isLoadingInitialReportActions) {
-            return;
-        }
+    const loadOlderChats = useCallback(
+        (force = false) => {
+            // Only fetch more if we are neither already fetching (so that we don't initiate duplicate requests) nor offline.
+            if (
+                !force &&
+                (!!network.isOffline ||
+                    isLoadingOlderReportActions ||
+                    // If there was an error only try again once on initial mount.
+                    (didLoadOlderChats.current && hasLoadingOlderReportActionsError) ||
+                    isLoadingInitialReportActions)
+            ) {
+                return;
+            }
 
-        // Don't load more chats if we're already at the beginning of the chat history
-        if (!oldestReportAction || hasCreatedAction) {
-            return;
-        }
+            // Don't load more chats if we're already at the beginning of the chat history
+            if (!oldestReportAction || hasCreatedAction) {
+                return;
+            }
 
-        if (!isEmptyObject(transactionThreadReport)) {
-            // Get older actions based on the oldest reportAction for the current report
-            const oldestActionCurrentReport = reportActionIDMap.findLast((item) => item.reportID === reportID);
-            Report.getOlderActions(oldestActionCurrentReport?.reportID ?? '0', oldestActionCurrentReport?.reportActionID ?? '0');
+            didLoadOlderChats.current = true;
 
-            // Get older actions based on the oldest reportAction for the transaction thread report
-            const oldestActionTransactionThreadReport = reportActionIDMap.findLast((item) => item.reportID === transactionThreadReport.reportID);
-            Report.getOlderActions(oldestActionTransactionThreadReport?.reportID ?? '0', oldestActionTransactionThreadReport?.reportActionID ?? '0');
-        } else {
-            // Retrieve the next REPORT.ACTIONS.LIMIT sized page of comments
-            Report.getOlderActions(reportID, oldestReportAction.reportActionID);
-        }
-    }, [network.isOffline, isLoadingOlderReportActions, isLoadingInitialReportActions, oldestReportAction, hasCreatedAction, reportID, reportActionIDMap, transactionThreadReport]);
-
-    const loadNewerChats = useCallback(() => {
-        // Determines if loading older reports is necessary when the content is smaller than the list
-        // and there are fewer than 23 items, indicating we've reached the oldest message.
-        const isLoadingOlderReportsFirstNeeded = checkIfContentSmallerThanList() && reportActions.length > 23;
-
-        Log.info(
-            `[ReportActionsView] loadNewerChats ${JSON.stringify({
-                isOffline: network.isOffline,
-                isLoadingOlderReportActions,
-                isLoadingInitialReportActions,
-                newestReportAction: newestReportAction.pendingAction,
-                firstReportActionID: newestReportAction?.reportActionID,
-                isLoadingOlderReportsFirstNeeded,
-                reportActionID,
-            })}`,
-        );
-
-        if (
-            !reportActionID ||
-            !isFocused ||
-            isLoadingInitialReportActions ||
-            isLoadingOlderReportActions ||
-            network.isOffline ||
-            newestReportAction.pendingAction === CONST.RED_BRICK_ROAD_PENDING_ACTION.DELETE
-        ) {
-            return;
-        }
+            if (!isEmptyObject(transactionThreadReport)) {
+                // Get older actions based on the oldest reportAction for the current report
+                const oldestActionCurrentReport = reportActionIDMap.findLast((item) => item.reportID === reportID);
+                Report.getOlderActions(oldestActionCurrentReport?.reportID ?? '-1', oldestActionCurrentReport?.reportActionID ?? '-1');
 
-        if ((reportActionID && indexOfLinkedAction > -1 && !isLoadingOlderReportsFirstNeeded) || (!reportActionID && !isLoadingOlderReportsFirstNeeded)) {
-            handleReportActionPagination({firstReportActionID: newestReportAction?.reportActionID});
-        }
-    }, [
-        isLoadingInitialReportActions,
-        isLoadingOlderReportActions,
-        checkIfContentSmallerThanList,
-        reportActionID,
-        indexOfLinkedAction,
-        handleReportActionPagination,
-        network.isOffline,
-        reportActions.length,
-        newestReportAction,
-        isFocused,
-    ]);
+                // Get older actions based on the oldest reportAction for the transaction thread report
+                const oldestActionTransactionThreadReport = reportActionIDMap.findLast((item) => item.reportID === transactionThreadReport.reportID);
+                Report.getOlderActions(oldestActionTransactionThreadReport?.reportID ?? '-1', oldestActionTransactionThreadReport?.reportActionID ?? '-1');
+            } else {
+                // Retrieve the next REPORT.ACTIONS.LIMIT sized page of comments
+                Report.getOlderActions(reportID, oldestReportAction.reportActionID);
+            }
+        },
+        [
+            network.isOffline,
+            isLoadingOlderReportActions,
+            isLoadingInitialReportActions,
+            oldestReportAction,
+            hasCreatedAction,
+            reportID,
+            reportActionIDMap,
+            transactionThreadReport,
+            hasLoadingOlderReportActionsError,
+        ],
+    );
+
+    const loadNewerChats = useCallback(
+        (force = false) => {
+            if (
+                !force &&
+                (!reportActionID ||
+                    !isFocused ||
+                    (isLoadingInitialReportActions && !hasMoreCached) ||
+                    isLoadingNewerReportActions ||
+                    // If there was an error only try again once on initial mount. We should also still load
+                    // more in case we have cached messages.
+                    (!hasMoreCached && didLoadNewerChats.current && hasLoadingNewerReportActionsError) ||
+                    newestReportAction.pendingAction === CONST.RED_BRICK_ROAD_PENDING_ACTION.DELETE)
+            ) {
+                return;
+            }
+
+            didLoadNewerChats.current = true;
+
+            if ((reportActionID && indexOfLinkedAction > -1) || !reportActionID) {
+                handleReportActionPagination({firstReportActionID: newestReportAction?.reportActionID});
+            }
+        },
+        [
+            isLoadingInitialReportActions,
+            isLoadingNewerReportActions,
+            reportActionID,
+            indexOfLinkedAction,
+            handleReportActionPagination,
+            newestReportAction,
+            isFocused,
+            hasLoadingNewerReportActionsError,
+            hasMoreCached,
+        ],
+    );
 
     /**
      * Runs when the FlatList finishes laying out
@@ -388,43 +431,15 @@ function ReportActionsView({
         if (!ReportActionsView.initMeasured) {
             Performance.markEnd(CONST.TIMING.OPEN_REPORT);
             Performance.markEnd(CONST.TIMING.REPORT_INITIAL_RENDER);
-            Timing.end(CONST.TIMING.REPORT_INITIAL_RENDER);
             ReportActionsView.initMeasured = true;
         } else {
             Performance.markEnd(CONST.TIMING.SWITCH_REPORT);
         }
         Timing.end(CONST.TIMING.SWITCH_REPORT, hasCachedActionOnFirstRender ? CONST.TIMING.WARM : CONST.TIMING.COLD);
+        Timing.end(CONST.TIMING.OPEN_REPORT_THREAD);
+        Timing.end(CONST.TIMING.OPEN_REPORT_FROM_PREVIEW);
     }, [hasCachedActionOnFirstRender]);
 
-    useEffect(() => {
-        // Temporary solution for handling REPORT_PREVIEW. More details: https://expensify.slack.com/archives/C035J5C9FAP/p1705417778466539?thread_ts=1705035404.136629&cid=C035J5C9FAP
-        // This code should be removed once REPORT_PREVIEW is no longer repositioned.
-        // We need to call openReport for gaps created by moving REPORT_PREVIEW, which causes mismatches in previousReportActionID and reportActionID of adjacent reportActions. The server returns the correct sequence, allowing us to overwrite incorrect data with the correct one.
-        const shouldOpenReport =
-            newestReportAction?.actionName === CONST.REPORT.ACTIONS.TYPE.REPORT_PREVIEW &&
-            !hasCreatedAction &&
-            isReadyForCommentLinking &&
-            reportActions.length < 24 &&
-            reportActions.length >= 1 &&
-            !isLoadingInitialReportActions &&
-            !isLoadingOlderReportActions &&
-            !isLoadingNewerReportActions;
-
-        if (shouldOpenReport) {
-            Report.openReport(reportID, reportActionID);
-        }
-    }, [
-        hasCreatedAction,
-        reportID,
-        reportActions,
-        reportActionID,
-        newestReportAction?.actionName,
-        isReadyForCommentLinking,
-        isLoadingOlderReportActions,
-        isLoadingNewerReportActions,
-        isLoadingInitialReportActions,
-    ]);
-
     // Check if the first report action in the list is the one we're currently linked to
     const isTheFirstReportActionIsLinked = newestReportAction?.reportActionID === reportActionID;
 
@@ -450,69 +465,11 @@ function ReportActionsView({
         };
     }, [isTheFirstReportActionIsLinked]);
 
-    // When we are offline before opening an IOU/Expense report,
-    // the total of the report and sometimes the expense aren't displayed because these actions aren't returned until `OpenReport` API is complete.
-    // We generate a fake created action here if it doesn't exist to display the total whenever possible because the total just depends on report data
-    // and we also generate an expense action if the number of expenses in reportActions is less than the total number of expenses
-    // to display at least one expense action to match the total data.
-    const reportActionsToDisplay = useMemo(() => {
-        if (!ReportUtils.isMoneyRequestReport(report) || !reportActions.length) {
-            return reportActions;
-        }
-
-        const actions = [...reportActions];
-        const lastAction = reportActions[reportActions.length - 1];
-
-        if (!ReportActionsUtils.isCreatedAction(lastAction)) {
-            const optimisticCreatedAction = ReportUtils.buildOptimisticCreatedReportAction(String(report?.ownerAccountID), DateUtils.subtractMillisecondsFromDateTime(lastAction.created, 1));
-            optimisticCreatedAction.pendingAction = null;
-            actions.push(optimisticCreatedAction);
-        }
-
-        const reportPreviewAction = ReportActionsUtils.getReportPreviewAction(report.chatReportID ?? '', report.reportID);
-        const moneyRequestActions = reportActions.filter(
-            (action) =>
-                action.actionName === CONST.REPORT.ACTIONS.TYPE.IOU &&
-                action.originalMessage &&
-                (action.originalMessage.type === CONST.IOU.REPORT_ACTION_TYPE.CREATE ||
-                    Boolean(action.originalMessage.type === CONST.IOU.REPORT_ACTION_TYPE.PAY && action.originalMessage.IOUDetails) ||
-                    action.originalMessage.type === CONST.IOU.REPORT_ACTION_TYPE.TRACK),
-        );
-
-        if (report.total && moneyRequestActions.length < (reportPreviewAction?.childMoneyRequestCount ?? 0) && isEmptyObject(transactionThreadReport)) {
-            const optimisticIOUAction = ReportUtils.buildOptimisticIOUReportAction(
-                CONST.IOU.REPORT_ACTION_TYPE.CREATE,
-                0,
-                CONST.CURRENCY.USD,
-                '',
-                [],
-                NumberUtils.rand64(),
-                undefined,
-                report.reportID,
-                false,
-                false,
-                {},
-                false,
-                DateUtils.subtractMillisecondsFromDateTime(actions[actions.length - 1].created, 1),
-            ) as OnyxTypes.ReportAction;
-            moneyRequestActions.push(optimisticIOUAction);
-            actions.splice(actions.length - 1, 0, optimisticIOUAction);
-        }
-
-        // Update pending action of created action if we have some requests that are pending
-        // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
-        const createdAction = actions.pop()!;
-        if (moneyRequestActions.filter((action) => Boolean(action.pendingAction)).length > 0) {
-            createdAction.pendingAction = CONST.RED_BRICK_ROAD_PENDING_ACTION.UPDATE;
-        }
-
-        return [...actions, createdAction];
-    }, [reportActions, report, transactionThreadReport]);
-
     // Comments have not loaded at all yet do nothing
     if (!reportActions.length) {
         return null;
     }
+
     // AutoScroll is disabled when we do linking to a specific reportAction
     const shouldEnableAutoScroll = hasNewestReportAction && (!reportActionID || !isNavigatingToLinkedMessage);
     return (
@@ -524,13 +481,15 @@ function ReportActionsView({
                 parentReportAction={parentReportAction}
                 parentReportActionForTransactionThread={parentReportActionForTransactionThread}
                 onLayout={recordTimeToMeasureItemLayout}
-                sortedReportActions={reportActionsToDisplay}
+                sortedReportActions={reportActions}
                 mostRecentIOUReportActionID={mostRecentIOUReportActionID}
                 loadOlderChats={loadOlderChats}
                 loadNewerChats={loadNewerChats}
                 isLoadingInitialReportActions={isLoadingInitialReportActions}
                 isLoadingOlderReportActions={isLoadingOlderReportActions}
+                hasLoadingOlderReportActionsError={hasLoadingOlderReportActionsError}
                 isLoadingNewerReportActions={isLoadingNewerReportActions}
+                hasLoadingNewerReportActionsError={hasLoadingNewerReportActionsError}
                 listID={listID}
                 onContentSizeChange={onContentSizeChange}
                 shouldEnableAutoScrollToTopThreshold={shouldEnableAutoScroll}
@@ -545,9 +504,10 @@ ReportActionsView.displayName = 'ReportActionsView';
 ReportActionsView.initMeasured = false;
 
 function arePropsEqual(oldProps: ReportActionsViewProps, newProps: ReportActionsViewProps): boolean {
-    if (!lodashIsEqual(oldProps.isReadyForCommentLinking, newProps.isReadyForCommentLinking)) {
+    if (!lodashIsEqual(oldProps.transactionThreadReport, newProps.transactionThreadReport)) {
         return false;
     }
+
     if (!lodashIsEqual(oldProps.reportActions, newProps.reportActions)) {
         return false;
     }
@@ -576,6 +536,14 @@ function arePropsEqual(oldProps: ReportActionsViewProps, newProps: ReportActions
         return false;
     }
 
+    if (oldProps.hasLoadingOlderReportActionsError !== newProps.hasLoadingOlderReportActionsError) {
+        return false;
+    }
+
+    if (oldProps.hasLoadingNewerReportActionsError !== newProps.hasLoadingNewerReportActionsError) {
+        return false;
+    }
+
     return lodashIsEqual(oldProps.report, newProps.report);
 }
 
@@ -587,12 +555,13 @@ export default Performance.withRenderTrace({id: '<ReportActionsView> rendering'}
             key: ONYXKEYS.SESSION,
         },
         transactionThreadReportActions: {
-            key: ({transactionThreadReportID}) => `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${transactionThreadReportID}`,
+            key: ({transactionThreadReportID}) => `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${transactionThreadReportID ?? -1}`,
             canEvict: false,
             selector: (reportActions: OnyxEntry<OnyxTypes.ReportActions>) => ReportActionsUtils.getSortedReportActionsForDisplay(reportActions, true),
         },
         transactionThreadReport: {
-            key: ({transactionThreadReportID}) => `${ONYXKEYS.COLLECTION.REPORT}${transactionThreadReportID}`,
+            key: ({transactionThreadReportID}) => `${ONYXKEYS.COLLECTION.REPORT}${transactionThreadReportID ?? -1}`,
+            initialValue: {} as OnyxTypes.Report,
         },
     })(MemoizedReportActionsView),
 );
diff --git a/src/pages/home/report/ReportAttachments.tsx b/src/pages/home/report/ReportAttachments.tsx
index 82b49d1e260c..7140cd2d45c4 100644
--- a/src/pages/home/report/ReportAttachments.tsx
+++ b/src/pages/home/report/ReportAttachments.tsx
@@ -1,43 +1,61 @@
 import type {StackScreenProps} from '@react-navigation/stack';
-import React, {useCallback} from 'react';
+import React, {useCallback, useEffect, useRef} from 'react';
+import {useOnyx} from 'react-native-onyx';
 import AttachmentModal from '@components/AttachmentModal';
 import type {Attachment} from '@components/Attachments/types';
 import ComposerFocusManager from '@libs/ComposerFocusManager';
 import Navigation from '@libs/Navigation/Navigation';
 import type {AuthScreensParamList} from '@libs/Navigation/types';
-import * as ReportUtils from '@libs/ReportUtils';
+import ONYXKEYS from '@src/ONYXKEYS';
 import ROUTES from '@src/ROUTES';
 import type SCREENS from '@src/SCREENS';
 
-type ReportAttachmentsProps = StackScreenProps<AuthScreensParamList, typeof SCREENS.REPORT_ATTACHMENTS>;
+type ReportAttachmentsProps = StackScreenProps<AuthScreensParamList, typeof SCREENS.ATTACHMENTS>;
 
 function ReportAttachments({route}: ReportAttachmentsProps) {
     const reportID = route.params.reportID;
-    const report = ReportUtils.getReport(reportID);
+    const type = route.params.type;
+    const accountID = route.params.accountID;
+    const [report] = useOnyx(`${ONYXKEYS.COLLECTION.REPORT}${reportID || -1}`);
+    const [isLoadingApp] = useOnyx(ONYXKEYS.IS_LOADING_APP);
+    const hasDismissedModalRef = useRef(false);
+
+    useEffect(
+        () => () => {
+            hasDismissedModalRef.current = false;
+        },
+        [],
+    );
 
     // In native the imported images sources are of type number. Ref: https://reactnative.dev/docs/image#imagesource
     const source = Number(route.params.source) || route.params.source;
 
     const onCarouselAttachmentChange = useCallback(
         (attachment: Attachment) => {
-            const routeToNavigate = ROUTES.REPORT_ATTACHMENTS.getRoute(reportID, String(attachment.source));
+            const routeToNavigate = ROUTES.ATTACHMENTS.getRoute(reportID, type, String(attachment.source), Number(accountID));
             Navigation.navigate(routeToNavigate);
         },
-        [reportID],
+        [reportID, accountID, type],
     );
 
     return (
         <AttachmentModal
+            accountID={Number(accountID)}
+            type={type}
             allowDownload
             defaultOpen
             report={report}
             source={source}
-            onModalHide={() => {
-                Navigation.dismissModal();
+            onModalClose={() => {
+                if (!hasDismissedModalRef.current) {
+                    Navigation.dismissModal();
+                    hasDismissedModalRef.current = true;
+                }
                 // This enables Composer refocus when the attachments modal is closed by the browser navigation
                 ComposerFocusManager.setReadyToFocus();
             }}
             onCarouselAttachmentChange={onCarouselAttachmentChange}
+            shouldShowNotFoundPage={!isLoadingApp && !report?.reportID}
         />
     );
 }
diff --git a/src/pages/home/report/ReportDetailsExportPage.tsx b/src/pages/home/report/ReportDetailsExportPage.tsx
new file mode 100644
index 000000000000..6f16786682af
--- /dev/null
+++ b/src/pages/home/report/ReportDetailsExportPage.tsx
@@ -0,0 +1,135 @@
+import type {StackScreenProps} from '@react-navigation/stack';
+import React, {useCallback, useState} from 'react';
+import {useOnyx} from 'react-native-onyx';
+import type {ValueOf} from 'type-fest';
+import ConfirmationPage from '@components/ConfirmationPage';
+import ConfirmModal from '@components/ConfirmModal';
+import HeaderWithBackButton from '@components/HeaderWithBackButton';
+import * as Illustrations from '@components/Icon/Illustrations';
+import ScreenWrapper from '@components/ScreenWrapper';
+import UserListItem from '@components/SelectionList/UserListItem';
+import type {SelectorType} from '@components/SelectionScreen';
+import SelectionScreen from '@components/SelectionScreen';
+import useLocalize from '@hooks/useLocalize';
+import * as ReportActions from '@libs/actions/Report';
+import Navigation from '@libs/Navigation/Navigation';
+import type {ReportDetailsNavigatorParamList} from '@libs/Navigation/types';
+import * as ReportUtils from '@libs/ReportUtils';
+import CONST from '@src/CONST';
+import ONYXKEYS from '@src/ONYXKEYS';
+import ROUTES from '@src/ROUTES';
+import type SCREENS from '@src/SCREENS';
+
+type ReportDetailsExportPageProps = StackScreenProps<ReportDetailsNavigatorParamList, typeof SCREENS.REPORT_DETAILS.EXPORT>;
+
+type ExportType = ValueOf<typeof CONST.REPORT.EXPORT_OPTIONS>;
+
+type ExportSelectorType = SelectorType<ExportType>;
+
+function ReportDetailsExportPage({route}: ReportDetailsExportPageProps) {
+    const connectionName = route?.params?.connectionName;
+    const reportID = route.params.reportID;
+    const [report] = useOnyx(`${ONYXKEYS.COLLECTION.REPORT}${reportID}`);
+    const [reportActions] = useOnyx(`${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${reportID}`);
+    const policyID = report?.policyID;
+
+    const {translate} = useLocalize();
+    const [modalStatus, setModalStatus] = useState<ExportType | null>(null);
+
+    const iconToDisplay = ReportUtils.getIntegrationIcon(connectionName);
+    const canBeExported = ReportUtils.canBeExported(report);
+    const isExported = ReportUtils.isExported(reportActions);
+
+    const confirmExport = useCallback(
+        (type = modalStatus) => {
+            if (type === CONST.REPORT.EXPORT_OPTIONS.EXPORT_TO_INTEGRATION) {
+                ReportActions.exportToIntegration(reportID, connectionName);
+            } else if (type === CONST.REPORT.EXPORT_OPTIONS.MARK_AS_EXPORTED) {
+                ReportActions.markAsManuallyExported(reportID, connectionName);
+            }
+            setModalStatus(null);
+            Navigation.dismissModal();
+        },
+        [connectionName, modalStatus, reportID],
+    );
+
+    const exportSelectorOptions: ExportSelectorType[] = [
+        {
+            value: CONST.REPORT.EXPORT_OPTIONS.EXPORT_TO_INTEGRATION,
+            text: translate('workspace.common.exportIntegrationSelected', connectionName),
+            icons: [
+                {
+                    source: iconToDisplay ?? '',
+                    type: CONST.ICON_TYPE_AVATAR,
+                },
+            ],
+            isDisabled: !canBeExported,
+        },
+        {
+            value: CONST.REPORT.EXPORT_OPTIONS.MARK_AS_EXPORTED,
+            text: translate('workspace.common.markAsExported'),
+            icons: [
+                {
+                    source: iconToDisplay ?? '',
+                    type: CONST.ICON_TYPE_AVATAR,
+                },
+            ],
+            isDisabled: !canBeExported,
+        },
+    ];
+
+    if (!canBeExported) {
+        return (
+            <ScreenWrapper testID={ReportDetailsExportPage.displayName}>
+                <HeaderWithBackButton title={translate('common.export')} />
+                <ConfirmationPage
+                    illustration={Illustrations.LaptopwithSecondScreenandHourglass}
+                    heading={translate('workspace.export.notReadyHeading')}
+                    description={translate('workspace.export.notReadyDescription')}
+                    shouldShowButton
+                    buttonText={translate('common.buttonConfirm')}
+                    onButtonPress={Navigation.goBack}
+                    illustrationStyle={{width: 233, height: 162}}
+                />
+            </ScreenWrapper>
+        );
+    }
+
+    return (
+        <>
+            <SelectionScreen<ExportType>
+                policyID={policyID ?? ''}
+                accessVariants={[CONST.POLICY.ACCESS_VARIANTS.ADMIN, CONST.POLICY.ACCESS_VARIANTS.PAID]}
+                featureName={CONST.POLICY.MORE_FEATURES.ARE_CONNECTIONS_ENABLED}
+                displayName={ReportDetailsExportPage.displayName}
+                sections={[{data: exportSelectorOptions}]}
+                listItem={UserListItem}
+                shouldBeBlocked={false}
+                onBackButtonPress={() => Navigation.goBack(ROUTES.REPORT_WITH_ID_DETAILS.getRoute(reportID))}
+                title="common.export"
+                connectionName={connectionName}
+                onSelectRow={({value}) => {
+                    if (isExported) {
+                        setModalStatus(value);
+                    } else {
+                        confirmExport(value);
+                    }
+                }}
+            />
+            <ConfirmModal
+                title={translate('workspace.exportAgainModal.title')}
+                onConfirm={confirmExport}
+                onCancel={() => setModalStatus(null)}
+                prompt={translate('workspace.exportAgainModal.description', report?.reportName ?? '', connectionName)}
+                confirmText={translate('workspace.exportAgainModal.confirmText')}
+                cancelText={translate('workspace.exportAgainModal.cancelText')}
+                isVisible={!!modalStatus}
+            />
+        </>
+    );
+}
+
+ReportDetailsExportPage.displayName = 'ReportDetailsExportPage';
+
+export default ReportDetailsExportPage;
+export type {ExportType};
diff --git a/src/pages/home/report/ReportDetailsShareCodePage.tsx b/src/pages/home/report/ReportDetailsShareCodePage.tsx
index 712e6c3097be..efee188d0beb 100644
--- a/src/pages/home/report/ReportDetailsShareCodePage.tsx
+++ b/src/pages/home/report/ReportDetailsShareCodePage.tsx
@@ -1,17 +1,36 @@
 import React from 'react';
+import {withOnyx} from 'react-native-onyx';
+import type {OnyxEntry} from 'react-native-onyx';
 import * as ReportUtils from '@libs/ReportUtils';
 import NotFoundPage from '@pages/ErrorPage/NotFoundPage';
 import ShareCodePage from '@pages/ShareCodePage';
+import ONYXKEYS from '@src/ONYXKEYS';
+import type {Policy} from '@src/types/onyx';
 import type {WithReportOrNotFoundProps} from './withReportOrNotFound';
 import withReportOrNotFound from './withReportOrNotFound';
 
-type ReportDetailsShareCodePageProps = WithReportOrNotFoundProps;
+type ReportDetailsShareCodePageOnyxProps = {
+    policy: OnyxEntry<Policy>;
+};
 
-function ReportDetailsShareCodePage({report}: ReportDetailsShareCodePageProps) {
+type ReportDetailsShareCodePageProps = ReportDetailsShareCodePageOnyxProps & WithReportOrNotFoundProps;
+
+function ReportDetailsShareCodePage({report, policy}: ReportDetailsShareCodePageProps) {
     if (ReportUtils.isSelfDM(report)) {
         return <NotFoundPage />;
     }
-    return <ShareCodePage report={report} />;
+    return (
+        <ShareCodePage
+            report={report}
+            policy={policy}
+        />
+    );
 }
 
-export default withReportOrNotFound()(ReportDetailsShareCodePage);
+export default withReportOrNotFound()(
+    withOnyx<ReportDetailsShareCodePageProps, ReportDetailsShareCodePageOnyxProps>({
+        policy: {
+            key: ({report}) => `${ONYXKEYS.COLLECTION.POLICY}${report?.policyID}`,
+        },
+    })(ReportDetailsShareCodePage),
+);
diff --git a/src/pages/home/report/ReportFooter.tsx b/src/pages/home/report/ReportFooter.tsx
index b128b83f88fc..ee8b7cde1971 100644
--- a/src/pages/home/report/ReportFooter.tsx
+++ b/src/pages/home/report/ReportFooter.tsx
@@ -1,16 +1,24 @@
 import lodashIsEqual from 'lodash/isEqual';
 import React, {memo, useCallback} from 'react';
 import {Keyboard, View} from 'react-native';
-import {withOnyx} from 'react-native-onyx';
+import {useOnyx} from 'react-native-onyx';
 import type {OnyxEntry} from 'react-native-onyx';
 import AnonymousReportFooter from '@components/AnonymousReportFooter';
 import ArchivedReportFooter from '@components/ArchivedReportFooter';
+import Banner from '@components/Banner';
+import BlockedReportFooter from '@components/BlockedReportFooter';
+import * as Expensicons from '@components/Icon/Expensicons';
 import OfflineIndicator from '@components/OfflineIndicator';
 import {usePersonalDetails} from '@components/OnyxProvider';
 import SwipeableView from '@components/SwipeableView';
+import useLocalize from '@hooks/useLocalize';
 import useNetwork from '@hooks/useNetwork';
+import useResponsiveLayout from '@hooks/useResponsiveLayout';
+import useScreenWrapperTranstionStatus from '@hooks/useScreenWrapperTransitionStatus';
 import useThemeStyles from '@hooks/useThemeStyles';
 import useWindowDimensions from '@hooks/useWindowDimensions';
+import Log from '@libs/Log';
+import * as PolicyUtils from '@libs/PolicyUtils';
 import * as ReportUtils from '@libs/ReportUtils';
 import * as UserUtils from '@libs/UserUtils';
 import variables from '@styles/variables';
@@ -20,34 +28,31 @@ import CONST from '@src/CONST';
 import ONYXKEYS from '@src/ONYXKEYS';
 import type * as OnyxTypes from '@src/types/onyx';
 import type {PendingAction} from '@src/types/onyx/OnyxCommon';
-import type {EmptyObject} from '@src/types/utils/EmptyObject';
 import ReportActionCompose from './ReportActionCompose/ReportActionCompose';
 import SystemChatReportFooterMessage from './SystemChatReportFooterMessage';
 
-type ReportFooterOnyxProps = {
-    /** Whether to show the compose input */
-    shouldShowComposeInput: OnyxEntry<boolean>;
-
-    /** Session info for the currently logged in user. */
-    session: OnyxEntry<OnyxTypes.Session>;
-};
-
-type ReportFooterProps = ReportFooterOnyxProps & {
+type ReportFooterProps = {
     /** Report object for the current report */
     report?: OnyxTypes.Report;
 
+    /** Report metadata */
+    reportMetadata?: OnyxEntry<OnyxTypes.ReportMetadata>;
+
+    /** The policy of the report */
+    policy: OnyxEntry<OnyxTypes.Policy>;
+
     /** The last report action */
     lastReportAction?: OnyxEntry<OnyxTypes.ReportAction>;
 
+    /** Whether to show educational tooltip in workspace chat for first-time user */
+    workspaceTooltip: OnyxEntry<OnyxTypes.WorkspaceTooltip>;
+
     /** Whether the chat is empty */
     isEmptyChat?: boolean;
 
     /** The pending action when we are adding a chat */
     pendingAction?: PendingAction;
 
-    /** Height of the list which the composer is part of */
-    listHeight?: number;
-
     /** Whether the report is ready for display */
     isReportReadyForDisplay?: boolean;
 
@@ -64,27 +69,54 @@ type ReportFooterProps = ReportFooterOnyxProps & {
 function ReportFooter({
     lastReportAction,
     pendingAction,
-    session,
-    report = {reportID: '0'},
-    shouldShowComposeInput = false,
+    report = {reportID: '-1'},
+    reportMetadata,
+    policy,
     isEmptyChat = true,
     isReportReadyForDisplay = true,
-    listHeight = 0,
     isComposerFullSize = false,
+    workspaceTooltip,
     onComposerBlur,
     onComposerFocus,
 }: ReportFooterProps) {
     const styles = useThemeStyles();
     const {isOffline} = useNetwork();
-    const {windowWidth, isSmallScreenWidth} = useWindowDimensions();
+    const {translate} = useLocalize();
+    const {windowWidth} = useWindowDimensions();
+    const {shouldUseNarrowLayout} = useResponsiveLayout();
+    const {didScreenTransitionEnd} = useScreenWrapperTranstionStatus();
+
+    const [shouldShowComposeInput] = useOnyx(ONYXKEYS.SHOULD_SHOW_COMPOSE_INPUT, {initialValue: false});
+    const [isAnonymousUser = false] = useOnyx(ONYXKEYS.SESSION, {selector: (session) => session?.authTokenType === CONST.AUTH_TOKEN_TYPES.ANONYMOUS});
+    const [isBlockedFromChat] = useOnyx(ONYXKEYS.NVP_BLOCKED_FROM_CHAT, {
+        selector: (dateString) => {
+            if (!dateString) {
+                return false;
+            }
+            try {
+                return new Date(dateString) >= new Date();
+            } catch (error) {
+                // If the NVP is malformed, we'll assume the user is not blocked from chat. This is not expected, so if it happens we'll log an alert.
+                Log.alert(`[${CONST.ERROR.ENSURE_BUGBOT}] Found malformed ${ONYXKEYS.NVP_BLOCKED_FROM_CHAT} nvp`, dateString);
+                return false;
+            }
+        },
+    });
+    const [reportNameValuePairs] = useOnyx(`${ONYXKEYS.COLLECTION.REPORT_NAME_VALUE_PAIRS}${report?.reportID ?? -1}`);
+
     const chatFooterStyles = {...styles.chatFooter, minHeight: !isOffline ? CONST.CHAT_FOOTER_MIN_HEIGHT : 0};
-    const isArchivedRoom = ReportUtils.isArchivedRoom(report);
-    const isAnonymousUser = session?.authTokenType === CONST.AUTH_TOKEN_TYPES.ANONYMOUS;
+    const isArchivedRoom = ReportUtils.isArchivedRoom(report, reportNameValuePairs);
 
-    const isSmallSizeLayout = windowWidth - (isSmallScreenWidth ? 0 : variables.sideBarWidth) < variables.anonymousReportFooterBreakpoint;
-    const hideComposer = !ReportUtils.canUserPerformWriteAction(report);
+    const isSmallSizeLayout = windowWidth - (shouldUseNarrowLayout ? 0 : variables.sideBarWidth) < variables.anonymousReportFooterBreakpoint;
+
+    // If a user just signed in and is viewing a public report, optimistically show the composer while loading the report, since they will have write access when the response comes back.
+    const shouldShowComposerOptimistically = !isAnonymousUser && ReportUtils.isPublicRoom(report) && !!reportMetadata?.isLoadingInitialReportActions;
+    const shouldHideComposer = (!ReportUtils.canUserPerformWriteAction(report) && !shouldShowComposerOptimistically) || isBlockedFromChat;
     const canWriteInReport = ReportUtils.canWriteInReport(report);
     const isSystemChat = ReportUtils.isSystemChat(report);
+    const isAdminsOnlyPostingRoom = ReportUtils.isAdminsOnlyPostingRoom(report);
+    const isUserPolicyAdmin = PolicyUtils.isPolicyAdmin(policy);
+    const shouldShowEducationalTooltip = !!workspaceTooltip?.shouldShow && !isUserPolicyAdmin;
 
     const allPersonalDetails = usePersonalDetails();
 
@@ -110,18 +142,18 @@ function ReportFooter({
             const mention = match[1] ? match[1].trim() : undefined;
             const mentionWithDomain = ReportUtils.addDomainToShortMention(mention ?? '') ?? mention;
 
-            let assignee: OnyxTypes.PersonalDetails | EmptyObject = {};
+            let assignee: OnyxEntry<OnyxTypes.PersonalDetails>;
             let assigneeChatReport;
             if (mentionWithDomain) {
-                assignee = Object.values(allPersonalDetails).find((value) => value?.login === mentionWithDomain) ?? {};
-                if (!Object.keys(assignee).length) {
+                assignee = Object.values(allPersonalDetails).find((value) => value?.login === mentionWithDomain) ?? undefined;
+                if (!Object.keys(assignee ?? {}).length) {
                     const assigneeAccountID = UserUtils.generateAccountID(mentionWithDomain);
                     const optimisticDataForNewAssignee = Task.setNewOptimisticAssignee(mentionWithDomain, assigneeAccountID);
                     assignee = optimisticDataForNewAssignee.assignee;
                     assigneeChatReport = optimisticDataForNewAssignee.assigneeReport;
                 }
             }
-            Task.createTaskAndNavigate(report.reportID, title, '', assignee?.login ?? '', assignee.accountID, assigneeChatReport, report.policyID);
+            Task.createTaskAndNavigate(report.reportID, title, '', assignee?.login ?? '', assignee?.accountID, assigneeChatReport, report.policyID);
             return true;
         },
         [allPersonalDetails, report.policyID, report.reportID],
@@ -135,14 +167,20 @@ function ReportFooter({
             }
             Report.addComment(report.reportID, text);
         },
-        // eslint-disable-next-line react-hooks/exhaustive-deps
+        // eslint-disable-next-line react-compiler/react-compiler, react-hooks/exhaustive-deps
         [report.reportID, handleCreateTask],
     );
 
     return (
         <>
-            {hideComposer && (
-                <View style={[styles.chatFooter, isArchivedRoom || isAnonymousUser || !canWriteInReport ? styles.mt4 : {}, isSmallScreenWidth ? styles.mb5 : null]}>
+            {shouldHideComposer && (
+                <View
+                    style={[
+                        styles.chatFooter,
+                        isArchivedRoom || isAnonymousUser || !canWriteInReport || (isAdminsOnlyPostingRoom && !isUserPolicyAdmin) ? styles.mt4 : {},
+                        shouldUseNarrowLayout ? styles.mb5 : null,
+                    ]}
+                >
                     {isAnonymousUser && !isArchivedRoom && (
                         <AnonymousReportFooter
                             report={report}
@@ -150,15 +188,25 @@ function ReportFooter({
                         />
                     )}
                     {isArchivedRoom && <ArchivedReportFooter report={report} />}
+                    {!isArchivedRoom && isBlockedFromChat && <BlockedReportFooter />}
                     {!isAnonymousUser && !canWriteInReport && isSystemChat && <SystemChatReportFooterMessage />}
-                    {!isSmallScreenWidth && <View style={styles.offlineIndicatorRow}>{hideComposer && <OfflineIndicator containerStyles={[styles.chatItemComposeSecondaryRow]} />}</View>}
+                    {isAdminsOnlyPostingRoom && !isUserPolicyAdmin && !isArchivedRoom && !isAnonymousUser && !isBlockedFromChat && (
+                        <Banner
+                            containerStyles={[styles.chatFooterBanner]}
+                            text={translate('adminOnlyCanPost')}
+                            icon={Expensicons.Lightbulb}
+                            shouldShowIcon
+                        />
+                    )}
+                    {!shouldUseNarrowLayout && (
+                        <View style={styles.offlineIndicatorRow}>{shouldHideComposer && <OfflineIndicator containerStyles={[styles.chatItemComposeSecondaryRow]} />}</View>
+                    )}
                 </View>
             )}
-            {!hideComposer && (!!shouldShowComposeInput || !isSmallScreenWidth) && (
+            {!shouldHideComposer && (!!shouldShowComposeInput || !shouldUseNarrowLayout) && (
                 <View style={[chatFooterStyles, isComposerFullSize && styles.chatFooterFullCompose]}>
                     <SwipeableView onSwipeDown={Keyboard.dismiss}>
                         <ReportActionCompose
-                            // @ts-expect-error TODO: Remove this once ReportActionCompose (https://github.com/Expensify/App/issues/31984) is migrated to TypeScript.
                             onSubmit={onSubmitComment}
                             onComposerFocus={onComposerFocus}
                             onComposerBlur={onComposerBlur}
@@ -168,8 +216,8 @@ function ReportFooter({
                             lastReportAction={lastReportAction}
                             pendingAction={pendingAction}
                             isComposerFullSize={isComposerFullSize}
-                            listHeight={listHeight}
                             isReportReadyForDisplay={isReportReadyForDisplay}
+                            shouldShowEducationalTooltip={didScreenTransitionEnd && shouldShowEducationalTooltip}
                         />
                     </SwipeableView>
                 </View>
@@ -180,26 +228,15 @@ function ReportFooter({
 
 ReportFooter.displayName = 'ReportFooter';
 
-export default withOnyx<ReportFooterProps, ReportFooterOnyxProps>({
-    shouldShowComposeInput: {
-        key: ONYXKEYS.SHOULD_SHOW_COMPOSE_INPUT,
-        initialValue: false,
-    },
-    session: {
-        key: ONYXKEYS.SESSION,
-    },
-})(
-    memo(
-        ReportFooter,
-        (prevProps, nextProps) =>
-            lodashIsEqual(prevProps.report, nextProps.report) &&
-            prevProps.pendingAction === nextProps.pendingAction &&
-            prevProps.listHeight === nextProps.listHeight &&
-            prevProps.isComposerFullSize === nextProps.isComposerFullSize &&
-            prevProps.isEmptyChat === nextProps.isEmptyChat &&
-            prevProps.lastReportAction === nextProps.lastReportAction &&
-            prevProps.shouldShowComposeInput === nextProps.shouldShowComposeInput &&
-            prevProps.isReportReadyForDisplay === nextProps.isReportReadyForDisplay &&
-            lodashIsEqual(prevProps.session, nextProps.session),
-    ),
+export default memo(
+    ReportFooter,
+    (prevProps, nextProps) =>
+        lodashIsEqual(prevProps.report, nextProps.report) &&
+        prevProps.pendingAction === nextProps.pendingAction &&
+        prevProps.isComposerFullSize === nextProps.isComposerFullSize &&
+        prevProps.isEmptyChat === nextProps.isEmptyChat &&
+        prevProps.lastReportAction === nextProps.lastReportAction &&
+        prevProps.isReportReadyForDisplay === nextProps.isReportReadyForDisplay &&
+        prevProps.workspaceTooltip?.shouldShow === nextProps.workspaceTooltip?.shouldShow &&
+        lodashIsEqual(prevProps.reportMetadata, nextProps.reportMetadata),
 );
diff --git a/src/pages/home/report/SystemChatReportFooterMessage.tsx b/src/pages/home/report/SystemChatReportFooterMessage.tsx
index c9ccac8f5c18..1c1ff2120674 100644
--- a/src/pages/home/report/SystemChatReportFooterMessage.tsx
+++ b/src/pages/home/report/SystemChatReportFooterMessage.tsx
@@ -1,5 +1,5 @@
 import React, {useMemo} from 'react';
-import {withOnyx} from 'react-native-onyx';
+import {useOnyx, withOnyx} from 'react-native-onyx';
 import type {OnyxCollection, OnyxEntry} from 'react-native-onyx';
 import Banner from '@components/Banner';
 import * as Expensicons from '@components/Icon/Expensicons';
@@ -8,7 +8,6 @@ import TextLink from '@components/TextLink';
 import useLocalize from '@hooks/useLocalize';
 import useThemeStyles from '@hooks/useThemeStyles';
 import * as PolicyUtils from '@libs/PolicyUtils';
-import * as ReportUtils from '@libs/ReportUtils';
 import Navigation from '@navigation/Navigation';
 import * as ReportInstance from '@userActions/Report';
 import type {OnboardingPurposeType} from '@src/CONST';
@@ -34,21 +33,23 @@ function SystemChatReportFooterMessage({choice, policies, activePolicyID}: Syste
     const {translate} = useLocalize();
     const styles = useThemeStyles();
 
-    const adminChatReport = useMemo(() => {
+    const adminChatReportID = useMemo(() => {
         const adminPolicy = activePolicyID
-            ? PolicyUtils.getPolicy(activePolicyID ?? '')
+            ? PolicyUtils.getPolicy(activePolicyID)
             : Object.values(policies ?? {}).find((policy) => PolicyUtils.shouldShowPolicy(policy, false) && policy?.role === CONST.POLICY.ROLE.ADMIN && policy?.chatReportIDAdmins);
 
-        return ReportUtils.getReport(String(adminPolicy?.chatReportIDAdmins));
+        return String(adminPolicy?.chatReportIDAdmins ?? -1);
     }, [activePolicyID, policies]);
 
+    const [adminChatReport] = useOnyx(`${ONYXKEYS.COLLECTION.REPORT}${adminChatReportID}`);
+
     const content = useMemo(() => {
         switch (choice) {
             case CONST.ONBOARDING_CHOICES.MANAGE_TEAM:
                 return (
                     <>
                         {translate('systemChatFooterMessage.newDotManageTeam.phrase1')}
-                        <TextLink onPress={() => Navigation.navigate(ROUTES.REPORT_WITH_ID.getRoute(adminChatReport?.reportID ?? ''))}>
+                        <TextLink onPress={() => Navigation.navigate(ROUTES.REPORT_WITH_ID.getRoute(adminChatReport?.reportID ?? '-1'))}>
                             {adminChatReport?.reportName ?? CONST.REPORT.WORKSPACE_CHAT_ROOMS.ADMINS}
                         </TextLink>
                         {translate('systemChatFooterMessage.newDotManageTeam.phrase2')}
@@ -67,10 +68,17 @@ function SystemChatReportFooterMessage({choice, policies, activePolicyID}: Syste
 
     return (
         <Banner
-            containerStyles={[styles.archivedReportFooter]}
+            containerStyles={[styles.chatFooterBanner]}
             shouldShowIcon
             icon={Expensicons.Lightbulb}
-            content={<Text suppressHighlighting>{content}</Text>}
+            content={
+                <Text
+                    suppressHighlighting
+                    style={styles.flex1}
+                >
+                    {content}
+                </Text>
+            }
         />
     );
 }
@@ -86,6 +94,5 @@ export default withOnyx<SystemChatReportFooterMessageProps, SystemChatReportFoot
     },
     activePolicyID: {
         key: ONYXKEYS.NVP_ACTIVE_POLICY_ID,
-        initialValue: null,
     },
 })(SystemChatReportFooterMessage);
diff --git a/src/pages/home/report/ThreadDivider.tsx b/src/pages/home/report/ThreadDivider.tsx
index edbe2c665752..d2ffa97f58b2 100644
--- a/src/pages/home/report/ThreadDivider.tsx
+++ b/src/pages/home/report/ThreadDivider.tsx
@@ -18,38 +18,56 @@ import ROUTES from '@src/ROUTES';
 type ThreadDividerProps = {
     /** Thread ancestor */
     ancestor: Ancestor;
+
+    /** Whether the link is disabled */
+    isLinkDisabled?: boolean;
 };
 
-function ThreadDivider({ancestor}: ThreadDividerProps) {
+function ThreadDivider({ancestor, isLinkDisabled = false}: ThreadDividerProps) {
     const styles = useThemeStyles();
     const theme = useTheme();
     const {translate} = useLocalize();
     const {isOffline} = useNetwork();
 
     return (
-        <View style={[styles.flexRow, styles.alignItemsCenter, styles.ml5, styles.mt3, styles.mb1]}>
-            <PressableWithoutFeedback
-                onPress={() => {
-                    const isVisibleAction = ReportActionsUtils.shouldReportActionBeVisible(ancestor.reportAction, ancestor.reportAction.reportActionID ?? '');
-                    // Pop the thread report screen before navigating to the chat report.
-                    Navigation.goBack(ROUTES.REPORT_WITH_ID.getRoute(ancestor.report.parentReportID ?? ''));
-                    if (isVisibleAction && !isOffline) {
-                        // Pop the chat report screen before navigating to the linked report action.
-                        Navigation.goBack(ROUTES.REPORT_WITH_ID.getRoute(ancestor.report.parentReportID ?? '', ancestor.reportAction.reportActionID));
-                    }
-                }}
-                accessibilityLabel={translate('threads.thread')}
-                role={CONST.ROLE.BUTTON}
-                style={[styles.flexRow, styles.alignItemsCenter, styles.gap1]}
-            >
-                <Icon
-                    src={Expensicons.Thread}
-                    fill={theme.link}
-                    width={variables.iconSizeExtraSmall}
-                    height={variables.iconSizeExtraSmall}
-                />
-                <Text style={[styles.threadDividerText, styles.link]}>{translate('threads.thread')}</Text>
-            </PressableWithoutFeedback>
+        <View
+            style={[styles.flexRow, styles.alignItemsCenter, styles.ml5, styles.mt3, styles.mb1, styles.userSelectNone]}
+            dataSet={{[CONST.SELECTION_SCRAPER_HIDDEN_ELEMENT]: true}}
+        >
+            {isLinkDisabled ? (
+                <>
+                    <Icon
+                        src={Expensicons.Thread}
+                        fill={theme.icon}
+                        width={variables.iconSizeExtraSmall}
+                        height={variables.iconSizeExtraSmall}
+                    />
+                    <Text style={[styles.threadDividerText, styles.textSupporting, styles.ml1, styles.userSelectNone]}>{translate('threads.thread')}</Text>
+                </>
+            ) : (
+                <PressableWithoutFeedback
+                    onPress={() => {
+                        const isVisibleAction = ReportActionsUtils.shouldReportActionBeVisible(ancestor.reportAction, ancestor.reportAction.reportActionID ?? '-1');
+                        // Pop the thread report screen before navigating to the chat report.
+                        Navigation.goBack(ROUTES.REPORT_WITH_ID.getRoute(ancestor.report.reportID ?? '-1'));
+                        if (isVisibleAction && !isOffline) {
+                            // Pop the chat report screen before navigating to the linked report action.
+                            Navigation.goBack(ROUTES.REPORT_WITH_ID.getRoute(ancestor.report.reportID ?? '-1', ancestor.reportAction.reportActionID));
+                        }
+                    }}
+                    accessibilityLabel={translate('threads.thread')}
+                    role={CONST.ROLE.BUTTON}
+                    style={[styles.flexRow, styles.alignItemsCenter, styles.gap1]}
+                >
+                    <Icon
+                        src={Expensicons.Thread}
+                        fill={theme.link}
+                        width={variables.iconSizeExtraSmall}
+                        height={variables.iconSizeExtraSmall}
+                    />
+                    <Text style={[styles.threadDividerText, styles.link]}>{translate('threads.thread')}</Text>
+                </PressableWithoutFeedback>
+            )}
             {!ancestor.shouldDisplayNewMarker && <View style={[styles.threadDividerLine]} />}
         </View>
     );
diff --git a/src/pages/home/report/UserTypingEventListener.tsx b/src/pages/home/report/UserTypingEventListener.tsx
index 45e56cfe7ff1..57eb51df137d 100644
--- a/src/pages/home/report/UserTypingEventListener.tsx
+++ b/src/pages/home/report/UserTypingEventListener.tsx
@@ -4,7 +4,7 @@ import {useEffect, useRef} from 'react';
 import {InteractionManager} from 'react-native';
 import {withOnyx} from 'react-native-onyx';
 import Navigation from '@libs/Navigation/Navigation';
-import type {CentralPaneNavigatorParamList} from '@libs/Navigation/types';
+import type {AuthScreensParamList} from '@libs/Navigation/types';
 import * as Report from '@userActions/Report';
 import ONYXKEYS from '@src/ONYXKEYS';
 import type SCREENS from '@src/SCREENS';
@@ -23,7 +23,24 @@ function UserTypingEventListener({report, lastVisitedPath}: UserTypingEventListe
     const didSubscribeToReportTypingEvents = useRef(false);
     const reportID = report.reportID;
     const isFocused = useIsFocused();
-    const route = useRoute<RouteProp<CentralPaneNavigatorParamList, typeof SCREENS.REPORT>>();
+    const route = useRoute<RouteProp<AuthScreensParamList, typeof SCREENS.REPORT>>();
+
+    useEffect(
+        () => () => {
+            if (!didSubscribeToReportTypingEvents.current) {
+                return;
+            }
+
+            // unsubscribe from report typing events when the component unmounts
+            didSubscribeToReportTypingEvents.current = false;
+            InteractionManager.runAfterInteractions(() => {
+                Report.unsubscribeFromReportChannel(reportID);
+            });
+        },
+        // eslint-disable-next-line react-compiler/react-compiler, react-hooks/exhaustive-deps
+        [],
+    );
+
     useEffect(() => {
         // Ensures any optimistic report that is being created (ex: a thread report) gets created and initialized successfully before subscribing
         if (route?.params?.reportID !== reportID) {
diff --git a/src/pages/home/report/comment/AttachmentCommentFragment.tsx b/src/pages/home/report/comment/AttachmentCommentFragment.tsx
index fec5ebe92e54..7d2d81b86e02 100644
--- a/src/pages/home/report/comment/AttachmentCommentFragment.tsx
+++ b/src/pages/home/report/comment/AttachmentCommentFragment.tsx
@@ -14,7 +14,7 @@ type AttachmentCommentFragmentProps = {
 
 function AttachmentCommentFragment({addExtraMargin, html, source, styleAsDeleted}: AttachmentCommentFragmentProps) {
     const styles = useThemeStyles();
-    const isUploading = html === CONST.ATTACHMENT_UPLOADING_MESSAGE_HTML;
+    const isUploading = html.includes(CONST.ATTACHMENT_OPTIMISTIC_SOURCE_ATTRIBUTE);
     const htmlContent = styleAsDeleted && isUploading ? `<del>${html}</del>` : html;
 
     return (
diff --git a/src/pages/home/report/comment/TextCommentFragment.tsx b/src/pages/home/report/comment/TextCommentFragment.tsx
index cf1ab6f8aa19..9d1a4d9ad4b7 100644
--- a/src/pages/home/report/comment/TextCommentFragment.tsx
+++ b/src/pages/home/report/comment/TextCommentFragment.tsx
@@ -1,16 +1,17 @@
-import Str from 'expensify-common/lib/str';
+import {Str} from 'expensify-common';
 import {isEmpty} from 'lodash';
-import React, {memo} from 'react';
+import React, {memo, useEffect} from 'react';
 import type {StyleProp, TextStyle} from 'react-native';
 import Text from '@components/Text';
 import ZeroWidthView from '@components/ZeroWidthView';
 import useLocalize from '@hooks/useLocalize';
+import useResponsiveLayout from '@hooks/useResponsiveLayout';
 import useTheme from '@hooks/useTheme';
 import useThemeStyles from '@hooks/useThemeStyles';
-import useWindowDimensions from '@hooks/useWindowDimensions';
 import convertToLTR from '@libs/convertToLTR';
 import * as DeviceCapabilities from '@libs/DeviceCapabilities';
 import * as EmojiUtils from '@libs/EmojiUtils';
+import Performance from '@libs/Performance';
 import variables from '@styles/variables';
 import CONST from '@src/CONST';
 import type {OriginalMessageSource} from '@src/types/onyx/OriginalMessage';
@@ -46,14 +47,18 @@ function TextCommentFragment({fragment, styleAsDeleted, styleAsMuted = false, so
     const styles = useThemeStyles();
     const {html = '', text} = fragment ?? {};
     const {translate} = useLocalize();
-    const {isSmallScreenWidth} = useWindowDimensions();
+    const {shouldUseNarrowLayout} = useResponsiveLayout();
+
+    useEffect(() => {
+        Performance.markEnd(CONST.TIMING.MESSAGE_SENT, {message: text});
+    }, [text]);
 
     // If the only difference between fragment.text and fragment.html is <br /> tags and emoji tag
     // on native, we render it as text, not as html
     // on other device, only render it as text if the only difference is <br /> tag
     const containsOnlyEmojis = EmojiUtils.containsOnlyEmojis(text ?? '');
     if (!shouldRenderAsText(html, text ?? '') && !(containsOnlyEmojis && styleAsDeleted)) {
-        const editedTag = fragment?.isEdited ? `<edited ${styleAsDeleted ? 'deleted' : ''}></edited>` : '';
+        const editedTag = fragment?.isEdited ? `<edited ${styleAsDeleted ? 'deleted' : ''} ${containsOnlyEmojis ? 'islarge' : ''}></edited>` : '';
         const htmlWithDeletedTag = styleAsDeleted ? `<del>${html}</del>` : html;
 
         const htmlContent = containsOnlyEmojis ? Str.replaceAll(htmlWithDeletedTag, '<emoji>', '<emoji islarge>') : htmlWithDeletedTag;
@@ -86,7 +91,7 @@ function TextCommentFragment({fragment, styleAsDeleted, styleAsMuted = false, so
                     style,
                     styleAsDeleted ? styles.offlineFeedback.deleted : undefined,
                     styleAsMuted ? styles.colorMuted : undefined,
-                    !DeviceCapabilities.canUseTouchScreen() || !isSmallScreenWidth ? styles.userSelectText : styles.userSelectNone,
+                    !DeviceCapabilities.canUseTouchScreen() || !shouldUseNarrowLayout ? styles.userSelectText : styles.userSelectNone,
                 ]}
             >
                 {convertToLTR(message ?? '')}
diff --git a/src/pages/home/report/comment/shouldRenderAsText/index.native.ts b/src/pages/home/report/comment/shouldRenderAsText/index.native.ts
index 7c5758f8720d..ac68a9e660cf 100644
--- a/src/pages/home/report/comment/shouldRenderAsText/index.native.ts
+++ b/src/pages/home/report/comment/shouldRenderAsText/index.native.ts
@@ -1,4 +1,4 @@
-import Str from 'expensify-common/lib/str';
+import {Str} from 'expensify-common';
 
 /**
  * Whether to render the report action as text
diff --git a/src/pages/home/report/comment/shouldRenderAsText/index.ts b/src/pages/home/report/comment/shouldRenderAsText/index.ts
index f26f43c528eb..7e8200671c1a 100644
--- a/src/pages/home/report/comment/shouldRenderAsText/index.ts
+++ b/src/pages/home/report/comment/shouldRenderAsText/index.ts
@@ -1,4 +1,4 @@
-import Str from 'expensify-common/lib/str';
+import {Str} from 'expensify-common';
 
 /**
  * Whether to render the report action as text
diff --git a/src/pages/home/report/reportActionFragmentPropTypes.js b/src/pages/home/report/reportActionFragmentPropTypes.js
deleted file mode 100644
index 5d2e3b951a1d..000000000000
--- a/src/pages/home/report/reportActionFragmentPropTypes.js
+++ /dev/null
@@ -1,32 +0,0 @@
-import PropTypes from 'prop-types';
-
-export default PropTypes.shape({
-    /** The type of the action item fragment. Used to render a corresponding component */
-    type: PropTypes.string.isRequired,
-
-    /** The text content of the fragment. */
-    text: PropTypes.string.isRequired,
-
-    /** Used to apply additional styling. Style refers to a predetermined constant and not a class name. e.g. 'normal'
-     * or 'strong'
-     */
-    style: PropTypes.string,
-
-    /** ID of a report */
-    reportID: PropTypes.string,
-
-    /** ID of a policy */
-    policyID: PropTypes.string,
-
-    /** The target of a link fragment e.g. '_blank' */
-    target: PropTypes.string,
-
-    /** The destination of a link fragment e.g. 'https://www.expensify.com' */
-    href: PropTypes.string,
-
-    /** An additional avatar url - not the main avatar url but used within a message. */
-    iconUrl: PropTypes.string,
-
-    /** Fragment edited flag */
-    isEdited: PropTypes.bool,
-});
diff --git a/src/pages/home/report/reportActionPropTypes.js b/src/pages/home/report/reportActionPropTypes.js
deleted file mode 100644
index f40e86aa7a7b..000000000000
--- a/src/pages/home/report/reportActionPropTypes.js
+++ /dev/null
@@ -1,31 +0,0 @@
-import PropTypes from 'prop-types';
-import reportActionFragmentPropTypes from './reportActionFragmentPropTypes';
-
-export default {
-    /** The ID of the reportAction. It is the string representation of the a 64-bit integer. */
-    reportActionID: PropTypes.string,
-
-    /** Name of the action e.g. ADD_COMMENT */
-    actionName: PropTypes.string,
-
-    /** Person who created the action */
-    person: PropTypes.arrayOf(reportActionFragmentPropTypes),
-
-    /** ISO-formatted datetime */
-    created: PropTypes.string,
-
-    /** report action message */
-    message: PropTypes.arrayOf(reportActionFragmentPropTypes),
-
-    /** Original message associated with this action */
-    originalMessage: PropTypes.shape({
-        // The ID of the iou transaction
-        IOUTransactionID: PropTypes.string,
-    }),
-
-    /** Error message that's come back from the server. */
-    error: PropTypes.string,
-
-    /** accountIDs of the people to which the whisper was sent to (if any). Returns empty array if it is not a whisper */
-    whisperedToAccountIDs: PropTypes.arrayOf(PropTypes.number),
-};
diff --git a/src/pages/home/report/withReportAndPrivateNotesOrNotFound.tsx b/src/pages/home/report/withReportAndPrivateNotesOrNotFound.tsx
index 468e4264bb3c..e6ba4858ad8b 100644
--- a/src/pages/home/report/withReportAndPrivateNotesOrNotFound.tsx
+++ b/src/pages/home/report/withReportAndPrivateNotesOrNotFound.tsx
@@ -1,7 +1,7 @@
 import React, {useEffect, useMemo} from 'react';
 import type {ComponentType, ForwardedRef, RefAttributes} from 'react';
 import type {OnyxEntry} from 'react-native-onyx';
-import {withOnyx} from 'react-native-onyx';
+import {useOnyx, withOnyx} from 'react-native-onyx';
 import useLocalize from '@hooks/useLocalize';
 import useNetwork from '@hooks/useNetwork';
 import usePrevious from '@hooks/usePrevious';
@@ -34,6 +34,7 @@ export default function (pageTitle: TranslationPaths) {
             const {translate} = useLocalize();
             const {isOffline} = useNetwork();
             const {route, report, session} = props;
+            const [reportNameValuePairs] = useOnyx(`${ONYXKEYS.COLLECTION.REPORT_NAME_VALUE_PAIRS}${report?.reportID ?? -1}`);
             const accountID = ('accountID' in route.params && route.params.accountID) || '';
             const isPrivateNotesFetchTriggered = report.isLoadingPrivateNotes !== undefined;
             const prevIsOffline = usePrevious(isOffline);
@@ -49,7 +50,7 @@ export default function (pageTitle: TranslationPaths) {
                 }
 
                 Report.getReportPrivateNote(report.reportID);
-                // eslint-disable-next-line react-hooks/exhaustive-deps -- do not add report.isLoadingPrivateNotes to dependencies
+                // eslint-disable-next-line react-compiler/react-compiler, react-hooks/exhaustive-deps -- do not add report.isLoadingPrivateNotes to dependencies
             }, [report.reportID, isOffline, isPrivateNotesFetchTriggered, isReconnecting]);
 
             const shouldShowFullScreenLoadingIndicator = !isPrivateNotesFetchFinished;
@@ -57,7 +58,7 @@ export default function (pageTitle: TranslationPaths) {
             // eslint-disable-next-line rulesdir/no-negated-variables
             const shouldShowNotFoundPage = useMemo(() => {
                 // Show not found view if the report is archived, or if the note is not of current user or if report is a self DM.
-                if (ReportUtils.isArchivedRoom(report) || isOtherUserNote || ReportUtils.isSelfDM(report)) {
+                if (ReportUtils.isArchivedRoom(report, reportNameValuePairs) || isOtherUserNote || ReportUtils.isSelfDM(report)) {
                     return true;
                 }
 
@@ -68,7 +69,7 @@ export default function (pageTitle: TranslationPaths) {
 
                 // As notes being empty and not loading is a valid case, show not found view only in offline mode.
                 return isOffline;
-            }, [report, isOtherUserNote, shouldShowFullScreenLoadingIndicator, isPrivateNotesUndefined, isReconnecting, isOffline]);
+            }, [report, isOtherUserNote, shouldShowFullScreenLoadingIndicator, isPrivateNotesUndefined, isReconnecting, isOffline, reportNameValuePairs]);
 
             if (shouldShowFullScreenLoadingIndicator) {
                 return <LoadingPage title={translate(pageTitle)} />;
diff --git a/src/pages/home/report/withReportAndReportActionOrNotFound.tsx b/src/pages/home/report/withReportAndReportActionOrNotFound.tsx
index e5e203fb5030..a9ad8851dcf1 100644
--- a/src/pages/home/report/withReportAndReportActionOrNotFound.tsx
+++ b/src/pages/home/report/withReportAndReportActionOrNotFound.tsx
@@ -2,12 +2,11 @@
 import type {StackScreenProps} from '@react-navigation/stack';
 import type {ComponentType, ForwardedRef, RefAttributes} from 'react';
 import React, {useCallback, useEffect} from 'react';
-import type {OnyxCollection, OnyxEntry, WithOnyxInstanceState} from 'react-native-onyx';
+import type {OnyxCollection, OnyxEntry, WithOnyxState} from 'react-native-onyx';
 import {withOnyx} from 'react-native-onyx';
 import FullscreenLoadingIndicator from '@components/FullscreenLoadingIndicator';
 import withWindowDimensions from '@components/withWindowDimensions';
 import type {WindowDimensionsProps} from '@components/withWindowDimensions/types';
-import compose from '@libs/compose';
 import getComponentDisplayName from '@libs/getComponentDisplayName';
 import type {FlagCommentNavigatorParamList, SplitDetailsNavigatorParamList} from '@libs/Navigation/types';
 import * as ReportUtils from '@libs/ReportUtils';
@@ -32,7 +31,7 @@ type OnyxProps = {
     reportActions: OnyxEntry<OnyxTypes.ReportActions>;
 
     /** The report's parentReportAction */
-    parentReportAction: OnyxEntry<OnyxTypes.ReportAction>;
+    parentReportAction: NonNullable<OnyxEntry<OnyxTypes.ReportAction>> | null;
 
     /** The policies which the user has access to */
     policies: OnyxCollection<OnyxTypes.Policy>;
@@ -53,11 +52,11 @@ export default function <TProps extends WithReportAndReportActionOrNotFoundProps
 ): ComponentType<TProps & RefAttributes<TRef>> {
     function WithReportOrNotFound(props: TProps, ref: ForwardedRef<TRef>) {
         const getReportAction = useCallback(() => {
-            let reportAction: OnyxTypes.ReportAction | Record<string, never> | undefined = props.reportActions?.[`${props.route.params.reportActionID}`];
+            let reportAction: OnyxEntry<OnyxTypes.ReportAction> = props.reportActions?.[`${props.route.params.reportActionID}`];
 
             // Handle threads if needed
             if (!reportAction?.reportActionID) {
-                reportAction = props?.parentReportAction ?? {};
+                reportAction = props?.parentReportAction ?? undefined;
             }
 
             return reportAction;
@@ -72,7 +71,7 @@ export default function <TProps extends WithReportAndReportActionOrNotFoundProps
                 return;
             }
             Report.openReport(props.route.params.reportID);
-            // eslint-disable-next-line react-hooks/exhaustive-deps
+            // eslint-disable-next-line react-compiler/react-compiler, react-hooks/exhaustive-deps
         }, [props.isSmallScreenWidth, props.route.params.reportID]);
 
         // Perform all the loading checks
@@ -103,13 +102,13 @@ export default function <TProps extends WithReportAndReportActionOrNotFoundProps
 
     WithReportOrNotFound.displayName = `withReportOrNotFound(${getComponentDisplayName(WrappedComponent)})`;
 
-    return compose(
+    return withWindowDimensions(
         withOnyx<TProps & RefAttributes<TRef>, OnyxProps>({
             report: {
                 key: ({route}) => `${ONYXKEYS.COLLECTION.REPORT}${route.params.reportID}`,
             },
             parentReport: {
-                key: ({report}) => `${ONYXKEYS.COLLECTION.REPORT}${report ? report.parentReportID : '0'}`,
+                key: ({report}) => `${ONYXKEYS.COLLECTION.REPORT}${report ? report.parentReportID : '-1'}`,
             },
             reportMetadata: {
                 key: ({route}) => `${ONYXKEYS.COLLECTION.REPORT_METADATA}${route.params.reportID}`,
@@ -129,7 +128,7 @@ export default function <TProps extends WithReportAndReportActionOrNotFoundProps
             },
             parentReportAction: {
                 key: ({report}) => `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${report ? report.parentReportID : 0}`,
-                selector: (parentReportActions: OnyxEntry<OnyxTypes.ReportActions>, props: WithOnyxInstanceState<OnyxProps>): OnyxEntry<OnyxTypes.ReportAction> => {
+                selector: (parentReportActions: OnyxEntry<OnyxTypes.ReportActions>, props?: WithOnyxState<OnyxProps>): NonNullable<OnyxEntry<OnyxTypes.ReportAction>> | null => {
                     const parentReportActionID = props?.report?.parentReportActionID;
                     if (!parentReportActionID) {
                         return null;
@@ -138,9 +137,8 @@ export default function <TProps extends WithReportAndReportActionOrNotFoundProps
                 },
                 canEvict: false,
             },
-        }),
-        withWindowDimensions,
-    )(React.forwardRef(WithReportOrNotFound));
+        })(React.forwardRef(WithReportOrNotFound)),
+    );
 }
 
 export type {WithReportAndReportActionOrNotFoundProps};
diff --git a/src/pages/home/report/withReportOrNotFound.tsx b/src/pages/home/report/withReportOrNotFound.tsx
index 56b0bd2dbf33..7f6165a031ee 100644
--- a/src/pages/home/report/withReportOrNotFound.tsx
+++ b/src/pages/home/report/withReportOrNotFound.tsx
@@ -66,7 +66,7 @@ export default function (
                 }
 
                 Report.openReport(props.route.params.reportID);
-                // eslint-disable-next-line react-hooks/exhaustive-deps
+                // eslint-disable-next-line react-compiler/react-compiler, react-hooks/exhaustive-deps
             }, [shouldFetchReport, isReportLoaded, props.route.params.reportID]);
 
             if (shouldRequireReportID || isReportIdInRoute) {
diff --git a/src/pages/home/sidebar/AllSettingsScreen.tsx b/src/pages/home/sidebar/AllSettingsScreen.tsx
index 8056d9bcc413..dc969cb98622 100644
--- a/src/pages/home/sidebar/AllSettingsScreen.tsx
+++ b/src/pages/home/sidebar/AllSettingsScreen.tsx
@@ -1,17 +1,16 @@
 import React, {useMemo} from 'react';
 import type {OnyxCollection} from 'react-native-onyx';
-import {withOnyx} from 'react-native-onyx';
+import {useOnyx, withOnyx} from 'react-native-onyx';
 import Breadcrumbs from '@components/Breadcrumbs';
 import * as Expensicons from '@components/Icon/Expensicons';
 import MenuItemList from '@components/MenuItemList';
 import ScreenWrapper from '@components/ScreenWrapper';
 import ScrollView from '@components/ScrollView';
 import useLocalize from '@hooks/useLocalize';
+import useResponsiveLayout from '@hooks/useResponsiveLayout';
 import useThemeStyles from '@hooks/useThemeStyles';
 import useWaitForNavigation from '@hooks/useWaitForNavigation';
-import useWindowDimensions from '@hooks/useWindowDimensions';
 import Navigation from '@libs/Navigation/Navigation';
-import shouldShowSubscriptionsMenu from '@libs/shouldShowSubscriptionsMenu';
 import {hasGlobalWorkspaceSettingsRBR} from '@libs/WorkspacesSettingsUtils';
 import * as Link from '@userActions/Link';
 import CONST from '@src/CONST';
@@ -30,7 +29,9 @@ function AllSettingsScreen({policies}: AllSettingsScreenProps) {
     const styles = useThemeStyles();
     const waitForNavigate = useWaitForNavigation();
     const {translate} = useLocalize();
-    const {isSmallScreenWidth} = useWindowDimensions();
+    const {shouldUseNarrowLayout} = useResponsiveLayout();
+
+    const [privateSubscription] = useOnyx(ONYXKEYS.NVP_PRIVATE_SUBSCRIPTION);
 
     /**
      * Retuns a list of menu items data for All workspaces settings
@@ -46,13 +47,13 @@ function AllSettingsScreen({policies}: AllSettingsScreenProps) {
                         Navigation.navigate(ROUTES.SETTINGS_WORKSPACES);
                     })();
                 },
-                focused: !isSmallScreenWidth,
+                focused: !shouldUseNarrowLayout,
                 brickRoadIndicator: hasGlobalWorkspaceSettingsRBR(policies) ? CONST.BRICK_ROAD_INDICATOR_STATUS.ERROR : undefined,
             },
-            ...(shouldShowSubscriptionsMenu
+            ...(privateSubscription
                 ? [
                       {
-                          translationKey: 'allSettingsScreen.subscriptions',
+                          translationKey: 'allSettingsScreen.subscription',
                           icon: Expensicons.MoneyBag,
                           action: () => {
                               Link.openOldDotLink(CONST.OLDDOT_URLS.ADMIN_POLICIES_URL);
@@ -64,8 +65,8 @@ function AllSettingsScreen({policies}: AllSettingsScreenProps) {
                   ]
                 : []),
             {
-                translationKey: 'allSettingsScreen.cardsAndDomains',
-                icon: Expensicons.CardsAndDomains,
+                translationKey: 'allSettingsScreen.domains',
+                icon: Expensicons.Globe,
                 action: () => {
                     Link.openOldDotLink(CONST.OLDDOT_URLS.ADMIN_DOMAINS_URL);
                 },
@@ -82,14 +83,14 @@ function AllSettingsScreen({policies}: AllSettingsScreenProps) {
             iconRight: item.iconRight,
             onPress: item.action,
             shouldShowRightIcon: item.shouldShowRightIcon,
-            shouldBlockSelection: Boolean(item.link),
+            shouldBlockSelection: !!item.link,
             wrapperStyle: styles.sectionMenuItem,
             isPaneMenu: true,
             focused: item.focused,
             hoverAndPressStyle: styles.hoveredComponentBG,
             brickRoadIndicator: item.brickRoadIndicator,
         }));
-    }, [isSmallScreenWidth, styles.hoveredComponentBG, styles.sectionMenuItem, translate, waitForNavigate, policies]);
+    }, [shouldUseNarrowLayout, policies, privateSubscription, waitForNavigate, translate, styles]);
 
     return (
         <ScreenWrapper
diff --git a/src/pages/home/sidebar/AvatarWithOptionalStatus.tsx b/src/pages/home/sidebar/AvatarWithOptionalStatus.tsx
index 609e4044002e..5d4af7ea4961 100644
--- a/src/pages/home/sidebar/AvatarWithOptionalStatus.tsx
+++ b/src/pages/home/sidebar/AvatarWithOptionalStatus.tsx
@@ -19,12 +19,14 @@ function AvatarWithOptionalStatus({emojiStatus = '', isSelected = false}: Avatar
         <View style={styles.sidebarStatusAvatarContainer}>
             <ProfileAvatarWithIndicator isSelected={isSelected} />
             <View style={[styles.sidebarStatusAvatar]}>
-                <Text
-                    style={styles.emojiStatusLHN}
-                    numberOfLines={1}
-                >
-                    {emojiStatus}
-                </Text>
+                <View>
+                    <Text
+                        style={styles.emojiStatusLHN}
+                        numberOfLines={1}
+                    >
+                        {emojiStatus}
+                    </Text>
+                </View>
             </View>
         </View>
     );
diff --git a/src/pages/home/sidebar/ProfileAvatarWithIndicator.tsx b/src/pages/home/sidebar/ProfileAvatarWithIndicator.tsx
index e7726fb89537..833c76f6f071 100644
--- a/src/pages/home/sidebar/ProfileAvatarWithIndicator.tsx
+++ b/src/pages/home/sidebar/ProfileAvatarWithIndicator.tsx
@@ -5,7 +5,6 @@ import AvatarWithIndicator from '@components/AvatarWithIndicator';
 import OfflineWithFeedback from '@components/OfflineWithFeedback';
 import useCurrentUserPersonalDetails from '@hooks/useCurrentUserPersonalDetails';
 import useThemeStyles from '@hooks/useThemeStyles';
-import * as UserUtils from '@libs/UserUtils';
 import ONYXKEYS from '@src/ONYXKEYS';
 
 type ProfileAvatarWithIndicatorProps = {
@@ -16,16 +15,16 @@ type ProfileAvatarWithIndicatorProps = {
 function ProfileAvatarWithIndicator({isSelected = false}: ProfileAvatarWithIndicatorProps) {
     const styles = useThemeStyles();
     const currentUserPersonalDetails = useCurrentUserPersonalDetails();
-    const [isLoadingOnyxValue] = useOnyx(ONYXKEYS.IS_LOADING_APP);
-    const isLoading = isLoadingOnyxValue ?? true;
+    const [isLoading = true] = useOnyx(ONYXKEYS.IS_LOADING_APP);
 
     return (
         <OfflineWithFeedback pendingAction={currentUserPersonalDetails.pendingFields?.avatar}>
             <View style={[isSelected && styles.selectedAvatarBorder]}>
                 <AvatarWithIndicator
-                    source={UserUtils.getAvatar(currentUserPersonalDetails.avatar, currentUserPersonalDetails.accountID)}
+                    source={currentUserPersonalDetails.avatar}
+                    accountID={currentUserPersonalDetails.accountID}
                     fallbackIcon={currentUserPersonalDetails.fallbackIcon}
-                    isLoading={isLoading && !currentUserPersonalDetails.avatar}
+                    isLoading={!!(isLoading && !currentUserPersonalDetails.avatar)}
                 />
             </View>
         </OfflineWithFeedback>
diff --git a/src/pages/home/sidebar/SidebarLinks.tsx b/src/pages/home/sidebar/SidebarLinks.tsx
index ac07c9f182b3..c4ace993d222 100644
--- a/src/pages/home/sidebar/SidebarLinks.tsx
+++ b/src/pages/home/sidebar/SidebarLinks.tsx
@@ -1,4 +1,4 @@
-import React, {memo, useCallback, useEffect, useMemo, useRef} from 'react';
+import React, {memo, useCallback, useEffect, useMemo} from 'react';
 import {InteractionManager, StyleSheet, View} from 'react-native';
 import type {OnyxEntry} from 'react-native-onyx';
 import type {EdgeInsets} from 'react-native-safe-area-context';
@@ -6,18 +6,15 @@ import type {ValueOf} from 'type-fest';
 import LHNOptionsList from '@components/LHNOptionsList/LHNOptionsList';
 import OptionsListSkeletonView from '@components/OptionsListSkeletonView';
 import useLocalize from '@hooks/useLocalize';
+import useResponsiveLayout from '@hooks/useResponsiveLayout';
 import useStyleUtils from '@hooks/useStyleUtils';
 import useThemeStyles from '@hooks/useThemeStyles';
-import useWindowDimensions from '@hooks/useWindowDimensions';
-import KeyboardShortcut from '@libs/KeyboardShortcut';
 import Navigation from '@libs/Navigation/Navigation';
-import onyxSubscribe from '@libs/onyxSubscribe';
 import * as ReportActionContextMenu from '@pages/home/report/ContextMenu/ReportActionContextMenu';
 import * as App from '@userActions/App';
 import CONST from '@src/CONST';
-import ONYXKEYS from '@src/ONYXKEYS';
 import ROUTES from '@src/ROUTES';
-import type {Modal, Report} from '@src/types/onyx';
+import type {Report} from '@src/types/onyx';
 
 type SidebarLinksProps = {
     /** Toggles the navigation menu open and closed */
@@ -46,9 +43,8 @@ type SidebarLinksProps = {
 function SidebarLinks({onLinkClick, insets, optionListItems, isLoading, priorityMode = CONST.PRIORITY_MODE.DEFAULT, isActiveReport}: SidebarLinksProps) {
     const styles = useThemeStyles();
     const StyleUtils = useStyleUtils();
-    const modal = useRef<Modal>({});
     const {updateLocale} = useLocalize();
-    const {isSmallScreenWidth} = useWindowDimensions();
+    const {shouldUseNarrowLayout} = useResponsiveLayout();
 
     useEffect(() => {
         App.confirmReadyToOpenApp();
@@ -61,47 +57,8 @@ function SidebarLinks({onLinkClick, insets, optionListItems, isLoading, priority
             });
         });
 
-        const unsubscribeOnyxModal = onyxSubscribe({
-            key: ONYXKEYS.MODAL,
-            callback: (modalArg) => {
-                if (modalArg === null || typeof modalArg !== 'object') {
-                    return;
-                }
-                modal.current = modalArg;
-            },
-        });
-
-        const shortcutConfig = CONST.KEYBOARD_SHORTCUTS.ESCAPE;
-        const unsubscribeEscapeKey = KeyboardShortcut.subscribe(
-            shortcutConfig.shortcutKey,
-            () => {
-                if (modal.current.willAlertModalBecomeVisible) {
-                    return;
-                }
-
-                if (modal.current.disableDismissOnEscape) {
-                    return;
-                }
-
-                Navigation.dismissModal();
-            },
-            shortcutConfig.descriptionKey,
-            shortcutConfig.modifiers,
-            true,
-            true,
-        );
-
         ReportActionContextMenu.hideContextMenu(false);
-
-        return () => {
-            if (unsubscribeEscapeKey) {
-                unsubscribeEscapeKey();
-            }
-            if (unsubscribeOnyxModal) {
-                unsubscribeOnyxModal();
-            }
-        };
-        // eslint-disable-next-line react-hooks/exhaustive-deps
+        // eslint-disable-next-line react-compiler/react-compiler, react-hooks/exhaustive-deps
     }, []);
 
     /**
@@ -114,18 +71,18 @@ function SidebarLinks({onLinkClick, insets, optionListItems, isLoading, priority
             // or when continuously clicking different LHNs, only apply to small screen
             // since getTopmostReportId always returns on other devices
             const reportActionID = Navigation.getTopmostReportActionId();
-            if ((option.reportID === Navigation.getTopmostReportId() && !reportActionID) || (isSmallScreenWidth && isActiveReport(option.reportID) && !reportActionID)) {
+            if ((option.reportID === Navigation.getTopmostReportId() && !reportActionID) || (shouldUseNarrowLayout && isActiveReport(option.reportID) && !reportActionID)) {
                 return;
             }
             Navigation.navigate(ROUTES.REPORT_WITH_ID.getRoute(option.reportID));
             onLinkClick();
         },
-        [isSmallScreenWidth, isActiveReport, onLinkClick],
+        [shouldUseNarrowLayout, isActiveReport, onLinkClick],
     );
 
     const viewMode = priorityMode === CONST.PRIORITY_MODE.GSD ? CONST.OPTION_MODE.COMPACT : CONST.OPTION_MODE.DEFAULT;
 
-    // eslint-disable-next-line react-hooks/exhaustive-deps
+    // eslint-disable-next-line react-compiler/react-compiler, react-hooks/exhaustive-deps
     const contentContainerStyles = useMemo(() => StyleSheet.flatten([styles.sidebarListContainer, {paddingBottom: StyleUtils.getSafeAreaMargins(insets).marginBottom}]), [insets]);
 
     return (
@@ -136,7 +93,7 @@ function SidebarLinks({onLinkClick, insets, optionListItems, isLoading, priority
                     contentContainerStyles={contentContainerStyles}
                     data={optionListItems}
                     onSelectRow={showReportPage}
-                    shouldDisableFocusOptions={isSmallScreenWidth}
+                    shouldDisableFocusOptions={shouldUseNarrowLayout}
                     optionMode={viewMode}
                     onFirstItemRendered={App.setSidebarLoaded}
                 />
diff --git a/src/pages/home/sidebar/SidebarLinksData.tsx b/src/pages/home/sidebar/SidebarLinksData.tsx
index 46f7d2410ffe..e5a74db796d8 100644
--- a/src/pages/home/sidebar/SidebarLinksData.tsx
+++ b/src/pages/home/sidebar/SidebarLinksData.tsx
@@ -2,18 +2,15 @@ import {useIsFocused} from '@react-navigation/native';
 import lodashIsEqual from 'lodash/isEqual';
 import React, {memo, useCallback, useEffect, useRef} from 'react';
 import {View} from 'react-native';
-import type {OnyxCollection, OnyxEntry} from 'react-native-onyx';
+import type {OnyxEntry} from 'react-native-onyx';
 import {withOnyx} from 'react-native-onyx';
 import type {EdgeInsets} from 'react-native-safe-area-context';
 import type {ValueOf} from 'type-fest';
-import useActiveWorkspace from '@hooks/useActiveWorkspace';
-import useCurrentUserPersonalDetails from '@hooks/useCurrentUserPersonalDetails';
+import useActiveWorkspaceFromNavigationState from '@hooks/useActiveWorkspaceFromNavigationState';
 import useLocalize from '@hooks/useLocalize';
-import type {PolicySelector} from '@hooks/useReportIDs';
-import {policySelector, useReportIDs} from '@hooks/useReportIDs';
+import {useReportIDs} from '@hooks/useReportIDs';
 import useThemeStyles from '@hooks/useThemeStyles';
-import {getPolicyEmployeeListByIdWithoutCurrentUser} from '@libs/PolicyUtils';
-import * as Policy from '@userActions/Policy';
+import * as Policy from '@userActions/Policy/Policy';
 import CONST from '@src/CONST';
 import ONYXKEYS from '@src/ONYXKEYS';
 import SidebarLinks from './SidebarLinks';
@@ -24,9 +21,6 @@ type SidebarLinksDataOnyxProps = {
 
     /** The chat priority mode */
     priorityMode: OnyxEntry<ValueOf<typeof CONST.PRIORITY_MODE>>;
-
-    /** The policies which the user has access to */
-    policies: OnyxCollection<PolicySelector>;
 };
 
 type SidebarLinksDataProps = SidebarLinksDataOnyxProps & {
@@ -37,21 +31,24 @@ type SidebarLinksDataProps = SidebarLinksDataOnyxProps & {
     insets: EdgeInsets;
 };
 
-function SidebarLinksData({insets, isLoadingApp = true, onLinkClick, priorityMode = CONST.PRIORITY_MODE.DEFAULT, policies}: SidebarLinksDataProps) {
-    const {accountID} = useCurrentUserPersonalDetails();
+function SidebarLinksData({insets, isLoadingApp = true, onLinkClick, priorityMode = CONST.PRIORITY_MODE.DEFAULT}: SidebarLinksDataProps) {
     const isFocused = useIsFocused();
     const styles = useThemeStyles();
-    const {activeWorkspaceID} = useActiveWorkspace();
+    const activeWorkspaceID = useActiveWorkspaceFromNavigationState();
     const {translate} = useLocalize();
 
-    const policyMemberAccountIDs = getPolicyEmployeeListByIdWithoutCurrentUser(policies, activeWorkspaceID, accountID);
+    const {orderedReportIDs, currentReportID, policyMemberAccountIDs} = useReportIDs();
 
-    // eslint-disable-next-line react-hooks/exhaustive-deps
-    useEffect(() => Policy.openWorkspace(activeWorkspaceID ?? '', policyMemberAccountIDs), [activeWorkspaceID]);
+    useEffect(() => {
+        if (!activeWorkspaceID) {
+            return;
+        }
 
-    const isLoading = isLoadingApp;
-    const {orderedReportIDs, currentReportID} = useReportIDs();
+        Policy.openWorkspace(activeWorkspaceID, policyMemberAccountIDs);
+        // eslint-disable-next-line react-compiler/react-compiler, react-hooks/exhaustive-deps
+    }, [activeWorkspaceID]);
 
+    const isLoading = isLoadingApp;
     const currentReportIDRef = useRef(currentReportID);
     currentReportIDRef.current = currentReportID;
     const isActiveReport = useCallback((reportID: string): boolean => currentReportIDRef.current === reportID, []);
@@ -88,11 +85,6 @@ export default withOnyx<SidebarLinksDataProps, SidebarLinksDataOnyxProps>({
         key: ONYXKEYS.NVP_PRIORITY_MODE,
         initialValue: CONST.PRIORITY_MODE.DEFAULT,
     },
-    policies: {
-        key: ONYXKEYS.COLLECTION.POLICY,
-        selector: policySelector,
-        initialValue: {},
-    },
 })(
     /* 
 While working on audit on the App Start App metric we noticed that by memoizing SidebarLinksData we can avoid 2 additional run of getOrderedReportIDs.
@@ -105,7 +97,6 @@ More details - https://github.com/Expensify/App/issues/35234#issuecomment-192691
             prevProps.isLoadingApp === nextProps.isLoadingApp &&
             prevProps.priorityMode === nextProps.priorityMode &&
             lodashIsEqual(prevProps.insets, nextProps.insets) &&
-            prevProps.onLinkClick === nextProps.onLinkClick &&
-            lodashIsEqual(prevProps.policies, nextProps.policies),
+            prevProps.onLinkClick === nextProps.onLinkClick,
     ),
 );
diff --git a/src/pages/home/sidebar/SidebarScreen/BaseSidebarScreen.tsx b/src/pages/home/sidebar/SidebarScreen/BaseSidebarScreen.tsx
index db30773f5155..edc8dfb3cb3a 100644
--- a/src/pages/home/sidebar/SidebarScreen/BaseSidebarScreen.tsx
+++ b/src/pages/home/sidebar/SidebarScreen/BaseSidebarScreen.tsx
@@ -1,15 +1,19 @@
 import React, {useEffect} from 'react';
 import {View} from 'react-native';
+import {useOnyx} from 'react-native-onyx';
 import ScreenWrapper from '@components/ScreenWrapper';
+import useActiveWorkspaceFromNavigationState from '@hooks/useActiveWorkspaceFromNavigationState';
 import useLocalize from '@hooks/useLocalize';
 import useThemeStyles from '@hooks/useThemeStyles';
+import {updateLastAccessedWorkspace} from '@libs/actions/Policy/Policy';
 import * as Browser from '@libs/Browser';
 import TopBar from '@libs/Navigation/AppNavigator/createCustomBottomTabNavigator/TopBar';
+import Navigation from '@libs/Navigation/Navigation';
 import Performance from '@libs/Performance';
-import {getPolicyIDFromNavigationState} from '@libs/PolicyUtils';
 import SidebarLinksData from '@pages/home/sidebar/SidebarLinksData';
 import Timing from '@userActions/Timing';
 import CONST from '@src/CONST';
+import ONYXKEYS from '@src/ONYXKEYS';
 
 /**
  * Function called when a pinned chat is selected.
@@ -21,14 +25,24 @@ const startTimer = () => {
 
 function BaseSidebarScreen() {
     const styles = useThemeStyles();
-    const activeWorkspaceID = getPolicyIDFromNavigationState();
+    const activeWorkspaceID = useActiveWorkspaceFromNavigationState();
     const {translate} = useLocalize();
+    const [activeWorkspace] = useOnyx(`${ONYXKEYS.COLLECTION.POLICY}${activeWorkspaceID ?? -1}`);
 
     useEffect(() => {
         Performance.markStart(CONST.TIMING.SIDEBAR_LOADED);
-        Timing.start(CONST.TIMING.SIDEBAR_LOADED, true);
+        Timing.start(CONST.TIMING.SIDEBAR_LOADED);
     }, []);
 
+    useEffect(() => {
+        if (!!activeWorkspace || activeWorkspaceID === undefined) {
+            return;
+        }
+
+        Navigation.navigateWithSwitchPolicyID({policyID: undefined});
+        updateLastAccessedWorkspace(undefined);
+    }, [activeWorkspace, activeWorkspaceID]);
+
     return (
         <ScreenWrapper
             includeSafeAreaPaddingBottom={false}
@@ -40,7 +54,7 @@ function BaseSidebarScreen() {
             {({insets}) => (
                 <>
                     <TopBar
-                        breadcrumbLabel={translate('common.chats')}
+                        breadcrumbLabel={translate('common.inbox')}
                         activeWorkspaceID={activeWorkspaceID}
                     />
                     <View style={[styles.flex1]}>
diff --git a/src/pages/home/sidebar/SidebarScreen/FloatingActionButtonAndPopover.tsx b/src/pages/home/sidebar/SidebarScreen/FloatingActionButtonAndPopover.tsx
index 8ac3f7e0ca94..b221a5d5be9d 100644
--- a/src/pages/home/sidebar/SidebarScreen/FloatingActionButtonAndPopover.tsx
+++ b/src/pages/home/sidebar/SidebarScreen/FloatingActionButtonAndPopover.tsx
@@ -4,26 +4,30 @@ import type {ForwardedRef, RefAttributes} from 'react';
 import React, {forwardRef, useCallback, useEffect, useImperativeHandle, useMemo, useRef, useState} from 'react';
 import {View} from 'react-native';
 import type {OnyxCollection, OnyxEntry} from 'react-native-onyx';
-import {withOnyx} from 'react-native-onyx';
+import {useOnyx, withOnyx} from 'react-native-onyx';
 import type {SvgProps} from 'react-native-svg';
 import FloatingActionButton from '@components/FloatingActionButton';
 import * as Expensicons from '@components/Icon/Expensicons';
 import PopoverMenu from '@components/PopoverMenu';
+import Text from '@components/Text';
 import useLocalize from '@hooks/useLocalize';
 import useNetwork from '@hooks/useNetwork';
 import usePermissions from '@hooks/usePermissions';
 import usePrevious from '@hooks/usePrevious';
+import useResponsiveLayout from '@hooks/useResponsiveLayout';
 import useThemeStyles from '@hooks/useThemeStyles';
 import useWindowDimensions from '@hooks/useWindowDimensions';
 import getIconForAction from '@libs/getIconForAction';
 import interceptAnonymousUser from '@libs/interceptAnonymousUser';
 import getTopmostCentralPaneRoute from '@libs/Navigation/getTopmostCentralPaneRoute';
 import Navigation from '@libs/Navigation/Navigation';
+import type {CentralPaneName, NavigationPartialRoute, RootStackParamList} from '@libs/Navigation/types';
 import * as PolicyUtils from '@libs/PolicyUtils';
 import * as ReportUtils from '@libs/ReportUtils';
+import * as SubscriptionUtils from '@libs/SubscriptionUtils';
 import * as App from '@userActions/App';
 import * as IOU from '@userActions/IOU';
-import * as Policy from '@userActions/Policy';
+import * as Policy from '@userActions/Policy/Policy';
 import * as Report from '@userActions/Report';
 import * as Task from '@userActions/Task';
 import CONST from '@src/CONST';
@@ -38,13 +42,13 @@ import {isEmptyObject} from '@src/types/utils/EmptyObject';
 // On small screen we hide the search page from central pane to show the search bottom tab page with bottom tab bar.
 // We need to take this in consideration when checking if the screen is focused.
 const useIsFocused = () => {
-    const {isSmallScreenWidth} = useWindowDimensions();
+    const {shouldUseNarrowLayout} = useResponsiveLayout();
     const isFocused = useIsFocusedOriginal();
-    const topmostCentralPane = useNavigationState(getTopmostCentralPaneRoute);
-    return isFocused || (topmostCentralPane?.name === SCREENS.SEARCH.CENTRAL_PANE && isSmallScreenWidth);
+    const topmostCentralPane = useNavigationState<RootStackParamList, NavigationPartialRoute<CentralPaneName> | undefined>(getTopmostCentralPaneRoute);
+    return isFocused || (topmostCentralPane?.name === SCREENS.SEARCH.CENTRAL_PANE && shouldUseNarrowLayout);
 };
 
-type PolicySelector = Pick<OnyxTypes.Policy, 'type' | 'role' | 'isPolicyExpenseChatEnabled' | 'pendingAction' | 'avatarURL' | 'name' | 'id'>;
+type PolicySelector = Pick<OnyxTypes.Policy, 'type' | 'role' | 'isPolicyExpenseChatEnabled' | 'pendingAction' | 'avatarURL' | 'name' | 'id' | 'areInvoicesEnabled'>;
 
 type FloatingActionButtonAndPopoverOnyxProps = {
     /** The list of policies the user has access to. */
@@ -93,6 +97,7 @@ const policySelector = (policy: OnyxEntry<OnyxTypes.Policy>): PolicySelector =>
         pendingAction: policy.pendingAction,
         avatarURL: policy.avatarURL,
         name: policy.name,
+        areInvoicesEnabled: policy.areInvoicesEnabled,
     }) as PolicySelector;
 
 const getQuickActionIcon = (action: QuickActionName): React.FC<SvgProps> => {
@@ -143,7 +148,7 @@ const getQuickActionTitle = (action: QuickActionName): TranslationPaths => {
         case CONST.QUICK_ACTIONS.TRACK_DISTANCE:
             return 'quickAction.trackDistance';
         case CONST.QUICK_ACTIONS.SEND_MONEY:
-            return 'quickAction.sendMoney';
+            return 'quickAction.paySomeone';
         case CONST.QUICK_ACTIONS.ASSIGN_TASK:
             return 'quickAction.assignTask';
         default:
@@ -172,10 +177,11 @@ function FloatingActionButtonAndPopover(
 ) {
     const styles = useThemeStyles();
     const {translate} = useLocalize();
+    const [reportNameValuePairs] = useOnyx(`${ONYXKEYS.COLLECTION.REPORT_NAME_VALUE_PAIRS}${quickActionReport?.reportID ?? -1}`);
     const [isCreateMenuActive, setIsCreateMenuActive] = useState(false);
     const fabRef = useRef<HTMLDivElement>(null);
-    const {canUseTrackExpense} = usePermissions();
-    const {isSmallScreenWidth, windowHeight} = useWindowDimensions();
+    const {windowHeight} = useWindowDimensions();
+    const {shouldUseNarrowLayout} = useResponsiveLayout();
     const isFocused = useIsFocused();
     const prevIsFocused = usePrevious(isFocused);
     const {isOffline} = useNetwork();
@@ -190,48 +196,88 @@ function FloatingActionButtonAndPopover(
         }
         return [];
         // Policy is needed as a dependency in order to update the shortcut details when the workspace changes
-        // eslint-disable-next-line react-hooks/exhaustive-deps
+        // eslint-disable-next-line react-compiler/react-compiler, react-hooks/exhaustive-deps
     }, [personalDetails, session?.accountID, quickActionReport, quickActionPolicy]);
 
+    const renderQuickActionTooltip = useCallback(
+        () => (
+            <Text>
+                <Text style={styles.quickActionTooltipTitle}>{translate('quickAction.tooltip.title')}</Text>
+                <Text style={styles.quickActionTooltipSubtitle}>{translate('quickAction.tooltip.subtitle')}</Text>
+            </Text>
+        ),
+        [styles.quickActionTooltipTitle, styles.quickActionTooltipSubtitle, translate],
+    );
+
     const quickActionTitle = useMemo(() => {
+        if (isEmptyObject(quickActionReport)) {
+            return '';
+        }
+        if (quickAction?.action === CONST.QUICK_ACTIONS.SEND_MONEY && quickActionAvatars.length > 0) {
+            const name: string = ReportUtils.getDisplayNameForParticipant(+(quickActionAvatars[0]?.id ?? -1), true) ?? '';
+            return translate('quickAction.paySomeone', name);
+        }
         const titleKey = getQuickActionTitle(quickAction?.action ?? ('' as QuickActionName));
         return titleKey ? translate(titleKey) : '';
-    }, [quickAction, translate]);
+    }, [quickAction, translate, quickActionAvatars, quickActionReport]);
+
+    const hideQABSubtitle = useMemo(() => {
+        if (isEmptyObject(quickActionReport)) {
+            return true;
+        }
+        if (quickActionAvatars.length === 0) {
+            return false;
+        }
+        const displayName = personalDetails?.[quickActionAvatars[0]?.id ?? -1]?.firstName ?? '';
+        return quickAction?.action === CONST.QUICK_ACTIONS.SEND_MONEY && displayName.length === 0;
+    }, [personalDetails, quickActionReport, quickAction?.action, quickActionAvatars]);
 
     const navigateToQuickAction = () => {
+        const selectOption = (onSelected: () => void, shouldRestrictAction: boolean) => {
+            if (shouldRestrictAction && quickActionReport?.policyID && SubscriptionUtils.shouldRestrictUserBillableActions(quickActionReport.policyID)) {
+                Navigation.navigate(ROUTES.RESTRICTED_ACTION.getRoute(quickActionReport.policyID));
+                return;
+            }
+
+            onSelected();
+        };
+
+        const isValidReport = !(isEmptyObject(quickActionReport) || ReportUtils.isArchivedRoom(quickActionReport, reportNameValuePairs));
+        const quickActionReportID = isValidReport ? quickActionReport?.reportID ?? '-1' : ReportUtils.generateReportID();
+
         switch (quickAction?.action) {
             case CONST.QUICK_ACTIONS.REQUEST_MANUAL:
-                IOU.startMoneyRequest(CONST.IOU.TYPE.SUBMIT, quickAction?.chatReportID ?? '', CONST.IOU.REQUEST_TYPE.MANUAL, true);
+                selectOption(() => IOU.startMoneyRequest(CONST.IOU.TYPE.SUBMIT, quickActionReportID, CONST.IOU.REQUEST_TYPE.MANUAL, true), true);
                 return;
             case CONST.QUICK_ACTIONS.REQUEST_SCAN:
-                IOU.startMoneyRequest(CONST.IOU.TYPE.SUBMIT, quickAction?.chatReportID ?? '', CONST.IOU.REQUEST_TYPE.SCAN, true);
+                selectOption(() => IOU.startMoneyRequest(CONST.IOU.TYPE.SUBMIT, quickActionReportID, CONST.IOU.REQUEST_TYPE.SCAN, true), true);
                 return;
             case CONST.QUICK_ACTIONS.REQUEST_DISTANCE:
-                IOU.startMoneyRequest(CONST.IOU.TYPE.SUBMIT, quickAction?.chatReportID ?? '', CONST.IOU.REQUEST_TYPE.DISTANCE, true);
+                selectOption(() => IOU.startMoneyRequest(CONST.IOU.TYPE.SUBMIT, quickActionReportID, CONST.IOU.REQUEST_TYPE.DISTANCE, true), true);
                 return;
             case CONST.QUICK_ACTIONS.SPLIT_MANUAL:
-                IOU.startMoneyRequest(CONST.IOU.TYPE.SPLIT, quickAction?.chatReportID ?? '', CONST.IOU.REQUEST_TYPE.MANUAL, true);
+                selectOption(() => IOU.startMoneyRequest(CONST.IOU.TYPE.SPLIT, quickActionReportID, CONST.IOU.REQUEST_TYPE.MANUAL, true), true);
                 return;
             case CONST.QUICK_ACTIONS.SPLIT_SCAN:
-                IOU.startMoneyRequest(CONST.IOU.TYPE.SPLIT, quickAction?.chatReportID ?? '', CONST.IOU.REQUEST_TYPE.SCAN, true);
+                selectOption(() => IOU.startMoneyRequest(CONST.IOU.TYPE.SPLIT, quickActionReportID, CONST.IOU.REQUEST_TYPE.SCAN, true), true);
                 return;
             case CONST.QUICK_ACTIONS.SPLIT_DISTANCE:
-                IOU.startMoneyRequest(CONST.IOU.TYPE.SPLIT, quickAction?.chatReportID ?? '', CONST.IOU.REQUEST_TYPE.DISTANCE, true);
+                selectOption(() => IOU.startMoneyRequest(CONST.IOU.TYPE.SPLIT, quickActionReportID, CONST.IOU.REQUEST_TYPE.DISTANCE, true), true);
                 return;
             case CONST.QUICK_ACTIONS.SEND_MONEY:
-                IOU.startMoneyRequest(CONST.IOU.TYPE.PAY, quickAction?.chatReportID ?? '', CONST.IOU.REQUEST_TYPE.MANUAL, true);
+                selectOption(() => IOU.startMoneyRequest(CONST.IOU.TYPE.PAY, quickActionReportID, CONST.IOU.REQUEST_TYPE.MANUAL, true), false);
                 return;
             case CONST.QUICK_ACTIONS.ASSIGN_TASK:
-                Task.clearOutTaskInfoAndNavigate(quickAction?.chatReportID ?? '', quickActionReport, quickAction.targetAccountID ?? 0, true);
+                selectOption(() => Task.startOutCreateTaskQuickAction(isValidReport ? quickActionReportID : '', quickAction.targetAccountID ?? -1), false);
                 break;
             case CONST.QUICK_ACTIONS.TRACK_MANUAL:
-                IOU.startMoneyRequest(CONST.IOU.TYPE.TRACK, quickAction?.chatReportID ?? '', CONST.IOU.REQUEST_TYPE.MANUAL, true);
+                selectOption(() => IOU.startMoneyRequest(CONST.IOU.TYPE.TRACK, quickActionReportID, CONST.IOU.REQUEST_TYPE.MANUAL, true), false);
                 break;
             case CONST.QUICK_ACTIONS.TRACK_SCAN:
-                IOU.startMoneyRequest(CONST.IOU.TYPE.TRACK, quickAction?.chatReportID ?? '', CONST.IOU.REQUEST_TYPE.SCAN, true);
+                selectOption(() => IOU.startMoneyRequest(CONST.IOU.TYPE.TRACK, quickActionReportID, CONST.IOU.REQUEST_TYPE.SCAN, true), false);
                 break;
             case CONST.QUICK_ACTIONS.TRACK_DISTANCE:
-                IOU.startMoneyRequest(CONST.IOU.TYPE.TRACK, quickAction?.chatReportID ?? '', CONST.IOU.REQUEST_TYPE.DISTANCE, true);
+                selectOption(() => IOU.startMoneyRequest(CONST.IOU.TYPE.TRACK, quickActionReportID, CONST.IOU.REQUEST_TYPE.DISTANCE, true), false);
                 break;
             default:
         }
@@ -253,14 +299,14 @@ function FloatingActionButtonAndPopover(
      */
     const showCreateMenu = useCallback(
         () => {
-            if (!isFocused && isSmallScreenWidth) {
+            if (!isFocused && shouldUseNarrowLayout) {
                 return;
             }
             setIsCreateMenuActive(true);
             onShowCreateMenu?.();
         },
-        // eslint-disable-next-line react-hooks/exhaustive-deps
-        [isFocused, isSmallScreenWidth],
+        // eslint-disable-next-line react-compiler/react-compiler, react-hooks/exhaustive-deps
+        [isFocused, shouldUseNarrowLayout],
     );
 
     /**
@@ -276,7 +322,7 @@ function FloatingActionButtonAndPopover(
             setIsCreateMenuActive(false);
             onHideCreateMenu?.();
         },
-        // eslint-disable-next-line react-hooks/exhaustive-deps
+        // eslint-disable-next-line react-compiler/react-compiler, react-hooks/exhaustive-deps
         [isCreateMenuActive],
     );
 
@@ -302,24 +348,24 @@ function FloatingActionButtonAndPopover(
             showCreateMenu();
         }
     };
-    // eslint-disable-next-line react-hooks/exhaustive-deps
+    // eslint-disable-next-line react-compiler/react-compiler, react-hooks/exhaustive-deps
     const selfDMReportID = useMemo(() => ReportUtils.findSelfDMReportID(), [isLoading]);
 
     return (
         <View style={styles.flexGrow1}>
             <PopoverMenu
                 onClose={hideCreateMenu}
-                isVisible={isCreateMenuActive && (!isSmallScreenWidth || isFocused)}
+                isVisible={isCreateMenuActive && (!shouldUseNarrowLayout || isFocused)}
                 anchorPosition={styles.createMenuPositionSidebar(windowHeight)}
                 onItemSelected={hideCreateMenu}
-                fromSidebarMediumScreen={!isSmallScreenWidth}
+                fromSidebarMediumScreen={!shouldUseNarrowLayout}
                 menuItems={[
                     {
                         icon: Expensicons.ChatBubble,
                         text: translate('sidebarScreen.fabNewChat'),
                         onSelected: () => interceptAnonymousUser(Report.startNewChat),
                     },
-                    ...(canUseTrackExpense && selfDMReportID
+                    ...(selfDMReportID
                         ? [
                               {
                                   icon: getIconForAction(CONST.IOU.TYPE.TRACK),
@@ -356,32 +402,6 @@ function FloatingActionButtonAndPopover(
                                 ),
                             ),
                     },
-                    {
-                        icon: Expensicons.Transfer,
-                        text: translate('iou.splitExpense'),
-                        onSelected: () =>
-                            interceptAnonymousUser(() =>
-                                IOU.startMoneyRequest(
-                                    CONST.IOU.TYPE.SPLIT,
-                                    // When starting to create a money request from the global FAB, there is not an existing report yet. A random optimistic reportID is generated and used
-                                    // for all of the routes in the creation flow.
-                                    ReportUtils.generateReportID(),
-                                ),
-                            ),
-                    },
-                    {
-                        icon: getIconForAction(CONST.IOU.TYPE.SEND),
-                        text: translate('iou.paySomeone', {}),
-                        onSelected: () =>
-                            interceptAnonymousUser(() =>
-                                IOU.startMoneyRequest(
-                                    CONST.IOU.TYPE.PAY,
-                                    // When starting to pay someone from the global FAB, there is not an existing report yet. A random optimistic reportID is generated and used
-                                    // for all of the routes in the creation flow.
-                                    ReportUtils.generateReportID(),
-                                ),
-                            ),
-                    },
                     ...(canSendInvoice
                         ? [
                               {
@@ -399,11 +419,6 @@ function FloatingActionButtonAndPopover(
                               },
                           ]
                         : []),
-                    {
-                        icon: Expensicons.Task,
-                        text: translate('newTaskPage.assignTask'),
-                        onSelected: () => interceptAnonymousUser(() => Task.clearOutTaskInfoAndNavigate()),
-                    },
                     ...(canUseSpotnanaTravel
                         ? [
                               {
@@ -436,10 +451,19 @@ function FloatingActionButtonAndPopover(
                                   isLabelHoverable: false,
                                   floatRightAvatars: quickActionAvatars,
                                   floatRightAvatarSize: CONST.AVATAR_SIZE.SMALL,
-                                  description: !isEmptyObject(quickActionReport) ? ReportUtils.getReportName(quickActionReport) : '',
+                                  description: !hideQABSubtitle ? ReportUtils.getReportName(quickActionReport) ?? translate('quickAction.updateDestination') : '',
                                   numberOfLinesDescription: 1,
                                   onSelected: () => interceptAnonymousUser(() => navigateToQuickAction()),
                                   shouldShowSubscriptRightAvatar: ReportUtils.isPolicyExpenseChat(quickActionReport),
+                                  shouldRenderTooltip: quickAction.isFirstQuickAction,
+                                  tooltipAnchorAlignment: {
+                                      vertical: CONST.MODAL.ANCHOR_ORIGIN_VERTICAL.BOTTOM,
+                                      horizontal: CONST.MODAL.ANCHOR_ORIGIN_HORIZONTAL.LEFT,
+                                  },
+                                  tooltipShiftHorizontal: styles.popoverMenuItem.paddingHorizontal,
+                                  tooltipShiftVertical: styles.popoverMenuItem.paddingVertical / 2,
+                                  renderTooltipContent: renderQuickActionTooltip,
+                                  tooltipWrapperStyle: styles.quickActionTooltipWrapper,
                               },
                           ]
                         : []),
diff --git a/src/pages/iou/HoldReasonFormView.tsx b/src/pages/iou/HoldReasonFormView.tsx
new file mode 100644
index 000000000000..197d00b6b0ed
--- /dev/null
+++ b/src/pages/iou/HoldReasonFormView.tsx
@@ -0,0 +1,72 @@
+import React from 'react';
+import {View} from 'react-native';
+import FormProvider from '@components/Form/FormProvider';
+import InputWrapper from '@components/Form/InputWrapper';
+import type {FormOnyxValues} from '@components/Form/types';
+import HeaderWithBackButton from '@components/HeaderWithBackButton';
+import ScreenWrapper from '@components/ScreenWrapper';
+import Text from '@components/Text';
+import TextInput from '@components/TextInput';
+import useAutoFocusInput from '@hooks/useAutoFocusInput';
+import useLocalize from '@hooks/useLocalize';
+import useThemeStyles from '@hooks/useThemeStyles';
+import Navigation from '@libs/Navigation/Navigation';
+import type ONYXKEYS from '@src/ONYXKEYS';
+import type {Route} from '@src/ROUTES';
+import INPUT_IDS from '@src/types/form/MoneyRequestHoldReasonForm';
+
+type HoldReasonFormViewProps = {
+    /** Submit function for submitting form */
+    onSubmit: (values: FormOnyxValues<typeof ONYXKEYS.FORMS.MONEY_REQUEST_HOLD_FORM>) => void;
+
+    /** Submit function for validating form */
+    validate: (values: FormOnyxValues<typeof ONYXKEYS.FORMS.MONEY_REQUEST_HOLD_FORM>) => Partial<Record<'comment', string | undefined>>;
+
+    /** Link to previous page */
+    backTo: Route;
+};
+
+function HoldReasonFormView({backTo, validate, onSubmit}: HoldReasonFormViewProps) {
+    const styles = useThemeStyles();
+    const {translate} = useLocalize();
+    const {inputCallbackRef} = useAutoFocusInput();
+
+    return (
+        <ScreenWrapper
+            includeSafeAreaPaddingBottom={false}
+            shouldEnableMaxHeight
+            testID={HoldReasonFormView.displayName}
+        >
+            <HeaderWithBackButton
+                title={translate('iou.holdExpense')}
+                onBackButtonPress={() => Navigation.goBack(backTo)}
+            />
+            <FormProvider
+                formID="moneyHoldReasonForm"
+                submitButtonText={translate('iou.holdExpense')}
+                style={[styles.flexGrow1, styles.ph5]}
+                onSubmit={onSubmit}
+                validate={validate}
+                enabledWhenOffline
+            >
+                <Text style={styles.mb6}>{translate('iou.explainHold')}</Text>
+                <View>
+                    <InputWrapper
+                        InputComponent={TextInput}
+                        inputID={INPUT_IDS.COMMENT}
+                        valueType="string"
+                        name="comment"
+                        defaultValue={undefined}
+                        label={translate('iou.reason')}
+                        accessibilityLabel={translate('iou.reason')}
+                        ref={inputCallbackRef}
+                    />
+                </View>
+            </FormProvider>
+        </ScreenWrapper>
+    );
+}
+
+HoldReasonFormView.displayName = 'HoldReasonFormViewProps';
+
+export default HoldReasonFormView;
diff --git a/src/pages/iou/HoldReasonPage.tsx b/src/pages/iou/HoldReasonPage.tsx
index 18b290a81ea4..82f29acf7d10 100644
--- a/src/pages/iou/HoldReasonPage.tsx
+++ b/src/pages/iou/HoldReasonPage.tsx
@@ -1,16 +1,8 @@
 import type {RouteProp} from '@react-navigation/native';
 import React, {useCallback, useEffect} from 'react';
-import {View} from 'react-native';
-import FormProvider from '@components/Form/FormProvider';
-import InputWrapper from '@components/Form/InputWrapper';
+import {useOnyx} from 'react-native-onyx';
 import type {FormInputErrors, FormOnyxValues} from '@components/Form/types';
-import HeaderWithBackButton from '@components/HeaderWithBackButton';
-import ScreenWrapper from '@components/ScreenWrapper';
-import Text from '@components/Text';
-import TextInput from '@components/TextInput';
-import useAutoFocusInput from '@hooks/useAutoFocusInput';
 import useLocalize from '@hooks/useLocalize';
-import useThemeStyles from '@hooks/useThemeStyles';
 import * as ErrorUtils from '@libs/ErrorUtils';
 import Navigation from '@libs/Navigation/Navigation';
 import * as ReportActionsUtils from '@libs/ReportActionsUtils';
@@ -21,6 +13,7 @@ import * as IOU from '@userActions/IOU';
 import ONYXKEYS from '@src/ONYXKEYS';
 import type {Route} from '@src/ROUTES';
 import INPUT_IDS from '@src/types/form/MoneyRequestHoldReasonForm';
+import HoldReasonFormView from './HoldReasonFormView';
 
 type HoldReasonPageRouteParams = {
     /** ID of the transaction the page was opened for */
@@ -39,33 +32,27 @@ type HoldReasonPageProps = {
 };
 
 function HoldReasonPage({route}: HoldReasonPageProps) {
-    const styles = useThemeStyles();
     const {translate} = useLocalize();
-    const {inputCallbackRef} = useAutoFocusInput();
 
     const {transactionID, reportID, backTo} = route.params;
 
-    const report = ReportUtils.getReport(reportID);
+    const [report] = useOnyx(`${ONYXKEYS.COLLECTION.REPORT}${reportID || -1}`);
 
     // We first check if the report is part of a policy - if not, then it's a personal request (1:1 request)
     // For personal requests, we need to allow both users to put the request on hold
     const isWorkspaceRequest = ReportUtils.isReportInGroupPolicy(report);
-    const parentReportAction = ReportActionsUtils.getReportAction(report?.parentReportID ?? '', report?.parentReportActionID ?? '');
-
-    const navigateBack = () => {
-        Navigation.navigate(backTo);
-    };
+    const parentReportAction = ReportActionsUtils.getReportAction(report?.parentReportID ?? '-1', report?.parentReportActionID ?? '-1');
 
     const onSubmit = (values: FormOnyxValues<typeof ONYXKEYS.FORMS.MONEY_REQUEST_HOLD_FORM>) => {
         // We have extra isWorkspaceRequest condition since, for 1:1 requests, canEditMoneyRequest will rightly return false
         // as we do not allow requestee to edit fields like description and amount.
         // But, we still want the requestee to be able to put the request on hold
-        if (!ReportUtils.canEditMoneyRequest(parentReportAction) && isWorkspaceRequest) {
+        if (ReportActionsUtils.isMoneyRequestAction(parentReportAction) && !ReportUtils.canEditMoneyRequest(parentReportAction) && isWorkspaceRequest) {
             return;
         }
 
         IOU.putOnHold(transactionID, values.comment, reportID);
-        navigateBack();
+        Navigation.navigate(backTo);
     };
 
     const validate = useCallback(
@@ -73,20 +60,20 @@ function HoldReasonPage({route}: HoldReasonPageProps) {
             const errors: FormInputErrors<typeof ONYXKEYS.FORMS.MONEY_REQUEST_HOLD_FORM> = ValidationUtils.getFieldRequiredErrors(values, [INPUT_IDS.COMMENT]);
 
             if (!values.comment) {
-                errors.comment = 'common.error.fieldRequired';
+                errors.comment = translate('common.error.fieldRequired');
             }
             // We have extra isWorkspaceRequest condition since, for 1:1 requests, canEditMoneyRequest will rightly return false
             // as we do not allow requestee to edit fields like description and amount.
             // But, we still want the requestee to be able to put the request on hold
-            if (!ReportUtils.canEditMoneyRequest(parentReportAction) && isWorkspaceRequest) {
+            if (ReportActionsUtils.isMoneyRequestAction(parentReportAction) && !ReportUtils.canEditMoneyRequest(parentReportAction) && isWorkspaceRequest) {
                 const formErrors = {};
-                ErrorUtils.addErrorMessage(formErrors, 'reportModified', 'common.error.requestModified');
+                ErrorUtils.addErrorMessage(formErrors, 'reportModified', translate('common.error.requestModified'));
                 FormActions.setErrors(ONYXKEYS.FORMS.MONEY_REQUEST_HOLD_FORM, formErrors);
             }
 
             return errors;
         },
-        [parentReportAction, isWorkspaceRequest],
+        [parentReportAction, isWorkspaceRequest, translate],
     );
 
     useEffect(() => {
@@ -95,38 +82,11 @@ function HoldReasonPage({route}: HoldReasonPageProps) {
     }, []);
 
     return (
-        <ScreenWrapper
-            includeSafeAreaPaddingBottom={false}
-            shouldEnableMaxHeight
-            testID={HoldReasonPage.displayName}
-        >
-            <HeaderWithBackButton
-                title={translate('iou.holdExpense')}
-                onBackButtonPress={navigateBack}
-            />
-            <FormProvider
-                formID="moneyHoldReasonForm"
-                submitButtonText={translate('iou.holdExpense')}
-                style={[styles.flexGrow1, styles.ph5]}
-                onSubmit={onSubmit}
-                validate={validate}
-                enabledWhenOffline
-            >
-                <Text style={styles.mb6}>{translate('iou.explainHold')}</Text>
-                <View>
-                    <InputWrapper
-                        InputComponent={TextInput}
-                        inputID={INPUT_IDS.COMMENT}
-                        valueType="string"
-                        name="comment"
-                        defaultValue={undefined}
-                        label={translate('iou.reason')}
-                        accessibilityLabel={translate('iou.reason')}
-                        ref={inputCallbackRef}
-                    />
-                </View>
-            </FormProvider>
-        </ScreenWrapper>
+        <HoldReasonFormView
+            onSubmit={onSubmit}
+            validate={validate}
+            backTo={backTo}
+        />
     );
 }
 
diff --git a/src/pages/iou/MoneyRequestAmountForm.tsx b/src/pages/iou/MoneyRequestAmountForm.tsx
index 46bd34006550..ba406c3ddef6 100644
--- a/src/pages/iou/MoneyRequestAmountForm.tsx
+++ b/src/pages/iou/MoneyRequestAmountForm.tsx
@@ -10,13 +10,13 @@ import MoneyRequestAmountInput from '@components/MoneyRequestAmountInput';
 import type {MoneyRequestAmountInputRef} from '@components/MoneyRequestAmountInput';
 import ScrollView from '@components/ScrollView';
 import SettlementButton from '@components/SettlementButton';
+import isTextInputFocused from '@components/TextInput/BaseTextInput/isTextInputFocused';
 import useLocalize from '@hooks/useLocalize';
 import usePrevious from '@hooks/usePrevious';
+import useResponsiveLayout from '@hooks/useResponsiveLayout';
 import useThemeStyles from '@hooks/useThemeStyles';
-import useWindowDimensions from '@hooks/useWindowDimensions';
 import * as CurrencyUtils from '@libs/CurrencyUtils';
 import * as DeviceCapabilities from '@libs/DeviceCapabilities';
-import type {MaybePhraseKey} from '@libs/Localize';
 import * as MoneyRequestUtils from '@libs/MoneyRequestUtils';
 import Navigation from '@libs/Navigation/Navigation';
 import type {BaseTextInputRef} from '@src/components/TextInput/BaseTextInput/types';
@@ -64,11 +64,14 @@ type MoneyRequestAmountFormProps = {
 
     /** The current tab we have navigated to in the expense modal. String that corresponds to the expense type. */
     selectedTab?: SelectedTabRequest;
+
+    /** Whether the user input should be kept or not */
+    shouldKeepUserInput?: boolean;
 };
 
 const isAmountInvalid = (amount: string) => !amount.length || parseFloat(amount) < 0.01;
-const isTaxAmountInvalid = (currentAmount: string, taxAmount: number, isTaxAmountForm: boolean) =>
-    isTaxAmountForm && Number.parseFloat(currentAmount) > CurrencyUtils.convertToFrontendAmount(Math.abs(taxAmount));
+const isTaxAmountInvalid = (currentAmount: string, taxAmount: number, isTaxAmountForm: boolean, currency: string) =>
+    isTaxAmountForm && Number.parseFloat(currentAmount) > CurrencyUtils.convertToFrontendAmountAsInteger(Math.abs(taxAmount), currency);
 
 const AMOUNT_VIEW_ID = 'amountView';
 const NUM_PAD_CONTAINER_VIEW_ID = 'numPadContainerView';
@@ -88,17 +91,18 @@ function MoneyRequestAmountForm(
         onCurrencyButtonPress,
         onSubmitButtonPress,
         selectedTab = CONST.TAB_REQUEST.MANUAL,
+        shouldKeepUserInput = false,
     }: MoneyRequestAmountFormProps,
     forwardedRef: ForwardedRef<BaseTextInputRef>,
 ) {
     const styles = useThemeStyles();
-    const {isExtraSmallScreenHeight} = useWindowDimensions();
+    const {isExtraSmallScreenHeight} = useResponsiveLayout();
     const {translate} = useLocalize();
 
     const textInput = useRef<BaseTextInputRef | null>(null);
     const moneyRequestAmountInput = useRef<MoneyRequestAmountInputRef | null>(null);
 
-    const [formError, setFormError] = useState<MaybePhraseKey>('');
+    const [formError, setFormError] = useState<string>('');
     const [shouldUpdateSelection, setShouldUpdateSelection] = useState(true);
 
     const isFocused = useIsFocused();
@@ -126,7 +130,8 @@ function MoneyRequestAmountForm(
         if (!textInput.current) {
             return;
         }
-        if (!textInput.current.isFocused()) {
+
+        if (!isTextInputFocused(textInput)) {
             textInput.current.focus();
         }
     };
@@ -143,14 +148,17 @@ function MoneyRequestAmountForm(
         });
     }, [isFocused, wasFocused]);
 
-    const initializeAmount = useCallback((newAmount: number) => {
-        const frontendAmount = newAmount ? CurrencyUtils.convertToFrontendAmount(newAmount).toString() : '';
-        moneyRequestAmountInput.current?.changeAmount(frontendAmount);
-        moneyRequestAmountInput.current?.changeSelection({
-            start: frontendAmount.length,
-            end: frontendAmount.length,
-        });
-    }, []);
+    const initializeAmount = useCallback(
+        (newAmount: number) => {
+            const frontendAmount = newAmount ? CurrencyUtils.convertToFrontendAmountAsString(newAmount, currency) : '';
+            moneyRequestAmountInput.current?.changeAmount(frontendAmount);
+            moneyRequestAmountInput.current?.changeSelection({
+                start: frontendAmount.length,
+                end: frontendAmount.length,
+            });
+        },
+        [currency],
+    );
 
     useEffect(() => {
         if (!currency || typeof amount !== 'number') {
@@ -158,7 +166,7 @@ function MoneyRequestAmountForm(
         }
         initializeAmount(amount);
         // we want to re-initialize the state only when the selected tab
-        // eslint-disable-next-line react-hooks/exhaustive-deps
+        // eslint-disable-next-line react-compiler/react-compiler, react-hooks/exhaustive-deps
     }, [selectedTab]);
 
     /**
@@ -167,7 +175,7 @@ function MoneyRequestAmountForm(
      */
     const updateAmountNumberPad = useCallback(
         (key: string) => {
-            if (shouldUpdateSelection && !textInput.current?.isFocused()) {
+            if (shouldUpdateSelection && !isTextInputFocused(textInput)) {
                 textInput.current?.focus();
             }
             const currentAmount = moneyRequestAmountInput.current?.getAmount() ?? '';
@@ -194,7 +202,7 @@ function MoneyRequestAmountForm(
      */
     const updateLongPressHandlerState = useCallback((value: boolean) => {
         setShouldUpdateSelection(!value);
-        if (!value && !textInput.current?.isFocused()) {
+        if (!value && !isTextInputFocused(textInput)) {
             textInput.current?.focus();
         }
     }, []);
@@ -209,39 +217,22 @@ function MoneyRequestAmountForm(
             // Skip the check for tax amount form as 0 is a valid input
             const currentAmount = moneyRequestAmountInput.current?.getAmount() ?? '';
             if (!currentAmount.length || (!isTaxAmountForm && isAmountInvalid(currentAmount))) {
-                setFormError('iou.error.invalidAmount');
+                setFormError(translate('iou.error.invalidAmount'));
                 return;
             }
 
-            if (isTaxAmountInvalid(currentAmount, taxAmount, isTaxAmountForm)) {
-                setFormError(['iou.error.invalidTaxAmount', {amount: formattedTaxAmount}]);
+            if (isTaxAmountInvalid(currentAmount, taxAmount, isTaxAmountForm, currency)) {
+                setFormError(translate('iou.error.invalidTaxAmount', {amount: formattedTaxAmount}));
                 return;
             }
 
-            // Update display amount string post-edit to ensure consistency with backend amount
-            // Reference: https://github.com/Expensify/App/issues/30505
-            const backendAmount = CurrencyUtils.convertToBackendAmount(Number.parseFloat(currentAmount));
-            initializeAmount(backendAmount);
-
             onSubmitButtonPress({amount: currentAmount, currency, paymentMethod: iouPaymentType});
         },
-        [taxAmount, onSubmitButtonPress, currency, formattedTaxAmount, initializeAmount],
+        [taxAmount, onSubmitButtonPress, currency, translate, formattedTaxAmount],
     );
 
     const buttonText: string = useMemo(() => {
-        const currentAmount = moneyRequestAmountInput.current?.getAmount() ?? '';
         if (skipConfirmation) {
-            if (currentAmount !== '') {
-                const currencyAmount = CurrencyUtils.convertToDisplayString(CurrencyUtils.convertToBackendAmount(Number.parseFloat(currentAmount)), currency) ?? '';
-                let text = translate('iou.submitAmount', {amount: currencyAmount});
-                if (iouType === CONST.IOU.TYPE.SPLIT) {
-                    text = translate('iou.splitAmount', {amount: currencyAmount});
-                } else if (iouType === CONST.IOU.TYPE.TRACK) {
-                    text = translate('iou.trackAmount', {amount: currencyAmount});
-                }
-                return text[0].toUpperCase() + text.slice(1);
-            }
-
             if (iouType === CONST.IOU.TYPE.SPLIT) {
                 return translate('iou.splitExpense');
             }
@@ -251,7 +242,7 @@ function MoneyRequestAmountForm(
             return translate('iou.submitExpense');
         }
         return isEditing ? translate('common.save') : translate('common.next');
-    }, [skipConfirmation, iouType, currency, isEditing, translate]);
+    }, [skipConfirmation, iouType, isEditing, translate]);
 
     const canUseTouchScreen = DeviceCapabilities.canUseTouchScreen();
 
@@ -287,6 +278,7 @@ function MoneyRequestAmountForm(
                         }
                         textInput.current = ref;
                     }}
+                    shouldKeepUserInput={shouldKeepUserInput}
                     moneyRequestAmountInputRef={moneyRequestAmountInput}
                     inputStyle={[styles.iouAmountTextInput]}
                     containerStyle={[styles.iouAmountTextInputContainer]}
@@ -320,7 +312,7 @@ function MoneyRequestAmountForm(
                             addBankAccountRoute={bankAccountRoute}
                             addDebitCardRoute={ROUTES.IOU_SEND_ADD_DEBIT_CARD}
                             currency={currency ?? CONST.CURRENCY.USD}
-                            policyID={policyID ?? ''}
+                            policyID={policyID ?? '-1'}
                             style={[styles.w100, canUseTouchScreen ? styles.mt5 : styles.mt3]}
                             buttonSize={CONST.DROPDOWN_BUTTON_SIZE.LARGE}
                             kycWallAnchorAlignment={{
diff --git a/src/pages/iou/SplitBillDetailsPage.tsx b/src/pages/iou/SplitBillDetailsPage.tsx
index 157f14d1dde5..2f882d562b55 100644
--- a/src/pages/iou/SplitBillDetailsPage.tsx
+++ b/src/pages/iou/SplitBillDetailsPage.tsx
@@ -5,17 +5,22 @@ import {withOnyx} from 'react-native-onyx';
 import type {OnyxEntry} from 'react-native-onyx';
 import FullPageNotFoundView from '@components/BlockingViews/FullPageNotFoundView';
 import HeaderWithBackButton from '@components/HeaderWithBackButton';
+import Icon from '@components/Icon';
+import * as Expensicons from '@components/Icon/Expensicons';
 import MoneyRequestConfirmationList from '@components/MoneyRequestConfirmationList';
 import MoneyRequestHeaderStatusBar from '@components/MoneyRequestHeaderStatusBar';
 import ScreenWrapper from '@components/ScreenWrapper';
 import useLocalize from '@hooks/useLocalize';
+import useTheme from '@hooks/useTheme';
 import useThemeStyles from '@hooks/useThemeStyles';
 import type {SplitDetailsNavigatorParamList} from '@libs/Navigation/types';
 import * as OptionsListUtils from '@libs/OptionsListUtils';
+import * as ReportActionsUtils from '@libs/ReportActionsUtils';
 import * as ReportUtils from '@libs/ReportUtils';
 import * as TransactionUtils from '@libs/TransactionUtils';
 import withReportAndReportActionOrNotFound from '@pages/home/report/withReportAndReportActionOrNotFound';
 import type {WithReportAndReportActionOrNotFoundProps} from '@pages/home/report/withReportAndReportActionOrNotFound';
+import variables from '@styles/variables';
 import * as IOU from '@userActions/IOU';
 import CONST from '@src/CONST';
 import ONYXKEYS from '@src/ONYXKEYS';
@@ -55,10 +60,11 @@ type SplitBillDetailsPageProps = WithReportAndReportActionOrNotFoundProps &
 
 function SplitBillDetailsPage({personalDetails, report, route, reportActions, transaction, draftTransaction, session}: SplitBillDetailsPageProps) {
     const styles = useThemeStyles();
-    const reportID = report?.reportID ?? '';
+    const reportID = report?.reportID ?? '-1';
     const {translate} = useLocalize();
+    const theme = useTheme();
     const reportAction = useMemo(() => reportActions?.[route.params.reportActionID] ?? ({} as ReportAction), [reportActions, route.params.reportActionID]);
-    const participantAccountIDs = reportAction?.actionName === CONST.REPORT.ACTIONS.TYPE.IOU ? reportAction?.originalMessage.participantAccountIDs ?? [] : [];
+    const participantAccountIDs = ReportActionsUtils.isMoneyRequestAction(reportAction) ? ReportActionsUtils.getOriginalMessage(reportAction)?.participantAccountIDs ?? [] : [];
 
     // In case this is workspace split expense, we manually add the workspace as the second participant of the split expense
     // because we don't save any accountID in the report action's originalMessage other than the payee's accountID
@@ -89,7 +95,7 @@ function SplitBillDetailsPage({personalDetails, report, route, reportActions, tr
     } = ReportUtils.getTransactionDetails(isEditingSplitBill && draftTransaction ? draftTransaction : transaction) ?? {};
 
     const onConfirm = useCallback(
-        () => IOU.completeSplitBill(reportID, reportAction, draftTransaction, session?.accountID ?? 0, session?.email ?? ''),
+        () => IOU.completeSplitBill(reportID, reportAction, draftTransaction, session?.accountID ?? -1, session?.email ?? ''),
         [reportID, reportAction, draftTransaction, session?.accountID, session?.email],
     );
 
@@ -99,21 +105,30 @@ function SplitBillDetailsPage({personalDetails, report, route, reportActions, tr
                 <HeaderWithBackButton title={translate('common.details')} />
                 <View style={[styles.containerWithSpaceBetween, styles.pointerEventsBoxNone]}>
                     {isScanning && (
-                        <MoneyRequestHeaderStatusBar
-                            title={translate('iou.receiptStatusTitle')}
-                            description={translate('iou.receiptStatusText')}
-                            shouldShowBorderBottom
-                        />
+                        <View style={[styles.ph5, styles.pb3, styles.borderBottom]}>
+                            <MoneyRequestHeaderStatusBar
+                                icon={
+                                    <Icon
+                                        src={Expensicons.ReceiptScan}
+                                        height={variables.iconSizeSmall}
+                                        width={variables.iconSizeSmall}
+                                        fill={theme.icon}
+                                    />
+                                }
+                                description={translate('iou.receiptScanInProgressDescription')}
+                                shouldStyleFlexGrow={false}
+                            />
+                        </View>
                     )}
                     {!!participants.length && (
                         <MoneyRequestConfirmationList
-                            hasMultipleParticipants
                             payeePersonalDetails={payeePersonalDetails}
                             selectedParticipants={participantsExcludingPayee}
                             iouAmount={splitAmount ?? 0}
                             iouCurrencyCode={splitCurrency}
                             iouComment={splitComment}
                             iouCreated={splitCreated}
+                            shouldDisplayReceipt
                             iouMerchant={splitMerchant}
                             iouCategory={splitCategory}
                             iouIsBillable={splitBillable}
@@ -131,6 +146,9 @@ function SplitBillDetailsPage({personalDetails, report, route, reportActions, tr
                             isPolicyExpenseChat={ReportUtils.isPolicyExpenseChat(report)}
                             policyID={ReportUtils.isPolicyExpenseChat(report) ? report?.policyID : undefined}
                             action={isEditingSplitBill ? CONST.IOU.ACTION.EDIT : CONST.IOU.ACTION.CREATE}
+                            onToggleBillable={(billable) => {
+                                IOU.setDraftSplitTransaction(transaction?.transactionID ?? '-1', {billable});
+                            }}
                         />
                     )}
                 </View>
@@ -145,16 +163,16 @@ const WrappedComponent = withOnyx<SplitBillDetailsPageProps, SplitBillDetailsPag
     transaction: {
         key: ({route, reportActions}) => {
             const reportAction = reportActions?.[route.params.reportActionID];
-            const IOUTransactionID =
-                reportAction?.actionName === CONST.REPORT.ACTIONS.TYPE.IOU && reportAction?.originalMessage?.IOUTransactionID ? reportAction.originalMessage.IOUTransactionID : 0;
+            const originalMessage = reportAction && ReportActionsUtils.isMoneyRequestAction(reportAction) ? ReportActionsUtils.getOriginalMessage(reportAction) : undefined;
+            const IOUTransactionID = reportAction?.actionName === CONST.REPORT.ACTIONS.TYPE.IOU && originalMessage?.IOUTransactionID ? originalMessage.IOUTransactionID : 0;
             return `${ONYXKEYS.COLLECTION.TRANSACTION}${IOUTransactionID}`;
         },
     },
     draftTransaction: {
         key: ({route, reportActions}) => {
             const reportAction = reportActions?.[route.params.reportActionID];
-            const IOUTransactionID =
-                reportAction?.actionName === CONST.REPORT.ACTIONS.TYPE.IOU && reportAction?.originalMessage?.IOUTransactionID ? reportAction.originalMessage.IOUTransactionID : 0;
+            const originalMessage = reportAction && ReportActionsUtils.isMoneyRequestAction(reportAction) ? ReportActionsUtils.getOriginalMessage(reportAction) : undefined;
+            const IOUTransactionID = reportAction?.actionName === CONST.REPORT.ACTIONS.TYPE.IOU && originalMessage?.IOUTransactionID ? originalMessage.IOUTransactionID : 0;
             return `${ONYXKEYS.COLLECTION.SPLIT_TRANSACTION_DRAFT}${IOUTransactionID}`;
         },
     },
diff --git a/src/pages/iou/request/IOURequestRedirectToStartPage.tsx b/src/pages/iou/request/IOURequestRedirectToStartPage.tsx
index 033b3b3e2edd..1316b3afc928 100644
--- a/src/pages/iou/request/IOURequestRedirectToStartPage.tsx
+++ b/src/pages/iou/request/IOURequestRedirectToStartPage.tsx
@@ -37,7 +37,7 @@ function IOURequestRedirectToStartPage({
         }
 
         // This useEffect should only run on mount which is why there are no dependencies being passed in the second parameter
-        // eslint-disable-next-line react-hooks/exhaustive-deps
+        // eslint-disable-next-line react-compiler/react-compiler, react-hooks/exhaustive-deps
     }, []);
 
     if (!isIouTypeValid || !isIouRequestTypeValid) {
diff --git a/src/pages/iou/request/IOURequestStartPage.tsx b/src/pages/iou/request/IOURequestStartPage.tsx
index 1bbf0d02a941..eac30b8839d2 100644
--- a/src/pages/iou/request/IOURequestStartPage.tsx
+++ b/src/pages/iou/request/IOURequestStartPage.tsx
@@ -1,70 +1,51 @@
-import {useFocusEffect} from '@react-navigation/native';
-import React, {useCallback, useEffect, useRef, useState} from 'react';
+import React, {useCallback, useEffect, useMemo, useRef, useState} from 'react';
 import {View} from 'react-native';
-import type {OnyxCollection, OnyxEntry} from 'react-native-onyx';
-import {withOnyx} from 'react-native-onyx';
-import FullPageNotFoundView from '@components/BlockingViews/FullPageNotFoundView';
+import {useOnyx} from 'react-native-onyx';
 import DragAndDropProvider from '@components/DragAndDrop/Provider';
+import FocusTrapContainerElement from '@components/FocusTrap/FocusTrapContainerElement';
 import FullScreenLoadingIndicator from '@components/FullscreenLoadingIndicator';
 import HeaderWithBackButton from '@components/HeaderWithBackButton';
 import ScreenWrapper from '@components/ScreenWrapper';
 import TabSelector from '@components/TabSelector/TabSelector';
 import useLocalize from '@hooks/useLocalize';
 import usePermissions from '@hooks/usePermissions';
+import usePolicy from '@hooks/usePolicy';
 import useThemeStyles from '@hooks/useThemeStyles';
 import * as DeviceCapabilities from '@libs/DeviceCapabilities';
-import * as IOUUtils from '@libs/IOUUtils';
-import * as KeyDownPressListener from '@libs/KeyboardShortcut/KeyDownPressListener';
 import Navigation from '@libs/Navigation/Navigation';
-import OnyxTabNavigator, {TopTab} from '@libs/Navigation/OnyxTabNavigator';
-import * as PolicyUtils from '@libs/PolicyUtils';
+import OnyxTabNavigator, {TabScreenWithFocusTrapWrapper, TopTab} from '@libs/Navigation/OnyxTabNavigator';
 import * as ReportUtils from '@libs/ReportUtils';
 import * as TransactionUtils from '@libs/TransactionUtils';
-import * as IOU from '@userActions/IOU';
+import AccessOrNotFoundWrapper from '@pages/workspace/AccessOrNotFoundWrapper';
 import type {IOURequestType} from '@userActions/IOU';
+import * as IOU from '@userActions/IOU';
 import CONST from '@src/CONST';
 import ONYXKEYS from '@src/ONYXKEYS';
 import type SCREENS from '@src/SCREENS';
-import type {Policy, Report, SelectedTabRequest, Transaction} from '@src/types/onyx';
 import {isEmptyObject} from '@src/types/utils/EmptyObject';
 import IOURequestStepAmount from './step/IOURequestStepAmount';
 import IOURequestStepDistance from './step/IOURequestStepDistance';
 import IOURequestStepScan from './step/IOURequestStepScan';
 import type {WithWritableReportOrNotFoundProps} from './step/withWritableReportOrNotFound';
 
-type IOURequestStartPageOnyxProps = {
-    /** The report that holds the transaction */
-    report: OnyxEntry<Report>;
-
-    /** The policy tied to the report */
-    policy: OnyxEntry<Policy>;
-
-    /** The tab to select by default (whatever the user visited last) */
-    selectedTab: OnyxEntry<SelectedTabRequest>;
-
-    /** The transaction being modified */
-    transaction: OnyxEntry<Transaction>;
-
-    /** The list of all policies */
-    allPolicies: OnyxCollection<Policy>;
-};
-
-type IOURequestStartPageProps = IOURequestStartPageOnyxProps & WithWritableReportOrNotFoundProps<typeof SCREENS.MONEY_REQUEST.CREATE>;
+type IOURequestStartPageProps = WithWritableReportOrNotFoundProps<typeof SCREENS.MONEY_REQUEST.CREATE>;
 
 function IOURequestStartPage({
-    report,
-    policy,
     route,
     route: {
         params: {iouType, reportID},
     },
-    selectedTab,
-    transaction,
-    allPolicies,
 }: IOURequestStartPageProps) {
     const styles = useThemeStyles();
     const {translate} = useLocalize();
     const [isDraggingOver, setIsDraggingOver] = useState(false);
+    const [report] = useOnyx(`${ONYXKEYS.COLLECTION.REPORT}${reportID}`);
+    const policy = usePolicy(report?.policyID);
+    const [selectedTab] = useOnyx(`${ONYXKEYS.COLLECTION.SELECTED_TAB}${CONST.TAB.IOU_REQUEST_TYPE}`);
+    // eslint-disable-next-line  @typescript-eslint/prefer-nullish-coalescing
+    const [transaction] = useOnyx(`${ONYXKEYS.COLLECTION.TRANSACTION_DRAFT}${route?.params.transactionID || -1}`);
+    const [allPolicies] = useOnyx(ONYXKEYS.COLLECTION.POLICY);
+
     const tabTitles = {
         [CONST.IOU.TYPE.REQUEST]: translate('iou.submitExpense'),
         [CONST.IOU.TYPE.SUBMIT]: translate('iou.submitExpense'),
@@ -78,21 +59,6 @@ function IOURequestStartPage({
     const {canUseP2PDistanceRequests} = usePermissions(iouType);
     const isFromGlobalCreate = isEmptyObject(report?.reportID);
 
-    useFocusEffect(
-        useCallback(() => {
-            const handler = (event: KeyboardEvent) => {
-                if (event.code !== CONST.KEYBOARD_SHORTCUTS.TAB.shortcutKey) {
-                    return;
-                }
-                event.preventDefault();
-                event.stopPropagation();
-            };
-            KeyDownPressListener.addKeyDownPressListener(handler);
-
-            return () => KeyDownPressListener.removeKeyDownPressListener(handler);
-        }, []),
-    );
-
     // Clear out the temporary expense if the reportID in the URL has changed from the transaction's reportID
     useEffect(() => {
         if (transaction?.reportID === reportID) {
@@ -103,10 +69,7 @@ function IOURequestStartPage({
 
     const isExpenseChat = ReportUtils.isPolicyExpenseChat(report);
     const isExpenseReport = ReportUtils.isExpenseReport(report);
-    const shouldDisplayDistanceRequest = (!!canUseP2PDistanceRequests || isExpenseChat || isExpenseReport || isFromGlobalCreate) && iouType !== CONST.IOU.TYPE.SPLIT;
-
-    // Allow the user to submit the expense if we are submitting the expense in global menu or the report can create the exoense
-    const isAllowedToCreateRequest = isEmptyObject(report?.reportID) || ReportUtils.canCreateRequest(report, policy, iouType) || PolicyUtils.canSendInvoice(allPolicies);
+    const shouldDisplayDistanceRequest = !!canUseP2PDistanceRequests || isExpenseChat || isExpenseReport || (isFromGlobalCreate && iouType !== CONST.IOU.TYPE.SPLIT);
 
     const navigateBack = () => {
         Navigation.closeRHPFlow();
@@ -114,11 +77,22 @@ function IOURequestStartPage({
 
     const resetIOUTypeIfChanged = useCallback(
         (newIOUType: IOURequestType) => {
+            if (transaction?.iouRequestType === newIOUType) {
+                return;
+            }
             IOU.initMoneyRequest(reportID, policy, isFromGlobalCreate, newIOUType);
         },
-        [policy, reportID, isFromGlobalCreate],
+        [policy, reportID, isFromGlobalCreate, transaction],
     );
 
+    const [headerWithBackBtnContainerElement, setHeaderWithBackButtonContainerElement] = useState<HTMLElement | null>(null);
+    const [tabBarContainerElement, setTabBarContainerElement] = useState<HTMLElement | null>(null);
+    const [activeTabContainerElement, setActiveTabContainerElement] = useState<HTMLElement | null>(null);
+
+    const focusTrapContainerElements = useMemo(() => {
+        return [headerWithBackBtnContainerElement, tabBarContainerElement, activeTabContainerElement].filter((element) => !!element) as HTMLElement[];
+    }, [headerWithBackBtnContainerElement, tabBarContainerElement, activeTabContainerElement]);
+
     if (!transaction?.transactionID) {
         // The draft transaction is initialized only after the component is mounted,
         // which will lead to briefly displaying the Not Found page without this loader.
@@ -126,61 +100,92 @@ function IOURequestStartPage({
     }
 
     return (
-        <ScreenWrapper
-            includeSafeAreaPaddingBottom={false}
-            shouldEnableKeyboardAvoidingView={false}
-            shouldEnableMinHeight={DeviceCapabilities.canUseTouchScreen()}
-            headerGapStyles={isDraggingOver ? [styles.receiptDropHeaderGap] : []}
-            testID={IOURequestStartPage.displayName}
+        <AccessOrNotFoundWrapper
+            reportID={reportID}
+            iouType={iouType}
+            policyID={policy?.id}
+            accessVariants={[CONST.IOU.ACCESS_VARIANTS.CREATE]}
+            allPolicies={allPolicies}
         >
-            {({safeAreaPaddingBottomStyle}) => (
-                <FullPageNotFoundView shouldShow={!IOUUtils.isValidMoneyRequestType(iouType) || !isAllowedToCreateRequest}>
+            <ScreenWrapper
+                includeSafeAreaPaddingBottom={false}
+                shouldEnableKeyboardAvoidingView={false}
+                shouldEnableMinHeight={DeviceCapabilities.canUseTouchScreen()}
+                headerGapStyles={isDraggingOver ? [styles.receiptDropHeaderGap] : []}
+                testID={IOURequestStartPage.displayName}
+                focusTrapSettings={{containerElements: focusTrapContainerElements}}
+            >
+                {({safeAreaPaddingBottomStyle}) => (
                     <DragAndDropProvider
                         setIsDraggingOver={setIsDraggingOver}
                         isDisabled={selectedTab !== CONST.TAB_REQUEST.SCAN}
                     >
                         <View style={[styles.flex1, safeAreaPaddingBottomStyle]}>
-                            <HeaderWithBackButton
-                                title={tabTitles[iouType]}
-                                onBackButtonPress={navigateBack}
-                            />
+                            <FocusTrapContainerElement
+                                onContainerElementChanged={setHeaderWithBackButtonContainerElement}
+                                style={[styles.w100]}
+                            >
+                                <HeaderWithBackButton
+                                    title={tabTitles[iouType]}
+                                    onBackButtonPress={navigateBack}
+                                />
+                            </FocusTrapContainerElement>
+
                             {iouType !== CONST.IOU.TYPE.SEND && iouType !== CONST.IOU.TYPE.PAY && iouType !== CONST.IOU.TYPE.INVOICE ? (
                                 <OnyxTabNavigator
                                     id={CONST.TAB.IOU_REQUEST_TYPE}
+                                    defaultSelectedTab={CONST.TAB_REQUEST.SCAN}
                                     onTabSelected={resetIOUTypeIfChanged}
                                     tabBar={TabSelector}
+                                    onTabBarFocusTrapContainerElementChanged={setTabBarContainerElement}
+                                    onActiveTabFocusTrapContainerElementChanged={setActiveTabContainerElement}
                                 >
-                                    <TopTab.Screen name={CONST.TAB_REQUEST.MANUAL}>{() => <IOURequestStepAmount route={route} />}</TopTab.Screen>
-                                    <TopTab.Screen name={CONST.TAB_REQUEST.SCAN}>{() => <IOURequestStepScan route={route} />}</TopTab.Screen>
-                                    {shouldDisplayDistanceRequest && <TopTab.Screen name={CONST.TAB_REQUEST.DISTANCE}>{() => <IOURequestStepDistance route={route} />}</TopTab.Screen>}
+                                    <TopTab.Screen name={CONST.TAB_REQUEST.MANUAL}>
+                                        {() => (
+                                            <TabScreenWithFocusTrapWrapper>
+                                                <IOURequestStepAmount
+                                                    shouldKeepUserInput
+                                                    route={route}
+                                                />
+                                            </TabScreenWithFocusTrapWrapper>
+                                        )}
+                                    </TopTab.Screen>
+                                    <TopTab.Screen name={CONST.TAB_REQUEST.SCAN}>
+                                        {() => (
+                                            <TabScreenWithFocusTrapWrapper>
+                                                <IOURequestStepScan route={route} />
+                                            </TabScreenWithFocusTrapWrapper>
+                                        )}
+                                    </TopTab.Screen>
+                                    {shouldDisplayDistanceRequest && (
+                                        <TopTab.Screen name={CONST.TAB_REQUEST.DISTANCE}>
+                                            {() => (
+                                                <TabScreenWithFocusTrapWrapper>
+                                                    <IOURequestStepDistance route={route} />
+                                                </TabScreenWithFocusTrapWrapper>
+                                            )}
+                                        </TopTab.Screen>
+                                    )}
                                 </OnyxTabNavigator>
                             ) : (
-                                <IOURequestStepAmount route={route} />
+                                <FocusTrapContainerElement
+                                    onContainerElementChanged={setActiveTabContainerElement}
+                                    style={[styles.flexColumn, styles.flex1]}
+                                >
+                                    <IOURequestStepAmount
+                                        route={route}
+                                        shouldKeepUserInput
+                                    />
+                                </FocusTrapContainerElement>
                             )}
                         </View>
                     </DragAndDropProvider>
-                </FullPageNotFoundView>
-            )}
-        </ScreenWrapper>
+                )}
+            </ScreenWrapper>
+        </AccessOrNotFoundWrapper>
     );
 }
 
 IOURequestStartPage.displayName = 'IOURequestStartPage';
 
-export default withOnyx<IOURequestStartPageProps, IOURequestStartPageOnyxProps>({
-    report: {
-        key: ({route}) => `${ONYXKEYS.COLLECTION.REPORT}${route?.params?.reportID}`,
-    },
-    policy: {
-        key: ({report}) => `${ONYXKEYS.COLLECTION.POLICY}${report?.policyID}`,
-    },
-    selectedTab: {
-        key: `${ONYXKEYS.COLLECTION.SELECTED_TAB}${CONST.TAB.IOU_REQUEST_TYPE}`,
-    },
-    transaction: {
-        key: ({route}) => `${ONYXKEYS.COLLECTION.TRANSACTION_DRAFT}${route?.params.transactionID ?? 0}`,
-    },
-    allPolicies: {
-        key: ONYXKEYS.COLLECTION.POLICY,
-    },
-})(IOURequestStartPage);
+export default IOURequestStartPage;
diff --git a/src/pages/iou/request/MoneyRequestParticipantsSelector.tsx b/src/pages/iou/request/MoneyRequestParticipantsSelector.tsx
new file mode 100644
index 000000000000..3d2f85ef6c62
--- /dev/null
+++ b/src/pages/iou/request/MoneyRequestParticipantsSelector.tsx
@@ -0,0 +1,466 @@
+import lodashIsEqual from 'lodash/isEqual';
+import lodashPick from 'lodash/pick';
+import lodashReject from 'lodash/reject';
+import React, {memo, useCallback, useEffect, useMemo} from 'react';
+import type {GestureResponderEvent} from 'react-native';
+import {useOnyx} from 'react-native-onyx';
+import Button from '@components/Button';
+import EmptySelectionListContent from '@components/EmptySelectionListContent';
+import FormHelpMessage from '@components/FormHelpMessage';
+import {usePersonalDetails} from '@components/OnyxProvider';
+import {useOptionsList} from '@components/OptionListContextProvider';
+import ReferralProgramCTA from '@components/ReferralProgramCTA';
+import SelectionList from '@components/SelectionList';
+import InviteMemberListItem from '@components/SelectionList/InviteMemberListItem';
+import useDebouncedState from '@hooks/useDebouncedState';
+import useDismissedReferralBanners from '@hooks/useDismissedReferralBanners';
+import useLocalize from '@hooks/useLocalize';
+import useNetwork from '@hooks/useNetwork';
+import usePermissions from '@hooks/usePermissions';
+import usePolicy from '@hooks/usePolicy';
+import useScreenWrapperTranstionStatus from '@hooks/useScreenWrapperTransitionStatus';
+import useThemeStyles from '@hooks/useThemeStyles';
+import * as DeviceCapabilities from '@libs/DeviceCapabilities';
+import Navigation from '@libs/Navigation/Navigation';
+import * as OptionsListUtils from '@libs/OptionsListUtils';
+import * as PolicyUtils from '@libs/PolicyUtils';
+import * as ReportUtils from '@libs/ReportUtils';
+import * as SubscriptionUtils from '@libs/SubscriptionUtils';
+import * as Policy from '@userActions/Policy/Policy';
+import * as Report from '@userActions/Report';
+import type {IOUAction, IOURequestType, IOUType} from '@src/CONST';
+import CONST from '@src/CONST';
+import ONYXKEYS from '@src/ONYXKEYS';
+import ROUTES from '@src/ROUTES';
+import type {Participant} from '@src/types/onyx/IOU';
+
+type MoneyRequestParticipantsSelectorProps = {
+    /** Callback to request parent modal to go to next step, which should be split */
+    onFinish: (value?: string) => void;
+
+    /** Callback to add participants in MoneyRequestModal */
+    onParticipantsAdded: (value: Participant[]) => void;
+
+    /** Selected participants from MoneyRequestModal with login */
+    participants?: Participant[] | typeof CONST.EMPTY_ARRAY;
+
+    /** The type of IOU report, i.e. split, request, send, track */
+    iouType: IOUType;
+
+    /** The expense type, ie. manual, scan, distance */
+    iouRequestType: IOURequestType;
+
+    /** The action of the IOU, i.e. create, split, move */
+    action: IOUAction;
+};
+
+function MoneyRequestParticipantsSelector({participants = CONST.EMPTY_ARRAY, onFinish, onParticipantsAdded, iouType, iouRequestType, action}: MoneyRequestParticipantsSelectorProps) {
+    const {translate} = useLocalize();
+    const styles = useThemeStyles();
+    const [searchTerm, debouncedSearchTerm, setSearchTerm] = useDebouncedState('');
+    const referralContentType = iouType === CONST.IOU.TYPE.PAY ? CONST.REFERRAL_PROGRAM.CONTENT_TYPES.PAY_SOMEONE : CONST.REFERRAL_PROGRAM.CONTENT_TYPES.SUBMIT_EXPENSE;
+    const {isOffline} = useNetwork();
+    const personalDetails = usePersonalDetails();
+    const {isDismissed} = useDismissedReferralBanners({referralContentType});
+    const {canUseP2PDistanceRequests} = usePermissions();
+    const {didScreenTransitionEnd} = useScreenWrapperTranstionStatus();
+    const [betas] = useOnyx(ONYXKEYS.BETAS);
+    const [activePolicyID] = useOnyx(ONYXKEYS.NVP_ACTIVE_POLICY_ID);
+    const policy = usePolicy(activePolicyID);
+    const [isSearchingForReports] = useOnyx(ONYXKEYS.IS_SEARCHING_FOR_REPORTS, {initWithStoredValues: false});
+    const {options, areOptionsInitialized} = useOptionsList({
+        shouldInitialize: didScreenTransitionEnd,
+    });
+    const cleanSearchTerm = useMemo(() => debouncedSearchTerm.trim().toLowerCase(), [debouncedSearchTerm]);
+    const offlineMessage: string = isOffline ? `${translate('common.youAppearToBeOffline')} ${translate('search.resultsAreLimited')}` : '';
+
+    const isPaidGroupPolicy = useMemo(() => PolicyUtils.isPaidGroupPolicy(policy), [policy]);
+    const isIOUSplit = iouType === CONST.IOU.TYPE.SPLIT;
+    const isCategorizeOrShareAction = [CONST.IOU.ACTION.CATEGORIZE, CONST.IOU.ACTION.SHARE].some((option) => option === action);
+
+    useEffect(() => {
+        Report.searchInServer(debouncedSearchTerm.trim());
+    }, [debouncedSearchTerm]);
+
+    const defaultOptions = useMemo(() => {
+        if (!areOptionsInitialized || !didScreenTransitionEnd) {
+            return {
+                userToInvite: null,
+                recentReports: [],
+                personalDetails: [],
+                currentUserOption: null,
+                headerMessage: '',
+                categoryOptions: [],
+                tagOptions: [],
+                taxRatesOptions: [],
+            };
+        }
+
+        const optionList = OptionsListUtils.getFilteredOptions(
+            options.reports,
+            options.personalDetails,
+            betas,
+            '',
+            participants as Participant[],
+            CONST.EXPENSIFY_EMAILS,
+
+            // If we are using this component in the "Submit expense" flow then we pass the includeOwnedWorkspaceChats argument so that the current user
+            // sees the option to submit an expense from their admin on their own Workspace Chat.
+            (iouType === CONST.IOU.TYPE.SUBMIT || iouType === CONST.IOU.TYPE.SPLIT) && action !== CONST.IOU.ACTION.SUBMIT,
+
+            // eslint-disable-next-line @typescript-eslint/prefer-nullish-coalescing
+            (canUseP2PDistanceRequests || iouRequestType !== CONST.IOU.REQUEST_TYPE.DISTANCE) && !isCategorizeOrShareAction,
+            false,
+            {},
+            [],
+            false,
+            {},
+            [],
+            // eslint-disable-next-line @typescript-eslint/prefer-nullish-coalescing
+            (canUseP2PDistanceRequests || iouRequestType !== CONST.IOU.REQUEST_TYPE.DISTANCE) && !isCategorizeOrShareAction,
+            false,
+            false,
+            0,
+            undefined,
+            undefined,
+            undefined,
+            undefined,
+            undefined,
+            iouType === CONST.IOU.TYPE.INVOICE,
+            action,
+            isPaidGroupPolicy,
+        );
+
+        return optionList;
+    }, [
+        action,
+        areOptionsInitialized,
+        betas,
+        canUseP2PDistanceRequests,
+        didScreenTransitionEnd,
+        iouRequestType,
+        iouType,
+        isCategorizeOrShareAction,
+        options.personalDetails,
+        options.reports,
+        participants,
+        isPaidGroupPolicy,
+    ]);
+
+    const chatOptions = useMemo(() => {
+        if (!areOptionsInitialized) {
+            return {
+                userToInvite: null,
+                recentReports: [],
+                personalDetails: [],
+                currentUserOption: null,
+                headerMessage: '',
+                categoryOptions: [],
+                tagOptions: [],
+                taxRatesOptions: [],
+            };
+        }
+
+        const newOptions = OptionsListUtils.filterOptions(defaultOptions, debouncedSearchTerm, {
+            selectedOptions: participants as Participant[],
+            excludeLogins: CONST.EXPENSIFY_EMAILS,
+            maxRecentReportsToShow: CONST.IOU.MAX_RECENT_REPORTS_TO_SHOW,
+            preferPolicyExpenseChat: isPaidGroupPolicy,
+        });
+        return newOptions;
+    }, [areOptionsInitialized, defaultOptions, debouncedSearchTerm, participants, isPaidGroupPolicy]);
+
+    /**
+     * Returns the sections needed for the OptionsSelector
+     * @returns {Array}
+     */
+    const [sections, header] = useMemo(() => {
+        const newSections: OptionsListUtils.CategorySection[] = [];
+        if (!areOptionsInitialized || !didScreenTransitionEnd) {
+            return [newSections, ''];
+        }
+
+        const formatResults = OptionsListUtils.formatSectionsFromSearchTerm(
+            debouncedSearchTerm,
+            participants.map((participant) => ({...participant, reportID: participant.reportID ?? '-1'})),
+            chatOptions.recentReports,
+            chatOptions.personalDetails,
+            personalDetails,
+            true,
+        );
+
+        newSections.push(formatResults.section);
+
+        newSections.push({
+            title: translate('common.recents'),
+            data: chatOptions.recentReports,
+            shouldShow: chatOptions.recentReports.length > 0,
+        });
+
+        newSections.push({
+            title: translate('common.contacts'),
+            data: chatOptions.personalDetails,
+            shouldShow: chatOptions.personalDetails.length > 0,
+        });
+
+        if (
+            chatOptions.userToInvite &&
+            !OptionsListUtils.isCurrentUser({...chatOptions.userToInvite, accountID: chatOptions.userToInvite?.accountID ?? -1, status: chatOptions.userToInvite?.status ?? undefined})
+        ) {
+            newSections.push({
+                title: undefined,
+                data: [chatOptions.userToInvite].map((participant) => {
+                    const isPolicyExpenseChat = participant?.isPolicyExpenseChat ?? false;
+                    return isPolicyExpenseChat ? OptionsListUtils.getPolicyExpenseReportOption(participant) : OptionsListUtils.getParticipantsOption(participant, personalDetails);
+                }),
+                shouldShow: true,
+            });
+        }
+
+        const headerMessage = OptionsListUtils.getHeaderMessage(
+            (chatOptions.personalDetails ?? []).length + (chatOptions.recentReports ?? []).length !== 0,
+            !!chatOptions?.userToInvite,
+            debouncedSearchTerm.trim(),
+            participants.some((participant) => OptionsListUtils.getPersonalDetailSearchTerms(participant).join(' ').toLowerCase().includes(cleanSearchTerm)),
+        );
+
+        return [newSections, headerMessage];
+    }, [
+        areOptionsInitialized,
+        didScreenTransitionEnd,
+        debouncedSearchTerm,
+        participants,
+        chatOptions.recentReports,
+        chatOptions.personalDetails,
+        chatOptions.userToInvite,
+        personalDetails,
+        translate,
+        cleanSearchTerm,
+    ]);
+
+    /**
+     * Adds a single participant to the expense
+     *
+     * @param {Object} option
+     */
+    const addSingleParticipant = useCallback(
+        (option: Participant) => {
+            const newParticipants: Participant[] = [
+                {
+                    ...lodashPick(option, 'accountID', 'login', 'isPolicyExpenseChat', 'reportID', 'searchText', 'policyID'),
+                    selected: true,
+                    iouType,
+                },
+            ];
+
+            if (iouType === CONST.IOU.TYPE.INVOICE) {
+                // TODO: Use getInvoicePrimaryWorkspace when the invoices screen is ready - https://github.com/Expensify/App/issues/45175.
+                const policyID = option.item && ReportUtils.isInvoiceRoom(option.item) ? option.policyID : Policy.getPrimaryPolicy(activePolicyID)?.id;
+                newParticipants.push({
+                    policyID,
+                    isSender: true,
+                    selected: false,
+                    iouType,
+                });
+            }
+
+            onParticipantsAdded(newParticipants);
+            onFinish();
+        },
+        // eslint-disable-next-line react-compiler/react-compiler, react-hooks/exhaustive-deps -- we don't want to trigger this callback when iouType changes
+        [onFinish, onParticipantsAdded],
+    );
+
+    /**
+     * 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: Participant) => {
+            const isOptionSelected = (selectedOption: Participant) => {
+                if (selectedOption.accountID && selectedOption.accountID === option?.accountID) {
+                    return true;
+                }
+
+                if (selectedOption.reportID && selectedOption.reportID === option?.reportID) {
+                    return true;
+                }
+
+                return false;
+            };
+            const isOptionInList = participants.some(isOptionSelected);
+            let newSelectedOptions: Participant[];
+
+            if (isOptionInList) {
+                newSelectedOptions = lodashReject(participants, isOptionSelected);
+            } else {
+                newSelectedOptions = [
+                    ...participants,
+                    {
+                        accountID: option.accountID,
+                        login: option.login,
+                        isPolicyExpenseChat: option.isPolicyExpenseChat,
+                        reportID: option.reportID,
+                        selected: true,
+                        searchText: option.searchText,
+                        iouType,
+                    },
+                ];
+            }
+
+            onParticipantsAdded(newSelectedOptions);
+        },
+        // eslint-disable-next-line react-compiler/react-compiler, react-hooks/exhaustive-deps -- we don't want to trigger this callback when iouType changes
+        [participants, onParticipantsAdded],
+    );
+
+    // 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 = participants.some((participant) => participant.isPolicyExpenseChat);
+    const shouldShowSplitBillErrorMessage = participants.length > 1 && hasPolicyExpenseChatParticipant;
+
+    // canUseP2PDistanceRequests is true if the iouType is track expense, but we don't want to allow splitting distance with track expense yet
+    const isAllowedToSplit =
+        // eslint-disable-next-line @typescript-eslint/prefer-nullish-coalescing
+        (canUseP2PDistanceRequests || iouRequestType !== CONST.IOU.REQUEST_TYPE.DISTANCE) &&
+        ![CONST.IOU.TYPE.PAY, CONST.IOU.TYPE.TRACK, CONST.IOU.TYPE.INVOICE].some((option) => option === iouType) &&
+        ![CONST.IOU.ACTION.SHARE, CONST.IOU.ACTION.SUBMIT, CONST.IOU.ACTION.CATEGORIZE].some((option) => option === action);
+
+    const handleConfirmSelection = useCallback(
+        (keyEvent?: GestureResponderEvent | KeyboardEvent, option?: Participant) => {
+            const shouldAddSingleParticipant = option && !participants.length;
+            if (shouldShowSplitBillErrorMessage || (!participants.length && !option)) {
+                return;
+            }
+
+            if (shouldAddSingleParticipant) {
+                addSingleParticipant(option);
+                return;
+            }
+
+            onFinish(CONST.IOU.TYPE.SPLIT);
+        },
+        [shouldShowSplitBillErrorMessage, onFinish, addSingleParticipant, participants],
+    );
+
+    const showLoadingPlaceholder = useMemo(() => !areOptionsInitialized || !didScreenTransitionEnd, [areOptionsInitialized, didScreenTransitionEnd]);
+
+    const optionLength = useMemo(() => {
+        if (!areOptionsInitialized) {
+            return 0;
+        }
+        let length = 0;
+        sections.forEach((section) => {
+            length += section.data.length;
+        });
+        return length;
+    }, [areOptionsInitialized, sections]);
+
+    const shouldShowListEmptyContent = useMemo(() => optionLength === 0 && !showLoadingPlaceholder, [optionLength, showLoadingPlaceholder]);
+
+    const shouldShowReferralBanner = !isDismissed && iouType !== CONST.IOU.TYPE.INVOICE && !shouldShowListEmptyContent;
+
+    const footerContent = useMemo(() => {
+        if (isDismissed && !shouldShowSplitBillErrorMessage && !participants.length) {
+            return;
+        }
+
+        return (
+            <>
+                {shouldShowReferralBanner && !isCategorizeOrShareAction && (
+                    <ReferralProgramCTA
+                        referralContentType={referralContentType}
+                        style={[styles.flexShrink0, !!participants.length && !shouldShowSplitBillErrorMessage && styles.mb5]}
+                    />
+                )}
+
+                {shouldShowSplitBillErrorMessage && (
+                    <FormHelpMessage
+                        style={[styles.ph1, styles.mb2]}
+                        isError
+                        message={translate('iou.error.splitExpenseMultipleParticipantsErrorMessage')}
+                    />
+                )}
+
+                {!!participants.length && !isCategorizeOrShareAction && (
+                    <Button
+                        success
+                        text={translate('common.next')}
+                        onPress={handleConfirmSelection}
+                        pressOnEnter
+                        large
+                        isDisabled={shouldShowSplitBillErrorMessage}
+                    />
+                )}
+                {isCategorizeOrShareAction && (
+                    <Button
+                        success
+                        text={translate('workspace.new.newWorkspace')}
+                        onPress={() => onFinish()}
+                        pressOnEnter
+                        large
+                    />
+                )}
+            </>
+        );
+    }, [
+        handleConfirmSelection,
+        participants.length,
+        isDismissed,
+        referralContentType,
+        shouldShowSplitBillErrorMessage,
+        styles,
+        translate,
+        shouldShowReferralBanner,
+        isCategorizeOrShareAction,
+        onFinish,
+    ]);
+
+    const onSelectRow = useCallback(
+        (option: Participant) => {
+            if (option.isPolicyExpenseChat && option.policyID && SubscriptionUtils.shouldRestrictUserBillableActions(option.policyID)) {
+                Navigation.navigate(ROUTES.RESTRICTED_ACTION.getRoute(option.policyID));
+                return;
+            }
+
+            if (isIOUSplit) {
+                addParticipantToSelection(option);
+                return;
+            }
+
+            addSingleParticipant(option);
+        },
+        [isIOUSplit, addParticipantToSelection, addSingleParticipant],
+    );
+
+    return (
+        <SelectionList
+            onConfirm={handleConfirmSelection}
+            sections={areOptionsInitialized ? sections : CONST.EMPTY_ARRAY}
+            ListItem={InviteMemberListItem}
+            textInputValue={searchTerm}
+            textInputLabel={translate('selectionList.nameEmailOrPhoneNumber')}
+            textInputHint={offlineMessage}
+            onChangeText={setSearchTerm}
+            shouldPreventDefaultFocusOnSelectRow={!DeviceCapabilities.canUseTouchScreen()}
+            onSelectRow={onSelectRow}
+            shouldSingleExecuteRowSelect
+            footerContent={footerContent}
+            listEmptyContent={<EmptySelectionListContent contentType={iouType} />}
+            headerMessage={header}
+            showLoadingPlaceholder={showLoadingPlaceholder}
+            canSelectMultiple={isIOUSplit && isAllowedToSplit}
+            isLoadingNewOptions={!!isSearchingForReports}
+            shouldShowListEmptyContent={shouldShowListEmptyContent}
+        />
+    );
+}
+
+MoneyRequestParticipantsSelector.displayName = 'MoneyTemporaryForRefactorRequestParticipantsSelector';
+
+export default memo(
+    MoneyRequestParticipantsSelector,
+    (prevProps, nextProps) =>
+        lodashIsEqual(prevProps.participants, nextProps.participants) && prevProps.iouRequestType === nextProps.iouRequestType && prevProps.iouType === nextProps.iouType,
+);
diff --git a/src/pages/iou/request/MoneyTemporaryForRefactorRequestParticipantsSelector.js b/src/pages/iou/request/MoneyTemporaryForRefactorRequestParticipantsSelector.js
deleted file mode 100644
index ecf3c449b14b..000000000000
--- a/src/pages/iou/request/MoneyTemporaryForRefactorRequestParticipantsSelector.js
+++ /dev/null
@@ -1,362 +0,0 @@
-import lodashGet from 'lodash/get';
-import lodashIsEqual from 'lodash/isEqual';
-import lodashMap from 'lodash/map';
-import lodashPick from 'lodash/pick';
-import lodashReject from 'lodash/reject';
-import lodashSome from 'lodash/some';
-import lodashValues from 'lodash/values';
-import PropTypes from 'prop-types';
-import React, {memo, useCallback, useEffect, useMemo} from 'react';
-import {useOnyx} from 'react-native-onyx';
-import Button from '@components/Button';
-import FormHelpMessage from '@components/FormHelpMessage';
-import {usePersonalDetails} from '@components/OnyxProvider';
-import {useOptionsList} from '@components/OptionListContextProvider';
-import ReferralProgramCTA from '@components/ReferralProgramCTA';
-import SelectionList from '@components/SelectionList';
-import InviteMemberListItem from '@components/SelectionList/InviteMemberListItem';
-import useDebouncedState from '@hooks/useDebouncedState';
-import useDismissedReferralBanners from '@hooks/useDismissedReferralBanners';
-import useLocalize from '@hooks/useLocalize';
-import useNetwork from '@hooks/useNetwork';
-import usePermissions from '@hooks/usePermissions';
-import useScreenWrapperTranstionStatus from '@hooks/useScreenWrapperTransitionStatus';
-import useThemeStyles from '@hooks/useThemeStyles';
-import * as DeviceCapabilities from '@libs/DeviceCapabilities';
-import * as OptionsListUtils from '@libs/OptionsListUtils';
-import * as Policy from '@userActions/Policy';
-import * as Report from '@userActions/Report';
-import CONST from '@src/CONST';
-import ONYXKEYS from '@src/ONYXKEYS';
-
-const propTypes = {
-    /** Callback to request parent modal to go to next step, which should be split */
-    onFinish: PropTypes.func.isRequired,
-
-    /** Callback to add participants in MoneyRequestModal */
-    onParticipantsAdded: 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,
-        }),
-    ),
-
-    /** The type of IOU report, i.e. split, request, send, track */
-    iouType: PropTypes.oneOf(lodashValues(CONST.IOU.TYPE)).isRequired,
-
-    /** The expense type, ie. manual, scan, distance */
-    iouRequestType: PropTypes.oneOf(lodashValues(CONST.IOU.REQUEST_TYPE)).isRequired,
-
-    /** The action of the IOU, i.e. create, split, move */
-    action: PropTypes.oneOf(lodashValues(CONST.IOU.ACTION)),
-};
-
-const defaultProps = {
-    participants: [],
-    action: CONST.IOU.ACTION.CREATE,
-};
-
-function MoneyTemporaryForRefactorRequestParticipantsSelector({participants, onFinish, onParticipantsAdded, iouType, iouRequestType, action}) {
-    const {translate} = useLocalize();
-    const styles = useThemeStyles();
-    const [searchTerm, debouncedSearchTerm, setSearchTerm] = useDebouncedState('');
-    const referralContentType = iouType === CONST.IOU.TYPE.PAY ? CONST.REFERRAL_PROGRAM.CONTENT_TYPES.PAY_SOMEONE : CONST.REFERRAL_PROGRAM.CONTENT_TYPES.SUBMIT_EXPENSE;
-    const {isOffline} = useNetwork();
-    const personalDetails = usePersonalDetails();
-    const {isDismissed} = useDismissedReferralBanners({referralContentType});
-    const {canUseP2PDistanceRequests} = usePermissions();
-    const {didScreenTransitionEnd} = useScreenWrapperTranstionStatus();
-    const [betas] = useOnyx(ONYXKEYS.BETAS);
-    const [activePolicyID] = useOnyx(ONYXKEYS.NVP_ACTIVE_POLICY_ID);
-    const [isSearchingForReports] = useOnyx(ONYXKEYS.IS_SEARCHING_FOR_REPORTS, {initWithStoredValues: false});
-    const {options, areOptionsInitialized} = useOptionsList({
-        shouldInitialize: didScreenTransitionEnd,
-    });
-
-    const offlineMessage = isOffline ? [`${translate('common.youAppearToBeOffline')} ${translate('search.resultsAreLimited')}`, {isTranslated: true}] : '';
-
-    const isIOUSplit = iouType === CONST.IOU.TYPE.SPLIT;
-    const isCategorizeOrShareAction = [CONST.IOU.ACTION.CATEGORIZE, CONST.IOU.ACTION.SHARE].includes(action);
-
-    const shouldShowReferralBanner = !isDismissed && iouType !== CONST.IOU.TYPE.INVOICE;
-
-    useEffect(() => {
-        Report.searchInServer(debouncedSearchTerm.trim());
-    }, [debouncedSearchTerm]);
-
-    /**
-     * Returns the sections needed for the OptionsSelector
-     *
-     * @returns {Array}
-     */
-    const [sections, newChatOptions] = useMemo(() => {
-        const newSections = [];
-        if (!areOptionsInitialized || !didScreenTransitionEnd) {
-            return [newSections, {}];
-        }
-        const chatOptions = OptionsListUtils.getFilteredOptions(
-            options.reports,
-            options.personalDetails,
-            betas,
-            debouncedSearchTerm,
-            participants,
-            CONST.EXPENSIFY_EMAILS,
-
-            // If we are using this component in the "Submit expense" flow then we pass the includeOwnedWorkspaceChats argument so that the current user
-            // sees the option to submit an expense from their admin on their own Workspace Chat.
-            (iouType === CONST.IOU.TYPE.SUBMIT || iouType === CONST.IOU.TYPE.SPLIT) && action !== CONST.IOU.ACTION.SUBMIT,
-
-            (canUseP2PDistanceRequests || iouRequestType !== CONST.IOU.REQUEST_TYPE.DISTANCE) && !isCategorizeOrShareAction,
-            false,
-            {},
-            [],
-            false,
-            {},
-            [],
-            (canUseP2PDistanceRequests || iouRequestType !== CONST.IOU.REQUEST_TYPE.DISTANCE) && !isCategorizeOrShareAction,
-            false,
-            undefined,
-            undefined,
-            undefined,
-            undefined,
-            undefined,
-            undefined,
-            !isCategorizeOrShareAction,
-            isCategorizeOrShareAction ? 0 : undefined,
-        );
-
-        const formatResults = OptionsListUtils.formatSectionsFromSearchTerm(debouncedSearchTerm, participants, chatOptions.recentReports, chatOptions.personalDetails, personalDetails, true);
-
-        newSections.push(formatResults.section);
-
-        newSections.push({
-            title: translate('common.recents'),
-            data: chatOptions.recentReports,
-            shouldShow: chatOptions.recentReports.length > 0,
-        });
-
-        newSections.push({
-            title: translate('common.contacts'),
-            data: chatOptions.personalDetails,
-            shouldShow: chatOptions.personalDetails.length > 0,
-        });
-
-        if (chatOptions.userToInvite && !OptionsListUtils.isCurrentUser(chatOptions.userToInvite)) {
-            newSections.push({
-                title: undefined,
-                data: lodashMap([chatOptions.userToInvite], (participant) => {
-                    const isPolicyExpenseChat = lodashGet(participant, 'isPolicyExpenseChat', false);
-                    return isPolicyExpenseChat ? OptionsListUtils.getPolicyExpenseReportOption(participant) : OptionsListUtils.getParticipantsOption(participant, personalDetails);
-                }),
-                shouldShow: true,
-            });
-        }
-
-        return [newSections, chatOptions];
-    }, [
-        areOptionsInitialized,
-        options.reports,
-        options.personalDetails,
-        betas,
-        debouncedSearchTerm,
-        participants,
-        iouType,
-        action,
-        canUseP2PDistanceRequests,
-        iouRequestType,
-        personalDetails,
-        translate,
-        didScreenTransitionEnd,
-        isCategorizeOrShareAction,
-    ]);
-
-    /**
-     * Adds a single participant to the expense
-     *
-     * @param {Object} option
-     */
-    const addSingleParticipant = useCallback(
-        (option) => {
-            const newParticipants = [
-                {
-                    ...lodashPick(option, 'accountID', 'login', 'isPolicyExpenseChat', 'reportID', 'searchText', 'policyID'),
-                    selected: true,
-                    iouType,
-                },
-            ];
-
-            if (iouType === CONST.IOU.TYPE.INVOICE) {
-                const primaryPolicy = Policy.getPrimaryPolicy(activePolicyID);
-
-                newParticipants.push({
-                    policyID: primaryPolicy.id,
-                    isSender: true,
-                    selected: false,
-                    iouType,
-                });
-            }
-
-            onParticipantsAdded(newParticipants);
-            onFinish();
-        },
-        // eslint-disable-next-line react-hooks/exhaustive-deps -- we don't want to trigger this callback when iouType changes
-        [onFinish, onParticipantsAdded],
-    );
-
-    /**
-     * 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 = lodashSome(participants, isOptionSelected);
-            let newSelectedOptions;
-
-            if (isOptionInList) {
-                newSelectedOptions = lodashReject(participants, isOptionSelected);
-            } else {
-                newSelectedOptions = [
-                    ...participants,
-                    {
-                        accountID: option.accountID,
-                        login: option.login,
-                        isPolicyExpenseChat: option.isPolicyExpenseChat,
-                        reportID: option.reportID,
-                        selected: true,
-                        searchText: option.searchText,
-                        iouType,
-                    },
-                ];
-            }
-
-            onParticipantsAdded(newSelectedOptions);
-        },
-        // eslint-disable-next-line react-hooks/exhaustive-deps -- we don't want to trigger this callback when iouType changes
-        [participants, onParticipantsAdded],
-    );
-
-    const headerMessage = useMemo(
-        () =>
-            OptionsListUtils.getHeaderMessage(
-                lodashGet(newChatOptions, 'personalDetails', []).length + lodashGet(newChatOptions, 'recentReports', []).length !== 0,
-                Boolean(newChatOptions.userToInvite),
-                debouncedSearchTerm.trim(),
-                lodashSome(participants, (participant) => participant.searchText.toLowerCase().includes(debouncedSearchTerm.trim().toLowerCase())),
-            ),
-        [newChatOptions, participants, debouncedSearchTerm],
-    );
-
-    // Right now you can't split an expense 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 = lodashSome(participants, (participant) => participant.isPolicyExpenseChat);
-    const shouldShowSplitBillErrorMessage = participants.length > 1 && hasPolicyExpenseChatParticipant;
-
-    // canUseP2PDistanceRequests is true if the iouType is track expense, but we don't want to allow splitting distance with track expense yet
-    const isAllowedToSplit =
-        (canUseP2PDistanceRequests || iouRequestType !== CONST.IOU.REQUEST_TYPE.DISTANCE) &&
-        ![CONST.IOU.TYPE.PAY, CONST.IOU.TYPE.TRACK, CONST.IOU.TYPE.INVOICE].includes(iouType) &&
-        ![CONST.IOU.ACTION.SHARE, CONST.IOU.ACTION.SUBMIT, CONST.IOU.ACTION.CATEGORIZE].includes(action);
-
-    const handleConfirmSelection = useCallback(
-        (keyEvent, option) => {
-            const shouldAddSingleParticipant = option && !participants.length;
-            if (shouldShowSplitBillErrorMessage || (!participants.length && !option)) {
-                return;
-            }
-
-            if (shouldAddSingleParticipant) {
-                addSingleParticipant(option);
-                return;
-            }
-
-            onFinish(CONST.IOU.TYPE.SPLIT);
-        },
-        [shouldShowSplitBillErrorMessage, onFinish, addSingleParticipant, participants],
-    );
-
-    const footerContent = useMemo(() => {
-        if (isDismissed && !shouldShowSplitBillErrorMessage && !participants.length) {
-            return;
-        }
-
-        return (
-            <>
-                {shouldShowReferralBanner && (
-                    <ReferralProgramCTA
-                        referralContentType={referralContentType}
-                        style={[styles.flexShrink0, !!participants.length && !shouldShowSplitBillErrorMessage && styles.mb5]}
-                    />
-                )}
-
-                {shouldShowSplitBillErrorMessage && (
-                    <FormHelpMessage
-                        style={[styles.ph1, styles.mb2]}
-                        isError
-                        message="iou.error.splitExpenseMultipleParticipantsErrorMessage"
-                    />
-                )}
-
-                {!!participants.length && (
-                    <Button
-                        success
-                        text={translate('common.next')}
-                        onPress={handleConfirmSelection}
-                        pressOnEnter
-                        large
-                        isDisabled={shouldShowSplitBillErrorMessage}
-                    />
-                )}
-            </>
-        );
-    }, [handleConfirmSelection, participants.length, isDismissed, referralContentType, shouldShowSplitBillErrorMessage, styles, translate, shouldShowReferralBanner]);
-
-    return (
-        <SelectionList
-            onConfirm={handleConfirmSelection}
-            sections={areOptionsInitialized ? sections : CONST.EMPTY_ARRAY}
-            ListItem={InviteMemberListItem}
-            textInputValue={searchTerm}
-            textInputLabel={translate('optionsSelector.nameEmailOrPhoneNumber')}
-            textInputHint={offlineMessage}
-            onChangeText={setSearchTerm}
-            shouldPreventDefaultFocusOnSelectRow={!DeviceCapabilities.canUseTouchScreen()}
-            onSelectRow={(item) => (isIOUSplit ? addParticipantToSelection(item) : addSingleParticipant(item))}
-            footerContent={footerContent}
-            headerMessage={headerMessage}
-            showLoadingPlaceholder={!areOptionsInitialized || !didScreenTransitionEnd}
-            canSelectMultiple={isIOUSplit && isAllowedToSplit}
-            isLoadingNewOptions={!!isSearchingForReports}
-        />
-    );
-}
-
-MoneyTemporaryForRefactorRequestParticipantsSelector.propTypes = propTypes;
-MoneyTemporaryForRefactorRequestParticipantsSelector.defaultProps = defaultProps;
-MoneyTemporaryForRefactorRequestParticipantsSelector.displayName = 'MoneyTemporaryForRefactorRequestParticipantsSelector';
-
-export default memo(
-    MoneyTemporaryForRefactorRequestParticipantsSelector,
-    (prevProps, nextProps) =>
-        lodashIsEqual(prevProps.participants, nextProps.participants) &&
-        prevProps.iouRequestType === nextProps.iouRequestType &&
-        prevProps.iouType === nextProps.iouType &&
-        lodashIsEqual(prevProps.betas, nextProps.betas),
-);
diff --git a/src/pages/iou/request/step/IOURequestStepAmount.tsx b/src/pages/iou/request/step/IOURequestStepAmount.tsx
index a9f096476814..a7457c88280d 100644
--- a/src/pages/iou/request/step/IOURequestStepAmount.tsx
+++ b/src/pages/iou/request/step/IOURequestStepAmount.tsx
@@ -1,7 +1,7 @@
 import {useFocusEffect} from '@react-navigation/native';
 import React, {useCallback, useEffect, useMemo, useRef} from 'react';
 import type {OnyxEntry} from 'react-native-onyx';
-import {withOnyx} from 'react-native-onyx';
+import {useOnyx, withOnyx} from 'react-native-onyx';
 import type {BaseTextInputRef} from '@components/TextInput/BaseTextInput/types';
 import withCurrentUserPersonalDetails from '@components/withCurrentUserPersonalDetails';
 import type {WithCurrentUserPersonalDetailsProps} from '@components/withCurrentUserPersonalDetails';
@@ -10,6 +10,7 @@ import * as TransactionEdit from '@libs/actions/TransactionEdit';
 import * as CurrencyUtils from '@libs/CurrencyUtils';
 import Navigation from '@libs/Navigation/Navigation';
 import * as OptionsListUtils from '@libs/OptionsListUtils';
+import * as PolicyUtils from '@libs/PolicyUtils';
 import * as ReportUtils from '@libs/ReportUtils';
 import * as TransactionUtils from '@libs/TransactionUtils';
 import {getRequestType} from '@libs/TransactionUtils';
@@ -54,6 +55,9 @@ type IOURequestStepAmountProps = IOURequestStepAmountOnyxProps &
     WithWritableReportOrNotFoundProps<typeof SCREENS.MONEY_REQUEST.STEP_AMOUNT | typeof SCREENS.MONEY_REQUEST.CREATE> & {
         /** The transaction object being modified in Onyx */
         transaction: OnyxEntry<OnyxTypes.Transaction>;
+
+        /** Whether the user input should be kept or not */
+        shouldKeepUserInput?: boolean;
     };
 
 function IOURequestStepAmount({
@@ -68,17 +72,21 @@ function IOURequestStepAmount({
     splitDraftTransaction,
     skipConfirmation,
     draftTransaction,
+    shouldKeepUserInput = false,
 }: IOURequestStepAmountProps) {
     const {translate} = useLocalize();
     const textInput = useRef<BaseTextInputRef | null>(null);
     const focusTimeoutRef = useRef<NodeJS.Timeout | null>(null);
     const isSaveButtonPressed = useRef(false);
     const iouRequestType = getRequestType(transaction);
+    const [reportNameValuePairs] = useOnyx(`${ONYXKEYS.COLLECTION.REPORT_NAME_VALUE_PAIRS}${report?.reportID ?? -1}`);
+    const [allPersonalDetails] = useOnyx(ONYXKEYS.PERSONAL_DETAILS_LIST);
 
     const isEditing = action === CONST.IOU.ACTION.EDIT;
     const isSplitBill = iouType === CONST.IOU.TYPE.SPLIT;
     const isEditingSplitBill = isEditing && isSplitBill;
-    const {amount: transactionAmount} = ReportUtils.getTransactionDetails(isEditingSplitBill && !isEmptyObject(splitDraftTransaction) ? splitDraftTransaction : transaction) ?? {amount: 0};
+    const currentTransaction = isEditingSplitBill && !isEmptyObject(splitDraftTransaction) ? splitDraftTransaction : transaction;
+    const {amount: transactionAmount} = ReportUtils.getTransactionDetails(currentTransaction) ?? {amount: 0};
     const {currency: originalCurrency} = ReportUtils.getTransactionDetails(isEditing ? draftTransaction : transaction) ?? {currency: CONST.CURRENCY.USD};
     const currency = CurrencyUtils.isValidCurrencyCode(selectedCurrency) ? selectedCurrency : originalCurrency;
 
@@ -89,8 +97,8 @@ function IOURequestStepAmount({
             return false;
         }
 
-        return !(ReportUtils.isArchivedRoom(report) || ReportUtils.isPolicyExpenseChat(report));
-    }, [report, skipConfirmation]);
+        return !(ReportUtils.isArchivedRoom(report, reportNameValuePairs) || ReportUtils.isPolicyExpenseChat(report));
+    }, [report, skipConfirmation, reportNameValuePairs]);
 
     useFocusEffect(
         useCallback(() => {
@@ -117,9 +125,9 @@ function IOURequestStepAmount({
             if (isSaveButtonPressed.current) {
                 return;
             }
-            TransactionEdit.removeDraftTransaction(transaction?.transactionID ?? '');
+            TransactionEdit.removeDraftTransaction(transaction?.transactionID ?? '-1');
         };
-        // eslint-disable-next-line react-hooks/exhaustive-deps
+        // eslint-disable-next-line react-compiler/react-compiler, react-hooks/exhaustive-deps
     }, []);
 
     const navigateBack = () => {
@@ -163,7 +171,11 @@ function IOURequestStepAmount({
         const amountInSmallestCurrencyUnits = CurrencyUtils.convertToBackendAmount(Number.parseFloat(amount));
 
         // eslint-disable-next-line @typescript-eslint/prefer-nullish-coalescing
-        IOU.setMoneyRequestAmount(transactionID, amountInSmallestCurrencyUnits, currency || CONST.CURRENCY.USD);
+        IOU.setMoneyRequestAmount(transactionID, amountInSmallestCurrencyUnits, currency || CONST.CURRENCY.USD, shouldKeepUserInput);
+
+        // Initially when we're creating money request, we do not know the participant and hence if the request is with workspace with tax tracking enabled
+        // So, we reset the taxAmount here and calculate it in the hook in MoneyRequestConfirmationList component
+        IOU.setMoneyRequestTaxAmount(transactionID, null);
 
         if (backTo) {
             Navigation.goBack(backTo);
@@ -173,16 +185,17 @@ function IOURequestStepAmount({
         // If a reportID exists in the report object, it's because the user started this flow from using the + button in the composer
         // inside a report. In this case, the participants can be automatically assigned from the report and the user can skip the participants step and go straight
         // to the confirm step.
-        if (report?.reportID && !ReportUtils.isArchivedRoom(report)) {
+        if (report?.reportID && !ReportUtils.isArchivedRoom(report, reportNameValuePairs)) {
             const selectedParticipants = IOU.setMoneyRequestParticipantsFromReport(transactionID, report);
             const participants = selectedParticipants.map((participant) => {
-                const participantAccountID = participant?.accountID ?? 0;
+                const participantAccountID = participant?.accountID ?? -1;
                 return participantAccountID ? OptionsListUtils.getParticipantsOption(participant, personalDetails) : OptionsListUtils.getReportOption(participant);
             });
             const backendAmount = CurrencyUtils.convertToBackendAmount(Number.parseFloat(amount));
 
             if (shouldSkipConfirmation) {
-                if (iouType === CONST.IOU.TYPE.SPLIT) {
+                // Only skip confirmation when the split is not configurable, for now Smartscanned splits cannot be configured
+                if (iouType === CONST.IOU.TYPE.SPLIT && transaction?.iouRequestType === CONST.IOU.REQUEST_TYPE.SCAN) {
                     IOU.splitBill({
                         participants,
                         currentUserLogin: currentUserPersonalDetails.login ?? '',
@@ -190,7 +203,7 @@ function IOURequestStepAmount({
                         amount: backendAmount,
                         comment: '',
                         currency,
-                        merchant: '',
+                        merchant: CONST.TRANSACTION.PARTIAL_TRANSACTION_MERCHANT,
                         tag: '',
                         category: '',
                         created: transaction?.created ?? '',
@@ -200,6 +213,7 @@ function IOURequestStepAmount({
                     });
                     return;
                 }
+
                 if (iouType === CONST.IOU.TYPE.PAY || iouType === CONST.IOU.TYPE.SEND) {
                     if (paymentMethod && paymentMethod === CONST.IOU.PAYMENT_TYPE.EXPENSIFY) {
                         IOU.sendMoneyWithWallet(report, backendAmount, currency, '', currentUserPersonalDetails.accountID, participants[0]);
@@ -240,6 +254,12 @@ function IOURequestStepAmount({
                 }
             }
             IOU.setMoneyRequestParticipantsFromReport(transactionID, report);
+            if (isSplitBill && !report.isOwnPolicyExpenseChat && report.participants) {
+                const participantAccountIDs = Object.keys(report.participants)
+                    .map((accountID) => Number(accountID))
+                    .filter((accountID) => !PolicyUtils.isExpensifyTeam(allPersonalDetails?.[accountID]?.login));
+                IOU.setSplitShares(transaction, amountInSmallestCurrencyUnits, currency || CONST.CURRENCY.USD, participantAccountIDs);
+            }
             navigateToConfirmationPage();
             return;
         }
@@ -250,27 +270,40 @@ function IOURequestStepAmount({
     };
 
     const saveAmountAndCurrency = ({amount, paymentMethod}: AmountParams) => {
+        const newAmount = CurrencyUtils.convertToBackendAmount(Number.parseFloat(amount));
+
+        // Edits to the amount from the splits page should reset the split shares.
+        if (transaction?.splitShares) {
+            IOU.resetSplitShares(transaction, newAmount, currency);
+        }
+
         if (!isEditing) {
             navigateToNextPage({amount, paymentMethod});
             return;
         }
 
-        const newAmount = CurrencyUtils.convertToBackendAmount(Number.parseFloat(amount));
-
         // If the value hasn't changed, don't request to save changes on the server and just close the modal
-        if (newAmount === TransactionUtils.getAmount(transaction) && currency === TransactionUtils.getCurrency(transaction)) {
-            Navigation.dismissModal();
+        const transactionCurrency = TransactionUtils.getCurrency(currentTransaction);
+        if (newAmount === TransactionUtils.getAmount(currentTransaction) && currency === transactionCurrency) {
+            navigateBack();
             return;
         }
 
+        // If currency has changed, then we get the default tax rate based on currency, otherwise we use the current tax rate selected in transaction, if we have it.
+        const transactionTaxCode = ReportUtils.getTransactionDetails(currentTransaction)?.taxCode;
+        const defaultTaxCode = TransactionUtils.getDefaultTaxCode(policy, currentTransaction, currency) ?? '';
+        const taxCode = (currency !== transactionCurrency ? defaultTaxCode : transactionTaxCode) ?? defaultTaxCode;
+        const taxPercentage = TransactionUtils.getTaxValue(policy, currentTransaction, taxCode) ?? '';
+        const taxAmount = CurrencyUtils.convertToBackendAmount(TransactionUtils.calculateTaxAmount(taxPercentage, newAmount, currency ?? CONST.CURRENCY.USD));
+
         if (isSplitBill) {
-            IOU.setDraftSplitTransaction(transactionID, {amount: newAmount, currency});
-            Navigation.goBack(backTo);
+            IOU.setDraftSplitTransaction(transactionID, {amount: newAmount, currency, taxCode, taxAmount});
+            navigateBack();
             return;
         }
 
-        IOU.updateMoneyRequestAmountAndCurrency({transactionID, transactionThreadReportID: reportID, currency, amount: newAmount});
-        Navigation.dismissModal();
+        IOU.updateMoneyRequestAmountAndCurrency({transactionID, transactionThreadReportID: reportID, currency, amount: newAmount, taxAmount, policy, taxCode});
+        navigateBack();
     };
 
     return (
@@ -287,9 +320,10 @@ function IOURequestStepAmount({
                 amount={Math.abs(transactionAmount)}
                 skipConfirmation={shouldSkipConfirmation ?? false}
                 iouType={iouType}
-                policyID={policy?.id ?? ''}
+                policyID={policy?.id ?? '-1'}
                 bankAccountRoute={ReportUtils.getBankAccountRoute(report)}
                 ref={(e) => (textInput.current = e)}
+                shouldKeepUserInput={transaction?.shouldShowOriginalAmount}
                 onCurrencyButtonPress={navigateToCurrencySelectionPage}
                 onSubmitButtonPress={saveAmountAndCurrency}
                 selectedTab={iouRequestType}
@@ -303,7 +337,7 @@ IOURequestStepAmount.displayName = 'IOURequestStepAmount';
 const IOURequestStepAmountWithOnyx = withOnyx<IOURequestStepAmountProps, IOURequestStepAmountOnyxProps>({
     splitDraftTransaction: {
         key: ({route}) => {
-            const transactionID = route.params.transactionID ?? 0;
+            const transactionID = route.params.transactionID ?? -1;
             return `${ONYXKEYS.COLLECTION.SPLIT_TRANSACTION_DRAFT}${transactionID}`;
         },
     },
@@ -315,7 +349,7 @@ const IOURequestStepAmountWithOnyx = withOnyx<IOURequestStepAmountProps, IOURequ
     },
     skipConfirmation: {
         key: ({route}) => {
-            const transactionID = route.params.transactionID ?? 0;
+            const transactionID = route.params.transactionID ?? -1;
             return `${ONYXKEYS.COLLECTION.SKIP_CONFIRMATION}${transactionID}`;
         },
     },
@@ -323,7 +357,7 @@ const IOURequestStepAmountWithOnyx = withOnyx<IOURequestStepAmountProps, IOURequ
         key: ONYXKEYS.PERSONAL_DETAILS_LIST,
     },
     policy: {
-        key: ({report}) => `${ONYXKEYS.COLLECTION.POLICY}${report ? report.policyID : '0'}`,
+        key: ({report}) => `${ONYXKEYS.COLLECTION.POLICY}${report ? report.policyID : '-1'}`,
     },
 })(IOURequestStepAmount);
 
diff --git a/src/pages/iou/request/step/IOURequestStepCategory.tsx b/src/pages/iou/request/step/IOURequestStepCategory.tsx
index 4b34a6a19600..e94ea724d1ed 100644
--- a/src/pages/iou/request/step/IOURequestStepCategory.tsx
+++ b/src/pages/iou/request/step/IOURequestStepCategory.tsx
@@ -1,24 +1,31 @@
 import lodashIsEmpty from 'lodash/isEmpty';
 import React, {useEffect} from 'react';
+import {ActivityIndicator, View} from 'react-native';
 import type {OnyxEntry} from 'react-native-onyx';
 import {withOnyx} from 'react-native-onyx';
+import Button from '@components/Button';
 import CategoryPicker from '@components/CategoryPicker';
+import FixedFooter from '@components/FixedFooter';
+import * as Illustrations from '@components/Icon/Illustrations';
 import type {ListItem} from '@components/SelectionList/types';
 import Text from '@components/Text';
+import WorkspaceEmptyStateSection from '@components/WorkspaceEmptyStateSection';
 import useLocalize from '@hooks/useLocalize';
 import useNetwork from '@hooks/useNetwork';
+import useTheme from '@hooks/useTheme';
 import useThemeStyles from '@hooks/useThemeStyles';
 import Navigation from '@libs/Navigation/Navigation';
 import * as OptionsListUtils from '@libs/OptionsListUtils';
+import * as ReportActionsUtils from '@libs/ReportActionsUtils';
 import * as ReportUtils from '@libs/ReportUtils';
 import * as TransactionUtils from '@libs/TransactionUtils';
 import * as IOU from '@userActions/IOU';
-import * as PolicyActions from '@userActions/Policy';
+import * as PolicyActions from '@userActions/Policy/Policy';
 import CONST from '@src/CONST';
 import ONYXKEYS from '@src/ONYXKEYS';
 import ROUTES from '@src/ROUTES';
 import type SCREENS from '@src/SCREENS';
-import type {Policy, PolicyCategories, PolicyTagList, ReportActions, Session, Transaction} from '@src/types/onyx';
+import type {Policy, PolicyCategories, PolicyTagLists, ReportActions, Session, Transaction} from '@src/types/onyx';
 import StepScreenWrapper from './StepScreenWrapper';
 import type {WithFullTransactionOrNotFoundProps} from './withFullTransactionOrNotFound';
 import withFullTransactionOrNotFound from './withFullTransactionOrNotFound';
@@ -32,11 +39,17 @@ type IOURequestStepCategoryOnyxProps = {
     /** The policy of the report */
     policy: OnyxEntry<Policy>;
 
+    /** The draft policy of the report */
+    policyDraft: OnyxEntry<Policy>;
+
     /** Collection of categories attached to a policy */
     policyCategories: OnyxEntry<PolicyCategories>;
 
+    /** Collection of draft categories attached to a policy */
+    policyCategoriesDraft: OnyxEntry<PolicyCategories>;
+
     /** Collection of tags attached to a policy */
-    policyTags: OnyxEntry<PolicyTagList>;
+    policyTags: OnyxEntry<PolicyTagLists>;
 
     /** The actions from the parent report */
     reportActions: OnyxEntry<ReportActions>;
@@ -50,19 +63,26 @@ type IOURequestStepCategoryProps = IOURequestStepCategoryOnyxProps &
     WithFullTransactionOrNotFoundProps<typeof SCREENS.MONEY_REQUEST.STEP_CATEGORY>;
 
 function IOURequestStepCategory({
-    report,
+    report: reportReal,
+    reportDraft,
     route: {
         params: {transactionID, backTo, action, iouType, reportActionID},
     },
     transaction,
     splitDraftTransaction,
-    policy,
+    policy: policyReal,
+    policyDraft,
     policyTags,
-    policyCategories,
+    policyCategories: policyCategoriesReal,
+    policyCategoriesDraft,
     reportActions,
     session,
 }: IOURequestStepCategoryProps) {
+    const report = reportReal ?? reportDraft;
+    const policy = policyReal ?? policyDraft;
+    const policyCategories = policyCategoriesReal ?? policyCategoriesDraft;
     const styles = useThemeStyles();
+    const theme = useTheme();
     const {translate} = useLocalize();
     const isEditing = action === CONST.IOU.ACTION.EDIT;
     const isEditingSplitBill = isEditing && iouType === CONST.IOU.TYPE.SPLIT;
@@ -71,27 +91,31 @@ function IOURequestStepCategory({
     // eslint-disable-next-line @typescript-eslint/prefer-nullish-coalescing
     const reportAction = reportActions?.[report?.parentReportActionID || reportActionID] ?? null;
 
-    // The transactionCategory can be an empty string, so to maintain the logic we'd like to keep it in this shape until utils refactor
-    // eslint-disable-next-line @typescript-eslint/prefer-nullish-coalescing
-    const shouldShowCategory = ReportUtils.isReportInGroupPolicy(report) && (!!transactionCategory || OptionsListUtils.hasEnabledOptions(Object.values(policyCategories ?? {})));
+    const shouldShowCategory =
+        (ReportUtils.isReportInGroupPolicy(report) || ReportUtils.isGroupPolicy(policy?.type ?? '')) &&
+        // The transactionCategory can be an empty string, so to maintain the logic we'd like to keep it in this shape until utils refactor
+        // eslint-disable-next-line @typescript-eslint/prefer-nullish-coalescing
+        (!!transactionCategory || OptionsListUtils.hasEnabledOptions(Object.values(policyCategories ?? {})));
 
     const isSplitBill = iouType === CONST.IOU.TYPE.SPLIT;
     const canEditSplitBill = isSplitBill && reportAction && session?.accountID === reportAction.actorAccountID && TransactionUtils.areRequiredFieldsEmpty(transaction);
     // eslint-disable-next-line rulesdir/no-negated-variables
-    const shouldShowNotFoundPage = !shouldShowCategory || (isEditing && (isSplitBill ? !canEditSplitBill : !ReportUtils.canEditMoneyRequest(reportAction)));
+    const shouldShowNotFoundPage = isEditing && (isSplitBill ? !canEditSplitBill : !ReportActionsUtils.isMoneyRequestAction(reportAction) || !ReportUtils.canEditMoneyRequest(reportAction));
 
     const fetchData = () => {
         if (policy && policyCategories) {
             return;
         }
 
-        PolicyActions.openDraftWorkspaceRequest(report?.policyID ?? '');
+        PolicyActions.openDraftWorkspaceRequest(report?.policyID ?? '-1');
     };
-    useNetwork({onReconnect: fetchData});
+    const {isOffline} = useNetwork({onReconnect: fetchData});
+    const isLoading = !isOffline && policyCategories === undefined;
+    const shouldShowEmptyState = !isLoading && !shouldShowCategory;
 
     useEffect(() => {
         fetchData();
-        // eslint-disable-next-line react-hooks/exhaustive-deps
+        // eslint-disable-next-line react-compiler/react-compiler, react-hooks/exhaustive-deps
     }, []);
 
     const navigateBack = () => {
@@ -121,7 +145,7 @@ function IOURequestStepCategory({
         IOU.setMoneyRequestCategory(transactionID, updatedCategory);
 
         if (action === CONST.IOU.ACTION.CATEGORIZE) {
-            Navigation.navigate(ROUTES.MONEY_REQUEST_STEP_CONFIRMATION.getRoute(action, iouType, transactionID, report?.reportID ?? ''));
+            Navigation.closeAndNavigate(ROUTES.MONEY_REQUEST_STEP_CONFIRMATION.getRoute(action, iouType, transactionID, report?.reportID ?? '-1'));
             return;
         }
 
@@ -135,14 +159,52 @@ function IOURequestStepCategory({
             shouldShowWrapper
             shouldShowNotFoundPage={shouldShowNotFoundPage}
             testID={IOURequestStepCategory.displayName}
-            includeSafeAreaPaddingBottom={false}
         >
-            <Text style={[styles.ph5, styles.pv3]}>{translate('iou.categorySelection')}</Text>
-            <CategoryPicker
-                selectedCategory={transactionCategory}
-                policyID={report?.policyID ?? ''}
-                onSubmit={updateCategory}
-            />
+            {isLoading && (
+                <ActivityIndicator
+                    size={CONST.ACTIVITY_INDICATOR_SIZE.LARGE}
+                    style={[styles.flex1]}
+                    color={theme.spinner}
+                />
+            )}
+            {shouldShowEmptyState && (
+                <View style={[styles.flex1]}>
+                    <WorkspaceEmptyStateSection
+                        shouldStyleAsCard={false}
+                        icon={Illustrations.EmptyStateExpenses}
+                        title={translate('workspace.categories.emptyCategories.title')}
+                        subtitle={translate('workspace.categories.emptyCategories.subtitle')}
+                        containerStyle={[styles.flex1, styles.justifyContentCenter]}
+                    />
+                    <FixedFooter style={[styles.mtAuto, styles.pt5]}>
+                        <Button
+                            large
+                            success
+                            style={[styles.w100]}
+                            onPress={() =>
+                                Navigation.navigate(
+                                    ROUTES.SETTINGS_CATEGORIES_ROOT.getRoute(
+                                        policy?.id ?? '-1',
+                                        ROUTES.MONEY_REQUEST_STEP_CATEGORY.getRoute(action, iouType, transactionID, report?.reportID ?? '-1', backTo, reportActionID),
+                                    ),
+                                )
+                            }
+                            text={translate('workspace.categories.editCategories')}
+                            pressOnEnter
+                        />
+                    </FixedFooter>
+                </View>
+            )}
+            {!shouldShowEmptyState && !isLoading && (
+                <>
+                    <Text style={[styles.ph5, styles.pv3]}>{translate('iou.categorySelection')}</Text>
+                    <CategoryPicker
+                        selectedCategory={transactionCategory}
+                        policyID={report?.policyID ?? policy?.id ?? '-1'}
+                        onSubmit={updateCategory}
+                    />
+                </>
+            )}
         </StepScreenWrapper>
     );
 }
@@ -152,18 +214,24 @@ IOURequestStepCategory.displayName = 'IOURequestStepCategory';
 const IOURequestStepCategoryWithOnyx = withOnyx<IOURequestStepCategoryProps, IOURequestStepCategoryOnyxProps>({
     splitDraftTransaction: {
         key: ({route}) => {
-            const transactionID = route?.params.transactionID ?? 0;
+            const transactionID = route?.params.transactionID ?? -1;
             return `${ONYXKEYS.COLLECTION.SPLIT_TRANSACTION_DRAFT}${transactionID}`;
         },
     },
     policy: {
-        key: ({report}) => `${ONYXKEYS.COLLECTION.POLICY}${report ? report.policyID : '0'}`,
+        key: ({report, transaction}) => `${ONYXKEYS.COLLECTION.POLICY}${IOU.getIOURequestPolicyID(transaction, report)}`,
+    },
+    policyDraft: {
+        key: ({reportDraft, transaction}) => `${ONYXKEYS.COLLECTION.POLICY_DRAFTS}${IOU.getIOURequestPolicyID(transaction, reportDraft)}`,
     },
     policyCategories: {
-        key: ({report}) => `${ONYXKEYS.COLLECTION.POLICY_CATEGORIES}${report ? report.policyID : '0'}`,
+        key: ({report, transaction}) => `${ONYXKEYS.COLLECTION.POLICY_CATEGORIES}${IOU.getIOURequestPolicyID(transaction, report)}`,
+    },
+    policyCategoriesDraft: {
+        key: ({reportDraft, transaction}) => `${ONYXKEYS.COLLECTION.POLICY_CATEGORIES_DRAFT}${IOU.getIOURequestPolicyID(transaction, reportDraft)}`,
     },
     policyTags: {
-        key: ({report}) => `${ONYXKEYS.COLLECTION.POLICY_TAGS}${report ? report.policyID : '0'}`,
+        key: ({report, transaction}) => `${ONYXKEYS.COLLECTION.POLICY_TAGS}${IOU.getIOURequestPolicyID(transaction, report)}`,
     },
     reportActions: {
         key: ({
@@ -172,7 +240,7 @@ const IOURequestStepCategoryWithOnyx = withOnyx<IOURequestStepCategoryProps, IOU
                 params: {action, iouType},
             },
         }) => {
-            let reportID = '0';
+            let reportID = '-1';
             if (action === CONST.IOU.ACTION.EDIT && report) {
                 if (iouType === CONST.IOU.TYPE.SPLIT) {
                     reportID = report.reportID;
diff --git a/src/pages/iou/request/step/IOURequestStepCompanyInfo.tsx b/src/pages/iou/request/step/IOURequestStepCompanyInfo.tsx
new file mode 100644
index 000000000000..d53940a4cfcb
--- /dev/null
+++ b/src/pages/iou/request/step/IOURequestStepCompanyInfo.tsx
@@ -0,0 +1,118 @@
+import {Str} from 'expensify-common';
+import React, {useCallback} from 'react';
+import {useOnyx} from 'react-native-onyx';
+import FormProvider from '@components/Form/FormProvider';
+import InputWrapper from '@components/Form/InputWrapper';
+import type {FormInputErrors, FormOnyxValues} from '@components/Form/types';
+import Text from '@components/Text';
+import TextInput from '@components/TextInput';
+import useAutoFocusInput from '@hooks/useAutoFocusInput';
+import useCurrentUserPersonalDetails from '@hooks/useCurrentUserPersonalDetails';
+import useLocalize from '@hooks/useLocalize';
+import usePolicy from '@hooks/usePolicy';
+import useThemeStyles from '@hooks/useThemeStyles';
+import * as CurrencyUtils from '@libs/CurrencyUtils';
+import playSound, {SOUNDS} from '@libs/Sound';
+import * as Url from '@libs/Url';
+import * as ValidationUtils from '@libs/ValidationUtils';
+import Navigation from '@navigation/Navigation';
+import * as IOU from '@userActions/IOU';
+import CONST from '@src/CONST';
+import ONYXKEYS from '@src/ONYXKEYS';
+import type SCREENS from '@src/SCREENS';
+import INPUT_IDS from '@src/types/form/MoneyRequestCompanyInfoForm';
+import StepScreenWrapper from './StepScreenWrapper';
+import withFullTransactionOrNotFound from './withFullTransactionOrNotFound';
+import type {WithFullTransactionOrNotFoundProps} from './withFullTransactionOrNotFound';
+import withWritableReportOrNotFound from './withWritableReportOrNotFound';
+import type {WithWritableReportOrNotFoundProps} from './withWritableReportOrNotFound';
+
+type IOURequestStepCompanyInfoProps = WithWritableReportOrNotFoundProps<typeof SCREENS.MONEY_REQUEST.STEP_COMPANY_INFO> &
+    WithFullTransactionOrNotFoundProps<typeof SCREENS.MONEY_REQUEST.STEP_COMPANY_INFO>;
+
+function IOURequestStepCompanyInfo({route, report, transaction}: IOURequestStepCompanyInfoProps) {
+    const {backTo} = route.params;
+
+    const styles = useThemeStyles();
+    const {translate} = useLocalize();
+    const {inputCallbackRef} = useAutoFocusInput();
+    const currentUserPersonalDetails = useCurrentUserPersonalDetails();
+
+    const policy = usePolicy(IOU.getIOURequestPolicyID(transaction, report));
+    const [policyCategories] = useOnyx(`${ONYXKEYS.COLLECTION.POLICY_CATEGORIES}${IOU.getIOURequestPolicyID(transaction, report)}`);
+    const [policyTags] = useOnyx(`${ONYXKEYS.COLLECTION.POLICY_TAGS}${IOU.getIOURequestPolicyID(transaction, report)}`);
+
+    const formattedAmount = CurrencyUtils.convertToDisplayString(Math.abs(transaction?.amount ?? 0), transaction?.currency);
+
+    const validate = useCallback(
+        (values: FormOnyxValues<typeof ONYXKEYS.FORMS.MONEY_REQUEST_COMPANY_INFO_FORM>): FormInputErrors<typeof ONYXKEYS.FORMS.MONEY_REQUEST_COMPANY_INFO_FORM> => {
+            const errors = ValidationUtils.getFieldRequiredErrors(values, [INPUT_IDS.COMPANY_NAME, INPUT_IDS.COMPANY_WEBSITE]);
+
+            if (values.companyWebsite) {
+                if (!ValidationUtils.isValidWebsite(values.companyWebsite)) {
+                    errors.companyWebsite = translate('bankAccount.error.website');
+                } else {
+                    const domain = Url.extractUrlDomain(values.companyWebsite);
+
+                    if (!domain || !Str.isValidDomainName(domain)) {
+                        errors.companyWebsite = translate('iou.invalidDomainError');
+                    } else if (ValidationUtils.isPublicDomain(domain)) {
+                        errors.companyWebsite = translate('iou.publicDomainError');
+                    }
+                }
+            }
+
+            return errors;
+        },
+        [translate],
+    );
+
+    const submit = (values: FormOnyxValues<typeof ONYXKEYS.FORMS.MONEY_REQUEST_COMPANY_INFO_FORM>) => {
+        playSound(SOUNDS.DONE);
+        IOU.sendInvoice(currentUserPersonalDetails.accountID, transaction, report, undefined, policy, policyTags, policyCategories, values.companyName, values.companyWebsite);
+    };
+
+    return (
+        <StepScreenWrapper
+            headerTitle={translate('iou.companyInfo')}
+            onBackButtonPress={() => Navigation.goBack(backTo)}
+            shouldShowWrapper
+            testID={IOURequestStepCompanyInfo.displayName}
+        >
+            <Text style={[styles.textNormalThemeText, styles.ph5]}>{translate('iou.companyInfoDescription')}</Text>
+            <FormProvider
+                style={[styles.flexGrow1, styles.ph5]}
+                formID={ONYXKEYS.FORMS.MONEY_REQUEST_COMPANY_INFO_FORM}
+                onSubmit={submit}
+                validate={validate}
+                submitButtonText={translate('iou.sendInvoice', {amount: formattedAmount})}
+                enabledWhenOffline
+            >
+                <InputWrapper
+                    InputComponent={TextInput}
+                    inputID={INPUT_IDS.COMPANY_NAME}
+                    name={INPUT_IDS.COMPANY_NAME}
+                    label={translate('iou.yourCompanyName')}
+                    accessibilityLabel={translate('iou.yourCompanyName')}
+                    role={CONST.ROLE.PRESENTATION}
+                    ref={inputCallbackRef}
+                    containerStyles={styles.mv4}
+                />
+                <InputWrapper
+                    InputComponent={TextInput}
+                    inputID={INPUT_IDS.COMPANY_WEBSITE}
+                    name={INPUT_IDS.COMPANY_WEBSITE}
+                    inputMode={CONST.INPUT_MODE.URL}
+                    label={translate('iou.yourCompanyWebsite')}
+                    accessibilityLabel={translate('iou.yourCompanyWebsite')}
+                    role={CONST.ROLE.PRESENTATION}
+                    hint={translate('iou.yourCompanyWebsiteNote')}
+                />
+            </FormProvider>
+        </StepScreenWrapper>
+    );
+}
+
+IOURequestStepCompanyInfo.displayName = 'IOURequestStepCompanyInfo';
+
+export default withWritableReportOrNotFound(withFullTransactionOrNotFound(IOURequestStepCompanyInfo));
diff --git a/src/pages/iou/request/step/IOURequestStepConfirmation.tsx b/src/pages/iou/request/step/IOURequestStepConfirmation.tsx
index e33e4d8fb763..c43d537c5bfc 100644
--- a/src/pages/iou/request/step/IOURequestStepConfirmation.tsx
+++ b/src/pages/iou/request/step/IOURequestStepConfirmation.tsx
@@ -2,48 +2,60 @@ import React, {useCallback, useEffect, useMemo, useRef, useState} from 'react';
 import {View} from 'react-native';
 import type {OnyxEntry} from 'react-native-onyx';
 import {withOnyx} from 'react-native-onyx';
+import FullScreenLoadingIndicator from '@components/FullscreenLoadingIndicator';
 import HeaderWithBackButton from '@components/HeaderWithBackButton';
 import * as Expensicons from '@components/Icon/Expensicons';
+import LocationPermissionModal from '@components/LocationPermissionModal';
 import MoneyRequestConfirmationList from '@components/MoneyRequestConfirmationList';
 import {usePersonalDetails} from '@components/OnyxProvider';
 import ScreenWrapper from '@components/ScreenWrapper';
 import useCurrentUserPersonalDetails from '@hooks/useCurrentUserPersonalDetails';
+import useFetchRoute from '@hooks/useFetchRoute';
 import useLocalize from '@hooks/useLocalize';
 import useNetwork from '@hooks/useNetwork';
 import useThemeStyles from '@hooks/useThemeStyles';
 import useWindowDimensions from '@hooks/useWindowDimensions';
-import {openDraftWorkspaceRequest} from '@libs/actions/Policy';
 import * as DeviceCapabilities from '@libs/DeviceCapabilities';
+import * as FileUtils from '@libs/fileDownload/FileUtils';
 import getCurrentPosition from '@libs/getCurrentPosition';
 import * as IOUUtils from '@libs/IOUUtils';
 import Log from '@libs/Log';
 import Navigation from '@libs/Navigation/Navigation';
 import * as OptionsListUtils from '@libs/OptionsListUtils';
+import * as PolicyUtils from '@libs/PolicyUtils';
 import * as ReportUtils from '@libs/ReportUtils';
+import playSound, {SOUNDS} from '@libs/Sound';
 import * as TransactionUtils from '@libs/TransactionUtils';
 import * as IOU from '@userActions/IOU';
+import {openDraftWorkspaceRequest} from '@userActions/Policy/Policy';
 import CONST from '@src/CONST';
 import ONYXKEYS from '@src/ONYXKEYS';
 import ROUTES from '@src/ROUTES';
 import type SCREENS from '@src/SCREENS';
-import type {Policy, PolicyCategories, PolicyTagList} from '@src/types/onyx';
+import type {Policy, PolicyCategories, PolicyTagLists} from '@src/types/onyx';
 import type {Participant} from '@src/types/onyx/IOU';
 import type {PaymentMethodType} from '@src/types/onyx/OriginalMessage';
 import type {Receipt} from '@src/types/onyx/Transaction';
 import type {WithFullTransactionOrNotFoundProps} from './withFullTransactionOrNotFound';
 import withFullTransactionOrNotFound from './withFullTransactionOrNotFound';
-import withWritableReportOrNotFound from './withWritableReportOrNotFound';
 import type {WithWritableReportOrNotFoundProps} from './withWritableReportOrNotFound';
+import withWritableReportOrNotFound from './withWritableReportOrNotFound';
 
 type IOURequestStepConfirmationOnyxProps = {
     /** The policy of the report */
     policy: OnyxEntry<Policy>;
 
+    /** The draft policy of the report */
+    policyDraft: OnyxEntry<Policy>;
+
     /** The category configuration of the report's policy */
     policyCategories: OnyxEntry<PolicyCategories>;
 
+    /** The draft category configuration of the report's policy */
+    policyCategoriesDraft: OnyxEntry<PolicyCategories>;
+
     /** The tag configuration of the report's policy */
-    policyTags: OnyxEntry<PolicyTagList>;
+    policyTags: OnyxEntry<PolicyTagLists>;
 };
 
 type IOURequestStepConfirmationProps = IOURequestStepConfirmationOnyxProps &
@@ -51,33 +63,47 @@ type IOURequestStepConfirmationProps = IOURequestStepConfirmationOnyxProps &
     WithFullTransactionOrNotFoundProps<typeof SCREENS.MONEY_REQUEST.STEP_CONFIRMATION>;
 
 function IOURequestStepConfirmation({
-    policy,
+    policy: policyReal,
+    policyDraft,
     policyTags,
-    policyCategories,
-    report,
+    policyCategories: policyCategoriesReal,
+    policyCategoriesDraft,
+    report: reportReal,
+    reportDraft,
     route: {
-        params: {iouType, reportID, transactionID, action},
+        params: {iouType, reportID, transactionID, action, participantsAutoAssigned: participantsAutoAssignedFromRoute},
     },
     transaction,
 }: IOURequestStepConfirmationProps) {
     const currentUserPersonalDetails = useCurrentUserPersonalDetails();
     const personalDetails = usePersonalDetails() || CONST.EMPTY_OBJECT;
 
+    const report = reportReal ?? reportDraft;
+    const policy = policyReal ?? policyDraft;
+    const policyCategories = policyCategoriesReal ?? policyCategoriesDraft;
+
     const styles = useThemeStyles();
     const {translate} = useLocalize();
     const {windowWidth} = useWindowDimensions();
     const {isOffline} = useNetwork();
-    const [receiptFile, setReceiptFile] = useState<Receipt>();
+    const [startLocationPermissionFlow, setStartLocationPermissionFlow] = useState(false);
+    const [selectedParticipantList, setSelectedParticipantList] = useState<Participant[]>([]);
+
+    const [receiptFile, setReceiptFile] = useState<OnyxEntry<Receipt>>();
+    const requestType = TransactionUtils.getRequestType(transaction);
+    const isDistanceRequest = requestType === CONST.IOU.REQUEST_TYPE.DISTANCE;
 
     const receiptFilename = transaction?.filename;
     const receiptPath = transaction?.receipt?.source;
     const receiptType = transaction?.receipt?.type;
-    const foreignTaxDefault = policy?.taxRates?.foreignTaxDefault;
-    const transactionTaxCode = transaction?.taxRate ? transaction.taxRate.data?.code : foreignTaxDefault;
-    const transactionTaxAmount = transaction?.taxAmount;
+    const customUnitRateID = TransactionUtils.getRateID(transaction) ?? '';
+    const defaultTaxCode = TransactionUtils.getDefaultTaxCode(policy, transaction);
+    const transactionTaxCode = (transaction?.taxCode ? transaction?.taxCode : defaultTaxCode) ?? '';
+    const transactionTaxAmount = transaction?.taxAmount ?? 0;
     const isSharingTrackExpense = action === CONST.IOU.ACTION.SHARE;
     const isCategorizingTrackExpense = action === CONST.IOU.ACTION.CATEGORIZE;
     const isSubmittingFromTrackExpense = action === CONST.IOU.ACTION.SUBMIT;
+    const isMovingTransactionFromTrackExpense = IOUUtils.isMovingTransactionFromTrackExpense(action);
     const payeePersonalDetails = useMemo(() => {
         if (personalDetails?.[transaction?.splitPayerAccountIDs?.[0] ?? -1]) {
             return personalDetails?.[transaction?.splitPayerAccountIDs?.[0] ?? -1];
@@ -94,7 +120,7 @@ function IOURequestStepConfirmation({
         };
     }, [personalDetails, transaction?.participants, transaction?.splitPayerAccountIDs]);
 
-    const requestType = TransactionUtils.getRequestType(transaction);
+    const gpsRequired = transaction?.amount === 0 && iouType !== CONST.IOU.TYPE.SPLIT && receiptFile;
 
     const headerTitle = useMemo(() => {
         if (isCategorizingTrackExpense) {
@@ -124,22 +150,21 @@ function IOURequestStepConfirmation({
     const participants = useMemo(
         () =>
             transaction?.participants?.map((participant) => {
-                const participantAccountID = participant.accountID ?? 0;
-
                 if (participant.isSender && iouType === CONST.IOU.TYPE.INVOICE) {
                     return participant;
                 }
-
-                return participantAccountID ? OptionsListUtils.getParticipantsOption(participant, personalDetails) : OptionsListUtils.getReportOption(participant);
+                return participant.accountID ? OptionsListUtils.getParticipantsOption(participant, personalDetails) : OptionsListUtils.getReportOption(participant);
             }) ?? [],
         [transaction?.participants, personalDetails, iouType],
     );
-    const isPolicyExpenseChat = useMemo(() => ReportUtils.isPolicyExpenseChat(ReportUtils.getRootParentReport(report)), [report]);
+    const isPolicyExpenseChat = useMemo(() => participants?.some((participant) => participant.isPolicyExpenseChat), [participants]);
     const formHasBeenSubmitted = useRef(false);
 
+    useFetchRoute(transaction, transaction?.comment?.waypoints, action);
+
     useEffect(() => {
         const policyExpenseChat = participants?.find((participant) => participant.isPolicyExpenseChat);
-        if (policyExpenseChat?.policyID) {
+        if (policyExpenseChat?.policyID && policy?.pendingAction !== CONST.RED_BRICK_ROAD_PENDING_ACTION.ADD) {
             openDraftWorkspaceRequest(policyExpenseChat.policyID);
         }
     }, [isOffline, participants, transaction?.billable, policy, transactionID]);
@@ -167,18 +192,25 @@ function IOURequestStepConfirmation({
         }
         IOU.setMoneyRequestCategory(transactionID, defaultCategory);
         // Prevent resetting to default when unselect category
-        // eslint-disable-next-line react-hooks/exhaustive-deps
+        // eslint-disable-next-line react-compiler/react-compiler, react-hooks/exhaustive-deps
     }, [transactionID, requestType, defaultCategory]);
 
     const navigateBack = useCallback(() => {
+        // If the action is categorize and there's no policies other than personal one, we simply call goBack(), i.e: dismiss the whole flow together
+        // We don't need to subscribe to policy_ collection as we only need to check on the latest collection value
+        if (action === CONST.IOU.ACTION.CATEGORIZE && PolicyUtils.hasNoPolicyOtherThanPersonalType()) {
+            Navigation.goBack();
+            return;
+        }
         // If there is not a report attached to the IOU with a reportID, then the participants were manually selected and the user needs taken
         // back to the participants step
-        if (!transaction?.participantsAutoAssigned) {
-            Navigation.goBack(ROUTES.MONEY_REQUEST_STEP_PARTICIPANTS.getRoute(iouType, transactionID, reportID, undefined, action));
+        if (!transaction?.participantsAutoAssigned && participantsAutoAssignedFromRoute !== 'true') {
+            // eslint-disable-next-line @typescript-eslint/prefer-nullish-coalescing
+            Navigation.goBack(ROUTES.MONEY_REQUEST_STEP_PARTICIPANTS.getRoute(iouType, transactionID, transaction?.reportID || reportID, undefined, action));
             return;
         }
         IOUUtils.navigateToStartMoneyRequestStep(requestType, iouType, transactionID, reportID, action);
-    }, [transaction, iouType, requestType, transactionID, reportID, action]);
+    }, [transaction, iouType, requestType, transactionID, reportID, action, participantsAutoAssignedFromRoute]);
 
     const navigateToAddReceipt = useCallback(() => {
         Navigation.navigate(ROUTES.MONEY_REQUEST_STEP_SCAN.getRoute(action, iouType, transactionID, reportID, Navigation.getActiveRouteWithoutParams()));
@@ -190,7 +222,7 @@ function IOURequestStepConfirmation({
     // skip this in case user is moving the transaction as the receipt path will be valid in that case
     useEffect(() => {
         // eslint-disable-next-line @typescript-eslint/prefer-nullish-coalescing
-        const isLocalFile = typeof receiptPath === 'number' || receiptPath?.startsWith('blob:') || receiptPath?.startsWith('file:') || receiptPath?.startsWith('/');
+        const isLocalFile = FileUtils.isLocalFile(receiptPath);
 
         if (!isLocalFile) {
             setReceiptFile(transaction?.receipt);
@@ -242,7 +274,7 @@ function IOURequestStepConfirmation({
     );
 
     const trackExpense = useCallback(
-        (selectedParticipants: Participant[], trimmedComment: string, receiptObj?: Receipt, gpsPoints?: IOU.GpsPoint) => {
+        (selectedParticipants: Participant[], trimmedComment: string, receiptObj?: OnyxEntry<Receipt>, gpsPoints?: IOU.GpsPoint) => {
             if (!report || !transaction) {
                 return;
             }
@@ -266,7 +298,7 @@ function IOURequestStepConfirmation({
                 policyTags,
                 policyCategories,
                 gpsPoints,
-                Object.keys(transaction?.comment?.waypoints ?? {}).length ? TransactionUtils.getValidWaypoints(transaction.comment.waypoints, true) : undefined,
+                Object.keys(transaction?.comment?.waypoints ?? {}).length ? TransactionUtils.getValidWaypoints(transaction.comment?.waypoints, true) : undefined,
                 action,
                 transaction.actionableWhisperReportActionID,
                 transaction.linkedTrackedExpenseReportAction,
@@ -277,34 +309,51 @@ function IOURequestStepConfirmation({
     );
 
     const createDistanceRequest = useCallback(
-        (selectedParticipants: Participant[], trimmedComment: string, customUnitRateID: string) => {
+        (selectedParticipants: Participant[], trimmedComment: string) => {
             if (!transaction) {
                 return;
             }
             IOU.createDistanceRequest(
                 report,
-                selectedParticipants[0],
+                selectedParticipants,
                 trimmedComment,
                 transaction.created,
                 transaction.category,
                 transaction.tag,
+                transactionTaxCode,
+                transactionTaxAmount,
                 transaction.amount,
                 transaction.currency,
                 transaction.merchant,
                 transaction.billable,
-                TransactionUtils.getValidWaypoints(transaction.comment.waypoints, true),
+                TransactionUtils.getValidWaypoints(transaction.comment?.waypoints, true),
                 policy,
                 policyTags,
                 policyCategories,
                 customUnitRateID,
+                currentUserPersonalDetails.login,
+                currentUserPersonalDetails.accountID,
+                transaction.splitShares,
+                iouType,
             );
         },
-        [policy, policyCategories, policyTags, report, transaction],
+        [policy, policyCategories, policyTags, report, transaction, transactionTaxCode, transactionTaxAmount, customUnitRateID, currentUserPersonalDetails, iouType],
     );
 
     const createTransaction = useCallback(
-        (selectedParticipants: Participant[]) => {
-            const trimmedComment = (transaction?.comment.comment ?? '').trim();
+        (selectedParticipants: Participant[], locationPermissionGranted = false) => {
+            let splitParticipants = selectedParticipants;
+
+            // Filter out participants with an amount equal to O
+            if (iouType === CONST.IOU.TYPE.SPLIT && transaction?.splitShares) {
+                const participantsWithAmount = Object.keys(transaction.splitShares ?? {})
+                    .filter((accountID: string): boolean => (transaction?.splitShares?.[Number(accountID)]?.amount ?? 0) > 0)
+                    .map((accountID) => Number(accountID));
+                splitParticipants = selectedParticipants.filter((participant) =>
+                    participantsWithAmount.includes(participant.isPolicyExpenseChat ? participant?.ownerAccountID ?? -1 : participant.accountID ?? -1),
+                );
+            }
+            const trimmedComment = transaction?.comment?.comment?.trim() ?? '';
 
             // Don't let the form be submitted multiple times while the navigator is waiting to take the user to a different page
             if (formHasBeenSubmitted.current) {
@@ -312,6 +361,12 @@ function IOURequestStepConfirmation({
             }
 
             formHasBeenSubmitted.current = true;
+            playSound(SOUNDS.DONE);
+
+            if (iouType !== CONST.IOU.TYPE.TRACK && isDistanceRequest && !isMovingTransactionFromTrackExpense) {
+                createDistanceRequest(iouType === CONST.IOU.TYPE.SPLIT ? splitParticipants : selectedParticipants, trimmedComment);
+                return;
+            }
 
             // If we have a receipt let's start the split expense by creating only the action, the transaction, and the group DM if needed
             if (iouType === CONST.IOU.TYPE.SPLIT && receiptFile) {
@@ -327,6 +382,8 @@ function IOURequestStepConfirmation({
                         category: transaction.category,
                         tag: transaction.tag,
                         currency: transaction.currency,
+                        taxCode: transactionTaxCode,
+                        taxAmount: transactionTaxAmount,
                     });
                 }
                 return;
@@ -337,7 +394,7 @@ function IOURequestStepConfirmation({
             if (iouType === CONST.IOU.TYPE.SPLIT && !transaction?.isFromGlobalCreate) {
                 if (currentUserPersonalDetails.login && !!transaction) {
                     IOU.splitBill({
-                        participants: selectedParticipants,
+                        participants: splitParticipants,
                         currentUserLogin: currentUserPersonalDetails.login,
                         currentUserAccountID: currentUserPersonalDetails.accountID,
                         amount: transaction.amount,
@@ -350,7 +407,10 @@ function IOURequestStepConfirmation({
                         existingSplitChatReportID: report?.reportID,
                         billable: transaction.billable,
                         iouRequestType: transaction.iouRequestType,
+                        splitShares: transaction.splitShares,
                         splitPayerAccountIDs: transaction.splitPayerAccountIDs ?? [],
+                        taxCode: transactionTaxCode,
+                        taxAmount: transactionTaxAmount,
                     });
                 }
                 return;
@@ -360,7 +420,7 @@ function IOURequestStepConfirmation({
             if (iouType === CONST.IOU.TYPE.SPLIT) {
                 if (currentUserPersonalDetails.login && !!transaction) {
                     IOU.splitBillAndOpenReport({
-                        participants: selectedParticipants,
+                        participants: splitParticipants,
                         currentUserLogin: currentUserPersonalDetails.login,
                         currentUserAccountID: currentUserPersonalDetails.accountID,
                         amount: transaction.amount,
@@ -372,7 +432,10 @@ function IOURequestStepConfirmation({
                         tag: transaction.tag,
                         billable: !!transaction.billable,
                         iouRequestType: transaction.iouRequestType,
+                        splitShares: transaction.splitShares,
                         splitPayerAccountIDs: transaction.splitPayerAccountIDs,
+                        taxCode: transactionTaxCode,
+                        taxAmount: transactionTaxAmount,
                     });
                 }
                 return;
@@ -386,7 +449,7 @@ function IOURequestStepConfirmation({
             if (iouType === CONST.IOU.TYPE.TRACK || isCategorizingTrackExpense || isSharingTrackExpense) {
                 if (receiptFile && transaction) {
                     // If the transaction amount is zero, then the money is being requested through the "Scan" flow and the GPS coordinates need to be included.
-                    if (transaction.amount === 0 && !isSharingTrackExpense && !isCategorizingTrackExpense) {
+                    if (transaction.amount === 0 && !isSharingTrackExpense && !isCategorizingTrackExpense && locationPermissionGranted) {
                         getCurrentPosition(
                             (successData) => {
                                 trackExpense(selectedParticipants, trimmedComment, receiptFile, {
@@ -400,11 +463,8 @@ function IOURequestStepConfirmation({
                                 trackExpense(selectedParticipants, trimmedComment, receiptFile);
                             },
                             {
-                                // It's OK to get a cached location that is up to an hour old because the only accuracy needed is the country the user is in
-                                maximumAge: 1000 * 60 * 60,
-
-                                // 15 seconds, don't wait too long because the server can always fall back to using the IP address
-                                timeout: 15000,
+                                maximumAge: CONST.GPS.MAX_AGE,
+                                timeout: CONST.GPS.TIMEOUT,
                             },
                         );
                         return;
@@ -420,7 +480,7 @@ function IOURequestStepConfirmation({
 
             if (receiptFile && !!transaction) {
                 // If the transaction amount is zero, then the money is being requested through the "Scan" flow and the GPS coordinates need to be included.
-                if (transaction.amount === 0 && !isSharingTrackExpense && !isCategorizingTrackExpense) {
+                if (transaction.amount === 0 && !isSharingTrackExpense && !isCategorizingTrackExpense && locationPermissionGranted) {
                     getCurrentPosition(
                         (successData) => {
                             requestMoney(selectedParticipants, trimmedComment, receiptFile, {
@@ -434,11 +494,8 @@ function IOURequestStepConfirmation({
                             requestMoney(selectedParticipants, trimmedComment, receiptFile);
                         },
                         {
-                            // It's OK to get a cached location that is up to an hour old because the only accuracy needed is the country the user is in
-                            maximumAge: 1000 * 60 * 60,
-
-                            // 15 seconds, don't wait too long because the server can always fall back to using the IP address
-                            timeout: 15000,
+                            maximumAge: CONST.GPS.MAX_AGE,
+                            timeout: CONST.GPS.TIMEOUT,
                         },
                     );
                     return;
@@ -449,12 +506,6 @@ function IOURequestStepConfirmation({
                 return;
             }
 
-            if (requestType === CONST.IOU.REQUEST_TYPE.DISTANCE && !IOUUtils.isMovingTransactionFromTrackExpense(action)) {
-                const customUnitRateID = TransactionUtils.getRateID(transaction) ?? '';
-                createDistanceRequest(selectedParticipants, trimmedComment, customUnitRateID);
-                return;
-            }
-
             requestMoney(selectedParticipants, trimmedComment);
         },
         [
@@ -462,7 +513,7 @@ function IOURequestStepConfirmation({
             report,
             iouType,
             receiptFile,
-            requestType,
+            isDistanceRequest,
             requestMoney,
             currentUserPersonalDetails.login,
             currentUserPersonalDetails.accountID,
@@ -470,10 +521,12 @@ function IOURequestStepConfirmation({
             createDistanceRequest,
             isSharingTrackExpense,
             isCategorizingTrackExpense,
-            action,
+            isMovingTransactionFromTrackExpense,
             policy,
             policyTags,
             policyCategories,
+            transactionTaxAmount,
+            transactionTaxCode,
         ],
     );
 
@@ -483,9 +536,7 @@ function IOURequestStepConfirmation({
     const sendMoney = useCallback(
         (paymentMethod: PaymentMethodType | undefined) => {
             const currency = transaction?.currency;
-
-            const trimmedComment = transaction?.comment?.comment ? transaction.comment.comment.trim() : '';
-
+            const trimmedComment = transaction?.comment?.comment?.trim() ?? '';
             const participant = participants?.[0];
 
             if (!participant || !transaction?.amount || !currency) {
@@ -504,18 +555,25 @@ function IOURequestStepConfirmation({
         [transaction?.amount, transaction?.comment, transaction?.currency, participants, currentUserPersonalDetails.accountID, report],
     );
 
-    const addNewParticipant = (option: Participant) => {
-        const newParticipants = transaction?.participants?.map((participant) => {
-            if (participant.accountID === option.accountID) {
-                return {...participant, selected: !participant.selected};
-            }
-            return participant;
-        });
-        IOU.setMoneyRequestParticipants(transactionID, newParticipants);
-    };
+    const setBillable = useCallback(
+        (billable: boolean) => {
+            IOU.setMoneyRequestBillable(transactionID, billable);
+        },
+        [transactionID],
+    );
+
+    // This loading indicator is shown because the transaction originalCurrency is being updated later than the component mounts.
+    // To prevent the component from rendering with the wrong currency, we show a loading indicator until the correct currency is set.
+    const isLoading = !!transaction?.originalCurrency;
 
-    const setBillable = (billable: boolean) => {
-        IOU.setMoneyRequestBillable(transactionID, billable);
+    const onConfirm = (listOfParticipants: Participant[]) => {
+        setSelectedParticipantList(listOfParticipants);
+        if (gpsRequired) {
+            setStartLocationPermissionFlow(true);
+            return;
+        }
+
+        createTransaction(listOfParticipants);
     };
 
     return (
@@ -529,7 +587,9 @@ function IOURequestStepConfirmation({
                     <HeaderWithBackButton
                         title={headerTitle}
                         onBackButtonPress={navigateBack}
-                        shouldShowThreeDotsButton={requestType === CONST.IOU.REQUEST_TYPE.MANUAL && (iouType === CONST.IOU.TYPE.SUBMIT || iouType === CONST.IOU.TYPE.TRACK)}
+                        shouldShowThreeDotsButton={
+                            requestType === CONST.IOU.REQUEST_TYPE.MANUAL && (iouType === CONST.IOU.TYPE.SUBMIT || iouType === CONST.IOU.TYPE.TRACK) && !isMovingTransactionFromTrackExpense
+                        }
                         threeDotsAnchorPosition={styles.threeDotsPopoverOffsetNoCloseButton(windowWidth)}
                         threeDotsMenuItems={[
                             {
@@ -539,38 +599,40 @@ function IOURequestStepConfirmation({
                             },
                         ]}
                     />
+                    {isLoading && <FullScreenLoadingIndicator />}
+                    {gpsRequired && (
+                        <LocationPermissionModal
+                            startPermissionFlow={startLocationPermissionFlow}
+                            resetPermissionFlow={() => setStartLocationPermissionFlow(false)}
+                            onGrant={() => createTransaction(selectedParticipantList, true)}
+                            onDeny={() => createTransaction(selectedParticipantList, false)}
+                        />
+                    )}
                     <MoneyRequestConfirmationList
                         transaction={transaction}
-                        hasMultipleParticipants={iouType === CONST.IOU.TYPE.SPLIT}
                         selectedParticipants={participants}
                         iouAmount={Math.abs(transaction?.amount ?? 0)}
-                        iouComment={transaction?.comment.comment ?? ''}
+                        iouComment={transaction?.comment?.comment ?? ''}
                         iouCurrencyCode={transaction?.currency}
                         iouIsBillable={transaction?.billable}
                         onToggleBillable={setBillable}
                         iouCategory={transaction?.category}
-                        onConfirm={createTransaction}
+                        onConfirm={onConfirm}
                         onSendMoney={sendMoney}
-                        onSelectParticipant={addNewParticipant}
                         receiptPath={receiptPath}
                         receiptFilename={receiptFilename}
                         iouType={iouType}
                         reportID={reportID}
                         isPolicyExpenseChat={isPolicyExpenseChat}
-                        // The participants can only be modified when the action is initiated from directly within a group chat and not the floating-action-button.
-                        // This is because when there is a group of people, say they are on a trip, and you have some shared expenses with some of the people,
-                        // but not all of them (maybe someone skipped out on dinner). Then it's nice to be able to select/deselect people from the group chat bill
-                        // split rather than forcing the user to create a new group, just for that expense. The reportID is empty, when the action was initiated from
-                        // the floating-action-button (since it is something that exists outside the context of a report).
-                        canModifyParticipants={!transaction?.isFromGlobalCreate}
-                        policyID={report?.policyID}
+                        policyID={IOU.getIOURequestPolicyID(transaction, report)}
                         bankAccountRoute={ReportUtils.getBankAccountRoute(report)}
                         iouMerchant={transaction?.merchant}
                         iouCreated={transaction?.created}
-                        isDistanceRequest={requestType === CONST.IOU.REQUEST_TYPE.DISTANCE}
-                        shouldShowSmartScanFields={IOUUtils.isMovingTransactionFromTrackExpense(action) ? transaction?.amount !== 0 : requestType !== CONST.IOU.REQUEST_TYPE.SCAN}
+                        isDistanceRequest={isDistanceRequest}
+                        shouldShowSmartScanFields={isMovingTransactionFromTrackExpense ? transaction?.amount !== 0 : requestType !== CONST.IOU.REQUEST_TYPE.SCAN}
                         action={action}
                         payeePersonalDetails={payeePersonalDetails}
+                        shouldPlaySound={false}
                     />
                 </View>
             )}
@@ -584,9 +646,15 @@ const IOURequestStepConfirmationWithOnyx = withOnyx<IOURequestStepConfirmationPr
     policy: {
         key: ({report, transaction}) => `${ONYXKEYS.COLLECTION.POLICY}${IOU.getIOURequestPolicyID(transaction, report)}`,
     },
+    policyDraft: {
+        key: ({reportDraft, transaction}) => `${ONYXKEYS.COLLECTION.POLICY_DRAFTS}${IOU.getIOURequestPolicyID(transaction, reportDraft)}`,
+    },
     policyCategories: {
         key: ({report, transaction}) => `${ONYXKEYS.COLLECTION.POLICY_CATEGORIES}${IOU.getIOURequestPolicyID(transaction, report)}`,
     },
+    policyCategoriesDraft: {
+        key: ({reportDraft, transaction}) => `${ONYXKEYS.COLLECTION.POLICY_CATEGORIES_DRAFT}${IOU.getIOURequestPolicyID(transaction, reportDraft)}`,
+    },
     policyTags: {
         key: ({report, transaction}) => `${ONYXKEYS.COLLECTION.POLICY_TAGS}${IOU.getIOURequestPolicyID(transaction, report)}`,
     },
diff --git a/src/pages/iou/request/step/IOURequestStepCurrency.tsx b/src/pages/iou/request/step/IOURequestStepCurrency.tsx
index 8669563f3b9f..74600a5f3650 100644
--- a/src/pages/iou/request/step/IOURequestStepCurrency.tsx
+++ b/src/pages/iou/request/step/IOURequestStepCurrency.tsx
@@ -61,7 +61,8 @@ function IOURequestStepCurrency({
         if (pageIndex !== 'confirm') {
             IOU.setMoneyRequestCurrency(transactionID, option.currencyCode, action === CONST.IOU.ACTION.EDIT);
         }
-        navigateBack(option.currencyCode);
+
+        Navigation.setNavigationActionToMicrotaskQueue(() => navigateBack(option.currencyCode));
     };
 
     return (
@@ -93,7 +94,7 @@ IOURequestStepCurrency.displayName = 'IOURequestStepCurrency';
 const IOURequestStepCurrencyWithOnyx = withOnyx<IOURequestStepCurrencyProps, IOURequestStepCurrencyOnyxProps>({
     draftTransaction: {
         key: ({route}) => {
-            const transactionID = route?.params?.transactionID ?? 0;
+            const transactionID = route?.params?.transactionID ?? -1;
             return `${ONYXKEYS.COLLECTION.TRANSACTION_DRAFT}${transactionID}`;
         },
     },
diff --git a/src/pages/iou/request/step/IOURequestStepDate.tsx b/src/pages/iou/request/step/IOURequestStepDate.tsx
index 26ea529cb108..b5b7b1d02cea 100644
--- a/src/pages/iou/request/step/IOURequestStepDate.tsx
+++ b/src/pages/iou/request/step/IOURequestStepDate.tsx
@@ -40,7 +40,7 @@ type IOURequestStepDateOnyxProps = {
     policyCategories: OnyxEntry<OnyxTypes.PolicyCategories>;
 
     /** Collection of tags attached to a policy */
-    policyTags: OnyxEntry<OnyxTypes.PolicyTagList>;
+    policyTags: OnyxEntry<OnyxTypes.PolicyTagLists>;
 };
 
 type IOURequestStepDateProps = IOURequestStepDateOnyxProps &
@@ -70,11 +70,12 @@ function IOURequestStepDate({
     const isEditing = action === CONST.IOU.ACTION.EDIT;
     // In the split flow, when editing we use SPLIT_TRANSACTION_DRAFT to save draft value
     const isEditingSplitBill = iouType === CONST.IOU.TYPE.SPLIT && isEditing;
-    const currentCreated = isEditingSplitBill && !lodashIsEmpty(splitDraftTransaction) ? TransactionUtils.getCreated(splitDraftTransaction) : TransactionUtils.getCreated(transaction);
-    const parentReportAction = reportActions?.[(isEditingSplitBill ? reportActionID : report?.parentReportActionID) ?? 0];
+    const currentCreated =
+        isEditingSplitBill && !lodashIsEmpty(splitDraftTransaction) ? TransactionUtils.getFormattedCreated(splitDraftTransaction) : TransactionUtils.getFormattedCreated(transaction);
+    const parentReportAction = reportActions?.[(isEditingSplitBill ? reportActionID : report?.parentReportActionID) ?? -1];
     const canEditingSplitBill =
         isEditingSplitBill && session && parentReportAction && session.accountID === parentReportAction.actorAccountID && TransactionUtils.areRequiredFieldsEmpty(transaction);
-    const canEditMoneyRequest = isEditing && ReportUtils.canEditFieldOfMoneyRequest(parentReportAction ?? null, CONST.EDIT_REQUEST_FIELD.DATE);
+    const canEditMoneyRequest = isEditing && ReportUtils.canEditFieldOfMoneyRequest(parentReportAction, CONST.EDIT_REQUEST_FIELD.DATE);
     // eslint-disable-next-line rulesdir/no-negated-variables
     const shouldShowNotFound = !IOUUtils.isValidMoneyRequestType(iouType) || (isEditing && !canEditMoneyRequest && !canEditingSplitBill);
 
@@ -93,17 +94,17 @@ function IOURequestStepDate({
 
         // In the split flow, when editing we use SPLIT_TRANSACTION_DRAFT to save draft value
         if (isEditingSplitBill) {
-            IOU.setDraftSplitTransaction(transaction?.transactionID ?? '0', {created: newCreated});
+            IOU.setDraftSplitTransaction(transaction?.transactionID ?? '-1', {created: newCreated});
             navigateBack();
             return;
         }
 
-        const isTransactionDraft = action === CONST.IOU.ACTION.CREATE || IOUUtils.isMovingTransactionFromTrackExpense(action);
+        const isTransactionDraft = IOUUtils.shouldUseTransactionDraft(action);
 
-        IOU.setMoneyRequestCreated(transaction?.transactionID ?? '0', newCreated, isTransactionDraft);
+        IOU.setMoneyRequestCreated(transaction?.transactionID ?? '-1', newCreated, isTransactionDraft);
 
         if (isEditing) {
-            IOU.updateMoneyRequestDate(transaction?.transactionID ?? '0', reportID, newCreated, policy, policyTags, policyCategories);
+            IOU.updateMoneyRequestDate(transaction?.transactionID ?? '-1', reportID, newCreated, policy, policyTags, policyCategories);
         }
 
         navigateBack();
@@ -116,6 +117,7 @@ function IOURequestStepDate({
             shouldShowNotFoundPage={shouldShowNotFound}
             shouldShowWrapper
             testID={IOURequestStepDate.displayName}
+            includeSafeAreaPaddingBottom={false}
         >
             <FormProvider
                 style={[styles.flexGrow1, styles.ph5]}
@@ -142,7 +144,7 @@ IOURequestStepDate.displayName = 'IOURequestStepDate';
 const IOURequestStepDateWithOnyx = withOnyx<IOURequestStepDateProps, IOURequestStepDateOnyxProps>({
     splitDraftTransaction: {
         key: ({route}) => {
-            const transactionID = route?.params.transactionID ?? 0;
+            const transactionID = route?.params.transactionID ?? -1;
             return `${ONYXKEYS.COLLECTION.SPLIT_TRANSACTION_DRAFT}${transactionID}`;
         },
     },
@@ -157,17 +159,18 @@ const IOURequestStepDateWithOnyx = withOnyx<IOURequestStepDateProps, IOURequestS
             if (action === CONST.IOU.ACTION.EDIT) {
                 reportID = iouType === CONST.IOU.TYPE.SPLIT ? report?.reportID : report?.parentReportID;
             }
-            return `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${reportID ?? '0'}`;
+            return `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${reportID ?? '-1'}`;
         },
+        canEvict: false,
     },
     policy: {
-        key: ({report}) => `${ONYXKEYS.COLLECTION.POLICY}${report ? report.policyID : '0'}`,
+        key: ({report}) => `${ONYXKEYS.COLLECTION.POLICY}${report ? report.policyID : '-1'}`,
     },
     policyCategories: {
-        key: ({report}) => `${ONYXKEYS.COLLECTION.POLICY_CATEGORIES}${report ? report.policyID : '0'}`,
+        key: ({report}) => `${ONYXKEYS.COLLECTION.POLICY_CATEGORIES}${report ? report.policyID : '-1'}`,
     },
     policyTags: {
-        key: ({report}) => `${ONYXKEYS.COLLECTION.POLICY_TAGS}${report ? report.policyID : '0'}`,
+        key: ({report}) => `${ONYXKEYS.COLLECTION.POLICY_TAGS}${report ? report.policyID : '-1'}`,
     },
     session: {
         key: ONYXKEYS.SESSION,
@@ -175,8 +178,8 @@ const IOURequestStepDateWithOnyx = withOnyx<IOURequestStepDateProps, IOURequestS
 })(IOURequestStepDate);
 
 // eslint-disable-next-line rulesdir/no-negated-variables
-const IOURequestStepDateWithWritableReportOrNotFound = withWritableReportOrNotFound(IOURequestStepDateWithOnyx);
+const IOURequestStepDateWithFullTransactionOrNotFound = withFullTransactionOrNotFound(IOURequestStepDateWithOnyx);
 // eslint-disable-next-line rulesdir/no-negated-variables
-const IOURequestStepDateWithFullTransactionOrNotFound = withFullTransactionOrNotFound(IOURequestStepDateWithWritableReportOrNotFound);
+const IOURequestStepDateWithWritableReportOrNotFound = withWritableReportOrNotFound(IOURequestStepDateWithFullTransactionOrNotFound);
 
-export default IOURequestStepDateWithFullTransactionOrNotFound;
+export default IOURequestStepDateWithWritableReportOrNotFound;
diff --git a/src/pages/iou/request/step/IOURequestStepDescription.tsx b/src/pages/iou/request/step/IOURequestStepDescription.tsx
index afa1e166ddfc..9b4cb97beba6 100644
--- a/src/pages/iou/request/step/IOURequestStepDescription.tsx
+++ b/src/pages/iou/request/step/IOURequestStepDescription.tsx
@@ -14,6 +14,7 @@ import useThemeStyles from '@hooks/useThemeStyles';
 import * as ErrorUtils from '@libs/ErrorUtils';
 import * as IOUUtils from '@libs/IOUUtils';
 import Navigation from '@libs/Navigation/Navigation';
+import * as ReportActionsUtils from '@libs/ReportActionsUtils';
 import * as ReportUtils from '@libs/ReportUtils';
 import * as TransactionUtils from '@libs/TransactionUtils';
 import updateMultilineInputRange from '@libs/updateMultilineInputRange';
@@ -40,7 +41,7 @@ type IOURequestStepDescriptionOnyxProps = {
     policyCategories: OnyxEntry<OnyxTypes.PolicyCategories>;
 
     /** Collection of tags attached to a policy */
-    policyTags: OnyxEntry<OnyxTypes.PolicyTagList>;
+    policyTags: OnyxEntry<OnyxTypes.PolicyTagLists>;
 
     /** The actions from the parent report */
     reportActions: OnyxEntry<OnyxTypes.ReportActions>;
@@ -74,7 +75,7 @@ function IOURequestStepDescription({
     const focusTimeoutRef = useRef<NodeJS.Timeout | null>(null);
     // In the split flow, when editing we use SPLIT_TRANSACTION_DRAFT to save draft value
     const isEditingSplitBill = iouType === CONST.IOU.TYPE.SPLIT && action === CONST.IOU.ACTION.EDIT;
-    const currentDescription = isEditingSplitBill && !lodashIsEmpty(splitDraftTransaction) ? splitDraftTransaction?.comment.comment ?? '' : transaction?.comment.comment ?? '';
+    const currentDescription = isEditingSplitBill && !lodashIsEmpty(splitDraftTransaction) ? splitDraftTransaction?.comment?.comment ?? '' : transaction?.comment?.comment ?? '';
     useFocusEffect(
         useCallback(() => {
             focusTimeoutRef.current = setTimeout(() => {
@@ -94,18 +95,22 @@ function IOURequestStepDescription({
     /**
      * @returns - An object containing the errors for each inputID
      */
-    const validate = useCallback((values: FormOnyxValues<typeof ONYXKEYS.FORMS.MONEY_REQUEST_DESCRIPTION_FORM>): FormInputErrors<typeof ONYXKEYS.FORMS.MONEY_REQUEST_DESCRIPTION_FORM> => {
-        const errors = {};
-
-        if (values.moneyRequestComment.length > CONST.DESCRIPTION_LIMIT) {
-            ErrorUtils.addErrorMessage(errors, 'moneyRequestComment', [
-                'common.error.characterLimitExceedCounter',
-                {length: values.moneyRequestComment.length, limit: CONST.DESCRIPTION_LIMIT},
-            ]);
-        }
+    const validate = useCallback(
+        (values: FormOnyxValues<typeof ONYXKEYS.FORMS.MONEY_REQUEST_DESCRIPTION_FORM>): FormInputErrors<typeof ONYXKEYS.FORMS.MONEY_REQUEST_DESCRIPTION_FORM> => {
+            const errors = {};
+
+            if (values.moneyRequestComment.length > CONST.DESCRIPTION_LIMIT) {
+                ErrorUtils.addErrorMessage(
+                    errors,
+                    'moneyRequestComment',
+                    translate('common.error.characterLimitExceedCounter', {length: values.moneyRequestComment.length, limit: CONST.DESCRIPTION_LIMIT}),
+                );
+            }
 
-        return errors;
-    }, []);
+            return errors;
+        },
+        [translate],
+    );
 
     const navigateBack = () => {
         Navigation.goBack(backTo);
@@ -122,16 +127,16 @@ function IOURequestStepDescription({
 
         // In the split flow, when editing we use SPLIT_TRANSACTION_DRAFT to save draft value
         if (isEditingSplitBill) {
-            IOU.setDraftSplitTransaction(transaction?.transactionID ?? '0', {comment: newComment});
+            IOU.setDraftSplitTransaction(transaction?.transactionID ?? '-1', {comment: newComment});
             navigateBack();
             return;
         }
-        const isTransactionDraft = action === CONST.IOU.ACTION.CREATE || IOUUtils.isMovingTransactionFromTrackExpense(action);
+        const isTransactionDraft = IOUUtils.shouldUseTransactionDraft(action);
 
-        IOU.setMoneyRequestDescription(transaction?.transactionID ?? '0', newComment, isTransactionDraft);
+        IOU.setMoneyRequestDescription(transaction?.transactionID ?? '-1', newComment, isTransactionDraft);
 
         if (action === CONST.IOU.ACTION.EDIT) {
-            IOU.updateMoneyRequestDescription(transaction?.transactionID ?? '0', reportID, newComment, policy, policyTags, policyCategories);
+            IOU.updateMoneyRequestDescription(transaction?.transactionID ?? '-1', reportID, newComment, policy, policyTags, policyCategories);
         }
 
         navigateBack();
@@ -143,7 +148,7 @@ function IOURequestStepDescription({
     const isSplitBill = iouType === CONST.IOU.TYPE.SPLIT;
     const canEditSplitBill = isSplitBill && reportAction && session?.accountID === reportAction.actorAccountID && TransactionUtils.areRequiredFieldsEmpty(transaction);
     // eslint-disable-next-line rulesdir/no-negated-variables
-    const shouldShowNotFoundPage = isEditing && (isSplitBill ? !canEditSplitBill : !ReportUtils.canEditMoneyRequest(reportAction));
+    const shouldShowNotFoundPage = isEditing && (isSplitBill ? !canEditSplitBill : !ReportActionsUtils.isMoneyRequestAction(reportAction) || !ReportUtils.canEditMoneyRequest(reportAction));
     return (
         <StepScreenWrapper
             headerTitle={translate('common.description')}
@@ -173,8 +178,10 @@ function IOURequestStepDescription({
                             if (!el) {
                                 return;
                             }
+                            if (!inputRef.current) {
+                                updateMultilineInputRange(el);
+                            }
                             inputRef.current = el;
-                            updateMultilineInputRange(inputRef.current);
                         }}
                         autoGrowHeight
                         maxAutoGrowHeight={variables.textInputAutoGrowMaxHeight}
@@ -192,18 +199,18 @@ IOURequestStepDescription.displayName = 'IOURequestStepDescription';
 const IOURequestStepDescriptionWithOnyx = withOnyx<IOURequestStepDescriptionProps, IOURequestStepDescriptionOnyxProps>({
     splitDraftTransaction: {
         key: ({route}) => {
-            const transactionID = route?.params.transactionID ?? 0;
+            const transactionID = route?.params.transactionID ?? -1;
             return `${ONYXKEYS.COLLECTION.SPLIT_TRANSACTION_DRAFT}${transactionID}`;
         },
     },
     policy: {
-        key: ({report}) => `${ONYXKEYS.COLLECTION.POLICY}${report ? report.policyID : '0'}`,
+        key: ({report}) => `${ONYXKEYS.COLLECTION.POLICY}${report ? report.policyID : '-1'}`,
     },
     policyCategories: {
-        key: ({report}) => `${ONYXKEYS.COLLECTION.POLICY_CATEGORIES}${report ? report.policyID : '0'}`,
+        key: ({report}) => `${ONYXKEYS.COLLECTION.POLICY_CATEGORIES}${report ? report.policyID : '-1'}`,
     },
     policyTags: {
-        key: ({report}) => `${ONYXKEYS.COLLECTION.POLICY_TAGS}${report ? report.policyID : '0'}`,
+        key: ({report}) => `${ONYXKEYS.COLLECTION.POLICY_TAGS}${report ? report.policyID : '-1'}`,
     },
     reportActions: {
         key: ({
@@ -212,9 +219,9 @@ const IOURequestStepDescriptionWithOnyx = withOnyx<IOURequestStepDescriptionProp
                 params: {action, iouType},
             },
         }) => {
-            let reportID = '0';
+            let reportID = '-1';
             if (action === CONST.IOU.ACTION.EDIT) {
-                reportID = iouType === CONST.IOU.TYPE.SPLIT ? report?.reportID ?? '0' : report?.parentReportID ?? '0';
+                reportID = iouType === CONST.IOU.TYPE.SPLIT ? report?.reportID ?? '-1' : report?.parentReportID ?? '-1';
             }
             return `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${reportID}`;
         },
@@ -226,8 +233,8 @@ const IOURequestStepDescriptionWithOnyx = withOnyx<IOURequestStepDescriptionProp
 })(IOURequestStepDescription);
 
 // eslint-disable-next-line rulesdir/no-negated-variables
-const IOURequestStepDescriptionWithWritableReportOrNotFound = withWritableReportOrNotFound(IOURequestStepDescriptionWithOnyx);
+const IOURequestStepDescriptionWithFullTransactionOrNotFound = withFullTransactionOrNotFound(IOURequestStepDescriptionWithOnyx);
 // eslint-disable-next-line rulesdir/no-negated-variables
-const IOURequestStepDescriptionWithFullTransactionOrNotFound = withFullTransactionOrNotFound(IOURequestStepDescriptionWithWritableReportOrNotFound);
+const IOURequestStepDescriptionWithWritableReportOrNotFound = withWritableReportOrNotFound(IOURequestStepDescriptionWithFullTransactionOrNotFound);
 
-export default IOURequestStepDescriptionWithFullTransactionOrNotFound;
+export default IOURequestStepDescriptionWithWritableReportOrNotFound;
diff --git a/src/pages/iou/request/step/IOURequestStepDistance.tsx b/src/pages/iou/request/step/IOURequestStepDistance.tsx
index 50b53d0734c9..9131bc4b3d39 100644
--- a/src/pages/iou/request/step/IOURequestStepDistance.tsx
+++ b/src/pages/iou/request/step/IOURequestStepDistance.tsx
@@ -5,7 +5,7 @@ import {View} from 'react-native';
 import type {ScrollView as RNScrollView} from 'react-native';
 import type {RenderItemParams} from 'react-native-draggable-flatlist/lib/typescript/types';
 import type {OnyxEntry} from 'react-native-onyx';
-import {withOnyx} from 'react-native-onyx';
+import {useOnyx, withOnyx} from 'react-native-onyx';
 import Button from '@components/Button';
 import DistanceRequestFooter from '@components/DistanceRequest/DistanceRequestFooter';
 import DistanceRequestRenderItem from '@components/DistanceRequest/DistanceRequestRenderItem';
@@ -13,11 +13,14 @@ import DotIndicatorMessage from '@components/DotIndicatorMessage';
 import DraggableList from '@components/DraggableList';
 import withCurrentUserPersonalDetails from '@components/withCurrentUserPersonalDetails';
 import type {WithCurrentUserPersonalDetailsProps} from '@components/withCurrentUserPersonalDetails';
+import useFetchRoute from '@hooks/useFetchRoute';
 import useLocalize from '@hooks/useLocalize';
 import useNetwork from '@hooks/useNetwork';
 import usePrevious from '@hooks/usePrevious';
 import useThemeStyles from '@hooks/useThemeStyles';
+import DistanceRequestUtils from '@libs/DistanceRequestUtils';
 import * as ErrorUtils from '@libs/ErrorUtils';
+import * as IOUUtils from '@libs/IOUUtils';
 import Navigation from '@libs/Navigation/Navigation';
 import * as OptionsListUtils from '@libs/OptionsListUtils';
 import * as ReportUtils from '@libs/ReportUtils';
@@ -32,7 +35,7 @@ import ROUTES from '@src/ROUTES';
 import type SCREENS from '@src/SCREENS';
 import type * as OnyxTypes from '@src/types/onyx';
 import type {Errors} from '@src/types/onyx/OnyxCommon';
-import type {WaypointCollection} from '@src/types/onyx/Transaction';
+import type {Waypoint, WaypointCollection} from '@src/types/onyx/Transaction';
 import StepScreenWrapper from './StepScreenWrapper';
 import withFullTransactionOrNotFound from './withFullTransactionOrNotFound';
 import type {WithWritableReportOrNotFoundProps} from './withWritableReportOrNotFound';
@@ -74,9 +77,19 @@ function IOURequestStepDistance({
     const styles = useThemeStyles();
     const {isOffline} = useNetwork();
     const {translate} = useLocalize();
+    const [reportNameValuePairs] = useOnyx(`${ONYXKEYS.COLLECTION.REPORT_NAME_VALUE_PAIRS}${report?.reportID ?? -1}`);
 
     const [optimisticWaypoints, setOptimisticWaypoints] = useState<WaypointCollection | null>(null);
-    const waypoints = useMemo(() => optimisticWaypoints ?? transaction?.comment?.waypoints ?? {waypoint0: {}, waypoint1: {}}, [optimisticWaypoints, transaction]);
+    const waypoints = useMemo(
+        () =>
+            optimisticWaypoints ??
+            transaction?.comment?.waypoints ?? {
+                waypoint0: {keyForList: 'start_waypoint'},
+                waypoint1: {keyForList: 'stop_waypoint'},
+            },
+        [optimisticWaypoints, transaction],
+    );
+    const {shouldFetchRoute, validatedWaypoints} = useFetchRoute(transaction, waypoints, action);
     const waypointsList = Object.keys(waypoints);
     const previousWaypoints = usePrevious(waypoints);
     const numberOfWaypoints = Object.keys(waypoints).length;
@@ -85,14 +98,16 @@ function IOURequestStepDistance({
     const isLoadingRoute = transaction?.comment?.isLoading ?? false;
     const isLoading = transaction?.isLoading ?? false;
     const hasRouteError = !!transaction?.errorFields?.route;
-    const hasRoute = TransactionUtils.hasRoute(transaction, true);
-    const validatedWaypoints = TransactionUtils.getValidWaypoints(waypoints);
-    const previousValidatedWaypoints = usePrevious(validatedWaypoints);
-    const haveValidatedWaypointsChanged = !isEqual(previousValidatedWaypoints, validatedWaypoints);
-    const isRouteAbsentWithoutErrors = !hasRoute && !hasRouteError;
-    const shouldFetchRoute = (isRouteAbsentWithoutErrors || haveValidatedWaypointsChanged) && !isLoadingRoute && Object.keys(validatedWaypoints).length > 1;
     const [shouldShowAtLeastTwoDifferentWaypointsError, setShouldShowAtLeastTwoDifferentWaypointsError] = useState(false);
-    const nonEmptyWaypointsCount = useMemo(() => Object.keys(waypoints).filter((key) => !isEmpty(waypoints[key])).length, [waypoints]);
+    const isWaypointEmpty = (waypoint?: Waypoint) => {
+        if (!waypoint) {
+            return true;
+        }
+        const {keyForList, ...waypointWithoutKey} = waypoint;
+        return isEmpty(waypointWithoutKey);
+    };
+    const nonEmptyWaypointsCount = useMemo(() => Object.keys(waypoints).filter((key) => !isWaypointEmpty(waypoints[key])).length, [waypoints]);
+
     const duplicateWaypointsError = useMemo(
         () => nonEmptyWaypointsCount >= 2 && Object.keys(validatedWaypoints).length !== nonEmptyWaypointsCount,
         [nonEmptyWaypointsCount, validatedWaypoints],
@@ -101,6 +116,8 @@ function IOURequestStepDistance({
     const isEditing = action === CONST.IOU.ACTION.EDIT;
     const transactionWasSaved = useRef(false);
     const isCreatingNewRequest = !(backTo || isEditing);
+    const [recentWaypoints, {status: recentWaypointsStatus}] = useOnyx(ONYXKEYS.NVP_RECENT_WAYPOINTS);
+    const iouRequestType = TransactionUtils.getRequestType(transaction);
 
     // For quick button actions, we'll skip the confirmation page unless the report is archived or this is a workspace
     // request and the workspace requires a category or a tag
@@ -109,8 +126,10 @@ function IOURequestStepDistance({
             return false;
         }
 
-        return !ReportUtils.isArchivedRoom(report) && !(ReportUtils.isPolicyExpenseChat(report) && ((policy?.requiresCategory ?? false) || (policy?.requiresTag ?? false)));
-    }, [report, skipConfirmation, policy]);
+        return (
+            !ReportUtils.isArchivedRoom(report, reportNameValuePairs) && !(ReportUtils.isPolicyExpenseChat(report) && ((policy?.requiresCategory ?? false) || (policy?.requiresTag ?? false)))
+        );
+    }, [report, skipConfirmation, policy, reportNameValuePairs]);
     let buttonText = !isCreatingNewRequest ? translate('common.save') : translate('common.next');
     if (shouldSkipConfirmation) {
         if (iouType === CONST.IOU.TYPE.SPLIT) {
@@ -122,18 +141,21 @@ function IOURequestStepDistance({
         }
     }
 
+    useEffect(() => {
+        if (iouRequestType !== CONST.IOU.REQUEST_TYPE.DISTANCE || isOffline || recentWaypointsStatus === 'loading' || recentWaypoints !== undefined) {
+            return;
+        }
+
+        // Only load the recent waypoints if they have been read from Onyx as undefined
+        // If the account doesn't have recent waypoints they will be returned as an empty array
+        TransactionAction.openDraftDistanceExpense();
+    }, [iouRequestType, recentWaypointsStatus, recentWaypoints, isOffline]);
+
     useEffect(() => {
         MapboxToken.init();
         return MapboxToken.stop;
     }, []);
 
-    useEffect(() => {
-        if (isOffline || !shouldFetchRoute) {
-            return;
-        }
-        TransactionAction.getRoute(transactionID, validatedWaypoints, action === CONST.IOU.ACTION.CREATE);
-    }, [shouldFetchRoute, transactionID, validatedWaypoints, isOffline, action]);
-
     useEffect(() => {
         if (numberOfWaypoints <= numberOfPreviousWaypoints) {
             return;
@@ -164,16 +186,17 @@ function IOURequestStepDistance({
             // 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) {
+                TransactionEdit.removeBackupTransaction(transaction?.transactionID ?? '-1');
                 return;
             }
-            TransactionEdit.restoreOriginalTransactionFromBackup(transaction?.transactionID ?? '', action === CONST.IOU.ACTION.CREATE);
+            TransactionEdit.restoreOriginalTransactionFromBackup(transaction?.transactionID ?? '-1', IOUUtils.shouldUseTransactionDraft(action));
         };
-        // eslint-disable-next-line react-hooks/exhaustive-deps
+        // eslint-disable-next-line react-compiler/react-compiler, react-hooks/exhaustive-deps
     }, []);
 
-    const navigateBack = () => {
+    const navigateBack = useCallback(() => {
         Navigation.goBack(backTo);
-    };
+    }, [backTo]);
 
     /**
      * Takes the user to the page for editing a specific waypoint
@@ -181,9 +204,7 @@ function IOURequestStepDistance({
      */
     const navigateToWaypointEditPage = useCallback(
         (index: number) => {
-            Navigation.navigate(
-                ROUTES.MONEY_REQUEST_STEP_WAYPOINT.getRoute(action, CONST.IOU.TYPE.SUBMIT, transactionID, report?.reportID, index.toString(), Navigation.getActiveRouteWithoutParams()),
-            );
+            Navigation.navigate(ROUTES.MONEY_REQUEST_STEP_WAYPOINT.getRoute(action, CONST.IOU.TYPE.SUBMIT, transactionID, report?.reportID, index.toString(), Navigation.getActiveRoute()));
         },
         [action, transactionID, report?.reportID],
     );
@@ -223,10 +244,10 @@ function IOURequestStepDistance({
         // If a reportID exists in the report object, it's because the user started this flow from using the + button in the composer
         // inside a report. In this case, the participants can be automatically assigned from the report and the user can skip the participants step and go straight
         // to the confirm step.
-        if (report?.reportID && !ReportUtils.isArchivedRoom(report)) {
+        if (report?.reportID && !ReportUtils.isArchivedRoom(report, reportNameValuePairs)) {
             const selectedParticipants = IOU.setMoneyRequestParticipantsFromReport(transactionID, report);
             const participants = selectedParticipants.map((participant) => {
-                const participantAccountID = participant?.accountID ?? 0;
+                const participantAccountID = participant?.accountID ?? -1;
                 return participantAccountID ? OptionsListUtils.getParticipantsOption(participant, personalDetails) : OptionsListUtils.getReportOption(participant);
             });
             if (shouldSkipConfirmation) {
@@ -243,7 +264,7 @@ function IOURequestStepDistance({
                         category: '',
                         tag: '',
                         billable: false,
-                        iouRequestType: CONST.IOU.REQUEST_TYPE.DISTANCE,
+                        iouRequestType,
                         existingSplitChatReportID: report?.reportID,
                     });
                     return;
@@ -278,16 +299,26 @@ function IOURequestStepDistance({
 
                 IOU.createDistanceRequest(
                     report,
-                    participants[0],
+                    participants,
                     '',
                     transaction?.created ?? '',
                     '',
                     '',
+                    '',
+                    0,
                     0,
                     transaction?.currency ?? 'USD',
                     translate('iou.fieldPending'),
-                    false,
+                    !!policy?.defaultBillable,
                     TransactionUtils.getValidWaypoints(waypoints, true),
+                    undefined,
+                    undefined,
+                    undefined,
+                    DistanceRequestUtils.getCustomUnitRateID(report.reportID),
+                    currentUserPersonalDetails.login ?? '',
+                    currentUserPersonalDetails.accountID,
+                    transaction?.splitShares,
+                    iouType,
                 );
                 return;
             }
@@ -313,6 +344,8 @@ function IOURequestStepDistance({
         navigateToParticipantPage,
         navigateToConfirmationPage,
         policy,
+        iouRequestType,
+        reportNameValuePairs,
     ]);
 
     const getError = () => {
@@ -324,7 +357,7 @@ function IOURequestStepDistance({
             return {duplicateWaypointsError: translate('iou.error.duplicateWaypointsErrorMessage')} as Errors;
         }
         if (atLeastTwoDifferentWaypointsError) {
-            return {atLeastTwoDifferentWaypointsError: 'iou.error.atLeastTwoDifferentWaypoints'} as Errors;
+            return {atLeastTwoDifferentWaypointsError: translate('iou.error.atLeastTwoDifferentWaypoints')} as Errors;
         }
         return {};
     };
@@ -344,15 +377,15 @@ function IOURequestStepDistance({
             data.forEach((waypoint, index) => {
                 newWaypoints[`waypoint${index}`] = waypoints[waypoint] ?? {};
                 // Find waypoint that BECOMES empty after dragging
-                if (isEmpty(newWaypoints[`waypoint${index}`]) && !isEmpty(waypoints[`waypoint${index}`] ?? {})) {
+                if (isWaypointEmpty(newWaypoints[`waypoint${index}`]) && !isWaypointEmpty(waypoints[`waypoint${index}`])) {
                     emptyWaypointIndex = index;
                 }
             });
 
             setOptimisticWaypoints(newWaypoints);
             Promise.all([
-                TransactionAction.removeWaypoint(transaction, emptyWaypointIndex.toString(), action === CONST.IOU.ACTION.CREATE),
-                TransactionAction.updateWaypoints(transactionID, newWaypoints, action === CONST.IOU.ACTION.CREATE),
+                TransactionAction.removeWaypoint(transaction, emptyWaypointIndex.toString(), IOUUtils.shouldUseTransactionDraft(action)),
+                TransactionAction.updateWaypoints(transactionID, newWaypoints, IOUUtils.shouldUseTransactionDraft(action)),
             ]).then(() => {
                 setOptimisticWaypoints(null);
             });
@@ -372,20 +405,28 @@ function IOURequestStepDistance({
         if (isEditing) {
             // If nothing was changed, simply go to transaction thread
             // We compare only addresses because numbers are rounded while backup
-            const oldWaypoints = transactionBackup?.comment.waypoints ?? {};
+            const oldWaypoints = transactionBackup?.comment?.waypoints ?? {};
             const oldAddresses = Object.fromEntries(Object.entries(oldWaypoints).map(([key, waypoint]) => [key, 'address' in waypoint ? waypoint.address : {}]));
             const addresses = Object.fromEntries(Object.entries(waypoints).map(([key, waypoint]) => [key, 'address' in waypoint ? waypoint.address : {}]));
+            const hasRouteChanged = !isEqual(transactionBackup?.routes, transaction?.routes);
             if (isEqual(oldAddresses, addresses)) {
-                Navigation.dismissModal();
+                navigateBack();
                 return;
             }
-            IOU.updateMoneyRequestDistance({transactionID: transaction?.transactionID ?? '', transactionThreadReportID: report?.reportID ?? '', waypoints});
-            Navigation.dismissModal();
+            IOU.updateMoneyRequestDistance({
+                transactionID: transaction?.transactionID ?? '-1',
+                transactionThreadReportID: report?.reportID ?? '-1',
+                waypoints,
+                ...(hasRouteChanged ? {routes: transaction?.routes} : {}),
+                policy,
+            });
+            navigateBack();
             return;
         }
 
         navigateToNextStep();
     }, [
+        navigateBack,
         duplicateWaypointsError,
         atLeastTwoDifferentWaypointsError,
         hasRouteError,
@@ -397,7 +438,9 @@ function IOURequestStepDistance({
         transactionBackup,
         waypoints,
         transaction?.transactionID,
+        transaction?.routes,
         report?.reportID,
+        policy,
     ]);
 
     const renderItem = useCallback(
@@ -426,7 +469,7 @@ function IOURequestStepDistance({
                 <View style={styles.flex1}>
                     <DraggableList
                         data={waypointsList}
-                        keyExtractor={(item) => item}
+                        keyExtractor={(item) => (waypoints[item]?.keyForList ?? waypoints[item]?.address ?? '') + item}
                         shouldUsePortal
                         onDragEnd={updateWaypoints}
                         ref={scrollViewRef}
@@ -470,19 +513,19 @@ IOURequestStepDistance.displayName = 'IOURequestStepDistance';
 const IOURequestStepDistanceWithOnyx = withOnyx<IOURequestStepDistanceProps, IOURequestStepDistanceOnyxProps>({
     transactionBackup: {
         key: ({route}) => {
-            const transactionID = route.params.transactionID ?? 0;
+            const transactionID = route.params.transactionID ?? -1;
             return `${ONYXKEYS.COLLECTION.TRANSACTION_BACKUP}${transactionID}`;
         },
     },
     policy: {
-        key: ({report}) => `${ONYXKEYS.COLLECTION.POLICY}${report ? report?.policyID : '0'}`,
+        key: ({report}) => `${ONYXKEYS.COLLECTION.POLICY}${report ? report?.policyID : '-1'}`,
     },
     personalDetails: {
         key: ONYXKEYS.PERSONAL_DETAILS_LIST,
     },
     skipConfirmation: {
         key: ({route}) => {
-            const transactionID = route.params.transactionID ?? 0;
+            const transactionID = route.params.transactionID ?? -1;
             return `${ONYXKEYS.COLLECTION.SKIP_CONFIRMATION}${transactionID}`;
         },
     },
diff --git a/src/pages/iou/request/step/IOURequestStepDistanceRate.tsx b/src/pages/iou/request/step/IOURequestStepDistanceRate.tsx
index 1b9ccf1876cf..3b42b1d9a1be 100644
--- a/src/pages/iou/request/step/IOURequestStepDistanceRate.tsx
+++ b/src/pages/iou/request/step/IOURequestStepDistanceRate.tsx
@@ -1,20 +1,22 @@
 import React from 'react';
-import {withOnyx} from 'react-native-onyx';
 import type {OnyxEntry} from 'react-native-onyx';
+import {useOnyx, withOnyx} from 'react-native-onyx';
 import SelectionList from '@components/SelectionList';
 import RadioListItem from '@components/SelectionList/RadioListItem';
 import Text from '@components/Text';
 import useLocalize from '@hooks/useLocalize';
 import useThemeStyles from '@hooks/useThemeStyles';
 import * as IOU from '@libs/actions/IOU';
-import type {MileageRate} from '@libs/DistanceRequestUtils';
+import * as CurrencyUtils from '@libs/CurrencyUtils';
 import DistanceRequestUtils from '@libs/DistanceRequestUtils';
 import Navigation from '@libs/Navigation/Navigation';
+import {getCustomUnitRate, isTaxTrackingEnabled} from '@libs/PolicyUtils';
+import * as ReportUtils from '@libs/ReportUtils';
 import * as TransactionUtils from '@libs/TransactionUtils';
 import CONST from '@src/CONST';
 import ONYXKEYS from '@src/ONYXKEYS';
 import type SCREENS from '@src/SCREENS';
-import type {Policy, Transaction} from '@src/types/onyx';
+import type * as OnyxTypes from '@src/types/onyx';
 import type {Unit} from '@src/types/onyx/Policy';
 import StepScreenWrapper from './StepScreenWrapper';
 import withFullTransactionOrNotFound from './withFullTransactionOrNotFound';
@@ -23,30 +25,45 @@ import withWritableReportOrNotFound from './withWritableReportOrNotFound';
 
 type IOURequestStepDistanceRateOnyxProps = {
     /** Policy details */
-    policy: OnyxEntry<Policy>;
+    policy: OnyxEntry<OnyxTypes.Policy>;
 
-    /** Mileage rates */
-    rates: Record<string, MileageRate>;
+    /** Collection of categories attached to the policy */
+    policyCategories: OnyxEntry<OnyxTypes.PolicyCategories>;
+
+    /** Collection of tags attached to the policy */
+    policyTags: OnyxEntry<OnyxTypes.PolicyTagLists>;
 };
 
 type IOURequestStepDistanceRateProps = IOURequestStepDistanceRateOnyxProps &
     WithWritableReportOrNotFoundProps<typeof SCREENS.MONEY_REQUEST.STEP_DISTANCE_RATE> & {
         /** Holds data related to Money Request view state, rather than the underlying Money Request data. */
-        transaction: OnyxEntry<Transaction>;
+        transaction: OnyxEntry<OnyxTypes.Transaction>;
     };
 
 function IOURequestStepDistanceRate({
-    policy,
+    policy: policyReal,
+    report,
+    reportDraft,
     route: {
-        params: {backTo, transactionID},
+        params: {action, reportID, backTo, transactionID},
     },
     transaction,
-    rates,
+    policyTags,
+    policyCategories,
 }: IOURequestStepDistanceRateProps) {
+    const [policyDraft] = useOnyx(`${ONYXKEYS.COLLECTION.POLICY_DRAFTS}${IOU.getIOURequestPolicyID(transaction, reportDraft) ?? '-1'}`);
+
+    const policy = policyReal ?? policyDraft;
+    const rates = DistanceRequestUtils.getMileageRates(policy);
+
     const styles = useThemeStyles();
     const {translate, toLocaleDigit} = useLocalize();
+    const isDistanceRequest = TransactionUtils.isDistanceRequest(transaction);
+    const isPolicyExpenseChat = ReportUtils.isReportInGroupPolicy(report);
+    const shouldShowTax = isTaxTrackingEnabled(isPolicyExpenseChat, policy, isDistanceRequest);
+    const isEditing = action === CONST.IOU.ACTION.EDIT;
 
-    const lastSelectedRateID = TransactionUtils.getRateID(transaction) ?? '';
+    const currentRateID = TransactionUtils.getRateID(transaction) ?? '-1';
 
     const navigateBack = () => {
         Navigation.goBack(backTo);
@@ -60,7 +77,7 @@ function IOURequestStepDistanceRate({
             alternateText: rate.name ? rateForDisplay : '',
             keyForList: rate.customUnitRateID,
             value: rate.customUnitRateID,
-            isSelected: lastSelectedRateID ? lastSelectedRateID === rate.customUnitRateID : Boolean(rate.name === CONST.CUSTOM_UNITS.DEFAULT_RATE),
+            isSelected: currentRateID ? currentRateID === rate.customUnitRateID : rate.name === CONST.CUSTOM_UNITS.DEFAULT_RATE,
         };
     });
 
@@ -69,7 +86,24 @@ function IOURequestStepDistanceRate({
     const initiallyFocusedOption = sections.find((item) => item.isSelected)?.keyForList;
 
     function selectDistanceRate(customUnitRateID: string) {
-        IOU.updateDistanceRequestRate(transactionID, customUnitRateID, policy?.id ?? '');
+        if (shouldShowTax) {
+            const policyCustomUnitRate = getCustomUnitRate(policy, customUnitRateID);
+            const taxRateExternalID = policyCustomUnitRate?.attributes?.taxRateExternalID ?? '-1';
+            const taxableAmount = DistanceRequestUtils.getTaxableAmount(policy, customUnitRateID, TransactionUtils.getDistanceInMeters(transaction, unit));
+            const taxPercentage = TransactionUtils.getTaxValue(policy, transaction, taxRateExternalID) ?? '';
+            const taxAmount = CurrencyUtils.convertToBackendAmount(TransactionUtils.calculateTaxAmount(taxPercentage, taxableAmount, rates[customUnitRateID].currency ?? CONST.CURRENCY.USD));
+            IOU.setMoneyRequestTaxAmount(transactionID, taxAmount);
+            IOU.setMoneyRequestTaxRate(transactionID, taxRateExternalID);
+        }
+
+        if (currentRateID !== customUnitRateID) {
+            IOU.setMoneyRequestDistanceRate(transactionID, customUnitRateID, policy?.id ?? '-1', !isEditing);
+
+            if (isEditing) {
+                IOU.updateMoneyRequestDistanceRate(transaction?.transactionID ?? '-1', reportID, customUnitRateID, policy, policyTags, policyCategories);
+            }
+        }
+
         navigateBack();
     }
 
@@ -77,8 +111,8 @@ function IOURequestStepDistanceRate({
         <StepScreenWrapper
             headerTitle={translate('common.rate')}
             onBackButtonPress={navigateBack}
-            shouldShowWrapper={Boolean(backTo)}
-            testID="rate"
+            shouldShowWrapper
+            testID={IOURequestStepDistanceRate.displayName}
         >
             <Text style={[styles.mh5, styles.mv4]}>{translate('iou.chooseARate', {unit})}</Text>
 
@@ -86,6 +120,7 @@ function IOURequestStepDistanceRate({
                 sections={[{data: sections}]}
                 ListItem={RadioListItem}
                 onSelectRow={({value}) => selectDistanceRate(value ?? '')}
+                shouldSingleExecuteRowSelect
                 initiallyFocusedOptionKey={initiallyFocusedOption}
             />
         </StepScreenWrapper>
@@ -96,11 +131,13 @@ IOURequestStepDistanceRate.displayName = 'IOURequestStepDistanceRate';
 
 const IOURequestStepDistanceRateWithOnyx = withOnyx<IOURequestStepDistanceRateProps, IOURequestStepDistanceRateOnyxProps>({
     policy: {
-        key: ({report}) => `${ONYXKEYS.COLLECTION.POLICY}${report ? report.policyID : '0'}`,
+        key: ({report}) => `${ONYXKEYS.COLLECTION.POLICY}${report ? report.policyID : '-1'}`,
+    },
+    policyCategories: {
+        key: ({report}) => `${ONYXKEYS.COLLECTION.POLICY_CATEGORIES}${report ? report.policyID : '0'}`,
     },
-    rates: {
-        key: ({report}) => `${ONYXKEYS.COLLECTION.POLICY}${report?.policyID ?? '0'}`,
-        selector: DistanceRequestUtils.getMileageRates,
+    policyTags: {
+        key: ({report}) => `${ONYXKEYS.COLLECTION.POLICY_TAGS}${report ? report.policyID : '0'}`,
     },
 })(IOURequestStepDistanceRate);
 
diff --git a/src/pages/iou/request/step/IOURequestStepMerchant.tsx b/src/pages/iou/request/step/IOURequestStepMerchant.tsx
index bc6f71b23228..a47e4d19be57 100644
--- a/src/pages/iou/request/step/IOURequestStepMerchant.tsx
+++ b/src/pages/iou/request/step/IOURequestStepMerchant.tsx
@@ -35,7 +35,7 @@ type IOURequestStepMerchantOnyxProps = {
     policyCategories: OnyxEntry<OnyxTypes.PolicyCategories>;
 
     /** Collection of tags attached to a policy */
-    policyTags: OnyxEntry<OnyxTypes.PolicyTagList>;
+    policyTags: OnyxEntry<OnyxTypes.PolicyTagLists>;
 };
 
 type IOURequestStepMerchantProps = IOURequestStepMerchantOnyxProps &
@@ -63,7 +63,9 @@ function IOURequestStepMerchant({
     const merchant = ReportUtils.getTransactionDetails(isEditingSplitBill && !isEmptyObject(splitDraftTransaction) ? splitDraftTransaction : transaction)?.merchant;
     const isEmptyMerchant = merchant === '' || merchant === CONST.TRANSACTION.PARTIAL_TRANSACTION_MERCHANT;
 
-    const isMerchantRequired = ReportUtils.isReportInGroupPolicy(report) || transaction?.participants?.some((participant) => Boolean(participant.isPolicyExpenseChat));
+    const isMerchantRequired =
+        ReportUtils.isPolicyExpenseChat(report) || ReportUtils.isExpenseRequest(report) || transaction?.participants?.some((participant) => !!participant.isPolicyExpenseChat);
+
     const navigateBack = () => {
         Navigation.goBack(backTo);
     };
@@ -73,12 +75,12 @@ function IOURequestStepMerchant({
             const errors: FormInputErrors<typeof ONYXKEYS.FORMS.MONEY_REQUEST_MERCHANT_FORM> = {};
 
             if (isMerchantRequired && !value.moneyRequestMerchant) {
-                errors.moneyRequestMerchant = 'common.error.fieldRequired';
+                errors.moneyRequestMerchant = translate('common.error.fieldRequired');
             }
 
             return errors;
         },
-        [isMerchantRequired],
+        [isMerchantRequired, translate],
     );
 
     const updateMerchant = (value: FormOnyxValues<typeof ONYXKEYS.FORMS.MONEY_REQUEST_MERCHANT_FORM>) => {
@@ -97,9 +99,9 @@ function IOURequestStepMerchant({
             navigateBack();
             return;
         }
-        IOU.setMoneyRequestMerchant(transactionID, newMerchant ?? '', !isEditing);
+        // When creating/editing an expense, newMerchant can be blank so we fall back on PARTIAL_TRANSACTION_MERCHANT
+        IOU.setMoneyRequestMerchant(transactionID, newMerchant || CONST.TRANSACTION.PARTIAL_TRANSACTION_MERCHANT, !isEditing);
         if (isEditing) {
-            // When creating a new expense, newMerchant can be blank so we fall back on PARTIAL_TRANSACTION_MERCHANT
             IOU.updateMoneyRequestMerchant(transactionID, reportID, newMerchant || CONST.TRANSACTION.PARTIAL_TRANSACTION_MERCHANT, policy, policyTags, policyCategories);
         }
         navigateBack();
@@ -146,18 +148,18 @@ export default withWritableReportOrNotFound(
         withOnyx<IOURequestStepMerchantProps, IOURequestStepMerchantOnyxProps>({
             splitDraftTransaction: {
                 key: ({route}) => {
-                    const transactionID = route.params.transactionID ?? 0;
+                    const transactionID = route.params.transactionID ?? -1;
                     return `${ONYXKEYS.COLLECTION.SPLIT_TRANSACTION_DRAFT}${transactionID}`;
                 },
             },
             policy: {
-                key: ({report}) => `${ONYXKEYS.COLLECTION.POLICY}${report ? report.policyID : '0'}`,
+                key: ({report}) => `${ONYXKEYS.COLLECTION.POLICY}${report ? report.policyID : '-1'}`,
             },
             policyCategories: {
-                key: ({report}) => `${ONYXKEYS.COLLECTION.POLICY_CATEGORIES}${report ? report.policyID : '0'}`,
+                key: ({report}) => `${ONYXKEYS.COLLECTION.POLICY_CATEGORIES}${report ? report.policyID : '-1'}`,
             },
             policyTags: {
-                key: ({report}) => `${ONYXKEYS.COLLECTION.POLICY_TAGS}${report ? report.policyID : '0'}`,
+                key: ({report}) => `${ONYXKEYS.COLLECTION.POLICY_TAGS}${report ? report.policyID : '-1'}`,
             },
         })(IOURequestStepMerchant),
     ),
diff --git a/src/pages/iou/request/step/IOURequestStepParticipants.tsx b/src/pages/iou/request/step/IOURequestStepParticipants.tsx
index be95cb03e95b..552ad4d54e39 100644
--- a/src/pages/iou/request/step/IOURequestStepParticipants.tsx
+++ b/src/pages/iou/request/step/IOURequestStepParticipants.tsx
@@ -1,16 +1,24 @@
+import {useIsFocused} from '@react-navigation/core';
 import React, {useCallback, useEffect, useMemo, useRef} from 'react';
 import type {OnyxEntry} from 'react-native-onyx';
+import {withOnyx} from 'react-native-onyx';
+import FormHelpMessage from '@components/FormHelpMessage';
 import useLocalize from '@hooks/useLocalize';
+import usePermissions from '@hooks/usePermissions';
+import useThemeStyles from '@hooks/useThemeStyles';
+import {READ_COMMANDS} from '@libs/API/types';
 import DistanceRequestUtils from '@libs/DistanceRequestUtils';
+import HttpUtils from '@libs/HttpUtils';
 import * as IOUUtils from '@libs/IOUUtils';
 import Navigation from '@libs/Navigation/Navigation';
+import * as ReportUtils from '@libs/ReportUtils';
 import * as TransactionUtils from '@libs/TransactionUtils';
-import MoneyRequestParticipantsSelector from '@pages/iou/request/MoneyTemporaryForRefactorRequestParticipantsSelector';
+import MoneyRequestParticipantsSelector from '@pages/iou/request/MoneyRequestParticipantsSelector';
 import * as IOU from '@userActions/IOU';
 import CONST from '@src/CONST';
+import ONYXKEYS from '@src/ONYXKEYS';
 import ROUTES from '@src/ROUTES';
 import type SCREENS from '@src/SCREENS';
-import type {Transaction} from '@src/types/onyx';
 import type {Participant} from '@src/types/onyx/IOU';
 import StepScreenWrapper from './StepScreenWrapper';
 import type {WithFullTransactionOrNotFoundProps} from './withFullTransactionOrNotFound';
@@ -19,8 +27,8 @@ import type {WithWritableReportOrNotFoundProps} from './withWritableReportOrNotF
 import withWritableReportOrNotFound from './withWritableReportOrNotFound';
 
 type IOURequestStepParticipantsOnyxProps = {
-    /** The transaction object being modified in Onyx */
-    transaction: OnyxEntry<Transaction>;
+    /** Whether the confirmation step should be skipped */
+    skipConfirmation: OnyxEntry<boolean>;
 };
 
 type IOURequestStepParticipantsProps = IOURequestStepParticipantsOnyxProps &
@@ -32,10 +40,16 @@ function IOURequestStepParticipants({
         params: {iouType, reportID, transactionID, action},
     },
     transaction,
+    skipConfirmation,
 }: IOURequestStepParticipantsProps) {
     const participants = transaction?.participants;
     const {translate} = useLocalize();
-    const selectedReportID = useRef<string>(reportID);
+    const styles = useThemeStyles();
+    const isFocused = useIsFocused();
+    const {canUseP2PDistanceRequests} = usePermissions(iouType);
+
+    // We need to set selectedReportID if user has navigated back from confirmation page and navigates to confirmation page with already selected participant
+    const selectedReportID = useRef<string>(participants?.length === 1 ? participants[0]?.reportID ?? reportID : reportID);
     const numberOfParticipants = useRef(participants?.length ?? 0);
     const iouRequestType = TransactionUtils.getRequestType(transaction);
     const isSplitRequest = iouType === CONST.IOU.TYPE.SPLIT;
@@ -78,42 +92,67 @@ function IOURequestStepParticipants({
 
     const addParticipant = useCallback(
         (val: Participant[]) => {
-            IOU.setMoneyRequestParticipants(transactionID, val);
-            const rateID = DistanceRequestUtils.getCustomUnitRateID(val[0]?.reportID ?? '');
-            IOU.setCustomUnitRateID(transactionID, rateID);
+            HttpUtils.cancelPendingRequests(READ_COMMANDS.SEARCH_FOR_REPORTS);
 
+            const firstParticipantReportID = val[0]?.reportID ?? '';
+            const rateID = DistanceRequestUtils.getCustomUnitRateID(firstParticipantReportID, !canUseP2PDistanceRequests);
+            const isInvoice = iouType === CONST.IOU.TYPE.INVOICE && ReportUtils.isInvoiceRoomWithID(firstParticipantReportID);
             numberOfParticipants.current = val.length;
 
+            IOU.setMoneyRequestParticipants(transactionID, val);
+            IOU.setCustomUnitRateID(transactionID, rateID);
+
             // When multiple participants are selected, the reportID is generated at the end of the confirmation step.
             // So we are resetting selectedReportID ref to the reportID coming from params.
-            if (val.length !== 1) {
+            if (val.length !== 1 && !isInvoice) {
                 selectedReportID.current = reportID;
                 return;
             }
 
             // When a participant is selected, the reportID needs to be saved because that's the reportID that will be used in the confirmation step.
-            selectedReportID.current = val[0]?.reportID ?? reportID;
+            selectedReportID.current = firstParticipantReportID || reportID;
         },
-        [reportID, transactionID],
+        [iouType, reportID, transactionID, canUseP2PDistanceRequests],
     );
 
     const goToNextStep = useCallback(() => {
         const isCategorizing = action === CONST.IOU.ACTION.CATEGORIZE;
+        const isShareAction = action === CONST.IOU.ACTION.SHARE;
+
+        const isPolicyExpenseChat = participants?.some((participant) => participant.isPolicyExpenseChat);
+        if (iouType === CONST.IOU.TYPE.SPLIT && !isPolicyExpenseChat && transaction?.amount && transaction?.currency) {
+            const participantAccountIDs = participants?.map((participant) => participant.accountID) as number[];
+            IOU.setSplitShares(transaction, transaction.amount, transaction.currency, participantAccountIDs);
+        }
 
         IOU.setMoneyRequestTag(transactionID, '');
         IOU.setMoneyRequestCategory(transactionID, '');
+        if ((isCategorizing || isShareAction) && numberOfParticipants.current === 0) {
+            ReportUtils.createDraftWorkspaceAndNavigateToConfirmationScreen(transactionID, action);
+            return;
+        }
+
         const iouConfirmationPageRoute = ROUTES.MONEY_REQUEST_STEP_CONFIRMATION.getRoute(action, iouType, transactionID, selectedReportID.current || reportID);
         if (isCategorizing) {
             Navigation.navigate(ROUTES.MONEY_REQUEST_STEP_CATEGORY.getRoute(action, iouType, transactionID, selectedReportID.current || reportID, iouConfirmationPageRoute));
         } else {
             Navigation.navigate(iouConfirmationPageRoute);
         }
-    }, [iouType, transactionID, reportID, action]);
+    }, [iouType, transactionID, transaction, reportID, action, participants]);
 
     const navigateBack = useCallback(() => {
         IOUUtils.navigateToStartMoneyRequestStep(iouRequestType, iouType, transactionID, reportID, action);
     }, [iouRequestType, iouType, transactionID, reportID, action]);
 
+    useEffect(() => {
+        const isCategorizing = action === CONST.IOU.ACTION.CATEGORIZE;
+        const isShareAction = action === CONST.IOU.ACTION.SHARE;
+        if (isFocused && (isCategorizing || isShareAction)) {
+            IOU.setMoneyRequestParticipants(transactionID, []);
+            numberOfParticipants.current = 0;
+        }
+    }, [isFocused, action, transactionID]);
+
     return (
         <StepScreenWrapper
             headerTitle={headerTitle}
@@ -122,6 +161,14 @@ function IOURequestStepParticipants({
             testID={IOURequestStepParticipants.displayName}
             includeSafeAreaPaddingBottom={false}
         >
+            {skipConfirmation && (
+                <FormHelpMessage
+                    style={[styles.ph4, styles.mb4]}
+                    isError={false}
+                    shouldShowRedDotIndicator={false}
+                    message={translate('quickAction.noLongerHaveReportAccess')}
+                />
+            )}
             <MoneyRequestParticipantsSelector
                 participants={isSplitRequest ? participants : []}
                 onParticipantsAdded={addParticipant}
@@ -136,4 +183,13 @@ function IOURequestStepParticipants({
 
 IOURequestStepParticipants.displayName = 'IOURequestStepParticipants';
 
-export default withWritableReportOrNotFound(withFullTransactionOrNotFound(IOURequestStepParticipants));
+const IOURequestStepParticipantsWithOnyx = withOnyx<IOURequestStepParticipantsProps, IOURequestStepParticipantsOnyxProps>({
+    skipConfirmation: {
+        key: ({route}) => {
+            const transactionID = route.params.transactionID ?? -1;
+            return `${ONYXKEYS.COLLECTION.SKIP_CONFIRMATION}${transactionID}`;
+        },
+    },
+})(IOURequestStepParticipants);
+
+export default withWritableReportOrNotFound(withFullTransactionOrNotFound(IOURequestStepParticipantsWithOnyx));
diff --git a/src/pages/iou/request/step/IOURequestStepScan/LocationPermission/index.android.ts b/src/pages/iou/request/step/IOURequestStepScan/LocationPermission/index.android.ts
new file mode 100644
index 000000000000..bd2db49befbe
--- /dev/null
+++ b/src/pages/iou/request/step/IOURequestStepScan/LocationPermission/index.android.ts
@@ -0,0 +1,12 @@
+import {check, PERMISSIONS, request} from 'react-native-permissions';
+
+function requestLocationPermission() {
+    return request(PERMISSIONS.ANDROID.ACCESS_FINE_LOCATION);
+}
+
+// Android will never return blocked after a check, you have to request the permission to get the info.
+function getLocationPermission() {
+    return check(PERMISSIONS.ANDROID.ACCESS_FINE_LOCATION);
+}
+
+export {requestLocationPermission, getLocationPermission};
diff --git a/src/pages/iou/request/step/IOURequestStepScan/LocationPermission/index.ios.ts b/src/pages/iou/request/step/IOURequestStepScan/LocationPermission/index.ios.ts
new file mode 100644
index 000000000000..6d8dc6543bb2
--- /dev/null
+++ b/src/pages/iou/request/step/IOURequestStepScan/LocationPermission/index.ios.ts
@@ -0,0 +1,11 @@
+import {check, PERMISSIONS, request} from 'react-native-permissions';
+
+function requestLocationPermission() {
+    return request(PERMISSIONS.IOS.LOCATION_WHEN_IN_USE);
+}
+
+function getLocationPermission() {
+    return check(PERMISSIONS.IOS.LOCATION_WHEN_IN_USE);
+}
+
+export {requestLocationPermission, getLocationPermission};
diff --git a/src/pages/iou/request/step/IOURequestStepScan/LocationPermission/index.ts b/src/pages/iou/request/step/IOURequestStepScan/LocationPermission/index.ts
new file mode 100644
index 000000000000..6f6a87dbfef7
--- /dev/null
+++ b/src/pages/iou/request/step/IOURequestStepScan/LocationPermission/index.ts
@@ -0,0 +1,38 @@
+import {RESULTS} from 'react-native-permissions';
+import type {PermissionStatus} from 'react-native-permissions';
+import CONST from '@src/CONST';
+
+function requestLocationPermission(): Promise<PermissionStatus> {
+    return new Promise((resolve) => {
+        if (navigator.geolocation) {
+            navigator.geolocation.getCurrentPosition(
+                () => resolve(RESULTS.GRANTED),
+                (error) => resolve(error.TIMEOUT || error.POSITION_UNAVAILABLE ? RESULTS.BLOCKED : RESULTS.DENIED),
+                {
+                    timeout: CONST.GPS.TIMEOUT,
+                    enableHighAccuracy: true,
+                },
+            );
+        } else {
+            resolve(RESULTS.UNAVAILABLE);
+        }
+    });
+}
+
+function getLocationPermission(): Promise<PermissionStatus> {
+    return new Promise((resolve) => {
+        if (navigator.geolocation) {
+            navigator.permissions.query({name: 'geolocation'}).then((result) => {
+                if (result.state === 'prompt') {
+                    resolve(RESULTS.DENIED);
+                    return;
+                }
+                resolve(result.state === 'granted' ? RESULTS.GRANTED : RESULTS.BLOCKED);
+            });
+        } else {
+            resolve(RESULTS.UNAVAILABLE);
+        }
+    });
+}
+
+export {requestLocationPermission, getLocationPermission};
diff --git a/src/pages/iou/request/step/IOURequestStepScan/NavigationAwareCamera/Camera.tsx b/src/pages/iou/request/step/IOURequestStepScan/NavigationAwareCamera/Camera.tsx
new file mode 100644
index 000000000000..e24901dcaa51
--- /dev/null
+++ b/src/pages/iou/request/step/IOURequestStepScan/NavigationAwareCamera/Camera.tsx
@@ -0,0 +1,24 @@
+import React from 'react';
+import type {ForwardedRef} from 'react';
+import {Camera as VisionCamera} from 'react-native-vision-camera';
+import useTabNavigatorFocus from '@hooks/useTabNavigatorFocus';
+import type {NavigationAwareCameraNativeProps} from './types';
+
+// Wraps a camera that will only be active when the tab is focused or as soon as it starts to become focused.
+function Camera({cameraTabIndex, ...props}: NavigationAwareCameraNativeProps, ref: ForwardedRef<VisionCamera>) {
+    const isCameraActive = useTabNavigatorFocus({tabIndex: cameraTabIndex});
+
+    return (
+        <VisionCamera
+            ref={ref}
+            photoQualityBalance="speed"
+            // eslint-disable-next-line react/jsx-props-no-spreading
+            {...props}
+            isActive={isCameraActive}
+        />
+    );
+}
+
+Camera.displayName = 'NavigationAwareCamera';
+
+export default React.forwardRef(Camera);
diff --git a/src/pages/iou/request/step/IOURequestStepScan/NavigationAwareCamera/WebCamera.tsx b/src/pages/iou/request/step/IOURequestStepScan/NavigationAwareCamera/WebCamera.tsx
new file mode 100644
index 000000000000..cc2b0f164a78
--- /dev/null
+++ b/src/pages/iou/request/step/IOURequestStepScan/NavigationAwareCamera/WebCamera.tsx
@@ -0,0 +1,31 @@
+import React from 'react';
+import type {ForwardedRef} from 'react';
+import {View} from 'react-native';
+import type {Camera} from 'react-native-vision-camera';
+import Webcam from 'react-webcam';
+import useTabNavigatorFocus from '@hooks/useTabNavigatorFocus';
+import type {NavigationAwareCameraProps} from './types';
+
+// Wraps a camera that will only be active when the tab is focused or as soon as it starts to become focused.
+function WebCamera({torchOn, onTorchAvailability, cameraTabIndex, ...props}: NavigationAwareCameraProps, ref: ForwardedRef<Webcam | Camera>) {
+    const shouldShowCamera = useTabNavigatorFocus({
+        tabIndex: cameraTabIndex,
+    });
+
+    if (!shouldShowCamera) {
+        return null;
+    }
+    return (
+        <View>
+            <Webcam
+                // eslint-disable-next-line react/jsx-props-no-spreading
+                {...props}
+                ref={ref as unknown as ForwardedRef<Webcam>}
+            />
+        </View>
+    );
+}
+
+WebCamera.displayName = 'NavigationAwareCamera';
+
+export default React.forwardRef(WebCamera);
diff --git a/src/pages/iou/request/step/IOURequestStepScan/NavigationAwareCamera/index.native.tsx b/src/pages/iou/request/step/IOURequestStepScan/NavigationAwareCamera/index.native.tsx
deleted file mode 100644
index beeb8938e917..000000000000
--- a/src/pages/iou/request/step/IOURequestStepScan/NavigationAwareCamera/index.native.tsx
+++ /dev/null
@@ -1,24 +0,0 @@
-import React from 'react';
-import type {ForwardedRef} from 'react';
-import {Camera} from 'react-native-vision-camera';
-import useTabNavigatorFocus from '@hooks/useTabNavigatorFocus';
-import type {NavigationAwareCameraNativeProps} from './types';
-
-// Wraps a camera that will only be active when the tab is focused or as soon as it starts to become focused.
-function NavigationAwareCamera({cameraTabIndex, ...props}: NavigationAwareCameraNativeProps, ref: ForwardedRef<Camera>) {
-    const isCameraActive = useTabNavigatorFocus({tabIndex: cameraTabIndex});
-
-    return (
-        <Camera
-            ref={ref}
-            photoQualityBalance="speed"
-            // eslint-disable-next-line react/jsx-props-no-spreading
-            {...props}
-            isActive={isCameraActive}
-        />
-    );
-}
-
-NavigationAwareCamera.displayName = 'NavigationAwareCamera';
-
-export default React.forwardRef(NavigationAwareCamera);
diff --git a/src/pages/iou/request/step/IOURequestStepScan/NavigationAwareCamera/index.tsx b/src/pages/iou/request/step/IOURequestStepScan/NavigationAwareCamera/index.tsx
deleted file mode 100644
index 2e5f1b2014b3..000000000000
--- a/src/pages/iou/request/step/IOURequestStepScan/NavigationAwareCamera/index.tsx
+++ /dev/null
@@ -1,31 +0,0 @@
-import React from 'react';
-import type {ForwardedRef} from 'react';
-import {View} from 'react-native';
-import type {Camera} from 'react-native-vision-camera';
-import Webcam from 'react-webcam';
-import useTabNavigatorFocus from '@hooks/useTabNavigatorFocus';
-import type {NavigationAwareCameraProps} from './types';
-
-// Wraps a camera that will only be active when the tab is focused or as soon as it starts to become focused.
-function NavigationAwareCamera({torchOn, onTorchAvailability, cameraTabIndex, ...props}: NavigationAwareCameraProps, ref: ForwardedRef<Webcam | Camera>) {
-    const shouldShowCamera = useTabNavigatorFocus({
-        tabIndex: cameraTabIndex,
-    });
-
-    if (!shouldShowCamera) {
-        return null;
-    }
-    return (
-        <View>
-            <Webcam
-                // eslint-disable-next-line react/jsx-props-no-spreading
-                {...props}
-                ref={ref as unknown as ForwardedRef<Webcam>}
-            />
-        </View>
-    );
-}
-
-NavigationAwareCamera.displayName = 'NavigationAwareCamera';
-
-export default React.forwardRef(NavigationAwareCamera);
diff --git a/src/pages/iou/request/step/IOURequestStepScan/NavigationAwareCamera/types.ts b/src/pages/iou/request/step/IOURequestStepScan/NavigationAwareCamera/types.ts
index 0e6845792122..555cb7a92367 100644
--- a/src/pages/iou/request/step/IOURequestStepScan/NavigationAwareCamera/types.ts
+++ b/src/pages/iou/request/step/IOURequestStepScan/NavigationAwareCamera/types.ts
@@ -12,7 +12,7 @@ type NavigationAwareCameraProps = WebcamProps & {
     cameraTabIndex: number;
 };
 
-type NavigationAwareCameraNativeProps = CameraProps & {
+type NavigationAwareCameraNativeProps = Omit<CameraProps, 'isActive'> & {
     cameraTabIndex: number;
 };
 
diff --git a/src/pages/iou/request/step/IOURequestStepScan/index.native.tsx b/src/pages/iou/request/step/IOURequestStepScan/index.native.tsx
index 5a95b78779e5..536b8eefecb4 100644
--- a/src/pages/iou/request/step/IOURequestStepScan/index.native.tsx
+++ b/src/pages/iou/request/step/IOURequestStepScan/index.native.tsx
@@ -1,20 +1,24 @@
 import {useFocusEffect} from '@react-navigation/core';
+import {Str} from 'expensify-common';
 import React, {useCallback, useMemo, useRef, useState} from 'react';
 import {ActivityIndicator, Alert, AppState, InteractionManager, View} from 'react-native';
 import {Gesture, GestureDetector} from 'react-native-gesture-handler';
-import {withOnyx} from 'react-native-onyx';
+import {useOnyx, withOnyx} from 'react-native-onyx';
 import {RESULTS} from 'react-native-permissions';
 import Animated, {runOnJS, useAnimatedStyle, useSharedValue, withDelay, withSequence, withSpring, withTiming} from 'react-native-reanimated';
 import type {Camera, PhotoFile, Point} from 'react-native-vision-camera';
 import {useCameraDevice} from 'react-native-vision-camera';
+import type {TupleToUnion} from 'type-fest';
 import Hand from '@assets/images/hand.svg';
 import Shutter from '@assets/images/shutter.svg';
 import type {FileObject} from '@components/AttachmentModal';
 import AttachmentPicker from '@components/AttachmentPicker';
 import Button from '@components/Button';
+import FullScreenLoadingIndicator from '@components/FullscreenLoadingIndicator';
 import Icon from '@components/Icon';
 import * as Expensicons from '@components/Icon/Expensicons';
 import ImageSVG from '@components/ImageSVG';
+import PDFThumbnail from '@components/PDFThumbnail';
 import PressableWithFeedback from '@components/Pressable/PressableWithFeedback';
 import Text from '@components/Text';
 import withCurrentUserPersonalDetails from '@components/withCurrentUserPersonalDetails';
@@ -22,10 +26,13 @@ import useLocalize from '@hooks/useLocalize';
 import useTheme from '@hooks/useTheme';
 import useThemeStyles from '@hooks/useThemeStyles';
 import * as FileUtils from '@libs/fileDownload/FileUtils';
+import getPhotoSource from '@libs/fileDownload/getPhotoSource';
+import getCurrentPosition from '@libs/getCurrentPosition';
 import Log from '@libs/Log';
 import Navigation from '@libs/Navigation/Navigation';
 import * as OptionsListUtils from '@libs/OptionsListUtils';
 import * as ReportUtils from '@libs/ReportUtils';
+import * as TransactionUtils from '@libs/TransactionUtils';
 import StepScreenWrapper from '@pages/iou/request/step/StepScreenWrapper';
 import withFullTransactionOrNotFound from '@pages/iou/request/step/withFullTransactionOrNotFound';
 import withWritableReportOrNotFound from '@pages/iou/request/step/withWritableReportOrNotFound';
@@ -35,7 +42,7 @@ import ONYXKEYS from '@src/ONYXKEYS';
 import ROUTES from '@src/ROUTES';
 import type {Receipt} from '@src/types/onyx/Transaction';
 import CameraPermission from './CameraPermission';
-import NavigationAwareCamera from './NavigationAwareCamera';
+import NavigationAwareCamera from './NavigationAwareCamera/Camera';
 import type {IOURequestStepOnyxProps, IOURequestStepScanProps} from './types';
 
 function IOURequestStepScan({
@@ -56,11 +63,19 @@ function IOURequestStepScan({
         physicalDevices: ['wide-angle-camera', 'ultra-wide-angle-camera'],
     });
 
-    const hasFlash = device != null && device.hasFlash;
+    const hasFlash = !!device?.hasFlash;
     const camera = useRef<Camera>(null);
     const [flash, setFlash] = useState(false);
+    const [reportNameValuePairs] = useOnyx(`${ONYXKEYS.COLLECTION.REPORT_NAME_VALUE_PAIRS}${report?.reportID ?? -1}`);
     const [cameraPermissionStatus, setCameraPermissionStatus] = useState<string | null>(null);
     const [didCapturePhoto, setDidCapturePhoto] = useState(false);
+    const [isLoadingReceipt, setIsLoadingReceipt] = useState(false);
+
+    const [pdfFile, setPdfFile] = useState<null | FileObject>(null);
+
+    const defaultTaxCode = TransactionUtils.getDefaultTaxCode(policy, transaction);
+    const transactionTaxCode = (transaction?.taxCode ? transaction?.taxCode : defaultTaxCode) ?? '';
+    const transactionTaxAmount = transaction?.taxAmount ?? 0;
 
     // For quick button actions, we'll skip the confirmation page unless the report is archived or this is a workspace
     // request and the workspace requires a category or a tag
@@ -69,8 +84,10 @@ function IOURequestStepScan({
             return false;
         }
 
-        return !ReportUtils.isArchivedRoom(report) && !(ReportUtils.isPolicyExpenseChat(report) && ((policy?.requiresCategory ?? false) || (policy?.requiresTag ?? false)));
-    }, [report, skipConfirmation, policy]);
+        return (
+            !ReportUtils.isArchivedRoom(report, reportNameValuePairs) && !(ReportUtils.isPolicyExpenseChat(report) && ((policy?.requiresCategory ?? false) || (policy?.requiresTag ?? false)))
+        );
+    }, [report, skipConfirmation, policy, reportNameValuePairs]);
 
     const {translate} = useLocalize();
 
@@ -104,11 +121,11 @@ function IOURequestStepScan({
             return;
         }
 
-        camera.current.focus(point).catch((ex) => {
-            if (ex.message === '[unknown/unknown] Cancelled by another startFocusAndMetering()') {
+        camera.current.focus(point).catch((error: Record<string, unknown>) => {
+            if (error.message === '[unknown/unknown] Cancelled by another startFocusAndMetering()') {
                 return;
             }
-            Log.warn('Error focusing camera', ex);
+            Log.warn('Error focusing camera', error);
         });
     };
 
@@ -117,6 +134,7 @@ function IOURequestStepScan({
         .onStart((ev: {x: number; y: number}) => {
             const point = {x: ev.x, y: ev.y};
 
+            // eslint-disable-next-line react-compiler/react-compiler
             focusIndicatorOpacity.value = withSequence(withTiming(0.8, {duration: 250}), withDelay(1000, withTiming(0, {duration: 250})));
             focusIndicatorScale.value = 2;
             focusIndicatorScale.value = withSpring(1, {damping: 10, stiffness: 200});
@@ -157,13 +175,15 @@ function IOURequestStepScan({
     const validateReceipt = (file: FileObject) => {
         const {fileExtension} = FileUtils.splitExtensionFromFileName(file?.name ?? '');
         if (
-            !CONST.API_ATTACHMENT_VALIDATIONS.ALLOWED_RECEIPT_EXTENSIONS.includes(fileExtension.toLowerCase() as (typeof CONST.API_ATTACHMENT_VALIDATIONS.ALLOWED_RECEIPT_EXTENSIONS)[number])
+            !CONST.API_ATTACHMENT_VALIDATIONS.ALLOWED_RECEIPT_EXTENSIONS.includes(
+                fileExtension.toLowerCase() as TupleToUnion<typeof CONST.API_ATTACHMENT_VALIDATIONS.ALLOWED_RECEIPT_EXTENSIONS>,
+            )
         ) {
             Alert.alert(translate('attachmentPicker.wrongFileType'), translate('attachmentPicker.notAllowedExtension'));
             return false;
         }
 
-        if ((file?.size ?? 0) > CONST.API_ATTACHMENT_VALIDATIONS.MAX_SIZE) {
+        if (!Str.isImage(file.name ?? '') && (file?.size ?? 0) > CONST.API_ATTACHMENT_VALIDATIONS.MAX_SIZE) {
             Alert.alert(translate('attachmentPicker.attachmentTooLarge'), translate('attachmentPicker.sizeExceeded'));
             return false;
         }
@@ -222,7 +242,7 @@ function IOURequestStepScan({
             // be added to the transaction (taken from the chat report participants) and then the person is taken to the confirmation step.
             const selectedParticipants = IOU.setMoneyRequestParticipantsFromReport(transactionID, report);
             const participants = selectedParticipants.map((participant) => {
-                const participantAccountID = participant?.accountID ?? 0;
+                const participantAccountID = participant?.accountID ?? -1;
                 return participantAccountID ? OptionsListUtils.getParticipantsOption(participant, personalDetails) : OptionsListUtils.getReportOption(participant);
             });
 
@@ -234,43 +254,108 @@ function IOURequestStepScan({
                     IOU.startSplitBill({
                         participants,
                         currentUserLogin: currentUserPersonalDetails?.login ?? '',
-                        currentUserAccountID: currentUserPersonalDetails?.accountID ?? 0,
+                        currentUserAccountID: currentUserPersonalDetails?.accountID ?? -1,
                         comment: '',
                         receipt,
-                        existingSplitChatReportID: reportID ?? 0,
+                        existingSplitChatReportID: reportID ?? -1,
                         billable: false,
                         category: '',
                         tag: '',
                         currency: transaction?.currency ?? 'USD',
+                        taxCode: transactionTaxCode,
+                        taxAmount: transactionTaxAmount,
                     });
                     return;
                 }
-                if (iouType === CONST.IOU.TYPE.TRACK && report) {
-                    IOU.trackExpense(
-                        report,
-                        0,
-                        transaction?.currency ?? 'USD',
-                        transaction?.created ?? '',
-                        '',
-                        currentUserPersonalDetails.login,
-                        currentUserPersonalDetails.accountID,
-                        participants[0],
-                        '',
-                        receipt,
-                    );
-                    return;
-                }
-                IOU.requestMoney(
-                    report,
-                    0,
-                    transaction?.currency ?? 'USD',
-                    transaction?.created ?? '',
-                    '',
-                    currentUserPersonalDetails.login,
-                    currentUserPersonalDetails.accountID,
-                    participants[0],
-                    '',
-                    receipt,
+                getCurrentPosition(
+                    (successData) => {
+                        if (iouType === CONST.IOU.TYPE.TRACK && report) {
+                            IOU.trackExpense(
+                                report,
+                                0,
+                                transaction?.currency ?? 'USD',
+                                transaction?.created ?? '',
+                                '',
+                                currentUserPersonalDetails.login,
+                                currentUserPersonalDetails.accountID,
+                                participants[0],
+                                '',
+                                receipt,
+                                '',
+                                '',
+                                '',
+                                0,
+                                false,
+                                policy,
+                                {},
+                                {},
+                                {
+                                    lat: successData.coords.latitude,
+                                    long: successData.coords.longitude,
+                                },
+                            );
+                        } else {
+                            IOU.requestMoney(
+                                report,
+                                0,
+                                transaction?.currency ?? 'USD',
+                                transaction?.created ?? '',
+                                '',
+                                currentUserPersonalDetails.login,
+                                currentUserPersonalDetails.accountID,
+                                participants[0],
+                                '',
+                                receipt,
+                                '',
+                                '',
+                                '',
+                                0,
+                                false,
+                                policy,
+                                {},
+                                {},
+                                {
+                                    lat: successData.coords.latitude,
+                                    long: successData.coords.longitude,
+                                },
+                            );
+                        }
+                    },
+                    (errorData) => {
+                        Log.info('[IOURequestStepScan] getCurrentPosition failed', false, errorData);
+                        // When there is an error, the money can still be requested, it just won't include the GPS coordinates
+                        if (iouType === CONST.IOU.TYPE.TRACK && report) {
+                            IOU.trackExpense(
+                                report,
+                                0,
+                                transaction?.currency ?? 'USD',
+                                transaction?.created ?? '',
+                                '',
+                                currentUserPersonalDetails.login,
+                                currentUserPersonalDetails.accountID,
+                                participants[0],
+                                '',
+                                receipt,
+                            );
+                        } else {
+                            IOU.requestMoney(
+                                report,
+                                0,
+                                transaction?.currency ?? 'USD',
+                                transaction?.created ?? '',
+                                '',
+                                currentUserPersonalDetails.login,
+                                currentUserPersonalDetails.accountID,
+                                participants[0],
+                                '',
+                                receipt,
+                            );
+                        }
+                    },
+                    {
+                        maximumAge: CONST.GPS.MAX_AGE,
+                        timeout: CONST.GPS.TIMEOUT,
+                    },
                 );
                 return;
             }
@@ -288,12 +373,15 @@ function IOURequestStepScan({
             transaction,
             navigateToConfirmationPage,
             navigateToParticipantPage,
+            policy,
+            transactionTaxCode,
+            transactionTaxAmount,
         ],
     );
 
     const updateScanAndNavigate = useCallback(
         (file: FileObject, source: string) => {
-            Navigation.dismissModal();
+            navigateBack();
             IOU.replaceReceipt(transactionID, file as File, source);
         },
         [transactionID],
@@ -302,22 +390,36 @@ function IOURequestStepScan({
     /**
      * Sets the Receipt objects and navigates the user to the next page
      */
-    const setReceiptAndNavigate = (file: FileObject) => {
-        if (!validateReceipt(file)) {
+    const setReceiptAndNavigate = (originalFile: FileObject, isPdfValidated?: boolean) => {
+        if (!validateReceipt(originalFile)) {
             return;
         }
 
-        // Store the receipt on the transaction object in Onyx
-        // On Android devices, fetching blob for a file with name containing spaces fails to retrieve the type of file.
-        // So, let us also save the file type in receipt for later use during blob fetch
-        IOU.setMoneyRequestReceipt(transactionID, file?.uri ?? '', file.name ?? '', action !== CONST.IOU.ACTION.EDIT, file.type);
-
-        if (action === CONST.IOU.ACTION.EDIT) {
-            updateScanAndNavigate(file, file?.uri ?? '');
+        // If we have a pdf file and if it is not validated then set the pdf file for validation and return
+        if (Str.isPDF(originalFile.name ?? '') && !isPdfValidated) {
+            setPdfFile(originalFile);
             return;
         }
 
-        navigateToConfirmationStep(file, file.uri ?? '');
+        // With the image size > 24MB, we use manipulateAsync to resize the image.
+        // It takes a long time so we should display a loading indicator while the resize image progresses.
+        if (Str.isImage(originalFile.name ?? '') && (originalFile?.size ?? 0) > CONST.API_ATTACHMENT_VALIDATIONS.MAX_SIZE) {
+            setIsLoadingReceipt(true);
+        }
+        FileUtils.resizeImageIfNeeded(originalFile).then((file) => {
+            setIsLoadingReceipt(false);
+            // Store the receipt on the transaction object in Onyx
+            // On Android devices, fetching blob for a file with name containing spaces fails to retrieve the type of file.
+            // So, let us also save the file type in receipt for later use during blob fetch
+            IOU.setMoneyRequestReceipt(transactionID, file?.uri ?? '', file.name ?? '', action !== CONST.IOU.ACTION.EDIT, file.type);
+
+            if (action === CONST.IOU.ACTION.EDIT) {
+                updateScanAndNavigate(file, file?.uri ?? '');
+                return;
+            }
+
+            navigateToConfirmationStep(file, file.uri ?? '');
+        });
     };
 
     const capturePhoto = useCallback(() => {
@@ -345,7 +447,7 @@ function IOURequestStepScan({
             })
             .then((photo: PhotoFile) => {
                 // Store the receipt on the transaction object in Onyx
-                const source = `file://${photo.path}`;
+                const source = getPhotoSource(photo.path);
                 IOU.setMoneyRequestReceipt(transactionID, source, photo.path, action !== CONST.IOU.ACTION.EDIT);
 
                 FileUtils.readFileAsync(source, photo.path, (file) => {
@@ -374,9 +476,30 @@ function IOURequestStepScan({
             includeSafeAreaPaddingBottom
             headerTitle={translate('common.receipt')}
             onBackButtonPress={navigateBack}
-            shouldShowWrapper={Boolean(backTo)}
+            shouldShowWrapper={!!backTo}
             testID={IOURequestStepScan.displayName}
         >
+            {isLoadingReceipt && <FullScreenLoadingIndicator />}
+            {pdfFile && (
+                <PDFThumbnail
+                    style={styles.invisiblePDF}
+                    previewSourceURL={pdfFile?.uri ?? ''}
+                    onLoadSuccess={() => {
+                        setPdfFile(null);
+                        if (pdfFile) {
+                            setReceiptAndNavigate(pdfFile, true);
+                        }
+                    }}
+                    onPassword={() => {
+                        setPdfFile(null);
+                        Alert.alert(translate('attachmentPicker.attachmentError'), translate('attachmentPicker.protectedPDFNotSupported'));
+                    }}
+                    onLoadError={() => {
+                        setPdfFile(null);
+                        Alert.alert(translate('attachmentPicker.attachmentError'), translate('attachmentPicker.errorWhileSelectingCorruptedAttachment'));
+                    }}
+                />
+            )}
             {cameraPermissionStatus !== RESULTS.GRANTED && (
                 <View style={[styles.cameraView, styles.permissionView, styles.userSelectNone]}>
                     <ImageSVG
@@ -415,8 +538,7 @@ function IOURequestStepScan({
                             <NavigationAwareCamera
                                 ref={camera}
                                 device={device}
-                                // @ts-expect-error The HOC are not migrated to TypeScript yet
-                                style={[styles.flex1]}
+                                style={styles.flex1}
                                 zoom={device.neutralZoom}
                                 photo
                                 cameraTabIndex={1}
@@ -431,7 +553,7 @@ function IOURequestStepScan({
                 <AttachmentPicker>
                     {({openPicker}) => (
                         <PressableWithFeedback
-                            role={CONST.ACCESSIBILITY_ROLE.BUTTON}
+                            role={CONST.ROLE.BUTTON}
                             accessibilityLabel={translate('receipt.gallery')}
                             style={[styles.alignItemsStart]}
                             onPress={() => {
@@ -450,7 +572,7 @@ function IOURequestStepScan({
                     )}
                 </AttachmentPicker>
                 <PressableWithFeedback
-                    role={CONST.ACCESSIBILITY_ROLE.BUTTON}
+                    role={CONST.ROLE.BUTTON}
                     accessibilityLabel={translate('receipt.shutter')}
                     style={[styles.alignItemsCenter]}
                     onPress={capturePhoto}
@@ -464,7 +586,7 @@ function IOURequestStepScan({
                 </PressableWithFeedback>
                 {hasFlash && (
                     <PressableWithFeedback
-                        role={CONST.ACCESSIBILITY_ROLE.BUTTON}
+                        role={CONST.ROLE.BUTTON}
                         accessibilityLabel={translate('receipt.flash')}
                         style={[styles.alignItemsEnd]}
                         disabled={cameraPermissionStatus !== RESULTS.GRANTED}
@@ -487,14 +609,14 @@ IOURequestStepScan.displayName = 'IOURequestStepScan';
 
 const IOURequestStepScanWithOnyx = withOnyx<IOURequestStepScanProps, IOURequestStepOnyxProps>({
     policy: {
-        key: ({report}) => `${ONYXKEYS.COLLECTION.POLICY}${report ? report.policyID : '0'}`,
+        key: ({report}) => `${ONYXKEYS.COLLECTION.POLICY}${report ? report.policyID : '-1'}`,
     },
     personalDetails: {
         key: ONYXKEYS.PERSONAL_DETAILS_LIST,
     },
     skipConfirmation: {
         key: ({route}) => {
-            const transactionID = route.params.transactionID ?? 0;
+            const transactionID = route.params.transactionID ?? -1;
             return `${ONYXKEYS.COLLECTION.SKIP_CONFIRMATION}${transactionID}`;
         },
     },
diff --git a/src/pages/iou/request/step/IOURequestStepScan/index.tsx b/src/pages/iou/request/step/IOURequestStepScan/index.tsx
index c391d87e23be..2d44502cdbe9 100644
--- a/src/pages/iou/request/step/IOURequestStepScan/index.tsx
+++ b/src/pages/iou/request/step/IOURequestStepScan/index.tsx
@@ -1,7 +1,9 @@
+import {Str} from 'expensify-common';
 import React, {useCallback, useContext, useEffect, useMemo, useReducer, useRef, useState} from 'react';
 import {ActivityIndicator, PanResponder, PixelRatio, View} from 'react-native';
-import {withOnyx} from 'react-native-onyx';
+import {useOnyx, withOnyx} from 'react-native-onyx';
 import type Webcam from 'react-webcam';
+import type {TupleToUnion} from 'type-fest';
 import Hand from '@assets/images/hand.svg';
 import ReceiptUpload from '@assets/images/receipt-upload.svg';
 import Shutter from '@assets/images/shutter.svg';
@@ -11,21 +13,26 @@ import Button from '@components/Button';
 import ConfirmModal from '@components/ConfirmModal';
 import CopyTextToClipboard from '@components/CopyTextToClipboard';
 import {DragAndDropContext} from '@components/DragAndDrop/Provider';
+import FullScreenLoadingIndicator from '@components/FullscreenLoadingIndicator';
 import Icon from '@components/Icon';
 import * as Expensicons from '@components/Icon/Expensicons';
+import PDFThumbnail from '@components/PDFThumbnail';
 import PressableWithFeedback from '@components/Pressable/PressableWithFeedback';
 import Text from '@components/Text';
 import withCurrentUserPersonalDetails from '@components/withCurrentUserPersonalDetails';
 import useLocalize from '@hooks/useLocalize';
+import useResponsiveLayout from '@hooks/useResponsiveLayout';
 import useTabNavigatorFocus from '@hooks/useTabNavigatorFocus';
 import useTheme from '@hooks/useTheme';
 import useThemeStyles from '@hooks/useThemeStyles';
-import useWindowDimensions from '@hooks/useWindowDimensions';
 import * as Browser from '@libs/Browser';
 import * as FileUtils from '@libs/fileDownload/FileUtils';
+import getCurrentPosition from '@libs/getCurrentPosition';
+import Log from '@libs/Log';
 import Navigation from '@libs/Navigation/Navigation';
 import * as OptionsListUtils from '@libs/OptionsListUtils';
 import * as ReportUtils from '@libs/ReportUtils';
+import * as TransactionUtils from '@libs/TransactionUtils';
 import ReceiptDropUI from '@pages/iou/ReceiptDropUI';
 import StepScreenDragAndDropWrapper from '@pages/iou/request/step/StepScreenDragAndDropWrapper';
 import withFullTransactionOrNotFound from '@pages/iou/request/step/withFullTransactionOrNotFound';
@@ -37,7 +44,7 @@ import ONYXKEYS from '@src/ONYXKEYS';
 import ROUTES from '@src/ROUTES';
 import type {Receipt} from '@src/types/onyx/Transaction';
 import {isEmptyObject} from '@src/types/utils/EmptyObject';
-import NavigationAwareCamera from './NavigationAwareCamera';
+import NavigationAwareCamera from './NavigationAwareCamera/WebCamera';
 import type {IOURequestStepOnyxProps, IOURequestStepScanProps} from './types';
 
 function IOURequestStepScan({
@@ -58,12 +65,11 @@ function IOURequestStepScan({
     const [isAttachmentInvalid, setIsAttachmentInvalid] = useState(false);
     const [attachmentInvalidReasonTitle, setAttachmentInvalidReasonTitle] = useState<TranslationPaths>();
     const [attachmentInvalidReason, setAttachmentValidReason] = useState<TranslationPaths>();
-
+    const [pdfFile, setPdfFile] = useState<null | FileObject>(null);
     const [receiptImageTopPosition, setReceiptImageTopPosition] = useState(0);
-    const {isSmallScreenWidth} = useWindowDimensions();
+    const {isSmallScreenWidth} = useResponsiveLayout();
     const {translate} = useLocalize();
     const {isDraggingOver} = useContext(DragAndDropContext);
-
     const [cameraPermissionState, setCameraPermissionState] = useState<PermissionState | undefined>('prompt');
     const [isFlashLightOn, toggleFlashlight] = useReducer((state) => !state, false);
     const [isTorchAvailable, setIsTorchAvailable] = useState(false);
@@ -72,11 +78,17 @@ function IOURequestStepScan({
     const [isQueriedPermissionState, setIsQueriedPermissionState] = useState(false);
 
     const getScreenshotTimeoutRef = useRef<NodeJS.Timeout | null>(null);
+    const [reportNameValuePairs] = useOnyx(`${ONYXKEYS.COLLECTION.REPORT_NAME_VALUE_PAIRS}${report?.reportID ?? -1}`);
+    const [isLoadingReceipt, setIsLoadingReceipt] = useState(false);
 
     const [videoConstraints, setVideoConstraints] = useState<MediaTrackConstraints>();
     const tabIndex = 1;
     const isTabActive = useTabNavigatorFocus({tabIndex});
 
+    const defaultTaxCode = TransactionUtils.getDefaultTaxCode(policy, transaction);
+    const transactionTaxCode = (transaction?.taxCode ? transaction?.taxCode : defaultTaxCode) ?? '';
+    const transactionTaxAmount = transaction?.taxAmount ?? 0;
+
     // For quick button actions, we'll skip the confirmation page unless the report is archived or this is a workspace
     // request and the workspace requires a category or a tag
     const shouldSkipConfirmation: boolean = useMemo(() => {
@@ -84,8 +96,10 @@ function IOURequestStepScan({
             return false;
         }
 
-        return !ReportUtils.isArchivedRoom(report) && !(ReportUtils.isPolicyExpenseChat(report) && ((policy?.requiresCategory ?? false) || (policy?.requiresTag ?? false)));
-    }, [report, skipConfirmation, policy]);
+        return (
+            !ReportUtils.isArchivedRoom(report, reportNameValuePairs) && !(ReportUtils.isPolicyExpenseChat(report) && ((policy?.requiresCategory ?? false) || (policy?.requiresTag ?? false)))
+        );
+    }, [report, skipConfirmation, policy, reportNameValuePairs]);
 
     /**
      * On phones that have ultra-wide lens, react-webcam uses ultra-wide by default.
@@ -98,7 +112,6 @@ function IOURequestStepScan({
 
         const defaultConstraints = {facingMode: {exact: 'environment'}};
         navigator.mediaDevices
-            // @ts-expect-error there is a type mismatch in typescipt types for MediaStreamTrack microsoft/TypeScript#39010
             .getUserMedia({video: {facingMode: {exact: 'environment'}, zoom: {ideal: 1}}})
             .then((stream) => {
                 setCameraPermissionState('granted');
@@ -108,7 +121,6 @@ function IOURequestStepScan({
                     let deviceId;
                     for (const track of stream.getTracks()) {
                         const setting = track.getSettings();
-                        // @ts-expect-error there is a type mismatch in typescipt types for MediaStreamTrack microsoft/TypeScript#39010
                         if (setting.zoom === 1) {
                             deviceId = setting.deviceId;
                             break;
@@ -143,7 +155,7 @@ function IOURequestStepScan({
                 setVideoConstraints(defaultConstraints);
                 setCameraPermissionState('denied');
             });
-        // eslint-disable-next-line react-hooks/exhaustive-deps
+        // eslint-disable-next-line react-compiler/react-compiler, react-hooks/exhaustive-deps
     }, []);
 
     useEffect(() => {
@@ -152,7 +164,6 @@ function IOURequestStepScan({
         }
         navigator.permissions
             .query({
-                // @ts-expect-error camera does exist in PermissionName
                 name: 'camera',
             })
             .then((permissionState) => {
@@ -168,7 +179,7 @@ function IOURequestStepScan({
                 setIsQueriedPermissionState(true);
             });
         // We only want to get the camera permission status when the component is mounted
-        // eslint-disable-next-line react-hooks/exhaustive-deps
+        // eslint-disable-next-line react-compiler/react-compiler, react-hooks/exhaustive-deps
     }, [isTabActive]);
 
     const hideRecieptModal = () => {
@@ -182,6 +193,7 @@ function IOURequestStepScan({
         setIsAttachmentInvalid(isInvalid);
         setAttachmentInvalidReasonTitle(title);
         setAttachmentValidReason(reason);
+        setPdfFile(null);
     };
 
     function validateReceipt(file: FileObject) {
@@ -190,14 +202,14 @@ function IOURequestStepScan({
                 const {fileExtension} = FileUtils.splitExtensionFromFileName(file?.name ?? '');
                 if (
                     !CONST.API_ATTACHMENT_VALIDATIONS.ALLOWED_RECEIPT_EXTENSIONS.includes(
-                        fileExtension.toLowerCase() as (typeof CONST.API_ATTACHMENT_VALIDATIONS.ALLOWED_RECEIPT_EXTENSIONS)[number],
+                        fileExtension.toLowerCase() as TupleToUnion<typeof CONST.API_ATTACHMENT_VALIDATIONS.ALLOWED_RECEIPT_EXTENSIONS>,
                     )
                 ) {
                     setUploadReceiptError(true, 'attachmentPicker.wrongFileType', 'attachmentPicker.notAllowedExtension');
                     return false;
                 }
 
-                if ((file?.size ?? 0) > CONST.API_ATTACHMENT_VALIDATIONS.MAX_SIZE) {
+                if (!Str.isImage(file.name ?? '') && (file?.size ?? 0) > CONST.API_ATTACHMENT_VALIDATIONS.MAX_SIZE) {
                     setUploadReceiptError(true, 'attachmentPicker.attachmentTooLarge', 'attachmentPicker.sizeExceeded');
                     return false;
                 }
@@ -206,18 +218,17 @@ function IOURequestStepScan({
                     setUploadReceiptError(true, 'attachmentPicker.attachmentTooSmall', 'attachmentPicker.sizeNotMet');
                     return false;
                 }
-
                 return true;
             })
             .catch(() => {
-                setUploadReceiptError(true, 'attachmentPicker.attachmentError', 'attachmentPicker.errorWhileSelectingCorruptedImage');
+                setUploadReceiptError(true, 'attachmentPicker.attachmentError', 'attachmentPicker.errorWhileSelectingCorruptedAttachment');
                 return false;
             });
     }
 
-    const navigateBack = () => {
+    const navigateBack = useCallback(() => {
         Navigation.goBack(backTo);
-    };
+    }, [backTo]);
 
     const navigateToParticipantPage = useCallback(() => {
         switch (iouType) {
@@ -262,7 +273,7 @@ function IOURequestStepScan({
             // be added to the transaction (taken from the chat report participants) and then the person is taken to the confirmation step.
             const selectedParticipants = IOU.setMoneyRequestParticipantsFromReport(transactionID, report);
             const participants = selectedParticipants.map((participant) => {
-                const participantAccountID = participant?.accountID ?? 0;
+                const participantAccountID = participant?.accountID ?? -1;
                 return participantAccountID ? OptionsListUtils.getParticipantsOption(participant, personalDetails) : OptionsListUtils.getReportOption(participant);
             });
 
@@ -274,43 +285,108 @@ function IOURequestStepScan({
                     IOU.startSplitBill({
                         participants,
                         currentUserLogin: currentUserPersonalDetails?.login ?? '',
-                        currentUserAccountID: currentUserPersonalDetails?.accountID ?? 0,
+                        currentUserAccountID: currentUserPersonalDetails?.accountID ?? -1,
                         comment: '',
                         receipt,
-                        existingSplitChatReportID: reportID ?? 0,
+                        existingSplitChatReportID: reportID ?? -1,
                         billable: false,
                         category: '',
                         tag: '',
                         currency: transaction?.currency ?? 'USD',
+                        taxCode: transactionTaxCode,
+                        taxAmount: transactionTaxAmount,
                     });
                     return;
                 }
-                if (iouType === CONST.IOU.TYPE.TRACK && report) {
-                    IOU.trackExpense(
-                        report,
-                        0,
-                        transaction?.currency ?? 'USD',
-                        transaction?.created ?? '',
-                        '',
-                        currentUserPersonalDetails.login,
-                        currentUserPersonalDetails.accountID,
-                        participants[0],
-                        '',
-                        receipt,
-                    );
-                    return;
-                }
-                IOU.requestMoney(
-                    report,
-                    0,
-                    transaction?.currency ?? 'USD',
-                    transaction?.created ?? '',
-                    '',
-                    currentUserPersonalDetails.login,
-                    currentUserPersonalDetails.accountID,
-                    participants[0],
-                    '',
-                    receipt,
+                getCurrentPosition(
+                    (successData) => {
+                        if (iouType === CONST.IOU.TYPE.TRACK && report) {
+                            IOU.trackExpense(
+                                report,
+                                0,
+                                transaction?.currency ?? 'USD',
+                                transaction?.created ?? '',
+                                '',
+                                currentUserPersonalDetails.login,
+                                currentUserPersonalDetails.accountID,
+                                participants[0],
+                                '',
+                                receipt,
+                                '',
+                                '',
+                                '',
+                                0,
+                                false,
+                                policy,
+                                {},
+                                {},
+                                {
+                                    lat: successData.coords.latitude,
+                                    long: successData.coords.longitude,
+                                },
+                            );
+                        } else {
+                            IOU.requestMoney(
+                                report,
+                                0,
+                                transaction?.currency ?? 'USD',
+                                transaction?.created ?? '',
+                                '',
+                                currentUserPersonalDetails.login,
+                                currentUserPersonalDetails.accountID,
+                                participants[0],
+                                '',
+                                receipt,
+                                '',
+                                '',
+                                '',
+                                0,
+                                false,
+                                policy,
+                                {},
+                                {},
+                                {
+                                    lat: successData.coords.latitude,
+                                    long: successData.coords.longitude,
+                                },
+                            );
+                        }
+                    },
+                    (errorData) => {
+                        Log.info('[IOURequestStepScan] getCurrentPosition failed', false, errorData);
+                        // When there is an error, the money can still be requested, it just won't include the GPS coordinates
+                        if (iouType === CONST.IOU.TYPE.TRACK && report) {
+                            IOU.trackExpense(
+                                report,
+                                0,
+                                transaction?.currency ?? 'USD',
+                                transaction?.created ?? '',
+                                '',
+                                currentUserPersonalDetails.login,
+                                currentUserPersonalDetails.accountID,
+                                participants[0],
+                                '',
+                                receipt,
+                            );
+                        } else {
+                            IOU.requestMoney(
+                                report,
+                                0,
+                                transaction?.currency ?? 'USD',
+                                transaction?.created ?? '',
+                                '',
+                                currentUserPersonalDetails.login,
+                                currentUserPersonalDetails.accountID,
+                                participants[0],
+                                '',
+                                receipt,
+                            );
+                        }
+                    },
+                    {
+                        maximumAge: CONST.GPS.MAX_AGE,
+                        timeout: CONST.GPS.TIMEOUT,
+                    },
                 );
                 return;
             }
@@ -328,35 +404,53 @@ function IOURequestStepScan({
             transaction,
             navigateToConfirmationPage,
             navigateToParticipantPage,
+            policy,
+            transactionTaxCode,
+            transactionTaxAmount,
         ],
     );
 
     const updateScanAndNavigate = useCallback(
         (file: FileObject, source: string) => {
             IOU.replaceReceipt(transactionID, file as File, source);
-            Navigation.dismissModal();
+            navigateBack();
         },
-        [transactionID],
+        [transactionID, navigateBack],
     );
 
     /**
      * Sets the Receipt objects and navigates the user to the next page
      */
-    const setReceiptAndNavigate = (file: FileObject) => {
-        validateReceipt(file).then((isFileValid) => {
+    const setReceiptAndNavigate = (originalFile: FileObject, isPdfValidated?: boolean) => {
+        validateReceipt(originalFile).then((isFileValid) => {
             if (!isFileValid) {
                 return;
             }
-            // Store the receipt on the transaction object in Onyx
-            const source = URL.createObjectURL(file as Blob);
-            // eslint-disable-next-line @typescript-eslint/prefer-nullish-coalescing
-            IOU.setMoneyRequestReceipt(transactionID, source, file.name || '', action !== CONST.IOU.ACTION.EDIT);
 
-            if (action === CONST.IOU.ACTION.EDIT) {
-                updateScanAndNavigate(file, source);
+            // If we have a pdf file and if it is not validated then set the pdf file for validation and return
+            if (Str.isPDF(originalFile.name ?? '') && !isPdfValidated) {
+                setPdfFile(originalFile);
                 return;
             }
-            navigateToConfirmationStep(file, source);
+
+            // With the image size > 24MB, we use manipulateAsync to resize the image.
+            // It takes a long time so we should display a loading indicator while the resize image progresses.
+            if (Str.isImage(originalFile.name ?? '') && (originalFile?.size ?? 0) > CONST.API_ATTACHMENT_VALIDATIONS.MAX_SIZE) {
+                setIsLoadingReceipt(true);
+            }
+            FileUtils.resizeImageIfNeeded(originalFile).then((file) => {
+                setIsLoadingReceipt(false);
+                // Store the receipt on the transaction object in Onyx
+                const source = URL.createObjectURL(file as Blob);
+                // eslint-disable-next-line @typescript-eslint/prefer-nullish-coalescing
+                IOU.setMoneyRequestReceipt(transactionID, source, file.name || '', action !== CONST.IOU.ACTION.EDIT);
+
+                if (action === CONST.IOU.ACTION.EDIT) {
+                    updateScanAndNavigate(file, source);
+                    return;
+                }
+                navigateToConfirmationStep(file, source);
+            });
         });
     };
 
@@ -398,7 +492,6 @@ function IOURequestStepScan({
             return;
         }
         trackRef.current.applyConstraints({
-            // @ts-expect-error there is a type mismatch in typescipt types for MediaStreamTrack microsoft/TypeScript#39010
             advanced: [{torch: false}],
         });
     }, []);
@@ -407,7 +500,6 @@ function IOURequestStepScan({
         if (trackRef.current && isFlashLightOn) {
             trackRef.current
                 .applyConstraints({
-                    // @ts-expect-error there is a type mismatch in typescipt types for MediaStreamTrack microsoft/TypeScript#39010
                     advanced: [{torch: true}],
                 })
                 .then(() => {
@@ -438,9 +530,27 @@ function IOURequestStepScan({
         [],
     );
 
+    const PDFThumbnailView = pdfFile ? (
+        <PDFThumbnail
+            style={styles.invisiblePDF}
+            previewSourceURL={pdfFile.uri ?? ''}
+            onLoadSuccess={() => {
+                setPdfFile(null);
+                setReceiptAndNavigate(pdfFile, true);
+            }}
+            onPassword={() => {
+                setUploadReceiptError(true, 'attachmentPicker.attachmentError', 'attachmentPicker.protectedPDFNotSupported');
+            }}
+            onLoadError={() => {
+                setUploadReceiptError(true, 'attachmentPicker.attachmentError', 'attachmentPicker.errorWhileSelectingCorruptedAttachment');
+            }}
+        />
+    ) : null;
+
     const mobileCameraView = () => (
         <>
             <View style={[styles.cameraView]}>
+                {PDFThumbnailView}
                 {((cameraPermissionState === 'prompt' && !isQueriedPermissionState) || (cameraPermissionState === 'granted' && isEmptyObject(videoConstraints))) && (
                     <ActivityIndicator
                         size={CONST.ACTIVITY_INDICATOR_SIZE.LARGE}
@@ -488,11 +598,11 @@ function IOURequestStepScan({
             </View>
 
             <View style={[styles.flexRow, styles.justifyContentAround, styles.alignItemsCenter, styles.pv3]}>
-                <AttachmentPicker>
+                <AttachmentPicker acceptedFileTypes={[...CONST.API_ATTACHMENT_VALIDATIONS.ALLOWED_RECEIPT_EXTENSIONS]}>
                     {({openPicker}) => (
                         <PressableWithFeedback
                             accessibilityLabel={translate('receipt.chooseFile')}
-                            role={CONST.ACCESSIBILITY_ROLE.BUTTON}
+                            role={CONST.ROLE.BUTTON}
                             onPress={() => {
                                 openPicker({
                                     onPicked: setReceiptAndNavigate,
@@ -509,7 +619,7 @@ function IOURequestStepScan({
                     )}
                 </AttachmentPicker>
                 <PressableWithFeedback
-                    role={CONST.ACCESSIBILITY_ROLE.BUTTON}
+                    role={CONST.ROLE.BUTTON}
                     accessibilityLabel={translate('receipt.shutter')}
                     style={[styles.alignItemsCenter]}
                     onPress={capturePhoto}
@@ -520,7 +630,7 @@ function IOURequestStepScan({
                     />
                 </PressableWithFeedback>
                 <PressableWithFeedback
-                    role={CONST.ACCESSIBILITY_ROLE.BUTTON}
+                    role={CONST.ROLE.BUTTON}
                     accessibilityLabel={translate('receipt.flash')}
                     style={[styles.alignItemsEnd, !isTorchAvailable && styles.opacity0]}
                     onPress={toggleFlashlight}
@@ -539,6 +649,7 @@ function IOURequestStepScan({
 
     const desktopUploadView = () => (
         <>
+            {PDFThumbnailView}
             <View onLayout={({nativeEvent}) => setReceiptImageTopPosition(PixelRatio.roundToNearestPixel((nativeEvent.layout as DOMRect).top))}>
                 <ReceiptUpload
                     width={CONST.RECEIPT.ICON_SIZE}
@@ -585,31 +696,36 @@ function IOURequestStepScan({
         <StepScreenDragAndDropWrapper
             headerTitle={translate('common.receipt')}
             onBackButtonPress={navigateBack}
-            shouldShowWrapper={Boolean(backTo)}
+            shouldShowWrapper={!!backTo}
             testID={IOURequestStepScan.displayName}
         >
-            <View style={[styles.flex1, !Browser.isMobile() && styles.uploadReceiptView(isSmallScreenWidth)]}>
-                {!isDraggingOver && (Browser.isMobile() ? mobileCameraView() : desktopUploadView())}
-                <ReceiptDropUI
-                    onDrop={(e) => {
-                        const file = e?.dataTransfer?.files[0];
-                        if (file) {
-                            file.uri = URL.createObjectURL(file);
-                            setReceiptAndNavigate(file);
-                        }
-                    }}
-                    receiptImageTopPosition={receiptImageTopPosition}
-                />
-                <ConfirmModal
-                    title={attachmentInvalidReasonTitle ? translate(attachmentInvalidReasonTitle) : ''}
-                    onConfirm={hideRecieptModal}
-                    onCancel={hideRecieptModal}
-                    isVisible={isAttachmentInvalid}
-                    prompt={attachmentInvalidReason ? translate(attachmentInvalidReason) : ''}
-                    confirmText={translate('common.close')}
-                    shouldShowCancelButton={false}
-                />
-            </View>
+            {(isDraggingOverWrapper) => (
+                <>
+                    {isLoadingReceipt && <FullScreenLoadingIndicator />}
+                    <View style={[styles.flex1, !Browser.isMobile() && styles.uploadReceiptView(isSmallScreenWidth)]}>
+                        {!(isDraggingOver ?? isDraggingOverWrapper) && (Browser.isMobile() ? mobileCameraView() : desktopUploadView())}
+                        <ReceiptDropUI
+                            onDrop={(e) => {
+                                const file = e?.dataTransfer?.files[0];
+                                if (file) {
+                                    file.uri = URL.createObjectURL(file);
+                                    setReceiptAndNavigate(file);
+                                }
+                            }}
+                            receiptImageTopPosition={receiptImageTopPosition}
+                        />
+                        <ConfirmModal
+                            title={attachmentInvalidReasonTitle ? translate(attachmentInvalidReasonTitle) : ''}
+                            onConfirm={hideRecieptModal}
+                            onCancel={hideRecieptModal}
+                            isVisible={isAttachmentInvalid}
+                            prompt={attachmentInvalidReason ? translate(attachmentInvalidReason) : ''}
+                            confirmText={translate('common.close')}
+                            shouldShowCancelButton={false}
+                        />
+                    </View>
+                </>
+            )}
         </StepScreenDragAndDropWrapper>
     );
 }
@@ -618,14 +734,14 @@ IOURequestStepScan.displayName = 'IOURequestStepScan';
 
 const IOURequestStepScanWithOnyx = withOnyx<Omit<IOURequestStepScanProps, 'user'>, Omit<IOURequestStepOnyxProps, 'user'>>({
     policy: {
-        key: ({report}) => `${ONYXKEYS.COLLECTION.POLICY}${report ? report.policyID : '0'}`,
+        key: ({report}) => `${ONYXKEYS.COLLECTION.POLICY}${report ? report.policyID : '-1'}`,
     },
     personalDetails: {
         key: ONYXKEYS.PERSONAL_DETAILS_LIST,
     },
     skipConfirmation: {
         key: ({route}) => {
-            const transactionID = route.params.transactionID ?? 0;
+            const transactionID = route.params.transactionID ?? -1;
             return `${ONYXKEYS.COLLECTION.SKIP_CONFIRMATION}${transactionID}`;
         },
     },
diff --git a/src/pages/iou/request/step/IOURequestStepSendFrom.tsx b/src/pages/iou/request/step/IOURequestStepSendFrom.tsx
index a5def1072f7e..7064e279ee06 100644
--- a/src/pages/iou/request/step/IOURequestStepSendFrom.tsx
+++ b/src/pages/iou/request/step/IOURequestStepSendFrom.tsx
@@ -8,6 +8,7 @@ import UserListItem from '@components/SelectionList/UserListItem';
 import useLocalize from '@hooks/useLocalize';
 import Navigation from '@libs/Navigation/Navigation';
 import * as PolicyUtils from '@libs/PolicyUtils';
+import {sortWorkspacesBySelected} from '@libs/PolicyUtils';
 import * as ReportUtils from '@libs/ReportUtils';
 import * as IOU from '@userActions/IOU';
 import CONST from '@src/CONST';
@@ -40,21 +41,27 @@ function IOURequestStepSendFrom({route, transaction, allPolicies}: IOURequestSte
     const selectedWorkspace = useMemo(() => transaction?.participants?.find((participant) => participant.isSender), [transaction]);
 
     const workspaceOptions: WorkspaceListItem[] = useMemo(() => {
-        const activeAdminWorkspaces = PolicyUtils.getActiveAdminWorkspaces(allPolicies);
-        return activeAdminWorkspaces.map((policy) => ({
-            text: policy.name,
-            value: policy.id,
-            keyForList: policy.id,
-            icons: [
-                {
-                    source: policy?.avatarURL ? policy.avatarURL : ReportUtils.getDefaultWorkspaceAvatar(policy.name),
-                    fallbackIcon: Expensicons.FallbackWorkspaceAvatar,
-                    name: policy.name,
-                    type: CONST.ICON_TYPE_WORKSPACE,
-                },
-            ],
-            isSelected: selectedWorkspace?.policyID === policy.id,
-        }));
+        const availableWorkspaces = PolicyUtils.getActiveAdminWorkspaces(allPolicies);
+        // TODO: Uncomment the following line when the invoices screen is ready - https://github.com/Expensify/App/issues/45175.
+        // .filter((policy) => PolicyUtils.canSendInvoiceFromWorkspace(policy.id));
+
+        return availableWorkspaces
+            .sort((policy1, policy2) => sortWorkspacesBySelected({policyID: policy1.id, name: policy1.name}, {policyID: policy2.id, name: policy2.name}, selectedWorkspace?.policyID))
+            .map((policy) => ({
+                text: policy.name,
+                value: policy.id,
+                keyForList: policy.id,
+                icons: [
+                    {
+                        id: policy.id,
+                        source: policy?.avatarURL ? policy.avatarURL : ReportUtils.getDefaultWorkspaceAvatar(policy.name),
+                        fallbackIcon: Expensicons.FallbackWorkspaceAvatar,
+                        name: policy.name,
+                        type: CONST.ICON_TYPE_WORKSPACE,
+                    },
+                ],
+                isSelected: selectedWorkspace?.policyID === policy.id,
+            }));
     }, [allPolicies, selectedWorkspace]);
 
     const navigateBack = () => {
@@ -85,6 +92,7 @@ function IOURequestStepSendFrom({route, transaction, allPolicies}: IOURequestSte
             <SelectionList
                 sections={[{data: workspaceOptions, title: translate('common.workspaces')}]}
                 onSelectRow={selectWorkspace}
+                shouldSingleExecuteRowSelect
                 ListItem={UserListItem}
                 initiallyFocusedOptionKey={selectedWorkspace?.policyID}
             />
diff --git a/src/pages/iou/request/step/IOURequestStepSplitPayer.tsx b/src/pages/iou/request/step/IOURequestStepSplitPayer.tsx
index c2ee404b1205..8236a780d970 100644
--- a/src/pages/iou/request/step/IOURequestStepSplitPayer.tsx
+++ b/src/pages/iou/request/step/IOURequestStepSplitPayer.tsx
@@ -51,14 +51,14 @@ function IOURequestStepSplitPayer({
         const participants = transaction?.participants ?? [];
         const participantOptions =
             [currentUserOption, ...participants]
-                ?.filter((participant) => Boolean(participant.accountID))
+                ?.filter((participant) => !!participant.accountID)
                 ?.map((participant) => OptionsListUtils.getParticipantsOption(participant, personalDetails)) ?? [];
         return [
             {
                 title: '',
                 data: participantOptions.map((participantOption) => ({
                     ...participantOption,
-                    isSelected: !!transaction?.splitPayerAccountIDs && transaction?.splitPayerAccountIDs?.includes(participantOption.accountID ?? 0),
+                    isSelected: !!transaction?.splitPayerAccountIDs && transaction?.splitPayerAccountIDs?.includes(participantOption.accountID ?? -1),
                 })),
             },
         ];
@@ -69,7 +69,7 @@ function IOURequestStepSplitPayer({
     };
 
     const setSplitPayer = (item: Participant | OptionData) => {
-        IOU.setSplitPayer(transactionID, item.accountID ?? 0);
+        IOU.setSplitPayer(transactionID, item.accountID ?? -1);
         navigateBack();
     };
 
@@ -87,6 +87,7 @@ function IOURequestStepSplitPayer({
                 sections={sections}
                 ListItem={UserListItem}
                 onSelectRow={setSplitPayer}
+                shouldSingleExecuteRowSelect
                 showLoadingPlaceholder={!didScreenTransitionEnd}
             />
         </StepScreenWrapper>
diff --git a/src/pages/iou/request/step/IOURequestStepTag.tsx b/src/pages/iou/request/step/IOURequestStepTag.tsx
index ff1a1c01600d..6cf9e39d6015 100644
--- a/src/pages/iou/request/step/IOURequestStepTag.tsx
+++ b/src/pages/iou/request/step/IOURequestStepTag.tsx
@@ -9,8 +9,8 @@ import * as IOUUtils from '@libs/IOUUtils';
 import Navigation from '@libs/Navigation/Navigation';
 import * as OptionsListUtils from '@libs/OptionsListUtils';
 import * as PolicyUtils from '@libs/PolicyUtils';
+import * as ReportActionsUtils from '@libs/ReportActionsUtils';
 import * as ReportUtils from '@libs/ReportUtils';
-import {canEditMoneyRequest} from '@libs/ReportUtils';
 import * as TransactionUtils from '@libs/TransactionUtils';
 import * as IOU from '@userActions/IOU';
 import CONST from '@src/CONST';
@@ -35,7 +35,7 @@ type IOURequestStepTagOnyxProps = {
     policyCategories: OnyxEntry<OnyxTypes.PolicyCategories>;
 
     /** Collection of tags attached to a policy */
-    policyTags: OnyxEntry<OnyxTypes.PolicyTagList>;
+    policyTags: OnyxEntry<OnyxTypes.PolicyTagLists>;
 
     /** The actions from the parent report */
     reportActions: OnyxEntry<OnyxTypes.ReportActions>;
@@ -73,14 +73,15 @@ function IOURequestStepTag({
     const currentTransaction = isEditingSplitBill && !isEmptyObject(splitDraftTransaction) ? splitDraftTransaction : transaction;
     const transactionTag = TransactionUtils.getTag(currentTransaction);
     const tag = TransactionUtils.getTag(currentTransaction, tagListIndex);
-    const reportAction = reportActions?.[report?.parentReportActionID ?? reportActionID];
+    const reportAction = reportActions?.[report?.parentReportActionID ?? reportActionID] ?? null;
     const canEditSplitBill = isSplitBill && reportAction && session?.accountID === reportAction.actorAccountID && TransactionUtils.areRequiredFieldsEmpty(transaction);
     const policyTagLists = useMemo(() => PolicyUtils.getTagLists(policyTags), [policyTags]);
 
     const shouldShowTag = ReportUtils.isReportInGroupPolicy(report) && (transactionTag || OptionsListUtils.hasEnabledTags(policyTagLists));
 
     // eslint-disable-next-line rulesdir/no-negated-variables
-    const shouldShowNotFoundPage = !shouldShowTag || (isEditing && (isSplitBill ? !canEditSplitBill : reportAction && !canEditMoneyRequest(reportAction)));
+    const shouldShowNotFoundPage =
+        !shouldShowTag || (isEditing && (isSplitBill ? !canEditSplitBill : !ReportActionsUtils.isMoneyRequestAction(reportAction) || !ReportUtils.canEditMoneyRequest(reportAction)));
 
     const navigateBack = () => {
         Navigation.goBack(backTo);
@@ -96,8 +97,8 @@ function IOURequestStepTag({
             return;
         }
         if (isEditing) {
-            IOU.updateMoneyRequestTag(transactionID, report?.reportID ?? '0', updatedTag, policy, policyTags, policyCategories);
-            Navigation.dismissModal();
+            IOU.updateMoneyRequestTag(transactionID, report?.reportID ?? '-1', updatedTag, policy, policyTags, policyCategories);
+            navigateBack();
             return;
         }
         IOU.setMoneyRequestTag(transactionID, updatedTag);
@@ -115,7 +116,7 @@ function IOURequestStepTag({
             <>
                 <Text style={[styles.ph5, styles.pv3]}>{translate('iou.tagSelection')}</Text>
                 <TagPicker
-                    policyID={report?.policyID ?? ''}
+                    policyID={report?.policyID ?? '-1'}
                     tagListName={policyTagListName}
                     tagListIndex={tagListIndex}
                     selectedTag={tag}
@@ -138,13 +139,13 @@ export default withWritableReportOrNotFound(
                 },
             },
             policy: {
-                key: ({report}) => `${ONYXKEYS.COLLECTION.POLICY}${report ? report.policyID : '0'}`,
+                key: ({report}) => `${ONYXKEYS.COLLECTION.POLICY}${report ? report.policyID : '-1'}`,
             },
             policyCategories: {
-                key: ({report}) => `${ONYXKEYS.COLLECTION.POLICY_CATEGORIES}${report ? report.policyID : '0'}`,
+                key: ({report}) => `${ONYXKEYS.COLLECTION.POLICY_CATEGORIES}${report ? report.policyID : '-1'}`,
             },
             policyTags: {
-                key: ({report}) => `${ONYXKEYS.COLLECTION.POLICY_TAGS}${report ? report.policyID : '0'}`,
+                key: ({report}) => `${ONYXKEYS.COLLECTION.POLICY_TAGS}${report ? report.policyID : '-1'}`,
             },
             reportActions: {
                 key: ({
@@ -153,7 +154,7 @@ export default withWritableReportOrNotFound(
                         params: {action, iouType},
                     },
                 }) => {
-                    let reportID: string | undefined = '0';
+                    let reportID: string | undefined = '-1';
                     if (action === CONST.IOU.ACTION.EDIT) {
                         reportID = iouType === CONST.IOU.TYPE.SPLIT ? report?.reportID : report?.parentReportID;
                     }
diff --git a/src/pages/iou/request/step/IOURequestStepTaxAmountPage.tsx b/src/pages/iou/request/step/IOURequestStepTaxAmountPage.tsx
index 22a00591b4fc..b3ed65be34a6 100644
--- a/src/pages/iou/request/step/IOURequestStepTaxAmountPage.tsx
+++ b/src/pages/iou/request/step/IOURequestStepTaxAmountPage.tsx
@@ -15,7 +15,8 @@ import CONST from '@src/CONST';
 import ONYXKEYS from '@src/ONYXKEYS';
 import ROUTES from '@src/ROUTES';
 import type SCREENS from '@src/SCREENS';
-import type {Policy, PolicyCategories, PolicyTagList, TaxRatesWithDefault, Transaction} from '@src/types/onyx';
+import type {Policy, PolicyCategories, PolicyTagLists, Transaction} from '@src/types/onyx';
+import {isEmptyObject} from '@src/types/utils/EmptyObject';
 import StepScreenWrapper from './StepScreenWrapper';
 import withFullTransactionOrNotFound from './withFullTransactionOrNotFound';
 import type {WithWritableReportOrNotFoundProps} from './withWritableReportOrNotFound';
@@ -26,7 +27,10 @@ type IOURequestStepTaxAmountPageOnyxProps = {
     policyCategories: OnyxEntry<PolicyCategories>;
 
     /** Collection of tag list on a policy */
-    policyTags: OnyxEntry<PolicyTagList>;
+    policyTags: OnyxEntry<PolicyTagLists>;
+
+    /** The draft transaction that holds data to be persisted on the current transaction */
+    splitDraftTransaction: OnyxEntry<Transaction>;
 };
 
 type IOURequestStepTaxAmountPageProps = IOURequestStepTaxAmountPageOnyxProps &
@@ -34,17 +38,19 @@ type IOURequestStepTaxAmountPageProps = IOURequestStepTaxAmountPageOnyxProps &
         transaction: OnyxEntry<Transaction>;
     };
 
-function getTaxAmount(transaction: OnyxEntry<Transaction>, taxRates: TaxRatesWithDefault | undefined, isEditing: boolean): number | undefined {
-    if (!transaction?.amount) {
+function getTaxAmount(transaction: OnyxEntry<Transaction>, policy: OnyxEntry<Policy>, currency: string | undefined, isEditing: boolean): number | undefined {
+    if (!transaction?.amount && !transaction?.modifiedAmount) {
         return;
     }
     const transactionTaxAmount = TransactionUtils.getAmount(transaction);
     const transactionTaxCode = transaction?.taxCode ?? '';
-    const defaultTaxValue = taxRates?.defaultValue;
-    const moneyRequestTaxPercentage = (transaction?.taxRate ? transaction?.taxRate?.data?.value : defaultTaxValue) ?? '';
-    const editingTaxPercentage = (transactionTaxCode ? taxRates?.taxes[transactionTaxCode]?.value : moneyRequestTaxPercentage) ?? '';
+    const defaultTaxCode = TransactionUtils.getDefaultTaxCode(policy, transaction, currency) ?? '';
+    const getTaxValue = (taxCode: string) => TransactionUtils.getTaxValue(policy, transaction, taxCode);
+    const defaultTaxValue = getTaxValue(defaultTaxCode);
+    const moneyRequestTaxPercentage = (transactionTaxCode ? getTaxValue(transactionTaxCode) : defaultTaxValue) ?? '';
+    const editingTaxPercentage = (transactionTaxCode ? getTaxValue(transactionTaxCode) : moneyRequestTaxPercentage) ?? '';
     const taxPercentage = isEditing ? editingTaxPercentage : moneyRequestTaxPercentage;
-    return CurrencyUtils.convertToBackendAmount(TransactionUtils.calculateTaxAmount(taxPercentage, transactionTaxAmount));
+    return CurrencyUtils.convertToBackendAmount(TransactionUtils.calculateTaxAmount(taxPercentage, transactionTaxAmount, currency ?? CONST.CURRENCY.USD));
 }
 
 function IOURequestStepTaxAmountPage({
@@ -56,16 +62,18 @@ function IOURequestStepTaxAmountPage({
     policy,
     policyTags,
     policyCategories,
+    splitDraftTransaction,
 }: IOURequestStepTaxAmountPageProps) {
     const {translate} = useLocalize();
     const textInput = useRef<BaseTextInputRef | null>();
     const isEditing = action === CONST.IOU.ACTION.EDIT;
+    const isEditingSplitBill = isEditing && iouType === CONST.IOU.TYPE.SPLIT;
 
     const focusTimeoutRef = useRef<NodeJS.Timeout>();
 
-    const transactionDetails = ReportUtils.getTransactionDetails(transaction);
+    const currentTransaction = isEditingSplitBill && !isEmptyObject(splitDraftTransaction) ? splitDraftTransaction : transaction;
+    const transactionDetails = ReportUtils.getTransactionDetails(currentTransaction);
     const currency = CurrencyUtils.isValidCurrencyCode(selectedCurrency) ? selectedCurrency : transactionDetails?.currency;
-    const taxRates = policy?.taxRates;
 
     useFocusEffect(
         useCallback(() => {
@@ -101,19 +109,25 @@ function IOURequestStepTaxAmountPage({
     };
 
     const updateTaxAmount = (currentAmount: CurrentMoney) => {
-        const amountInSmallestCurrencyUnits = CurrencyUtils.convertToBackendAmount(Number.parseFloat(currentAmount.amount));
+        const taxAmountInSmallestCurrencyUnits = CurrencyUtils.convertToBackendAmount(Number.parseFloat(currentAmount.amount));
+
+        if (isEditingSplitBill) {
+            IOU.setDraftSplitTransaction(transactionID, {taxAmount: taxAmountInSmallestCurrencyUnits});
+            navigateBack();
+            return;
+        }
 
         if (isEditing) {
-            if (amountInSmallestCurrencyUnits === TransactionUtils.getTaxAmount(transaction, false)) {
+            if (taxAmountInSmallestCurrencyUnits === TransactionUtils.getTaxAmount(currentTransaction, false)) {
                 navigateBack();
                 return;
             }
-            IOU.updateMoneyRequestTaxAmount(transactionID, report?.reportID ?? '', amountInSmallestCurrencyUnits, policy, policyTags, policyCategories);
+            IOU.updateMoneyRequestTaxAmount(transactionID, report?.reportID ?? '', taxAmountInSmallestCurrencyUnits, policy, policyTags, policyCategories);
             navigateBack();
             return;
         }
 
-        IOU.setMoneyRequestTaxAmount(transactionID, amountInSmallestCurrencyUnits, true);
+        IOU.setMoneyRequestTaxAmount(transactionID, taxAmountInSmallestCurrencyUnits);
 
         // eslint-disable-next-line @typescript-eslint/prefer-nullish-coalescing
         IOU.setMoneyRequestCurrency(transactionID, currency || CONST.CURRENCY.USD);
@@ -143,18 +157,18 @@ function IOURequestStepTaxAmountPage({
             headerTitle={translate('iou.taxAmount')}
             onBackButtonPress={navigateBack}
             testID={IOURequestStepTaxAmountPage.displayName}
-            shouldShowWrapper={Boolean(backTo || isEditing)}
+            shouldShowWrapper={!!(backTo || isEditing)}
             includeSafeAreaPaddingBottom
         >
             <MoneyRequestAmountForm
-                isEditing={Boolean(backTo || isEditing)}
+                isEditing={!!(backTo || isEditing)}
                 currency={currency}
-                amount={transactionDetails?.taxAmount}
-                taxAmount={getTaxAmount(transaction, taxRates, Boolean(backTo || isEditing))}
+                amount={Math.abs(transactionDetails?.taxAmount ?? 0)}
+                taxAmount={getTaxAmount(currentTransaction, policy, currency, !!(backTo || isEditing))}
                 ref={(e) => (textInput.current = e)}
                 onCurrencyButtonPress={navigateToCurrencySelectionPage}
                 onSubmitButtonPress={updateTaxAmount}
-                isCurrencyPressable={!isEditing}
+                isCurrencyPressable={false}
             />
         </StepScreenWrapper>
     );
@@ -163,14 +177,20 @@ function IOURequestStepTaxAmountPage({
 IOURequestStepTaxAmountPage.displayName = 'IOURequestStepTaxAmountPage';
 
 const IOURequestStepTaxAmountPageWithOnyx = withOnyx<IOURequestStepTaxAmountPageProps, IOURequestStepTaxAmountPageOnyxProps>({
+    splitDraftTransaction: {
+        key: ({route}) => {
+            const transactionID = route?.params.transactionID ?? 0;
+            return `${ONYXKEYS.COLLECTION.SPLIT_TRANSACTION_DRAFT}${transactionID}`;
+        },
+    },
     policy: {
-        key: ({report}) => `${ONYXKEYS.COLLECTION.POLICY}${report ? report.policyID : '0'}`,
+        key: ({report}) => `${ONYXKEYS.COLLECTION.POLICY}${report ? report.policyID : '-1'}`,
     },
     policyCategories: {
-        key: ({report}) => `${ONYXKEYS.COLLECTION.POLICY_CATEGORIES}${report ? report.policyID : '0'}`,
+        key: ({report}) => `${ONYXKEYS.COLLECTION.POLICY_CATEGORIES}${report ? report.policyID : '-1'}`,
     },
     policyTags: {
-        key: ({report}) => `${ONYXKEYS.COLLECTION.POLICY_TAGS}${report ? report.policyID : '0'}`,
+        key: ({report}) => `${ONYXKEYS.COLLECTION.POLICY_TAGS}${report ? report.policyID : '-1'}`,
     },
 })(IOURequestStepTaxAmountPage);
 
diff --git a/src/pages/iou/request/step/IOURequestStepTaxRatePage.tsx b/src/pages/iou/request/step/IOURequestStepTaxRatePage.tsx
index da3a244a2db2..7fedc09e2abe 100644
--- a/src/pages/iou/request/step/IOURequestStepTaxRatePage.tsx
+++ b/src/pages/iou/request/step/IOURequestStepTaxRatePage.tsx
@@ -5,25 +5,29 @@ import TaxPicker from '@components/TaxPicker';
 import useLocalize from '@hooks/useLocalize';
 import * as CurrencyUtils from '@libs/CurrencyUtils';
 import Navigation from '@libs/Navigation/Navigation';
-import * as OptionsListUtils from '@libs/OptionsListUtils';
-import * as ReportUtils from '@libs/ReportUtils';
+import type {TaxRatesOption} from '@libs/OptionsListUtils';
 import * as TransactionUtils from '@libs/TransactionUtils';
+import {getCurrency} from '@libs/TransactionUtils';
 import * as IOU from '@userActions/IOU';
 import CONST from '@src/CONST';
 import ONYXKEYS from '@src/ONYXKEYS';
 import type SCREENS from '@src/SCREENS';
-import type {Policy, PolicyCategories, PolicyTagList, TaxRatesWithDefault, Transaction} from '@src/types/onyx';
+import type {Policy, PolicyCategories, PolicyTagLists, Transaction} from '@src/types/onyx';
+import {isEmptyObject} from '@src/types/utils/EmptyObject';
 import StepScreenWrapper from './StepScreenWrapper';
 import withFullTransactionOrNotFound from './withFullTransactionOrNotFound';
-import type {WithWritableReportOrNotFoundProps} from './withWritableReportOrNotFound';
 import withWritableReportOrNotFound from './withWritableReportOrNotFound';
+import type {WithWritableReportOrNotFoundProps} from './withWritableReportOrNotFound';
 
 type IOURequestStepTaxRatePageOnyxProps = {
     policy: OnyxEntry<Policy>;
     policyCategories: OnyxEntry<PolicyCategories>;
 
     /** Collection of tag list on a policy */
-    policyTags: OnyxEntry<PolicyTagList>;
+    policyTags: OnyxEntry<PolicyTagLists>;
+
+    /** The draft transaction that holds data to be persisted on the current transaction */
+    splitDraftTransaction: OnyxEntry<Transaction>;
 };
 
 type IOURequestStepTaxRatePageProps = IOURequestStepTaxRatePageOnyxProps &
@@ -31,67 +35,79 @@ type IOURequestStepTaxRatePageProps = IOURequestStepTaxRatePageOnyxProps &
         transaction: OnyxEntry<Transaction>;
     };
 
-function getTaxAmount(taxRates: TaxRatesWithDefault, selectedTaxRate: string, amount: number): number | undefined {
-    const percentage = Object.values(OptionsListUtils.transformedTaxRates(taxRates)).find((taxRate) => taxRate.modifiedName?.includes(selectedTaxRate))?.value;
-    if (percentage) {
-        return TransactionUtils.calculateTaxAmount(percentage, amount);
+function getTaxAmount(policy: OnyxEntry<Policy>, transaction: OnyxEntry<Transaction>, selectedTaxCode: string, amount: number): number | undefined {
+    const getTaxValue = (taxCode: string) => TransactionUtils.getTaxValue(policy, transaction, taxCode);
+    const taxPercentage = getTaxValue(selectedTaxCode);
+    if (taxPercentage) {
+        return TransactionUtils.calculateTaxAmount(taxPercentage, amount, getCurrency(transaction));
     }
 }
 
 function IOURequestStepTaxRatePage({
     route: {
-        params: {action, backTo},
+        params: {action, backTo, iouType},
     },
     policy,
     transaction,
     report,
     policyCategories,
     policyTags,
+    splitDraftTransaction,
 }: IOURequestStepTaxRatePageProps) {
     const {translate} = useLocalize();
 
     const isEditing = action === CONST.IOU.ACTION.EDIT;
+    const isEditingSplitBill = isEditing && iouType === CONST.IOU.TYPE.SPLIT;
+    const currentTransaction = isEditingSplitBill && !isEmptyObject(splitDraftTransaction) ? splitDraftTransaction : transaction;
     const taxRates = policy?.taxRates;
-    const defaultExternalID = taxRates?.defaultExternalID;
-    const transactionDetails = ReportUtils.getTransactionDetails(transaction);
-    const transactionTaxCode = transactionDetails?.taxCode;
 
     const navigateBack = () => {
         Navigation.goBack(backTo);
     };
-    // eslint-disable-next-line @typescript-eslint/prefer-nullish-coalescing
-    const moneyRequestSelectedTaxRate = transaction?.taxRate?.keyForList || (taxRates && TransactionUtils.getDefaultTaxName(taxRates));
-    const editingSelectedTaxRate =
-        taxRates &&
-        (transactionTaxCode === defaultExternalID
-            ? transaction && TransactionUtils.getDefaultTaxName(taxRates, transaction)
-            : transactionTaxCode && TransactionUtils.getTaxName(taxRates.taxes, transactionTaxCode));
-
-    const updateTaxRates = (taxes: OptionsListUtils.TaxRatesOption) => {
-        if (isEditing) {
-            const newTaxCode = taxes.data.code;
-            if (newTaxCode === undefined || newTaxCode === TransactionUtils.getTaxCode(transaction)) {
-                navigateBack();
-                return;
-            }
-            IOU.updateMoneyRequestTaxRate(transaction?.transactionID ?? '', report?.reportID ?? '', newTaxCode, policy, policyTags, policyCategories);
+
+    const taxRateTitle = TransactionUtils.getTaxName(policy, currentTransaction);
+
+    const updateTaxRates = (taxes: TaxRatesOption) => {
+        if (!currentTransaction || !taxes.code || !taxRates) {
+            Navigation.goBack();
+            return;
+        }
+
+        const taxAmount = getTaxAmount(policy, currentTransaction, taxes.code, TransactionUtils.getAmount(currentTransaction, false, true));
+
+        if (isEditingSplitBill) {
+            IOU.setDraftSplitTransaction(currentTransaction.transactionID, {
+                taxAmount: CurrencyUtils.convertToBackendAmount(taxAmount ?? 0),
+                taxCode: taxes.code,
+            });
             navigateBack();
             return;
         }
-        if (!transaction || !taxes.text || !taxRates) {
-            Navigation.goBack(backTo);
+
+        if (isEditing) {
+            const newTaxCode = taxes.code;
+            IOU.updateMoneyRequestTaxRate({
+                transactionID: currentTransaction?.transactionID ?? '-1',
+                optimisticReportActionID: report?.reportID ?? '-1',
+                taxCode: newTaxCode,
+                taxAmount: CurrencyUtils.convertToBackendAmount(taxAmount ?? 0),
+                policy,
+                policyTagList: policyTags,
+                policyCategories,
+            });
+            navigateBack();
             return;
         }
-        const taxAmount = getTaxAmount(taxRates, taxes.text, transaction?.amount);
+
         if (taxAmount === undefined) {
-            Navigation.goBack(backTo);
+            navigateBack();
             return;
         }
         const amountInSmallestCurrencyUnits = CurrencyUtils.convertToBackendAmount(taxAmount);
-        IOU.setMoneyRequestTaxRate(transaction?.transactionID, taxes);
-        IOU.setMoneyRequestTaxAmount(transaction.transactionID, amountInSmallestCurrencyUnits, true);
+        IOU.setMoneyRequestTaxRate(currentTransaction?.transactionID, taxes?.code ?? '');
+        IOU.setMoneyRequestTaxAmount(currentTransaction.transactionID, amountInSmallestCurrencyUnits);
 
-        Navigation.goBack(backTo);
+        navigateBack();
     };
 
     return (
@@ -102,9 +118,13 @@ function IOURequestStepTaxRatePage({
             testID={IOURequestStepTaxRatePage.displayName}
         >
             <TaxPicker
-                selectedTaxRate={isEditing ? editingSelectedTaxRate ?? '' : moneyRequestSelectedTaxRate}
+                selectedTaxRate={taxRateTitle}
                 policyID={report?.policyID}
+                transactionID={currentTransaction?.transactionID}
                 onSubmit={updateTaxRates}
+                action={action}
+                iouType={iouType}
+                onDismiss={navigateBack}
             />
         </StepScreenWrapper>
     );
@@ -113,14 +133,20 @@ function IOURequestStepTaxRatePage({
 IOURequestStepTaxRatePage.displayName = 'IOURequestStepTaxRatePage';
 
 const IOURequestStepTaxRatePageWithOnyx = withOnyx<IOURequestStepTaxRatePageProps, IOURequestStepTaxRatePageOnyxProps>({
+    splitDraftTransaction: {
+        key: ({route}) => {
+            const transactionID = route.params.transactionID ?? 0;
+            return `${ONYXKEYS.COLLECTION.SPLIT_TRANSACTION_DRAFT}${transactionID}`;
+        },
+    },
     policy: {
-        key: ({report}) => `${ONYXKEYS.COLLECTION.POLICY}${report ? report.policyID : '0'}`,
+        key: ({report}) => `${ONYXKEYS.COLLECTION.POLICY}${report ? report.policyID : '-1'}`,
     },
     policyCategories: {
-        key: ({report}) => `${ONYXKEYS.COLLECTION.POLICY_CATEGORIES}${report ? report.policyID : '0'}`,
+        key: ({report}) => `${ONYXKEYS.COLLECTION.POLICY_CATEGORIES}${report ? report.policyID : '-1'}`,
     },
     policyTags: {
-        key: ({report}) => `${ONYXKEYS.COLLECTION.POLICY_TAGS}${report ? report.policyID : '0'}`,
+        key: ({report}) => `${ONYXKEYS.COLLECTION.POLICY_TAGS}${report ? report.policyID : '-1'}`,
     },
 })(IOURequestStepTaxRatePage);
 
diff --git a/src/pages/iou/request/step/IOURequestStepWaypoint.tsx b/src/pages/iou/request/step/IOURequestStepWaypoint.tsx
index 5576c3dedb8a..28dcbfd3094f 100644
--- a/src/pages/iou/request/step/IOURequestStepWaypoint.tsx
+++ b/src/pages/iou/request/step/IOURequestStepWaypoint.tsx
@@ -13,6 +13,7 @@ import InputWrapperWithRef from '@components/Form/InputWrapper';
 import type {FormOnyxValues} from '@components/Form/types';
 import HeaderWithBackButton from '@components/HeaderWithBackButton';
 import * as Expensicons from '@components/Icon/Expensicons';
+import type BaseModalProps from '@components/Modal/types';
 import ScreenWrapper from '@components/ScreenWrapper';
 import useLocalize from '@hooks/useLocalize';
 import useLocationBias from '@hooks/useLocationBias';
@@ -20,8 +21,10 @@ import useNetwork from '@hooks/useNetwork';
 import useThemeStyles from '@hooks/useThemeStyles';
 import useWindowDimensions from '@hooks/useWindowDimensions';
 import * as ErrorUtils from '@libs/ErrorUtils';
+import * as IOUUtils from '@libs/IOUUtils';
 import Navigation from '@libs/Navigation/Navigation';
 import * as ValidationUtils from '@libs/ValidationUtils';
+import * as Modal from '@userActions/Modal';
 import * as Transaction from '@userActions/Transaction';
 import CONST from '@src/CONST';
 import type {TranslationPaths} from '@src/languages/types';
@@ -58,13 +61,14 @@ function IOURequestStepWaypoint({
     const styles = useThemeStyles();
     const {windowWidth} = useWindowDimensions();
     const [isDeleteStopModalOpen, setIsDeleteStopModalOpen] = useState(false);
+    const [restoreFocusType, setRestoreFocusType] = useState<BaseModalProps['restoreFocusType']>();
     const navigation = useNavigation();
     const isFocused = navigation.isFocused();
     const {translate} = useLocalize();
     const {isOffline} = useNetwork();
     const textInput = useRef<TextInput | null>(null);
     const parsedWaypointIndex = parseInt(pageIndex, 10);
-    const allWaypoints = transaction?.comment.waypoints ?? {};
+    const allWaypoints = transaction?.comment?.waypoints ?? {};
     const currentWaypoint = allWaypoints[`waypoint${pageIndex}`] ?? {};
     const waypointCount = Object.keys(allWaypoints).length;
     const filledWaypointCount = Object.values(allWaypoints).filter((waypoint) => !isEmptyObject(waypoint)).length;
@@ -86,29 +90,37 @@ function IOURequestStepWaypoint({
         isFocused &&
         (Number.isNaN(parsedWaypointIndex) || parsedWaypointIndex < 0 || parsedWaypointIndex > waypointCount || (filledWaypointCount < 2 && parsedWaypointIndex >= waypointCount));
 
+    const goBack = () => {
+        if (backTo) {
+            Navigation.goBack(backTo);
+            return;
+        }
+        Navigation.goBack(ROUTES.MONEY_REQUEST_CREATE_TAB_DISTANCE.getRoute(CONST.IOU.ACTION.CREATE, iouType, transactionID, reportID));
+    };
+
     const validate = (values: FormOnyxValues<'waypointForm'>): Partial<Record<string, TranslationPaths>> => {
         const errors = {};
         const waypointValue = values[`waypoint${pageIndex}`] ?? '';
         if (isOffline && waypointValue !== '' && !ValidationUtils.isValidAddress(waypointValue)) {
-            ErrorUtils.addErrorMessage(errors, `waypoint${pageIndex}`, 'bankAccount.error.address');
+            ErrorUtils.addErrorMessage(errors, `waypoint${pageIndex}`, translate('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) {
-            ErrorUtils.addErrorMessage(errors, `waypoint${pageIndex}`, 'distance.error.selectSuggestedAddress');
+            ErrorUtils.addErrorMessage(errors, `waypoint${pageIndex}`, translate('distance.error.selectSuggestedAddress'));
         }
 
         return errors;
     };
 
-    const saveWaypoint = (waypoint: FormOnyxValues<'waypointForm'>) => Transaction.saveWaypoint(transactionID, pageIndex, waypoint, action === CONST.IOU.ACTION.CREATE);
+    const saveWaypoint = (waypoint: FormOnyxValues<'waypointForm'>) => Transaction.saveWaypoint(transactionID, pageIndex, waypoint, IOUUtils.shouldUseTransactionDraft(action));
 
     const submit = (values: FormOnyxValues<'waypointForm'>) => {
         const waypointValue = values[`waypoint${pageIndex}`] ?? '';
         // Allows letting you set a waypoint to an empty value
         if (waypointValue === '') {
-            Transaction.removeWaypoint(transaction, pageIndex, action === CONST.IOU.ACTION.CREATE);
+            Transaction.removeWaypoint(transaction, pageIndex, IOUUtils.shouldUseTransactionDraft(action));
         }
 
         // While the user is offline, the auto-complete address search will not work
@@ -119,18 +131,20 @@ function IOURequestStepWaypoint({
                 name: values.name ?? '',
                 lat: values.lat ?? 0,
                 lng: values.lng ?? 0,
+                keyForList: `${(values.name ?? 'waypoint') as string}_${Date.now()}`,
             };
             saveWaypoint(waypoint);
         }
 
         // Other flows will be handled by selecting a waypoint with selectWaypoint as this is mainly for the offline flow
-        Navigation.goBack(ROUTES.MONEY_REQUEST_STEP_DISTANCE.getRoute(action, iouType, transactionID, reportID));
+        goBack();
     };
 
     const deleteStopAndHideModal = () => {
-        Transaction.removeWaypoint(transaction, pageIndex, action === CONST.IOU.ACTION.CREATE);
+        Transaction.removeWaypoint(transaction, pageIndex, IOUUtils.shouldUseTransactionDraft(action));
+        setRestoreFocusType(CONST.MODAL.RESTORE_FOCUS_TYPE.DELETE);
         setIsDeleteStopModalOpen(false);
-        Navigation.goBack(ROUTES.MONEY_REQUEST_STEP_DISTANCE.getRoute(action, iouType, transactionID, reportID));
+        goBack();
     };
 
     const selectWaypoint = (values: Waypoint) => {
@@ -139,14 +153,11 @@ function IOURequestStepWaypoint({
             lng: values.lng ?? 0,
             address: values.address ?? '',
             name: values.name ?? '',
+            keyForList: `${values.name ?? 'waypoint'}_${Date.now()}`,
         };
 
-        Transaction.saveWaypoint(transactionID, pageIndex, waypoint, action === CONST.IOU.ACTION.CREATE);
-        if (backTo) {
-            Navigation.goBack(backTo);
-            return;
-        }
-        Navigation.goBack(ROUTES.MONEY_REQUEST_CREATE_TAB_DISTANCE.getRoute(CONST.IOU.ACTION.CREATE, iouType, transactionID, reportID));
+        Transaction.saveWaypoint(transactionID, pageIndex, waypoint, IOUUtils.shouldUseTransactionDraft(action));
+        goBack();
     };
 
     return (
@@ -160,9 +171,7 @@ function IOURequestStepWaypoint({
                 <HeaderWithBackButton
                     title={translate(waypointDescriptionKey)}
                     shouldShowBackButton
-                    onBackButtonPress={() => {
-                        Navigation.goBack(ROUTES.MONEY_REQUEST_STEP_DISTANCE.getRoute(action, iouType, transactionID, reportID));
-                    }}
+                    onBackButtonPress={goBack}
                     shouldShowThreeDotsButton={shouldShowThreeDotsButton}
                     shouldSetModalVisibility={false}
                     threeDotsAnchorPosition={styles.threeDotsPopoverOffset(windowWidth)}
@@ -170,7 +179,12 @@ function IOURequestStepWaypoint({
                         {
                             icon: Expensicons.Trashcan,
                             text: translate('distance.deleteWaypoint'),
-                            onSelected: () => setIsDeleteStopModalOpen(true),
+                            onSelected: () => {
+                                Modal.close(() => {
+                                    setRestoreFocusType(undefined);
+                                    setIsDeleteStopModalOpen(true);
+                                });
+                            },
                         },
                     ]}
                 />
@@ -183,7 +197,9 @@ function IOURequestStepWaypoint({
                     prompt={translate('distance.deleteWaypointConfirmation')}
                     confirmText={translate('common.delete')}
                     cancelText={translate('common.cancel')}
+                    shouldEnableNewFocusManagement
                     danger
+                    restoreFocusType={restoreFocusType}
                 />
                 <FormProvider
                     style={[styles.flexGrow1, styles.mh5]}
@@ -204,7 +220,7 @@ function IOURequestStepWaypoint({
                             ref={(e: HTMLElement | null) => {
                                 textInput.current = e as unknown as TextInput;
                             }}
-                            hint={!isOffline ? 'distance.error.selectSuggestedAddress' : ''}
+                            hint={!isOffline ? translate('distance.error.selectSuggestedAddress') : ''}
                             containerStyles={[styles.mt4]}
                             label={translate('distance.address')}
                             defaultValue={waypointAddress}
@@ -242,19 +258,21 @@ export default withWritableReportOrNotFound(
             recentWaypoints: {
                 key: ONYXKEYS.NVP_RECENT_WAYPOINTS,
 
-                // Only grab the most recent 5 waypoints because that's all that is shown in the UI. This also puts them into the format of data
+                // Only grab the most recent 20 waypoints because that's all that is shown in the UI. This also puts them into the format of data
                 // that the google autocomplete component expects for it's "predefined places" feature.
                 selector: (waypoints) =>
-                    (waypoints ? waypoints.slice(0, 5) : []).map((waypoint) => ({
-                        name: waypoint.name,
-                        description: waypoint.address ?? '',
-                        geometry: {
-                            location: {
-                                lat: waypoint.lat ?? 0,
-                                lng: waypoint.lng ?? 0,
+                    (waypoints ? waypoints.slice(0, CONST.RECENT_WAYPOINTS_NUMBER as number) : [])
+                        .filter((waypoint) => waypoint.keyForList?.includes(CONST.YOUR_LOCATION_TEXT) !== true)
+                        .map((waypoint) => ({
+                            name: waypoint.name,
+                            description: waypoint.address ?? '',
+                            geometry: {
+                                location: {
+                                    lat: waypoint.lat ?? 0,
+                                    lng: waypoint.lng ?? 0,
+                                },
                             },
-                        },
-                    })),
+                        })),
             },
         })(IOURequestStepWaypoint),
     ),
diff --git a/src/pages/iou/request/step/StepScreenDragAndDropWrapper.tsx b/src/pages/iou/request/step/StepScreenDragAndDropWrapper.tsx
index 39ac12b6bdcf..81a574b6e408 100644
--- a/src/pages/iou/request/step/StepScreenDragAndDropWrapper.tsx
+++ b/src/pages/iou/request/step/StepScreenDragAndDropWrapper.tsx
@@ -1,4 +1,4 @@
-import type {PropsWithChildren} from 'react';
+import type {ReactNode} from 'react';
 import React, {useState} from 'react';
 import {View} from 'react-native';
 import DragAndDropProvider from '@components/DragAndDrop/Provider';
@@ -6,6 +6,7 @@ import HeaderWithBackButton from '@components/HeaderWithBackButton';
 import ScreenWrapper from '@components/ScreenWrapper';
 import useThemeStyles from '@hooks/useThemeStyles';
 import * as DeviceCapabilities from '@libs/DeviceCapabilities';
+import callOrReturn from '@src/types/utils/callOrReturn';
 
 type StepScreenDragAndDropWrapperProps = {
     /** The title to show in the header (should be translated already) */
@@ -22,15 +23,18 @@ type StepScreenDragAndDropWrapperProps = {
 
     /** An ID used for unit testing */
     testID: string;
+
+    /** The children to render */
+    children: ((isDraggingOver: boolean) => ReactNode) | ReactNode;
 };
 
-function StepScreenDragAndDropWrapper({testID, headerTitle, onBackButtonPress, onEntryTransitionEnd, children, shouldShowWrapper}: PropsWithChildren<StepScreenDragAndDropWrapperProps>) {
+function StepScreenDragAndDropWrapper({testID, headerTitle, onBackButtonPress, onEntryTransitionEnd, children, shouldShowWrapper}: StepScreenDragAndDropWrapperProps) {
     const styles = useThemeStyles();
 
     const [isDraggingOver, setIsDraggingOver] = useState(false);
 
     if (!shouldShowWrapper) {
-        return children;
+        return callOrReturn(children, false);
     }
 
     return (
@@ -49,7 +53,7 @@ function StepScreenDragAndDropWrapper({testID, headerTitle, onBackButtonPress, o
                             title={headerTitle}
                             onBackButtonPress={onBackButtonPress}
                         />
-                        {children}
+                        {callOrReturn(children, isDraggingOver)}
                     </View>
                 </DragAndDropProvider>
             )}
diff --git a/src/pages/iou/request/step/withFullTransactionOrNotFound.tsx b/src/pages/iou/request/step/withFullTransactionOrNotFound.tsx
index f09049e87441..491c37c9a402 100644
--- a/src/pages/iou/request/step/withFullTransactionOrNotFound.tsx
+++ b/src/pages/iou/request/step/withFullTransactionOrNotFound.tsx
@@ -35,7 +35,8 @@ type MoneyRequestRouteName =
     | typeof SCREENS.MONEY_REQUEST.STEP_TAX_RATE
     | typeof SCREENS.MONEY_REQUEST.STEP_SCAN
     | typeof SCREENS.MONEY_REQUEST.STEP_CURRENCY
-    | typeof SCREENS.MONEY_REQUEST.STEP_SEND_FROM;
+    | typeof SCREENS.MONEY_REQUEST.STEP_SEND_FROM
+    | typeof SCREENS.MONEY_REQUEST.STEP_COMPANY_INFO;
 
 type Route<T extends MoneyRequestRouteName> = RouteProp<MoneyRequestNavigatorParamList, T>;
 
@@ -69,10 +70,10 @@ export default function <TProps extends WithFullTransactionOrNotFoundProps<Money
     return withOnyx<TProps & RefAttributes<TRef>, WithFullTransactionOrNotFoundOnyxProps>({
         transaction: {
             key: ({route}) => {
-                const transactionID = route.params.transactionID ?? 0;
+                const transactionID = route.params.transactionID ?? -1;
                 const userAction = 'action' in route.params && route.params.action ? route.params.action : CONST.IOU.ACTION.CREATE;
 
-                if (userAction === CONST.IOU.ACTION.CREATE || IOUUtils.isMovingTransactionFromTrackExpense(userAction)) {
+                if (IOUUtils.shouldUseTransactionDraft(userAction)) {
                     return `${ONYXKEYS.COLLECTION.TRANSACTION_DRAFT}${transactionID}` as `${typeof ONYXKEYS.COLLECTION.TRANSACTION}${string}`;
                 }
                 return `${ONYXKEYS.COLLECTION.TRANSACTION}${transactionID}`;
diff --git a/src/pages/iou/request/step/withWritableReportOrNotFound.tsx b/src/pages/iou/request/step/withWritableReportOrNotFound.tsx
index 36b14f2aaedb..8df530f3c81c 100644
--- a/src/pages/iou/request/step/withWritableReportOrNotFound.tsx
+++ b/src/pages/iou/request/step/withWritableReportOrNotFound.tsx
@@ -1,12 +1,14 @@
 import type {RouteProp} from '@react-navigation/core';
 import type {ComponentType, ForwardedRef, RefAttributes} from 'react';
-import React, {forwardRef} from 'react';
+import React, {forwardRef, useEffect} from 'react';
 import type {OnyxEntry} from 'react-native-onyx';
 import {withOnyx} from 'react-native-onyx';
 import FullPageNotFoundView from '@components/BlockingViews/FullPageNotFoundView';
+import FullScreenLoadingIndicator from '@components/FullscreenLoadingIndicator';
 import getComponentDisplayName from '@libs/getComponentDisplayName';
 import type {MoneyRequestNavigatorParamList} from '@libs/Navigation/types';
 import * as ReportUtils from '@libs/ReportUtils';
+import * as ReportActions from '@userActions/Report';
 import CONST from '@src/CONST';
 import ONYXKEYS from '@src/ONYXKEYS';
 import type SCREENS from '@src/SCREENS';
@@ -15,6 +17,12 @@ import type {Report} from '@src/types/onyx';
 type WithWritableReportOrNotFoundOnyxProps = {
     /** The report corresponding to the reportID in the route params */
     report: OnyxEntry<Report>;
+
+    /** Whether the reports are loading. When false it means they are ready to be used. */
+    isLoadingApp: OnyxEntry<boolean>;
+
+    /** The draft report corresponding to the reportID in the route params */
+    reportDraft: OnyxEntry<Report>;
 };
 
 type MoneyRequestRouteName =
@@ -34,7 +42,8 @@ type MoneyRequestRouteName =
     | typeof SCREENS.MONEY_REQUEST.STEP_MERCHANT
     | typeof SCREENS.MONEY_REQUEST.STEP_TAX_AMOUNT
     | typeof SCREENS.MONEY_REQUEST.STEP_SCAN
-    | typeof SCREENS.MONEY_REQUEST.STEP_SEND_FROM;
+    | typeof SCREENS.MONEY_REQUEST.STEP_SEND_FROM
+    | typeof SCREENS.MONEY_REQUEST.STEP_COMPANY_INFO;
 
 type Route<T extends MoneyRequestRouteName> = RouteProp<MoneyRequestNavigatorParamList, T>;
 
@@ -46,12 +55,25 @@ export default function <TProps extends WithWritableReportOrNotFoundProps<MoneyR
 ): React.ComponentType<Omit<TProps & RefAttributes<TRef>, keyof WithWritableReportOrNotFoundOnyxProps>> {
     // eslint-disable-next-line rulesdir/no-negated-variables
     function WithWritableReportOrNotFound(props: TProps, ref: ForwardedRef<TRef>) {
-        const {report = {reportID: ''}, route} = props;
+        const {report = {reportID: ''}, route, isLoadingApp = true, reportDraft} = props;
         const iouTypeParamIsInvalid = !Object.values(CONST.IOU.TYPE)
             .filter((type) => shouldIncludeDeprecatedIOUType || (type !== CONST.IOU.TYPE.REQUEST && type !== CONST.IOU.TYPE.SEND))
             .includes(route.params?.iouType);
+        const isEditing = 'action' in route.params && route.params?.action === CONST.IOU.ACTION.EDIT;
         const canUserPerformWriteAction = ReportUtils.canUserPerformWriteAction(report);
 
+        useEffect(() => {
+            if (!!report?.reportID || !route.params.reportID || !!reportDraft || !isEditing) {
+                return;
+            }
+            ReportActions.openReport(route.params.reportID);
+            // eslint-disable-next-line react-compiler/react-compiler, react-hooks/exhaustive-deps
+        }, []);
+
+        if (isEditing && isLoadingApp) {
+            return <FullScreenLoadingIndicator />;
+        }
+
         if (iouTypeParamIsInvalid || !canUserPerformWriteAction) {
             return <FullPageNotFoundView shouldShow />;
         }
@@ -69,7 +91,13 @@ export default function <TProps extends WithWritableReportOrNotFoundProps<MoneyR
 
     return withOnyx<TProps & RefAttributes<TRef>, WithWritableReportOrNotFoundOnyxProps>({
         report: {
-            key: ({route}) => `${ONYXKEYS.COLLECTION.REPORT}${route.params.reportID ?? '0'}`,
+            key: ({route}) => `${ONYXKEYS.COLLECTION.REPORT}${route.params.reportID ?? '-1'}`,
+        },
+        isLoadingApp: {
+            key: ONYXKEYS.IS_LOADING_APP,
+        },
+        reportDraft: {
+            key: ({route}) => `${ONYXKEYS.COLLECTION.REPORT_DRAFT}${route.params.reportID ?? '-1'}`,
         },
     })(forwardRef(WithWritableReportOrNotFound));
 }
diff --git a/src/pages/settings/AboutPage/AboutPage.tsx b/src/pages/settings/AboutPage/AboutPage.tsx
index 56336386c46b..1f3f235a9c3f 100644
--- a/src/pages/settings/AboutPage/AboutPage.tsx
+++ b/src/pages/settings/AboutPage/AboutPage.tsx
@@ -14,9 +14,9 @@ import Section from '@components/Section';
 import Text from '@components/Text';
 import TextLink from '@components/TextLink';
 import useLocalize from '@hooks/useLocalize';
+import useResponsiveLayout from '@hooks/useResponsiveLayout';
 import useThemeStyles from '@hooks/useThemeStyles';
 import useWaitForNavigation from '@hooks/useWaitForNavigation';
-import useWindowDimensions from '@hooks/useWindowDimensions';
 import * as Environment from '@libs/Environment/Environment';
 import Navigation from '@libs/Navigation/Navigation';
 import * as ReportActionContextMenu from '@pages/home/report/ContextMenu/ReportActionContextMenu';
@@ -53,7 +53,7 @@ function AboutPage() {
     const styles = useThemeStyles();
     const popoverAnchor = useRef<View | RNText | null>(null);
     const waitForNavigate = useWaitForNavigation();
-    const {isSmallScreenWidth} = useWindowDimensions();
+    const {shouldUseNarrowLayout} = useResponsiveLayout();
 
     const menuItems = useMemo(() => {
         const baseMenuItems: MenuItem[] = [
@@ -122,7 +122,7 @@ function AboutPage() {
             </View>
         ),
         // disabling this rule, as we want this to run only on the first render
-        // eslint-disable-next-line react-hooks/exhaustive-deps
+        // eslint-disable-next-line react-compiler/react-compiler, react-hooks/exhaustive-deps
         [],
     );
 
@@ -134,12 +134,12 @@ function AboutPage() {
         >
             <HeaderWithBackButton
                 title={translate('initialSettingsPage.about')}
-                shouldShowBackButton={isSmallScreenWidth}
+                shouldShowBackButton={shouldUseNarrowLayout}
                 onBackButtonPress={() => Navigation.goBack(ROUTES.SETTINGS)}
                 icon={Illustrations.PalmTree}
             />
             <ScrollView contentContainerStyle={styles.pt3}>
-                <View style={[styles.flex1, isSmallScreenWidth ? styles.workspaceSectionMobile : styles.workspaceSection]}>
+                <View style={[styles.flex1, shouldUseNarrowLayout ? styles.workspaceSectionMobile : styles.workspaceSection]}>
                     <Section
                         title={translate('footer.aboutExpensify')}
                         subtitle={translate('initialSettingsPage.aboutPage.description')}
diff --git a/src/pages/settings/AboutPage/ConsolePage.tsx b/src/pages/settings/AboutPage/ConsolePage.tsx
index c9532fa041a0..21ce3a7907cc 100644
--- a/src/pages/settings/AboutPage/ConsolePage.tsx
+++ b/src/pages/settings/AboutPage/ConsolePage.tsx
@@ -1,5 +1,7 @@
+import type {RouteProp} from '@react-navigation/native';
+import {useRoute} from '@react-navigation/native';
 import {format} from 'date-fns';
-import React, {useCallback, useEffect, useMemo, useState} from 'react';
+import React, {useCallback, useMemo, useRef, useState} from 'react';
 import {View} from 'react-native';
 import type {ListRenderItem, ListRenderItemInfo} from 'react-native';
 import {withOnyx} from 'react-native-onyx';
@@ -9,21 +11,26 @@ import ConfirmModal from '@components/ConfirmModal';
 import HeaderWithBackButton from '@components/HeaderWithBackButton';
 import * as Expensicons from '@components/Icon/Expensicons';
 import InvertedFlatList from '@components/InvertedFlatList';
+import type {PopoverMenuItem} from '@components/PopoverMenu';
 import ScreenWrapper from '@components/ScreenWrapper';
 import Text from '@components/Text';
 import TextInput from '@components/TextInput';
 import useKeyboardShortcut from '@hooks/useKeyboardShortcut';
 import useLocalize from '@hooks/useLocalize';
+import useTheme from '@hooks/useTheme';
 import useThemeStyles from '@hooks/useThemeStyles';
+import useWindowDimensions from '@hooks/useWindowDimensions';
 import {addLog} from '@libs/actions/Console';
 import {createLog, parseStringifiedMessages, sanitizeConsoleInput} from '@libs/Console';
 import type {Log} from '@libs/Console';
 import localFileCreate from '@libs/localFileCreate';
 import localFileDownload from '@libs/localFileDownload';
 import Navigation from '@libs/Navigation/Navigation';
+import type {SettingsNavigatorParamList} from '@navigation/types';
 import CONST from '@src/CONST';
 import ONYXKEYS from '@src/ONYXKEYS';
 import ROUTES from '@src/ROUTES';
+import type SCREENS from '@src/SCREENS';
 import type {CapturedLogs} from '@src/types/onyx';
 
 type ConsolePageOnyxProps = {
@@ -36,30 +43,71 @@ type ConsolePageOnyxProps = {
 
 type ConsolePageProps = ConsolePageOnyxProps;
 
+const filterBy = {
+    all: '',
+    network: '[Network]',
+} as const;
+type FilterBy = (typeof filterBy)[keyof typeof filterBy];
+
 function ConsolePage({capturedLogs, shouldStoreLogs}: ConsolePageProps) {
     const [input, setInput] = useState('');
-    const [logs, setLogs] = useState(capturedLogs);
     const [isGeneratingLogsFile, setIsGeneratingLogsFile] = useState(false);
     const [isLimitModalVisible, setIsLimitModalVisible] = useState(false);
+    const [activeFilterIndex, setActiveFilterIndex] = useState<FilterBy>(filterBy.all);
     const {translate} = useLocalize();
     const styles = useThemeStyles();
-
-    const logsList = useMemo(
-        () =>
-            Object.entries(logs ?? {})
-                .map(([key, value]) => ({key, ...value}))
-                .reverse(),
-        [logs],
+    const theme = useTheme();
+    const {windowWidth} = useWindowDimensions();
+    const route = useRoute<RouteProp<SettingsNavigatorParamList, typeof SCREENS.SETTINGS.CONSOLE>>();
+
+    const menuItems: PopoverMenuItem[] = useMemo(
+        () => [
+            {
+                text: translate('common.filterLogs'),
+                disabled: true,
+            },
+            {
+                icon: Expensicons.All,
+                text: translate('common.all'),
+                iconFill: activeFilterIndex === filterBy.all ? theme.iconSuccessFill : theme.icon,
+                iconRight: Expensicons.Checkmark,
+                shouldShowRightIcon: activeFilterIndex === filterBy.all,
+                success: activeFilterIndex === filterBy.all,
+                onSelected: () => {
+                    setActiveFilterIndex(filterBy.all);
+                },
+            },
+            {
+                icon: Expensicons.Globe,
+                text: translate('common.network'),
+                iconFill: activeFilterIndex === filterBy.network ? theme.iconSuccessFill : theme.icon,
+                iconRight: Expensicons.CheckCircle,
+                shouldShowRightIcon: activeFilterIndex === filterBy.network,
+                success: activeFilterIndex === filterBy.network,
+                onSelected: () => {
+                    setActiveFilterIndex(filterBy.network);
+                },
+            },
+        ],
+        [activeFilterIndex, theme.icon, theme.iconSuccessFill, translate],
     );
 
-    useEffect(() => {
+    const prevLogs = useRef<OnyxEntry<CapturedLogs>>({});
+    const getLogs = useCallback(() => {
         if (!shouldStoreLogs) {
-            return;
+            return [];
         }
 
-        setLogs((prevLogs) => ({...prevLogs, ...capturedLogs}));
+        prevLogs.current = {...prevLogs.current, ...capturedLogs};
+        return Object.entries(prevLogs.current ?? {})
+            .map(([key, value]) => ({key, ...value}))
+            .reverse();
     }, [capturedLogs, shouldStoreLogs]);
 
+    const logsList = useMemo(() => getLogs(), [getLogs]);
+
+    const filteredLogsList = useMemo(() => logsList.filter((log) => log.message.includes(activeFilterIndex)), [activeFilterIndex, logsList]);
+
     const executeArbitraryCode = () => {
         const sanitizedInput = sanitizeConsoleInput(input);
 
@@ -71,14 +119,14 @@ function ConsolePage({capturedLogs, shouldStoreLogs}: ConsolePageProps) {
     useKeyboardShortcut(CONST.KEYBOARD_SHORTCUTS.ENTER, executeArbitraryCode);
 
     const saveLogs = () => {
-        const logsWithParsedMessages = parseStringifiedMessages(logsList);
+        const logsWithParsedMessages = parseStringifiedMessages(filteredLogsList);
 
         localFileDownload('logs', JSON.stringify(logsWithParsedMessages, null, 2));
     };
 
     const shareLogs = () => {
         setIsGeneratingLogsFile(true);
-        const logsWithParsedMessages = parseStringifiedMessages(logsList);
+        const logsWithParsedMessages = parseStringifiedMessages(filteredLogsList);
 
         // Generate a file with the logs and pass its path to the list of reports to share it with
         localFileCreate('logs', JSON.stringify(logsWithParsedMessages, null, 2)).then(({path, size}) => {
@@ -114,11 +162,16 @@ function ConsolePage({capturedLogs, shouldStoreLogs}: ConsolePageProps) {
         <ScreenWrapper testID={ConsolePage.displayName}>
             <HeaderWithBackButton
                 title={translate('initialSettingsPage.troubleshoot.debugConsole')}
-                onBackButtonPress={() => Navigation.goBack(ROUTES.SETTINGS_TROUBLESHOOT)}
+                onBackButtonPress={() => Navigation.goBack(route.params?.backTo)}
+                shouldShowThreeDotsButton
+                threeDotsMenuItems={menuItems}
+                threeDotsAnchorPosition={styles.threeDotsPopoverOffset(windowWidth)}
+                threeDotsMenuIcon={Expensicons.Filter}
+                threeDotsMenuIconFill={theme.icon}
             />
             <View style={[styles.border, styles.highlightBG, styles.borderNone, styles.mh5, styles.flex1]}>
                 <InvertedFlatList
-                    data={logsList}
+                    data={filteredLogsList}
                     renderItem={renderItem}
                     contentContainerStyle={styles.p5}
                     ListEmptyComponent={<Text>{translate('initialSettingsPage.debugConsole.noLogsAvailable')}</Text>}
@@ -154,7 +207,7 @@ function ConsolePage({capturedLogs, shouldStoreLogs}: ConsolePageProps) {
                     success
                     text={translate('initialSettingsPage.debugConsole.execute')}
                     onPress={executeArbitraryCode}
-                    style={[styles.mt5]}
+                    style={[styles.mv5]}
                     large
                 />
             </View>
@@ -162,6 +215,7 @@ function ConsolePage({capturedLogs, shouldStoreLogs}: ConsolePageProps) {
                 title={translate('initialSettingsPage.debugConsole.shareLog')}
                 isVisible={isLimitModalVisible}
                 onConfirm={() => setIsLimitModalVisible(false)}
+                onCancel={() => setIsLimitModalVisible(false)}
                 prompt={translate('initialSettingsPage.debugConsole.logSizeTooLarge', {
                     size: CONST.API_ATTACHMENT_VALIDATIONS.MAX_SIZE / 1024 / 1024,
                 })}
diff --git a/src/pages/settings/AboutPage/ShareLogList/BaseShareLogList.tsx b/src/pages/settings/AboutPage/ShareLogList/BaseShareLogList.tsx
index 58c3be7df6b1..3f5db6cf5613 100644
--- a/src/pages/settings/AboutPage/ShareLogList/BaseShareLogList.tsx
+++ b/src/pages/settings/AboutPage/ShareLogList/BaseShareLogList.tsx
@@ -27,30 +27,51 @@ function BaseShareLogList({onAttachLogToReport}: BaseShareLogListProps) {
     const [isSearchingForReports] = useOnyx(ONYXKEYS.IS_SEARCHING_FOR_REPORTS, {initWithStoredValues: false});
     const {options, areOptionsInitialized} = useOptionsList();
 
-    const searchOptions = useMemo(() => {
+    const defaultOptions = useMemo(() => {
         if (!areOptionsInitialized) {
             return {
                 recentReports: [],
                 personalDetails: [],
-                userToInvite: undefined,
+                userToInvite: null,
+                currentUserOption: null,
+                categoryOptions: [],
+                tagOptions: [],
+                taxRatesOptions: [],
                 headerMessage: '',
             };
         }
-        const {
-            recentReports: localRecentReports,
-            personalDetails: localPersonalDetails,
-            userToInvite: localUserToInvite,
-        } = OptionsListUtils.getShareLogOptions(options, debouncedSearchValue.trim(), betas ?? []);
+        const shareLogOptions = OptionsListUtils.getShareLogOptions(options, '', betas ?? []);
 
-        const header = OptionsListUtils.getHeaderMessage((localRecentReports?.length || 0) + (localPersonalDetails?.length || 0) !== 0, Boolean(localUserToInvite), debouncedSearchValue);
+        const header = OptionsListUtils.getHeaderMessage(
+            (shareLogOptions.recentReports.length || 0) + (shareLogOptions.personalDetails.length || 0) !== 0,
+            !!shareLogOptions.userToInvite,
+            '',
+        );
 
         return {
-            recentReports: localRecentReports,
-            personalDetails: localPersonalDetails,
-            userToInvite: localUserToInvite,
+            ...shareLogOptions,
             headerMessage: header,
         };
-    }, [areOptionsInitialized, options, debouncedSearchValue, betas]);
+    }, [areOptionsInitialized, options, betas]);
+
+    const searchOptions = useMemo(() => {
+        if (debouncedSearchValue.trim() === '') {
+            return defaultOptions;
+        }
+
+        const filteredOptions = OptionsListUtils.filterOptions(defaultOptions, debouncedSearchValue, {
+            preferChatroomsOverThreads: true,
+            sortByReportTypeInSearch: true,
+        });
+
+        const headerMessage = OptionsListUtils.getHeaderMessage(
+            (filteredOptions.recentReports?.length || 0) + (filteredOptions.personalDetails?.length || 0) !== 0,
+            !!filteredOptions.userToInvite,
+            debouncedSearchValue.trim(),
+        );
+
+        return {...filteredOptions, headerMessage};
+    }, [debouncedSearchValue, defaultOptions]);
 
     const sections = useMemo(() => {
         const sectionsList = [];
@@ -99,16 +120,17 @@ function BaseShareLogList({onAttachLogToReport}: BaseShareLogListProps) {
                 <>
                     <HeaderWithBackButton
                         title={translate('initialSettingsPage.debugConsole.shareLog')}
-                        onBackButtonPress={() => Navigation.goBack(ROUTES.SETTINGS_CONSOLE)}
+                        onBackButtonPress={() => Navigation.goBack(ROUTES.SETTINGS_CONSOLE.getRoute())}
                     />
                     <SelectionList
                         ListItem={UserListItem}
                         sections={didScreenTransitionEnd ? sections : CONST.EMPTY_ARRAY}
                         onSelectRow={attachLogToReport}
+                        shouldSingleExecuteRowSelect
                         onChangeText={setSearchValue}
                         textInputValue={searchValue}
                         headerMessage={searchOptions.headerMessage}
-                        textInputLabel={translate('optionsSelector.nameEmailOrPhoneNumber')}
+                        textInputLabel={translate('selectionList.nameEmailOrPhoneNumber')}
                         textInputHint={isOffline ? `${translate('common.youAppearToBeOffline')} ${translate('search.resultsAreLimited')}` : ''}
                         showLoadingPlaceholder={!didScreenTransitionEnd}
                         isLoadingNewOptions={!!isSearchingForReports}
diff --git a/src/pages/settings/ExitSurvey/ExitSurveyConfirmPage.tsx b/src/pages/settings/ExitSurvey/ExitSurveyConfirmPage.tsx
index 672dbbb91069..2c9fa879dcfc 100644
--- a/src/pages/settings/ExitSurvey/ExitSurveyConfirmPage.tsx
+++ b/src/pages/settings/ExitSurvey/ExitSurveyConfirmPage.tsx
@@ -84,13 +84,15 @@ function ExitSurveyConfirmPage({exitReason, isLoading, route, navigation}: ExitS
                     large
                     text={translate('exitSurvey.goToExpensifyClassic')}
                     onPress={() => {
-                        ExitSurvey.switchToOldDot();
-
+                        const promise = ExitSurvey.switchToOldDot();
                         if (NativeModules.HybridAppModule) {
-                            NativeModules.HybridAppModule.closeReactNativeApp();
+                            promise.then(() => {
+                                Navigation.resetToHome();
+                                NativeModules.HybridAppModule.closeReactNativeApp(false);
+                            });
                             return;
                         }
-
+                        Navigation.dismissModal();
                         Link.openOldDotLink(CONST.OLDDOT_URLS.INBOX);
                     }}
                     isLoading={isLoading ?? false}
diff --git a/src/pages/settings/ExitSurvey/ExitSurveyReasonPage.tsx b/src/pages/settings/ExitSurvey/ExitSurveyReasonPage.tsx
index dbaf330803c1..d9f53faa62d0 100644
--- a/src/pages/settings/ExitSurvey/ExitSurveyReasonPage.tsx
+++ b/src/pages/settings/ExitSurvey/ExitSurveyReasonPage.tsx
@@ -60,7 +60,7 @@ function ExitSurveyReasonPage({draftReason}: ExitSurveyReasonPageOnyxProps) {
                 validate={() => {
                     const errors: Errors = {};
                     if (!reason) {
-                        errors[INPUT_IDS.REASON] = 'common.error.fieldRequired';
+                        errors[INPUT_IDS.REASON] = translate('common.error.fieldRequired');
                     }
                     return errors;
                 }}
diff --git a/src/pages/settings/ExitSurvey/ExitSurveyResponsePage.tsx b/src/pages/settings/ExitSurvey/ExitSurveyResponsePage.tsx
index 62183b0ebc26..83f5d90b85af 100644
--- a/src/pages/settings/ExitSurvey/ExitSurveyResponsePage.tsx
+++ b/src/pages/settings/ExitSurvey/ExitSurveyResponsePage.tsx
@@ -44,7 +44,7 @@ function ExitSurveyResponsePage({draftResponse, route, navigation}: ExitSurveyRe
     const {keyboardHeight} = useKeyboardState();
     const {windowHeight} = useWindowDimensions();
     const {top: safeAreaInsetsTop} = useSafeAreaInsets();
-    const {inputCallbackRef} = useAutoFocusInput();
+    const {inputCallbackRef, inputRef} = useAutoFocusInput();
 
     const {reason, backTo} = route.params;
     const {isOffline} = useNetwork({
@@ -110,7 +110,7 @@ function ExitSurveyResponsePage({draftResponse, route, navigation}: ExitSurveyRe
                 validate={() => {
                     const errors: Errors = {};
                     if (!draftResponse?.trim()) {
-                        errors[INPUT_IDS.RESPONSE] = 'common.error.fieldRequired';
+                        errors[INPUT_IDS.RESPONSE] = translate('common.error.fieldRequired');
                     }
                     return errors;
                 }}
@@ -134,11 +134,14 @@ function ExitSurveyResponsePage({draftResponse, route, navigation}: ExitSurveyRe
                                 if (!el) {
                                     return;
                                 }
-                                updateMultilineInputRange(el);
+                                if (!inputRef.current) {
+                                    updateMultilineInputRange(el);
+                                }
                                 inputCallbackRef(el);
                             }}
                             containerStyles={[baseResponseInputContainerStyle]}
                             shouldSaveDraft
+                            shouldSubmitForm
                         />
                     </>
                 )}
diff --git a/src/pages/settings/InitialSettingsPage.tsx b/src/pages/settings/InitialSettingsPage.tsx
index 2dfeb1841a74..0cfcad3d731d 100755
--- a/src/pages/settings/InitialSettingsPage.tsx
+++ b/src/pages/settings/InitialSettingsPage.tsx
@@ -4,15 +4,14 @@ import React, {useCallback, useContext, useEffect, useLayoutEffect, useMemo, use
 import type {GestureResponderEvent, ScrollView as RNScrollView, ScrollViewProps, StyleProp, ViewStyle} from 'react-native';
 import {View} from 'react-native';
 import type {OnyxCollection, OnyxEntry} from 'react-native-onyx';
-import {withOnyx} from 'react-native-onyx';
+import {useOnyx, withOnyx} from 'react-native-onyx';
 import type {ValueOf} from 'type-fest';
-import AvatarWithImagePicker from '@components/AvatarWithImagePicker';
+import AccountSwitcher from '@components/AccountSwitcher';
+import AccountSwitcherSkeletonView from '@components/AccountSwitcherSkeletonView';
 import ConfirmModal from '@components/ConfirmModal';
-import CurrentUserPersonalDetailsSkeletonView from '@components/CurrentUserPersonalDetailsSkeletonView';
 import Icon from '@components/Icon';
 import * as Expensicons from '@components/Icon/Expensicons';
 import MenuItem from '@components/MenuItem';
-import OfflineWithFeedback from '@components/OfflineWithFeedback';
 import {PressableWithFeedback} from '@components/Pressable';
 import ScreenWrapper from '@components/ScreenWrapper';
 import {ScrollOffsetContext} from '@components/ScrollOffsetContextProvider';
@@ -21,23 +20,23 @@ import Text from '@components/Text';
 import Tooltip from '@components/Tooltip';
 import type {WithCurrentUserPersonalDetailsProps} from '@components/withCurrentUserPersonalDetails';
 import withCurrentUserPersonalDetails from '@components/withCurrentUserPersonalDetails';
-import useActiveRoute from '@hooks/useActiveRoute';
+import useActiveCentralPaneRoute from '@hooks/useActiveCentralPaneRoute';
 import useLocalize from '@hooks/useLocalize';
 import useNetwork from '@hooks/useNetwork';
 import useSingleExecution from '@hooks/useSingleExecution';
+import useSubscriptionPlan from '@hooks/useSubscriptionPlan';
 import useTheme from '@hooks/useTheme';
 import useThemeStyles from '@hooks/useThemeStyles';
 import useWaitForNavigation from '@hooks/useWaitForNavigation';
 import * as CurrencyUtils from '@libs/CurrencyUtils';
 import Navigation from '@libs/Navigation/Navigation';
-import shouldShowSubscriptionsMenu from '@libs/shouldShowSubscriptionsMenu';
+import * as SubscriptionUtils from '@libs/SubscriptionUtils';
 import * as UserUtils from '@libs/UserUtils';
 import {hasGlobalWorkspaceSettingsRBR} from '@libs/WorkspacesSettingsUtils';
 import * as ReportActionContextMenu from '@pages/home/report/ContextMenu/ReportActionContextMenu';
 import variables from '@styles/variables';
 import * as Link from '@userActions/Link';
 import * as PaymentMethods from '@userActions/PaymentMethods';
-import * as PersonalDetails from '@userActions/PersonalDetails';
 import * as Session from '@userActions/Session';
 import * as Wallet from '@userActions/Wallet';
 import CONST from '@src/CONST';
@@ -51,9 +50,6 @@ import {isEmptyObject} from '@src/types/utils/EmptyObject';
 import type IconAsset from '@src/types/utils/IconAsset';
 
 type InitialSettingsPageOnyxProps = {
-    /** The user's session */
-    session: OnyxEntry<OnyxTypes.Session>;
-
     /** The user's wallet account */
     userWallet: OnyxEntry<OnyxTypes.UserWallet>;
 
@@ -86,26 +82,31 @@ type MenuData = {
     iconStyles?: StyleProp<ViewStyle>;
     fallbackIcon?: IconAsset;
     shouldStackHorizontally?: boolean;
-    avatarSize?: (typeof CONST.AVATAR_SIZE)[keyof typeof CONST.AVATAR_SIZE];
+    avatarSize?: ValueOf<typeof CONST.AVATAR_SIZE>;
     floatRightAvatars?: TIcon[];
     title?: string;
     shouldShowRightIcon?: boolean;
     iconRight?: IconAsset;
+    badgeText?: string;
+    badgeStyle?: ViewStyle;
 };
 
 type Menu = {sectionStyle: StyleProp<ViewStyle>; sectionTranslationKey: TranslationPaths; items: MenuData[]};
 
-function InitialSettingsPage({session, userWallet, bankAccountList, fundList, walletTerms, loginList, currentUserPersonalDetails, policies}: InitialSettingsPageProps) {
+function InitialSettingsPage({userWallet, bankAccountList, fundList, walletTerms, loginList, currentUserPersonalDetails, policies}: InitialSettingsPageProps) {
     const network = useNetwork();
     const theme = useTheme();
     const styles = useThemeStyles();
     const {isExecuting, singleExecution} = useSingleExecution();
     const waitForNavigate = useWaitForNavigation();
     const popoverAnchor = useRef(null);
-    const {translate, formatPhoneNumber} = useLocalize();
-    const activeRoute = useActiveRoute();
+    const {translate} = useLocalize();
+    const activeCentralPaneRoute = useActiveCentralPaneRoute();
     const emojiCode = currentUserPersonalDetails?.status?.emojiCode ?? '';
 
+    const [privateSubscription] = useOnyx(ONYXKEYS.NVP_PRIVATE_SUBSCRIPTION);
+    const subscriptionPlan = useSubscriptionPlan();
+
     const [shouldShowSignoutConfirmModal, setShouldShowSignoutConfirmModal] = useState(false);
 
     useEffect(() => {
@@ -189,8 +190,8 @@ function InitialSettingsPage({session, userWallet, bankAccountList, fundList, wa
                 brickRoadIndicator: hasGlobalWorkspaceSettingsRBR(policies) ? CONST.BRICK_ROAD_INDICATOR_STATUS.ERROR : undefined,
             },
             {
-                translationKey: 'allSettingsScreen.cardsAndDomains',
-                icon: Expensicons.CardsAndDomains,
+                translationKey: 'allSettingsScreen.domains',
+                icon: Expensicons.Globe,
                 action: () => {
                     Link.openOldDotLink(CONST.OLDDOT_URLS.ADMIN_DOMAINS_URL);
                 },
@@ -200,16 +201,14 @@ function InitialSettingsPage({session, userWallet, bankAccountList, fundList, wa
             },
         ];
 
-        if (shouldShowSubscriptionsMenu) {
+        if (subscriptionPlan) {
             items.splice(1, 0, {
-                translationKey: 'allSettingsScreen.subscriptions',
-                icon: Expensicons.MoneyBag,
-                action: () => {
-                    Link.openOldDotLink(CONST.OLDDOT_URLS.ADMIN_POLICIES_URL);
-                },
-                shouldShowRightIcon: true,
-                iconRight: Expensicons.NewWindow,
-                link: () => Link.buildOldDotURL(CONST.OLDDOT_URLS.ADMIN_POLICIES_URL),
+                translationKey: 'allSettingsScreen.subscription',
+                icon: Expensicons.CreditCard,
+                routeName: ROUTES.SETTINGS_SUBSCRIPTION,
+                brickRoadIndicator: !!privateSubscription?.errors || SubscriptionUtils.hasSubscriptionRedDotError() ? CONST.BRICK_ROAD_INDICATOR_STATUS.ERROR : undefined,
+                badgeText: SubscriptionUtils.isUserOnFreeTrial() ? translate('subscription.badge.freeTrial', {numOfDays: SubscriptionUtils.calculateRemainingFreeTrialDays()}) : undefined,
+                badgeStyle: SubscriptionUtils.isUserOnFreeTrial() ? styles.badgeSuccess : undefined,
             });
         }
 
@@ -218,7 +217,7 @@ function InitialSettingsPage({session, userWallet, bankAccountList, fundList, wa
             sectionTranslationKey: 'common.workspaces',
             items,
         };
-    }, [policies, styles.workspaceSettingsSectionContainer]);
+    }, [policies, privateSubscription?.errors, styles.badgeSuccess, styles.workspaceSettingsSectionContainer, subscriptionPlan, translate]);
 
     /**
      * Retuns a list of menu items data for general section
@@ -226,7 +225,7 @@ function InitialSettingsPage({session, userWallet, bankAccountList, fundList, wa
      */
     const generalMenuItemsData: Menu = useMemo(() => {
         const signOutTranslationKey = Session.isSupportAuthToken() && Session.hasStashedSession() ? 'initialSettingsPage.restoreStashed' : 'initialSettingsPage.signOut';
-        const defaultMenu: Menu = {
+        return {
             sectionStyle: {
                 ...styles.pt4,
             },
@@ -266,8 +265,6 @@ function InitialSettingsPage({session, userWallet, bankAccountList, fundList, wa
                 },
             ],
         };
-
-        return defaultMenu;
     }, [styles.pt4, signOut]);
 
     /**
@@ -316,7 +313,8 @@ function InitialSettingsPage({session, userWallet, bankAccountList, fundList, wa
                                     }
                                 })}
                                 iconStyles={item.iconStyles}
-                                badgeText={getWalletBalance(isPaymentItem)}
+                                badgeText={item.badgeText ?? getWalletBalance(isPaymentItem)}
+                                badgeStyle={item.badgeStyle}
                                 fallbackIcon={item.fallbackIcon}
                                 brickRoadIndicator={item.brickRoadIndicator}
                                 floatRightAvatars={item.floatRightAvatars}
@@ -324,10 +322,12 @@ function InitialSettingsPage({session, userWallet, bankAccountList, fundList, wa
                                 floatRightAvatarSize={item.avatarSize}
                                 ref={popoverAnchor}
                                 hoverAndPressStyle={styles.hoveredComponentBG}
-                                shouldBlockSelection={Boolean(item.link)}
+                                shouldBlockSelection={!!item.link}
                                 onSecondaryInteraction={item.link ? (event) => openPopover(item.link, event) : undefined}
                                 focused={
-                                    !!activeRoute?.name && !!item.routeName && !!(activeRoute?.name.toLowerCase().replaceAll('_', '') === item.routeName.toLowerCase().replaceAll('/', ''))
+                                    !!activeCentralPaneRoute &&
+                                    !!item.routeName &&
+                                    !!(activeCentralPaneRoute.name.toLowerCase().replaceAll('_', '') === item.routeName.toLowerCase().replaceAll('/', ''))
                                 }
                                 isPaneMenu
                                 iconRight={item.iconRight}
@@ -348,7 +348,7 @@ function InitialSettingsPage({session, userWallet, bankAccountList, fundList, wa
             userWallet?.currentBalance,
             isExecuting,
             singleExecution,
-            activeRoute,
+            activeCentralPaneRoute,
             waitForNavigate,
         ],
     );
@@ -357,94 +357,35 @@ function InitialSettingsPage({session, userWallet, bankAccountList, fundList, wa
     const generalMenuItems = useMemo(() => getMenuItemsSection(generalMenuItemsData), [generalMenuItemsData, getMenuItemsSection]);
     const workspaceMenuItems = useMemo(() => getMenuItemsSection(workspaceMenuItemsData), [workspaceMenuItemsData, getMenuItemsSection]);
 
-    const currentUserDetails = currentUserPersonalDetails;
-    const avatarURL = currentUserDetails?.avatar ?? '';
-    const accountID = currentUserDetails?.accountID ?? '';
-
     const headerContent = (
-        <View style={[styles.avatarSectionWrapperSettings, styles.justifyContentCenter, styles.ph5, styles.pb5]}>
+        <View style={[styles.ph5, styles.pb3]}>
             {isEmptyObject(currentUserPersonalDetails) || currentUserPersonalDetails.displayName === undefined ? (
-                <CurrentUserPersonalDetailsSkeletonView avatarSize={CONST.AVATAR_SIZE.XLARGE} />
+                <AccountSwitcherSkeletonView avatarSize={CONST.AVATAR_SIZE.MEDIUM} />
             ) : (
-                <>
-                    <View style={[styles.flexRow, styles.w100, styles.justifyContentBetween, styles.alignItemsCenter, styles.pb5]}>
-                        <Tooltip text={translate('common.shareCode')}>
-                            <PressableWithFeedback
-                                accessibilityLabel={translate('common.shareCode')}
-                                accessibilityRole="button"
-                                accessible
-                                onPress={() => Navigation.navigate(ROUTES.SETTINGS_SHARE_CODE)}
-                            >
-                                <View style={styles.primaryMediumIcon}>
+                <View style={[styles.flexRow, styles.justifyContentBetween, styles.alignItemsCenter, styles.pb3, styles.gap3]}>
+                    <AccountSwitcher />
+                    <Tooltip text={translate('statusPage.status')}>
+                        <PressableWithFeedback
+                            accessibilityLabel={translate('statusPage.status')}
+                            accessibilityRole="button"
+                            accessible
+                            onPress={() => Navigation.navigate(ROUTES.SETTINGS_STATUS)}
+                        >
+                            <View style={styles.primaryMediumIcon}>
+                                {emojiCode ? (
+                                    <Text style={styles.primaryMediumText}>{emojiCode}</Text>
+                                ) : (
                                     <Icon
-                                        src={Expensicons.QrCode}
+                                        src={Expensicons.Emoji}
                                         width={variables.iconSizeNormal}
                                         height={variables.iconSizeNormal}
                                         fill={theme.icon}
                                     />
-                                </View>
-                            </PressableWithFeedback>
-                        </Tooltip>
-                        <Tooltip text={translate('statusPage.status')}>
-                            <PressableWithFeedback
-                                accessibilityLabel={translate('statusPage.status')}
-                                accessibilityRole="button"
-                                accessible
-                                onPress={() => Navigation.navigate(ROUTES.SETTINGS_STATUS)}
-                            >
-                                <View style={styles.primaryMediumIcon}>
-                                    {emojiCode ? (
-                                        <Text style={styles.primaryMediumText}>{emojiCode}</Text>
-                                    ) : (
-                                        <Icon
-                                            src={Expensicons.Emoji}
-                                            width={variables.iconSizeNormal}
-                                            height={variables.iconSizeNormal}
-                                            fill={theme.icon}
-                                        />
-                                    )}
-                                </View>
-                            </PressableWithFeedback>
-                        </Tooltip>
-                    </View>
-                    <OfflineWithFeedback
-                        pendingAction={currentUserPersonalDetails?.pendingFields?.avatar ?? undefined}
-                        style={[styles.mb3, styles.w100]}
-                    >
-                        <AvatarWithImagePicker
-                            isUsingDefaultAvatar={UserUtils.isDefaultAvatar(currentUserDetails?.avatar ?? '')}
-                            source={UserUtils.getAvatar(avatarURL, accountID)}
-                            onImageSelected={PersonalDetails.updateAvatar}
-                            onImageRemoved={PersonalDetails.deleteAvatar}
-                            size={CONST.AVATAR_SIZE.XLARGE}
-                            avatarStyle={styles.avatarXLarge}
-                            pendingAction={currentUserPersonalDetails?.pendingFields?.avatar ?? undefined}
-                            errors={currentUserPersonalDetails?.errorFields?.avatar ?? null}
-                            errorRowStyles={styles.mt6}
-                            onErrorClose={PersonalDetails.clearAvatarErrors}
-                            onViewPhotoPress={() => Navigation.navigate(ROUTES.PROFILE_AVATAR.getRoute(String(accountID)))}
-                            previewSource={UserUtils.getFullSizeAvatar(avatarURL, accountID)}
-                            originalFileName={currentUserDetails.originalFileName}
-                            headerTitle={translate('profilePage.profileAvatar')}
-                            fallbackIcon={currentUserDetails?.fallbackIcon}
-                            editIconStyle={styles.smallEditIconAccount}
-                        />
-                    </OfflineWithFeedback>
-                    <Text
-                        style={[styles.textHeadline, styles.pre, styles.textAlignCenter]}
-                        numberOfLines={1}
-                    >
-                        {currentUserPersonalDetails.displayName ? currentUserPersonalDetails.displayName : formatPhoneNumber(session?.email ?? '')}
-                    </Text>
-                    {Boolean(currentUserPersonalDetails.displayName) && (
-                        <Text
-                            style={[styles.textLabelSupporting, styles.mt1, styles.w100, styles.textAlignCenter]}
-                            numberOfLines={1}
-                        >
-                            {formatPhoneNumber(session?.email ?? '')}
-                        </Text>
-                    )}
-                </>
+                                )}
+                            </View>
+                        </PressableWithFeedback>
+                    </Tooltip>
+                </View>
             )}
         </View>
     );
@@ -524,9 +465,6 @@ export default withCurrentUserPersonalDetails(
         loginList: {
             key: ONYXKEYS.LOGIN_LIST,
         },
-        session: {
-            key: ONYXKEYS.SESSION,
-        },
         policies: {
             key: ONYXKEYS.COLLECTION.POLICY,
         },
diff --git a/src/pages/settings/PaymentCard/ChangeCurrency/index.tsx b/src/pages/settings/PaymentCard/ChangeCurrency/index.tsx
new file mode 100644
index 000000000000..3d6f575a8aff
--- /dev/null
+++ b/src/pages/settings/PaymentCard/ChangeCurrency/index.tsx
@@ -0,0 +1,43 @@
+import React, {useCallback} from 'react';
+import {View} from 'react-native';
+import {useOnyx} from 'react-native-onyx';
+import type {ValueOf} from 'type-fest';
+import PaymentCardChangeCurrencyForm from '@components/AddPaymentCard/PaymentCardChangeCurrencyForm';
+import HeaderWithBackButton from '@components/HeaderWithBackButton';
+import ScreenWrapper from '@components/ScreenWrapper';
+import useLocalize from '@hooks/useLocalize';
+import useThemeStyles from '@hooks/useThemeStyles';
+import Navigation from '@navigation/Navigation';
+import * as PaymentMethods from '@userActions/PaymentMethods';
+import type CONST from '@src/CONST';
+import ONYXKEYS from '@src/ONYXKEYS';
+
+function ChangeCurrency() {
+    const styles = useThemeStyles();
+    const {translate} = useLocalize();
+    const [debitCardForm] = useOnyx(ONYXKEYS.FORMS.ADD_PAYMENT_CARD_FORM);
+
+    const changeCurrency = useCallback((currency?: ValueOf<typeof CONST.PAYMENT_CARD_CURRENCY>) => {
+        if (currency) {
+            PaymentMethods.setPaymentMethodCurrency(currency);
+        }
+
+        Navigation.goBack();
+    }, []);
+
+    return (
+        <ScreenWrapper testID={ChangeCurrency.displayName}>
+            <HeaderWithBackButton title={translate('billingCurrency.changePaymentCurrency')} />
+            <View style={styles.containerWithSpaceBetween}>
+                <PaymentCardChangeCurrencyForm
+                    changeBillingCurrency={changeCurrency}
+                    initialCurrency={debitCardForm?.currency}
+                />
+            </View>
+        </ScreenWrapper>
+    );
+}
+
+ChangeCurrency.displayName = 'ChangeCurrency';
+
+export default ChangeCurrency;
diff --git a/src/pages/settings/Preferences/LanguagePage.tsx b/src/pages/settings/Preferences/LanguagePage.tsx
index b577e006acfb..dbc1440a5e67 100644
--- a/src/pages/settings/Preferences/LanguagePage.tsx
+++ b/src/pages/settings/Preferences/LanguagePage.tsx
@@ -31,6 +31,7 @@ function LanguagePage() {
                 sections={[{data: localesToLanguages}]}
                 ListItem={RadioListItem}
                 onSelectRow={(language) => App.setLocaleAndNavigate(language.value)}
+                shouldSingleExecuteRowSelect
                 initiallyFocusedOptionKey={localesToLanguages.find((locale) => locale.isSelected)?.keyForList}
             />
         </ScreenWrapper>
diff --git a/src/pages/settings/Preferences/PreferencesPage.tsx b/src/pages/settings/Preferences/PreferencesPage.tsx
index 3d957af373ef..e51250f3538a 100755
--- a/src/pages/settings/Preferences/PreferencesPage.tsx
+++ b/src/pages/settings/Preferences/PreferencesPage.tsx
@@ -11,8 +11,8 @@ import Section from '@components/Section';
 import Switch from '@components/Switch';
 import Text from '@components/Text';
 import useLocalize from '@hooks/useLocalize';
+import useResponsiveLayout from '@hooks/useResponsiveLayout';
 import useThemeStyles from '@hooks/useThemeStyles';
-import useWindowDimensions from '@hooks/useWindowDimensions';
 import LocaleUtils from '@libs/LocaleUtils';
 import Navigation from '@libs/Navigation/Navigation';
 import * as User from '@userActions/User';
@@ -27,7 +27,7 @@ function PreferencesPage() {
 
     const styles = useThemeStyles();
     const {translate, preferredLocale} = useLocalize();
-    const {isSmallScreenWidth} = useWindowDimensions();
+    const {shouldUseNarrowLayout} = useResponsiveLayout();
 
     return (
         <ScreenWrapper
@@ -39,11 +39,11 @@ function PreferencesPage() {
             <HeaderWithBackButton
                 title={translate('common.preferences')}
                 icon={Illustrations.Gears}
-                shouldShowBackButton={isSmallScreenWidth}
+                shouldShowBackButton={shouldUseNarrowLayout}
                 onBackButtonPress={() => Navigation.goBack()}
             />
             <ScrollView contentContainerStyle={styles.pt3}>
-                <View style={[styles.flex1, isSmallScreenWidth ? styles.workspaceSectionMobile : styles.workspaceSection]}>
+                <View style={[styles.flex1, shouldUseNarrowLayout ? styles.workspaceSectionMobile : styles.workspaceSection]}>
                     <Section
                         title={translate('preferencesPage.appSection.title')}
                         subtitle={translate('preferencesPage.appSection.subtitle')}
diff --git a/src/pages/settings/Preferences/PriorityModePage.tsx b/src/pages/settings/Preferences/PriorityModePage.tsx
index 2a4cd196f177..57f565e7dca7 100644
--- a/src/pages/settings/Preferences/PriorityModePage.tsx
+++ b/src/pages/settings/Preferences/PriorityModePage.tsx
@@ -58,6 +58,7 @@ function PriorityModePage() {
                 sections={[{data: priorityModes}]}
                 ListItem={RadioListItem}
                 onSelectRow={updateMode}
+                shouldSingleExecuteRowSelect
                 initiallyFocusedOptionKey={priorityModes.find((mode) => mode.isSelected)?.keyForList}
             />
         </ScreenWrapper>
diff --git a/src/pages/settings/Preferences/ThemePage.tsx b/src/pages/settings/Preferences/ThemePage.tsx
index f879a7a259ea..bd14c076bfb3 100644
--- a/src/pages/settings/Preferences/ThemePage.tsx
+++ b/src/pages/settings/Preferences/ThemePage.tsx
@@ -49,6 +49,7 @@ function ThemePage({preferredTheme}: ThemePageProps) {
                 sections={[{data: localesToThemes}]}
                 ListItem={RadioListItem}
                 onSelectRow={(theme) => User.updateTheme(theme.value)}
+                shouldSingleExecuteRowSelect
                 initiallyFocusedOptionKey={localesToThemes.find((theme) => theme.isSelected)?.keyForList}
             />
         </ScreenWrapper>
diff --git a/src/pages/settings/Profile/Contacts/ContactMethodDetailsPage.tsx b/src/pages/settings/Profile/Contacts/ContactMethodDetailsPage.tsx
index 8aaeb7151563..21321f5e6740 100644
--- a/src/pages/settings/Profile/Contacts/ContactMethodDetailsPage.tsx
+++ b/src/pages/settings/Profile/Contacts/ContactMethodDetailsPage.tsx
@@ -1,8 +1,7 @@
 import type {StackScreenProps} from '@react-navigation/stack';
-import Str from 'expensify-common/lib/str';
+import {Str} from 'expensify-common';
 import React, {useCallback, useEffect, useMemo, useRef, useState} from 'react';
 import {InteractionManager, Keyboard, View} from 'react-native';
-import type {OnyxEntry} from 'react-native-onyx';
 import {useOnyx} from 'react-native-onyx';
 import FullPageNotFoundView from '@components/BlockingViews/FullPageNotFoundView';
 import ConfirmModal from '@components/ConfirmModal';
@@ -23,24 +22,16 @@ import {canUseTouchScreen} from '@libs/DeviceCapabilities';
 import * as ErrorUtils from '@libs/ErrorUtils';
 import Navigation from '@libs/Navigation/Navigation';
 import type {SettingsNavigatorParamList} from '@libs/Navigation/types';
-import * as Session from '@userActions/Session';
 import * as User from '@userActions/User';
 import CONST from '@src/CONST';
 import ONYXKEYS from '@src/ONYXKEYS';
 import ROUTES from '@src/ROUTES';
 import type SCREENS from '@src/SCREENS';
-import type {Policy} from '@src/types/onyx';
 import {isEmptyObject} from '@src/types/utils/EmptyObject';
 import isLoadingOnyxValue from '@src/types/utils/isLoadingOnyxValue';
 import ValidateCodeForm from './ValidateCodeForm';
 import type {ValidateCodeFormHandle} from './ValidateCodeForm/BaseValidateCodeForm';
 
-const policiesSelector = (policy: OnyxEntry<Policy>): Pick<Policy, 'id' | 'ownerAccountID' | 'owner'> => ({
-    id: policy?.id ?? '',
-    ownerAccountID: policy?.ownerAccountID,
-    owner: policy?.owner ?? '',
-});
-
 type ContactMethodDetailsPageProps = StackScreenProps<SettingsNavigatorParamList, typeof SCREENS.SETTINGS.PROFILE.CONTACT_METHOD_DETAILS>;
 
 function ContactMethodDetailsPage({route}: ContactMethodDetailsPageProps) {
@@ -49,9 +40,8 @@ function ContactMethodDetailsPage({route}: ContactMethodDetailsPageProps) {
     const [myDomainSecurityGroups, myDomainSecurityGroupsResult] = useOnyx(ONYXKEYS.MY_DOMAIN_SECURITY_GROUPS);
     const [securityGroups, securityGroupsResult] = useOnyx(ONYXKEYS.COLLECTION.SECURITY_GROUP);
     const [isLoadingReportData, isLoadingReportDataResult] = useOnyx(ONYXKEYS.IS_LOADING_REPORT_DATA, {initialValue: true});
-    const [policies, policiesResult] = useOnyx(ONYXKEYS.COLLECTION.POLICY, {selector: policiesSelector});
 
-    const isLoadingOnyxValues = isLoadingOnyxValue(loginListResult, sessionResult, myDomainSecurityGroupsResult, securityGroupsResult, isLoadingReportDataResult, policiesResult);
+    const isLoadingOnyxValues = isLoadingOnyxValue(loginListResult, sessionResult, myDomainSecurityGroupsResult, securityGroupsResult, isLoadingReportDataResult);
 
     const {formatPhoneNumber, translate} = useLocalize();
     const theme = useTheme();
@@ -59,6 +49,7 @@ function ContactMethodDetailsPage({route}: ContactMethodDetailsPageProps) {
 
     const [isDeleteModalOpen, setIsDeleteModalOpen] = useState(false);
     const validateCodeFormRef = useRef<ValidateCodeFormHandle>(null);
+    const backTo = route.params.backTo;
 
     /**
      * Gets the current contact method from the route params
@@ -88,8 +79,8 @@ function ContactMethodDetailsPage({route}: ContactMethodDetailsPageProps) {
      * Attempt to set this contact method as user's "Default contact method"
      */
     const setAsDefault = useCallback(() => {
-        User.setContactMethodAsDefault(contactMethod, policies);
-    }, [contactMethod, policies]);
+        User.setContactMethodAsDefault(contactMethod, backTo);
+    }, [contactMethod, backTo]);
 
     /**
      * Checks if the user is allowed to change their default contact method. This should only be allowed if:
@@ -138,15 +129,15 @@ function ContactMethodDetailsPage({route}: ContactMethodDetailsPageProps) {
      */
     const confirmDeleteAndHideModal = useCallback(() => {
         toggleDeleteModal(false);
-        User.deleteContactMethod(contactMethod, loginList ?? {});
-    }, [contactMethod, loginList, toggleDeleteModal]);
+        User.deleteContactMethod(contactMethod, loginList ?? {}, backTo);
+    }, [contactMethod, loginList, toggleDeleteModal, backTo]);
 
     useEffect(() => {
         if (isEmptyObject(loginData)) {
             return;
         }
         User.resetContactMethodValidateCodeSentState(contactMethod);
-        // eslint-disable-next-line react-hooks/exhaustive-deps
+        // eslint-disable-next-line react-compiler/react-compiler, react-hooks/exhaustive-deps
     }, []);
 
     const prevValidatedDate = usePrevious(loginData?.validatedDate);
@@ -156,17 +147,10 @@ function ContactMethodDetailsPage({route}: ContactMethodDetailsPageProps) {
             return;
         }
 
-        // If the selected contactMethod is the current session['login'] and the account is unvalidated,
-        // the current authToken is invalid after the successful magic code verification.
-        // So we need to sign out the user and redirect to the sign in page.
-        if (isDefaultContactMethod) {
-            Session.signOutAndRedirectToSignIn();
-            return;
-        }
         // Navigate to methods page on successful magic code verification
         // validatedDate property is responsible to decide the status of the magic code verification
-        Navigation.goBack(ROUTES.SETTINGS_CONTACT_METHODS.route);
-    }, [prevValidatedDate, loginData?.validatedDate, isDefaultContactMethod]);
+        Navigation.goBack(ROUTES.SETTINGS_CONTACT_METHODS.getRoute(backTo));
+    }, [prevValidatedDate, loginData?.validatedDate, isDefaultContactMethod, backTo]);
 
     if (isLoadingOnyxValues || (isLoadingReportData && isEmptyObject(loginList))) {
         return <FullscreenLoadingIndicator />;
@@ -178,15 +162,15 @@ function ContactMethodDetailsPage({route}: ContactMethodDetailsPageProps) {
                 <FullPageNotFoundView
                     shouldShow
                     linkKey="contacts.goBackContactMethods"
-                    onBackButtonPress={() => Navigation.goBack(ROUTES.SETTINGS_CONTACT_METHODS.route)}
-                    onLinkPress={() => Navigation.goBack(ROUTES.SETTINGS_CONTACT_METHODS.route)}
+                    onBackButtonPress={() => Navigation.goBack(ROUTES.SETTINGS_CONTACT_METHODS.getRoute(backTo))}
+                    onLinkPress={() => Navigation.goBack(ROUTES.SETTINGS_CONTACT_METHODS.getRoute(backTo))}
                 />
             </ScreenWrapper>
         );
     }
 
     // Replacing spaces with "hard spaces" to prevent breaking the number
-    const formattedContactMethod = Str.isSMSLogin(contactMethod) ? formatPhoneNumber(contactMethod).replace(/ /g, '\u00A0') : contactMethod;
+    const formattedContactMethod = Str.isSMSLogin(contactMethod) ? formatPhoneNumber(contactMethod) : contactMethod;
     const hasMagicCodeBeenSent = !!loginData.validateCodeSent;
     const isFailedAddContactMethod = !!loginData.errorFields?.addedLogin;
     const isFailedRemovedContactMethod = !!loginData.errorFields?.deletedLogin;
@@ -198,7 +182,7 @@ function ContactMethodDetailsPage({route}: ContactMethodDetailsPageProps) {
         >
             <HeaderWithBackButton
                 title={formattedContactMethod}
-                onBackButtonPress={() => Navigation.goBack(ROUTES.SETTINGS_CONTACT_METHODS.route)}
+                onBackButtonPress={() => Navigation.goBack(ROUTES.SETTINGS_CONTACT_METHODS.getRoute(backTo))}
             />
             <ScrollView keyboardShouldPersistTaps="handled">
                 <ConfirmModal
@@ -231,7 +215,7 @@ function ContactMethodDetailsPage({route}: ContactMethodDetailsPageProps) {
                             type="success"
                             style={[themeStyles.mb3]}
                             // eslint-disable-next-line @typescript-eslint/naming-convention
-                            messages={{0: ['contacts.enterMagicCode', {contactMethod: formattedContactMethod}]}}
+                            messages={{0: translate('contacts.enterMagicCode', {contactMethod: formattedContactMethod})}}
                         />
 
                         <ValidateCodeForm
diff --git a/src/pages/settings/Profile/Contacts/ContactMethodsPage.tsx b/src/pages/settings/Profile/Contacts/ContactMethodsPage.tsx
index 8970df59f856..44c7a9b567cf 100644
--- a/src/pages/settings/Profile/Contacts/ContactMethodsPage.tsx
+++ b/src/pages/settings/Profile/Contacts/ContactMethodsPage.tsx
@@ -1,5 +1,5 @@
 import type {StackScreenProps} from '@react-navigation/stack';
-import Str from 'expensify-common/lib/str';
+import {Str} from 'expensify-common';
 import React, {useCallback} from 'react';
 import {View} from 'react-native';
 import type {OnyxEntry} from 'react-native-onyx';
@@ -80,7 +80,7 @@ function ContactMethodsPage({loginList, session, route}: ContactMethodsPageProps
                 <MenuItem
                     title={menuItemTitle}
                     description={description}
-                    onPress={() => Navigation.navigate(ROUTES.SETTINGS_CONTACT_METHOD_DETAILS.getRoute(partnerUserID))}
+                    onPress={() => Navigation.navigate(ROUTES.SETTINGS_CONTACT_METHOD_DETAILS.getRoute(partnerUserID, navigateBackTo))}
                     brickRoadIndicator={indicator}
                     shouldShowBasicTitle
                     shouldShowRightIcon
diff --git a/src/pages/settings/Profile/Contacts/NewContactMethodPage.tsx b/src/pages/settings/Profile/Contacts/NewContactMethodPage.tsx
index 20e12f71664e..3380766d0ecf 100644
--- a/src/pages/settings/Profile/Contacts/NewContactMethodPage.tsx
+++ b/src/pages/settings/Profile/Contacts/NewContactMethodPage.tsx
@@ -1,5 +1,5 @@
 import type {StackScreenProps} from '@react-navigation/stack';
-import Str from 'expensify-common/lib/str';
+import {Str} from 'expensify-common';
 import React, {useCallback, useRef} from 'react';
 import {View} from 'react-native';
 import type {OnyxEntry} from 'react-native-onyx';
@@ -34,14 +34,6 @@ type NewContactMethodPageOnyxProps = {
 
 type NewContactMethodPageProps = NewContactMethodPageOnyxProps & StackScreenProps<SettingsNavigatorParamList, typeof SCREENS.SETTINGS.PROFILE.NEW_CONTACT_METHOD>;
 
-const addNewContactMethod = (values: FormOnyxValues<typeof ONYXKEYS.FORMS.NEW_CONTACT_METHOD_FORM>) => {
-    const phoneLogin = LoginUtils.getPhoneLogin(values.phoneOrEmail);
-    const validateIfnumber = LoginUtils.validateNumber(phoneLogin);
-    const submitDetail = (validateIfnumber || values.phoneOrEmail).trim().toLowerCase();
-
-    User.addNewContactMethodAndNavigate(submitDetail);
-};
-
 function NewContactMethodPage({loginList, route}: NewContactMethodPageProps) {
     const styles = useThemeStyles();
     const {translate} = useLocalize();
@@ -49,6 +41,17 @@ function NewContactMethodPage({loginList, route}: NewContactMethodPageProps) {
 
     const navigateBackTo = route?.params?.backTo ?? ROUTES.SETTINGS_PROFILE;
 
+    const addNewContactMethod = useCallback(
+        (values: FormOnyxValues<typeof ONYXKEYS.FORMS.NEW_CONTACT_METHOD_FORM>) => {
+            const phoneLogin = LoginUtils.getPhoneLogin(values.phoneOrEmail);
+            const validateIfnumber = LoginUtils.validateNumber(phoneLogin);
+            const submitDetail = (validateIfnumber || values.phoneOrEmail).trim().toLowerCase();
+
+            User.addNewContactMethodAndNavigate(submitDetail, route.params?.backTo);
+        },
+        [route.params?.backTo],
+    );
+
     const validate = React.useCallback(
         (values: FormOnyxValues<typeof ONYXKEYS.FORMS.NEW_CONTACT_METHOD_FORM>): Errors => {
             const phoneLogin = LoginUtils.getPhoneLogin(values.phoneOrEmail);
@@ -57,15 +60,15 @@ function NewContactMethodPage({loginList, route}: NewContactMethodPageProps) {
             const errors = {};
 
             if (!values.phoneOrEmail) {
-                ErrorUtils.addErrorMessage(errors, 'phoneOrEmail', 'contacts.genericFailureMessages.contactMethodRequired');
+                ErrorUtils.addErrorMessage(errors, 'phoneOrEmail', translate('contacts.genericFailureMessages.contactMethodRequired'));
             }
 
             if (!!values.phoneOrEmail && !(validateIfnumber || Str.isValidEmail(values.phoneOrEmail))) {
-                ErrorUtils.addErrorMessage(errors, 'phoneOrEmail', 'contacts.genericFailureMessages.invalidContactMethod');
+                ErrorUtils.addErrorMessage(errors, 'phoneOrEmail', translate('contacts.genericFailureMessages.invalidContactMethod'));
             }
 
             if (!!values.phoneOrEmail && loginList?.[validateIfnumber || values.phoneOrEmail.toLowerCase()]) {
-                ErrorUtils.addErrorMessage(errors, 'phoneOrEmail', 'contacts.genericFailureMessages.enteredMethodIsAlreadySubmited');
+                ErrorUtils.addErrorMessage(errors, 'phoneOrEmail', translate('contacts.genericFailureMessages.enteredMethodIsAlreadySubmited'));
             }
 
             return errors;
@@ -73,8 +76,8 @@ function NewContactMethodPage({loginList, route}: NewContactMethodPageProps) {
         // We don't need `loginList` because when submitting this form
         // the loginList gets updated, causing this function to run again.
         // https://github.com/Expensify/App/issues/20610
-        // eslint-disable-next-line react-hooks/exhaustive-deps
-        [],
+        // eslint-disable-next-line react-compiler/react-compiler, react-hooks/exhaustive-deps
+        [translate],
     );
 
     const onBackButtonPress = useCallback(() => {
diff --git a/src/pages/settings/Profile/Contacts/ValidateCodeForm/BaseValidateCodeForm.tsx b/src/pages/settings/Profile/Contacts/ValidateCodeForm/BaseValidateCodeForm.tsx
index fc4ec0220b41..e0b7a23d5df3 100644
--- a/src/pages/settings/Profile/Contacts/ValidateCodeForm/BaseValidateCodeForm.tsx
+++ b/src/pages/settings/Profile/Contacts/ValidateCodeForm/BaseValidateCodeForm.tsx
@@ -118,7 +118,7 @@ function BaseValidateCodeForm({account = {}, contactMethod, hasMagicCodeBeenSent
         }
         User.clearContactMethodErrors(contactMethod, 'validateLogin');
         // contactMethod is not added as a dependency since it does not change between renders
-        // eslint-disable-next-line react-hooks/exhaustive-deps
+        // eslint-disable-next-line react-compiler/react-compiler, react-hooks/exhaustive-deps
     }, []);
 
     useEffect(() => {
@@ -166,8 +166,8 @@ function BaseValidateCodeForm({account = {}, contactMethod, hasMagicCodeBeenSent
         }
 
         setFormError({});
-        User.validateSecondaryLogin(contactMethod, validateCode);
-    }, [validateCode, contactMethod]);
+        User.validateSecondaryLogin(loginList, contactMethod, validateCode);
+    }, [loginList, validateCode, contactMethod]);
 
     return (
         <>
@@ -206,7 +206,7 @@ function BaseValidateCodeForm({account = {}, contactMethod, hasMagicCodeBeenSent
                             type="success"
                             style={[styles.mt6, styles.flex0]}
                             // eslint-disable-next-line @typescript-eslint/naming-convention
-                            messages={{0: 'resendValidationForm.linkHasBeenResent'}}
+                            messages={{0: translate('resendValidationForm.linkHasBeenResent')}}
                         />
                     )}
                 </View>
diff --git a/src/pages/settings/Profile/CustomStatus/StatusClearAfterPage.tsx b/src/pages/settings/Profile/CustomStatus/StatusClearAfterPage.tsx
index 40fbf097cdd9..2d3538b8fbc5 100644
--- a/src/pages/settings/Profile/CustomStatus/StatusClearAfterPage.tsx
+++ b/src/pages/settings/Profile/CustomStatus/StatusClearAfterPage.tsx
@@ -72,7 +72,7 @@ const useValidateCustomDate = (data: string) => {
             return;
         }
         validate();
-        // eslint-disable-next-line react-hooks/exhaustive-deps
+        // eslint-disable-next-line react-compiler/react-compiler, react-hooks/exhaustive-deps
     }, [data]);
 
     const validateCustomDate = () => validate();
@@ -149,7 +149,7 @@ function StatusClearAfterPage({customStatus}: StatusClearAfterPageProps) {
             clearAfter: draftClearAfter || clearAfter,
         });
 
-        // eslint-disable-next-line react-hooks/exhaustive-deps
+        // eslint-disable-next-line react-compiler/react-compiler, react-hooks/exhaustive-deps
     }, []);
 
     const customStatusDate = DateUtils.extractDate(draftClearAfter);
diff --git a/src/pages/settings/Profile/CustomStatus/StatusPage.tsx b/src/pages/settings/Profile/CustomStatus/StatusPage.tsx
index 5dc1c1832d39..26c2a9092131 100644
--- a/src/pages/settings/Profile/CustomStatus/StatusPage.tsx
+++ b/src/pages/settings/Profile/CustomStatus/StatusPage.tsx
@@ -74,6 +74,26 @@ function StatusPage({draftStatus, currentUserPersonalDetails}: StatusPageProps)
         return DateUtils.isTimeAtLeastOneMinuteInFuture({dateTimeString: clearAfterTime});
     }, [draftClearAfter, currentUserClearAfter]);
 
+    const navigateBackToPreviousScreenTask = useRef<{
+        then: (
+            onfulfilled?: () => typeof InteractionManager.runAfterInteractions,
+            onrejected?: () => typeof InteractionManager.runAfterInteractions,
+        ) => Promise<typeof InteractionManager.runAfterInteractions>;
+        done: (...args: Array<typeof InteractionManager.runAfterInteractions>) => typeof InteractionManager.runAfterInteractions;
+        cancel: () => void;
+    } | null>(null);
+
+    useEffect(
+        () => () => {
+            if (!navigateBackToPreviousScreenTask.current) {
+                return;
+            }
+
+            navigateBackToPreviousScreenTask.current.cancel();
+        },
+        [],
+    );
+
     const navigateBackToPreviousScreen = useCallback(() => Navigation.goBack(), []);
     const updateStatus = useCallback(
         ({emojiCode, statusText}: FormOnyxValues<typeof ONYXKEYS.FORMS.SETTINGS_STATUS_SET_FORM>) => {
@@ -90,7 +110,7 @@ function StatusPage({draftStatus, currentUserPersonalDetails}: StatusPageProps)
                 clearAfter: clearAfterTime !== CONST.CUSTOM_STATUS_TYPES.NEVER ? clearAfterTime : '',
             });
             User.clearDraftCustomStatus();
-            InteractionManager.runAfterInteractions(() => {
+            navigateBackToPreviousScreenTask.current = InteractionManager.runAfterInteractions(() => {
                 navigateBackToPreviousScreen();
             });
         },
@@ -106,7 +126,7 @@ function StatusPage({draftStatus, currentUserPersonalDetails}: StatusPageProps)
         });
         formRef.current?.resetForm({[INPUT_IDS.EMOJI_CODE]: ''});
 
-        InteractionManager.runAfterInteractions(() => {
+        navigateBackToPreviousScreenTask.current = InteractionManager.runAfterInteractions(() => {
             navigateBackToPreviousScreen();
         });
     };
@@ -121,7 +141,7 @@ function StatusPage({draftStatus, currentUserPersonalDetails}: StatusPageProps)
         }
 
         return () => User.clearDraftCustomStatus();
-        // eslint-disable-next-line react-hooks/exhaustive-deps
+        // eslint-disable-next-line react-compiler/react-compiler, react-hooks/exhaustive-deps
     }, []);
 
     const validateForm = useCallback((): FormInputErrors<typeof ONYXKEYS.FORMS.SETTINGS_STATUS_SET_FORM> => {
@@ -131,7 +151,7 @@ function StatusPage({draftStatus, currentUserPersonalDetails}: StatusPageProps)
         return {};
     }, [brickRoadIndicator]);
 
-    const {inputCallbackRef} = useAutoFocusInput();
+    const {inputCallbackRef, inputRef} = useAutoFocusInput();
 
     return (
         <ScreenWrapper
@@ -166,7 +186,9 @@ function StatusPage({draftStatus, currentUserPersonalDetails}: StatusPageProps)
                             role={CONST.ROLE.PRESENTATION}
                             defaultValue={defaultEmoji}
                             style={styles.mb3}
-                            onModalHide={() => {}}
+                            onModalHide={() => {
+                                inputRef.current?.focus();
+                            }}
                             // eslint-disable-next-line @typescript-eslint/no-unused-vars
                             onInputChange={(emoji: string): void => {}}
                         />
diff --git a/src/pages/settings/Profile/DisplayNamePage.tsx b/src/pages/settings/Profile/DisplayNamePage.tsx
index 3ab443b23561..90f7ca3abbd6 100644
--- a/src/pages/settings/Profile/DisplayNamePage.tsx
+++ b/src/pages/settings/Profile/DisplayNamePage.tsx
@@ -47,22 +47,24 @@ function DisplayNamePage({isLoadingApp = true, currentUserPersonalDetails}: Disp
 
         // First we validate the first name field
         if (!ValidationUtils.isValidDisplayName(values.firstName)) {
-            ErrorUtils.addErrorMessage(errors, 'firstName', 'personalDetails.error.hasInvalidCharacter');
+            ErrorUtils.addErrorMessage(errors, 'firstName', translate('personalDetails.error.hasInvalidCharacter'));
         } else if (values.firstName.length > CONST.TITLE_CHARACTER_LIMIT) {
-            ErrorUtils.addErrorMessage(errors, 'firstName', ['common.error.characterLimitExceedCounter', {length: values.firstName.length, limit: CONST.TITLE_CHARACTER_LIMIT}]);
+            ErrorUtils.addErrorMessage(errors, 'firstName', translate('common.error.characterLimitExceedCounter', {length: values.firstName.length, limit: CONST.TITLE_CHARACTER_LIMIT}));
+        } else if (values.firstName.length === 0) {
+            ErrorUtils.addErrorMessage(errors, 'firstName', translate('personalDetails.error.requiredFirstName'));
         }
         if (ValidationUtils.doesContainReservedWord(values.firstName, CONST.DISPLAY_NAME.RESERVED_NAMES)) {
-            ErrorUtils.addErrorMessage(errors, 'firstName', 'personalDetails.error.containsReservedWord');
+            ErrorUtils.addErrorMessage(errors, 'firstName', translate('personalDetails.error.containsReservedWord'));
         }
 
         // Then we validate the last name field
         if (!ValidationUtils.isValidDisplayName(values.lastName)) {
-            ErrorUtils.addErrorMessage(errors, 'lastName', 'personalDetails.error.hasInvalidCharacter');
+            ErrorUtils.addErrorMessage(errors, 'lastName', translate('personalDetails.error.hasInvalidCharacter'));
         } else if (values.lastName.length > CONST.TITLE_CHARACTER_LIMIT) {
-            ErrorUtils.addErrorMessage(errors, 'lastName', ['common.error.characterLimitExceedCounter', {length: values.lastName.length, limit: CONST.TITLE_CHARACTER_LIMIT}]);
+            ErrorUtils.addErrorMessage(errors, 'lastName', translate('common.error.characterLimitExceedCounter', {length: values.lastName.length, limit: CONST.TITLE_CHARACTER_LIMIT}));
         }
         if (ValidationUtils.doesContainReservedWord(values.lastName, CONST.DISPLAY_NAME.RESERVED_NAMES)) {
-            ErrorUtils.addErrorMessage(errors, 'lastName', 'personalDetails.error.containsReservedWord');
+            ErrorUtils.addErrorMessage(errors, 'lastName', translate('personalDetails.error.containsReservedWord'));
         }
         return errors;
     };
diff --git a/src/pages/settings/Profile/PersonalDetails/AddressPage.tsx b/src/pages/settings/Profile/PersonalDetails/AddressPage.tsx
deleted file mode 100644
index fcb018348b72..000000000000
--- a/src/pages/settings/Profile/PersonalDetails/AddressPage.tsx
+++ /dev/null
@@ -1,153 +0,0 @@
-import type {StackScreenProps} from '@react-navigation/stack';
-import React, {useCallback, useEffect, useMemo, useState} from 'react';
-import type {OnyxEntry} from 'react-native-onyx';
-import {withOnyx} from 'react-native-onyx';
-import AddressForm from '@components/AddressForm';
-import FullscreenLoadingIndicator from '@components/FullscreenLoadingIndicator';
-import HeaderWithBackButton from '@components/HeaderWithBackButton';
-import ScreenWrapper from '@components/ScreenWrapper';
-import useGeographicalStateFromRoute from '@hooks/useGeographicalStateFromRoute';
-import useLocalize from '@hooks/useLocalize';
-import useThemeStyles from '@hooks/useThemeStyles';
-import Navigation from '@libs/Navigation/Navigation';
-import type {SettingsNavigatorParamList} from '@libs/Navigation/types';
-import * as PersonalDetails from '@userActions/PersonalDetails';
-import type {FormOnyxValues} from '@src/components/Form/types';
-import CONST from '@src/CONST';
-import type {Country} from '@src/CONST';
-import ONYXKEYS from '@src/ONYXKEYS';
-import type SCREENS from '@src/SCREENS';
-import type {PrivatePersonalDetails} from '@src/types/onyx';
-import type {Address} from '@src/types/onyx/PrivatePersonalDetails';
-
-type AddressPageOnyxProps = {
-    /** User's private personal details */
-    privatePersonalDetails: OnyxEntry<PrivatePersonalDetails>;
-    /** Whether app is loading */
-    isLoadingApp: OnyxEntry<boolean>;
-};
-
-type AddressPageProps = StackScreenProps<SettingsNavigatorParamList, typeof SCREENS.SETTINGS.PROFILE.ADDRESS> & AddressPageOnyxProps;
-
-/**
- * Submit form to update user's first and last legal name
- * @param values - form input values
- */
-function updateAddress(values: FormOnyxValues<typeof ONYXKEYS.FORMS.HOME_ADDRESS_FORM>) {
-    PersonalDetails.updateAddress(
-        values.addressLine1?.trim() ?? '',
-        values.addressLine2?.trim() ?? '',
-        values.city.trim(),
-        values.state.trim(),
-        values?.zipPostCode?.trim().toUpperCase() ?? '',
-        values.country,
-    );
-}
-
-function AddressPage({privatePersonalDetails, route, isLoadingApp = true}: AddressPageProps) {
-    const styles = useThemeStyles();
-    const {translate} = useLocalize();
-    const address = useMemo(() => privatePersonalDetails?.address, [privatePersonalDetails]);
-    const countryFromUrlTemp = route?.params?.country;
-
-    // Check if country is valid
-    const countryFromUrl = CONST.ALL_COUNTRIES[countryFromUrlTemp as keyof typeof CONST.ALL_COUNTRIES] ? countryFromUrlTemp : '';
-    const stateFromUrl = useGeographicalStateFromRoute();
-    const [currentCountry, setCurrentCountry] = useState(address?.country);
-    const [street1, street2] = (address?.street ?? '').split('\n');
-    const [state, setState] = useState(address?.state);
-    const [city, setCity] = useState(address?.city);
-    const [zipcode, setZipcode] = useState(address?.zip);
-
-    useEffect(() => {
-        if (!address) {
-            return;
-        }
-        setState(address.state);
-        setCurrentCountry(address.country);
-        setCity(address.city);
-        setZipcode(address.zip);
-    }, [address]);
-
-    const handleAddressChange = useCallback((value: unknown, key: unknown) => {
-        const countryValue = value as Country | '';
-        const addressKey = key as keyof Address;
-
-        if (addressKey !== 'country' && addressKey !== 'state' && addressKey !== 'city' && addressKey !== 'zipPostCode') {
-            return;
-        }
-        if (addressKey === 'country') {
-            setCurrentCountry(countryValue);
-            setState('');
-            setCity('');
-            setZipcode('');
-            return;
-        }
-        if (addressKey === 'state') {
-            setState(countryValue);
-            setCity('');
-            setZipcode('');
-            return;
-        }
-        if (addressKey === 'city') {
-            setCity(countryValue);
-            setZipcode('');
-            return;
-        }
-        setZipcode(countryValue);
-    }, []);
-
-    useEffect(() => {
-        if (!countryFromUrl) {
-            return;
-        }
-        handleAddressChange(countryFromUrl, 'country');
-    }, [countryFromUrl, handleAddressChange]);
-
-    useEffect(() => {
-        if (!stateFromUrl) {
-            return;
-        }
-        handleAddressChange(stateFromUrl, 'state');
-    }, [handleAddressChange, stateFromUrl]);
-
-    return (
-        <ScreenWrapper
-            includeSafeAreaPaddingBottom={false}
-            testID={AddressPage.displayName}
-        >
-            <HeaderWithBackButton
-                title={translate('privatePersonalDetails.address')}
-                shouldShowBackButton
-                onBackButtonPress={() => Navigation.goBack()}
-            />
-            {isLoadingApp ? (
-                <FullscreenLoadingIndicator style={[styles.flex1, styles.pRelative]} />
-            ) : (
-                <AddressForm
-                    formID={ONYXKEYS.FORMS.HOME_ADDRESS_FORM}
-                    onSubmit={updateAddress}
-                    submitButtonText={translate('common.save')}
-                    city={city}
-                    country={currentCountry}
-                    onAddressChanged={handleAddressChange}
-                    state={state}
-                    street1={street1}
-                    street2={street2}
-                    zip={zipcode}
-                />
-            )}
-        </ScreenWrapper>
-    );
-}
-
-AddressPage.displayName = 'AddressPage';
-
-export default withOnyx<AddressPageProps, AddressPageOnyxProps>({
-    privatePersonalDetails: {
-        key: ONYXKEYS.PRIVATE_PERSONAL_DETAILS,
-    },
-    isLoadingApp: {
-        key: ONYXKEYS.IS_LOADING_APP,
-    },
-})(AddressPage);
diff --git a/src/pages/settings/Profile/PersonalDetails/CountrySelectionPage.tsx b/src/pages/settings/Profile/PersonalDetails/CountrySelectionPage.tsx
index c0d980083ddf..080d53dd8573 100644
--- a/src/pages/settings/Profile/PersonalDetails/CountrySelectionPage.tsx
+++ b/src/pages/settings/Profile/PersonalDetails/CountrySelectionPage.tsx
@@ -80,6 +80,7 @@ function CountrySelectionPage({route, navigation}: CountrySelectionPageProps) {
                 sections={[{data: searchResults}]}
                 ListItem={RadioListItem}
                 onSelectRow={selectCountry}
+                shouldSingleExecuteRowSelect
                 onChangeText={setSearchValue}
                 initiallyFocusedOptionKey={currentCountry}
                 shouldUseDynamicMaxToRenderPerBatch
diff --git a/src/pages/settings/Profile/PersonalDetails/LegalNamePage.tsx b/src/pages/settings/Profile/PersonalDetails/LegalNamePage.tsx
index 085c70b47937..99e9c910cbdf 100644
--- a/src/pages/settings/Profile/PersonalDetails/LegalNamePage.tsx
+++ b/src/pages/settings/Profile/PersonalDetails/LegalNamePage.tsx
@@ -40,40 +40,48 @@ function LegalNamePage({privatePersonalDetails, isLoadingApp = true}: LegalNameP
     const legalFirstName = privatePersonalDetails?.legalFirstName ?? '';
     const legalLastName = privatePersonalDetails?.legalLastName ?? '';
 
-    const validate = useCallback((values: FormOnyxValues<typeof ONYXKEYS.FORMS.LEGAL_NAME_FORM>) => {
-        const errors: Errors = {};
+    const validate = useCallback(
+        (values: FormOnyxValues<typeof ONYXKEYS.FORMS.LEGAL_NAME_FORM>) => {
+            const errors: Errors = {};
 
-        if (typeof values.legalFirstName === 'string') {
-            if (!ValidationUtils.isValidLegalName(values.legalFirstName)) {
-                ErrorUtils.addErrorMessage(errors, 'legalFirstName', 'privatePersonalDetails.error.hasInvalidCharacter');
-            } else if (!values.legalFirstName) {
-                errors.legalFirstName = 'common.error.fieldRequired';
-            } else if (values.legalFirstName.length > CONST.LEGAL_NAME.MAX_LENGTH) {
-                ErrorUtils.addErrorMessage(errors, 'legalFirstName', [
-                    'common.error.characterLimitExceedCounter',
-                    {length: values.legalFirstName.length, limit: CONST.LEGAL_NAME.MAX_LENGTH},
-                ]);
+            if (typeof values.legalFirstName === 'string') {
+                if (!ValidationUtils.isValidLegalName(values.legalFirstName)) {
+                    ErrorUtils.addErrorMessage(errors, 'legalFirstName', translate('privatePersonalDetails.error.hasInvalidCharacter'));
+                } else if (!values.legalFirstName) {
+                    errors.legalFirstName = translate('common.error.fieldRequired');
+                } else if (values.legalFirstName.length > CONST.LEGAL_NAME.MAX_LENGTH) {
+                    ErrorUtils.addErrorMessage(
+                        errors,
+                        'legalFirstName',
+                        translate('common.error.characterLimitExceedCounter', {length: values.legalFirstName.length, limit: CONST.LEGAL_NAME.MAX_LENGTH}),
+                    );
+                }
+                if (ValidationUtils.doesContainReservedWord(values.legalFirstName, CONST.DISPLAY_NAME.RESERVED_NAMES)) {
+                    ErrorUtils.addErrorMessage(errors, 'legalFirstName', translate('personalDetails.error.containsReservedWord'));
+                }
             }
-            if (ValidationUtils.doesContainReservedWord(values.legalFirstName, CONST.DISPLAY_NAME.RESERVED_NAMES)) {
-                ErrorUtils.addErrorMessage(errors, 'legalFirstName', 'personalDetails.error.containsReservedWord');
-            }
-        }
 
-        if (typeof values.legalLastName === 'string') {
-            if (!ValidationUtils.isValidLegalName(values.legalLastName)) {
-                ErrorUtils.addErrorMessage(errors, 'legalLastName', 'privatePersonalDetails.error.hasInvalidCharacter');
-            } else if (!values.legalLastName) {
-                errors.legalLastName = 'common.error.fieldRequired';
-            } else if (values.legalLastName.length > CONST.LEGAL_NAME.MAX_LENGTH) {
-                ErrorUtils.addErrorMessage(errors, 'legalLastName', ['common.error.characterLimitExceedCounter', {length: values.legalLastName.length, limit: CONST.LEGAL_NAME.MAX_LENGTH}]);
-            }
-            if (ValidationUtils.doesContainReservedWord(values.legalLastName, CONST.DISPLAY_NAME.RESERVED_NAMES)) {
-                ErrorUtils.addErrorMessage(errors, 'legalLastName', 'personalDetails.error.containsReservedWord');
+            if (typeof values.legalLastName === 'string') {
+                if (!ValidationUtils.isValidLegalName(values.legalLastName)) {
+                    ErrorUtils.addErrorMessage(errors, 'legalLastName', translate('privatePersonalDetails.error.hasInvalidCharacter'));
+                } else if (!values.legalLastName) {
+                    errors.legalLastName = translate('common.error.fieldRequired');
+                } else if (values.legalLastName.length > CONST.LEGAL_NAME.MAX_LENGTH) {
+                    ErrorUtils.addErrorMessage(
+                        errors,
+                        'legalLastName',
+                        translate('common.error.characterLimitExceedCounter', {length: values.legalLastName.length, limit: CONST.LEGAL_NAME.MAX_LENGTH}),
+                    );
+                }
+                if (ValidationUtils.doesContainReservedWord(values.legalLastName, CONST.DISPLAY_NAME.RESERVED_NAMES)) {
+                    ErrorUtils.addErrorMessage(errors, 'legalLastName', translate('personalDetails.error.containsReservedWord'));
+                }
             }
-        }
 
-        return errors;
-    }, []);
+            return errors;
+        },
+        [translate],
+    );
 
     return (
         <ScreenWrapper
diff --git a/src/pages/settings/Profile/PersonalDetails/PersonalAddressPage.tsx b/src/pages/settings/Profile/PersonalDetails/PersonalAddressPage.tsx
new file mode 100644
index 000000000000..3e5287c82a42
--- /dev/null
+++ b/src/pages/settings/Profile/PersonalDetails/PersonalAddressPage.tsx
@@ -0,0 +1,62 @@
+import type {StackScreenProps} from '@react-navigation/stack';
+import React, {useMemo} from 'react';
+import type {OnyxEntry} from 'react-native-onyx';
+import {withOnyx} from 'react-native-onyx';
+import useLocalize from '@hooks/useLocalize';
+import type {SettingsNavigatorParamList} from '@libs/Navigation/types';
+import * as PersonalDetailsUtils from '@libs/PersonalDetailsUtils';
+import AddressPage from '@pages/AddressPage';
+import * as PersonalDetails from '@userActions/PersonalDetails';
+import type {FormOnyxValues} from '@src/components/Form/types';
+import ONYXKEYS from '@src/ONYXKEYS';
+import type SCREENS from '@src/SCREENS';
+import type {PrivatePersonalDetails} from '@src/types/onyx';
+
+type PersonalAddressPageOnyxProps = {
+    /** User's private personal details */
+    privatePersonalDetails: OnyxEntry<PrivatePersonalDetails>;
+    /** Whether app is loading */
+    isLoadingApp: OnyxEntry<boolean>;
+};
+
+type PersonalAddressPageProps = StackScreenProps<SettingsNavigatorParamList, typeof SCREENS.SETTINGS.PROFILE.ADDRESS> & PersonalAddressPageOnyxProps;
+
+/**
+ * Submit form to update user's first and last legal name
+ * @param values - form input values
+ */
+function updateAddress(values: FormOnyxValues<typeof ONYXKEYS.FORMS.HOME_ADDRESS_FORM>) {
+    PersonalDetails.updateAddress(
+        values.addressLine1?.trim() ?? '',
+        values.addressLine2?.trim() ?? '',
+        values.city.trim(),
+        values.state.trim(),
+        values?.zipPostCode?.trim().toUpperCase() ?? '',
+        values.country,
+    );
+}
+
+function PersonalAddressPage({privatePersonalDetails, isLoadingApp = true}: PersonalAddressPageProps) {
+    const {translate} = useLocalize();
+    const address = useMemo(() => PersonalDetailsUtils.getCurrentAddress(privatePersonalDetails), [privatePersonalDetails]);
+
+    return (
+        <AddressPage
+            address={address}
+            isLoadingApp={isLoadingApp}
+            updateAddress={updateAddress}
+            title={translate('privatePersonalDetails.address')}
+        />
+    );
+}
+
+PersonalAddressPage.displayName = 'PersonalAddressPage';
+
+export default withOnyx<PersonalAddressPageProps, PersonalAddressPageOnyxProps>({
+    privatePersonalDetails: {
+        key: ONYXKEYS.PRIVATE_PERSONAL_DETAILS,
+    },
+    isLoadingApp: {
+        key: ONYXKEYS.IS_LOADING_APP,
+    },
+})(PersonalAddressPage);
diff --git a/src/pages/settings/Profile/PersonalDetails/StateSelectionPage.tsx b/src/pages/settings/Profile/PersonalDetails/StateSelectionPage.tsx
index 32f72b015fa4..c04e631bd13f 100644
--- a/src/pages/settings/Profile/PersonalDetails/StateSelectionPage.tsx
+++ b/src/pages/settings/Profile/PersonalDetails/StateSelectionPage.tsx
@@ -1,5 +1,5 @@
 import {useNavigation, useRoute} from '@react-navigation/native';
-import {CONST as COMMON_CONST} from 'expensify-common/lib/CONST';
+import {CONST as COMMON_CONST} from 'expensify-common';
 import _ from 'lodash';
 import React, {useCallback, useMemo, useState} from 'react';
 import {View} from 'react-native';
@@ -65,11 +65,11 @@ function StateSelectionPage() {
                     Navigation.goBack();
                 } else {
                     // "backTo" provided: navigate back to "backTo" with state parameter.
-                    Navigation.goBack(appendParam(backTo, 'state', option.value) as Route);
+                    Navigation.goBack(appendParam(backTo, 'state', option.value));
                 }
             } else if (!_.isEmpty(backTo)) {
                 // Most common case: Navigation stack has multiple routes and "backTo" is defined: navigate to "backTo" with state parameter.
-                Navigation.navigate(appendParam(backTo, 'state', option.value) as Route);
+                Navigation.navigate(appendParam(backTo, 'state', option.value));
             } else {
                 // This is a fallback block and should never execute if StateSelector is correctly appending the "backTo" route.
                 // Navigation stack has multiple routes but no "backTo" defined: default back navigation.
@@ -91,13 +91,12 @@ function StateSelectionPage() {
                 shouldShowBackButton
                 onBackButtonPress={() => {
                     const backTo = params?.backTo ?? '';
-                    let backToRoute = '';
+                    let backToRoute: Route | undefined;
 
                     if (backTo) {
                         backToRoute = appendParam(backTo, 'state', currentState ?? '');
                     }
 
-                    // @ts-expect-error Navigation.goBack does take a param
                     Navigation.goBack(backToRoute);
                 }}
             />
@@ -106,6 +105,7 @@ function StateSelectionPage() {
 
             <SelectionList
                 onSelectRow={selectCountryState}
+                shouldSingleExecuteRowSelect
                 headerMessage={headerMessage}
                 // Label can be an empty string
                 // eslint-disable-next-line @typescript-eslint/prefer-nullish-coalescing
diff --git a/src/pages/settings/Profile/ProfileAvatar.tsx b/src/pages/settings/Profile/ProfileAvatar.tsx
index 4925a6948fef..977719f63879 100644
--- a/src/pages/settings/Profile/ProfileAvatar.tsx
+++ b/src/pages/settings/Profile/ProfileAvatar.tsx
@@ -24,7 +24,7 @@ type ProfileAvatarProps = ProfileAvatarOnyxProps & StackScreenProps<AuthScreensP
 function ProfileAvatar({route, personalDetails, personalDetailsMetadata, isLoadingApp = true}: ProfileAvatarProps) {
     const personalDetail = personalDetails?.[route.params.accountID];
     const avatarURL = personalDetail?.avatar ?? '';
-    const accountID = Number(route.params.accountID ?? '');
+    const accountID = Number(route.params.accountID ?? '-1');
     const isLoading = personalDetailsMetadata?.[accountID]?.isLoading ?? (isLoadingApp && !Object.keys(personalDetail ?? {}).length);
     const displayName = PersonalDetailsUtils.getDisplayNameOrDefault(personalDetail);
 
diff --git a/src/pages/settings/Profile/ProfilePage.tsx b/src/pages/settings/Profile/ProfilePage.tsx
index 4c5ed88e6898..b62342aa56f4 100755
--- a/src/pages/settings/Profile/ProfilePage.tsx
+++ b/src/pages/settings/Profile/ProfilePage.tsx
@@ -1,32 +1,39 @@
-import React, {useEffect} from 'react';
+import React from 'react';
 import {View} from 'react-native';
 import type {OnyxEntry} from 'react-native-onyx';
 import {withOnyx} from 'react-native-onyx';
+import AvatarWithImagePicker from '@components/AvatarWithImagePicker';
 import FullScreenLoadingIndicator from '@components/FullscreenLoadingIndicator';
 import HeaderWithBackButton from '@components/HeaderWithBackButton';
+import Icon from '@components/Icon';
+import * as Expensicons from '@components/Icon/Expensicons';
 import * as Illustrations from '@components/Icon/Illustrations';
 import MenuItemGroup from '@components/MenuItemGroup';
 import MenuItemWithTopDescription from '@components/MenuItemWithTopDescription';
+import {PressableWithFeedback} from '@components/Pressable';
 import ScreenWrapper from '@components/ScreenWrapper';
 import ScrollView from '@components/ScrollView';
 import Section from '@components/Section';
+import Text from '@components/Text';
+import Tooltip from '@components/Tooltip';
 import type {WithCurrentUserPersonalDetailsProps} from '@components/withCurrentUserPersonalDetails';
 import withCurrentUserPersonalDetails from '@components/withCurrentUserPersonalDetails';
 import useLocalize from '@hooks/useLocalize';
+import useResponsiveLayout from '@hooks/useResponsiveLayout';
 import useStyleUtils from '@hooks/useStyleUtils';
 import useTheme from '@hooks/useTheme';
 import useThemeStyles from '@hooks/useThemeStyles';
-import useWindowDimensions from '@hooks/useWindowDimensions';
 import * as LocalePhoneNumber from '@libs/LocalePhoneNumber';
 import Navigation from '@libs/Navigation/Navigation';
 import * as PersonalDetailsUtils from '@libs/PersonalDetailsUtils';
 import * as UserUtils from '@libs/UserUtils';
-import * as App from '@userActions/App';
+import variables from '@styles/variables';
+import * as PersonalDetails from '@userActions/PersonalDetails';
 import CONST from '@src/CONST';
 import type {TranslationPaths} from '@src/languages/types';
 import ONYXKEYS from '@src/ONYXKEYS';
 import ROUTES from '@src/ROUTES';
-import type {LoginList, PersonalDetails, PrivatePersonalDetails} from '@src/types/onyx';
+import type {LoginList, PrivatePersonalDetails} from '@src/types/onyx';
 
 type ProfilePageOnyxProps = {
     loginList: OnyxEntry<LoginList>;
@@ -44,14 +51,16 @@ function ProfilePage({
         legalFirstName: '',
         legalLastName: '',
         dob: '',
-        address: {
-            street: '',
-            street2: '',
-            city: '',
-            state: '',
-            zip: '',
-            country: '',
-        },
+        addresses: [
+            {
+                street: '',
+                street2: '',
+                city: '',
+                state: '',
+                zip: '',
+                country: '',
+            },
+        ],
     },
     currentUserPersonalDetails,
     isLoadingApp,
@@ -60,13 +69,16 @@ function ProfilePage({
     const styles = useThemeStyles();
     const StyleUtils = useStyleUtils();
     const {translate} = useLocalize();
-    const {isSmallScreenWidth} = useWindowDimensions();
+    const {shouldUseNarrowLayout} = useResponsiveLayout();
 
     const getPronouns = (): string => {
         const pronounsKey = currentUserPersonalDetails?.pronouns?.replace(CONST.PRONOUNS.PREFIX, '') ?? '';
         return pronounsKey ? translate(`pronouns.${pronounsKey}` as TranslationPaths) : translate('profilePage.selectYourPronouns');
     };
 
+    const avatarURL = currentUserPersonalDetails?.avatar ?? '';
+    const accountID = currentUserPersonalDetails?.accountID ?? '-1';
+
     const contactMethodBrickRoadIndicator = UserUtils.getLoginListBrickRoadIndicator(loginList);
     const emojiCode = currentUserPersonalDetails?.status?.emojiCode ?? '';
     const privateDetails = privatePersonalDetails ?? {};
@@ -101,10 +113,6 @@ function ProfilePage({
         },
     ];
 
-    useEffect(() => {
-        App.openProfile(currentUserPersonalDetails as PersonalDetails);
-    }, [currentUserPersonalDetails]);
-
     const privateOptions = [
         {
             description: translate('privatePersonalDetails.legalName'),
@@ -132,12 +140,12 @@ function ProfilePage({
             <HeaderWithBackButton
                 title={translate('common.profile')}
                 onBackButtonPress={() => Navigation.goBack()}
-                shouldShowBackButton={isSmallScreenWidth}
+                shouldShowBackButton={shouldUseNarrowLayout}
                 icon={Illustrations.Profile}
             />
             <ScrollView style={styles.pt3}>
                 <MenuItemGroup>
-                    <View style={[styles.flex1, isSmallScreenWidth ? styles.workspaceSectionMobile : styles.workspaceSection]}>
+                    <View style={[styles.flex1, shouldUseNarrowLayout ? styles.workspaceSectionMobile : styles.workspaceSection]}>
                         <Section
                             title={translate('profilePage.publicSection.title')}
                             subtitle={translate('profilePage.publicSection.subtitle')}
@@ -146,6 +154,27 @@ function ProfilePage({
                             childrenStyles={styles.pt5}
                             titleStyles={styles.accountSettingsSectionTitle}
                         >
+                            <View style={[styles.pt3, styles.pb6, styles.alignSelfStart]}>
+                                <AvatarWithImagePicker
+                                    isUsingDefaultAvatar={UserUtils.isDefaultAvatar(currentUserPersonalDetails?.avatar ?? '')}
+                                    source={avatarURL}
+                                    avatarID={accountID}
+                                    onImageSelected={PersonalDetails.updateAvatar}
+                                    onImageRemoved={PersonalDetails.deleteAvatar}
+                                    size={CONST.AVATAR_SIZE.XLARGE}
+                                    avatarStyle={styles.avatarXLarge}
+                                    pendingAction={currentUserPersonalDetails?.pendingFields?.avatar ?? undefined}
+                                    errors={currentUserPersonalDetails?.errorFields?.avatar ?? null}
+                                    errorRowStyles={styles.mt6}
+                                    onErrorClose={PersonalDetails.clearAvatarErrors}
+                                    onViewPhotoPress={() => Navigation.navigate(ROUTES.PROFILE_AVATAR.getRoute(String(accountID)))}
+                                    previewSource={UserUtils.getFullSizeAvatar(avatarURL, accountID)}
+                                    originalFileName={currentUserPersonalDetails.originalFileName}
+                                    headerTitle={translate('profilePage.profileAvatar')}
+                                    fallbackIcon={currentUserPersonalDetails?.fallbackIcon}
+                                    editIconStyle={styles.profilePageAvatar}
+                                />
+                            </View>
                             {publicOptions.map((detail, index) => (
                                 <MenuItemWithTopDescription
                                     // eslint-disable-next-line react/no-array-index-key
@@ -158,6 +187,25 @@ function ProfilePage({
                                     brickRoadIndicator={detail.brickRoadIndicator}
                                 />
                             ))}
+                            <View style={[styles.alignSelfStart, styles.pt3]}>
+                                <Tooltip text={translate('common.shareCode')}>
+                                    <PressableWithFeedback
+                                        accessibilityLabel={translate('common.shareCode')}
+                                        accessibilityRole="button"
+                                        accessible
+                                        onPress={() => Navigation.navigate(ROUTES.SETTINGS_SHARE_CODE)}
+                                        style={[styles.button, styles.flexRow, styles.gap1, styles.ph4]}
+                                    >
+                                        <Icon
+                                            src={Expensicons.QrCode}
+                                            width={variables.iconSizeNormal}
+                                            height={variables.iconSizeNormal}
+                                            fill={theme.icon}
+                                        />
+                                        <Text style={styles.buttonText}>{translate('common.share')}</Text>
+                                    </PressableWithFeedback>
+                                </Tooltip>
+                            </View>
                         </Section>
                         <Section
                             title={translate('profilePage.privateSection.title')}
diff --git a/src/pages/settings/Profile/PronounsPage.tsx b/src/pages/settings/Profile/PronounsPage.tsx
index 3f4c7ebe6b66..305909fd38ae 100644
--- a/src/pages/settings/Profile/PronounsPage.tsx
+++ b/src/pages/settings/Profile/PronounsPage.tsx
@@ -42,7 +42,7 @@ function PronounsPage({currentUserPersonalDetails, isLoadingApp = true}: Pronoun
         setSearchValue(currentPronounsText ? translate(`pronouns.${currentPronounsText}`) : '');
 
         // Only need to update search value when the first time the data is loaded
-        // eslint-disable-next-line react-hooks/exhaustive-deps
+        // eslint-disable-next-line react-compiler/react-compiler, react-hooks/exhaustive-deps
     }, [isLoadingApp]);
 
     const filteredPronounsList = useMemo((): PronounEntry[] => {
@@ -95,6 +95,7 @@ function PronounsPage({currentUserPersonalDetails, isLoadingApp = true}: Pronoun
                         sections={[{data: filteredPronounsList}]}
                         ListItem={RadioListItem}
                         onSelectRow={updatePronouns}
+                        shouldSingleExecuteRowSelect
                         onChangeText={setSearchValue}
                         initiallyFocusedOptionKey={currentPronounsKey}
                     />
diff --git a/src/pages/settings/Profile/TimezoneSelectPage.tsx b/src/pages/settings/Profile/TimezoneSelectPage.tsx
index 97cec508f867..326db5481d37 100644
--- a/src/pages/settings/Profile/TimezoneSelectPage.tsx
+++ b/src/pages/settings/Profile/TimezoneSelectPage.tsx
@@ -72,6 +72,7 @@ function TimezoneSelectPage({currentUserPersonalDetails}: TimezoneSelectPageProp
                 textInputValue={timezoneInputText}
                 onChangeText={filterShownTimezones}
                 onSelectRow={saveSelectedTimezone}
+                shouldSingleExecuteRowSelect
                 sections={[{data: timezoneOptions, isDisabled: timezone.automatic}]}
                 initiallyFocusedOptionKey={timezoneOptions.find((tz) => tz.text === timezone.selected)?.keyForList}
                 showScrollIndicator
diff --git a/src/pages/settings/Report/NamePage.tsx b/src/pages/settings/Report/NamePage.tsx
new file mode 100644
index 000000000000..de73e59bb7da
--- /dev/null
+++ b/src/pages/settings/Report/NamePage.tsx
@@ -0,0 +1,22 @@
+import type {StackScreenProps} from '@react-navigation/stack';
+import React from 'react';
+import * as ReportUtils from '@libs/ReportUtils';
+import type {ReportSettingsNavigatorParamList} from '@navigation/types';
+import GroupChatNameEditPage from '@pages/GroupChatNameEditPage';
+import withReportOrNotFound from '@pages/home/report/withReportOrNotFound';
+import type {WithReportOrNotFoundProps} from '@pages/home/report/withReportOrNotFound';
+import type SCREENS from '@src/SCREENS';
+import RoomNamePage from './RoomNamePage';
+
+type NamePageProps = WithReportOrNotFoundProps & StackScreenProps<ReportSettingsNavigatorParamList, typeof SCREENS.REPORT_SETTINGS.NAME>;
+
+function NamePage({report}: NamePageProps) {
+    if (ReportUtils.isGroupChat(report)) {
+        return <GroupChatNameEditPage report={report} />;
+    }
+    return <RoomNamePage report={report} />;
+}
+
+NamePage.displayName = 'NamePage';
+
+export default withReportOrNotFound()(NamePage);
diff --git a/src/pages/settings/Report/NotificationPreferencePage.tsx b/src/pages/settings/Report/NotificationPreferencePage.tsx
index af55ff994fcf..3a149e1ed377 100644
--- a/src/pages/settings/Report/NotificationPreferencePage.tsx
+++ b/src/pages/settings/Report/NotificationPreferencePage.tsx
@@ -1,5 +1,6 @@
 import type {StackScreenProps} from '@react-navigation/stack';
 import React from 'react';
+import {useOnyx} from 'react-native-onyx';
 import FullPageNotFoundView from '@components/BlockingViews/FullPageNotFoundView';
 import HeaderWithBackButton from '@components/HeaderWithBackButton';
 import ScreenWrapper from '@components/ScreenWrapper';
@@ -12,13 +13,19 @@ import withReportOrNotFound from '@pages/home/report/withReportOrNotFound';
 import type {WithReportOrNotFoundProps} from '@pages/home/report/withReportOrNotFound';
 import * as ReportActions from '@userActions/Report';
 import CONST from '@src/CONST';
+import ONYXKEYS from '@src/ONYXKEYS';
 import type SCREENS from '@src/SCREENS';
 
 type NotificationPreferencePageProps = WithReportOrNotFoundProps & StackScreenProps<ReportSettingsNavigatorParamList, typeof SCREENS.REPORT_SETTINGS.NOTIFICATION_PREFERENCES>;
 
 function NotificationPreferencePage({report}: NotificationPreferencePageProps) {
     const {translate} = useLocalize();
-    const shouldDisableNotificationPreferences = ReportUtils.isArchivedRoom(report) || ReportUtils.isSelfDM(report);
+    const [reportNameValuePairs] = useOnyx(`${ONYXKEYS.COLLECTION.REPORT_NAME_VALUE_PAIRS}${report.reportID || -1}`);
+    const isMoneyRequestReport = ReportUtils.isMoneyRequestReport(report);
+    const shouldDisableNotificationPreferences =
+        ReportUtils.isArchivedRoom(report, reportNameValuePairs) ||
+        ReportUtils.isSelfDM(report) ||
+        (!isMoneyRequestReport && report?.notificationPreference === CONST.REPORT.NOTIFICATION_PREFERENCE.HIDDEN);
     const notificationPreferenceOptions = Object.values(CONST.REPORT.NOTIFICATION_PREFERENCE)
         .filter((pref) => pref !== CONST.REPORT.NOTIFICATION_PREFERENCE.HIDDEN)
         .map((preference) => ({
@@ -44,6 +51,7 @@ function NotificationPreferencePage({report}: NotificationPreferencePageProps) {
                     onSelectRow={(option) =>
                         report && ReportActions.updateNotificationPreference(report.reportID, report.notificationPreference, option.value, true, undefined, undefined, report)
                     }
+                    shouldSingleExecuteRowSelect
                     initiallyFocusedOptionKey={notificationPreferenceOptions.find((locale) => locale.isSelected)?.keyForList}
                 />
             </FullPageNotFoundView>
diff --git a/src/pages/settings/Report/ReportSettingsPage.tsx b/src/pages/settings/Report/ReportSettingsPage.tsx
index aabd8d2fe376..6e1ab9a61737 100644
--- a/src/pages/settings/Report/ReportSettingsPage.tsx
+++ b/src/pages/settings/Report/ReportSettingsPage.tsx
@@ -1,11 +1,10 @@
 import type {StackScreenProps} from '@react-navigation/stack';
 import React, {useMemo} from 'react';
 import {View} from 'react-native';
+import {useOnyx} from 'react-native-onyx';
 import FullPageNotFoundView from '@components/BlockingViews/FullPageNotFoundView';
-import DisplayNames from '@components/DisplayNames';
 import HeaderWithBackButton from '@components/HeaderWithBackButton';
 import MenuItemWithTopDescription from '@components/MenuItemWithTopDescription';
-import OfflineWithFeedback from '@components/OfflineWithFeedback';
 import ScreenWrapper from '@components/ScreenWrapper';
 import ScrollView from '@components/ScrollView';
 import Text from '@components/Text';
@@ -16,8 +15,8 @@ import * as ReportUtils from '@libs/ReportUtils';
 import type {ReportSettingsNavigatorParamList} from '@navigation/types';
 import withReportOrNotFound from '@pages/home/report/withReportOrNotFound';
 import type {WithReportOrNotFoundProps} from '@pages/home/report/withReportOrNotFound';
-import * as ReportActions from '@userActions/Report';
 import CONST from '@src/CONST';
+import ONYXKEYS from '@src/ONYXKEYS';
 import ROUTES from '@src/ROUTES';
 import type SCREENS from '@src/SCREENS';
 import {isEmptyObject} from '@src/types/utils/EmptyObject';
@@ -25,17 +24,15 @@ import {isEmptyObject} from '@src/types/utils/EmptyObject';
 type ReportSettingsPageProps = WithReportOrNotFoundProps & StackScreenProps<ReportSettingsNavigatorParamList, typeof SCREENS.REPORT_SETTINGS.ROOT>;
 
 function ReportSettingsPage({report, policies}: ReportSettingsPageProps) {
-    const reportID = report?.reportID ?? '';
+    const reportID = report?.reportID ?? '-1';
     const styles = useThemeStyles();
-    const isGroupChat = ReportUtils.isGroupChat(report);
     const {translate} = useLocalize();
+    const [reportNameValuePairs] = useOnyx(`${ONYXKEYS.COLLECTION.REPORT_NAME_VALUE_PAIRS}${reportID}`);
     // The workspace the report is on, null if the user isn't a member of the workspace
-    const linkedWorkspace = useMemo(() => Object.values(policies ?? {}).find((policy) => policy && policy.id === report?.policyID) ?? null, [policies, report?.policyID]);
-    const shouldDisableRename = useMemo(() => ReportUtils.shouldDisableRename(report, linkedWorkspace), [report, linkedWorkspace]);
+    const linkedWorkspace = useMemo(() => Object.values(policies ?? {}).find((policy) => policy && policy.id === report?.policyID), [policies, report?.policyID]);
     const isMoneyRequestReport = ReportUtils.isMoneyRequestReport(report);
 
-    const shouldDisableSettings = isEmptyObject(report) || ReportUtils.isArchivedRoom(report) || ReportUtils.isSelfDM(report);
-    const shouldShowRoomName = !ReportUtils.isPolicyExpenseChat(report) && !ReportUtils.isChatThread(report) && !ReportUtils.isInvoiceRoom(report);
+    const shouldDisableSettings = isEmptyObject(report) || ReportUtils.isArchivedRoom(report, reportNameValuePairs) || ReportUtils.isSelfDM(report);
     const notificationPreference =
         report?.notificationPreference && report.notificationPreference !== CONST.REPORT.NOTIFICATION_PREFERENCE.HIDDEN
             ? translate(`notificationPreferencesPage.notificationPreferences.${report.notificationPreference}`)
@@ -47,8 +44,6 @@ function ReportSettingsPage({report, policies}: ReportSettingsPageProps) {
     const shouldAllowChangeVisibility = useMemo(() => ReportUtils.canEditRoomVisibility(report, linkedWorkspace), [report, linkedWorkspace]);
 
     const shouldShowNotificationPref = !isMoneyRequestReport && report?.notificationPreference !== CONST.REPORT.NOTIFICATION_PREFERENCE.HIDDEN;
-    const roomNameLabel = translate(isMoneyRequestReport ? 'workspace.editor.nameInputLabel' : 'newRoomPage.roomName');
-    const reportName = ReportUtils.getReportName(report);
 
     const shouldShowWriteCapability = !isMoneyRequestReport;
 
@@ -68,43 +63,6 @@ function ReportSettingsPage({report, policies}: ReportSettingsPageProps) {
                             onPress={() => Navigation.navigate(ROUTES.REPORT_SETTINGS_NOTIFICATION_PREFERENCES.getRoute(reportID))}
                         />
                     )}
-                    {shouldShowRoomName && (
-                        <OfflineWithFeedback
-                            pendingAction={report?.pendingFields?.reportName}
-                            errors={report?.errorFields?.reportName}
-                            errorRowStyles={[styles.ph5]}
-                            onClose={() => ReportActions.clearPolicyRoomNameErrors(reportID)}
-                        >
-                            {shouldDisableRename ? (
-                                <View style={[styles.ph5, styles.pv3]}>
-                                    <Text
-                                        style={[styles.textLabelSupporting, styles.lh16, styles.mb1]}
-                                        numberOfLines={1}
-                                    >
-                                        {roomNameLabel}
-                                    </Text>
-                                    <DisplayNames
-                                        fullTitle={reportName ?? ''}
-                                        tooltipEnabled
-                                        numberOfLines={1}
-                                        textStyles={[styles.optionAlternateText, styles.pre]}
-                                        shouldUseFullTitle
-                                    />
-                                </View>
-                            ) : (
-                                <MenuItemWithTopDescription
-                                    shouldShowRightIcon
-                                    title={report?.reportName === '' ? reportName : report?.reportName}
-                                    description={isGroupChat ? translate('common.name') : translate('newRoomPage.roomName')}
-                                    onPress={() =>
-                                        isGroupChat
-                                            ? Navigation.navigate(ROUTES.REPORT_SETTINGS_GROUP_NAME.getRoute(reportID))
-                                            : Navigation.navigate(ROUTES.REPORT_SETTINGS_ROOM_NAME.getRoute(reportID))
-                                    }
-                                />
-                            )}
-                        </OfflineWithFeedback>
-                    )}
                     {shouldShowWriteCapability &&
                         (shouldAllowWriteCapabilityEditing ? (
                             <MenuItemWithTopDescription
@@ -129,25 +87,6 @@ function ReportSettingsPage({report, policies}: ReportSettingsPageProps) {
                                 </Text>
                             </View>
                         ))}
-                    <View style={[styles.ph5]}>
-                        {linkedWorkspace !== null && (
-                            <View style={[styles.pv3]}>
-                                <Text
-                                    style={[styles.textLabelSupporting, styles.lh16, styles.mb1]}
-                                    numberOfLines={1}
-                                >
-                                    {translate('workspace.common.workspace')}
-                                </Text>
-                                <DisplayNames
-                                    fullTitle={linkedWorkspace.name}
-                                    tooltipEnabled
-                                    numberOfLines={1}
-                                    textStyles={[styles.optionAlternateText, styles.pre]}
-                                    shouldUseFullTitle
-                                />
-                            </View>
-                        )}
-                    </View>
                     {!!report?.visibility &&
                         report.chatType !== CONST.REPORT.CHAT_TYPE.INVOICE &&
                         (shouldAllowChangeVisibility ? (
diff --git a/src/pages/settings/Report/RoomNamePage.tsx b/src/pages/settings/Report/RoomNamePage.tsx
index 5ba85961e5ba..764ccbff6b3c 100644
--- a/src/pages/settings/Report/RoomNamePage.tsx
+++ b/src/pages/settings/Report/RoomNamePage.tsx
@@ -1,9 +1,8 @@
 import {useIsFocused} from '@react-navigation/native';
-import type {StackScreenProps} from '@react-navigation/stack';
 import React, {useCallback, useRef} from 'react';
 import {View} from 'react-native';
 import {withOnyx} from 'react-native-onyx';
-import type {OnyxCollection, OnyxEntry} from 'react-native-onyx';
+import type {OnyxCollection} from 'react-native-onyx';
 import FullPageNotFoundView from '@components/BlockingViews/FullPageNotFoundView';
 import FormProvider from '@components/Form/FormProvider';
 import InputWrapper from '@components/Form/InputWrapper';
@@ -18,28 +17,23 @@ import * as ErrorUtils from '@libs/ErrorUtils';
 import Navigation from '@libs/Navigation/Navigation';
 import * as ReportUtils from '@libs/ReportUtils';
 import * as ValidationUtils from '@libs/ValidationUtils';
-import type {ReportSettingsNavigatorParamList} from '@navigation/types';
-import withReportOrNotFound from '@pages/home/report/withReportOrNotFound';
-import type {WithReportOrNotFoundProps} from '@pages/home/report/withReportOrNotFound';
 import * as ReportActions from '@userActions/Report';
 import CONST from '@src/CONST';
 import ONYXKEYS from '@src/ONYXKEYS';
 import ROUTES from '@src/ROUTES';
-import type SCREENS from '@src/SCREENS';
 import INPUT_IDS from '@src/types/form/RoomNameForm';
-import type {Policy, Report} from '@src/types/onyx';
+import type {Report} from '@src/types/onyx';
 
 type RoomNamePageOnyxProps = {
     /** All reports shared with the user */
     reports: OnyxCollection<Report>;
-
-    /** Policy of the report for which the name is being edited */
-    policy: OnyxEntry<Policy>;
 };
 
-type RoomNamePageProps = RoomNamePageOnyxProps & WithReportOrNotFoundProps & StackScreenProps<ReportSettingsNavigatorParamList, typeof SCREENS.REPORT_SETTINGS.ROOM_NAME>;
+type RoomNamePageProps = RoomNamePageOnyxProps & {
+    report: Report;
+};
 
-function RoomNamePage({report, policy, reports}: RoomNamePageProps) {
+function RoomNamePage({report, reports}: RoomNamePageProps) {
     const styles = useThemeStyles();
     const roomNameInputRef = useRef<AnimatedTextInputRef>(null);
     const isFocused = useIsFocused();
@@ -56,23 +50,23 @@ function RoomNamePage({report, policy, reports}: RoomNamePageProps) {
 
             if (!values.roomName || values.roomName === CONST.POLICY.ROOM_PREFIX) {
                 // We error if the user doesn't enter a room name or left blank
-                ErrorUtils.addErrorMessage(errors, 'roomName', 'newRoomPage.pleaseEnterRoomName');
+                ErrorUtils.addErrorMessage(errors, 'roomName', translate('newRoomPage.pleaseEnterRoomName'));
             } else if (!ValidationUtils.isValidRoomName(values.roomName)) {
                 // We error if the room name has invalid characters
-                ErrorUtils.addErrorMessage(errors, 'roomName', 'newRoomPage.roomNameInvalidError');
+                ErrorUtils.addErrorMessage(errors, 'roomName', translate('newRoomPage.roomNameInvalidError'));
             } else if (ValidationUtils.isReservedRoomName(values.roomName)) {
                 // Certain names are reserved for default rooms and should not be used for policy rooms.
-                ErrorUtils.addErrorMessage(errors, 'roomName', ['newRoomPage.roomNameReservedError', {reservedName: values.roomName}]);
-            } else if (ValidationUtils.isExistingRoomName(values.roomName, reports, report?.policyID ?? '')) {
+                ErrorUtils.addErrorMessage(errors, 'roomName', translate('newRoomPage.roomNameReservedError', {reservedName: values.roomName}));
+            } else if (ValidationUtils.isExistingRoomName(values.roomName, reports, report?.policyID ?? '-1')) {
                 // The room name can't be set to one that already exists on the policy
-                ErrorUtils.addErrorMessage(errors, 'roomName', 'newRoomPage.roomAlreadyExistsError');
+                ErrorUtils.addErrorMessage(errors, 'roomName', translate('newRoomPage.roomAlreadyExistsError'));
             } else if (values.roomName.length > CONST.TITLE_CHARACTER_LIMIT) {
-                ErrorUtils.addErrorMessage(errors, 'roomName', ['common.error.characterLimitExceedCounter', {length: values.roomName.length, limit: CONST.TITLE_CHARACTER_LIMIT}]);
+                ErrorUtils.addErrorMessage(errors, 'roomName', translate('common.error.characterLimitExceedCounter', {length: values.roomName.length, limit: CONST.TITLE_CHARACTER_LIMIT}));
             }
 
             return errors;
         },
-        [report, reports],
+        [report, reports, translate],
     );
 
     return (
@@ -81,10 +75,10 @@ function RoomNamePage({report, policy, reports}: RoomNamePageProps) {
             includeSafeAreaPaddingBottom={false}
             testID={RoomNamePage.displayName}
         >
-            <FullPageNotFoundView shouldShow={ReportUtils.shouldDisableRename(report, policy)}>
+            <FullPageNotFoundView shouldShow={ReportUtils.shouldDisableRename(report)}>
                 <HeaderWithBackButton
                     title={translate('newRoomPage.roomName')}
-                    onBackButtonPress={() => Navigation.goBack(ROUTES.REPORT_SETTINGS.getRoute(report?.reportID ?? ''))}
+                    onBackButtonPress={() => Navigation.goBack(ROUTES.REPORT_SETTINGS.getRoute(report?.reportID ?? '-1'))}
                 />
                 <FormProvider
                     style={[styles.flexGrow1, styles.ph5]}
@@ -111,13 +105,8 @@ function RoomNamePage({report, policy, reports}: RoomNamePageProps) {
 
 RoomNamePage.displayName = 'RoomNamePage';
 
-export default withReportOrNotFound()(
-    withOnyx<RoomNamePageProps, RoomNamePageOnyxProps>({
-        reports: {
-            key: ONYXKEYS.COLLECTION.REPORT,
-        },
-        policy: {
-            key: ({report}) => `${ONYXKEYS.COLLECTION.POLICY}${report?.policyID}`,
-        },
-    })(RoomNamePage),
-);
+export default withOnyx<RoomNamePageProps, RoomNamePageOnyxProps>({
+    reports: {
+        key: ONYXKEYS.COLLECTION.REPORT,
+    },
+})(RoomNamePage);
diff --git a/src/pages/settings/Report/VisibilityPage.tsx b/src/pages/settings/Report/VisibilityPage.tsx
index d3b8b2656d50..5d09bec1788e 100644
--- a/src/pages/settings/Report/VisibilityPage.tsx
+++ b/src/pages/settings/Report/VisibilityPage.tsx
@@ -1,5 +1,6 @@
 import type {StackScreenProps} from '@react-navigation/stack';
-import React, {useCallback, useMemo, useState} from 'react';
+import React, {useCallback, useMemo, useRef, useState} from 'react';
+import {useOnyx} from 'react-native-onyx';
 import FullPageNotFoundView from '@components/BlockingViews/FullPageNotFoundView';
 import ConfirmModal from '@components/ConfirmModal';
 import HeaderWithBackButton from '@components/HeaderWithBackButton';
@@ -13,6 +14,7 @@ import type {WithReportOrNotFoundProps} from '@pages/home/report/withReportOrNot
 import withReportOrNotFound from '@pages/home/report/withReportOrNotFound';
 import * as ReportActions from '@userActions/Report';
 import CONST from '@src/CONST';
+import ONYXKEYS from '@src/ONYXKEYS';
 import type SCREENS from '@src/SCREENS';
 import type {RoomVisibility} from '@src/types/onyx/Report';
 
@@ -20,8 +22,10 @@ type VisibilityProps = WithReportOrNotFoundProps & StackScreenProps<ReportSettin
 
 function VisibilityPage({report}: VisibilityProps) {
     const [showConfirmModal, setShowConfirmModal] = useState(false);
+    const [reportNameValuePairs] = useOnyx(`${ONYXKEYS.COLLECTION.REPORT_NAME_VALUE_PAIRS}${report?.reportID || -1}`);
+    const shouldGoBackToDetailsPage = useRef(false);
 
-    const shouldDisableVisibility = ReportUtils.isArchivedRoom(report);
+    const shouldDisableVisibility = ReportUtils.isArchivedRoom(report, reportNameValuePairs);
     const {translate} = useLocalize();
 
     const visibilityOptions = useMemo(
@@ -43,9 +47,14 @@ function VisibilityPage({report}: VisibilityProps) {
             if (!report) {
                 return;
             }
-            ReportActions.updateRoomVisibility(report.reportID, report.visibility, newVisibility, true, report);
+            ReportActions.updateRoomVisibility(report.reportID, report.visibility, newVisibility);
+            if (showConfirmModal) {
+                shouldGoBackToDetailsPage.current = true;
+            } else {
+                ReportUtils.goBackToDetailsPage(report);
+            }
         },
-        [report],
+        [report, showConfirmModal],
     );
 
     const hideModal = useCallback(() => {
@@ -72,6 +81,7 @@ function VisibilityPage({report}: VisibilityProps) {
                         }
                         changeVisibility(option.value);
                     }}
+                    shouldSingleExecuteRowSelect
                     initiallyFocusedOptionKey={visibilityOptions.find((visibility) => visibility.isSelected)?.keyForList}
                     ListItem={RadioListItem}
                 />
@@ -81,6 +91,13 @@ function VisibilityPage({report}: VisibilityProps) {
                         changeVisibility(CONST.REPORT.VISIBILITY.PUBLIC);
                         hideModal();
                     }}
+                    onModalHide={() => {
+                        if (!shouldGoBackToDetailsPage.current) {
+                            return;
+                        }
+                        shouldGoBackToDetailsPage.current = false;
+                        ReportUtils.goBackToDetailsPage(report);
+                    }}
                     onCancel={hideModal}
                     title={translate('common.areYouSure')}
                     prompt={translate('newRoomPage.publicDescription')}
diff --git a/src/pages/settings/Report/WriteCapabilityPage.tsx b/src/pages/settings/Report/WriteCapabilityPage.tsx
index 1f991ef87c9a..19e8c10b698b 100644
--- a/src/pages/settings/Report/WriteCapabilityPage.tsx
+++ b/src/pages/settings/Report/WriteCapabilityPage.tsx
@@ -49,12 +49,13 @@ function WriteCapabilityPage({report, policy}: WriteCapabilityPageProps) {
                 <HeaderWithBackButton
                     title={translate('writeCapabilityPage.label')}
                     shouldShowBackButton
-                    onBackButtonPress={() => Navigation.goBack(ROUTES.REPORT_SETTINGS.getRoute(report?.reportID ?? ''))}
+                    onBackButtonPress={() => Navigation.goBack(ROUTES.REPORT_SETTINGS.getRoute(report?.reportID ?? '-1'))}
                 />
                 <SelectionList
                     sections={[{data: writeCapabilityOptions}]}
                     ListItem={RadioListItem}
                     onSelectRow={(option) => report && ReportActions.updateWriteCapabilityAndNavigate(report, option.value)}
+                    shouldSingleExecuteRowSelect
                     initiallyFocusedOptionKey={writeCapabilityOptions.find((locale) => locale.isSelected)?.keyForList}
                 />
             </FullPageNotFoundView>
diff --git a/src/pages/settings/Security/CloseAccountPage.tsx b/src/pages/settings/Security/CloseAccountPage.tsx
index 0fc0f5b7790a..1da4436ca810 100644
--- a/src/pages/settings/Security/CloseAccountPage.tsx
+++ b/src/pages/settings/Security/CloseAccountPage.tsx
@@ -1,5 +1,5 @@
 import type {StackScreenProps} from '@react-navigation/stack';
-import Str from 'expensify-common/lib/str';
+import {Str} from 'expensify-common';
 import React, {useEffect, useState} from 'react';
 import {View} from 'react-native';
 import {withOnyx} from 'react-native-onyx';
@@ -72,7 +72,7 @@ function CloseAccountPage({session}: CloseAccountPageProps) {
         const errors = ValidationUtils.getFieldRequiredErrors(values, ['phoneOrEmail']);
 
         if (values.phoneOrEmail && userEmailOrPhone && sanitizePhoneOrEmail(userEmailOrPhone) !== sanitizePhoneOrEmail(values.phoneOrEmail)) {
-            errors.phoneOrEmail = 'closeAccountPage.enterYourDefaultContactMethod';
+            errors.phoneOrEmail = translate('closeAccountPage.enterYourDefaultContactMethod');
         }
         return errors;
     };
diff --git a/src/pages/settings/Security/SecuritySettingsPage.tsx b/src/pages/settings/Security/SecuritySettingsPage.tsx
index 01563e586792..3420e352e056 100644
--- a/src/pages/settings/Security/SecuritySettingsPage.tsx
+++ b/src/pages/settings/Security/SecuritySettingsPage.tsx
@@ -9,9 +9,9 @@ import ScreenWrapper from '@components/ScreenWrapper';
 import ScrollView from '@components/ScrollView';
 import Section from '@components/Section';
 import useLocalize from '@hooks/useLocalize';
+import useResponsiveLayout from '@hooks/useResponsiveLayout';
 import useThemeStyles from '@hooks/useThemeStyles';
 import useWaitForNavigation from '@hooks/useWaitForNavigation';
-import useWindowDimensions from '@hooks/useWindowDimensions';
 import Navigation from '@libs/Navigation/Navigation';
 import type {TranslationPaths} from '@src/languages/types';
 import ROUTES from '@src/ROUTES';
@@ -20,7 +20,7 @@ function SecuritySettingsPage() {
     const styles = useThemeStyles();
     const {translate} = useLocalize();
     const waitForNavigate = useWaitForNavigation();
-    const {isSmallScreenWidth} = useWindowDimensions();
+    const {shouldUseNarrowLayout} = useResponsiveLayout();
 
     const menuItems = useMemo(() => {
         const baseMenuItems = [
@@ -56,12 +56,12 @@ function SecuritySettingsPage() {
         >
             <HeaderWithBackButton
                 title={translate('initialSettingsPage.security')}
-                shouldShowBackButton={isSmallScreenWidth}
+                shouldShowBackButton={shouldUseNarrowLayout}
                 onBackButtonPress={() => Navigation.goBack()}
                 icon={Illustrations.LockClosed}
             />
             <ScrollView contentContainerStyle={styles.pt3}>
-                <View style={[styles.flex1, isSmallScreenWidth ? styles.workspaceSectionMobile : styles.workspaceSection]}>
+                <View style={[styles.flex1, shouldUseNarrowLayout ? styles.workspaceSectionMobile : styles.workspaceSection]}>
                     <Section
                         title={translate('securityPage.title')}
                         subtitle={translate('securityPage.subtitle')}
diff --git a/src/pages/settings/Security/TwoFactorAuth/Steps/CodesStep.tsx b/src/pages/settings/Security/TwoFactorAuth/Steps/CodesStep.tsx
index dfa769077374..dd3d3b87a12f 100644
--- a/src/pages/settings/Security/TwoFactorAuth/Steps/CodesStep.tsx
+++ b/src/pages/settings/Security/TwoFactorAuth/Steps/CodesStep.tsx
@@ -1,3 +1,5 @@
+import type {RouteProp} from '@react-navigation/native';
+import {useRoute} from '@react-navigation/native';
 import React, {useEffect, useState} from 'react';
 import {ActivityIndicator, View} from 'react-native';
 import {withOnyx} from 'react-native-onyx';
@@ -10,13 +12,14 @@ import PressableWithDelayToggle from '@components/Pressable/PressableWithDelayTo
 import ScrollView from '@components/ScrollView';
 import Section from '@components/Section';
 import Text from '@components/Text';
+import ValidateAccountMessage from '@components/ValidateAccountMessage';
 import useLocalize from '@hooks/useLocalize';
+import useResponsiveLayout from '@hooks/useResponsiveLayout';
 import useTheme from '@hooks/useTheme';
 import useThemeStyles from '@hooks/useThemeStyles';
-import useWindowDimensions from '@hooks/useWindowDimensions';
 import Clipboard from '@libs/Clipboard';
 import localFileDownload from '@libs/localFileDownload';
-import type {BackToParams} from '@libs/Navigation/types';
+import type {BackToParams, SettingsNavigatorParamList} from '@libs/Navigation/types';
 import StepWrapper from '@pages/settings/Security/TwoFactorAuth/StepWrapper/StepWrapper';
 import useTwoFactorAuthContext from '@pages/settings/Security/TwoFactorAuth/TwoFactorAuthContext/useTwoFactorAuth';
 import type {BaseTwoFactorAuthFormOnyxProps} from '@pages/settings/Security/TwoFactorAuth/TwoFactorAuthForm/types';
@@ -24,26 +27,30 @@ import * as Session from '@userActions/Session';
 import * as TwoFactorAuthActions from '@userActions/TwoFactorAuthActions';
 import CONST from '@src/CONST';
 import ONYXKEYS from '@src/ONYXKEYS';
+import ROUTES from '@src/ROUTES';
+import type SCREENS from '@src/SCREENS';
 
 type CodesStepProps = BaseTwoFactorAuthFormOnyxProps & BackToParams;
 
-function CodesStep({account, backTo}: CodesStepProps) {
+function CodesStep({account, user, backTo}: CodesStepProps) {
     const theme = useTheme();
     const styles = useThemeStyles();
     const {translate} = useLocalize();
-    const {isExtraSmallScreenWidth, isSmallScreenWidth} = useWindowDimensions();
+    const {isExtraSmallScreenWidth, isSmallScreenWidth} = useResponsiveLayout();
     const [error, setError] = useState('');
+    const isUserValidated = user?.validated;
+    const route = useRoute<RouteProp<SettingsNavigatorParamList, typeof SCREENS.SETTINGS.TWO_FACTOR_AUTH>>();
 
     const {setStep} = useTwoFactorAuthContext();
 
     useEffect(() => {
         // eslint-disable-next-line @typescript-eslint/prefer-nullish-coalescing
-        if (account?.requiresTwoFactorAuth || account?.recoveryCodes) {
+        if (account?.requiresTwoFactorAuth || account?.recoveryCodes || !isUserValidated) {
             return;
         }
         Session.toggleTwoFactorAuth(true);
-        // eslint-disable-next-line react-hooks/exhaustive-deps -- We want to run this when component mounts
-    }, []);
+        // eslint-disable-next-line react-compiler/react-compiler, react-hooks/exhaustive-deps -- We want to run this when component mounts
+    }, [isUserValidated]);
 
     return (
         <StepWrapper
@@ -57,72 +64,75 @@ function CodesStep({account, backTo}: CodesStepProps) {
             onBackButtonPress={() => TwoFactorAuthActions.quitAndNavigateBack(backTo)}
         >
             <ScrollView contentContainerStyle={styles.flexGrow1}>
-                <Section
-                    title={translate('twoFactorAuth.keepCodesSafe')}
-                    icon={Illustrations.ShieldYellow}
-                    containerStyles={[styles.twoFactorAuthSection]}
-                    iconContainerStyles={[styles.ml6]}
-                >
-                    <View style={styles.mv3}>
-                        <Text>{translate('twoFactorAuth.codesLoseAccess')}</Text>
-                    </View>
-                    <View style={styles.twoFactorAuthCodesBox({isExtraSmallScreenWidth, isSmallScreenWidth})}>
-                        {account?.isLoading ? (
-                            <View style={styles.twoFactorLoadingContainer}>
-                                <ActivityIndicator color={theme.spinner} />
-                            </View>
-                        ) : (
-                            <>
-                                <View style={styles.twoFactorAuthCodesContainer}>
-                                    {Boolean(account?.recoveryCodes) &&
-                                        account?.recoveryCodes?.split(', ').map((code) => (
-                                            <Text
-                                                style={styles.twoFactorAuthCode}
-                                                key={code}
-                                            >
-                                                {code}
-                                            </Text>
-                                        ))}
+                {isUserValidated && (
+                    <Section
+                        title={translate('twoFactorAuth.keepCodesSafe')}
+                        icon={Illustrations.ShieldYellow}
+                        containerStyles={[styles.twoFactorAuthSection]}
+                        iconContainerStyles={[styles.ml6]}
+                    >
+                        <View style={styles.mv3}>
+                            <Text>{translate('twoFactorAuth.codesLoseAccess')}</Text>
+                        </View>
+                        <View style={styles.twoFactorAuthCodesBox({isExtraSmallScreenWidth, isSmallScreenWidth})}>
+                            {account?.isLoading ? (
+                                <View style={styles.twoFactorLoadingContainer}>
+                                    <ActivityIndicator color={theme.spinner} />
                                 </View>
-                                <View style={styles.twoFactorAuthCodesButtonsContainer}>
-                                    <PressableWithDelayToggle
-                                        text={translate('twoFactorAuth.copy')}
-                                        textChecked={translate('common.copied')}
-                                        icon={Expensicons.Copy}
-                                        inline={false}
-                                        onPress={() => {
-                                            Clipboard.setString(account?.recoveryCodes ?? '');
-                                            setError('');
-                                            TwoFactorAuthActions.setCodesAreCopied();
-                                        }}
-                                        styles={[styles.button, styles.buttonMedium, styles.twoFactorAuthCodesButton]}
-                                        textStyles={[styles.buttonMediumText]}
-                                        accessible={false}
-                                        tooltipText=""
-                                        tooltipTextChecked=""
-                                    />
-                                    <PressableWithDelayToggle
-                                        text={translate('common.download')}
-                                        icon={Expensicons.Download}
-                                        onPress={() => {
-                                            localFileDownload('two-factor-auth-codes', account?.recoveryCodes ?? '');
-                                            setError('');
-                                            TwoFactorAuthActions.setCodesAreCopied();
-                                        }}
-                                        inline={false}
-                                        styles={[styles.button, styles.buttonMedium, styles.twoFactorAuthCodesButton]}
-                                        textStyles={[styles.buttonMediumText]}
-                                        accessible={false}
-                                        tooltipText=""
-                                        tooltipTextChecked=""
-                                    />
-                                </View>
-                            </>
-                        )}
-                    </View>
-                </Section>
+                            ) : (
+                                <>
+                                    <View style={styles.twoFactorAuthCodesContainer}>
+                                        {!!account?.recoveryCodes &&
+                                            account?.recoveryCodes?.split(', ').map((code) => (
+                                                <Text
+                                                    style={styles.twoFactorAuthCode}
+                                                    key={code}
+                                                >
+                                                    {code}
+                                                </Text>
+                                            ))}
+                                    </View>
+                                    <View style={styles.twoFactorAuthCodesButtonsContainer}>
+                                        <PressableWithDelayToggle
+                                            text={translate('twoFactorAuth.copy')}
+                                            textChecked={translate('common.copied')}
+                                            icon={Expensicons.Copy}
+                                            inline={false}
+                                            onPress={() => {
+                                                Clipboard.setString(account?.recoveryCodes ?? '');
+                                                setError('');
+                                                TwoFactorAuthActions.setCodesAreCopied();
+                                            }}
+                                            styles={[styles.button, styles.buttonMedium, styles.twoFactorAuthCodesButton]}
+                                            textStyles={[styles.buttonMediumText]}
+                                            accessible={false}
+                                            tooltipText=""
+                                            tooltipTextChecked=""
+                                        />
+                                        <PressableWithDelayToggle
+                                            text={translate('common.download')}
+                                            icon={Expensicons.Download}
+                                            onPress={() => {
+                                                localFileDownload('two-factor-auth-codes', account?.recoveryCodes ?? '');
+                                                setError('');
+                                                TwoFactorAuthActions.setCodesAreCopied();
+                                            }}
+                                            inline={false}
+                                            styles={[styles.button, styles.buttonMedium, styles.twoFactorAuthCodesButton]}
+                                            textStyles={[styles.buttonMediumText]}
+                                            accessible={false}
+                                            tooltipText=""
+                                            tooltipTextChecked=""
+                                        />
+                                    </View>
+                                </>
+                            )}
+                        </View>
+                    </Section>
+                )}
+                {!isUserValidated && <ValidateAccountMessage backTo={ROUTES.SETTINGS_2FA.getRoute(route?.params?.backTo)} />}
                 <FixedFooter style={[styles.mtAuto, styles.pt5]}>
-                    {Boolean(error) && (
+                    {!!error && (
                         <FormHelpMessage
                             isError
                             message={error}
@@ -132,10 +142,11 @@ function CodesStep({account, backTo}: CodesStepProps) {
                     <Button
                         success
                         large
+                        isDisabled={!isUserValidated}
                         text={translate('common.next')}
                         onPress={() => {
                             if (!account?.codesAreCopied) {
-                                setError('twoFactorAuth.errorStepCodes');
+                                setError(translate('twoFactorAuth.errorStepCodes'));
                                 return;
                             }
                             setStep(CONST.TWO_FACTOR_AUTH_STEPS.VERIFY);
@@ -151,4 +162,7 @@ CodesStep.displayName = 'CodesStep';
 
 export default withOnyx<CodesStepProps, BaseTwoFactorAuthFormOnyxProps>({
     account: {key: ONYXKEYS.ACCOUNT},
+    user: {
+        key: ONYXKEYS.USER,
+    },
 })(CodesStep);
diff --git a/src/pages/settings/Security/TwoFactorAuth/Steps/EnabledStep.tsx b/src/pages/settings/Security/TwoFactorAuth/Steps/EnabledStep.tsx
index ad9a4060af45..ddd99f8fb54e 100644
--- a/src/pages/settings/Security/TwoFactorAuth/Steps/EnabledStep.tsx
+++ b/src/pages/settings/Security/TwoFactorAuth/Steps/EnabledStep.tsx
@@ -57,7 +57,7 @@ function EnabledStep() {
                     onModalHide={() => setIsConfirmModalVisible(false)}
                     isVisible={isConfirmModalVisible}
                     prompt={translate('twoFactorAuth.disableTwoFactorAuthConfirmation')}
-                    confirmText={translate('twoFactorAuth.disable')}
+                    confirmText={translate('common.disable')}
                     cancelText={translate('common.cancel')}
                     shouldShowCancelButton
                     danger
diff --git a/src/pages/settings/Security/TwoFactorAuth/Steps/SuccessStep.tsx b/src/pages/settings/Security/TwoFactorAuth/Steps/SuccessStep.tsx
index 5e92fb8649ef..9604a7d1627f 100644
--- a/src/pages/settings/Security/TwoFactorAuth/Steps/SuccessStep.tsx
+++ b/src/pages/settings/Security/TwoFactorAuth/Steps/SuccessStep.tsx
@@ -1,18 +1,26 @@
 import React from 'react';
 import ConfirmationPage from '@components/ConfirmationPage';
 import LottieAnimations from '@components/LottieAnimations';
+import useEnvironment from '@hooks/useEnvironment';
 import useLocalize from '@hooks/useLocalize';
-import type {BackToParams} from '@libs/Navigation/types';
 import Navigation from '@navigation/Navigation';
 import StepWrapper from '@pages/settings/Security/TwoFactorAuth/StepWrapper/StepWrapper';
 import useTwoFactorAuthContext from '@pages/settings/Security/TwoFactorAuth/TwoFactorAuthContext/useTwoFactorAuth';
+import * as Link from '@userActions/Link';
 import * as TwoFactorAuthActions from '@userActions/TwoFactorAuthActions';
 import CONST from '@src/CONST';
+import type {Route} from '@src/ROUTES';
 
-function SuccessStep({backTo}: BackToParams) {
+type SuccessStepParams = {
+    backTo?: Route;
+    forwardTo?: string;
+};
+
+function SuccessStep({backTo, forwardTo}: SuccessStepParams) {
     const {setStep} = useTwoFactorAuthContext();
 
     const {translate} = useLocalize();
+    const {environmentURL} = useEnvironment();
 
     return (
         <StepWrapper
@@ -23,7 +31,7 @@ function SuccessStep({backTo}: BackToParams) {
             }}
         >
             <ConfirmationPage
-                animation={LottieAnimations.Fireworks}
+                illustration={LottieAnimations.Fireworks}
                 heading={translate('twoFactorAuth.enabled')}
                 description={translate('twoFactorAuth.congrats')}
                 shouldShowButton
@@ -34,6 +42,9 @@ function SuccessStep({backTo}: BackToParams) {
                     if (backTo) {
                         Navigation.navigate(backTo);
                     }
+                    if (forwardTo) {
+                        Link.openLink(forwardTo, environmentURL);
+                    }
                 }}
             />
         </StepWrapper>
diff --git a/src/pages/settings/Security/TwoFactorAuth/Steps/VerifyStep.tsx b/src/pages/settings/Security/TwoFactorAuth/Steps/VerifyStep.tsx
index cfd233d61cf1..aeb388ff56b2 100644
--- a/src/pages/settings/Security/TwoFactorAuth/Steps/VerifyStep.tsx
+++ b/src/pages/settings/Security/TwoFactorAuth/Steps/VerifyStep.tsx
@@ -98,7 +98,7 @@ function VerifyStep({account}: VerifyStepProps) {
                     </View>
                     <Text style={styles.mt5}>{translate('twoFactorAuth.addKey')}</Text>
                     <View style={[styles.mt11, styles.flexRow, styles.alignItemsCenter, styles.justifyContentBetween]}>
-                        {Boolean(account?.twoFactorAuthSecretKey) && <Text>{splitSecretInChunks(account?.twoFactorAuthSecretKey ?? '')}</Text>}
+                        {!!account?.twoFactorAuthSecretKey && <Text>{splitSecretInChunks(account?.twoFactorAuthSecretKey ?? '')}</Text>}
                         <PressableWithDelayToggle
                             text={translate('twoFactorAuth.copy')}
                             textChecked={translate('common.copied')}
diff --git a/src/pages/settings/Security/TwoFactorAuth/TwoFactorAuthForm/BaseTwoFactorAuthForm.tsx b/src/pages/settings/Security/TwoFactorAuth/TwoFactorAuthForm/BaseTwoFactorAuthForm.tsx
index 33484c2aee35..ece2e8fdf2f2 100644
--- a/src/pages/settings/Security/TwoFactorAuth/TwoFactorAuthForm/BaseTwoFactorAuthForm.tsx
+++ b/src/pages/settings/Security/TwoFactorAuth/TwoFactorAuthForm/BaseTwoFactorAuthForm.tsx
@@ -3,6 +3,7 @@ import type {ForwardedRef, RefAttributes} from 'react';
 import {withOnyx} from 'react-native-onyx';
 import type {AutoCompleteVariant, MagicCodeInputHandle} from '@components/MagicCodeInput';
 import MagicCodeInput from '@components/MagicCodeInput';
+import useLocalize from '@hooks/useLocalize';
 import * as ErrorUtils from '@libs/ErrorUtils';
 import * as ValidationUtils from '@libs/ValidationUtils';
 import * as Session from '@userActions/Session';
@@ -14,9 +15,11 @@ type BaseTwoFactorAuthFormProps = BaseTwoFactorAuthFormOnyxProps & {
 };
 
 function BaseTwoFactorAuthForm({account, autoComplete}: BaseTwoFactorAuthFormProps, ref: ForwardedRef<BaseTwoFactorAuthFormRef>) {
+    const {translate} = useLocalize();
     const [formError, setFormError] = useState<{twoFactorAuthCode?: string}>({});
     const [twoFactorAuthCode, setTwoFactorAuthCode] = useState('');
     const inputRef = useRef<MagicCodeInputHandle | null>(null);
+    const shouldClearData = account?.needsTwoFactorAuthSetup ?? false;
 
     /**
      * Handle text input and clear formError upon text change
@@ -41,18 +44,18 @@ function BaseTwoFactorAuthForm({account, autoComplete}: BaseTwoFactorAuthFormPro
             inputRef.current.blur();
         }
         if (!twoFactorAuthCode.trim()) {
-            setFormError({twoFactorAuthCode: 'twoFactorAuthForm.error.pleaseFillTwoFactorAuth'});
+            setFormError({twoFactorAuthCode: translate('twoFactorAuthForm.error.pleaseFillTwoFactorAuth')});
             return;
         }
 
         if (!ValidationUtils.isValidTwoFactorCode(twoFactorAuthCode)) {
-            setFormError({twoFactorAuthCode: 'twoFactorAuthForm.error.incorrect2fa'});
+            setFormError({twoFactorAuthCode: translate('twoFactorAuthForm.error.incorrect2fa')});
             return;
         }
 
         setFormError({});
-        Session.validateTwoFactorAuth(twoFactorAuthCode);
-    }, [twoFactorAuthCode]);
+        Session.validateTwoFactorAuth(twoFactorAuthCode, shouldClearData);
+    }, [twoFactorAuthCode, shouldClearData, translate]);
 
     useImperativeHandle(ref, () => ({
         validateAndSubmitForm() {
diff --git a/src/pages/settings/Security/TwoFactorAuth/TwoFactorAuthForm/types.ts b/src/pages/settings/Security/TwoFactorAuth/TwoFactorAuthForm/types.ts
index baac250a3d66..97510a2a3a29 100644
--- a/src/pages/settings/Security/TwoFactorAuth/TwoFactorAuthForm/types.ts
+++ b/src/pages/settings/Security/TwoFactorAuth/TwoFactorAuthForm/types.ts
@@ -1,9 +1,10 @@
 import type {ForwardedRef} from 'react';
 import type {OnyxEntry} from 'react-native-onyx';
-import type {Account} from '@src/types/onyx';
+import type {Account, User} from '@src/types/onyx';
 
 type BaseTwoFactorAuthFormOnyxProps = {
     account: OnyxEntry<Account>;
+    user?: OnyxEntry<User>;
 };
 
 type BaseTwoFactorAuthFormRef = {
diff --git a/src/pages/settings/Security/TwoFactorAuth/TwoFactorAuthSteps.tsx b/src/pages/settings/Security/TwoFactorAuth/TwoFactorAuthSteps.tsx
index c8f2c357f05f..76b1e7cfb0f7 100644
--- a/src/pages/settings/Security/TwoFactorAuth/TwoFactorAuthSteps.tsx
+++ b/src/pages/settings/Security/TwoFactorAuth/TwoFactorAuthSteps.tsx
@@ -1,6 +1,6 @@
 import {useRoute} from '@react-navigation/native';
 import type {RouteProp} from '@react-navigation/native';
-import React, {useCallback, useEffect, useMemo, useState} from 'react';
+import React, {useCallback, useEffect, useMemo} from 'react';
 import {withOnyx} from 'react-native-onyx';
 import type {AnimationDirection} from '@components/AnimatedStep/AnimatedStepContext';
 import useAnimatedStepContext from '@components/AnimatedStep/useAnimatedStepContext';
@@ -23,30 +23,23 @@ type TwoFactorAuthStepProps = BaseTwoFactorAuthFormOnyxProps;
 function TwoFactorAuthSteps({account}: TwoFactorAuthStepProps) {
     const route = useRoute<RouteProp<SettingsNavigatorParamList, typeof SCREENS.SETTINGS.TWO_FACTOR_AUTH>>();
     const backTo = route.params?.backTo ?? '';
-    const [currentStep, setCurrentStep] = useState<TwoFactorAuthStep>(CONST.TWO_FACTOR_AUTH_STEPS.CODES);
+    const forwardTo = route.params?.forwardTo ?? '';
 
-    const {setAnimationDirection} = useAnimatedStepContext();
-
-    useEffect(() => () => TwoFactorAuthActions.clearTwoFactorAuthData(), []);
-
-    useEffect(() => {
+    const currentStep = useMemo(() => {
         if (account?.twoFactorAuthStep) {
-            setCurrentStep(account?.twoFactorAuthStep);
-            return;
-        }
-
-        if (account?.requiresTwoFactorAuth) {
-            setCurrentStep(CONST.TWO_FACTOR_AUTH_STEPS.ENABLED);
-        } else {
-            setCurrentStep(CONST.TWO_FACTOR_AUTH_STEPS.CODES);
+            return account.twoFactorAuthStep;
         }
+        return account?.requiresTwoFactorAuth ? CONST.TWO_FACTOR_AUTH_STEPS.ENABLED : CONST.TWO_FACTOR_AUTH_STEPS.CODES;
     }, [account?.requiresTwoFactorAuth, account?.twoFactorAuthStep]);
 
+    const {setAnimationDirection} = useAnimatedStepContext();
+
+    useEffect(() => () => TwoFactorAuthActions.clearTwoFactorAuthData(), []);
+
     const handleSetStep = useCallback(
         (step: TwoFactorAuthStep, animationDirection: AnimationDirection = CONST.ANIMATION_DIRECTION.IN) => {
             setAnimationDirection(animationDirection);
             TwoFactorAuthActions.setTwoFactorAuthStep(step);
-            setCurrentStep(step);
         },
         [setAnimationDirection],
     );
@@ -59,7 +52,12 @@ function TwoFactorAuthSteps({account}: TwoFactorAuthStepProps) {
             case CONST.TWO_FACTOR_AUTH_STEPS.VERIFY:
                 return <VerifyStep />;
             case CONST.TWO_FACTOR_AUTH_STEPS.SUCCESS:
-                return <SuccessStep backTo={backTo} />;
+                return (
+                    <SuccessStep
+                        backTo={backTo}
+                        forwardTo={forwardTo}
+                    />
+                );
             case CONST.TWO_FACTOR_AUTH_STEPS.ENABLED:
                 return <EnabledStep />;
             case CONST.TWO_FACTOR_AUTH_STEPS.DISABLED:
diff --git a/src/pages/settings/Subscription/CardAuthenticationModal/index.tsx b/src/pages/settings/Subscription/CardAuthenticationModal/index.tsx
new file mode 100644
index 000000000000..6f49e9bd0508
--- /dev/null
+++ b/src/pages/settings/Subscription/CardAuthenticationModal/index.tsx
@@ -0,0 +1,95 @@
+import React, {useCallback, useEffect, useState} from 'react';
+import {View} from 'react-native';
+import {useOnyx} from 'react-native-onyx';
+import FullScreenLoadingIndicator from '@components/FullscreenLoadingIndicator';
+import HeaderWithBackButton from '@components/HeaderWithBackButton';
+import Modal from '@components/Modal';
+import ScreenWrapper from '@components/ScreenWrapper';
+import useThemeStyles from '@hooks/useThemeStyles';
+import * as PaymentMethods from '@userActions/PaymentMethods';
+import CONST from '@src/CONST';
+import ONYXKEYS from '@src/ONYXKEYS';
+
+type CardAuthenticationModalProps = {
+    /** Title shown in the header of the modal */
+    headerTitle?: string;
+};
+function CardAuthenticationModal({headerTitle}: CardAuthenticationModalProps) {
+    const styles = useThemeStyles();
+    const [authenticationLink] = useOnyx(ONYXKEYS.VERIFY_3DS_SUBSCRIPTION);
+    const [session] = useOnyx(ONYXKEYS.SESSION);
+    const [isLoading, setIsLoading] = useState(true);
+    const [isVisible, setIsVisible] = useState(false);
+
+    const onModalClose = useCallback(() => {
+        setIsVisible(false);
+        PaymentMethods.clearPaymentCard3dsVerification();
+    }, []);
+
+    useEffect(() => {
+        if (!authenticationLink) {
+            return;
+        }
+        setIsVisible(!!authenticationLink);
+    }, [authenticationLink]);
+
+    const handleGBPAuthentication = useCallback(
+        (event: MessageEvent<string>) => {
+            const message = event.data;
+            if (message === CONST.GBP_AUTHENTICATION_COMPLETE) {
+                PaymentMethods.verifySetupIntent(session?.accountID ?? -1, true);
+                onModalClose();
+            }
+        },
+        [onModalClose, session?.accountID],
+    );
+
+    useEffect(() => {
+        window.addEventListener('message', handleGBPAuthentication);
+        return () => {
+            window.removeEventListener('message', handleGBPAuthentication);
+        };
+    }, [handleGBPAuthentication]);
+
+    return (
+        <Modal
+            type={CONST.MODAL.MODAL_TYPE.CENTERED_UNSWIPEABLE}
+            isVisible={isVisible}
+            onClose={onModalClose}
+            onModalHide={onModalClose}
+        >
+            <ScreenWrapper
+                style={styles.pb0}
+                includePaddingTop={false}
+                includeSafeAreaPaddingBottom={false}
+                testID={CardAuthenticationModal.displayName}
+            >
+                <HeaderWithBackButton
+                    title={headerTitle}
+                    shouldShowBorderBottom
+                    shouldShowCloseButton
+                    onCloseButtonPress={onModalClose}
+                    shouldShowBackButton={false}
+                />
+                {isLoading && <FullScreenLoadingIndicator />}
+                <View style={[styles.flex1]}>
+                    <iframe
+                        src={authenticationLink}
+                        title="Statements"
+                        height="100%"
+                        width="100%"
+                        seamless
+                        style={{border: 'none'}}
+                        onLoad={() => {
+                            setIsLoading(false);
+                        }}
+                    />
+                </View>
+            </ScreenWrapper>
+        </Modal>
+    );
+}
+
+CardAuthenticationModal.displayName = 'CardAuthenticationModal';
+
+export default CardAuthenticationModal;
diff --git a/src/pages/settings/Subscription/CardSection/BillingBanner/BillingBanner.tsx b/src/pages/settings/Subscription/CardSection/BillingBanner/BillingBanner.tsx
new file mode 100644
index 000000000000..bbb06dac4549
--- /dev/null
+++ b/src/pages/settings/Subscription/CardSection/BillingBanner/BillingBanner.tsx
@@ -0,0 +1,103 @@
+import React, {useMemo} from 'react';
+import type {StyleProp, TextStyle, ViewStyle} from 'react-native';
+import {View} from 'react-native';
+import type {ValueOf} from 'type-fest';
+import Icon from '@components/Icon';
+import * as Expensicons from '@components/Icon/Expensicons';
+import {PressableWithoutFeedback} from '@components/Pressable';
+import Text from '@components/Text';
+import useTheme from '@hooks/useTheme';
+import useThemeStyles from '@hooks/useThemeStyles';
+import variables from '@styles/variables';
+import CONST from '@src/CONST';
+import type IconAsset from '@src/types/utils/IconAsset';
+
+type BillingBannerProps = {
+    /** The title of the banner. */
+    title: string | React.ReactNode;
+
+    /** The subtitle of the banner. */
+    subtitle: string | React.ReactNode;
+
+    /** The icon to display in the banner. */
+    icon: IconAsset;
+
+    /** The type of brick road indicator to show. */
+    brickRoadIndicator?: ValueOf<typeof CONST.BRICK_ROAD_INDICATOR_STATUS>;
+
+    /** Styles to apply to the container. */
+    style?: StyleProp<ViewStyle>;
+
+    /** Styles to apply to the title. */
+    titleStyle?: StyleProp<TextStyle>;
+
+    /** Styles to apply to the subtitle. */
+    subtitleStyle?: StyleProp<TextStyle>;
+
+    /** An icon to be rendered instead of the RBR / GBR indicator. */
+    rightIcon?: IconAsset;
+
+    /** Callback to be called when the right icon is pressed. */
+    onRightIconPress?: () => void;
+
+    /** Accessibility label for the right icon. */
+    rightIconAccessibilityLabel?: string;
+};
+
+function BillingBanner({title, subtitle, icon, brickRoadIndicator, style, titleStyle, subtitleStyle, rightIcon, onRightIconPress, rightIconAccessibilityLabel}: BillingBannerProps) {
+    const styles = useThemeStyles();
+    const theme = useTheme();
+
+    const rightIconComponent = useMemo(() => {
+        if (rightIcon) {
+            return onRightIconPress && rightIconAccessibilityLabel ? (
+                <PressableWithoutFeedback
+                    onPress={onRightIconPress}
+                    style={[styles.touchableButtonImage]}
+                    role={CONST.ROLE.BUTTON}
+                    accessibilityLabel={rightIconAccessibilityLabel}
+                >
+                    <Icon
+                        src={rightIcon}
+                        fill={theme.icon}
+                    />
+                </PressableWithoutFeedback>
+            ) : (
+                <Icon
+                    src={rightIcon}
+                    fill={theme.icon}
+                />
+            );
+        }
+
+        return (
+            !!brickRoadIndicator && (
+                <Icon
+                    src={Expensicons.DotIndicator}
+                    fill={brickRoadIndicator === CONST.BRICK_ROAD_INDICATOR_STATUS.ERROR ? theme.danger : theme.success}
+                />
+            )
+        );
+    }, [brickRoadIndicator, onRightIconPress, rightIcon, rightIconAccessibilityLabel, styles.touchableButtonImage, theme.danger, theme.icon, theme.success]);
+
+    return (
+        <View style={[styles.pv4, styles.ph5, styles.flexRow, styles.gap3, styles.w100, styles.alignItemsCenter, styles.trialBannerBackgroundColor, style]}>
+            <Icon
+                src={icon}
+                width={variables.menuIconSize}
+                height={variables.menuIconSize}
+            />
+
+            <View style={[styles.flex1, styles.justifyContentCenter]}>
+                {typeof title === 'string' ? <Text style={[styles.textStrong, titleStyle]}>{title}</Text> : title}
+                {typeof subtitle === 'string' ? <Text style={subtitleStyle}>{subtitle}</Text> : subtitle}
+            </View>
+            {rightIconComponent}
+        </View>
+    );
+}
+
+BillingBanner.displayName = 'BillingBanner';
+
+export default BillingBanner;
+export type {BillingBannerProps};
diff --git a/src/pages/settings/Subscription/CardSection/BillingBanner/PreTrialBillingBanner.tsx b/src/pages/settings/Subscription/CardSection/BillingBanner/PreTrialBillingBanner.tsx
new file mode 100644
index 000000000000..bb3b5bcbdfd6
--- /dev/null
+++ b/src/pages/settings/Subscription/CardSection/BillingBanner/PreTrialBillingBanner.tsx
@@ -0,0 +1,50 @@
+import React from 'react';
+import * as Illustrations from '@components/Icon/Illustrations';
+import Text from '@components/Text';
+import TextLink from '@components/TextLink';
+import useLocalize from '@hooks/useLocalize';
+import useThemeStyles from '@hooks/useThemeStyles';
+import * as Report from '@libs/actions/Report';
+import Navigation from '@libs/Navigation/Navigation';
+import * as ReportUtils from '@libs/ReportUtils';
+import ROUTES from '@src/ROUTES';
+import BillingBanner from './BillingBanner';
+
+function PreTrialBillingBanner() {
+    const {translate} = useLocalize();
+    const styles = useThemeStyles();
+
+    const navigateToChat = () => {
+        const reportUsedForOnboarding = ReportUtils.getChatUsedForOnboarding();
+
+        if (!reportUsedForOnboarding) {
+            Report.navigateToConciergeChat();
+            return;
+        }
+
+        Navigation.navigate(ROUTES.REPORT_WITH_ID.getRoute(reportUsedForOnboarding.reportID));
+    };
+
+    return (
+        <BillingBanner
+            title={translate('subscription.billingBanner.preTrial.title')}
+            subtitle={
+                <Text>
+                    {translate('subscription.billingBanner.preTrial.subtitleStart')}
+                    <TextLink
+                        style={styles.link}
+                        onPress={navigateToChat}
+                    >
+                        {translate('subscription.billingBanner.preTrial.subtitleLink')}
+                    </TextLink>
+                    {translate('subscription.billingBanner.preTrial.subtitleEnd')}
+                </Text>
+            }
+            icon={Illustrations.TreasureChest}
+        />
+    );
+}
+
+PreTrialBillingBanner.displayName = 'PreTrialBillingBanner';
+
+export default PreTrialBillingBanner;
diff --git a/src/pages/settings/Subscription/CardSection/BillingBanner/SubscriptionBillingBanner.tsx b/src/pages/settings/Subscription/CardSection/BillingBanner/SubscriptionBillingBanner.tsx
new file mode 100644
index 000000000000..d949e2699e44
--- /dev/null
+++ b/src/pages/settings/Subscription/CardSection/BillingBanner/SubscriptionBillingBanner.tsx
@@ -0,0 +1,39 @@
+import React from 'react';
+import * as Illustrations from '@components/Icon/Illustrations';
+import useThemeStyles from '@hooks/useThemeStyles';
+import CONST from '@src/CONST';
+import type IconAsset from '@src/types/utils/IconAsset';
+import BillingBanner from './BillingBanner';
+import type {BillingBannerProps} from './BillingBanner';
+
+type SubscriptionBillingBannerProps = Omit<BillingBannerProps, 'titleStyle' | 'subtitleStyle' | 'style' | 'brickRoadIndicator' | 'icon'> & {
+    /** Indicates whether there is an error */
+    isError?: boolean;
+
+    /** An optional icon prop */
+    icon?: IconAsset;
+};
+
+function SubscriptionBillingBanner({title, subtitle, rightIcon, icon, isError = false, onRightIconPress, rightIconAccessibilityLabel}: SubscriptionBillingBannerProps) {
+    const styles = useThemeStyles();
+
+    const iconAsset = icon ?? isError ? Illustrations.CreditCardEyes : Illustrations.CheckmarkCircle;
+
+    return (
+        <BillingBanner
+            title={title}
+            subtitle={subtitle}
+            icon={iconAsset}
+            brickRoadIndicator={isError ? CONST.BRICK_ROAD_INDICATOR_STATUS.ERROR : CONST.BRICK_ROAD_INDICATOR_STATUS.INFO}
+            subtitleStyle={styles.textSupporting}
+            style={styles.hoveredComponentBG}
+            rightIcon={rightIcon}
+            onRightIconPress={onRightIconPress}
+            rightIconAccessibilityLabel={rightIconAccessibilityLabel}
+        />
+    );
+}
+
+SubscriptionBillingBanner.displayName = 'SubscriptionBillingBanner';
+
+export default SubscriptionBillingBanner;
diff --git a/src/pages/settings/Subscription/CardSection/BillingBanner/TrialEndedBillingBanner.tsx b/src/pages/settings/Subscription/CardSection/BillingBanner/TrialEndedBillingBanner.tsx
new file mode 100644
index 000000000000..67dd37f7a844
--- /dev/null
+++ b/src/pages/settings/Subscription/CardSection/BillingBanner/TrialEndedBillingBanner.tsx
@@ -0,0 +1,25 @@
+import React from 'react';
+import * as Illustrations from '@components/Icon/Illustrations';
+import useLocalize from '@hooks/useLocalize';
+import * as SubscriptionUtils from '@libs/SubscriptionUtils';
+import BillingBanner from './BillingBanner';
+
+function TrialEndedBillingBanner() {
+    const {translate} = useLocalize();
+
+    if (SubscriptionUtils.doesUserHavePaymentCardAdded()) {
+        return null;
+    }
+
+    return (
+        <BillingBanner
+            title={translate('subscription.billingBanner.trialEnded.title')}
+            subtitle={translate('subscription.billingBanner.trialEnded.subtitle')}
+            icon={Illustrations.Tire}
+        />
+    );
+}
+
+TrialEndedBillingBanner.displayName = 'TrialEndedBillingBanner';
+
+export default TrialEndedBillingBanner;
diff --git a/src/pages/settings/Subscription/CardSection/BillingBanner/TrialStartedBillingBanner.tsx b/src/pages/settings/Subscription/CardSection/BillingBanner/TrialStartedBillingBanner.tsx
new file mode 100644
index 000000000000..608a4a861c6a
--- /dev/null
+++ b/src/pages/settings/Subscription/CardSection/BillingBanner/TrialStartedBillingBanner.tsx
@@ -0,0 +1,23 @@
+import React from 'react';
+import * as Illustrations from '@components/Icon/Illustrations';
+import useLocalize from '@hooks/useLocalize';
+import * as SubscriptionUtils from '@libs/SubscriptionUtils';
+import BillingBanner from './BillingBanner';
+
+function TrialStartedBillingBanner() {
+    const {translate} = useLocalize();
+
+    const subtitle = !SubscriptionUtils.doesUserHavePaymentCardAdded() ? translate('subscription.billingBanner.trialStarted.subtitle') : '';
+
+    return (
+        <BillingBanner
+            title={translate('subscription.billingBanner.trialStarted.title', {numOfDays: SubscriptionUtils.calculateRemainingFreeTrialDays()})}
+            subtitle={subtitle}
+            icon={Illustrations.TreasureChest}
+        />
+    );
+}
+
+TrialStartedBillingBanner.displayName = 'TrialStartedBillingBanner';
+
+export default TrialStartedBillingBanner;
diff --git a/src/pages/settings/Subscription/CardSection/CardSection.tsx b/src/pages/settings/Subscription/CardSection/CardSection.tsx
new file mode 100644
index 000000000000..797b28de4107
--- /dev/null
+++ b/src/pages/settings/Subscription/CardSection/CardSection.tsx
@@ -0,0 +1,220 @@
+import React, {useCallback, useEffect, useMemo, useState} from 'react';
+import {View} from 'react-native';
+import {useOnyx} from 'react-native-onyx';
+import Button from '@components/Button';
+import ConfirmModal from '@components/ConfirmModal';
+import Icon from '@components/Icon';
+import * as Expensicons from '@components/Icon/Expensicons';
+import MenuItem from '@components/MenuItem';
+import Section from '@components/Section';
+import Text from '@components/Text';
+import useLocalize from '@hooks/useLocalize';
+import useNetwork from '@hooks/useNetwork';
+import useSubscriptionPlan from '@hooks/useSubscriptionPlan';
+import useTheme from '@hooks/useTheme';
+import useThemeStyles from '@hooks/useThemeStyles';
+import * as User from '@libs/actions/User';
+import DateUtils from '@libs/DateUtils';
+import Navigation from '@libs/Navigation/Navigation';
+import {getPaymentMethodDescription} from '@libs/PaymentUtils';
+import * as SearchUtils from '@libs/SearchUtils';
+import * as SubscriptionUtils from '@libs/SubscriptionUtils';
+import * as PaymentMethods from '@userActions/PaymentMethods';
+import * as Subscription from '@userActions/Subscription';
+import CONST from '@src/CONST';
+import ONYXKEYS from '@src/ONYXKEYS';
+import ROUTES from '@src/ROUTES';
+import {isEmptyObject} from '@src/types/utils/EmptyObject';
+import PreTrialBillingBanner from './BillingBanner/PreTrialBillingBanner';
+import SubscriptionBillingBanner from './BillingBanner/SubscriptionBillingBanner';
+import TrialEndedBillingBanner from './BillingBanner/TrialEndedBillingBanner';
+import TrialStartedBillingBanner from './BillingBanner/TrialStartedBillingBanner';
+import CardSectionActions from './CardSectionActions';
+import CardSectionDataEmpty from './CardSectionDataEmpty';
+import RequestEarlyCancellationMenuItem from './RequestEarlyCancellationMenuItem';
+import type {BillingStatusResult} from './utils';
+import CardSectionUtils from './utils';
+
+function CardSection() {
+    const [isRequestRefundModalVisible, setIsRequestRefundModalVisible] = useState(false);
+    const {translate, preferredLocale} = useLocalize();
+    const styles = useThemeStyles();
+    const theme = useTheme();
+    const [account] = useOnyx(ONYXKEYS.ACCOUNT);
+    const [privateSubscription] = useOnyx(ONYXKEYS.NVP_PRIVATE_SUBSCRIPTION);
+    const [privateStripeCustomerID] = useOnyx(ONYXKEYS.NVP_PRIVATE_STRIPE_CUSTOMER_ID);
+    const [authenticationLink] = useOnyx(ONYXKEYS.VERIFY_3DS_SUBSCRIPTION);
+    const [session] = useOnyx(ONYXKEYS.SESSION);
+    const [fundList] = useOnyx(ONYXKEYS.FUND_LIST);
+    const subscriptionPlan = useSubscriptionPlan();
+    const [subscriptionRetryBillingStatusPending] = useOnyx(ONYXKEYS.SUBSCRIPTION_RETRY_BILLING_STATUS_PENDING);
+    const [subscriptionRetryBillingStatusSuccessful] = useOnyx(ONYXKEYS.SUBSCRIPTION_RETRY_BILLING_STATUS_SUCCESSFUL);
+    const [subscriptionRetryBillingStatusFailed] = useOnyx(ONYXKEYS.SUBSCRIPTION_RETRY_BILLING_STATUS_FAILED);
+    const {isOffline} = useNetwork();
+    const defaultCard = useMemo(() => Object.values(fundList ?? {}).find((card) => card.accountData?.additionalData?.isBillingCard), [fundList]);
+    const cardMonth = useMemo(() => DateUtils.getMonthNames(preferredLocale)[(defaultCard?.accountData?.cardMonth ?? 1) - 1], [defaultCard?.accountData?.cardMonth, preferredLocale]);
+
+    const requestRefund = useCallback(() => {
+        User.requestRefund();
+        setIsRequestRefundModalVisible(false);
+        Navigation.resetToHome();
+    }, []);
+
+    const [billingStatus, setBillingStatus] = useState<BillingStatusResult | undefined>(CardSectionUtils.getBillingStatus(translate, defaultCard?.accountData ?? {}));
+
+    const nextPaymentDate = !isEmptyObject(privateSubscription) ? CardSectionUtils.getNextBillingDate() : undefined;
+
+    const sectionSubtitle = defaultCard && !!nextPaymentDate ? translate('subscription.cardSection.cardNextPayment', {nextPaymentDate}) : translate('subscription.cardSection.subtitle');
+
+    useEffect(() => {
+        setBillingStatus(CardSectionUtils.getBillingStatus(translate, defaultCard?.accountData ?? {}));
+    }, [subscriptionRetryBillingStatusPending, subscriptionRetryBillingStatusSuccessful, subscriptionRetryBillingStatusFailed, translate, defaultCard?.accountData, privateStripeCustomerID]);
+
+    const handleRetryPayment = () => {
+        Subscription.clearOutstandingBalance();
+    };
+
+    useEffect(() => {
+        if (!authenticationLink || privateStripeCustomerID?.status !== CONST.STRIPE_GBP_AUTH_STATUSES.CARD_AUTHENTICATION_REQUIRED) {
+            return;
+        }
+        Navigation.navigate(ROUTES.SETTINGS_SUBSCRIPTION_ADD_PAYMENT_CARD);
+    }, [authenticationLink, privateStripeCustomerID?.status]);
+
+    const handleAuthenticatePayment = () => {
+        PaymentMethods.verifySetupIntent(session?.accountID ?? -1, false);
+    };
+
+    const handleBillingBannerClose = () => {
+        setBillingStatus(undefined);
+    };
+
+    let BillingBanner: React.ReactNode | undefined;
+    if (CardSectionUtils.shouldShowPreTrialBillingBanner()) {
+        BillingBanner = <PreTrialBillingBanner />;
+    } else if (SubscriptionUtils.isUserOnFreeTrial()) {
+        BillingBanner = <TrialStartedBillingBanner />;
+    } else if (SubscriptionUtils.hasUserFreeTrialEnded()) {
+        BillingBanner = <TrialEndedBillingBanner />;
+    }
+    if (billingStatus) {
+        BillingBanner = (
+            <SubscriptionBillingBanner
+                title={billingStatus.title}
+                subtitle={billingStatus.subtitle}
+                isError={billingStatus.isError}
+                icon={billingStatus.icon}
+                rightIcon={billingStatus.rightIcon}
+                onRightIconPress={handleBillingBannerClose}
+                rightIconAccessibilityLabel={translate('common.close')}
+            />
+        );
+    }
+
+    return (
+        <>
+            <Section
+                title={translate('subscription.cardSection.title')}
+                subtitle={sectionSubtitle}
+                isCentralPane
+                titleStyles={styles.textStrong}
+                subtitleMuted
+                banner={BillingBanner}
+            >
+                <View style={[styles.mt8, styles.mb3, styles.flexRow]}>
+                    {!isEmptyObject(defaultCard?.accountData) && (
+                        <View style={[styles.flexRow, styles.flex1, styles.gap3]}>
+                            <Icon
+                                src={Expensicons.CreditCard}
+                                additionalStyles={styles.subscriptionAddedCardIcon}
+                                fill={theme.icon}
+                                medium
+                            />
+                            <View style={styles.flex1}>
+                                <Text style={styles.textStrong}>{getPaymentMethodDescription(defaultCard?.accountType, defaultCard?.accountData)}</Text>
+                                <Text style={styles.mutedNormalTextLabel}>
+                                    {translate('subscription.cardSection.cardInfo', {
+                                        name: defaultCard?.accountData?.addressName,
+                                        expiration: `${cardMonth} ${defaultCard?.accountData?.cardYear}`,
+                                        currency: defaultCard?.accountData?.currency,
+                                    })}
+                                </Text>
+                            </View>
+                            <CardSectionActions />
+                        </View>
+                    )}
+                </View>
+
+                <View style={styles.mb3}>{isEmptyObject(defaultCard?.accountData) && <CardSectionDataEmpty />}</View>
+                {billingStatus?.isRetryAvailable !== undefined && (
+                    <Button
+                        text={translate('subscription.cardSection.retryPaymentButton')}
+                        isDisabled={isOffline || !billingStatus?.isRetryAvailable}
+                        isLoading={subscriptionRetryBillingStatusPending}
+                        onPress={handleRetryPayment}
+                        style={[styles.w100, styles.mb3]}
+                        large
+                    />
+                )}
+                {SubscriptionUtils.hasCardAuthenticatedError() && (
+                    <Button
+                        text={translate('subscription.cardSection.authenticatePayment')}
+                        isDisabled={isOffline || !billingStatus?.isAuthenticationRequired}
+                        isLoading={subscriptionRetryBillingStatusPending}
+                        onPress={handleAuthenticatePayment}
+                        style={[styles.w100, styles.mt5]}
+                        large
+                    />
+                )}
+
+                {!!account?.hasPurchases && (
+                    <MenuItem
+                        shouldShowRightIcon
+                        icon={Expensicons.History}
+                        wrapperStyle={styles.sectionMenuItemTopDescription}
+                        title={translate('subscription.cardSection.viewPaymentHistory')}
+                        titleStyle={styles.textStrong}
+                        onPress={() => Navigation.navigate(ROUTES.SEARCH_CENTRAL_PANE.getRoute({query: SearchUtils.buildCannedSearchQuery()}))}
+                        hoverAndPressStyle={styles.hoveredComponentBG}
+                    />
+                )}
+
+                {!!(subscriptionPlan && account?.isEligibleForRefund) && (
+                    <MenuItem
+                        shouldShowRightIcon
+                        icon={Expensicons.Bill}
+                        wrapperStyle={styles.sectionMenuItemTopDescription}
+                        title={translate('subscription.cardSection.requestRefund')}
+                        titleStyle={styles.textStrong}
+                        disabled={isOffline}
+                        onPress={() => setIsRequestRefundModalVisible(true)}
+                    />
+                )}
+
+                {privateSubscription?.type === CONST.SUBSCRIPTION.TYPE.ANNUAL && <RequestEarlyCancellationMenuItem />}
+            </Section>
+
+            {account?.isEligibleForRefund && (
+                <ConfirmModal
+                    title={translate('subscription.cardSection.requestRefund')}
+                    isVisible={isRequestRefundModalVisible}
+                    onConfirm={requestRefund}
+                    onCancel={() => setIsRequestRefundModalVisible(false)}
+                    prompt={
+                        <>
+                            <Text style={styles.mb4}>{translate('subscription.cardSection.requestRefundModal.phrase1')}</Text>
+                            <Text>{translate('subscription.cardSection.requestRefundModal.phrase2')}</Text>
+                        </>
+                    }
+                    confirmText={translate('subscription.cardSection.requestRefundModal.confirm')}
+                    cancelText={translate('common.cancel')}
+                    danger
+                />
+            )}
+        </>
+    );
+}
+
+CardSection.displayName = 'CardSection';
+
+export default CardSection;
diff --git a/src/pages/settings/Subscription/CardSection/CardSectionActions/index.native.tsx b/src/pages/settings/Subscription/CardSection/CardSectionActions/index.native.tsx
new file mode 100644
index 000000000000..853180c08eb6
--- /dev/null
+++ b/src/pages/settings/Subscription/CardSection/CardSectionActions/index.native.tsx
@@ -0,0 +1,7 @@
+function CardSectionActions() {
+    return null; // We need to disable actions on mobile
+}
+
+CardSectionActions.displayName = 'CardSectionActions';
+
+export default CardSectionActions;
diff --git a/src/pages/settings/Subscription/CardSection/CardSectionActions/index.tsx b/src/pages/settings/Subscription/CardSection/CardSectionActions/index.tsx
new file mode 100644
index 000000000000..663ea38f81d7
--- /dev/null
+++ b/src/pages/settings/Subscription/CardSection/CardSectionActions/index.tsx
@@ -0,0 +1,67 @@
+import React, {useCallback, useMemo, useRef, useState} from 'react';
+import {View} from 'react-native';
+import * as Expensicons from '@components/Icon/Expensicons';
+import ThreeDotsMenu from '@components/ThreeDotsMenu';
+import type ThreeDotsMenuProps from '@components/ThreeDotsMenu/types';
+import useLocalize from '@hooks/useLocalize';
+import useResponsiveLayout from '@hooks/useResponsiveLayout';
+import Navigation from '@navigation/Navigation';
+import type {AnchorPosition} from '@styles/index';
+import CONST from '@src/CONST';
+import ROUTES from '@src/ROUTES';
+
+const anchorAlignment = {
+    horizontal: CONST.MODAL.ANCHOR_ORIGIN_HORIZONTAL.RIGHT,
+    vertical: CONST.MODAL.ANCHOR_ORIGIN_VERTICAL.TOP,
+};
+
+function CardSectionActions() {
+    const {shouldUseNarrowLayout} = useResponsiveLayout();
+    const {translate} = useLocalize();
+    const [threeDotsMenuPosition, setThreeDotsMenuPosition] = useState<AnchorPosition>({horizontal: 0, vertical: 0});
+    const threeDotsMenuContainerRef = useRef<View>(null);
+
+    const overflowMenu: ThreeDotsMenuProps['menuItems'] = useMemo(
+        () => [
+            {
+                icon: Expensicons.CreditCard,
+                text: translate('subscription.cardSection.changeCard'),
+                onSelected: () => Navigation.navigate(ROUTES.SETTINGS_SUBSCRIPTION_ADD_PAYMENT_CARD),
+            },
+            {
+                icon: Expensicons.MoneyCircle,
+                text: translate('subscription.cardSection.changeCurrency'),
+                onSelected: () => Navigation.navigate(ROUTES.SETTINGS_SUBSCRIPTION_CHANGE_BILLING_CURRENCY),
+            },
+        ],
+        [translate],
+    );
+
+    const calculateAndSetThreeDotsMenuPosition = useCallback(() => {
+        if (shouldUseNarrowLayout) {
+            return;
+        }
+        threeDotsMenuContainerRef.current?.measureInWindow((x, y, width, height) => {
+            setThreeDotsMenuPosition({
+                horizontal: x + width,
+                vertical: y + height,
+            });
+        });
+    }, [shouldUseNarrowLayout]);
+
+    return (
+        <View ref={threeDotsMenuContainerRef}>
+            <ThreeDotsMenu
+                onIconPress={calculateAndSetThreeDotsMenuPosition}
+                menuItems={overflowMenu}
+                anchorPosition={threeDotsMenuPosition}
+                anchorAlignment={anchorAlignment}
+                shouldOverlay
+            />
+        </View>
+    );
+}
+
+CardSectionActions.displayName = 'CardSectionActions';
+
+export default CardSectionActions;
diff --git a/src/pages/settings/Subscription/CardSection/CardSectionDataEmpty/index.native.tsx b/src/pages/settings/Subscription/CardSection/CardSectionDataEmpty/index.native.tsx
new file mode 100644
index 000000000000..bbec42d940ee
--- /dev/null
+++ b/src/pages/settings/Subscription/CardSection/CardSectionDataEmpty/index.native.tsx
@@ -0,0 +1,30 @@
+import React from 'react';
+import {View} from 'react-native';
+import Icon from '@components/Icon';
+import * as Expensicons from '@components/Icon/Expensicons';
+import Text from '@components/Text';
+import useLocalize from '@hooks/useLocalize';
+import useTheme from '@hooks/useTheme';
+import useThemeStyles from '@hooks/useThemeStyles';
+
+function CardSectionDataEmpty() {
+    const {translate} = useLocalize();
+    const styles = useThemeStyles();
+    const theme = useTheme();
+
+    return (
+        <View style={[styles.flexRow, styles.alignItemsCenter, styles.gap3]}>
+            <Icon
+                src={Expensicons.CreditCardExclamation}
+                additionalStyles={styles.subscriptionCardIcon}
+                fill={theme.icon}
+                medium
+            />
+            <Text style={[styles.mutedNormalTextLabel, styles.textStrong]}>{translate('subscription.cardSection.cardNotFound')}</Text>
+        </View>
+    );
+}
+
+CardSectionDataEmpty.displayName = 'CardSectionDataEmpty';
+
+export default CardSectionDataEmpty;
diff --git a/src/pages/settings/Subscription/CardSection/CardSectionDataEmpty/index.tsx b/src/pages/settings/Subscription/CardSection/CardSectionDataEmpty/index.tsx
new file mode 100644
index 000000000000..627556e7b5bd
--- /dev/null
+++ b/src/pages/settings/Subscription/CardSection/CardSectionDataEmpty/index.tsx
@@ -0,0 +1,29 @@
+import React, {useCallback} from 'react';
+import Button from '@components/Button';
+import useLocalize from '@hooks/useLocalize';
+import useThemeStyles from '@hooks/useThemeStyles';
+import Navigation from '@navigation/Navigation';
+import ROUTES from '@src/ROUTES';
+
+function CardSectionDataEmpty() {
+    const {translate} = useLocalize();
+    const styles = useThemeStyles();
+
+    const openAddPaymentCardScreen = useCallback(() => {
+        Navigation.navigate(ROUTES.SETTINGS_SUBSCRIPTION_ADD_PAYMENT_CARD);
+    }, []);
+
+    return (
+        <Button
+            text={translate('subscription.cardSection.addCardButton')}
+            onPress={openAddPaymentCardScreen}
+            style={styles.w100}
+            success
+            large
+        />
+    );
+}
+
+CardSectionDataEmpty.displayName = 'CardSectionDataEmpty';
+
+export default CardSectionDataEmpty;
diff --git a/src/pages/settings/Subscription/CardSection/RequestEarlyCancellationMenuItem/index.native.tsx b/src/pages/settings/Subscription/CardSection/RequestEarlyCancellationMenuItem/index.native.tsx
new file mode 100644
index 000000000000..0f9b55ba306e
--- /dev/null
+++ b/src/pages/settings/Subscription/CardSection/RequestEarlyCancellationMenuItem/index.native.tsx
@@ -0,0 +1,5 @@
+function RequestEarlyCancellationMenuItem() {
+    return null;
+}
+
+export default RequestEarlyCancellationMenuItem;
diff --git a/src/pages/settings/Subscription/CardSection/RequestEarlyCancellationMenuItem/index.tsx b/src/pages/settings/Subscription/CardSection/RequestEarlyCancellationMenuItem/index.tsx
new file mode 100644
index 000000000000..9fbb48e51605
--- /dev/null
+++ b/src/pages/settings/Subscription/CardSection/RequestEarlyCancellationMenuItem/index.tsx
@@ -0,0 +1,29 @@
+import React from 'react';
+import * as Expensicons from '@components/Icon/Expensicons';
+import MenuItem from '@components/MenuItem';
+import useLocalize from '@hooks/useLocalize';
+import useTheme from '@hooks/useTheme';
+import useThemeStyles from '@hooks/useThemeStyles';
+import Navigation from '@libs/Navigation/Navigation';
+import ROUTES from '@src/ROUTES';
+
+function RequestEarlyCancellationMenuItem() {
+    const {translate} = useLocalize();
+    const theme = useTheme();
+    const styles = useThemeStyles();
+
+    return (
+        <MenuItem
+            title={translate('subscription.requestEarlyCancellation.title')}
+            icon={Expensicons.CalendarSolid}
+            iconFill={theme.success}
+            shouldShowRightIcon
+            wrapperStyle={styles.sectionMenuItemTopDescription}
+            onPress={() => Navigation.navigate(ROUTES.SETTINGS_SUBSCRIPTION_REQUEST_EARLY_CANCELLATION)}
+        />
+    );
+}
+
+RequestEarlyCancellationMenuItem.displayName = 'RequestEarlyCancellationMenuItem';
+
+export default RequestEarlyCancellationMenuItem;
diff --git a/src/pages/settings/Subscription/CardSection/utils.ts b/src/pages/settings/Subscription/CardSection/utils.ts
new file mode 100644
index 000000000000..48999f1bb7cb
--- /dev/null
+++ b/src/pages/settings/Subscription/CardSection/utils.ts
@@ -0,0 +1,154 @@
+import {addMonths, format, fromUnixTime, startOfMonth} from 'date-fns';
+import * as Expensicons from '@components/Icon/Expensicons';
+import * as Illustrations from '@components/Icon/Illustrations';
+import DateUtils from '@libs/DateUtils';
+import type {Phrase, PhraseParameters} from '@libs/Localize';
+import * as SubscriptionUtils from '@libs/SubscriptionUtils';
+import CONST from '@src/CONST';
+import type {TranslationPaths} from '@src/languages/types';
+import type {AccountData} from '@src/types/onyx/Fund';
+import type IconAsset from '@src/types/utils/IconAsset';
+
+type BillingStatusResult = {
+    title: string;
+    subtitle: string;
+    isError: boolean;
+    isRetryAvailable?: boolean;
+    isAddButtonDark?: boolean;
+    isAuthenticationRequired?: boolean;
+    icon?: IconAsset;
+    rightIcon?: IconAsset;
+};
+
+function getBillingStatus(
+    translate: <TKey extends TranslationPaths>(phraseKey: TKey, ...phraseParameters: PhraseParameters<Phrase<TKey>>) => string,
+    accountData?: AccountData,
+): BillingStatusResult | undefined {
+    const cardEnding = (accountData?.cardNumber ?? '')?.slice(-4);
+
+    const amountOwed = SubscriptionUtils.getAmountOwed();
+
+    const subscriptionStatus = SubscriptionUtils.getSubscriptionStatus();
+
+    const endDate = SubscriptionUtils.getOverdueGracePeriodDate();
+
+    const endDateFormatted = endDate ? DateUtils.formatWithUTCTimeZone(fromUnixTime(endDate).toUTCString(), CONST.DATE.MONTH_DAY_YEAR_FORMAT) : null;
+
+    const isCurrentCardExpired = DateUtils.isCardExpired(accountData?.cardMonth ?? 0, accountData?.cardYear ?? 0);
+
+    switch (subscriptionStatus?.status) {
+        case SubscriptionUtils.PAYMENT_STATUS.POLICY_OWNER_WITH_AMOUNT_OWED:
+            return {
+                title: translate('subscription.billingBanner.policyOwnerAmountOwed.title'),
+                subtitle: translate('subscription.billingBanner.policyOwnerAmountOwed.subtitle', {date: endDateFormatted}),
+                isError: true,
+                isRetryAvailable: true,
+            };
+
+        case SubscriptionUtils.PAYMENT_STATUS.POLICY_OWNER_WITH_AMOUNT_OWED_OVERDUE:
+            return {
+                title: translate('subscription.billingBanner.policyOwnerAmountOwedOverdue.title'),
+                subtitle: translate('subscription.billingBanner.policyOwnerAmountOwedOverdue.subtitle'),
+                isError: true,
+            };
+
+        case SubscriptionUtils.PAYMENT_STATUS.OWNER_OF_POLICY_UNDER_INVOICING:
+            return {
+                title: translate('subscription.billingBanner.policyOwnerUnderInvoicing.title'),
+                subtitle: translate('subscription.billingBanner.policyOwnerUnderInvoicing.subtitle', {date: endDateFormatted}),
+                isError: true,
+                isAddButtonDark: true,
+            };
+
+        case SubscriptionUtils.PAYMENT_STATUS.OWNER_OF_POLICY_UNDER_INVOICING_OVERDUE:
+            return {
+                title: translate('subscription.billingBanner.policyOwnerUnderInvoicingOverdue.title'),
+                subtitle: translate('subscription.billingBanner.policyOwnerUnderInvoicingOverdue.subtitle'),
+                isError: true,
+                isAddButtonDark: true,
+            };
+
+        case SubscriptionUtils.PAYMENT_STATUS.BILLING_DISPUTE_PENDING:
+            return {
+                title: translate('subscription.billingBanner.billingDisputePending.title'),
+                subtitle: translate('subscription.billingBanner.billingDisputePending.subtitle', {amountOwed, cardEnding}),
+                isError: true,
+                isRetryAvailable: false,
+            };
+
+        case SubscriptionUtils.PAYMENT_STATUS.CARD_AUTHENTICATION_REQUIRED:
+            return {
+                title: translate('subscription.billingBanner.cardAuthenticationRequired.title'),
+                subtitle: translate('subscription.billingBanner.cardAuthenticationRequired.subtitle', {cardEnding}),
+                isError: true,
+                isAuthenticationRequired: true,
+            };
+
+        case SubscriptionUtils.PAYMENT_STATUS.INSUFFICIENT_FUNDS:
+            return {
+                title: translate('subscription.billingBanner.insufficientFunds.title'),
+                subtitle: translate('subscription.billingBanner.insufficientFunds.subtitle', {amountOwed}),
+                isError: true,
+                isRetryAvailable: true,
+            };
+
+        case SubscriptionUtils.PAYMENT_STATUS.CARD_EXPIRED:
+            return {
+                title: translate('subscription.billingBanner.cardExpired.title'),
+                subtitle: translate('subscription.billingBanner.cardExpired.subtitle', {amountOwed}),
+                isError: true,
+                isRetryAvailable: !isCurrentCardExpired,
+            };
+
+        case SubscriptionUtils.PAYMENT_STATUS.CARD_EXPIRE_SOON:
+            return {
+                title: translate('subscription.billingBanner.cardExpireSoon.title'),
+                subtitle: translate('subscription.billingBanner.cardExpireSoon.subtitle'),
+                isError: false,
+                icon: Illustrations.CreditCardEyes,
+            };
+
+        case SubscriptionUtils.PAYMENT_STATUS.RETRY_BILLING_SUCCESS:
+            return {
+                title: translate('subscription.billingBanner.retryBillingSuccess.title'),
+                subtitle: translate('subscription.billingBanner.retryBillingSuccess.subtitle'),
+                isError: false,
+                rightIcon: Expensicons.Close,
+            };
+
+        case SubscriptionUtils.PAYMENT_STATUS.RETRY_BILLING_ERROR:
+            return {
+                title: translate('subscription.billingBanner.retryBillingError.title'),
+                subtitle: translate('subscription.billingBanner.retryBillingError.subtitle'),
+                isError: true,
+                isRetryAvailable: false,
+            };
+
+        default:
+            return undefined;
+    }
+}
+
+/**
+ * Get the next billing date.
+ *
+ * @returns - The next billing date in 'yyyy-MM-dd' format.
+ */
+function getNextBillingDate(): string {
+    const today = new Date();
+
+    const nextBillingDate = startOfMonth(addMonths(today, 1));
+
+    return format(nextBillingDate, CONST.DATE.MONTH_DAY_YEAR_FORMAT);
+}
+
+function shouldShowPreTrialBillingBanner(): boolean {
+    return !SubscriptionUtils.isUserOnFreeTrial() && !SubscriptionUtils.hasUserFreeTrialEnded();
+}
+
+export default {
+    getBillingStatus,
+    shouldShowPreTrialBillingBanner,
+    getNextBillingDate,
+};
+export type {BillingStatusResult};
diff --git a/src/pages/settings/Subscription/DisableAutoRenewSurveyPage/index.native.tsx b/src/pages/settings/Subscription/DisableAutoRenewSurveyPage/index.native.tsx
new file mode 100644
index 000000000000..9d197d2e43b0
--- /dev/null
+++ b/src/pages/settings/Subscription/DisableAutoRenewSurveyPage/index.native.tsx
@@ -0,0 +1,19 @@
+import React from 'react';
+import FullPageNotFoundView from '@components/BlockingViews/FullPageNotFoundView';
+import ScreenWrapper from '@components/ScreenWrapper';
+
+function DisableAutoRenewSurveyPage() {
+    return (
+        <ScreenWrapper
+            testID={DisableAutoRenewSurveyPage.displayName}
+            includeSafeAreaPaddingBottom
+            shouldEnableMaxHeight
+        >
+            <FullPageNotFoundView shouldShow />
+        </ScreenWrapper>
+    );
+}
+
+DisableAutoRenewSurveyPage.displayName = 'DisableAutoRenewSurveyPage';
+
+export default DisableAutoRenewSurveyPage;
diff --git a/src/pages/settings/Subscription/DisableAutoRenewSurveyPage/index.tsx b/src/pages/settings/Subscription/DisableAutoRenewSurveyPage/index.tsx
new file mode 100644
index 000000000000..655658363e87
--- /dev/null
+++ b/src/pages/settings/Subscription/DisableAutoRenewSurveyPage/index.tsx
@@ -0,0 +1,48 @@
+import React from 'react';
+import FeedbackSurvey from '@components/FeedbackSurvey';
+import HeaderWithBackButton from '@components/HeaderWithBackButton';
+import ScreenWrapper from '@components/ScreenWrapper';
+import ScrollView from '@components/ScrollView';
+import useLocalize from '@hooks/useLocalize';
+import useThemeStyles from '@hooks/useThemeStyles';
+import Navigation from '@libs/Navigation/Navigation';
+import * as Subscription from '@userActions/Subscription';
+import type {FeedbackSurveyOptionID} from '@src/CONST';
+import ONYXKEYS from '@src/ONYXKEYS';
+
+function DisableAutoRenewSurveyPage() {
+    const {translate} = useLocalize();
+    const styles = useThemeStyles();
+
+    const handleSubmit = (key: FeedbackSurveyOptionID, additionalNote?: string) => {
+        Subscription.updateSubscriptionAutoRenew(false, key, additionalNote);
+        Navigation.goBack();
+    };
+
+    return (
+        <ScreenWrapper
+            testID={DisableAutoRenewSurveyPage.displayName}
+            includeSafeAreaPaddingBottom={false}
+            shouldEnablePickerAvoiding={false}
+            shouldEnableMaxHeight
+        >
+            <HeaderWithBackButton
+                title={translate('subscription.subscriptionSettings.disableAutoRenew')}
+                onBackButtonPress={Navigation.goBack}
+            />
+            <ScrollView contentContainerStyle={[styles.flexGrow1, styles.pt3]}>
+                <FeedbackSurvey
+                    formID={ONYXKEYS.FORMS.DISABLE_AUTO_RENEW_SURVEY_FORM}
+                    title={translate('subscription.subscriptionSettings.helpUsImprove')}
+                    description={translate('subscription.subscriptionSettings.whatsMainReason')}
+                    onSubmit={handleSubmit}
+                    optionRowStyles={styles.flex1}
+                />
+            </ScrollView>
+        </ScreenWrapper>
+    );
+}
+
+DisableAutoRenewSurveyPage.displayName = 'DisableAutoRenewSurveyPage';
+
+export default DisableAutoRenewSurveyPage;
diff --git a/src/pages/settings/Subscription/PaymentCard/ChangeBillingCurrency/index.native.tsx b/src/pages/settings/Subscription/PaymentCard/ChangeBillingCurrency/index.native.tsx
new file mode 100644
index 000000000000..b7b34d3d4ce9
--- /dev/null
+++ b/src/pages/settings/Subscription/PaymentCard/ChangeBillingCurrency/index.native.tsx
@@ -0,0 +1,19 @@
+import React from 'react';
+import FullPageNotFoundView from '@components/BlockingViews/FullPageNotFoundView';
+import ScreenWrapper from '@components/ScreenWrapper';
+
+function ChangeBillingCurrency() {
+    return (
+        <ScreenWrapper
+            testID={ChangeBillingCurrency.displayName}
+            includeSafeAreaPaddingBottom
+            shouldEnableMaxHeight
+        >
+            <FullPageNotFoundView shouldShow />
+        </ScreenWrapper>
+    );
+}
+
+ChangeBillingCurrency.displayName = 'ChangeBillingCurrency';
+
+export default ChangeBillingCurrency;
diff --git a/src/pages/settings/Subscription/PaymentCard/ChangeBillingCurrency/index.tsx b/src/pages/settings/Subscription/PaymentCard/ChangeBillingCurrency/index.tsx
new file mode 100644
index 000000000000..5cb4e10c735f
--- /dev/null
+++ b/src/pages/settings/Subscription/PaymentCard/ChangeBillingCurrency/index.tsx
@@ -0,0 +1,59 @@
+import React, {useCallback, useEffect, useMemo} from 'react';
+import {View} from 'react-native';
+import {useOnyx} from 'react-native-onyx';
+import type {ValueOf} from 'type-fest';
+import PaymentCardChangeCurrencyForm from '@components/AddPaymentCard/PaymentCardChangeCurrencyForm';
+import type {FormOnyxValues} from '@components/Form/types';
+import HeaderWithBackButton from '@components/HeaderWithBackButton';
+import ScreenWrapper from '@components/ScreenWrapper';
+import useLocalize from '@hooks/useLocalize';
+import usePrevious from '@hooks/usePrevious';
+import useThemeStyles from '@hooks/useThemeStyles';
+import Navigation from '@navigation/Navigation';
+import * as PaymentMethods from '@userActions/PaymentMethods';
+import CONST from '@src/CONST';
+import ONYXKEYS from '@src/ONYXKEYS';
+
+function ChangeBillingCurrency() {
+    const styles = useThemeStyles();
+    const {translate} = useLocalize();
+    const [fundList] = useOnyx(ONYXKEYS.FUND_LIST);
+    const defaultCard = useMemo(() => Object.values(fundList ?? {}).find((card) => card.accountData?.additionalData?.isBillingCard), [fundList]);
+
+    const [formData] = useOnyx(ONYXKEYS.FORMS.CHANGE_BILLING_CURRENCY_FORM);
+    const formDataComplete = formData?.isLoading === false && !formData.errors;
+    const prevIsLoading = usePrevious(formData?.isLoading);
+    const prevFormDataComplete = usePrevious(formDataComplete);
+
+    useEffect(() => {
+        if (!formDataComplete || prevFormDataComplete || !prevIsLoading) {
+            return;
+        }
+        Navigation.goBack();
+    }, [formDataComplete, prevFormDataComplete, prevIsLoading]);
+
+    const changeBillingCurrency = useCallback((currency?: ValueOf<typeof CONST.PAYMENT_CARD_CURRENCY>, values?: FormOnyxValues<typeof ONYXKEYS.FORMS.CHANGE_BILLING_CURRENCY_FORM>) => {
+        if (!values?.securityCode) {
+            Navigation.goBack();
+            return;
+        }
+        PaymentMethods.updateBillingCurrency(currency ?? CONST.PAYMENT_CARD_CURRENCY.USD, values.securityCode);
+    }, []);
+
+    return (
+        <ScreenWrapper testID={ChangeBillingCurrency.displayName}>
+            <HeaderWithBackButton title={translate('billingCurrency.changeBillingCurrency')} />
+            <View style={styles.containerWithSpaceBetween}>
+                <PaymentCardChangeCurrencyForm
+                    isSecurityCodeRequired
+                    changeBillingCurrency={changeBillingCurrency}
+                    initialCurrency={defaultCard?.accountData?.currency}
+                />
+            </View>
+        </ScreenWrapper>
+    );
+}
+
+ChangeBillingCurrency.displayName = 'ChangeBillingCurrency';
+
+export default ChangeBillingCurrency;
diff --git a/src/pages/settings/Subscription/PaymentCard/index.native.tsx b/src/pages/settings/Subscription/PaymentCard/index.native.tsx
new file mode 100644
index 000000000000..bcb1b8b715ae
--- /dev/null
+++ b/src/pages/settings/Subscription/PaymentCard/index.native.tsx
@@ -0,0 +1,19 @@
+import React from 'react';
+import FullPageNotFoundView from '@components/BlockingViews/FullPageNotFoundView';
+import ScreenWrapper from '@components/ScreenWrapper';
+
+function AddPaymentCard() {
+    return (
+        <ScreenWrapper
+            testID={AddPaymentCard.displayName}
+            includeSafeAreaPaddingBottom
+            shouldEnableMaxHeight
+        >
+            <FullPageNotFoundView shouldShow />
+        </ScreenWrapper>
+    );
+}
+
+AddPaymentCard.displayName = 'AddPaymentCard';
+
+export default AddPaymentCard;
diff --git a/src/pages/settings/Subscription/PaymentCard/index.tsx b/src/pages/settings/Subscription/PaymentCard/index.tsx
new file mode 100644
index 000000000000..cdeb1ae0a580
--- /dev/null
+++ b/src/pages/settings/Subscription/PaymentCard/index.tsx
@@ -0,0 +1,118 @@
+import React, {useCallback, useEffect} from 'react';
+import {View} from 'react-native';
+import {useOnyx} from 'react-native-onyx';
+import PaymentCardForm from '@components/AddPaymentCard/PaymentCardForm';
+import type {FormOnyxValues} from '@components/Form/types';
+import HeaderWithBackButton from '@components/HeaderWithBackButton';
+import * as Illustrations from '@components/Icon/Illustrations';
+import ScreenWrapper from '@components/ScreenWrapper';
+import Section, {CARD_LAYOUT} from '@components/Section';
+import Text from '@components/Text';
+import TextLink from '@components/TextLink';
+import useLocalize from '@hooks/useLocalize';
+import usePreferredCurrency from '@hooks/usePreferredCurrency';
+import usePrevious from '@hooks/usePrevious';
+import useSubscriptionPlan from '@hooks/useSubscriptionPlan';
+import useSubscriptionPrice from '@hooks/useSubscriptionPrice';
+import useThemeStyles from '@hooks/useThemeStyles';
+import * as CardUtils from '@libs/CardUtils';
+import {convertToShortDisplayString} from '@libs/CurrencyUtils';
+import CardAuthenticationModal from '@pages/settings/Subscription/CardAuthenticationModal';
+import * as PaymentMethods from '@userActions/PaymentMethods';
+import CONST from '@src/CONST';
+import ONYXKEYS from '@src/ONYXKEYS';
+import ROUTES from '@src/ROUTES';
+
+function AddPaymentCard() {
+    const styles = useThemeStyles();
+    const {translate} = useLocalize();
+    const [privateSubscription] = useOnyx(ONYXKEYS.NVP_PRIVATE_SUBSCRIPTION);
+
+    const subscriptionPlan = useSubscriptionPlan();
+    const subscriptionPrice = useSubscriptionPrice();
+    const preferredCurrency = usePreferredCurrency();
+
+    const isCollect = subscriptionPlan === CONST.POLICY.TYPE.TEAM;
+    const isAnnual = privateSubscription?.type === CONST.SUBSCRIPTION.TYPE.ANNUAL;
+
+    useEffect(() => {
+        PaymentMethods.clearPaymentCardFormErrorAndSubmit();
+
+        return () => {
+            PaymentMethods.clearPaymentCardFormErrorAndSubmit();
+        };
+    }, []);
+
+    const addPaymentCard = useCallback((values: FormOnyxValues<typeof ONYXKEYS.FORMS.ADD_PAYMENT_CARD_FORM>) => {
+        const cardData = {
+            cardNumber: CardUtils.getMCardNumberString(values.cardNumber),
+            cardMonth: CardUtils.getMonthFromExpirationDateString(values.expirationDate),
+            cardYear: CardUtils.getYearFromExpirationDateString(values.expirationDate),
+            cardCVV: values.securityCode,
+            addressName: values.nameOnCard,
+            addressZip: values.addressZipCode,
+            currency: values.currency ?? CONST.PAYMENT_CARD_CURRENCY.USD,
+        };
+        PaymentMethods.addSubscriptionPaymentCard(cardData);
+    }, []);
+
+    const [formData] = useOnyx(ONYXKEYS.FORMS.ADD_PAYMENT_CARD_FORM);
+    const prevFormDataSetupComplete = usePrevious(!!formData?.setupComplete);
+
+    useEffect(() => {
+        if (prevFormDataSetupComplete || !formData?.setupComplete) {
+            return;
+        }
+
+        PaymentMethods.continueSetup();
+    }, [prevFormDataSetupComplete, formData?.setupComplete]);
+
+    return (
+        <ScreenWrapper testID={AddPaymentCard.displayName}>
+            <HeaderWithBackButton title={translate('subscription.paymentCard.addPaymentCard')} />
+            <View style={styles.containerWithSpaceBetween}>
+                <PaymentCardForm
+                    shouldShowPaymentCardForm
+                    addPaymentCard={addPaymentCard}
+                    showAcceptTerms
+                    showCurrencyField
+                    currencySelectorRoute={ROUTES.SETTINGS_SUBSCRIPTION_CHANGE_PAYMENT_CURRENCY}
+                    submitButtonText={translate('subscription.paymentCard.addPaymentCard')}
+                    headerContent={<Text style={[styles.textHeadline, styles.mt3, styles.mb2, styles.ph5]}>{translate('subscription.paymentCard.enterPaymentCardDetails')}</Text>}
+                    footerContent={
+                        <>
+                            <Section
+                                icon={Illustrations.ShieldYellow}
+                                cardLayout={CARD_LAYOUT.ICON_ON_LEFT}
+                                iconContainerStyles={styles.mr4}
+                                containerStyles={[styles.mh0, styles.mt5]}
+                                renderTitle={() => (
+                                    <Text style={[styles.mutedTextLabel]}>
+                                        {translate('subscription.paymentCard.security')}{' '}
+                                        <TextLink
+                                            style={[styles.mutedTextLabel, styles.link]}
+                                            href={CONST.TERMS_URL}
+                                        >
+                                            {translate('subscription.paymentCard.learnMoreAboutSecurity')}
+                                        </TextLink>
+                                    </Text>
+                                )}
+                            />
+                            <Text style={[styles.textMicroSupporting, styles.mt3, styles.textAlignCenter, styles.mr5, styles.ml5]}>
+                                {translate(`subscription.yourPlan.${isCollect ? 'collect' : 'control'}.${isAnnual ? 'priceAnnual' : 'pricePayPerUse'}`, {
+                                    lower: convertToShortDisplayString(subscriptionPrice, preferredCurrency),
+                                    upper: convertToShortDisplayString(subscriptionPrice * CONST.SUBSCRIPTION_PRICE_FACTOR, preferredCurrency),
+                                })}
+                            </Text>
+                        </>
+                    }
+                />
+            </View>
+            <CardAuthenticationModal headerTitle={translate('subscription.authenticatePaymentCard')} />
+        </ScreenWrapper>
+    );
+}
+
+AddPaymentCard.displayName = 'AddPaymentCard';
+
+export default AddPaymentCard;
diff --git a/src/pages/settings/Subscription/ReducedFunctionalityMessage/index.native.tsx b/src/pages/settings/Subscription/ReducedFunctionalityMessage/index.native.tsx
new file mode 100644
index 000000000000..10ff0e23ade4
--- /dev/null
+++ b/src/pages/settings/Subscription/ReducedFunctionalityMessage/index.native.tsx
@@ -0,0 +1,14 @@
+import Text from '@components/Text';
+import useLocalize from '@hooks/useLocalize';
+import useThemeStyles from '@hooks/useThemeStyles';
+
+function ReducedFunctionalityMessage() {
+    const styles = useThemeStyles();
+    const {translate} = useLocalize();
+
+    return <Text style={[styles.ph5, styles.pb5, styles.textSupporting]}>{translate('subscription.mobileReducedFunctionalityMessage')}</Text>;
+}
+
+ReducedFunctionalityMessage.displayName = 'ReducedFunctionalityMessage';
+
+export default ReducedFunctionalityMessage;
diff --git a/src/pages/settings/Subscription/ReducedFunctionalityMessage/index.tsx b/src/pages/settings/Subscription/ReducedFunctionalityMessage/index.tsx
new file mode 100644
index 000000000000..02b5470fdd37
--- /dev/null
+++ b/src/pages/settings/Subscription/ReducedFunctionalityMessage/index.tsx
@@ -0,0 +1,7 @@
+function ReducedFunctionalityMessage() {
+    return null; // We do not need to show this message on web and desktop
+}
+
+ReducedFunctionalityMessage.displayName = 'ReducedFunctionalityMessage';
+
+export default ReducedFunctionalityMessage;
diff --git a/src/pages/settings/Subscription/RequestEarlyCancellationPage/index.native.tsx b/src/pages/settings/Subscription/RequestEarlyCancellationPage/index.native.tsx
new file mode 100644
index 000000000000..10bf7808e2b1
--- /dev/null
+++ b/src/pages/settings/Subscription/RequestEarlyCancellationPage/index.native.tsx
@@ -0,0 +1,19 @@
+import React from 'react';
+import FullPageNotFoundView from '@components/BlockingViews/FullPageNotFoundView';
+import ScreenWrapper from '@components/ScreenWrapper';
+
+function RequestEarlyCancellationPage() {
+    return (
+        <ScreenWrapper
+            testID={RequestEarlyCancellationPage.displayName}
+            includeSafeAreaPaddingBottom
+            shouldEnableMaxHeight
+        >
+            <FullPageNotFoundView shouldShow />
+        </ScreenWrapper>
+    );
+}
+
+RequestEarlyCancellationPage.displayName = 'RequestEarlyCancellationPage';
+
+export default RequestEarlyCancellationPage;
diff --git a/src/pages/settings/Subscription/RequestEarlyCancellationPage/index.tsx b/src/pages/settings/Subscription/RequestEarlyCancellationPage/index.tsx
new file mode 100644
index 000000000000..d74e126ff94e
--- /dev/null
+++ b/src/pages/settings/Subscription/RequestEarlyCancellationPage/index.tsx
@@ -0,0 +1,141 @@
+import type {ReactNode} from 'react';
+import React, {useMemo, useState} from 'react';
+import {View} from 'react-native';
+import Button from '@components/Button';
+import FeedbackSurvey from '@components/FeedbackSurvey';
+import FixedFooter from '@components/FixedFooter';
+import HeaderWithBackButton from '@components/HeaderWithBackButton';
+import ScreenWrapper from '@components/ScreenWrapper';
+import ScrollView from '@components/ScrollView';
+import Text from '@components/Text';
+import TextLink from '@components/TextLink';
+import useCancellationType from '@hooks/useCancellationType';
+import useLocalize from '@hooks/useLocalize';
+import useThemeStyles from '@hooks/useThemeStyles';
+import Navigation from '@libs/Navigation/Navigation';
+import * as Report from '@userActions/Report';
+import * as Subscription from '@userActions/Subscription';
+import type {CancellationType, FeedbackSurveyOptionID} from '@src/CONST';
+import CONST from '@src/CONST';
+import ONYXKEYS from '@src/ONYXKEYS';
+import ROUTES from '@src/ROUTES';
+
+function RequestEarlyCancellationPage() {
+    const {translate} = useLocalize();
+    const styles = useThemeStyles();
+
+    const [isLoading, setIsLoading] = useState(false);
+
+    const cancellationType = useCancellationType();
+
+    const handleSubmit = (cancellationReason: FeedbackSurveyOptionID, cancellationNote = '') => {
+        setIsLoading(true);
+        Subscription.cancelBillingSubscription(cancellationReason, cancellationNote);
+    };
+
+    const acknowledgementText = useMemo(
+        () => (
+            <Text>
+                {translate('subscription.requestEarlyCancellation.acknowledgement.part1')}
+                <TextLink href={CONST.TERMS_URL}>{translate('subscription.requestEarlyCancellation.acknowledgement.link')}</TextLink>
+                {translate('subscription.requestEarlyCancellation.acknowledgement.part2')}
+            </Text>
+        ),
+        [translate],
+    );
+
+    const manualCancellationContent = useMemo(
+        () => (
+            <View style={[styles.flexGrow1, styles.justifyContentBetween, styles.mh5]}>
+                <View>
+                    <Text style={styles.textHeadline}>{translate('subscription.requestEarlyCancellation.requestSubmitted.title')}</Text>
+                    <Text style={[styles.mt1, styles.textNormalThemeText]}>
+                        {translate('subscription.requestEarlyCancellation.requestSubmitted.subtitle.part1')}
+                        <TextLink onPress={() => Report.navigateToConciergeChat()}>{translate('subscription.requestEarlyCancellation.requestSubmitted.subtitle.link')}</TextLink>
+                        {translate('subscription.requestEarlyCancellation.requestSubmitted.subtitle.part2')}
+                    </Text>
+                </View>
+                <FixedFooter style={styles.ph0}>
+                    <Button
+                        success
+                        text={translate('common.done')}
+                        onPress={() => Navigation.goBack()}
+                        large
+                    />
+                </FixedFooter>
+            </View>
+        ),
+        [styles, translate],
+    );
+
+    const automaticCancellationContent = useMemo(
+        () => (
+            <View style={[styles.flexGrow1, styles.justifyContentBetween, styles.mh5]}>
+                <View>
+                    <Text style={styles.textHeadline}>{translate('subscription.requestEarlyCancellation.subscriptionCanceled.title')}</Text>
+                    <Text style={[styles.mt1, styles.textNormalThemeText]}>{translate('subscription.requestEarlyCancellation.subscriptionCanceled.subtitle')}</Text>
+                    <Text style={[styles.mv4, styles.textNormalThemeText]}>{translate('subscription.requestEarlyCancellation.subscriptionCanceled.info')}</Text>
+                    <Text>
+                        {translate('subscription.requestEarlyCancellation.subscriptionCanceled.preventFutureActivity.part1')}
+                        <TextLink onPress={() => Navigation.navigate(ROUTES.SETTINGS_WORKSPACES)}>
+                            {translate('subscription.requestEarlyCancellation.subscriptionCanceled.preventFutureActivity.link')}
+                        </TextLink>
+                        {translate('subscription.requestEarlyCancellation.subscriptionCanceled.preventFutureActivity.part2')}
+                    </Text>
+                </View>
+                <FixedFooter style={styles.ph0}>
+                    <Button
+                        success
+                        text={translate('common.done')}
+                        onPress={() => Navigation.goBack()}
+                        large
+                    />
+                </FixedFooter>
+            </View>
+        ),
+        [styles, translate],
+    );
+
+    const surveyContent = useMemo(
+        () => (
+            <FeedbackSurvey
+                formID={ONYXKEYS.FORMS.REQUEST_EARLY_CANCELLATION_FORM}
+                title={translate('subscription.subscriptionSettings.helpUsImprove')}
+                description={translate('subscription.requestEarlyCancellation.subtitle')}
+                onSubmit={handleSubmit}
+                optionRowStyles={styles.flex1}
+                footerText={<Text style={[styles.mb2, styles.mt4]}>{acknowledgementText}</Text>}
+                isNoteRequired
+                isLoading={isLoading}
+                enabledWhenOffline={false}
+            />
+        ),
+        [acknowledgementText, isLoading, styles.flex1, styles.mb2, styles.mt4, translate],
+    );
+
+    const contentMap: Partial<Record<CancellationType, ReactNode>> = {
+        [CONST.CANCELLATION_TYPE.MANUAL]: manualCancellationContent,
+        [CONST.CANCELLATION_TYPE.AUTOMATIC]: automaticCancellationContent,
+    };
+
+    const screenContent = cancellationType ? contentMap[cancellationType] : surveyContent;
+
+    return (
+        <ScreenWrapper
+            testID={RequestEarlyCancellationPage.displayName}
+            includeSafeAreaPaddingBottom={false}
+            shouldEnablePickerAvoiding={false}
+            shouldEnableMaxHeight
+        >
+            <HeaderWithBackButton
+                title={translate('subscription.requestEarlyCancellation.title')}
+                onBackButtonPress={Navigation.goBack}
+            />
+            <ScrollView contentContainerStyle={[styles.flexGrow1, styles.pt3]}>{screenContent}</ScrollView>
+        </ScreenWrapper>
+    );
+}
+
+RequestEarlyCancellationPage.displayName = 'RequestEarlyCancellationPage';
+
+export default RequestEarlyCancellationPage;
diff --git a/src/pages/settings/Subscription/SaveWithExpensifyButton/index.native.tsx b/src/pages/settings/Subscription/SaveWithExpensifyButton/index.native.tsx
new file mode 100644
index 000000000000..6eef4331c304
--- /dev/null
+++ b/src/pages/settings/Subscription/SaveWithExpensifyButton/index.native.tsx
@@ -0,0 +1,8 @@
+/** Return null because this button is not supposed to be rendered in the native apps */
+function SaveWithExpensifyButton() {
+    return null;
+}
+
+SaveWithExpensifyButton.displayName = 'SaveWithExpensifyButton';
+
+export default SaveWithExpensifyButton;
diff --git a/src/pages/settings/Subscription/SaveWithExpensifyButton/index.tsx b/src/pages/settings/Subscription/SaveWithExpensifyButton/index.tsx
new file mode 100644
index 000000000000..ea12afe90440
--- /dev/null
+++ b/src/pages/settings/Subscription/SaveWithExpensifyButton/index.tsx
@@ -0,0 +1,25 @@
+import React from 'react';
+import {Linking} from 'react-native';
+import Button from '@components/Button';
+import useLocalize from '@hooks/useLocalize';
+import CONST from '@src/CONST';
+
+function SaveWithExpensifyButton() {
+    const {translate} = useLocalize();
+
+    const onLinkPress = () => {
+        Linking.openURL(CONST.SAVE_WITH_EXPENSIFY_URL);
+    };
+
+    return (
+        <Button
+            text={translate('subscription.yourPlan.saveWithExpensifyButton')}
+            onPress={onLinkPress}
+            medium
+        />
+    );
+}
+
+SaveWithExpensifyButton.displayName = 'SaveWithExpensifyButton';
+
+export default SaveWithExpensifyButton;
diff --git a/src/pages/settings/Subscription/SubscriptionDetails/index.native.tsx b/src/pages/settings/Subscription/SubscriptionDetails/index.native.tsx
new file mode 100644
index 000000000000..6b53c0b1bbd9
--- /dev/null
+++ b/src/pages/settings/Subscription/SubscriptionDetails/index.native.tsx
@@ -0,0 +1,83 @@
+import React from 'react';
+import {View} from 'react-native';
+import {useOnyx} from 'react-native-onyx';
+import Icon from '@components/Icon';
+import * as Illustrations from '@components/Icon/Illustrations';
+import MenuItemWithTopDescription from '@components/MenuItemWithTopDescription';
+import OptionItem from '@components/OptionsPicker/OptionItem';
+import Section from '@components/Section';
+import Text from '@components/Text';
+import useLocalize from '@hooks/useLocalize';
+import useThemeIllustrations from '@hooks/useThemeIllustrations';
+import useThemeStyles from '@hooks/useThemeStyles';
+import variables from '@styles/variables';
+import CONST from '@src/CONST';
+import ONYXKEYS from '@src/ONYXKEYS';
+
+function SubscriptionDetails() {
+    const {translate} = useLocalize();
+    const styles = useThemeStyles();
+    const illustrations = useThemeIllustrations();
+
+    const [privateSubscription] = useOnyx(ONYXKEYS.NVP_PRIVATE_SUBSCRIPTION);
+
+    const [account] = useOnyx(ONYXKEYS.ACCOUNT);
+
+    // This section is only shown when the subscription is annual
+    let subscriptionSizeSection: React.JSX.Element | null = null;
+
+    if (privateSubscription?.type === CONST.SUBSCRIPTION.TYPE.ANNUAL) {
+        subscriptionSizeSection = privateSubscription?.userCount ? (
+            <MenuItemWithTopDescription
+                description={translate('subscription.details.subscriptionSize')}
+                title={`${privateSubscription?.userCount}`}
+                wrapperStyle={styles.sectionMenuItemTopDescription}
+                style={styles.mt5}
+            />
+        ) : (
+            <Text style={[styles.mt5, styles.textLabelSupporting, styles.textLineHeightNormal]}>{translate('subscription.details.headsUp')}</Text>
+        );
+    }
+
+    return (
+        <Section
+            title={translate('subscription.details.title')}
+            isCentralPane
+            titleStyles={styles.textStrong}
+        >
+            {!!account?.isApprovedAccountant || !!account?.isApprovedAccountantClient ? (
+                <View style={[styles.borderedContentCard, styles.p5, styles.mt5]}>
+                    <Icon
+                        src={illustrations.ExpensifyApprovedLogo}
+                        width={variables.modalTopIconWidth}
+                        height={variables.menuIconSize}
+                    />
+                    <Text style={[styles.textLabelSupporting, styles.mt2]}>{translate('subscription.details.zeroCommitment')}</Text>
+                </View>
+            ) : (
+                <>
+                    {privateSubscription?.type === CONST.SUBSCRIPTION.TYPE.PAYPERUSE ? (
+                        <OptionItem
+                            title="subscription.details.payPerUse"
+                            icon={Illustrations.SubscriptionPPU}
+                            style={styles.mt5}
+                            isDisabled
+                        />
+                    ) : (
+                        <OptionItem
+                            title="subscription.details.annual"
+                            icon={Illustrations.SubscriptionAnnual}
+                            style={styles.mt5}
+                            isDisabled
+                        />
+                    )}
+                    {subscriptionSizeSection}
+                </>
+            )}
+        </Section>
+    );
+}
+
+SubscriptionDetails.displayName = 'SubscriptionDetails';
+
+export default SubscriptionDetails;
diff --git a/src/pages/settings/Subscription/SubscriptionDetails/index.tsx b/src/pages/settings/Subscription/SubscriptionDetails/index.tsx
new file mode 100644
index 000000000000..c78847cb35aa
--- /dev/null
+++ b/src/pages/settings/Subscription/SubscriptionDetails/index.tsx
@@ -0,0 +1,127 @@
+import React from 'react';
+import {View} from 'react-native';
+import {useOnyx} from 'react-native-onyx';
+import Badge from '@components/Badge';
+import Icon from '@components/Icon';
+import * as Illustrations from '@components/Icon/Illustrations';
+import MenuItemWithTopDescription from '@components/MenuItemWithTopDescription';
+import OfflineWithFeedback from '@components/OfflineWithFeedback';
+import type {OptionsPickerItem} from '@components/OptionsPicker';
+import OptionsPicker from '@components/OptionsPicker';
+import Section from '@components/Section';
+import Text from '@components/Text';
+import useLocalize from '@hooks/useLocalize';
+import useThemeIllustrations from '@hooks/useThemeIllustrations';
+import useThemeStyles from '@hooks/useThemeStyles';
+import Navigation from '@libs/Navigation/Navigation';
+import TaxExemptActions from '@pages/settings/Subscription/TaxExemptActions';
+import variables from '@styles/variables';
+import * as Subscription from '@userActions/Subscription';
+import type {SubscriptionType} from '@src/CONST';
+import CONST from '@src/CONST';
+import ONYXKEYS from '@src/ONYXKEYS';
+import ROUTES from '@src/ROUTES';
+
+const options: Array<OptionsPickerItem<SubscriptionType>> = [
+    {
+        key: CONST.SUBSCRIPTION.TYPE.ANNUAL,
+        title: 'subscription.details.annual',
+        icon: Illustrations.SubscriptionAnnual,
+    },
+    {
+        key: CONST.SUBSCRIPTION.TYPE.PAYPERUSE,
+        title: 'subscription.details.payPerUse',
+        icon: Illustrations.SubscriptionPPU,
+    },
+];
+
+function SubscriptionDetails() {
+    const {translate} = useLocalize();
+    const styles = useThemeStyles();
+    const illustrations = useThemeIllustrations();
+
+    const [privateSubscription] = useOnyx(ONYXKEYS.NVP_PRIVATE_SUBSCRIPTION);
+    const [privateTaxExempt] = useOnyx(ONYXKEYS.NVP_PRIVATE_TAX_EXEMPT);
+    const [account] = useOnyx(ONYXKEYS.ACCOUNT);
+
+    const onOptionSelected = (option: SubscriptionType) => {
+        if (privateSubscription?.type === CONST.SUBSCRIPTION.TYPE.ANNUAL && option === CONST.SUBSCRIPTION.TYPE.PAYPERUSE && !account?.canDowngrade) {
+            Navigation.navigate(ROUTES.SETTINGS_SUBSCRIPTION_SIZE.getRoute(0));
+            return;
+        }
+
+        Subscription.updateSubscriptionType(option);
+    };
+
+    const onSubscriptionSizePress = () => {
+        Navigation.navigate(ROUTES.SETTINGS_SUBSCRIPTION_SIZE.getRoute(1));
+    };
+
+    // This section is only shown when the subscription is annual
+    const subscriptionSizeSection: React.JSX.Element | null =
+        privateSubscription?.type === CONST.SUBSCRIPTION.TYPE.ANNUAL ? (
+            <>
+                <OfflineWithFeedback
+                    pendingAction={privateSubscription?.pendingFields?.userCount}
+                    errors={privateSubscription?.errorFields?.userCount}
+                    onClose={() => {
+                        Subscription.clearUpdateSubscriptionSizeError();
+                    }}
+                >
+                    <MenuItemWithTopDescription
+                        description={translate('subscription.details.subscriptionSize')}
+                        shouldShowRightIcon
+                        onPress={onSubscriptionSizePress}
+                        wrapperStyle={styles.sectionMenuItemTopDescription}
+                        style={styles.mt5}
+                        title={`${privateSubscription?.userCount ?? ''}`}
+                    />
+                </OfflineWithFeedback>
+                {!privateSubscription?.userCount && <Text style={[styles.mt2, styles.textLabelSupporting, styles.textLineHeightNormal]}>{translate('subscription.details.headsUp')}</Text>}
+            </>
+        ) : null;
+
+    return (
+        <Section
+            isCentralPane
+            titleStyles={styles.textStrong}
+        >
+            <View style={[styles.flexShrink1, styles.w100, styles.justifyContentBetween]}>
+                <View style={styles.flexRow}>
+                    <Text style={[styles.textHeadline, styles.cardSectionTitle, styles.textStrong]}>{translate('subscription.details.title')}</Text>
+                    {privateTaxExempt && (
+                        <Badge
+                            badgeStyles={styles.mtn1}
+                            text={translate('subscription.details.taxExemptEnabled')}
+                        />
+                    )}
+                </View>
+                {!privateTaxExempt && <TaxExemptActions />}
+            </View>
+            {!!account?.isApprovedAccountant || !!account?.isApprovedAccountantClient ? (
+                <View style={[styles.borderedContentCard, styles.p5, styles.mt5]}>
+                    <Icon
+                        src={illustrations.ExpensifyApprovedLogo}
+                        width={variables.modalTopIconWidth}
+                        height={variables.menuIconSize}
+                    />
+                    <Text style={[styles.textLabelSupporting, styles.mt2]}>{translate('subscription.details.zeroCommitment')}</Text>
+                </View>
+            ) : (
+                <OfflineWithFeedback pendingAction={privateSubscription?.pendingFields?.type}>
+                    <OptionsPicker
+                        options={options}
+                        selectedOption={privateSubscription?.type ?? CONST.SUBSCRIPTION.TYPE.ANNUAL}
+                        onOptionSelected={onOptionSelected}
+                        style={styles.mt5}
+                    />
+                    {subscriptionSizeSection}
+                </OfflineWithFeedback>
+            )}
+        </Section>
+    );
+}
+
+SubscriptionDetails.displayName = 'SubscriptionDetails';
+
+export default SubscriptionDetails;
diff --git a/src/pages/settings/Subscription/SubscriptionPlan.tsx b/src/pages/settings/Subscription/SubscriptionPlan.tsx
new file mode 100644
index 000000000000..33933027dd45
--- /dev/null
+++ b/src/pages/settings/Subscription/SubscriptionPlan.tsx
@@ -0,0 +1,107 @@
+import React from 'react';
+import {View} from 'react-native';
+import {useOnyx} from 'react-native-onyx';
+import Icon from '@components/Icon';
+import * as Expensicons from '@components/Icon/Expensicons';
+import * as Illustrations from '@components/Icon/Illustrations';
+import Section from '@components/Section';
+import Text from '@components/Text';
+import useLocalize from '@hooks/useLocalize';
+import usePreferredCurrency from '@hooks/usePreferredCurrency';
+import useSubscriptionPlan from '@hooks/useSubscriptionPlan';
+import useSubscriptionPrice from '@hooks/useSubscriptionPrice';
+import useTheme from '@hooks/useTheme';
+import useThemeStyles from '@hooks/useThemeStyles';
+import {convertToShortDisplayString} from '@libs/CurrencyUtils';
+import variables from '@styles/variables';
+import CONST from '@src/CONST';
+import ONYXKEYS from '@src/ONYXKEYS';
+import SaveWithExpensifyButton from './SaveWithExpensifyButton';
+
+function SubscriptionPlan() {
+    const {translate} = useLocalize();
+    const styles = useThemeStyles();
+    const theme = useTheme();
+
+    const [privateSubscription] = useOnyx(ONYXKEYS.NVP_PRIVATE_SUBSCRIPTION);
+
+    const subscriptionPlan = useSubscriptionPlan();
+    const subscriptionPrice = useSubscriptionPrice();
+    const preferredCurrency = usePreferredCurrency();
+
+    const isCollect = subscriptionPlan === CONST.POLICY.TYPE.TEAM;
+    const isAnnual = privateSubscription?.type === CONST.SUBSCRIPTION.TYPE.ANNUAL;
+
+    const benefitsList = isCollect
+        ? [
+              translate('subscription.yourPlan.collect.benefit1'),
+              translate('subscription.yourPlan.collect.benefit2'),
+              translate('subscription.yourPlan.collect.benefit3'),
+              translate('subscription.yourPlan.collect.benefit4'),
+              translate('subscription.yourPlan.collect.benefit5'),
+              translate('subscription.yourPlan.collect.benefit6'),
+              translate('subscription.yourPlan.collect.benefit7'),
+          ]
+        : [
+              translate('subscription.yourPlan.control.benefit1'),
+              translate('subscription.yourPlan.control.benefit2'),
+              translate('subscription.yourPlan.control.benefit3'),
+              translate('subscription.yourPlan.control.benefit4'),
+              translate('subscription.yourPlan.control.benefit5'),
+              translate('subscription.yourPlan.control.benefit6'),
+          ];
+
+    return (
+        <Section
+            title={translate('subscription.yourPlan.title')}
+            isCentralPane
+            titleStyles={styles.textStrong}
+        >
+            <View style={[styles.borderedContentCard, styles.mt5, styles.p5]}>
+                <Icon
+                    src={isCollect ? Illustrations.Mailbox : Illustrations.ShieldYellow}
+                    width={variables.iconHeader}
+                    height={variables.iconHeader}
+                />
+                <Text style={[styles.headerText, styles.mt2]}>{translate(`subscription.yourPlan.${isCollect ? 'collect' : 'control'}.title`)}</Text>
+                <Text style={[styles.textLabelSupporting, styles.mb2]}>
+                    {translate(`subscription.yourPlan.${isCollect ? 'collect' : 'control'}.${isAnnual ? 'priceAnnual' : 'pricePayPerUse'}`, {
+                        lower: convertToShortDisplayString(subscriptionPrice, preferredCurrency),
+                        upper: convertToShortDisplayString(subscriptionPrice * CONST.SUBSCRIPTION_PRICE_FACTOR, preferredCurrency),
+                    })}
+                </Text>
+                {benefitsList.map((benefit) => (
+                    <View
+                        style={[styles.flexRow, styles.alignItemsCenter, styles.mt2]}
+                        key={benefit}
+                    >
+                        <Icon
+                            src={Expensicons.Checkmark}
+                            fill={theme.iconSuccessFill}
+                            width={variables.iconSizeSmall}
+                            height={variables.iconSizeSmall}
+                        />
+                        <Text style={[styles.textMicroSupporting, styles.ml2]}>{benefit}</Text>
+                    </View>
+                ))}
+            </View>
+            <View style={[styles.flexRow, styles.alignItemsCenter, styles.mt6]}>
+                <Icon
+                    src={Illustrations.HandCard}
+                    width={variables.iconHeader}
+                    height={variables.iconHeader}
+                    additionalStyles={styles.mr2}
+                />
+                <View style={[styles.flexColumn, styles.justifyContentCenter, styles.flex1, styles.mr2]}>
+                    <Text style={[styles.headerText, styles.mt2]}>{translate('subscription.yourPlan.saveWithExpensifyTitle')}</Text>
+                    <Text style={[styles.textLabelSupporting, styles.mb2]}>{translate('subscription.yourPlan.saveWithExpensifyDescription')}</Text>
+                </View>
+                <SaveWithExpensifyButton />
+            </View>
+        </Section>
+    );
+}
+
+SubscriptionPlan.displayName = 'SubscriptionPlan';
+
+export default SubscriptionPlan;
diff --git a/src/pages/settings/Subscription/SubscriptionSettings/index.native.tsx b/src/pages/settings/Subscription/SubscriptionSettings/index.native.tsx
new file mode 100644
index 000000000000..e1443501e2f4
--- /dev/null
+++ b/src/pages/settings/Subscription/SubscriptionSettings/index.native.tsx
@@ -0,0 +1,5 @@
+function SubscriptionSettings() {
+    return null;
+}
+
+export default SubscriptionSettings;
diff --git a/src/pages/settings/Subscription/SubscriptionSettings/index.tsx b/src/pages/settings/Subscription/SubscriptionSettings/index.tsx
new file mode 100644
index 000000000000..247d82ef8ca3
--- /dev/null
+++ b/src/pages/settings/Subscription/SubscriptionSettings/index.tsx
@@ -0,0 +1,94 @@
+import React from 'react';
+import type {StyleProp, TextStyle} from 'react-native';
+import {View} from 'react-native';
+import {useOnyx} from 'react-native-onyx';
+import OfflineWithFeedback from '@components/OfflineWithFeedback';
+import Section from '@components/Section';
+import Text from '@components/Text';
+import useLocalize from '@hooks/useLocalize';
+import usePreferredCurrency from '@hooks/usePreferredCurrency';
+import useSubscriptionPossibleCostSavings from '@hooks/useSubscriptionPossibleCostSavings';
+import useTheme from '@hooks/useTheme';
+import useThemeStyles from '@hooks/useThemeStyles';
+import {convertToShortDisplayString} from '@libs/CurrencyUtils';
+import Navigation from '@navigation/Navigation';
+import {formatSubscriptionEndDate} from '@pages/settings/Subscription/utils';
+import ToggleSettingOptionRow from '@pages/workspace/workflows/ToggleSettingsOptionRow';
+import * as Subscription from '@userActions/Subscription';
+import CONST from '@src/CONST';
+import ONYXKEYS from '@src/ONYXKEYS';
+import ROUTES from '@src/ROUTES';
+
+function SubscriptionSettings() {
+    const {translate} = useLocalize();
+    const styles = useThemeStyles();
+    const theme = useTheme();
+    const [privateSubscription] = useOnyx(ONYXKEYS.NVP_PRIVATE_SUBSCRIPTION);
+    const preferredCurrency = usePreferredCurrency();
+    const possibleCostSavings = useSubscriptionPossibleCostSavings();
+
+    const autoRenewalDate = formatSubscriptionEndDate(privateSubscription?.endDate);
+
+    const handleAutoRenewToggle = () => {
+        if (!privateSubscription?.autoRenew) {
+            Subscription.updateSubscriptionAutoRenew(true);
+            return;
+        }
+        Navigation.navigate(ROUTES.SETTINGS_SUBSCRIPTION_DISABLE_AUTO_RENEW_SURVEY);
+    };
+
+    const handleAutoIncreaseToggle = () => {
+        Subscription.updateSubscriptionAddNewUsersAutomatically(!privateSubscription?.addNewUsersAutomatically);
+    };
+
+    if (privateSubscription?.type === CONST.SUBSCRIPTION.TYPE.PAYPERUSE) {
+        return null;
+    }
+
+    const customTitleSecondSentenceStyles: StyleProp<TextStyle> = [styles.textNormal, {color: theme.success}];
+    const customTitle = (
+        <View style={[styles.flexRow, styles.flex1, styles.alignItemsCenter]}>
+            <Text style={[styles.mr1, styles.textNormalThemeText]}>{translate('subscription.subscriptionSettings.autoIncrease')}</Text>
+            <Text style={customTitleSecondSentenceStyles}>
+                {translate('subscription.subscriptionSettings.saveUpTo', {
+                    amountWithCurrency: convertToShortDisplayString(possibleCostSavings, preferredCurrency),
+                })}
+            </Text>
+        </View>
+    );
+
+    return (
+        <Section
+            title={translate('subscription.subscriptionSettings.title')}
+            titleStyles={styles.textStrong}
+            isCentralPane
+        >
+            <OfflineWithFeedback pendingAction={privateSubscription?.pendingFields?.autoRenew}>
+                <View style={styles.mt5}>
+                    <ToggleSettingOptionRow
+                        title={translate('subscription.subscriptionSettings.autoRenew')}
+                        switchAccessibilityLabel={translate('subscription.subscriptionSettings.autoRenew')}
+                        onToggle={handleAutoRenewToggle}
+                        isActive={privateSubscription?.autoRenew ?? false}
+                    />
+                    {!!autoRenewalDate && <Text style={[styles.mutedTextLabel, styles.mt2]}>{translate('subscription.subscriptionSettings.renewsOn', {date: autoRenewalDate})}</Text>}
+                </View>
+            </OfflineWithFeedback>
+            <OfflineWithFeedback pendingAction={privateSubscription?.pendingFields?.addNewUsersAutomatically}>
+                <View style={styles.mt3}>
+                    <ToggleSettingOptionRow
+                        customTitle={customTitle}
+                        switchAccessibilityLabel={translate('subscription.subscriptionSettings.autoRenew')}
+                        onToggle={handleAutoIncreaseToggle}
+                        isActive={privateSubscription?.addNewUsersAutomatically ?? false}
+                    />
+                    <Text style={[styles.mutedTextLabel, styles.mt2]}>{translate('subscription.subscriptionSettings.automaticallyIncrease')}</Text>
+                </View>
+            </OfflineWithFeedback>
+        </Section>
+    );
+}
+
+SubscriptionSettings.displayName = 'SubscriptionSettings';
+
+export default SubscriptionSettings;
diff --git a/src/pages/settings/Subscription/SubscriptionSettingsPage.tsx b/src/pages/settings/Subscription/SubscriptionSettingsPage.tsx
new file mode 100644
index 000000000000..c6112ec19c8d
--- /dev/null
+++ b/src/pages/settings/Subscription/SubscriptionSettingsPage.tsx
@@ -0,0 +1,60 @@
+import React, {useEffect} from 'react';
+import {View} from 'react-native';
+import HeaderWithBackButton from '@components/HeaderWithBackButton';
+import * as Illustrations from '@components/Icon/Illustrations';
+import ScreenWrapper from '@components/ScreenWrapper';
+import ScrollView from '@components/ScrollView';
+import useLocalize from '@hooks/useLocalize';
+import useResponsiveLayout from '@hooks/useResponsiveLayout';
+import useSubscriptionPlan from '@hooks/useSubscriptionPlan';
+import useThemeStyles from '@hooks/useThemeStyles';
+import Navigation from '@libs/Navigation/Navigation';
+import NotFoundPage from '@pages/ErrorPage/NotFoundPage';
+import * as Subscription from '@userActions/Subscription';
+import CardSection from './CardSection/CardSection';
+import ReducedFunctionalityMessage from './ReducedFunctionalityMessage';
+import SubscriptionDetails from './SubscriptionDetails';
+import SubscriptionPlan from './SubscriptionPlan';
+import SubscriptionSettings from './SubscriptionSettings';
+
+function SubscriptionSettingsPage() {
+    const {shouldUseNarrowLayout} = useResponsiveLayout();
+    const {translate} = useLocalize();
+    const styles = useThemeStyles();
+    const subscriptionPlan = useSubscriptionPlan();
+
+    useEffect(() => {
+        Subscription.openSubscriptionPage();
+    }, []);
+
+    if (!subscriptionPlan) {
+        return <NotFoundPage />;
+    }
+
+    return (
+        <ScreenWrapper
+            testID={SubscriptionSettingsPage.displayName}
+            shouldShowOfflineIndicatorInWideScreen
+        >
+            <HeaderWithBackButton
+                title={translate('workspace.common.subscription')}
+                onBackButtonPress={() => Navigation.goBack()}
+                shouldShowBackButton={shouldUseNarrowLayout}
+                icon={Illustrations.CreditCardsNew}
+            />
+            <ScrollView style={styles.pt3}>
+                <View style={[styles.flex1, shouldUseNarrowLayout ? styles.workspaceSectionMobile : styles.workspaceSection]}>
+                    <ReducedFunctionalityMessage />
+                    <CardSection />
+                    <SubscriptionPlan />
+                    <SubscriptionDetails />
+                    <SubscriptionSettings />
+                </View>
+            </ScrollView>
+        </ScreenWrapper>
+    );
+}
+
+SubscriptionSettingsPage.displayName = 'SubscriptionSettingsPage';
+
+export default SubscriptionSettingsPage;
diff --git a/src/pages/settings/Subscription/SubscriptionSize/index.native.tsx b/src/pages/settings/Subscription/SubscriptionSize/index.native.tsx
new file mode 100644
index 000000000000..3afd51298551
--- /dev/null
+++ b/src/pages/settings/Subscription/SubscriptionSize/index.native.tsx
@@ -0,0 +1,19 @@
+import React from 'react';
+import FullPageNotFoundView from '@components/BlockingViews/FullPageNotFoundView';
+import ScreenWrapper from '@components/ScreenWrapper';
+
+function SubscriptionSizePage() {
+    return (
+        <ScreenWrapper
+            testID={SubscriptionSizePage.displayName}
+            includeSafeAreaPaddingBottom
+            shouldEnableMaxHeight
+        >
+            <FullPageNotFoundView shouldShow />
+        </ScreenWrapper>
+    );
+}
+
+SubscriptionSizePage.displayName = 'SubscriptionSizePage';
+
+export default SubscriptionSizePage;
diff --git a/src/pages/settings/Subscription/SubscriptionSize/index.tsx b/src/pages/settings/Subscription/SubscriptionSize/index.tsx
new file mode 100644
index 000000000000..84cd86c60bca
--- /dev/null
+++ b/src/pages/settings/Subscription/SubscriptionSize/index.tsx
@@ -0,0 +1,76 @@
+import type {StackScreenProps} from '@react-navigation/stack';
+import React, {useEffect} from 'react';
+import {useOnyx} from 'react-native-onyx';
+import HeaderWithBackButton from '@components/HeaderWithBackButton';
+import ScreenWrapper from '@components/ScreenWrapper';
+import useLocalize from '@hooks/useLocalize';
+import useSubStep from '@hooks/useSubStep';
+import type {SubStepProps} from '@hooks/useSubStep/types';
+import Navigation from '@libs/Navigation/Navigation';
+import type {SettingsNavigatorParamList} from '@navigation/types';
+import * as FormActions from '@userActions/FormActions';
+import * as Subscription from '@userActions/Subscription';
+import ONYXKEYS from '@src/ONYXKEYS';
+import type SCREENS from '@src/SCREENS';
+import INPUT_IDS from '@src/types/form/SubscriptionSizeForm';
+import Confirmation from './substeps/Confirmation';
+import Size from './substeps/Size';
+
+const bodyContent: Array<React.ComponentType<SubStepProps>> = [Size, Confirmation];
+
+type SubscriptionSizePageProps = StackScreenProps<SettingsNavigatorParamList, typeof SCREENS.SETTINGS.SUBSCRIPTION.SIZE>;
+
+function SubscriptionSizePage({route}: SubscriptionSizePageProps) {
+    const [privateSubscription] = useOnyx(ONYXKEYS.NVP_PRIVATE_SUBSCRIPTION);
+    const [subscriptionSizeFormDraft] = useOnyx(ONYXKEYS.FORMS.SUBSCRIPTION_SIZE_FORM_DRAFT);
+    const {translate} = useLocalize();
+    const canChangeSubscriptionSize = !!(route.params?.canChangeSize ?? 1);
+    const startFrom = canChangeSubscriptionSize ? 0 : 1;
+
+    const onFinished = () => {
+        Subscription.updateSubscriptionSize(subscriptionSizeFormDraft ? Number(subscriptionSizeFormDraft[INPUT_IDS.SUBSCRIPTION_SIZE]) : 0, privateSubscription?.userCount ?? 0);
+        Navigation.goBack();
+    };
+
+    const {componentToRender: SubStep, screenIndex, nextScreen, prevScreen, moveTo} = useSubStep({bodyContent, startFrom, onFinished});
+
+    const onBackButtonPress = () => {
+        if (screenIndex !== 0 && startFrom === 0) {
+            prevScreen();
+            return;
+        }
+
+        Navigation.goBack();
+    };
+
+    useEffect(
+        () => () => {
+            FormActions.clearDraftValues(ONYXKEYS.FORMS.SUBSCRIPTION_SIZE_FORM);
+        },
+        [],
+    );
+
+    return (
+        <ScreenWrapper
+            testID={SubscriptionSizePage.displayName}
+            includeSafeAreaPaddingBottom={false}
+            shouldEnablePickerAvoiding={false}
+            shouldEnableMaxHeight
+            shouldShowOfflineIndicatorInWideScreen
+        >
+            <HeaderWithBackButton
+                title={translate('subscription.subscriptionSize.title')}
+                onBackButtonPress={onBackButtonPress}
+            />
+            <SubStep
+                isEditing={canChangeSubscriptionSize}
+                onNext={nextScreen}
+                onMove={moveTo}
+            />
+        </ScreenWrapper>
+    );
+}
+
+SubscriptionSizePage.displayName = 'SubscriptionSizePage';
+
+export default SubscriptionSizePage;
diff --git a/src/pages/settings/Subscription/SubscriptionSize/substeps/Confirmation.tsx b/src/pages/settings/Subscription/SubscriptionSize/substeps/Confirmation.tsx
new file mode 100644
index 000000000000..d9d77f9da605
--- /dev/null
+++ b/src/pages/settings/Subscription/SubscriptionSize/substeps/Confirmation.tsx
@@ -0,0 +1,86 @@
+import React from 'react';
+import {View} from 'react-native';
+import {useOnyx} from 'react-native-onyx';
+import Button from '@components/Button';
+import FixedFooter from '@components/FixedFooter';
+import MenuItemWithTopDescription from '@components/MenuItemWithTopDescription';
+import Text from '@components/Text';
+import useLocalize from '@hooks/useLocalize';
+import type {SubStepProps} from '@hooks/useSubStep/types';
+import useThemeStyles from '@hooks/useThemeStyles';
+import Navigation from '@navigation/Navigation';
+import {formatSubscriptionEndDate, getNewSubscriptionRenewalDate} from '@pages/settings/Subscription/utils';
+import ONYXKEYS from '@src/ONYXKEYS';
+import INPUT_IDS from '@src/types/form/SubscriptionSizeForm';
+
+type ConfirmationProps = SubStepProps;
+
+function Confirmation({onNext, isEditing}: ConfirmationProps) {
+    const {translate} = useLocalize();
+    const styles = useThemeStyles();
+    const [account] = useOnyx(ONYXKEYS.ACCOUNT);
+    const [privateSubscription] = useOnyx(ONYXKEYS.NVP_PRIVATE_SUBSCRIPTION);
+    const [subscriptionSizeFormDraft] = useOnyx(ONYXKEYS.FORMS.SUBSCRIPTION_SIZE_FORM_DRAFT);
+    const subscriptionRenewalDate = getNewSubscriptionRenewalDate();
+    const subscriptionSizeDraft = subscriptionSizeFormDraft ? Number(subscriptionSizeFormDraft[INPUT_IDS.SUBSCRIPTION_SIZE]) : 0;
+    const subscriptionSize = subscriptionSizeDraft || (privateSubscription?.userCount ?? 0);
+
+    const isTryingToIncreaseSubscriptionSize = subscriptionSizeDraft > (privateSubscription?.userCount ?? 0);
+    const canChangeSubscriptionSize = (account?.canDowngrade ?? false) || (isTryingToIncreaseSubscriptionSize && isEditing);
+    const formattedSubscriptionEndDate = formatSubscriptionEndDate(privateSubscription?.endDate);
+
+    const onClosePress = () => {
+        Navigation.goBack();
+    };
+
+    return (
+        <View style={[styles.flexGrow1]}>
+            {canChangeSubscriptionSize ? (
+                <>
+                    <Text style={[styles.ph5, styles.pb3]}>{translate('subscription.subscriptionSize.confirmDetails')}</Text>
+                    <MenuItemWithTopDescription
+                        interactive={false}
+                        description={translate('subscription.subscriptionSize.subscriptionSize')}
+                        title={translate('subscription.subscriptionSize.activeMembers', {size: subscriptionSize})}
+                    />
+                    <MenuItemWithTopDescription
+                        interactive={false}
+                        description={translate('subscription.subscriptionSize.subscriptionRenews')}
+                        title={subscriptionRenewalDate}
+                    />
+                </>
+            ) : (
+                <>
+                    <Text style={[styles.ph5, styles.pb5, styles.textNormalThemeText]}>{translate('subscription.subscriptionSize.youCantDowngrade')}</Text>
+                    <Text style={[styles.ph5, styles.textNormalThemeText]}>
+                        {translate('subscription.subscriptionSize.youAlreadyCommitted', {
+                            size: privateSubscription?.userCount ?? 0,
+                            date: formattedSubscriptionEndDate,
+                        })}
+                    </Text>
+                </>
+            )}
+            <FixedFooter style={[styles.mtAuto]}>
+                {canChangeSubscriptionSize ? (
+                    <Button
+                        success
+                        large
+                        onPress={onNext}
+                        text={translate('common.save')}
+                    />
+                ) : (
+                    <Button
+                        success
+                        large
+                        onPress={onClosePress}
+                        text={translate('common.close')}
+                    />
+                )}
+            </FixedFooter>
+        </View>
+    );
+}
+
+Confirmation.displayName = 'ConfirmationStep';
+
+export default Confirmation;
diff --git a/src/pages/settings/Subscription/SubscriptionSize/substeps/Size.tsx b/src/pages/settings/Subscription/SubscriptionSize/substeps/Size.tsx
new file mode 100644
index 000000000000..ed42d604181d
--- /dev/null
+++ b/src/pages/settings/Subscription/SubscriptionSize/substeps/Size.tsx
@@ -0,0 +1,84 @@
+import React, {useCallback} from 'react';
+import {View} from 'react-native';
+import {useOnyx} from 'react-native-onyx';
+import FormProvider from '@components/Form/FormProvider';
+import InputWrapper from '@components/Form/InputWrapper';
+import type {FormInputErrors, FormOnyxValues} from '@components/Form/types';
+import Text from '@components/Text';
+import TextInput from '@components/TextInput';
+import useAutoFocusInput from '@hooks/useAutoFocusInput';
+import useLocalize from '@hooks/useLocalize';
+import useStepFormSubmit from '@hooks/useStepFormSubmit';
+import type {SubStepProps} from '@hooks/useSubStep/types';
+import useThemeStyles from '@hooks/useThemeStyles';
+import * as ValidationUtils from '@libs/ValidationUtils';
+import CONST from '@src/CONST';
+import ONYXKEYS from '@src/ONYXKEYS';
+import INPUT_IDS from '@src/types/form/SubscriptionSizeForm';
+
+type SizeProps = SubStepProps;
+
+function Size({onNext}: SizeProps) {
+    const {translate} = useLocalize();
+    const styles = useThemeStyles();
+    const [privateSubscription] = useOnyx(ONYXKEYS.NVP_PRIVATE_SUBSCRIPTION);
+    const {inputCallbackRef} = useAutoFocusInput();
+
+    const handleSubmit = useStepFormSubmit<typeof ONYXKEYS.FORMS.SUBSCRIPTION_SIZE_FORM>({
+        formId: ONYXKEYS.FORMS.SUBSCRIPTION_SIZE_FORM,
+        fieldIds: [INPUT_IDS.SUBSCRIPTION_SIZE],
+        onNext,
+        shouldSaveDraft: true,
+    });
+
+    const defaultValues = {
+        [INPUT_IDS.SUBSCRIPTION_SIZE]: `${privateSubscription?.userCount ?? ''}`,
+    };
+
+    const validate = useCallback(
+        (values: FormOnyxValues<typeof ONYXKEYS.FORMS.SUBSCRIPTION_SIZE_FORM>): FormInputErrors<typeof ONYXKEYS.FORMS.SUBSCRIPTION_SIZE_FORM> => {
+            const errors = ValidationUtils.getFieldRequiredErrors(values, [INPUT_IDS.SUBSCRIPTION_SIZE]);
+            if (values[INPUT_IDS.SUBSCRIPTION_SIZE] && !ValidationUtils.isValidSubscriptionSize(values[INPUT_IDS.SUBSCRIPTION_SIZE])) {
+                errors.subscriptionSize = translate('subscription.subscriptionSize.error.size');
+            }
+
+            if (Number(values[INPUT_IDS.SUBSCRIPTION_SIZE]) === privateSubscription?.userCount) {
+                errors.subscriptionSize = translate('subscription.subscriptionSize.error.sameSize');
+            }
+
+            return errors;
+        },
+        [privateSubscription?.userCount, translate],
+    );
+
+    return (
+        <FormProvider
+            formID={ONYXKEYS.FORMS.SUBSCRIPTION_SIZE_FORM}
+            submitButtonText={translate('common.next')}
+            onSubmit={handleSubmit}
+            validate={validate}
+            style={[styles.mh5, styles.flexGrow1]}
+            enabledWhenOffline
+        >
+            <View>
+                <Text style={[styles.textNormalThemeText, styles.mb5]}>{translate('subscription.subscriptionSize.yourSize')}</Text>
+                <InputWrapper
+                    InputComponent={TextInput}
+                    ref={inputCallbackRef}
+                    inputID={INPUT_IDS.SUBSCRIPTION_SIZE}
+                    label={translate('subscription.subscriptionSize.subscriptionSize')}
+                    aria-label={translate('subscription.subscriptionSize.subscriptionSize')}
+                    role={CONST.ROLE.PRESENTATION}
+                    defaultValue={defaultValues[INPUT_IDS.SUBSCRIPTION_SIZE]}
+                    shouldSaveDraft
+                />
+                <Text style={[styles.formHelp, styles.mt2]}>{translate('subscription.subscriptionSize.eachMonth')}</Text>
+                <Text style={[styles.formHelp, styles.mt2]}>{translate('subscription.subscriptionSize.note')}</Text>
+            </View>
+        </FormProvider>
+    );
+}
+
+Size.displayName = 'SizeStep';
+
+export default Size;
diff --git a/src/pages/settings/Subscription/TaxExemptActions/index.native.tsx b/src/pages/settings/Subscription/TaxExemptActions/index.native.tsx
new file mode 100644
index 000000000000..bc911bbf7895
--- /dev/null
+++ b/src/pages/settings/Subscription/TaxExemptActions/index.native.tsx
@@ -0,0 +1,7 @@
+function TaxExemptActions() {
+    return null; // We need to disable actions on mobile
+}
+
+TaxExemptActions.displayName = 'TaxExemptActions';
+
+export default TaxExemptActions;
diff --git a/src/pages/settings/Subscription/TaxExemptActions/index.tsx b/src/pages/settings/Subscription/TaxExemptActions/index.tsx
new file mode 100644
index 000000000000..22a2fb2d41fe
--- /dev/null
+++ b/src/pages/settings/Subscription/TaxExemptActions/index.tsx
@@ -0,0 +1,71 @@
+import React, {useCallback, useMemo, useRef, useState} from 'react';
+import {View} from 'react-native';
+import * as Expensicons from '@components/Icon/Expensicons';
+import ThreeDotsMenu from '@components/ThreeDotsMenu';
+import type ThreeDotsMenuProps from '@components/ThreeDotsMenu/types';
+import useLocalize from '@hooks/useLocalize';
+import useResponsiveLayout from '@hooks/useResponsiveLayout';
+import useThemeStyles from '@hooks/useThemeStyles';
+import type {AnchorPosition} from '@styles/index';
+import * as Report from '@userActions/Report';
+import * as Subscription from '@userActions/Subscription';
+import CONST from '@src/CONST';
+
+const anchorAlignment = {
+    horizontal: CONST.MODAL.ANCHOR_ORIGIN_HORIZONTAL.RIGHT,
+    vertical: CONST.MODAL.ANCHOR_ORIGIN_VERTICAL.TOP,
+};
+
+function TaxExemptActions() {
+    const {shouldUseNarrowLayout} = useResponsiveLayout();
+    const styles = useThemeStyles();
+    const {translate} = useLocalize();
+    const [threeDotsMenuPosition, setThreeDotsMenuPosition] = useState<AnchorPosition>({horizontal: 0, vertical: 0});
+    const threeDotsMenuContainerRef = useRef<View>(null);
+
+    const overflowMenu: ThreeDotsMenuProps['menuItems'] = useMemo(
+        () => [
+            {
+                icon: Expensicons.Coins,
+                numberOfLinesTitle: 2,
+                text: translate('subscription.details.taxExempt'),
+                onSelected: () => {
+                    Subscription.requestTaxExempt();
+                    Report.navigateToConciergeChat();
+                },
+            },
+        ],
+        [translate],
+    );
+
+    const calculateAndSetThreeDotsMenuPosition = useCallback(() => {
+        if (shouldUseNarrowLayout) {
+            return;
+        }
+        threeDotsMenuContainerRef.current?.measureInWindow((x, y, width, height) => {
+            setThreeDotsMenuPosition({
+                horizontal: x + width,
+                vertical: y + height,
+            });
+        });
+    }, [shouldUseNarrowLayout]);
+
+    return (
+        <View
+            ref={threeDotsMenuContainerRef}
+            style={[styles.mtn2, styles.pAbsolute, styles.rn3]}
+        >
+            <ThreeDotsMenu
+                onIconPress={calculateAndSetThreeDotsMenuPosition}
+                menuItems={overflowMenu}
+                anchorPosition={threeDotsMenuPosition}
+                anchorAlignment={anchorAlignment}
+                shouldOverlay
+            />
+        </View>
+    );
+}
+
+TaxExemptActions.displayName = 'TaxExemptActions';
+
+export default TaxExemptActions;
diff --git a/src/pages/settings/Subscription/utils.ts b/src/pages/settings/Subscription/utils.ts
new file mode 100644
index 000000000000..e9649eb3748d
--- /dev/null
+++ b/src/pages/settings/Subscription/utils.ts
@@ -0,0 +1,22 @@
+import {addMonths, format, startOfMonth} from 'date-fns';
+import CONST from '@src/CONST';
+
+function appendMidnightTime(date: string): string {
+    return `${date}T00:00:00`;
+}
+
+function formatSubscriptionEndDate(date: string | undefined): string {
+    if (!date) {
+        return '';
+    }
+
+    const dateWithMidnightTime = appendMidnightTime(date);
+
+    return format(new Date(dateWithMidnightTime), CONST.DATE.MONTH_DAY_YEAR_ABBR_FORMAT);
+}
+
+function getNewSubscriptionRenewalDate(): string {
+    return format(startOfMonth(addMonths(new Date(), 12)), CONST.DATE.MONTH_DAY_YEAR_ABBR_FORMAT);
+}
+
+export {getNewSubscriptionRenewalDate, formatSubscriptionEndDate};
diff --git a/src/pages/settings/Troubleshoot/TroubleshootPage.tsx b/src/pages/settings/Troubleshoot/TroubleshootPage.tsx
index b2523a4e039c..8396595f5ca9 100644
--- a/src/pages/settings/Troubleshoot/TroubleshootPage.tsx
+++ b/src/pages/settings/Troubleshoot/TroubleshootPage.tsx
@@ -1,4 +1,4 @@
-import React, {useMemo, useState} from 'react';
+import React, {useCallback, useMemo, useState} from 'react';
 import {View} from 'react-native';
 import Onyx, {withOnyx} from 'react-native-onyx';
 import type {OnyxEntry} from 'react-native-onyx';
@@ -13,22 +13,25 @@ import MenuItemList from '@components/MenuItemList';
 import ScreenWrapper from '@components/ScreenWrapper';
 import ScrollView from '@components/ScrollView';
 import Section from '@components/Section';
+import Switch from '@components/Switch';
 import TestToolMenu from '@components/TestToolMenu';
+import TestToolRow from '@components/TestToolRow';
 import Text from '@components/Text';
 import TextLink from '@components/TextLink';
 import useEnvironment from '@hooks/useEnvironment';
 import useLocalize from '@hooks/useLocalize';
-import useTheme from '@hooks/useTheme';
+import useResponsiveLayout from '@hooks/useResponsiveLayout';
 import useThemeStyles from '@hooks/useThemeStyles';
 import useWaitForNavigation from '@hooks/useWaitForNavigation';
-import useWindowDimensions from '@hooks/useWindowDimensions';
+import {setShouldMaskOnyxState} from '@libs/actions/MaskOnyx';
+import ExportOnyxState from '@libs/ExportOnyxState';
 import Navigation from '@libs/Navigation/Navigation';
 import * as App from '@userActions/App';
 import * as Report from '@userActions/Report';
 import type {TranslationPaths} from '@src/languages/types';
 import ONYXKEYS from '@src/ONYXKEYS';
 import ROUTES from '@src/ROUTES';
-import SCREENS from '@src/SCREENS';
+import getLightbulbIllustrationStyle from './getLightbulbIllustrationStyle';
 
 type BaseMenuItem = {
     translationKey: TranslationPaths;
@@ -38,24 +41,36 @@ type BaseMenuItem = {
 
 type TroubleshootPageOnyxProps = {
     shouldStoreLogs: OnyxEntry<boolean>;
+    shouldMaskOnyxState: boolean;
 };
 
 type TroubleshootPageProps = TroubleshootPageOnyxProps;
 
-function TroubleshootPage({shouldStoreLogs}: TroubleshootPageProps) {
+function TroubleshootPage({shouldStoreLogs, shouldMaskOnyxState}: TroubleshootPageProps) {
     const {translate} = useLocalize();
-    const theme = useTheme();
     const styles = useThemeStyles();
     const {isProduction} = useEnvironment();
     const [isConfirmationModalVisible, setIsConfirmationModalVisible] = useState(false);
     const waitForNavigate = useWaitForNavigation();
-    const {isSmallScreenWidth} = useWindowDimensions();
+    const {shouldUseNarrowLayout} = useResponsiveLayout();
+    const illustrationStyle = getLightbulbIllustrationStyle();
+
+    const exportOnyxState = useCallback(() => {
+        ExportOnyxState.readFromOnyxDatabase().then((value: Record<string, unknown>) => {
+            let dataToShare = value;
+            if (shouldMaskOnyxState) {
+                dataToShare = ExportOnyxState.maskFragileData(value);
+            }
+
+            ExportOnyxState.shareAsFile(JSON.stringify(dataToShare));
+        });
+    }, [shouldMaskOnyxState]);
 
     const menuItems = useMemo(() => {
         const debugConsoleItem: BaseMenuItem = {
             translationKey: 'initialSettingsPage.troubleshoot.viewConsole',
-            icon: Expensicons.Gear,
-            action: waitForNavigate(() => Navigation.navigate(ROUTES.SETTINGS_CONSOLE)),
+            icon: Expensicons.Bug,
+            action: waitForNavigate(() => Navigation.navigate(ROUTES.SETTINGS_CONSOLE.getRoute(ROUTES.SETTINGS_TROUBLESHOOT))),
         };
 
         const baseMenuItems: BaseMenuItem[] = [
@@ -64,6 +79,11 @@ function TroubleshootPage({shouldStoreLogs}: TroubleshootPageProps) {
                 icon: Expensicons.RotateLeft,
                 action: () => setIsConfirmationModalVisible(true),
             },
+            {
+                translationKey: 'initialSettingsPage.troubleshoot.exportOnyxState',
+                icon: Expensicons.Download,
+                action: exportOnyxState,
+            },
         ];
 
         if (shouldStoreLogs) {
@@ -79,7 +99,7 @@ function TroubleshootPage({shouldStoreLogs}: TroubleshootPageProps) {
                 wrapperStyle: [styles.sectionMenuItemTopDescription],
             }))
             .reverse();
-    }, [shouldStoreLogs, translate, waitForNavigate, styles.sectionMenuItemTopDescription]);
+    }, [waitForNavigate, exportOnyxState, shouldStoreLogs, translate, styles.sectionMenuItemTopDescription]);
 
     return (
         <ScreenWrapper
@@ -89,21 +109,20 @@ function TroubleshootPage({shouldStoreLogs}: TroubleshootPageProps) {
         >
             <HeaderWithBackButton
                 title={translate('initialSettingsPage.aboutPage.troubleshoot')}
-                shouldShowBackButton={isSmallScreenWidth}
+                shouldShowBackButton={shouldUseNarrowLayout}
                 onBackButtonPress={() => Navigation.goBack(ROUTES.SETTINGS)}
                 icon={Illustrations.Lightbulb}
             />
             <ScrollView contentContainerStyle={styles.pt3}>
-                <View style={[styles.flex1, isSmallScreenWidth ? styles.workspaceSectionMobile : styles.workspaceSection]}>
+                <View style={[styles.flex1, shouldUseNarrowLayout ? styles.workspaceSectionMobile : styles.workspaceSection]}>
                     <Section
                         title={translate('initialSettingsPage.aboutPage.troubleshoot')}
                         subtitle={translate('initialSettingsPage.troubleshoot.description')}
                         isCentralPane
                         subtitleMuted
                         illustration={LottieAnimations.Desk}
-                        illustrationStyle={[styles.mt4, styles.mbn4]}
+                        illustrationStyle={illustrationStyle}
                         titleStyles={styles.accountSettingsSectionTitle}
-                        illustrationBackgroundColor={theme.PAGE_THEMES[SCREENS.SETTINGS.TROUBLESHOOT].backgroundColor}
                         renderSubtitle={() => (
                             <Text style={[styles.flexRow, styles.alignItemsCenter, styles.w100, styles.mt2]}>
                                 <Text style={[styles.textNormal, styles.colorMuted]}>{translate('initialSettingsPage.troubleshoot.description')}</Text>{' '}
@@ -120,6 +139,13 @@ function TroubleshootPage({shouldStoreLogs}: TroubleshootPageProps) {
                         <View style={[styles.flex1, styles.mt5]}>
                             <View>
                                 <ClientSideLoggingToolMenu />
+                                <TestToolRow title={translate('initialSettingsPage.troubleshoot.maskExportOnyxStateData')}>
+                                    <Switch
+                                        accessibilityLabel={translate('initialSettingsPage.troubleshoot.maskExportOnyxStateData')}
+                                        isOn={shouldMaskOnyxState}
+                                        onToggle={setShouldMaskOnyxState}
+                                    />
+                                </TestToolRow>
                             </View>
                             <MenuItemList
                                 menuItems={menuItems}
@@ -158,4 +184,8 @@ export default withOnyx<TroubleshootPageProps, TroubleshootPageOnyxProps>({
     shouldStoreLogs: {
         key: ONYXKEYS.SHOULD_STORE_LOGS,
     },
+    shouldMaskOnyxState: {
+        key: ONYXKEYS.SHOULD_MASK_ONYX_STATE,
+        selector: (shouldMaskOnyxState) => shouldMaskOnyxState ?? true,
+    },
 })(TroubleshootPage);
diff --git a/src/pages/settings/Troubleshoot/getLightbulbIllustrationStyle/index.native.ts b/src/pages/settings/Troubleshoot/getLightbulbIllustrationStyle/index.native.ts
new file mode 100644
index 000000000000..034df2052d97
--- /dev/null
+++ b/src/pages/settings/Troubleshoot/getLightbulbIllustrationStyle/index.native.ts
@@ -0,0 +1,6 @@
+import type {ViewStyle} from 'react-native';
+
+// Styling lottie animations for the Lightbulb component requires different margin values depending on the platform.
+export default function getLightbulbIllustrationStyle(): ViewStyle {
+    return {};
+}
diff --git a/src/pages/settings/Troubleshoot/getLightbulbIllustrationStyle/index.ts b/src/pages/settings/Troubleshoot/getLightbulbIllustrationStyle/index.ts
new file mode 100644
index 000000000000..fa22fde73062
--- /dev/null
+++ b/src/pages/settings/Troubleshoot/getLightbulbIllustrationStyle/index.ts
@@ -0,0 +1,9 @@
+import type {ViewStyle} from 'react-native';
+
+// Styling lottie animations for the Lightbulb component requires different margin values depending on the platform.
+export default function getTripIllustrationStyle(): ViewStyle {
+    return {
+        marginTop: 16,
+        marginBottom: -16,
+    };
+}
diff --git a/src/pages/settings/Wallet/ActivatePhysicalCardPage.tsx b/src/pages/settings/Wallet/ActivatePhysicalCardPage.tsx
index 1d1d6583ffa8..23b694fe0d40 100644
--- a/src/pages/settings/Wallet/ActivatePhysicalCardPage.tsx
+++ b/src/pages/settings/Wallet/ActivatePhysicalCardPage.tsx
@@ -12,9 +12,9 @@ import type {MagicCodeInputHandle} from '@components/MagicCodeInput';
 import Text from '@components/Text';
 import useLocalize from '@hooks/useLocalize';
 import useNetwork from '@hooks/useNetwork';
+import useResponsiveLayout from '@hooks/useResponsiveLayout';
 import useTheme from '@hooks/useTheme';
 import useThemeStyles from '@hooks/useThemeStyles';
-import useWindowDimensions from '@hooks/useWindowDimensions';
 import * as DeviceCapabilities from '@libs/DeviceCapabilities';
 import * as ErrorUtils from '@libs/ErrorUtils';
 import Navigation from '@libs/Navigation/Navigation';
@@ -46,7 +46,7 @@ function ActivatePhysicalCardPage({
 }: ActivatePhysicalCardPageProps) {
     const theme = useTheme();
     const styles = useThemeStyles();
-    const {isExtraSmallScreenHeight} = useWindowDimensions();
+    const {isExtraSmallScreenHeight} = useResponsiveLayout();
     const {translate} = useLocalize();
     const {isOffline} = useNetwork();
 
@@ -105,7 +105,7 @@ function ActivatePhysicalCardPage({
         activateCardCodeInputRef.current?.blur();
 
         if (lastFourDigits.replace(CONST.MAGIC_CODE_EMPTY_CHAR, '').length !== LAST_FOUR_DIGITS_LENGTH) {
-            setFormError('activateCardPage.error.thatDidntMatch');
+            setFormError(translate('activateCardPage.error.thatDidntMatch'));
             return;
         }
         if (inactiveCard?.cardID === undefined) {
@@ -113,7 +113,7 @@ function ActivatePhysicalCardPage({
         }
 
         CardSettings.activatePhysicalExpensifyCard(lastFourDigits, inactiveCard?.cardID);
-    }, [lastFourDigits, inactiveCard?.cardID]);
+    }, [lastFourDigits, inactiveCard?.cardID, translate]);
 
     if (isEmptyObject(inactiveCard)) {
         return <NotFoundPage />;
diff --git a/src/pages/settings/Wallet/AddDebitCardPage.tsx b/src/pages/settings/Wallet/AddDebitCardPage.tsx
index 0beb3c16018d..d785df0ea324 100644
--- a/src/pages/settings/Wallet/AddDebitCardPage.tsx
+++ b/src/pages/settings/Wallet/AddDebitCardPage.tsx
@@ -1,76 +1,33 @@
-import {useRoute} from '@react-navigation/native';
 import React, {useEffect, useRef} from 'react';
-import {View} from 'react-native';
-import type {OnyxEntry} from 'react-native-onyx';
-import {withOnyx} from 'react-native-onyx';
-import AddressSearch from '@components/AddressSearch';
-import CheckboxWithLabel from '@components/CheckboxWithLabel';
-import FormProvider from '@components/Form/FormProvider';
-import InputWrapper from '@components/Form/InputWrapper';
-import type {FormInputErrors, FormOnyxValues} from '@components/Form/types';
+import {useOnyx} from 'react-native-onyx';
+import PaymentCardForm from '@components/AddPaymentCard/PaymentCardForm';
 import HeaderWithBackButton from '@components/HeaderWithBackButton';
 import type {AnimatedTextInputRef} from '@components/RNTextInput';
 import ScreenWrapper from '@components/ScreenWrapper';
-import StateSelector from '@components/StateSelector';
-import Text from '@components/Text';
-import TextInput from '@components/TextInput';
-import TextLink from '@components/TextLink';
 import useLocalize from '@hooks/useLocalize';
 import usePrevious from '@hooks/usePrevious';
-import useThemeStyles from '@hooks/useThemeStyles';
 import Navigation from '@libs/Navigation/Navigation';
-import * as ValidationUtils from '@libs/ValidationUtils';
+import NotFoundPage from '@pages/ErrorPage/NotFoundPage';
 import * as PaymentMethods from '@userActions/PaymentMethods';
-import CONST from '@src/CONST';
 import ONYXKEYS from '@src/ONYXKEYS';
-import ROUTES from '@src/ROUTES';
-import SCREENS from '@src/SCREENS';
-import type {AddDebitCardForm} from '@src/types/form';
-import INPUT_IDS from '@src/types/form/AddDebitCardForm';
 
-type DebitCardPageOnyxProps = {
-    /** Form data propTypes */
-    formData: OnyxEntry<AddDebitCardForm>;
-};
+function DebitCardPage() {
+    // Temporarily disabled
+    return <NotFoundPage />;
 
-type DebitCardPageProps = DebitCardPageOnyxProps;
-
-function IAcceptTheLabel() {
-    const {translate} = useLocalize();
-
-    return (
-        <Text>
-            {`${translate('common.iAcceptThe')}`}
-            <TextLink href={CONST.TERMS_URL}>{`${translate('common.expensifyTermsOfService')}`}</TextLink>
-        </Text>
-    );
-}
-
-const REQUIRED_FIELDS = [
-    INPUT_IDS.NAME_ON_CARD,
-    INPUT_IDS.CARD_NUMBER,
-    INPUT_IDS.EXPIRATION_DATE,
-    INPUT_IDS.SECURITY_CODE,
-    INPUT_IDS.ADDRESS_STREET,
-    INPUT_IDS.ADDRESS_ZIP_CODE,
-    INPUT_IDS.ADDRESS_STATE,
-];
-
-function DebitCardPage({formData}: DebitCardPageProps) {
-    const styles = useThemeStyles();
     const {translate} = useLocalize();
+    const [formData] = useOnyx(ONYXKEYS.FORMS.ADD_PAYMENT_CARD_FORM);
     const prevFormDataSetupComplete = usePrevious(!!formData?.setupComplete);
     const nameOnCardRef = useRef<AnimatedTextInputRef>(null);
-    const route = useRoute();
 
     /**
      * Reset the form values on the mount and unmount so that old errors don't show when this form is displayed again.
      */
     useEffect(() => {
-        PaymentMethods.clearDebitCardFormErrorAndSubmit();
+        PaymentMethods.clearPaymentCardFormErrorAndSubmit();
 
         return () => {
-            PaymentMethods.clearDebitCardFormErrorAndSubmit();
+            PaymentMethods.clearPaymentCardFormErrorAndSubmit();
         };
     }, []);
 
@@ -82,43 +39,6 @@ function DebitCardPage({formData}: DebitCardPageProps) {
         PaymentMethods.continueSetup();
     }, [prevFormDataSetupComplete, formData?.setupComplete]);
 
-    /**
-     * @param values - form input values passed by the Form component
-     */
-    const validate = (values: FormOnyxValues<typeof ONYXKEYS.FORMS.ADD_DEBIT_CARD_FORM>): FormInputErrors<typeof ONYXKEYS.FORMS.ADD_DEBIT_CARD_FORM> => {
-        const errors = ValidationUtils.getFieldRequiredErrors(values, REQUIRED_FIELDS);
-
-        if (values.nameOnCard && !ValidationUtils.isValidLegalName(values.nameOnCard)) {
-            errors.nameOnCard = 'addDebitCardPage.error.invalidName';
-        }
-
-        if (values.cardNumber && !ValidationUtils.isValidDebitCard(values.cardNumber.replace(/ /g, ''))) {
-            errors.cardNumber = 'addDebitCardPage.error.debitCardNumber';
-        }
-
-        if (values.expirationDate && !ValidationUtils.isValidExpirationDate(values.expirationDate)) {
-            errors.expirationDate = 'addDebitCardPage.error.expirationDate';
-        }
-
-        if (values.securityCode && !ValidationUtils.isValidSecurityCode(values.securityCode)) {
-            errors.securityCode = 'addDebitCardPage.error.securityCode';
-        }
-
-        if (values.addressStreet && !ValidationUtils.isValidAddress(values.addressStreet)) {
-            errors.addressStreet = 'addDebitCardPage.error.addressStreet';
-        }
-
-        if (values.addressZipCode && !ValidationUtils.isValidZipCode(values.addressZipCode)) {
-            errors.addressZipCode = 'addDebitCardPage.error.addressZipCode';
-        }
-
-        if (!values.acceptTerms) {
-            errors.acceptTerms = 'common.error.acceptTerms';
-        }
-
-        return errors;
-    };
-
     return (
         <ScreenWrapper
             onEntryTransitionEnd={() => nameOnCardRef.current?.focus()}
@@ -129,103 +49,19 @@ function DebitCardPage({formData}: DebitCardPageProps) {
                 title={translate('addDebitCardPage.addADebitCard')}
                 onBackButtonPress={() => Navigation.goBack()}
             />
-            <FormProvider
-                formID={ONYXKEYS.FORMS.ADD_DEBIT_CARD_FORM}
-                validate={validate}
-                onSubmit={PaymentMethods.addPaymentCard}
+            <PaymentCardForm
+                showAcceptTerms
+                shouldShowPaymentCardForm
+                showAddressField
+                isDebitCard
+                showStateSelector
+                addPaymentCard={PaymentMethods.addPaymentCard}
                 submitButtonText={translate('common.save')}
-                scrollContextEnabled
-                style={[styles.mh5, styles.flexGrow1]}
-            >
-                <InputWrapper
-                    InputComponent={TextInput}
-                    inputID={INPUT_IDS.NAME_ON_CARD}
-                    label={translate('addDebitCardPage.nameOnCard')}
-                    aria-label={translate('addDebitCardPage.nameOnCard')}
-                    role={CONST.ROLE.PRESENTATION}
-                    ref={nameOnCardRef}
-                    spellCheck={false}
-                />
-                <InputWrapper
-                    InputComponent={TextInput}
-                    inputID={INPUT_IDS.CARD_NUMBER}
-                    label={translate('addDebitCardPage.debitCardNumber')}
-                    aria-label={translate('addDebitCardPage.debitCardNumber')}
-                    role={CONST.ROLE.PRESENTATION}
-                    containerStyles={[styles.mt4]}
-                    inputMode={CONST.INPUT_MODE.NUMERIC}
-                />
-                <View style={[styles.flexRow, styles.mt4]}>
-                    <View style={[styles.flex1, styles.mr2]}>
-                        <InputWrapper
-                            InputComponent={TextInput}
-                            inputID={INPUT_IDS.EXPIRATION_DATE}
-                            label={translate('addDebitCardPage.expiration')}
-                            aria-label={translate('addDebitCardPage.expiration')}
-                            role={CONST.ROLE.PRESENTATION}
-                            placeholder={translate('addDebitCardPage.expirationDate')}
-                            inputMode={CONST.INPUT_MODE.NUMERIC}
-                            maxLength={4}
-                        />
-                    </View>
-                    <View style={[styles.flex1]}>
-                        <InputWrapper
-                            InputComponent={TextInput}
-                            inputID={INPUT_IDS.SECURITY_CODE}
-                            label={translate('addDebitCardPage.cvv')}
-                            aria-label={translate('addDebitCardPage.cvv')}
-                            role={CONST.ROLE.PRESENTATION}
-                            maxLength={4}
-                            inputMode={CONST.INPUT_MODE.NUMERIC}
-                        />
-                    </View>
-                </View>
-                <View>
-                    <InputWrapper
-                        InputComponent={AddressSearch}
-                        inputID={INPUT_IDS.ADDRESS_STREET}
-                        label={translate('addDebitCardPage.billingAddress')}
-                        containerStyles={[styles.mt4]}
-                        maxInputLength={CONST.FORM_CHARACTER_LIMIT}
-                        // Limit the address search only to the USA until we fully can support international debit cards
-                        isLimitedToUSA
-                    />
-                </View>
-                <InputWrapper
-                    InputComponent={TextInput}
-                    inputID={INPUT_IDS.ADDRESS_ZIP_CODE}
-                    label={translate('common.zip')}
-                    aria-label={translate('common.zip')}
-                    role={CONST.ROLE.PRESENTATION}
-                    inputMode={CONST.INPUT_MODE.NUMERIC}
-                    maxLength={CONST.BANK_ACCOUNT.MAX_LENGTH.ZIP_CODE}
-                    hint={['common.zipCodeExampleFormat', {zipSampleFormat: CONST.COUNTRY_ZIP_REGEX_DATA.US.samples}]}
-                    containerStyles={[styles.mt4]}
-                />
-                <View style={[styles.mt4, styles.mhn5]}>
-                    <InputWrapper
-                        stateSelectorRoute={route.name === SCREENS.IOU_SEND.ADD_DEBIT_CARD ? ROUTES.MONEY_REQUEST_STATE_SELECTOR : undefined}
-                        InputComponent={StateSelector}
-                        inputID={INPUT_IDS.ADDRESS_STATE}
-                    />
-                </View>
-                <InputWrapper
-                    InputComponent={CheckboxWithLabel}
-                    accessibilityLabel={`${translate('common.iAcceptThe')} ${translate('common.expensifyTermsOfService')}`}
-                    inputID={INPUT_IDS.ACCEPT_TERMS}
-                    defaultValue={false}
-                    LabelComponent={IAcceptTheLabel}
-                    style={[styles.mt4]}
-                />
-            </FormProvider>
+            />
         </ScreenWrapper>
     );
 }
 
 DebitCardPage.displayName = 'DebitCardPage';
 
-export default withOnyx<DebitCardPageProps, DebitCardPageOnyxProps>({
-    formData: {
-        key: ONYXKEYS.FORMS.ADD_DEBIT_CARD_FORM,
-    },
-})(DebitCardPage);
+export default DebitCardPage;
diff --git a/src/pages/settings/Wallet/Card/BaseGetPhysicalCard.tsx b/src/pages/settings/Wallet/Card/BaseGetPhysicalCard.tsx
index 8fff374e0c8e..ae003c4afbe2 100644
--- a/src/pages/settings/Wallet/Card/BaseGetPhysicalCard.tsx
+++ b/src/pages/settings/Wallet/Card/BaseGetPhysicalCard.tsx
@@ -111,7 +111,7 @@ function BaseGetPhysicalCard({
 
     const domainCards = CardUtils.getDomainCards(cardList)[domain] || [];
     const cardToBeIssued = domainCards.find((card) => !card?.nameValuePairs?.isVirtual && card?.state === CONST.EXPENSIFY_CARD.STATE.STATE_NOT_ISSUED);
-    const cardID = cardToBeIssued?.cardID.toString() ?? '';
+    const cardID = cardToBeIssued?.cardID.toString() ?? '-1';
 
     useEffect(() => {
         if (isRouteSet.current || !privatePersonalDetails || !cardList) {
@@ -132,7 +132,7 @@ function BaseGetPhysicalCard({
         }
 
         if (!draftValues) {
-            const updatedDraftValues = GetPhysicalCardUtils.getUpdatedDraftValues(null, privatePersonalDetails, loginList);
+            const updatedDraftValues = GetPhysicalCardUtils.getUpdatedDraftValues(undefined, privatePersonalDetails, loginList);
             // Form draft data needs to be initialized with the private personal details
             // If no draft data exists
             FormActions.setDraftValues(ONYXKEYS.FORMS.GET_PHYSICAL_CARD_FORM, updatedDraftValues);
@@ -140,15 +140,15 @@ function BaseGetPhysicalCard({
         }
 
         // Redirect user to previous steps of the flow if he hasn't finished them yet
-        GetPhysicalCardUtils.setCurrentRoute(currentRoute, domain, GetPhysicalCardUtils.getUpdatedPrivatePersonalDetails(draftValues));
+        GetPhysicalCardUtils.setCurrentRoute(currentRoute, domain, GetPhysicalCardUtils.getUpdatedPrivatePersonalDetails(draftValues, privatePersonalDetails));
         isRouteSet.current = true;
     }, [cardList, currentRoute, domain, domainCards.length, draftValues, loginList, cardToBeIssued, privatePersonalDetails]);
 
     const onSubmit = useCallback(() => {
-        const updatedPrivatePersonalDetails = GetPhysicalCardUtils.getUpdatedPrivatePersonalDetails(draftValues);
+        const updatedPrivatePersonalDetails = GetPhysicalCardUtils.getUpdatedPrivatePersonalDetails(draftValues, privatePersonalDetails);
         // If the current step of the get physical card flow is the confirmation page
         if (isConfirmation) {
-            Wallet.requestPhysicalExpensifyCard(cardToBeIssued?.cardID ?? 0, session?.authToken ?? '', updatedPrivatePersonalDetails);
+            Wallet.requestPhysicalExpensifyCard(cardToBeIssued?.cardID ?? -1, session?.authToken ?? '', updatedPrivatePersonalDetails);
             // Form draft data needs to be erased when the flow is complete,
             // so that no stale data is left on Onyx
             FormActions.clearDraftValues(ONYXKEYS.FORMS.GET_PHYSICAL_CARD_FORM);
@@ -156,7 +156,7 @@ function BaseGetPhysicalCard({
             return;
         }
         GetPhysicalCardUtils.goToNextPhysicalCardRoute(domain, updatedPrivatePersonalDetails);
-    }, [cardID, cardToBeIssued?.cardID, domain, draftValues, isConfirmation, session?.authToken]);
+    }, [cardID, cardToBeIssued?.cardID, domain, draftValues, isConfirmation, session?.authToken, privatePersonalDetails]);
     return (
         <ScreenWrapper
             shouldEnablePickerAvoiding={false}
diff --git a/src/pages/settings/Wallet/Card/GetPhysicalCardAddress.tsx b/src/pages/settings/Wallet/Card/GetPhysicalCardAddress.tsx
index 5f3dbb3fa6c3..69ba24585e2e 100644
--- a/src/pages/settings/Wallet/Card/GetPhysicalCardAddress.tsx
+++ b/src/pages/settings/Wallet/Card/GetPhysicalCardAddress.tsx
@@ -1,15 +1,18 @@
 import type {StackScreenProps} from '@react-navigation/stack';
-import React, {useCallback, useEffect} from 'react';
+import React, {useCallback, useEffect, useState} from 'react';
 import {withOnyx} from 'react-native-onyx';
 import type {OnyxEntry} from 'react-native-onyx';
 import AddressForm from '@components/AddressForm';
 import useLocalize from '@hooks/useLocalize';
 import * as FormActions from '@libs/actions/FormActions';
 import type {SettingsNavigatorParamList} from '@navigation/types';
+import type {Country} from '@src/CONST';
 import ONYXKEYS from '@src/ONYXKEYS';
 import ROUTES from '@src/ROUTES';
 import type SCREENS from '@src/SCREENS';
 import type {GetPhysicalCardForm} from '@src/types/form';
+import INPUT_IDS from '@src/types/form/GetPhysicalCardForm';
+import type {Address} from '@src/types/onyx/PrivatePersonalDetails';
 import BaseGetPhysicalCard from './BaseGetPhysicalCard';
 import type {RenderContentProps} from './BaseGetPhysicalCard';
 
@@ -28,7 +31,22 @@ function GetPhysicalCardAddress({
 }: GetPhysicalCardAddressProps) {
     const {translate} = useLocalize();
 
-    const {addressLine1 = '', addressLine2 = '', city = '', state = '', zipPostCode = '', country = ''} = draftValues ?? {};
+    const {addressLine1, addressLine2} = draftValues ?? {};
+    const [country, setCountry] = useState(draftValues?.country);
+    const [state, setState] = useState(draftValues?.state);
+    const [city, setCity] = useState(draftValues?.city);
+    const [zipPostCode, setZipPostCode] = useState(draftValues?.zipPostCode);
+
+    useEffect(() => {
+        if (!draftValues) {
+            return;
+        }
+        setState(draftValues.state);
+        setCountry(draftValues.country);
+        setCity(draftValues.city);
+        setZipPostCode(draftValues.zipPostCode);
+        // eslint-disable-next-line react-compiler/react-compiler, react-hooks/exhaustive-deps
+    }, [draftValues?.state, draftValues?.country, draftValues?.city, draftValues?.zipPostCode]);
 
     useEffect(() => {
         if (!countryFromUrl) {
@@ -37,11 +55,40 @@ function GetPhysicalCardAddress({
         FormActions.setDraftValues(ONYXKEYS.FORMS.GET_PHYSICAL_CARD_FORM, {country: countryFromUrl});
     }, [countryFromUrl]);
 
+    const handleAddressChange = useCallback((value: unknown, key: unknown) => {
+        const addressPart = value as string;
+        const addressPartKey = key as keyof Address;
+
+        if (addressPartKey !== INPUT_IDS.COUNTRY && addressPartKey !== INPUT_IDS.STATE && addressPartKey !== INPUT_IDS.CITY && addressPartKey !== INPUT_IDS.ZIP_POST_CODE) {
+            return;
+        }
+        if (addressPartKey === INPUT_IDS.COUNTRY) {
+            setCountry(addressPart as Country | '');
+            setState('');
+            setCity('');
+            setZipPostCode('');
+            return;
+        }
+        if (addressPartKey === INPUT_IDS.STATE) {
+            setState(addressPart);
+            setCity('');
+            setZipPostCode('');
+            return;
+        }
+        if (addressPartKey === INPUT_IDS.CITY) {
+            setCity(addressPart);
+            setZipPostCode('');
+            return;
+        }
+        setZipPostCode(addressPart);
+    }, []);
+
     const renderContent = useCallback(
         ({onSubmit, submitButtonText}: RenderContentProps) => (
             <AddressForm
                 formID={ONYXKEYS.FORMS.GET_PHYSICAL_CARD_FORM}
                 onSubmit={onSubmit}
+                onAddressChanged={handleAddressChange}
                 submitButtonText={submitButtonText}
                 city={city}
                 country={country}
@@ -52,7 +99,7 @@ function GetPhysicalCardAddress({
                 zip={zipPostCode}
             />
         ),
-        [addressLine1, addressLine2, city, country, state, zipPostCode],
+        [addressLine1, addressLine2, city, country, handleAddressChange, state, zipPostCode],
     );
 
     return (
diff --git a/src/pages/settings/Wallet/Card/GetPhysicalCardConfirm.tsx b/src/pages/settings/Wallet/Card/GetPhysicalCardConfirm.tsx
index c6b4bc2272d1..15354c3cdfb8 100644
--- a/src/pages/settings/Wallet/Card/GetPhysicalCardConfirm.tsx
+++ b/src/pages/settings/Wallet/Card/GetPhysicalCardConfirm.tsx
@@ -77,13 +77,15 @@ function GetPhysicalCardConfirm({
                 onPress={() => goToGetPhysicalCardAddress(domain)}
                 shouldShowRightIcon
                 title={PersonalDetailsUtils.getFormattedAddress({
-                    address: {
-                        street: PersonalDetailsUtils.getFormattedStreet(addressLine1, addressLine2),
-                        city,
-                        state,
-                        zip: zipPostCode,
-                        country,
-                    },
+                    addresses: [
+                        {
+                            street: PersonalDetailsUtils.getFormattedStreet(addressLine1, addressLine2),
+                            city,
+                            state,
+                            zip: zipPostCode,
+                            country,
+                        },
+                    ],
                 })}
             />
         </BaseGetPhysicalCard>
diff --git a/src/pages/settings/Wallet/Card/GetPhysicalCardName.tsx b/src/pages/settings/Wallet/Card/GetPhysicalCardName.tsx
index 1667aa8d36d3..deaa05350c7f 100644
--- a/src/pages/settings/Wallet/Card/GetPhysicalCardName.tsx
+++ b/src/pages/settings/Wallet/Card/GetPhysicalCardName.tsx
@@ -43,15 +43,15 @@ function GetPhysicalCardName({
         const errors: OnValidateResult = {};
 
         if (values?.legalFirstName && !ValidationUtils.isValidLegalName(values.legalFirstName)) {
-            errors.legalFirstName = 'privatePersonalDetails.error.hasInvalidCharacter';
+            errors.legalFirstName = translate('privatePersonalDetails.error.hasInvalidCharacter');
         } else if (!values?.legalFirstName) {
-            errors.legalFirstName = 'common.error.fieldRequired';
+            errors.legalFirstName = translate('common.error.fieldRequired');
         }
 
         if (values?.legalLastName && !ValidationUtils.isValidLegalName(values.legalLastName)) {
-            errors.legalLastName = 'privatePersonalDetails.error.hasInvalidCharacter';
+            errors.legalLastName = translate('privatePersonalDetails.error.hasInvalidCharacter');
         } else if (!values?.legalLastName) {
-            errors.legalLastName = 'common.error.fieldRequired';
+            errors.legalLastName = translate('common.error.fieldRequired');
         }
 
         return errors;
diff --git a/src/pages/settings/Wallet/Card/GetPhysicalCardPhone.tsx b/src/pages/settings/Wallet/Card/GetPhysicalCardPhone.tsx
index f709de4b51c3..56d5a29a3203 100644
--- a/src/pages/settings/Wallet/Card/GetPhysicalCardPhone.tsx
+++ b/src/pages/settings/Wallet/Card/GetPhysicalCardPhone.tsx
@@ -42,9 +42,9 @@ function GetPhysicalCardPhone({
         const errors: OnValidateResult = {};
 
         if (!LoginUtils.validateNumber(phoneNumberToValidate)) {
-            errors.phoneNumber = 'common.error.phoneNumber';
+            errors.phoneNumber = translate('common.error.phoneNumber');
         } else if (!phoneNumberToValidate) {
-            errors.phoneNumber = 'common.error.fieldRequired';
+            errors.phoneNumber = translate('common.error.fieldRequired');
         }
 
         return errors;
diff --git a/src/pages/settings/Wallet/ExpensifyCardPage.tsx b/src/pages/settings/Wallet/ExpensifyCardPage.tsx
index 49686e19852c..4fec05f51e13 100644
--- a/src/pages/settings/Wallet/ExpensifyCardPage.tsx
+++ b/src/pages/settings/Wallet/ExpensifyCardPage.tsx
@@ -32,7 +32,7 @@ import ROUTES from '@src/ROUTES';
 import type SCREENS from '@src/SCREENS';
 import type {GetPhysicalCardForm} from '@src/types/form';
 import type {LoginList, Card as OnyxCard, PrivatePersonalDetails} from '@src/types/onyx';
-import type {TCardDetails} from '@src/types/onyx/Card';
+import type {ExpensifyCardDetails} from '@src/types/onyx/Card';
 import RedDotCardSection from './RedDotCardSection';
 import CardDetails from './WalletPage/CardDetails';
 
@@ -84,14 +84,14 @@ function ExpensifyCardPage({
     const styles = useThemeStyles();
     const {isOffline} = useNetwork();
     const {translate} = useLocalize();
-    const shouldDisplayCardDomain = !cardList?.[cardID]?.nameValuePairs?.issuedBy;
+    const shouldDisplayCardDomain = !cardList?.[cardID]?.nameValuePairs?.issuedBy || !cardList?.[cardID]?.nameValuePairs?.isVirtual;
     const domain = cardList?.[cardID]?.domainName ?? '';
     const pageTitle = shouldDisplayCardDomain ? translate('cardPage.expensifyCard') : cardList?.[cardID]?.nameValuePairs?.cardTitle ?? translate('cardPage.expensifyCard');
 
     const [isNotFound, setIsNotFound] = useState(false);
     const cardsToShow = useMemo(() => {
         if (shouldDisplayCardDomain) {
-            return CardUtils.getDomainCards(cardList)[domain]?.filter((card) => !card?.nameValuePairs?.issuedBy) ?? [];
+            return CardUtils.getDomainCards(cardList)[domain]?.filter((card) => !card?.nameValuePairs?.issuedBy || !card?.nameValuePairs?.isVirtual) ?? [];
         }
         return [cardList?.[cardID]];
     }, [shouldDisplayCardDomain, cardList, cardID, domain]);
@@ -101,7 +101,7 @@ function ExpensifyCardPage({
 
     const virtualCards = useMemo(() => cardsToShow?.filter((card) => card?.nameValuePairs?.isVirtual), [cardsToShow]);
     const physicalCards = useMemo(() => cardsToShow?.filter((card) => !card?.nameValuePairs?.isVirtual), [cardsToShow]);
-    const [cardsDetails, setCardsDetails] = useState<Record<number, TCardDetails | null>>({});
+    const [cardsDetails, setCardsDetails] = useState<Record<number, ExpensifyCardDetails | null>>({});
     const [isCardDetailsLoading, setIsCardDetailsLoading] = useState<Record<number, boolean>>({});
     const [cardsDetailsErrors, setCardsDetailsErrors] = useState<Record<number, string>>({});
 
@@ -116,13 +116,13 @@ function ExpensifyCardPage({
         // eslint-disable-next-line rulesdir/no-thenable-actions-in-views
         Card.revealVirtualCardDetails(revealedCardID)
             .then((value) => {
-                setCardsDetails((prevState: Record<number, TCardDetails | null>) => ({...prevState, [revealedCardID]: value as TCardDetails}));
+                setCardsDetails((prevState: Record<number, ExpensifyCardDetails | null>) => ({...prevState, [revealedCardID]: value}));
                 setCardsDetailsErrors((prevState) => ({
                     ...prevState,
                     [revealedCardID]: '',
                 }));
             })
-            .catch((error) => {
+            .catch((error: string) => {
                 setCardsDetailsErrors((prevState) => ({
                     ...prevState,
                     [revealedCardID]: error,
@@ -140,13 +140,13 @@ function ExpensifyCardPage({
     const goToGetPhysicalCardFlow = () => {
         let updatedDraftValues = draftValues;
         if (!draftValues) {
-            updatedDraftValues = GetPhysicalCardUtils.getUpdatedDraftValues(null, privatePersonalDetails, loginList);
+            updatedDraftValues = GetPhysicalCardUtils.getUpdatedDraftValues(undefined, privatePersonalDetails, loginList);
             // Form draft data needs to be initialized with the private personal details
             // If no draft data exists
             FormActions.setDraftValues(ONYXKEYS.FORMS.GET_PHYSICAL_CARD_FORM, updatedDraftValues);
         }
 
-        GetPhysicalCardUtils.goToNextPhysicalCardRoute(domain, GetPhysicalCardUtils.getUpdatedPrivatePersonalDetails(updatedDraftValues));
+        GetPhysicalCardUtils.goToNextPhysicalCardRoute(domain, GetPhysicalCardUtils.getUpdatedPrivatePersonalDetails(updatedDraftValues, privatePersonalDetails));
     };
 
     if (isNotFound) {
@@ -173,7 +173,7 @@ function ExpensifyCardPage({
                             <DotIndicatorMessage
                                 style={styles.pageWrapper}
                                 textStyles={styles.walletLockedMessage}
-                                messages={{error: 'cardPage.cardLocked'}}
+                                messages={{error: translate('cardPage.cardLocked')}}
                                 type="error"
                             />
                         )}
diff --git a/src/pages/settings/Wallet/PaymentMethodList.tsx b/src/pages/settings/Wallet/PaymentMethodList.tsx
index f684b76a152e..0d127e3346ae 100644
--- a/src/pages/settings/Wallet/PaymentMethodList.tsx
+++ b/src/pages/settings/Wallet/PaymentMethodList.tsx
@@ -4,7 +4,7 @@ import React, {useCallback, useMemo} from 'react';
 import type {GestureResponderEvent, StyleProp, ViewStyle} from 'react-native';
 import {FlatList, View} from 'react-native';
 import type {OnyxEntry} from 'react-native-onyx';
-import {withOnyx} from 'react-native-onyx';
+import {useOnyx, withOnyx} from 'react-native-onyx';
 import type {SvgProps} from 'react-native-svg/lib/typescript/ReactNativeSVG';
 import type {ValueOf} from 'type-fest';
 import type {RenderSuggestionMenuItemProps} from '@components/AutoCompleteSuggestions/types';
@@ -29,7 +29,7 @@ import * as PaymentMethods from '@userActions/PaymentMethods';
 import CONST from '@src/CONST';
 import ONYXKEYS from '@src/ONYXKEYS';
 import ROUTES from '@src/ROUTES';
-import type {AccountData, BankAccountList, CardList, FundList} from '@src/types/onyx';
+import type {AccountData, BankAccountList, CardList} from '@src/types/onyx';
 import type {BankIcon} from '@src/types/onyx/Bank';
 import type {Errors} from '@src/types/onyx/OnyxCommon';
 import type PaymentMethod from '@src/types/onyx/PaymentMethod';
@@ -45,7 +45,7 @@ type PaymentMethodListOnyxProps = {
     cardList: OnyxEntry<CardList>;
 
     /** List of user's cards */
-    fundList: OnyxEntry<FundList>;
+    // fundList: OnyxEntry<FundList>;
 
     /** Are we loading payment methods? */
     isLoadingPaymentMethods: OnyxEntry<boolean>;
@@ -175,7 +175,8 @@ function PaymentMethodList({
     bankAccountList = {},
     buttonRef = () => {},
     cardList = {},
-    fundList = {},
+    // Temporarily disabled because P2P debit cards are disabled.
+    // fundList = {},
     filterType = '',
     listHeaderComponent,
     isLoadingPaymentMethods = true,
@@ -196,6 +197,7 @@ function PaymentMethodList({
     const StyleUtils = useStyleUtils();
     const {translate} = useLocalize();
     const {isOffline} = useNetwork();
+    const [isUserValidated] = useOnyx(ONYXKEYS.USER, {selector: (user) => !!user?.validated});
 
     const filteredPaymentMethods = useMemo(() => {
         if (shouldShowAssignedCards) {
@@ -226,7 +228,7 @@ function PaymentMethodList({
                     return;
                 }
 
-                const isAdminIssuedVirtualCard = !!card?.nameValuePairs?.issuedBy;
+                const isAdminIssuedVirtualCard = !!card?.nameValuePairs?.issuedBy && !!card?.nameValuePairs?.isVirtual;
 
                 // The card should be grouped to a specific domain and such domain already exists in a assignedCardsGrouped
                 if (assignedCardsGrouped.some((item) => item.isGroupedCardDomain && item.description === card.domainName) && !isAdminIssuedVirtualCard) {
@@ -242,7 +244,7 @@ function PaymentMethodList({
                 assignedCardsGrouped.push({
                     key: card.cardID.toString(),
                     // eslint-disable-next-line @typescript-eslint/prefer-nullish-coalescing
-                    title: isAdminIssuedVirtualCard ? card?.nameValuePairs?.cardTitle || card.bank : card.bank,
+                    title: card?.nameValuePairs?.cardTitle || card.bank,
                     description: card.domainName,
                     onPress: () => Navigation.navigate(ROUTES.SETTINGS_WALLET_DOMAINCARD.getRoute(String(card.cardID))),
                     isGroupedCardDomain: !isAdminIssuedVirtualCard,
@@ -260,10 +262,11 @@ function PaymentMethodList({
             return assignedCardsGrouped;
         }
 
-        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 = Object.values(paymentCardList).filter((card) => !!card.accountData?.additionalData?.isP2PDebitCard);
+        // All payment cards are temporarily disabled for use as a payment method
+        // const paymentCardList = fundList ?? {};
+        // const filteredCardList = Object.values(paymentCardList).filter((card) => !!card.accountData?.additionalData?.isP2PDebitCard);
+        const filteredCardList = {};
         let combinedPaymentMethods = PaymentUtils.formatPaymentMethods(bankAccountList ?? {}, filteredCardList, styles);
 
         if (filterType !== '') {
@@ -302,20 +305,7 @@ function PaymentMethodList({
             };
         });
         return combinedPaymentMethods;
-    }, [
-        shouldShowAssignedCards,
-        fundList,
-        bankAccountList,
-        styles,
-        filterType,
-        isOffline,
-        cardList,
-        actionPaymentMethodType,
-        activePaymentMethodID,
-        StyleUtils,
-        shouldShowRightIcon,
-        onPress,
-    ]);
+    }, [shouldShowAssignedCards, bankAccountList, styles, filterType, isOffline, cardList, actionPaymentMethodType, activePaymentMethodID, StyleUtils, shouldShowRightIcon, onPress]);
 
     /**
      * Render placeholder when there are no payments methods
@@ -331,10 +321,11 @@ function PaymentMethodList({
                 wrapperStyle={[styles.paymentMethod, listItemStyle]}
                 hoverAndPressStyle={styles.hoveredComponentBG}
                 ref={buttonRef}
+                disabled={!isUserValidated}
             />
         ),
 
-        [onPress, translate, styles.paymentMethod, styles.hoveredComponentBG, listItemStyle, buttonRef],
+        [onPress, translate, styles.paymentMethod, styles.hoveredComponentBG, listItemStyle, buttonRef, isUserValidated],
     );
 
     /**
@@ -423,9 +414,10 @@ export default withOnyx<PaymentMethodListProps, PaymentMethodListOnyxProps>({
     cardList: {
         key: ONYXKEYS.CARD_LIST,
     },
-    fundList: {
-        key: ONYXKEYS.FUND_LIST,
-    },
+    // Temporarily disabled - used for P2P debit cards
+    // fundList: {
+    //     key: ONYXKEYS.FUND_LIST,
+    // },
     isLoadingPaymentMethods: {
         key: ONYXKEYS.IS_LOADING_PAYMENT_METHODS,
     },
diff --git a/src/pages/settings/Wallet/ReportCardLostPage.tsx b/src/pages/settings/Wallet/ReportCardLostPage.tsx
index 9d6c69249130..35b5bc9cd19a 100644
--- a/src/pages/settings/Wallet/ReportCardLostPage.tsx
+++ b/src/pages/settings/Wallet/ReportCardLostPage.tsx
@@ -11,6 +11,7 @@ import SingleOptionSelector from '@components/SingleOptionSelector';
 import Text from '@components/Text';
 import useLocalize from '@hooks/useLocalize';
 import usePrevious from '@hooks/usePrevious';
+import useStyledSafeAreaInsets from '@hooks/useStyledSafeAreaInsets';
 import useThemeStyles from '@hooks/useThemeStyles';
 import Navigation from '@libs/Navigation/Navigation';
 import type {SettingsNavigatorParamList} from '@libs/Navigation/types';
@@ -64,14 +65,16 @@ type ReportCardLostPageProps = ReportCardLostPageOnyxProps & StackScreenProps<Se
 
 function ReportCardLostPage({
     privatePersonalDetails = {
-        address: {
-            street: '',
-            street2: '',
-            city: '',
-            state: '',
-            zip: '',
-            country: '',
-        },
+        addresses: [
+            {
+                street: '',
+                street2: '',
+                city: '',
+                state: '',
+                zip: '',
+                country: '',
+            },
+        ],
     },
     cardList = {},
     route: {
@@ -92,6 +95,8 @@ function ReportCardLostPage({
 
     const prevIsLoading = usePrevious(formData?.isLoading);
 
+    const {paddingBottom} = useStyledSafeAreaInsets();
+
     const formattedAddress = PersonalDetailsUtils.getFormattedAddress(privatePersonalDetails ?? {});
 
     useEffect(() => {
@@ -159,11 +164,11 @@ function ReportCardLostPage({
                 title={translate('reportCardLostOrDamaged.screenTitle')}
                 onBackButtonPress={handleBackButtonPress}
             />
-            <View style={[styles.flex1, styles.justifyContentBetween, styles.pt3]}>
+            <View style={[styles.flex1, styles.justifyContentBetween, styles.pt3, styles.mh5, !paddingBottom ? styles.pb5 : null]}>
                 {isReasonConfirmed ? (
                     <>
                         <View>
-                            <Text style={[styles.textHeadline, styles.mb3, styles.mh5]}>{translate('reportCardLostOrDamaged.confirmAddressTitle')}</Text>
+                            <Text style={[styles.textHeadline, styles.mb3]}>{translate('reportCardLostOrDamaged.confirmAddressTitle')}</Text>
                             <MenuItemWithTopDescription
                                 title={formattedAddress}
                                 description={translate('reportCardLostOrDamaged.address')}
@@ -172,22 +177,22 @@ function ReportCardLostPage({
                                 numberOfLinesTitle={2}
                             />
                             {isDamaged ? (
-                                <Text style={[styles.mt3, styles.mh5]}>{translate('reportCardLostOrDamaged.cardDamagedInfo')}</Text>
+                                <Text style={[styles.mt3]}>{translate('reportCardLostOrDamaged.cardDamagedInfo')}</Text>
                             ) : (
-                                <Text style={[styles.mt3, styles.mh5]}>{translate('reportCardLostOrDamaged.cardLostOrStolenInfo')}</Text>
+                                <Text style={[styles.mt3]}>{translate('reportCardLostOrDamaged.cardLostOrStolenInfo')}</Text>
                             )}
                         </View>
                         <FormAlertWithSubmitButton
                             isAlertVisible={shouldShowAddressError}
                             onSubmit={handleSubmitSecondStep}
-                            message="reportCardLostOrDamaged.addressError"
+                            message={translate('reportCardLostOrDamaged.addressError')}
                             isLoading={formData?.isLoading}
                             buttonText={isDamaged ? translate('reportCardLostOrDamaged.shipNewCardButton') : translate('reportCardLostOrDamaged.deactivateCardButton')}
                         />
                     </>
                 ) : (
                     <>
-                        <View style={styles.mh5}>
+                        <View>
                             <Text style={[styles.textHeadline, styles.mr5]}>{translate('reportCardLostOrDamaged.reasonTitle')}</Text>
                             <SingleOptionSelector
                                 options={OPTIONS}
@@ -198,9 +203,8 @@ function ReportCardLostPage({
                         <FormAlertWithSubmitButton
                             isAlertVisible={shouldShowReasonError}
                             onSubmit={handleSubmitFirstStep}
-                            message="reportCardLostOrDamaged.reasonError"
+                            message={translate('reportCardLostOrDamaged.reasonError')}
                             buttonText={translate('reportCardLostOrDamaged.nextButtonLabel')}
-                            containerStyles={[styles.m5]}
                         />
                     </>
                 )}
diff --git a/src/pages/settings/Wallet/ReportVirtualCardFraudPage.tsx b/src/pages/settings/Wallet/ReportVirtualCardFraudPage.tsx
index 76f5f4c1bef3..22761c40da9c 100644
--- a/src/pages/settings/Wallet/ReportVirtualCardFraudPage.tsx
+++ b/src/pages/settings/Wallet/ReportVirtualCardFraudPage.tsx
@@ -71,7 +71,7 @@ function ReportVirtualCardFraudPage({
             <View style={[styles.flex1, styles.justifyContentBetween]}>
                 <Text style={[styles.webViewStyles.baseFontStyle, styles.mh5]}>{translate('reportFraudPage.description')}</Text>
                 <FormAlertWithSubmitButton
-                    isAlertVisible={Boolean(virtualCardError)}
+                    isAlertVisible={!!virtualCardError}
                     onSubmit={() => Card.reportVirtualExpensifyCardFraud(virtualCard.cardID)}
                     message={virtualCardError}
                     isLoading={formData?.isLoading}
diff --git a/src/pages/settings/Wallet/TransferBalancePage.tsx b/src/pages/settings/Wallet/TransferBalancePage.tsx
index 62169c848b99..a324c91ecb85 100644
--- a/src/pages/settings/Wallet/TransferBalancePage.tsx
+++ b/src/pages/settings/Wallet/TransferBalancePage.tsx
@@ -14,6 +14,7 @@ import ScrollView from '@components/ScrollView';
 import Text from '@components/Text';
 import useLocalize from '@hooks/useLocalize';
 import useNetwork from '@hooks/useNetwork';
+import useStyledSafeAreaInsets from '@hooks/useStyledSafeAreaInsets';
 import useThemeStyles from '@hooks/useThemeStyles';
 import * as CurrencyUtils from '@libs/CurrencyUtils';
 import * as ErrorUtils from '@libs/ErrorUtils';
@@ -51,6 +52,7 @@ function TransferBalancePage({bankAccountList, fundList, userWallet, walletTrans
     const styles = useThemeStyles();
     const {numberFormat, translate} = useLocalize();
     const {isOffline} = useNetwork();
+    const {paddingBottom} = useStyledSafeAreaInsets();
     const paymentCardList = fundList ?? {};
 
     const paymentTypes = [
@@ -95,7 +97,7 @@ function TransferBalancePage({bankAccountList, fundList, userWallet, walletTrans
         const filteredMethods = combinedPaymentMethods.filter((paymentMethod) => paymentMethod.accountType === filterPaymentMethodType);
         if (filteredMethods.length === 1) {
             const account = filteredMethods[0];
-            PaymentMethods.saveWalletTransferAccountTypeAndID(filterPaymentMethodType ?? '', account?.methodID?.toString() ?? '');
+            PaymentMethods.saveWalletTransferAccountTypeAndID(filterPaymentMethodType ?? '', account?.methodID?.toString() ?? '-1');
             return;
         }
 
@@ -111,8 +113,8 @@ function TransferBalancePage({bankAccountList, fundList, userWallet, walletTrans
             return;
         }
 
-        PaymentMethods.saveWalletTransferAccountTypeAndID(selectedAccount?.accountType ?? '', selectedAccount?.methodID?.toString() ?? '');
-        // eslint-disable-next-line react-hooks/exhaustive-deps -- we only want this effect to run on initial render
+        PaymentMethods.saveWalletTransferAccountTypeAndID(selectedAccount?.accountType ?? '', selectedAccount?.methodID?.toString() ?? '-1');
+        // eslint-disable-next-line react-compiler/react-compiler, react-hooks/exhaustive-deps -- we only want this effect to run on initial render
     }, []);
 
     if (walletTransfer?.shouldShowSuccess && !walletTransfer?.loading) {
@@ -189,7 +191,7 @@ function TransferBalancePage({bankAccountList, fundList, userWallet, walletTrans
                         ))}
                     </View>
                     <Text style={[styles.pt8, styles.ph5, styles.pb1, styles.textLabelSupporting, styles.justifyContentStart]}>{translate('transferAmountPage.whichAccount')}</Text>
-                    {Boolean(selectedAccount) && (
+                    {!!selectedAccount && (
                         <MenuItem
                             title={selectedAccount?.title}
                             description={selectedAccount?.description}
@@ -217,6 +219,7 @@ function TransferBalancePage({bankAccountList, fundList, userWallet, walletTrans
                         isDisabled={isButtonDisabled || isOffline}
                         message={errorMessage}
                         isAlertVisible={!isEmptyObject(errorMessage)}
+                        containerStyles={[styles.ph5, !paddingBottom ? styles.pb5 : null]}
                     />
                 </View>
             </FullPageNotFoundView>
diff --git a/src/pages/settings/Wallet/WalletEmptyState.tsx b/src/pages/settings/Wallet/WalletEmptyState.tsx
index ec63a4fafc26..ca067662b7f6 100644
--- a/src/pages/settings/Wallet/WalletEmptyState.tsx
+++ b/src/pages/settings/Wallet/WalletEmptyState.tsx
@@ -5,9 +5,9 @@ import HeaderPageLayout from '@components/HeaderPageLayout';
 import * as Illustrations from '@components/Icon/Illustrations';
 import LottieAnimations from '@components/LottieAnimations';
 import useLocalize from '@hooks/useLocalize';
+import useResponsiveLayout from '@hooks/useResponsiveLayout';
 import useTheme from '@hooks/useTheme';
 import useThemeStyles from '@hooks/useThemeStyles';
-import useWindowDimensions from '@hooks/useWindowDimensions';
 import Navigation from '@libs/Navigation/Navigation';
 import ROUTES from '@src/ROUTES';
 import SCREENS from '@src/SCREENS';
@@ -36,16 +36,16 @@ function WalletEmptyState({onAddPaymentMethod}: WalletEmptyStateProps) {
     const theme = useTheme();
     const styles = useThemeStyles();
     const {translate} = useLocalize();
-    const {isSmallScreenWidth} = useWindowDimensions();
+    const {shouldUseNarrowLayout} = useResponsiveLayout();
 
     return (
         <HeaderPageLayout
             backgroundColor={theme.PAGE_THEMES[SCREENS.SETTINGS.WALLET.ROOT].backgroundColor}
             onBackButtonPress={() => Navigation.goBack(ROUTES.SETTINGS)}
             title={translate('common.wallet')}
-            shouldShowBackButton={isSmallScreenWidth}
+            shouldShowBackButton={shouldUseNarrowLayout}
             shouldShowOfflineIndicatorInWideScreen
-            style={isSmallScreenWidth ? styles.workspaceSectionMobile : styles.workspaceSection}
+            style={shouldUseNarrowLayout ? styles.workspaceSectionMobile : styles.workspaceSection}
             testID={WalletEmptyState.displayName}
         >
             <FeatureList
diff --git a/src/pages/settings/Wallet/WalletPage/CardDetails.tsx b/src/pages/settings/Wallet/WalletPage/CardDetails.tsx
index 4cce60cfa5c0..6a705140139d 100644
--- a/src/pages/settings/Wallet/WalletPage/CardDetails.tsx
+++ b/src/pages/settings/Wallet/WalletPage/CardDetails.tsx
@@ -16,13 +16,15 @@ import ROUTES from '@src/ROUTES';
 import type {PrivatePersonalDetails} from '@src/types/onyx';
 
 const defaultPrivatePersonalDetails: PrivatePersonalDetails = {
-    address: {
-        street: '',
-        city: '',
-        state: '',
-        zip: '',
-        country: '',
-    },
+    addresses: [
+        {
+            street: '',
+            city: '',
+            state: '',
+            zip: '',
+            country: '',
+        },
+    ],
 };
 
 type CardDetailsOnyxProps = {
diff --git a/src/pages/settings/Wallet/WalletPage/WalletPage.tsx b/src/pages/settings/Wallet/WalletPage/WalletPage.tsx
index c28a0f6649e4..7e242a5c8782 100644
--- a/src/pages/settings/Wallet/WalletPage/WalletPage.tsx
+++ b/src/pages/settings/Wallet/WalletPage/WalletPage.tsx
@@ -5,9 +5,7 @@ import type {GestureResponderEvent} from 'react-native';
 import {ActivityIndicator, Dimensions, View} from 'react-native';
 import {withOnyx} from 'react-native-onyx';
 import AddPaymentMethodMenu from '@components/AddPaymentMethodMenu';
-import Button from '@components/Button';
 import ConfirmModal from '@components/ConfirmModal';
-import CurrentWalletBalance from '@components/CurrentWalletBalance';
 import HeaderWithBackButton from '@components/HeaderWithBackButton';
 import Icon from '@components/Icon';
 import * as Expensicons from '@components/Icon/Expensicons';
@@ -15,6 +13,7 @@ import * as Illustrations from '@components/Icon/Illustrations';
 import KYCWall from '@components/KYCWall';
 import type {PaymentMethodType, Source} from '@components/KYCWall/types';
 import MenuItem from '@components/MenuItem';
+import MenuItemWithTopDescription from '@components/MenuItemWithTopDescription';
 import OfflineWithFeedback from '@components/OfflineWithFeedback';
 import Popover from '@components/Popover';
 import ScreenWrapper from '@components/ScreenWrapper';
@@ -23,9 +22,11 @@ import Section from '@components/Section';
 import Text from '@components/Text';
 import useLocalize from '@hooks/useLocalize';
 import useNetwork from '@hooks/useNetwork';
+import useResponsiveLayout from '@hooks/useResponsiveLayout';
 import useTheme from '@hooks/useTheme';
 import useThemeStyles from '@hooks/useThemeStyles';
 import useWindowDimensions from '@hooks/useWindowDimensions';
+import * as CurrencyUtils from '@libs/CurrencyUtils';
 import getClickedTargetLocation from '@libs/getClickedTargetLocation';
 import Navigation from '@libs/Navigation/Navigation';
 import * as PaymentUtils from '@libs/PaymentUtils';
@@ -60,7 +61,8 @@ function WalletPage({bankAccountList = {}, cardList = {}, fundList = {}, isLoadi
     const styles = useThemeStyles();
     const {translate} = useLocalize();
     const network = useNetwork();
-    const {isSmallScreenWidth, windowWidth} = useWindowDimensions();
+    const {windowWidth} = useWindowDimensions();
+    const {shouldUseNarrowLayout} = useResponsiveLayout();
     const [shouldShowAddPaymentMenu, setShouldShowAddPaymentMenu] = useState(false);
     const [shouldShowDefaultDeleteMenu, setShouldShowDefaultDeleteMenu] = useState(false);
     const [shouldShowLoadingSpinner, setShouldShowLoadingSpinner] = useState(false);
@@ -191,7 +193,7 @@ function WalletPage({bankAccountList = {}, cardList = {}, fundList = {}, isLoadi
                 selectedPaymentMethod: account ?? {},
                 selectedPaymentMethodType: accountType,
                 formattedSelectedPaymentMethod,
-                methodID: methodID ?? '',
+                methodID: methodID ?? '-1',
             });
             setShouldShowDefaultDeleteMenu(true);
             setMenuPosition();
@@ -242,9 +244,9 @@ function WalletPage({bankAccountList = {}, cardList = {}, fundList = {}, isLoadi
         const previousPaymentMethod = paymentMethods.find((method) => !!method.isDefault);
         const currentPaymentMethod = paymentMethods.find((method) => method.methodID === paymentMethod.methodID);
         if (paymentMethod.selectedPaymentMethodType === CONST.PAYMENT_METHODS.PERSONAL_BANK_ACCOUNT) {
-            PaymentMethods.makeDefaultPaymentMethod(paymentMethod.selectedPaymentMethod.bankAccountID ?? 0, 0, previousPaymentMethod, currentPaymentMethod);
+            PaymentMethods.makeDefaultPaymentMethod(paymentMethod.selectedPaymentMethod.bankAccountID ?? -1, 0, previousPaymentMethod, currentPaymentMethod);
         } else if (paymentMethod.selectedPaymentMethodType === CONST.PAYMENT_METHODS.DEBIT_CARD) {
-            PaymentMethods.makeDefaultPaymentMethod(0, paymentMethod.selectedPaymentMethod.fundID ?? 0, previousPaymentMethod, currentPaymentMethod);
+            PaymentMethods.makeDefaultPaymentMethod(0, paymentMethod.selectedPaymentMethod.fundID ?? -1, previousPaymentMethod, currentPaymentMethod);
         }
     }, [
         paymentMethod.methodID,
@@ -273,10 +275,6 @@ function WalletPage({bankAccountList = {}, cardList = {}, fundList = {}, isLoadi
         Navigation.navigate(source === CONST.KYC_WALL_SOURCE.ENABLE_WALLET ? ROUTES.SETTINGS_WALLET : ROUTES.SETTINGS_WALLET_TRANSFER_BALANCE);
     };
 
-    useEffect(() => {
-        PaymentMethods.openWalletPage();
-    }, []);
-
     useEffect(() => {
         // If the user was previously offline, skip debouncing showing the loader
         if (!network.isOffline) {
@@ -341,9 +339,9 @@ function WalletPage({bankAccountList = {}, cardList = {}, fundList = {}, isLoadi
         !(paymentMethod.formattedSelectedPaymentMethod.type === CONST.PAYMENT_METHODS.PERSONAL_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;
+    const isPopoverBottomMount = anchorPosition.anchorPositionTop === 0 || shouldUseNarrowLayout;
     const alertTextStyle = [styles.inlineSystemMessage, styles.flexShrink1];
-    const alertViewStyle = [styles.flexRow, styles.alignItemsCenter, styles.w100, styles.ph5];
+    const alertViewStyle = [styles.flexRow, styles.alignItemsCenter, styles.w100];
 
     return (
         <>
@@ -358,10 +356,10 @@ function WalletPage({bankAccountList = {}, cardList = {}, fundList = {}, isLoadi
                         title={translate('common.wallet')}
                         onBackButtonPress={() => Navigation.goBack()}
                         icon={Illustrations.MoneyIntoWallet}
-                        shouldShowBackButton={isSmallScreenWidth}
+                        shouldShowBackButton={shouldUseNarrowLayout}
                     />
                     <ScrollView style={styles.pt3}>
-                        <View style={[styles.flex1, isSmallScreenWidth ? styles.workspaceSectionMobile : styles.workspaceSection]}>
+                        <View style={[styles.flex1, shouldUseNarrowLayout ? styles.workspaceSectionMobile : styles.workspaceSection]}>
                             <OfflineWithFeedback
                                 style={styles.flex1}
                                 contentContainerStyle={styles.flex1}
@@ -369,10 +367,58 @@ function WalletPage({bankAccountList = {}, cardList = {}, fundList = {}, isLoadi
                                 errors={userWallet?.errors}
                                 errorRowStyles={[styles.ph6]}
                             >
+                                <Section
+                                    subtitle={translate('walletPage.addBankAccountToSendAndReceive')}
+                                    title={translate('walletPage.bankAccounts')}
+                                    isCentralPane
+                                    titleStyles={styles.accountSettingsSectionTitle}
+                                    illustration={Illustrations.BigVault}
+                                    illustrationStyle={styles.walletIllustration}
+                                    illustrationContainerStyle={{height: 220}}
+                                    illustrationBackgroundColor="#411103"
+                                >
+                                    <PaymentMethodList
+                                        shouldShowAddPaymentMethodButton={false}
+                                        shouldShowEmptyListMessage={false}
+                                        onPress={paymentMethodPressed}
+                                        actionPaymentMethodType={shouldShowDefaultDeleteMenu ? paymentMethod.selectedPaymentMethodType : ''}
+                                        activePaymentMethodID={shouldShowDefaultDeleteMenu ? getSelectedPaymentMethodID() : ''}
+                                        buttonRef={addPaymentMethodAnchorRef}
+                                        onListContentSizeChange={shouldShowAddPaymentMenu || shouldShowDefaultDeleteMenu ? setMenuPosition : () => {}}
+                                        shouldEnableScroll={false}
+                                        style={[styles.mt5, [shouldUseNarrowLayout ? styles.mhn5 : styles.mhn8]]}
+                                        listItemStyle={shouldUseNarrowLayout ? styles.ph5 : styles.ph8}
+                                    />
+                                </Section>
+
+                                {hasAssignedCard ? (
+                                    <Section
+                                        subtitle={translate('walletPage.assignedCardsDescription')}
+                                        title={translate('walletPage.assignedCards')}
+                                        isCentralPane
+                                        titleStyles={styles.accountSettingsSectionTitle}
+                                    >
+                                        <PaymentMethodList
+                                            shouldShowAddBankAccount={false}
+                                            shouldShowAddPaymentMethodButton={false}
+                                            shouldShowAssignedCards
+                                            shouldShowEmptyListMessage={false}
+                                            shouldEnableScroll={false}
+                                            onPress={paymentMethodPressed}
+                                            style={[styles.mt5, [shouldUseNarrowLayout ? styles.mhn5 : styles.mhn8]]}
+                                            listItemStyle={shouldUseNarrowLayout ? styles.ph5 : styles.ph8}
+                                            actionPaymentMethodType={shouldShowDefaultDeleteMenu ? paymentMethod.selectedPaymentMethodType : ''}
+                                            activePaymentMethodID={shouldShowDefaultDeleteMenu ? getSelectedPaymentMethodID() : ''}
+                                            buttonRef={addPaymentMethodAnchorRef}
+                                            onListContentSizeChange={shouldShowAddPaymentMenu || shouldShowDefaultDeleteMenu ? setMenuPosition : () => {}}
+                                        />
+                                    </Section>
+                                ) : null}
+
                                 {hasWallet && (
                                     <Section
-                                        subtitle={translate(`walletPage.${hasActivatedWallet ? 'sendAndReceiveMoney' : 'enableWalletToSendAndReceiveMoney'}`)}
-                                        title={translate('walletPage.expensifyWallet')}
+                                        subtitle={translate(`walletPage.${hasActivatedWallet ? 'walletEnabledToSendAndReceiveMoney' : 'enableWalletToSendAndReceiveMoney'}`)}
+                                        title={translate('walletPage.sendAndReceiveMoney')}
                                         isCentralPane
                                         titleStyles={styles.accountSettingsSectionTitle}
                                     >
@@ -389,9 +435,15 @@ function WalletPage({bankAccountList = {}, cardList = {}, fundList = {}, isLoadi
                                                     errors={walletTerms?.errors}
                                                     onClose={PaymentMethods.clearWalletTermsError}
                                                     errorRowStyles={[styles.ml10, styles.mr2]}
-                                                    style={[styles.mt7, styles.mb5, styles.alignSelfStart]}
+                                                    style={[styles.mt4, styles.mb2]}
                                                 >
-                                                    <CurrentWalletBalance balanceStyles={[styles.walletBalance]} />
+                                                    <MenuItemWithTopDescription
+                                                        description={translate('walletPage.balance')}
+                                                        title={CurrencyUtils.convertToDisplayString(userWallet?.currentBalance ?? 0)}
+                                                        titleStyle={styles.textHeadlineH2}
+                                                        interactive={false}
+                                                        wrapperStyle={styles.sectionMenuItemTopDescription}
+                                                    />
                                                 </OfflineWithFeedback>
                                             )}
 
@@ -430,8 +482,8 @@ function WalletPage({bankAccountList = {}, cardList = {}, fundList = {}, isLoadi
                                                                 disabled={network.isOffline}
                                                                 wrapperStyle={[
                                                                     styles.transferBalance,
-                                                                    isSmallScreenWidth ? styles.mhn5 : styles.mhn8,
-                                                                    isSmallScreenWidth ? styles.ph5 : styles.ph8,
+                                                                    shouldUseNarrowLayout ? styles.mhn5 : styles.mhn8,
+                                                                    shouldUseNarrowLayout ? styles.ph5 : styles.ph8,
                                                                 ]}
                                                             />
                                                         );
@@ -464,13 +516,18 @@ function WalletPage({bankAccountList = {}, cardList = {}, fundList = {}, isLoadi
                                                     }
 
                                                     return (
-                                                        <Button
+                                                        <MenuItem
                                                             ref={buttonRef as ForwardedRef<View>}
-                                                            text={translate('walletPage.enableWallet')}
-                                                            onPress={triggerKYCFlow}
-                                                            isDisabled={network.isOffline}
-                                                            success
-                                                            large
+                                                            onPress={() => Navigation.navigate(ROUTES.SETTINGS_ENABLE_PAYMENTS)}
+                                                            disabled={network.isOffline}
+                                                            title={translate('walletPage.enableWallet')}
+                                                            icon={Expensicons.Wallet}
+                                                            hoverAndPressStyle={styles.hoveredComponentBG}
+                                                            wrapperStyle={[
+                                                                styles.transferBalance,
+                                                                shouldUseNarrowLayout ? styles.mhn5 : styles.mhn8,
+                                                                shouldUseNarrowLayout ? styles.ph5 : styles.ph8,
+                                                            ]}
                                                         />
                                                     );
                                                 }}
@@ -478,48 +535,6 @@ function WalletPage({bankAccountList = {}, cardList = {}, fundList = {}, isLoadi
                                         </>
                                     </Section>
                                 )}
-                                {hasAssignedCard ? (
-                                    <Section
-                                        subtitle={translate('walletPage.assignedCardsDescription')}
-                                        title={translate('walletPage.assignedCards')}
-                                        isCentralPane
-                                        titleStyles={styles.accountSettingsSectionTitle}
-                                    >
-                                        <PaymentMethodList
-                                            shouldShowAddBankAccount={false}
-                                            shouldShowAddPaymentMethodButton={false}
-                                            shouldShowAssignedCards
-                                            shouldShowEmptyListMessage={false}
-                                            shouldEnableScroll={false}
-                                            onPress={paymentMethodPressed}
-                                            style={[styles.mt5, [isSmallScreenWidth ? styles.mhn5 : styles.mhn8]]}
-                                            listItemStyle={isSmallScreenWidth ? styles.ph5 : styles.ph8}
-                                            actionPaymentMethodType={shouldShowDefaultDeleteMenu ? paymentMethod.selectedPaymentMethodType : ''}
-                                            activePaymentMethodID={shouldShowDefaultDeleteMenu ? getSelectedPaymentMethodID() : ''}
-                                            buttonRef={addPaymentMethodAnchorRef}
-                                            onListContentSizeChange={shouldShowAddPaymentMenu || shouldShowDefaultDeleteMenu ? setMenuPosition : () => {}}
-                                        />
-                                    </Section>
-                                ) : null}
-                                <Section
-                                    subtitle={translate('walletPage.addBankAccountToSendAndReceive')}
-                                    title={translate('walletPage.bankAccounts')}
-                                    isCentralPane
-                                    titleStyles={styles.accountSettingsSectionTitle}
-                                >
-                                    <PaymentMethodList
-                                        shouldShowAddPaymentMethodButton={false}
-                                        shouldShowEmptyListMessage={false}
-                                        onPress={paymentMethodPressed}
-                                        actionPaymentMethodType={shouldShowDefaultDeleteMenu ? paymentMethod.selectedPaymentMethodType : ''}
-                                        activePaymentMethodID={shouldShowDefaultDeleteMenu ? getSelectedPaymentMethodID() : ''}
-                                        buttonRef={addPaymentMethodAnchorRef}
-                                        onListContentSizeChange={shouldShowAddPaymentMenu || shouldShowDefaultDeleteMenu ? setMenuPosition : () => {}}
-                                        shouldEnableScroll={false}
-                                        style={[styles.mt5, [isSmallScreenWidth ? styles.mhn5 : styles.mhn8]]}
-                                        listItemStyle={isSmallScreenWidth ? styles.ph5 : styles.ph8}
-                                    />
-                                </Section>
                             </OfflineWithFeedback>
                         </View>
                     </ScrollView>
@@ -533,7 +548,7 @@ function WalletPage({bankAccountList = {}, cardList = {}, fundList = {}, isLoadi
                         anchorRef={paymentMethodButtonRef as RefObject<View>}
                     >
                         {!showConfirmDeleteModal && (
-                            <View style={[styles.mv5, !isSmallScreenWidth ? styles.sidebarPopover : {}]}>
+                            <View style={[styles.mv5, !shouldUseNarrowLayout ? styles.sidebarPopover : {}]}>
                                 {isPopoverBottomMount && (
                                     <MenuItem
                                         title={paymentMethod.formattedSelectedPaymentMethod.title}
@@ -555,14 +570,14 @@ function WalletPage({bankAccountList = {}, cardList = {}, fundList = {}, isLoadi
                                             makeDefaultPaymentMethod();
                                             setShouldShowDefaultDeleteMenu(false);
                                         }}
-                                        wrapperStyle={[styles.pv3, styles.ph5, !isSmallScreenWidth ? styles.sidebarPopover : {}]}
+                                        wrapperStyle={[styles.pv3, styles.ph5, !shouldUseNarrowLayout ? styles.sidebarPopover : {}]}
                                     />
                                 )}
                                 <MenuItem
                                     title={translate('common.delete')}
                                     icon={Expensicons.Trashcan}
                                     onPress={() => setShowConfirmDeleteModal(true)}
-                                    wrapperStyle={[styles.pv3, styles.ph5, !isSmallScreenWidth ? styles.sidebarPopover : {}]}
+                                    wrapperStyle={[styles.pv3, styles.ph5, !shouldUseNarrowLayout ? styles.sidebarPopover : {}]}
                                 />
                             </View>
                         )}
diff --git a/src/pages/signin/ChooseSSOOrMagicCode.tsx b/src/pages/signin/ChooseSSOOrMagicCode.tsx
index 4143c2b733e0..2551fe34a21b 100644
--- a/src/pages/signin/ChooseSSOOrMagicCode.tsx
+++ b/src/pages/signin/ChooseSSOOrMagicCode.tsx
@@ -8,8 +8,8 @@ import Text from '@components/Text';
 import useKeyboardState from '@hooks/useKeyboardState';
 import useLocalize from '@hooks/useLocalize';
 import useNetwork from '@hooks/useNetwork';
+import useResponsiveLayout from '@hooks/useResponsiveLayout';
 import useThemeStyles from '@hooks/useThemeStyles';
-import useWindowDimensions from '@hooks/useWindowDimensions';
 import * as ErrorUtils from '@libs/ErrorUtils';
 import Navigation from '@libs/Navigation/Navigation';
 import * as Session from '@userActions/Session';
@@ -39,7 +39,7 @@ function ChooseSSOOrMagicCode({credentials, account, setIsUsingMagicCode}: Choos
     const {isKeyboardShown} = useKeyboardState();
     const {translate} = useLocalize();
     const {isOffline} = useNetwork();
-    const {isSmallScreenWidth} = useWindowDimensions();
+    const {shouldUseNarrowLayout} = useResponsiveLayout();
 
     // This view doesn't have a field for user input, so dismiss the device keyboard if shown
     useEffect(() => {
@@ -52,7 +52,7 @@ function ChooseSSOOrMagicCode({credentials, account, setIsUsingMagicCode}: Choos
     return (
         <>
             <View>
-                <Text style={[styles.loginHeroBody, styles.mb5, styles.textNormal, !isSmallScreenWidth ? styles.textAlignLeft : {}]}>{translate('samlSignIn.welcomeSAMLEnabled')}</Text>
+                <Text style={[styles.loginHeroBody, styles.mb5, styles.textNormal, !shouldUseNarrowLayout ? styles.textAlignLeft : {}]}>{translate('samlSignIn.welcomeSAMLEnabled')}</Text>
                 <Button
                     isDisabled={isOffline}
                     success
@@ -66,7 +66,7 @@ function ChooseSSOOrMagicCode({credentials, account, setIsUsingMagicCode}: Choos
                 />
 
                 <View style={[styles.mt5]}>
-                    <Text style={[styles.loginHeroBody, styles.mb5, styles.textNormal, !isSmallScreenWidth ? styles.textAlignLeft : {}]}>
+                    <Text style={[styles.loginHeroBody, styles.mb5, styles.textNormal, !shouldUseNarrowLayout ? styles.textAlignLeft : {}]}>
                         {translate('samlSignIn.orContinueWithMagicCode')}
                     </Text>
                 </View>
diff --git a/src/pages/signin/EmailDeliveryFailurePage.tsx b/src/pages/signin/EmailDeliveryFailurePage.tsx
index e2e12dbd0c1c..ff16af7dffd9 100644
--- a/src/pages/signin/EmailDeliveryFailurePage.tsx
+++ b/src/pages/signin/EmailDeliveryFailurePage.tsx
@@ -1,4 +1,4 @@
-import Str from 'expensify-common/lib/str';
+import {Str} from 'expensify-common';
 import React, {useEffect, useMemo} from 'react';
 import {Keyboard, View} from 'react-native';
 import {withOnyx} from 'react-native-onyx';
@@ -9,7 +9,7 @@ import TextLink from '@components/TextLink';
 import useKeyboardState from '@hooks/useKeyboardState';
 import useLocalize from '@hooks/useLocalize';
 import useThemeStyles from '@hooks/useThemeStyles';
-import redirectToSignIn from '@userActions/SignInRedirect';
+import * as Session from '@userActions/Session';
 import CONST from '@src/CONST';
 import ONYXKEYS from '@src/ONYXKEYS';
 import type {Credentials} from '@src/types/onyx';
@@ -74,7 +74,7 @@ function EmailDeliveryFailurePage({credentials}: EmailDeliveryFailurePageProps)
             </View>
             <View style={[styles.mv4, styles.flexRow, styles.justifyContentBetween, styles.alignItemsCenter]}>
                 <PressableWithFeedback
-                    onPress={() => redirectToSignIn()}
+                    onPress={() => Session.clearSignInData()}
                     role="button"
                     accessibilityLabel={translate('common.back')}
                     // disable hover dim for switch
diff --git a/src/pages/signin/LoginForm/BaseLoginForm.tsx b/src/pages/signin/LoginForm/BaseLoginForm.tsx
index 4286a2603341..f3df5ebfb0b5 100644
--- a/src/pages/signin/LoginForm/BaseLoginForm.tsx
+++ b/src/pages/signin/LoginForm/BaseLoginForm.tsx
@@ -1,8 +1,8 @@
 import {useIsFocused} from '@react-navigation/native';
-import Str from 'expensify-common/lib/str';
+import {Str} from 'expensify-common';
 import type {ForwardedRef} from 'react';
 import React, {forwardRef, useCallback, useEffect, useImperativeHandle, useMemo, useRef, useState} from 'react';
-import {View} from 'react-native';
+import {InteractionManager, View} from 'react-native';
 import {withOnyx} from 'react-native-onyx';
 import type {OnyxEntry} from 'react-native-onyx';
 import DotIndicatorMessage from '@components/DotIndicatorMessage';
@@ -11,6 +11,7 @@ import AppleSignIn from '@components/SignInButtons/AppleSignIn';
 import GoogleSignIn from '@components/SignInButtons/GoogleSignIn';
 import Text from '@components/Text';
 import TextInput from '@components/TextInput';
+import isTextInputFocused from '@components/TextInput/BaseTextInput/isTextInputFocused';
 import type {BaseTextInputRef} from '@components/TextInput/BaseTextInput/types';
 import withToggleVisibilityView from '@components/withToggleVisibilityView';
 import type {WithToggleVisibilityViewProps} from '@components/withToggleVisibilityView';
@@ -19,6 +20,7 @@ import useNetwork from '@hooks/useNetwork';
 import usePrevious from '@hooks/usePrevious';
 import useResponsiveLayout from '@hooks/useResponsiveLayout';
 import useThemeStyles from '@hooks/useThemeStyles';
+import * as Browser from '@libs/Browser';
 import canFocusInputOnScreenFocus from '@libs/canFocusInputOnScreenFocus';
 import * as ErrorUtils from '@libs/ErrorUtils';
 import isInputAutoFilled from '@libs/isInputAutoFilled';
@@ -26,7 +28,6 @@ import * as LoginUtils from '@libs/LoginUtils';
 import {parsePhoneNumber} from '@libs/PhoneNumber';
 import * as ValidationUtils from '@libs/ValidationUtils';
 import Visibility from '@libs/Visibility';
-import willBlurTextInputOnTapOutsideFunc from '@libs/willBlurTextInputOnTapOutside';
 import * as CloseAccount from '@userActions/CloseAccount';
 import * as Session from '@userActions/Session';
 import CONFIG from '@src/CONFIG';
@@ -34,7 +35,9 @@ import CONST from '@src/CONST';
 import type {TranslationPaths} from '@src/languages/types';
 import ONYXKEYS from '@src/ONYXKEYS';
 import type {CloseAccountForm} from '@src/types/form';
-import type {Account, Credentials} from '@src/types/onyx';
+import type {Account} from '@src/types/onyx';
+import htmlDivElementRef from '@src/types/utils/htmlDivElementRef';
+import viewRef from '@src/types/utils/viewRef';
 import type LoginFormProps from './types';
 import type {InputHandle} from './types';
 
@@ -44,27 +47,21 @@ type BaseLoginFormOnyxProps = {
 
     /** Message to display when user successfully closed their account */
     closeAccount: OnyxEntry<CloseAccountForm>;
-
-    /** The credentials of the logged in person */
-    credentials: OnyxEntry<Credentials>;
 };
 
 type BaseLoginFormProps = WithToggleVisibilityViewProps & BaseLoginFormOnyxProps & LoginFormProps;
 
-const willBlurTextInputOnTapOutside = willBlurTextInputOnTapOutsideFunc();
-
-function BaseLoginForm({account, credentials, closeAccount, blurOnSubmit = false, isVisible}: BaseLoginFormProps, ref: ForwardedRef<InputHandle>) {
+function BaseLoginForm({account, login, onLoginChanged, closeAccount, blurOnSubmit = false, isVisible}: BaseLoginFormProps, ref: ForwardedRef<InputHandle>) {
     const styles = useThemeStyles();
     const {isOffline} = useNetwork();
     const {translate} = useLocalize();
     const input = useRef<BaseTextInputRef | null>(null);
-    const [login, setLogin] = useState(() => Str.removeSMSDomain(credentials?.login ?? ''));
     const [formError, setFormError] = useState<TranslationPaths | undefined>();
     const prevIsVisible = usePrevious(isVisible);
     const firstBlurred = useRef(false);
     const isFocused = useIsFocused();
     const isLoading = useRef(false);
-    const {shouldUseNarrowLayout, isInModal} = useResponsiveLayout();
+    const {shouldUseNarrowLayout, isInNarrowPaneModal} = useResponsiveLayout();
 
     /**
      * Validate the input value and set the error for formError
@@ -100,7 +97,7 @@ function BaseLoginForm({account, credentials, closeAccount, blurOnSubmit = false
      */
     const onTextInput = useCallback(
         (text: string) => {
-            setLogin(text);
+            onLoginChanged(text);
             if (firstBlurred.current) {
                 validate(text);
             }
@@ -114,7 +111,7 @@ function BaseLoginForm({account, credentials, closeAccount, blurOnSubmit = false
                 CloseAccount.setDefaultData();
             }
         },
-        [account, closeAccount, input, setLogin, validate],
+        [account, closeAccount, input, onLoginChanged, validate],
     );
 
     function getSignInWithStyles() {
@@ -167,13 +164,13 @@ function BaseLoginForm({account, credentials, closeAccount, blurOnSubmit = false
             return;
         }
         let focusTimeout: NodeJS.Timeout;
-        if (isInModal) {
+        if (isInNarrowPaneModal) {
             focusTimeout = setTimeout(() => input.current?.focus(), CONST.ANIMATED_TRANSITION);
         } else {
             input.current.focus();
         }
         return () => clearTimeout(focusTimeout);
-        // eslint-disable-next-line react-hooks/exhaustive-deps -- we just want to call this function when component is mounted
+        // eslint-disable-next-line react-compiler/react-compiler, react-hooks/exhaustive-deps -- we just want to call this function when component is mounted
     }, []);
 
     useEffect(() => {
@@ -200,7 +197,7 @@ function BaseLoginForm({account, credentials, closeAccount, blurOnSubmit = false
             if (!input.current) {
                 return false;
             }
-            return input.current.isFocused() as boolean;
+            return !!isTextInputFocused(input);
         },
         clearDataAndFocus(clearLogin = true) {
             if (!input.current) {
@@ -215,6 +212,21 @@ function BaseLoginForm({account, credentials, closeAccount, blurOnSubmit = false
 
     const serverErrorText = useMemo(() => (account ? ErrorUtils.getLatestErrorMessage(account) : ''), [account]);
     const shouldShowServerError = !!serverErrorText && !formError;
+    const isSigningWithAppleOrGoogle = useRef(false);
+    const setIsSigningWithAppleOrGoogle = useCallback((isPressed: boolean) => (isSigningWithAppleOrGoogle.current = isPressed), []);
+
+    const submitContainerRef = useRef<View | HTMLDivElement>(null);
+    const handleFocus = useCallback(() => {
+        if (!Browser.isMobileWebKit()) {
+            return;
+        }
+        // On mobile WebKit browsers, when an input field gains focus, the keyboard appears and the virtual viewport is resized and scrolled to make the input field visible.
+        // This occurs even when there is enough space to display both the input field and the submit button in the current view.
+        // so this change to correct the scroll position when the input field gains focus.
+        InteractionManager.runAfterInteractions(() => {
+            htmlDivElementRef(submitContainerRef).current?.scrollIntoView?.({behavior: 'smooth', block: 'end'});
+        });
+    }, []);
 
     return (
         <>
@@ -237,25 +249,23 @@ function BaseLoginForm({account, credentials, closeAccount, blurOnSubmit = false
                         // As we have only two signin buttons (Apple/Google) other than the text input,
                         // for natives onBlur is called only when the buttons are pressed and we don't need
                         // to validate in those case as the user has opted for other signin flow.
-                        willBlurTextInputOnTapOutside
-                            ? () =>
-                                  // This delay is to avoid the validate being called before google iframe is rendered to
-                                  // avoid error message appearing after pressing google signin button.
-                                  setTimeout(() => {
-                                      if (firstBlurred.current || !Visibility.isVisible() || !Visibility.hasFocus()) {
-                                          return;
-                                      }
-                                      firstBlurred.current = true;
-                                      validate(login);
-                                  }, 500)
-                            : undefined
+                        () =>
+                            setTimeout(() => {
+                                if (isSigningWithAppleOrGoogle.current || firstBlurred.current || !Visibility.isVisible() || !Visibility.hasFocus()) {
+                                    setIsSigningWithAppleOrGoogle(false);
+                                    return;
+                                }
+                                firstBlurred.current = true;
+                                validate(login);
+                            }, 500)
                     }
+                    onFocus={handleFocus}
                     onChangeText={onTextInput}
                     onSubmitEditing={validateAndSubmitForm}
                     autoCapitalize="none"
                     autoCorrect={false}
                     inputMode={CONST.INPUT_MODE.EMAIL}
-                    errorText={formError}
+                    errorText={formError ? translate(formError) : undefined}
                     hasError={shouldShowServerError}
                     maxLength={CONST.LOGIN_CHARACTER_LIMIT}
                 />
@@ -266,14 +276,17 @@ function BaseLoginForm({account, credentials, closeAccount, blurOnSubmit = false
                     style={[styles.mv2]}
                     type="success"
                     // eslint-disable-next-line @typescript-eslint/naming-convention,@typescript-eslint/prefer-nullish-coalescing
-                    messages={{0: closeAccount?.success ? [closeAccount.success, {isTranslated: true}] : account?.message || ''}}
+                    messages={{0: closeAccount?.success ? closeAccount.success : account?.message || ''}}
                 />
             )}
             {
                 // We need to unmount the submit button when the component is not visible so that the Enter button
                 // key handler gets unsubscribed
                 isVisible && (
-                    <View style={[shouldShowServerError ? {} : styles.mt5]}>
+                    <View
+                        style={[shouldShowServerError ? {} : styles.mt5]}
+                        ref={viewRef(submitContainerRef)}
+                    >
                         <FormAlertWithSubmitButton
                             buttonText={translate('common.continue')}
                             isLoading={account?.isLoading && account?.loadingForm === CONST.FORMS.LOGIN_FORM}
@@ -300,10 +313,10 @@ function BaseLoginForm({account, credentials, closeAccount, blurOnSubmit = false
 
                                     <View style={shouldUseNarrowLayout ? styles.loginButtonRowSmallScreen : styles.loginButtonRow}>
                                         <View>
-                                            <AppleSignIn />
+                                            <AppleSignIn onPress={() => setIsSigningWithAppleOrGoogle(true)} />
                                         </View>
                                         <View>
-                                            <GoogleSignIn />
+                                            <GoogleSignIn onPress={() => setIsSigningWithAppleOrGoogle(true)} />
                                         </View>
                                     </View>
                                 </View>
@@ -321,7 +334,6 @@ BaseLoginForm.displayName = 'BaseLoginForm';
 export default withToggleVisibilityView(
     withOnyx<BaseLoginFormProps, BaseLoginFormOnyxProps>({
         account: {key: ONYXKEYS.ACCOUNT},
-        credentials: {key: ONYXKEYS.CREDENTIALS},
         closeAccount: {key: ONYXKEYS.FORMS.CLOSE_ACCOUNT_FORM},
     })(forwardRef(BaseLoginForm)),
 );
diff --git a/src/pages/signin/LoginForm/types.ts b/src/pages/signin/LoginForm/types.ts
index 775009072a2d..9539b22e36ca 100644
--- a/src/pages/signin/LoginForm/types.ts
+++ b/src/pages/signin/LoginForm/types.ts
@@ -1,4 +1,10 @@
 type LoginFormProps = {
+    /** The login input value */
+    login: string;
+
+    /** A callback to notify that the login input value is changed */
+    onLoginChanged: (login: string) => void;
+
     /** Function used to scroll to the top of the page */
     scrollPageToTop?: () => void;
 
diff --git a/src/pages/signin/SignInModal.tsx b/src/pages/signin/SignInModal.tsx
index 2029d07353a5..bad93b29f8af 100644
--- a/src/pages/signin/SignInModal.tsx
+++ b/src/pages/signin/SignInModal.tsx
@@ -1,4 +1,4 @@
-import React, {useEffect} from 'react';
+import React, {useEffect, useRef} from 'react';
 import type {OnyxEntry} from 'react-native-onyx';
 import {withOnyx} from 'react-native-onyx';
 import HeaderWithBackButton from '@components/HeaderWithBackButton';
@@ -6,11 +6,13 @@ import ScreenWrapper from '@components/ScreenWrapper';
 import useStyleUtils from '@hooks/useStyleUtils';
 import useTheme from '@hooks/useTheme';
 import Navigation from '@libs/Navigation/Navigation';
+import * as App from '@userActions/App';
 import CONST from '@src/CONST';
 import ONYXKEYS from '@src/ONYXKEYS';
 import SCREENS from '@src/SCREENS';
 import type {Session} from '@src/types/onyx';
 import SignInPage from './SignInPage';
+import type {SignInPageRef} from './SignInPage';
 
 type SignInModalOnyxProps = {
     session: OnyxEntry<Session>;
@@ -21,12 +23,14 @@ type SignInModalProps = SignInModalOnyxProps;
 function SignInModal({session}: SignInModalProps) {
     const theme = useTheme();
     const StyleUtils = useStyleUtils();
+    const siginPageRef = useRef<SignInPageRef | null>(null);
 
     useEffect(() => {
         const isAnonymousUser = session?.authTokenType === CONST.AUTH_TOKEN_TYPES.ANONYMOUS;
         if (!isAnonymousUser) {
             // Signing in RHP is only for anonymous users
             Navigation.isNavigationReady().then(() => Navigation.dismissModal());
+            App.openApp();
         }
     }, [session?.authTokenType]);
 
@@ -38,8 +42,19 @@ function SignInModal({session}: SignInModalProps) {
             shouldShowOfflineIndicator={false}
             testID={SignInModal.displayName}
         >
-            <HeaderWithBackButton onBackButtonPress={() => Navigation.goBack()} />
-            <SignInPage shouldEnableMaxHeight={false} />
+            <HeaderWithBackButton
+                onBackButtonPress={() => {
+                    if (!siginPageRef.current) {
+                        Navigation.goBack();
+                        return;
+                    }
+                    siginPageRef.current?.navigateBack();
+                }}
+            />
+            <SignInPage
+                shouldEnableMaxHeight={false}
+                ref={siginPageRef}
+            />
         </ScreenWrapper>
     );
 }
diff --git a/src/pages/signin/SignInPage.tsx b/src/pages/signin/SignInPage.tsx
index 38da932af6e8..729faae5e90b 100644
--- a/src/pages/signin/SignInPage.tsx
+++ b/src/pages/signin/SignInPage.tsx
@@ -1,5 +1,6 @@
-import Str from 'expensify-common/lib/str';
-import React, {useEffect, useRef, useState} from 'react';
+import {Str} from 'expensify-common';
+import React, {forwardRef, useEffect, useImperativeHandle, useRef, useState} from 'react';
+import type {ForwardedRef, RefAttributes} from 'react';
 import {withOnyx} from 'react-native-onyx';
 import type {OnyxEntry} from 'react-native-onyx';
 import ColorSchemeWrapper from '@components/ColorSchemeWrapper';
@@ -31,8 +32,10 @@ import LoginForm from './LoginForm';
 import type {InputHandle} from './LoginForm/types';
 import SignInPageLayout from './SignInPageLayout';
 import type {SignInPageLayoutRef} from './SignInPageLayout/types';
+import SignUpWelcomeForm from './SignUpWelcomeForm';
 import UnlinkLoginForm from './UnlinkLoginForm';
 import ValidateCodeForm from './ValidateCodeForm';
+import type {BaseValidateCodeFormRef} from './ValidateCodeForm/BaseValidateCodeForm';
 
 type SignInPageInnerOnyxProps = {
     /** The details about the account that the user is signing in with */
@@ -52,6 +55,10 @@ type SignInPageInnerProps = SignInPageInnerOnyxProps & {
     shouldEnableMaxHeight?: boolean;
 };
 
+type SignInPageRef = {
+    navigateBack: () => void;
+};
+
 type RenderOption = {
     shouldShowLoginForm: boolean;
     shouldShowEmailDeliveryFailurePage: boolean;
@@ -61,6 +68,7 @@ type RenderOption = {
     shouldInitiateSAMLLogin: boolean;
     shouldShowWelcomeHeader: boolean;
     shouldShowWelcomeText: boolean;
+    shouldShouldSignUpWelcomeForm: boolean;
 };
 
 type GetRenderOptionsParams = {
@@ -71,6 +79,7 @@ type GetRenderOptionsParams = {
     isUsingMagicCode: boolean;
     hasInitiatedSAMLLogin: boolean;
     shouldShowAnotherLoginPageOpenedMessage: boolean;
+    credentials: OnyxEntry<Credentials>;
 };
 
 /**
@@ -90,6 +99,7 @@ function getRenderOptions({
     isUsingMagicCode,
     hasInitiatedSAMLLogin,
     shouldShowAnotherLoginPageOpenedMessage,
+    credentials,
 }: GetRenderOptionsParams): RenderOption {
     const hasAccount = !isEmptyObject(account);
     const isSAMLEnabled = !!account?.isSAMLEnabled;
@@ -107,33 +117,46 @@ function getRenderOptions({
         Session.clearSignInData();
     }
 
+    // Show the Welcome form if a user is signing up for a new account in a domain that is not controlled
+    const shouldShouldSignUpWelcomeForm = !!credentials?.login && !account?.validated && !account?.accountExists && !account?.domainControlled;
     const shouldShowLoginForm = !shouldShowAnotherLoginPageOpenedMessage && !hasLogin && !hasValidateCode;
     const shouldShowEmailDeliveryFailurePage = hasLogin && hasEmailDeliveryFailure && !shouldShowChooseSSOOrMagicCode && !shouldInitiateSAMLLogin;
     const isUnvalidatedSecondaryLogin = hasLogin && !isPrimaryLogin && !account?.validated && !hasEmailDeliveryFailure;
     const shouldShowValidateCodeForm =
-        hasAccount && (hasLogin || hasValidateCode) && !isUnvalidatedSecondaryLogin && !hasEmailDeliveryFailure && !shouldShowChooseSSOOrMagicCode && !isSAMLRequired;
-    const shouldShowWelcomeHeader = shouldShowLoginForm || shouldShowValidateCodeForm || shouldShowChooseSSOOrMagicCode || isUnvalidatedSecondaryLogin;
-    const shouldShowWelcomeText = shouldShowLoginForm || shouldShowValidateCodeForm || shouldShowChooseSSOOrMagicCode || shouldShowAnotherLoginPageOpenedMessage;
+        !shouldShouldSignUpWelcomeForm &&
+        hasAccount &&
+        (hasLogin || hasValidateCode) &&
+        !isUnvalidatedSecondaryLogin &&
+        !hasEmailDeliveryFailure &&
+        !shouldShowChooseSSOOrMagicCode &&
+        !isSAMLRequired;
+    const shouldShowWelcomeHeader = shouldShowLoginForm || shouldShowValidateCodeForm || shouldShowChooseSSOOrMagicCode || isUnvalidatedSecondaryLogin || shouldShouldSignUpWelcomeForm;
+    const shouldShowWelcomeText =
+        shouldShowLoginForm || shouldShowValidateCodeForm || shouldShowChooseSSOOrMagicCode || shouldShowAnotherLoginPageOpenedMessage || shouldShouldSignUpWelcomeForm;
+
     return {
         shouldShowLoginForm,
         shouldShowEmailDeliveryFailurePage,
-        shouldShowUnlinkLoginForm: isUnvalidatedSecondaryLogin,
+        shouldShowUnlinkLoginForm: !shouldShouldSignUpWelcomeForm && isUnvalidatedSecondaryLogin,
         shouldShowValidateCodeForm,
         shouldShowChooseSSOOrMagicCode,
         shouldInitiateSAMLLogin,
         shouldShowWelcomeHeader,
         shouldShowWelcomeText,
+        shouldShouldSignUpWelcomeForm,
     };
 }
 
-function SignInPageInner({credentials, account, activeClients = [], preferredLocale, shouldEnableMaxHeight = true}: SignInPageInnerProps) {
+function SignInPage({credentials, account, activeClients = [], preferredLocale, shouldEnableMaxHeight = true}: SignInPageInnerProps, ref: ForwardedRef<SignInPageRef>) {
     const styles = useThemeStyles();
     const StyleUtils = useStyleUtils();
     const {translate, formatPhoneNumber} = useLocalize();
-    const {shouldUseNarrowLayout, isInModal} = useResponsiveLayout();
+    const {shouldUseNarrowLayout, isInNarrowPaneModal} = useResponsiveLayout();
     const safeAreaInsets = useSafeAreaInsets();
     const signInPageLayoutRef = useRef<SignInPageLayoutRef>(null);
     const loginFormRef = useRef<InputHandle>(null);
+    const validateCodeFormRef = useRef<BaseValidateCodeFormRef>(null);
+
     /** 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);
@@ -146,6 +169,8 @@ function SignInPageInner({credentials, account, activeClients = [], preferredLoc
      *  if we need to clear their sign in details so they can enter a login */
     const [hasInitiatedSAMLLogin, setHasInitiatedSAMLLogin] = useState(false);
 
+    const [login, setLogin] = useState(() => Str.removeSMSDomain(credentials?.login ?? ''));
+
     const isClientTheLeader = !!activeClients && ActiveClientManager.isClientTheLeader();
     // We need to show "Another login page is opened" message if the page isn't active and visible
     // eslint-disable-next-line rulesdir/no-negated-variables
@@ -181,6 +206,7 @@ function SignInPageInner({credentials, account, activeClients = [], preferredLoc
         shouldInitiateSAMLLogin,
         shouldShowWelcomeHeader,
         shouldShowWelcomeText,
+        shouldShouldSignUpWelcomeForm,
     } = getRenderOptions({
         hasLogin: !!credentials?.login,
         hasValidateCode: !!credentials?.validateCode,
@@ -189,6 +215,7 @@ function SignInPageInner({credentials, account, activeClients = [], preferredLoc
         isUsingMagicCode,
         hasInitiatedSAMLLogin,
         shouldShowAnotherLoginPageOpenedMessage,
+        credentials,
     });
 
     if (shouldInitiateSAMLLogin) {
@@ -200,6 +227,11 @@ function SignInPageInner({credentials, account, activeClients = [], preferredLoc
     let welcomeText = '';
     const headerText = translate('login.hero.header');
 
+    const userLogin = Str.removeSMSDomain(credentials?.login ?? '');
+
+    // replacing spaces with "hard spaces" to prevent breaking the number
+    const userLoginToDisplay = Str.isSMSLogin(userLogin) ? formatPhoneNumber(userLogin) : userLogin;
+
     if (shouldShowAnotherLoginPageOpenedMessage) {
         welcomeHeader = translate('welcomeText.anotherLoginPageIsOpen');
         welcomeText = translate('welcomeText.anotherLoginPageIsOpenExplanation');
@@ -209,32 +241,26 @@ function SignInPageInner({credentials, account, activeClients = [], preferredLoc
     } else if (shouldShowValidateCodeForm) {
         if (account?.requiresTwoFactorAuth) {
             // We will only know this after a user signs in successfully, without their 2FA code
-            welcomeHeader = shouldUseNarrowLayout ? '' : translate('welcomeText.welcomeBack');
+            welcomeHeader = shouldUseNarrowLayout ? '' : translate('welcomeText.welcome');
             welcomeText = isUsingRecoveryCode ? translate('validateCodeForm.enterRecoveryCode') : translate('validateCodeForm.enterAuthenticatorCode');
         } else {
-            const userLogin = Str.removeSMSDomain(credentials?.login ?? '');
-
-            // replacing spaces with "hard spaces" to prevent breaking the number
-            const userLoginToDisplay = Str.isSMSLogin(userLogin) ? formatPhoneNumber(userLogin).replace(/ /g, '\u00A0') : userLogin;
-            if (account?.validated) {
-                welcomeHeader = shouldUseNarrowLayout ? '' : translate('welcomeText.welcomeBack');
-                welcomeText = shouldUseNarrowLayout
-                    ? `${translate('welcomeText.welcomeBack')} ${translate('welcomeText.welcomeEnterMagicCode', {login: userLoginToDisplay})}`
-                    : translate('welcomeText.welcomeEnterMagicCode', {login: userLoginToDisplay});
-            } else {
-                welcomeHeader = shouldUseNarrowLayout ? '' : translate('welcomeText.welcome');
-                welcomeText = shouldUseNarrowLayout
-                    ? `${translate('welcomeText.welcome')} ${translate('welcomeText.newFaceEnterMagicCode', {login: userLoginToDisplay})}`
-                    : translate('welcomeText.newFaceEnterMagicCode', {login: userLoginToDisplay});
-            }
+            welcomeHeader = shouldUseNarrowLayout ? '' : translate('welcomeText.welcome');
+            welcomeText = shouldUseNarrowLayout
+                ? `${translate('welcomeText.welcome')} ${translate('welcomeText.welcomeEnterMagicCode', {login: userLoginToDisplay})}`
+                : translate('welcomeText.welcomeEnterMagicCode', {login: userLoginToDisplay});
         }
     } else if (shouldShowUnlinkLoginForm || shouldShowEmailDeliveryFailurePage || shouldShowChooseSSOOrMagicCode) {
-        welcomeHeader = shouldUseNarrowLayout ? headerText : translate('welcomeText.welcomeBack');
+        welcomeHeader = shouldUseNarrowLayout ? headerText : translate('welcomeText.welcome');
 
         // Don't show any welcome text if we're showing the user the email delivery failed view
         if (shouldShowEmailDeliveryFailurePage || shouldShowChooseSSOOrMagicCode) {
             welcomeText = '';
         }
+    } else if (shouldShouldSignUpWelcomeForm) {
+        welcomeHeader = shouldUseNarrowLayout ? headerText : translate('welcomeText.welcome');
+        welcomeText = shouldUseNarrowLayout
+            ? `${translate('welcomeText.welcomeWithoutExclamation')} ${translate('welcomeText.welcomeNewFace', {login: userLoginToDisplay})}`
+            : translate('welcomeText.welcomeNewFace', {login: userLoginToDisplay});
     } else if (!shouldInitiateSAMLLogin && !hasInitiatedSAMLLogin) {
         Log.warn('SignInPage in unexpected state!');
     }
@@ -244,14 +270,34 @@ function SignInPageInner({credentials, account, activeClients = [], preferredLoc
         loginFormRef.current?.clearDataAndFocus();
     };
 
+    const navigateBack = () => {
+        if (
+            shouldShouldSignUpWelcomeForm ||
+            (!shouldShowAnotherLoginPageOpenedMessage && (shouldShowEmailDeliveryFailurePage || shouldShowUnlinkLoginForm || shouldShowChooseSSOOrMagicCode))
+        ) {
+            Session.clearSignInData();
+            return;
+        }
+
+        if (shouldShowValidateCodeForm) {
+            validateCodeFormRef.current?.clearSignInData();
+            return;
+        }
+
+        Navigation.goBack();
+    };
+    useImperativeHandle(ref, () => ({
+        navigateBack,
+    }));
     return (
         // Bottom SafeAreaView is removed so that login screen svg displays correctly on mobile.
         // The SVG should flow under the Home Indicator on iOS.
         <ScreenWrapper
             shouldShowOfflineIndicator={false}
             shouldEnableMaxHeight={shouldEnableMaxHeight}
-            style={[styles.signInPage, StyleUtils.getSafeAreaPadding({...safeAreaInsets, bottom: 0, top: isInModal ? 0 : safeAreaInsets.top}, 1)]}
-            testID={SignInPageInner.displayName}
+            shouldUseCachedViewportHeight
+            style={[styles.signInPage, StyleUtils.getSafeAreaPadding({...safeAreaInsets, bottom: 0, top: isInNarrowPaneModal ? 0 : safeAreaInsets.top}, 1)]}
+            testID={SignInPageThemeWrapper.displayName}
         >
             <SignInPageLayout
                 welcomeHeader={welcomeHeader}
@@ -266,14 +312,18 @@ function SignInPageInner({credentials, account, activeClients = [], preferredLoc
                 <LoginForm
                     ref={loginFormRef}
                     isVisible={shouldShowLoginForm}
+                    login={login}
+                    onLoginChanged={setLogin}
                     blurOnSubmit={account?.validated === false}
                     scrollPageToTop={signInPageLayoutRef.current?.scrollPageToTop}
                 />
+                {shouldShouldSignUpWelcomeForm && <SignUpWelcomeForm />}
                 {shouldShowValidateCodeForm && (
                     <ValidateCodeForm
                         isVisible={!shouldShowAnotherLoginPageOpenedMessage}
                         isUsingRecoveryCode={isUsingRecoveryCode}
                         setIsUsingRecoveryCode={setIsUsingRecoveryCode}
+                        ref={validateCodeFormRef}
                     />
                 )}
                 {!shouldShowAnotherLoginPageOpenedMessage && (
@@ -288,18 +338,18 @@ function SignInPageInner({credentials, account, activeClients = [], preferredLoc
     );
 }
 
-SignInPageInner.displayName = 'SignInPage';
-
 type SignInPageProps = SignInPageInnerProps;
 type SignInPageOnyxProps = SignInPageInnerOnyxProps;
+const SignInPageWithRef = forwardRef(SignInPage);
 
-function SignInPage(props: SignInPageProps) {
+function SignInPageThemeWrapper(props: SignInPageProps, ref: ForwardedRef<SignInPageRef>) {
     return (
         <ThemeProvider theme={CONST.THEME.DARK}>
             <ThemeStylesProvider>
                 <ColorSchemeWrapper>
                     <CustomStatusBarAndBackground isNested />
-                    <SignInPageInner
+                    <SignInPageWithRef
+                        ref={ref}
                         // eslint-disable-next-line react/jsx-props-no-spreading
                         {...props}
                     />
@@ -309,7 +359,9 @@ function SignInPage(props: SignInPageProps) {
     );
 }
 
-export default withOnyx<SignInPageProps, SignInPageOnyxProps>({
+SignInPageThemeWrapper.displayName = 'SignInPage';
+
+export default withOnyx<SignInPageProps & RefAttributes<SignInPageRef>, SignInPageOnyxProps>({
     account: {key: ONYXKEYS.ACCOUNT},
     credentials: {key: ONYXKEYS.CREDENTIALS},
     /**
@@ -323,4 +375,6 @@ export default withOnyx<SignInPageProps, SignInPageOnyxProps>({
     preferredLocale: {
         key: ONYXKEYS.NVP_PREFERRED_LOCALE,
     },
-})(SignInPage);
+})(forwardRef(SignInPageThemeWrapper));
+
+export type {SignInPageRef};
diff --git a/src/pages/signin/SignInPageLayout/BackgroundImage/index.ios.tsx b/src/pages/signin/SignInPageLayout/BackgroundImage/index.ios.tsx
index b52709951c80..3aab8a003bc9 100644
--- a/src/pages/signin/SignInPageLayout/BackgroundImage/index.ios.tsx
+++ b/src/pages/signin/SignInPageLayout/BackgroundImage/index.ios.tsx
@@ -4,7 +4,7 @@ import type {ImageSourcePropType} from 'react-native';
 import Reanimated, {Easing, useAnimatedStyle, useSharedValue, withTiming} from 'react-native-reanimated';
 import DesktopBackgroundImage from '@assets/images/home-background--desktop.svg';
 import MobileBackgroundImage from '@assets/images/home-background--mobile-new.svg';
-import useIsSplashHidden from '@hooks/useIsSplashHidden';
+import useSplashScreen from '@hooks/useSplashScreen';
 import useStyleUtils from '@hooks/useStyleUtils';
 import useThemeStyles from '@hooks/useThemeStyles';
 import CONST from '@src/CONST';
@@ -19,13 +19,14 @@ function BackgroundImage({width, transitionDuration, isSmallScreen = false}: Bac
     const animatedStyle = useAnimatedStyle(() => ({opacity: opacity.value}));
     // This sets the opacity animation for the background image once it has loaded.
     function setOpacityAnimation() {
+        // eslint-disable-next-line react-compiler/react-compiler
         opacity.value = withTiming(1, {
             duration: CONST.MICROSECONDS_PER_MS,
             easing: Easing.ease,
         });
     }
 
-    const isSplashHidden = useIsSplashHidden();
+    const {isSplashHidden} = useSplashScreen();
     // Prevent rendering the background image until the splash screen is hidden.
     // See issue: https://github.com/Expensify/App/issues/34696
     if (!isSplashHidden) {
diff --git a/src/pages/signin/SignInPageLayout/Footer.tsx b/src/pages/signin/SignInPageLayout/Footer.tsx
index 4e2d642e0179..314d91256e80 100644
--- a/src/pages/signin/SignInPageLayout/Footer.tsx
+++ b/src/pages/signin/SignInPageLayout/Footer.tsx
@@ -13,7 +13,6 @@ import useResponsiveLayout from '@hooks/useResponsiveLayout';
 import useStyleUtils from '@hooks/useStyleUtils';
 import useTheme from '@hooks/useTheme';
 import useThemeStyles from '@hooks/useThemeStyles';
-import useWindowDimensions from '@hooks/useWindowDimensions';
 import Licenses from '@pages/signin/Licenses';
 import Socials from '@pages/signin/Socials';
 import variables from '@styles/variables';
@@ -148,8 +147,7 @@ function Footer({navigateFocus}: FooterProps) {
     const styles = useThemeStyles();
     const StyleUtils = useStyleUtils();
     const {translate} = useLocalize();
-    const {shouldUseNarrowLayout} = useResponsiveLayout();
-    const {isMediumScreenWidth} = useWindowDimensions();
+    const {shouldUseNarrowLayout, isMediumScreenWidth} = useResponsiveLayout();
     const isVertical = shouldUseNarrowLayout;
     const imageDirection = isVertical ? styles.flexRow : styles.flexColumn;
     const imageStyle = isVertical ? styles.pr0 : styles.alignSelfCenter;
diff --git a/src/pages/signin/SignInPageLayout/SignInHeroCopy.tsx b/src/pages/signin/SignInPageLayout/SignInHeroCopy.tsx
index baddf70fecca..82e20e298179 100644
--- a/src/pages/signin/SignInPageLayout/SignInHeroCopy.tsx
+++ b/src/pages/signin/SignInPageLayout/SignInHeroCopy.tsx
@@ -2,9 +2,9 @@ import React from 'react';
 import {View} from 'react-native';
 import Text from '@components/Text';
 import useLocalize from '@hooks/useLocalize';
+import useResponsiveLayout from '@hooks/useResponsiveLayout';
 import useStyleUtils from '@hooks/useStyleUtils';
 import useThemeStyles from '@hooks/useThemeStyles';
-import useWindowDimensions from '@hooks/useWindowDimensions';
 import variables from '@styles/variables';
 import type {SignInPageLayoutProps} from './types';
 
@@ -13,7 +13,7 @@ type SignInHeroCopyProps = Pick<SignInPageLayoutProps, 'customHeadline' | 'custo
 function SignInHeroCopy({customHeadline, customHeroBody}: SignInHeroCopyProps) {
     const styles = useThemeStyles();
     const StyleUtils = useStyleUtils();
-    const {isMediumScreenWidth, isLargeScreenWidth} = useWindowDimensions();
+    const {isMediumScreenWidth, isLargeScreenWidth} = useResponsiveLayout();
     const {translate} = useLocalize();
 
     return (
diff --git a/src/pages/signin/SignInPageLayout/SignInHeroImage.tsx b/src/pages/signin/SignInPageLayout/SignInHeroImage.tsx
index 538f26e32e93..db3472b21d76 100644
--- a/src/pages/signin/SignInPageLayout/SignInHeroImage.tsx
+++ b/src/pages/signin/SignInPageLayout/SignInHeroImage.tsx
@@ -1,17 +1,13 @@
 import React, {useMemo} from 'react';
-import {View} from 'react-native';
 import Lottie from '@components/Lottie';
 import LottieAnimations from '@components/LottieAnimations';
-import useIsSplashHidden from '@hooks/useIsSplashHidden';
 import useResponsiveLayout from '@hooks/useResponsiveLayout';
 import useThemeStyles from '@hooks/useThemeStyles';
-import useWindowDimensions from '@hooks/useWindowDimensions';
 import variables from '@styles/variables';
 
 function SignInHeroImage() {
     const styles = useThemeStyles();
-    const {isMediumScreenWidth} = useWindowDimensions();
-    const {shouldUseNarrowLayout} = useResponsiveLayout();
+    const {shouldUseNarrowLayout, isMediumScreenWidth} = useResponsiveLayout();
     const imageSize = useMemo(() => {
         if (shouldUseNarrowLayout) {
             return {
@@ -26,14 +22,6 @@ function SignInHeroImage() {
         };
     }, [shouldUseNarrowLayout, isMediumScreenWidth]);
 
-    const isSplashHidden = useIsSplashHidden();
-    // Prevents rendering of the Lottie animation until the splash screen is hidden
-    // by returning an empty view of the same size as the animation.
-    // See issue: https://github.com/Expensify/App/issues/34696
-    if (!isSplashHidden) {
-        return <View style={[styles.alignSelfCenter, imageSize]} />;
-    }
-
     return (
         <Lottie
             source={LottieAnimations.Hands}
diff --git a/src/pages/signin/SignInPageLayout/index.tsx b/src/pages/signin/SignInPageLayout/index.tsx
index 3532c17181db..f63801dd158a 100644
--- a/src/pages/signin/SignInPageLayout/index.tsx
+++ b/src/pages/signin/SignInPageLayout/index.tsx
@@ -14,6 +14,7 @@ import useStyleUtils from '@hooks/useStyleUtils';
 import useTheme from '@hooks/useTheme';
 import useThemeStyles from '@hooks/useThemeStyles';
 import useWindowDimensions from '@hooks/useWindowDimensions';
+import * as Browser from '@libs/Browser';
 import variables from '@styles/variables';
 import CONST from '@src/CONST';
 import BackgroundImage from './BackgroundImage';
@@ -43,8 +44,8 @@ function SignInPageLayout(
     const {top: topInsets, bottom: bottomInsets} = useSafeAreaInsets();
     const scrollViewRef = useRef<RNScrollView>(null);
     const prevPreferredLocale = usePrevious(preferredLocale);
-    const {windowHeight, isMediumScreenWidth, isLargeScreenWidth} = useWindowDimensions();
-    const {shouldUseNarrowLayout} = useResponsiveLayout();
+    const {windowHeight} = useWindowDimensions();
+    const {shouldUseNarrowLayout, isMediumScreenWidth, isLargeScreenWidth} = useResponsiveLayout();
 
     const {containerStyles, contentContainerStyles} = useMemo(
         () => ({
@@ -144,7 +145,15 @@ function SignInPageLayout(
                     keyboardShouldPersistTaps="handled"
                     ref={scrollViewRef}
                 >
-                    <View style={[styles.flex1, styles.flexColumn, styles.overflowHidden, StyleUtils.getMinimumHeight(backgroundImageHeight), StyleUtils.getSignInBgStyles(theme)]}>
+                    <View
+                        style={[
+                            styles.flex1,
+                            styles.flexColumn,
+                            Browser.isMobileSafari() ? styles.overflowHidden : {},
+                            StyleUtils.getMinimumHeight(backgroundImageHeight),
+                            StyleUtils.getSignInBgStyles(theme),
+                        ]}
+                    >
                         <View style={[styles.pAbsolute, styles.w100, StyleUtils.getHeight(backgroundImageHeight), StyleUtils.getBackgroundColorStyle(theme.highlightBG)]}>
                             <BackgroundImage
                                 isSmallScreen
diff --git a/src/pages/signin/SignUpWelcomeForm.tsx b/src/pages/signin/SignUpWelcomeForm.tsx
new file mode 100644
index 000000000000..68bb7d10796a
--- /dev/null
+++ b/src/pages/signin/SignUpWelcomeForm.tsx
@@ -0,0 +1,52 @@
+import React from 'react';
+import {View} from 'react-native';
+import {withOnyx} from 'react-native-onyx';
+import type {OnyxEntry} from 'react-native-onyx';
+import Button from '@components/Button';
+import useLocalize from '@hooks/useLocalize';
+import useNetwork from '@hooks/useNetwork';
+import useThemeStyles from '@hooks/useThemeStyles';
+import * as Session from '@userActions/Session';
+import ONYXKEYS from '@src/ONYXKEYS';
+import type {Account} from '@src/types/onyx';
+import ChangeExpensifyLoginLink from './ChangeExpensifyLoginLink';
+import Terms from './Terms';
+
+type SignUpWelcomeFormOnyxProps = {
+    /** State for the account */
+    account: OnyxEntry<Account>;
+};
+
+type SignUpWelcomeFormProps = SignUpWelcomeFormOnyxProps;
+
+function SignUpWelcomeForm({account}: SignUpWelcomeFormProps) {
+    const network = useNetwork();
+    const styles = useThemeStyles();
+    const {translate} = useLocalize();
+
+    return (
+        <>
+            <View style={[styles.mt3, styles.mb2]}>
+                <Button
+                    isDisabled={network.isOffline || !!account?.message}
+                    success
+                    large
+                    text={translate('welcomeSignUpForm.join')}
+                    isLoading={account?.isLoading}
+                    onPress={() => Session.signUpUser()}
+                    pressOnEnter
+                    style={[styles.mb2]}
+                />
+                <ChangeExpensifyLoginLink onPress={() => Session.clearSignInData()} />
+            </View>
+            <View style={[styles.mt4, styles.signInPageWelcomeTextContainer]}>
+                <Terms />
+            </View>
+        </>
+    );
+}
+SignUpWelcomeForm.displayName = 'SignUpWelcomeForm';
+
+export default withOnyx<SignUpWelcomeFormProps, SignUpWelcomeFormOnyxProps>({
+    account: {key: ONYXKEYS.ACCOUNT},
+})(SignUpWelcomeForm);
diff --git a/src/pages/signin/UnlinkLoginForm.tsx b/src/pages/signin/UnlinkLoginForm.tsx
index c2e62e3b80f3..9ccbbaaa56cd 100644
--- a/src/pages/signin/UnlinkLoginForm.tsx
+++ b/src/pages/signin/UnlinkLoginForm.tsx
@@ -1,4 +1,4 @@
-import Str from 'expensify-common/lib/str';
+import {Str} from 'expensify-common';
 import React, {useMemo} from 'react';
 import {View} from 'react-native';
 import {withOnyx} from 'react-native-onyx';
@@ -32,6 +32,7 @@ function UnlinkLoginForm({account, credentials}: UnlinkLoginFormProps) {
     const styles = useThemeStyles();
     const {translate} = useLocalize();
     const {isOffline} = useNetwork();
+    const unlinkMessage = account?.message === 'unlinkLoginForm.linkSent' || account?.message === 'unlinkLoginForm.succesfullyUnlinkedLogin' ? translate(account?.message) : account?.message;
     const primaryLogin = useMemo(() => {
         if (!account?.primaryLogin) {
             return '';
@@ -53,13 +54,13 @@ function UnlinkLoginForm({account, credentials}: UnlinkLoginFormProps) {
             <View style={[styles.mv5]}>
                 <Text>{translate('unlinkLoginForm.noLongerHaveAccess', {primaryLogin})}</Text>
             </View>
-            {!!account?.message && (
+            {!!unlinkMessage && (
                 // DotIndicatorMessage mostly expects onyxData errors, so we need to mock an object so that the messages looks similar to prop.account.errors
                 <DotIndicatorMessage
                     style={[styles.mb5, styles.flex0]}
                     type="success"
                     // eslint-disable-next-line @typescript-eslint/naming-convention
-                    messages={{0: account.message}}
+                    messages={{0: unlinkMessage}}
                 />
             )}
             {!!account?.errors && !isEmptyObject(account.errors) && (
diff --git a/src/pages/signin/ValidateCodeForm/BaseValidateCodeForm.tsx b/src/pages/signin/ValidateCodeForm/BaseValidateCodeForm.tsx
index 488d3d48eae9..f23b136c76d0 100755
--- a/src/pages/signin/ValidateCodeForm/BaseValidateCodeForm.tsx
+++ b/src/pages/signin/ValidateCodeForm/BaseValidateCodeForm.tsx
@@ -1,9 +1,11 @@
 import {useIsFocused} from '@react-navigation/native';
-import React, {useCallback, useEffect, useRef, useState} from 'react';
+import React, {forwardRef, useCallback, useEffect, useImperativeHandle, useRef, useState} from 'react';
+import type {ForwardedRef} from 'react';
 import {View} from 'react-native';
 import type {OnyxEntry} from 'react-native-onyx';
 import {withOnyx} from 'react-native-onyx';
 import Button from '@components/Button';
+import SafariFormWrapper from '@components/Form/SafariFormWrapper';
 import FormHelpMessage from '@components/FormHelpMessage';
 import type {MagicCodeInputHandle} from '@components/MagicCodeInput';
 import MagicCodeInput from '@components/MagicCodeInput';
@@ -50,11 +52,18 @@ type BaseValidateCodeFormProps = WithToggleVisibilityViewProps &
         autoComplete: 'sms-otp' | 'one-time-code';
     };
 
+type BaseValidateCodeFormRef = {
+    clearSignInData: () => void;
+};
+
 type ValidateCodeFormVariant = 'validateCode' | 'twoFactorAuthCode' | 'recoveryCode';
 
 type FormError = Partial<Record<ValidateCodeFormVariant, TranslationPaths>>;
 
-function BaseValidateCodeForm({account, credentials, session, autoComplete, isUsingRecoveryCode, setIsUsingRecoveryCode, isVisible}: BaseValidateCodeFormProps) {
+function BaseValidateCodeForm(
+    {account, credentials, session, autoComplete, isUsingRecoveryCode, setIsUsingRecoveryCode, isVisible}: BaseValidateCodeFormProps,
+    forwardedRef: ForwardedRef<BaseValidateCodeFormRef>,
+) {
     const styles = useThemeStyles();
     const StyleUtils = useStyleUtils();
     const {translate} = useLocalize();
@@ -63,7 +72,7 @@ function BaseValidateCodeForm({account, credentials, session, autoComplete, isUs
     const [formError, setFormError] = useState<FormError>({});
     const [validateCode, setValidateCode] = useState(credentials?.validateCode ?? '');
     const [twoFactorAuthCode, setTwoFactorAuthCode] = useState('');
-    const [timeRemaining, setTimeRemaining] = useState(30);
+    const [timeRemaining, setTimeRemaining] = useState(CONST.REQUEST_CODE_DELAY as number);
     const [recoveryCode, setRecoveryCode] = useState('');
     const [needToClearError, setNeedToClearError] = useState<boolean>(!!account?.errors);
 
@@ -90,6 +99,7 @@ function BaseValidateCodeForm({account, credentials, session, autoComplete, isUs
         if (!inputValidateCodeRef.current || !canFocusInputOnScreenFocus() || !isVisible || !isFocused) {
             return;
         }
+        setTimeRemaining(CONST.REQUEST_CODE_DELAY);
         inputValidateCodeRef.current.focus();
     }, [isVisible, isFocused]);
 
@@ -160,27 +170,31 @@ function BaseValidateCodeForm({account, credentials, session, autoComplete, isUs
         User.resendValidateCode(credentials?.login ?? '');
         inputValidateCodeRef.current?.clear();
         // Give feedback to the user to let them know the email was sent so that they don't spam the button.
-        setTimeRemaining(30);
+        setTimeRemaining(CONST.REQUEST_CODE_DELAY);
     };
 
     /**
      * Clear local sign in states
      */
-    const clearLocalSignInData = () => {
+    const clearLocalSignInData = useCallback(() => {
         setTwoFactorAuthCode('');
         setFormError({});
         setValidateCode('');
         setIsUsingRecoveryCode(false);
         setRecoveryCode('');
-    };
+    }, [setIsUsingRecoveryCode]);
 
     /**
      * Clears local and Onyx sign in states
      */
-    const clearSignInData = () => {
+    const clearSignInData = useCallback(() => {
         clearLocalSignInData();
         SessionActions.clearSignInData();
-    };
+    }, [clearLocalSignInData]);
+
+    useImperativeHandle(forwardedRef, () => ({
+        clearSignInData,
+    }));
 
     useEffect(() => {
         if (!needToClearError) {
@@ -217,7 +231,7 @@ function BaseValidateCodeForm({account, credentials, session, autoComplete, isUs
         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
+        // eslint-disable-next-line react-compiler/react-compiler, react-hooks/exhaustive-deps
     }, [isLoadingResendValidationForm]);
 
     useEffect(() => {
@@ -291,7 +305,7 @@ function BaseValidateCodeForm({account, credentials, session, autoComplete, isUs
     }, [account, credentials, twoFactorAuthCode, validateCode, isUsingRecoveryCode, recoveryCode]);
 
     return (
-        <>
+        <SafariFormWrapper>
             {/* At this point, if we know the account requires 2FA we already successfully authenticated */}
             {account?.requiresTwoFactorAuth ? (
                 <View style={[styles.mv3]}>
@@ -303,7 +317,7 @@ function BaseValidateCodeForm({account, credentials, session, autoComplete, isUs
                             onChangeText={(text) => onTextInput(text, 'recoveryCode')}
                             maxLength={CONST.FORM_CHARACTER_LIMIT}
                             label={translate('recoveryCodeForm.recoveryCode')}
-                            errorText={formError?.recoveryCode ?? ''}
+                            errorText={formError?.recoveryCode ? translate(formError?.recoveryCode) : ''}
                             hasError={hasError}
                             onSubmitEditing={validateAndSubmitForm}
                             autoFocus
@@ -323,7 +337,7 @@ function BaseValidateCodeForm({account, credentials, session, autoComplete, isUs
                             onChangeText={(text) => onTextInput(text, 'twoFactorAuthCode')}
                             onFulfill={validateAndSubmitForm}
                             maxLength={CONST.TFA_CODE_LENGTH}
-                            errorText={formError?.twoFactorAuthCode ?? ''}
+                            errorText={formError?.twoFactorAuthCode ? translate(formError?.twoFactorAuthCode) : ''}
                             hasError={hasError}
                             autoFocus
                             key="twoFactorAuthCode"
@@ -356,7 +370,7 @@ function BaseValidateCodeForm({account, credentials, session, autoComplete, isUs
                         value={validateCode}
                         onChangeText={(text) => onTextInput(text, 'validateCode')}
                         onFulfill={validateAndSubmitForm}
-                        errorText={formError?.validateCode ?? ''}
+                        errorText={formError?.validateCode ? translate(formError?.validateCode) : ''}
                         hasError={hasError}
                         autoFocus
                         key="validateCode"
@@ -402,7 +416,7 @@ function BaseValidateCodeForm({account, credentials, session, autoComplete, isUs
             <View style={[styles.mt5, styles.signInPageWelcomeTextContainer]}>
                 <Terms />
             </View>
-        </>
+        </SafariFormWrapper>
     );
 }
 
@@ -413,5 +427,7 @@ export default withToggleVisibilityView(
         account: {key: ONYXKEYS.ACCOUNT},
         credentials: {key: ONYXKEYS.CREDENTIALS},
         session: {key: ONYXKEYS.SESSION},
-    })(BaseValidateCodeForm),
+    })(forwardRef(BaseValidateCodeForm)),
 );
+
+export type {BaseValidateCodeFormRef};
diff --git a/src/pages/signin/ValidateCodeForm/index.android.tsx b/src/pages/signin/ValidateCodeForm/index.android.tsx
index 1edd17517539..1cb05a0470f0 100644
--- a/src/pages/signin/ValidateCodeForm/index.android.tsx
+++ b/src/pages/signin/ValidateCodeForm/index.android.tsx
@@ -1,11 +1,14 @@
-import React from 'react';
+import React, {forwardRef} from 'react';
+import type {ForwardedRef} from 'react';
 import BaseValidateCodeForm from './BaseValidateCodeForm';
+import type {BaseValidateCodeFormRef} from './BaseValidateCodeForm';
 import type ValidateCodeFormProps from './types';
 
-function ValidateCodeForm(props: ValidateCodeFormProps) {
+function ValidateCodeForm(props: ValidateCodeFormProps, ref: ForwardedRef<BaseValidateCodeFormRef>) {
     return (
         <BaseValidateCodeForm
             autoComplete="sms-otp"
+            ref={ref}
             /* eslint-disable-next-line react/jsx-props-no-spreading */
             {...props}
         />
@@ -14,4 +17,4 @@ function ValidateCodeForm(props: ValidateCodeFormProps) {
 
 ValidateCodeForm.displayName = 'ValidateCodeForm';
 
-export default ValidateCodeForm;
+export default forwardRef(ValidateCodeForm);
diff --git a/src/pages/signin/ValidateCodeForm/index.tsx b/src/pages/signin/ValidateCodeForm/index.tsx
index 8c1528ae7409..c656b049345e 100644
--- a/src/pages/signin/ValidateCodeForm/index.tsx
+++ b/src/pages/signin/ValidateCodeForm/index.tsx
@@ -1,11 +1,14 @@
-import React from 'react';
+import React, {forwardRef} from 'react';
+import type {ForwardedRef} from 'react';
 import BaseValidateCodeForm from './BaseValidateCodeForm';
+import type {BaseValidateCodeFormRef} from './BaseValidateCodeForm';
 import type ValidateCodeFormProps from './types';
 
-function ValidateCodeForm(props: ValidateCodeFormProps) {
+function ValidateCodeForm(props: ValidateCodeFormProps, ref: ForwardedRef<BaseValidateCodeFormRef>) {
     return (
         <BaseValidateCodeForm
             autoComplete="one-time-code"
+            ref={ref}
             /* eslint-disable-next-line react/jsx-props-no-spreading */
             {...props}
         />
@@ -14,4 +17,4 @@ function ValidateCodeForm(props: ValidateCodeFormProps) {
 
 ValidateCodeForm.displayName = 'ValidateCodeForm';
 
-export default ValidateCodeForm;
+export default forwardRef(ValidateCodeForm);
diff --git a/src/pages/tasks/NewTaskDescriptionPage.tsx b/src/pages/tasks/NewTaskDescriptionPage.tsx
index 93ad5e63f3d7..f18829e8c803 100644
--- a/src/pages/tasks/NewTaskDescriptionPage.tsx
+++ b/src/pages/tasks/NewTaskDescriptionPage.tsx
@@ -1,5 +1,4 @@
 import type {StackScreenProps} from '@react-navigation/stack';
-import ExpensiMark from 'expensify-common/lib/ExpensiMark';
 import React from 'react';
 import {View} from 'react-native';
 import {withOnyx} from 'react-native-onyx';
@@ -16,6 +15,8 @@ import useThemeStyles from '@hooks/useThemeStyles';
 import * as ErrorUtils from '@libs/ErrorUtils';
 import Navigation from '@libs/Navigation/Navigation';
 import type {NewTaskNavigatorParamList} from '@libs/Navigation/types';
+import Parser from '@libs/Parser';
+import * as ReportUtils from '@libs/ReportUtils';
 import updateMultilineInputRange from '@libs/updateMultilineInputRange';
 import variables from '@styles/variables';
 import * as TaskActions from '@userActions/Task';
@@ -33,12 +34,10 @@ type NewTaskDescriptionPageOnyxProps = {
 
 type NewTaskDescriptionPageProps = NewTaskDescriptionPageOnyxProps & StackScreenProps<NewTaskNavigatorParamList, typeof SCREENS.NEW_TASK.DESCRIPTION>;
 
-const parser = new ExpensiMark();
-
 function NewTaskDescriptionPage({task}: NewTaskDescriptionPageProps) {
     const styles = useThemeStyles();
     const {translate} = useLocalize();
-    const {inputCallbackRef} = useAutoFocusInput();
+    const {inputCallbackRef, inputRef} = useAutoFocusInput();
 
     const onSubmit = (values: FormOnyxValues<typeof ONYXKEYS.FORMS.NEW_TASK_FORM>) => {
         TaskActions.setDescriptionValue(values.taskDescription);
@@ -47,9 +46,9 @@ function NewTaskDescriptionPage({task}: NewTaskDescriptionPageProps) {
 
     const validate = (values: FormOnyxValues<typeof ONYXKEYS.FORMS.NEW_TASK_FORM>): FormInputErrors<typeof ONYXKEYS.FORMS.NEW_TASK_FORM> => {
         const errors = {};
-
-        if (values.taskDescription.length > CONST.DESCRIPTION_LIMIT) {
-            ErrorUtils.addErrorMessage(errors, 'taskDescription', ['common.error.characterLimitExceedCounter', {length: values.taskDescription.length, limit: CONST.DESCRIPTION_LIMIT}]);
+        const taskDescriptionLength = ReportUtils.getCommentLength(values.taskDescription);
+        if (taskDescriptionLength > CONST.DESCRIPTION_LIMIT) {
+            ErrorUtils.addErrorMessage(errors, 'taskDescription', translate('common.error.characterLimitExceedCounter', {length: taskDescriptionLength, limit: CONST.DESCRIPTION_LIMIT}));
         }
 
         return errors;
@@ -78,14 +77,16 @@ function NewTaskDescriptionPage({task}: NewTaskDescriptionPageProps) {
                     <View style={styles.mb5}>
                         <InputWrapperWithRef
                             InputComponent={TextInput}
-                            defaultValue={parser.htmlToMarkdown(parser.replace(task?.description ?? ''))}
+                            defaultValue={Parser.htmlToMarkdown(Parser.replace(task?.description ?? ''))}
                             inputID={INPUT_IDS.TASK_DESCRIPTION}
                             label={translate('newTaskPage.descriptionOptional')}
                             accessibilityLabel={translate('newTaskPage.descriptionOptional')}
                             role={CONST.ROLE.PRESENTATION}
                             ref={(el) => {
+                                if (!inputRef.current) {
+                                    updateMultilineInputRange(el);
+                                }
                                 inputCallbackRef(el);
-                                updateMultilineInputRange(el);
                             }}
                             autoGrowHeight
                             maxAutoGrowHeight={variables.textInputAutoGrowMaxHeight}
diff --git a/src/pages/tasks/NewTaskDetailsPage.tsx b/src/pages/tasks/NewTaskDetailsPage.tsx
index 52fdbf5523a2..2078ec81f04a 100644
--- a/src/pages/tasks/NewTaskDetailsPage.tsx
+++ b/src/pages/tasks/NewTaskDetailsPage.tsx
@@ -1,5 +1,4 @@
 import type {StackScreenProps} from '@react-navigation/stack';
-import ExpensiMark from 'expensify-common/lib/ExpensiMark';
 import React, {useEffect, useState} from 'react';
 import {View} from 'react-native';
 import {withOnyx} from 'react-native-onyx';
@@ -16,6 +15,8 @@ import useThemeStyles from '@hooks/useThemeStyles';
 import * as ErrorUtils from '@libs/ErrorUtils';
 import Navigation from '@libs/Navigation/Navigation';
 import type {NewTaskNavigatorParamList} from '@libs/Navigation/types';
+import Parser from '@libs/Parser';
+import * as ReportUtils from '@libs/ReportUtils';
 import playSound, {SOUNDS} from '@libs/Sound';
 import variables from '@styles/variables';
 import * as TaskActions from '@userActions/Task';
@@ -33,8 +34,6 @@ type NewTaskDetailsPageOnyxProps = {
 
 type NewTaskDetailsPageProps = NewTaskDetailsPageOnyxProps & StackScreenProps<NewTaskNavigatorParamList, typeof SCREENS.NEW_TASK.DETAILS>;
 
-const parser = new ExpensiMark();
-
 function NewTaskDetailsPage({task}: NewTaskDetailsPageProps) {
     const styles = useThemeStyles();
     const {translate} = useLocalize();
@@ -48,7 +47,7 @@ function NewTaskDetailsPage({task}: NewTaskDetailsPageProps) {
 
     useEffect(() => {
         setTaskTitle(task?.title ?? '');
-        setTaskDescription(parser.htmlToMarkdown(parser.replace(task?.description ?? '')));
+        setTaskDescription(Parser.htmlToMarkdown(Parser.replace(task?.description ?? '')));
     }, [task]);
 
     const validate = (values: FormOnyxValues<typeof ONYXKEYS.FORMS.NEW_TASK_FORM>): FormInputErrors<typeof ONYXKEYS.FORMS.NEW_TASK_FORM> => {
@@ -56,12 +55,13 @@ function NewTaskDetailsPage({task}: NewTaskDetailsPageProps) {
 
         if (!values.taskTitle) {
             // We error if the user doesn't enter a task name
-            ErrorUtils.addErrorMessage(errors, 'taskTitle', 'newTaskPage.pleaseEnterTaskName');
+            ErrorUtils.addErrorMessage(errors, 'taskTitle', translate('newTaskPage.pleaseEnterTaskName'));
         } else if (values.taskTitle.length > CONST.TITLE_CHARACTER_LIMIT) {
-            ErrorUtils.addErrorMessage(errors, 'taskTitle', ['common.error.characterLimitExceedCounter', {length: values.taskTitle.length, limit: CONST.TITLE_CHARACTER_LIMIT}]);
+            ErrorUtils.addErrorMessage(errors, 'taskTitle', translate('common.error.characterLimitExceedCounter', {length: values.taskTitle.length, limit: CONST.TITLE_CHARACTER_LIMIT}));
         }
-        if (values.taskDescription.length > CONST.DESCRIPTION_LIMIT) {
-            ErrorUtils.addErrorMessage(errors, 'taskDescription', ['common.error.characterLimitExceedCounter', {length: values.taskDescription.length, limit: CONST.DESCRIPTION_LIMIT}]);
+        const taskDescriptionLength = ReportUtils.getCommentLength(values.taskDescription);
+        if (taskDescriptionLength > CONST.DESCRIPTION_LIMIT) {
+            ErrorUtils.addErrorMessage(errors, 'taskDescription', translate('common.error.characterLimitExceedCounter', {length: taskDescriptionLength, limit: CONST.DESCRIPTION_LIMIT}));
         }
 
         return errors;
@@ -73,10 +73,10 @@ function NewTaskDetailsPage({task}: NewTaskDetailsPageProps) {
         TaskActions.setDetailsValue(values.taskTitle, values.taskDescription);
 
         if (skipConfirmation) {
-            TaskActions.setShareDestinationValue(task?.parentReportID ?? '');
+            TaskActions.setShareDestinationValue(task?.parentReportID ?? '-1');
             playSound(SOUNDS.DONE);
             TaskActions.createTaskAndNavigate(
-                task?.parentReportID ?? '',
+                task?.parentReportID ?? '-1',
                 values.taskTitle,
                 values.taskDescription ?? '',
                 task?.assignee ?? '',
@@ -133,7 +133,7 @@ function NewTaskDetailsPage({task}: NewTaskDetailsPageProps) {
                         autoGrowHeight
                         maxAutoGrowHeight={variables.textInputAutoGrowMaxHeight}
                         shouldSubmitForm
-                        defaultValue={parser.htmlToMarkdown(parser.replace(taskDescription))}
+                        defaultValue={Parser.htmlToMarkdown(Parser.replace(taskDescription))}
                         value={taskDescription}
                         onValueChange={setTaskDescription}
                         isMarkdownEnabled
diff --git a/src/pages/tasks/NewTaskPage.tsx b/src/pages/tasks/NewTaskPage.tsx
index 44cb485c0b06..5510ce910b97 100644
--- a/src/pages/tasks/NewTaskPage.tsx
+++ b/src/pages/tasks/NewTaskPage.tsx
@@ -1,17 +1,21 @@
+import {useFocusEffect} from '@react-navigation/native';
 import type {StackScreenProps} from '@react-navigation/stack';
-import React, {useEffect, useMemo, useState} from 'react';
-import {View} from 'react-native';
-import {withOnyx} from 'react-native-onyx';
+import React, {useCallback, useEffect, useMemo, useRef, useState} from 'react';
+import {InteractionManager, View} from 'react-native';
 import type {OnyxCollection, OnyxEntry} from 'react-native-onyx';
+import {withOnyx} from 'react-native-onyx';
 import FullPageNotFoundView from '@components/BlockingViews/FullPageNotFoundView';
 import FormAlertWithSubmitButton from '@components/FormAlertWithSubmitButton';
+import FormHelpMessage from '@components/FormHelpMessage';
 import HeaderWithBackButton from '@components/HeaderWithBackButton';
 import MenuItem from '@components/MenuItem';
 import MenuItemWithTopDescription from '@components/MenuItemWithTopDescription';
 import ScreenWrapper from '@components/ScreenWrapper';
 import ScrollView from '@components/ScrollView';
 import useLocalize from '@hooks/useLocalize';
+import useStyledSafeAreaInsets from '@hooks/useStyledSafeAreaInsets';
 import useThemeStyles from '@hooks/useThemeStyles';
+import blurActiveElement from '@libs/Accessibility/blurActiveElement';
 import * as LocalePhoneNumber from '@libs/LocalePhoneNumber';
 import Navigation from '@libs/Navigation/Navigation';
 import type {NewTaskNavigatorParamList} from '@libs/Navigation/types';
@@ -19,6 +23,7 @@ import * as OptionsListUtils from '@libs/OptionsListUtils';
 import * as ReportUtils from '@libs/ReportUtils';
 import playSound, {SOUNDS} from '@libs/Sound';
 import * as TaskActions from '@userActions/Task';
+import CONST from '@src/CONST';
 import ONYXKEYS from '@src/ONYXKEYS';
 import ROUTES from '@src/ROUTES';
 import type SCREENS from '@src/SCREENS';
@@ -50,10 +55,26 @@ function NewTaskPage({task, reports, personalDetails}: NewTaskPageProps) {
     const [title, setTitle] = useState('');
     const [description, setDescription] = useState('');
     const [errorMessage, setErrorMessage] = useState('');
-    const [parentReport, setParentReport] = useState<OnyxEntry<Report>>(null);
+    const [parentReport, setParentReport] = useState<OnyxEntry<Report>>();
 
+    const hasDestinationError = task?.skipConfirmation && !task?.parentReportID;
     const isAllowedToCreateTask = useMemo(() => isEmptyObject(parentReport) || ReportUtils.isAllowedToComment(parentReport), [parentReport]);
 
+    const {paddingBottom} = useStyledSafeAreaInsets();
+
+    const confirmButtonRef = useRef<View>(null);
+    const focusTimeoutRef = useRef<NodeJS.Timeout | null>(null);
+    useFocusEffect(
+        useCallback(() => {
+            focusTimeoutRef.current = setTimeout(() => {
+                InteractionManager.runAfterInteractions(() => {
+                    blurActiveElement();
+                });
+            }, CONST.ANIMATED_TRANSITION);
+            return () => focusTimeoutRef.current && clearTimeout(focusTimeoutRef.current);
+        }, []),
+    );
+
     useEffect(() => {
         setErrorMessage('');
 
@@ -74,7 +95,7 @@ function NewTaskPage({task, reports, personalDetails}: NewTaskPageProps) {
         // If we have a share destination, we want to set the parent report and
         // the share destination data
         if (task?.shareDestination) {
-            setParentReport(reports?.[`report_${task.shareDestination}`] ?? null);
+            setParentReport(reports?.[`report_${task.shareDestination}`]);
             const displayDetails = TaskActions.getShareDestination(task.shareDestination, reports, personalDetails);
             setShareDestination(displayDetails);
         }
@@ -94,23 +115,23 @@ function NewTaskPage({task, reports, personalDetails}: NewTaskPageProps) {
     // the response
     const onSubmit = () => {
         if (!task?.title && !task?.shareDestination) {
-            setErrorMessage('newTaskPage.confirmError');
+            setErrorMessage(translate('newTaskPage.confirmError'));
             return;
         }
 
         if (!task.title) {
-            setErrorMessage('newTaskPage.pleaseEnterTaskName');
+            setErrorMessage(translate('newTaskPage.pleaseEnterTaskName'));
             return;
         }
 
         if (!task.shareDestination) {
-            setErrorMessage('newTaskPage.pleaseEnterTaskDestination');
+            setErrorMessage(translate('newTaskPage.pleaseEnterTaskDestination'));
             return;
         }
 
         playSound(SOUNDS.DONE);
         TaskActions.createTaskAndNavigate(
-            parentReport?.reportID ?? '',
+            parentReport?.reportID ?? '-1',
             task.title,
             task?.description ?? '',
             task?.assignee ?? '',
@@ -138,6 +159,14 @@ function NewTaskPage({task, reports, personalDetails}: NewTaskPageProps) {
                         Navigation.goBack(ROUTES.NEW_TASK_DETAILS);
                     }}
                 />
+                {hasDestinationError && (
+                    <FormHelpMessage
+                        style={[styles.ph4, styles.mb4]}
+                        isError={false}
+                        shouldShowRedDotIndicator={false}
+                        message={translate('quickAction.noLongerHaveReportAccess')}
+                    />
+                )}
                 <ScrollView
                     contentContainerStyle={styles.flexGrow1}
                     // on iOS, navigation animation sometimes cause the scrollbar to appear
@@ -153,6 +182,7 @@ function NewTaskPage({task, reports, personalDetails}: NewTaskPageProps) {
                                 title={title}
                                 onPress={() => Navigation.navigate(ROUTES.NEW_TASK_TITLE)}
                                 shouldShowRightIcon
+                                rightLabel={translate('common.required')}
                             />
                             <MenuItemWithTopDescription
                                 description={translate('task.description')}
@@ -173,25 +203,27 @@ function NewTaskPage({task, reports, personalDetails}: NewTaskPageProps) {
                                 titleWithTooltips={assigneeTooltipDetails}
                             />
                             <MenuItem
-                                label={shareDestination?.displayName ? translate('newTaskPage.shareSomewhere') : ''}
+                                label={shareDestination?.displayName ? translate('common.share') : ''}
                                 title={shareDestination?.displayName ?? ''}
-                                description={shareDestination?.displayName ? shareDestination.subtitle : translate('newTaskPage.shareSomewhere')}
+                                description={shareDestination?.displayName ? shareDestination.subtitle : translate('common.share')}
                                 icon={shareDestination?.icons}
                                 onPress={() => Navigation.navigate(ROUTES.NEW_TASK_SHARE_DESTINATION)}
                                 interactive={!task?.parentReportID}
                                 shouldShowRightIcon={!task?.parentReportID}
                                 titleWithTooltips={shareDestination?.shouldUseFullTitleToDisplay ? undefined : shareDestination?.displayNamesWithTooltips}
+                                rightLabel={translate('common.required')}
                             />
                         </View>
                     </View>
                     <View style={styles.flexShrink0}>
                         <FormAlertWithSubmitButton
-                            isAlertVisible={Boolean(errorMessage)}
+                            isAlertVisible={!!errorMessage}
                             message={errorMessage}
                             onSubmit={onSubmit}
                             enabledWhenOffline
+                            buttonRef={confirmButtonRef}
                             buttonText={translate('newTaskPage.confirmTask')}
-                            containerStyles={[styles.mh0, styles.mt5, styles.flex1, styles.ph5]}
+                            containerStyles={[styles.mh0, styles.mt5, styles.flex1, styles.ph5, !paddingBottom ? styles.mb5 : null]}
                         />
                     </View>
                 </ScrollView>
diff --git a/src/pages/tasks/NewTaskTitlePage.tsx b/src/pages/tasks/NewTaskTitlePage.tsx
index 582d2a5c6500..cdc9fc27596a 100644
--- a/src/pages/tasks/NewTaskTitlePage.tsx
+++ b/src/pages/tasks/NewTaskTitlePage.tsx
@@ -40,9 +40,9 @@ function NewTaskTitlePage({task}: NewTaskTitlePageProps) {
 
         if (!values.taskTitle) {
             // We error if the user doesn't enter a task name
-            ErrorUtils.addErrorMessage(errors, 'taskTitle', 'newTaskPage.pleaseEnterTaskName');
+            ErrorUtils.addErrorMessage(errors, 'taskTitle', translate('newTaskPage.pleaseEnterTaskName'));
         } else if (values.taskTitle.length > CONST.TITLE_CHARACTER_LIMIT) {
-            ErrorUtils.addErrorMessage(errors, 'taskTitle', ['common.error.characterLimitExceedCounter', {length: values.taskTitle.length, limit: CONST.TITLE_CHARACTER_LIMIT}]);
+            ErrorUtils.addErrorMessage(errors, 'taskTitle', translate('common.error.characterLimitExceedCounter', {length: values.taskTitle.length, limit: CONST.TITLE_CHARACTER_LIMIT}));
         }
 
         return errors;
diff --git a/src/pages/tasks/TaskAssigneeSelectorModal.tsx b/src/pages/tasks/TaskAssigneeSelectorModal.tsx
index 9a3993a6b649..8884a69debaa 100644
--- a/src/pages/tasks/TaskAssigneeSelectorModal.tsx
+++ b/src/pages/tasks/TaskAssigneeSelectorModal.tsx
@@ -2,7 +2,7 @@
 import type {RouteProp} from '@react-navigation/native';
 import {useRoute} from '@react-navigation/native';
 import React, {useCallback, useEffect, useMemo, useState} from 'react';
-import {View} from 'react-native';
+import {InteractionManager, View} from 'react-native';
 import {useOnyx, withOnyx} from 'react-native-onyx';
 import type {OnyxCollection, OnyxEntry} from 'react-native-onyx';
 import FullPageNotFoundView from '@components/BlockingViews/FullPageNotFoundView';
@@ -22,6 +22,8 @@ import useDebouncedState from '@hooks/useDebouncedState';
 import useLocalize from '@hooks/useLocalize';
 import useThemeStyles from '@hooks/useThemeStyles';
 import * as ReportActions from '@libs/actions/Report';
+import {READ_COMMANDS} from '@libs/API/types';
+import HttpUtils from '@libs/HttpUtils';
 import Navigation from '@libs/Navigation/Navigation';
 import * as OptionsListUtils from '@libs/OptionsListUtils';
 import * as ReportUtils from '@libs/ReportUtils';
@@ -49,12 +51,12 @@ function useOptions() {
     const [searchValue, debouncedSearchValue, setSearchValue] = useDebouncedState('');
     const {options: optionsList, areOptionsInitialized} = useOptionsList();
 
-    const options = useMemo(() => {
+    const defaultOptions = useMemo(() => {
         const {recentReports, personalDetails, userToInvite, currentUserOption} = OptionsListUtils.getFilteredOptions(
             optionsList.reports,
             optionsList.personalDetails,
             betas,
-            debouncedSearchValue.trim(),
+            '',
             [],
             CONST.EXPENSIFY_EMAILS,
             false,
@@ -66,13 +68,12 @@ function useOptions() {
             {},
             [],
             true,
+            false,
+            false,
+            0,
         );
 
-        const headerMessage = OptionsListUtils.getHeaderMessage(
-            (recentReports?.length || 0) + (personalDetails?.length || 0) !== 0 || Boolean(currentUserOption),
-            Boolean(userToInvite),
-            debouncedSearchValue,
-        );
+        const headerMessage = OptionsListUtils.getHeaderMessage((recentReports?.length || 0) + (personalDetails?.length || 0) !== 0 || !!currentUserOption, !!userToInvite, '');
 
         if (isLoading) {
             setIsLoading(false);
@@ -84,8 +85,28 @@ function useOptions() {
             personalDetails,
             currentUserOption,
             headerMessage,
+            categoryOptions: [],
+            tagOptions: [],
+            taxRatesOptions: [],
+        };
+    }, [optionsList.reports, optionsList.personalDetails, betas, isLoading]);
+
+    const options = useMemo(() => {
+        const filteredOptions = OptionsListUtils.filterOptions(defaultOptions, debouncedSearchValue.trim(), {
+            excludeLogins: CONST.EXPENSIFY_EMAILS,
+            maxRecentReportsToShow: CONST.IOU.MAX_RECENT_REPORTS_TO_SHOW,
+        });
+        const headerMessage = OptionsListUtils.getHeaderMessage(
+            (filteredOptions.recentReports?.length || 0) + (filteredOptions.personalDetails?.length || 0) !== 0 || !!filteredOptions.currentUserOption,
+            !!filteredOptions.userToInvite,
+            debouncedSearchValue,
+        );
+
+        return {
+            ...filteredOptions,
+            headerMessage,
         };
-    }, [optionsList.reports, optionsList.personalDetails, betas, debouncedSearchValue, isLoading]);
+    }, [debouncedSearchValue, defaultOptions]);
 
     return {...options, searchValue, debouncedSearchValue, setSearchValue, areOptionsInitialized};
 }
@@ -101,14 +122,14 @@ function TaskAssigneeSelectorModal({reports, task}: TaskAssigneeSelectorModalPro
 
     const report: OnyxEntry<Report> = useMemo(() => {
         if (!route.params?.reportID) {
-            return null;
+            return;
         }
         if (report && !ReportUtils.isTaskReport(report)) {
             Navigation.isNavigationReady().then(() => {
                 Navigation.dismissModal(report.reportID);
             });
         }
-        return reports?.[`${ONYXKEYS.COLLECTION.REPORT}${route.params?.reportID}`] ?? null;
+        return reports?.[`${ONYXKEYS.COLLECTION.REPORT}${route.params?.reportID}`];
     }, [reports, route]);
 
     const sections = useMemo(() => {
@@ -158,6 +179,7 @@ function TaskAssigneeSelectorModal({reports, task}: TaskAssigneeSelectorModalPro
 
     const selectReport = useCallback(
         (option: ListItem) => {
+            HttpUtils.cancelPendingRequests(READ_COMMANDS.SEARCH_FOR_REPORTS);
             if (!option) {
                 return;
             }
@@ -169,24 +191,27 @@ function TaskAssigneeSelectorModal({reports, task}: TaskAssigneeSelectorModalPro
                         option?.login ?? '',
                         option?.accountID ?? -1,
                         report.reportID,
-                        null, // passing null as report because for editing task the report will be task details report page not the actual report where task was created
+                        undefined, // passing null as report because for editing task the report will be task details report page not the actual report where task was created
                         OptionsListUtils.isCurrentUser({...option, accountID: option?.accountID ?? -1, login: option?.login ?? ''}),
                     );
-
                     // Pass through the selected assignee
-                    TaskActions.editTaskAssignee(report, session?.accountID ?? 0, option?.login ?? '', option?.accountID, assigneeChatReport);
+                    TaskActions.editTaskAssignee(report, session?.accountID ?? -1, option?.login ?? '', option?.accountID, assigneeChatReport);
                 }
-                Navigation.dismissModal(report.reportID);
+                InteractionManager.runAfterInteractions(() => {
+                    Navigation.dismissModal(report.reportID);
+                });
                 // If there's no report, we're creating a new task
             } else if (option.accountID) {
                 TaskActions.setAssigneeValue(
                     option?.login ?? '',
-                    option.accountID,
+                    option.accountID ?? -1,
                     task?.shareDestination ?? '',
-                    null, // passing null as report is null in this condition
+                    undefined, // passing null as report is null in this condition
                     OptionsListUtils.isCurrentUser({...option, accountID: option?.accountID ?? -1, login: option?.login ?? undefined}),
                 );
-                Navigation.goBack(ROUTES.NEW_TASK);
+                InteractionManager.runAfterInteractions(() => {
+                    Navigation.goBack(ROUTES.NEW_TASK);
+                });
             }
         },
         [session?.accountID, task?.shareDestination, report],
@@ -217,10 +242,11 @@ function TaskAssigneeSelectorModal({reports, task}: TaskAssigneeSelectorModalPro
                         sections={areOptionsInitialized ? sections : []}
                         ListItem={UserListItem}
                         onSelectRow={selectReport}
+                        shouldSingleExecuteRowSelect
                         onChangeText={setSearchValue}
                         textInputValue={searchValue}
                         headerMessage={headerMessage}
-                        textInputLabel={translate('optionsSelector.nameEmailOrPhoneNumber')}
+                        textInputLabel={translate('selectionList.nameEmailOrPhoneNumber')}
                         showLoadingPlaceholder={!areOptionsInitialized}
                         isLoadingNewOptions={!!isSearchingForReports}
                     />
diff --git a/src/pages/tasks/TaskDescriptionPage.tsx b/src/pages/tasks/TaskDescriptionPage.tsx
index 58fddda73bd2..230185f2b4f0 100644
--- a/src/pages/tasks/TaskDescriptionPage.tsx
+++ b/src/pages/tasks/TaskDescriptionPage.tsx
@@ -1,5 +1,4 @@
 import {useFocusEffect} from '@react-navigation/native';
-import ExpensiMark from 'expensify-common/lib/ExpensiMark';
 import React, {useCallback, useRef} from 'react';
 import {View} from 'react-native';
 import FullPageNotFoundView from '@components/BlockingViews/FullPageNotFoundView';
@@ -16,6 +15,7 @@ import useLocalize from '@hooks/useLocalize';
 import useThemeStyles from '@hooks/useThemeStyles';
 import * as ErrorUtils from '@libs/ErrorUtils';
 import Navigation from '@libs/Navigation/Navigation';
+import Parser from '@libs/Parser';
 import * as ReportUtils from '@libs/ReportUtils';
 import updateMultilineInputRange from '@libs/updateMultilineInputRange';
 import withReportOrNotFound from '@pages/home/report/withReportOrNotFound';
@@ -29,25 +29,27 @@ import {isEmptyObject} from '@src/types/utils/EmptyObject';
 
 type TaskDescriptionPageProps = WithReportOrNotFoundProps & WithCurrentUserPersonalDetailsProps;
 
-const parser = new ExpensiMark();
-
 function TaskDescriptionPage({report, currentUserPersonalDetails}: TaskDescriptionPageProps) {
     const styles = useThemeStyles();
     const {translate} = useLocalize();
 
-    const validate = useCallback((values: FormOnyxValues<typeof ONYXKEYS.FORMS.EDIT_TASK_FORM>): FormInputErrors<typeof ONYXKEYS.FORMS.EDIT_TASK_FORM> => {
-        const errors = {};
-
-        if (values?.description && values.description?.length > CONST.DESCRIPTION_LIMIT) {
-            ErrorUtils.addErrorMessage(errors, 'description', ['common.error.characterLimitExceedCounter', {length: values.description.length, limit: CONST.DESCRIPTION_LIMIT}]);
-        }
+    const validate = useCallback(
+        (values: FormOnyxValues<typeof ONYXKEYS.FORMS.EDIT_TASK_FORM>): FormInputErrors<typeof ONYXKEYS.FORMS.EDIT_TASK_FORM> => {
+            const errors = {};
+            const parsedDescription = ReportUtils.getParsedComment(values?.description);
+            const taskDescriptionLength = ReportUtils.getCommentLength(parsedDescription);
+            if (values?.description && taskDescriptionLength > CONST.DESCRIPTION_LIMIT) {
+                ErrorUtils.addErrorMessage(errors, 'description', translate('common.error.characterLimitExceedCounter', {length: taskDescriptionLength, limit: CONST.DESCRIPTION_LIMIT}));
+            }
 
-        return errors;
-    }, []);
+            return errors;
+        },
+        [translate],
+    );
 
     const submit = useCallback(
         (values: FormOnyxValues<typeof ONYXKEYS.FORMS.EDIT_TASK_FORM>) => {
-            if (parser.htmlToMarkdown(parser.replace(values.description)) !== parser.htmlToMarkdown(parser.replace(report?.description ?? '')) && !isEmptyObject(report)) {
+            if (values.description !== Parser.htmlToMarkdown(report?.description ?? '') && !isEmptyObject(report)) {
                 // Set the description of the report in the store and then call EditTask API
                 // to update the description of the report on the server
                 Task.editTask(report, {description: values.description});
@@ -110,13 +112,15 @@ function TaskDescriptionPage({report, currentUserPersonalDetails}: TaskDescripti
                             name={INPUT_IDS.DESCRIPTION}
                             label={translate('newTaskPage.descriptionOptional')}
                             accessibilityLabel={translate('newTaskPage.descriptionOptional')}
-                            defaultValue={parser.htmlToMarkdown((report && parser.replace(report?.description ?? '')) || '')}
+                            defaultValue={Parser.htmlToMarkdown(report?.description ?? '')}
                             ref={(element: AnimatedTextInputRef) => {
                                 if (!element) {
                                     return;
                                 }
+                                if (!inputRef.current) {
+                                    updateMultilineInputRange(inputRef.current);
+                                }
                                 inputRef.current = element;
-                                updateMultilineInputRange(inputRef.current);
                             }}
                             autoGrowHeight
                             maxAutoGrowHeight={variables.textInputAutoGrowMaxHeight}
diff --git a/src/pages/tasks/TaskShareDestinationSelectorModal.tsx b/src/pages/tasks/TaskShareDestinationSelectorModal.tsx
index 859dfa36a33f..1754c512bd6b 100644
--- a/src/pages/tasks/TaskShareDestinationSelectorModal.tsx
+++ b/src/pages/tasks/TaskShareDestinationSelectorModal.tsx
@@ -11,6 +11,8 @@ import useLocalize from '@hooks/useLocalize';
 import useNetwork from '@hooks/useNetwork';
 import useThemeStyles from '@hooks/useThemeStyles';
 import * as ReportActions from '@libs/actions/Report';
+import {READ_COMMANDS} from '@libs/API/types';
+import HttpUtils from '@libs/HttpUtils';
 import Navigation from '@libs/Navigation/Navigation';
 import * as OptionsListUtils from '@libs/OptionsListUtils';
 import * as ReportUtils from '@libs/ReportUtils';
@@ -21,6 +23,7 @@ import ROUTES from '@src/ROUTES';
 import type {Report} from '@src/types/onyx';
 
 const selectReportHandler = (option: unknown) => {
+    HttpUtils.cancelPendingRequests(READ_COMMANDS.SEARCH_FOR_REPORTS);
     const optionItem = option as ReportUtils.OptionData;
 
     if (!optionItem || !optionItem?.reportID) {
@@ -53,22 +56,52 @@ function TaskShareDestinationSelectorModal() {
 
     const textInputHint = useMemo(() => (isOffline ? `${translate('common.youAppearToBeOffline')} ${translate('search.resultsAreLimited')}` : ''), [isOffline, translate]);
 
-    const options = useMemo(() => {
+    const defaultOptions = useMemo(() => {
         if (!areOptionsInitialized) {
             return {
-                sections: [],
-                headerMessage: '',
+                recentReports: [],
+                personalDetails: [],
+                userToInvite: null,
+                currentUserOption: null,
+                categoryOptions: [],
+                tagOptions: [],
+                taxRatesOptions: [],
+                header: '',
             };
         }
         const filteredReports = reportFilter(optionList.reports);
-        const {recentReports} = OptionsListUtils.getShareDestinationOptions(filteredReports, optionList.personalDetails, [], debouncedSearchValue.trim(), [], CONST.EXPENSIFY_EMAILS, true);
-        const headerMessage = OptionsListUtils.getHeaderMessage(recentReports && recentReports.length !== 0, false, debouncedSearchValue);
+        const {recentReports} = OptionsListUtils.getShareDestinationOptions(filteredReports, optionList.personalDetails, [], '', [], [], true);
+        const header = OptionsListUtils.getHeaderMessage(recentReports && recentReports.length !== 0, false, '');
+        return {
+            recentReports,
+            personalDetails: [],
+            userToInvite: null,
+            currentUserOption: null,
+            categoryOptions: [],
+            tagOptions: [],
+            taxRatesOptions: [],
+            header,
+        };
+    }, [areOptionsInitialized, optionList.personalDetails, optionList.reports]);
+
+    const options = useMemo(() => {
+        if (debouncedSearchValue.trim() === '') {
+            return defaultOptions;
+        }
+        const filteredReports = OptionsListUtils.filterOptions(defaultOptions, debouncedSearchValue.trim(), {
+            excludeLogins: CONST.EXPENSIFY_EMAILS,
+            canInviteUser: false,
+        });
+        const header = OptionsListUtils.getHeaderMessage(filteredReports.recentReports && filteredReports.recentReports.length !== 0, false, debouncedSearchValue);
+        return {...filteredReports, header};
+    }, [debouncedSearchValue, defaultOptions]);
 
-        const sections =
-            recentReports && recentReports.length > 0
+    const sections = useMemo(
+        () =>
+            options.recentReports && options.recentReports.length > 0
                 ? [
                       {
-                          data: recentReports.map((option) => ({
+                          data: options.recentReports.map((option) => ({
                               ...option,
                               text: option.text ?? '',
                               alternateText: option.alternateText ?? undefined,
@@ -80,10 +113,9 @@ function TaskShareDestinationSelectorModal() {
                           shouldShow: true,
                       },
                   ]
-                : [];
-
-        return {sections, headerMessage};
-    }, [areOptionsInitialized, optionList.reports, optionList.personalDetails, debouncedSearchValue]);
+                : [],
+        [options.recentReports],
+    );
 
     useEffect(() => {
         ReportActions.searchInServer(debouncedSearchValue);
@@ -97,19 +129,20 @@ function TaskShareDestinationSelectorModal() {
         >
             <>
                 <HeaderWithBackButton
-                    title={translate('newTaskPage.shareSomewhere')}
+                    title={translate('common.share')}
                     onBackButtonPress={() => Navigation.goBack(ROUTES.NEW_TASK)}
                 />
                 <View style={[styles.flex1, styles.w100, styles.pRelative]}>
                     <SelectionList
                         ListItem={UserListItem}
-                        sections={areOptionsInitialized ? options.sections : []}
+                        sections={areOptionsInitialized ? sections : []}
                         onSelectRow={selectReportHandler}
+                        shouldSingleExecuteRowSelect
                         onChangeText={setSearchValue}
                         textInputValue={searchValue}
-                        headerMessage={options.headerMessage}
-                        textInputLabel={translate('optionsSelector.nameEmailOrPhoneNumber')}
-                        showLoadingPlaceholder={areOptionsInitialized && debouncedSearchValue.trim() === '' ? options.sections.length === 0 : !didScreenTransitionEnd}
+                        headerMessage={options.header}
+                        textInputLabel={translate('selectionList.nameEmailOrPhoneNumber')}
+                        showLoadingPlaceholder={areOptionsInitialized && debouncedSearchValue.trim() === '' ? sections.length === 0 : !didScreenTransitionEnd}
                         isLoadingNewOptions={!!isSearchingForReports}
                         textInputHint={textInputHint}
                     />
diff --git a/src/pages/tasks/TaskTitlePage.tsx b/src/pages/tasks/TaskTitlePage.tsx
index 99558efaeb03..e99b0b3da67a 100644
--- a/src/pages/tasks/TaskTitlePage.tsx
+++ b/src/pages/tasks/TaskTitlePage.tsx
@@ -29,17 +29,20 @@ function TaskTitlePage({report, currentUserPersonalDetails}: TaskTitlePageProps)
     const styles = useThemeStyles();
     const {translate} = useLocalize();
 
-    const validate = useCallback(({title}: FormOnyxValues<typeof ONYXKEYS.FORMS.EDIT_TASK_FORM>): FormInputErrors<typeof ONYXKEYS.FORMS.EDIT_TASK_FORM> => {
-        const errors: FormInputErrors<typeof ONYXKEYS.FORMS.EDIT_TASK_FORM> = {};
+    const validate = useCallback(
+        ({title}: FormOnyxValues<typeof ONYXKEYS.FORMS.EDIT_TASK_FORM>): FormInputErrors<typeof ONYXKEYS.FORMS.EDIT_TASK_FORM> => {
+            const errors: FormInputErrors<typeof ONYXKEYS.FORMS.EDIT_TASK_FORM> = {};
 
-        if (!title) {
-            ErrorUtils.addErrorMessage(errors, INPUT_IDS.TITLE, 'newTaskPage.pleaseEnterTaskName');
-        } else if (title.length > CONST.TITLE_CHARACTER_LIMIT) {
-            ErrorUtils.addErrorMessage(errors, INPUT_IDS.TITLE, ['common.error.characterLimitExceedCounter', {length: title.length, limit: CONST.TITLE_CHARACTER_LIMIT}]);
-        }
+            if (!title) {
+                ErrorUtils.addErrorMessage(errors, INPUT_IDS.TITLE, translate('newTaskPage.pleaseEnterTaskName'));
+            } else if (title.length > CONST.TITLE_CHARACTER_LIMIT) {
+                ErrorUtils.addErrorMessage(errors, INPUT_IDS.TITLE, translate('common.error.characterLimitExceedCounter', {length: title.length, limit: CONST.TITLE_CHARACTER_LIMIT}));
+            }
 
-        return errors;
-    }, []);
+            return errors;
+        },
+        [translate],
+    );
 
     const submit = useCallback(
         (values: FormOnyxValues<typeof ONYXKEYS.FORMS.EDIT_TASK_FORM>) => {
diff --git a/src/pages/wallet/WalletStatementPage.tsx b/src/pages/wallet/WalletStatementPage.tsx
index ac1b6d428d52..0db72877bd2e 100644
--- a/src/pages/wallet/WalletStatementPage.tsx
+++ b/src/pages/wallet/WalletStatementPage.tsx
@@ -1,6 +1,6 @@
 import type {StackScreenProps} from '@react-navigation/stack';
 import {format, getMonth, getYear} from 'date-fns';
-import Str from 'expensify-common/lib/str';
+import {Str} from 'expensify-common';
 import React, {useEffect} from 'react';
 import {withOnyx} from 'react-native-onyx';
 import type {OnyxEntry} from 'react-native-onyx';
@@ -42,7 +42,7 @@ function WalletStatementPage({walletStatement, route}: WalletStatementPageProps)
         if (!yearMonth || yearMonth.length !== 6 || yearMonth > currentYearMonth) {
             Navigation.dismissModal();
         }
-        // eslint-disable-next-line react-hooks/exhaustive-deps -- we want this effect to run only on mount
+        // eslint-disable-next-line react-compiler/react-compiler, react-hooks/exhaustive-deps -- we want this effect to run only on mount
     }, []);
 
     useEffect(() => {
diff --git a/src/pages/workspace/AccessOrNotFoundWrapper.tsx b/src/pages/workspace/AccessOrNotFoundWrapper.tsx
index 16e81ea747c6..816d2b74dbc6 100644
--- a/src/pages/workspace/AccessOrNotFoundWrapper.tsx
+++ b/src/pages/workspace/AccessOrNotFoundWrapper.tsx
@@ -1,14 +1,18 @@
 /* eslint-disable rulesdir/no-negated-variables */
-import React, {useEffect} from 'react';
-import type {OnyxEntry} from 'react-native-onyx';
+import React, {useEffect, useState} from 'react';
+import type {OnyxCollection, OnyxEntry} from 'react-native-onyx';
 import {withOnyx} from 'react-native-onyx';
 import type {FullPageNotFoundViewProps} from '@components/BlockingViews/FullPageNotFoundView';
-import FullPageNotFoundView from '@components/BlockingViews/FullPageNotFoundView';
 import FullscreenLoadingIndicator from '@components/FullscreenLoadingIndicator';
+import useCurrentUserPersonalDetails from '@hooks/useCurrentUserPersonalDetails';
+import useNetwork from '@hooks/useNetwork';
+import * as IOUUtils from '@libs/IOUUtils';
 import Navigation from '@libs/Navigation/Navigation';
 import * as PolicyUtils from '@libs/PolicyUtils';
+import * as ReportUtils from '@libs/ReportUtils';
 import NotFoundPage from '@pages/ErrorPage/NotFoundPage';
-import * as Policy from '@userActions/Policy';
+import * as Policy from '@userActions/Policy/Policy';
+import type {IOUType} from '@src/CONST';
 import CONST from '@src/CONST';
 import ONYXKEYS from '@src/ONYXKEYS';
 import ROUTES from '@src/ROUTES';
@@ -17,13 +21,32 @@ import type {PolicyFeatureName} from '@src/types/onyx/Policy';
 import callOrReturn from '@src/types/utils/callOrReturn';
 import {isEmptyObject} from '@src/types/utils/EmptyObject';
 
-const POLICY_ACCESS_VARIANTS = {
-    [CONST.POLICY.ACCESS_VARIANTS.PAID]: (policy: OnyxEntry<OnyxTypes.Policy>) => PolicyUtils.isPaidGroupPolicy(policy) && !!policy?.isPolicyExpenseChatEnabled,
-    [CONST.POLICY.ACCESS_VARIANTS.ADMIN]: (policy: OnyxEntry<OnyxTypes.Policy>) => PolicyUtils.isPolicyAdmin(policy),
-} as const satisfies Record<string, (policy: OnyxTypes.Policy) => boolean>;
-
-type PolicyAccessVariant = keyof typeof POLICY_ACCESS_VARIANTS;
+const ACCESS_VARIANTS = {
+    [CONST.POLICY.ACCESS_VARIANTS.PAID]: (policy: OnyxEntry<OnyxTypes.Policy>) => PolicyUtils.isPaidGroupPolicy(policy),
+    [CONST.POLICY.ACCESS_VARIANTS.CONTROL]: (policy: OnyxEntry<OnyxTypes.Policy>) => PolicyUtils.isControlPolicy(policy),
+    [CONST.POLICY.ACCESS_VARIANTS.ADMIN]: (policy: OnyxEntry<OnyxTypes.Policy>, login: string) => PolicyUtils.isPolicyAdmin(policy, login),
+    [CONST.IOU.ACCESS_VARIANTS.CREATE]: (
+        policy: OnyxEntry<OnyxTypes.Policy>,
+        login: string,
+        report: OnyxEntry<OnyxTypes.Report>,
+        allPolicies: NonNullable<OnyxCollection<OnyxTypes.Policy>> | null,
+        iouType?: IOUType,
+    ) =>
+        !!iouType &&
+        IOUUtils.isValidMoneyRequestType(iouType) &&
+        // Allow the user to submit the expense if we are submitting the expense in global menu or the report can create the expense
+        (isEmptyObject(report?.reportID) || ReportUtils.canCreateRequest(report, policy, iouType)) &&
+        (iouType !== CONST.IOU.TYPE.INVOICE || PolicyUtils.canSendInvoice(allPolicies)),
+} as const satisfies Record<
+    string,
+    (policy: OnyxTypes.Policy, login: string, report: OnyxTypes.Report, allPolicies: NonNullable<OnyxCollection<OnyxTypes.Policy>> | null, iouType?: IOUType) => boolean
+>;
+
+type AccessVariant = keyof typeof ACCESS_VARIANTS;
 type AccessOrNotFoundWrapperOnyxProps = {
+    /** The report that holds the transaction */
+    report: OnyxEntry<OnyxTypes.Report>;
+
     /** The report currently being looked at */
     policy: OnyxEntry<OnyxTypes.Policy>;
 
@@ -35,43 +58,57 @@ type AccessOrNotFoundWrapperProps = AccessOrNotFoundWrapperOnyxProps & {
     /** The children to render */
     children: ((props: AccessOrNotFoundWrapperOnyxProps) => React.ReactNode) | React.ReactNode;
 
+    /** The id of the report that holds the transaction */
+    reportID?: string;
+
     /** The report currently being looked at */
-    policyID: string;
+    policyID?: string;
 
     /** Defines which types of access should be verified */
-    accessVariants?: PolicyAccessVariant[];
+    accessVariants?: AccessVariant[];
 
     /** The current feature name that the user tries to get access to */
     featureName?: PolicyFeatureName;
 
     /** Props for customizing fallback pages */
     fullPageNotFoundViewProps?: FullPageNotFoundViewProps;
+
+    /** Whether or not to block user from accessing the page */
+    shouldBeBlocked?: boolean;
+
+    /** The type of the transaction */
+    iouType?: IOUType;
+
+    /** The list of all policies */
+    allPolicies?: OnyxCollection<OnyxTypes.Policy>;
 } & Pick<FullPageNotFoundViewProps, 'subtitleKey' | 'onLinkPress'>;
 
-type PageNotFoundFallbackProps = Pick<AccessOrNotFoundWrapperProps, 'policyID' | 'fullPageNotFoundViewProps'> & {shouldShowFullScreenFallback: boolean};
+type PageNotFoundFallbackProps = Pick<AccessOrNotFoundWrapperProps, 'policyID' | 'fullPageNotFoundViewProps'> & {shouldShowFullScreenFallback: boolean; isMoneyRequest: boolean};
 
-function PageNotFoundFallback({policyID, shouldShowFullScreenFallback, fullPageNotFoundViewProps}: PageNotFoundFallbackProps) {
-    return shouldShowFullScreenFallback ? (
-        <FullPageNotFoundView
-            shouldShow
-            onBackButtonPress={() => Navigation.goBack(ROUTES.SETTINGS_WORKSPACES)}
-            shouldForceFullScreen
-            // eslint-disable-next-line react/jsx-props-no-spreading
-            {...fullPageNotFoundViewProps}
-        />
-    ) : (
+function PageNotFoundFallback({policyID, shouldShowFullScreenFallback, fullPageNotFoundViewProps, isMoneyRequest}: PageNotFoundFallbackProps) {
+    return (
         <NotFoundPage
-            onBackButtonPress={() => Navigation.goBack(ROUTES.WORKSPACE_PROFILE.getRoute(policyID))}
+            shouldForceFullScreen={shouldShowFullScreenFallback}
+            onBackButtonPress={() => {
+                if (shouldShowFullScreenFallback) {
+                    Navigation.dismissModal();
+                    return;
+                }
+                Navigation.goBack(policyID && !isMoneyRequest ? ROUTES.WORKSPACE_PROFILE.getRoute(policyID) : undefined);
+            }}
             // eslint-disable-next-line react/jsx-props-no-spreading
             {...fullPageNotFoundViewProps}
         />
     );
 }
 
-function AccessOrNotFoundWrapper({accessVariants = [], fullPageNotFoundViewProps, ...props}: AccessOrNotFoundWrapperProps) {
-    const {policy, policyID, featureName, isLoadingReportData} = props;
-
+function AccessOrNotFoundWrapper({accessVariants = [], fullPageNotFoundViewProps, shouldBeBlocked, ...props}: AccessOrNotFoundWrapperProps) {
+    const {policy, policyID, report, iouType, allPolicies, featureName, isLoadingReportData} = props;
+    const {login = ''} = useCurrentUserPersonalDetails();
     const isPolicyIDInRoute = !!policyID?.length;
+    const isMoneyRequest = !!iouType && IOUUtils.isValidMoneyRequestType(iouType);
+    const isFromGlobalCreate = isEmptyObject(report?.reportID);
+    const pendingField = featureName ? props.policy?.pendingFields?.[featureName] : undefined;
 
     useEffect(() => {
         if (!isPolicyIDInRoute || !isEmptyObject(policy)) {
@@ -80,19 +117,33 @@ function AccessOrNotFoundWrapper({accessVariants = [], fullPageNotFoundViewProps
         }
 
         Policy.openWorkspace(policyID, []);
-        // eslint-disable-next-line react-hooks/exhaustive-deps
+        // eslint-disable-next-line react-compiler/react-compiler, react-hooks/exhaustive-deps
     }, [isPolicyIDInRoute, policyID]);
 
-    const shouldShowFullScreenLoadingIndicator = isLoadingReportData !== false && (!Object.entries(policy ?? {}).length || !policy?.id);
+    const shouldShowFullScreenLoadingIndicator = !isMoneyRequest && isLoadingReportData !== false && (!Object.entries(policy ?? {}).length || !policy?.id);
 
     const isFeatureEnabled = featureName ? PolicyUtils.isPolicyFeatureEnabled(policy, featureName) : true;
 
+    const [isPolicyFeatureEnabled, setIsPolicyFeatureEnabled] = useState(isFeatureEnabled);
+    const {isOffline} = useNetwork();
+
     const isPageAccessible = accessVariants.reduce((acc, variant) => {
-        const accessFunction = POLICY_ACCESS_VARIANTS[variant];
-        return acc && accessFunction(policy);
+        const accessFunction = ACCESS_VARIANTS[variant];
+        return acc && accessFunction(policy, login, report, allPolicies ?? null, iouType);
     }, true);
 
-    const shouldShowNotFoundPage = isEmptyObject(policy) || (Object.keys(policy).length === 1 && !isEmptyObject(policy.errors)) || !policy?.id || !isPageAccessible || !isFeatureEnabled;
+    const isPolicyNotAccessible = isEmptyObject(policy) || (Object.keys(policy).length === 1 && !isEmptyObject(policy.errors)) || !policy?.id;
+    const shouldShowNotFoundPage = (!isMoneyRequest && !isFromGlobalCreate && isPolicyNotAccessible) || !isPageAccessible || !isPolicyFeatureEnabled || shouldBeBlocked;
+
+    // We only update the feature state if it isn't pending.
+    // This is because the feature state changes several times during the creation of a workspace, while we are waiting for a response from the backend.
+    // Without this, we can have unexpectedly have 'Not Found' be shown.
+    useEffect(() => {
+        if (pendingField && !isOffline && !isFeatureEnabled) {
+            return;
+        }
+        setIsPolicyFeatureEnabled(isFeatureEnabled);
+    }, [pendingField, isOffline, isFeatureEnabled]);
 
     if (shouldShowFullScreenLoadingIndicator) {
         return <FullscreenLoadingIndicator />;
@@ -102,7 +153,8 @@ function AccessOrNotFoundWrapper({accessVariants = [], fullPageNotFoundViewProps
         return (
             <PageNotFoundFallback
                 policyID={policyID}
-                shouldShowFullScreenFallback={!isFeatureEnabled}
+                isMoneyRequest={isMoneyRequest}
+                shouldShowFullScreenFallback={!isFeatureEnabled || isPolicyNotAccessible}
                 fullPageNotFoundViewProps={fullPageNotFoundViewProps}
             />
         );
@@ -111,11 +163,14 @@ function AccessOrNotFoundWrapper({accessVariants = [], fullPageNotFoundViewProps
     return callOrReturn(props.children, props);
 }
 
-export type {PolicyAccessVariant};
+export type {AccessVariant};
 
 export default withOnyx<AccessOrNotFoundWrapperProps, AccessOrNotFoundWrapperOnyxProps>({
+    report: {
+        key: ({reportID}) => `${ONYXKEYS.COLLECTION.REPORT}${reportID}`,
+    },
     policy: {
-        key: ({policyID}) => `${ONYXKEYS.COLLECTION.POLICY}${policyID ?? ''}`,
+        key: ({policyID}) => `${ONYXKEYS.COLLECTION.POLICY}${policyID}`,
     },
     isLoadingReportData: {
         key: ONYXKEYS.IS_LOADING_REPORT_DATA,
diff --git a/src/pages/workspace/WorkspaceAvatar.tsx b/src/pages/workspace/WorkspaceAvatar.tsx
index f1aa5235b42f..dfe79feb7755 100644
--- a/src/pages/workspace/WorkspaceAvatar.tsx
+++ b/src/pages/workspace/WorkspaceAvatar.tsx
@@ -28,7 +28,7 @@ function WorkspaceAvatar({policy, isLoadingApp = true}: WorkspaceAvatarProps) {
             source={UserUtils.getFullSizeAvatar(avatarURL, 0)}
             onModalClose={Navigation.goBack}
             isWorkspaceAvatar
-            originalFileName={policy?.originalFileName ?? policy?.name ?? ''}
+            originalFileName={policy?.originalFileName ?? policy?.id}
             shouldShowNotFoundPage={!Object.keys(policy ?? {}).length && !isLoadingApp}
             isLoading={!Object.keys(policy ?? {}).length && !!isLoadingApp}
             maybeIcon
@@ -40,7 +40,7 @@ WorkspaceAvatar.displayName = 'WorkspaceAvatar';
 
 export default withOnyx<WorkspaceAvatarProps, WorkspaceAvatarOnyxProps>({
     policy: {
-        key: ({route}) => `${ONYXKEYS.COLLECTION.POLICY}${route.params.policyID ?? ''}`,
+        key: ({route}) => `${ONYXKEYS.COLLECTION.POLICY}${route.params.policyID ?? '-1'}`,
     },
     isLoadingApp: {
         key: ONYXKEYS.IS_LOADING_APP,
diff --git a/src/pages/workspace/WorkspaceInitialPage.tsx b/src/pages/workspace/WorkspaceInitialPage.tsx
index 1c861d510a85..e9fc9a8480ee 100644
--- a/src/pages/workspace/WorkspaceInitialPage.tsx
+++ b/src/pages/workspace/WorkspaceInitialPage.tsx
@@ -1,6 +1,6 @@
-import {useNavigationState} from '@react-navigation/native';
+import {useFocusEffect, useNavigationState} from '@react-navigation/native';
 import type {StackScreenProps} from '@react-navigation/stack';
-import React, {useCallback, useEffect, useMemo, useState} from 'react';
+import React, {useCallback, useEffect, useMemo, useRef, useState} from 'react';
 import {View} from 'react-native';
 import type {OnyxEntry} from 'react-native-onyx';
 import {withOnyx} from 'react-native-onyx';
@@ -13,6 +13,7 @@ import * as Expensicons from '@components/Icon/Expensicons';
 import OfflineWithFeedback from '@components/OfflineWithFeedback';
 import ScreenWrapper from '@components/ScreenWrapper';
 import ScrollView from '@components/ScrollView';
+import useCurrentUserPersonalDetails from '@hooks/useCurrentUserPersonalDetails';
 import useLocalize from '@hooks/useLocalize';
 import useNetwork from '@hooks/useNetwork';
 import usePermissions from '@hooks/usePermissions';
@@ -20,20 +21,21 @@ import usePrevious from '@hooks/usePrevious';
 import useSingleExecution from '@hooks/useSingleExecution';
 import useThemeStyles from '@hooks/useThemeStyles';
 import useWaitForNavigation from '@hooks/useWaitForNavigation';
-import getTopmostWorkspacesCentralPaneName from '@libs/Navigation/getTopmostWorkspacesCentralPaneName';
+import getTopmostRouteName from '@libs/Navigation/getTopmostRouteName';
 import Navigation from '@libs/Navigation/Navigation';
 import * as PolicyUtils from '@libs/PolicyUtils';
 import {getDefaultWorkspaceAvatar} from '@libs/ReportUtils';
 import type {FullScreenNavigatorParamList} from '@navigation/types';
-import * as App from '@userActions/App';
-import * as Policy from '@userActions/Policy';
+import * as Policy from '@userActions/Policy/Policy';
 import * as ReimbursementAccount from '@userActions/ReimbursementAccount';
 import CONST from '@src/CONST';
 import type {TranslationPaths} from '@src/languages/types';
 import ONYXKEYS from '@src/ONYXKEYS';
+import type {Route} from '@src/ROUTES';
 import ROUTES from '@src/ROUTES';
 import SCREENS from '@src/SCREENS';
 import type * as OnyxTypes from '@src/types/onyx';
+import type {PendingAction} from '@src/types/onyx/OnyxCommon';
 import type {PolicyFeatureName} from '@src/types/onyx/Policy';
 import {isEmptyObject} from '@src/types/utils/EmptyObject';
 import type IconAsset from '@src/types/utils/IconAsset';
@@ -60,7 +62,11 @@ type WorkspaceMenuItem = {
         | typeof SCREENS.WORKSPACE.TAXES
         | typeof SCREENS.WORKSPACE.MORE_FEATURES
         | typeof SCREENS.WORKSPACE.PROFILE
-        | typeof SCREENS.WORKSPACE.MEMBERS;
+        | typeof SCREENS.WORKSPACE.MEMBERS
+        | typeof SCREENS.WORKSPACE.EXPENSIFY_CARD
+        | typeof SCREENS.WORKSPACE.COMPANY_CARDS
+        | typeof SCREENS.WORKSPACE.REPORT_FIELDS
+        | typeof SCREENS.WORKSPACE.RULES;
 };
 
 type WorkspaceInitialPageOnyxProps = {
@@ -75,22 +81,28 @@ type WorkspaceInitialPageProps = WithPolicyAndFullscreenLoadingProps & Workspace
 
 type PolicyFeatureStates = Record<PolicyFeatureName, boolean>;
 
-function dismissError(policyID: string) {
-    PolicyUtils.goBackFromInvalidPolicy();
-    Policy.removeWorkspace(policyID);
+function dismissError(policyID: string, pendingAction: PendingAction | undefined) {
+    if (!policyID || pendingAction === CONST.RED_BRICK_ROAD_PENDING_ACTION.ADD) {
+        PolicyUtils.goBackFromInvalidPolicy();
+        Policy.removeWorkspace(policyID);
+    } else {
+        Policy.clearErrors(policyID);
+    }
 }
 
-function WorkspaceInitialPage({policyDraft, policy: policyProp, reimbursementAccount, policyCategories}: WorkspaceInitialPageProps) {
+function WorkspaceInitialPage({policyDraft, policy: policyProp, reimbursementAccount, policyCategories, route}: WorkspaceInitialPageProps) {
     const styles = useThemeStyles();
     const policy = policyDraft?.id ? policyDraft : policyProp;
     const [isCurrencyModalOpen, setIsCurrencyModalOpen] = useState(false);
-    const hasPolicyCreationError = !!(policy?.pendingAction === CONST.RED_BRICK_ROAD_PENDING_ACTION.ADD && policy.errors);
+    const hasPolicyCreationError = !!(policy?.pendingAction === CONST.RED_BRICK_ROAD_PENDING_ACTION.ADD && !isEmptyObject(policy.errors));
+    const hasSyncError = PolicyUtils.hasSyncError(policy);
     const waitForNavigate = useWaitForNavigation();
     const {singleExecution, isExecuting} = useSingleExecution();
-    const activeRoute = useNavigationState(getTopmostWorkspacesCentralPaneName);
+    const activeRoute = useNavigationState(getTopmostRouteName);
     const {translate} = useLocalize();
-    const {canUseAccountingIntegrations} = usePermissions();
     const {isOffline} = useNetwork();
+    const {canUseWorkspaceRules} = usePermissions();
+    const wasRendered = useRef(false);
 
     const prevPendingFields = usePrevious(policy?.pendingFields);
     const policyFeatureStates = useMemo(
@@ -100,25 +112,32 @@ function WorkspaceInitialPage({policyDraft, policy: policyProp, reimbursementAcc
             [CONST.POLICY.MORE_FEATURES.ARE_CATEGORIES_ENABLED]: policy?.areCategoriesEnabled,
             [CONST.POLICY.MORE_FEATURES.ARE_TAGS_ENABLED]: policy?.areTagsEnabled,
             [CONST.POLICY.MORE_FEATURES.ARE_TAXES_ENABLED]: policy?.tax?.trackingEnabled,
-            [CONST.POLICY.MORE_FEATURES.ARE_CONNECTIONS_ENABLED]: policy?.areConnectionsEnabled,
+            [CONST.POLICY.MORE_FEATURES.ARE_COMPANY_CARDS_ENABLED]: policy?.areCompanyCardsEnabled,
+            [CONST.POLICY.MORE_FEATURES.ARE_CONNECTIONS_ENABLED]: !!policy?.areConnectionsEnabled || !isEmptyObject(policy?.connections),
+            [CONST.POLICY.MORE_FEATURES.ARE_EXPENSIFY_CARDS_ENABLED]: policy?.areExpensifyCardsEnabled,
+            [CONST.POLICY.MORE_FEATURES.ARE_REPORT_FIELDS_ENABLED]: policy?.areReportFieldsEnabled,
+            [CONST.POLICY.MORE_FEATURES.ARE_RULES_ENABLED]: policy?.areRulesEnabled,
         }),
         [policy],
     ) as PolicyFeatureStates;
 
-    const policyID = policy?.id ?? '';
-    const policyName = policy?.name ?? '';
-
-    useEffect(() => {
-        const policyDraftId = policyDraft?.id;
-
-        if (!policyDraftId) {
+    const fetchPolicyData = useCallback(() => {
+        if (policyDraft?.id) {
             return;
         }
+        Policy.openPolicyInitialPage(route.params.policyID);
+    }, [policyDraft?.id, route.params.policyID]);
+
+    useNetwork({onReconnect: fetchPolicyData});
 
-        App.savePolicyDraftByNewWorkspace(policyDraft.id, policyDraft.name, '', policyDraft.makeMeAdmin);
-        // We only care when the component renders the first time
-        // eslint-disable-next-line react-hooks/exhaustive-deps
-    }, []);
+    useFocusEffect(
+        useCallback(() => {
+            fetchPolicyData();
+        }, [fetchPolicyData]),
+    );
+
+    const policyID = policy?.id ?? '-1';
+    const policyName = policy?.name ?? '';
 
     useEffect(() => {
         if (!isCurrencyModalOpen || policy?.outputCurrency !== CONST.CURRENCY.USD) {
@@ -136,8 +155,13 @@ function WorkspaceInitialPage({policyDraft, policy: policyProp, reimbursementAcc
 
     const hasMembersError = PolicyUtils.hasEmployeeListError(policy);
     const hasPolicyCategoryError = PolicyUtils.hasPolicyCategoriesError(policyCategories);
-    const hasGeneralSettingsError = !isEmptyObject(policy?.errorFields?.generalSettings ?? {}) || !isEmptyObject(policy?.errorFields?.avatarURL ?? {});
-    const shouldShowProtectedItems = PolicyUtils.isPolicyAdmin(policy);
+    const hasGeneralSettingsError =
+        !isEmptyObject(policy?.errorFields?.name ?? {}) ||
+        !isEmptyObject(policy?.errorFields?.avatarURL ?? {}) ||
+        !isEmptyObject(policy?.errorFields?.ouputCurrency ?? {}) ||
+        !isEmptyObject(policy?.errorFields?.address ?? {});
+    const {login} = useCurrentUserPersonalDetails();
+    const shouldShowProtectedItems = PolicyUtils.isPolicyAdmin(policy, login);
     const isPaidGroupPolicy = PolicyUtils.isPaidGroupPolicy(policy);
     const isFreeGroupPolicy = PolicyUtils.isFreeGroupPolicy(policy);
     const [featureStates, setFeatureStates] = useState(policyFeatureStates);
@@ -187,7 +211,7 @@ function WorkspaceInitialPage({policyDraft, policy: policyProp, reimbursementAcc
     const protectedCollectPolicyMenuItems: WorkspaceMenuItem[] = [];
 
     // We only update feature states if they aren't pending.
-    // These changes are made to synchronously change feature states along with FeatureEnabledAccessOrNotFoundComponent.
+    // These changes are made to synchronously change feature states along with AccessOrNotFoundWrapperComponent.
     useEffect(() => {
         setFeatureStates((currentFeatureStates) => {
             const newFeatureStates = {} as PolicyFeatureStates;
@@ -212,6 +236,24 @@ function WorkspaceInitialPage({policyDraft, policy: policyProp, reimbursementAcc
         });
     }
 
+    if (featureStates?.[CONST.POLICY.MORE_FEATURES.ARE_EXPENSIFY_CARDS_ENABLED]) {
+        protectedCollectPolicyMenuItems.push({
+            translationKey: 'workspace.common.expensifyCard',
+            icon: Expensicons.CreditCard,
+            action: singleExecution(waitForNavigate(() => Navigation.navigate(ROUTES.WORKSPACE_EXPENSIFY_CARD.getRoute(policyID)))),
+            routeName: SCREENS.WORKSPACE.EXPENSIFY_CARD,
+        });
+    }
+
+    if (featureStates?.[CONST.POLICY.MORE_FEATURES.ARE_COMPANY_CARDS_ENABLED]) {
+        protectedCollectPolicyMenuItems.push({
+            translationKey: 'workspace.common.companyCards',
+            icon: Expensicons.CreditCard,
+            action: singleExecution(waitForNavigate(() => Navigation.navigate(ROUTES.WORKSPACE_COMPANY_CARDS.getRoute(policyID)))),
+            routeName: SCREENS.WORKSPACE.COMPANY_CARDS,
+        });
+    }
+
     if (featureStates?.[CONST.POLICY.MORE_FEATURES.ARE_WORKFLOWS_ENABLED]) {
         protectedCollectPolicyMenuItems.push({
             translationKey: 'workspace.common.workflows',
@@ -251,17 +293,34 @@ function WorkspaceInitialPage({policyDraft, policy: policyProp, reimbursementAcc
         });
     }
 
-    if (featureStates?.[CONST.POLICY.MORE_FEATURES.ARE_CONNECTIONS_ENABLED] && canUseAccountingIntegrations) {
+    if (featureStates?.[CONST.POLICY.MORE_FEATURES.ARE_REPORT_FIELDS_ENABLED]) {
+        protectedCollectPolicyMenuItems.push({
+            translationKey: 'workspace.common.reportFields',
+            icon: Expensicons.Pencil,
+            action: singleExecution(waitForNavigate(() => Navigation.navigate(ROUTES.WORKSPACE_REPORT_FIELDS.getRoute(policyID)))),
+            routeName: SCREENS.WORKSPACE.REPORT_FIELDS,
+        });
+    }
+
+    if (featureStates?.[CONST.POLICY.MORE_FEATURES.ARE_CONNECTIONS_ENABLED]) {
         protectedCollectPolicyMenuItems.push({
             translationKey: 'workspace.common.accounting',
             icon: Expensicons.Sync,
             action: singleExecution(waitForNavigate(() => Navigation.navigate(ROUTES.POLICY_ACCOUNTING.getRoute(policyID)))),
-            // brickRoadIndicator should be set when API will be ready
-            brickRoadIndicator: undefined,
+            brickRoadIndicator: hasSyncError ? CONST.BRICK_ROAD_INDICATOR_STATUS.ERROR : undefined,
             routeName: SCREENS.WORKSPACE.ACCOUNTING.ROOT,
         });
     }
 
+    if (featureStates?.[CONST.POLICY.MORE_FEATURES.ARE_RULES_ENABLED] && canUseWorkspaceRules) {
+        protectedCollectPolicyMenuItems.push({
+            translationKey: 'workspace.common.rules',
+            icon: Expensicons.Feed,
+            action: singleExecution(waitForNavigate(() => Navigation.navigate(ROUTES.WORKSPACE_RULES.getRoute(policyID)))),
+            routeName: SCREENS.WORKSPACE.RULES,
+        });
+    }
+
     protectedCollectPolicyMenuItems.push({
         translationKey: 'workspace.common.moreFeatures',
         icon: Expensicons.Gear,
@@ -305,6 +364,24 @@ function WorkspaceInitialPage({policyDraft, policy: policyProp, reimbursementAcc
         PolicyUtils.goBackFromInvalidPolicy();
     }, [policy, prevPolicy]);
 
+    // We are checking if the user can access the route.
+    // If user can't access the route, we are dismissing any modals that are open when the NotFound view is shown
+    const canAccessRoute = activeRoute && menuItems.some((item) => item.routeName === activeRoute);
+
+    useEffect(() => {
+        if (!shouldShowNotFoundPage && canAccessRoute) {
+            return;
+        }
+        if (wasRendered.current) {
+            return;
+        }
+        wasRendered.current = true;
+        // We are dismissing any modals that are open when the NotFound view is shown
+        Navigation.isNavigationReady().then(() => {
+            Navigation.closeRHPFlow();
+        });
+    }, [canAccessRoute, shouldShowNotFoundPage]);
+
     const policyAvatar = useMemo(() => {
         if (!policy) {
             return {source: Expensicons.ExpensifyAppIcon, name: CONST.WORKSPACE_SWITCHER.NAME, type: CONST.ICON_TYPE_AVATAR};
@@ -315,7 +392,7 @@ function WorkspaceInitialPage({policyDraft, policy: policyProp, reimbursementAcc
             source: avatar,
             name: policy?.name ?? '',
             type: CONST.ICON_TYPE_WORKSPACE,
-            id: policy.id ?? '',
+            id: policy.id ?? '-1',
         };
     }, [policy]);
 
@@ -332,7 +409,14 @@ function WorkspaceInitialPage({policyDraft, policy: policyProp, reimbursementAcc
             >
                 <HeaderWithBackButton
                     title={policyName}
-                    onBackButtonPress={Navigation.dismissModal}
+                    onBackButtonPress={() => {
+                        if (route.params?.backTo) {
+                            Navigation.resetToHome();
+                            Navigation.isNavigationReady().then(() => Navigation.navigate(route.params?.backTo as Route));
+                        } else {
+                            Navigation.dismissModal();
+                        }
+                    }}
                     policyAvatar={policyAvatar}
                     style={styles.headerBarDesktopHeight}
                 />
@@ -340,7 +424,7 @@ function WorkspaceInitialPage({policyDraft, policy: policyProp, reimbursementAcc
                 <ScrollView contentContainerStyle={[styles.flexGrow1, styles.flexColumn, styles.justifyContentBetween]}>
                     <OfflineWithFeedback
                         pendingAction={policy?.pendingAction}
-                        onClose={() => dismissError(policyID)}
+                        onClose={() => dismissError(policyID, policy?.pendingAction)}
                         errors={policy?.errors}
                         errorRowStyles={[styles.ph5, styles.pv2]}
                         shouldDisableStrikeThrough={false}
@@ -394,7 +478,7 @@ export default withPolicyAndFullscreenLoading(
             key: ONYXKEYS.REIMBURSEMENT_ACCOUNT,
         },
         policyCategories: {
-            key: ({route}) => `${ONYXKEYS.COLLECTION.POLICY_CATEGORIES}${route.params?.policyID ?? '0'}`,
+            key: ({route}) => `${ONYXKEYS.COLLECTION.POLICY_CATEGORIES}${route.params?.policyID ?? '-1'}`,
         },
     })(WorkspaceInitialPage),
 );
diff --git a/src/pages/workspace/WorkspaceInviteMessagePage.tsx b/src/pages/workspace/WorkspaceInviteMessagePage.tsx
index 2eaa38b865e6..df34875f5fa6 100644
--- a/src/pages/workspace/WorkspaceInviteMessagePage.tsx
+++ b/src/pages/workspace/WorkspaceInviteMessagePage.tsx
@@ -1,5 +1,4 @@
 import type {StackScreenProps} from '@react-navigation/stack';
-import ExpensiMark from 'expensify-common/lib/ExpensiMark';
 import lodashDebounce from 'lodash/debounce';
 import React, {useEffect, useMemo, useState} from 'react';
 import {Keyboard, View} from 'react-native';
@@ -23,12 +22,14 @@ import useLocalize from '@hooks/useLocalize';
 import useThemeStyles from '@hooks/useThemeStyles';
 import Navigation from '@libs/Navigation/Navigation';
 import * as OptionsListUtils from '@libs/OptionsListUtils';
+import Parser from '@libs/Parser';
 import * as PolicyUtils from '@libs/PolicyUtils';
 import updateMultilineInputRange from '@libs/updateMultilineInputRange';
 import type {SettingsNavigatorParamList} from '@navigation/types';
 import variables from '@styles/variables';
 import * as Link from '@userActions/Link';
-import * as Policy from '@userActions/Policy';
+import * as Member from '@userActions/Policy/Member';
+import * as Policy from '@userActions/Policy/Policy';
 import CONST from '@src/CONST';
 import ONYXKEYS from '@src/ONYXKEYS';
 import ROUTES from '@src/ROUTES';
@@ -57,8 +58,6 @@ type WorkspaceInviteMessagePageProps = WithPolicyAndFullscreenLoadingProps &
     WorkspaceInviteMessagePageOnyxProps &
     StackScreenProps<SettingsNavigatorParamList, typeof SCREENS.WORKSPACE.INVITE_MESSAGE>;
 
-const parser = new ExpensiMark();
-
 function WorkspaceInviteMessagePage({
     workspaceInviteMessageDraft,
     invitedEmailsToAccountIDsDraft,
@@ -72,7 +71,7 @@ function WorkspaceInviteMessagePage({
 
     const [welcomeNote, setWelcomeNote] = useState<string>();
 
-    const {inputCallbackRef} = useAutoFocusInput();
+    const {inputCallbackRef, inputRef} = useAutoFocusInput();
 
     const welcomeNoteSubject = useMemo(
         () => `# ${currentUserPersonalDetails?.displayName ?? ''} invited you to ${policy?.name ?? 'a workspace'}`,
@@ -85,20 +84,21 @@ function WorkspaceInviteMessagePage({
         workspaceInviteMessageDraft ||
         // policy?.description can be an empty string
         // eslint-disable-next-line @typescript-eslint/prefer-nullish-coalescing
-        policy?.description ||
-        parser.replace(
-            translate('workspace.common.welcomeNote', {
-                workspaceName: policy?.name ?? '',
-            }),
-        );
+        Parser.htmlToMarkdown(policy?.description ?? '') ||
+        translate('workspace.common.welcomeNote', {
+            workspaceName: policy?.name ?? '',
+        });
 
     useEffect(() => {
         if (!isEmptyObject(invitedEmailsToAccountIDsDraft)) {
-            setWelcomeNote(parser.htmlToMarkdown(getDefaultWelcomeNote()));
+            setWelcomeNote(getDefaultWelcomeNote());
+            return;
+        }
+        if (isEmptyObject(policy)) {
             return;
         }
         Navigation.goBack(ROUTES.WORKSPACE_INVITE.getRoute(route.params.policyID), true);
-        // eslint-disable-next-line react-hooks/exhaustive-deps
+        // eslint-disable-next-line react-compiler/react-compiler, react-hooks/exhaustive-deps
     }, []);
 
     const debouncedSaveDraft = lodashDebounce((newDraft: string | null) => {
@@ -108,12 +108,10 @@ function WorkspaceInviteMessagePage({
     const sendInvitation = () => {
         Keyboard.dismiss();
         // Please see https://github.com/Expensify/App/blob/main/README.md#Security for more details
-        Policy.addMembersToWorkspace(invitedEmailsToAccountIDsDraft ?? {}, `${welcomeNoteSubject}\n\n${welcomeNote}`, route.params.policyID);
+        Member.addMembersToWorkspace(invitedEmailsToAccountIDsDraft ?? {}, `${welcomeNoteSubject}\n\n${welcomeNote}`, route.params.policyID);
         debouncedSaveDraft(null);
         SearchInputManager.searchInput = '';
-        // Pop the invite message page before navigating to the members page.
-        Navigation.goBack();
-        Navigation.navigate(ROUTES.WORKSPACE_MEMBERS.getRoute(route.params.policyID));
+        Navigation.dismissModal();
     };
 
     /** Opens privacy url as an external link */
@@ -125,7 +123,7 @@ function WorkspaceInviteMessagePage({
     const validate = (): FormInputErrors<typeof ONYXKEYS.FORMS.WORKSPACE_INVITE_MESSAGE_FORM> => {
         const errorFields: FormInputErrors<typeof ONYXKEYS.FORMS.WORKSPACE_INVITE_MESSAGE_FORM> = {};
         if (isEmptyObject(invitedEmailsToAccountIDsDraft)) {
-            errorFields.welcomeMessage = 'workspace.inviteMessage.inviteNoMembersError';
+            errorFields.welcomeMessage = translate('workspace.inviteMessage.inviteNoMembersError');
         }
         return errorFields;
     };
@@ -209,8 +207,10 @@ function WorkspaceInviteMessagePage({
                                 if (!element) {
                                     return;
                                 }
+                                if (!inputRef.current) {
+                                    updateMultilineInputRange(element);
+                                }
                                 inputCallbackRef(element);
-                                updateMultilineInputRange(element);
                             }}
                         />
                     </View>
diff --git a/src/pages/workspace/WorkspaceInvitePage.tsx b/src/pages/workspace/WorkspaceInvitePage.tsx
index 2ba3cd88f137..c29819b3c6f9 100644
--- a/src/pages/workspace/WorkspaceInvitePage.tsx
+++ b/src/pages/workspace/WorkspaceInvitePage.tsx
@@ -17,7 +17,9 @@ import useLocalize from '@hooks/useLocalize';
 import useNetwork from '@hooks/useNetwork';
 import useThemeStyles from '@hooks/useThemeStyles';
 import * as ReportActions from '@libs/actions/Report';
+import {READ_COMMANDS} from '@libs/API/types';
 import * as DeviceCapabilities from '@libs/DeviceCapabilities';
+import HttpUtils from '@libs/HttpUtils';
 import * as LoginUtils from '@libs/LoginUtils';
 import Navigation from '@libs/Navigation/Navigation';
 import * as OptionsListUtils from '@libs/OptionsListUtils';
@@ -26,7 +28,8 @@ import * as PhoneNumber from '@libs/PhoneNumber';
 import * as PolicyUtils from '@libs/PolicyUtils';
 import type {OptionData} from '@libs/ReportUtils';
 import type {SettingsNavigatorParamList} from '@navigation/types';
-import * as Policy from '@userActions/Policy';
+import * as Member from '@userActions/Policy/Member';
+import * as Policy from '@userActions/Policy/Policy';
 import CONST from '@src/CONST';
 import ONYXKEYS from '@src/ONYXKEYS';
 import ROUTES from '@src/ROUTES';
@@ -76,27 +79,45 @@ function WorkspaceInvitePage({route, betas, invitedEmailsToAccountIDsDraft, poli
     useEffect(() => {
         setSearchTerm(SearchInputManager.searchInput);
         return () => {
-            Policy.setWorkspaceInviteMembersDraft(route.params.policyID, {});
+            Member.setWorkspaceInviteMembersDraft(route.params.policyID, {});
         };
-        // eslint-disable-next-line react-hooks/exhaustive-deps
+        // eslint-disable-next-line react-compiler/react-compiler, react-hooks/exhaustive-deps
     }, [route.params.policyID]);
 
     useEffect(() => {
         Policy.clearErrors(route.params.policyID);
         openWorkspaceInvitePage();
-        // eslint-disable-next-line react-hooks/exhaustive-deps -- policyID changes remount the component
+        // eslint-disable-next-line react-compiler/react-compiler, react-hooks/exhaustive-deps -- policyID changes remount the component
     }, []);
 
     useNetwork({onReconnect: openWorkspaceInvitePage});
 
     const excludedUsers = useMemo(() => PolicyUtils.getIneligibleInvitees(policy?.employeeList), [policy?.employeeList]);
 
+    const defaultOptions = useMemo(() => {
+        if (!areOptionsInitialized) {
+            return {recentReports: [], personalDetails: [], userToInvite: null, currentUserOption: null, categoryOptions: [], tagOptions: [], taxRatesOptions: []};
+        }
+
+        const inviteOptions = OptionsListUtils.getMemberInviteOptions(options.personalDetails, betas ?? [], '', excludedUsers, true);
+
+        return {...inviteOptions, recentReports: [], currentUserOption: null, categoryOptions: [], tagOptions: [], taxRatesOptions: []};
+    }, [areOptionsInitialized, betas, excludedUsers, options.personalDetails]);
+
+    const inviteOptions = useMemo(
+        () => OptionsListUtils.filterOptions(defaultOptions, debouncedSearchTerm, {excludeLogins: excludedUsers}),
+        [debouncedSearchTerm, defaultOptions, excludedUsers],
+    );
+
     useEffect(() => {
+        if (!areOptionsInitialized) {
+            return;
+        }
+
         const newUsersToInviteDict: Record<number, OptionData> = {};
         const newPersonalDetailsDict: Record<number, OptionData> = {};
         const newSelectedOptionsDict: Record<number, MemberForList> = {};
 
-        const inviteOptions = OptionsListUtils.getMemberInviteOptions(options.personalDetails, betas ?? [], debouncedSearchTerm, excludedUsers, true);
         // Update selectedOptions with the latest personalDetails and policyEmployeeList information
         const detailsMap: Record<string, MemberForList> = {};
         inviteOptions.personalDetails.forEach((detail) => {
@@ -150,8 +171,8 @@ function WorkspaceInvitePage({route, betas, invitedEmailsToAccountIDsDraft, poli
         setPersonalDetails(Object.values(newPersonalDetailsDict));
         setSelectedOptions(Object.values(newSelectedOptionsDict));
 
-        // eslint-disable-next-line react-hooks/exhaustive-deps -- we don't want to recalculate when selectedOptions change
-    }, [options.personalDetails, policy?.employeeList, betas, debouncedSearchTerm, excludedUsers]);
+        // eslint-disable-next-line react-compiler/react-compiler, react-hooks/exhaustive-deps -- we don't want to recalculate when selectedOptions change
+    }, [options.personalDetails, policy?.employeeList, betas, debouncedSearchTerm, excludedUsers, areOptionsInitialized, inviteOptions.personalDetails, inviteOptions.userToInvite]);
 
     const sections: MembersSection[] = useMemo(() => {
         const sectionsArr: MembersSection[] = [];
@@ -233,17 +254,18 @@ function WorkspaceInvitePage({route, betas, invitedEmailsToAccountIDsDraft, poli
         if (!isValid) {
             return;
         }
+        HttpUtils.cancelPendingRequests(READ_COMMANDS.SEARCH_FOR_REPORTS);
 
         const invitedEmailsToAccountIDs: InvitedEmailsToAccountIDs = {};
         selectedOptions.forEach((option) => {
             const login = option.login ?? '';
-            const accountID = option.accountID ?? '';
+            const accountID = option.accountID ?? '-1';
             if (!login.toLowerCase().trim() || !accountID) {
                 return;
             }
             invitedEmailsToAccountIDs[login] = Number(accountID);
         });
-        Policy.setWorkspaceInviteMembersDraft(route.params.policyID, invitedEmailsToAccountIDs);
+        Member.setWorkspaceInviteMembersDraft(route.params.policyID, invitedEmailsToAccountIDs);
         Navigation.navigate(ROUTES.WORKSPACE_INVITE_MESSAGE.getRoute(route.params.policyID));
     }, [route.params.policyID, selectedOptions]);
 
@@ -274,10 +296,9 @@ function WorkspaceInvitePage({route, betas, invitedEmailsToAccountIDsDraft, poli
                 isAlertVisible={shouldShowAlertPrompt}
                 buttonText={translate('common.next')}
                 onSubmit={inviteUser}
-                message={[policy?.alertMessage ?? '', {isTranslated: true}]}
+                message={policy?.alertMessage ?? ''}
                 containerStyles={[styles.flexReset, styles.flexGrow0, styles.flexShrink0, styles.flexBasisAuto]}
                 enabledWhenOffline
-                disablePressOnEnter
             />
         ),
         [inviteUser, policy?.alertMessage, selectedOptions.length, shouldShowAlertPrompt, styles, translate],
@@ -314,7 +335,7 @@ function WorkspaceInvitePage({route, betas, invitedEmailsToAccountIDsDraft, poli
                     canSelectMultiple
                     sections={sections}
                     ListItem={InviteMemberListItem}
-                    textInputLabel={translate('optionsSelector.nameEmailOrPhoneNumber')}
+                    textInputLabel={translate('selectionList.nameEmailOrPhoneNumber')}
                     textInputValue={searchTerm}
                     onChangeText={(value) => {
                         SearchInputManager.searchInput = value;
diff --git a/src/pages/workspace/WorkspaceJoinUserPage.tsx b/src/pages/workspace/WorkspaceJoinUserPage.tsx
index 7cc8e63da2ee..d73dab51c4fe 100644
--- a/src/pages/workspace/WorkspaceJoinUserPage.tsx
+++ b/src/pages/workspace/WorkspaceJoinUserPage.tsx
@@ -6,9 +6,10 @@ import FullScreenLoadingIndicator from '@components/FullscreenLoadingIndicator';
 import ScreenWrapper from '@components/ScreenWrapper';
 import useThemeStyles from '@hooks/useThemeStyles';
 import navigateAfterJoinRequest from '@libs/navigateAfterJoinRequest';
+import * as PolicyUtils from '@libs/PolicyUtils';
 import Navigation from '@navigation/Navigation';
 import type {AuthScreensParamList} from '@navigation/types';
-import * as PolicyAction from '@userActions/Policy';
+import * as MemberAction from '@userActions/Policy/Member';
 import ONYXKEYS from '@src/ONYXKEYS';
 import ROUTES from '@src/ROUTES';
 import type SCREENS from '@src/SCREENS';
@@ -42,14 +43,14 @@ function WorkspaceJoinUserPage({route, policy}: WorkspaceJoinUserPageProps) {
         if (isUnmounted.current || isJoinLinkUsed) {
             return;
         }
-        if (!isEmptyObject(policy) && !policy?.isJoinRequestPending) {
+        if (!isEmptyObject(policy) && !policy?.isJoinRequestPending && !PolicyUtils.isPendingDeletePolicy(policy)) {
             Navigation.isNavigationReady().then(() => {
                 Navigation.goBack(undefined, false, true);
-                Navigation.navigate(ROUTES.WORKSPACE_INITIAL.getRoute(policyID ?? ''));
+                Navigation.navigate(ROUTES.WORKSPACE_INITIAL.getRoute(policyID ?? '-1'));
             });
             return;
         }
-        PolicyAction.inviteMemberToWorkspace(policyID, inviterEmail);
+        MemberAction.inviteMemberToWorkspace(policyID, inviterEmail);
         isJoinLinkUsed = true;
         Navigation.isNavigationReady().then(() => {
             if (isUnmounted.current) {
diff --git a/src/pages/workspace/WorkspaceMembersPage.tsx b/src/pages/workspace/WorkspaceMembersPage.tsx
index 0d723961a29e..90a29601d2a0 100644
--- a/src/pages/workspace/WorkspaceMembersPage.tsx
+++ b/src/pages/workspace/WorkspaceMembersPage.tsx
@@ -5,74 +5,63 @@ import React, {useCallback, useEffect, useMemo, useRef, useState} from 'react';
 import type {TextInput} from 'react-native';
 import {InteractionManager, View} from 'react-native';
 import type {OnyxEntry} from 'react-native-onyx';
-import {withOnyx} from 'react-native-onyx';
+import {useOnyx} from 'react-native-onyx';
 import Badge from '@components/Badge';
-import FullPageNotFoundView from '@components/BlockingViews/FullPageNotFoundView';
 import Button from '@components/Button';
 import ButtonWithDropdownMenu from '@components/ButtonWithDropdownMenu';
 import type {DropdownOption, WorkspaceMemberBulkActionType} from '@components/ButtonWithDropdownMenu/types';
 import ConfirmModal from '@components/ConfirmModal';
-import HeaderWithBackButton from '@components/HeaderWithBackButton';
 import * as Expensicons from '@components/Icon/Expensicons';
 import * as Illustrations from '@components/Icon/Illustrations';
 import MessagesRow from '@components/MessagesRow';
-import ScreenWrapper from '@components/ScreenWrapper';
-import SelectionList from '@components/SelectionList';
 import TableListItem from '@components/SelectionList/TableListItem';
 import type {ListItem, SelectionListHandle} from '@components/SelectionList/types';
+import SelectionListWithModal from '@components/SelectionListWithModal';
 import Text from '@components/Text';
 import type {WithCurrentUserPersonalDetailsProps} from '@components/withCurrentUserPersonalDetails';
 import withCurrentUserPersonalDetails from '@components/withCurrentUserPersonalDetails';
 import useLocalize from '@hooks/useLocalize';
 import useNetwork from '@hooks/useNetwork';
 import usePrevious from '@hooks/usePrevious';
+import useResponsiveLayout from '@hooks/useResponsiveLayout';
 import useStyleUtils from '@hooks/useStyleUtils';
 import useThemeStyles from '@hooks/useThemeStyles';
-import useWindowDimensions from '@hooks/useWindowDimensions';
+import {turnOffMobileSelectionMode} from '@libs/actions/MobileSelectionMode';
 import * as DeviceCapabilities from '@libs/DeviceCapabilities';
 import Log from '@libs/Log';
 import Navigation from '@libs/Navigation/Navigation';
-import type {WorkspacesCentralPaneNavigatorParamList} from '@libs/Navigation/types';
+import type {FullScreenNavigatorParamList} from '@libs/Navigation/types';
 import * as OptionsListUtils from '@libs/OptionsListUtils';
 import * as PersonalDetailsUtils from '@libs/PersonalDetailsUtils';
 import * as PolicyUtils from '@libs/PolicyUtils';
-import * as UserUtils from '@libs/UserUtils';
-import * as Policy from '@userActions/Policy';
+import {getDisplayNameForParticipant} from '@libs/ReportUtils';
+import * as Member from '@userActions/Policy/Member';
+import * as Policy from '@userActions/Policy/Policy';
 import CONST from '@src/CONST';
 import ONYXKEYS from '@src/ONYXKEYS';
 import ROUTES from '@src/ROUTES';
 import type SCREENS from '@src/SCREENS';
-import type {InvitedEmailsToAccountIDs, PersonalDetailsList, PolicyEmployee, PolicyEmployeeList, Session} from '@src/types/onyx';
+import type {PersonalDetailsList, PolicyEmployeeList} from '@src/types/onyx';
 import type {Errors, PendingAction} from '@src/types/onyx/OnyxCommon';
 import {isEmptyObject} from '@src/types/utils/EmptyObject';
 import type {WithPolicyAndFullscreenLoadingProps} from './withPolicyAndFullscreenLoading';
 import withPolicyAndFullscreenLoading from './withPolicyAndFullscreenLoading';
+import WorkspacePageWithSections from './WorkspacePageWithSections';
 
-type WorkspaceMembersPageOnyxProps = {
-    /** Session info for the currently logged in user. */
-    session: OnyxEntry<Session>;
-
-    /** An object containing the accountID for every invited user email */
-    invitedEmailsToAccountIDsDraft: OnyxEntry<InvitedEmailsToAccountIDs>;
-};
-type WorkspaceMembersPageProps = WithPolicyAndFullscreenLoadingProps &
-    WithCurrentUserPersonalDetailsProps &
-    WorkspaceMembersPageOnyxProps &
-    StackScreenProps<WorkspacesCentralPaneNavigatorParamList, typeof SCREENS.WORKSPACE.MEMBERS>;
+type WorkspaceMembersPageProps = WithPolicyAndFullscreenLoadingProps & WithCurrentUserPersonalDetailsProps & StackScreenProps<FullScreenNavigatorParamList, typeof SCREENS.WORKSPACE.MEMBERS>;
 
 /**
  * Inverts an object, equivalent of _.invert
  */
 function invertObject(object: Record<string, string>): Record<string, string> {
-    const invertedEntries = Object.entries(object).map(([key, value]) => [value, key]);
-    const inverted: Record<string, string> = Object.fromEntries(invertedEntries);
-    return inverted;
+    const invertedEntries = Object.entries(object).map(([key, value]) => [value, key] as const);
+    return Object.fromEntries(invertedEntries);
 }
 
 type MemberOption = Omit<ListItem, 'accountID'> & {accountID: number};
 
-function WorkspaceMembersPage({personalDetails, invitedEmailsToAccountIDsDraft, route, policy, session, currentUserPersonalDetails, isLoadingReportData = true}: WorkspaceMembersPageProps) {
-    const policyMemberEmailsToAccountIDs = useMemo(() => PolicyUtils.getMemberAccountIDsForWorkspace(policy?.employeeList), [policy?.employeeList]);
+function WorkspaceMembersPage({personalDetails, route, policy, currentUserPersonalDetails}: WorkspaceMembersPageProps) {
+    const policyMemberEmailsToAccountIDs = useMemo(() => PolicyUtils.getMemberAccountIDsForWorkspace(policy?.employeeList, true), [policy?.employeeList]);
     const styles = useThemeStyles();
     const StyleUtils = useStyleUtils();
     const [selectedEmployees, setSelectedEmployees] = useState<number[]>([]);
@@ -86,35 +75,48 @@ function WorkspaceMembersPage({personalDetails, invitedEmailsToAccountIDsDraft,
     const isOfflineAndNoMemberDataAvailable = isEmptyObject(policy?.employeeList) && isOffline;
     const prevPersonalDetails = usePrevious(personalDetails);
     const {translate, formatPhoneNumber, preferredLocale} = useLocalize();
-    const {isSmallScreenWidth} = useWindowDimensions();
-    const dropdownButtonRef = useRef(null);
+    const {shouldUseNarrowLayout} = useResponsiveLayout();
     const isPolicyAdmin = PolicyUtils.isPolicyAdmin(policy);
     const isLoading = useMemo(
         () => !isOfflineAndNoMemberDataAvailable && (!OptionsListUtils.isPersonalDetailsReady(personalDetails) || isEmptyObject(policy?.employeeList)),
         [isOfflineAndNoMemberDataAvailable, personalDetails, policy?.employeeList],
     );
+
+    const [invitedEmailsToAccountIDsDraft] = useOnyx(`${ONYXKEYS.COLLECTION.WORKSPACE_INVITE_MEMBERS_DRAFT}${route.params.policyID.toString()}`);
+    const [selectionMode] = useOnyx(ONYXKEYS.MOBILE_SELECTION_MODE);
+    const [session] = useOnyx(ONYXKEYS.SESSION);
     const selectionListRef = useRef<SelectionListHandle>(null);
     const isFocused = useIsFocused();
     const policyID = route.params.policyID;
+
+    const canSelectMultiple = isPolicyAdmin && (shouldUseNarrowLayout ? selectionMode?.isEnabled : true);
+
+    const confirmModalPrompt = useMemo(() => {
+        const approverAccountID = selectedEmployees.find((selectedEmployee) => Member.isApprover(policy, selectedEmployee));
+        if (!approverAccountID) {
+            return translate('workspace.people.removeMembersPrompt');
+        }
+        return translate('workspace.people.removeMembersWarningPrompt', {
+            memberName: getDisplayNameForParticipant(approverAccountID),
+            ownerName: getDisplayNameForParticipant(policy?.ownerAccountID),
+        });
+    }, [selectedEmployees, policy, translate]);
     /**
      * Get filtered personalDetails list with current employeeList
      */
     const filterPersonalDetails = (members: OnyxEntry<PolicyEmployeeList>, details: OnyxEntry<PersonalDetailsList>): PersonalDetailsList =>
-        Object.keys(members ?? {}).reduce((result, key) => {
+        Object.keys(members ?? {}).reduce((acc, key) => {
             const memberAccountIdKey = policyMemberEmailsToAccountIDs[key] ?? '';
             if (details?.[memberAccountIdKey]) {
-                return {
-                    ...result,
-                    [memberAccountIdKey]: details[memberAccountIdKey],
-                };
+                acc[memberAccountIdKey] = details[memberAccountIdKey];
             }
-            return result;
-        }, {});
+            return acc;
+        }, {} as PersonalDetailsList);
     /**
      * Get members for the current workspace
      */
     const getWorkspaceMembers = useCallback(() => {
-        Policy.openWorkspaceMembersPage(route.params.policyID, Object.keys(PolicyUtils.getMemberAccountIDsForWorkspace(policy?.employeeList)));
+        Member.openWorkspaceMembersPage(route.params.policyID, Object.keys(PolicyUtils.getMemberAccountIDsForWorkspace(policy?.employeeList)));
     }, [route.params.policyID, policy?.employeeList]);
 
     /**
@@ -129,7 +131,7 @@ function WorkspaceMembersPage({personalDetails, invitedEmailsToAccountIDsDraft,
             newErrors[member] = translate('workspace.people.error.cannotRemove');
         });
         setErrors(newErrors);
-        // eslint-disable-next-line react-hooks/exhaustive-deps
+        // eslint-disable-next-line react-compiler/react-compiler, react-hooks/exhaustive-deps
     }, [selectedEmployees, policy?.owner, session?.accountID]);
 
     // useFocus would make getWorkspaceMembers get called twice on fresh login because policyEmployee is a dependency of getWorkspaceMembers.
@@ -139,7 +141,7 @@ function WorkspaceMembersPage({personalDetails, invitedEmailsToAccountIDsDraft,
             return;
         }
         getWorkspaceMembers();
-        // eslint-disable-next-line react-hooks/exhaustive-deps
+        // eslint-disable-next-line react-compiler/react-compiler, react-hooks/exhaustive-deps
     }, [isFocused]);
 
     useEffect(() => {
@@ -167,7 +169,7 @@ function WorkspaceMembersPage({personalDetails, invitedEmailsToAccountIDsDraft,
             // This is an equivalent of the lodash intersection function. The reduce method below is used to filter the items that exist in both arrays.
             return [prevSelectedElements, currentSelectedElements].reduce((prev, members) => prev.filter((item) => members.includes(item)));
         });
-        // eslint-disable-next-line react-hooks/exhaustive-deps
+        // eslint-disable-next-line react-compiler/react-compiler, react-hooks/exhaustive-deps
     }, [policy?.employeeList, policyMemberEmailsToAccountIDs]);
 
     useEffect(() => {
@@ -197,7 +199,7 @@ function WorkspaceMembersPage({personalDetails, invitedEmailsToAccountIDsDraft,
         // Remove the admin from the list
         const accountIDsToRemove = session?.accountID ? selectedEmployees.filter((id) => id !== session.accountID) : selectedEmployees;
 
-        Policy.removeMembers(accountIDsToRemove, route.params.policyID);
+        Member.removeMembers(accountIDsToRemove, route.params.policyID);
         setSelectedEmployees([]);
         setRemoveMembersConfirmModalVisible(false);
     };
@@ -256,6 +258,10 @@ function WorkspaceMembersPage({personalDetails, invitedEmailsToAccountIDsDraft,
      */
     const toggleUser = useCallback(
         (accountID: number, pendingAction?: PendingAction) => {
+            if (accountID === policy?.ownerAccountID && accountID !== session?.accountID) {
+                return;
+            }
+
             if (pendingAction === CONST.RED_BRICK_ROAD_PENDING_ACTION.DELETE) {
                 return;
             }
@@ -267,7 +273,7 @@ function WorkspaceMembersPage({personalDetails, invitedEmailsToAccountIDsDraft,
                 addUser(accountID);
             }
         },
-        [selectedEmployees, addUser, removeUser],
+        [selectedEmployees, addUser, removeUser, policy?.ownerAccountID, session?.accountID],
     );
 
     /** Opens the member details page */
@@ -277,7 +283,7 @@ function WorkspaceMembersPage({personalDetails, invitedEmailsToAccountIDsDraft,
                 Navigation.navigate(ROUTES.PROFILE.getRoute(item.accountID));
                 return;
             }
-            Policy.clearWorkspaceOwnerChangeFlow(policyID);
+            Member.clearWorkspaceOwnerChangeFlow(policyID);
             Navigation.navigate(ROUTES.WORKSPACE_MEMBER_DETAILS.getRoute(route.params.policyID, item.accountID));
         },
         [isPolicyAdmin, policy, policyID, route.params.policyID],
@@ -289,22 +295,14 @@ function WorkspaceMembersPage({personalDetails, invitedEmailsToAccountIDsDraft,
     const dismissError = useCallback(
         (item: MemberOption) => {
             if (item.pendingAction === CONST.RED_BRICK_ROAD_PENDING_ACTION.DELETE) {
-                Policy.clearDeleteMemberError(route.params.policyID, item.accountID);
+                Member.clearDeleteMemberError(route.params.policyID, item.accountID);
             } else {
-                Policy.clearAddMemberError(route.params.policyID, item.accountID);
+                Member.clearAddMemberError(route.params.policyID, item.accountID);
             }
         },
         [route.params.policyID],
     );
 
-    /**
-     * Check if the policy member is deleted from the workspace
-     */
-    const isDeletedPolicyEmployee = useCallback(
-        (policyEmployee: PolicyEmployee): boolean => !isOffline && policyEmployee.pendingAction === CONST.RED_BRICK_ROAD_PENDING_ACTION.DELETE && isEmptyObject(policyEmployee.errors),
-        [isOffline],
-    );
-
     const policyOwner = policy?.owner;
     const currentUserLogin = currentUserPersonalDetails.login;
     const invitedPrimaryToSecondaryLogins = invertObject(policy?.primaryLoginsInvited ?? {});
@@ -313,7 +311,7 @@ function WorkspaceMembersPage({personalDetails, invitedEmailsToAccountIDsDraft,
 
         Object.entries(policy?.employeeList ?? {}).forEach(([email, policyEmployee]) => {
             const accountID = Number(policyMemberEmailsToAccountIDs[email] ?? '');
-            if (isDeletedPolicyEmployee(policyEmployee)) {
+            if (PolicyUtils.isDeletedPolicyEmployee(policyEmployee, isOffline)) {
                 return;
             }
 
@@ -333,7 +331,7 @@ function WorkspaceMembersPage({personalDetails, invitedEmailsToAccountIDsDraft,
                 }
             }
 
-            const isSelected = selectedEmployees.includes(accountID);
+            const isSelected = selectedEmployees.includes(accountID) && canSelectMultiple;
 
             const isOwner = policy?.owner === details.login;
             const isAdmin = policyEmployee.role === CONST.POLICY.ROLE.ADMIN;
@@ -347,13 +345,16 @@ function WorkspaceMembersPage({personalDetails, invitedEmailsToAccountIDsDraft,
                 accountID,
                 isSelected,
                 isDisabledCheckbox: !(isPolicyAdmin && accountID !== policy?.ownerAccountID && accountID !== session?.accountID),
-                isDisabled: isPolicyAdmin && (policyEmployee.pendingAction === CONST.RED_BRICK_ROAD_PENDING_ACTION.DELETE || !isEmptyObject(policyEmployee.errors)),
+                isDisabled:
+                    !!details.isOptimisticPersonalDetail ||
+                    (isPolicyAdmin && (policyEmployee.pendingAction === CONST.RED_BRICK_ROAD_PENDING_ACTION.DELETE || !isEmptyObject(policyEmployee.errors))),
+                cursorStyle: details.isOptimisticPersonalDetail ? styles.cursorDefault : {},
                 text: formatPhoneNumber(PersonalDetailsUtils.getDisplayNameOrDefault(details)),
                 alternateText: formatPhoneNumber(details?.login ?? ''),
                 rightElement: roleBadge,
                 icons: [
                     {
-                        source: UserUtils.getAvatar(details.avatar, accountID),
+                        source: details.avatar ?? Expensicons.FallbackAvatar,
                         name: formatPhoneNumber(details?.login ?? ''),
                         type: CONST.ICON_TYPE_AVATAR,
                         id: accountID,
@@ -365,13 +366,13 @@ function WorkspaceMembersPage({personalDetails, invitedEmailsToAccountIDsDraft,
                 invitedSecondaryLogin: details?.login ? invitedPrimaryToSecondaryLogins[details.login] ?? '' : '',
             });
         });
-        result = result.sort((a, b) => (a.text ?? '').toLowerCase().localeCompare((b.text ?? '').toLowerCase()));
+        result = OptionsListUtils.sortAlphabetically(result, 'text');
         return result;
     }, [
+        isOffline,
         currentUserLogin,
         formatPhoneNumber,
         invitedPrimaryToSecondaryLogins,
-        isDeletedPolicyEmployee,
         isPolicyAdmin,
         personalDetails,
         policy?.owner,
@@ -382,6 +383,8 @@ function WorkspaceMembersPage({personalDetails, invitedEmailsToAccountIDsDraft,
         selectedEmployees,
         session?.accountID,
         translate,
+        styles.cursorDefault,
+        canSelectMultiple,
     ]);
 
     const data = useMemo(() => getUsers(), [getUsers]);
@@ -395,7 +398,7 @@ function WorkspaceMembersPage({personalDetails, invitedEmailsToAccountIDsDraft,
         }
         const invitedEmails = Object.values(invitedEmailsToAccountIDsDraft).map(String);
         selectionListRef.current?.scrollAndHighlightItem?.(invitedEmails, 1500);
-        Policy.setWorkspaceInviteMembersDraft(route.params.policyID, {});
+        Member.setWorkspaceInviteMembersDraft(route.params.policyID, {});
     }, [invitedEmailsToAccountIDsDraft, route.params.policyID, isFocused, accountIDs, prevAccountIDs]);
 
     const getHeaderMessage = () => {
@@ -413,7 +416,7 @@ function WorkspaceMembersPage({personalDetails, invitedEmailsToAccountIDsDraft,
                 <MessagesRow
                     type="success"
                     // eslint-disable-next-line @typescript-eslint/naming-convention
-                    messages={{0: 'workspace.people.addedWithPrimary'}}
+                    messages={{0: translate('workspace.people.addedWithPrimary')}}
                     containerStyles={[styles.pb5, styles.ph5]}
                     onClose={() => Policy.dismissAddedWithPrimaryLoginMessages(policyID)}
                 />
@@ -421,18 +424,26 @@ function WorkspaceMembersPage({personalDetails, invitedEmailsToAccountIDsDraft,
         </>
     );
 
+    useEffect(() => {
+        if (selectionMode?.isEnabled) {
+            return;
+        }
+
+        setSelectedEmployees([]);
+    }, [setSelectedEmployees, selectionMode?.isEnabled]);
+
     const getCustomListHeader = () => {
         const header = (
             <View style={[styles.flex1, styles.flexRow, styles.justifyContentBetween]}>
                 <View>
-                    <Text style={[styles.searchInputStyle, isPolicyAdmin ? styles.ml3 : styles.ml0]}>{translate('common.member')}</Text>
+                    <Text style={[styles.searchInputStyle, canSelectMultiple ? styles.ml3 : styles.ml0]}>{translate('common.member')}</Text>
                 </View>
                 <View style={[StyleUtils.getMinimumWidth(60)]}>
                     <Text style={[styles.searchInputStyle, styles.textAlignCenter]}>{translate('common.role')}</Text>
                 </View>
             </View>
         );
-        if (isPolicyAdmin) {
+        if (canSelectMultiple) {
             return header;
         }
         return <View style={[styles.peopleRow, styles.userSelectNone, styles.ph9, styles.pv3, styles.pb5]}>{header}</View>;
@@ -448,7 +459,7 @@ function WorkspaceMembersPage({personalDetails, invitedEmailsToAccountIDsDraft,
             return policy?.employeeList?.[email]?.role !== role;
         });
 
-        Policy.updateWorkspaceMembersRole(route.params.policyID, accountIDsToUpdate, role);
+        Member.updateWorkspaceMembersRole(route.params.policyID, accountIDsToUpdate, role);
         setSelectedEmployees([]);
     };
 
@@ -496,7 +507,7 @@ function WorkspaceMembersPage({personalDetails, invitedEmailsToAccountIDsDraft,
         }
         return (
             <View style={styles.w100}>
-                {selectedEmployees.length > 0 ? (
+                {(shouldUseNarrowLayout ? canSelectMultiple : selectedEmployees.length > 0) ? (
                     <ButtonWithDropdownMenu<WorkspaceMemberBulkActionType>
                         shouldAlwaysShowDropdownMenu
                         pressOnEnter
@@ -504,9 +515,9 @@ function WorkspaceMembersPage({personalDetails, invitedEmailsToAccountIDsDraft,
                         buttonSize={CONST.DROPDOWN_BUTTON_SIZE.MEDIUM}
                         onPress={() => null}
                         options={getBulkActionsButtonOptions()}
-                        buttonRef={dropdownButtonRef}
                         isSplitButton={false}
-                        style={[isSmallScreenWidth && styles.flexGrow1]}
+                        style={[shouldUseNarrowLayout && styles.flexGrow1, shouldUseNarrowLayout && styles.mb3]}
+                        isDisabled={!selectedEmployees.length}
                     />
                 ) : (
                     <Button
@@ -515,94 +526,89 @@ function WorkspaceMembersPage({personalDetails, invitedEmailsToAccountIDsDraft,
                         onPress={inviteUser}
                         text={translate('workspace.invite.member')}
                         icon={Expensicons.Plus}
-                        innerStyles={[isSmallScreenWidth && styles.alignItemsCenter]}
-                        style={[isSmallScreenWidth && styles.flexGrow1]}
+                        innerStyles={[shouldUseNarrowLayout && styles.alignItemsCenter]}
+                        style={[shouldUseNarrowLayout && styles.flexGrow1, shouldUseNarrowLayout && styles.mb3]}
                     />
                 )}
             </View>
         );
     };
 
+    const selectionModeHeader = selectionMode?.isEnabled && shouldUseNarrowLayout;
+
     return (
-        <ScreenWrapper
-            includeSafeAreaPaddingBottom={false}
-            style={[styles.defaultModalContainer]}
+        <WorkspacePageWithSections
+            headerText={selectionModeHeader ? translate('common.selectMultiple') : translate('workspace.common.members')}
+            route={route}
+            guidesCallTaskID={CONST.GUIDES_CALL_TASK_IDS.WORKSPACE_MEMBERS}
+            icon={!selectionModeHeader ? Illustrations.ReceiptWrangler : undefined}
+            headerContent={!shouldUseNarrowLayout && getHeaderButtons()}
             testID={WorkspaceMembersPage.displayName}
+            shouldShowLoading={false}
             shouldShowOfflineIndicatorInWideScreen
+            shouldShowNonAdmin
+            onBackButtonPress={() => {
+                if (selectionMode?.isEnabled) {
+                    setSelectedEmployees([]);
+                    turnOffMobileSelectionMode();
+                    return;
+                }
+                Navigation.goBack();
+            }}
         >
-            <FullPageNotFoundView
-                shouldShow={(isEmptyObject(policy) && !isLoadingReportData) || PolicyUtils.isPendingDeletePolicy(policy)}
-                subtitleKey={isEmptyObject(policy) ? undefined : 'workspace.common.notAuthorized'}
-                onBackButtonPress={PolicyUtils.goBackFromInvalidPolicy}
-                onLinkPress={PolicyUtils.goBackFromInvalidPolicy}
-            >
-                <HeaderWithBackButton
-                    title={translate('workspace.common.members')}
-                    icon={Illustrations.ReceiptWrangler}
-                    onBackButtonPress={() => {
-                        Navigation.goBack();
-                    }}
-                    shouldShowBackButton={isSmallScreenWidth}
-                    guidesCallTaskID={CONST.GUIDES_CALL_TASK_IDS.WORKSPACE_MEMBERS}
-                >
-                    {!isSmallScreenWidth && getHeaderButtons()}
-                </HeaderWithBackButton>
-                {isSmallScreenWidth && <View style={[styles.pl5, styles.pr5]}>{getHeaderButtons()}</View>}
-                <ConfirmModal
-                    danger
-                    title={translate('workspace.people.removeMembersTitle')}
-                    isVisible={removeMembersConfirmModalVisible}
-                    onConfirm={removeUsers}
-                    onCancel={() => setRemoveMembersConfirmModalVisible(false)}
-                    prompt={translate('workspace.people.removeMembersPrompt')}
-                    confirmText={translate('common.remove')}
-                    cancelText={translate('common.cancel')}
-                    onModalHide={() => {
-                        InteractionManager.runAfterInteractions(() => {
-                            if (!textInputRef.current) {
-                                return;
-                            }
-                            textInputRef.current.focus();
-                        });
-                    }}
-                />
-                <View style={[styles.w100, styles.flex1]}>
-                    <SelectionList
-                        ref={selectionListRef}
-                        canSelectMultiple={isPolicyAdmin}
-                        sections={[{data, isDisabled: false}]}
-                        ListItem={TableListItem}
-                        disableKeyboardShortcuts={removeMembersConfirmModalVisible}
-                        headerMessage={getHeaderMessage()}
-                        headerContent={getHeaderContent()}
-                        onSelectRow={openMemberDetails}
-                        onCheckboxPress={(item) => toggleUser(item.accountID)}
-                        onSelectAll={() => toggleAllUsers(data)}
-                        onDismissError={dismissError}
-                        showLoadingPlaceholder={isLoading}
-                        showScrollIndicator
-                        shouldPreventDefaultFocusOnSelectRow={!DeviceCapabilities.canUseTouchScreen()}
-                        textInputRef={textInputRef}
-                        customListHeader={getCustomListHeader()}
-                        listHeaderWrapperStyle={[styles.ph9, styles.pv3, styles.pb5]}
+            {() => (
+                <>
+                    {shouldUseNarrowLayout && <View style={[styles.pl5, styles.pr5]}>{getHeaderButtons()}</View>}
+                    <ConfirmModal
+                        danger
+                        title={translate('workspace.people.removeMembersTitle')}
+                        isVisible={removeMembersConfirmModalVisible}
+                        onConfirm={removeUsers}
+                        onCancel={() => setRemoveMembersConfirmModalVisible(false)}
+                        prompt={confirmModalPrompt}
+                        confirmText={translate('common.remove')}
+                        cancelText={translate('common.cancel')}
+                        onModalHide={() => {
+                            InteractionManager.runAfterInteractions(() => {
+                                if (!textInputRef.current) {
+                                    return;
+                                }
+                                textInputRef.current.focus();
+                            });
+                        }}
                     />
-                </View>
-            </FullPageNotFoundView>
-        </ScreenWrapper>
+                    <View style={[styles.w100, styles.flex1]}>
+                        <SelectionListWithModal
+                            ref={selectionListRef}
+                            canSelectMultiple={canSelectMultiple}
+                            sections={[{data, isDisabled: false}]}
+                            ListItem={TableListItem}
+                            turnOnSelectionModeOnLongPress={isPolicyAdmin}
+                            onTurnOnSelectionMode={(item) => item && toggleUser(item?.accountID)}
+                            shouldUseUserSkeletonView
+                            disableKeyboardShortcuts={removeMembersConfirmModalVisible}
+                            headerMessage={getHeaderMessage()}
+                            headerContent={!shouldUseNarrowLayout && getHeaderContent()}
+                            onSelectRow={openMemberDetails}
+                            shouldSingleExecuteRowSelect={!isPolicyAdmin}
+                            onCheckboxPress={(item) => toggleUser(item.accountID)}
+                            onSelectAll={() => toggleAllUsers(data)}
+                            onDismissError={dismissError}
+                            showLoadingPlaceholder={isLoading}
+                            shouldPreventDefaultFocusOnSelectRow={!DeviceCapabilities.canUseTouchScreen()}
+                            textInputRef={textInputRef}
+                            customListHeader={getCustomListHeader()}
+                            listHeaderWrapperStyle={[styles.ph9, styles.pv3, styles.pb5]}
+                            listHeaderContent={shouldUseNarrowLayout ? <View style={[styles.pl5, styles.pr5]}>{getHeaderContent()}</View> : null}
+                            showScrollIndicator={false}
+                        />
+                    </View>
+                </>
+            )}
+        </WorkspacePageWithSections>
     );
 }
 
 WorkspaceMembersPage.displayName = 'WorkspaceMembersPage';
 
-export default withCurrentUserPersonalDetails(
-    withPolicyAndFullscreenLoading(
-        withOnyx<WorkspaceMembersPageProps, WorkspaceMembersPageOnyxProps>({
-            invitedEmailsToAccountIDsDraft: {
-                key: ({route}) => `${ONYXKEYS.COLLECTION.WORKSPACE_INVITE_MEMBERS_DRAFT}${route.params.policyID.toString()}`,
-            },
-            session: {
-                key: ONYXKEYS.SESSION,
-            },
-        })(WorkspaceMembersPage),
-    ),
-);
+export default withCurrentUserPersonalDetails(withPolicyAndFullscreenLoading(WorkspaceMembersPage));
diff --git a/src/pages/workspace/WorkspaceMoreFeaturesPage.tsx b/src/pages/workspace/WorkspaceMoreFeaturesPage.tsx
index 6ef72b228a20..e1eb7e24130a 100644
--- a/src/pages/workspace/WorkspaceMoreFeaturesPage.tsx
+++ b/src/pages/workspace/WorkspaceMoreFeaturesPage.tsx
@@ -1,7 +1,9 @@
 import {useFocusEffect} from '@react-navigation/native';
 import type {StackScreenProps} from '@react-navigation/stack';
-import React, {useCallback} from 'react';
+import React, {useCallback, useState} from 'react';
 import {View} from 'react-native';
+import {useOnyx} from 'react-native-onyx';
+import ConfirmModal from '@components/ConfirmModal';
 import HeaderWithBackButton from '@components/HeaderWithBackButton';
 import * as Illustrations from '@components/Icon/Illustrations';
 import ScreenWrapper from '@components/ScreenWrapper';
@@ -10,13 +12,21 @@ import Section from '@components/Section';
 import useLocalize from '@hooks/useLocalize';
 import useNetwork from '@hooks/useNetwork';
 import usePermissions from '@hooks/usePermissions';
+import useResponsiveLayout from '@hooks/useResponsiveLayout';
 import useThemeStyles from '@hooks/useThemeStyles';
-import useWindowDimensions from '@hooks/useWindowDimensions';
 import * as ErrorUtils from '@libs/ErrorUtils';
-import type {WorkspacesCentralPaneNavigatorParamList} from '@libs/Navigation/types';
-import * as Policy from '@userActions/Policy';
+import Navigation from '@libs/Navigation/Navigation';
+import type {FullScreenNavigatorParamList} from '@libs/Navigation/types';
+import {isControlPolicy} from '@libs/PolicyUtils';
+import * as Category from '@userActions/Policy/Category';
+import * as DistanceRate from '@userActions/Policy/DistanceRate';
+import * as Policy from '@userActions/Policy/Policy';
+import * as Tag from '@userActions/Policy/Tag';
+import * as Report from '@userActions/Report';
 import CONST from '@src/CONST';
 import type {TranslationPaths} from '@src/languages/types';
+import ONYXKEYS from '@src/ONYXKEYS';
+import ROUTES from '@src/ROUTES';
 import type SCREENS from '@src/SCREENS';
 import type {Errors, PendingAction} from '@src/types/onyx/OnyxCommon';
 import {isEmptyObject} from '@src/types/utils/EmptyObject';
@@ -26,7 +36,7 @@ import type {WithPolicyAndFullscreenLoadingProps} from './withPolicyAndFullscree
 import withPolicyAndFullscreenLoading from './withPolicyAndFullscreenLoading';
 import ToggleSettingOptionRow from './workflows/ToggleSettingsOptionRow';
 
-type WorkspaceMoreFeaturesPageProps = WithPolicyAndFullscreenLoadingProps & StackScreenProps<WorkspacesCentralPaneNavigatorParamList, typeof SCREENS.WORKSPACE.MORE_FEATURES>;
+type WorkspaceMoreFeaturesPageProps = WithPolicyAndFullscreenLoadingProps & StackScreenProps<FullScreenNavigatorParamList, typeof SCREENS.WORKSPACE.MORE_FEATURES>;
 
 type Item = {
     icon: IconAsset;
@@ -35,6 +45,7 @@ type Item = {
     isActive: boolean;
     disabled?: boolean;
     action: (isEnabled: boolean) => void;
+    disabledAction?: () => void;
     pendingAction: PendingAction | undefined;
     errors?: Errors;
     onCloseError?: () => void;
@@ -48,11 +59,31 @@ type SectionObject = {
 
 function WorkspaceMoreFeaturesPage({policy, route}: WorkspaceMoreFeaturesPageProps) {
     const styles = useThemeStyles();
-    const {isSmallScreenWidth} = useWindowDimensions();
+    const {shouldUseNarrowLayout} = useResponsiveLayout();
     const {translate} = useLocalize();
-    const {canUseAccountingIntegrations} = usePermissions();
-    const hasAccountingConnection = !!policy?.areConnectionsEnabled && !isEmptyObject(policy?.connections);
-    const isSyncTaxEnabled = !!policy?.connections?.quickbooksOnline?.config.syncTax || !!policy?.connections?.xero?.config.importTaxRates;
+    const {canUseWorkspaceFeeds, canUseWorkspaceRules} = usePermissions();
+    const hasAccountingConnection = !isEmptyObject(policy?.connections);
+    const isAccountingEnabled = !!policy?.areConnectionsEnabled || !isEmptyObject(policy?.connections);
+    const isSyncTaxEnabled =
+        !!policy?.connections?.quickbooksOnline?.config?.syncTax ||
+        !!policy?.connections?.xero?.config?.importTaxRates ||
+        !!policy?.connections?.netsuite?.options?.config?.syncOptions?.syncTax;
+    const policyID = policy?.id;
+    const workspaceAccountID = policy?.workspaceAccountID ?? -1;
+    const [cardsList] = useOnyx(`${ONYXKEYS.COLLECTION.WORKSPACE_CARDS_LIST}${workspaceAccountID.toString()}${CONST.EXPENSIFY_CARD.BANK}`);
+    const [cardFeeds] = useOnyx(`${ONYXKEYS.COLLECTION.SHARED_NVP_PRIVATE_DOMAIN_MEMBER}${workspaceAccountID.toString()}`);
+    const [isOrganizeWarningModalOpen, setIsOrganizeWarningModalOpen] = useState(false);
+    const [isIntegrateWarningModalOpen, setIsIntegrateWarningModalOpen] = useState(false);
+    const [isReportFieldsWarningModalOpen, setIsReportFieldsWarningModalOpen] = useState(false);
+    const [isDisableExpensifyCardWarningModalOpen, setIsDisableExpensifyCardWarningModalOpen] = useState(false);
+    const [isDisableCompanyCardsWarningModalOpen, setIsDisableCompanyCardsWarningModalOpen] = useState(false);
+
+    const onDisabledOrganizeSwitchPress = useCallback(() => {
+        if (!hasAccountingConnection) {
+            return;
+        }
+        setIsOrganizeWarningModalOpen(true);
+    }, [hasAccountingConnection]);
 
     const spendItems: Item[] = [
         {
@@ -62,9 +93,59 @@ function WorkspaceMoreFeaturesPage({policy, route}: WorkspaceMoreFeaturesPagePro
             isActive: policy?.areDistanceRatesEnabled ?? false,
             pendingAction: policy?.pendingFields?.areDistanceRatesEnabled,
             action: (isEnabled: boolean) => {
-                Policy.enablePolicyDistanceRates(policy?.id ?? '', isEnabled);
+                if (!policyID) {
+                    return;
+                }
+                DistanceRate.enablePolicyDistanceRates(policyID, isEnabled);
             },
         },
+    ];
+
+    // TODO remove this when feature will be fully done, and move spend item inside spendItems array
+    if (canUseWorkspaceFeeds) {
+        spendItems.push({
+            icon: Illustrations.HandCard,
+            titleTranslationKey: 'workspace.moreFeatures.expensifyCard.title',
+            subtitleTranslationKey: 'workspace.moreFeatures.expensifyCard.subtitle',
+            isActive: policy?.areExpensifyCardsEnabled ?? false,
+            pendingAction: policy?.pendingFields?.areExpensifyCardsEnabled,
+            disabled: !isEmptyObject(cardsList),
+            action: (isEnabled: boolean) => {
+                if (!policyID) {
+                    return;
+                }
+                Policy.enableExpensifyCard(policyID, isEnabled);
+            },
+            disabledAction: () => {
+                setIsDisableExpensifyCardWarningModalOpen(true);
+            },
+        });
+        spendItems.push({
+            icon: Illustrations.CompanyCard,
+            titleTranslationKey: 'workspace.moreFeatures.companyCards.title',
+            subtitleTranslationKey: 'workspace.moreFeatures.companyCards.subtitle',
+            isActive: policy?.areCompanyCardsEnabled ?? false,
+            pendingAction: policy?.pendingFields?.areCompanyCardsEnabled,
+            disabled: !isEmptyObject(cardFeeds?.companyCards),
+            action: (isEnabled: boolean) => {
+                if (!policyID) {
+                    return;
+                }
+                if (isEnabled && !isControlPolicy(policy)) {
+                    Navigation.navigate(
+                        ROUTES.WORKSPACE_UPGRADE.getRoute(policyID, CONST.UPGRADE_FEATURE_INTRO_MAPPING.companyCards.alias, ROUTES.WORKSPACE_MORE_FEATURES.getRoute(policyID)),
+                    );
+                    return;
+                }
+                Policy.enableCompanyCards(policyID, isEnabled);
+            },
+            disabledAction: () => {
+                setIsDisableCompanyCardsWarningModalOpen(true);
+            },
+        });
+    }
+
+    const manageItems: Item[] = [
         {
             icon: Illustrations.Workflows,
             titleTranslationKey: 'workspace.moreFeatures.workflows.title',
@@ -72,7 +153,48 @@ function WorkspaceMoreFeaturesPage({policy, route}: WorkspaceMoreFeaturesPagePro
             isActive: policy?.areWorkflowsEnabled ?? false,
             pendingAction: policy?.pendingFields?.areWorkflowsEnabled,
             action: (isEnabled: boolean) => {
-                Policy.enablePolicyWorkflows(policy?.id ?? '', isEnabled);
+                if (!policyID) {
+                    return;
+                }
+                Policy.enablePolicyWorkflows(policyID, isEnabled);
+            },
+        },
+    ];
+
+    // TODO remove this when feature will be fully done, and move manage item inside manageItems array
+    if (canUseWorkspaceRules) {
+        manageItems.splice(1, 0, {
+            icon: Illustrations.Rules,
+            titleTranslationKey: 'workspace.moreFeatures.rules.title',
+            subtitleTranslationKey: 'workspace.moreFeatures.rules.subtitle',
+            isActive: policy?.areRulesEnabled ?? false,
+            pendingAction: policy?.pendingFields?.areRulesEnabled,
+            action: (isEnabled: boolean) => {
+                if (!policyID) {
+                    return;
+                }
+
+                if (isEnabled && !isControlPolicy(policy)) {
+                    Navigation.navigate(ROUTES.WORKSPACE_UPGRADE.getRoute(policyID, CONST.UPGRADE_FEATURE_INTRO_MAPPING.rules.alias, ROUTES.WORKSPACE_MORE_FEATURES.getRoute(policyID)));
+                    return;
+                }
+                Policy.enablePolicyRules(policyID, isEnabled);
+            },
+        });
+    }
+
+    const earnItems: Item[] = [
+        {
+            icon: Illustrations.InvoiceBlue,
+            titleTranslationKey: 'workspace.moreFeatures.invoices.title',
+            subtitleTranslationKey: 'workspace.moreFeatures.invoices.subtitle',
+            isActive: policy?.areInvoicesEnabled ?? false,
+            pendingAction: policy?.pendingFields?.areInvoicesEnabled,
+            action: (isEnabled: boolean) => {
+                if (!policyID) {
+                    return;
+                }
+                Policy.enablePolicyInvoicing(policyID, isEnabled);
             },
         },
     ];
@@ -84,9 +206,13 @@ function WorkspaceMoreFeaturesPage({policy, route}: WorkspaceMoreFeaturesPagePro
             subtitleTranslationKey: 'workspace.moreFeatures.categories.subtitle',
             isActive: policy?.areCategoriesEnabled ?? false,
             disabled: hasAccountingConnection,
+            disabledAction: onDisabledOrganizeSwitchPress,
             pendingAction: policy?.pendingFields?.areCategoriesEnabled,
             action: (isEnabled: boolean) => {
-                Policy.enablePolicyCategories(policy?.id ?? '', isEnabled);
+                if (!policyID) {
+                    return;
+                }
+                Category.enablePolicyCategories(policyID, isEnabled);
             },
         },
         {
@@ -96,8 +222,12 @@ function WorkspaceMoreFeaturesPage({policy, route}: WorkspaceMoreFeaturesPagePro
             isActive: policy?.areTagsEnabled ?? false,
             disabled: hasAccountingConnection,
             pendingAction: policy?.pendingFields?.areTagsEnabled,
+            disabledAction: onDisabledOrganizeSwitchPress,
             action: (isEnabled: boolean) => {
-                Policy.enablePolicyTags(policy?.id ?? '', isEnabled);
+                if (!policyID) {
+                    return;
+                }
+                Tag.enablePolicyTags(policyID, isEnabled);
             },
         },
         {
@@ -105,10 +235,40 @@ function WorkspaceMoreFeaturesPage({policy, route}: WorkspaceMoreFeaturesPagePro
             titleTranslationKey: 'workspace.moreFeatures.taxes.title',
             subtitleTranslationKey: 'workspace.moreFeatures.taxes.subtitle',
             isActive: (policy?.tax?.trackingEnabled ?? false) || isSyncTaxEnabled,
-            disabled: isSyncTaxEnabled || policy?.connections?.quickbooksOnline?.data?.country === CONST.COUNTRY.US,
+            disabled: hasAccountingConnection,
             pendingAction: policy?.pendingFields?.tax,
+            disabledAction: onDisabledOrganizeSwitchPress,
             action: (isEnabled: boolean) => {
-                Policy.enablePolicyTaxes(policy?.id ?? '', isEnabled);
+                if (!policyID) {
+                    return;
+                }
+                Policy.enablePolicyTaxes(policyID, isEnabled);
+            },
+        },
+        {
+            icon: Illustrations.Pencil,
+            titleTranslationKey: 'workspace.moreFeatures.reportFields.title',
+            subtitleTranslationKey: 'workspace.moreFeatures.reportFields.subtitle',
+            isActive: policy?.areReportFieldsEnabled ?? false,
+            disabled: hasAccountingConnection,
+            pendingAction: policy?.pendingFields?.areReportFieldsEnabled,
+            disabledAction: onDisabledOrganizeSwitchPress,
+            action: (isEnabled: boolean) => {
+                if (!policyID) {
+                    return;
+                }
+                if (isEnabled) {
+                    if (!isControlPolicy(policy)) {
+                        Navigation.navigate(
+                            ROUTES.WORKSPACE_UPGRADE.getRoute(policyID, CONST.UPGRADE_FEATURE_INTRO_MAPPING.reportFields.alias, ROUTES.WORKSPACE_MORE_FEATURES.getRoute(policyID)),
+                        );
+                        return;
+                    }
+
+                    Policy.enablePolicyReportFields(policyID, true);
+                    return;
+                }
+                setIsReportFieldsWarningModalOpen(true);
             },
         },
     ];
@@ -118,14 +278,28 @@ function WorkspaceMoreFeaturesPage({policy, route}: WorkspaceMoreFeaturesPagePro
             icon: Illustrations.Accounting,
             titleTranslationKey: 'workspace.moreFeatures.connections.title',
             subtitleTranslationKey: 'workspace.moreFeatures.connections.subtitle',
-            isActive: !!policy?.areConnectionsEnabled,
+            isActive: isAccountingEnabled,
             pendingAction: policy?.pendingFields?.areConnectionsEnabled,
+            disabledAction: () => {
+                if (!hasAccountingConnection) {
+                    return;
+                }
+                setIsIntegrateWarningModalOpen(true);
+            },
             action: (isEnabled: boolean) => {
-                Policy.enablePolicyConnections(policy?.id ?? '', isEnabled);
+                if (!policyID) {
+                    return;
+                }
+                Policy.enablePolicyConnections(policyID, isEnabled);
             },
             disabled: hasAccountingConnection,
             errors: ErrorUtils.getLatestErrorField(policy ?? {}, CONST.POLICY.MORE_FEATURES.ARE_CONNECTIONS_ENABLED),
-            onCloseError: () => Policy.clearPolicyErrorField(policy?.id ?? '', CONST.POLICY.MORE_FEATURES.ARE_CONNECTIONS_ENABLED),
+            onCloseError: () => {
+                if (!policyID) {
+                    return;
+                }
+                Policy.clearPolicyErrorField(policyID, CONST.POLICY.MORE_FEATURES.ARE_CONNECTIONS_ENABLED);
+            },
         },
     ];
 
@@ -135,20 +309,27 @@ function WorkspaceMoreFeaturesPage({policy, route}: WorkspaceMoreFeaturesPagePro
             subtitleTranslationKey: 'workspace.moreFeatures.spendSection.subtitle',
             items: spendItems,
         },
+        {
+            titleTranslationKey: 'workspace.moreFeatures.manageSection.title',
+            subtitleTranslationKey: 'workspace.moreFeatures.manageSection.subtitle',
+            items: manageItems,
+        },
+        {
+            titleTranslationKey: 'workspace.moreFeatures.earnSection.title',
+            subtitleTranslationKey: 'workspace.moreFeatures.earnSection.subtitle',
+            items: earnItems,
+        },
         {
             titleTranslationKey: 'workspace.moreFeatures.organizeSection.title',
             subtitleTranslationKey: 'workspace.moreFeatures.organizeSection.subtitle',
             items: organizeItems,
         },
-    ];
-
-    if (canUseAccountingIntegrations) {
-        sections.push({
+        {
             titleTranslationKey: 'workspace.moreFeatures.integrateSection.title',
             subtitleTranslationKey: 'workspace.moreFeatures.integrateSection.subtitle',
             items: integrateItems,
-        });
-    }
+        },
+    ];
 
     const renderItem = useCallback(
         (item: Item) => (
@@ -158,12 +339,16 @@ function WorkspaceMoreFeaturesPage({policy, route}: WorkspaceMoreFeaturesPagePro
             >
                 <ToggleSettingOptionRow
                     icon={item.icon}
+                    disabled={item.disabled}
+                    disabledAction={item.disabledAction}
                     title={translate(item.titleTranslationKey)}
+                    titleStyle={styles.textStrong}
                     subtitle={translate(item.subtitleTranslationKey)}
+                    switchAccessibilityLabel={translate(item.subtitleTranslationKey)}
                     isActive={item.isActive}
                     pendingAction={item.pendingAction}
                     onToggle={item.action}
-                    disabled={item.disabled}
+                    showLockIcon={item.disabled}
                     errors={item.errors}
                     onCloseError={item.onCloseError}
                 />
@@ -176,10 +361,10 @@ function WorkspaceMoreFeaturesPage({policy, route}: WorkspaceMoreFeaturesPagePro
         (section: SectionObject) => (
             <View
                 key={section.titleTranslationKey}
-                style={[styles.mt3, isSmallScreenWidth ? styles.workspaceSectionMobile : styles.workspaceSection]}
+                style={[styles.mt3, shouldUseNarrowLayout ? styles.workspaceSectionMobile : styles.workspaceSection]}
             >
                 <Section
-                    containerStyles={isSmallScreenWidth ? styles.p5 : styles.p8}
+                    containerStyles={shouldUseNarrowLayout ? styles.p5 : styles.p8}
                     title={translate(section.titleTranslationKey)}
                     titleStyles={styles.textStrong}
                     subtitle={translate(section.subtitleTranslationKey)}
@@ -189,7 +374,7 @@ function WorkspaceMoreFeaturesPage({policy, route}: WorkspaceMoreFeaturesPagePro
                 </Section>
             </View>
         ),
-        [isSmallScreenWidth, styles, renderItem, translate],
+        [shouldUseNarrowLayout, styles, renderItem, translate],
     );
 
     const fetchFeatures = useCallback(() => {
@@ -218,10 +403,81 @@ function WorkspaceMoreFeaturesPage({policy, route}: WorkspaceMoreFeaturesPagePro
                 <HeaderWithBackButton
                     icon={Illustrations.Gears}
                     title={translate('workspace.common.moreFeatures')}
-                    shouldShowBackButton={isSmallScreenWidth}
+                    shouldShowBackButton={shouldUseNarrowLayout}
                 />
 
                 <ScrollView contentContainerStyle={styles.pb2}>{sections.map(renderSection)}</ScrollView>
+
+                <ConfirmModal
+                    title={translate('workspace.moreFeatures.connectionsWarningModal.featureEnabledTitle')}
+                    onConfirm={() => {
+                        if (!policyID) {
+                            return;
+                        }
+                        setIsOrganizeWarningModalOpen(false);
+                        Navigation.navigate(ROUTES.POLICY_ACCOUNTING.getRoute(policyID));
+                    }}
+                    onCancel={() => setIsOrganizeWarningModalOpen(false)}
+                    isVisible={isOrganizeWarningModalOpen}
+                    prompt={translate('workspace.moreFeatures.connectionsWarningModal.featureEnabledText')}
+                    confirmText={translate('workspace.moreFeatures.connectionsWarningModal.manageSettings')}
+                    cancelText={translate('common.cancel')}
+                />
+                <ConfirmModal
+                    title={translate('workspace.moreFeatures.connectionsWarningModal.featureEnabledTitle')}
+                    onConfirm={() => {
+                        if (!policyID) {
+                            return;
+                        }
+                        setIsIntegrateWarningModalOpen(false);
+                        Navigation.navigate(ROUTES.POLICY_ACCOUNTING.getRoute(policyID));
+                    }}
+                    onCancel={() => setIsIntegrateWarningModalOpen(false)}
+                    isVisible={isIntegrateWarningModalOpen}
+                    prompt={translate('workspace.moreFeatures.connectionsWarningModal.disconnectText')}
+                    confirmText={translate('workspace.moreFeatures.connectionsWarningModal.manageSettings')}
+                    cancelText={translate('common.cancel')}
+                />
+                <ConfirmModal
+                    title={translate('workspace.reportFields.disableReportFields')}
+                    isVisible={isReportFieldsWarningModalOpen}
+                    onConfirm={() => {
+                        if (!policyID) {
+                            return;
+                        }
+                        setIsReportFieldsWarningModalOpen(false);
+                        Policy.enablePolicyReportFields(policyID, false);
+                    }}
+                    onCancel={() => setIsReportFieldsWarningModalOpen(false)}
+                    prompt={translate('workspace.reportFields.disableReportFieldsConfirmation')}
+                    confirmText={translate('common.disable')}
+                    cancelText={translate('common.cancel')}
+                    danger
+                />
+                <ConfirmModal
+                    title={translate('workspace.moreFeatures.expensifyCard.disableCardTitle')}
+                    isVisible={isDisableExpensifyCardWarningModalOpen}
+                    onConfirm={() => {
+                        setIsDisableExpensifyCardWarningModalOpen(false);
+                        Report.navigateToConciergeChat(true);
+                    }}
+                    onCancel={() => setIsDisableExpensifyCardWarningModalOpen(false)}
+                    prompt={translate('workspace.moreFeatures.expensifyCard.disableCardPrompt')}
+                    confirmText={translate('workspace.moreFeatures.expensifyCard.disableCardButton')}
+                    cancelText={translate('common.cancel')}
+                />
+                <ConfirmModal
+                    title={translate('workspace.moreFeatures.companyCards.disableCardTitle')}
+                    isVisible={isDisableCompanyCardsWarningModalOpen}
+                    onConfirm={() => {
+                        setIsDisableCompanyCardsWarningModalOpen(false);
+                        Report.navigateToConciergeChat(true);
+                    }}
+                    onCancel={() => setIsDisableCompanyCardsWarningModalOpen(false)}
+                    prompt={translate('workspace.moreFeatures.companyCards.disableCardPrompt')}
+                    confirmText={translate('workspace.moreFeatures.companyCards.disableCardButton')}
+                    cancelText={translate('common.cancel')}
+                />
             </ScreenWrapper>
         </AccessOrNotFoundWrapper>
     );
diff --git a/src/pages/workspace/WorkspaceNamePage.tsx b/src/pages/workspace/WorkspaceNamePage.tsx
index 3a0cd476de9b..d9632a1a2ae8 100644
--- a/src/pages/workspace/WorkspaceNamePage.tsx
+++ b/src/pages/workspace/WorkspaceNamePage.tsx
@@ -11,7 +11,7 @@ import useThemeStyles from '@hooks/useThemeStyles';
 import * as ErrorUtils from '@libs/ErrorUtils';
 import Navigation from '@libs/Navigation/Navigation';
 import * as ValidationUtils from '@libs/ValidationUtils';
-import * as Policy from '@userActions/Policy';
+import * as Policy from '@userActions/Policy/Policy';
 import CONST from '@src/CONST';
 import ONYXKEYS from '@src/ONYXKEYS';
 import INPUT_IDS from '@src/types/form/WorkspaceSettingsForm';
@@ -38,24 +38,27 @@ function WorkspaceNamePage({policy}: Props) {
         [policy],
     );
 
-    const validate = useCallback((values: FormOnyxValues<typeof ONYXKEYS.FORMS.WORKSPACE_SETTINGS_FORM>) => {
-        const errors: FormInputErrors<typeof ONYXKEYS.FORMS.WORKSPACE_SETTINGS_FORM> = {};
-        const name = values.name.trim();
+    const validate = useCallback(
+        (values: FormOnyxValues<typeof ONYXKEYS.FORMS.WORKSPACE_SETTINGS_FORM>) => {
+            const errors: FormInputErrors<typeof ONYXKEYS.FORMS.WORKSPACE_SETTINGS_FORM> = {};
+            const name = values.name.trim();
 
-        if (!ValidationUtils.isRequiredFulfilled(name)) {
-            errors.name = 'workspace.editor.nameIsRequiredError';
-        } else if ([...name].length > CONST.TITLE_CHARACTER_LIMIT) {
-            // Uses the spread syntax to count the number of Unicode code points instead of the number of UTF-16
-            // code units.
-            ErrorUtils.addErrorMessage(errors, 'name', ['common.error.characterLimitExceedCounter', {length: [...name].length, limit: CONST.TITLE_CHARACTER_LIMIT}]);
-        }
+            if (!ValidationUtils.isRequiredFulfilled(name)) {
+                errors.name = translate('workspace.editor.nameIsRequiredError');
+            } else if ([...name].length > CONST.TITLE_CHARACTER_LIMIT) {
+                // Uses the spread syntax to count the number of Unicode code points instead of the number of UTF-16
+                // code units.
+                ErrorUtils.addErrorMessage(errors, 'name', translate('common.error.characterLimitExceedCounter', {length: [...name].length, limit: CONST.TITLE_CHARACTER_LIMIT}));
+            }
 
-        return errors;
-    }, []);
+            return errors;
+        },
+        [translate],
+    );
 
     return (
         <AccessOrNotFoundWrapper
-            policyID={policy?.id ?? ''}
+            policyID={policy?.id ?? '-1'}
             accessVariants={[CONST.POLICY.ACCESS_VARIANTS.ADMIN]}
         >
             <ScreenWrapper
diff --git a/src/pages/workspace/WorkspaceNewRoomPage.tsx b/src/pages/workspace/WorkspaceNewRoomPage.tsx
index 5716812ced16..7bf04bd4b449 100644
--- a/src/pages/workspace/WorkspaceNewRoomPage.tsx
+++ b/src/pages/workspace/WorkspaceNewRoomPage.tsx
@@ -21,8 +21,8 @@ import useAutoFocusInput from '@hooks/useAutoFocusInput';
 import useLocalize from '@hooks/useLocalize';
 import useNetwork from '@hooks/useNetwork';
 import usePrevious from '@hooks/usePrevious';
+import useResponsiveLayout from '@hooks/useResponsiveLayout';
 import useThemeStyles from '@hooks/useThemeStyles';
-import useWindowDimensions from '@hooks/useWindowDimensions';
 import * as ErrorUtils from '@libs/ErrorUtils';
 import localeCompare from '@libs/LocaleCompare';
 import Navigation from '@libs/Navigation/Navigation';
@@ -64,7 +64,7 @@ function WorkspaceNewRoomPage({policies, reports, formState, session, activePoli
     const isFocused = useIsFocused();
     const {translate} = useLocalize();
     const {isOffline} = useNetwork();
-    const {isSmallScreenWidth} = useWindowDimensions();
+    const {isSmallScreenWidth} = useResponsiveLayout();
     const [visibility, setVisibility] = useState<ValueOf<typeof CONST.REPORT.VISIBILITY>>(CONST.REPORT.VISIBILITY.RESTRICTED);
     const [writeCapability, setWriteCapability] = useState<ValueOf<typeof CONST.REPORT.WRITE_CAPABILITIES>>(CONST.REPORT.WRITE_CAPABILITIES.ALL);
     const wasLoading = usePrevious<boolean>(!!formState?.isLoading);
@@ -104,8 +104,8 @@ function WorkspaceNewRoomPage({policies, reports, formState, session, activePoli
      * @param values - form input values passed by the Form component
      */
     const submit = (values: FormOnyxValues<typeof ONYXKEYS.FORMS.NEW_ROOM_FORM>) => {
-        const participants = [session?.accountID ?? 0];
-        const parsedDescription = ReportUtils.getParsedComment(values.reportDescription ?? '');
+        const participants = [session?.accountID ?? -1];
+        const parsedDescription = ReportUtils.getParsedComment(values.reportDescription ?? '', {policyID});
         const policyReport = ReportUtils.buildOptimisticChatReport(
             participants,
             values.roomName,
@@ -148,7 +148,7 @@ function WorkspaceNewRoomPage({policies, reports, formState, session, activePoli
             return;
         }
         Navigation.dismissModal(newRoomReportID);
-        // eslint-disable-next-line react-hooks/exhaustive-deps -- we just want this to update on changing the form State
+        // eslint-disable-next-line react-compiler/react-compiler, react-hooks/exhaustive-deps -- we just want this to update on changing the form State
     }, [isLoading, errorFields]);
 
     useEffect(() => {
@@ -169,35 +169,36 @@ function WorkspaceNewRoomPage({policies, reports, formState, session, activePoli
 
             if (!values.roomName || values.roomName === CONST.POLICY.ROOM_PREFIX) {
                 // We error if the user doesn't enter a room name or left blank
-                ErrorUtils.addErrorMessage(errors, 'roomName', 'newRoomPage.pleaseEnterRoomName');
+                ErrorUtils.addErrorMessage(errors, 'roomName', translate('newRoomPage.pleaseEnterRoomName'));
             } else if (values.roomName !== CONST.POLICY.ROOM_PREFIX && !ValidationUtils.isValidRoomName(values.roomName)) {
                 // We error if the room name has invalid characters
-                ErrorUtils.addErrorMessage(errors, 'roomName', 'newRoomPage.roomNameInvalidError');
+                ErrorUtils.addErrorMessage(errors, 'roomName', translate('newRoomPage.roomNameInvalidError'));
             } else if (ValidationUtils.isReservedRoomName(values.roomName)) {
                 // Certain names are reserved for default rooms and should not be used for policy rooms.
-                ErrorUtils.addErrorMessage(errors, 'roomName', ['newRoomPage.roomNameReservedError', {reservedName: values.roomName}]);
-            } else if (ValidationUtils.isExistingRoomName(values.roomName, reports, values.policyID ?? '')) {
+                ErrorUtils.addErrorMessage(errors, 'roomName', translate('newRoomPage.roomNameReservedError', {reservedName: values.roomName}));
+            } else if (ValidationUtils.isExistingRoomName(values.roomName, reports, values.policyID ?? '-1')) {
                 // Certain names are reserved for default rooms and should not be used for policy rooms.
-                ErrorUtils.addErrorMessage(errors, 'roomName', 'newRoomPage.roomAlreadyExistsError');
+                ErrorUtils.addErrorMessage(errors, 'roomName', translate('newRoomPage.roomAlreadyExistsError'));
             } else if (values.roomName.length > CONST.TITLE_CHARACTER_LIMIT) {
-                ErrorUtils.addErrorMessage(errors, 'roomName', ['common.error.characterLimitExceedCounter', {length: values.roomName.length, limit: CONST.TITLE_CHARACTER_LIMIT}]);
+                ErrorUtils.addErrorMessage(errors, 'roomName', translate('common.error.characterLimitExceedCounter', {length: values.roomName.length, limit: CONST.TITLE_CHARACTER_LIMIT}));
             }
 
-            const descriptionLength = ReportUtils.getCommentLength(values.reportDescription);
+            const descriptionLength = ReportUtils.getCommentLength(values.reportDescription, {policyID});
             if (descriptionLength > CONST.REPORT_DESCRIPTION.MAX_LENGTH) {
-                ErrorUtils.addErrorMessage(errors, 'reportDescription', [
-                    'common.error.characterLimitExceedCounter',
-                    {length: descriptionLength, limit: CONST.REPORT_DESCRIPTION.MAX_LENGTH},
-                ]);
+                ErrorUtils.addErrorMessage(
+                    errors,
+                    'reportDescription',
+                    translate('common.error.characterLimitExceedCounter', {length: descriptionLength, limit: CONST.REPORT_DESCRIPTION.MAX_LENGTH}),
+                );
             }
 
             if (!values.policyID) {
-                errors.policyID = 'newRoomPage.pleaseSelectWorkspace';
+                errors.policyID = translate('newRoomPage.pleaseSelectWorkspace');
             }
 
             return errors;
         },
-        [reports],
+        [reports, policyID, translate],
     );
 
     const writeCapabilityOptions = useMemo(
@@ -227,8 +228,8 @@ function WorkspaceNewRoomPage({policies, reports, formState, session, activePoli
         <>
             <BlockingView
                 icon={Illustrations.TeleScope}
-                iconWidth={variables.emptyWorkspaceIconWidth}
-                iconHeight={variables.emptyWorkspaceIconHeight}
+                iconWidth={variables.emptyListIconWidth}
+                iconHeight={variables.emptyListIconHeight}
                 title={translate('workspace.emptyWorkspace.notFound')}
                 subtitle={translate('workspace.emptyWorkspace.description')}
                 shouldShowLink={false}
@@ -252,6 +253,8 @@ function WorkspaceNewRoomPage({policies, reports, formState, session, activePoli
             includePaddingTop={false}
             shouldEnablePickerAvoiding={false}
             testID={WorkspaceNewRoomPage.displayName}
+            // Disable the focus trap of this page to activate the parent focus trap in `NewChatSelectorPage`.
+            focusTrapSettings={{active: false}}
         >
             {({insets}) =>
                 workspaceOptions.length === 0 ? (
@@ -271,7 +274,6 @@ function WorkspaceNewRoomPage({policies, reports, formState, session, activePoli
                             validate={validate}
                             onSubmit={submit}
                             enabledWhenOffline
-                            disablePressOnEnter={false}
                         >
                             <View style={styles.mb5}>
                                 <InputWrapper
@@ -295,6 +297,7 @@ function WorkspaceNewRoomPage({policies, reports, formState, session, activePoli
                                     maxLength={CONST.REPORT_DESCRIPTION.MAX_LENGTH}
                                     autoCapitalize="none"
                                     shouldInterceptSwipe
+                                    isMarkdownEnabled
                                 />
                             </View>
                             <View style={[styles.mhn5]}>
@@ -351,12 +354,12 @@ export default withOnyx<WorkspaceNewRoomPageProps, WorkspaceNewRoomPageOnyxProps
     },
     formState: {
         key: ONYXKEYS.FORMS.NEW_ROOM_FORM,
+        initWithStoredValues: false,
     },
     session: {
         key: ONYXKEYS.SESSION,
     },
     activePolicyID: {
         key: ONYXKEYS.NVP_ACTIVE_POLICY_ID,
-        initialValue: null,
     },
 })(WorkspaceNewRoomPage);
diff --git a/src/pages/workspace/WorkspacePageWithSections.tsx b/src/pages/workspace/WorkspacePageWithSections.tsx
index 58288f213818..e46e7071333f 100644
--- a/src/pages/workspace/WorkspacePageWithSections.tsx
+++ b/src/pages/workspace/WorkspacePageWithSections.tsx
@@ -11,8 +11,8 @@ import ScreenWrapper from '@components/ScreenWrapper';
 import ScrollViewWithContext from '@components/ScrollViewWithContext';
 import useNetwork from '@hooks/useNetwork';
 import usePrevious from '@hooks/usePrevious';
+import useResponsiveLayout from '@hooks/useResponsiveLayout';
 import useThemeStyles from '@hooks/useThemeStyles';
-import useWindowDimensions from '@hooks/useWindowDimensions';
 import BankAccount from '@libs/models/BankAccount';
 import Navigation from '@libs/Navigation/Navigation';
 import * as PolicyUtils from '@libs/PolicyUtils';
@@ -82,8 +82,17 @@ type WorkspacePageWithSectionsProps = WithPolicyAndFullscreenLoadingProps &
          * */
         icon?: IconAsset;
 
+        /** Content to be added to the header */
+        headerContent?: ReactNode;
+
+        /** TestID of the component */
+        testID?: string;
+
         /** Whether the page is loading, example any other API call in progres */
         isLoading?: boolean;
+
+        /** Callback to be called when the back button is pressed */
+        onBackButtonPress?: () => void;
     };
 
 function fetchData(policyID: string, skipVBBACal?: boolean) {
@@ -106,26 +115,29 @@ function WorkspacePageWithSections({
     reimbursementAccount = CONST.REIMBURSEMENT_ACCOUNT.DEFAULT_DATA,
     route,
     shouldUseScrollView = false,
-    shouldSkipVBBACall = false,
+    shouldSkipVBBACall = true,
     shouldShowBackButton = false,
     user,
     shouldShowLoading = true,
     shouldShowOfflineIndicatorInWideScreen = false,
     shouldShowNonAdmin = false,
+    headerContent,
+    testID,
     shouldShowNotFoundPage = false,
     isLoading: isPageLoading = false,
+    onBackButtonPress,
 }: WorkspacePageWithSectionsProps) {
     const styles = useThemeStyles();
-    const policyID = route.params?.policyID ?? '';
+    const policyID = route.params?.policyID ?? '-1';
     useNetwork({onReconnect: () => fetchData(policyID, shouldSkipVBBACall)});
 
     // eslint-disable-next-line @typescript-eslint/prefer-nullish-coalescing
     const isLoading = (reimbursementAccount?.isLoading || isPageLoading) ?? true;
-    const achState = reimbursementAccount?.achData?.state ?? '';
+    const achState = reimbursementAccount?.achData?.state ?? '-1';
     const isUsingECard = user?.isUsingExpensifyCard ?? false;
     const hasVBA = achState === BankAccount.STATE.OPEN;
     const content = typeof children === 'function' ? children(hasVBA, policyID, isUsingECard) : children;
-    const {isSmallScreenWidth} = useWindowDimensions();
+    const {shouldUseNarrowLayout} = useResponsiveLayout();
     const firstRender = useRef(true);
     const isFocused = useIsFocused();
     const prevPolicy = usePrevious(policy);
@@ -152,7 +164,7 @@ function WorkspacePageWithSections({
             (!isEmptyObject(policy) && !PolicyUtils.isPolicyAdmin(policy) && !shouldShowNonAdmin) ||
             (PolicyUtils.isPendingDeletePolicy(policy) && PolicyUtils.isPendingDeletePolicy(prevPolicy))
         );
-        // eslint-disable-next-line react-hooks/exhaustive-deps
+        // eslint-disable-next-line react-compiler/react-compiler, react-hooks/exhaustive-deps
     }, [policy, shouldShowNonAdmin]);
 
     return (
@@ -160,7 +172,7 @@ function WorkspacePageWithSections({
             includeSafeAreaPaddingBottom={false}
             shouldEnablePickerAvoiding={false}
             shouldEnableMaxHeight
-            testID={WorkspacePageWithSections.displayName}
+            testID={testID ?? WorkspacePageWithSections.displayName}
             shouldShowOfflineIndicatorInWideScreen={shouldShowOfflineIndicatorInWideScreen && !shouldShow}
         >
             <FullPageNotFoundView
@@ -173,11 +185,13 @@ function WorkspacePageWithSections({
                 <HeaderWithBackButton
                     title={headerText}
                     guidesCallTaskID={guidesCallTaskID}
-                    shouldShowBackButton={isSmallScreenWidth || shouldShowBackButton}
-                    onBackButtonPress={() => Navigation.goBack(backButtonRoute)}
+                    onBackButtonPress={() => (onBackButtonPress ? onBackButtonPress() : Navigation.goBack(backButtonRoute))}
+                    shouldShowBackButton={shouldUseNarrowLayout || shouldShowBackButton}
                     icon={icon ?? undefined}
                     style={styles.headerBarDesktopHeight}
-                />
+                >
+                    {headerContent}
+                </HeaderWithBackButton>
                 {(isLoading || firstRender.current) && shouldShowLoading && isFocused ? (
                     <FullScreenLoadingIndicator style={[styles.flex1, styles.pRelative]} />
                 ) : (
diff --git a/src/pages/workspace/WorkspaceProfileAddressPage.tsx b/src/pages/workspace/WorkspaceProfileAddressPage.tsx
index 175a3611ef57..47793f7fb810 100644
--- a/src/pages/workspace/WorkspaceProfileAddressPage.tsx
+++ b/src/pages/workspace/WorkspaceProfileAddressPage.tsx
@@ -1,17 +1,14 @@
 import type {StackScreenProps} from '@react-navigation/stack';
-import React, {useCallback, useEffect, useMemo, useState} from 'react';
-import AddressForm from '@components/AddressForm';
+import React, {useMemo} from 'react';
 import type {FormOnyxValues} from '@components/Form/types';
-import HeaderWithBackButton from '@components/HeaderWithBackButton';
-import ScreenWrapper from '@components/ScreenWrapper';
 import useLocalize from '@hooks/useLocalize';
 import Navigation from '@libs/Navigation/Navigation';
 import type {SettingsNavigatorParamList} from '@libs/Navigation/types';
-import {updateAddress} from '@userActions/Policy';
-import type {Country} from '@src/CONST';
-import ONYXKEYS from '@src/ONYXKEYS';
+import AddressPage from '@pages/AddressPage';
+import {updateAddress} from '@userActions/Policy/Policy';
+import type ONYXKEYS from '@src/ONYXKEYS';
 import type SCREENS from '@src/SCREENS';
-import type {CompanyAddress} from '@src/types/onyx/Policy';
+import type {Address} from '@src/types/onyx/PrivatePersonalDetails';
 import type {WithPolicyProps} from './withPolicy';
 import withPolicy from './withPolicy';
 
@@ -21,12 +18,19 @@ type WorkspaceProfileAddressPageProps = StackScreenProps<SettingsNavigatorParamL
 
 function WorkspaceProfileAddressPage({policy}: WorkspaceProfileAddressPageProps) {
     const {translate} = useLocalize();
-    const address = useMemo(() => policy?.address, [policy]);
-    const [currentCountry, setCurrentCountry] = useState(address?.country);
-    const [[street1, street2], setStreets] = useState((address?.addressStreet ?? '').split('\n'));
-    const [state, setState] = useState(address?.state);
-    const [city, setCity] = useState(address?.city);
-    const [zipcode, setZipcode] = useState(address?.zipCode);
+    const address: Address = useMemo(() => {
+        const tempAddress = policy?.address;
+        const [street1, street2] = (tempAddress?.addressStreet ?? '').split('\n');
+        const result = {
+            street: street1?.trim() ?? '',
+            street2: street2?.trim() ?? '',
+            city: tempAddress?.city?.trim() ?? '',
+            state: tempAddress?.state?.trim() ?? '',
+            zip: tempAddress?.zipCode?.trim().toUpperCase() ?? '',
+            country: tempAddress?.country ?? '',
+        };
+        return result;
+    }, [policy]);
 
     const updatePolicyAddress = (values: FormOnyxValues<typeof ONYXKEYS.FORMS.HOME_ADDRESS_FORM>) => {
         if (!policy) {
@@ -42,68 +46,13 @@ function WorkspaceProfileAddressPage({policy}: WorkspaceProfileAddressPageProps)
         Navigation.goBack();
     };
 
-    const handleAddressChange = useCallback((value: unknown, key: unknown) => {
-        const countryValue = value as Country | '';
-        const addressKey = key as keyof CompanyAddress;
-
-        if (addressKey !== 'country' && addressKey !== 'state' && addressKey !== 'city' && addressKey !== 'zipCode') {
-            return;
-        }
-        if (addressKey === 'country') {
-            setCurrentCountry(countryValue);
-            setState('');
-            setCity('');
-            setZipcode('');
-            return;
-        }
-        if (addressKey === 'state') {
-            setState(countryValue);
-            setCity('');
-            setZipcode('');
-            return;
-        }
-        if (addressKey === 'city') {
-            setCity(countryValue);
-            setZipcode('');
-            return;
-        }
-        setZipcode(countryValue);
-    }, []);
-
-    useEffect(() => {
-        if (!address) {
-            return;
-        }
-        setStreets((address?.addressStreet ?? '').split('\n'));
-        setState(address.state);
-        setCurrentCountry(address.country);
-        setCity(address.city);
-        setZipcode(address.zipCode);
-    }, [address]);
-
     return (
-        <ScreenWrapper
-            includeSafeAreaPaddingBottom={false}
-            testID={WorkspaceProfileAddressPage.displayName}
-        >
-            <HeaderWithBackButton
-                title={translate('common.companyAddress')}
-                shouldShowBackButton
-                onBackButtonPress={() => Navigation.goBack()}
-            />
-            <AddressForm
-                formID={ONYXKEYS.FORMS.HOME_ADDRESS_FORM}
-                onSubmit={updatePolicyAddress}
-                submitButtonText={translate('common.save')}
-                city={city}
-                country={currentCountry}
-                onAddressChanged={handleAddressChange}
-                state={state}
-                street1={street1}
-                street2={street2}
-                zip={zipcode}
-            />
-        </ScreenWrapper>
+        <AddressPage
+            address={address}
+            isLoadingApp={false}
+            updateAddress={updatePolicyAddress}
+            title={translate('common.companyAddress')}
+        />
     );
 }
 
diff --git a/src/pages/workspace/WorkspaceProfileCurrencyPage.tsx b/src/pages/workspace/WorkspaceProfileCurrencyPage.tsx
index 8d00975c7494..85d66db58a88 100644
--- a/src/pages/workspace/WorkspaceProfileCurrencyPage.tsx
+++ b/src/pages/workspace/WorkspaceProfileCurrencyPage.tsx
@@ -6,7 +6,7 @@ import ScreenWrapper from '@components/ScreenWrapper';
 import useLocalize from '@hooks/useLocalize';
 import Navigation from '@libs/Navigation/Navigation';
 import * as PolicyUtils from '@libs/PolicyUtils';
-import * as Policy from '@userActions/Policy';
+import * as Policy from '@userActions/Policy/Policy';
 import CONST from '@src/CONST';
 import {isEmptyObject} from '@src/types/utils/EmptyObject';
 import AccessOrNotFoundWrapper from './AccessOrNotFoundWrapper';
@@ -19,13 +19,13 @@ function WorkspaceProfileCurrencyPage({policy}: WorkspaceProfileCurrencyPageProp
     const {translate} = useLocalize();
 
     const onSelectCurrency = (item: CurrencyListItem) => {
-        Policy.updateGeneralSettings(policy?.id ?? '', policy?.name ?? '', item.currencyCode);
-        Navigation.goBack();
+        Policy.updateGeneralSettings(policy?.id ?? '-1', policy?.name ?? '', item.currencyCode);
+        Navigation.setNavigationActionToMicrotaskQueue(Navigation.goBack);
     };
 
     return (
         <AccessOrNotFoundWrapper
-            policyID={policy?.id ?? ''}
+            policyID={policy?.id ?? '-1'}
             accessVariants={[CONST.POLICY.ACCESS_VARIANTS.ADMIN]}
             fullPageNotFoundViewProps={{onLinkPress: PolicyUtils.goBackFromInvalidPolicy, subtitleKey: isEmptyObject(policy) ? undefined : 'workspace.common.notAuthorized'}}
         >
diff --git a/src/pages/workspace/WorkspaceProfileDescriptionPage.tsx b/src/pages/workspace/WorkspaceProfileDescriptionPage.tsx
index 00b11bf64697..09c4dce72e51 100644
--- a/src/pages/workspace/WorkspaceProfileDescriptionPage.tsx
+++ b/src/pages/workspace/WorkspaceProfileDescriptionPage.tsx
@@ -1,5 +1,4 @@
-import ExpensiMark from 'expensify-common/lib/ExpensiMark';
-import React, {useCallback, useState} from 'react';
+import React, {useCallback, useRef, useState} from 'react';
 import {Keyboard, View} from 'react-native';
 import FormProvider from '@components/Form/FormProvider';
 import InputWrapper from '@components/Form/InputWrapper';
@@ -12,9 +11,10 @@ import useLocalize from '@hooks/useLocalize';
 import useThemeStyles from '@hooks/useThemeStyles';
 import * as ErrorUtils from '@libs/ErrorUtils';
 import Navigation from '@libs/Navigation/Navigation';
+import Parser from '@libs/Parser';
 import updateMultilineInputRange from '@libs/updateMultilineInputRange';
 import variables from '@styles/variables';
-import * as Policy from '@userActions/Policy';
+import * as Policy from '@userActions/Policy/Policy';
 import CONST from '@src/CONST';
 import ONYXKEYS from '@src/ONYXKEYS';
 import AccessOrNotFoundWrapper from './AccessOrNotFoundWrapper';
@@ -23,17 +23,16 @@ import type {WithPolicyProps} from './withPolicy';
 
 type Props = WithPolicyProps;
 
-const parser = new ExpensiMark();
-
 function WorkspaceProfileDescriptionPage({policy}: Props) {
     const styles = useThemeStyles();
     const {translate} = useLocalize();
+    const isInputInitializedRef = useRef(false);
     const [description, setDescription] = useState(() =>
-        parser.htmlToMarkdown(
+        Parser.htmlToMarkdown(
             // policy?.description can be an empty string
             // eslint-disable-next-line @typescript-eslint/prefer-nullish-coalescing
             policy?.description ||
-                parser.replace(
+                Parser.replace(
                     translate('workspace.common.welcomeNote', {
                         workspaceName: policy?.name ?? '',
                     }),
@@ -45,15 +44,18 @@ function WorkspaceProfileDescriptionPage({policy}: Props) {
      * @param {Object} values - form input values passed by the Form component
      * @returns {Boolean}
      */
-    const validate = useCallback((values: FormOnyxValues<typeof ONYXKEYS.FORMS.WORKSPACE_DESCRIPTION_FORM>) => {
-        const errors = {};
+    const validate = useCallback(
+        (values: FormOnyxValues<typeof ONYXKEYS.FORMS.WORKSPACE_DESCRIPTION_FORM>) => {
+            const errors = {};
 
-        if (values.description.length > CONST.DESCRIPTION_LIMIT) {
-            ErrorUtils.addErrorMessage(errors, 'description', ['common.error.characterLimitExceedCounter', {length: values.description.length, limit: CONST.DESCRIPTION_LIMIT}]);
-        }
+            if (values.description.length > CONST.DESCRIPTION_LIMIT) {
+                ErrorUtils.addErrorMessage(errors, 'description', translate('common.error.characterLimitExceedCounter', {length: values.description.length, limit: CONST.DESCRIPTION_LIMIT}));
+            }
 
-        return errors;
-    }, []);
+            return errors;
+        },
+        [translate],
+    );
 
     const submit = useCallback(
         (values: FormOnyxValues<typeof ONYXKEYS.FORMS.WORKSPACE_DESCRIPTION_FORM>) => {
@@ -70,7 +72,7 @@ function WorkspaceProfileDescriptionPage({policy}: Props) {
 
     return (
         <AccessOrNotFoundWrapper
-            policyID={policy?.id ?? ''}
+            policyID={policy?.id ?? '-1'}
             accessVariants={[CONST.POLICY.ACCESS_VARIANTS.ADMIN]}
         >
             <ScreenWrapper
@@ -108,7 +110,10 @@ function WorkspaceProfileDescriptionPage({policy}: Props) {
                             autoGrowHeight
                             isMarkdownEnabled
                             ref={(el: BaseTextInputRef | null): void => {
-                                updateMultilineInputRange(el);
+                                if (!isInputInitializedRef.current) {
+                                    updateMultilineInputRange(el);
+                                }
+                                isInputInitializedRef.current = true;
                             }}
                         />
                     </View>
diff --git a/src/pages/workspace/WorkspaceProfilePage.tsx b/src/pages/workspace/WorkspaceProfilePage.tsx
index 02b41518533f..8cd5c7c1127b 100644
--- a/src/pages/workspace/WorkspaceProfilePage.tsx
+++ b/src/pages/workspace/WorkspaceProfilePage.tsx
@@ -1,9 +1,10 @@
-import ExpensiMark from 'expensify-common/lib/ExpensiMark';
+import {useFocusEffect} from '@react-navigation/native';
+import type {StackScreenProps} from '@react-navigation/stack';
 import React, {useCallback, useState} from 'react';
 import type {ImageStyle, StyleProp} from 'react-native';
 import {Image, StyleSheet, View} from 'react-native';
 import type {OnyxEntry} from 'react-native-onyx';
-import {withOnyx} from 'react-native-onyx';
+import {useOnyx, withOnyx} from 'react-native-onyx';
 import Avatar from '@components/Avatar';
 import AvatarWithImagePicker from '@components/AvatarWithImagePicker';
 import Button from '@components/Button';
@@ -13,46 +14,51 @@ import * as Illustrations from '@components/Icon/Illustrations';
 import MenuItemWithTopDescription from '@components/MenuItemWithTopDescription';
 import OfflineWithFeedback from '@components/OfflineWithFeedback';
 import Section from '@components/Section';
-import Text from '@components/Text';
 import useActiveWorkspace from '@hooks/useActiveWorkspace';
 import useLocalize from '@hooks/useLocalize';
+import useNetwork from '@hooks/useNetwork';
 import usePermissions from '@hooks/usePermissions';
+import useResponsiveLayout from '@hooks/useResponsiveLayout';
 import useThemeIllustrations from '@hooks/useThemeIllustrations';
 import useThemeStyles from '@hooks/useThemeStyles';
-import useWindowDimensions from '@hooks/useWindowDimensions';
 import * as ErrorUtils from '@libs/ErrorUtils';
 import Navigation from '@libs/Navigation/Navigation';
+import type {FullScreenNavigatorParamList} from '@libs/Navigation/types';
+import Parser from '@libs/Parser';
 import * as PolicyUtils from '@libs/PolicyUtils';
 import * as ReportUtils from '@libs/ReportUtils';
 import StringUtils from '@libs/StringUtils';
 import * as UserUtils from '@libs/UserUtils';
-import * as Policy from '@userActions/Policy';
+import * as Policy from '@userActions/Policy/Policy';
 import CONST from '@src/CONST';
 import ONYXKEYS from '@src/ONYXKEYS';
 import ROUTES from '@src/ROUTES';
+import type SCREENS from '@src/SCREENS';
 import type * as OnyxTypes from '@src/types/onyx';
 import {isEmptyObject} from '@src/types/utils/EmptyObject';
-import withPolicy from './withPolicy';
 import type {WithPolicyProps} from './withPolicy';
+import withPolicy from './withPolicy';
 import WorkspacePageWithSections from './WorkspacePageWithSections';
 
-type WorkSpaceProfilePageOnyxProps = {
+type WorkspaceProfilePageOnyxProps = {
     /** Constant, list of available currencies */
     currencyList: OnyxEntry<OnyxTypes.CurrencyList>;
 };
 
-type WorkSpaceProfilePageProps = WithPolicyProps & WorkSpaceProfilePageOnyxProps;
+type WorkspaceProfilePageProps = WithPolicyProps & WorkspaceProfilePageOnyxProps & StackScreenProps<FullScreenNavigatorParamList, typeof SCREENS.WORKSPACE.PROFILE>;
 
-const parser = new ExpensiMark();
-
-function WorkspaceProfilePage({policy, currencyList = {}, route}: WorkSpaceProfilePageProps) {
+function WorkspaceProfilePage({policyDraft, policy: policyProp, currencyList = {}, route}: WorkspaceProfilePageProps) {
     const styles = useThemeStyles();
     const {translate} = useLocalize();
-    const {isSmallScreenWidth} = useWindowDimensions();
+    const {shouldUseNarrowLayout} = useResponsiveLayout();
     const illustrations = useThemeIllustrations();
     const {activeWorkspaceID, setActiveWorkspaceID} = useActiveWorkspace();
     const {canUseSpotnanaTravel} = usePermissions();
 
+    const [currentUserAccountID = -1] = useOnyx(ONYXKEYS.SESSION, {selector: (session) => session?.accountID});
+
+    // When we create a new workspace, the policy prop will be empty on the first render. Therefore, we have to use policyDraft until policy has been set in Onyx.
+    const policy = policyDraft?.id ? policyDraft : policyProp;
     const outputCurrency = policy?.outputCurrency ?? '';
     const currencySymbol = currencyList?.[outputCurrency]?.symbol ?? '';
     const formattedCurrency = !isEmptyObject(policy) && !isEmptyObject(currencyList) ? `${outputCurrency} - ${currencySymbol}` : '';
@@ -63,24 +69,43 @@ function WorkspaceProfilePage({policy, currencyList = {}, route}: WorkSpaceProfi
             ? `${street1?.trim()}, ${street2 ? `${street2.trim()}, ` : ''}${policy.address.city}, ${policy.address.state} ${policy.address.zipCode ?? ''}`
             : '';
 
-    const onPressCurrency = useCallback(() => Navigation.navigate(ROUTES.WORKSPACE_PROFILE_CURRENCY.getRoute(policy?.id ?? '')), [policy?.id]);
-    const onPressAddress = useCallback(() => Navigation.navigate(ROUTES.WORKSPACE_PROFILE_ADDRESS.getRoute(policy?.id ?? '')), [policy?.id]);
-    const onPressName = useCallback(() => Navigation.navigate(ROUTES.WORKSPACE_PROFILE_NAME.getRoute(policy?.id ?? '')), [policy?.id]);
-    const onPressDescription = useCallback(() => Navigation.navigate(ROUTES.WORKSPACE_PROFILE_DESCRIPTION.getRoute(policy?.id ?? '')), [policy?.id]);
-    const onPressShare = useCallback(() => Navigation.navigate(ROUTES.WORKSPACE_PROFILE_SHARE.getRoute(policy?.id ?? '')), [policy?.id]);
+    const onPressCurrency = useCallback(() => Navigation.navigate(ROUTES.WORKSPACE_PROFILE_CURRENCY.getRoute(policy?.id ?? '-1')), [policy?.id]);
+    const onPressAddress = useCallback(() => Navigation.navigate(ROUTES.WORKSPACE_PROFILE_ADDRESS.getRoute(policy?.id ?? '-1')), [policy?.id]);
+    const onPressName = useCallback(() => Navigation.navigate(ROUTES.WORKSPACE_PROFILE_NAME.getRoute(policy?.id ?? '-1')), [policy?.id]);
+    const onPressDescription = useCallback(() => Navigation.navigate(ROUTES.WORKSPACE_PROFILE_DESCRIPTION.getRoute(policy?.id ?? '-1')), [policy?.id]);
+    const onPressShare = useCallback(() => Navigation.navigate(ROUTES.WORKSPACE_PROFILE_SHARE.getRoute(policy?.id ?? '-1')), [policy?.id]);
 
     const policyName = policy?.name ?? '';
     const policyDescription =
         // policy?.description can be an empty string
         // eslint-disable-next-line @typescript-eslint/prefer-nullish-coalescing
         policy?.description ||
-        parser.replace(
+        Parser.replace(
             translate('workspace.common.welcomeNote', {
                 workspaceName: policy?.name ?? '',
             }),
         );
     const readOnly = !PolicyUtils.isPolicyAdmin(policy);
-    const imageStyle: StyleProp<ImageStyle> = isSmallScreenWidth ? [styles.mhv12, styles.mhn5, styles.mbn5] : [styles.mhv8, styles.mhn8, styles.mbn5];
+    const isOwner = PolicyUtils.isPolicyOwner(policy, currentUserAccountID);
+    const imageStyle: StyleProp<ImageStyle> = shouldUseNarrowLayout ? [styles.mhv12, styles.mhn5, styles.mbn5] : [styles.mhv8, styles.mhn8, styles.mbn5];
+    const shouldShowAddress = !readOnly || formattedAddress;
+
+    const fetchPolicyData = useCallback(() => {
+        if (policyDraft?.id) {
+            return;
+        }
+        Policy.openPolicyProfilePage(route.params.policyID);
+    }, [policyDraft?.id, route.params.policyID]);
+
+    useNetwork({onReconnect: fetchPolicyData});
+
+    // We have the same focus effect in the WorkspaceInitialPage, this way we can get the policy data in narrow
+    // as well as in the wide layout when looking at policy settings.
+    useFocusEffect(
+        useCallback(() => {
+            fetchPolicyData();
+        }, [fetchPolicyData]),
+    );
 
     const DefaultAvatar = useCallback(
         () => (
@@ -92,7 +117,7 @@ function WorkspaceProfilePage({policy, currencyList = {}, route}: WorkSpaceProfi
                 fallbackIcon={Expensicons.FallbackWorkspaceAvatar}
                 size={CONST.AVATAR_SIZE.XLARGE}
                 name={policyName}
-                accountID={policy?.id ?? ''}
+                avatarID={policy?.id}
                 type={CONST.ICON_TYPE_WORKSPACE}
             />
         ),
@@ -115,19 +140,22 @@ function WorkspaceProfilePage({policy, currencyList = {}, route}: WorkSpaceProfi
             Navigation.navigateWithSwitchPolicyID({policyID: undefined});
         }
     }, [policy?.id, policyName, activeWorkspaceID, setActiveWorkspaceID]);
+
     return (
         <WorkspacePageWithSections
             headerText={translate('workspace.common.profile')}
             route={route}
             guidesCallTaskID={CONST.GUIDES_CALL_TASK_IDS.WORKSPACE_PROFILE}
-            shouldShowLoading={false}
+            // When we create a new workspaces, the policy prop will not be set on the first render. Therefore, we have to delay rendering until it has been set in Onyx.
+            shouldShowLoading={policy === undefined}
             shouldUseScrollView
             shouldShowOfflineIndicatorInWideScreen
             shouldShowNonAdmin
             icon={Illustrations.House}
+            shouldShowNotFoundPage={policy === undefined}
         >
             {(hasVBA?: boolean) => (
-                <View style={[styles.flex1, styles.mt3, isSmallScreenWidth ? styles.workspaceSectionMobile : styles.workspaceSection]}>
+                <View style={[styles.flex1, styles.mt3, shouldUseNarrowLayout ? styles.workspaceSectionMobile : styles.workspaceSection]}>
                     <Section
                         isCentralPane
                         title=""
@@ -138,8 +166,9 @@ function WorkspaceProfilePage({policy, currencyList = {}, route}: WorkSpaceProfi
                             resizeMode="cover"
                         />
                         <AvatarWithImagePicker
-                            onViewPhotoPress={() => Navigation.navigate(ROUTES.WORKSPACE_AVATAR.getRoute(policy?.id ?? ''))}
+                            onViewPhotoPress={() => Navigation.navigate(ROUTES.WORKSPACE_AVATAR.getRoute(policy?.id ?? '-1'))}
                             source={policy?.avatarURL ?? ''}
+                            avatarID={policy?.id}
                             size={CONST.AVATAR_SIZE.XLARGE}
                             avatarStyle={styles.avatarXLarge}
                             enablePreview
@@ -147,19 +176,19 @@ function WorkspaceProfilePage({policy, currencyList = {}, route}: WorkSpaceProfi
                             type={CONST.ICON_TYPE_WORKSPACE}
                             fallbackIcon={Expensicons.FallbackWorkspaceAvatar}
                             style={[
-                                policy?.errorFields?.avatarURL ?? isSmallScreenWidth ? styles.mb1 : styles.mb3,
-                                isSmallScreenWidth ? styles.mtn17 : styles.mtn20,
+                                policy?.errorFields?.avatarURL ?? shouldUseNarrowLayout ? styles.mb1 : styles.mb3,
+                                shouldUseNarrowLayout ? styles.mtn17 : styles.mtn20,
                                 styles.alignItemsStart,
                                 styles.sectionMenuItemTopDescription,
                             ]}
                             editIconStyle={styles.smallEditIconWorkspace}
                             isUsingDefaultAvatar={!policy?.avatarURL ?? false}
-                            onImageSelected={(file) => Policy.updateWorkspaceAvatar(policy?.id ?? '', file as File)}
-                            onImageRemoved={() => Policy.deleteWorkspaceAvatar(policy?.id ?? '')}
+                            onImageSelected={(file) => Policy.updateWorkspaceAvatar(policy?.id ?? '-1', file as File)}
+                            onImageRemoved={() => Policy.deleteWorkspaceAvatar(policy?.id ?? '-1')}
                             editorMaskImage={Expensicons.ImageCropSquareMask}
                             pendingAction={policy?.pendingFields?.avatarURL}
                             errors={policy?.errorFields?.avatarURL}
-                            onErrorClose={() => Policy.clearAvatarErrors(policy?.id ?? '')}
+                            onErrorClose={() => Policy.clearAvatarErrors(policy?.id ?? '-1')}
                             previewSource={UserUtils.getFullSizeAvatar(policy?.avatarURL ?? '')}
                             headerTitle={translate('workspace.common.workspaceAvatar')}
                             originalFileName={policy?.originalFileName}
@@ -167,14 +196,14 @@ function WorkspaceProfilePage({policy, currencyList = {}, route}: WorkSpaceProfi
                             disabledStyle={styles.cursorDefault}
                             errorRowStyles={styles.mt3}
                         />
-                        <OfflineWithFeedback pendingAction={policy?.pendingFields?.generalSettings}>
+                        <OfflineWithFeedback pendingAction={policy?.pendingFields?.name}>
                             <MenuItemWithTopDescription
                                 title={policyName}
                                 titleStyle={styles.workspaceTitleStyle}
                                 description={translate('workspace.editor.nameInputLabel')}
                                 shouldShowRightIcon={!readOnly}
                                 disabled={readOnly}
-                                wrapperStyle={[styles.sectionMenuItemTopDescription, isSmallScreenWidth ? styles.mt3 : {}]}
+                                wrapperStyle={[styles.sectionMenuItemTopDescription, shouldUseNarrowLayout ? styles.mt3 : {}]}
                                 onPress={onPressName}
                                 shouldGreyOutWhenDisabled={false}
                                 shouldUseDefaultCursorWhenDisabled
@@ -184,7 +213,7 @@ function WorkspaceProfilePage({policy, currencyList = {}, route}: WorkSpaceProfi
                             <OfflineWithFeedback
                                 pendingAction={policy?.pendingFields?.description}
                                 errors={ErrorUtils.getLatestErrorField(policy ?? {}, CONST.POLICY.COLLECTION_KEYS.DESCRIPTION)}
-                                onClose={() => Policy.clearPolicyErrorField(policy?.id ?? '', CONST.POLICY.COLLECTION_KEYS.DESCRIPTION)}
+                                onClose={() => Policy.clearPolicyErrorField(policy?.id ?? '-1', CONST.POLICY.COLLECTION_KEYS.DESCRIPTION)}
                             >
                                 <MenuItemWithTopDescription
                                     title={policyDescription}
@@ -200,9 +229,9 @@ function WorkspaceProfilePage({policy, currencyList = {}, route}: WorkSpaceProfi
                             </OfflineWithFeedback>
                         )}
                         <OfflineWithFeedback
-                            pendingAction={policy?.pendingFields?.generalSettings}
+                            pendingAction={policy?.pendingFields?.outputCurrency}
                             errors={ErrorUtils.getLatestErrorField(policy ?? {}, CONST.POLICY.COLLECTION_KEYS.GENERAL_SETTINGS)}
-                            onClose={() => Policy.clearPolicyErrorField(policy?.id ?? '', CONST.POLICY.COLLECTION_KEYS.GENERAL_SETTINGS)}
+                            onClose={() => Policy.clearPolicyErrorField(policy?.id ?? '-1', CONST.POLICY.COLLECTION_KEYS.GENERAL_SETTINGS)}
                             errorRowStyles={[styles.mt2]}
                         >
                             <View>
@@ -215,14 +244,12 @@ function WorkspaceProfilePage({policy, currencyList = {}, route}: WorkSpaceProfi
                                     onPress={onPressCurrency}
                                     shouldGreyOutWhenDisabled={false}
                                     shouldUseDefaultCursorWhenDisabled
+                                    hintText={hasVBA ? translate('workspace.editor.currencyInputDisabledText') : translate('workspace.editor.currencyInputHelpText')}
                                 />
-                                <Text style={[styles.textLabel, styles.colorMuted, styles.mt1, styles.mh5, styles.sectionMenuItemTopDescription]}>
-                                    {hasVBA ? translate('workspace.editor.currencyInputDisabledText') : translate('workspace.editor.currencyInputHelpText')}
-                                </Text>
                             </View>
                         </OfflineWithFeedback>
-                        {canUseSpotnanaTravel && (
-                            <OfflineWithFeedback pendingAction={policy?.pendingFields?.generalSettings}>
+                        {canUseSpotnanaTravel && shouldShowAddress && (
+                            <OfflineWithFeedback pendingAction={policy?.pendingFields?.address}>
                                 <View>
                                     <MenuItemWithTopDescription
                                         title={formattedAddress}
@@ -246,14 +273,16 @@ function WorkspaceProfilePage({policy, currencyList = {}, route}: WorkSpaceProfi
                                     medium
                                     icon={Expensicons.QrCode}
                                 />
-                                <Button
-                                    accessibilityLabel={translate('common.delete')}
-                                    text={translate('common.delete')}
-                                    style={[styles.ml2]}
-                                    onPress={() => setIsDeleteModalOpen(true)}
-                                    medium
-                                    icon={Expensicons.Trashcan}
-                                />
+                                {isOwner && (
+                                    <Button
+                                        accessibilityLabel={translate('common.delete')}
+                                        text={translate('common.delete')}
+                                        style={[styles.ml2]}
+                                        onPress={() => setIsDeleteModalOpen(true)}
+                                        medium
+                                        icon={Expensicons.Trashcan}
+                                    />
+                                )}
                             </View>
                         )}
                     </Section>
@@ -276,7 +305,7 @@ function WorkspaceProfilePage({policy, currencyList = {}, route}: WorkSpaceProfi
 WorkspaceProfilePage.displayName = 'WorkspaceProfilePage';
 
 export default withPolicy(
-    withOnyx<WorkSpaceProfilePageProps, WorkSpaceProfilePageOnyxProps>({
+    withOnyx<WorkspaceProfilePageProps, WorkspaceProfilePageOnyxProps>({
         currencyList: {key: ONYXKEYS.CURRENCY_LIST},
     })(WorkspaceProfilePage),
 );
diff --git a/src/pages/workspace/WorkspaceProfileSharePage.tsx b/src/pages/workspace/WorkspaceProfileSharePage.tsx
index 1d7ec8c50e29..16a076205ad3 100644
--- a/src/pages/workspace/WorkspaceProfileSharePage.tsx
+++ b/src/pages/workspace/WorkspaceProfileSharePage.tsx
@@ -1,7 +1,6 @@
-import React, {useRef} from 'react';
+import React, {useMemo, useRef} from 'react';
 import {View} from 'react-native';
 import type {ImageSourcePropType} from 'react-native';
-import expensifyLogo from '@assets/images/expensify-logo-round-transparent.png';
 import ContextMenuItem from '@components/ContextMenuItem';
 import HeaderWithBackButton from '@components/HeaderWithBackButton';
 import * as Expensicons from '@components/Icon/Expensicons';
@@ -10,12 +9,16 @@ import QRShare from '@components/QRShare';
 import type {QRShareHandle} from '@components/QRShare/types';
 import ScreenWrapper from '@components/ScreenWrapper';
 import ScrollView from '@components/ScrollView';
+import Text from '@components/Text';
+import TextLink from '@components/TextLink';
 import useEnvironment from '@hooks/useEnvironment';
 import useLocalize from '@hooks/useLocalize';
+import useResponsiveLayout from '@hooks/useResponsiveLayout';
+import useStyleUtils from '@hooks/useStyleUtils';
 import useThemeStyles from '@hooks/useThemeStyles';
-import useWindowDimensions from '@hooks/useWindowDimensions';
 import Clipboard from '@libs/Clipboard';
 import Navigation from '@libs/Navigation/Navigation';
+import * as ReportUtils from '@libs/ReportUtils';
 import * as Url from '@libs/Url';
 import CONST from '@src/CONST';
 import ROUTES from '@src/ROUTES';
@@ -25,22 +28,40 @@ import type {WithPolicyProps} from './withPolicy';
 
 function WorkspaceProfileSharePage({policy}: WithPolicyProps) {
     const themeStyles = useThemeStyles();
+    const StyleUtils = useStyleUtils();
     const {translate} = useLocalize();
     const {environmentURL} = useEnvironment();
     const qrCodeRef = useRef<QRShareHandle>(null);
-    const {isSmallScreenWidth} = useWindowDimensions();
+    const {shouldUseNarrowLayout} = useResponsiveLayout();
     const session = useSession();
 
     const policyName = policy?.name ?? '';
-    const id = policy?.id ?? '';
+    const policyID = policy?.id ?? '-1';
     const adminEmail = session?.email ?? '';
     const urlWithTrailingSlash = Url.addTrailingForwardSlash(environmentURL);
 
-    const url = `${urlWithTrailingSlash}${ROUTES.WORKSPACE_JOIN_USER.getRoute(id, adminEmail)}`;
+    const url = `${urlWithTrailingSlash}${ROUTES.WORKSPACE_JOIN_USER.getRoute(policyID, adminEmail)}`;
+
+    const hasAvatar = !!policy?.avatarURL;
+    const logo = hasAvatar ? (policy?.avatarURL as ImageSourcePropType) : undefined;
+
+    const defaultWorkspaceAvatar = ReportUtils.getDefaultWorkspaceAvatar(policyName) || Expensicons.FallbackAvatar;
+    const defaultWorkspaceAvatarColors = StyleUtils.getDefaultWorkspaceAvatarColor(policyID);
+
+    const svgLogo = !hasAvatar ? defaultWorkspaceAvatar : undefined;
+    const logoBackgroundColor = !hasAvatar ? defaultWorkspaceAvatarColors.backgroundColor?.toString() : undefined;
+    const svgLogoFillColor = !hasAvatar ? defaultWorkspaceAvatarColors.fill : undefined;
+
+    const adminRoom = useMemo(() => {
+        if (!policy?.id) {
+            return undefined;
+        }
+        return ReportUtils.getRoom(CONST.REPORT.CHAT_TYPE.POLICY_ADMINS, policy?.id);
+    }, [policy?.id]);
 
     return (
         <AccessOrNotFoundWrapper
-            policyID={id}
+            policyID={policyID}
             accessVariants={[CONST.POLICY.ACCESS_VARIANTS.ADMIN]}
         >
             <ScreenWrapper
@@ -51,26 +72,49 @@ function WorkspaceProfileSharePage({policy}: WithPolicyProps) {
                     title={translate('common.share')}
                     onBackButtonPress={Navigation.goBack}
                 />
-                <ScrollView style={[themeStyles.flex1, themeStyles.pt2]}>
-                    <View style={[themeStyles.flex1, isSmallScreenWidth ? themeStyles.workspaceSectionMobile : themeStyles.workspaceSection]}>
+                <ScrollView style={[themeStyles.flex1, themeStyles.pt3]}>
+                    <View style={[themeStyles.flex1, shouldUseNarrowLayout ? themeStyles.workspaceSectionMobile : themeStyles.workspaceSection]}>
+                        <View style={[themeStyles.mh5]}>
+                            <Text style={[themeStyles.textHeadlineH1, themeStyles.mb2]}>{translate('workspace.common.shareNote.header')}</Text>
+                        </View>
+                        <View style={[themeStyles.mh5, themeStyles.mb9]}>
+                            <Text style={[themeStyles.textNormal]}>
+                                {translate('workspace.common.shareNote.content.firstPart')}{' '}
+                                <TextLink
+                                    style={themeStyles.link}
+                                    onPress={() => {
+                                        if (!adminRoom?.reportID) {
+                                            return;
+                                        }
+                                        Navigation.navigate(ROUTES.REPORT_WITH_ID.getRoute(adminRoom.reportID));
+                                    }}
+                                >
+                                    {CONST.REPORT.WORKSPACE_CHAT_ROOMS.ADMINS}
+                                </TextLink>{' '}
+                                {translate('workspace.common.shareNote.content.secondPart')}
+                            </Text>
+                        </View>
+
                         <View style={[themeStyles.workspaceSectionMobile, themeStyles.ph9]}>
-                            {/* 
+                            {/*
                             Right now QR code download button is not shown anymore
                             This is a temporary measure because right now it's broken because of the Fabric update.
                             We need to wait for react-native v0.74 to be released so react-native-view-shot gets fixed.
-                            
+
                             Please see https://github.com/Expensify/App/issues/40110 to see if it can be re-enabled.
                         */}
                             <QRShare
                                 ref={qrCodeRef}
                                 url={url}
                                 title={policyName}
-                                logo={(policy?.avatarURL ? policy.avatarURL : expensifyLogo) as ImageSourcePropType}
+                                logo={logo}
+                                svgLogo={svgLogo}
+                                logoBackgroundColor={logoBackgroundColor}
+                                svgLogoFillColor={svgLogoFillColor}
                                 logoRatio={CONST.QR.DEFAULT_LOGO_SIZE_RATIO}
                                 logoMarginRatio={CONST.QR.DEFAULT_LOGO_MARGIN_RATIO}
                             />
                         </View>
-
                         <View style={[themeStyles.mt3, themeStyles.ph4]}>
                             <ContextMenuItem
                                 isAnonymousAction
diff --git a/src/pages/workspace/WorkspaceResetBankAccountModal.tsx b/src/pages/workspace/WorkspaceResetBankAccountModal.tsx
index e7a8ce307816..5856c71d0a43 100644
--- a/src/pages/workspace/WorkspaceResetBankAccountModal.tsx
+++ b/src/pages/workspace/WorkspaceResetBankAccountModal.tsx
@@ -13,9 +13,6 @@ import type * as OnyxTypes from '@src/types/onyx';
 type WorkspaceResetBankAccountModalOnyxProps = {
     /** Session info for the currently logged in user. */
     session: OnyxEntry<OnyxTypes.Session>;
-
-    /** The user's data */
-    user: OnyxEntry<OnyxTypes.User>;
 };
 
 type WorkspaceResetBankAccountModalProps = WorkspaceResetBankAccountModalOnyxProps & {
@@ -23,7 +20,7 @@ type WorkspaceResetBankAccountModalProps = WorkspaceResetBankAccountModalOnyxPro
     reimbursementAccount: OnyxEntry<OnyxTypes.ReimbursementAccount>;
 };
 
-function WorkspaceResetBankAccountModal({reimbursementAccount, session, user}: WorkspaceResetBankAccountModalProps) {
+function WorkspaceResetBankAccountModal({reimbursementAccount, session}: WorkspaceResetBankAccountModalProps) {
     const styles = useThemeStyles();
     const {translate} = useLocalize();
     const achData = reimbursementAccount?.achData;
@@ -49,7 +46,7 @@ function WorkspaceResetBankAccountModal({reimbursementAccount, session, user}: W
             }
             danger
             onCancel={BankAccounts.cancelResetFreePlanBankAccount}
-            onConfirm={() => BankAccounts.resetFreePlanBankAccount(bankAccountID, session, achData?.policyID ?? '', user)}
+            onConfirm={() => BankAccounts.resetFreePlanBankAccount(bankAccountID, session, achData?.policyID ?? '-1')}
             shouldShowCancelButton
             isVisible
         />
@@ -62,7 +59,4 @@ export default withOnyx<WorkspaceResetBankAccountModalProps, WorkspaceResetBankA
     session: {
         key: ONYXKEYS.SESSION,
     },
-    user: {
-        key: ONYXKEYS.USER,
-    },
 })(WorkspaceResetBankAccountModal);
diff --git a/src/pages/workspace/WorkspacesListPage.tsx b/src/pages/workspace/WorkspacesListPage.tsx
index a22a3679b435..94fb454c4a2d 100755
--- a/src/pages/workspace/WorkspacesListPage.tsx
+++ b/src/pages/workspace/WorkspacesListPage.tsx
@@ -22,9 +22,9 @@ import Text from '@components/Text';
 import useActiveWorkspace from '@hooks/useActiveWorkspace';
 import useLocalize from '@hooks/useLocalize';
 import useNetwork from '@hooks/useNetwork';
+import useResponsiveLayout from '@hooks/useResponsiveLayout';
 import useTheme from '@hooks/useTheme';
 import useThemeStyles from '@hooks/useThemeStyles';
-import useWindowDimensions from '@hooks/useWindowDimensions';
 import interceptAnonymousUser from '@libs/interceptAnonymousUser';
 import localeCompare from '@libs/LocaleCompare';
 import Navigation from '@libs/Navigation/Navigation';
@@ -32,7 +32,8 @@ import * as PolicyUtils from '@libs/PolicyUtils';
 import * as ReportUtils from '@libs/ReportUtils';
 import type {AvatarSource} from '@libs/UserUtils';
 import * as App from '@userActions/App';
-import * as Policy from '@userActions/Policy';
+import * as Modal from '@userActions/Modal';
+import * as Policy from '@userActions/Policy/Policy';
 import * as Session from '@userActions/Session';
 import CONST from '@src/CONST';
 import ONYXKEYS from '@src/ONYXKEYS';
@@ -40,8 +41,6 @@ import ROUTES from '@src/ROUTES';
 import type {Policy as PolicyType, ReimbursementAccount, Report, Session as SessionType} from '@src/types/onyx';
 import type * as OnyxCommon from '@src/types/onyx/OnyxCommon';
 import {isEmptyObject} from '@src/types/utils/EmptyObject';
-import withPolicyAndFullscreenLoading from './withPolicyAndFullscreenLoading';
-import type {WithPolicyAndFullscreenLoadingProps} from './withPolicyAndFullscreenLoading';
 import WorkspacesListRow from './WorkspacesListRow';
 
 type WorkspaceItem = Required<Pick<MenuItemProps, 'title' | 'disabled'>> &
@@ -82,7 +81,7 @@ type WorkspaceListPageOnyxProps = {
     session: OnyxEntry<SessionType>;
 };
 
-type WorkspaceListPageProps = WithPolicyAndFullscreenLoadingProps & WorkspaceListPageOnyxProps;
+type WorkspaceListPageProps = WorkspaceListPageOnyxProps;
 
 const workspaceFeatures: FeatureListItem[] = [
     {
@@ -102,7 +101,7 @@ const workspaceFeatures: FeatureListItem[] = [
 /**
  * Dismisses the errors on one item
  */
-function dismissWorkspaceError(policyID: string, pendingAction: OnyxCommon.PendingAction) {
+function dismissWorkspaceError(policyID: string, pendingAction: OnyxCommon.PendingAction | undefined) {
     if (pendingAction === CONST.RED_BRICK_ROAD_PENDING_ACTION.DELETE) {
         Policy.clearDeleteWorkspaceError(policyID);
         return;
@@ -112,7 +111,8 @@ function dismissWorkspaceError(policyID: string, pendingAction: OnyxCommon.Pendi
         Policy.removeWorkspace(policyID);
         return;
     }
-    throw new Error('Not implemented');
+
+    Policy.clearErrors(policyID);
 }
 
 const stickyHeaderIndices = [0];
@@ -122,13 +122,14 @@ function WorkspacesListPage({policies, reimbursementAccount, reports, session}:
     const styles = useThemeStyles();
     const {translate} = useLocalize();
     const {isOffline} = useNetwork();
-    const {isMediumScreenWidth, isSmallScreenWidth} = useWindowDimensions();
+    const {shouldUseNarrowLayout, isMediumScreenWidth} = useResponsiveLayout();
+
     const {activeWorkspaceID, setActiveWorkspaceID} = useActiveWorkspace();
 
     const [isDeleteModalOpen, setIsDeleteModalOpen] = useState(false);
     const [policyIDToDelete, setPolicyIDToDelete] = useState<string>();
     const [policyNameToDelete, setPolicyNameToDelete] = useState<string>();
-    const isLessThanMediumScreen = isMediumScreenWidth || isSmallScreenWidth;
+    const isLessThanMediumScreen = isMediumScreenWidth || shouldUseNarrowLayout;
 
     const confirmDeleteAndHideModal = () => {
         if (!policyIDToDelete || !policyNameToDelete) {
@@ -157,23 +158,24 @@ function WorkspacesListPage({policies, reimbursementAccount, reports, session}:
             // In such cases, let us use the available chat report ids from the policy.
             const threeDotsMenuItems: PopoverMenuItem[] = [];
 
-            if (isAdmin) {
+            if (isOwner) {
                 threeDotsMenuItems.push({
                     icon: Expensicons.Trashcan,
                     text: translate('workspace.common.delete'),
-                    onSelected: () => {
-                        setPolicyIDToDelete(item.policyID ?? '');
-                        setPolicyNameToDelete(item.title);
-                        setIsDeleteModalOpen(true);
-                    },
+                    onSelected: () =>
+                        Modal.close(() => {
+                            setPolicyIDToDelete(item.policyID ?? '-1');
+                            setPolicyNameToDelete(item.title);
+                            setIsDeleteModalOpen(true);
+                        }),
                 });
             }
 
             if (!(isAdmin || isOwner)) {
                 threeDotsMenuItems.push({
-                    icon: Expensicons.ChatBubbles,
+                    icon: Expensicons.Exit,
                     text: translate('common.leave'),
-                    onSelected: Session.checkIfActionIsAllowed(() => Policy.leaveWorkspace(item.policyID ?? '')),
+                    onSelected: Session.checkIfActionIsAllowed(() => Policy.leaveWorkspace(item.policyID ?? '-1')),
                 });
             }
 
@@ -339,12 +341,7 @@ function WorkspacesListPage({policies, reimbursementAccount, reports, session}:
                     brickRoadIndicator: reimbursementAccountBrickRoadIndicator ?? PolicyUtils.getPolicyBrickRoadIndicatorStatus(policy),
                     pendingAction: policy.pendingAction,
                     errors: policy.errors,
-                    dismissError: () => {
-                        if (!policy.pendingAction) {
-                            return;
-                        }
-                        dismissWorkspaceError(policy.id, policy.pendingAction);
-                    },
+                    dismissError: () => dismissWorkspaceError(policy.id, policy.pendingAction),
                     disabled: policy.pendingAction === CONST.RED_BRICK_ROAD_PENDING_ACTION.DELETE,
                     iconType: policy.avatarURL ? CONST.ICON_TYPE_AVATAR : CONST.ICON_TYPE_ICON,
                     iconFill: theme.textLight,
@@ -360,6 +357,18 @@ function WorkspacesListPage({policies, reimbursementAccount, reports, session}:
             .sort((a, b) => localeCompare(a.title, b.title));
     }, [reimbursementAccount?.errors, policies, isOffline, theme.textLight, policyRooms]);
 
+    const getHeaderButton = () => (
+        <Button
+            accessibilityLabel={translate('workspace.new.newWorkspace')}
+            success
+            medium
+            text={translate('workspace.new.newWorkspace')}
+            onPress={() => interceptAnonymousUser(() => App.createWorkspaceWithPolicyDraftAndNavigateToIt())}
+            icon={Expensicons.Plus}
+            style={[shouldUseNarrowLayout && styles.flexGrow1, shouldUseNarrowLayout && styles.mb3]}
+        />
+    );
+
     if (isEmptyObject(workspaces)) {
         return (
             <ScreenWrapper
@@ -371,17 +380,13 @@ function WorkspacesListPage({policies, reimbursementAccount, reports, session}:
             >
                 <HeaderWithBackButton
                     title={translate('common.workspaces')}
-                    shouldShowBackButton={isSmallScreenWidth}
+                    shouldShowBackButton={shouldUseNarrowLayout}
                     onBackButtonPress={() => Navigation.goBack()}
+                    icon={Illustrations.BigRocket}
                 >
-                    <Button
-                        accessibilityLabel={translate('workspace.new.newWorkspace')}
-                        success
-                        medium
-                        text={translate('workspace.new.newWorkspace')}
-                        onPress={() => interceptAnonymousUser(() => App.createWorkspaceWithPolicyDraftAndNavigateToIt())}
-                    />
+                    {!shouldUseNarrowLayout && getHeaderButton()}
                 </HeaderWithBackButton>
+                {shouldUseNarrowLayout && <View style={[styles.pl5, styles.pr5]}>{getHeaderButton()}</View>}
                 <ScrollView contentContainerStyle={styles.pt3}>
                     <View style={[styles.flex1, isLessThanMediumScreen ? styles.workspaceSectionMobile : styles.workspaceSection]}>
                         <FeatureList
@@ -394,6 +399,7 @@ function WorkspacesListPage({policies, reimbursementAccount, reports, session}:
                             illustration={LottieAnimations.WorkspacePlanet}
                             // We use this style to vertically center the illustration, as the original illustration is not centered
                             illustrationStyle={styles.emptyWorkspaceIllustrationStyle}
+                            titleStyles={styles.textHeadlineH1}
                         />
                     </View>
                 </ScrollView>
@@ -410,17 +416,13 @@ function WorkspacesListPage({policies, reimbursementAccount, reports, session}:
             <View style={styles.flex1}>
                 <HeaderWithBackButton
                     title={translate('common.workspaces')}
-                    shouldShowBackButton={isSmallScreenWidth}
+                    shouldShowBackButton={shouldUseNarrowLayout}
                     onBackButtonPress={() => Navigation.goBack()}
+                    icon={Illustrations.BigRocket}
                 >
-                    <Button
-                        accessibilityLabel={translate('workspace.new.newWorkspace')}
-                        success
-                        medium
-                        text={translate('workspace.new.newWorkspace')}
-                        onPress={() => interceptAnonymousUser(() => App.createWorkspaceWithPolicyDraftAndNavigateToIt())}
-                    />
+                    {!shouldUseNarrowLayout && getHeaderButton()}
                 </HeaderWithBackButton>
+                {shouldUseNarrowLayout && <View style={[styles.pl5, styles.pr5]}>{getHeaderButton()}</View>}
                 <FlatList
                     data={workspaces}
                     renderItem={getMenuItem}
@@ -444,20 +446,18 @@ function WorkspacesListPage({policies, reimbursementAccount, reports, session}:
 
 WorkspacesListPage.displayName = 'WorkspacesListPage';
 
-export default withPolicyAndFullscreenLoading(
-    withOnyx<WorkspaceListPageProps, WorkspaceListPageOnyxProps>({
-        policies: {
-            key: ONYXKEYS.COLLECTION.POLICY,
-        },
-        // @ts-expect-error: ONYXKEYS.REIMBURSEMENT_ACCOUNT is conflicting with ONYXKEYS.FORMS.REIMBURSEMENT_ACCOUNT_FORM
-        reimbursementAccount: {
-            key: ONYXKEYS.REIMBURSEMENT_ACCOUNT,
-        },
-        reports: {
-            key: ONYXKEYS.COLLECTION.REPORT,
-        },
-        session: {
-            key: ONYXKEYS.SESSION,
-        },
-    })(WorkspacesListPage),
-);
+export default withOnyx<WorkspaceListPageProps, WorkspaceListPageOnyxProps>({
+    policies: {
+        key: ONYXKEYS.COLLECTION.POLICY,
+    },
+    // @ts-expect-error: ONYXKEYS.REIMBURSEMENT_ACCOUNT is conflicting with ONYXKEYS.FORMS.REIMBURSEMENT_ACCOUNT_FORM
+    reimbursementAccount: {
+        key: ONYXKEYS.REIMBURSEMENT_ACCOUNT,
+    },
+    reports: {
+        key: ONYXKEYS.COLLECTION.REPORT,
+    },
+    session: {
+        key: ONYXKEYS.SESSION,
+    },
+})(WorkspacesListPage);
diff --git a/src/pages/workspace/WorkspacesListRow.tsx b/src/pages/workspace/WorkspacesListRow.tsx
index a1affd935c50..ac53252829fa 100644
--- a/src/pages/workspace/WorkspacesListRow.tsx
+++ b/src/pages/workspace/WorkspacesListRow.tsx
@@ -13,9 +13,9 @@ import ThreeDotsMenu from '@components/ThreeDotsMenu';
 import type {WithCurrentUserPersonalDetailsProps} from '@components/withCurrentUserPersonalDetails';
 import withCurrentUserPersonalDetails from '@components/withCurrentUserPersonalDetails';
 import useLocalize from '@hooks/useLocalize';
+import useResponsiveLayout from '@hooks/useResponsiveLayout';
 import useTheme from '@hooks/useTheme';
 import useThemeStyles from '@hooks/useThemeStyles';
-import useWindowDimensions from '@hooks/useWindowDimensions';
 import * as PersonalDetailsUtils from '@libs/PersonalDetailsUtils';
 import type {AvatarSource} from '@libs/UserUtils';
 import type {AnchorPosition} from '@styles/index';
@@ -113,7 +113,7 @@ function WorkspacesListRow({
     const {translate} = useLocalize();
     const [threeDotsMenuPosition, setThreeDotsMenuPosition] = useState<AnchorPosition>({horizontal: 0, vertical: 0});
     const threeDotsMenuContainerRef = useRef<View>(null);
-    const {isSmallScreenWidth} = useWindowDimensions();
+    const {shouldUseNarrowLayout} = useResponsiveLayout();
 
     const ownerDetails = ownerAccountID && PersonalDetailsUtils.getPersonalDetailsByIDs([ownerAccountID], currentUserPersonalDetails.accountID)[0];
 
@@ -142,9 +142,9 @@ function WorkspacesListRow({
     const isDeleted = style && Array.isArray(style) ? style.includes(styles.offlineFeedback.deleted) : false;
 
     const ThreeDotMenuOrPendingIcon = (
-        <View style={[isNarrow && styles.mr5]}>
+        <View style={[styles.flexRow, !shouldUseNarrowLayout && styles.workspaceThreeDotMenu]}>
             {isJoinRequestPending && (
-                <View style={[styles.flexRow, styles.gap2, styles.alignItemsCenter, styles.flex1, styles.justifyContentEnd, !isNarrow && styles.pr4, isNarrow && styles.workspaceListBadge]}>
+                <View style={[styles.flexRow, styles.gap2, styles.alignItemsCenter, styles.justifyContentEnd]}>
                     <Badge
                         text={translate('workspace.common.requested')}
                         textStyles={styles.textStrong}
@@ -154,17 +154,14 @@ function WorkspacesListRow({
                 </View>
             )}
             {!isJoinRequestPending && (
-                <>
-                    <View style={[styles.flexRow, styles.flex0, styles.gap2, isNarrow && styles.mr5, styles.alignItemsCenter]}>
+                <View style={[styles.flexRow, styles.ml2, styles.gap1]}>
+                    <View style={[styles.flexRow, styles.gap2, styles.alignItemsCenter, isNarrow && styles.workspaceListRBR]}>
                         <BrickRoadIndicatorIcon brickRoadIndicator={brickRoadIndicator} />
                     </View>
-                    <View
-                        ref={threeDotsMenuContainerRef}
-                        style={[!isSmallScreenWidth && styles.workspaceThreeDotMenu]}
-                    >
+                    <View ref={threeDotsMenuContainerRef}>
                         <ThreeDotsMenu
                             onIconPress={() => {
-                                if (isSmallScreenWidth) {
+                                if (shouldUseNarrowLayout) {
                                     return;
                                 }
                                 threeDotsMenuContainerRef.current?.measureInWindow((x, y, width, height) => {
@@ -181,13 +178,13 @@ function WorkspacesListRow({
                             disabled={shouldDisableThreeDotsMenu}
                         />
                     </View>
-                </>
+                </View>
             )}
         </View>
     );
 
     return (
-        <View style={[styles.flexRow, styles.highlightBG, rowStyles, style, isWide && styles.gap5, styles.br3, styles.pv5, styles.pl5]}>
+        <View style={[styles.flexRow, styles.highlightBG, rowStyles, style, isWide && styles.gap5, styles.br3, styles.p5]}>
             <View style={[isWide ? styles.flexRow : styles.flexColumn, styles.flex1, isWide && styles.gap5]}>
                 <View style={[styles.flexRow, styles.justifyContentBetween, styles.flex1, isNarrow && styles.mb3, styles.alignItemsCenter]}>
                     <View style={[styles.flexRow, styles.gap3, styles.flex1, styles.alignItemsCenter]}>
@@ -196,7 +193,7 @@ function WorkspacesListRow({
                             size={CONST.AVATAR_SIZE.DEFAULT}
                             source={workspaceIcon}
                             fallbackIcon={fallbackWorkspaceIcon}
-                            accountID={policyID}
+                            avatarID={policyID}
                             name={title}
                             type={CONST.ICON_TYPE_WORKSPACE}
                         />
@@ -207,13 +204,15 @@ function WorkspacesListRow({
                             {title}
                         </Text>
                     </View>
-                    {isSmallScreenWidth && ThreeDotMenuOrPendingIcon}
+                    {shouldUseNarrowLayout && ThreeDotMenuOrPendingIcon}
                 </View>
-                <View style={[styles.flexRow, isWide && styles.flex1, styles.gap2, isNarrow && styles.mr5, styles.alignItemsCenter]}>
+                <View style={[styles.flexRow, isWide && styles.flex1, styles.gap2, styles.alignItemsCenter]}>
                     {!!ownerDetails && (
                         <>
                             <Avatar
                                 source={ownerDetails.avatar}
+                                avatarID={ownerDetails.accountID}
+                                type={CONST.ICON_TYPE_AVATAR}
                                 size={CONST.AVATAR_SIZE.SMALL}
                                 containerStyles={styles.workspaceOwnerAvatarWrapper}
                             />
@@ -234,7 +233,7 @@ function WorkspacesListRow({
                         </>
                     )}
                 </View>
-                <View style={[styles.flexRow, isWide && styles.flex1, styles.gap2, isNarrow && styles.mr5, styles.alignItemsCenter]}>
+                <View style={[styles.flexRow, isWide && styles.flex1, styles.gap2, styles.alignItemsCenter]}>
                     <Icon
                         src={workspaceTypeIcon(workspaceType)}
                         width={variables.workspaceTypeIconWidth}
@@ -258,7 +257,7 @@ function WorkspacesListRow({
                 </View>
             </View>
 
-            {!isSmallScreenWidth && ThreeDotMenuOrPendingIcon}
+            {!shouldUseNarrowLayout && ThreeDotMenuOrPendingIcon}
         </View>
     );
 }
diff --git a/src/pages/workspace/accounting/AccountingContext.tsx b/src/pages/workspace/accounting/AccountingContext.tsx
new file mode 100644
index 000000000000..ce5ac90fd2f1
--- /dev/null
+++ b/src/pages/workspace/accounting/AccountingContext.tsx
@@ -0,0 +1,138 @@
+import type {MutableRefObject, RefObject} from 'react';
+import React, {useContext, useMemo, useRef, useState} from 'react';
+import type {View} from 'react-native';
+import AccountingConnectionConfirmationModal from '@components/AccountingConnectionConfirmationModal';
+import useLocalize from '@hooks/useLocalize';
+import {removePolicyConnection} from '@libs/actions/connections';
+import Navigation from '@libs/Navigation/Navigation';
+import {isControlPolicy} from '@libs/PolicyUtils';
+import CONST from '@src/CONST';
+import ROUTES from '@src/ROUTES';
+import type {ConnectionName} from '@src/types/onyx/Policy';
+import type Policy from '@src/types/onyx/Policy';
+import type ChildrenProps from '@src/types/utils/ChildrenProps';
+import {getAccountingIntegrationData} from './utils';
+
+type ActiveIntegration = {
+    name: ConnectionName;
+    shouldDisconnectIntegrationBeforeConnecting?: boolean;
+    integrationToDisconnect?: ConnectionName;
+};
+
+type ActiveIntegrationState = ActiveIntegration & {key: number};
+
+type AccountingContextType = {
+    activeIntegration?: ActiveIntegration;
+    startIntegrationFlow: (activeIntegration: ActiveIntegration) => void;
+
+    /*
+     * This stores refs to integration buttons, so the PopoverMenu can be positioned correctly
+     */
+    popoverAnchorRefs: RefObject<Record<string, MutableRefObject<View | null>>>;
+};
+
+const popoverAnchorRefsInitialValue = Object.values(CONST.POLICY.CONNECTIONS.NAME).reduce((acc, key) => {
+    acc[key] = {current: null};
+    return acc;
+}, {} as Record<ConnectionName, MutableRefObject<View | null>>);
+
+const defaultAccountingContext = {
+    activeIntegration: undefined,
+    startIntegrationFlow: () => {},
+    popoverAnchorRefs: {
+        current: popoverAnchorRefsInitialValue,
+    },
+};
+
+const AccountingContext = React.createContext<AccountingContextType>(defaultAccountingContext);
+
+type AccountingContextProviderProps = ChildrenProps & {
+    policy: Policy;
+};
+
+function AccountingContextProvider({children, policy}: AccountingContextProviderProps) {
+    const popoverAnchorRefs = useRef<Record<string, MutableRefObject<View | null>>>(defaultAccountingContext.popoverAnchorRefs.current);
+    const [activeIntegration, setActiveIntegration] = useState<ActiveIntegrationState>();
+    const {translate} = useLocalize();
+    const policyID = policy.id;
+
+    const startIntegrationFlow = React.useCallback(
+        (newActiveIntegration: ActiveIntegration) => {
+            const accountingIntegrationData = getAccountingIntegrationData(newActiveIntegration.name, policyID, translate);
+            const workspaceUpgradeNavigationDetails = accountingIntegrationData?.workspaceUpgradeNavigationDetails;
+            if (workspaceUpgradeNavigationDetails && !isControlPolicy(policy)) {
+                Navigation.navigate(
+                    ROUTES.WORKSPACE_UPGRADE.getRoute(policyID, workspaceUpgradeNavigationDetails.integrationAlias, workspaceUpgradeNavigationDetails.backToAfterWorkspaceUpgradeRoute),
+                );
+                return;
+            }
+            setActiveIntegration({
+                ...newActiveIntegration,
+                key: Math.random(),
+            });
+        },
+        [policy, policyID, translate],
+    );
+
+    const closeConfirmationModal = () => {
+        setActiveIntegration((prev) => {
+            if (prev) {
+                return {
+                    ...prev,
+                    shouldDisconnectIntegrationBeforeConnecting: false,
+                    integrationToDisconnect: undefined,
+                };
+            }
+            return undefined;
+        });
+    };
+
+    const accountingContext = useMemo(
+        () => ({
+            activeIntegration,
+            startIntegrationFlow,
+            popoverAnchorRefs,
+        }),
+        [activeIntegration, startIntegrationFlow],
+    );
+
+    const renderActiveIntegration = () => {
+        if (!activeIntegration) {
+            return null;
+        }
+
+        return getAccountingIntegrationData(activeIntegration.name, policyID, translate, policy, activeIntegration.key)?.setupConnectionFlow;
+    };
+
+    const shouldShowConfirmationModal = activeIntegration?.shouldDisconnectIntegrationBeforeConnecting && activeIntegration?.integrationToDisconnect;
+
+    return (
+        <AccountingContext.Provider value={accountingContext}>
+            {children}
+            {!shouldShowConfirmationModal && renderActiveIntegration()}
+            {shouldShowConfirmationModal && activeIntegration?.integrationToDisconnect && (
+                <AccountingConnectionConfirmationModal
+                    onConfirm={() => {
+                        if (!activeIntegration?.integrationToDisconnect) {
+                            return;
+                        }
+                        removePolicyConnection(policyID, activeIntegration?.integrationToDisconnect);
+                        closeConfirmationModal();
+                    }}
+                    integrationToConnect={activeIntegration?.integrationToDisconnect}
+                    onCancel={() => {
+                        setActiveIntegration(undefined);
+                    }}
+                />
+            )}
+        </AccountingContext.Provider>
+    );
+}
+
+function useAccountingContext() {
+    return useContext(AccountingContext);
+}
+
+export default AccountingContext;
+export {AccountingContextProvider, useAccountingContext};
+export type {ActiveIntegrationState};
diff --git a/src/pages/workspace/accounting/PolicyAccountingPage.tsx b/src/pages/workspace/accounting/PolicyAccountingPage.tsx
index 0b40cd46fd3a..11c47a21f2e1 100644
--- a/src/pages/workspace/accounting/PolicyAccountingPage.tsx
+++ b/src/pages/workspace/accounting/PolicyAccountingPage.tsx
@@ -1,17 +1,16 @@
-import React, {useMemo, useRef, useState} from 'react';
+import {differenceInMinutes, isValid, parseISO} from 'date-fns';
+import React, {useEffect, useMemo, useRef, useState} from 'react';
 import {ActivityIndicator, View} from 'react-native';
-import {withOnyx} from 'react-native-onyx';
-import type {OnyxEntry} from 'react-native-onyx';
+import {useOnyx} from 'react-native-onyx';
+import Button from '@components/Button';
 import CollapsibleSection from '@components/CollapsibleSection';
 import ConfirmModal from '@components/ConfirmModal';
-import ConnectToQuickbooksOnlineButton from '@components/ConnectToQuickbooksOnlineButton';
-import ConnectToXeroButton from '@components/ConnectToXeroButton';
 import HeaderWithBackButton from '@components/HeaderWithBackButton';
 import * as Expensicons from '@components/Icon/Expensicons';
 import * as Illustrations from '@components/Icon/Illustrations';
-import type {LocaleContextProps} from '@components/LocaleContextProvider';
-import type {MenuItemProps} from '@components/MenuItem';
+import MenuItem from '@components/MenuItem';
 import MenuItemList from '@components/MenuItemList';
+import OfflineWithFeedback from '@components/OfflineWithFeedback';
 import ScreenWrapper from '@components/ScreenWrapper';
 import ScrollView from '@components/ScrollView';
 import Section from '@components/Section';
@@ -20,130 +19,187 @@ import type ThreeDotsMenuProps from '@components/ThreeDotsMenu/types';
 import useLocalize from '@hooks/useLocalize';
 import useNetwork from '@hooks/useNetwork';
 import usePermissions from '@hooks/usePermissions';
+import useResponsiveLayout from '@hooks/useResponsiveLayout';
 import useTheme from '@hooks/useTheme';
 import useThemeStyles from '@hooks/useThemeStyles';
 import useWindowDimensions from '@hooks/useWindowDimensions';
-import {removePolicyConnection} from '@libs/actions/connections';
-import {syncConnection} from '@libs/actions/connections/QuickBooksOnline';
-import {findCurrentXeroOrganization, getXeroTenants} from '@libs/PolicyUtils';
+import {getSynchronizationErrorMessage, isAuthenticationError, isConnectionUnverified, removePolicyConnection, syncConnection} from '@libs/actions/connections';
+import {
+    areSettingsInErrorFields,
+    findCurrentXeroOrganization,
+    getConnectedIntegration,
+    getCurrentSageIntacctEntityName,
+    getCurrentXeroOrganizationName,
+    getIntegrationLastSuccessfulDate,
+    getXeroTenants,
+    settingsPendingAction,
+} from '@libs/PolicyUtils';
 import Navigation from '@navigation/Navigation';
 import AccessOrNotFoundWrapper from '@pages/workspace/AccessOrNotFoundWrapper';
-import type {WithPolicyProps} from '@pages/workspace/withPolicy';
 import withPolicyConnections from '@pages/workspace/withPolicyConnections';
 import type {AnchorPosition} from '@styles/index';
+import * as Modal from '@userActions/Modal';
 import CONST from '@src/CONST';
 import ONYXKEYS from '@src/ONYXKEYS';
 import ROUTES from '@src/ROUTES';
-import type {Policy, PolicyConnectionSyncProgress} from '@src/types/onyx';
-import type {PolicyConnectionName} from '@src/types/onyx/Policy';
 import {isEmptyObject} from '@src/types/utils/EmptyObject';
-import type IconAsset from '@src/types/utils/IconAsset';
+import {AccountingContextProvider, useAccountingContext} from './AccountingContext';
+import type {MenuItemData, PolicyAccountingPageProps} from './types';
+import {getAccountingIntegrationData} from './utils';
 
-type PolicyAccountingPageOnyxProps = {
-    connectionSyncProgress: OnyxEntry<PolicyConnectionSyncProgress>;
-};
-
-type PolicyAccountingPageProps = WithPolicyProps &
-    PolicyAccountingPageOnyxProps & {
-        // This is not using OnyxEntry<OnyxTypes.Policy> because the HOC withPolicyConnections will only render this component if there is a policy
-        policy: Policy;
-    };
-
-type AccountingIntegration = {
-    title: string;
-    icon: IconAsset;
-    setupConnectionButton: React.ReactNode;
-    onImportPagePress: () => void;
-    onExportPagePress: () => void;
-    onAdvancedPagePress: () => void;
-};
-function accountingIntegrationData(
-    connectionName: PolicyConnectionName,
-    policyID: string,
-    translate: LocaleContextProps['translate'],
-    isConnectedToIntegration?: boolean,
-    integrationToDisconnect?: PolicyConnectionName,
-): AccountingIntegration | undefined {
-    switch (connectionName) {
-        case CONST.POLICY.CONNECTIONS.NAME.QBO:
-            return {
-                title: translate('workspace.accounting.qbo'),
-                icon: Expensicons.QBOSquare,
-                setupConnectionButton: (
-                    <ConnectToQuickbooksOnlineButton
-                        policyID={policyID}
-                        shouldDisconnectIntegrationBeforeConnecting={isConnectedToIntegration}
-                        integrationToDisconnect={integrationToDisconnect}
-                    />
-                ),
-                onImportPagePress: () => Navigation.navigate(ROUTES.POLICY_ACCOUNTING_QUICKBOOKS_ONLINE_IMPORT.getRoute(policyID)),
-                onExportPagePress: () => Navigation.navigate(ROUTES.POLICY_ACCOUNTING_QUICKBOOKS_ONLINE_EXPORT.getRoute(policyID)),
-                onAdvancedPagePress: () => Navigation.navigate(ROUTES.WORKSPACE_ACCOUNTING_QUICKBOOKS_ONLINE_ADVANCED.getRoute(policyID)),
-            };
-        case CONST.POLICY.CONNECTIONS.NAME.XERO:
-            return {
-                title: translate('workspace.accounting.xero'),
-                icon: Expensicons.XeroSquare,
-                setupConnectionButton: (
-                    <ConnectToXeroButton
-                        policyID={policyID}
-                        shouldDisconnectIntegrationBeforeConnecting={isConnectedToIntegration}
-                        integrationToDisconnect={integrationToDisconnect}
-                    />
-                ),
-                onImportPagePress: () => Navigation.navigate(ROUTES.POLICY_ACCOUNTING_XERO_IMPORT.getRoute(policyID)),
-                onExportPagePress: () => {},
-                onAdvancedPagePress: () => Navigation.navigate(ROUTES.POLICY_ACCOUNTING_XERO_ADVANCED.getRoute(policyID)),
-            };
-        default:
-            return undefined;
-    }
-}
-
-function PolicyAccountingPage({policy, connectionSyncProgress}: PolicyAccountingPageProps) {
+function PolicyAccountingPage({policy}: PolicyAccountingPageProps) {
+    const [connectionSyncProgress] = useOnyx(`${ONYXKEYS.COLLECTION.POLICY_CONNECTION_SYNC_PROGRESS}${policy.id}`);
     const theme = useTheme();
     const styles = useThemeStyles();
-    const {translate} = useLocalize();
+    const {translate, datetimeToRelative: getDatetimeToRelative} = useLocalize();
     const {isOffline} = useNetwork();
-    const {canUseXeroIntegration} = usePermissions();
-    const {isSmallScreenWidth, windowWidth} = useWindowDimensions();
+    const {windowWidth} = useWindowDimensions();
+    const {shouldUseNarrowLayout} = useResponsiveLayout();
     const [threeDotsMenuPosition, setThreeDotsMenuPosition] = useState<AnchorPosition>({horizontal: 0, vertical: 0});
     const [isDisconnectModalOpen, setIsDisconnectModalOpen] = useState(false);
+    const [datetimeToRelative, setDateTimeToRelative] = useState('');
     const threeDotsMenuContainerRef = useRef<View>(null);
+    const {canUseWorkspaceFeeds} = usePermissions();
+    const {startIntegrationFlow, popoverAnchorRefs} = useAccountingContext();
 
-    const isSyncInProgress = !!connectionSyncProgress?.stageInProgress && connectionSyncProgress.stageInProgress !== CONST.POLICY.CONNECTIONS.SYNC_STAGE_NAME.JOB_DONE;
+    const lastSyncProgressDate = parseISO(connectionSyncProgress?.timestamp ?? '');
+    const isSyncInProgress =
+        !!connectionSyncProgress?.stageInProgress &&
+        (connectionSyncProgress.stageInProgress !== CONST.POLICY.CONNECTIONS.SYNC_STAGE_NAME.JOB_DONE || !policy.connections?.[connectionSyncProgress.connectionName]) &&
+        isValid(lastSyncProgressDate) &&
+        differenceInMinutes(new Date(), lastSyncProgressDate) < CONST.POLICY.CONNECTIONS.SYNC_STAGE_TIMEOUT_MINUTES;
 
-    const accountingIntegrations = Object.values(CONST.POLICY.CONNECTIONS.NAME).filter((name) => !(name === CONST.POLICY.CONNECTIONS.NAME.XERO && !canUseXeroIntegration));
-    const connectedIntegration = accountingIntegrations.find((integration) => !!policy?.connections?.[integration]) ?? connectionSyncProgress?.connectionName;
-    const policyID = policy?.id ?? '';
+    const accountingIntegrations = Object.values(CONST.POLICY.CONNECTIONS.NAME);
+    const connectedIntegration = getConnectedIntegration(policy, accountingIntegrations) ?? connectionSyncProgress?.connectionName;
+    const synchronizationError = connectedIntegration && getSynchronizationErrorMessage(policy, connectedIntegration, isSyncInProgress);
 
-    const policyConnectedToXero = connectedIntegration === CONST.POLICY.CONNECTIONS.NAME.XERO;
+    // Enter credentials item shouldn't be shown for SageIntacct and NetSuite integrations
+    const shouldShowEnterCredentials =
+        connectedIntegration &&
+        !!synchronizationError &&
+        isAuthenticationError(policy, connectedIntegration) &&
+        connectedIntegration !== CONST.POLICY.CONNECTIONS.NAME.SAGE_INTACCT &&
+        connectedIntegration !== CONST.POLICY.CONNECTIONS.NAME.NETSUITE;
 
-    const tenants = useMemo(() => getXeroTenants(policy), [policy]);
+    const policyID = policy?.id ?? '-1';
+    // Get the last successful date of the integration. Then, if `connectionSyncProgress` is the same integration displayed and the state is 'jobDone', get the more recent update time of the two.
+    const successfulDate = getIntegrationLastSuccessfulDate(
+        connectedIntegration ? policy?.connections?.[connectedIntegration] : undefined,
+        connectedIntegration === connectionSyncProgress?.connectionName ? connectionSyncProgress : undefined,
+    );
 
+    const tenants = useMemo(() => getXeroTenants(policy), [policy]);
     const currentXeroOrganization = findCurrentXeroOrganization(tenants, policy?.connections?.xero?.config?.tenantID);
 
     const overflowMenu: ThreeDotsMenuProps['menuItems'] = useMemo(
         () => [
-            {
-                icon: Expensicons.Sync,
-                text: translate('workspace.accounting.syncNow'),
-                onSelected: () => syncConnection(policyID),
-                disabled: isOffline,
-            },
+            ...(shouldShowEnterCredentials
+                ? [
+                      {
+                          icon: Expensicons.Key,
+                          text: translate('workspace.accounting.enterCredentials'),
+                          onSelected: () => Modal.close(() => startIntegrationFlow({name: connectedIntegration})),
+                          disabled: isOffline,
+                          iconRight: Expensicons.NewWindow,
+                          shouldShowRightIcon: true,
+                      },
+                  ]
+                : [
+                      {
+                          icon: Expensicons.Sync,
+                          text: translate('workspace.accounting.syncNow'),
+                          onSelected: () => syncConnection(policyID, connectedIntegration),
+                          disabled: isOffline,
+                      },
+                  ]),
             {
                 icon: Expensicons.Trashcan,
                 text: translate('workspace.accounting.disconnect'),
-                onSelected: () => setIsDisconnectModalOpen(true),
+                onSelected: () => Modal.close(() => setIsDisconnectModalOpen(true)),
             },
         ],
-        [translate, policyID, isOffline],
+        [shouldShowEnterCredentials, translate, isOffline, policyID, connectedIntegration, startIntegrationFlow],
     );
 
-    const connectionsMenuItems: MenuItemProps[] = useMemo(() => {
+    useEffect(() => {
+        if (successfulDate) {
+            setDateTimeToRelative(getDatetimeToRelative(successfulDate));
+            return;
+        }
+        setDateTimeToRelative('');
+    }, [getDatetimeToRelative, successfulDate]);
+
+    const integrationSpecificMenuItems = useMemo(() => {
+        const sageIntacctEntityList = policy?.connections?.intacct?.data?.entities ?? [];
+        const netSuiteSubsidiaryList = policy?.connections?.netsuite?.options?.data?.subsidiaryList ?? [];
+        switch (connectedIntegration) {
+            case CONST.POLICY.CONNECTIONS.NAME.XERO:
+                return {
+                    description: translate('workspace.xero.organization'),
+                    iconRight: Expensicons.ArrowRight,
+                    title: getCurrentXeroOrganizationName(policy),
+                    wrapperStyle: [styles.sectionMenuItemTopDescription],
+                    titleStyle: styles.fontWeightNormal,
+                    shouldShowRightIcon: tenants.length > 1,
+                    shouldShowDescriptionOnTop: true,
+                    onPress: () => {
+                        if (!(tenants.length > 1)) {
+                            return;
+                        }
+                        Navigation.navigate(ROUTES.POLICY_ACCOUNTING_XERO_ORGANIZATION.getRoute(policyID, currentXeroOrganization?.id ?? '-1'));
+                    },
+                    pendingAction: settingsPendingAction([CONST.XERO_CONFIG.TENANT_ID], policy?.connections?.xero?.config?.pendingFields),
+                    brickRoadIndicator: areSettingsInErrorFields([CONST.XERO_CONFIG.TENANT_ID], policy?.connections?.xero?.config?.errorFields)
+                        ? CONST.BRICK_ROAD_INDICATOR_STATUS.ERROR
+                        : undefined,
+                };
+            case CONST.POLICY.CONNECTIONS.NAME.NETSUITE:
+                return {
+                    description: translate('workspace.netsuite.subsidiary'),
+                    iconRight: Expensicons.ArrowRight,
+                    title: policy?.connections?.netsuite?.options?.config?.subsidiary ?? '',
+                    wrapperStyle: [styles.sectionMenuItemTopDescription],
+                    titleStyle: styles.fontWeightNormal,
+                    shouldShowRightIcon: netSuiteSubsidiaryList?.length > 1,
+                    shouldShowDescriptionOnTop: true,
+                    pendingAction: policy?.connections?.netsuite?.options?.config?.pendingFields?.subsidiary,
+                    brickRoadIndicator: policy?.connections?.netsuite?.options?.config?.errorFields?.subsidiary ? CONST.BRICK_ROAD_INDICATOR_STATUS.ERROR : undefined,
+                    onPress: () => {
+                        if (!(netSuiteSubsidiaryList?.length > 1)) {
+                            return;
+                        }
+                        Navigation.navigate(ROUTES.POLICY_ACCOUNTING_NETSUITE_SUBSIDIARY_SELECTOR.getRoute(policyID));
+                    },
+                };
+            case CONST.POLICY.CONNECTIONS.NAME.SAGE_INTACCT:
+                return !sageIntacctEntityList.length
+                    ? {}
+                    : {
+                          description: translate('workspace.intacct.entity'),
+                          iconRight: Expensicons.ArrowRight,
+                          title: getCurrentSageIntacctEntityName(policy, translate('workspace.common.topLevel')),
+                          wrapperStyle: [styles.sectionMenuItemTopDescription],
+                          titleStyle: styles.fontWeightNormal,
+                          shouldShowRightIcon: true,
+                          shouldShowDescriptionOnTop: true,
+                          pendingAction: policy?.connections?.intacct?.config?.pendingFields?.entity,
+                          brickRoadIndicator: policy?.connections?.intacct?.config?.errorFields?.entity ? CONST.BRICK_ROAD_INDICATOR_STATUS.ERROR : undefined,
+                          onPress: () => {
+                              if (!sageIntacctEntityList.length) {
+                                  return;
+                              }
+                              Navigation.navigate(ROUTES.POLICY_ACCOUNTING_SAGE_INTACCT_ENTITY.getRoute(policyID));
+                          },
+                      };
+            default:
+                return undefined;
+        }
+    }, [connectedIntegration, currentXeroOrganization?.id, policy, policyID, styles.fontWeightNormal, styles.sectionMenuItemTopDescription, tenants.length, translate]);
+
+    const connectionsMenuItems: MenuItemData[] = useMemo(() => {
         if (isEmptyObject(policy?.connections) && !isSyncInProgress) {
             return accountingIntegrations.map((integration) => {
-                const integrationData = accountingIntegrationData(integration, policyID, translate);
+                const integrationData = getAccountingIntegrationData(integration, policyID, translate);
                 const iconProps = integrationData?.icon ? {icon: integrationData.icon, iconType: CONST.ICON_TYPE_AVATAR} : {};
                 return {
                     ...iconProps,
@@ -151,7 +207,22 @@ function PolicyAccountingPage({policy, connectionSyncProgress}: PolicyAccounting
                     wrapperStyle: [styles.sectionMenuItemTopDescription],
                     shouldShowRightComponent: true,
                     title: integrationData?.title,
-                    rightComponent: integrationData?.setupConnectionButton,
+                    rightComponent: (
+                        <Button
+                            onPress={() => startIntegrationFlow({name: integration})}
+                            text={translate('workspace.accounting.setup')}
+                            style={styles.justifyContentCenter}
+                            small
+                            isDisabled={isOffline}
+                            ref={(ref) => {
+                                if (!popoverAnchorRefs?.current) {
+                                    return;
+                                }
+                                // eslint-disable-next-line react-compiler/react-compiler
+                                popoverAnchorRefs.current[integration].current = ref;
+                            }}
+                        />
+                    ),
                 };
             });
         }
@@ -159,19 +230,69 @@ function PolicyAccountingPage({policy, connectionSyncProgress}: PolicyAccounting
         if (!connectedIntegration) {
             return [];
         }
-        const integrationData = accountingIntegrationData(connectedIntegration, policyID, translate);
+        const shouldShowSynchronizationError = !!synchronizationError;
+        const shouldHideConfigurationOptions = isConnectionUnverified(policy, connectedIntegration);
+        const integrationData = getAccountingIntegrationData(connectedIntegration, policyID, translate, policy);
         const iconProps = integrationData?.icon ? {icon: integrationData.icon, iconType: CONST.ICON_TYPE_AVATAR} : {};
+
+        const configurationOptions = [
+            {
+                icon: Expensicons.Pencil,
+                iconRight: Expensicons.ArrowRight,
+                shouldShowRightIcon: true,
+                title: translate('workspace.accounting.import'),
+                wrapperStyle: [styles.sectionMenuItemTopDescription],
+                onPress: integrationData?.onImportPagePress,
+                brickRoadIndicator: areSettingsInErrorFields(integrationData?.subscribedImportSettings, integrationData?.errorFields) ? CONST.BRICK_ROAD_INDICATOR_STATUS.ERROR : undefined,
+                pendingAction: settingsPendingAction(integrationData?.subscribedImportSettings, integrationData?.pendingFields),
+            },
+            {
+                icon: Expensicons.Send,
+                iconRight: Expensicons.ArrowRight,
+                shouldShowRightIcon: true,
+                title: translate('workspace.accounting.export'),
+                wrapperStyle: [styles.sectionMenuItemTopDescription],
+                onPress: integrationData?.onExportPagePress,
+                brickRoadIndicator: areSettingsInErrorFields(integrationData?.subscribedExportSettings, integrationData?.errorFields) ? CONST.BRICK_ROAD_INDICATOR_STATUS.ERROR : undefined,
+                pendingAction: settingsPendingAction(integrationData?.subscribedExportSettings, integrationData?.pendingFields),
+            },
+            {
+                icon: Expensicons.ExpensifyCard,
+                iconRight: Expensicons.ArrowRight,
+                shouldShowRightIcon: true,
+                title: translate('workspace.accounting.cardReconciliation'),
+                wrapperStyle: [styles.sectionMenuItemTopDescription],
+                onPress: integrationData?.onCardReconciliationPagePress,
+            },
+            {
+                icon: Expensicons.Gear,
+                iconRight: Expensicons.ArrowRight,
+                shouldShowRightIcon: true,
+                title: translate('workspace.accounting.advanced'),
+                wrapperStyle: [styles.sectionMenuItemTopDescription],
+                onPress: integrationData?.onAdvancedPagePress,
+                brickRoadIndicator: areSettingsInErrorFields(integrationData?.subscribedAdvancedSettings, integrationData?.errorFields) ? CONST.BRICK_ROAD_INDICATOR_STATUS.ERROR : undefined,
+                pendingAction: settingsPendingAction(integrationData?.subscribedAdvancedSettings, integrationData?.pendingFields),
+            },
+        ];
+
+        if (!canUseWorkspaceFeeds || !policy?.areExpensifyCardsEnabled) {
+            configurationOptions.splice(2, 1);
+        }
+
         return [
             {
                 ...iconProps,
                 interactive: false,
-                wrapperStyle: [styles.sectionMenuItemTopDescription],
+                wrapperStyle: [styles.sectionMenuItemTopDescription, shouldShowSynchronizationError && styles.pb0],
                 shouldShowRightComponent: true,
                 title: integrationData?.title,
-
+                errorText: synchronizationError,
+                errorTextStyle: [styles.mt5],
+                shouldShowRedDotIndicator: true,
                 description: isSyncInProgress
                     ? translate('workspace.accounting.connections.syncStageName', connectionSyncProgress.stageInProgress)
-                    : translate('workspace.accounting.lastSync'),
+                    : translate('workspace.accounting.lastSync', datetimeToRelative),
                 rightComponent: isSyncInProgress ? (
                     <ActivityIndicator
                         style={[styles.popoverMenuIcon]}
@@ -195,69 +316,32 @@ function PolicyAccountingPage({policy, connectionSyncProgress}: PolicyAccounting
                     </View>
                 ),
             },
-            ...(policyConnectedToXero
-                ? [
-                      {
-                          description: translate('workspace.xero.organization'),
-                          iconRight: Expensicons.ArrowRight,
-                          title: currentXeroOrganization?.name,
-                          wrapperStyle: [styles.sectionMenuItemTopDescription],
-                          titleStyle: styles.fontWeightNormal,
-                          shouldShowRightIcon: tenants.length > 1,
-                          shouldShowDescriptionOnTop: true,
-                          onPress: () => {
-                              if (!(tenants.length > 1)) {
-                                  return;
-                              }
-                              Navigation.navigate(ROUTES.POLICY_ACCOUNTING_XERO_ORGANIZATION.getRoute(policyID, currentXeroOrganization?.id ?? ''));
-                          },
-                      },
-                  ]
-                : []),
-            ...(isEmptyObject(policy?.connections)
-                ? []
-                : [
-                      {
-                          icon: Expensicons.Pencil,
-                          iconRight: Expensicons.ArrowRight,
-                          shouldShowRightIcon: true,
-                          title: translate('workspace.accounting.import'),
-                          wrapperStyle: [styles.sectionMenuItemTopDescription],
-                          onPress: integrationData?.onImportPagePress,
-                      },
-                      {
-                          icon: Expensicons.Send,
-                          iconRight: Expensicons.ArrowRight,
-                          shouldShowRightIcon: true,
-                          title: translate('workspace.accounting.export'),
-                          wrapperStyle: [styles.sectionMenuItemTopDescription],
-                          onPress: integrationData?.onExportPagePress,
-                      },
-                      {
-                          icon: Expensicons.Gear,
-                          iconRight: Expensicons.ArrowRight,
-                          shouldShowRightIcon: true,
-                          title: translate('workspace.accounting.advanced'),
-                          wrapperStyle: [styles.sectionMenuItemTopDescription],
-                          onPress: integrationData?.onAdvancedPagePress,
-                      },
-                  ]),
+            ...(isEmptyObject(integrationSpecificMenuItems) || shouldShowSynchronizationError || isEmptyObject(policy?.connections) ? [] : [integrationSpecificMenuItems]),
+            ...(isEmptyObject(policy?.connections) || shouldHideConfigurationOptions ? [] : configurationOptions),
         ];
     }, [
-        connectedIntegration,
-        connectionSyncProgress?.stageInProgress,
-        currentXeroOrganization,
-        tenants,
+        policy,
         isSyncInProgress,
-        overflowMenu,
-        policy?.connections,
-        policyConnectedToXero,
+        connectedIntegration,
+        synchronizationError,
         policyID,
-        styles,
+        translate,
+        styles.sectionMenuItemTopDescription,
+        styles.pb0,
+        styles.mt5,
+        styles.popoverMenuIcon,
+        canUseWorkspaceFeeds,
+        styles.justifyContentCenter,
+        connectionSyncProgress?.stageInProgress,
+        datetimeToRelative,
         theme.spinner,
+        overflowMenu,
         threeDotsMenuPosition,
-        translate,
+        integrationSpecificMenuItems,
         accountingIntegrations,
+        isOffline,
+        startIntegrationFlow,
+        popoverAnchorRefs,
     ]);
 
     const otherIntegrationsItems = useMemo(() => {
@@ -268,43 +352,52 @@ function PolicyAccountingPage({policy, connectionSyncProgress}: PolicyAccounting
             (integration) => (isSyncInProgress && integration !== connectionSyncProgress?.connectionName) || integration !== connectedIntegration,
         );
         return otherIntegrations.map((integration) => {
-            const integrationData = accountingIntegrationData(integration, policyID, translate, true, connectedIntegration);
+            const integrationData = getAccountingIntegrationData(integration, policyID, translate);
             const iconProps = integrationData?.icon ? {icon: integrationData.icon, iconType: CONST.ICON_TYPE_AVATAR} : {};
             return {
                 ...iconProps,
                 title: integrationData?.title,
-                rightComponent: integrationData?.setupConnectionButton,
+                rightComponent: (
+                    <Button
+                        onPress={() =>
+                            startIntegrationFlow({
+                                name: integration,
+                                integrationToDisconnect: connectedIntegration,
+                                shouldDisconnectIntegrationBeforeConnecting: true,
+                            })
+                        }
+                        text={translate('workspace.accounting.setup')}
+                        style={styles.justifyContentCenter}
+                        small
+                        isDisabled={isOffline}
+                        ref={(r) => {
+                            if (!popoverAnchorRefs?.current) {
+                                return;
+                            }
+                            popoverAnchorRefs.current[integration].current = r;
+                        }}
+                    />
+                ),
                 interactive: false,
                 shouldShowRightComponent: true,
                 wrapperStyle: styles.sectionMenuItemTopDescription,
             };
         });
     }, [
-        connectedIntegration,
-        connectionSyncProgress?.connectionName,
-        isSyncInProgress,
         policy?.connections,
+        isSyncInProgress,
+        accountingIntegrations,
+        connectionSyncProgress?.connectionName,
+        connectedIntegration,
         policyID,
-        styles.sectionMenuItemTopDescription,
         translate,
-        accountingIntegrations,
+        styles.justifyContentCenter,
+        styles.sectionMenuItemTopDescription,
+        isOffline,
+        startIntegrationFlow,
+        popoverAnchorRefs,
     ]);
 
-    const headerThreeDotsMenuItems: ThreeDotsMenuProps['menuItems'] = [
-        {
-            icon: Expensicons.Key,
-            shouldShowRightIcon: true,
-            iconRight: Expensicons.NewWindow,
-            text: translate('workspace.accounting.enterCredentials'),
-            onSelected: () => {},
-        },
-        {
-            icon: Expensicons.Trashcan,
-            text: translate('workspace.accounting.disconnect'),
-            onSelected: () => setIsDisconnectModalOpen(true),
-        },
-    ];
-
     return (
         <AccessOrNotFoundWrapper
             accessVariants={[CONST.POLICY.ACCESS_VARIANTS.ADMIN, CONST.POLICY.ACCESS_VARIANTS.PAID]}
@@ -318,14 +411,12 @@ function PolicyAccountingPage({policy, connectionSyncProgress}: PolicyAccounting
             >
                 <HeaderWithBackButton
                     title={translate('workspace.common.accounting')}
-                    shouldShowBackButton={isSmallScreenWidth}
+                    shouldShowBackButton={shouldUseNarrowLayout}
                     icon={Illustrations.Accounting}
-                    shouldShowThreeDotsButton
                     threeDotsAnchorPosition={styles.threeDotsPopoverOffsetNoCloseButton(windowWidth)}
-                    threeDotsMenuItems={headerThreeDotsMenuItems}
                 />
                 <ScrollView contentContainerStyle={styles.pt3}>
-                    <View style={[styles.flex1, isSmallScreenWidth ? styles.workspaceSectionMobile : styles.workspaceSection]}>
+                    <View style={[styles.flex1, shouldUseNarrowLayout ? styles.workspaceSectionMobile : styles.workspaceSection]}>
                         <Section
                             title={translate('workspace.accounting.title')}
                             subtitle={translate('workspace.accounting.subtitle')}
@@ -334,15 +425,25 @@ function PolicyAccountingPage({policy, connectionSyncProgress}: PolicyAccounting
                             titleStyles={styles.accountSettingsSectionTitle}
                             childrenStyles={styles.pt5}
                         >
-                            <MenuItemList
-                                menuItems={connectionsMenuItems}
-                                shouldUseSingleExecution
-                            />
+                            {connectionsMenuItems.map((menuItem) => (
+                                <OfflineWithFeedback
+                                    pendingAction={menuItem.pendingAction}
+                                    key={menuItem.title}
+                                >
+                                    <MenuItem
+                                        brickRoadIndicator={menuItem.brickRoadIndicator}
+                                        key={menuItem.title}
+                                        // eslint-disable-next-line react/jsx-props-no-spreading
+                                        {...menuItem}
+                                    />
+                                </OfflineWithFeedback>
+                            ))}
                             {otherIntegrationsItems && (
                                 <CollapsibleSection
                                     title={translate('workspace.accounting.other')}
-                                    wrapperStyle={styles.pr3}
+                                    wrapperStyle={[styles.pr3, styles.mt5, styles.pv3]}
                                     titleStyle={[styles.textNormal, styles.colorMuted]}
+                                    textStyle={[styles.flex1, styles.userSelectNone, styles.textNormal, styles.colorMuted]}
                                 >
                                     <MenuItemList
                                         menuItems={otherIntegrationsItems}
@@ -363,7 +464,7 @@ function PolicyAccountingPage({policy, connectionSyncProgress}: PolicyAccounting
                         setIsDisconnectModalOpen(false);
                     }}
                     onCancel={() => setIsDisconnectModalOpen(false)}
-                    prompt={translate('workspace.accounting.disconnectPrompt', undefined, connectedIntegration)}
+                    prompt={translate('workspace.accounting.disconnectPrompt', connectedIntegration)}
                     confirmText={translate('workspace.accounting.disconnect')}
                     cancelText={translate('common.cancel')}
                     danger
@@ -373,12 +474,17 @@ function PolicyAccountingPage({policy, connectionSyncProgress}: PolicyAccounting
     );
 }
 
+function PolicyAccountingPageWrapper(props: PolicyAccountingPageProps) {
+    return (
+        <AccountingContextProvider policy={props.policy}>
+            <PolicyAccountingPage
+                // eslint-disable-next-line react/jsx-props-no-spreading
+                {...props}
+            />
+        </AccountingContextProvider>
+    );
+}
+
 PolicyAccountingPage.displayName = 'PolicyAccountingPage';
 
-export default withPolicyConnections(
-    withOnyx<PolicyAccountingPageProps, PolicyAccountingPageOnyxProps>({
-        connectionSyncProgress: {
-            key: (props) => `${ONYXKEYS.COLLECTION.POLICY_CONNECTION_SYNC_PROGRESS}${props.route.params.policyID}`,
-        },
-    })(PolicyAccountingPage),
-);
+export default withPolicyConnections(PolicyAccountingPageWrapper);
diff --git a/src/pages/workspace/accounting/intacct/EnterSageIntacctCredentialsPage.tsx b/src/pages/workspace/accounting/intacct/EnterSageIntacctCredentialsPage.tsx
new file mode 100644
index 000000000000..71728d523a37
--- /dev/null
+++ b/src/pages/workspace/accounting/intacct/EnterSageIntacctCredentialsPage.tsx
@@ -0,0 +1,97 @@
+import type {StackScreenProps} from '@react-navigation/stack';
+import React, {useCallback} from 'react';
+import {View} from 'react-native';
+import FormProvider from '@components/Form/FormProvider';
+import InputWrapper from '@components/Form/InputWrapper';
+import type {FormInputErrors, FormOnyxValues} from '@components/Form/types';
+import HeaderWithBackButton from '@components/HeaderWithBackButton';
+import ScreenWrapper from '@components/ScreenWrapper';
+import Text from '@components/Text';
+import TextInput from '@components/TextInput';
+import useLocalize from '@hooks/useLocalize';
+import useThemeStyles from '@hooks/useThemeStyles';
+import {connectToSageIntacct} from '@libs/actions/connections/SageIntacct';
+import * as ErrorUtils from '@libs/ErrorUtils';
+import Navigation from '@libs/Navigation/Navigation';
+import type {SettingsNavigatorParamList} from '@libs/Navigation/types';
+import CONST from '@src/CONST';
+import ONYXKEYS from '@src/ONYXKEYS';
+import ROUTES from '@src/ROUTES';
+import type SCREENS from '@src/SCREENS';
+import INPUT_IDS from '@src/types/form/SageIntactCredentialsForm';
+
+type SageIntacctPrerequisitesPageProps = StackScreenProps<SettingsNavigatorParamList, typeof SCREENS.WORKSPACE.ACCOUNTING.SAGE_INTACCT_PREREQUISITES>;
+
+function EnterSageIntacctCredentialsPage({route}: SageIntacctPrerequisitesPageProps) {
+    const styles = useThemeStyles();
+    const {translate} = useLocalize();
+    const policyID: string = route.params.policyID;
+
+    const confirmCredentials = useCallback(
+        (values: FormOnyxValues<typeof ONYXKEYS.FORMS.SAGE_INTACCT_CREDENTIALS_FORM>) => {
+            connectToSageIntacct(policyID, values);
+            Navigation.dismissModal();
+        },
+        [policyID],
+    );
+
+    const formItems = Object.values(INPUT_IDS);
+    const validate = useCallback(
+        (values: FormOnyxValues<typeof ONYXKEYS.FORMS.SAGE_INTACCT_CREDENTIALS_FORM>) => {
+            const errors: FormInputErrors<typeof ONYXKEYS.FORMS.SAGE_INTACCT_CREDENTIALS_FORM> = {};
+
+            formItems.forEach((formItem) => {
+                if (values[formItem]) {
+                    return;
+                }
+                ErrorUtils.addErrorMessage(errors, formItem, translate('common.error.fieldRequired'));
+            });
+            return errors;
+        },
+        [formItems, translate],
+    );
+    return (
+        <ScreenWrapper
+            includeSafeAreaPaddingBottom={false}
+            shouldEnableMaxHeight
+            testID={EnterSageIntacctCredentialsPage.displayName}
+        >
+            <HeaderWithBackButton
+                title={translate('workspace.intacct.sageIntacctSetup')}
+                onBackButtonPress={() => Navigation.goBack(ROUTES.POLICY_ACCOUNTING_SAGE_INTACCT_PREREQUISITES.getRoute(policyID))}
+            />
+            <FormProvider
+                style={[styles.flexGrow1, styles.ph5]}
+                formID={ONYXKEYS.FORMS.SAGE_INTACCT_CREDENTIALS_FORM}
+                validate={validate}
+                onSubmit={confirmCredentials}
+                submitButtonText={translate('common.confirm')}
+                enabledWhenOffline
+                shouldValidateOnBlur
+                shouldValidateOnChange
+            >
+                <Text style={[styles.textHeadlineH1, styles.pb5, styles.pt3]}>{translate('workspace.intacct.enterCredentials')}</Text>
+                {formItems.map((formItem) => (
+                    <View
+                        style={styles.mb4}
+                        key={formItem}
+                    >
+                        <InputWrapper
+                            InputComponent={TextInput}
+                            inputID={formItem}
+                            label={translate(`common.${formItem}`)}
+                            aria-label={translate(`common.${formItem}`)}
+                            role={CONST.ROLE.PRESENTATION}
+                            spellCheck={false}
+                            secureTextEntry={formItem === INPUT_IDS.PASSWORD}
+                        />
+                    </View>
+                ))}
+            </FormProvider>
+        </ScreenWrapper>
+    );
+}
+
+EnterSageIntacctCredentialsPage.displayName = 'EnterSageIntacctCredentialsPage';
+
+export default EnterSageIntacctCredentialsPage;
diff --git a/src/pages/workspace/accounting/intacct/ExistingConnectionsPage.tsx b/src/pages/workspace/accounting/intacct/ExistingConnectionsPage.tsx
new file mode 100644
index 000000000000..d26626578bcb
--- /dev/null
+++ b/src/pages/workspace/accounting/intacct/ExistingConnectionsPage.tsx
@@ -0,0 +1,65 @@
+import type {StackScreenProps} from '@react-navigation/stack';
+import React from 'react';
+import {View} from 'react-native';
+import HeaderWithBackButton from '@components/HeaderWithBackButton';
+import MenuItemList from '@components/MenuItemList';
+import ScreenWrapper from '@components/ScreenWrapper';
+import useLocalize from '@hooks/useLocalize';
+import useThemeStyles from '@hooks/useThemeStyles';
+import {copyExistingPolicyConnection} from '@libs/actions/connections';
+import {getAdminPoliciesConnectedToSageIntacct} from '@libs/actions/Policy/Policy';
+import Navigation from '@libs/Navigation/Navigation';
+import type {SettingsNavigatorParamList} from '@libs/Navigation/types';
+import * as ReportUtils from '@libs/ReportUtils';
+import CONST from '@src/CONST';
+import type SCREENS from '@src/SCREENS';
+
+type ExistingConnectionsPageProps = StackScreenProps<SettingsNavigatorParamList, typeof SCREENS.WORKSPACE.ACCOUNTING.EXISTING_SAGE_INTACCT_CONNECTIONS>;
+
+function ExistingConnectionsPage({route}: ExistingConnectionsPageProps) {
+    const {translate, datetimeToRelative} = useLocalize();
+    const styles = useThemeStyles();
+    const policiesConnectedToSageIntacct = getAdminPoliciesConnectedToSageIntacct();
+    const policyID: string = route.params.policyID;
+
+    const menuItems = policiesConnectedToSageIntacct.map((policy) => {
+        const lastSuccessfulSyncDate = policy.connections?.intacct.lastSync?.successfulDate;
+        const date = lastSuccessfulSyncDate ? datetimeToRelative(lastSuccessfulSyncDate) : undefined;
+        return {
+            title: policy.name,
+            key: policy.id,
+            avatarID: policy.id,
+            icon: policy.avatarURL ? policy.avatarURL : ReportUtils.getDefaultWorkspaceAvatar(policy.name),
+            iconType: policy.avatarURL ? CONST.ICON_TYPE_AVATAR : CONST.ICON_TYPE_WORKSPACE,
+            description: date ? translate('workspace.common.lastSyncDate', CONST.POLICY.CONNECTIONS.NAME_USER_FRIENDLY.intacct, date) : translate('workspace.accounting.intacct'),
+            onPress: () => {
+                copyExistingPolicyConnection(policy.id, policyID, CONST.POLICY.CONNECTIONS.NAME.SAGE_INTACCT);
+                Navigation.dismissModal();
+            },
+        };
+    });
+
+    return (
+        <ScreenWrapper
+            shouldEnablePickerAvoiding={false}
+            shouldShowOfflineIndicatorInWideScreen
+            testID={ExistingConnectionsPage.displayName}
+        >
+            <HeaderWithBackButton
+                title={translate('workspace.common.existingConnections')}
+                shouldShowBackButton
+                onBackButtonPress={() => Navigation.goBack()}
+            />
+            <View style={[styles.flex1]}>
+                <MenuItemList
+                    menuItems={menuItems}
+                    shouldUseSingleExecution
+                />
+            </View>
+        </ScreenWrapper>
+    );
+}
+
+ExistingConnectionsPage.displayName = 'ExistingConnectionsPage';
+
+export default ExistingConnectionsPage;
diff --git a/src/pages/workspace/accounting/intacct/SageIntacctEntityPage.tsx b/src/pages/workspace/accounting/intacct/SageIntacctEntityPage.tsx
new file mode 100644
index 000000000000..f96ca2738480
--- /dev/null
+++ b/src/pages/workspace/accounting/intacct/SageIntacctEntityPage.tsx
@@ -0,0 +1,68 @@
+import React from 'react';
+import RadioListItem from '@components/SelectionList/RadioListItem';
+import type {ListItem} from '@components/SelectionList/types';
+import SelectionScreen from '@components/SelectionScreen';
+import useLocalize from '@hooks/useLocalize';
+import useThemeStyles from '@hooks/useThemeStyles';
+import {clearSageIntacctErrorField, updateSageIntacctEntity} from '@libs/actions/connections/SageIntacct';
+import * as ErrorUtils from '@libs/ErrorUtils';
+import Navigation from '@libs/Navigation/Navigation';
+import {settingsPendingAction} from '@libs/PolicyUtils';
+import withPolicy from '@pages/workspace/withPolicy';
+import type {WithPolicyProps} from '@pages/workspace/withPolicy';
+import CONST from '@src/CONST';
+
+function SageIntacctEntityPage({policy}: WithPolicyProps) {
+    const styles = useThemeStyles();
+    const config = policy?.connections?.intacct?.config;
+    const entityID = config?.entity ?? '';
+    const {translate} = useLocalize();
+
+    const policyID = policy?.id ?? '-1';
+
+    const sections = [
+        {
+            text: translate('workspace.common.topLevel'),
+            value: translate('workspace.common.topLevel'),
+            keyForList: '',
+            isSelected: entityID === '',
+        },
+    ];
+    policy?.connections?.intacct?.data?.entities.forEach((entity) => {
+        sections.push({
+            text: entity.name,
+            value: entity.name,
+            keyForList: entity.id,
+            isSelected: entity.id === entityID,
+        });
+    });
+
+    const saveSelection = ({keyForList}: ListItem) => {
+        updateSageIntacctEntity(policyID, keyForList ?? '', entityID);
+        Navigation.goBack();
+    };
+
+    return (
+        <SelectionScreen
+            policyID={policyID}
+            featureName={CONST.POLICY.MORE_FEATURES.ARE_CONNECTIONS_ENABLED}
+            displayName={SageIntacctEntityPage.displayName}
+            sections={sections ? [{data: sections}] : []}
+            listItem={RadioListItem}
+            onSelectRow={saveSelection}
+            initiallyFocusedOptionKey={sections?.find((mode) => mode.isSelected)?.keyForList}
+            onBackButtonPress={() => Navigation.dismissModal()}
+            title="workspace.intacct.entity"
+            accessVariants={[CONST.POLICY.ACCESS_VARIANTS.ADMIN, CONST.POLICY.ACCESS_VARIANTS.PAID]}
+            connectionName={CONST.POLICY.CONNECTIONS.NAME.SAGE_INTACCT}
+            pendingAction={settingsPendingAction([CONST.SAGE_INTACCT_CONFIG.ENTITY], config?.pendingFields)}
+            errors={ErrorUtils.getLatestErrorField(config, CONST.SAGE_INTACCT_CONFIG.ENTITY)}
+            errorRowStyles={[styles.ph5, styles.mv2]}
+            onClose={() => clearSageIntacctErrorField(policyID, CONST.SAGE_INTACCT_CONFIG.ENTITY)}
+        />
+    );
+}
+
+SageIntacctEntityPage.displayName = 'SageIntacctEntityPage';
+
+export default withPolicy(SageIntacctEntityPage);
diff --git a/src/pages/workspace/accounting/intacct/SageIntacctPrerequisitesPage.tsx b/src/pages/workspace/accounting/intacct/SageIntacctPrerequisitesPage.tsx
new file mode 100644
index 000000000000..4e5863d48317
--- /dev/null
+++ b/src/pages/workspace/accounting/intacct/SageIntacctPrerequisitesPage.tsx
@@ -0,0 +1,104 @@
+import type {StackScreenProps} from '@react-navigation/stack';
+import React, {useMemo, useRef} from 'react';
+import {View} from 'react-native';
+// eslint-disable-next-line no-restricted-imports
+import type {GestureResponderEvent, Text as RNText} from 'react-native';
+import Computer from '@assets/images/computer.svg';
+import Button from '@components/Button';
+import FixedFooter from '@components/FixedFooter';
+import HeaderWithBackButton from '@components/HeaderWithBackButton';
+import * as Expensicons from '@components/Icon/Expensicons';
+import ImageSVG from '@components/ImageSVG';
+import MenuItemList from '@components/MenuItemList';
+import ScreenWrapper from '@components/ScreenWrapper';
+import Text from '@components/Text';
+import useLocalize from '@hooks/useLocalize';
+import useThemeStyles from '@hooks/useThemeStyles';
+import fileDownload from '@libs/fileDownload';
+import Navigation from '@libs/Navigation/Navigation';
+import type {SettingsNavigatorParamList} from '@libs/Navigation/types';
+import * as ReportActionContextMenu from '@pages/home/report/ContextMenu/ReportActionContextMenu';
+import * as Link from '@userActions/Link';
+import CONST from '@src/CONST';
+import ROUTES from '@src/ROUTES';
+import type SCREENS from '@src/SCREENS';
+
+type SageIntacctPrerequisitesPageProps = StackScreenProps<SettingsNavigatorParamList, typeof SCREENS.WORKSPACE.ACCOUNTING.SAGE_INTACCT_PREREQUISITES>;
+
+function SageIntacctPrerequisitesPage({route}: SageIntacctPrerequisitesPageProps) {
+    const {translate} = useLocalize();
+    const styles = useThemeStyles();
+    const popoverAnchor = useRef<View | RNText | null>(null);
+    const policyID: string = route.params.policyID;
+
+    const menuItems = useMemo(
+        () => [
+            {
+                title: translate('workspace.intacct.downloadExpensifyPackage'),
+                key: 'workspace.intacct.downloadExpensifyPackage',
+                icon: Expensicons.Download,
+                iconRight: Expensicons.NewWindow,
+                shouldShowRightIcon: true,
+                onPress: () => {
+                    fileDownload(CONST.EXPENSIFY_PACKAGE_FOR_SAGE_INTACCT, CONST.EXPENSIFY_PACKAGE_FOR_SAGE_INTACCT_FILE_NAME);
+                },
+                onSecondaryInteraction: (event: GestureResponderEvent | MouseEvent) =>
+                    ReportActionContextMenu.showContextMenu(CONST.CONTEXT_MENU_TYPES.LINK, event, CONST.EXPENSIFY_PACKAGE_FOR_SAGE_INTACCT, popoverAnchor.current),
+                numberOfLinesTitle: 2,
+            },
+            {
+                title: translate('workspace.intacct.followSteps'),
+                key: 'workspace.intacct.followSteps',
+                icon: Expensicons.Task,
+                iconRight: Expensicons.NewWindow,
+                shouldShowRightIcon: true,
+                onPress: () => {
+                    Link.openExternalLink(CONST.HOW_TO_CONNECT_TO_SAGE_INTACCT);
+                },
+                onSecondaryInteraction: (event: GestureResponderEvent | MouseEvent) =>
+                    ReportActionContextMenu.showContextMenu(CONST.CONTEXT_MENU_TYPES.LINK, event, CONST.HOW_TO_CONNECT_TO_SAGE_INTACCT, popoverAnchor.current),
+                numberOfLinesTitle: 3,
+            },
+        ],
+        [translate],
+    );
+
+    return (
+        <ScreenWrapper
+            shouldEnablePickerAvoiding={false}
+            shouldShowOfflineIndicatorInWideScreen
+            testID={SageIntacctPrerequisitesPage.displayName}
+        >
+            <HeaderWithBackButton
+                title={translate('workspace.intacct.sageIntacctSetup')}
+                shouldShowBackButton
+                onBackButtonPress={() => Navigation.dismissModal()}
+            />
+            <View style={styles.flex1}>
+                <View style={[styles.alignSelfCenter, styles.computerIllustrationContainer]}>
+                    <ImageSVG src={Computer} />
+                </View>
+
+                <Text style={[styles.textHeadlineH1, styles.p5, styles.p6]}>{translate('workspace.intacct.prerequisitesTitle')}</Text>
+                <MenuItemList
+                    menuItems={menuItems}
+                    shouldUseSingleExecution
+                />
+
+                <FixedFooter style={[styles.mtAuto]}>
+                    <Button
+                        success
+                        text={translate('common.next')}
+                        onPress={() => Navigation.navigate(ROUTES.POLICY_ACCOUNTING_SAGE_INTACCT_ENTER_CREDENTIALS.getRoute(policyID))}
+                        pressOnEnter
+                        large
+                    />
+                </FixedFooter>
+            </View>
+        </ScreenWrapper>
+    );
+}
+
+SageIntacctPrerequisitesPage.displayName = 'SageIntacctPrerequisitesPage';
+
+export default SageIntacctPrerequisitesPage;
diff --git a/src/pages/workspace/accounting/intacct/advanced/SageIntacctAdvancedPage.tsx b/src/pages/workspace/accounting/intacct/advanced/SageIntacctAdvancedPage.tsx
new file mode 100644
index 000000000000..5a0df17fc92c
--- /dev/null
+++ b/src/pages/workspace/accounting/intacct/advanced/SageIntacctAdvancedPage.tsx
@@ -0,0 +1,136 @@
+import React, {useMemo} from 'react';
+import ConnectionLayout from '@components/ConnectionLayout';
+import MenuItemWithTopDescription from '@components/MenuItemWithTopDescription';
+import OfflineWithFeedback from '@components/OfflineWithFeedback';
+import useLocalize from '@hooks/useLocalize';
+import useThemeStyles from '@hooks/useThemeStyles';
+import * as ErrorUtils from '@libs/ErrorUtils';
+import {areSettingsInErrorFields, getCurrentSageIntacctEntityName, settingsPendingAction} from '@libs/PolicyUtils';
+import Navigation from '@navigation/Navigation';
+import type {WithPolicyProps} from '@pages/workspace/withPolicy';
+import withPolicy from '@pages/workspace/withPolicy';
+import ToggleSettingOptionRow from '@pages/workspace/workflows/ToggleSettingsOptionRow';
+import {
+    updateSageIntacctApprovalMode,
+    updateSageIntacctAutoSync,
+    updateSageIntacctImportEmployees,
+    updateSageIntacctSyncReimbursedReports,
+    updateSageIntacctSyncReimbursementAccountID,
+} from '@userActions/connections/SageIntacct';
+import * as Policy from '@userActions/Policy/Policy';
+import CONST from '@src/CONST';
+import ROUTES from '@src/ROUTES';
+import type {SageIntacctDataElement} from '@src/types/onyx/Policy';
+
+function getReimbursedAccountName(bankAccounts: SageIntacctDataElement[], reimbursementAccountID?: string): string | undefined {
+    return bankAccounts.find((bankAccount) => bankAccount.id === reimbursementAccountID)?.name ?? reimbursementAccountID;
+}
+
+function SageIntacctAdvancedPage({policy}: WithPolicyProps) {
+    const {translate} = useLocalize();
+    const policyID = policy?.id ?? '-1';
+    const styles = useThemeStyles();
+
+    const {importEmployees, autoSync, sync, pendingFields, errorFields} = policy?.connections?.intacct?.config ?? {};
+    const {data, config} = policy?.connections?.intacct ?? {};
+
+    const toggleSections = useMemo(
+        () => [
+            {
+                label: translate('workspace.sageIntacct.autoSync'),
+                description: translate('workspace.sageIntacct.autoSyncDescription'),
+                isActive: !!autoSync?.enabled,
+                onToggle: (enabled: boolean) => updateSageIntacctAutoSync(policyID, enabled),
+                subscribedSettings: [CONST.SAGE_INTACCT_CONFIG.AUTO_SYNC_ENABLED],
+                error: ErrorUtils.getLatestErrorField(config, CONST.SAGE_INTACCT_CONFIG.AUTO_SYNC_ENABLED),
+                onCloseError: () => Policy.clearSageIntacctErrorField(policyID, CONST.SAGE_INTACCT_CONFIG.AUTO_SYNC_ENABLED),
+            },
+            {
+                label: translate('workspace.sageIntacct.inviteEmployees'),
+                description: translate('workspace.sageIntacct.inviteEmployeesDescription'),
+                isActive: !!importEmployees,
+                onToggle: (enabled: boolean) => {
+                    updateSageIntacctImportEmployees(policyID, enabled);
+                    updateSageIntacctApprovalMode(policyID, enabled);
+                },
+                subscribedSettings: [CONST.SAGE_INTACCT_CONFIG.IMPORT_EMPLOYEES, CONST.SAGE_INTACCT_CONFIG.APPROVAL_MODE],
+                error:
+                    ErrorUtils.getLatestErrorField(config ?? {}, CONST.SAGE_INTACCT_CONFIG.IMPORT_EMPLOYEES) ??
+                    ErrorUtils.getLatestErrorField(config ?? {}, CONST.SAGE_INTACCT_CONFIG.APPROVAL_MODE),
+                onCloseError: () => {
+                    Policy.clearSageIntacctErrorField(policyID, CONST.SAGE_INTACCT_CONFIG.IMPORT_EMPLOYEES);
+                    Policy.clearSageIntacctErrorField(policyID, CONST.SAGE_INTACCT_CONFIG.APPROVAL_MODE);
+                },
+            },
+            {
+                label: translate('workspace.sageIntacct.syncReimbursedReports'),
+                description: translate('workspace.sageIntacct.syncReimbursedReportsDescription'),
+                isActive: !!sync?.syncReimbursedReports,
+                onToggle: (enabled: boolean) => {
+                    updateSageIntacctSyncReimbursedReports(policyID, enabled);
+
+                    if (enabled && !sync?.reimbursementAccountID) {
+                        const reimbursementAccountID = data?.bankAccounts[0]?.id ?? '';
+                        updateSageIntacctSyncReimbursementAccountID(policyID, reimbursementAccountID);
+                    }
+                },
+                subscribedSettings: [CONST.SAGE_INTACCT_CONFIG.SYNC_REIMBURSED_REPORTS],
+                error: ErrorUtils.getLatestErrorField(config ?? {}, CONST.SAGE_INTACCT_CONFIG.SYNC_REIMBURSED_REPORTS),
+                onCloseError: () => {
+                    Policy.clearSageIntacctErrorField(policyID, CONST.SAGE_INTACCT_CONFIG.SYNC_REIMBURSED_REPORTS);
+                },
+            },
+        ],
+        [translate, autoSync?.enabled, config, importEmployees, sync?.syncReimbursedReports, sync?.reimbursementAccountID, policyID, data?.bankAccounts],
+    );
+
+    return (
+        <ConnectionLayout
+            displayName={SageIntacctAdvancedPage.displayName}
+            headerTitle="workspace.accounting.advanced"
+            headerSubtitle={getCurrentSageIntacctEntityName(policy, translate('workspace.common.topLevel'))}
+            accessVariants={[CONST.POLICY.ACCESS_VARIANTS.ADMIN, CONST.POLICY.ACCESS_VARIANTS.PAID]}
+            policyID={policyID}
+            featureName={CONST.POLICY.MORE_FEATURES.ARE_CONNECTIONS_ENABLED}
+            contentContainerStyle={styles.pb2}
+            titleStyle={styles.ph5}
+            connectionName={CONST.POLICY.CONNECTIONS.NAME.SAGE_INTACCT}
+            onBackButtonPress={() => Navigation.goBack(ROUTES.POLICY_ACCOUNTING.getRoute(policyID))}
+        >
+            {toggleSections.map((section) => (
+                <ToggleSettingOptionRow
+                    key={section.label}
+                    title={section.label}
+                    subtitle={section.description}
+                    shouldPlaceSubtitleBelowSwitch
+                    switchAccessibilityLabel={section.label}
+                    isActive={section.isActive}
+                    onToggle={section.onToggle}
+                    wrapperStyle={[styles.ph5, styles.pv3]}
+                    pendingAction={settingsPendingAction(section.subscribedSettings, pendingFields)}
+                    errors={section.error}
+                    onCloseError={section.onCloseError}
+                />
+            ))}
+
+            {!!sync?.syncReimbursedReports && (
+                <OfflineWithFeedback
+                    key={translate('workspace.sageIntacct.paymentAccount')}
+                    pendingAction={settingsPendingAction([CONST.SAGE_INTACCT_CONFIG.REIMBURSEMENT_ACCOUNT_ID], pendingFields)}
+                >
+                    <MenuItemWithTopDescription
+                        title={getReimbursedAccountName(data?.bankAccounts ?? [], sync?.reimbursementAccountID) ?? translate('workspace.sageIntacct.notConfigured')}
+                        description={translate('workspace.sageIntacct.paymentAccount')}
+                        shouldShowRightIcon
+                        onPress={() => Navigation.navigate(ROUTES.POLICY_ACCOUNTING_SAGE_INTACCT_PAYMENT_ACCOUNT.getRoute(policyID))}
+                        brickRoadIndicator={areSettingsInErrorFields([CONST.SAGE_INTACCT_CONFIG.REIMBURSEMENT_ACCOUNT_ID], errorFields) ? CONST.BRICK_ROAD_INDICATOR_STATUS.ERROR : undefined}
+                    />
+                </OfflineWithFeedback>
+            )}
+        </ConnectionLayout>
+    );
+}
+
+SageIntacctAdvancedPage.displayName = 'SageIntacctAdvancedPage';
+
+export default withPolicy(SageIntacctAdvancedPage);
diff --git a/src/pages/workspace/accounting/intacct/advanced/SageIntacctPaymentAccountPage.tsx b/src/pages/workspace/accounting/intacct/advanced/SageIntacctPaymentAccountPage.tsx
new file mode 100644
index 000000000000..5bb6205b8160
--- /dev/null
+++ b/src/pages/workspace/accounting/intacct/advanced/SageIntacctPaymentAccountPage.tsx
@@ -0,0 +1,76 @@
+import React, {useCallback, useMemo} from 'react';
+import BlockingView from '@components/BlockingViews/BlockingView';
+import * as Illustrations from '@components/Icon/Illustrations';
+import RadioListItem from '@components/SelectionList/RadioListItem';
+import type {SelectorType} from '@components/SelectionScreen';
+import SelectionScreen from '@components/SelectionScreen';
+import useLocalize from '@hooks/useLocalize';
+import useThemeStyles from '@hooks/useThemeStyles';
+import * as ErrorUtils from '@libs/ErrorUtils';
+import Navigation from '@libs/Navigation/Navigation';
+import {getSageIntacctBankAccounts, settingsPendingAction} from '@libs/PolicyUtils';
+import type {WithPolicyConnectionsProps} from '@pages/workspace/withPolicyConnections';
+import withPolicyConnections from '@pages/workspace/withPolicyConnections';
+import variables from '@styles/variables';
+import {updateSageIntacctSyncReimbursementAccountID} from '@userActions/connections/SageIntacct';
+import * as Policy from '@userActions/Policy/Policy';
+import CONST from '@src/CONST';
+import ROUTES from '@src/ROUTES';
+
+function SageIntacctPaymentAccountPage({policy}: WithPolicyConnectionsProps) {
+    const styles = useThemeStyles();
+    const {translate} = useLocalize();
+
+    const policyID = policy?.id ?? '-1';
+
+    const {config} = policy?.connections?.intacct ?? {};
+
+    const vendorSelectorOptions = useMemo<SelectorType[]>(() => getSageIntacctBankAccounts(policy, config?.sync?.reimbursementAccountID), [policy, config?.sync?.reimbursementAccountID]);
+
+    const updateDefaultVendor = useCallback(
+        ({value}: SelectorType) => {
+            if (value !== config?.sync?.reimbursementAccountID) {
+                updateSageIntacctSyncReimbursementAccountID(policyID, value, config?.sync?.reimbursementAccountID);
+            }
+            Navigation.goBack(ROUTES.POLICY_ACCOUNTING_SAGE_INTACCT_ADVANCED.getRoute(policyID));
+        },
+        [policyID, config?.sync?.reimbursementAccountID],
+    );
+
+    const listEmptyContent = useMemo(
+        () => (
+            <BlockingView
+                icon={Illustrations.TeleScope}
+                iconWidth={variables.emptyListIconWidth}
+                iconHeight={variables.emptyListIconHeight}
+                title={translate('workspace.sageIntacct.noAccountsFound')}
+                subtitle={translate('workspace.sageIntacct.noAccountsFoundDescription')}
+            />
+        ),
+        [translate],
+    );
+
+    return (
+        <SelectionScreen
+            policyID={policyID}
+            featureName={CONST.POLICY.MORE_FEATURES.ARE_CONNECTIONS_ENABLED}
+            displayName={SageIntacctPaymentAccountPage.displayName}
+            sections={vendorSelectorOptions.length ? [{data: vendorSelectorOptions}] : []}
+            listItem={RadioListItem}
+            onSelectRow={updateDefaultVendor}
+            initiallyFocusedOptionKey={vendorSelectorOptions.find((mode) => mode.isSelected)?.keyForList}
+            onBackButtonPress={() => Navigation.goBack(ROUTES.POLICY_ACCOUNTING_SAGE_INTACCT_ADVANCED.getRoute(policyID))}
+            title="workspace.sageIntacct.paymentAccount"
+            listEmptyContent={listEmptyContent}
+            connectionName={CONST.POLICY.CONNECTIONS.NAME.SAGE_INTACCT}
+            pendingAction={settingsPendingAction([CONST.SAGE_INTACCT_CONFIG.REIMBURSEMENT_ACCOUNT_ID], config?.pendingFields)}
+            errors={ErrorUtils.getLatestErrorField(config ?? {}, CONST.SAGE_INTACCT_CONFIG.REIMBURSEMENT_ACCOUNT_ID)}
+            errorRowStyles={[styles.ph5, styles.pv3]}
+            onClose={() => Policy.clearSageIntacctErrorField(policyID, CONST.SAGE_INTACCT_CONFIG.REIMBURSEMENT_ACCOUNT_ID)}
+        />
+    );
+}
+
+SageIntacctPaymentAccountPage.displayName = 'SageIntacctPaymentAccountPage';
+
+export default withPolicyConnections(SageIntacctPaymentAccountPage);
diff --git a/src/pages/workspace/accounting/intacct/export/SageIntacctDatePage.tsx b/src/pages/workspace/accounting/intacct/export/SageIntacctDatePage.tsx
new file mode 100644
index 000000000000..bf4a3dbf058d
--- /dev/null
+++ b/src/pages/workspace/accounting/intacct/export/SageIntacctDatePage.tsx
@@ -0,0 +1,82 @@
+import React, {useCallback, useMemo} from 'react';
+import {View} from 'react-native';
+import type {ValueOf} from 'type-fest';
+import RadioListItem from '@components/SelectionList/RadioListItem';
+import type {ListItem} from '@components/SelectionList/types';
+import SelectionScreen from '@components/SelectionScreen';
+import type {SelectorType} from '@components/SelectionScreen';
+import Text from '@components/Text';
+import useLocalize from '@hooks/useLocalize';
+import useThemeStyles from '@hooks/useThemeStyles';
+import * as ErrorUtils from '@libs/ErrorUtils';
+import {settingsPendingAction} from '@libs/PolicyUtils';
+import Navigation from '@navigation/Navigation';
+import type {WithPolicyProps} from '@pages/workspace/withPolicy';
+import withPolicyConnections from '@pages/workspace/withPolicyConnections';
+import {updateSageIntacctExportDate} from '@userActions/connections/SageIntacct';
+import * as Policy from '@userActions/Policy/Policy';
+import CONST from '@src/CONST';
+import ROUTES from '@src/ROUTES';
+
+type MenuListItem = ListItem & {
+    value: ValueOf<typeof CONST.SAGE_INTACCT_EXPORT_DATE>;
+};
+
+function SageIntacctDatePage({policy}: WithPolicyProps) {
+    const {translate} = useLocalize();
+    const policyID = policy?.id ?? '-1';
+    const styles = useThemeStyles();
+    const {config} = policy?.connections?.intacct ?? {};
+    const {export: exportConfig, pendingFields} = policy?.connections?.intacct?.config ?? {};
+    const data: MenuListItem[] = Object.values(CONST.SAGE_INTACCT_EXPORT_DATE).map((dateType) => ({
+        value: dateType,
+        text: translate(`workspace.sageIntacct.exportDate.values.${dateType}.label`),
+        alternateText: translate(`workspace.sageIntacct.exportDate.values.${dateType}.description`),
+        keyForList: dateType,
+        isSelected: exportConfig?.exportDate === dateType,
+    }));
+
+    const headerContent = useMemo(
+        () => (
+            <View>
+                <Text style={[styles.ph5, styles.pb5]}>{translate('workspace.sageIntacct.exportDate.description')}</Text>
+            </View>
+        ),
+        [translate, styles.pb5, styles.ph5],
+    );
+
+    const selectExportDate = useCallback(
+        (row: MenuListItem) => {
+            if (row.value !== exportConfig?.exportDate) {
+                updateSageIntacctExportDate(policyID, row.value, exportConfig?.exportDate);
+            }
+            Navigation.goBack(ROUTES.POLICY_ACCOUNTING_SAGE_INTACCT_EXPORT.getRoute(policyID));
+        },
+        [exportConfig?.exportDate, policyID],
+    );
+
+    return (
+        <SelectionScreen
+            displayName={SageIntacctDatePage.displayName}
+            title="workspace.sageIntacct.exportDate.label"
+            headerContent={headerContent}
+            sections={[{data}]}
+            listItem={RadioListItem}
+            onSelectRow={(selection: SelectorType) => selectExportDate(selection as MenuListItem)}
+            initiallyFocusedOptionKey={data.find((mode) => mode.isSelected)?.keyForList}
+            policyID={policyID}
+            accessVariants={[CONST.POLICY.ACCESS_VARIANTS.ADMIN, CONST.POLICY.ACCESS_VARIANTS.PAID]}
+            featureName={CONST.POLICY.MORE_FEATURES.ARE_CONNECTIONS_ENABLED}
+            onBackButtonPress={() => Navigation.goBack(ROUTES.POLICY_ACCOUNTING_SAGE_INTACCT_EXPORT.getRoute(policyID))}
+            connectionName={CONST.POLICY.CONNECTIONS.NAME.SAGE_INTACCT}
+            pendingAction={settingsPendingAction([CONST.SAGE_INTACCT_CONFIG.EXPORT_DATE], pendingFields)}
+            errors={ErrorUtils.getLatestErrorField(config ?? {}, CONST.SAGE_INTACCT_CONFIG.EXPORT_DATE)}
+            errorRowStyles={[styles.ph5, styles.pv3]}
+            onClose={() => Policy.clearSageIntacctErrorField(policyID, CONST.SAGE_INTACCT_CONFIG.EXPORT_DATE)}
+        />
+    );
+}
+
+SageIntacctDatePage.displayName = 'SageIntacctDatePage';
+
+export default withPolicyConnections(SageIntacctDatePage);
diff --git a/src/pages/workspace/accounting/intacct/export/SageIntacctDefaultVendorPage.tsx b/src/pages/workspace/accounting/intacct/export/SageIntacctDefaultVendorPage.tsx
new file mode 100644
index 000000000000..9070ba0820fe
--- /dev/null
+++ b/src/pages/workspace/accounting/intacct/export/SageIntacctDefaultVendorPage.tsx
@@ -0,0 +1,119 @@
+import type {StackScreenProps} from '@react-navigation/stack';
+import React, {useCallback, useMemo} from 'react';
+import {View} from 'react-native';
+import BlockingView from '@components/BlockingViews/BlockingView';
+import * as Illustrations from '@components/Icon/Illustrations';
+import RadioListItem from '@components/SelectionList/RadioListItem';
+import type {SelectorType} from '@components/SelectionScreen';
+import SelectionScreen from '@components/SelectionScreen';
+import Text from '@components/Text';
+import useLocalize from '@hooks/useLocalize';
+import usePolicy from '@hooks/usePolicy';
+import useThemeStyles from '@hooks/useThemeStyles';
+import * as ErrorUtils from '@libs/ErrorUtils';
+import Navigation from '@libs/Navigation/Navigation';
+import {getSageIntacctNonReimbursableActiveDefaultVendor, getSageIntacctVendors, settingsPendingAction} from '@libs/PolicyUtils';
+import type {SettingsNavigatorParamList} from '@navigation/types';
+import variables from '@styles/variables';
+import {updateSageIntacctDefaultVendor} from '@userActions/connections/SageIntacct';
+import * as Policy from '@userActions/Policy/Policy';
+import CONST from '@src/CONST';
+import ROUTES from '@src/ROUTES';
+import type SCREENS from '@src/SCREENS';
+import type {Connections} from '@src/types/onyx/Policy';
+
+type SageIntacctDefaultVendorPageProps = StackScreenProps<SettingsNavigatorParamList, typeof SCREENS.WORKSPACE.ACCOUNTING.SAGE_INTACCT_DEFAULT_VENDOR>;
+
+function SageIntacctDefaultVendorPage({route}: SageIntacctDefaultVendorPageProps) {
+    const styles = useThemeStyles();
+    const {translate} = useLocalize();
+
+    const policyID = route.params.policyID ?? '-1';
+    const policy = usePolicy(policyID);
+    const {config} = policy?.connections?.intacct ?? {};
+    const {export: exportConfig} = policy?.connections?.intacct?.config ?? {};
+
+    const isReimbursable = route.params.reimbursable === CONST.SAGE_INTACCT_CONFIG.REIMBURSABLE;
+
+    let defaultVendor;
+    let settingName: keyof Connections['intacct']['config']['export'];
+    if (!isReimbursable) {
+        const {nonReimbursable} = exportConfig ?? {};
+        defaultVendor = getSageIntacctNonReimbursableActiveDefaultVendor(policy);
+        settingName =
+            nonReimbursable === CONST.SAGE_INTACCT_NON_REIMBURSABLE_EXPENSE_TYPE.CREDIT_CARD_CHARGE
+                ? CONST.SAGE_INTACCT_CONFIG.NON_REIMBURSABLE_CREDIT_CARD_VENDOR
+                : CONST.SAGE_INTACCT_CONFIG.NON_REIMBURSABLE_VENDOR;
+    } else {
+        const {reimbursableExpenseReportDefaultVendor} = exportConfig ?? {};
+        defaultVendor = reimbursableExpenseReportDefaultVendor;
+        settingName = CONST.SAGE_INTACCT_CONFIG.REIMBURSABLE_VENDOR;
+    }
+
+    const vendorSelectorOptions = useMemo<SelectorType[]>(() => getSageIntacctVendors(policy, defaultVendor), [defaultVendor, policy]);
+
+    const listHeaderComponent = useMemo(
+        () => (
+            <View style={[styles.pb2, styles.ph5]}>
+                <Text style={[styles.pb5, styles.textNormal]}>{translate('workspace.sageIntacct.defaultVendorDescription', isReimbursable)}</Text>
+            </View>
+        ),
+        [translate, styles.pb2, styles.ph5, styles.pb5, styles.textNormal, isReimbursable],
+    );
+
+    const updateDefaultVendor = useCallback(
+        ({value}: SelectorType) => {
+            if (value !== defaultVendor) {
+                updateSageIntacctDefaultVendor(policyID, settingName, value, defaultVendor);
+            }
+            Navigation.goBack(ROUTES.POLICY_ACCOUNTING_SAGE_INTACCT_NON_REIMBURSABLE_EXPENSES.getRoute(policyID));
+        },
+        [defaultVendor, policyID, settingName],
+    );
+
+    const listEmptyContent = useMemo(
+        () => (
+            <BlockingView
+                icon={Illustrations.TeleScope}
+                iconWidth={variables.emptyListIconWidth}
+                iconHeight={variables.emptyListIconHeight}
+                title={translate('workspace.sageIntacct.noAccountsFound')}
+                subtitle={translate('workspace.sageIntacct.noAccountsFoundDescription')}
+                containerStyle={styles.pb10}
+            />
+        ),
+        [translate, styles.pb10],
+    );
+
+    return (
+        <SelectionScreen
+            policyID={policyID}
+            featureName={CONST.POLICY.MORE_FEATURES.ARE_CONNECTIONS_ENABLED}
+            displayName={SageIntacctDefaultVendorPage.displayName}
+            sections={vendorSelectorOptions.length ? [{data: vendorSelectorOptions}] : []}
+            listItem={RadioListItem}
+            onSelectRow={updateDefaultVendor}
+            initiallyFocusedOptionKey={vendorSelectorOptions.find((mode) => mode.isSelected)?.keyForList}
+            headerContent={listHeaderComponent}
+            onBackButtonPress={() =>
+                Navigation.goBack(
+                    isReimbursable
+                        ? ROUTES.POLICY_ACCOUNTING_SAGE_INTACCT_REIMBURSABLE_EXPENSES.getRoute(policyID)
+                        : ROUTES.POLICY_ACCOUNTING_SAGE_INTACCT_NON_REIMBURSABLE_EXPENSES.getRoute(policyID),
+                )
+            }
+            title="workspace.sageIntacct.defaultVendor"
+            listEmptyContent={listEmptyContent}
+            accessVariants={[CONST.POLICY.ACCESS_VARIANTS.ADMIN, CONST.POLICY.ACCESS_VARIANTS.PAID]}
+            connectionName={CONST.POLICY.CONNECTIONS.NAME.SAGE_INTACCT}
+            pendingAction={settingsPendingAction([settingName], config?.pendingFields)}
+            errors={ErrorUtils.getLatestErrorField(config, settingName)}
+            errorRowStyles={[styles.ph5, styles.pv3]}
+            onClose={() => Policy.clearSageIntacctErrorField(policyID, settingName)}
+        />
+    );
+}
+
+SageIntacctDefaultVendorPage.displayName = 'SageIntacctDefaultVendorPage';
+
+export default SageIntacctDefaultVendorPage;
diff --git a/src/pages/workspace/accounting/intacct/export/SageIntacctExportPage.tsx b/src/pages/workspace/accounting/intacct/export/SageIntacctExportPage.tsx
new file mode 100644
index 000000000000..47c5ada80f46
--- /dev/null
+++ b/src/pages/workspace/accounting/intacct/export/SageIntacctExportPage.tsx
@@ -0,0 +1,95 @@
+import React, {useMemo} from 'react';
+import ConnectionLayout from '@components/ConnectionLayout';
+import MenuItemWithTopDescription from '@components/MenuItemWithTopDescription';
+import OfflineWithFeedback from '@components/OfflineWithFeedback';
+import useLocalize from '@hooks/useLocalize';
+import useThemeStyles from '@hooks/useThemeStyles';
+import Navigation from '@libs/Navigation/Navigation';
+import {getCurrentSageIntacctEntityName} from '@libs/PolicyUtils';
+import * as PolicyUtils from '@libs/PolicyUtils';
+import type {WithPolicyProps} from '@pages/workspace/withPolicy';
+import withPolicyConnections from '@pages/workspace/withPolicyConnections';
+import CONST from '@src/CONST';
+import ROUTES from '@src/ROUTES';
+
+function SageIntacctExportPage({policy}: WithPolicyProps) {
+    const {translate} = useLocalize();
+    const styles = useThemeStyles();
+    const policyID = policy?.id ?? '-1';
+
+    const {export: exportConfig, pendingFields, errorFields} = policy?.connections?.intacct?.config ?? {};
+
+    const sections = useMemo(
+        () => [
+            {
+                description: translate('workspace.sageIntacct.preferredExporter'),
+                action: () => Navigation.navigate(ROUTES.POLICY_ACCOUNTING_SAGE_INTACCT_PREFERRED_EXPORTER.getRoute(policyID)),
+                title: exportConfig?.exporter ?? translate('workspace.sageIntacct.notConfigured'),
+                subscribedSettings: [CONST.SAGE_INTACCT_CONFIG.EXPORTER],
+            },
+            {
+                description: translate('workspace.sageIntacct.exportDate.label'),
+                action: () => Navigation.navigate(ROUTES.POLICY_ACCOUNTING_SAGE_INTACCT_EXPORT_DATE.getRoute(policyID)),
+                title: exportConfig?.exportDate ? translate(`workspace.sageIntacct.exportDate.values.${exportConfig.exportDate}.label`) : translate(`workspace.sageIntacct.notConfigured`),
+                subscribedSettings: [CONST.SAGE_INTACCT_CONFIG.EXPORT_DATE],
+            },
+            {
+                description: translate('workspace.accounting.exportOutOfPocket'),
+                action: () => Navigation.navigate(ROUTES.POLICY_ACCOUNTING_SAGE_INTACCT_REIMBURSABLE_EXPENSES.getRoute(policyID)),
+                title: exportConfig?.reimbursable
+                    ? translate(`workspace.sageIntacct.reimbursableExpenses.values.${exportConfig.reimbursable}`)
+                    : translate('workspace.sageIntacct.notConfigured'),
+                subscribedSettings: [CONST.SAGE_INTACCT_CONFIG.REIMBURSABLE, CONST.SAGE_INTACCT_CONFIG.REIMBURSABLE_VENDOR],
+            },
+            {
+                description: translate('workspace.accounting.exportCompanyCard'),
+                action: () => Navigation.navigate(ROUTES.POLICY_ACCOUNTING_SAGE_INTACCT_NON_REIMBURSABLE_EXPENSES.getRoute(policyID)),
+                title: exportConfig?.nonReimbursable
+                    ? translate(`workspace.sageIntacct.nonReimbursableExpenses.values.${exportConfig.nonReimbursable}`)
+                    : translate('workspace.sageIntacct.notConfigured'),
+                subscribedSettings: [
+                    CONST.SAGE_INTACCT_CONFIG.NON_REIMBURSABLE,
+                    CONST.SAGE_INTACCT_CONFIG.NON_REIMBURSABLE_ACCOUNT,
+                    exportConfig?.nonReimbursable === CONST.SAGE_INTACCT_NON_REIMBURSABLE_EXPENSE_TYPE.VENDOR_BILL
+                        ? CONST.SAGE_INTACCT_CONFIG.NON_REIMBURSABLE_VENDOR
+                        : CONST.SAGE_INTACCT_CONFIG.NON_REIMBURSABLE_CREDIT_CARD_VENDOR,
+                ],
+            },
+        ],
+        [exportConfig, policyID, translate],
+    );
+
+    return (
+        <ConnectionLayout
+            displayName={SageIntacctExportPage.displayName}
+            headerTitle="workspace.accounting.export"
+            headerSubtitle={getCurrentSageIntacctEntityName(policy, translate('workspace.common.topLevel'))}
+            title="workspace.sageIntacct.exportDescription"
+            accessVariants={[CONST.POLICY.ACCESS_VARIANTS.ADMIN, CONST.POLICY.ACCESS_VARIANTS.PAID]}
+            policyID={policyID}
+            featureName={CONST.POLICY.MORE_FEATURES.ARE_CONNECTIONS_ENABLED}
+            contentContainerStyle={styles.pb2}
+            titleStyle={styles.ph5}
+            connectionName={CONST.POLICY.CONNECTIONS.NAME.SAGE_INTACCT}
+        >
+            {sections.map((section) => (
+                <OfflineWithFeedback
+                    key={section.description}
+                    pendingAction={PolicyUtils.settingsPendingAction(section.subscribedSettings, pendingFields)}
+                >
+                    <MenuItemWithTopDescription
+                        title={section.title}
+                        description={section.description}
+                        shouldShowRightIcon
+                        onPress={section.action}
+                        brickRoadIndicator={PolicyUtils.areSettingsInErrorFields(section.subscribedSettings, errorFields) ? CONST.BRICK_ROAD_INDICATOR_STATUS.ERROR : undefined}
+                    />
+                </OfflineWithFeedback>
+            ))}
+        </ConnectionLayout>
+    );
+}
+
+SageIntacctExportPage.displayName = 'SageIntacctExportPage';
+
+export default withPolicyConnections(SageIntacctExportPage);
diff --git a/src/pages/workspace/accounting/intacct/export/SageIntacctNonReimbursableCreditCardAccountPage.tsx b/src/pages/workspace/accounting/intacct/export/SageIntacctNonReimbursableCreditCardAccountPage.tsx
new file mode 100644
index 000000000000..1eaeaeaad0c3
--- /dev/null
+++ b/src/pages/workspace/accounting/intacct/export/SageIntacctNonReimbursableCreditCardAccountPage.tsx
@@ -0,0 +1,78 @@
+import React, {useCallback, useMemo} from 'react';
+import BlockingView from '@components/BlockingViews/BlockingView';
+import * as Illustrations from '@components/Icon/Illustrations';
+import RadioListItem from '@components/SelectionList/RadioListItem';
+import type {SelectorType} from '@components/SelectionScreen';
+import SelectionScreen from '@components/SelectionScreen';
+import useLocalize from '@hooks/useLocalize';
+import useThemeStyles from '@hooks/useThemeStyles';
+import * as ErrorUtils from '@libs/ErrorUtils';
+import Navigation from '@libs/Navigation/Navigation';
+import {getSageIntacctCreditCards, settingsPendingAction} from '@libs/PolicyUtils';
+import type {WithPolicyConnectionsProps} from '@pages/workspace/withPolicyConnections';
+import withPolicyConnections from '@pages/workspace/withPolicyConnections';
+import variables from '@styles/variables';
+import {updateSageIntacctNonreimbursableExpensesExportAccount} from '@userActions/connections/SageIntacct';
+import * as Policy from '@userActions/Policy/Policy';
+import CONST from '@src/CONST';
+import ROUTES from '@src/ROUTES';
+
+function SageIntacctNonReimbursableCreditCardAccountPage({policy}: WithPolicyConnectionsProps) {
+    const styles = useThemeStyles();
+    const {translate} = useLocalize();
+
+    const policyID = policy?.id ?? '-1';
+    const {config} = policy?.connections?.intacct ?? {};
+    const {export: exportConfig} = policy?.connections?.intacct?.config ?? {};
+
+    const creditCardSelectorOptions = useMemo<SelectorType[]>(() => getSageIntacctCreditCards(policy, exportConfig?.nonReimbursableAccount), [exportConfig?.nonReimbursableAccount, policy]);
+
+    const updateCreditCardAccount = useCallback(
+        ({value}: SelectorType) => {
+            if (value !== exportConfig?.nonReimbursableAccount) {
+                updateSageIntacctNonreimbursableExpensesExportAccount(policyID, value, exportConfig?.nonReimbursableAccount);
+            }
+            Navigation.goBack(ROUTES.POLICY_ACCOUNTING_SAGE_INTACCT_NON_REIMBURSABLE_EXPENSES.getRoute(policyID));
+        },
+        [policyID, exportConfig?.nonReimbursableAccount],
+    );
+
+    const listEmptyContent = useMemo(
+        () => (
+            <BlockingView
+                icon={Illustrations.TeleScope}
+                iconWidth={variables.emptyListIconWidth}
+                iconHeight={variables.emptyListIconHeight}
+                title={translate('workspace.sageIntacct.noAccountsFound')}
+                subtitle={translate('workspace.sageIntacct.noAccountsFoundDescription')}
+                containerStyle={styles.pb10}
+            />
+        ),
+        [translate, styles.pb10],
+    );
+
+    return (
+        <SelectionScreen
+            policyID={policyID}
+            featureName={CONST.POLICY.MORE_FEATURES.ARE_CONNECTIONS_ENABLED}
+            displayName={SageIntacctNonReimbursableCreditCardAccountPage.displayName}
+            sections={creditCardSelectorOptions.length ? [{data: creditCardSelectorOptions}] : []}
+            listItem={RadioListItem}
+            onSelectRow={updateCreditCardAccount}
+            initiallyFocusedOptionKey={creditCardSelectorOptions.find((mode) => mode.isSelected)?.keyForList}
+            onBackButtonPress={() => Navigation.goBack(ROUTES.POLICY_ACCOUNTING_SAGE_INTACCT_NON_REIMBURSABLE_EXPENSES.getRoute(policyID))}
+            title="workspace.sageIntacct.creditCardAccount"
+            listEmptyContent={listEmptyContent}
+            accessVariants={[CONST.POLICY.ACCESS_VARIANTS.ADMIN, CONST.POLICY.ACCESS_VARIANTS.PAID]}
+            connectionName={CONST.POLICY.CONNECTIONS.NAME.SAGE_INTACCT}
+            pendingAction={settingsPendingAction([CONST.SAGE_INTACCT_CONFIG.NON_REIMBURSABLE_ACCOUNT], config?.pendingFields)}
+            errors={ErrorUtils.getLatestErrorField(config ?? {}, CONST.SAGE_INTACCT_CONFIG.NON_REIMBURSABLE_ACCOUNT)}
+            errorRowStyles={[styles.ph5, styles.pv3]}
+            onClose={() => Policy.clearSageIntacctErrorField(policyID, CONST.SAGE_INTACCT_CONFIG.NON_REIMBURSABLE_ACCOUNT)}
+        />
+    );
+}
+
+SageIntacctNonReimbursableCreditCardAccountPage.displayName = 'SageIntacctNonReimbursableCreditCardAccountPage';
+
+export default withPolicyConnections(SageIntacctNonReimbursableCreditCardAccountPage);
diff --git a/src/pages/workspace/accounting/intacct/export/SageIntacctNonReimbursableExpensesPage.tsx b/src/pages/workspace/accounting/intacct/export/SageIntacctNonReimbursableExpensesPage.tsx
new file mode 100644
index 000000000000..808c497c05da
--- /dev/null
+++ b/src/pages/workspace/accounting/intacct/export/SageIntacctNonReimbursableExpensesPage.tsx
@@ -0,0 +1,177 @@
+import React, {useCallback, useMemo} from 'react';
+import {View} from 'react-native';
+import type {ValueOf} from 'type-fest';
+import ConnectionLayout from '@components/ConnectionLayout';
+import MenuItemWithTopDescription from '@components/MenuItemWithTopDescription';
+import OfflineWithFeedback from '@components/OfflineWithFeedback';
+import SelectionList from '@components/SelectionList';
+import RadioListItem from '@components/SelectionList/RadioListItem';
+import type {ListItem} from '@components/SelectionList/types';
+import type {SelectorType} from '@components/SelectionScreen';
+import useLocalize from '@hooks/useLocalize';
+import useThemeStyles from '@hooks/useThemeStyles';
+import * as ErrorUtils from '@libs/ErrorUtils';
+import {areSettingsInErrorFields, getSageIntacctNonReimbursableActiveDefaultVendor, settingsPendingAction} from '@libs/PolicyUtils';
+import Navigation from '@navigation/Navigation';
+import type {WithPolicyProps} from '@pages/workspace/withPolicy';
+import withPolicyConnections from '@pages/workspace/withPolicyConnections';
+import ToggleSettingOptionRow from '@pages/workspace/workflows/ToggleSettingsOptionRow';
+import {updateSageIntacctDefaultVendor, updateSageIntacctNonreimbursableExpensesExportDestination} from '@userActions/connections/SageIntacct';
+import * as Policy from '@userActions/Policy/Policy';
+import CONST from '@src/CONST';
+import ROUTES from '@src/ROUTES';
+import type {SageIntacctDataElementWithValue} from '@src/types/onyx/Policy';
+
+type MenuListItem = ListItem & {
+    value: ValueOf<typeof CONST.SAGE_INTACCT_NON_REIMBURSABLE_EXPENSE_TYPE>;
+};
+
+function getDefaultVendorName(defaultVendor?: string, vendors?: SageIntacctDataElementWithValue[]): string | undefined {
+    return (vendors ?? []).find((vendor) => vendor.id === defaultVendor)?.value ?? defaultVendor;
+}
+
+function SageIntacctNonReimbursableExpensesPage({policy}: WithPolicyProps) {
+    const {translate} = useLocalize();
+    const policyID = policy?.id ?? '-1';
+    const styles = useThemeStyles();
+    const {data: intacctData, config} = policy?.connections?.intacct ?? {};
+
+    const data: MenuListItem[] = Object.values(CONST.SAGE_INTACCT_NON_REIMBURSABLE_EXPENSE_TYPE).map((expenseType) => ({
+        value: expenseType,
+        text: translate(`workspace.sageIntacct.nonReimbursableExpenses.values.${expenseType}`),
+        keyForList: expenseType,
+        isSelected: config?.export.nonReimbursable === expenseType,
+    }));
+
+    const selectNonReimbursableExpense = useCallback(
+        (row: MenuListItem) => {
+            if (row.value === config?.export.nonReimbursable) {
+                return;
+            }
+            updateSageIntacctNonreimbursableExpensesExportDestination(policyID, row.value, config?.export.nonReimbursable);
+        },
+        [config?.export.nonReimbursable, policyID],
+    );
+
+    const defaultVendor = useMemo(() => {
+        const activeDefaultVendor = getSageIntacctNonReimbursableActiveDefaultVendor(policy);
+        const defaultVendorName = getDefaultVendorName(activeDefaultVendor, intacctData?.vendors);
+
+        const defaultVendorSection = {
+            description: translate('workspace.sageIntacct.defaultVendor'),
+            action: () => Navigation.navigate(ROUTES.POLICY_ACCOUNTING_SAGE_INTACCT_DEFAULT_VENDOR.getRoute(policyID, CONST.SAGE_INTACCT_CONFIG.NON_REIMBURSABLE.toLowerCase())),
+            title: defaultVendorName && defaultVendorName !== '' ? defaultVendorName : translate('workspace.sageIntacct.notConfigured'),
+            subscribedSettings: [
+                config?.export.nonReimbursable === CONST.SAGE_INTACCT_NON_REIMBURSABLE_EXPENSE_TYPE.VENDOR_BILL
+                    ? CONST.SAGE_INTACCT_CONFIG.NON_REIMBURSABLE_VENDOR
+                    : CONST.SAGE_INTACCT_CONFIG.NON_REIMBURSABLE_CREDIT_CARD_VENDOR,
+            ],
+        };
+
+        return (
+            <OfflineWithFeedback
+                key={defaultVendorSection.description}
+                pendingAction={settingsPendingAction(defaultVendorSection.subscribedSettings, config?.pendingFields)}
+            >
+                <MenuItemWithTopDescription
+                    title={defaultVendorSection.title}
+                    description={defaultVendorSection.description}
+                    shouldShowRightIcon
+                    onPress={defaultVendorSection.action}
+                    brickRoadIndicator={areSettingsInErrorFields(defaultVendorSection.subscribedSettings, config?.errorFields) ? CONST.BRICK_ROAD_INDICATOR_STATUS.ERROR : undefined}
+                />
+            </OfflineWithFeedback>
+        );
+    }, [config?.errorFields, config?.export.nonReimbursable, config?.pendingFields, intacctData?.vendors, policy, policyID, translate]);
+
+    const creditCardAccount = useMemo(() => {
+        const creditCardAccountSection = {
+            description: translate('workspace.sageIntacct.creditCardAccount'),
+            action: () => Navigation.navigate(ROUTES.POLICY_ACCOUNTING_SAGE_INTACCT_NON_REIMBURSABLE_CREDIT_CARD_ACCOUNT.getRoute(policyID)),
+            title: config?.export.nonReimbursableAccount ? config.export.nonReimbursableAccount : translate('workspace.sageIntacct.notConfigured'),
+            subscribedSettings: [CONST.SAGE_INTACCT_CONFIG.NON_REIMBURSABLE_ACCOUNT],
+        };
+
+        return (
+            <OfflineWithFeedback
+                key={creditCardAccountSection.description}
+                pendingAction={settingsPendingAction(creditCardAccountSection.subscribedSettings, config?.pendingFields)}
+            >
+                <MenuItemWithTopDescription
+                    title={creditCardAccountSection.title}
+                    description={creditCardAccountSection.description}
+                    shouldShowRightIcon
+                    onPress={creditCardAccountSection.action}
+                    brickRoadIndicator={areSettingsInErrorFields(creditCardAccountSection.subscribedSettings, config?.errorFields) ? CONST.BRICK_ROAD_INDICATOR_STATUS.ERROR : undefined}
+                />
+            </OfflineWithFeedback>
+        );
+    }, [config?.errorFields, config?.export.nonReimbursableAccount, config?.pendingFields, policyID, translate]);
+
+    return (
+        <ConnectionLayout
+            headerTitle="workspace.accounting.exportCompanyCard"
+            title="workspace.sageIntacct.nonReimbursableExpenses.description"
+            titleStyle={[styles.ph5, styles.pb5]}
+            onBackButtonPress={() => Navigation.goBack(ROUTES.POLICY_ACCOUNTING_SAGE_INTACCT_EXPORT.getRoute(policyID))}
+            accessVariants={[CONST.POLICY.ACCESS_VARIANTS.ADMIN, CONST.POLICY.ACCESS_VARIANTS.PAID]}
+            featureName={CONST.POLICY.MORE_FEATURES.ARE_CONNECTIONS_ENABLED}
+            displayName={SageIntacctNonReimbursableExpensesPage.displayName}
+            policyID={policyID}
+            connectionName={CONST.POLICY.CONNECTIONS.NAME.SAGE_INTACCT}
+            shouldUseScrollView={false}
+            shouldIncludeSafeAreaPaddingBottom
+        >
+            <OfflineWithFeedback
+                pendingAction={settingsPendingAction([CONST.SAGE_INTACCT_CONFIG.NON_REIMBURSABLE], config?.pendingFields)}
+                errors={ErrorUtils.getLatestErrorField(config, CONST.SAGE_INTACCT_CONFIG.NON_REIMBURSABLE)}
+                errorRowStyles={[styles.ph5, styles.pv3]}
+                onClose={() => Policy.clearSageIntacctErrorField(policyID, CONST.SAGE_INTACCT_CONFIG.NON_REIMBURSABLE)}
+                style={[styles.flexGrow1, styles.flexShrink1]}
+                contentContainerStyle={[styles.flexGrow1, styles.flexShrink1]}
+            >
+                <SelectionList
+                    onSelectRow={(selection: SelectorType) => selectNonReimbursableExpense(selection as MenuListItem)}
+                    sections={[{data}]}
+                    ListItem={RadioListItem}
+                    showScrollIndicator
+                    shouldShowTooltips={false}
+                    containerStyle={[styles.flexReset, styles.flexGrow1, styles.flexShrink1, styles.pb0]}
+                />
+            </OfflineWithFeedback>
+            <View style={[styles.flexGrow1, styles.flexShrink1]}>
+                {config?.export.nonReimbursable === CONST.SAGE_INTACCT_NON_REIMBURSABLE_EXPENSE_TYPE.VENDOR_BILL && defaultVendor}
+                {config?.export.nonReimbursable === CONST.SAGE_INTACCT_NON_REIMBURSABLE_EXPENSE_TYPE.CREDIT_CARD_CHARGE && (
+                    <View>
+                        {creditCardAccount}
+                        <ToggleSettingOptionRow
+                            title={translate('workspace.sageIntacct.defaultVendor')}
+                            subtitle={translate('workspace.sageIntacct.defaultVendorDescription', false)}
+                            shouldPlaceSubtitleBelowSwitch
+                            switchAccessibilityLabel={translate('workspace.sageIntacct.defaultVendor')}
+                            isActive={!!config?.export.nonReimbursableCreditCardChargeDefaultVendor}
+                            onToggle={(enabled) => {
+                                const vendor = enabled ? policy?.connections?.intacct?.data?.vendors?.[0].id ?? '' : '';
+                                updateSageIntacctDefaultVendor(
+                                    policyID,
+                                    CONST.SAGE_INTACCT_CONFIG.NON_REIMBURSABLE_CREDIT_CARD_VENDOR,
+                                    vendor,
+                                    config?.export.nonReimbursableCreditCardChargeDefaultVendor,
+                                );
+                            }}
+                            wrapperStyle={[styles.ph5, styles.pv3]}
+                            pendingAction={settingsPendingAction([CONST.SAGE_INTACCT_CONFIG.NON_REIMBURSABLE_CREDIT_CARD_VENDOR], config?.pendingFields)}
+                            errors={ErrorUtils.getLatestErrorField(config, CONST.SAGE_INTACCT_CONFIG.NON_REIMBURSABLE_CREDIT_CARD_VENDOR)}
+                            onCloseError={() => Policy.clearSageIntacctErrorField(policyID, CONST.SAGE_INTACCT_CONFIG.NON_REIMBURSABLE_CREDIT_CARD_VENDOR)}
+                        />
+                        {!!config?.export.nonReimbursableCreditCardChargeDefaultVendor && defaultVendor}
+                    </View>
+                )}
+            </View>
+        </ConnectionLayout>
+    );
+}
+
+SageIntacctNonReimbursableExpensesPage.displayName = 'SageIntacctNonReimbursableExpensesPage';
+
+export default withPolicyConnections(SageIntacctNonReimbursableExpensesPage);
diff --git a/src/pages/workspace/accounting/intacct/export/SageIntacctPreferredExporterPage.tsx b/src/pages/workspace/accounting/intacct/export/SageIntacctPreferredExporterPage.tsx
new file mode 100644
index 000000000000..0617b8b690fe
--- /dev/null
+++ b/src/pages/workspace/accounting/intacct/export/SageIntacctPreferredExporterPage.tsx
@@ -0,0 +1,111 @@
+import {isEmpty} from 'lodash';
+import React, {useCallback, useMemo} from 'react';
+import {View} from 'react-native';
+import RadioListItem from '@components/SelectionList/RadioListItem';
+import type {ListItem} from '@components/SelectionList/types';
+import SelectionScreen from '@components/SelectionScreen';
+import Text from '@components/Text';
+import useCurrentUserPersonalDetails from '@hooks/useCurrentUserPersonalDetails';
+import useLocalize from '@hooks/useLocalize';
+import useThemeStyles from '@hooks/useThemeStyles';
+import * as ErrorUtils from '@libs/ErrorUtils';
+import {getAdminEmployees, isExpensifyTeam, settingsPendingAction} from '@libs/PolicyUtils';
+import Navigation from '@navigation/Navigation';
+import type {WithPolicyProps} from '@pages/workspace/withPolicy';
+import withPolicyConnections from '@pages/workspace/withPolicyConnections';
+import {updateSageIntacctExporter} from '@userActions/connections/SageIntacct';
+import * as Policy from '@userActions/Policy/Policy';
+import CONST from '@src/CONST';
+import ROUTES from '@src/ROUTES';
+
+type CardListItem = ListItem & {
+    value: string;
+};
+
+function SageIntacctPreferredExporterPage({policy}: WithPolicyProps) {
+    const {translate} = useLocalize();
+    const styles = useThemeStyles();
+    const policyOwner = policy?.owner ?? '';
+    const {config} = policy?.connections?.intacct ?? {};
+    const {export: exportConfiguration, pendingFields} = policy?.connections?.intacct?.config ?? {};
+    const exporters = getAdminEmployees(policy);
+    const {login: currentUserLogin} = useCurrentUserPersonalDetails();
+
+    const policyID = policy?.id ?? '-1';
+    const data: CardListItem[] = useMemo(() => {
+        if (!isEmpty(policyOwner) && isEmpty(exporters)) {
+            return [
+                {
+                    value: policyOwner,
+                    text: policyOwner,
+                    keyForList: policyOwner,
+                    isSelected: exportConfiguration?.exporter === policyOwner,
+                },
+            ];
+        }
+
+        return exporters?.reduce<CardListItem[]>((options, exporter) => {
+            if (!exporter.email) {
+                return options;
+            }
+
+            // Don't show guides if the current user is not a guide themselves or an Expensify employee
+            if (isExpensifyTeam(exporter.email) && !isExpensifyTeam(policyOwner) && !isExpensifyTeam(currentUserLogin)) {
+                return options;
+            }
+
+            options.push({
+                value: exporter.email,
+                text: exporter.email,
+                keyForList: exporter.email,
+                isSelected: exportConfiguration?.exporter === exporter.email,
+            });
+            return options;
+        }, []);
+    }, [exportConfiguration, exporters, policyOwner, currentUserLogin]);
+
+    const selectExporter = useCallback(
+        (row: CardListItem) => {
+            if (row.value !== exportConfiguration?.exporter) {
+                updateSageIntacctExporter(policyID, row.value, exportConfiguration?.exporter);
+            }
+            Navigation.goBack(ROUTES.POLICY_ACCOUNTING_SAGE_INTACCT_EXPORT.getRoute(policyID));
+        },
+        [policyID, exportConfiguration],
+    );
+
+    const headerContent = useMemo(
+        () => (
+            <View style={[styles.pb2, styles.ph5]}>
+                <Text style={[styles.pb2, styles.textNormal]}>{translate('workspace.sageIntacct.exportPreferredExporterNote')}</Text>
+                <Text style={[styles.pb5, styles.textNormal]}>{translate('workspace.sageIntacct.exportPreferredExporterSubNote')}</Text>
+            </View>
+        ),
+        [translate, styles.pb2, styles.ph5, styles.pb5, styles.textNormal],
+    );
+
+    return (
+        <SelectionScreen
+            policyID={policyID}
+            accessVariants={[CONST.POLICY.ACCESS_VARIANTS.ADMIN, CONST.POLICY.ACCESS_VARIANTS.PAID]}
+            featureName={CONST.POLICY.MORE_FEATURES.ARE_CONNECTIONS_ENABLED}
+            displayName={SageIntacctPreferredExporterPage.displayName}
+            sections={[{data}]}
+            listItem={RadioListItem}
+            headerContent={headerContent}
+            onSelectRow={selectExporter}
+            initiallyFocusedOptionKey={data.find((mode) => mode.isSelected)?.keyForList}
+            onBackButtonPress={() => Navigation.goBack(ROUTES.POLICY_ACCOUNTING_SAGE_INTACCT_EXPORT.getRoute(policyID))}
+            title="workspace.sageIntacct.preferredExporter"
+            connectionName={CONST.POLICY.CONNECTIONS.NAME.SAGE_INTACCT}
+            pendingAction={settingsPendingAction([CONST.SAGE_INTACCT_CONFIG.EXPORTER], pendingFields)}
+            errors={ErrorUtils.getLatestErrorField(config ?? {}, CONST.SAGE_INTACCT_CONFIG.EXPORTER)}
+            errorRowStyles={[styles.ph5, styles.pv3]}
+            onClose={() => Policy.clearSageIntacctErrorField(policyID, CONST.SAGE_INTACCT_CONFIG.EXPORTER)}
+        />
+    );
+}
+
+SageIntacctPreferredExporterPage.displayName = 'SageIntacctPreferredExporterPage';
+
+export default withPolicyConnections(SageIntacctPreferredExporterPage);
diff --git a/src/pages/workspace/accounting/intacct/export/SageIntacctReimbursableExpensesPage.tsx b/src/pages/workspace/accounting/intacct/export/SageIntacctReimbursableExpensesPage.tsx
new file mode 100644
index 000000000000..360da1ac7a2d
--- /dev/null
+++ b/src/pages/workspace/accounting/intacct/export/SageIntacctReimbursableExpensesPage.tsx
@@ -0,0 +1,143 @@
+import React, {useCallback, useMemo} from 'react';
+import {View} from 'react-native';
+import type {ValueOf} from 'type-fest';
+import ConnectionLayout from '@components/ConnectionLayout';
+import MenuItemWithTopDescription from '@components/MenuItemWithTopDescription';
+import OfflineWithFeedback from '@components/OfflineWithFeedback';
+import SelectionList from '@components/SelectionList';
+import RadioListItem from '@components/SelectionList/RadioListItem';
+import type {ListItem} from '@components/SelectionList/types';
+import type {SelectorType} from '@components/SelectionScreen';
+import useLocalize from '@hooks/useLocalize';
+import useThemeStyles from '@hooks/useThemeStyles';
+import * as ErrorUtils from '@libs/ErrorUtils';
+import {areSettingsInErrorFields, settingsPendingAction} from '@libs/PolicyUtils';
+import Navigation from '@navigation/Navigation';
+import type {WithPolicyProps} from '@pages/workspace/withPolicy';
+import withPolicyConnections from '@pages/workspace/withPolicyConnections';
+import ToggleSettingOptionRow from '@pages/workspace/workflows/ToggleSettingsOptionRow';
+import {changeMappingsValueFromDefaultToTag, updateSageIntacctDefaultVendor, updateSageIntacctReimbursableExpensesExportDestination} from '@userActions/connections/SageIntacct';
+import * as Policy from '@userActions/Policy/Policy';
+import CONST from '@src/CONST';
+import ROUTES from '@src/ROUTES';
+import type {SageIntacctDataElementWithValue} from '@src/types/onyx/Policy';
+
+type MenuListItem = ListItem & {
+    value: ValueOf<typeof CONST.SAGE_INTACCT_REIMBURSABLE_EXPENSE_TYPE>;
+};
+
+function getDefaultVendorName(defaultVendor?: string, vendors?: SageIntacctDataElementWithValue[]): string | undefined {
+    return (vendors ?? []).find((vendor) => vendor.id === defaultVendor)?.value ?? defaultVendor;
+}
+
+function SageIntacctReimbursableExpensesPage({policy}: WithPolicyProps) {
+    const {translate} = useLocalize();
+    const policyID = policy?.id ?? '-1';
+    const styles = useThemeStyles();
+    const {data: intacctData, config} = policy?.connections?.intacct ?? {};
+    const {reimbursable, reimbursableExpenseReportDefaultVendor} = policy?.connections?.intacct?.config?.export ?? {};
+
+    const data: MenuListItem[] = Object.values(CONST.SAGE_INTACCT_REIMBURSABLE_EXPENSE_TYPE).map((expenseType) => ({
+        value: expenseType,
+        text: translate(`workspace.sageIntacct.reimbursableExpenses.values.${expenseType}`),
+        keyForList: expenseType,
+        isSelected: reimbursable === expenseType,
+    }));
+
+    const selectReimbursableDestination = useCallback(
+        (row: MenuListItem) => {
+            if (row.value !== reimbursable) {
+                updateSageIntacctReimbursableExpensesExportDestination(policyID, row.value, reimbursable);
+            }
+            if (row.value === CONST.SAGE_INTACCT_REIMBURSABLE_EXPENSE_TYPE.VENDOR_BILL) {
+                // Employee default mapping value is not allowed when expense type is VENDOR_BILL, so we have to change mapping value to Tag
+                changeMappingsValueFromDefaultToTag(policyID, config?.mappings);
+                Navigation.goBack(ROUTES.POLICY_ACCOUNTING_SAGE_INTACCT_EXPORT.getRoute(policyID));
+            }
+        },
+        [reimbursable, policyID, config?.mappings],
+    );
+
+    const defaultVendor = useMemo(() => {
+        const defaultVendorName = getDefaultVendorName(reimbursableExpenseReportDefaultVendor, intacctData?.vendors);
+        const defaultVendorSection = {
+            description: translate('workspace.sageIntacct.defaultVendor'),
+            action: () => Navigation.navigate(ROUTES.POLICY_ACCOUNTING_SAGE_INTACCT_DEFAULT_VENDOR.getRoute(policyID, CONST.SAGE_INTACCT_CONFIG.REIMBURSABLE)),
+            title: defaultVendorName && defaultVendorName !== '' ? defaultVendorName : translate('workspace.sageIntacct.notConfigured'),
+            subscribedSettings: [CONST.SAGE_INTACCT_CONFIG.REIMBURSABLE_VENDOR],
+        };
+
+        return (
+            <OfflineWithFeedback
+                key={defaultVendorSection.description}
+                pendingAction={settingsPendingAction(defaultVendorSection.subscribedSettings, config?.pendingFields)}
+            >
+                <MenuItemWithTopDescription
+                    title={defaultVendorSection.title}
+                    description={defaultVendorSection.description}
+                    shouldShowRightIcon
+                    onPress={defaultVendorSection.action}
+                    brickRoadIndicator={areSettingsInErrorFields(defaultVendorSection.subscribedSettings, config?.errorFields) ? CONST.BRICK_ROAD_INDICATOR_STATUS.ERROR : undefined}
+                />
+            </OfflineWithFeedback>
+        );
+    }, [config?.errorFields, config?.pendingFields, intacctData?.vendors, policyID, reimbursableExpenseReportDefaultVendor, translate]);
+
+    return (
+        <ConnectionLayout
+            headerTitle="workspace.accounting.exportOutOfPocket"
+            title="workspace.sageIntacct.reimbursableExpenses.description"
+            titleStyle={[styles.ph5, styles.pb5]}
+            onBackButtonPress={() => Navigation.goBack(ROUTES.POLICY_ACCOUNTING_SAGE_INTACCT_EXPORT.getRoute(policyID))}
+            accessVariants={[CONST.POLICY.ACCESS_VARIANTS.ADMIN, CONST.POLICY.ACCESS_VARIANTS.PAID]}
+            featureName={CONST.POLICY.MORE_FEATURES.ARE_CONNECTIONS_ENABLED}
+            displayName={SageIntacctReimbursableExpensesPage.displayName}
+            policyID={policyID}
+            connectionName={CONST.POLICY.CONNECTIONS.NAME.SAGE_INTACCT}
+            shouldUseScrollView={false}
+            shouldIncludeSafeAreaPaddingBottom
+        >
+            <OfflineWithFeedback
+                pendingAction={settingsPendingAction([CONST.SAGE_INTACCT_CONFIG.REIMBURSABLE], config?.pendingFields)}
+                errors={ErrorUtils.getLatestErrorField(config, CONST.SAGE_INTACCT_CONFIG.REIMBURSABLE)}
+                errorRowStyles={[styles.ph5, styles.pv3]}
+                onClose={() => Policy.clearSageIntacctErrorField(policyID, CONST.SAGE_INTACCT_CONFIG.REIMBURSABLE)}
+                style={[styles.flexGrow1, styles.flexShrink1]}
+                contentContainerStyle={[styles.flexGrow1, styles.flexShrink1]}
+            >
+                <SelectionList
+                    onSelectRow={(selection: SelectorType) => selectReimbursableDestination(selection as MenuListItem)}
+                    sections={[{data}]}
+                    ListItem={RadioListItem}
+                    showScrollIndicator
+                    shouldShowTooltips={false}
+                    containerStyle={[styles.flexReset, styles.flexGrow1, styles.flexShrink1, styles.pb0]}
+                />
+            </OfflineWithFeedback>
+            {reimbursable === CONST.SAGE_INTACCT_REIMBURSABLE_EXPENSE_TYPE.EXPENSE_REPORT && (
+                <View style={[styles.flexGrow1, styles.flexShrink1]}>
+                    <ToggleSettingOptionRow
+                        title={translate('workspace.sageIntacct.defaultVendor')}
+                        subtitle={translate('workspace.sageIntacct.defaultVendorDescription', true)}
+                        shouldPlaceSubtitleBelowSwitch
+                        switchAccessibilityLabel={translate('workspace.sageIntacct.defaultVendor')}
+                        isActive={!!reimbursableExpenseReportDefaultVendor}
+                        onToggle={(enabled) => {
+                            const vendor = enabled ? policy?.connections?.intacct?.data?.vendors?.[0].id ?? '' : '';
+                            updateSageIntacctDefaultVendor(policyID, CONST.SAGE_INTACCT_CONFIG.REIMBURSABLE_VENDOR, vendor, reimbursableExpenseReportDefaultVendor);
+                        }}
+                        pendingAction={settingsPendingAction([CONST.SAGE_INTACCT_CONFIG.REIMBURSABLE_VENDOR], config?.pendingFields)}
+                        errors={ErrorUtils.getLatestErrorField(config, CONST.SAGE_INTACCT_CONFIG.REIMBURSABLE_VENDOR)}
+                        wrapperStyle={[styles.ph5, styles.pv3]}
+                        onCloseError={() => Policy.clearSageIntacctErrorField(policyID, CONST.SAGE_INTACCT_CONFIG.REIMBURSABLE_VENDOR)}
+                    />
+                    {!!reimbursableExpenseReportDefaultVendor && defaultVendor}
+                </View>
+            )}
+        </ConnectionLayout>
+    );
+}
+
+SageIntacctReimbursableExpensesPage.displayName = 'SageIntacctReimbursableExpensesPage';
+
+export default withPolicyConnections(SageIntacctReimbursableExpensesPage);
diff --git a/src/pages/workspace/accounting/intacct/import/DimensionTypeSelector.tsx b/src/pages/workspace/accounting/intacct/import/DimensionTypeSelector.tsx
new file mode 100644
index 000000000000..05d0c0438c8f
--- /dev/null
+++ b/src/pages/workspace/accounting/intacct/import/DimensionTypeSelector.tsx
@@ -0,0 +1,75 @@
+import React from 'react';
+import {View} from 'react-native';
+import FormHelpMessage from '@components/FormHelpMessage';
+import RadioListItem from '@components/SelectionList/RadioListItem';
+import type {SelectorType} from '@components/SelectionScreen';
+import Text from '@components/Text';
+import useLocalize from '@hooks/useLocalize';
+import useThemeStyles from '@hooks/useThemeStyles';
+import CONST from '@src/CONST';
+
+type DimensionTypeSelectorProps = {
+    /** Error text to display */
+    errorText?: string;
+
+    /** Business type to display */
+    value?: string;
+
+    /** Callback to call when the input changes */
+    onInputChange?: (value: string) => void;
+};
+
+function DimensionTypeSelector({errorText = '', value = '', onInputChange}: DimensionTypeSelectorProps) {
+    const {translate} = useLocalize();
+    const styles = useThemeStyles();
+
+    const selectionOptions = [
+        {
+            value: CONST.SAGE_INTACCT_MAPPING_VALUE.TAG,
+            text: translate('common.tag'),
+            alternateText: translate('workspace.common.lineItemLevel'),
+            keyForList: CONST.SAGE_INTACCT_MAPPING_VALUE.TAG,
+            isSelected: value === CONST.SAGE_INTACCT_MAPPING_VALUE.TAG,
+        },
+        {
+            value: CONST.SAGE_INTACCT_MAPPING_VALUE.REPORT_FIELD,
+            text: translate('workspace.common.reportField'),
+            alternateText: translate('workspace.common.reportLevel'),
+            keyForList: CONST.SAGE_INTACCT_MAPPING_VALUE.REPORT_FIELD,
+            isSelected: value === CONST.SAGE_INTACCT_MAPPING_VALUE.REPORT_FIELD,
+        },
+    ];
+
+    const onDimensionTypeSelected = (dimensionType: SelectorType) => {
+        if (!onInputChange || dimensionType.value === value) {
+            return;
+        }
+        onInputChange(dimensionType.value);
+    };
+
+    return (
+        <View>
+            <Text style={[styles.textLabelSupporting, styles.mb1]}>{translate('workspace.common.displayedAs')}</Text>
+            <View style={[styles.mhn5, styles.pb5, styles.mb0]}>
+                {selectionOptions.map((option) => (
+                    <RadioListItem
+                        key={option.value}
+                        item={option}
+                        showTooltip={false}
+                        isFocused={option.isSelected}
+                        onSelectRow={onDimensionTypeSelected}
+                    />
+                ))}
+                {!!errorText && (
+                    <FormHelpMessage
+                        style={styles.mh5}
+                        isError={!!errorText}
+                        message={errorText}
+                    />
+                )}
+            </View>
+        </View>
+    );
+}
+
+export default DimensionTypeSelector;
diff --git a/src/pages/workspace/accounting/intacct/import/SageIntacctAddUserDimensionPage.tsx b/src/pages/workspace/accounting/intacct/import/SageIntacctAddUserDimensionPage.tsx
new file mode 100644
index 000000000000..3dc7a325650b
--- /dev/null
+++ b/src/pages/workspace/accounting/intacct/import/SageIntacctAddUserDimensionPage.tsx
@@ -0,0 +1,101 @@
+import React, {useCallback} from 'react';
+import {View} from 'react-native';
+import ConnectionLayout from '@components/ConnectionLayout';
+import FormProvider from '@components/Form/FormProvider';
+import InputWrapper from '@components/Form/InputWrapper';
+import type {FormInputErrors, FormOnyxValues} from '@components/Form/types';
+import TextInput from '@components/TextInput';
+import useAutoFocusInput from '@hooks/useAutoFocusInput';
+import useLocalize from '@hooks/useLocalize';
+import useThemeStyles from '@hooks/useThemeStyles';
+import {addSageIntacctUserDimensions} from '@libs/actions/connections/SageIntacct';
+import * as ErrorUtils from '@libs/ErrorUtils';
+import Navigation from '@libs/Navigation/Navigation';
+import withPolicy from '@pages/workspace/withPolicy';
+import type {WithPolicyProps} from '@pages/workspace/withPolicy';
+import CONST from '@src/CONST';
+import ONYXKEYS from '@src/ONYXKEYS';
+import ROUTES from '@src/ROUTES';
+import INPUT_IDS from '@src/types/form/SageIntacctDimensionsForm';
+import DimensionTypeSelector from './DimensionTypeSelector';
+
+function SageIntacctAddUserDimensionPage({policy}: WithPolicyProps) {
+    const styles = useThemeStyles();
+    const {translate} = useLocalize();
+
+    const policyID = policy?.id ?? '-1';
+    const userDimensions = policy?.connections?.intacct?.config?.mappings?.dimensions;
+    const {inputCallbackRef} = useAutoFocusInput();
+
+    const validate = useCallback(
+        (values: FormOnyxValues<typeof ONYXKEYS.FORMS.SAGE_INTACCT_DIMENSION_TYPE_FORM>) => {
+            const errors: FormInputErrors<typeof ONYXKEYS.FORMS.SAGE_INTACCT_DIMENSION_TYPE_FORM> = {};
+
+            if (!values[INPUT_IDS.INTEGRATION_NAME]) {
+                ErrorUtils.addErrorMessage(errors, INPUT_IDS.INTEGRATION_NAME, translate('common.error.fieldRequired'));
+            }
+
+            if (userDimensions?.some((userDimension) => userDimension.dimension === values[INPUT_IDS.INTEGRATION_NAME])) {
+                ErrorUtils.addErrorMessage(errors, INPUT_IDS.INTEGRATION_NAME, translate('workspace.intacct.dimensionExists'));
+            }
+
+            if (!values[INPUT_IDS.DIMENSION_TYPE]) {
+                ErrorUtils.addErrorMessage(errors, INPUT_IDS.DIMENSION_TYPE, translate('common.error.fieldRequired'));
+            }
+            return errors;
+        },
+        [translate, userDimensions],
+    );
+
+    return (
+        <ConnectionLayout
+            displayName={SageIntacctAddUserDimensionPage.displayName}
+            headerTitle="workspace.intacct.addUserDefinedDimension"
+            accessVariants={[CONST.POLICY.ACCESS_VARIANTS.ADMIN, CONST.POLICY.ACCESS_VARIANTS.PAID]}
+            policyID={policyID}
+            featureName={CONST.POLICY.MORE_FEATURES.ARE_CONNECTIONS_ENABLED}
+            contentContainerStyle={styles.flex1}
+            shouldUseScrollView={false}
+            titleStyle={styles.ph5}
+            connectionName={CONST.POLICY.CONNECTIONS.NAME.SAGE_INTACCT}
+            onBackButtonPress={() => Navigation.goBack(ROUTES.POLICY_ACCOUNTING_SAGE_INTACCT_USER_DIMENSIONS.getRoute(policyID))}
+        >
+            <FormProvider
+                style={[styles.flexGrow1, styles.ph5]}
+                formID={ONYXKEYS.FORMS.SAGE_INTACCT_DIMENSION_TYPE_FORM}
+                validate={validate}
+                onSubmit={(value) => {
+                    addSageIntacctUserDimensions(policyID, value[INPUT_IDS.INTEGRATION_NAME], value[INPUT_IDS.DIMENSION_TYPE], userDimensions ?? []);
+                    Navigation.goBack(ROUTES.POLICY_ACCOUNTING_SAGE_INTACCT_USER_DIMENSIONS.getRoute(policyID));
+                }}
+                submitButtonText={translate('common.confirm')}
+                enabledWhenOffline
+                shouldValidateOnBlur
+                shouldValidateOnChange
+            >
+                <View style={styles.mb4}>
+                    <InputWrapper
+                        InputComponent={TextInput}
+                        inputID={INPUT_IDS.INTEGRATION_NAME}
+                        label={translate('workspace.intacct.integrationName')}
+                        aria-label={translate('workspace.intacct.integrationName')}
+                        role={CONST.ROLE.PRESENTATION}
+                        spellCheck={false}
+                        ref={inputCallbackRef}
+                    />
+                </View>
+                <View>
+                    <InputWrapper
+                        InputComponent={DimensionTypeSelector}
+                        inputID={INPUT_IDS.DIMENSION_TYPE}
+                        aria-label="dimensionTypeSelector"
+                    />
+                </View>
+            </FormProvider>
+        </ConnectionLayout>
+    );
+}
+
+SageIntacctAddUserDimensionPage.displayName = 'SageIntacctAddUserDimensionPage';
+
+export default withPolicy(SageIntacctAddUserDimensionPage);
diff --git a/src/pages/workspace/accounting/intacct/import/SageIntacctEditUserDimensionsPage.tsx b/src/pages/workspace/accounting/intacct/import/SageIntacctEditUserDimensionsPage.tsx
new file mode 100644
index 000000000000..cd10e270d7d2
--- /dev/null
+++ b/src/pages/workspace/accounting/intacct/import/SageIntacctEditUserDimensionsPage.tsx
@@ -0,0 +1,157 @@
+import type {StackScreenProps} from '@react-navigation/stack';
+import React, {useCallback, useState} from 'react';
+import {View} from 'react-native';
+import ConfirmModal from '@components/ConfirmModal';
+import ConnectionLayout from '@components/ConnectionLayout';
+import FormProvider from '@components/Form/FormProvider';
+import InputWrapper from '@components/Form/InputWrapper';
+import type {FormInputErrors, FormOnyxValues} from '@components/Form/types';
+import * as Expensicons from '@components/Icon/Expensicons';
+import MenuItem from '@components/MenuItem';
+import OfflineWithFeedback from '@components/OfflineWithFeedback';
+import TextInput from '@components/TextInput';
+import useLocalize from '@hooks/useLocalize';
+import usePolicy from '@hooks/usePolicy';
+import useThemeStyles from '@hooks/useThemeStyles';
+import {
+    clearSageIntacctErrorField,
+    clearSageIntacctPendingField,
+    editSageIntacctUserDimensions,
+    removeSageIntacctUserDimensions,
+    removeSageIntacctUserDimensionsByName,
+} from '@libs/actions/connections/SageIntacct';
+import * as ErrorUtils from '@libs/ErrorUtils';
+import Navigation from '@libs/Navigation/Navigation';
+import type {SettingsNavigatorParamList} from '@libs/Navigation/types';
+import {settingsPendingAction} from '@libs/PolicyUtils';
+import CONST from '@src/CONST';
+import ONYXKEYS from '@src/ONYXKEYS';
+import ROUTES from '@src/ROUTES';
+import type SCREENS from '@src/SCREENS';
+import INPUT_IDS from '@src/types/form/SageIntacctDimensionsForm';
+import DimensionTypeSelector from './DimensionTypeSelector';
+
+type SageIntacctEditUserDimensionsPageProps = StackScreenProps<SettingsNavigatorParamList, typeof SCREENS.WORKSPACE.ACCOUNTING.SAGE_INTACCT_EDIT_USER_DIMENSION>;
+
+function SageIntacctEditUserDimensionsPage({route}: SageIntacctEditUserDimensionsPageProps) {
+    const styles = useThemeStyles();
+    const {translate} = useLocalize();
+
+    const editedUserDimensionName: string = route.params.dimensionName;
+    const policy = usePolicy(route.params.policyID);
+    const policyID: string = policy?.id ?? '-1';
+    const config = policy?.connections?.intacct?.config;
+    const userDimensions = policy?.connections?.intacct?.config?.mappings?.dimensions;
+    const editedUserDimension = userDimensions?.find((userDimension) => userDimension.dimension === editedUserDimensionName);
+    const [isDeleteModalOpen, setIsDeleteModalOpen] = useState(false);
+
+    const validate = useCallback(
+        (values: FormOnyxValues<typeof ONYXKEYS.FORMS.SAGE_INTACCT_DIMENSION_TYPE_FORM>) => {
+            const errors: FormInputErrors<typeof ONYXKEYS.FORMS.SAGE_INTACCT_DIMENSION_TYPE_FORM> = {};
+
+            if (!values[INPUT_IDS.INTEGRATION_NAME]) {
+                ErrorUtils.addErrorMessage(errors, INPUT_IDS.INTEGRATION_NAME, translate('common.error.fieldRequired'));
+            }
+
+            if (userDimensions?.some((userDimension) => userDimension.dimension === values[INPUT_IDS.INTEGRATION_NAME] && editedUserDimensionName !== values[INPUT_IDS.INTEGRATION_NAME])) {
+                ErrorUtils.addErrorMessage(errors, INPUT_IDS.INTEGRATION_NAME, translate('workspace.intacct.dimensionExists'));
+            }
+
+            if (!values[INPUT_IDS.DIMENSION_TYPE]) {
+                ErrorUtils.addErrorMessage(errors, INPUT_IDS.DIMENSION_TYPE, translate('common.error.fieldRequired'));
+            }
+            return errors;
+        },
+        [editedUserDimensionName, translate, userDimensions],
+    );
+
+    return (
+        <ConnectionLayout
+            displayName={SageIntacctEditUserDimensionsPage.displayName}
+            headerTitleAlreadyTranslated={editedUserDimensionName}
+            accessVariants={[CONST.POLICY.ACCESS_VARIANTS.ADMIN, CONST.POLICY.ACCESS_VARIANTS.PAID]}
+            policyID={policyID}
+            featureName={CONST.POLICY.MORE_FEATURES.ARE_CONNECTIONS_ENABLED}
+            contentContainerStyle={styles.flex1}
+            shouldUseScrollView={false}
+            titleStyle={styles.ph5}
+            connectionName={CONST.POLICY.CONNECTIONS.NAME.SAGE_INTACCT}
+            onBackButtonPress={() => Navigation.goBack(ROUTES.POLICY_ACCOUNTING_SAGE_INTACCT_USER_DIMENSIONS.getRoute(policyID))}
+        >
+            <FormProvider
+                style={[styles.flexGrow1, styles.ph5]}
+                formID={ONYXKEYS.FORMS.SAGE_INTACCT_DIMENSION_TYPE_FORM}
+                validate={validate}
+                onSubmit={(value) => {
+                    editSageIntacctUserDimensions(policyID, editedUserDimensionName, value[INPUT_IDS.INTEGRATION_NAME], value[INPUT_IDS.DIMENSION_TYPE], userDimensions ?? []);
+                    Navigation.goBack(ROUTES.POLICY_ACCOUNTING_SAGE_INTACCT_USER_DIMENSIONS.getRoute(policyID));
+                }}
+                submitButtonText={translate('common.save')}
+                enabledWhenOffline
+                shouldValidateOnBlur
+                shouldValidateOnChange
+            >
+                <OfflineWithFeedback
+                    pendingAction={settingsPendingAction([`${CONST.SAGE_INTACCT_CONFIG.DIMENSION_PREFIX}${editedUserDimensionName}`], config?.pendingFields)}
+                    errors={ErrorUtils.getLatestErrorField(config ?? {}, `${CONST.SAGE_INTACCT_CONFIG.DIMENSION_PREFIX}${editedUserDimensionName}`)}
+                    errorRowStyles={[styles.pb3]}
+                    onClose={() => {
+                        clearSageIntacctErrorField(policyID, `${CONST.SAGE_INTACCT_CONFIG.DIMENSION_PREFIX}${editedUserDimensionName}`);
+                        const pendingAction = settingsPendingAction([`${CONST.SAGE_INTACCT_CONFIG.DIMENSION_PREFIX}${editedUserDimensionName}`], config?.pendingFields);
+                        if (pendingAction === CONST.RED_BRICK_ROAD_PENDING_ACTION.ADD) {
+                            removeSageIntacctUserDimensionsByName(userDimensions ?? [], policyID, editedUserDimensionName);
+                            Navigation.goBack();
+                        }
+                        clearSageIntacctPendingField(policyID, `${CONST.SAGE_INTACCT_CONFIG.DIMENSION_PREFIX}${editedUserDimensionName}`);
+                    }}
+                >
+                    <View style={[styles.mb4]}>
+                        <InputWrapper
+                            InputComponent={TextInput}
+                            inputID={INPUT_IDS.INTEGRATION_NAME}
+                            label={translate('workspace.intacct.integrationName')}
+                            aria-label={translate('workspace.intacct.integrationName')}
+                            role={CONST.ROLE.PRESENTATION}
+                            spellCheck={false}
+                            defaultValue={editedUserDimensionName}
+                        />
+                    </View>
+                    <View style={[]}>
+                        <InputWrapper
+                            InputComponent={DimensionTypeSelector}
+                            inputID={INPUT_IDS.DIMENSION_TYPE}
+                            aria-label="dimensionTypeSelector"
+                            defaultValue={editedUserDimension?.mapping}
+                        />
+                    </View>
+                    <View style={[styles.mhn5]}>
+                        <MenuItem
+                            title={translate('common.remove')}
+                            icon={Expensicons.Trashcan}
+                            onPress={() => setIsDeleteModalOpen(true)}
+                        />
+                    </View>
+                </OfflineWithFeedback>
+                <ConfirmModal
+                    title={translate('workspace.intacct.removeDimension')}
+                    isVisible={isDeleteModalOpen}
+                    onConfirm={() => {
+                        setIsDeleteModalOpen(false);
+                        removeSageIntacctUserDimensions(policyID, editedUserDimensionName, userDimensions ?? []);
+                        Navigation.goBack();
+                    }}
+                    onCancel={() => setIsDeleteModalOpen(false)}
+                    prompt={translate('workspace.intacct.removeDimensionPrompt')}
+                    confirmText={translate('common.remove')}
+                    cancelText={translate('common.cancel')}
+                    danger
+                    shouldEnableNewFocusManagement
+                />
+            </FormProvider>
+        </ConnectionLayout>
+    );
+}
+
+SageIntacctEditUserDimensionsPage.displayName = 'SageIntacctEditUserDimensionsPage';
+
+export default SageIntacctEditUserDimensionsPage;
diff --git a/src/pages/workspace/accounting/intacct/import/SageIntacctImportPage.tsx b/src/pages/workspace/accounting/intacct/import/SageIntacctImportPage.tsx
new file mode 100644
index 000000000000..abd5fe9eb63f
--- /dev/null
+++ b/src/pages/workspace/accounting/intacct/import/SageIntacctImportPage.tsx
@@ -0,0 +1,145 @@
+import {Str} from 'expensify-common';
+import React, {useMemo} from 'react';
+import ConnectionLayout from '@components/ConnectionLayout';
+import MenuItemWithTopDescription from '@components/MenuItemWithTopDescription';
+import OfflineWithFeedback from '@components/OfflineWithFeedback';
+import useLocalize from '@hooks/useLocalize';
+import useThemeStyles from '@hooks/useThemeStyles';
+import {clearSageIntacctErrorField, updateSageIntacctBillable, updateSageIntacctSyncTaxConfiguration} from '@libs/actions/connections/SageIntacct';
+import * as ErrorUtils from '@libs/ErrorUtils';
+import Navigation from '@libs/Navigation/Navigation';
+import {areSettingsInErrorFields, getCurrentSageIntacctEntityName, settingsPendingAction} from '@libs/PolicyUtils';
+import withPolicy from '@pages/workspace/withPolicy';
+import type {WithPolicyProps} from '@pages/workspace/withPolicy';
+import ToggleSettingOptionRow from '@pages/workspace/workflows/ToggleSettingsOptionRow';
+import CONST from '@src/CONST';
+import type {TranslationPaths} from '@src/languages/types';
+import ROUTES from '@src/ROUTES';
+import type {SageIntacctConnectionsConfig, SageIntacctMappingValue} from '@src/types/onyx/Policy';
+
+function getDisplayTypeTranslationKey(displayType?: SageIntacctMappingValue): TranslationPaths | undefined {
+    switch (displayType) {
+        case CONST.SAGE_INTACCT_MAPPING_VALUE.DEFAULT: {
+            return 'workspace.intacct.employeeDefault';
+        }
+        case CONST.SAGE_INTACCT_MAPPING_VALUE.TAG: {
+            return 'workspace.accounting.importTypes.TAG';
+        }
+        case CONST.SAGE_INTACCT_MAPPING_VALUE.REPORT_FIELD: {
+            return 'workspace.accounting.importTypes.REPORT_FIELD';
+        }
+        default: {
+            return 'workspace.accounting.notImported';
+        }
+    }
+}
+
+const checkForUserDimensionWithError = (config?: SageIntacctConnectionsConfig) =>
+    config?.mappings?.dimensions?.some((dimension) => !!config?.errorFields?.[`${CONST.SAGE_INTACCT_CONFIG.DIMENSION_PREFIX}${dimension.dimension}`]);
+
+const checkForUserDimensionWithPendingAction = (config?: SageIntacctConnectionsConfig) =>
+    config?.mappings?.dimensions?.some((dimension) => !!config?.pendingFields?.[`${CONST.SAGE_INTACCT_CONFIG.DIMENSION_PREFIX}${dimension.dimension}`]);
+
+function SageIntacctImportPage({policy}: WithPolicyProps) {
+    const {translate} = useLocalize();
+    const styles = useThemeStyles();
+
+    const policyID: string = policy?.id ?? '-1';
+    const sageIntacctConfig = policy?.connections?.intacct?.config;
+
+    const mapingItems = useMemo(
+        () =>
+            Object.values(CONST.SAGE_INTACCT_CONFIG.MAPPINGS).map((mapping) => {
+                const menuItemTitleKey = getDisplayTypeTranslationKey(sageIntacctConfig?.mappings?.[mapping]);
+                return {
+                    description: Str.recapitalize(translate('workspace.intacct.mappingTitle', mapping)),
+                    action: () => Navigation.navigate(ROUTES.POLICY_ACCOUNTING_SAGE_INTACCT_TOGGLE_MAPPINGS.getRoute(policyID, mapping)),
+                    title: menuItemTitleKey ? translate(menuItemTitleKey) : undefined,
+                    subscribedSettings: [mapping],
+                };
+            }),
+        [policyID, sageIntacctConfig?.mappings, translate],
+    );
+
+    return (
+        <ConnectionLayout
+            displayName={SageIntacctImportPage.displayName}
+            headerTitle="workspace.accounting.import"
+            headerSubtitle={getCurrentSageIntacctEntityName(policy, translate('workspace.common.topLevel'))}
+            accessVariants={[CONST.POLICY.ACCESS_VARIANTS.ADMIN, CONST.POLICY.ACCESS_VARIANTS.PAID]}
+            policyID={policyID}
+            featureName={CONST.POLICY.MORE_FEATURES.ARE_CONNECTIONS_ENABLED}
+            contentContainerStyle={styles.pb2}
+            titleStyle={styles.ph5}
+            connectionName={CONST.POLICY.CONNECTIONS.NAME.SAGE_INTACCT}
+        >
+            <ToggleSettingOptionRow
+                title={translate('workspace.intacct.expenseTypes')}
+                subtitle={translate('workspace.intacct.expenseTypesDescription')}
+                switchAccessibilityLabel={translate('workspace.intacct.expenseTypesDescription')}
+                shouldPlaceSubtitleBelowSwitch
+                wrapperStyle={[styles.mv3, styles.mh5]}
+                isActive
+                onToggle={() => {}}
+                disabled
+            />
+            <ToggleSettingOptionRow
+                title={translate('common.billable')}
+                switchAccessibilityLabel={translate('common.billable')}
+                shouldPlaceSubtitleBelowSwitch
+                wrapperStyle={[styles.mv3, styles.mh5]}
+                isActive={sageIntacctConfig?.mappings?.syncItems ?? false}
+                onToggle={() => updateSageIntacctBillable(policyID, !sageIntacctConfig?.mappings?.syncItems)}
+                pendingAction={settingsPendingAction([CONST.SAGE_INTACCT_CONFIG.SYNC_ITEMS], sageIntacctConfig?.pendingFields)}
+                errors={ErrorUtils.getLatestErrorField(sageIntacctConfig ?? {}, CONST.SAGE_INTACCT_CONFIG.SYNC_ITEMS)}
+                onCloseError={() => clearSageIntacctErrorField(policyID, CONST.SAGE_INTACCT_CONFIG.SYNC_ITEMS)}
+            />
+
+            {mapingItems.map((section) => (
+                <OfflineWithFeedback
+                    key={section.description}
+                    pendingAction={settingsPendingAction(section.subscribedSettings, sageIntacctConfig?.pendingFields)}
+                >
+                    <MenuItemWithTopDescription
+                        title={section.title}
+                        description={section.description}
+                        shouldShowRightIcon
+                        onPress={section.action}
+                        brickRoadIndicator={areSettingsInErrorFields(section.subscribedSettings, sageIntacctConfig?.errorFields) ? CONST.BRICK_ROAD_INDICATOR_STATUS.ERROR : undefined}
+                    />
+                </OfflineWithFeedback>
+            ))}
+
+            <ToggleSettingOptionRow
+                title={translate('common.tax')}
+                subtitle={translate('workspace.intacct.importTaxDescription')}
+                switchAccessibilityLabel={translate('workspace.intacct.importTaxDescription')}
+                shouldPlaceSubtitleBelowSwitch
+                wrapperStyle={[styles.mv3, styles.mh5]}
+                isActive={sageIntacctConfig?.tax?.syncTax ?? false}
+                onToggle={() => updateSageIntacctSyncTaxConfiguration(policyID, !sageIntacctConfig?.tax?.syncTax)}
+                pendingAction={settingsPendingAction([CONST.SAGE_INTACCT_CONFIG.TAX], sageIntacctConfig?.pendingFields)}
+                errors={ErrorUtils.getLatestErrorField(sageIntacctConfig ?? {}, CONST.SAGE_INTACCT_CONFIG.TAX)}
+                onCloseError={() => clearSageIntacctErrorField(policyID, CONST.SAGE_INTACCT_CONFIG.TAX)}
+            />
+
+            <OfflineWithFeedback pendingAction={checkForUserDimensionWithPendingAction(sageIntacctConfig) ? CONST.RED_BRICK_ROAD_PENDING_ACTION.UPDATE : undefined}>
+                <MenuItemWithTopDescription
+                    title={
+                        sageIntacctConfig?.mappings?.dimensions && sageIntacctConfig?.mappings?.dimensions?.length > 0
+                            ? translate('workspace.intacct.userDimensionsAdded', sageIntacctConfig?.mappings?.dimensions?.length)
+                            : undefined
+                    }
+                    description={translate('workspace.intacct.userDefinedDimensions')}
+                    shouldShowRightIcon
+                    onPress={() => Navigation.navigate(ROUTES.POLICY_ACCOUNTING_SAGE_INTACCT_USER_DIMENSIONS.getRoute(policyID))}
+                    brickRoadIndicator={checkForUserDimensionWithError(sageIntacctConfig) ? CONST.BRICK_ROAD_INDICATOR_STATUS.ERROR : undefined}
+                />
+            </OfflineWithFeedback>
+        </ConnectionLayout>
+    );
+}
+
+SageIntacctImportPage.displayName = 'SageIntacctImportPage';
+
+export default withPolicy(SageIntacctImportPage);
diff --git a/src/pages/workspace/accounting/intacct/import/SageIntacctMappingsTypePage.tsx b/src/pages/workspace/accounting/intacct/import/SageIntacctMappingsTypePage.tsx
new file mode 100644
index 000000000000..73f35cc7bfdb
--- /dev/null
+++ b/src/pages/workspace/accounting/intacct/import/SageIntacctMappingsTypePage.tsx
@@ -0,0 +1,100 @@
+import type {StackScreenProps} from '@react-navigation/stack';
+import React, {useCallback, useMemo} from 'react';
+import RadioListItem from '@components/SelectionList/RadioListItem';
+import SelectionScreen from '@components/SelectionScreen';
+import type {SelectorType} from '@components/SelectionScreen';
+import useLocalize from '@hooks/useLocalize';
+import usePolicy from '@hooks/usePolicy';
+import useThemeStyles from '@hooks/useThemeStyles';
+import {updateSageIntacctMappingValue} from '@libs/actions/connections/SageIntacct';
+import * as ErrorUtils from '@libs/ErrorUtils';
+import Navigation from '@libs/Navigation/Navigation';
+import type {SettingsNavigatorParamList} from '@libs/Navigation/types';
+import {settingsPendingAction} from '@libs/PolicyUtils';
+import * as Policy from '@userActions/Policy/Policy';
+import CONST from '@src/CONST';
+import ROUTES from '@src/ROUTES';
+import type SCREENS from '@src/SCREENS';
+import type {SageIntacctMappingName, SageIntacctMappingValue} from '@src/types/onyx/Policy';
+
+type SageIntacctMappingsTypePageProps = StackScreenProps<SettingsNavigatorParamList, typeof SCREENS.WORKSPACE.ACCOUNTING.SAGE_INTACCT_MAPPING_TYPE>;
+
+function SageIntacctMappingsTypePage({route}: SageIntacctMappingsTypePageProps) {
+    const {translate} = useLocalize();
+    const styles = useThemeStyles();
+
+    const mappingName: SageIntacctMappingName = route.params.mapping;
+    const policy = usePolicy(route.params.policyID);
+    const policyID = policy?.id ?? '-1';
+
+    const {config} = policy?.connections?.intacct ?? {};
+    const {mappings, pendingFields, export: exportConfig} = config ?? {};
+
+    const selectionOptions = useMemo<SelectorType[]>(() => {
+        const mappingOptions: SelectorType[] = [];
+        if (
+            !([CONST.SAGE_INTACCT_CONFIG.MAPPINGS.CUSTOMERS, CONST.SAGE_INTACCT_CONFIG.MAPPINGS.PROJECTS] as string[]).includes(mappingName) &&
+            exportConfig?.reimbursable !== CONST.SAGE_INTACCT_REIMBURSABLE_EXPENSE_TYPE.VENDOR_BILL
+        ) {
+            mappingOptions.push({
+                value: CONST.SAGE_INTACCT_MAPPING_VALUE.DEFAULT,
+                text: translate('workspace.intacct.employeeDefault'),
+                alternateText: translate('workspace.common.appliedOnExport'),
+                keyForList: CONST.SAGE_INTACCT_MAPPING_VALUE.DEFAULT,
+                isSelected: mappings?.[mappingName] === CONST.SAGE_INTACCT_MAPPING_VALUE.DEFAULT,
+            });
+        }
+        mappingOptions.push(
+            ...[
+                {
+                    value: CONST.SAGE_INTACCT_MAPPING_VALUE.TAG,
+                    text: translate('workspace.common.tags'),
+                    alternateText: translate('workspace.common.lineItemLevel'),
+                    keyForList: CONST.SAGE_INTACCT_MAPPING_VALUE.TAG,
+                    isSelected: mappings?.[mappingName] === CONST.SAGE_INTACCT_MAPPING_VALUE.TAG,
+                },
+                {
+                    value: CONST.SAGE_INTACCT_MAPPING_VALUE.REPORT_FIELD,
+                    text: translate('workspace.common.reportFields'),
+                    alternateText: translate('workspace.common.reportLevel'),
+                    keyForList: CONST.SAGE_INTACCT_MAPPING_VALUE.REPORT_FIELD,
+                    isSelected: mappings?.[mappingName] === CONST.SAGE_INTACCT_MAPPING_VALUE.REPORT_FIELD,
+                },
+            ],
+        );
+
+        return mappingOptions;
+    }, [exportConfig?.reimbursable, mappingName, mappings, translate]);
+
+    const updateMapping = useCallback(
+        ({value}: SelectorType) => {
+            updateSageIntacctMappingValue(policyID, mappingName, value as SageIntacctMappingValue, mappings?.[mappingName]);
+            Navigation.goBack(ROUTES.POLICY_ACCOUNTING_SAGE_INTACCT_TOGGLE_MAPPINGS.getRoute(policyID, mappingName));
+        },
+        [mappingName, policyID, mappings],
+    );
+
+    return (
+        <SelectionScreen
+            policyID={policyID}
+            accessVariants={[CONST.POLICY.ACCESS_VARIANTS.ADMIN, CONST.POLICY.ACCESS_VARIANTS.PAID]}
+            featureName={CONST.POLICY.MORE_FEATURES.ARE_CONNECTIONS_ENABLED}
+            displayName={SageIntacctMappingsTypePage.displayName}
+            sections={[{data: selectionOptions}]}
+            listItem={RadioListItem}
+            connectionName={CONST.POLICY.CONNECTIONS.NAME.SAGE_INTACCT}
+            onSelectRow={updateMapping}
+            initiallyFocusedOptionKey={mappings?.[mappingName]}
+            onBackButtonPress={() => Navigation.goBack(ROUTES.POLICY_ACCOUNTING_SAGE_INTACCT_TOGGLE_MAPPINGS.getRoute(policyID, mappingName))}
+            title="workspace.common.displayedAs"
+            pendingAction={settingsPendingAction([mappingName], pendingFields)}
+            errors={ErrorUtils.getLatestErrorField(config ?? {}, mappingName)}
+            errorRowStyles={[styles.ph5, styles.pv3]}
+            onClose={() => Policy.clearSageIntacctErrorField(policyID, mappingName)}
+        />
+    );
+}
+
+SageIntacctMappingsTypePage.displayName = 'SageIntacctMappingsTypePage';
+
+export default SageIntacctMappingsTypePage;
diff --git a/src/pages/workspace/accounting/intacct/import/SageIntacctToggleMappingsPage.tsx b/src/pages/workspace/accounting/intacct/import/SageIntacctToggleMappingsPage.tsx
new file mode 100644
index 000000000000..56a8278346c3
--- /dev/null
+++ b/src/pages/workspace/accounting/intacct/import/SageIntacctToggleMappingsPage.tsx
@@ -0,0 +1,112 @@
+import type {StackScreenProps} from '@react-navigation/stack';
+import {Str} from 'expensify-common';
+import React from 'react';
+import ConnectionLayout from '@components/ConnectionLayout';
+import MenuItemWithTopDescription from '@components/MenuItemWithTopDescription';
+import OfflineWithFeedback from '@components/OfflineWithFeedback';
+import Text from '@components/Text';
+import useLocalize from '@hooks/useLocalize';
+import usePolicy from '@hooks/usePolicy';
+import useThemeStyles from '@hooks/useThemeStyles';
+import {clearSageIntacctErrorField, updateSageIntacctMappingValue} from '@libs/actions/connections/SageIntacct';
+import * as ErrorUtils from '@libs/ErrorUtils';
+import Navigation from '@libs/Navigation/Navigation';
+import type {SettingsNavigatorParamList} from '@libs/Navigation/types';
+import {areSettingsInErrorFields, settingsPendingAction} from '@libs/PolicyUtils';
+import ToggleSettingOptionRow from '@pages/workspace/workflows/ToggleSettingsOptionRow';
+import CONST from '@src/CONST';
+import type {TranslationPaths} from '@src/languages/types';
+import ROUTES from '@src/ROUTES';
+import type SCREENS from '@src/SCREENS';
+import type {SageIntacctMappingName, SageIntacctMappingValue} from '@src/types/onyx/Policy';
+
+type SageIntacctToggleMappingsPageProps = StackScreenProps<SettingsNavigatorParamList, typeof SCREENS.WORKSPACE.ACCOUNTING.SAGE_INTACCT_MAPPING_TYPE>;
+
+type DisplayTypeTranslationKeys = {
+    titleKey: TranslationPaths;
+    descriptionKey: TranslationPaths;
+};
+
+function getDisplayTypeTranslationKeys(displayType?: SageIntacctMappingValue): DisplayTypeTranslationKeys | undefined {
+    switch (displayType) {
+        case CONST.SAGE_INTACCT_MAPPING_VALUE.DEFAULT: {
+            return {titleKey: 'workspace.intacct.employeeDefault', descriptionKey: 'workspace.intacct.employeeDefaultDescription'};
+        }
+        case CONST.SAGE_INTACCT_MAPPING_VALUE.TAG: {
+            return {titleKey: 'workspace.common.tags', descriptionKey: 'workspace.intacct.displayedAsTagDescription'};
+        }
+        case CONST.SAGE_INTACCT_MAPPING_VALUE.REPORT_FIELD: {
+            return {titleKey: 'workspace.common.reportFields', descriptionKey: 'workspace.intacct.displayedAsReportFieldDescription'};
+        }
+        default: {
+            return undefined;
+        }
+    }
+}
+
+function SageIntacctToggleMappingsPage({route}: SageIntacctToggleMappingsPageProps) {
+    const {translate} = useLocalize();
+    const styles = useThemeStyles();
+
+    const policy = usePolicy(route.params.policyID);
+    const mappingName: SageIntacctMappingName = route.params.mapping;
+    const policyID: string = policy?.id ?? '-1';
+
+    const config = policy?.connections?.intacct?.config;
+    const translationKeys = getDisplayTypeTranslationKeys(config?.mappings?.[mappingName]);
+    const isImportMappingEnable = config?.mappings?.[mappingName] !== CONST.SAGE_INTACCT_MAPPING_VALUE.NONE;
+    return (
+        <ConnectionLayout
+            displayName={SageIntacctToggleMappingsPage.displayName}
+            headerTitleAlreadyTranslated={Str.recapitalize(translate('workspace.intacct.mappingTitle', mappingName))}
+            accessVariants={[CONST.POLICY.ACCESS_VARIANTS.ADMIN, CONST.POLICY.ACCESS_VARIANTS.PAID]}
+            policyID={policyID}
+            featureName={CONST.POLICY.MORE_FEATURES.ARE_CONNECTIONS_ENABLED}
+            contentContainerStyle={styles.pb2}
+            titleStyle={styles.ph5}
+            connectionName={CONST.POLICY.CONNECTIONS.NAME.SAGE_INTACCT}
+            onBackButtonPress={() => Navigation.goBack(ROUTES.POLICY_ACCOUNTING_SAGE_INTACCT_IMPORT.getRoute(policyID))}
+        >
+            <Text style={[styles.flexRow, styles.alignItemsCenter, styles.w100, styles.mb5, styles.ph5]}>
+                <Text style={[styles.textNormal]}>{translate('workspace.intacct.toggleImportTitleFirstPart')}</Text>
+                <Text style={[styles.textStrong]}>{translate('workspace.intacct.mappingTitle', mappingName)}</Text>
+                <Text style={[styles.textNormal]}>{translate('workspace.intacct.toggleImportTitleSecondPart')}</Text>
+            </Text>
+            <ToggleSettingOptionRow
+                title={translate('workspace.accounting.import')}
+                switchAccessibilityLabel={`${translate('workspace.accounting.import')} ${translate('workspace.intacct.mappingTitle', mappingName)}`}
+                shouldPlaceSubtitleBelowSwitch
+                wrapperStyle={[styles.mv3, styles.mh5]}
+                isActive={isImportMappingEnable}
+                onToggle={(enabled) => {
+                    const mappingValue = enabled ? CONST.SAGE_INTACCT_MAPPING_VALUE.TAG : CONST.SAGE_INTACCT_MAPPING_VALUE.NONE;
+                    updateSageIntacctMappingValue(policyID, mappingName, mappingValue, config?.mappings?.[mappingName]);
+                }}
+                pendingAction={settingsPendingAction([mappingName], config?.pendingFields)}
+                errors={ErrorUtils.getLatestErrorField(config ?? {}, mappingName)}
+                onCloseError={() => clearSageIntacctErrorField(policyID, mappingName)}
+            />
+            {isImportMappingEnable && (
+                <OfflineWithFeedback pendingAction={settingsPendingAction([mappingName], config?.pendingFields)}>
+                    <MenuItemWithTopDescription
+                        title={translationKeys?.titleKey ? translate(translationKeys?.titleKey) : undefined}
+                        description={translate('workspace.common.displayedAs')}
+                        shouldShowRightIcon
+                        onPress={() => Navigation.navigate(ROUTES.POLICY_ACCOUNTING_SAGE_INTACCT_MAPPINGS_TYPE.getRoute(policyID, mappingName))}
+                        brickRoadIndicator={areSettingsInErrorFields([mappingName], config?.errorFields) ? 'error' : undefined}
+                    />
+                    <Text
+                        style={[styles.textLabelSupporting, styles.ph5]}
+                        numberOfLines={2}
+                    >
+                        {translationKeys?.descriptionKey ? translate(translationKeys?.descriptionKey) : undefined}
+                    </Text>
+                </OfflineWithFeedback>
+            )}
+        </ConnectionLayout>
+    );
+}
+
+SageIntacctToggleMappingsPage.displayName = 'SageIntacctToggleMappingsPage';
+
+export default SageIntacctToggleMappingsPage;
diff --git a/src/pages/workspace/accounting/intacct/import/SageIntacctUserDimensionsPage.tsx b/src/pages/workspace/accounting/intacct/import/SageIntacctUserDimensionsPage.tsx
new file mode 100644
index 000000000000..aa7a86adfb26
--- /dev/null
+++ b/src/pages/workspace/accounting/intacct/import/SageIntacctUserDimensionsPage.tsx
@@ -0,0 +1,125 @@
+import React from 'react';
+import {View} from 'react-native';
+import Button from '@components/Button';
+import ConnectionLayout from '@components/ConnectionLayout';
+import FixedFooter from '@components/FixedFooter';
+import Icon from '@components/Icon';
+import * as Illustrations from '@components/Icon/Illustrations';
+import MenuItemWithTopDescription from '@components/MenuItemWithTopDescription';
+import OfflineWithFeedback from '@components/OfflineWithFeedback';
+import ScrollView from '@components/ScrollView';
+import Text from '@components/Text';
+import TextLink from '@components/TextLink';
+import useLocalize from '@hooks/useLocalize';
+import useThemeStyles from '@hooks/useThemeStyles';
+import Navigation from '@libs/Navigation/Navigation';
+import {areSettingsInErrorFields, settingsPendingAction} from '@libs/PolicyUtils';
+import withPolicy from '@pages/workspace/withPolicy';
+import type {WithPolicyProps} from '@pages/workspace/withPolicy';
+import * as Link from '@userActions/Link';
+import CONST from '@src/CONST';
+import ROUTES from '@src/ROUTES';
+
+function SageIntacctUserDimensionsPage({policy}: WithPolicyProps) {
+    const styles = useThemeStyles();
+    const {translate} = useLocalize();
+
+    const policyID = policy?.id ?? '-1';
+    const config = policy?.connections?.intacct?.config;
+    const userDimensions = policy?.connections?.intacct?.config?.mappings?.dimensions ?? [];
+
+    return (
+        <ConnectionLayout
+            displayName={SageIntacctUserDimensionsPage.displayName}
+            headerTitle="workspace.intacct.userDefinedDimension"
+            accessVariants={[CONST.POLICY.ACCESS_VARIANTS.ADMIN, CONST.POLICY.ACCESS_VARIANTS.PAID]}
+            policyID={policyID}
+            featureName={CONST.POLICY.MORE_FEATURES.ARE_CONNECTIONS_ENABLED}
+            contentContainerStyle={[styles.flex1]}
+            titleStyle={styles.ph5}
+            connectionName={CONST.POLICY.CONNECTIONS.NAME.SAGE_INTACCT}
+            shouldIncludeSafeAreaPaddingBottom
+            shouldUseScrollView={false}
+            onBackButtonPress={() => Navigation.goBack(ROUTES.POLICY_ACCOUNTING_SAGE_INTACCT_IMPORT.getRoute(policyID))}
+        >
+            {userDimensions?.length === 0 ? (
+                <View style={[styles.alignItemsCenter, styles.flex1, styles.justifyContentCenter]}>
+                    <Icon
+                        src={Illustrations.FolderWithPapers}
+                        width={160}
+                        height={100}
+                    />
+
+                    <View style={[styles.w100, styles.pt5]}>
+                        <View style={[styles.justifyContentCenter, styles.ph5]}>
+                            <Text style={[styles.notFoundTextHeader]}>{translate('workspace.intacct.addAUserDefinedDimension')}</Text>
+                        </View>
+
+                        <View style={[styles.ph5]}>
+                            <Text style={[styles.textAlignCenter]}>
+                                <TextLink
+                                    style={styles.link}
+                                    onPress={() => {
+                                        Link.openExternalLink(CONST.SAGE_INTACCT_INSTRUCTIONS);
+                                    }}
+                                >
+                                    {translate('workspace.intacct.detailedInstructionsLink')}
+                                </TextLink>
+                                <Text>{translate('workspace.intacct.detailedInstructionsRestOfSentence')}</Text>
+                            </Text>
+                        </View>
+                    </View>
+                </View>
+            ) : (
+                <>
+                    <View style={[styles.ph5]}>
+                        <Text style={[styles.textAlignLeft]}>
+                            <TextLink
+                                style={styles.link}
+                                onPress={() => {
+                                    Link.openExternalLink(CONST.SAGE_INTACCT_INSTRUCTIONS);
+                                }}
+                            >
+                                {translate('workspace.intacct.detailedInstructionsLink')}
+                            </TextLink>
+                            <Text>{translate('workspace.intacct.detailedInstructionsRestOfSentence')}</Text>
+                        </Text>
+                    </View>
+                    <ScrollView>
+                        {userDimensions.map((userDimension) => (
+                            <OfflineWithFeedback
+                                key={userDimension.dimension}
+                                pendingAction={settingsPendingAction([`${CONST.SAGE_INTACCT_CONFIG.DIMENSION_PREFIX}${userDimension.dimension}`], config?.pendingFields)}
+                            >
+                                <MenuItemWithTopDescription
+                                    title={userDimension.dimension}
+                                    description={translate('workspace.intacct.userDefinedDimension')}
+                                    shouldShowRightIcon
+                                    onPress={() => Navigation.navigate(ROUTES.POLICY_ACCOUNTING_SAGE_INTACCT_EDIT_USER_DIMENSION.getRoute(policyID, userDimension.dimension))}
+                                    brickRoadIndicator={
+                                        areSettingsInErrorFields([`${CONST.SAGE_INTACCT_CONFIG.DIMENSION_PREFIX}${userDimension.dimension}`], config?.errorFields)
+                                            ? CONST.BRICK_ROAD_INDICATOR_STATUS.ERROR
+                                            : undefined
+                                    }
+                                />
+                            </OfflineWithFeedback>
+                        ))}
+                    </ScrollView>
+                </>
+            )}
+            <FixedFooter style={[styles.mt5]}>
+                <Button
+                    success
+                    text={translate('workspace.intacct.addUserDefinedDimension')}
+                    onPress={() => Navigation.navigate(ROUTES.POLICY_ACCOUNTING_SAGE_INTACCT_ADD_USER_DIMENSION.getRoute(policyID))}
+                    pressOnEnter
+                    large
+                />
+            </FixedFooter>
+        </ConnectionLayout>
+    );
+}
+
+SageIntacctUserDimensionsPage.displayName = 'SageIntacctUserDimensionsPage';
+
+export default withPolicy(SageIntacctUserDimensionsPage);
diff --git a/src/pages/workspace/accounting/netsuite/NetSuiteSubsidiarySelector.tsx b/src/pages/workspace/accounting/netsuite/NetSuiteSubsidiarySelector.tsx
new file mode 100644
index 000000000000..21a3cadb95fb
--- /dev/null
+++ b/src/pages/workspace/accounting/netsuite/NetSuiteSubsidiarySelector.tsx
@@ -0,0 +1,105 @@
+import React, {useMemo} from 'react';
+import BlockingView from '@components/BlockingViews/BlockingView';
+import * as Illustrations from '@components/Icon/Illustrations';
+import OfflineWithFeedback from '@components/OfflineWithFeedback';
+import RadioListItem from '@components/SelectionList/RadioListItem';
+import SelectionScreen from '@components/SelectionScreen';
+import type {SelectorType} from '@components/SelectionScreen';
+import Text from '@components/Text';
+import useLocalize from '@hooks/useLocalize';
+import useThemeStyles from '@hooks/useThemeStyles';
+import {updateNetSuiteSubsidiary} from '@libs/actions/connections/NetSuiteCommands';
+import * as ErrorUtils from '@libs/ErrorUtils';
+import Navigation from '@libs/Navigation/Navigation';
+import withPolicyConnections from '@pages/workspace/withPolicyConnections';
+import type {WithPolicyConnectionsProps} from '@pages/workspace/withPolicyConnections';
+import variables from '@styles/variables';
+import * as Policy from '@userActions/Policy/Policy';
+import CONST from '@src/CONST';
+import type {NetSuiteSubsidiary} from '@src/types/onyx/Policy';
+
+function NetSuiteSubsidiarySelector({policy}: WithPolicyConnectionsProps) {
+    const {translate} = useLocalize();
+    const styles = useThemeStyles();
+    const subsidiaryList = policy?.connections?.netsuite?.options?.data?.subsidiaryList ?? [];
+    const netsuiteConfig = policy?.connections?.netsuite?.options?.config;
+    const currentSubsidiaryName = netsuiteConfig?.subsidiary ?? '';
+    const currentSubsidiaryID = netsuiteConfig?.subsidiaryID ?? '';
+    const policyID = policy?.id ?? '-1';
+
+    const subsidiaryListSections =
+        subsidiaryList.map((subsidiary: NetSuiteSubsidiary) => ({
+            text: subsidiary.name,
+            keyForList: subsidiary.internalID,
+            isSelected: subsidiary.name === currentSubsidiaryName,
+            value: subsidiary.name,
+        })) ?? [];
+
+    const updateSubsidiary = ({keyForList, value}: SelectorType) => {
+        if (!keyForList || keyForList === currentSubsidiaryID) {
+            return;
+        }
+
+        updateNetSuiteSubsidiary(
+            policyID,
+            {
+                subsidiary: value,
+                subsidiaryID: keyForList,
+            },
+            {
+                subsidiary: currentSubsidiaryName,
+                subsidiaryID: currentSubsidiaryID,
+            },
+        );
+        Navigation.goBack();
+    };
+
+    const listEmptyContent = useMemo(
+        () => (
+            <BlockingView
+                icon={Illustrations.TeleScope}
+                iconWidth={variables.emptyListIconWidth}
+                iconHeight={variables.emptyListIconHeight}
+                title={translate('workspace.netsuite.noSubsidiariesFound')}
+                subtitle={translate('workspace.netsuite.noSubsidiariesFoundDescription')}
+                containerStyle={styles.pb10}
+            />
+        ),
+        [translate, styles.pb10],
+    );
+
+    const listHeaderComponent = useMemo(
+        () => (
+            <OfflineWithFeedback
+                errors={ErrorUtils.getLatestErrorField(netsuiteConfig ?? {}, CONST.NETSUITE_CONFIG.SUBSIDIARY)}
+                errorRowStyles={[styles.ph5, styles.mt2, styles.mb4]}
+                onClose={() => Policy.clearNetSuiteErrorField(policyID, CONST.NETSUITE_CONFIG.SUBSIDIARY)}
+            >
+                <Text style={[styles.ph5, styles.pb5]}>{translate('workspace.netsuite.subsidiarySelectDescription')}</Text>
+            </OfflineWithFeedback>
+        ),
+        [netsuiteConfig, styles.ph5, styles.mt2, styles.pb5, styles.mb4, translate, policyID],
+    );
+
+    return (
+        <SelectionScreen
+            policyID={policyID}
+            accessVariants={[CONST.POLICY.ACCESS_VARIANTS.ADMIN, CONST.POLICY.ACCESS_VARIANTS.CONTROL]}
+            featureName={CONST.POLICY.MORE_FEATURES.ARE_CONNECTIONS_ENABLED}
+            displayName={NetSuiteSubsidiarySelector.displayName}
+            sections={subsidiaryListSections.length > 0 ? [{data: subsidiaryListSections}] : []}
+            listItem={RadioListItem}
+            connectionName={CONST.POLICY.CONNECTIONS.NAME.NETSUITE}
+            onSelectRow={updateSubsidiary}
+            initiallyFocusedOptionKey={netsuiteConfig?.subsidiaryID ?? subsidiaryListSections?.[0]?.keyForList}
+            headerContent={listHeaderComponent}
+            onBackButtonPress={() => Navigation.goBack()}
+            title="workspace.netsuite.subsidiary"
+            listEmptyContent={listEmptyContent}
+        />
+    );
+}
+
+NetSuiteSubsidiarySelector.displayName = 'NetSuiteSubsidiarySelector';
+
+export default withPolicyConnections(NetSuiteSubsidiarySelector);
diff --git a/src/pages/workspace/accounting/netsuite/NetSuiteTokenInput/NetSuiteExistingConnectionsPage.tsx b/src/pages/workspace/accounting/netsuite/NetSuiteTokenInput/NetSuiteExistingConnectionsPage.tsx
new file mode 100644
index 000000000000..f6a57bcd0014
--- /dev/null
+++ b/src/pages/workspace/accounting/netsuite/NetSuiteTokenInput/NetSuiteExistingConnectionsPage.tsx
@@ -0,0 +1,68 @@
+import type {StackScreenProps} from '@react-navigation/stack';
+import React from 'react';
+import {View} from 'react-native';
+import ConnectionLayout from '@components/ConnectionLayout';
+import MenuItemList from '@components/MenuItemList';
+import useLocalize from '@hooks/useLocalize';
+import useThemeStyles from '@hooks/useThemeStyles';
+import {copyExistingPolicyConnection} from '@libs/actions/connections';
+import {getAdminPoliciesConnectedToNetSuite} from '@libs/actions/Policy/Policy';
+import Navigation from '@libs/Navigation/Navigation';
+import type {SettingsNavigatorParamList} from '@libs/Navigation/types';
+import * as ReportUtils from '@libs/ReportUtils';
+import CONST from '@src/CONST';
+import ROUTES from '@src/ROUTES';
+import type SCREENS from '@src/SCREENS';
+
+type ExistingConnectionsPageProps = StackScreenProps<SettingsNavigatorParamList, typeof SCREENS.WORKSPACE.ACCOUNTING.NETSUITE_REUSE_EXISTING_CONNECTIONS>;
+
+function NetSuiteExistingConnectionsPage({route}: ExistingConnectionsPageProps) {
+    const {translate, datetimeToRelative} = useLocalize();
+    const styles = useThemeStyles();
+    const policiesConnectedToSageNetSuite = getAdminPoliciesConnectedToNetSuite();
+    const policyID: string = route.params.policyID;
+
+    const menuItems = policiesConnectedToSageNetSuite.map((policy) => {
+        const lastSuccessfulSyncDate = policy.connections?.netsuite.lastSyncDate;
+        const date = lastSuccessfulSyncDate ? datetimeToRelative(lastSuccessfulSyncDate) : undefined;
+        return {
+            title: policy.name,
+            key: policy.id,
+            avatarID: policy.id,
+            icon: policy.avatarURL ? policy.avatarURL : ReportUtils.getDefaultWorkspaceAvatar(policy.name),
+            iconType: policy.avatarURL ? CONST.ICON_TYPE_AVATAR : CONST.ICON_TYPE_WORKSPACE,
+            description: date ? translate('workspace.common.lastSyncDate', CONST.POLICY.CONNECTIONS.NAME_USER_FRIENDLY.netsuite, date) : translate('workspace.accounting.netsuite'),
+            onPress: () => {
+                copyExistingPolicyConnection(policy.id, policyID, CONST.POLICY.CONNECTIONS.NAME.NETSUITE);
+                Navigation.goBack(ROUTES.WORKSPACE_ACCOUNTING.getRoute(policyID));
+            },
+        };
+    });
+
+    return (
+        <ConnectionLayout
+            displayName={NetSuiteExistingConnectionsPage.displayName}
+            headerTitle="workspace.common.existingConnections"
+            accessVariants={[CONST.POLICY.ACCESS_VARIANTS.ADMIN, CONST.POLICY.ACCESS_VARIANTS.CONTROL]}
+            policyID={policyID}
+            featureName={CONST.POLICY.MORE_FEATURES.ARE_CONNECTIONS_ENABLED}
+            contentContainerStyle={[styles.flex1]}
+            titleStyle={styles.ph5}
+            shouldLoadForEmptyConnection
+            connectionName={CONST.POLICY.CONNECTIONS.NAME.NETSUITE}
+            onBackButtonPress={() => Navigation.goBack(ROUTES.WORKSPACE_ACCOUNTING.getRoute(policyID))}
+            shouldIncludeSafeAreaPaddingBottom
+        >
+            <View style={[styles.flex1]}>
+                <MenuItemList
+                    menuItems={menuItems}
+                    shouldUseSingleExecution
+                />
+            </View>
+        </ConnectionLayout>
+    );
+}
+
+NetSuiteExistingConnectionsPage.displayName = 'NetSuiteExistingConnectionsPage';
+
+export default NetSuiteExistingConnectionsPage;
diff --git a/src/pages/workspace/accounting/netsuite/NetSuiteTokenInput/NetSuiteTokenInputPage.tsx b/src/pages/workspace/accounting/netsuite/NetSuiteTokenInput/NetSuiteTokenInputPage.tsx
new file mode 100644
index 000000000000..178db5534f49
--- /dev/null
+++ b/src/pages/workspace/accounting/netsuite/NetSuiteTokenInput/NetSuiteTokenInputPage.tsx
@@ -0,0 +1,90 @@
+import React, {useRef} from 'react';
+import type {ComponentType, ForwardedRef} from 'react';
+import {View} from 'react-native';
+import ConnectionLayout from '@components/ConnectionLayout';
+import InteractiveStepSubHeader from '@components/InteractiveStepSubHeader';
+import type {InteractiveStepSubHeaderHandle} from '@components/InteractiveStepSubHeader';
+import useSubStep from '@hooks/useSubStep';
+import type {SubStepProps} from '@hooks/useSubStep/types';
+import useThemeStyles from '@hooks/useThemeStyles';
+import Navigation from '@libs/Navigation/Navigation';
+import type {WithPolicyConnectionsProps} from '@pages/workspace/withPolicyConnections';
+import withPolicyConnections from '@pages/workspace/withPolicyConnections';
+import CONST from '@src/CONST';
+import NetSuiteTokenInputForm from './substeps/NetSuiteTokenInputForm';
+import NetSuiteTokenSetupContent from './substeps/NetSuiteTokenSetupContent';
+
+type SubStepWithPolicy = SubStepProps & {policyID: string};
+
+const staticContentSteps = Array<ComponentType<SubStepWithPolicy>>(4).fill(NetSuiteTokenSetupContent);
+const tokenInputSteps: Array<ComponentType<SubStepWithPolicy>> = [...staticContentSteps, NetSuiteTokenInputForm];
+
+function NetSuiteTokenInputPage({policy}: WithPolicyConnectionsProps) {
+    const policyID = policy?.id ?? '-1';
+    const styles = useThemeStyles();
+    const ref: ForwardedRef<InteractiveStepSubHeaderHandle> = useRef(null);
+
+    const submit = () => {
+        Navigation.goBack();
+    };
+
+    const {
+        componentToRender: SubStep,
+        isEditing,
+        nextScreen,
+        prevScreen,
+        screenIndex,
+        moveTo,
+    } = useSubStep<SubStepWithPolicy>({bodyContent: tokenInputSteps, startFrom: 0, onFinished: submit});
+
+    const handleBackButtonPress = () => {
+        if (screenIndex === 0) {
+            Navigation.goBack();
+            return;
+        }
+        ref.current?.movePrevious();
+        prevScreen();
+    };
+
+    const handleNextScreen = () => {
+        ref.current?.moveNext();
+        nextScreen();
+    };
+
+    return (
+        <ConnectionLayout
+            displayName={NetSuiteTokenInputPage.displayName}
+            headerTitle="workspace.netsuite.tokenInput.title"
+            accessVariants={[CONST.POLICY.ACCESS_VARIANTS.ADMIN, CONST.POLICY.ACCESS_VARIANTS.CONTROL]}
+            policyID={policyID}
+            featureName={CONST.POLICY.MORE_FEATURES.ARE_CONNECTIONS_ENABLED}
+            contentContainerStyle={[styles.flex1]}
+            titleStyle={styles.ph5}
+            shouldLoadForEmptyConnection
+            connectionName={CONST.POLICY.CONNECTIONS.NAME.NETSUITE}
+            onBackButtonPress={handleBackButtonPress}
+            shouldIncludeSafeAreaPaddingBottom
+        >
+            <View style={[styles.ph5, styles.mb3, styles.mt3, {height: CONST.BANK_ACCOUNT.STEPS_HEADER_HEIGHT}]}>
+                <InteractiveStepSubHeader
+                    ref={ref}
+                    startStepIndex={0}
+                    stepNames={CONST.NETSUITE_CONFIG.TOKEN_INPUT_STEP_NAMES}
+                />
+            </View>
+            <View style={[styles.flexGrow1, styles.mt3]}>
+                <SubStep
+                    isEditing={isEditing}
+                    onNext={handleNextScreen}
+                    onMove={moveTo}
+                    screenIndex={screenIndex}
+                    policyID={policyID}
+                />
+            </View>
+        </ConnectionLayout>
+    );
+}
+
+NetSuiteTokenInputPage.displayName = 'NetSuiteTokenInputPage';
+
+export default withPolicyConnections(NetSuiteTokenInputPage);
diff --git a/src/pages/workspace/accounting/netsuite/NetSuiteTokenInput/substeps/NetSuiteTokenInputForm.tsx b/src/pages/workspace/accounting/netsuite/NetSuiteTokenInput/substeps/NetSuiteTokenInputForm.tsx
new file mode 100644
index 000000000000..580ad181e6ed
--- /dev/null
+++ b/src/pages/workspace/accounting/netsuite/NetSuiteTokenInput/substeps/NetSuiteTokenInputForm.tsx
@@ -0,0 +1,94 @@
+import React, {useCallback} from 'react';
+import {View} from 'react-native';
+import FormProvider from '@components/Form/FormProvider';
+import InputWrapper from '@components/Form/InputWrapper';
+import type {FormInputErrors, FormOnyxValues} from '@components/Form/types';
+import RenderHTML from '@components/RenderHTML';
+import Text from '@components/Text';
+import TextInput from '@components/TextInput';
+import useAutoFocusInput from '@hooks/useAutoFocusInput';
+import useLocalize from '@hooks/useLocalize';
+import type {SubStepProps} from '@hooks/useSubStep/types';
+import useThemeStyles from '@hooks/useThemeStyles';
+import {connectPolicyToNetSuite} from '@libs/actions/connections/NetSuiteCommands';
+import * as ErrorUtils from '@libs/ErrorUtils';
+import Parser from '@libs/Parser';
+import CONST from '@src/CONST';
+import ONYXKEYS from '@src/ONYXKEYS';
+import INPUT_IDS from '@src/types/form/NetSuiteTokenInputForm';
+
+function NetSuiteTokenInputForm({onNext, policyID}: SubStepProps & {policyID: string}) {
+    const styles = useThemeStyles();
+    const {translate} = useLocalize();
+    const {inputCallbackRef} = useAutoFocusInput();
+
+    const formInputs = Object.values(INPUT_IDS);
+
+    const validate = useCallback(
+        (formValues: FormOnyxValues<typeof ONYXKEYS.FORMS.NETSUITE_TOKEN_INPUT_FORM>) => {
+            const errors: FormInputErrors<typeof ONYXKEYS.FORMS.NETSUITE_TOKEN_INPUT_FORM> = {};
+
+            formInputs.forEach((formInput) => {
+                if (formValues[formInput]) {
+                    return;
+                }
+                ErrorUtils.addErrorMessage(errors, formInput, translate('common.error.fieldRequired'));
+            });
+            return errors;
+        },
+        [formInputs, translate],
+    );
+
+    const connectPolicy = useCallback(
+        (formValues: FormOnyxValues<typeof ONYXKEYS.FORMS.NETSUITE_TOKEN_INPUT_FORM>) => {
+            connectPolicyToNetSuite(policyID, formValues);
+            onNext();
+        },
+        [onNext, policyID],
+    );
+
+    return (
+        <View style={[styles.flexGrow1, styles.ph5]}>
+            <Text style={[styles.textHeadlineLineHeightXXL]}>{translate(`workspace.netsuite.tokenInput.formSteps.enterCredentials.title`)}</Text>
+
+            <FormProvider
+                formID={ONYXKEYS.FORMS.NETSUITE_TOKEN_INPUT_FORM}
+                style={styles.flexGrow1}
+                validate={validate}
+                onSubmit={connectPolicy}
+                submitButtonText={translate('common.confirm')}
+                shouldValidateOnBlur
+                shouldValidateOnChange
+            >
+                {formInputs.map((formInput, index) => (
+                    <View
+                        style={styles.mb4}
+                        key={formInput}
+                    >
+                        <InputWrapper
+                            InputComponent={TextInput}
+                            inputID={formInput}
+                            ref={index === 0 ? inputCallbackRef : undefined}
+                            label={translate(`workspace.netsuite.tokenInput.formSteps.enterCredentials.formInputs.${formInput}`)}
+                            aria-label={translate(`workspace.netsuite.tokenInput.formSteps.enterCredentials.formInputs.${formInput}`)}
+                            role={CONST.ROLE.PRESENTATION}
+                            spellCheck={false}
+                        />
+                        {formInput === INPUT_IDS.NETSUITE_ACCOUNT_ID && (
+                            <View style={[styles.flexRow, styles.pt2]}>
+                                <RenderHTML
+                                    html={`<comment><muted-text>${Parser.replace(
+                                        translate(`workspace.netsuite.tokenInput.formSteps.enterCredentials.${formInput}Description`),
+                                    )}</muted-text></comment>`}
+                                />
+                            </View>
+                        )}
+                    </View>
+                ))}
+            </FormProvider>
+        </View>
+    );
+}
+
+NetSuiteTokenInputForm.displayName = 'NetSuiteTokenInputForm';
+export default NetSuiteTokenInputForm;
diff --git a/src/pages/workspace/accounting/netsuite/NetSuiteTokenInput/substeps/NetSuiteTokenSetupContent.tsx b/src/pages/workspace/accounting/netsuite/NetSuiteTokenInput/substeps/NetSuiteTokenSetupContent.tsx
new file mode 100644
index 000000000000..889e3101fb32
--- /dev/null
+++ b/src/pages/workspace/accounting/netsuite/NetSuiteTokenInput/substeps/NetSuiteTokenSetupContent.tsx
@@ -0,0 +1,44 @@
+import React from 'react';
+import {View} from 'react-native';
+import Button from '@components/Button';
+import FixedFooter from '@components/FixedFooter';
+import RenderHTML from '@components/RenderHTML';
+import Text from '@components/Text';
+import useLocalize from '@hooks/useLocalize';
+import type {SubStepProps} from '@hooks/useSubStep/types';
+import useThemeStyles from '@hooks/useThemeStyles';
+import Parser from '@libs/Parser';
+import CONST from '@src/CONST';
+import type {TranslationPaths} from '@src/languages/types';
+
+function NetSuiteTokenSetupContent({onNext, screenIndex}: SubStepProps) {
+    const styles = useThemeStyles();
+    const {translate} = useLocalize();
+
+    const stepKeys = CONST.NETSUITE_CONFIG.TOKEN_INPUT_STEP_KEYS;
+    const currentStepKey = stepKeys[(screenIndex ?? 0) as keyof typeof stepKeys];
+
+    const titleKey = `workspace.netsuite.tokenInput.formSteps.${currentStepKey}.title` as TranslationPaths;
+    const description = `workspace.netsuite.tokenInput.formSteps.${currentStepKey}.description` as TranslationPaths;
+
+    return (
+        <View style={styles.flex1}>
+            <Text style={[styles.textHeadlineLineHeightXXL, styles.ph5, styles.mb3]}>{translate(titleKey)}</Text>
+            <View style={[styles.flex1, styles.mb3, styles.ph5]}>
+                <RenderHTML html={`<comment><muted-text>${Parser.replace(translate(description))}</muted-text></comment>`} />
+            </View>
+            <FixedFooter style={[styles.mtAuto]}>
+                <Button
+                    success
+                    large
+                    style={[styles.w100]}
+                    onPress={onNext}
+                    text={translate('common.next')}
+                />
+            </FixedFooter>
+        </View>
+    );
+}
+
+NetSuiteTokenSetupContent.displayName = 'NetSuiteTokenSetupContent';
+export default NetSuiteTokenSetupContent;
diff --git a/src/pages/workspace/accounting/netsuite/advanced/NetSuiteAdvancedPage.tsx b/src/pages/workspace/accounting/netsuite/advanced/NetSuiteAdvancedPage.tsx
new file mode 100644
index 000000000000..1b86832c374a
--- /dev/null
+++ b/src/pages/workspace/accounting/netsuite/advanced/NetSuiteAdvancedPage.tsx
@@ -0,0 +1,295 @@
+import React, {useMemo} from 'react';
+import {View} from 'react-native';
+import ConnectionLayout from '@components/ConnectionLayout';
+import MenuItemWithTopDescription from '@components/MenuItemWithTopDescription';
+import OfflineWithFeedback from '@components/OfflineWithFeedback';
+import useLocalize from '@hooks/useLocalize';
+import useThemeStyles from '@hooks/useThemeStyles';
+import * as Connections from '@libs/actions/connections/NetSuiteCommands';
+import * as ErrorUtils from '@libs/ErrorUtils';
+import Navigation from '@libs/Navigation/Navigation';
+import {findSelectedBankAccountWithDefaultSelect, getFilteredApprovalAccountOptions, getFilteredCollectionAccountOptions, getFilteredReimbursableAccountOptions} from '@libs/PolicyUtils';
+import type {DividerLineItem, MenuItem, ToggleItem} from '@pages/workspace/accounting/netsuite/types';
+import type {WithPolicyConnectionsProps} from '@pages/workspace/withPolicyConnections';
+import withPolicyConnections from '@pages/workspace/withPolicyConnections';
+import ToggleSettingOptionRow from '@pages/workspace/workflows/ToggleSettingsOptionRow';
+import * as Policy from '@userActions/Policy/Policy';
+import CONST from '@src/CONST';
+import ROUTES from '@src/ROUTES';
+
+function NetSuiteAdvancedPage({policy}: WithPolicyConnectionsProps) {
+    const {translate} = useLocalize();
+    const styles = useThemeStyles();
+    const policyID = policy?.id ?? '-1';
+
+    const config = policy?.connections?.netsuite?.options.config;
+    const autoSyncConfig = policy?.connections?.netsuite?.config;
+
+    const {payableList} = policy?.connections?.netsuite?.options?.data ?? {};
+
+    const selectedReimbursementAccount = useMemo(
+        () => findSelectedBankAccountWithDefaultSelect(getFilteredReimbursableAccountOptions(payableList), config?.reimbursementAccountID),
+        [payableList, config?.reimbursementAccountID],
+    );
+    const selectedCollectionAccount = useMemo(
+        () => findSelectedBankAccountWithDefaultSelect(getFilteredCollectionAccountOptions(payableList), config?.collectionAccount),
+        [payableList, config?.collectionAccount],
+    );
+    const selectedApprovalAccount = useMemo(() => {
+        if (config?.approvalAccount === CONST.NETSUITE_APPROVAL_ACCOUNT_DEFAULT) {
+            return {
+                id: CONST.NETSUITE_APPROVAL_ACCOUNT_DEFAULT,
+                name: translate('workspace.netsuite.advancedConfig.defaultApprovalAccount'),
+            };
+        }
+        return findSelectedBankAccountWithDefaultSelect(getFilteredApprovalAccountOptions(payableList), config?.approvalAccount);
+    }, [config?.approvalAccount, payableList, translate]);
+
+    const menuItems: Array<MenuItem | ToggleItem | DividerLineItem> = [
+        {
+            type: 'toggle',
+            title: translate('workspace.accounting.autoSync'),
+            subtitle: translate('workspace.netsuite.advancedConfig.autoSyncDescription'),
+            isActive: !!autoSyncConfig?.autoSync.enabled,
+            switchAccessibilityLabel: translate('workspace.netsuite.advancedConfig.autoSyncDescription'),
+            shouldPlaceSubtitleBelowSwitch: true,
+            onCloseError: () => Policy.clearNetSuiteAutoSyncErrorField(policyID),
+            onToggle: (isEnabled) => Connections.updateNetSuiteAutoSync(policyID, isEnabled),
+            pendingAction: autoSyncConfig?.pendingFields?.autoSync,
+            errors: ErrorUtils.getLatestErrorField(autoSyncConfig, CONST.NETSUITE_CONFIG.AUTO_SYNC),
+        },
+        {
+            type: 'divider',
+            key: 'divider1',
+        },
+        {
+            type: 'toggle',
+            title: translate('workspace.accounting.reimbursedReports'),
+            subtitle: translate('workspace.netsuite.advancedConfig.reimbursedReportsDescription'),
+            isActive: !!config?.syncOptions.syncReimbursedReports,
+            switchAccessibilityLabel: translate('workspace.netsuite.advancedConfig.reimbursedReportsDescription'),
+            shouldPlaceSubtitleBelowSwitch: true,
+            onCloseError: () => Policy.clearNetSuiteErrorField(policyID, CONST.NETSUITE_CONFIG.SYNC_OPTIONS.SYNC_REIMBURSED_REPORTS),
+            onToggle: (isEnabled) => Connections.updateNetSuiteSyncReimbursedReports(policyID, isEnabled),
+            pendingAction: config?.syncOptions.pendingFields?.syncReimbursedReports,
+            errors: ErrorUtils.getLatestErrorField(config, CONST.NETSUITE_CONFIG.SYNC_OPTIONS.SYNC_REIMBURSED_REPORTS),
+            shouldHide: config?.reimbursableExpensesExportDestination === CONST.NETSUITE_EXPORT_DESTINATION.JOURNAL_ENTRY,
+        },
+        {
+            type: 'menuitem',
+            description: translate('workspace.netsuite.advancedConfig.reimbursementsAccount'),
+            onPress: () => Navigation.navigate(ROUTES.POLICY_ACCOUNTING_NETSUITE_REIMBURSEMENT_ACCOUNT_SELECT.getRoute(policyID)),
+            brickRoadIndicator: config?.errorFields?.reimbursementAccountID ? CONST.BRICK_ROAD_INDICATOR_STATUS.ERROR : undefined,
+            title: selectedReimbursementAccount ? selectedReimbursementAccount.name : undefined,
+            pendingAction: config?.pendingFields?.reimbursementAccountID,
+            errors: ErrorUtils.getLatestErrorField(config, CONST.NETSUITE_CONFIG.REIMBURSEMENT_ACCOUNT_ID),
+            onCloseError: () => Policy.clearNetSuiteErrorField(policyID, CONST.NETSUITE_CONFIG.REIMBURSEMENT_ACCOUNT_ID),
+            shouldHide: config?.reimbursableExpensesExportDestination === CONST.NETSUITE_EXPORT_DESTINATION.JOURNAL_ENTRY,
+        },
+        {
+            type: 'menuitem',
+            description: translate('workspace.netsuite.advancedConfig.collectionsAccount'),
+            onPress: () => Navigation.navigate(ROUTES.POLICY_ACCOUNTING_NETSUITE_COLLECTION_ACCOUNT_SELECT.getRoute(policyID)),
+            brickRoadIndicator: config?.errorFields?.collectionAccount ? CONST.BRICK_ROAD_INDICATOR_STATUS.ERROR : undefined,
+            title: selectedCollectionAccount ? selectedCollectionAccount.name : undefined,
+            pendingAction: config?.pendingFields?.collectionAccount,
+            errors: ErrorUtils.getLatestErrorField(config, CONST.NETSUITE_CONFIG.COLLECTION_ACCOUNT),
+            onCloseError: () => Policy.clearNetSuiteErrorField(policyID, CONST.NETSUITE_CONFIG.COLLECTION_ACCOUNT),
+            shouldHide: config?.reimbursableExpensesExportDestination === CONST.NETSUITE_EXPORT_DESTINATION.JOURNAL_ENTRY,
+        },
+        {
+            type: 'divider',
+            key: 'divider2',
+            shouldHide: config?.reimbursableExpensesExportDestination === CONST.NETSUITE_EXPORT_DESTINATION.JOURNAL_ENTRY,
+        },
+        {
+            type: 'toggle',
+            title: translate('workspace.netsuite.advancedConfig.inviteEmployees'),
+            subtitle: translate('workspace.netsuite.advancedConfig.inviteEmployeesDescription'),
+            isActive: !!config?.syncOptions.syncPeople,
+            switchAccessibilityLabel: translate('workspace.netsuite.advancedConfig.inviteEmployeesDescription'),
+            shouldPlaceSubtitleBelowSwitch: true,
+            shouldParseSubtitle: true,
+            onCloseError: () => Policy.clearNetSuiteErrorField(policyID, CONST.NETSUITE_CONFIG.SYNC_OPTIONS.SYNC_PEOPLE),
+            onToggle: (isEnabled) => Connections.updateNetSuiteSyncPeople(policyID, isEnabled),
+            pendingAction: config?.syncOptions.pendingFields?.syncPeople,
+            errors: ErrorUtils.getLatestErrorField(config, CONST.NETSUITE_CONFIG.SYNC_OPTIONS.SYNC_PEOPLE),
+        },
+        {
+            type: 'toggle',
+            title: translate('workspace.netsuite.advancedConfig.autoCreateEntities'),
+            isActive: !!config?.autoCreateEntities,
+            switchAccessibilityLabel: translate('workspace.netsuite.advancedConfig.autoCreateEntities'),
+            onCloseError: () => Policy.clearNetSuiteErrorField(policyID, CONST.NETSUITE_CONFIG.AUTO_CREATE_ENTITIES),
+            onToggle: (isEnabled) => Connections.updateNetSuiteAutoCreateEntities(policyID, isEnabled),
+            pendingAction: config?.pendingFields?.autoCreateEntities,
+            errors: ErrorUtils.getLatestErrorField(config, CONST.NETSUITE_CONFIG.AUTO_CREATE_ENTITIES),
+        },
+        {
+            type: 'divider',
+            key: 'divider3',
+        },
+        {
+            type: 'toggle',
+            title: translate('workspace.netsuite.advancedConfig.enableCategories'),
+            isActive: !!config?.syncOptions.enableNewCategories,
+            switchAccessibilityLabel: translate('workspace.netsuite.advancedConfig.enableCategories'),
+            onCloseError: () => Policy.clearNetSuiteErrorField(policyID, CONST.NETSUITE_CONFIG.SYNC_OPTIONS.ENABLE_NEW_CATEGORIES),
+            onToggle: (isEnabled) => Connections.updateNetSuiteEnableNewCategories(policyID, isEnabled),
+            pendingAction: config?.syncOptions.pendingFields?.enableNewCategories,
+            errors: ErrorUtils.getLatestErrorField(config, CONST.NETSUITE_CONFIG.SYNC_OPTIONS.ENABLE_NEW_CATEGORIES),
+        },
+        {
+            type: 'divider',
+            key: 'divider4',
+        },
+        {
+            type: 'menuitem',
+            description: translate('workspace.netsuite.advancedConfig.exportReportsTo.label'),
+            onPress: () => Navigation.navigate(ROUTES.POLICY_ACCOUNTING_NETSUITE_EXPENSE_REPORT_APPROVAL_LEVEL_SELECT.getRoute(policyID)),
+            brickRoadIndicator: config?.errorFields?.exportReportsTo ? CONST.BRICK_ROAD_INDICATOR_STATUS.ERROR : undefined,
+            title: config?.syncOptions.exportReportsTo ? translate(`workspace.netsuite.advancedConfig.exportReportsTo.values.${config.syncOptions.exportReportsTo}`) : undefined,
+            pendingAction: config?.syncOptions.pendingFields?.exportReportsTo,
+            errors: ErrorUtils.getLatestErrorField(config, CONST.NETSUITE_CONFIG.SYNC_OPTIONS.EXPORT_REPORTS_TO),
+            onCloseError: () => Policy.clearNetSuiteErrorField(policyID, CONST.NETSUITE_CONFIG.SYNC_OPTIONS.EXPORT_REPORTS_TO),
+            shouldHide: config?.reimbursableExpensesExportDestination !== CONST.NETSUITE_EXPORT_DESTINATION.EXPENSE_REPORT,
+        },
+        {
+            type: 'menuitem',
+            description: translate('workspace.netsuite.advancedConfig.exportVendorBillsTo.label'),
+            onPress: () => Navigation.navigate(ROUTES.POLICY_ACCOUNTING_NETSUITE_VENDOR_BILL_APPROVAL_LEVEL_SELECT.getRoute(policyID)),
+            brickRoadIndicator: config?.errorFields?.exportVendorBillsTo ? CONST.BRICK_ROAD_INDICATOR_STATUS.ERROR : undefined,
+            title: config?.syncOptions.exportVendorBillsTo ? translate(`workspace.netsuite.advancedConfig.exportVendorBillsTo.values.${config.syncOptions.exportVendorBillsTo}`) : undefined,
+            pendingAction: config?.syncOptions.pendingFields?.exportVendorBillsTo,
+            errors: ErrorUtils.getLatestErrorField(config, CONST.NETSUITE_CONFIG.SYNC_OPTIONS.EXPORT_VENDOR_BILLS_TO),
+            onCloseError: () => Policy.clearNetSuiteErrorField(policyID, CONST.NETSUITE_CONFIG.SYNC_OPTIONS.EXPORT_VENDOR_BILLS_TO),
+            shouldHide:
+                config?.reimbursableExpensesExportDestination !== CONST.NETSUITE_EXPORT_DESTINATION.VENDOR_BILL &&
+                config?.nonreimbursableExpensesExportDestination !== CONST.NETSUITE_EXPORT_DESTINATION.VENDOR_BILL,
+        },
+        {
+            type: 'menuitem',
+            description: translate('workspace.netsuite.advancedConfig.exportJournalsTo.label'),
+            onPress: () => Navigation.navigate(ROUTES.POLICY_ACCOUNTING_NETSUITE_JOURNAL_ENTRY_APPROVAL_LEVEL_SELECT.getRoute(policyID)),
+            brickRoadIndicator: config?.errorFields?.exportJournalsTo ? CONST.BRICK_ROAD_INDICATOR_STATUS.ERROR : undefined,
+            title: config?.syncOptions.exportJournalsTo ? translate(`workspace.netsuite.advancedConfig.exportJournalsTo.values.${config.syncOptions.exportJournalsTo}`) : undefined,
+            pendingAction: config?.syncOptions.pendingFields?.exportJournalsTo,
+            errors: ErrorUtils.getLatestErrorField(config, CONST.NETSUITE_CONFIG.SYNC_OPTIONS.EXPORT_JOURNALS_TO),
+            onCloseError: () => Policy.clearNetSuiteErrorField(policyID, CONST.NETSUITE_CONFIG.SYNC_OPTIONS.EXPORT_JOURNALS_TO),
+            shouldHide:
+                config?.reimbursableExpensesExportDestination !== CONST.NETSUITE_EXPORT_DESTINATION.JOURNAL_ENTRY &&
+                config?.nonreimbursableExpensesExportDestination !== CONST.NETSUITE_EXPORT_DESTINATION.JOURNAL_ENTRY,
+        },
+        {
+            type: 'menuitem',
+            description: translate('workspace.netsuite.advancedConfig.approvalAccount'),
+            onPress: () => Navigation.navigate(ROUTES.POLICY_ACCOUNTING_NETSUITE_APPROVAL_ACCOUNT_SELECT.getRoute(policyID)),
+            brickRoadIndicator: config?.errorFields?.approvalAccount ? CONST.BRICK_ROAD_INDICATOR_STATUS.ERROR : undefined,
+            title: selectedApprovalAccount ? selectedApprovalAccount.name : undefined,
+            pendingAction: config?.pendingFields?.approvalAccount,
+            errors: ErrorUtils.getLatestErrorField(config, CONST.NETSUITE_CONFIG.APPROVAL_ACCOUNT),
+            onCloseError: () => Policy.clearNetSuiteErrorField(policyID, CONST.NETSUITE_CONFIG.APPROVAL_ACCOUNT),
+        },
+        {
+            type: 'divider',
+            key: 'divider5',
+        },
+        {
+            type: 'toggle',
+            title: translate('workspace.netsuite.advancedConfig.customFormID'),
+            subtitle: translate('workspace.netsuite.advancedConfig.customFormIDDescription'),
+            isActive: !!config?.customFormIDOptions?.enabled,
+            switchAccessibilityLabel: translate('workspace.netsuite.advancedConfig.customFormIDDescription'),
+            shouldPlaceSubtitleBelowSwitch: true,
+            onCloseError: () => Policy.clearNetSuiteErrorField(policyID, CONST.NETSUITE_CONFIG.CUSTOM_FORM_ID_OPTIONS),
+            onToggle: (isEnabled) => Connections.updateNetSuiteCustomFormIDOptionsEnabled(policyID, isEnabled),
+            pendingAction: config?.pendingFields?.customFormIDOptions,
+            errors: ErrorUtils.getLatestErrorField(config, CONST.NETSUITE_CONFIG.CUSTOM_FORM_ID_OPTIONS),
+        },
+        {
+            type: 'menuitem',
+            description: translate('workspace.netsuite.advancedConfig.customFormIDReimbursable'),
+            onPress: () => Navigation.navigate(ROUTES.POLICY_ACCOUNTING_NETSUITE_CUSTOM_FORM_ID.getRoute(policyID, CONST.NETSUITE_EXPENSE_TYPE.REIMBURSABLE)),
+            brickRoadIndicator: config?.errorFields?.customFormIDOptions ? CONST.BRICK_ROAD_INDICATOR_STATUS.ERROR : undefined,
+            title: config?.customFormIDOptions?.reimbursable?.[CONST.NETSUITE_MAP_EXPORT_DESTINATION[config.reimbursableExpensesExportDestination]],
+            pendingAction: config?.pendingFields?.customFormIDOptions,
+            errors: ErrorUtils.getLatestErrorField(config, CONST.NETSUITE_CONFIG.CUSTOM_FORM_ID_OPTIONS),
+            onCloseError: () => Policy.clearNetSuiteErrorField(policyID, CONST.NETSUITE_CONFIG.CUSTOM_FORM_ID_OPTIONS),
+            shouldHide: !config?.customFormIDOptions?.enabled,
+        },
+        {
+            type: 'menuitem',
+            description: translate('workspace.netsuite.advancedConfig.customFormIDNonReimbursable'),
+            onPress: () => Navigation.navigate(ROUTES.POLICY_ACCOUNTING_NETSUITE_CUSTOM_FORM_ID.getRoute(policyID, CONST.NETSUITE_EXPENSE_TYPE.NON_REIMBURSABLE)),
+            brickRoadIndicator: config?.errorFields?.customFormIDOptions ? CONST.BRICK_ROAD_INDICATOR_STATUS.ERROR : undefined,
+            title: config?.customFormIDOptions?.nonReimbursable?.[CONST.NETSUITE_MAP_EXPORT_DESTINATION[config.nonreimbursableExpensesExportDestination]],
+            pendingAction: config?.pendingFields?.customFormIDOptions,
+            errors: ErrorUtils.getLatestErrorField(config, CONST.NETSUITE_CONFIG.CUSTOM_FORM_ID_OPTIONS),
+            onCloseError: () => Policy.clearNetSuiteErrorField(policyID, CONST.NETSUITE_CONFIG.CUSTOM_FORM_ID_OPTIONS),
+            shouldHide: !config?.customFormIDOptions?.enabled,
+        },
+    ];
+
+    return (
+        <ConnectionLayout
+            displayName={NetSuiteAdvancedPage.displayName}
+            headerTitle="workspace.accounting.advanced"
+            headerSubtitle={config?.subsidiary ?? ''}
+            accessVariants={[CONST.POLICY.ACCESS_VARIANTS.ADMIN]}
+            policyID={policyID}
+            featureName={CONST.POLICY.MORE_FEATURES.ARE_CONNECTIONS_ENABLED}
+            contentContainerStyle={styles.pb2}
+            titleStyle={styles.ph5}
+            connectionName={CONST.POLICY.CONNECTIONS.NAME.NETSUITE}
+        >
+            {menuItems
+                .filter((item) => !item.shouldHide)
+                .map((item) => {
+                    switch (item.type) {
+                        case 'divider':
+                            return (
+                                <View
+                                    key={item.key}
+                                    style={styles.dividerLine}
+                                />
+                            );
+                        case 'toggle':
+                            // eslint-disable-next-line no-case-declarations
+                            const {type, shouldHide, ...rest} = item;
+                            return (
+                                <ToggleSettingOptionRow
+                                    key={rest.title}
+                                    // eslint-disable-next-line react/jsx-props-no-spreading
+                                    {...rest}
+                                    wrapperStyle={[styles.mv3, styles.ph5]}
+                                />
+                            );
+                        default:
+                            return (
+                                <OfflineWithFeedback
+                                    key={item.description}
+                                    pendingAction={item.pendingAction}
+                                    errors={item.errors}
+                                    errorRowStyles={[styles.ph5]}
+                                    onClose={item.onCloseError}
+                                >
+                                    <MenuItemWithTopDescription
+                                        title={item.title}
+                                        description={item.description}
+                                        shouldShowRightIcon
+                                        onPress={item?.onPress}
+                                        brickRoadIndicator={item?.brickRoadIndicator}
+                                        helperText={item?.helperText}
+                                        errorText={item?.errorText}
+                                    />
+                                </OfflineWithFeedback>
+                            );
+                    }
+                })}
+        </ConnectionLayout>
+    );
+}
+
+NetSuiteAdvancedPage.displayName = 'NetSuiteAdvancedPage';
+
+export default withPolicyConnections(NetSuiteAdvancedPage);
diff --git a/src/pages/workspace/accounting/netsuite/advanced/NetSuiteApprovalAccountSelectPage.tsx b/src/pages/workspace/accounting/netsuite/advanced/NetSuiteApprovalAccountSelectPage.tsx
new file mode 100644
index 000000000000..98cf607e30ab
--- /dev/null
+++ b/src/pages/workspace/accounting/netsuite/advanced/NetSuiteApprovalAccountSelectPage.tsx
@@ -0,0 +1,90 @@
+import React, {useCallback, useMemo} from 'react';
+import {View} from 'react-native';
+import BlockingView from '@components/BlockingViews/BlockingView';
+import * as Illustrations from '@components/Icon/Illustrations';
+import RadioListItem from '@components/SelectionList/RadioListItem';
+import type {SelectorType} from '@components/SelectionScreen';
+import SelectionScreen from '@components/SelectionScreen';
+import Text from '@components/Text';
+import useLocalize from '@hooks/useLocalize';
+import useThemeStyles from '@hooks/useThemeStyles';
+import * as Connections from '@libs/actions/connections/NetSuiteCommands';
+import Navigation from '@libs/Navigation/Navigation';
+import {getNetSuiteApprovalAccountOptions} from '@libs/PolicyUtils';
+import type {WithPolicyConnectionsProps} from '@pages/workspace/withPolicyConnections';
+import withPolicyConnections from '@pages/workspace/withPolicyConnections';
+import variables from '@styles/variables';
+import CONST from '@src/CONST';
+import ROUTES from '@src/ROUTES';
+
+function NetSuiteApprovalAccountSelectPage({policy}: WithPolicyConnectionsProps) {
+    const styles = useThemeStyles();
+    const {translate} = useLocalize();
+
+    const policyID = policy?.id ?? '-1';
+
+    const config = policy?.connections?.netsuite.options.config;
+    const netsuiteApprovalAccountOptions = useMemo<SelectorType[]>(
+        () => getNetSuiteApprovalAccountOptions(policy ?? undefined, config?.approvalAccount),
+        // The default option will be language dependent, so we need to recompute the options when the language changes
+        // eslint-disable-next-line react-compiler/react-compiler, react-hooks/exhaustive-deps
+        [config?.approvalAccount, policy, translate],
+    );
+
+    const initiallyFocusedOptionKey = useMemo(() => netsuiteApprovalAccountOptions?.find((mode) => mode.isSelected)?.keyForList, [netsuiteApprovalAccountOptions]);
+
+    const updateCollectionAccount = useCallback(
+        ({value}: SelectorType) => {
+            if (config?.approvalAccount !== value) {
+                Connections.updateNetSuiteApprovalAccount(policyID, value, config?.approvalAccount ?? CONST.NETSUITE_APPROVAL_ACCOUNT_DEFAULT);
+            }
+            Navigation.goBack(ROUTES.POLICY_ACCOUNTING_NETSUITE_ADVANCED.getRoute(policyID));
+        },
+        [policyID, config?.approvalAccount],
+    );
+
+    const listEmptyContent = useMemo(
+        () => (
+            <BlockingView
+                icon={Illustrations.TeleScope}
+                iconWidth={variables.emptyListIconWidth}
+                iconHeight={variables.emptyListIconHeight}
+                title={translate('workspace.netsuite.noAccountsFound')}
+                subtitle={translate('workspace.netsuite.noAccountsFoundDescription')}
+                containerStyle={styles.pb10}
+            />
+        ),
+        [translate, styles.pb10],
+    );
+
+    const headerContent = useMemo(
+        () => (
+            <View>
+                <Text style={[styles.ph5, styles.pb5]}>{translate('workspace.netsuite.advancedConfig.approvalAccountDescription')}</Text>
+            </View>
+        ),
+        [translate, styles.pb5, styles.ph5],
+    );
+
+    return (
+        <SelectionScreen
+            policyID={policyID}
+            accessVariants={[CONST.POLICY.ACCESS_VARIANTS.ADMIN, CONST.POLICY.ACCESS_VARIANTS.CONTROL]}
+            featureName={CONST.POLICY.MORE_FEATURES.ARE_CONNECTIONS_ENABLED}
+            displayName={NetSuiteApprovalAccountSelectPage.displayName}
+            headerContent={headerContent}
+            sections={netsuiteApprovalAccountOptions.length ? [{data: netsuiteApprovalAccountOptions}] : []}
+            listItem={RadioListItem}
+            onSelectRow={updateCollectionAccount}
+            initiallyFocusedOptionKey={initiallyFocusedOptionKey}
+            onBackButtonPress={() => Navigation.goBack(ROUTES.POLICY_ACCOUNTING_NETSUITE_ADVANCED.getRoute(policyID))}
+            title="workspace.netsuite.advancedConfig.approvalAccount"
+            listEmptyContent={listEmptyContent}
+            connectionName={CONST.POLICY.CONNECTIONS.NAME.NETSUITE}
+        />
+    );
+}
+
+NetSuiteApprovalAccountSelectPage.displayName = 'NetSuiteApprovalAccountSelectPage';
+
+export default withPolicyConnections(NetSuiteApprovalAccountSelectPage);
diff --git a/src/pages/workspace/accounting/netsuite/advanced/NetSuiteCollectionAccountSelectPage.tsx b/src/pages/workspace/accounting/netsuite/advanced/NetSuiteCollectionAccountSelectPage.tsx
new file mode 100644
index 000000000000..a8ad5cff5895
--- /dev/null
+++ b/src/pages/workspace/accounting/netsuite/advanced/NetSuiteCollectionAccountSelectPage.tsx
@@ -0,0 +1,89 @@
+import React, {useCallback, useMemo} from 'react';
+import {View} from 'react-native';
+import BlockingView from '@components/BlockingViews/BlockingView';
+import * as Illustrations from '@components/Icon/Illustrations';
+import RadioListItem from '@components/SelectionList/RadioListItem';
+import type {SelectorType} from '@components/SelectionScreen';
+import SelectionScreen from '@components/SelectionScreen';
+import Text from '@components/Text';
+import useLocalize from '@hooks/useLocalize';
+import useThemeStyles from '@hooks/useThemeStyles';
+import * as Connections from '@libs/actions/connections/NetSuiteCommands';
+import Navigation from '@libs/Navigation/Navigation';
+import {getNetSuiteCollectionAccountOptions} from '@libs/PolicyUtils';
+import type {WithPolicyConnectionsProps} from '@pages/workspace/withPolicyConnections';
+import withPolicyConnections from '@pages/workspace/withPolicyConnections';
+import variables from '@styles/variables';
+import CONST from '@src/CONST';
+import ROUTES from '@src/ROUTES';
+
+function NetSuiteCollectionAccountSelectPage({policy}: WithPolicyConnectionsProps) {
+    const styles = useThemeStyles();
+    const {translate} = useLocalize();
+
+    const policyID = policy?.id ?? '-1';
+
+    const config = policy?.connections?.netsuite.options.config;
+    const netsuiteCollectionAccountOptions = useMemo<SelectorType[]>(
+        () => getNetSuiteCollectionAccountOptions(policy ?? undefined, config?.collectionAccount),
+        [config?.collectionAccount, policy],
+    );
+
+    const initiallyFocusedOptionKey = useMemo(() => netsuiteCollectionAccountOptions?.find((mode) => mode.isSelected)?.keyForList, [netsuiteCollectionAccountOptions]);
+
+    const updateCollectionAccount = useCallback(
+        ({value}: SelectorType) => {
+            if (config?.collectionAccount !== value) {
+                Connections.updateNetSuiteCollectionAccount(policyID, value, config?.collectionAccount);
+            }
+            Navigation.goBack(ROUTES.POLICY_ACCOUNTING_NETSUITE_ADVANCED.getRoute(policyID));
+        },
+        [policyID, config?.collectionAccount],
+    );
+
+    const listEmptyContent = useMemo(
+        () => (
+            <BlockingView
+                icon={Illustrations.TeleScope}
+                iconWidth={variables.emptyListIconWidth}
+                iconHeight={variables.emptyListIconHeight}
+                title={translate('workspace.netsuite.noAccountsFound')}
+                subtitle={translate('workspace.netsuite.noAccountsFoundDescription')}
+                containerStyle={styles.pb10}
+            />
+        ),
+        [translate, styles.pb10],
+    );
+
+    const headerContent = useMemo(
+        () => (
+            <View>
+                <Text style={[styles.ph5, styles.pb5]}>{translate('workspace.netsuite.advancedConfig.collectionsAccountDescription')}</Text>
+            </View>
+        ),
+        [translate, styles.pb5, styles.ph5],
+    );
+
+    return (
+        <SelectionScreen
+            policyID={policyID}
+            accessVariants={[CONST.POLICY.ACCESS_VARIANTS.ADMIN, CONST.POLICY.ACCESS_VARIANTS.CONTROL]}
+            featureName={CONST.POLICY.MORE_FEATURES.ARE_CONNECTIONS_ENABLED}
+            displayName={NetSuiteCollectionAccountSelectPage.displayName}
+            headerContent={headerContent}
+            sections={netsuiteCollectionAccountOptions.length ? [{data: netsuiteCollectionAccountOptions}] : []}
+            listItem={RadioListItem}
+            onSelectRow={updateCollectionAccount}
+            initiallyFocusedOptionKey={initiallyFocusedOptionKey}
+            onBackButtonPress={() => Navigation.goBack(ROUTES.POLICY_ACCOUNTING_NETSUITE_ADVANCED.getRoute(policyID))}
+            title="workspace.netsuite.advancedConfig.collectionsAccount"
+            listEmptyContent={listEmptyContent}
+            connectionName={CONST.POLICY.CONNECTIONS.NAME.NETSUITE}
+            shouldBeBlocked={config?.reimbursableExpensesExportDestination === CONST.NETSUITE_EXPORT_DESTINATION.JOURNAL_ENTRY}
+        />
+    );
+}
+
+NetSuiteCollectionAccountSelectPage.displayName = 'NetSuiteCollectionAccountSelectPage';
+
+export default withPolicyConnections(NetSuiteCollectionAccountSelectPage);
diff --git a/src/pages/workspace/accounting/netsuite/advanced/NetSuiteCustomFormIDPage.tsx b/src/pages/workspace/accounting/netsuite/advanced/NetSuiteCustomFormIDPage.tsx
new file mode 100644
index 000000000000..9a4635dd17bb
--- /dev/null
+++ b/src/pages/workspace/accounting/netsuite/advanced/NetSuiteCustomFormIDPage.tsx
@@ -0,0 +1,106 @@
+import {useRoute} from '@react-navigation/native';
+import React, {useCallback} from 'react';
+import {View} from 'react-native';
+import ConnectionLayout from '@components/ConnectionLayout';
+import FormProvider from '@components/Form/FormProvider';
+import InputWrapper from '@components/Form/InputWrapper';
+import type {FormInputErrors, FormOnyxValues} from '@components/Form/types';
+import TextInput from '@components/TextInput';
+import useAutoFocusInput from '@hooks/useAutoFocusInput';
+import useLocalize from '@hooks/useLocalize';
+import useThemeStyles from '@hooks/useThemeStyles';
+import * as Connections from '@libs/actions/connections/NetSuiteCommands';
+import * as ErrorUtils from '@libs/ErrorUtils';
+import Navigation from '@libs/Navigation/Navigation';
+import * as ValidationUtils from '@libs/ValidationUtils';
+import type {ExpenseRouteParams} from '@pages/workspace/accounting/netsuite/types';
+import type {WithPolicyConnectionsProps} from '@pages/workspace/withPolicyConnections';
+import withPolicyConnections from '@pages/workspace/withPolicyConnections';
+import CONST from '@src/CONST';
+import ONYXKEYS from '@src/ONYXKEYS';
+import ROUTES from '@src/ROUTES';
+
+function NetSuiteCustomFormIDPage({policy}: WithPolicyConnectionsProps) {
+    const {translate} = useLocalize();
+    const {inputCallbackRef} = useAutoFocusInput();
+
+    const styles = useThemeStyles();
+    const policyID = policy?.id ?? '-1';
+    const route = useRoute();
+    const params = route.params as ExpenseRouteParams;
+    const isReimbursable = params.expenseType === CONST.NETSUITE_EXPENSE_TYPE.REIMBURSABLE;
+
+    const config = policy?.connections?.netsuite?.options.config;
+
+    const exportDestination =
+        (isReimbursable ? config?.reimbursableExpensesExportDestination : config?.nonreimbursableExpensesExportDestination) ?? CONST.NETSUITE_EXPORT_DESTINATION.EXPENSE_REPORT;
+    const customFormIDKey = isReimbursable ? CONST.NETSUITE_CONFIG.CUSTOM_FORM_ID_TYPE.REIMBURSABLE : CONST.NETSUITE_CONFIG.CUSTOM_FORM_ID_TYPE.NON_REIMBURSABLE;
+
+    const validate = useCallback(
+        (values: FormOnyxValues<typeof ONYXKEYS.FORMS.NETSUITE_CUSTOM_FORM_ID_FORM>): FormInputErrors<typeof ONYXKEYS.FORMS.NETSUITE_CUSTOM_FORM_ID_FORM> => {
+            const errors: FormInputErrors<typeof ONYXKEYS.FORMS.NETSUITE_CUSTOM_FORM_ID_FORM> = {};
+
+            if (values[params.expenseType] && !ValidationUtils.isNumeric(values[params.expenseType])) {
+                ErrorUtils.addErrorMessage(errors, params.expenseType, translate('workspace.netsuite.advancedConfig.error.customFormID'));
+            }
+
+            return errors;
+        },
+        [params.expenseType, translate],
+    );
+
+    const updateCustomFormID = useCallback(
+        (formValues: FormOnyxValues<typeof ONYXKEYS.FORMS.NETSUITE_CUSTOM_FORM_ID_FORM>) => {
+            if (config?.customFormIDOptions?.[customFormIDKey]?.[CONST.NETSUITE_MAP_EXPORT_DESTINATION[exportDestination]] !== formValues[params.expenseType]) {
+                Connections.updateNetSuiteCustomFormIDOptions(policyID, formValues[params.expenseType], isReimbursable, exportDestination, config?.customFormIDOptions);
+            }
+            Navigation.goBack(ROUTES.POLICY_ACCOUNTING_NETSUITE_ADVANCED.getRoute(policyID));
+        },
+        [config?.customFormIDOptions, customFormIDKey, exportDestination, isReimbursable, params.expenseType, policyID],
+    );
+
+    return (
+        <ConnectionLayout
+            displayName={NetSuiteCustomFormIDPage.displayName}
+            onBackButtonPress={() => Navigation.goBack(ROUTES.POLICY_ACCOUNTING_NETSUITE_ADVANCED.getRoute(policyID))}
+            headerTitle={`workspace.netsuite.advancedConfig.${isReimbursable ? 'customFormIDReimbursable' : 'customFormIDNonReimbursable'}`}
+            accessVariants={[CONST.POLICY.ACCESS_VARIANTS.ADMIN, CONST.POLICY.ACCESS_VARIANTS.CONTROL]}
+            policyID={policyID}
+            featureName={CONST.POLICY.MORE_FEATURES.ARE_CONNECTIONS_ENABLED}
+            contentContainerStyle={[styles.flex1]}
+            titleStyle={styles.ph5}
+            connectionName={CONST.POLICY.CONNECTIONS.NAME.NETSUITE}
+            shouldIncludeSafeAreaPaddingBottom
+            shouldBeBlocked={!config?.customFormIDOptions?.enabled}
+            shouldUseScrollView={false}
+        >
+            <View style={[styles.flexGrow1, styles.ph5]}>
+                <FormProvider
+                    formID={ONYXKEYS.FORMS.NETSUITE_CUSTOM_FORM_ID_FORM}
+                    style={styles.flexGrow1}
+                    validate={validate}
+                    onSubmit={updateCustomFormID}
+                    submitButtonText={translate('common.confirm')}
+                    shouldValidateOnBlur
+                    shouldValidateOnChange
+                >
+                    <InputWrapper
+                        InputComponent={TextInput}
+                        ref={inputCallbackRef}
+                        inputID={params.expenseType}
+                        label={translate(`workspace.netsuite.advancedConfig.${isReimbursable ? 'customFormIDReimbursable' : 'customFormIDNonReimbursable'}`)}
+                        aria-label={translate(`workspace.netsuite.advancedConfig.${isReimbursable ? 'customFormIDReimbursable' : 'customFormIDNonReimbursable'}`)}
+                        role={CONST.ROLE.PRESENTATION}
+                        spellCheck={false}
+                        inputMode={CONST.INPUT_MODE.NUMERIC}
+                        defaultValue={config?.customFormIDOptions?.[customFormIDKey]?.[CONST.NETSUITE_MAP_EXPORT_DESTINATION[exportDestination]]}
+                    />
+                </FormProvider>
+            </View>
+        </ConnectionLayout>
+    );
+}
+
+NetSuiteCustomFormIDPage.displayName = 'NetSuiteCustomFormIDPage';
+
+export default withPolicyConnections(NetSuiteCustomFormIDPage);
diff --git a/src/pages/workspace/accounting/netsuite/advanced/NetSuiteExpenseReportApprovalLevelSelectPage.tsx b/src/pages/workspace/accounting/netsuite/advanced/NetSuiteExpenseReportApprovalLevelSelectPage.tsx
new file mode 100644
index 000000000000..ed70da6f1608
--- /dev/null
+++ b/src/pages/workspace/accounting/netsuite/advanced/NetSuiteExpenseReportApprovalLevelSelectPage.tsx
@@ -0,0 +1,74 @@
+import React, {useCallback, useMemo} from 'react';
+import {View} from 'react-native';
+import type {ValueOf} from 'type-fest';
+import RadioListItem from '@components/SelectionList/RadioListItem';
+import type {ListItem} from '@components/SelectionList/types';
+import SelectionScreen from '@components/SelectionScreen';
+import type {SelectorType} from '@components/SelectionScreen';
+import Text from '@components/Text';
+import useLocalize from '@hooks/useLocalize';
+import useThemeStyles from '@hooks/useThemeStyles';
+import * as Connections from '@libs/actions/connections/NetSuiteCommands';
+import Navigation from '@navigation/Navigation';
+import type {WithPolicyConnectionsProps} from '@pages/workspace/withPolicyConnections';
+import withPolicyConnections from '@pages/workspace/withPolicyConnections';
+import CONST from '@src/CONST';
+import ROUTES from '@src/ROUTES';
+
+type MenuListItem = ListItem & {
+    value: ValueOf<typeof CONST.NETSUITE_REPORTS_APPROVAL_LEVEL>;
+};
+
+function NetSuiteExpenseReportApprovalLevelSelectPage({policy}: WithPolicyConnectionsProps) {
+    const {translate} = useLocalize();
+    const policyID = policy?.id ?? '-1';
+    const styles = useThemeStyles();
+    const config = policy?.connections?.netsuite.options.config;
+    const data: MenuListItem[] = Object.values(CONST.NETSUITE_REPORTS_APPROVAL_LEVEL).map((approvalType) => ({
+        value: approvalType,
+        text: translate(`workspace.netsuite.advancedConfig.exportReportsTo.values.${approvalType}`),
+        keyForList: approvalType,
+        isSelected: config?.syncOptions.exportReportsTo === approvalType,
+    }));
+
+    const headerContent = useMemo(
+        () => (
+            <View>
+                <Text style={[styles.ph5, styles.pb5]}>{translate('workspace.netsuite.advancedConfig.exportReportsTo.description')}</Text>
+            </View>
+        ),
+        [translate, styles.pb5, styles.ph5],
+    );
+
+    const selectExpenseReportApprovalLevel = useCallback(
+        (row: MenuListItem) => {
+            if (row.value !== config?.syncOptions.exportReportsTo) {
+                Connections.updateNetSuiteExportReportsTo(policyID, row.value, config?.syncOptions.exportReportsTo ?? CONST.NETSUITE_REPORTS_APPROVAL_LEVEL.REPORTS_APPROVED_NONE);
+            }
+            Navigation.goBack(ROUTES.POLICY_ACCOUNTING_NETSUITE_ADVANCED.getRoute(policyID));
+        },
+        [config?.syncOptions.exportReportsTo, policyID],
+    );
+
+    return (
+        <SelectionScreen
+            displayName={NetSuiteExpenseReportApprovalLevelSelectPage.displayName}
+            title="workspace.netsuite.advancedConfig.exportReportsTo.label"
+            headerContent={headerContent}
+            sections={[{data}]}
+            listItem={RadioListItem}
+            onSelectRow={(selection: SelectorType) => selectExpenseReportApprovalLevel(selection as MenuListItem)}
+            initiallyFocusedOptionKey={data.find((mode) => mode.isSelected)?.keyForList}
+            policyID={policyID}
+            accessVariants={[CONST.POLICY.ACCESS_VARIANTS.ADMIN]}
+            featureName={CONST.POLICY.MORE_FEATURES.ARE_CONNECTIONS_ENABLED}
+            onBackButtonPress={() => Navigation.goBack(ROUTES.POLICY_ACCOUNTING_NETSUITE_ADVANCED.getRoute(policyID))}
+            connectionName={CONST.POLICY.CONNECTIONS.NAME.NETSUITE}
+            shouldBeBlocked={config?.reimbursableExpensesExportDestination !== CONST.NETSUITE_EXPORT_DESTINATION.EXPENSE_REPORT}
+        />
+    );
+}
+
+NetSuiteExpenseReportApprovalLevelSelectPage.displayName = 'NetSuiteExpenseReportApprovalLevelSelectPage';
+
+export default withPolicyConnections(NetSuiteExpenseReportApprovalLevelSelectPage);
diff --git a/src/pages/workspace/accounting/netsuite/advanced/NetSuiteJournalEntryApprovalLevelSelectPage.tsx b/src/pages/workspace/accounting/netsuite/advanced/NetSuiteJournalEntryApprovalLevelSelectPage.tsx
new file mode 100644
index 000000000000..ee1d1108ffd6
--- /dev/null
+++ b/src/pages/workspace/accounting/netsuite/advanced/NetSuiteJournalEntryApprovalLevelSelectPage.tsx
@@ -0,0 +1,77 @@
+import React, {useCallback, useMemo} from 'react';
+import {View} from 'react-native';
+import type {ValueOf} from 'type-fest';
+import RadioListItem from '@components/SelectionList/RadioListItem';
+import type {ListItem} from '@components/SelectionList/types';
+import SelectionScreen from '@components/SelectionScreen';
+import type {SelectorType} from '@components/SelectionScreen';
+import Text from '@components/Text';
+import useLocalize from '@hooks/useLocalize';
+import useThemeStyles from '@hooks/useThemeStyles';
+import * as Connections from '@libs/actions/connections/NetSuiteCommands';
+import Navigation from '@navigation/Navigation';
+import type {WithPolicyConnectionsProps} from '@pages/workspace/withPolicyConnections';
+import withPolicyConnections from '@pages/workspace/withPolicyConnections';
+import CONST from '@src/CONST';
+import ROUTES from '@src/ROUTES';
+
+type MenuListItem = ListItem & {
+    value: ValueOf<typeof CONST.NETSUITE_JOURNALS_APPROVAL_LEVEL>;
+};
+
+function NetSuiteJournalEntryApprovalLevelSelectPage({policy}: WithPolicyConnectionsProps) {
+    const {translate} = useLocalize();
+    const policyID = policy?.id ?? '-1';
+    const styles = useThemeStyles();
+    const config = policy?.connections?.netsuite.options.config;
+    const data: MenuListItem[] = Object.values(CONST.NETSUITE_JOURNALS_APPROVAL_LEVEL).map((approvalType) => ({
+        value: approvalType,
+        text: translate(`workspace.netsuite.advancedConfig.exportJournalsTo.values.${approvalType}`),
+        keyForList: approvalType,
+        isSelected: config?.syncOptions.exportJournalsTo === approvalType,
+    }));
+
+    const headerContent = useMemo(
+        () => (
+            <View>
+                <Text style={[styles.ph5, styles.pb5]}>{translate('workspace.netsuite.advancedConfig.exportJournalsTo.description')}</Text>
+            </View>
+        ),
+        [translate, styles.pb5, styles.ph5],
+    );
+
+    const selectJournalApprovalLevel = useCallback(
+        (row: MenuListItem) => {
+            if (row.value !== config?.syncOptions.exportJournalsTo) {
+                Connections.updateNetSuiteExportJournalsTo(policyID, row.value, config?.syncOptions.exportJournalsTo ?? CONST.NETSUITE_JOURNALS_APPROVAL_LEVEL.JOURNALS_APPROVED_NONE);
+            }
+            Navigation.goBack(ROUTES.POLICY_ACCOUNTING_NETSUITE_ADVANCED.getRoute(policyID));
+        },
+        [config?.syncOptions.exportJournalsTo, policyID],
+    );
+
+    return (
+        <SelectionScreen
+            displayName={NetSuiteJournalEntryApprovalLevelSelectPage.displayName}
+            title="workspace.netsuite.advancedConfig.exportJournalsTo.label"
+            headerContent={headerContent}
+            sections={[{data}]}
+            listItem={RadioListItem}
+            onSelectRow={(selection: SelectorType) => selectJournalApprovalLevel(selection as MenuListItem)}
+            initiallyFocusedOptionKey={data.find((mode) => mode.isSelected)?.keyForList}
+            policyID={policyID}
+            accessVariants={[CONST.POLICY.ACCESS_VARIANTS.ADMIN]}
+            featureName={CONST.POLICY.MORE_FEATURES.ARE_CONNECTIONS_ENABLED}
+            onBackButtonPress={() => Navigation.goBack(ROUTES.POLICY_ACCOUNTING_NETSUITE_ADVANCED.getRoute(policyID))}
+            connectionName={CONST.POLICY.CONNECTIONS.NAME.NETSUITE}
+            shouldBeBlocked={
+                config?.reimbursableExpensesExportDestination !== CONST.NETSUITE_EXPORT_DESTINATION.JOURNAL_ENTRY &&
+                config?.nonreimbursableExpensesExportDestination !== CONST.NETSUITE_EXPORT_DESTINATION.JOURNAL_ENTRY
+            }
+        />
+    );
+}
+
+NetSuiteJournalEntryApprovalLevelSelectPage.displayName = 'NetSuiteJournalEntryApprovalLevelSelectPage';
+
+export default withPolicyConnections(NetSuiteJournalEntryApprovalLevelSelectPage);
diff --git a/src/pages/workspace/accounting/netsuite/advanced/NetSuiteReimbursementAccountSelectPage.tsx b/src/pages/workspace/accounting/netsuite/advanced/NetSuiteReimbursementAccountSelectPage.tsx
new file mode 100644
index 000000000000..4ad1a1b62633
--- /dev/null
+++ b/src/pages/workspace/accounting/netsuite/advanced/NetSuiteReimbursementAccountSelectPage.tsx
@@ -0,0 +1,89 @@
+import React, {useCallback, useMemo} from 'react';
+import {View} from 'react-native';
+import BlockingView from '@components/BlockingViews/BlockingView';
+import * as Illustrations from '@components/Icon/Illustrations';
+import RadioListItem from '@components/SelectionList/RadioListItem';
+import type {SelectorType} from '@components/SelectionScreen';
+import SelectionScreen from '@components/SelectionScreen';
+import Text from '@components/Text';
+import useLocalize from '@hooks/useLocalize';
+import useThemeStyles from '@hooks/useThemeStyles';
+import * as Connections from '@libs/actions/connections/NetSuiteCommands';
+import Navigation from '@libs/Navigation/Navigation';
+import {getNetSuiteReimbursableAccountOptions} from '@libs/PolicyUtils';
+import type {WithPolicyConnectionsProps} from '@pages/workspace/withPolicyConnections';
+import withPolicyConnections from '@pages/workspace/withPolicyConnections';
+import variables from '@styles/variables';
+import CONST from '@src/CONST';
+import ROUTES from '@src/ROUTES';
+
+function NetSuiteReimbursementAccountSelectPage({policy}: WithPolicyConnectionsProps) {
+    const styles = useThemeStyles();
+    const {translate} = useLocalize();
+
+    const policyID = policy?.id ?? '-1';
+
+    const config = policy?.connections?.netsuite.options.config;
+    const netsuiteReimbursableAccountOptions = useMemo<SelectorType[]>(
+        () => getNetSuiteReimbursableAccountOptions(policy ?? undefined, config?.reimbursementAccountID),
+        [config?.reimbursementAccountID, policy],
+    );
+
+    const initiallyFocusedOptionKey = useMemo(() => netsuiteReimbursableAccountOptions?.find((mode) => mode.isSelected)?.keyForList, [netsuiteReimbursableAccountOptions]);
+
+    const updateReimbursementAccount = useCallback(
+        ({value}: SelectorType) => {
+            if (config?.reimbursementAccountID !== value) {
+                Connections.updateNetSuiteReimbursementAccountID(policyID, value, config?.reimbursementAccountID);
+            }
+            Navigation.goBack(ROUTES.POLICY_ACCOUNTING_NETSUITE_ADVANCED.getRoute(policyID));
+        },
+        [policyID, config?.reimbursementAccountID],
+    );
+
+    const listEmptyContent = useMemo(
+        () => (
+            <BlockingView
+                icon={Illustrations.TeleScope}
+                iconWidth={variables.emptyListIconWidth}
+                iconHeight={variables.emptyListIconHeight}
+                title={translate('workspace.netsuite.noAccountsFound')}
+                subtitle={translate('workspace.netsuite.noAccountsFoundDescription')}
+                containerStyle={styles.pb10}
+            />
+        ),
+        [translate, styles.pb10],
+    );
+
+    const headerContent = useMemo(
+        () => (
+            <View>
+                <Text style={[styles.ph5, styles.pb5]}>{translate('workspace.netsuite.advancedConfig.reimbursementsAccountDescription')}</Text>
+            </View>
+        ),
+        [translate, styles.pb5, styles.ph5],
+    );
+
+    return (
+        <SelectionScreen
+            policyID={policyID}
+            accessVariants={[CONST.POLICY.ACCESS_VARIANTS.ADMIN, CONST.POLICY.ACCESS_VARIANTS.CONTROL]}
+            featureName={CONST.POLICY.MORE_FEATURES.ARE_CONNECTIONS_ENABLED}
+            displayName={NetSuiteReimbursementAccountSelectPage.displayName}
+            headerContent={headerContent}
+            sections={netsuiteReimbursableAccountOptions.length ? [{data: netsuiteReimbursableAccountOptions}] : []}
+            listItem={RadioListItem}
+            onSelectRow={updateReimbursementAccount}
+            initiallyFocusedOptionKey={initiallyFocusedOptionKey}
+            onBackButtonPress={() => Navigation.goBack(ROUTES.POLICY_ACCOUNTING_NETSUITE_ADVANCED.getRoute(policyID))}
+            title="workspace.netsuite.advancedConfig.reimbursementsAccount"
+            listEmptyContent={listEmptyContent}
+            connectionName={CONST.POLICY.CONNECTIONS.NAME.NETSUITE}
+            shouldBeBlocked={config?.reimbursableExpensesExportDestination === CONST.NETSUITE_EXPORT_DESTINATION.JOURNAL_ENTRY}
+        />
+    );
+}
+
+NetSuiteReimbursementAccountSelectPage.displayName = 'NetSuiteReimbursementAccountSelectPage';
+
+export default withPolicyConnections(NetSuiteReimbursementAccountSelectPage);
diff --git a/src/pages/workspace/accounting/netsuite/advanced/NetSuiteVendorBillApprovalLevelSelectPage.tsx b/src/pages/workspace/accounting/netsuite/advanced/NetSuiteVendorBillApprovalLevelSelectPage.tsx
new file mode 100644
index 000000000000..ecbaacd46bad
--- /dev/null
+++ b/src/pages/workspace/accounting/netsuite/advanced/NetSuiteVendorBillApprovalLevelSelectPage.tsx
@@ -0,0 +1,81 @@
+import React, {useCallback, useMemo} from 'react';
+import {View} from 'react-native';
+import type {ValueOf} from 'type-fest';
+import RadioListItem from '@components/SelectionList/RadioListItem';
+import type {ListItem} from '@components/SelectionList/types';
+import SelectionScreen from '@components/SelectionScreen';
+import type {SelectorType} from '@components/SelectionScreen';
+import Text from '@components/Text';
+import useLocalize from '@hooks/useLocalize';
+import useThemeStyles from '@hooks/useThemeStyles';
+import * as Connections from '@libs/actions/connections/NetSuiteCommands';
+import Navigation from '@navigation/Navigation';
+import type {WithPolicyConnectionsProps} from '@pages/workspace/withPolicyConnections';
+import withPolicyConnections from '@pages/workspace/withPolicyConnections';
+import CONST from '@src/CONST';
+import ROUTES from '@src/ROUTES';
+
+type MenuListItem = ListItem & {
+    value: ValueOf<typeof CONST.NETSUITE_VENDOR_BILLS_APPROVAL_LEVEL>;
+};
+
+function NetSuiteVendorBillApprovalLevelSelectPage({policy}: WithPolicyConnectionsProps) {
+    const {translate} = useLocalize();
+    const policyID = policy?.id ?? '-1';
+    const styles = useThemeStyles();
+    const config = policy?.connections?.netsuite.options.config;
+    const data: MenuListItem[] = Object.values(CONST.NETSUITE_VENDOR_BILLS_APPROVAL_LEVEL).map((approvalType) => ({
+        value: approvalType,
+        text: translate(`workspace.netsuite.advancedConfig.exportVendorBillsTo.values.${approvalType}`),
+        keyForList: approvalType,
+        isSelected: config?.syncOptions.exportVendorBillsTo === approvalType,
+    }));
+
+    const headerContent = useMemo(
+        () => (
+            <View>
+                <Text style={[styles.ph5, styles.pb5]}>{translate('workspace.netsuite.advancedConfig.exportVendorBillsTo.description')}</Text>
+            </View>
+        ),
+        [translate, styles.pb5, styles.ph5],
+    );
+
+    const selectVendorBillApprovalLevel = useCallback(
+        (row: MenuListItem) => {
+            if (row.value !== config?.syncOptions.exportVendorBillsTo) {
+                Connections.updateNetSuiteExportVendorBillsTo(
+                    policyID,
+                    row.value,
+                    config?.syncOptions.exportVendorBillsTo ?? CONST.NETSUITE_VENDOR_BILLS_APPROVAL_LEVEL.VENDOR_BILLS_APPROVED_NONE,
+                );
+            }
+            Navigation.goBack(ROUTES.POLICY_ACCOUNTING_NETSUITE_ADVANCED.getRoute(policyID));
+        },
+        [config?.syncOptions.exportVendorBillsTo, policyID],
+    );
+
+    return (
+        <SelectionScreen
+            displayName={NetSuiteVendorBillApprovalLevelSelectPage.displayName}
+            title="workspace.netsuite.advancedConfig.exportVendorBillsTo.label"
+            headerContent={headerContent}
+            sections={[{data}]}
+            listItem={RadioListItem}
+            onSelectRow={(selection: SelectorType) => selectVendorBillApprovalLevel(selection as MenuListItem)}
+            initiallyFocusedOptionKey={data.find((mode) => mode.isSelected)?.keyForList}
+            policyID={policyID}
+            accessVariants={[CONST.POLICY.ACCESS_VARIANTS.ADMIN]}
+            featureName={CONST.POLICY.MORE_FEATURES.ARE_CONNECTIONS_ENABLED}
+            onBackButtonPress={() => Navigation.goBack(ROUTES.POLICY_ACCOUNTING_NETSUITE_ADVANCED.getRoute(policyID))}
+            connectionName={CONST.POLICY.CONNECTIONS.NAME.NETSUITE}
+            shouldBeBlocked={
+                config?.reimbursableExpensesExportDestination !== CONST.NETSUITE_EXPORT_DESTINATION.VENDOR_BILL &&
+                config?.nonreimbursableExpensesExportDestination !== CONST.NETSUITE_EXPORT_DESTINATION.VENDOR_BILL
+            }
+        />
+    );
+}
+
+NetSuiteVendorBillApprovalLevelSelectPage.displayName = 'NetSuiteVendorBillApprovalLevelSelectPage';
+
+export default withPolicyConnections(NetSuiteVendorBillApprovalLevelSelectPage);
diff --git a/src/pages/workspace/accounting/netsuite/export/NetSuiteDateSelectPage.tsx b/src/pages/workspace/accounting/netsuite/export/NetSuiteDateSelectPage.tsx
new file mode 100644
index 000000000000..42d014ed4299
--- /dev/null
+++ b/src/pages/workspace/accounting/netsuite/export/NetSuiteDateSelectPage.tsx
@@ -0,0 +1,75 @@
+import React, {useCallback, useMemo} from 'react';
+import {View} from 'react-native';
+import type {ValueOf} from 'type-fest';
+import RadioListItem from '@components/SelectionList/RadioListItem';
+import type {ListItem} from '@components/SelectionList/types';
+import SelectionScreen from '@components/SelectionScreen';
+import type {SelectorType} from '@components/SelectionScreen';
+import Text from '@components/Text';
+import useLocalize from '@hooks/useLocalize';
+import useThemeStyles from '@hooks/useThemeStyles';
+import * as Connections from '@libs/actions/connections/NetSuiteCommands';
+import Navigation from '@navigation/Navigation';
+import type {WithPolicyConnectionsProps} from '@pages/workspace/withPolicyConnections';
+import withPolicyConnections from '@pages/workspace/withPolicyConnections';
+import CONST from '@src/CONST';
+import ROUTES from '@src/ROUTES';
+
+type MenuListItem = ListItem & {
+    value: ValueOf<typeof CONST.NETSUITE_EXPORT_DATE>;
+};
+
+function NetSuiteDateSelectPage({policy}: WithPolicyConnectionsProps) {
+    const {translate} = useLocalize();
+    const policyID = policy?.id ?? '-1';
+    const styles = useThemeStyles();
+    const config = policy?.connections?.netsuite.options.config;
+    const selectedValue = Object.values(CONST.NETSUITE_EXPORT_DATE).find((value) => value === config?.exportDate) ?? CONST.NETSUITE_EXPORT_DATE.LAST_EXPENSE;
+    const data: MenuListItem[] = Object.values(CONST.NETSUITE_EXPORT_DATE).map((dateType) => ({
+        value: dateType,
+        text: translate(`workspace.netsuite.exportDate.values.${dateType}.label`),
+        alternateText: translate(`workspace.netsuite.exportDate.values.${dateType}.description`),
+        keyForList: dateType,
+        isSelected: selectedValue === dateType,
+    }));
+
+    const headerContent = useMemo(
+        () => (
+            <View>
+                <Text style={[styles.ph5, styles.pb5]}>{translate('workspace.netsuite.exportDate.description')}</Text>
+            </View>
+        ),
+        [translate, styles.pb5, styles.ph5],
+    );
+
+    const selectExportDate = useCallback(
+        (row: MenuListItem) => {
+            if (row.value !== config?.exportDate) {
+                Connections.updateNetSuiteExportDate(policyID, row.value, config?.exportDate);
+            }
+            Navigation.goBack(ROUTES.POLICY_ACCOUNTING_NETSUITE_EXPORT.getRoute(policyID));
+        },
+        [config?.exportDate, policyID],
+    );
+
+    return (
+        <SelectionScreen
+            displayName={NetSuiteDateSelectPage.displayName}
+            title="workspace.netsuite.exportDate.label"
+            headerContent={headerContent}
+            sections={[{data}]}
+            listItem={RadioListItem}
+            onSelectRow={(selection: SelectorType) => selectExportDate(selection as MenuListItem)}
+            initiallyFocusedOptionKey={data.find((mode) => mode.isSelected)?.keyForList}
+            policyID={policyID}
+            accessVariants={[CONST.POLICY.ACCESS_VARIANTS.ADMIN]}
+            featureName={CONST.POLICY.MORE_FEATURES.ARE_CONNECTIONS_ENABLED}
+            onBackButtonPress={() => Navigation.goBack(ROUTES.POLICY_ACCOUNTING_NETSUITE_EXPORT.getRoute(policyID))}
+            connectionName={CONST.POLICY.CONNECTIONS.NAME.NETSUITE}
+        />
+    );
+}
+
+NetSuiteDateSelectPage.displayName = 'NetSuiteDateSelectPage';
+
+export default withPolicyConnections(NetSuiteDateSelectPage);
diff --git a/src/pages/workspace/accounting/netsuite/export/NetSuiteExportConfigurationPage.tsx b/src/pages/workspace/accounting/netsuite/export/NetSuiteExportConfigurationPage.tsx
new file mode 100644
index 000000000000..648ec7d77a64
--- /dev/null
+++ b/src/pages/workspace/accounting/netsuite/export/NetSuiteExportConfigurationPage.tsx
@@ -0,0 +1,252 @@
+import React, {useMemo} from 'react';
+import {View} from 'react-native';
+import ConnectionLayout from '@components/ConnectionLayout';
+import MenuItemWithTopDescription from '@components/MenuItemWithTopDescription';
+import OfflineWithFeedback from '@components/OfflineWithFeedback';
+import useLocalize from '@hooks/useLocalize';
+import usePermissions from '@hooks/usePermissions';
+import useThemeStyles from '@hooks/useThemeStyles';
+import * as Connections from '@libs/actions/connections/NetSuiteCommands';
+import * as ErrorUtils from '@libs/ErrorUtils';
+import Navigation from '@libs/Navigation/Navigation';
+import {
+    canUseProvincialTaxNetSuite,
+    canUseTaxNetSuite,
+    findSelectedBankAccountWithDefaultSelect,
+    findSelectedInvoiceItemWithDefaultSelect,
+    findSelectedTaxAccountWithDefaultSelect,
+} from '@libs/PolicyUtils';
+import type {DividerLineItem, MenuItem, ToggleItem} from '@pages/workspace/accounting/netsuite/types';
+import type {WithPolicyConnectionsProps} from '@pages/workspace/withPolicyConnections';
+import withPolicyConnections from '@pages/workspace/withPolicyConnections';
+import ToggleSettingOptionRow from '@pages/workspace/workflows/ToggleSettingsOptionRow';
+import * as Policy from '@userActions/Policy/Policy';
+import CONST from '@src/CONST';
+import ROUTES from '@src/ROUTES';
+
+function NetSuiteExportConfigurationPage({policy}: WithPolicyConnectionsProps) {
+    const {translate} = useLocalize();
+    const styles = useThemeStyles();
+    const policyID = policy?.id ?? '-1';
+    const policyOwner = policy?.owner ?? '';
+    const {canUseNetSuiteUSATax} = usePermissions();
+
+    const config = policy?.connections?.netsuite?.options.config;
+
+    const {subsidiaryList, receivableList, taxAccountsList, items} = policy?.connections?.netsuite?.options?.data ?? {};
+    const selectedSubsidiary = useMemo(() => (subsidiaryList ?? []).find((subsidiary) => subsidiary.internalID === config?.subsidiaryID), [subsidiaryList, config?.subsidiaryID]);
+
+    const selectedReceivable = useMemo(() => findSelectedBankAccountWithDefaultSelect(receivableList, config?.receivableAccount), [receivableList, config?.receivableAccount]);
+
+    const selectedItem = useMemo(() => findSelectedInvoiceItemWithDefaultSelect(items, config?.invoiceItem), [items, config?.invoiceItem]);
+
+    const invoiceItemValue = useMemo(() => {
+        if (!config?.invoiceItemPreference) {
+            return translate('workspace.netsuite.invoiceItem.values.create.label');
+        }
+        if (config.invoiceItemPreference === CONST.NETSUITE_INVOICE_ITEM_PREFERENCE.CREATE) {
+            return translate('workspace.netsuite.invoiceItem.values.create.label');
+        }
+        if (!selectedItem) {
+            return translate('workspace.netsuite.invoiceItem.values.select.label');
+        }
+        return selectedItem.name;
+    }, [config?.invoiceItemPreference, selectedItem, translate]);
+
+    const selectedTaxPostingAccount = useMemo(() => findSelectedTaxAccountWithDefaultSelect(taxAccountsList, config?.taxPostingAccount), [taxAccountsList, config?.taxPostingAccount]);
+
+    const selectedProvTaxPostingAccount = useMemo(
+        () => findSelectedTaxAccountWithDefaultSelect(taxAccountsList, config?.provincialTaxPostingAccount),
+        [taxAccountsList, config?.provincialTaxPostingAccount],
+    );
+
+    const menuItems: Array<MenuItem | ToggleItem | DividerLineItem> = [
+        {
+            type: 'menuitem',
+            description: translate('workspace.accounting.preferredExporter'),
+            onPress: () => {
+                Navigation.navigate(ROUTES.POLICY_ACCOUNTING_NETSUITE_PREFERRED_EXPORTER_SELECT.getRoute(policyID));
+            },
+            brickRoadIndicator: config?.errorFields?.exporter ? CONST.BRICK_ROAD_INDICATOR_STATUS.ERROR : undefined,
+            title: config?.exporter ?? policyOwner,
+            pendingAction: config?.pendingFields?.exporter,
+            errors: ErrorUtils.getLatestErrorField(config, CONST.NETSUITE_CONFIG.EXPORTER),
+            onCloseError: () => Policy.clearNetSuiteErrorField(policyID, CONST.NETSUITE_CONFIG.EXPORTER),
+        },
+        {
+            type: 'divider',
+            key: 'divider1',
+        },
+        {
+            type: 'menuitem',
+            description: translate('workspace.accounting.exportDate'),
+            onPress: () => Navigation.navigate(ROUTES.POLICY_ACCOUNTING_NETSUITE_DATE_SELECT.getRoute(policyID)),
+            brickRoadIndicator: config?.errorFields?.exportDate ? CONST.BRICK_ROAD_INDICATOR_STATUS.ERROR : undefined,
+            title: config?.exportDate
+                ? translate(`workspace.netsuite.exportDate.values.${config.exportDate}.label`)
+                : translate(`workspace.netsuite.exportDate.values.${CONST.NETSUITE_EXPORT_DATE.LAST_EXPENSE}.label`),
+            pendingAction: config?.pendingFields?.exportDate,
+            errors: ErrorUtils.getLatestErrorField(config, CONST.NETSUITE_CONFIG.EXPORT_DATE),
+            onCloseError: () => Policy.clearNetSuiteErrorField(policyID, CONST.NETSUITE_CONFIG.EXPORT_DATE),
+        },
+        {
+            type: 'menuitem',
+            description: translate('workspace.accounting.exportOutOfPocket'),
+            onPress: () => Navigation.navigate(ROUTES.POLICY_ACCOUNTING_NETSUITE_EXPORT_EXPENSES.getRoute(policyID, CONST.NETSUITE_EXPENSE_TYPE.REIMBURSABLE)),
+            brickRoadIndicator: config?.errorFields?.reimbursableExpensesExportDestination ? CONST.BRICK_ROAD_INDICATOR_STATUS.ERROR : undefined,
+            title: config?.reimbursableExpensesExportDestination ? translate(`workspace.netsuite.exportDestination.values.${config.reimbursableExpensesExportDestination}.label`) : undefined,
+            pendingAction: config?.pendingFields?.reimbursableExpensesExportDestination,
+            errors: ErrorUtils.getLatestErrorField(config, CONST.NETSUITE_CONFIG.REIMBURSABLE_EXPENSES_EXPORT_DESTINATION),
+            onCloseError: () => Policy.clearNetSuiteErrorField(policyID, CONST.NETSUITE_CONFIG.REIMBURSABLE_EXPENSES_EXPORT_DESTINATION),
+        },
+        {
+            type: 'menuitem',
+            description: translate('workspace.accounting.exportCompanyCard'),
+            onPress: () => Navigation.navigate(ROUTES.POLICY_ACCOUNTING_NETSUITE_EXPORT_EXPENSES.getRoute(policyID, CONST.NETSUITE_EXPENSE_TYPE.NON_REIMBURSABLE)),
+            brickRoadIndicator: config?.errorFields?.nonreimbursableExpensesExportDestination ? CONST.BRICK_ROAD_INDICATOR_STATUS.ERROR : undefined,
+            title: config?.nonreimbursableExpensesExportDestination
+                ? translate(`workspace.netsuite.exportDestination.values.${config.nonreimbursableExpensesExportDestination}.label`)
+                : undefined,
+            pendingAction: config?.pendingFields?.nonreimbursableExpensesExportDestination,
+            errors: ErrorUtils.getLatestErrorField(config, CONST.NETSUITE_CONFIG.NON_REIMBURSABLE_EXPENSES_EXPORT_DESTINATION),
+            onCloseError: () => Policy.clearNetSuiteErrorField(policyID, CONST.NETSUITE_CONFIG.NON_REIMBURSABLE_EXPENSES_EXPORT_DESTINATION),
+        },
+        {
+            type: 'divider',
+            key: 'divider2',
+        },
+        {
+            type: 'menuitem',
+            description: translate('workspace.netsuite.exportInvoices'),
+            onPress: () => Navigation.navigate(ROUTES.POLICY_ACCOUNTING_NETSUITE_RECEIVABLE_ACCOUNT_SELECT.getRoute(policyID)),
+            brickRoadIndicator: config?.errorFields?.receivableAccount ? CONST.BRICK_ROAD_INDICATOR_STATUS.ERROR : undefined,
+            title: selectedReceivable ? selectedReceivable.name : undefined,
+            pendingAction: config?.pendingFields?.receivableAccount,
+            errors: ErrorUtils.getLatestErrorField(config, CONST.NETSUITE_CONFIG.RECEIVABLE_ACCOUNT),
+            onCloseError: () => Policy.clearNetSuiteErrorField(policyID, CONST.NETSUITE_CONFIG.RECEIVABLE_ACCOUNT),
+        },
+        {
+            type: 'menuitem',
+            description: translate('workspace.netsuite.invoiceItem.label'),
+            onPress: () => Navigation.navigate(ROUTES.POLICY_ACCOUNTING_NETSUITE_INVOICE_ITEM_PREFERENCE_SELECT.getRoute(policyID)),
+            brickRoadIndicator: config?.errorFields?.invoiceItemPreference ? CONST.BRICK_ROAD_INDICATOR_STATUS.ERROR : undefined,
+            title: invoiceItemValue,
+            pendingAction: config?.pendingFields?.invoiceItemPreference,
+            errors: ErrorUtils.getLatestErrorField(config, CONST.NETSUITE_CONFIG.INVOICE_ITEM_PREFERENCE),
+            onCloseError: () => Policy.clearNetSuiteErrorField(policyID, CONST.NETSUITE_CONFIG.INVOICE_ITEM_PREFERENCE),
+        },
+        {
+            type: 'divider',
+            key: 'divider3',
+        },
+        {
+            type: 'menuitem',
+            description: translate('workspace.netsuite.journalEntriesProvTaxPostingAccount'),
+            onPress: () => Navigation.navigate(ROUTES.POLICY_ACCOUNTING_NETSUITE_PROVINCIAL_TAX_POSTING_ACCOUNT_SELECT.getRoute(policyID)),
+            brickRoadIndicator: config?.errorFields?.provincialTaxPostingAccount ? CONST.BRICK_ROAD_INDICATOR_STATUS.ERROR : undefined,
+            title: selectedProvTaxPostingAccount ? selectedProvTaxPostingAccount.name : undefined,
+            pendingAction: config?.pendingFields?.provincialTaxPostingAccount,
+            errors: ErrorUtils.getLatestErrorField(config, CONST.NETSUITE_CONFIG.PROVINCIAL_TAX_POSTING_ACCOUNT),
+            onCloseError: () => Policy.clearNetSuiteErrorField(policyID, CONST.NETSUITE_CONFIG.PROVINCIAL_TAX_POSTING_ACCOUNT),
+            shouldHide: !!config?.suiteTaxEnabled || !config?.syncOptions.syncTax || !canUseProvincialTaxNetSuite(selectedSubsidiary?.country),
+        },
+        {
+            type: 'menuitem',
+            description: translate('workspace.netsuite.journalEntriesTaxPostingAccount'),
+            onPress: () => Navigation.navigate(ROUTES.POLICY_ACCOUNTING_NETSUITE_TAX_POSTING_ACCOUNT_SELECT.getRoute(policyID)),
+            brickRoadIndicator: config?.errorFields?.taxPostingAccount ? CONST.BRICK_ROAD_INDICATOR_STATUS.ERROR : undefined,
+            title: selectedTaxPostingAccount ? selectedTaxPostingAccount.name : undefined,
+            pendingAction: config?.pendingFields?.taxPostingAccount,
+            errors: ErrorUtils.getLatestErrorField(config, CONST.NETSUITE_CONFIG.TAX_POSTING_ACCOUNT),
+            onCloseError: () => Policy.clearNetSuiteErrorField(policyID, CONST.NETSUITE_CONFIG.TAX_POSTING_ACCOUNT),
+            shouldHide: !!config?.suiteTaxEnabled || !config?.syncOptions.syncTax || !canUseTaxNetSuite(canUseNetSuiteUSATax, selectedSubsidiary?.country),
+        },
+        {
+            type: 'toggle',
+            title: translate('workspace.netsuite.foreignCurrencyAmount'),
+            isActive: !!config?.allowForeignCurrency,
+            switchAccessibilityLabel: translate('workspace.netsuite.foreignCurrencyAmount'),
+            onToggle: () => Connections.updateNetSuiteAllowForeignCurrency(policyID, !config?.allowForeignCurrency, config?.allowForeignCurrency),
+            onCloseError: () => Policy.clearNetSuiteErrorField(policyID, CONST.NETSUITE_CONFIG.ALLOW_FOREIGN_CURRENCY),
+            pendingAction: config?.pendingFields?.allowForeignCurrency,
+            errors: ErrorUtils.getLatestErrorField(config, CONST.NETSUITE_CONFIG.ALLOW_FOREIGN_CURRENCY),
+            shouldHide:
+                config?.reimbursableExpensesExportDestination !== CONST.NETSUITE_EXPORT_DESTINATION.EXPENSE_REPORT &&
+                config?.nonreimbursableExpensesExportDestination !== CONST.NETSUITE_EXPORT_DESTINATION.EXPENSE_REPORT,
+        },
+        {
+            type: 'toggle',
+            title: translate('workspace.netsuite.exportToNextOpenPeriod'),
+            isActive: !!config?.exportToNextOpenPeriod,
+            switchAccessibilityLabel: translate('workspace.netsuite.exportToNextOpenPeriod'),
+            onCloseError: () => Policy.clearNetSuiteErrorField(policyID, CONST.NETSUITE_CONFIG.EXPORT_TO_NEXT_OPEN_PERIOD),
+            onToggle: () => Connections.updateNetSuiteExportToNextOpenPeriod(policyID, !config?.exportToNextOpenPeriod, config?.exportToNextOpenPeriod ?? false),
+            pendingAction: config?.pendingFields?.exportToNextOpenPeriod,
+            errors: ErrorUtils.getLatestErrorField(config, CONST.NETSUITE_CONFIG.EXPORT_TO_NEXT_OPEN_PERIOD),
+        },
+    ];
+
+    return (
+        <ConnectionLayout
+            displayName={NetSuiteExportConfigurationPage.displayName}
+            headerTitle="workspace.accounting.export"
+            headerSubtitle={config?.subsidiary ?? ''}
+            title="workspace.netsuite.exportDescription"
+            accessVariants={[CONST.POLICY.ACCESS_VARIANTS.ADMIN]}
+            policyID={policyID}
+            featureName={CONST.POLICY.MORE_FEATURES.ARE_CONNECTIONS_ENABLED}
+            contentContainerStyle={styles.pb2}
+            titleStyle={styles.ph5}
+            connectionName={CONST.POLICY.CONNECTIONS.NAME.NETSUITE}
+        >
+            {menuItems
+                .filter((item) => !item.shouldHide)
+                .map((item) => {
+                    switch (item.type) {
+                        case 'divider':
+                            return (
+                                <View
+                                    key={item.key}
+                                    style={styles.dividerLine}
+                                />
+                            );
+                        case 'toggle':
+                            // eslint-disable-next-line no-case-declarations
+                            const {type, shouldHide, ...rest} = item;
+                            return (
+                                <ToggleSettingOptionRow
+                                    key={rest.title}
+                                    // eslint-disable-next-line react/jsx-props-no-spreading
+                                    {...rest}
+                                    wrapperStyle={[styles.mv3, styles.ph5]}
+                                />
+                            );
+                        default:
+                            return (
+                                <OfflineWithFeedback
+                                    key={item.description}
+                                    pendingAction={item.pendingAction}
+                                    errors={item.errors}
+                                    errorRowStyles={[styles.ph5]}
+                                    onClose={item.onCloseError}
+                                >
+                                    <MenuItemWithTopDescription
+                                        title={item.title}
+                                        description={item.description}
+                                        shouldShowRightIcon
+                                        onPress={item?.onPress}
+                                        brickRoadIndicator={item?.brickRoadIndicator}
+                                        helperText={item?.helperText}
+                                        errorText={item?.errorText}
+                                    />
+                                </OfflineWithFeedback>
+                            );
+                    }
+                })}
+        </ConnectionLayout>
+    );
+}
+
+NetSuiteExportConfigurationPage.displayName = 'NetSuiteExportConfigurationPage';
+
+export default withPolicyConnections(NetSuiteExportConfigurationPage);
diff --git a/src/pages/workspace/accounting/netsuite/export/NetSuiteExportExpensesDestinationSelectPage.tsx b/src/pages/workspace/accounting/netsuite/export/NetSuiteExportExpensesDestinationSelectPage.tsx
new file mode 100644
index 000000000000..535951a51f87
--- /dev/null
+++ b/src/pages/workspace/accounting/netsuite/export/NetSuiteExportExpensesDestinationSelectPage.tsx
@@ -0,0 +1,72 @@
+import {useRoute} from '@react-navigation/native';
+import React, {useCallback} from 'react';
+import type {ValueOf} from 'type-fest';
+import RadioListItem from '@components/SelectionList/RadioListItem';
+import type {ListItem} from '@components/SelectionList/types';
+import SelectionScreen from '@components/SelectionScreen';
+import type {SelectorType} from '@components/SelectionScreen';
+import useLocalize from '@hooks/useLocalize';
+import * as Connections from '@libs/actions/connections/NetSuiteCommands';
+import Navigation from '@navigation/Navigation';
+import type {ExpenseRouteParams} from '@pages/workspace/accounting/netsuite/types';
+import type {WithPolicyConnectionsProps} from '@pages/workspace/withPolicyConnections';
+import withPolicyConnections from '@pages/workspace/withPolicyConnections';
+import CONST from '@src/CONST';
+import ROUTES from '@src/ROUTES';
+
+type MenuListItem = ListItem & {
+    value: ValueOf<typeof CONST.NETSUITE_EXPORT_DESTINATION>;
+};
+
+function NetSuiteExportExpensesDestinationSelectPage({policy}: WithPolicyConnectionsProps) {
+    const {translate} = useLocalize();
+    const policyID = policy?.id ?? '-1';
+    const config = policy?.connections?.netsuite.options.config;
+
+    const route = useRoute();
+    const params = route.params as ExpenseRouteParams;
+    const isReimbursable = params.expenseType === CONST.NETSUITE_EXPENSE_TYPE.REIMBURSABLE;
+
+    const currentDestination = isReimbursable ? config?.reimbursableExpensesExportDestination : config?.nonreimbursableExpensesExportDestination;
+
+    const data: MenuListItem[] = Object.values(CONST.NETSUITE_EXPORT_DESTINATION).map((dateType) => ({
+        value: dateType,
+        text: translate(`workspace.netsuite.exportDestination.values.${dateType}.label`),
+        keyForList: dateType,
+        isSelected: currentDestination === dateType,
+    }));
+
+    const selectDestination = useCallback(
+        (row: MenuListItem) => {
+            if (row.value !== currentDestination) {
+                if (isReimbursable) {
+                    Connections.updateNetSuiteReimbursableExpensesExportDestination(policyID, row.value, currentDestination ?? CONST.NETSUITE_EXPORT_DESTINATION.EXPENSE_REPORT);
+                } else {
+                    Connections.updateNetSuiteNonReimbursableExpensesExportDestination(policyID, row.value, currentDestination ?? CONST.NETSUITE_EXPORT_DESTINATION.VENDOR_BILL);
+                }
+            }
+            Navigation.goBack(ROUTES.POLICY_ACCOUNTING_NETSUITE_EXPORT_EXPENSES.getRoute(policyID, params.expenseType));
+        },
+        [currentDestination, isReimbursable, params.expenseType, policyID],
+    );
+
+    return (
+        <SelectionScreen
+            displayName={NetSuiteExportExpensesDestinationSelectPage.displayName}
+            title="workspace.accounting.exportAs"
+            sections={[{data}]}
+            listItem={RadioListItem}
+            onSelectRow={(selection: SelectorType) => selectDestination(selection as MenuListItem)}
+            initiallyFocusedOptionKey={data.find((mode) => mode.isSelected)?.keyForList}
+            policyID={policyID}
+            accessVariants={[CONST.POLICY.ACCESS_VARIANTS.ADMIN]}
+            featureName={CONST.POLICY.MORE_FEATURES.ARE_CONNECTIONS_ENABLED}
+            onBackButtonPress={() => Navigation.goBack(ROUTES.POLICY_ACCOUNTING_NETSUITE_EXPORT_EXPENSES.getRoute(policyID, params.expenseType))}
+            connectionName={CONST.POLICY.CONNECTIONS.NAME.NETSUITE}
+        />
+    );
+}
+
+NetSuiteExportExpensesDestinationSelectPage.displayName = 'NetSuiteExportExpensesDestinationSelectPage';
+
+export default withPolicyConnections(NetSuiteExportExpensesDestinationSelectPage);
diff --git a/src/pages/workspace/accounting/netsuite/export/NetSuiteExportExpensesJournalPostingPreferenceSelectPage.tsx b/src/pages/workspace/accounting/netsuite/export/NetSuiteExportExpensesJournalPostingPreferenceSelectPage.tsx
new file mode 100644
index 000000000000..544cd0cc20cd
--- /dev/null
+++ b/src/pages/workspace/accounting/netsuite/export/NetSuiteExportExpensesJournalPostingPreferenceSelectPage.tsx
@@ -0,0 +1,75 @@
+import {useRoute} from '@react-navigation/native';
+import React, {useCallback} from 'react';
+import type {ValueOf} from 'type-fest';
+import RadioListItem from '@components/SelectionList/RadioListItem';
+import type {ListItem} from '@components/SelectionList/types';
+import SelectionScreen from '@components/SelectionScreen';
+import type {SelectorType} from '@components/SelectionScreen';
+import useLocalize from '@hooks/useLocalize';
+import * as Connections from '@libs/actions/connections/NetSuiteCommands';
+import Navigation from '@navigation/Navigation';
+import type {ExpenseRouteParams} from '@pages/workspace/accounting/netsuite/types';
+import type {WithPolicyConnectionsProps} from '@pages/workspace/withPolicyConnections';
+import withPolicyConnections from '@pages/workspace/withPolicyConnections';
+import CONST from '@src/CONST';
+import ROUTES from '@src/ROUTES';
+
+type MenuListItem = ListItem & {
+    value: ValueOf<typeof CONST.NETSUITE_JOURNAL_POSTING_PREFERENCE>;
+};
+
+function NetSuiteExportExpensesJournalPostingPreferenceSelectPage({policy}: WithPolicyConnectionsProps) {
+    const {translate} = useLocalize();
+    const policyID = policy?.id ?? '-1';
+    const config = policy?.connections?.netsuite.options.config;
+
+    const route = useRoute();
+    const params = route.params as ExpenseRouteParams;
+    const isReimbursable = params.expenseType === CONST.NETSUITE_EXPENSE_TYPE.REIMBURSABLE;
+
+    const selectedValue =
+        Object.values(CONST.NETSUITE_JOURNAL_POSTING_PREFERENCE).find((value) => value === config?.journalPostingPreference) ??
+        CONST.NETSUITE_JOURNAL_POSTING_PREFERENCE.JOURNALS_POSTING_INDIVIDUAL_LINE;
+
+    const data: MenuListItem[] = Object.values(CONST.NETSUITE_JOURNAL_POSTING_PREFERENCE).map((postingPreference) => ({
+        value: postingPreference,
+        text: translate(`workspace.netsuite.journalPostingPreference.values.${postingPreference}`),
+        keyForList: postingPreference,
+        isSelected: selectedValue === postingPreference,
+    }));
+
+    const selectPostingPreference = useCallback(
+        (row: MenuListItem) => {
+            if (row.value !== config?.journalPostingPreference) {
+                Connections.updateNetSuiteJournalPostingPreference(policyID, row.value, config?.journalPostingPreference);
+            }
+            Navigation.goBack(ROUTES.POLICY_ACCOUNTING_NETSUITE_EXPORT_EXPENSES.getRoute(policyID, params.expenseType));
+        },
+        [config?.journalPostingPreference, params.expenseType, policyID],
+    );
+
+    return (
+        <SelectionScreen
+            displayName={NetSuiteExportExpensesJournalPostingPreferenceSelectPage.displayName}
+            title="workspace.netsuite.journalPostingPreference.label"
+            sections={[{data}]}
+            listItem={RadioListItem}
+            onSelectRow={(selection: SelectorType) => selectPostingPreference(selection as MenuListItem)}
+            initiallyFocusedOptionKey={data.find((mode) => mode.isSelected)?.keyForList}
+            policyID={policyID}
+            accessVariants={[CONST.POLICY.ACCESS_VARIANTS.ADMIN]}
+            featureName={CONST.POLICY.MORE_FEATURES.ARE_CONNECTIONS_ENABLED}
+            onBackButtonPress={() => Navigation.goBack(ROUTES.POLICY_ACCOUNTING_NETSUITE_EXPORT_EXPENSES.getRoute(policyID, params.expenseType))}
+            connectionName={CONST.POLICY.CONNECTIONS.NAME.NETSUITE}
+            shouldBeBlocked={
+                isReimbursable
+                    ? config?.reimbursableExpensesExportDestination !== CONST.NETSUITE_EXPORT_DESTINATION.JOURNAL_ENTRY
+                    : config?.nonreimbursableExpensesExportDestination !== CONST.NETSUITE_EXPORT_DESTINATION.JOURNAL_ENTRY
+            }
+        />
+    );
+}
+
+NetSuiteExportExpensesJournalPostingPreferenceSelectPage.displayName = 'NetSuiteExportExpensesJournalPostingPreferenceSelectPage';
+
+export default withPolicyConnections(NetSuiteExportExpensesJournalPostingPreferenceSelectPage);
diff --git a/src/pages/workspace/accounting/netsuite/export/NetSuiteExportExpensesPage.tsx b/src/pages/workspace/accounting/netsuite/export/NetSuiteExportExpensesPage.tsx
new file mode 100644
index 000000000000..c3ffe000e1e5
--- /dev/null
+++ b/src/pages/workspace/accounting/netsuite/export/NetSuiteExportExpensesPage.tsx
@@ -0,0 +1,143 @@
+import {useRoute} from '@react-navigation/native';
+import React, {useMemo} from 'react';
+import ConnectionLayout from '@components/ConnectionLayout';
+import MenuItemWithTopDescription from '@components/MenuItemWithTopDescription';
+import OfflineWithFeedback from '@components/OfflineWithFeedback';
+import useLocalize from '@hooks/useLocalize';
+import useThemeStyles from '@hooks/useThemeStyles';
+import * as ErrorUtils from '@libs/ErrorUtils';
+import Navigation from '@libs/Navigation/Navigation';
+import {findSelectedBankAccountWithDefaultSelect, findSelectedVendorWithDefaultSelect} from '@libs/PolicyUtils';
+import type {ExpenseRouteParams, MenuItem} from '@pages/workspace/accounting/netsuite/types';
+import type {WithPolicyConnectionsProps} from '@pages/workspace/withPolicyConnections';
+import withPolicyConnections from '@pages/workspace/withPolicyConnections';
+import * as Policy from '@userActions/Policy/Policy';
+import CONST from '@src/CONST';
+import ROUTES from '@src/ROUTES';
+
+type MenuItemWithoutType = Omit<MenuItem, 'type'>;
+
+function NetSuiteExportExpensesPage({policy}: WithPolicyConnectionsProps) {
+    const {translate} = useLocalize();
+    const styles = useThemeStyles();
+    const policyID = policy?.id ?? '-1';
+    const route = useRoute();
+    const params = route.params as ExpenseRouteParams;
+    const isReimbursable = params.expenseType === CONST.NETSUITE_EXPENSE_TYPE.REIMBURSABLE;
+
+    const config = policy?.connections?.netsuite?.options.config;
+
+    const exportDestination = isReimbursable ? config?.reimbursableExpensesExportDestination : config?.nonreimbursableExpensesExportDestination;
+    const exportDestinationError = isReimbursable ? config?.errorFields?.reimbursableExpensesExportDestination : config?.errorFields?.nonreimbursableExpensesExportDestination;
+    const exportDestinationPending = isReimbursable ? config?.pendingFields?.reimbursableExpensesExportDestination : config?.pendingFields?.nonreimbursableExpensesExportDestination;
+    const helperTextType = isReimbursable ? 'reimbursableDescription' : 'nonReimbursableDescription';
+    const configType = isReimbursable ? CONST.NETSUITE_CONFIG.REIMBURSABLE_EXPENSES_EXPORT_DESTINATION : CONST.NETSUITE_CONFIG.NON_REIMBURSABLE_EXPENSES_EXPORT_DESTINATION;
+
+    const {vendors, payableList} = policy?.connections?.netsuite?.options?.data ?? {};
+
+    const defaultVendor = useMemo(() => findSelectedVendorWithDefaultSelect(vendors, config?.defaultVendor), [vendors, config?.defaultVendor]);
+
+    const selectedPayableAccount = useMemo(() => findSelectedBankAccountWithDefaultSelect(payableList, config?.payableAcct), [payableList, config?.payableAcct]);
+
+    const selectedReimbursablePayableAccount = useMemo(
+        () => findSelectedBankAccountWithDefaultSelect(payableList, config?.reimbursablePayableAccount),
+        [payableList, config?.reimbursablePayableAccount],
+    );
+
+    const menuItems: MenuItemWithoutType[] = [
+        {
+            description: translate('workspace.accounting.exportAs'),
+            onPress: () => Navigation.navigate(ROUTES.POLICY_ACCOUNTING_NETSUITE_EXPORT_EXPENSES_DESTINATION_SELECT.getRoute(policyID, params.expenseType)),
+            brickRoadIndicator: exportDestinationError ? CONST.BRICK_ROAD_INDICATOR_STATUS.ERROR : undefined,
+            title: exportDestination ? translate(`workspace.netsuite.exportDestination.values.${exportDestination}.label`) : undefined,
+            pendingAction: exportDestinationPending,
+            errors: ErrorUtils.getLatestErrorField(config, configType),
+            onCloseError: () => Policy.clearNetSuiteErrorField(policyID, configType),
+            helperText: exportDestination ? translate(`workspace.netsuite.exportDestination.values.${exportDestination}.${helperTextType}`) : undefined,
+            shouldParseHelperText: true,
+        },
+        {
+            description: translate('workspace.accounting.defaultVendor'),
+            onPress: () => Navigation.navigate(ROUTES.POLICY_ACCOUNTING_NETSUITE_EXPORT_EXPENSES_VENDOR_SELECT.getRoute(policyID, params.expenseType)),
+            brickRoadIndicator: config?.errorFields?.defaultVendor ? CONST.BRICK_ROAD_INDICATOR_STATUS.ERROR : undefined,
+            title: defaultVendor ? defaultVendor.name : undefined,
+            pendingAction: config?.pendingFields?.defaultVendor,
+            errors: ErrorUtils.getLatestErrorField(config, CONST.NETSUITE_CONFIG.DEFAULT_VENDOR),
+            onCloseError: () => Policy.clearNetSuiteErrorField(policyID, CONST.NETSUITE_CONFIG.DEFAULT_VENDOR),
+            shouldHide: isReimbursable || exportDestination !== CONST.NETSUITE_EXPORT_DESTINATION.VENDOR_BILL,
+        },
+        {
+            description: translate('workspace.netsuite.nonReimbursableJournalPostingAccount'),
+            onPress: () => Navigation.navigate(ROUTES.POLICY_ACCOUNTING_NETSUITE_EXPORT_EXPENSES_PAYABLE_ACCOUNT_SELECT.getRoute(policyID, params.expenseType)),
+            brickRoadIndicator: config?.errorFields?.payableAcct ? CONST.BRICK_ROAD_INDICATOR_STATUS.ERROR : undefined,
+            title: selectedPayableAccount ? selectedPayableAccount.name : undefined,
+            pendingAction: config?.pendingFields?.payableAcct,
+            errors: ErrorUtils.getLatestErrorField(config, CONST.NETSUITE_CONFIG.PAYABLE_ACCT),
+            onCloseError: () => Policy.clearNetSuiteErrorField(policyID, CONST.NETSUITE_CONFIG.PAYABLE_ACCT),
+            shouldHide: isReimbursable || exportDestination !== CONST.NETSUITE_EXPORT_DESTINATION.JOURNAL_ENTRY,
+        },
+        {
+            description: translate('workspace.netsuite.reimbursableJournalPostingAccount'),
+            onPress: () => Navigation.navigate(ROUTES.POLICY_ACCOUNTING_NETSUITE_EXPORT_EXPENSES_PAYABLE_ACCOUNT_SELECT.getRoute(policyID, params.expenseType)),
+            brickRoadIndicator: config?.errorFields?.reimbursablePayableAccount ? CONST.BRICK_ROAD_INDICATOR_STATUS.ERROR : undefined,
+            title: selectedReimbursablePayableAccount ? selectedReimbursablePayableAccount.name : undefined,
+            pendingAction: config?.pendingFields?.reimbursablePayableAccount,
+            errors: ErrorUtils.getLatestErrorField(config, CONST.NETSUITE_CONFIG.REIMBURSABLE_PAYABLE_ACCOUNT),
+            onCloseError: () => Policy.clearNetSuiteErrorField(policyID, CONST.NETSUITE_CONFIG.REIMBURSABLE_PAYABLE_ACCOUNT),
+            shouldHide: !isReimbursable || exportDestination !== CONST.NETSUITE_EXPORT_DESTINATION.JOURNAL_ENTRY,
+        },
+        {
+            description: translate('workspace.netsuite.journalPostingPreference.label'),
+            onPress: () => Navigation.navigate(ROUTES.POLICY_ACCOUNTING_NETSUITE_EXPORT_EXPENSES_JOURNAL_POSTING_PREFERENCE_SELECT.getRoute(policyID, params.expenseType)),
+            brickRoadIndicator: config?.errorFields?.journalPostingPreference ? CONST.BRICK_ROAD_INDICATOR_STATUS.ERROR : undefined,
+            title: config?.journalPostingPreference
+                ? translate(`workspace.netsuite.journalPostingPreference.values.${config.journalPostingPreference}`)
+                : translate(`workspace.netsuite.journalPostingPreference.values.${CONST.NETSUITE_JOURNAL_POSTING_PREFERENCE.JOURNALS_POSTING_INDIVIDUAL_LINE}`),
+            pendingAction: config?.pendingFields?.journalPostingPreference,
+            errors: ErrorUtils.getLatestErrorField(config, CONST.NETSUITE_CONFIG.JOURNAL_POSTING_PREFERENCE),
+            onCloseError: () => Policy.clearNetSuiteErrorField(policyID, CONST.NETSUITE_CONFIG.JOURNAL_POSTING_PREFERENCE),
+            shouldHide: exportDestination !== CONST.NETSUITE_EXPORT_DESTINATION.JOURNAL_ENTRY,
+        },
+    ];
+
+    return (
+        <ConnectionLayout
+            displayName={NetSuiteExportExpensesPage.displayName}
+            onBackButtonPress={() => Navigation.goBack(ROUTES.POLICY_ACCOUNTING_NETSUITE_EXPORT.getRoute(policyID))}
+            headerTitle={`workspace.accounting.${isReimbursable ? 'exportOutOfPocket' : 'exportCompanyCard'}`}
+            accessVariants={[CONST.POLICY.ACCESS_VARIANTS.ADMIN, CONST.POLICY.ACCESS_VARIANTS.CONTROL]}
+            policyID={policyID}
+            featureName={CONST.POLICY.MORE_FEATURES.ARE_CONNECTIONS_ENABLED}
+            contentContainerStyle={styles.pb2}
+            titleStyle={styles.ph5}
+            connectionName={CONST.POLICY.CONNECTIONS.NAME.NETSUITE}
+        >
+            {menuItems
+                .filter((item) => !item.shouldHide)
+                .map((item) => (
+                    <OfflineWithFeedback
+                        key={item.description}
+                        pendingAction={item.pendingAction}
+                        errors={item.errors}
+                        onClose={item.onCloseError}
+                        errorRowStyles={[styles.ph5]}
+                    >
+                        <MenuItemWithTopDescription
+                            title={item.title}
+                            description={item.description}
+                            shouldShowRightIcon
+                            onPress={item?.onPress}
+                            brickRoadIndicator={item?.brickRoadIndicator}
+                            helperText={item?.helperText}
+                            errorText={item?.errorText}
+                            shouldParseHelperText={item.shouldParseHelperText ?? false}
+                        />
+                    </OfflineWithFeedback>
+                ))}
+        </ConnectionLayout>
+    );
+}
+
+NetSuiteExportExpensesPage.displayName = 'NetSuiteExportExpensesPage';
+
+export default withPolicyConnections(NetSuiteExportExpensesPage);
diff --git a/src/pages/workspace/accounting/netsuite/export/NetSuiteExportExpensesPayableAccountSelectPage.tsx b/src/pages/workspace/accounting/netsuite/export/NetSuiteExportExpensesPayableAccountSelectPage.tsx
new file mode 100644
index 000000000000..0461171920d4
--- /dev/null
+++ b/src/pages/workspace/accounting/netsuite/export/NetSuiteExportExpensesPayableAccountSelectPage.tsx
@@ -0,0 +1,89 @@
+import {useRoute} from '@react-navigation/native';
+import React, {useCallback, useMemo} from 'react';
+import BlockingView from '@components/BlockingViews/BlockingView';
+import * as Illustrations from '@components/Icon/Illustrations';
+import RadioListItem from '@components/SelectionList/RadioListItem';
+import type {SelectorType} from '@components/SelectionScreen';
+import SelectionScreen from '@components/SelectionScreen';
+import useLocalize from '@hooks/useLocalize';
+import useThemeStyles from '@hooks/useThemeStyles';
+import * as Connections from '@libs/actions/connections/NetSuiteCommands';
+import Navigation from '@libs/Navigation/Navigation';
+import {getNetSuitePayableAccountOptions} from '@libs/PolicyUtils';
+import type {ExpenseRouteParams} from '@pages/workspace/accounting/netsuite/types';
+import type {WithPolicyConnectionsProps} from '@pages/workspace/withPolicyConnections';
+import withPolicyConnections from '@pages/workspace/withPolicyConnections';
+import variables from '@styles/variables';
+import CONST from '@src/CONST';
+import ROUTES from '@src/ROUTES';
+
+function NetSuiteExportExpensesPayableAccountSelectPage({policy}: WithPolicyConnectionsProps) {
+    const styles = useThemeStyles();
+    const {translate} = useLocalize();
+
+    const policyID = policy?.id ?? '-1';
+
+    const route = useRoute();
+    const params = route.params as ExpenseRouteParams;
+    const isReimbursable = params.expenseType === CONST.NETSUITE_EXPENSE_TYPE.REIMBURSABLE;
+
+    const config = policy?.connections?.netsuite.options.config;
+    const currentPayableAccountID = isReimbursable ? config?.reimbursablePayableAccount : config?.payableAcct;
+    const netsuitePayableAccountOptions = useMemo<SelectorType[]>(() => getNetSuitePayableAccountOptions(policy ?? undefined, currentPayableAccountID), [currentPayableAccountID, policy]);
+
+    const initiallyFocusedOptionKey = useMemo(() => netsuitePayableAccountOptions?.find((mode) => mode.isSelected)?.keyForList, [netsuitePayableAccountOptions]);
+
+    const updatePayableAccount = useCallback(
+        ({value}: SelectorType) => {
+            if (currentPayableAccountID !== value) {
+                if (isReimbursable) {
+                    Connections.updateNetSuiteReimbursablePayableAccount(policyID, value, currentPayableAccountID ?? '');
+                } else {
+                    Connections.updateNetSuitePayableAcct(policyID, value, currentPayableAccountID ?? '');
+                }
+            }
+            Navigation.goBack(ROUTES.POLICY_ACCOUNTING_NETSUITE_EXPORT_EXPENSES.getRoute(policyID, params.expenseType));
+        },
+        [currentPayableAccountID, policyID, params.expenseType, isReimbursable],
+    );
+
+    const listEmptyContent = useMemo(
+        () => (
+            <BlockingView
+                icon={Illustrations.TeleScope}
+                iconWidth={variables.emptyListIconWidth}
+                iconHeight={variables.emptyListIconHeight}
+                title={translate('workspace.netsuite.noAccountsFound')}
+                subtitle={translate('workspace.netsuite.noAccountsFoundDescription')}
+                containerStyle={styles.pb10}
+            />
+        ),
+        [translate, styles.pb10],
+    );
+
+    return (
+        <SelectionScreen
+            policyID={policyID}
+            accessVariants={[CONST.POLICY.ACCESS_VARIANTS.ADMIN, CONST.POLICY.ACCESS_VARIANTS.CONTROL]}
+            featureName={CONST.POLICY.MORE_FEATURES.ARE_CONNECTIONS_ENABLED}
+            displayName={NetSuiteExportExpensesPayableAccountSelectPage.displayName}
+            sections={netsuitePayableAccountOptions.length ? [{data: netsuitePayableAccountOptions}] : []}
+            listItem={RadioListItem}
+            onSelectRow={updatePayableAccount}
+            initiallyFocusedOptionKey={initiallyFocusedOptionKey}
+            onBackButtonPress={() => Navigation.goBack(ROUTES.POLICY_ACCOUNTING_NETSUITE_EXPORT_EXPENSES.getRoute(policyID, params.expenseType))}
+            title={isReimbursable ? 'workspace.netsuite.reimbursableJournalPostingAccount' : 'workspace.netsuite.nonReimbursableJournalPostingAccount'}
+            listEmptyContent={listEmptyContent}
+            connectionName={CONST.POLICY.CONNECTIONS.NAME.NETSUITE}
+            shouldBeBlocked={
+                isReimbursable
+                    ? config?.reimbursableExpensesExportDestination !== CONST.NETSUITE_EXPORT_DESTINATION.JOURNAL_ENTRY
+                    : config?.nonreimbursableExpensesExportDestination !== CONST.NETSUITE_EXPORT_DESTINATION.JOURNAL_ENTRY
+            }
+        />
+    );
+}
+
+NetSuiteExportExpensesPayableAccountSelectPage.displayName = 'NetSuiteExportExpensesPayableAccountSelectPage';
+
+export default withPolicyConnections(NetSuiteExportExpensesPayableAccountSelectPage);
diff --git a/src/pages/workspace/accounting/netsuite/export/NetSuiteExportExpensesVendorSelectPage.tsx b/src/pages/workspace/accounting/netsuite/export/NetSuiteExportExpensesVendorSelectPage.tsx
new file mode 100644
index 000000000000..b6034a29a949
--- /dev/null
+++ b/src/pages/workspace/accounting/netsuite/export/NetSuiteExportExpensesVendorSelectPage.tsx
@@ -0,0 +1,80 @@
+import {useRoute} from '@react-navigation/native';
+import React, {useCallback, useMemo} from 'react';
+import BlockingView from '@components/BlockingViews/BlockingView';
+import * as Illustrations from '@components/Icon/Illustrations';
+import RadioListItem from '@components/SelectionList/RadioListItem';
+import type {SelectorType} from '@components/SelectionScreen';
+import SelectionScreen from '@components/SelectionScreen';
+import useLocalize from '@hooks/useLocalize';
+import useThemeStyles from '@hooks/useThemeStyles';
+import * as Connections from '@libs/actions/connections/NetSuiteCommands';
+import Navigation from '@libs/Navigation/Navigation';
+import {getNetSuiteVendorOptions} from '@libs/PolicyUtils';
+import type {ExpenseRouteParams} from '@pages/workspace/accounting/netsuite/types';
+import type {WithPolicyConnectionsProps} from '@pages/workspace/withPolicyConnections';
+import withPolicyConnections from '@pages/workspace/withPolicyConnections';
+import variables from '@styles/variables';
+import CONST from '@src/CONST';
+import ROUTES from '@src/ROUTES';
+
+function NetSuiteExportExpensesVendorSelectPage({policy}: WithPolicyConnectionsProps) {
+    const styles = useThemeStyles();
+    const {translate} = useLocalize();
+
+    const policyID = policy?.id ?? '-1';
+
+    const route = useRoute();
+    const params = route.params as ExpenseRouteParams;
+    const isReimbursable = params.expenseType === CONST.NETSUITE_EXPENSE_TYPE.REIMBURSABLE;
+
+    const config = policy?.connections?.netsuite.options.config;
+    const netsuiteVendorOptions = useMemo<SelectorType[]>(() => getNetSuiteVendorOptions(policy ?? undefined, config?.defaultVendor), [config?.defaultVendor, policy]);
+
+    const initiallyFocusedOptionKey = useMemo(() => netsuiteVendorOptions?.find((mode) => mode.isSelected)?.keyForList, [netsuiteVendorOptions]);
+
+    const updateDefaultVendor = useCallback(
+        ({value}: SelectorType) => {
+            if (config?.defaultVendor !== value) {
+                Connections.updateNetSuiteDefaultVendor(policyID, value, config?.defaultVendor);
+            }
+            Navigation.goBack(ROUTES.POLICY_ACCOUNTING_NETSUITE_EXPORT_EXPENSES.getRoute(policyID, params.expenseType));
+        },
+        [config?.defaultVendor, policyID, params.expenseType],
+    );
+
+    const listEmptyContent = useMemo(
+        () => (
+            <BlockingView
+                icon={Illustrations.TeleScope}
+                iconWidth={variables.emptyListIconWidth}
+                iconHeight={variables.emptyListIconHeight}
+                title={translate('workspace.netsuite.noVendorsFound')}
+                subtitle={translate('workspace.netsuite.noVendorsFoundDescription')}
+                containerStyle={styles.pb10}
+            />
+        ),
+        [translate, styles.pb10],
+    );
+
+    return (
+        <SelectionScreen
+            policyID={policyID}
+            accessVariants={[CONST.POLICY.ACCESS_VARIANTS.ADMIN, CONST.POLICY.ACCESS_VARIANTS.CONTROL]}
+            featureName={CONST.POLICY.MORE_FEATURES.ARE_CONNECTIONS_ENABLED}
+            displayName={NetSuiteExportExpensesVendorSelectPage.displayName}
+            sections={netsuiteVendorOptions.length ? [{data: netsuiteVendorOptions}] : []}
+            listItem={RadioListItem}
+            onSelectRow={updateDefaultVendor}
+            initiallyFocusedOptionKey={initiallyFocusedOptionKey}
+            onBackButtonPress={() => Navigation.goBack(ROUTES.POLICY_ACCOUNTING_NETSUITE_EXPORT_EXPENSES.getRoute(policyID, params.expenseType))}
+            title="workspace.accounting.defaultVendor"
+            listEmptyContent={listEmptyContent}
+            connectionName={CONST.POLICY.CONNECTIONS.NAME.NETSUITE}
+            shouldBeBlocked={isReimbursable || config?.nonreimbursableExpensesExportDestination !== CONST.NETSUITE_EXPORT_DESTINATION.VENDOR_BILL}
+        />
+    );
+}
+
+NetSuiteExportExpensesVendorSelectPage.displayName = 'NetSuiteExportExpensesVendorSelectPage';
+
+export default withPolicyConnections(NetSuiteExportExpensesVendorSelectPage);
diff --git a/src/pages/workspace/accounting/netsuite/export/NetSuiteInvoiceItemPreferenceSelectPage.tsx b/src/pages/workspace/accounting/netsuite/export/NetSuiteInvoiceItemPreferenceSelectPage.tsx
new file mode 100644
index 000000000000..73a452c81745
--- /dev/null
+++ b/src/pages/workspace/accounting/netsuite/export/NetSuiteInvoiceItemPreferenceSelectPage.tsx
@@ -0,0 +1,109 @@
+import React, {useCallback, useMemo} from 'react';
+import {View} from 'react-native';
+import type {ValueOf} from 'type-fest';
+import MenuItemWithTopDescription from '@components/MenuItemWithTopDescription';
+import OfflineWithFeedback from '@components/OfflineWithFeedback';
+import RadioListItem from '@components/SelectionList/RadioListItem';
+import type {ListItem} from '@components/SelectionList/types';
+import SelectionScreen from '@components/SelectionScreen';
+import type {SelectorType} from '@components/SelectionScreen';
+import Text from '@components/Text';
+import useLocalize from '@hooks/useLocalize';
+import useThemeStyles from '@hooks/useThemeStyles';
+import * as Connections from '@libs/actions/connections/NetSuiteCommands';
+import * as ErrorUtils from '@libs/ErrorUtils';
+import {findSelectedInvoiceItemWithDefaultSelect} from '@libs/PolicyUtils';
+import Navigation from '@navigation/Navigation';
+import type {WithPolicyConnectionsProps} from '@pages/workspace/withPolicyConnections';
+import withPolicyConnections from '@pages/workspace/withPolicyConnections';
+import * as Policy from '@userActions/Policy/Policy';
+import CONST from '@src/CONST';
+import ROUTES from '@src/ROUTES';
+
+type MenuListItem = ListItem & {
+    value: ValueOf<typeof CONST.NETSUITE_INVOICE_ITEM_PREFERENCE>;
+};
+
+function NetSuiteInvoiceItemPreferenceSelectPage({policy}: WithPolicyConnectionsProps) {
+    const {translate} = useLocalize();
+    const styles = useThemeStyles();
+    const policyID = policy?.id ?? '-1';
+    const config = policy?.connections?.netsuite.options.config;
+
+    const {items} = policy?.connections?.netsuite.options.data ?? {};
+    const selectedItem = useMemo(() => findSelectedInvoiceItemWithDefaultSelect(items, config?.invoiceItem), [items, config?.invoiceItem]);
+
+    const selectedValue = Object.values(CONST.NETSUITE_INVOICE_ITEM_PREFERENCE).find((value) => value === config?.invoiceItemPreference) ?? CONST.NETSUITE_INVOICE_ITEM_PREFERENCE.CREATE;
+
+    const data: MenuListItem[] = Object.values(CONST.NETSUITE_INVOICE_ITEM_PREFERENCE).map((postingPreference) => ({
+        value: postingPreference,
+        text: translate(`workspace.netsuite.invoiceItem.values.${postingPreference}.label`),
+        keyForList: postingPreference,
+        isSelected: selectedValue === postingPreference,
+    }));
+
+    const selectInvoicePreference = useCallback(
+        (row: MenuListItem) => {
+            if (row.value !== config?.invoiceItemPreference) {
+                Connections.updateNetSuiteInvoiceItemPreference(policyID, row.value, config?.invoiceItemPreference);
+            }
+            if (row.value === CONST.NETSUITE_INVOICE_ITEM_PREFERENCE.CREATE) {
+                Navigation.goBack(ROUTES.POLICY_ACCOUNTING_NETSUITE_EXPORT.getRoute(policyID));
+            }
+        },
+        [config?.invoiceItemPreference, policyID],
+    );
+
+    const headerContent = useMemo(
+        () => (
+            <View style={[styles.pb2, styles.ph5]}>
+                <Text style={[styles.pb2, styles.textNormal]}>
+                    {translate(`workspace.netsuite.invoiceItem.values.${config?.invoiceItemPreference ?? CONST.NETSUITE_INVOICE_ITEM_PREFERENCE.CREATE}.description`)}
+                </Text>
+            </View>
+        ),
+        [styles.pb2, styles.ph5, styles.textNormal, translate, config?.invoiceItemPreference],
+    );
+
+    return (
+        <SelectionScreen
+            displayName={NetSuiteInvoiceItemPreferenceSelectPage.displayName}
+            title="workspace.netsuite.invoiceItem.label"
+            sections={[{data}]}
+            listItem={RadioListItem}
+            headerContent={headerContent}
+            onSelectRow={(selection: SelectorType) => selectInvoicePreference(selection as MenuListItem)}
+            initiallyFocusedOptionKey={data.find((mode) => mode.isSelected)?.keyForList}
+            policyID={policyID}
+            accessVariants={[CONST.POLICY.ACCESS_VARIANTS.ADMIN]}
+            featureName={CONST.POLICY.MORE_FEATURES.ARE_CONNECTIONS_ENABLED}
+            onBackButtonPress={() => Navigation.goBack(ROUTES.POLICY_ACCOUNTING_NETSUITE_EXPORT.getRoute(policyID))}
+            connectionName={CONST.POLICY.CONNECTIONS.NAME.NETSUITE}
+            shouldUpdateFocusedIndex
+            listFooterContent={
+                config?.invoiceItemPreference === CONST.NETSUITE_INVOICE_ITEM_PREFERENCE.SELECT ? (
+                    <OfflineWithFeedback
+                        key={translate('workspace.netsuite.invoiceItem.label')}
+                        pendingAction={config?.pendingFields?.invoiceItem}
+                        errors={ErrorUtils.getLatestErrorField(config, CONST.NETSUITE_CONFIG.INVOICE_ITEM)}
+                        errorRowStyles={[styles.ph5]}
+                        onClose={() => Policy.clearNetSuiteErrorField(policyID, CONST.NETSUITE_CONFIG.INVOICE_ITEM)}
+                    >
+                        <MenuItemWithTopDescription
+                            description={translate('workspace.netsuite.invoiceItem.label')}
+                            title={selectedItem ? selectedItem.name : undefined}
+                            interactive
+                            shouldShowRightIcon
+                            onPress={() => Navigation.navigate(ROUTES.POLICY_ACCOUNTING_NETSUITE_INVOICE_ITEM_SELECT.getRoute(policyID))}
+                            brickRoadIndicator={config?.errorFields?.invoiceItem ? CONST.BRICK_ROAD_INDICATOR_STATUS.ERROR : undefined}
+                        />
+                    </OfflineWithFeedback>
+                ) : null
+            }
+        />
+    );
+}
+
+NetSuiteInvoiceItemPreferenceSelectPage.displayName = 'NetSuiteInvoiceItemPreferenceSelectPage';
+
+export default withPolicyConnections(NetSuiteInvoiceItemPreferenceSelectPage);
diff --git a/src/pages/workspace/accounting/netsuite/export/NetSuiteInvoiceItemSelectPage.tsx b/src/pages/workspace/accounting/netsuite/export/NetSuiteInvoiceItemSelectPage.tsx
new file mode 100644
index 000000000000..26af047a3ef4
--- /dev/null
+++ b/src/pages/workspace/accounting/netsuite/export/NetSuiteInvoiceItemSelectPage.tsx
@@ -0,0 +1,74 @@
+import React, {useCallback, useMemo} from 'react';
+import BlockingView from '@components/BlockingViews/BlockingView';
+import * as Illustrations from '@components/Icon/Illustrations';
+import RadioListItem from '@components/SelectionList/RadioListItem';
+import type {SelectorType} from '@components/SelectionScreen';
+import SelectionScreen from '@components/SelectionScreen';
+import useLocalize from '@hooks/useLocalize';
+import useThemeStyles from '@hooks/useThemeStyles';
+import * as Connections from '@libs/actions/connections/NetSuiteCommands';
+import Navigation from '@libs/Navigation/Navigation';
+import {getNetSuiteInvoiceItemOptions} from '@libs/PolicyUtils';
+import type {WithPolicyConnectionsProps} from '@pages/workspace/withPolicyConnections';
+import withPolicyConnections from '@pages/workspace/withPolicyConnections';
+import variables from '@styles/variables';
+import CONST from '@src/CONST';
+import ROUTES from '@src/ROUTES';
+
+function NetSuiteInvoiceItemSelectPage({policy}: WithPolicyConnectionsProps) {
+    const styles = useThemeStyles();
+    const {translate} = useLocalize();
+
+    const policyID = policy?.id ?? '-1';
+
+    const config = policy?.connections?.netsuite.options.config;
+    const netsuiteInvoiceItemOptions = useMemo<SelectorType[]>(() => getNetSuiteInvoiceItemOptions(policy ?? undefined, config?.invoiceItem), [config?.invoiceItem, policy]);
+
+    const initiallyFocusedOptionKey = useMemo(() => netsuiteInvoiceItemOptions?.find((mode) => mode.isSelected)?.keyForList, [netsuiteInvoiceItemOptions]);
+
+    const updateInvoiceItem = useCallback(
+        ({value}: SelectorType) => {
+            if (config?.invoiceItem !== value) {
+                Connections.updateNetSuiteInvoiceItem(policyID, value, config?.invoiceItem);
+            }
+            Navigation.goBack(ROUTES.POLICY_ACCOUNTING_NETSUITE_INVOICE_ITEM_PREFERENCE_SELECT.getRoute(policyID));
+        },
+        [policyID, config?.invoiceItem],
+    );
+
+    const listEmptyContent = useMemo(
+        () => (
+            <BlockingView
+                icon={Illustrations.TeleScope}
+                iconWidth={variables.emptyListIconWidth}
+                iconHeight={variables.emptyListIconHeight}
+                title={translate('workspace.netsuite.noItemsFound')}
+                subtitle={translate('workspace.netsuite.noItemsFoundDescription')}
+                containerStyle={styles.pb10}
+            />
+        ),
+        [translate, styles.pb10],
+    );
+
+    return (
+        <SelectionScreen
+            policyID={policyID}
+            accessVariants={[CONST.POLICY.ACCESS_VARIANTS.ADMIN, CONST.POLICY.ACCESS_VARIANTS.CONTROL]}
+            featureName={CONST.POLICY.MORE_FEATURES.ARE_CONNECTIONS_ENABLED}
+            displayName={NetSuiteInvoiceItemSelectPage.displayName}
+            sections={netsuiteInvoiceItemOptions.length ? [{data: netsuiteInvoiceItemOptions}] : []}
+            listItem={RadioListItem}
+            onSelectRow={updateInvoiceItem}
+            initiallyFocusedOptionKey={initiallyFocusedOptionKey}
+            onBackButtonPress={() => Navigation.goBack(ROUTES.POLICY_ACCOUNTING_NETSUITE_INVOICE_ITEM_PREFERENCE_SELECT.getRoute(policyID))}
+            title="workspace.netsuite.invoiceItem.label"
+            listEmptyContent={listEmptyContent}
+            connectionName={CONST.POLICY.CONNECTIONS.NAME.NETSUITE}
+            shouldBeBlocked={config?.invoiceItemPreference !== CONST.NETSUITE_INVOICE_ITEM_PREFERENCE.SELECT}
+        />
+    );
+}
+
+NetSuiteInvoiceItemSelectPage.displayName = 'NetSuiteInvoiceItemSelectPage';
+
+export default withPolicyConnections(NetSuiteInvoiceItemSelectPage);
diff --git a/src/pages/workspace/accounting/netsuite/export/NetSuitePreferredExporterSelectPage.tsx b/src/pages/workspace/accounting/netsuite/export/NetSuitePreferredExporterSelectPage.tsx
new file mode 100644
index 000000000000..92d9a76bf9e4
--- /dev/null
+++ b/src/pages/workspace/accounting/netsuite/export/NetSuitePreferredExporterSelectPage.tsx
@@ -0,0 +1,104 @@
+import {isEmpty} from 'lodash';
+import React, {useCallback, useMemo} from 'react';
+import {View} from 'react-native';
+import RadioListItem from '@components/SelectionList/RadioListItem';
+import type {ListItem} from '@components/SelectionList/types';
+import SelectionScreen from '@components/SelectionScreen';
+import Text from '@components/Text';
+import useCurrentUserPersonalDetails from '@hooks/useCurrentUserPersonalDetails';
+import useLocalize from '@hooks/useLocalize';
+import useThemeStyles from '@hooks/useThemeStyles';
+import * as Connections from '@libs/actions/connections/NetSuiteCommands';
+import {getAdminEmployees, isExpensifyTeam} from '@libs/PolicyUtils';
+import Navigation from '@navigation/Navigation';
+import type {WithPolicyConnectionsProps} from '@pages/workspace/withPolicyConnections';
+import withPolicyConnections from '@pages/workspace/withPolicyConnections';
+import CONST from '@src/CONST';
+import ROUTES from '@src/ROUTES';
+
+type CardListItem = ListItem & {
+    value: string;
+};
+
+function NetSuitePreferredExporterSelectPage({policy}: WithPolicyConnectionsProps) {
+    const config = policy?.connections?.netsuite.options.config;
+    const {translate} = useLocalize();
+    const styles = useThemeStyles();
+    const policyOwner = policy?.owner ?? '';
+    const exporters = getAdminEmployees(policy);
+    const {login: currentUserLogin} = useCurrentUserPersonalDetails();
+
+    const policyID = policy?.id ?? '-1';
+    const data: CardListItem[] = useMemo(() => {
+        if (!isEmpty(policyOwner) && isEmpty(exporters)) {
+            return [
+                {
+                    value: policyOwner,
+                    text: policyOwner,
+                    keyForList: policyOwner,
+                    isSelected: true,
+                },
+            ];
+        }
+
+        return exporters?.reduce<CardListItem[]>((options, exporter) => {
+            if (!exporter.email) {
+                return options;
+            }
+
+            // Don't show guides if the current user is not a guide themselves or an Expensify employee
+            if (isExpensifyTeam(exporter.email) && !isExpensifyTeam(policyOwner) && !isExpensifyTeam(currentUserLogin)) {
+                return options;
+            }
+
+            options.push({
+                value: exporter.email,
+                text: exporter.email,
+                keyForList: exporter.email,
+                isSelected: (config?.exporter ?? policyOwner) === exporter.email,
+            });
+            return options;
+        }, []);
+    }, [config?.exporter, exporters, policyOwner, currentUserLogin]);
+
+    const selectExporter = useCallback(
+        (row: CardListItem) => {
+            if (row.value !== config?.exporter) {
+                Connections.updateNetSuiteExporter(policyID, row.value, config?.exporter ?? '');
+            }
+            Navigation.goBack(ROUTES.POLICY_ACCOUNTING_NETSUITE_EXPORT.getRoute(policyID));
+        },
+        [config?.exporter, policyID],
+    );
+
+    const headerContent = useMemo(
+        () => (
+            <View style={[styles.pb2, styles.ph5]}>
+                <Text style={[styles.pb2, styles.textNormal]}>{translate('workspace.accounting.exportPreferredExporterNote')}</Text>
+                <Text style={[styles.pb5, styles.textNormal]}>{translate('workspace.accounting.exportPreferredExporterSubNote')}</Text>
+            </View>
+        ),
+        [translate, styles.pb2, styles.ph5, styles.pb5, styles.textNormal],
+    );
+
+    return (
+        <SelectionScreen
+            policyID={policyID}
+            accessVariants={[CONST.POLICY.ACCESS_VARIANTS.ADMIN, CONST.POLICY.ACCESS_VARIANTS.CONTROL]}
+            featureName={CONST.POLICY.MORE_FEATURES.ARE_CONNECTIONS_ENABLED}
+            displayName={NetSuitePreferredExporterSelectPage.displayName}
+            sections={[{data}]}
+            listItem={RadioListItem}
+            headerContent={headerContent}
+            onSelectRow={selectExporter}
+            initiallyFocusedOptionKey={data.find((mode) => mode.isSelected)?.keyForList}
+            onBackButtonPress={() => Navigation.goBack(ROUTES.POLICY_ACCOUNTING_NETSUITE_EXPORT.getRoute(policyID))}
+            title="workspace.accounting.preferredExporter"
+            connectionName={CONST.POLICY.CONNECTIONS.NAME.NETSUITE}
+        />
+    );
+}
+
+NetSuitePreferredExporterSelectPage.displayName = 'NetSuitePreferredExporterSelectPage';
+
+export default withPolicyConnections(NetSuitePreferredExporterSelectPage);
diff --git a/src/pages/workspace/accounting/netsuite/export/NetSuiteProvincialTaxPostingAccountSelectPage.tsx b/src/pages/workspace/accounting/netsuite/export/NetSuiteProvincialTaxPostingAccountSelectPage.tsx
new file mode 100644
index 000000000000..71a10432d1ed
--- /dev/null
+++ b/src/pages/workspace/accounting/netsuite/export/NetSuiteProvincialTaxPostingAccountSelectPage.tsx
@@ -0,0 +1,80 @@
+import React, {useCallback, useMemo} from 'react';
+import BlockingView from '@components/BlockingViews/BlockingView';
+import * as Illustrations from '@components/Icon/Illustrations';
+import RadioListItem from '@components/SelectionList/RadioListItem';
+import type {SelectorType} from '@components/SelectionScreen';
+import SelectionScreen from '@components/SelectionScreen';
+import useLocalize from '@hooks/useLocalize';
+import useThemeStyles from '@hooks/useThemeStyles';
+import * as Connections from '@libs/actions/connections/NetSuiteCommands';
+import Navigation from '@libs/Navigation/Navigation';
+import {canUseProvincialTaxNetSuite, getNetSuiteTaxAccountOptions} from '@libs/PolicyUtils';
+import type {WithPolicyConnectionsProps} from '@pages/workspace/withPolicyConnections';
+import withPolicyConnections from '@pages/workspace/withPolicyConnections';
+import variables from '@styles/variables';
+import CONST from '@src/CONST';
+import ROUTES from '@src/ROUTES';
+
+function NetSuiteProvincialTaxPostingAccountSelectPage({policy}: WithPolicyConnectionsProps) {
+    const styles = useThemeStyles();
+    const {translate} = useLocalize();
+
+    const policyID = policy?.id ?? '-1';
+
+    const config = policy?.connections?.netsuite.options.config;
+    const {subsidiaryList} = policy?.connections?.netsuite?.options?.data ?? {};
+    const selectedSubsidiary = useMemo(() => (subsidiaryList ?? []).find((subsidiary) => subsidiary.internalID === config?.subsidiaryID), [subsidiaryList, config?.subsidiaryID]);
+
+    const netsuiteTaxAccountOptions = useMemo<SelectorType[]>(
+        () => getNetSuiteTaxAccountOptions(policy ?? undefined, selectedSubsidiary?.country, config?.provincialTaxPostingAccount),
+        [config?.provincialTaxPostingAccount, policy, selectedSubsidiary?.country],
+    );
+
+    const initiallyFocusedOptionKey = useMemo(() => netsuiteTaxAccountOptions?.find((mode) => mode.isSelected)?.keyForList, [netsuiteTaxAccountOptions]);
+
+    const updateTaxAccount = useCallback(
+        ({value}: SelectorType) => {
+            if (config?.provincialTaxPostingAccount !== value) {
+                Connections.updateNetSuiteProvincialTaxPostingAccount(policyID, value, config?.provincialTaxPostingAccount);
+            }
+            Navigation.goBack(ROUTES.POLICY_ACCOUNTING_NETSUITE_EXPORT.getRoute(policyID));
+        },
+        [policyID, config?.provincialTaxPostingAccount],
+    );
+
+    const listEmptyContent = useMemo(
+        () => (
+            <BlockingView
+                icon={Illustrations.TeleScope}
+                iconWidth={variables.emptyListIconWidth}
+                iconHeight={variables.emptyListIconHeight}
+                title={translate('workspace.netsuite.noAccountsFound')}
+                subtitle={translate('workspace.netsuite.noAccountsFoundDescription')}
+                containerStyle={styles.pb10}
+            />
+        ),
+        [translate, styles.pb10],
+    );
+
+    return (
+        <SelectionScreen
+            policyID={policyID}
+            accessVariants={[CONST.POLICY.ACCESS_VARIANTS.ADMIN, CONST.POLICY.ACCESS_VARIANTS.CONTROL]}
+            featureName={CONST.POLICY.MORE_FEATURES.ARE_CONNECTIONS_ENABLED}
+            displayName={NetSuiteProvincialTaxPostingAccountSelectPage.displayName}
+            sections={netsuiteTaxAccountOptions.length ? [{data: netsuiteTaxAccountOptions}] : []}
+            listItem={RadioListItem}
+            onSelectRow={updateTaxAccount}
+            initiallyFocusedOptionKey={initiallyFocusedOptionKey}
+            onBackButtonPress={() => Navigation.goBack(ROUTES.POLICY_ACCOUNTING_NETSUITE_EXPORT.getRoute(policyID))}
+            title="workspace.netsuite.journalEntriesProvTaxPostingAccount"
+            listEmptyContent={listEmptyContent}
+            connectionName={CONST.POLICY.CONNECTIONS.NAME.NETSUITE}
+            shouldBeBlocked={!!config?.suiteTaxEnabled || !config?.syncOptions.syncTax || !canUseProvincialTaxNetSuite(selectedSubsidiary?.country)}
+        />
+    );
+}
+
+NetSuiteProvincialTaxPostingAccountSelectPage.displayName = 'NetSuiteProvincialTaxPostingAccountSelectPage';
+
+export default withPolicyConnections(NetSuiteProvincialTaxPostingAccountSelectPage);
diff --git a/src/pages/workspace/accounting/netsuite/export/NetSuiteReceivableAccountSelectPage.tsx b/src/pages/workspace/accounting/netsuite/export/NetSuiteReceivableAccountSelectPage.tsx
new file mode 100644
index 000000000000..4c1e62d66674
--- /dev/null
+++ b/src/pages/workspace/accounting/netsuite/export/NetSuiteReceivableAccountSelectPage.tsx
@@ -0,0 +1,76 @@
+import React, {useCallback, useMemo} from 'react';
+import BlockingView from '@components/BlockingViews/BlockingView';
+import * as Illustrations from '@components/Icon/Illustrations';
+import RadioListItem from '@components/SelectionList/RadioListItem';
+import type {SelectorType} from '@components/SelectionScreen';
+import SelectionScreen from '@components/SelectionScreen';
+import useLocalize from '@hooks/useLocalize';
+import useThemeStyles from '@hooks/useThemeStyles';
+import * as Connections from '@libs/actions/connections/NetSuiteCommands';
+import Navigation from '@libs/Navigation/Navigation';
+import {getNetSuiteReceivableAccountOptions} from '@libs/PolicyUtils';
+import type {WithPolicyConnectionsProps} from '@pages/workspace/withPolicyConnections';
+import withPolicyConnections from '@pages/workspace/withPolicyConnections';
+import variables from '@styles/variables';
+import CONST from '@src/CONST';
+import ROUTES from '@src/ROUTES';
+
+function NetSuiteReceivableAccountSelectPage({policy}: WithPolicyConnectionsProps) {
+    const styles = useThemeStyles();
+    const {translate} = useLocalize();
+
+    const policyID = policy?.id ?? '-1';
+
+    const config = policy?.connections?.netsuite.options.config;
+    const netsuiteReceivableAccountOptions = useMemo<SelectorType[]>(
+        () => getNetSuiteReceivableAccountOptions(policy ?? undefined, config?.receivableAccount),
+        [config?.receivableAccount, policy],
+    );
+
+    const initiallyFocusedOptionKey = useMemo(() => netsuiteReceivableAccountOptions?.find((mode) => mode.isSelected)?.keyForList, [netsuiteReceivableAccountOptions]);
+
+    const updateReceivableAccount = useCallback(
+        ({value}: SelectorType) => {
+            if (config?.receivableAccount !== value) {
+                Connections.updateNetSuiteReceivableAccount(policyID, value, config?.receivableAccount);
+            }
+            Navigation.goBack(ROUTES.POLICY_ACCOUNTING_NETSUITE_EXPORT.getRoute(policyID));
+        },
+        [policyID, config?.receivableAccount],
+    );
+
+    const listEmptyContent = useMemo(
+        () => (
+            <BlockingView
+                icon={Illustrations.TeleScope}
+                iconWidth={variables.emptyListIconWidth}
+                iconHeight={variables.emptyListIconHeight}
+                title={translate('workspace.netsuite.noAccountsFound')}
+                subtitle={translate('workspace.netsuite.noAccountsFoundDescription')}
+                containerStyle={styles.pb10}
+            />
+        ),
+        [translate, styles.pb10],
+    );
+
+    return (
+        <SelectionScreen
+            policyID={policyID}
+            accessVariants={[CONST.POLICY.ACCESS_VARIANTS.ADMIN, CONST.POLICY.ACCESS_VARIANTS.CONTROL]}
+            featureName={CONST.POLICY.MORE_FEATURES.ARE_CONNECTIONS_ENABLED}
+            displayName={NetSuiteReceivableAccountSelectPage.displayName}
+            sections={netsuiteReceivableAccountOptions.length ? [{data: netsuiteReceivableAccountOptions}] : []}
+            listItem={RadioListItem}
+            onSelectRow={updateReceivableAccount}
+            initiallyFocusedOptionKey={initiallyFocusedOptionKey}
+            onBackButtonPress={() => Navigation.goBack(ROUTES.POLICY_ACCOUNTING_NETSUITE_EXPORT.getRoute(policyID))}
+            title="workspace.netsuite.exportInvoices"
+            listEmptyContent={listEmptyContent}
+            connectionName={CONST.POLICY.CONNECTIONS.NAME.NETSUITE}
+        />
+    );
+}
+
+NetSuiteReceivableAccountSelectPage.displayName = 'NetSuiteReceivableAccountSelectPage';
+
+export default withPolicyConnections(NetSuiteReceivableAccountSelectPage);
diff --git a/src/pages/workspace/accounting/netsuite/export/NetSuiteTaxPostingAccountSelectPage.tsx b/src/pages/workspace/accounting/netsuite/export/NetSuiteTaxPostingAccountSelectPage.tsx
new file mode 100644
index 000000000000..f7b7295e3a3a
--- /dev/null
+++ b/src/pages/workspace/accounting/netsuite/export/NetSuiteTaxPostingAccountSelectPage.tsx
@@ -0,0 +1,82 @@
+import React, {useCallback, useMemo} from 'react';
+import BlockingView from '@components/BlockingViews/BlockingView';
+import * as Illustrations from '@components/Icon/Illustrations';
+import RadioListItem from '@components/SelectionList/RadioListItem';
+import type {SelectorType} from '@components/SelectionScreen';
+import SelectionScreen from '@components/SelectionScreen';
+import useLocalize from '@hooks/useLocalize';
+import usePermissions from '@hooks/usePermissions';
+import useThemeStyles from '@hooks/useThemeStyles';
+import * as Connections from '@libs/actions/connections/NetSuiteCommands';
+import Navigation from '@libs/Navigation/Navigation';
+import {canUseTaxNetSuite, getNetSuiteTaxAccountOptions} from '@libs/PolicyUtils';
+import type {WithPolicyConnectionsProps} from '@pages/workspace/withPolicyConnections';
+import withPolicyConnections from '@pages/workspace/withPolicyConnections';
+import variables from '@styles/variables';
+import CONST from '@src/CONST';
+import ROUTES from '@src/ROUTES';
+
+function NetSuiteTaxPostingAccountSelectPage({policy}: WithPolicyConnectionsProps) {
+    const styles = useThemeStyles();
+    const {translate} = useLocalize();
+    const {canUseNetSuiteUSATax} = usePermissions();
+
+    const policyID = policy?.id ?? '-1';
+
+    const config = policy?.connections?.netsuite.options.config;
+    const {subsidiaryList} = policy?.connections?.netsuite?.options?.data ?? {};
+    const selectedSubsidiary = useMemo(() => (subsidiaryList ?? []).find((subsidiary) => subsidiary.internalID === config?.subsidiaryID), [subsidiaryList, config?.subsidiaryID]);
+
+    const netsuiteTaxAccountOptions = useMemo<SelectorType[]>(
+        () => getNetSuiteTaxAccountOptions(policy ?? undefined, selectedSubsidiary?.country, config?.taxPostingAccount),
+        [config?.taxPostingAccount, policy, selectedSubsidiary?.country],
+    );
+
+    const initiallyFocusedOptionKey = useMemo(() => netsuiteTaxAccountOptions?.find((mode) => mode.isSelected)?.keyForList, [netsuiteTaxAccountOptions]);
+
+    const updateTaxAccount = useCallback(
+        ({value}: SelectorType) => {
+            if (config?.taxPostingAccount !== value) {
+                Connections.updateNetSuiteTaxPostingAccount(policyID, value, config?.taxPostingAccount);
+            }
+            Navigation.goBack(ROUTES.POLICY_ACCOUNTING_NETSUITE_EXPORT.getRoute(policyID));
+        },
+        [policyID, config?.taxPostingAccount],
+    );
+
+    const listEmptyContent = useMemo(
+        () => (
+            <BlockingView
+                icon={Illustrations.TeleScope}
+                iconWidth={variables.emptyListIconWidth}
+                iconHeight={variables.emptyListIconHeight}
+                title={translate('workspace.netsuite.noAccountsFound')}
+                subtitle={translate('workspace.netsuite.noAccountsFoundDescription')}
+                containerStyle={styles.pb10}
+            />
+        ),
+        [translate, styles.pb10],
+    );
+
+    return (
+        <SelectionScreen
+            policyID={policyID}
+            accessVariants={[CONST.POLICY.ACCESS_VARIANTS.ADMIN, CONST.POLICY.ACCESS_VARIANTS.CONTROL]}
+            featureName={CONST.POLICY.MORE_FEATURES.ARE_CONNECTIONS_ENABLED}
+            displayName={NetSuiteTaxPostingAccountSelectPage.displayName}
+            sections={netsuiteTaxAccountOptions.length ? [{data: netsuiteTaxAccountOptions}] : []}
+            listItem={RadioListItem}
+            onSelectRow={updateTaxAccount}
+            initiallyFocusedOptionKey={initiallyFocusedOptionKey}
+            onBackButtonPress={() => Navigation.goBack(ROUTES.POLICY_ACCOUNTING_NETSUITE_EXPORT.getRoute(policyID))}
+            title="workspace.netsuite.journalEntriesTaxPostingAccount"
+            listEmptyContent={listEmptyContent}
+            connectionName={CONST.POLICY.CONNECTIONS.NAME.NETSUITE}
+            shouldBeBlocked={!!config?.suiteTaxEnabled || !config?.syncOptions.syncTax || !canUseTaxNetSuite(canUseNetSuiteUSATax, selectedSubsidiary?.country)}
+        />
+    );
+}
+
+NetSuiteTaxPostingAccountSelectPage.displayName = 'NetSuiteTaxPostingAccountSelectPage';
+
+export default withPolicyConnections(NetSuiteTaxPostingAccountSelectPage);
diff --git a/src/pages/workspace/accounting/netsuite/import/NetSuiteImportCustomFieldEdit.tsx b/src/pages/workspace/accounting/netsuite/import/NetSuiteImportCustomFieldEdit.tsx
new file mode 100644
index 000000000000..d3f5082d47cb
--- /dev/null
+++ b/src/pages/workspace/accounting/netsuite/import/NetSuiteImportCustomFieldEdit.tsx
@@ -0,0 +1,173 @@
+import React, {useCallback, useMemo} from 'react';
+import type {ValueOf} from 'type-fest';
+import ConnectionLayout from '@components/ConnectionLayout';
+import FormProvider from '@components/Form/FormProvider';
+import InputWrapper from '@components/Form/InputWrapper';
+import type {FormInputErrors, FormOnyxValues} from '@components/Form/types';
+import TextInput from '@components/TextInput';
+import useAutoFocusInput from '@hooks/useAutoFocusInput';
+import useLocalize from '@hooks/useLocalize';
+import useThemeStyles from '@hooks/useThemeStyles';
+import {updateNetSuiteCustomLists, updateNetSuiteCustomSegments} from '@libs/actions/connections/NetSuiteCommands';
+import * as ErrorUtils from '@libs/ErrorUtils';
+import Navigation from '@libs/Navigation/Navigation';
+import * as PolicyUtils from '@libs/PolicyUtils';
+import withPolicyConnections from '@pages/workspace/withPolicyConnections';
+import type {WithPolicyConnectionsProps} from '@pages/workspace/withPolicyConnections';
+import CONST from '@src/CONST';
+import type {TranslationPaths} from '@src/languages/types';
+import ONYXKEYS from '@src/ONYXKEYS';
+import ROUTES from '@src/ROUTES';
+import type {NetSuiteCustomList, NetSuiteCustomSegment} from '@src/types/onyx/Policy';
+import NetSuiteCustomFieldMappingPicker from './NetSuiteImportCustomFieldNew/NetSuiteCustomFieldMappingPicker';
+
+type CustomField = NetSuiteCustomList | NetSuiteCustomSegment;
+type ImportCustomFieldsKeys = ValueOf<typeof CONST.NETSUITE_CONFIG.IMPORT_CUSTOM_FIELDS>;
+
+type NetSuiteImportCustomFieldViewProps = WithPolicyConnectionsProps & {
+    route: {
+        params: {
+            /** Whether the record is of type custom segment or list */
+            importCustomField: ImportCustomFieldsKeys;
+
+            /** Index of the current record */
+            valueIndex: number;
+
+            /** Selected field of the current record  */
+            fieldName: string;
+        };
+    };
+};
+
+function NetSuiteImportCustomFieldEdit({
+    policy,
+    route: {
+        params: {importCustomField, valueIndex, fieldName},
+    },
+}: NetSuiteImportCustomFieldViewProps) {
+    const policyID = policy?.id ?? '-1';
+    const styles = useThemeStyles();
+    const {translate} = useLocalize();
+    const {inputCallbackRef} = useAutoFocusInput();
+
+    const config = policy?.connections?.netsuite?.options?.config;
+    const allRecords = useMemo(() => config?.syncOptions?.[importCustomField] ?? [], [config?.syncOptions, importCustomField]);
+
+    const customField: CustomField | undefined = allRecords[valueIndex];
+    const fieldValue = customField?.[fieldName as keyof CustomField] ?? '';
+
+    const updateRecord = useCallback(
+        (formValues: Partial<FormOnyxValues<typeof ONYXKEYS.FORMS.NETSUITE_CUSTOM_FIELD_FORM>>) => {
+            const newValue = formValues[fieldName as keyof typeof formValues];
+
+            if (customField) {
+                const updatedRecords = allRecords.map((record, index) => {
+                    if (index === Number(valueIndex)) {
+                        return {
+                            ...record,
+                            [fieldName]: newValue,
+                        };
+                    }
+                    return record;
+                });
+
+                if (PolicyUtils.isNetSuiteCustomSegmentRecord(customField)) {
+                    updateNetSuiteCustomSegments(policyID, updatedRecords as NetSuiteCustomSegment[], allRecords as NetSuiteCustomSegment[]);
+                } else {
+                    updateNetSuiteCustomLists(policyID, updatedRecords as NetSuiteCustomList[], allRecords as NetSuiteCustomList[]);
+                }
+            }
+
+            Navigation.navigate(ROUTES.POLICY_ACCOUNTING_NETSUITE_IMPORT_CUSTOM_FIELD_VIEW.getRoute(policyID, importCustomField, valueIndex));
+        },
+        [allRecords, customField, fieldName, importCustomField, policyID, valueIndex],
+    );
+
+    const validate = useCallback(
+        (formValues: FormOnyxValues<typeof ONYXKEYS.FORMS.NETSUITE_CUSTOM_FIELD_FORM>) => {
+            const errors: FormInputErrors<typeof ONYXKEYS.FORMS.NETSUITE_CUSTOM_FIELD_FORM> = {};
+
+            const key = fieldName as keyof typeof formValues;
+            const fieldLabel = translate(`workspace.netsuite.import.importCustomFields.${importCustomField}.fields.${fieldName}` as TranslationPaths);
+            if (!formValues[key]) {
+                ErrorUtils.addErrorMessage(errors, fieldName, translate('workspace.netsuite.import.importCustomFields.requiredFieldError', fieldLabel));
+            } else if (
+                policy?.connections?.netsuite?.options?.config?.syncOptions?.customSegments?.find(
+                    (customSegment) => customSegment?.[fieldName as keyof typeof customSegment]?.toLowerCase() === formValues[key].toLowerCase(),
+                )
+            ) {
+                ErrorUtils.addErrorMessage(errors, fieldName, translate('workspace.netsuite.import.importCustomFields.customSegments.errors.uniqueFieldError', fieldLabel));
+            }
+
+            return errors;
+        },
+        [fieldName, importCustomField, policy?.connections?.netsuite?.options?.config?.syncOptions?.customSegments, translate],
+    );
+
+    const renderForm = useMemo(
+        () =>
+            customField && (
+                <FormProvider
+                    formID={ONYXKEYS.FORMS.NETSUITE_CUSTOM_FIELD_FORM}
+                    style={[styles.flexGrow1, styles.ph5]}
+                    validate={validate}
+                    onSubmit={updateRecord}
+                    submitButtonText={translate('common.save')}
+                    shouldValidateOnBlur
+                    shouldValidateOnChange
+                    isSubmitDisabled={!!config?.syncOptions?.pendingFields?.[importCustomField]}
+                >
+                    <InputWrapper
+                        InputComponent={TextInput}
+                        inputID={fieldName}
+                        label={translate(`workspace.netsuite.import.importCustomFields.${importCustomField}.fields.${fieldName}` as TranslationPaths)}
+                        aria-label={translate(`workspace.netsuite.import.importCustomFields.${importCustomField}.fields.${fieldName}` as TranslationPaths)}
+                        role={CONST.ROLE.PRESENTATION}
+                        spellCheck={false}
+                        defaultValue={fieldValue ?? ''}
+                        ref={inputCallbackRef}
+                    />
+                </FormProvider>
+            ),
+        [config?.syncOptions?.pendingFields, customField, fieldName, fieldValue, importCustomField, inputCallbackRef, styles.flexGrow1, styles.ph5, translate, updateRecord, validate],
+    );
+
+    const renderSelection = useMemo(
+        () =>
+            customField && (
+                <NetSuiteCustomFieldMappingPicker
+                    onInputChange={(value) => {
+                        updateRecord({
+                            [fieldName]: value,
+                        });
+                    }}
+                    value={fieldValue}
+                />
+            ),
+        [customField, fieldName, fieldValue, updateRecord],
+    );
+
+    const renderMap: Record<string, JSX.Element> = {
+        mapping: renderSelection,
+    };
+
+    return (
+        <ConnectionLayout
+            displayName={NetSuiteImportCustomFieldEdit.displayName}
+            headerTitle={`workspace.netsuite.import.importCustomFields.${importCustomField}.fields.${fieldName}` as TranslationPaths}
+            accessVariants={[CONST.POLICY.ACCESS_VARIANTS.ADMIN, CONST.POLICY.ACCESS_VARIANTS.CONTROL]}
+            policyID={policyID}
+            featureName={CONST.POLICY.MORE_FEATURES.ARE_CONNECTIONS_ENABLED}
+            contentContainerStyle={[styles.pb2, styles.flex1]}
+            titleStyle={styles.ph5}
+            connectionName={CONST.POLICY.CONNECTIONS.NAME.NETSUITE}
+            shouldBeBlocked={!customField || !PolicyUtils.isNetSuiteCustomFieldPropertyEditable(customField, fieldName)}
+            shouldUseScrollView={false}
+        >
+            {renderMap[fieldName] || renderForm}
+        </ConnectionLayout>
+    );
+}
+
+NetSuiteImportCustomFieldEdit.displayName = 'NetSuiteImportCustomFieldEdit';
+export default withPolicyConnections(NetSuiteImportCustomFieldEdit);
diff --git a/src/pages/workspace/accounting/netsuite/import/NetSuiteImportCustomFieldNew/NetSuiteCustomFieldMappingPicker.tsx b/src/pages/workspace/accounting/netsuite/import/NetSuiteImportCustomFieldNew/NetSuiteCustomFieldMappingPicker.tsx
new file mode 100644
index 000000000000..b98b8b328b77
--- /dev/null
+++ b/src/pages/workspace/accounting/netsuite/import/NetSuiteImportCustomFieldNew/NetSuiteCustomFieldMappingPicker.tsx
@@ -0,0 +1,61 @@
+import React from 'react';
+import {View} from 'react-native';
+import FormHelpMessage from '@components/FormHelpMessage';
+import SelectionList from '@components/SelectionList';
+import RadioListItem from '@components/SelectionList/RadioListItem';
+import useLocalize from '@hooks/useLocalize';
+import useThemeStyles from '@hooks/useThemeStyles';
+import CONST from '@src/CONST';
+
+type NetSuiteCustomListPickerProps = {
+    /** Selected mapping value */
+    value?: string;
+
+    /** Text to display on error message */
+    errorText?: string;
+
+    /** Callback to fire when mapping is selected */
+    onInputChange?: (value: string) => void;
+};
+
+function NetSuiteCustomFieldMappingPicker({value, errorText, onInputChange}: NetSuiteCustomListPickerProps) {
+    const {translate} = useLocalize();
+    const styles = useThemeStyles();
+
+    const options = [CONST.INTEGRATION_ENTITY_MAP_TYPES.TAG, CONST.INTEGRATION_ENTITY_MAP_TYPES.REPORT_FIELD];
+
+    const selectionData =
+        options.map((option) => ({
+            text: translate(`workspace.netsuite.import.importTypes.${option}.label`),
+            keyForList: option,
+            isSelected: value === option,
+            value: option,
+            alternateText: translate(`workspace.netsuite.import.importTypes.${option}.description`),
+        })) ?? [];
+
+    return (
+        <>
+            <SelectionList
+                sections={[{data: selectionData}]}
+                onSelectRow={(selected) => {
+                    onInputChange?.(selected.value);
+                }}
+                ListItem={RadioListItem}
+                initiallyFocusedOptionKey={value ?? CONST.INTEGRATION_ENTITY_MAP_TYPES.TAG}
+                shouldSingleExecuteRowSelect
+                shouldUpdateFocusedIndex
+            />
+            {!!errorText && (
+                <View style={styles.ph5}>
+                    <FormHelpMessage
+                        isError={!!errorText}
+                        message={errorText}
+                    />
+                </View>
+            )}
+        </>
+    );
+}
+
+NetSuiteCustomFieldMappingPicker.displayName = 'NetSuiteCustomFieldMappingPicker';
+export default NetSuiteCustomFieldMappingPicker;
diff --git a/src/pages/workspace/accounting/netsuite/import/NetSuiteImportCustomFieldNew/NetSuiteCustomListPicker.tsx b/src/pages/workspace/accounting/netsuite/import/NetSuiteImportCustomFieldNew/NetSuiteCustomListPicker.tsx
new file mode 100644
index 000000000000..18a4a8318316
--- /dev/null
+++ b/src/pages/workspace/accounting/netsuite/import/NetSuiteImportCustomFieldNew/NetSuiteCustomListPicker.tsx
@@ -0,0 +1,67 @@
+import React, {useState} from 'react';
+import MenuItemWithTopDescription from '@components/MenuItemWithTopDescription';
+import useLocalize from '@hooks/useLocalize';
+import Navigation from '@libs/Navigation/Navigation';
+import type {CustomListSelectorType} from '@pages/workspace/accounting/netsuite/types';
+import CONST from '@src/CONST';
+import type {Policy} from '@src/types/onyx';
+import NetSuiteCustomListSelectorModal from './NetSuiteCustomListSelectorModal';
+
+type NetSuiteCustomListPickerProps = {
+    /** Current value of the selected item */
+    value?: string;
+
+    /** Current connected policy */
+    policy?: Policy;
+
+    /** Callback when the list item is selected */
+    onInputChange?: (value: string, key?: string) => void;
+
+    /** Id of the internalID input to be updated on input change */
+    internalIDInputID?: string;
+
+    /** Form Error description */
+    errorText?: string;
+};
+
+function NetSuiteCustomListPicker({value, policy, internalIDInputID, errorText, onInputChange = () => {}}: NetSuiteCustomListPickerProps) {
+    const {translate} = useLocalize();
+    const [isPickerVisible, setIsPickerVisible] = useState(false);
+
+    const hidePickerModal = () => {
+        setIsPickerVisible(false);
+    };
+
+    const updateInput = (item: CustomListSelectorType) => {
+        onInputChange?.(item.value);
+        if (internalIDInputID) {
+            onInputChange(item.id, internalIDInputID);
+        }
+        hidePickerModal();
+    };
+
+    return (
+        <>
+            <MenuItemWithTopDescription
+                shouldShowRightIcon
+                title={value}
+                description={translate('workspace.netsuite.import.importCustomFields.customLists.fields.listName')}
+                onPress={() => setIsPickerVisible(true)}
+                brickRoadIndicator={errorText ? CONST.BRICK_ROAD_INDICATOR_STATUS.ERROR : undefined}
+                errorText={errorText}
+            />
+            <NetSuiteCustomListSelectorModal
+                isVisible={isPickerVisible}
+                currentCustomListValue={value ?? ''}
+                onCustomListSelected={updateInput}
+                onClose={hidePickerModal}
+                label={translate('workspace.netsuite.import.importCustomFields.customLists.fields.listName')}
+                policy={policy}
+                onBackdropPress={Navigation.dismissModal}
+            />
+        </>
+    );
+}
+
+NetSuiteCustomListPicker.displayName = 'NetSuiteCustomListPicker';
+export default NetSuiteCustomListPicker;
diff --git a/src/pages/workspace/accounting/netsuite/import/NetSuiteImportCustomFieldNew/NetSuiteCustomListSelectorModal.tsx b/src/pages/workspace/accounting/netsuite/import/NetSuiteImportCustomFieldNew/NetSuiteCustomListSelectorModal.tsx
new file mode 100644
index 000000000000..e8f0d9e8315f
--- /dev/null
+++ b/src/pages/workspace/accounting/netsuite/import/NetSuiteImportCustomFieldNew/NetSuiteCustomListSelectorModal.tsx
@@ -0,0 +1,112 @@
+import {Str} from 'expensify-common';
+import React, {useMemo} from 'react';
+import HeaderWithBackButton from '@components/HeaderWithBackButton';
+import Modal from '@components/Modal';
+import ScreenWrapper from '@components/ScreenWrapper';
+import SelectionList from '@components/SelectionList';
+import RadioListItem from '@components/SelectionList/RadioListItem';
+import useDebouncedState from '@hooks/useDebouncedState';
+import useLocalize from '@hooks/useLocalize';
+import useThemeStyles from '@hooks/useThemeStyles';
+import type {CustomListSelectorType} from '@pages/workspace/accounting/netsuite/types';
+import CONST from '@src/CONST';
+import type {Policy} from '@src/types/onyx';
+
+type NetSuiteCustomListSelectorModalProps = {
+    /** Whether the modal is visible */
+    isVisible: boolean;
+
+    /** Function to call when the user closes the business type selector modal */
+    onClose: () => void;
+
+    /** Label to display on field */
+    label: string;
+
+    /** Custom List value selected  */
+    currentCustomListValue: string;
+
+    policy?: Policy;
+
+    /** Function to call when the user selects a custom list */
+    onCustomListSelected: (value: CustomListSelectorType) => void;
+
+    /** Function to call when the user presses on the modal backdrop */
+    onBackdropPress?: () => void;
+};
+
+function NetSuiteCustomListSelectorModal({isVisible, currentCustomListValue, onCustomListSelected, onClose, label, policy, onBackdropPress}: NetSuiteCustomListSelectorModalProps) {
+    const {translate} = useLocalize();
+    const [searchValue, debouncedSearchValue, setSearchValue] = useDebouncedState('');
+
+    const {sections, headerMessage, showTextInput} = useMemo(() => {
+        const customLists = policy?.connections?.netsuite?.options?.data?.customLists ?? [];
+        const customListData = customLists.map((customListRecord) => ({
+            text: customListRecord.name,
+            value: customListRecord.name,
+            isSelected: customListRecord.name === currentCustomListValue,
+            keyForList: customListRecord.name,
+            id: customListRecord.id,
+        }));
+
+        const searchRegex = new RegExp(Str.escapeForRegExp(debouncedSearchValue.trim()), 'i');
+        const filteredCustomLists = customListData.filter((customListRecord) => searchRegex.test(customListRecord.text ?? ''));
+        const isEmpty = debouncedSearchValue.trim() && !filteredCustomLists.length;
+
+        return {
+            sections: isEmpty
+                ? []
+                : [
+                      {
+                          data: filteredCustomLists,
+                      },
+                  ],
+            headerMessage: isEmpty ? translate('common.noResultsFound') : '',
+            showTextInput: customListData.length > CONST.NETSUITE_CONFIG.NETSUITE_CUSTOM_LIST_LIMIT,
+        };
+    }, [debouncedSearchValue, policy?.connections?.netsuite?.options?.data?.customLists, translate, currentCustomListValue]);
+
+    const styles = useThemeStyles();
+
+    return (
+        <Modal
+            type={CONST.MODAL.MODAL_TYPE.RIGHT_DOCKED}
+            isVisible={isVisible}
+            onClose={onClose}
+            onModalHide={onClose}
+            hideModalContentWhileAnimating
+            useNativeDriver
+            onBackdropPress={onBackdropPress}
+        >
+            <ScreenWrapper
+                style={[styles.pb0]}
+                includePaddingTop={false}
+                includeSafeAreaPaddingBottom={false}
+                testID={NetSuiteCustomListSelectorModal.displayName}
+            >
+                <HeaderWithBackButton
+                    title={label}
+                    shouldShowBackButton
+                    onBackButtonPress={onClose}
+                />
+                <SelectionList
+                    sections={sections}
+                    textInputValue={searchValue}
+                    textInputLabel={showTextInput ? translate('common.search') : undefined}
+                    onChangeText={setSearchValue}
+                    onSelectRow={onCustomListSelected}
+                    headerMessage={headerMessage}
+                    ListItem={RadioListItem}
+                    isRowMultilineSupported
+                    initiallyFocusedOptionKey={currentCustomListValue}
+                    shouldSingleExecuteRowSelect
+                    shouldStopPropagation
+                    shouldUseDynamicMaxToRenderPerBatch
+                />
+            </ScreenWrapper>
+        </Modal>
+    );
+}
+
+NetSuiteCustomListSelectorModal.displayName = 'NetSuiteCustomListSelectorModal';
+
+export default NetSuiteCustomListSelectorModal;
diff --git a/src/pages/workspace/accounting/netsuite/import/NetSuiteImportCustomFieldNew/NetSuiteImportAddCustomListPage.tsx b/src/pages/workspace/accounting/netsuite/import/NetSuiteImportCustomFieldNew/NetSuiteImportAddCustomListPage.tsx
new file mode 100644
index 000000000000..e08cf4dac6c4
--- /dev/null
+++ b/src/pages/workspace/accounting/netsuite/import/NetSuiteImportCustomFieldNew/NetSuiteImportAddCustomListPage.tsx
@@ -0,0 +1,176 @@
+import React, {useCallback, useMemo, useRef} from 'react';
+import type {ForwardedRef} from 'react';
+import {View} from 'react-native';
+import ConnectionLayout from '@components/ConnectionLayout';
+import FormProvider from '@components/Form/FormProvider';
+import type {FormInputErrors, FormOnyxValues} from '@components/Form/types';
+import InteractiveStepSubHeader from '@components/InteractiveStepSubHeader';
+import type {InteractiveStepSubHeaderHandle} from '@components/InteractiveStepSubHeader';
+import useLocalize from '@hooks/useLocalize';
+import useSubStep from '@hooks/useSubStep';
+import useThemeStyles from '@hooks/useThemeStyles';
+import * as Connections from '@libs/actions/connections/NetSuiteCommands';
+import Navigation from '@libs/Navigation/Navigation';
+import * as ValidationUtils from '@libs/ValidationUtils';
+import type {CustomFieldSubStepWithPolicy} from '@pages/workspace/accounting/netsuite/types';
+import type {WithPolicyConnectionsProps} from '@pages/workspace/withPolicyConnections';
+import withPolicyConnections from '@pages/workspace/withPolicyConnections';
+import CONST from '@src/CONST';
+import ONYXKEYS from '@src/ONYXKEYS';
+import ROUTES from '@src/ROUTES';
+import INPUT_IDS from '@src/types/form/NetSuiteCustomFieldForm';
+import ChooseCustomListStep from './substeps/ChooseCustomListStep';
+import ConfirmCustomListStep from './substeps/ConfirmCustomListStep';
+import MappingStep from './substeps/MappingStep';
+import TransactionFieldIDStep from './substeps/TransactionFieldIDStep';
+
+const formSteps = [ChooseCustomListStep, TransactionFieldIDStep, MappingStep, ConfirmCustomListStep];
+
+function NetSuiteImportAddCustomListPage({policy}: WithPolicyConnectionsProps) {
+    const policyID = policy?.id ?? '-1';
+    const styles = useThemeStyles();
+    const {translate} = useLocalize();
+    const ref: ForwardedRef<InteractiveStepSubHeaderHandle> = useRef(null);
+
+    const config = policy?.connections?.netsuite?.options?.config;
+    const customLists = useMemo(() => config?.syncOptions?.customLists ?? [], [config?.syncOptions]);
+
+    const handleFinishStep = useCallback(() => {
+        Navigation.goBack(ROUTES.POLICY_ACCOUNTING_NETSUITE_IMPORT_CUSTOM_FIELD_MAPPING.getRoute(policyID, CONST.NETSUITE_CONFIG.IMPORT_CUSTOM_FIELDS.CUSTOM_LISTS));
+    }, [policyID]);
+
+    const {
+        componentToRender: SubStep,
+        isEditing,
+        nextScreen,
+        prevScreen,
+        screenIndex,
+        moveTo,
+        goToTheLastStep,
+    } = useSubStep<CustomFieldSubStepWithPolicy>({
+        bodyContent: formSteps,
+        startFrom: CONST.NETSUITE_CUSTOM_FIELD_SUBSTEP_INDEXES.CUSTOM_LISTS.CUSTOM_LIST_PICKER,
+        onFinished: handleFinishStep,
+    });
+
+    const handleBackButtonPress = () => {
+        if (isEditing) {
+            goToTheLastStep();
+            return;
+        }
+
+        // Clicking back on the first screen should go back to listing
+        if (screenIndex === CONST.NETSUITE_CUSTOM_FIELD_SUBSTEP_INDEXES.CUSTOM_LISTS.CUSTOM_LIST_PICKER) {
+            Navigation.goBack(ROUTES.POLICY_ACCOUNTING_NETSUITE_IMPORT_CUSTOM_FIELD_MAPPING.getRoute(policyID, CONST.NETSUITE_CONFIG.IMPORT_CUSTOM_FIELDS.CUSTOM_LISTS));
+            return;
+        }
+        ref.current?.movePrevious();
+        prevScreen();
+    };
+
+    const handleNextScreen = useCallback(() => {
+        if (isEditing) {
+            goToTheLastStep();
+            return;
+        }
+        ref.current?.moveNext();
+        nextScreen();
+    }, [goToTheLastStep, isEditing, nextScreen]);
+
+    const validate = useCallback(
+        (values: FormOnyxValues<typeof ONYXKEYS.FORMS.NETSUITE_CUSTOM_LIST_ADD_FORM>): FormInputErrors<typeof ONYXKEYS.FORMS.NETSUITE_CUSTOM_LIST_ADD_FORM> => {
+            const errors: FormInputErrors<typeof ONYXKEYS.FORMS.NETSUITE_CUSTOM_LIST_ADD_FORM> = {};
+            switch (screenIndex) {
+                case CONST.NETSUITE_CUSTOM_FIELD_SUBSTEP_INDEXES.CUSTOM_LISTS.CUSTOM_LIST_PICKER:
+                    return ValidationUtils.getFieldRequiredErrors(values, [INPUT_IDS.LIST_NAME]);
+                case CONST.NETSUITE_CUSTOM_FIELD_SUBSTEP_INDEXES.CUSTOM_LISTS.TRANSACTION_FIELD_ID:
+                    if (!ValidationUtils.isRequiredFulfilled(values[INPUT_IDS.TRANSACTION_FIELD_ID])) {
+                        const fieldLabel = translate(`workspace.netsuite.import.importCustomFields.customLists.fields.transactionFieldID`);
+                        errors[INPUT_IDS.TRANSACTION_FIELD_ID] = translate('workspace.netsuite.import.importCustomFields.requiredFieldError', fieldLabel);
+                    } else if (customLists.find((customList) => customList.transactionFieldID.toLowerCase() === values[INPUT_IDS.TRANSACTION_FIELD_ID].toLowerCase())) {
+                        errors[INPUT_IDS.TRANSACTION_FIELD_ID] = translate('workspace.netsuite.import.importCustomFields.customLists.errors.uniqueTransactionFieldIDError');
+                    }
+                    return errors;
+                case CONST.NETSUITE_CUSTOM_FIELD_SUBSTEP_INDEXES.CUSTOM_LISTS.MAPPING:
+                    return ValidationUtils.getFieldRequiredErrors(values, [INPUT_IDS.MAPPING]);
+                default:
+                    return errors;
+            }
+        },
+        [customLists, screenIndex, translate],
+    );
+
+    const updateNetSuiteCustomLists = useCallback(
+        (formValues: FormOnyxValues<typeof ONYXKEYS.FORMS.NETSUITE_CUSTOM_LIST_ADD_FORM>) => {
+            const updatedCustomLists = customLists.concat([
+                {
+                    listName: formValues[INPUT_IDS.LIST_NAME],
+                    internalID: formValues[INPUT_IDS.INTERNAL_ID],
+                    transactionFieldID: formValues[INPUT_IDS.TRANSACTION_FIELD_ID],
+                    mapping: formValues[INPUT_IDS.MAPPING] ?? CONST.INTEGRATION_ENTITY_MAP_TYPES.TAG,
+                },
+            ]);
+            Connections.updateNetSuiteCustomLists(policyID, updatedCustomLists, customLists);
+            nextScreen();
+        },
+        [customLists, nextScreen, policyID],
+    );
+
+    const selectionListForm = [CONST.NETSUITE_CUSTOM_FIELD_SUBSTEP_INDEXES.CUSTOM_LISTS.MAPPING as number].includes(screenIndex);
+    const submitFlexAllowed = [
+        CONST.NETSUITE_CUSTOM_FIELD_SUBSTEP_INDEXES.CUSTOM_LISTS.CUSTOM_LIST_PICKER as number,
+        CONST.NETSUITE_CUSTOM_FIELD_SUBSTEP_INDEXES.CUSTOM_LISTS.TRANSACTION_FIELD_ID as number,
+    ].includes(screenIndex);
+
+    return (
+        <ConnectionLayout
+            displayName={NetSuiteImportAddCustomListPage.displayName}
+            headerTitle="workspace.netsuite.import.importCustomFields.customLists.addText"
+            accessVariants={[CONST.POLICY.ACCESS_VARIANTS.ADMIN, CONST.POLICY.ACCESS_VARIANTS.CONTROL]}
+            policyID={policyID}
+            featureName={CONST.POLICY.MORE_FEATURES.ARE_CONNECTIONS_ENABLED}
+            contentContainerStyle={[styles.flex1]}
+            titleStyle={styles.ph5}
+            connectionName={CONST.POLICY.CONNECTIONS.NAME.NETSUITE}
+            onBackButtonPress={handleBackButtonPress}
+            shouldIncludeSafeAreaPaddingBottom
+            shouldUseScrollView={false}
+        >
+            <View style={[styles.ph5, styles.mb3, styles.mt3, {height: CONST.NETSUITE_FORM_STEPS_HEADER_HEIGHT}]}>
+                <InteractiveStepSubHeader
+                    ref={ref}
+                    startStepIndex={CONST.NETSUITE_CUSTOM_FIELD_SUBSTEP_INDEXES.CUSTOM_LISTS.CUSTOM_LIST_PICKER}
+                    stepNames={CONST.NETSUITE_CONFIG.NETSUITE_ADD_CUSTOM_LIST_STEP_NAMES}
+                />
+            </View>
+            <View style={[styles.flexGrow1, styles.mt3]}>
+                <FormProvider
+                    formID={ONYXKEYS.FORMS.NETSUITE_CUSTOM_LIST_ADD_FORM}
+                    submitButtonText={screenIndex === formSteps.length - 1 ? translate('common.confirm') : translate('common.next')}
+                    onSubmit={screenIndex === formSteps.length - 1 ? updateNetSuiteCustomLists : handleNextScreen}
+                    validate={validate}
+                    style={[styles.mt3, styles.flexGrow1]}
+                    submitButtonStyles={[styles.ph5, styles.mb0]}
+                    shouldUseScrollView={!selectionListForm}
+                    enabledWhenOffline
+                    isSubmitDisabled={!!config?.syncOptions?.pendingFields?.customLists}
+                    submitFlexEnabled={submitFlexAllowed}
+                >
+                    <SubStep
+                        isEditing={isEditing}
+                        onNext={handleNextScreen}
+                        onMove={moveTo}
+                        screenIndex={screenIndex}
+                        policyID={policyID}
+                        policy={policy}
+                        importCustomField={CONST.NETSUITE_CONFIG.IMPORT_CUSTOM_FIELDS.CUSTOM_LISTS}
+                    />
+                </FormProvider>
+            </View>
+        </ConnectionLayout>
+    );
+}
+
+NetSuiteImportAddCustomListPage.displayName = 'NetSuiteImportAddCustomListPage';
+
+export default withPolicyConnections(NetSuiteImportAddCustomListPage);
diff --git a/src/pages/workspace/accounting/netsuite/import/NetSuiteImportCustomFieldNew/NetSuiteImportAddCustomSegmentPage.tsx b/src/pages/workspace/accounting/netsuite/import/NetSuiteImportCustomFieldNew/NetSuiteImportAddCustomSegmentPage.tsx
new file mode 100644
index 000000000000..1a24a117ac85
--- /dev/null
+++ b/src/pages/workspace/accounting/netsuite/import/NetSuiteImportCustomFieldNew/NetSuiteImportAddCustomSegmentPage.tsx
@@ -0,0 +1,224 @@
+import React, {useCallback, useMemo, useRef, useState} from 'react';
+import type {ForwardedRef} from 'react';
+import {View} from 'react-native';
+import type {ValueOf} from 'type-fest';
+import ConnectionLayout from '@components/ConnectionLayout';
+import FormProvider from '@components/Form/FormProvider';
+import type {FormInputErrors, FormOnyxValues} from '@components/Form/types';
+import InteractiveStepSubHeader from '@components/InteractiveStepSubHeader';
+import type {InteractiveStepSubHeaderHandle} from '@components/InteractiveStepSubHeader';
+import useLocalize from '@hooks/useLocalize';
+import useSubStep from '@hooks/useSubStep';
+import useThemeStyles from '@hooks/useThemeStyles';
+import * as Connections from '@libs/actions/connections/NetSuiteCommands';
+import Navigation from '@libs/Navigation/Navigation';
+import * as ValidationUtils from '@libs/ValidationUtils';
+import type {CustomFieldSubStepWithPolicy} from '@pages/workspace/accounting/netsuite/types';
+import type {WithPolicyConnectionsProps} from '@pages/workspace/withPolicyConnections';
+import withPolicyConnections from '@pages/workspace/withPolicyConnections';
+import CONST from '@src/CONST';
+import type {TranslationPaths} from '@src/languages/types';
+import ONYXKEYS from '@src/ONYXKEYS';
+import ROUTES from '@src/ROUTES';
+import INPUT_IDS from '@src/types/form/NetSuiteCustomFieldForm';
+import ChooseSegmentTypeStep from './substeps/ChooseSegmentTypeStep';
+import ConfirmCustomSegmentList from './substeps/ConfirmCustomSegmentList';
+import CustomSegmentInternalIdStep from './substeps/CustomSegmentInternalIdStep';
+import CustomSegmentNameStep from './substeps/CustomSegmentNameStep';
+import CustomSegmentScriptIdStep from './substeps/CustomSegmentScriptIdStep';
+import MappingStep from './substeps/MappingStep';
+
+const formSteps = [ChooseSegmentTypeStep, CustomSegmentNameStep, CustomSegmentInternalIdStep, CustomSegmentScriptIdStep, MappingStep, ConfirmCustomSegmentList];
+
+function NetSuiteImportAddCustomSegmentPage({policy}: WithPolicyConnectionsProps) {
+    const policyID = policy?.id ?? '-1';
+    const styles = useThemeStyles();
+    const {translate} = useLocalize();
+    const ref: ForwardedRef<InteractiveStepSubHeaderHandle> = useRef(null);
+
+    const config = policy?.connections?.netsuite?.options?.config;
+    const customSegments = useMemo(() => config?.syncOptions?.customSegments ?? [], [config?.syncOptions]);
+
+    const handleFinishStep = useCallback(() => {
+        Navigation.goBack(ROUTES.POLICY_ACCOUNTING_NETSUITE_IMPORT_CUSTOM_FIELD_MAPPING.getRoute(policyID, CONST.NETSUITE_CONFIG.IMPORT_CUSTOM_FIELDS.CUSTOM_SEGMENTS));
+    }, [policyID]);
+
+    const {
+        componentToRender: SubStep,
+        isEditing,
+        nextScreen,
+        prevScreen,
+        screenIndex,
+        moveTo,
+        goToTheLastStep,
+    } = useSubStep<CustomFieldSubStepWithPolicy>({bodyContent: formSteps, startFrom: CONST.NETSUITE_CUSTOM_FIELD_SUBSTEP_INDEXES.CUSTOM_SEGMENTS.SEGMENT_TYPE, onFinished: handleFinishStep});
+
+    const handleBackButtonPress = () => {
+        if (isEditing) {
+            goToTheLastStep();
+            return;
+        }
+
+        // Clicking back on the first screen should go back to listing
+        if (screenIndex === CONST.NETSUITE_CUSTOM_FIELD_SUBSTEP_INDEXES.CUSTOM_SEGMENTS.SEGMENT_TYPE) {
+            Navigation.goBack(ROUTES.POLICY_ACCOUNTING_NETSUITE_IMPORT_CUSTOM_FIELD_MAPPING.getRoute(policyID, CONST.NETSUITE_CONFIG.IMPORT_CUSTOM_FIELDS.CUSTOM_SEGMENTS));
+            return;
+        }
+        ref.current?.movePrevious();
+        prevScreen();
+    };
+
+    const handleNextScreen = useCallback(() => {
+        if (isEditing) {
+            goToTheLastStep();
+            return;
+        }
+        ref.current?.moveNext();
+        nextScreen();
+    }, [goToTheLastStep, isEditing, nextScreen]);
+
+    const [customSegmentType, setCustomSegmentType] = useState<ValueOf<typeof CONST.NETSUITE_CUSTOM_RECORD_TYPES> | undefined>();
+
+    const validate = useCallback(
+        (values: FormOnyxValues<typeof ONYXKEYS.FORMS.NETSUITE_CUSTOM_SEGMENT_ADD_FORM>): FormInputErrors<typeof ONYXKEYS.FORMS.NETSUITE_CUSTOM_SEGMENT_ADD_FORM> => {
+            const errors: FormInputErrors<typeof ONYXKEYS.FORMS.NETSUITE_CUSTOM_SEGMENT_ADD_FORM> = {};
+            const customSegmentRecordType = customSegmentType ?? CONST.NETSUITE_CUSTOM_RECORD_TYPES.CUSTOM_SEGMENT;
+            switch (screenIndex) {
+                case CONST.NETSUITE_CUSTOM_FIELD_SUBSTEP_INDEXES.CUSTOM_SEGMENTS.SEGMENT_NAME:
+                    if (!ValidationUtils.isRequiredFulfilled(values[INPUT_IDS.SEGMENT_NAME])) {
+                        errors[INPUT_IDS.SEGMENT_NAME] = translate(
+                            'workspace.netsuite.import.importCustomFields.requiredFieldError',
+                            translate(`workspace.netsuite.import.importCustomFields.customSegments.addForm.${customSegmentRecordType}Name`),
+                        );
+                    } else if (customSegments.find((customSegment) => customSegment.segmentName.toLowerCase() === values[INPUT_IDS.SEGMENT_NAME].toLowerCase())) {
+                        const fieldLabel = translate(`workspace.netsuite.import.importCustomFields.customSegments.fields.segmentName`);
+                        errors[INPUT_IDS.SEGMENT_NAME] = translate('workspace.netsuite.import.importCustomFields.customSegments.errors.uniqueFieldError', fieldLabel);
+                    }
+                    return errors;
+                case CONST.NETSUITE_CUSTOM_FIELD_SUBSTEP_INDEXES.CUSTOM_SEGMENTS.INTERNAL_ID:
+                    if (!ValidationUtils.isRequiredFulfilled(values[INPUT_IDS.INTERNAL_ID])) {
+                        const fieldLabel = translate(`workspace.netsuite.import.importCustomFields.customSegments.fields.internalID`);
+                        errors[INPUT_IDS.INTERNAL_ID] = translate('workspace.netsuite.import.importCustomFields.requiredFieldError', fieldLabel);
+                    } else if (customSegments.find((customSegment) => customSegment.internalID.toLowerCase() === values[INPUT_IDS.INTERNAL_ID].toLowerCase())) {
+                        const fieldLabel = translate(`workspace.netsuite.import.importCustomFields.customSegments.fields.internalID`);
+                        errors[INPUT_IDS.INTERNAL_ID] = translate('workspace.netsuite.import.importCustomFields.customSegments.errors.uniqueFieldError', fieldLabel);
+                    }
+                    return errors;
+                case CONST.NETSUITE_CUSTOM_FIELD_SUBSTEP_INDEXES.CUSTOM_SEGMENTS.SCRIPT_ID:
+                    if (!ValidationUtils.isRequiredFulfilled(values[INPUT_IDS.SCRIPT_ID])) {
+                        const fieldLabel = translate(
+                            `workspace.netsuite.import.importCustomFields.customSegments.fields.${
+                                customSegmentRecordType === CONST.NETSUITE_CUSTOM_RECORD_TYPES.CUSTOM_SEGMENT ? 'scriptID' : 'customRecordScriptID'
+                            }`,
+                        );
+                        errors[INPUT_IDS.SCRIPT_ID] = translate('workspace.netsuite.import.importCustomFields.requiredFieldError', fieldLabel);
+                    } else if (customSegments.find((customSegment) => customSegment.scriptID.toLowerCase() === values[INPUT_IDS.SCRIPT_ID].toLowerCase())) {
+                        const fieldLabel = translate(
+                            `workspace.netsuite.import.importCustomFields.customSegments.fields.${
+                                customSegmentRecordType === CONST.NETSUITE_CUSTOM_RECORD_TYPES.CUSTOM_SEGMENT ? 'scriptID' : 'customRecordScriptID'
+                            }`,
+                        );
+                        errors[INPUT_IDS.SCRIPT_ID] = translate('workspace.netsuite.import.importCustomFields.customSegments.errors.uniqueFieldError', fieldLabel);
+                    }
+                    return errors;
+                case CONST.NETSUITE_CUSTOM_FIELD_SUBSTEP_INDEXES.CUSTOM_SEGMENTS.MAPPING:
+                    if (!ValidationUtils.isRequiredFulfilled(values[INPUT_IDS.MAPPING])) {
+                        errors[INPUT_IDS.MAPPING] = translate('common.error.pleaseSelectOne');
+                    }
+                    return errors;
+                default:
+                    return errors;
+            }
+        },
+        [customSegmentType, customSegments, screenIndex, translate],
+    );
+
+    const updateNetSuiteCustomSegments = useCallback(
+        (formValues: FormOnyxValues<typeof ONYXKEYS.FORMS.NETSUITE_CUSTOM_SEGMENT_ADD_FORM>) => {
+            const updatedCustomSegments = customSegments.concat([
+                {
+                    segmentName: formValues[INPUT_IDS.SEGMENT_NAME],
+                    internalID: formValues[INPUT_IDS.INTERNAL_ID],
+                    scriptID: formValues[INPUT_IDS.SCRIPT_ID],
+                    mapping: formValues[INPUT_IDS.MAPPING] ?? CONST.INTEGRATION_ENTITY_MAP_TYPES.TAG,
+                },
+            ]);
+            Connections.updateNetSuiteCustomSegments(policyID, updatedCustomSegments, customSegments);
+            nextScreen();
+        },
+        [customSegments, nextScreen, policyID],
+    );
+
+    const renderSubStepContent = useMemo(
+        () => (
+            <SubStep
+                isEditing={isEditing}
+                onNext={handleNextScreen}
+                onMove={moveTo}
+                screenIndex={screenIndex}
+                policyID={policyID}
+                policy={policy}
+                importCustomField={CONST.NETSUITE_CONFIG.IMPORT_CUSTOM_FIELDS.CUSTOM_SEGMENTS}
+                customSegmentType={customSegmentType}
+                setCustomSegmentType={setCustomSegmentType}
+            />
+        ),
+        [SubStep, handleNextScreen, isEditing, moveTo, policy, policyID, screenIndex, customSegmentType],
+    );
+
+    const selectionListForm = [CONST.NETSUITE_CUSTOM_FIELD_SUBSTEP_INDEXES.CUSTOM_SEGMENTS.MAPPING as number].includes(screenIndex);
+    const submitFlexAllowed = [
+        CONST.NETSUITE_CUSTOM_FIELD_SUBSTEP_INDEXES.CUSTOM_SEGMENTS.SEGMENT_NAME as number,
+        CONST.NETSUITE_CUSTOM_FIELD_SUBSTEP_INDEXES.CUSTOM_SEGMENTS.INTERNAL_ID as number,
+        CONST.NETSUITE_CUSTOM_FIELD_SUBSTEP_INDEXES.CUSTOM_SEGMENTS.SCRIPT_ID as number,
+    ].includes(screenIndex);
+
+    return (
+        <ConnectionLayout
+            displayName={NetSuiteImportAddCustomSegmentPage.displayName}
+            headerTitle={`workspace.netsuite.import.importCustomFields.customSegments.${customSegmentType ? `addForm.${customSegmentType}AddTitle` : 'addText'}` as TranslationPaths}
+            accessVariants={[CONST.POLICY.ACCESS_VARIANTS.ADMIN, CONST.POLICY.ACCESS_VARIANTS.CONTROL]}
+            policyID={policyID}
+            featureName={CONST.POLICY.MORE_FEATURES.ARE_CONNECTIONS_ENABLED}
+            contentContainerStyle={[styles.flex1]}
+            titleStyle={styles.ph5}
+            connectionName={CONST.POLICY.CONNECTIONS.NAME.NETSUITE}
+            onBackButtonPress={handleBackButtonPress}
+            shouldIncludeSafeAreaPaddingBottom
+            shouldUseScrollView={false}
+        >
+            <View style={[styles.ph5, styles.mb3, styles.mt3, {height: CONST.NETSUITE_FORM_STEPS_HEADER_HEIGHT}]}>
+                <InteractiveStepSubHeader
+                    ref={ref}
+                    startStepIndex={CONST.NETSUITE_CUSTOM_FIELD_SUBSTEP_INDEXES.CUSTOM_SEGMENTS.SEGMENT_TYPE}
+                    stepNames={CONST.NETSUITE_CONFIG.NETSUITE_ADD_CUSTOM_SEGMENT_STEP_NAMES}
+                />
+            </View>
+            <View style={[styles.flexGrow1, styles.mt3]}>
+                {screenIndex === CONST.NETSUITE_CUSTOM_FIELD_SUBSTEP_INDEXES.CUSTOM_SEGMENTS.SEGMENT_TYPE ? (
+                    renderSubStepContent
+                ) : (
+                    <FormProvider
+                        formID={ONYXKEYS.FORMS.NETSUITE_CUSTOM_SEGMENT_ADD_FORM}
+                        submitButtonText={screenIndex === formSteps.length - 1 ? translate('common.confirm') : translate('common.next')}
+                        onSubmit={screenIndex === formSteps.length - 1 ? updateNetSuiteCustomSegments : handleNextScreen}
+                        validate={validate}
+                        style={[styles.flexGrow1]}
+                        submitButtonStyles={[styles.ph5, styles.mb0]}
+                        shouldUseScrollView={!selectionListForm}
+                        enabledWhenOffline
+                        isSubmitDisabled={!!config?.syncOptions?.pendingFields?.customSegments}
+                        submitFlexEnabled={submitFlexAllowed}
+                        shouldHideFixErrorsAlert={screenIndex === CONST.NETSUITE_CUSTOM_FIELD_SUBSTEP_INDEXES.CUSTOM_SEGMENTS.MAPPING}
+                    >
+                        {renderSubStepContent}
+                    </FormProvider>
+                )}
+            </View>
+        </ConnectionLayout>
+    );
+}
+
+NetSuiteImportAddCustomSegmentPage.displayName = 'NetSuiteImportAddCustomSegmentPage';
+
+export default withPolicyConnections(NetSuiteImportAddCustomSegmentPage);
diff --git a/src/pages/workspace/accounting/netsuite/import/NetSuiteImportCustomFieldNew/NetSuiteMenuWithTopDescriptionForm.tsx b/src/pages/workspace/accounting/netsuite/import/NetSuiteImportCustomFieldNew/NetSuiteMenuWithTopDescriptionForm.tsx
new file mode 100644
index 000000000000..684059a5b846
--- /dev/null
+++ b/src/pages/workspace/accounting/netsuite/import/NetSuiteImportCustomFieldNew/NetSuiteMenuWithTopDescriptionForm.tsx
@@ -0,0 +1,24 @@
+import React from 'react';
+import type {MenuItemProps} from '@components/MenuItem';
+import MenuItemWithTopDescription from '@components/MenuItemWithTopDescription';
+
+type NetSuiteMenuWithTopDescriptionFormProps = MenuItemProps & {
+    /** The value of the menu item */
+    value?: string;
+
+    /** Callback to format the value */
+    valueRenderer?: (value?: string) => string | undefined;
+};
+
+function NetSuiteMenuWithTopDescriptionForm({value, valueRenderer, ...props}: NetSuiteMenuWithTopDescriptionFormProps) {
+    return (
+        <MenuItemWithTopDescription
+            // eslint-disable-next-line react/jsx-props-no-spreading
+            {...props}
+            title={valueRenderer ? valueRenderer(value) : value}
+        />
+    );
+}
+
+NetSuiteMenuWithTopDescriptionForm.displayName = 'NetSuiteMenuWithTopDescriptionForm';
+export default NetSuiteMenuWithTopDescriptionForm;
diff --git a/src/pages/workspace/accounting/netsuite/import/NetSuiteImportCustomFieldNew/substeps/ChooseCustomListStep.tsx b/src/pages/workspace/accounting/netsuite/import/NetSuiteImportCustomFieldNew/substeps/ChooseCustomListStep.tsx
new file mode 100644
index 000000000000..473a01d5e7ce
--- /dev/null
+++ b/src/pages/workspace/accounting/netsuite/import/NetSuiteImportCustomFieldNew/substeps/ChooseCustomListStep.tsx
@@ -0,0 +1,28 @@
+import React from 'react';
+import InputWrapper from '@components/Form/InputWrapper';
+import Text from '@components/Text';
+import useLocalize from '@hooks/useLocalize';
+import useThemeStyles from '@hooks/useThemeStyles';
+import NetSuiteCustomListPicker from '@pages/workspace/accounting/netsuite/import/NetSuiteImportCustomFieldNew/NetSuiteCustomListPicker';
+import type {CustomFieldSubStepWithPolicy} from '@pages/workspace/accounting/netsuite/types';
+import INPUT_IDS from '@src/types/form/NetSuiteCustomFieldForm';
+
+function ChooseCustomListStep({policy}: CustomFieldSubStepWithPolicy) {
+    const styles = useThemeStyles();
+    const {translate} = useLocalize();
+
+    return (
+        <>
+            <Text style={[styles.mb3, styles.ph5, styles.textHeadlineLineHeightXXL]}>{translate(`workspace.netsuite.import.importCustomFields.customLists.addForm.listNameTitle`)}</Text>
+            <InputWrapper
+                InputComponent={NetSuiteCustomListPicker}
+                inputID={INPUT_IDS.LIST_NAME}
+                policy={policy}
+                internalIDInputID={INPUT_IDS.INTERNAL_ID}
+            />
+        </>
+    );
+}
+
+ChooseCustomListStep.displayName = 'ChooseCustomListStep';
+export default ChooseCustomListStep;
diff --git a/src/pages/workspace/accounting/netsuite/import/NetSuiteImportCustomFieldNew/substeps/ChooseSegmentTypeStep.tsx b/src/pages/workspace/accounting/netsuite/import/NetSuiteImportCustomFieldNew/substeps/ChooseSegmentTypeStep.tsx
new file mode 100644
index 000000000000..a5bbb15a1756
--- /dev/null
+++ b/src/pages/workspace/accounting/netsuite/import/NetSuiteImportCustomFieldNew/substeps/ChooseSegmentTypeStep.tsx
@@ -0,0 +1,76 @@
+import React, {useState} from 'react';
+import {View} from 'react-native';
+import FormHelpMessage from '@components/FormHelpMessage';
+import SelectionList from '@components/SelectionList';
+import RadioListItem from '@components/SelectionList/RadioListItem';
+import Text from '@components/Text';
+import useLocalize from '@hooks/useLocalize';
+import useThemeStyles from '@hooks/useThemeStyles';
+import type {CustomFieldSubStepWithPolicy} from '@pages/workspace/accounting/netsuite/types';
+import CONST from '@src/CONST';
+
+function ChooseSegmentTypeStep({onNext, customSegmentType, setCustomSegmentType}: CustomFieldSubStepWithPolicy) {
+    const styles = useThemeStyles();
+    const {translate} = useLocalize();
+    const [selectedType, setSelectedType] = useState(customSegmentType);
+    const [isError, setIsError] = useState(false);
+
+    const selectionData = [
+        {
+            text: translate(`workspace.netsuite.import.importCustomFields.customSegments.addForm.segmentTitle`),
+            keyForList: CONST.NETSUITE_CUSTOM_RECORD_TYPES.CUSTOM_SEGMENT,
+            isSelected: selectedType === CONST.NETSUITE_CUSTOM_RECORD_TYPES.CUSTOM_SEGMENT,
+            value: CONST.NETSUITE_CUSTOM_RECORD_TYPES.CUSTOM_SEGMENT,
+        },
+        {
+            text: translate(`workspace.netsuite.import.importCustomFields.customSegments.addForm.recordTitle`),
+            keyForList: CONST.NETSUITE_CUSTOM_RECORD_TYPES.CUSTOM_RECORD,
+            isSelected: selectedType === CONST.NETSUITE_CUSTOM_RECORD_TYPES.CUSTOM_RECORD,
+            value: CONST.NETSUITE_CUSTOM_RECORD_TYPES.CUSTOM_RECORD,
+        },
+    ];
+
+    const onConfirm = () => {
+        if (!selectedType) {
+            setIsError(true);
+        } else {
+            setCustomSegmentType?.(selectedType);
+            onNext();
+        }
+    };
+
+    return (
+        <>
+            <Text style={[styles.ph5, styles.textHeadlineLineHeightXXL, styles.mb3]}>
+                {translate(`workspace.netsuite.import.importCustomFields.customSegments.addForm.segmentRecordType`)}
+            </Text>
+            <Text style={[styles.ph5, styles.mb3]}>{translate(`workspace.netsuite.import.importCustomFields.chooseOptionBelow`)}</Text>
+            <SelectionList
+                sections={[{data: selectionData}]}
+                ListItem={RadioListItem}
+                initiallyFocusedOptionKey={selectedType}
+                onSelectRow={(selected) => {
+                    setSelectedType(selected.value);
+                    setIsError(false);
+                }}
+                shouldSingleExecuteRowSelect
+                shouldUpdateFocusedIndex
+                showConfirmButton
+                confirmButtonText={translate('common.next')}
+                onConfirm={onConfirm}
+            >
+                {isError && (
+                    <View style={[styles.ph5, styles.mb5]}>
+                        <FormHelpMessage
+                            isError={isError}
+                            message={translate('common.error.pleaseSelectOne')}
+                        />
+                    </View>
+                )}
+            </SelectionList>
+        </>
+    );
+}
+
+ChooseSegmentTypeStep.displayName = 'ChooseSegmentTypeStep';
+export default ChooseSegmentTypeStep;
diff --git a/src/pages/workspace/accounting/netsuite/import/NetSuiteImportCustomFieldNew/substeps/ConfirmCustomListStep.tsx b/src/pages/workspace/accounting/netsuite/import/NetSuiteImportCustomFieldNew/substeps/ConfirmCustomListStep.tsx
new file mode 100644
index 000000000000..e72aa8710753
--- /dev/null
+++ b/src/pages/workspace/accounting/netsuite/import/NetSuiteImportCustomFieldNew/substeps/ConfirmCustomListStep.tsx
@@ -0,0 +1,39 @@
+import React from 'react';
+import {View} from 'react-native';
+import InputWrapper from '@components/Form/InputWrapper';
+import Text from '@components/Text';
+import useLocalize from '@hooks/useLocalize';
+import useThemeStyles from '@hooks/useThemeStyles';
+import NetSuiteMenuWithTopDescriptionForm from '@pages/workspace/accounting/netsuite/import/NetSuiteImportCustomFieldNew/NetSuiteMenuWithTopDescriptionForm';
+import type {CustomFieldSubStepWithPolicy} from '@pages/workspace/accounting/netsuite/types';
+import type {TranslationPaths} from '@src/languages/types';
+import INPUT_IDS from '@src/types/form/NetSuiteCustomFieldForm';
+
+function ConfirmCustomListStep({onMove}: CustomFieldSubStepWithPolicy) {
+    const styles = useThemeStyles();
+    const {translate} = useLocalize();
+
+    const fieldNames = [INPUT_IDS.LIST_NAME, INPUT_IDS.TRANSACTION_FIELD_ID, INPUT_IDS.MAPPING];
+
+    return (
+        <View style={styles.flex1}>
+            <Text style={[styles.textHeadlineLineHeightXXL, styles.ph5, styles.mb3]}>{translate('workspace.common.letsDoubleCheck')}</Text>
+            {fieldNames.map((fieldName, index) => (
+                <InputWrapper
+                    InputComponent={NetSuiteMenuWithTopDescriptionForm}
+                    inputID={fieldName}
+                    key={fieldName}
+                    description={translate(`workspace.netsuite.import.importCustomFields.customLists.fields.${fieldName}` as TranslationPaths)}
+                    shouldShowRightIcon
+                    onPress={() => {
+                        onMove(index);
+                    }}
+                    valueRenderer={(value) => (fieldName === INPUT_IDS.MAPPING && value ? translate(`workspace.netsuite.import.importTypes.${value}.label` as TranslationPaths) : value)}
+                />
+            ))}
+        </View>
+    );
+}
+
+ConfirmCustomListStep.displayName = 'ConfirmCustomListStep';
+export default ConfirmCustomListStep;
diff --git a/src/pages/workspace/accounting/netsuite/import/NetSuiteImportCustomFieldNew/substeps/ConfirmCustomSegmentList.tsx b/src/pages/workspace/accounting/netsuite/import/NetSuiteImportCustomFieldNew/substeps/ConfirmCustomSegmentList.tsx
new file mode 100644
index 000000000000..bf1314491c03
--- /dev/null
+++ b/src/pages/workspace/accounting/netsuite/import/NetSuiteImportCustomFieldNew/substeps/ConfirmCustomSegmentList.tsx
@@ -0,0 +1,46 @@
+import React from 'react';
+import {View} from 'react-native';
+import InputWrapper from '@components/Form/InputWrapper';
+import Text from '@components/Text';
+import useLocalize from '@hooks/useLocalize';
+import useThemeStyles from '@hooks/useThemeStyles';
+import NetSuiteMenuWithTopDescriptionForm from '@pages/workspace/accounting/netsuite/import/NetSuiteImportCustomFieldNew/NetSuiteMenuWithTopDescriptionForm';
+import type {CustomFieldSubStepWithPolicy} from '@pages/workspace/accounting/netsuite/types';
+import CONST from '@src/CONST';
+import type {TranslationPaths} from '@src/languages/types';
+import INPUT_IDS from '@src/types/form/NetSuiteCustomFieldForm';
+
+function ConfirmCustomListStep({onMove, customSegmentType}: CustomFieldSubStepWithPolicy) {
+    const styles = useThemeStyles();
+    const {translate} = useLocalize();
+
+    const fieldNames = [INPUT_IDS.SEGMENT_NAME, INPUT_IDS.INTERNAL_ID, INPUT_IDS.SCRIPT_ID, INPUT_IDS.MAPPING];
+
+    return (
+        <View style={styles.flex1}>
+            <Text style={[styles.textHeadlineLineHeightXXL, styles.ph5, styles.mb3]}>{translate('workspace.common.letsDoubleCheck')}</Text>
+            {fieldNames.map((fieldName, index) => (
+                <InputWrapper
+                    InputComponent={NetSuiteMenuWithTopDescriptionForm}
+                    inputID={fieldName}
+                    key={fieldName}
+                    description={translate(
+                        `workspace.netsuite.import.importCustomFields.customSegments.fields.${
+                            fieldName === INPUT_IDS.SCRIPT_ID && customSegmentType === CONST.NETSUITE_CUSTOM_RECORD_TYPES.CUSTOM_RECORD
+                                ? `${CONST.NETSUITE_CUSTOM_RECORD_TYPES.CUSTOM_RECORD}ScriptID`
+                                : `${fieldName}`
+                        }` as TranslationPaths,
+                    )}
+                    shouldShowRightIcon
+                    onPress={() => {
+                        onMove(index + 1);
+                    }}
+                    valueRenderer={(value) => (fieldName === INPUT_IDS.MAPPING && value ? translate(`workspace.netsuite.import.importTypes.${value}.label` as TranslationPaths) : value)}
+                />
+            ))}
+        </View>
+    );
+}
+
+ConfirmCustomListStep.displayName = 'ConfirmCustomListStep';
+export default ConfirmCustomListStep;
diff --git a/src/pages/workspace/accounting/netsuite/import/NetSuiteImportCustomFieldNew/substeps/CustomSegmentInternalIdStep.tsx b/src/pages/workspace/accounting/netsuite/import/NetSuiteImportCustomFieldNew/substeps/CustomSegmentInternalIdStep.tsx
new file mode 100644
index 000000000000..df110dfb1eeb
--- /dev/null
+++ b/src/pages/workspace/accounting/netsuite/import/NetSuiteImportCustomFieldNew/substeps/CustomSegmentInternalIdStep.tsx
@@ -0,0 +1,48 @@
+import React from 'react';
+import {View} from 'react-native';
+import InputWrapper from '@components/Form/InputWrapper';
+import RenderHTML from '@components/RenderHTML';
+import Text from '@components/Text';
+import TextInput from '@components/TextInput';
+import useAutoFocusInput from '@hooks/useAutoFocusInput';
+import useLocalize from '@hooks/useLocalize';
+import useThemeStyles from '@hooks/useThemeStyles';
+import Parser from '@libs/Parser';
+import type {CustomFieldSubStepWithPolicy} from '@pages/workspace/accounting/netsuite/types';
+import CONST from '@src/CONST';
+import INPUT_IDS from '@src/types/form/NetSuiteCustomFieldForm';
+
+function CustomSegmentInternalIdStep({customSegmentType}: CustomFieldSubStepWithPolicy) {
+    const styles = useThemeStyles();
+    const {translate} = useLocalize();
+    const {inputCallbackRef} = useAutoFocusInput();
+
+    const customSegmentRecordType = customSegmentType ?? CONST.NETSUITE_CUSTOM_RECORD_TYPES.CUSTOM_SEGMENT;
+
+    const fieldLabel = translate(`workspace.netsuite.import.importCustomFields.customSegments.fields.internalID`);
+
+    return (
+        <View style={styles.ph5}>
+            <Text style={[styles.mb3, styles.textHeadlineLineHeightXXL]}>
+                {translate(`workspace.netsuite.import.importCustomFields.customSegments.addForm.customSegmentInternalIDTitle`)}
+            </Text>
+            <InputWrapper
+                InputComponent={TextInput}
+                inputID={INPUT_IDS.INTERNAL_ID}
+                label={fieldLabel}
+                aria-label={fieldLabel}
+                role={CONST.ROLE.PRESENTATION}
+                spellCheck={false}
+                ref={inputCallbackRef}
+            />
+            <View style={[styles.flex1, styles.mv3, styles.renderHTML, styles.textDecorationSkipInkNone]}>
+                <RenderHTML
+                    html={`<comment>${Parser.replace(translate(`workspace.netsuite.import.importCustomFields.customSegments.addForm.${customSegmentRecordType}InternalIDFooter`))}</comment>`}
+                />
+            </View>
+        </View>
+    );
+}
+
+CustomSegmentInternalIdStep.displayName = 'CustomSegmentInternalIdStep';
+export default CustomSegmentInternalIdStep;
diff --git a/src/pages/workspace/accounting/netsuite/import/NetSuiteImportCustomFieldNew/substeps/CustomSegmentNameStep.tsx b/src/pages/workspace/accounting/netsuite/import/NetSuiteImportCustomFieldNew/substeps/CustomSegmentNameStep.tsx
new file mode 100644
index 000000000000..3d2af112743f
--- /dev/null
+++ b/src/pages/workspace/accounting/netsuite/import/NetSuiteImportCustomFieldNew/substeps/CustomSegmentNameStep.tsx
@@ -0,0 +1,48 @@
+import React from 'react';
+import {View} from 'react-native';
+import InputWrapper from '@components/Form/InputWrapper';
+import RenderHTML from '@components/RenderHTML';
+import Text from '@components/Text';
+import TextInput from '@components/TextInput';
+import useAutoFocusInput from '@hooks/useAutoFocusInput';
+import useLocalize from '@hooks/useLocalize';
+import useThemeStyles from '@hooks/useThemeStyles';
+import Parser from '@libs/Parser';
+import type {CustomFieldSubStepWithPolicy} from '@pages/workspace/accounting/netsuite/types';
+import CONST from '@src/CONST';
+import INPUT_IDS from '@src/types/form/NetSuiteCustomFieldForm';
+
+function CustomSegmentNameStep({customSegmentType}: CustomFieldSubStepWithPolicy) {
+    const styles = useThemeStyles();
+    const {translate} = useLocalize();
+    const {inputCallbackRef} = useAutoFocusInput();
+
+    const fieldLabel = translate(`workspace.netsuite.import.importCustomFields.customSegments.fields.segmentName`);
+
+    const customSegmentRecordType = customSegmentType ?? CONST.NETSUITE_CUSTOM_RECORD_TYPES.CUSTOM_SEGMENT;
+
+    return (
+        <View style={styles.ph5}>
+            <Text style={[styles.mb3, styles.textHeadlineLineHeightXXL]}>
+                {translate(`workspace.netsuite.import.importCustomFields.customSegments.addForm.${customSegmentRecordType}NameTitle`)}
+            </Text>
+            <InputWrapper
+                InputComponent={TextInput}
+                inputID={INPUT_IDS.SEGMENT_NAME}
+                label={fieldLabel}
+                aria-label={fieldLabel}
+                role={CONST.ROLE.PRESENTATION}
+                spellCheck={false}
+                ref={inputCallbackRef}
+            />
+            <View style={[styles.flex1, styles.mv3, styles.renderHTML, styles.textDecorationSkipInkNone]}>
+                <RenderHTML
+                    html={`<comment>${Parser.replace(translate(`workspace.netsuite.import.importCustomFields.customSegments.addForm.${customSegmentRecordType}NameFooter`))}</comment>`}
+                />
+            </View>
+        </View>
+    );
+}
+
+CustomSegmentNameStep.displayName = 'CustomSegmentNameStep';
+export default CustomSegmentNameStep;
diff --git a/src/pages/workspace/accounting/netsuite/import/NetSuiteImportCustomFieldNew/substeps/CustomSegmentScriptIdStep.tsx b/src/pages/workspace/accounting/netsuite/import/NetSuiteImportCustomFieldNew/substeps/CustomSegmentScriptIdStep.tsx
new file mode 100644
index 000000000000..1388f6b2397e
--- /dev/null
+++ b/src/pages/workspace/accounting/netsuite/import/NetSuiteImportCustomFieldNew/substeps/CustomSegmentScriptIdStep.tsx
@@ -0,0 +1,52 @@
+import React from 'react';
+import {View} from 'react-native';
+import InputWrapper from '@components/Form/InputWrapper';
+import RenderHTML from '@components/RenderHTML';
+import Text from '@components/Text';
+import TextInput from '@components/TextInput';
+import useAutoFocusInput from '@hooks/useAutoFocusInput';
+import useLocalize from '@hooks/useLocalize';
+import useThemeStyles from '@hooks/useThemeStyles';
+import Parser from '@libs/Parser';
+import type {CustomFieldSubStepWithPolicy} from '@pages/workspace/accounting/netsuite/types';
+import CONST from '@src/CONST';
+import INPUT_IDS from '@src/types/form/NetSuiteCustomFieldForm';
+
+function CustomSegmentScriptIdStep({customSegmentType}: CustomFieldSubStepWithPolicy) {
+    const styles = useThemeStyles();
+    const {translate} = useLocalize();
+    const {inputCallbackRef} = useAutoFocusInput();
+
+    const customSegmentRecordType = customSegmentType ?? CONST.NETSUITE_CUSTOM_RECORD_TYPES.CUSTOM_SEGMENT;
+
+    const fieldLabel = translate(
+        `workspace.netsuite.import.importCustomFields.customSegments.fields.${
+            customSegmentRecordType === CONST.NETSUITE_CUSTOM_RECORD_TYPES.CUSTOM_SEGMENT ? 'scriptID' : 'customRecordScriptID'
+        }`,
+    );
+
+    return (
+        <View style={styles.ph5}>
+            <Text style={[styles.mb3, styles.textHeadlineLineHeightXXL]}>
+                {translate(`workspace.netsuite.import.importCustomFields.customSegments.addForm.${customSegmentRecordType}ScriptIDTitle`)}
+            </Text>
+            <InputWrapper
+                InputComponent={TextInput}
+                inputID={INPUT_IDS.SCRIPT_ID}
+                label={fieldLabel}
+                aria-label={fieldLabel}
+                role={CONST.ROLE.PRESENTATION}
+                spellCheck={false}
+                ref={inputCallbackRef}
+            />
+            <View style={[styles.flex1, styles.mv3, styles.renderHTML, styles.textDecorationSkipInkNone]}>
+                <RenderHTML
+                    html={`<comment>${Parser.replace(translate(`workspace.netsuite.import.importCustomFields.customSegments.addForm.${customSegmentRecordType}ScriptIDFooter`))}</comment>`}
+                />
+            </View>
+        </View>
+    );
+}
+
+CustomSegmentScriptIdStep.displayName = 'CustomSegmentScriptIdStep';
+export default CustomSegmentScriptIdStep;
diff --git a/src/pages/workspace/accounting/netsuite/import/NetSuiteImportCustomFieldNew/substeps/MappingStep.tsx b/src/pages/workspace/accounting/netsuite/import/NetSuiteImportCustomFieldNew/substeps/MappingStep.tsx
new file mode 100644
index 000000000000..f41269e4954f
--- /dev/null
+++ b/src/pages/workspace/accounting/netsuite/import/NetSuiteImportCustomFieldNew/substeps/MappingStep.tsx
@@ -0,0 +1,37 @@
+import React from 'react';
+import InputWrapper from '@components/Form/InputWrapper';
+import Text from '@components/Text';
+import useLocalize from '@hooks/useLocalize';
+import useThemeStyles from '@hooks/useThemeStyles';
+import NetSuiteCustomFieldMappingPicker from '@pages/workspace/accounting/netsuite/import/NetSuiteImportCustomFieldNew/NetSuiteCustomFieldMappingPicker';
+import type {CustomFieldSubStepWithPolicy} from '@pages/workspace/accounting/netsuite/types';
+import CONST from '@src/CONST';
+import type {TranslationPaths} from '@src/languages/types';
+import INPUT_IDS from '@src/types/form/NetSuiteCustomFieldForm';
+
+function MappingStep({importCustomField, customSegmentType}: CustomFieldSubStepWithPolicy) {
+    const styles = useThemeStyles();
+    const {translate} = useLocalize();
+
+    let titleKey;
+    if (importCustomField === CONST.NETSUITE_CONFIG.IMPORT_CUSTOM_FIELDS.CUSTOM_LISTS) {
+        titleKey = 'workspace.netsuite.import.importCustomFields.customLists.addForm.mappingTitle';
+    } else {
+        const customSegmentRecordType = customSegmentType ?? CONST.NETSUITE_CUSTOM_RECORD_TYPES.CUSTOM_SEGMENT;
+        titleKey = `workspace.netsuite.import.importCustomFields.customSegments.addForm.${customSegmentRecordType}MappingTitle`;
+    }
+
+    return (
+        <>
+            <Text style={[styles.ph5, styles.textHeadlineLineHeightXXL, styles.mb3]}>{translate(titleKey as TranslationPaths)}</Text>
+            <Text style={[styles.ph5, styles.mb3]}>{translate(`workspace.netsuite.import.importCustomFields.chooseOptionBelow`)}</Text>
+            <InputWrapper
+                InputComponent={NetSuiteCustomFieldMappingPicker}
+                inputID={INPUT_IDS.MAPPING}
+            />
+        </>
+    );
+}
+
+MappingStep.displayName = 'MappingStep';
+export default MappingStep;
diff --git a/src/pages/workspace/accounting/netsuite/import/NetSuiteImportCustomFieldNew/substeps/TransactionFieldIDStep.tsx b/src/pages/workspace/accounting/netsuite/import/NetSuiteImportCustomFieldNew/substeps/TransactionFieldIDStep.tsx
new file mode 100644
index 000000000000..08c0ce4127d2
--- /dev/null
+++ b/src/pages/workspace/accounting/netsuite/import/NetSuiteImportCustomFieldNew/substeps/TransactionFieldIDStep.tsx
@@ -0,0 +1,41 @@
+import React from 'react';
+import {View} from 'react-native';
+import InputWrapper from '@components/Form/InputWrapper';
+import RenderHTML from '@components/RenderHTML';
+import Text from '@components/Text';
+import TextInput from '@components/TextInput';
+import useAutoFocusInput from '@hooks/useAutoFocusInput';
+import useLocalize from '@hooks/useLocalize';
+import useThemeStyles from '@hooks/useThemeStyles';
+import Parser from '@libs/Parser';
+import CONST from '@src/CONST';
+import INPUT_IDS from '@src/types/form/NetSuiteCustomFieldForm';
+
+function TransactionFieldIDStep() {
+    const styles = useThemeStyles();
+    const {translate} = useLocalize();
+    const {inputCallbackRef} = useAutoFocusInput();
+
+    const fieldLabel = translate(`workspace.netsuite.import.importCustomFields.customLists.fields.transactionFieldID`);
+
+    return (
+        <View style={styles.ph5}>
+            <Text style={[styles.mb3, styles.textHeadlineLineHeightXXL]}>{translate(`workspace.netsuite.import.importCustomFields.customLists.addForm.transactionFieldIDTitle`)}</Text>
+            <InputWrapper
+                InputComponent={TextInput}
+                inputID={INPUT_IDS.TRANSACTION_FIELD_ID}
+                label={fieldLabel}
+                aria-label={fieldLabel}
+                role={CONST.ROLE.PRESENTATION}
+                spellCheck={false}
+                ref={inputCallbackRef}
+            />
+            <View style={[styles.flex1, styles.mv3, styles.renderHTML, styles.textDecorationSkipInkNone]}>
+                <RenderHTML html={`<comment>${Parser.replace(translate(`workspace.netsuite.import.importCustomFields.customLists.addForm.transactionFieldIDFooter`))}</comment>`} />
+            </View>
+        </View>
+    );
+}
+
+TransactionFieldIDStep.displayName = 'TransactionFieldIDStep';
+export default TransactionFieldIDStep;
diff --git a/src/pages/workspace/accounting/netsuite/import/NetSuiteImportCustomFieldPage.tsx b/src/pages/workspace/accounting/netsuite/import/NetSuiteImportCustomFieldPage.tsx
new file mode 100644
index 000000000000..0a749b01399f
--- /dev/null
+++ b/src/pages/workspace/accounting/netsuite/import/NetSuiteImportCustomFieldPage.tsx
@@ -0,0 +1,164 @@
+import React, {useMemo} from 'react';
+import type {StyleProp, TextStyle} from 'react-native';
+import {View} from 'react-native';
+import type {ValueOf} from 'type-fest';
+import Button from '@components/Button';
+import ConnectionLayout from '@components/ConnectionLayout';
+import FixedFooter from '@components/FixedFooter';
+import * as Illustrations from '@components/Icon/Illustrations';
+import type {LocaleContextProps} from '@components/LocaleContextProvider';
+import MenuItemWithTopDescription from '@components/MenuItemWithTopDescription';
+import OfflineWithFeedback from '@components/OfflineWithFeedback';
+import Text from '@components/Text';
+import TextLink from '@components/TextLink';
+import WorkspaceEmptyStateSection from '@components/WorkspaceEmptyStateSection';
+import useLocalize from '@hooks/useLocalize';
+import useThemeStyles from '@hooks/useThemeStyles';
+import * as ErrorUtils from '@libs/ErrorUtils';
+import Navigation from '@libs/Navigation/Navigation';
+import withPolicyConnections from '@pages/workspace/withPolicyConnections';
+import type {WithPolicyConnectionsProps} from '@pages/workspace/withPolicyConnections';
+import type {ThemeStyles} from '@styles/index';
+import * as Policy from '@userActions/Policy/Policy';
+import CONST from '@src/CONST';
+import ROUTES from '@src/ROUTES';
+
+type ImportCustomFieldsKeys = ValueOf<typeof CONST.NETSUITE_CONFIG.IMPORT_CUSTOM_FIELDS>;
+
+type NetSuiteImportCustomFieldPageProps = WithPolicyConnectionsProps & {
+    route: {
+        params: {
+            /** Whether the record is of type custom segment or list */
+            importCustomField: ImportCustomFieldsKeys;
+        };
+    };
+};
+
+type HelpLinkComponentProps = {
+    /** Whether the record is of type custom segment or list */
+    importCustomField: ImportCustomFieldsKeys;
+
+    /** Callback to localize content */
+    translate: LocaleContextProps['translate'];
+
+    /** Theme styles to apply to the component */
+    styles: ThemeStyles;
+
+    /** Text alignment style for the Text component   */
+    alignmentStyle: StyleProp<TextStyle>;
+};
+
+function HelpLinkComponent({importCustomField, styles, translate, alignmentStyle}: HelpLinkComponentProps) {
+    return (
+        <Text style={[styles.mb3, styles.flex1, alignmentStyle]}>
+            <TextLink
+                href={translate(`workspace.netsuite.import.importCustomFields.${importCustomField}.helpLink`)}
+                style={[styles.link, alignmentStyle]}
+            >
+                {translate(`workspace.netsuite.import.importCustomFields.${importCustomField}.helpLinkText`)}
+            </TextLink>
+            {translate(`workspace.netsuite.import.importCustomFields.${importCustomField}.helpText`)}
+        </Text>
+    );
+}
+
+function NetSuiteImportCustomFieldPage({
+    policy,
+    route: {
+        params: {importCustomField},
+    },
+}: NetSuiteImportCustomFieldPageProps) {
+    const policyID = policy?.id ?? '-1';
+    const styles = useThemeStyles();
+    const {translate} = useLocalize();
+
+    const config = policy?.connections?.netsuite?.options?.config;
+    const data = config?.syncOptions?.[importCustomField] ?? [];
+
+    const listEmptyComponent = useMemo(
+        () => (
+            <WorkspaceEmptyStateSection
+                shouldStyleAsCard={false}
+                title={translate(`workspace.netsuite.import.importCustomFields.${importCustomField}.emptyTitle`)}
+                icon={Illustrations.FolderWithPapers}
+                subtitleComponent={
+                    <HelpLinkComponent
+                        importCustomField={importCustomField}
+                        styles={styles}
+                        translate={translate}
+                        alignmentStyle={styles.textAlignCenter}
+                    />
+                }
+                containerStyle={[styles.flex1, styles.justifyContentCenter]}
+            />
+        ),
+        [importCustomField, styles, translate],
+    );
+
+    const listHeaderComponent = useMemo(
+        () => (
+            <View style={[styles.ph5, styles.flexRow]}>
+                <HelpLinkComponent
+                    importCustomField={importCustomField}
+                    styles={styles}
+                    translate={translate}
+                    alignmentStyle={styles.textAlignLeft}
+                />
+            </View>
+        ),
+        [styles, importCustomField, translate],
+    );
+
+    return (
+        <ConnectionLayout
+            displayName={NetSuiteImportCustomFieldPage.displayName}
+            headerTitle={`workspace.netsuite.import.importCustomFields.${importCustomField}.title`}
+            accessVariants={[CONST.POLICY.ACCESS_VARIANTS.ADMIN, CONST.POLICY.ACCESS_VARIANTS.CONTROL]}
+            policyID={policyID}
+            featureName={CONST.POLICY.MORE_FEATURES.ARE_CONNECTIONS_ENABLED}
+            contentContainerStyle={[styles.flex1]}
+            titleStyle={styles.ph5}
+            connectionName={CONST.POLICY.CONNECTIONS.NAME.NETSUITE}
+            shouldIncludeSafeAreaPaddingBottom
+            onBackButtonPress={() => Navigation.goBack(ROUTES.POLICY_ACCOUNTING_NETSUITE_IMPORT.getRoute(policyID))}
+        >
+            {data.length === 0 ? listEmptyComponent : listHeaderComponent}
+            <OfflineWithFeedback
+                errors={ErrorUtils.getLatestErrorField(config ?? {}, importCustomField)}
+                errorRowStyles={[styles.ph5]}
+                pendingAction={config?.syncOptions?.pendingFields?.[importCustomField]}
+                onClose={() => Policy.clearNetSuiteErrorField(policyID, importCustomField)}
+            >
+                {data.map((record, index) => (
+                    <MenuItemWithTopDescription
+                        // eslint-disable-next-line react/no-array-index-key
+                        key={`${record.internalID}-${index}`}
+                        description={translate(`workspace.netsuite.import.importCustomFields.${importCustomField}.recordTitle`)}
+                        shouldShowRightIcon
+                        title={'listName' in record ? record.listName : record.segmentName}
+                        onPress={() => Navigation.navigate(ROUTES.POLICY_ACCOUNTING_NETSUITE_IMPORT_CUSTOM_FIELD_VIEW.getRoute(policyID, importCustomField, index))}
+                    />
+                ))}
+            </OfflineWithFeedback>
+
+            <FixedFooter style={[styles.mtAuto, styles.pt3]}>
+                <Button
+                    success
+                    large
+                    isDisabled={!!config?.syncOptions?.pendingFields?.[importCustomField]}
+                    onPress={() => {
+                        if (importCustomField === CONST.NETSUITE_CONFIG.IMPORT_CUSTOM_FIELDS.CUSTOM_SEGMENTS) {
+                            Navigation.navigate(ROUTES.POLICY_ACCOUNTING_NETSUITE_IMPORT_CUSTOM_SEGMENT_ADD.getRoute(policyID));
+                        } else {
+                            Navigation.navigate(ROUTES.POLICY_ACCOUNTING_NETSUITE_IMPORT_CUSTOM_LIST_ADD.getRoute(policyID));
+                        }
+                    }}
+                    text={translate(`workspace.netsuite.import.importCustomFields.${importCustomField}.addText`)}
+                />
+            </FixedFooter>
+        </ConnectionLayout>
+    );
+}
+
+NetSuiteImportCustomFieldPage.displayName = 'NetSuiteImportCustomFieldPage';
+export default withPolicyConnections(NetSuiteImportCustomFieldPage);
diff --git a/src/pages/workspace/accounting/netsuite/import/NetSuiteImportCustomFieldView.tsx b/src/pages/workspace/accounting/netsuite/import/NetSuiteImportCustomFieldView.tsx
new file mode 100644
index 000000000000..fc1caa20f1f2
--- /dev/null
+++ b/src/pages/workspace/accounting/netsuite/import/NetSuiteImportCustomFieldView.tsx
@@ -0,0 +1,137 @@
+import React, {useCallback, useMemo, useState} from 'react';
+import type {ValueOf} from 'type-fest';
+import ConfirmModal from '@components/ConfirmModal';
+import ConnectionLayout from '@components/ConnectionLayout';
+import * as Expensicons from '@components/Icon/Expensicons';
+import MenuItem from '@components/MenuItem';
+import MenuItemWithTopDescription from '@components/MenuItemWithTopDescription';
+import OfflineWithFeedback from '@components/OfflineWithFeedback';
+import useLocalize from '@hooks/useLocalize';
+import useThemeStyles from '@hooks/useThemeStyles';
+import {updateNetSuiteCustomLists, updateNetSuiteCustomSegments} from '@libs/actions/connections/NetSuiteCommands';
+import * as ErrorUtils from '@libs/ErrorUtils';
+import Navigation from '@libs/Navigation/Navigation';
+import * as PolicyUtils from '@libs/PolicyUtils';
+import withPolicyConnections from '@pages/workspace/withPolicyConnections';
+import type {WithPolicyConnectionsProps} from '@pages/workspace/withPolicyConnections';
+import * as Policy from '@userActions/Policy/Policy';
+import CONST from '@src/CONST';
+import type {TranslationPaths} from '@src/languages/types';
+import ROUTES from '@src/ROUTES';
+import INPUT_IDS from '@src/types/form/NetSuiteCustomFieldForm';
+import type {NetSuiteCustomList, NetSuiteCustomSegment} from '@src/types/onyx/Policy';
+
+type CustomField = NetSuiteCustomList | NetSuiteCustomSegment;
+type ImportCustomFieldsKeys = ValueOf<typeof CONST.NETSUITE_CONFIG.IMPORT_CUSTOM_FIELDS>;
+
+type NetSuiteImportCustomFieldViewProps = WithPolicyConnectionsProps & {
+    route: {
+        params: {
+            /** Whether the record is of type custom segment or list */
+            importCustomField: ImportCustomFieldsKeys;
+
+            /** Index of the current record */
+            valueIndex: number;
+        };
+    };
+};
+
+function NetSuiteImportCustomFieldView({
+    policy,
+    route: {
+        params: {importCustomField, valueIndex},
+    },
+}: NetSuiteImportCustomFieldViewProps) {
+    const policyID = policy?.id ?? '-1';
+    const styles = useThemeStyles();
+    const {translate} = useLocalize();
+    const [isRemoveModalOpen, setIsRemoveModalOpen] = useState<boolean>(false);
+
+    const config = policy?.connections?.netsuite?.options?.config;
+    const allRecords = useMemo(() => config?.syncOptions?.[importCustomField] ?? [], [config?.syncOptions, importCustomField]);
+
+    const customField: CustomField | undefined = allRecords[valueIndex];
+    const fieldList =
+        customField && PolicyUtils.isNetSuiteCustomSegmentRecord(customField)
+            ? CONST.NETSUITE_CONFIG.CUSTOM_SEGMENT_FIELDS
+            : [INPUT_IDS.LIST_NAME, INPUT_IDS.TRANSACTION_FIELD_ID, INPUT_IDS.MAPPING];
+
+    const removeRecord = useCallback(() => {
+        if (customField) {
+            // We allow multiple custom list records with the same internalID. Hence it is safe to remove by index.
+            const filteredRecords = allRecords.filter((_, index) => index !== Number(valueIndex));
+
+            if (PolicyUtils.isNetSuiteCustomSegmentRecord(customField)) {
+                updateNetSuiteCustomSegments(policyID, filteredRecords as NetSuiteCustomSegment[], allRecords as NetSuiteCustomSegment[]);
+            } else {
+                updateNetSuiteCustomLists(policyID, filteredRecords as NetSuiteCustomList[], allRecords as NetSuiteCustomList[]);
+            }
+        }
+        Navigation.navigate(ROUTES.POLICY_ACCOUNTING_NETSUITE_IMPORT_CUSTOM_FIELD_MAPPING.getRoute(policyID, importCustomField));
+    }, [allRecords, customField, importCustomField, policyID, valueIndex]);
+
+    return (
+        <ConnectionLayout
+            displayName={NetSuiteImportCustomFieldView.displayName}
+            headerTitleAlreadyTranslated={customField ? PolicyUtils.getNameFromNetSuiteCustomField(customField) : ''}
+            accessVariants={[CONST.POLICY.ACCESS_VARIANTS.ADMIN, CONST.POLICY.ACCESS_VARIANTS.CONTROL]}
+            policyID={policyID}
+            featureName={CONST.POLICY.MORE_FEATURES.ARE_CONNECTIONS_ENABLED}
+            contentContainerStyle={[styles.pb2, styles.flex1]}
+            titleStyle={styles.ph5}
+            connectionName={CONST.POLICY.CONNECTIONS.NAME.NETSUITE}
+            shouldBeBlocked={!customField}
+            onBackButtonPress={() => Navigation.goBack(ROUTES.POLICY_ACCOUNTING_NETSUITE_IMPORT_CUSTOM_FIELD_MAPPING.getRoute(policyID, importCustomField))}
+        >
+            {customField && (
+                <OfflineWithFeedback
+                    errors={ErrorUtils.getLatestErrorField(config ?? {}, importCustomField)}
+                    errorRowStyles={[styles.ph5]}
+                    pendingAction={config?.syncOptions?.pendingFields?.[importCustomField]}
+                    onClose={() => Policy.clearNetSuiteErrorField(policyID, importCustomField)}
+                >
+                    {fieldList.map((fieldName) => {
+                        const isEditable = !config?.syncOptions?.pendingFields?.[importCustomField] && PolicyUtils.isNetSuiteCustomFieldPropertyEditable(customField, fieldName);
+                        return (
+                            <MenuItemWithTopDescription
+                                key={fieldName}
+                                description={translate(`workspace.netsuite.import.importCustomFields.${importCustomField}.fields.${fieldName}` as TranslationPaths)}
+                                shouldShowRightIcon={isEditable}
+                                title={
+                                    fieldName === 'mapping'
+                                        ? translate(`workspace.netsuite.import.importTypes.${customField[fieldName as keyof CustomField].toUpperCase()}.label` as TranslationPaths)
+                                        : customField[fieldName as keyof CustomField]
+                                }
+                                onPress={
+                                    isEditable
+                                        ? () => Navigation.navigate(ROUTES.POLICY_ACCOUNTING_NETSUITE_IMPORT_CUSTOM_FIELD_EDIT.getRoute(policyID, importCustomField, valueIndex, fieldName))
+                                        : undefined
+                                }
+                            />
+                        );
+                    })}
+                    <MenuItem
+                        icon={Expensicons.Trashcan}
+                        title={translate('common.remove')}
+                        disabled={!!config?.syncOptions?.pendingFields?.[importCustomField]}
+                        onPress={() => setIsRemoveModalOpen(true)}
+                    />
+                </OfflineWithFeedback>
+            )}
+
+            <ConfirmModal
+                title={translate(`workspace.netsuite.import.importCustomFields.${importCustomField}.removeTitle`)}
+                isVisible={isRemoveModalOpen}
+                onConfirm={removeRecord}
+                onCancel={() => setIsRemoveModalOpen(false)}
+                prompt={translate(`workspace.netsuite.import.importCustomFields.${importCustomField}.removePrompt`)}
+                confirmText={translate('common.remove')}
+                cancelText={translate('common.cancel')}
+                danger
+            />
+        </ConnectionLayout>
+    );
+}
+
+NetSuiteImportCustomFieldView.displayName = 'NetSuiteImportCustomFieldView';
+export default withPolicyConnections(NetSuiteImportCustomFieldView);
diff --git a/src/pages/workspace/accounting/netsuite/import/NetSuiteImportCustomersOrProjectSelectPage.tsx b/src/pages/workspace/accounting/netsuite/import/NetSuiteImportCustomersOrProjectSelectPage.tsx
new file mode 100644
index 000000000000..dba0c516cf4a
--- /dev/null
+++ b/src/pages/workspace/accounting/netsuite/import/NetSuiteImportCustomersOrProjectSelectPage.tsx
@@ -0,0 +1,78 @@
+import React, {useCallback} from 'react';
+import RadioListItem from '@components/SelectionList/RadioListItem';
+import type {SelectorType} from '@components/SelectionScreen';
+import SelectionScreen from '@components/SelectionScreen';
+import useLocalize from '@hooks/useLocalize';
+import {updateNetSuiteCustomersJobsMapping} from '@libs/actions/connections/NetSuiteCommands';
+import Navigation from '@libs/Navigation/Navigation';
+import withPolicyConnections from '@pages/workspace/withPolicyConnections';
+import type {WithPolicyConnectionsProps} from '@pages/workspace/withPolicyConnections';
+import CONST from '@src/CONST';
+import ROUTES from '@src/ROUTES';
+import type {NetSuiteMappingValues} from '@src/types/onyx/Policy';
+
+type ImportListItem = SelectorType & {
+    value: NetSuiteMappingValues;
+};
+
+function NetSuiteImportCustomersOrProjectSelectPage({policy}: WithPolicyConnectionsProps) {
+    const policyID = policy?.id ?? '-1';
+    const {translate} = useLocalize();
+
+    const netsuiteConfig = policy?.connections?.netsuite?.options?.config;
+    const importMappings = netsuiteConfig?.syncOptions?.mapping;
+
+    const importCustomer = importMappings?.customers ?? CONST.INTEGRATION_ENTITY_MAP_TYPES.NETSUITE_DEFAULT;
+    const importJobs = importMappings?.jobs ?? CONST.INTEGRATION_ENTITY_MAP_TYPES.NETSUITE_DEFAULT;
+    const importedValue = importMappings?.customers !== CONST.INTEGRATION_ENTITY_MAP_TYPES.NETSUITE_DEFAULT ? importCustomer : importJobs;
+
+    const inputOptions = [CONST.INTEGRATION_ENTITY_MAP_TYPES.TAG, CONST.INTEGRATION_ENTITY_MAP_TYPES.REPORT_FIELD];
+
+    const inputSectionData: ImportListItem[] = inputOptions.map((inputOption) => ({
+        text: translate(`workspace.netsuite.import.importTypes.${inputOption}.label`),
+        keyForList: inputOption,
+        isSelected: importedValue === inputOption,
+        value: inputOption,
+        alternateText: translate(`workspace.netsuite.import.importTypes.${inputOption}.description`),
+    }));
+
+    const updateImportMapping = useCallback(
+        ({value}: ImportListItem) => {
+            if (value !== importedValue) {
+                updateNetSuiteCustomersJobsMapping(
+                    policyID,
+                    {
+                        customersMapping: importCustomer !== CONST.INTEGRATION_ENTITY_MAP_TYPES.NETSUITE_DEFAULT ? value : CONST.INTEGRATION_ENTITY_MAP_TYPES.NETSUITE_DEFAULT,
+                        jobsMapping: importJobs !== CONST.INTEGRATION_ENTITY_MAP_TYPES.NETSUITE_DEFAULT ? value : CONST.INTEGRATION_ENTITY_MAP_TYPES.NETSUITE_DEFAULT,
+                    },
+                    {
+                        customersMapping: importMappings?.customers,
+                        jobsMapping: importMappings?.jobs,
+                    },
+                );
+            }
+            Navigation.goBack(ROUTES.POLICY_ACCOUNTING_NETSUITE_IMPORT_CUSTOMERS_OR_PROJECTS.getRoute(policyID));
+        },
+        [importCustomer, importJobs, importMappings?.customers, importMappings?.jobs, importedValue, policyID],
+    );
+
+    return (
+        <SelectionScreen
+            policyID={policyID}
+            accessVariants={[CONST.POLICY.ACCESS_VARIANTS.ADMIN, CONST.POLICY.ACCESS_VARIANTS.CONTROL]}
+            featureName={CONST.POLICY.MORE_FEATURES.ARE_CONNECTIONS_ENABLED}
+            displayName={NetSuiteImportCustomersOrProjectSelectPage.displayName}
+            sections={[{data: inputSectionData}]}
+            listItem={RadioListItem}
+            connectionName={CONST.POLICY.CONNECTIONS.NAME.NETSUITE}
+            onSelectRow={(selection: SelectorType) => updateImportMapping(selection as ImportListItem)}
+            initiallyFocusedOptionKey={inputSectionData.find((inputOption) => inputOption.isSelected)?.keyForList}
+            onBackButtonPress={() => Navigation.goBack(ROUTES.POLICY_ACCOUNTING_NETSUITE_IMPORT_CUSTOMERS_OR_PROJECTS.getRoute(policyID))}
+            title="workspace.common.displayedAs"
+        />
+    );
+}
+
+NetSuiteImportCustomersOrProjectSelectPage.displayName = 'NetSuiteImportCustomersOrProjectSelectPage';
+
+export default withPolicyConnections(NetSuiteImportCustomersOrProjectSelectPage);
diff --git a/src/pages/workspace/accounting/netsuite/import/NetSuiteImportCustomersOrProjectsPage.tsx b/src/pages/workspace/accounting/netsuite/import/NetSuiteImportCustomersOrProjectsPage.tsx
new file mode 100644
index 000000000000..4e23da326d92
--- /dev/null
+++ b/src/pages/workspace/accounting/netsuite/import/NetSuiteImportCustomersOrProjectsPage.tsx
@@ -0,0 +1,143 @@
+import React, {useCallback} from 'react';
+import {View} from 'react-native';
+import ConnectionLayout from '@components/ConnectionLayout';
+import MenuItemWithTopDescription from '@components/MenuItemWithTopDescription';
+import OfflineWithFeedback from '@components/OfflineWithFeedback';
+import RenderHTML from '@components/RenderHTML';
+import useLocalize from '@hooks/useLocalize';
+import useThemeStyles from '@hooks/useThemeStyles';
+import {updateNetSuiteCrossSubsidiaryCustomersConfiguration, updateNetSuiteImportMapping} from '@libs/actions/connections/NetSuiteCommands';
+import * as ErrorUtils from '@libs/ErrorUtils';
+import Navigation from '@libs/Navigation/Navigation';
+import Parser from '@libs/Parser';
+import withPolicyConnections from '@pages/workspace/withPolicyConnections';
+import type {WithPolicyConnectionsProps} from '@pages/workspace/withPolicyConnections';
+import ToggleSettingOptionRow from '@pages/workspace/workflows/ToggleSettingsOptionRow';
+import * as Policy from '@userActions/Policy/Policy';
+import CONST from '@src/CONST';
+import type {TranslationPaths} from '@src/languages/types';
+import ROUTES from '@src/ROUTES';
+
+type ImportField = 'jobs' | 'customers';
+
+function NetSuiteImportCustomersOrProjectsPage({policy}: WithPolicyConnectionsProps) {
+    const policyID = policy?.id ?? '-1';
+    const styles = useThemeStyles();
+    const {translate} = useLocalize();
+
+    const config = policy?.connections?.netsuite?.options?.config;
+    const importMappings = config?.syncOptions?.mapping;
+    const importCustomer = importMappings?.customers ?? CONST.INTEGRATION_ENTITY_MAP_TYPES.NETSUITE_DEFAULT;
+    const importJobs = importMappings?.jobs ?? CONST.INTEGRATION_ENTITY_MAP_TYPES.NETSUITE_DEFAULT;
+    const importedValue = importMappings?.customers !== CONST.INTEGRATION_ENTITY_MAP_TYPES.NETSUITE_DEFAULT ? importCustomer : importJobs;
+
+    const updateMapping = useCallback(
+        (importField: ImportField, isEnabled: boolean) => {
+            let newValue;
+            if (!isEnabled) {
+                // if the import is off, then we send default as the value for mapping
+                newValue = CONST.INTEGRATION_ENTITY_MAP_TYPES.NETSUITE_DEFAULT;
+            } else {
+                // when we enable any field, and if the other one already has a value set, we should set that,
+                const otherFieldValue =
+                    importField === CONST.NETSUITE_CONFIG.SYNC_OPTIONS.CUSTOMER_MAPPINGS.JOBS ? config?.syncOptions?.mapping?.customers : config?.syncOptions?.mapping?.jobs;
+                if (otherFieldValue === CONST.INTEGRATION_ENTITY_MAP_TYPES.NETSUITE_DEFAULT) {
+                    newValue = CONST.INTEGRATION_ENTITY_MAP_TYPES.TAG;
+                } else {
+                    // else fallback to Tag
+                    newValue = otherFieldValue;
+                }
+            }
+            if (newValue) {
+                updateNetSuiteImportMapping(policyID, importField, newValue, config?.syncOptions?.mapping?.[importField]);
+            }
+        },
+        [config?.syncOptions?.mapping, policyID],
+    );
+
+    return (
+        <ConnectionLayout
+            displayName={NetSuiteImportCustomersOrProjectsPage.displayName}
+            headerTitle="workspace.netsuite.import.customersOrJobs.title"
+            accessVariants={[CONST.POLICY.ACCESS_VARIANTS.ADMIN, CONST.POLICY.ACCESS_VARIANTS.CONTROL]}
+            policyID={policyID}
+            featureName={CONST.POLICY.MORE_FEATURES.ARE_CONNECTIONS_ENABLED}
+            contentContainerStyle={styles.pb2}
+            titleStyle={styles.ph5}
+            connectionName={CONST.POLICY.CONNECTIONS.NAME.NETSUITE}
+            onBackButtonPress={() => Navigation.goBack(ROUTES.POLICY_ACCOUNTING_NETSUITE_IMPORT.getRoute(policyID))}
+        >
+            <View style={[styles.ph5, styles.flexRow, styles.pb5]}>
+                <RenderHTML html={`<comment>${Parser.replace(translate(`workspace.netsuite.import.customersOrJobs.subtitle` as TranslationPaths))}</comment>`} />
+            </View>
+
+            <ToggleSettingOptionRow
+                wrapperStyle={[styles.mv3, styles.ph5]}
+                title={translate('workspace.netsuite.import.customersOrJobs.importCustomers')}
+                isActive={(config?.syncOptions?.mapping?.customers ?? CONST.INTEGRATION_ENTITY_MAP_TYPES.NETSUITE_DEFAULT) !== CONST.INTEGRATION_ENTITY_MAP_TYPES.NETSUITE_DEFAULT}
+                switchAccessibilityLabel={translate('workspace.netsuite.import.customersOrJobs.importCustomers')}
+                onToggle={(isEnabled: boolean) => {
+                    updateMapping(CONST.NETSUITE_CONFIG.SYNC_OPTIONS.CUSTOMER_MAPPINGS.CUSTOMERS, isEnabled);
+                }}
+                pendingAction={config?.syncOptions?.mapping?.pendingFields?.customers}
+                errors={ErrorUtils.getLatestErrorField(config ?? {}, CONST.NETSUITE_CONFIG.SYNC_OPTIONS.CUSTOMER_MAPPINGS.CUSTOMERS)}
+                onCloseError={() => Policy.clearNetSuiteErrorField(policyID, CONST.NETSUITE_CONFIG.SYNC_OPTIONS.CUSTOMER_MAPPINGS.CUSTOMERS)}
+            />
+            <ToggleSettingOptionRow
+                wrapperStyle={[styles.mv3, styles.ph5]}
+                title={translate('workspace.netsuite.import.customersOrJobs.importJobs')}
+                isActive={(config?.syncOptions?.mapping?.jobs ?? CONST.INTEGRATION_ENTITY_MAP_TYPES.NETSUITE_DEFAULT) !== CONST.INTEGRATION_ENTITY_MAP_TYPES.NETSUITE_DEFAULT}
+                switchAccessibilityLabel={translate('workspace.netsuite.import.customersOrJobs.importJobs')}
+                onToggle={(isEnabled: boolean) => {
+                    updateMapping(CONST.NETSUITE_CONFIG.SYNC_OPTIONS.CUSTOMER_MAPPINGS.JOBS, isEnabled);
+                }}
+                pendingAction={config?.syncOptions?.mapping?.pendingFields?.jobs}
+                errors={ErrorUtils.getLatestErrorField(config ?? {}, CONST.NETSUITE_CONFIG.SYNC_OPTIONS.CUSTOMER_MAPPINGS.JOBS)}
+                onCloseError={() => Policy.clearNetSuiteErrorField(policyID, CONST.NETSUITE_CONFIG.SYNC_OPTIONS.CUSTOMER_MAPPINGS.JOBS)}
+            />
+            {importedValue !== CONST.INTEGRATION_ENTITY_MAP_TYPES.NETSUITE_DEFAULT && (
+                <ToggleSettingOptionRow
+                    wrapperStyle={[styles.mv3, styles.ph5]}
+                    title={translate('workspace.netsuite.import.crossSubsidiaryCustomers')}
+                    isActive={config?.syncOptions?.crossSubsidiaryCustomers ?? false}
+                    switchAccessibilityLabel={translate('workspace.netsuite.import.crossSubsidiaryCustomers')}
+                    onToggle={(isEnabled: boolean) => {
+                        updateNetSuiteCrossSubsidiaryCustomersConfiguration(policyID, isEnabled);
+                    }}
+                    pendingAction={config?.syncOptions?.pendingFields?.crossSubsidiaryCustomers}
+                    errors={ErrorUtils.getLatestErrorField(config ?? {}, CONST.NETSUITE_CONFIG.SYNC_OPTIONS.CROSS_SUBSIDIARY_CUSTOMERS)}
+                    onCloseError={() => Policy.clearNetSuiteErrorField(policyID, CONST.NETSUITE_CONFIG.SYNC_OPTIONS.CROSS_SUBSIDIARY_CUSTOMERS)}
+                />
+            )}
+
+            {importedValue !== CONST.INTEGRATION_ENTITY_MAP_TYPES.NETSUITE_DEFAULT && (
+                <OfflineWithFeedback
+                    errors={
+                        ErrorUtils.getLatestErrorField(config ?? {}, CONST.NETSUITE_CONFIG.SYNC_OPTIONS.CUSTOMER_MAPPINGS.CUSTOMERS) ??
+                        ErrorUtils.getLatestErrorField(config ?? {}, CONST.NETSUITE_CONFIG.SYNC_OPTIONS.CUSTOMER_MAPPINGS.JOBS)
+                    }
+                    errorRowStyles={[styles.ph5]}
+                    pendingAction={config?.syncOptions?.mapping?.pendingFields?.customers ?? config?.syncOptions?.mapping?.pendingFields?.jobs}
+                    onClose={() => {
+                        Policy.clearNetSuiteErrorField(policyID, CONST.NETSUITE_CONFIG.SYNC_OPTIONS.CUSTOMER_MAPPINGS.CUSTOMERS);
+                        Policy.clearNetSuiteErrorField(policyID, CONST.NETSUITE_CONFIG.SYNC_OPTIONS.CUSTOMER_MAPPINGS.JOBS);
+                    }}
+                >
+                    <MenuItemWithTopDescription
+                        description={translate('workspace.common.displayedAs')}
+                        title={translate(`workspace.netsuite.import.importTypes.${importedValue}.label`)}
+                        shouldShowRightIcon
+                        onPress={() => {
+                            Navigation.navigate(ROUTES.POLICY_ACCOUNTING_NETSUITE_IMPORT_CUSTOMERS_OR_PROJECTS_SELECT.getRoute(policyID));
+                        }}
+                        brickRoadIndicator={!!config?.errorFields?.customers || !!config?.errorFields?.jobs ? CONST.BRICK_ROAD_INDICATOR_STATUS.ERROR : undefined}
+                    />
+                </OfflineWithFeedback>
+            )}
+        </ConnectionLayout>
+    );
+}
+
+NetSuiteImportCustomersOrProjectsPage.displayName = 'NetSuiteImportCustomersOrProjectsPage';
+
+export default withPolicyConnections(NetSuiteImportCustomersOrProjectsPage);
diff --git a/src/pages/workspace/accounting/netsuite/import/NetSuiteImportMappingPage.tsx b/src/pages/workspace/accounting/netsuite/import/NetSuiteImportMappingPage.tsx
new file mode 100644
index 000000000000..073fe63f4c10
--- /dev/null
+++ b/src/pages/workspace/accounting/netsuite/import/NetSuiteImportMappingPage.tsx
@@ -0,0 +1,114 @@
+import React, {useCallback, useMemo} from 'react';
+import {View} from 'react-native';
+import type {TupleToUnion, ValueOf} from 'type-fest';
+import RenderHTML from '@components/RenderHTML';
+import RadioListItem from '@components/SelectionList/RadioListItem';
+import type {SelectorType} from '@components/SelectionScreen';
+import SelectionScreen from '@components/SelectionScreen';
+import Text from '@components/Text';
+import useLocalize from '@hooks/useLocalize';
+import useThemeStyles from '@hooks/useThemeStyles';
+import {updateNetSuiteImportMapping} from '@libs/actions/connections/NetSuiteCommands';
+import Navigation from '@libs/Navigation/Navigation';
+import Parser from '@libs/Parser';
+import withPolicyConnections from '@pages/workspace/withPolicyConnections';
+import type {WithPolicyConnectionsProps} from '@pages/workspace/withPolicyConnections';
+import CONST from '@src/CONST';
+import type {TranslationPaths} from '@src/languages/types';
+import ROUTES from '@src/ROUTES';
+
+type ImportFieldsKeys = TupleToUnion<typeof CONST.NETSUITE_CONFIG.IMPORT_FIELDS>;
+
+type NetSuiteImportMappingPageProps = WithPolicyConnectionsProps & {
+    route: {
+        params: {
+            /** Whether the record is custom segment or custom list */
+            importField: ImportFieldsKeys;
+        };
+    };
+};
+
+type ImportListItem = SelectorType & {
+    value: ValueOf<typeof CONST.INTEGRATION_ENTITY_MAP_TYPES>;
+};
+
+function NetSuiteImportMappingPage({
+    policy,
+    route: {
+        params: {importField},
+    },
+}: NetSuiteImportMappingPageProps) {
+    const policyID = policy?.id ?? '-1';
+    const styles = useThemeStyles();
+    const {translate} = useLocalize();
+
+    const netsuiteConfig = policy?.connections?.netsuite?.options?.config;
+    const importMappings = netsuiteConfig?.syncOptions?.mapping;
+
+    const importValue = importMappings?.[importField] ?? CONST.INTEGRATION_ENTITY_MAP_TYPES.NETSUITE_DEFAULT;
+
+    const listFooterContent = useMemo(
+        () => (
+            <View style={[styles.ph5, styles.mt3, styles.mb4]}>
+                <Text>{translate(`workspace.netsuite.import.importTypes.${importValue}.footerContent`, importField)}</Text>
+            </View>
+        ),
+        [importField, importValue, styles.mb4, styles.mt3, styles.ph5, translate],
+    );
+
+    const listHeaderComponent = useMemo(
+        () => (
+            <View style={[styles.ph5, styles.pb5]}>
+                <View style={[styles.flexRow]}>
+                    <RenderHTML html={`<comment>${Parser.replace(translate(`workspace.netsuite.import.importFields.${importField}.subtitle` as TranslationPaths))}</comment>`} />
+                </View>
+            </View>
+        ),
+        [styles.ph5, styles.pb5, styles.flexRow, translate, importField],
+    );
+
+    const inputOptions = [CONST.INTEGRATION_ENTITY_MAP_TYPES.NETSUITE_DEFAULT, CONST.INTEGRATION_ENTITY_MAP_TYPES.TAG, CONST.INTEGRATION_ENTITY_MAP_TYPES.REPORT_FIELD];
+
+    const inputSectionData: ImportListItem[] = inputOptions.map((inputOption) => ({
+        text: translate(`workspace.netsuite.import.importTypes.${inputOption}.label`),
+        keyForList: inputOption,
+        isSelected: importValue === inputOption,
+        value: inputOption,
+        alternateText: translate(`workspace.netsuite.import.importTypes.${inputOption}.description`),
+    }));
+
+    const titleKey = `workspace.netsuite.import.importFields.${importField}.title` as TranslationPaths;
+
+    const updateImportMapping = useCallback(
+        ({value}: ImportListItem) => {
+            if (value !== importValue) {
+                updateNetSuiteImportMapping(policyID, importField as keyof typeof importMappings, value, importValue);
+            }
+
+            Navigation.goBack(ROUTES.POLICY_ACCOUNTING_NETSUITE_IMPORT.getRoute(policyID));
+        },
+        [importField, importValue, policyID],
+    );
+
+    return (
+        <SelectionScreen
+            policyID={policyID}
+            accessVariants={[CONST.POLICY.ACCESS_VARIANTS.ADMIN, CONST.POLICY.ACCESS_VARIANTS.CONTROL]}
+            featureName={CONST.POLICY.MORE_FEATURES.ARE_CONNECTIONS_ENABLED}
+            displayName={NetSuiteImportMappingPage.displayName}
+            sections={[{data: inputSectionData}]}
+            listItem={RadioListItem}
+            connectionName={CONST.POLICY.CONNECTIONS.NAME.NETSUITE}
+            onSelectRow={(selection: SelectorType) => updateImportMapping(selection as ImportListItem)}
+            initiallyFocusedOptionKey={inputSectionData.find((inputOption) => inputOption.isSelected)?.keyForList}
+            headerContent={listHeaderComponent}
+            onBackButtonPress={() => Navigation.goBack(ROUTES.POLICY_ACCOUNTING_NETSUITE_IMPORT.getRoute(policyID))}
+            title={titleKey}
+            listFooterContent={listFooterContent}
+        />
+    );
+}
+
+NetSuiteImportMappingPage.displayName = 'NetSuiteImportMappingPage';
+
+export default withPolicyConnections(NetSuiteImportMappingPage);
diff --git a/src/pages/workspace/accounting/netsuite/import/NetSuiteImportPage.tsx b/src/pages/workspace/accounting/netsuite/import/NetSuiteImportPage.tsx
new file mode 100644
index 000000000000..c3d77b656b50
--- /dev/null
+++ b/src/pages/workspace/accounting/netsuite/import/NetSuiteImportPage.tsx
@@ -0,0 +1,134 @@
+import React, {useMemo} from 'react';
+import ConnectionLayout from '@components/ConnectionLayout';
+import MenuItemWithTopDescription from '@components/MenuItemWithTopDescription';
+import OfflineWithFeedback from '@components/OfflineWithFeedback';
+import useLocalize from '@hooks/useLocalize';
+import usePermissions from '@hooks/usePermissions';
+import useThemeStyles from '@hooks/useThemeStyles';
+import {updateNetSuiteSyncTaxConfiguration} from '@libs/actions/connections/NetSuiteCommands';
+import * as ErrorUtils from '@libs/ErrorUtils';
+import Navigation from '@libs/Navigation/Navigation';
+import * as PolicyUtils from '@libs/PolicyUtils';
+import {canUseTaxNetSuite} from '@libs/PolicyUtils';
+import withPolicyConnections from '@pages/workspace/withPolicyConnections';
+import type {WithPolicyConnectionsProps} from '@pages/workspace/withPolicyConnections';
+import ToggleSettingOptionRow from '@pages/workspace/workflows/ToggleSettingsOptionRow';
+import * as Policy from '@userActions/Policy/Policy';
+import CONST from '@src/CONST';
+import ROUTES from '@src/ROUTES';
+
+function NetSuiteImportPage({policy}: WithPolicyConnectionsProps) {
+    const {translate} = useLocalize();
+    const styles = useThemeStyles();
+    const {canUseNetSuiteUSATax} = usePermissions();
+
+    const policyID = policy?.id ?? '-1';
+    const config = policy?.connections?.netsuite?.options.config;
+    const {subsidiaryList} = policy?.connections?.netsuite?.options?.data ?? {};
+    const selectedSubsidiary = useMemo(() => (subsidiaryList ?? []).find((subsidiary) => subsidiary.internalID === config?.subsidiaryID), [subsidiaryList, config?.subsidiaryID]);
+
+    return (
+        <ConnectionLayout
+            displayName={NetSuiteImportPage.displayName}
+            headerTitle="workspace.accounting.import"
+            headerSubtitle={config?.subsidiary ?? ''}
+            accessVariants={[CONST.POLICY.ACCESS_VARIANTS.ADMIN, CONST.POLICY.ACCESS_VARIANTS.CONTROL]}
+            policyID={policyID}
+            featureName={CONST.POLICY.MORE_FEATURES.ARE_CONNECTIONS_ENABLED}
+            contentContainerStyle={[styles.pb2]}
+            titleStyle={styles.ph5}
+            connectionName={CONST.POLICY.CONNECTIONS.NAME.NETSUITE}
+        >
+            <ToggleSettingOptionRow
+                wrapperStyle={[styles.mv3, styles.ph5]}
+                title={translate('workspace.netsuite.import.expenseCategories')}
+                subtitle={translate('workspace.netsuite.import.expenseCategoriesDescription')}
+                shouldPlaceSubtitleBelowSwitch
+                isActive
+                disabled
+                switchAccessibilityLabel={translate('workspace.netsuite.import.expenseCategories')}
+                onToggle={() => {}}
+            />
+
+            {CONST.NETSUITE_CONFIG.IMPORT_FIELDS.map((importField) => (
+                <OfflineWithFeedback
+                    key={importField}
+                    errors={ErrorUtils.getLatestErrorField(config ?? {}, importField)}
+                    errorRowStyles={[styles.ph5]}
+                    pendingAction={config?.syncOptions?.mapping?.pendingFields?.[importField]}
+                    onClose={() => Policy.clearNetSuiteErrorField(policyID, importField)}
+                >
+                    <MenuItemWithTopDescription
+                        description={translate(`workspace.netsuite.import.importFields.${importField}.title`)}
+                        title={translate(`workspace.accounting.importTypes.${config?.syncOptions?.mapping?.[importField] ?? CONST.INTEGRATION_ENTITY_MAP_TYPES.NETSUITE_DEFAULT}`)}
+                        shouldShowRightIcon
+                        onPress={() => {
+                            Navigation.navigate(ROUTES.POLICY_ACCOUNTING_NETSUITE_IMPORT_MAPPING.getRoute(policyID, importField));
+                        }}
+                        brickRoadIndicator={config?.errorFields?.[importField] ? CONST.BRICK_ROAD_INDICATOR_STATUS.ERROR : undefined}
+                    />
+                </OfflineWithFeedback>
+            ))}
+
+            <OfflineWithFeedback
+                errors={
+                    ErrorUtils.getLatestErrorField(config ?? {}, CONST.NETSUITE_CONFIG.SYNC_OPTIONS.CUSTOMER_MAPPINGS.CUSTOMERS) ??
+                    ErrorUtils.getLatestErrorField(config ?? {}, CONST.NETSUITE_CONFIG.SYNC_OPTIONS.CUSTOMER_MAPPINGS.JOBS)
+                }
+                errorRowStyles={[styles.ph5]}
+                pendingAction={config?.syncOptions?.mapping?.pendingFields?.customers ?? config?.syncOptions?.mapping?.pendingFields?.jobs}
+                onClose={() => {
+                    Policy.clearNetSuiteErrorField(policyID, CONST.NETSUITE_CONFIG.SYNC_OPTIONS.CUSTOMER_MAPPINGS.CUSTOMERS);
+                    Policy.clearNetSuiteErrorField(policyID, CONST.NETSUITE_CONFIG.SYNC_OPTIONS.CUSTOMER_MAPPINGS.JOBS);
+                }}
+            >
+                <MenuItemWithTopDescription
+                    description={translate(`workspace.netsuite.import.customersOrJobs.title`)}
+                    title={PolicyUtils.getCustomersOrJobsLabelNetSuite(policy, translate)}
+                    shouldShowRightIcon
+                    numberOfLinesTitle={2}
+                    onPress={() => {
+                        Navigation.navigate(ROUTES.POLICY_ACCOUNTING_NETSUITE_IMPORT_CUSTOMERS_OR_PROJECTS.getRoute(policyID));
+                    }}
+                    brickRoadIndicator={!!config?.errorFields?.customers || !!config?.errorFields?.jobs ? CONST.BRICK_ROAD_INDICATOR_STATUS.ERROR : undefined}
+                />
+            </OfflineWithFeedback>
+
+            {canUseTaxNetSuite(canUseNetSuiteUSATax, selectedSubsidiary?.country) && (
+                <ToggleSettingOptionRow
+                    wrapperStyle={[styles.mv3, styles.ph5]}
+                    title={translate('common.tax')}
+                    subtitle={translate('workspace.netsuite.import.importTaxDescription')}
+                    shouldPlaceSubtitleBelowSwitch
+                    isActive={config?.syncOptions?.syncTax ?? false}
+                    switchAccessibilityLabel={translate('common.tax')}
+                    onToggle={(isEnabled: boolean) => {
+                        updateNetSuiteSyncTaxConfiguration(policyID, isEnabled);
+                    }}
+                    pendingAction={config?.syncOptions?.pendingFields?.syncTax}
+                    errors={ErrorUtils.getLatestErrorField(config ?? {}, CONST.NETSUITE_CONFIG.SYNC_OPTIONS.SYNC_TAX)}
+                    onCloseError={() => Policy.clearNetSuiteErrorField(policyID, CONST.NETSUITE_CONFIG.SYNC_OPTIONS.SYNC_TAX)}
+                />
+            )}
+
+            {Object.values(CONST.NETSUITE_CONFIG.IMPORT_CUSTOM_FIELDS).map((importField) => (
+                <OfflineWithFeedback
+                    key={importField}
+                    errors={ErrorUtils.getLatestErrorField(config ?? {}, importField)}
+                    errorRowStyles={[styles.ph5]}
+                    onClose={() => Policy.clearNetSuiteErrorField(policyID, importField)}
+                >
+                    <MenuItemWithTopDescription
+                        description={translate(`workspace.netsuite.import.importCustomFields.${importField}.title`)}
+                        shouldShowRightIcon
+                        onPress={() => Navigation.navigate(ROUTES.POLICY_ACCOUNTING_NETSUITE_IMPORT_CUSTOM_FIELD_MAPPING.getRoute(policyID, importField))}
+                        brickRoadIndicator={config?.errorFields?.[importField] ? CONST.BRICK_ROAD_INDICATOR_STATUS.ERROR : undefined}
+                    />
+                </OfflineWithFeedback>
+            ))}
+        </ConnectionLayout>
+    );
+}
+
+NetSuiteImportPage.displayName = 'NetSuiteImportPage';
+export default withPolicyConnections(NetSuiteImportPage);
diff --git a/src/pages/workspace/accounting/netsuite/types.ts b/src/pages/workspace/accounting/netsuite/types.ts
new file mode 100644
index 000000000000..fa092c856585
--- /dev/null
+++ b/src/pages/workspace/accounting/netsuite/types.ts
@@ -0,0 +1,72 @@
+import type {ValueOf} from 'type-fest';
+import type {MenuItemProps} from '@components/MenuItem';
+import type {OfflineWithFeedbackProps} from '@components/OfflineWithFeedback';
+import type {SelectorType} from '@components/SelectionScreen';
+import type {SubStepProps} from '@hooks/useSubStep/types';
+import type {ToggleSettingOptionRowProps} from '@pages/workspace/workflows/ToggleSettingsOptionRow';
+import type CONST from '@src/CONST';
+import type {Policy} from '@src/types/onyx';
+
+type MenuItem = MenuItemProps & {
+    /** Type of the item */
+    type: 'menuitem';
+
+    /** The type of action that's pending  */
+    pendingAction: OfflineWithFeedbackProps['pendingAction'];
+
+    /** Whether the item should be hidden */
+    shouldHide?: boolean;
+
+    /** Any error message to show */
+    errors: OfflineWithFeedbackProps['errors'];
+
+    /** Callback to close the error messages */
+    onCloseError: OfflineWithFeedbackProps['onClose'];
+};
+
+type DividerLineItem = {
+    /** Type of the item */
+    type: 'divider';
+
+    /** Unique key for the item */
+    key: string;
+
+    /** Whether the item should be hidden */
+    shouldHide?: boolean;
+};
+
+type ToggleItem = ToggleSettingOptionRowProps & {
+    /** Type of the item */
+    type: 'toggle';
+
+    /** Whether the item should be hidden */
+    shouldHide?: boolean;
+};
+
+type ExpenseRouteParams = {
+    expenseType: ValueOf<typeof CONST.NETSUITE_EXPENSE_TYPE>;
+};
+
+type CustomFieldSubStepWithPolicy = SubStepProps & {
+    /** Policy ID of the current policy */
+    policyID: string;
+
+    /** Currenct policy in the form steps */
+    policy: Policy | undefined;
+
+    /** Whether the page is a custom segment or custom list */
+    importCustomField: ValueOf<typeof CONST.NETSUITE_CONFIG.IMPORT_CUSTOM_FIELDS>;
+
+    /** Whether the record is custom segment or custom record  */
+    customSegmentType?: ValueOf<typeof CONST.NETSUITE_CUSTOM_RECORD_TYPES>;
+
+    /** Callback to update the current segment type of the record  */
+    setCustomSegmentType?: (segmentType: ValueOf<typeof CONST.NETSUITE_CUSTOM_RECORD_TYPES>) => void;
+};
+
+type CustomListSelectorType = SelectorType & {
+    /** ID of the list item */
+    id: string;
+};
+
+export type {MenuItem, DividerLineItem, ToggleItem, ExpenseRouteParams, CustomFieldSubStepWithPolicy, CustomListSelectorType};
diff --git a/src/pages/workspace/accounting/qbo/advanced/QuickbooksAccountSelectPage.tsx b/src/pages/workspace/accounting/qbo/advanced/QuickbooksAccountSelectPage.tsx
index 38dc517d57de..bed84acfb7ce 100644
--- a/src/pages/workspace/accounting/qbo/advanced/QuickbooksAccountSelectPage.tsx
+++ b/src/pages/workspace/accounting/qbo/advanced/QuickbooksAccountSelectPage.tsx
@@ -1,6 +1,8 @@
 import React, {useCallback, useMemo} from 'react';
 import {View} from 'react-native';
+import BlockingView from '@components/BlockingViews/BlockingView';
 import HeaderWithBackButton from '@components/HeaderWithBackButton';
+import * as Illustrations from '@components/Icon/Illustrations';
 import ScreenWrapper from '@components/ScreenWrapper';
 import SelectionList from '@components/SelectionList';
 import RadioListItem from '@components/SelectionList/RadioListItem';
@@ -13,6 +15,7 @@ import Navigation from '@libs/Navigation/Navigation';
 import AccessOrNotFoundWrapper from '@pages/workspace/AccessOrNotFoundWrapper';
 import type {WithPolicyConnectionsProps} from '@pages/workspace/withPolicyConnections';
 import withPolicyConnections from '@pages/workspace/withPolicyConnections';
+import variables from '@styles/variables';
 import CONST from '@src/CONST';
 import ROUTES from '@src/ROUTES';
 
@@ -24,7 +27,7 @@ function QuickbooksAccountSelectPage({policy}: WithPolicyConnectionsProps) {
     const styles = useThemeStyles();
     const {translate} = useLocalize();
 
-    const policyID = policy?.id ?? '';
+    const policyID = policy?.id ?? '-1';
     const {bankAccounts, creditCards} = policy?.connections?.quickbooksOnline?.data ?? {};
     const {reimbursementAccountID} = policy?.connections?.quickbooksOnline?.config ?? {};
     const accountOptions = useMemo(() => [...(bankAccounts ?? []), ...(creditCards ?? [])], [bankAccounts, creditCards]);
@@ -42,7 +45,7 @@ function QuickbooksAccountSelectPage({policy}: WithPolicyConnectionsProps) {
     const listHeaderComponent = useMemo(
         () => (
             <View style={[styles.pb2, styles.ph5]}>
-                <Text style={[styles.pb5, styles.textNormal]}>{translate('workspace.qbo.advancedConfig.invoiceAccountSelectDescription')}</Text>
+                <Text style={[styles.pb5, styles.textNormal]}>{translate('workspace.qbo.advancedConfig.accountSelectDescription')}</Text>
             </View>
         ),
         [translate, styles.pb2, styles.ph5, styles.pb5, styles.textNormal],
@@ -58,6 +61,20 @@ function QuickbooksAccountSelectPage({policy}: WithPolicyConnectionsProps) {
         [policyID],
     );
 
+    const listEmptyContent = useMemo(
+        () => (
+            <BlockingView
+                icon={Illustrations.TeleScope}
+                iconWidth={variables.emptyListIconWidth}
+                iconHeight={variables.emptyListIconHeight}
+                title={translate('workspace.qbo.noAccountsFound')}
+                subtitle={translate('workspace.qbo.noAccountsFoundDescription')}
+                containerStyle={styles.pb10}
+            />
+        ),
+        [translate, styles.pb10],
+    );
+
     return (
         <AccessOrNotFoundWrapper
             accessVariants={[CONST.POLICY.ACCESS_VARIANTS.ADMIN, CONST.POLICY.ACCESS_VARIANTS.PAID]}
@@ -71,11 +88,13 @@ function QuickbooksAccountSelectPage({policy}: WithPolicyConnectionsProps) {
                 <HeaderWithBackButton title={translate('workspace.qbo.advancedConfig.qboBillPaymentAccount')} />
 
                 <SelectionList
-                    sections={[{data: qboOnlineSelectorOptions}]}
+                    sections={qboOnlineSelectorOptions.length ? [{data: qboOnlineSelectorOptions}] : []}
                     ListItem={RadioListItem}
                     headerContent={listHeaderComponent}
                     onSelectRow={saveSelection}
+                    shouldSingleExecuteRowSelect
                     initiallyFocusedOptionKey={initiallyFocusedOptionKey}
+                    listEmptyContent={listEmptyContent}
                 />
             </ScreenWrapper>
         </AccessOrNotFoundWrapper>
diff --git a/src/pages/workspace/accounting/qbo/advanced/QuickbooksAdvancedPage.tsx b/src/pages/workspace/accounting/qbo/advanced/QuickbooksAdvancedPage.tsx
index a356b82a0c2b..a0b89e4e5baf 100644
--- a/src/pages/workspace/accounting/qbo/advanced/QuickbooksAdvancedPage.tsx
+++ b/src/pages/workspace/accounting/qbo/advanced/QuickbooksAdvancedPage.tsx
@@ -9,6 +9,7 @@ import useLocalize from '@hooks/useLocalize';
 import useThemeStyles from '@hooks/useThemeStyles';
 import useWaitForNavigation from '@hooks/useWaitForNavigation';
 import * as Connections from '@libs/actions/connections';
+import * as QuickbooksOnline from '@libs/actions/connections/QuickbooksOnline';
 import * as ErrorUtils from '@libs/ErrorUtils';
 import Navigation from '@libs/Navigation/Navigation';
 import AccessOrNotFoundWrapper from '@pages/workspace/AccessOrNotFoundWrapper';
@@ -16,7 +17,7 @@ import type {WithPolicyConnectionsProps} from '@pages/workspace/withPolicyConnec
 import withPolicyConnections from '@pages/workspace/withPolicyConnections';
 import ToggleSettingOptionRow from '@pages/workspace/workflows/ToggleSettingsOptionRow';
 import type {ToggleSettingOptionRowProps} from '@pages/workspace/workflows/ToggleSettingsOptionRow';
-import * as Policy from '@userActions/Policy';
+import * as Policy from '@userActions/Policy/Policy';
 import CONST from '@src/CONST';
 import ROUTES from '@src/ROUTES';
 
@@ -25,7 +26,7 @@ function QuickbooksAdvancedPage({policy}: WithPolicyConnectionsProps) {
     const waitForNavigate = useWaitForNavigation();
     const {translate} = useLocalize();
 
-    const policyID = policy?.id ?? '';
+    const policyID = policy?.id ?? '-1';
     const qboConfig = policy?.connections?.quickbooksOnline?.config;
     const {autoSync, syncPeople, autoCreateVendor, pendingFields, collectionAccountID, reimbursementAccountID, errorFields} = qboConfig ?? {};
     const {bankAccounts, creditCards, otherCurrentAssetAccounts} = policy?.connections?.quickbooksOnline?.data ?? {};
@@ -50,11 +51,10 @@ function QuickbooksAdvancedPage({policy}: WithPolicyConnectionsProps) {
                     description={translate('workspace.qbo.advancedConfig.qboBillPaymentAccount')}
                     wrapperStyle={[styles.sectionMenuItemTopDescription]}
                     onPress={waitForNavigate(() => Navigation.navigate(ROUTES.WORKSPACE_ACCOUNTING_QUICKBOOKS_ONLINE_ACCOUNT_SELECTOR.getRoute(policyID)))}
-                    error={errorFields?.reimbursementAccountID ? translate('common.genericErrorMessage') : undefined}
+                    errorText={errorFields?.reimbursementAccountID ? translate('common.genericErrorMessage') : undefined}
                     brickRoadIndicator={errorFields?.reimbursementAccountID ? CONST.BRICK_ROAD_INDICATOR_STATUS.ERROR : undefined}
                 />
             </OfflineWithFeedback>
-
             <OfflineWithFeedback pendingAction={pendingFields?.collectionAccountID}>
                 <MenuItemWithTopDescription
                     shouldShowRightIcon
@@ -62,7 +62,7 @@ function QuickbooksAdvancedPage({policy}: WithPolicyConnectionsProps) {
                     description={translate('workspace.qbo.advancedConfig.qboInvoiceCollectionAccount')}
                     wrapperStyle={[styles.sectionMenuItemTopDescription]}
                     onPress={waitForNavigate(() => Navigation.navigate(ROUTES.WORKSPACE_ACCOUNTING_QUICKBOOKS_ONLINE_INVOICE_ACCOUNT_SELECTOR.getRoute(policyID)))}
-                    error={errorFields?.collectionAccountID ? translate('common.genericErrorMessage') : undefined}
+                    errorText={errorFields?.collectionAccountID ? translate('common.genericErrorMessage') : undefined}
                     brickRoadIndicator={errorFields?.collectionAccountID ? CONST.BRICK_ROAD_INDICATOR_STATUS.ERROR : undefined}
                 />
             </OfflineWithFeedback>
@@ -71,9 +71,10 @@ function QuickbooksAdvancedPage({policy}: WithPolicyConnectionsProps) {
 
     const qboToggleSettingItems: ToggleSettingOptionRowProps[] = [
         {
-            title: translate('workspace.qbo.advancedConfig.autoSync'),
+            title: translate('workspace.accounting.autoSync'),
             subtitle: translate('workspace.qbo.advancedConfig.autoSyncDescription'),
-            isActive: Boolean(autoSync?.enabled),
+            switchAccessibilityLabel: translate('workspace.qbo.advancedConfig.autoSyncDescription'),
+            isActive: !!autoSync?.enabled,
             onToggle: () =>
                 Connections.updatePolicyConnectionConfig(policyID, CONST.POLICY.CONNECTIONS.NAME.QBO, CONST.QUICK_BOOKS_CONFIG.AUTO_SYNC, {
                     enabled: !autoSync?.enabled,
@@ -86,7 +87,8 @@ function QuickbooksAdvancedPage({policy}: WithPolicyConnectionsProps) {
         {
             title: translate('workspace.qbo.advancedConfig.inviteEmployees'),
             subtitle: translate('workspace.qbo.advancedConfig.inviteEmployeesDescription'),
-            isActive: Boolean(syncPeople),
+            switchAccessibilityLabel: translate('workspace.qbo.advancedConfig.inviteEmployeesDescription'),
+            isActive: !!syncPeople,
             onToggle: () => Connections.updatePolicyConnectionConfig(policyID, CONST.POLICY.CONNECTIONS.NAME.QBO, CONST.QUICK_BOOKS_CONFIG.SYNC_PEOPLE, !syncPeople),
             pendingAction: pendingFields?.syncPeople,
             errors: ErrorUtils.getLatestErrorField(qboConfig ?? {}, CONST.QUICK_BOOKS_CONFIG.SYNC_PEOPLE),
@@ -96,16 +98,18 @@ function QuickbooksAdvancedPage({policy}: WithPolicyConnectionsProps) {
         {
             title: translate('workspace.qbo.advancedConfig.createEntities'),
             subtitle: translate('workspace.qbo.advancedConfig.createEntitiesDescription'),
-            isActive: Boolean(autoCreateVendor),
-            onToggle: () => Connections.updatePolicyConnectionConfig(policyID, CONST.POLICY.CONNECTIONS.NAME.QBO, CONST.QUICK_BOOKS_CONFIG.AUTO_CREATE_VENDOR, !autoCreateVendor),
+            switchAccessibilityLabel: translate('workspace.qbo.advancedConfig.createEntitiesDescription'),
+            isActive: !!autoCreateVendor,
+            onToggle: () => QuickbooksOnline.updateQuickbooksOnlineAutoCreateVendor(policyID, !autoCreateVendor),
             pendingAction: pendingFields?.autoCreateVendor,
             errors: ErrorUtils.getLatestErrorField(qboConfig ?? {}, CONST.QUICK_BOOKS_CONFIG.AUTO_CREATE_VENDOR),
             onCloseError: () => Policy.clearQBOErrorField(policyID, CONST.QUICK_BOOKS_CONFIG.AUTO_CREATE_VENDOR),
             wrapperStyle: styles.mv3,
         },
         {
-            title: translate('workspace.qbo.advancedConfig.reimbursedReports'),
+            title: translate('workspace.accounting.reimbursedReports'),
             subtitle: translate('workspace.qbo.advancedConfig.reimbursedReportsDescription'),
+            switchAccessibilityLabel: translate('workspace.qbo.advancedConfig.reimbursedReportsDescription'),
             isActive: isSyncReimbursedSwitchOn,
             onToggle: () =>
                 Connections.updatePolicyConnectionConfig(
@@ -133,7 +137,7 @@ function QuickbooksAdvancedPage({policy}: WithPolicyConnectionsProps) {
                 shouldEnableMaxHeight
                 testID={QuickbooksAdvancedPage.displayName}
             >
-                <HeaderWithBackButton title={translate('workspace.qbo.advancedConfig.advanced')} />
+                <HeaderWithBackButton title={translate('workspace.accounting.advanced')} />
 
                 <ScrollView contentContainerStyle={[styles.ph5, styles.pb5]}>
                     {qboToggleSettingItems.map((item) => (
@@ -143,6 +147,7 @@ function QuickbooksAdvancedPage({policy}: WithPolicyConnectionsProps) {
                             onCloseError={item.onCloseError}
                             title={item.title}
                             subtitle={item.subtitle}
+                            switchAccessibilityLabel={item.switchAccessibilityLabel}
                             shouldPlaceSubtitleBelowSwitch
                             wrapperStyle={item.wrapperStyle}
                             isActive={item.isActive}
diff --git a/src/pages/workspace/accounting/qbo/advanced/QuickbooksInvoiceAccountSelectPage.tsx b/src/pages/workspace/accounting/qbo/advanced/QuickbooksInvoiceAccountSelectPage.tsx
index 31667da4ff6d..69acda4e1ba6 100644
--- a/src/pages/workspace/accounting/qbo/advanced/QuickbooksInvoiceAccountSelectPage.tsx
+++ b/src/pages/workspace/accounting/qbo/advanced/QuickbooksInvoiceAccountSelectPage.tsx
@@ -1,6 +1,8 @@
 import React, {useCallback, useMemo} from 'react';
 import {View} from 'react-native';
+import BlockingView from '@components/BlockingViews/BlockingView';
 import HeaderWithBackButton from '@components/HeaderWithBackButton';
+import * as Illustrations from '@components/Icon/Illustrations';
 import ScreenWrapper from '@components/ScreenWrapper';
 import SelectionList from '@components/SelectionList';
 import RadioListItem from '@components/SelectionList/RadioListItem';
@@ -13,6 +15,7 @@ import Navigation from '@libs/Navigation/Navigation';
 import AccessOrNotFoundWrapper from '@pages/workspace/AccessOrNotFoundWrapper';
 import type {WithPolicyConnectionsProps} from '@pages/workspace/withPolicyConnections';
 import withPolicyConnections from '@pages/workspace/withPolicyConnections';
+import variables from '@styles/variables';
 import CONST from '@src/CONST';
 import ROUTES from '@src/ROUTES';
 
@@ -24,7 +27,7 @@ function QuickbooksInvoiceAccountSelectPage({policy}: WithPolicyConnectionsProps
     const styles = useThemeStyles();
     const {translate} = useLocalize();
 
-    const policyID = policy?.id ?? '';
+    const policyID = policy?.id ?? '-1';
     const {bankAccounts, otherCurrentAssetAccounts} = policy?.connections?.quickbooksOnline?.data ?? {};
     const accountOptions = useMemo(() => [...(bankAccounts ?? []), ...(otherCurrentAssetAccounts ?? [])], [bankAccounts, otherCurrentAssetAccounts]);
     const {collectionAccountID} = policy?.connections?.quickbooksOnline?.config ?? {};
@@ -43,7 +46,7 @@ function QuickbooksInvoiceAccountSelectPage({policy}: WithPolicyConnectionsProps
     const listHeaderComponent = useMemo(
         () => (
             <View style={[styles.pb2, styles.ph5]}>
-                <Text style={[styles.pb5, styles.textNormal]}>{translate('workspace.qbo.advancedConfig.invoiceAccountSelectDescription')}</Text>
+                <Text style={[styles.pb5, styles.textNormal]}>{translate('workspace.qbo.advancedConfig.invoiceAccountSelectorDescription')}</Text>
             </View>
         ),
         [translate, styles.pb2, styles.ph5, styles.pb5, styles.textNormal],
@@ -51,7 +54,7 @@ function QuickbooksInvoiceAccountSelectPage({policy}: WithPolicyConnectionsProps
 
     const initiallyFocusedOptionKey = useMemo(() => qboOnlineSelectorOptions?.find((mode) => mode.isSelected)?.keyForList, [qboOnlineSelectorOptions]);
 
-    const updateMode = useCallback(
+    const updateAccount = useCallback(
         ({value}: SelectorType) => {
             Connections.updatePolicyConnectionConfig(policyID, CONST.POLICY.CONNECTIONS.NAME.QBO, CONST.QUICK_BOOKS_CONFIG.COLLECTION_ACCOUNT_ID, value);
             Navigation.goBack(ROUTES.WORKSPACE_ACCOUNTING_QUICKBOOKS_ONLINE_ADVANCED.getRoute(policyID));
@@ -59,6 +62,20 @@ function QuickbooksInvoiceAccountSelectPage({policy}: WithPolicyConnectionsProps
         [policyID],
     );
 
+    const listEmptyContent = useMemo(
+        () => (
+            <BlockingView
+                icon={Illustrations.TeleScope}
+                iconWidth={variables.emptyListIconWidth}
+                iconHeight={variables.emptyListIconHeight}
+                title={translate('workspace.qbo.noAccountsFound')}
+                subtitle={translate('workspace.qbo.noAccountsFoundDescription')}
+                containerStyle={styles.pb10}
+            />
+        ),
+        [translate, styles.pb10],
+    );
+
     return (
         <AccessOrNotFoundWrapper
             policyID={policyID}
@@ -72,11 +89,13 @@ function QuickbooksInvoiceAccountSelectPage({policy}: WithPolicyConnectionsProps
                 <HeaderWithBackButton title={translate('workspace.qbo.advancedConfig.qboInvoiceCollectionAccount')} />
 
                 <SelectionList
-                    sections={[{data: qboOnlineSelectorOptions}]}
+                    sections={qboOnlineSelectorOptions.length ? [{data: qboOnlineSelectorOptions}] : []}
                     ListItem={RadioListItem}
                     headerContent={listHeaderComponent}
-                    onSelectRow={updateMode}
+                    onSelectRow={updateAccount}
+                    shouldSingleExecuteRowSelect
                     initiallyFocusedOptionKey={initiallyFocusedOptionKey}
+                    listEmptyContent={listEmptyContent}
                 />
             </ScreenWrapper>
         </AccessOrNotFoundWrapper>
diff --git a/src/pages/workspace/accounting/qbo/export/QuickbooksCompanyCardExpenseAccountPage.tsx b/src/pages/workspace/accounting/qbo/export/QuickbooksCompanyCardExpenseAccountPage.tsx
index b3fd41d9a342..01867a6c764d 100644
--- a/src/pages/workspace/accounting/qbo/export/QuickbooksCompanyCardExpenseAccountPage.tsx
+++ b/src/pages/workspace/accounting/qbo/export/QuickbooksCompanyCardExpenseAccountPage.tsx
@@ -8,6 +8,7 @@ import Text from '@components/Text';
 import useLocalize from '@hooks/useLocalize';
 import useThemeStyles from '@hooks/useThemeStyles';
 import * as Connections from '@libs/actions/connections';
+import * as ConnectionUtils from '@libs/ConnectionUtils';
 import Navigation from '@navigation/Navigation';
 import AccessOrNotFoundWrapper from '@pages/workspace/AccessOrNotFoundWrapper';
 import type {WithPolicyConnectionsProps} from '@pages/workspace/withPolicyConnections';
@@ -19,11 +20,10 @@ import ROUTES from '@src/ROUTES';
 function QuickbooksCompanyCardExpenseAccountPage({policy}: WithPolicyConnectionsProps) {
     const {translate} = useLocalize();
     const styles = useThemeStyles();
-    const policyID = policy?.id ?? '';
+    const policyID = policy?.id ?? '-1';
     const {nonReimbursableBillDefaultVendor, autoCreateVendor, errorFields, pendingFields, nonReimbursableExpensesExportDestination, nonReimbursableExpensesAccount} =
         policy?.connections?.quickbooksOnline?.config ?? {};
     const {vendors} = policy?.connections?.quickbooksOnline?.data ?? {};
-    const isVendorSelected = nonReimbursableExpensesExportDestination === CONST.QUICKBOOKS_NON_REIMBURSABLE_EXPORT_ACCOUNT_TYPE.VENDOR_BILL;
     const nonReimbursableBillDefaultVendorObject = vendors?.find((vendor) => vendor.id === nonReimbursableBillDefaultVendor);
     return (
         <AccessOrNotFoundWrapper
@@ -35,57 +35,73 @@ function QuickbooksCompanyCardExpenseAccountPage({policy}: WithPolicyConnections
                 includeSafeAreaPaddingBottom={false}
                 testID={QuickbooksCompanyCardExpenseAccountPage.displayName}
             >
-                <HeaderWithBackButton title={translate('workspace.qbo.exportCompany')} />
+                <HeaderWithBackButton title={translate('workspace.accounting.exportCompanyCard')} />
                 <ScrollView contentContainerStyle={styles.pb2}>
                     <Text style={[styles.ph5, styles.pb5]}>{translate('workspace.qbo.exportCompanyCardsDescription')}</Text>
                     <OfflineWithFeedback pendingAction={pendingFields?.nonReimbursableExpensesExportDestination}>
                         <MenuItemWithTopDescription
                             title={nonReimbursableExpensesExportDestination ? translate(`workspace.qbo.accounts.${nonReimbursableExpensesExportDestination}`) : undefined}
-                            description={translate('workspace.qbo.exportCompany')}
-                            error={errorFields?.nonReimbursableExpensesExportDestination ? translate('common.genericErrorMessage') : undefined}
+                            description={translate('workspace.accounting.exportAs')}
+                            errorText={errorFields?.nonReimbursableExpensesExportDestination ? translate('common.genericErrorMessage') : undefined}
                             onPress={() => Navigation.navigate(ROUTES.POLICY_ACCOUNTING_QUICKBOOKS_ONLINE_COMPANY_CARD_EXPENSE_SELECT.getRoute(policyID))}
                             brickRoadIndicator={errorFields?.nonReimbursableExpensesExportDestination ? CONST.BRICK_ROAD_INDICATOR_STATUS.ERROR : undefined}
                             shouldShowRightIcon
+                            hintText={nonReimbursableExpensesExportDestination ? translate(`workspace.qbo.accounts.${nonReimbursableExpensesExportDestination}Description`) : undefined}
                         />
                     </OfflineWithFeedback>
-                    {!!nonReimbursableExpensesExportDestination && (
-                        <Text style={[styles.ph5, styles.mutedNormalTextLabel, styles.pt1, styles.pb2]}>
-                            {translate(`workspace.qbo.accounts.${nonReimbursableExpensesExportDestination}Description`)}
-                        </Text>
-                    )}
-                    {isVendorSelected && (
+                    <OfflineWithFeedback pendingAction={pendingFields?.nonReimbursableExpensesAccount}>
+                        <MenuItemWithTopDescription
+                            title={nonReimbursableExpensesAccount?.name}
+                            description={ConnectionUtils.getQBONonReimbursableExportAccountType(nonReimbursableExpensesExportDestination)}
+                            errorText={errorFields?.nonReimbursableExpensesAccount ? translate('common.genericErrorMessage') : undefined}
+                            onPress={() => Navigation.navigate(ROUTES.POLICY_ACCOUNTING_QUICKBOOKS_ONLINE_COMPANY_CARD_EXPENSE_ACCOUNT_SELECT.getRoute(policyID))}
+                            brickRoadIndicator={errorFields?.nonReimbursableExpensesAccount ? CONST.BRICK_ROAD_INDICATOR_STATUS.ERROR : undefined}
+                            shouldShowRightIcon
+                        />
+                    </OfflineWithFeedback>
+                    {nonReimbursableExpensesExportDestination === CONST.QUICKBOOKS_NON_REIMBURSABLE_EXPORT_ACCOUNT_TYPE.VENDOR_BILL && (
                         <>
-                            <OfflineWithFeedback pendingAction={pendingFields?.nonReimbursableExpensesAccount}>
-                                <MenuItemWithTopDescription
-                                    title={nonReimbursableExpensesAccount?.name}
-                                    description={translate('workspace.qbo.accountsPayable')}
-                                    error={errorFields?.nonReimbursableExpensesAccount ? translate('common.genericErrorMessage') : undefined}
-                                    onPress={() => Navigation.navigate(ROUTES.POLICY_ACCOUNTING_QUICKBOOKS_ONLINE_COMPANY_CARD_EXPENSE_ACCOUNT_PAYABLE_SELECT.getRoute(policyID))}
-                                    brickRoadIndicator={errorFields?.nonReimbursableExpensesAccount ? CONST.BRICK_ROAD_INDICATOR_STATUS.ERROR : undefined}
-                                    shouldShowRightIcon
-                                />
-                            </OfflineWithFeedback>
                             <ToggleSettingOptionRow
+                                shouldPlaceSubtitleBelowSwitch
                                 subtitle={translate('workspace.qbo.defaultVendorDescription')}
+                                switchAccessibilityLabel={translate('workspace.qbo.defaultVendorDescription')}
                                 errors={errorFields?.autoCreateVendor ?? undefined}
-                                title={translate('workspace.qbo.defaultVendor')}
+                                title={translate('workspace.accounting.defaultVendor')}
                                 wrapperStyle={[styles.ph5, styles.mb3, styles.mt1]}
-                                isActive={Boolean(autoCreateVendor)}
-                                onToggle={(isOn) => Connections.updatePolicyConnectionConfig(policyID, CONST.POLICY.CONNECTIONS.NAME.QBO, CONST.QUICK_BOOKS_CONFIG.AUTO_CREATE_VENDOR, isOn)}
+                                isActive={!!autoCreateVendor}
+                                onToggle={(isOn) =>
+                                    Connections.updateManyPolicyConnectionConfigs(
+                                        policyID,
+                                        CONST.POLICY.CONNECTIONS.NAME.QBO,
+                                        {
+                                            [CONST.QUICK_BOOKS_CONFIG.AUTO_CREATE_VENDOR]: isOn,
+                                            [CONST.QUICK_BOOKS_CONFIG.NON_REIMBURSABLE_BILL_DEFAULT_VENDOR]: isOn
+                                                ? policy?.connections?.quickbooksOnline?.data?.vendors?.[0]?.id ?? CONST.INTEGRATION_ENTITY_MAP_TYPES.NONE
+                                                : CONST.INTEGRATION_ENTITY_MAP_TYPES.NONE,
+                                        },
+                                        {
+                                            [CONST.QUICK_BOOKS_CONFIG.AUTO_CREATE_VENDOR]: autoCreateVendor,
+                                            [CONST.QUICK_BOOKS_CONFIG.NON_REIMBURSABLE_BILL_DEFAULT_VENDOR]:
+                                                nonReimbursableBillDefaultVendorObject?.id ?? CONST.INTEGRATION_ENTITY_MAP_TYPES.NONE,
+                                        },
+                                    )
+                                }
                                 pendingAction={pendingFields?.autoCreateVendor}
                             />
+                            {autoCreateVendor && (
+                                <OfflineWithFeedback pendingAction={pendingFields?.nonReimbursableBillDefaultVendor}>
+                                    <MenuItemWithTopDescription
+                                        title={nonReimbursableBillDefaultVendorObject?.name}
+                                        description={translate('workspace.accounting.defaultVendor')}
+                                        onPress={() => Navigation.navigate(ROUTES.POLICY_ACCOUNTING_QUICKBOOKS_ONLINE_NON_REIMBURSABLE_DEFAULT_VENDOR_SELECT.getRoute(policyID))}
+                                        brickRoadIndicator={errorFields?.nonReimbursableBillDefaultVendor ? CONST.BRICK_ROAD_INDICATOR_STATUS.ERROR : undefined}
+                                        shouldShowRightIcon
+                                        errorText={errorFields?.nonReimbursableBillDefaultVendor ? translate('common.genericErrorMessage') : undefined}
+                                    />
+                                </OfflineWithFeedback>
+                            )}
                         </>
                     )}
-                    <OfflineWithFeedback pendingAction={pendingFields?.nonReimbursableBillDefaultVendor}>
-                        <MenuItemWithTopDescription
-                            title={nonReimbursableBillDefaultVendorObject?.name}
-                            description={isVendorSelected ? translate('workspace.qbo.vendor') : translate('workspace.qbo.account')}
-                            onPress={() => Navigation.navigate(ROUTES.POLICY_ACCOUNTING_QUICKBOOKS_ONLINE_NON_REIMBURSABLE_DEFAULT_VENDOR_SELECT.getRoute(policyID))}
-                            brickRoadIndicator={errorFields?.nonReimbursableBillDefaultVendor ? CONST.BRICK_ROAD_INDICATOR_STATUS.ERROR : undefined}
-                            shouldShowRightIcon
-                            error={errorFields?.nonReimbursableBillDefaultVendor ? translate('common.genericErrorMessage') : undefined}
-                        />
-                    </OfflineWithFeedback>
                 </ScrollView>
             </ScreenWrapper>
         </AccessOrNotFoundWrapper>
diff --git a/src/pages/workspace/accounting/qbo/export/QuickbooksCompanyCardExpenseAccountPayableSelectPage.tsx b/src/pages/workspace/accounting/qbo/export/QuickbooksCompanyCardExpenseAccountPayableSelectPage.tsx
deleted file mode 100644
index d7104fd4bbaf..000000000000
--- a/src/pages/workspace/accounting/qbo/export/QuickbooksCompanyCardExpenseAccountPayableSelectPage.tsx
+++ /dev/null
@@ -1,73 +0,0 @@
-import React, {useCallback, useMemo} from 'react';
-import HeaderWithBackButton from '@components/HeaderWithBackButton';
-import ScreenWrapper from '@components/ScreenWrapper';
-import SelectionList from '@components/SelectionList';
-import RadioListItem from '@components/SelectionList/RadioListItem';
-import type {ListItem} from '@components/SelectionList/types';
-import Text from '@components/Text';
-import useLocalize from '@hooks/useLocalize';
-import useThemeStyles from '@hooks/useThemeStyles';
-import * as Connections from '@libs/actions/connections';
-import Navigation from '@navigation/Navigation';
-import AccessOrNotFoundWrapper from '@pages/workspace/AccessOrNotFoundWrapper';
-import type {WithPolicyConnectionsProps} from '@pages/workspace/withPolicyConnections';
-import withPolicyConnections from '@pages/workspace/withPolicyConnections';
-import CONST from '@src/CONST';
-import ROUTES from '@src/ROUTES';
-import type {Account} from '@src/types/onyx/Policy';
-
-type CardListItem = ListItem & {
-    value: Account;
-};
-
-function QuickbooksCompanyCardExpenseAccountPayableSelectPage({policy}: WithPolicyConnectionsProps) {
-    const {translate} = useLocalize();
-    const styles = useThemeStyles();
-    const {accountPayable} = policy?.connections?.quickbooksOnline?.data ?? {};
-    const {nonReimbursableExpensesAccount} = policy?.connections?.quickbooksOnline?.config ?? {};
-
-    const policyID = policy?.id ?? '';
-    const sections = useMemo(() => {
-        const data: CardListItem[] =
-            accountPayable?.map((account) => ({
-                value: account,
-                text: account.name,
-                keyForList: account.name,
-                isSelected: account.id === nonReimbursableExpensesAccount?.id,
-            })) ?? [];
-        return [{data}];
-    }, [nonReimbursableExpensesAccount, accountPayable]);
-
-    const selectAccountPayable = useCallback(
-        (row: CardListItem) => {
-            if (row.value.id !== nonReimbursableExpensesAccount?.id) {
-                Connections.updatePolicyConnectionConfig(policyID, CONST.POLICY.CONNECTIONS.NAME.QBO, CONST.QUICK_BOOKS_CONFIG.NON_REIMBURSABLE_EXPENSES_ACCOUNT, row.value);
-            }
-            Navigation.goBack(ROUTES.POLICY_ACCOUNTING_QUICKBOOKS_ONLINE_COMPANY_CARD_EXPENSE_ACCOUNT.getRoute(policyID));
-        },
-        [nonReimbursableExpensesAccount, policyID],
-    );
-
-    return (
-        <AccessOrNotFoundWrapper
-            policyID={policyID}
-            accessVariants={[CONST.POLICY.ACCESS_VARIANTS.ADMIN]}
-            featureName={CONST.POLICY.MORE_FEATURES.ARE_CONNECTIONS_ENABLED}
-        >
-            <ScreenWrapper testID={QuickbooksCompanyCardExpenseAccountPayableSelectPage.displayName}>
-                <HeaderWithBackButton title={translate('workspace.qbo.accountsPayable')} />
-                <SelectionList
-                    headerContent={<Text style={[styles.ph5, styles.pb5]}>{translate('workspace.qbo.accountsPayableDescription')}</Text>}
-                    sections={sections}
-                    ListItem={RadioListItem}
-                    onSelectRow={selectAccountPayable}
-                    initiallyFocusedOptionKey={sections[0].data.find((mode) => mode.isSelected)?.keyForList}
-                />
-            </ScreenWrapper>
-        </AccessOrNotFoundWrapper>
-    );
-}
-
-QuickbooksCompanyCardExpenseAccountPayableSelectPage.displayName = 'QuickbooksCompanyCardExpenseAccountPayableSelectPage';
-
-export default withPolicyConnections(QuickbooksCompanyCardExpenseAccountPayableSelectPage);
diff --git a/src/pages/workspace/accounting/qbo/export/QuickbooksCompanyCardExpenseAccountSelectCardPage.tsx b/src/pages/workspace/accounting/qbo/export/QuickbooksCompanyCardExpenseAccountSelectCardPage.tsx
index 9b7aace8ebcf..c36f7df6b245 100644
--- a/src/pages/workspace/accounting/qbo/export/QuickbooksCompanyCardExpenseAccountSelectCardPage.tsx
+++ b/src/pages/workspace/accounting/qbo/export/QuickbooksCompanyCardExpenseAccountSelectCardPage.tsx
@@ -15,18 +15,21 @@ import type {WithPolicyConnectionsProps} from '@pages/workspace/withPolicyConnec
 import withPolicyConnections from '@pages/workspace/withPolicyConnections';
 import CONST from '@src/CONST';
 import ROUTES from '@src/ROUTES';
-import type {QBONonReimbursableExportAccountType} from '@src/types/onyx/Policy';
+import type {Account, QBONonReimbursableExportAccountType} from '@src/types/onyx/Policy';
 
 type AccountListItem = ListItem & {
     value: QBONonReimbursableExportAccountType;
+    accounts: Account[];
+    defaultVendor: string;
 };
 
 function QuickbooksCompanyCardExpenseAccountSelectCardPage({policy}: WithPolicyConnectionsProps) {
     const {translate} = useLocalize();
     const styles = useThemeStyles();
-    const policyID = policy?.id ?? '';
-    const {nonReimbursableExpensesExportDestination, syncLocations} = policy?.connections?.quickbooksOnline?.config ?? {};
-    const isLocationEnabled = Boolean(syncLocations && syncLocations !== CONST.INTEGRATION_ENTITY_MAP_TYPES.NONE);
+    const policyID = policy?.id ?? '-1';
+    const {nonReimbursableExpensesExportDestination, nonReimbursableExpensesAccount, syncLocations, nonReimbursableBillDefaultVendor} = policy?.connections?.quickbooksOnline?.config ?? {};
+    const {creditCards, bankAccounts, accountPayable, vendors} = policy?.connections?.quickbooksOnline?.data ?? {};
+    const isLocationEnabled = !!(syncLocations && syncLocations !== CONST.INTEGRATION_ENTITY_MAP_TYPES.NONE);
 
     const sections = useMemo(() => {
         const options: AccountListItem[] = [
@@ -35,12 +38,16 @@ function QuickbooksCompanyCardExpenseAccountSelectCardPage({policy}: WithPolicyC
                 value: CONST.QUICKBOOKS_NON_REIMBURSABLE_EXPORT_ACCOUNT_TYPE.CREDIT_CARD,
                 keyForList: CONST.QUICKBOOKS_NON_REIMBURSABLE_EXPORT_ACCOUNT_TYPE.CREDIT_CARD,
                 isSelected: CONST.QUICKBOOKS_NON_REIMBURSABLE_EXPORT_ACCOUNT_TYPE.CREDIT_CARD === nonReimbursableExpensesExportDestination,
+                accounts: creditCards ?? [],
+                defaultVendor: CONST.INTEGRATION_ENTITY_MAP_TYPES.NONE,
             },
             {
                 text: translate(`workspace.qbo.accounts.debit_card`),
                 value: CONST.QUICKBOOKS_NON_REIMBURSABLE_EXPORT_ACCOUNT_TYPE.DEBIT_CARD,
                 keyForList: CONST.QUICKBOOKS_NON_REIMBURSABLE_EXPORT_ACCOUNT_TYPE.DEBIT_CARD,
                 isSelected: CONST.QUICKBOOKS_NON_REIMBURSABLE_EXPORT_ACCOUNT_TYPE.DEBIT_CARD === nonReimbursableExpensesExportDestination,
+                accounts: bankAccounts ?? [],
+                defaultVendor: CONST.INTEGRATION_ENTITY_MAP_TYPES.NONE,
             },
         ];
         if (!isLocationEnabled) {
@@ -49,19 +56,34 @@ function QuickbooksCompanyCardExpenseAccountSelectCardPage({policy}: WithPolicyC
                 value: CONST.QUICKBOOKS_NON_REIMBURSABLE_EXPORT_ACCOUNT_TYPE.VENDOR_BILL,
                 keyForList: CONST.QUICKBOOKS_NON_REIMBURSABLE_EXPORT_ACCOUNT_TYPE.VENDOR_BILL,
                 isSelected: CONST.QUICKBOOKS_NON_REIMBURSABLE_EXPORT_ACCOUNT_TYPE.VENDOR_BILL === nonReimbursableExpensesExportDestination,
+                accounts: accountPayable ?? [],
+                defaultVendor: vendors?.[0]?.id ?? CONST.INTEGRATION_ENTITY_MAP_TYPES.NONE,
             });
         }
         return [{data: options}];
-    }, [translate, nonReimbursableExpensesExportDestination, isLocationEnabled]);
+    }, [translate, nonReimbursableExpensesExportDestination, isLocationEnabled, accountPayable, bankAccounts, creditCards, vendors]);
 
     const selectExportCompanyCard = useCallback(
         (row: AccountListItem) => {
             if (row.value !== nonReimbursableExpensesExportDestination) {
-                Connections.updatePolicyConnectionConfig(policyID, CONST.POLICY.CONNECTIONS.NAME.QBO, CONST.QUICK_BOOKS_CONFIG.NON_REIMBURSABLE_EXPENSES_EXPORT_DESTINATION, row.value);
+                Connections.updateManyPolicyConnectionConfigs(
+                    policyID,
+                    CONST.POLICY.CONNECTIONS.NAME.QBO,
+                    {
+                        [CONST.QUICK_BOOKS_CONFIG.NON_REIMBURSABLE_EXPENSES_EXPORT_DESTINATION]: row.value,
+                        [CONST.QUICK_BOOKS_CONFIG.NON_REIMBURSABLE_EXPENSES_ACCOUNT]: row.accounts[0],
+                        [CONST.QUICK_BOOKS_CONFIG.NON_REIMBURSABLE_BILL_DEFAULT_VENDOR]: row.defaultVendor,
+                    },
+                    {
+                        [CONST.QUICK_BOOKS_CONFIG.NON_REIMBURSABLE_EXPENSES_EXPORT_DESTINATION]: nonReimbursableExpensesExportDestination,
+                        [CONST.QUICK_BOOKS_CONFIG.NON_REIMBURSABLE_EXPENSES_ACCOUNT]: nonReimbursableExpensesAccount,
+                        [CONST.QUICK_BOOKS_CONFIG.NON_REIMBURSABLE_BILL_DEFAULT_VENDOR]: nonReimbursableBillDefaultVendor,
+                    },
+                );
             }
             Navigation.goBack(ROUTES.POLICY_ACCOUNTING_QUICKBOOKS_ONLINE_COMPANY_CARD_EXPENSE_ACCOUNT.getRoute(policyID));
         },
-        [nonReimbursableExpensesExportDestination, policyID],
+        [nonReimbursableExpensesExportDestination, policyID, nonReimbursableExpensesAccount, nonReimbursableBillDefaultVendor],
     );
 
     return (
@@ -71,14 +93,14 @@ function QuickbooksCompanyCardExpenseAccountSelectCardPage({policy}: WithPolicyC
             featureName={CONST.POLICY.MORE_FEATURES.ARE_CONNECTIONS_ENABLED}
         >
             <ScreenWrapper testID={QuickbooksCompanyCardExpenseAccountSelectCardPage.displayName}>
-                <HeaderWithBackButton title={translate('workspace.qbo.exportCompany')} />
+                <HeaderWithBackButton title={translate('workspace.accounting.exportAs')} />
                 <View style={styles.flex1}>
                     <SelectionList
                         containerStyle={[styles.flexReset, styles.flexGrow0, styles.flexShrink0, styles.flexBasisAuto]}
-                        headerContent={<Text style={[styles.ph5, styles.pb5]}>{translate('workspace.qbo.exportCompanyCardsDescription')}</Text>}
                         sections={sections}
                         ListItem={RadioListItem}
                         onSelectRow={selectExportCompanyCard}
+                        shouldSingleExecuteRowSelect
                         initiallyFocusedOptionKey={sections[0].data.find((option) => option.isSelected)?.keyForList}
                         footerContent={
                             isLocationEnabled && <Text style={[styles.mutedNormalTextLabel, styles.pt2]}>{translate('workspace.qbo.companyCardsLocationEnabledDescription')}</Text>
diff --git a/src/pages/workspace/accounting/qbo/export/QuickbooksCompanyCardExpenseAccountSelectPage.tsx b/src/pages/workspace/accounting/qbo/export/QuickbooksCompanyCardExpenseAccountSelectPage.tsx
index f5c8020db929..8bee7d206180 100644
--- a/src/pages/workspace/accounting/qbo/export/QuickbooksCompanyCardExpenseAccountSelectPage.tsx
+++ b/src/pages/workspace/accounting/qbo/export/QuickbooksCompanyCardExpenseAccountSelectPage.tsx
@@ -1,5 +1,7 @@
 import React, {useCallback, useMemo} from 'react';
+import BlockingView from '@components/BlockingViews/BlockingView';
 import HeaderWithBackButton from '@components/HeaderWithBackButton';
+import * as Illustrations from '@components/Icon/Illustrations';
 import ScreenWrapper from '@components/ScreenWrapper';
 import SelectionList from '@components/SelectionList';
 import RadioListItem from '@components/SelectionList/RadioListItem';
@@ -8,10 +10,12 @@ import Text from '@components/Text';
 import useLocalize from '@hooks/useLocalize';
 import useThemeStyles from '@hooks/useThemeStyles';
 import * as Connections from '@libs/actions/connections';
+import * as ConnectionUtils from '@libs/ConnectionUtils';
 import Navigation from '@navigation/Navigation';
 import AccessOrNotFoundWrapper from '@pages/workspace/AccessOrNotFoundWrapper';
 import type {WithPolicyConnectionsProps} from '@pages/workspace/withPolicyConnections';
 import withPolicyConnections from '@pages/workspace/withPolicyConnections';
+import variables from '@styles/variables';
 import CONST from '@src/CONST';
 import ROUTES from '@src/ROUTES';
 import type {Account} from '@src/types/onyx/Policy';
@@ -23,8 +27,8 @@ type CardListItem = ListItem & {
 function QuickbooksCompanyCardExpenseAccountSelectPage({policy}: WithPolicyConnectionsProps) {
     const {translate} = useLocalize();
     const styles = useThemeStyles();
-    const policyID = policy?.id ?? '';
-    const {creditCards, vendors, bankAccounts} = policy?.connections?.quickbooksOnline?.data ?? {};
+    const policyID = policy?.id ?? '-1';
+    const {creditCards, accountPayable, bankAccounts} = policy?.connections?.quickbooksOnline?.data ?? {};
 
     const {nonReimbursableExpensesAccount, nonReimbursableExpensesExportDestination} = policy?.connections?.quickbooksOnline?.config ?? {};
 
@@ -38,7 +42,7 @@ function QuickbooksCompanyCardExpenseAccountSelectPage({policy}: WithPolicyConne
                 accounts = bankAccounts ?? [];
                 break;
             case CONST.QUICKBOOKS_REIMBURSABLE_ACCOUNT_TYPE.VENDOR_BILL:
-                accounts = vendors ?? [];
+                accounts = accountPayable ?? [];
                 break;
             default:
                 accounts = [];
@@ -50,7 +54,7 @@ function QuickbooksCompanyCardExpenseAccountSelectPage({policy}: WithPolicyConne
             keyForList: card.name,
             isSelected: card.name === nonReimbursableExpensesAccount?.name,
         }));
-    }, [nonReimbursableExpensesAccount, creditCards, bankAccounts, nonReimbursableExpensesExportDestination, vendors]);
+    }, [nonReimbursableExpensesAccount, creditCards, bankAccounts, nonReimbursableExpensesExportDestination, accountPayable]);
 
     const selectExportAccount = useCallback(
         (row: CardListItem) => {
@@ -62,6 +66,20 @@ function QuickbooksCompanyCardExpenseAccountSelectPage({policy}: WithPolicyConne
         [nonReimbursableExpensesAccount, policyID],
     );
 
+    const listEmptyContent = useMemo(
+        () => (
+            <BlockingView
+                icon={Illustrations.TeleScope}
+                iconWidth={variables.emptyListIconWidth}
+                iconHeight={variables.emptyListIconHeight}
+                title={translate('workspace.qbo.noAccountsFound')}
+                subtitle={translate('workspace.qbo.noAccountsFoundDescription')}
+                containerStyle={styles.pb10}
+            />
+        ),
+        [translate, styles.pb10],
+    );
+
     return (
         <AccessOrNotFoundWrapper
             policyID={policyID}
@@ -69,23 +87,19 @@ function QuickbooksCompanyCardExpenseAccountSelectPage({policy}: WithPolicyConne
             featureName={CONST.POLICY.MORE_FEATURES.ARE_CONNECTIONS_ENABLED}
         >
             <ScreenWrapper testID={QuickbooksCompanyCardExpenseAccountSelectPage.displayName}>
-                <HeaderWithBackButton
-                    title={
-                        nonReimbursableExpensesExportDestination === CONST.QUICKBOOKS_NON_REIMBURSABLE_EXPORT_ACCOUNT_TYPE.VENDOR_BILL
-                            ? translate('workspace.qbo.vendor')
-                            : translate('workspace.qbo.account')
-                    }
-                />
+                <HeaderWithBackButton title={ConnectionUtils.getQBONonReimbursableExportAccountType(nonReimbursableExpensesExportDestination)} />
                 <SelectionList
                     headerContent={
                         nonReimbursableExpensesExportDestination ? (
                             <Text style={[styles.ph5, styles.pb5]}>{translate(`workspace.qbo.accounts.${nonReimbursableExpensesExportDestination}AccountDescription`)}</Text>
                         ) : null
                     }
-                    sections={[{data}]}
+                    sections={data.length ? [{data}] : []}
                     ListItem={RadioListItem}
                     onSelectRow={selectExportAccount}
+                    shouldSingleExecuteRowSelect
                     initiallyFocusedOptionKey={data.find((mode) => mode.isSelected)?.keyForList}
+                    listEmptyContent={listEmptyContent}
                 />
             </ScreenWrapper>
         </AccessOrNotFoundWrapper>
diff --git a/src/pages/workspace/accounting/qbo/export/QuickbooksExportConfigurationPage.tsx b/src/pages/workspace/accounting/qbo/export/QuickbooksExportConfigurationPage.tsx
index 527a55d41b30..b60431661f34 100644
--- a/src/pages/workspace/accounting/qbo/export/QuickbooksExportConfigurationPage.tsx
+++ b/src/pages/workspace/accounting/qbo/export/QuickbooksExportConfigurationPage.tsx
@@ -23,7 +23,7 @@ type MenuItem = MenuItemProps & {pendingAction?: OfflineWithFeedbackProps['pendi
 function QuickbooksExportConfigurationPage({policy}: WithPolicyConnectionsProps) {
     const {translate} = useLocalize();
     const styles = useThemeStyles();
-    const policyID = policy?.id ?? '';
+    const policyID = policy?.id ?? '-1';
     const policyOwner = policy?.owner ?? '';
     const {
         export: exportConfiguration,
@@ -36,12 +36,12 @@ function QuickbooksExportConfigurationPage({policy}: WithPolicyConnectionsProps)
     } = policy?.connections?.quickbooksOnline?.config ?? {};
     const menuItems: MenuItem[] = [
         {
-            description: translate('workspace.qbo.preferredExporter'),
+            description: translate('workspace.accounting.preferredExporter'),
             onPress: () => Navigation.navigate(ROUTES.POLICY_ACCOUNTING_QUICKBOOKS_ONLINE_PREFERRED_EXPORTER.getRoute(policyID)),
             brickRoadIndicator: errorFields?.exporter ? CONST.BRICK_ROAD_INDICATOR_STATUS.ERROR : undefined,
             title: exportConfiguration?.exporter ?? policyOwner,
             pendingAction: pendingFields?.export,
-            error: errorFields?.exporter ? translate('common.genericErrorMessage') : undefined,
+            errorText: errorFields?.exporter ? translate('common.genericErrorMessage') : undefined,
         },
         {
             description: translate('workspace.qbo.date'),
@@ -49,12 +49,12 @@ function QuickbooksExportConfigurationPage({policy}: WithPolicyConnectionsProps)
             brickRoadIndicator: errorFields?.exportDate ? CONST.BRICK_ROAD_INDICATOR_STATUS.ERROR : undefined,
             title: exportDate ? translate(`workspace.qbo.exportDate.values.${exportDate}.label`) : undefined,
             pendingAction: pendingFields?.exportDate,
-            error: errorFields?.exportDate ? translate('common.genericErrorMessage') : undefined,
+            errorText: errorFields?.exportDate ? translate('common.genericErrorMessage') : undefined,
         },
         {
-            description: translate('workspace.qbo.exportExpenses'),
+            description: translate('workspace.accounting.exportOutOfPocket'),
             onPress: () => Navigation.navigate(ROUTES.POLICY_ACCOUNTING_QUICKBOOKS_ONLINE_EXPORT_OUT_OF_POCKET_EXPENSES.getRoute(policyID)),
-            brickRoadIndicator: Boolean(errorFields?.exportEntity) || Boolean(errorFields?.reimbursableExpensesAccount) ? CONST.BRICK_ROAD_INDICATOR_STATUS.ERROR : undefined,
+            brickRoadIndicator: !!errorFields?.exportEntity || !!errorFields?.reimbursableExpensesAccount ? CONST.BRICK_ROAD_INDICATOR_STATUS.ERROR : undefined,
             title: reimbursableExpensesExportDestination ? translate(`workspace.qbo.accounts.${reimbursableExpensesExportDestination}`) : undefined,
             // eslint-disable-next-line @typescript-eslint/prefer-nullish-coalescing
             pendingAction: pendingFields?.reimbursableExpensesExportDestination || pendingFields?.reimbursableExpensesAccount,
@@ -65,15 +65,15 @@ function QuickbooksExportConfigurationPage({policy}: WithPolicyConnectionsProps)
             brickRoadIndicator: errorFields?.receivableAccount ? CONST.BRICK_ROAD_INDICATOR_STATUS.ERROR : undefined,
             title: receivableAccount?.name,
             pendingAction: pendingFields?.receivableAccount,
-            error: errorFields?.receivableAccount ? translate('common.genericErrorMessage') : undefined,
+            errorText: errorFields?.receivableAccount ? translate('common.genericErrorMessage') : undefined,
         },
         {
-            description: translate('workspace.qbo.exportCompany'),
+            description: translate('workspace.accounting.exportCompanyCard'),
             onPress: () => Navigation.navigate(ROUTES.POLICY_ACCOUNTING_QUICKBOOKS_ONLINE_COMPANY_CARD_EXPENSE_ACCOUNT.getRoute(policyID)),
             brickRoadIndicator: errorFields?.exportCompanyCard ? CONST.BRICK_ROAD_INDICATOR_STATUS.ERROR : undefined,
             title: nonReimbursableExpensesExportDestination ? translate(`workspace.qbo.accounts.${nonReimbursableExpensesExportDestination}`) : undefined,
             pendingAction: pendingFields?.nonReimbursableExpensesExportDestination,
-            error: errorFields?.nonReimbursableExpensesExportDestination ? translate('common.genericErrorMessage') : undefined,
+            errorText: errorFields?.nonReimbursableExpensesExportDestination ? translate('common.genericErrorMessage') : undefined,
         },
         {
             description: translate('workspace.qbo.exportExpensifyCard'),
@@ -93,7 +93,7 @@ function QuickbooksExportConfigurationPage({policy}: WithPolicyConnectionsProps)
                 includeSafeAreaPaddingBottom={false}
                 testID={QuickbooksExportConfigurationPage.displayName}
             >
-                <HeaderWithBackButton title={translate('workspace.qbo.export')} />
+                <HeaderWithBackButton title={translate('workspace.accounting.export')} />
                 <ScrollView contentContainerStyle={styles.pb2}>
                     <Text style={[styles.ph5, styles.pb5]}>{translate('workspace.qbo.exportDescription')}</Text>
                     {menuItems.map((menuItem) => (
@@ -108,9 +108,7 @@ function QuickbooksExportConfigurationPage({policy}: WithPolicyConnectionsProps)
                                 shouldShowRightIcon={menuItem?.shouldShowRightIcon ?? true}
                                 onPress={menuItem?.onPress}
                                 brickRoadIndicator={menuItem?.brickRoadIndicator}
-                                // TODO uncomment when errorText will be fixed
-                                // errorText={menuItem?.errorText}
-                                error={menuItem?.error}
+                                errorText={menuItem?.errorText}
                             />
                         </OfflineWithFeedback>
                     ))}
diff --git a/src/pages/workspace/accounting/qbo/export/QuickbooksExportDateSelectPage.tsx b/src/pages/workspace/accounting/qbo/export/QuickbooksExportDateSelectPage.tsx
index 16e9a20668c5..89fbd6a96b33 100644
--- a/src/pages/workspace/accounting/qbo/export/QuickbooksExportDateSelectPage.tsx
+++ b/src/pages/workspace/accounting/qbo/export/QuickbooksExportDateSelectPage.tsx
@@ -22,7 +22,7 @@ type CardListItem = ListItem & {
 function QuickbooksExportDateSelectPage({policy}: WithPolicyConnectionsProps) {
     const {translate} = useLocalize();
     const styles = useThemeStyles();
-    const policyID = policy?.id ?? '';
+    const policyID = policy?.id ?? '-1';
     const {exportDate} = policy?.connections?.quickbooksOnline?.config ?? {};
     const data: CardListItem[] = Object.values(CONST.QUICKBOOKS_EXPORT_DATE).map((dateType) => ({
         value: dateType,
@@ -58,6 +58,7 @@ function QuickbooksExportDateSelectPage({policy}: WithPolicyConnectionsProps) {
                     sections={[{data}]}
                     ListItem={RadioListItem}
                     onSelectRow={selectExportDate}
+                    shouldSingleExecuteRowSelect
                     initiallyFocusedOptionKey={data.find((mode) => mode.isSelected)?.keyForList}
                 />
             </ScreenWrapper>
diff --git a/src/pages/workspace/accounting/qbo/export/QuickbooksExportInvoiceAccountSelectPage.tsx b/src/pages/workspace/accounting/qbo/export/QuickbooksExportInvoiceAccountSelectPage.tsx
index b7c95811b90a..e2b285fe3d41 100644
--- a/src/pages/workspace/accounting/qbo/export/QuickbooksExportInvoiceAccountSelectPage.tsx
+++ b/src/pages/workspace/accounting/qbo/export/QuickbooksExportInvoiceAccountSelectPage.tsx
@@ -1,5 +1,7 @@
 import React, {useCallback, useMemo} from 'react';
+import BlockingView from '@components/BlockingViews/BlockingView';
 import HeaderWithBackButton from '@components/HeaderWithBackButton';
+import * as Illustrations from '@components/Icon/Illustrations';
 import ScreenWrapper from '@components/ScreenWrapper';
 import SelectionList from '@components/SelectionList';
 import RadioListItem from '@components/SelectionList/RadioListItem';
@@ -12,6 +14,7 @@ import Navigation from '@navigation/Navigation';
 import AccessOrNotFoundWrapper from '@pages/workspace/AccessOrNotFoundWrapper';
 import type {WithPolicyConnectionsProps} from '@pages/workspace/withPolicyConnections';
 import withPolicyConnections from '@pages/workspace/withPolicyConnections';
+import variables from '@styles/variables';
 import CONST from '@src/CONST';
 import ROUTES from '@src/ROUTES';
 import type {Account} from '@src/types/onyx/Policy';
@@ -26,7 +29,7 @@ function QuickbooksExportInvoiceAccountSelectPage({policy}: WithPolicyConnection
     const {accountsReceivable} = policy?.connections?.quickbooksOnline?.data ?? {};
     const {receivableAccount} = policy?.connections?.quickbooksOnline?.config ?? {};
 
-    const policyID = policy?.id ?? '';
+    const policyID = policy?.id ?? '-1';
     const data: CardListItem[] = useMemo(
         () =>
             accountsReceivable?.map((account) => ({
@@ -48,6 +51,20 @@ function QuickbooksExportInvoiceAccountSelectPage({policy}: WithPolicyConnection
         [receivableAccount, policyID],
     );
 
+    const listEmptyContent = useMemo(
+        () => (
+            <BlockingView
+                icon={Illustrations.TeleScope}
+                iconWidth={variables.emptyListIconWidth}
+                iconHeight={variables.emptyListIconHeight}
+                title={translate('workspace.qbo.noAccountsFound')}
+                subtitle={translate('workspace.qbo.noAccountsFoundDescription')}
+                containerStyle={styles.pb10}
+            />
+        ),
+        [translate, styles.pb10],
+    );
+
     return (
         <AccessOrNotFoundWrapper
             policyID={policyID}
@@ -58,10 +75,12 @@ function QuickbooksExportInvoiceAccountSelectPage({policy}: WithPolicyConnection
                 <HeaderWithBackButton title={translate('workspace.qbo.exportInvoices')} />
                 <SelectionList
                     headerContent={<Text style={[styles.ph5, styles.pb5]}>{translate('workspace.qbo.exportInvoicesDescription')}</Text>}
-                    sections={[{data}]}
+                    sections={data.length ? [{data}] : []}
                     ListItem={RadioListItem}
                     onSelectRow={selectExportInvoice}
+                    shouldSingleExecuteRowSelect
                     initiallyFocusedOptionKey={data.find((mode) => mode.isSelected)?.keyForList}
+                    listEmptyContent={listEmptyContent}
                 />
             </ScreenWrapper>
         </AccessOrNotFoundWrapper>
diff --git a/src/pages/workspace/accounting/qbo/export/QuickbooksNonReimbursableDefaultVendorSelectPage.tsx b/src/pages/workspace/accounting/qbo/export/QuickbooksNonReimbursableDefaultVendorSelectPage.tsx
index 729914176a0d..d57da414b57b 100644
--- a/src/pages/workspace/accounting/qbo/export/QuickbooksNonReimbursableDefaultVendorSelectPage.tsx
+++ b/src/pages/workspace/accounting/qbo/export/QuickbooksNonReimbursableDefaultVendorSelectPage.tsx
@@ -1,10 +1,11 @@
 import React, {useCallback, useMemo} from 'react';
+import BlockingView from '@components/BlockingViews/BlockingView';
 import HeaderWithBackButton from '@components/HeaderWithBackButton';
+import * as Illustrations from '@components/Icon/Illustrations';
 import ScreenWrapper from '@components/ScreenWrapper';
 import SelectionList from '@components/SelectionList';
 import RadioListItem from '@components/SelectionList/RadioListItem';
 import type {ListItem} from '@components/SelectionList/types';
-import Text from '@components/Text';
 import useLocalize from '@hooks/useLocalize';
 import useThemeStyles from '@hooks/useThemeStyles';
 import * as Connections from '@libs/actions/connections';
@@ -12,6 +13,7 @@ import Navigation from '@navigation/Navigation';
 import AccessOrNotFoundWrapper from '@pages/workspace/AccessOrNotFoundWrapper';
 import type {WithPolicyConnectionsProps} from '@pages/workspace/withPolicyConnections';
 import withPolicyConnections from '@pages/workspace/withPolicyConnections';
+import variables from '@styles/variables';
 import CONST from '@src/CONST';
 import ROUTES from '@src/ROUTES';
 
@@ -25,7 +27,7 @@ function QuickbooksNonReimbursableDefaultVendorSelectPage({policy}: WithPolicyCo
     const {vendors} = policy?.connections?.quickbooksOnline?.data ?? {};
     const {nonReimbursableBillDefaultVendor} = policy?.connections?.quickbooksOnline?.config ?? {};
 
-    const policyID = policy?.id ?? '';
+    const policyID = policy?.id ?? '-1';
     const sections = useMemo(() => {
         const data: CardListItem[] =
             vendors?.map((vendor) => ({
@@ -34,7 +36,7 @@ function QuickbooksNonReimbursableDefaultVendorSelectPage({policy}: WithPolicyCo
                 keyForList: vendor.name,
                 isSelected: vendor.id === nonReimbursableBillDefaultVendor,
             })) ?? [];
-        return [{data}];
+        return data.length ? [{data}] : [];
     }, [nonReimbursableBillDefaultVendor, vendors]);
 
     const selectVendor = useCallback(
@@ -47,6 +49,20 @@ function QuickbooksNonReimbursableDefaultVendorSelectPage({policy}: WithPolicyCo
         [nonReimbursableBillDefaultVendor, policyID],
     );
 
+    const listEmptyContent = useMemo(
+        () => (
+            <BlockingView
+                icon={Illustrations.TeleScope}
+                iconWidth={variables.emptyListIconWidth}
+                iconHeight={variables.emptyListIconHeight}
+                title={translate('workspace.qbo.noAccountsFound')}
+                subtitle={translate('workspace.qbo.noAccountsFoundDescription')}
+                containerStyle={styles.pb10}
+            />
+        ),
+        [translate, styles.pb10],
+    );
+
     return (
         <AccessOrNotFoundWrapper
             policyID={policyID}
@@ -54,13 +70,14 @@ function QuickbooksNonReimbursableDefaultVendorSelectPage({policy}: WithPolicyCo
             featureName={CONST.POLICY.MORE_FEATURES.ARE_CONNECTIONS_ENABLED}
         >
             <ScreenWrapper testID={QuickbooksNonReimbursableDefaultVendorSelectPage.displayName}>
-                <HeaderWithBackButton title={translate('workspace.qbo.defaultVendor')} />
+                <HeaderWithBackButton title={translate('workspace.accounting.defaultVendor')} />
                 <SelectionList
-                    headerContent={<Text style={[styles.ph5, styles.pb5]}>{translate('workspace.qbo.defaultVendorDescription')}</Text>}
                     sections={sections}
                     ListItem={RadioListItem}
                     onSelectRow={selectVendor}
-                    initiallyFocusedOptionKey={sections[0].data.find((mode) => mode.isSelected)?.keyForList}
+                    shouldSingleExecuteRowSelect
+                    initiallyFocusedOptionKey={sections[0]?.data.find((mode) => mode.isSelected)?.keyForList}
+                    listEmptyContent={listEmptyContent}
                 />
             </ScreenWrapper>
         </AccessOrNotFoundWrapper>
diff --git a/src/pages/workspace/accounting/qbo/export/QuickbooksOutOfPocketExpenseAccountSelectPage.tsx b/src/pages/workspace/accounting/qbo/export/QuickbooksOutOfPocketExpenseAccountSelectPage.tsx
index ebac7546341a..1e50464d3b06 100644
--- a/src/pages/workspace/accounting/qbo/export/QuickbooksOutOfPocketExpenseAccountSelectPage.tsx
+++ b/src/pages/workspace/accounting/qbo/export/QuickbooksOutOfPocketExpenseAccountSelectPage.tsx
@@ -1,5 +1,7 @@
 import React, {useCallback, useMemo} from 'react';
+import BlockingView from '@components/BlockingViews/BlockingView';
 import HeaderWithBackButton from '@components/HeaderWithBackButton';
+import * as Illustrations from '@components/Icon/Illustrations';
 import ScreenWrapper from '@components/ScreenWrapper';
 import SelectionList from '@components/SelectionList';
 import RadioListItem from '@components/SelectionList/RadioListItem';
@@ -7,11 +9,12 @@ import type {ListItem} from '@components/SelectionList/types';
 import Text from '@components/Text';
 import useLocalize from '@hooks/useLocalize';
 import useThemeStyles from '@hooks/useThemeStyles';
-import * as Connections from '@libs/actions/connections';
+import * as QuickbooksOnline from '@libs/actions/connections/QuickbooksOnline';
 import Navigation from '@navigation/Navigation';
 import AccessOrNotFoundWrapper from '@pages/workspace/AccessOrNotFoundWrapper';
 import type {WithPolicyConnectionsProps} from '@pages/workspace/withPolicyConnections';
 import withPolicyConnections from '@pages/workspace/withPolicyConnections';
+import variables from '@styles/variables';
 import CONST from '@src/CONST';
 import ROUTES from '@src/ROUTES';
 import type {Account} from '@src/types/onyx/Policy';
@@ -27,18 +30,41 @@ function QuickbooksOutOfPocketExpenseAccountSelectPage({policy}: WithPolicyConne
 
     const {reimbursableExpensesExportDestination, reimbursableExpensesAccount} = policy?.connections?.quickbooksOnline?.config ?? {};
 
+    const [title, description] = useMemo(() => {
+        let titleText: string | undefined;
+        let descriptionText: string | undefined;
+        switch (reimbursableExpensesExportDestination) {
+            case CONST.QUICKBOOKS_REIMBURSABLE_ACCOUNT_TYPE.CHECK:
+                titleText = translate('workspace.qbo.bankAccount');
+                descriptionText = translate('workspace.qbo.bankAccountDescription');
+                break;
+            case CONST.QUICKBOOKS_REIMBURSABLE_ACCOUNT_TYPE.JOURNAL_ENTRY:
+                titleText = translate('workspace.qbo.account');
+                descriptionText = translate('workspace.qbo.accountDescription');
+                break;
+            case CONST.QUICKBOOKS_REIMBURSABLE_ACCOUNT_TYPE.VENDOR_BILL:
+                titleText = translate('workspace.qbo.accountsPayable');
+                descriptionText = translate('workspace.qbo.accountsPayableDescription');
+                break;
+            default:
+                break;
+        }
+
+        return [titleText, descriptionText];
+    }, [translate, reimbursableExpensesExportDestination]);
+
     const data: CardListItem[] = useMemo(() => {
         let accounts: Account[];
         switch (reimbursableExpensesExportDestination) {
             case CONST.QUICKBOOKS_REIMBURSABLE_ACCOUNT_TYPE.CHECK:
                 accounts = bankAccounts ?? [];
                 break;
-            case CONST.QUICKBOOKS_REIMBURSABLE_ACCOUNT_TYPE.VENDOR_BILL:
-                accounts = accountPayable ?? [];
-                break;
             case CONST.QUICKBOOKS_REIMBURSABLE_ACCOUNT_TYPE.JOURNAL_ENTRY:
                 accounts = journalEntryAccounts ?? [];
                 break;
+            case CONST.QUICKBOOKS_REIMBURSABLE_ACCOUNT_TYPE.VENDOR_BILL:
+                accounts = accountPayable ?? [];
+                break;
             default:
                 accounts = [];
         }
@@ -51,18 +77,32 @@ function QuickbooksOutOfPocketExpenseAccountSelectPage({policy}: WithPolicyConne
         }));
     }, [accountPayable, bankAccounts, reimbursableExpensesExportDestination, reimbursableExpensesAccount, journalEntryAccounts]);
 
-    const policyID = policy?.id ?? '';
+    const policyID = policy?.id ?? '-1';
 
     const selectExportAccount = useCallback(
         (row: CardListItem) => {
             if (row.value.id !== reimbursableExpensesAccount?.id) {
-                Connections.updatePolicyConnectionConfig(policyID, CONST.POLICY.CONNECTIONS.NAME.QBO, CONST.QUICK_BOOKS_CONFIG.REIMBURSABLE_EXPENSES_ACCOUNT, row.value);
+                QuickbooksOnline.updateQuickbooksOnlineReimbursableExpensesAccount(policyID, row.value);
             }
             Navigation.goBack(ROUTES.POLICY_ACCOUNTING_QUICKBOOKS_ONLINE_EXPORT_OUT_OF_POCKET_EXPENSES.getRoute(policyID));
         },
         [reimbursableExpensesAccount, policyID],
     );
 
+    const listEmptyContent = useMemo(
+        () => (
+            <BlockingView
+                icon={Illustrations.TeleScope}
+                iconWidth={variables.emptyListIconWidth}
+                iconHeight={variables.emptyListIconHeight}
+                title={translate('workspace.qbo.noAccountsFound')}
+                subtitle={translate('workspace.qbo.noAccountsFoundDescription')}
+                containerStyle={styles.pb10}
+            />
+        ),
+        [translate, styles.pb10],
+    );
+
     return (
         <AccessOrNotFoundWrapper
             policyID={policyID}
@@ -70,13 +110,15 @@ function QuickbooksOutOfPocketExpenseAccountSelectPage({policy}: WithPolicyConne
             featureName={CONST.POLICY.MORE_FEATURES.ARE_CONNECTIONS_ENABLED}
         >
             <ScreenWrapper testID={QuickbooksOutOfPocketExpenseAccountSelectPage.displayName}>
-                <HeaderWithBackButton title={translate('workspace.qbo.accountsPayable')} />
+                <HeaderWithBackButton title={title} />
                 <SelectionList
-                    headerContent={<Text style={[styles.ph5, styles.pb5]}>{translate('workspace.qbo.accountsPayableDescription')}</Text>}
-                    sections={[{data}]}
+                    headerContent={<Text style={[styles.ph5, styles.pb5]}>{description}</Text>}
+                    sections={data.length ? [{data}] : []}
                     ListItem={RadioListItem}
                     onSelectRow={selectExportAccount}
+                    shouldSingleExecuteRowSelect
                     initiallyFocusedOptionKey={data.find((mode) => mode.isSelected)?.keyForList}
+                    listEmptyContent={listEmptyContent}
                 />
             </ScreenWrapper>
         </AccessOrNotFoundWrapper>
diff --git a/src/pages/workspace/accounting/qbo/export/QuickbooksOutOfPocketExpenseConfigurationPage.tsx b/src/pages/workspace/accounting/qbo/export/QuickbooksOutOfPocketExpenseConfigurationPage.tsx
index bc4741e00b48..679f021e60fa 100644
--- a/src/pages/workspace/accounting/qbo/export/QuickbooksOutOfPocketExpenseConfigurationPage.tsx
+++ b/src/pages/workspace/accounting/qbo/export/QuickbooksOutOfPocketExpenseConfigurationPage.tsx
@@ -1,4 +1,4 @@
-import React from 'react';
+import React, {useMemo} from 'react';
 import HeaderWithBackButton from '@components/HeaderWithBackButton';
 import MenuItemWithTopDescription from '@components/MenuItemWithTopDescription';
 import OfflineWithFeedback from '@components/OfflineWithFeedback';
@@ -17,13 +17,35 @@ import ROUTES from '@src/ROUTES';
 function QuickbooksOutOfPocketExpenseConfigurationPage({policy}: WithPolicyConnectionsProps) {
     const {translate} = useLocalize();
     const styles = useThemeStyles();
-    const policyID = policy?.id ?? '';
-    const {syncLocations, reimbursableExpensesAccount, reimbursableExpensesExportDestination, errorFields, syncTax, pendingFields} = policy?.connections?.quickbooksOnline?.config ?? {};
-    const isLocationEnabled = Boolean(syncLocations && syncLocations !== CONST.INTEGRATION_ENTITY_MAP_TYPES.NONE);
-    const isTaxesEnabled = Boolean(syncTax);
+    const policyID = policy?.id ?? '-1';
+    const {syncLocations, syncTax, reimbursableExpensesAccount, reimbursableExpensesExportDestination, errorFields, pendingFields} = policy?.connections?.quickbooksOnline?.config ?? {};
+    const isLocationEnabled = !!(syncLocations && syncLocations !== CONST.INTEGRATION_ENTITY_MAP_TYPES.NONE);
+    const isTaxesEnabled = !!syncTax;
     const shouldShowTaxError = isTaxesEnabled && reimbursableExpensesExportDestination === CONST.QUICKBOOKS_REIMBURSABLE_ACCOUNT_TYPE.JOURNAL_ENTRY;
     const shouldShowLocationError = isLocationEnabled && reimbursableExpensesExportDestination !== CONST.QUICKBOOKS_REIMBURSABLE_ACCOUNT_TYPE.JOURNAL_ENTRY;
-    const hasErrors = Boolean(errorFields?.exportEntity) || shouldShowTaxError || shouldShowLocationError;
+    const hasErrors = !!errorFields?.reimbursableExpensesExportDestination || shouldShowTaxError || shouldShowLocationError;
+    const [exportHintText, accountDescription] = useMemo(() => {
+        let hintText: string | undefined;
+        let description: string | undefined;
+        switch (reimbursableExpensesExportDestination) {
+            case CONST.QUICKBOOKS_REIMBURSABLE_ACCOUNT_TYPE.CHECK:
+                hintText = isLocationEnabled ? undefined : translate('workspace.qbo.exportCheckDescription');
+                description = translate('workspace.qbo.bankAccount');
+                break;
+            case CONST.QUICKBOOKS_REIMBURSABLE_ACCOUNT_TYPE.JOURNAL_ENTRY:
+                hintText = isTaxesEnabled ? undefined : translate('workspace.qbo.exportJournalEntryDescription');
+                description = translate('workspace.qbo.account');
+                break;
+            case CONST.QUICKBOOKS_REIMBURSABLE_ACCOUNT_TYPE.VENDOR_BILL:
+                hintText = isLocationEnabled ? undefined : translate('workspace.qbo.exportVendorBillDescription');
+                description = translate('workspace.qbo.accountsPayable');
+                break;
+            default:
+                break;
+        }
+
+        return [hintText, description];
+    }, [translate, reimbursableExpensesExportDestination, isLocationEnabled, isTaxesEnabled]);
 
     return (
         <AccessOrNotFoundWrapper
@@ -35,37 +57,30 @@ function QuickbooksOutOfPocketExpenseConfigurationPage({policy}: WithPolicyConne
                 includeSafeAreaPaddingBottom={false}
                 testID={QuickbooksOutOfPocketExpenseConfigurationPage.displayName}
             >
-                <HeaderWithBackButton title={translate('workspace.qbo.exportExpenses')} />
+                <HeaderWithBackButton title={translate('workspace.accounting.exportOutOfPocket')} />
                 <ScrollView contentContainerStyle={styles.pb2}>
-                    {!isLocationEnabled && <Text style={[styles.ph5, styles.pb5]}>{translate('workspace.qbo.exportOutOfPocketExpensesDescription')}</Text>}
+                    <Text style={[styles.ph5, styles.pb5]}>{translate('workspace.qbo.exportOutOfPocketExpensesDescription')}</Text>
                     <OfflineWithFeedback pendingAction={pendingFields?.reimbursableExpensesExportDestination}>
                         <MenuItemWithTopDescription
                             title={reimbursableExpensesExportDestination ? translate(`workspace.qbo.accounts.${reimbursableExpensesExportDestination}`) : undefined}
-                            description={translate('workspace.qbo.exportAs')}
-                            error={hasErrors && reimbursableExpensesExportDestination ? translate(`workspace.qbo.accounts.${reimbursableExpensesExportDestination}Error`) : undefined}
+                            description={translate('workspace.accounting.exportAs')}
+                            errorText={hasErrors && reimbursableExpensesExportDestination ? translate(`workspace.qbo.accounts.${reimbursableExpensesExportDestination}Error`) : undefined}
                             onPress={() => Navigation.navigate(ROUTES.POLICY_ACCOUNTING_QUICKBOOKS_ONLINE_EXPORT_OUT_OF_POCKET_EXPENSES_SELECT.getRoute(policyID))}
                             brickRoadIndicator={hasErrors ? CONST.BRICK_ROAD_INDICATOR_STATUS.ERROR : undefined}
                             shouldShowRightIcon
+                            hintText={exportHintText}
+                        />
+                    </OfflineWithFeedback>
+                    <OfflineWithFeedback pendingAction={pendingFields?.reimbursableExpensesAccount}>
+                        <MenuItemWithTopDescription
+                            title={reimbursableExpensesAccount?.name}
+                            description={accountDescription}
+                            onPress={() => Navigation.navigate(ROUTES.POLICY_ACCOUNTING_QUICKBOOKS_ONLINE_EXPORT_OUT_OF_POCKET_EXPENSES_ACCOUNT_SELECT.getRoute(policyID))}
+                            brickRoadIndicator={errorFields?.exportAccount ? CONST.BRICK_ROAD_INDICATOR_STATUS.ERROR : undefined}
+                            shouldShowRightIcon
+                            errorText={errorFields?.exportAccount ? translate('common.genericErrorMessage') : undefined}
                         />
                     </OfflineWithFeedback>
-                    {reimbursableExpensesExportDestination === CONST.QUICKBOOKS_REIMBURSABLE_ACCOUNT_TYPE.VENDOR_BILL && !isLocationEnabled && (
-                        <Text style={[styles.ph5, styles.mutedNormalTextLabel, styles.pt1, styles.pb2]}>{translate('workspace.qbo.exportVendorBillDescription')}</Text>
-                    )}
-                    {isLocationEnabled && <Text style={[styles.ph5, styles.mutedNormalTextLabel, styles.pt1]}>{translate('workspace.qbo.outOfPocketLocationEnabledDescription')}</Text>}
-                    {!isLocationEnabled && (
-                        <OfflineWithFeedback pendingAction={pendingFields?.reimbursableExpensesAccount}>
-                            <MenuItemWithTopDescription
-                                title={reimbursableExpensesAccount?.name}
-                                description={translate('workspace.qbo.accountsPayable')}
-                                onPress={() => Navigation.navigate(ROUTES.POLICY_ACCOUNTING_QUICKBOOKS_ONLINE_EXPORT_OUT_OF_POCKET_EXPENSES_ACCOUNT_SELECT.getRoute(policyID))}
-                                brickRoadIndicator={errorFields?.exportAccount ? CONST.BRICK_ROAD_INDICATOR_STATUS.ERROR : undefined}
-                                shouldShowRightIcon
-                                error={errorFields?.exportAccount ? translate('common.genericErrorMessage') : undefined}
-                                // TODO uncomment when errorText will be fixed
-                                // errorText={errors?.exportAccount}
-                            />
-                        </OfflineWithFeedback>
-                    )}
                 </ScrollView>
             </ScreenWrapper>
         </AccessOrNotFoundWrapper>
diff --git a/src/pages/workspace/accounting/qbo/export/QuickbooksOutOfPocketExpenseEntitySelectPage.tsx b/src/pages/workspace/accounting/qbo/export/QuickbooksOutOfPocketExpenseEntitySelectPage.tsx
index 35e06f6734e2..b0d8afa6d53b 100644
--- a/src/pages/workspace/accounting/qbo/export/QuickbooksOutOfPocketExpenseEntitySelectPage.tsx
+++ b/src/pages/workspace/accounting/qbo/export/QuickbooksOutOfPocketExpenseEntitySelectPage.tsx
@@ -16,21 +16,39 @@ import type {WithPolicyConnectionsProps} from '@pages/workspace/withPolicyConnec
 import withPolicyConnections from '@pages/workspace/withPolicyConnections';
 import CONST from '@src/CONST';
 import ROUTES from '@src/ROUTES';
-import type {QBOReimbursableExportAccountType} from '@src/types/onyx/Policy';
+import type {Account, QBOReimbursableExportAccountType} from '@src/types/onyx/Policy';
+
+function Footer({isTaxEnabled, isLocationsEnabled}: {isTaxEnabled: boolean; isLocationsEnabled: boolean}) {
+    const styles = useThemeStyles();
+    const {translate} = useLocalize();
+
+    if (!isTaxEnabled && !isLocationsEnabled) {
+        return null;
+    }
+
+    return (
+        <View style={[styles.gap2, styles.mt2]}>
+            {isTaxEnabled && <Text style={styles.mutedNormalTextLabel}>{translate('workspace.qbo.outOfPocketTaxEnabledDescription')}</Text>}
+            {isLocationsEnabled && <Text style={styles.mutedNormalTextLabel}>{translate('workspace.qbo.outOfPocketLocationEnabledDescription')}</Text>}
+        </View>
+    );
+}
 
 type CardListItem = ListItem & {
     value: QBOReimbursableExportAccountType;
     isShown: boolean;
+    accounts: Account[];
 };
 type CardsSection = SectionListData<CardListItem, Section<CardListItem>>;
 
 function QuickbooksOutOfPocketExpenseEntitySelectPage({policy}: WithPolicyConnectionsProps) {
     const {translate} = useLocalize();
     const styles = useThemeStyles();
-    const {reimbursableExpensesExportDestination, syncTax, syncLocations} = policy?.connections?.quickbooksOnline?.config ?? {};
-    const isLocationsEnabled = Boolean(syncLocations && syncLocations !== CONST.INTEGRATION_ENTITY_MAP_TYPES.NONE);
-    const isTaxesEnabled = Boolean(syncTax);
-    const policyID = policy?.id ?? '';
+    const {reimbursableExpensesExportDestination, reimbursableExpensesAccount, syncTax, syncLocations} = policy?.connections?.quickbooksOnline?.config ?? {};
+    const {bankAccounts, accountPayable, journalEntryAccounts} = policy?.connections?.quickbooksOnline?.data ?? {};
+    const isLocationsEnabled = !!(syncLocations && syncLocations !== CONST.INTEGRATION_ENTITY_MAP_TYPES.NONE);
+    const isTaxesEnabled = !!syncTax;
+    const policyID = policy?.id ?? '-1';
 
     const data: CardListItem[] = useMemo(
         () => [
@@ -40,13 +58,15 @@ function QuickbooksOutOfPocketExpenseEntitySelectPage({policy}: WithPolicyConnec
                 keyForList: CONST.QUICKBOOKS_REIMBURSABLE_ACCOUNT_TYPE.CHECK,
                 isSelected: reimbursableExpensesExportDestination === CONST.QUICKBOOKS_REIMBURSABLE_ACCOUNT_TYPE.CHECK,
                 isShown: !isLocationsEnabled,
+                accounts: bankAccounts ?? [],
             },
             {
                 value: CONST.QUICKBOOKS_REIMBURSABLE_ACCOUNT_TYPE.JOURNAL_ENTRY,
                 text: translate(`workspace.qbo.accounts.journal_entry`),
                 keyForList: CONST.QUICKBOOKS_REIMBURSABLE_ACCOUNT_TYPE.JOURNAL_ENTRY,
                 isSelected: reimbursableExpensesExportDestination === CONST.QUICKBOOKS_REIMBURSABLE_ACCOUNT_TYPE.JOURNAL_ENTRY,
-                isShown: !isTaxesEnabled || isLocationsEnabled,
+                isShown: !isTaxesEnabled,
+                accounts: journalEntryAccounts ?? [],
             },
             {
                 value: CONST.QUICKBOOKS_REIMBURSABLE_ACCOUNT_TYPE.VENDOR_BILL,
@@ -54,9 +74,10 @@ function QuickbooksOutOfPocketExpenseEntitySelectPage({policy}: WithPolicyConnec
                 keyForList: CONST.QUICKBOOKS_REIMBURSABLE_ACCOUNT_TYPE.VENDOR_BILL,
                 isSelected: reimbursableExpensesExportDestination === CONST.QUICKBOOKS_REIMBURSABLE_ACCOUNT_TYPE.VENDOR_BILL,
                 isShown: !isLocationsEnabled,
+                accounts: accountPayable ?? [],
             },
         ],
-        [reimbursableExpensesExportDestination, isTaxesEnabled, translate, isLocationsEnabled],
+        [reimbursableExpensesExportDestination, isTaxesEnabled, translate, isLocationsEnabled, bankAccounts, accountPayable, journalEntryAccounts],
     );
 
     const sections: CardsSection[] = useMemo(() => [{data: data.filter((item) => item.isShown)}], [data]);
@@ -64,11 +85,22 @@ function QuickbooksOutOfPocketExpenseEntitySelectPage({policy}: WithPolicyConnec
     const selectExportEntity = useCallback(
         (row: CardListItem) => {
             if (row.value !== reimbursableExpensesExportDestination) {
-                Connections.updatePolicyConnectionConfig(policyID, CONST.POLICY.CONNECTIONS.NAME.QBO, CONST.QUICK_BOOKS_CONFIG.REIMBURSABLE_EXPENSES_EXPORT_DESTINATION, row.value);
+                Connections.updateManyPolicyConnectionConfigs(
+                    policyID,
+                    CONST.POLICY.CONNECTIONS.NAME.QBO,
+                    {
+                        [CONST.QUICK_BOOKS_CONFIG.REIMBURSABLE_EXPENSES_EXPORT_DESTINATION]: row.value,
+                        [CONST.QUICK_BOOKS_CONFIG.REIMBURSABLE_EXPENSES_ACCOUNT]: row.accounts[0],
+                    },
+                    {
+                        [CONST.QUICK_BOOKS_CONFIG.REIMBURSABLE_EXPENSES_EXPORT_DESTINATION]: reimbursableExpensesExportDestination,
+                        [CONST.QUICK_BOOKS_CONFIG.REIMBURSABLE_EXPENSES_ACCOUNT]: reimbursableExpensesAccount,
+                    },
+                );
             }
             Navigation.goBack(ROUTES.POLICY_ACCOUNTING_QUICKBOOKS_ONLINE_EXPORT_OUT_OF_POCKET_EXPENSES.getRoute(policyID));
         },
-        [reimbursableExpensesExportDestination, policyID],
+        [reimbursableExpensesExportDestination, policyID, reimbursableExpensesAccount],
     );
 
     return (
@@ -81,16 +113,21 @@ function QuickbooksOutOfPocketExpenseEntitySelectPage({policy}: WithPolicyConnec
                 includeSafeAreaPaddingBottom={false}
                 testID={QuickbooksOutOfPocketExpenseEntitySelectPage.displayName}
             >
-                <HeaderWithBackButton title={translate('workspace.qbo.exportAs')} />
+                <HeaderWithBackButton title={translate('workspace.accounting.exportAs')} />
                 <View style={styles.flex1}>
                     <SelectionList
                         containerStyle={[styles.flexReset, styles.flexGrow0, styles.flexShrink0, styles.flexBasisAuto]}
-                        headerContent={<Text style={[styles.ph5, styles.pb5]}>{translate('workspace.qbo.optionBelow')}</Text>}
                         sections={sections}
                         ListItem={RadioListItem}
                         onSelectRow={selectExportEntity}
+                        shouldSingleExecuteRowSelect
                         initiallyFocusedOptionKey={data.find((mode) => mode.isSelected)?.keyForList}
-                        footerContent={isTaxesEnabled && <Text style={[styles.mutedNormalTextLabel, styles.pt2]}>{translate('workspace.qbo.outOfPocketTaxEnabledDescription')}</Text>}
+                        footerContent={
+                            <Footer
+                                isTaxEnabled={isTaxesEnabled}
+                                isLocationsEnabled={isLocationsEnabled}
+                            />
+                        }
                     />
                 </View>
             </ScreenWrapper>
diff --git a/src/pages/workspace/accounting/qbo/export/QuickbooksPreferredExporterConfigurationPage.tsx b/src/pages/workspace/accounting/qbo/export/QuickbooksPreferredExporterConfigurationPage.tsx
index a55b293fc3a1..55d262ebb21e 100644
--- a/src/pages/workspace/accounting/qbo/export/QuickbooksPreferredExporterConfigurationPage.tsx
+++ b/src/pages/workspace/accounting/qbo/export/QuickbooksPreferredExporterConfigurationPage.tsx
@@ -29,7 +29,7 @@ function QuickbooksPreferredExporterConfigurationPage({policy}: WithPolicyConnec
     const exporters = getAdminEmployees(policy);
     const {login: currentUserLogin} = useCurrentUserPersonalDetails();
 
-    const policyID = policy?.id ?? '';
+    const policyID = policy?.id ?? '-1';
     const data: CardListItem[] = useMemo(
         () =>
             exporters?.reduce<CardListItem[]>((options, exporter) => {
@@ -45,7 +45,7 @@ function QuickbooksPreferredExporterConfigurationPage({policy}: WithPolicyConnec
                     value: exporter.email,
                     text: exporter.email,
                     keyForList: exporter.email,
-                    isSelected: exportConfiguration?.exporter === exporter.email,
+                    isSelected: (exportConfiguration?.exporter ?? policy?.owner) === exporter.email,
                 });
                 return options;
             }, []),
@@ -69,17 +69,18 @@ function QuickbooksPreferredExporterConfigurationPage({policy}: WithPolicyConnec
             featureName={CONST.POLICY.MORE_FEATURES.ARE_CONNECTIONS_ENABLED}
         >
             <ScreenWrapper testID={QuickbooksPreferredExporterConfigurationPage.displayName}>
-                <HeaderWithBackButton title={translate('workspace.qbo.preferredExporter')} />
+                <HeaderWithBackButton title={translate('workspace.accounting.preferredExporter')} />
                 <SelectionList
                     headerContent={
                         <>
-                            <Text style={[styles.ph5, styles.pb5]}>{translate('workspace.qbo.exportPreferredExporterNote')}</Text>
-                            <Text style={[styles.ph5, styles.pb5]}>{translate('workspace.qbo.exportPreferredExporterSubNote')}</Text>
+                            <Text style={[styles.ph5, styles.pb5]}>{translate('workspace.accounting.exportPreferredExporterNote')}</Text>
+                            <Text style={[styles.ph5, styles.pb5]}>{translate('workspace.accounting.exportPreferredExporterSubNote')}</Text>
                         </>
                     }
                     sections={[{data}]}
                     ListItem={RadioListItem}
                     onSelectRow={selectExporter}
+                    shouldSingleExecuteRowSelect
                     initiallyFocusedOptionKey={data.find((mode) => mode.isSelected)?.keyForList}
                 />
             </ScreenWrapper>
diff --git a/src/pages/workspace/accounting/qbo/import/QuickbooksChartOfAccountsPage.tsx b/src/pages/workspace/accounting/qbo/import/QuickbooksChartOfAccountsPage.tsx
index 8c904481b1a0..1ccf944dd9c6 100644
--- a/src/pages/workspace/accounting/qbo/import/QuickbooksChartOfAccountsPage.tsx
+++ b/src/pages/workspace/accounting/qbo/import/QuickbooksChartOfAccountsPage.tsx
@@ -1,15 +1,13 @@
 import React from 'react';
 import {View} from 'react-native';
-import HeaderWithBackButton from '@components/HeaderWithBackButton';
+import ConnectionLayout from '@components/ConnectionLayout';
+import MenuItemWithTopDescription from '@components/MenuItemWithTopDescription';
 import OfflineWithFeedback from '@components/OfflineWithFeedback';
-import ScreenWrapper from '@components/ScreenWrapper';
-import ScrollView from '@components/ScrollView';
 import Switch from '@components/Switch';
 import Text from '@components/Text';
 import useLocalize from '@hooks/useLocalize';
 import useThemeStyles from '@hooks/useThemeStyles';
-import * as Connections from '@libs/actions/connections';
-import AccessOrNotFoundWrapper from '@pages/workspace/AccessOrNotFoundWrapper';
+import * as QuickbooksOnline from '@libs/actions/connections/QuickbooksOnline';
 import type {WithPolicyProps} from '@pages/workspace/withPolicy';
 import withPolicyConnections from '@pages/workspace/withPolicyConnections';
 import variables from '@styles/variables';
@@ -18,50 +16,58 @@ import CONST from '@src/CONST';
 function QuickbooksChartOfAccountsPage({policy}: WithPolicyProps) {
     const {translate} = useLocalize();
     const styles = useThemeStyles();
-    const policyID = policy?.id ?? '';
+    const policyID = policy?.id ?? '-1';
     const {enableNewCategories, pendingFields} = policy?.connections?.quickbooksOnline?.config ?? {};
 
     return (
-        <AccessOrNotFoundWrapper
+        <ConnectionLayout
+            displayName={QuickbooksChartOfAccountsPage.displayName}
+            headerTitle="workspace.accounting.accounts"
+            title="workspace.qbo.accountsDescription"
             accessVariants={[CONST.POLICY.ACCESS_VARIANTS.ADMIN]}
             policyID={policyID}
             featureName={CONST.POLICY.MORE_FEATURES.ARE_CONNECTIONS_ENABLED}
+            contentContainerStyle={[styles.pb2, styles.ph5]}
+            connectionName={CONST.POLICY.CONNECTIONS.NAME.QBO}
         >
-            <ScreenWrapper
-                includeSafeAreaPaddingBottom={false}
-                shouldEnableMaxHeight
-                testID={QuickbooksChartOfAccountsPage.displayName}
-            >
-                <HeaderWithBackButton title={translate('workspace.accounting.accounts')} />
-                <ScrollView contentContainerStyle={[styles.pb2, styles.ph5]}>
-                    <Text style={styles.pb5}>{translate('workspace.qbo.accountsDescription')}</Text>
-                    <View style={[styles.flexRow, styles.mb2, styles.alignItemsCenter, styles.justifyContentBetween]}>
-                        <View style={styles.flex1}>
-                            <Text fontSize={variables.fontSizeNormal}>{translate('workspace.qbo.accountsSwitchTitle')}</Text>
-                        </View>
-                        <OfflineWithFeedback pendingAction={pendingFields?.enableNewCategories}>
-                            <View style={[styles.flex1, styles.alignItemsEnd, styles.pl3]}>
-                                <Switch
-                                    accessibilityLabel={translate('workspace.accounting.accounts')}
-                                    isOn={!!enableNewCategories}
-                                    onToggle={() =>
-                                        Connections.updatePolicyConnectionConfig(
-                                            policyID,
-                                            CONST.POLICY.CONNECTIONS.NAME.QBO,
-                                            CONST.QUICK_BOOKS_CONFIG.ENABLE_NEW_CATEGORIES,
-                                            !enableNewCategories,
-                                        )
-                                    }
-                                />
-                            </View>
-                        </OfflineWithFeedback>
+            <View style={[styles.flexRow, styles.mb4, styles.alignItemsCenter, styles.justifyContentBetween]}>
+                <View style={styles.flex1}>
+                    <Text fontSize={variables.fontSizeNormal}>{translate('workspace.accounting.import')}</Text>
+                </View>
+                <View style={[styles.flex1, styles.alignItemsEnd, styles.pl3]}>
+                    <Switch
+                        accessibilityLabel={translate('workspace.accounting.accounts')}
+                        isOn
+                        disabled
+                        onToggle={() => {}}
+                    />
+                </View>
+            </View>
+            <MenuItemWithTopDescription
+                interactive={false}
+                title={translate('workspace.common.categories')}
+                description={translate('workspace.common.displayedAs')}
+                wrapperStyle={styles.sectionMenuItemTopDescription}
+            />
+            <Text style={styles.pv5}>{translate('workspace.qbo.accountsSwitchTitle')}</Text>
+            <View style={[styles.flexRow, styles.mb2, styles.alignItemsCenter, styles.justifyContentBetween]}>
+                <View style={styles.flex1}>
+                    <Text fontSize={variables.fontSizeNormal}>{translate('workspace.common.enabled')}</Text>
+                </View>
+                <OfflineWithFeedback pendingAction={pendingFields?.enableNewCategories}>
+                    <View style={[styles.flex1, styles.alignItemsEnd, styles.pl3]}>
+                        <Switch
+                            accessibilityLabel={translate('workspace.accounting.accounts')}
+                            isOn={!!enableNewCategories}
+                            onToggle={() => QuickbooksOnline.updateQuickbooksOnlineEnableNewCategories(policyID, !enableNewCategories)}
+                        />
                     </View>
-                    <View style={styles.flex1}>
-                        <Text style={styles.mutedTextLabel}>{translate('workspace.qbo.accountsSwitchDescription')}</Text>
-                    </View>
-                </ScrollView>
-            </ScreenWrapper>
-        </AccessOrNotFoundWrapper>
+                </OfflineWithFeedback>
+            </View>
+            <View style={styles.flex1}>
+                <Text style={styles.mutedTextLabel}>{translate('workspace.qbo.accountsSwitchDescription')}</Text>
+            </View>
+        </ConnectionLayout>
     );
 }
 
diff --git a/src/pages/workspace/accounting/qbo/import/QuickbooksClassesPage.tsx b/src/pages/workspace/accounting/qbo/import/QuickbooksClassesPage.tsx
index 45b7533648bb..023c676d2018 100644
--- a/src/pages/workspace/accounting/qbo/import/QuickbooksClassesPage.tsx
+++ b/src/pages/workspace/accounting/qbo/import/QuickbooksClassesPage.tsx
@@ -19,9 +19,9 @@ import CONST from '@src/CONST';
 function QuickbooksClassesPage({policy}: WithPolicyProps) {
     const {translate} = useLocalize();
     const styles = useThemeStyles();
-    const policyID = policy?.id ?? '';
+    const policyID = policy?.id ?? '-1';
     const {syncClasses, pendingFields} = policy?.connections?.quickbooksOnline?.config ?? {};
-    const isSwitchOn = Boolean(syncClasses && syncClasses !== CONST.INTEGRATION_ENTITY_MAP_TYPES.NONE);
+    const isSwitchOn = !!(syncClasses && syncClasses !== CONST.INTEGRATION_ENTITY_MAP_TYPES.NONE);
     const isReportFieldsSelected = syncClasses === CONST.INTEGRATION_ENTITY_MAP_TYPES.REPORT_FIELD;
 
     return (
@@ -64,7 +64,7 @@ function QuickbooksClassesPage({policy}: WithPolicyProps) {
                             <MenuItemWithTopDescription
                                 interactive={false}
                                 title={isReportFieldsSelected ? translate('workspace.common.reportFields') : translate('workspace.common.tags')}
-                                description={translate('workspace.qbo.displayedAs')}
+                                description={translate('workspace.common.displayedAs')}
                                 wrapperStyle={styles.sectionMenuItemTopDescription}
                             />
                         </OfflineWithFeedback>
diff --git a/src/pages/workspace/accounting/qbo/import/QuickbooksCustomersPage.tsx b/src/pages/workspace/accounting/qbo/import/QuickbooksCustomersPage.tsx
index 3c38e542d455..6d4f8c8c9f1e 100644
--- a/src/pages/workspace/accounting/qbo/import/QuickbooksCustomersPage.tsx
+++ b/src/pages/workspace/accounting/qbo/import/QuickbooksCustomersPage.tsx
@@ -19,9 +19,9 @@ import CONST from '@src/CONST';
 function QuickbooksCustomersPage({policy}: WithPolicyProps) {
     const {translate} = useLocalize();
     const styles = useThemeStyles();
-    const policyID = policy?.id ?? '';
+    const policyID = policy?.id ?? '-1';
     const {syncCustomers, pendingFields} = policy?.connections?.quickbooksOnline?.config ?? {};
-    const isSwitchOn = Boolean(syncCustomers && syncCustomers !== CONST.INTEGRATION_ENTITY_MAP_TYPES.NONE);
+    const isSwitchOn = !!(syncCustomers && syncCustomers !== CONST.INTEGRATION_ENTITY_MAP_TYPES.NONE);
     const isReportFieldsSelected = syncCustomers === CONST.INTEGRATION_ENTITY_MAP_TYPES.REPORT_FIELD;
     return (
         <AccessOrNotFoundWrapper
@@ -63,7 +63,7 @@ function QuickbooksCustomersPage({policy}: WithPolicyProps) {
                             <MenuItemWithTopDescription
                                 interactive={false}
                                 title={isReportFieldsSelected ? translate('workspace.common.reportFields') : translate('workspace.common.tags')}
-                                description={translate('workspace.qbo.displayedAs')}
+                                description={translate('workspace.common.displayedAs')}
                                 wrapperStyle={styles.sectionMenuItemTopDescription}
                             />
                         </OfflineWithFeedback>
diff --git a/src/pages/workspace/accounting/qbo/import/QuickbooksImportPage.tsx b/src/pages/workspace/accounting/qbo/import/QuickbooksImportPage.tsx
index a0da62f525e1..4ea1b5de427a 100644
--- a/src/pages/workspace/accounting/qbo/import/QuickbooksImportPage.tsx
+++ b/src/pages/workspace/accounting/qbo/import/QuickbooksImportPage.tsx
@@ -17,35 +17,35 @@ import ROUTES from '@src/ROUTES';
 function QuickbooksImportPage({policy}: WithPolicyProps) {
     const {translate} = useLocalize();
     const styles = useThemeStyles();
-    const policyID = policy?.id ?? '';
-    const {syncClasses, syncCustomers, syncLocations, syncTax, enableNewCategories, pendingFields} = policy?.connections?.quickbooksOnline?.config ?? {};
+    const policyID = policy?.id ?? '-1';
+    const {syncClasses, syncCustomers, syncLocations, syncTax, pendingFields} = policy?.connections?.quickbooksOnline?.config ?? {};
 
     const sections = [
         {
             description: translate('workspace.accounting.accounts'),
             action: () => Navigation.navigate(ROUTES.POLICY_ACCOUNTING_QUICKBOOKS_ONLINE_CHART_OF_ACCOUNTS.getRoute(policyID)),
-            hasError: Boolean(policy?.errors?.enableNewCategories),
-            title: enableNewCategories ? translate('workspace.accounting.importAsCategory') : translate('workspace.accounting.importTypes.NONE'),
+            hasError: !!policy?.errors?.enableNewCategories,
+            title: translate('workspace.accounting.importAsCategory'),
             pendingAction: pendingFields?.enableNewCategories,
         },
         {
             description: translate('workspace.qbo.classes'),
             action: () => Navigation.navigate(ROUTES.POLICY_ACCOUNTING_QUICKBOOKS_ONLINE_CLASSES.getRoute(policyID)),
-            hasError: Boolean(policy?.errors?.syncClasses),
+            hasError: !!policy?.errors?.syncClasses,
             title: translate(`workspace.accounting.importTypes.${syncClasses ?? CONST.INTEGRATION_ENTITY_MAP_TYPES.NONE}`),
             pendingAction: pendingFields?.syncClasses,
         },
         {
             description: translate('workspace.qbo.customers'),
             action: () => Navigation.navigate(ROUTES.POLICY_ACCOUNTING_QUICKBOOKS_ONLINE_CUSTOMERS.getRoute(policyID)),
-            hasError: Boolean(policy?.errors?.syncCustomers),
+            hasError: !!policy?.errors?.syncCustomers,
             title: translate(`workspace.accounting.importTypes.${syncCustomers ?? CONST.INTEGRATION_ENTITY_MAP_TYPES.NONE}`),
             pendingAction: pendingFields?.syncCustomers,
         },
         {
             description: translate('workspace.qbo.locations'),
             action: () => Navigation.navigate(ROUTES.POLICY_ACCOUNTING_QUICKBOOKS_ONLINE_LOCATIONS.getRoute(policyID)),
-            hasError: Boolean(policy?.errors?.syncLocations),
+            hasError: !!policy?.errors?.syncLocations,
             title: translate(`workspace.accounting.importTypes.${syncLocations ?? CONST.INTEGRATION_ENTITY_MAP_TYPES.NONE}`),
             pendingAction: pendingFields?.syncLocations,
         },
@@ -55,7 +55,7 @@ function QuickbooksImportPage({policy}: WithPolicyProps) {
         sections.push({
             description: translate('workspace.accounting.taxes'),
             action: () => Navigation.navigate(ROUTES.POLICY_ACCOUNTING_QUICKBOOKS_ONLINE_TAXES.getRoute(policyID)),
-            hasError: Boolean(policy?.errors?.syncTax),
+            hasError: !!policy?.errors?.syncTax,
             title: translate(syncTax ? 'workspace.accounting.imported' : 'workspace.accounting.notImported'),
             pendingAction: pendingFields?.syncTax,
         });
diff --git a/src/pages/workspace/accounting/qbo/import/QuickbooksLocationsPage.tsx b/src/pages/workspace/accounting/qbo/import/QuickbooksLocationsPage.tsx
index 307847809d62..e1fd7ed0d160 100644
--- a/src/pages/workspace/accounting/qbo/import/QuickbooksLocationsPage.tsx
+++ b/src/pages/workspace/accounting/qbo/import/QuickbooksLocationsPage.tsx
@@ -19,9 +19,13 @@ import CONST from '@src/CONST';
 function QuickbooksLocationsPage({policy}: WithPolicyProps) {
     const {translate} = useLocalize();
     const styles = useThemeStyles();
-    const policyID = policy?.id ?? '';
-    const {syncLocations, pendingFields} = policy?.connections?.quickbooksOnline?.config ?? {};
-    const isSwitchOn = Boolean(syncLocations && syncLocations !== CONST.INTEGRATION_ENTITY_MAP_TYPES.NONE);
+    const policyID = policy?.id ?? '-1';
+    const {syncLocations, pendingFields, reimbursableExpensesExportDestination, nonReimbursableExpensesExportDestination} = policy?.connections?.quickbooksOnline?.config ?? {};
+    const isSwitchOn = !!(syncLocations && syncLocations !== CONST.INTEGRATION_ENTITY_MAP_TYPES.NONE);
+    const canImportLocation =
+        reimbursableExpensesExportDestination === CONST.QUICKBOOKS_REIMBURSABLE_ACCOUNT_TYPE.JOURNAL_ENTRY &&
+        nonReimbursableExpensesExportDestination !== CONST.QUICKBOOKS_NON_REIMBURSABLE_EXPORT_ACCOUNT_TYPE.VENDOR_BILL;
+    const shouldBeDisabled = !canImportLocation && !isSwitchOn;
     const isReportFieldsSelected = syncLocations === CONST.INTEGRATION_ENTITY_MAP_TYPES.REPORT_FIELD;
 
     return (
@@ -55,6 +59,7 @@ function QuickbooksLocationsPage({policy}: WithPolicyProps) {
                                             isSwitchOn ? CONST.INTEGRATION_ENTITY_MAP_TYPES.NONE : CONST.INTEGRATION_ENTITY_MAP_TYPES.TAG,
                                         )
                                     }
+                                    disabled={shouldBeDisabled}
                                 />
                             </View>
                         </OfflineWithFeedback>
@@ -64,14 +69,16 @@ function QuickbooksLocationsPage({policy}: WithPolicyProps) {
                             <MenuItemWithTopDescription
                                 interactive={false}
                                 title={isReportFieldsSelected ? translate('workspace.common.reportFields') : translate('workspace.common.tags')}
-                                description={translate('workspace.qbo.displayedAs')}
+                                description={translate('workspace.common.displayedAs')}
                                 wrapperStyle={styles.sectionMenuItemTopDescription}
                             />
                         </OfflineWithFeedback>
                     )}
-                    <View style={[styles.flex1, styles.flexRow, styles.alignItemsCenter, styles.gap2, styles.mt1]}>
-                        <Text style={styles.mutedTextLabel}>{translate('workspace.qbo.locationsAdditionalDescription')}</Text>
-                    </View>
+                    {shouldBeDisabled && (
+                        <View style={[styles.flex1, styles.flexRow, styles.alignItemsCenter, styles.gap2, styles.mt1]}>
+                            <Text style={styles.mutedTextLabel}>{translate('workspace.qbo.locationsAdditionalDescription')}</Text>
+                        </View>
+                    )}
                 </ScrollView>
             </ScreenWrapper>
         </AccessOrNotFoundWrapper>
diff --git a/src/pages/workspace/accounting/qbo/import/QuickbooksTaxesPage.tsx b/src/pages/workspace/accounting/qbo/import/QuickbooksTaxesPage.tsx
index 9cd6e9e1653f..30680d2c935a 100644
--- a/src/pages/workspace/accounting/qbo/import/QuickbooksTaxesPage.tsx
+++ b/src/pages/workspace/accounting/qbo/import/QuickbooksTaxesPage.tsx
@@ -18,8 +18,10 @@ import CONST from '@src/CONST';
 function QuickbooksTaxesPage({policy}: WithPolicyProps) {
     const {translate} = useLocalize();
     const styles = useThemeStyles();
-    const policyID = policy?.id ?? '';
-    const {syncTax, pendingFields} = policy?.connections?.quickbooksOnline?.config ?? {};
+    const policyID = policy?.id ?? '-1';
+    const {syncTax, pendingFields, reimbursableExpensesExportDestination} = policy?.connections?.quickbooksOnline?.config ?? {};
+    const isJournalExportEntity = reimbursableExpensesExportDestination === CONST.QUICKBOOKS_REIMBURSABLE_ACCOUNT_TYPE.JOURNAL_ENTRY;
+
     return (
         <AccessOrNotFoundWrapper
             accessVariants={[CONST.POLICY.ACCESS_VARIANTS.ADMIN]}
@@ -44,10 +46,12 @@ function QuickbooksTaxesPage({policy}: WithPolicyProps) {
                                     accessibilityLabel={translate('workspace.accounting.taxes')}
                                     isOn={!!syncTax}
                                     onToggle={() => Connections.updatePolicyConnectionConfig(policyID, CONST.POLICY.CONNECTIONS.NAME.QBO, CONST.QUICK_BOOKS_CONFIG.SYNC_TAX, !syncTax)}
+                                    disabled={!syncTax && isJournalExportEntity}
                                 />
                             </View>
                         </OfflineWithFeedback>
                     </View>
+                    {!syncTax && isJournalExportEntity && <Text style={[styles.mutedNormalTextLabel, styles.pt2]}>{translate('workspace.qbo.taxesJournalEntrySwitchNote')}</Text>}
                 </ScrollView>
             </ScreenWrapper>
         </AccessOrNotFoundWrapper>
diff --git a/src/pages/workspace/accounting/reconciliation/CardReconciliationPage.tsx b/src/pages/workspace/accounting/reconciliation/CardReconciliationPage.tsx
new file mode 100644
index 000000000000..c907095c4301
--- /dev/null
+++ b/src/pages/workspace/accounting/reconciliation/CardReconciliationPage.tsx
@@ -0,0 +1,125 @@
+import type {StackScreenProps} from '@react-navigation/stack';
+import React, {useCallback} from 'react';
+import {useOnyx} from 'react-native-onyx';
+import HeaderWithBackButton from '@components/HeaderWithBackButton';
+import MenuItemWithTopDescription from '@components/MenuItemWithTopDescription';
+import ScreenWrapper from '@components/ScreenWrapper';
+import ScrollView from '@components/ScrollView';
+import Text from '@components/Text';
+import TextLink from '@components/TextLink';
+import useLocalize from '@hooks/useLocalize';
+import useThemeStyles from '@hooks/useThemeStyles';
+import * as AccountingUtils from '@libs/AccountingUtils';
+import Navigation from '@navigation/Navigation';
+import type {SettingsNavigatorParamList} from '@navigation/types';
+import AccessOrNotFoundWrapper from '@pages/workspace/AccessOrNotFoundWrapper';
+import type {WithPolicyConnectionsProps} from '@pages/workspace/withPolicyConnections';
+import withPolicyConnections from '@pages/workspace/withPolicyConnections';
+import ToggleSettingOptionRow from '@pages/workspace/workflows/ToggleSettingsOptionRow';
+import * as Card from '@userActions/Card';
+import CONST from '@src/CONST';
+import ONYXKEYS from '@src/ONYXKEYS';
+import ROUTES from '@src/ROUTES';
+import type SCREENS from '@src/SCREENS';
+import type {ConnectionName} from '@src/types/onyx/Policy';
+
+type CardReconciliationPageProps = WithPolicyConnectionsProps & StackScreenProps<SettingsNavigatorParamList, typeof SCREENS.WORKSPACE.ACCOUNTING.CARD_RECONCILIATION>;
+
+function CardReconciliationPage({policy, route}: CardReconciliationPageProps) {
+    const styles = useThemeStyles();
+    const {translate} = useLocalize();
+
+    const workspaceAccountID = policy?.workspaceAccountID ?? -1;
+
+    const [isContinuousReconciliationOn] = useOnyx(`${ONYXKEYS.COLLECTION.EXPENSIFY_CARD_USE_CONTINUOUS_RECONCILIATION}${workspaceAccountID}`);
+    const [cardSettings] = useOnyx(`${ONYXKEYS.COLLECTION.PRIVATE_EXPENSIFY_CARD_SETTINGS}${workspaceAccountID}`);
+    const [currentConnectionName] = useOnyx(`${ONYXKEYS.COLLECTION.EXPENSIFY_CARD_CONTINUOUS_RECONCILIATION_CONNECTION}${workspaceAccountID}`);
+    const [bankAccountList] = useOnyx(ONYXKEYS.BANK_ACCOUNT_LIST);
+
+    const paymentBankAccountID = cardSettings?.paymentBankAccountID ?? 0;
+    const bankAccountTitle = bankAccountList?.[paymentBankAccountID]?.title ?? '';
+
+    const policyID = policy?.id ?? '-1';
+    const {connection} = route.params;
+    const connectionName = AccountingUtils.getConnectionNameFromRouteParam(connection) as ConnectionName;
+    const autoSync = !!policy?.connections?.[connectionName]?.config?.autoSync?.enabled;
+
+    const toggleContinuousReconciliation = (value: boolean) => {
+        Card.toggleContinuousReconciliation(workspaceAccountID, value, connectionName, currentConnectionName);
+        if (value) {
+            Navigation.navigate(ROUTES.WORKSPACE_ACCOUNTING_RECONCILIATION_ACCOUNT_SETTINGS.getRoute(policyID, connection));
+        }
+    };
+
+    const navigateToAdvancedSettings = useCallback(() => {
+        switch (connection) {
+            case CONST.POLICY.CONNECTIONS.ROUTE.QBO:
+                Navigation.navigate(ROUTES.WORKSPACE_ACCOUNTING_QUICKBOOKS_ONLINE_ADVANCED.getRoute(policyID));
+                break;
+            case CONST.POLICY.CONNECTIONS.ROUTE.XERO:
+                Navigation.navigate(ROUTES.POLICY_ACCOUNTING_XERO_ADVANCED.getRoute(policyID));
+                break;
+            case CONST.POLICY.CONNECTIONS.ROUTE.NETSUITE:
+                Navigation.navigate(ROUTES.POLICY_ACCOUNTING_NETSUITE_ADVANCED.getRoute(policyID));
+                break;
+            case CONST.POLICY.CONNECTIONS.ROUTE.SAGE_INTACCT:
+                Navigation.navigate(ROUTES.POLICY_ACCOUNTING_SAGE_INTACCT_ADVANCED.getRoute(policyID));
+                break;
+            default:
+                break;
+        }
+    }, [connection, policyID]);
+
+    return (
+        <AccessOrNotFoundWrapper
+            policyID={policyID}
+            accessVariants={[CONST.POLICY.ACCESS_VARIANTS.ADMIN, CONST.POLICY.ACCESS_VARIANTS.PAID]}
+            featureName={CONST.POLICY.MORE_FEATURES.ARE_CONNECTIONS_ENABLED}
+        >
+            <ScreenWrapper
+                includeSafeAreaPaddingBottom={false}
+                shouldEnableMaxHeight
+                testID={CardReconciliationPage.displayName}
+            >
+                <HeaderWithBackButton title={translate('workspace.accounting.cardReconciliation')} />
+                <ScrollView contentContainerStyle={styles.pb5}>
+                    <ToggleSettingOptionRow
+                        key={translate('workspace.accounting.continuousReconciliation')}
+                        title={translate('workspace.accounting.continuousReconciliation')}
+                        subtitle={translate('workspace.accounting.saveHoursOnReconciliation')}
+                        shouldPlaceSubtitleBelowSwitch
+                        switchAccessibilityLabel={translate('workspace.accounting.continuousReconciliation')}
+                        disabled={!autoSync}
+                        isActive={!!isContinuousReconciliationOn}
+                        onToggle={toggleContinuousReconciliation}
+                        wrapperStyle={styles.ph5}
+                    />
+                    {!autoSync && (
+                        <Text style={[styles.mutedNormalTextLabel, styles.ph5, styles.mt2]}>
+                            {translate('workspace.accounting.enableContinuousReconciliation')}
+                            <TextLink
+                                style={styles.fontSizeLabel}
+                                onPress={navigateToAdvancedSettings}
+                            >
+                                {translate('workspace.accounting.autoSync').toLowerCase()}
+                            </TextLink>{' '}
+                            {translate('common.conjunctionFor')} {CONST.POLICY.CONNECTIONS.NAME_USER_FRIENDLY[connectionName]}
+                        </Text>
+                    )}
+                    {!!paymentBankAccountID && isContinuousReconciliationOn && (
+                        <MenuItemWithTopDescription
+                            style={styles.mt5}
+                            title={bankAccountTitle}
+                            description={translate('workspace.accounting.reconciliationAccount')}
+                            shouldShowRightIcon
+                        />
+                    )}
+                </ScrollView>
+            </ScreenWrapper>
+        </AccessOrNotFoundWrapper>
+    );
+}
+
+CardReconciliationPage.displayName = 'CardReconciliationPage';
+
+export default withPolicyConnections(CardReconciliationPage);
diff --git a/src/pages/workspace/accounting/reconciliation/ReconciliationAccountSettingsPage.tsx b/src/pages/workspace/accounting/reconciliation/ReconciliationAccountSettingsPage.tsx
new file mode 100644
index 000000000000..1d2468e2e4e4
--- /dev/null
+++ b/src/pages/workspace/accounting/reconciliation/ReconciliationAccountSettingsPage.tsx
@@ -0,0 +1,87 @@
+import type {StackScreenProps} from '@react-navigation/stack';
+import React, {useMemo} from 'react';
+import {useOnyx} from 'react-native-onyx';
+import ConnectionLayout from '@components/ConnectionLayout';
+import SelectionList from '@components/SelectionList';
+import RadioListItem from '@components/SelectionList/RadioListItem';
+import Text from '@components/Text';
+import TextLink from '@components/TextLink';
+import useLocalize from '@hooks/useLocalize';
+import useThemeStyles from '@hooks/useThemeStyles';
+import * as AccountingUtils from '@libs/AccountingUtils';
+import {getLastFourDigits} from '@libs/BankAccountUtils';
+import * as PolicyUtils from '@libs/PolicyUtils';
+import Navigation from '@navigation/Navigation';
+import type {SettingsNavigatorParamList} from '@navigation/types';
+import CONST from '@src/CONST';
+import ONYXKEYS from '@src/ONYXKEYS';
+import ROUTES from '@src/ROUTES';
+import type SCREENS from '@src/SCREENS';
+
+type ReconciliationAccountSettingsPageProps = StackScreenProps<SettingsNavigatorParamList, typeof SCREENS.WORKSPACE.ACCOUNTING.RECONCILIATION_ACCOUNT_SETTINGS>;
+
+function ReconciliationAccountSettingsPage({route}: ReconciliationAccountSettingsPageProps) {
+    const {policyID, connection} = route.params;
+
+    const styles = useThemeStyles();
+    const {translate} = useLocalize();
+
+    const workspaceAccountID = PolicyUtils.getWorkspaceAccountID(policyID);
+    const connectionName = AccountingUtils.getConnectionNameFromRouteParam(connection);
+
+    const [bankAccountList] = useOnyx(ONYXKEYS.BANK_ACCOUNT_LIST);
+    const [cardSettings] = useOnyx(`${ONYXKEYS.COLLECTION.PRIVATE_EXPENSIFY_CARD_SETTINGS}${workspaceAccountID}`);
+    const paymentBankAccountID = cardSettings?.paymentBankAccountID ?? 0;
+
+    const selectedBankAccount = useMemo(() => bankAccountList?.[paymentBankAccountID.toString()], [paymentBankAccountID, bankAccountList]);
+    const bankAccountNumber = useMemo(() => selectedBankAccount?.accountData?.accountNumber ?? '', [selectedBankAccount]);
+    const settlementAccountEnding = getLastFourDigits(bankAccountNumber);
+
+    const sections = useMemo(() => {
+        const data = Object.values(bankAccountList ?? {}).map((bankAccount) => ({
+            text: bankAccount.title,
+            value: bankAccount.accountData?.bankAccountID,
+            keyForList: bankAccount.accountData?.bankAccountID?.toString(),
+            isSelected: bankAccount.accountData?.bankAccountID === selectedBankAccount?.accountData?.bankAccountID,
+        }));
+        return [{data}];
+    }, [bankAccountList, selectedBankAccount]);
+
+    const selectBankAccount = () => {
+        // TODO: add API call when it's implemented https://github.com/Expensify/Expensify/issues/407836
+        // Navigation.goBack();
+    };
+
+    return (
+        <ConnectionLayout
+            displayName={ReconciliationAccountSettingsPage.displayName}
+            headerTitle="workspace.accounting.reconciliationAccount"
+            accessVariants={[CONST.POLICY.ACCESS_VARIANTS.ADMIN, CONST.POLICY.ACCESS_VARIANTS.PAID]}
+            policyID={policyID}
+            featureName={CONST.POLICY.MORE_FEATURES.ARE_CONNECTIONS_ENABLED}
+            contentContainerStyle={[styles.flex1, styles.pb2]}
+            connectionName={connectionName}
+            shouldUseScrollView={false}
+        >
+            <Text style={[styles.textNormal, styles.mb5, styles.ph5]}>{translate('workspace.accounting.chooseReconciliationAccount.chooseBankAccount')}</Text>
+            <Text style={[styles.textNormal, styles.mb6, styles.ph5]}>
+                {translate('workspace.accounting.chooseReconciliationAccount.accountMatches')}
+                <TextLink onPress={() => Navigation.navigate(ROUTES.WORKSPACE_EXPENSIFY_CARD_SETTINGS_ACCOUNT.getRoute(policyID))}>
+                    {translate('workspace.accounting.chooseReconciliationAccount.settlementAccount')}
+                </TextLink>
+                {translate('workspace.accounting.chooseReconciliationAccount.reconciliationWorks', settlementAccountEnding)}
+            </Text>
+
+            <SelectionList
+                sections={sections}
+                onSelectRow={selectBankAccount}
+                ListItem={RadioListItem}
+                initiallyFocusedOptionKey={selectedBankAccount?.accountData?.bankAccountID?.toString()}
+            />
+        </ConnectionLayout>
+    );
+}
+
+ReconciliationAccountSettingsPage.displayName = 'ReconciliationAccountSettingsPage';
+
+export default ReconciliationAccountSettingsPage;
diff --git a/src/pages/workspace/accounting/types.ts b/src/pages/workspace/accounting/types.ts
new file mode 100644
index 000000000000..ed4f11312f2a
--- /dev/null
+++ b/src/pages/workspace/accounting/types.ts
@@ -0,0 +1,44 @@
+import type {OnyxEntry} from 'react-native-onyx';
+import type {MenuItemProps} from '@components/MenuItem';
+import type {OfflineWithFeedbackProps} from '@components/OfflineWithFeedback';
+import type {WithPolicyConnectionsProps} from '@pages/workspace/withPolicyConnections';
+import type {Policy, PolicyConnectionSyncProgress} from '@src/types/onyx';
+import type {ErrorFields, PendingFields} from '@src/types/onyx/OnyxCommon';
+import type IconAsset from '@src/types/utils/IconAsset';
+
+type MenuItemData = MenuItemProps & {pendingAction?: OfflineWithFeedbackProps['pendingAction']; errors?: OfflineWithFeedbackProps['errors']};
+
+type PolicyAccountingPageOnyxProps = {
+    connectionSyncProgress: OnyxEntry<PolicyConnectionSyncProgress>;
+};
+
+type PolicyAccountingPageProps = WithPolicyConnectionsProps &
+    PolicyAccountingPageOnyxProps & {
+        // This is not using OnyxEntry<OnyxTypes.Policy> because the HOC withPolicyConnections will only render this component if there is a policy
+        policy: Policy;
+    };
+
+type WorkspaceUpgradeNavigationDetails = {
+    /** Integration alias for workspace upgrade navigation. If passed, and the user doesn't have control policy, they will be redirected to the upgrade page */
+    integrationAlias: string;
+    /** Route to redirect to after upgrading the workspace */
+    backToAfterWorkspaceUpgradeRoute: string;
+};
+
+type AccountingIntegration = {
+    title: string;
+    icon: IconAsset;
+    setupConnectionFlow: React.ReactNode;
+    onImportPagePress: () => void;
+    subscribedImportSettings?: string[];
+    onExportPagePress: () => void;
+    subscribedExportSettings?: string[];
+    onAdvancedPagePress: () => void;
+    subscribedAdvancedSettings?: string[];
+    onCardReconciliationPagePress: () => void;
+    pendingFields?: PendingFields<string>;
+    errorFields?: ErrorFields;
+    workspaceUpgradeNavigationDetails?: WorkspaceUpgradeNavigationDetails;
+};
+
+export type {MenuItemData, PolicyAccountingPageOnyxProps, PolicyAccountingPageProps, AccountingIntegration};
diff --git a/src/pages/workspace/accounting/utils.tsx b/src/pages/workspace/accounting/utils.tsx
new file mode 100644
index 000000000000..05ee41b85b9b
--- /dev/null
+++ b/src/pages/workspace/accounting/utils.tsx
@@ -0,0 +1,140 @@
+import React from 'react';
+import ConnectToNetSuiteFlow from '@components/ConnectToNetSuiteFlow';
+import ConnectToQuickbooksOnlineFlow from '@components/ConnectToQuickbooksOnlineFlow';
+import ConnectToSageIntacctFlow from '@components/ConnectToSageIntacctFlow';
+import ConnectToXeroFlow from '@components/ConnectToXeroFlow';
+import * as Expensicons from '@components/Icon/Expensicons';
+import type {LocaleContextProps} from '@components/LocaleContextProvider';
+import Navigation from '@navigation/Navigation';
+import {getTrackingCategories} from '@userActions/connections/Xero';
+import CONST from '@src/CONST';
+import ROUTES from '@src/ROUTES';
+import type {Policy} from '@src/types/onyx';
+import type {PolicyConnectionName} from '@src/types/onyx/Policy';
+import type {AccountingIntegration} from './types';
+
+function getAccountingIntegrationData(
+    connectionName: PolicyConnectionName,
+    policyID: string,
+    translate: LocaleContextProps['translate'],
+    policy?: Policy,
+    key?: number,
+): AccountingIntegration | undefined {
+    switch (connectionName) {
+        case CONST.POLICY.CONNECTIONS.NAME.QBO:
+            return {
+                title: translate('workspace.accounting.qbo'),
+                icon: Expensicons.QBOSquare,
+                setupConnectionFlow: (
+                    <ConnectToQuickbooksOnlineFlow
+                        policyID={policyID}
+                        key={key}
+                    />
+                ),
+                onImportPagePress: () => Navigation.navigate(ROUTES.POLICY_ACCOUNTING_QUICKBOOKS_ONLINE_IMPORT.getRoute(policyID)),
+                onExportPagePress: () => Navigation.navigate(ROUTES.POLICY_ACCOUNTING_QUICKBOOKS_ONLINE_EXPORT.getRoute(policyID)),
+                onCardReconciliationPagePress: () => Navigation.navigate(ROUTES.WORKSPACE_ACCOUNTING_CARD_RECONCILIATION.getRoute(policyID, CONST.POLICY.CONNECTIONS.ROUTE.QBO)),
+                onAdvancedPagePress: () => Navigation.navigate(ROUTES.WORKSPACE_ACCOUNTING_QUICKBOOKS_ONLINE_ADVANCED.getRoute(policyID)),
+            };
+        case CONST.POLICY.CONNECTIONS.NAME.XERO:
+            return {
+                title: translate('workspace.accounting.xero'),
+                icon: Expensicons.XeroSquare,
+                setupConnectionFlow: (
+                    <ConnectToXeroFlow
+                        policyID={policyID}
+                        key={key}
+                    />
+                ),
+                onImportPagePress: () => Navigation.navigate(ROUTES.POLICY_ACCOUNTING_XERO_IMPORT.getRoute(policyID)),
+                subscribedImportSettings: [
+                    CONST.XERO_CONFIG.ENABLE_NEW_CATEGORIES,
+                    CONST.XERO_CONFIG.IMPORT_TRACKING_CATEGORIES,
+                    CONST.XERO_CONFIG.IMPORT_CUSTOMERS,
+                    CONST.XERO_CONFIG.IMPORT_TAX_RATES,
+                    ...getTrackingCategories(policy).map((category) => `${CONST.XERO_CONFIG.TRACKING_CATEGORY_PREFIX}${category.id}`),
+                ],
+                onExportPagePress: () => Navigation.navigate(ROUTES.POLICY_ACCOUNTING_XERO_EXPORT.getRoute(policyID)),
+                subscribedExportSettings: [CONST.XERO_CONFIG.EXPORTER, CONST.XERO_CONFIG.BILL_DATE, CONST.XERO_CONFIG.BILL_STATUS, CONST.XERO_CONFIG.NON_REIMBURSABLE_ACCOUNT],
+                onCardReconciliationPagePress: () => Navigation.navigate(ROUTES.WORKSPACE_ACCOUNTING_CARD_RECONCILIATION.getRoute(policyID, CONST.POLICY.CONNECTIONS.ROUTE.XERO)),
+                onAdvancedPagePress: () => Navigation.navigate(ROUTES.POLICY_ACCOUNTING_XERO_ADVANCED.getRoute(policyID)),
+                subscribedAdvancedSettings: [
+                    CONST.XERO_CONFIG.ENABLED,
+                    CONST.XERO_CONFIG.SYNC_REIMBURSED_REPORTS,
+                    CONST.XERO_CONFIG.REIMBURSEMENT_ACCOUNT_ID,
+                    CONST.XERO_CONFIG.INVOICE_COLLECTIONS_ACCOUNT_ID,
+                ],
+                pendingFields: policy?.connections?.xero?.config?.pendingFields,
+                errorFields: policy?.connections?.xero?.config?.errorFields,
+            };
+        case CONST.POLICY.CONNECTIONS.NAME.NETSUITE:
+            return {
+                title: translate('workspace.accounting.netsuite'),
+                icon: Expensicons.NetSuiteSquare,
+                setupConnectionFlow: (
+                    <ConnectToNetSuiteFlow
+                        policyID={policyID}
+                        key={key}
+                    />
+                ),
+                onImportPagePress: () => Navigation.navigate(ROUTES.POLICY_ACCOUNTING_NETSUITE_IMPORT.getRoute(policyID)),
+                onExportPagePress: () => Navigation.navigate(ROUTES.POLICY_ACCOUNTING_NETSUITE_EXPORT.getRoute(policyID)),
+                onCardReconciliationPagePress: () => Navigation.navigate(ROUTES.WORKSPACE_ACCOUNTING_CARD_RECONCILIATION.getRoute(policyID, CONST.POLICY.CONNECTIONS.ROUTE.NETSUITE)),
+                onAdvancedPagePress: () => Navigation.navigate(ROUTES.POLICY_ACCOUNTING_NETSUITE_ADVANCED.getRoute(policyID)),
+                workspaceUpgradeNavigationDetails: {
+                    integrationAlias: CONST.UPGRADE_FEATURE_INTRO_MAPPING.netsuite.alias,
+                    backToAfterWorkspaceUpgradeRoute: ROUTES.POLICY_ACCOUNTING_NETSUITE_TOKEN_INPUT.getRoute(policyID),
+                },
+            };
+        case CONST.POLICY.CONNECTIONS.NAME.SAGE_INTACCT:
+            return {
+                title: translate('workspace.accounting.intacct'),
+                icon: Expensicons.IntacctSquare,
+                setupConnectionFlow: (
+                    <ConnectToSageIntacctFlow
+                        policyID={policyID}
+                        key={key}
+                    />
+                ),
+                onImportPagePress: () => Navigation.navigate(ROUTES.POLICY_ACCOUNTING_SAGE_INTACCT_IMPORT.getRoute(policyID)),
+                subscribedImportSettings: [
+                    CONST.SAGE_INTACCT_CONFIG.SYNC_ITEMS,
+                    ...Object.values(CONST.SAGE_INTACCT_CONFIG.MAPPINGS),
+                    CONST.SAGE_INTACCT_CONFIG.TAX,
+                    ...(policy?.connections?.intacct?.config?.mappings?.dimensions ?? []).map((dimension) => `${CONST.SAGE_INTACCT_CONFIG.DIMENSION_PREFIX}${dimension.dimension}`),
+                ],
+                onExportPagePress: () => Navigation.navigate(ROUTES.POLICY_ACCOUNTING_SAGE_INTACCT_EXPORT.getRoute(policyID)),
+                subscribedExportSettings: [
+                    CONST.SAGE_INTACCT_CONFIG.EXPORTER,
+                    CONST.SAGE_INTACCT_CONFIG.EXPORT_DATE,
+                    CONST.SAGE_INTACCT_CONFIG.REIMBURSABLE,
+                    CONST.SAGE_INTACCT_CONFIG.REIMBURSABLE_VENDOR,
+                    CONST.SAGE_INTACCT_CONFIG.NON_REIMBURSABLE,
+                    CONST.SAGE_INTACCT_CONFIG.NON_REIMBURSABLE_ACCOUNT,
+                    policy?.connections?.intacct?.config?.export?.nonReimbursable === CONST.SAGE_INTACCT_NON_REIMBURSABLE_EXPENSE_TYPE.VENDOR_BILL
+                        ? CONST.SAGE_INTACCT_CONFIG.NON_REIMBURSABLE_VENDOR
+                        : CONST.SAGE_INTACCT_CONFIG.NON_REIMBURSABLE_CREDIT_CARD_VENDOR,
+                ],
+                onCardReconciliationPagePress: () => Navigation.navigate(ROUTES.WORKSPACE_ACCOUNTING_CARD_RECONCILIATION.getRoute(policyID, CONST.POLICY.CONNECTIONS.ROUTE.SAGE_INTACCT)),
+                onAdvancedPagePress: () => Navigation.navigate(ROUTES.POLICY_ACCOUNTING_SAGE_INTACCT_ADVANCED.getRoute(policyID)),
+                subscribedAdvancedSettings: [
+                    CONST.SAGE_INTACCT_CONFIG.AUTO_SYNC_ENABLED,
+                    CONST.SAGE_INTACCT_CONFIG.IMPORT_EMPLOYEES,
+                    CONST.SAGE_INTACCT_CONFIG.APPROVAL_MODE,
+                    CONST.SAGE_INTACCT_CONFIG.SYNC_REIMBURSED_REPORTS,
+                    CONST.SAGE_INTACCT_CONFIG.REIMBURSEMENT_ACCOUNT_ID,
+                ],
+                workspaceUpgradeNavigationDetails: {
+                    integrationAlias: CONST.UPGRADE_FEATURE_INTRO_MAPPING.intacct.alias,
+                    backToAfterWorkspaceUpgradeRoute: ROUTES.POLICY_ACCOUNTING_SAGE_INTACCT_PREREQUISITES.getRoute(policyID),
+                },
+                pendingFields: policy?.connections?.intacct?.config?.pendingFields,
+                errorFields: policy?.connections?.intacct?.config?.errorFields,
+            };
+        default:
+            return undefined;
+    }
+}
+
+// eslint-disable-next-line import/prefer-default-export
+export {getAccountingIntegrationData};
diff --git a/src/pages/workspace/accounting/xero/XeroImportPage.tsx b/src/pages/workspace/accounting/xero/XeroImportPage.tsx
index 13011b1952ac..87f4b3a8ac9a 100644
--- a/src/pages/workspace/accounting/xero/XeroImportPage.tsx
+++ b/src/pages/workspace/accounting/xero/XeroImportPage.tsx
@@ -1,17 +1,16 @@
 import React, {useMemo} from 'react';
-import HeaderWithBackButton from '@components/HeaderWithBackButton';
+import ConnectionLayout from '@components/ConnectionLayout';
 import MenuItemWithTopDescription from '@components/MenuItemWithTopDescription';
 import OfflineWithFeedback from '@components/OfflineWithFeedback';
-import ScreenWrapper from '@components/ScreenWrapper';
-import ScrollView from '@components/ScrollView';
 import Text from '@components/Text';
 import useLocalize from '@hooks/useLocalize';
 import useThemeStyles from '@hooks/useThemeStyles';
 import Navigation from '@libs/Navigation/Navigation';
-import {getXeroTenants} from '@libs/PolicyUtils';
-import AccessOrNotFoundWrapper from '@pages/workspace/AccessOrNotFoundWrapper';
+import {getCurrentXeroOrganizationName} from '@libs/PolicyUtils';
+import * as PolicyUtils from '@libs/PolicyUtils';
 import withPolicy from '@pages/workspace/withPolicy';
 import type {WithPolicyProps} from '@pages/workspace/withPolicy';
+import {getTrackingCategories} from '@userActions/connections/Xero';
 import CONST from '@src/CONST';
 import ROUTES from '@src/ROUTES';
 
@@ -19,96 +18,75 @@ function XeroImportPage({policy}: WithPolicyProps) {
     const {translate} = useLocalize();
     const styles = useThemeStyles();
 
-    const policyID = policy?.id ?? '';
-    const {importCustomers, importTaxRates, importTrackingCategories, pendingFields} = policy?.connections?.xero?.config ?? {};
+    const policyID = policy?.id ?? '-1';
+    const {importCustomers, importTaxRates, importTrackingCategories, pendingFields, errorFields} = policy?.connections?.xero?.config ?? {};
 
-    const tenants = useMemo(() => getXeroTenants(policy ?? undefined), [policy]);
-    const currentXeroOrganization = tenants.find((tenant) => tenant.id === policy?.connections?.xero.config.tenantID);
+    const currentXeroOrganizationName = useMemo(() => getCurrentXeroOrganizationName(policy ?? undefined), [policy]);
 
     const sections = useMemo(
         () => [
             {
                 description: translate('workspace.accounting.accounts'),
-                action: () => {},
-                hasError: !!policy?.errors?.enableNewCategories,
-                title: translate('workspace.accounting.imported'),
-                pendingAction: pendingFields?.enableNewCategories,
+                action: () => Navigation.navigate(ROUTES.POLICY_ACCOUNTING_XERO_CHART_OF_ACCOUNTS.getRoute(policyID)),
+                title: translate('workspace.accounting.importAsCategory'),
+                subscribedSettings: [CONST.XERO_CONFIG.ENABLE_NEW_CATEGORIES],
             },
             {
                 description: translate('workspace.xero.trackingCategories'),
-                action: () => {},
-                hasError: !!policy?.errors?.importTrackingCategories,
-                title: importTrackingCategories ? translate('workspace.accounting.importTypes.TAG') : translate('workspace.xero.notImported'),
-                pendingAction: pendingFields?.importTrackingCategories,
+                action: () => Navigation.navigate(ROUTES.POLICY_ACCOUNTING_XERO_TRACKING_CATEGORIES.getRoute(policyID)),
+                title: importTrackingCategories ? translate('workspace.accounting.imported') : translate('workspace.xero.notImported'),
+                subscribedSettings: [
+                    CONST.XERO_CONFIG.IMPORT_TRACKING_CATEGORIES,
+                    ...getTrackingCategories(policy).map((category) => `${CONST.XERO_CONFIG.TRACKING_CATEGORY_PREFIX}${category.id}`),
+                ],
             },
             {
                 description: translate('workspace.xero.customers'),
                 action: () => {
                     Navigation.navigate(ROUTES.POLICY_ACCOUNTING_XERO_CUSTOMER.getRoute(policyID));
                 },
-                hasError: !!policy?.errors?.importCustomers,
                 title: importCustomers ? translate('workspace.accounting.importTypes.TAG') : translate('workspace.xero.notImported'),
-                pendingAction: pendingFields?.importCustomers,
+                subscribedSettings: [CONST.XERO_CONFIG.IMPORT_CUSTOMERS],
             },
             {
                 description: translate('workspace.accounting.taxes'),
                 action: () => Navigation.navigate(ROUTES.POLICY_ACCOUNTING_XERO_TAXES.getRoute(policyID)),
-                hasError: !!policy?.errors?.importTaxes,
                 title: importTaxRates ? translate('workspace.accounting.imported') : translate('workspace.xero.notImported'),
-                pendingAction: pendingFields?.importTaxRates,
+                subscribedSettings: [CONST.XERO_CONFIG.IMPORT_TAX_RATES],
             },
         ],
-        [
-            importCustomers,
-            importTaxRates,
-            importTrackingCategories,
-            pendingFields?.enableNewCategories,
-            pendingFields?.importTaxRates,
-            pendingFields?.importCustomers,
-            pendingFields?.importTrackingCategories,
-            policy?.errors?.importTrackingCategories,
-            policy?.errors?.enableNewCategories,
-            policy?.errors?.importCustomers,
-            policy?.errors?.importTaxes,
-            translate,
-            policyID,
-        ],
+        [translate, policy, importTrackingCategories, importCustomers, importTaxRates, policyID],
     );
 
     return (
-        <AccessOrNotFoundWrapper
+        <ConnectionLayout
+            displayName={XeroImportPage.displayName}
+            headerTitle="workspace.accounting.import"
+            headerSubtitle={currentXeroOrganizationName}
             accessVariants={[CONST.POLICY.ACCESS_VARIANTS.ADMIN, CONST.POLICY.ACCESS_VARIANTS.PAID]}
             policyID={policyID}
             featureName={CONST.POLICY.MORE_FEATURES.ARE_CONNECTIONS_ENABLED}
+            contentContainerStyle={styles.pb2}
+            titleStyle={styles.ph5}
+            connectionName={CONST.POLICY.CONNECTIONS.NAME.XERO}
         >
-            <ScreenWrapper
-                includeSafeAreaPaddingBottom={false}
-                shouldEnableMaxHeight
-                testID={XeroImportPage.displayName}
-            >
-                <HeaderWithBackButton
-                    title={translate('workspace.accounting.import')}
-                    subtitle={currentXeroOrganization?.name}
-                />
-                <ScrollView contentContainerStyle={styles.pb2}>
-                    <Text style={[styles.ph5, styles.pb5]}>{translate('workspace.xero.importDescription')}</Text>
-                    {sections.map((section) => (
-                        <OfflineWithFeedback
-                            key={section.description}
-                            pendingAction={section.pendingAction}
-                        >
-                            <MenuItemWithTopDescription
-                                title={section.title}
-                                description={section.description}
-                                shouldShowRightIcon
-                                onPress={section.action}
-                                brickRoadIndicator={section.hasError ? CONST.BRICK_ROAD_INDICATOR_STATUS.ERROR : undefined}
-                            />
-                        </OfflineWithFeedback>
-                    ))}
-                </ScrollView>
-            </ScreenWrapper>
-        </AccessOrNotFoundWrapper>
+            <Text style={[styles.ph5, styles.pb5]}>{translate('workspace.xero.importDescription')}</Text>
+
+            {sections.map((section) => (
+                <OfflineWithFeedback
+                    key={section.description}
+                    pendingAction={PolicyUtils.settingsPendingAction(section.subscribedSettings, pendingFields)}
+                >
+                    <MenuItemWithTopDescription
+                        title={section.title}
+                        description={section.description}
+                        shouldShowRightIcon
+                        onPress={section.action}
+                        brickRoadIndicator={PolicyUtils.areSettingsInErrorFields(section.subscribedSettings, errorFields) ? CONST.BRICK_ROAD_INDICATOR_STATUS.ERROR : undefined}
+                    />
+                </OfflineWithFeedback>
+            ))}
+        </ConnectionLayout>
     );
 }
 
diff --git a/src/pages/workspace/accounting/xero/XeroMapTrackingCategoryConfigurationPage.tsx b/src/pages/workspace/accounting/xero/XeroMapTrackingCategoryConfigurationPage.tsx
new file mode 100644
index 000000000000..dae46f32dc54
--- /dev/null
+++ b/src/pages/workspace/accounting/xero/XeroMapTrackingCategoryConfigurationPage.tsx
@@ -0,0 +1,98 @@
+import {useRoute} from '@react-navigation/native';
+import React, {useCallback, useMemo} from 'react';
+import {View} from 'react-native';
+import RadioListItem from '@components/SelectionList/RadioListItem';
+import SelectionScreen from '@components/SelectionScreen';
+import Text from '@components/Text';
+import useLocalize from '@hooks/useLocalize';
+import useThemeStyles from '@hooks/useThemeStyles';
+import * as Xero from '@libs/actions/connections/Xero';
+import * as ErrorUtils from '@libs/ErrorUtils';
+import Navigation from '@libs/Navigation/Navigation';
+import {settingsPendingAction} from '@libs/PolicyUtils';
+import type {WithPolicyProps} from '@pages/workspace/withPolicy';
+import withPolicyConnections from '@pages/workspace/withPolicyConnections';
+import * as Policy from '@userActions/Policy/Policy';
+import CONST from '@src/CONST';
+import type {TranslationPaths} from '@src/languages/types';
+import ROUTES from '@src/ROUTES';
+
+type RouteParams = {
+    categoryId?: string;
+    categoryName?: string;
+};
+
+function XeroMapTrackingCategoryConfigurationPage({policy}: WithPolicyProps) {
+    const {translate} = useLocalize();
+    const route = useRoute();
+    const params = route.params as RouteParams;
+    const styles = useThemeStyles();
+    const categoryId = params?.categoryId ?? '';
+    const categoryName = decodeURIComponent(params?.categoryName ?? '');
+    const policyID = policy?.id ?? '-1';
+    const {config} = policy?.connections?.xero ?? {};
+    const {trackingCategories} = policy?.connections?.xero?.data ?? {};
+    const {mappings} = policy?.connections?.xero?.config ?? {};
+
+    const currentTrackingCategory = trackingCategories?.find((category) => category.id === categoryId);
+    const currentTrackingCategoryValue = currentTrackingCategory ? mappings?.[`${CONST.XERO_CONFIG.TRACKING_CATEGORY_PREFIX}${currentTrackingCategory.id}`] ?? '' : '';
+
+    const optionsList = useMemo(
+        () =>
+            Object.values(CONST.XERO_CONFIG.TRACKING_CATEGORY_OPTIONS).map((option) => ({
+                value: option,
+                text: translate(`workspace.xero.trackingCategoriesOptions.${option.toLowerCase()}` as TranslationPaths),
+                keyForList: option,
+                isSelected: option === currentTrackingCategoryValue,
+            })),
+        [translate, currentTrackingCategoryValue],
+    );
+
+    const listHeaderComponent = useMemo(
+        () => (
+            <View style={[styles.pb2, styles.ph5]}>
+                <Text style={[styles.pb5, styles.textNormal]}>{translate('workspace.xero.mapTrackingCategoryToDescription', {categoryName})}</Text>
+            </View>
+        ),
+        [translate, styles.pb2, styles.ph5, styles.pb5, styles.textNormal, categoryName],
+    );
+
+    const updateMapping = useCallback(
+        (option: {value: string}) => {
+            if (option.value !== categoryName) {
+                Xero.updateXeroMappings(
+                    policyID,
+                    categoryId ? {[`${CONST.XERO_CONFIG.TRACKING_CATEGORY_PREFIX}${categoryId}`]: option.value} : {},
+                    categoryId ? {[`${CONST.XERO_CONFIG.TRACKING_CATEGORY_PREFIX}${categoryId}`]: currentTrackingCategoryValue} : {},
+                );
+            }
+            Navigation.goBack(ROUTES.POLICY_ACCOUNTING_XERO_TRACKING_CATEGORIES.getRoute(policyID));
+        },
+        [categoryId, categoryName, currentTrackingCategoryValue, policyID],
+    );
+
+    return (
+        <SelectionScreen
+            policyID={policyID}
+            accessVariants={[CONST.POLICY.ACCESS_VARIANTS.ADMIN]}
+            featureName={CONST.POLICY.MORE_FEATURES.ARE_CONNECTIONS_ENABLED}
+            displayName={XeroMapTrackingCategoryConfigurationPage.displayName}
+            sections={optionsList.length ? [{data: optionsList}] : []}
+            listItem={RadioListItem}
+            onSelectRow={updateMapping}
+            initiallyFocusedOptionKey={optionsList.find((option) => option.isSelected)?.keyForList}
+            headerContent={listHeaderComponent}
+            onBackButtonPress={() => Navigation.goBack(ROUTES.POLICY_ACCOUNTING_XERO_TRACKING_CATEGORIES.getRoute(policyID))}
+            headerTitleAlreadyTranslated={translate('workspace.xero.mapTrackingCategoryTo', {categoryName})}
+            connectionName={CONST.POLICY.CONNECTIONS.NAME.XERO}
+            pendingAction={settingsPendingAction([`${CONST.XERO_CONFIG.TRACKING_CATEGORY_PREFIX}${categoryId}`], config?.pendingFields)}
+            errors={ErrorUtils.getLatestErrorField(config ?? {}, `${CONST.XERO_CONFIG.TRACKING_CATEGORY_PREFIX}${categoryId}`)}
+            errorRowStyles={[styles.ph5, styles.pv3]}
+            onClose={() => Policy.clearXeroErrorField(policyID, `${CONST.XERO_CONFIG.TRACKING_CATEGORY_PREFIX}${categoryId}`)}
+            shouldSingleExecuteRowSelect
+        />
+    );
+}
+
+XeroMapTrackingCategoryConfigurationPage.displayName = 'XeroMapTrackingCategoryConfigurationPage';
+export default withPolicyConnections(XeroMapTrackingCategoryConfigurationPage);
diff --git a/src/pages/workspace/accounting/xero/XeroOrganizationConfigurationPage.tsx b/src/pages/workspace/accounting/xero/XeroOrganizationConfigurationPage.tsx
index 475bbe87e688..bb49c5212fb2 100644
--- a/src/pages/workspace/accounting/xero/XeroOrganizationConfigurationPage.tsx
+++ b/src/pages/workspace/accounting/xero/XeroOrganizationConfigurationPage.tsx
@@ -1,21 +1,23 @@
 import type {StackScreenProps} from '@react-navigation/stack';
 import React, {useMemo} from 'react';
-import HeaderWithBackButton from '@components/HeaderWithBackButton';
-import ScreenWrapper from '@components/ScreenWrapper';
-import ScrollView from '@components/ScrollView';
-import SelectionList from '@components/SelectionList';
+import {View} from 'react-native';
+import BlockingView from '@components/BlockingViews/BlockingView';
+import * as Illustrations from '@components/Icon/Illustrations';
 import RadioListItem from '@components/SelectionList/RadioListItem';
 import type {ListItem} from '@components/SelectionList/types';
+import SelectionScreen from '@components/SelectionScreen';
 import Text from '@components/Text';
 import useLocalize from '@hooks/useLocalize';
 import useThemeStyles from '@hooks/useThemeStyles';
-import {updatePolicyConnectionConfig} from '@libs/actions/connections';
+import * as Xero from '@libs/actions/connections/Xero';
+import * as ErrorUtils from '@libs/ErrorUtils';
 import Navigation from '@libs/Navigation/Navigation';
 import type {SettingsNavigatorParamList} from '@libs/Navigation/types';
 import {findCurrentXeroOrganization, getXeroTenants} from '@libs/PolicyUtils';
-import AccessOrNotFoundWrapper from '@pages/workspace/AccessOrNotFoundWrapper';
 import withPolicy from '@pages/workspace/withPolicy';
 import type {WithPolicyProps} from '@pages/workspace/withPolicy';
+import variables from '@styles/variables';
+import * as Policy from '@userActions/Policy/Policy';
 import CONST from '@src/CONST';
 import ROUTES from '@src/ROUTES';
 import type SCREENS from '@src/SCREENS';
@@ -30,49 +32,72 @@ function XeroOrganizationConfigurationPage({
     const {translate} = useLocalize();
     const styles = useThemeStyles();
     const tenants = useMemo(() => getXeroTenants(policy ?? undefined), [policy]);
-    const currentXeroOrganization = findCurrentXeroOrganization(tenants, policy?.connections?.xero?.config?.tenantID);
+    const xeroConfig = policy?.connections?.xero?.config;
+    const currentXeroOrganization = findCurrentXeroOrganization(tenants, xeroConfig?.tenantID);
 
-    const policyID = policy?.id ?? '';
+    const policyID = policy?.id ?? '-1';
 
     const sections =
-        policy?.connections?.xero.data.tenants.map((tenant) => ({
+        policy?.connections?.xero?.data?.tenants.map((tenant) => ({
+            value: tenant.id,
             text: tenant.name,
             keyForList: tenant.id,
             isSelected: tenant.id === organizationID,
         })) ?? [];
 
+    const listHeaderComponent = useMemo(
+        () => (
+            <View style={[styles.pb2, styles.ph5]}>
+                <Text style={[styles.pb5, styles.textNormal]}>{translate('workspace.xero.organizationDescription')}</Text>
+            </View>
+        ),
+        [translate, styles.pb2, styles.ph5, styles.pb5, styles.textNormal],
+    );
+
     const saveSelection = ({keyForList}: ListItem) => {
         if (!keyForList) {
             return;
         }
 
-        updatePolicyConnectionConfig(policyID, CONST.POLICY.CONNECTIONS.NAME.XERO, 'tenantID', keyForList);
-        Navigation.goBack(ROUTES.WORKSPACE_ACCOUNTING.getRoute(policyID));
+        Xero.updateXeroTenantID(policyID, keyForList, xeroConfig?.tenantID);
+        Navigation.goBack();
     };
 
+    const listEmptyContent = useMemo(
+        () => (
+            <BlockingView
+                icon={Illustrations.TeleScope}
+                iconWidth={variables.emptyListIconWidth}
+                iconHeight={variables.emptyListIconHeight}
+                title={translate('workspace.xero.noAccountsFound')}
+                subtitle={translate('workspace.xero.noAccountsFoundDescription')}
+                containerStyle={styles.pb10}
+            />
+        ),
+        [translate, styles.pb10],
+    );
+
     return (
-        <AccessOrNotFoundWrapper
-            accessVariants={[CONST.POLICY.ACCESS_VARIANTS.ADMIN, CONST.POLICY.ACCESS_VARIANTS.PAID]}
+        <SelectionScreen
             policyID={policyID}
+            accessVariants={[CONST.POLICY.ACCESS_VARIANTS.ADMIN, CONST.POLICY.ACCESS_VARIANTS.PAID]}
             featureName={CONST.POLICY.MORE_FEATURES.ARE_CONNECTIONS_ENABLED}
-        >
-            <ScreenWrapper
-                includeSafeAreaPaddingBottom={false}
-                shouldEnableMaxHeight
-                testID={XeroOrganizationConfigurationPage.displayName}
-            >
-                <HeaderWithBackButton title={translate('workspace.xero.organization')} />
-                <ScrollView contentContainerStyle={styles.pb2}>
-                    <Text style={[styles.ph5, styles.pb5]}>{translate('workspace.xero.organizationDescription')}</Text>
-                    <SelectionList
-                        ListItem={RadioListItem}
-                        onSelectRow={saveSelection}
-                        sections={[{data: sections}]}
-                        initiallyFocusedOptionKey={currentXeroOrganization?.id}
-                    />
-                </ScrollView>
-            </ScreenWrapper>
-        </AccessOrNotFoundWrapper>
+            displayName={XeroOrganizationConfigurationPage.displayName}
+            sections={sections.length ? [{data: sections}] : []}
+            listItem={RadioListItem}
+            connectionName={CONST.POLICY.CONNECTIONS.NAME.XERO}
+            onSelectRow={saveSelection}
+            initiallyFocusedOptionKey={currentXeroOrganization?.id}
+            headerContent={listHeaderComponent}
+            onBackButtonPress={() => Navigation.goBack(ROUTES.POLICY_ACCOUNTING.getRoute(policyID))}
+            title="workspace.xero.organization"
+            listEmptyContent={listEmptyContent}
+            pendingAction={xeroConfig?.pendingFields?.tenantID}
+            errors={ErrorUtils.getLatestErrorField(xeroConfig ?? {}, CONST.XERO_CONFIG.TENANT_ID)}
+            errorRowStyles={[styles.ph5, styles.pv3]}
+            onClose={() => Policy.clearXeroErrorField(policyID, CONST.XERO_CONFIG.TENANT_ID)}
+            shouldSingleExecuteRowSelect
+        />
     );
 }
 
diff --git a/src/pages/workspace/accounting/xero/XeroTaxesConfigurationPage.tsx b/src/pages/workspace/accounting/xero/XeroTaxesConfigurationPage.tsx
index 47910760eb40..cf695b57aa38 100644
--- a/src/pages/workspace/accounting/xero/XeroTaxesConfigurationPage.tsx
+++ b/src/pages/workspace/accounting/xero/XeroTaxesConfigurationPage.tsx
@@ -1,59 +1,44 @@
 import React from 'react';
-import {View} from 'react-native';
-import HeaderWithBackButton from '@components/HeaderWithBackButton';
-import OfflineWithFeedback from '@components/OfflineWithFeedback';
-import ScreenWrapper from '@components/ScreenWrapper';
-import ScrollView from '@components/ScrollView';
-import Switch from '@components/Switch';
-import Text from '@components/Text';
+import ConnectionLayout from '@components/ConnectionLayout';
 import useLocalize from '@hooks/useLocalize';
 import useThemeStyles from '@hooks/useThemeStyles';
-import * as Connections from '@libs/actions/connections';
-import AccessOrNotFoundWrapper from '@pages/workspace/AccessOrNotFoundWrapper';
+import * as Xero from '@libs/actions/connections/Xero';
+import * as ErrorUtils from '@libs/ErrorUtils';
+import * as PolicyUtils from '@libs/PolicyUtils';
 import type {WithPolicyProps} from '@pages/workspace/withPolicy';
 import withPolicyConnections from '@pages/workspace/withPolicyConnections';
-import variables from '@styles/variables';
+import ToggleSettingOptionRow from '@pages/workspace/workflows/ToggleSettingsOptionRow';
+import * as Policy from '@userActions/Policy/Policy';
 import CONST from '@src/CONST';
 
 function XeroTaxesConfigurationPage({policy}: WithPolicyProps) {
     const {translate} = useLocalize();
     const styles = useThemeStyles();
-    const policyID = policy?.id ?? '';
-    const {importTaxRates, pendingFields} = policy?.connections?.xero?.config ?? {};
-    const isSwitchOn = Boolean(importTaxRates);
+    const policyID = policy?.id ?? '-1';
+    const xeroConfig = policy?.connections?.xero?.config;
+    const isSwitchOn = !!xeroConfig?.importTaxRates;
+
     return (
-        <AccessOrNotFoundWrapper
+        <ConnectionLayout
+            displayName={XeroTaxesConfigurationPage.displayName}
+            headerTitle="workspace.accounting.taxes"
+            title="workspace.xero.taxesDescription"
             accessVariants={[CONST.POLICY.ACCESS_VARIANTS.ADMIN]}
             policyID={policyID}
             featureName={CONST.POLICY.MORE_FEATURES.ARE_CONNECTIONS_ENABLED}
+            contentContainerStyle={[styles.pb2, styles.ph5]}
+            connectionName={CONST.POLICY.CONNECTIONS.NAME.XERO}
         >
-            <ScreenWrapper
-                includeSafeAreaPaddingBottom={false}
-                shouldEnableMaxHeight
-                testID={XeroTaxesConfigurationPage.displayName}
-            >
-                <HeaderWithBackButton title={translate('workspace.accounting.taxes')} />
-                <ScrollView contentContainerStyle={[styles.pb2, styles.ph5]}>
-                    <Text style={styles.pb5}>{translate('workspace.xero.taxesDescription')}</Text>
-                    <View style={[styles.flexRow, styles.mb4, styles.alignItemsCenter, styles.justifyContentBetween]}>
-                        <View style={styles.flex1}>
-                            <Text fontSize={variables.fontSizeNormal}>{translate('workspace.accounting.import')}</Text>
-                        </View>
-                        <OfflineWithFeedback pendingAction={pendingFields?.importTaxRates}>
-                            <View style={[styles.flex1, styles.alignItemsEnd, styles.pl3]}>
-                                <Switch
-                                    accessibilityLabel={translate('workspace.accounting.taxes')}
-                                    isOn={isSwitchOn}
-                                    onToggle={() =>
-                                        Connections.updatePolicyConnectionConfig(policyID, CONST.POLICY.CONNECTIONS.NAME.XERO, CONST.XERO_CONFIG.IMPORT_TAX_RATES, !importTaxRates)
-                                    }
-                                />
-                            </View>
-                        </OfflineWithFeedback>
-                    </View>
-                </ScrollView>
-            </ScreenWrapper>
-        </AccessOrNotFoundWrapper>
+            <ToggleSettingOptionRow
+                title={translate('workspace.accounting.import')}
+                switchAccessibilityLabel={translate('workspace.xero.customers')}
+                isActive={isSwitchOn}
+                onToggle={() => Xero.updateXeroImportTaxRates(policyID, !xeroConfig?.importTaxRates, xeroConfig?.importTaxRates)}
+                errors={ErrorUtils.getLatestErrorField(xeroConfig ?? {}, CONST.XERO_CONFIG.IMPORT_TAX_RATES)}
+                onCloseError={() => Policy.clearXeroErrorField(policyID, CONST.XERO_CONFIG.IMPORT_TAX_RATES)}
+                pendingAction={PolicyUtils.settingsPendingAction([CONST.XERO_CONFIG.IMPORT_TAX_RATES], xeroConfig?.pendingFields)}
+            />
+        </ConnectionLayout>
     );
 }
 
diff --git a/src/pages/workspace/accounting/xero/XeroTrackingCategoryConfigurationPage.tsx b/src/pages/workspace/accounting/xero/XeroTrackingCategoryConfigurationPage.tsx
new file mode 100644
index 000000000000..5aa6b2cd4efe
--- /dev/null
+++ b/src/pages/workspace/accounting/xero/XeroTrackingCategoryConfigurationPage.tsx
@@ -0,0 +1,84 @@
+import React, {useMemo} from 'react';
+import {View} from 'react-native';
+import ConnectionLayout from '@components/ConnectionLayout';
+import MenuItemWithTopDescription from '@components/MenuItemWithTopDescription';
+import OfflineWithFeedback from '@components/OfflineWithFeedback';
+import useLocalize from '@hooks/useLocalize';
+import useThemeStyles from '@hooks/useThemeStyles';
+import * as Xero from '@libs/actions/connections/Xero';
+import * as ErrorUtils from '@libs/ErrorUtils';
+import Navigation from '@libs/Navigation/Navigation';
+import {areSettingsInErrorFields, settingsPendingAction} from '@libs/PolicyUtils';
+import StringUtils from '@libs/StringUtils';
+import type {WithPolicyProps} from '@pages/workspace/withPolicy';
+import withPolicyConnections from '@pages/workspace/withPolicyConnections';
+import ToggleSettingOptionRow from '@pages/workspace/workflows/ToggleSettingsOptionRow';
+import * as Policy from '@userActions/Policy/Policy';
+import CONST from '@src/CONST';
+import type {TranslationPaths} from '@src/languages/types';
+import ROUTES from '@src/ROUTES';
+import type {XeroTrackingCategory} from '@src/types/onyx/Policy';
+
+function XeroTrackingCategoryConfigurationPage({policy}: WithPolicyProps) {
+    const {translate} = useLocalize();
+    const styles = useThemeStyles();
+    const policyID = policy?.id ?? '-1';
+    const xeroConfig = policy?.connections?.xero?.config;
+    const isSwitchOn = !!xeroConfig?.importTrackingCategories;
+
+    const menuItems = useMemo(() => {
+        const trackingCategories = Xero.getTrackingCategories(policy);
+        return trackingCategories.map((category: XeroTrackingCategory & {value: string}) => ({
+            id: category.id,
+            description: translate('workspace.xero.mapTrackingCategoryTo', {categoryName: category.name}) as TranslationPaths,
+            onPress: () => Navigation.navigate(ROUTES.POLICY_ACCOUNTING_XERO_TRACKING_CATEGORIES_MAP.getRoute(policyID, category.id, category.name)),
+            title: translate(`workspace.xero.trackingCategoriesOptions.${!StringUtils.isEmptyString(category.value) ? category.value.toLowerCase() : 'default'}` as TranslationPaths),
+        }));
+    }, [translate, policy, policyID]);
+
+    return (
+        <ConnectionLayout
+            displayName={XeroTrackingCategoryConfigurationPage.displayName}
+            headerTitle="workspace.xero.trackingCategories"
+            title="workspace.xero.trackingCategoriesDescription"
+            accessVariants={[CONST.POLICY.ACCESS_VARIANTS.ADMIN]}
+            policyID={policyID}
+            featureName={CONST.POLICY.MORE_FEATURES.ARE_CONNECTIONS_ENABLED}
+            contentContainerStyle={[styles.pb2, styles.ph5]}
+            connectionName={CONST.POLICY.CONNECTIONS.NAME.XERO}
+        >
+            <ToggleSettingOptionRow
+                title={translate('workspace.accounting.import')}
+                switchAccessibilityLabel={translate('workspace.xero.trackingCategories')}
+                isActive={isSwitchOn}
+                wrapperStyle={styles.mv3}
+                onToggle={() => Xero.updateXeroImportTrackingCategories(policyID, !xeroConfig?.importTrackingCategories, xeroConfig?.importTrackingCategories)}
+                pendingAction={settingsPendingAction([CONST.XERO_CONFIG.IMPORT_TRACKING_CATEGORIES], xeroConfig?.pendingFields)}
+                errors={ErrorUtils.getLatestErrorField(xeroConfig ?? {}, CONST.XERO_CONFIG.IMPORT_TRACKING_CATEGORIES)}
+                onCloseError={() => Policy.clearXeroErrorField(policyID, CONST.XERO_CONFIG.IMPORT_TRACKING_CATEGORIES)}
+            />
+            {xeroConfig?.importTrackingCategories && (
+                <View>
+                    {menuItems.map((menuItem) => (
+                        <OfflineWithFeedback
+                            key={menuItem.id}
+                            pendingAction={settingsPendingAction([`${CONST.XERO_CONFIG.TRACKING_CATEGORY_PREFIX}${menuItem.id}`], xeroConfig?.pendingFields)}
+                        >
+                            <MenuItemWithTopDescription
+                                title={menuItem.title}
+                                description={menuItem.description}
+                                shouldShowRightIcon
+                                onPress={menuItem.onPress}
+                                wrapperStyle={styles.sectionMenuItemTopDescription}
+                                brickRoadIndicator={areSettingsInErrorFields([`${CONST.XERO_CONFIG.TRACKING_CATEGORY_PREFIX}${menuItem.id}`], xeroConfig?.errorFields) ? 'error' : undefined}
+                            />
+                        </OfflineWithFeedback>
+                    ))}
+                </View>
+            )}
+        </ConnectionLayout>
+    );
+}
+
+XeroTrackingCategoryConfigurationPage.displayName = 'XeroTrackCategoriesPage';
+export default withPolicyConnections(XeroTrackingCategoryConfigurationPage);
diff --git a/src/pages/workspace/accounting/xero/advanced/XeroAdvancedPage.tsx b/src/pages/workspace/accounting/xero/advanced/XeroAdvancedPage.tsx
index 87892ce60cef..287163ae69cc 100644
--- a/src/pages/workspace/accounting/xero/advanced/XeroAdvancedPage.tsx
+++ b/src/pages/workspace/accounting/xero/advanced/XeroAdvancedPage.tsx
@@ -1,4 +1,4 @@
-import React from 'react';
+import React, {useMemo} from 'react';
 import ConnectionLayout from '@components/ConnectionLayout';
 import MenuItemWithTopDescription from '@components/MenuItemWithTopDescription';
 import OfflineWithFeedback from '@components/OfflineWithFeedback';
@@ -6,92 +6,124 @@ import useLocalize from '@hooks/useLocalize';
 import useThemeStyles from '@hooks/useThemeStyles';
 import * as Connections from '@libs/actions/connections';
 import * as ErrorUtils from '@libs/ErrorUtils';
+import Navigation from '@libs/Navigation/Navigation';
+import {getCurrentXeroOrganizationName, settingsPendingAction} from '@libs/PolicyUtils';
+import * as PolicyUtils from '@libs/PolicyUtils';
 import type {WithPolicyConnectionsProps} from '@pages/workspace/withPolicyConnections';
 import withPolicyConnections from '@pages/workspace/withPolicyConnections';
 import ToggleSettingOptionRow from '@pages/workspace/workflows/ToggleSettingsOptionRow';
-import * as Policy from '@userActions/Policy';
+import * as Policy from '@userActions/Policy/Policy';
 import CONST from '@src/CONST';
+import ROUTES from '@src/ROUTES';
 
 function XeroAdvancedPage({policy}: WithPolicyConnectionsProps) {
     const styles = useThemeStyles();
     const {translate} = useLocalize();
 
-    const policyID = policy?.id ?? '';
+    const policyID = policy?.id ?? '-1';
     const xeroConfig = policy?.connections?.xero?.config;
-    const {autoSync, pendingFields, sync} = xeroConfig ?? {};
-    const xeroData = policy?.connections?.xero?.data;
+    const {autoSync, pendingFields, errorFields, sync} = xeroConfig ?? {};
+    const {bankAccounts} = policy?.connections?.xero?.data ?? {};
+    const {invoiceCollectionsAccountID, reimbursementAccountID} = sync ?? {};
+
+    const getSelectedAccountName = useMemo(
+        () => (accountID: string) => {
+            const selectedAccount = (bankAccounts ?? []).find((bank) => bank.id === accountID);
+            return selectedAccount?.name ?? translate('workspace.xero.notConfigured');
+        },
+        [bankAccounts, translate],
+    );
+
+    const selectedBankAccountName = getSelectedAccountName(invoiceCollectionsAccountID ?? '-1');
+    const selectedBillPaymentAccountName = getSelectedAccountName(reimbursementAccountID ?? '-1');
+
+    const currentXeroOrganizationName = useMemo(() => getCurrentXeroOrganizationName(policy ?? undefined), [policy]);
 
     return (
         <ConnectionLayout
             displayName={XeroAdvancedPage.displayName}
-            headerTitle="workspace.xero.advancedConfig.advanced"
+            headerTitle="workspace.accounting.advanced"
+            headerSubtitle={currentXeroOrganizationName}
             accessVariants={[CONST.POLICY.ACCESS_VARIANTS.ADMIN, CONST.POLICY.ACCESS_VARIANTS.PAID]}
             policyID={policyID}
             featureName={CONST.POLICY.MORE_FEATURES.ARE_CONNECTIONS_ENABLED}
             contentContainerStyle={[styles.pb2, styles.ph5]}
+            connectionName={CONST.POLICY.CONNECTIONS.NAME.XERO}
         >
             <ToggleSettingOptionRow
-                key={translate('workspace.xero.advancedConfig.autoSync')}
-                title={translate('workspace.xero.advancedConfig.autoSync')}
+                key={translate('workspace.accounting.autoSync')}
+                title={translate('workspace.accounting.autoSync')}
                 subtitle={translate('workspace.xero.advancedConfig.autoSyncDescription')}
+                switchAccessibilityLabel={translate('workspace.xero.advancedConfig.autoSyncDescription')}
                 shouldPlaceSubtitleBelowSwitch
                 wrapperStyle={styles.mv3}
-                isActive={Boolean(autoSync?.enabled)}
+                isActive={!!autoSync?.enabled}
                 onToggle={() =>
-                    Connections.updatePolicyConnectionConfig(policyID, CONST.POLICY.CONNECTIONS.NAME.XERO, CONST.XERO_CONFIG.AUTO_SYNC, {
-                        enabled: !autoSync?.enabled,
-                    })
+                    Connections.updatePolicyXeroConnectionConfig(
+                        policyID,
+                        CONST.POLICY.CONNECTIONS.NAME.XERO,
+                        CONST.XERO_CONFIG.AUTO_SYNC,
+                        {
+                            enabled: !autoSync?.enabled,
+                        },
+                        {enabled: autoSync?.enabled ?? null},
+                    )
                 }
-                pendingAction={pendingFields?.autoSync}
-                errors={ErrorUtils.getLatestErrorField(xeroConfig ?? {}, CONST.XERO_CONFIG.AUTO_SYNC)}
-                onCloseError={() => Policy.clearXeroErrorField(policyID, CONST.XERO_CONFIG.AUTO_SYNC)}
+                pendingAction={settingsPendingAction([CONST.XERO_CONFIG.ENABLED], pendingFields)}
+                errors={ErrorUtils.getLatestErrorField(xeroConfig ?? {}, CONST.XERO_CONFIG.ENABLED)}
+                onCloseError={() => Policy.clearXeroErrorField(policyID, CONST.XERO_CONFIG.ENABLED)}
             />
-            <OfflineWithFeedback pendingAction={pendingFields?.export}>
-                <MenuItemWithTopDescription
-                    shouldShowRightIcon
-                    title={xeroConfig?.export.billStatus.purchase}
-                    description={translate('workspace.xero.advancedConfig.purchaseBillStatusTitle')}
-                    key={translate('workspace.xero.advancedConfig.purchaseBillStatusTitle')}
-                    wrapperStyle={[styles.sectionMenuItemTopDescription]}
-                    onPress={() => {}}
-                />
-            </OfflineWithFeedback>
             <ToggleSettingOptionRow
-                key={translate('workspace.xero.advancedConfig.reimbursedReports')}
-                title={translate('workspace.xero.advancedConfig.reimbursedReports')}
+                key={translate('workspace.accounting.reimbursedReports')}
+                title={translate('workspace.accounting.reimbursedReports')}
                 subtitle={translate('workspace.xero.advancedConfig.reimbursedReportsDescription')}
+                switchAccessibilityLabel={translate('workspace.xero.advancedConfig.reimbursedReportsDescription')}
                 shouldPlaceSubtitleBelowSwitch
                 wrapperStyle={styles.mv3}
-                isActive={Boolean(sync?.syncReimbursedReports)}
+                isActive={!!sync?.syncReimbursedReports}
                 onToggle={() =>
-                    Connections.updatePolicyConnectionConfig(policyID, CONST.POLICY.CONNECTIONS.NAME.XERO, CONST.XERO_CONFIG.SYNC, {
-                        syncReimbursedReports: !sync?.syncReimbursedReports,
-                    })
+                    Connections.updatePolicyXeroConnectionConfig(
+                        policyID,
+                        CONST.POLICY.CONNECTIONS.NAME.XERO,
+                        CONST.XERO_CONFIG.SYNC,
+                        {
+                            syncReimbursedReports: !sync?.syncReimbursedReports,
+                        },
+                        {syncReimbursedReports: sync?.syncReimbursedReports ?? null},
+                    )
                 }
-                pendingAction={pendingFields?.sync}
-                errors={ErrorUtils.getLatestErrorField(xeroConfig ?? {}, CONST.XERO_CONFIG.SYNC)}
-                onCloseError={() => Policy.clearXeroErrorField(policyID, CONST.XERO_CONFIG.SYNC)}
+                pendingAction={settingsPendingAction([CONST.XERO_CONFIG.SYNC_REIMBURSED_REPORTS], pendingFields)}
+                errors={ErrorUtils.getLatestErrorField(xeroConfig ?? {}, CONST.XERO_CONFIG.SYNC_REIMBURSED_REPORTS)}
+                onCloseError={() => Policy.clearXeroErrorField(policyID, CONST.XERO_CONFIG.SYNC_REIMBURSED_REPORTS)}
             />
             {sync?.syncReimbursedReports && (
                 <>
-                    <OfflineWithFeedback pendingAction={pendingFields?.sync}>
+                    <OfflineWithFeedback pendingAction={settingsPendingAction([CONST.XERO_CONFIG.REIMBURSEMENT_ACCOUNT_ID], pendingFields)}>
                         <MenuItemWithTopDescription
                             shouldShowRightIcon
-                            title={String(xeroData?.bankAccounts)}
+                            title={String(selectedBillPaymentAccountName)}
                             description={translate('workspace.xero.advancedConfig.xeroBillPaymentAccount')}
                             key={translate('workspace.xero.advancedConfig.xeroBillPaymentAccount')}
                             wrapperStyle={[styles.sectionMenuItemTopDescription]}
-                            onPress={() => {}}
+                            onPress={() => Navigation.navigate(ROUTES.POLICY_ACCOUNTING_XERO_BILL_PAYMENT_ACCOUNT_SELECTOR.getRoute(policyID))}
+                            brickRoadIndicator={
+                                PolicyUtils.areSettingsInErrorFields([CONST.XERO_CONFIG.REIMBURSEMENT_ACCOUNT_ID], errorFields) ? CONST.BRICK_ROAD_INDICATOR_STATUS.ERROR : undefined
+                            }
                         />
                     </OfflineWithFeedback>
-                    <OfflineWithFeedback pendingAction={pendingFields?.sync}>
+                    <OfflineWithFeedback pendingAction={settingsPendingAction([CONST.XERO_CONFIG.INVOICE_COLLECTIONS_ACCOUNT_ID], pendingFields)}>
                         <MenuItemWithTopDescription
                             shouldShowRightIcon
-                            title={String(xeroData?.bankAccounts)}
+                            title={String(selectedBankAccountName)}
                             description={translate('workspace.xero.advancedConfig.xeroInvoiceCollectionAccount')}
                             key={translate('workspace.xero.advancedConfig.xeroInvoiceCollectionAccount')}
                             wrapperStyle={[styles.sectionMenuItemTopDescription]}
-                            onPress={() => {}}
+                            onPress={() => {
+                                Navigation.navigate(ROUTES.POLICY_ACCOUNTING_XERO_INVOICE_SELECTOR.getRoute(policyID));
+                            }}
+                            brickRoadIndicator={
+                                PolicyUtils.areSettingsInErrorFields([CONST.XERO_CONFIG.INVOICE_COLLECTIONS_ACCOUNT_ID], errorFields) ? CONST.BRICK_ROAD_INDICATOR_STATUS.ERROR : undefined
+                            }
                         />
                     </OfflineWithFeedback>
                 </>
diff --git a/src/pages/workspace/accounting/xero/advanced/XeroBillPaymentAccountSelectorPage.tsx b/src/pages/workspace/accounting/xero/advanced/XeroBillPaymentAccountSelectorPage.tsx
new file mode 100644
index 000000000000..0e940435816a
--- /dev/null
+++ b/src/pages/workspace/accounting/xero/advanced/XeroBillPaymentAccountSelectorPage.tsx
@@ -0,0 +1,99 @@
+import React, {useCallback, useMemo} from 'react';
+import {View} from 'react-native';
+import BlockingView from '@components/BlockingViews/BlockingView';
+import * as Illustrations from '@components/Icon/Illustrations';
+import RadioListItem from '@components/SelectionList/RadioListItem';
+import type {SelectorType} from '@components/SelectionScreen';
+import SelectionScreen from '@components/SelectionScreen';
+import Text from '@components/Text';
+import useLocalize from '@hooks/useLocalize';
+import useThemeStyles from '@hooks/useThemeStyles';
+import * as Connections from '@libs/actions/connections';
+import * as ErrorUtils from '@libs/ErrorUtils';
+import Navigation from '@libs/Navigation/Navigation';
+import {getXeroBankAccounts, settingsPendingAction} from '@libs/PolicyUtils';
+import type {WithPolicyConnectionsProps} from '@pages/workspace/withPolicyConnections';
+import withPolicyConnections from '@pages/workspace/withPolicyConnections';
+import variables from '@styles/variables';
+import * as Policy from '@userActions/Policy/Policy';
+import CONST from '@src/CONST';
+import ROUTES from '@src/ROUTES';
+
+function XeroBillPaymentAccountSelectorPage({policy}: WithPolicyConnectionsProps) {
+    const styles = useThemeStyles();
+    const {translate} = useLocalize();
+
+    const policyID = policy?.id ?? '-1';
+
+    const {config} = policy?.connections?.xero ?? {};
+    const {reimbursementAccountID, syncReimbursedReports} = policy?.connections?.xero?.config.sync ?? {};
+    const xeroSelectorOptions = useMemo<SelectorType[]>(() => getXeroBankAccounts(policy ?? undefined, reimbursementAccountID), [reimbursementAccountID, policy]);
+
+    const listHeaderComponent = useMemo(
+        () => (
+            <View style={[styles.pb2, styles.ph5]}>
+                <Text style={[styles.pb5, styles.textNormal]}>{translate('workspace.xero.advancedConfig.xeroBillPaymentAccountDescription')}</Text>
+            </View>
+        ),
+        [translate, styles.pb2, styles.ph5, styles.pb5, styles.textNormal],
+    );
+
+    const initiallyFocusedOptionKey = useMemo(() => xeroSelectorOptions?.find((mode) => mode.isSelected)?.keyForList, [xeroSelectorOptions]);
+
+    const updateAccount = useCallback(
+        ({value}: SelectorType) => {
+            Connections.updatePolicyXeroConnectionConfig(
+                policyID,
+                CONST.POLICY.CONNECTIONS.NAME.XERO,
+                CONST.XERO_CONFIG.SYNC,
+                {
+                    reimbursementAccountID: value,
+                },
+                {reimbursementAccountID: reimbursementAccountID ?? null},
+            );
+            Navigation.goBack(ROUTES.POLICY_ACCOUNTING_XERO_ADVANCED.getRoute(policyID));
+        },
+        [policyID, reimbursementAccountID],
+    );
+
+    const listEmptyContent = useMemo(
+        () => (
+            <BlockingView
+                icon={Illustrations.TeleScope}
+                iconWidth={variables.emptyListIconWidth}
+                iconHeight={variables.emptyListIconHeight}
+                title={translate('workspace.xero.noAccountsFound')}
+                subtitle={translate('workspace.xero.noAccountsFoundDescription')}
+                containerStyle={styles.pb10}
+            />
+        ),
+        [translate, styles.pb10],
+    );
+
+    return (
+        <SelectionScreen
+            policyID={policyID}
+            accessVariants={[CONST.POLICY.ACCESS_VARIANTS.ADMIN, CONST.POLICY.ACCESS_VARIANTS.PAID]}
+            featureName={CONST.POLICY.MORE_FEATURES.ARE_CONNECTIONS_ENABLED}
+            displayName={XeroBillPaymentAccountSelectorPage.displayName}
+            sections={xeroSelectorOptions.length ? [{data: xeroSelectorOptions}] : []}
+            listItem={RadioListItem}
+            connectionName={CONST.POLICY.CONNECTIONS.NAME.XERO}
+            shouldBeBlocked={!syncReimbursedReports}
+            onSelectRow={updateAccount}
+            initiallyFocusedOptionKey={initiallyFocusedOptionKey}
+            headerContent={listHeaderComponent}
+            onBackButtonPress={() => Navigation.goBack(ROUTES.POLICY_ACCOUNTING_XERO_ADVANCED.getRoute(policyID))}
+            title="workspace.xero.advancedConfig.xeroBillPaymentAccount"
+            listEmptyContent={listEmptyContent}
+            pendingAction={settingsPendingAction([CONST.XERO_CONFIG.REIMBURSEMENT_ACCOUNT_ID], config?.pendingFields)}
+            errors={ErrorUtils.getLatestErrorField(config ?? {}, CONST.XERO_CONFIG.REIMBURSEMENT_ACCOUNT_ID)}
+            errorRowStyles={[styles.ph5, styles.pv3]}
+            onClose={() => Policy.clearXeroErrorField(policyID, CONST.XERO_CONFIG.REIMBURSEMENT_ACCOUNT_ID)}
+        />
+    );
+}
+
+XeroBillPaymentAccountSelectorPage.displayName = 'XeroBillPaymentAccountSelectorPage';
+
+export default withPolicyConnections(XeroBillPaymentAccountSelectorPage);
diff --git a/src/pages/workspace/accounting/xero/advanced/XeroInvoiceAccountSelectorPage.tsx b/src/pages/workspace/accounting/xero/advanced/XeroInvoiceAccountSelectorPage.tsx
new file mode 100644
index 000000000000..de3b4be0b656
--- /dev/null
+++ b/src/pages/workspace/accounting/xero/advanced/XeroInvoiceAccountSelectorPage.tsx
@@ -0,0 +1,99 @@
+import React, {useCallback, useMemo} from 'react';
+import {View} from 'react-native';
+import BlockingView from '@components/BlockingViews/BlockingView';
+import * as Illustrations from '@components/Icon/Illustrations';
+import RadioListItem from '@components/SelectionList/RadioListItem';
+import type {SelectorType} from '@components/SelectionScreen';
+import SelectionScreen from '@components/SelectionScreen';
+import Text from '@components/Text';
+import useLocalize from '@hooks/useLocalize';
+import useThemeStyles from '@hooks/useThemeStyles';
+import * as Connections from '@libs/actions/connections';
+import * as ErrorUtils from '@libs/ErrorUtils';
+import Navigation from '@libs/Navigation/Navigation';
+import {getXeroBankAccounts, settingsPendingAction} from '@libs/PolicyUtils';
+import type {WithPolicyConnectionsProps} from '@pages/workspace/withPolicyConnections';
+import withPolicyConnections from '@pages/workspace/withPolicyConnections';
+import variables from '@styles/variables';
+import * as Policy from '@userActions/Policy/Policy';
+import CONST from '@src/CONST';
+import ROUTES from '@src/ROUTES';
+
+function XeroInvoiceAccountSelectorPage({policy}: WithPolicyConnectionsProps) {
+    const styles = useThemeStyles();
+    const {translate} = useLocalize();
+
+    const policyID = policy?.id ?? '-1';
+
+    const {config} = policy?.connections?.xero ?? {};
+    const {invoiceCollectionsAccountID, syncReimbursedReports} = policy?.connections?.xero?.config.sync ?? {};
+    const xeroSelectorOptions = useMemo<SelectorType[]>(() => getXeroBankAccounts(policy ?? undefined, invoiceCollectionsAccountID), [invoiceCollectionsAccountID, policy]);
+
+    const listHeaderComponent = useMemo(
+        () => (
+            <View style={[styles.pb2, styles.ph5]}>
+                <Text style={[styles.pb5, styles.textNormal]}>{translate('workspace.xero.advancedConfig.invoiceAccountSelectorDescription')}</Text>
+            </View>
+        ),
+        [translate, styles.pb2, styles.ph5, styles.pb5, styles.textNormal],
+    );
+
+    const initiallyFocusedOptionKey = useMemo(() => xeroSelectorOptions?.find((mode) => mode.isSelected)?.keyForList, [xeroSelectorOptions]);
+
+    const updateAccount = useCallback(
+        ({value}: SelectorType) => {
+            Connections.updatePolicyXeroConnectionConfig(
+                policyID,
+                CONST.POLICY.CONNECTIONS.NAME.XERO,
+                CONST.XERO_CONFIG.SYNC,
+                {
+                    invoiceCollectionsAccountID: value,
+                },
+                {invoiceCollectionsAccountID: invoiceCollectionsAccountID ?? null},
+            );
+            Navigation.goBack(ROUTES.POLICY_ACCOUNTING_XERO_ADVANCED.getRoute(policyID));
+        },
+        [policyID, invoiceCollectionsAccountID],
+    );
+
+    const listEmptyContent = useMemo(
+        () => (
+            <BlockingView
+                icon={Illustrations.TeleScope}
+                iconWidth={variables.emptyListIconWidth}
+                iconHeight={variables.emptyListIconHeight}
+                title={translate('workspace.xero.noAccountsFound')}
+                subtitle={translate('workspace.xero.noAccountsFoundDescription')}
+                containerStyle={styles.pb10}
+            />
+        ),
+        [translate, styles.pb10],
+    );
+
+    return (
+        <SelectionScreen
+            policyID={policyID}
+            accessVariants={[CONST.POLICY.ACCESS_VARIANTS.ADMIN, CONST.POLICY.ACCESS_VARIANTS.PAID]}
+            featureName={CONST.POLICY.MORE_FEATURES.ARE_CONNECTIONS_ENABLED}
+            displayName={XeroInvoiceAccountSelectorPage.displayName}
+            sections={xeroSelectorOptions.length ? [{data: xeroSelectorOptions}] : []}
+            listItem={RadioListItem}
+            connectionName={CONST.POLICY.CONNECTIONS.NAME.XERO}
+            shouldBeBlocked={!syncReimbursedReports}
+            onSelectRow={updateAccount}
+            initiallyFocusedOptionKey={initiallyFocusedOptionKey}
+            headerContent={listHeaderComponent}
+            onBackButtonPress={() => Navigation.goBack(ROUTES.POLICY_ACCOUNTING_XERO_ADVANCED.getRoute(policyID))}
+            title="workspace.xero.advancedConfig.xeroInvoiceCollectionAccount"
+            listEmptyContent={listEmptyContent}
+            pendingAction={settingsPendingAction([CONST.XERO_CONFIG.INVOICE_COLLECTIONS_ACCOUNT_ID], config?.pendingFields)}
+            errors={ErrorUtils.getLatestErrorField(config ?? {}, CONST.XERO_CONFIG.INVOICE_COLLECTIONS_ACCOUNT_ID)}
+            errorRowStyles={[styles.ph5, styles.pv3]}
+            onClose={() => Policy.clearXeroErrorField(policyID, CONST.XERO_CONFIG.INVOICE_COLLECTIONS_ACCOUNT_ID)}
+        />
+    );
+}
+
+XeroInvoiceAccountSelectorPage.displayName = 'XeroInvoiceAccountSelectorPage';
+
+export default withPolicyConnections(XeroInvoiceAccountSelectorPage);
diff --git a/src/pages/workspace/accounting/xero/export/XeroBankAccountSelectPage.tsx b/src/pages/workspace/accounting/xero/export/XeroBankAccountSelectPage.tsx
new file mode 100644
index 000000000000..4dfd2e92bd0c
--- /dev/null
+++ b/src/pages/workspace/accounting/xero/export/XeroBankAccountSelectPage.tsx
@@ -0,0 +1,103 @@
+import React, {useCallback, useMemo} from 'react';
+import {View} from 'react-native';
+import BlockingView from '@components/BlockingViews/BlockingView';
+import * as Illustrations from '@components/Icon/Illustrations';
+import RadioListItem from '@components/SelectionList/RadioListItem';
+import type {SelectorType} from '@components/SelectionScreen';
+import SelectionScreen from '@components/SelectionScreen';
+import Text from '@components/Text';
+import useLocalize from '@hooks/useLocalize';
+import useThemeStyles from '@hooks/useThemeStyles';
+import * as Connections from '@libs/actions/connections';
+import * as ErrorUtils from '@libs/ErrorUtils';
+import Navigation from '@libs/Navigation/Navigation';
+import {getXeroBankAccounts} from '@libs/PolicyUtils';
+import * as PolicyUtils from '@libs/PolicyUtils';
+import type {WithPolicyConnectionsProps} from '@pages/workspace/withPolicyConnections';
+import withPolicyConnections from '@pages/workspace/withPolicyConnections';
+import variables from '@styles/variables';
+import * as Policy from '@userActions/Policy/Policy';
+import CONST from '@src/CONST';
+import ROUTES from '@src/ROUTES';
+
+function XeroBankAccountSelectPage({policy}: WithPolicyConnectionsProps) {
+    const styles = useThemeStyles();
+    const {translate} = useLocalize();
+
+    const policyID = policy?.id ?? '-1';
+
+    const {config} = policy?.connections?.xero ?? {};
+    const xeroSelectorOptions = useMemo<SelectorType[]>(
+        () => getXeroBankAccounts(policy ?? undefined, config?.export?.nonReimbursableAccount),
+        [config?.export?.nonReimbursableAccount, policy],
+    );
+
+    const listHeaderComponent = useMemo(
+        () => (
+            <View style={[styles.pb2, styles.ph5]}>
+                <Text style={[styles.pb5, styles.textNormal]}>{translate('workspace.xero.xeroBankAccountDescription')}</Text>
+            </View>
+        ),
+        [translate, styles.pb2, styles.ph5, styles.pb5, styles.textNormal],
+    );
+
+    const initiallyFocusedOptionKey = useMemo(() => xeroSelectorOptions?.find((mode) => mode.isSelected)?.keyForList, [xeroSelectorOptions]);
+
+    const updateBankAccount = useCallback(
+        ({value}: SelectorType) => {
+            if (initiallyFocusedOptionKey !== value) {
+                Connections.updatePolicyXeroConnectionConfig(
+                    policyID,
+                    CONST.POLICY.CONNECTIONS.NAME.XERO,
+                    CONST.XERO_CONFIG.EXPORT,
+                    {
+                        nonReimbursableAccount: value,
+                    },
+                    {nonReimbursableAccount: config?.export?.nonReimbursableAccount ?? null},
+                );
+            }
+            Navigation.goBack(ROUTES.POLICY_ACCOUNTING_XERO_EXPORT.getRoute(policyID));
+        },
+        [initiallyFocusedOptionKey, policyID, config?.export?.nonReimbursableAccount],
+    );
+
+    const listEmptyContent = useMemo(
+        () => (
+            <BlockingView
+                icon={Illustrations.TeleScope}
+                iconWidth={variables.emptyListIconWidth}
+                iconHeight={variables.emptyListIconHeight}
+                title={translate('workspace.xero.noAccountsFound')}
+                subtitle={translate('workspace.xero.noAccountsFoundDescription')}
+                containerStyle={styles.pb10}
+            />
+        ),
+        [translate, styles.pb10],
+    );
+
+    return (
+        <SelectionScreen
+            policyID={policyID}
+            accessVariants={[CONST.POLICY.ACCESS_VARIANTS.ADMIN, CONST.POLICY.ACCESS_VARIANTS.PAID]}
+            featureName={CONST.POLICY.MORE_FEATURES.ARE_CONNECTIONS_ENABLED}
+            displayName={XeroBankAccountSelectPage.displayName}
+            sections={xeroSelectorOptions.length ? [{data: xeroSelectorOptions}] : []}
+            listItem={RadioListItem}
+            onSelectRow={updateBankAccount}
+            initiallyFocusedOptionKey={initiallyFocusedOptionKey}
+            headerContent={listHeaderComponent}
+            onBackButtonPress={() => Navigation.goBack(ROUTES.POLICY_ACCOUNTING_XERO_EXPORT.getRoute(policyID))}
+            title="workspace.xero.xeroBankAccount"
+            listEmptyContent={listEmptyContent}
+            connectionName={CONST.POLICY.CONNECTIONS.NAME.XERO}
+            pendingAction={PolicyUtils.settingsPendingAction([CONST.XERO_CONFIG.NON_REIMBURSABLE_ACCOUNT], config?.pendingFields)}
+            errors={ErrorUtils.getLatestErrorField(config ?? {}, CONST.XERO_CONFIG.NON_REIMBURSABLE_ACCOUNT)}
+            errorRowStyles={[styles.ph5, styles.pv3]}
+            onClose={() => Policy.clearXeroErrorField(policyID, CONST.XERO_CONFIG.NON_REIMBURSABLE_ACCOUNT)}
+        />
+    );
+}
+
+XeroBankAccountSelectPage.displayName = 'XeroBankAccountSelectPage';
+
+export default withPolicyConnections(XeroBankAccountSelectPage);
diff --git a/src/pages/workspace/accounting/xero/export/XeroExportConfigurationPage.tsx b/src/pages/workspace/accounting/xero/export/XeroExportConfigurationPage.tsx
new file mode 100644
index 000000000000..52f1163588db
--- /dev/null
+++ b/src/pages/workspace/accounting/xero/export/XeroExportConfigurationPage.tsx
@@ -0,0 +1,116 @@
+import React, {useMemo} from 'react';
+import ConnectionLayout from '@components/ConnectionLayout';
+import MenuItemWithTopDescription from '@components/MenuItemWithTopDescription';
+import OfflineWithFeedback from '@components/OfflineWithFeedback';
+import useLocalize from '@hooks/useLocalize';
+import useThemeStyles from '@hooks/useThemeStyles';
+import Navigation from '@libs/Navigation/Navigation';
+import {getCurrentXeroOrganizationName} from '@libs/PolicyUtils';
+import * as PolicyUtils from '@libs/PolicyUtils';
+import type {WithPolicyConnectionsProps} from '@pages/workspace/withPolicyConnections';
+import withPolicyConnections from '@pages/workspace/withPolicyConnections';
+import CONST from '@src/CONST';
+import ROUTES from '@src/ROUTES';
+
+function XeroExportConfigurationPage({policy}: WithPolicyConnectionsProps) {
+    const {translate} = useLocalize();
+    const styles = useThemeStyles();
+    const policyID = policy?.id ?? '-1';
+    const policyOwner = policy?.owner ?? '';
+
+    const {export: exportConfiguration, errorFields, pendingFields} = policy?.connections?.xero?.config ?? {};
+
+    const {bankAccounts} = policy?.connections?.xero?.data ?? {};
+    const selectedBankAccountName = useMemo(() => {
+        const selectedAccount = (bankAccounts ?? []).find((bank) => bank.id === exportConfiguration?.nonReimbursableAccount);
+        return selectedAccount?.name ?? bankAccounts?.[0]?.name ?? '';
+    }, [bankAccounts, exportConfiguration?.nonReimbursableAccount]);
+
+    const currentXeroOrganizationName = useMemo(() => getCurrentXeroOrganizationName(policy ?? undefined), [policy]);
+
+    const menuItems = [
+        {
+            description: translate('workspace.accounting.preferredExporter'),
+            onPress: () => {
+                Navigation.navigate(ROUTES.POLICY_ACCOUNTING_XERO_PREFERRED_EXPORTER_SELECT.getRoute(policyID));
+            },
+            title: exportConfiguration?.exporter ?? policyOwner,
+            subscribedSettings: [CONST.XERO_CONFIG.EXPORTER],
+        },
+        {
+            description: translate('workspace.accounting.exportOutOfPocket'),
+            title: translate('workspace.xero.purchaseBill'),
+            interactive: false,
+            shouldShowRightIcon: false,
+            helperText: translate('workspace.xero.exportExpensesDescription'),
+        },
+        {
+            description: translate('workspace.xero.purchaseBillDate'),
+            onPress: () => Navigation.navigate(ROUTES.POLICY_ACCOUNTING_XERO_EXPORT_PURCHASE_BILL_DATE_SELECT.getRoute(policyID)),
+            title: exportConfiguration?.billDate ? translate(`workspace.xero.exportDate.values.${exportConfiguration.billDate}.label`) : undefined,
+            subscribedSettings: [CONST.XERO_CONFIG.BILL_DATE],
+        },
+        {
+            description: translate('workspace.xero.advancedConfig.purchaseBillStatusTitle'),
+            onPress: () => Navigation.navigate(ROUTES.POLICY_ACCOUNTING_XERO_BILL_STATUS_SELECTOR.getRoute(policyID)),
+            title: exportConfiguration?.billStatus?.purchase ? translate(`workspace.xero.invoiceStatus.values.${exportConfiguration.billStatus.purchase}`) : undefined,
+            subscribedSettings: [CONST.XERO_CONFIG.BILL_STATUS],
+        },
+        {
+            description: translate('workspace.xero.exportInvoices'),
+            title: translate('workspace.xero.salesInvoice'),
+            interactive: false,
+            shouldShowRightIcon: false,
+            helperText: translate('workspace.xero.exportInvoicesDescription'),
+        },
+        {
+            description: translate('workspace.accounting.exportCompanyCard'),
+            title: translate('workspace.xero.bankTransactions'),
+            shouldShowRightIcon: false,
+            interactive: false,
+            helperText: translate('workspace.xero.exportDeepDiveCompanyCard'),
+        },
+        {
+            description: translate('workspace.xero.xeroBankAccount'),
+            onPress: () => Navigation.navigate(ROUTES.POLICY_ACCOUNTING_XERO_EXPORT_BANK_ACCOUNT_SELECT.getRoute(policyID)),
+            title: selectedBankAccountName,
+            subscribedSettings: [CONST.XERO_CONFIG.NON_REIMBURSABLE_ACCOUNT],
+        },
+    ];
+
+    return (
+        <ConnectionLayout
+            displayName={XeroExportConfigurationPage.displayName}
+            headerTitle="workspace.accounting.export"
+            headerSubtitle={currentXeroOrganizationName}
+            title="workspace.xero.exportDescription"
+            accessVariants={[CONST.POLICY.ACCESS_VARIANTS.ADMIN]}
+            policyID={policyID}
+            featureName={CONST.POLICY.MORE_FEATURES.ARE_CONNECTIONS_ENABLED}
+            contentContainerStyle={styles.pb2}
+            titleStyle={styles.ph5}
+            connectionName={CONST.POLICY.CONNECTIONS.NAME.XERO}
+        >
+            {menuItems.map((menuItem) => (
+                <OfflineWithFeedback
+                    key={menuItem.description}
+                    pendingAction={PolicyUtils.settingsPendingAction(menuItem?.subscribedSettings ?? [], pendingFields)}
+                >
+                    <MenuItemWithTopDescription
+                        title={menuItem.title}
+                        interactive={menuItem?.interactive ?? true}
+                        description={menuItem.description}
+                        shouldShowRightIcon={menuItem?.shouldShowRightIcon ?? true}
+                        onPress={menuItem?.onPress}
+                        brickRoadIndicator={PolicyUtils.areSettingsInErrorFields(menuItem?.subscribedSettings ?? [], errorFields) ? CONST.BRICK_ROAD_INDICATOR_STATUS.ERROR : undefined}
+                        helperText={menuItem?.helperText}
+                    />
+                </OfflineWithFeedback>
+            ))}
+        </ConnectionLayout>
+    );
+}
+
+XeroExportConfigurationPage.displayName = 'XeroExportConfigurationPage';
+
+export default withPolicyConnections(XeroExportConfigurationPage);
diff --git a/src/pages/workspace/accounting/xero/export/XeroPreferredExporterSelectPage.tsx b/src/pages/workspace/accounting/xero/export/XeroPreferredExporterSelectPage.tsx
new file mode 100644
index 000000000000..7cbe523f859b
--- /dev/null
+++ b/src/pages/workspace/accounting/xero/export/XeroPreferredExporterSelectPage.tsx
@@ -0,0 +1,117 @@
+import {isEmpty} from 'lodash';
+import React, {useCallback, useMemo} from 'react';
+import {View} from 'react-native';
+import RadioListItem from '@components/SelectionList/RadioListItem';
+import type {ListItem} from '@components/SelectionList/types';
+import SelectionScreen from '@components/SelectionScreen';
+import Text from '@components/Text';
+import useCurrentUserPersonalDetails from '@hooks/useCurrentUserPersonalDetails';
+import useLocalize from '@hooks/useLocalize';
+import useThemeStyles from '@hooks/useThemeStyles';
+import * as Connections from '@libs/actions/connections';
+import * as ErrorUtils from '@libs/ErrorUtils';
+import {getAdminEmployees, isExpensifyTeam} from '@libs/PolicyUtils';
+import * as PolicyUtils from '@libs/PolicyUtils';
+import Navigation from '@navigation/Navigation';
+import type {WithPolicyConnectionsProps} from '@pages/workspace/withPolicyConnections';
+import withPolicyConnections from '@pages/workspace/withPolicyConnections';
+import * as Policy from '@userActions/Policy/Policy';
+import CONST from '@src/CONST';
+import ROUTES from '@src/ROUTES';
+
+type CardListItem = ListItem & {
+    value: string;
+};
+
+function XeroPreferredExporterSelectPage({policy}: WithPolicyConnectionsProps) {
+    const {config} = policy?.connections?.xero ?? {};
+    const {translate} = useLocalize();
+    const styles = useThemeStyles();
+    const policyOwner = policy?.owner ?? '';
+    const exporters = getAdminEmployees(policy);
+    const {login: currentUserLogin} = useCurrentUserPersonalDetails();
+
+    const policyID = policy?.id ?? '-1';
+    const data: CardListItem[] = useMemo(() => {
+        if (!isEmpty(policyOwner) && isEmpty(exporters)) {
+            return [
+                {
+                    value: policyOwner,
+                    text: policyOwner,
+                    keyForList: policyOwner,
+                    isSelected: true,
+                },
+            ];
+        }
+
+        return exporters?.reduce<CardListItem[]>((options, exporter) => {
+            if (!exporter.email) {
+                return options;
+            }
+
+            // Don't show guides if the current user is not a guide themselves or an Expensify employee
+            if (isExpensifyTeam(exporter.email) && !isExpensifyTeam(policyOwner) && !isExpensifyTeam(currentUserLogin)) {
+                return options;
+            }
+
+            options.push({
+                value: exporter.email,
+                text: exporter.email,
+                keyForList: exporter.email,
+                isSelected: (config?.export?.exporter ?? policyOwner) === exporter.email,
+            });
+            return options;
+        }, []);
+    }, [policyOwner, exporters, currentUserLogin, config?.export?.exporter]);
+
+    const selectExporter = useCallback(
+        (row: CardListItem) => {
+            if (row.value !== config?.export?.exporter) {
+                Connections.updatePolicyXeroConnectionConfig(
+                    policyID,
+                    CONST.POLICY.CONNECTIONS.NAME.XERO,
+                    CONST.XERO_CONFIG.EXPORT,
+                    {exporter: row.value},
+                    {exporter: config?.export?.exporter ?? null},
+                );
+            }
+            Navigation.goBack(ROUTES.POLICY_ACCOUNTING_XERO_EXPORT.getRoute(policyID));
+        },
+        [policyID, config?.export?.exporter],
+    );
+
+    const headerContent = useMemo(
+        () => (
+            <View style={[styles.pb2, styles.ph5]}>
+                <Text style={[styles.pb2, styles.textNormal]}>{translate('workspace.accounting.exportPreferredExporterNote')}</Text>
+                <Text style={[styles.pb5, styles.textNormal]}>{translate('workspace.accounting.exportPreferredExporterSubNote')}</Text>
+            </View>
+        ),
+        [translate, styles.pb2, styles.ph5, styles.pb5, styles.textNormal],
+    );
+
+    return (
+        <SelectionScreen
+            policyID={policyID}
+            accessVariants={[CONST.POLICY.ACCESS_VARIANTS.ADMIN, CONST.POLICY.ACCESS_VARIANTS.PAID]}
+            featureName={CONST.POLICY.MORE_FEATURES.ARE_CONNECTIONS_ENABLED}
+            displayName={XeroPreferredExporterSelectPage.displayName}
+            sections={[{data}]}
+            listItem={RadioListItem}
+            headerContent={headerContent}
+            onSelectRow={selectExporter}
+            initiallyFocusedOptionKey={data.find((mode) => mode.isSelected)?.keyForList}
+            onBackButtonPress={() => Navigation.goBack(ROUTES.POLICY_ACCOUNTING_XERO_EXPORT.getRoute(policyID))}
+            title="workspace.accounting.preferredExporter"
+            connectionName={CONST.POLICY.CONNECTIONS.NAME.XERO}
+            pendingAction={PolicyUtils.settingsPendingAction([CONST.XERO_CONFIG.EXPORTER], config?.pendingFields)}
+            errors={ErrorUtils.getLatestErrorField(config ?? {}, CONST.XERO_CONFIG.EXPORTER)}
+            errorRowStyles={[styles.ph5, styles.pv3]}
+            onClose={() => Policy.clearXeroErrorField(policyID, CONST.XERO_CONFIG.EXPORTER)}
+        />
+    );
+}
+
+XeroPreferredExporterSelectPage.displayName = 'XeroPreferredExporterSelectPage';
+
+export default withPolicyConnections(XeroPreferredExporterSelectPage);
diff --git a/src/pages/workspace/accounting/xero/export/XeroPurchaseBillDateSelectPage.tsx b/src/pages/workspace/accounting/xero/export/XeroPurchaseBillDateSelectPage.tsx
new file mode 100644
index 000000000000..57b37f13d648
--- /dev/null
+++ b/src/pages/workspace/accounting/xero/export/XeroPurchaseBillDateSelectPage.tsx
@@ -0,0 +1,87 @@
+import React, {useCallback, useMemo} from 'react';
+import {View} from 'react-native';
+import type {ValueOf} from 'type-fest';
+import RadioListItem from '@components/SelectionList/RadioListItem';
+import type {ListItem} from '@components/SelectionList/types';
+import SelectionScreen from '@components/SelectionScreen';
+import type {SelectorType} from '@components/SelectionScreen';
+import Text from '@components/Text';
+import useLocalize from '@hooks/useLocalize';
+import useThemeStyles from '@hooks/useThemeStyles';
+import * as Connections from '@libs/actions/connections';
+import * as ErrorUtils from '@libs/ErrorUtils';
+import * as PolicyUtils from '@libs/PolicyUtils';
+import Navigation from '@navigation/Navigation';
+import type {WithPolicyConnectionsProps} from '@pages/workspace/withPolicyConnections';
+import withPolicyConnections from '@pages/workspace/withPolicyConnections';
+import * as Policy from '@userActions/Policy/Policy';
+import CONST from '@src/CONST';
+import ROUTES from '@src/ROUTES';
+
+type MenuListItem = ListItem & {
+    value: ValueOf<typeof CONST.XERO_EXPORT_DATE>;
+};
+
+function XeroPurchaseBillDateSelectPage({policy}: WithPolicyConnectionsProps) {
+    const {translate} = useLocalize();
+    const policyID = policy?.id ?? '-1';
+    const styles = useThemeStyles();
+    const {config} = policy?.connections?.xero ?? {};
+    const data: MenuListItem[] = Object.values(CONST.XERO_EXPORT_DATE).map((dateType) => ({
+        value: dateType,
+        text: translate(`workspace.xero.exportDate.values.${dateType}.label`),
+        alternateText: translate(`workspace.xero.exportDate.values.${dateType}.description`),
+        keyForList: dateType,
+        isSelected: config?.export?.billDate === dateType,
+    }));
+
+    const headerContent = useMemo(
+        () => (
+            <View>
+                <Text style={[styles.ph5, styles.pb5]}>{translate('workspace.xero.exportDate.description')}</Text>
+            </View>
+        ),
+        [translate, styles.pb5, styles.ph5],
+    );
+
+    const selectExportDate = useCallback(
+        (row: MenuListItem) => {
+            if (row.value !== config?.export?.billDate) {
+                Connections.updatePolicyXeroConnectionConfig(
+                    policyID,
+                    CONST.POLICY.CONNECTIONS.NAME.XERO,
+                    CONST.XERO_CONFIG.EXPORT,
+                    {billDate: row.value},
+                    {billDate: config?.export?.billDate ?? null},
+                );
+            }
+            Navigation.goBack(ROUTES.POLICY_ACCOUNTING_XERO_EXPORT_PURCHASE_BILL_DATE_SELECT.getRoute(policyID));
+        },
+        [config?.export?.billDate, policyID],
+    );
+
+    return (
+        <SelectionScreen
+            displayName={XeroPurchaseBillDateSelectPage.displayName}
+            title="workspace.xero.exportDate.label"
+            headerContent={headerContent}
+            sections={[{data}]}
+            listItem={RadioListItem}
+            onSelectRow={(selection: SelectorType) => selectExportDate(selection as MenuListItem)}
+            initiallyFocusedOptionKey={data.find((mode) => mode.isSelected)?.keyForList}
+            policyID={policyID}
+            accessVariants={[CONST.POLICY.ACCESS_VARIANTS.ADMIN]}
+            featureName={CONST.POLICY.MORE_FEATURES.ARE_CONNECTIONS_ENABLED}
+            onBackButtonPress={() => Navigation.goBack(ROUTES.POLICY_ACCOUNTING_XERO_EXPORT.getRoute(policyID))}
+            connectionName={CONST.POLICY.CONNECTIONS.NAME.XERO}
+            pendingAction={PolicyUtils.settingsPendingAction([CONST.XERO_CONFIG.BILL_DATE], config?.pendingFields)}
+            errors={ErrorUtils.getLatestErrorField(config ?? {}, CONST.XERO_CONFIG.BILL_DATE)}
+            errorRowStyles={[styles.ph5, styles.pv3]}
+            onClose={() => Policy.clearXeroErrorField(policyID, CONST.XERO_CONFIG.BILL_DATE)}
+        />
+    );
+}
+
+XeroPurchaseBillDateSelectPage.displayName = 'XeroPurchaseBillDateSelectPage';
+
+export default withPolicyConnections(XeroPurchaseBillDateSelectPage);
diff --git a/src/pages/workspace/accounting/xero/export/XeroPurchaseBillStatusSelectorPage.tsx b/src/pages/workspace/accounting/xero/export/XeroPurchaseBillStatusSelectorPage.tsx
new file mode 100644
index 000000000000..d1902f8a3c46
--- /dev/null
+++ b/src/pages/workspace/accounting/xero/export/XeroPurchaseBillStatusSelectorPage.tsx
@@ -0,0 +1,94 @@
+import {isEmpty} from 'lodash';
+import React, {useCallback, useMemo} from 'react';
+import {View} from 'react-native';
+import type {ValueOf} from 'type-fest';
+import RadioListItem from '@components/SelectionList/RadioListItem';
+import type {ListItem} from '@components/SelectionList/types';
+import SelectionScreen from '@components/SelectionScreen';
+import type {SelectorType} from '@components/SelectionScreen';
+import Text from '@components/Text';
+import useLocalize from '@hooks/useLocalize';
+import useThemeStyles from '@hooks/useThemeStyles';
+import * as Connections from '@libs/actions/connections';
+import * as ErrorUtils from '@libs/ErrorUtils';
+import * as PolicyUtils from '@libs/PolicyUtils';
+import Navigation from '@navigation/Navigation';
+import type {WithPolicyConnectionsProps} from '@pages/workspace/withPolicyConnections';
+import withPolicyConnections from '@pages/workspace/withPolicyConnections';
+import * as Policy from '@userActions/Policy/Policy';
+import CONST from '@src/CONST';
+import ROUTES from '@src/ROUTES';
+
+type MenuListItem = ListItem & {
+    value: ValueOf<typeof CONST.XERO_CONFIG.INVOICE_STATUS>;
+};
+
+function XeroPurchaseBillStatusSelectorPage({policy}: WithPolicyConnectionsProps) {
+    const {translate} = useLocalize();
+    const policyID = policy?.id ?? '';
+    const styles = useThemeStyles();
+    const {config} = policy?.connections?.xero ?? {};
+    const invoiceStatus = config?.export?.billStatus?.purchase;
+
+    const data: MenuListItem[] = Object.values(CONST.XERO_CONFIG.INVOICE_STATUS).map((status) => ({
+        value: status,
+        text: translate(`workspace.xero.invoiceStatus.values.${status}`),
+        keyForList: status,
+        isSelected: invoiceStatus === status,
+    }));
+
+    const headerContent = useMemo(
+        () => (
+            <View>
+                <Text style={[styles.ph5, styles.pb5]}>{translate('workspace.xero.invoiceStatus.description')}</Text>
+            </View>
+        ),
+        [translate, styles.pb5, styles.ph5],
+    );
+
+    const selectPurchaseBillStatus = useCallback(
+        (row: MenuListItem) => {
+            if (isEmpty(config?.export?.billStatus)) {
+                return;
+            }
+            if (row.value !== invoiceStatus) {
+                Connections.updatePolicyXeroConnectionConfig(
+                    policyID,
+                    CONST.POLICY.CONNECTIONS.NAME.XERO,
+                    CONST.XERO_CONFIG.EXPORT,
+                    {
+                        billStatus: {...config?.export?.billStatus, purchase: row.value},
+                    },
+                    {billStatus: config?.export?.billStatus ?? null},
+                );
+            }
+            Navigation.goBack(ROUTES.POLICY_ACCOUNTING_XERO_BILL_STATUS_SELECTOR.getRoute(policyID));
+        },
+        [config?.export?.billStatus, invoiceStatus, policyID],
+    );
+
+    return (
+        <SelectionScreen
+            displayName={XeroPurchaseBillStatusSelectorPage.displayName}
+            title="workspace.xero.invoiceStatus.label"
+            headerContent={headerContent}
+            sections={[{data}]}
+            listItem={RadioListItem}
+            onSelectRow={(selection: SelectorType) => selectPurchaseBillStatus(selection as MenuListItem)}
+            initiallyFocusedOptionKey={data.find((mode) => mode.isSelected)?.keyForList}
+            policyID={policyID}
+            accessVariants={[CONST.POLICY.ACCESS_VARIANTS.ADMIN]}
+            featureName={CONST.POLICY.MORE_FEATURES.ARE_CONNECTIONS_ENABLED}
+            onBackButtonPress={() => Navigation.goBack(ROUTES.POLICY_ACCOUNTING_XERO_EXPORT.getRoute(policyID))}
+            connectionName={CONST.POLICY.CONNECTIONS.NAME.XERO}
+            pendingAction={PolicyUtils.settingsPendingAction([CONST.XERO_CONFIG.BILL_STATUS], config?.pendingFields)}
+            errors={ErrorUtils.getLatestErrorField(config ?? {}, CONST.XERO_CONFIG.BILL_STATUS)}
+            errorRowStyles={[styles.ph5, styles.pv3]}
+            onClose={() => Policy.clearXeroErrorField(policyID, CONST.XERO_CONFIG.BILL_STATUS)}
+        />
+    );
+}
+
+XeroPurchaseBillStatusSelectorPage.displayName = 'XeroPurchaseBillStatusSelectorPage';
+
+export default withPolicyConnections(XeroPurchaseBillStatusSelectorPage);
diff --git a/src/pages/workspace/accounting/xero/import/XeroChartOfAccountsPage.tsx b/src/pages/workspace/accounting/xero/import/XeroChartOfAccountsPage.tsx
new file mode 100644
index 000000000000..20a6e24eb105
--- /dev/null
+++ b/src/pages/workspace/accounting/xero/import/XeroChartOfAccountsPage.tsx
@@ -0,0 +1,81 @@
+import React from 'react';
+import {View} from 'react-native';
+import ConnectionLayout from '@components/ConnectionLayout';
+import MenuItemWithTopDescription from '@components/MenuItemWithTopDescription';
+import Switch from '@components/Switch';
+import Text from '@components/Text';
+import useLocalize from '@hooks/useLocalize';
+import useThemeStyles from '@hooks/useThemeStyles';
+import * as Connections from '@libs/actions/connections';
+import * as ErrorUtils from '@libs/ErrorUtils';
+import {settingsPendingAction} from '@libs/PolicyUtils';
+import type {WithPolicyProps} from '@pages/workspace/withPolicy';
+import withPolicyConnections from '@pages/workspace/withPolicyConnections';
+import ToggleSettingOptionRow from '@pages/workspace/workflows/ToggleSettingsOptionRow';
+import variables from '@styles/variables';
+import * as Policy from '@userActions/Policy/Policy';
+import CONST from '@src/CONST';
+
+function XeroChartOfAccountsPage({policy}: WithPolicyProps) {
+    const {translate} = useLocalize();
+    const styles = useThemeStyles();
+    const policyID = policy?.id ?? '-1';
+    const xeroConfig = policy?.connections?.xero?.config;
+
+    return (
+        <ConnectionLayout
+            displayName={XeroChartOfAccountsPage.displayName}
+            headerTitle="workspace.accounting.accounts"
+            title="workspace.xero.accountsDescription"
+            accessVariants={[CONST.POLICY.ACCESS_VARIANTS.ADMIN]}
+            policyID={policyID}
+            featureName={CONST.POLICY.MORE_FEATURES.ARE_CONNECTIONS_ENABLED}
+            contentContainerStyle={[styles.pb2, styles.ph5]}
+            connectionName={CONST.POLICY.CONNECTIONS.NAME.XERO}
+        >
+            <View style={[styles.flexRow, styles.mb4, styles.alignItemsCenter, styles.justifyContentBetween]}>
+                <View style={styles.flex1}>
+                    <Text fontSize={variables.fontSizeNormal}>{translate('workspace.accounting.import')}</Text>
+                </View>
+                <View style={[styles.flex1, styles.alignItemsEnd, styles.pl3]}>
+                    <Switch
+                        accessibilityLabel={translate('workspace.accounting.accounts')}
+                        isOn
+                        disabled
+                        onToggle={() => {}}
+                    />
+                </View>
+            </View>
+            <MenuItemWithTopDescription
+                interactive={false}
+                title={translate('workspace.common.categories')}
+                description={translate('workspace.common.displayedAs')}
+                wrapperStyle={styles.sectionMenuItemTopDescription}
+            />
+            <Text style={styles.pv5}>{translate('workspace.xero.accountsSwitchTitle')}</Text>
+            <ToggleSettingOptionRow
+                title={translate('workspace.common.enabled')}
+                subtitle={translate('workspace.xero.accountsSwitchDescription')}
+                switchAccessibilityLabel={translate('workspace.xero.accountsSwitchDescription')}
+                shouldPlaceSubtitleBelowSwitch
+                isActive={!!xeroConfig?.enableNewCategories}
+                onToggle={() =>
+                    Connections.updatePolicyXeroConnectionConfig(
+                        policyID,
+                        CONST.POLICY.CONNECTIONS.NAME.XERO,
+                        CONST.XERO_CONFIG.ENABLE_NEW_CATEGORIES,
+                        !xeroConfig?.enableNewCategories,
+                        xeroConfig?.enableNewCategories,
+                    )
+                }
+                pendingAction={settingsPendingAction([CONST.XERO_CONFIG.ENABLE_NEW_CATEGORIES], xeroConfig?.pendingFields)}
+                errors={ErrorUtils.getLatestErrorField(xeroConfig ?? {}, CONST.XERO_CONFIG.ENABLE_NEW_CATEGORIES)}
+                onCloseError={() => Policy.clearXeroErrorField(policyID, CONST.XERO_CONFIG.ENABLE_NEW_CATEGORIES)}
+            />
+        </ConnectionLayout>
+    );
+}
+
+XeroChartOfAccountsPage.displayName = 'XeroChartOfAccountsPage';
+
+export default withPolicyConnections(XeroChartOfAccountsPage);
diff --git a/src/pages/workspace/accounting/xero/import/XeroCustomerConfigurationPage.tsx b/src/pages/workspace/accounting/xero/import/XeroCustomerConfigurationPage.tsx
index 1d1cf11f9791..29c7125213d1 100644
--- a/src/pages/workspace/accounting/xero/import/XeroCustomerConfigurationPage.tsx
+++ b/src/pages/workspace/accounting/xero/import/XeroCustomerConfigurationPage.tsx
@@ -1,25 +1,23 @@
 import React from 'react';
-import {View} from 'react-native';
 import ConnectionLayout from '@components/ConnectionLayout';
 import MenuItemWithTopDescription from '@components/MenuItemWithTopDescription';
-import OfflineWithFeedback from '@components/OfflineWithFeedback';
-import Switch from '@components/Switch';
-import Text from '@components/Text';
 import useLocalize from '@hooks/useLocalize';
 import useThemeStyles from '@hooks/useThemeStyles';
 import * as Connections from '@libs/actions/connections';
+import * as ErrorUtils from '@libs/ErrorUtils';
+import * as PolicyUtils from '@libs/PolicyUtils';
 import type {WithPolicyProps} from '@pages/workspace/withPolicy';
 import withPolicyConnections from '@pages/workspace/withPolicyConnections';
-import variables from '@styles/variables';
+import ToggleSettingOptionRow from '@pages/workspace/workflows/ToggleSettingsOptionRow';
+import * as Policy from '@userActions/Policy/Policy';
 import CONST from '@src/CONST';
 
 function XeroCustomerConfigurationPage({policy}: WithPolicyProps) {
     const {translate} = useLocalize();
     const styles = useThemeStyles();
-    const policyID = policy?.id ?? '';
-    const {importCustomers, pendingFields} = policy?.connections?.xero?.config ?? {};
-
-    const isSwitchOn = Boolean(importCustomers);
+    const policyID = policy?.id ?? '-1';
+    const xeroConfig = policy?.connections?.xero?.config;
+    const isSwitchOn = !!xeroConfig?.importCustomers;
 
     return (
         <ConnectionLayout
@@ -30,33 +28,33 @@ function XeroCustomerConfigurationPage({policy}: WithPolicyProps) {
             policyID={policyID}
             featureName={CONST.POLICY.MORE_FEATURES.ARE_CONNECTIONS_ENABLED}
             contentContainerStyle={[[styles.pb2, styles.ph5]]}
+            connectionName={CONST.POLICY.CONNECTIONS.NAME.XERO}
         >
-            <View>
-                <View style={[styles.flexRow, styles.mb4, styles.alignItemsCenter, styles.justifyContentBetween]}>
-                    <View style={styles.flex1}>
-                        <Text fontSize={variables.fontSizeNormal}>{translate('workspace.accounting.import')}</Text>
-                    </View>
-                    <OfflineWithFeedback pendingAction={pendingFields?.importCustomers}>
-                        <View style={[styles.flex1, styles.alignItemsEnd, styles.pl3]}>
-                            <Switch
-                                accessibilityLabel={translate('workspace.xero.customers')}
-                                isOn={isSwitchOn}
-                                onToggle={() => Connections.updatePolicyConnectionConfig(policyID, CONST.POLICY.CONNECTIONS.NAME.XERO, CONST.XERO_CONFIG.IMPORT_CUSTOMERS, !importCustomers)}
-                            />
-                        </View>
-                    </OfflineWithFeedback>
-                </View>
-                {isSwitchOn && (
-                    <OfflineWithFeedback pendingAction={pendingFields?.importCustomers}>
-                        <MenuItemWithTopDescription
-                            interactive={false}
-                            title={translate('workspace.common.tags')}
-                            description={translate('workspace.qbo.displayedAs')}
-                            wrapperStyle={styles.sectionMenuItemTopDescription}
-                        />
-                    </OfflineWithFeedback>
-                )}
-            </View>
+            <ToggleSettingOptionRow
+                title={translate('workspace.accounting.import')}
+                switchAccessibilityLabel={translate('workspace.xero.customers')}
+                subMenuItems={
+                    <MenuItemWithTopDescription
+                        interactive={false}
+                        title={translate('workspace.common.tags')}
+                        description={translate('workspace.common.displayedAs')}
+                        wrapperStyle={styles.sectionMenuItemTopDescription}
+                    />
+                }
+                isActive={isSwitchOn}
+                onToggle={() =>
+                    Connections.updatePolicyXeroConnectionConfig(
+                        policyID,
+                        CONST.POLICY.CONNECTIONS.NAME.XERO,
+                        CONST.XERO_CONFIG.IMPORT_CUSTOMERS,
+                        !xeroConfig?.importCustomers,
+                        xeroConfig?.importCustomers,
+                    )
+                }
+                errors={ErrorUtils.getLatestErrorField(xeroConfig ?? {}, CONST.XERO_CONFIG.IMPORT_CUSTOMERS)}
+                onCloseError={() => Policy.clearXeroErrorField(policyID, CONST.XERO_CONFIG.IMPORT_CUSTOMERS)}
+                pendingAction={PolicyUtils.settingsPendingAction([CONST.XERO_CONFIG.IMPORT_CUSTOMERS], xeroConfig?.pendingFields)}
+            />
         </ConnectionLayout>
     );
 }
diff --git a/src/pages/workspace/bills/WorkspaceBillsFirstSection.tsx b/src/pages/workspace/bills/WorkspaceBillsFirstSection.tsx
index 638ab9d58c31..f30d90f5a063 100644
--- a/src/pages/workspace/bills/WorkspaceBillsFirstSection.tsx
+++ b/src/pages/workspace/bills/WorkspaceBillsFirstSection.tsx
@@ -1,4 +1,4 @@
-import Str from 'expensify-common/lib/str';
+import {Str} from 'expensify-common';
 import React from 'react';
 import {View} from 'react-native';
 import {withOnyx} from 'react-native-onyx';
diff --git a/src/pages/workspace/bills/WorkspaceBillsPage.tsx b/src/pages/workspace/bills/WorkspaceBillsPage.tsx
index e2dbe398b49f..195cf51a710b 100644
--- a/src/pages/workspace/bills/WorkspaceBillsPage.tsx
+++ b/src/pages/workspace/bills/WorkspaceBillsPage.tsx
@@ -2,32 +2,33 @@ import type {StackScreenProps} from '@react-navigation/stack';
 import React from 'react';
 import {View} from 'react-native';
 import useLocalize from '@hooks/useLocalize';
+import useResponsiveLayout from '@hooks/useResponsiveLayout';
 import useThemeStyles from '@hooks/useThemeStyles';
-import useWindowDimensions from '@hooks/useWindowDimensions';
-import type {WorkspacesCentralPaneNavigatorParamList} from '@navigation/types';
+import type {FullScreenNavigatorParamList} from '@navigation/types';
 import WorkspacePageWithSections from '@pages/workspace/WorkspacePageWithSections';
 import CONST from '@src/CONST';
 import type SCREENS from '@src/SCREENS';
 import WorkspaceBillsNoVBAView from './WorkspaceBillsNoVBAView';
 import WorkspaceBillsVBAView from './WorkspaceBillsVBAView';
 
-type WorkspaceBillsPageProps = StackScreenProps<WorkspacesCentralPaneNavigatorParamList, typeof SCREENS.WORKSPACE.BILLS>;
+type WorkspaceBillsPageProps = StackScreenProps<FullScreenNavigatorParamList, typeof SCREENS.WORKSPACE.BILLS>;
 
 function WorkspaceBillsPage({route}: WorkspaceBillsPageProps) {
     const {translate} = useLocalize();
     const styles = useThemeStyles();
-    const {isSmallScreenWidth} = useWindowDimensions();
+    const {shouldUseNarrowLayout} = useResponsiveLayout();
 
     return (
         <WorkspacePageWithSections
             shouldUseScrollView
             headerText={translate('workspace.common.bills')}
             route={route}
+            shouldSkipVBBACall={false}
             guidesCallTaskID={CONST.GUIDES_CALL_TASK_IDS.WORKSPACE_BILLS}
             shouldShowOfflineIndicatorInWideScreen
         >
             {(hasVBA: boolean, policyID: string) => (
-                <View style={[styles.mt3, isSmallScreenWidth ? styles.workspaceSectionMobile : styles.workspaceSection]}>
+                <View style={[styles.mt3, shouldUseNarrowLayout ? styles.workspaceSectionMobile : styles.workspaceSection]}>
                     {!hasVBA && <WorkspaceBillsNoVBAView policyID={policyID} />}
                     {hasVBA && <WorkspaceBillsVBAView policyID={policyID} />}
                 </View>
diff --git a/src/pages/workspace/card/WorkspaceCardPage.tsx b/src/pages/workspace/card/WorkspaceCardPage.tsx
index 079c715bffd6..af00d3ad437a 100644
--- a/src/pages/workspace/card/WorkspaceCardPage.tsx
+++ b/src/pages/workspace/card/WorkspaceCardPage.tsx
@@ -2,9 +2,9 @@ import type {StackScreenProps} from '@react-navigation/stack';
 import React from 'react';
 import {View} from 'react-native';
 import useLocalize from '@hooks/useLocalize';
+import useResponsiveLayout from '@hooks/useResponsiveLayout';
 import useThemeStyles from '@hooks/useThemeStyles';
-import useWindowDimensions from '@hooks/useWindowDimensions';
-import type {WorkspacesCentralPaneNavigatorParamList} from '@libs/Navigation/types';
+import type {FullScreenNavigatorParamList} from '@libs/Navigation/types';
 import WorkspacePageWithSections from '@pages/workspace/WorkspacePageWithSections';
 import CONST from '@src/CONST';
 import type SCREENS from '@src/SCREENS';
@@ -12,24 +12,25 @@ import WorkspaceCardNoVBAView from './WorkspaceCardNoVBAView';
 import WorkspaceCardVBANoECardView from './WorkspaceCardVBANoECardView';
 import WorkspaceCardVBAWithECardView from './WorkspaceCardVBAWithECardView';
 
-type WorkspaceCardPageProps = StackScreenProps<WorkspacesCentralPaneNavigatorParamList, typeof SCREENS.WORKSPACE.CARD>;
+type WorkspaceCardPageProps = StackScreenProps<FullScreenNavigatorParamList, typeof SCREENS.WORKSPACE.CARD>;
 
 function WorkspaceCardPage({route}: WorkspaceCardPageProps) {
     const {translate} = useLocalize();
     const styles = useThemeStyles();
-    const {isSmallScreenWidth} = useWindowDimensions();
+    const {shouldUseNarrowLayout} = useResponsiveLayout();
 
     return (
         <WorkspacePageWithSections
             shouldUseScrollView
             headerText={translate('workspace.common.card')}
             route={route}
+            shouldSkipVBBACall={false}
             guidesCallTaskID={CONST.GUIDES_CALL_TASK_IDS.WORKSPACE_CARD}
             shouldShowOfflineIndicatorInWideScreen
         >
             {(hasVBA?: boolean, policyID?: string, isUsingECard?: boolean) => (
-                <View style={[styles.mt3, isSmallScreenWidth ? styles.workspaceSectionMobile : styles.workspaceSection]}>
-                    {!hasVBA && <WorkspaceCardNoVBAView policyID={policyID ?? ''} />}
+                <View style={[styles.mt3, shouldUseNarrowLayout ? styles.workspaceSectionMobile : styles.workspaceSection]}>
+                    {!hasVBA && <WorkspaceCardNoVBAView policyID={policyID ?? '-1'} />}
 
                     {hasVBA && !isUsingECard && <WorkspaceCardVBANoECardView />}
 
diff --git a/src/pages/workspace/categories/CategoryForm.tsx b/src/pages/workspace/categories/CategoryForm.tsx
index 30e30b29b216..efe457729e36 100644
--- a/src/pages/workspace/categories/CategoryForm.tsx
+++ b/src/pages/workspace/categories/CategoryForm.tsx
@@ -9,7 +9,6 @@ import useAutoFocusInput from '@hooks/useAutoFocusInput';
 import useLocalize from '@hooks/useLocalize';
 import useThemeStyles from '@hooks/useThemeStyles';
 import * as ErrorUtils from '@libs/ErrorUtils';
-import Navigation from '@libs/Navigation/Navigation';
 import * as ValidationUtils from '@libs/ValidationUtils';
 import CONST from '@src/CONST';
 import ONYXKEYS from '@src/ONYXKEYS';
@@ -41,26 +40,29 @@ function CategoryForm({onSubmit, policyCategories, categoryName, validateEdit}:
             const newCategoryName = values.categoryName.trim();
 
             if (!ValidationUtils.isRequiredFulfilled(newCategoryName)) {
-                errors.categoryName = 'workspace.categories.categoryRequiredError';
+                errors.categoryName = translate('workspace.categories.categoryRequiredError');
             } else if (policyCategories?.[newCategoryName]) {
-                errors.categoryName = 'workspace.categories.existingCategoryError';
+                errors.categoryName = translate('workspace.categories.existingCategoryError');
             } else if (newCategoryName === CONST.INVALID_CATEGORY_NAME) {
-                errors.categoryName = 'workspace.categories.invalidCategoryName';
+                errors.categoryName = translate('workspace.categories.invalidCategoryName');
             } else if ([...newCategoryName].length > CONST.CATEGORY_NAME_LIMIT) {
                 // Uses the spread syntax to count the number of Unicode code points instead of the number of UTF-16 code units.
-                ErrorUtils.addErrorMessage(errors, 'categoryName', ['common.error.characterLimitExceedCounter', {length: [...newCategoryName].length, limit: CONST.CATEGORY_NAME_LIMIT}]);
+                ErrorUtils.addErrorMessage(
+                    errors,
+                    'categoryName',
+                    translate('common.error.characterLimitExceedCounter', {length: [...newCategoryName].length, limit: CONST.CATEGORY_NAME_LIMIT}),
+                );
             }
 
             return errors;
         },
-        [policyCategories],
+        [policyCategories, translate],
     );
 
     const submit = useCallback(
         (values: FormOnyxValues<typeof ONYXKEYS.FORMS.WORKSPACE_CATEGORY_FORM>) => {
-            onSubmit(values);
             Keyboard.dismiss();
-            Navigation.dismissModal();
+            onSubmit(values);
         },
         [onSubmit],
     );
diff --git a/src/pages/workspace/categories/CategoryGLCodePage.tsx b/src/pages/workspace/categories/CategoryGLCodePage.tsx
new file mode 100644
index 000000000000..131f17a14242
--- /dev/null
+++ b/src/pages/workspace/categories/CategoryGLCodePage.tsx
@@ -0,0 +1,87 @@
+import type {StackScreenProps} from '@react-navigation/stack';
+import React, {useCallback} from 'react';
+import {useOnyx} from 'react-native-onyx';
+import FormProvider from '@components/Form/FormProvider';
+import InputWrapper from '@components/Form/InputWrapper';
+import type {FormOnyxValues} from '@components/Form/types';
+import HeaderWithBackButton from '@components/HeaderWithBackButton';
+import ScreenWrapper from '@components/ScreenWrapper';
+import TextInput from '@components/TextInput';
+import useAutoFocusInput from '@hooks/useAutoFocusInput';
+import useLocalize from '@hooks/useLocalize';
+import useThemeStyles from '@hooks/useThemeStyles';
+import Navigation from '@libs/Navigation/Navigation';
+import type {SettingsNavigatorParamList} from '@navigation/types';
+import AccessOrNotFoundWrapper from '@pages/workspace/AccessOrNotFoundWrapper';
+import * as Category from '@userActions/Policy/Category';
+import CONST from '@src/CONST';
+import ONYXKEYS from '@src/ONYXKEYS';
+import ROUTES from '@src/ROUTES';
+import type SCREENS from '@src/SCREENS';
+import INPUT_IDS from '@src/types/form/WorkspaceCategoryForm';
+
+type EditCategoryPageProps = StackScreenProps<SettingsNavigatorParamList, typeof SCREENS.WORKSPACE.CATEGORY_GL_CODE>;
+
+function CategoryGLCodePage({route}: EditCategoryPageProps) {
+    const styles = useThemeStyles();
+    const {translate} = useLocalize();
+    const policyId = route.params.policyID ?? '-1';
+    const [policyCategories] = useOnyx(`${ONYXKEYS.COLLECTION.POLICY_CATEGORIES}${policyId}`);
+
+    const categoryName = route.params.categoryName;
+    const glCode = policyCategories?.[categoryName]?.['GL Code'];
+    const {inputCallbackRef} = useAutoFocusInput();
+
+    const editGLCode = useCallback(
+        (values: FormOnyxValues<typeof ONYXKEYS.FORMS.WORKSPACE_CATEGORY_FORM>) => {
+            const newGLCode = values.glCode.trim();
+            if (newGLCode !== glCode) {
+                Category.setPolicyCategoryGLCode(route.params.policyID, categoryName, newGLCode);
+            }
+            Navigation.goBack(ROUTES.WORKSPACE_CATEGORY_SETTINGS.getRoute(route.params.policyID, categoryName));
+        },
+        [categoryName, glCode, route.params.policyID],
+    );
+
+    return (
+        <AccessOrNotFoundWrapper
+            accessVariants={[CONST.POLICY.ACCESS_VARIANTS.ADMIN, CONST.POLICY.ACCESS_VARIANTS.CONTROL]}
+            policyID={route.params.policyID}
+            featureName={CONST.POLICY.MORE_FEATURES.ARE_CATEGORIES_ENABLED}
+        >
+            <ScreenWrapper
+                includeSafeAreaPaddingBottom={false}
+                style={[styles.defaultModalContainer]}
+                testID={CategoryGLCodePage.displayName}
+                shouldEnableMaxHeight
+            >
+                <HeaderWithBackButton
+                    title={translate('workspace.categories.glCode')}
+                    onBackButtonPress={() => Navigation.goBack(ROUTES.WORKSPACE_CATEGORY_SETTINGS.getRoute(route.params.policyID, route.params.categoryName))}
+                />
+                <FormProvider
+                    formID={ONYXKEYS.FORMS.WORKSPACE_CATEGORY_FORM}
+                    onSubmit={editGLCode}
+                    submitButtonText={translate('common.save')}
+                    style={[styles.mh5, styles.flex1]}
+                    enabledWhenOffline
+                >
+                    <InputWrapper
+                        ref={inputCallbackRef}
+                        InputComponent={TextInput}
+                        defaultValue={glCode}
+                        label={translate('workspace.categories.glCode')}
+                        accessibilityLabel={translate('workspace.categories.glCode')}
+                        inputID={INPUT_IDS.GL_CODE}
+                        role={CONST.ROLE.PRESENTATION}
+                        maxLength={CONST.MAX_LENGTH_256}
+                    />
+                </FormProvider>
+            </ScreenWrapper>
+        </AccessOrNotFoundWrapper>
+    );
+}
+
+CategoryGLCodePage.displayName = 'CategoryGLCodePage';
+
+export default CategoryGLCodePage;
diff --git a/src/pages/workspace/categories/CategoryPayrollCodePage.tsx b/src/pages/workspace/categories/CategoryPayrollCodePage.tsx
new file mode 100644
index 000000000000..df5ba802a566
--- /dev/null
+++ b/src/pages/workspace/categories/CategoryPayrollCodePage.tsx
@@ -0,0 +1,87 @@
+import type {StackScreenProps} from '@react-navigation/stack';
+import React, {useCallback} from 'react';
+import {useOnyx} from 'react-native-onyx';
+import FormProvider from '@components/Form/FormProvider';
+import InputWrapper from '@components/Form/InputWrapper';
+import type {FormOnyxValues} from '@components/Form/types';
+import HeaderWithBackButton from '@components/HeaderWithBackButton';
+import ScreenWrapper from '@components/ScreenWrapper';
+import TextInput from '@components/TextInput';
+import useAutoFocusInput from '@hooks/useAutoFocusInput';
+import useLocalize from '@hooks/useLocalize';
+import useThemeStyles from '@hooks/useThemeStyles';
+import Navigation from '@libs/Navigation/Navigation';
+import type {SettingsNavigatorParamList} from '@navigation/types';
+import AccessOrNotFoundWrapper from '@pages/workspace/AccessOrNotFoundWrapper';
+import * as Category from '@userActions/Policy/Category';
+import CONST from '@src/CONST';
+import ONYXKEYS from '@src/ONYXKEYS';
+import ROUTES from '@src/ROUTES';
+import type SCREENS from '@src/SCREENS';
+import INPUT_IDS from '@src/types/form/WorkspaceCategoryForm';
+
+type EditCategoryPageProps = StackScreenProps<SettingsNavigatorParamList, typeof SCREENS.WORKSPACE.CATEGORY_PAYROLL_CODE>;
+
+function CategoryPayrollCodePage({route}: EditCategoryPageProps) {
+    const styles = useThemeStyles();
+    const {translate} = useLocalize();
+    const policyId = route.params.policyID ?? '-1';
+    const [policyCategories] = useOnyx(`${ONYXKEYS.COLLECTION.POLICY_CATEGORIES}${policyId}`);
+
+    const categoryName = route.params.categoryName;
+    const payrollCode = policyCategories?.[categoryName]?.['Payroll Code'];
+    const {inputCallbackRef} = useAutoFocusInput();
+
+    const editPayrollCode = useCallback(
+        (values: FormOnyxValues<typeof ONYXKEYS.FORMS.WORKSPACE_CATEGORY_FORM>) => {
+            const newPayrollCode = values.payrollCode.trim();
+            if (newPayrollCode !== payrollCode) {
+                Category.setPolicyCategoryPayrollCode(route.params.policyID, categoryName, newPayrollCode);
+            }
+            Navigation.goBack(ROUTES.WORKSPACE_CATEGORY_SETTINGS.getRoute(route.params.policyID, categoryName));
+        },
+        [categoryName, payrollCode, route.params.policyID],
+    );
+
+    return (
+        <AccessOrNotFoundWrapper
+            accessVariants={[CONST.POLICY.ACCESS_VARIANTS.ADMIN, CONST.POLICY.ACCESS_VARIANTS.CONTROL]}
+            policyID={route.params.policyID}
+            featureName={CONST.POLICY.MORE_FEATURES.ARE_CATEGORIES_ENABLED}
+        >
+            <ScreenWrapper
+                includeSafeAreaPaddingBottom={false}
+                style={[styles.defaultModalContainer]}
+                testID={CategoryPayrollCodePage.displayName}
+                shouldEnableMaxHeight
+            >
+                <HeaderWithBackButton
+                    title={translate('workspace.categories.payrollCode')}
+                    onBackButtonPress={() => Navigation.goBack(ROUTES.WORKSPACE_CATEGORY_SETTINGS.getRoute(route.params.policyID, route.params.categoryName))}
+                />
+                <FormProvider
+                    formID={ONYXKEYS.FORMS.WORKSPACE_CATEGORY_FORM}
+                    onSubmit={editPayrollCode}
+                    submitButtonText={translate('common.save')}
+                    style={[styles.mh5, styles.flex1]}
+                    enabledWhenOffline
+                >
+                    <InputWrapper
+                        ref={inputCallbackRef}
+                        InputComponent={TextInput}
+                        defaultValue={payrollCode}
+                        label={translate('workspace.categories.payrollCode')}
+                        accessibilityLabel={translate('workspace.categories.payrollCode')}
+                        inputID={INPUT_IDS.PAYROLL_CODE}
+                        role={CONST.ROLE.PRESENTATION}
+                        maxLength={CONST.MAX_LENGTH_256}
+                    />
+                </FormProvider>
+            </ScreenWrapper>
+        </AccessOrNotFoundWrapper>
+    );
+}
+
+CategoryPayrollCodePage.displayName = 'CategoryPayrollCodePage';
+
+export default CategoryPayrollCodePage;
diff --git a/src/pages/workspace/categories/CategorySettingsPage.tsx b/src/pages/workspace/categories/CategorySettingsPage.tsx
index 33f3e82ed05f..af8b62a5a061 100644
--- a/src/pages/workspace/categories/CategorySettingsPage.tsx
+++ b/src/pages/workspace/categories/CategorySettingsPage.tsx
@@ -1,26 +1,28 @@
 import type {StackScreenProps} from '@react-navigation/stack';
-import React, {useState} from 'react';
+import React, {useEffect, useState} from 'react';
 import {View} from 'react-native';
-import {useOnyx, withOnyx} from 'react-native-onyx';
+import {withOnyx} from 'react-native-onyx';
 import type {OnyxEntry} from 'react-native-onyx';
 import ConfirmModal from '@components/ConfirmModal';
 import HeaderWithBackButton from '@components/HeaderWithBackButton';
 import * as Expensicons from '@components/Icon/Expensicons';
+import MenuItem from '@components/MenuItem';
 import MenuItemWithTopDescription from '@components/MenuItemWithTopDescription';
 import OfflineWithFeedback from '@components/OfflineWithFeedback';
 import ScreenWrapper from '@components/ScreenWrapper';
 import Switch from '@components/Switch';
 import Text from '@components/Text';
 import useLocalize from '@hooks/useLocalize';
+import usePolicy from '@hooks/usePolicy';
 import useThemeStyles from '@hooks/useThemeStyles';
-import useWindowDimensions from '@hooks/useWindowDimensions';
-import {setWorkspaceCategoryEnabled} from '@libs/actions/Policy';
 import * as ErrorUtils from '@libs/ErrorUtils';
 import Navigation from '@libs/Navigation/Navigation';
+import {isControlPolicy} from '@libs/PolicyUtils';
 import type {SettingsNavigatorParamList} from '@navigation/types';
 import NotFoundPage from '@pages/ErrorPage/NotFoundPage';
 import AccessOrNotFoundWrapper from '@pages/workspace/AccessOrNotFoundWrapper';
-import * as Policy from '@userActions/Policy';
+import {setWorkspaceCategoryEnabled} from '@userActions/Policy/Category';
+import * as Category from '@userActions/Policy/Category';
 import CONST from '@src/CONST';
 import ONYXKEYS from '@src/ONYXKEYS';
 import ROUTES from '@src/ROUTES';
@@ -34,14 +36,30 @@ type CategorySettingsPageOnyxProps = {
 
 type CategorySettingsPageProps = CategorySettingsPageOnyxProps & StackScreenProps<SettingsNavigatorParamList, typeof SCREENS.WORKSPACE.CATEGORY_SETTINGS>;
 
-function CategorySettingsPage({route, policyCategories}: CategorySettingsPageProps) {
+function CategorySettingsPage({route, policyCategories, navigation}: CategorySettingsPageProps) {
     const styles = useThemeStyles();
     const {translate} = useLocalize();
-    const {windowWidth} = useWindowDimensions();
     const [deleteCategoryConfirmModalVisible, setDeleteCategoryConfirmModalVisible] = useState(false);
-    const [policy] = useOnyx(`${ONYXKEYS.COLLECTION.POLICY}${route.params.policyID}`);
+    const backTo = route.params?.backTo;
+    const policy = usePolicy(route.params.policyID);
 
-    const policyCategory = policyCategories?.[route.params.categoryName];
+    const policyCategory =
+        policyCategories?.[route.params.categoryName] ?? Object.values(policyCategories ?? {}).find((category) => category.previousCategoryName === route.params.categoryName);
+
+    const navigateBack = () => {
+        if (backTo) {
+            Navigation.goBack(ROUTES.SETTINGS_CATEGORIES_ROOT.getRoute(route.params.policyID, backTo));
+            return;
+        }
+        Navigation.goBack();
+    };
+
+    useEffect(() => {
+        if (policyCategory?.name === route.params.categoryName || !policyCategory) {
+            return;
+        }
+        navigation.setParams({categoryName: policyCategory?.name});
+    }, [route.params.categoryName, navigation, policyCategory]);
 
     if (!policyCategory) {
         return <NotFoundPage />;
@@ -52,24 +70,20 @@ function CategorySettingsPage({route, policyCategories}: CategorySettingsPagePro
     };
 
     const navigateToEditCategory = () => {
+        if (backTo) {
+            Navigation.navigate(ROUTES.SETTINGS_CATEGORY_EDIT.getRoute(route.params.policyID, policyCategory.name, backTo));
+            return;
+        }
         Navigation.navigate(ROUTES.WORKSPACE_CATEGORY_EDIT.getRoute(route.params.policyID, policyCategory.name));
     };
 
     const deleteCategory = () => {
-        Policy.deleteWorkspaceCategories(route.params.policyID, [route.params.categoryName]);
+        Category.deleteWorkspaceCategories(route.params.policyID, [route.params.categoryName]);
         setDeleteCategoryConfirmModalVisible(false);
-        Navigation.dismissModal();
+        navigateBack();
     };
 
     const isThereAnyAccountingConnection = Object.keys(policy?.connections ?? {}).length !== 0;
-    const threeDotsMenuItems = [];
-    if (!isThereAnyAccountingConnection) {
-        threeDotsMenuItems.push({
-            icon: Expensicons.Trashcan,
-            text: translate('workspace.categories.deleteCategory'),
-            onSelected: () => setDeleteCategoryConfirmModalVisible(true),
-        });
-    }
 
     return (
         <AccessOrNotFoundWrapper
@@ -83,10 +97,8 @@ function CategorySettingsPage({route, policyCategories}: CategorySettingsPagePro
                 testID={CategorySettingsPage.displayName}
             >
                 <HeaderWithBackButton
-                    shouldShowThreeDotsButton={threeDotsMenuItems.length > 0}
                     title={route.params.categoryName}
-                    threeDotsAnchorPosition={styles.threeDotsPopoverOffsetNoCloseButton(windowWidth)}
-                    threeDotsMenuItems={threeDotsMenuItems}
+                    onBackButtonPress={navigateBack}
                 />
                 <ConfirmModal
                     isVisible={deleteCategoryConfirmModalVisible}
@@ -103,7 +115,7 @@ function CategorySettingsPage({route, policyCategories}: CategorySettingsPagePro
                         errors={ErrorUtils.getLatestErrorMessageField(policyCategory)}
                         pendingAction={policyCategory?.pendingFields?.enabled}
                         errorRowStyles={styles.mh5}
-                        onClose={() => Policy.clearCategoryErrors(route.params.policyID, route.params.categoryName)}
+                        onClose={() => Category.clearCategoryErrors(route.params.policyID, route.params.categoryName)}
                     >
                         <View style={[styles.mt2, styles.mh5]}>
                             <View style={[styles.flexRow, styles.mb5, styles.mr2, styles.alignItemsCenter, styles.justifyContentBetween]}>
@@ -119,11 +131,58 @@ function CategorySettingsPage({route, policyCategories}: CategorySettingsPagePro
                     <OfflineWithFeedback pendingAction={policyCategory.pendingFields?.name}>
                         <MenuItemWithTopDescription
                             title={policyCategory.name}
-                            description={translate(`workspace.categories.categoryName`)}
+                            description={translate(`common.name`)}
                             onPress={navigateToEditCategory}
                             shouldShowRightIcon
                         />
                     </OfflineWithFeedback>
+                    <OfflineWithFeedback pendingAction={policyCategory.pendingFields?.['GL Code']}>
+                        <MenuItemWithTopDescription
+                            title={policyCategory['GL Code']}
+                            description={translate(`workspace.categories.glCode`)}
+                            onPress={() => {
+                                if (!isControlPolicy(policy)) {
+                                    Navigation.navigate(
+                                        ROUTES.WORKSPACE_UPGRADE.getRoute(
+                                            route.params.policyID,
+                                            CONST.UPGRADE_FEATURE_INTRO_MAPPING.glAndPayrollCodes.alias,
+                                            ROUTES.WORKSPACE_CATEGORY_GL_CODE.getRoute(route.params.policyID, policyCategory.name),
+                                        ),
+                                    );
+                                    return;
+                                }
+                                Navigation.navigate(ROUTES.WORKSPACE_CATEGORY_GL_CODE.getRoute(route.params.policyID, policyCategory.name));
+                            }}
+                            shouldShowRightIcon
+                        />
+                    </OfflineWithFeedback>
+                    <OfflineWithFeedback pendingAction={policyCategory.pendingFields?.['Payroll Code']}>
+                        <MenuItemWithTopDescription
+                            title={policyCategory['Payroll Code']}
+                            description={translate(`workspace.categories.payrollCode`)}
+                            onPress={() => {
+                                if (!isControlPolicy(policy)) {
+                                    Navigation.navigate(
+                                        ROUTES.WORKSPACE_UPGRADE.getRoute(
+                                            route.params.policyID,
+                                            CONST.UPGRADE_FEATURE_INTRO_MAPPING.glAndPayrollCodes.alias,
+                                            ROUTES.WORKSPACE_CATEGORY_PAYROLL_CODE.getRoute(route.params.policyID, policyCategory.name),
+                                        ),
+                                    );
+                                    return;
+                                }
+                                Navigation.navigate(ROUTES.WORKSPACE_CATEGORY_PAYROLL_CODE.getRoute(route.params.policyID, policyCategory.name));
+                            }}
+                            shouldShowRightIcon
+                        />
+                    </OfflineWithFeedback>
+                    {!isThereAnyAccountingConnection && (
+                        <MenuItem
+                            icon={Expensicons.Trashcan}
+                            title={translate('common.delete')}
+                            onPress={() => setDeleteCategoryConfirmModalVisible(true)}
+                        />
+                    )}
                 </View>
             </ScreenWrapper>
         </AccessOrNotFoundWrapper>
diff --git a/src/pages/workspace/categories/CreateCategoryPage.tsx b/src/pages/workspace/categories/CreateCategoryPage.tsx
index 752ab5b53cfa..472cba1215af 100644
--- a/src/pages/workspace/categories/CreateCategoryPage.tsx
+++ b/src/pages/workspace/categories/CreateCategoryPage.tsx
@@ -10,9 +10,10 @@ import useThemeStyles from '@hooks/useThemeStyles';
 import Navigation from '@libs/Navigation/Navigation';
 import type {SettingsNavigatorParamList} from '@navigation/types';
 import AccessOrNotFoundWrapper from '@pages/workspace/AccessOrNotFoundWrapper';
-import * as Policy from '@userActions/Policy';
+import * as Category from '@userActions/Policy/Category';
 import CONST from '@src/CONST';
 import ONYXKEYS from '@src/ONYXKEYS';
+import ROUTES from '@src/ROUTES';
 import type SCREENS from '@src/SCREENS';
 import type {PolicyCategories} from '@src/types/onyx';
 import CategoryForm from './CategoryForm';
@@ -27,12 +28,18 @@ type CreateCategoryPageProps = WorkspaceCreateCategoryPageOnyxProps & StackScree
 function CreateCategoryPage({route, policyCategories}: CreateCategoryPageProps) {
     const styles = useThemeStyles();
     const {translate} = useLocalize();
+    const backTo = route.params?.backTo;
 
     const createCategory = useCallback(
         (values: FormOnyxValues<typeof ONYXKEYS.FORMS.WORKSPACE_CATEGORY_FORM>) => {
-            Policy.createPolicyCategory(route.params.policyID, values.categoryName.trim());
+            Category.createPolicyCategory(route.params.policyID, values.categoryName.trim());
+            if (backTo) {
+                Navigation.goBack(ROUTES.SETTINGS_CATEGORIES_ROOT.getRoute(route.params.policyID, backTo));
+                return;
+            }
+            Navigation.goBack();
         },
-        [route.params.policyID],
+        [backTo, route.params.policyID],
     );
 
     return (
@@ -49,7 +56,7 @@ function CreateCategoryPage({route, policyCategories}: CreateCategoryPageProps)
             >
                 <HeaderWithBackButton
                     title={translate('workspace.categories.addCategory')}
-                    onBackButtonPress={Navigation.goBack}
+                    onBackButtonPress={() => (backTo ? Navigation.goBack(ROUTES.SETTINGS_CATEGORIES_ROOT.getRoute(route.params.policyID, backTo)) : Navigation.goBack())}
                 />
                 <CategoryForm
                     onSubmit={createCategory}
diff --git a/src/pages/workspace/categories/EditCategoryPage.tsx b/src/pages/workspace/categories/EditCategoryPage.tsx
index 201329b539a9..224233fff318 100644
--- a/src/pages/workspace/categories/EditCategoryPage.tsx
+++ b/src/pages/workspace/categories/EditCategoryPage.tsx
@@ -10,7 +10,7 @@ import useThemeStyles from '@hooks/useThemeStyles';
 import Navigation from '@libs/Navigation/Navigation';
 import type {SettingsNavigatorParamList} from '@navigation/types';
 import AccessOrNotFoundWrapper from '@pages/workspace/AccessOrNotFoundWrapper';
-import * as Policy from '@userActions/Policy';
+import * as Category from '@userActions/Policy/Category';
 import CONST from '@src/CONST';
 import ONYXKEYS from '@src/ONYXKEYS';
 import ROUTES from '@src/ROUTES';
@@ -29,6 +29,7 @@ function EditCategoryPage({route, policyCategories}: EditCategoryPageProps) {
     const styles = useThemeStyles();
     const {translate} = useLocalize();
     const currentCategoryName = route.params.categoryName;
+    const backTo = route.params?.backTo;
 
     const validate = useCallback(
         (values: FormOnyxValues<typeof ONYXKEYS.FORMS.WORKSPACE_CATEGORY_FORM>) => {
@@ -36,14 +37,14 @@ function EditCategoryPage({route, policyCategories}: EditCategoryPageProps) {
             const newCategoryName = values.categoryName.trim();
 
             if (!newCategoryName) {
-                errors.categoryName = 'workspace.categories.categoryRequiredError';
+                errors.categoryName = translate('workspace.categories.categoryRequiredError');
             } else if (policyCategories?.[newCategoryName] && currentCategoryName !== newCategoryName) {
-                errors.categoryName = 'workspace.categories.existingCategoryError';
+                errors.categoryName = translate('workspace.categories.existingCategoryError');
             }
 
             return errors;
         },
-        [policyCategories, currentCategoryName],
+        [policyCategories, currentCategoryName, translate],
     );
 
     const editCategory = useCallback(
@@ -51,10 +52,15 @@ function EditCategoryPage({route, policyCategories}: EditCategoryPageProps) {
             const newCategoryName = values.categoryName.trim();
             // Do not call the API if the edited category name is the same as the current category name
             if (currentCategoryName !== newCategoryName) {
-                Policy.renamePolicyCategory(route.params.policyID, {oldName: currentCategoryName, newName: values.categoryName});
+                Category.renamePolicyCategory(route.params.policyID, {oldName: currentCategoryName, newName: values.categoryName});
             }
+            if (backTo) {
+                Navigation.goBack(ROUTES.SETTINGS_CATEGORY_SETTINGS.getRoute(route.params.policyID, route.params.categoryName, backTo));
+                return;
+            }
+            Navigation.goBack();
         },
-        [currentCategoryName, route.params.policyID],
+        [backTo, currentCategoryName, route.params.categoryName, route.params.policyID],
     );
 
     return (
@@ -71,7 +77,11 @@ function EditCategoryPage({route, policyCategories}: EditCategoryPageProps) {
             >
                 <HeaderWithBackButton
                     title={translate('workspace.categories.editCategory')}
-                    onBackButtonPress={() => Navigation.goBack(ROUTES.WORKSPACE_CATEGORY_SETTINGS.getRoute(route.params.policyID, route.params.categoryName))}
+                    onBackButtonPress={() =>
+                        backTo
+                            ? Navigation.goBack(ROUTES.SETTINGS_CATEGORY_SETTINGS.getRoute(route.params.policyID, route.params.categoryName, backTo))
+                            : Navigation.goBack(ROUTES.WORKSPACE_CATEGORY_SETTINGS.getRoute(route.params.policyID, route.params.categoryName))
+                    }
                 />
                 <CategoryForm
                     onSubmit={editCategory}
diff --git a/src/pages/workspace/categories/WorkspaceCategoriesPage.tsx b/src/pages/workspace/categories/WorkspaceCategoriesPage.tsx
index 12606a9284fd..05e48a8c8774 100644
--- a/src/pages/workspace/categories/WorkspaceCategoriesPage.tsx
+++ b/src/pages/workspace/categories/WorkspaceCategoriesPage.tsx
@@ -1,41 +1,46 @@
 import {useFocusEffect, useIsFocused} from '@react-navigation/native';
 import type {StackScreenProps} from '@react-navigation/stack';
-import React, {useCallback, useEffect, useMemo, useRef, useState} from 'react';
+import lodashSortBy from 'lodash/sortBy';
+import React, {useCallback, useEffect, useMemo, useState} from 'react';
 import {ActivityIndicator, View} from 'react-native';
 import {useOnyx} from 'react-native-onyx';
 import Button from '@components/Button';
 import ButtonWithDropdownMenu from '@components/ButtonWithDropdownMenu';
 import type {DropdownOption} from '@components/ButtonWithDropdownMenu/types';
 import ConfirmModal from '@components/ConfirmModal';
+import EmptyStateComponent from '@components/EmptyStateComponent';
 import HeaderWithBackButton from '@components/HeaderWithBackButton';
 import * as Expensicons from '@components/Icon/Expensicons';
 import * as Illustrations from '@components/Icon/Illustrations';
 import ScreenWrapper from '@components/ScreenWrapper';
-import SelectionList from '@components/SelectionList';
-import RightElementEnabledStatus from '@components/SelectionList/RightElementEnabledStatus';
+import ListItemRightCaretWithLabel from '@components/SelectionList/ListItemRightCaretWithLabel';
 import TableListItem from '@components/SelectionList/TableListItem';
 import type {ListItem} from '@components/SelectionList/types';
+import SelectionListWithModal from '@components/SelectionListWithModal';
+import TableListItemSkeleton from '@components/Skeletons/TableRowSkeleton';
 import Text from '@components/Text';
 import TextLink from '@components/TextLink';
-import WorkspaceEmptyStateSection from '@components/WorkspaceEmptyStateSection';
 import useEnvironment from '@hooks/useEnvironment';
 import useLocalize from '@hooks/useLocalize';
 import useNetwork from '@hooks/useNetwork';
+import usePolicy from '@hooks/usePolicy';
+import useResponsiveLayout from '@hooks/useResponsiveLayout';
 import useTheme from '@hooks/useTheme';
 import useThemeStyles from '@hooks/useThemeStyles';
-import useWindowDimensions from '@hooks/useWindowDimensions';
-import {deleteWorkspaceCategories, setWorkspaceCategoryEnabled} from '@libs/actions/Policy';
+import {turnOffMobileSelectionMode} from '@libs/actions/MobileSelectionMode';
 import * as DeviceCapabilities from '@libs/DeviceCapabilities';
 import localeCompare from '@libs/LocaleCompare';
 import Navigation from '@libs/Navigation/Navigation';
-import type {WorkspacesCentralPaneNavigatorParamList} from '@libs/Navigation/types';
+import type {FullScreenNavigatorParamList} from '@libs/Navigation/types';
 import * as PolicyUtils from '@libs/PolicyUtils';
 import AccessOrNotFoundWrapper from '@pages/workspace/AccessOrNotFoundWrapper';
-import * as Policy from '@userActions/Policy';
+import {deleteWorkspaceCategories, setWorkspaceCategoryEnabled} from '@userActions/Policy/Category';
+import * as Category from '@userActions/Policy/Category';
 import CONST from '@src/CONST';
 import ONYXKEYS from '@src/ONYXKEYS';
 import ROUTES from '@src/ROUTES';
 import type SCREENS from '@src/SCREENS';
+import type {PolicyCategory} from '@src/types/onyx';
 import type DeepValueOf from '@src/types/utils/DeepValueOf';
 
 type PolicyOption = ListItem & {
@@ -43,24 +48,29 @@ type PolicyOption = ListItem & {
     keyForList: string;
 };
 
-type WorkspaceCategoriesPageProps = StackScreenProps<WorkspacesCentralPaneNavigatorParamList, typeof SCREENS.WORKSPACE.CATEGORIES>;
+type WorkspaceCategoriesPageProps = StackScreenProps<FullScreenNavigatorParamList, typeof SCREENS.WORKSPACE.CATEGORIES>;
 
 function WorkspaceCategoriesPage({route}: WorkspaceCategoriesPageProps) {
-    const {isSmallScreenWidth} = useWindowDimensions();
+    const {shouldUseNarrowLayout} = useResponsiveLayout();
     const styles = useThemeStyles();
     const theme = useTheme();
     const {translate} = useLocalize();
     const [selectedCategories, setSelectedCategories] = useState<Record<string, boolean>>({});
-    const dropdownButtonRef = useRef(null);
     const [deleteCategoriesConfirmModalVisible, setDeleteCategoriesConfirmModalVisible] = useState(false);
     const isFocused = useIsFocused();
     const {environmentURL} = useEnvironment();
-    const policyId = route.params.policyID ?? '';
-    const [policy] = useOnyx(`${ONYXKEYS.COLLECTION.POLICY}${policyId}`);
+    const policyId = route.params.policyID ?? '-1';
+    const backTo = route.params?.backTo;
+    const policy = usePolicy(policyId);
     const [policyCategories] = useOnyx(`${ONYXKEYS.COLLECTION.POLICY_CATEGORIES}${policyId}`);
+    const [selectionMode] = useOnyx(ONYXKEYS.MOBILE_SELECTION_MODE);
+    const isConnectedToAccounting = Object.keys(policy?.connections ?? {}).length > 0;
+    const currentConnectionName = PolicyUtils.getCurrentConnectionName(policy);
+
+    const canSelectMultiple = shouldUseNarrowLayout ? selectionMode?.isEnabled : true;
 
     const fetchCategories = useCallback(() => {
-        Policy.openPolicyCategoriesPage(policyId);
+        Category.openPolicyCategoriesPage(policyId);
     }, [policyId]);
 
     const {isOffline} = useNetwork({onReconnect: fetchCategories});
@@ -80,24 +90,22 @@ function WorkspaceCategoriesPage({route}: WorkspaceCategoriesPageProps) {
 
     const categoryList = useMemo<PolicyOption[]>(
         () =>
-            Object.values(policyCategories ?? {})
-                .sort((a, b) => localeCompare(a.name, b.name))
-                .map((value) => {
-                    const isDisabled = value.pendingAction === CONST.RED_BRICK_ROAD_PENDING_ACTION.DELETE;
-                    return {
-                        text: value.name,
-                        keyForList: value.name,
-                        isSelected: !!selectedCategories[value.name],
-                        isDisabled,
-                        pendingAction: value.pendingAction,
-                        errors: value.errors ?? undefined,
-                        rightElement: <RightElementEnabledStatus enabled={value.enabled} />,
-                    };
-                }),
-        [policyCategories, selectedCategories],
+            (lodashSortBy(Object.values(policyCategories ?? {}), 'name', localeCompare) as PolicyCategory[]).map((value) => {
+                const isDisabled = value.pendingAction === CONST.RED_BRICK_ROAD_PENDING_ACTION.DELETE;
+                return {
+                    text: value.name,
+                    keyForList: value.name,
+                    isSelected: !!selectedCategories[value.name] && canSelectMultiple,
+                    isDisabled,
+                    pendingAction: value.pendingAction,
+                    errors: value.errors ?? undefined,
+                    rightElement: <ListItemRightCaretWithLabel labelText={value.enabled ? translate('workspace.common.enabled') : translate('workspace.common.disabled')} />,
+                };
+            }),
+        [policyCategories, selectedCategories, canSelectMultiple, translate],
     );
 
-    const toggleCategory = (category: PolicyOption) => {
+    const toggleCategory = useCallback((category: PolicyOption) => {
         setSelectedCategories((prev) => {
             if (prev[category.keyForList]) {
                 const {[category.keyForList]: omittedCategory, ...newCategories} = prev;
@@ -105,7 +113,7 @@ function WorkspaceCategoriesPage({route}: WorkspaceCategoriesPageProps) {
             }
             return {...prev, [category.keyForList]: true};
         });
-    };
+    }, []);
 
     const toggleAllCategories = () => {
         const availableCategories = categoryList.filter((category) => category.pendingAction !== CONST.RED_BRICK_ROAD_PENDING_ACTION.DELETE);
@@ -114,26 +122,38 @@ function WorkspaceCategoriesPage({route}: WorkspaceCategoriesPageProps) {
     };
 
     const getCustomListHeader = () => (
-        <View style={[styles.flex1, styles.flexRow, styles.justifyContentBetween, styles.pl3, styles.pr9]}>
+        <View style={[styles.flex1, styles.flexRow, styles.justifyContentBetween, styles.pl3, styles.pr9, !canSelectMultiple && styles.m5]}>
             <Text style={styles.searchInputStyle}>{translate('common.name')}</Text>
             <Text style={[styles.searchInputStyle, styles.textAlignCenter]}>{translate('statusPage.status')}</Text>
         </View>
     );
 
     const navigateToCategorySettings = (category: PolicyOption) => {
+        if (backTo) {
+            Navigation.navigate(ROUTES.SETTINGS_CATEGORY_SETTINGS.getRoute(policyId, category.keyForList, backTo));
+            return;
+        }
         Navigation.navigate(ROUTES.WORKSPACE_CATEGORY_SETTINGS.getRoute(policyId, category.keyForList));
     };
 
     const navigateToCategoriesSettings = () => {
+        if (backTo) {
+            Navigation.navigate(ROUTES.SETTINGS_CATEGORIES_SETTINGS.getRoute(policyId, backTo));
+            return;
+        }
         Navigation.navigate(ROUTES.WORKSPACE_CATEGORIES_SETTINGS.getRoute(policyId));
     };
 
     const navigateToCreateCategoryPage = () => {
+        if (backTo) {
+            Navigation.navigate(ROUTES.SETTINGS_CATEGORY_CREATE.getRoute(policyId, backTo));
+            return;
+        }
         Navigation.navigate(ROUTES.WORKSPACE_CATEGORY_CREATE.getRoute(policyId));
     };
 
     const dismissError = (item: PolicyOption) => {
-        Policy.clearCategoryErrors(policyId, item.keyForList);
+        Category.clearCategoryErrors(policyId, item.keyForList);
     };
 
     const selectedCategoriesArray = Object.keys(selectedCategories).filter((key) => selectedCategories[key]);
@@ -145,15 +165,15 @@ function WorkspaceCategoriesPage({route}: WorkspaceCategoriesPageProps) {
     };
 
     const getHeaderButtons = () => {
-        const options: Array<DropdownOption<DeepValueOf<typeof CONST.POLICY.CATEGORIES_BULK_ACTION_TYPES>>> = [];
+        const options: Array<DropdownOption<DeepValueOf<typeof CONST.POLICY.BULK_ACTION_TYPES>>> = [];
         const isThereAnyAccountingConnection = Object.keys(policy?.connections ?? {}).length !== 0;
 
-        if (selectedCategoriesArray.length > 0) {
+        if (shouldUseNarrowLayout ? canSelectMultiple : selectedCategoriesArray.length > 0) {
             if (!isThereAnyAccountingConnection) {
                 options.push({
                     icon: Expensicons.Trashcan,
                     text: translate(selectedCategoriesArray.length === 1 ? 'workspace.categories.deleteCategory' : 'workspace.categories.deleteCategories'),
-                    value: CONST.POLICY.CATEGORIES_BULK_ACTION_TYPES.DELETE,
+                    value: CONST.POLICY.BULK_ACTION_TYPES.DELETE,
                     onSelected: () => setDeleteCategoriesConfirmModalVisible(true),
                 });
             }
@@ -173,7 +193,7 @@ function WorkspaceCategoriesPage({route}: WorkspaceCategoriesPageProps) {
                 options.push({
                     icon: Expensicons.DocumentSlash,
                     text: translate(enabledCategories.length === 1 ? 'workspace.categories.disableCategory' : 'workspace.categories.disableCategories'),
-                    value: CONST.POLICY.CATEGORIES_BULK_ACTION_TYPES.DISABLE,
+                    value: CONST.POLICY.BULK_ACTION_TYPES.DISABLE,
                     onSelected: () => {
                         setSelectedCategories({});
                         setWorkspaceCategoryEnabled(policyId, categoriesToDisable);
@@ -195,7 +215,7 @@ function WorkspaceCategoriesPage({route}: WorkspaceCategoriesPageProps) {
                 options.push({
                     icon: Expensicons.Document,
                     text: translate(disabledCategories.length === 1 ? 'workspace.categories.enableCategory' : 'workspace.categories.enableCategories'),
-                    value: CONST.POLICY.CATEGORIES_BULK_ACTION_TYPES.ENABLE,
+                    value: CONST.POLICY.BULK_ACTION_TYPES.ENABLE,
                     onSelected: () => {
                         setSelectedCategories({});
                         setWorkspaceCategoryEnabled(policyId, categoriesToEnable);
@@ -205,7 +225,6 @@ function WorkspaceCategoriesPage({route}: WorkspaceCategoriesPageProps) {
 
             return (
                 <ButtonWithDropdownMenu
-                    buttonRef={dropdownButtonRef}
                     onPress={() => null}
                     shouldAlwaysShowDropdownMenu
                     pressOnEnter
@@ -213,13 +232,14 @@ function WorkspaceCategoriesPage({route}: WorkspaceCategoriesPageProps) {
                     customText={translate('workspace.common.selected', {selectedNumber: selectedCategoriesArray.length})}
                     options={options}
                     isSplitButton={false}
-                    style={[isSmallScreenWidth && styles.flexGrow1, isSmallScreenWidth && styles.mb3]}
+                    style={[shouldUseNarrowLayout && styles.flexGrow1, shouldUseNarrowLayout && styles.mb3]}
+                    isDisabled={!selectedCategoriesArray.length}
                 />
             );
         }
 
         return (
-            <View style={[styles.w100, styles.flexRow, isSmallScreenWidth && styles.mb3]}>
+            <View style={[styles.w100, styles.flexRow, styles.gap2, shouldUseNarrowLayout && styles.mb3]}>
                 {!PolicyUtils.hasAccountingConnections(policy) && (
                     <Button
                         medium
@@ -227,7 +247,7 @@ function WorkspaceCategoriesPage({route}: WorkspaceCategoriesPageProps) {
                         onPress={navigateToCreateCategoryPage}
                         icon={Expensicons.Plus}
                         text={translate('workspace.categories.addCategory')}
-                        style={[styles.mr3, isSmallScreenWidth && styles.w50]}
+                        style={[shouldUseNarrowLayout && styles.flex1]}
                     />
                 )}
                 <Button
@@ -235,7 +255,7 @@ function WorkspaceCategoriesPage({route}: WorkspaceCategoriesPageProps) {
                     onPress={navigateToCategoriesSettings}
                     icon={Expensicons.Gear}
                     text={translate('common.settings')}
-                    style={[isSmallScreenWidth && styles.w50]}
+                    style={[shouldUseNarrowLayout && styles.flex1]}
                 />
             </View>
         );
@@ -243,7 +263,36 @@ function WorkspaceCategoriesPage({route}: WorkspaceCategoriesPageProps) {
 
     const isLoading = !isOffline && policyCategories === undefined;
 
-    const shouldShowEmptyState = !categoryList.some((category) => category.pendingAction !== CONST.RED_BRICK_ROAD_PENDING_ACTION.DELETE) && !isLoading;
+    useEffect(() => {
+        if (selectionMode?.isEnabled) {
+            return;
+        }
+
+        setSelectedCategories({});
+    }, [setSelectedCategories, selectionMode?.isEnabled]);
+
+    const hasVisibleCategories = categoryList.some((category) => category.pendingAction !== CONST.RED_BRICK_ROAD_PENDING_ACTION.DELETE || isOffline);
+
+    const getHeaderText = () => (
+        <View style={[styles.ph5, styles.pb5, styles.pt3]}>
+            {isConnectedToAccounting ? (
+                <Text>
+                    <Text style={[styles.textNormal, styles.colorMuted]}>{`${translate('workspace.categories.importedFromAccountingSoftware')} `}</Text>
+                    <TextLink
+                        style={[styles.textNormal, styles.link]}
+                        href={`${environmentURL}/${ROUTES.POLICY_ACCOUNTING.getRoute(policyId)}`}
+                    >
+                        {`${currentConnectionName} ${translate('workspace.accounting.settings')}`}
+                    </TextLink>
+                    <Text style={[styles.textNormal, styles.colorMuted]}>.</Text>
+                </Text>
+            ) : (
+                <Text style={[styles.textNormal, styles.colorMuted]}>{translate('workspace.categories.subtitle')}</Text>
+            )}
+        </View>
+    );
+
+    const selectionModeHeader = selectionMode?.isEnabled && shouldUseNarrowLayout;
 
     return (
         <AccessOrNotFoundWrapper
@@ -259,11 +308,19 @@ function WorkspaceCategoriesPage({route}: WorkspaceCategoriesPageProps) {
                 offlineIndicatorStyle={styles.mtAuto}
             >
                 <HeaderWithBackButton
-                    icon={Illustrations.FolderOpen}
-                    title={translate('workspace.common.categories')}
-                    shouldShowBackButton={isSmallScreenWidth}
+                    shouldShowBackButton={shouldUseNarrowLayout}
+                    title={selectionModeHeader ? translate('common.selectMultiple') : translate('workspace.common.categories')}
+                    icon={!selectionModeHeader ? Illustrations.FolderOpen : undefined}
+                    onBackButtonPress={() => {
+                        if (selectionMode?.isEnabled) {
+                            setSelectedCategories({});
+                            turnOffMobileSelectionMode();
+                            return;
+                        }
+                        Navigation.goBack(backTo);
+                    }}
                 >
-                    {!isSmallScreenWidth && getHeaderButtons()}
+                    {!shouldUseNarrowLayout && getHeaderButtons()}
                 </HeaderWithBackButton>
                 <ConfirmModal
                     isVisible={deleteCategoriesConfirmModalVisible}
@@ -275,22 +332,8 @@ function WorkspaceCategoriesPage({route}: WorkspaceCategoriesPageProps) {
                     cancelText={translate('common.cancel')}
                     danger
                 />
-                {isSmallScreenWidth && <View style={[styles.pl5, styles.pr5]}>{getHeaderButtons()}</View>}
-                <View style={[styles.ph5, styles.pb5, styles.pt3]}>
-                    {Object.keys(policy?.connections ?? {}).length > 0 ? (
-                        <Text>
-                            <Text style={[styles.textNormal, styles.colorMuted]}>{`${translate('workspace.categories.importedFromAccountingSoftware')} `}</Text>
-                            <TextLink
-                                style={[styles.textNormal, styles.link]}
-                                href={`${environmentURL}/${ROUTES.POLICY_ACCOUNTING.getRoute(policyId)}`}
-                            >
-                                {`${translate('workspace.accounting.qbo')} ${translate('workspace.accounting.settings')}`}
-                            </TextLink>
-                        </Text>
-                    ) : (
-                        <Text style={[styles.textNormal, styles.colorMuted]}>{translate('workspace.categories.subtitle')}</Text>
-                    )}
-                </View>
+                {shouldUseNarrowLayout && <View style={[styles.pl5, styles.pr5]}>{getHeaderButtons()}</View>}
+                {(!shouldUseNarrowLayout || !hasVisibleCategories || isLoading) && getHeaderText()}
                 {isLoading && (
                     <ActivityIndicator
                         size={CONST.ACTIVITY_INDICATOR_SIZE.LARGE}
@@ -298,26 +341,34 @@ function WorkspaceCategoriesPage({route}: WorkspaceCategoriesPageProps) {
                         color={theme.spinner}
                     />
                 )}
-                {shouldShowEmptyState && (
-                    <WorkspaceEmptyStateSection
+
+                {!hasVisibleCategories && !isLoading && (
+                    <EmptyStateComponent
+                        SkeletonComponent={TableListItemSkeleton}
+                        headerMediaType={CONST.EMPTY_STATE_MEDIA.ILLUSTRATION}
+                        headerMedia={Illustrations.EmptyState}
+                        headerStyles={styles.emptyFolderBG}
+                        headerContentStyles={styles.emptyStateFolderIconSize}
                         title={translate('workspace.categories.emptyCategories.title')}
-                        icon={Illustrations.EmptyStateExpenses}
                         subtitle={translate('workspace.categories.emptyCategories.subtitle')}
                     />
                 )}
-                {!shouldShowEmptyState && !isLoading && (
-                    <SelectionList
-                        canSelectMultiple
+                {hasVisibleCategories && !isLoading && (
+                    <SelectionListWithModal
+                        canSelectMultiple={canSelectMultiple}
+                        turnOnSelectionModeOnLongPress
+                        onTurnOnSelectionMode={(item) => item && toggleCategory(item)}
                         sections={[{data: categoryList, isDisabled: false}]}
                         onCheckboxPress={toggleCategory}
                         onSelectRow={navigateToCategorySettings}
                         shouldPreventDefaultFocusOnSelectRow={!DeviceCapabilities.canUseTouchScreen()}
                         onSelectAll={toggleAllCategories}
-                        showScrollIndicator
                         ListItem={TableListItem}
                         onDismissError={dismissError}
                         customListHeader={getCustomListHeader()}
                         listHeaderWrapperStyle={[styles.ph9, styles.pv3, styles.pb5]}
+                        listHeaderContent={shouldUseNarrowLayout ? getHeaderText() : null}
+                        showScrollIndicator={false}
                     />
                 )}
             </ScreenWrapper>
diff --git a/src/pages/workspace/categories/WorkspaceCategoriesSettingsPage.tsx b/src/pages/workspace/categories/WorkspaceCategoriesSettingsPage.tsx
index 3b4947b02c56..3c9edfd5fbf2 100644
--- a/src/pages/workspace/categories/WorkspaceCategoriesSettingsPage.tsx
+++ b/src/pages/workspace/categories/WorkspaceCategoriesSettingsPage.tsx
@@ -5,13 +5,14 @@ import HeaderWithBackButton from '@components/HeaderWithBackButton';
 import ScreenWrapper from '@components/ScreenWrapper';
 import useLocalize from '@hooks/useLocalize';
 import useThemeStyles from '@hooks/useThemeStyles';
-import {setWorkspaceRequiresCategory} from '@libs/actions/Policy';
 import * as OptionsListUtils from '@libs/OptionsListUtils';
+import * as PolicyUtils from '@libs/PolicyUtils';
 import AccessOrNotFoundWrapper from '@pages/workspace/AccessOrNotFoundWrapper';
 import type {WithPolicyConnectionsProps} from '@pages/workspace/withPolicyConnections';
 import withPolicyConnections from '@pages/workspace/withPolicyConnections';
 import ToggleSettingOptionRow from '@pages/workspace/workflows/ToggleSettingsOptionRow';
-import * as Policy from '@userActions/Policy';
+import {setWorkspaceRequiresCategory} from '@userActions/Policy/Category';
+import * as Policy from '@userActions/Policy/Policy';
 import CONST from '@src/CONST';
 import ONYXKEYS from '@src/ONYXKEYS';
 
@@ -21,8 +22,11 @@ function WorkspaceCategoriesSettingsPage({policy, route}: WorkspaceCategoriesSet
     const styles = useThemeStyles();
     const {translate} = useLocalize();
     const isConnectedToAccounting = Object.keys(policy?.connections ?? {}).length > 0;
-    const policyID = route.params.policyID ?? '';
+    const policyID = route.params.policyID ?? '-1';
     const [policyCategories] = useOnyx(`${ONYXKEYS.COLLECTION.POLICY_CATEGORIES}${policyID}`);
+    const currentConnectionName = PolicyUtils.getCurrentConnectionName(policy);
+
+    const toggleSubtitle = isConnectedToAccounting && currentConnectionName ? `${translate('workspace.categories.needCategoryForExportToIntegration')} ${currentConnectionName}.` : undefined;
 
     const updateWorkspaceRequiresCategory = (value: boolean) => {
         setWorkspaceRequiresCategory(policyID, value);
@@ -44,14 +48,16 @@ function WorkspaceCategoriesSettingsPage({policy, route}: WorkspaceCategoriesSet
                 <View style={styles.flexGrow1}>
                     <ToggleSettingOptionRow
                         title={translate('workspace.categories.requiresCategory')}
-                        subtitle={isConnectedToAccounting ? `${translate('workspace.categories.needCategoryForExportToIntegration')} ${translate('workspace.accounting.qbo')}` : ''}
+                        subtitle={toggleSubtitle}
+                        switchAccessibilityLabel={translate('workspace.categories.requiresCategory')}
                         isActive={policy?.requiresCategory ?? false}
                         onToggle={updateWorkspaceRequiresCategory}
                         pendingAction={policy?.pendingFields?.requiresCategory}
                         disabled={!policy?.areCategoriesEnabled || !hasEnabledOptions || isConnectedToAccounting}
                         wrapperStyle={[styles.mt2, styles.mh4]}
                         errors={policy?.errorFields?.requiresCategory ?? undefined}
-                        onCloseError={() => Policy.clearPolicyErrorField(policy?.id ?? '', 'requiresCategory')}
+                        onCloseError={() => Policy.clearPolicyErrorField(policy?.id ?? '-1', 'requiresCategory')}
+                        shouldPlaceSubtitleBelowSwitch
                     />
                 </View>
             </ScreenWrapper>
diff --git a/src/pages/workspace/companyCards/WorkspaceCompanyCardFeedSelectorPage.tsx b/src/pages/workspace/companyCards/WorkspaceCompanyCardFeedSelectorPage.tsx
new file mode 100644
index 000000000000..c745774d364d
--- /dev/null
+++ b/src/pages/workspace/companyCards/WorkspaceCompanyCardFeedSelectorPage.tsx
@@ -0,0 +1,123 @@
+import type {StackScreenProps} from '@react-navigation/stack';
+import React from 'react';
+import {useOnyx} from 'react-native-onyx';
+import HeaderWithBackButton from '@components/HeaderWithBackButton';
+import Icon from '@components/Icon';
+import * as Expensicons from '@components/Icon/Expensicons';
+import MenuItem from '@components/MenuItem';
+import ScreenWrapper from '@components/ScreenWrapper';
+import SelectionList from '@components/SelectionList';
+import RadioListItem from '@components/SelectionList/RadioListItem';
+import type {ListItem} from '@components/SelectionList/types';
+import useLocalize from '@hooks/useLocalize';
+import useThemeStyles from '@hooks/useThemeStyles';
+import * as CardUtils from '@libs/CardUtils';
+import type {SettingsNavigatorParamList} from '@libs/Navigation/types';
+import Navigation from '@navigation/Navigation';
+import AccessOrNotFoundWrapper from '@pages/workspace/AccessOrNotFoundWrapper';
+import variables from '@styles/variables';
+import * as Card from '@userActions/Card';
+import CONST from '@src/CONST';
+import ONYXKEYS from '@src/ONYXKEYS';
+import ROUTES from '@src/ROUTES';
+import type SCREENS from '@src/SCREENS';
+import type {CardFeeds} from '@src/types/onyx';
+
+type CardFeedListItem = ListItem & {
+    /** Card feed value */
+    value: string;
+};
+
+const mockedData: CardFeeds = {
+    companyCards: {
+        cdfbmo: {
+            pending: false,
+            asrEnabled: true,
+            forceReimbursable: 'force_no',
+            liabilityType: 'corporate',
+            preferredPolicy: '',
+            reportTitleFormat: '{report:card}{report:bank}{report:submit:from}{report:total}{report:enddate:MMMM}',
+            statementPeriodEndDay: 'LAST_DAY_OF_MONTH',
+        },
+    },
+    companyCardNicknames: {
+        cdfbmo: 'BMO MasterCard',
+    },
+};
+
+type WorkspaceCompanyCardFeedSelectorPageProps = StackScreenProps<SettingsNavigatorParamList, typeof SCREENS.WORKSPACE.COMPANY_CARDS_SELECT_FEED>;
+
+function WorkspaceCompanyCardFeedSelectorPage({route}: WorkspaceCompanyCardFeedSelectorPageProps) {
+    const {policyID} = route.params;
+
+    const {translate} = useLocalize();
+    const styles = useThemeStyles();
+    // TODO: use data form onyx instead of mocked one when API is implemented
+    // const [cardFeeds] = useOnyx(`${ONYXKEYS.COLLECTION.SHARED_NVP_PRIVATE_DOMAIN_MEMBER}${workspaceAccountID}`);
+    const [lastSelectedFeed] = useOnyx(`${ONYXKEYS.COLLECTION.LAST_SELECTED_FEED}${policyID}`);
+
+    const cardFeeds = mockedData;
+    const defaultFeed = Object.keys(cardFeeds?.companyCards ?? {})[0];
+    const selectedFeed = lastSelectedFeed ?? defaultFeed;
+
+    const feeds: CardFeedListItem[] = Object.entries(cardFeeds?.companyCardNicknames ?? {}).map(([key, value]) => ({
+        value: key,
+        text: value,
+        keyForList: key,
+        isSelected: key === selectedFeed,
+        leftElement: (
+            <Icon
+                src={CardUtils.getCardFeedIcon(key)}
+                height={variables.iconSizeExtraLarge}
+                width={variables.iconSizeExtraLarge}
+                additionalStyles={styles.mr3}
+            />
+        ),
+    }));
+
+    const goBack = () => Navigation.goBack(ROUTES.WORKSPACE_COMPANY_CARDS.getRoute(policyID));
+
+    const selectFeed = (feed: CardFeedListItem) => {
+        Card.updateSelectedFeed(feed.value, policyID);
+        goBack();
+    };
+
+    return (
+        <AccessOrNotFoundWrapper
+            policyID={policyID}
+            featureName={CONST.POLICY.MORE_FEATURES.ARE_COMPANY_CARDS_ENABLED}
+        >
+            <ScreenWrapper
+                testID={WorkspaceCompanyCardFeedSelectorPage.displayName}
+                shouldEnablePickerAvoiding={false}
+                shouldEnableMaxHeight
+            >
+                <HeaderWithBackButton
+                    title={translate('workspace.companyCards.selectCardFeed')}
+                    onBackButtonPress={goBack}
+                />
+                <SelectionList
+                    ListItem={RadioListItem}
+                    onSelectRow={selectFeed}
+                    sections={[{data: feeds}]}
+                    shouldUpdateFocusedIndex
+                    isAlternateTextMultilineSupported
+                    initiallyFocusedOptionKey={selectedFeed}
+                    listFooterContent={
+                        <MenuItem
+                            title={translate('workspace.companyCards.addCompanyCards')}
+                            icon={Expensicons.Plus}
+                            onPress={() => {
+                                // TODO: navigate to Add Feed flow when it's implemented
+                            }}
+                        />
+                    }
+                />
+            </ScreenWrapper>
+        </AccessOrNotFoundWrapper>
+    );
+}
+
+WorkspaceCompanyCardFeedSelectorPage.displayName = 'WorkspaceCompanyCardFeedSelectorPage';
+
+export default WorkspaceCompanyCardFeedSelectorPage;
diff --git a/src/pages/workspace/companyCards/WorkspaceCompanyCardsPage.tsx b/src/pages/workspace/companyCards/WorkspaceCompanyCardsPage.tsx
new file mode 100644
index 000000000000..1945cf99a001
--- /dev/null
+++ b/src/pages/workspace/companyCards/WorkspaceCompanyCardsPage.tsx
@@ -0,0 +1,42 @@
+import type {StackScreenProps} from '@react-navigation/stack';
+import React from 'react';
+import {View} from 'react-native';
+import * as Illustrations from '@components/Icon/Illustrations';
+import useLocalize from '@hooks/useLocalize';
+import useResponsiveLayout from '@hooks/useResponsiveLayout';
+import useThemeStyles from '@hooks/useThemeStyles';
+import type {FullScreenNavigatorParamList} from '@libs/Navigation/types';
+import AccessOrNotFoundWrapper from '@pages/workspace/AccessOrNotFoundWrapper';
+import WorkspacePageWithSections from '@pages/workspace/WorkspacePageWithSections';
+import CONST from '@src/CONST';
+import type SCREENS from '@src/SCREENS';
+
+type WorkspaceCompanyCardPageProps = StackScreenProps<FullScreenNavigatorParamList, typeof SCREENS.WORKSPACE.COMPANY_CARDS>;
+
+function WorkspaceCompanyCardPage({route}: WorkspaceCompanyCardPageProps) {
+    const {translate} = useLocalize();
+    const styles = useThemeStyles();
+    const {shouldUseNarrowLayout} = useResponsiveLayout();
+
+    return (
+        <AccessOrNotFoundWrapper
+            policyID={route.params.policyID}
+            featureName={CONST.POLICY.MORE_FEATURES.ARE_COMPANY_CARDS_ENABLED}
+        >
+            <WorkspacePageWithSections
+                shouldUseScrollView
+                icon={Illustrations.CompanyCard}
+                headerText={translate('workspace.common.companyCards')}
+                route={route}
+                guidesCallTaskID={CONST.GUIDES_CALL_TASK_IDS.WORKSPACE_COMPANY_CARDS}
+                shouldShowOfflineIndicatorInWideScreen
+            >
+                <View style={[styles.mt3, shouldUseNarrowLayout ? styles.workspaceSectionMobile : styles.workspaceSection]} />
+            </WorkspacePageWithSections>
+        </AccessOrNotFoundWrapper>
+    );
+}
+
+WorkspaceCompanyCardPage.displayName = 'WorkspaceCompanyCardPage';
+
+export default WorkspaceCompanyCardPage;
diff --git a/src/pages/workspace/distanceRates/CreateDistanceRatePage.tsx b/src/pages/workspace/distanceRates/CreateDistanceRatePage.tsx
index a103d4b61e09..b2dca63ecd34 100644
--- a/src/pages/workspace/distanceRates/CreateDistanceRatePage.tsx
+++ b/src/pages/workspace/distanceRates/CreateDistanceRatePage.tsx
@@ -1,8 +1,10 @@
 import type {StackScreenProps} from '@react-navigation/stack';
 import React, {useCallback} from 'react';
+import {View} from 'react-native';
 import type {OnyxEntry} from 'react-native-onyx';
 import {withOnyx} from 'react-native-onyx';
 import AmountForm from '@components/AmountForm';
+import FullPageOfflineBlockingView from '@components/BlockingViews/FullPageOfflineBlockingView';
 import FormProvider from '@components/Form/FormProvider';
 import InputWrapperWithRef from '@components/Form/InputWrapper';
 import type {FormOnyxValues} from '@components/Form/types';
@@ -15,7 +17,8 @@ import {getOptimisticRateName, validateRateValue} from '@libs/PolicyDistanceRate
 import Navigation from '@navigation/Navigation';
 import type {SettingsNavigatorParamList} from '@navigation/types';
 import AccessOrNotFoundWrapper from '@pages/workspace/AccessOrNotFoundWrapper';
-import {createPolicyDistanceRate, generateCustomUnitID} from '@userActions/Policy';
+import {createPolicyDistanceRate} from '@userActions/Policy/DistanceRate';
+import {generateCustomUnitID} from '@userActions/Policy/Policy';
 import CONST from '@src/CONST';
 import ONYXKEYS from '@src/ONYXKEYS';
 import type SCREENS from '@src/SCREENS';
@@ -39,6 +42,8 @@ function CreateDistanceRatePage({policy, route}: CreateDistanceRatePageProps) {
     const customUnitRateID = generateCustomUnitID();
     const {inputCallbackRef} = useAutoFocusInput();
 
+    const FullPageBlockingView = !customUnitID ? FullPageOfflineBlockingView : View;
+
     const validate = useCallback(
         (values: FormOnyxValues<typeof ONYXKEYS.FORMS.POLICY_CREATE_DISTANCE_RATE_FORM>) => validateRateValue(values, currency, toLocaleDigit),
         [currency, toLocaleDigit],
@@ -70,27 +75,28 @@ function CreateDistanceRatePage({policy, route}: CreateDistanceRatePageProps) {
                 shouldEnableMaxHeight
             >
                 <HeaderWithBackButton title={translate('workspace.distanceRates.addRate')} />
-                <FormProvider
-                    formID={ONYXKEYS.FORMS.POLICY_CREATE_DISTANCE_RATE_FORM}
-                    submitButtonText={translate('common.save')}
-                    onSubmit={submit}
-                    validate={validate}
-                    enabledWhenOffline
-                    style={[styles.flexGrow1]}
-                    shouldHideFixErrorsAlert
-                    submitFlexEnabled={false}
-                    submitButtonStyles={[styles.mh5, styles.mt0]}
-                    disablePressOnEnter={false}
-                >
-                    <InputWrapperWithRef
-                        InputComponent={AmountForm}
-                        inputID={INPUT_IDS.RATE}
-                        extraDecimals={1}
-                        isCurrencyPressable={false}
-                        currency={currency}
-                        ref={inputCallbackRef}
-                    />
-                </FormProvider>
+                <FullPageBlockingView style={[styles.flexGrow1]}>
+                    <FormProvider
+                        formID={ONYXKEYS.FORMS.POLICY_CREATE_DISTANCE_RATE_FORM}
+                        submitButtonText={translate('common.save')}
+                        onSubmit={submit}
+                        validate={validate}
+                        enabledWhenOffline
+                        style={[styles.flexGrow1]}
+                        shouldHideFixErrorsAlert
+                        submitFlexEnabled={false}
+                        submitButtonStyles={[styles.mh5, styles.mt0]}
+                    >
+                        <InputWrapperWithRef
+                            InputComponent={AmountForm}
+                            inputID={INPUT_IDS.RATE}
+                            extraDecimals={1}
+                            isCurrencyPressable={false}
+                            currency={currency}
+                            ref={inputCallbackRef}
+                        />
+                    </FormProvider>
+                </FullPageBlockingView>
             </ScreenWrapper>
         </AccessOrNotFoundWrapper>
     );
diff --git a/src/pages/workspace/distanceRates/PolicyDistanceRateDetailsPage.tsx b/src/pages/workspace/distanceRates/PolicyDistanceRateDetailsPage.tsx
index a75fc74c33cc..c4d033351b37 100644
--- a/src/pages/workspace/distanceRates/PolicyDistanceRateDetailsPage.tsx
+++ b/src/pages/workspace/distanceRates/PolicyDistanceRateDetailsPage.tsx
@@ -6,26 +6,28 @@ import type {OnyxEntry} from 'react-native-onyx';
 import ConfirmModal from '@components/ConfirmModal';
 import HeaderWithBackButton from '@components/HeaderWithBackButton';
 import * as Expensicons from '@components/Icon/Expensicons';
+import MenuItem from '@components/MenuItem';
 import MenuItemWithTopDescription from '@components/MenuItemWithTopDescription';
 import OfflineWithFeedback from '@components/OfflineWithFeedback';
 import ScreenWrapper from '@components/ScreenWrapper';
+import ScrollView from '@components/ScrollView';
 import Switch from '@components/Switch';
 import Text from '@components/Text';
 import useLocalize from '@hooks/useLocalize';
 import useThemeStyles from '@hooks/useThemeStyles';
-import useWindowDimensions from '@hooks/useWindowDimensions';
 import * as CurrencyUtils from '@libs/CurrencyUtils';
 import * as ErrorUtils from '@libs/ErrorUtils';
 import Navigation from '@libs/Navigation/Navigation';
 import type {SettingsNavigatorParamList} from '@navigation/types';
+import NotFoundPage from '@pages/ErrorPage/NotFoundPage';
 import AccessOrNotFoundWrapper from '@pages/workspace/AccessOrNotFoundWrapper';
-import * as Policy from '@userActions/Policy';
+import * as DistanceRate from '@userActions/Policy/DistanceRate';
 import CONST from '@src/CONST';
 import ONYXKEYS from '@src/ONYXKEYS';
 import ROUTES from '@src/ROUTES';
 import type SCREENS from '@src/SCREENS';
 import type * as OnyxTypes from '@src/types/onyx';
-import type {Rate} from '@src/types/onyx/Policy';
+import type {Rate, TaxRateAttributes} from '@src/types/onyx/Policy';
 
 type PolicyDistanceRateDetailsPageOnyxProps = {
     /** Policy details */
@@ -37,27 +39,44 @@ type PolicyDistanceRateDetailsPageProps = PolicyDistanceRateDetailsPageOnyxProps
 function PolicyDistanceRateDetailsPage({policy, route}: PolicyDistanceRateDetailsPageProps) {
     const styles = useThemeStyles();
     const {translate} = useLocalize();
-    const {windowWidth} = useWindowDimensions();
     const [isWarningModalVisible, setIsWarningModalVisible] = useState(false);
     const [isDeleteModalVisible, setIsDeleteModalVisible] = useState(false);
-
     const policyID = route.params.policyID;
     const rateID = route.params.rateID;
     const customUnits = policy?.customUnits ?? {};
     const customUnit = customUnits[Object.keys(customUnits)[0]];
-    const rate = customUnit.rates[rateID];
-    const currency = rate.currency ?? CONST.CURRENCY.USD;
-    const canDeleteRate = Object.values(customUnit.rates).filter((distanceRate) => distanceRate.enabled).length > 1 || !rate.enabled;
-    const canDisableRate = Object.values(customUnit.rates).filter((distanceRate) => distanceRate.enabled).length > 1;
-    const errorFields = rate.errorFields;
+    const rate = customUnit?.rates[rateID];
+    const currency = rate?.currency ?? CONST.CURRENCY.USD;
+    const taxClaimablePercentage = rate.attributes?.taxClaimablePercentage;
+    const taxRateExternalID = rate.attributes?.taxRateExternalID;
+
+    const isDistanceTrackTaxEnabled = !!customUnit?.attributes?.taxEnabled;
+    const isPolicyTrackTaxEnabled = !!policy?.tax?.trackingEnabled;
+    const taxRate =
+        taxRateExternalID && policy?.taxRates?.taxes[taxRateExternalID] ? `${policy?.taxRates?.taxes[taxRateExternalID]?.name} (${policy?.taxRates?.taxes[taxRateExternalID]?.value})` : '';
+    // Rates can be disabled or deleted as long as in the remaining rates there is always at least one enabled rate and there are no pending delete action
+    const canDisableOrDeleteRate = Object.values(customUnit?.rates ?? {}).some(
+        (distanceRate: Rate) => distanceRate?.enabled && rateID !== distanceRate?.customUnitRateID && distanceRate?.pendingAction !== CONST.RED_BRICK_ROAD_PENDING_ACTION.DELETE,
+    );
+    const errorFields = rate?.errorFields;
+
+    if (!rate) {
+        return <NotFoundPage />;
+    }
 
     const editRateValue = () => {
         Navigation.navigate(ROUTES.WORKSPACE_DISTANCE_RATE_EDIT.getRoute(policyID, rateID));
     };
+    const editTaxReclaimableValue = () => {
+        Navigation.navigate(ROUTES.WORKSPACE_DISTANCE_RATE_TAX_RECLAIMABLE_ON_EDIT.getRoute(policyID, rateID));
+    };
+    const editTaxRateValue = () => {
+        Navigation.navigate(ROUTES.WORKSPACE_DISTANCE_RATE_TAX_RATE_EDIT.getRoute(policyID, rateID));
+    };
 
     const toggleRate = () => {
-        if (!rate.enabled || canDisableRate) {
-            Policy.setPolicyDistanceRatesEnabled(policyID, customUnit, [{...rate, enabled: !rate.enabled}]);
+        if (!rate?.enabled || canDisableOrDeleteRate) {
+            DistanceRate.setPolicyDistanceRatesEnabled(policyID, customUnit, [{...rate, enabled: !rate?.enabled}]);
         } else {
             setIsWarningModalVisible(true);
         }
@@ -65,29 +84,16 @@ function PolicyDistanceRateDetailsPage({policy, route}: PolicyDistanceRateDetail
 
     const deleteRate = () => {
         Navigation.goBack();
-        Policy.deletePolicyDistanceRates(policyID, customUnit, [rateID]);
+        DistanceRate.deletePolicyDistanceRates(policyID, customUnit, [rateID]);
         setIsDeleteModalVisible(false);
     };
 
-    const rateValueToDisplay = CurrencyUtils.convertAmountToDisplayString(rate.rate, currency);
+    const rateValueToDisplay = CurrencyUtils.convertAmountToDisplayString(rate?.rate, currency);
+    const taxClaimableValueToDisplay = taxClaimablePercentage && rate.rate ? CurrencyUtils.convertAmountToDisplayString(taxClaimablePercentage * rate.rate, currency) : '';
     const unitToDisplay = translate(`common.${customUnit?.attributes?.unit ?? CONST.CUSTOM_UNITS.DISTANCE_UNIT_MILES}`);
 
-    const threeDotsMenuItems = [
-        {
-            icon: Expensicons.Trashcan,
-            text: translate('workspace.distanceRates.deleteDistanceRate'),
-            onSelected: () => {
-                if (canDeleteRate) {
-                    setIsDeleteModalVisible(true);
-                    return;
-                }
-                setIsWarningModalVisible(true);
-            },
-        },
-    ];
-
-    const clearErrorFields = (fieldName: keyof Rate) => {
-        Policy.clearPolicyDistanceRateErrorFields(policyID, customUnit.customUnitID, rateID, {...errorFields, [fieldName]: null});
+    const clearErrorFields = (fieldName: keyof Rate | keyof TaxRateAttributes) => {
+        DistanceRate.clearPolicyDistanceRateErrorFields(policyID, customUnit.customUnitID, rateID, {...errorFields, [fieldName]: null});
     };
 
     return (
@@ -100,17 +106,11 @@ function PolicyDistanceRateDetailsPage({policy, route}: PolicyDistanceRateDetail
                 testID={PolicyDistanceRateDetailsPage.displayName}
                 includeSafeAreaPaddingBottom={false}
                 style={[styles.defaultModalContainer]}
-                shouldShowOfflineIndicatorInWideScreen
             >
-                <HeaderWithBackButton
-                    title={`${rateValueToDisplay} / ${translate(`common.${customUnit?.attributes?.unit ?? CONST.CUSTOM_UNITS.DISTANCE_UNIT_MILES}`)}`}
-                    shouldShowThreeDotsButton
-                    threeDotsMenuItems={threeDotsMenuItems}
-                    threeDotsAnchorPosition={styles.threeDotsPopoverOffset(windowWidth)}
-                />
-                <View style={styles.flexGrow1}>
+                <HeaderWithBackButton title={`${rateValueToDisplay} / ${translate(`common.${customUnit?.attributes?.unit ?? CONST.CUSTOM_UNITS.DISTANCE_UNIT_MILES}`)}`} />
+                <ScrollView contentContainerStyle={styles.flexGrow1}>
                     <OfflineWithFeedback
-                        errors={ErrorUtils.getLatestErrorField(rate, 'enabled')}
+                        errors={ErrorUtils.getLatestErrorField(rate ?? {}, 'enabled')}
                         pendingAction={rate?.pendingFields?.enabled}
                         errorRowStyles={styles.mh5}
                         onClose={() => clearErrorFields('enabled')}
@@ -118,14 +118,14 @@ function PolicyDistanceRateDetailsPage({policy, route}: PolicyDistanceRateDetail
                         <View style={[styles.flexRow, styles.justifyContentBetween, styles.p5]}>
                             <Text>{translate('workspace.distanceRates.enableRate')}</Text>
                             <Switch
-                                isOn={rate.enabled ?? false}
+                                isOn={rate?.enabled ?? false}
                                 onToggle={toggleRate}
                                 accessibilityLabel={translate('workspace.distanceRates.enableRate')}
                             />
                         </View>
                     </OfflineWithFeedback>
                     <OfflineWithFeedback
-                        errors={ErrorUtils.getLatestErrorField(rate, 'rate')}
+                        errors={ErrorUtils.getLatestErrorField(rate ?? {}, 'rate')}
                         pendingAction={rate?.pendingFields?.rate ?? rate?.pendingFields?.currency}
                         errorRowStyles={styles.mh5}
                         onClose={() => clearErrorFields('rate')}
@@ -138,8 +138,53 @@ function PolicyDistanceRateDetailsPage({policy, route}: PolicyDistanceRateDetail
                             onPress={editRateValue}
                         />
                     </OfflineWithFeedback>
+                    {isDistanceTrackTaxEnabled && isPolicyTrackTaxEnabled && (
+                        <OfflineWithFeedback
+                            errors={ErrorUtils.getLatestErrorField(rate, 'taxRateExternalID')}
+                            pendingAction={rate?.pendingFields?.taxRateExternalID}
+                            errorRowStyles={styles.mh5}
+                            onClose={() => clearErrorFields('taxRateExternalID')}
+                        >
+                            <View style={styles.w100}>
+                                <MenuItemWithTopDescription
+                                    title={taxRate}
+                                    description={translate('workspace.taxes.taxRate')}
+                                    shouldShowRightIcon
+                                    onPress={editTaxRateValue}
+                                />
+                            </View>
+                        </OfflineWithFeedback>
+                    )}
+                    {isDistanceTrackTaxEnabled && isPolicyTrackTaxEnabled && (
+                        <OfflineWithFeedback
+                            errors={ErrorUtils.getLatestErrorField(rate, 'taxClaimablePercentage')}
+                            pendingAction={rate?.pendingFields?.taxClaimablePercentage}
+                            errorRowStyles={styles.mh5}
+                            onClose={() => clearErrorFields('taxClaimablePercentage')}
+                        >
+                            <MenuItemWithTopDescription
+                                shouldShowRightIcon
+                                title={taxClaimableValueToDisplay}
+                                description={translate('workspace.taxes.taxReclaimableOn')}
+                                descriptionTextStyle={styles.textNormal}
+                                onPress={editTaxReclaimableValue}
+                            />
+                        </OfflineWithFeedback>
+                    )}
+                    <MenuItem
+                        icon={Expensicons.Trashcan}
+                        title={translate('common.delete')}
+                        onPress={() => {
+                            if (canDisableOrDeleteRate) {
+                                setIsDeleteModalVisible(true);
+                                return;
+                            }
+                            setIsWarningModalVisible(true);
+                        }}
+                    />
                     <ConfirmModal
                         onConfirm={() => setIsWarningModalVisible(false)}
+                        onCancel={() => setIsWarningModalVisible(false)}
                         isVisible={isWarningModalVisible}
                         title={translate('workspace.distanceRates.oopsNotSoFast')}
                         prompt={translate('workspace.distanceRates.workspaceNeeds')}
@@ -156,7 +201,7 @@ function PolicyDistanceRateDetailsPage({policy, route}: PolicyDistanceRateDetail
                         cancelText={translate('common.cancel')}
                         danger
                     />
-                </View>
+                </ScrollView>
             </ScreenWrapper>
         </AccessOrNotFoundWrapper>
     );
diff --git a/src/pages/workspace/distanceRates/PolicyDistanceRateEditPage.tsx b/src/pages/workspace/distanceRates/PolicyDistanceRateEditPage.tsx
index 6c853557e01a..4128d68a0a53 100644
--- a/src/pages/workspace/distanceRates/PolicyDistanceRateEditPage.tsx
+++ b/src/pages/workspace/distanceRates/PolicyDistanceRateEditPage.tsx
@@ -15,8 +15,9 @@ import useThemeStyles from '@hooks/useThemeStyles';
 import Navigation from '@libs/Navigation/Navigation';
 import {validateRateValue} from '@libs/PolicyDistanceRatesUtils';
 import type {SettingsNavigatorParamList} from '@navigation/types';
+import NotFoundPage from '@pages/ErrorPage/NotFoundPage';
 import AccessOrNotFoundWrapper from '@pages/workspace/AccessOrNotFoundWrapper';
-import * as Policy from '@userActions/Policy';
+import * as DistanceRate from '@userActions/Policy/DistanceRate';
 import CONST from '@src/CONST';
 import ONYXKEYS from '@src/ONYXKEYS';
 import type SCREENS from '@src/SCREENS';
@@ -39,12 +40,16 @@ function PolicyDistanceRateEditPage({policy, route}: PolicyDistanceRateEditPageP
     const rateID = route.params.rateID;
     const customUnits = policy?.customUnits ?? {};
     const customUnit = customUnits[Object.keys(customUnits)[0]];
-    const rate = customUnit.rates[rateID];
-    const currency = rate.currency ?? CONST.CURRENCY.USD;
-    const currentRateValue = (rate.rate ?? 0).toString();
+    const rate = customUnit?.rates[rateID];
+    const currency = rate?.currency ?? CONST.CURRENCY.USD;
+    const currentRateValue = (parseFloat((rate?.rate ?? 0).toString()) / CONST.POLICY.CUSTOM_UNIT_RATE_BASE_OFFSET).toFixed(3);
 
     const submitRate = (values: FormOnyxValues<typeof ONYXKEYS.FORMS.POLICY_DISTANCE_RATE_EDIT_FORM>) => {
-        Policy.updatePolicyDistanceRateValue(policyID, customUnit, [{...rate, rate: Number(values.rate) * CONST.POLICY.CUSTOM_UNIT_RATE_BASE_OFFSET}]);
+        if (currentRateValue === values.rate) {
+            Navigation.goBack();
+            return;
+        }
+        DistanceRate.updatePolicyDistanceRateValue(policyID, customUnit, [{...rate, rate: Number(values.rate) * CONST.POLICY.CUSTOM_UNIT_RATE_BASE_OFFSET}]);
         Keyboard.dismiss();
         Navigation.goBack();
     };
@@ -54,6 +59,10 @@ function PolicyDistanceRateEditPage({policy, route}: PolicyDistanceRateEditPageP
         [currency, toLocaleDigit],
     );
 
+    if (!rate) {
+        return <NotFoundPage />;
+    }
+
     return (
         <AccessOrNotFoundWrapper
             accessVariants={[CONST.POLICY.ACCESS_VARIANTS.ADMIN, CONST.POLICY.ACCESS_VARIANTS.PAID]}
@@ -81,13 +90,12 @@ function PolicyDistanceRateEditPage({policy, route}: PolicyDistanceRateEditPageP
                     shouldHideFixErrorsAlert
                     submitFlexEnabled={false}
                     submitButtonStyles={[styles.mh5, styles.mt0]}
-                    disablePressOnEnter={false}
                 >
                     <InputWrapperWithRef
                         InputComponent={AmountForm}
                         inputID={INPUT_IDS.RATE}
                         extraDecimals={1}
-                        defaultValue={(parseFloat(currentRateValue) / CONST.POLICY.CUSTOM_UNIT_RATE_BASE_OFFSET).toFixed(3)}
+                        defaultValue={currentRateValue}
                         isCurrencyPressable={false}
                         currency={currency}
                         ref={inputCallbackRef}
diff --git a/src/pages/workspace/distanceRates/PolicyDistanceRateTaxRateEditPage.tsx b/src/pages/workspace/distanceRates/PolicyDistanceRateTaxRateEditPage.tsx
new file mode 100644
index 000000000000..9fe090222691
--- /dev/null
+++ b/src/pages/workspace/distanceRates/PolicyDistanceRateTaxRateEditPage.tsx
@@ -0,0 +1,88 @@
+import type {StackScreenProps} from '@react-navigation/stack';
+import React from 'react';
+import HeaderWithBackButton from '@components/HeaderWithBackButton';
+import ScreenWrapper from '@components/ScreenWrapper';
+import TaxPicker from '@components/TaxPicker';
+import useLocalize from '@hooks/useLocalize';
+import useThemeStyles from '@hooks/useThemeStyles';
+import Navigation from '@libs/Navigation/Navigation';
+import type * as OptionsListUtils from '@libs/OptionsListUtils';
+import * as TransactionUtils from '@libs/TransactionUtils';
+import type {SettingsNavigatorParamList} from '@navigation/types';
+import AccessOrNotFoundWrapper from '@pages/workspace/AccessOrNotFoundWrapper';
+import type {WithPolicyOnyxProps} from '@pages/workspace/withPolicy';
+import withPolicy from '@pages/workspace/withPolicy';
+import * as DistanceRate from '@userActions/Policy/DistanceRate';
+import CONST from '@src/CONST';
+import ROUTES from '@src/ROUTES';
+import type SCREENS from '@src/SCREENS';
+
+type PolicyDistanceRateTaxRateEditPageProps = WithPolicyOnyxProps & StackScreenProps<SettingsNavigatorParamList, typeof SCREENS.WORKSPACE.DISTANCE_RATE_TAX_RATE_EDIT>;
+
+function PolicyDistanceRateTaxRateEditPage({route, policy}: PolicyDistanceRateTaxRateEditPageProps) {
+    const styles = useThemeStyles();
+    const {translate} = useLocalize();
+    const policyID = route.params.policyID;
+    const rateID = route.params.rateID;
+    const customUnits = policy?.customUnits ?? {};
+    const customUnit = customUnits[Object.keys(customUnits)[0]];
+    const rate = customUnit?.rates[rateID];
+    const taxRateExternalID = rate.attributes?.taxRateExternalID;
+    const selectedTaxRate = TransactionUtils.getWorkspaceTaxesSettingsName(policy, taxRateExternalID ?? '');
+
+    const onTaxRateChange = (newTaxRate: OptionsListUtils.TaxRatesOption) => {
+        if (taxRateExternalID === newTaxRate.code) {
+            Navigation.goBack();
+            return;
+        }
+        DistanceRate.updateDistanceTaxRate(policyID, customUnit, [
+            {
+                ...rate,
+                attributes: {
+                    ...rate.attributes,
+                    taxRateExternalID: newTaxRate.code,
+                },
+            },
+        ]);
+        Navigation.navigate(ROUTES.WORKSPACE_DISTANCE_RATE_DETAILS.getRoute(policyID, rateID));
+    };
+
+    const dismiss = () => {
+        Navigation.goBack(ROUTES.WORKSPACE_TAXES_SETTINGS.getRoute(policyID));
+    };
+
+    return (
+        <AccessOrNotFoundWrapper
+            accessVariants={[CONST.POLICY.ACCESS_VARIANTS.ADMIN, CONST.POLICY.ACCESS_VARIANTS.PAID]}
+            policyID={policyID}
+            featureName={CONST.POLICY.MORE_FEATURES.ARE_DISTANCE_RATES_ENABLED}
+        >
+            <ScreenWrapper
+                includeSafeAreaPaddingBottom={false}
+                style={[styles.defaultModalContainer]}
+                shouldEnableMaxHeight
+                testID={PolicyDistanceRateTaxRateEditPage.displayName}
+            >
+                {({insets}) => (
+                    <>
+                        <HeaderWithBackButton
+                            title={translate('workspace.taxes.taxRate')}
+                            shouldShowBackButton
+                        />
+                        <TaxPicker
+                            selectedTaxRate={selectedTaxRate}
+                            policyID={policyID}
+                            insets={insets}
+                            onSubmit={onTaxRateChange}
+                            onDismiss={dismiss}
+                        />
+                    </>
+                )}
+            </ScreenWrapper>
+        </AccessOrNotFoundWrapper>
+    );
+}
+
+PolicyDistanceRateTaxRateEditPage.displayName = 'PolicyDistanceRateTaxRateEditPage';
+
+export default withPolicy(PolicyDistanceRateTaxRateEditPage);
diff --git a/src/pages/workspace/distanceRates/PolicyDistanceRateTaxReclaimableEditPage.tsx b/src/pages/workspace/distanceRates/PolicyDistanceRateTaxReclaimableEditPage.tsx
new file mode 100644
index 000000000000..21d318f2da89
--- /dev/null
+++ b/src/pages/workspace/distanceRates/PolicyDistanceRateTaxReclaimableEditPage.tsx
@@ -0,0 +1,105 @@
+import type {StackScreenProps} from '@react-navigation/stack';
+import React, {useCallback} from 'react';
+import AmountForm from '@components/AmountForm';
+import FormProvider from '@components/Form/FormProvider';
+import InputWrapperWithRef from '@components/Form/InputWrapper';
+import type {FormOnyxValues} from '@components/Form/types';
+import HeaderWithBackButton from '@components/HeaderWithBackButton';
+import ScreenWrapper from '@components/ScreenWrapper';
+import useAutoFocusInput from '@hooks/useAutoFocusInput';
+import useLocalize from '@hooks/useLocalize';
+import useThemeStyles from '@hooks/useThemeStyles';
+import * as CurrencyUtils from '@libs/CurrencyUtils';
+import Navigation from '@libs/Navigation/Navigation';
+import {validateTaxClaimableValue} from '@libs/PolicyDistanceRatesUtils';
+import type {SettingsNavigatorParamList} from '@navigation/types';
+import AccessOrNotFoundWrapper from '@pages/workspace/AccessOrNotFoundWrapper';
+import type {WithPolicyOnyxProps} from '@pages/workspace/withPolicy';
+import withPolicy from '@pages/workspace/withPolicy';
+import * as DistanceRate from '@userActions/Policy/DistanceRate';
+import CONST from '@src/CONST';
+import ONYXKEYS from '@src/ONYXKEYS';
+import type SCREENS from '@src/SCREENS';
+import INPUT_IDS from '@src/types/form/PolicyDistanceRateTaxReclaimableOnEditForm';
+
+type PolicyDistanceRateTaxReclaimableEditPageProps = WithPolicyOnyxProps & StackScreenProps<SettingsNavigatorParamList, typeof SCREENS.WORKSPACE.DISTANCE_RATE_TAX_RECLAIMABLE_ON_EDIT>;
+
+function PolicyDistanceRateTaxReclaimableEditPage({route, policy}: PolicyDistanceRateTaxReclaimableEditPageProps) {
+    const styles = useThemeStyles();
+    const {translate} = useLocalize();
+    const {inputCallbackRef} = useAutoFocusInput();
+
+    const policyID = route.params.policyID;
+    const rateID = route.params.rateID;
+    const customUnits = policy?.customUnits ?? {};
+    const customUnit = customUnits[Object.keys(customUnits)[0]];
+    const rate = customUnit.rates[rateID];
+    const currency = rate.currency ?? CONST.CURRENCY.USD;
+    const extraDecimals = 1;
+    const decimals = CurrencyUtils.getCurrencyDecimals(currency) + extraDecimals;
+    const currentTaxReclaimableOnValue = rate.attributes?.taxClaimablePercentage && rate.rate ? ((rate.attributes.taxClaimablePercentage * rate.rate) / 100).toFixed(decimals) : '';
+
+    const submitTaxReclaimableOn = (values: FormOnyxValues<typeof ONYXKEYS.FORMS.POLICY_DISTANCE_RATE_TAX_RECLAIMABLE_ON_EDIT_FORM>) => {
+        if (values.taxClaimableValue === currentTaxReclaimableOnValue) {
+            Navigation.goBack();
+            return;
+        }
+        DistanceRate.updateDistanceTaxClaimableValue(policyID, customUnit, [
+            {
+                ...rate,
+                attributes: {
+                    ...rate.attributes,
+                    taxClaimablePercentage: rate.rate ? (Number(values.taxClaimableValue) * 100) / rate.rate : undefined,
+                },
+            },
+        ]);
+        Navigation.goBack();
+    };
+
+    const validate = useCallback((values: FormOnyxValues<typeof ONYXKEYS.FORMS.POLICY_DISTANCE_RATE_TAX_RECLAIMABLE_ON_EDIT_FORM>) => validateTaxClaimableValue(values, rate), [rate]);
+
+    return (
+        <AccessOrNotFoundWrapper
+            accessVariants={[CONST.POLICY.ACCESS_VARIANTS.ADMIN, CONST.POLICY.ACCESS_VARIANTS.PAID]}
+            policyID={policyID}
+            featureName={CONST.POLICY.MORE_FEATURES.ARE_DISTANCE_RATES_ENABLED}
+        >
+            <ScreenWrapper
+                includeSafeAreaPaddingBottom={false}
+                style={[styles.defaultModalContainer]}
+                testID={PolicyDistanceRateTaxReclaimableEditPage.displayName}
+                shouldEnableMaxHeight
+            >
+                <HeaderWithBackButton
+                    title={translate('workspace.taxes.taxReclaimableOn')}
+                    shouldShowBackButton
+                />
+                <FormProvider
+                    formID={ONYXKEYS.FORMS.POLICY_DISTANCE_RATE_TAX_RECLAIMABLE_ON_EDIT_FORM}
+                    submitButtonText={translate('common.save')}
+                    onSubmit={submitTaxReclaimableOn}
+                    validate={validate}
+                    enabledWhenOffline
+                    style={[styles.flexGrow1]}
+                    shouldHideFixErrorsAlert
+                    submitFlexEnabled={false}
+                    submitButtonStyles={[styles.mh5, styles.mt0]}
+                >
+                    <InputWrapperWithRef
+                        InputComponent={AmountForm}
+                        inputID={INPUT_IDS.TAX_CLAIMABLE_VALUE}
+                        extraDecimals={extraDecimals}
+                        defaultValue={currentTaxReclaimableOnValue?.toString() ?? ''}
+                        isCurrencyPressable={false}
+                        currency={currency}
+                        ref={inputCallbackRef}
+                    />
+                </FormProvider>
+            </ScreenWrapper>
+        </AccessOrNotFoundWrapper>
+    );
+}
+
+PolicyDistanceRateTaxReclaimableEditPage.displayName = 'PolicyDistanceRateTaxReclaimableEditPage';
+
+export default withPolicy(PolicyDistanceRateTaxReclaimableEditPage);
diff --git a/src/pages/workspace/distanceRates/PolicyDistanceRatesPage.tsx b/src/pages/workspace/distanceRates/PolicyDistanceRatesPage.tsx
index 85f90c54a359..0b2e83f458ff 100644
--- a/src/pages/workspace/distanceRates/PolicyDistanceRatesPage.tsx
+++ b/src/pages/workspace/distanceRates/PolicyDistanceRatesPage.tsx
@@ -1,9 +1,8 @@
 import {useFocusEffect, useIsFocused} from '@react-navigation/native';
 import type {StackScreenProps} from '@react-navigation/stack';
-import React, {useCallback, useEffect, useMemo, useRef, useState} from 'react';
+import React, {useCallback, useEffect, useMemo, useState} from 'react';
 import {ActivityIndicator, View} from 'react-native';
-import type {OnyxEntry} from 'react-native-onyx';
-import {withOnyx} from 'react-native-onyx';
+import {useOnyx} from 'react-native-onyx';
 import Button from '@components/Button';
 import type {DropdownOption, WorkspaceDistanceRatesBulkActionType} from '@components/ButtonWithDropdownMenu/types';
 import ConfirmModal from '@components/ConfirmModal';
@@ -11,50 +10,52 @@ import HeaderWithBackButton from '@components/HeaderWithBackButton';
 import * as Expensicons from '@components/Icon/Expensicons';
 import * as Illustrations from '@components/Icon/Illustrations';
 import ScreenWrapper from '@components/ScreenWrapper';
-import SelectionList from '@components/SelectionList';
-import RightElementEnabledStatus from '@components/SelectionList/RightElementEnabledStatus';
+import ListItemRightCaretWithLabel from '@components/SelectionList/ListItemRightCaretWithLabel';
 import TableListItem from '@components/SelectionList/TableListItem';
 import type {ListItem} from '@components/SelectionList/types';
+import SelectionListWithModal from '@components/SelectionListWithModal';
 import Text from '@components/Text';
 import useLocalize from '@hooks/useLocalize';
 import useNetwork from '@hooks/useNetwork';
+import usePolicy from '@hooks/usePolicy';
+import useResponsiveLayout from '@hooks/useResponsiveLayout';
 import useTheme from '@hooks/useTheme';
 import useThemeStyles from '@hooks/useThemeStyles';
-import useWindowDimensions from '@hooks/useWindowDimensions';
+import {turnOffMobileSelectionMode} from '@libs/actions/MobileSelectionMode';
 import * as CurrencyUtils from '@libs/CurrencyUtils';
 import * as DeviceCapabilities from '@libs/DeviceCapabilities';
 import Navigation from '@libs/Navigation/Navigation';
-import type {WorkspacesCentralPaneNavigatorParamList} from '@navigation/types';
+import type {FullScreenNavigatorParamList} from '@navigation/types';
 import AccessOrNotFoundWrapper from '@pages/workspace/AccessOrNotFoundWrapper';
-import * as Policy from '@userActions/Policy';
+import * as DistanceRate from '@userActions/Policy/DistanceRate';
 import ButtonWithDropdownMenu from '@src/components/ButtonWithDropdownMenu';
 import CONST from '@src/CONST';
 import ONYXKEYS from '@src/ONYXKEYS';
 import ROUTES from '@src/ROUTES';
 import type SCREENS from '@src/SCREENS';
-import type * as OnyxTypes from '@src/types/onyx';
 import type {CustomUnit, Rate} from '@src/types/onyx/Policy';
 
 type RateForList = ListItem & {value: string};
 
-type PolicyDistanceRatesPageOnyxProps = {
-    /** Policy details */
-    policy: OnyxEntry<OnyxTypes.Policy>;
-};
+type PolicyDistanceRatesPageProps = StackScreenProps<FullScreenNavigatorParamList, typeof SCREENS.WORKSPACE.DISTANCE_RATES>;
 
-type PolicyDistanceRatesPageProps = PolicyDistanceRatesPageOnyxProps & StackScreenProps<WorkspacesCentralPaneNavigatorParamList, typeof SCREENS.WORKSPACE.DISTANCE_RATES>;
-
-function PolicyDistanceRatesPage({policy, route}: PolicyDistanceRatesPageProps) {
-    const {isSmallScreenWidth} = useWindowDimensions();
+function PolicyDistanceRatesPage({
+    route: {
+        params: {policyID},
+    },
+}: PolicyDistanceRatesPageProps) {
+    const {shouldUseNarrowLayout} = useResponsiveLayout();
     const styles = useThemeStyles();
     const theme = useTheme();
     const {translate} = useLocalize();
     const [selectedDistanceRates, setSelectedDistanceRates] = useState<Rate[]>([]);
     const [isWarningModalVisible, setIsWarningModalVisible] = useState(false);
     const [isDeleteModalVisible, setIsDeleteModalVisible] = useState(false);
-    const dropdownButtonRef = useRef(null);
-    const policyID = route.params.policyID;
     const isFocused = useIsFocused();
+    const policy = usePolicy(policyID);
+    const [selectionMode] = useOnyx(ONYXKEYS.MOBILE_SELECTION_MODE);
+
+    const canSelectMultiple = shouldUseNarrowLayout ? selectionMode?.isEnabled : true;
 
     const customUnit: CustomUnit | undefined = useMemo(
         () => (policy?.customUnits !== undefined ? policy?.customUnits[Object.keys(policy?.customUnits)[0]] : undefined),
@@ -69,17 +70,17 @@ function PolicyDistanceRatesPage({policy, route}: PolicyDistanceRatesPageProps)
     );
 
     const fetchDistanceRates = useCallback(() => {
-        Policy.openPolicyDistanceRatesPage(policyID);
+        DistanceRate.openPolicyDistanceRatesPage(policyID);
     }, [policyID]);
 
     const dismissError = useCallback(
         (item: RateForList) => {
             if (customUnitRates[item.value].errors) {
-                Policy.clearDeleteDistanceRateError(policyID, customUnit?.customUnitID ?? '', item.value);
+                DistanceRate.clearDeleteDistanceRateError(policyID, customUnit?.customUnitID ?? '', item.value);
                 return;
             }
 
-            Policy.clearCreateDistanceRateItemAndError(policyID, customUnit?.customUnitID ?? '', item.value);
+            DistanceRate.clearCreateDistanceRateItemAndError(policyID, customUnit?.customUnitID ?? '', item.value);
         },
         [customUnit?.customUnitID, customUnitRates, policyID],
     );
@@ -101,19 +102,28 @@ function PolicyDistanceRatesPage({policy, route}: PolicyDistanceRatesPageProps)
 
     const distanceRatesList = useMemo<RateForList[]>(
         () =>
-            Object.values(customUnitRates).map((value) => ({
-                value: value.customUnitRateID ?? '',
-                text: `${CurrencyUtils.convertAmountToDisplayString(value.rate, value.currency ?? CONST.CURRENCY.USD)} / ${translate(
-                    `common.${customUnit?.attributes?.unit ?? CONST.CUSTOM_UNITS.DISTANCE_UNIT_MILES}`,
-                )}`,
-                keyForList: value.customUnitRateID ?? '',
-                isSelected: selectedDistanceRates.find((rate) => rate.customUnitRateID === value.customUnitRateID) !== undefined,
-                isDisabled: value.pendingAction === CONST.RED_BRICK_ROAD_PENDING_ACTION.DELETE,
-                pendingAction: value.pendingAction ?? value.pendingFields?.rate ?? value.pendingFields?.enabled ?? value.pendingFields?.currency,
-                errors: value.errors ?? undefined,
-                rightElement: <RightElementEnabledStatus enabled={value.enabled} />,
-            })),
-        [customUnit?.attributes?.unit, customUnitRates, selectedDistanceRates, translate],
+            Object.values(customUnitRates)
+                .sort((rateA, rateB) => (rateA?.rate ?? 0) - (rateB?.rate ?? 0))
+                .map((value) => ({
+                    value: value.customUnitRateID ?? '',
+                    text: `${CurrencyUtils.convertAmountToDisplayString(value.rate, value.currency ?? CONST.CURRENCY.USD)} / ${translate(
+                        `common.${customUnit?.attributes?.unit ?? CONST.CUSTOM_UNITS.DISTANCE_UNIT_MILES}`,
+                    )}`,
+                    keyForList: value.customUnitRateID ?? '',
+                    isSelected: selectedDistanceRates.find((rate) => rate.customUnitRateID === value.customUnitRateID) !== undefined && canSelectMultiple,
+                    isDisabled: value.pendingAction === CONST.RED_BRICK_ROAD_PENDING_ACTION.DELETE,
+                    pendingAction:
+                        value.pendingAction ??
+                        value.pendingFields?.rate ??
+                        value.pendingFields?.enabled ??
+                        value.pendingFields?.currency ??
+                        value.pendingFields?.taxRateExternalID ??
+                        value.pendingFields?.taxClaimablePercentage ??
+                        (policy?.pendingAction === CONST.RED_BRICK_ROAD_PENDING_ACTION.ADD ? policy?.pendingAction : undefined),
+                    errors: value.errors ?? undefined,
+                    rightElement: <ListItemRightCaretWithLabel labelText={value.enabled ? translate('workspace.common.enabled') : translate('workspace.common.disabled')} />,
+                })),
+        [customUnit?.attributes?.unit, customUnitRates, selectedDistanceRates, translate, policy?.pendingAction, canSelectMultiple],
     );
 
     const addRate = () => {
@@ -133,7 +143,7 @@ function PolicyDistanceRatesPage({policy, route}: PolicyDistanceRatesPageProps)
             return;
         }
 
-        Policy.setPolicyDistanceRatesEnabled(
+        DistanceRate.setPolicyDistanceRatesEnabled(
             policyID,
             customUnit,
             selectedDistanceRates.filter((rate) => rate.enabled).map((rate) => ({...rate, enabled: false})),
@@ -146,7 +156,7 @@ function PolicyDistanceRatesPage({policy, route}: PolicyDistanceRatesPageProps)
             return;
         }
 
-        Policy.setPolicyDistanceRatesEnabled(
+        DistanceRate.setPolicyDistanceRatesEnabled(
             policyID,
             customUnit,
             selectedDistanceRates.filter((rate) => !rate.enabled).map((rate) => ({...rate, enabled: true})),
@@ -159,7 +169,7 @@ function PolicyDistanceRatesPage({policy, route}: PolicyDistanceRatesPageProps)
             return;
         }
 
-        Policy.deletePolicyDistanceRates(
+        DistanceRate.deletePolicyDistanceRates(
             policyID,
             customUnit,
             selectedDistanceRates.map((rate) => rate.customUnitRateID ?? ''),
@@ -185,7 +195,7 @@ function PolicyDistanceRatesPage({policy, route}: PolicyDistanceRatesPageProps)
     };
 
     const getCustomListHeader = () => (
-        <View style={[styles.flex1, styles.flexRow, styles.justifyContentBetween, styles.pl3, styles.pr9]}>
+        <View style={[styles.flex1, styles.flexRow, styles.justifyContentBetween, styles.pl3, styles.pr9, !canSelectMultiple && styles.m5]}>
             <Text style={styles.searchInputStyle}>{translate('workspace.distanceRates.rate')}</Text>
             <Text style={[styles.searchInputStyle, styles.textAlignCenter]}>{translate('statusPage.status')}</Text>
         </View>
@@ -195,7 +205,7 @@ function PolicyDistanceRatesPage({policy, route}: PolicyDistanceRatesPageProps)
         const options: Array<DropdownOption<WorkspaceDistanceRatesBulkActionType>> = [
             {
                 text: translate('workspace.distanceRates.deleteRates', {count: selectedDistanceRates.length}),
-                value: CONST.POLICY.DISTANCE_RATES_BULK_ACTION_TYPES.DELETE,
+                value: CONST.POLICY.BULK_ACTION_TYPES.DELETE,
                 icon: Expensicons.Trashcan,
                 onSelected: () => (canDisableOrDeleteSelectedRates ? setIsDeleteModalVisible(true) : setIsWarningModalVisible(true)),
             },
@@ -205,7 +215,7 @@ function PolicyDistanceRatesPage({policy, route}: PolicyDistanceRatesPageProps)
         if (enabledRates.length > 0) {
             options.push({
                 text: translate('workspace.distanceRates.disableRates', {count: enabledRates.length}),
-                value: CONST.POLICY.DISTANCE_RATES_BULK_ACTION_TYPES.DISABLE,
+                value: CONST.POLICY.BULK_ACTION_TYPES.DISABLE,
                 icon: Expensicons.DocumentSlash,
                 onSelected: () => (canDisableOrDeleteSelectedRates ? disableRates() : setIsWarningModalVisible(true)),
             });
@@ -215,7 +225,7 @@ function PolicyDistanceRatesPage({policy, route}: PolicyDistanceRatesPageProps)
         if (disabledRates.length > 0) {
             options.push({
                 text: translate('workspace.distanceRates.enableRates', {count: disabledRates.length}),
-                value: CONST.POLICY.DISTANCE_RATES_BULK_ACTION_TYPES.ENABLE,
+                value: CONST.POLICY.BULK_ACTION_TYPES.ENABLE,
                 icon: Expensicons.Document,
                 onSelected: enableRates,
             });
@@ -227,14 +237,14 @@ function PolicyDistanceRatesPage({policy, route}: PolicyDistanceRatesPageProps)
     const isLoading = !isOffline && customUnit === undefined;
 
     const headerButtons = (
-        <View style={[styles.w100, styles.flexRow, isSmallScreenWidth && styles.mb3]}>
-            {selectedDistanceRates.length === 0 ? (
+        <View style={[styles.w100, styles.flexRow, styles.gap2, shouldUseNarrowLayout && styles.mb3]}>
+            {(shouldUseNarrowLayout ? !selectionMode?.isEnabled : selectedDistanceRates.length === 0) ? (
                 <>
                     <Button
                         medium
                         text={translate('workspace.distanceRates.addRate')}
                         onPress={addRate}
-                        style={[styles.mr3, isSmallScreenWidth && styles.flexGrow1]}
+                        style={[shouldUseNarrowLayout && styles.flex1]}
                         icon={Expensicons.Plus}
                         success
                     />
@@ -243,7 +253,7 @@ function PolicyDistanceRatesPage({policy, route}: PolicyDistanceRatesPageProps)
                         medium
                         text={translate('workspace.common.settings')}
                         onPress={openSettings}
-                        style={[isSmallScreenWidth && styles.flexGrow1]}
+                        style={[shouldUseNarrowLayout && styles.flex1]}
                         icon={Expensicons.Gear}
                     />
                 </>
@@ -255,15 +265,23 @@ function PolicyDistanceRatesPage({policy, route}: PolicyDistanceRatesPageProps)
                     buttonSize={CONST.DROPDOWN_BUTTON_SIZE.MEDIUM}
                     onPress={() => null}
                     options={getBulkActionsButtonOptions()}
-                    buttonRef={dropdownButtonRef}
-                    style={[isSmallScreenWidth && styles.flexGrow1]}
+                    style={[shouldUseNarrowLayout && styles.flexGrow1]}
                     wrapperStyle={styles.w100}
                     isSplitButton={false}
+                    isDisabled={!selectedDistanceRates.length}
                 />
             )}
         </View>
     );
 
+    const getHeaderText = () => (
+        <View style={[styles.ph5, styles.pb5, styles.pt3]}>
+            <Text style={[styles.textNormal, styles.colorMuted]}>{translate('workspace.distanceRates.centrallyManage')}</Text>
+        </View>
+    );
+
+    const selectionModeHeader = selectionMode?.isEnabled && shouldUseNarrowLayout;
+
     return (
         <AccessOrNotFoundWrapper
             accessVariants={[CONST.POLICY.ACCESS_VARIANTS.ADMIN, CONST.POLICY.ACCESS_VARIANTS.PAID]}
@@ -277,16 +295,22 @@ function PolicyDistanceRatesPage({policy, route}: PolicyDistanceRatesPageProps)
                 shouldShowOfflineIndicatorInWideScreen
             >
                 <HeaderWithBackButton
-                    icon={Illustrations.CarIce}
-                    title={translate('workspace.common.distanceRates')}
-                    shouldShowBackButton={isSmallScreenWidth}
+                    icon={!selectionModeHeader ? Illustrations.CarIce : undefined}
+                    title={translate(!selectionModeHeader ? 'workspace.common.distanceRates' : 'common.selectMultiple')}
+                    shouldShowBackButton={shouldUseNarrowLayout}
+                    onBackButtonPress={() => {
+                        if (selectionMode?.isEnabled) {
+                            setSelectedDistanceRates([]);
+                            turnOffMobileSelectionMode();
+                            return;
+                        }
+                        Navigation.goBack();
+                    }}
                 >
-                    {!isSmallScreenWidth && headerButtons}
+                    {!shouldUseNarrowLayout && headerButtons}
                 </HeaderWithBackButton>
-                {isSmallScreenWidth && <View style={[styles.ph5]}>{headerButtons}</View>}
-                <View style={[styles.ph5, styles.pb5, styles.pt3]}>
-                    <Text style={[styles.textNormal, styles.colorMuted]}>{translate('workspace.distanceRates.centrallyManage')}</Text>
-                </View>
+                {shouldUseNarrowLayout && <View style={[styles.ph5]}>{headerButtons}</View>}
+                {!shouldUseNarrowLayout && getHeaderText()}
                 {isLoading && (
                     <ActivityIndicator
                         size={CONST.ACTIVITY_INDICATOR_SIZE.LARGE}
@@ -295,22 +319,26 @@ function PolicyDistanceRatesPage({policy, route}: PolicyDistanceRatesPageProps)
                     />
                 )}
                 {Object.values(customUnitRates).length > 0 && (
-                    <SelectionList
-                        canSelectMultiple
+                    <SelectionListWithModal
+                        canSelectMultiple={canSelectMultiple}
+                        turnOnSelectionModeOnLongPress
+                        onTurnOnSelectionMode={(item) => item && toggleRate(item)}
                         sections={[{data: distanceRatesList, isDisabled: false}]}
                         onCheckboxPress={toggleRate}
                         onSelectRow={openRateDetails}
                         onSelectAll={toggleAllRates}
                         onDismissError={dismissError}
-                        showScrollIndicator
                         ListItem={TableListItem}
                         shouldPreventDefaultFocusOnSelectRow={!DeviceCapabilities.canUseTouchScreen()}
                         customListHeader={getCustomListHeader()}
                         listHeaderWrapperStyle={[styles.ph9, styles.pv3, styles.pb5]}
+                        listHeaderContent={shouldUseNarrowLayout ? getHeaderText() : null}
+                        showScrollIndicator={false}
                     />
                 )}
                 <ConfirmModal
                     onConfirm={() => setIsWarningModalVisible(false)}
+                    onCancel={() => setIsWarningModalVisible(false)}
                     isVisible={isWarningModalVisible}
                     title={translate('workspace.distanceRates.oopsNotSoFast')}
                     prompt={translate('workspace.distanceRates.workspaceNeeds')}
@@ -334,8 +362,4 @@ function PolicyDistanceRatesPage({policy, route}: PolicyDistanceRatesPageProps)
 
 PolicyDistanceRatesPage.displayName = 'PolicyDistanceRatesPage';
 
-export default withOnyx<PolicyDistanceRatesPageProps, PolicyDistanceRatesPageOnyxProps>({
-    policy: {
-        key: ({route}) => `${ONYXKEYS.COLLECTION.POLICY}${route.params.policyID}`,
-    },
-})(PolicyDistanceRatesPage);
+export default PolicyDistanceRatesPage;
diff --git a/src/pages/workspace/distanceRates/PolicyDistanceRatesSettingsPage.tsx b/src/pages/workspace/distanceRates/PolicyDistanceRatesSettingsPage.tsx
index d756084e5e49..8ab9f87bfe56 100644
--- a/src/pages/workspace/distanceRates/PolicyDistanceRatesSettingsPage.tsx
+++ b/src/pages/workspace/distanceRates/PolicyDistanceRatesSettingsPage.tsx
@@ -3,20 +3,29 @@ import React from 'react';
 import {View} from 'react-native';
 import type {OnyxEntry} from 'react-native-onyx';
 import {withOnyx} from 'react-native-onyx';
+import FullPageOfflineBlockingView from '@components/BlockingViews/FullPageOfflineBlockingView';
 import HeaderWithBackButton from '@components/HeaderWithBackButton';
 import OfflineWithFeedback from '@components/OfflineWithFeedback';
 import ScreenWrapper from '@components/ScreenWrapper';
+import ScrollView from '@components/ScrollView';
 import type {ListItem} from '@components/SelectionList/types';
+import Switch from '@components/Switch';
+import Text from '@components/Text';
+import TextLink from '@components/TextLink';
 import type {UnitItemType} from '@components/UnitPicker';
 import useLocalize from '@hooks/useLocalize';
 import useThemeStyles from '@hooks/useThemeStyles';
 import * as ErrorUtils from '@libs/ErrorUtils';
+import Navigation from '@libs/Navigation/Navigation';
 import * as OptionsListUtils from '@libs/OptionsListUtils';
 import type {SettingsNavigatorParamList} from '@navigation/types';
 import AccessOrNotFoundWrapper from '@pages/workspace/AccessOrNotFoundWrapper';
-import * as Policy from '@userActions/Policy';
+import * as Category from '@userActions/Policy/Category';
+import * as DistanceRate from '@userActions/Policy/DistanceRate';
+import * as Policy from '@userActions/Policy/Policy';
 import CONST from '@src/CONST';
 import ONYXKEYS from '@src/ONYXKEYS';
+import ROUTES from '@src/ROUTES';
 import type SCREENS from '@src/SCREENS';
 import type * as OnyxTypes from '@src/types/onyx';
 import type {CustomUnit} from '@src/types/onyx/Policy';
@@ -36,18 +45,22 @@ type PolicyDistanceRatesSettingsPageProps = PolicyDistanceRatesSettingsPageOnyxP
 function PolicyDistanceRatesSettingsPage({policy, policyCategories, route}: PolicyDistanceRatesSettingsPageProps) {
     const styles = useThemeStyles();
     const {translate} = useLocalize();
-
     const policyID = route.params.policyID;
     const customUnits = policy?.customUnits ?? {};
     const customUnit = customUnits[Object.keys(customUnits)[0]];
     const customUnitID = customUnit?.customUnitID ?? '';
+    const isDistanceTrackTaxEnabled = !!customUnit?.attributes?.taxEnabled;
+    const isPolicyTrackTaxEnabled = !!policy?.tax?.trackingEnabled;
+
+    const defaultCategory = customUnits[customUnitID]?.defaultCategory;
+    const defaultUnit = customUnits[customUnitID]?.attributes?.unit;
+    const errorFields = customUnits[customUnitID]?.errorFields;
 
-    const defaultCategory = customUnits[customUnitID].defaultCategory;
-    const defaultUnit = customUnits[customUnitID].attributes.unit;
-    const errorFields = customUnits[customUnitID].errorFields;
+    const FullPageBlockingView = !customUnit ? FullPageOfflineBlockingView : View;
 
     const setNewUnit = (unit: UnitItemType) => {
-        Policy.setPolicyDistanceRatesUnit(policyID, customUnit, {...customUnit, attributes: {unit: unit.value}});
+        const attributes = {...customUnits[customUnitID].attributes, unit: unit.value};
+        DistanceRate.setPolicyDistanceRatesUnit(policyID, customUnit, {...customUnit, attributes});
     };
 
     const setNewCategory = (category: ListItem) => {
@@ -55,14 +68,19 @@ function PolicyDistanceRatesSettingsPage({policy, policyCategories, route}: Poli
             return;
         }
 
-        Policy.setPolicyDistanceRatesDefaultCategory(policyID, customUnit, {
+        Category.setPolicyDistanceRatesDefaultCategory(policyID, customUnit, {
             ...customUnit,
             defaultCategory: defaultCategory === category.searchText ? '' : category.searchText,
         });
     };
 
     const clearErrorFields = (fieldName: keyof CustomUnit) => {
-        Policy.clearPolicyDistanceRatesErrorFields(policyID, customUnitID, {...errorFields, [fieldName]: null});
+        DistanceRate.clearPolicyDistanceRatesErrorFields(policyID, customUnitID, {...errorFields, [fieldName]: null});
+    };
+
+    const onToggleTrackTax = (isOn: boolean) => {
+        const attributes = {...customUnits[customUnitID].attributes, taxEnabled: isOn};
+        Policy.enableDistanceRequestTax(policyID, customUnit?.name, customUnitID, attributes);
     };
 
     return (
@@ -77,37 +95,76 @@ function PolicyDistanceRatesSettingsPage({policy, policyCategories, route}: Poli
                 testID={PolicyDistanceRatesSettingsPage.displayName}
             >
                 <HeaderWithBackButton title={translate('workspace.common.settings')} />
-                <View style={styles.flexGrow1}>
-                    <OfflineWithFeedback
-                        errors={ErrorUtils.getLatestErrorField(customUnits[customUnitID], 'attributes')}
-                        pendingAction={customUnits[customUnitID].pendingFields?.attributes}
-                        errorRowStyles={styles.mh5}
-                        onClose={() => clearErrorFields('attributes')}
-                    >
-                        <UnitSelector
-                            label={translate('workspace.distanceRates.unit')}
-                            defaultValue={defaultUnit}
-                            wrapperStyle={[styles.ph5, styles.mt3]}
-                            setNewUnit={setNewUnit}
-                        />
-                    </OfflineWithFeedback>
-                    {policy?.areCategoriesEnabled && OptionsListUtils.hasEnabledOptions(policyCategories ?? {}) && (
-                        <OfflineWithFeedback
-                            errors={ErrorUtils.getLatestErrorField(customUnits[customUnitID], 'defaultCategory')}
-                            pendingAction={customUnits[customUnitID].pendingFields?.defaultCategory}
-                            errorRowStyles={styles.mh5}
-                            onClose={() => clearErrorFields('defaultCategory')}
-                        >
-                            <CategorySelector
-                                policyID={policyID}
-                                label={translate('workspace.distanceRates.defaultCategory')}
-                                defaultValue={defaultCategory}
-                                wrapperStyle={[styles.ph5, styles.mt3]}
-                                setNewCategory={setNewCategory}
-                            />
-                        </OfflineWithFeedback>
-                    )}
-                </View>
+                <FullPageBlockingView style={customUnit ? styles.flexGrow1 : []}>
+                    <ScrollView contentContainerStyle={styles.flexGrow1}>
+                        <View>
+                            {defaultUnit && (
+                                <OfflineWithFeedback
+                                    errors={ErrorUtils.getLatestErrorField(customUnits[customUnitID] ?? {}, 'attributes')}
+                                    pendingAction={customUnits[customUnitID]?.pendingFields?.attributes}
+                                    errorRowStyles={styles.mh5}
+                                    onClose={() => clearErrorFields('attributes')}
+                                >
+                                    <UnitSelector
+                                        label={translate('workspace.distanceRates.unit')}
+                                        defaultValue={defaultUnit}
+                                        wrapperStyle={[styles.ph5, styles.mt3]}
+                                        setNewUnit={setNewUnit}
+                                    />
+                                </OfflineWithFeedback>
+                            )}
+                            {policy?.areCategoriesEnabled && OptionsListUtils.hasEnabledOptions(policyCategories ?? {}) && (
+                                <OfflineWithFeedback
+                                    errors={ErrorUtils.getLatestErrorField(customUnits[customUnitID] ?? {}, 'defaultCategory')}
+                                    pendingAction={customUnits[customUnitID]?.pendingFields?.defaultCategory}
+                                    errorRowStyles={styles.mh5}
+                                    onClose={() => clearErrorFields('defaultCategory')}
+                                >
+                                    <CategorySelector
+                                        policyID={policyID}
+                                        label={translate('workspace.distanceRates.defaultCategory')}
+                                        defaultValue={defaultCategory}
+                                        wrapperStyle={[styles.ph5, styles.mt3]}
+                                        setNewCategory={setNewCategory}
+                                    />
+                                </OfflineWithFeedback>
+                            )}
+                            <OfflineWithFeedback
+                                errors={ErrorUtils.getLatestErrorField(customUnits[customUnitID] ?? {}, 'taxEnabled')}
+                                errorRowStyles={styles.mh5}
+                                pendingAction={customUnits[customUnitID]?.pendingFields?.taxEnabled}
+                            >
+                                <View style={[styles.mt2, styles.mh5]}>
+                                    <View style={[styles.flexRow, styles.mb2, styles.mr2, styles.alignItemsCenter, styles.justifyContentBetween]}>
+                                        <Text style={[styles.textNormal, styles.colorMuted]}>{translate('workspace.distanceRates.trackTax')}</Text>
+                                        <Switch
+                                            isOn={isDistanceTrackTaxEnabled && isPolicyTrackTaxEnabled}
+                                            accessibilityLabel={translate('workspace.distanceRates.trackTax')}
+                                            onToggle={onToggleTrackTax}
+                                            disabled={!isPolicyTrackTaxEnabled}
+                                        />
+                                    </View>
+                                </View>
+                                {!isPolicyTrackTaxEnabled && (
+                                    <View style={[styles.mh5]}>
+                                        <Text style={styles.colorMuted}>
+                                            {translate('workspace.distanceRates.taxFeatureNotEnabledMessage')}
+                                            <TextLink
+                                                onPress={() => {
+                                                    Navigation.dismissModal();
+                                                    Navigation.goBack(ROUTES.WORKSPACE_MORE_FEATURES.getRoute(policyID));
+                                                }}
+                                            >
+                                                {translate('workspace.common.moreFeatures')}
+                                            </TextLink>
+                                            {translate('workspace.distanceRates.changePromptMessage')}
+                                        </Text>
+                                    </View>
+                                )}
+                            </OfflineWithFeedback>
+                        </View>
+                    </ScrollView>
+                </FullPageBlockingView>
             </ScreenWrapper>
         </AccessOrNotFoundWrapper>
     );
diff --git a/src/pages/workspace/distanceRates/UnitSelector/UnitSelectorModal.tsx b/src/pages/workspace/distanceRates/UnitSelector/UnitSelectorModal.tsx
index 5a9f5e7c6ea1..34eb21ce19c4 100644
--- a/src/pages/workspace/distanceRates/UnitSelector/UnitSelectorModal.tsx
+++ b/src/pages/workspace/distanceRates/UnitSelector/UnitSelectorModal.tsx
@@ -13,7 +13,7 @@ type UnitSelectorModalProps = {
     isVisible: boolean;
 
     /** Selected unit  */
-    currentUnit: Unit;
+    currentUnit?: Unit;
 
     /** Function to call when the user selects a unit */
     onUnitSelected: (value: UnitItemType) => void;
diff --git a/src/pages/workspace/distanceRates/UnitSelector/index.tsx b/src/pages/workspace/distanceRates/UnitSelector/index.tsx
index e6511e7d6418..883ef0a5e593 100644
--- a/src/pages/workspace/distanceRates/UnitSelector/index.tsx
+++ b/src/pages/workspace/distanceRates/UnitSelector/index.tsx
@@ -1,4 +1,4 @@
-import Str from 'expensify-common/lib/str';
+import {Str} from 'expensify-common';
 import React, {useState} from 'react';
 import type {StyleProp, ViewStyle} from 'react-native';
 import {View} from 'react-native';
@@ -14,7 +14,7 @@ type UnitSelectorProps = {
     setNewUnit: (value: UnitItemType) => void;
 
     /** Currently selected unit */
-    defaultValue: Unit;
+    defaultValue?: Unit;
 
     /** Label to display on field */
     label: string;
@@ -41,7 +41,7 @@ function UnitSelector({defaultValue, wrapperStyle, label, setNewUnit}: UnitSelec
         hidePickerModal();
     };
 
-    const title = Str.recapitalize(translate(getUnitTranslationKey(defaultValue)));
+    const title = defaultValue ? Str.recapitalize(translate(getUnitTranslationKey(defaultValue))) : '';
 
     return (
         <View>
diff --git a/src/pages/workspace/expensifyCard/EmptyCardView.tsx b/src/pages/workspace/expensifyCard/EmptyCardView.tsx
new file mode 100644
index 000000000000..f83095444036
--- /dev/null
+++ b/src/pages/workspace/expensifyCard/EmptyCardView.tsx
@@ -0,0 +1,48 @@
+import React from 'react';
+import {View} from 'react-native';
+import EmptyStateComponent from '@components/EmptyStateComponent';
+import * as Illustrations from '@components/Icon/Illustrations';
+import ScrollView from '@components/ScrollView';
+import CardRowSkeleton from '@components/Skeletons/CardRowSkeleton';
+import Text from '@components/Text';
+import useEmptyViewHeaderHeight from '@hooks/useEmptyViewHeaderHeight';
+import useLocalize from '@hooks/useLocalize';
+import useThemeStyles from '@hooks/useThemeStyles';
+import useWindowDimensions from '@hooks/useWindowDimensions';
+import colors from '@styles/theme/colors';
+import CONST from '@src/CONST';
+
+function EmptyCardView() {
+    const {translate} = useLocalize();
+    const styles = useThemeStyles();
+    const {windowHeight, isSmallScreenWidth} = useWindowDimensions();
+
+    const headerHeight = useEmptyViewHeaderHeight(isSmallScreenWidth);
+
+    return (
+        <ScrollView>
+            <View style={[{height: windowHeight - headerHeight}, styles.pt5]}>
+                <EmptyStateComponent
+                    SkeletonComponent={CardRowSkeleton}
+                    headerMediaType={CONST.EMPTY_STATE_MEDIA.ILLUSTRATION}
+                    headerMedia={Illustrations.EmptyCardState}
+                    headerStyles={[
+                        {
+                            overflow: 'hidden',
+                            backgroundColor: colors.green700,
+                        },
+                        isSmallScreenWidth && {maxHeight: 250},
+                    ]}
+                    title={translate('workspace.expensifyCard.issueAndManageCards')}
+                    subtitle={translate('workspace.expensifyCard.getStartedIssuing')}
+                    minModalHeight={500}
+                />
+            </View>
+            <Text style={[styles.textMicroSupporting, styles.m5]}>{translate('workspace.expensifyCard.disclaimer')}</Text>
+        </ScrollView>
+    );
+}
+
+EmptyCardView.displayName = 'EmptyCardView';
+
+export default EmptyCardView;
diff --git a/src/pages/workspace/expensifyCard/WorkspaceCardListHeader.tsx b/src/pages/workspace/expensifyCard/WorkspaceCardListHeader.tsx
new file mode 100644
index 000000000000..6dcc775bcb70
--- /dev/null
+++ b/src/pages/workspace/expensifyCard/WorkspaceCardListHeader.tsx
@@ -0,0 +1,79 @@
+import React from 'react';
+import {View} from 'react-native';
+import {useOnyx} from 'react-native-onyx';
+import Text from '@components/Text';
+import useLocalize from '@hooks/useLocalize';
+import useResponsiveLayout from '@hooks/useResponsiveLayout';
+import useThemeStyles from '@hooks/useThemeStyles';
+import * as PolicyUtils from '@libs/PolicyUtils';
+import CONST from '@src/CONST';
+import ONYXKEYS from '@src/ONYXKEYS';
+import WorkspaceCardsListLabel from './WorkspaceCardsListLabel';
+
+type WorkspaceCardListHeaderProps = {
+    /** ID of the current policy */
+    policyID: string;
+};
+
+function WorkspaceCardListHeader({policyID}: WorkspaceCardListHeaderProps) {
+    const {shouldUseNarrowLayout, isMediumScreenWidth, isSmallScreenWidth} = useResponsiveLayout();
+    const styles = useThemeStyles();
+    const {translate} = useLocalize();
+
+    const workspaceAccountID = PolicyUtils.getWorkspaceAccountID(policyID);
+    const isLessThanMediumScreen = isMediumScreenWidth || isSmallScreenWidth;
+
+    const [cardSettings] = useOnyx(`${ONYXKEYS.COLLECTION.PRIVATE_EXPENSIFY_CARD_SETTINGS}${workspaceAccountID}`);
+
+    return (
+        <View style={styles.appBG}>
+            <View style={[isLessThanMediumScreen ? styles.flexColumn : styles.flexRow, isLessThanMediumScreen ? [styles.mt5, styles.mb3] : styles.mv5, styles.mh5, styles.ph4]}>
+                <View style={[styles.flexRow, styles.flex1, isLessThanMediumScreen && styles.mb5]}>
+                    <WorkspaceCardsListLabel
+                        type={CONST.WORKSPACE_CARDS_LIST_LABEL_TYPE.CURRENT_BALANCE}
+                        value={cardSettings?.[CONST.WORKSPACE_CARDS_LIST_LABEL_TYPE.CURRENT_BALANCE] ?? 0}
+                    />
+                    <WorkspaceCardsListLabel
+                        type={CONST.WORKSPACE_CARDS_LIST_LABEL_TYPE.REMAINING_LIMIT}
+                        value={cardSettings?.[CONST.WORKSPACE_CARDS_LIST_LABEL_TYPE.REMAINING_LIMIT] ?? 0}
+                    />
+                </View>
+                <WorkspaceCardsListLabel
+                    type={CONST.WORKSPACE_CARDS_LIST_LABEL_TYPE.CASH_BACK}
+                    value={cardSettings?.[CONST.WORKSPACE_CARDS_LIST_LABEL_TYPE.CASH_BACK] ?? 0}
+                />
+            </View>
+
+            <View style={[styles.flexRow, styles.mh5, styles.gap5, styles.p4]}>
+                <View style={[styles.flexRow, styles.flex5, styles.gap2, styles.alignItemsCenter]}>
+                    <Text
+                        numberOfLines={1}
+                        style={[styles.textLabelSupporting, styles.lh16]}
+                    >
+                        {translate('workspace.expensifyCard.name')}
+                    </Text>
+                </View>
+                <View style={[styles.flexRow, styles.gap2, shouldUseNarrowLayout ? styles.flex2 : styles.flex1, styles.alignItemsCenter, styles.justifyContentEnd]}>
+                    <Text
+                        numberOfLines={1}
+                        style={[styles.textLabelSupporting, styles.lh16]}
+                    >
+                        {translate('workspace.expensifyCard.lastFour')}
+                    </Text>
+                </View>
+                <View style={[styles.flexRow, shouldUseNarrowLayout ? styles.flex3 : styles.flex1, styles.gap2, styles.alignItemsCenter, styles.justifyContentEnd]}>
+                    <Text
+                        numberOfLines={1}
+                        style={[styles.textLabelSupporting, styles.lh16]}
+                    >
+                        {translate('workspace.expensifyCard.limit')}
+                    </Text>
+                </View>
+            </View>
+        </View>
+    );
+}
+
+WorkspaceCardListHeader.displayName = 'WorkspaceCardListHeader';
+
+export default WorkspaceCardListHeader;
diff --git a/src/pages/workspace/expensifyCard/WorkspaceCardListRow.tsx b/src/pages/workspace/expensifyCard/WorkspaceCardListRow.tsx
new file mode 100644
index 000000000000..7bbeae3a167b
--- /dev/null
+++ b/src/pages/workspace/expensifyCard/WorkspaceCardListRow.tsx
@@ -0,0 +1,78 @@
+import React, {useMemo} from 'react';
+import {View} from 'react-native';
+import Avatar from '@components/Avatar';
+import Badge from '@components/Badge';
+import Text from '@components/Text';
+import useResponsiveLayout from '@hooks/useResponsiveLayout';
+import useThemeStyles from '@hooks/useThemeStyles';
+import * as CurrencyUtils from '@libs/CurrencyUtils';
+import * as PersonalDetailsUtils from '@libs/PersonalDetailsUtils';
+import {getDefaultAvatarURL} from '@libs/UserUtils';
+import CONST from '@src/CONST';
+import type {PersonalDetails} from '@src/types/onyx';
+
+type WorkspacesListRowProps = {
+    /** The last four digits of the card */
+    lastFourPAN: string;
+
+    /** Card name */
+    name: string;
+
+    /** Cardholder personal details */
+    cardholder?: PersonalDetails | null;
+
+    /** Card limit */
+    limit: number;
+
+    /** Policy currency */
+    currency: string;
+};
+
+function WorkspaceCardListRow({limit, cardholder, lastFourPAN, name, currency}: WorkspacesListRowProps) {
+    const {shouldUseNarrowLayout} = useResponsiveLayout();
+    const styles = useThemeStyles();
+
+    const cardholderName = useMemo(() => PersonalDetailsUtils.getDisplayNameOrDefault(cardholder), [cardholder]);
+
+    return (
+        <View style={[styles.flexRow, styles.gap5, styles.br3, styles.p4]}>
+            <View style={[styles.flexRow, styles.flex5, styles.gap3, styles.alignItemsCenter]}>
+                <Avatar
+                    source={getDefaultAvatarURL(cardholder?.accountID)}
+                    avatarID={cardholder?.accountID}
+                    type={CONST.ICON_TYPE_AVATAR}
+                    size={CONST.AVATAR_SIZE.DEFAULT}
+                />
+                <View style={styles.flex1}>
+                    <Text
+                        numberOfLines={1}
+                        style={[styles.optionDisplayName, styles.textStrong, styles.pre]}
+                    >
+                        {cardholderName}
+                    </Text>
+                    <Text
+                        numberOfLines={1}
+                        style={[styles.textLabelSupporting, styles.lh16]}
+                    >
+                        {name}
+                    </Text>
+                </View>
+            </View>
+            <View style={[styles.flexRow, styles.gap2, shouldUseNarrowLayout ? styles.flex2 : styles.flex1, styles.alignItemsCenter, styles.justifyContentEnd]}>
+                <Text
+                    numberOfLines={1}
+                    style={[styles.textLabelSupporting, styles.lh16]}
+                >
+                    {lastFourPAN}
+                </Text>
+            </View>
+            <View style={[styles.flexRow, shouldUseNarrowLayout ? styles.flex3 : styles.flex1, styles.gap2, styles.alignItemsCenter, styles.justifyContentEnd]}>
+                <Badge text={CurrencyUtils.convertToDisplayString(limit, currency)} />
+            </View>
+        </View>
+    );
+}
+
+WorkspaceCardListRow.displayName = 'WorkspaceCardListRow';
+
+export default WorkspaceCardListRow;
diff --git a/src/pages/workspace/expensifyCard/WorkspaceCardSettingsPage.tsx b/src/pages/workspace/expensifyCard/WorkspaceCardSettingsPage.tsx
new file mode 100644
index 000000000000..4e295c66060a
--- /dev/null
+++ b/src/pages/workspace/expensifyCard/WorkspaceCardSettingsPage.tsx
@@ -0,0 +1,95 @@
+import type {StackScreenProps} from '@react-navigation/stack';
+import React from 'react';
+import {View} from 'react-native';
+import {useOnyx} from 'react-native-onyx';
+import HeaderWithBackButton from '@components/HeaderWithBackButton';
+import MenuItemWithTopDescription from '@components/MenuItemWithTopDescription';
+import OfflineWithFeedback from '@components/OfflineWithFeedback';
+import ScreenWrapper from '@components/ScreenWrapper';
+import ScrollView from '@components/ScrollView';
+import TextLink from '@components/TextLink';
+import useLocalize from '@hooks/useLocalize';
+import useThemeStyles from '@hooks/useThemeStyles';
+import {getLastFourDigits} from '@libs/BankAccountUtils';
+import * as PolicyUtils from '@libs/PolicyUtils';
+import Navigation from '@navigation/Navigation';
+import type {SettingsNavigatorParamList} from '@navigation/types';
+import AccessOrNotFoundWrapper from '@pages/workspace/AccessOrNotFoundWrapper';
+import CONST from '@src/CONST';
+import ONYXKEYS from '@src/ONYXKEYS';
+import ROUTES from '@src/ROUTES';
+import type SCREENS from '@src/SCREENS';
+
+type WorkspaceCardSettingsPageProps = StackScreenProps<SettingsNavigatorParamList, typeof SCREENS.WORKSPACE.EXPENSIFY_CARD_SETTINGS>;
+
+function WorkspaceCardSettingsPage({route}: WorkspaceCardSettingsPageProps) {
+    const styles = useThemeStyles();
+    const {translate} = useLocalize();
+    const policyID = route.params?.policyID;
+    const workspaceAccountID = PolicyUtils.getWorkspaceAccountID(policyID);
+
+    const [bankAccountList] = useOnyx(ONYXKEYS.BANK_ACCOUNT_LIST);
+    const [cardSettings] = useOnyx(`${ONYXKEYS.COLLECTION.PRIVATE_EXPENSIFY_CARD_SETTINGS}${workspaceAccountID}`);
+
+    const paymentBankAccountID = cardSettings?.paymentBankAccountID ?? 0;
+    // const isMonthlySettlementAllowed = cardSettings?.isMonthlySettlementAllowed ?? true;
+    const settlementFrequency = cardSettings?.monthlySettlementDate ? CONST.EXPENSIFY_CARD.FREQUENCY_SETTING.MONTHLY : CONST.EXPENSIFY_CARD.FREQUENCY_SETTING.DAILY;
+    // TODO: replace this line with the following line and uncomment the previous comment
+    const isSettlementFrequencyBlocked = settlementFrequency === CONST.EXPENSIFY_CARD.FREQUENCY_SETTING.DAILY;
+    // const isSettlementFrequencyBlocked = !isMonthlySettlementAllowed && settlementFrequency === CONST.EXPENSIFY_CARD.FREQUENCY_SETTING.DAILY;
+    const bankAccountNumber = bankAccountList?.[paymentBankAccountID.toString()]?.accountData?.accountNumber ?? '';
+
+    return (
+        <AccessOrNotFoundWrapper
+            accessVariants={[CONST.POLICY.ACCESS_VARIANTS.ADMIN, CONST.POLICY.ACCESS_VARIANTS.PAID]}
+            policyID={policyID}
+            featureName={CONST.POLICY.MORE_FEATURES.ARE_EXPENSIFY_CARDS_ENABLED}
+        >
+            <ScreenWrapper
+                testID={WorkspaceCardSettingsPage.displayName}
+                includeSafeAreaPaddingBottom={false}
+                shouldEnableMaxHeight
+            >
+                <HeaderWithBackButton title={translate('workspace.common.settings')} />
+                <ScrollView contentContainerStyle={styles.flexGrow1}>
+                    <View>
+                        <OfflineWithFeedback errorRowStyles={styles.mh5}>
+                            <MenuItemWithTopDescription
+                                description={translate('workspace.expensifyCard.settlementAccount')}
+                                title={bankAccountNumber ? `${CONST.MASKED_PAN_PREFIX}${getLastFourDigits(bankAccountNumber)}` : ''}
+                                shouldShowRightIcon
+                                onPress={() => Navigation.navigate(ROUTES.WORKSPACE_EXPENSIFY_CARD_SETTINGS_ACCOUNT.getRoute(policyID))}
+                            />
+                        </OfflineWithFeedback>
+                        <OfflineWithFeedback errorRowStyles={styles.mh5}>
+                            <MenuItemWithTopDescription
+                                description={translate('workspace.expensifyCard.settlementFrequency')}
+                                title={translate(`workspace.expensifyCard.frequency.${settlementFrequency}`)}
+                                shouldShowRightIcon={settlementFrequency !== CONST.EXPENSIFY_CARD.FREQUENCY_SETTING.DAILY}
+                                // interactive={!isSettlementFrequencyBlocked}
+                                onPress={() => Navigation.navigate(ROUTES.WORKSPACE_EXPENSIFY_CARD_SETTINGS_FREQUENCY.getRoute(policyID))}
+                                hintText={
+                                    isSettlementFrequencyBlocked ? (
+                                        <>
+                                            {translate('workspace.expensifyCard.settlementFrequencyInfo')}{' '}
+                                            <TextLink
+                                                href=""
+                                                style={styles.label}
+                                            >
+                                                {translate('common.learnMore')}
+                                            </TextLink>
+                                        </>
+                                    ) : undefined
+                                }
+                            />
+                        </OfflineWithFeedback>
+                    </View>
+                </ScrollView>
+            </ScreenWrapper>
+        </AccessOrNotFoundWrapper>
+    );
+}
+
+WorkspaceCardSettingsPage.displayName = 'WorkspaceCardSettingsPage';
+
+export default WorkspaceCardSettingsPage;
diff --git a/src/pages/workspace/expensifyCard/WorkspaceCardsListLabel.tsx b/src/pages/workspace/expensifyCard/WorkspaceCardsListLabel.tsx
new file mode 100644
index 000000000000..c0566d71f686
--- /dev/null
+++ b/src/pages/workspace/expensifyCard/WorkspaceCardsListLabel.tsx
@@ -0,0 +1,134 @@
+import type {RouteProp} from '@react-navigation/native';
+import {useRoute} from '@react-navigation/native';
+import React, {useEffect, useMemo, useRef, useState} from 'react';
+import {View} from 'react-native';
+import type {StyleProp, ViewStyle} from 'react-native';
+import {useOnyx} from 'react-native-onyx';
+import type {ValueOf} from 'type-fest';
+import Button from '@components/Button';
+import Icon from '@components/Icon';
+import * as Expensicons from '@components/Icon/Expensicons';
+import Popover from '@components/Popover';
+import {PressableWithFeedback} from '@components/Pressable';
+import Text from '@components/Text';
+import useLocalize from '@hooks/useLocalize';
+import usePolicy from '@hooks/usePolicy';
+import useResponsiveLayout from '@hooks/useResponsiveLayout';
+import useTheme from '@hooks/useTheme';
+import useThemeStyles from '@hooks/useThemeStyles';
+import useWindowDimensions from '@hooks/useWindowDimensions';
+import * as CurrencyUtils from '@libs/CurrencyUtils';
+import getClickedTargetLocation from '@libs/getClickedTargetLocation';
+import type {FullScreenNavigatorParamList} from '@navigation/types';
+import variables from '@styles/variables';
+import * as Report from '@userActions/Report';
+import CONST from '@src/CONST';
+import ONYXKEYS from '@src/ONYXKEYS';
+import type SCREENS from '@src/SCREENS';
+
+type WorkspaceCardsListLabelProps = {
+    /** Label type */
+    type: ValueOf<typeof CONST.WORKSPACE_CARDS_LIST_LABEL_TYPE>;
+
+    /** Label value */
+    value: number;
+
+    /** Additional style props */
+    style?: StyleProp<ViewStyle>;
+};
+
+function WorkspaceCardsListLabel({type, value, style}: WorkspaceCardsListLabelProps) {
+    const route = useRoute<RouteProp<FullScreenNavigatorParamList, typeof SCREENS.WORKSPACE.EXPENSIFY_CARD>>();
+    const policy = usePolicy(route.params.policyID);
+    const styles = useThemeStyles();
+    const {windowWidth} = useWindowDimensions();
+    const {shouldUseNarrowLayout} = useResponsiveLayout();
+    const theme = useTheme();
+    const {translate} = useLocalize();
+    const [bankAccountList] = useOnyx(ONYXKEYS.BANK_ACCOUNT_LIST);
+    const [isVisible, setVisible] = useState(false);
+    const [anchorPosition, setAnchorPosition] = useState({top: 0, left: 0});
+    const anchorRef = useRef(null);
+
+    const policyCurrency = useMemo(() => policy?.outputCurrency ?? CONST.CURRENCY.USD, [policy]);
+    // TODO: instead of the first bankAccount on the list get settlementBankAccountID from the private_expensifyCardSettings NVP and check if that is connected via Plaid.
+    const isConnectedWithPlaid = useMemo(() => !!Object.values(bankAccountList ?? {})[0]?.accountData?.additionalData?.plaidAccountID, [bankAccountList]);
+
+    useEffect(() => {
+        if (!anchorRef.current || !isVisible) {
+            return;
+        }
+
+        const position = getClickedTargetLocation(anchorRef.current);
+        const BOTTOM_MARGIN_OFFSET = 3;
+
+        setAnchorPosition({
+            top: position.top + position.height + BOTTOM_MARGIN_OFFSET,
+            left: position.left,
+        });
+    }, [isVisible, windowWidth]);
+
+    const requestLimitIncrease = () => {
+        // TODO: uncomment when RequestExpensifyCardLimitIncrease API call is supported
+        // Policy.requestExpensifyCardLimitIncrease(settlementBankAccountID);
+        setVisible(false);
+        Report.navigateToConciergeChat();
+    };
+
+    return (
+        <View style={styles.flex1}>
+            <View
+                ref={anchorRef}
+                style={[styles.flexRow, styles.alignItemsCenter, styles.mb1, style]}
+            >
+                <Text style={[styles.mutedNormalTextLabel, styles.mr1]}>{translate(`workspace.expensifyCard.${type}`)}</Text>
+                <PressableWithFeedback
+                    accessibilityLabel={translate(`workspace.expensifyCard.${type}`)}
+                    accessibilityRole={CONST.ROLE.BUTTON}
+                    onPress={() => setVisible(true)}
+                >
+                    <Icon
+                        src={Expensicons.Info}
+                        width={variables.iconSizeExtraSmall}
+                        height={variables.iconSizeExtraSmall}
+                        fill={theme.icon}
+                    />
+                </PressableWithFeedback>
+            </View>
+
+            <Text style={styles.shortTermsHeadline}>{CurrencyUtils.convertToDisplayString(value, policyCurrency)}</Text>
+
+            <Popover
+                onClose={() => setVisible(false)}
+                isVisible={isVisible}
+                outerStyle={!shouldUseNarrowLayout ? styles.pr5 : undefined}
+                innerContainerStyle={!shouldUseNarrowLayout ? {maxWidth: variables.modalContentMaxWidth} : undefined}
+                anchorRef={anchorRef}
+                anchorPosition={anchorPosition}
+            >
+                <View style={styles.p4}>
+                    <Text
+                        numberOfLines={1}
+                        style={[styles.optionDisplayName, styles.textStrong, styles.mb2]}
+                    >
+                        {translate(`workspace.expensifyCard.${type}`)}
+                    </Text>
+                    <Text style={[styles.textLabelSupporting, styles.lh16]}>{translate(`workspace.expensifyCard.${type}Description`)}</Text>
+
+                    {!isConnectedWithPlaid && type === CONST.WORKSPACE_CARDS_LIST_LABEL_TYPE.REMAINING_LIMIT && (
+                        <View style={[styles.flexRow, styles.mt3]}>
+                            <Button
+                                medium
+                                onPress={requestLimitIncrease}
+                                text={translate('workspace.expensifyCard.requestLimitIncrease')}
+                                style={shouldUseNarrowLayout && styles.flex1}
+                            />
+                        </View>
+                    )}
+                </View>
+            </Popover>
+        </View>
+    );
+}
+
+export default WorkspaceCardsListLabel;
diff --git a/src/pages/workspace/expensifyCard/WorkspaceEditCardLimitPage.tsx b/src/pages/workspace/expensifyCard/WorkspaceEditCardLimitPage.tsx
new file mode 100644
index 000000000000..b42dcb406ada
--- /dev/null
+++ b/src/pages/workspace/expensifyCard/WorkspaceEditCardLimitPage.tsx
@@ -0,0 +1,156 @@
+import type {StackScreenProps} from '@react-navigation/stack';
+import React, {useCallback, useMemo, useState} from 'react';
+import {useOnyx} from 'react-native-onyx';
+import AmountForm from '@components/AmountForm';
+import ConfirmModal from '@components/ConfirmModal';
+import FormProvider from '@components/Form/FormProvider';
+import InputWrapper from '@components/Form/InputWrapper';
+import type {FormInputErrors, FormOnyxValues} from '@components/Form/types';
+import HeaderWithBackButton from '@components/HeaderWithBackButton';
+import ScreenWrapper from '@components/ScreenWrapper';
+import useAutoFocusInput from '@hooks/useAutoFocusInput';
+import useLocalize from '@hooks/useLocalize';
+import useThemeStyles from '@hooks/useThemeStyles';
+import * as CurrencyUtils from '@libs/CurrencyUtils';
+import * as PolicyUtils from '@libs/PolicyUtils';
+import * as ValidationUtils from '@libs/ValidationUtils';
+import Navigation from '@navigation/Navigation';
+import type {SettingsNavigatorParamList} from '@navigation/types';
+import AccessOrNotFoundWrapper from '@pages/workspace/AccessOrNotFoundWrapper';
+import * as Card from '@userActions/Card';
+import CONST from '@src/CONST';
+import ONYXKEYS from '@src/ONYXKEYS';
+import ROUTES from '@src/ROUTES';
+import type SCREENS from '@src/SCREENS';
+import INPUT_IDS from '@src/types/form/EditExpensifyCardLimitForm';
+
+type ConfirmationWarningTranslationPaths = 'workspace.expensifyCard.smartLimitWarning' | 'workspace.expensifyCard.monthlyLimitWarning' | 'workspace.expensifyCard.fixedLimitWarning';
+
+type WorkspaceEditCardLimitPageProps = StackScreenProps<SettingsNavigatorParamList, typeof SCREENS.WORKSPACE.EXPENSIFY_CARD_LIMIT>;
+
+function WorkspaceEditCardLimitPage({route}: WorkspaceEditCardLimitPageProps) {
+    const {policyID, cardID} = route.params;
+    const {translate} = useLocalize();
+    const {inputCallbackRef} = useAutoFocusInput();
+    const styles = useThemeStyles();
+    const [isConfirmModalVisible, setIsConfirmModalVisible] = useState(false);
+    const workspaceAccountID = PolicyUtils.getWorkspaceAccountID(policyID);
+
+    const [cardsList] = useOnyx(`${ONYXKEYS.COLLECTION.WORKSPACE_CARDS_LIST}${workspaceAccountID}_${CONST.EXPENSIFY_CARD.BANK}`);
+    const card = cardsList?.[cardID];
+
+    const getPromptTextKey = useMemo((): ConfirmationWarningTranslationPaths => {
+        switch (card?.nameValuePairs?.limitType) {
+            case CONST.EXPENSIFY_CARD.LIMIT_TYPES.SMART:
+                return 'workspace.expensifyCard.smartLimitWarning';
+            case CONST.EXPENSIFY_CARD.LIMIT_TYPES.FIXED:
+                return 'workspace.expensifyCard.fixedLimitWarning';
+            case CONST.EXPENSIFY_CARD.LIMIT_TYPES.MONTHLY:
+                return 'workspace.expensifyCard.monthlyLimitWarning';
+            default:
+                return 'workspace.expensifyCard.fixedLimitWarning';
+        }
+    }, [card?.nameValuePairs?.limitType]);
+
+    const getNewAvailableSpend = (newLimit: number) => {
+        const currentLimit = card?.nameValuePairs?.unapprovedExpenseLimit ?? 0;
+        const currentSpend = currentLimit - (card?.availableSpend ?? 0);
+
+        return newLimit - currentSpend;
+    };
+
+    const goBack = useCallback(() => Navigation.goBack(ROUTES.WORKSPACE_EXPENSIFY_CARD_DETAILS.getRoute(policyID, cardID)), [policyID, cardID]);
+
+    const updateCardLimit = (newLimit: number) => {
+        const newAvailableSpend = getNewAvailableSpend(newLimit);
+
+        setIsConfirmModalVisible(false);
+
+        Card.updateExpensifyCardLimit(workspaceAccountID, Number(cardID), newLimit, newAvailableSpend, card?.nameValuePairs?.unapprovedExpenseLimit, card?.availableSpend);
+
+        goBack();
+    };
+
+    const submit = (values: FormOnyxValues<typeof ONYXKEYS.FORMS.EDIT_EXPENSIFY_CARD_LIMIT_FORM>) => {
+        const newLimit = Number(values[INPUT_IDS.LIMIT]) * 100;
+        const newAvailableSpend = getNewAvailableSpend(newLimit);
+
+        if (newAvailableSpend <= 0) {
+            setIsConfirmModalVisible(true);
+            return;
+        }
+
+        updateCardLimit(newLimit);
+    };
+
+    const validate = useCallback(
+        (values: FormOnyxValues<typeof ONYXKEYS.FORMS.EDIT_EXPENSIFY_CARD_LIMIT_FORM>): FormInputErrors<typeof ONYXKEYS.FORMS.EDIT_EXPENSIFY_CARD_LIMIT_FORM> => {
+            const errors = ValidationUtils.getFieldRequiredErrors(values, [INPUT_IDS.LIMIT]);
+
+            // We only want integers to be sent as the limit
+            if (!Number(values.limit) || !Number.isInteger(Number(values.limit))) {
+                errors.limit = translate('iou.error.invalidAmount');
+            }
+
+            return errors;
+        },
+        [translate],
+    );
+
+    return (
+        <AccessOrNotFoundWrapper
+            accessVariants={[CONST.POLICY.ACCESS_VARIANTS.ADMIN, CONST.POLICY.ACCESS_VARIANTS.PAID]}
+            policyID={policyID}
+            featureName={CONST.POLICY.MORE_FEATURES.ARE_EXPENSIFY_CARDS_ENABLED}
+        >
+            <ScreenWrapper
+                testID={WorkspaceEditCardLimitPage.displayName}
+                shouldEnablePickerAvoiding={false}
+                shouldEnableMaxHeight
+            >
+                <HeaderWithBackButton
+                    title={translate('workspace.expensifyCard.cardLimit')}
+                    onBackButtonPress={goBack}
+                />
+                <FormProvider
+                    formID={ONYXKEYS.FORMS.EDIT_EXPENSIFY_CARD_LIMIT_FORM}
+                    submitButtonText={translate('common.save')}
+                    shouldHideFixErrorsAlert
+                    onSubmit={submit}
+                    style={styles.flex1}
+                    submitButtonStyles={[styles.mh5, styles.mt0]}
+                    submitFlexEnabled={false}
+                    enabledWhenOffline
+                    validate={validate}
+                >
+                    {({inputValues}) => (
+                        <>
+                            <InputWrapper
+                                InputComponent={AmountForm}
+                                defaultValue={CurrencyUtils.convertToFrontendAmountAsString(card?.nameValuePairs?.unapprovedExpenseLimit, CONST.CURRENCY.USD, false)}
+                                isCurrencyPressable={false}
+                                inputID={INPUT_IDS.LIMIT}
+                                ref={inputCallbackRef}
+                            />
+                            <ConfirmModal
+                                title={translate('workspace.expensifyCard.changeCardLimit')}
+                                isVisible={isConfirmModalVisible}
+                                onConfirm={() => updateCardLimit(Number(inputValues[INPUT_IDS.LIMIT]) * 100)}
+                                onCancel={() => setIsConfirmModalVisible(false)}
+                                prompt={translate(getPromptTextKey, CurrencyUtils.convertToDisplayString(Number(inputValues[INPUT_IDS.LIMIT]) * 100, CONST.CURRENCY.USD))}
+                                confirmText={translate('workspace.expensifyCard.changeLimit')}
+                                cancelText={translate('common.cancel')}
+                                danger
+                                shouldEnableNewFocusManagement
+                            />
+                        </>
+                    )}
+                </FormProvider>
+            </ScreenWrapper>
+        </AccessOrNotFoundWrapper>
+    );
+}
+
+WorkspaceEditCardLimitPage.displayName = 'WorkspaceEditCardLimitPage';
+
+export default WorkspaceEditCardLimitPage;
diff --git a/src/pages/workspace/expensifyCard/WorkspaceEditCardLimitTypePage.tsx b/src/pages/workspace/expensifyCard/WorkspaceEditCardLimitTypePage.tsx
new file mode 100644
index 000000000000..3394cb08f5fd
--- /dev/null
+++ b/src/pages/workspace/expensifyCard/WorkspaceEditCardLimitTypePage.tsx
@@ -0,0 +1,194 @@
+import {useFocusEffect} from '@react-navigation/native';
+import type {StackScreenProps} from '@react-navigation/stack';
+import React, {useCallback, useMemo, useState} from 'react';
+import {useOnyx} from 'react-native-onyx';
+import FullPageOfflineBlockingView from '@components/BlockingViews/FullPageOfflineBlockingView';
+import Button from '@components/Button';
+import ConfirmModal from '@components/ConfirmModal';
+import HeaderWithBackButton from '@components/HeaderWithBackButton';
+import ScreenWrapper from '@components/ScreenWrapper';
+import SelectionList from '@components/SelectionList';
+import RadioListItem from '@components/SelectionList/RadioListItem';
+import useLocalize from '@hooks/useLocalize';
+import usePolicy from '@hooks/usePolicy';
+import useThemeStyles from '@hooks/useThemeStyles';
+import * as CurrencyUtils from '@libs/CurrencyUtils';
+import * as PolicyUtils from '@libs/PolicyUtils';
+import Navigation from '@navigation/Navigation';
+import type {SettingsNavigatorParamList} from '@navigation/types';
+import AccessOrNotFoundWrapper from '@pages/workspace/AccessOrNotFoundWrapper';
+import * as Card from '@userActions/Card';
+import * as Policy from '@userActions/Policy/Policy';
+import CONST from '@src/CONST';
+import ONYXKEYS from '@src/ONYXKEYS';
+import ROUTES from '@src/ROUTES';
+import type SCREENS from '@src/SCREENS';
+import {isEmptyObject} from '@src/types/utils/EmptyObject';
+
+type WorkspaceEditCardLimitTypePageProps = StackScreenProps<SettingsNavigatorParamList, typeof SCREENS.WORKSPACE.EXPENSIFY_CARD_LIMIT_TYPE>;
+
+function WorkspaceEditCardLimitTypePage({route}: WorkspaceEditCardLimitTypePageProps) {
+    const {policyID, cardID} = route.params;
+    const workspaceAccountID = PolicyUtils.getWorkspaceAccountID(policyID);
+
+    const {translate} = useLocalize();
+    const styles = useThemeStyles();
+
+    const policy = usePolicy(policyID);
+    const [cardsList] = useOnyx(`${ONYXKEYS.COLLECTION.WORKSPACE_CARDS_LIST}${workspaceAccountID}_${CONST.EXPENSIFY_CARD.BANK}`);
+
+    const card = cardsList?.[cardID];
+    const areApprovalsConfigured = !isEmptyObject(policy?.approver) && policy?.approvalMode !== CONST.POLICY.APPROVAL_MODE.OPTIONAL;
+    const defaultLimitType = areApprovalsConfigured ? CONST.EXPENSIFY_CARD.LIMIT_TYPES.SMART : CONST.EXPENSIFY_CARD.LIMIT_TYPES.MONTHLY;
+    const initialLimitType = card?.nameValuePairs?.limitType ?? defaultLimitType;
+    const promptTranslationKey =
+        initialLimitType === CONST.EXPENSIFY_CARD.LIMIT_TYPES.MONTHLY || initialLimitType === CONST.EXPENSIFY_CARD.LIMIT_TYPES.FIXED
+            ? 'workspace.expensifyCard.changeCardSmartLimitTypeWarning'
+            : 'workspace.expensifyCard.changeCardMonthlyLimitTypeWarning';
+
+    const [typeSelected, setTypeSelected] = useState(initialLimitType);
+    const [isConfirmModalVisible, setIsConfirmModalVisible] = useState(false);
+
+    const goBack = useCallback(() => Navigation.goBack(ROUTES.WORKSPACE_EXPENSIFY_CARD_DETAILS.getRoute(policyID, cardID)), [policyID, cardID]);
+
+    const fetchCardLimitTypeData = useCallback(() => {
+        Policy.openPolicyEditCardLimitTypePage(policyID, Number(cardID));
+    }, [policyID, cardID]);
+
+    useFocusEffect(fetchCardLimitTypeData);
+
+    const updateCardLimitType = () => {
+        setIsConfirmModalVisible(false);
+
+        Card.updateExpensifyCardLimitType(workspaceAccountID, Number(cardID), typeSelected, card?.nameValuePairs?.limitType);
+
+        goBack();
+    };
+
+    const submit = () => {
+        let shouldShowConfirmModal = false;
+        if (!!card?.unapprovedSpend && card?.nameValuePairs?.unapprovedExpenseLimit) {
+            // Spends are coming as negative numbers from the backend and we need to make it positive for the correct expression.
+            const unapprovedSpend = Math.abs(card.unapprovedSpend);
+            const isUnapprovedSpendOverLimit = unapprovedSpend >= card.nameValuePairs.unapprovedExpenseLimit;
+
+            const validCombinations = [
+                [CONST.EXPENSIFY_CARD.LIMIT_TYPES.MONTHLY, CONST.EXPENSIFY_CARD.LIMIT_TYPES.SMART],
+                [CONST.EXPENSIFY_CARD.LIMIT_TYPES.SMART, CONST.EXPENSIFY_CARD.LIMIT_TYPES.MONTHLY],
+                [CONST.EXPENSIFY_CARD.LIMIT_TYPES.FIXED, CONST.EXPENSIFY_CARD.LIMIT_TYPES.SMART],
+                [CONST.EXPENSIFY_CARD.LIMIT_TYPES.FIXED, CONST.EXPENSIFY_CARD.LIMIT_TYPES.MONTHLY],
+            ];
+            // Check if the combination exists in validCombinations
+            const isValidCombination = validCombinations.some(([limitType, selectedType]) => initialLimitType === limitType && typeSelected === selectedType);
+
+            if (isValidCombination && isUnapprovedSpendOverLimit) {
+                shouldShowConfirmModal = true;
+            }
+        }
+
+        if (shouldShowConfirmModal) {
+            setIsConfirmModalVisible(true);
+        } else {
+            updateCardLimitType();
+        }
+    };
+
+    const data = useMemo(() => {
+        const options = [];
+        let shouldShowFixedOption = true;
+
+        if (card?.totalSpend && card?.nameValuePairs?.unapprovedExpenseLimit) {
+            const totalSpend = Math.abs(card.totalSpend);
+            if (
+                (initialLimitType === CONST.EXPENSIFY_CARD.LIMIT_TYPES.MONTHLY || initialLimitType === CONST.EXPENSIFY_CARD.LIMIT_TYPES.SMART) &&
+                totalSpend >= card.nameValuePairs?.unapprovedExpenseLimit
+            ) {
+                shouldShowFixedOption = false;
+            }
+        }
+
+        if (areApprovalsConfigured) {
+            options.push({
+                value: CONST.EXPENSIFY_CARD.LIMIT_TYPES.SMART,
+                text: translate('workspace.card.issueNewCard.smartLimit'),
+                alternateText: translate('workspace.card.issueNewCard.smartLimitDescription'),
+                keyForList: CONST.EXPENSIFY_CARD.LIMIT_TYPES.SMART,
+                isSelected: typeSelected === CONST.EXPENSIFY_CARD.LIMIT_TYPES.SMART,
+            });
+        }
+
+        options.push({
+            value: CONST.EXPENSIFY_CARD.LIMIT_TYPES.MONTHLY,
+            text: translate('workspace.card.issueNewCard.monthly'),
+            alternateText: translate('workspace.card.issueNewCard.monthlyDescription'),
+            keyForList: CONST.EXPENSIFY_CARD.LIMIT_TYPES.MONTHLY,
+            isMultilineSupported: true,
+            isSelected: typeSelected === CONST.EXPENSIFY_CARD.LIMIT_TYPES.MONTHLY,
+        });
+
+        if (shouldShowFixedOption) {
+            options.push({
+                value: CONST.EXPENSIFY_CARD.LIMIT_TYPES.FIXED,
+                text: translate('workspace.card.issueNewCard.fixedAmount'),
+                alternateText: translate('workspace.card.issueNewCard.fixedAmountDescription'),
+                keyForList: CONST.EXPENSIFY_CARD.LIMIT_TYPES.FIXED,
+                isMultilineSupported: true,
+                isSelected: typeSelected === CONST.EXPENSIFY_CARD.LIMIT_TYPES.FIXED,
+            });
+        }
+
+        return options;
+    }, [areApprovalsConfigured, card, initialLimitType, translate, typeSelected]);
+
+    return (
+        <AccessOrNotFoundWrapper
+            accessVariants={[CONST.POLICY.ACCESS_VARIANTS.ADMIN, CONST.POLICY.ACCESS_VARIANTS.PAID]}
+            policyID={policyID}
+            featureName={CONST.POLICY.MORE_FEATURES.ARE_EXPENSIFY_CARDS_ENABLED}
+        >
+            <ScreenWrapper
+                testID={WorkspaceEditCardLimitTypePage.displayName}
+                shouldEnablePickerAvoiding={false}
+                shouldEnableMaxHeight
+            >
+                <HeaderWithBackButton
+                    title={translate('workspace.card.issueNewCard.limitType')}
+                    onBackButtonPress={goBack}
+                />
+                <FullPageOfflineBlockingView>
+                    <SelectionList
+                        ListItem={RadioListItem}
+                        onSelectRow={({value}) => setTypeSelected(value)}
+                        sections={[{data}]}
+                        shouldUpdateFocusedIndex
+                        isAlternateTextMultilineSupported
+                        initiallyFocusedOptionKey={typeSelected}
+                    />
+                    <ConfirmModal
+                        title={translate('workspace.expensifyCard.changeCardLimitType')}
+                        isVisible={isConfirmModalVisible}
+                        onConfirm={updateCardLimitType}
+                        onCancel={() => setIsConfirmModalVisible(false)}
+                        prompt={translate(promptTranslationKey, CurrencyUtils.convertToDisplayString(card?.nameValuePairs?.unapprovedExpenseLimit, CONST.CURRENCY.USD))}
+                        confirmText={translate('workspace.expensifyCard.changeLimitType')}
+                        cancelText={translate('common.cancel')}
+                        danger
+                        shouldEnableNewFocusManagement
+                    />
+                    <Button
+                        success
+                        large
+                        pressOnEnter
+                        text={translate('common.save')}
+                        onPress={submit}
+                        style={styles.m5}
+                    />
+                </FullPageOfflineBlockingView>
+            </ScreenWrapper>
+        </AccessOrNotFoundWrapper>
+    );
+}
+
+WorkspaceEditCardLimitTypePage.displayName = 'WorkspaceEditCardLimitTypePage';
+
+export default WorkspaceEditCardLimitTypePage;
diff --git a/src/pages/workspace/expensifyCard/WorkspaceEditCardNamePage.tsx b/src/pages/workspace/expensifyCard/WorkspaceEditCardNamePage.tsx
new file mode 100644
index 000000000000..c5eb8a53930a
--- /dev/null
+++ b/src/pages/workspace/expensifyCard/WorkspaceEditCardNamePage.tsx
@@ -0,0 +1,88 @@
+import type {StackScreenProps} from '@react-navigation/stack';
+import React from 'react';
+import {useOnyx} from 'react-native-onyx';
+import FormProvider from '@components/Form/FormProvider';
+import InputWrapper from '@components/Form/InputWrapper';
+import type {FormInputErrors, FormOnyxValues} from '@components/Form/types';
+import HeaderWithBackButton from '@components/HeaderWithBackButton';
+import ScreenWrapper from '@components/ScreenWrapper';
+import TextInput from '@components/TextInput';
+import useAutoFocusInput from '@hooks/useAutoFocusInput';
+import useLocalize from '@hooks/useLocalize';
+import useThemeStyles from '@hooks/useThemeStyles';
+import * as PolicyUtils from '@libs/PolicyUtils';
+import * as ValidationUtils from '@libs/ValidationUtils';
+import Navigation from '@navigation/Navigation';
+import type {SettingsNavigatorParamList} from '@navigation/types';
+import AccessOrNotFoundWrapper from '@pages/workspace/AccessOrNotFoundWrapper';
+import * as Card from '@userActions/Card';
+import CONST from '@src/CONST';
+import ONYXKEYS from '@src/ONYXKEYS';
+import ROUTES from '@src/ROUTES';
+import type SCREENS from '@src/SCREENS';
+import INPUT_IDS from '@src/types/form/EditExpensifyCardNameForm';
+
+type WorkspaceEditCardNamePageProps = StackScreenProps<SettingsNavigatorParamList, typeof SCREENS.WORKSPACE.EXPENSIFY_CARD_NAME>;
+
+function WorkspaceEditCardNamePage({route}: WorkspaceEditCardNamePageProps) {
+    const {policyID, cardID} = route.params;
+    const workspaceAccountID = PolicyUtils.getWorkspaceAccountID(policyID);
+
+    const {translate} = useLocalize();
+    const {inputCallbackRef} = useAutoFocusInput();
+    const styles = useThemeStyles();
+
+    const [cardsList] = useOnyx(`${ONYXKEYS.COLLECTION.WORKSPACE_CARDS_LIST}${workspaceAccountID}_${CONST.EXPENSIFY_CARD.BANK}`);
+    const card = cardsList?.[cardID];
+
+    const submit = (values: FormOnyxValues<typeof ONYXKEYS.FORMS.EDIT_EXPENSIFY_CARD_NAME_FORM>) => {
+        Card.updateExpensifyCardTitle(workspaceAccountID, Number(cardID), values[INPUT_IDS.NAME], card?.nameValuePairs?.cardTitle);
+        Navigation.goBack();
+    };
+
+    const validate = (values: FormOnyxValues<typeof ONYXKEYS.FORMS.EDIT_EXPENSIFY_CARD_NAME_FORM>): FormInputErrors<typeof ONYXKEYS.FORMS.EDIT_EXPENSIFY_CARD_NAME_FORM> =>
+        ValidationUtils.getFieldRequiredErrors(values, [INPUT_IDS.NAME]);
+
+    return (
+        <AccessOrNotFoundWrapper
+            accessVariants={[CONST.POLICY.ACCESS_VARIANTS.ADMIN, CONST.POLICY.ACCESS_VARIANTS.PAID]}
+            policyID={policyID}
+            featureName={CONST.POLICY.MORE_FEATURES.ARE_EXPENSIFY_CARDS_ENABLED}
+        >
+            <ScreenWrapper
+                testID={WorkspaceEditCardNamePage.displayName}
+                shouldEnablePickerAvoiding={false}
+                shouldEnableMaxHeight
+            >
+                <HeaderWithBackButton
+                    title={translate('workspace.card.issueNewCard.cardName')}
+                    onBackButtonPress={() => Navigation.goBack(ROUTES.WORKSPACE_EXPENSIFY_CARD_DETAILS.getRoute(policyID, cardID))}
+                />
+                <FormProvider
+                    formID={ONYXKEYS.FORMS.EDIT_EXPENSIFY_CARD_NAME_FORM}
+                    submitButtonText={translate('common.save')}
+                    onSubmit={submit}
+                    style={[styles.flex1, styles.mh5]}
+                    enabledWhenOffline
+                    validate={validate}
+                >
+                    <InputWrapper
+                        InputComponent={TextInput}
+                        inputID={INPUT_IDS.NAME}
+                        label={translate('workspace.card.issueNewCard.cardName')}
+                        hint={translate('workspace.card.issueNewCard.giveItNameInstruction')}
+                        aria-label={translate('workspace.card.issueNewCard.cardName')}
+                        role={CONST.ROLE.PRESENTATION}
+                        defaultValue={card?.nameValuePairs?.cardTitle}
+                        maxLength={CONST.EXPENSIFY_CARD.CARD_TITLE_INPUT_LIMIT}
+                        ref={inputCallbackRef}
+                    />
+                </FormProvider>
+            </ScreenWrapper>
+        </AccessOrNotFoundWrapper>
+    );
+}
+
+WorkspaceEditCardNamePage.displayName = 'WorkspaceEditCardNamePage';
+
+export default WorkspaceEditCardNamePage;
diff --git a/src/pages/workspace/expensifyCard/WorkspaceExpensifyCardBankAccounts.tsx b/src/pages/workspace/expensifyCard/WorkspaceExpensifyCardBankAccounts.tsx
new file mode 100644
index 000000000000..78060487d35f
--- /dev/null
+++ b/src/pages/workspace/expensifyCard/WorkspaceExpensifyCardBankAccounts.tsx
@@ -0,0 +1,103 @@
+import type {StackScreenProps} from '@react-navigation/stack';
+import React from 'react';
+import {View} from 'react-native';
+import {useOnyx} from 'react-native-onyx';
+import HeaderWithBackButton from '@components/HeaderWithBackButton';
+import getBankIcon from '@components/Icon/BankIcons';
+import * as Expensicons from '@components/Icon/Expensicons';
+import MenuItem from '@components/MenuItem';
+import ScreenWrapper from '@components/ScreenWrapper';
+import Text from '@components/Text';
+import useLocalize from '@hooks/useLocalize';
+import useThemeStyles from '@hooks/useThemeStyles';
+import {getLastFourDigits} from '@libs/BankAccountUtils';
+import * as CardUtils from '@libs/CardUtils';
+import * as PolicyUtils from '@libs/PolicyUtils';
+import Navigation from '@navigation/Navigation';
+import type {SettingsNavigatorParamList} from '@navigation/types';
+import * as Card from '@userActions/Card';
+import ONYXKEYS from '@src/ONYXKEYS';
+import ROUTES from '@src/ROUTES';
+import type SCREENS from '@src/SCREENS';
+import type {BankName} from '@src/types/onyx/Bank';
+import {isEmptyObject} from '@src/types/utils/EmptyObject';
+
+type WorkspaceExpensifyCardBankAccountsProps = StackScreenProps<SettingsNavigatorParamList, typeof SCREENS.WORKSPACE.EXPENSIFY_CARD_BANK_ACCOUNT>;
+
+function WorkspaceExpensifyCardBankAccounts({route}: WorkspaceExpensifyCardBankAccountsProps) {
+    const {translate} = useLocalize();
+    const styles = useThemeStyles();
+    const [bankAccountsList] = useOnyx(ONYXKEYS.BANK_ACCOUNT_LIST);
+
+    const policyID = route?.params?.policyID ?? '-1';
+
+    const workspaceAccountID = PolicyUtils.getWorkspaceAccountID(policyID);
+
+    const handleAddBankAccount = () => {
+        Navigation.navigate(ROUTES.BANK_ACCOUNT_WITH_STEP_TO_OPEN.getRoute('new', policyID, ROUTES.WORKSPACE_EXPENSIFY_CARD.getRoute(policyID)));
+    };
+
+    const handleSelectBankAccount = (value?: number) => {
+        Card.configureExpensifyCardsForPolicy(policyID, value);
+        const domainName = PolicyUtils.getDomainNameForPolicy(policyID);
+        Card.updateSettlementAccount(workspaceAccountID, domainName, value);
+        Navigation.navigate(ROUTES.WORKSPACE_EXPENSIFY_CARD_ISSUE_NEW.getRoute(policyID));
+    };
+
+    const renderBankOptions = () => {
+        if (!bankAccountsList || isEmptyObject(bankAccountsList)) {
+            return null;
+        }
+
+        const eligibleBankAccounts = CardUtils.getEligibleBankAccountsForCard(bankAccountsList);
+
+        return eligibleBankAccounts.map((bankAccount) => {
+            const bankName = (bankAccount.accountData?.addressName ?? '') as BankName;
+            const bankAccountNumber = bankAccount.accountData?.accountNumber ?? '';
+            const bankAccountID = bankAccount.accountData?.bankAccountID;
+
+            const {icon, iconSize, iconStyles} = getBankIcon({bankName, styles});
+
+            return (
+                <MenuItem
+                    title={bankName}
+                    description={`${translate('workspace.expensifyCard.accountEndingIn')} ${getLastFourDigits(bankAccountNumber)}`}
+                    onPress={() => handleSelectBankAccount(bankAccountID)}
+                    icon={icon}
+                    iconHeight={iconSize}
+                    iconWidth={iconSize}
+                    iconStyles={iconStyles}
+                    shouldShowRightIcon
+                    displayInDefaultIconColor
+                />
+            );
+        });
+    };
+
+    return (
+        <ScreenWrapper
+            testID={WorkspaceExpensifyCardBankAccounts.displayName}
+            includeSafeAreaPaddingBottom={false}
+            shouldEnablePickerAvoiding={false}
+        >
+            <HeaderWithBackButton
+                shouldShowBackButton
+                onBackButtonPress={() => Navigation.goBack()}
+                title={translate('workspace.expensifyCard.chooseBankAccount')}
+            />
+            <View style={styles.flex1}>
+                <Text style={[styles.mh5, styles.mb3]}>{translate('workspace.expensifyCard.chooseExistingBank')}</Text>
+                {renderBankOptions()}
+                <MenuItem
+                    icon={Expensicons.Plus}
+                    title={translate('workspace.expensifyCard.addNewBankAccount')}
+                    onPress={handleAddBankAccount}
+                />
+            </View>
+        </ScreenWrapper>
+    );
+}
+
+WorkspaceExpensifyCardBankAccounts.displayName = 'WorkspaceExpensifyCardBankAccounts';
+
+export default WorkspaceExpensifyCardBankAccounts;
diff --git a/src/pages/workspace/expensifyCard/WorkspaceExpensifyCardDetailsPage.tsx b/src/pages/workspace/expensifyCard/WorkspaceExpensifyCardDetailsPage.tsx
new file mode 100644
index 000000000000..fe6b21256c0d
--- /dev/null
+++ b/src/pages/workspace/expensifyCard/WorkspaceExpensifyCardDetailsPage.tsx
@@ -0,0 +1,182 @@
+import type {StackScreenProps} from '@react-navigation/stack';
+import React, {useCallback, useEffect, useState} from 'react';
+import {View} from 'react-native';
+import {useOnyx} from 'react-native-onyx';
+import ExpensifyCardImage from '@assets/images/expensify-card.svg';
+import Badge from '@components/Badge';
+import ConfirmModal from '@components/ConfirmModal';
+import DecisionModal from '@components/DecisionModal';
+import HeaderWithBackButton from '@components/HeaderWithBackButton';
+import {FallbackAvatar} from '@components/Icon/Expensicons';
+import * as Expensicons from '@components/Icon/Expensicons';
+import ImageSVG from '@components/ImageSVG';
+import MenuItem from '@components/MenuItem';
+import MenuItemWithTopDescription from '@components/MenuItemWithTopDescription';
+import ScreenWrapper from '@components/ScreenWrapper';
+import ScrollView from '@components/ScrollView';
+import useLocalize from '@hooks/useLocalize';
+import useNetwork from '@hooks/useNetwork';
+import useTheme from '@hooks/useTheme';
+import useThemeStyles from '@hooks/useThemeStyles';
+import useWindowDimensions from '@hooks/useWindowDimensions';
+import * as CardUtils from '@libs/CardUtils';
+import * as CurrencyUtils from '@libs/CurrencyUtils';
+import type {SettingsNavigatorParamList} from '@libs/Navigation/types';
+import * as PersonalDetailsUtils from '@libs/PersonalDetailsUtils';
+import * as PolicyUtils from '@libs/PolicyUtils';
+import Navigation from '@navigation/Navigation';
+import AccessOrNotFoundWrapper from '@pages/workspace/AccessOrNotFoundWrapper';
+import variables from '@styles/variables';
+import * as Card from '@userActions/Card';
+import CONST from '@src/CONST';
+import ONYXKEYS from '@src/ONYXKEYS';
+import ROUTES from '@src/ROUTES';
+import type SCREENS from '@src/SCREENS';
+
+type WorkspaceExpensifyCardDetailsPageProps = StackScreenProps<SettingsNavigatorParamList, typeof SCREENS.WORKSPACE.EXPENSIFY_CARD_DETAILS>;
+
+function WorkspaceExpensifyCardDetailsPage({route}: WorkspaceExpensifyCardDetailsPageProps) {
+    const {policyID, cardID, backTo} = route.params;
+    const workspaceAccountID = PolicyUtils.getWorkspaceAccountID(policyID);
+
+    const [isDeactivateModalVisible, setIsDeactivateModalVisible] = useState(false);
+    const [isOfflineModalVisible, setIsOfflineModalVisible] = useState(false);
+    const {translate} = useLocalize();
+    const {isSmallScreenWidth} = useWindowDimensions();
+    const styles = useThemeStyles();
+    const theme = useTheme();
+
+    const [personalDetails] = useOnyx(ONYXKEYS.PERSONAL_DETAILS_LIST);
+    const [cardsList] = useOnyx(`${ONYXKEYS.COLLECTION.WORKSPACE_CARDS_LIST}${workspaceAccountID}_${CONST.EXPENSIFY_CARD.BANK}`);
+
+    const card = cardsList?.[cardID];
+    const cardholder = personalDetails?.[card?.accountID ?? -1];
+    const isVirtual = !!card?.nameValuePairs?.isVirtual;
+    const formattedAvailableSpendAmount = CurrencyUtils.convertToDisplayString(card?.availableSpend);
+    const formattedLimit = CurrencyUtils.convertToDisplayString(card?.nameValuePairs?.unapprovedExpenseLimit);
+    const displayName = PersonalDetailsUtils.getDisplayNameOrDefault(cardholder);
+    const translationForLimitType = CardUtils.getTranslationKeyForLimitType(card?.nameValuePairs?.limitType);
+
+    const fetchCardDetails = useCallback(() => {
+        Card.openCardDetailsPage(Number(cardID));
+    }, [cardID]);
+
+    const {isOffline} = useNetwork({onReconnect: fetchCardDetails});
+
+    useEffect(() => fetchCardDetails(), [fetchCardDetails]);
+
+    const deactivateCard = () => {
+        setIsDeactivateModalVisible(false);
+        Card.deactivateCard(workspaceAccountID, card);
+        Navigation.goBack();
+    };
+
+    return (
+        <AccessOrNotFoundWrapper
+            accessVariants={[CONST.POLICY.ACCESS_VARIANTS.ADMIN, CONST.POLICY.ACCESS_VARIANTS.PAID]}
+            policyID={policyID}
+            featureName={CONST.POLICY.MORE_FEATURES.ARE_EXPENSIFY_CARDS_ENABLED}
+        >
+            <ScreenWrapper
+                includeSafeAreaPaddingBottom={false}
+                testID={WorkspaceExpensifyCardDetailsPage.displayName}
+            >
+                {({safeAreaPaddingBottomStyle}) => (
+                    <>
+                        <HeaderWithBackButton
+                            title={translate('workspace.expensifyCard.cardDetails')}
+                            onBackButtonPress={() => Navigation.goBack(backTo)}
+                        />
+                        <ScrollView contentContainerStyle={safeAreaPaddingBottomStyle}>
+                            <View style={[styles.walletCard, styles.mb3]}>
+                                <ImageSVG
+                                    contentFit="contain"
+                                    src={ExpensifyCardImage}
+                                    pointerEvents="none"
+                                    height={variables.cardPreviewHeight}
+                                    width={variables.cardPreviewWidth}
+                                />
+                                <Badge
+                                    badgeStyles={styles.cardBadge}
+                                    textStyles={styles.cardBadgeText}
+                                    text={translate(isVirtual ? 'workspace.expensifyCard.virtual' : 'workspace.expensifyCard.physical')}
+                                />
+                            </View>
+
+                            <MenuItem
+                                label={translate('workspace.card.issueNewCard.cardholder')}
+                                title={displayName}
+                                icon={cardholder?.avatar ?? FallbackAvatar}
+                                iconType={CONST.ICON_TYPE_AVATAR}
+                                description={cardholder?.login}
+                                interactive={false}
+                            />
+                            <MenuItemWithTopDescription
+                                description={translate(isVirtual ? 'cardPage.virtualCardNumber' : 'cardPage.physicalCardNumber')}
+                                title={CardUtils.maskCard(card?.lastFourPAN)}
+                                interactive={false}
+                                titleStyle={styles.walletCardNumber}
+                            />
+                            <MenuItemWithTopDescription
+                                description={translate('cardPage.availableSpend')}
+                                title={formattedAvailableSpendAmount}
+                                interactive={false}
+                                titleStyle={styles.newKansasLarge}
+                                containerStyle={isOffline ? styles.buttonOpacityDisabled : null}
+                            />
+                            <MenuItemWithTopDescription
+                                description={translate('workspace.expensifyCard.cardLimit')}
+                                title={formattedLimit}
+                                shouldShowRightIcon
+                                onPress={() => Navigation.navigate(ROUTES.WORKSPACE_EXPENSIFY_CARD_LIMIT.getRoute(policyID, cardID))}
+                            />
+                            <MenuItemWithTopDescription
+                                description={translate('workspace.card.issueNewCard.limitType')}
+                                title={translationForLimitType ? translate(translationForLimitType) : ''}
+                                shouldShowRightIcon
+                                onPress={() => Navigation.navigate(ROUTES.WORKSPACE_EXPENSIFY_CARD_LIMIT_TYPE.getRoute(policyID, cardID))}
+                            />
+                            <MenuItemWithTopDescription
+                                description={translate('workspace.card.issueNewCard.cardName')}
+                                title={card?.nameValuePairs?.cardTitle}
+                                shouldShowRightIcon
+                                onPress={() => Navigation.navigate(ROUTES.WORKSPACE_EXPENSIFY_CARD_NAME.getRoute(policyID, cardID))}
+                            />
+                            <MenuItem
+                                icon={Expensicons.Trashcan}
+                                iconFill={theme.icon}
+                                title={translate('workspace.expensifyCard.deactivate')}
+                                style={styles.mv1}
+                                onPress={() => (isOffline ? setIsOfflineModalVisible(true) : setIsDeactivateModalVisible(true))}
+                            />
+                            <ConfirmModal
+                                title={translate('workspace.card.deactivateCardModal.deactivateCard')}
+                                isVisible={isDeactivateModalVisible}
+                                onConfirm={deactivateCard}
+                                onCancel={() => setIsDeactivateModalVisible(false)}
+                                shouldSetModalVisibility={false}
+                                prompt={translate('workspace.card.deactivateCardModal.deactivateConfirmation')}
+                                confirmText={translate('workspace.card.deactivateCardModal.deactivate')}
+                                cancelText={translate('common.cancel')}
+                                danger
+                            />
+                            <DecisionModal
+                                title={translate('common.youAppearToBeOffline')}
+                                prompt={translate('common.offlinePrompt')}
+                                isSmallScreenWidth={isSmallScreenWidth}
+                                onSecondOptionSubmit={() => setIsOfflineModalVisible(false)}
+                                secondOptionText={translate('common.buttonConfirm')}
+                                isVisible={isOfflineModalVisible}
+                                onClose={() => setIsOfflineModalVisible(false)}
+                            />
+                        </ScrollView>
+                    </>
+                )}
+            </ScreenWrapper>
+        </AccessOrNotFoundWrapper>
+    );
+}
+
+WorkspaceExpensifyCardDetailsPage.displayName = 'WorkspaceExpensifyCardDetailsPage';
+
+export default WorkspaceExpensifyCardDetailsPage;
diff --git a/src/pages/workspace/expensifyCard/WorkspaceExpensifyCardListPage.tsx b/src/pages/workspace/expensifyCard/WorkspaceExpensifyCardListPage.tsx
new file mode 100644
index 000000000000..c27d5a7168ba
--- /dev/null
+++ b/src/pages/workspace/expensifyCard/WorkspaceExpensifyCardListPage.tsx
@@ -0,0 +1,132 @@
+import type {RouteProp} from '@react-navigation/native';
+import React, {useCallback, useMemo} from 'react';
+import type {ListRenderItemInfo} from 'react-native';
+import {FlatList, View} from 'react-native';
+import {useOnyx} from 'react-native-onyx';
+import type {OnyxEntry} from 'react-native-onyx';
+import Button from '@components/Button';
+import HeaderWithBackButton from '@components/HeaderWithBackButton';
+import * as Expensicons from '@components/Icon/Expensicons';
+import * as Illustrations from '@components/Icon/Illustrations';
+import OfflineWithFeedback from '@components/OfflineWithFeedback';
+import {PressableWithFeedback} from '@components/Pressable';
+import ScreenWrapper from '@components/ScreenWrapper';
+import useLocalize from '@hooks/useLocalize';
+import usePolicy from '@hooks/usePolicy';
+import useResponsiveLayout from '@hooks/useResponsiveLayout';
+import useThemeStyles from '@hooks/useThemeStyles';
+import * as CardUtils from '@libs/CardUtils';
+import Navigation from '@navigation/Navigation';
+import type {FullScreenNavigatorParamList} from '@navigation/types';
+import CONST from '@src/CONST';
+import ONYXKEYS from '@src/ONYXKEYS';
+import ROUTES from '@src/ROUTES';
+import type SCREENS from '@src/SCREENS';
+import type {Card, WorkspaceCardsList} from '@src/types/onyx';
+import {isEmptyObject} from '@src/types/utils/EmptyObject';
+import EmptyCardView from './EmptyCardView';
+import WorkspaceCardListHeader from './WorkspaceCardListHeader';
+import WorkspaceCardListRow from './WorkspaceCardListRow';
+
+type WorkspaceExpensifyCardListPageProps = {
+    /** Route from navigation */
+    route: RouteProp<FullScreenNavigatorParamList, typeof SCREENS.WORKSPACE.EXPENSIFY_CARD>;
+
+    /** List of Expensify cards */
+    cardsList: OnyxEntry<WorkspaceCardsList>;
+};
+
+function WorkspaceExpensifyCardListPage({route, cardsList}: WorkspaceExpensifyCardListPageProps) {
+    const {shouldUseNarrowLayout} = useResponsiveLayout();
+    const {translate} = useLocalize();
+    const styles = useThemeStyles();
+
+    const policyID = route.params.policyID;
+    const policy = usePolicy(policyID);
+    const [personalDetails] = useOnyx(ONYXKEYS.PERSONAL_DETAILS_LIST);
+
+    const policyCurrency = useMemo(() => policy?.outputCurrency ?? CONST.CURRENCY.USD, [policy]);
+
+    const sortedCards = useMemo(() => CardUtils.sortCardsByCardholderName(cardsList, personalDetails), [cardsList, personalDetails]);
+
+    const getHeaderButtons = () => (
+        <View style={[styles.w100, styles.flexRow, styles.gap2, shouldUseNarrowLayout && styles.mb3]}>
+            <Button
+                medium
+                success
+                onPress={() => Navigation.navigate(ROUTES.WORKSPACE_EXPENSIFY_CARD_ISSUE_NEW.getRoute(policyID))}
+                icon={Expensicons.Plus}
+                text={translate('workspace.expensifyCard.issueCard')}
+                style={shouldUseNarrowLayout && styles.flex1}
+            />
+            <Button
+                medium
+                onPress={() => Navigation.navigate(ROUTES.WORKSPACE_EXPENSIFY_CARD_SETTINGS.getRoute(policyID))}
+                icon={Expensicons.Gear}
+                text={translate('common.settings')}
+                style={shouldUseNarrowLayout && styles.flex1}
+            />
+        </View>
+    );
+
+    const renderItem = useCallback(
+        ({item, index}: ListRenderItemInfo<Card>) => (
+            <OfflineWithFeedback
+                key={`${item.nameValuePairs?.cardTitle}_${index}`}
+                errorRowStyles={styles.ph5}
+                errors={item.errors}
+            >
+                <PressableWithFeedback
+                    role={CONST.ROLE.BUTTON}
+                    style={[styles.mh5, styles.br3, styles.mb3, styles.highlightBG]}
+                    accessibilityLabel="row"
+                    hoverStyle={[styles.hoveredComponentBG]}
+                    onPress={() => Navigation.navigate(ROUTES.WORKSPACE_EXPENSIFY_CARD_DETAILS.getRoute(policyID, item.cardID.toString()))}
+                >
+                    <WorkspaceCardListRow
+                        lastFourPAN={item.lastFourPAN ?? ''}
+                        cardholder={personalDetails?.[item.accountID ?? '-1']}
+                        limit={item.nameValuePairs?.unapprovedExpenseLimit ?? 0}
+                        name={item.nameValuePairs?.cardTitle ?? ''}
+                        currency={policyCurrency}
+                    />
+                </PressableWithFeedback>
+            </OfflineWithFeedback>
+        ),
+        [personalDetails, policyCurrency, policyID, styles],
+    );
+
+    const renderListHeader = useCallback(() => <WorkspaceCardListHeader policyID={policyID} />, [policyID]);
+
+    return (
+        <ScreenWrapper
+            shouldEnablePickerAvoiding={false}
+            shouldShowOfflineIndicatorInWideScreen
+            shouldEnableMaxHeight
+            testID={WorkspaceExpensifyCardListPage.displayName}
+        >
+            <HeaderWithBackButton
+                icon={Illustrations.HandCard}
+                title={translate('workspace.common.expensifyCard')}
+                shouldShowBackButton={shouldUseNarrowLayout}
+                onBackButtonPress={() => Navigation.goBack()}
+            >
+                {!shouldUseNarrowLayout && getHeaderButtons()}
+            </HeaderWithBackButton>
+            {shouldUseNarrowLayout && <View style={[styles.pl5, styles.pr5]}>{getHeaderButtons()}</View>}
+            {isEmptyObject(cardsList) ? (
+                <EmptyCardView />
+            ) : (
+                <FlatList
+                    data={sortedCards}
+                    renderItem={renderItem}
+                    ListHeaderComponent={renderListHeader}
+                />
+            )}
+        </ScreenWrapper>
+    );
+}
+
+WorkspaceExpensifyCardListPage.displayName = 'WorkspaceExpensifyCardListPage';
+
+export default WorkspaceExpensifyCardListPage;
diff --git a/src/pages/workspace/expensifyCard/WorkspaceExpensifyCardPage.tsx b/src/pages/workspace/expensifyCard/WorkspaceExpensifyCardPage.tsx
new file mode 100644
index 000000000000..b0b517a0aee0
--- /dev/null
+++ b/src/pages/workspace/expensifyCard/WorkspaceExpensifyCardPage.tsx
@@ -0,0 +1,67 @@
+import {useFocusEffect} from '@react-navigation/native';
+import type {StackScreenProps} from '@react-navigation/stack';
+import React, {useCallback} from 'react';
+import {ActivityIndicator} from 'react-native';
+import {useOnyx} from 'react-native-onyx';
+import useNetwork from '@hooks/useNetwork';
+import useTheme from '@hooks/useTheme';
+import useThemeStyles from '@hooks/useThemeStyles';
+import type {FullScreenNavigatorParamList} from '@libs/Navigation/types';
+import * as PolicyUtils from '@libs/PolicyUtils';
+import AccessOrNotFoundWrapper from '@pages/workspace/AccessOrNotFoundWrapper';
+import * as Policy from '@userActions/Policy/Policy';
+import CONST from '@src/CONST';
+import ONYXKEYS from '@src/ONYXKEYS';
+import type SCREENS from '@src/SCREENS';
+import WorkspaceExpensifyCardListPage from './WorkspaceExpensifyCardListPage';
+import WorkspaceExpensifyCardPageEmptyState from './WorkspaceExpensifyCardPageEmptyState';
+
+type WorkspaceExpensifyCardPageProps = StackScreenProps<FullScreenNavigatorParamList, typeof SCREENS.WORKSPACE.EXPENSIFY_CARD>;
+
+function WorkspaceExpensifyCardPage({route}: WorkspaceExpensifyCardPageProps) {
+    const policyID = route.params.policyID ?? '-1';
+    const workspaceAccountID = PolicyUtils.getWorkspaceAccountID(policyID);
+
+    const styles = useThemeStyles();
+    const theme = useTheme();
+    const [cardSettings] = useOnyx(`${ONYXKEYS.COLLECTION.PRIVATE_EXPENSIFY_CARD_SETTINGS}${workspaceAccountID}`);
+    const [cardsList] = useOnyx(`${ONYXKEYS.COLLECTION.WORKSPACE_CARDS_LIST}${workspaceAccountID}_${CONST.EXPENSIFY_CARD.BANK}`);
+
+    const fetchExpensifyCards = useCallback(() => {
+        Policy.openPolicyExpensifyCardsPage(policyID, workspaceAccountID);
+    }, [policyID, workspaceAccountID]);
+
+    const {isOffline} = useNetwork({onReconnect: fetchExpensifyCards});
+
+    useFocusEffect(fetchExpensifyCards);
+
+    const paymentBankAccountID = cardSettings?.paymentBankAccountID ?? 0;
+    const isLoading = !isOffline && (!cardSettings || (cardSettings.isLoading && Object.keys(cardSettings).length === 1));
+
+    return (
+        <AccessOrNotFoundWrapper
+            accessVariants={[CONST.POLICY.ACCESS_VARIANTS.ADMIN, CONST.POLICY.ACCESS_VARIANTS.PAID]}
+            policyID={route.params.policyID}
+            featureName={CONST.POLICY.MORE_FEATURES.ARE_EXPENSIFY_CARDS_ENABLED}
+        >
+            {isLoading && (
+                <ActivityIndicator
+                    size={CONST.ACTIVITY_INDICATOR_SIZE.LARGE}
+                    style={styles.flex1}
+                    color={theme.spinner}
+                />
+            )}
+            {!!paymentBankAccountID && !isLoading && (
+                <WorkspaceExpensifyCardListPage
+                    cardsList={cardsList}
+                    route={route}
+                />
+            )}
+            {!paymentBankAccountID && !isLoading && <WorkspaceExpensifyCardPageEmptyState route={route} />}
+        </AccessOrNotFoundWrapper>
+    );
+}
+
+WorkspaceExpensifyCardPage.displayName = 'WorkspaceExpensifyCardPage';
+
+export default WorkspaceExpensifyCardPage;
diff --git a/src/pages/workspace/expensifyCard/WorkspaceExpensifyCardPageEmptyState.tsx b/src/pages/workspace/expensifyCard/WorkspaceExpensifyCardPageEmptyState.tsx
new file mode 100644
index 000000000000..4d4a2927d194
--- /dev/null
+++ b/src/pages/workspace/expensifyCard/WorkspaceExpensifyCardPageEmptyState.tsx
@@ -0,0 +1,92 @@
+import type {StackScreenProps} from '@react-navigation/stack';
+import React, {useCallback} from 'react';
+import {View} from 'react-native';
+import {useOnyx} from 'react-native-onyx';
+import FeatureList from '@components/FeatureList';
+import type {FeatureListItem} from '@components/FeatureList';
+import * as Illustrations from '@components/Icon/Illustrations';
+import useLocalize from '@hooks/useLocalize';
+import useResponsiveLayout from '@hooks/useResponsiveLayout';
+import useTheme from '@hooks/useTheme';
+import useThemeStyles from '@hooks/useThemeStyles';
+import * as CardUtils from '@libs/CardUtils';
+import type {FullScreenNavigatorParamList} from '@libs/Navigation/types';
+import Navigation from '@navigation/Navigation';
+import type {WithPolicyAndFullscreenLoadingProps} from '@pages/workspace/withPolicyAndFullscreenLoading';
+import withPolicyAndFullscreenLoading from '@pages/workspace/withPolicyAndFullscreenLoading';
+import WorkspacePageWithSections from '@pages/workspace/WorkspacePageWithSections';
+import CONST from '@src/CONST';
+import ONYXKEYS from '@src/ONYXKEYS';
+import ROUTES from '@src/ROUTES';
+import type SCREENS from '@src/SCREENS';
+import {isEmptyObject} from '@src/types/utils/EmptyObject';
+
+const expensifyCardFeatures: FeatureListItem[] = [
+    {
+        icon: Illustrations.MoneyReceipts,
+        translationKey: 'workspace.moreFeatures.expensifyCard.feed.features.cashBack',
+    },
+    {
+        icon: Illustrations.CreditCardsNew,
+        translationKey: 'workspace.moreFeatures.expensifyCard.feed.features.unlimited',
+    },
+    {
+        icon: Illustrations.MoneyWings,
+        translationKey: 'workspace.moreFeatures.expensifyCard.feed.features.spend',
+    },
+];
+type WorkspaceExpensifyCardPageEmptyStateProps = {
+    route: StackScreenProps<FullScreenNavigatorParamList, typeof SCREENS.WORKSPACE.EXPENSIFY_CARD>['route'];
+} & WithPolicyAndFullscreenLoadingProps;
+
+function WorkspaceExpensifyCardPageEmptyState({route, policy}: WorkspaceExpensifyCardPageEmptyStateProps) {
+    const {translate} = useLocalize();
+    const styles = useThemeStyles();
+    const theme = useTheme();
+    const {shouldUseNarrowLayout} = useResponsiveLayout();
+    const [bankAccountList] = useOnyx(ONYXKEYS.BANK_ACCOUNT_LIST);
+    const [reimbursementAccount] = useOnyx(ONYXKEYS.REIMBURSEMENT_ACCOUNT);
+
+    const eligibleBankAccounts = CardUtils.getEligibleBankAccountsForCard(bankAccountList ?? {});
+
+    const reimbursementAccountStatus = reimbursementAccount?.achData?.state ?? '';
+    const isSetupUnfinished = isEmptyObject(bankAccountList) && reimbursementAccountStatus && reimbursementAccountStatus !== CONST.BANK_ACCOUNT.STATE.OPEN;
+
+    const startFlow = useCallback(() => {
+        if (!eligibleBankAccounts.length || isSetupUnfinished) {
+            Navigation.navigate(ROUTES.BANK_ACCOUNT_WITH_STEP_TO_OPEN.getRoute('', policy?.id, ROUTES.WORKSPACE_EXPENSIFY_CARD.getRoute(policy?.id ?? '-1')));
+        } else {
+            Navigation.navigate(ROUTES.WORKSPACE_EXPENSIFY_CARD_BANK_ACCOUNT.getRoute(policy?.id ?? '-1'));
+        }
+    }, [eligibleBankAccounts.length, isSetupUnfinished, policy?.id]);
+
+    return (
+        <WorkspacePageWithSections
+            shouldUseScrollView
+            icon={Illustrations.HandCard}
+            headerText={translate('workspace.common.expensifyCard')}
+            route={route}
+            guidesCallTaskID={CONST.GUIDES_CALL_TASK_IDS.WORKSPACE_EXPENSIFY_CARD}
+            shouldShowOfflineIndicatorInWideScreen
+        >
+            <View style={[styles.mt3, shouldUseNarrowLayout ? styles.workspaceSectionMobile : styles.workspaceSection]}>
+                <FeatureList
+                    menuItems={expensifyCardFeatures}
+                    title={translate('workspace.moreFeatures.expensifyCard.feed.title')}
+                    subtitle={translate('workspace.moreFeatures.expensifyCard.feed.subTitle')}
+                    ctaText={translate(isSetupUnfinished ? 'workspace.expensifyCard.finishSetup' : 'workspace.expensifyCard.issueNewCard')}
+                    ctaAccessibilityLabel={translate('workspace.moreFeatures.expensifyCard.feed.ctaTitle')}
+                    onCtaPress={startFlow}
+                    illustrationBackgroundColor={theme.fallbackIconColor}
+                    illustration={Illustrations.ExpensifyCardIllustration}
+                    illustrationStyle={styles.expensifyCardIllustrationContainer}
+                    titleStyles={styles.textHeadlineH1}
+                />
+            </View>
+        </WorkspacePageWithSections>
+    );
+}
+
+WorkspaceExpensifyCardPageEmptyState.displayName = 'WorkspaceExpensifyCardPageEmptyState';
+
+export default withPolicyAndFullscreenLoading(WorkspaceExpensifyCardPageEmptyState);
diff --git a/src/pages/workspace/expensifyCard/WorkspaceSettlementAccountPage.tsx b/src/pages/workspace/expensifyCard/WorkspaceSettlementAccountPage.tsx
new file mode 100644
index 000000000000..298d0c1c54f9
--- /dev/null
+++ b/src/pages/workspace/expensifyCard/WorkspaceSettlementAccountPage.tsx
@@ -0,0 +1,128 @@
+import type {StackScreenProps} from '@react-navigation/stack';
+import React, {useMemo} from 'react';
+import {View} from 'react-native';
+import {useOnyx} from 'react-native-onyx';
+import HeaderWithBackButton from '@components/HeaderWithBackButton';
+import Icon from '@components/Icon';
+import getBankIcon from '@components/Icon/BankIcons';
+import ScreenWrapper from '@components/ScreenWrapper';
+import ScrollView from '@components/ScrollView';
+import SelectionList from '@components/SelectionList';
+import RadioListItem from '@components/SelectionList/RadioListItem';
+import Text from '@components/Text';
+import TextLink from '@components/TextLink';
+import useLocalize from '@hooks/useLocalize';
+import useThemeStyles from '@hooks/useThemeStyles';
+import * as AccountingUtils from '@libs/AccountingUtils';
+import {getLastFourDigits} from '@libs/BankAccountUtils';
+import * as CardUtils from '@libs/CardUtils';
+import * as PolicyUtils from '@libs/PolicyUtils';
+import Navigation from '@navigation/Navigation';
+import type {SettingsNavigatorParamList} from '@navigation/types';
+import AccessOrNotFoundWrapper from '@pages/workspace/AccessOrNotFoundWrapper';
+import * as Card from '@userActions/Card';
+import CONST from '@src/CONST';
+import ONYXKEYS from '@src/ONYXKEYS';
+import ROUTES from '@src/ROUTES';
+import type SCREENS from '@src/SCREENS';
+import type {BankName} from '@src/types/onyx/Bank';
+import type {ConnectionName} from '@src/types/onyx/Policy';
+
+type WorkspaceSettlementAccountPageProps = StackScreenProps<SettingsNavigatorParamList, typeof SCREENS.WORKSPACE.EXPENSIFY_CARD_SETTINGS_ACCOUNT>;
+
+function WorkspaceSettlementAccountPage({route}: WorkspaceSettlementAccountPageProps) {
+    const styles = useThemeStyles();
+    const {translate} = useLocalize();
+    const policyID = route.params?.policyID ?? '-1';
+    const workspaceAccountID = PolicyUtils.getWorkspaceAccountID(policyID);
+
+    const [bankAccountsList] = useOnyx(ONYXKEYS.BANK_ACCOUNT_LIST);
+    const [cardSettings] = useOnyx(`${ONYXKEYS.COLLECTION.PRIVATE_EXPENSIFY_CARD_SETTINGS}${workspaceAccountID}`);
+    const [isUsedContinuousReconciliation] = useOnyx(`${ONYXKEYS.COLLECTION.EXPENSIFY_CARD_USE_CONTINUOUS_RECONCILIATION}${workspaceAccountID}`);
+    const [reconciliationConnection] = useOnyx(`${ONYXKEYS.COLLECTION.EXPENSIFY_CARD_CONTINUOUS_RECONCILIATION_CONNECTION}${workspaceAccountID}`);
+
+    const connectionName = reconciliationConnection ?? '';
+    const connectionParam = AccountingUtils.getRouteParamForConnection(connectionName as ConnectionName);
+
+    const paymentBankAccountID = cardSettings?.paymentBankAccountID ?? 0;
+    const paymentBankAccountNumber = bankAccountsList?.[paymentBankAccountID.toString()]?.accountData?.accountNumber ?? '';
+
+    const eligibleBankAccounts = CardUtils.getEligibleBankAccountsForCard(bankAccountsList ?? {});
+
+    const data = useMemo(() => {
+        const options = eligibleBankAccounts.map((bankAccount) => {
+            const bankName = (bankAccount.accountData?.addressName ?? '') as BankName;
+            const bankAccountNumber = bankAccount.accountData?.accountNumber ?? '';
+
+            const {icon, iconSize, iconStyles} = getBankIcon({bankName, styles});
+
+            return {
+                value: bankAccount.accountData?.bankAccountID,
+                text: bankAccount.title,
+                leftElement: icon && (
+                    <View style={[styles.flexRow, styles.alignItemsCenter, styles.mr3]}>
+                        <Icon
+                            src={icon}
+                            width={iconSize}
+                            height={iconSize}
+                            additionalStyles={iconStyles}
+                        />
+                    </View>
+                ),
+                alternateText: `${translate('workspace.expensifyCard.accountEndingIn')} ${getLastFourDigits(bankAccountNumber)}`,
+                keyForList: bankAccount.accountData?.bankAccountID?.toString(),
+                isSelected: bankAccount.accountData?.bankAccountID === paymentBankAccountID,
+            };
+        });
+        return options;
+    }, [eligibleBankAccounts, paymentBankAccountID, styles, translate]);
+
+    const updateSettlementAccount = (value: number) => {
+        const domainName = PolicyUtils.getDomainNameForPolicy(policyID);
+        Card.updateSettlementAccount(workspaceAccountID, domainName, value, paymentBankAccountID);
+        Navigation.goBack();
+    };
+
+    return (
+        <AccessOrNotFoundWrapper
+            accessVariants={[CONST.POLICY.ACCESS_VARIANTS.ADMIN, CONST.POLICY.ACCESS_VARIANTS.PAID]}
+            policyID={policyID}
+            featureName={CONST.POLICY.MORE_FEATURES.ARE_EXPENSIFY_CARDS_ENABLED}
+        >
+            <ScreenWrapper
+                testID={WorkspaceSettlementAccountPage.displayName}
+                includeSafeAreaPaddingBottom={false}
+                shouldEnableMaxHeight
+            >
+                <HeaderWithBackButton
+                    title={translate('workspace.expensifyCard.settlementAccount')}
+                    onBackButtonPress={() => Navigation.goBack(ROUTES.WORKSPACE_EXPENSIFY_CARD_SETTINGS.getRoute(policyID))}
+                />
+                <ScrollView>
+                    <Text style={[styles.mh5, styles.mv4]}>{translate('workspace.expensifyCard.settlementAccountDescription')}</Text>
+                    {isUsedContinuousReconciliation && (
+                        <Text style={[styles.mh5, styles.mb6]}>
+                            <Text>{translate('workspace.expensifyCard.settlementAccountInfoPt1')}</Text>{' '}
+                            <TextLink onPress={() => Navigation.navigate(ROUTES.WORKSPACE_ACCOUNTING_RECONCILIATION_ACCOUNT_SETTINGS.getRoute(policyID, connectionParam))}>
+                                {translate('workspace.expensifyCard.reconciliationAccount')}
+                            </TextLink>{' '}
+                            <Text>{`(${CONST.MASKED_PAN_PREFIX}${getLastFourDigits(paymentBankAccountNumber)}) `}</Text>
+                            <Text>{translate('workspace.expensifyCard.settlementAccountInfoPt2')}</Text>
+                        </Text>
+                    )}
+                    <SelectionList
+                        sections={[{data}]}
+                        ListItem={RadioListItem}
+                        onSelectRow={({value}) => updateSettlementAccount(value ?? 0)}
+                        shouldSingleExecuteRowSelect
+                        initiallyFocusedOptionKey={paymentBankAccountID.toString()}
+                    />
+                </ScrollView>
+            </ScreenWrapper>
+        </AccessOrNotFoundWrapper>
+    );
+}
+
+WorkspaceSettlementAccountPage.displayName = 'WorkspaceSettlementAccountPage';
+
+export default WorkspaceSettlementAccountPage;
diff --git a/src/pages/workspace/expensifyCard/WorkspaceSettlementFrequencyPage.tsx b/src/pages/workspace/expensifyCard/WorkspaceSettlementFrequencyPage.tsx
new file mode 100644
index 000000000000..84f1bb810af2
--- /dev/null
+++ b/src/pages/workspace/expensifyCard/WorkspaceSettlementFrequencyPage.tsx
@@ -0,0 +1,91 @@
+import type {StackScreenProps} from '@react-navigation/stack';
+import React, {useMemo} from 'react';
+import {useOnyx} from 'react-native-onyx';
+import type {ValueOf} from 'type-fest';
+import HeaderWithBackButton from '@components/HeaderWithBackButton';
+import ScreenWrapper from '@components/ScreenWrapper';
+import SelectionList from '@components/SelectionList';
+import RadioListItem from '@components/SelectionList/RadioListItem';
+import Text from '@components/Text';
+import useLocalize from '@hooks/useLocalize';
+import useThemeStyles from '@hooks/useThemeStyles';
+import * as PolicyUtils from '@libs/PolicyUtils';
+import Navigation from '@navigation/Navigation';
+import type {SettingsNavigatorParamList} from '@navigation/types';
+import AccessOrNotFoundWrapper from '@pages/workspace/AccessOrNotFoundWrapper';
+import * as Card from '@userActions/Card';
+import CONST from '@src/CONST';
+import ONYXKEYS from '@src/ONYXKEYS';
+import ROUTES from '@src/ROUTES';
+import type SCREENS from '@src/SCREENS';
+
+type WorkspaceSettlementFrequencyPageProps = StackScreenProps<SettingsNavigatorParamList, typeof SCREENS.WORKSPACE.EXPENSIFY_CARD_SETTINGS_FREQUENCY>;
+
+function WorkspaceSettlementFrequencyPage({route}: WorkspaceSettlementFrequencyPageProps) {
+    const styles = useThemeStyles();
+    const {translate} = useLocalize();
+    const policyID = route.params?.policyID ?? '-1';
+    const workspaceAccountID = PolicyUtils.getWorkspaceAccountID(policyID);
+
+    const [cardSettings] = useOnyx(`${ONYXKEYS.COLLECTION.PRIVATE_EXPENSIFY_CARD_SETTINGS}${workspaceAccountID}`);
+
+    const shouldShowMonthlyOption = cardSettings?.isMonthlySettlementAllowed ?? false;
+    const selectedFrequency = cardSettings?.monthlySettlementDate ? CONST.EXPENSIFY_CARD.FREQUENCY_SETTING.MONTHLY : CONST.EXPENSIFY_CARD.FREQUENCY_SETTING.DAILY;
+
+    const data = useMemo(() => {
+        const options = [];
+
+        options.push({
+            value: CONST.EXPENSIFY_CARD.FREQUENCY_SETTING.DAILY,
+            text: translate('workspace.expensifyCard.frequency.daily'),
+            keyForList: CONST.EXPENSIFY_CARD.FREQUENCY_SETTING.DAILY,
+            isSelected: selectedFrequency === CONST.EXPENSIFY_CARD.FREQUENCY_SETTING.DAILY,
+        });
+
+        if (shouldShowMonthlyOption) {
+            options.push({
+                value: CONST.EXPENSIFY_CARD.FREQUENCY_SETTING.MONTHLY,
+                text: translate('workspace.expensifyCard.frequency.monthly'),
+                keyForList: CONST.EXPENSIFY_CARD.FREQUENCY_SETTING.MONTHLY,
+                isSelected: selectedFrequency === CONST.EXPENSIFY_CARD.FREQUENCY_SETTING.MONTHLY,
+            });
+        }
+
+        return options;
+    }, [translate, shouldShowMonthlyOption, selectedFrequency]);
+
+    const updateSettlementFrequency = (value: ValueOf<typeof CONST.EXPENSIFY_CARD.FREQUENCY_SETTING>) => {
+        Card.updateSettlementFrequency(workspaceAccountID, value, cardSettings?.monthlySettlementDate);
+    };
+
+    return (
+        <AccessOrNotFoundWrapper
+            accessVariants={[CONST.POLICY.ACCESS_VARIANTS.ADMIN, CONST.POLICY.ACCESS_VARIANTS.PAID]}
+            policyID={policyID}
+            featureName={CONST.POLICY.MORE_FEATURES.ARE_EXPENSIFY_CARDS_ENABLED}
+        >
+            <ScreenWrapper
+                testID={WorkspaceSettlementFrequencyPage.displayName}
+                includeSafeAreaPaddingBottom={false}
+                shouldEnableMaxHeight
+            >
+                <HeaderWithBackButton
+                    title={translate('workspace.expensifyCard.settlementFrequency')}
+                    onBackButtonPress={() => Navigation.goBack(ROUTES.WORKSPACE_EXPENSIFY_CARD_SETTINGS.getRoute(policyID))}
+                />
+                <Text style={[styles.mh5, styles.mv4]}>{translate('workspace.expensifyCard.settlementFrequencyDescription')}</Text>
+                <SelectionList
+                    sections={[{data}]}
+                    ListItem={RadioListItem}
+                    onSelectRow={({value}) => updateSettlementFrequency(value)}
+                    shouldSingleExecuteRowSelect
+                    initiallyFocusedOptionKey={selectedFrequency}
+                />
+            </ScreenWrapper>
+        </AccessOrNotFoundWrapper>
+    );
+}
+
+WorkspaceSettlementFrequencyPage.displayName = 'WorkspaceSettlementFrequencyPage';
+
+export default WorkspaceSettlementFrequencyPage;
diff --git a/src/pages/workspace/expensifyCard/issueNew/AssigneeStep.tsx b/src/pages/workspace/expensifyCard/issueNew/AssigneeStep.tsx
new file mode 100644
index 000000000000..52b3c58cd7da
--- /dev/null
+++ b/src/pages/workspace/expensifyCard/issueNew/AssigneeStep.tsx
@@ -0,0 +1,161 @@
+import React, {useMemo} from 'react';
+import {View} from 'react-native';
+import type {OnyxEntry} from 'react-native-onyx';
+import {useOnyx} from 'react-native-onyx';
+import HeaderWithBackButton from '@components/HeaderWithBackButton';
+import * as Expensicons from '@components/Icon/Expensicons';
+import InteractiveStepSubHeader from '@components/InteractiveStepSubHeader';
+import ScreenWrapper from '@components/ScreenWrapper';
+import SelectionList from '@components/SelectionList';
+import type {ListItem} from '@components/SelectionList/types';
+import UserListItem from '@components/SelectionList/UserListItem';
+import Text from '@components/Text';
+import useDebouncedState from '@hooks/useDebouncedState';
+import useLocalize from '@hooks/useLocalize';
+import useNetwork from '@hooks/useNetwork';
+import useThemeStyles from '@hooks/useThemeStyles';
+import {formatPhoneNumber} from '@libs/LocalePhoneNumber';
+import * as OptionsListUtils from '@libs/OptionsListUtils';
+import * as PersonalDetailsUtils from '@libs/PersonalDetailsUtils';
+import * as PolicyUtils from '@libs/PolicyUtils';
+import Navigation from '@navigation/Navigation';
+import * as Card from '@userActions/Card';
+import CONST from '@src/CONST';
+import ONYXKEYS from '@src/ONYXKEYS';
+import type * as OnyxTypes from '@src/types/onyx';
+
+const MINIMUM_MEMBER_TO_SHOW_SEARCH = 8;
+
+type AssigneeStepProps = {
+    // The policy that the card will be issued under
+    policy: OnyxEntry<OnyxTypes.Policy>;
+};
+
+function AssigneeStep({policy}: AssigneeStepProps) {
+    const {translate} = useLocalize();
+    const styles = useThemeStyles();
+    const {isOffline} = useNetwork();
+    const [issueNewCard] = useOnyx(ONYXKEYS.ISSUE_NEW_EXPENSIFY_CARD);
+
+    const isEditing = issueNewCard?.isEditing;
+
+    const [searchTerm, debouncedSearchTerm, setSearchTerm] = useDebouncedState('');
+
+    const submit = (assignee: ListItem) => {
+        Card.setIssueNewCardStepAndData({
+            step: isEditing ? CONST.EXPENSIFY_CARD.STEP.CONFIRMATION : CONST.EXPENSIFY_CARD.STEP.CARD_TYPE,
+            data: {
+                assigneeEmail: assignee?.login ?? '',
+            },
+            isEditing: false,
+        });
+    };
+
+    const handleBackButtonPress = () => {
+        if (isEditing) {
+            Card.setIssueNewCardStepAndData({step: CONST.EXPENSIFY_CARD.STEP.CONFIRMATION, isEditing: false});
+            return;
+        }
+        Navigation.goBack();
+        Card.clearIssueNewCardFlow();
+    };
+
+    const shouldShowSearchInput = policy?.employeeList && Object.keys(policy.employeeList).length >= MINIMUM_MEMBER_TO_SHOW_SEARCH;
+    const textInputLabel = shouldShowSearchInput ? translate('workspace.card.issueNewCard.findMember') : undefined;
+
+    const membersDetails = useMemo(() => {
+        let membersList: ListItem[] = [];
+        if (!policy?.employeeList) {
+            return membersList;
+        }
+
+        Object.entries(policy.employeeList ?? {}).forEach(([email, policyEmployee]) => {
+            if (PolicyUtils.isDeletedPolicyEmployee(policyEmployee, isOffline)) {
+                return;
+            }
+
+            const personalDetail = PersonalDetailsUtils.getPersonalDetailByEmail(email);
+            membersList.push({
+                keyForList: email,
+                text: personalDetail?.displayName,
+                alternateText: email,
+                login: email,
+                accountID: personalDetail?.accountID,
+                icons: [
+                    {
+                        source: personalDetail?.avatar ?? Expensicons.FallbackAvatar,
+                        name: formatPhoneNumber(email),
+                        type: CONST.ICON_TYPE_AVATAR,
+                        id: personalDetail?.accountID,
+                    },
+                ],
+            });
+        });
+
+        membersList = OptionsListUtils.sortAlphabetically(membersList, 'text');
+
+        return membersList;
+    }, [isOffline, policy?.employeeList]);
+
+    const sections = useMemo(() => {
+        if (!debouncedSearchTerm) {
+            return [
+                {
+                    data: membersDetails,
+                    shouldShow: true,
+                },
+            ];
+        }
+
+        const searchValue = OptionsListUtils.getSearchValueForPhoneOrEmail(debouncedSearchTerm).toLowerCase();
+        const filteredOptions = membersDetails.filter((option) => !!option.text?.toLowerCase().includes(searchValue) || !!option.alternateText?.toLowerCase().includes(searchValue));
+
+        return [
+            {
+                title: undefined,
+                data: filteredOptions,
+                shouldShow: true,
+            },
+        ];
+    }, [membersDetails, debouncedSearchTerm]);
+
+    const headerMessage = useMemo(() => {
+        const searchValue = debouncedSearchTerm.trim().toLowerCase();
+
+        return OptionsListUtils.getHeaderMessage(sections[0].data.length !== 0, false, searchValue);
+    }, [debouncedSearchTerm, sections]);
+
+    return (
+        <ScreenWrapper
+            testID={AssigneeStep.displayName}
+            includeSafeAreaPaddingBottom={false}
+            shouldEnablePickerAvoiding={false}
+            shouldEnableMaxHeight
+        >
+            <HeaderWithBackButton
+                title={translate('workspace.card.issueCard')}
+                onBackButtonPress={handleBackButtonPress}
+            />
+            <View style={[styles.ph5, styles.mb5, styles.mt3, {height: CONST.BANK_ACCOUNT.STEPS_HEADER_HEIGHT}]}>
+                <InteractiveStepSubHeader
+                    startStepIndex={0}
+                    stepNames={CONST.EXPENSIFY_CARD.STEP_NAMES}
+                />
+            </View>
+            <Text style={[styles.textHeadlineLineHeightXXL, styles.ph5, styles.mv3]}>{translate('workspace.card.issueNewCard.whoNeedsCard')}</Text>
+            <SelectionList
+                textInputLabel={textInputLabel}
+                textInputValue={searchTerm}
+                onChangeText={setSearchTerm}
+                sections={sections}
+                headerMessage={headerMessage}
+                ListItem={UserListItem}
+                onSelectRow={submit}
+            />
+        </ScreenWrapper>
+    );
+}
+
+AssigneeStep.displayName = 'AssigneeStep';
+
+export default AssigneeStep;
diff --git a/src/pages/workspace/expensifyCard/issueNew/CardNameStep.tsx b/src/pages/workspace/expensifyCard/issueNew/CardNameStep.tsx
new file mode 100644
index 000000000000..556f512c725d
--- /dev/null
+++ b/src/pages/workspace/expensifyCard/issueNew/CardNameStep.tsx
@@ -0,0 +1,103 @@
+import React, {useCallback} from 'react';
+import {View} from 'react-native';
+import {useOnyx} from 'react-native-onyx';
+import FormProvider from '@components/Form/FormProvider';
+import InputWrapper from '@components/Form/InputWrapper';
+import type {FormInputErrors, FormOnyxValues} from '@components/Form/types';
+import HeaderWithBackButton from '@components/HeaderWithBackButton';
+import InteractiveStepSubHeader from '@components/InteractiveStepSubHeader';
+import ScreenWrapper from '@components/ScreenWrapper';
+import Text from '@components/Text';
+import TextInput from '@components/TextInput';
+import useAutoFocusInput from '@hooks/useAutoFocusInput';
+import useLocalize from '@hooks/useLocalize';
+import useThemeStyles from '@hooks/useThemeStyles';
+import * as ValidationUtils from '@libs/ValidationUtils';
+import * as Card from '@userActions/Card';
+import CONST from '@src/CONST';
+import ONYXKEYS from '@src/ONYXKEYS';
+import INPUT_IDS from '@src/types/form/IssueNewExpensifyCardForm';
+
+function CardNameStep() {
+    const {translate} = useLocalize();
+    const styles = useThemeStyles();
+    const {inputCallbackRef} = useAutoFocusInput();
+    const [issueNewCard] = useOnyx(ONYXKEYS.ISSUE_NEW_EXPENSIFY_CARD);
+
+    const isEditing = issueNewCard?.isEditing;
+
+    const validate = useCallback(
+        (values: FormOnyxValues<typeof ONYXKEYS.FORMS.ISSUE_NEW_EXPENSIFY_CARD_FORM>): FormInputErrors<typeof ONYXKEYS.FORMS.ISSUE_NEW_EXPENSIFY_CARD_FORM> => {
+            const errors = ValidationUtils.getFieldRequiredErrors(values, [INPUT_IDS.CARD_TITLE]);
+            if (!values.cardTitle) {
+                errors.cardTitle = translate('common.error.fieldRequired');
+            }
+            return errors;
+        },
+        [translate],
+    );
+
+    const submit = useCallback((values: FormOnyxValues<typeof ONYXKEYS.FORMS.ISSUE_NEW_EXPENSIFY_CARD_FORM>) => {
+        Card.setIssueNewCardStepAndData({
+            step: CONST.EXPENSIFY_CARD.STEP.CONFIRMATION,
+            data: {
+                cardTitle: values.cardTitle,
+            },
+            isEditing: false,
+        });
+    }, []);
+
+    const handleBackButtonPress = useCallback(() => {
+        if (isEditing) {
+            Card.setIssueNewCardStepAndData({step: CONST.EXPENSIFY_CARD.STEP.CONFIRMATION, isEditing: false});
+            return;
+        }
+        Card.setIssueNewCardStepAndData({step: CONST.EXPENSIFY_CARD.STEP.LIMIT});
+    }, [isEditing]);
+
+    return (
+        <ScreenWrapper
+            testID={CardNameStep.displayName}
+            includeSafeAreaPaddingBottom={false}
+            shouldEnablePickerAvoiding={false}
+            shouldEnableMaxHeight
+        >
+            <HeaderWithBackButton
+                title={translate('workspace.card.issueCard')}
+                onBackButtonPress={handleBackButtonPress}
+            />
+            <View style={[styles.ph5, styles.mb5, styles.mt3, {height: CONST.BANK_ACCOUNT.STEPS_HEADER_HEIGHT}]}>
+                <InteractiveStepSubHeader
+                    startStepIndex={4}
+                    stepNames={CONST.EXPENSIFY_CARD.STEP_NAMES}
+                />
+            </View>
+            <Text style={[styles.textHeadlineLineHeightXXL, styles.ph5, styles.mv3]}>{translate('workspace.card.issueNewCard.giveItName')}</Text>
+            <FormProvider
+                formID={ONYXKEYS.FORMS.ISSUE_NEW_EXPENSIFY_CARD_FORM}
+                submitButtonText={translate(isEditing ? 'common.confirm' : 'common.next')}
+                onSubmit={submit}
+                validate={validate}
+                style={[styles.mh5, styles.flexGrow1]}
+                enabledWhenOffline
+            >
+                <InputWrapper
+                    InputComponent={TextInput}
+                    inputID={INPUT_IDS.CARD_TITLE}
+                    label={translate('workspace.card.issueNewCard.cardName')}
+                    hint={translate('workspace.card.issueNewCard.giveItNameInstruction')}
+                    aria-label={translate('workspace.card.issueNewCard.cardName')}
+                    role={CONST.ROLE.PRESENTATION}
+                    // TODO: default value for card name
+                    defaultValue={issueNewCard?.data?.cardTitle}
+                    containerStyles={[styles.mb6]}
+                    ref={inputCallbackRef}
+                />
+            </FormProvider>
+        </ScreenWrapper>
+    );
+}
+
+CardNameStep.displayName = 'CardNameStep';
+
+export default CardNameStep;
diff --git a/src/pages/workspace/expensifyCard/issueNew/CardTypeStep.tsx b/src/pages/workspace/expensifyCard/issueNew/CardTypeStep.tsx
new file mode 100644
index 000000000000..fd1fb5a7586f
--- /dev/null
+++ b/src/pages/workspace/expensifyCard/issueNew/CardTypeStep.tsx
@@ -0,0 +1,94 @@
+import React from 'react';
+import {View} from 'react-native';
+import {useOnyx} from 'react-native-onyx';
+import type {ValueOf} from 'type-fest';
+import HeaderWithBackButton from '@components/HeaderWithBackButton';
+import * as Illustrations from '@components/Icon/Illustrations';
+import InteractiveStepSubHeader from '@components/InteractiveStepSubHeader';
+import MenuItem from '@components/MenuItem';
+import ScreenWrapper from '@components/ScreenWrapper';
+import Text from '@components/Text';
+import useLocalize from '@hooks/useLocalize';
+import useThemeStyles from '@hooks/useThemeStyles';
+import variables from '@styles/variables';
+import * as Card from '@userActions/Card';
+import CONST from '@src/CONST';
+import ONYXKEYS from '@src/ONYXKEYS';
+
+function CardTypeStep() {
+    const {translate} = useLocalize();
+    const styles = useThemeStyles();
+    const [issueNewCard] = useOnyx(ONYXKEYS.ISSUE_NEW_EXPENSIFY_CARD);
+
+    const isEditing = issueNewCard?.isEditing;
+
+    const submit = (value: ValueOf<typeof CONST.EXPENSIFY_CARD.CARD_TYPE>) => {
+        Card.setIssueNewCardStepAndData({
+            step: isEditing ? CONST.EXPENSIFY_CARD.STEP.CONFIRMATION : CONST.EXPENSIFY_CARD.STEP.LIMIT_TYPE,
+            data: {
+                cardType: value,
+            },
+            isEditing: false,
+        });
+    };
+
+    const handleBackButtonPress = () => {
+        if (isEditing) {
+            Card.setIssueNewCardStepAndData({step: CONST.EXPENSIFY_CARD.STEP.CONFIRMATION, isEditing: false});
+            return;
+        }
+        Card.setIssueNewCardStepAndData({step: CONST.EXPENSIFY_CARD.STEP.ASSIGNEE});
+    };
+
+    return (
+        <ScreenWrapper
+            testID={CardTypeStep.displayName}
+            includeSafeAreaPaddingBottom={false}
+            shouldEnablePickerAvoiding={false}
+            shouldEnableMaxHeight
+            offlineIndicatorStyle={styles.mtAuto}
+        >
+            <HeaderWithBackButton
+                title={translate('workspace.card.issueCard')}
+                onBackButtonPress={handleBackButtonPress}
+            />
+            <View style={[styles.ph5, styles.mb5, styles.mt3, {height: CONST.BANK_ACCOUNT.STEPS_HEADER_HEIGHT}]}>
+                <InteractiveStepSubHeader
+                    startStepIndex={1}
+                    stepNames={CONST.EXPENSIFY_CARD.STEP_NAMES}
+                />
+            </View>
+            <Text style={[styles.textHeadlineLineHeightXXL, styles.ph5, styles.mv3]}>{translate('workspace.card.issueNewCard.chooseCardType')}</Text>
+            <View style={styles.mh5}>
+                <MenuItem
+                    icon={Illustrations.HandCard}
+                    title={translate('workspace.card.issueNewCard.physicalCard')}
+                    description={translate('workspace.card.issueNewCard.physicalCardDescription')}
+                    shouldShowRightIcon
+                    onPress={() => submit(CONST.EXPENSIFY_CARD.CARD_TYPE.PHYSICAL)}
+                    displayInDefaultIconColor
+                    iconStyles={[styles.ml3, styles.mr2]}
+                    iconWidth={variables.menuIconSize}
+                    iconHeight={variables.menuIconSize}
+                    wrapperStyle={styles.purposeMenuItem}
+                />
+                <MenuItem
+                    icon={Illustrations.VirtualCard}
+                    title={translate('workspace.card.issueNewCard.virtualCard')}
+                    description={translate('workspace.card.issueNewCard.virtualCardDescription')}
+                    shouldShowRightIcon
+                    onPress={() => submit(CONST.EXPENSIFY_CARD.CARD_TYPE.VIRTUAL)}
+                    displayInDefaultIconColor
+                    iconStyles={[styles.ml3, styles.mr2]}
+                    iconWidth={variables.menuIconSize}
+                    iconHeight={variables.menuIconSize}
+                    wrapperStyle={styles.purposeMenuItem}
+                />
+            </View>
+        </ScreenWrapper>
+    );
+}
+
+CardTypeStep.displayName = 'CardTypeStep';
+
+export default CardTypeStep;
diff --git a/src/pages/workspace/expensifyCard/issueNew/ConfirmationStep.tsx b/src/pages/workspace/expensifyCard/issueNew/ConfirmationStep.tsx
new file mode 100644
index 000000000000..aed246227d7d
--- /dev/null
+++ b/src/pages/workspace/expensifyCard/issueNew/ConfirmationStep.tsx
@@ -0,0 +1,124 @@
+import React from 'react';
+import {View} from 'react-native';
+import {useOnyx} from 'react-native-onyx';
+import Button from '@components/Button';
+import HeaderWithBackButton from '@components/HeaderWithBackButton';
+import InteractiveStepSubHeader from '@components/InteractiveStepSubHeader';
+import MenuItemWithTopDescription from '@components/MenuItemWithTopDescription';
+import ScreenWrapper from '@components/ScreenWrapper';
+import ScrollView from '@components/ScrollView';
+import Text from '@components/Text';
+import useLocalize from '@hooks/useLocalize';
+import useNetwork from '@hooks/useNetwork';
+import useThemeStyles from '@hooks/useThemeStyles';
+import {getTranslationKeyForLimitType} from '@libs/CardUtils';
+import * as CurrencyUtils from '@libs/CurrencyUtils';
+import * as PersonalDetailsUtils from '@libs/PersonalDetailsUtils';
+import Navigation from '@navigation/Navigation';
+import * as Card from '@userActions/Card';
+import CONST from '@src/CONST';
+import ONYXKEYS from '@src/ONYXKEYS';
+import ROUTES from '@src/ROUTES';
+import type {IssueNewCardStep} from '@src/types/onyx/Card';
+
+type ConfirmationStepProps = {
+    // ID of the policy that the card will be issued under
+    policyID: string;
+};
+
+function ConfirmationStep({policyID}: ConfirmationStepProps) {
+    const {translate} = useLocalize();
+    const styles = useThemeStyles();
+    const {isOffline} = useNetwork();
+
+    const [issueNewCard] = useOnyx(ONYXKEYS.ISSUE_NEW_EXPENSIFY_CARD);
+
+    const data = issueNewCard?.data;
+
+    const submit = () => {
+        Card.issueExpensifyCard(policyID, CONST.COUNTRY.US, data);
+        Navigation.navigate(ROUTES.WORKSPACE_EXPENSIFY_CARD.getRoute(policyID ?? '-1'));
+        Card.clearIssueNewCardFlow();
+    };
+
+    const editStep = (step: IssueNewCardStep) => {
+        Card.setIssueNewCardStepAndData({step, isEditing: true});
+    };
+
+    const handleBackButtonPress = () => {
+        Card.setIssueNewCardStepAndData({step: CONST.EXPENSIFY_CARD.STEP.CARD_NAME});
+    };
+
+    const translationForLimitType = getTranslationKeyForLimitType(data?.limitType);
+
+    return (
+        <ScreenWrapper
+            testID={ConfirmationStep.displayName}
+            includeSafeAreaPaddingBottom={false}
+            shouldEnablePickerAvoiding={false}
+            shouldEnableMaxHeight
+        >
+            <HeaderWithBackButton
+                title={translate('workspace.card.issueCard')}
+                onBackButtonPress={handleBackButtonPress}
+            />
+            <View style={[styles.ph5, styles.mb5, styles.mt3, {height: CONST.BANK_ACCOUNT.STEPS_HEADER_HEIGHT}]}>
+                <InteractiveStepSubHeader
+                    startStepIndex={5}
+                    stepNames={CONST.EXPENSIFY_CARD.STEP_NAMES}
+                />
+            </View>
+            <ScrollView
+                style={styles.pt0}
+                contentContainerStyle={styles.flexGrow1}
+            >
+                <Text style={[styles.textHeadlineLineHeightXXL, styles.ph5, styles.mv3]}>{translate('workspace.card.issueNewCard.letsDoubleCheck')}</Text>
+                <Text style={[styles.textSupporting, styles.ph5, styles.mv3]}>{translate('workspace.card.issueNewCard.willBeReady')}</Text>
+                <MenuItemWithTopDescription
+                    description={translate('workspace.card.issueNewCard.cardholder')}
+                    title={PersonalDetailsUtils.getPersonalDetailByEmail(data?.assigneeEmail ?? '')?.displayName}
+                    shouldShowRightIcon
+                    onPress={() => editStep(CONST.EXPENSIFY_CARD.STEP.ASSIGNEE)}
+                />
+                <MenuItemWithTopDescription
+                    description={translate('workspace.card.issueNewCard.cardType')}
+                    title={data?.cardType ? translate(`workspace.card.issueNewCard.${data?.cardType}Card`) : ''}
+                    shouldShowRightIcon
+                    onPress={() => editStep(CONST.EXPENSIFY_CARD.STEP.CARD_TYPE)}
+                />
+                <MenuItemWithTopDescription
+                    description={translate('workspace.card.issueNewCard.limit')}
+                    title={CurrencyUtils.convertToShortDisplayString(data?.limit)}
+                    shouldShowRightIcon
+                    onPress={() => editStep(CONST.EXPENSIFY_CARD.STEP.LIMIT)}
+                />
+                <MenuItemWithTopDescription
+                    description={translate('workspace.card.issueNewCard.limitType')}
+                    title={translationForLimitType ? translate(translationForLimitType) : ''}
+                    shouldShowRightIcon
+                    onPress={() => editStep(CONST.EXPENSIFY_CARD.STEP.LIMIT_TYPE)}
+                />
+                <MenuItemWithTopDescription
+                    description={translate('workspace.card.issueNewCard.name')}
+                    title={data?.cardTitle}
+                    shouldShowRightIcon
+                    onPress={() => editStep(CONST.EXPENSIFY_CARD.STEP.CARD_NAME)}
+                />
+                <View style={[styles.mh5, styles.pb5, styles.mt3, styles.flexGrow1, styles.justifyContentEnd]}>
+                    <Button
+                        isDisabled={isOffline}
+                        success
+                        large
+                        style={[styles.w100]}
+                        onPress={submit}
+                        text={translate('workspace.card.issueCard')}
+                    />
+                </View>
+            </ScrollView>
+        </ScreenWrapper>
+    );
+}
+
+ConfirmationStep.displayName = 'ConfirmationStep';
+
+export default ConfirmationStep;
diff --git a/src/pages/workspace/expensifyCard/issueNew/IssueNewCardPage.tsx b/src/pages/workspace/expensifyCard/issueNew/IssueNewCardPage.tsx
new file mode 100644
index 000000000000..f1cd737eed46
--- /dev/null
+++ b/src/pages/workspace/expensifyCard/issueNew/IssueNewCardPage.tsx
@@ -0,0 +1,46 @@
+import React, {useEffect} from 'react';
+import {useOnyx} from 'react-native-onyx';
+import type {WithPolicyAndFullscreenLoadingProps} from '@pages/workspace/withPolicyAndFullscreenLoading';
+import withPolicyAndFullscreenLoading from '@pages/workspace/withPolicyAndFullscreenLoading';
+import * as Card from '@userActions/Card';
+import CONST from '@src/CONST';
+import ONYXKEYS from '@src/ONYXKEYS';
+import AssigneeStep from './AssigneeStep';
+import CardNameStep from './CardNameStep';
+import CardTypeStep from './CardTypeStep';
+import ConfirmationStep from './ConfirmationStep';
+import LimitStep from './LimitStep';
+import LimitTypeStep from './LimitTypeStep';
+
+function IssueNewCardPage({policy}: WithPolicyAndFullscreenLoadingProps) {
+    const [issueNewCard] = useOnyx(ONYXKEYS.ISSUE_NEW_EXPENSIFY_CARD);
+
+    const {currentStep} = issueNewCard ?? {};
+
+    const policyID = policy?.id ?? '-1';
+
+    // TODO: add logic to skip Assignee step when the flow is started from the member's profile page
+    useEffect(() => {
+        Card.startIssueNewCardFlow(policyID);
+    }, [policyID]);
+
+    switch (currentStep) {
+        case CONST.EXPENSIFY_CARD.STEP.ASSIGNEE:
+            return <AssigneeStep policy={policy} />;
+        case CONST.EXPENSIFY_CARD.STEP.CARD_TYPE:
+            return <CardTypeStep />;
+        case CONST.EXPENSIFY_CARD.STEP.LIMIT_TYPE:
+            return <LimitTypeStep policy={policy} />;
+        case CONST.EXPENSIFY_CARD.STEP.LIMIT:
+            return <LimitStep />;
+        case CONST.EXPENSIFY_CARD.STEP.CARD_NAME:
+            return <CardNameStep />;
+        case CONST.EXPENSIFY_CARD.STEP.CONFIRMATION:
+            return <ConfirmationStep policyID={policyID} />;
+        default:
+            return <AssigneeStep policy={policy} />;
+    }
+}
+
+IssueNewCardPage.displayName = 'IssueNewCardPage';
+export default withPolicyAndFullscreenLoading(IssueNewCardPage);
diff --git a/src/pages/workspace/expensifyCard/issueNew/LimitStep.tsx b/src/pages/workspace/expensifyCard/issueNew/LimitStep.tsx
new file mode 100644
index 000000000000..eb7c2e7d8e0f
--- /dev/null
+++ b/src/pages/workspace/expensifyCard/issueNew/LimitStep.tsx
@@ -0,0 +1,106 @@
+import React, {useCallback} from 'react';
+import {View} from 'react-native';
+import {useOnyx} from 'react-native-onyx';
+import AmountForm from '@components/AmountForm';
+import FormProvider from '@components/Form/FormProvider';
+import InputWrapper from '@components/Form/InputWrapper';
+import type {FormInputErrors, FormOnyxValues} from '@components/Form/types';
+import HeaderWithBackButton from '@components/HeaderWithBackButton';
+import InteractiveStepSubHeader from '@components/InteractiveStepSubHeader';
+import ScreenWrapper from '@components/ScreenWrapper';
+import Text from '@components/Text';
+import useAutoFocusInput from '@hooks/useAutoFocusInput';
+import useLocalize from '@hooks/useLocalize';
+import useThemeStyles from '@hooks/useThemeStyles';
+import * as CurrencyUtils from '@libs/CurrencyUtils';
+import * as ValidationUtils from '@libs/ValidationUtils';
+import * as Card from '@userActions/Card';
+import CONST from '@src/CONST';
+import ONYXKEYS from '@src/ONYXKEYS';
+import INPUT_IDS from '@src/types/form/IssueNewExpensifyCardForm';
+
+function LimitStep() {
+    const {translate} = useLocalize();
+    const {inputCallbackRef} = useAutoFocusInput();
+    const styles = useThemeStyles();
+    const [issueNewCard] = useOnyx(ONYXKEYS.ISSUE_NEW_EXPENSIFY_CARD);
+    const isEditing = issueNewCard?.isEditing;
+
+    const submit = useCallback(
+        (values: FormOnyxValues<typeof ONYXKEYS.FORMS.ISSUE_NEW_EXPENSIFY_CARD_FORM>) => {
+            const limit = CurrencyUtils.convertToBackendAmount(Number(values?.limit));
+            Card.setIssueNewCardStepAndData({
+                step: isEditing ? CONST.EXPENSIFY_CARD.STEP.CONFIRMATION : CONST.EXPENSIFY_CARD.STEP.CARD_NAME,
+                data: {limit},
+                isEditing: false,
+            });
+        },
+        [isEditing],
+    );
+
+    const handleBackButtonPress = useCallback(() => {
+        if (isEditing) {
+            Card.setIssueNewCardStepAndData({step: CONST.EXPENSIFY_CARD.STEP.CONFIRMATION, isEditing: false});
+            return;
+        }
+        Card.setIssueNewCardStepAndData({step: CONST.EXPENSIFY_CARD.STEP.LIMIT_TYPE});
+    }, [isEditing]);
+
+    const validate = useCallback(
+        (values: FormOnyxValues<typeof ONYXKEYS.FORMS.ISSUE_NEW_EXPENSIFY_CARD_FORM>): FormInputErrors<typeof ONYXKEYS.FORMS.ISSUE_NEW_EXPENSIFY_CARD_FORM> => {
+            const errors = ValidationUtils.getFieldRequiredErrors(values, [INPUT_IDS.LIMIT]);
+
+            // We only want integers to be sent as the limit
+            if (!Number(values.limit) || !Number.isInteger(Number(values.limit))) {
+                errors.limit = translate('iou.error.invalidAmount');
+            }
+            return errors;
+        },
+        [translate],
+    );
+
+    return (
+        <ScreenWrapper
+            testID={LimitStep.displayName}
+            includeSafeAreaPaddingBottom={false}
+            shouldEnablePickerAvoiding={false}
+            shouldEnableMaxHeight
+        >
+            <HeaderWithBackButton
+                title={translate('workspace.card.issueCard')}
+                onBackButtonPress={handleBackButtonPress}
+            />
+            <View style={[styles.ph5, styles.mb5, styles.mt3, {height: CONST.BANK_ACCOUNT.STEPS_HEADER_HEIGHT}]}>
+                <InteractiveStepSubHeader
+                    startStepIndex={3}
+                    stepNames={CONST.EXPENSIFY_CARD.STEP_NAMES}
+                />
+            </View>
+            <Text style={[styles.textHeadlineLineHeightXXL, styles.ph5, styles.mv3]}>{translate('workspace.card.issueNewCard.setLimit')}</Text>
+            <FormProvider
+                formID={ONYXKEYS.FORMS.ISSUE_NEW_EXPENSIFY_CARD_FORM}
+                submitButtonText={translate(isEditing ? 'common.confirm' : 'common.next')}
+                shouldHideFixErrorsAlert
+                onSubmit={submit}
+                style={[styles.flex1]}
+                submitButtonStyles={[styles.mh5, styles.mt0]}
+                submitFlexEnabled={false}
+                disablePressOnEnter={false}
+                validate={validate}
+                enabledWhenOffline
+            >
+                <InputWrapper
+                    InputComponent={AmountForm}
+                    defaultValue={CurrencyUtils.convertToFrontendAmountAsString(issueNewCard?.data?.limit, CONST.CURRENCY.USD, false)}
+                    isCurrencyPressable={false}
+                    inputID={INPUT_IDS.LIMIT}
+                    ref={inputCallbackRef}
+                />
+            </FormProvider>
+        </ScreenWrapper>
+    );
+}
+
+LimitStep.displayName = 'LimitStep';
+
+export default LimitStep;
diff --git a/src/pages/workspace/expensifyCard/issueNew/LimitTypeStep.tsx b/src/pages/workspace/expensifyCard/issueNew/LimitTypeStep.tsx
new file mode 100644
index 000000000000..de4bca070d51
--- /dev/null
+++ b/src/pages/workspace/expensifyCard/issueNew/LimitTypeStep.tsx
@@ -0,0 +1,126 @@
+import React, {useCallback, useMemo, useState} from 'react';
+import {View} from 'react-native';
+import type {OnyxEntry} from 'react-native-onyx';
+import {useOnyx} from 'react-native-onyx';
+import Button from '@components/Button';
+import HeaderWithBackButton from '@components/HeaderWithBackButton';
+import InteractiveStepSubHeader from '@components/InteractiveStepSubHeader';
+import ScreenWrapper from '@components/ScreenWrapper';
+import SelectionList from '@components/SelectionList';
+import RadioListItem from '@components/SelectionList/RadioListItem';
+import Text from '@components/Text';
+import useLocalize from '@hooks/useLocalize';
+import useThemeStyles from '@hooks/useThemeStyles';
+import * as Card from '@userActions/Card';
+import CONST from '@src/CONST';
+import ONYXKEYS from '@src/ONYXKEYS';
+import type * as OnyxTypes from '@src/types/onyx';
+import {isEmptyObject} from '@src/types/utils/EmptyObject';
+
+type LimitTypeStepProps = {
+    // The policy that the card will be issued under
+    policy: OnyxEntry<OnyxTypes.Policy>;
+};
+
+function LimitTypeStep({policy}: LimitTypeStepProps) {
+    const {translate} = useLocalize();
+    const styles = useThemeStyles();
+    const [issueNewCard] = useOnyx(ONYXKEYS.ISSUE_NEW_EXPENSIFY_CARD);
+
+    const areApprovalsConfigured = !isEmptyObject(policy?.approver) && policy?.approvalMode !== CONST.POLICY.APPROVAL_MODE.OPTIONAL;
+    const defaultType = areApprovalsConfigured ? CONST.EXPENSIFY_CARD.LIMIT_TYPES.SMART : CONST.EXPENSIFY_CARD.LIMIT_TYPES.MONTHLY;
+
+    const [typeSelected, setTypeSelected] = useState(issueNewCard?.data?.limitType ?? defaultType);
+
+    const isEditing = issueNewCard?.isEditing;
+
+    const submit = useCallback(() => {
+        Card.setIssueNewCardStepAndData({
+            step: isEditing ? CONST.EXPENSIFY_CARD.STEP.CONFIRMATION : CONST.EXPENSIFY_CARD.STEP.LIMIT,
+            data: {limitType: typeSelected},
+            isEditing: false,
+        });
+    }, [isEditing, typeSelected]);
+
+    const handleBackButtonPress = useCallback(() => {
+        if (isEditing) {
+            Card.setIssueNewCardStepAndData({step: CONST.EXPENSIFY_CARD.STEP.CONFIRMATION, isEditing: false});
+            return;
+        }
+        Card.setIssueNewCardStepAndData({step: CONST.EXPENSIFY_CARD.STEP.CARD_TYPE});
+    }, [isEditing]);
+
+    const data = useMemo(() => {
+        const options = [];
+
+        if (areApprovalsConfigured) {
+            options.push({
+                value: CONST.EXPENSIFY_CARD.LIMIT_TYPES.SMART,
+                text: translate('workspace.card.issueNewCard.smartLimit'),
+                alternateText: translate('workspace.card.issueNewCard.smartLimitDescription'),
+                keyForList: CONST.EXPENSIFY_CARD.LIMIT_TYPES.SMART,
+                isSelected: typeSelected === CONST.EXPENSIFY_CARD.LIMIT_TYPES.SMART,
+            });
+        }
+
+        options.push(
+            {
+                value: CONST.EXPENSIFY_CARD.LIMIT_TYPES.MONTHLY,
+                text: translate('workspace.card.issueNewCard.monthly'),
+                alternateText: translate('workspace.card.issueNewCard.monthlyDescription'),
+                keyForList: CONST.EXPENSIFY_CARD.LIMIT_TYPES.MONTHLY,
+                isSelected: typeSelected === CONST.EXPENSIFY_CARD.LIMIT_TYPES.MONTHLY,
+            },
+            {
+                value: CONST.EXPENSIFY_CARD.LIMIT_TYPES.FIXED,
+                text: translate('workspace.card.issueNewCard.fixedAmount'),
+                alternateText: translate('workspace.card.issueNewCard.fixedAmountDescription'),
+                keyForList: CONST.EXPENSIFY_CARD.LIMIT_TYPES.FIXED,
+                isSelected: typeSelected === CONST.EXPENSIFY_CARD.LIMIT_TYPES.FIXED,
+            },
+        );
+
+        return options;
+    }, [areApprovalsConfigured, translate, typeSelected]);
+
+    return (
+        <ScreenWrapper
+            testID={LimitTypeStep.displayName}
+            includeSafeAreaPaddingBottom={false}
+            shouldEnablePickerAvoiding={false}
+            shouldEnableMaxHeight
+        >
+            <HeaderWithBackButton
+                title={translate('workspace.card.issueCard')}
+                onBackButtonPress={handleBackButtonPress}
+            />
+            <View style={[styles.ph5, styles.mb5, styles.mt3, {height: CONST.BANK_ACCOUNT.STEPS_HEADER_HEIGHT}]}>
+                <InteractiveStepSubHeader
+                    startStepIndex={2}
+                    stepNames={CONST.EXPENSIFY_CARD.STEP_NAMES}
+                />
+            </View>
+            <Text style={[styles.textHeadlineLineHeightXXL, styles.ph5, styles.mv3]}>{translate('workspace.card.issueNewCard.chooseLimitType')}</Text>
+            <SelectionList
+                ListItem={RadioListItem}
+                onSelectRow={({value}) => setTypeSelected(value)}
+                sections={[{data}]}
+                shouldSingleExecuteRowSelect
+                initiallyFocusedOptionKey={typeSelected}
+                shouldUpdateFocusedIndex
+            />
+            <Button
+                success
+                large
+                pressOnEnter
+                text={translate(isEditing ? 'common.confirm' : 'common.next')}
+                onPress={submit}
+                style={styles.m5}
+            />
+        </ScreenWrapper>
+    );
+}
+
+LimitTypeStep.displayName = 'LimitTypeStep';
+
+export default LimitTypeStep;
diff --git a/src/pages/workspace/invoices/WorkspaceInvoicesPage.tsx b/src/pages/workspace/invoices/WorkspaceInvoicesPage.tsx
index a00c4959cedb..40a8239b9ab1 100644
--- a/src/pages/workspace/invoices/WorkspaceInvoicesPage.tsx
+++ b/src/pages/workspace/invoices/WorkspaceInvoicesPage.tsx
@@ -2,31 +2,32 @@ import type {StackScreenProps} from '@react-navigation/stack';
 import React from 'react';
 import {View} from 'react-native';
 import useLocalize from '@hooks/useLocalize';
+import useResponsiveLayout from '@hooks/useResponsiveLayout';
 import useThemeStyles from '@hooks/useThemeStyles';
-import useWindowDimensions from '@hooks/useWindowDimensions';
-import type {WorkspacesCentralPaneNavigatorParamList} from '@navigation/types';
+import type {FullScreenNavigatorParamList} from '@navigation/types';
 import WorkspacePageWithSections from '@pages/workspace/WorkspacePageWithSections';
 import CONST from '@src/CONST';
 import type SCREENS from '@src/SCREENS';
 import WorkspaceInvoicesNoVBAView from './WorkspaceInvoicesNoVBAView';
 import WorkspaceInvoicesVBAView from './WorkspaceInvoicesVBAView';
 
-type WorkspaceInvoicesPageProps = StackScreenProps<WorkspacesCentralPaneNavigatorParamList, typeof SCREENS.WORKSPACE.INVOICES>;
+type WorkspaceInvoicesPageProps = StackScreenProps<FullScreenNavigatorParamList, typeof SCREENS.WORKSPACE.INVOICES>;
 
 function WorkspaceInvoicesPage({route}: WorkspaceInvoicesPageProps) {
     const {translate} = useLocalize();
     const styles = useThemeStyles();
-    const {isSmallScreenWidth} = useWindowDimensions();
+    const {shouldUseNarrowLayout} = useResponsiveLayout();
     return (
         <WorkspacePageWithSections
             shouldUseScrollView
             headerText={translate('workspace.common.invoices')}
             guidesCallTaskID={CONST.GUIDES_CALL_TASK_IDS.WORKSPACE_INVOICES}
             shouldShowOfflineIndicatorInWideScreen
+            shouldSkipVBBACall={false}
             route={route}
         >
             {(hasVBA?: boolean, policyID?: string) => (
-                <View style={[styles.mt3, isSmallScreenWidth ? styles.workspaceSectionMobile : styles.workspaceSection]}>
+                <View style={[styles.mt3, shouldUseNarrowLayout ? styles.workspaceSectionMobile : styles.workspaceSection]}>
                     {!hasVBA && policyID && <WorkspaceInvoicesNoVBAView policyID={policyID} />}
                     {hasVBA && policyID && <WorkspaceInvoicesVBAView policyID={policyID} />}
                 </View>
diff --git a/src/pages/workspace/invoices/WorkspaceInvoicingDetailsName.tsx b/src/pages/workspace/invoices/WorkspaceInvoicingDetailsName.tsx
new file mode 100644
index 000000000000..fff7c592baaa
--- /dev/null
+++ b/src/pages/workspace/invoices/WorkspaceInvoicingDetailsName.tsx
@@ -0,0 +1,79 @@
+import type {StackScreenProps} from '@react-navigation/stack';
+import React from 'react';
+import {useOnyx} from 'react-native-onyx';
+import FormProvider from '@components/Form/FormProvider';
+import InputWrapper from '@components/Form/InputWrapper';
+import type {FormInputErrors, FormOnyxValues} from '@components/Form/types';
+import HeaderWithBackButton from '@components/HeaderWithBackButton';
+import ScreenWrapper from '@components/ScreenWrapper';
+import TextInput from '@components/TextInput';
+import useAutoFocusInput from '@hooks/useAutoFocusInput';
+import useLocalize from '@hooks/useLocalize';
+import useThemeStyles from '@hooks/useThemeStyles';
+import * as ValidationUtils from '@libs/ValidationUtils';
+import Navigation from '@navigation/Navigation';
+import type {SettingsNavigatorParamList} from '@navigation/types';
+import AccessOrNotFoundWrapper from '@pages/workspace/AccessOrNotFoundWrapper';
+import CONST from '@src/CONST';
+import ONYXKEYS from '@src/ONYXKEYS';
+import type SCREENS from '@src/SCREENS';
+import INPUT_IDS from '@src/types/form/WorkspaceInvoicesCompanyNameForm';
+
+type WorkspaceInvoicingDetailsNameProps = StackScreenProps<SettingsNavigatorParamList, typeof SCREENS.WORKSPACE.INVOICES_COMPANY_NAME>;
+
+function WorkspaceInvoicingDetailsName({route}: WorkspaceInvoicingDetailsNameProps) {
+    const {policyID} = route.params;
+
+    const {translate} = useLocalize();
+    const {inputCallbackRef} = useAutoFocusInput();
+    const styles = useThemeStyles();
+    const [policy] = useOnyx(`${ONYXKEYS.COLLECTION.POLICY}${policyID}`);
+
+    // eslint-disable-next-line @typescript-eslint/no-unused-vars
+    const submit = (values: FormOnyxValues<typeof ONYXKEYS.FORMS.WORKSPACE_INVOICES_COMPANY_NAME_FORM>) => {
+        // TODO: implement UpdateInvoiceCompanyName API call when it's supported
+        Navigation.goBack();
+    };
+
+    const validate = (values: FormOnyxValues<typeof ONYXKEYS.FORMS.WORKSPACE_INVOICES_COMPANY_NAME_FORM>): FormInputErrors<typeof ONYXKEYS.FORMS.WORKSPACE_INVOICES_COMPANY_NAME_FORM> =>
+        ValidationUtils.getFieldRequiredErrors(values, [INPUT_IDS.COMPANY_NAME]);
+
+    return (
+        <AccessOrNotFoundWrapper
+            accessVariants={[CONST.POLICY.ACCESS_VARIANTS.ADMIN, CONST.POLICY.ACCESS_VARIANTS.PAID]}
+            policyID={policyID}
+            // TODO: uncomment when CONST.POLICY.MORE_FEATURES.ARE_INVOICES_ENABLED is supported
+            // featureName={CONST.POLICY.MORE_FEATURES.ARE_INVOICES_ENABLED}
+        >
+            <ScreenWrapper
+                testID={WorkspaceInvoicingDetailsName.displayName}
+                shouldEnablePickerAvoiding={false}
+                shouldEnableMaxHeight
+            >
+                <HeaderWithBackButton title={translate('workspace.invoices.companyName')} />
+                <FormProvider
+                    formID={ONYXKEYS.FORMS.WORKSPACE_INVOICES_COMPANY_NAME_FORM}
+                    submitButtonText={translate('common.save')}
+                    onSubmit={submit}
+                    style={[styles.flex1, styles.mh5]}
+                    enabledWhenOffline
+                    validate={validate}
+                >
+                    <InputWrapper
+                        InputComponent={TextInput}
+                        inputID={INPUT_IDS.COMPANY_NAME}
+                        label={translate('workspace.invoices.companyName')}
+                        accessibilityLabel={translate('workspace.invoices.companyName')}
+                        role={CONST.ROLE.PRESENTATION}
+                        defaultValue={policy?.invoice?.companyName}
+                        ref={inputCallbackRef}
+                    />
+                </FormProvider>
+            </ScreenWrapper>
+        </AccessOrNotFoundWrapper>
+    );
+}
+
+WorkspaceInvoicingDetailsName.displayName = 'WorkspaceInvoicingDetailsName';
+
+export default WorkspaceInvoicingDetailsName;
diff --git a/src/pages/workspace/invoices/WorkspaceInvoicingDetailsSection.tsx b/src/pages/workspace/invoices/WorkspaceInvoicingDetailsSection.tsx
new file mode 100644
index 000000000000..c734e4b6d517
--- /dev/null
+++ b/src/pages/workspace/invoices/WorkspaceInvoicingDetailsSection.tsx
@@ -0,0 +1,57 @@
+import React, {useMemo} from 'react';
+import {useOnyx} from 'react-native-onyx';
+import MenuItemWithTopDescription from '@components/MenuItemWithTopDescription';
+import Section from '@components/Section';
+import useLocalize from '@hooks/useLocalize';
+import useResponsiveLayout from '@hooks/useResponsiveLayout';
+import useThemeStyles from '@hooks/useThemeStyles';
+import Navigation from '@navigation/Navigation';
+import ONYXKEYS from '@src/ONYXKEYS';
+import ROUTES from '@src/ROUTES';
+
+type WorkspaceInvoicingDetailsSectionProps = {
+    /** The current policy ID */
+    policyID: string;
+};
+
+function WorkspaceInvoicingDetailsSection({policyID}: WorkspaceInvoicingDetailsSectionProps) {
+    const styles = useThemeStyles();
+    const {translate} = useLocalize();
+    const {shouldUseNarrowLayout} = useResponsiveLayout();
+    const [policy] = useOnyx(`${ONYXKEYS.COLLECTION.POLICY}${policyID}`);
+
+    const horizontalPadding = useMemo(() => (shouldUseNarrowLayout ? styles.ph5 : styles.ph8), [shouldUseNarrowLayout, styles]);
+
+    return (
+        <Section
+            title={translate('workspace.invoices.invoicingDetails')}
+            subtitle={translate('workspace.invoices.invoicingDetailsDescription')}
+            containerStyles={[styles.ph0, shouldUseNarrowLayout ? styles.pt5 : styles.pt8]}
+            subtitleStyles={horizontalPadding}
+            titleStyles={[styles.textStrong, horizontalPadding]}
+            childrenStyles={styles.pt5}
+            subtitleMuted
+        >
+            <MenuItemWithTopDescription
+                key={translate('workspace.invoices.companyName')}
+                shouldShowRightIcon
+                title={policy?.invoice?.companyName}
+                description={translate('workspace.invoices.companyName')}
+                onPress={() => Navigation.navigate(ROUTES.WORKSPACE_INVOICES_COMPANY_NAME.getRoute(policyID))}
+                style={horizontalPadding}
+            />
+            <MenuItemWithTopDescription
+                key={translate('workspace.invoices.companyWebsite')}
+                shouldShowRightIcon
+                title={policy?.invoice?.companyWebsite}
+                description={translate('workspace.invoices.companyWebsite')}
+                onPress={() => Navigation.navigate(ROUTES.WORKSPACE_INVOICES_COMPANY_WEBSITE.getRoute(policyID))}
+                style={horizontalPadding}
+            />
+        </Section>
+    );
+}
+
+WorkspaceInvoicingDetailsSection.displayName = 'WorkspaceInvoicingDetailsSection';
+
+export default WorkspaceInvoicingDetailsSection;
diff --git a/src/pages/workspace/invoices/WorkspaceInvoicingDetailsWebsite.tsx b/src/pages/workspace/invoices/WorkspaceInvoicingDetailsWebsite.tsx
new file mode 100644
index 000000000000..5a58e8935db2
--- /dev/null
+++ b/src/pages/workspace/invoices/WorkspaceInvoicingDetailsWebsite.tsx
@@ -0,0 +1,101 @@
+import type {StackScreenProps} from '@react-navigation/stack';
+import {Str} from 'expensify-common';
+import React from 'react';
+import {useOnyx} from 'react-native-onyx';
+import FormProvider from '@components/Form/FormProvider';
+import InputWrapper from '@components/Form/InputWrapper';
+import type {FormInputErrors, FormOnyxValues} from '@components/Form/types';
+import HeaderWithBackButton from '@components/HeaderWithBackButton';
+import ScreenWrapper from '@components/ScreenWrapper';
+import TextInput from '@components/TextInput';
+import useAutoFocusInput from '@hooks/useAutoFocusInput';
+import useLocalize from '@hooks/useLocalize';
+import useThemeStyles from '@hooks/useThemeStyles';
+import * as Url from '@libs/Url';
+import * as ValidationUtils from '@libs/ValidationUtils';
+import Navigation from '@navigation/Navigation';
+import type {SettingsNavigatorParamList} from '@navigation/types';
+import AccessOrNotFoundWrapper from '@pages/workspace/AccessOrNotFoundWrapper';
+import CONST from '@src/CONST';
+import ONYXKEYS from '@src/ONYXKEYS';
+import type SCREENS from '@src/SCREENS';
+import INPUT_IDS from '@src/types/form/WorkspaceInvoicesCompanyWebsiteForm';
+
+type WorkspaceInvoicingDetailsWebsiteProps = StackScreenProps<SettingsNavigatorParamList, typeof SCREENS.WORKSPACE.INVOICES_COMPANY_WEBSITE>;
+
+function WorkspaceInvoicingDetailsWebsite({route}: WorkspaceInvoicingDetailsWebsiteProps) {
+    const {policyID} = route.params;
+
+    const {translate} = useLocalize();
+    const {inputCallbackRef} = useAutoFocusInput();
+    const styles = useThemeStyles();
+    const [policy] = useOnyx(`${ONYXKEYS.COLLECTION.POLICY}${policyID}`);
+
+    // eslint-disable-next-line @typescript-eslint/no-unused-vars
+    const submit = (values: FormOnyxValues<typeof ONYXKEYS.FORMS.WORKSPACE_INVOICES_COMPANY_WEBSITE_FORM>) => {
+        // TODO: implement UpdateInvoiceCompanyWebsite API call when it's supported
+        Navigation.goBack();
+    };
+
+    const validate = (
+        values: FormOnyxValues<typeof ONYXKEYS.FORMS.WORKSPACE_INVOICES_COMPANY_WEBSITE_FORM>,
+    ): FormInputErrors<typeof ONYXKEYS.FORMS.WORKSPACE_INVOICES_COMPANY_WEBSITE_FORM> => {
+        const errors = ValidationUtils.getFieldRequiredErrors(values, [INPUT_IDS.COMPANY_WEBSITE]);
+
+        if (values.companyWebsite) {
+            if (!ValidationUtils.isValidWebsite(values.companyWebsite)) {
+                errors.companyWebsite = translate('bankAccount.error.website');
+            } else {
+                const domain = Url.extractUrlDomain(values.companyWebsite);
+
+                if (!domain || !Str.isValidDomainName(domain)) {
+                    errors.companyWebsite = translate('iou.invalidDomainError');
+                } else if (ValidationUtils.isPublicDomain(domain)) {
+                    errors.companyWebsite = translate('iou.publicDomainError');
+                }
+            }
+        }
+
+        return errors;
+    };
+
+    return (
+        <AccessOrNotFoundWrapper
+            accessVariants={[CONST.POLICY.ACCESS_VARIANTS.ADMIN, CONST.POLICY.ACCESS_VARIANTS.PAID]}
+            policyID={policyID}
+            // TODO: uncomment when CONST.POLICY.MORE_FEATURES.ARE_INVOICES_ENABLED is supported
+            // featureName={CONST.POLICY.MORE_FEATURES.ARE_INVOICES_ENABLED}
+        >
+            <ScreenWrapper
+                testID={WorkspaceInvoicingDetailsWebsite.displayName}
+                shouldEnablePickerAvoiding={false}
+                shouldEnableMaxHeight
+            >
+                <HeaderWithBackButton title={translate('workspace.invoices.companyWebsite')} />
+                <FormProvider
+                    formID={ONYXKEYS.FORMS.WORKSPACE_INVOICES_COMPANY_WEBSITE_FORM}
+                    submitButtonText={translate('common.save')}
+                    onSubmit={submit}
+                    style={[styles.flex1, styles.mh5]}
+                    enabledWhenOffline
+                    validate={validate}
+                >
+                    <InputWrapper
+                        InputComponent={TextInput}
+                        inputID={INPUT_IDS.COMPANY_WEBSITE}
+                        label={translate('workspace.invoices.companyWebsite')}
+                        accessibilityLabel={translate('workspace.invoices.companyWebsite')}
+                        role={CONST.ROLE.PRESENTATION}
+                        defaultValue={policy?.invoice?.companyWebsite}
+                        ref={inputCallbackRef}
+                        inputMode={CONST.INPUT_MODE.URL}
+                    />
+                </FormProvider>
+            </ScreenWrapper>
+        </AccessOrNotFoundWrapper>
+    );
+}
+
+WorkspaceInvoicingDetailsWebsite.displayName = 'WorkspaceInvoicingDetailsWebsite';
+
+export default WorkspaceInvoicingDetailsWebsite;
diff --git a/src/pages/workspace/members/WorkspaceMemberDetailsPage.tsx b/src/pages/workspace/members/WorkspaceMemberDetailsPage.tsx
index 7b2aa78545f2..60216745c11e 100644
--- a/src/pages/workspace/members/WorkspaceMemberDetailsPage.tsx
+++ b/src/pages/workspace/members/WorkspaceMemberDetailsPage.tsx
@@ -1,8 +1,10 @@
 import type {StackScreenProps} from '@react-navigation/stack';
 import React, {useCallback, useEffect, useMemo, useState} from 'react';
 import {View} from 'react-native';
+import {useOnyx} from 'react-native-onyx';
 import type {OnyxEntry} from 'react-native-onyx';
 import type {ValueOf} from 'type-fest';
+import ExpensifyCardImage from '@assets/images/expensify-card.svg';
 import Avatar from '@components/Avatar';
 import Button from '@components/Button';
 import ConfirmModal from '@components/ConfirmModal';
@@ -12,20 +14,26 @@ import MenuItem from '@components/MenuItem';
 import MenuItemWithTopDescription from '@components/MenuItemWithTopDescription';
 import OfflineWithFeedback from '@components/OfflineWithFeedback';
 import ScreenWrapper from '@components/ScreenWrapper';
+import ScrollView from '@components/ScrollView';
 import Text from '@components/Text';
 import useCurrentUserPersonalDetails from '@hooks/useCurrentUserPersonalDetails';
 import useLocalize from '@hooks/useLocalize';
 import useNetwork from '@hooks/useNetwork';
+import usePrevious from '@hooks/usePrevious';
 import useStyleUtils from '@hooks/useStyleUtils';
 import useThemeStyles from '@hooks/useThemeStyles';
-import * as UserUtils from '@libs/UserUtils';
+import * as CurrencyUtils from '@libs/CurrencyUtils';
 import Navigation from '@navigation/Navigation';
 import type {SettingsNavigatorParamList} from '@navigation/types';
+import NotFoundPage from '@pages/ErrorPage/NotFoundPage';
 import AccessOrNotFoundWrapper from '@pages/workspace/AccessOrNotFoundWrapper';
 import type {WithPolicyAndFullscreenLoadingProps} from '@pages/workspace/withPolicyAndFullscreenLoading';
 import withPolicyAndFullscreenLoading from '@pages/workspace/withPolicyAndFullscreenLoading';
-import * as Policy from '@userActions/Policy';
+import variables from '@styles/variables';
+import * as Card from '@userActions/Card';
+import * as Member from '@userActions/Policy/Member';
 import CONST from '@src/CONST';
+import ONYXKEYS from '@src/ONYXKEYS';
 import ROUTES from '@src/ROUTES';
 import type SCREENS from '@src/SCREENS';
 import type {PersonalDetails, PersonalDetailsList} from '@src/types/onyx';
@@ -47,23 +55,43 @@ function WorkspaceMemberDetailsPage({personalDetails, policy, route}: WorkspaceM
     const {translate} = useLocalize();
     const StyleUtils = useStyleUtils();
     const currentUserPersonalDetails = useCurrentUserPersonalDetails();
+    const [cardsList] = useOnyx(`${ONYXKEYS.COLLECTION.WORKSPACE_CARDS_LIST}${policy?.workspaceAccountID}_${CONST.EXPENSIFY_CARD.BANK}`);
 
     const [isRemoveMemberConfirmModalVisible, setIsRemoveMemberConfirmModalVisible] = useState(false);
     const [isRoleSelectionModalVisible, setIsRoleSelectionModalVisible] = useState(false);
 
     const accountID = Number(route.params.accountID);
     const policyID = route.params.policyID;
-
     const memberLogin = personalDetails?.[accountID]?.login ?? '';
     const member = policy?.employeeList?.[memberLogin];
+    const prevMember = usePrevious(member);
     const details = personalDetails?.[accountID] ?? ({} as PersonalDetails);
-    const avatar = details.avatar ?? UserUtils.getDefaultAvatar();
     const fallbackIcon = details.fallbackIcon ?? '';
     const displayName = details.displayName ?? '';
     const isSelectedMemberOwner = policy?.owner === details.login;
     const isSelectedMemberCurrentUser = accountID === currentUserPersonalDetails?.accountID;
     const isCurrentUserAdmin = policy?.employeeList?.[personalDetails?.[currentUserPersonalDetails?.accountID]?.login ?? '']?.role === CONST.POLICY.ROLE.ADMIN;
     const isCurrentUserOwner = policy?.owner === currentUserPersonalDetails?.login;
+    const ownerDetails = personalDetails?.[policy?.ownerAccountID ?? -1] ?? ({} as PersonalDetails);
+    const policyOwnerDisplayName = ownerDetails.displayName ?? policy?.owner ?? '';
+
+    const memberCards = useMemo(() => {
+        if (!cardsList) {
+            return [];
+        }
+        return Object.values(cardsList).filter((card) => card.accountID === accountID);
+    }, [cardsList, accountID]);
+
+    const confirmModalPrompt = useMemo(() => {
+        const isApprover = Member.isApprover(policy, accountID);
+        if (!isApprover) {
+            return translate('workspace.people.removeMemberPrompt', {memberName: displayName});
+        }
+        return translate('workspace.people.removeMembersWarningPrompt', {
+            memberName: displayName,
+            ownerName: policyOwnerDisplayName,
+        });
+    }, [accountID, policy, displayName, policyOwnerDisplayName, translate]);
 
     const roleItems: ListItemType[] = useMemo(
         () => [
@@ -84,31 +112,43 @@ function WorkspaceMemberDetailsPage({personalDetails, policy, route}: WorkspaceM
     );
 
     useEffect(() => {
-        if (!policy?.errorFields?.changeOwner && policy?.isChangeOwnerSuccessful) {
+        if (!prevMember || prevMember?.pendingAction === CONST.RED_BRICK_ROAD_PENDING_ACTION.DELETE || member?.pendingAction !== CONST.RED_BRICK_ROAD_PENDING_ACTION.DELETE) {
             return;
         }
-
-        const changeOwnerErrors = Object.keys(policy?.errorFields?.changeOwner ?? {});
-
-        if (changeOwnerErrors && changeOwnerErrors.length > 0) {
-            Navigation.navigate(ROUTES.WORKSPACE_OWNER_CHANGE_CHECK.getRoute(policyID, accountID, changeOwnerErrors[0] as ValueOf<typeof CONST.POLICY.OWNERSHIP_ERRORS>));
-        }
-    }, [accountID, policy?.errorFields?.changeOwner, policy?.isChangeOwnerSuccessful, policyID]);
+        Navigation.goBack();
+    }, [member, prevMember]);
 
     const askForConfirmationToRemove = () => {
         setIsRemoveMemberConfirmModalVisible(true);
     };
 
     const removeUser = useCallback(() => {
-        Policy.removeMembers([accountID], policyID);
+        Member.removeMembers([accountID], policyID);
         setIsRemoveMemberConfirmModalVisible(false);
-        Navigation.goBack();
     }, [accountID, policyID]);
 
     const navigateToProfile = useCallback(() => {
         Navigation.navigate(ROUTES.PROFILE.getRoute(accountID, Navigation.getActiveRoute()));
     }, [accountID]);
 
+    const navigateToDetails = useCallback(
+        (cardID: string) => {
+            Navigation.navigate(ROUTES.WORKSPACE_EXPENSIFY_CARD_DETAILS.getRoute(policyID, cardID, Navigation.getActiveRoute()));
+        },
+        [policyID],
+    );
+
+    const navigateToIssueNewCard = useCallback(() => {
+        Card.setIssueNewCardStepAndData({
+            step: CONST.EXPENSIFY_CARD.STEP.CARD_TYPE,
+            data: {
+                assigneeEmail: memberLogin,
+            },
+            isEditing: false,
+        });
+        Navigation.navigate(ROUTES.WORKSPACE_EXPENSIFY_CARD_ISSUE_NEW.getRoute(policyID));
+    }, [memberLogin, policyID]);
+
     const openRoleSelectionModal = useCallback(() => {
         setIsRoleSelectionModalVisible(true);
     }, []);
@@ -116,100 +156,145 @@ function WorkspaceMemberDetailsPage({personalDetails, policy, route}: WorkspaceM
     const changeRole = useCallback(
         ({value}: ListItemType) => {
             setIsRoleSelectionModalVisible(false);
-            Policy.updateWorkspaceMembersRole(policyID, [accountID], value);
+            Member.updateWorkspaceMembersRole(policyID, [accountID], value);
         },
         [accountID, policyID],
     );
 
     const startChangeOwnershipFlow = useCallback(() => {
-        Policy.clearWorkspaceOwnerChangeFlow(policyID);
-        Policy.requestWorkspaceOwnerChange(policyID);
+        Member.clearWorkspaceOwnerChangeFlow(policyID);
+        Member.requestWorkspaceOwnerChange(policyID);
         Navigation.navigate(ROUTES.WORKSPACE_OWNER_CHANGE_CHECK.getRoute(policyID, accountID, 'amountOwed' as ValueOf<typeof CONST.POLICY.OWNERSHIP_ERRORS>));
     }, [accountID, policyID]);
 
+    // eslint-disable-next-line rulesdir/no-negated-variables
+    const shouldShowNotFoundPage =
+        !member || (member.pendingAction === CONST.RED_BRICK_ROAD_PENDING_ACTION.DELETE && prevMember?.pendingAction === CONST.RED_BRICK_ROAD_PENDING_ACTION.DELETE);
+
+    if (shouldShowNotFoundPage) {
+        return <NotFoundPage />;
+    }
+
     return (
         <AccessOrNotFoundWrapper
             policyID={policyID}
             accessVariants={[CONST.POLICY.ACCESS_VARIANTS.ADMIN, CONST.POLICY.ACCESS_VARIANTS.PAID]}
         >
             <ScreenWrapper testID={WorkspaceMemberDetailsPage.displayName}>
-                <HeaderWithBackButton
-                    title={displayName}
-                    subtitle={policy?.name}
-                />
-                <View style={[styles.containerWithSpaceBetween, styles.pointerEventsBoxNone, styles.justifyContentStart]}>
-                    <View style={[styles.avatarSectionWrapper, styles.pb0]}>
-                        <OfflineWithFeedback pendingAction={details.pendingFields?.avatar}>
-                            <Avatar
-                                containerStyles={[styles.avatarXLarge, styles.mv5, styles.noOutline]}
-                                imageStyles={[styles.avatarXLarge]}
-                                source={UserUtils.getAvatar(avatar, accountID)}
-                                size={CONST.AVATAR_SIZE.XLARGE}
-                                fallbackIcon={fallbackIcon}
-                            />
-                        </OfflineWithFeedback>
-                        {Boolean(details.displayName ?? '') && (
-                            <Text
-                                style={[styles.textHeadline, styles.pre, styles.mb6, styles.w100, styles.textAlignCenter]}
-                                numberOfLines={1}
-                            >
-                                {displayName}
-                            </Text>
-                        )}
-                        {isSelectedMemberOwner && isCurrentUserAdmin && !isCurrentUserOwner ? (
-                            <Button
-                                text={translate('workspace.people.transferOwner')}
-                                onPress={startChangeOwnershipFlow}
-                                medium
-                                isDisabled={isOffline}
-                                icon={Expensicons.Transfer}
-                                iconStyles={StyleUtils.getTransformScaleStyle(0.8)}
-                                style={styles.mv5}
-                            />
-                        ) : (
-                            <Button
-                                text={translate('workspace.people.removeMemberButtonTitle')}
-                                onPress={askForConfirmationToRemove}
-                                medium
-                                isDisabled={isSelectedMemberOwner || isSelectedMemberCurrentUser}
-                                icon={Expensicons.RemoveMembers}
-                                iconStyles={StyleUtils.getTransformScaleStyle(0.8)}
-                                style={styles.mv5}
-                            />
-                        )}
-                        <ConfirmModal
-                            danger
-                            title={translate('workspace.people.removeMemberTitle')}
-                            isVisible={isRemoveMemberConfirmModalVisible}
-                            onConfirm={removeUser}
-                            onCancel={() => setIsRemoveMemberConfirmModalVisible(false)}
-                            prompt={translate('workspace.people.removeMemberPrompt', {memberName: displayName})}
-                            confirmText={translate('common.remove')}
-                            cancelText={translate('common.cancel')}
-                        />
-                    </View>
-                    <View style={styles.w100}>
-                        <MenuItemWithTopDescription
-                            disabled={isSelectedMemberOwner || isSelectedMemberCurrentUser}
-                            title={member?.role === CONST.POLICY.ROLE.ADMIN ? translate('common.admin') : translate('common.member')}
-                            description={translate('common.role')}
-                            shouldShowRightIcon
-                            onPress={openRoleSelectionModal}
-                        />
-                        <MenuItem
-                            title={translate('common.profile')}
-                            icon={Expensicons.Info}
-                            onPress={navigateToProfile}
-                            shouldShowRightIcon
-                        />
-                        <WorkspaceMemberDetailsRoleSelectionModal
-                            isVisible={isRoleSelectionModalVisible}
-                            items={roleItems}
-                            onRoleChange={changeRole}
-                            onClose={() => setIsRoleSelectionModalVisible(false)}
+                {({safeAreaPaddingBottomStyle}) => (
+                    <>
+                        <HeaderWithBackButton
+                            title={displayName}
+                            subtitle={policy?.name}
                         />
-                    </View>
-                </View>
+                        <ScrollView contentContainerStyle={safeAreaPaddingBottomStyle}>
+                            <View style={[styles.containerWithSpaceBetween, styles.pointerEventsBoxNone, styles.justifyContentStart]}>
+                                <View style={[styles.avatarSectionWrapper, styles.pb0]}>
+                                    <OfflineWithFeedback pendingAction={details.pendingFields?.avatar}>
+                                        <Avatar
+                                            containerStyles={[styles.avatarXLarge, styles.mv5, styles.noOutline]}
+                                            imageStyles={[styles.avatarXLarge]}
+                                            source={details.avatar}
+                                            avatarID={accountID}
+                                            type={CONST.ICON_TYPE_AVATAR}
+                                            size={CONST.AVATAR_SIZE.XLARGE}
+                                            fallbackIcon={fallbackIcon}
+                                        />
+                                    </OfflineWithFeedback>
+                                    {!!(details.displayName ?? '') && (
+                                        <Text
+                                            style={[styles.textHeadline, styles.pre, styles.mb6, styles.w100, styles.textAlignCenter]}
+                                            numberOfLines={1}
+                                        >
+                                            {displayName}
+                                        </Text>
+                                    )}
+                                    {isSelectedMemberOwner && isCurrentUserAdmin && !isCurrentUserOwner ? (
+                                        <Button
+                                            text={translate('workspace.people.transferOwner')}
+                                            onPress={startChangeOwnershipFlow}
+                                            medium
+                                            isDisabled={isOffline}
+                                            icon={Expensicons.Transfer}
+                                            iconStyles={StyleUtils.getTransformScaleStyle(0.8)}
+                                            style={styles.mv5}
+                                        />
+                                    ) : (
+                                        <Button
+                                            text={translate('workspace.people.removeMemberButtonTitle')}
+                                            onPress={askForConfirmationToRemove}
+                                            medium
+                                            isDisabled={isSelectedMemberOwner || isSelectedMemberCurrentUser}
+                                            icon={Expensicons.RemoveMembers}
+                                            iconStyles={StyleUtils.getTransformScaleStyle(0.8)}
+                                            style={styles.mv5}
+                                        />
+                                    )}
+                                    <ConfirmModal
+                                        danger
+                                        title={translate('workspace.people.removeMemberTitle')}
+                                        isVisible={isRemoveMemberConfirmModalVisible}
+                                        onConfirm={removeUser}
+                                        onCancel={() => setIsRemoveMemberConfirmModalVisible(false)}
+                                        prompt={confirmModalPrompt}
+                                        confirmText={translate('common.remove')}
+                                        cancelText={translate('common.cancel')}
+                                    />
+                                </View>
+                                <View style={styles.w100}>
+                                    <MenuItemWithTopDescription
+                                        disabled={isSelectedMemberOwner || isSelectedMemberCurrentUser}
+                                        title={member?.role === CONST.POLICY.ROLE.ADMIN ? translate('common.admin') : translate('common.member')}
+                                        description={translate('common.role')}
+                                        shouldShowRightIcon
+                                        onPress={openRoleSelectionModal}
+                                    />
+                                    <MenuItem
+                                        style={styles.mb5}
+                                        title={translate('common.profile')}
+                                        icon={Expensicons.Info}
+                                        onPress={navigateToProfile}
+                                        shouldShowRightIcon
+                                    />
+                                    <WorkspaceMemberDetailsRoleSelectionModal
+                                        isVisible={isRoleSelectionModalVisible}
+                                        items={roleItems}
+                                        onRoleChange={changeRole}
+                                        onClose={() => setIsRoleSelectionModalVisible(false)}
+                                    />
+                                    {policy?.areExpensifyCardsEnabled && (
+                                        <>
+                                            <View style={[styles.ph5, styles.pv3]}>
+                                                <Text style={StyleUtils.combineStyles([styles.sidebarLinkText, styles.optionAlternateText, styles.textLabelSupporting])}>
+                                                    {translate('walletPage.assignedCards')}
+                                                </Text>
+                                            </View>
+                                            {memberCards.map((card) => (
+                                                <MenuItem
+                                                    title={card.nameValuePairs?.cardTitle}
+                                                    badgeText={CurrencyUtils.convertAmountToDisplayString(card.nameValuePairs?.unapprovedExpenseLimit)}
+                                                    icon={ExpensifyCardImage}
+                                                    displayInDefaultIconColor
+                                                    iconStyles={styles.cardIcon}
+                                                    contentFit="contain"
+                                                    iconWidth={variables.cardIconWidth}
+                                                    iconHeight={variables.cardIconHeight}
+                                                    onPress={() => navigateToDetails(card.cardID.toString())}
+                                                    shouldShowRightIcon
+                                                />
+                                            ))}
+                                            <MenuItem
+                                                title={translate('workspace.expensifyCard.newCard')}
+                                                icon={Expensicons.Plus}
+                                                onPress={navigateToIssueNewCard}
+                                            />
+                                        </>
+                                    )}
+                                </View>
+                            </View>
+                        </ScrollView>
+                    </>
+                )}
             </ScreenWrapper>
         </AccessOrNotFoundWrapper>
     );
diff --git a/src/pages/workspace/members/WorkspaceMemberDetailsRoleSelectionModal.tsx b/src/pages/workspace/members/WorkspaceMemberDetailsRoleSelectionModal.tsx
index f1d4334f7069..31b6c7476a08 100644
--- a/src/pages/workspace/members/WorkspaceMemberDetailsRoleSelectionModal.tsx
+++ b/src/pages/workspace/members/WorkspaceMemberDetailsRoleSelectionModal.tsx
@@ -56,6 +56,7 @@ function WorkspaceMemberDetailsRoleSelectionModal({isVisible, items, onRoleChang
                         sections={[{data: items}]}
                         ListItem={RadioListItem}
                         onSelectRow={onRoleChange}
+                        shouldSingleExecuteRowSelect
                         initiallyFocusedOptionKey={items.find((item) => item.isSelected)?.keyForList}
                     />
                 </View>
diff --git a/src/pages/workspace/members/WorkspaceOwnerChangeCheck.tsx b/src/pages/workspace/members/WorkspaceOwnerChangeCheck.tsx
index 1ec928158a59..52d60dbd618d 100644
--- a/src/pages/workspace/members/WorkspaceOwnerChangeCheck.tsx
+++ b/src/pages/workspace/members/WorkspaceOwnerChangeCheck.tsx
@@ -1,4 +1,5 @@
 import React, {useCallback, useEffect, useState} from 'react';
+import {View} from 'react-native';
 import type {OnyxEntry} from 'react-native-onyx';
 import {withOnyx} from 'react-native-onyx';
 import type {ValueOf} from 'type-fest';
@@ -8,7 +9,7 @@ import useLocalize from '@hooks/useLocalize';
 import useThemeStyles from '@hooks/useThemeStyles';
 import * as WorkspaceSettingsUtils from '@libs/WorkspacesSettingsUtils';
 import Navigation from '@navigation/Navigation';
-import * as PolicyActions from '@userActions/Policy';
+import * as MemberActions from '@userActions/Policy/Member';
 import CONST from '@src/CONST';
 import ONYXKEYS from '@src/ONYXKEYS';
 import ROUTES from '@src/ROUTES';
@@ -39,7 +40,7 @@ function WorkspaceOwnerChangeCheck({personalDetails, policy, accountID, error}:
         buttonText: '',
     });
 
-    const policyID = policy?.id ?? '';
+    const policyID = policy?.id ?? '-1';
 
     const updateDisplayTexts = useCallback(() => {
         const changeOwnerErrors = Object.keys(policy?.errorFields?.changeOwner ?? {});
@@ -53,7 +54,7 @@ function WorkspaceOwnerChangeCheck({personalDetails, policy, accountID, error}:
 
     useEffect(() => {
         updateDisplayTexts();
-        // eslint-disable-next-line react-hooks/exhaustive-deps
+        // eslint-disable-next-line react-compiler/react-compiler, react-hooks/exhaustive-deps
     }, []);
 
     useEffect(() => {
@@ -63,25 +64,27 @@ function WorkspaceOwnerChangeCheck({personalDetails, policy, accountID, error}:
     const confirm = useCallback(() => {
         if (error === CONST.POLICY.OWNERSHIP_ERRORS.HAS_FAILED_SETTLEMENTS || error === CONST.POLICY.OWNERSHIP_ERRORS.FAILED_TO_CLEAR_BALANCE) {
             // cannot transfer ownership if there are failed settlements, or we cannot clear the balance
-            PolicyActions.clearWorkspaceOwnerChangeFlow(policyID);
+            MemberActions.clearWorkspaceOwnerChangeFlow(policyID);
             Navigation.goBack();
             Navigation.navigate(ROUTES.WORKSPACE_MEMBER_DETAILS.getRoute(policyID, accountID));
             return;
         }
 
-        PolicyActions.requestWorkspaceOwnerChange(policyID);
+        MemberActions.requestWorkspaceOwnerChange(policyID);
     }, [accountID, error, policyID]);
 
     return (
         <>
             <Text style={[styles.textHeadline, styles.mt3, styles.mb2]}>{displayTexts.title}</Text>
             <Text style={styles.flex1}>{displayTexts.text}</Text>
-            <Button
-                success
-                large
-                onPress={confirm}
-                text={displayTexts.buttonText}
-            />
+            <View style={styles.pb5}>
+                <Button
+                    success
+                    large
+                    onPress={confirm}
+                    text={displayTexts.buttonText}
+                />
+            </View>
         </>
     );
 }
diff --git a/src/pages/workspace/members/WorkspaceOwnerChangeErrorPage.tsx b/src/pages/workspace/members/WorkspaceOwnerChangeErrorPage.tsx
index 7f0d14801b66..b24a2a53d0ef 100644
--- a/src/pages/workspace/members/WorkspaceOwnerChangeErrorPage.tsx
+++ b/src/pages/workspace/members/WorkspaceOwnerChangeErrorPage.tsx
@@ -14,7 +14,7 @@ import useThemeStyles from '@hooks/useThemeStyles';
 import Navigation from '@navigation/Navigation';
 import type {SettingsNavigatorParamList} from '@navigation/types';
 import AccessOrNotFoundWrapper from '@pages/workspace/AccessOrNotFoundWrapper';
-import * as PolicyActions from '@userActions/Policy';
+import * as MemberActions from '@userActions/Policy/Member';
 import CONST from '@src/CONST';
 import ROUTES from '@src/ROUTES';
 import type SCREENS from '@src/SCREENS';
@@ -25,11 +25,11 @@ function WorkspaceOwnerChangeErrorPage({route}: WorkspaceOwnerChangeSuccessPageP
     const styles = useThemeStyles();
     const {translate} = useLocalize();
 
-    const accountID = Number(route.params.accountID) ?? 0;
+    const accountID = Number(route.params.accountID) ?? -1;
     const policyID = route.params.policyID;
 
     const closePage = useCallback(() => {
-        PolicyActions.clearWorkspaceOwnerChangeFlow(policyID);
+        MemberActions.clearWorkspaceOwnerChangeFlow(policyID);
         Navigation.goBack();
         Navigation.navigate(ROUTES.WORKSPACE_MEMBER_DETAILS.getRoute(policyID, accountID));
     }, [accountID, policyID]);
diff --git a/src/pages/workspace/members/WorkspaceOwnerChangeSuccessPage.tsx b/src/pages/workspace/members/WorkspaceOwnerChangeSuccessPage.tsx
index 1460808cd078..f5c9dd398bf6 100644
--- a/src/pages/workspace/members/WorkspaceOwnerChangeSuccessPage.tsx
+++ b/src/pages/workspace/members/WorkspaceOwnerChangeSuccessPage.tsx
@@ -9,7 +9,7 @@ import useThemeStyles from '@hooks/useThemeStyles';
 import Navigation from '@navigation/Navigation';
 import type {SettingsNavigatorParamList} from '@navigation/types';
 import AccessOrNotFoundWrapper from '@pages/workspace/AccessOrNotFoundWrapper';
-import * as PolicyActions from '@userActions/Policy';
+import * as MemberActions from '@userActions/Policy/Member';
 import CONST from '@src/CONST';
 import ROUTES from '@src/ROUTES';
 import type SCREENS from '@src/SCREENS';
@@ -20,11 +20,11 @@ function WorkspaceOwnerChangeSuccessPage({route}: WorkspaceOwnerChangeSuccessPag
     const styles = useThemeStyles();
     const {translate} = useLocalize();
 
-    const accountID = Number(route.params.accountID) ?? 0;
+    const accountID = Number(route.params.accountID) ?? -1;
     const policyID = route.params.policyID;
 
     const closePage = useCallback(() => {
-        PolicyActions.clearWorkspaceOwnerChangeFlow(policyID);
+        MemberActions.clearWorkspaceOwnerChangeFlow(policyID);
         Navigation.goBack();
         Navigation.navigate(ROUTES.WORKSPACE_MEMBER_DETAILS.getRoute(policyID, accountID));
     }, [accountID, policyID]);
@@ -40,7 +40,7 @@ function WorkspaceOwnerChangeSuccessPage({route}: WorkspaceOwnerChangeSuccessPag
                     onBackButtonPress={closePage}
                 />
                 <ConfirmationPage
-                    animation={LottieAnimations.Fireworks}
+                    illustration={LottieAnimations.Fireworks}
                     heading={translate('workspace.changeOwner.successTitle')}
                     description={translate('workspace.changeOwner.successDescription')}
                     descriptionStyle={styles.textSupporting}
diff --git a/src/pages/workspace/members/WorkspaceOwnerChangeWrapperPage.tsx b/src/pages/workspace/members/WorkspaceOwnerChangeWrapperPage.tsx
index 16afaa147157..f6ab69b1e9c5 100644
--- a/src/pages/workspace/members/WorkspaceOwnerChangeWrapperPage.tsx
+++ b/src/pages/workspace/members/WorkspaceOwnerChangeWrapperPage.tsx
@@ -12,7 +12,7 @@ import type {SettingsNavigatorParamList} from '@navigation/types';
 import AccessOrNotFoundWrapper from '@pages/workspace/AccessOrNotFoundWrapper';
 import withPolicy from '@pages/workspace/withPolicy';
 import type {WithPolicyOnyxProps} from '@pages/workspace/withPolicy';
-import * as PolicyActions from '@userActions/Policy';
+import * as MemberActions from '@userActions/Policy/Member';
 import CONST from '@src/CONST';
 import ROUTES from '@src/ROUTES';
 import type SCREENS from '@src/SCREENS';
@@ -36,19 +36,21 @@ function WorkspaceOwnerChangeWrapperPage({route, policy}: WorkspaceOwnerChangeWr
 
         if (!policy.errorFields && policy.isChangeOwnerFailed) {
             // there are some errors but not related to change owner flow - show an error page
+            Navigation.goBack();
             Navigation.navigate(ROUTES.WORKSPACE_OWNER_CHANGE_ERROR.getRoute(policyID, accountID));
             return;
         }
 
         if (!policy?.errorFields?.changeOwner && policy?.isChangeOwnerSuccessful) {
             // no errors - show a success page
+            Navigation.goBack();
             Navigation.navigate(ROUTES.WORKSPACE_OWNER_CHANGE_SUCCESS.getRoute(policyID, accountID));
             return;
         }
 
         const changeOwnerErrors = Object.keys(policy?.errorFields?.changeOwner ?? {});
 
-        if (changeOwnerErrors && changeOwnerErrors.length > 0 && changeOwnerErrors[0] !== CONST.POLICY.OWNERSHIP_ERRORS.NO_BILLING_CARD) {
+        if (changeOwnerErrors && changeOwnerErrors.length > 0) {
             Navigation.navigate(ROUTES.WORKSPACE_OWNER_CHANGE_CHECK.getRoute(policyID, accountID, changeOwnerErrors[0] as ValueOf<typeof CONST.POLICY.OWNERSHIP_ERRORS>));
         }
     }, [accountID, policy, policy?.errorFields?.changeOwner, policyID]);
@@ -62,12 +64,12 @@ function WorkspaceOwnerChangeWrapperPage({route, policy}: WorkspaceOwnerChangeWr
                 <HeaderWithBackButton
                     title={translate('workspace.changeOwner.changeOwnerPageTitle')}
                     onBackButtonPress={() => {
-                        PolicyActions.clearWorkspaceOwnerChangeFlow(policyID);
+                        MemberActions.clearWorkspaceOwnerChangeFlow(policyID);
                         Navigation.goBack();
                         Navigation.navigate(ROUTES.WORKSPACE_MEMBER_DETAILS.getRoute(policyID, accountID));
                     }}
                 />
-                <View style={[styles.containerWithSpaceBetween, styles.ph5, error === CONST.POLICY.OWNERSHIP_ERRORS.NO_BILLING_CARD ? styles.pb0 : styles.pb5]}>
+                <View style={[styles.containerWithSpaceBetween, error !== CONST.POLICY.OWNERSHIP_ERRORS.NO_BILLING_CARD ? styles.ph5 : styles.ph0, styles.pb0]}>
                     {policy?.isLoading && <FullScreenLoadingIndicator />}
                     {!policy?.isLoading &&
                         (error === CONST.POLICY.OWNERSHIP_ERRORS.NO_BILLING_CARD ? (
diff --git a/src/pages/workspace/members/WorkspaceOwnerPaymentCardCurrencyModal.tsx b/src/pages/workspace/members/WorkspaceOwnerPaymentCardCurrencyModal.tsx
deleted file mode 100644
index fcbbbbd4af3f..000000000000
--- a/src/pages/workspace/members/WorkspaceOwnerPaymentCardCurrencyModal.tsx
+++ /dev/null
@@ -1,84 +0,0 @@
-import React, {useMemo} from 'react';
-import HeaderWithBackButton from '@components/HeaderWithBackButton';
-import Modal from '@components/Modal';
-import ScreenWrapper from '@components/ScreenWrapper';
-import SelectionList from '@components/SelectionList';
-import RadioListItem from '@components/SelectionList/RadioListItem';
-import useLocalize from '@hooks/useLocalize';
-import useThemeStyles from '@hooks/useThemeStyles';
-import CONST from '@src/CONST';
-
-type WorkspaceOwnerPaymentCardCurrencyModalProps = {
-    /** Whether the modal is visible */
-    isVisible: boolean;
-
-    /** The list of years to render */
-    currencies: Array<keyof typeof CONST.CURRENCY>;
-
-    /** Currently selected year */
-    currentCurrency: keyof typeof CONST.CURRENCY;
-
-    /** Function to call when the user selects a year */
-    onCurrencyChange?: (currency: keyof typeof CONST.CURRENCY) => void;
-
-    /** Function to call when the user closes the year picker */
-    onClose?: () => void;
-};
-
-function WorkspaceOwnerPaymentCardCurrencyModal({isVisible, currencies, currentCurrency = CONST.CURRENCY.USD, onCurrencyChange, onClose}: WorkspaceOwnerPaymentCardCurrencyModalProps) {
-    const styles = useThemeStyles();
-    const {translate} = useLocalize();
-    const {sections} = useMemo(
-        () => ({
-            sections: [
-                {
-                    data: currencies.map((currency) => ({
-                        text: currency,
-                        value: currency,
-                        keyForList: currency,
-                        isSelected: currency === currentCurrency,
-                    })),
-                },
-            ],
-        }),
-        [currencies, currentCurrency],
-    );
-
-    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}
-                testID={WorkspaceOwnerPaymentCardCurrencyModal.displayName}
-            >
-                <HeaderWithBackButton
-                    title={translate('common.currency')}
-                    onBackButtonPress={onClose}
-                />
-                <SelectionList
-                    sections={sections}
-                    onSelectRow={(option) => {
-                        onCurrencyChange?.(option.value);
-                    }}
-                    initiallyFocusedOptionKey={currentCurrency}
-                    showScrollIndicator
-                    shouldStopPropagation
-                    shouldUseDynamicMaxToRenderPerBatch
-                    ListItem={RadioListItem}
-                />
-            </ScreenWrapper>
-        </Modal>
-    );
-}
-
-WorkspaceOwnerPaymentCardCurrencyModal.displayName = 'WorkspaceOwnerPaymentCardCurrencyModal';
-
-export default WorkspaceOwnerPaymentCardCurrencyModal;
diff --git a/src/pages/workspace/members/WorkspaceOwnerPaymentCardForm.tsx b/src/pages/workspace/members/WorkspaceOwnerPaymentCardForm.tsx
index 293a5c2d7c09..91e22fd9fcd5 100644
--- a/src/pages/workspace/members/WorkspaceOwnerPaymentCardForm.tsx
+++ b/src/pages/workspace/members/WorkspaceOwnerPaymentCardForm.tsx
@@ -1,50 +1,36 @@
-import React, {useCallback, useEffect, useRef, useState} from 'react';
+import React, {useCallback, useEffect, useState} from 'react';
 import {View} from 'react-native';
 import type {OnyxEntry} from 'react-native-onyx';
-import FormProvider from '@components/Form/FormProvider';
-import InputWrapper from '@components/Form/InputWrapper';
-import type {FormInputErrors, FormOnyxValues} from '@components/Form/types';
-import Hoverable from '@components/Hoverable';
+import PaymentCardForm from '@components/AddPaymentCard/PaymentCardForm';
+import type {FormOnyxValues} from '@components/Form/types';
 import Icon from '@components/Icon';
 import * as Expensicons from '@components/Icon/Expensicons';
 import * as Illustrations from '@components/Icon/Illustrations';
-import type {AnimatedTextInputRef} from '@components/RNTextInput';
 import Section, {CARD_LAYOUT} from '@components/Section';
 import Text from '@components/Text';
-import TextInput from '@components/TextInput';
 import TextLink from '@components/TextLink';
 import useLocalize from '@hooks/useLocalize';
 import useTheme from '@hooks/useTheme';
 import useThemeStyles from '@hooks/useThemeStyles';
 import * as CardUtils from '@libs/CardUtils';
-import * as ValidationUtils from '@libs/ValidationUtils';
 import * as PaymentMethods from '@userActions/PaymentMethods';
-import * as PolicyActions from '@userActions/Policy';
+import * as PolicyActions from '@userActions/Policy/Policy';
 import CONST from '@src/CONST';
-import ONYXKEYS from '@src/ONYXKEYS';
-import INPUT_IDS from '@src/types/form/AddDebitCardForm';
+import type ONYXKEYS from '@src/ONYXKEYS';
 import type * as OnyxTypes from '@src/types/onyx';
-import WorkspaceOwnerPaymentCardCurrencyModal from './WorkspaceOwnerPaymentCardCurrencyModal';
 
 type WorkspaceOwnerPaymentCardFormProps = {
     /** The policy */
     policy: OnyxEntry<OnyxTypes.Policy>;
 };
 
-const REQUIRED_FIELDS = [INPUT_IDS.NAME_ON_CARD, INPUT_IDS.CARD_NUMBER, INPUT_IDS.EXPIRATION_DATE, INPUT_IDS.ADDRESS_STREET, INPUT_IDS.SECURITY_CODE, INPUT_IDS.ADDRESS_ZIP_CODE];
-
 function WorkspaceOwnerPaymentCardForm({policy}: WorkspaceOwnerPaymentCardFormProps) {
-    const styles = useThemeStyles();
-    const theme = useTheme();
     const {translate} = useLocalize();
-
-    const cardNumberRef = useRef<AnimatedTextInputRef>(null);
-
-    const [isCurrencyModalVisible, setIsCurrencyModalVisible] = useState(false);
-    const [currency, setCurrency] = useState<keyof typeof CONST.CURRENCY>(CONST.CURRENCY.USD);
+    const theme = useTheme();
+    const styles = useThemeStyles();
     const [shouldShowPaymentCardForm, setShouldShowPaymentCardForm] = useState(false);
 
-    const policyID = policy?.id ?? '';
+    const policyID = policy?.id ?? '-1';
 
     const checkIfCanBeRendered = useCallback(() => {
         const changeOwnerErrors = Object.keys(policy?.errorFields?.changeOwner ?? {});
@@ -57,14 +43,14 @@ function WorkspaceOwnerPaymentCardForm({policy}: WorkspaceOwnerPaymentCardFormPr
 
     useEffect(
         () => {
-            PaymentMethods.clearDebitCardFormErrorAndSubmit();
+            PaymentMethods.clearPaymentCardFormErrorAndSubmit();
             checkIfCanBeRendered();
 
             return () => {
-                PaymentMethods.clearDebitCardFormErrorAndSubmit();
+                PaymentMethods.clearPaymentCardFormErrorAndSubmit();
             };
         },
-        // eslint-disable-next-line react-hooks/exhaustive-deps
+        // eslint-disable-next-line react-compiler/react-compiler, react-hooks/exhaustive-deps
         [],
     );
 
@@ -72,40 +58,10 @@ function WorkspaceOwnerPaymentCardForm({policy}: WorkspaceOwnerPaymentCardFormPr
         checkIfCanBeRendered();
     }, [checkIfCanBeRendered]);
 
-    const validate = (formValues: FormOnyxValues<typeof ONYXKEYS.FORMS.ADD_DEBIT_CARD_FORM>): FormInputErrors<typeof ONYXKEYS.FORMS.ADD_DEBIT_CARD_FORM> => {
-        const errors = ValidationUtils.getFieldRequiredErrors(formValues, REQUIRED_FIELDS);
-
-        if (formValues.nameOnCard && !ValidationUtils.isValidLegalName(formValues.nameOnCard)) {
-            errors.nameOnCard = 'addDebitCardPage.error.invalidName';
-        }
-
-        if (formValues.cardNumber && !ValidationUtils.isValidDebitCard(formValues.cardNumber.replace(/ /g, ''))) {
-            errors.cardNumber = 'addDebitCardPage.error.debitCardNumber';
-        }
-
-        if (formValues.expirationDate && !ValidationUtils.isValidExpirationDate(formValues.expirationDate)) {
-            errors.expirationDate = 'addDebitCardPage.error.expirationDate';
-        }
-
-        if (formValues.securityCode && !ValidationUtils.isValidSecurityCode(formValues.securityCode)) {
-            errors.securityCode = 'addDebitCardPage.error.securityCode';
-        }
-
-        if (formValues.addressStreet && !ValidationUtils.isValidAddress(formValues.addressStreet)) {
-            errors.addressStreet = 'addDebitCardPage.error.addressStreet';
-        }
-
-        if (formValues.addressZipCode && !ValidationUtils.isValidZipCode(formValues.addressZipCode)) {
-            errors.addressZipCode = 'addDebitCardPage.error.addressZipCode';
-        }
-
-        return errors;
-    };
-
     const addPaymentCard = useCallback(
-        (values: FormOnyxValues<typeof ONYXKEYS.FORMS.ADD_DEBIT_CARD_FORM>) => {
+        (values: FormOnyxValues<typeof ONYXKEYS.FORMS.ADD_PAYMENT_CARD_FORM>) => {
             const cardData = {
-                cardNumber: values.cardNumber,
+                cardNumber: CardUtils.getMCardNumberString(values.cardNumber),
                 cardMonth: CardUtils.getMonthFromExpirationDateString(values.expirationDate),
                 cardYear: CardUtils.getYearFromExpirationDateString(values.expirationDate),
                 cardCVV: values.securityCode,
@@ -119,174 +75,78 @@ function WorkspaceOwnerPaymentCardForm({policy}: WorkspaceOwnerPaymentCardFormPr
         [policyID],
     );
 
-    const showCurrenciesModal = useCallback(() => {
-        setIsCurrencyModalVisible(true);
-    }, []);
-
-    const changeCurrency = useCallback((newCurrency: keyof typeof CONST.CURRENCY) => {
-        setCurrency(newCurrency);
-        setIsCurrencyModalVisible(false);
-    }, []);
-
-    if (!shouldShowPaymentCardForm) {
-        return null;
-    }
-
     return (
-        <>
-            <Text style={[styles.textHeadline, styles.mt3, styles.mb2]}>{translate('workspace.changeOwner.addPaymentCardTitle')}</Text>
-            <FormProvider
-                formID={ONYXKEYS.FORMS.ADD_DEBIT_CARD_FORM}
-                validate={validate}
-                onSubmit={addPaymentCard}
-                submitButtonText={translate('workspace.changeOwner.addPaymentCardButtonText')}
-                scrollContextEnabled
-                style={[styles.flexGrow1]}
-            >
-                <InputWrapper
-                    InputComponent={TextInput}
-                    inputID={INPUT_IDS.CARD_NUMBER}
-                    label={translate('addDebitCardPage.debitCardNumber')}
-                    aria-label={translate('addDebitCardPage.debitCardNumber')}
-                    role={CONST.ROLE.PRESENTATION}
-                    ref={cardNumberRef}
-                    inputMode={CONST.INPUT_MODE.NUMERIC}
-                />
-                <InputWrapper
-                    InputComponent={TextInput}
-                    inputID={INPUT_IDS.NAME_ON_CARD}
-                    label={translate('addDebitCardPage.nameOnCard')}
-                    aria-label={translate('addDebitCardPage.nameOnCard')}
-                    role={CONST.ROLE.PRESENTATION}
-                    containerStyles={[styles.mt5]}
-                    spellCheck={false}
-                />
-                <View style={[styles.flexRow, styles.mt5]}>
-                    <View style={[styles.flex1, styles.mr2]}>
-                        <InputWrapper
-                            InputComponent={TextInput}
-                            inputID={INPUT_IDS.EXPIRATION_DATE}
-                            label={translate('addDebitCardPage.expiration')}
-                            aria-label={translate('addDebitCardPage.expiration')}
-                            role={CONST.ROLE.PRESENTATION}
-                            placeholder={translate('addDebitCardPage.expirationDate')}
-                            inputMode={CONST.INPUT_MODE.NUMERIC}
-                            maxLength={4}
-                        />
-                    </View>
-                    <View style={[styles.flex1]}>
-                        <InputWrapper
-                            InputComponent={TextInput}
-                            inputID={INPUT_IDS.SECURITY_CODE}
-                            label={translate('addDebitCardPage.cvv')}
-                            aria-label={translate('addDebitCardPage.cvv')}
-                            role={CONST.ROLE.PRESENTATION}
-                            maxLength={4}
-                            inputMode={CONST.INPUT_MODE.NUMERIC}
-                        />
-                    </View>
-                </View>
-                <View style={[styles.flexRow, styles.mt5]}>
-                    <View style={[styles.flex1, styles.mr2]}>
-                        <InputWrapper
-                            InputComponent={TextInput}
-                            inputID={INPUT_IDS.ADDRESS_ZIP_CODE}
-                            label={translate('common.zip')}
-                            aria-label={translate('common.zip')}
-                            role={CONST.ROLE.PRESENTATION}
-                            inputMode={CONST.INPUT_MODE.NUMERIC}
-                            maxLength={CONST.BANK_ACCOUNT.MAX_LENGTH.ZIP_CODE}
-                        />
-                    </View>
-                    <View style={[styles.flex1]}>
-                        <Hoverable>
-                            {(isHovered) => (
-                                <TextInput
-                                    label={translate('common.currency')}
-                                    aria-label={translate('common.currency')}
-                                    role={CONST.ROLE.COMBOBOX}
-                                    icon={Expensicons.ArrowRight}
-                                    onPress={showCurrenciesModal}
-                                    value={currency}
-                                    inputStyle={isHovered && styles.cursorPointer}
-                                    hideFocusedState
-                                    caretHidden
-                                />
-                            )}
-                        </Hoverable>
-                    </View>
-                </View>
-
-                <WorkspaceOwnerPaymentCardCurrencyModal
-                    isVisible={isCurrencyModalVisible}
-                    currencies={Object.keys(CONST.CURRENCY) as Array<keyof typeof CONST.CURRENCY>}
-                    currentCurrency={currency}
-                    onCurrencyChange={changeCurrency}
-                    onClose={() => setIsCurrencyModalVisible(false)}
-                />
-
-                <Text style={[styles.textMicroSupporting, styles.mt5]}>
-                    {translate('workspace.changeOwner.addPaymentCardReadAndAcceptTextPart1')}{' '}
-                    <TextLink
-                        style={[styles.textMicroSupporting, styles.link]}
-                        href={CONST.TERMS_URL}
-                    >
-                        {translate('workspace.changeOwner.addPaymentCardTerms')}
-                    </TextLink>{' '}
-                    {translate('workspace.changeOwner.addPaymentCardAnd')}{' '}
-                    <TextLink
-                        style={[styles.textMicroSupporting, styles.link]}
-                        href={CONST.PRIVACY_URL}
-                    >
-                        {translate('workspace.changeOwner.addPaymentCardPrivacy')}
-                    </TextLink>{' '}
-                    {translate('workspace.changeOwner.addPaymentCardReadAndAcceptTextPart2')}
-                </Text>
-                <Section
-                    icon={Illustrations.ShieldYellow}
-                    cardLayout={CARD_LAYOUT.ICON_ON_LEFT}
-                    title={translate('requestorStep.isMyDataSafe')}
-                    containerStyles={[styles.mh0, styles.mt5]}
-                >
-                    <View style={[styles.mt4, styles.ph2, styles.pb2]}>
-                        <Text style={[styles.searchInputStyle, styles.dFlex, styles.alignItemsCenter]}>
-                            <Icon
-                                src={Expensicons.Checkmark}
-                                additionalStyles={[styles.mr3]}
-                                fill={theme.iconSuccessFill}
-                            />
-                            {translate('workspace.changeOwner.addPaymentCardPciCompliant')}
-                        </Text>
-                        <Text style={[styles.mt3, styles.searchInputStyle, styles.dFlex, styles.alignItemsCenter]}>
-                            <Icon
-                                src={Expensicons.Checkmark}
-                                additionalStyles={[styles.mr3]}
-                                fill={theme.iconSuccessFill}
-                            />
-                            {translate('workspace.changeOwner.addPaymentCardBankLevelEncrypt')}
-                        </Text>
-                        <Text style={[styles.mt3, styles.searchInputStyle, styles.dFlex, styles.alignItemsCenter]}>
-                            <Icon
-                                src={Expensicons.Checkmark}
-                                additionalStyles={[styles.mr3]}
-                                fill={theme.iconSuccessFill}
-                            />
-                            {translate('workspace.changeOwner.addPaymentCardRedundant')}
-                        </Text>
-                    </View>
-                    <Text style={[styles.mt3, styles.searchInputStyle]}>
-                        {translate('workspace.changeOwner.addPaymentCardLearnMore')}{' '}
+        <PaymentCardForm
+            shouldShowPaymentCardForm={shouldShowPaymentCardForm}
+            addPaymentCard={addPaymentCard}
+            showCurrencyField
+            submitButtonText={translate('workspace.changeOwner.addPaymentCardButtonText')}
+            headerContent={<Text style={[styles.textHeadline, styles.mt3, styles.mb2, styles.ph5]}>{translate('workspace.changeOwner.addPaymentCardTitle')}</Text>}
+            footerContent={
+                <>
+                    <Text style={[styles.textMicroSupporting, styles.mt5]}>
+                        {translate('workspace.changeOwner.addPaymentCardReadAndAcceptTextPart1')}{' '}
                         <TextLink
-                            style={[styles.searchInputStyle, styles.link]}
-                            href={CONST.PERSONAL_DATA_PROTECTION_INFO_URL}
+                            style={[styles.textMicroSupporting, styles.link]}
+                            href={CONST.TERMS_URL}
                         >
-                            {translate('workspace.changeOwner.addPaymentCardSecurity')}
-                        </TextLink>
-                        .
+                            {translate('workspace.changeOwner.addPaymentCardTerms')}
+                        </TextLink>{' '}
+                        {translate('workspace.changeOwner.addPaymentCardAnd')}{' '}
+                        <TextLink
+                            style={[styles.textMicroSupporting, styles.link]}
+                            href={CONST.PRIVACY_URL}
+                        >
+                            {translate('workspace.changeOwner.addPaymentCardPrivacy')}
+                        </TextLink>{' '}
+                        {translate('workspace.changeOwner.addPaymentCardReadAndAcceptTextPart2')}
                     </Text>
-                </Section>
-            </FormProvider>
-        </>
+                    <Section
+                        icon={Illustrations.ShieldYellow}
+                        cardLayout={CARD_LAYOUT.ICON_ON_LEFT}
+                        title={translate('requestorStep.isMyDataSafe')}
+                        containerStyles={[styles.mh0, styles.mt5]}
+                    >
+                        <View style={[styles.mt4, styles.ph2, styles.pb2]}>
+                            <Text style={[styles.searchInputStyle, styles.dFlex, styles.alignItemsCenter]}>
+                                <Icon
+                                    src={Expensicons.Checkmark}
+                                    additionalStyles={[styles.mr3]}
+                                    fill={theme.iconSuccessFill}
+                                />
+                                {translate('workspace.changeOwner.addPaymentCardPciCompliant')}
+                            </Text>
+                            <Text style={[styles.mt3, styles.searchInputStyle, styles.dFlex, styles.alignItemsCenter]}>
+                                <Icon
+                                    src={Expensicons.Checkmark}
+                                    additionalStyles={[styles.mr3]}
+                                    fill={theme.iconSuccessFill}
+                                />
+                                {translate('workspace.changeOwner.addPaymentCardBankLevelEncrypt')}
+                            </Text>
+                            <Text style={[styles.mt3, styles.searchInputStyle, styles.dFlex, styles.alignItemsCenter]}>
+                                <Icon
+                                    src={Expensicons.Checkmark}
+                                    additionalStyles={[styles.mr3]}
+                                    fill={theme.iconSuccessFill}
+                                />
+                                {translate('workspace.changeOwner.addPaymentCardRedundant')}
+                            </Text>
+                        </View>
+                        <Text style={[styles.mt3, styles.searchInputStyle]}>
+                            {translate('workspace.changeOwner.addPaymentCardLearnMore')}{' '}
+                            <TextLink
+                                style={[styles.searchInputStyle, styles.link]}
+                                href={CONST.PERSONAL_DATA_PROTECTION_INFO_URL}
+                            >
+                                {translate('workspace.changeOwner.addPaymentCardSecurity')}
+                            </TextLink>
+                            .
+                        </Text>
+                    </Section>
+                </>
+            }
+        />
     );
 }
 
diff --git a/src/pages/workspace/reimburse/WorkspaceRateAndUnitPage.tsx b/src/pages/workspace/reimburse/WorkspaceRateAndUnitPage.tsx
deleted file mode 100644
index 8fef5f4dc6f9..000000000000
--- a/src/pages/workspace/reimburse/WorkspaceRateAndUnitPage.tsx
+++ /dev/null
@@ -1,158 +0,0 @@
-import type {StackScreenProps} from '@react-navigation/stack';
-import React, {useEffect} from 'react';
-import {Keyboard, View} from 'react-native';
-import FormProvider from '@components/Form/FormProvider';
-import InputWrapper from '@components/Form/InputWrapper';
-import type {FormOnyxValues} from '@components/Form/types';
-import OfflineWithFeedback from '@components/OfflineWithFeedback';
-import Picker from '@components/Picker';
-import TextInput from '@components/TextInput';
-import useLocalize from '@hooks/useLocalize';
-import useThemeStyles from '@hooks/useThemeStyles';
-import * as CurrencyUtils from '@libs/CurrencyUtils';
-import getPermittedDecimalSeparator from '@libs/getPermittedDecimalSeparator';
-import Navigation from '@libs/Navigation/Navigation';
-import type {SettingsNavigatorParamList} from '@libs/Navigation/types';
-import * as NumberUtils from '@libs/NumberUtils';
-import * as PolicyUtils from '@libs/PolicyUtils';
-import withPolicy from '@pages/workspace/withPolicy';
-import type {WithPolicyProps} from '@pages/workspace/withPolicy';
-import WorkspacePageWithSections from '@pages/workspace/WorkspacePageWithSections';
-import * as BankAccounts from '@userActions/BankAccounts';
-import * as Policy from '@userActions/Policy';
-import CONST from '@src/CONST';
-import type {TranslationPaths} from '@src/languages/types';
-import ONYXKEYS from '@src/ONYXKEYS';
-import ROUTES from '@src/ROUTES';
-import type SCREENS from '@src/SCREENS';
-import type {Unit} from '@src/types/onyx/Policy';
-
-type WorkspaceRateAndUnitPageProps = WithPolicyProps & StackScreenProps<SettingsNavigatorParamList, typeof SCREENS.WORKSPACE.RATE_AND_UNIT>;
-
-type ValidationError = {rate?: TranslationPaths | undefined};
-
-function WorkspaceRateAndUnitPage({policy, route}: WorkspaceRateAndUnitPageProps) {
-    const {translate, toLocaleDigit} = useLocalize();
-    const styles = useThemeStyles();
-
-    useEffect(() => {
-        if ((policy?.customUnits ?? []).length !== 0) {
-            return;
-        }
-
-        BankAccounts.setReimbursementAccountLoading(true);
-        Policy.openWorkspaceReimburseView(policy?.id ?? '');
-    }, [policy?.customUnits, policy?.id]);
-
-    const unitItems = [
-        {label: translate('common.kilometers'), value: CONST.CUSTOM_UNITS.DISTANCE_UNIT_KILOMETERS},
-        {label: translate('common.miles'), value: CONST.CUSTOM_UNITS.DISTANCE_UNIT_MILES},
-    ];
-
-    const saveUnitAndRate = (unit: Unit, rate: string) => {
-        const distanceCustomUnit = Object.values(policy?.customUnits ?? {}).find((customUnit) => customUnit.name === CONST.CUSTOM_UNITS.NAME_DISTANCE);
-        if (!distanceCustomUnit) {
-            return;
-        }
-        const currentCustomUnitRate = Object.values(distanceCustomUnit?.rates ?? {}).find((r) => r.name === CONST.CUSTOM_UNITS.DEFAULT_RATE);
-        const unitID = distanceCustomUnit.customUnitID ?? '';
-        const unitName = distanceCustomUnit.name ?? '';
-        const rateNumValue = PolicyUtils.getNumericValue(rate, toLocaleDigit);
-
-        const newCustomUnit: Policy.NewCustomUnit = {
-            customUnitID: unitID,
-            name: unitName,
-            attributes: {unit},
-            rates: {
-                ...currentCustomUnitRate,
-                rate: Number(rateNumValue) * CONST.POLICY.CUSTOM_UNIT_RATE_BASE_OFFSET,
-            },
-        };
-
-        Policy.updateWorkspaceCustomUnitAndRate(policy?.id ?? '', distanceCustomUnit, newCustomUnit, policy?.lastModified);
-    };
-
-    const submit = (values: FormOnyxValues<typeof ONYXKEYS.FORMS.WORKSPACE_RATE_AND_UNIT_FORM>) => {
-        saveUnitAndRate(values.unit as Unit, values.rate);
-        Keyboard.dismiss();
-        Navigation.goBack(ROUTES.WORKSPACE_REIMBURSE.getRoute(policy?.id ?? ''));
-    };
-
-    const validate = (values: FormOnyxValues<typeof ONYXKEYS.FORMS.WORKSPACE_RATE_AND_UNIT_FORM>): ValidationError => {
-        const errors: ValidationError = {};
-        const decimalSeparator = toLocaleDigit('.');
-        const outputCurrency = policy?.outputCurrency ?? CONST.CURRENCY.USD;
-        // Allow one more decimal place for accuracy
-        const rateValueRegex = RegExp(String.raw`^-?\d{0,8}([${getPermittedDecimalSeparator(decimalSeparator)}]\d{1,${CurrencyUtils.getCurrencyDecimals(outputCurrency) + 1}})?$`, 'i');
-        if (!rateValueRegex.test(values.rate) || values.rate === '') {
-            errors.rate = 'workspace.reimburse.invalidRateError';
-        } else if (NumberUtils.parseFloatAnyLocale(values.rate) <= 0) {
-            errors.rate = 'workspace.reimburse.lowRateError';
-        }
-        return errors;
-    };
-
-    const distanceCustomUnit = Object.values(policy?.customUnits ?? {}).find((unit) => unit.name === CONST.CUSTOM_UNITS.NAME_DISTANCE);
-    const distanceCustomRate = Object.values(distanceCustomUnit?.rates ?? {}).find((rate) => rate.name === CONST.CUSTOM_UNITS.DEFAULT_RATE);
-
-    return (
-        <WorkspacePageWithSections
-            headerText={translate('workspace.reimburse.trackDistance')}
-            route={route}
-            guidesCallTaskID={CONST.GUIDES_CALL_TASK_IDS.WORKSPACE_REIMBURSE}
-            shouldSkipVBBACall
-            backButtonRoute={ROUTES.WORKSPACE_REIMBURSE.getRoute(policy?.id ?? '')}
-            shouldShowLoading={false}
-        >
-            {() => (
-                <FormProvider
-                    formID={ONYXKEYS.FORMS.WORKSPACE_RATE_AND_UNIT_FORM}
-                    submitButtonText={translate('common.save')}
-                    style={[styles.mh5, styles.flexGrow1]}
-                    scrollContextEnabled
-                    validate={validate}
-                    onSubmit={submit}
-                    enabledWhenOffline
-                >
-                    <OfflineWithFeedback
-                        errors={{
-                            ...(distanceCustomUnit?.errors ?? {}),
-                            ...(distanceCustomRate?.errors ?? {}),
-                        }}
-                        pendingAction={distanceCustomUnit?.pendingAction ?? distanceCustomRate?.pendingAction}
-                        onClose={() => Policy.clearCustomUnitErrors(policy?.id ?? '', distanceCustomUnit?.customUnitID ?? '', distanceCustomRate?.customUnitRateID ?? '')}
-                    >
-                        <InputWrapper
-                            InputComponent={TextInput}
-                            role={CONST.ROLE.PRESENTATION}
-                            inputID="rate"
-                            containerStyles={styles.mt4}
-                            defaultValue={PolicyUtils.getUnitRateValue(toLocaleDigit, distanceCustomRate)}
-                            label={translate('workspace.reimburse.trackDistanceRate')}
-                            aria-label={translate('workspace.reimburse.trackDistanceRate')}
-                            placeholder={policy?.outputCurrency ?? CONST.CURRENCY.USD}
-                            autoCompleteType="off"
-                            autoCorrect={false}
-                            inputMode={CONST.INPUT_MODE.DECIMAL}
-                            maxLength={12}
-                        />
-
-                        <View style={styles.mt4}>
-                            <InputWrapper
-                                InputComponent={Picker}
-                                inputID="unit"
-                                label={translate('workspace.reimburse.trackDistanceUnit')}
-                                items={unitItems}
-                                defaultValue={distanceCustomUnit?.attributes.unit ?? CONST.CUSTOM_UNITS.DISTANCE_UNIT_MILES}
-                            />
-                        </View>
-                    </OfflineWithFeedback>
-                </FormProvider>
-            )}
-        </WorkspacePageWithSections>
-    );
-}
-
-WorkspaceRateAndUnitPage.displayName = 'WorkspaceRateAndUnitPage';
-
-export default withPolicy(WorkspaceRateAndUnitPage);
diff --git a/src/pages/workspace/reimburse/WorkspaceRateAndUnitPage/InitialPage.tsx b/src/pages/workspace/reimburse/WorkspaceRateAndUnitPage/InitialPage.tsx
index 684b4be37d44..7381d02cb01d 100644
--- a/src/pages/workspace/reimburse/WorkspaceRateAndUnitPage/InitialPage.tsx
+++ b/src/pages/workspace/reimburse/WorkspaceRateAndUnitPage/InitialPage.tsx
@@ -1,35 +1,31 @@
-import Str from 'expensify-common/lib/str';
+import {Str} from 'expensify-common';
 import React, {useEffect} from 'react';
 import {View} from 'react-native';
-import {withOnyx} from 'react-native-onyx';
 import type {OnyxEntry} from 'react-native-onyx';
+import {withOnyx} from 'react-native-onyx';
 import FormAlertWithSubmitButton from '@components/FormAlertWithSubmitButton';
 import MenuItemWithTopDescription from '@components/MenuItemWithTopDescription';
 import OfflineWithFeedback from '@components/OfflineWithFeedback';
-import {withNetwork} from '@components/OnyxProvider';
 import ScrollView from '@components/ScrollView';
 import useLocalize from '@hooks/useLocalize';
 import useThemeStyles from '@hooks/useThemeStyles';
-import compose from '@libs/compose';
 import * as CurrencyUtils from '@libs/CurrencyUtils';
 import Navigation from '@libs/Navigation/Navigation';
+import * as PolicyUtils from '@libs/PolicyUtils';
 import {getUnitTranslationKey} from '@libs/WorkspacesSettingsUtils';
-import withPolicy from '@pages/workspace/withPolicy';
 import type {WithPolicyProps} from '@pages/workspace/withPolicy';
+import withPolicy from '@pages/workspace/withPolicy';
 import WorkspacePageWithSections from '@pages/workspace/WorkspacePageWithSections';
 import * as BankAccounts from '@userActions/BankAccounts';
-import * as Policy from '@userActions/Policy';
+import * as Policy from '@userActions/Policy/Policy';
 import CONST from '@src/CONST';
 import ONYXKEYS from '@src/ONYXKEYS';
 import ROUTES from '@src/ROUTES';
-import type {Network, ReimbursementAccount, WorkspaceRateAndUnit} from '@src/types/onyx';
+import type {ReimbursementAccount, WorkspaceRateAndUnit} from '@src/types/onyx';
 import type {Unit} from '@src/types/onyx/Policy';
 import {isEmptyObject} from '@src/types/utils/EmptyObject';
 
-type WorkspaceRateAndUnitPageBaseProps = WithPolicyProps & {
-    // eslint-disable-next-line react/no-unused-prop-types
-    network: OnyxEntry<Network>;
-};
+type WorkspaceRateAndUnitPageBaseProps = WithPolicyProps;
 
 type WorkspaceRateAndUnitOnyxProps = {
     workspaceRateAndUnit: OnyxEntry<WorkspaceRateAndUnit>;
@@ -47,8 +43,8 @@ function WorkspaceRateAndUnitPage(props: WorkspaceRateAndUnitPageProps) {
         if (props.workspaceRateAndUnit?.policyID === props.policy?.id) {
             return;
         }
-        Policy.setPolicyIDForReimburseView(props.policy?.id ?? '');
-        // eslint-disable-next-line react-hooks/exhaustive-deps
+        Policy.setPolicyIDForReimburseView(props.policy?.id ?? '-1');
+        // eslint-disable-next-line react-compiler/react-compiler, react-hooks/exhaustive-deps
     }, []);
 
     useEffect(() => {
@@ -58,11 +54,11 @@ function WorkspaceRateAndUnitPage(props: WorkspaceRateAndUnitPageProps) {
         }
 
         BankAccounts.setReimbursementAccountLoading(true);
-        Policy.openWorkspaceReimburseView(props.policy?.id ?? '');
+        Policy.openWorkspaceReimburseView(props.policy?.id ?? '-1');
     }, [props]);
 
     const saveUnitAndRate = (newUnit: Unit, newRate: string) => {
-        const distanceCustomUnit = Object.values(props.policy?.customUnits ?? {}).find((unit) => unit.name === CONST.CUSTOM_UNITS.NAME_DISTANCE);
+        const distanceCustomUnit = PolicyUtils.getCustomUnit(props.policy);
         if (!distanceCustomUnit) {
             return;
         }
@@ -79,10 +75,10 @@ function WorkspaceRateAndUnitPage(props: WorkspaceRateAndUnitPageProps) {
                 rate: parseFloat(newRate),
             },
         };
-        Policy.updateWorkspaceCustomUnitAndRate(props.policy?.id ?? '', distanceCustomUnit, newCustomUnit, props.policy?.lastModified);
+        Policy.updateWorkspaceCustomUnitAndRate(props.policy?.id ?? '-1', distanceCustomUnit, newCustomUnit, props.policy?.lastModified);
     };
 
-    const distanceCustomUnit = Object.values(props.policy?.customUnits ?? {}).find((unit) => unit.name === CONST.CUSTOM_UNITS.NAME_DISTANCE);
+    const distanceCustomUnit = PolicyUtils.getCustomUnit(props.policy);
     const distanceCustomRate = Object.values(distanceCustomUnit?.rates ?? {}).find((rate) => rate.name === CONST.CUSTOM_UNITS.DEFAULT_RATE);
 
     const unitValue = props.workspaceRateAndUnit?.unit ?? distanceCustomUnit?.attributes.unit ?? CONST.CUSTOM_UNITS.DISTANCE_UNIT_MILES;
@@ -100,7 +96,6 @@ function WorkspaceRateAndUnitPage(props: WorkspaceRateAndUnitPageProps) {
             headerText={translate('workspace.reimburse.trackDistance')}
             route={props.route}
             guidesCallTaskID={CONST.GUIDES_CALL_TASK_IDS.WORKSPACE_REIMBURSE}
-            shouldSkipVBBACall
             backButtonRoute=""
             shouldShowLoading={false}
             shouldShowBackButton
@@ -116,18 +111,18 @@ function WorkspaceRateAndUnitPage(props: WorkspaceRateAndUnitPageProps) {
                                 }}
                                 errorRowStyles={styles.mh5}
                                 pendingAction={distanceCustomUnit?.pendingAction ?? distanceCustomRate?.pendingAction}
-                                onClose={() => Policy.clearCustomUnitErrors(props.policy?.id ?? '', distanceCustomUnit?.customUnitID ?? '', distanceCustomRate?.customUnitRateID ?? '')}
+                                onClose={() => Policy.clearCustomUnitErrors(props.policy?.id ?? '-1', distanceCustomUnit?.customUnitID ?? '-1', distanceCustomRate?.customUnitRateID ?? '-1')}
                             >
                                 <MenuItemWithTopDescription
                                     description={translate('workspace.reimburse.trackDistanceRate')}
                                     title={CurrencyUtils.convertAmountToDisplayString(parseFloat(rateValue), props.policy?.outputCurrency ?? CONST.CURRENCY.USD)}
-                                    onPress={() => Navigation.navigate(ROUTES.WORKSPACE_RATE_AND_UNIT_RATE.getRoute(props.policy?.id ?? ''))}
+                                    onPress={() => Navigation.navigate(ROUTES.WORKSPACE_RATE_AND_UNIT_RATE.getRoute(props.policy?.id ?? '-1'))}
                                     shouldShowRightIcon
                                 />
                                 <MenuItemWithTopDescription
                                     description={translate('workspace.reimburse.trackDistanceUnit')}
                                     title={unitTitle}
-                                    onPress={() => Navigation.navigate(ROUTES.WORKSPACE_RATE_AND_UNIT_UNIT.getRoute(props.policy?.id ?? ''))}
+                                    onPress={() => Navigation.navigate(ROUTES.WORKSPACE_RATE_AND_UNIT_UNIT.getRoute(props.policy?.id ?? '-1'))}
                                     shouldShowRightIcon
                                 />
                             </OfflineWithFeedback>
@@ -150,7 +145,7 @@ function WorkspaceRateAndUnitPage(props: WorkspaceRateAndUnitPageProps) {
 
 WorkspaceRateAndUnitPage.displayName = 'WorkspaceRateAndUnitPage';
 
-export default compose(
+export default withPolicy(
     withOnyx<WorkspaceRateAndUnitPageProps, WorkspaceRateAndUnitOnyxProps>({
         // @ts-expect-error: ONYXKEYS.REIMBURSEMENT_ACCOUNT is conflicting with ONYXKEYS.FORMS.REIMBURSEMENT_ACCOUNT_FORM
         reimbursementAccount: {
@@ -159,7 +154,5 @@ export default compose(
         workspaceRateAndUnit: {
             key: ONYXKEYS.WORKSPACE_RATE_AND_UNIT,
         },
-    }),
-    withPolicy,
-    withNetwork(),
-)(WorkspaceRateAndUnitPage);
+    })(WorkspaceRateAndUnitPage),
+);
diff --git a/src/pages/workspace/reimburse/WorkspaceRateAndUnitPage/RatePage.tsx b/src/pages/workspace/reimburse/WorkspaceRateAndUnitPage/RatePage.tsx
index 8685cd3b1aee..c8a2b3373230 100644
--- a/src/pages/workspace/reimburse/WorkspaceRateAndUnitPage/RatePage.tsx
+++ b/src/pages/workspace/reimburse/WorkspaceRateAndUnitPage/RatePage.tsx
@@ -1,19 +1,19 @@
 import React, {useCallback, useEffect, useMemo} from 'react';
-import {withOnyx} from 'react-native-onyx';
 import type {OnyxEntry} from 'react-native-onyx';
+import {withOnyx} from 'react-native-onyx';
 import AmountForm from '@components/AmountForm';
 import FormProvider from '@components/Form/FormProvider';
 import InputWrapperWithRef from '@components/Form/InputWrapper';
 import type {FormOnyxValues} from '@components/Form/types';
 import useLocalize from '@hooks/useLocalize';
 import useThemeStyles from '@hooks/useThemeStyles';
-import compose from '@libs/compose';
 import Navigation from '@libs/Navigation/Navigation';
 import {validateRateValue} from '@libs/PolicyDistanceRatesUtils';
-import withPolicy from '@pages/workspace/withPolicy';
+import * as PolicyUtils from '@libs/PolicyUtils';
 import type {WithPolicyProps} from '@pages/workspace/withPolicy';
+import withPolicy from '@pages/workspace/withPolicy';
 import WorkspacePageWithSections from '@pages/workspace/WorkspacePageWithSections';
-import * as Policy from '@userActions/Policy';
+import * as Policy from '@userActions/Policy/Policy';
 import CONST from '@src/CONST';
 import ONYXKEYS from '@src/ONYXKEYS';
 import ROUTES from '@src/ROUTES';
@@ -37,14 +37,14 @@ function WorkspaceRatePage(props: WorkspaceRatePageProps) {
         if (props.workspaceRateAndUnit?.policyID === props.policy?.id) {
             return;
         }
-        Policy.setPolicyIDForReimburseView(props.policy?.id ?? '');
-        // eslint-disable-next-line react-hooks/exhaustive-deps
+        Policy.setPolicyIDForReimburseView(props.policy?.id ?? '-1');
+        // eslint-disable-next-line react-compiler/react-compiler, react-hooks/exhaustive-deps
     }, []);
 
     const submit = (values: FormOnyxValues<typeof ONYXKEYS.FORMS.WORKSPACE_RATE_AND_UNIT_FORM>) => {
         const rate = values.rate;
         Policy.setRateForReimburseView((parseFloat(rate) * CONST.POLICY.CUSTOM_UNIT_RATE_BASE_OFFSET).toFixed(1));
-        Navigation.goBack(ROUTES.WORKSPACE_RATE_AND_UNIT.getRoute(props.policy?.id ?? ''));
+        Navigation.goBack(ROUTES.WORKSPACE_RATE_AND_UNIT.getRoute(props.policy?.id ?? '-1'));
     };
 
     const validate = useCallback(
@@ -53,18 +53,17 @@ function WorkspaceRatePage(props: WorkspaceRatePageProps) {
     );
 
     const defaultValue = useMemo(() => {
-        const defaultDistanceCustomUnit = Object.values(props.policy?.customUnits ?? {}).find((unit) => unit.name === CONST.CUSTOM_UNITS.NAME_DISTANCE);
+        const defaultDistanceCustomUnit = PolicyUtils.getCustomUnit(props.policy);
         const distanceCustomRate = Object.values(defaultDistanceCustomUnit?.rates ?? {}).find((rate) => rate.name === CONST.CUSTOM_UNITS.DEFAULT_RATE);
         return distanceCustomRate?.rate ?? 0;
-    }, [props.policy?.customUnits]);
+    }, [props.policy]);
 
     return (
         <WorkspacePageWithSections
             headerText={translate('workspace.reimburse.trackDistanceRate')}
             route={props.route}
             guidesCallTaskID={CONST.GUIDES_CALL_TASK_IDS.WORKSPACE_REIMBURSE}
-            shouldSkipVBBACall
-            backButtonRoute={ROUTES.WORKSPACE_RATE_AND_UNIT.getRoute(props.policy?.id ?? '')}
+            backButtonRoute={ROUTES.WORKSPACE_RATE_AND_UNIT.getRoute(props.policy?.id ?? '-1')}
             shouldShowLoading={false}
             shouldShowBackButton
         >
@@ -79,7 +78,6 @@ function WorkspaceRatePage(props: WorkspaceRatePageProps) {
                     shouldHideFixErrorsAlert
                     submitFlexEnabled={false}
                     submitButtonStyles={[styles.mh5, styles.mt0]}
-                    disablePressOnEnter={false}
                 >
                     <InputWrapperWithRef
                         InputComponent={AmountForm}
@@ -99,11 +97,10 @@ function WorkspaceRatePage(props: WorkspaceRatePageProps) {
 
 WorkspaceRatePage.displayName = 'WorkspaceRatePage';
 
-export default compose(
+export default withPolicy(
     withOnyx<WorkspaceRatePageProps, WorkspaceRateAndUnitOnyxProps>({
         workspaceRateAndUnit: {
             key: ONYXKEYS.WORKSPACE_RATE_AND_UNIT,
         },
-    }),
-    withPolicy,
-)(WorkspaceRatePage);
+    })(WorkspaceRatePage),
+);
diff --git a/src/pages/workspace/reimburse/WorkspaceRateAndUnitPage/UnitPage.tsx b/src/pages/workspace/reimburse/WorkspaceRateAndUnitPage/UnitPage.tsx
index 1d30c068e30d..981ad2c81f9b 100644
--- a/src/pages/workspace/reimburse/WorkspaceRateAndUnitPage/UnitPage.tsx
+++ b/src/pages/workspace/reimburse/WorkspaceRateAndUnitPage/UnitPage.tsx
@@ -1,17 +1,17 @@
 import React, {useEffect, useMemo} from 'react';
-import {withOnyx} from 'react-native-onyx';
 import type {OnyxEntry} from 'react-native-onyx';
+import {withOnyx} from 'react-native-onyx';
 import Text from '@components/Text';
 import type {UnitItemType} from '@components/UnitPicker';
 import UnitPicker from '@components/UnitPicker';
 import useLocalize from '@hooks/useLocalize';
 import useThemeStyles from '@hooks/useThemeStyles';
-import compose from '@libs/compose';
 import Navigation from '@libs/Navigation/Navigation';
-import withPolicy from '@pages/workspace/withPolicy';
+import * as PolicyUtils from '@libs/PolicyUtils';
 import type {WithPolicyProps} from '@pages/workspace/withPolicy';
+import withPolicy from '@pages/workspace/withPolicy';
 import WorkspacePageWithSections from '@pages/workspace/WorkspacePageWithSections';
-import * as Policy from '@userActions/Policy';
+import * as Policy from '@userActions/Policy/Policy';
 import CONST from '@src/CONST';
 import ONYXKEYS from '@src/ONYXKEYS';
 import ROUTES from '@src/ROUTES';
@@ -32,27 +32,26 @@ function WorkspaceUnitPage(props: WorkspaceUnitPageProps) {
         if (props.workspaceRateAndUnit?.policyID === props.policy?.id) {
             return;
         }
-        Policy.setPolicyIDForReimburseView(props.policy?.id ?? '');
-        // eslint-disable-next-line react-hooks/exhaustive-deps
+        Policy.setPolicyIDForReimburseView(props.policy?.id ?? '-1');
+        // eslint-disable-next-line react-compiler/react-compiler, react-hooks/exhaustive-deps
     }, []);
 
     const updateUnit = (unit: UnitItemType) => {
         Policy.setUnitForReimburseView(unit.value);
-        Navigation.goBack(ROUTES.WORKSPACE_RATE_AND_UNIT.getRoute(props.policy?.id ?? ''));
+        Navigation.goBack(ROUTES.WORKSPACE_RATE_AND_UNIT.getRoute(props.policy?.id ?? '-1'));
     };
 
     const defaultValue = useMemo(() => {
-        const defaultDistanceCustomUnit = Object.values(props.policy?.customUnits ?? {}).find((unit) => unit.name === CONST.CUSTOM_UNITS.NAME_DISTANCE);
+        const defaultDistanceCustomUnit = PolicyUtils.getCustomUnit(props.policy);
         return defaultDistanceCustomUnit?.attributes.unit ?? CONST.CUSTOM_UNITS.DISTANCE_UNIT_MILES;
-    }, [props.policy?.customUnits]);
+    }, [props.policy]);
 
     return (
         <WorkspacePageWithSections
             headerText={translate('workspace.reimburse.trackDistanceUnit')}
             route={props.route}
             guidesCallTaskID={CONST.GUIDES_CALL_TASK_IDS.WORKSPACE_REIMBURSE}
-            shouldSkipVBBACall
-            backButtonRoute={ROUTES.WORKSPACE_RATE_AND_UNIT.getRoute(props.policy?.id ?? '')}
+            backButtonRoute={ROUTES.WORKSPACE_RATE_AND_UNIT.getRoute(props.policy?.id ?? '-1')}
             shouldShowLoading={false}
             shouldShowBackButton
         >
@@ -70,12 +69,10 @@ function WorkspaceUnitPage(props: WorkspaceUnitPageProps) {
 }
 
 WorkspaceUnitPage.displayName = 'WorkspaceUnitPage';
-
-export default compose(
+export default withPolicy(
     withOnyx<WorkspaceUnitPageProps, WorkspaceRateAndUnitOnyxProps>({
         workspaceRateAndUnit: {
             key: ONYXKEYS.WORKSPACE_RATE_AND_UNIT,
         },
-    }),
-    withPolicy,
-)(WorkspaceUnitPage);
+    })(WorkspaceUnitPage),
+);
diff --git a/src/pages/workspace/reimburse/WorkspaceReimbursePage.tsx b/src/pages/workspace/reimburse/WorkspaceReimbursePage.tsx
index 222ece12d29d..d929ec10748a 100644
--- a/src/pages/workspace/reimburse/WorkspaceReimbursePage.tsx
+++ b/src/pages/workspace/reimburse/WorkspaceReimbursePage.tsx
@@ -1,7 +1,7 @@
 import type {StackScreenProps} from '@react-navigation/stack';
 import React from 'react';
 import useLocalize from '@hooks/useLocalize';
-import type {WorkspacesCentralPaneNavigatorParamList} from '@libs/Navigation/types';
+import type {FullScreenNavigatorParamList} from '@libs/Navigation/types';
 import type {WithPolicyProps} from '@pages/workspace/withPolicy';
 import withPolicy from '@pages/workspace/withPolicy';
 import WorkspacePageWithSections from '@pages/workspace/WorkspacePageWithSections';
@@ -9,7 +9,7 @@ import CONST from '@src/CONST';
 import type SCREENS from '@src/SCREENS';
 import WorkspaceReimburseView from './WorkspaceReimburseView';
 
-type WorkspaceReimbursePageProps = WithPolicyProps & StackScreenProps<WorkspacesCentralPaneNavigatorParamList, typeof SCREENS.WORKSPACE.REIMBURSE>;
+type WorkspaceReimbursePageProps = WithPolicyProps & StackScreenProps<FullScreenNavigatorParamList, typeof SCREENS.WORKSPACE.REIMBURSE>;
 
 function WorkspaceReimbursePage({route, policy}: WorkspaceReimbursePageProps) {
     const {translate} = useLocalize();
@@ -20,7 +20,6 @@ function WorkspaceReimbursePage({route, policy}: WorkspaceReimbursePageProps) {
             headerText={translate('workspace.common.reimburse')}
             route={route}
             guidesCallTaskID={CONST.GUIDES_CALL_TASK_IDS.WORKSPACE_REIMBURSE}
-            shouldSkipVBBACall
             shouldShowLoading={false}
             shouldShowOfflineIndicatorInWideScreen
         >
diff --git a/src/pages/workspace/reimburse/WorkspaceReimburseSection.tsx b/src/pages/workspace/reimburse/WorkspaceReimburseSection.tsx
index 18bd121b3fcb..6c07956e74a7 100644
--- a/src/pages/workspace/reimburse/WorkspaceReimburseSection.tsx
+++ b/src/pages/workspace/reimburse/WorkspaceReimburseSection.tsx
@@ -30,7 +30,7 @@ function WorkspaceReimburseSection({policy, reimbursementAccount}: WorkspaceReim
     const [shouldShowLoadingSpinner, setShouldShowLoadingSpinner] = useState(true);
     const achState = reimbursementAccount?.achData?.state ?? '';
     const hasVBA = achState === BankAccount.STATE.OPEN;
-    const policyId = policy?.id ?? '';
+    const policyId = policy?.id ?? '-1';
     const reimburseReceiptsUrl = `reports?policyID=${policyId}&from=all&type=expense&showStates=Archived&isAdvancedFilterMode=true`;
     const isLoading = reimbursementAccount?.isLoading ?? false;
     const prevIsLoading = usePrevious(isLoading);
@@ -99,7 +99,7 @@ function WorkspaceReimburseSection({policy, reimbursementAccount}: WorkspaceReim
                 <Text>{translate('workspace.reimburse.unlockNoVBACopy')}</Text>
             </View>
             <ConnectBankAccountButton
-                policyID={policy?.id ?? ''}
+                policyID={policy?.id ?? '-1'}
                 style={[styles.mt4]}
             />
         </Section>
diff --git a/src/pages/workspace/reimburse/WorkspaceReimburseView.tsx b/src/pages/workspace/reimburse/WorkspaceReimburseView.tsx
index 9c7b1c493e8d..8cfd6ee07207 100644
--- a/src/pages/workspace/reimburse/WorkspaceReimburseView.tsx
+++ b/src/pages/workspace/reimburse/WorkspaceReimburseView.tsx
@@ -11,13 +11,13 @@ import Section from '@components/Section';
 import Text from '@components/Text';
 import useLocalize from '@hooks/useLocalize';
 import useNetwork from '@hooks/useNetwork';
+import useResponsiveLayout from '@hooks/useResponsiveLayout';
 import useThemeStyles from '@hooks/useThemeStyles';
-import useWindowDimensions from '@hooks/useWindowDimensions';
 import Navigation from '@libs/Navigation/Navigation';
 import * as PolicyUtils from '@libs/PolicyUtils';
 import * as BankAccounts from '@userActions/BankAccounts';
 import * as Link from '@userActions/Link';
-import * as Policy from '@userActions/Policy';
+import * as Policy from '@userActions/Policy/Policy';
 import CONST from '@src/CONST';
 import ONYXKEYS from '@src/ONYXKEYS';
 import ROUTES from '@src/ROUTES';
@@ -38,9 +38,9 @@ type WorkspaceReimburseViewProps = WorkspaceReimburseViewOnyxProps & {
 function WorkspaceReimburseView({policy, reimbursementAccount}: WorkspaceReimburseViewProps) {
     const styles = useThemeStyles();
     const [currentRatePerUnit, setCurrentRatePerUnit] = useState<string>('');
-    const {isSmallScreenWidth} = useWindowDimensions();
-    const viewAllReceiptsUrl = `expenses?policyIDList=${policy?.id ?? ''}&billableReimbursable=reimbursable&submitterEmail=%2B%2B`;
-    const distanceCustomUnit = Object.values(policy?.customUnits ?? {}).find((unit) => unit.name === CONST.CUSTOM_UNITS.NAME_DISTANCE);
+    const {shouldUseNarrowLayout} = useResponsiveLayout();
+    const viewAllReceiptsUrl = `expenses?policyIDList=${policy?.id ?? '-1'}&billableReimbursable=reimbursable&submitterEmail=%2B%2B`;
+    const distanceCustomUnit = PolicyUtils.getCustomUnit(policy);
     const distanceCustomRate = Object.values(distanceCustomUnit?.rates ?? {}).find((rate) => rate.name === CONST.CUSTOM_UNITS.DEFAULT_RATE);
     const {translate, toLocaleDigit} = useLocalize();
     const {isOffline} = useNetwork();
@@ -61,7 +61,7 @@ function WorkspaceReimburseView({policy, reimbursementAccount}: WorkspaceReimbur
         // openWorkspaceReimburseView uses API.read which will not make the request until all WRITE requests in the sequential queue have finished responding, so there would be a delay in
         // updating Onyx with the optimistic data.
         BankAccounts.setReimbursementAccountLoading(true);
-        Policy.openWorkspaceReimburseView(policy?.id ?? '');
+        Policy.openWorkspaceReimburseView(policy?.id ?? '-1');
     }, [policy?.id]);
 
     useEffect(() => {
@@ -76,7 +76,7 @@ function WorkspaceReimburseView({policy, reimbursementAccount}: WorkspaceReimbur
     }, [policy?.customUnits, getCurrentRatePerUnitLabel]);
 
     return (
-        <View style={[styles.mt3, isSmallScreenWidth ? styles.workspaceSectionMobile : styles.workspaceSection]}>
+        <View style={[styles.mt3, shouldUseNarrowLayout ? styles.workspaceSectionMobile : styles.workspaceSection]}>
             <Section
                 title={translate('workspace.reimburse.captureReceipts')}
                 icon={Illustrations.MoneyReceipts}
@@ -122,8 +122,8 @@ function WorkspaceReimburseView({policy, reimbursementAccount}: WorkspaceReimbur
                             description={translate('workspace.reimburse.trackDistanceRate')}
                             shouldShowRightIcon
                             onPress={() => {
-                                Policy.setPolicyIDForReimburseView(policy?.id ?? '');
-                                Navigation.navigate(ROUTES.WORKSPACE_RATE_AND_UNIT.getRoute(policy?.id ?? ''));
+                                Policy.setPolicyIDForReimburseView(policy?.id ?? '-1');
+                                Navigation.navigate(ROUTES.WORKSPACE_RATE_AND_UNIT.getRoute(policy?.id ?? '-1'));
                             }}
                             wrapperStyle={[styles.sectionMenuItemTopDescription, styles.mt3]}
                             brickRoadIndicator={(distanceCustomUnit?.errors ?? distanceCustomRate?.errors) && CONST.BRICK_ROAD_INDICATOR_STATUS.ERROR}
diff --git a/src/pages/workspace/reportFields/CreateReportFieldsPage.tsx b/src/pages/workspace/reportFields/CreateReportFieldsPage.tsx
new file mode 100644
index 000000000000..79be1022da33
--- /dev/null
+++ b/src/pages/workspace/reportFields/CreateReportFieldsPage.tsx
@@ -0,0 +1,197 @@
+import type {StackScreenProps} from '@react-navigation/stack';
+import React, {useCallback, useEffect, useRef} from 'react';
+import {View} from 'react-native';
+import {useOnyx} from 'react-native-onyx';
+import FormProvider from '@components/Form/FormProvider';
+import InputWrapper from '@components/Form/InputWrapper';
+import type {FormInputErrors, FormOnyxValues, FormRef} from '@components/Form/types';
+import HeaderWithBackButton from '@components/HeaderWithBackButton';
+import MenuItemWithTopDescription from '@components/MenuItemWithTopDescription';
+import ScreenWrapper from '@components/ScreenWrapper';
+import TextPicker from '@components/TextPicker';
+import useLocalize from '@hooks/useLocalize';
+import useThemeStyles from '@hooks/useThemeStyles';
+import * as ReportField from '@libs/actions/Policy/ReportField';
+import DateUtils from '@libs/DateUtils';
+import localeCompare from '@libs/LocaleCompare';
+import Navigation from '@libs/Navigation/Navigation';
+import * as PolicyUtils from '@libs/PolicyUtils';
+import type {SettingsNavigatorParamList} from '@navigation/types';
+import AccessOrNotFoundWrapper from '@pages/workspace/AccessOrNotFoundWrapper';
+import type {WithPolicyAndFullscreenLoadingProps} from '@pages/workspace/withPolicyAndFullscreenLoading';
+import withPolicyAndFullscreenLoading from '@pages/workspace/withPolicyAndFullscreenLoading';
+import CONST from '@src/CONST';
+import * as ErrorUtils from '@src/libs/ErrorUtils';
+import * as ValidationUtils from '@src/libs/ValidationUtils';
+import ONYXKEYS from '@src/ONYXKEYS';
+import ROUTES from '@src/ROUTES';
+import type SCREENS from '@src/SCREENS';
+import INPUT_IDS from '@src/types/form/WorkspaceReportFieldForm';
+import InitialListValueSelector from './InitialListValueSelector';
+import TypeSelector from './TypeSelector';
+
+type CreateReportFieldsPageProps = WithPolicyAndFullscreenLoadingProps & StackScreenProps<SettingsNavigatorParamList, typeof SCREENS.WORKSPACE.REPORT_FIELDS_CREATE>;
+
+const defaultDate = DateUtils.extractDate(new Date().toString());
+
+function CreateReportFieldsPage({
+    policy,
+    route: {
+        params: {policyID},
+    },
+}: CreateReportFieldsPageProps) {
+    const styles = useThemeStyles();
+    const {translate} = useLocalize();
+    const formRef = useRef<FormRef>(null);
+    const [formDraft] = useOnyx(ONYXKEYS.FORMS.WORKSPACE_REPORT_FIELDS_FORM_DRAFT);
+
+    const availableListValuesLength = (formDraft?.[INPUT_IDS.DISABLED_LIST_VALUES] ?? []).filter((disabledListValue) => !disabledListValue).length;
+
+    const submitForm = useCallback(
+        (values: FormOnyxValues<typeof ONYXKEYS.FORMS.WORKSPACE_REPORT_FIELDS_FORM>) => {
+            ReportField.createReportField(policyID, {
+                name: values[INPUT_IDS.NAME],
+                type: values[INPUT_IDS.TYPE],
+                initialValue: values[INPUT_IDS.INITIAL_VALUE],
+            });
+            Navigation.goBack();
+        },
+        [policyID],
+    );
+
+    const validateForm = useCallback(
+        (values: FormOnyxValues<typeof ONYXKEYS.FORMS.WORKSPACE_REPORT_FIELDS_FORM>): FormInputErrors<typeof ONYXKEYS.FORMS.WORKSPACE_REPORT_FIELDS_FORM> => {
+            const {name, type} = values;
+            const errors: FormInputErrors<typeof ONYXKEYS.FORMS.WORKSPACE_REPORT_FIELDS_FORM> = {};
+
+            if (!ValidationUtils.isRequiredFulfilled(name)) {
+                errors[INPUT_IDS.NAME] = translate('workspace.reportFields.reportFieldNameRequiredError');
+            } else if (Object.values(policy?.fieldList ?? {}).some((reportField) => reportField.name === name)) {
+                errors[INPUT_IDS.NAME] = translate('workspace.reportFields.existingReportFieldNameError');
+            } else if ([...name].length > CONST.WORKSPACE_REPORT_FIELD_POLICY_MAX_LENGTH) {
+                // Uses the spread syntax to count the number of Unicode code points instead of the number of UTF-16 code units.
+                ErrorUtils.addErrorMessage(
+                    errors,
+                    INPUT_IDS.NAME,
+                    translate('common.error.characterLimitExceedCounter', {length: [...name].length, limit: CONST.WORKSPACE_REPORT_FIELD_POLICY_MAX_LENGTH}),
+                );
+            }
+
+            if (!ValidationUtils.isRequiredFulfilled(type)) {
+                errors[INPUT_IDS.TYPE] = translate('workspace.reportFields.reportFieldTypeRequiredError');
+            }
+
+            return errors;
+        },
+        [policy?.fieldList, translate],
+    );
+
+    useEffect(() => {
+        ReportField.setInitialCreateReportFieldsForm();
+    }, []);
+
+    const [modal] = useOnyx(ONYXKEYS.MODAL);
+
+    return (
+        <AccessOrNotFoundWrapper
+            accessVariants={[CONST.POLICY.ACCESS_VARIANTS.ADMIN, CONST.POLICY.ACCESS_VARIANTS.PAID]}
+            policyID={policyID}
+            featureName={CONST.POLICY.MORE_FEATURES.ARE_REPORT_FIELDS_ENABLED}
+            shouldBeBlocked={PolicyUtils.hasAccountingConnections(policy)}
+        >
+            <ScreenWrapper
+                includeSafeAreaPaddingBottom={false}
+                style={styles.defaultModalContainer}
+                testID={CreateReportFieldsPage.displayName}
+                shouldEnableMaxHeight
+            >
+                <HeaderWithBackButton
+                    title={translate('workspace.reportFields.addField')}
+                    onBackButtonPress={Navigation.goBack}
+                />
+                <FormProvider
+                    ref={formRef}
+                    style={[styles.mh5, styles.flex1]}
+                    formID={ONYXKEYS.FORMS.WORKSPACE_REPORT_FIELDS_FORM}
+                    onSubmit={submitForm}
+                    validate={validateForm}
+                    submitButtonText={translate('common.save')}
+                    enabledWhenOffline
+                    shouldValidateOnBlur={false}
+                    disablePressOnEnter={!!modal?.isVisible}
+                >
+                    {({inputValues}) => (
+                        <View style={styles.mhn5}>
+                            <InputWrapper
+                                InputComponent={TextPicker}
+                                inputID={INPUT_IDS.NAME}
+                                label={translate('common.name')}
+                                subtitle={translate('workspace.reportFields.nameInputSubtitle')}
+                                description={translate('common.name')}
+                                rightLabel={translate('common.required')}
+                                accessibilityLabel={translate('workspace.editor.nameInputLabel')}
+                                maxLength={CONST.WORKSPACE_REPORT_FIELD_POLICY_MAX_LENGTH}
+                                multiline={false}
+                                role={CONST.ROLE.PRESENTATION}
+                            />
+                            <InputWrapper
+                                InputComponent={TypeSelector}
+                                inputID={INPUT_IDS.TYPE}
+                                label={translate('common.type')}
+                                subtitle={translate('workspace.reportFields.typeInputSubtitle')}
+                                rightLabel={translate('common.required')}
+                                onTypeSelected={(type) => formRef.current?.resetForm({...inputValues, type, initialValue: type === CONST.REPORT_FIELD_TYPES.DATE ? defaultDate : ''})}
+                            />
+
+                            {inputValues[INPUT_IDS.TYPE] === CONST.REPORT_FIELD_TYPES.LIST && (
+                                <MenuItemWithTopDescription
+                                    description={translate('workspace.reportFields.listValues')}
+                                    shouldShowRightIcon
+                                    onPress={() => Navigation.navigate(ROUTES.WORKSPACE_REPORT_FIELDS_LIST_VALUES.getRoute(policyID))}
+                                    title={formDraft?.[INPUT_IDS.LIST_VALUES]?.sort(localeCompare)?.join(', ')}
+                                    numberOfLinesTitle={5}
+                                />
+                            )}
+
+                            {inputValues[INPUT_IDS.TYPE] === CONST.REPORT_FIELD_TYPES.TEXT && (
+                                <InputWrapper
+                                    InputComponent={TextPicker}
+                                    inputID={INPUT_IDS.INITIAL_VALUE}
+                                    label={translate('common.initialValue')}
+                                    subtitle={translate('workspace.reportFields.initialValueInputSubtitle')}
+                                    description={translate('common.initialValue')}
+                                    accessibilityLabel={translate('workspace.editor.initialValueInputLabel')}
+                                    maxLength={CONST.WORKSPACE_REPORT_FIELD_POLICY_MAX_LENGTH}
+                                    multiline={false}
+                                    role={CONST.ROLE.PRESENTATION}
+                                />
+                            )}
+
+                            {inputValues[INPUT_IDS.TYPE] === CONST.REPORT_FIELD_TYPES.DATE && (
+                                <MenuItemWithTopDescription
+                                    title={translate('common.currentDate')}
+                                    description={translate('common.date')}
+                                    rightLabel={translate('common.required')}
+                                    interactive={false}
+                                />
+                            )}
+
+                            {inputValues[INPUT_IDS.TYPE] === CONST.REPORT_FIELD_TYPES.LIST && availableListValuesLength > 0 && (
+                                <InputWrapper
+                                    InputComponent={InitialListValueSelector}
+                                    inputID={INPUT_IDS.INITIAL_VALUE}
+                                    label={translate('common.initialValue')}
+                                    subtitle={translate('workspace.reportFields.listValuesInputSubtitle')}
+                                />
+                            )}
+                        </View>
+                    )}
+                </FormProvider>
+            </ScreenWrapper>
+        </AccessOrNotFoundWrapper>
+    );
+}
+
+CreateReportFieldsPage.displayName = 'CreateReportFieldsPage';
+
+export default withPolicyAndFullscreenLoading(CreateReportFieldsPage);
diff --git a/src/pages/workspace/reportFields/InitialListValueSelector/InitialListValueSelectorModal.tsx b/src/pages/workspace/reportFields/InitialListValueSelector/InitialListValueSelectorModal.tsx
new file mode 100644
index 000000000000..fa6c5dc76bdb
--- /dev/null
+++ b/src/pages/workspace/reportFields/InitialListValueSelector/InitialListValueSelectorModal.tsx
@@ -0,0 +1,74 @@
+import React from 'react';
+import {View} from 'react-native';
+import {useOnyx} from 'react-native-onyx';
+import HeaderWithBackButton from '@components/HeaderWithBackButton';
+import Modal from '@components/Modal';
+import ScreenWrapper from '@components/ScreenWrapper';
+import Text from '@components/Text';
+import useThemeStyles from '@hooks/useThemeStyles';
+import CONST from '@src/CONST';
+import ONYXKEYS from '@src/ONYXKEYS';
+import ReportFieldsInitialListValuePicker from './ReportFieldsInitialListValuePicker';
+
+type InitialListValueSelectorModalProps = {
+    /** Whether the modal is visible */
+    isVisible: boolean;
+
+    /** Selected value */
+    currentValue: string;
+
+    /** Label to display on field */
+    label: string;
+
+    /** Subtitle to display on field */
+    subtitle: string;
+
+    /** Function to call when the user selects a value */
+    onValueSelected: (value: string) => void;
+
+    /** Function to call when the user closes the value selector modal */
+    onClose: () => void;
+};
+
+function InitialListValueSelectorModal({isVisible, currentValue, label, subtitle, onValueSelected, onClose}: InitialListValueSelectorModalProps) {
+    const styles = useThemeStyles();
+
+    const [formDraft] = useOnyx(ONYXKEYS.FORMS.WORKSPACE_REPORT_FIELDS_FORM_DRAFT);
+
+    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}
+                testID={InitialListValueSelectorModal.displayName}
+            >
+                <HeaderWithBackButton
+                    title={label}
+                    shouldShowBackButton
+                    onBackButtonPress={onClose}
+                />
+                <View style={[styles.ph5, styles.pb4]}>
+                    <Text style={[styles.sidebarLinkText, styles.optionAlternateText]}>{subtitle}</Text>
+                </View>
+                <ReportFieldsInitialListValuePicker
+                    listValues={formDraft?.listValues ?? []}
+                    disabledOptions={formDraft?.disabledListValues ?? []}
+                    value={currentValue}
+                    onValueChange={onValueSelected}
+                />
+            </ScreenWrapper>
+        </Modal>
+    );
+}
+
+InitialListValueSelectorModal.displayName = 'InitialListValueSelectorModal';
+
+export default InitialListValueSelectorModal;
diff --git a/src/pages/workspace/reportFields/InitialListValueSelector/ReportFieldsInitialListValuePicker.tsx b/src/pages/workspace/reportFields/InitialListValueSelector/ReportFieldsInitialListValuePicker.tsx
new file mode 100644
index 000000000000..4e6328bbc36b
--- /dev/null
+++ b/src/pages/workspace/reportFields/InitialListValueSelector/ReportFieldsInitialListValuePicker.tsx
@@ -0,0 +1,50 @@
+import React, {useMemo} from 'react';
+import SelectionList from '@components/SelectionList';
+import RadioListItem from '@components/SelectionList/RadioListItem';
+import localeCompare from '@libs/LocaleCompare';
+
+type ReportFieldsInitialListValuePickerProps = {
+    /** Options to select from if field is of type list */
+    listValues: string[];
+
+    /** Collection of flags that state whether list field options are disabled */
+    disabledOptions: boolean[];
+
+    /** Selected value */
+    value: string;
+
+    /** Function to call when the user selects a value */
+    onValueChange: (value: string) => void;
+};
+
+function ReportFieldsInitialListValuePicker({listValues, disabledOptions, value, onValueChange}: ReportFieldsInitialListValuePickerProps) {
+    const listValueSections = useMemo(
+        () => [
+            {
+                data: Object.values(listValues ?? {})
+                    .filter((listValue, index) => !disabledOptions[index])
+                    .sort(localeCompare)
+                    .map((listValue) => ({
+                        keyForList: listValue,
+                        value: listValue,
+                        isSelected: value === listValue,
+                        text: listValue,
+                    })),
+            },
+        ],
+        [value, listValues, disabledOptions],
+    );
+
+    return (
+        <SelectionList
+            sections={listValueSections}
+            ListItem={RadioListItem}
+            onSelectRow={(item) => onValueChange(item.value)}
+            initiallyFocusedOptionKey={listValueSections[0].data.find((listValue) => listValue.isSelected)?.keyForList}
+        />
+    );
+}
+
+ReportFieldsInitialListValuePicker.displayName = 'ReportFieldsInitialListValuePicker';
+
+export default ReportFieldsInitialListValuePicker;
diff --git a/src/pages/workspace/reportFields/InitialListValueSelector/index.tsx b/src/pages/workspace/reportFields/InitialListValueSelector/index.tsx
new file mode 100644
index 000000000000..fef68a649931
--- /dev/null
+++ b/src/pages/workspace/reportFields/InitialListValueSelector/index.tsx
@@ -0,0 +1,75 @@
+import type {ForwardedRef} from 'react';
+import React, {forwardRef, useEffect, useState} from 'react';
+import {View} from 'react-native';
+import {useOnyx} from 'react-native-onyx';
+import type {MenuItemBaseProps} from '@components/MenuItem';
+import MenuItemWithTopDescription from '@components/MenuItemWithTopDescription';
+import CONST from '@src/CONST';
+import ONYXKEYS from '@src/ONYXKEYS';
+import InitialListValueSelectorModal from './InitialListValueSelectorModal';
+
+type InitialListValueSelectorProps = Pick<MenuItemBaseProps, 'label' | 'rightLabel' | 'errorText'> & {
+    /** Currently selected value */
+    value?: string;
+
+    /** Subtitle to display on field */
+    subtitle?: string;
+
+    /** Function to call when the user selects a value */
+    onInputChange?: (value: string) => void;
+};
+
+function InitialListValueSelector({value = '', label = '', rightLabel, subtitle = '', errorText = '', onInputChange}: InitialListValueSelectorProps, forwardedRef: ForwardedRef<View>) {
+    const [formDraft] = useOnyx(ONYXKEYS.FORMS.WORKSPACE_REPORT_FIELDS_FORM_DRAFT);
+
+    const [isPickerVisible, setIsPickerVisible] = useState(false);
+
+    const showPickerModal = () => {
+        setIsPickerVisible(true);
+    };
+
+    const hidePickerModal = () => {
+        setIsPickerVisible(false);
+    };
+
+    const updateValueInput = (initialValue: string) => {
+        onInputChange?.(value === initialValue ? '' : initialValue);
+        hidePickerModal();
+    };
+
+    useEffect(() => {
+        const currentValueIndex = Object.values(formDraft?.listValues ?? {}).findIndex((listValue) => listValue === value);
+        const isCurrentValueDisabled = formDraft?.disabledListValues?.[currentValueIndex] ?? true;
+
+        if (isCurrentValueDisabled && value !== '') {
+            onInputChange?.('');
+        }
+    }, [formDraft?.disabledListValues, formDraft?.listValues, onInputChange, value]);
+
+    return (
+        <View>
+            <MenuItemWithTopDescription
+                ref={forwardedRef}
+                shouldShowRightIcon
+                title={value}
+                description={label}
+                rightLabel={rightLabel}
+                brickRoadIndicator={errorText ? CONST.BRICK_ROAD_INDICATOR_STATUS.ERROR : undefined}
+                errorText={errorText}
+                onPress={showPickerModal}
+            />
+            <InitialListValueSelectorModal
+                isVisible={isPickerVisible}
+                currentValue={value}
+                onClose={hidePickerModal}
+                onValueSelected={updateValueInput}
+                label={label}
+                subtitle={subtitle}
+            />
+        </View>
+    );
+}
+
+InitialListValueSelector.displayName = 'InitialListValueSelector';
+
+export default forwardRef(InitialListValueSelector);
diff --git a/src/pages/workspace/reportFields/ReportFieldTypePicker/index.tsx b/src/pages/workspace/reportFields/ReportFieldTypePicker/index.tsx
new file mode 100644
index 000000000000..599d7ae0da99
--- /dev/null
+++ b/src/pages/workspace/reportFields/ReportFieldTypePicker/index.tsx
@@ -0,0 +1,60 @@
+import React, {useMemo} from 'react';
+import SelectionList from '@components/SelectionList';
+import RadioListItem from '@components/SelectionList/RadioListItem';
+import useLocalize from '@hooks/useLocalize';
+import * as WorkspaceReportFieldUtils from '@libs/WorkspaceReportFieldUtils';
+import CONST from '@src/CONST';
+import type {PolicyReportFieldType} from '@src/types/onyx/Policy';
+
+type ReportFieldItemType = {
+    /** The value */
+    value: PolicyReportFieldType;
+
+    /** The display text */
+    text: string;
+
+    /** The key for list */
+    keyForList: string;
+
+    /** Whether the value is selected */
+    isSelected: boolean;
+};
+
+type ReportFieldTypePickerProps = {
+    /** Currently selected report field type */
+    defaultValue: PolicyReportFieldType;
+
+    /** Function to call when the user selects a report field type */
+    onOptionSelected: (reportField: ReportFieldItemType) => void;
+};
+
+function ReportFieldTypePicker({defaultValue, onOptionSelected}: ReportFieldTypePickerProps) {
+    const {translate} = useLocalize();
+
+    const typeSections = useMemo(() => {
+        const data = Object.values(CONST.REPORT_FIELD_TYPES).map((reportFieldType) => ({
+            keyForList: reportFieldType,
+            value: reportFieldType,
+            isSelected: defaultValue === reportFieldType,
+            text: translate(WorkspaceReportFieldUtils.getReportFieldTypeTranslationKey(reportFieldType)),
+            alternateText: translate(WorkspaceReportFieldUtils.getReportFieldAlternativeTextTranslationKey(reportFieldType)),
+        }));
+
+        return [{data}];
+    }, [defaultValue, translate]);
+
+    return (
+        <SelectionList
+            sections={typeSections}
+            ListItem={RadioListItem}
+            onSelectRow={onOptionSelected}
+            initiallyFocusedOptionKey={typeSections[0].data.find((reportField) => reportField.isSelected)?.keyForList}
+        />
+    );
+}
+
+ReportFieldTypePicker.displayName = 'ReportFieldTypePicker';
+
+export default ReportFieldTypePicker;
+
+export type {ReportFieldItemType};
diff --git a/src/pages/workspace/reportFields/ReportFieldsAddListValuePage.tsx b/src/pages/workspace/reportFields/ReportFieldsAddListValuePage.tsx
new file mode 100644
index 000000000000..0d85fca800bb
--- /dev/null
+++ b/src/pages/workspace/reportFields/ReportFieldsAddListValuePage.tsx
@@ -0,0 +1,101 @@
+import type {StackScreenProps} from '@react-navigation/stack';
+import React, {useCallback} from 'react';
+import {Keyboard} from 'react-native';
+import {useOnyx} from 'react-native-onyx';
+import FormProvider from '@components/Form/FormProvider';
+import InputWrapper from '@components/Form/InputWrapper';
+import type {FormOnyxValues} from '@components/Form/types';
+import HeaderWithBackButton from '@components/HeaderWithBackButton';
+import ScreenWrapper from '@components/ScreenWrapper';
+import TextInput from '@components/TextInput';
+import useAutoFocusInput from '@hooks/useAutoFocusInput';
+import useLocalize from '@hooks/useLocalize';
+import useThemeStyles from '@hooks/useThemeStyles';
+import * as ReportField from '@libs/actions/Policy/ReportField';
+import Navigation from '@libs/Navigation/Navigation';
+import * as PolicyUtils from '@libs/PolicyUtils';
+import * as WorkspaceReportFieldUtils from '@libs/WorkspaceReportFieldUtils';
+import type {SettingsNavigatorParamList} from '@navigation/types';
+import AccessOrNotFoundWrapper from '@pages/workspace/AccessOrNotFoundWrapper';
+import type {WithPolicyAndFullscreenLoadingProps} from '@pages/workspace/withPolicyAndFullscreenLoading';
+import withPolicyAndFullscreenLoading from '@pages/workspace/withPolicyAndFullscreenLoading';
+import CONST from '@src/CONST';
+import ONYXKEYS from '@src/ONYXKEYS';
+import type SCREENS from '@src/SCREENS';
+import INPUT_IDS from '@src/types/form/WorkspaceReportFieldForm';
+
+type ReportFieldsAddListValuePageProps = WithPolicyAndFullscreenLoadingProps & StackScreenProps<SettingsNavigatorParamList, typeof SCREENS.WORKSPACE.REPORT_FIELDS_ADD_VALUE>;
+
+function ReportFieldsAddListValuePage({
+    policy,
+    route: {
+        params: {policyID, reportFieldID},
+    },
+}: ReportFieldsAddListValuePageProps) {
+    const styles = useThemeStyles();
+    const {translate} = useLocalize();
+    const {inputCallbackRef} = useAutoFocusInput();
+    const [formDraft] = useOnyx(ONYXKEYS.FORMS.WORKSPACE_REPORT_FIELDS_FORM_DRAFT);
+
+    const validate = useCallback(
+        (values: FormOnyxValues<typeof ONYXKEYS.FORMS.WORKSPACE_REPORT_FIELDS_FORM>) =>
+            WorkspaceReportFieldUtils.validateReportFieldListValueName(values[INPUT_IDS.VALUE_NAME].trim(), '', formDraft?.[INPUT_IDS.LIST_VALUES] ?? [], INPUT_IDS.VALUE_NAME),
+        [formDraft],
+    );
+
+    const createValue = useCallback(
+        (values: FormOnyxValues<typeof ONYXKEYS.FORMS.WORKSPACE_REPORT_FIELDS_FORM>) => {
+            if (reportFieldID) {
+                ReportField.addReportFieldListValue(policyID, reportFieldID, values[INPUT_IDS.VALUE_NAME]);
+            } else {
+                ReportField.createReportFieldsListValue(values[INPUT_IDS.VALUE_NAME]);
+            }
+            Keyboard.dismiss();
+            Navigation.goBack();
+        },
+        [policyID, reportFieldID],
+    );
+
+    return (
+        <AccessOrNotFoundWrapper
+            accessVariants={[CONST.POLICY.ACCESS_VARIANTS.ADMIN, CONST.POLICY.ACCESS_VARIANTS.PAID]}
+            policyID={policyID}
+            featureName={CONST.POLICY.MORE_FEATURES.ARE_REPORT_FIELDS_ENABLED}
+            shouldBeBlocked={PolicyUtils.hasAccountingConnections(policy)}
+        >
+            <ScreenWrapper
+                includeSafeAreaPaddingBottom={false}
+                style={styles.defaultModalContainer}
+                testID={ReportFieldsAddListValuePage.displayName}
+                shouldEnableMaxHeight
+            >
+                <HeaderWithBackButton
+                    title={translate('workspace.reportFields.addValue')}
+                    onBackButtonPress={Navigation.goBack}
+                />
+                <FormProvider
+                    formID={ONYXKEYS.FORMS.WORKSPACE_REPORT_FIELDS_FORM}
+                    onSubmit={createValue}
+                    submitButtonText={translate('common.save')}
+                    validate={validate}
+                    style={[styles.mh5, styles.flex1]}
+                    enabledWhenOffline
+                >
+                    <InputWrapper
+                        InputComponent={TextInput}
+                        maxLength={CONST.WORKSPACE_REPORT_FIELD_POLICY_MAX_LENGTH}
+                        label={translate('common.value')}
+                        accessibilityLabel={translate('common.value')}
+                        inputID={INPUT_IDS.VALUE_NAME}
+                        role={CONST.ROLE.PRESENTATION}
+                        ref={inputCallbackRef}
+                    />
+                </FormProvider>
+            </ScreenWrapper>
+        </AccessOrNotFoundWrapper>
+    );
+}
+
+ReportFieldsAddListValuePage.displayName = 'ReportFieldsAddListValuePage';
+
+export default withPolicyAndFullscreenLoading(ReportFieldsAddListValuePage);
diff --git a/src/pages/workspace/reportFields/ReportFieldsEditValuePage.tsx b/src/pages/workspace/reportFields/ReportFieldsEditValuePage.tsx
new file mode 100644
index 000000000000..bfc885000c98
--- /dev/null
+++ b/src/pages/workspace/reportFields/ReportFieldsEditValuePage.tsx
@@ -0,0 +1,108 @@
+import type {StackScreenProps} from '@react-navigation/stack';
+import React, {useCallback} from 'react';
+import {Keyboard} from 'react-native';
+import {useOnyx} from 'react-native-onyx';
+import FormProvider from '@components/Form/FormProvider';
+import InputWrapper from '@components/Form/InputWrapper';
+import type {FormOnyxValues} from '@components/Form/types';
+import HeaderWithBackButton from '@components/HeaderWithBackButton';
+import ScreenWrapper from '@components/ScreenWrapper';
+import TextInput from '@components/TextInput';
+import useAutoFocusInput from '@hooks/useAutoFocusInput';
+import useLocalize from '@hooks/useLocalize';
+import useThemeStyles from '@hooks/useThemeStyles';
+import * as ReportField from '@libs/actions/Policy/ReportField';
+import Navigation from '@libs/Navigation/Navigation';
+import * as PolicyUtils from '@libs/PolicyUtils';
+import * as WorkspaceReportFieldUtils from '@libs/WorkspaceReportFieldUtils';
+import type {SettingsNavigatorParamList} from '@navigation/types';
+import AccessOrNotFoundWrapper from '@pages/workspace/AccessOrNotFoundWrapper';
+import type {WithPolicyAndFullscreenLoadingProps} from '@pages/workspace/withPolicyAndFullscreenLoading';
+import withPolicyAndFullscreenLoading from '@pages/workspace/withPolicyAndFullscreenLoading';
+import CONST from '@src/CONST';
+import ONYXKEYS from '@src/ONYXKEYS';
+import type SCREENS from '@src/SCREENS';
+import INPUT_IDS from '@src/types/form/WorkspaceReportFieldForm';
+
+type ReportFieldsEditValuePageProps = WithPolicyAndFullscreenLoadingProps & StackScreenProps<SettingsNavigatorParamList, typeof SCREENS.WORKSPACE.REPORT_FIELDS_EDIT_VALUE>;
+
+function ReportFieldsEditValuePage({
+    policy,
+    route: {
+        params: {policyID, valueIndex},
+    },
+}: ReportFieldsEditValuePageProps) {
+    const styles = useThemeStyles();
+    const {translate} = useLocalize();
+    const {inputCallbackRef} = useAutoFocusInput();
+    const [formDraft] = useOnyx(ONYXKEYS.FORMS.WORKSPACE_REPORT_FIELDS_FORM_DRAFT);
+
+    const currentValueName = formDraft?.listValues?.[valueIndex] ?? '';
+
+    const validate = useCallback(
+        (values: FormOnyxValues<typeof ONYXKEYS.FORMS.WORKSPACE_REPORT_FIELDS_FORM>) =>
+            WorkspaceReportFieldUtils.validateReportFieldListValueName(
+                values[INPUT_IDS.NEW_VALUE_NAME].trim(),
+                currentValueName,
+                formDraft?.[INPUT_IDS.LIST_VALUES] ?? [],
+                INPUT_IDS.NEW_VALUE_NAME,
+            ),
+        [currentValueName, formDraft],
+    );
+
+    const editValue = useCallback(
+        (values: FormOnyxValues<typeof ONYXKEYS.FORMS.WORKSPACE_REPORT_FIELDS_FORM>) => {
+            const valueName = values[INPUT_IDS.NEW_VALUE_NAME]?.trim();
+            if (currentValueName !== valueName) {
+                ReportField.renameReportFieldsListValue(valueIndex, valueName);
+            }
+            Keyboard.dismiss();
+            Navigation.goBack();
+        },
+        [currentValueName, valueIndex],
+    );
+
+    return (
+        <AccessOrNotFoundWrapper
+            accessVariants={[CONST.POLICY.ACCESS_VARIANTS.ADMIN, CONST.POLICY.ACCESS_VARIANTS.PAID]}
+            policyID={policyID}
+            featureName={CONST.POLICY.MORE_FEATURES.ARE_REPORT_FIELDS_ENABLED}
+            shouldBeBlocked={PolicyUtils.hasAccountingConnections(policy)}
+        >
+            <ScreenWrapper
+                includeSafeAreaPaddingBottom={false}
+                style={styles.defaultModalContainer}
+                testID={ReportFieldsEditValuePage.displayName}
+                shouldEnableMaxHeight
+            >
+                <HeaderWithBackButton
+                    title={translate('workspace.reportFields.editValue')}
+                    onBackButtonPress={Navigation.goBack}
+                />
+                <FormProvider
+                    formID={ONYXKEYS.FORMS.WORKSPACE_REPORT_FIELDS_FORM}
+                    onSubmit={editValue}
+                    submitButtonText={translate('common.save')}
+                    validate={validate}
+                    style={[styles.mh5, styles.flex1]}
+                    enabledWhenOffline
+                >
+                    <InputWrapper
+                        InputComponent={TextInput}
+                        maxLength={CONST.WORKSPACE_REPORT_FIELD_POLICY_MAX_LENGTH}
+                        defaultValue={currentValueName}
+                        label={translate('common.value')}
+                        accessibilityLabel={translate('common.value')}
+                        inputID={INPUT_IDS.NEW_VALUE_NAME}
+                        role={CONST.ROLE.PRESENTATION}
+                        ref={inputCallbackRef}
+                    />
+                </FormProvider>
+            </ScreenWrapper>
+        </AccessOrNotFoundWrapper>
+    );
+}
+
+ReportFieldsEditValuePage.displayName = 'ReportFieldsEditValuePage';
+
+export default withPolicyAndFullscreenLoading(ReportFieldsEditValuePage);
diff --git a/src/pages/workspace/reportFields/ReportFieldsInitialValuePage.tsx b/src/pages/workspace/reportFields/ReportFieldsInitialValuePage.tsx
new file mode 100644
index 000000000000..74ed854a0495
--- /dev/null
+++ b/src/pages/workspace/reportFields/ReportFieldsInitialValuePage.tsx
@@ -0,0 +1,161 @@
+import type {StackScreenProps} from '@react-navigation/stack';
+import React, {useCallback, useState} from 'react';
+import {View} from 'react-native';
+import FormProvider from '@components/Form/FormProvider';
+import InputWrapper from '@components/Form/InputWrapper';
+import type {FormInputErrors, FormOnyxValues} from '@components/Form/types';
+import HeaderWithBackButton from '@components/HeaderWithBackButton';
+import ScreenWrapper from '@components/ScreenWrapper';
+import Text from '@components/Text';
+import TextInput from '@components/TextInput';
+import useAutoFocusInput from '@hooks/useAutoFocusInput';
+import useLocalize from '@hooks/useLocalize';
+import useThemeStyles from '@hooks/useThemeStyles';
+import * as ReportField from '@libs/actions/Policy/ReportField';
+import Navigation from '@libs/Navigation/Navigation';
+import type {SettingsNavigatorParamList} from '@libs/Navigation/types';
+import * as PolicyUtils from '@libs/PolicyUtils';
+import * as ReportUtils from '@libs/ReportUtils';
+import * as WorkspaceReportFieldUtils from '@libs/WorkspaceReportFieldUtils';
+import NotFoundPage from '@pages/ErrorPage/NotFoundPage';
+import AccessOrNotFoundWrapper from '@pages/workspace/AccessOrNotFoundWrapper';
+import type {WithPolicyAndFullscreenLoadingProps} from '@pages/workspace/withPolicyAndFullscreenLoading';
+import withPolicyAndFullscreenLoading from '@pages/workspace/withPolicyAndFullscreenLoading';
+import CONST from '@src/CONST';
+import * as ErrorUtils from '@src/libs/ErrorUtils';
+import * as ValidationUtils from '@src/libs/ValidationUtils';
+import ONYXKEYS from '@src/ONYXKEYS';
+import type SCREENS from '@src/SCREENS';
+import INPUT_IDS from '@src/types/form/WorkspaceReportFieldForm';
+import ReportFieldsInitialListValuePicker from './InitialListValueSelector/ReportFieldsInitialListValuePicker';
+
+type ReportFieldsInitialValuePageProps = WithPolicyAndFullscreenLoadingProps & StackScreenProps<SettingsNavigatorParamList, typeof SCREENS.WORKSPACE.REPORT_FIELDS_EDIT_INITIAL_VALUE>;
+function ReportFieldsInitialValuePage({
+    policy,
+    route: {
+        params: {policyID, reportFieldID},
+    },
+}: ReportFieldsInitialValuePageProps) {
+    const styles = useThemeStyles();
+    const {translate} = useLocalize();
+    const {inputCallbackRef} = useAutoFocusInput();
+
+    const hasAccountingConnections = PolicyUtils.hasAccountingConnections(policy);
+    const reportField = policy?.fieldList?.[ReportUtils.getReportFieldKey(reportFieldID)] ?? null;
+    const availableListValuesLength = (reportField?.disabledOptions ?? []).filter((disabledListValue) => !disabledListValue).length;
+    const currentInitialValue = WorkspaceReportFieldUtils.getReportFieldInitialValue(reportField);
+    const [initialValue, setInitialValue] = useState(currentInitialValue);
+
+    const submitForm = useCallback(
+        (values: FormOnyxValues<typeof ONYXKEYS.FORMS.WORKSPACE_REPORT_FIELDS_FORM>) => {
+            if (currentInitialValue !== values.initialValue) {
+                ReportField.updateReportFieldInitialValue(policyID, reportFieldID, values.initialValue);
+            }
+            Navigation.goBack();
+        },
+        [policyID, reportFieldID, currentInitialValue],
+    );
+
+    const submitListValueUpdate = (value: string) => {
+        ReportField.updateReportFieldInitialValue(policyID, reportFieldID, currentInitialValue === value ? '' : value);
+        Navigation.goBack();
+    };
+
+    const validateForm = useCallback(
+        (values: FormOnyxValues<typeof ONYXKEYS.FORMS.WORKSPACE_REPORT_FIELDS_FORM>): FormInputErrors<typeof ONYXKEYS.FORMS.WORKSPACE_REPORT_FIELDS_FORM> => {
+            const {name, type, initialValue: formInitialValue} = values;
+            const errors: FormInputErrors<typeof ONYXKEYS.FORMS.WORKSPACE_REPORT_FIELDS_FORM> = {};
+
+            if (!ValidationUtils.isRequiredFulfilled(name)) {
+                errors[INPUT_IDS.NAME] = translate('workspace.reportFields.reportFieldNameRequiredError');
+            } else if (Object.values(policy?.fieldList ?? {}).some((currentReportField) => currentReportField.name === name)) {
+                errors[INPUT_IDS.NAME] = translate('workspace.reportFields.existingReportFieldNameError');
+            } else if ([...name].length > CONST.WORKSPACE_REPORT_FIELD_POLICY_MAX_LENGTH) {
+                // Uses the spread syntax to count the number of Unicode code points instead of the number of UTF-16 code units.
+                ErrorUtils.addErrorMessage(
+                    errors,
+                    INPUT_IDS.NAME,
+                    translate('common.error.characterLimitExceedCounter', {length: [...name].length, limit: CONST.WORKSPACE_REPORT_FIELD_POLICY_MAX_LENGTH}),
+                );
+            }
+
+            if (type === CONST.REPORT_FIELD_TYPES.LIST && availableListValuesLength > 0 && !ValidationUtils.isRequiredFulfilled(formInitialValue)) {
+                errors[INPUT_IDS.INITIAL_VALUE] = translate('workspace.reportFields.reportFieldInitialValueRequiredError');
+            }
+
+            return errors;
+        },
+        [availableListValuesLength, policy?.fieldList, translate],
+    );
+
+    if (!reportField || hasAccountingConnections) {
+        return <NotFoundPage />;
+    }
+
+    const isTextFieldType = reportField.type === CONST.REPORT_FIELD_TYPES.TEXT;
+    const isListFieldType = reportField.type === CONST.REPORT_FIELD_TYPES.LIST;
+
+    return (
+        <AccessOrNotFoundWrapper
+            accessVariants={[CONST.POLICY.ACCESS_VARIANTS.ADMIN, CONST.POLICY.ACCESS_VARIANTS.PAID]}
+            policyID={policyID}
+            featureName={CONST.POLICY.MORE_FEATURES.ARE_REPORT_FIELDS_ENABLED}
+        >
+            <ScreenWrapper
+                includeSafeAreaPaddingBottom={false}
+                style={styles.defaultModalContainer}
+                testID={ReportFieldsInitialValuePage.displayName}
+                shouldEnableMaxHeight
+            >
+                <HeaderWithBackButton
+                    title={translate('common.initialValue')}
+                    onBackButtonPress={Navigation.goBack}
+                />
+                {isListFieldType && (
+                    <View style={[styles.ph5, styles.pb4]}>
+                        <Text style={[styles.sidebarLinkText, styles.optionAlternateText]}>{translate('workspace.reportFields.listValuesInputSubtitle')}</Text>
+                    </View>
+                )}
+
+                {isTextFieldType && (
+                    <FormProvider
+                        formID={ONYXKEYS.FORMS.WORKSPACE_REPORT_FIELDS_FORM}
+                        onSubmit={submitForm}
+                        submitButtonText={translate('common.save')}
+                        validate={validateForm}
+                        style={styles.flex1}
+                        enabledWhenOffline
+                        isSubmitButtonVisible={isTextFieldType}
+                        submitButtonStyles={styles.mh5}
+                    >
+                        <InputWrapper
+                            containerStyles={styles.mh5}
+                            InputComponent={TextInput}
+                            inputID={INPUT_IDS.INITIAL_VALUE}
+                            label={translate('common.initialValue')}
+                            accessibilityLabel={translate('workspace.editor.initialValueInputLabel')}
+                            maxLength={CONST.WORKSPACE_REPORT_FIELD_POLICY_MAX_LENGTH}
+                            multiline={false}
+                            value={initialValue}
+                            role={CONST.ROLE.PRESENTATION}
+                            ref={inputCallbackRef}
+                            onChangeText={setInitialValue}
+                        />
+                    </FormProvider>
+                )}
+                {isListFieldType && (
+                    <ReportFieldsInitialListValuePicker
+                        listValues={reportField.values}
+                        disabledOptions={reportField.disabledOptions}
+                        value={initialValue}
+                        onValueChange={submitListValueUpdate}
+                    />
+                )}
+            </ScreenWrapper>
+        </AccessOrNotFoundWrapper>
+    );
+}
+
+ReportFieldsInitialValuePage.displayName = 'ReportFieldsInitialValuePage';
+
+export default withPolicyAndFullscreenLoading(ReportFieldsInitialValuePage);
diff --git a/src/pages/workspace/reportFields/ReportFieldsListValuesPage.tsx b/src/pages/workspace/reportFields/ReportFieldsListValuesPage.tsx
new file mode 100644
index 000000000000..686a32c69c6b
--- /dev/null
+++ b/src/pages/workspace/reportFields/ReportFieldsListValuesPage.tsx
@@ -0,0 +1,354 @@
+import type {StackScreenProps} from '@react-navigation/stack';
+import React, {useMemo, useState} from 'react';
+import {View} from 'react-native';
+import {useOnyx} from 'react-native-onyx';
+import Button from '@components/Button';
+import ButtonWithDropdownMenu from '@components/ButtonWithDropdownMenu';
+import type {DropdownOption} from '@components/ButtonWithDropdownMenu/types';
+import ConfirmModal from '@components/ConfirmModal';
+import EmptyStateComponent from '@components/EmptyStateComponent';
+import HeaderWithBackButton from '@components/HeaderWithBackButton';
+import * as Expensicons from '@components/Icon/Expensicons';
+import * as Illustrations from '@components/Icon/Illustrations';
+import ScreenWrapper from '@components/ScreenWrapper';
+import ListItemRightCaretWithLabel from '@components/SelectionList/ListItemRightCaretWithLabel';
+import TableListItem from '@components/SelectionList/TableListItem';
+import type {ListItem} from '@components/SelectionList/types';
+import SelectionListWithModal from '@components/SelectionListWithModal';
+import TableListItemSkeleton from '@components/Skeletons/TableRowSkeleton';
+import Text from '@components/Text';
+import useLocalize from '@hooks/useLocalize';
+import useResponsiveLayout from '@hooks/useResponsiveLayout';
+import useThemeStyles from '@hooks/useThemeStyles';
+import {turnOffMobileSelectionMode} from '@libs/actions/MobileSelectionMode';
+import * as ReportField from '@libs/actions/Policy/ReportField';
+import * as DeviceCapabilities from '@libs/DeviceCapabilities';
+import localeCompare from '@libs/LocaleCompare';
+import Navigation from '@libs/Navigation/Navigation';
+import * as PolicyUtils from '@libs/PolicyUtils';
+import * as ReportUtils from '@libs/ReportUtils';
+import type {SettingsNavigatorParamList} from '@navigation/types';
+import AccessOrNotFoundWrapper from '@pages/workspace/AccessOrNotFoundWrapper';
+import type {WithPolicyAndFullscreenLoadingProps} from '@pages/workspace/withPolicyAndFullscreenLoading';
+import withPolicyAndFullscreenLoading from '@pages/workspace/withPolicyAndFullscreenLoading';
+import CONST from '@src/CONST';
+import ONYXKEYS from '@src/ONYXKEYS';
+import ROUTES from '@src/ROUTES';
+import type SCREENS from '@src/SCREENS';
+import type DeepValueOf from '@src/types/utils/DeepValueOf';
+
+type ValueListItem = ListItem & {
+    /** The value */
+    value: string;
+
+    /** Whether the value is enabled */
+    enabled: boolean;
+
+    /** The value order weight in the list */
+    orderWeight?: number;
+};
+
+type ReportFieldsListValuesPageProps = WithPolicyAndFullscreenLoadingProps & StackScreenProps<SettingsNavigatorParamList, typeof SCREENS.WORKSPACE.REPORT_FIELDS_LIST_VALUES>;
+
+function ReportFieldsListValuesPage({
+    policy,
+    route: {
+        params: {policyID, reportFieldID},
+    },
+}: ReportFieldsListValuesPageProps) {
+    const styles = useThemeStyles();
+    const {translate} = useLocalize();
+    const {isSmallScreenWidth} = useResponsiveLayout();
+    const [formDraft] = useOnyx(ONYXKEYS.FORMS.WORKSPACE_REPORT_FIELDS_FORM_DRAFT);
+    const [selectionMode] = useOnyx(ONYXKEYS.MOBILE_SELECTION_MODE);
+
+    const [selectedValues, setSelectedValues] = useState<Record<string, boolean>>({});
+    const [deleteValuesConfirmModalVisible, setDeleteValuesConfirmModalVisible] = useState(false);
+    const hasAccountingConnections = PolicyUtils.hasAccountingConnections(policy);
+
+    const canSelectMultiple = !hasAccountingConnections && (isSmallScreenWidth ? selectionMode?.isEnabled : true);
+
+    const [listValues, disabledListValues] = useMemo(() => {
+        let reportFieldValues: string[];
+        let reportFieldDisabledValues: boolean[];
+
+        if (reportFieldID) {
+            const reportFieldKey = ReportUtils.getReportFieldKey(reportFieldID);
+
+            reportFieldValues = Object.values(policy?.fieldList?.[reportFieldKey]?.values ?? {});
+            reportFieldDisabledValues = Object.values(policy?.fieldList?.[reportFieldKey]?.disabledOptions ?? {});
+        } else {
+            reportFieldValues = formDraft?.listValues ?? [];
+            reportFieldDisabledValues = formDraft?.disabledListValues ?? [];
+        }
+
+        return [reportFieldValues, reportFieldDisabledValues];
+    }, [formDraft?.disabledListValues, formDraft?.listValues, policy?.fieldList, reportFieldID]);
+
+    const listValuesSections = useMemo(() => {
+        const data = listValues
+            .map<ValueListItem>((value, index) => ({
+                value,
+                index,
+                text: value,
+                keyForList: value,
+                isSelected: selectedValues[value] && canSelectMultiple,
+                enabled: !disabledListValues[index] ?? true,
+                rightElement: (
+                    <ListItemRightCaretWithLabel
+                        shouldShowCaret={false}
+                        labelText={disabledListValues[index] ? translate('workspace.common.disabled') : translate('workspace.common.enabled')}
+                    />
+                ),
+            }))
+            .sort((a, b) => localeCompare(a.value, b.value));
+        return [{data, isDisabled: false}];
+    }, [canSelectMultiple, disabledListValues, listValues, selectedValues, translate]);
+
+    const shouldShowEmptyState = Object.values(listValues ?? {}).length <= 0;
+    const selectedValuesArray = Object.keys(selectedValues).filter((key) => selectedValues[key]);
+
+    const toggleValue = (valueItem: ValueListItem) => {
+        setSelectedValues((prev) => ({
+            ...prev,
+            [valueItem.value]: !prev[valueItem.value],
+        }));
+    };
+
+    const toggleAllValues = () => {
+        const areAllSelected = listValues.length === selectedValuesArray.length;
+
+        setSelectedValues(areAllSelected ? {} : Object.fromEntries(listValues.map((value) => [value, true])));
+    };
+
+    const handleDeleteValues = () => {
+        setSelectedValues({});
+
+        const valuesToDelete = selectedValuesArray.reduce<number[]>((acc, valueName) => {
+            const index = listValues?.indexOf(valueName) ?? -1;
+
+            if (index !== -1) {
+                acc.push(index);
+            }
+
+            return acc;
+        }, []);
+
+        if (reportFieldID) {
+            ReportField.removeReportFieldListValue(policyID, reportFieldID, valuesToDelete);
+        } else {
+            ReportField.deleteReportFieldsListValue(valuesToDelete);
+        }
+
+        setDeleteValuesConfirmModalVisible(false);
+    };
+
+    const openListValuePage = (valueItem: ValueListItem) => {
+        if (valueItem.index === undefined || hasAccountingConnections) {
+            return;
+        }
+
+        Navigation.navigate(ROUTES.WORKSPACE_REPORT_FIELDS_VALUE_SETTINGS.getRoute(policyID, valueItem.index, reportFieldID));
+
+        setSelectedValues({});
+    };
+
+    const getCustomListHeader = () => {
+        const header = (
+            <View
+                style={[
+                    styles.flex1,
+                    styles.flexRow,
+                    styles.justifyContentBetween,
+                    // Required padding accounting for the checkbox and the right arrow in multi-select mode
+                    canSelectMultiple && styles.pl3,
+                ]}
+            >
+                <Text style={styles.searchInputStyle}>{translate('common.name')}</Text>
+                <Text style={[styles.searchInputStyle, styles.textAlignCenter]}>{translate('statusPage.status')}</Text>
+            </View>
+        );
+        if (canSelectMultiple) {
+            return header;
+        }
+        return <View style={[styles.flexRow, styles.ph9, styles.pv3, styles.pb5]}>{header}</View>;
+    };
+
+    const getHeaderButtons = () => {
+        const options: Array<DropdownOption<DeepValueOf<typeof CONST.POLICY.BULK_ACTION_TYPES>>> = [];
+        if (isSmallScreenWidth ? selectionMode?.isEnabled : selectedValuesArray.length > 0) {
+            if (selectedValuesArray.length > 0) {
+                options.push({
+                    icon: Expensicons.Trashcan,
+                    text: translate(selectedValuesArray.length === 1 ? 'workspace.reportFields.deleteValue' : 'workspace.reportFields.deleteValues'),
+                    value: CONST.POLICY.BULK_ACTION_TYPES.DELETE,
+                    onSelected: () => setDeleteValuesConfirmModalVisible(true),
+                });
+            }
+            const enabledValues = selectedValuesArray.filter((valueName) => {
+                const index = listValues?.indexOf(valueName) ?? -1;
+                return !disabledListValues?.[index];
+            });
+
+            if (enabledValues.length > 0) {
+                const valuesToDisable = selectedValuesArray.reduce<number[]>((acc, valueName) => {
+                    const index = listValues?.indexOf(valueName) ?? -1;
+                    if (!disabledListValues?.[index] && index !== -1) {
+                        acc.push(index);
+                    }
+
+                    return acc;
+                }, []);
+
+                options.push({
+                    icon: Expensicons.DocumentSlash,
+                    text: translate(enabledValues.length === 1 ? 'workspace.reportFields.disableValue' : 'workspace.reportFields.disableValues'),
+                    value: CONST.POLICY.BULK_ACTION_TYPES.DISABLE,
+                    onSelected: () => {
+                        setSelectedValues({});
+
+                        if (reportFieldID) {
+                            ReportField.updateReportFieldListValueEnabled(policyID, reportFieldID, valuesToDisable, false);
+                            return;
+                        }
+
+                        ReportField.setReportFieldsListValueEnabled(valuesToDisable, false);
+                    },
+                });
+            }
+
+            const disabledValues = selectedValuesArray.filter((valueName) => {
+                const index = listValues?.indexOf(valueName) ?? -1;
+                return disabledListValues?.[index];
+            });
+
+            if (disabledValues.length > 0) {
+                const valuesToEnable = selectedValuesArray.reduce<number[]>((acc, valueName) => {
+                    const index = listValues?.indexOf(valueName) ?? -1;
+                    if (disabledListValues?.[index] && index !== -1) {
+                        acc.push(index);
+                    }
+
+                    return acc;
+                }, []);
+
+                options.push({
+                    icon: Expensicons.Document,
+                    text: translate(disabledValues.length === 1 ? 'workspace.reportFields.enableValue' : 'workspace.reportFields.enableValues'),
+                    value: CONST.POLICY.BULK_ACTION_TYPES.ENABLE,
+                    onSelected: () => {
+                        setSelectedValues({});
+
+                        if (reportFieldID) {
+                            ReportField.updateReportFieldListValueEnabled(policyID, reportFieldID, valuesToEnable, true);
+                            return;
+                        }
+
+                        ReportField.setReportFieldsListValueEnabled(valuesToEnable, true);
+                    },
+                });
+            }
+
+            return (
+                <ButtonWithDropdownMenu
+                    onPress={() => null}
+                    shouldAlwaysShowDropdownMenu
+                    pressOnEnter
+                    buttonSize={CONST.DROPDOWN_BUTTON_SIZE.MEDIUM}
+                    customText={translate('workspace.common.selected', {selectedNumber: selectedValuesArray.length})}
+                    options={options}
+                    isSplitButton={false}
+                    style={[isSmallScreenWidth && styles.flexGrow1, isSmallScreenWidth && styles.mb3]}
+                    isDisabled={!selectedValuesArray.length}
+                />
+            );
+        }
+
+        return (
+            <Button
+                style={[isSmallScreenWidth && styles.flexGrow1, isSmallScreenWidth && styles.mb3]}
+                medium
+                success
+                icon={Expensicons.Plus}
+                text={translate('workspace.reportFields.addValue')}
+                onPress={() => Navigation.navigate(ROUTES.WORKSPACE_REPORT_FIELDS_ADD_VALUE.getRoute(policyID, reportFieldID))}
+            />
+        );
+    };
+
+    const selectionModeHeader = selectionMode?.isEnabled && isSmallScreenWidth;
+
+    return (
+        <AccessOrNotFoundWrapper
+            accessVariants={[CONST.POLICY.ACCESS_VARIANTS.ADMIN, CONST.POLICY.ACCESS_VARIANTS.PAID]}
+            policyID={policyID}
+            featureName={CONST.POLICY.MORE_FEATURES.ARE_REPORT_FIELDS_ENABLED}
+        >
+            <ScreenWrapper
+                includeSafeAreaPaddingBottom={false}
+                style={styles.defaultModalContainer}
+                testID={ReportFieldsListValuesPage.displayName}
+                shouldEnableMaxHeight
+            >
+                <HeaderWithBackButton
+                    title={translate(selectionModeHeader ? 'common.selectMultiple' : 'workspace.reportFields.listValues')}
+                    onBackButtonPress={() => {
+                        if (selectionMode?.isEnabled) {
+                            setSelectedValues({});
+                            turnOffMobileSelectionMode();
+                            return;
+                        }
+                        Navigation.goBack();
+                    }}
+                >
+                    {!isSmallScreenWidth && !hasAccountingConnections && getHeaderButtons()}
+                </HeaderWithBackButton>
+                {isSmallScreenWidth && <View style={[styles.pl5, styles.pr5]}>{!hasAccountingConnections && getHeaderButtons()}</View>}
+                <View style={[styles.ph5, styles.pv4]}>
+                    <Text style={[styles.sidebarLinkText, styles.optionAlternateText]}>{translate('workspace.reportFields.listInputSubtitle')}</Text>
+                </View>
+                {shouldShowEmptyState && (
+                    <EmptyStateComponent
+                        title={translate('workspace.reportFields.emptyReportFieldsValues.title')}
+                        subtitle={translate('workspace.reportFields.emptyReportFieldsValues.subtitle')}
+                        SkeletonComponent={TableListItemSkeleton}
+                        headerMediaType={CONST.EMPTY_STATE_MEDIA.ILLUSTRATION}
+                        headerMedia={Illustrations.EmptyStateExpenses}
+                        headerStyles={styles.emptyFolderBG}
+                        headerContentStyles={styles.emptyStateFolderIconSize}
+                    />
+                )}
+                {!shouldShowEmptyState && (
+                    <SelectionListWithModal
+                        canSelectMultiple={canSelectMultiple}
+                        turnOnSelectionModeOnLongPress={!hasAccountingConnections}
+                        onTurnOnSelectionMode={(item) => item && toggleValue(item)}
+                        sections={listValuesSections}
+                        onCheckboxPress={toggleValue}
+                        onSelectRow={openListValuePage}
+                        onSelectAll={toggleAllValues}
+                        ListItem={TableListItem}
+                        customListHeader={getCustomListHeader()}
+                        shouldPreventDefaultFocusOnSelectRow={!DeviceCapabilities.canUseTouchScreen()}
+                        listHeaderWrapperStyle={[styles.ph9, styles.pv3, styles.pb5]}
+                        showScrollIndicator={false}
+                    />
+                )}
+                <ConfirmModal
+                    isVisible={deleteValuesConfirmModalVisible}
+                    onConfirm={handleDeleteValues}
+                    onCancel={() => setDeleteValuesConfirmModalVisible(false)}
+                    title={translate(selectedValuesArray.length === 1 ? 'workspace.reportFields.deleteValue' : 'workspace.reportFields.deleteValues')}
+                    prompt={translate(selectedValuesArray.length === 1 ? 'workspace.reportFields.deleteValuePrompt' : 'workspace.reportFields.deleteValuesPrompt')}
+                    confirmText={translate('common.delete')}
+                    cancelText={translate('common.cancel')}
+                    danger
+                />
+            </ScreenWrapper>
+        </AccessOrNotFoundWrapper>
+    );
+}
+
+ReportFieldsListValuesPage.displayName = 'ReportFieldsListValuesPage';
+
+export default withPolicyAndFullscreenLoading(ReportFieldsListValuesPage);
diff --git a/src/pages/workspace/reportFields/ReportFieldsSettingsPage.tsx b/src/pages/workspace/reportFields/ReportFieldsSettingsPage.tsx
new file mode 100644
index 000000000000..cc6460d20641
--- /dev/null
+++ b/src/pages/workspace/reportFields/ReportFieldsSettingsPage.tsx
@@ -0,0 +1,139 @@
+import type {StackScreenProps} from '@react-navigation/stack';
+import {Str} from 'expensify-common';
+import React, {useState} from 'react';
+import {View} from 'react-native';
+import ConfirmModal from '@components/ConfirmModal';
+import HeaderWithBackButton from '@components/HeaderWithBackButton';
+import * as Expensicons from '@components/Icon/Expensicons';
+import MenuItem from '@components/MenuItem';
+import MenuItemWithTopDescription from '@components/MenuItemWithTopDescription';
+import ScreenWrapper from '@components/ScreenWrapper';
+import useLocalize from '@hooks/useLocalize';
+import useThemeStyles from '@hooks/useThemeStyles';
+import localeCompare from '@libs/LocaleCompare';
+import Navigation from '@libs/Navigation/Navigation';
+import * as PolicyUtils from '@libs/PolicyUtils';
+import * as ReportUtils from '@libs/ReportUtils';
+import * as WorkspaceReportFieldUtils from '@libs/WorkspaceReportFieldUtils';
+import type {SettingsNavigatorParamList} from '@navigation/types';
+import NotFoundPage from '@pages/ErrorPage/NotFoundPage';
+import AccessOrNotFoundWrapper from '@pages/workspace/AccessOrNotFoundWrapper';
+import type {WithPolicyAndFullscreenLoadingProps} from '@pages/workspace/withPolicyAndFullscreenLoading';
+import withPolicyAndFullscreenLoading from '@pages/workspace/withPolicyAndFullscreenLoading';
+import * as ReportField from '@userActions/Policy/ReportField';
+import CONST from '@src/CONST';
+import ROUTES from '@src/ROUTES';
+import type SCREENS from '@src/SCREENS';
+
+type ReportFieldsSettingsPageProps = WithPolicyAndFullscreenLoadingProps & StackScreenProps<SettingsNavigatorParamList, typeof SCREENS.WORKSPACE.REPORT_FIELDS_SETTINGS>;
+
+function ReportFieldsSettingsPage({
+    policy,
+    route: {
+        params: {policyID, reportFieldID},
+    },
+}: ReportFieldsSettingsPageProps) {
+    const styles = useThemeStyles();
+    const {translate} = useLocalize();
+    const [isDeleteModalVisible, setIsDeleteModalVisible] = useState(false);
+
+    const hasAccountingConnections = PolicyUtils.hasAccountingConnections(policy);
+    const reportFieldKey = ReportUtils.getReportFieldKey(reportFieldID);
+    const reportField = policy?.fieldList?.[reportFieldKey] ?? null;
+
+    if (!reportField) {
+        return <NotFoundPage />;
+    }
+
+    const isDateFieldType = reportField.type === CONST.REPORT_FIELD_TYPES.DATE;
+    const isListFieldType = reportField.type === CONST.REPORT_FIELD_TYPES.LIST;
+    const isListFieldEmpty = isListFieldType && reportField.disabledOptions.filter((disabledListValue) => !disabledListValue).length <= 0;
+    const listValues = Object.values(policy?.fieldList?.[reportFieldKey]?.values ?? {})?.sort(localeCompare);
+
+    const deleteReportFieldAndHideModal = () => {
+        ReportField.deleteReportFields(policyID, [reportFieldKey]);
+        setIsDeleteModalVisible(false);
+        Navigation.goBack();
+    };
+
+    return (
+        <AccessOrNotFoundWrapper
+            accessVariants={[CONST.POLICY.ACCESS_VARIANTS.ADMIN, CONST.POLICY.ACCESS_VARIANTS.PAID]}
+            policyID={policyID}
+            featureName={CONST.POLICY.MORE_FEATURES.ARE_REPORT_FIELDS_ENABLED}
+        >
+            <ScreenWrapper
+                includeSafeAreaPaddingBottom={false}
+                style={[styles.defaultModalContainer]}
+                testID={ReportFieldsSettingsPage.displayName}
+            >
+                <HeaderWithBackButton
+                    title={reportField.name}
+                    shouldSetModalVisibility={false}
+                />
+                <ConfirmModal
+                    title={translate('workspace.reportFields.delete')}
+                    isVisible={isDeleteModalVisible && !hasAccountingConnections}
+                    onConfirm={deleteReportFieldAndHideModal}
+                    onCancel={() => setIsDeleteModalVisible(false)}
+                    shouldSetModalVisibility={false}
+                    prompt={translate('workspace.reportFields.deleteConfirmation')}
+                    confirmText={translate('common.delete')}
+                    cancelText={translate('common.cancel')}
+                    danger
+                />
+                <View style={styles.flexGrow1}>
+                    <MenuItemWithTopDescription
+                        style={[styles.moneyRequestMenuItem]}
+                        titleStyle={styles.flex1}
+                        title={reportField.name}
+                        description={translate('common.name')}
+                        interactive={false}
+                    />
+                    <MenuItemWithTopDescription
+                        style={[styles.moneyRequestMenuItem]}
+                        titleStyle={styles.flex1}
+                        title={Str.recapitalize(translate(WorkspaceReportFieldUtils.getReportFieldTypeTranslationKey(reportField.type)))}
+                        description={translate('common.type')}
+                        interactive={false}
+                    />
+                    {isListFieldType && (
+                        <MenuItemWithTopDescription
+                            style={[styles.moneyRequestMenuItem]}
+                            titleStyle={styles.flex1}
+                            description={translate('workspace.reportFields.listValues')}
+                            shouldShowRightIcon
+                            onPress={() => Navigation.navigate(ROUTES.WORKSPACE_REPORT_FIELDS_LIST_VALUES.getRoute(policyID, reportFieldID))}
+                            title={listValues.join(', ')}
+                            numberOfLinesTitle={5}
+                        />
+                    )}
+                    {!isListFieldEmpty && (
+                        <MenuItemWithTopDescription
+                            style={[styles.moneyRequestMenuItem]}
+                            titleStyle={styles.flex1}
+                            title={WorkspaceReportFieldUtils.getReportFieldInitialValue(reportField)}
+                            description={translate('common.initialValue')}
+                            shouldShowRightIcon={!isDateFieldType && !hasAccountingConnections}
+                            interactive={!isDateFieldType && !hasAccountingConnections}
+                            onPress={() => Navigation.navigate(ROUTES.WORKSPACE_EDIT_REPORT_FIELDS_INITIAL_VALUE.getRoute(policyID, reportFieldID))}
+                        />
+                    )}
+                    {!hasAccountingConnections && (
+                        <View style={styles.flexGrow1}>
+                            <MenuItem
+                                icon={Expensicons.Trashcan}
+                                title={translate('common.delete')}
+                                onPress={() => setIsDeleteModalVisible(true)}
+                            />
+                        </View>
+                    )}
+                </View>
+            </ScreenWrapper>
+        </AccessOrNotFoundWrapper>
+    );
+}
+
+ReportFieldsSettingsPage.displayName = 'ReportFieldsSettingsPage';
+
+export default withPolicyAndFullscreenLoading(ReportFieldsSettingsPage);
diff --git a/src/pages/workspace/reportFields/ReportFieldsValueSettingsPage.tsx b/src/pages/workspace/reportFields/ReportFieldsValueSettingsPage.tsx
new file mode 100644
index 000000000000..977e64c882f1
--- /dev/null
+++ b/src/pages/workspace/reportFields/ReportFieldsValueSettingsPage.tsx
@@ -0,0 +1,147 @@
+import type {StackScreenProps} from '@react-navigation/stack';
+import React, {useMemo, useState} from 'react';
+import {View} from 'react-native';
+import {useOnyx} from 'react-native-onyx';
+import ConfirmModal from '@components/ConfirmModal';
+import HeaderWithBackButton from '@components/HeaderWithBackButton';
+import * as Expensicons from '@components/Icon/Expensicons';
+import MenuItem from '@components/MenuItem';
+import MenuItemWithTopDescription from '@components/MenuItemWithTopDescription';
+import ScreenWrapper from '@components/ScreenWrapper';
+import Switch from '@components/Switch';
+import Text from '@components/Text';
+import useLocalize from '@hooks/useLocalize';
+import useThemeStyles from '@hooks/useThemeStyles';
+import * as ReportField from '@libs/actions/Policy/ReportField';
+import Navigation from '@libs/Navigation/Navigation';
+import * as PolicyUtils from '@libs/PolicyUtils';
+import * as ReportUtils from '@libs/ReportUtils';
+import type {SettingsNavigatorParamList} from '@navigation/types';
+import NotFoundPage from '@pages/ErrorPage/NotFoundPage';
+import AccessOrNotFoundWrapper from '@pages/workspace/AccessOrNotFoundWrapper';
+import type {WithPolicyAndFullscreenLoadingProps} from '@pages/workspace/withPolicyAndFullscreenLoading';
+import withPolicyAndFullscreenLoading from '@pages/workspace/withPolicyAndFullscreenLoading';
+import CONST from '@src/CONST';
+import ONYXKEYS from '@src/ONYXKEYS';
+import ROUTES from '@src/ROUTES';
+import type SCREENS from '@src/SCREENS';
+
+type ReportFieldsValueSettingsPageProps = WithPolicyAndFullscreenLoadingProps & StackScreenProps<SettingsNavigatorParamList, typeof SCREENS.WORKSPACE.REPORT_FIELDS_VALUE_SETTINGS>;
+
+function ReportFieldsValueSettingsPage({
+    policy,
+    route: {
+        params: {policyID, valueIndex, reportFieldID},
+    },
+}: ReportFieldsValueSettingsPageProps) {
+    const styles = useThemeStyles();
+    const {translate} = useLocalize();
+    const [formDraft] = useOnyx(ONYXKEYS.FORMS.WORKSPACE_REPORT_FIELDS_FORM_DRAFT);
+
+    const [isDeleteTagModalOpen, setIsDeleteTagModalOpen] = useState(false);
+
+    const [currentValueName, currentValueDisabled] = useMemo(() => {
+        let reportFieldValue: string;
+        let reportFieldDisabledValue: boolean;
+
+        if (reportFieldID) {
+            const reportFieldKey = ReportUtils.getReportFieldKey(reportFieldID);
+
+            reportFieldValue = Object.values(policy?.fieldList?.[reportFieldKey]?.values ?? {})?.[valueIndex] ?? '';
+            reportFieldDisabledValue = Object.values(policy?.fieldList?.[reportFieldKey]?.disabledOptions ?? {})?.[valueIndex] ?? false;
+        } else {
+            reportFieldValue = formDraft?.listValues?.[valueIndex] ?? '';
+            reportFieldDisabledValue = formDraft?.disabledListValues?.[valueIndex] ?? false;
+        }
+
+        return [reportFieldValue, reportFieldDisabledValue];
+    }, [formDraft?.disabledListValues, formDraft?.listValues, policy?.fieldList, reportFieldID, valueIndex]);
+
+    const hasAccountingConnections = PolicyUtils.hasAccountingConnections(policy);
+
+    if (!currentValueName || hasAccountingConnections) {
+        return <NotFoundPage />;
+    }
+
+    const deleteListValueAndHideModal = () => {
+        if (reportFieldID) {
+            ReportField.removeReportFieldListValue(policyID, reportFieldID, [valueIndex]);
+        } else {
+            ReportField.deleteReportFieldsListValue([valueIndex]);
+        }
+
+        setIsDeleteTagModalOpen(false);
+        Navigation.goBack();
+    };
+
+    const updateListValueEnabled = (value: boolean) => {
+        if (reportFieldID) {
+            ReportField.updateReportFieldListValueEnabled(policyID, reportFieldID, [Number(valueIndex)], value);
+            return;
+        }
+
+        ReportField.setReportFieldsListValueEnabled([valueIndex], value);
+    };
+
+    const navigateToEditValue = () => {
+        Navigation.navigate(ROUTES.WORKSPACE_REPORT_FIELDS_EDIT_VALUE.getRoute(policyID, valueIndex));
+    };
+
+    return (
+        <AccessOrNotFoundWrapper
+            accessVariants={[CONST.POLICY.ACCESS_VARIANTS.ADMIN, CONST.POLICY.ACCESS_VARIANTS.PAID]}
+            policyID={policyID}
+            featureName={CONST.POLICY.MORE_FEATURES.ARE_REPORT_FIELDS_ENABLED}
+        >
+            <ScreenWrapper
+                includeSafeAreaPaddingBottom={false}
+                style={styles.defaultModalContainer}
+                testID={ReportFieldsValueSettingsPage.displayName}
+            >
+                <HeaderWithBackButton
+                    title={currentValueName}
+                    shouldSetModalVisibility={false}
+                />
+                <ConfirmModal
+                    title={translate('workspace.reportFields.deleteValue')}
+                    isVisible={isDeleteTagModalOpen}
+                    onConfirm={deleteListValueAndHideModal}
+                    onCancel={() => setIsDeleteTagModalOpen(false)}
+                    shouldSetModalVisibility={false}
+                    prompt={translate('workspace.reportFields.deleteValuePrompt')}
+                    confirmText={translate('common.delete')}
+                    cancelText={translate('common.cancel')}
+                    danger
+                />
+                <View style={styles.flexGrow1}>
+                    <View style={[styles.mt2, styles.mh5]}>
+                        <View style={[styles.flexRow, styles.mb5, styles.mr2, styles.alignItemsCenter, styles.justifyContentBetween]}>
+                            <Text>{translate('workspace.reportFields.enableValue')}</Text>
+                            <Switch
+                                isOn={!currentValueDisabled}
+                                accessibilityLabel={translate('workspace.reportFields.enableValue')}
+                                onToggle={updateListValueEnabled}
+                            />
+                        </View>
+                    </View>
+                    <MenuItemWithTopDescription
+                        title={currentValueName}
+                        description={translate('common.value')}
+                        shouldShowRightIcon={!reportFieldID}
+                        interactive={!reportFieldID}
+                        onPress={navigateToEditValue}
+                    />
+                    <MenuItem
+                        icon={Expensicons.Trashcan}
+                        title={translate('common.delete')}
+                        onPress={() => setIsDeleteTagModalOpen(true)}
+                    />
+                </View>
+            </ScreenWrapper>
+        </AccessOrNotFoundWrapper>
+    );
+}
+
+ReportFieldsValueSettingsPage.displayName = 'ReportFieldsValueSettingsPage';
+
+export default withPolicyAndFullscreenLoading(ReportFieldsValueSettingsPage);
diff --git a/src/pages/workspace/reportFields/TypeSelector/TypeSelectorModal.tsx b/src/pages/workspace/reportFields/TypeSelector/TypeSelectorModal.tsx
new file mode 100644
index 000000000000..ca64dda455a4
--- /dev/null
+++ b/src/pages/workspace/reportFields/TypeSelector/TypeSelectorModal.tsx
@@ -0,0 +1,70 @@
+import React from 'react';
+import {View} from 'react-native';
+import HeaderWithBackButton from '@components/HeaderWithBackButton';
+import Modal from '@components/Modal';
+import ScreenWrapper from '@components/ScreenWrapper';
+import Text from '@components/Text';
+import useThemeStyles from '@hooks/useThemeStyles';
+import type {ReportFieldItemType} from '@pages/workspace/reportFields/ReportFieldTypePicker';
+import ReportFieldTypePicker from '@pages/workspace/reportFields/ReportFieldTypePicker';
+import CONST from '@src/CONST';
+import type {PolicyReportFieldType} from '@src/types/onyx/Policy';
+
+type TypeSelectorModalProps = {
+    /** Whether the modal is visible */
+    isVisible: boolean;
+
+    /** Selected type */
+    currentType: PolicyReportFieldType;
+
+    /** Label to display on field */
+    label: string;
+
+    /** Subtitle to display on field */
+    subtitle: string;
+
+    /** Function to call when the user selects a type */
+    onTypeSelected: (value: ReportFieldItemType) => void;
+
+    /** Function to call when the user closes the type selector modal */
+    onClose: () => void;
+};
+
+function TypeSelectorModal({isVisible, currentType, label, subtitle, onTypeSelected, onClose}: TypeSelectorModalProps) {
+    const styles = useThemeStyles();
+
+    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}
+                testID={TypeSelectorModal.displayName}
+            >
+                <HeaderWithBackButton
+                    title={label}
+                    shouldShowBackButton
+                    onBackButtonPress={onClose}
+                />
+                <View style={[styles.ph5, styles.pb4]}>
+                    <Text style={[styles.sidebarLinkText, styles.optionAlternateText]}>{subtitle}</Text>
+                </View>
+                <ReportFieldTypePicker
+                    defaultValue={currentType}
+                    onOptionSelected={onTypeSelected}
+                />
+            </ScreenWrapper>
+        </Modal>
+    );
+}
+
+TypeSelectorModal.displayName = 'TypeSelectorModal';
+
+export default TypeSelectorModal;
diff --git a/src/pages/workspace/reportFields/TypeSelector/index.tsx b/src/pages/workspace/reportFields/TypeSelector/index.tsx
new file mode 100644
index 000000000000..083408a61b9a
--- /dev/null
+++ b/src/pages/workspace/reportFields/TypeSelector/index.tsx
@@ -0,0 +1,73 @@
+import {Str} from 'expensify-common';
+import type {ForwardedRef} from 'react';
+import React, {forwardRef, useState} from 'react';
+import {View} from 'react-native';
+import type {MenuItemBaseProps} from '@components/MenuItem';
+import MenuItemWithTopDescription from '@components/MenuItemWithTopDescription';
+import useLocalize from '@hooks/useLocalize';
+import * as WorkspaceReportFieldUtils from '@libs/WorkspaceReportFieldUtils';
+import type {ReportFieldItemType} from '@pages/workspace/reportFields/ReportFieldTypePicker';
+import CONST from '@src/CONST';
+import type {PolicyReportFieldType} from '@src/types/onyx/Policy';
+import TypeSelectorModal from './TypeSelectorModal';
+
+type TypeSelectorProps = Pick<MenuItemBaseProps, 'label' | 'rightLabel' | 'errorText'> & {
+    /** Currently selected type */
+    value?: string;
+
+    /** Subtitle to display on field */
+    subtitle?: string;
+
+    /** Function to call when the user selects a type */
+    onInputChange?: (value: string) => void;
+
+    /** Function to call when the user selects a type */
+    onTypeSelected?: (reportFieldType: PolicyReportFieldType) => void;
+};
+
+function TypeSelector({value, label = '', rightLabel, subtitle = '', errorText = '', onInputChange, onTypeSelected}: TypeSelectorProps, forwardedRef: ForwardedRef<View>) {
+    const {translate} = useLocalize();
+
+    const [isPickerVisible, setIsPickerVisible] = useState(false);
+
+    const showPickerModal = () => {
+        setIsPickerVisible(true);
+    };
+
+    const hidePickerModal = () => {
+        setIsPickerVisible(false);
+    };
+
+    const updateTypeInput = (reportField: ReportFieldItemType) => {
+        onInputChange?.(reportField.value);
+        onTypeSelected?.(reportField.value);
+        hidePickerModal();
+    };
+
+    return (
+        <View>
+            <MenuItemWithTopDescription
+                ref={forwardedRef}
+                shouldShowRightIcon
+                title={value ? Str.recapitalize(translate(WorkspaceReportFieldUtils.getReportFieldTypeTranslationKey(value as PolicyReportFieldType))) : ''}
+                description={label}
+                rightLabel={rightLabel}
+                brickRoadIndicator={errorText ? CONST.BRICK_ROAD_INDICATOR_STATUS.ERROR : undefined}
+                errorText={errorText}
+                onPress={showPickerModal}
+            />
+            <TypeSelectorModal
+                isVisible={isPickerVisible}
+                currentType={value as PolicyReportFieldType}
+                onClose={hidePickerModal}
+                onTypeSelected={updateTypeInput}
+                label={label}
+                subtitle={subtitle}
+            />
+        </View>
+    );
+}
+
+TypeSelector.displayName = 'TypeSelector';
+
+export default forwardRef(TypeSelector);
diff --git a/src/pages/workspace/reportFields/WorkspaceReportFieldsPage.tsx b/src/pages/workspace/reportFields/WorkspaceReportFieldsPage.tsx
new file mode 100644
index 000000000000..872946905974
--- /dev/null
+++ b/src/pages/workspace/reportFields/WorkspaceReportFieldsPage.tsx
@@ -0,0 +1,321 @@
+import {useFocusEffect, useIsFocused} from '@react-navigation/native';
+import type {StackScreenProps} from '@react-navigation/stack';
+import {Str} from 'expensify-common';
+import React, {useCallback, useEffect, useMemo, useState} from 'react';
+import {ActivityIndicator, View} from 'react-native';
+import {useOnyx} from 'react-native-onyx';
+import Button from '@components/Button';
+import ButtonWithDropdownMenu from '@components/ButtonWithDropdownMenu';
+import type {DropdownOption} from '@components/ButtonWithDropdownMenu/types';
+import ConfirmModal from '@components/ConfirmModal';
+import EmptyStateComponent from '@components/EmptyStateComponent';
+import HeaderWithBackButton from '@components/HeaderWithBackButton';
+import * as Expensicons from '@components/Icon/Expensicons';
+import * as Illustrations from '@components/Icon/Illustrations';
+import ScreenWrapper from '@components/ScreenWrapper';
+import ListItemRightCaretWithLabel from '@components/SelectionList/ListItemRightCaretWithLabel';
+import TableListItem from '@components/SelectionList/TableListItem';
+import type {ListItem} from '@components/SelectionList/types';
+import SelectionListWithModal from '@components/SelectionListWithModal';
+import TableListItemSkeleton from '@components/Skeletons/TableRowSkeleton';
+import Text from '@components/Text';
+import TextLink from '@components/TextLink';
+import useEnvironment from '@hooks/useEnvironment';
+import useLocalize from '@hooks/useLocalize';
+import useNetwork from '@hooks/useNetwork';
+import usePolicy from '@hooks/usePolicy';
+import useResponsiveLayout from '@hooks/useResponsiveLayout';
+import useTheme from '@hooks/useTheme';
+import useThemeStyles from '@hooks/useThemeStyles';
+import {turnOffMobileSelectionMode} from '@libs/actions/MobileSelectionMode';
+import * as DeviceCapabilities from '@libs/DeviceCapabilities';
+import localeCompare from '@libs/LocaleCompare';
+import Navigation from '@libs/Navigation/Navigation';
+import type {FullScreenNavigatorParamList} from '@libs/Navigation/types';
+import * as PolicyUtils from '@libs/PolicyUtils';
+import * as ReportUtils from '@libs/ReportUtils';
+import * as WorkspaceReportFieldUtils from '@libs/WorkspaceReportFieldUtils';
+import AccessOrNotFoundWrapper from '@pages/workspace/AccessOrNotFoundWrapper';
+import * as ReportField from '@userActions/Policy/ReportField';
+import CONST from '@src/CONST';
+import ONYXKEYS from '@src/ONYXKEYS';
+import ROUTES from '@src/ROUTES';
+import type SCREENS from '@src/SCREENS';
+import type {PolicyReportField} from '@src/types/onyx/Policy';
+import type DeepValueOf from '@src/types/utils/DeepValueOf';
+
+type ReportFieldForList = ListItem & {
+    value: string;
+    fieldID: string;
+    orderWeight?: number;
+};
+
+type WorkspaceReportFieldsPageProps = StackScreenProps<FullScreenNavigatorParamList, typeof SCREENS.WORKSPACE.REPORT_FIELDS>;
+
+function WorkspaceReportFieldsPage({
+    route: {
+        params: {policyID},
+    },
+}: WorkspaceReportFieldsPageProps) {
+    const {shouldUseNarrowLayout, isSmallScreenWidth} = useResponsiveLayout();
+    const styles = useThemeStyles();
+    const theme = useTheme();
+    const {translate} = useLocalize();
+    const isFocused = useIsFocused();
+    const {environmentURL} = useEnvironment();
+    const policy = usePolicy(policyID);
+    const [selectionMode] = useOnyx(ONYXKEYS.MOBILE_SELECTION_MODE);
+    const filteredPolicyFieldList = useMemo(() => {
+        if (!policy?.fieldList) {
+            return {};
+        }
+        // eslint-disable-next-line @typescript-eslint/no-unused-vars
+        return Object.fromEntries(Object.entries(policy.fieldList).filter(([_, value]) => value.fieldID !== 'text_title'));
+    }, [policy]);
+    const [selectedReportFields, setSelectedReportFields] = useState<PolicyReportField[]>([]);
+    const [deleteReportFieldsConfirmModalVisible, setDeleteReportFieldsConfirmModalVisible] = useState(false);
+    const hasAccountingConnections = PolicyUtils.hasAccountingConnections(policy);
+    const isConnectedToAccounting = Object.keys(policy?.connections ?? {}).length > 0;
+    const currentConnectionName = PolicyUtils.getCurrentConnectionName(policy);
+
+    const canSelectMultiple = !hasAccountingConnections && (isSmallScreenWidth ? selectionMode?.isEnabled : true);
+
+    const fetchReportFields = useCallback(() => {
+        ReportField.openPolicyReportFieldsPage(policyID);
+    }, [policyID]);
+
+    const {isOffline} = useNetwork({onReconnect: fetchReportFields});
+
+    const hasVisibleReportField = Object.values(filteredPolicyFieldList).some((reportField) => reportField.pendingAction !== CONST.RED_BRICK_ROAD_PENDING_ACTION.DELETE || isOffline);
+
+    useFocusEffect(fetchReportFields);
+
+    useEffect(() => {
+        if (isFocused) {
+            return;
+        }
+        setSelectedReportFields([]);
+    }, [isFocused]);
+
+    const reportFieldsSections = useMemo(() => {
+        if (!policy) {
+            return [{data: [], isDisabled: true}];
+        }
+
+        return [
+            {
+                data: Object.values(filteredPolicyFieldList)
+                    .sort((a, b) => localeCompare(a.name, b.name))
+                    .map((reportField) => ({
+                        value: reportField.name,
+                        fieldID: reportField.fieldID,
+                        keyForList: String(reportField.fieldID),
+                        orderWeight: reportField.orderWeight,
+                        pendingAction: reportField.pendingAction,
+                        isSelected: selectedReportFields.find((selectedReportField) => selectedReportField.name === reportField.name) !== undefined && canSelectMultiple,
+                        isDisabled: reportField.pendingAction === CONST.RED_BRICK_ROAD_PENDING_ACTION.DELETE,
+                        text: reportField.name,
+                        rightElement: (
+                            <ListItemRightCaretWithLabel
+                                shouldShowCaret={false}
+                                labelText={Str.recapitalize(translate(WorkspaceReportFieldUtils.getReportFieldTypeTranslationKey(reportField.type)))}
+                            />
+                        ),
+                    })),
+                isDisabled: false,
+            },
+        ];
+    }, [filteredPolicyFieldList, policy, selectedReportFields, canSelectMultiple, translate]);
+
+    const updateSelectedReportFields = (item: ReportFieldForList) => {
+        const fieldKey = ReportUtils.getReportFieldKey(item.fieldID);
+        const updatedReportFields = selectedReportFields.find((selectedReportField) => selectedReportField.name === item.value)
+            ? selectedReportFields.filter((selectedReportField) => selectedReportField.name !== item.value)
+            : [...selectedReportFields, filteredPolicyFieldList[fieldKey]];
+        setSelectedReportFields(updatedReportFields);
+    };
+
+    const toggleAllReportFields = () => {
+        const availableReportFields = Object.values(filteredPolicyFieldList).filter((reportField) => reportField.pendingAction !== CONST.RED_BRICK_ROAD_PENDING_ACTION.DELETE);
+        const isAllSelected = availableReportFields.length === selectedReportFields.length;
+        setSelectedReportFields(isAllSelected ? [] : availableReportFields);
+    };
+
+    const navigateToReportFieldsSettings = (reportField: ReportFieldForList) => {
+        Navigation.navigate(ROUTES.WORKSPACE_REPORT_FIELDS_SETTINGS.getRoute(policyID, reportField.fieldID));
+    };
+
+    const handleDeleteReportFields = () => {
+        const reportFieldKeys = selectedReportFields.map((selectedReportField) => ReportUtils.getReportFieldKey(selectedReportField.fieldID));
+        setSelectedReportFields([]);
+        ReportField.deleteReportFields(policyID, reportFieldKeys);
+        setDeleteReportFieldsConfirmModalVisible(false);
+    };
+
+    const isLoading = !isOffline && policy === undefined;
+    const shouldShowEmptyState =
+        !Object.values(filteredPolicyFieldList).some((reportField) => reportField.pendingAction !== CONST.RED_BRICK_ROAD_PENDING_ACTION.DELETE || isOffline) && !isLoading;
+
+    const getHeaderButtons = () => {
+        const options: Array<DropdownOption<DeepValueOf<typeof CONST.POLICY.BULK_ACTION_TYPES>>> = [];
+
+        if (shouldUseNarrowLayout ? canSelectMultiple : selectedReportFields.length > 0) {
+            options.push({
+                icon: Expensicons.Trashcan,
+                text: translate(selectedReportFields.length === 1 ? 'workspace.reportFields.delete' : 'workspace.reportFields.deleteFields'),
+                value: CONST.POLICY.BULK_ACTION_TYPES.DELETE,
+                onSelected: () => setDeleteReportFieldsConfirmModalVisible(true),
+            });
+
+            return (
+                <ButtonWithDropdownMenu
+                    onPress={() => null}
+                    shouldAlwaysShowDropdownMenu
+                    pressOnEnter
+                    buttonSize={CONST.DROPDOWN_BUTTON_SIZE.MEDIUM}
+                    customText={translate('workspace.common.selected', {selectedNumber: selectedReportFields.length})}
+                    options={options}
+                    isSplitButton={false}
+                    style={[shouldUseNarrowLayout && styles.flexGrow1, shouldUseNarrowLayout && styles.mb3]}
+                    isDisabled={!selectedReportFields.length}
+                />
+            );
+        }
+        return (
+            <View style={[styles.w100, styles.flexRow, styles.gap2, shouldUseNarrowLayout && styles.mb3]}>
+                <Button
+                    medium
+                    success
+                    onPress={() => Navigation.navigate(ROUTES.WORKSPACE_CREATE_REPORT_FIELD.getRoute(policyID))}
+                    icon={Expensicons.Plus}
+                    text={translate('workspace.reportFields.addField')}
+                    style={[shouldUseNarrowLayout && styles.flex1]}
+                />
+            </View>
+        );
+    };
+
+    const getCustomListHeader = () => {
+        const header = (
+            <View
+                style={[
+                    styles.flex1,
+                    styles.flexRow,
+                    styles.justifyContentBetween,
+                    // Required padding accounting for the checkbox and the right arrow in multi-select mode
+                    canSelectMultiple && styles.pl3,
+                ]}
+            >
+                <Text style={styles.searchInputStyle}>{translate('common.name')}</Text>
+                <Text style={[styles.searchInputStyle, styles.textAlignCenter]}>{translate('common.type')}</Text>
+            </View>
+        );
+        if (canSelectMultiple) {
+            return header;
+        }
+        return <View style={[styles.flexRow, styles.ph9, styles.pv3, styles.pb5]}>{header}</View>;
+    };
+
+    const getHeaderText = () => (
+        <View style={[styles.ph5, styles.pb5, styles.pt3]}>
+            {isConnectedToAccounting ? (
+                <Text>
+                    <Text style={[styles.textNormal, styles.colorMuted]}>{`${translate('workspace.reportFields.importedFromAccountingSoftware')} `}</Text>
+                    <TextLink
+                        style={[styles.textNormal, styles.link]}
+                        href={`${environmentURL}/${ROUTES.POLICY_ACCOUNTING.getRoute(policyID)}`}
+                    >
+                        {`${currentConnectionName} ${translate('workspace.accounting.settings')}`}
+                    </TextLink>
+                    <Text style={[styles.textNormal, styles.colorMuted]}>.</Text>
+                </Text>
+            ) : (
+                <Text style={[styles.textNormal, styles.colorMuted]}>{translate('workspace.reportFields.subtitle')}</Text>
+            )}
+        </View>
+    );
+    const selectionModeHeader = selectionMode?.isEnabled && shouldUseNarrowLayout;
+
+    return (
+        <AccessOrNotFoundWrapper
+            policyID={policyID}
+            accessVariants={[CONST.POLICY.ACCESS_VARIANTS.ADMIN, CONST.POLICY.ACCESS_VARIANTS.PAID]}
+            featureName={CONST.POLICY.MORE_FEATURES.ARE_REPORT_FIELDS_ENABLED}
+        >
+            <ScreenWrapper
+                includeSafeAreaPaddingBottom={false}
+                style={[styles.defaultModalContainer]}
+                testID={WorkspaceReportFieldsPage.displayName}
+                shouldShowOfflineIndicatorInWideScreen
+                offlineIndicatorStyle={styles.mtAuto}
+            >
+                <HeaderWithBackButton
+                    icon={!selectionModeHeader ? Illustrations.Pencil : undefined}
+                    title={translate(selectionModeHeader ? 'common.selectMultiple' : 'workspace.common.reportFields')}
+                    shouldShowBackButton={shouldUseNarrowLayout}
+                    onBackButtonPress={() => {
+                        if (selectionModeHeader) {
+                            setSelectedReportFields([]);
+                            turnOffMobileSelectionMode();
+                            return;
+                        }
+                        Navigation.goBack();
+                    }}
+                >
+                    {!shouldUseNarrowLayout && !hasAccountingConnections && getHeaderButtons()}
+                </HeaderWithBackButton>
+                {shouldUseNarrowLayout && <View style={[styles.pl5, styles.pr5]}>{!hasAccountingConnections && getHeaderButtons()}</View>}
+                <ConfirmModal
+                    isVisible={deleteReportFieldsConfirmModalVisible}
+                    onConfirm={handleDeleteReportFields}
+                    onCancel={() => setDeleteReportFieldsConfirmModalVisible(false)}
+                    title={translate(selectedReportFields.length === 1 ? 'workspace.reportFields.delete' : 'workspace.reportFields.deleteFields')}
+                    prompt={translate(selectedReportFields.length === 1 ? 'workspace.reportFields.deleteConfirmation' : 'workspace.reportFields.deleteFieldsConfirmation')}
+                    confirmText={translate('common.delete')}
+                    cancelText={translate('common.cancel')}
+                    danger
+                />
+                {(!shouldUseNarrowLayout || !hasVisibleReportField || isLoading) && getHeaderText()}
+                {isLoading && (
+                    <ActivityIndicator
+                        size={CONST.ACTIVITY_INDICATOR_SIZE.LARGE}
+                        style={styles.flex1}
+                        color={theme.spinner}
+                    />
+                )}
+                {shouldShowEmptyState && (
+                    <EmptyStateComponent
+                        title={translate('workspace.reportFields.emptyReportFields.title')}
+                        subtitle={translate('workspace.reportFields.emptyReportFields.subtitle')}
+                        SkeletonComponent={TableListItemSkeleton}
+                        headerMediaType={CONST.EMPTY_STATE_MEDIA.ILLUSTRATION}
+                        headerMedia={Illustrations.EmptyStateExpenses}
+                        headerStyles={styles.emptyFolderBG}
+                        headerContentStyles={styles.emptyStateFolderIconSize}
+                    />
+                )}
+                {!shouldShowEmptyState && !isLoading && (
+                    <SelectionListWithModal
+                        canSelectMultiple={canSelectMultiple}
+                        turnOnSelectionModeOnLongPress={!hasAccountingConnections}
+                        onTurnOnSelectionMode={(item) => item && updateSelectedReportFields(item)}
+                        sections={reportFieldsSections}
+                        onCheckboxPress={updateSelectedReportFields}
+                        onSelectRow={navigateToReportFieldsSettings}
+                        onSelectAll={toggleAllReportFields}
+                        ListItem={TableListItem}
+                        customListHeader={getCustomListHeader()}
+                        listHeaderContent={shouldUseNarrowLayout ? getHeaderText() : null}
+                        shouldPreventDefaultFocusOnSelectRow={!DeviceCapabilities.canUseTouchScreen()}
+                        listHeaderWrapperStyle={[styles.ph9, styles.pv3, styles.pb5]}
+                        showScrollIndicator={false}
+                    />
+                )}
+            </ScreenWrapper>
+        </AccessOrNotFoundWrapper>
+    );
+}
+
+WorkspaceReportFieldsPage.displayName = 'WorkspaceReportFieldsPage';
+
+export default WorkspaceReportFieldsPage;
diff --git a/src/pages/workspace/rules/IndividualExpenseRulesSection.tsx b/src/pages/workspace/rules/IndividualExpenseRulesSection.tsx
new file mode 100644
index 000000000000..78dbcb3b16c8
--- /dev/null
+++ b/src/pages/workspace/rules/IndividualExpenseRulesSection.tsx
@@ -0,0 +1,202 @@
+import React, {useMemo} from 'react';
+import {View} from 'react-native';
+import type {LocaleContextProps} from '@components/LocaleContextProvider';
+import MenuItemWithTopDescription from '@components/MenuItemWithTopDescription';
+import OfflineWithFeedback from '@components/OfflineWithFeedback';
+import Section from '@components/Section';
+import Switch from '@components/Switch';
+import Text from '@components/Text';
+import TextLink from '@components/TextLink';
+import useLocalize from '@hooks/useLocalize';
+import usePolicy from '@hooks/usePolicy';
+import useThemeStyles from '@hooks/useThemeStyles';
+import * as CurrencyUtils from '@libs/CurrencyUtils';
+import Navigation from '@libs/Navigation/Navigation';
+import type {ThemeStyles} from '@styles/index';
+import * as Link from '@userActions/Link';
+import * as PolicyActions from '@userActions/Policy/Policy';
+import CONST from '@src/CONST';
+import type {TranslationPaths} from '@src/languages/types';
+import ROUTES from '@src/ROUTES';
+import type {Policy} from '@src/types/onyx';
+import type {PendingAction} from '@src/types/onyx/OnyxCommon';
+
+type IndividualExpenseRulesSectionProps = {
+    policyID: string;
+};
+
+type IndividualExpenseRulesSectionSubtitleProps = {
+    policy?: Policy;
+    translate: LocaleContextProps['translate'];
+    styles: ThemeStyles;
+};
+
+type IndividualExpenseRulesMenuItem = {
+    title: string;
+    descriptionTranslationKey: TranslationPaths;
+    action: () => void;
+    pendingAction?: PendingAction;
+};
+
+function IndividualExpenseRulesSectionSubtitle({policy, translate, styles}: IndividualExpenseRulesSectionSubtitleProps) {
+    const policyID = policy?.id ?? '-1';
+
+    const handleOnPressCategoriesLink = () => {
+        if (policy?.areCategoriesEnabled) {
+            Navigation.navigate(ROUTES.WORKSPACE_CATEGORIES.getRoute(policyID));
+            return;
+        }
+
+        Navigation.navigate(ROUTES.WORKSPACE_MORE_FEATURES.getRoute(policyID));
+    };
+
+    const handleOnPressTagsLink = () => {
+        if (policy?.areTagsEnabled) {
+            Navigation.navigate(ROUTES.WORKSPACE_TAGS.getRoute(policyID));
+            return;
+        }
+
+        Navigation.navigate(ROUTES.WORKSPACE_MORE_FEATURES.getRoute(policyID));
+    };
+
+    return (
+        <Text style={[styles.flexRow, styles.alignItemsCenter, styles.w100, styles.mt2]}>
+            <Text style={[styles.textNormal, styles.colorMuted]}>{translate('workspace.rules.individualExpenseRules.subtitle')}</Text>{' '}
+            <TextLink
+                style={styles.link}
+                onPress={handleOnPressCategoriesLink}
+            >
+                {translate('workspace.common.categories').toLowerCase()}
+            </TextLink>{' '}
+            <Text style={[styles.textNormal, styles.colorMuted]}>{translate('common.and')}</Text>{' '}
+            <TextLink
+                style={styles.link}
+                onPress={handleOnPressTagsLink}
+            >
+                {translate('workspace.common.tags').toLowerCase()}
+            </TextLink>
+            .
+        </Text>
+    );
+}
+
+function IndividualExpenseRulesSection({policyID}: IndividualExpenseRulesSectionProps) {
+    const {translate} = useLocalize();
+    const styles = useThemeStyles();
+    const policy = usePolicy(policyID);
+
+    const policyCurrency = policy?.outputCurrency ?? CONST.CURRENCY.USD;
+
+    const maxExpenseAmountNoReceiptText = useMemo(() => {
+        if (policy?.maxExpenseAmountNoReceipt === CONST.DISABLED_MAX_EXPENSE_VALUE || !policy?.maxExpenseAmountNoReceipt) {
+            return '';
+        }
+
+        return CurrencyUtils.convertToDisplayString(policy?.maxExpenseAmountNoReceipt, policyCurrency);
+    }, [policy?.maxExpenseAmountNoReceipt, policyCurrency]);
+
+    const maxExpenseAmountText = useMemo(() => {
+        if (policy?.maxExpenseAmount === CONST.DISABLED_MAX_EXPENSE_VALUE || !policy?.maxExpenseAmount) {
+            return '';
+        }
+
+        return CurrencyUtils.convertToDisplayString(policy?.maxExpenseAmount, policyCurrency);
+    }, [policy?.maxExpenseAmount, policyCurrency]);
+
+    const maxExpenseAgeText = useMemo(() => {
+        if (policy?.maxExpenseAge === CONST.DISABLED_MAX_EXPENSE_VALUE || !policy?.maxExpenseAge) {
+            return '';
+        }
+
+        return translate('workspace.rules.individualExpenseRules.maxExpenseAgeDays', policy?.maxExpenseAge);
+    }, [policy?.maxExpenseAge, translate]);
+
+    const billableModeText = translate(`workspace.rules.individualExpenseRules.${policy?.defaultBillable ? 'billable' : 'nonBillable'}`);
+
+    const individualExpenseRulesItems: IndividualExpenseRulesMenuItem[] = [
+        {
+            title: maxExpenseAmountNoReceiptText,
+            descriptionTranslationKey: 'workspace.rules.individualExpenseRules.receiptRequiredAmount',
+            action: () => Navigation.navigate(ROUTES.RULES_RECEIPT_REQUIRED_AMOUNT.getRoute(policyID)),
+            pendingAction: policy?.pendingFields?.maxExpenseAmountNoReceipt,
+        },
+        {
+            title: maxExpenseAmountText,
+            descriptionTranslationKey: 'workspace.rules.individualExpenseRules.maxExpenseAmount',
+            action: () => Navigation.navigate(ROUTES.RULES_MAX_EXPENSE_AMOUNT.getRoute(policyID)),
+            pendingAction: policy?.pendingFields?.maxExpenseAmount,
+        },
+        {
+            title: maxExpenseAgeText,
+            descriptionTranslationKey: 'workspace.rules.individualExpenseRules.maxExpenseAge',
+            action: () => Navigation.navigate(ROUTES.RULES_MAX_EXPENSE_AGE.getRoute(policyID)),
+            pendingAction: policy?.pendingFields?.maxExpenseAge,
+        },
+        {
+            title: billableModeText,
+            descriptionTranslationKey: 'workspace.rules.individualExpenseRules.billableDefault',
+            action: () => Navigation.navigate(ROUTES.RULES_BILLABLE_DEFAULT.getRoute(policyID)),
+            pendingAction: policy?.pendingFields?.defaultBillable,
+        },
+    ];
+
+    const areEReceiptsEnabled = policy?.eReceipts ?? false;
+
+    return (
+        <Section
+            isCentralPane
+            title={translate('workspace.rules.individualExpenseRules.title')}
+            renderSubtitle={() => (
+                <IndividualExpenseRulesSectionSubtitle
+                    policy={policy}
+                    translate={translate}
+                    styles={styles}
+                />
+            )}
+            subtitle={translate('workspace.rules.individualExpenseRules.subtitle')}
+            titleStyles={styles.accountSettingsSectionTitle}
+        >
+            <View style={[styles.mt3, styles.gap3]}>
+                {individualExpenseRulesItems.map((item) => (
+                    <OfflineWithFeedback pendingAction={item.pendingAction}>
+                        <MenuItemWithTopDescription
+                            key={translate(item.descriptionTranslationKey)}
+                            shouldShowRightIcon
+                            title={item.title}
+                            description={translate(item.descriptionTranslationKey)}
+                            onPress={item.action}
+                            wrapperStyle={[styles.sectionMenuItemTopDescription]}
+                            numberOfLinesTitle={2}
+                        />
+                    </OfflineWithFeedback>
+                ))}
+
+                <View style={[styles.mt3]}>
+                    <OfflineWithFeedback pendingAction={policy?.pendingFields?.eReceipts}>
+                        <View style={[styles.flexRow, styles.mb1, styles.mr2, styles.alignItemsCenter, styles.justifyContentBetween]}>
+                            <Text style={[styles.flexShrink1, styles.mr2]}>{translate('workspace.rules.individualExpenseRules.eReceipts')}</Text>
+                            <Switch
+                                isOn={areEReceiptsEnabled}
+                                accessibilityLabel={translate('workspace.rules.individualExpenseRules.eReceipts')}
+                                onToggle={() => PolicyActions.setWorkspaceEReceiptsEnabled(policyID, !areEReceiptsEnabled)}
+                                disabled={policyCurrency !== CONST.CURRENCY.USD}
+                            />
+                        </View>
+                    </OfflineWithFeedback>
+                    <Text style={[styles.flexRow, styles.alignItemsCenter, styles.w100]}>
+                        <Text style={[styles.textLabel, styles.colorMuted]}>{translate('workspace.rules.individualExpenseRules.eReceiptsHint')}</Text>{' '}
+                        <TextLink
+                            style={[styles.textLabel, styles.link]}
+                            onPress={() => Link.openExternalLink(CONST.DEEP_DIVE_ERECEIPTS)}
+                        >
+                            {translate('workspace.rules.individualExpenseRules.eReceiptsHintLink')}
+                        </TextLink>
+                        .
+                    </Text>
+                </View>
+            </View>
+        </Section>
+    );
+}
+
+export default IndividualExpenseRulesSection;
diff --git a/src/pages/workspace/rules/PolicyRulesPage.tsx b/src/pages/workspace/rules/PolicyRulesPage.tsx
new file mode 100644
index 000000000000..bd9e911e2a5e
--- /dev/null
+++ b/src/pages/workspace/rules/PolicyRulesPage.tsx
@@ -0,0 +1,59 @@
+import type {StackScreenProps} from '@react-navigation/stack';
+import React from 'react';
+import {View} from 'react-native';
+import Section from '@components/Section';
+import useLocalize from '@hooks/useLocalize';
+import usePermissions from '@hooks/usePermissions';
+import useResponsiveLayout from '@hooks/useResponsiveLayout';
+import useThemeStyles from '@hooks/useThemeStyles';
+import type {FullScreenNavigatorParamList} from '@libs/Navigation/types';
+import AccessOrNotFoundWrapper from '@pages/workspace/AccessOrNotFoundWrapper';
+import WorkspacePageWithSections from '@pages/workspace/WorkspacePageWithSections';
+import * as Illustrations from '@src/components/Icon/Illustrations';
+import CONST from '@src/CONST';
+import type SCREENS from '@src/SCREENS';
+import IndividualExpenseRulesSection from './IndividualExpenseRulesSection';
+
+type PolicyRulesPageProps = StackScreenProps<FullScreenNavigatorParamList, typeof SCREENS.WORKSPACE.RULES>;
+
+function PolicyRulesPage({route}: PolicyRulesPageProps) {
+    const {translate} = useLocalize();
+    const {policyID} = route.params;
+    const styles = useThemeStyles();
+    const {shouldUseNarrowLayout} = useResponsiveLayout();
+    const {canUseWorkspaceRules} = usePermissions();
+
+    return (
+        <AccessOrNotFoundWrapper
+            policyID={policyID}
+            featureName={CONST.POLICY.MORE_FEATURES.ARE_RULES_ENABLED}
+            accessVariants={[CONST.POLICY.ACCESS_VARIANTS.ADMIN, CONST.POLICY.ACCESS_VARIANTS.PAID]}
+        >
+            <WorkspacePageWithSections
+                testID={PolicyRulesPage.displayName}
+                shouldUseScrollView
+                headerText={translate('workspace.common.rules')}
+                guidesCallTaskID={CONST.GUIDES_CALL_TASK_IDS.WORKSPACE_RULES}
+                shouldShowOfflineIndicatorInWideScreen
+                route={route}
+                icon={Illustrations.Rules}
+                shouldShowNotFoundPage={!canUseWorkspaceRules}
+            >
+                <View style={[styles.mt3, shouldUseNarrowLayout ? styles.workspaceSectionMobile : styles.workspaceSection]}>
+                    <IndividualExpenseRulesSection policyID={policyID} />
+                    <Section
+                        isCentralPane
+                        title={translate('workspace.rules.expenseReportRules.title')}
+                        subtitle={translate('workspace.rules.expenseReportRules.subtitle')}
+                        titleStyles={styles.accountSettingsSectionTitle}
+                        subtitleMuted
+                    />
+                </View>
+            </WorkspacePageWithSections>
+        </AccessOrNotFoundWrapper>
+    );
+}
+
+PolicyRulesPage.displayName = 'PolicyRulesPage';
+
+export default PolicyRulesPage;
diff --git a/src/pages/workspace/rules/RulesBillableDefaultPage.tsx b/src/pages/workspace/rules/RulesBillableDefaultPage.tsx
new file mode 100644
index 000000000000..900007f9a573
--- /dev/null
+++ b/src/pages/workspace/rules/RulesBillableDefaultPage.tsx
@@ -0,0 +1,103 @@
+import type {StackScreenProps} from '@react-navigation/stack';
+import React from 'react';
+import HeaderWithBackButton from '@components/HeaderWithBackButton';
+import ScreenWrapper from '@components/ScreenWrapper';
+import SelectionList from '@components/SelectionList';
+import RadioListItem from '@components/SelectionList/RadioListItem';
+import Text from '@components/Text';
+import TextLink from '@components/TextLink';
+import useLocalize from '@hooks/useLocalize';
+import usePolicy from '@hooks/usePolicy';
+import useThemeStyles from '@hooks/useThemeStyles';
+import Navigation from '@libs/Navigation/Navigation';
+import type {SettingsNavigatorParamList} from '@libs/Navigation/types';
+import AccessOrNotFoundWrapper from '@pages/workspace/AccessOrNotFoundWrapper';
+import * as Policy from '@userActions/Policy/Policy';
+import CONST from '@src/CONST';
+import ROUTES from '@src/ROUTES';
+import type SCREENS from '@src/SCREENS';
+
+type RulesBillableDefaultPageProps = StackScreenProps<SettingsNavigatorParamList, typeof SCREENS.WORKSPACE.RULES_BILLABLE_DEFAULT>;
+
+function RulesBillableDefaultPage({
+    route: {
+        params: {policyID},
+    },
+}: RulesBillableDefaultPageProps) {
+    const policy = usePolicy(policyID);
+
+    const {translate} = useLocalize();
+    const styles = useThemeStyles();
+
+    const billableModes = [
+        {
+            value: true,
+            text: translate(`workspace.rules.individualExpenseRules.billable`),
+            alternateText: translate(`workspace.rules.individualExpenseRules.billableDescription`),
+            keyForList: CONST.POLICY_BILLABLE_MODES.BILLABLE,
+            isSelected: policy?.defaultBillable,
+        },
+        {
+            value: false,
+            text: translate(`workspace.rules.individualExpenseRules.nonBillable`),
+            alternateText: translate(`workspace.rules.individualExpenseRules.nonBillableDescription`),
+            keyForList: CONST.POLICY_BILLABLE_MODES.NON_BILLABLE,
+            isSelected: !policy?.defaultBillable,
+        },
+    ];
+
+    const initiallyFocusedOptionKey = policy?.defaultBillable ? CONST.POLICY_BILLABLE_MODES.BILLABLE : CONST.POLICY_BILLABLE_MODES.NON_BILLABLE;
+
+    const handleOnPressTagsLink = () => {
+        if (policy?.areTagsEnabled) {
+            Navigation.navigate(ROUTES.WORKSPACE_TAGS.getRoute(policyID));
+            return;
+        }
+
+        Navigation.navigate(ROUTES.WORKSPACE_MORE_FEATURES.getRoute(policyID));
+    };
+
+    return (
+        <AccessOrNotFoundWrapper
+            policyID={policyID}
+            accessVariants={[CONST.POLICY.ACCESS_VARIANTS.ADMIN, CONST.POLICY.ACCESS_VARIANTS.PAID]}
+            featureName={CONST.POLICY.MORE_FEATURES.ARE_RULES_ENABLED}
+        >
+            <ScreenWrapper
+                includeSafeAreaPaddingBottom={false}
+                shouldEnableMaxHeight
+                testID={RulesBillableDefaultPage.displayName}
+            >
+                <HeaderWithBackButton
+                    title={translate('workspace.rules.individualExpenseRules.billableDefault')}
+                    onBackButtonPress={() => Navigation.goBack()}
+                />
+                <Text style={[styles.flexRow, styles.alignItemsCenter, styles.mt3, styles.mh5, styles.mb5]}>
+                    <Text style={[styles.textNormal, styles.colorMuted]}>{translate('workspace.rules.individualExpenseRules.billableDefaultDescription')}</Text>{' '}
+                    <TextLink
+                        style={styles.link}
+                        onPress={handleOnPressTagsLink}
+                    >
+                        {translate('workspace.common.tags').toLowerCase()}
+                    </TextLink>
+                    .
+                </Text>
+                <SelectionList
+                    sections={[{data: billableModes}]}
+                    ListItem={RadioListItem}
+                    onSelectRow={(item) => {
+                        Policy.setPolicyBillableMode(policyID, item.value);
+                        Navigation.setNavigationActionToMicrotaskQueue(Navigation.goBack);
+                    }}
+                    shouldSingleExecuteRowSelect
+                    containerStyle={[styles.pt3]}
+                    initiallyFocusedOptionKey={initiallyFocusedOptionKey}
+                />
+            </ScreenWrapper>
+        </AccessOrNotFoundWrapper>
+    );
+}
+
+RulesBillableDefaultPage.displayName = 'RulesBillableDefaultPage';
+
+export default RulesBillableDefaultPage;
diff --git a/src/pages/workspace/rules/RulesMaxExpenseAgePage.tsx b/src/pages/workspace/rules/RulesMaxExpenseAgePage.tsx
new file mode 100644
index 000000000000..514360473568
--- /dev/null
+++ b/src/pages/workspace/rules/RulesMaxExpenseAgePage.tsx
@@ -0,0 +1,95 @@
+import type {StackScreenProps} from '@react-navigation/stack';
+import React, {useCallback, useState} from 'react';
+import {View} from 'react-native';
+import FormProvider from '@components/Form/FormProvider';
+import InputWrapper from '@components/Form/InputWrapper';
+import HeaderWithBackButton from '@components/HeaderWithBackButton';
+import ScreenWrapper from '@components/ScreenWrapper';
+import Text from '@components/Text';
+import TextInput from '@components/TextInput';
+import useAutoFocusInput from '@hooks/useAutoFocusInput';
+import useLocalize from '@hooks/useLocalize';
+import usePolicy from '@hooks/usePolicy';
+import useThemeStyles from '@hooks/useThemeStyles';
+import Navigation from '@libs/Navigation/Navigation';
+import type {SettingsNavigatorParamList} from '@libs/Navigation/types';
+import AccessOrNotFoundWrapper from '@pages/workspace/AccessOrNotFoundWrapper';
+import * as PolicyActions from '@userActions/Policy/Policy';
+import CONST from '@src/CONST';
+import ONYXKEYS from '@src/ONYXKEYS';
+import type SCREENS from '@src/SCREENS';
+import INPUT_IDS from '@src/types/form/RulesMaxExpenseAgeForm';
+
+type RulesMaxExpenseAgePageProps = StackScreenProps<SettingsNavigatorParamList, typeof SCREENS.WORKSPACE.RULES_MAX_EXPENSE_AGE>;
+
+function RulesMaxExpenseAgePage({
+    route: {
+        params: {policyID},
+    },
+}: RulesMaxExpenseAgePageProps) {
+    const policy = usePolicy(policyID);
+
+    const {inputCallbackRef} = useAutoFocusInput();
+    const {translate} = useLocalize();
+    const styles = useThemeStyles();
+
+    const maxExpenseAgeDefaultValue = policy?.maxExpenseAge === CONST.DISABLED_MAX_EXPENSE_VALUE || !policy?.maxExpenseAge ? '' : `${policy?.maxExpenseAge}`;
+
+    const [maxExpenseAgeValue, setMaxExpenseAgeValue] = useState(maxExpenseAgeDefaultValue);
+
+    const onChangeMaxExpenseAge = useCallback((newValue: string) => {
+        // replace all characters that are not spaces or digits
+        const validMaxExpenseAge = newValue.replace(/[^0-9]/g, '');
+        setMaxExpenseAgeValue(validMaxExpenseAge);
+    }, []);
+
+    return (
+        <AccessOrNotFoundWrapper
+            policyID={policyID}
+            accessVariants={[CONST.POLICY.ACCESS_VARIANTS.ADMIN, CONST.POLICY.ACCESS_VARIANTS.PAID]}
+            featureName={CONST.POLICY.MORE_FEATURES.ARE_RULES_ENABLED}
+        >
+            <ScreenWrapper
+                includeSafeAreaPaddingBottom={false}
+                shouldEnableMaxHeight
+                testID={RulesMaxExpenseAgePage.displayName}
+            >
+                <HeaderWithBackButton
+                    title={translate('workspace.rules.individualExpenseRules.maxExpenseAge')}
+                    onBackButtonPress={() => Navigation.goBack()}
+                />
+                <FormProvider
+                    style={[styles.flexGrow1, styles.pt3, styles.ph5]}
+                    formID={ONYXKEYS.FORMS.RULES_MAX_EXPENSE_AGE_FORM}
+                    onSubmit={({maxExpenseAge}) => {
+                        PolicyActions.setPolicyMaxExpenseAge(policyID, maxExpenseAge);
+                        Navigation.setNavigationActionToMicrotaskQueue(Navigation.goBack);
+                    }}
+                    submitButtonText={translate('workspace.editor.save')}
+                    enabledWhenOffline
+                >
+                    <View style={styles.mb4}>
+                        <InputWrapper
+                            InputComponent={TextInput}
+                            inputID={INPUT_IDS.MAX_EXPENSE_AGE}
+                            label={translate('workspace.rules.individualExpenseRules.maxAge')}
+                            suffixCharacter={translate('common.days')}
+                            suffixStyle={styles.colorMuted}
+                            role={CONST.ROLE.PRESENTATION}
+                            inputMode={CONST.INPUT_MODE.NUMERIC}
+                            value={maxExpenseAgeValue}
+                            onChangeText={onChangeMaxExpenseAge}
+                            ref={inputCallbackRef}
+                            maxLength={CONST.FORM_CHARACTER_LIMIT}
+                        />
+                        <Text style={[styles.mutedTextLabel, styles.mt2]}>{translate('workspace.rules.individualExpenseRules.maxExpenseAgeDescription')}</Text>
+                    </View>
+                </FormProvider>
+            </ScreenWrapper>
+        </AccessOrNotFoundWrapper>
+    );
+}
+
+RulesMaxExpenseAgePage.displayName = 'RulesMaxExpenseAgePage';
+
+export default RulesMaxExpenseAgePage;
diff --git a/src/pages/workspace/rules/RulesMaxExpenseAmountPage.tsx b/src/pages/workspace/rules/RulesMaxExpenseAmountPage.tsx
new file mode 100644
index 000000000000..dba43789bd34
--- /dev/null
+++ b/src/pages/workspace/rules/RulesMaxExpenseAmountPage.tsx
@@ -0,0 +1,88 @@
+import type {StackScreenProps} from '@react-navigation/stack';
+import React from 'react';
+import {View} from 'react-native';
+import AmountForm from '@components/AmountForm';
+import FormProvider from '@components/Form/FormProvider';
+import InputWrapper from '@components/Form/InputWrapper';
+import HeaderWithBackButton from '@components/HeaderWithBackButton';
+import ScreenWrapper from '@components/ScreenWrapper';
+import Text from '@components/Text';
+import useAutoFocusInput from '@hooks/useAutoFocusInput';
+import useLocalize from '@hooks/useLocalize';
+import usePolicy from '@hooks/usePolicy';
+import useThemeStyles from '@hooks/useThemeStyles';
+import * as CurrencyUtils from '@libs/CurrencyUtils';
+import Navigation from '@libs/Navigation/Navigation';
+import type {SettingsNavigatorParamList} from '@libs/Navigation/types';
+import AccessOrNotFoundWrapper from '@pages/workspace/AccessOrNotFoundWrapper';
+import * as PolicyActions from '@userActions/Policy/Policy';
+import CONST from '@src/CONST';
+import ONYXKEYS from '@src/ONYXKEYS';
+import type SCREENS from '@src/SCREENS';
+import INPUT_IDS from '@src/types/form/RulesMaxExpenseAmountForm';
+
+type RulesMaxExpenseAmountPageProps = StackScreenProps<SettingsNavigatorParamList, typeof SCREENS.WORKSPACE.RULES_MAX_EXPENSE_AMOUNT>;
+
+function RulesMaxExpenseAmountPage({
+    route: {
+        params: {policyID},
+    },
+}: RulesMaxExpenseAmountPageProps) {
+    const policy = usePolicy(policyID);
+
+    const {inputCallbackRef} = useAutoFocusInput();
+    const {translate} = useLocalize();
+    const styles = useThemeStyles();
+
+    const defaultValue =
+        policy?.maxExpenseAmount === CONST.DISABLED_MAX_EXPENSE_VALUE || !policy?.maxExpenseAmount
+            ? ''
+            : CurrencyUtils.convertToFrontendAmountAsString(policy?.maxExpenseAmount, policy?.outputCurrency);
+
+    return (
+        <AccessOrNotFoundWrapper
+            policyID={policyID}
+            accessVariants={[CONST.POLICY.ACCESS_VARIANTS.ADMIN, CONST.POLICY.ACCESS_VARIANTS.PAID]}
+            featureName={CONST.POLICY.MORE_FEATURES.ARE_RULES_ENABLED}
+        >
+            <ScreenWrapper
+                includeSafeAreaPaddingBottom={false}
+                shouldEnableMaxHeight
+                testID={RulesMaxExpenseAmountPage.displayName}
+            >
+                <HeaderWithBackButton
+                    title={translate('workspace.rules.individualExpenseRules.maxExpenseAmount')}
+                    onBackButtonPress={() => Navigation.goBack()}
+                />
+                <FormProvider
+                    style={[styles.flexGrow1, styles.pt3, styles.ph5]}
+                    formID={ONYXKEYS.FORMS.RULES_MAX_EXPENSE_AMOUNT_FORM}
+                    onSubmit={({maxExpenseAmount}) => {
+                        PolicyActions.setPolicyMaxExpenseAmount(policyID, maxExpenseAmount);
+                        Navigation.setNavigationActionToMicrotaskQueue(Navigation.goBack);
+                    }}
+                    submitButtonText={translate('workspace.editor.save')}
+                    enabledWhenOffline
+                >
+                    <View style={styles.mb4}>
+                        <InputWrapper
+                            label={translate('iou.amount')}
+                            InputComponent={AmountForm}
+                            inputID={INPUT_IDS.MAX_EXPENSE_AMOUNT}
+                            currency={CurrencyUtils.getCurrencySymbol(policy?.outputCurrency ?? CONST.CURRENCY.USD)}
+                            defaultValue={defaultValue}
+                            isCurrencyPressable={false}
+                            ref={inputCallbackRef}
+                            displayAsTextInput
+                        />
+                        <Text style={[styles.mutedTextLabel, styles.mt2]}>{translate('workspace.rules.individualExpenseRules.maxExpenseAmountDescription')}</Text>
+                    </View>
+                </FormProvider>
+            </ScreenWrapper>
+        </AccessOrNotFoundWrapper>
+    );
+}
+
+RulesMaxExpenseAmountPage.displayName = 'RulesMaxExpenseAmountPage';
+
+export default RulesMaxExpenseAmountPage;
diff --git a/src/pages/workspace/rules/RulesReceiptRequiredAmountPage.tsx b/src/pages/workspace/rules/RulesReceiptRequiredAmountPage.tsx
new file mode 100644
index 000000000000..9e7098d45502
--- /dev/null
+++ b/src/pages/workspace/rules/RulesReceiptRequiredAmountPage.tsx
@@ -0,0 +1,88 @@
+import type {StackScreenProps} from '@react-navigation/stack';
+import React from 'react';
+import {View} from 'react-native';
+import AmountForm from '@components/AmountForm';
+import FormProvider from '@components/Form/FormProvider';
+import InputWrapper from '@components/Form/InputWrapper';
+import HeaderWithBackButton from '@components/HeaderWithBackButton';
+import ScreenWrapper from '@components/ScreenWrapper';
+import Text from '@components/Text';
+import useAutoFocusInput from '@hooks/useAutoFocusInput';
+import useLocalize from '@hooks/useLocalize';
+import usePolicy from '@hooks/usePolicy';
+import useThemeStyles from '@hooks/useThemeStyles';
+import * as CurrencyUtils from '@libs/CurrencyUtils';
+import Navigation from '@libs/Navigation/Navigation';
+import type {SettingsNavigatorParamList} from '@libs/Navigation/types';
+import AccessOrNotFoundWrapper from '@pages/workspace/AccessOrNotFoundWrapper';
+import * as PolicyActions from '@userActions/Policy/Policy';
+import CONST from '@src/CONST';
+import ONYXKEYS from '@src/ONYXKEYS';
+import type SCREENS from '@src/SCREENS';
+import INPUT_IDS from '@src/types/form/RulesRequiredReceiptAmountForm';
+
+type RulesReceiptRequiredAmountPageProps = StackScreenProps<SettingsNavigatorParamList, typeof SCREENS.WORKSPACE.RULES_RECEIPT_REQUIRED_AMOUNT>;
+
+function RulesReceiptRequiredAmountPage({
+    route: {
+        params: {policyID},
+    },
+}: RulesReceiptRequiredAmountPageProps) {
+    const policy = usePolicy(policyID);
+
+    const {inputCallbackRef} = useAutoFocusInput();
+    const {translate} = useLocalize();
+    const styles = useThemeStyles();
+
+    const defaultValue =
+        policy?.maxExpenseAmountNoReceipt === CONST.DISABLED_MAX_EXPENSE_VALUE || !policy?.maxExpenseAmountNoReceipt
+            ? ''
+            : CurrencyUtils.convertToFrontendAmountAsString(policy?.maxExpenseAmountNoReceipt, policy?.outputCurrency);
+
+    return (
+        <AccessOrNotFoundWrapper
+            policyID={policyID}
+            accessVariants={[CONST.POLICY.ACCESS_VARIANTS.ADMIN, CONST.POLICY.ACCESS_VARIANTS.PAID]}
+            featureName={CONST.POLICY.MORE_FEATURES.ARE_RULES_ENABLED}
+        >
+            <ScreenWrapper
+                includeSafeAreaPaddingBottom={false}
+                shouldEnableMaxHeight
+                testID={RulesReceiptRequiredAmountPage.displayName}
+            >
+                <HeaderWithBackButton
+                    title={translate('workspace.rules.individualExpenseRules.receiptRequiredAmount')}
+                    onBackButtonPress={() => Navigation.goBack()}
+                />
+                <FormProvider
+                    style={[styles.flexGrow1, styles.pt3, styles.ph5]}
+                    formID={ONYXKEYS.FORMS.RULES_REQUIRED_RECEIPT_AMOUNT_FORM}
+                    onSubmit={({maxExpenseAmountNoReceipt}) => {
+                        PolicyActions.setPolicyMaxExpenseAmountNoReceipt(policyID, maxExpenseAmountNoReceipt);
+                        Navigation.setNavigationActionToMicrotaskQueue(Navigation.goBack);
+                    }}
+                    submitButtonText={translate('workspace.editor.save')}
+                    enabledWhenOffline
+                >
+                    <View style={styles.mb4}>
+                        <InputWrapper
+                            label={translate('iou.amount')}
+                            InputComponent={AmountForm}
+                            inputID={INPUT_IDS.MAX_EXPENSE_AMOUNT_NO_RECEIPT}
+                            currency={CurrencyUtils.getCurrencySymbol(policy?.outputCurrency ?? CONST.CURRENCY.USD)}
+                            defaultValue={defaultValue}
+                            isCurrencyPressable={false}
+                            ref={inputCallbackRef}
+                            displayAsTextInput
+                        />
+                        <Text style={[styles.mutedTextLabel, styles.mt2]}>{translate('workspace.rules.individualExpenseRules.receiptRequiredAmountDescription')}</Text>
+                    </View>
+                </FormProvider>
+            </ScreenWrapper>
+        </AccessOrNotFoundWrapper>
+    );
+}
+
+RulesReceiptRequiredAmountPage.displayName = 'RulesReceiptRequiredAmountPage';
+
+export default RulesReceiptRequiredAmountPage;
diff --git a/src/pages/workspace/tags/EditTagPage.tsx b/src/pages/workspace/tags/EditTagPage.tsx
index 98b681955169..c8cef174dbdb 100644
--- a/src/pages/workspace/tags/EditTagPage.tsx
+++ b/src/pages/workspace/tags/EditTagPage.tsx
@@ -17,16 +17,16 @@ import * as PolicyUtils from '@libs/PolicyUtils';
 import * as ValidationUtils from '@libs/ValidationUtils';
 import type {SettingsNavigatorParamList} from '@navigation/types';
 import AccessOrNotFoundWrapper from '@pages/workspace/AccessOrNotFoundWrapper';
-import * as Policy from '@userActions/Policy';
+import * as Tag from '@userActions/Policy/Tag';
 import CONST from '@src/CONST';
 import ONYXKEYS from '@src/ONYXKEYS';
 import type SCREENS from '@src/SCREENS';
 import INPUT_IDS from '@src/types/form/WorkspaceTagForm';
-import type {PolicyTagList} from '@src/types/onyx';
+import type {PolicyTagLists} from '@src/types/onyx';
 
 type EditTagPageOnyxProps = {
     /** All policy tags */
-    policyTags: OnyxEntry<PolicyTagList>;
+    policyTags: OnyxEntry<PolicyTagLists>;
 };
 
 type EditTagPageProps = EditTagPageOnyxProps & StackScreenProps<SettingsNavigatorParamList, typeof SCREENS.WORKSPACE.TAG_EDIT>;
@@ -41,16 +41,19 @@ function EditTagPage({route, policyTags}: EditTagPageProps) {
         (values: FormOnyxValues<typeof ONYXKEYS.FORMS.WORKSPACE_TAG_FORM>) => {
             const errors: FormInputErrors<typeof ONYXKEYS.FORMS.WORKSPACE_TAG_FORM> = {};
             const tagName = values.tagName.trim();
-            const {tags} = PolicyUtils.getTagList(policyTags, 0);
+            const escapedTagName = PolicyUtils.escapeTagName(values.tagName.trim());
+            const {tags} = PolicyUtils.getTagList(policyTags, route.params.orderWeight);
             if (!ValidationUtils.isRequiredFulfilled(tagName)) {
-                errors.tagName = 'workspace.tags.tagRequiredError';
-            } else if (tags?.[tagName] && currentTagName !== tagName) {
-                errors.tagName = 'workspace.tags.existingTagError';
+                errors.tagName = translate('workspace.tags.tagRequiredError');
+            } else if (escapedTagName === '0') {
+                errors.tagName = translate('workspace.tags.invalidTagNameError');
+            } else if (tags?.[escapedTagName] && currentTagName !== tagName) {
+                errors.tagName = translate('workspace.tags.existingTagError');
             }
 
             return errors;
         },
-        [currentTagName, policyTags],
+        [policyTags, route.params.orderWeight, currentTagName, translate],
     );
 
     const editTag = useCallback(
@@ -58,12 +61,12 @@ function EditTagPage({route, policyTags}: EditTagPageProps) {
             const tagName = values.tagName.trim();
             // Do not call the API if the edited tag name is the same as the current tag name
             if (currentTagName !== tagName) {
-                Policy.renamePolicyTag(route.params.policyID, {oldName: currentTagName, newName: values.tagName.trim()});
+                Tag.renamePolicyTag(route.params.policyID, {oldName: route.params.tagName, newName: values.tagName.trim()}, route.params.orderWeight);
             }
             Keyboard.dismiss();
-            Navigation.dismissModal();
+            Navigation.goBack();
         },
-        [route.params.policyID, currentTagName],
+        [currentTagName, route.params.policyID, route.params.tagName, route.params.orderWeight],
     );
 
     return (
diff --git a/src/pages/workspace/tags/TagGLCodePage.tsx b/src/pages/workspace/tags/TagGLCodePage.tsx
new file mode 100644
index 000000000000..54e5c034ca07
--- /dev/null
+++ b/src/pages/workspace/tags/TagGLCodePage.tsx
@@ -0,0 +1,99 @@
+import type {StackScreenProps} from '@react-navigation/stack';
+import React, {useCallback} from 'react';
+import {withOnyx} from 'react-native-onyx';
+import type {OnyxEntry} from 'react-native-onyx';
+import FormProvider from '@components/Form/FormProvider';
+import InputWrapper from '@components/Form/InputWrapper';
+import type {FormOnyxValues} from '@components/Form/types';
+import HeaderWithBackButton from '@components/HeaderWithBackButton';
+import ScreenWrapper from '@components/ScreenWrapper';
+import TextInput from '@components/TextInput';
+import useAutoFocusInput from '@hooks/useAutoFocusInput';
+import useLocalize from '@hooks/useLocalize';
+import useThemeStyles from '@hooks/useThemeStyles';
+import Navigation from '@libs/Navigation/Navigation';
+import * as PolicyUtils from '@libs/PolicyUtils';
+import type {SettingsNavigatorParamList} from '@navigation/types';
+import AccessOrNotFoundWrapper from '@pages/workspace/AccessOrNotFoundWrapper';
+import * as Tag from '@userActions/Policy/Tag';
+import CONST from '@src/CONST';
+import ONYXKEYS from '@src/ONYXKEYS';
+import ROUTES from '@src/ROUTES';
+import type SCREENS from '@src/SCREENS';
+import INPUT_IDS from '@src/types/form/WorkspaceTagForm';
+import type {PolicyTagLists} from '@src/types/onyx';
+
+type WorkspaceEditTagGLCodePageOnyxProps = {
+    /** Collection of categories attached to a policy */
+    policyTags: OnyxEntry<PolicyTagLists>;
+};
+
+type EditTagGLCodePageProps = WorkspaceEditTagGLCodePageOnyxProps & StackScreenProps<SettingsNavigatorParamList, typeof SCREENS.WORKSPACE.TAG_GL_CODE>;
+
+function TagGLCodePage({route, policyTags}: EditTagGLCodePageProps) {
+    const styles = useThemeStyles();
+    const {translate} = useLocalize();
+    const {inputCallbackRef} = useAutoFocusInput();
+
+    const tagName = route.params.tagName;
+    const orderWeight = route.params.orderWeight;
+    const {tags} = PolicyUtils.getTagList(policyTags, orderWeight);
+    const glCode = tags?.[route.params.tagName]?.['GL Code'];
+
+    const editGLCode = useCallback(
+        (values: FormOnyxValues<typeof ONYXKEYS.FORMS.WORKSPACE_TAG_FORM>) => {
+            const newGLCode = values.glCode.trim();
+            if (newGLCode !== glCode) {
+                Tag.setPolicyTagGLCode(route.params.policyID, tagName, orderWeight, newGLCode);
+            }
+            Navigation.goBack(ROUTES.WORKSPACE_TAG_SETTINGS.getRoute(route.params.policyID, orderWeight, tagName));
+        },
+        [glCode, route.params.policyID, tagName, orderWeight],
+    );
+
+    return (
+        <AccessOrNotFoundWrapper
+            accessVariants={[CONST.POLICY.ACCESS_VARIANTS.ADMIN, CONST.POLICY.ACCESS_VARIANTS.CONTROL]}
+            policyID={route.params.policyID}
+            featureName={CONST.POLICY.MORE_FEATURES.ARE_CATEGORIES_ENABLED}
+        >
+            <ScreenWrapper
+                includeSafeAreaPaddingBottom={false}
+                style={[styles.defaultModalContainer]}
+                testID={TagGLCodePage.displayName}
+                shouldEnableMaxHeight
+            >
+                <HeaderWithBackButton
+                    title={translate('workspace.tags.glCode')}
+                    onBackButtonPress={() => Navigation.goBack()}
+                />
+                <FormProvider
+                    formID={ONYXKEYS.FORMS.WORKSPACE_TAG_FORM}
+                    onSubmit={editGLCode}
+                    submitButtonText={translate('common.save')}
+                    style={[styles.mh5, styles.flex1]}
+                    enabledWhenOffline
+                >
+                    <InputWrapper
+                        ref={inputCallbackRef}
+                        InputComponent={TextInput}
+                        defaultValue={glCode}
+                        label={translate('workspace.tags.glCode')}
+                        accessibilityLabel={translate('workspace.tags.glCode')}
+                        inputID={INPUT_IDS.TAG_GL_CODE}
+                        role={CONST.ROLE.PRESENTATION}
+                        maxLength={CONST.MAX_LENGTH_256}
+                    />
+                </FormProvider>
+            </ScreenWrapper>
+        </AccessOrNotFoundWrapper>
+    );
+}
+
+TagGLCodePage.displayName = 'TagGLCodePage';
+
+export default withOnyx<EditTagGLCodePageProps, WorkspaceEditTagGLCodePageOnyxProps>({
+    policyTags: {
+        key: ({route}) => `${ONYXKEYS.COLLECTION.POLICY_TAGS}${route?.params?.policyID}`,
+    },
+})(TagGLCodePage);
diff --git a/src/pages/workspace/tags/TagSettingsPage.tsx b/src/pages/workspace/tags/TagSettingsPage.tsx
index 54316efbc14b..a0f98ef699ed 100644
--- a/src/pages/workspace/tags/TagSettingsPage.tsx
+++ b/src/pages/workspace/tags/TagSettingsPage.tsx
@@ -1,79 +1,94 @@
 import type {StackScreenProps} from '@react-navigation/stack';
-import React, {useMemo} from 'react';
+import React, {useEffect, useMemo} from 'react';
 import {View} from 'react-native';
-import {useOnyx, withOnyx} from 'react-native-onyx';
+import {withOnyx} from 'react-native-onyx';
 import type {OnyxEntry} from 'react-native-onyx';
 import ConfirmModal from '@components/ConfirmModal';
 import HeaderWithBackButton from '@components/HeaderWithBackButton';
-import {Trashcan} from '@components/Icon/Expensicons';
+import * as Expensicons from '@components/Icon/Expensicons';
+import MenuItem from '@components/MenuItem';
 import MenuItemWithTopDescription from '@components/MenuItemWithTopDescription';
 import OfflineWithFeedback from '@components/OfflineWithFeedback';
 import ScreenWrapper from '@components/ScreenWrapper';
 import Switch from '@components/Switch';
 import Text from '@components/Text';
 import useLocalize from '@hooks/useLocalize';
+import usePolicy from '@hooks/usePolicy';
 import useThemeStyles from '@hooks/useThemeStyles';
-import useWindowDimensions from '@hooks/useWindowDimensions';
-import {setWorkspaceTagEnabled} from '@libs/actions/Policy';
 import * as ErrorUtils from '@libs/ErrorUtils';
 import Navigation from '@libs/Navigation/Navigation';
 import * as PolicyUtils from '@libs/PolicyUtils';
 import type {SettingsNavigatorParamList} from '@navigation/types';
 import NotFoundPage from '@pages/ErrorPage/NotFoundPage';
 import AccessOrNotFoundWrapper from '@pages/workspace/AccessOrNotFoundWrapper';
-import * as Policy from '@userActions/Policy';
+import {setWorkspaceTagEnabled} from '@userActions/Policy/Tag';
+import * as Tag from '@userActions/Policy/Tag';
 import CONST from '@src/CONST';
 import ONYXKEYS from '@src/ONYXKEYS';
 import ROUTES from '@src/ROUTES';
 import type SCREENS from '@src/SCREENS';
-import type {PolicyTagList} from '@src/types/onyx';
+import type {PolicyTagLists} from '@src/types/onyx';
 
 type TagSettingsPageOnyxProps = {
     /** All policy tags */
-    policyTags: OnyxEntry<PolicyTagList>;
+    policyTags: OnyxEntry<PolicyTagLists>;
 };
 
 type TagSettingsPageProps = TagSettingsPageOnyxProps & StackScreenProps<SettingsNavigatorParamList, typeof SCREENS.WORKSPACE.TAG_SETTINGS>;
 
-function TagSettingsPage({route, policyTags}: TagSettingsPageProps) {
+function TagSettingsPage({route, policyTags, navigation}: TagSettingsPageProps) {
     const styles = useThemeStyles();
     const {translate} = useLocalize();
-    const policyTag = useMemo(() => PolicyUtils.getTagList(policyTags, 0), [policyTags]);
-    const [policy] = useOnyx(`${ONYXKEYS.COLLECTION.POLICY}${route.params.policyID}`);
-
-    const {windowWidth} = useWindowDimensions();
+    const policyTag = useMemo(() => PolicyUtils.getTagList(policyTags, route.params.orderWeight), [policyTags, route.params.orderWeight]);
+    const policy = usePolicy(route.params.policyID);
 
     const [isDeleteTagModalOpen, setIsDeleteTagModalOpen] = React.useState(false);
 
-    const currentPolicyTag = policyTag.tags[decodeURIComponent(route.params.tagName)];
+    const currentPolicyTag = policyTag.tags[route.params.tagName] ?? Object.values(policyTag.tags ?? {}).find((tag) => tag.previousTagName === route.params.tagName);
+
+    useEffect(() => {
+        if (currentPolicyTag?.name === route.params.tagName || !currentPolicyTag) {
+            return;
+        }
+        navigation.setParams({tagName: currentPolicyTag?.name});
+    }, [route.params.tagName, currentPolicyTag, navigation]);
 
     if (!currentPolicyTag) {
         return <NotFoundPage />;
     }
 
     const deleteTagAndHideModal = () => {
-        Policy.deletePolicyTags(route.params.policyID, [currentPolicyTag.name]);
+        Tag.deletePolicyTags(route.params.policyID, [currentPolicyTag.name]);
         setIsDeleteTagModalOpen(false);
         Navigation.goBack();
     };
 
     const updateWorkspaceTagEnabled = (value: boolean) => {
-        setWorkspaceTagEnabled(route.params.policyID, {[currentPolicyTag.name]: {name: currentPolicyTag.name, enabled: value}});
+        setWorkspaceTagEnabled(route.params.policyID, {[currentPolicyTag.name]: {name: currentPolicyTag.name, enabled: value}}, policyTag.orderWeight);
     };
 
     const navigateToEditTag = () => {
-        Navigation.navigate(ROUTES.WORKSPACE_TAG_EDIT.getRoute(route.params.policyID, currentPolicyTag.name));
+        Navigation.navigate(ROUTES.WORKSPACE_TAG_EDIT.getRoute(route.params.policyID, route.params.orderWeight, currentPolicyTag.name));
+    };
+
+    const navigateToEditGlCode = () => {
+        if (!PolicyUtils.isControlPolicy(policy)) {
+            Navigation.navigate(
+                ROUTES.WORKSPACE_UPGRADE.getRoute(
+                    route.params.policyID,
+                    CONST.UPGRADE_FEATURE_INTRO_MAPPING.glCodes.alias,
+                    ROUTES.WORKSPACE_TAG_GL_CODE.getRoute(policy?.id ?? '', route.params.orderWeight, route.params.tagName),
+                ),
+            );
+            return;
+        }
+        Navigation.navigate(ROUTES.WORKSPACE_TAG_GL_CODE.getRoute(route.params.policyID, route.params.orderWeight, currentPolicyTag.name));
     };
 
     const isThereAnyAccountingConnection = Object.keys(policy?.connections ?? {}).length !== 0;
-    const threeDotsMenuItems = [];
-    if (!isThereAnyAccountingConnection) {
-        threeDotsMenuItems.push({
-            icon: Trashcan,
-            text: translate('workspace.tags.deleteTag'),
-            onSelected: () => setIsDeleteTagModalOpen(true),
-        });
-    }
+    const isMultiLevelTags = PolicyUtils.isMultiLevelTags(policyTags);
+
+    const shouldShowDeleteMenuItem = !isThereAnyAccountingConnection && !isMultiLevelTags;
 
     return (
         <AccessOrNotFoundWrapper
@@ -88,10 +103,7 @@ function TagSettingsPage({route, policyTags}: TagSettingsPageProps) {
             >
                 <HeaderWithBackButton
                     title={PolicyUtils.getCleanedTagName(route.params.tagName)}
-                    shouldShowThreeDotsButton={threeDotsMenuItems.length > 0}
                     shouldSetModalVisibility={false}
-                    threeDotsAnchorPosition={styles.threeDotsPopoverOffset(windowWidth)}
-                    threeDotsMenuItems={threeDotsMenuItems}
                 />
                 <ConfirmModal
                     title={translate('workspace.tags.deleteTag')}
@@ -109,7 +121,7 @@ function TagSettingsPage({route, policyTags}: TagSettingsPageProps) {
                         errors={ErrorUtils.getLatestErrorMessageField(currentPolicyTag)}
                         pendingAction={currentPolicyTag.pendingFields?.enabled}
                         errorRowStyles={styles.mh5}
-                        onClose={() => Policy.clearPolicyTagErrors(route.params.policyID, route.params.tagName)}
+                        onClose={() => Tag.clearPolicyTagErrors(route.params.policyID, route.params.tagName, route.params.orderWeight)}
                     >
                         <View style={[styles.mt2, styles.mh5]}>
                             <View style={[styles.flexRow, styles.mb5, styles.mr2, styles.alignItemsCenter, styles.justifyContentBetween]}>
@@ -125,11 +137,26 @@ function TagSettingsPage({route, policyTags}: TagSettingsPageProps) {
                     <OfflineWithFeedback pendingAction={currentPolicyTag.pendingFields?.name}>
                         <MenuItemWithTopDescription
                             title={PolicyUtils.getCleanedTagName(currentPolicyTag.name)}
-                            description={translate(`workspace.tags.tagName`)}
+                            description={translate(`common.name`)}
                             onPress={navigateToEditTag}
                             shouldShowRightIcon
                         />
                     </OfflineWithFeedback>
+                    <OfflineWithFeedback pendingAction={currentPolicyTag.pendingFields?.['GL Code']}>
+                        <MenuItemWithTopDescription
+                            title={currentPolicyTag['GL Code']}
+                            description={translate(`workspace.tags.glCode`)}
+                            onPress={navigateToEditGlCode}
+                            shouldShowRightIcon
+                        />
+                    </OfflineWithFeedback>
+                    {shouldShowDeleteMenuItem && (
+                        <MenuItem
+                            icon={Expensicons.Trashcan}
+                            title={translate('common.delete')}
+                            onPress={() => setIsDeleteTagModalOpen(true)}
+                        />
+                    )}
                 </View>
             </ScreenWrapper>
         </AccessOrNotFoundWrapper>
diff --git a/src/pages/workspace/tags/WorkspaceCreateTagPage.tsx b/src/pages/workspace/tags/WorkspaceCreateTagPage.tsx
index 5ff60afe12f1..cde6a55c5258 100644
--- a/src/pages/workspace/tags/WorkspaceCreateTagPage.tsx
+++ b/src/pages/workspace/tags/WorkspaceCreateTagPage.tsx
@@ -18,16 +18,16 @@ import * as PolicyUtils from '@libs/PolicyUtils';
 import * as ValidationUtils from '@libs/ValidationUtils';
 import type {SettingsNavigatorParamList} from '@navigation/types';
 import AccessOrNotFoundWrapper from '@pages/workspace/AccessOrNotFoundWrapper';
-import * as Policy from '@userActions/Policy';
+import * as Tag from '@userActions/Policy/Tag';
 import CONST from '@src/CONST';
 import ONYXKEYS from '@src/ONYXKEYS';
 import type SCREENS from '@src/SCREENS';
 import INPUT_IDS from '@src/types/form/WorkspaceTagForm';
-import type {PolicyTagList} from '@src/types/onyx';
+import type {PolicyTagLists} from '@src/types/onyx';
 
 type WorkspaceCreateTagPageOnyxProps = {
     /** All policy tags */
-    policyTags: OnyxEntry<PolicyTagList>;
+    policyTags: OnyxEntry<PolicyTagLists>;
 };
 
 type CreateTagPageProps = WorkspaceCreateTagPageOnyxProps & StackScreenProps<SettingsNavigatorParamList, typeof SCREENS.WORKSPACE.TAG_CREATE>;
@@ -40,26 +40,28 @@ function CreateTagPage({route, policyTags}: CreateTagPageProps) {
     const validate = useCallback(
         (values: FormOnyxValues<typeof ONYXKEYS.FORMS.WORKSPACE_TAG_FORM>) => {
             const errors: FormInputErrors<typeof ONYXKEYS.FORMS.WORKSPACE_TAG_FORM> = {};
-            const tagName = values.tagName.trim();
+            const tagName = PolicyUtils.escapeTagName(values.tagName.trim());
             const {tags} = PolicyUtils.getTagList(policyTags, 0);
 
             if (!ValidationUtils.isRequiredFulfilled(tagName)) {
-                errors.tagName = 'workspace.tags.tagRequiredError';
+                errors.tagName = translate('workspace.tags.tagRequiredError');
+            } else if (tagName === '0') {
+                errors.tagName = translate('workspace.tags.invalidTagNameError');
             } else if (tags?.[tagName]) {
-                errors.tagName = 'workspace.tags.existingTagError';
+                errors.tagName = translate('workspace.tags.existingTagError');
             } else if ([...tagName].length > CONST.TAG_NAME_LIMIT) {
                 // Uses the spread syntax to count the number of Unicode code points instead of the number of UTF-16 code units.
-                ErrorUtils.addErrorMessage(errors, 'tagName', ['common.error.characterLimitExceedCounter', {length: [...tagName].length, limit: CONST.TAG_NAME_LIMIT}]);
+                ErrorUtils.addErrorMessage(errors, 'tagName', translate('common.error.characterLimitExceedCounter', {length: [...tagName].length, limit: CONST.TAG_NAME_LIMIT}));
             }
 
             return errors;
         },
-        [policyTags],
+        [policyTags, translate],
     );
 
     const createTag = useCallback(
         (values: FormOnyxValues<typeof ONYXKEYS.FORMS.WORKSPACE_TAG_FORM>) => {
-            Policy.createPolicyTag(route.params.policyID, values.tagName.trim());
+            Tag.createPolicyTag(route.params.policyID, values.tagName.trim());
             Keyboard.dismiss();
             Navigation.goBack();
         },
diff --git a/src/pages/workspace/tags/WorkspaceEditTagsPage.tsx b/src/pages/workspace/tags/WorkspaceEditTagsPage.tsx
index fed48c5fe4be..972506e31be1 100644
--- a/src/pages/workspace/tags/WorkspaceEditTagsPage.tsx
+++ b/src/pages/workspace/tags/WorkspaceEditTagsPage.tsx
@@ -12,7 +12,7 @@ import TextInput from '@components/TextInput';
 import useAutoFocusInput from '@hooks/useAutoFocusInput';
 import useLocalize from '@hooks/useLocalize';
 import useThemeStyles from '@hooks/useThemeStyles';
-import * as Policy from '@libs/actions/Policy';
+import * as Tag from '@libs/actions/Policy/Tag';
 import Navigation from '@libs/Navigation/Navigation';
 import * as PolicyUtils from '@libs/PolicyUtils';
 import type {SettingsNavigatorParamList} from '@navigation/types';
@@ -25,33 +25,39 @@ import type * as OnyxTypes from '@src/types/onyx';
 
 type WorkspaceEditTagsPageOnyxProps = {
     /** Collection of tags attached to a policy */
-    policyTags: OnyxEntry<OnyxTypes.PolicyTagList>;
+    policyTags: OnyxEntry<OnyxTypes.PolicyTagLists>;
 };
 
 type WorkspaceEditTagsPageProps = WorkspaceEditTagsPageOnyxProps & StackScreenProps<SettingsNavigatorParamList, typeof SCREENS.WORKSPACE.TAGS_EDIT>;
 
-const validateTagName = (values: FormOnyxValues<typeof ONYXKEYS.FORMS.POLICY_TAG_NAME_FORM>) => {
-    const errors: FormInputErrors<typeof ONYXKEYS.FORMS.POLICY_TAG_NAME_FORM> = {};
-    if (!values[INPUT_IDS.POLICY_TAGS_NAME] && values[INPUT_IDS.POLICY_TAGS_NAME].trim() === '') {
-        errors[INPUT_IDS.POLICY_TAGS_NAME] = 'common.error.fieldRequired';
-    }
-    return errors;
-};
-
 function WorkspaceEditTagsPage({route, policyTags}: WorkspaceEditTagsPageProps) {
     const styles = useThemeStyles();
     const {translate} = useLocalize();
-    const taglistName = useMemo(() => PolicyUtils.getTagLists(policyTags)[0].name, [policyTags]);
+    const taglistName = useMemo(() => PolicyUtils.getTagListName(policyTags, route.params.orderWeight), [policyTags, route.params.orderWeight]);
     const {inputCallbackRef} = useAutoFocusInput();
 
+    const validateTagName = useCallback(
+        (values: FormOnyxValues<typeof ONYXKEYS.FORMS.POLICY_TAG_NAME_FORM>) => {
+            const errors: FormInputErrors<typeof ONYXKEYS.FORMS.POLICY_TAG_NAME_FORM> = {};
+            if (!values[INPUT_IDS.POLICY_TAGS_NAME] && values[INPUT_IDS.POLICY_TAGS_NAME].trim() === '') {
+                errors[INPUT_IDS.POLICY_TAGS_NAME] = translate('common.error.fieldRequired');
+            }
+            if (policyTags && Object.values(policyTags).find((tag) => tag.orderWeight !== route.params.orderWeight && tag.name === values[INPUT_IDS.POLICY_TAGS_NAME])) {
+                errors[INPUT_IDS.POLICY_TAGS_NAME] = translate('workspace.tags.existingTagError');
+            }
+            return errors;
+        },
+        [translate, policyTags, route.params.orderWeight],
+    );
+
     const updateTaglistName = useCallback(
         (values: FormOnyxValues<typeof ONYXKEYS.FORMS.POLICY_TAG_NAME_FORM>) => {
             if (values[INPUT_IDS.POLICY_TAGS_NAME] !== taglistName) {
-                Policy.renamePolicyTaglist(route.params.policyID, {oldName: taglistName, newName: values[INPUT_IDS.POLICY_TAGS_NAME]}, policyTags);
+                Tag.renamePolicyTaglist(route.params.policyID, {oldName: taglistName, newName: values[INPUT_IDS.POLICY_TAGS_NAME]}, policyTags, route.params.orderWeight);
             }
             Navigation.goBack();
         },
-        [policyTags, route.params.policyID, taglistName],
+        [policyTags, route.params.orderWeight, route.params.policyID, taglistName],
     );
 
     return (
diff --git a/src/pages/workspace/tags/WorkspaceTagsPage.tsx b/src/pages/workspace/tags/WorkspaceTagsPage.tsx
index 0e4290776250..adf200a99dd1 100644
--- a/src/pages/workspace/tags/WorkspaceTagsPage.tsx
+++ b/src/pages/workspace/tags/WorkspaceTagsPage.tsx
@@ -1,87 +1,74 @@
 import {useFocusEffect, useIsFocused} from '@react-navigation/native';
 import type {StackScreenProps} from '@react-navigation/stack';
 import lodashSortBy from 'lodash/sortBy';
-import React, {useCallback, useEffect, useMemo, useRef, useState} from 'react';
+import React, {useCallback, useEffect, useMemo, useState} from 'react';
 import {ActivityIndicator, View} from 'react-native';
 import {useOnyx} from 'react-native-onyx';
 import Button from '@components/Button';
 import ButtonWithDropdownMenu from '@components/ButtonWithDropdownMenu';
 import type {DropdownOption} from '@components/ButtonWithDropdownMenu/types';
 import ConfirmModal from '@components/ConfirmModal';
+import EmptyStateComponent from '@components/EmptyStateComponent';
 import HeaderWithBackButton from '@components/HeaderWithBackButton';
 import * as Expensicons from '@components/Icon/Expensicons';
 import * as Illustrations from '@components/Icon/Illustrations';
 import ScreenWrapper from '@components/ScreenWrapper';
-import SelectionList from '@components/SelectionList';
-import RightElementEnabledStatus from '@components/SelectionList/RightElementEnabledStatus';
+import ListItemRightCaretWithLabel from '@components/SelectionList/ListItemRightCaretWithLabel';
 import TableListItem from '@components/SelectionList/TableListItem';
-import type {ListItem} from '@components/SelectionList/types';
+import SelectionListWithModal from '@components/SelectionListWithModal';
+import TableListItemSkeleton from '@components/Skeletons/TableRowSkeleton';
 import Text from '@components/Text';
 import TextLink from '@components/TextLink';
-import WorkspaceEmptyStateSection from '@components/WorkspaceEmptyStateSection';
 import useEnvironment from '@hooks/useEnvironment';
 import useLocalize from '@hooks/useLocalize';
 import useNetwork from '@hooks/useNetwork';
+import usePolicy from '@hooks/usePolicy';
+import useResponsiveLayout from '@hooks/useResponsiveLayout';
 import useTheme from '@hooks/useTheme';
 import useThemeStyles from '@hooks/useThemeStyles';
-import useWindowDimensions from '@hooks/useWindowDimensions';
+import {turnOffMobileSelectionMode} from '@libs/actions/MobileSelectionMode';
 import * as DeviceCapabilities from '@libs/DeviceCapabilities';
 import localeCompare from '@libs/LocaleCompare';
 import Navigation from '@libs/Navigation/Navigation';
-import type {WorkspacesCentralPaneNavigatorParamList} from '@libs/Navigation/types';
+import type {FullScreenNavigatorParamList} from '@libs/Navigation/types';
 import * as PolicyUtils from '@libs/PolicyUtils';
 import AccessOrNotFoundWrapper from '@pages/workspace/AccessOrNotFoundWrapper';
-import * as Policy from '@userActions/Policy';
+import * as Tag from '@userActions/Policy/Tag';
 import CONST from '@src/CONST';
 import ONYXKEYS from '@src/ONYXKEYS';
 import ROUTES from '@src/ROUTES';
 import type SCREENS from '@src/SCREENS';
-import type * as OnyxTypes from '@src/types/onyx';
-import type * as OnyxCommon from '@src/types/onyx/OnyxCommon';
+import type {PendingAction} from '@src/types/onyx/OnyxCommon';
 import type DeepValueOf from '@src/types/utils/DeepValueOf';
+import type {PolicyTag, PolicyTagList, TagListItem} from './types';
 
-type PolicyForList = {
-    value: string;
-    text: string;
-    keyForList: string;
-    isSelected: boolean;
-    rightElement: React.ReactNode;
-    enabled: boolean;
-};
-
-type PolicyOption = ListItem & {
-    /** Tag name is used as a key for the selectedTags state */
-    keyForList: string;
-};
-
-type WorkspaceTagsPageProps = StackScreenProps<WorkspacesCentralPaneNavigatorParamList, typeof SCREENS.WORKSPACE.TAGS>;
+type WorkspaceTagsPageProps = StackScreenProps<FullScreenNavigatorParamList, typeof SCREENS.WORKSPACE.TAGS>;
 
 function WorkspaceTagsPage({route}: WorkspaceTagsPageProps) {
-    const {isSmallScreenWidth} = useWindowDimensions();
+    const {shouldUseNarrowLayout} = useResponsiveLayout();
     const styles = useThemeStyles();
     const theme = useTheme();
     const {translate} = useLocalize();
     const [selectedTags, setSelectedTags] = useState<Record<string, boolean>>({});
-    const dropdownButtonRef = useRef(null);
-    const [deleteTagsConfirmModalVisible, setDeleteTagsConfirmModalVisible] = useState(false);
+    const [isDeleteTagsConfirmModalVisible, setIsDeleteTagsConfirmModalVisible] = useState(false);
     const isFocused = useIsFocused();
-    const policyID = route.params.policyID ?? '';
-    const [policy] = useOnyx(`${ONYXKEYS.COLLECTION.POLICY}${policyID}`);
+    const policyID = route.params.policyID ?? '-1';
+    const policy = usePolicy(policyID);
     const [policyTags] = useOnyx(`${ONYXKEYS.COLLECTION.POLICY_TAGS}${policyID}`);
+    const [selectionMode] = useOnyx(ONYXKEYS.MOBILE_SELECTION_MODE);
     const {environmentURL} = useEnvironment();
     const isConnectedToAccounting = Object.keys(policy?.connections ?? {}).length > 0;
+    const currentConnectionName = PolicyUtils.getCurrentConnectionName(policy);
+    const [policyTagLists, isMultiLevelTags] = useMemo(() => [PolicyUtils.getTagLists(policyTags), PolicyUtils.isMultiLevelTags(policyTags)], [policyTags]);
+    const canSelectMultiple = !isMultiLevelTags && (shouldUseNarrowLayout ? selectionMode?.isEnabled : true);
 
     const fetchTags = useCallback(() => {
-        Policy.openPolicyTagsPage(policyID);
+        Tag.openPolicyTagsPage(policyID);
     }, [policyID]);
 
     const {isOffline} = useNetwork({onReconnect: fetchTags});
 
-    useFocusEffect(
-        useCallback(() => {
-            fetchTags();
-        }, [fetchTags]),
-    );
+    useFocusEffect(fetchTags);
 
     useEffect(() => {
         if (isFocused) {
@@ -90,38 +77,58 @@ function WorkspaceTagsPage({route}: WorkspaceTagsPageProps) {
         setSelectedTags({});
     }, [isFocused]);
 
-    // We currently don't support multi level tags, so let's only get the first level tags.
-    const policyTagLists = useMemo(() => PolicyUtils.getTagLists(policyTags).slice(0, 1), [policyTags]);
-    const tagList = useMemo<PolicyForList[]>(
+    const getPendingAction = (policyTagList: PolicyTagList): PendingAction | undefined => {
+        if (!policyTagList) {
+            return undefined;
+        }
+        return (policyTagList.pendingAction as PendingAction) ?? Object.values(policyTagList.tags).some((tag: PolicyTag) => tag.pendingAction)
+            ? CONST.RED_BRICK_ROAD_PENDING_ACTION.UPDATE
+            : undefined;
+    };
+
+    const tagList = useMemo<TagListItem[]>(() => {
+        if (isMultiLevelTags) {
+            return policyTagLists.map((policyTagList) => ({
+                value: policyTagList.name,
+                orderWeight: policyTagList.orderWeight,
+                text: PolicyUtils.getCleanedTagName(policyTagList.name),
+                keyForList: String(policyTagList.orderWeight),
+                isSelected: selectedTags[policyTagList.name] && canSelectMultiple,
+                pendingAction: getPendingAction(policyTagList),
+                enabled: true,
+                required: policyTagList.required,
+                rightElement: (
+                    <ListItemRightCaretWithLabel
+                        labelText={policyTagList.required ? translate('common.required') : undefined}
+                        shouldShowCaret={false}
+                    />
+                ),
+            }));
+        }
+        const sortedTags = lodashSortBy(Object.values(policyTagLists[0]?.tags ?? {}), 'name', localeCompare) as PolicyTag[];
+        return sortedTags.map((tag) => ({
+            value: tag.name,
+            text: PolicyUtils.getCleanedTagName(tag.name),
+            keyForList: tag.name,
+            isSelected: selectedTags[tag.name] && canSelectMultiple,
+            pendingAction: tag.pendingAction,
+            errors: tag.errors ?? undefined,
+            enabled: tag.enabled,
+            isDisabled: tag.pendingAction === CONST.RED_BRICK_ROAD_PENDING_ACTION.DELETE,
+            rightElement: <ListItemRightCaretWithLabel labelText={tag.enabled ? translate('workspace.common.enabled') : translate('workspace.common.disabled')} />,
+        }));
+    }, [isMultiLevelTags, policyTagLists, selectedTags, canSelectMultiple, translate]);
+
+    const tagListKeyedByName = useMemo(
         () =>
-            policyTagLists
-                .map((policyTagList) =>
-                    lodashSortBy(Object.values(policyTagList.tags || []), 'name', localeCompare).map((value) => {
-                        const tag = value as OnyxCommon.OnyxValueWithOfflineFeedback<OnyxTypes.PolicyTag>;
-                        const isDisabled = tag.pendingAction === CONST.RED_BRICK_ROAD_PENDING_ACTION.DELETE;
-                        return {
-                            value: tag.name,
-                            text: PolicyUtils.getCleanedTagName(tag.name),
-                            keyForList: tag.name,
-                            isSelected: !!selectedTags[tag.name],
-                            pendingAction: tag.pendingAction,
-                            errors: tag.errors ?? undefined,
-                            enabled: tag.enabled,
-                            isDisabled,
-                            rightElement: <RightElementEnabledStatus enabled={tag.enabled} />,
-                        };
-                    }),
-                )
-                .flat(),
-        [policyTagLists, selectedTags],
+            tagList.reduce<Record<string, TagListItem>>((acc, tag) => {
+                acc[tag.value] = tag;
+                return acc;
+            }, {}),
+        [tagList],
     );
 
-    const tagListKeyedByName = tagList.reduce<Record<string, PolicyForList>>((acc, tag) => {
-        acc[tag.value] = tag;
-        return acc;
-    }, {});
-
-    const toggleTag = (tag: PolicyForList) => {
+    const toggleTag = (tag: TagListItem) => {
         setSelectedTags((prev) => ({
             ...prev,
             [tag.value]: !prev[tag.value],
@@ -129,16 +136,31 @@ function WorkspaceTagsPage({route}: WorkspaceTagsPageProps) {
     };
 
     const toggleAllTags = () => {
-        const isAllSelected = tagList.every((tag) => !!selectedTags[tag.value]);
-        setSelectedTags(isAllSelected ? {} : Object.fromEntries(tagList.map((item) => [item.value, true])));
+        const availableTags = tagList.filter((tag) => tag.pendingAction !== CONST.RED_BRICK_ROAD_PENDING_ACTION.DELETE);
+        const isAllSelected = availableTags.length === Object.keys(selectedTags).length;
+        setSelectedTags(isAllSelected ? {} : Object.fromEntries(availableTags.map((item) => [item.value, true])));
     };
 
-    const getCustomListHeader = () => (
-        <View style={[styles.flex1, styles.flexRow, styles.justifyContentBetween, styles.pl3, styles.pr9]}>
-            <Text style={styles.searchInputStyle}>{translate('common.name')}</Text>
-            <Text style={[styles.searchInputStyle, styles.textAlignCenter]}>{translate('statusPage.status')}</Text>
-        </View>
-    );
+    const getCustomListHeader = () => {
+        const header = (
+            <View
+                style={[
+                    styles.flex1,
+                    styles.flexRow,
+                    styles.justifyContentBetween,
+                    // Required padding accounting for the checkbox and the right arrow in multi-select mode
+                    canSelectMultiple && [styles.pl3, styles.pr9],
+                ]}
+            >
+                <Text style={styles.searchInputStyle}>{translate('common.name')}</Text>
+                <Text style={[styles.searchInputStyle, styles.textAlignCenter]}>{translate('statusPage.status')}</Text>
+            </View>
+        );
+        if (canSelectMultiple) {
+            return header;
+        }
+        return <View style={[styles.flexRow, styles.ph9, styles.pv3, styles.pb5]}>{header}</View>;
+    };
 
     const navigateToTagsSettings = () => {
         Navigation.navigate(ROUTES.WORKSPACE_TAGS_SETTINGS.getRoute(policyID));
@@ -148,117 +170,144 @@ function WorkspaceTagsPage({route}: WorkspaceTagsPageProps) {
         Navigation.navigate(ROUTES.WORKSPACE_TAG_CREATE.getRoute(policyID));
     };
 
-    const navigateToTagSettings = (tag: PolicyOption) => {
-        Navigation.navigate(ROUTES.WORKSPACE_TAG_SETTINGS.getRoute(policyID, tag.keyForList));
+    const navigateToTagSettings = (tag: TagListItem) => {
+        if (tag.orderWeight !== undefined) {
+            Navigation.navigate(ROUTES.WORKSPACE_TAG_LIST_VIEW.getRoute(policyID, tag.orderWeight));
+            return;
+        }
+        Navigation.navigate(ROUTES.WORKSPACE_TAG_SETTINGS.getRoute(policyID, 0, tag.value));
     };
 
     const selectedTagsArray = Object.keys(selectedTags).filter((key) => selectedTags[key]);
 
-    const handleDeleteTags = () => {
+    const deleteTags = () => {
         setSelectedTags({});
-        Policy.deletePolicyTags(policyID, selectedTagsArray);
-        setDeleteTagsConfirmModalVisible(false);
+        Tag.deletePolicyTags(policyID, selectedTagsArray);
+        setIsDeleteTagsConfirmModalVisible(false);
     };
 
     const isLoading = !isOffline && policyTags === undefined;
 
     const getHeaderButtons = () => {
-        const options: Array<DropdownOption<DeepValueOf<typeof CONST.POLICY.TAGS_BULK_ACTION_TYPES>>> = [];
-        const isThereAnyAccountingConnection = Object.keys(policy?.connections ?? {}).length !== 0;
-
-        if (selectedTagsArray.length > 0) {
-            if (!isThereAnyAccountingConnection) {
-                options.push({
-                    icon: Expensicons.Trashcan,
-                    text: translate(selectedTagsArray.length === 1 ? 'workspace.tags.deleteTag' : 'workspace.tags.deleteTags'),
-                    value: CONST.POLICY.TAGS_BULK_ACTION_TYPES.DELETE,
-                    onSelected: () => setDeleteTagsConfirmModalVisible(true),
-                });
-            }
-
-            const enabledTags = selectedTagsArray.filter((tagName) => tagListKeyedByName?.[tagName]?.enabled);
-            if (enabledTags.length > 0) {
-                const tagsToDisable = selectedTagsArray
-                    .filter((tagName) => tagListKeyedByName?.[tagName]?.enabled)
-                    .reduce<Record<string, {name: string; enabled: boolean}>>((acc, tagName) => {
-                        acc[tagName] = {
-                            name: tagName,
-                            enabled: false,
-                        };
-                        return acc;
-                    }, {});
-
-                options.push({
-                    icon: Expensicons.DocumentSlash,
-                    text: translate(enabledTags.length === 1 ? 'workspace.tags.disableTag' : 'workspace.tags.disableTags'),
-                    value: CONST.POLICY.TAGS_BULK_ACTION_TYPES.DISABLE,
-                    onSelected: () => {
-                        setSelectedTags({});
-                        Policy.setWorkspaceTagEnabled(policyID, tagsToDisable);
-                    },
-                });
-            }
-
-            const disabledTags = selectedTagsArray.filter((tagName) => !tagListKeyedByName?.[tagName]?.enabled);
-            if (disabledTags.length > 0) {
-                const tagsToEnable = selectedTagsArray
-                    .filter((tagName) => !tagListKeyedByName?.[tagName]?.enabled)
-                    .reduce<Record<string, {name: string; enabled: boolean}>>((acc, tagName) => {
-                        acc[tagName] = {
-                            name: tagName,
-                            enabled: true,
-                        };
-                        return acc;
-                    }, {});
-                options.push({
-                    icon: Expensicons.Document,
-                    text: translate(disabledTags.length === 1 ? 'workspace.tags.enableTag' : 'workspace.tags.enableTags'),
-                    value: CONST.POLICY.TAGS_BULK_ACTION_TYPES.ENABLE,
-                    onSelected: () => {
-                        setSelectedTags({});
-                        Policy.setWorkspaceTagEnabled(policyID, tagsToEnable);
-                    },
-                });
-            }
+        const hasAccountingConnections = PolicyUtils.hasAccountingConnections(policy);
 
+        if (shouldUseNarrowLayout ? !selectionMode?.isEnabled : selectedTagsArray.length === 0) {
             return (
-                <ButtonWithDropdownMenu
-                    buttonRef={dropdownButtonRef}
-                    onPress={() => null}
-                    shouldAlwaysShowDropdownMenu
-                    pressOnEnter
-                    isSplitButton={false}
-                    buttonSize={CONST.DROPDOWN_BUTTON_SIZE.MEDIUM}
-                    customText={translate('workspace.common.selected', {selectedNumber: selectedTagsArray.length})}
-                    options={options}
-                    style={[isSmallScreenWidth && styles.flexGrow1, isSmallScreenWidth && styles.mb3]}
-                />
-            );
-        }
-
-        return (
-            <View style={[styles.w100, styles.flexRow, isSmallScreenWidth && styles.mb3]}>
-                <Button
-                    medium
-                    success
-                    onPress={navigateToCreateTagPage}
-                    icon={Expensicons.Plus}
-                    text={translate('workspace.tags.addTag')}
-                    style={[styles.mr3, isSmallScreenWidth && styles.w50]}
-                />
-                {policyTags && (
+                <View style={[styles.w100, styles.flexRow, styles.gap2, shouldUseNarrowLayout && styles.mb3]}>
+                    {!hasAccountingConnections && !isMultiLevelTags && (
+                        <Button
+                            medium
+                            success
+                            onPress={navigateToCreateTagPage}
+                            icon={Expensicons.Plus}
+                            text={translate('workspace.tags.addTag')}
+                            style={[shouldUseNarrowLayout && styles.flex1]}
+                        />
+                    )}
                     <Button
                         medium
                         onPress={navigateToTagsSettings}
                         icon={Expensicons.Gear}
                         text={translate('common.settings')}
-                        style={[isSmallScreenWidth && styles.w50]}
+                        style={[shouldUseNarrowLayout && styles.flex1]}
                     />
-                )}
-            </View>
+                </View>
+            );
+        }
+
+        const options: Array<DropdownOption<DeepValueOf<typeof CONST.POLICY.BULK_ACTION_TYPES>>> = [];
+
+        if (!hasAccountingConnections) {
+            options.push({
+                icon: Expensicons.Trashcan,
+                text: translate(selectedTagsArray.length === 1 ? 'workspace.tags.deleteTag' : 'workspace.tags.deleteTags'),
+                value: CONST.POLICY.BULK_ACTION_TYPES.DELETE,
+                onSelected: () => setIsDeleteTagsConfirmModalVisible(true),
+            });
+        }
+
+        let enabledTagCount = 0;
+        const tagsToDisable: Record<string, {name: string; enabled: boolean}> = {};
+        let disabledTagCount = 0;
+        const tagsToEnable: Record<string, {name: string; enabled: boolean}> = {};
+        for (const tagName of selectedTagsArray) {
+            if (tagListKeyedByName[tagName]?.enabled) {
+                enabledTagCount++;
+                tagsToDisable[tagName] = {
+                    name: tagName,
+                    enabled: false,
+                };
+            } else {
+                disabledTagCount++;
+                tagsToEnable[tagName] = {
+                    name: tagName,
+                    enabled: true,
+                };
+            }
+        }
+
+        if (enabledTagCount > 0) {
+            options.push({
+                icon: Expensicons.DocumentSlash,
+                text: translate(enabledTagCount === 1 ? 'workspace.tags.disableTag' : 'workspace.tags.disableTags'),
+                value: CONST.POLICY.BULK_ACTION_TYPES.DISABLE,
+                onSelected: () => {
+                    setSelectedTags({});
+                    Tag.setWorkspaceTagEnabled(policyID, tagsToDisable, 0);
+                },
+            });
+        }
+
+        if (disabledTagCount > 0) {
+            options.push({
+                icon: Expensicons.Document,
+                text: translate(disabledTagCount === 1 ? 'workspace.tags.enableTag' : 'workspace.tags.enableTags'),
+                value: CONST.POLICY.BULK_ACTION_TYPES.ENABLE,
+                onSelected: () => {
+                    setSelectedTags({});
+                    Tag.setWorkspaceTagEnabled(policyID, tagsToEnable, 0);
+                },
+            });
+        }
+
+        return (
+            <ButtonWithDropdownMenu
+                onPress={() => null}
+                shouldAlwaysShowDropdownMenu
+                pressOnEnter
+                isSplitButton={false}
+                buttonSize={CONST.DROPDOWN_BUTTON_SIZE.MEDIUM}
+                customText={translate('workspace.common.selected', {selectedNumber: selectedTagsArray.length})}
+                options={options}
+                style={[shouldUseNarrowLayout && styles.flexGrow1, shouldUseNarrowLayout && styles.mb3]}
+                isDisabled={!selectedTagsArray.length}
+            />
         );
     };
 
+    const getHeaderText = () => (
+        <View style={[styles.ph5, styles.pb5, styles.pt3]}>
+            {isConnectedToAccounting ? (
+                <Text>
+                    <Text style={[styles.textNormal, styles.colorMuted]}>{`${translate('workspace.tags.importedFromAccountingSoftware')} `}</Text>
+                    <TextLink
+                        style={[styles.textNormal, styles.link]}
+                        href={`${environmentURL}/${ROUTES.POLICY_ACCOUNTING.getRoute(policyID)}`}
+                    >
+                        {`${currentConnectionName} ${translate('workspace.accounting.settings')}`}
+                    </TextLink>
+                    <Text style={[styles.textNormal, styles.colorMuted]}>.</Text>
+                </Text>
+            ) : (
+                <Text style={[styles.textNormal, styles.colorMuted]}>{translate('workspace.tags.subtitle')}</Text>
+            )}
+        </View>
+    );
+
+    const hasVisibleTag = tagList.some((tag) => tag.pendingAction !== CONST.RED_BRICK_ROAD_PENDING_ACTION.DELETE || isOffline);
+
+    const selectionModeHeader = selectionMode?.isEnabled && shouldUseNarrowLayout;
+
     return (
         <AccessOrNotFoundWrapper
             policyID={policyID}
@@ -273,38 +322,32 @@ function WorkspaceTagsPage({route}: WorkspaceTagsPageProps) {
                 offlineIndicatorStyle={styles.mtAuto}
             >
                 <HeaderWithBackButton
-                    icon={Illustrations.Tag}
-                    title={translate('workspace.common.tags')}
-                    shouldShowBackButton={isSmallScreenWidth}
+                    icon={!selectionModeHeader ? Illustrations.Tag : undefined}
+                    title={translate(selectionModeHeader ? 'common.selectMultiple' : 'workspace.common.tags')}
+                    shouldShowBackButton={shouldUseNarrowLayout}
+                    onBackButtonPress={() => {
+                        if (selectionMode?.isEnabled) {
+                            setSelectedTags({});
+                            turnOffMobileSelectionMode();
+                            return;
+                        }
+                        Navigation.goBack();
+                    }}
                 >
-                    {!isSmallScreenWidth && getHeaderButtons()}
+                    {!shouldUseNarrowLayout && getHeaderButtons()}
                 </HeaderWithBackButton>
+                {shouldUseNarrowLayout && <View style={[styles.pl5, styles.pr5]}>{getHeaderButtons()}</View>}
                 <ConfirmModal
-                    isVisible={deleteTagsConfirmModalVisible}
-                    onConfirm={handleDeleteTags}
-                    onCancel={() => setDeleteTagsConfirmModalVisible(false)}
+                    isVisible={isDeleteTagsConfirmModalVisible}
+                    onConfirm={deleteTags}
+                    onCancel={() => setIsDeleteTagsConfirmModalVisible(false)}
                     title={translate(selectedTagsArray.length === 1 ? 'workspace.tags.deleteTag' : 'workspace.tags.deleteTags')}
                     prompt={translate(selectedTagsArray.length === 1 ? 'workspace.tags.deleteTagConfirmation' : 'workspace.tags.deleteTagsConfirmation')}
                     confirmText={translate('common.delete')}
                     cancelText={translate('common.cancel')}
                     danger
                 />
-                {isSmallScreenWidth && <View style={[styles.pl5, styles.pr5]}>{getHeaderButtons()}</View>}
-                <View style={[styles.ph5, styles.pb5, styles.pt3]}>
-                    {isConnectedToAccounting ? (
-                        <Text>
-                            <Text style={[styles.textNormal, styles.colorMuted]}>{`${translate('workspace.tags.importedFromAccountingSoftware')} `}</Text>
-                            <TextLink
-                                style={[styles.textNormal, styles.link]}
-                                href={`${environmentURL}/${ROUTES.POLICY_ACCOUNTING.getRoute(policyID)}`}
-                            >
-                                {`${translate('workspace.accounting.qbo')} ${translate('workspace.accounting.settings')}`}
-                            </TextLink>
-                        </Text>
-                    ) : (
-                        <Text style={[styles.textNormal, styles.colorMuted]}>{translate('workspace.tags.subtitle')}</Text>
-                    )}
-                </View>
+                {(!shouldUseNarrowLayout || !hasVisibleTag || isLoading) && getHeaderText()}
                 {isLoading && (
                     <ActivityIndicator
                         size={CONST.ACTIVITY_INDICATOR_SIZE.LARGE}
@@ -312,26 +355,34 @@ function WorkspaceTagsPage({route}: WorkspaceTagsPageProps) {
                         color={theme.spinner}
                     />
                 )}
-                {tagList.length === 0 && !isLoading && (
-                    <WorkspaceEmptyStateSection
+                {!hasVisibleTag && !isLoading && (
+                    <EmptyStateComponent
+                        SkeletonComponent={TableListItemSkeleton}
+                        headerMediaType={CONST.EMPTY_STATE_MEDIA.ILLUSTRATION}
+                        headerMedia={Illustrations.EmptyState}
+                        headerStyles={styles.emptyFolderBG}
+                        headerContentStyles={styles.emptyStateFolderIconSize}
                         title={translate('workspace.tags.emptyTags.title')}
-                        icon={Illustrations.EmptyStateExpenses}
                         subtitle={translate('workspace.tags.emptyTags.subtitle')}
                     />
                 )}
-                {tagList.length > 0 && !isLoading && (
-                    <SelectionList
-                        canSelectMultiple
+                {hasVisibleTag && !isLoading && (
+                    <SelectionListWithModal
+                        canSelectMultiple={canSelectMultiple}
+                        turnOnSelectionModeOnLongPress={!isMultiLevelTags}
+                        onTurnOnSelectionMode={(item) => item && toggleTag(item)}
                         sections={[{data: tagList, isDisabled: false}]}
                         onCheckboxPress={toggleTag}
                         onSelectRow={navigateToTagSettings}
+                        shouldSingleExecuteRowSelect={!canSelectMultiple}
                         onSelectAll={toggleAllTags}
-                        showScrollIndicator
                         ListItem={TableListItem}
                         customListHeader={getCustomListHeader()}
                         shouldPreventDefaultFocusOnSelectRow={!DeviceCapabilities.canUseTouchScreen()}
                         listHeaderWrapperStyle={[styles.ph9, styles.pv3, styles.pb5]}
-                        onDismissError={(item) => Policy.clearPolicyTagErrors(policyID, item.value)}
+                        onDismissError={(item) => !isMultiLevelTags && Tag.clearPolicyTagErrors(policyID, item.value, 0)}
+                        listHeaderContent={shouldUseNarrowLayout ? getHeaderText() : null}
+                        showScrollIndicator={false}
                     />
                 )}
             </ScreenWrapper>
diff --git a/src/pages/workspace/tags/WorkspaceTagsSettingsPage.tsx b/src/pages/workspace/tags/WorkspaceTagsSettingsPage.tsx
index 90b8dc16952a..530554388285 100644
--- a/src/pages/workspace/tags/WorkspaceTagsSettingsPage.tsx
+++ b/src/pages/workspace/tags/WorkspaceTagsSettingsPage.tsx
@@ -3,6 +3,7 @@ import React, {useCallback, useMemo} from 'react';
 import {View} from 'react-native';
 import type {OnyxEntry} from 'react-native-onyx';
 import {withOnyx} from 'react-native-onyx';
+import FullPageOfflineBlockingView from '@components/BlockingViews/FullPageOfflineBlockingView';
 import HeaderWithBackButton from '@components/HeaderWithBackButton';
 import MenuItemWithTopDescription from '@components/MenuItemWithTopDescription';
 import OfflineWithFeedback from '@components/OfflineWithFeedback';
@@ -10,9 +11,11 @@ import ScreenWrapper from '@components/ScreenWrapper';
 import Switch from '@components/Switch';
 import Text from '@components/Text';
 import useLocalize from '@hooks/useLocalize';
+import useNetwork from '@hooks/useNetwork';
 import useThemeStyles from '@hooks/useThemeStyles';
-import * as Policy from '@libs/actions/Policy';
+import * as Tag from '@libs/actions/Policy/Tag';
 import Navigation from '@libs/Navigation/Navigation';
+import * as OptionsListUtils from '@libs/OptionsListUtils';
 import * as PolicyUtils from '@libs/PolicyUtils';
 import type {SettingsNavigatorParamList} from '@navigation/types';
 import AccessOrNotFoundWrapper from '@pages/workspace/AccessOrNotFoundWrapper';
@@ -24,25 +27,65 @@ import type * as OnyxTypes from '@src/types/onyx';
 
 type WorkspaceTagsSettingsPageOnyxProps = {
     /** Collection of tags attached to a policy */
-    policyTags: OnyxEntry<OnyxTypes.PolicyTagList>;
+    policyTags: OnyxEntry<OnyxTypes.PolicyTagLists>;
 };
 type WorkspaceTagsSettingsPageProps = WorkspaceTagsSettingsPageOnyxProps & StackScreenProps<SettingsNavigatorParamList, typeof SCREENS.WORKSPACE.TAGS_SETTINGS>;
 
 function WorkspaceTagsSettingsPage({route, policyTags}: WorkspaceTagsSettingsPageProps) {
+    const policyID = route.params.policyID;
     const styles = useThemeStyles();
     const {translate} = useLocalize();
-    const policyTagName = useMemo(() => PolicyUtils.getTagLists(policyTags)?.[0]?.name ?? '', [policyTags]);
-
+    const [policyTagLists, isMultiLevelTags] = useMemo(() => [PolicyUtils.getTagLists(policyTags), PolicyUtils.isMultiLevelTags(policyTags)], [policyTags]);
+    const isLoading = !PolicyUtils.getTagLists(policyTags)?.[0] || Object.keys(policyTags ?? {})[0] === 'undefined';
+    const {isOffline} = useNetwork();
+    const hasEnabledOptions = OptionsListUtils.hasEnabledOptions(Object.values(policyTags ?? {}).flatMap(({tags}) => Object.values(tags)));
     const updateWorkspaceRequiresTag = useCallback(
         (value: boolean) => {
-            Policy.setPolicyRequiresTag(route.params.policyID, value);
+            Tag.setPolicyRequiresTag(policyID, value);
         },
-        [route.params.policyID],
+        [policyID],
+    );
+
+    const getTagsSettings = (policy: OnyxEntry<OnyxTypes.Policy>) => (
+        <View style={styles.flexGrow1}>
+            <OfflineWithFeedback
+                errors={policy?.errorFields?.requiresTag}
+                pendingAction={policy?.pendingFields?.requiresTag}
+                errorRowStyles={styles.mh5}
+            >
+                <View style={[styles.mt2, styles.mh4]}>
+                    <View style={[styles.flexRow, styles.mb5, styles.mr2, styles.alignItemsCenter, styles.justifyContentBetween]}>
+                        <Text style={[styles.textNormal]}>{translate('workspace.tags.requiresTag')}</Text>
+                        <Switch
+                            isOn={policy?.requiresTag ?? false}
+                            accessibilityLabel={translate('workspace.tags.requiresTag')}
+                            onToggle={updateWorkspaceRequiresTag}
+                            disabled={!policy?.areTagsEnabled || !hasEnabledOptions}
+                        />
+                    </View>
+                </View>
+            </OfflineWithFeedback>
+            {!isMultiLevelTags && (
+                <OfflineWithFeedback
+                    errors={policyTags?.[policyTagLists[0]?.name]?.errors}
+                    onClose={() => Tag.clearPolicyTagListErrors(policyID, policyTagLists[0].orderWeight)}
+                    pendingAction={policyTags?.[policyTagLists[0]?.name]?.pendingAction}
+                    errorRowStyles={styles.mh5}
+                >
+                    <MenuItemWithTopDescription
+                        title={policyTagLists[0]?.name}
+                        description={translate(`workspace.tags.customTagName`)}
+                        onPress={() => Navigation.navigate(ROUTES.WORKSPACE_EDIT_TAGS.getRoute(policyID, policyTagLists[0].orderWeight))}
+                        shouldShowRightIcon
+                    />
+                </OfflineWithFeedback>
+            )}
+        </View>
     );
     return (
         <AccessOrNotFoundWrapper
             accessVariants={[CONST.POLICY.ACCESS_VARIANTS.ADMIN, CONST.POLICY.ACCESS_VARIANTS.PAID]}
-            policyID={route.params.policyID}
+            policyID={policyID}
             featureName={CONST.POLICY.MORE_FEATURES.ARE_TAGS_ENABLED}
         >
             {({policy}) => (
@@ -52,36 +95,7 @@ function WorkspaceTagsSettingsPage({route, policyTags}: WorkspaceTagsSettingsPag
                     testID={WorkspaceTagsSettingsPage.displayName}
                 >
                     <HeaderWithBackButton title={translate('common.settings')} />
-                    <View style={styles.flexGrow1}>
-                        <OfflineWithFeedback
-                            errors={policy?.errorFields?.requiresTag}
-                            pendingAction={policy?.pendingFields?.requiresTag}
-                            errorRowStyles={styles.mh5}
-                        >
-                            <View style={[styles.mt2, styles.mh4]}>
-                                <View style={[styles.flexRow, styles.mb5, styles.mr2, styles.alignItemsCenter, styles.justifyContentBetween]}>
-                                    <Text style={[styles.textNormal, styles.colorMuted]}>{translate('workspace.tags.requiresTag')}</Text>
-                                    <Switch
-                                        isOn={policy?.requiresTag ?? false}
-                                        accessibilityLabel={translate('workspace.tags.requiresTag')}
-                                        onToggle={updateWorkspaceRequiresTag}
-                                    />
-                                </View>
-                            </View>
-                        </OfflineWithFeedback>
-                        <OfflineWithFeedback
-                            errors={policyTags?.[policyTagName]?.errors}
-                            pendingAction={policyTags?.[policyTagName]?.pendingAction}
-                            errorRowStyles={styles.mh5}
-                        >
-                            <MenuItemWithTopDescription
-                                title={policyTagName}
-                                description={translate(`workspace.tags.customTagName`)}
-                                onPress={() => Navigation.navigate(ROUTES.WORKSPACE_EDIT_TAGS.getRoute(route.params.policyID))}
-                                shouldShowRightIcon
-                            />
-                        </OfflineWithFeedback>
-                    </View>
+                    {isOffline && isLoading ? <FullPageOfflineBlockingView>{getTagsSettings(policy)}</FullPageOfflineBlockingView> : getTagsSettings(policy)}
                 </ScreenWrapper>
             )}
         </AccessOrNotFoundWrapper>
diff --git a/src/pages/workspace/tags/WorkspaceViewTagsPage.tsx b/src/pages/workspace/tags/WorkspaceViewTagsPage.tsx
new file mode 100644
index 000000000000..752da36394d0
--- /dev/null
+++ b/src/pages/workspace/tags/WorkspaceViewTagsPage.tsx
@@ -0,0 +1,335 @@
+import {useIsFocused} from '@react-navigation/native';
+import type {StackScreenProps} from '@react-navigation/stack';
+import React, {useCallback, useEffect, useMemo, useRef, useState} from 'react';
+import {ActivityIndicator, View} from 'react-native';
+import {useOnyx} from 'react-native-onyx';
+import ButtonWithDropdownMenu from '@components/ButtonWithDropdownMenu';
+import type {DropdownOption} from '@components/ButtonWithDropdownMenu/types';
+import ConfirmModal from '@components/ConfirmModal';
+import HeaderWithBackButton from '@components/HeaderWithBackButton';
+import * as Expensicons from '@components/Icon/Expensicons';
+import MenuItemWithTopDescription from '@components/MenuItemWithTopDescription';
+import OfflineWithFeedback from '@components/OfflineWithFeedback';
+import ScreenWrapper from '@components/ScreenWrapper';
+import ListItemRightCaretWithLabel from '@components/SelectionList/ListItemRightCaretWithLabel';
+import TableListItem from '@components/SelectionList/TableListItem';
+import SelectionListWithModal from '@components/SelectionListWithModal';
+import Text from '@components/Text';
+import useLocalize from '@hooks/useLocalize';
+import useNetwork from '@hooks/useNetwork';
+import usePolicy from '@hooks/usePolicy';
+import useResponsiveLayout from '@hooks/useResponsiveLayout';
+import useStyleUtils from '@hooks/useStyleUtils';
+import useTheme from '@hooks/useTheme';
+import useThemeStyles from '@hooks/useThemeStyles';
+import {turnOffMobileSelectionMode} from '@libs/actions/MobileSelectionMode';
+import * as DeviceCapabilities from '@libs/DeviceCapabilities';
+import localeCompare from '@libs/LocaleCompare';
+import Navigation from '@libs/Navigation/Navigation';
+import * as PolicyUtils from '@libs/PolicyUtils';
+import type {SettingsNavigatorParamList} from '@navigation/types';
+import NotFoundPage from '@pages/ErrorPage/NotFoundPage';
+import AccessOrNotFoundWrapper from '@pages/workspace/AccessOrNotFoundWrapper';
+import ToggleSettingOptionRow from '@pages/workspace/workflows/ToggleSettingsOptionRow';
+import * as Tag from '@userActions/Policy/Tag';
+import CONST from '@src/CONST';
+import ONYXKEYS from '@src/ONYXKEYS';
+import ROUTES from '@src/ROUTES';
+import type SCREENS from '@src/SCREENS';
+import type DeepValueOf from '@src/types/utils/DeepValueOf';
+import type {TagListItem} from './types';
+
+type WorkspaceViewTagsProps = StackScreenProps<SettingsNavigatorParamList, typeof SCREENS.WORKSPACE.TAG_LIST_VIEW>;
+
+function WorkspaceViewTagsPage({route}: WorkspaceViewTagsProps) {
+    const {shouldUseNarrowLayout, isSmallScreenWidth} = useResponsiveLayout();
+    const styles = useThemeStyles();
+    const StyleUtils = useStyleUtils();
+    const theme = useTheme();
+    const {translate} = useLocalize();
+    const [selectedTags, setSelectedTags] = useState<Record<string, boolean>>({});
+    const dropdownButtonRef = useRef(null);
+    const [isDeleteTagsConfirmModalVisible, setIsDeleteTagsConfirmModalVisible] = useState(false);
+    const isFocused = useIsFocused();
+    const policyID = route.params.policyID ?? '-1';
+    const policy = usePolicy(policyID);
+    const [policyTags] = useOnyx(`${ONYXKEYS.COLLECTION.POLICY_TAGS}${policyID}`);
+    const [selectionMode] = useOnyx(ONYXKEYS.MOBILE_SELECTION_MODE);
+    const currentTagListName = useMemo(() => PolicyUtils.getTagListName(policyTags, route.params.orderWeight), [policyTags, route.params.orderWeight]);
+    const currentPolicyTag = policyTags?.[currentTagListName];
+
+    const fetchTags = useCallback(() => {
+        Tag.openPolicyTagsPage(policyID);
+    }, [policyID]);
+
+    const {isOffline} = useNetwork({onReconnect: fetchTags});
+    const canSelectMultiple = isSmallScreenWidth ? selectionMode?.isEnabled : true;
+
+    useEffect(() => {
+        if (isFocused) {
+            return;
+        }
+        setSelectedTags({});
+
+        return () => {
+            setSelectedTags({});
+            turnOffMobileSelectionMode();
+        };
+    }, [isFocused]);
+
+    const tagList = useMemo<TagListItem[]>(
+        () =>
+            Object.values(currentPolicyTag?.tags ?? {})
+                .sort((tagA, tagB) => localeCompare(tagA.name, tagB.name))
+                .map((tag) => ({
+                    value: tag.name,
+                    text: PolicyUtils.getCleanedTagName(tag.name),
+                    keyForList: tag.name,
+                    isSelected: selectedTags[tag.name] && canSelectMultiple,
+                    pendingAction: tag.pendingAction,
+                    errors: tag.errors ?? undefined,
+                    enabled: tag.enabled,
+                    isDisabled: tag.pendingAction === CONST.RED_BRICK_ROAD_PENDING_ACTION.DELETE,
+                    rightElement: <ListItemRightCaretWithLabel labelText={tag.enabled ? translate('workspace.common.enabled') : translate('workspace.common.disabled')} />,
+                })),
+        [currentPolicyTag, selectedTags, canSelectMultiple, translate],
+    );
+
+    const hasDependentTags = useMemo(() => PolicyUtils.hasDependentTags(policy, policyTags), [policy, policyTags]);
+
+    const tagListKeyedByName = useMemo(
+        () =>
+            tagList.reduce<Record<string, TagListItem>>((acc, tag) => {
+                acc[tag.value] = tag;
+                return acc;
+            }, {}),
+        [tagList],
+    );
+
+    if (!currentPolicyTag) {
+        return <NotFoundPage />;
+    }
+
+    const toggleTag = (tag: TagListItem) => {
+        setSelectedTags((prev) => ({
+            ...prev,
+            [tag.value]: !prev[tag.value],
+        }));
+    };
+
+    const toggleAllTags = () => {
+        const isAllSelected = tagList.every((tag) => !!selectedTags[tag.value]);
+        setSelectedTags(isAllSelected ? {} : Object.fromEntries(tagList.map((item) => [item.value, true])));
+    };
+
+    const getCustomListHeader = () => {
+        const header = (
+            <View style={[styles.flex1, styles.flexRow, styles.justifyContentBetween, canSelectMultiple && styles.ml3]}>
+                <View>
+                    <Text style={[styles.searchInputStyle]}>{translate('common.name')}</Text>
+                </View>
+                <View style={[StyleUtils.getMinimumWidth(60)]}>
+                    <Text style={[styles.searchInputStyle, styles.textAlignCenter]}>{translate('statusPage.status')}</Text>
+                </View>
+            </View>
+        );
+        if (canSelectMultiple) {
+            return header;
+        }
+        return <View style={[styles.peopleRow, styles.userSelectNone, styles.ph9, styles.pt3, styles.pb5]}>{header}</View>;
+    };
+
+    const navigateToTagSettings = (tag: TagListItem) => {
+        Navigation.navigate(ROUTES.WORKSPACE_TAG_SETTINGS.getRoute(policyID, route.params.orderWeight, tag.value));
+    };
+
+    const selectedTagsArray = Object.keys(selectedTags).filter((key) => selectedTags[key]);
+
+    const deleteTags = () => {
+        setSelectedTags({});
+        Tag.deletePolicyTags(policyID, selectedTagsArray);
+        setIsDeleteTagsConfirmModalVisible(false);
+    };
+
+    const isLoading = !isOffline && policyTags === undefined;
+
+    const getHeaderButtons = () => {
+        if ((!isSmallScreenWidth && selectedTagsArray.length === 0) || (isSmallScreenWidth && !selectionMode?.isEnabled)) {
+            return null;
+        }
+
+        const options: Array<DropdownOption<DeepValueOf<typeof CONST.POLICY.BULK_ACTION_TYPES>>> = [];
+        const isThereAnyAccountingConnection = Object.keys(policy?.connections ?? {}).length !== 0;
+        const isMultiLevelTags = PolicyUtils.isMultiLevelTags(policyTags);
+
+        if (!isThereAnyAccountingConnection && !isMultiLevelTags && selectedTagsArray.length > 0) {
+            options.push({
+                icon: Expensicons.Trashcan,
+                text: translate(selectedTagsArray.length === 1 ? 'workspace.tags.deleteTag' : 'workspace.tags.deleteTags'),
+                value: CONST.POLICY.BULK_ACTION_TYPES.DELETE,
+                onSelected: () => setIsDeleteTagsConfirmModalVisible(true),
+            });
+        }
+
+        let enabledTagCount = 0;
+        const tagsToDisable: Record<string, {name: string; enabled: boolean}> = {};
+        let disabledTagCount = 0;
+        const tagsToEnable: Record<string, {name: string; enabled: boolean}> = {};
+        for (const tagName of selectedTagsArray) {
+            if (tagListKeyedByName[tagName]?.enabled) {
+                enabledTagCount++;
+                tagsToDisable[tagName] = {
+                    name: tagName,
+                    enabled: false,
+                };
+            } else {
+                disabledTagCount++;
+                tagsToEnable[tagName] = {
+                    name: tagName,
+                    enabled: true,
+                };
+            }
+        }
+
+        if (enabledTagCount > 0) {
+            options.push({
+                icon: Expensicons.DocumentSlash,
+                text: translate(enabledTagCount === 1 ? 'workspace.tags.disableTag' : 'workspace.tags.disableTags'),
+                value: CONST.POLICY.BULK_ACTION_TYPES.DISABLE,
+                onSelected: () => {
+                    setSelectedTags({});
+                    Tag.setWorkspaceTagEnabled(policyID, tagsToDisable, route.params.orderWeight);
+                },
+            });
+        }
+
+        if (disabledTagCount > 0) {
+            options.push({
+                icon: Expensicons.Document,
+                text: translate(disabledTagCount === 1 ? 'workspace.tags.enableTag' : 'workspace.tags.enableTags'),
+                value: CONST.POLICY.BULK_ACTION_TYPES.ENABLE,
+                onSelected: () => {
+                    setSelectedTags({});
+                    Tag.setWorkspaceTagEnabled(policyID, tagsToEnable, route.params.orderWeight);
+                },
+            });
+        }
+
+        return (
+            <ButtonWithDropdownMenu
+                buttonRef={dropdownButtonRef}
+                onPress={() => null}
+                shouldAlwaysShowDropdownMenu
+                pressOnEnter
+                isSplitButton={false}
+                buttonSize={CONST.DROPDOWN_BUTTON_SIZE.MEDIUM}
+                customText={translate('workspace.common.selected', {selectedNumber: selectedTagsArray.length})}
+                options={options}
+                style={[shouldUseNarrowLayout && styles.flexGrow1, shouldUseNarrowLayout && styles.mb3]}
+                isDisabled={!selectedTagsArray.length}
+            />
+        );
+    };
+
+    const navigateToEditTag = () => {
+        Navigation.navigate(ROUTES.WORKSPACE_EDIT_TAGS.getRoute(route.params.policyID, currentPolicyTag?.orderWeight));
+    };
+
+    const selectionModeHeader = selectionMode?.isEnabled && isSmallScreenWidth;
+
+    return (
+        <AccessOrNotFoundWrapper
+            policyID={policyID}
+            accessVariants={[CONST.POLICY.ACCESS_VARIANTS.ADMIN, CONST.POLICY.ACCESS_VARIANTS.PAID]}
+            featureName={CONST.POLICY.MORE_FEATURES.ARE_TAGS_ENABLED}
+        >
+            <ScreenWrapper
+                includeSafeAreaPaddingBottom={false}
+                shouldEnableMaxHeight
+                testID={WorkspaceViewTagsPage.displayName}
+            >
+                <HeaderWithBackButton
+                    title={selectionModeHeader ? translate('common.selectMultiple') : currentTagListName}
+                    onBackButtonPress={() => {
+                        if (selectionMode?.isEnabled) {
+                            setSelectedTags({});
+                            turnOffMobileSelectionMode();
+                            return;
+                        }
+                        Navigation.goBack();
+                    }}
+                >
+                    {!shouldUseNarrowLayout && getHeaderButtons()}
+                </HeaderWithBackButton>
+                {shouldUseNarrowLayout && <View style={[styles.pl5, styles.pr5]}>{getHeaderButtons()}</View>}
+                <ConfirmModal
+                    isVisible={isDeleteTagsConfirmModalVisible}
+                    onConfirm={deleteTags}
+                    onCancel={() => setIsDeleteTagsConfirmModalVisible(false)}
+                    title={translate(selectedTagsArray.length === 1 ? 'workspace.tags.deleteTag' : 'workspace.tags.deleteTags')}
+                    prompt={translate(selectedTagsArray.length === 1 ? 'workspace.tags.deleteTagConfirmation' : 'workspace.tags.deleteTagsConfirmation')}
+                    confirmText={translate('common.delete')}
+                    cancelText={translate('common.cancel')}
+                    danger
+                />
+                {!hasDependentTags && (
+                    <View style={[styles.pv4, styles.ph5]}>
+                        <ToggleSettingOptionRow
+                            title={translate('common.required')}
+                            switchAccessibilityLabel={translate('common.required')}
+                            isActive={!!currentPolicyTag?.required}
+                            onToggle={(on) => Tag.setPolicyTagsRequired(policyID, on, route.params.orderWeight)}
+                            pendingAction={currentPolicyTag.pendingFields?.required}
+                            errors={currentPolicyTag?.errorFields?.required ?? undefined}
+                            onCloseError={() => Tag.clearPolicyTagListErrorField(policyID, route.params.orderWeight, 'required')}
+                            disabled={!currentPolicyTag?.required && !Object.values(currentPolicyTag?.tags ?? {}).some((tag) => tag.enabled)}
+                        />
+                    </View>
+                )}
+                <OfflineWithFeedback
+                    errors={currentPolicyTag.errors}
+                    onClose={() => Tag.clearPolicyTagListErrors(policyID, currentPolicyTag.orderWeight)}
+                    pendingAction={currentPolicyTag.pendingAction}
+                    errorRowStyles={styles.mh5}
+                >
+                    <MenuItemWithTopDescription
+                        title={PolicyUtils.getCleanedTagName(currentPolicyTag.name)}
+                        description={translate(`workspace.tags.customTagName`)}
+                        onPress={navigateToEditTag}
+                        shouldShowRightIcon
+                    />
+                </OfflineWithFeedback>
+                {isLoading && (
+                    <ActivityIndicator
+                        size={CONST.ACTIVITY_INDICATOR_SIZE.LARGE}
+                        style={[styles.flex1]}
+                        color={theme.spinner}
+                    />
+                )}
+                {tagList.length > 0 && !isLoading && (
+                    <SelectionListWithModal
+                        canSelectMultiple={canSelectMultiple}
+                        turnOnSelectionModeOnLongPress
+                        onTurnOnSelectionMode={(item) => item && toggleTag(item)}
+                        sections={[{data: tagList, isDisabled: false}]}
+                        onCheckboxPress={toggleTag}
+                        onSelectRow={navigateToTagSettings}
+                        onSelectAll={toggleAllTags}
+                        showScrollIndicator
+                        ListItem={TableListItem}
+                        customListHeader={getCustomListHeader()}
+                        shouldPreventDefaultFocusOnSelectRow={!DeviceCapabilities.canUseTouchScreen()}
+                        listHeaderWrapperStyle={[styles.ph9, styles.pv3, styles.pb5]}
+                        onDismissError={(item) => {
+                            Tag.clearPolicyTagErrors(policyID, item.value, route.params.orderWeight);
+                        }}
+                    />
+                )}
+            </ScreenWrapper>
+        </AccessOrNotFoundWrapper>
+    );
+}
+
+WorkspaceViewTagsPage.displayName = 'WorkspaceViewTagsPage';
+
+export default WorkspaceViewTagsPage;
diff --git a/src/pages/workspace/tags/types.ts b/src/pages/workspace/tags/types.ts
new file mode 100644
index 000000000000..cae0e5c4e3dd
--- /dev/null
+++ b/src/pages/workspace/tags/types.ts
@@ -0,0 +1,36 @@
+import type {ListItem} from '@components/SelectionList/types';
+import type {Errors, PendingAction} from '@src/types/onyx/OnyxCommon';
+
+type TagListItem = ListItem & {
+    value: string;
+    enabled: boolean;
+    orderWeight?: number;
+};
+
+type PolicyTag = {
+    name: string;
+    enabled: boolean;
+    previousTagName?: string;
+    /** "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;
+    errors?: Errors | null;
+    rules?: {
+        parentTagsFilter?: string;
+    };
+    parentTagsFilter?: string;
+    pendingAction?: PendingAction | null;
+};
+
+type PolicyTags = Record<string, PolicyTag>;
+
+type PolicyTagList = {
+    name: string;
+    orderWeight: number;
+    required: boolean;
+    tags: PolicyTags;
+    pendingAction?: PendingAction | null;
+};
+
+// eslint-disable-next-line import/prefer-default-export
+export type {TagListItem, PolicyTag, PolicyTagList};
diff --git a/src/pages/workspace/taxes/NamePage.tsx b/src/pages/workspace/taxes/NamePage.tsx
index dfcad933b7b0..0fb495a04574 100644
--- a/src/pages/workspace/taxes/NamePage.tsx
+++ b/src/pages/workspace/taxes/NamePage.tsx
@@ -1,5 +1,4 @@
 import type {StackScreenProps} from '@react-navigation/stack';
-import ExpensiMark from 'expensify-common/lib/ExpensiMark';
 import React, {useCallback, useState} from 'react';
 import {View} from 'react-native';
 import FormProvider from '@components/Form/FormProvider';
@@ -14,6 +13,7 @@ import useThemeStyles from '@hooks/useThemeStyles';
 import {renamePolicyTax, validateTaxName} from '@libs/actions/TaxRate';
 import Navigation from '@libs/Navigation/Navigation';
 import type {SettingsNavigatorParamList} from '@libs/Navigation/types';
+import Parser from '@libs/Parser';
 import * as PolicyUtils from '@libs/PolicyUtils';
 import NotFoundPage from '@pages/ErrorPage/NotFoundPage';
 import AccessOrNotFoundWrapper from '@pages/workspace/AccessOrNotFoundWrapper';
@@ -27,8 +27,6 @@ import INPUT_IDS from '@src/types/form/WorkspaceTaxNameForm';
 
 type NamePageProps = WithPolicyAndFullscreenLoadingProps & StackScreenProps<SettingsNavigatorParamList, typeof SCREENS.WORKSPACE.TAX_NAME>;
 
-const parser = new ExpensiMark();
-
 function NamePage({
     route: {
         params: {policyID, taxID},
@@ -40,12 +38,16 @@ function NamePage({
     const currentTaxRate = PolicyUtils.getTaxByID(policy, taxID);
     const {inputCallbackRef} = useAutoFocusInput();
 
-    const [name, setName] = useState(() => parser.htmlToMarkdown(currentTaxRate?.name ?? ''));
+    const [name, setName] = useState(() => Parser.htmlToMarkdown(currentTaxRate?.name ?? ''));
 
-    const goBack = useCallback(() => Navigation.goBack(ROUTES.WORKSPACE_TAX_EDIT.getRoute(policyID ?? '', taxID)), [policyID, taxID]);
+    const goBack = useCallback(() => Navigation.goBack(ROUTES.WORKSPACE_TAX_EDIT.getRoute(policyID ?? '-1', taxID)), [policyID, taxID]);
 
     const submit = () => {
-        renamePolicyTax(policyID, taxID, name);
+        const taxName = name.trim();
+        // Do not call the API if the edited tax name is the same as the current tag name
+        if (currentTaxRate?.name !== taxName) {
+            renamePolicyTax(policyID, taxID, taxName);
+        }
         goBack();
     };
 
diff --git a/src/pages/workspace/taxes/ValuePage.tsx b/src/pages/workspace/taxes/ValuePage.tsx
index d73e5997a5ed..5b724d625e5b 100644
--- a/src/pages/workspace/taxes/ValuePage.tsx
+++ b/src/pages/workspace/taxes/ValuePage.tsx
@@ -38,14 +38,18 @@ function ValuePage({
     const currentTaxRate = PolicyUtils.getTaxByID(policy, taxID);
     const defaultValue = currentTaxRate?.value?.replace('%', '');
 
-    const goBack = useCallback(() => Navigation.goBack(ROUTES.WORKSPACE_TAX_EDIT.getRoute(policyID ?? '', taxID)), [policyID, taxID]);
+    const goBack = useCallback(() => Navigation.goBack(ROUTES.WORKSPACE_TAX_EDIT.getRoute(policyID ?? '-1', taxID)), [policyID, taxID]);
 
     const submit = useCallback(
         (values: FormOnyxValues<typeof ONYXKEYS.FORMS.WORKSPACE_TAX_VALUE_FORM>) => {
+            if (defaultValue === values.value) {
+                goBack();
+                return;
+            }
             updatePolicyTaxValue(policyID, taxID, Number(values.value));
             goBack();
         },
-        [goBack, policyID, taxID],
+        [goBack, policyID, taxID, defaultValue],
     );
 
     if (!currentTaxRate) {
@@ -76,7 +80,6 @@ function ValuePage({
                     validate={validateTaxValue}
                     onSubmit={submit}
                     enabledWhenOffline
-                    disablePressOnEnter={false}
                     shouldHideFixErrorsAlert
                     submitFlexEnabled={false}
                     submitButtonStyles={[styles.mh5, styles.mt0]}
@@ -89,7 +92,7 @@ function ValuePage({
                         // The default currency uses 2 decimal places, so we substract it
                         extraDecimals={CONST.MAX_TAX_RATE_DECIMAL_PLACES - 2}
                         // We increase the amount max length to support the extra decimals.
-                        amountMaxLength={CONST.MAX_TAX_RATE_DECIMAL_PLACES + CONST.MAX_TAX_RATE_INTEGER_PLACES}
+                        amountMaxLength={CONST.MAX_TAX_RATE_INTEGER_PLACES}
                         extraSymbol={<Text style={styles.iouAmountText}>%</Text>}
                         ref={inputCallbackRef}
                     />
diff --git a/src/pages/workspace/taxes/WorkspaceCreateTaxPage.tsx b/src/pages/workspace/taxes/WorkspaceCreateTaxPage.tsx
index ab1b2f252f1e..4a31f7d16b1e 100644
--- a/src/pages/workspace/taxes/WorkspaceCreateTaxPage.tsx
+++ b/src/pages/workspace/taxes/WorkspaceCreateTaxPage.tsx
@@ -1,7 +1,9 @@
 import type {StackScreenProps} from '@react-navigation/stack';
 import React, {useCallback} from 'react';
 import {View} from 'react-native';
+import {useOnyx} from 'react-native-onyx';
 import AmountPicker from '@components/AmountPicker';
+import FullPageNotFoundView from '@components/BlockingViews/FullPageNotFoundView';
 import FormProvider from '@components/Form/FormProvider';
 import InputWrapper from '@components/Form/InputWrapper';
 import type {FormInputErrors, FormOnyxValues} from '@components/Form/types';
@@ -14,6 +16,7 @@ import useThemeStyles from '@hooks/useThemeStyles';
 import {createPolicyTax, getNextTaxCode, getTaxValueWithPercentage, validateTaxName, validateTaxValue} from '@libs/actions/TaxRate';
 import Navigation from '@libs/Navigation/Navigation';
 import type {SettingsNavigatorParamList} from '@libs/Navigation/types';
+import * as PolicyUtils from '@libs/PolicyUtils';
 import AccessOrNotFoundWrapper from '@pages/workspace/AccessOrNotFoundWrapper';
 import type {WithPolicyAndFullscreenLoadingProps} from '@pages/workspace/withPolicyAndFullscreenLoading';
 import withPolicyAndFullscreenLoading from '@pages/workspace/withPolicyAndFullscreenLoading';
@@ -33,6 +36,7 @@ function WorkspaceCreateTaxPage({
 }: WorkspaceCreateTaxPageProps) {
     const styles = useThemeStyles();
     const {translate} = useLocalize();
+    const [modal] = useOnyx(ONYXKEYS.MODAL);
 
     const submitForm = useCallback(
         ({value, ...values}: FormOnyxValues<typeof ONYXKEYS.FORMS.WORKSPACE_NEW_TAX_FORM>) => {
@@ -71,47 +75,48 @@ function WorkspaceCreateTaxPage({
                 includeSafeAreaPaddingBottom={false}
                 style={[styles.defaultModalContainer]}
             >
-                <View style={[styles.h100, styles.flex1, styles.justifyContentBetween]}>
-                    <HeaderWithBackButton title={translate('workspace.taxes.addRate')} />
-                    <FormProvider
-                        style={[styles.flexGrow1, styles.mh5]}
-                        formID={ONYXKEYS.FORMS.WORKSPACE_NEW_TAX_FORM}
-                        onSubmit={submitForm}
-                        validate={validateForm}
-                        submitButtonText={translate('common.save')}
-                        enabledWhenOffline
-                        shouldValidateOnBlur={false}
-                        disablePressOnEnter={false}
-                    >
-                        <View style={styles.mhn5}>
-                            <InputWrapper
-                                InputComponent={TextPicker}
-                                inputID={INPUT_IDS.NAME}
-                                label={translate('common.name')}
-                                description={translate('common.name')}
-                                rightLabel={translate('common.required')}
-                                accessibilityLabel={translate('workspace.editor.nameInputLabel')}
-                                maxLength={CONST.TAX_RATES.NAME_MAX_LENGTH}
-                                multiline={false}
-                                role={CONST.ROLE.PRESENTATION}
-                                autoFocus
-                            />
-                            <InputWrapper
-                                InputComponent={AmountPicker}
-                                inputID={INPUT_IDS.VALUE}
-                                title={(v) => (v ? getTaxValueWithPercentage(v) : '')}
-                                description={translate('workspace.taxes.value')}
-                                rightLabel={translate('common.required')}
-                                hideCurrencySymbol
-                                // The default currency uses 2 decimal places, so we substract it
-                                extraDecimals={CONST.MAX_TAX_RATE_DECIMAL_PLACES - 2}
-                                // We increase the amount max length to support the extra decimals.
-                                amountMaxLength={CONST.MAX_TAX_RATE_DECIMAL_PLACES + CONST.MAX_TAX_RATE_INTEGER_PLACES}
-                                extraSymbol={<Text style={styles.iouAmountText}>%</Text>}
-                            />
-                        </View>
-                    </FormProvider>
-                </View>
+                <FullPageNotFoundView shouldShow={PolicyUtils.hasAccountingConnections(policy)}>
+                    <View style={[styles.h100, styles.flex1, styles.justifyContentBetween]}>
+                        <HeaderWithBackButton title={translate('workspace.taxes.addRate')} />
+                        <FormProvider
+                            style={[styles.flexGrow1, styles.mh5]}
+                            formID={ONYXKEYS.FORMS.WORKSPACE_NEW_TAX_FORM}
+                            onSubmit={submitForm}
+                            validate={validateForm}
+                            submitButtonText={translate('common.save')}
+                            enabledWhenOffline
+                            shouldValidateOnBlur={false}
+                            disablePressOnEnter={!!modal?.isVisible}
+                        >
+                            <View style={styles.mhn5}>
+                                <InputWrapper
+                                    InputComponent={TextPicker}
+                                    inputID={INPUT_IDS.NAME}
+                                    label={translate('common.name')}
+                                    description={translate('common.name')}
+                                    rightLabel={translate('common.required')}
+                                    accessibilityLabel={translate('workspace.editor.nameInputLabel')}
+                                    maxLength={CONST.TAX_RATES.NAME_MAX_LENGTH}
+                                    multiline={false}
+                                    role={CONST.ROLE.PRESENTATION}
+                                />
+                                <InputWrapper
+                                    InputComponent={AmountPicker}
+                                    inputID={INPUT_IDS.VALUE}
+                                    title={(v) => (v ? getTaxValueWithPercentage(v) : '')}
+                                    description={translate('workspace.taxes.value')}
+                                    rightLabel={translate('common.required')}
+                                    hideCurrencySymbol
+                                    // The default currency uses 2 decimal places, so we substract it
+                                    extraDecimals={CONST.MAX_TAX_RATE_DECIMAL_PLACES - 2}
+                                    // We increase the amount max length to support the extra decimals.
+                                    amountMaxLength={CONST.MAX_TAX_RATE_INTEGER_PLACES}
+                                    extraSymbol={<Text style={styles.iouAmountText}>%</Text>}
+                                />
+                            </View>
+                        </FormProvider>
+                    </View>
+                </FullPageNotFoundView>
             </ScreenWrapper>
         </AccessOrNotFoundWrapper>
     );
diff --git a/src/pages/workspace/taxes/WorkspaceEditTaxPage.tsx b/src/pages/workspace/taxes/WorkspaceEditTaxPage.tsx
index 8ccff7b4e126..0f50ed8fe0b8 100644
--- a/src/pages/workspace/taxes/WorkspaceEditTaxPage.tsx
+++ b/src/pages/workspace/taxes/WorkspaceEditTaxPage.tsx
@@ -1,10 +1,10 @@
 import type {StackScreenProps} from '@react-navigation/stack';
-import React, {useMemo, useState} from 'react';
+import React, {useEffect, useState} from 'react';
 import {View} from 'react-native';
 import ConfirmModal from '@components/ConfirmModal';
 import HeaderWithBackButton from '@components/HeaderWithBackButton';
-import type {ThreeDotsMenuItem} from '@components/HeaderWithBackButton/types';
 import * as Expensicons from '@components/Icon/Expensicons';
+import MenuItem from '@components/MenuItem';
 import MenuItemWithTopDescription from '@components/MenuItemWithTopDescription';
 import OfflineWithFeedback from '@components/OfflineWithFeedback';
 import ScreenWrapper from '@components/ScreenWrapper';
@@ -12,7 +12,6 @@ import Switch from '@components/Switch';
 import Text from '@components/Text';
 import useLocalize from '@hooks/useLocalize';
 import useThemeStyles from '@hooks/useThemeStyles';
-import useWindowDimensions from '@hooks/useWindowDimensions';
 import {clearTaxRateFieldError, deletePolicyTaxes, setPolicyTaxesEnabled} from '@libs/actions/TaxRate';
 import * as ErrorUtils from '@libs/ErrorUtils';
 import Navigation from '@libs/Navigation/Navigation';
@@ -36,10 +35,13 @@ function WorkspaceEditTaxPage({
 }: WorkspaceEditTaxPageBaseProps) {
     const styles = useThemeStyles();
     const {translate} = useLocalize();
-    const currentTaxRate = PolicyUtils.getTaxByID(policy, taxID);
-    const {windowWidth} = useWindowDimensions();
+    const currentTaxID = PolicyUtils.getCurrentTaxID(policy, taxID);
+    const currentTaxRate = currentTaxID && policy?.taxRates?.taxes?.[currentTaxID];
     const [isDeleteModalVisible, setIsDeleteModalVisible] = useState(false);
-    const canEdit = policy && PolicyUtils.canEditTaxRate(policy, taxID);
+    const canEditTaxRate = policy && PolicyUtils.canEditTaxRate(policy, currentTaxID ?? taxID);
+    const hasAccountingConnections = PolicyUtils.hasAccountingConnections(policy);
+
+    const shouldShowDeleteMenuItem = canEditTaxRate && !hasAccountingConnections;
 
     const toggleTaxRate = () => {
         if (!currentTaxRate) {
@@ -48,6 +50,13 @@ function WorkspaceEditTaxPage({
         setPolicyTaxesEnabled(policyID, [taxID], !!currentTaxRate.isDisabled);
     };
 
+    useEffect(() => {
+        if (currentTaxID === taxID || !currentTaxID) {
+            return;
+        }
+        Navigation.setParams({taxID: currentTaxID});
+    }, [taxID, currentTaxID]);
+
     const deleteTaxRate = () => {
         if (!policyID) {
             return;
@@ -57,20 +66,10 @@ function WorkspaceEditTaxPage({
         Navigation.goBack();
     };
 
-    const threeDotsMenuItems: ThreeDotsMenuItem[] = useMemo(
-        () => [
-            {
-                icon: Expensicons.Trashcan,
-                text: translate('common.delete'),
-                onSelected: () => setIsDeleteModalVisible(true),
-            },
-        ],
-        [translate],
-    );
-
     if (!currentTaxRate) {
         return <NotFoundPage />;
     }
+    const taxCodeToShow = PolicyUtils.isControlPolicy(policy) ? taxID : '';
 
     return (
         <AccessOrNotFoundWrapper
@@ -83,12 +82,7 @@ function WorkspaceEditTaxPage({
                 style={styles.mb5}
             >
                 <View style={[styles.h100, styles.flex1]}>
-                    <HeaderWithBackButton
-                        title={currentTaxRate?.name}
-                        threeDotsMenuItems={threeDotsMenuItems}
-                        shouldShowThreeDotsButton={!!canEdit}
-                        threeDotsAnchorPosition={styles.threeDotsPopoverOffsetNoCloseButton(windowWidth)}
-                    />
+                    <HeaderWithBackButton title={currentTaxRate?.name} />
                     <OfflineWithFeedback
                         errors={ErrorUtils.getLatestErrorField(currentTaxRate, 'isDisabled')}
                         pendingAction={currentTaxRate?.pendingFields?.isDisabled}
@@ -102,7 +96,7 @@ function WorkspaceEditTaxPage({
                                     isOn={!currentTaxRate?.isDisabled}
                                     accessibilityLabel={translate('workspace.taxes.actions.enable')}
                                     onToggle={toggleTaxRate}
-                                    disabled={!canEdit}
+                                    disabled={!canEditTaxRate}
                                 />
                             </View>
                         </View>
@@ -137,6 +131,40 @@ function WorkspaceEditTaxPage({
                             onPress={() => Navigation.navigate(ROUTES.WORKSPACE_TAX_VALUE.getRoute(`${policyID}`, taxID))}
                         />
                     </OfflineWithFeedback>
+                    <OfflineWithFeedback
+                        errors={ErrorUtils.getLatestErrorField(currentTaxRate, 'code')}
+                        pendingAction={currentTaxRate?.pendingFields?.code}
+                        errorRowStyles={styles.mh5}
+                        onClose={() => clearTaxRateFieldError(policyID, taxID, 'code')}
+                    >
+                        <MenuItemWithTopDescription
+                            shouldShowRightIcon
+                            title={taxCodeToShow}
+                            description={translate('workspace.taxes.taxCode')}
+                            style={[styles.moneyRequestMenuItem]}
+                            titleStyle={styles.flex1}
+                            onPress={() => {
+                                if (!PolicyUtils.isControlPolicy(policy)) {
+                                    Navigation.navigate(
+                                        ROUTES.WORKSPACE_UPGRADE.getRoute(
+                                            policyID,
+                                            CONST.UPGRADE_FEATURE_INTRO_MAPPING.taxCodes.alias,
+                                            ROUTES.WORKSPACE_TAX_CODE.getRoute(`${policyID}`, taxID),
+                                        ),
+                                    );
+                                    return;
+                                }
+                                Navigation.navigate(ROUTES.WORKSPACE_TAX_CODE.getRoute(`${policyID}`, taxID));
+                            }}
+                        />
+                    </OfflineWithFeedback>
+                    {shouldShowDeleteMenuItem && (
+                        <MenuItem
+                            icon={Expensicons.Trashcan}
+                            title={translate('common.delete')}
+                            onPress={() => setIsDeleteModalVisible(true)}
+                        />
+                    )}
                 </View>
                 <ConfirmModal
                     title={translate('workspace.taxes.actions.delete')}
diff --git a/src/pages/workspace/taxes/WorkspaceTaxCodePage.tsx b/src/pages/workspace/taxes/WorkspaceTaxCodePage.tsx
new file mode 100644
index 000000000000..e9005a8a58f2
--- /dev/null
+++ b/src/pages/workspace/taxes/WorkspaceTaxCodePage.tsx
@@ -0,0 +1,108 @@
+import type {StackScreenProps} from '@react-navigation/stack';
+import React, {useCallback} from 'react';
+import {View} from 'react-native';
+import FormProvider from '@components/Form/FormProvider';
+import InputWrapper from '@components/Form/InputWrapper';
+import type {FormOnyxValues} from '@components/Form/types';
+import HeaderWithBackButton from '@components/HeaderWithBackButton';
+import ScreenWrapper from '@components/ScreenWrapper';
+import TextInput from '@components/TextInput';
+import useAutoFocusInput from '@hooks/useAutoFocusInput';
+import useLocalize from '@hooks/useLocalize';
+import usePolicy from '@hooks/usePolicy';
+import useThemeStyles from '@hooks/useThemeStyles';
+import {setPolicyTaxCode, validateTaxCode} from '@libs/actions/TaxRate';
+import Navigation from '@libs/Navigation/Navigation';
+import type {SettingsNavigatorParamList} from '@libs/Navigation/types';
+import AccessOrNotFoundWrapper from '@pages/workspace/AccessOrNotFoundWrapper';
+import CONST from '@src/CONST';
+import ONYXKEYS from '@src/ONYXKEYS';
+import ROUTES from '@src/ROUTES';
+import type SCREENS from '@src/SCREENS';
+import INPUT_IDS from '@src/types/form/WorkspaceTaxCodeForm';
+
+type WorkspaceTaxCodePageProps = StackScreenProps<SettingsNavigatorParamList, typeof SCREENS.WORKSPACE.TAX_CODE>;
+
+function WorkspaceTaxCodePage({route}: WorkspaceTaxCodePageProps) {
+    const styles = useThemeStyles();
+    const {translate} = useLocalize();
+    const policyID = route.params.policyID ?? '-1';
+    const currentTaxCode = route.params.taxID;
+
+    const policy = usePolicy(policyID);
+    const {inputCallbackRef} = useAutoFocusInput();
+
+    const setTaxCode = useCallback(
+        (values: FormOnyxValues<typeof ONYXKEYS.FORMS.WORKSPACE_TAX_CODE_FORM>) => {
+            const newTaxCode = values.taxCode.trim();
+            if (currentTaxCode === newTaxCode) {
+                Navigation.goBack(ROUTES.WORKSPACE_TAX_EDIT.getRoute(policyID, currentTaxCode));
+                return;
+            }
+
+            setPolicyTaxCode(policyID, currentTaxCode, newTaxCode);
+            Navigation.goBack(ROUTES.WORKSPACE_TAX_EDIT.getRoute(policyID, currentTaxCode));
+        },
+        [currentTaxCode, policyID],
+    );
+
+    const validate = useCallback(
+        (values: FormOnyxValues<typeof ONYXKEYS.FORMS.WORKSPACE_TAX_CODE_FORM>) => {
+            if (!policy) {
+                return {};
+            }
+            const newTaxCode = values.taxCode.trim();
+            if (newTaxCode === currentTaxCode) {
+                return {};
+            }
+
+            return validateTaxCode(policy, values);
+        },
+        [currentTaxCode, policy],
+    );
+
+    return (
+        <AccessOrNotFoundWrapper
+            accessVariants={[CONST.POLICY.ACCESS_VARIANTS.ADMIN, CONST.POLICY.ACCESS_VARIANTS.CONTROL]}
+            policyID={policyID}
+            featureName={CONST.POLICY.MORE_FEATURES.ARE_TAXES_ENABLED}
+        >
+            <ScreenWrapper
+                includeSafeAreaPaddingBottom={false}
+                shouldEnableMaxHeight
+                testID={WorkspaceTaxCodePage.displayName}
+            >
+                <HeaderWithBackButton
+                    title={translate('workspace.taxes.taxCode')}
+                    onBackButtonPress={() => Navigation.goBack(ROUTES.WORKSPACE_TAX_EDIT.getRoute(policyID, currentTaxCode))}
+                />
+
+                <FormProvider
+                    formID={ONYXKEYS.FORMS.WORKSPACE_TAX_CODE_FORM}
+                    submitButtonText={translate('workspace.editor.save')}
+                    style={[styles.flexGrow1, styles.ph5]}
+                    onSubmit={setTaxCode}
+                    enabledWhenOffline
+                    validate={validate}
+                >
+                    <View style={styles.mb4}>
+                        <InputWrapper
+                            InputComponent={TextInput}
+                            role={CONST.ROLE.PRESENTATION}
+                            inputID={INPUT_IDS.TAX_CODE}
+                            label={translate('workspace.taxes.taxCode')}
+                            accessibilityLabel={translate('workspace.taxes.taxCode')}
+                            defaultValue={currentTaxCode}
+                            maxLength={CONST.TAX_RATES.NAME_MAX_LENGTH}
+                            ref={inputCallbackRef}
+                        />
+                    </View>
+                </FormProvider>
+            </ScreenWrapper>
+        </AccessOrNotFoundWrapper>
+    );
+}
+
+WorkspaceTaxCodePage.displayName = 'WorkspaceTaxCodePage';
+
+export default WorkspaceTaxCodePage;
diff --git a/src/pages/workspace/taxes/WorkspaceTaxesPage.tsx b/src/pages/workspace/taxes/WorkspaceTaxesPage.tsx
index 91d54cb02055..02d807ed63d1 100644
--- a/src/pages/workspace/taxes/WorkspaceTaxesPage.tsx
+++ b/src/pages/workspace/taxes/WorkspaceTaxesPage.tsx
@@ -1,7 +1,8 @@
 import {useFocusEffect, useIsFocused} from '@react-navigation/native';
 import type {StackScreenProps} from '@react-navigation/stack';
-import React, {useCallback, useEffect, useMemo, useRef, useState} from 'react';
+import React, {useCallback, useEffect, useMemo, useState} from 'react';
 import {ActivityIndicator, View} from 'react-native';
+import {useOnyx} from 'react-native-onyx';
 import Button from '@components/Button';
 import ButtonWithDropdownMenu from '@components/ButtonWithDropdownMenu';
 import type {DropdownOption, WorkspaceTaxRatesBulkActionType} from '@components/ButtonWithDropdownMenu/types';
@@ -10,32 +11,36 @@ import HeaderWithBackButton from '@components/HeaderWithBackButton';
 import * as Expensicons from '@components/Icon/Expensicons';
 import * as Illustrations from '@components/Icon/Illustrations';
 import ScreenWrapper from '@components/ScreenWrapper';
-import SelectionList from '@components/SelectionList';
-import RightElementEnabledStatus from '@components/SelectionList/RightElementEnabledStatus';
+import ListItemRightCaretWithLabel from '@components/SelectionList/ListItemRightCaretWithLabel';
 import TableListItem from '@components/SelectionList/TableListItem';
 import type {ListItem} from '@components/SelectionList/types';
+import SelectionListWithModal from '@components/SelectionListWithModal';
 import Text from '@components/Text';
+import TextLink from '@components/TextLink';
+import useEnvironment from '@hooks/useEnvironment';
 import useLocalize from '@hooks/useLocalize';
 import useNetwork from '@hooks/useNetwork';
+import useResponsiveLayout from '@hooks/useResponsiveLayout';
 import useTheme from '@hooks/useTheme';
 import useThemeStyles from '@hooks/useThemeStyles';
-import useWindowDimensions from '@hooks/useWindowDimensions';
-import {openPolicyTaxesPage} from '@libs/actions/Policy';
+import {turnOffMobileSelectionMode} from '@libs/actions/MobileSelectionMode';
 import {clearTaxRateError, deletePolicyTaxes, setPolicyTaxesEnabled} from '@libs/actions/TaxRate';
 import * as DeviceCapabilities from '@libs/DeviceCapabilities';
 import * as ErrorUtils from '@libs/ErrorUtils';
 import Navigation from '@libs/Navigation/Navigation';
 import * as PolicyUtils from '@libs/PolicyUtils';
-import type {WorkspacesCentralPaneNavigatorParamList} from '@navigation/types';
+import type {FullScreenNavigatorParamList} from '@navigation/types';
 import AccessOrNotFoundWrapper from '@pages/workspace/AccessOrNotFoundWrapper';
 import withPolicyAndFullscreenLoading from '@pages/workspace/withPolicyAndFullscreenLoading';
 import type {WithPolicyAndFullscreenLoadingProps} from '@pages/workspace/withPolicyAndFullscreenLoading';
+import {openPolicyTaxesPage} from '@userActions/Policy/Policy';
 import CONST from '@src/CONST';
+import ONYXKEYS from '@src/ONYXKEYS';
 import ROUTES from '@src/ROUTES';
 import type SCREENS from '@src/SCREENS';
 import type {TaxRate} from '@src/types/onyx';
 
-type WorkspaceTaxesPageProps = WithPolicyAndFullscreenLoadingProps & StackScreenProps<WorkspacesCentralPaneNavigatorParamList, typeof SCREENS.WORKSPACE.TAXES>;
+type WorkspaceTaxesPageProps = WithPolicyAndFullscreenLoadingProps & StackScreenProps<FullScreenNavigatorParamList, typeof SCREENS.WORKSPACE.TAXES>;
 
 function WorkspaceTaxesPage({
     policy,
@@ -43,16 +48,22 @@ function WorkspaceTaxesPage({
         params: {policyID},
     },
 }: WorkspaceTaxesPageProps) {
-    const {isSmallScreenWidth} = useWindowDimensions();
+    const {shouldUseNarrowLayout} = useResponsiveLayout();
     const styles = useThemeStyles();
     const theme = useTheme();
     const {translate} = useLocalize();
+    const {environmentURL} = useEnvironment();
     const [selectedTaxesIDs, setSelectedTaxesIDs] = useState<string[]>([]);
     const [isDeleteModalVisible, setIsDeleteModalVisible] = useState(false);
+    const [selectionMode] = useOnyx(ONYXKEYS.MOBILE_SELECTION_MODE);
     const defaultExternalID = policy?.taxRates?.defaultExternalID;
     const foreignTaxDefault = policy?.taxRates?.foreignTaxDefault;
-    const dropdownButtonRef = useRef(null);
     const isFocused = useIsFocused();
+    const hasAccountingConnections = PolicyUtils.hasAccountingConnections(policy);
+
+    const isConnectedToAccounting = Object.keys(policy?.connections ?? {}).length > 0;
+    const currentConnectionName = PolicyUtils.getCurrentConnectionName(policy);
+    const canSelectMultiple = shouldUseNarrowLayout ? selectionMode?.isEnabled : true;
 
     const fetchTaxes = useCallback(() => {
         openPolicyTaxesPage(policyID);
@@ -100,21 +111,21 @@ function WorkspaceTaxesPage({
                 text: value.name,
                 alternateText: textForDefault(key, value),
                 keyForList: key,
-                isSelected: !!selectedTaxesIDs.includes(key),
+                isSelected: !!selectedTaxesIDs.includes(key) && canSelectMultiple,
                 isDisabledCheckbox: !PolicyUtils.canEditTaxRate(policy, key),
                 isDisabled: value.pendingAction === CONST.RED_BRICK_ROAD_PENDING_ACTION.DELETE,
                 pendingAction: value.pendingAction ?? (Object.keys(value.pendingFields ?? {}).length > 0 ? CONST.RED_BRICK_ROAD_PENDING_ACTION.UPDATE : null),
                 errors: value.errors ?? ErrorUtils.getLatestErrorFieldForAnyField(value),
-                rightElement: <RightElementEnabledStatus enabled={!value.isDisabled} />,
+                rightElement: <ListItemRightCaretWithLabel labelText={!value.isDisabled ? translate('workspace.common.enabled') : translate('workspace.common.disabled')} />,
             }))
             .sort((a, b) => (a.text ?? a.keyForList ?? '').localeCompare(b.text ?? b.keyForList ?? ''));
-    }, [policy, textForDefault, selectedTaxesIDs]);
+    }, [policy, textForDefault, selectedTaxesIDs, canSelectMultiple, translate]);
 
     const isLoading = !isOffline && taxesList === undefined;
 
     const toggleTax = (tax: ListItem) => {
         const key = tax.keyForList;
-        if (typeof key !== 'string') {
+        if (typeof key !== 'string' || key === defaultExternalID || key === foreignTaxDefault) {
             return;
         }
 
@@ -127,18 +138,19 @@ function WorkspaceTaxesPage({
     };
 
     const toggleAllTaxes = () => {
-        const taxesToSelect = taxesList.filter((tax) => tax.keyForList !== defaultExternalID);
+        const taxesToSelect = taxesList.filter(
+            (tax) => tax.keyForList !== defaultExternalID && tax.keyForList !== foreignTaxDefault && tax.pendingAction !== CONST.RED_BRICK_ROAD_PENDING_ACTION.DELETE,
+        );
         setSelectedTaxesIDs((prev) => {
             if (prev.length === taxesToSelect.length) {
                 return [];
             }
-
             return taxesToSelect.map((item) => (item.keyForList ? item.keyForList : ''));
         });
     };
 
     const getCustomListHeader = () => (
-        <View style={[styles.flex1, styles.flexRow, styles.justifyContentBetween, styles.pl3, styles.pr9]}>
+        <View style={[styles.flex1, styles.flexRow, styles.justifyContentBetween, styles.pl3, styles.pr9, !canSelectMultiple && styles.m5]}>
             <Text style={styles.searchInputStyle}>{translate('common.name')}</Text>
             <Text style={[styles.searchInputStyle, styles.textAlignCenter]}>{translate('statusPage.status')}</Text>
         </View>
@@ -173,21 +185,22 @@ function WorkspaceTaxesPage({
 
     const dropdownMenuOptions = useMemo(() => {
         const isMultiple = selectedTaxesIDs.length > 1;
-        const options: Array<DropdownOption<WorkspaceTaxRatesBulkActionType>> = [
-            {
+        const options: Array<DropdownOption<WorkspaceTaxRatesBulkActionType>> = [];
+        if (!hasAccountingConnections) {
+            options.push({
                 icon: Expensicons.Trashcan,
                 text: isMultiple ? translate('workspace.taxes.actions.deleteMultiple') : translate('workspace.taxes.actions.delete'),
-                value: CONST.POLICY.TAX_RATES_BULK_ACTION_TYPES.DELETE,
+                value: CONST.POLICY.BULK_ACTION_TYPES.DELETE,
                 onSelected: () => setIsDeleteModalVisible(true),
-            },
-        ];
+            });
+        }
 
         // `Disable rates` when at least one enabled rate is selected.
         if (selectedTaxesIDs.some((taxID) => !policy?.taxRates?.taxes[taxID]?.isDisabled)) {
             options.push({
                 icon: Expensicons.DocumentSlash,
                 text: isMultiple ? translate('workspace.taxes.actions.disableMultiple') : translate('workspace.taxes.actions.disable'),
-                value: CONST.POLICY.TAX_RATES_BULK_ACTION_TYPES.DISABLE,
+                value: CONST.POLICY.BULK_ACTION_TYPES.DISABLE,
                 onSelected: () => toggleTaxes(false),
             });
         }
@@ -197,34 +210,36 @@ function WorkspaceTaxesPage({
             options.push({
                 icon: Expensicons.Document,
                 text: isMultiple ? translate('workspace.taxes.actions.enableMultiple') : translate('workspace.taxes.actions.enable'),
-                value: CONST.POLICY.TAX_RATES_BULK_ACTION_TYPES.ENABLE,
+                value: CONST.POLICY.BULK_ACTION_TYPES.ENABLE,
                 onSelected: () => toggleTaxes(true),
             });
         }
         return options;
-    }, [policy?.taxRates?.taxes, selectedTaxesIDs, toggleTaxes, translate]);
+    }, [hasAccountingConnections, policy?.taxRates?.taxes, selectedTaxesIDs, toggleTaxes, translate]);
 
-    const headerButtons = !selectedTaxesIDs.length ? (
-        <View style={[styles.w100, styles.flexRow, isSmallScreenWidth && styles.mb3]}>
-            <Button
-                medium
-                success
-                onPress={() => Navigation.navigate(ROUTES.WORKSPACE_TAX_CREATE.getRoute(policyID))}
-                icon={Expensicons.Plus}
-                text={translate('workspace.taxes.addRate')}
-                style={[styles.mr3, isSmallScreenWidth && styles.w50]}
-            />
+    const shouldShowBulkActionsButton = shouldUseNarrowLayout ? selectionMode?.isEnabled : selectedTaxesIDs.length > 0;
+    const headerButtons = !shouldShowBulkActionsButton ? (
+        <View style={[styles.w100, styles.flexRow, shouldUseNarrowLayout && styles.mb3]}>
+            {!hasAccountingConnections && (
+                <Button
+                    medium
+                    success
+                    onPress={() => Navigation.navigate(ROUTES.WORKSPACE_TAX_CREATE.getRoute(policyID))}
+                    icon={Expensicons.Plus}
+                    text={translate('workspace.taxes.addRate')}
+                    style={[styles.mr3, shouldUseNarrowLayout && styles.flex1]}
+                />
+            )}
             <Button
                 medium
                 onPress={() => Navigation.navigate(ROUTES.WORKSPACE_TAXES_SETTINGS.getRoute(policyID))}
                 icon={Expensicons.Gear}
                 text={translate('common.settings')}
-                style={[isSmallScreenWidth && styles.w50]}
+                style={[shouldUseNarrowLayout && styles.flex1]}
             />
         </View>
     ) : (
         <ButtonWithDropdownMenu<WorkspaceTaxRatesBulkActionType>
-            buttonRef={dropdownButtonRef}
             onPress={() => {}}
             options={dropdownMenuOptions}
             buttonSize={CONST.DROPDOWN_BUTTON_SIZE.MEDIUM}
@@ -232,10 +247,32 @@ function WorkspaceTaxesPage({
             shouldAlwaysShowDropdownMenu
             pressOnEnter
             isSplitButton={false}
-            style={[isSmallScreenWidth && styles.flexGrow1, isSmallScreenWidth && styles.mb3]}
+            style={[shouldUseNarrowLayout && styles.flexGrow1, shouldUseNarrowLayout && styles.mb3]}
+            isDisabled={!selectedTaxesIDs.length}
         />
     );
 
+    const getHeaderText = () => (
+        <View style={[styles.ph5, styles.pb5, styles.pt3]}>
+            {isConnectedToAccounting ? (
+                <Text>
+                    <Text style={[styles.textNormal, styles.colorMuted]}>{`${translate('workspace.taxes.importedFromAccountingSoftware')} `}</Text>
+                    <TextLink
+                        style={[styles.textNormal, styles.link]}
+                        href={`${environmentURL}/${ROUTES.POLICY_ACCOUNTING.getRoute(policyID)}`}
+                    >
+                        {`${currentConnectionName} ${translate('workspace.accounting.settings')}`}
+                    </TextLink>
+                    <Text style={[styles.textNormal, styles.colorMuted]}>.</Text>
+                </Text>
+            ) : (
+                <Text style={[styles.textNormal, styles.colorMuted]}>{translate('workspace.taxes.subtitle')}</Text>
+            )}
+        </View>
+    );
+
+    const selectionModeHeader = selectionMode?.isEnabled && shouldUseNarrowLayout;
+
     return (
         <AccessOrNotFoundWrapper
             accessVariants={[CONST.POLICY.ACCESS_VARIANTS.ADMIN, CONST.POLICY.ACCESS_VARIANTS.PAID]}
@@ -249,18 +286,23 @@ function WorkspaceTaxesPage({
                 shouldShowOfflineIndicatorInWideScreen
             >
                 <HeaderWithBackButton
-                    icon={Illustrations.Coins}
-                    title={translate('workspace.common.taxes')}
-                    shouldShowBackButton={isSmallScreenWidth}
+                    icon={!selectionModeHeader ? Illustrations.Coins : undefined}
+                    title={translate(selectionModeHeader ? 'common.selectMultiple' : 'workspace.common.taxes')}
+                    shouldShowBackButton={shouldUseNarrowLayout}
+                    onBackButtonPress={() => {
+                        if (selectionMode?.isEnabled) {
+                            setSelectedTaxesIDs([]);
+                            turnOffMobileSelectionMode();
+                            return;
+                        }
+                        Navigation.goBack();
+                    }}
                 >
-                    {!isSmallScreenWidth && headerButtons}
+                    {!shouldUseNarrowLayout && headerButtons}
                 </HeaderWithBackButton>
+                {shouldUseNarrowLayout && <View style={[styles.pl5, styles.pr5]}>{headerButtons}</View>}
 
-                {isSmallScreenWidth && <View style={[styles.pl5, styles.pr5]}>{headerButtons}</View>}
-
-                <View style={[styles.ph5, styles.pb5, styles.pt3]}>
-                    <Text style={[styles.textNormal, styles.colorMuted]}>{translate('workspace.taxes.subtitle')}</Text>
-                </View>
+                {!shouldUseNarrowLayout && getHeaderText()}
                 {isLoading && (
                     <ActivityIndicator
                         size={CONST.ACTIVITY_INDICATOR_SIZE.LARGE}
@@ -268,18 +310,21 @@ function WorkspaceTaxesPage({
                         color={theme.spinner}
                     />
                 )}
-                <SelectionList
-                    canSelectMultiple
+                <SelectionListWithModal
+                    canSelectMultiple={canSelectMultiple}
+                    turnOnSelectionModeOnLongPress
+                    onTurnOnSelectionMode={(item) => item && toggleTax(item)}
                     sections={[{data: taxesList, isDisabled: false}]}
                     onCheckboxPress={toggleTax}
                     onSelectRow={navigateToEditTaxRate}
                     onSelectAll={toggleAllTaxes}
-                    showScrollIndicator
                     ListItem={TableListItem}
                     customListHeader={getCustomListHeader()}
+                    listHeaderContent={shouldUseNarrowLayout ? getHeaderText() : null}
                     shouldPreventDefaultFocusOnSelectRow={!DeviceCapabilities.canUseTouchScreen()}
                     listHeaderWrapperStyle={[styles.ph9, styles.pv3, styles.pb5]}
                     onDismissError={(item) => (item.keyForList ? clearTaxRateError(policyID, item.keyForList, item.pendingAction) : undefined)}
+                    showScrollIndicator={false}
                 />
                 <ConfirmModal
                     title={translate('workspace.taxes.actions.delete')}
diff --git a/src/pages/workspace/taxes/WorkspaceTaxesSettingsCustomTaxName.tsx b/src/pages/workspace/taxes/WorkspaceTaxesSettingsCustomTaxName.tsx
index 8bcefdf9fd9c..f24a388011ab 100644
--- a/src/pages/workspace/taxes/WorkspaceTaxesSettingsCustomTaxName.tsx
+++ b/src/pages/workspace/taxes/WorkspaceTaxesSettingsCustomTaxName.tsx
@@ -10,13 +10,13 @@ import TextInput from '@components/TextInput';
 import useAutoFocusInput from '@hooks/useAutoFocusInput';
 import useLocalize from '@hooks/useLocalize';
 import useThemeStyles from '@hooks/useThemeStyles';
-import {setPolicyCustomTaxName} from '@libs/actions/Policy';
 import Navigation from '@libs/Navigation/Navigation';
 import type {SettingsNavigatorParamList} from '@libs/Navigation/types';
 import * as ValidationUtils from '@libs/ValidationUtils';
 import AccessOrNotFoundWrapper from '@pages/workspace/AccessOrNotFoundWrapper';
 import type {WithPolicyAndFullscreenLoadingProps} from '@pages/workspace/withPolicyAndFullscreenLoading';
 import withPolicyAndFullscreenLoading from '@pages/workspace/withPolicyAndFullscreenLoading';
+import {setPolicyCustomTaxName} from '@userActions/Policy/Policy';
 import CONST from '@src/CONST';
 import ONYXKEYS from '@src/ONYXKEYS';
 import ROUTES from '@src/ROUTES';
@@ -36,16 +36,19 @@ function WorkspaceTaxesSettingsCustomTaxName({
     const {translate} = useLocalize();
     const {inputCallbackRef} = useAutoFocusInput();
 
-    const validate = useCallback((values: FormOnyxValues<typeof ONYXKEYS.FORMS.WORKSPACE_TAX_CUSTOM_NAME>) => {
-        const errors: FormInputErrors<typeof ONYXKEYS.FORMS.WORKSPACE_TAX_CUSTOM_NAME> = {};
-        const customTaxName = values[INPUT_IDS.NAME];
+    const validate = useCallback(
+        (values: FormOnyxValues<typeof ONYXKEYS.FORMS.WORKSPACE_TAX_CUSTOM_NAME>) => {
+            const errors: FormInputErrors<typeof ONYXKEYS.FORMS.WORKSPACE_TAX_CUSTOM_NAME> = {};
+            const customTaxName = values[INPUT_IDS.NAME];
 
-        if (!ValidationUtils.isRequiredFulfilled(customTaxName)) {
-            errors.name = 'workspace.taxes.error.customNameRequired';
-        }
+            if (!ValidationUtils.isRequiredFulfilled(customTaxName)) {
+                errors.name = translate('workspace.taxes.error.customNameRequired');
+            }
 
-        return errors;
-    }, []);
+            return errors;
+        },
+        [translate],
+    );
 
     const submit = ({name}: WorkspaceTaxCustomName) => {
         setPolicyCustomTaxName(policyID, name);
diff --git a/src/pages/workspace/taxes/WorkspaceTaxesSettingsForeignCurrency.tsx b/src/pages/workspace/taxes/WorkspaceTaxesSettingsForeignCurrency.tsx
index b006732aec7b..2e40667c1daf 100644
--- a/src/pages/workspace/taxes/WorkspaceTaxesSettingsForeignCurrency.tsx
+++ b/src/pages/workspace/taxes/WorkspaceTaxesSettingsForeignCurrency.tsx
@@ -6,7 +6,6 @@ import ScreenWrapper from '@components/ScreenWrapper';
 import TaxPicker from '@components/TaxPicker';
 import useLocalize from '@hooks/useLocalize';
 import useThemeStyles from '@hooks/useThemeStyles';
-import {setForeignCurrencyDefault} from '@libs/actions/Policy';
 import Navigation from '@libs/Navigation/Navigation';
 import type {SettingsNavigatorParamList} from '@libs/Navigation/types';
 import type * as OptionsListUtils from '@libs/OptionsListUtils';
@@ -14,6 +13,7 @@ import * as TransactionUtils from '@libs/TransactionUtils';
 import AccessOrNotFoundWrapper from '@pages/workspace/AccessOrNotFoundWrapper';
 import type {WithPolicyAndFullscreenLoadingProps} from '@pages/workspace/withPolicyAndFullscreenLoading';
 import withPolicyAndFullscreenLoading from '@pages/workspace/withPolicyAndFullscreenLoading';
+import {setForeignCurrencyDefault} from '@userActions/Policy/Policy';
 import CONST from '@src/CONST';
 import ROUTES from '@src/ROUTES';
 import type SCREENS from '@src/SCREENS';
@@ -29,15 +29,16 @@ function WorkspaceTaxesSettingsForeignCurrency({
     const {translate} = useLocalize();
     const styles = useThemeStyles();
 
-    const taxRates = policy?.taxRates;
-    const foreignTaxDefault = taxRates?.foreignTaxDefault ?? '';
-    const defaultExternalID = taxRates?.defaultExternalID ?? '';
+    const foreignTaxDefault = policy?.taxRates?.foreignTaxDefault ?? '';
 
-    const selectedTaxRate =
-        foreignTaxDefault === defaultExternalID ? taxRates && TransactionUtils.getDefaultTaxName(taxRates) : TransactionUtils.getTaxName(taxRates?.taxes ?? {}, foreignTaxDefault);
+    const selectedTaxRate = TransactionUtils.getWorkspaceTaxesSettingsName(policy, foreignTaxDefault);
 
     const submit = (taxes: OptionsListUtils.TaxRatesOption) => {
-        setForeignCurrencyDefault(policyID, taxes.data.code ?? '');
+        setForeignCurrencyDefault(policyID, taxes.code ?? '');
+        Navigation.goBack(ROUTES.WORKSPACE_TAXES_SETTINGS.getRoute(policyID));
+    };
+
+    const dismiss = () => {
         Navigation.goBack(ROUTES.WORKSPACE_TAXES_SETTINGS.getRoute(policyID));
     };
 
@@ -63,6 +64,7 @@ function WorkspaceTaxesSettingsForeignCurrency({
                                 policyID={policyID}
                                 insets={insets}
                                 onSubmit={submit}
+                                onDismiss={dismiss}
                             />
                         </View>
                     </>
diff --git a/src/pages/workspace/taxes/WorkspaceTaxesSettingsWorkspaceCurrency.tsx b/src/pages/workspace/taxes/WorkspaceTaxesSettingsWorkspaceCurrency.tsx
index e1ecfbde3a37..c46efe3fd243 100644
--- a/src/pages/workspace/taxes/WorkspaceTaxesSettingsWorkspaceCurrency.tsx
+++ b/src/pages/workspace/taxes/WorkspaceTaxesSettingsWorkspaceCurrency.tsx
@@ -6,7 +6,6 @@ import ScreenWrapper from '@components/ScreenWrapper';
 import TaxPicker from '@components/TaxPicker';
 import useLocalize from '@hooks/useLocalize';
 import useThemeStyles from '@hooks/useThemeStyles';
-import {setWorkspaceCurrencyDefault} from '@libs/actions/Policy';
 import Navigation from '@libs/Navigation/Navigation';
 import type {SettingsNavigatorParamList} from '@libs/Navigation/types';
 import type * as OptionsListUtils from '@libs/OptionsListUtils';
@@ -14,6 +13,7 @@ import * as TransactionUtils from '@libs/TransactionUtils';
 import AccessOrNotFoundWrapper from '@pages/workspace/AccessOrNotFoundWrapper';
 import type {WithPolicyAndFullscreenLoadingProps} from '@pages/workspace/withPolicyAndFullscreenLoading';
 import withPolicyAndFullscreenLoading from '@pages/workspace/withPolicyAndFullscreenLoading';
+import {setWorkspaceCurrencyDefault} from '@userActions/Policy/Policy';
 import CONST from '@src/CONST';
 import ROUTES from '@src/ROUTES';
 import type SCREENS from '@src/SCREENS';
@@ -30,10 +30,15 @@ function WorkspaceTaxesSettingsWorkspaceCurrency({
     const {translate} = useLocalize();
     const styles = useThemeStyles();
 
-    const selectedTaxRate = policy?.taxRates && TransactionUtils.getDefaultTaxName(policy?.taxRates);
+    const defaultExternalID = policy?.taxRates?.defaultExternalID ?? '';
+    const selectedTaxRate = policy?.taxRates && TransactionUtils.getWorkspaceTaxesSettingsName(policy, defaultExternalID);
 
     const submit = (taxes: OptionsListUtils.TaxRatesOption) => {
-        setWorkspaceCurrencyDefault(policyID, taxes.data.code ?? '');
+        setWorkspaceCurrencyDefault(policyID, taxes.code ?? '');
+        Navigation.goBack(ROUTES.WORKSPACE_TAXES_SETTINGS.getRoute(policyID));
+    };
+
+    const dismiss = () => {
         Navigation.goBack(ROUTES.WORKSPACE_TAXES_SETTINGS.getRoute(policyID));
     };
 
@@ -59,6 +64,7 @@ function WorkspaceTaxesSettingsWorkspaceCurrency({
                                 policyID={policyID}
                                 insets={insets}
                                 onSubmit={submit}
+                                onDismiss={dismiss}
                             />
                         </View>
                     </>
diff --git a/src/pages/workspace/travel/WorkspaceTravelPage.tsx b/src/pages/workspace/travel/WorkspaceTravelPage.tsx
index c03bcc7cfb9b..36f7deaea0a1 100644
--- a/src/pages/workspace/travel/WorkspaceTravelPage.tsx
+++ b/src/pages/workspace/travel/WorkspaceTravelPage.tsx
@@ -2,21 +2,21 @@ import type {StackScreenProps} from '@react-navigation/stack';
 import React from 'react';
 import {View} from 'react-native';
 import useLocalize from '@hooks/useLocalize';
+import useResponsiveLayout from '@hooks/useResponsiveLayout';
 import useThemeStyles from '@hooks/useThemeStyles';
-import useWindowDimensions from '@hooks/useWindowDimensions';
-import type {WorkspacesCentralPaneNavigatorParamList} from '@libs/Navigation/types';
+import type {FullScreenNavigatorParamList} from '@libs/Navigation/types';
 import WorkspacePageWithSections from '@pages/workspace/WorkspacePageWithSections';
 import CONST from '@src/CONST';
 import type SCREENS from '@src/SCREENS';
 import WorkspaceTravelNoVBAView from './WorkspaceTravelNoVBAView';
 import WorkspaceTravelVBAView from './WorkspaceTravelVBAView';
 
-type WorkspaceTravelPageProps = StackScreenProps<WorkspacesCentralPaneNavigatorParamList, typeof SCREENS.WORKSPACE.TRAVEL>;
+type WorkspaceTravelPageProps = StackScreenProps<FullScreenNavigatorParamList, typeof SCREENS.WORKSPACE.TRAVEL>;
 
 function WorkspaceTravelPage({route}: WorkspaceTravelPageProps) {
     const {translate} = useLocalize();
     const styles = useThemeStyles();
-    const {isSmallScreenWidth} = useWindowDimensions();
+    const {shouldUseNarrowLayout} = useResponsiveLayout();
 
     return (
         <WorkspacePageWithSections
@@ -25,9 +25,10 @@ function WorkspaceTravelPage({route}: WorkspaceTravelPageProps) {
             route={route}
             guidesCallTaskID={CONST.GUIDES_CALL_TASK_IDS.WORKSPACE_TRAVEL}
             shouldShowOfflineIndicatorInWideScreen
+            shouldSkipVBBACall={false}
         >
             {(hasVBA, policyID) => (
-                <View style={[styles.mt3, isSmallScreenWidth ? styles.workspaceSectionMobile : styles.workspaceSection]}>
+                <View style={[styles.mt3, shouldUseNarrowLayout ? styles.workspaceSectionMobile : styles.workspaceSection]}>
                     {!hasVBA && <WorkspaceTravelNoVBAView policyID={policyID} />}
                     {hasVBA && <WorkspaceTravelVBAView />}
                 </View>
diff --git a/src/pages/workspace/upgrade/UpgradeConfirmation.tsx b/src/pages/workspace/upgrade/UpgradeConfirmation.tsx
new file mode 100644
index 000000000000..6ad6b6300667
--- /dev/null
+++ b/src/pages/workspace/upgrade/UpgradeConfirmation.tsx
@@ -0,0 +1,40 @@
+import React from 'react';
+import ConfirmationPage from '@components/ConfirmationPage';
+import TextLink from '@components/TextLink';
+import useLocalize from '@hooks/useLocalize';
+import useThemeStyles from '@hooks/useThemeStyles';
+import Navigation from '@libs/Navigation/Navigation';
+import ROUTES from '@src/ROUTES';
+
+type Props = {
+    policyName: string;
+    onConfirmUpgrade: () => void;
+};
+
+function UpgradeConfirmation({policyName, onConfirmUpgrade}: Props) {
+    const {translate} = useLocalize();
+    const styles = useThemeStyles();
+
+    return (
+        <ConfirmationPage
+            heading={translate('workspace.upgrade.completed.headline')}
+            description={
+                <>
+                    {translate('workspace.upgrade.completed.successMessage', policyName)}{' '}
+                    <TextLink
+                        style={styles.link}
+                        onPress={() => Navigation.navigate(ROUTES.SETTINGS_SUBSCRIPTION)}
+                    >
+                        {translate('workspace.upgrade.completed.viewSubscription')}
+                    </TextLink>{' '}
+                    {translate('workspace.upgrade.completed.moreDetails')}
+                </>
+            }
+            shouldShowButton
+            onButtonPress={onConfirmUpgrade}
+            buttonText={translate('workspace.upgrade.completed.gotIt')}
+        />
+    );
+}
+
+export default UpgradeConfirmation;
diff --git a/src/pages/workspace/upgrade/UpgradeIntro.tsx b/src/pages/workspace/upgrade/UpgradeIntro.tsx
new file mode 100644
index 000000000000..5fe04fb7a0ce
--- /dev/null
+++ b/src/pages/workspace/upgrade/UpgradeIntro.tsx
@@ -0,0 +1,91 @@
+import React from 'react';
+import {View} from 'react-native';
+import type {ValueOf} from 'type-fest';
+import Avatar from '@components/Avatar';
+import Badge from '@components/Badge';
+import Button from '@components/Button';
+import Icon from '@components/Icon';
+import * as Expensicon from '@components/Icon/Expensicons';
+import * as Illustrations from '@components/Icon/Illustrations';
+import Text from '@components/Text';
+import TextLink from '@components/TextLink';
+import useLocalize from '@hooks/useLocalize';
+import useResponsiveLayout from '@hooks/useResponsiveLayout';
+import useThemeStyles from '@hooks/useThemeStyles';
+import Navigation from '@libs/Navigation/Navigation';
+import CONST from '@src/CONST';
+import ROUTES from '@src/ROUTES';
+
+type Props = {
+    buttonDisabled?: boolean;
+    loading?: boolean;
+    feature: ValueOf<typeof CONST.UPGRADE_FEATURE_INTRO_MAPPING>;
+    onUpgrade: () => void;
+};
+
+function UpgradeIntro({feature, onUpgrade, buttonDisabled, loading}: Props) {
+    const styles = useThemeStyles();
+    const {isExtraSmallScreenWidth, isSmallScreenWidth} = useResponsiveLayout();
+    const {translate} = useLocalize();
+    const isIllustration = feature.icon in Illustrations;
+    const iconSrc = isIllustration ? Illustrations[feature.icon as keyof typeof Illustrations] : Expensicon[feature.icon as keyof typeof Expensicon];
+    const iconAdditionalStyles = feature.id === CONST.UPGRADE_FEATURE_INTRO_MAPPING.approvals.id ? styles.br0 : undefined;
+
+    return (
+        <View style={styles.p5}>
+            <View style={styles.workspaceUpgradeIntroBox({isExtraSmallScreenWidth, isSmallScreenWidth})}>
+                <View style={[styles.mb3, styles.flexRow, styles.justifyContentBetween]}>
+                    {!isIllustration ? (
+                        <Avatar
+                            source={iconSrc}
+                            type={CONST.ICON_TYPE_AVATAR}
+                        />
+                    ) : (
+                        <Icon
+                            src={iconSrc}
+                            width={48}
+                            height={48}
+                            additionalStyles={iconAdditionalStyles}
+                        />
+                    )}
+                    <Badge
+                        icon={Expensicon.Unlock}
+                        text={translate('workspace.upgrade.upgradeToUnlock')}
+                        success
+                    />
+                </View>
+                <View style={styles.mb5}>
+                    <Text style={[styles.textHeadlineH1, styles.mb4]}>{translate(feature.title)}</Text>
+                    <Text style={[styles.textNormal, styles.textSupporting, styles.mb4]}>{translate(feature.description)}</Text>
+                    <Text style={[styles.textNormal, styles.textSupporting]}>
+                        {translate(`workspace.upgrade.${feature.id}.onlyAvailableOnPlan`)}
+                        <Text style={[styles.textSupporting, styles.textBold]}>{translate(`workspace.upgrade.pricing.amount`)}</Text>
+                        {translate(`workspace.upgrade.pricing.perActiveMember`)}
+                    </Text>
+                </View>
+                <Button
+                    isLoading={loading}
+                    text={translate('common.upgrade')}
+                    success
+                    onPress={onUpgrade}
+                    isDisabled={buttonDisabled}
+                    large
+                />
+            </View>
+            <View style={styles.mt6}>
+                <Text style={[styles.textNormal, styles.textSupporting]}>
+                    {translate('workspace.upgrade.note.upgradeWorkspace')}{' '}
+                    <TextLink
+                        style={[styles.link]}
+                        onPress={() => Navigation.navigate(ROUTES.SETTINGS_SUBSCRIPTION)}
+                    >
+                        {translate('workspace.upgrade.note.learnMore')}
+                    </TextLink>{' '}
+                    {translate('workspace.upgrade.note.aboutOurPlans')}
+                </Text>
+            </View>
+        </View>
+    );
+}
+
+export default UpgradeIntro;
diff --git a/src/pages/workspace/upgrade/WorkspaceUpgradePage.tsx b/src/pages/workspace/upgrade/WorkspaceUpgradePage.tsx
new file mode 100644
index 000000000000..bb4bdff27097
--- /dev/null
+++ b/src/pages/workspace/upgrade/WorkspaceUpgradePage.tsx
@@ -0,0 +1,101 @@
+import {useNavigation} from '@react-navigation/native';
+import type {StackScreenProps} from '@react-navigation/stack';
+import React, {useCallback, useEffect} from 'react';
+import {useOnyx} from 'react-native-onyx';
+import HeaderWithBackButton from '@components/HeaderWithBackButton';
+import ScreenWrapper from '@components/ScreenWrapper';
+import useLocalize from '@hooks/useLocalize';
+import useNetwork from '@hooks/useNetwork';
+import useThemeStyles from '@hooks/useThemeStyles';
+import Navigation from '@libs/Navigation/Navigation';
+import type {SettingsNavigatorParamList} from '@libs/Navigation/types';
+import {isControlPolicy} from '@libs/PolicyUtils';
+import NotFoundPage from '@pages/ErrorPage/NotFoundPage';
+import CONST from '@src/CONST';
+import * as Policy from '@src/libs/actions/Policy/Policy';
+import ROUTES from '@src/ROUTES';
+import type SCREENS from '@src/SCREENS';
+import UpgradeConfirmation from './UpgradeConfirmation';
+import UpgradeIntro from './UpgradeIntro';
+
+type WorkspaceUpgradePageProps = StackScreenProps<SettingsNavigatorParamList, typeof SCREENS.WORKSPACE.UPGRADE>;
+
+function WorkspaceUpgradePage({route}: WorkspaceUpgradePageProps) {
+    const navigation = useNavigation();
+    const styles = useThemeStyles();
+    const policyID = route.params.policyID;
+    const feature = Object.values(CONST.UPGRADE_FEATURE_INTRO_MAPPING).find((f) => f.alias === route.params.featureName);
+    const {translate} = useLocalize();
+    const [policy] = useOnyx(`policy_${policyID}`);
+    const {isOffline} = useNetwork();
+
+    const isUpgraded = React.useMemo(() => isControlPolicy(policy), [policy]);
+
+    const upgradeToCorporate = () => {
+        if (!policy || !feature) {
+            return;
+        }
+
+        Policy.upgradeToCorporate(policy.id, feature.name);
+    };
+
+    const confirmUpgrade = useCallback(() => {
+        if (!feature) {
+            return;
+        }
+        switch (feature.id) {
+            case CONST.UPGRADE_FEATURE_INTRO_MAPPING.reportFields.id:
+                Policy.enablePolicyReportFields(policyID, true, true);
+                return Navigation.navigate(ROUTES.WORKSPACE_MORE_FEATURES.getRoute(policyID));
+            case CONST.UPGRADE_FEATURE_INTRO_MAPPING.rules.id:
+                Policy.enablePolicyRules(policyID, true, true);
+                return Navigation.navigate(ROUTES.WORKSPACE_MORE_FEATURES.getRoute(policyID));
+            default:
+                return route.params.backTo ? Navigation.navigate(route.params.backTo) : Navigation.goBack();
+        }
+    }, [feature, policyID, route.params.backTo]);
+
+    useEffect(() => {
+        const unsubscribeListener = navigation.addListener('blur', () => {
+            if (!isUpgraded) {
+                return;
+            }
+            confirmUpgrade();
+        });
+
+        return unsubscribeListener;
+    }, [isUpgraded, confirmUpgrade, navigation]);
+
+    if (!feature || !policy) {
+        return <NotFoundPage />;
+    }
+
+    return (
+        <ScreenWrapper
+            shouldShowOfflineIndicator
+            testID="workspaceUpgradePage"
+            offlineIndicatorStyle={styles.mtAuto}
+        >
+            <HeaderWithBackButton
+                title={translate('common.upgrade')}
+                onBackButtonPress={() => (isUpgraded ? Navigation.dismissModal() : Navigation.goBack())}
+            />
+            {isUpgraded && (
+                <UpgradeConfirmation
+                    onConfirmUpgrade={() => Navigation.dismissModal()}
+                    policyName={policy.name}
+                />
+            )}
+            {!isUpgraded && (
+                <UpgradeIntro
+                    feature={feature}
+                    onUpgrade={upgradeToCorporate}
+                    buttonDisabled={isOffline}
+                    loading={policy.isPendingUpgrade}
+                />
+            )}
+        </ScreenWrapper>
+    );
+}
+
+export default WorkspaceUpgradePage;
diff --git a/src/pages/workspace/withPolicy.tsx b/src/pages/workspace/withPolicy.tsx
index 2c06bf208482..b6da4dd689e6 100644
--- a/src/pages/workspace/withPolicy.tsx
+++ b/src/pages/workspace/withPolicy.tsx
@@ -1,44 +1,35 @@
 import type {RouteProp} from '@react-navigation/native';
 import {useNavigationState} from '@react-navigation/native';
-import PropTypes from 'prop-types';
 import type {ComponentType, ForwardedRef, RefAttributes} from 'react';
 import React, {forwardRef} from 'react';
 import type {OnyxEntry} from 'react-native-onyx';
 import {withOnyx} from 'react-native-onyx';
-import {translatableTextPropTypes} from '@libs/Localize';
-import type {
-    BottomTabNavigatorParamList,
-    CentralPaneNavigatorParamList,
-    FullScreenNavigatorParamList,
-    ReimbursementAccountNavigatorParamList,
-    SettingsNavigatorParamList,
-    WorkspacesCentralPaneNavigatorParamList,
-} from '@navigation/types';
-import * as Policy from '@userActions/Policy';
-import CONST from '@src/CONST';
+import type {AuthScreensParamList, BottomTabNavigatorParamList, FullScreenNavigatorParamList, ReimbursementAccountNavigatorParamList, SettingsNavigatorParamList} from '@navigation/types';
+import * as Policy from '@userActions/Policy/Policy';
 import ONYXKEYS from '@src/ONYXKEYS';
 import type SCREENS from '@src/SCREENS';
 import type * as OnyxTypes from '@src/types/onyx';
 
-type NavigatorsParamList = BottomTabNavigatorParamList &
-    CentralPaneNavigatorParamList &
-    SettingsNavigatorParamList &
-    ReimbursementAccountNavigatorParamList &
-    FullScreenNavigatorParamList &
-    WorkspacesCentralPaneNavigatorParamList;
+type NavigatorsParamList = BottomTabNavigatorParamList & AuthScreensParamList & SettingsNavigatorParamList & ReimbursementAccountNavigatorParamList & FullScreenNavigatorParamList;
 
 type PolicyRoute = RouteProp<
     NavigatorsParamList,
     | typeof SCREENS.REIMBURSEMENT_ACCOUNT_ROOT
     | typeof SCREENS.WORKSPACE.INITIAL
+    | typeof SCREENS.WORKSPACE.PROFILE
     | typeof SCREENS.WORKSPACE.BILLS
     | typeof SCREENS.WORKSPACE.MORE_FEATURES
     | typeof SCREENS.WORKSPACE.MEMBERS
+    | typeof SCREENS.WORKSPACE.EXPENSIFY_CARD
+    | typeof SCREENS.WORKSPACE.COMPANY_CARDS
     | typeof SCREENS.WORKSPACE.INVITE
     | typeof SCREENS.WORKSPACE.INVITE_MESSAGE
     | typeof SCREENS.WORKSPACE.WORKFLOWS_PAYER
     | typeof SCREENS.WORKSPACE.WORKFLOWS
-    | typeof SCREENS.WORKSPACE.WORKFLOWS_APPROVER
+    | typeof SCREENS.WORKSPACE.WORKFLOWS_APPROVALS_NEW
+    | typeof SCREENS.WORKSPACE.WORKFLOWS_APPROVALS_EDIT
+    | typeof SCREENS.WORKSPACE.WORKFLOWS_APPROVALS_EXPENSES_FROM
+    | typeof SCREENS.WORKSPACE.WORKFLOWS_APPROVALS_APPROVER
     | typeof SCREENS.WORKSPACE.WORKFLOWS_AUTO_REPORTING_MONTHLY_OFFSET
     | typeof SCREENS.WORKSPACE.TRAVEL
     | typeof SCREENS.WORKSPACE.WORKFLOWS_AUTO_REPORTING_FREQUENCY
@@ -47,104 +38,21 @@ type PolicyRoute = RouteProp<
     | typeof SCREENS.WORKSPACE.CARD
     | typeof SCREENS.WORKSPACE.OWNER_CHANGE_CHECK
     | typeof SCREENS.WORKSPACE.TAX_EDIT
+    | typeof SCREENS.WORKSPACE.ADDRESS
+    | typeof SCREENS.WORKSPACE.DISTANCE_RATE_TAX_RATE_EDIT
+    | typeof SCREENS.WORKSPACE.DISTANCE_RATE_TAX_RECLAIMABLE_ON_EDIT
+    | typeof SCREENS.WORKSPACE.REPORT_FIELDS_CREATE
+    | typeof SCREENS.WORKSPACE.REPORT_FIELDS_LIST_VALUES
+    | typeof SCREENS.WORKSPACE.REPORT_FIELDS_EDIT_INITIAL_VALUE
+    | typeof SCREENS.WORKSPACE.REPORT_FIELDS_VALUE_SETTINGS
+    | typeof SCREENS.WORKSPACE.ACCOUNTING.CARD_RECONCILIATION
+    | typeof SCREENS.WORKSPACE.RULES
 >;
 
 function getPolicyIDFromRoute(route: PolicyRoute): string {
-    return route?.params?.policyID ?? '';
+    return route?.params?.policyID ?? '-1';
 }
 
-const taxPropTypes = PropTypes.shape({
-    /** Name of a tax */
-    name: PropTypes.string,
-
-    /** The value of a tax */
-    value: PropTypes.string,
-
-    /** Whether the tax is disabled */
-    isDisabled: PropTypes.bool,
-});
-
-const taxRatesPropTypes = PropTypes.shape({
-    /** Name of the tax */
-    name: PropTypes.string,
-
-    /** Default policy tax ID */
-    defaultExternalID: PropTypes.string,
-
-    /** Default value of taxes */
-    defaultValue: PropTypes.string,
-
-    /** Default foreign policy tax ID */
-    foreignTaxDefault: PropTypes.string,
-
-    /** List of tax names and values */
-    taxes: PropTypes.objectOf(taxPropTypes),
-});
-
-const policyPropTypes = {
-    /** The policy object for the current route */
-    policy: PropTypes.shape({
-        /** The ID of the policy */
-        id: PropTypes.string,
-
-        /** The name of the policy */
-        name: PropTypes.string,
-
-        /** The current user's role in the policy */
-        role: PropTypes.oneOf(Object.values(CONST.POLICY.ROLE)),
-
-        /** The policy type */
-        type: PropTypes.oneOf(Object.values(CONST.POLICY.TYPE)),
-
-        /** The email of the policy owner */
-        owner: PropTypes.string,
-
-        /** The output currency for the policy */
-        outputCurrency: PropTypes.string,
-
-        /** The URL for the policy avatar */
-        avatar: PropTypes.string,
-
-        /** Errors on the policy keyed by microtime */
-        errors: PropTypes.objectOf(PropTypes.string),
-
-        /**
-         * Error objects keyed by field name containing errors keyed by microtime
-         * E.x
-         * {
-         *     name: {
-         *        [DateUtils.getMicroseconds()]: 'Sorry, there was an unexpected problem updating your workspace name.',
-         *     }
-         * }
-         */
-        errorFields: PropTypes.objectOf(PropTypes.objectOf(translatableTextPropTypes)),
-
-        /** Whether or not the policy requires tags */
-        requiresTag: PropTypes.bool,
-
-        /** Whether or not the policy requires categories */
-        requiresCategory: PropTypes.bool,
-
-        /** Whether or not the policy has multiple tag lists */
-        hasMultipleTagLists: PropTypes.bool,
-
-        /**
-         * Whether or not the policy has tax tracking enabled
-         *
-         * @deprecated - use tax.trackingEnabled instead
-         */
-        isTaxTrackingEnabled: PropTypes.bool,
-
-        /** Whether or not the policy has tax tracking enabled */
-        tax: PropTypes.shape({
-            trackingEnabled: PropTypes.bool,
-        }),
-
-        /** Collection of tax rates attached to a policy */
-        taxRates: taxRatesPropTypes,
-    }),
-};
-
 type WithPolicyOnyxProps = {
     policy: OnyxEntry<OnyxTypes.Policy>;
     policyDraft: OnyxEntry<OnyxTypes.Policy>;
@@ -193,5 +101,5 @@ export default function <TProps extends WithPolicyProps, TRef>(WrappedComponent:
     })(forwardRef(WithPolicy));
 }
 
-export {policyDefaultProps, policyPropTypes};
+export {policyDefaultProps};
 export type {PolicyRoute, WithPolicyOnyxProps, WithPolicyProps};
diff --git a/src/pages/workspace/withPolicyAndFullscreenLoading.tsx b/src/pages/workspace/withPolicyAndFullscreenLoading.tsx
index 161320441843..2467136a382b 100644
--- a/src/pages/workspace/withPolicyAndFullscreenLoading.tsx
+++ b/src/pages/workspace/withPolicyAndFullscreenLoading.tsx
@@ -4,7 +4,6 @@ import React, {forwardRef} from 'react';
 import type {OnyxEntry} from 'react-native-onyx';
 import {withOnyx} from 'react-native-onyx';
 import FullscreenLoadingIndicator from '@components/FullscreenLoadingIndicator';
-import compose from '@libs/compose';
 import ONYXKEYS from '@src/ONYXKEYS';
 import type {PersonalDetailsList} from '@src/types/onyx';
 import type {WithPolicyOnyxProps, WithPolicyProps} from './withPolicy';
@@ -49,7 +48,7 @@ export default function withPolicyAndFullscreenLoading<TProps extends WithPolicy
 
     WithPolicyAndFullscreenLoading.displayName = `WithPolicyAndFullscreenLoading`;
 
-    return compose(
+    return withPolicy(
         withOnyx<TProps & RefAttributes<TRef>, WithPolicyAndFullscreenLoadingOnyxProps>({
             isLoadingReportData: {
                 key: ONYXKEYS.IS_LOADING_REPORT_DATA,
@@ -57,9 +56,8 @@ export default function withPolicyAndFullscreenLoading<TProps extends WithPolicy
             personalDetails: {
                 key: ONYXKEYS.PERSONAL_DETAILS_LIST,
             },
-        }),
-        withPolicy,
-    )(forwardRef(WithPolicyAndFullscreenLoading));
+        })(forwardRef(WithPolicyAndFullscreenLoading)),
+    );
 }
 
 export type {WithPolicyAndFullscreenLoadingProps};
diff --git a/src/pages/workspace/withPolicyConnections.tsx b/src/pages/workspace/withPolicyConnections.tsx
index bb24bbb3bb76..127631bc5437 100644
--- a/src/pages/workspace/withPolicyConnections.tsx
+++ b/src/pages/workspace/withPolicyConnections.tsx
@@ -1,15 +1,19 @@
-import React, {useEffect} from 'react';
+import isBoolean from 'lodash/isBoolean';
+import React, {useEffect, useState} from 'react';
 import type {ComponentType} from 'react';
 import {useOnyx} from 'react-native-onyx';
-import FullPageOfflineBlockingView from '@components/BlockingViews/FullPageOfflineBlockingView';
 import FullScreenLoadingIndicator from '@components/FullscreenLoadingIndicator';
 import useNetwork from '@hooks/useNetwork';
+import usePrevious from '@hooks/usePrevious';
 import {openPolicyAccountingPage} from '@libs/actions/PolicyConnections';
 import ONYXKEYS from '@src/ONYXKEYS';
+import {isEmptyObject} from '@src/types/utils/EmptyObject';
 import withPolicy from './withPolicy';
 import type {WithPolicyProps} from './withPolicy';
 
-type WithPolicyConnectionsProps = WithPolicyProps;
+type WithPolicyConnectionsProps = WithPolicyProps & {
+    isConnectionDataFetchNeeded: boolean;
+};
 
 /**
  * Higher-order component that fetches the connections data and populates
@@ -21,35 +25,45 @@ type WithPolicyConnectionsProps = WithPolicyProps;
  * Only the active policy gets the complete policy data upon app start that includes the connections data.
  * For other policies, the connections data needs to be fetched when it's needed.
  */
-function withPolicyConnections<TProps extends WithPolicyConnectionsProps>(WrappedComponent: ComponentType<TProps>) {
+function withPolicyConnections<TProps extends WithPolicyConnectionsProps>(WrappedComponent: ComponentType<TProps>, shouldBlockView = true) {
     function WithPolicyConnections(props: TProps) {
         const {isOffline} = useNetwork();
-        const [hasConnectionsDataBeenFetched, {status}] = useOnyx(`${ONYXKEYS.COLLECTION.POLICY_HAS_CONNECTIONS_DATA_BEEN_FETCHED}${props.policy?.id ?? '0'}`, {
+        const [hasConnectionsDataBeenFetched] = useOnyx(`${ONYXKEYS.COLLECTION.POLICY_HAS_CONNECTIONS_DATA_BEEN_FETCHED}${props.policy?.id ?? '-1'}`, {
             initWithStoredValues: false,
         });
+        const isConnectionDataFetchNeeded =
+            !isOffline && !!props.policy && (!!props.policy.areConnectionsEnabled || !isEmptyObject(props.policy.connections)) && !hasConnectionsDataBeenFetched;
+
+        const [isFetchingData, setIsFetchingData] = useState(false);
+
+        const prevHasConnectionsDataBeenFetched = usePrevious(hasConnectionsDataBeenFetched);
+
+        useEffect(() => {
+            if (prevHasConnectionsDataBeenFetched !== undefined || !isBoolean(hasConnectionsDataBeenFetched)) {
+                return;
+            }
+            setIsFetchingData(false);
+        }, [hasConnectionsDataBeenFetched, prevHasConnectionsDataBeenFetched]);
 
         useEffect(() => {
             // When the accounting feature is not enabled, or if the connections data already exists,
             // there is no need to fetch the connections data.
-            if (!props.policy || !props.policy.areConnectionsEnabled || !!hasConnectionsDataBeenFetched || !!props.policy.connections) {
+            if (!isConnectionDataFetchNeeded || !props.policy?.id) {
                 return;
             }
-
+            setIsFetchingData(true);
             openPolicyAccountingPage(props.policy.id);
-        }, [hasConnectionsDataBeenFetched, props.policy, isOffline]);
-
-        if (props.policy?.areConnectionsEnabled && (!props.policy || status === 'loading' || hasConnectionsDataBeenFetched === false)) {
-            return (
-                <FullPageOfflineBlockingView>
-                    <FullScreenLoadingIndicator />
-                </FullPageOfflineBlockingView>
-            );
+        }, [props.policy?.id, isConnectionDataFetchNeeded]);
+
+        if ((isConnectionDataFetchNeeded || isFetchingData) && shouldBlockView) {
+            return <FullScreenLoadingIndicator />;
         }
 
         return (
             <WrappedComponent
                 // eslint-disable-next-line react/jsx-props-no-spreading
                 {...props}
+                isConnectionDataFetchNeeded={isConnectionDataFetchNeeded}
             />
         );
     }
diff --git a/src/pages/workspace/workflows/ToggleSettingsOptionRow.tsx b/src/pages/workspace/workflows/ToggleSettingsOptionRow.tsx
index 071115b32c0e..af36d79404a2 100644
--- a/src/pages/workspace/workflows/ToggleSettingsOptionRow.tsx
+++ b/src/pages/workspace/workflows/ToggleSettingsOptionRow.tsx
@@ -1,62 +1,141 @@
 import React, {useMemo} from 'react';
 import {View} from 'react-native';
-import type {StyleProp, ViewStyle} from 'react-native';
+import type {StyleProp, TextStyle, ViewStyle} from 'react-native';
 import Icon from '@components/Icon';
 import OfflineWithFeedback from '@components/OfflineWithFeedback';
+import RenderHTML from '@components/RenderHTML';
 import Switch from '@components/Switch';
 import Text from '@components/Text';
 import useThemeStyles from '@hooks/useThemeStyles';
+import Parser from '@libs/Parser';
 import type {Errors, PendingAction} from '@src/types/onyx/OnyxCommon';
 import type IconAsset from '@src/types/utils/IconAsset';
 
 type ToggleSettingOptionRowProps = {
     /** Icon to be shown for the option */
     icon?: IconAsset;
+
     /** Title of the option */
-    title: string;
+    title?: string;
+
+    /** Custom title for the option */
+    customTitle?: React.ReactNode;
+
     /** Subtitle of the option */
-    subtitle: string;
+    subtitle?: string;
+
+    /** Accessibility label for the switch */
+    switchAccessibilityLabel: string;
+
     /** subtitle should show below switch and title */
     shouldPlaceSubtitleBelowSwitch?: boolean;
+
+    /** Whether or not the text should be escaped */
+    shouldEscapeText?: boolean;
+
+    /** Whether should render subtitle as HTML or as Text */
+    shouldParseSubtitle?: boolean;
+
     /** Used to apply styles to the outermost container */
     wrapperStyle?: StyleProp<ViewStyle>;
+
+    /** Used to apply styles to the Title */
+    titleStyle?: StyleProp<TextStyle>;
+
+    /** Used to apply styles to the Subtitle */
+    subtitleStyle?: StyleProp<TextStyle>;
+
     /** Whether the option is enabled or not */
     isActive: boolean;
+
     /** Callback to be called when the switch is toggled */
     onToggle: (isEnabled: boolean) => void;
+
     /** SubMenuItems will be shown when the option is enabled */
     subMenuItems?: React.ReactNode;
+
     /** If there is a pending action, we will grey out the option */
     pendingAction?: PendingAction;
+
     /** Any error message to show */
     errors?: Errors;
+
     /** Callback to close the error messages */
     onCloseError?: () => void;
+
     /** Whether the toggle should be disabled */
     disabled?: boolean;
+
+    /** Whether to show the lock icon even if the switch is enabled */
+    showLockIcon?: boolean;
+
+    /** Callback to fire when the switch is toggled in disabled state */
+    disabledAction?: () => void;
 };
 const ICON_SIZE = 48;
 
 function ToggleSettingOptionRow({
     icon,
     title,
+    customTitle,
     subtitle,
+    subtitleStyle,
+    switchAccessibilityLabel,
     shouldPlaceSubtitleBelowSwitch,
+    shouldEscapeText = undefined,
+    shouldParseSubtitle = false,
     wrapperStyle,
+    titleStyle,
     onToggle,
     subMenuItems,
     isActive,
+    disabledAction,
     pendingAction,
     errors,
     onCloseError,
     disabled = false,
+    showLockIcon = false,
 }: ToggleSettingOptionRowProps) {
     const styles = useThemeStyles();
 
-    const subTitleView = useMemo(
-        () => <Text style={[styles.textLabel, shouldPlaceSubtitleBelowSwitch ? styles.mt4 : {...styles.mt1, ...styles.mr5}, styles.textSupporting]}>{subtitle}</Text>,
-        [shouldPlaceSubtitleBelowSwitch, subtitle, styles.mr5, styles.mt1, styles.mt4, styles.textLabel, styles.textSupporting],
-    );
+    const subtitleHtml = useMemo(() => {
+        if (!subtitle || !shouldParseSubtitle) {
+            return '';
+        }
+        return Parser.replace(subtitle, {shouldEscapeText});
+    }, [subtitle, shouldParseSubtitle, shouldEscapeText]);
+
+    const processedSubtitle = useMemo(() => {
+        let textToWrap = '';
+
+        if (shouldParseSubtitle) {
+            textToWrap = subtitleHtml;
+        }
+
+        return textToWrap ? `<comment><muted-text-label>${textToWrap}</muted-text-label></comment>` : '';
+    }, [shouldParseSubtitle, subtitleHtml]);
+
+    const subTitleView = useMemo(() => {
+        if (!!subtitle && shouldParseSubtitle) {
+            return (
+                <View style={[styles.flexRow, styles.renderHTML, shouldPlaceSubtitleBelowSwitch ? styles.mt1 : {...styles.mt1, ...styles.mr5}]}>
+                    <RenderHTML html={processedSubtitle} />
+                </View>
+            );
+        }
+        return <Text style={[styles.mutedNormalTextLabel, shouldPlaceSubtitleBelowSwitch ? styles.mt1 : {...styles.mt1, ...styles.mr5}, subtitleStyle]}>{subtitle}</Text>;
+    }, [
+        subtitle,
+        shouldParseSubtitle,
+        styles.mutedNormalTextLabel,
+        styles.mt1,
+        styles.mr5,
+        styles.flexRow,
+        styles.renderHTML,
+        shouldPlaceSubtitleBelowSwitch,
+        subtitleStyle,
+        processedSubtitle,
+    ]);
 
     return (
         <OfflineWithFeedback
@@ -77,19 +156,23 @@ function ToggleSettingOptionRow({
                                 additionalStyles={[styles.mr3]}
                             />
                         )}
-                        <View style={[styles.flexColumn, styles.flex1]}>
-                            <Text style={[!shouldPlaceSubtitleBelowSwitch && styles.textMicroBold, styles.textNormal, styles.lh20]}>{title}</Text>
-                            {!shouldPlaceSubtitleBelowSwitch && subTitleView}
-                        </View>
+                        {customTitle ?? (
+                            <View style={[styles.flexColumn, styles.flex1]}>
+                                <Text style={[styles.textNormal, styles.lh20, titleStyle]}>{title}</Text>
+                                {!shouldPlaceSubtitleBelowSwitch && subtitle && subTitleView}
+                            </View>
+                        )}
                     </View>
                     <Switch
-                        accessibilityLabel={subtitle}
+                        disabledAction={disabledAction}
+                        accessibilityLabel={switchAccessibilityLabel}
                         onToggle={onToggle}
                         isOn={isActive}
                         disabled={disabled}
+                        showLockIcon={showLockIcon}
                     />
                 </View>
-                {shouldPlaceSubtitleBelowSwitch && subTitleView}
+                {shouldPlaceSubtitleBelowSwitch && subtitle && subTitleView}
                 {isActive && subMenuItems}
             </View>
         </OfflineWithFeedback>
diff --git a/src/pages/workspace/workflows/WorkspaceAutoReportingFrequencyPage.tsx b/src/pages/workspace/workflows/WorkspaceAutoReportingFrequencyPage.tsx
index 07553baba356..d026c218910f 100644
--- a/src/pages/workspace/workflows/WorkspaceAutoReportingFrequencyPage.tsx
+++ b/src/pages/workspace/workflows/WorkspaceAutoReportingFrequencyPage.tsx
@@ -1,24 +1,24 @@
 import type {StackScreenProps} from '@react-navigation/stack';
-import React, {useState} from 'react';
-import {FlatList} from 'react-native-gesture-handler';
+import React from 'react';
 import type {ValueOf} from 'type-fest';
 import FullPageNotFoundView from '@components/BlockingViews/FullPageNotFoundView';
 import HeaderWithBackButton from '@components/HeaderWithBackButton';
 import MenuItem from '@components/MenuItem';
 import OfflineWithFeedback from '@components/OfflineWithFeedback';
 import ScreenWrapper from '@components/ScreenWrapper';
+import SelectionList from '@components/SelectionList';
 import RadioListItem from '@components/SelectionList/RadioListItem';
 import useLocalize from '@hooks/useLocalize';
 import useThemeStyles from '@hooks/useThemeStyles';
 import * as ErrorUtils from '@libs/ErrorUtils';
 import * as Localize from '@libs/Localize';
 import Navigation from '@libs/Navigation/Navigation';
-import type {WorkspacesCentralPaneNavigatorParamList} from '@libs/Navigation/types';
+import type {FullScreenNavigatorParamList} from '@libs/Navigation/types';
 import * as PolicyUtils from '@libs/PolicyUtils';
 import AccessOrNotFoundWrapper from '@pages/workspace/AccessOrNotFoundWrapper';
 import withPolicy from '@pages/workspace/withPolicy';
 import type {WithPolicyOnyxProps} from '@pages/workspace/withPolicy';
-import * as Policy from '@userActions/Policy';
+import * as Policy from '@userActions/Policy/Policy';
 import CONST from '@src/CONST';
 import ROUTES from '@src/ROUTES';
 import type SCREENS from '@src/SCREENS';
@@ -27,12 +27,13 @@ import {isEmptyObject} from '@src/types/utils/EmptyObject';
 type AutoReportingFrequencyKey = Exclude<ValueOf<typeof CONST.POLICY.AUTO_REPORTING_FREQUENCIES>, 'instant'>;
 type Locale = ValueOf<typeof CONST.LOCALES>;
 
-type WorkspaceAutoReportingFrequencyPageProps = WithPolicyOnyxProps & StackScreenProps<WorkspacesCentralPaneNavigatorParamList, typeof SCREENS.WORKSPACE.WORKFLOWS_AUTO_REPORTING_FREQUENCY>;
+type WorkspaceAutoReportingFrequencyPageProps = WithPolicyOnyxProps & StackScreenProps<FullScreenNavigatorParamList, typeof SCREENS.WORKSPACE.WORKFLOWS_AUTO_REPORTING_FREQUENCY>;
 
 type WorkspaceAutoReportingFrequencyPageItem = {
     text: string;
     keyForList: string;
     isSelected: boolean;
+    footerComponent?: React.ReactNode | null;
 };
 
 type AutoReportingFrequencyDisplayNames = Record<AutoReportingFrequencyKey, string>;
@@ -47,29 +48,18 @@ const getAutoReportingFrequencyDisplayNames = (locale: Locale): AutoReportingFre
 });
 
 function WorkspaceAutoReportingFrequencyPage({policy, route}: WorkspaceAutoReportingFrequencyPageProps) {
+    const autoReportingFrequency = PolicyUtils.getCorrectedAutoReportingFrequency(policy);
+
     const {translate, preferredLocale, toLocaleOrdinal} = useLocalize();
     const styles = useThemeStyles();
-    const [isMonthlyFrequency, setIsMonthlyFrequency] = useState(policy?.autoReportingFrequency === CONST.POLICY.AUTO_REPORTING_FREQUENCIES.MONTHLY);
-
-    const autoReportingFrequencyItems: WorkspaceAutoReportingFrequencyPageItem[] = Object.keys(getAutoReportingFrequencyDisplayNames(preferredLocale)).map((frequencyKey) => {
-        const isSelected = policy?.autoReportingFrequency === frequencyKey;
-
-        return {
-            text: getAutoReportingFrequencyDisplayNames(preferredLocale)[frequencyKey as AutoReportingFrequencyKey] || '',
-            keyForList: frequencyKey,
-            isSelected,
-        };
-    });
 
     const onSelectAutoReportingFrequency = (item: WorkspaceAutoReportingFrequencyPageItem) => {
-        Policy.setWorkspaceAutoReportingFrequency(policy?.id ?? '', item.keyForList as AutoReportingFrequencyKey);
+        Policy.setWorkspaceAutoReportingFrequency(policy?.id ?? '-1', item.keyForList as AutoReportingFrequencyKey);
 
         if (item.keyForList === CONST.POLICY.AUTO_REPORTING_FREQUENCIES.MONTHLY) {
-            setIsMonthlyFrequency(true);
             return;
         }
 
-        setIsMonthlyFrequency(false);
         Navigation.goBack();
     };
 
@@ -91,7 +81,7 @@ function WorkspaceAutoReportingFrequencyPage({policy, route}: WorkspaceAutoRepor
         <OfflineWithFeedback
             pendingAction={policy?.pendingFields?.autoReportingOffset}
             errors={ErrorUtils.getLatestErrorField(policy ?? {}, CONST.POLICY.COLLECTION_KEYS.AUTOREPORTING_OFFSET)}
-            onClose={() => Policy.clearPolicyErrorField(policy?.id ?? '', CONST.POLICY.COLLECTION_KEYS.AUTOREPORTING_OFFSET)}
+            onClose={() => Policy.clearPolicyErrorField(policy?.id ?? '-1', CONST.POLICY.COLLECTION_KEYS.AUTOREPORTING_OFFSET)}
             errorRowStyles={[styles.ml7]}
         >
             <MenuItem
@@ -106,16 +96,12 @@ function WorkspaceAutoReportingFrequencyPage({policy, route}: WorkspaceAutoRepor
         </OfflineWithFeedback>
     );
 
-    const renderItem = ({item}: {item: WorkspaceAutoReportingFrequencyPageItem}) => (
-        <>
-            <RadioListItem
-                item={item}
-                onSelectRow={() => onSelectAutoReportingFrequency(item)}
-                showTooltip={false}
-            />
-            {isMonthlyFrequency && item.keyForList === CONST.POLICY.AUTO_REPORTING_FREQUENCIES.MONTHLY ? monthlyFrequencyDetails() : null}
-        </>
-    );
+    const autoReportingFrequencyItems: WorkspaceAutoReportingFrequencyPageItem[] = Object.keys(getAutoReportingFrequencyDisplayNames(preferredLocale)).map((frequencyKey) => ({
+        text: getAutoReportingFrequencyDisplayNames(preferredLocale)[frequencyKey as AutoReportingFrequencyKey] || '',
+        keyForList: frequencyKey,
+        isSelected: frequencyKey === autoReportingFrequency,
+        footerContent: frequencyKey === autoReportingFrequency && frequencyKey === CONST.POLICY.AUTO_REPORTING_FREQUENCIES.MONTHLY ? monthlyFrequencyDetails() : null,
+    }));
 
     return (
         <AccessOrNotFoundWrapper
@@ -139,12 +125,16 @@ function WorkspaceAutoReportingFrequencyPage({policy, route}: WorkspaceAutoRepor
                     <OfflineWithFeedback
                         pendingAction={policy?.pendingFields?.autoReportingFrequency}
                         errors={ErrorUtils.getLatestErrorField(policy ?? {}, CONST.POLICY.COLLECTION_KEYS.AUTOREPORTING_FREQUENCY)}
-                        onClose={() => Policy.clearPolicyErrorField(policy?.id ?? '', CONST.POLICY.COLLECTION_KEYS.AUTOREPORTING_FREQUENCY)}
+                        onClose={() => Policy.clearPolicyErrorField(policy?.id ?? '-1', CONST.POLICY.COLLECTION_KEYS.AUTOREPORTING_FREQUENCY)}
+                        style={styles.flex1}
+                        contentContainerStyle={styles.flex1}
                     >
-                        <FlatList
-                            data={autoReportingFrequencyItems}
-                            renderItem={renderItem}
-                            keyExtractor={(item: WorkspaceAutoReportingFrequencyPageItem) => item.text}
+                        <SelectionList
+                            ListItem={RadioListItem}
+                            sections={[{data: autoReportingFrequencyItems}]}
+                            onSelectRow={onSelectAutoReportingFrequency}
+                            initiallyFocusedOptionKey={autoReportingFrequency}
+                            shouldUpdateFocusedIndex
                         />
                     </OfflineWithFeedback>
                 </FullPageNotFoundView>
diff --git a/src/pages/workspace/workflows/WorkspaceAutoReportingMonthlyOffsetPage.tsx b/src/pages/workspace/workflows/WorkspaceAutoReportingMonthlyOffsetPage.tsx
index 614e17e5b9c9..a9f96061ec0a 100644
--- a/src/pages/workspace/workflows/WorkspaceAutoReportingMonthlyOffsetPage.tsx
+++ b/src/pages/workspace/workflows/WorkspaceAutoReportingMonthlyOffsetPage.tsx
@@ -8,20 +8,20 @@ import SelectionList from '@components/SelectionList';
 import RadioListItem from '@components/SelectionList/RadioListItem';
 import useLocalize from '@hooks/useLocalize';
 import Navigation from '@libs/Navigation/Navigation';
-import type {WorkspacesCentralPaneNavigatorParamList} from '@libs/Navigation/types';
+import type {FullScreenNavigatorParamList} from '@libs/Navigation/types';
 import * as PolicyUtils from '@libs/PolicyUtils';
 import AccessOrNotFoundWrapper from '@pages/workspace/AccessOrNotFoundWrapper';
 import withPolicy from '@pages/workspace/withPolicy';
 import type {WithPolicyOnyxProps} from '@pages/workspace/withPolicy';
-import * as Policy from '@userActions/Policy';
+import * as Policy from '@userActions/Policy/Policy';
 import CONST from '@src/CONST';
+import ROUTES from '@src/ROUTES';
 import type SCREENS from '@src/SCREENS';
 import {isEmptyObject} from '@src/types/utils/EmptyObject';
 
 const DAYS_OF_MONTH = 28;
 
-type WorkspaceAutoReportingMonthlyOffsetProps = WithPolicyOnyxProps &
-    StackScreenProps<WorkspacesCentralPaneNavigatorParamList, typeof SCREENS.WORKSPACE.WORKFLOWS_AUTO_REPORTING_MONTHLY_OFFSET>;
+type WorkspaceAutoReportingMonthlyOffsetProps = WithPolicyOnyxProps & StackScreenProps<FullScreenNavigatorParamList, typeof SCREENS.WORKSPACE.WORKFLOWS_AUTO_REPORTING_MONTHLY_OFFSET>;
 
 type AutoReportingOffsetKeys = ValueOf<typeof CONST.POLICY.AUTO_REPORTING_OFFSET>;
 
@@ -67,8 +67,8 @@ function WorkspaceAutoReportingMonthlyOffsetPage({policy, route}: WorkspaceAutoR
     const headerMessage = searchText.trim() && !filteredDaysOfMonth.length ? translate('common.noResultsFound') : '';
 
     const onSelectDayOfMonth = (item: WorkspaceAutoReportingMonthlyOffsetPageItem) => {
-        Policy.setWorkspaceAutoReportingMonthlyOffset(policy?.id ?? '', item.isNumber ? parseInt(item.keyForList, 10) : (item.keyForList as AutoReportingOffsetKeys));
-        Navigation.goBack();
+        Policy.setWorkspaceAutoReportingMonthlyOffset(policy?.id ?? '-1', item.isNumber ? parseInt(item.keyForList, 10) : (item.keyForList as AutoReportingOffsetKeys));
+        Navigation.goBack(ROUTES.WORKSPACE_WORKFLOWS_AUTOREPORTING_FREQUENCY.getRoute(policy?.id ?? ''));
     };
 
     return (
@@ -88,7 +88,7 @@ function WorkspaceAutoReportingMonthlyOffsetPage({policy, route}: WorkspaceAutoR
                 >
                     <HeaderWithBackButton
                         title={translate('workflowsPage.submissionFrequency')}
-                        onBackButtonPress={Navigation.goBack}
+                        onBackButtonPress={() => Navigation.goBack(ROUTES.WORKSPACE_WORKFLOWS_AUTOREPORTING_FREQUENCY.getRoute(policy?.id ?? ''))}
                     />
 
                     <SelectionList
@@ -99,6 +99,7 @@ function WorkspaceAutoReportingMonthlyOffsetPage({policy, route}: WorkspaceAutoR
                         headerMessage={headerMessage}
                         ListItem={RadioListItem}
                         onSelectRow={onSelectDayOfMonth}
+                        shouldSingleExecuteRowSelect
                         initiallyFocusedOptionKey={offset.toString()}
                         showScrollIndicator
                     />
diff --git a/src/pages/workspace/workflows/WorkspaceWorkflowsApproverPage.tsx b/src/pages/workspace/workflows/WorkspaceWorkflowsApproverPage.tsx
deleted file mode 100644
index 0c12bace7a4d..000000000000
--- a/src/pages/workspace/workflows/WorkspaceWorkflowsApproverPage.tsx
+++ /dev/null
@@ -1,195 +0,0 @@
-import type {StackScreenProps} from '@react-navigation/stack';
-import React, {useCallback, useMemo, useState} from 'react';
-import type {SectionListData} from 'react-native';
-import type {OnyxEntry} from 'react-native-onyx';
-import Badge from '@components/Badge';
-import FullPageNotFoundView from '@components/BlockingViews/FullPageNotFoundView';
-import HeaderWithBackButton from '@components/HeaderWithBackButton';
-import ScreenWrapper from '@components/ScreenWrapper';
-import SelectionList from '@components/SelectionList';
-import type {ListItem, Section} from '@components/SelectionList/types';
-import UserListItem from '@components/SelectionList/UserListItem';
-import useLocalize from '@hooks/useLocalize';
-import useNetwork from '@hooks/useNetwork';
-import {formatPhoneNumber} from '@libs/LocalePhoneNumber';
-import Log from '@libs/Log';
-import Navigation from '@libs/Navigation/Navigation';
-import type {WorkspacesCentralPaneNavigatorParamList} from '@libs/Navigation/types';
-import * as OptionsListUtils from '@libs/OptionsListUtils';
-import * as PersonalDetailsUtils from '@libs/PersonalDetailsUtils';
-import * as PolicyUtils from '@libs/PolicyUtils';
-import * as UserUtils from '@libs/UserUtils';
-import AccessOrNotFoundWrapper from '@pages/workspace/AccessOrNotFoundWrapper';
-import withPolicyAndFullscreenLoading from '@pages/workspace/withPolicyAndFullscreenLoading';
-import type {WithPolicyAndFullscreenLoadingProps} from '@pages/workspace/withPolicyAndFullscreenLoading';
-import * as Policy from '@userActions/Policy';
-import CONST from '@src/CONST';
-import type SCREENS from '@src/SCREENS';
-import type {PersonalDetailsList, PolicyEmployee} from '@src/types/onyx';
-import {isEmptyObject} from '@src/types/utils/EmptyObject';
-
-type WorkspaceWorkflowsApproverPageOnyxProps = {
-    /** All of the personal details for everyone */
-    personalDetails: OnyxEntry<PersonalDetailsList>;
-};
-
-type WorkspaceWorkflowsApproverPageProps = WorkspaceWorkflowsApproverPageOnyxProps &
-    WithPolicyAndFullscreenLoadingProps &
-    StackScreenProps<WorkspacesCentralPaneNavigatorParamList, typeof SCREENS.WORKSPACE.WORKFLOWS_APPROVER>;
-type MemberOption = Omit<ListItem, 'accountID'> & {accountID: number};
-type MembersSection = SectionListData<MemberOption, Section<MemberOption>>;
-
-function WorkspaceWorkflowsApproverPage({policy, personalDetails, isLoadingReportData = true, route}: WorkspaceWorkflowsApproverPageProps) {
-    const {translate} = useLocalize();
-    const policyName = policy?.name ?? '';
-    const [searchTerm, setSearchTerm] = useState('');
-    const {isOffline} = useNetwork();
-
-    const isDeletedPolicyEmployee = useCallback(
-        (policyEmployee: PolicyEmployee) => !isOffline && policyEmployee.pendingAction === CONST.RED_BRICK_ROAD_PENDING_ACTION.DELETE && isEmptyObject(policyEmployee.errors),
-        [isOffline],
-    );
-
-    const [formattedPolicyEmployeeList, formattedApprover] = useMemo(() => {
-        const policyMemberDetails: MemberOption[] = [];
-        const approverDetails: MemberOption[] = [];
-
-        const policyMemberEmailsToAccountIDs = PolicyUtils.getMemberAccountIDsForWorkspace(policy?.employeeList);
-
-        Object.entries(policy?.employeeList ?? {}).forEach(([email, policyEmployee]) => {
-            if (isDeletedPolicyEmployee(policyEmployee)) {
-                return;
-            }
-
-            const accountID = Number(policyMemberEmailsToAccountIDs[email] ?? '');
-
-            const details = personalDetails?.[accountID];
-            if (!details) {
-                Log.hmmm(`[WorkspaceMembersPage] no personal details found for policy member with accountID: ${accountID}`);
-                return;
-            }
-
-            const isOwner = policy?.owner === details.login;
-            const isAdmin = policyEmployee.role === CONST.POLICY.ROLE.ADMIN;
-
-            let roleBadge = null;
-            if (isOwner || isAdmin) {
-                roleBadge = <Badge text={isOwner ? translate('common.owner') : translate('common.admin')} />;
-            }
-
-            const formattedMember = {
-                keyForList: String(accountID),
-                accountID,
-                isSelected: policy?.approver === details.login,
-                isDisabled: policyEmployee.pendingAction === CONST.RED_BRICK_ROAD_PENDING_ACTION.DELETE || !isEmptyObject(policyEmployee.errors),
-                text: formatPhoneNumber(PersonalDetailsUtils.getDisplayNameOrDefault(details)),
-                alternateText: formatPhoneNumber(details?.login ?? ''),
-                rightElement: roleBadge,
-                icons: [
-                    {
-                        source: UserUtils.getAvatar(details.avatar, accountID),
-                        name: formatPhoneNumber(details?.login ?? ''),
-                        type: CONST.ICON_TYPE_AVATAR,
-                        id: accountID,
-                    },
-                ],
-                errors: policyEmployee.errors,
-                pendingAction: policyEmployee.pendingAction,
-            };
-
-            if (policy?.approver === details.login) {
-                approverDetails.push(formattedMember);
-            } else {
-                policyMemberDetails.push(formattedMember);
-            }
-        });
-        return [policyMemberDetails, approverDetails];
-    }, [personalDetails, translate, policy?.approver, isDeletedPolicyEmployee, policy?.owner, policy?.employeeList]);
-
-    const sections: MembersSection[] = useMemo(() => {
-        const sectionsArray: MembersSection[] = [];
-
-        if (searchTerm !== '') {
-            const filteredOptions = [...formattedApprover, ...formattedPolicyEmployeeList].filter((option) => {
-                const searchValue = OptionsListUtils.getSearchValueForPhoneOrEmail(searchTerm);
-                return !!option.text?.toLowerCase().includes(searchValue) || !!option.login?.toLowerCase().includes(searchValue);
-            });
-            return [
-                {
-                    title: undefined,
-                    data: filteredOptions,
-                    shouldShow: true,
-                },
-            ];
-        }
-
-        sectionsArray.push({
-            title: undefined,
-            data: formattedApprover,
-            shouldShow: formattedApprover.length > 0,
-        });
-
-        sectionsArray.push({
-            title: translate('common.all'),
-            data: formattedPolicyEmployeeList,
-            shouldShow: true,
-        });
-
-        return sectionsArray;
-    }, [formattedPolicyEmployeeList, formattedApprover, searchTerm, translate]);
-
-    const headerMessage = useMemo(
-        () => (searchTerm && !sections[0].data.length ? translate('common.noResultsFound') : ''),
-
-        // eslint-disable-next-line react-hooks/exhaustive-deps
-        [translate, sections],
-    );
-
-    const setPolicyApprover = (member: MemberOption) => {
-        if (!policy?.approvalMode || !personalDetails?.[member.accountID]?.login) {
-            return;
-        }
-        const approver: string = personalDetails?.[member.accountID]?.login ?? policy.approver ?? policy.owner;
-        Policy.setWorkspaceApprovalMode(policy.id, approver, policy.approvalMode);
-        Navigation.goBack();
-    };
-
-    return (
-        <AccessOrNotFoundWrapper
-            policyID={route.params.policyID}
-            featureName={CONST.POLICY.MORE_FEATURES.ARE_WORKFLOWS_ENABLED}
-        >
-            <ScreenWrapper
-                includeSafeAreaPaddingBottom={false}
-                testID={WorkspaceWorkflowsApproverPage.displayName}
-            >
-                <FullPageNotFoundView
-                    shouldShow={(isEmptyObject(policy) && !isLoadingReportData) || !PolicyUtils.isPolicyAdmin(policy) || PolicyUtils.isPendingDeletePolicy(policy)}
-                    subtitleKey={isEmptyObject(policy) ? undefined : 'workspace.common.notAuthorized'}
-                    onBackButtonPress={PolicyUtils.goBackFromInvalidPolicy}
-                    onLinkPress={PolicyUtils.goBackFromInvalidPolicy}
-                >
-                    <HeaderWithBackButton
-                        title={translate('workflowsPage.approver')}
-                        subtitle={policyName}
-                        onBackButtonPress={Navigation.goBack}
-                    />
-                    <SelectionList
-                        sections={sections}
-                        textInputLabel={translate('optionsSelector.findMember')}
-                        textInputValue={searchTerm}
-                        onChangeText={setSearchTerm}
-                        headerMessage={headerMessage}
-                        ListItem={UserListItem}
-                        onSelectRow={setPolicyApprover}
-                        showScrollIndicator
-                    />
-                </FullPageNotFoundView>
-            </ScreenWrapper>
-        </AccessOrNotFoundWrapper>
-    );
-}
-
-WorkspaceWorkflowsApproverPage.displayName = 'WorkspaceWorkflowsApproverPage';
-
-export default withPolicyAndFullscreenLoading(WorkspaceWorkflowsApproverPage);
diff --git a/src/pages/workspace/workflows/WorkspaceWorkflowsPage.tsx b/src/pages/workspace/workflows/WorkspaceWorkflowsPage.tsx
index d5753f15c218..bd0f2775a884 100644
--- a/src/pages/workspace/workflows/WorkspaceWorkflowsPage.tsx
+++ b/src/pages/workspace/workflows/WorkspaceWorkflowsPage.tsx
@@ -1,31 +1,40 @@
 import {useFocusEffect} from '@react-navigation/native';
 import type {StackScreenProps} from '@react-navigation/stack';
 import React, {useCallback, useMemo, useState} from 'react';
-import {View} from 'react-native';
+import {ActivityIndicator, View} from 'react-native';
 import type {OnyxEntry} from 'react-native-onyx';
-import {withOnyx} from 'react-native-onyx';
+import {useOnyx, withOnyx} from 'react-native-onyx';
+import ApprovalWorkflowSection from '@components/ApprovalWorkflowSection';
 import ConfirmModal from '@components/ConfirmModal';
+import getBankIcon from '@components/Icon/BankIcons';
+import type {BankName} from '@components/Icon/BankIconsUtils';
+import * as Expensicons from '@components/Icon/Expensicons';
 import * as Illustrations from '@components/Icon/Illustrations';
 import MenuItem from '@components/MenuItem';
+import MenuItemWithTopDescription from '@components/MenuItemWithTopDescription';
 import OfflineWithFeedback from '@components/OfflineWithFeedback';
 import Section from '@components/Section';
 import Text from '@components/Text';
 import useLocalize from '@hooks/useLocalize';
 import useNetwork from '@hooks/useNetwork';
+import useResponsiveLayout from '@hooks/useResponsiveLayout';
+import useTheme from '@hooks/useTheme';
 import useThemeStyles from '@hooks/useThemeStyles';
-import useWindowDimensions from '@hooks/useWindowDimensions';
 import * as ErrorUtils from '@libs/ErrorUtils';
 import Navigation from '@libs/Navigation/Navigation';
+import {getPaymentMethodDescription} from '@libs/PaymentUtils';
 import Permissions from '@libs/Permissions';
 import * as PersonalDetailsUtils from '@libs/PersonalDetailsUtils';
 import * as PolicyUtils from '@libs/PolicyUtils';
-import type {WorkspacesCentralPaneNavigatorParamList} from '@navigation/types';
+import {convertPolicyEmployeesToApprovalWorkflows, INITIAL_APPROVAL_WORKFLOW} from '@libs/WorkflowUtils';
+import type {FullScreenNavigatorParamList} from '@navigation/types';
 import AccessOrNotFoundWrapper from '@pages/workspace/AccessOrNotFoundWrapper';
 import type {WithPolicyProps} from '@pages/workspace/withPolicy';
 import withPolicy from '@pages/workspace/withPolicy';
 import WorkspacePageWithSections from '@pages/workspace/WorkspacePageWithSections';
-import * as Policy from '@userActions/Policy';
+import * as Policy from '@userActions/Policy/Policy';
 import {navigateToBankAccountRoute} from '@userActions/ReimbursementAccount';
+import * as Workflow from '@userActions/Workflow';
 import CONST from '@src/CONST';
 import ONYXKEYS from '@src/ONYXKEYS';
 import ROUTES from '@src/ROUTES';
@@ -40,29 +49,38 @@ type WorkspaceWorkflowsPageOnyxProps = {
     /** Beta features list */
     betas: OnyxEntry<Beta[]>;
 };
-type WorkspaceWorkflowsPageProps = WithPolicyProps & WorkspaceWorkflowsPageOnyxProps & StackScreenProps<WorkspacesCentralPaneNavigatorParamList, typeof SCREENS.WORKSPACE.WORKFLOWS>;
+type WorkspaceWorkflowsPageProps = WithPolicyProps & WorkspaceWorkflowsPageOnyxProps & StackScreenProps<FullScreenNavigatorParamList, typeof SCREENS.WORKSPACE.WORKFLOWS>;
 
 function WorkspaceWorkflowsPage({policy, betas, route}: WorkspaceWorkflowsPageProps) {
     const {translate, preferredLocale} = useLocalize();
+    const theme = useTheme();
     const styles = useThemeStyles();
-    const {isSmallScreenWidth} = useWindowDimensions();
+    const {shouldUseNarrowLayout, isSmallScreenWidth} = useResponsiveLayout();
 
     const policyApproverEmail = policy?.approver;
-    const policyApproverName = useMemo(() => PersonalDetailsUtils.getPersonalDetailByEmail(policyApproverEmail ?? '')?.displayName ?? policyApproverEmail, [policyApproverEmail]);
-    const containerStyle = useMemo(() => [styles.ph8, styles.mhn8, styles.ml11, styles.pv3, styles.pr0, styles.pl4, styles.mr0, styles.widthAuto, styles.mt4], [styles]);
-    const canUseDelayedSubmission = Permissions.canUseWorkflowsDelayedSubmission(betas);
+    const canUseAdvancedApproval = Permissions.canUseWorkflowsAdvancedApproval(betas);
     const [isCurrencyModalOpen, setIsCurrencyModalOpen] = useState(false);
-
+    const [personalDetails] = useOnyx(ONYXKEYS.PERSONAL_DETAILS_LIST);
+    const policyApproverName = useMemo(() => PersonalDetailsUtils.getPersonalDetailByEmail(policyApproverEmail ?? '')?.displayName ?? policyApproverEmail, [policyApproverEmail]);
+    const {approvalWorkflows, availableMembers, usedApproverEmails} = useMemo(
+        () =>
+            convertPolicyEmployeesToApprovalWorkflows({
+                employees: policy?.employeeList ?? {},
+                defaultApprover: policyApproverEmail ?? policy?.owner ?? '',
+                personalDetails: personalDetails ?? {},
+            }),
+        [personalDetails, policy?.employeeList, policy?.owner, policyApproverEmail],
+    );
     const displayNameForAuthorizedPayer = useMemo(
         () => PersonalDetailsUtils.getPersonalDetailByEmail(policy?.achAccount?.reimburser ?? '')?.displayName ?? policy?.achAccount?.reimburser,
         [policy?.achAccount?.reimburser],
     );
 
-    const onPressAutoReportingFrequency = useCallback(() => Navigation.navigate(ROUTES.WORKSPACE_WORKFLOWS_AUTOREPORTING_FREQUENCY.getRoute(policy?.id ?? '')), [policy?.id]);
+    const onPressAutoReportingFrequency = useCallback(() => Navigation.navigate(ROUTES.WORKSPACE_WORKFLOWS_AUTOREPORTING_FREQUENCY.getRoute(route.params.policyID)), [route.params.policyID]);
 
     const fetchData = useCallback(() => {
-        Policy.openPolicyWorkflowsPage(policy?.id ?? route.params.policyID);
-    }, [policy?.id, route.params.policyID]);
+        Policy.openPolicyWorkflowsPage(route.params.policyID);
+    }, [route.params.policyID]);
 
     const confirmCurrencyChangeAndHideModal = useCallback(() => {
         if (!policy) {
@@ -82,174 +100,231 @@ function WorkspaceWorkflowsPage({policy, betas, route}: WorkspaceWorkflowsPagePr
         }, [fetchData]),
     );
 
+    // User should be allowed to add new Approval Workflow only if he's upgraded to Control Plan, otherwise redirected to the Upgrade Page
+    const addApprovalAction = useCallback(() => {
+        if (!PolicyUtils.isControlPolicy(policy)) {
+            Navigation.navigate(
+                ROUTES.WORKSPACE_UPGRADE.getRoute(route.params.policyID, CONST.UPGRADE_FEATURE_INTRO_MAPPING.approvals.alias, ROUTES.WORKSPACE_WORKFLOWS.getRoute(route.params.policyID)),
+            );
+            return;
+        }
+
+        Workflow.setApprovalWorkflow({
+            ...INITIAL_APPROVAL_WORKFLOW,
+            availableMembers,
+            usedApproverEmails,
+        });
+        Navigation.navigate(ROUTES.WORKSPACE_WORKFLOWS_APPROVALS_EXPENSES_FROM.getRoute(route.params.policyID));
+    }, [policy, route.params.policyID, availableMembers, usedApproverEmails]);
+
     const optionItems: ToggleSettingOptionRowProps[] = useMemo(() => {
-        const {accountNumber, addressName, bankName} = policy?.achAccount ?? {};
-        const hasVBA = !!policy?.achAccount;
+        const {accountNumber, addressName, bankName, bankAccountID} = policy?.achAccount ?? {};
+        const shouldShowBankAccount = !!bankAccountID && policy?.reimbursementChoice === CONST.POLICY.REIMBURSEMENT_CHOICES.REIMBURSEMENT_YES;
+        const bankIcon = getBankIcon({bankName: bankName as BankName, isCard: false, styles});
+
         let bankDisplayName = bankName ?? addressName;
         if (accountNumber && bankDisplayName !== accountNumber) {
             bankDisplayName += ` ${accountNumber.slice(-5)}`;
         }
         const hasReimburserError = !!policy?.errorFields?.reimburser;
         const hasApprovalError = !!policy?.errorFields?.approvalMode;
-        const hasDelayedSubmissionError = !!policy?.errorFields?.autoReporting;
+        const hasDelayedSubmissionError = !!policy?.errorFields?.autoReporting ?? !!policy?.errorFields?.autoReportingFrequency;
 
         return [
-            ...(canUseDelayedSubmission
-                ? [
-                      {
-                          icon: Illustrations.ReceiptEnvelope,
-                          title: translate('workflowsPage.delaySubmissionTitle'),
-                          subtitle: translate('workflowsPage.delaySubmissionDescription'),
-                          onToggle: (isEnabled: boolean) => {
-                              const frequency =
-                                  policy?.autoReportingFrequency === CONST.POLICY.AUTO_REPORTING_FREQUENCIES.INSTANT || !policy?.autoReportingFrequency
-                                      ? CONST.POLICY.AUTO_REPORTING_FREQUENCIES.WEEKLY
-                                      : policy.autoReportingFrequency;
-                              Policy.setWorkspaceAutoReporting(route.params.policyID, isEnabled, frequency);
-                          },
-                          subMenuItems: (
-                              <MenuItem
-                                  title={translate('workflowsPage.submissionFrequency')}
-                                  titleStyle={styles.textLabelSupportingNormal}
-                                  descriptionTextStyle={styles.textNormalThemeText}
-                                  onPress={onPressAutoReportingFrequency}
-                                  // Instant submit is the equivalent of delayed submissions being turned off, so we show the feature as disabled if the frequency is instant
-                                  description={
-                                      getAutoReportingFrequencyDisplayNames(preferredLocale)[
-                                          (policy?.autoReportingFrequency as AutoReportingFrequencyKey) ?? CONST.POLICY.AUTO_REPORTING_FREQUENCIES.WEEKLY
-                                      ]
-                                  }
-                                  shouldShowRightIcon
-                                  wrapperStyle={containerStyle}
-                                  hoverAndPressStyle={[styles.mr0, styles.br2]}
-                                  brickRoadIndicator={hasDelayedSubmissionError ? CONST.BRICK_ROAD_INDICATOR_STATUS.ERROR : undefined}
-                              />
-                          ),
-                          isActive: (policy?.harvesting?.enabled && policy.autoReportingFrequency !== CONST.POLICY.AUTO_REPORTING_FREQUENCIES.INSTANT && !hasDelayedSubmissionError) ?? false,
-                          pendingAction: policy?.pendingFields?.autoReporting,
-                          errors: ErrorUtils.getLatestErrorField(policy ?? {}, CONST.POLICY.COLLECTION_KEYS.AUTOREPORTING),
-                          onCloseError: () => Policy.clearPolicyErrorField(policy?.id ?? '', CONST.POLICY.COLLECTION_KEYS.AUTOREPORTING),
-                      },
-                  ]
-                : []),
             {
-                icon: Illustrations.Approval,
+                title: translate('workflowsPage.delaySubmissionTitle'),
+                subtitle: translate('workflowsPage.delaySubmissionDescription'),
+                switchAccessibilityLabel: translate('workflowsPage.delaySubmissionDescription'),
+                onToggle: (isEnabled: boolean) => {
+                    Policy.setWorkspaceAutoReportingFrequency(
+                        route.params.policyID,
+                        isEnabled ? CONST.POLICY.AUTO_REPORTING_FREQUENCIES.WEEKLY : CONST.POLICY.AUTO_REPORTING_FREQUENCIES.INSTANT,
+                    );
+                },
+                subMenuItems: (
+                    <MenuItemWithTopDescription
+                        title={
+                            getAutoReportingFrequencyDisplayNames(preferredLocale)[
+                                (PolicyUtils.getCorrectedAutoReportingFrequency(policy) as AutoReportingFrequencyKey) ?? CONST.POLICY.AUTO_REPORTING_FREQUENCIES.WEEKLY
+                            ]
+                        }
+                        titleStyle={styles.textNormalThemeText}
+                        descriptionTextStyle={styles.textLabelSupportingNormal}
+                        onPress={onPressAutoReportingFrequency}
+                        // Instant submit is the equivalent of delayed submissions being turned off, so we show the feature as disabled if the frequency is instant
+                        description={translate('workflowsPage.submissionFrequency')}
+                        shouldShowRightIcon
+                        wrapperStyle={[styles.sectionMenuItemTopDescription, styles.mt3, styles.mbn3]}
+                        brickRoadIndicator={hasDelayedSubmissionError ? CONST.BRICK_ROAD_INDICATOR_STATUS.ERROR : undefined}
+                    />
+                ),
+                isActive: (policy?.autoReportingFrequency !== CONST.POLICY.AUTO_REPORTING_FREQUENCIES.INSTANT && !hasDelayedSubmissionError) ?? false,
+                pendingAction: policy?.pendingFields?.autoReporting ?? policy?.pendingFields?.autoReportingFrequency,
+                errors: ErrorUtils.getLatestErrorField(policy ?? {}, CONST.POLICY.COLLECTION_KEYS.AUTOREPORTING),
+                onCloseError: () => Policy.clearPolicyErrorField(route.params.policyID, CONST.POLICY.COLLECTION_KEYS.AUTOREPORTING),
+            },
+            {
                 title: translate('workflowsPage.addApprovalsTitle'),
                 subtitle: translate('workflowsPage.addApprovalsDescription'),
+                switchAccessibilityLabel: translate('workflowsPage.addApprovalsDescription'),
                 onToggle: (isEnabled: boolean) => {
                     Policy.setWorkspaceApprovalMode(route.params.policyID, policy?.owner ?? '', isEnabled ? CONST.POLICY.APPROVAL_MODE.BASIC : CONST.POLICY.APPROVAL_MODE.OPTIONAL);
                 },
-                subMenuItems: (
-                    <MenuItem
-                        title={translate('workflowsPage.approver')}
-                        titleStyle={styles.textLabelSupportingNormal}
-                        descriptionTextStyle={styles.textNormalThemeText}
-                        description={policyApproverName ?? ''}
-                        onPress={() => Navigation.navigate(ROUTES.WORKSPACE_WORKFLOWS_APPROVER.getRoute(route.params.policyID))}
+                subMenuItems: canUseAdvancedApproval ? (
+                    <>
+                        {approvalWorkflows.map((workflow, index) => (
+                            <OfflineWithFeedback
+                                // eslint-disable-next-line react/no-array-index-key
+                                key={`workflow-${index}`}
+                                pendingAction={policy?.pendingFields?.employeeList}
+                            >
+                                <ApprovalWorkflowSection
+                                    approvalWorkflow={workflow}
+                                    onPress={() => Navigation.navigate(ROUTES.WORKSPACE_WORKFLOWS_APPROVALS_EDIT.getRoute(route.params.policyID, workflow.approvers[0].email))}
+                                />
+                            </OfflineWithFeedback>
+                        ))}
+                        <MenuItem
+                            title={translate('workflowsPage.addApprovalButton')}
+                            titleStyle={styles.textStrong}
+                            icon={Expensicons.Plus}
+                            iconHeight={20}
+                            iconWidth={20}
+                            iconFill={theme.success}
+                            style={[styles.sectionMenuItemTopDescription, styles.mt6, styles.mbn3]}
+                            onPress={addApprovalAction}
+                        />
+                    </>
+                ) : (
+                    <MenuItemWithTopDescription
+                        title={policyApproverName ?? ''}
+                        titleStyle={styles.textNormalThemeText}
+                        descriptionTextStyle={styles.textLabelSupportingNormal}
+                        description={translate('workflowsPage.approver')}
+                        onPress={() => Navigation.navigate(ROUTES.WORKSPACE_WORKFLOWS_APPROVALS_APPROVER.getRoute(route.params.policyID))}
                         shouldShowRightIcon
-                        wrapperStyle={containerStyle}
-                        hoverAndPressStyle={[styles.mr0, styles.br2]}
+                        wrapperStyle={[styles.sectionMenuItemTopDescription, styles.mt3, styles.mbn3]}
                         brickRoadIndicator={hasApprovalError ? CONST.BRICK_ROAD_INDICATOR_STATUS.ERROR : undefined}
                     />
                 ),
-                isActive: (policy?.approvalMode === CONST.POLICY.APPROVAL_MODE.BASIC && !hasApprovalError) ?? false,
+                isActive:
+                    ([CONST.POLICY.APPROVAL_MODE.BASIC, CONST.POLICY.APPROVAL_MODE.ADVANCED].some((approvalMode) => approvalMode === policy?.approvalMode) && !hasApprovalError) ?? false,
                 pendingAction: policy?.pendingFields?.approvalMode,
                 errors: ErrorUtils.getLatestErrorField(policy ?? {}, CONST.POLICY.COLLECTION_KEYS.APPROVAL_MODE),
-                onCloseError: () => Policy.clearPolicyErrorField(policy?.id ?? '', CONST.POLICY.COLLECTION_KEYS.APPROVAL_MODE),
+                onCloseError: () => Policy.clearPolicyErrorField(route.params.policyID, CONST.POLICY.COLLECTION_KEYS.APPROVAL_MODE),
             },
             {
-                icon: Illustrations.WalletAlt,
                 title: translate('workflowsPage.makeOrTrackPaymentsTitle'),
                 subtitle: translate('workflowsPage.makeOrTrackPaymentsDescription'),
+                switchAccessibilityLabel: translate('workflowsPage.makeOrTrackPaymentsDescription'),
                 onToggle: (isEnabled: boolean) => {
                     let newReimbursementChoice;
                     if (!isEnabled) {
                         newReimbursementChoice = CONST.POLICY.REIMBURSEMENT_CHOICES.REIMBURSEMENT_NO;
-                    } else if (hasVBA && !Policy.isCurrencySupportedForDirectReimbursement(policy?.outputCurrency ?? '')) {
+                    } else if (!!policy?.achAccount && !Policy.isCurrencySupportedForDirectReimbursement(policy?.outputCurrency ?? '')) {
                         newReimbursementChoice = CONST.POLICY.REIMBURSEMENT_CHOICES.REIMBURSEMENT_MANUAL;
                     } else {
-                        newReimbursementChoice = hasVBA ? CONST.POLICY.REIMBURSEMENT_CHOICES.REIMBURSEMENT_YES : CONST.POLICY.REIMBURSEMENT_CHOICES.REIMBURSEMENT_MANUAL;
+                        newReimbursementChoice = CONST.POLICY.REIMBURSEMENT_CHOICES.REIMBURSEMENT_YES;
                     }
 
                     const newReimburserEmail = policy?.achAccount?.reimburser ?? policy?.owner;
-                    Policy.setWorkspaceReimbursement(policy?.id ?? '', newReimbursementChoice, newReimburserEmail ?? '');
+                    Policy.setWorkspaceReimbursement(route.params.policyID, newReimbursementChoice, newReimburserEmail ?? '');
                 },
-                subMenuItems: (
-                    <>
-                        <MenuItem
-                            titleStyle={hasVBA ? styles.textLabelSupportingNormal : styles.textLabelSupportingEmptyValue}
-                            descriptionTextStyle={styles.textNormalThemeText}
-                            title={
-                                hasVBA && policy?.reimbursementChoice === CONST.POLICY.REIMBURSEMENT_CHOICES.REIMBURSEMENT_YES
-                                    ? translate('common.bankAccount')
-                                    : translate('workflowsPage.connectBankAccount')
-                            }
-                            description={bankDisplayName}
-                            disabled={isOffline || !isPolicyAdmin}
-                            onPress={() => {
-                                if (!Policy.isCurrencySupportedForDirectReimbursement(policy?.outputCurrency ?? '')) {
-                                    setIsCurrencyModalOpen(true);
-                                    return;
-                                }
-                                navigateToBankAccountRoute(route.params.policyID, ROUTES.WORKSPACE_WORKFLOWS.getRoute(route.params.policyID));
-                            }}
-                            shouldShowRightIcon={!isOffline && isPolicyAdmin}
-                            wrapperStyle={containerStyle}
-                            hoverAndPressStyle={[styles.mr0, styles.br2]}
+                subMenuItems:
+                    !isOffline && policy?.isLoadingWorkspaceReimbursement === true ? (
+                        <ActivityIndicator
+                            size={CONST.ACTIVITY_INDICATOR_SIZE.LARGE}
+                            color={theme.spinner}
+                            style={styles.mt7}
                         />
-                        {hasVBA && policy?.reimbursementChoice === CONST.POLICY.REIMBURSEMENT_CHOICES.REIMBURSEMENT_YES && (
-                            <OfflineWithFeedback
-                                pendingAction={policy?.pendingFields?.reimburser}
-                                errors={ErrorUtils.getLatestErrorField(policy ?? {}, CONST.POLICY.COLLECTION_KEYS.REIMBURSER)}
-                                onClose={() => Policy.clearPolicyErrorField(policy?.id ?? '', CONST.POLICY.COLLECTION_KEYS.REIMBURSER)}
-                                errorRowStyles={[styles.ml7]}
-                            >
-                                <MenuItem
-                                    titleStyle={styles.textLabelSupportingNormal}
-                                    descriptionTextStyle={styles.textNormalThemeText}
-                                    title={translate('workflowsPayerPage.title')}
-                                    description={displayNameForAuthorizedPayer}
-                                    onPress={() => Navigation.navigate(ROUTES.WORKSPACE_WORKFLOWS_PAYER.getRoute(route.params.policyID))}
-                                    shouldShowRightIcon
-                                    wrapperStyle={containerStyle}
-                                    hoverAndPressStyle={[styles.mr0, styles.br2]}
-                                    brickRoadIndicator={hasReimburserError ? CONST.BRICK_ROAD_INDICATOR_STATUS.ERROR : undefined}
-                                />
-                            </OfflineWithFeedback>
-                        )}
-                    </>
-                ),
+                    ) : (
+                        <>
+                            {shouldShowBankAccount && (
+                                <View style={[styles.sectionMenuItemTopDescription, styles.mt5, styles.mbn3, styles.pb1, styles.pt1]}>
+                                    <Text style={[styles.textLabelSupportingNormal, styles.colorMuted]}>{translate('workflowsPayerPage.paymentAccount')}</Text>
+                                </View>
+                            )}
+                            <MenuItem
+                                title={shouldShowBankAccount ? addressName : translate('workflowsPage.connectBankAccount')}
+                                titleStyle={shouldShowBankAccount ? undefined : styles.textLabelSupportingEmptyValue}
+                                description={getPaymentMethodDescription(CONST.PAYMENT_METHODS.BUSINESS_BANK_ACCOUNT, policy?.achAccount ?? {})}
+                                onPress={() => {
+                                    if (!Policy.isCurrencySupportedForDirectReimbursement(policy?.outputCurrency ?? '')) {
+                                        setIsCurrencyModalOpen(true);
+                                        return;
+                                    }
+                                    navigateToBankAccountRoute(route.params.policyID, ROUTES.WORKSPACE_WORKFLOWS.getRoute(route.params.policyID));
+                                }}
+                                icon={shouldShowBankAccount ? bankIcon.icon : undefined}
+                                iconHeight={bankIcon.iconHeight ?? bankIcon.iconSize}
+                                iconWidth={bankIcon.iconWidth ?? bankIcon.iconSize}
+                                iconStyles={bankIcon.iconStyles}
+                                disabled={isOffline || !isPolicyAdmin}
+                                shouldGreyOutWhenDisabled={!policy?.pendingFields?.reimbursementChoice}
+                                shouldShowRightIcon={!isOffline && isPolicyAdmin}
+                                wrapperStyle={[styles.sectionMenuItemTopDescription, styles.mt3, styles.mbn3]}
+                                displayInDefaultIconColor
+                                brickRoadIndicator={hasReimburserError ? CONST.BRICK_ROAD_INDICATOR_STATUS.ERROR : undefined}
+                            />
+                            {shouldShowBankAccount && (
+                                <OfflineWithFeedback
+                                    pendingAction={policy?.pendingFields?.reimburser}
+                                    shouldDisableOpacity={isOffline && !!policy?.pendingFields?.reimbursementChoice && !!policy?.pendingFields?.reimburser}
+                                    errors={ErrorUtils.getLatestErrorField(policy ?? {}, CONST.POLICY.COLLECTION_KEYS.REIMBURSER)}
+                                    onClose={() => Policy.clearPolicyErrorField(policy?.id ?? '', CONST.POLICY.COLLECTION_KEYS.REIMBURSER)}
+                                    errorRowStyles={[styles.ml7]}
+                                >
+                                    <MenuItemWithTopDescription
+                                        title={displayNameForAuthorizedPayer ?? ''}
+                                        titleStyle={styles.textNormalThemeText}
+                                        descriptionTextStyle={styles.textLabelSupportingNormal}
+                                        description={translate('workflowsPayerPage.payer')}
+                                        onPress={() => Navigation.navigate(ROUTES.WORKSPACE_WORKFLOWS_PAYER.getRoute(route.params.policyID))}
+                                        shouldShowRightIcon
+                                        wrapperStyle={[styles.sectionMenuItemTopDescription, styles.mt3, styles.mbn3]}
+                                        brickRoadIndicator={hasReimburserError ? CONST.BRICK_ROAD_INDICATOR_STATUS.ERROR : undefined}
+                                    />
+                                </OfflineWithFeedback>
+                            )}
+                        </>
+                    ),
                 isEndOptionRow: true,
                 isActive: policy?.reimbursementChoice !== CONST.POLICY.REIMBURSEMENT_CHOICES.REIMBURSEMENT_NO,
                 pendingAction: policy?.pendingFields?.reimbursementChoice,
                 errors: ErrorUtils.getLatestErrorField(policy ?? {}, CONST.POLICY.COLLECTION_KEYS.REIMBURSEMENT_CHOICE),
-                onCloseError: () => Policy.clearPolicyErrorField(policy?.id ?? '', CONST.POLICY.COLLECTION_KEYS.REIMBURSEMENT_CHOICE),
+                onCloseError: () => Policy.clearPolicyErrorField(route.params.policyID, CONST.POLICY.COLLECTION_KEYS.REIMBURSEMENT_CHOICE),
             },
         ];
     }, [
         policy,
-        route.params.policyID,
         styles,
         translate,
-        policyApproverName,
-        containerStyle,
-        onPressAutoReportingFrequency,
         preferredLocale,
-        canUseDelayedSubmission,
-        displayNameForAuthorizedPayer,
+        onPressAutoReportingFrequency,
+        canUseAdvancedApproval,
+        approvalWorkflows,
+        theme.success,
+        theme.spinner,
+        addApprovalAction,
+        policyApproverName,
         isOffline,
         isPolicyAdmin,
+        displayNameForAuthorizedPayer,
+        route.params.policyID,
     ]);
 
     const renderOptionItem = (item: ToggleSettingOptionRowProps, index: number) => (
-        <View
-            style={styles.mt7}
+        <Section
+            containerStyles={isSmallScreenWidth ? styles.p5 : styles.p8}
             key={`toggleSettingOptionItem-${index}`}
+            renderTitle={() => <View />}
         >
             <ToggleSettingOptionRow
-                icon={item.icon}
                 title={item.title}
+                titleStyle={[styles.textHeadline, styles.cardSectionTitle, styles.accountSettingsSectionTitle, styles.mb1]}
                 subtitle={item.subtitle}
+                subtitleStyle={[styles.textLabelSupportingEmptyValue]}
+                switchAccessibilityLabel={item.switchAccessibilityLabel}
                 onToggle={item.onToggle}
                 subMenuItems={item.subMenuItems}
                 isActive={item.isActive}
@@ -257,11 +332,11 @@ function WorkspaceWorkflowsPage({policy, betas, route}: WorkspaceWorkflowsPagePr
                 errors={item.errors}
                 onCloseError={item.onCloseError}
             />
-        </View>
+        </Section>
     );
 
     const isPaidGroupPolicy = PolicyUtils.isPaidGroupPolicy(policy);
-    const isLoading = Boolean(policy?.isLoading && policy?.reimbursementChoice === undefined);
+    const isLoading = !!(policy?.isLoading && policy?.reimbursementChoice === undefined);
 
     return (
         <AccessOrNotFoundWrapper
@@ -275,32 +350,22 @@ function WorkspaceWorkflowsPage({policy, betas, route}: WorkspaceWorkflowsPagePr
                 guidesCallTaskID={CONST.GUIDES_CALL_TASK_IDS.WORKSPACE_WORKFLOWS}
                 shouldShowOfflineIndicatorInWideScreen
                 shouldShowNotFoundPage={!isPaidGroupPolicy || !isPolicyAdmin}
-                shouldSkipVBBACall
                 isLoading={isLoading}
                 shouldShowLoading={isLoading}
                 shouldUseScrollView
             >
-                <View style={[styles.mt3, styles.textStrong, isSmallScreenWidth ? styles.workspaceSectionMobile : styles.workspaceSection]}>
-                    <Section
-                        title={translate('workflowsPage.workflowTitle')}
-                        titleStyles={styles.textStrong}
-                        containerStyles={isSmallScreenWidth ? styles.p5 : styles.p8}
-                    >
-                        <View>
-                            <Text style={[styles.mt3, styles.textSupporting]}>{translate('workflowsPage.workflowDescription')}</Text>
-                            {optionItems.map(renderOptionItem)}
-                            <ConfirmModal
-                                title={translate('workspace.bankAccount.workspaceCurrency')}
-                                isVisible={isCurrencyModalOpen}
-                                onConfirm={confirmCurrencyChangeAndHideModal}
-                                onCancel={() => setIsCurrencyModalOpen(false)}
-                                prompt={translate('workspace.bankAccount.updateCurrencyPrompt')}
-                                confirmText={translate('workspace.bankAccount.updateToUSD')}
-                                cancelText={translate('common.cancel')}
-                                danger
-                            />
-                        </View>
-                    </Section>
+                <View style={[styles.mt3, shouldUseNarrowLayout ? styles.workspaceSectionMobile : styles.workspaceSection]}>
+                    {optionItems.map(renderOptionItem)}
+                    <ConfirmModal
+                        title={translate('workspace.bankAccount.workspaceCurrency')}
+                        isVisible={isCurrencyModalOpen}
+                        onConfirm={confirmCurrencyChangeAndHideModal}
+                        onCancel={() => setIsCurrencyModalOpen(false)}
+                        prompt={translate('workspace.bankAccount.updateCurrencyPrompt')}
+                        confirmText={translate('workspace.bankAccount.updateToUSD')}
+                        cancelText={translate('common.cancel')}
+                        danger
+                    />
                 </View>
             </WorkspacePageWithSections>
         </AccessOrNotFoundWrapper>
diff --git a/src/pages/workspace/workflows/WorkspaceWorkflowsPayerPage.tsx b/src/pages/workspace/workflows/WorkspaceWorkflowsPayerPage.tsx
index 889d8571357b..d127a13df240 100644
--- a/src/pages/workspace/workflows/WorkspaceWorkflowsPayerPage.tsx
+++ b/src/pages/workspace/workflows/WorkspaceWorkflowsPayerPage.tsx
@@ -5,6 +5,7 @@ import type {OnyxEntry} from 'react-native-onyx';
 import Badge from '@components/Badge';
 import FullPageNotFoundView from '@components/BlockingViews/FullPageNotFoundView';
 import HeaderWithBackButton from '@components/HeaderWithBackButton';
+import {FallbackAvatar} from '@components/Icon/Expensicons';
 import ScreenWrapper from '@components/ScreenWrapper';
 import SelectionList from '@components/SelectionList';
 import type {ListItem, Section} from '@components/SelectionList/types';
@@ -17,12 +18,11 @@ import Navigation from '@libs/Navigation/Navigation';
 import * as OptionsListUtils from '@libs/OptionsListUtils';
 import * as PersonalDetailsUtils from '@libs/PersonalDetailsUtils';
 import * as PolicyUtils from '@libs/PolicyUtils';
-import * as UserUtils from '@libs/UserUtils';
 import type {SettingsNavigatorParamList} from '@navigation/types';
 import AccessOrNotFoundWrapper from '@pages/workspace/AccessOrNotFoundWrapper';
 import withPolicyAndFullscreenLoading from '@pages/workspace/withPolicyAndFullscreenLoading';
 import type {WithPolicyAndFullscreenLoadingProps} from '@pages/workspace/withPolicyAndFullscreenLoading';
-import * as Policy from '@userActions/Policy';
+import * as Policy from '@userActions/Policy/Policy';
 import CONST from '@src/CONST';
 import type SCREENS from '@src/SCREENS';
 import type {PersonalDetailsList, PolicyEmployee} from '@src/types/onyx';
@@ -87,7 +87,7 @@ function WorkspaceWorkflowsPayerPage({route, policy, personalDetails, isLoadingR
                 rightElement: roleBadge,
                 icons: [
                     {
-                        source: UserUtils.getAvatar(details?.avatar, accountID),
+                        source: details.avatar ?? FallbackAvatar,
                         name: formatPhoneNumber(details?.login ?? ''),
                         type: CONST.ICON_TYPE_AVATAR,
                         id: accountID,
@@ -139,7 +139,7 @@ function WorkspaceWorkflowsPayerPage({route, policy, personalDetails, isLoadingR
     const headerMessage = useMemo(
         () => (searchTerm && !sections[0].data.length ? translate('common.noResultsFound') : ''),
 
-        // eslint-disable-next-line react-hooks/exhaustive-deps
+        // eslint-disable-next-line react-compiler/react-compiler, react-hooks/exhaustive-deps
         [translate, sections],
     );
 
@@ -151,7 +151,7 @@ function WorkspaceWorkflowsPayerPage({route, policy, personalDetails, isLoadingR
             return;
         }
 
-        Policy.setWorkspacePayer(policy?.id ?? '', authorizedPayerEmail);
+        Policy.setWorkspacePayer(policy?.id ?? '-1', authorizedPayerEmail);
         Navigation.goBack();
     };
 
@@ -186,12 +186,13 @@ function WorkspaceWorkflowsPayerPage({route, policy, personalDetails, isLoadingR
                     />
                     <SelectionList
                         sections={sections}
-                        textInputLabel={translate('optionsSelector.findMember')}
+                        textInputLabel={translate('selectionList.findMember')}
                         textInputValue={searchTerm}
                         onChangeText={setSearchTerm}
                         headerMessage={headerMessage}
                         ListItem={UserListItem}
                         onSelectRow={setPolicyAuthorizedPayer}
+                        shouldSingleExecuteRowSelect
                         showScrollIndicator
                     />
                 </ScreenWrapper>
diff --git a/src/pages/workspace/workflows/approvals/ApprovalWorkflowEditor.tsx b/src/pages/workspace/workflows/approvals/ApprovalWorkflowEditor.tsx
new file mode 100644
index 000000000000..6325ce1da21d
--- /dev/null
+++ b/src/pages/workspace/workflows/approvals/ApprovalWorkflowEditor.tsx
@@ -0,0 +1,183 @@
+import type {ForwardedRef} from 'react';
+import React, {forwardRef, useCallback, useMemo} from 'react';
+import {View} from 'react-native';
+// eslint-disable-next-line no-restricted-imports
+import type {ScrollView as ScrollViewRN} from 'react-native';
+import type {OnyxEntry} from 'react-native-onyx';
+import * as Expensicons from '@components/Icon/Expensicons';
+import MenuItem from '@components/MenuItem';
+import MenuItemWithTopDescription from '@components/MenuItemWithTopDescription';
+import ScrollView from '@components/ScrollView';
+import Text from '@components/Text';
+import useLocalize from '@hooks/useLocalize';
+import useTheme from '@hooks/useTheme';
+import useThemeStyles from '@hooks/useThemeStyles';
+import Navigation from '@libs/Navigation/Navigation';
+import * as OptionsListUtils from '@libs/OptionsListUtils';
+import * as PolicyUtils from '@libs/PolicyUtils';
+import CONST from '@src/CONST';
+import ROUTES from '@src/ROUTES';
+import type {ApprovalWorkflowOnyx, Policy} from '@src/types/onyx';
+import type {Approver} from '@src/types/onyx/ApprovalWorkflow';
+
+type ApprovalWorkflowEditorProps = {
+    /** The approval workflow to display */
+    approvalWorkflow: ApprovalWorkflowOnyx;
+
+    /** Function to remove the approval workflow */
+    removeApprovalWorkflow?: () => void;
+
+    /** The policy for the current route */
+    policy: OnyxEntry<Policy>;
+
+    /** The policy ID */
+    policyID: string;
+};
+
+function ApprovalWorkflowEditor({approvalWorkflow, removeApprovalWorkflow, policy, policyID}: ApprovalWorkflowEditorProps, ref: ForwardedRef<ScrollViewRN>) {
+    const styles = useThemeStyles();
+    const theme = useTheme();
+    const {translate, toLocaleOrdinal} = useLocalize();
+    const approverCount = approvalWorkflow.approvers.length;
+
+    const approverDescription = useCallback(
+        (index: number) => (approverCount > 1 ? `${toLocaleOrdinal(index + 1, true)} ${translate('workflowsPage.approver').toLowerCase()}` : `${translate('workflowsPage.approver')}`),
+        [approverCount, toLocaleOrdinal, translate],
+    );
+
+    const members = useMemo(() => {
+        if (approvalWorkflow.isDefault) {
+            return translate('workspace.common.everyone');
+        }
+
+        return OptionsListUtils.sortAlphabetically(approvalWorkflow.members, 'displayName')
+            .map((m) => m.displayName)
+            .join(', ');
+    }, [approvalWorkflow.isDefault, approvalWorkflow.members, translate]);
+
+    const approverErrorMessage = useCallback(
+        (approver: Approver | undefined, approverIndex: number) => {
+            const previousApprover = approvalWorkflow.approvers.slice(0, approverIndex).filter(Boolean).at(-1);
+            const error = approvalWorkflow?.errors?.[`approver-${approverIndex}`];
+
+            if (!error) {
+                return;
+            }
+
+            if (error === 'workflowsPage.approverCircularReference') {
+                if (!previousApprover || !approver) {
+                    return;
+                }
+                return translate('workflowsPage.approverCircularReference', {
+                    name1: approver.displayName,
+                    name2: previousApprover.displayName,
+                });
+            }
+
+            return translate(error);
+        },
+        [approvalWorkflow.approvers, approvalWorkflow.errors, translate],
+    );
+
+    const editMembers = useCallback(() => {
+        const backTo = approvalWorkflow.action === CONST.APPROVAL_WORKFLOW.ACTION.CREATE ? ROUTES.WORKSPACE_WORKFLOWS_APPROVALS_NEW.getRoute(policyID) : undefined;
+        Navigation.navigate(ROUTES.WORKSPACE_WORKFLOWS_APPROVALS_EXPENSES_FROM.getRoute(policyID, backTo), CONST.NAVIGATION.ACTION_TYPE.PUSH);
+    }, [approvalWorkflow.action, policyID]);
+
+    const editApprover = useCallback(
+        (approverIndex: number) => {
+            const backTo = approvalWorkflow.action === CONST.APPROVAL_WORKFLOW.ACTION.CREATE ? ROUTES.WORKSPACE_WORKFLOWS_APPROVALS_NEW.getRoute(policyID) : undefined;
+            Navigation.navigate(ROUTES.WORKSPACE_WORKFLOWS_APPROVALS_APPROVER.getRoute(policyID, approverIndex, backTo), CONST.NAVIGATION.ACTION_TYPE.PUSH);
+        },
+        [approvalWorkflow.action, policyID],
+    );
+
+    // User should be allowed to add additional approver only if they upgraded to Control Plan, otherwise redirected to the Upgrade Page
+    const addAdditionalApprover = useCallback(() => {
+        if (!PolicyUtils.isControlPolicy(policy) && approverCount > 0) {
+            Navigation.navigate(ROUTES.WORKSPACE_UPGRADE.getRoute(policyID, CONST.UPGRADE_FEATURE_INTRO_MAPPING.approvals.alias, Navigation.getActiveRoute()));
+            return;
+        }
+        Navigation.navigate(
+            ROUTES.WORKSPACE_WORKFLOWS_APPROVALS_APPROVER.getRoute(policyID, approverCount, ROUTES.WORKSPACE_WORKFLOWS_APPROVALS_NEW.getRoute(policyID)),
+            CONST.NAVIGATION.ACTION_TYPE.PUSH,
+        );
+    }, [approverCount, policy, policyID]);
+
+    return (
+        <ScrollView
+            style={[styles.flex1]}
+            ref={ref}
+        >
+            <View style={[styles.mh5]}>
+                {approvalWorkflow.action === CONST.APPROVAL_WORKFLOW.ACTION.CREATE && (
+                    <Text style={[styles.textHeadlineH1, styles.mv3]}>{translate('workflowsCreateApprovalsPage.header')}</Text>
+                )}
+
+                <MenuItemWithTopDescription
+                    title={members}
+                    titleStyle={styles.textNormalThemeText}
+                    numberOfLinesTitle={4}
+                    description={translate('workflowsExpensesFromPage.title')}
+                    descriptionTextStyle={!!members && styles.textLabelSupportingNormal}
+                    onPress={editMembers}
+                    wrapperStyle={[styles.sectionMenuItemTopDescription]}
+                    errorText={approvalWorkflow?.errors?.members ? translate(approvalWorkflow.errors.members) : undefined}
+                    brickRoadIndicator={approvalWorkflow?.errors?.members ? CONST.BRICK_ROAD_INDICATOR_STATUS.ERROR : undefined}
+                    shouldShowRightIcon={!approvalWorkflow.isDefault}
+                    interactive={!approvalWorkflow.isDefault}
+                />
+
+                {approvalWorkflow.approvers.map((approver, approverIndex) => {
+                    const errorText = approverErrorMessage(approver, approverIndex);
+                    const hintText =
+                        !errorText && approvalWorkflow.usedApproverEmails.some((approverEmail) => approverEmail === approver?.email)
+                            ? translate('workflowsPage.approverInMultipleWorkflows')
+                            : undefined;
+
+                    return (
+                        <MenuItemWithTopDescription
+                            // eslint-disable-next-line react/no-array-index-key
+                            key={`approver-${approver?.email}-${approverIndex}`}
+                            title={approver?.displayName}
+                            titleStyle={styles.textNormalThemeText}
+                            wrapperStyle={styles.sectionMenuItemTopDescription}
+                            description={approverDescription(approverIndex)}
+                            descriptionTextStyle={!!approver?.displayName && styles.textLabelSupportingNormal}
+                            onPress={() => editApprover(approverIndex)}
+                            shouldShowRightIcon
+                            hintText={hintText}
+                            shouldRenderHintAsHTML
+                            brickRoadIndicator={errorText ? CONST.BRICK_ROAD_INDICATOR_STATUS.ERROR : undefined}
+                            errorText={errorText}
+                            shouldRenderErrorAsHTML
+                        />
+                    );
+                })}
+
+                <MenuItemWithTopDescription
+                    description={approverCount > 0 ? translate('workflowsCreateApprovalsPage.additionalApprover') : translate('workflowsPage.approver')}
+                    onPress={addAdditionalApprover}
+                    shouldShowRightIcon
+                    wrapperStyle={styles.sectionMenuItemTopDescription}
+                    errorText={approvalWorkflow?.errors?.additionalApprover ? translate(approvalWorkflow.errors.additionalApprover) : undefined}
+                    brickRoadIndicator={approvalWorkflow?.errors?.additionalApprover ? CONST.BRICK_ROAD_INDICATOR_STATUS.ERROR : undefined}
+                />
+
+                {removeApprovalWorkflow && !approvalWorkflow.isDefault && (
+                    <MenuItem
+                        wrapperStyle={[styles.sectionMenuItemTopDescription, styles.mt6]}
+                        icon={Expensicons.Trashcan}
+                        iconFill={theme.icon}
+                        title={translate('common.delete')}
+                        onPress={removeApprovalWorkflow}
+                    />
+                )}
+            </View>
+        </ScrollView>
+    );
+}
+
+ApprovalWorkflowEditor.displayName = 'ApprovalWorkflowEditor';
+
+export default forwardRef(ApprovalWorkflowEditor);
diff --git a/src/pages/workspace/workflows/approvals/WorkspaceWorkflowsApprovalsApproverPage.tsx b/src/pages/workspace/workflows/approvals/WorkspaceWorkflowsApprovalsApproverPage.tsx
new file mode 100644
index 000000000000..986456c9be0f
--- /dev/null
+++ b/src/pages/workspace/workflows/approvals/WorkspaceWorkflowsApprovalsApproverPage.tsx
@@ -0,0 +1,433 @@
+import type {StackScreenProps} from '@react-navigation/stack';
+import React, {useCallback, useEffect, useMemo, useState} from 'react';
+import type {SectionListData} from 'react-native';
+import type {OnyxEntry} from 'react-native-onyx';
+import {useOnyx, withOnyx} from 'react-native-onyx';
+import Badge from '@components/Badge';
+import FullPageNotFoundView from '@components/BlockingViews/FullPageNotFoundView';
+import FormAlertWithSubmitButton from '@components/FormAlertWithSubmitButton';
+import HeaderWithBackButton from '@components/HeaderWithBackButton';
+import {FallbackAvatar} from '@components/Icon/Expensicons';
+import ScreenWrapper from '@components/ScreenWrapper';
+import SelectionList from '@components/SelectionList';
+import InviteMemberListItem from '@components/SelectionList/InviteMemberListItem';
+import type {ListItem, Section} from '@components/SelectionList/types';
+import UserListItem from '@components/SelectionList/UserListItem';
+import Text from '@components/Text';
+import useDebouncedState from '@hooks/useDebouncedState';
+import useLocalize from '@hooks/useLocalize';
+import useNetwork from '@hooks/useNetwork';
+import useThemeStyles from '@hooks/useThemeStyles';
+import * as DeviceCapabilities from '@libs/DeviceCapabilities';
+import {formatPhoneNumber} from '@libs/LocalePhoneNumber';
+import Log from '@libs/Log';
+import Navigation from '@libs/Navigation/Navigation';
+import type {FullScreenNavigatorParamList} from '@libs/Navigation/types';
+import * as OptionsListUtils from '@libs/OptionsListUtils';
+import Permissions from '@libs/Permissions';
+import * as PersonalDetailsUtils from '@libs/PersonalDetailsUtils';
+import * as PolicyUtils from '@libs/PolicyUtils';
+import AccessOrNotFoundWrapper from '@pages/workspace/AccessOrNotFoundWrapper';
+import withPolicyAndFullscreenLoading from '@pages/workspace/withPolicyAndFullscreenLoading';
+import type {WithPolicyAndFullscreenLoadingProps} from '@pages/workspace/withPolicyAndFullscreenLoading';
+import * as Policy from '@userActions/Policy/Policy';
+import * as Workflow from '@userActions/Workflow';
+import CONST from '@src/CONST';
+import ONYXKEYS from '@src/ONYXKEYS';
+import ROUTES from '@src/ROUTES';
+import type SCREENS from '@src/SCREENS';
+import type {Beta, PolicyEmployee} from '@src/types/onyx';
+import type {Icon} from '@src/types/onyx/OnyxCommon';
+import {isEmptyObject} from '@src/types/utils/EmptyObject';
+
+type WorkspaceWorkflowsApprovalsApproverPageOnyxProps = {
+    /** Beta features list */
+    // eslint-disable-next-line react/no-unused-prop-types -- This prop is used in the component
+    betas: OnyxEntry<Beta[]>;
+};
+
+type WorkspaceWorkflowsApprovalsApproverPageProps = WorkspaceWorkflowsApprovalsApproverPageOnyxProps &
+    WithPolicyAndFullscreenLoadingProps &
+    StackScreenProps<FullScreenNavigatorParamList, typeof SCREENS.WORKSPACE.WORKFLOWS_APPROVALS_APPROVER>;
+
+type SelectionListApprover = {
+    text: string;
+    alternateText: string;
+    keyForList: string;
+    isSelected: boolean;
+    login: string;
+    rightElement?: React.ReactNode;
+    icons: Icon[];
+};
+type ApproverSection = SectionListData<SelectionListApprover, Section<SelectionListApprover>>;
+
+function WorkspaceWorkflowsApprovalsApproverPageWrapper(props: WorkspaceWorkflowsApprovalsApproverPageProps) {
+    if (Permissions.canUseWorkflowsAdvancedApproval(props.betas) && props.route.params.approverIndex !== undefined) {
+        // eslint-disable-next-line react/jsx-props-no-spreading
+        return <WorkspaceWorkflowsApprovalsApproverPageBeta {...props} />;
+    }
+
+    // eslint-disable-next-line react/jsx-props-no-spreading
+    return <WorkspaceWorkflowsApprovalsApproverPage {...props} />;
+}
+
+function WorkspaceWorkflowsApprovalsApproverPageBeta({policy, personalDetails, isLoadingReportData = true, route}: WorkspaceWorkflowsApprovalsApproverPageProps) {
+    const styles = useThemeStyles();
+    const {translate} = useLocalize();
+    const [didScreenTransitionEnd, setDidScreenTransitionEnd] = useState(false);
+    const [searchTerm, debouncedSearchTerm, setSearchTerm] = useDebouncedState('');
+    const [approvalWorkflow, approvalWorkflowMetadata] = useOnyx(ONYXKEYS.APPROVAL_WORKFLOW);
+    const [selectedApproverEmail, setSelectedApproverEmail] = useState<string | undefined>(undefined);
+
+    // eslint-disable-next-line rulesdir/no-negated-variables
+    const shouldShowNotFoundView = (isEmptyObject(policy) && !isLoadingReportData) || !PolicyUtils.isPolicyAdmin(policy) || PolicyUtils.isPendingDeletePolicy(policy);
+    const approverIndex = Number(route.params.approverIndex) ?? 0;
+    const isInitialCreationFlow = approvalWorkflow?.action === CONST.APPROVAL_WORKFLOW.ACTION.CREATE && !route.params.backTo;
+    const defaultApprover = policy?.approver ?? policy?.owner;
+
+    useEffect(() => {
+        const currentApprover = approvalWorkflow?.approvers[approverIndex];
+        if (!currentApprover) {
+            return;
+        }
+
+        setSelectedApproverEmail(currentApprover.email);
+    }, [approvalWorkflow?.approvers, approverIndex]);
+
+    const sections: ApproverSection[] = useMemo(() => {
+        const approvers: SelectionListApprover[] = [];
+
+        if (policy?.employeeList) {
+            const availableApprovers = Object.values(policy.employeeList)
+                .map((employee): SelectionListApprover | null => {
+                    const isAdmin = employee?.role === CONST.REPORT.ROLE.ADMIN;
+                    const email = employee.email;
+
+                    if (!email) {
+                        return null;
+                    }
+
+                    // Do not allow the same email to be added twice
+                    const isEmailAlreadyInApprovers = approvalWorkflow?.approvers.some((approver, index) => approver?.email === email && index !== approverIndex);
+                    if (isEmailAlreadyInApprovers && selectedApproverEmail !== email) {
+                        return null;
+                    }
+
+                    // Do not allow the default approver to be added as the first approver
+                    if (!approvalWorkflow?.isDefault && approverIndex === 0 && defaultApprover === email) {
+                        return null;
+                    }
+
+                    const policyMemberEmailsToAccountIDs = PolicyUtils.getMemberAccountIDsForWorkspace(policy?.employeeList);
+                    const accountID = Number(policyMemberEmailsToAccountIDs[email] ?? '');
+                    const {avatar, displayName = email} = personalDetails?.[accountID] ?? {};
+
+                    return {
+                        text: displayName,
+                        alternateText: email,
+                        keyForList: email,
+                        isSelected: selectedApproverEmail === email,
+                        login: email,
+                        icons: [{source: avatar ?? FallbackAvatar, type: CONST.ICON_TYPE_AVATAR, name: displayName, id: accountID}],
+                        rightElement: isAdmin ? <Badge text={translate('common.admin')} /> : undefined,
+                    };
+                })
+                .filter((approver): approver is SelectionListApprover => !!approver);
+
+            approvers.push(...availableApprovers);
+        }
+
+        const filteredApprovers =
+            debouncedSearchTerm !== ''
+                ? approvers.filter((option) => {
+                      const searchValue = OptionsListUtils.getSearchValueForPhoneOrEmail(debouncedSearchTerm);
+                      const isPartOfSearchTerm = !!option.text?.toLowerCase().includes(searchValue) || !!option.login?.toLowerCase().includes(searchValue);
+                      return isPartOfSearchTerm;
+                  })
+                : approvers;
+
+        return [
+            {
+                title: undefined,
+                data: OptionsListUtils.sortAlphabetically(filteredApprovers, 'text'),
+                shouldShow: true,
+            },
+        ];
+    }, [
+        approvalWorkflow?.approvers,
+        approvalWorkflow?.isDefault,
+        approverIndex,
+        debouncedSearchTerm,
+        defaultApprover,
+        personalDetails,
+        policy?.employeeList,
+        selectedApproverEmail,
+        translate,
+    ]);
+
+    const nextStep = useCallback(() => {
+        if (selectedApproverEmail) {
+            const policyMemberEmailsToAccountIDs = PolicyUtils.getMemberAccountIDsForWorkspace(policy?.employeeList);
+            const accountID = Number(policyMemberEmailsToAccountIDs[selectedApproverEmail] ?? '');
+            const {avatar, displayName = selectedApproverEmail} = personalDetails?.[accountID] ?? {};
+            Workflow.setApprovalWorkflowApprover(
+                {
+                    email: selectedApproverEmail,
+                    avatar,
+                    displayName,
+                },
+                approverIndex,
+                route.params.policyID,
+            );
+        } else {
+            Workflow.clearApprovalWorkflowApprover(approverIndex);
+        }
+
+        if (approvalWorkflow?.action === CONST.APPROVAL_WORKFLOW.ACTION.CREATE) {
+            Navigation.navigate(ROUTES.WORKSPACE_WORKFLOWS_APPROVALS_NEW.getRoute(route.params.policyID));
+        } else {
+            const firstApprover = approvalWorkflow?.approvers?.[0]?.email ?? '';
+            Navigation.goBack(ROUTES.WORKSPACE_WORKFLOWS_APPROVALS_EDIT.getRoute(route.params.policyID, firstApprover));
+        }
+    }, [approvalWorkflow, approverIndex, personalDetails, policy?.employeeList, route.params.policyID, selectedApproverEmail]);
+
+    const nextButton = useMemo(
+        () => (
+            <FormAlertWithSubmitButton
+                isDisabled={!selectedApproverEmail && isInitialCreationFlow}
+                buttonText={isInitialCreationFlow ? translate('common.next') : translate('common.save')}
+                onSubmit={nextStep}
+                containerStyles={[styles.flexReset, styles.flexGrow0, styles.flexShrink0, styles.flexBasisAuto]}
+                enabledWhenOffline
+            />
+        ),
+        [isInitialCreationFlow, nextStep, selectedApproverEmail, styles.flexBasisAuto, styles.flexGrow0, styles.flexReset, styles.flexShrink0, translate],
+    );
+
+    const goBack = useCallback(() => {
+        if (isInitialCreationFlow) {
+            Workflow.clearApprovalWorkflowApprovers();
+        }
+        Navigation.goBack();
+    }, [isInitialCreationFlow]);
+
+    const toggleApprover = (approver: SelectionListApprover) => {
+        if (selectedApproverEmail === approver.login) {
+            setSelectedApproverEmail(undefined);
+            return;
+        }
+        setSelectedApproverEmail(approver.login);
+    };
+
+    const headerMessage = useMemo(() => (searchTerm && !sections[0].data.length ? translate('common.noResultsFound') : ''), [searchTerm, sections, translate]);
+
+    return (
+        <AccessOrNotFoundWrapper
+            policyID={route.params.policyID}
+            featureName={CONST.POLICY.MORE_FEATURES.ARE_WORKFLOWS_ENABLED}
+        >
+            <ScreenWrapper
+                includeSafeAreaPaddingBottom={false}
+                testID={WorkspaceWorkflowsApprovalsApproverPageWrapper.displayName}
+                onEntryTransitionEnd={() => setDidScreenTransitionEnd(true)}
+            >
+                <FullPageNotFoundView
+                    shouldShow={shouldShowNotFoundView}
+                    subtitleKey={isEmptyObject(policy) ? undefined : 'workspace.common.notAuthorized'}
+                    onBackButtonPress={PolicyUtils.goBackFromInvalidPolicy}
+                    onLinkPress={PolicyUtils.goBackFromInvalidPolicy}
+                >
+                    <HeaderWithBackButton
+                        title={translate('workflowsPage.approver')}
+                        onBackButtonPress={goBack}
+                    />
+                    {approvalWorkflow?.action === CONST.APPROVAL_WORKFLOW.ACTION.CREATE && (
+                        <Text style={[styles.textHeadlineH1, styles.mh5, styles.mv3]}>{translate('workflowsApproverPage.header')}</Text>
+                    )}
+                    <SelectionList
+                        sections={sections}
+                        ListItem={InviteMemberListItem}
+                        textInputLabel={translate('selectionList.findMember')}
+                        textInputValue={searchTerm}
+                        onChangeText={setSearchTerm}
+                        headerMessage={headerMessage}
+                        onSelectRow={toggleApprover}
+                        showScrollIndicator
+                        showLoadingPlaceholder={!didScreenTransitionEnd || approvalWorkflowMetadata.status === 'loading'}
+                        shouldPreventDefaultFocusOnSelectRow={!DeviceCapabilities.canUseTouchScreen()}
+                        footerContent={nextButton}
+                    />
+                </FullPageNotFoundView>
+            </ScreenWrapper>
+        </AccessOrNotFoundWrapper>
+    );
+}
+
+type MemberOption = Omit<ListItem, 'accountID'> & {accountID: number};
+type MembersSection = SectionListData<MemberOption, Section<MemberOption>>;
+
+// TODO: Remove this component when workflowsAdvancedApproval beta is removed
+function WorkspaceWorkflowsApprovalsApproverPage({policy, personalDetails, isLoadingReportData = true, route}: WorkspaceWorkflowsApprovalsApproverPageProps) {
+    const {translate} = useLocalize();
+    const policyName = policy?.name ?? '';
+    const [searchTerm, setSearchTerm] = useState('');
+    const {isOffline} = useNetwork();
+
+    const isDeletedPolicyEmployee = useCallback(
+        (policyEmployee: PolicyEmployee) => !isOffline && policyEmployee.pendingAction === CONST.RED_BRICK_ROAD_PENDING_ACTION.DELETE && isEmptyObject(policyEmployee.errors),
+        [isOffline],
+    );
+
+    const [formattedPolicyEmployeeList, formattedApprover] = useMemo(() => {
+        const policyMemberDetails: MemberOption[] = [];
+        const approverDetails: MemberOption[] = [];
+
+        const policyMemberEmailsToAccountIDs = PolicyUtils.getMemberAccountIDsForWorkspace(policy?.employeeList);
+
+        Object.entries(policy?.employeeList ?? {}).forEach(([email, policyEmployee]) => {
+            if (isDeletedPolicyEmployee(policyEmployee)) {
+                return;
+            }
+
+            const accountID = Number(policyMemberEmailsToAccountIDs[email] ?? '');
+
+            const details = personalDetails?.[accountID];
+            if (!details) {
+                Log.hmmm(`[WorkspaceMembersPage] no personal details found for policy member with accountID: ${accountID}`);
+                return;
+            }
+            const searchValue = OptionsListUtils.getSearchValueForPhoneOrEmail(searchTerm);
+            if (searchValue.trim() && !OptionsListUtils.isSearchStringMatchUserDetails(details, searchValue)) {
+                return;
+            }
+
+            const isOwner = policy?.owner === details.login;
+            const isAdmin = policyEmployee.role === CONST.POLICY.ROLE.ADMIN;
+
+            let roleBadge = null;
+            if (isOwner || isAdmin) {
+                roleBadge = <Badge text={isOwner ? translate('common.owner') : translate('common.admin')} />;
+            }
+
+            const formattedMember = {
+                keyForList: String(accountID),
+                accountID,
+                isSelected: policy?.approver === details.login,
+                isDisabled: policyEmployee.pendingAction === CONST.RED_BRICK_ROAD_PENDING_ACTION.DELETE || !isEmptyObject(policyEmployee.errors),
+                text: formatPhoneNumber(PersonalDetailsUtils.getDisplayNameOrDefault(details)),
+                alternateText: formatPhoneNumber(details?.login ?? ''),
+                rightElement: roleBadge,
+                icons: [
+                    {
+                        source: details.avatar ?? FallbackAvatar,
+                        name: formatPhoneNumber(details?.login ?? ''),
+                        type: CONST.ICON_TYPE_AVATAR,
+                        id: accountID,
+                    },
+                ],
+                errors: policyEmployee.errors,
+                pendingAction: policyEmployee.pendingAction,
+            };
+
+            if (policy?.approver === details.login) {
+                approverDetails.push(formattedMember);
+            } else {
+                policyMemberDetails.push(formattedMember);
+            }
+        });
+        return [policyMemberDetails, approverDetails];
+    }, [policy?.employeeList, policy?.owner, policy?.approver, isDeletedPolicyEmployee, personalDetails, searchTerm, translate]);
+
+    const sections: MembersSection[] = useMemo(() => {
+        const sectionsArray: MembersSection[] = [];
+
+        if (searchTerm !== '') {
+            return [
+                {
+                    title: undefined,
+                    data: [...formattedApprover, ...formattedPolicyEmployeeList],
+                    shouldShow: true,
+                },
+            ];
+        }
+
+        sectionsArray.push({
+            title: undefined,
+            data: formattedApprover,
+            shouldShow: formattedApprover.length > 0,
+        });
+
+        sectionsArray.push({
+            title: translate('common.all'),
+            data: formattedPolicyEmployeeList,
+            shouldShow: true,
+        });
+
+        return sectionsArray;
+    }, [formattedPolicyEmployeeList, formattedApprover, searchTerm, translate]);
+
+    const headerMessage = useMemo(
+        () => (searchTerm && !sections[0].data.length ? translate('common.noResultsFound') : ''),
+
+        // eslint-disable-next-line react-compiler/react-compiler, react-hooks/exhaustive-deps
+        [translate, sections],
+    );
+
+    const setPolicyApprover = (member: MemberOption) => {
+        if (!policy?.approvalMode || !personalDetails?.[member.accountID]?.login) {
+            return;
+        }
+        const approver: string = personalDetails?.[member.accountID]?.login ?? policy.approver ?? policy.owner;
+        Policy.setWorkspaceApprovalMode(policy.id, approver, policy.approvalMode);
+        Navigation.goBack();
+    };
+
+    // eslint-disable-next-line rulesdir/no-negated-variables
+    const shouldShowNotFoundView = (isEmptyObject(policy) && !isLoadingReportData) || !PolicyUtils.isPolicyAdmin(policy) || PolicyUtils.isPendingDeletePolicy(policy);
+
+    return (
+        <AccessOrNotFoundWrapper
+            policyID={route.params.policyID}
+            featureName={CONST.POLICY.MORE_FEATURES.ARE_WORKFLOWS_ENABLED}
+        >
+            <ScreenWrapper
+                includeSafeAreaPaddingBottom={false}
+                testID={WorkspaceWorkflowsApprovalsApproverPageWrapper.displayName}
+            >
+                <FullPageNotFoundView
+                    shouldShow={shouldShowNotFoundView}
+                    subtitleKey={isEmptyObject(policy) ? undefined : 'workspace.common.notAuthorized'}
+                    onBackButtonPress={PolicyUtils.goBackFromInvalidPolicy}
+                    onLinkPress={PolicyUtils.goBackFromInvalidPolicy}
+                >
+                    <HeaderWithBackButton
+                        title={translate('workflowsPage.approver')}
+                        subtitle={policyName}
+                        onBackButtonPress={Navigation.goBack}
+                    />
+                    <SelectionList
+                        sections={sections}
+                        textInputLabel={translate('selectionList.findMember')}
+                        textInputValue={searchTerm}
+                        onChangeText={setSearchTerm}
+                        headerMessage={headerMessage}
+                        ListItem={UserListItem}
+                        onSelectRow={setPolicyApprover}
+                        shouldSingleExecuteRowSelect
+                        showScrollIndicator
+                    />
+                </FullPageNotFoundView>
+            </ScreenWrapper>
+        </AccessOrNotFoundWrapper>
+    );
+}
+
+WorkspaceWorkflowsApprovalsApproverPageWrapper.displayName = 'WorkspaceWorkflowsApprovalsApproverPage';
+
+export default withPolicyAndFullscreenLoading(
+    withOnyx<WorkspaceWorkflowsApprovalsApproverPageProps, WorkspaceWorkflowsApprovalsApproverPageOnyxProps>({
+        betas: {
+            key: ONYXKEYS.BETAS,
+        },
+    })(WorkspaceWorkflowsApprovalsApproverPageWrapper),
+);
diff --git a/src/pages/workspace/workflows/approvals/WorkspaceWorkflowsApprovalsCreatePage.tsx b/src/pages/workspace/workflows/approvals/WorkspaceWorkflowsApprovalsCreatePage.tsx
new file mode 100644
index 000000000000..dc0f067f60df
--- /dev/null
+++ b/src/pages/workspace/workflows/approvals/WorkspaceWorkflowsApprovalsCreatePage.tsx
@@ -0,0 +1,99 @@
+import type {StackScreenProps} from '@react-navigation/stack';
+import React, {useCallback, useRef} from 'react';
+// eslint-disable-next-line no-restricted-imports
+import type {ScrollView} from 'react-native';
+import {useOnyx} from 'react-native-onyx';
+import FullPageNotFoundView from '@components/BlockingViews/FullPageNotFoundView';
+import FormAlertWithSubmitButton from '@components/FormAlertWithSubmitButton';
+import FullScreenLoadingIndicator from '@components/FullscreenLoadingIndicator';
+import HeaderWithBackButton from '@components/HeaderWithBackButton';
+import ScreenWrapper from '@components/ScreenWrapper';
+import useLocalize from '@hooks/useLocalize';
+import useThemeStyles from '@hooks/useThemeStyles';
+import Navigation from '@libs/Navigation/Navigation';
+import type {FullScreenNavigatorParamList} from '@libs/Navigation/types';
+import * as PolicyUtils from '@libs/PolicyUtils';
+import AccessOrNotFoundWrapper from '@pages/workspace/AccessOrNotFoundWrapper';
+import withPolicyAndFullscreenLoading from '@pages/workspace/withPolicyAndFullscreenLoading';
+import type {WithPolicyAndFullscreenLoadingProps} from '@pages/workspace/withPolicyAndFullscreenLoading';
+import * as Workflow from '@userActions/Workflow';
+import CONST from '@src/CONST';
+import ONYXKEYS from '@src/ONYXKEYS';
+import type SCREENS from '@src/SCREENS';
+import {isEmptyObject} from '@src/types/utils/EmptyObject';
+import ApprovalWorkflowEditor from './ApprovalWorkflowEditor';
+
+type WorkspaceWorkflowsApprovalsCreatePageProps = WithPolicyAndFullscreenLoadingProps & StackScreenProps<FullScreenNavigatorParamList, typeof SCREENS.WORKSPACE.WORKFLOWS_APPROVALS_NEW>;
+
+function WorkspaceWorkflowsApprovalsCreatePage({policy, isLoadingReportData = true, route}: WorkspaceWorkflowsApprovalsCreatePageProps) {
+    const styles = useThemeStyles();
+    const {translate} = useLocalize();
+    const [approvalWorkflow] = useOnyx(ONYXKEYS.APPROVAL_WORKFLOW);
+    const formRef = useRef<ScrollView>(null);
+
+    // eslint-disable-next-line rulesdir/no-negated-variables
+    const shouldShowNotFoundView = (isEmptyObject(policy) && !isLoadingReportData) || !PolicyUtils.isPolicyAdmin(policy) || PolicyUtils.isPendingDeletePolicy(policy);
+
+    const createApprovalWorkflow = useCallback(() => {
+        if (!approvalWorkflow) {
+            return;
+        }
+
+        if (!Workflow.validateApprovalWorkflow(approvalWorkflow)) {
+            return;
+        }
+
+        Workflow.createApprovalWorkflow(route.params.policyID, approvalWorkflow);
+        Navigation.dismissModal();
+    }, [approvalWorkflow, route.params.policyID]);
+
+    return (
+        <AccessOrNotFoundWrapper
+            policyID={route.params.policyID}
+            featureName={CONST.POLICY.MORE_FEATURES.ARE_WORKFLOWS_ENABLED}
+        >
+            <ScreenWrapper
+                includeSafeAreaPaddingBottom={false}
+                testID={WorkspaceWorkflowsApprovalsCreatePage.displayName}
+            >
+                <FullPageNotFoundView
+                    shouldShow={shouldShowNotFoundView}
+                    subtitleKey={isEmptyObject(policy) ? undefined : 'workspace.common.notAuthorized'}
+                    onBackButtonPress={PolicyUtils.goBackFromInvalidPolicy}
+                    onLinkPress={PolicyUtils.goBackFromInvalidPolicy}
+                >
+                    <HeaderWithBackButton
+                        title={translate('workflowsCreateApprovalsPage.title')}
+                        onBackButtonPress={Navigation.goBack}
+                    />
+                    {approvalWorkflow && (
+                        <>
+                            <ApprovalWorkflowEditor
+                                approvalWorkflow={approvalWorkflow}
+                                policy={policy}
+                                policyID={route.params.policyID}
+                                ref={formRef}
+                            />
+                            <FormAlertWithSubmitButton
+                                isAlertVisible={!isEmptyObject(approvalWorkflow?.errors)}
+                                onSubmit={createApprovalWorkflow}
+                                onFixTheErrorsLinkPressed={() => {
+                                    formRef.current?.scrollTo({y: 0, animated: true});
+                                }}
+                                isLoading={approvalWorkflow?.isLoading}
+                                buttonText={translate('workflowsCreateApprovalsPage.submitButton')}
+                                containerStyles={[styles.mb5, styles.mh5]}
+                                enabledWhenOffline
+                            />
+                        </>
+                    )}
+                    {!approvalWorkflow && <FullScreenLoadingIndicator />}
+                </FullPageNotFoundView>
+            </ScreenWrapper>
+        </AccessOrNotFoundWrapper>
+    );
+}
+
+WorkspaceWorkflowsApprovalsCreatePage.displayName = 'WorkspaceWorkflowsApprovalsCreatePage';
+
+export default withPolicyAndFullscreenLoading(WorkspaceWorkflowsApprovalsCreatePage);
diff --git a/src/pages/workspace/workflows/approvals/WorkspaceWorkflowsApprovalsEditPage.tsx b/src/pages/workspace/workflows/approvals/WorkspaceWorkflowsApprovalsEditPage.tsx
new file mode 100644
index 000000000000..dcd9eb912972
--- /dev/null
+++ b/src/pages/workspace/workflows/approvals/WorkspaceWorkflowsApprovalsEditPage.tsx
@@ -0,0 +1,171 @@
+import type {StackScreenProps} from '@react-navigation/stack';
+import React, {useCallback, useEffect, useMemo, useRef, useState} from 'react';
+// eslint-disable-next-line no-restricted-imports
+import type {ScrollView} from 'react-native';
+import {useOnyx} from 'react-native-onyx';
+import FullPageNotFoundView from '@components/BlockingViews/FullPageNotFoundView';
+import ConfirmModal from '@components/ConfirmModal';
+import FormAlertWithSubmitButton from '@components/FormAlertWithSubmitButton';
+import FullScreenLoadingIndicator from '@components/FullscreenLoadingIndicator';
+import HeaderWithBackButton from '@components/HeaderWithBackButton';
+import ScreenWrapper from '@components/ScreenWrapper';
+import useLocalize from '@hooks/useLocalize';
+import useThemeStyles from '@hooks/useThemeStyles';
+import Navigation from '@libs/Navigation/Navigation';
+import type {FullScreenNavigatorParamList} from '@libs/Navigation/types';
+import * as PolicyUtils from '@libs/PolicyUtils';
+import {convertPolicyEmployeesToApprovalWorkflows} from '@libs/WorkflowUtils';
+import AccessOrNotFoundWrapper from '@pages/workspace/AccessOrNotFoundWrapper';
+import withPolicyAndFullscreenLoading from '@pages/workspace/withPolicyAndFullscreenLoading';
+import type {WithPolicyAndFullscreenLoadingProps} from '@pages/workspace/withPolicyAndFullscreenLoading';
+import * as Workflow from '@userActions/Workflow';
+import CONST from '@src/CONST';
+import ONYXKEYS from '@src/ONYXKEYS';
+import type SCREENS from '@src/SCREENS';
+import type ApprovalWorkflow from '@src/types/onyx/ApprovalWorkflow';
+import {isEmptyObject} from '@src/types/utils/EmptyObject';
+import ApprovalWorkflowEditor from './ApprovalWorkflowEditor';
+
+type WorkspaceWorkflowsApprovalsEditPageProps = WithPolicyAndFullscreenLoadingProps & StackScreenProps<FullScreenNavigatorParamList, typeof SCREENS.WORKSPACE.WORKFLOWS_APPROVALS_EDIT>;
+
+function WorkspaceWorkflowsApprovalsEditPage({policy, isLoadingReportData = true, route}: WorkspaceWorkflowsApprovalsEditPageProps) {
+    const styles = useThemeStyles();
+    const {translate} = useLocalize();
+    const [personalDetails] = useOnyx(ONYXKEYS.PERSONAL_DETAILS_LIST);
+    const [approvalWorkflow] = useOnyx(ONYXKEYS.APPROVAL_WORKFLOW);
+    const [initialApprovalWorkflow, setInitialApprovalWorkflow] = useState<ApprovalWorkflow | undefined>();
+    const [isDeleteModalVisible, setIsDeleteModalVisible] = useState(false);
+    const formRef = useRef<ScrollView>(null);
+
+    const updateApprovalWorkflow = useCallback(() => {
+        if (!approvalWorkflow || !initialApprovalWorkflow) {
+            return;
+        }
+
+        if (!Workflow.validateApprovalWorkflow(approvalWorkflow)) {
+            return;
+        }
+
+        const membersToRemove = initialApprovalWorkflow.members.filter((initialMember) => !approvalWorkflow.members.some((member) => member.email === initialMember.email));
+        Workflow.updateApprovalWorkflow(route.params.policyID, approvalWorkflow, membersToRemove);
+        Navigation.dismissModal();
+    }, [approvalWorkflow, initialApprovalWorkflow, route.params.policyID]);
+
+    const removeApprovalWorkflow = useCallback(() => {
+        if (!initialApprovalWorkflow) {
+            return;
+        }
+
+        // Remove the approval workflow using the initial data as it could be already edited
+        Workflow.removeApprovalWorkflow(route.params.policyID, initialApprovalWorkflow);
+        setIsDeleteModalVisible(false);
+        Navigation.dismissModal();
+    }, [initialApprovalWorkflow, route.params.policyID]);
+
+    const {currentApprovalWorkflow, defaultWorkflowMembers, usedApproverEmails} = useMemo(() => {
+        if (!policy || !personalDetails) {
+            return {};
+        }
+
+        const defaultApprover = policy?.approver ?? policy.owner;
+        const firstApprover = route.params.firstApproverEmail;
+        const result = convertPolicyEmployeesToApprovalWorkflows({
+            employees: policy.employeeList ?? {},
+            defaultApprover,
+            personalDetails,
+            firstApprover,
+        });
+
+        return {
+            defaultWorkflowMembers: result.availableMembers,
+            usedApproverEmails: result.usedApproverEmails,
+            currentApprovalWorkflow: result.approvalWorkflows.find((workflow) => workflow.approvers.at(0)?.email === firstApprover),
+        };
+    }, [personalDetails, policy, route.params.firstApproverEmail]);
+
+    // eslint-disable-next-line rulesdir/no-negated-variables
+    const shouldShowNotFoundView =
+        (isEmptyObject(policy) && !isLoadingReportData) || !PolicyUtils.isPolicyAdmin(policy) || PolicyUtils.isPendingDeletePolicy(policy) || !currentApprovalWorkflow;
+
+    // Set the initial approval workflow when the page is loaded
+    useEffect(() => {
+        if (initialApprovalWorkflow) {
+            return;
+        }
+
+        if (!currentApprovalWorkflow) {
+            return Workflow.clearApprovalWorkflow();
+        }
+
+        Workflow.setApprovalWorkflow({
+            ...currentApprovalWorkflow,
+            availableMembers: [...currentApprovalWorkflow.members, ...defaultWorkflowMembers],
+            usedApproverEmails,
+            action: CONST.APPROVAL_WORKFLOW.ACTION.EDIT,
+            isLoading: false,
+            errors: null,
+        });
+        setInitialApprovalWorkflow(currentApprovalWorkflow);
+    }, [currentApprovalWorkflow, defaultWorkflowMembers, initialApprovalWorkflow, usedApproverEmails]);
+
+    return (
+        <AccessOrNotFoundWrapper
+            policyID={route.params.policyID}
+            featureName={CONST.POLICY.MORE_FEATURES.ARE_WORKFLOWS_ENABLED}
+        >
+            <ScreenWrapper
+                includeSafeAreaPaddingBottom={false}
+                testID={WorkspaceWorkflowsApprovalsEditPage.displayName}
+            >
+                <FullPageNotFoundView
+                    shouldShow={shouldShowNotFoundView}
+                    subtitleKey={isEmptyObject(policy) ? undefined : 'workspace.common.notAuthorized'}
+                    onBackButtonPress={PolicyUtils.goBackFromInvalidPolicy}
+                    onLinkPress={PolicyUtils.goBackFromInvalidPolicy}
+                >
+                    <HeaderWithBackButton
+                        title={translate('workflowsEditApprovalsPage.title')}
+                        onBackButtonPress={Navigation.goBack}
+                    />
+                    {approvalWorkflow && (
+                        <>
+                            <ApprovalWorkflowEditor
+                                approvalWorkflow={approvalWorkflow}
+                                removeApprovalWorkflow={() => setIsDeleteModalVisible(true)}
+                                policy={policy}
+                                policyID={route.params.policyID}
+                                ref={formRef}
+                            />
+                            <FormAlertWithSubmitButton
+                                isAlertVisible={!isEmptyObject(approvalWorkflow?.errors)}
+                                onSubmit={updateApprovalWorkflow}
+                                onFixTheErrorsLinkPressed={() => {
+                                    formRef.current?.scrollTo({y: 0, animated: true});
+                                }}
+                                isLoading={approvalWorkflow?.isLoading}
+                                buttonText={translate('common.save')}
+                                containerStyles={[styles.mb5, styles.mh5]}
+                                enabledWhenOffline
+                            />
+                        </>
+                    )}
+                    {!initialApprovalWorkflow && <FullScreenLoadingIndicator />}
+                </FullPageNotFoundView>
+                <ConfirmModal
+                    title={translate('workflowsEditApprovalsPage.deleteTitle')}
+                    isVisible={isDeleteModalVisible}
+                    onConfirm={removeApprovalWorkflow}
+                    onCancel={() => setIsDeleteModalVisible(false)}
+                    prompt={translate('workflowsEditApprovalsPage.deletePrompt')}
+                    confirmText={translate('common.delete')}
+                    cancelText={translate('common.cancel')}
+                    danger
+                />
+            </ScreenWrapper>
+        </AccessOrNotFoundWrapper>
+    );
+}
+
+WorkspaceWorkflowsApprovalsEditPage.displayName = 'WorkspaceWorkflowsApprovalsEditPage';
+
+export default withPolicyAndFullscreenLoading(WorkspaceWorkflowsApprovalsEditPage);
diff --git a/src/pages/workspace/workflows/approvals/WorkspaceWorkflowsApprovalsExpensesFromPage.tsx b/src/pages/workspace/workflows/approvals/WorkspaceWorkflowsApprovalsExpensesFromPage.tsx
new file mode 100644
index 000000000000..f1a0f34dda01
--- /dev/null
+++ b/src/pages/workspace/workflows/approvals/WorkspaceWorkflowsApprovalsExpensesFromPage.tsx
@@ -0,0 +1,218 @@
+import type {StackScreenProps} from '@react-navigation/stack';
+import React, {useCallback, useEffect, useMemo, useState} from 'react';
+import type {SectionListData} from 'react-native';
+import {useOnyx} from 'react-native-onyx';
+import Badge from '@components/Badge';
+import FullPageNotFoundView from '@components/BlockingViews/FullPageNotFoundView';
+import FormAlertWithSubmitButton from '@components/FormAlertWithSubmitButton';
+import HeaderWithBackButton from '@components/HeaderWithBackButton';
+import {FallbackAvatar} from '@components/Icon/Expensicons';
+import ScreenWrapper from '@components/ScreenWrapper';
+import SelectionList from '@components/SelectionList';
+import InviteMemberListItem from '@components/SelectionList/InviteMemberListItem';
+import type {Section} from '@components/SelectionList/types';
+import Text from '@components/Text';
+import useDebouncedState from '@hooks/useDebouncedState';
+import useLocalize from '@hooks/useLocalize';
+import useThemeStyles from '@hooks/useThemeStyles';
+import * as DeviceCapabilities from '@libs/DeviceCapabilities';
+import Navigation from '@libs/Navigation/Navigation';
+import type {FullScreenNavigatorParamList} from '@libs/Navigation/types';
+import * as OptionsListUtils from '@libs/OptionsListUtils';
+import * as PolicyUtils from '@libs/PolicyUtils';
+import AccessOrNotFoundWrapper from '@pages/workspace/AccessOrNotFoundWrapper';
+import withPolicyAndFullscreenLoading from '@pages/workspace/withPolicyAndFullscreenLoading';
+import type {WithPolicyAndFullscreenLoadingProps} from '@pages/workspace/withPolicyAndFullscreenLoading';
+import * as Workflow from '@userActions/Workflow';
+import CONST from '@src/CONST';
+import ONYXKEYS from '@src/ONYXKEYS';
+import ROUTES from '@src/ROUTES';
+import type SCREENS from '@src/SCREENS';
+import type {Member} from '@src/types/onyx/ApprovalWorkflow';
+import type {Icon} from '@src/types/onyx/OnyxCommon';
+import {isEmptyObject} from '@src/types/utils/EmptyObject';
+
+type SelectionListMember = {
+    text: string;
+    alternateText: string;
+    keyForList: string;
+    isSelected: boolean;
+    login: string;
+    rightElement?: React.ReactNode;
+    icons?: Icon[];
+};
+
+type MembersSection = SectionListData<SelectionListMember, Section<SelectionListMember>>;
+
+type WorkspaceWorkflowsApprovalsExpensesFromPageProps = WithPolicyAndFullscreenLoadingProps &
+    StackScreenProps<FullScreenNavigatorParamList, typeof SCREENS.WORKSPACE.WORKFLOWS_APPROVALS_EXPENSES_FROM>;
+
+function WorkspaceWorkflowsApprovalsExpensesFromPage({policy, isLoadingReportData = true, route}: WorkspaceWorkflowsApprovalsExpensesFromPageProps) {
+    const styles = useThemeStyles();
+    const {translate} = useLocalize();
+    const [didScreenTransitionEnd, setDidScreenTransitionEnd] = useState(false);
+    const [searchTerm, debouncedSearchTerm, setSearchTerm] = useDebouncedState('');
+    const [approvalWorkflow, approvalWorkflowMetadata] = useOnyx(ONYXKEYS.APPROVAL_WORKFLOW);
+    const [selectedMembers, setSelectedMembers] = useState<SelectionListMember[]>([]);
+
+    // eslint-disable-next-line rulesdir/no-negated-variables
+    const shouldShowNotFoundView = (isEmptyObject(policy) && !isLoadingReportData) || !PolicyUtils.isPolicyAdmin(policy) || PolicyUtils.isPendingDeletePolicy(policy);
+    const isInitialCreationFlow = approvalWorkflow?.action === CONST.APPROVAL_WORKFLOW.ACTION.CREATE && !route.params.backTo;
+
+    useEffect(() => {
+        if (!approvalWorkflow?.members) {
+            return;
+        }
+
+        setSelectedMembers(
+            approvalWorkflow.members.map((member) => {
+                const policyMemberEmailsToAccountIDs = PolicyUtils.getMemberAccountIDsForWorkspace(policy?.employeeList);
+                const accountID = Number(policyMemberEmailsToAccountIDs[member.email] ?? '');
+                const isAdmin = policy?.employeeList?.[member.email]?.role === CONST.REPORT.ROLE.ADMIN;
+
+                return {
+                    text: member.displayName,
+                    alternateText: member.email,
+                    keyForList: member.email,
+                    isSelected: true,
+                    login: member.email,
+                    icons: [{source: member.avatar ?? FallbackAvatar, type: CONST.ICON_TYPE_AVATAR, name: member.displayName, id: accountID}],
+                    rightElement: isAdmin ? <Badge text={translate('common.admin')} /> : undefined,
+                };
+            }),
+        );
+    }, [approvalWorkflow?.members, policy?.employeeList, translate]);
+
+    const sections: MembersSection[] = useMemo(() => {
+        const members: SelectionListMember[] = [...selectedMembers];
+
+        if (approvalWorkflow?.availableMembers) {
+            const availableMembers = approvalWorkflow.availableMembers
+                .map((member) => {
+                    const isAdmin = policy?.employeeList?.[member.email]?.role === CONST.REPORT.ROLE.ADMIN;
+                    const policyMemberEmailsToAccountIDs = PolicyUtils.getMemberAccountIDsForWorkspace(policy?.employeeList);
+                    const accountID = Number(policyMemberEmailsToAccountIDs[member.email] ?? '');
+
+                    return {
+                        text: member.displayName,
+                        alternateText: member.email,
+                        keyForList: member.email,
+                        isSelected: false,
+                        login: member.email,
+                        icons: [{source: member.avatar ?? FallbackAvatar, type: CONST.ICON_TYPE_AVATAR, name: member.displayName, id: accountID}],
+                        rightElement: isAdmin ? <Badge text={translate('common.admin')} /> : undefined,
+                    };
+                })
+                .filter((member) => !selectedMembers.some((selectedOption) => selectedOption.login === member.login));
+
+            members.push(...availableMembers);
+        }
+
+        const filteredMembers =
+            debouncedSearchTerm !== ''
+                ? members.filter((option) => {
+                      const searchValue = OptionsListUtils.getSearchValueForPhoneOrEmail(debouncedSearchTerm);
+                      const isPartOfSearchTerm = !!option.text?.toLowerCase().includes(searchValue) || !!option.login?.toLowerCase().includes(searchValue);
+                      return isPartOfSearchTerm;
+                  })
+                : members;
+
+        return [
+            {
+                title: undefined,
+                data: OptionsListUtils.sortAlphabetically(filteredMembers, 'text'),
+                shouldShow: true,
+            },
+        ];
+    }, [approvalWorkflow?.availableMembers, debouncedSearchTerm, policy?.employeeList, selectedMembers, translate]);
+
+    const nextStep = useCallback(() => {
+        const members: Member[] = selectedMembers.map((member) => ({displayName: member.text, avatar: member.icons?.[0]?.source, email: member.login}));
+        Workflow.setApprovalWorkflowMembers(members);
+
+        if (route.params.backTo) {
+            Navigation.navigate(route.params.backTo);
+            return;
+        }
+
+        if (approvalWorkflow?.action === CONST.APPROVAL_WORKFLOW.ACTION.CREATE) {
+            Navigation.navigate(ROUTES.WORKSPACE_WORKFLOWS_APPROVALS_APPROVER.getRoute(route.params.policyID, 0));
+        } else {
+            const firstApprover = approvalWorkflow?.approvers?.[0]?.email ?? '';
+            Navigation.navigate(ROUTES.WORKSPACE_WORKFLOWS_APPROVALS_EDIT.getRoute(route.params.policyID, firstApprover));
+        }
+    }, [approvalWorkflow, route.params.backTo, route.params.policyID, selectedMembers]);
+
+    const goBack = useCallback(() => {
+        if (isInitialCreationFlow) {
+            Workflow.clearApprovalWorkflow();
+        }
+        Navigation.goBack();
+    }, [isInitialCreationFlow]);
+
+    const nextButton = useMemo(
+        () => (
+            <FormAlertWithSubmitButton
+                isDisabled={!selectedMembers.length}
+                buttonText={isInitialCreationFlow ? translate('common.next') : translate('common.save')}
+                onSubmit={nextStep}
+                containerStyles={[styles.flexReset, styles.flexGrow0, styles.flexShrink0, styles.flexBasisAuto]}
+                enabledWhenOffline
+            />
+        ),
+        [isInitialCreationFlow, nextStep, selectedMembers.length, styles.flexBasisAuto, styles.flexGrow0, styles.flexReset, styles.flexShrink0, translate],
+    );
+
+    const toggleMember = (member: SelectionListMember) => {
+        const isAlreadySelected = selectedMembers.some((selectedOption) => selectedOption.login === member.login);
+        setSelectedMembers(isAlreadySelected ? selectedMembers.filter((selectedOption) => selectedOption.login !== member.login) : [...selectedMembers, {...member, isSelected: true}]);
+    };
+
+    const headerMessage = useMemo(() => (searchTerm && !sections[0].data.length ? translate('common.noResultsFound') : ''), [searchTerm, sections, translate]);
+
+    return (
+        <AccessOrNotFoundWrapper
+            policyID={route.params.policyID}
+            featureName={CONST.POLICY.MORE_FEATURES.ARE_WORKFLOWS_ENABLED}
+        >
+            <ScreenWrapper
+                includeSafeAreaPaddingBottom={false}
+                testID={WorkspaceWorkflowsApprovalsExpensesFromPage.displayName}
+                onEntryTransitionEnd={() => setDidScreenTransitionEnd(true)}
+            >
+                <FullPageNotFoundView
+                    shouldShow={shouldShowNotFoundView}
+                    subtitleKey={isEmptyObject(policy) ? undefined : 'workspace.common.notAuthorized'}
+                    onBackButtonPress={PolicyUtils.goBackFromInvalidPolicy}
+                    onLinkPress={PolicyUtils.goBackFromInvalidPolicy}
+                >
+                    <HeaderWithBackButton
+                        title={translate('workflowsExpensesFromPage.title')}
+                        onBackButtonPress={goBack}
+                    />
+                    {approvalWorkflow?.action === CONST.APPROVAL_WORKFLOW.ACTION.CREATE && (
+                        <Text style={[styles.textHeadlineH1, styles.mh5, styles.mv3]}>{translate('workflowsExpensesFromPage.header')}</Text>
+                    )}
+                    <SelectionList
+                        canSelectMultiple
+                        sections={sections}
+                        ListItem={InviteMemberListItem}
+                        textInputLabel={translate('selectionList.findMember')}
+                        textInputValue={searchTerm}
+                        onChangeText={setSearchTerm}
+                        headerMessage={headerMessage}
+                        onSelectRow={toggleMember}
+                        showScrollIndicator
+                        showLoadingPlaceholder={!didScreenTransitionEnd || approvalWorkflowMetadata.status === 'loading'}
+                        shouldPreventDefaultFocusOnSelectRow={!DeviceCapabilities.canUseTouchScreen()}
+                        footerContent={nextButton}
+                    />
+                </FullPageNotFoundView>
+            </ScreenWrapper>
+        </AccessOrNotFoundWrapper>
+    );
+}
+
+WorkspaceWorkflowsApprovalsExpensesFromPage.displayName = 'WorkspaceWorkflowsApprovalsExpensesFromPage';
+
+export default withPolicyAndFullscreenLoading(WorkspaceWorkflowsApprovalsExpensesFromPage);
diff --git a/src/setup/addUtilsToWindow.ts b/src/setup/addUtilsToWindow.ts
index d2d11e138431..3600ad035fb0 100644
--- a/src/setup/addUtilsToWindow.ts
+++ b/src/setup/addUtilsToWindow.ts
@@ -2,6 +2,7 @@ import Onyx from 'react-native-onyx';
 import * as Environment from '@libs/Environment/Environment';
 import markAllPolicyReportsAsRead from '@libs/markAllPolicyReportsAsRead';
 import * as Session from '@userActions/Session';
+import type {OnyxKey} from '@src/ONYXKEYS';
 
 /**
  * This is used to inject development/debugging utilities into the window object on web and desktop.
@@ -17,17 +18,16 @@ export default function addUtilsToWindow() {
             return;
         }
 
-        window.Onyx = Onyx;
+        window.Onyx = Onyx as typeof Onyx & {get: (key: OnyxKey) => Promise<unknown>; log: (key: OnyxKey) => void};
 
         // We intentionally do not offer an Onyx.get API because we believe it will lead to code patterns we don't want to use in this repo, but we can offer a workaround for the sake of debugging
-        // @ts-expect-error TS233 - injecting additional utility for use in runtime debugging, should not be used in any compiled code
         window.Onyx.get = function (key) {
             return new Promise((resolve) => {
                 // eslint-disable-next-line rulesdir/prefer-onyx-connect-in-libs
-                const connectionID = Onyx.connect({
+                const connection = Onyx.connect({
                     key,
                     callback: (value) => {
-                        Onyx.disconnect(connectionID);
+                        Onyx.disconnect(connection);
                         resolve(value);
                     },
                     waitForCollectionCallback: true,
@@ -35,9 +35,7 @@ export default function addUtilsToWindow() {
             });
         };
 
-        // @ts-expect-error TS233 - injecting additional utility for use in runtime debugging, should not be used in any compiled code
         window.Onyx.log = function (key) {
-            // @ts-expect-error TS2339 - using additional utility injected above
             window.Onyx.get(key).then((value) => {
                 /* eslint-disable-next-line no-console */
                 console.log(value);
@@ -47,7 +45,6 @@ export default function addUtilsToWindow() {
         window.setSupportToken = Session.setSupportAuthToken;
 
         // Workaround to give employees the ability to mark reports as read via the JS console
-        // eslint-disable-next-line @typescript-eslint/no-explicit-any
-        (window as any).markAllPolicyReportsAsRead = markAllPolicyReportsAsRead;
+        window.markAllPolicyReportsAsRead = markAllPolicyReportsAsRead;
     });
 }
diff --git a/src/setup/platformSetup/index.native.ts b/src/setup/platformSetup/index.native.ts
index 09a39e13386e..31000ad9daa6 100644
--- a/src/setup/platformSetup/index.native.ts
+++ b/src/setup/platformSetup/index.native.ts
@@ -1,6 +1,4 @@
 import crashlytics from '@react-native-firebase/crashlytics';
-import PushNotification from '@libs/Notification/PushNotification';
-import subscribeToReportCommentPushNotifications from '@libs/Notification/PushNotification/subscribeToReportCommentPushNotifications';
 import Performance from '@libs/Performance';
 import CONFIG from '@src/CONFIG';
 
@@ -12,14 +10,5 @@ export default function () {
         crashlytics().setCrashlyticsCollectionEnabled(false);
     }
 
-    /*
-     * Register callbacks for push notifications.
-     * When the app is completely closed, this code will be executed by a headless JS process thanks to magic in the UrbanAirship RN library.
-     * However, the main App component will not be mounted in this headless context, so we must register these callbacks outside of any React lifecycle.
-     * Otherwise, they will not be executed when the app is completely closed, and the push notification won't update the app data.
-     */
-    PushNotification.init();
-    subscribeToReportCommentPushNotifications();
-
     Performance.setupPerformanceObserver();
 }
diff --git a/src/setup/platformSetup/index.website.ts b/src/setup/platformSetup/index.website.ts
index 0fef333e6508..07917e0e6f65 100644
--- a/src/setup/platformSetup/index.website.ts
+++ b/src/setup/platformSetup/index.website.ts
@@ -1,6 +1,4 @@
 import {AppRegistry} from 'react-native';
-// This is a polyfill for InternetExplorer to support the modern KeyboardEvent.key and KeyboardEvent.code instead of KeyboardEvent.keyCode
-import 'shim-keyboard-event-key';
 import checkForUpdates from '@libs/checkForUpdates';
 import DateUtils from '@libs/DateUtils';
 import Visibility from '@libs/Visibility';
@@ -55,7 +53,6 @@ const webUpdater = (): PlatformSpecificUpdater => ({
 export default function () {
     AppRegistry.runApplication(Config.APP_NAME, {
         rootTag: document.getElementById('root'),
-        mode: 'legacy',
     });
 
     // When app loads, get current version (production only)
diff --git a/src/stories/ButtonWithDropdownMenu.stories.tsx b/src/stories/ButtonWithDropdownMenu.stories.tsx
index f0e3fba1edb3..fe22d737c998 100644
--- a/src/stories/ButtonWithDropdownMenu.stories.tsx
+++ b/src/stories/ButtonWithDropdownMenu.stories.tsx
@@ -25,7 +25,7 @@ function Template(props: ButtonWithDropdownMenuProps<unknown>) {
 // See: https://storybook.js.org/docs/react/writing-stories/introduction#using-args
 const Default: ButtonWithDropdownMenuStory = Template.bind({});
 Default.args = {
-    customText: 'Pay using Expensify',
+    customText: 'Pay with Expensify',
     onPress: (e, item) => {
         alert(`Button ${item as string} is pressed.`);
     },
diff --git a/src/stories/Composer.stories.tsx b/src/stories/Composer.stories.tsx
index b60568003bd2..a92dc0e789a0 100644
--- a/src/stories/Composer.stories.tsx
+++ b/src/stories/Composer.stories.tsx
@@ -1,7 +1,9 @@
 import type {Meta} from '@storybook/react';
-import ExpensiMark from 'expensify-common/lib/ExpensiMark';
+// eslint-disable-next-line no-restricted-imports
+import {ExpensiMark} from 'expensify-common';
 import React, {useState} from 'react';
 import {Image, View} from 'react-native';
+import type {FileObject} from '@components/AttachmentModal';
 import Composer from '@components/Composer';
 import type {ComposerProps} from '@components/Composer/types';
 import RenderHTML from '@components/RenderHTML';
@@ -28,7 +30,7 @@ const parser = new ExpensiMark();
 
 function Default(props: ComposerProps) {
     const StyleUtils = useStyleUtils();
-    const [pastedFile, setPastedFile] = useState<File | null>(null);
+    const [pastedFile, setPastedFile] = useState<FileObject | null>(null);
     const [comment, setComment] = useState(props.defaultValue);
     const renderedHTML = parser.replace(comment ?? '');
 
@@ -52,7 +54,7 @@ function Default(props: ComposerProps) {
                 <View style={[defaultStyles.p5, defaultStyles.borderBottom, defaultStyles.borderRight, defaultStyles.borderTop, defaultStyles.flex1]}>
                     <Text style={[defaultStyles.mb2, defaultStyles.textLabelSupporting]}>Rendered Comment</Text>
                     {!!renderedHTML && <RenderHTML html={renderedHTML} />}
-                    {!!pastedFile && (
+                    {!!pastedFile && pastedFile instanceof File && (
                         <View style={defaultStyles.mv3}>
                             <Image
                                 source={{uri: URL.createObjectURL(pastedFile)}}
diff --git a/src/stories/Form.stories.tsx b/src/stories/Form.stories.tsx
index 8a1c2ca0b8f0..ab29612b0556 100644
--- a/src/stories/Form.stories.tsx
+++ b/src/stories/Form.stories.tsx
@@ -1,5 +1,6 @@
 import type {Meta, StoryFn} from '@storybook/react';
 import React, {useState} from 'react';
+import type {ComponentType} from 'react';
 import {View} from 'react-native';
 import AddressSearch from '@components/AddressSearch';
 import CheckboxWithLabel from '@components/CheckboxWithLabel';
@@ -11,7 +12,6 @@ import Picker from '@components/Picker';
 import StateSelector from '@components/StateSelector';
 import Text from '@components/Text';
 import TextInput from '@components/TextInput';
-import type {MaybePhraseKey} from '@libs/Localize';
 import NetworkConnection from '@libs/NetworkConnection';
 import * as ValidationUtils from '@libs/ValidationUtils';
 import * as FormActions from '@userActions/FormActions';
@@ -36,29 +36,17 @@ type StorybookFormErrors = Partial<Record<keyof StorybookFormValues, string>>;
 
 const STORYBOOK_FORM_ID = 'TestForm' as keyof OnyxFormValuesMapping;
 
-/**
- * We use the Component Story Format for writing stories. Follow the docs here:
- *
- * https://storybook.js.org/docs/react/writing-stories/introduction#component-story-format
- */
 const story: Meta<typeof FormProvider> = {
     title: 'Components/Form',
     component: FormProvider,
     subcomponents: {
-        // @ts-expect-error Subcomponent passes props with unknown type causing a TS error
-        InputWrapper,
-        // @ts-expect-error Subcomponent passes props with unknown type causing a TS error
-        TextInput,
-        // @ts-expect-error Subcomponent passes props with unknown type causing a TS error
-        AddressSearch,
-        // @ts-expect-error Subcomponent passes props with unknown type causing a TS error
-        CheckboxWithLabel,
-        // @ts-expect-error Subcomponent passes props with unknown type causing a TS error
-        Picker,
-        // @ts-expect-error Subcomponent passes props with unknown type causing a TS error
-        StateSelector,
-        // @ts-expect-error Subcomponent passes props with unknown type causing a TS error
-        DatePicker,
+        InputWrapper: InputWrapper as ComponentType<unknown>,
+        TextInput: TextInput as ComponentType<unknown>,
+        AddressSearch: AddressSearch as ComponentType<unknown>,
+        CheckboxWithLabel: CheckboxWithLabel as ComponentType<unknown>,
+        Picker: Picker as ComponentType<unknown>,
+        StateSelector: StateSelector as ComponentType<unknown>,
+        DatePicker: DatePicker as ComponentType<unknown>,
     },
 };
 
@@ -69,7 +57,7 @@ function Template(props: FormProviderProps) {
     FormActions.setDraftValues(props.formID, props.draftValues);
 
     if (props.formState?.error) {
-        FormActions.setErrors(props.formID, {error: props.formState.error as MaybePhraseKey});
+        FormActions.setErrors(props.formID, {error: props.formState.error as string});
     } else {
         FormActions.clearErrors(props.formID);
     }
@@ -183,7 +171,7 @@ function WithNativeEventHandler(props: FormProviderProps) {
     FormActions.setDraftValues(props.formID, props.draftValues);
 
     if (props.formState?.error) {
-        FormActions.setErrors(props.formID, {error: props.formState.error as MaybePhraseKey});
+        FormActions.setErrors(props.formID, {error: props.formState.error as string});
     } else {
         FormActions.clearErrors(props.formID);
     }
diff --git a/src/stories/PromotedActionBar.stories.tsx b/src/stories/PromotedActionBar.stories.tsx
new file mode 100644
index 000000000000..f3fc626fc916
--- /dev/null
+++ b/src/stories/PromotedActionBar.stories.tsx
@@ -0,0 +1,70 @@
+import React from 'react';
+import {View} from 'react-native';
+import * as Expensicons from '@components/Icon/Expensicons';
+import PromotedActionsBar from '@components/PromotedActionsBar';
+import type {PromotedAction, PromotedActionsBarProps} from '@components/PromotedActionsBar';
+import variables from '@src/styles/variables';
+
+/**
+ * We use the Component Story Format for writing stories. Follow the docs here:
+ *
+ * https://storybook.js.org/docs/react/writing-stories/introduction#component-story-format
+ */
+const story = {
+    title: 'Components/PromotedActionsBar',
+    component: PromotedActionsBar,
+};
+
+type StoryType = typeof Template & {args?: Partial<PromotedActionsBarProps>};
+
+function Template(args: PromotedActionsBarProps) {
+    return (
+        <View style={{maxWidth: variables.sideBarWidth}}>
+            <PromotedActionsBar
+                // eslint-disable-next-line react/jsx-props-no-spreading
+                {...args}
+            />
+        </View>
+    );
+}
+
+const promotedActions = [
+    {
+        key: 'join',
+        icon: Expensicons.CommentBubbles,
+        text: 'Join',
+        onSelected: () => {},
+    },
+    {
+        key: 'pin',
+        icon: Expensicons.Pin,
+        text: 'Pin',
+        onSelected: () => {},
+    },
+    {
+        key: 'share',
+        icon: Expensicons.QrCode,
+        text: 'Share',
+        onSelected: () => {},
+    },
+] satisfies PromotedAction[];
+
+// Arguments can be passed to the component by binding
+// See: https://storybook.js.org/docs/react/writing-stories/introduction#using-args
+const Default: StoryType = Template.bind({});
+Default.args = {
+    promotedActions: [promotedActions[0]],
+};
+
+const TwoPromotedActions: StoryType = Template.bind({});
+TwoPromotedActions.args = {
+    promotedActions: [promotedActions[0], promotedActions[1]],
+};
+
+const ThreePromotedActions: StoryType = Template.bind({});
+ThreePromotedActions.args = {
+    promotedActions: [promotedActions[0], promotedActions[1], promotedActions[2]],
+};
+
+export default story;
+export {Default, TwoPromotedActions, ThreePromotedActions};
diff --git a/src/styles/index.ts b/src/styles/index.ts
index 54a72bee54eb..b9538ea4ed88 100644
--- a/src/styles/index.ts
+++ b/src/styles/index.ts
@@ -7,6 +7,7 @@ import {StyleSheet} from 'react-native';
 import type {CustomAnimation} from 'react-native-animatable';
 import type {PickerStyle} from 'react-native-picker-select';
 import type {MixedStyleDeclaration, MixedStyleRecord} from 'react-native-render-html';
+import type {ValueOf} from 'type-fest';
 import type DotLottieAnimation from '@components/LottieAnimations/types';
 import * as Browser from '@libs/Browser';
 import CONST from '@src/CONST';
@@ -15,6 +16,7 @@ import colors from './theme/colors';
 import type {ThemeColors} from './theme/types';
 import addOutlineWidth from './utils/addOutlineWidth';
 import borders from './utils/borders';
+import chatContentScrollViewPlatformStyles from './utils/chatContentScrollViewPlatformStyles';
 import codeStyles from './utils/codeStyles';
 import cursor from './utils/cursor';
 import display from './utils/display';
@@ -42,8 +44,8 @@ import wordBreak from './utils/wordBreak';
 import writingDirection from './utils/writingDirection';
 import variables from './variables';
 
-type ColorScheme = (typeof CONST.COLOR_SCHEME)[keyof typeof CONST.COLOR_SCHEME];
-type StatusBarStyle = (typeof CONST.STATUS_BAR_STYLE)[keyof typeof CONST.STATUS_BAR_STYLE];
+type ColorScheme = ValueOf<typeof CONST.COLOR_SCHEME>;
+type StatusBarStyle = ValueOf<typeof CONST.STATUS_BAR_STYLE>;
 
 type AnchorDimensions = {
     width: number;
@@ -65,6 +67,7 @@ type CustomPickerStyle = PickerStyle & {icon?: ViewStyle};
 type OverlayStylesParams = {progress: Animated.AnimatedInterpolation<string | number>};
 
 type TwoFactorAuthCodesBoxParams = {isExtraSmallScreenWidth: boolean; isSmallScreenWidth: boolean};
+type WorkspaceUpgradeIntroBoxParams = {isExtraSmallScreenWidth: boolean; isSmallScreenWidth: boolean};
 
 type Translation = 'perspective' | 'rotate' | 'rotateX' | 'rotateY' | 'rotateZ' | 'scale' | 'scaleX' | 'scaleY' | 'translateX' | 'translateY' | 'skewX' | 'skewY' | 'matrix';
 
@@ -96,7 +99,7 @@ const picker = (theme: ThemeColors) =>
     ({
         backgroundColor: theme.transparent,
         color: theme.text,
-        fontFamily: FontUtils.fontFamily.platform.EXP_NEUE,
+        ...FontUtils.fontFamily.platform.EXP_NEUE,
         fontSize: variables.fontSizeNormal,
         lineHeight: variables.fontSizeNormalHeight,
         paddingBottom: 8,
@@ -112,7 +115,8 @@ const link = (theme: ThemeColors) =>
     ({
         color: theme.link,
         textDecorationColor: theme.link,
-        fontFamily: FontUtils.fontFamily.platform.EXP_NEUE,
+        // We set fontFamily directly in order to avoid overriding fontWeight and fontStyle.
+        fontFamily: FontUtils.fontFamily.platform.EXP_NEUE.fontFamily,
     } satisfies ViewStyle & MixedStyleDeclaration);
 
 const baseCodeTagStyles = (theme: ThemeColors) =>
@@ -124,8 +128,7 @@ const baseCodeTagStyles = (theme: ThemeColors) =>
     } satisfies ViewStyle & MixedStyleDeclaration);
 
 const headlineFont = {
-    fontFamily: FontUtils.fontFamily.platform.EXP_NEW_KANSAS_MEDIUM,
-    fontWeight: '500',
+    ...FontUtils.fontFamily.platform.EXP_NEW_KANSAS_MEDIUM,
 } satisfies TextStyle;
 
 const modalNavigatorContainer = (isSmallScreenWidth: boolean) =>
@@ -144,8 +147,9 @@ const webViewStyles = (theme: ThemeColors) =>
         // component.
         tagStyles: {
             em: {
-                fontFamily: FontUtils.fontFamily.platform.EXP_NEUE,
-                fontStyle: 'italic',
+                // We set fontFamily and fontStyle directly in order to avoid overriding fontWeight.
+                fontFamily: FontUtils.fontFamily.platform.EXP_NEUE_ITALIC.fontFamily,
+                fontStyle: FontUtils.fontFamily.platform.EXP_NEUE_ITALIC.fontStyle,
             },
 
             del: {
@@ -154,8 +158,9 @@ const webViewStyles = (theme: ThemeColors) =>
             },
 
             strong: {
-                fontFamily: FontUtils.fontFamily.platform.EXP_NEUE,
-                fontWeight: 'bold',
+                // We set fontFamily and fontWeight directly in order to avoid overriding fontStyle.
+                fontFamily: FontUtils.fontFamily.platform.EXP_NEUE_BOLD.fontFamily,
+                fontWeight: FontUtils.fontFamily.platform.EXP_NEUE_BOLD.fontWeight,
             },
 
             a: link(theme),
@@ -188,7 +193,7 @@ const webViewStyles = (theme: ThemeColors) =>
                 paddingVertical: 8,
                 paddingHorizontal: 12,
                 fontSize: 13,
-                fontFamily: FontUtils.fontFamily.platform.MONOSPACE,
+                ...FontUtils.fontFamily.platform.MONOSPACE,
                 marginTop: 0,
                 marginBottom: 0,
             },
@@ -198,7 +203,7 @@ const webViewStyles = (theme: ThemeColors) =>
                 ...(codeStyles.codeTextStyle as MixedStyleDeclaration),
                 paddingLeft: 5,
                 paddingRight: 5,
-                fontFamily: FontUtils.fontFamily.platform.MONOSPACE,
+                ...FontUtils.fontFamily.platform.MONOSPACE,
                 // Font size is determined by getCodeFontSize function in `StyleUtils.js`
             },
 
@@ -230,7 +235,7 @@ const webViewStyles = (theme: ThemeColors) =>
         baseFontStyle: {
             color: theme.text,
             fontSize: variables.fontSizeNormal,
-            fontFamily: FontUtils.fontFamily.platform.EXP_NEUE,
+            ...FontUtils.fontFamily.platform.EXP_NEUE,
             flex: 1,
             lineHeight: variables.fontSizeNormalHeight,
             ...writingDirection.ltr,
@@ -264,10 +269,8 @@ const styles = (theme: ThemeColors) =>
             borderWidth: 1,
             borderColor: theme.border,
             justifyContent: 'center',
+            overflow: 'hidden',
             boxShadow: variables.popoverMenuShadow,
-            position: 'absolute',
-            left: 0,
-            right: 0,
             paddingVertical: CONST.AUTO_COMPLETE_SUGGESTER.SUGGESTER_INNER_PADDING,
         },
 
@@ -310,8 +313,7 @@ const styles = (theme: ThemeColors) =>
         },
 
         mentionSuggestionsDisplayName: {
-            fontFamily: FontUtils.fontFamily.platform.EXP_NEUE_BOLD,
-            fontWeight: FontUtils.fontWeight.bold,
+            ...FontUtils.fontFamily.platform.EXP_NEUE_BOLD,
         },
 
         textSupporting: {
@@ -325,7 +327,7 @@ const styles = (theme: ThemeColors) =>
         linkMuted: {
             color: theme.textSupporting,
             textDecorationColor: theme.textSupporting,
-            fontFamily: FontUtils.fontFamily.platform.EXP_NEUE,
+            ...FontUtils.fontFamily.platform.EXP_NEUE,
         },
 
         linkMutedHovered: {
@@ -339,11 +341,13 @@ const styles = (theme: ThemeColors) =>
         appBG: {
             backgroundColor: theme.appBG,
         },
+        fontSizeLabel: {
+            fontSize: variables.fontSizeLabel,
+        },
 
         h4: {
-            fontFamily: FontUtils.fontFamily.platform.EXP_NEUE_BOLD,
+            ...FontUtils.fontFamily.platform.EXP_NEUE_BOLD,
             fontSize: variables.fontSizeLabel,
-            fontWeight: FontUtils.fontWeight.bold,
         },
 
         textAlignCenter: {
@@ -361,7 +365,9 @@ const styles = (theme: ThemeColors) =>
         verticalAlignTop: {
             verticalAlign: 'top',
         },
-
+        lineHeightLarge: {
+            lineHeight: variables.lineHeightLarge,
+        },
         label: {
             fontSize: variables.fontSizeLabel,
             lineHeight: variables.lineHeightLarge,
@@ -373,6 +379,10 @@ const styles = (theme: ThemeColors) =>
             lineHeight: variables.lineHeightLarge,
         },
 
+        themeTextColor: {
+            color: theme.text,
+        },
+
         mutedTextLabel: {
             color: theme.textSupporting,
             fontSize: variables.fontSizeLabel,
@@ -385,30 +395,34 @@ const styles = (theme: ThemeColors) =>
             lineHeight: variables.lineHeightNormal,
         },
 
+        textSmall: {
+            ...FontUtils.fontFamily.platform.EXP_NEUE,
+            fontSize: variables.fontSizeSmall,
+        },
+
         textMicro: {
-            fontFamily: FontUtils.fontFamily.platform.EXP_NEUE,
+            ...FontUtils.fontFamily.platform.EXP_NEUE,
             fontSize: variables.fontSizeSmall,
             lineHeight: variables.lineHeightSmall,
         },
 
         textMicroBold: {
             color: theme.text,
-            fontWeight: FontUtils.fontWeight.bold,
-            fontFamily: FontUtils.fontFamily.platform.EXP_NEUE_BOLD,
+            ...FontUtils.fontFamily.platform.EXP_NEUE_BOLD,
             fontSize: variables.fontSizeSmall,
             lineHeight: variables.lineHeightSmall,
         },
 
         textMicroSupporting: {
             color: theme.textSupporting,
-            fontFamily: FontUtils.fontFamily.platform.EXP_NEUE,
+            ...FontUtils.fontFamily.platform.EXP_NEUE,
             fontSize: variables.fontSizeSmall,
             lineHeight: variables.lineHeightSmall,
         },
 
         textExtraSmallSupporting: {
             color: theme.textSupporting,
-            fontFamily: FontUtils.fontFamily.platform.EXP_NEUE,
+            ...FontUtils.fontFamily.platform.EXP_NEUE,
             fontSize: variables.fontSizeExtraSmall,
         },
 
@@ -435,18 +449,12 @@ const styles = (theme: ThemeColors) =>
 
         textHero: {
             fontSize: variables.fontSizeHero,
-            fontFamily: FontUtils.fontFamily.platform.EXP_NEW_KANSAS_MEDIUM,
+            ...FontUtils.fontFamily.platform.EXP_NEW_KANSAS_MEDIUM,
             lineHeight: variables.lineHeightHero,
         },
 
-        textNewKansasNormal: {
-            fontFamily: FontUtils.fontFamily.platform.EXP_NEW_KANSAS_MEDIUM,
-            fontSize: variables.fontSizeNormal,
-        },
-
         textStrong: {
-            fontFamily: FontUtils.fontFamily.platform.EXP_NEUE_BOLD,
-            fontWeight: FontUtils.fontWeight.bold,
+            ...FontUtils.fontFamily.platform.EXP_NEUE_BOLD,
         },
 
         fontWeightNormal: {
@@ -485,18 +493,30 @@ const styles = (theme: ThemeColors) =>
             color: theme.link,
         },
 
+        textBold: {
+            fontWeight: FontUtils.fontWeight.bold,
+        },
+
         textVersion: {
             color: theme.iconColorfulBackground,
             fontSize: variables.fontSizeNormal,
             lineHeight: variables.lineHeightNormal,
-            fontFamily: FontUtils.fontFamily.platform.MONOSPACE,
+            ...FontUtils.fontFamily.platform.MONOSPACE,
             textAlign: 'center',
         },
 
+        textWrap: {
+            ...whiteSpace.preWrap,
+        },
+
         textNoWrap: {
             ...whiteSpace.noWrap,
         },
 
+        textLineHeightNormal: {
+            lineHeight: variables.lineHeightNormal,
+        },
+
         colorReversed: {
             color: theme.textReversed,
         },
@@ -567,15 +587,13 @@ const styles = (theme: ThemeColors) =>
         },
 
         buttonContainer: {
-            padding: 1,
             borderRadius: variables.buttonBorderRadius,
         },
 
         buttonText: {
             color: theme.text,
-            fontFamily: FontUtils.fontFamily.platform.EXP_NEUE_BOLD,
+            ...FontUtils.fontFamily.platform.EXP_NEUE_BOLD,
             fontSize: variables.fontSizeNormal,
-            fontWeight: FontUtils.fontWeight.bold,
             textAlign: 'center',
             flexShrink: 1,
 
@@ -621,22 +639,19 @@ const styles = (theme: ThemeColors) =>
 
         buttonSmallText: {
             fontSize: variables.fontSizeSmall,
-            fontFamily: FontUtils.fontFamily.platform.EXP_NEUE_BOLD,
-            fontWeight: FontUtils.fontWeight.bold,
+            ...FontUtils.fontFamily.platform.EXP_NEUE_BOLD,
             textAlign: 'center',
         },
 
         buttonMediumText: {
             fontSize: variables.fontSizeLabel,
-            fontFamily: FontUtils.fontFamily.platform.EXP_NEUE_BOLD,
-            fontWeight: FontUtils.fontWeight.bold,
+            ...FontUtils.fontFamily.platform.EXP_NEUE_BOLD,
             textAlign: 'center',
         },
 
         buttonLargeText: {
             fontSize: variables.fontSizeNormal,
-            fontFamily: FontUtils.fontFamily.platform.EXP_NEUE_BOLD,
-            fontWeight: FontUtils.fontWeight.bold,
+            ...FontUtils.fontFamily.platform.EXP_NEUE_BOLD,
             textAlign: 'center',
         },
 
@@ -776,10 +791,10 @@ const styles = (theme: ThemeColors) =>
             height: 140,
         },
 
-        pickerSmall: (disabled = false, backgroundColor = theme.highlightBG) =>
+        pickerSmall: (disabled = false, backgroundColor: string = theme.highlightBG) =>
             ({
                 inputIOS: {
-                    fontFamily: FontUtils.fontFamily.platform.EXP_NEUE,
+                    ...FontUtils.fontFamily.platform.EXP_NEUE,
                     fontSize: variables.fontSizeSmall,
                     paddingLeft: 0,
                     paddingRight: 17,
@@ -799,6 +814,7 @@ const styles = (theme: ThemeColors) =>
                     fontSize: 17,
                 },
                 modalViewMiddle: {
+                    position: 'relative',
                     backgroundColor: theme.border,
                     borderTopWidth: 0,
                 },
@@ -806,7 +822,7 @@ const styles = (theme: ThemeColors) =>
                     backgroundColor: theme.highlightBG,
                 },
                 inputWeb: {
-                    fontFamily: FontUtils.fontFamily.platform.EXP_NEUE,
+                    ...FontUtils.fontFamily.platform.EXP_NEUE,
                     fontSize: variables.fontSizeSmall,
                     paddingLeft: 0,
                     paddingRight: 17,
@@ -821,7 +837,7 @@ const styles = (theme: ThemeColors) =>
                     ...(disabled ? cursor.cursorDisabled : cursor.cursorPointer),
                 },
                 inputAndroid: {
-                    fontFamily: FontUtils.fontFamily.platform.EXP_NEUE,
+                    ...FontUtils.fontFamily.platform.EXP_NEUE,
                     fontSize: variables.fontSizeSmall,
                     paddingLeft: 0,
                     paddingRight: 17,
@@ -841,6 +857,10 @@ const styles = (theme: ThemeColors) =>
                     width: variables.iconSizeExtraSmall,
                     height: variables.iconSizeExtraSmall,
                 },
+                chevronContainer: {
+                    pointerEvents: 'none',
+                    opacity: 0,
+                },
             } satisfies CustomPickerStyle),
 
         badge: {
@@ -864,6 +884,16 @@ const styles = (theme: ThemeColors) =>
             alignItems: 'center',
         },
 
+        cardBadge: {
+            position: 'absolute',
+            top: 20,
+            left: 16,
+            marginLeft: 0,
+            paddingHorizontal: 8,
+            minHeight: 20,
+            borderColor: colors.productDark500,
+        },
+
         environmentBadge: {
             minHeight: 12,
             borderRadius: 14,
@@ -929,6 +959,11 @@ const styles = (theme: ThemeColors) =>
             ...whiteSpace.noWrap,
         },
 
+        cardBadgeText: {
+            color: colors.white,
+            fontSize: variables.fontSizeExtraSmall,
+        },
+
         activeItemBadge: {
             borderColor: theme.buttonHoveredBG,
         },
@@ -1016,18 +1051,24 @@ const styles = (theme: ThemeColors) =>
             justifyContent: 'center',
         },
 
+        invisiblePDF: {
+            position: 'absolute',
+            opacity: 0,
+            width: 1,
+            height: 1,
+        },
+
         headerAnonymousFooter: {
             color: theme.heading,
-            fontFamily: FontUtils.fontFamily.platform.EXP_NEW_KANSAS_MEDIUM,
+            ...FontUtils.fontFamily.platform.EXP_NEW_KANSAS_MEDIUM,
             fontSize: variables.fontSizeXLarge,
             lineHeight: variables.lineHeightXXLarge,
         },
 
         headerText: {
             color: theme.heading,
-            fontFamily: FontUtils.fontFamily.platform.EXP_NEUE_BOLD,
+            ...FontUtils.fontFamily.platform.EXP_NEUE_BOLD,
             fontSize: variables.fontSizeNormal,
-            fontWeight: FontUtils.fontWeight.bold,
         },
 
         headerGap: {
@@ -1046,7 +1087,7 @@ const styles = (theme: ThemeColors) =>
 
         chatItemComposeSecondaryRowSubText: {
             color: theme.textSupporting,
-            fontFamily: FontUtils.fontFamily.platform.EXP_NEUE,
+            ...FontUtils.fontFamily.platform.EXP_NEUE,
             fontSize: variables.fontSizeSmall,
             lineHeight: variables.lineHeightSmall,
         },
@@ -1137,9 +1178,8 @@ const styles = (theme: ThemeColors) =>
             borderColor: theme.border,
         },
 
-        textInputContainerBorder: {
-            borderBottomWidth: 2,
-            borderColor: theme.border,
+        optionRowAmountInput: {
+            textAlign: 'right',
         },
 
         textInputLabel: {
@@ -1148,7 +1188,7 @@ const styles = (theme: ThemeColors) =>
             top: 0,
             fontSize: variables.fontSizeNormal,
             color: theme.textSupporting,
-            fontFamily: FontUtils.fontFamily.platform.EXP_NEUE,
+            ...FontUtils.fontFamily.platform.EXP_NEUE,
             width: '100%',
             zIndex: 1,
         },
@@ -1171,7 +1211,7 @@ const styles = (theme: ThemeColors) =>
             } satisfies TextStyle),
 
         baseTextInput: {
-            fontFamily: FontUtils.fontFamily.platform.EXP_NEUE,
+            ...FontUtils.fontFamily.platform.EXP_NEUE,
             fontSize: variables.fontSizeNormal,
             lineHeight: variables.lineHeightXLarge,
             color: theme.text,
@@ -1221,7 +1261,7 @@ const styles = (theme: ThemeColors) =>
             borderColor: theme.border,
             borderWidth: 1,
             color: theme.text,
-            fontFamily: FontUtils.fontFamily.platform.EXP_NEUE,
+            ...FontUtils.fontFamily.platform.EXP_NEUE,
             fontSize: variables.fontSizeNormal,
             paddingLeft: 12,
             paddingRight: 12,
@@ -1242,9 +1282,28 @@ const styles = (theme: ThemeColors) =>
             paddingBottom: 8,
         },
 
+        textInputSuffixWrapper: {
+            position: 'absolute',
+            right: 0,
+            top: 0,
+            height: variables.inputHeight,
+            display: 'flex',
+            flexDirection: 'row',
+            alignItems: 'center',
+            paddingTop: 23,
+            paddingBottom: 8,
+        },
+
         textInputPrefix: {
             color: theme.text,
-            fontFamily: FontUtils.fontFamily.platform.EXP_NEUE,
+            ...FontUtils.fontFamily.platform.EXP_NEUE,
+            fontSize: variables.fontSizeNormal,
+            verticalAlign: 'middle',
+        },
+
+        textInputSuffix: {
+            color: theme.text,
+            ...FontUtils.fontFamily.platform.EXP_NEUE,
             fontSize: variables.fontSizeNormal,
             verticalAlign: 'middle',
         },
@@ -1271,7 +1330,7 @@ const styles = (theme: ThemeColors) =>
             zIndex: 1,
         },
 
-        picker: (disabled = false, backgroundColor = theme.appBG) =>
+        picker: (disabled = false, backgroundColor: string = theme.appBG) =>
             ({
                 iconContainer: {
                     top: Math.round(variables.inputHeight * 0.5) - 11,
@@ -1321,34 +1380,31 @@ const styles = (theme: ThemeColors) =>
         noOutline: addOutlineWidth(theme, {}, 0),
 
         labelStrong: {
-            fontFamily: FontUtils.fontFamily.platform.EXP_NEUE,
-            fontWeight: 'bold',
+            ...FontUtils.fontFamily.platform.EXP_NEUE_BOLD,
             fontSize: variables.fontSizeLabel,
             lineHeight: variables.lineHeightNormal,
         },
 
         textLabelSupporting: {
-            fontFamily: FontUtils.fontFamily.platform.EXP_NEUE,
+            ...FontUtils.fontFamily.platform.EXP_NEUE,
             fontSize: variables.fontSizeLabel,
             color: theme.textSupporting,
         },
 
         textLabelSupportingEmptyValue: {
-            fontFamily: FontUtils.fontFamily.platform.EXP_NEUE,
+            ...FontUtils.fontFamily.platform.EXP_NEUE,
             fontSize: variables.fontSizeNormal,
-            fontWeight: FontUtils.fontWeight.normal,
             color: theme.textSupporting,
         },
 
         textLabelSupportingNormal: {
-            fontFamily: FontUtils.fontFamily.platform.EXP_NEUE,
+            ...FontUtils.fontFamily.platform.EXP_NEUE,
             fontSize: variables.fontSizeLabel,
             color: theme.textSupporting,
-            fontWeight: FontUtils.fontWeight.normal,
         },
 
         textLabelError: {
-            fontFamily: FontUtils.fontFamily.platform.EXP_NEUE,
+            ...FontUtils.fontFamily.platform.EXP_NEUE,
             fontSize: variables.fontSizeLabel,
             color: theme.textError,
         },
@@ -1361,18 +1417,22 @@ const styles = (theme: ThemeColors) =>
         },
 
         subTextReceiptUpload: {
-            fontFamily: FontUtils.fontFamily.platform.EXP_NEUE,
+            ...FontUtils.fontFamily.platform.EXP_NEUE,
             lineHeight: variables.lineHeightLarge,
             textAlign: 'center',
             color: theme.text,
         },
 
         furtherDetailsText: {
-            fontFamily: FontUtils.fontFamily.platform.EXP_NEUE,
+            ...FontUtils.fontFamily.platform.EXP_NEUE,
             fontSize: variables.fontSizeSmall,
             color: theme.textSupporting,
         },
 
+        lh14: {
+            lineHeight: variables.lineHeightSmall,
+        },
+
         lh16: {
             lineHeight: 16,
         },
@@ -1388,14 +1448,14 @@ const styles = (theme: ThemeColors) =>
         formHelp: {
             color: theme.textSupporting,
             fontSize: variables.fontSizeLabel,
-            lineHeight: variables.lineHeightLarge,
+            lineHeight: variables.lineHeightNormal,
             marginBottom: 4,
         },
 
         formError: {
             color: theme.textError,
             fontSize: variables.fontSizeLabel,
-            lineHeight: variables.formErrorLineHeight,
+            lineHeight: variables.lineHeightNormal,
             marginBottom: 4,
         },
 
@@ -1412,6 +1472,11 @@ const styles = (theme: ThemeColors) =>
             flex: 1,
         },
 
+        lhnSuccessText: {
+            color: theme.success,
+            fontWeight: FontUtils.fontWeight.bold,
+        },
+
         signInPageHeroCenter: {
             position: 'absolute',
             top: 0,
@@ -1491,6 +1556,12 @@ const styles = (theme: ThemeColors) =>
             height: '100%',
         },
 
+        canvasContainer: {
+            // Adding border to prevent a bug with the appearance of lines during gesture events for MultiGestureCanvas
+            borderWidth: 1,
+            borderColor: theme.appBG,
+        },
+
         sidebarHeaderContainer: {
             flexDirection: 'row',
             paddingHorizontal: 20,
@@ -1530,7 +1601,7 @@ const styles = (theme: ThemeColors) =>
             borderColor: theme.success,
         },
 
-        statusIndicator: (backgroundColor = theme.danger) =>
+        statusIndicator: (backgroundColor: string = theme.danger) =>
             ({
                 borderColor: theme.sidebar,
                 backgroundColor,
@@ -1544,7 +1615,7 @@ const styles = (theme: ThemeColors) =>
                 zIndex: 10,
             } satisfies ViewStyle),
 
-        bottomTabStatusIndicator: (backgroundColor = theme.danger) => ({
+        bottomTabStatusIndicator: (backgroundColor: string = theme.danger) => ({
             borderColor: theme.sidebar,
             backgroundColor,
             borderRadius: 8,
@@ -1569,7 +1640,7 @@ const styles = (theme: ThemeColors) =>
         sidebarFooterUsername: {
             color: theme.heading,
             fontSize: variables.fontSizeLabel,
-            fontWeight: '700',
+            fontWeight: FontUtils.fontWeight.bold,
             width: 200,
             textOverflow: 'ellipsis',
             overflow: 'hidden',
@@ -1580,7 +1651,7 @@ const styles = (theme: ThemeColors) =>
             color: theme.textSupporting,
             fontSize: variables.fontSizeSmall,
             textDecorationLine: 'none',
-            fontFamily: FontUtils.fontFamily.platform.EXP_NEUE,
+            ...FontUtils.fontFamily.platform.EXP_NEUE,
             lineHeight: 20,
         },
 
@@ -1686,13 +1757,13 @@ const styles = (theme: ThemeColors) =>
 
         createMenuContainer: {
             width: variables.sideBarWidth - 40,
-            paddingVertical: 12,
+            paddingVertical: variables.componentBorderRadiusLarge,
         },
 
         createMenuHeaderText: {
-            fontFamily: FontUtils.fontFamily.platform.EXP_NEUE,
+            ...FontUtils.fontFamily.platform.EXP_NEUE,
             fontSize: variables.fontSizeLabel,
-            color: theme.heading,
+            color: theme.textSupporting,
         },
 
         popoverMenuItem: {
@@ -1778,7 +1849,7 @@ const styles = (theme: ThemeColors) =>
         },
 
         sidebarLinkActive: {
-            backgroundColor: theme.buttonHoveredBG,
+            backgroundColor: theme.activeComponentBG,
             textDecorationLine: 'none',
         },
 
@@ -1788,8 +1859,7 @@ const styles = (theme: ThemeColors) =>
         },
 
         sidebarLinkTextBold: {
-            fontFamily: FontUtils.fontFamily.platform.EXP_NEUE_BOLD,
-            fontWeight: FontUtils.fontWeight.bold,
+            ...FontUtils.fontFamily.platform.EXP_NEUE_BOLD,
             color: theme.heading,
         },
 
@@ -1806,7 +1876,7 @@ const styles = (theme: ThemeColors) =>
         },
 
         optionDisplayName: {
-            fontFamily: FontUtils.fontFamily.platform.EXP_NEUE,
+            ...FontUtils.fontFamily.platform.EXP_NEUE,
             minHeight: variables.alternateTextHeight,
             lineHeight: variables.lineHeightXLarge,
             ...whiteSpace.noWrap,
@@ -1937,8 +2007,10 @@ const styles = (theme: ThemeColors) =>
         },
 
         chatContentScrollView: {
-            justifyContent: 'flex-end',
+            flexGrow: 1,
+            justifyContent: 'flex-start',
             paddingBottom: 16,
+            ...chatContentScrollViewPlatformStyles,
         },
 
         // Chat Item
@@ -1975,9 +2047,8 @@ const styles = (theme: ThemeColors) =>
 
         chatItemMessageHeaderSender: {
             color: theme.heading,
-            fontFamily: FontUtils.fontFamily.platform.EXP_NEUE_BOLD,
+            ...FontUtils.fontFamily.platform.EXP_NEUE_BOLD,
             fontSize: variables.fontSizeNormal,
-            fontWeight: FontUtils.fontWeight.bold,
             lineHeight: variables.lineHeightXLarge,
             ...wordBreak.breakWord,
         },
@@ -1992,7 +2063,7 @@ const styles = (theme: ThemeColors) =>
         chatItemMessage: {
             color: theme.text,
             fontSize: variables.fontSizeNormal,
-            fontFamily: FontUtils.fontFamily.platform.EXP_NEUE,
+            ...FontUtils.fontFamily.platform.EXP_NEUE,
             lineHeight: variables.lineHeightXLarge,
             maxWidth: '100%',
             ...whiteSpace.preWrap,
@@ -2002,7 +2073,7 @@ const styles = (theme: ThemeColors) =>
         renderHTMLTitle: {
             color: theme.text,
             fontSize: variables.fontSizeNormal,
-            fontFamily: FontUtils.fontFamily.platform.EXP_NEUE,
+            ...FontUtils.fontFamily.platform.EXP_NEUE,
             lineHeight: variables.lineHeightXLarge,
             maxWidth: '100%',
             ...whiteSpace.preWrap,
@@ -2051,7 +2122,8 @@ const styles = (theme: ThemeColors) =>
         },
 
         chatFooterFullCompose: {
-            flex: 1,
+            height: '100%',
+            paddingTop: 20,
         },
 
         chatItemDraft: {
@@ -2079,7 +2151,7 @@ const styles = (theme: ThemeColors) =>
                 backgroundColor: theme.componentBG,
                 borderColor: theme.border,
                 color: theme.text,
-                fontFamily: FontUtils.fontFamily.platform.EXP_NEUE,
+                ...FontUtils.fontFamily.platform.EXP_NEUE,
                 fontSize: variables.fontSizeNormal,
                 borderWidth: 0,
                 height: 'auto',
@@ -2145,8 +2217,7 @@ const styles = (theme: ThemeColors) =>
 
         emojiSkinToneTitle: {
             ...spacing.pv1,
-            fontFamily: FontUtils.fontFamily.platform.EXP_NEUE_BOLD,
-            fontWeight: FontUtils.fontWeight.bold,
+            ...FontUtils.fontFamily.platform.EXP_NEUE_BOLD,
             color: theme.heading,
             fontSize: variables.fontSizeSmall,
         },
@@ -2231,6 +2302,15 @@ const styles = (theme: ThemeColors) =>
             width: 200,
         },
 
+        chatItemPDFAttachmentLoading: {
+            backgroundColor: 'transparent',
+            borderColor: theme.border,
+            borderWidth: 1,
+            borderRadius: variables.componentBorderRadiusNormal,
+            ...flex.alignItemsCenter,
+            ...flex.justifyContentCenter,
+        },
+
         sidebarVisible: {
             borderRightWidth: 1,
         },
@@ -2323,11 +2403,6 @@ const styles = (theme: ThemeColors) =>
             backgroundColor: theme.appBG,
         },
 
-        avatarLarge: {
-            width: variables.avatarSizeLarge,
-            height: variables.avatarSizeLarge,
-        },
-
         avatarXLarge: {
             width: variables.avatarSizeXLarge,
             height: variables.avatarSizeXLarge,
@@ -2347,6 +2422,7 @@ const styles = (theme: ThemeColors) =>
             lineHeight: undefined,
             marginLeft: -2,
             textAlign: 'center',
+            zIndex: 10,
         },
 
         emptyAvatar: {
@@ -2552,7 +2628,6 @@ const styles = (theme: ThemeColors) =>
             ...flex.flexColumn,
             ...flex.alignItemsCenter,
             paddingHorizontal: 20,
-            paddingBottom: 20,
         },
 
         reportDetailsRoomInfo: {
@@ -2619,7 +2694,7 @@ const styles = (theme: ThemeColors) =>
         },
 
         twoFactorAuthCode: {
-            fontFamily: FontUtils.fontFamily.platform.MONOSPACE,
+            ...FontUtils.fontFamily.platform.MONOSPACE,
             width: 112,
             textAlign: 'center',
         },
@@ -2667,7 +2742,7 @@ const styles = (theme: ThemeColors) =>
             height: 20,
         },
         anonymousRoomFooterLogoTaglineText: {
-            fontFamily: FontUtils.fontFamily.platform.EXP_NEUE,
+            ...FontUtils.fontFamily.platform.EXP_NEUE,
             fontSize: variables.fontSizeMedium,
             color: theme.text,
         },
@@ -2679,6 +2754,23 @@ const styles = (theme: ThemeColors) =>
             width: 110,
         },
 
+        workspaceUpgradeIntroBox: ({isExtraSmallScreenWidth}: WorkspaceUpgradeIntroBoxParams): ViewStyle => {
+            let paddingHorizontal = spacing.ph5;
+            let paddingVertical = spacing.pv5;
+
+            if (isExtraSmallScreenWidth) {
+                paddingHorizontal = spacing.ph2;
+                paddingVertical = spacing.pv2;
+            }
+
+            return {
+                backgroundColor: theme.highlightBG,
+                borderRadius: 16,
+                ...paddingVertical,
+                ...paddingHorizontal,
+            } satisfies ViewStyle;
+        },
+
         roomHeaderAvatarSize: {
             height: variables.componentSizeLarge,
             width: variables.componentSizeLarge,
@@ -2708,9 +2800,8 @@ const styles = (theme: ThemeColors) =>
         avatarInnerTextChat: {
             color: theme.text,
             fontSize: variables.fontSizeXLarge,
-            fontFamily: FontUtils.fontFamily.platform.EXP_NEW_KANSAS_MEDIUM,
+            ...FontUtils.fontFamily.platform.EXP_NEW_KANSAS_MEDIUM,
             textAlign: 'center',
-            fontWeight: 'normal',
             position: 'absolute',
             width: 88,
             left: -16,
@@ -2736,8 +2827,6 @@ const styles = (theme: ThemeColors) =>
 
         avatarSectionWrapperSkeleton: {
             width: '100%',
-            paddingHorizontal: 20,
-            paddingBottom: 20,
         },
 
         avatarSectionWrapperSettings: {
@@ -2769,15 +2858,19 @@ const styles = (theme: ThemeColors) =>
             ...spacing.pb4,
             paddingLeft: 13,
             fontSize: 13,
-            fontFamily: FontUtils.fontFamily.platform.EXP_NEUE,
-            fontWeight: '400',
+            ...FontUtils.fontFamily.platform.EXP_NEUE,
             lineHeight: 16,
             color: theme.textSupporting,
         },
 
         accountSettingsSectionTitle: {
-            fontFamily: FontUtils.fontFamily.platform.EXP_NEUE_BOLD,
-            fontWeight: FontUtils.fontWeight.bold,
+            ...FontUtils.fontFamily.platform.EXP_NEUE_BOLD,
+        },
+
+        borderedContentCard: {
+            borderWidth: 1,
+            borderColor: theme.border,
+            borderRadius: variables.componentBorderRadiusNormal,
         },
 
         sectionMenuItem: {
@@ -2787,6 +2880,10 @@ const styles = (theme: ThemeColors) =>
             alignItems: 'center',
         },
 
+        sectionSelectCircle: {
+            backgroundColor: theme.cardBG,
+        },
+
         qrShareSection: {
             width: 264,
         },
@@ -2797,6 +2894,26 @@ const styles = (theme: ThemeColors) =>
             width: 'auto',
         },
 
+        subscriptionCardIcon: {
+            padding: 10,
+            backgroundColor: theme.border,
+            borderRadius: variables.componentBorderRadius,
+            height: variables.iconSizeExtraLarge,
+            width: variables.iconSizeExtraLarge,
+        },
+
+        subscriptionAddedCardIcon: {
+            padding: 10,
+            backgroundColor: theme.buttonDefaultBG,
+            borderRadius: variables.componentBorderRadius,
+            height: variables.iconSizeExtraLarge,
+            width: variables.iconSizeExtraLarge,
+        },
+
+        trialBannerBackgroundColor: {
+            backgroundColor: theme.trialBannerBackgroundColor,
+        },
+
         selectCircle: {
             width: variables.componentSizeSmall,
             height: variables.componentSizeSmall,
@@ -2855,16 +2972,23 @@ const styles = (theme: ThemeColors) =>
             marginRight: 20,
         },
 
+        dividerLine: {
+            height: 1,
+            backgroundColor: theme.border,
+            flexGrow: 1,
+            ...spacing.mh5,
+            ...spacing.mv3,
+        },
+
         unreadIndicatorText: {
             color: theme.unreadIndicator,
-            fontFamily: FontUtils.fontFamily.platform.EXP_NEUE_BOLD,
+            ...FontUtils.fontFamily.platform.EXP_NEUE_BOLD,
             fontSize: variables.fontSizeSmall,
-            fontWeight: FontUtils.fontWeight.bold,
             textTransform: 'capitalize',
         },
 
         threadDividerText: {
-            fontFamily: FontUtils.fontFamily.platform.EXP_NEUE,
+            ...FontUtils.fontFamily.platform.EXP_NEUE,
             fontSize: variables.fontSizeSmall,
             textTransform: 'capitalize',
         },
@@ -3206,7 +3330,7 @@ const styles = (theme: ThemeColors) =>
 
         growlNotificationText: {
             fontSize: variables.fontSizeNormal,
-            fontFamily: FontUtils.fontFamily.platform.EXP_NEUE,
+            ...FontUtils.fontFamily.platform.EXP_NEUE,
             width: '90%',
             lineHeight: variables.fontSizeNormalHeight,
             color: theme.textReversed,
@@ -3294,13 +3418,14 @@ const styles = (theme: ThemeColors) =>
         },
 
         workspaceThreeDotMenu: {
-            marginLeft: 84,
+            justifyContent: 'flex-end',
+            width: 124,
         },
 
-        workspaceListBadge: {
+        workspaceListRBR: {
             flexDirection: 'column',
             justifyContent: 'flex-start',
-            marginTop: 6,
+            marginTop: 10,
         },
 
         peopleRow: {
@@ -3373,6 +3498,7 @@ const styles = (theme: ThemeColors) =>
         shortTermsBorder: {
             borderWidth: 1,
             borderColor: theme.border,
+            borderRadius: variables.componentBorderRadius,
         },
 
         shortTermsHorizontalRule: {
@@ -3407,8 +3533,8 @@ const styles = (theme: ThemeColors) =>
             ...headlineFont,
             ...whiteSpace.preWrap,
             color: theme.heading,
-            fontSize: variables.fontSizeXXXLarge,
-            lineHeight: variables.lineHeightXXXLarge,
+            fontSize: variables.fontSizeXLarge,
+            lineHeight: variables.lineHeightXXLarge,
         },
 
         longTermsRow: {
@@ -3457,7 +3583,7 @@ const styles = (theme: ThemeColors) =>
             color: theme.text,
             fontSize: variables.fontSizeNormal,
             lineHeight: variables.fontSizeNormalHeight,
-            fontFamily: FontUtils.fontFamily.platform.EXP_NEUE,
+            ...FontUtils.fontFamily.platform.EXP_NEUE,
             flex: 1,
         },
 
@@ -3486,6 +3612,10 @@ const styles = (theme: ThemeColors) =>
             lineHeight: 16,
         },
 
+        searchTableHeaderActive: {
+            fontWeight: FontUtils.fontWeight.bold,
+        },
+
         threeDotsPopoverOffset: (windowWidth: number) =>
             ({
                 ...getPopOverVerticalOffset(60),
@@ -3504,6 +3634,12 @@ const styles = (theme: ThemeColors) =>
                 horizontal: windowWidth - 140,
             } satisfies AnchorPosition),
 
+        popoverMenuOffset: (windowWidth: number) =>
+            ({
+                ...getPopOverVerticalOffset(180),
+                horizontal: windowWidth - 355,
+            } satisfies AnchorPosition),
+
         iPhoneXSafeArea: {
             backgroundColor: theme.inverse,
             flex: 1,
@@ -3565,7 +3701,7 @@ const styles = (theme: ThemeColors) =>
         inlineSystemMessage: {
             color: theme.textSupporting,
             fontSize: variables.fontSizeLabel,
-            fontFamily: FontUtils.fontFamily.platform.EXP_NEUE,
+            ...FontUtils.fontFamily.platform.EXP_NEUE,
             marginLeft: 6,
         },
 
@@ -3610,7 +3746,7 @@ const styles = (theme: ThemeColors) =>
 
         cardSectionContainer: {
             backgroundColor: theme.cardBG,
-            borderRadius: variables.componentBorderRadiusCard,
+            borderRadius: variables.componentBorderRadiusLarge,
             width: 'auto',
             textAlign: 'left',
             overflow: 'hidden',
@@ -3658,10 +3794,10 @@ const styles = (theme: ThemeColors) =>
 
         paymentMethod: {
             paddingHorizontal: 20,
-            height: variables.optionRowHeight,
+            minHeight: variables.optionRowHeight,
         },
 
-        archivedReportFooter: {
+        chatFooterBanner: {
             borderRadius: variables.componentBorderRadius,
             ...wordBreak.breakWord,
         },
@@ -3738,7 +3874,7 @@ const styles = (theme: ThemeColors) =>
         reactionCounterText: {
             fontSize: 13,
             marginLeft: 4,
-            fontWeight: 'bold',
+            fontWeight: FontUtils.fontWeight.bold,
         },
 
         fontColorReactionLabel: {
@@ -3755,6 +3891,27 @@ const styles = (theme: ThemeColors) =>
             ...wordBreak.breakWord,
         },
 
+        reportActionComposeTooltipWrapper: {
+            backgroundColor: theme.tooltipHighlightBG,
+            paddingVertical: 8,
+            borderRadius: variables.componentBorderRadiusMedium,
+        },
+
+        quickActionTooltipWrapper: {
+            backgroundColor: theme.tooltipHighlightBG,
+        },
+
+        quickActionTooltipTitle: {
+            ...FontUtils.fontFamily.platform.EXP_NEUE_BOLD,
+            fontSize: variables.fontSizeLabel,
+            color: theme.tooltipHighlightText,
+        },
+
+        quickActionTooltipSubtitle: {
+            fontSize: variables.fontSizeLabel,
+            color: theme.textDark,
+        },
+
         quickReactionsContainer: {
             gap: 12,
             flexDirection: 'row',
@@ -3774,7 +3931,7 @@ const styles = (theme: ThemeColors) =>
 
         validateCodeDigits: {
             color: theme.text,
-            fontFamily: FontUtils.fontFamily.platform.EXP_NEUE,
+            ...FontUtils.fontFamily.platform.EXP_NEUE,
             fontSize: variables.fontSizeXXLarge,
             letterSpacing: 4,
         },
@@ -3824,9 +3981,8 @@ const styles = (theme: ThemeColors) =>
         },
 
         loginHeroHeader: {
-            fontFamily: FontUtils.fontFamily.platform.EXP_NEW_KANSAS_MEDIUM,
+            ...FontUtils.fontFamily.platform.EXP_NEW_KANSAS_MEDIUM,
             color: theme.success,
-            fontWeight: '500',
             textAlign: 'center',
         },
 
@@ -3854,28 +4010,28 @@ const styles = (theme: ThemeColors) =>
         },
 
         eReceiptMerchant: {
-            fontFamily: FontUtils.fontFamily.platform.EXP_NEUE,
+            ...FontUtils.fontFamily.platform.EXP_NEUE,
             fontSize: variables.fontSizeXLarge,
             lineHeight: variables.lineHeightXXLarge,
             color: theme.textColorfulBackground,
         },
 
         eReceiptWaypointTitle: {
-            fontFamily: FontUtils.fontFamily.platform.EXP_NEUE,
+            ...FontUtils.fontFamily.platform.EXP_NEUE,
             fontSize: variables.fontSizeSmall,
             lineHeight: variables.lineHeightSmall,
             color: colors.green400,
         },
 
         eReceiptWaypointAddress: {
-            fontFamily: FontUtils.fontFamily.platform.MONOSPACE,
+            ...FontUtils.fontFamily.platform.MONOSPACE,
             fontSize: variables.fontSizeNormal,
             lineHeight: variables.lineHeightNormal,
             color: theme.textColorfulBackground,
         },
 
         eReceiptGuaranteed: {
-            fontFamily: FontUtils.fontFamily.platform.MONOSPACE,
+            ...FontUtils.fontFamily.platform.MONOSPACE,
             fontSize: variables.fontSizeSmall,
             lineHeight: variables.lineHeightSmall,
             color: theme.textColorfulBackground,
@@ -3897,6 +4053,7 @@ const styles = (theme: ThemeColors) =>
             backgroundColor: colors.green800,
             borderRadius: 20,
             width: 335,
+            overflow: 'hidden',
         },
 
         eReceiptBackgroundThumbnail: {
@@ -3904,7 +4061,6 @@ const styles = (theme: ThemeColors) =>
             position: 'absolute',
             aspectRatio: 335 / 540,
             top: 0,
-            minWidth: 217,
         },
 
         eReceiptContainer: {
@@ -3915,7 +4071,7 @@ const styles = (theme: ThemeColors) =>
         },
 
         loginHeroBody: {
-            fontFamily: FontUtils.fontFamily.platform.EXP_NEUE,
+            ...FontUtils.fontFamily.platform.EXP_NEUE,
             fontSize: variables.fontSizeSignInHeroBody,
             color: theme.textLight,
             textAlign: 'center',
@@ -3948,6 +4104,11 @@ const styles = (theme: ThemeColors) =>
             width: 1,
         },
 
+        taskCheckboxWrapper: {
+            height: variables.fontSizeNormalHeight,
+            ...flex.justifyContentCenter,
+        },
+
         taskCheckbox: {
             height: 16,
             width: 16,
@@ -3967,7 +4128,7 @@ const styles = (theme: ThemeColors) =>
         },
 
         taskTitleDescription: {
-            fontFamily: FontUtils.fontFamily.platform.EXP_NEUE,
+            ...FontUtils.fontFamily.platform.EXP_NEUE,
             fontSize: variables.fontSizeLabel,
             color: theme.textSupporting,
             lineHeight: variables.lineHeightNormal,
@@ -3985,8 +4146,7 @@ const styles = (theme: ThemeColors) =>
         },
 
         assigneeTextStyle: {
-            fontFamily: FontUtils.fontFamily.platform.EXP_NEUE_BOLD,
-            fontWeight: FontUtils.fontWeight.bold,
+            ...FontUtils.fontFamily.platform.EXP_NEUE_BOLD,
             minHeight: variables.avatarSizeSubscript,
         },
 
@@ -4110,8 +4270,7 @@ const styles = (theme: ThemeColors) =>
         tabText: (isSelected: boolean) =>
             ({
                 marginLeft: 8,
-                fontFamily: isSelected ? FontUtils.fontFamily.platform.EXP_NEUE_BOLD : FontUtils.fontFamily.platform.EXP_NEUE,
-                fontWeight: isSelected ? FontUtils.fontWeight.bold : '400',
+                ...FontUtils.fontFamily.platform.EXP_NEUE_BOLD,
                 color: isSelected ? theme.text : theme.textSupporting,
                 lineHeight: variables.lineHeightNormal,
                 fontSize: variables.fontSizeNormal,
@@ -4329,6 +4488,15 @@ const styles = (theme: ThemeColors) =>
 
         emojiStatusLHN: {
             fontSize: 9,
+            ...(Browser.getBrowser() && !Browser.isMobile() && {transform: 'scale(.5)', fontSize: 22, overflow: 'visible'}),
+            ...(Browser.getBrowser() &&
+                Browser.isSafari() &&
+                !Browser.isMobile() && {
+                    transform: 'scale(0.7)',
+                    fontSize: 13,
+                    lineHeight: 15,
+                    overflow: 'visible',
+                }),
         },
 
         onboardingVideoPlayer: {
@@ -4356,7 +4524,17 @@ const styles = (theme: ThemeColors) =>
             bottom: -4,
             borderColor: theme.highlightBG,
             borderWidth: 2,
+            overflow: 'hidden',
+        },
+
+        profilePageAvatar: {
+            borderColor: theme.highlightBG,
         },
+
+        justSignedInModalAnimation: (is2FARequired: boolean) => ({
+            height: is2FARequired ? variables.modalTopIconHeight : variables.modalTopBigIconHeight,
+        }),
+
         moneyRequestViewImage: {
             ...spacing.mh5,
             ...spacing.mv3,
@@ -4368,6 +4546,16 @@ const styles = (theme: ThemeColors) =>
             maxWidth: 400,
         },
 
+        pdfErrorPlaceholder: {
+            overflow: 'hidden',
+            borderWidth: 2,
+            borderColor: theme.cardBG,
+            borderRadius: variables.componentBorderRadiusLarge,
+            maxWidth: 400,
+            height: '100%',
+            backgroundColor: theme.highlightBG,
+        },
+
         moneyRequestAttachReceipt: {
             backgroundColor: theme.highlightBG,
             borderColor: theme.border,
@@ -4390,6 +4578,7 @@ const styles = (theme: ThemeColors) =>
             borderWidth: variables.componentBorderWidth,
             borderColor: theme.appBG,
         },
+        currentPositionDot: {backgroundColor: colors.blue400, width: 16, height: 16, borderRadius: 16},
 
         mapViewOverlay: {
             flex: 1,
@@ -4420,7 +4609,7 @@ const styles = (theme: ThemeColors) =>
         },
 
         mapPendingView: {
-            backgroundColor: theme.highlightBG,
+            backgroundColor: theme.hoverComponentBG,
             ...flex.flex1,
             borderRadius: variables.componentBorderRadiusLarge,
         },
@@ -4466,15 +4655,17 @@ const styles = (theme: ThemeColors) =>
             borderRadius: 8,
         },
 
+        selectionListStickyHeader: {
+            backgroundColor: theme.appBG,
+        },
+
         draggableTopBar: {
             height: 30,
             width: '100%',
         },
         menuItemError: {
-            position: 'absolute',
-            bottom: -4,
-            left: 20,
-            right: 20,
+            marginTop: 4,
+            marginBottom: 0,
         },
         formHelperMessage: {
             height: 32,
@@ -4493,7 +4684,7 @@ const styles = (theme: ThemeColors) =>
             top: -36,
         },
 
-        chatBottomLoader: {
+        listBoundaryLoader: {
             position: 'absolute',
             top: 0,
             bottom: 0,
@@ -4501,6 +4692,15 @@ const styles = (theme: ThemeColors) =>
             right: 0,
             height: CONST.CHAT_HEADER_LOADER_HEIGHT,
         },
+        listBoundaryError: {
+            paddingVertical: 15,
+            paddingHorizontal: 20,
+        },
+        listBoundaryErrorText: {
+            color: theme.textSupporting,
+            fontSize: variables.fontSizeLabel,
+            marginBottom: 10,
+        },
 
         videoContainer: {
             ...flex.flex1,
@@ -4531,6 +4731,15 @@ const styles = (theme: ThemeColors) =>
             paddingVertical: 4,
         },
 
+        headerStatusBarContainer: {
+            minHeight: variables.componentSizeSmall,
+        },
+
+        walletIllustration: {
+            width: 262,
+            height: 152,
+        },
+
         walletCardLimit: {
             color: theme.text,
             fontSize: variables.fontSizeNormal,
@@ -4549,8 +4758,7 @@ const styles = (theme: ThemeColors) =>
         },
 
         walletCardMenuItem: {
-            fontFamily: FontUtils.fontFamily.platform.EXP_NEUE_BOLD,
-            fontWeight: FontUtils.fontWeight.bold,
+            ...FontUtils.fontFamily.platform.EXP_NEUE_BOLD,
             color: theme.text,
             fontSize: variables.fontSizeNormal,
             lineHeight: variables.lineHeightXLarge,
@@ -4566,13 +4774,6 @@ const styles = (theme: ThemeColors) =>
             lineHeight: variables.lineHeightLarge,
         },
 
-        walletBalance: {
-            lineHeight: undefined,
-            fontSize: 45,
-            paddingTop: 0,
-            paddingBottom: 0,
-        },
-
         walletRedDotSectionTitle: {
             color: theme.text,
             fontWeight: FontUtils.fontWeight.bold,
@@ -4663,8 +4864,7 @@ const styles = (theme: ThemeColors) =>
 
         interactiveStepHeaderStepText: {
             fontSize: variables.fontSizeLabel,
-            fontFamily: FontUtils.fontFamily.platform.EXP_NEUE,
-            fontWeight: FontUtils.fontWeight.bold,
+            ...FontUtils.fontFamily.platform.EXP_NEUE_BOLD,
         },
 
         interactiveStepHeaderCompletedStepButton: {
@@ -4691,7 +4891,7 @@ const styles = (theme: ThemeColors) =>
         },
         confirmBankInfoText: {
             fontSize: variables.fontSizeNormal,
-            fontFamily: FontUtils.fontFamily.platform.EXP_NEUE,
+            ...FontUtils.fontFamily.platform.EXP_NEUE,
             color: theme.text,
         },
         confirmBankInfoCompanyIcon: {
@@ -4708,7 +4908,7 @@ const styles = (theme: ThemeColors) =>
             borderRadius: 50,
         },
         confirmBankInfoNumber: {
-            fontFamily: FontUtils.fontFamily.platform.MONOSPACE,
+            ...FontUtils.fontFamily.platform.MONOSPACE,
             fontSize: variables.fontSizeNormal,
             lineHeight: variables.lineHeightXLarge,
             color: theme.text,
@@ -4769,7 +4969,7 @@ const styles = (theme: ThemeColors) =>
         videoPlayerText: {
             textAlign: 'center',
             fontSize: variables.fontSizeLabel,
-            fontWeight: '700',
+            fontWeight: FontUtils.fontWeight.bold,
             lineHeight: 16,
             color: theme.white,
             userSelect: 'none',
@@ -4875,11 +5075,114 @@ const styles = (theme: ThemeColors) =>
         workspaceTitleStyle: {
             ...headlineFont,
             fontSize: variables.fontSizeXLarge,
+            flex: 1,
+        },
+
+        expensifyCardIllustrationContainer: {
+            width: 680,
+            height: 220,
+        },
+
+        computerIllustrationContainer: {
+            width: 272,
+            height: 188,
+        },
+
+        cardIcon: {
+            overflow: 'hidden',
+            borderRadius: variables.cardBorderRadius,
+            height: variables.cardIconHeight,
+            alignSelf: 'center',
+        },
+
+        tripReservationIconContainer: {
+            width: variables.avatarSizeNormal,
+            height: variables.avatarSizeNormal,
+            backgroundColor: theme.border,
+            borderRadius: variables.componentBorderRadiusXLarge,
+            alignItems: 'center',
+            justifyContent: 'center',
         },
 
         textLineThrough: {
             textDecorationLine: 'line-through',
         },
+
+        tripIllustrationSize: {
+            width: 190,
+            height: 172,
+        },
+
+        reportListItemTitle: {
+            color: theme.text,
+            fontSize: variables.fontSizeNormal,
+        },
+
+        skeletonBackground: {
+            flex: 1,
+            position: 'absolute',
+            top: 0,
+            left: 0,
+            width: '100%',
+            height: '100%',
+        },
+
+        emptyStateScrollView: {
+            height: '100%',
+            flex: 1,
+        },
+
+        emptyStateForeground: {
+            margin: 32,
+            justifyContent: 'center',
+            alignItems: 'center',
+            flex: 1,
+        },
+
+        emptyStateContent: {
+            backgroundColor: theme.cardBG,
+            borderRadius: variables.componentBorderRadiusLarge,
+            maxWidth: 400,
+            width: '100%',
+        },
+
+        emptyStateHeader: (isIllustration: boolean) => ({
+            borderTopLeftRadius: variables.componentBorderRadiusLarge,
+            borderTopRightRadius: variables.componentBorderRadiusLarge,
+            minHeight: 200,
+            alignItems: isIllustration ? 'center' : undefined,
+            justifyContent: isIllustration ? 'center' : undefined,
+        }),
+
+        emptyFolderBG: {
+            backgroundColor: theme.emptyFolderBG,
+        },
+
+        emptyStateVideo: {
+            borderTopLeftRadius: variables.componentBorderRadiusLarge,
+            borderTopRightRadius: variables.componentBorderRadiusLarge,
+        },
+
+        emptyStateFolderIconSize: {
+            width: 184,
+            height: 112,
+        },
+
+        workflowApprovalVerticalLine: {
+            height: 16,
+            width: 1,
+            marginLeft: 19,
+            backgroundColor: theme.border,
+        },
+
+        accountSwitcherPopover: {
+            width: variables.sideBarWidth - 19,
+        },
+
+        accountSwitcherAnchorPosition: {
+            top: 80,
+            left: 12,
+        },
     } satisfies Styles);
 
 type ThemeStyles = ReturnType<typeof styles>;
diff --git a/src/styles/stylePropTypes.js b/src/styles/stylePropTypes.js
deleted file mode 100644
index b82db94140ee..000000000000
--- a/src/styles/stylePropTypes.js
+++ /dev/null
@@ -1,5 +0,0 @@
-import PropTypes from 'prop-types';
-
-const stylePropTypes = PropTypes.oneOfType([PropTypes.object, PropTypes.bool, PropTypes.arrayOf(PropTypes.object), PropTypes.func]);
-
-export default stylePropTypes;
diff --git a/src/styles/theme/illustrations/themes/dark.ts b/src/styles/theme/illustrations/themes/dark.ts
index a46900510652..64d121448863 100644
--- a/src/styles/theme/illustrations/themes/dark.ts
+++ b/src/styles/theme/illustrations/themes/dark.ts
@@ -1,3 +1,4 @@
+import ExpensifyApprovedLogo from '@assets/images/subscription-details__approvedlogo.svg';
 import EmptyStateBackgroundImage from '@assets/images/themeDependent/empty-state_background-fade-dark.png';
 import ExampleCheckEN from '@assets/images/themeDependent/example-check-image-dark-en.png';
 import ExampleCheckES from '@assets/images/themeDependent/example-check-image-dark-es.png';
@@ -9,6 +10,7 @@ const illustrations = {
     ExampleCheckEN,
     ExampleCheckES,
     WorkspaceProfile,
+    ExpensifyApprovedLogo,
 } satisfies IllustrationsType;
 
 export default illustrations;
diff --git a/src/styles/theme/illustrations/themes/light.ts b/src/styles/theme/illustrations/themes/light.ts
index 3406e219e656..a4e5b45ef99c 100644
--- a/src/styles/theme/illustrations/themes/light.ts
+++ b/src/styles/theme/illustrations/themes/light.ts
@@ -1,3 +1,4 @@
+import ExpensifyApprovedLogo from '@assets/images/subscription-details__approvedlogo--light.svg';
 import EmptyStateBackgroundImage from '@assets/images/themeDependent/empty-state_background-fade-light.png';
 import ExampleCheckEN from '@assets/images/themeDependent/example-check-image-light-en.png';
 import ExampleCheckES from '@assets/images/themeDependent/example-check-image-light-es.png';
@@ -9,6 +10,7 @@ const illustrations = {
     ExampleCheckEN,
     ExampleCheckES,
     WorkspaceProfile,
+    ExpensifyApprovedLogo,
 } satisfies IllustrationsType;
 
 export default illustrations;
diff --git a/src/styles/theme/illustrations/types.ts b/src/styles/theme/illustrations/types.ts
index 86f2aa813118..04faeb43e9ed 100644
--- a/src/styles/theme/illustrations/types.ts
+++ b/src/styles/theme/illustrations/types.ts
@@ -1,10 +1,13 @@
+import type {FC} from 'react';
 import type {ImageSourcePropType} from 'react-native';
+import type {SvgProps} from 'react-native-svg';
 
 type IllustrationsType = {
     EmptyStateBackgroundImage: ImageSourcePropType;
     ExampleCheckES: ImageSourcePropType;
     ExampleCheckEN: ImageSourcePropType;
     WorkspaceProfile: ImageSourcePropType;
+    ExpensifyApprovedLogo: FC<SvgProps>;
 };
 
 export default IllustrationsType;
diff --git a/src/styles/theme/themes/dark.ts b/src/styles/theme/themes/dark.ts
index a68ff1c04d93..eedcca6199e4 100644
--- a/src/styles/theme/themes/dark.ts
+++ b/src/styles/theme/themes/dark.ts
@@ -1,4 +1,3 @@
-import getSplashBackgroundColor from '@libs/getSplashBackgroundColor';
 import colors from '@styles/theme/colors';
 import type {ThemeColors} from '@styles/theme/types';
 import CONST from '@src/CONST';
@@ -7,7 +6,7 @@ import SCREENS from '@src/SCREENS';
 const darkTheme = {
     // Figma keys
     appBG: colors.productDark100,
-    splashBG: getSplashBackgroundColor(),
+    splashBG: colors.green400,
     highlightBG: colors.productDark200,
     border: colors.productDark400,
     borderLighter: colors.productDark400,
@@ -81,8 +80,11 @@ const darkTheme = {
     mentionBG: colors.blue600,
     ourMentionText: colors.green100,
     ourMentionBG: colors.green600,
+    tooltipHighlightBG: colors.green100,
+    tooltipHighlightText: colors.green500,
     tooltipSupportingText: colors.productLight800,
     tooltipPrimaryText: colors.productLight900,
+    trialBannerBackgroundColor: colors.green700,
     skeletonLHNIn: colors.productDark400,
     skeletonLHNOut: colors.productDark600,
     QRLogo: colors.green400,
@@ -91,6 +93,8 @@ const darkTheme = {
     white: colors.white,
     videoPlayerBG: `${colors.productDark100}cc`,
     transparentWhite: `${colors.white}51`,
+    emptyFolderBG: colors.yellow600,
+    travelBG: colors.blue600,
 
     // Adding a color here will animate the status bar to the right color when the screen is opened.
     // Note that it needs to be a screen name, not a route url.
@@ -129,12 +133,12 @@ const darkTheme = {
             backgroundColor: colors.productDark100,
             statusBarStyle: CONST.STATUS_BAR_STYLE.LIGHT_CONTENT,
         },
-        [SCREENS.WORKSPACE_SWITCHER.ROOT]: {
+        [SCREENS.LEFT_MODAL.WORKSPACE_SWITCHER]: {
             backgroundColor: colors.productDark100,
             statusBarStyle: CONST.STATUS_BAR_STYLE.LIGHT_CONTENT,
         },
         [SCREENS.SETTINGS.TROUBLESHOOT]: {
-            backgroundColor: colors.blue700,
+            backgroundColor: colors.productDark100,
             statusBarStyle: CONST.STATUS_BAR_STYLE.LIGHT_CONTENT,
         },
         [SCREENS.REFERRAL_DETAILS]: {
diff --git a/src/styles/theme/themes/light.ts b/src/styles/theme/themes/light.ts
index 17e1c03bcdda..f578e6f48641 100644
--- a/src/styles/theme/themes/light.ts
+++ b/src/styles/theme/themes/light.ts
@@ -1,4 +1,3 @@
-import getSplashBackgroundColor from '@libs/getSplashBackgroundColor';
 import colors from '@styles/theme/colors';
 import type {ThemeColors} from '@styles/theme/types';
 import CONST from '@src/CONST';
@@ -7,7 +6,7 @@ import SCREENS from '@src/SCREENS';
 const lightTheme = {
     // Figma keys
     appBG: colors.productLight100,
-    splashBG: getSplashBackgroundColor(),
+    splashBG: colors.green400,
     highlightBG: colors.productLight200,
     border: colors.productLight400,
     borderLighter: colors.productLight400,
@@ -81,8 +80,11 @@ const lightTheme = {
     mentionBG: colors.blue100,
     ourMentionText: colors.green600,
     ourMentionBG: colors.green100,
+    tooltipHighlightBG: colors.green100,
+    tooltipHighlightText: colors.green500,
     tooltipSupportingText: colors.productDark800,
     tooltipPrimaryText: colors.productDark900,
+    trialBannerBackgroundColor: colors.green100,
     skeletonLHNIn: colors.productLight400,
     skeletonLHNOut: colors.productLight600,
     QRLogo: colors.green400,
@@ -91,6 +93,8 @@ const lightTheme = {
     white: colors.white,
     videoPlayerBG: `${colors.productDark100}cc`,
     transparentWhite: `${colors.white}51`,
+    emptyFolderBG: colors.yellow600,
+    travelBG: colors.blue600,
 
     // Adding a color here will animate the status bar to the right color when the screen is opened.
     // Note that it needs to be a screen name, not a route url.
@@ -129,13 +133,13 @@ const lightTheme = {
             backgroundColor: colors.productLight100,
             statusBarStyle: CONST.STATUS_BAR_STYLE.DARK_CONTENT,
         },
-        [SCREENS.WORKSPACE_SWITCHER.ROOT]: {
+        [SCREENS.LEFT_MODAL.WORKSPACE_SWITCHER]: {
             backgroundColor: colors.productLight100,
             statusBarStyle: CONST.STATUS_BAR_STYLE.DARK_CONTENT,
         },
         [SCREENS.SETTINGS.TROUBLESHOOT]: {
-            backgroundColor: colors.blue700,
-            statusBarStyle: CONST.STATUS_BAR_STYLE.LIGHT_CONTENT,
+            backgroundColor: colors.productLight100,
+            statusBarStyle: CONST.STATUS_BAR_STYLE.DARK_CONTENT,
         },
         [SCREENS.REFERRAL_DETAILS]: {
             backgroundColor: colors.pink800,
diff --git a/src/styles/theme/types.ts b/src/styles/theme/types.ts
index 8be9f3226fe5..bafeae6a3fee 100644
--- a/src/styles/theme/types.ts
+++ b/src/styles/theme/types.ts
@@ -1,9 +1,10 @@
+import type {ValueOf} from 'type-fest';
 import type CONST from '@src/CONST';
 import type {ColorScheme, StatusBarStyle} from '..';
 
 type Color = string;
 
-type ThemePreference = (typeof CONST.THEME)[keyof typeof CONST.THEME];
+type ThemePreference = ValueOf<typeof CONST.THEME>;
 type ThemePreferenceWithoutSystem = Exclude<ThemePreference, typeof CONST.THEME.SYSTEM>;
 
 type ThemeColors = {
@@ -83,8 +84,11 @@ type ThemeColors = {
     mentionBG: Color;
     ourMentionText: Color;
     ourMentionBG: Color;
+    tooltipHighlightBG: Color;
+    tooltipHighlightText: Color;
     tooltipSupportingText: Color;
     tooltipPrimaryText: Color;
+    trialBannerBackgroundColor: Color;
     skeletonLHNIn: Color;
     skeletonLHNOut: Color;
     QRLogo: Color;
@@ -93,6 +97,8 @@ type ThemeColors = {
     white: Color;
     videoPlayerBG: Color;
     transparentWhite: Color;
+    emptyFolderBG: Color;
+    travelBG: Color;
 
     PAGE_THEMES: Record<string, {backgroundColor: Color; statusBarStyle: StatusBarStyle}>;
 
diff --git a/src/styles/utils/FontUtils/fontFamily/bold/index.android.ts b/src/styles/utils/FontUtils/fontFamily/bold/index.android.ts
deleted file mode 100644
index 89f116f18c20..000000000000
--- a/src/styles/utils/FontUtils/fontFamily/bold/index.android.ts
+++ /dev/null
@@ -1,6 +0,0 @@
-import type FontFamilyBoldStyles from './types';
-
-const singleBold: FontFamilyBoldStyles = 'ExpensifyNeue-Bold';
-const multiBold: FontFamilyBoldStyles = 'ExpensifyNeue-Bold';
-
-export {singleBold, multiBold};
diff --git a/src/styles/utils/FontUtils/fontFamily/bold/index.ios.ts b/src/styles/utils/FontUtils/fontFamily/bold/index.ios.ts
deleted file mode 100644
index a5dfea7ecd2e..000000000000
--- a/src/styles/utils/FontUtils/fontFamily/bold/index.ios.ts
+++ /dev/null
@@ -1,6 +0,0 @@
-import type FontFamilyBoldStyles from './types';
-
-const singleBold: FontFamilyBoldStyles = 'ExpensifyNeue-Regular';
-const multiBold: FontFamilyBoldStyles = 'ExpensifyNeue-Regular';
-
-export {singleBold, multiBold};
diff --git a/src/styles/utils/FontUtils/fontFamily/bold/index.ts b/src/styles/utils/FontUtils/fontFamily/bold/index.ts
deleted file mode 100644
index d07951acd0f5..000000000000
--- a/src/styles/utils/FontUtils/fontFamily/bold/index.ts
+++ /dev/null
@@ -1,6 +0,0 @@
-import type FontFamilyBoldStyles from './types';
-
-const singleBold: FontFamilyBoldStyles = 'ExpensifyNeue-Regular';
-const multiBold: FontFamilyBoldStyles = 'ExpensifyNeue-Regular, Segoe UI Emoji, Noto Color Emoji';
-
-export {singleBold, multiBold};
diff --git a/src/styles/utils/FontUtils/fontFamily/bold/types.ts b/src/styles/utils/FontUtils/fontFamily/bold/types.ts
deleted file mode 100644
index b393618102a5..000000000000
--- a/src/styles/utils/FontUtils/fontFamily/bold/types.ts
+++ /dev/null
@@ -1,5 +0,0 @@
-import type {TextStyle} from 'react-native';
-
-type FontFamilyBoldStyles = NonNullable<TextStyle['fontFamily']>;
-
-export default FontFamilyBoldStyles;
diff --git a/src/styles/utils/FontUtils/fontFamily/multiFontFamily.ts b/src/styles/utils/FontUtils/fontFamily/multiFontFamily.ts
deleted file mode 100644
index 902b94021b32..000000000000
--- a/src/styles/utils/FontUtils/fontFamily/multiFontFamily.ts
+++ /dev/null
@@ -1,27 +0,0 @@
-import getOperatingSystem from '@libs/getOperatingSystem';
-import CONST from '@src/CONST';
-import {multiBold} from './bold';
-import type FontFamilyStyles from './types';
-
-// In windows and ubuntu, we need some extra system fonts for emojis to work properly
-// otherwise few of them will appear as black and white
-const fontFamily: FontFamilyStyles = {
-    EXP_NEUE_ITALIC: 'ExpensifyNeue-Italic, Segoe UI Emoji, Noto Color Emoji',
-    EXP_NEUE_BOLD: multiBold,
-    EXP_NEUE: 'ExpensifyNeue-Regular, Segoe UI Emoji, Noto Color Emoji',
-    EXP_NEW_KANSAS_MEDIUM: 'ExpensifyNewKansas-Medium, Segoe UI Emoji, Noto Color Emoji',
-    EXP_NEW_KANSAS_MEDIUM_ITALIC: 'ExpensifyNewKansas-MediumItalic, Segoe UI Emoji, Noto Color Emoji',
-    SYSTEM: 'System',
-    MONOSPACE: 'ExpensifyMono-Regular, Segoe UI Emoji, Noto Color Emoji',
-    MONOSPACE_ITALIC: 'ExpensifyMono-Regular, Segoe UI Emoji, Noto Color Emoji',
-    MONOSPACE_BOLD: 'ExpensifyMono-Bold, Segoe UI Emoji, Noto Color Emoji',
-    MONOSPACE_BOLD_ITALIC: 'ExpensifyMono-Bold, Segoe UI Emoji, Noto Color Emoji',
-};
-
-if (getOperatingSystem() === CONST.OS.WINDOWS) {
-    Object.keys(fontFamily).forEach((key) => {
-        fontFamily[key as keyof FontFamilyStyles] = fontFamily[key as keyof FontFamilyStyles].replace('Segoe UI Emoji', 'Windows Segoe UI Emoji');
-    });
-}
-
-export default fontFamily;
diff --git a/src/styles/utils/FontUtils/fontFamily/multiFontFamily/index.native.ts b/src/styles/utils/FontUtils/fontFamily/multiFontFamily/index.native.ts
new file mode 100644
index 000000000000..c0350b7c3167
--- /dev/null
+++ b/src/styles/utils/FontUtils/fontFamily/multiFontFamily/index.native.ts
@@ -0,0 +1,5 @@
+// Since we don't use multiple font families on native platforms, we just fallback to single.
+// eslint-disable-next-line no-restricted-imports
+import fontFamily from '@styles/utils/FontUtils/fontFamily/singleFontFamily';
+
+export default fontFamily;
diff --git a/src/styles/utils/FontUtils/fontFamily/multiFontFamily/index.ts b/src/styles/utils/FontUtils/fontFamily/multiFontFamily/index.ts
new file mode 100644
index 000000000000..7104f905e72f
--- /dev/null
+++ b/src/styles/utils/FontUtils/fontFamily/multiFontFamily/index.ts
@@ -0,0 +1,67 @@
+import getOperatingSystem from '@libs/getOperatingSystem';
+// eslint-disable-next-line no-restricted-imports
+import type FontFamilyStyles from '@styles/utils/FontUtils/fontFamily/types';
+// eslint-disable-next-line no-restricted-imports
+import fontWeight from '@styles/utils/FontUtils/fontWeight';
+import CONST from '@src/CONST';
+
+// In windows and ubuntu, we need some extra system fonts for emojis to work properly
+// otherwise few of them will appear as black and white
+const fontFamily: FontFamilyStyles = {
+    SYSTEM: {
+        fontFamily: 'System',
+        fontStyle: 'normal',
+        fontWeight: fontWeight.normal,
+    },
+
+    MONOSPACE: {
+        fontFamily: 'Expensify Mono, Segoe UI Emoji, Noto Color Emoji',
+        fontStyle: 'normal',
+        fontWeight: fontWeight.normal,
+    },
+    MONOSPACE_BOLD: {
+        fontFamily: 'Expensify Mono, Segoe UI Emoji, Noto Color Emoji',
+        fontStyle: 'normal',
+        fontWeight: fontWeight.bold,
+    },
+
+    EXP_NEUE: {
+        fontFamily: 'Expensify Neue, Segoe UI Emoji, Noto Color Emoji',
+        fontStyle: 'normal',
+        fontWeight: fontWeight.normal,
+    },
+    EXP_NEUE_BOLD: {
+        fontFamily: 'Expensify Neue, Segoe UI Emoji, Noto Color Emoji',
+        fontStyle: 'normal',
+        fontWeight: fontWeight.bold,
+    },
+    EXP_NEUE_ITALIC: {
+        fontFamily: 'Expensify Neue, Segoe UI Emoji, Noto Color Emoji',
+        fontStyle: 'italic',
+        fontWeight: fontWeight.normal,
+    },
+    EXP_NEUE_BOLD_ITALIC: {
+        fontFamily: 'Expensify Neue, Segoe UI Emoji, Noto Color Emoji',
+        fontStyle: 'italic',
+        fontWeight: fontWeight.bold,
+    },
+
+    EXP_NEW_KANSAS_MEDIUM: {
+        fontFamily: 'Expensify New Kansas, Segoe UI Emoji, Noto Color Emoji',
+        fontStyle: 'normal',
+        fontWeight: fontWeight.medium,
+    },
+    EXP_NEW_KANSAS_MEDIUM_ITALIC: {
+        fontFamily: 'Expensify New Kansas, Segoe UI Emoji, Noto Color Emoji',
+        fontStyle: 'italic',
+        fontWeight: fontWeight.medium,
+    },
+};
+
+if (getOperatingSystem() === CONST.OS.WINDOWS) {
+    Object.keys(fontFamily).forEach((key) => {
+        fontFamily[key as keyof FontFamilyStyles].fontFamily = fontFamily[key as keyof FontFamilyStyles].fontFamily.replace('Segoe UI Emoji', 'Windows Segoe UI Emoji');
+    });
+}
+
+export default fontFamily;
diff --git a/src/styles/utils/FontUtils/fontFamily/singleFontFamily.ts b/src/styles/utils/FontUtils/fontFamily/singleFontFamily.ts
deleted file mode 100644
index 71294c55ffaa..000000000000
--- a/src/styles/utils/FontUtils/fontFamily/singleFontFamily.ts
+++ /dev/null
@@ -1,17 +0,0 @@
-import {singleBold} from './bold';
-import type FontFamilyStyles from './types';
-
-const fontFamily: FontFamilyStyles = {
-    EXP_NEUE_ITALIC: 'ExpensifyNeue-Italic',
-    EXP_NEUE_BOLD: singleBold,
-    EXP_NEUE: 'ExpensifyNeue-Regular',
-    EXP_NEW_KANSAS_MEDIUM: 'ExpensifyNewKansas-Medium',
-    EXP_NEW_KANSAS_MEDIUM_ITALIC: 'ExpensifyNewKansas-MediumItalic',
-    SYSTEM: 'System',
-    MONOSPACE: 'ExpensifyMono-Regular',
-    MONOSPACE_ITALIC: 'ExpensifyMono-Regular',
-    MONOSPACE_BOLD: 'ExpensifyMono-Bold',
-    MONOSPACE_BOLD_ITALIC: 'ExpensifyMono-Bold',
-};
-
-export default fontFamily;
diff --git a/src/styles/utils/FontUtils/fontFamily/singleFontFamily/index.ts b/src/styles/utils/FontUtils/fontFamily/singleFontFamily/index.ts
new file mode 100644
index 000000000000..6415835264ac
--- /dev/null
+++ b/src/styles/utils/FontUtils/fontFamily/singleFontFamily/index.ts
@@ -0,0 +1,57 @@
+// eslint-disable-next-line no-restricted-imports
+import type FontFamilyStyles from '@styles/utils/FontUtils/fontFamily/types';
+// eslint-disable-next-line no-restricted-imports
+import fontWeight from '@styles/utils/FontUtils/fontWeight';
+
+const fontFamily: FontFamilyStyles = {
+    SYSTEM: {
+        fontFamily: 'System',
+        fontStyle: 'normal',
+        fontWeight: fontWeight.normal,
+    },
+
+    MONOSPACE: {
+        fontFamily: 'Expensify Mono',
+        fontStyle: 'normal',
+        fontWeight: fontWeight.normal,
+    },
+    MONOSPACE_BOLD: {
+        fontFamily: 'Expensify Mono',
+        fontStyle: 'normal',
+        fontWeight: fontWeight.bold,
+    },
+
+    EXP_NEUE: {
+        fontFamily: 'Expensify Neue',
+        fontStyle: 'normal',
+        fontWeight: fontWeight.normal,
+    },
+    EXP_NEUE_BOLD: {
+        fontFamily: 'Expensify Neue',
+        fontStyle: 'normal',
+        fontWeight: fontWeight.bold,
+    },
+    EXP_NEUE_ITALIC: {
+        fontFamily: 'Expensify Neue',
+        fontStyle: 'italic',
+        fontWeight: fontWeight.normal,
+    },
+    EXP_NEUE_BOLD_ITALIC: {
+        fontFamily: 'Expensify Neue',
+        fontStyle: 'italic',
+        fontWeight: fontWeight.bold,
+    },
+
+    EXP_NEW_KANSAS_MEDIUM: {
+        fontFamily: 'Expensify New Kansas',
+        fontStyle: 'normal',
+        fontWeight: fontWeight.medium,
+    },
+    EXP_NEW_KANSAS_MEDIUM_ITALIC: {
+        fontFamily: 'Expensify New Kansas',
+        fontStyle: 'italic',
+        fontWeight: fontWeight.medium,
+    },
+};
+
+export default fontFamily;
diff --git a/src/styles/utils/FontUtils/fontFamily/types.ts b/src/styles/utils/FontUtils/fontFamily/types.ts
index 724f92d4edc7..75275c28ea9e 100644
--- a/src/styles/utils/FontUtils/fontFamily/types.ts
+++ b/src/styles/utils/FontUtils/fontFamily/types.ts
@@ -1,17 +1,22 @@
 import type {TextStyle} from 'react-native';
 
-type FontFamilyKeys =
-    | 'EXP_NEUE_ITALIC'
-    | 'EXP_NEUE_BOLD'
-    | 'EXP_NEUE'
-    | 'EXP_NEW_KANSAS_MEDIUM'
-    | 'EXP_NEW_KANSAS_MEDIUM_ITALIC'
+type FontFamilyKey =
     | 'SYSTEM'
     | 'MONOSPACE'
-    | 'MONOSPACE_ITALIC'
     | 'MONOSPACE_BOLD'
-    | 'MONOSPACE_BOLD_ITALIC';
+    | 'EXP_NEUE'
+    | 'EXP_NEUE_BOLD'
+    | 'EXP_NEUE_ITALIC'
+    | 'EXP_NEUE_BOLD_ITALIC'
+    | 'EXP_NEW_KANSAS_MEDIUM'
+    | 'EXP_NEW_KANSAS_MEDIUM_ITALIC';
+
+type FontFamily = {
+    fontFamily: string;
+    fontStyle: TextStyle['fontStyle'];
+    fontWeight: TextStyle['fontWeight'];
+};
 
-type FontFamilyStyles = Record<FontFamilyKeys, NonNullable<TextStyle['fontFamily']>>;
+type FontFamilyStyles = Record<FontFamilyKey, FontFamily>;
 
 export default FontFamilyStyles;
diff --git a/src/styles/utils/FontUtils/fontWeight/bold/index.android.ts b/src/styles/utils/FontUtils/fontWeight/bold/index.android.ts
deleted file mode 100644
index f4364eeb1e80..000000000000
--- a/src/styles/utils/FontUtils/fontWeight/bold/index.android.ts
+++ /dev/null
@@ -1,7 +0,0 @@
-import type FontWeightBoldStyles from './types';
-
-// Android has ExpensifyNeue-Bold, but fontWeight: '700' will result in
-// an incorrect font displaying on Android
-const bold: FontWeightBoldStyles = '600';
-
-export default bold;
diff --git a/src/styles/utils/FontUtils/fontWeight/bold/index.ts b/src/styles/utils/FontUtils/fontWeight/bold/index.ts
deleted file mode 100644
index ecb6cb5ce2b1..000000000000
--- a/src/styles/utils/FontUtils/fontWeight/bold/index.ts
+++ /dev/null
@@ -1,6 +0,0 @@
-import type 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/utils/FontUtils/fontWeight/bold/types.ts b/src/styles/utils/FontUtils/fontWeight/bold/types.ts
deleted file mode 100644
index 624deb999a43..000000000000
--- a/src/styles/utils/FontUtils/fontWeight/bold/types.ts
+++ /dev/null
@@ -1,5 +0,0 @@
-import type {TextStyle} from 'react-native';
-
-type FontWeightBoldStyles = NonNullable<TextStyle['fontWeight']>;
-
-export default FontWeightBoldStyles;
diff --git a/src/styles/utils/FontUtils/fontWeight/index.ts b/src/styles/utils/FontUtils/fontWeight/index.ts
new file mode 100644
index 000000000000..c5b98deb84e0
--- /dev/null
+++ b/src/styles/utils/FontUtils/fontWeight/index.ts
@@ -0,0 +1,11 @@
+import type {TextStyle} from 'react-native';
+
+type FontWeightStyles = Record<'normal' | 'medium' | 'bold', NonNullable<TextStyle['fontWeight']>>;
+
+const fontWeight: FontWeightStyles = {
+    normal: '400',
+    medium: '500',
+    bold: '700',
+};
+
+export default fontWeight;
diff --git a/src/styles/utils/FontUtils/index.ts b/src/styles/utils/FontUtils/index.ts
index c460a20d855d..8b18a7dc18ab 100644
--- a/src/styles/utils/FontUtils/index.ts
+++ b/src/styles/utils/FontUtils/index.ts
@@ -1,18 +1,26 @@
 import fontFamily from './fontFamily';
 import multiFontFamily from './fontFamily/multiFontFamily';
 import singleFontFamily from './fontFamily/singleFontFamily';
-import fontWeightBold from './fontWeight/bold';
+import fontWeight from './fontWeight';
 
 const FontUtils = {
     fontFamily: {
+        /**
+         * Set of font families that can either have fallback fonts (if web / desktop) or not (if native).
+         */
         platform: fontFamily,
+
+        /**
+         * Set of font families that don't include any fallback fonts, normally used on native platforms.
+         */
         single: singleFontFamily,
+
+        /**
+         * Set of font families that include fallback fonts, normally used on web / desktop platforms.
+         */
         multi: multiFontFamily,
     },
-    fontWeight: {
-        bold: fontWeightBold,
-        normal: '400',
-    },
+    fontWeight,
 } as const;
 
 type FontUtilsType = typeof FontUtils;
diff --git a/src/styles/utils/chatContentScrollViewPlatformStyles/index.native.ts b/src/styles/utils/chatContentScrollViewPlatformStyles/index.native.ts
new file mode 100644
index 000000000000..ee3f566ddc27
--- /dev/null
+++ b/src/styles/utils/chatContentScrollViewPlatformStyles/index.native.ts
@@ -0,0 +1,5 @@
+import type ChatContentScrollViewPlatformStyles from './types';
+
+const chatContentScrollViewPlatformStyles: ChatContentScrollViewPlatformStyles = {};
+
+export default chatContentScrollViewPlatformStyles;
diff --git a/src/styles/utils/chatContentScrollViewPlatformStyles/index.ts b/src/styles/utils/chatContentScrollViewPlatformStyles/index.ts
new file mode 100644
index 000000000000..cef1d5e70e6e
--- /dev/null
+++ b/src/styles/utils/chatContentScrollViewPlatformStyles/index.ts
@@ -0,0 +1,7 @@
+import type ChatContentScrollViewPlatformStyles from './types';
+
+const chatContentScrollViewPlatformStyles: ChatContentScrollViewPlatformStyles = {
+    overflow: 'hidden',
+};
+
+export default chatContentScrollViewPlatformStyles;
diff --git a/src/styles/utils/chatContentScrollViewPlatformStyles/types.ts b/src/styles/utils/chatContentScrollViewPlatformStyles/types.ts
new file mode 100644
index 000000000000..3fff2ba6a14d
--- /dev/null
+++ b/src/styles/utils/chatContentScrollViewPlatformStyles/types.ts
@@ -0,0 +1,5 @@
+import type {ViewStyle} from 'react-native';
+
+type ChatContentScrollViewPlatformStyles = ViewStyle;
+
+export default ChatContentScrollViewPlatformStyles;
diff --git a/src/styles/utils/cursor/index.ts b/src/styles/utils/cursor/index.ts
index 958e45749ebb..514571522faa 100644
--- a/src/styles/utils/cursor/index.ts
+++ b/src/styles/utils/cursor/index.ts
@@ -1,38 +1,43 @@
+import type {ViewStyle} from 'react-native';
 import type CursorStyles from './types';
 
+/**
+ * Web-only style.
+ * NOTE: We are asserting "cursor" to valid react-native types, because it isn't possible to augment "cursor".
+ */
 const cursor: CursorStyles = {
     cursorDefault: {
-        cursor: 'default',
+        cursor: 'default' as ViewStyle['cursor'],
     },
     cursorDisabled: {
-        cursor: 'not-allowed',
+        cursor: 'not-allowed' as ViewStyle['cursor'],
     },
     cursorPointer: {
         cursor: 'pointer',
     },
     cursorMove: {
-        cursor: 'move',
+        cursor: 'move' as ViewStyle['cursor'],
     },
     cursorUnset: {
-        cursor: 'unset',
+        cursor: 'unset' as ViewStyle['cursor'],
     },
     cursorAuto: {
         cursor: 'auto',
     },
     cursorZoomIn: {
-        cursor: 'zoom-in',
+        cursor: 'zoom-in' as ViewStyle['cursor'],
     },
     cursorGrabbing: {
-        cursor: 'grabbing',
+        cursor: 'grabbing' as ViewStyle['cursor'],
     },
     cursorZoomOut: {
-        cursor: 'zoom-out',
+        cursor: 'zoom-out' as ViewStyle['cursor'],
     },
     cursorInitial: {
-        cursor: 'initial',
+        cursor: 'initial' as ViewStyle['cursor'],
     },
     cursorText: {
-        cursor: 'text',
+        cursor: 'text' as ViewStyle['cursor'],
     },
 };
 
diff --git a/src/styles/utils/display.ts b/src/styles/utils/display.ts
index 82b8c87b0980..0f0166e135c9 100644
--- a/src/styles/utils/display.ts
+++ b/src/styles/utils/display.ts
@@ -23,31 +23,27 @@ export default {
      * Web-only style.
      */
     dInline: {
-        // NOTE: asserting "display" to a valid type, because it isn't possible to augment "display".
-        display: 'inline' as ViewStyle['display'],
+        display: 'inline',
     },
 
     /**
      * Web-only style.
      */
     dInlineFlex: {
-        // NOTE: asserting "display" to a valid type, because it isn't possible to augment "display".
-        display: 'inline-flex' as ViewStyle['display'],
+        display: 'inline-flex',
     },
 
     /**
      * Web-only style.
      */
     dBlock: {
-        // NOTE: asserting "display" to a valid type, because it isn't possible to augment "display".
-        display: 'block' as ViewStyle['display'],
+        display: 'block',
     },
 
     /**
      * Web-only style.
      */
     dGrid: {
-        // NOTE: asserting "display" to a valid type, because it isn't possible to augment "display".
-        display: 'grid' as ViewStyle['display'],
+        display: 'grid',
     },
 } satisfies Record<string, ViewStyle>;
diff --git a/src/styles/utils/emojiDefaultStyles/index.native.ts b/src/styles/utils/emojiDefaultStyles/index.native.ts
index 20bb887161d6..d90e92340315 100644
--- a/src/styles/utils/emojiDefaultStyles/index.native.ts
+++ b/src/styles/utils/emojiDefaultStyles/index.native.ts
@@ -1,8 +1,9 @@
+import FontUtils from '@styles/utils/FontUtils';
 import type EmojiDefaultStyles from './types';
 
 const emojiDefaultStyles: EmojiDefaultStyles = {
     fontStyle: 'normal',
-    fontWeight: 'normal',
+    fontWeight: FontUtils.fontWeight.normal,
     textDecorationLine: 'none',
 };
 
diff --git a/src/styles/utils/emojiDefaultStyles/index.ts b/src/styles/utils/emojiDefaultStyles/index.ts
index a24424f6677c..88c42e7e95d1 100644
--- a/src/styles/utils/emojiDefaultStyles/index.ts
+++ b/src/styles/utils/emojiDefaultStyles/index.ts
@@ -1,10 +1,11 @@
 // eslint-disable-next-line no-restricted-imports
 import display from '@styles/utils/display';
+import FontUtils from '@styles/utils/FontUtils';
 import type EmojiDefaultStyles from './types';
 
 const emojiDefaultStyles: EmojiDefaultStyles = {
     fontStyle: 'normal',
-    fontWeight: 'normal',
+    fontWeight: FontUtils.fontWeight.normal,
     ...display.dInlineFlex,
 };
 
diff --git a/src/styles/utils/flex.ts b/src/styles/utils/flex.ts
index 38b68bddd38d..4db09f138535 100644
--- a/src/styles/utils/flex.ts
+++ b/src/styles/utils/flex.ts
@@ -30,6 +30,10 @@ export default {
         flex: 4,
     },
 
+    flex5: {
+        flex: 5,
+    },
+
     flexRow: {
         flexDirection: 'row',
     },
diff --git a/src/styles/utils/generators/ModalStyleUtils.ts b/src/styles/utils/generators/ModalStyleUtils.ts
index 335ef8382941..7f51b7727d6a 100644
--- a/src/styles/utils/generators/ModalStyleUtils.ts
+++ b/src/styles/utils/generators/ModalStyleUtils.ts
@@ -46,7 +46,7 @@ type GetModalStylesStyleUtil = {
 
 const createModalStyleUtils: StyleUtilGenerator<GetModalStylesStyleUtil> = ({theme, styles}) => ({
     getModalStyles: (type, windowDimensions, popoverAnchorPosition = {}, innerContainerStyle = {}, outerStyle = {}): GetModalStyles => {
-        const {isSmallScreenWidth, windowWidth} = windowDimensions;
+        const {windowWidth, isSmallScreenWidth} = windowDimensions;
 
         let modalStyle: GetModalStyles['modalStyle'] = {
             margin: 0,
@@ -75,7 +75,7 @@ const createModalStyleUtils: StyleUtilGenerator<GetModalStylesStyleUtil> = ({the
                 };
                 modalContainerStyle = {
                     boxShadow: '0px 0px 5px 5px rgba(0, 0, 0, 0.1)',
-                    borderRadius: 12,
+                    borderRadius: variables.componentBorderRadiusLarge,
                     overflow: 'hidden',
                     width: variables.sideBarWidth,
                 };
@@ -102,7 +102,7 @@ const createModalStyleUtils: StyleUtilGenerator<GetModalStylesStyleUtil> = ({the
                     flex: 1,
                     marginTop: isSmallScreenWidth ? 0 : 20,
                     marginBottom: isSmallScreenWidth ? 0 : 20,
-                    borderRadius: isSmallScreenWidth ? 0 : 12,
+                    borderRadius: isSmallScreenWidth ? 0 : variables.componentBorderRadiusLarge,
                     overflow: 'hidden',
                     ...getCenteredModalStyles(styles, windowWidth, isSmallScreenWidth),
                 };
@@ -129,7 +129,7 @@ const createModalStyleUtils: StyleUtilGenerator<GetModalStylesStyleUtil> = ({the
                     flex: 1,
                     marginTop: isSmallScreenWidth ? 0 : 20,
                     marginBottom: isSmallScreenWidth ? 0 : 20,
-                    borderRadius: isSmallScreenWidth ? 0 : 12,
+                    borderRadius: isSmallScreenWidth ? 0 : variables.componentBorderRadiusLarge,
                     overflow: 'hidden',
                     ...getCenteredModalStyles(styles, windowWidth, isSmallScreenWidth, true),
                 };
@@ -151,7 +151,7 @@ const createModalStyleUtils: StyleUtilGenerator<GetModalStylesStyleUtil> = ({the
                 };
                 modalContainerStyle = {
                     boxShadow: '0px 0px 5px 5px rgba(0, 0, 0, 0.1)',
-                    borderRadius: 12,
+                    borderRadius: variables.componentBorderRadiusLarge,
                     borderWidth: 0,
                 };
 
@@ -174,9 +174,9 @@ const createModalStyleUtils: StyleUtilGenerator<GetModalStylesStyleUtil> = ({the
                 };
                 modalContainerStyle = {
                     width: '100%',
-                    borderTopLeftRadius: 20,
-                    borderTopRightRadius: 20,
-                    paddingTop: 12,
+                    borderTopLeftRadius: variables.componentBorderRadiusLarge,
+                    borderTopRightRadius: variables.componentBorderRadiusLarge,
+                    paddingTop: variables.componentBorderRadiusLarge,
                     justifyContent: 'center',
                     overflow: 'hidden',
                 };
@@ -197,7 +197,7 @@ const createModalStyleUtils: StyleUtilGenerator<GetModalStylesStyleUtil> = ({the
                     },
                 };
                 modalContainerStyle = {
-                    borderRadius: 12,
+                    borderRadius: variables.componentBorderRadiusLarge,
                     borderWidth: 1,
                     borderColor: theme.border,
                     justifyContent: 'center',
diff --git a/src/styles/utils/generators/ReportActionContextMenuStyleUtils.ts b/src/styles/utils/generators/ReportActionContextMenuStyleUtils.ts
index e8761468f640..1894f95a44c1 100644
--- a/src/styles/utils/generators/ReportActionContextMenuStyleUtils.ts
+++ b/src/styles/utils/generators/ReportActionContextMenuStyleUtils.ts
@@ -20,8 +20,7 @@ const getMiniWrapperStyle = (theme: ThemeColors, styles: ThemeStyles): ViewStyle
         borderWidth: 1,
         borderColor: theme.border,
         // In Safari, when welcome messages use a code block (triple backticks), they would overlap the context menu below when there is no scrollbar without the transform style.
-        // NOTE: asserting "transform" to a valid type, because it isn't possible to augment "transform".
-        transform: 'translateZ(0)' as unknown as ViewStyle['transform'],
+        transform: 'translateZ(0)',
     },
 ];
 
@@ -45,7 +44,7 @@ const createReportActionContextMenuStyleUtils: StyleUtilGenerator<GetReportActio
             getDefaultWrapperStyle(theme),
 
             // Small screens use a bottom-docked modal that already has vertical padding.
-            isSmallScreenWidth ? {} : styles.pv3,
+            isSmallScreenWidth ? {} : styles.pv4,
         ];
     },
 });
diff --git a/src/styles/utils/generators/TooltipStyleUtils.ts b/src/styles/utils/generators/TooltipStyleUtils.ts
deleted file mode 100644
index bb77a851f567..000000000000
--- a/src/styles/utils/generators/TooltipStyleUtils.ts
+++ /dev/null
@@ -1,312 +0,0 @@
-import type {TextStyle, View, ViewStyle} from 'react-native';
-import {Animated} from 'react-native';
-import roundToNearestMultipleOfFour from '@libs/roundToNearestMultipleOfFour';
-import FontUtils from '@styles/utils/FontUtils';
-// eslint-disable-next-line no-restricted-imports
-import positioning from '@styles/utils/positioning';
-// eslint-disable-next-line no-restricted-imports
-import spacing from '@styles/utils/spacing';
-// eslint-disable-next-line no-restricted-imports
-import titleBarHeight from '@styles/utils/titleBarHeight';
-import variables from '@styles/variables';
-import type StyleUtilGenerator from './types';
-
-/** 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 */
-const POINTER_HEIGHT = 4;
-
-/** 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 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 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.
- */
-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;
-    const tooltipRightEdge = componentCenter + tooltipWidth / 2;
-
-    if (tooltipLeftEdge < GUTTER_WIDTH) {
-        // Tooltip is in left gutter, shift right by a multiple of four.
-        return roundToNearestMultipleOfFour(GUTTER_WIDTH - tooltipLeftEdge);
-    }
-
-    if (tooltipRightEdge > windowWidth - GUTTER_WIDTH) {
-        // Tooltip is in right gutter, shift left by a multiple of four.
-        return roundToNearestMultipleOfFour(windowWidth - GUTTER_WIDTH - tooltipRightEdge);
-    }
-
-    // Tooltip is not in the gutter, so no need to shift it horizontally
-    return 0;
-}
-
-/**
- * Determines if there is an overlapping element at the top of a given coordinate.
- *                    (targetCenterX, y)
- *                            |
- *                            v
- *                        _ _ _ _ _
- *                       |         |
- *                       |         |
- *                       |         |
- *                       |         |
- *                       |_ _ _ _ _|
- *
- * @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 yOffset - The distance between the top edge of the window
- *                           and the top edge of the wrapped component.
- * @param tooltipTargetWidth - The width of the tooltip's target
- * @param tooltipTargetHeight - The height of the tooltip's target
- */
-function isOverlappingAtTop(tooltip: View | HTMLDivElement, xOffset: number, yOffset: number, tooltipTargetWidth: number, tooltipTargetHeight: number) {
-    if (typeof document.elementFromPoint !== 'function') {
-        return false;
-    }
-
-    // Use the x center position of the target to prevent wrong element returned by elementFromPoint
-    // in case the target has a border radius or is a multiline text.
-    const targetCenterX = xOffset + tooltipTargetWidth / 2;
-    const elementAtTargetCenterX = document.elementFromPoint(targetCenterX, yOffset);
-
-    // Ensure it's not the already rendered element of this very tooltip, so the tooltip doesn't try to "avoid" itself
-    if (!elementAtTargetCenterX || ('contains' in tooltip && tooltip.contains(elementAtTargetCenterX))) {
-        return false;
-    }
-
-    const rectAtTargetCenterX = elementAtTargetCenterX.getBoundingClientRect();
-
-    // Ensure it's not overlapping with another element by checking if the yOffset is greater than the top of the element
-    // and less than the bottom of the element. Also ensure the tooltip target is not completely inside the elementAtTargetCenterX by vertical direction
-    const isOverlappingAtTargetCenterX = yOffset > rectAtTargetCenterX.top && yOffset < rectAtTargetCenterX.bottom && yOffset + tooltipTargetHeight > rectAtTargetCenterX.bottom;
-
-    return isOverlappingAtTargetCenterX;
-}
-
-type TooltipStyles = {
-    animationStyle: ViewStyle;
-    rootWrapperStyle: ViewStyle;
-    textStyle: TextStyle;
-    pointerWrapperStyle: ViewStyle;
-    pointerStyle: ViewStyle;
-};
-
-type TooltipParams = {
-    tooltip: View | HTMLDivElement | null;
-    currentSize: Animated.Value;
-    windowWidth: number;
-    xOffset: number;
-    yOffset: number;
-    tooltipTargetWidth: number;
-    tooltipTargetHeight: number;
-    maxWidth: number;
-    tooltipContentWidth?: number;
-    tooltipWrapperHeight?: number;
-    manualShiftHorizontal?: number;
-    manualShiftVertical?: number;
-    shouldForceRenderingBelow?: boolean;
-};
-
-type GetTooltipStylesStyleUtil = {getTooltipStyles: (props: TooltipParams) => TooltipStyles};
-
-/**
- * Generate styles for the tooltip component.
- *
- * @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 yOffset - The distance between the top edge of the window
- *                           and the top edge of the wrapped component.
- * @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 [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.
- */
-const createTooltipStyleUtils: StyleUtilGenerator<GetTooltipStylesStyleUtil> = ({theme, styles}) => ({
-    getTooltipStyles: ({
-        tooltip,
-        currentSize,
-        windowWidth,
-        xOffset,
-        yOffset,
-        tooltipTargetWidth,
-        tooltipTargetHeight,
-        maxWidth,
-        tooltipContentWidth,
-        tooltipWrapperHeight,
-        manualShiftHorizontal = 0,
-        manualShiftVertical = 0,
-        shouldForceRenderingBelow = false,
-    }) => {
-        const tooltipVerticalPadding = spacing.pv1;
-
-        // We calculate tooltip width based on the tooltip's content width
-        // so the tooltip wrapper is just big enough to fit content and prevent white space.
-        // NOTE: Add 1 to the tooltipWidth to prevent truncated text in Safari
-        const tooltipWidth = tooltipContentWidth && tooltipContentWidth + spacing.ph2.paddingHorizontal * 2 + 1;
-        const tooltipHeight = tooltipWrapperHeight;
-
-        const isTooltipSizeReady = tooltipWidth !== undefined && tooltipHeight !== undefined;
-
-        // Set the scale to 1 to be able to measure the tooltip size correctly when it's not ready yet.
-        let scale = new Animated.Value(1);
-        let shouldShowBelow = false;
-        let horizontalShift = 0;
-        let horizontalShiftPointer = 0;
-        let rootWrapperTop = 0;
-        let rootWrapperLeft = 0;
-        let pointerWrapperTop = 0;
-        let pointerWrapperLeft = 0;
-        let pointerAdditionalStyle = {};
-
-        if (isTooltipSizeReady) {
-            // Determine if the tooltip should display below the wrapped component.
-            // If either a tooltip will try to render within GUTTER_WIDTH or desktop header 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 =
-                shouldForceRenderingBelow ||
-                yOffset - tooltipHeight - POINTER_HEIGHT < GUTTER_WIDTH + titleBarHeight ||
-                !!(tooltip && isOverlappingAtTop(tooltip, xOffset, yOffset, tooltipTargetWidth, tooltipTargetHeight));
-
-            // When the tooltip size is ready, we can start animating the scale.
-            scale = currentSize;
-
-            // Determine if we need to shift the tooltip horizontally to prevent it
-            // from displaying too near to the edge of the screen.
-            horizontalShift = computeHorizontalShift(windowWidth, xOffset, tooltipTargetWidth, tooltipWidth, manualShiftHorizontal);
-
-            // Determine if we need to shift the pointer horizontally to prevent it from being too near to the edge of the tooltip
-            // We shift it to the right a bit if the tooltip is positioned on the extreme left
-            // and shift it to left a bit if the tooltip is positioned on the extreme right.
-            horizontalShiftPointer =
-                horizontalShift > 0
-                    ? Math.max(-horizontalShift, -(tooltipWidth / 2) + POINTER_WIDTH / 2 + variables.componentBorderRadiusSmall)
-                    : Math.min(-horizontalShift, tooltipWidth / 2 - POINTER_WIDTH / 2 - variables.componentBorderRadiusSmall);
-
-            // Because it uses fixed positioning, the top-left corner of the tooltip is aligned
-            // with the top-left corner of the window by default.
-            // we will use yOffset to position the tooltip relative to the Wrapped Component
-            // So we need to shift the tooltip vertically and horizontally to position it correctly.
-            //
-            // First, we'll position it vertically.
-            // To shift the tooltip down, we'll give `top` a positive value.
-            // To shift the tooltip up, we'll give `top` a negative value.
-            rootWrapperTop = shouldShowBelow
-                ? // We need to shift the tooltip down below the component. So shift the tooltip down (+) by...
-                  yOffset + tooltipTargetHeight + POINTER_HEIGHT + manualShiftVertical
-                : // We need to shift the tooltip up above the component. So shift the tooltip up (-) by...
-                  yOffset - (tooltipHeight + POINTER_HEIGHT) + manualShiftVertical;
-
-            // Next, we'll position it horizontally.
-            // we will use xOffset to position the tooltip relative to the Wrapped Component
-            // To shift the tooltip right, we'll give `left` a positive value.
-            // To shift the tooltip left, we'll give `left` a negative value.
-            //
-            // So we'll:
-            //   1) Shift the tooltip right (+) to the center of the component,
-            //      so the left edge lines up with the component center.
-            //   2) Shift it left (-) to by half the tooltip's width,
-            //      so the tooltip's center lines up with the center of the wrapped component.
-            //   3) Add the horizontal shift (left or right) computed above to keep it out of the gutters.
-            //   4) Lastly, add the manual horizontal shift passed in as a parameter.
-            rootWrapperLeft = xOffset + (tooltipTargetWidth / 2 - tooltipWidth / 2) + horizontalShift + manualShiftHorizontal;
-
-            // By default, the pointer's top-left will align with the top-left of the tooltip wrapper.
-            //
-            // To align it vertically, we'll:
-            //   If the pointer should be below the tooltip wrapper, shift the pointer down (+) by the tooltip height,
-            //   so that the top of the pointer lines up with the bottom of the tooltip
-            //
-            //   OR if the pointer should be above the tooltip wrapper, then the pointer up (-) by the pointer's height
-            //   so that the bottom of the pointer lines up with the top of the tooltip
-            pointerWrapperTop = shouldShowBelow ? -POINTER_HEIGHT : tooltipHeight;
-
-            // To align it horizontally, we'll:
-            //   1) Shift the pointer to the right (+) by the half the tooltipWidth's width,
-            //      so the left edge of the pointer lines up with the tooltipWidth's center.
-            //   2) To the left (-) by half the pointer's width,
-            //      so the pointer's center lines up with the tooltipWidth's center.
-            //   3) Remove the wrapper's horizontalShift to maintain the pointer
-            //      at the center of the hovered component.
-            pointerWrapperLeft = horizontalShiftPointer + (tooltipWidth / 2 - POINTER_WIDTH / 2);
-
-            pointerAdditionalStyle = shouldShowBelow ? styles.flipUpsideDown : {};
-        }
-
-        return {
-            animationStyle: {
-                // remember Transform causes a new Local cordinate system
-                // https://drafts.csswg.org/css-transforms-1/#transform-rendering
-                // so Position fixed children will be relative to this new Local cordinate system
-                transform: [{scale}],
-            },
-            rootWrapperStyle: {
-                ...positioning.pFixed,
-                backgroundColor: theme.heading,
-                borderRadius: variables.componentBorderRadiusSmall,
-                ...tooltipVerticalPadding,
-                ...spacing.ph2,
-                zIndex: variables.tooltipzIndex,
-                width: tooltipWidth,
-                maxWidth,
-                top: rootWrapperTop,
-                left: rootWrapperLeft,
-
-                // We are adding this to prevent the tooltip text from being selected and copied on CTRL + A.
-                ...styles.userSelectNone,
-                ...styles.pointerEventsNone,
-            },
-            textStyle: {
-                color: theme.textReversed,
-                fontFamily: FontUtils.fontFamily.platform.EXP_NEUE,
-                fontSize: variables.fontSizeSmall,
-                overflow: 'hidden',
-                lineHeight: variables.lineHeightSmall,
-                textAlign: 'center',
-            },
-            pointerWrapperStyle: {
-                ...positioning.pFixed,
-                top: pointerWrapperTop,
-                left: pointerWrapperLeft,
-            },
-            pointerStyle: {
-                width: 0,
-                height: 0,
-                backgroundColor: theme.transparent,
-                borderStyle: 'solid',
-                borderLeftWidth: POINTER_WIDTH / 2,
-                borderRightWidth: POINTER_WIDTH / 2,
-                borderTopWidth: POINTER_HEIGHT,
-                borderLeftColor: theme.transparent,
-                borderRightColor: theme.transparent,
-                borderTopColor: theme.heading,
-                ...pointerAdditionalStyle,
-            },
-        };
-    },
-});
-
-export default createTooltipStyleUtils;
diff --git a/src/styles/utils/generators/TooltipStyleUtils/computeHorizontalShift/index.native.ts b/src/styles/utils/generators/TooltipStyleUtils/computeHorizontalShift/index.native.ts
new file mode 100644
index 000000000000..377cb3dbdfc0
--- /dev/null
+++ b/src/styles/utils/generators/TooltipStyleUtils/computeHorizontalShift/index.native.ts
@@ -0,0 +1,5 @@
+import type {ComputeHorizontalShift} from './types';
+
+const computeHorizontalShift: ComputeHorizontalShift = () => 0;
+
+export default computeHorizontalShift;
diff --git a/src/styles/utils/generators/TooltipStyleUtils/computeHorizontalShift/index.ts b/src/styles/utils/generators/TooltipStyleUtils/computeHorizontalShift/index.ts
new file mode 100644
index 000000000000..dbbdc52d5b9a
--- /dev/null
+++ b/src/styles/utils/generators/TooltipStyleUtils/computeHorizontalShift/index.ts
@@ -0,0 +1,42 @@
+import roundToNearestMultipleOfFour from '@libs/roundToNearestMultipleOfFour';
+import variables from '@styles/variables';
+import type {ComputeHorizontalShift} from './types';
+
+/** 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;
+
+/**
+ * Compute the amount the tooltip needs to be horizontally shifted in order to keep it from displaying in the gutters.
+ *
+ * @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 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.
+ */
+const computeHorizontalShift: ComputeHorizontalShift = (windowWidth, xOffset, componentWidth, tooltipWidth, manualShiftHorizontal) => {
+    // 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;
+    const tooltipRightEdge = componentCenter + tooltipWidth / 2;
+
+    if (tooltipLeftEdge < GUTTER_WIDTH) {
+        // Tooltip is in left gutter, shift right by a multiple of four.
+        return roundToNearestMultipleOfFour(GUTTER_WIDTH - tooltipLeftEdge);
+    }
+
+    if (tooltipRightEdge > windowWidth - GUTTER_WIDTH) {
+        // Tooltip is in right gutter, shift left by a multiple of four.
+        return roundToNearestMultipleOfFour(windowWidth - GUTTER_WIDTH - tooltipRightEdge);
+    }
+
+    // Tooltip is not in the gutter, so no need to shift it horizontally
+    return 0;
+};
+
+export {GUTTER_WIDTH};
+export default computeHorizontalShift;
diff --git a/src/styles/utils/generators/TooltipStyleUtils/computeHorizontalShift/types.ts b/src/styles/utils/generators/TooltipStyleUtils/computeHorizontalShift/types.ts
new file mode 100644
index 000000000000..bc82a9b4fbe4
--- /dev/null
+++ b/src/styles/utils/generators/TooltipStyleUtils/computeHorizontalShift/types.ts
@@ -0,0 +1,4 @@
+type ComputeHorizontalShift = (windowWidth: number, xOffset: number, componentWidth: number, tooltipWidth: number, manualShiftHorizontal: number) => number;
+
+// eslint-disable-next-line import/prefer-default-export
+export type {ComputeHorizontalShift};
diff --git a/src/styles/utils/generators/TooltipStyleUtils/index.ts b/src/styles/utils/generators/TooltipStyleUtils/index.ts
new file mode 100644
index 000000000000..07dba25844ea
--- /dev/null
+++ b/src/styles/utils/generators/TooltipStyleUtils/index.ts
@@ -0,0 +1,274 @@
+import type {StyleProp, TextStyle, View, ViewStyle} from 'react-native';
+import {Animated, StyleSheet} from 'react-native';
+import FontUtils from '@styles/utils/FontUtils';
+// eslint-disable-next-line no-restricted-imports
+import type StyleUtilGenerator from '@styles/utils/generators/types';
+// eslint-disable-next-line no-restricted-imports
+import spacing from '@styles/utils/spacing';
+// eslint-disable-next-line no-restricted-imports
+import titleBarHeight from '@styles/utils/titleBarHeight';
+import variables from '@styles/variables';
+import CONST from '@src/CONST';
+import type {TooltipAnchorAlignment} from '@src/types/utils/AnchorAlignment';
+import computeHorizontalShift, {GUTTER_WIDTH} from './computeHorizontalShift';
+import isOverlappingAtTop from './isOverlappingAtTop';
+import tooltipPlatformStyle from './tooltipPlatformStyles';
+
+/** The height of a tooltip pointer */
+const POINTER_HEIGHT = 4;
+
+/** The width of a tooltip pointer */
+const POINTER_WIDTH = 12;
+
+type TooltipStyles = {
+    animationStyle: ViewStyle;
+    rootWrapperStyle: ViewStyle;
+    textStyle: TextStyle;
+    pointerWrapperStyle: ViewStyle;
+    pointerStyle: ViewStyle;
+};
+
+type TooltipParams = {
+    tooltip: View | HTMLDivElement | null;
+    currentSize: Animated.Value;
+    windowWidth: number;
+    xOffset: number;
+    yOffset: number;
+    tooltipTargetWidth: number;
+    tooltipTargetHeight: number;
+    maxWidth: number;
+    tooltipContentWidth?: number;
+    tooltipWrapperHeight?: number;
+    manualShiftHorizontal?: number;
+    manualShiftVertical?: number;
+    shouldForceRenderingBelow?: boolean;
+    wrapperStyle: StyleProp<ViewStyle>;
+    anchorAlignment?: TooltipAnchorAlignment;
+    shouldAddHorizontalPadding?: boolean;
+};
+
+type GetTooltipStylesStyleUtil = {getTooltipStyles: (props: TooltipParams) => TooltipStyles};
+
+/**
+ * Generate styles for the tooltip component.
+ *
+ * @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 yOffset - The distance between the top edge of the window
+ *                           and the top edge of the wrapped component.
+ * @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 [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 [shouldForceRenderingBelow] - Should display tooltip below the wrapped component.
+ * @param [anchorAlignment] - Align tooltip anchor horizontally and vertically.
+ * @param [wrapperStyle] - Any additional styles for the root wrapper.
+ */
+const createTooltipStyleUtils: StyleUtilGenerator<GetTooltipStylesStyleUtil> = ({theme, styles}) => ({
+    getTooltipStyles: ({
+        tooltip,
+        currentSize,
+        windowWidth,
+        xOffset,
+        yOffset,
+        tooltipTargetWidth,
+        tooltipTargetHeight,
+        maxWidth,
+        tooltipContentWidth,
+        tooltipWrapperHeight,
+        manualShiftHorizontal = 0,
+        manualShiftVertical = 0,
+        shouldAddHorizontalPadding = true,
+        shouldForceRenderingBelow = false,
+        anchorAlignment = {
+            horizontal: CONST.MODAL.ANCHOR_ORIGIN_HORIZONTAL.CENTER,
+            vertical: CONST.MODAL.ANCHOR_ORIGIN_VERTICAL.BOTTOM,
+        },
+        wrapperStyle = {},
+    }) => {
+        const customWrapperStyle = StyleSheet.flatten(wrapperStyle);
+        const tooltipVerticalPadding = spacing.pv1;
+        const tooltipHorizontalPadding = shouldAddHorizontalPadding ? spacing.ph2.paddingHorizontal * 2 : 0;
+
+        // We calculate tooltip width based on the tooltip's content width
+        // so the tooltip wrapper is just big enough to fit content and prevent white space.
+        // NOTE: Add 1 to the tooltipWidth to prevent truncated text in Safari
+        const tooltipWidth = tooltipContentWidth && tooltipContentWidth + tooltipHorizontalPadding + 1;
+        const tooltipHeight = tooltipWrapperHeight;
+
+        const isTooltipSizeReady = tooltipWidth !== undefined && tooltipHeight !== undefined;
+
+        // Set the scale to 1 to be able to measure the tooltip size correctly when it's not ready yet.
+        let scale = new Animated.Value(1);
+        let shouldShowBelow = false;
+        let horizontalShift = 0;
+        let horizontalShiftPointer = 0;
+        let rootWrapperTop = 0;
+        let rootWrapperLeft = 0;
+        let pointerWrapperTop = 0;
+        let pointerWrapperLeft = 0;
+        let pointerAdditionalStyle = {};
+        let opacity = 0;
+
+        if (isTooltipSizeReady) {
+            // Determine if the tooltip should display below the wrapped component.
+            // If either a tooltip will try to render within GUTTER_WIDTH or desktop header 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 =
+                shouldForceRenderingBelow ||
+                yOffset - tooltipHeight - POINTER_HEIGHT < GUTTER_WIDTH + titleBarHeight ||
+                !!(tooltip && isOverlappingAtTop(tooltip, xOffset, yOffset, tooltipTargetWidth, tooltipTargetHeight)) ||
+                anchorAlignment.vertical === CONST.MODAL.ANCHOR_ORIGIN_VERTICAL.TOP;
+
+            // When the tooltip size is ready, we can start animating the scale.
+            scale = currentSize;
+
+            // Determine if we need to shift the tooltip horizontally to prevent it
+            // from displaying too near to the edge of the screen.
+            horizontalShift = computeHorizontalShift(windowWidth, xOffset, tooltipTargetWidth, tooltipWidth, manualShiftHorizontal);
+
+            // Determine if we need to shift the pointer horizontally to prevent it from being too near to the edge of the tooltip
+            // We shift it to the right a bit if the tooltip is positioned on the extreme left
+            // and shift it to left a bit if the tooltip is positioned on the extreme right.
+            horizontalShiftPointer =
+                horizontalShift > 0
+                    ? Math.max(-horizontalShift, -(tooltipWidth / 2) + POINTER_WIDTH / 2 + variables.componentBorderRadiusSmall)
+                    : Math.min(-horizontalShift, tooltipWidth / 2 - POINTER_WIDTH / 2 - variables.componentBorderRadiusSmall);
+
+            // Because it uses fixed positioning, the top-left corner of the tooltip is aligned
+            // with the top-left corner of the window by default.
+            // we will use yOffset to position the tooltip relative to the Wrapped Component
+            // So we need to shift the tooltip vertically and horizontally to position it correctly.
+            //
+            // First, we'll position it vertically.
+            // To shift the tooltip down, we'll give `top` a positive value.
+            // To shift the tooltip up, we'll give `top` a negative value.
+            rootWrapperTop = shouldShowBelow
+                ? // We need to shift the tooltip down below the component. So shift the tooltip down (+) by...
+                  yOffset + tooltipTargetHeight + POINTER_HEIGHT + manualShiftVertical
+                : // We need to shift the tooltip up above the component. So shift the tooltip up (-) by...
+                  yOffset - (tooltipHeight + POINTER_HEIGHT) + manualShiftVertical;
+
+            // By default, the pointer's top-left will align with the top-left of the tooltip wrapper.
+            //
+            // To align it vertically, we'll:
+            //   If the pointer should be below the tooltip wrapper, shift the pointer down (+) by the tooltip height,
+            //   so that the top of the pointer lines up with the bottom of the tooltip
+            //
+            //   OR if the pointer should be above the tooltip wrapper, then the pointer up (-) by the pointer's height
+            //   so that the bottom of the pointer lines up with the top of the tooltip
+            pointerWrapperTop = shouldShowBelow ? -POINTER_HEIGHT : tooltipHeight;
+
+            // Horizontal tooltip position:
+            // we will use xOffset to position the tooltip relative to the Wrapped Component
+            // To shift the tooltip right, we'll give `left` a positive value.
+            // To shift the tooltip left, we'll give `left` a negative value.
+            //
+            // So we'll:
+            //   1) Add the horizontal shift (left or right) computed above to keep it out of the gutters.
+            //   2) Add the manual horizontal shift passed in as a parameter.
+            //   3a) Horizontally align left: No need for shifting.
+            //   3b) Horizontally align center:
+            //      - Shift the tooltip right (+) to the center of the component,
+            //        so the left edge lines up with the component center.
+            //      - Shift it left (-) to by half the tooltip's width,
+            //        so the tooltip's center lines up with the center of the wrapped component.
+
+            // Horizontal pointer position:
+            //   1) Left align: Shift the pointer to the right (+) by half the pointer's width,
+            //      so the left edge of the pointer does not overlap with the wrapper's border radius.
+            //   2) Center align:
+            //      - Shift the pointer to the right (+) by the half the tooltipWidth's width,
+            //        so the left edge of the pointer lines up with the tooltipWidth's center.
+            //      - To the left (-) by half the pointer's width,
+            //        so the pointer's center lines up with the tooltipWidth's center.
+            //      - Remove the wrapper's horizontalShift to maintain the pointer
+            //        at the center of the hovered component.
+            rootWrapperLeft = xOffset + horizontalShift + manualShiftHorizontal;
+            switch (anchorAlignment.horizontal) {
+                case CONST.MODAL.ANCHOR_ORIGIN_HORIZONTAL.LEFT:
+                    pointerWrapperLeft = POINTER_WIDTH / 2;
+                    break;
+                case CONST.MODAL.ANCHOR_ORIGIN_HORIZONTAL.RIGHT:
+                    pointerWrapperLeft = horizontalShiftPointer + (tooltipWidth - POINTER_WIDTH * 1.5);
+                    rootWrapperLeft += tooltipTargetWidth - tooltipWidth;
+                    break;
+                case CONST.MODAL.ANCHOR_ORIGIN_HORIZONTAL.CENTER:
+                default:
+                    pointerWrapperLeft = horizontalShiftPointer + (tooltipWidth / 2 - POINTER_WIDTH / 2);
+                    rootWrapperLeft += tooltipTargetWidth / 2 - tooltipWidth / 2;
+            }
+
+            pointerAdditionalStyle = shouldShowBelow ? styles.flipUpsideDown : {};
+
+            // React Native's measure() is asynchronous, we temporarily hide the tooltip until its bound is calculated
+            opacity = 100;
+        }
+
+        return {
+            animationStyle: {
+                // remember Transform causes a new Local cordinate system
+                // https://drafts.csswg.org/css-transforms-1/#transform-rendering
+                // so Position fixed children will be relative to this new Local cordinate system
+                transform: [{scale}],
+            },
+            rootWrapperStyle: {
+                ...tooltipPlatformStyle,
+                backgroundColor: theme.heading,
+                borderRadius: variables.componentBorderRadiusSmall,
+                ...tooltipVerticalPadding,
+                ...spacing.ph2,
+                zIndex: variables.tooltipzIndex,
+                width: tooltipWidth,
+                maxWidth,
+                top: rootWrapperTop,
+                left: rootWrapperLeft,
+                opacity,
+                ...customWrapperStyle,
+
+                // We are adding this to prevent the tooltip text from being selected and copied on CTRL + A.
+                ...styles.userSelectNone,
+                ...styles.pointerEventsNone,
+            },
+            textStyle: {
+                color: theme.textReversed,
+                ...FontUtils.fontFamily.platform.EXP_NEUE,
+                fontSize: variables.fontSizeSmall,
+                overflow: 'hidden',
+                lineHeight: variables.lineHeightSmall,
+                textAlign: 'center',
+            },
+            pointerWrapperStyle: {
+                ...tooltipPlatformStyle,
+                top: pointerWrapperTop,
+                left: pointerWrapperLeft,
+                opacity,
+            },
+            pointerStyle: {
+                width: 0,
+                height: 0,
+                backgroundColor: theme.transparent,
+                borderStyle: 'solid',
+                borderLeftWidth: POINTER_WIDTH / 2,
+                borderRightWidth: POINTER_WIDTH / 2,
+                borderTopWidth: POINTER_HEIGHT,
+                borderLeftColor: theme.transparent,
+                borderRightColor: theme.transparent,
+                borderTopColor: customWrapperStyle.backgroundColor ?? theme.heading,
+                ...pointerAdditionalStyle,
+            },
+        };
+    },
+});
+
+export default createTooltipStyleUtils;
diff --git a/src/styles/utils/generators/TooltipStyleUtils/isOverlappingAtTop/index.native.ts b/src/styles/utils/generators/TooltipStyleUtils/isOverlappingAtTop/index.native.ts
new file mode 100644
index 000000000000..fa80f4471870
--- /dev/null
+++ b/src/styles/utils/generators/TooltipStyleUtils/isOverlappingAtTop/index.native.ts
@@ -0,0 +1,5 @@
+import type IsOverlappingAtTop from './types';
+
+const isOverlappingAtTop: IsOverlappingAtTop = () => false;
+
+export default isOverlappingAtTop;
diff --git a/src/styles/utils/generators/TooltipStyleUtils/isOverlappingAtTop/index.ts b/src/styles/utils/generators/TooltipStyleUtils/isOverlappingAtTop/index.ts
new file mode 100644
index 000000000000..081d1a0a693e
--- /dev/null
+++ b/src/styles/utils/generators/TooltipStyleUtils/isOverlappingAtTop/index.ts
@@ -0,0 +1,47 @@
+import type IsOverlappingAtTop from './types';
+
+/**
+ * Determines if there is an overlapping element at the top of a given coordinate.
+ *                    (targetCenterX, y)
+ *                            |
+ *                            v
+ *                        _ _ _ _ _
+ *                       |         |
+ *                       |         |
+ *                       |         |
+ *                       |         |
+ *                       |_ _ _ _ _|
+ *
+ * @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 yOffset - The distance between the top edge of the window
+ *                           and the top edge of the wrapped component.
+ * @param tooltipTargetWidth - The width of the tooltip's target
+ * @param tooltipTargetHeight - The height of the tooltip's target
+ */
+const isOverlappingAtTop: IsOverlappingAtTop = (tooltip, xOffset, yOffset, tooltipTargetWidth, tooltipTargetHeight) => {
+    if (typeof document.elementFromPoint !== 'function') {
+        return false;
+    }
+
+    // Use the x center position of the target to prevent wrong element returned by elementFromPoint
+    // in case the target has a border radius or is a multiline text.
+    const targetCenterX = xOffset + tooltipTargetWidth / 2;
+    const elementAtTargetCenterX = document.elementFromPoint(targetCenterX, yOffset);
+
+    // Ensure it's not the already rendered element of this very tooltip, so the tooltip doesn't try to "avoid" itself
+    if (!elementAtTargetCenterX || ('contains' in tooltip && tooltip.contains(elementAtTargetCenterX))) {
+        return false;
+    }
+
+    const rectAtTargetCenterX = elementAtTargetCenterX.getBoundingClientRect();
+
+    // Ensure it's not overlapping with another element by checking if the yOffset is greater than the top of the element
+    // and less than the bottom of the element. Also ensure the tooltip target is not completely inside the elementAtTargetCenterX by vertical direction
+    const isOverlappingAtTargetCenterX = yOffset > rectAtTargetCenterX.top && yOffset < rectAtTargetCenterX.bottom && yOffset + tooltipTargetHeight > rectAtTargetCenterX.bottom;
+
+    return isOverlappingAtTargetCenterX;
+};
+
+export default isOverlappingAtTop;
diff --git a/src/styles/utils/generators/TooltipStyleUtils/isOverlappingAtTop/types.ts b/src/styles/utils/generators/TooltipStyleUtils/isOverlappingAtTop/types.ts
new file mode 100644
index 000000000000..bdd8ff346a86
--- /dev/null
+++ b/src/styles/utils/generators/TooltipStyleUtils/isOverlappingAtTop/types.ts
@@ -0,0 +1,5 @@
+import type {View} from 'react-native';
+
+type IsOverlappingAtTop = (tooltip: View | HTMLDivElement, xOffset: number, yOffset: number, tooltipTargetWidth: number, tooltipTargetHeight: number) => boolean;
+
+export default IsOverlappingAtTop;
diff --git a/src/styles/utils/generators/TooltipStyleUtils/tooltipPlatformStyles/index.native.ts b/src/styles/utils/generators/TooltipStyleUtils/tooltipPlatformStyles/index.native.ts
new file mode 100644
index 000000000000..17cc7200b20d
--- /dev/null
+++ b/src/styles/utils/generators/TooltipStyleUtils/tooltipPlatformStyles/index.native.ts
@@ -0,0 +1,7 @@
+import type {ViewStyle} from 'react-native';
+// eslint-disable-next-line no-restricted-imports
+import positioning from '@styles/utils/positioning';
+
+const tooltipPlatformStyle: ViewStyle = positioning.pAbsolute;
+
+export default tooltipPlatformStyle;
diff --git a/src/styles/utils/generators/TooltipStyleUtils/tooltipPlatformStyles/index.ts b/src/styles/utils/generators/TooltipStyleUtils/tooltipPlatformStyles/index.ts
new file mode 100644
index 000000000000..fd49d03b9413
--- /dev/null
+++ b/src/styles/utils/generators/TooltipStyleUtils/tooltipPlatformStyles/index.ts
@@ -0,0 +1,7 @@
+import type {ViewStyle} from 'react-native';
+// eslint-disable-next-line no-restricted-imports
+import positioning from '@styles/utils/positioning';
+
+const tooltipPlatformStyle: ViewStyle = positioning.pFixed;
+
+export default tooltipPlatformStyle;
diff --git a/src/styles/utils/getHighResolutionInfoWrapperStyle/index.native.ts b/src/styles/utils/getHighResolutionInfoWrapperStyle/index.native.ts
new file mode 100644
index 000000000000..743c52287486
--- /dev/null
+++ b/src/styles/utils/getHighResolutionInfoWrapperStyle/index.native.ts
@@ -0,0 +1,11 @@
+// eslint-disable-next-line no-restricted-imports
+import spacing from '@styles/utils/spacing';
+import type GetHighResolutionInfoWrapperStyle from './types';
+
+const getHighResolutionInfoWrapperStyle: GetHighResolutionInfoWrapperStyle = (isUploaded) => ({
+    ...spacing.ph8,
+    ...spacing.pt5,
+    ...(isUploaded ? spacing.pb5 : spacing.mbn1),
+});
+
+export default getHighResolutionInfoWrapperStyle;
diff --git a/src/styles/utils/getHighResolutionInfoWrapperStyle/index.ts b/src/styles/utils/getHighResolutionInfoWrapperStyle/index.ts
new file mode 100644
index 000000000000..ff10f7c71420
--- /dev/null
+++ b/src/styles/utils/getHighResolutionInfoWrapperStyle/index.ts
@@ -0,0 +1,11 @@
+// eslint-disable-next-line no-restricted-imports
+import spacing from '@styles/utils/spacing';
+import type GetHighResolutionInfoWrapperStyle from './types';
+
+const getHighResolutionInfoWrapperStyle: GetHighResolutionInfoWrapperStyle = (isUploaded) => ({
+    ...spacing.ph5,
+    ...spacing.pt5,
+    ...(isUploaded ? spacing.pb5 : spacing.mbn1),
+});
+
+export default getHighResolutionInfoWrapperStyle;
diff --git a/src/styles/utils/getHighResolutionInfoWrapperStyle/types.ts b/src/styles/utils/getHighResolutionInfoWrapperStyle/types.ts
new file mode 100644
index 000000000000..b7ff33d7c071
--- /dev/null
+++ b/src/styles/utils/getHighResolutionInfoWrapperStyle/types.ts
@@ -0,0 +1,5 @@
+import type {ViewStyle} from 'react-native';
+
+type GetHighResolutionInfoWrapperStyle = (isUploaded: boolean) => ViewStyle;
+
+export default GetHighResolutionInfoWrapperStyle;
diff --git a/src/styles/utils/index.ts b/src/styles/utils/index.ts
index ca238c3ffd88..def901b716bd 100644
--- a/src/styles/utils/index.ts
+++ b/src/styles/utils/index.ts
@@ -1,5 +1,5 @@
 import {StyleSheet} from 'react-native';
-import type {AnimatableNumericValue, Animated, ColorValue, DimensionValue, ImageStyle, PressableStateCallbackType, StyleProp, TextStyle, ViewStyle} from 'react-native';
+import type {AnimatableNumericValue, Animated, ColorValue, ImageStyle, PressableStateCallbackType, StyleProp, TextStyle, ViewStyle} from 'react-native';
 import type {OnyxEntry} from 'react-native-onyx';
 import type {EdgeInsets} from 'react-native-safe-area-context';
 import type {ValueOf} from 'type-fest';
@@ -18,11 +18,11 @@ import type {ThemeStyles} from '..';
 import shouldPreventScrollOnAutoCompleteSuggestion from './autoCompleteSuggestion';
 import getCardStyles from './cardStyles';
 import containerComposeStyles from './containerComposeStyles';
-import FontUtils from './FontUtils';
 import createModalStyleUtils from './generators/ModalStyleUtils';
 import createReportActionContextMenuStyleUtils from './generators/ReportActionContextMenuStyleUtils';
 import createTooltipStyleUtils from './generators/TooltipStyleUtils';
 import getContextMenuItemStyles from './getContextMenuItemStyles';
+import getHighResolutionInfoWrapperStyle from './getHighResolutionInfoWrapperStyle';
 import getNavigationModalCardStyle from './getNavigationModalCardStyles';
 import getSignInBgStyles from './getSignInBgStyles';
 import {compactContentContainerStyles} from './optionRowStyles';
@@ -342,7 +342,6 @@ function getSafeAreaMargins(insets?: EdgeInsets): ViewStyle {
     return {marginBottom: (insets?.bottom ?? 0) * variables.safeInsertPercentage};
 }
 
-// NOTE: asserting some web style properties to a valid type, because it isn't possible to augment them.
 function getZoomSizingStyle(
     isZoomed: boolean,
     imgWidth: number,
@@ -356,23 +355,23 @@ function getZoomSizingStyle(
     if (isLoading || imgWidth === 0 || imgHeight === 0) {
         return undefined;
     }
-    const top = `${Math.max((containerHeight - imgHeight) / 2, 0)}px` as DimensionValue;
-    const left = `${Math.max((containerWidth - imgWidth) / 2, 0)}px` as DimensionValue;
+    const top = `${Math.max((containerHeight - imgHeight) / 2, 0)}px`;
+    const left = `${Math.max((containerWidth - imgWidth) / 2, 0)}px`;
 
     // Return different size and offset style based on zoomScale and isZoom.
     if (isZoomed) {
         // When both width and height are smaller than container(modal) size, set the height by multiplying zoomScale if it is zoomed in.
         if (zoomScale >= 1) {
             return {
-                height: `${imgHeight * zoomScale}px` as DimensionValue,
-                width: `${imgWidth * zoomScale}px` as DimensionValue,
+                height: `${imgHeight * zoomScale}px`,
+                width: `${imgWidth * zoomScale}px`,
             };
         }
 
         // If image height and width are bigger than container size, display image with original size because original size is bigger and position absolute.
         return {
-            height: `${imgHeight}px` as DimensionValue,
-            width: `${imgWidth}px` as DimensionValue,
+            height: `${imgHeight}px`,
+            width: `${imgWidth}px`,
             top,
             left,
         };
@@ -381,8 +380,8 @@ function getZoomSizingStyle(
     // If image is not zoomed in and image size is smaller than container size, display with original size based on offset and position absolute.
     if (zoomScale > 1) {
         return {
-            height: `${imgHeight}px` as DimensionValue,
-            width: `${imgWidth}px` as DimensionValue,
+            height: `${imgHeight}px`,
+            width: `${imgWidth}px`,
             top,
             left,
         };
@@ -390,18 +389,18 @@ function getZoomSizingStyle(
 
     // If image is bigger than container size, display full image in the screen with scaled size (fit by container size) and position absolute.
     // top, left offset should be different when displaying long or wide image.
-    const scaledTop = `${Math.max((containerHeight - imgHeight * zoomScale) / 2, 0)}px` as DimensionValue;
-    const scaledLeft = `${Math.max((containerWidth - imgWidth * zoomScale) / 2, 0)}px` as DimensionValue;
+    const scaledTop = `${Math.max((containerHeight - imgHeight * zoomScale) / 2, 0)}px`;
+    const scaledLeft = `${Math.max((containerWidth - imgWidth * zoomScale) / 2, 0)}px`;
     return {
-        height: `${imgHeight * zoomScale}px` as DimensionValue,
-        width: `${imgWidth * zoomScale}px` as DimensionValue,
+        height: `${imgHeight * zoomScale}px`,
+        width: `${imgWidth * zoomScale}px`,
         top: scaledTop,
         left: scaledLeft,
     };
 }
 
 /**
- * Returns auto grow text input style
+ * Returns a style with width set to the specified number
  */
 function getWidthStyle(width: number): ViewStyle & ImageStyle {
     return {
@@ -409,6 +408,15 @@ function getWidthStyle(width: number): ViewStyle & ImageStyle {
     };
 }
 
+/**
+ * Returns a style with border radius set to the specified number
+ */
+function getBorderRadiusStyle(borderRadius: number): ViewStyle & ImageStyle {
+    return {
+        borderRadius,
+    };
+}
+
 /**
  * Returns a style with backgroundColor and borderColor set to the same color
  */
@@ -505,7 +513,7 @@ function getButtonStyleWithIcon(
     hasText?: boolean,
     shouldShowRightIcon?: boolean,
 ): ViewStyle | undefined {
-    const useDefaultButtonStyles = Boolean(hasIcon && shouldShowRightIcon) || Boolean(!hasIcon && !shouldShowRightIcon);
+    const useDefaultButtonStyles = !!(hasIcon && shouldShowRightIcon) || !!(!hasIcon && !shouldShowRightIcon);
     switch (true) {
         case small: {
             const verticalStyle = hasIcon ? styles.pl2 : styles.pr2;
@@ -529,6 +537,8 @@ function getButtonStyleWithIcon(
     }
 }
 
+type MarginPaddingValue = ViewStyle['marginTop' | 'marginBottom' | 'paddingTop' | 'paddingBottom'];
+
 /**
  * Combine margin/padding with safe area inset
  *
@@ -536,10 +546,14 @@ function getButtonStyleWithIcon(
  * @param safeAreaValue - safe area inset
  * @param shouldAddSafeAreaValue - indicator whether safe area inset should be applied
  */
-function getCombinedSpacing(modalContainerValue: DimensionValue | undefined, safeAreaValue: number, shouldAddSafeAreaValue: boolean): number | DimensionValue | undefined {
+function getCombinedSpacing(modalContainerValue: MarginPaddingValue, safeAreaValue: number, shouldAddSafeAreaValue: boolean): MarginPaddingValue {
     // modalContainerValue can only be added to safe area inset if it's a number, otherwise it's returned as is
-    if (typeof modalContainerValue === 'number' || !modalContainerValue) {
-        return (modalContainerValue ?? 0) + (shouldAddSafeAreaValue ? safeAreaValue : 0);
+    if (typeof modalContainerValue === 'number') {
+        return modalContainerValue + (shouldAddSafeAreaValue ? safeAreaValue : 0);
+    }
+
+    if (!modalContainerValue) {
+        return shouldAddSafeAreaValue ? safeAreaValue : 0;
     }
 
     return modalContainerValue;
@@ -554,10 +568,10 @@ type ModalPaddingStylesParams = {
     safeAreaPaddingBottom: number;
     safeAreaPaddingLeft: number;
     safeAreaPaddingRight: number;
-    modalContainerStyleMarginTop: DimensionValue | undefined;
-    modalContainerStyleMarginBottom: DimensionValue | undefined;
-    modalContainerStylePaddingTop: DimensionValue | undefined;
-    modalContainerStylePaddingBottom: DimensionValue | undefined;
+    modalContainerStyleMarginTop: MarginPaddingValue;
+    modalContainerStyleMarginBottom: MarginPaddingValue;
+    modalContainerStylePaddingTop: MarginPaddingValue;
+    modalContainerStylePaddingBottom: MarginPaddingValue;
     insets: EdgeInsets;
 };
 
@@ -589,16 +603,6 @@ function getModalPaddingStyles({
     };
 }
 
-/**
- * Takes fontStyle and fontWeight and returns the correct fontFamily
- */
-function getFontFamilyMonospace({fontStyle, fontWeight}: TextStyle): string {
-    const italic = fontStyle === 'italic' && FontUtils.fontFamily.platform.MONOSPACE_ITALIC;
-    const bold = fontWeight === 'bold' && FontUtils.fontFamily.platform.MONOSPACE_BOLD;
-    const italicBold = italic && bold && FontUtils.fontFamily.platform.MONOSPACE_BOLD_ITALIC;
-
-    return italicBold || bold || italic || FontUtils.fontFamily.platform.MONOSPACE;
-}
 /**
  * Returns the font size for the HTML code tag renderer.
  */
@@ -660,6 +664,15 @@ function getPaddingLeft(paddingLeft: number): ViewStyle {
     };
 }
 
+/**
+ * Get variable padding-right as style
+ */
+function getPaddingRight(paddingRight: number): ViewStyle {
+    return {
+        paddingRight,
+    };
+}
+
 /**
  * Checks to see if the iOS device has safe areas or not
  */
@@ -689,7 +702,7 @@ function getMinimumHeight(minHeight: number): ViewStyle {
 /**
  * Get minimum width as style
  */
-function getMinimumWidth(minWidth: number): ViewStyle {
+function getMinimumWidth(minWidth: number): ViewStyle & ImageStyle {
     return {
         minWidth,
     };
@@ -770,37 +783,32 @@ function getHorizontalStackedOverlayAvatarStyle(oneAvatarSize: AvatarSize, oneAv
 /**
  * Gets the correct size for the empty state background image based on screen dimensions
  */
-function getReportWelcomeBackgroundImageStyle(isSmallScreenWidth: boolean, isMoneyOrTaskReport = false): ImageStyle {
-    const emptyStateBackground = isMoneyOrTaskReport ? CONST.EMPTY_STATE_BACKGROUND.MONEY_OR_TASK_REPORT : CONST.EMPTY_STATE_BACKGROUND;
-
+function getReportWelcomeBackgroundImageStyle(isSmallScreenWidth: boolean): ImageStyle {
     if (isSmallScreenWidth) {
         return {
-            height: emptyStateBackground.SMALL_SCREEN.IMAGE_HEIGHT,
-            width: '100%',
             position: 'absolute',
+            bottom: 0,
+            height: CONST.EMPTY_STATE_BACKGROUND.SMALL_SCREEN.IMAGE_HEIGHT,
+            width: '100%',
         };
     }
 
     return {
-        height: emptyStateBackground.WIDE_SCREEN.IMAGE_HEIGHT,
-        width: '100%',
         position: 'absolute',
+        bottom: 0,
+        height: CONST.EMPTY_STATE_BACKGROUND.WIDE_SCREEN.IMAGE_HEIGHT,
+        width: '100%',
     };
 }
 
 /**
- * Gets the correct top margin size for the chat welcome message based on screen dimensions
+ * Gets the style for the container of the empty state background image that overlap the created report action
  */
-function getReportWelcomeTopMarginStyle(isSmallScreenWidth: boolean, isMoneyOrTaskReport = false): ViewStyle {
-    const emptyStateBackground = isMoneyOrTaskReport ? CONST.EMPTY_STATE_BACKGROUND.MONEY_OR_TASK_REPORT : CONST.EMPTY_STATE_BACKGROUND;
-    if (isSmallScreenWidth) {
-        return {
-            marginTop: emptyStateBackground.SMALL_SCREEN.VIEW_HEIGHT,
-        };
-    }
-
+function getReportWelcomeBackgroundContainerStyle(): ViewStyle {
     return {
-        marginTop: emptyStateBackground.WIDE_SCREEN.VIEW_HEIGHT,
+        position: 'absolute',
+        top: CONST.EMPTY_STATE_BACKGROUND.OVERLAP,
+        width: '100%',
     };
 }
 
@@ -822,23 +830,6 @@ function getLineHeightStyle(lineHeight: number): TextStyle {
     };
 }
 
-/**
- * Gets the correct size for the empty state container based on screen dimensions
- */
-function getReportWelcomeContainerStyle(isSmallScreenWidth: boolean, isMoneyOrTaskReport = false, shouldShowAnimatedBackground = true): ViewStyle {
-    const emptyStateBackground = isMoneyOrTaskReport ? CONST.EMPTY_STATE_BACKGROUND.MONEY_OR_TASK_REPORT : CONST.EMPTY_STATE_BACKGROUND;
-    const baseStyles: ViewStyle = {
-        display: 'flex',
-        justifyContent: 'space-between',
-    };
-
-    if (shouldShowAnimatedBackground) {
-        baseStyles.minHeight = isSmallScreenWidth ? emptyStateBackground.SMALL_SCREEN.CONTAINER_MINHEIGHT : emptyStateBackground.WIDE_SCREEN.CONTAINER_MINHEIGHT;
-    }
-
-    return baseStyles;
-}
-
 type GetBaseAutoCompleteSuggestionContainerStyleParams = {
     left: number;
     bottom: number;
@@ -850,7 +841,7 @@ type GetBaseAutoCompleteSuggestionContainerStyleParams = {
  */
 function getBaseAutoCompleteSuggestionContainerStyle({left, bottom, width}: GetBaseAutoCompleteSuggestionContainerStyleParams): ViewStyle {
     return {
-        ...positioning.pFixed,
+        position: 'absolute',
         bottom,
         left,
         width,
@@ -868,11 +859,7 @@ function getAutoCompleteSuggestionContainerStyle(itemsHeight: number): ViewStyle
     const borderWidth = 2;
     const height = itemsHeight + 2 * CONST.AUTO_COMPLETE_SUGGESTER.SUGGESTER_INNER_PADDING + (shouldPreventScroll ? borderWidth : 0);
 
-    // The suggester is positioned absolutely within the component that includes the input and RecipientLocalTime view (for non-expanded mode only). To position it correctly,
-    // 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 + CONST.AUTO_COMPLETE_SUGGESTER.SUGGESTER_PADDING + (shouldPreventScroll ? 0 : borderWidth)),
         height,
         minHeight: CONST.AUTO_COMPLETE_SUGGESTER.SUGGESTION_ROW_HEIGHT,
     };
@@ -989,11 +976,9 @@ function getColorStyle(color: string): TextColorStyle {
  */
 function getCheckboxPressableStyle(borderRadius = 6): ViewStyle {
     return {
-        padding: 2,
         justifyContent: 'center',
         alignItems: 'center',
-        // eslint-disable-next-line object-shorthand
-        borderRadius: borderRadius,
+        borderRadius,
     };
 }
 
@@ -1089,6 +1074,44 @@ function getMultiGestureCanvasContainerStyle(canvasWidth: number): ViewStyle {
     };
 }
 
+function percentage(percentageValue: number, totalValue: number) {
+    return (totalValue / 100) * percentageValue;
+}
+
+/**
+ * Calculates the width in px of characters from 0 to 9 and '.'
+ */
+function getCharacterWidth(character: string) {
+    const defaultWidth = 8;
+    if (character === '.') {
+        return percentage(25, defaultWidth);
+    }
+    const number = +character;
+
+    // The digit '1' is 62.5% smaller than the default width
+    if (number === 1) {
+        return percentage(62.5, defaultWidth);
+    }
+    if (number >= 2 && number <= 5) {
+        return defaultWidth;
+    }
+    if (number === 7) {
+        return percentage(87.5, defaultWidth);
+    }
+    if ((number >= 6 && number <= 9) || number === 0) {
+        return percentage(112.5, defaultWidth);
+    }
+    return defaultWidth;
+}
+
+function getAmountWidth(amount: string): number {
+    let width = 0;
+    for (let i = 0; i < amount.length; i++) {
+        width += getCharacterWidth(amount.charAt(i));
+    }
+    return width;
+}
+
 const staticStyleUtils = {
     positioning,
     combineStyles,
@@ -1105,6 +1128,7 @@ const staticStyleUtils = {
     getBackgroundColorStyle,
     getBackgroundColorWithOpacityStyle,
     getPaddingLeft,
+    getPaddingRight,
     hasSafeAreas,
     getHeight,
     getMinimumHeight,
@@ -1116,8 +1140,7 @@ const staticStyleUtils = {
     getHorizontalStackedAvatarStyle,
     getHorizontalStackedOverlayAvatarStyle,
     getReportWelcomeBackgroundImageStyle,
-    getReportWelcomeTopMarginStyle,
-    getReportWelcomeContainerStyle,
+    getReportWelcomeBackgroundContainerStyle,
     getBaseAutoCompleteSuggestionContainerStyle,
     getBorderColorStyle,
     getCheckboxPressableStyle,
@@ -1131,7 +1154,6 @@ const staticStyleUtils = {
     getEmojiPickerStyle,
     getEmojiReactionBubbleTextStyle,
     getTransformScaleStyle,
-    getFontFamilyMonospace,
     getCodeFontSize,
     getFontSizeStyle,
     getLineHeightStyle,
@@ -1160,6 +1182,10 @@ const staticStyleUtils = {
     getSignInBgStyles,
     getIconWidthAndHeightStyle,
     getButtonStyleWithIcon,
+    getCharacterWidth,
+    getAmountWidth,
+    getBorderRadiusStyle,
+    getHighResolutionInfoWrapperStyle,
 };
 
 const createStyleUtils = (theme: ThemeColors, styles: ThemeStyles) => ({
@@ -1202,16 +1228,12 @@ const createStyleUtils = (theme: ThemeColors, styles: ThemeStyles) => ({
      */
     getAutoGrowHeightInputStyle: (textInputHeight: number, maxHeight: number): ViewStyle => {
         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,
@@ -1240,17 +1262,11 @@ const createStyleUtils = (theme: ThemeColors, styles: ThemeStyles) => ({
     getBadgeColorStyle: (isSuccess: boolean, isError: boolean, isPressed = false, isAdHoc = false): ViewStyle => {
         if (isSuccess) {
             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 (isError) {
-            // 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 {};
@@ -1309,8 +1325,7 @@ const createStyleUtils = (theme: ThemeColors, styles: ThemeStyles) => ({
         borderWidth: 2,
         justifyContent: 'center',
         alignItems: 'center',
-        // eslint-disable-next-line object-shorthand
-        borderRadius: borderRadius,
+        borderRadius,
     }),
 
     /**
@@ -1327,8 +1342,6 @@ const createStyleUtils = (theme: ThemeColors, styles: ThemeStyles) => ({
             ...styles.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 : {}),
@@ -1338,13 +1351,13 @@ const createStyleUtils = (theme: ThemeColors, styles: ThemeStyles) => ({
     /**
      * Get the style for the AM and PM buttons in the TimePicker
      */
-    getStatusAMandPMButtonStyle: (amPmValue: string): {styleForAM: ViewStyle; styleForPM: ViewStyle} => {
+    getStatusAMandPMButtonStyle: (amPmValue: string): {styleForAM: StyleProp<ViewStyle>; styleForPM: StyleProp<ViewStyle>} => {
         const computedStyleForAM: ViewStyle = amPmValue !== CONST.TIME_PERIOD.AM ? {backgroundColor: theme.componentBG} : {};
         const computedStyleForPM: ViewStyle = amPmValue !== CONST.TIME_PERIOD.PM ? {backgroundColor: theme.componentBG} : {};
 
         return {
-            styleForAM: [styles.timePickerWidth100, computedStyleForAM] as unknown as ViewStyle,
-            styleForPM: [styles.timePickerWidth100, computedStyleForPM] as unknown as ViewStyle,
+            styleForAM: [styles.timePickerWidth100, computedStyleForAM],
+            styleForPM: [styles.timePickerWidth100, computedStyleForPM],
         };
     },
 
@@ -1394,8 +1407,6 @@ const createStyleUtils = (theme: ThemeColors, styles: ThemeStyles) => ({
 
     getGoogleListViewStyle: (shouldDisplayBorder: boolean): ViewStyle => {
         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,
@@ -1461,35 +1472,29 @@ const createStyleUtils = (theme: ThemeColors, styles: ThemeStyles) => ({
     /**
      * Generate the wrapper styles for the mini ReportActionContextMenu.
      */
-    getMiniReportActionContextMenuWrapperStyle: (isReportActionItemGrouped: boolean): ViewStyle =>
-        // 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
-        ({
-            ...(isReportActionItemGrouped ? positioning.tn8 : positioning.tn4),
-            ...positioning.r4,
-            ...styles.cursorDefault,
-            ...styles.userSelectNone,
-            overflowAnchor: 'none',
-            position: 'absolute',
-            zIndex: 8,
-        }),
+    getMiniReportActionContextMenuWrapperStyle: (isReportActionItemGrouped: boolean): ViewStyle => ({
+        ...(isReportActionItemGrouped ? positioning.tn8 : positioning.tn4),
+        ...positioning.r4,
+        ...styles.cursorDefault,
+        ...styles.userSelectNone,
+        overflowAnchor: 'none',
+        position: 'absolute',
+        zIndex: 8,
+    }),
 
     /**
      * Generate the styles for the ReportActionItem wrapper view.
      */
-    getReportActionItemStyle: (isHovered = false, isClickable = false): ViewStyle =>
-        // 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
-        ({
-            display: 'flex',
-            justifyContent: 'space-between',
-            backgroundColor: isHovered
-                ? theme.hoverComponentBG
-                : // Warning: Setting this to a non-transparent color will cause unread indicator to break on Android
-                  theme.transparent,
-            opacity: 1,
-            ...(isClickable ? styles.cursorPointer : styles.cursorInitial),
-        }),
+    getReportActionItemStyle: (isHovered = false, isClickable = false): ViewStyle => ({
+        display: 'flex',
+        justifyContent: 'space-between',
+        backgroundColor: isHovered
+            ? theme.hoverComponentBG
+            : // Warning: Setting this to a non-transparent color will cause unread indicator to break on Android
+              theme.transparent,
+        opacity: 1,
+        ...(isClickable ? styles.cursorPointer : styles.cursorInitial),
+    }),
 
     /**
      * Determines the theme color for a modal based on the app's background color,
@@ -1513,38 +1518,39 @@ const createStyleUtils = (theme: ThemeColors, styles: ThemeStyles) => ({
 
     getZoomCursorStyle: (isZoomed: boolean, isDragging: boolean): ViewStyle => {
         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;
     },
 
-    getSearchTableColumnStyles: (columnName: string): ViewStyle => {
+    getSearchTableColumnStyles: (columnName: string, shouldExtendDateColumn = false): ViewStyle => {
         let columnWidth;
         switch (columnName) {
-            case CONST.SEARCH_TABLE_COLUMNS.DATE:
-                columnWidth = getWidthStyle(variables.w44);
+            case CONST.SEARCH.TABLE_COLUMNS.RECEIPT:
+                columnWidth = {...getWidthStyle(variables.w36), ...styles.alignItemsCenter};
                 break;
-            case CONST.SEARCH_TABLE_COLUMNS.MERCHANT:
-                columnWidth = styles.flex1;
+            case CONST.SEARCH.TABLE_COLUMNS.DATE:
+                columnWidth = getWidthStyle(shouldExtendDateColumn ? variables.w92 : variables.w52);
                 break;
-            case CONST.SEARCH_TABLE_COLUMNS.FROM:
+            case CONST.SEARCH.TABLE_COLUMNS.MERCHANT:
+            case CONST.SEARCH.TABLE_COLUMNS.FROM:
+            case CONST.SEARCH.TABLE_COLUMNS.TO:
                 columnWidth = styles.flex1;
                 break;
-            case CONST.SEARCH_TABLE_COLUMNS.TO:
-                columnWidth = styles.flex1;
+            case CONST.SEARCH.TABLE_COLUMNS.CATEGORY:
+            case CONST.SEARCH.TABLE_COLUMNS.TAG:
+                columnWidth = {...getWidthStyle(variables.w36), ...styles.flex1};
                 break;
-            case CONST.SEARCH_TABLE_COLUMNS.TOTAL:
+            case CONST.SEARCH.TABLE_COLUMNS.TAX_AMOUNT:
+            case CONST.SEARCH.TABLE_COLUMNS.TOTAL_AMOUNT:
                 columnWidth = {...getWidthStyle(variables.w96), ...styles.alignItemsEnd};
                 break;
-            case CONST.SEARCH_TABLE_COLUMNS.TYPE:
-                columnWidth = {...getWidthStyle(variables.w28), ...styles.alignItemsCenter};
+            case CONST.SEARCH.TABLE_COLUMNS.TYPE:
+                columnWidth = {...getWidthStyle(variables.w20), ...styles.alignItemsCenter};
                 break;
-            case CONST.SEARCH_TABLE_COLUMNS.ACTION:
-                columnWidth = getWidthStyle(variables.w80);
+            case CONST.SEARCH.TABLE_COLUMNS.ACTION:
+                columnWidth = {...getWidthStyle(variables.w80), ...styles.alignItemsCenter};
                 break;
             default:
                 columnWidth = styles.flex1;
@@ -1553,6 +1559,10 @@ const createStyleUtils = (theme: ThemeColors, styles: ThemeStyles) => ({
         return columnWidth;
     },
 
+    getTextOverflowStyle: (overflow: string): TextStyle => ({
+        textOverflow: overflow,
+    }),
+
     /**
      * Returns container styles for showing the icons in MultipleAvatars/SubscriptAvatar
      */
@@ -1624,13 +1634,33 @@ const createStyleUtils = (theme: ThemeColors, styles: ThemeStyles) => ({
      * 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.
      */
-    getCharacterPadding: (prefix: string): number => prefix.length * 10,
+    getCharacterPadding: (prefix: string): number => {
+        let padding = 0;
+        prefix.split('').forEach((char) => {
+            if (char.match(/[a-z]/i) && char === char.toUpperCase()) {
+                padding += 11;
+            } else {
+                padding += 8;
+            }
+        });
+
+        return padding;
+    },
 
     // TODO: remove it when we'll implement the callback to handle this toggle in Expensify/Expensify#368335
     getWorkspaceWorkflowsOfflineDescriptionStyle: (descriptionTextStyle: TextStyle | TextStyle[]): StyleProp<TextStyle> => ({
         ...StyleSheet.flatten(descriptionTextStyle),
         opacity: styles.opacitySemiTransparent.opacity,
     }),
+
+    getTripReservationIconContainer: (isSmallIcon: boolean): StyleProp<ViewStyle> => ({
+        width: isSmallIcon ? variables.avatarSizeSmallNormal : variables.avatarSizeNormal,
+        height: isSmallIcon ? variables.avatarSizeSmallNormal : variables.avatarSizeNormal,
+        borderRadius: isSmallIcon ? variables.avatarSizeSmallNormal : variables.componentBorderRadiusXLarge,
+        backgroundColor: theme.border,
+        alignItems: 'center',
+        justifyContent: 'center',
+    }),
 });
 
 type StyleUtilsType = ReturnType<typeof createStyleUtils>;
diff --git a/src/styles/utils/overflowAuto/index.ts b/src/styles/utils/overflowAuto/index.ts
index 670a0b9643eb..db55b65b8949 100644
--- a/src/styles/utils/overflowAuto/index.ts
+++ b/src/styles/utils/overflowAuto/index.ts
@@ -1,12 +1,10 @@
-import type {ViewStyle} from 'react-native';
 import type OverflowAutoStyles from './types';
 
 /**
  * Web-only style.
  */
 const overflowAuto: OverflowAutoStyles = {
-    // NOTE: asserting "overflow" to a valid type, because it isn't possible to augment "overflow".
-    overflow: 'auto' as ViewStyle['overflow'],
+    overflow: 'auto',
 };
 
 export default overflowAuto;
diff --git a/src/styles/utils/positioning.ts b/src/styles/utils/positioning.ts
index 5e0169990499..c4affba653ac 100644
--- a/src/styles/utils/positioning.ts
+++ b/src/styles/utils/positioning.ts
@@ -15,13 +15,15 @@ export default {
      * Web-only style.
      */
     pFixed: {
-        // NOTE: asserting "position" to a valid type, because it isn't possible to augment "position".
-        position: 'fixed' as ViewStyle['position'],
+        position: 'fixed',
     },
 
     t0: {
         top: 0,
     },
+    t5: {
+        top: 20,
+    },
     tn4: {
         top: -16,
     },
@@ -52,6 +54,9 @@ export default {
     r8: {
         right: 32,
     },
+    rn3: {
+        right: -12,
+    },
     b0: {
         bottom: 0,
     },
diff --git a/src/styles/utils/sizing.ts b/src/styles/utils/sizing.ts
index ec9aa1ce4c5c..f4be70391eb5 100644
--- a/src/styles/utils/sizing.ts
+++ b/src/styles/utils/sizing.ts
@@ -6,6 +6,9 @@ import type {ViewStyle} from 'react-native';
  * https://getbootstrap.com/docs/5.0/utilities/sizing/
  */
 export default {
+    h0: {
+        height: 0,
+    },
     h100: {
         height: '100%',
     },
@@ -38,6 +41,21 @@ export default {
         minHeight: '100%',
     },
 
+    mnh20: {
+        minHeight: 80,
+    },
+    mnh40: {
+        minHeight: 40,
+    },
+
+    mnh0: {
+        minHeight: 0,
+    },
+
+    mnw0: {
+        minWidth: 0,
+    },
+
     mnw2: {
         minWidth: 8,
     },
diff --git a/src/styles/utils/spacing.ts b/src/styles/utils/spacing.ts
index 4584a38e8171..92edd6e7fa18 100644
--- a/src/styles/utils/spacing.ts
+++ b/src/styles/utils/spacing.ts
@@ -275,6 +275,10 @@ export default {
         marginTop: -80,
     },
 
+    mbAuto: {
+        marginBottom: 'auto',
+    },
+
     mb0: {
         marginBottom: 0,
     },
@@ -283,6 +287,10 @@ export default {
         marginBottom: 4,
     },
 
+    mb1half: {
+        marginBottom: 6,
+    },
+
     mb2: {
         marginBottom: 8,
     },
@@ -369,6 +377,10 @@ export default {
         padding: 20,
     },
 
+    p6: {
+        padding: 24,
+    },
+
     p8: {
         padding: 32,
     },
@@ -393,6 +405,10 @@ export default {
         paddingVertical: 4,
     },
 
+    pv1half: {
+        paddingVertical: 6,
+    },
+
     pv2: {
         paddingVertical: 8,
     },
@@ -541,6 +557,10 @@ export default {
         paddingTop: 4,
     },
 
+    pt1half: {
+        paddingTop: 6,
+    },
+
     pt2: {
         paddingTop: 8,
     },
@@ -593,6 +613,10 @@ export default {
         paddingBottom: 20,
     },
 
+    pb6: {
+        paddingBottom: 24,
+    },
+
     pb8: {
         paddingBottom: 32,
     },
@@ -601,6 +625,10 @@ export default {
         paddingBottom: 56,
     },
 
+    pb10: {
+        paddingBottom: 40,
+    },
+
     pb20: {
         paddingBottom: 80,
     },
@@ -640,4 +668,12 @@ export default {
     rowGap4: {
         rowGap: 16,
     },
+
+    minHeight5: {
+        minHeight: 20,
+    },
+
+    minHeight65: {
+        minHeight: 260,
+    },
 } satisfies Record<string, ViewStyle>;
diff --git a/src/styles/variables.ts b/src/styles/variables.ts
index 7ab469af9533..c0c058352d00 100644
--- a/src/styles/variables.ts
+++ b/src/styles/variables.ts
@@ -63,7 +63,7 @@ export default {
     fontSizeXLarge: 22,
     fontSizeXXLarge: 28,
     fontSizeXXXLarge: 32,
-    fontSizeNormalHeight: getValueUsingPixelRatio(21, 28),
+    fontSizeNormalHeight: getValueUsingPixelRatio(20, 28),
     fontSizeEReceiptLarge: 44,
     fontSizeSignInHeroLarge: 48,
     fontSizeSignInHeroMedium: 38,
@@ -73,6 +73,7 @@ export default {
     lineHeightHero: 45,
     iconSizeXXXSmall: 4,
     iconSizeXXSmall: 8,
+    iconSizeXSmall: 10,
     iconSizeExtraSmall: 12,
     iconSizeSmall: 16,
     iconSizeMedium: 18,
@@ -81,10 +82,11 @@ export default {
     iconSizeXLarge: 28,
     iconSizeExtraLarge: 40,
     iconSizeSuperLarge: 60,
-    iconSizeUltraLarge: 120,
+    iconSizeUltraLarge: 80,
     iconBottomBar: 24,
     sidebarAvatarSize: 28,
     iconHeader: 48,
+    iconSection: 68,
     emojiSize: 20,
     emojiLineHeight: 28,
     iouAmountTextSize: 40,
@@ -127,10 +129,13 @@ export default {
     borderTopWidth: 1,
     emptyLHNIconWidth: 24, // iconSizeSmall + 4*2 horizontal margin
     emptyLHNIconHeight: 16,
-    emptyWorkspaceIconWidth: 84,
-    emptyWorkspaceIconHeight: 84,
+    emptySelectionListIconWidth: 120,
+    emptySelectionListIconHeight: 125,
+    emptyListIconWidth: 136,
+    emptyListIconHeight: 144,
     modalTopIconWidth: 200,
     modalTopIconHeight: 164,
+    modalTopMediumIconHeight: 203,
     modalTopBigIconHeight: 244,
     modalWordmarkWidth: 154,
     modalWordmarkHeight: 37,
@@ -178,6 +183,8 @@ export default {
     eReceiptMCCHeightWidth: 40,
     eReceiptIconHeightSmall: 65,
     eReceiptIconWidthSmall: 46,
+    eReceiptIconHeightXSmall: 24,
+    eReceiptIconWidthXSmall: 20,
     eReceiptMCCHeightWidthSmall: 26,
     eReceiptIconHeightMedium: 82,
     eReceiptIconWidthMedium: 59,
@@ -187,6 +194,8 @@ export default {
     eReceiptBGHeight: 540,
     eReceiptBGHWidth: 335,
     eReceiptTextContainerWidth: 263,
+    receiptPlaceholderIconWidth: 80,
+    receiptPlaceholderIconHeight: 80,
     reportPreviewMaxWidth: 335,
     reportActionImagesSingleImageHeight: 147,
     reportActionImagesDoubleImageHeight: 138,
@@ -201,9 +210,11 @@ export default {
     oldDotWireframeIconWidth: 263.38,
     oldDotWireframeIconHeight: 143.28,
     sectionIllustrationHeight: 220,
+    restrictedActionIllustrationHeight: 136,
     photoUploadPopoverWidth: 335,
     onboardingModalWidth: 500,
     welcomeVideoDelay: 1000,
+    explanationModalDelay: 2000,
 
     // The height of the empty list is 14px (2px for borders and 12px for vertical padding)
     // This is calculated based on the values specified in the 'getGoogleListViewStyle' function of the 'StyleUtils' utility
@@ -219,6 +230,10 @@ export default {
 
     cardPreviewHeight: 148,
     cardPreviewWidth: 235,
+    cardIconWidth: 40,
+    cardIconHeight: 25.29,
+    cardBorderRadius: 2.35,
+
     cardNameWidth: 156,
     holdMenuIconSize: 64,
     updateAnimationW: 390,
@@ -230,9 +245,27 @@ export default {
     mushroomTopHatHeight: 128,
     bankButtonMargin: 23,
     textInputAutoGrowMaxHeight: 115,
+    eReceiptBackgroundImageMinWidth: 217,
+
+    searchTypeColumnWidth: 52,
+
+    composerTooltipShiftHorizontal: 10,
+    composerTooltipShiftVertical: -10,
 
+    h20: 20,
+    h28: 28,
+    h36: 36,
+    h112: 112,
+    h172: 172,
+    w20: 20,
     w28: 28,
+    w36: 36,
+    w40: 40,
     w44: 44,
+    w52: 52,
     w80: 80,
+    w92: 92,
     w96: 96,
+    w184: 184,
+    w191: 191,
 } as const;
diff --git a/src/types/form/AddDebitCardForm.ts b/src/types/form/AddDebitCardForm.ts
deleted file mode 100644
index b5badf0bb7f3..000000000000
--- a/src/types/form/AddDebitCardForm.ts
+++ /dev/null
@@ -1,35 +0,0 @@
-import type {ValueOf} from 'type-fest';
-import type Form from './Form';
-
-const INPUT_IDS = {
-    SETUP_COMPLETE: 'setupComplete',
-    NAME_ON_CARD: 'nameOnCard',
-    CARD_NUMBER: 'cardNumber',
-    EXPIRATION_DATE: 'expirationDate',
-    SECURITY_CODE: 'securityCode',
-    ADDRESS_STREET: 'addressStreet',
-    ADDRESS_ZIP_CODE: 'addressZipCode',
-    ADDRESS_STATE: 'addressState',
-    ACCEPT_TERMS: 'acceptTerms',
-} as const;
-
-type InputID = ValueOf<typeof INPUT_IDS>;
-
-type AddDebitCardForm = Form<
-    InputID,
-    {
-        /** Whether the form has been submitted */
-        [INPUT_IDS.SETUP_COMPLETE]: boolean;
-        [INPUT_IDS.NAME_ON_CARD]: string;
-        [INPUT_IDS.CARD_NUMBER]: string;
-        [INPUT_IDS.EXPIRATION_DATE]: string;
-        [INPUT_IDS.SECURITY_CODE]: string;
-        [INPUT_IDS.ADDRESS_STREET]: string;
-        [INPUT_IDS.ADDRESS_ZIP_CODE]: string;
-        [INPUT_IDS.ADDRESS_STATE]: string;
-        [INPUT_IDS.ACCEPT_TERMS]: string;
-    }
->;
-
-export type {AddDebitCardForm};
-export default INPUT_IDS;
diff --git a/src/types/form/AddPaymentCardForm.ts b/src/types/form/AddPaymentCardForm.ts
new file mode 100644
index 000000000000..580186f64f3d
--- /dev/null
+++ b/src/types/form/AddPaymentCardForm.ts
@@ -0,0 +1,38 @@
+import type {ValueOf} from 'type-fest';
+import type CONST from '@src/CONST';
+import type Form from './Form';
+
+const INPUT_IDS = {
+    SETUP_COMPLETE: 'setupComplete',
+    NAME_ON_CARD: 'nameOnCard',
+    CARD_NUMBER: 'cardNumber',
+    EXPIRATION_DATE: 'expirationDate',
+    SECURITY_CODE: 'securityCode',
+    ADDRESS_STREET: 'addressStreet',
+    ADDRESS_ZIP_CODE: 'addressZipCode',
+    ADDRESS_STATE: 'addressState',
+    ACCEPT_TERMS: 'acceptTerms',
+    CURRENCY: 'currency',
+} as const;
+
+type InputID = ValueOf<typeof INPUT_IDS>;
+
+type AddPaymentCardForm = Form<
+    InputID,
+    {
+        /** Whether the form has been submitted */
+        [INPUT_IDS.SETUP_COMPLETE]: boolean;
+        [INPUT_IDS.NAME_ON_CARD]: string;
+        [INPUT_IDS.CARD_NUMBER]: string;
+        [INPUT_IDS.EXPIRATION_DATE]: string;
+        [INPUT_IDS.SECURITY_CODE]: string;
+        [INPUT_IDS.ADDRESS_STREET]: string;
+        [INPUT_IDS.ADDRESS_ZIP_CODE]: string;
+        [INPUT_IDS.ADDRESS_STATE]: string;
+        [INPUT_IDS.ACCEPT_TERMS]: string;
+        [INPUT_IDS.CURRENCY]: ValueOf<typeof CONST.PAYMENT_CARD_CURRENCY>;
+    }
+>;
+
+export type {AddPaymentCardForm};
+export default INPUT_IDS;
diff --git a/src/types/form/ChangeBillingCurrencyForm.ts b/src/types/form/ChangeBillingCurrencyForm.ts
new file mode 100644
index 000000000000..0f68fdabc555
--- /dev/null
+++ b/src/types/form/ChangeBillingCurrencyForm.ts
@@ -0,0 +1,21 @@
+import type {ValueOf} from 'type-fest';
+import type CONST from '@src/CONST';
+import type Form from './Form';
+
+const INPUT_IDS = {
+    CURRENCY: 'currency',
+    SECURITY_CODE: 'securityCode',
+} as const;
+
+type InputID = ValueOf<typeof INPUT_IDS>;
+
+type ChangeBillingCurrencyForm = Form<
+    InputID,
+    {
+        [INPUT_IDS.CURRENCY]: ValueOf<typeof CONST.PAYMENT_CARD_CURRENCY>;
+        [INPUT_IDS.SECURITY_CODE]: string;
+    }
+>;
+
+export type {ChangeBillingCurrencyForm};
+export default INPUT_IDS;
diff --git a/src/types/form/EditExpensifyCardLimitForm.ts b/src/types/form/EditExpensifyCardLimitForm.ts
new file mode 100644
index 000000000000..8958999cfd7c
--- /dev/null
+++ b/src/types/form/EditExpensifyCardLimitForm.ts
@@ -0,0 +1,13 @@
+import type {ValueOf} from 'type-fest';
+import type Form from './Form';
+
+const INPUT_IDS = {
+    LIMIT: 'limit',
+} as const;
+
+type InputID = ValueOf<typeof INPUT_IDS>;
+
+type EditExpensifyCardLimitForm = Form<InputID, {[INPUT_IDS.LIMIT]: string}>;
+
+export type {EditExpensifyCardLimitForm};
+export default INPUT_IDS;
diff --git a/src/types/form/EditExpensifyCardNameForm.ts b/src/types/form/EditExpensifyCardNameForm.ts
new file mode 100644
index 000000000000..197ba70801b6
--- /dev/null
+++ b/src/types/form/EditExpensifyCardNameForm.ts
@@ -0,0 +1,13 @@
+import type {ValueOf} from 'type-fest';
+import type Form from './Form';
+
+const INPUT_IDS = {
+    NAME: 'name',
+} as const;
+
+type InputID = ValueOf<typeof INPUT_IDS>;
+
+type EditExpensifyCardNameForm = Form<InputID, {[INPUT_IDS.NAME]: string}>;
+
+export type {EditExpensifyCardNameForm};
+export default INPUT_IDS;
diff --git a/src/types/form/FeedbackSurveyForm.ts b/src/types/form/FeedbackSurveyForm.ts
new file mode 100644
index 000000000000..b8cd68fd6630
--- /dev/null
+++ b/src/types/form/FeedbackSurveyForm.ts
@@ -0,0 +1,19 @@
+import type {ValueOf} from 'type-fest';
+import type {FeedbackSurveyOptionID} from '@src/CONST';
+import type Form from './Form';
+
+const INPUT_IDS = {
+    REASON: 'reason',
+    NOTE: 'note',
+} as const;
+
+type FeedbackSurveyForm = Form<
+    ValueOf<typeof INPUT_IDS>,
+    {
+        [INPUT_IDS.REASON]: FeedbackSurveyOptionID;
+        [INPUT_IDS.NOTE]: string;
+    }
+>;
+
+export type {FeedbackSurveyForm};
+export default INPUT_IDS;
diff --git a/src/types/form/IssueNewExpensifyCardForm.ts b/src/types/form/IssueNewExpensifyCardForm.ts
new file mode 100644
index 000000000000..9d662a6f47b3
--- /dev/null
+++ b/src/types/form/IssueNewExpensifyCardForm.ts
@@ -0,0 +1,20 @@
+import type {ValueOf} from 'type-fest';
+import type Form from './Form';
+
+const INPUT_IDS = {
+    CARD_TITLE: 'cardTitle',
+    LIMIT: 'limit',
+} as const;
+
+type InputID = ValueOf<typeof INPUT_IDS>;
+
+type IssueNewExpensifyCardForm = Form<
+    InputID,
+    {
+        [INPUT_IDS.CARD_TITLE]: string;
+        [INPUT_IDS.LIMIT]: string;
+    }
+>;
+
+export type {IssueNewExpensifyCardForm};
+export default INPUT_IDS;
diff --git a/src/types/form/MoneyRequestCompanyInfoForm.ts b/src/types/form/MoneyRequestCompanyInfoForm.ts
new file mode 100644
index 000000000000..94ff6867e75d
--- /dev/null
+++ b/src/types/form/MoneyRequestCompanyInfoForm.ts
@@ -0,0 +1,20 @@
+import type {ValueOf} from 'type-fest';
+import type Form from './Form';
+
+const INPUT_IDS = {
+    COMPANY_NAME: 'companyName',
+    COMPANY_WEBSITE: 'companyWebsite',
+} as const;
+
+type InputID = ValueOf<typeof INPUT_IDS>;
+
+type MoneyRequestCompanyInfoForm = Form<
+    InputID,
+    {
+        [INPUT_IDS.COMPANY_NAME]: string;
+        [INPUT_IDS.COMPANY_WEBSITE]: string;
+    }
+>;
+
+export type {MoneyRequestCompanyInfoForm};
+export default INPUT_IDS;
diff --git a/src/types/form/NetSuiteCustomFieldForm.ts b/src/types/form/NetSuiteCustomFieldForm.ts
new file mode 100644
index 000000000000..efbf844bd89f
--- /dev/null
+++ b/src/types/form/NetSuiteCustomFieldForm.ts
@@ -0,0 +1,29 @@
+import type {ValueOf} from 'type-fest';
+import type {NetSuiteCustomFieldMapping} from '@src/types/onyx/Policy';
+import type Form from './Form';
+
+const INPUT_IDS = {
+    INTERNAL_ID: 'internalID',
+    MAPPING: 'mapping',
+    LIST_NAME: 'listName',
+    SEGMENT_NAME: 'segmentName',
+    TRANSACTION_FIELD_ID: 'transactionFieldID',
+    SCRIPT_ID: 'scriptID',
+} as const;
+
+type InputID = ValueOf<typeof INPUT_IDS>;
+
+type NetSuiteCustomFieldForm = Form<
+    InputID,
+    {
+        [INPUT_IDS.INTERNAL_ID]: string;
+        [INPUT_IDS.MAPPING]: NetSuiteCustomFieldMapping;
+        [INPUT_IDS.LIST_NAME]: string;
+        [INPUT_IDS.SEGMENT_NAME]: string;
+        [INPUT_IDS.TRANSACTION_FIELD_ID]: string;
+        [INPUT_IDS.SCRIPT_ID]: string;
+    }
+>;
+
+export type {NetSuiteCustomFieldForm};
+export default INPUT_IDS;
diff --git a/src/types/form/NetSuiteCustomFormIDForm.ts b/src/types/form/NetSuiteCustomFormIDForm.ts
new file mode 100644
index 000000000000..eb1ea8625075
--- /dev/null
+++ b/src/types/form/NetSuiteCustomFormIDForm.ts
@@ -0,0 +1,16 @@
+import type {ValueOf} from 'type-fest';
+import type CONST from '@src/CONST';
+import type Form from './Form';
+
+type InputID = ValueOf<typeof CONST.NETSUITE_EXPENSE_TYPE>;
+
+type NetSuiteCustomFormIDForm = Form<
+    InputID,
+    {
+        [CONST.NETSUITE_EXPENSE_TYPE.REIMBURSABLE]: string;
+        [CONST.NETSUITE_EXPENSE_TYPE.NON_REIMBURSABLE]: string;
+    }
+>;
+
+// eslint-disable-next-line import/prefer-default-export
+export type {NetSuiteCustomFormIDForm};
diff --git a/src/types/form/NetSuiteTokenInputForm.ts b/src/types/form/NetSuiteTokenInputForm.ts
new file mode 100644
index 000000000000..e5ec13109704
--- /dev/null
+++ b/src/types/form/NetSuiteTokenInputForm.ts
@@ -0,0 +1,22 @@
+import type {ValueOf} from 'type-fest';
+import type Form from './Form';
+
+const INPUT_IDS = {
+    NETSUITE_ACCOUNT_ID: 'netSuiteAccountID',
+    NETSUITE_TOKEN_ID: 'netSuiteTokenID',
+    NETSUITE_TOKEN_SECRET: 'netSuiteTokenSecret',
+} as const;
+
+type InputID = ValueOf<typeof INPUT_IDS>;
+
+type NetSuiteTokenInputForm = Form<
+    InputID,
+    {
+        [INPUT_IDS.NETSUITE_ACCOUNT_ID]: string;
+        [INPUT_IDS.NETSUITE_TOKEN_ID]: string;
+        [INPUT_IDS.NETSUITE_TOKEN_SECRET]: string;
+    }
+>;
+
+export type {NetSuiteTokenInputForm};
+export default INPUT_IDS;
diff --git a/src/types/form/PersonalBankAccountForm.ts b/src/types/form/PersonalBankAccountForm.ts
index 1a1922bf8013..a5b95b20e684 100644
--- a/src/types/form/PersonalBankAccountForm.ts
+++ b/src/types/form/PersonalBankAccountForm.ts
@@ -32,7 +32,11 @@ type PlaidAccountProps = {
     [INPUT_IDS.BANK_INFO_STEP.SELECTED_PLAID_ACCOUNT_ID]: string;
 };
 
-type PersonalBankAccountForm = Form<InputID, BankAccountStepProps & PlaidAccountProps>;
+type OnfidoStepProps = {
+    isOnfidoSetupComplete: boolean;
+};
+
+type PersonalBankAccountForm = Form<InputID, BankAccountStepProps & PlaidAccountProps> & OnfidoStepProps;
 
 export type {BankAccountStepProps, PlaidAccountProps, PersonalBankAccountForm};
 
diff --git a/src/types/form/PolicyDistanceRateTaxReclaimableOnEditForm.ts b/src/types/form/PolicyDistanceRateTaxReclaimableOnEditForm.ts
new file mode 100644
index 000000000000..b41facf3604f
--- /dev/null
+++ b/src/types/form/PolicyDistanceRateTaxReclaimableOnEditForm.ts
@@ -0,0 +1,18 @@
+import type {ValueOf} from 'type-fest';
+import type Form from './Form';
+
+const INPUT_IDS = {
+    TAX_CLAIMABLE_VALUE: 'taxClaimableValue',
+} as const;
+
+type InputID = ValueOf<typeof INPUT_IDS>;
+
+type PolicyDistanceRateTaxReclaimableOnEditForm = Form<
+    InputID,
+    {
+        [INPUT_IDS.TAX_CLAIMABLE_VALUE]: string;
+    }
+>;
+
+export type {PolicyDistanceRateTaxReclaimableOnEditForm};
+export default INPUT_IDS;
diff --git a/src/types/form/ReportFieldEditForm.ts b/src/types/form/ReportFieldEditForm.ts
deleted file mode 100644
index 7befa2cb6502..000000000000
--- a/src/types/form/ReportFieldEditForm.ts
+++ /dev/null
@@ -1,6 +0,0 @@
-import type Form from './Form';
-
-type ReportFieldEditForm = Form<string, Record<string, string>>;
-
-// eslint-disable-next-line import/prefer-default-export
-export type {ReportFieldEditForm};
diff --git a/src/types/form/ReportFieldsEditForm.ts b/src/types/form/ReportFieldsEditForm.ts
new file mode 100644
index 000000000000..8315490d31c7
--- /dev/null
+++ b/src/types/form/ReportFieldsEditForm.ts
@@ -0,0 +1,6 @@
+import type Form from './Form';
+
+type ReportFieldsEditForm = Form<string, Record<string, string>>;
+
+// eslint-disable-next-line import/prefer-default-export
+export type {ReportFieldsEditForm};
diff --git a/src/types/form/RulesMaxExpenseAgeForm.ts b/src/types/form/RulesMaxExpenseAgeForm.ts
new file mode 100644
index 000000000000..bc66e194522d
--- /dev/null
+++ b/src/types/form/RulesMaxExpenseAgeForm.ts
@@ -0,0 +1,18 @@
+import type {ValueOf} from 'type-fest';
+import type Form from './Form';
+
+const INPUT_IDS = {
+    MAX_EXPENSE_AGE: 'maxExpenseAge',
+} as const;
+
+type InputID = ValueOf<typeof INPUT_IDS>;
+
+type RulesMaxExpenseAgeForm = Form<
+    InputID,
+    {
+        [INPUT_IDS.MAX_EXPENSE_AGE]: string;
+    }
+>;
+
+export type {RulesMaxExpenseAgeForm};
+export default INPUT_IDS;
diff --git a/src/types/form/RulesMaxExpenseAmountForm.ts b/src/types/form/RulesMaxExpenseAmountForm.ts
new file mode 100644
index 000000000000..ec8e8736a803
--- /dev/null
+++ b/src/types/form/RulesMaxExpenseAmountForm.ts
@@ -0,0 +1,18 @@
+import type {ValueOf} from 'type-fest';
+import type Form from './Form';
+
+const INPUT_IDS = {
+    MAX_EXPENSE_AMOUNT: 'maxExpenseAmount',
+} as const;
+
+type InputID = ValueOf<typeof INPUT_IDS>;
+
+type RulesMaxExpenseAmountForm = Form<
+    InputID,
+    {
+        [INPUT_IDS.MAX_EXPENSE_AMOUNT]: string;
+    }
+>;
+
+export type {RulesMaxExpenseAmountForm};
+export default INPUT_IDS;
diff --git a/src/types/form/RulesRequiredReceiptAmountForm.ts b/src/types/form/RulesRequiredReceiptAmountForm.ts
new file mode 100644
index 000000000000..18b59c8f92dd
--- /dev/null
+++ b/src/types/form/RulesRequiredReceiptAmountForm.ts
@@ -0,0 +1,18 @@
+import type {ValueOf} from 'type-fest';
+import type Form from './Form';
+
+const INPUT_IDS = {
+    MAX_EXPENSE_AMOUNT_NO_RECEIPT: 'maxExpenseAmountNoReceipt',
+} as const;
+
+type InputID = ValueOf<typeof INPUT_IDS>;
+
+type RulesRequiredReceiptAmountForm = Form<
+    InputID,
+    {
+        [INPUT_IDS.MAX_EXPENSE_AMOUNT_NO_RECEIPT]: string;
+    }
+>;
+
+export type {RulesRequiredReceiptAmountForm};
+export default INPUT_IDS;
diff --git a/src/types/form/SageIntacctDimensionsForm.ts b/src/types/form/SageIntacctDimensionsForm.ts
new file mode 100644
index 000000000000..b2b074801190
--- /dev/null
+++ b/src/types/form/SageIntacctDimensionsForm.ts
@@ -0,0 +1,21 @@
+import type {ValueOf} from 'type-fest';
+import type CONST from '@src/CONST';
+import type Form from './Form';
+
+const INPUT_IDS = {
+    INTEGRATION_NAME: 'integrationName',
+    DIMENSION_TYPE: 'dimensionType',
+} as const;
+
+type InputID = ValueOf<typeof INPUT_IDS>;
+
+type SageIntacctDimensionForm = Form<
+    InputID,
+    {
+        [INPUT_IDS.INTEGRATION_NAME]: string;
+        [INPUT_IDS.DIMENSION_TYPE]: typeof CONST.SAGE_INTACCT_MAPPING_VALUE.TAG | typeof CONST.SAGE_INTACCT_MAPPING_VALUE.REPORT_FIELD;
+    }
+>;
+
+export type {SageIntacctDimensionForm};
+export default INPUT_IDS;
diff --git a/src/types/form/SageIntactCredentialsForm.ts b/src/types/form/SageIntactCredentialsForm.ts
new file mode 100644
index 000000000000..b70a28fbda8c
--- /dev/null
+++ b/src/types/form/SageIntactCredentialsForm.ts
@@ -0,0 +1,22 @@
+import type {ValueOf} from 'type-fest';
+import type Form from './Form';
+
+const INPUT_IDS = {
+    COMPANY_ID: 'companyID',
+    USER_ID: 'userID',
+    PASSWORD: 'password',
+} as const;
+
+type InputID = ValueOf<typeof INPUT_IDS>;
+
+type SageIntactCredentialsForm = Form<
+    InputID,
+    {
+        [INPUT_IDS.COMPANY_ID]: string;
+        [INPUT_IDS.USER_ID]: string;
+        [INPUT_IDS.PASSWORD]: string;
+    }
+>;
+
+export type {SageIntactCredentialsForm};
+export default INPUT_IDS;
diff --git a/src/types/form/SearchAdvancedFiltersForm.ts b/src/types/form/SearchAdvancedFiltersForm.ts
new file mode 100644
index 000000000000..6541072cae81
--- /dev/null
+++ b/src/types/form/SearchAdvancedFiltersForm.ts
@@ -0,0 +1,50 @@
+import type {ValueOf} from 'type-fest';
+import type Form from './Form';
+
+const FILTER_KEYS = {
+    DATE_AFTER: 'dateAfter',
+    DATE_BEFORE: 'dateBefore',
+    CURRENCY: 'currency',
+    CATEGORY: 'category',
+    POLICY_ID: 'policyID',
+    CARD_ID: 'cardID',
+    MERCHANT: 'merchant',
+    DESCRIPTION: 'description',
+    REPORT_ID: 'reportID',
+    LESS_THAN: 'lessThan',
+    GREATER_THAN: 'greaterThan',
+    TAX_RATE: 'taxRate',
+    EXPENSE_TYPE: 'expenseType',
+    TAG: 'tag',
+    KEYWORD: 'keyword',
+    FROM: 'from',
+    TO: 'to',
+} as const;
+
+type InputID = ValueOf<typeof FILTER_KEYS>;
+
+type SearchAdvancedFiltersForm = Form<
+    InputID,
+    {
+        [FILTER_KEYS.DATE_AFTER]: string;
+        [FILTER_KEYS.DATE_BEFORE]: string;
+        [FILTER_KEYS.CURRENCY]: string[];
+        [FILTER_KEYS.CATEGORY]: string[];
+        [FILTER_KEYS.POLICY_ID]: string;
+        [FILTER_KEYS.CARD_ID]: string[];
+        [FILTER_KEYS.MERCHANT]: string;
+        [FILTER_KEYS.DESCRIPTION]: string;
+        [FILTER_KEYS.REPORT_ID]: string;
+        [FILTER_KEYS.LESS_THAN]: string;
+        [FILTER_KEYS.GREATER_THAN]: string;
+        [FILTER_KEYS.KEYWORD]: string;
+        [FILTER_KEYS.TAX_RATE]: string[];
+        [FILTER_KEYS.EXPENSE_TYPE]: string[];
+        [FILTER_KEYS.TAG]: string[];
+        [FILTER_KEYS.FROM]: string[];
+        [FILTER_KEYS.TO]: string[];
+    }
+>;
+
+export type {SearchAdvancedFiltersForm};
+export default FILTER_KEYS;
diff --git a/src/types/form/SubscriptionSizeForm.ts b/src/types/form/SubscriptionSizeForm.ts
new file mode 100644
index 000000000000..2a58bddfb11b
--- /dev/null
+++ b/src/types/form/SubscriptionSizeForm.ts
@@ -0,0 +1,13 @@
+import type {ValueOf} from 'type-fest';
+import type Form from './Form';
+
+const INPUT_IDS = {
+    SUBSCRIPTION_SIZE: 'subscriptionSize',
+} as const;
+
+type InputID = ValueOf<typeof INPUT_IDS>;
+
+type SubscriptionSizeForm = Form<InputID, {[INPUT_IDS.SUBSCRIPTION_SIZE]: string}>;
+
+export type {SubscriptionSizeForm};
+export default INPUT_IDS;
diff --git a/src/types/form/TextPickerModalForm.ts b/src/types/form/TextPickerModalForm.ts
new file mode 100644
index 000000000000..eae46c0accd3
--- /dev/null
+++ b/src/types/form/TextPickerModalForm.ts
@@ -0,0 +1,5 @@
+import type Form from './Form';
+
+type TextPickerModalForm = Form<string, Record<string, string>>;
+
+export default TextPickerModalForm;
diff --git a/src/types/form/WorkspaceCategoryForm.ts b/src/types/form/WorkspaceCategoryForm.ts
index 4f5f9282373c..093655e87bc9 100644
--- a/src/types/form/WorkspaceCategoryForm.ts
+++ b/src/types/form/WorkspaceCategoryForm.ts
@@ -3,6 +3,8 @@ import type Form from './Form';
 
 const INPUT_IDS = {
     CATEGORY_NAME: 'categoryName',
+    PAYROLL_CODE: 'payrollCode',
+    GL_CODE: 'glCode',
 } as const;
 
 type InputID = ValueOf<typeof INPUT_IDS>;
@@ -11,6 +13,8 @@ type WorkspaceCategoryForm = Form<
     InputID,
     {
         [INPUT_IDS.CATEGORY_NAME]: string;
+        [INPUT_IDS.PAYROLL_CODE]: string;
+        [INPUT_IDS.GL_CODE]: string;
     }
 >;
 
diff --git a/src/types/form/WorkspaceInvoicesCompanyNameForm.ts b/src/types/form/WorkspaceInvoicesCompanyNameForm.ts
new file mode 100644
index 000000000000..d3e6dd606cd5
--- /dev/null
+++ b/src/types/form/WorkspaceInvoicesCompanyNameForm.ts
@@ -0,0 +1,18 @@
+import type {ValueOf} from 'type-fest';
+import type Form from './Form';
+
+const INPUT_IDS = {
+    COMPANY_NAME: 'companyName',
+} as const;
+
+type InputID = ValueOf<typeof INPUT_IDS>;
+
+type WorkspaceInvoicesCompanyNameForm = Form<
+    InputID,
+    {
+        [INPUT_IDS.COMPANY_NAME]: string;
+    }
+>;
+
+export type {WorkspaceInvoicesCompanyNameForm};
+export default INPUT_IDS;
diff --git a/src/types/form/WorkspaceInvoicesCompanyWebsiteForm.ts b/src/types/form/WorkspaceInvoicesCompanyWebsiteForm.ts
new file mode 100644
index 000000000000..3f3bba19d96e
--- /dev/null
+++ b/src/types/form/WorkspaceInvoicesCompanyWebsiteForm.ts
@@ -0,0 +1,18 @@
+import type {ValueOf} from 'type-fest';
+import type Form from './Form';
+
+const INPUT_IDS = {
+    COMPANY_WEBSITE: 'companyWebsite',
+} as const;
+
+type InputID = ValueOf<typeof INPUT_IDS>;
+
+type WorkspaceInvoicesCompanyWebsiteForm = Form<
+    InputID,
+    {
+        [INPUT_IDS.COMPANY_WEBSITE]: string;
+    }
+>;
+
+export type {WorkspaceInvoicesCompanyWebsiteForm};
+export default INPUT_IDS;
diff --git a/src/types/form/WorkspaceReportFieldForm.ts b/src/types/form/WorkspaceReportFieldForm.ts
new file mode 100644
index 000000000000..69651cf7de20
--- /dev/null
+++ b/src/types/form/WorkspaceReportFieldForm.ts
@@ -0,0 +1,31 @@
+import type {ValueOf} from 'type-fest';
+import type {PolicyReportFieldType} from '@src/types/onyx/Policy';
+import type Form from './Form';
+
+const INPUT_IDS = {
+    NAME: 'name',
+    TYPE: 'type',
+    INITIAL_VALUE: 'initialValue',
+    LIST_VALUES: 'listValues',
+    DISABLED_LIST_VALUES: 'disabledListValues',
+    VALUE_NAME: 'valueName',
+    NEW_VALUE_NAME: 'newValueName',
+} as const;
+
+type InputID = ValueOf<typeof INPUT_IDS>;
+
+type WorkspaceReportFieldForm = Form<
+    InputID,
+    {
+        [INPUT_IDS.NAME]: string;
+        [INPUT_IDS.TYPE]: PolicyReportFieldType;
+        [INPUT_IDS.INITIAL_VALUE]: string;
+        [INPUT_IDS.LIST_VALUES]: string[];
+        [INPUT_IDS.DISABLED_LIST_VALUES]: boolean[];
+        [INPUT_IDS.VALUE_NAME]: string;
+        [INPUT_IDS.NEW_VALUE_NAME]: string;
+    }
+>;
+
+export type {WorkspaceReportFieldForm, InputID};
+export default INPUT_IDS;
diff --git a/src/types/form/WorkspaceTagForm.ts b/src/types/form/WorkspaceTagForm.ts
index a6cc4c6c37cd..b049e1f5cc97 100644
--- a/src/types/form/WorkspaceTagForm.ts
+++ b/src/types/form/WorkspaceTagForm.ts
@@ -3,6 +3,7 @@ import type Form from './Form';
 
 const INPUT_IDS = {
     TAG_NAME: 'tagName',
+    TAG_GL_CODE: 'glCode',
 } as const;
 
 type InputID = ValueOf<typeof INPUT_IDS>;
@@ -11,6 +12,7 @@ type WorkspaceTagForm = Form<
     InputID,
     {
         [INPUT_IDS.TAG_NAME]: string;
+        [INPUT_IDS.TAG_GL_CODE]: string;
     }
 >;
 
diff --git a/src/types/form/WorkspaceTaxCodeForm.ts b/src/types/form/WorkspaceTaxCodeForm.ts
new file mode 100644
index 000000000000..f278200a7cbb
--- /dev/null
+++ b/src/types/form/WorkspaceTaxCodeForm.ts
@@ -0,0 +1,18 @@
+import type {ValueOf} from 'type-fest';
+import type Form from './Form';
+
+const INPUT_IDS = {
+    TAX_CODE: 'taxCode',
+} as const;
+
+type InputID = ValueOf<typeof INPUT_IDS>;
+
+type WorkspaceTaxCodeForm = Form<
+    InputID,
+    {
+        [INPUT_IDS.TAX_CODE]: string;
+    }
+>;
+
+export type {WorkspaceTaxCodeForm};
+export default INPUT_IDS;
diff --git a/src/types/form/index.ts b/src/types/form/index.ts
index b3e46733a44e..e2421d000557 100644
--- a/src/types/form/index.ts
+++ b/src/types/form/index.ts
@@ -1,21 +1,26 @@
-export type {AddDebitCardForm} from './AddDebitCardForm';
+export type {AddPaymentCardForm} from './AddPaymentCardForm';
 export type {CloseAccountForm} from './CloseAccountForm';
 export type {DateOfBirthForm} from './DateOfBirthForm';
 export type {DisplayNameForm} from './DisplayNameForm';
 export type {EditTaskForm} from './EditTaskForm';
 export type {ExitSurveyReasonForm} from './ExitSurveyReasonForm';
 export type {ExitSurveyResponseForm} from './ExitSurveyResponseForm';
+export type {FeedbackSurveyForm} from './FeedbackSurveyForm';
 export type {GetPhysicalCardForm} from './GetPhysicalCardForm';
 export type {HomeAddressForm} from './HomeAddressForm';
 export type {IKnowTeacherForm} from './IKnowTeacherForm';
 export type {IntroSchoolPrincipalForm} from './IntroSchoolPrincipalForm';
+export type {IssueNewExpensifyCardForm} from './IssueNewExpensifyCardForm';
+export type {EditExpensifyCardNameForm} from './EditExpensifyCardNameForm';
 export type {LegalNameForm} from './LegalNameForm';
 export type {MoneyRequestAmountForm} from './MoneyRequestAmountForm';
 export type {MoneyRequestDateForm} from './MoneyRequestDateForm';
 export type {MoneyRequestDescriptionForm} from './MoneyRequestDescriptionForm';
 export type {MoneyRequestMerchantForm} from './MoneyRequestMerchantForm';
 export type {MoneyRequestHoldReasonForm} from './MoneyRequestHoldReasonForm';
+export type {MoneyRequestCompanyInfoForm} from './MoneyRequestCompanyInfoForm';
 export type {NewContactMethodForm} from './NewContactMethodForm';
+export type {ChangeBillingCurrencyForm} from './ChangeBillingCurrencyForm';
 export type {NewRoomForm} from './NewRoomForm';
 export type {NewTaskForm} from './NewTaskForm';
 export type {PersonalBankAccountForm} from './PersonalBankAccountForm';
@@ -23,7 +28,7 @@ export type {PrivateNotesForm} from './PrivateNotesForm';
 export type {ProfileSettingsForm} from './ProfileSettingsForm';
 export type {ReimbursementAccountForm} from './ReimbursementAccountForm';
 export type {ReportDescriptionForm} from './ReportDescriptionForm';
-export type {ReportFieldEditForm} from './ReportFieldEditForm';
+export type {ReportFieldsEditForm} from './ReportFieldsEditForm';
 export type {ReportVirtualCardFraudForm} from './ReportVirtualCardFraudForm';
 export type {RequestPhysicalCardForm} from './RequestPhysicalCardForm';
 export type {RoomNameForm} from './RoomNameForm';
@@ -45,9 +50,26 @@ export type {WorkspaceNewTaxForm} from './WorkspaceNewTaxForm';
 export type {WorkspaceTaxNameForm} from './WorkspaceTaxNameForm';
 export type {WorkspaceTaxValueForm} from './WorkspaceTaxValueForm';
 export type {WorkspaceTaxCustomName} from './WorkspaceTaxCustomName';
+export type {WorkspaceTaxCodeForm} from './WorkspaceTaxCodeForm';
+export type {WorkspaceInvoicesCompanyNameForm} from './WorkspaceInvoicesCompanyNameForm';
+export type {WorkspaceInvoicesCompanyWebsiteForm} from './WorkspaceInvoicesCompanyWebsiteForm';
 export type {PolicyCreateDistanceRateForm} from './PolicyCreateDistanceRateForm';
+export type {PolicyDistanceRateTaxReclaimableOnEditForm} from './PolicyDistanceRateTaxReclaimableOnEditForm';
 export type {PolicyDistanceRateEditForm} from './PolicyDistanceRateEditForm';
 export type {WalletAdditionalDetailsForm} from './WalletAdditionalDetailsForm';
 export type {NewChatNameForm} from './NewChatNameForm';
 export type {WorkForm} from './WorkForm';
+export type {SageIntacctDimensionForm} from './SageIntacctDimensionsForm';
+export type {SubscriptionSizeForm} from './SubscriptionSizeForm';
+export type {WorkspaceReportFieldForm} from './WorkspaceReportFieldForm';
+export type {SageIntactCredentialsForm} from './SageIntactCredentialsForm';
+export type {NetSuiteCustomFieldForm} from './NetSuiteCustomFieldForm';
+export type {NetSuiteTokenInputForm} from './NetSuiteTokenInputForm';
+export type {NetSuiteCustomFormIDForm} from './NetSuiteCustomFormIDForm';
+export type {SearchAdvancedFiltersForm} from './SearchAdvancedFiltersForm';
+export type {EditExpensifyCardLimitForm} from './EditExpensifyCardLimitForm';
+export type {default as TextPickerModalForm} from './TextPickerModalForm';
 export type {default as Form} from './Form';
+export type {RulesRequiredReceiptAmountForm} from './RulesRequiredReceiptAmountForm';
+export type {RulesMaxExpenseAmountForm} from './RulesMaxExpenseAmountForm';
+export type {RulesMaxExpenseAgeForm} from './RulesMaxExpenseAgeForm';
diff --git a/src/types/global.d.ts b/src/types/global.d.ts
index 03446e813949..cb3cba68cce5 100644
--- a/src/types/global.d.ts
+++ b/src/types/global.d.ts
@@ -30,4 +30,12 @@ declare module '*.lottie' {
 // eslint-disable-next-line @typescript-eslint/consistent-type-definitions
 interface Window {
     setSupportToken: (token: string, email: string, accountID: number) => void;
+    markAllPolicyReportsAsRead: (policyID: string) => void;
+}
+
+// Allows to add generic type in require
+// eslint-disable-next-line @typescript-eslint/consistent-type-definitions
+interface NodeRequire {
+    // eslint-disable-next-line @typescript-eslint/prefer-function-type, @typescript-eslint/no-explicit-any
+    <T = any>(id: string): T;
 }
diff --git a/src/types/modules/act.d.ts b/src/types/modules/act.d.ts
index 5fe00ec479cf..43b13a47d3f0 100644
--- a/src/types/modules/act.d.ts
+++ b/src/types/modules/act.d.ts
@@ -1,8 +1,8 @@
-import type {StepIdentifier as ActStepIdentifier} from '@kie/act-js';
+import type {EventJSON} from '@kie/act-js/build/src/action-event/action-event.types';
+import type {StepIdentifier as ActStepIdentifier, MockStep} from '@kie/act-js/build/src/step-mocker/step-mocker.types';
 
 declare module '@kie/act-js' {
-    // eslint-disable-next-line rulesdir/no-inline-named-export
-    export declare type StepIdentifier = {
+    type StepIdentifier = ActStepIdentifier & {
         id?: string;
         name: string;
         run?: string;
@@ -10,5 +10,7 @@ declare module '@kie/act-js' {
         with?: string;
         envs?: string[];
         inputs?: string[];
-    } & Omit<ActStepIdentifier, 'name' | 'id' | 'run' | 'mockWith'>;
+    };
+
+    export type {StepIdentifier, MockStep, EventJSON};
 }
diff --git a/src/types/modules/dom.d.ts b/src/types/modules/dom.d.ts
index 60bd9c9ae983..029b4b3d6de5 100644
--- a/src/types/modules/dom.d.ts
+++ b/src/types/modules/dom.d.ts
@@ -19,6 +19,51 @@ declare global {
         AppleIDSignInOnSuccess: AppleIDSignInOnSuccessEvent;
         AppleIDSignInOnFailure: AppleIDSignInOnFailureEvent;
     }
+
+    // eslint-disable-next-line @typescript-eslint/consistent-type-definitions
+    interface Permissions {
+        /** [MDN Reference](https://developer.mozilla.org/docs/Web/API/Permissions/query) */
+        query(permissionDesc: {name: 'geolocation' | 'notifications' | 'persistent-storage' | 'push' | 'screen-wake-lock' | 'xr-spatial-tracking' | 'camera'}): Promise<PermissionStatus>;
+    }
+
+    // eslint-disable-next-line @typescript-eslint/consistent-type-definitions
+    interface MediaTrackConstraintSet {
+        aspectRatio?: ConstrainDouble;
+        autoGainControl?: ConstrainBoolean;
+        channelCount?: ConstrainULong;
+        deviceId?: ConstrainDOMString;
+        displaySurface?: ConstrainDOMString;
+        echoCancellation?: ConstrainBoolean;
+        facingMode?: ConstrainDOMString;
+        frameRate?: ConstrainDouble;
+        groupId?: ConstrainDOMString;
+        height?: ConstrainULong;
+        noiseSuppression?: ConstrainBoolean;
+        sampleRate?: ConstrainULong;
+        sampleSize?: ConstrainULong;
+        width?: ConstrainULong;
+        zoom?: {ideal: number};
+        torch?: boolean;
+    }
+
+    // eslint-disable-next-line @typescript-eslint/consistent-type-definitions
+    interface MediaTrackSettings {
+        aspectRatio?: number;
+        autoGainControl?: boolean;
+        channelCount?: number;
+        deviceId?: string;
+        displaySurface?: string;
+        echoCancellation?: boolean;
+        facingMode?: string;
+        frameRate?: number;
+        groupId?: string;
+        height?: number;
+        noiseSuppression?: boolean;
+        sampleRate?: number;
+        sampleSize?: number;
+        width?: number;
+        zoom?: number;
+    }
 }
 
 export type {AppleIDSignInOnFailureEvent, AppleIDSignInOnSuccessEvent};
diff --git a/src/types/modules/jest.d.ts b/src/types/modules/jest.d.ts
new file mode 100644
index 000000000000..532437d2f7cf
--- /dev/null
+++ b/src/types/modules/jest.d.ts
@@ -0,0 +1,13 @@
+declare global {
+    namespace jest {
+        // eslint-disable-next-line @typescript-eslint/consistent-type-definitions
+        interface Expect {
+            // eslint-disable-next-line @typescript-eslint/ban-types
+            objectContaining<E = {}>(obj: E): unknown;
+            arrayContaining<E = unknown>(arr: readonly E[]): unknown;
+        }
+    }
+}
+
+// We used the export {} line to mark this file as an external module
+export {};
diff --git a/src/types/modules/pdf.worker.d.ts b/src/types/modules/pdf.worker.d.ts
new file mode 100644
index 000000000000..307d0ff53a63
--- /dev/null
+++ b/src/types/modules/pdf.worker.d.ts
@@ -0,0 +1 @@
+declare module 'pdfjs-dist/legacy/build/pdf.worker';
diff --git a/src/types/modules/react-native-onyx.d.ts b/src/types/modules/react-native-onyx.d.ts
index 8498b03ec933..453f707165e1 100644
--- a/src/types/modules/react-native-onyx.d.ts
+++ b/src/types/modules/react-native-onyx.d.ts
@@ -1,4 +1,5 @@
 import type Onyx from 'react-native-onyx';
+import type {CollectionKeyBase} from 'react-native-onyx/dist/types';
 import type {OnyxCollectionKey, OnyxFormDraftKey, OnyxFormKey, OnyxValueKey, OnyxValues} from '@src/ONYXKEYS';
 
 declare module 'react-native-onyx' {
@@ -9,11 +10,13 @@ declare module 'react-native-onyx' {
         values: OnyxValues;
     }
 }
-
 declare global {
     // Global methods for Onyx key management for debugging purposes
     // eslint-disable-next-line @typescript-eslint/consistent-type-definitions
     interface Window {
-        Onyx: typeof Onyx;
+        Onyx: typeof Onyx & {
+            get: (key: CollectionKeyBase) => Promise<unknown>;
+            log: (key: CollectionKeyBase) => void;
+        };
     }
 }
diff --git a/src/types/modules/react-native-performance.d.ts b/src/types/modules/react-native-performance.d.ts
new file mode 100644
index 000000000000..e42e7593b027
--- /dev/null
+++ b/src/types/modules/react-native-performance.d.ts
@@ -0,0 +1,12 @@
+import type {Performance, PerformanceEntry, PerformanceMark, PerformanceMeasure, PerformanceObserver} from 'react-native-performance';
+
+declare module 'react-native-performance' {
+    // eslint-disable-next-line @typescript-eslint/consistent-type-definitions
+    interface ReactNativePerformance {
+        default: Performance;
+        setResourceLoggingEnabled: (enabled?: boolean) => void;
+        PerformanceObserver: typeof PerformanceObserver;
+    }
+
+    export type {PerformanceEntry, PerformanceMark, PerformanceMeasure, Performance, ReactNativePerformance};
+}
diff --git a/src/types/modules/react-native-web.d.ts b/src/types/modules/react-native-web.d.ts
deleted file mode 100644
index f7db951eadad..000000000000
--- a/src/types/modules/react-native-web.d.ts
+++ /dev/null
@@ -1,11 +0,0 @@
-/* eslint-disable import/prefer-default-export */
-/* eslint-disable @typescript-eslint/consistent-type-definitions */
-declare module 'react-native-web' {
-    class Clipboard {
-        static isAvailable(): boolean;
-        static getString(): Promise<string>;
-        static setString(text: string): boolean;
-    }
-
-    export {Clipboard};
-}
diff --git a/src/types/modules/react-native.d.ts b/src/types/modules/react-native.d.ts
index effbdd9d28fa..2fc9402157e0 100644
--- a/src/types/modules/react-native.d.ts
+++ b/src/types/modules/react-native.d.ts
@@ -1,335 +1,33 @@
-/* eslint-disable @typescript-eslint/naming-convention */
-
-/* eslint-disable @typescript-eslint/no-empty-interface */
-
 /* eslint-disable @typescript-eslint/consistent-type-definitions */
-// eslint-disable-next-line no-restricted-imports
-import type {CSSProperties, FocusEventHandler, KeyboardEventHandler, MouseEventHandler, PointerEventHandler, UIEventHandler, WheelEventHandler} from 'react';
-import 'react-native';
+import type {TargetedEvent} from 'react-native';
 import type {BootSplashModule} from '@libs/BootSplash/types';
+import type {EnvironmentCheckerModule} from '@libs/Environment/betaChecker/types';
+import type StartupTimer from '@libs/StartupTimer/types';
 
 type HybridAppModule = {
-    closeReactNativeApp: () => void;
+    closeReactNativeApp: (shouldSignOut: boolean) => void;
+    completeOnboarding: (status: boolean) => void;
+    exitApp: () => void;
 };
 
-declare module 'react-native' {
-    // <------ REACT NATIVE WEB (0.19.0) ------>
-    // Extracted from react-native-web, packages/react-native-web/src/exports/View/types.js
-    type idRef = string;
-    type idRefList = idRef | idRef[];
-
-    // https://necolas.github.io/react-native-web/docs/accessibility/#accessibility-props-api
-    // Extracted from react-native-web, packages/react-native-web/src/exports/View/types.js
-    interface AccessibilityProps {
-        'aria-activedescendant'?: idRef;
-        'aria-atomic'?: boolean;
-        'aria-autocomplete'?: 'none' | 'list' | 'inline' | 'both';
-        'aria-busy'?: boolean;
-        'aria-checked'?: boolean | 'mixed';
-        'aria-colcount'?: number;
-        'aria-colindex'?: number;
-        'aria-colspan'?: number;
-        'aria-controls'?: idRef;
-        'aria-current'?: boolean | 'page' | 'step' | 'location' | 'date' | 'time';
-        'aria-describedby'?: idRef;
-        'aria-details'?: idRef;
-        'aria-disabled'?: boolean;
-        'aria-errormessage'?: idRef;
-        'aria-expanded'?: boolean;
-        'aria-flowto'?: idRef;
-        'aria-haspopup'?: 'dialog' | 'grid' | 'listbox' | 'menu' | 'tree' | false;
-        'aria-hidden'?: boolean;
-        'aria-invalid'?: boolean;
-        'aria-keyshortcuts'?: string;
-        'aria-label'?: string;
-        'aria-labelledby'?: idRef;
-        'aria-level'?: number;
-        'aria-live'?: 'assertive' | 'none' | 'polite';
-        'aria-modal'?: boolean;
-        'aria-multiline'?: boolean;
-        'aria-multiselectable'?: boolean;
-        'aria-orientation'?: 'horizontal' | 'vertical';
-        'aria-owns'?: idRef;
-        'aria-placeholder'?: string;
-        'aria-posinset'?: number;
-        'aria-pressed'?: boolean | 'mixed';
-        'aria-readonly'?: boolean;
-        'aria-required'?: boolean;
-        'aria-roledescription'?: string;
-        'aria-rowcount'?: number;
-        'aria-rowindex'?: number;
-        'aria-rowspan'?: number;
-        'aria-selected'?: boolean;
-        'aria-setsize'?: number;
-        'aria-sort'?: 'ascending' | 'descending' | 'none' | 'other';
-        'aria-valuemax'?: number;
-        'aria-valuemin'?: number;
-        'aria-valuenow'?: number;
-        'aria-valuetext'?: string;
-        role?: string;
-
-        // @deprecated
-        accessibilityActiveDescendant?: idRef;
-        accessibilityAtomic?: boolean;
-        accessibilityAutoComplete?: 'none' | 'list' | 'inline' | 'both';
-        accessibilityBusy?: boolean;
-        accessibilityChecked?: boolean | 'mixed';
-        accessibilityColumnCount?: number;
-        accessibilityColumnIndex?: number;
-        accessibilityColumnSpan?: number;
-        accessibilityControls?: idRefList;
-        accessibilityCurrent?: boolean | 'page' | 'step' | 'location' | 'date' | 'time';
-        accessibilityDescribedBy?: idRefList;
-        accessibilityDetails?: idRef;
-        accessibilityDisabled?: boolean;
-        accessibilityErrorMessage?: idRef;
-        accessibilityExpanded?: boolean;
-        accessibilityFlowTo?: idRefList;
-        accessibilityHasPopup?: 'dialog' | 'grid' | 'listbox' | 'menu' | 'tree' | false;
-        accessibilityHidden?: boolean;
-        accessibilityInvalid?: boolean;
-        accessibilityKeyShortcuts?: string[];
-        accessibilityLabel?: string;
-        accessibilityLabelledBy?: idRef;
-        accessibilityLevel?: number;
-        accessibilityLiveRegion?: 'assertive' | 'none' | 'polite';
-        accessibilityModal?: boolean;
-        accessibilityMultiline?: boolean;
-        accessibilityMultiSelectable?: boolean;
-        accessibilityOrientation?: 'horizontal' | 'vertical';
-        accessibilityOwns?: idRefList;
-        accessibilityPlaceholder?: string;
-        accessibilityPosInSet?: number;
-        accessibilityPressed?: boolean | 'mixed';
-        accessibilityReadOnly?: boolean;
-        accessibilityRequired?: boolean;
-        accessibilityRole?: string;
-        accessibilityRoleDescription?: string;
-        accessibilityRowCount?: number;
-        accessibilityRowIndex?: number;
-        accessibilityRowSpan?: number;
-        accessibilitySelected?: boolean;
-        accessibilitySetSize?: number;
-        accessibilitySort?: 'ascending' | 'descending' | 'none' | 'other';
-        accessibilityValueMax?: number;
-        accessibilityValueMin?: number;
-        accessibilityValueNow?: number;
-        accessibilityValueText?: string;
-    }
-
-    // https://necolas.github.io/react-native-web/docs/interactions/#pointerevent-props-api
-    // Extracted properties from react-native-web, packages/react-native-web/src/exports/View/types.js and packages/react-native-web/src/modules/forwardedProps/index.js
-    // Extracted types from @types/react, index.d.ts
-    interface PointerProps {
-        onAuxClick?: MouseEventHandler;
-        onClick?: MouseEventHandler;
-        onContextMenu?: MouseEventHandler;
-        onGotPointerCapture?: PointerEventHandler;
-        onLostPointerCapture?: PointerEventHandler;
-        onPointerCancel?: PointerEventHandler;
-        onPointerDown?: PointerEventHandler;
-        onPointerEnter?: PointerEventHandler;
-        onPointerMove?: PointerEventHandler;
-        onPointerLeave?: PointerEventHandler;
-        onPointerOut?: PointerEventHandler;
-        onPointerOver?: PointerEventHandler;
-        onPointerUp?: PointerEventHandler;
-        onMouseDown?: MouseEventHandler;
-        onMouseEnter?: MouseEventHandler;
-        onMouseLeave?: MouseEventHandler;
-        onMouseMove?: MouseEventHandler;
-        onMouseOver?: MouseEventHandler;
-        onMouseOut?: MouseEventHandler;
-        onMouseUp?: MouseEventHandler;
-        onScroll?: UIEventHandler;
-        onWheel?: WheelEventHandler;
-    }
-
-    // https://necolas.github.io/react-native-web/docs/interactions/#responderevent-props-api
-    // Extracted from react-native-web, packages/react-native-web/src/modules/useResponderEvents/ResponderTouchHistoryStore.js
-    type TouchRecord = {
-        currentPageX: number;
-        currentPageY: number;
-        currentTimeStamp: number;
-        previousPageX: number;
-        previousPageY: number;
-        previousTimeStamp: number;
-        startPageX: number;
-        startPageY: number;
-        startTimeStamp: number;
-        touchActive: boolean;
-    };
-
-    // https://necolas.github.io/react-native-web/docs/interactions/#responderevent-props-api
-    // Extracted from react-native-web, packages/react-native-web/src/modules/useResponderEvents/ResponderTouchHistoryStore.js
-    type TouchHistory = Readonly<{
-        indexOfSingleActiveTouch: number;
-        mostRecentTimeStamp: number;
-        numberActiveTouches: number;
-        touchBank: TouchRecord[];
-    }>;
-
-    // https://necolas.github.io/react-native-web/docs/interactions/#responderevent-props-api
-    // Extracted from react-native-web, packages/react-native-web/src/modules/useResponderEvents/createResponderEvent.js
-    type ResponderEvent = {
-        bubbles: boolean;
-        cancelable: boolean;
-        currentTarget?: unknown; // changed from "any" to "unknown"
-        defaultPrevented?: boolean;
-        dispatchConfig: {
-            registrationName?: string;
-            phasedRegistrationNames?: {
-                bubbled: string;
-                captured: string;
-            };
-        };
-        eventPhase?: number;
-        isDefaultPrevented: () => boolean;
-        isPropagationStopped: () => boolean;
-        isTrusted?: boolean;
-        preventDefault: () => void;
-        stopPropagation: () => void;
-        nativeEvent: TouchEvent;
-        persist: () => void;
-        target?: unknown; // changed from "any" to "unknown"
-        timeStamp: number;
-        touchHistory: TouchHistory;
-    };
-
-    // https://necolas.github.io/react-native-web/docs/interactions/#responderevent-props-api
-    // Extracted from react-native-web, packages/react-native-web/src/modules/useResponderEvents/ResponderSystem.js
-    interface ResponderProps {
-        // Direct responder events dispatched directly to responder. Do not bubble.
-        onResponderEnd?: (e: ResponderEvent) => void;
-        onResponderGrant?: (e: ResponderEvent) => void | boolean;
-        onResponderMove?: (e: ResponderEvent) => void;
-        onResponderRelease?: (e: ResponderEvent) => void;
-        onResponderReject?: (e: ResponderEvent) => void;
-        onResponderStart?: (e: ResponderEvent) => void;
-        onResponderTerminate?: (e: ResponderEvent) => void;
-        onResponderTerminationRequest?: (e: ResponderEvent) => boolean;
-
-        // On pointer down, should this element become the responder?
-        onStartShouldSetResponder?: (e: ResponderEvent) => boolean;
-        onStartShouldSetResponderCapture?: (e: ResponderEvent) => boolean;
-
-        // On pointer move, should this element become the responder?
-        onMoveShouldSetResponder?: (e: ResponderEvent) => boolean;
-        onMoveShouldSetResponderCapture?: (e: ResponderEvent) => boolean;
-
-        // On scroll, should this element become the responder? Do no bubble
-        onScrollShouldSetResponder?: (e: ResponderEvent) => boolean;
-        onScrollShouldSetResponderCapture?: (e: ResponderEvent) => boolean;
-
-        // On text selection change, should this element become the responder?
-        onSelectionChangeShouldSetResponder?: (e: ResponderEvent) => boolean;
-        onSelectionChangeShouldSetResponderCapture?: (e: ResponderEvent) => boolean;
-    }
-
-    // https://necolas.github.io/react-native-web/docs/interactions/#focusevent-props-api
-    // Extracted properties from react-native-web, packages/react-native-web/src/exports/View/types.js and packages/react-native-web/src/modules/forwardedProps/index.js
-    // Extracted types from @types/react, index.d.ts
-    interface FocusProps {
-        onBlur?: FocusEventHandler;
-        onFocus?: FocusEventHandler;
-    }
-
-    // https://necolas.github.io/react-native-web/docs/interactions/#keyboardevent-props-api
-    // Extracted properties from react-native-web, packages/react-native-web/src/exports/View/types.js and packages/react-native-web/src/modules/forwardedProps/index.js
-    // Extracted types from @types/react, index.d.ts
-    interface KeyboardProps {
-        onKeyDown?: KeyboardEventHandler;
-        onKeyDownCapture?: KeyboardEventHandler;
-        onKeyUp?: KeyboardEventHandler;
-        onKeyUpCapture?: KeyboardEventHandler;
-    }
+type RNTextInputResetModule = {
+    resetKeyboardInput: (nodeHandle: number | null) => void;
+};
 
-    /**
-     * Shared props
-     * Extracted from react-native-web, packages/react-native-web/src/exports/View/types.js
-     */
-    interface WebSharedProps extends AccessibilityProps, PointerProps, ResponderProps, FocusProps, KeyboardProps {
-        dataSet?: Record<string, unknown>;
-        href?: string;
-        hrefAttrs?: {
-            download?: boolean;
-            rel?: string;
-            target?: string;
+declare module 'react-native' {
+    interface TextInputFocusEventData extends TargetedEvent {
+        text: string;
+        eventCount: number;
+        relatedTarget?: {
+            id?: string;
         };
-        tabIndex?: 0 | -1;
-        lang?: string;
     }
 
-    /**
-     * View
-     * Extracted from react-native-web, packages/react-native-web/src/exports/View/types.js
-     */
-    interface WebViewProps extends WebSharedProps {
-        dir?: 'ltr' | 'rtl';
-    }
-    interface ViewProps extends WebViewProps {}
-
-    /**
-     * Text
-     * Extracted from react-native-web, packages/react-native-web/src/exports/Text/types.js
-     */
-    interface WebTextProps extends WebSharedProps {
-        dir?: 'auto' | 'ltr' | 'rtl';
-    }
-    interface TextProps extends WebTextProps {}
-
-    /**
-     * TextInput
-     * Extracted from react-native-web, packages/react-native-web/src/exports/TextInput/types.js
-     */
-    interface WebTextInputProps extends WebSharedProps {
-        disabled?: boolean;
-    }
-    interface TextInputProps extends WebTextInputProps {
-        isFullComposerAvailable?: boolean;
-    }
-
-    /**
-     * Image
-     * Extracted from react-native-web, packages/react-native-web/src/exports/Image/types.js
-     */
-    interface WebImageProps extends WebSharedProps {
-        dir?: 'ltr' | 'rtl';
-        draggable?: boolean;
-    }
-    interface ImageProps extends WebImageProps {}
-
-    /**
-     * ScrollView
-     * Extracted from react-native-web, packages/react-native-web/src/exports/ScrollView/ScrollViewBase.js
-     */
-    interface WebScrollViewProps extends WebSharedProps {}
-    interface ScrollViewProps extends WebScrollViewProps {}
-
-    /**
-     * Pressable
-     */
-    // https://necolas.github.io/react-native-web/docs/pressable/#interactionstate
-    // Extracted from react-native-web, packages/react-native-web/src/exports/Pressable/index.js
-    interface WebPressableStateCallbackType {
-        readonly focused: boolean;
-        readonly hovered: boolean;
-        readonly pressed: boolean;
-    }
     interface PressableStateCallbackType extends WebPressableStateCallbackType {
         readonly isScreenReaderActive: boolean;
         readonly isDisabled: boolean;
     }
 
-    // Extracted from react-native-web, packages/react-native-web/src/exports/Pressable/index.js
-    interface WebPressableProps extends WebSharedProps {
-        delayPressIn?: number;
-        delayPressOut?: number;
-        onPressMove?: null | ((event: GestureResponderEvent) => void);
-        onPressEnd?: null | ((event: GestureResponderEvent) => void);
-    }
-    interface PressableProps extends WebPressableProps {}
-
     interface AppStateStatic {
         emitCurrentTestState: (status: string) => void;
     }
@@ -338,26 +36,19 @@ declare module 'react-native' {
         setInitialURL: (url: string) => void;
     }
 
-    /**
-     * Styles
-     */
-    // We extend CSSProperties (alias to "csstype" library) which provides all CSS style properties for Web,
-    // but properties that are already defined on RN won't be overrided / augmented.
-    interface WebStyle extends CSSProperties {
-        // https://necolas.github.io/react-native-web/docs/styling/#non-standard-properties
-        // Exclusive to react-native-web, "pointerEvents" already included on RN
-        animationKeyframes?: string | Record<string, ViewStyle>;
-        writingDirection?: 'auto' | 'ltr' | 'rtl';
-        enableBackground?: string;
-    }
-
-    interface ViewStyle extends WebStyle {}
-    interface TextStyle extends WebStyle {}
-    interface ImageStyle extends WebStyle {}
-    // <------ REACT NATIVE WEB (0.19.0) ------>
-
     interface NativeModulesStatic {
         BootSplash: BootSplashModule;
         HybridAppModule: HybridAppModule;
+        StartupTimer: StartupTimer;
+        RNTextInputReset: RNTextInputResetModule;
+        EnvironmentChecker: EnvironmentCheckerModule;
+    }
+
+    namespace Animated {
+        interface AnimatedInterpolation<OutputT extends number | string> extends AnimatedWithChildren {
+            interpolate(config: InterpolationConfigType): AnimatedInterpolation<OutputT>;
+            // eslint-disable-next-line @typescript-eslint/naming-convention
+            __getValue: () => OutputT;
+        }
     }
 }
diff --git a/src/types/onyx/Account.ts b/src/types/onyx/Account.ts
index c53d7ea816f8..4edb029d02e0 100644
--- a/src/types/onyx/Account.ts
+++ b/src/types/onyx/Account.ts
@@ -1,11 +1,43 @@
 import type {ValueOf} from 'type-fest';
 import type CONST from '@src/CONST';
+import type {TranslationPaths} from '@src/languages/types';
 import type DismissedReferralBanners from './DismissedReferralBanners';
 import type * as OnyxCommon from './OnyxCommon';
-import type {TravelSettings} from './TravelSettings';
 
+/** Two factor authentication steps */
 type TwoFactorAuthStep = ValueOf<typeof CONST.TWO_FACTOR_AUTH_STEPS> | '';
 
+/** The role of the delegate */
+type DelegateRole = ValueOf<typeof CONST.DELEGATE_ROLE>;
+
+/** Model of delegate */
+type Delegate = {
+    /** The email of the delegate */
+    email: string;
+
+    /** The role of the delegate */
+    role: DelegateRole;
+
+    /** Authentication failure errors */
+    error?: TranslationPaths;
+};
+
+/** Model of delegated access data */
+type DelegatedAccess = {
+    /** The users that can access your account as a delegate */
+    delegates?: Delegate[];
+
+    /** The the users you can access as a delegate */
+    delegators?: Delegate[];
+
+    /** The email of original user when they are acting as a delegate for another account */
+    delegate?: string;
+
+    /** Authentication failure errors when disconnecting as a copilot */
+    error?: TranslationPaths;
+};
+
+/** Model of user account */
 type Account = {
     /** Whether SAML is enabled for the current account */
     isSAMLEnabled?: boolean;
@@ -28,6 +60,9 @@ type Account = {
     /** Whether this account has 2FA enabled or not */
     requiresTwoFactorAuth?: boolean;
 
+    /** Whether this account needs 2FA setup before it can be used. eg: 2FA is required when Xero integration is enabled */
+    needsTwoFactorAuthSetup?: boolean;
+
     /** Whether the account is validated */
     validated?: boolean;
 
@@ -55,15 +90,39 @@ type Account = {
     /** Whether a sign is loading */
     isLoading?: boolean;
 
+    /** Authentication failure errors */
     errors?: OnyxCommon.Errors | null;
+
+    /** Authentication success message */
     success?: string;
+
+    /** Whether the two factor authentication codes were copied */
     codesAreCopied?: boolean;
+
+    /** Current two factor authentication step */
     twoFactorAuthStep?: TwoFactorAuthStep;
+
+    /** Referral banners that the user dismissed */
     dismissedReferralBanners?: DismissedReferralBanners;
 
-    /** Object containing all account information necessary to connect with Spontana */
-    travelSettings?: TravelSettings;
+    /** Indicates whether the user is an approved accountant */
+    isApprovedAccountant?: boolean;
+
+    /** Indicates whether the user is a client of an approved accountant */
+    isApprovedAccountantClient?: boolean;
+
+    /** Indicates whether the user can downgrade current subscription plan */
+    canDowngrade?: boolean;
+
+    /** Indicates whether the user can downgrade current subscription plan */
+    isEligibleForRefund?: boolean;
+
+    /** Indicates whether the user has at least one previous purchase */
+    hasPurchases?: boolean;
+
+    /** The users you can access as delegate and the users who can access your account as a delegate */
+    delegatedAccess?: DelegatedAccess;
 };
 
 export default Account;
-export type {TwoFactorAuthStep};
+export type {TwoFactorAuthStep, DelegateRole, DelegatedAccess};
diff --git a/src/types/onyx/AccountData.ts b/src/types/onyx/AccountData.ts
index 124a006ff57c..010715f15f85 100644
--- a/src/types/onyx/AccountData.ts
+++ b/src/types/onyx/AccountData.ts
@@ -1,15 +1,7 @@
-import type {BankName} from './Bank';
+import type {BankAccountAdditionalData} from './BankAccount';
 import type * as OnyxCommon from './OnyxCommon';
 
-type AdditionalData = {
-    isP2PDebitCard?: boolean;
-    beneficialOwners?: string[];
-    currency?: string;
-    bankName?: BankName;
-    fieldsType?: string;
-    country?: string;
-};
-
+/** Model of bank account data */
 type AccountData = {
     /** The masked bank account number */
     accountNumber?: string;
@@ -38,13 +30,14 @@ type AccountData = {
     /** All user emails that have access to this bank account */
     sharees?: string[];
 
+    /** Institution that processes the account payments */
     processor?: string;
 
     /** The bankAccountID in the bankAccounts db */
     bankAccountID?: number;
 
     /** All data related to the bank account */
-    additionalData?: AdditionalData;
+    additionalData?: BankAccountAdditionalData;
 
     /** The bank account type */
     type?: string;
@@ -52,6 +45,7 @@ type AccountData = {
     /** Any error message to show */
     errors?: OnyxCommon.Errors;
 
+    /** The debit card ID */
     fundID?: number;
 };
 
diff --git a/src/types/onyx/ApprovalWorkflow.ts b/src/types/onyx/ApprovalWorkflow.ts
new file mode 100644
index 000000000000..e1d746b26a9c
--- /dev/null
+++ b/src/types/onyx/ApprovalWorkflow.ts
@@ -0,0 +1,119 @@
+import type {ValueOf} from 'type-fest';
+import type {AvatarSource} from '@libs/UserUtils';
+import type CONST from '@src/CONST';
+import type {TranslationPaths} from '@src/languages/types';
+
+/**
+ * Approver in the approval workflow
+ */
+type Approver = {
+    /**
+     * Email of the approver
+     */
+    email: string;
+
+    /**
+     * Email of the user this user forwards all approved reports to
+     */
+    forwardsTo?: string;
+
+    /**
+     * Avatar URL of the current user from their personal details
+     */
+    avatar?: AvatarSource;
+
+    /**
+     * Display name of the current user from their personal details
+     */
+    displayName: string;
+
+    /**
+     * Is this approver in a circular reference (approver forwards to themselves, or a cycle of forwards)
+     *
+     * example: A -> A (self forwards)
+     * example: A -> B -> C -> A (cycle)
+     */
+    isCircularReference?: boolean;
+};
+
+/**
+ * Member in the approval workflow
+ */
+type Member = {
+    /**
+     * Email of the member
+     */
+    email: string;
+
+    /**
+     * Display name of the current user from their personal details
+     */
+    displayName: string;
+
+    /**
+     * Avatar URL of the current user from their personal details
+     */
+    avatar?: AvatarSource;
+};
+
+/**
+ * Approval workflow for a group of employees
+ */
+type ApprovalWorkflow = {
+    /**
+     * List of member emails in the workflow
+     */
+    members: Member[];
+
+    /**
+     * List of approvers in the workflow (the order of approvers in this array is important)
+     *
+     * The first approver in the array is the first approver in the workflow, next approver is the one they forward to, etc.
+     */
+    approvers: Approver[];
+
+    /**
+     * Is this the default workflow for the policy (first approver of this workflow is the same as the policy's default approver)
+     */
+    isDefault: boolean;
+};
+
+/**
+ * Approval workflow for a group of employees with additional properties for the Onyx store
+ */
+type ApprovalWorkflowOnyx = Omit<ApprovalWorkflow, 'approvers'> & {
+    /**
+     * List of approvers in the workflow (the order of approvers in this array is important)
+     *
+     * The first approver in the array is the first approver in the workflow, next approver is the one they forward to, etc.
+     */
+    approvers: Array<Approver | undefined>;
+
+    /**
+     * The current action of the workflow, used to navigate between different screens
+     */
+    action: ValueOf<typeof CONST.APPROVAL_WORKFLOW.ACTION>;
+
+    /**
+     * Whether we are waiting for the API action to complete
+     */
+    isLoading: boolean;
+
+    /**
+     * List of available members that can be selected in the workflow
+     */
+    availableMembers: Member[];
+
+    /**
+     * List of emails that are already in use in other workflows
+     */
+    usedApproverEmails: string[];
+
+    /**
+     * Errors for the workflow
+     */
+    errors?: Record<string, TranslationPaths>;
+};
+
+export default ApprovalWorkflow;
+export type {ApprovalWorkflowOnyx, Approver, Member};
diff --git a/src/types/onyx/Bank.ts b/src/types/onyx/Bank.ts
index 72b5fcda4788..3eee283da5c6 100644
--- a/src/types/onyx/Bank.ts
+++ b/src/types/onyx/Bank.ts
@@ -3,15 +3,28 @@ import type {ValueOf} from 'type-fest';
 import type CONST from '@src/CONST';
 import type IconAsset from '@src/types/utils/IconAsset';
 
+/** Bank icon configurations */
 type BankIcon = {
+    /** Source of the icon, can be a component or an image */
     icon: IconAsset;
+
+    /** Size of the icon */
     iconSize?: number;
+
+    /** Height of the icon */
     iconHeight?: number;
+
+    /** Width of the icon */
     iconWidth?: number;
+
+    /** Icon wrapper styles */
     iconStyles?: ViewStyle[];
 };
 
+/** Bank names */
 type BankName = ValueOf<typeof CONST.BANK_NAMES>;
+
+/** Bank name keys */
 type BankNameKey = keyof typeof CONST.BANK_NAMES;
 
 export type {BankIcon, BankName, BankNameKey};
diff --git a/src/types/onyx/BankAccount.ts b/src/types/onyx/BankAccount.ts
index d0f80708842c..6da03440fb2e 100644
--- a/src/types/onyx/BankAccount.ts
+++ b/src/types/onyx/BankAccount.ts
@@ -1,16 +1,36 @@
 import type CONST from '@src/CONST';
 import type AccountData from './AccountData';
+import type {BankName} from './Bank';
 import type * as OnyxCommon from './OnyxCommon';
 
-type AdditionalData = {
+/** Model of additional bank account data */
+type BankAccountAdditionalData = {
+    /** Is a Peer-To-Peer Debit Card */
     isP2PDebitCard?: boolean;
+
+    /** Owners that can benefit from this bank account */
     beneficialOwners?: string[];
+
+    /** In which currency is the bank account */
     currency?: string;
-    bankName?: string;
+
+    /** In which bank is the bank account */
+    bankName?: BankName;
+
+    /** Plaid account id */
+    plaidAccountID?: string;
+
+    /** Whether the bank account details were obtained for local transfer or international wire */
     fieldsType?: string;
+
+    /** In which country is the bank account */
     country?: string;
+
+    /** Is billing card */
+    isBillingCard?: boolean;
 };
 
+/** Model of bank account */
 type BankAccount = OnyxCommon.OnyxValueWithOfflineFeedback<{
     /** The bank account type */
     accountType?: typeof CONST.PAYMENT_METHODS.PERSONAL_BANK_ACCOUNT;
@@ -18,15 +38,16 @@ type BankAccount = OnyxCommon.OnyxValueWithOfflineFeedback<{
     /** string like 'Account ending in XXXX' */
     description?: string;
 
+    /** Determines if the bank account is a default payment method */
     isDefault?: boolean;
 
-    /* Determines if the bank account is a savings account */
+    /** Determines if the bank account is a savings account */
     isSavings?: boolean;
 
-    /** Date when the 3 micro amounts for validation were supposed to reach the bank account. */
+    /** Date when the 3 micro amounts for validation were supposed to reach the bank account */
     validateCodeExpectedDate?: string;
 
-    /** string like 'bankAccount-{<bankAccountID>}' where <bankAccountID> is the bankAccountID */
+    /** string like `bankAccount-<bankAccountID>` */
     key?: string;
 
     /** Alias for bankAccountID */
@@ -42,7 +63,8 @@ type BankAccount = OnyxCommon.OnyxValueWithOfflineFeedback<{
     errors?: OnyxCommon.Errors;
 }>;
 
+/** Record of bank accounts, indexed by bankAccountID */
 type BankAccountList = Record<string, BankAccount>;
 
 export default BankAccount;
-export type {AccountData, AdditionalData, BankAccountList};
+export type {AccountData, BankAccountAdditionalData, BankAccountList};
diff --git a/src/types/onyx/Beta.ts b/src/types/onyx/Beta.ts
index 35ed4c804ab8..1c282409aea5 100644
--- a/src/types/onyx/Beta.ts
+++ b/src/types/onyx/Beta.ts
@@ -1,6 +1,7 @@
 import type {ValueOf} from 'type-fest';
 import type CONST from '@src/CONST';
 
+/** New Dot Beta features */
 type Beta = ValueOf<typeof CONST.BETAS>;
 
 export default Beta;
diff --git a/src/types/onyx/BillingGraceEndPeriod.ts b/src/types/onyx/BillingGraceEndPeriod.ts
new file mode 100644
index 000000000000..01b440dcab4e
--- /dev/null
+++ b/src/types/onyx/BillingGraceEndPeriod.ts
@@ -0,0 +1,7 @@
+/** Model of BillingGraceEndPeriod's Shared NVP record */
+type BillingGraceEndPeriod = {
+    /** The grace period end date (epoch timestamp) of the workspace's owner where the user is a member of. */
+    value: number;
+};
+
+export default BillingGraceEndPeriod;
diff --git a/src/types/onyx/BillingStatus.ts b/src/types/onyx/BillingStatus.ts
new file mode 100644
index 000000000000..a28c5b5f770a
--- /dev/null
+++ b/src/types/onyx/BillingStatus.ts
@@ -0,0 +1,16 @@
+/** Billing status model */
+type BillingStatus = {
+    /** Status action */
+    action: string;
+
+    /** Billing period month */
+    periodMonth: string;
+
+    /** Billing period year */
+    periodYear: string;
+
+    /** Decline reason */
+    declineReason: 'insufficient_funds' | 'expired_card';
+};
+
+export default BillingStatus;
diff --git a/src/types/onyx/BlockedFromConcierge.ts b/src/types/onyx/BlockedFromConcierge.ts
index 4eebd537604c..ed4381076555 100644
--- a/src/types/onyx/BlockedFromConcierge.ts
+++ b/src/types/onyx/BlockedFromConcierge.ts
@@ -1,3 +1,4 @@
+/** Model of blocked user from concierge */
 type BlockedFromConcierge = {
     /** The date that the user will be unblocked */
     expiresAt: string;
diff --git a/src/types/onyx/CancellationDetails.ts b/src/types/onyx/CancellationDetails.ts
new file mode 100644
index 000000000000..8296a1336757
--- /dev/null
+++ b/src/types/onyx/CancellationDetails.ts
@@ -0,0 +1,29 @@
+import type {CancellationType, FeedbackSurveyOptionID} from '@src/CONST';
+import type * as OnyxCommon from './OnyxCommon';
+import type PrivateSubscription from './PrivateSubscription';
+
+/** Cancellation details model */
+type CancellationDetails = {
+    /** Cancellation date */
+    cancellationDate?: string;
+
+    /** Cancellation reason */
+    cancellationReason: FeedbackSurveyOptionID;
+
+    /** Cancellation type (manual/automatic/none) */
+    cancellationType: CancellationType;
+
+    /** Additional note */
+    note: string;
+
+    /** Cancellation request date */
+    requestDate: string;
+
+    /** Canceled subscription object */
+    subscription: PrivateSubscription;
+
+    /** Cancellation errors */
+    errors?: OnyxCommon.Errors;
+};
+
+export default CancellationDetails;
diff --git a/src/types/onyx/Card.ts b/src/types/onyx/Card.ts
index 50403b982c0d..24640df9e2da 100644
--- a/src/types/onyx/Card.ts
+++ b/src/types/onyx/Card.ts
@@ -2,44 +2,134 @@ import type {ValueOf} from 'type-fest';
 import type CONST from '@src/CONST';
 import type * as OnyxCommon from './OnyxCommon';
 
+/** Model of Expensify card */
 type Card = {
+    /** Card ID number */
     cardID: number;
+
+    /** Current card state */
     state: ValueOf<typeof CONST.EXPENSIFY_CARD.STATE>;
+
+    /** Bank name */
     bank: string;
-    availableSpend: number;
+
+    /** Available amount to spend */
+    availableSpend?: number;
+
+    /** Spend that is unapproved on the card (comes as a negative number) */
+    unapprovedSpend?: number;
+
+    /** Total spend on the card (comes as a negative number) */
+    totalSpend?: number;
+
+    /** Domain name */
     domainName: string;
+
+    /** Last four Primary Account Number digits */
     lastFourPAN?: string;
+
+    /** Current fraud state of the card */
     fraud: ValueOf<typeof CONST.EXPENSIFY_CARD.FRAUD_TYPES>;
+
+    /** Card related error messages */
     errors?: OnyxCommon.Errors;
+
+    /** Is card data loading */
     isLoading?: boolean;
+
+    /** Cardholder account ID */
+    accountID?: number;
+
+    /** Additional card data */
     nameValuePairs?: {
+        /** Type of card spending limits */
         limitType?: ValueOf<typeof CONST.EXPENSIFY_CARD.LIMIT_TYPES>;
-        cardTitle?: string; // Used only for admin-issued virtual cards
+
+        /** User-defined nickname for the card */
+        cardTitle?: string;
+
+        /** Account ID of user that issued the card */
         issuedBy?: number;
+
+        /**
+         * Whether the card has a custom unapproved expense limit.
+         * When not set, the domain unapproved expense limit is used
+         */
         hasCustomUnapprovedExpenseLimit?: boolean;
+
+        /**
+         * The maximum unapproved spend allowed on the card.
+         * If it's $100 and you spend $100, you need to get the expenses approved for the card to continue working
+         */
         unapprovedExpenseLimit?: number;
+
+        /** Card product under which the card is provisioned */
         feedCountry?: string;
+
+        /** Is a virtual card */
         isVirtual?: boolean;
+
+        /** Previous card state */
         previousState?: number;
+
+        /** Card expiration date */
         expirationDate?: string;
     };
 };
 
-type TCardDetails = {
+/** Model of Expensify card details */
+type ExpensifyCardDetails = {
+    /** Card Primary Account Number */
     pan: string;
+
+    /** Card expiration date */
     expiration: string;
+
+    /** Card Verification Value number */
     cvv: string;
-    address: {
-        street: string;
-        street2: string;
-        city: string;
-        state: string;
-        zip: string;
-        country: string;
-    };
 };
 
+/** Record of Expensify cards, indexed by cardID */
 type CardList = Record<string, Card>;
 
+/** Issue new card flow steps */
+type IssueNewCardStep = ValueOf<typeof CONST.EXPENSIFY_CARD.STEP>;
+
+/** Card spending limit type */
+type CardLimitType = ValueOf<typeof CONST.EXPENSIFY_CARD.LIMIT_TYPES>;
+
+/** Data required to be sent to issue a new card */
+type IssueNewCardData = {
+    /** The email address of the cardholder */
+    assigneeEmail: string;
+
+    /** Card type */
+    cardType: ValueOf<typeof CONST.EXPENSIFY_CARD.CARD_TYPE>;
+
+    /** Card spending limit type */
+    limitType: CardLimitType;
+
+    /** Card spending limit */
+    limit: number;
+
+    /** Name of the card */
+    cardTitle: string;
+};
+
+/** Model of Issue new card flow */
+type IssueNewCard = {
+    /** The current step of the flow */
+    currentStep: IssueNewCardStep;
+
+    /** Data required to be sent to issue a new card */
+    data: IssueNewCardData;
+
+    /** Whether the user is editing step */
+    isEditing: boolean;
+};
+
+/** List of Expensify cards */
+type WorkspaceCardsList = Record<string, Card>;
+
 export default Card;
-export type {TCardDetails, CardList};
+export type {ExpensifyCardDetails, CardList, IssueNewCard, IssueNewCardStep, IssueNewCardData, WorkspaceCardsList, CardLimitType};
diff --git a/src/types/onyx/CardFeeds.ts b/src/types/onyx/CardFeeds.ts
new file mode 100644
index 000000000000..59d93a192cf8
--- /dev/null
+++ b/src/types/onyx/CardFeeds.ts
@@ -0,0 +1,34 @@
+/** Card feed data */
+type CardFeedData = {
+    /** Whether any actions are pending */
+    pending: boolean;
+
+    /** Determines if Automated Statement Reconciliation (ASR) is enabled for the cards */
+    asrEnabled: boolean;
+
+    /** Specifies if the expenses on this card should be force reimbursable */
+    forceReimbursable: string;
+
+    /** Defines the type of liability for the card */
+    liabilityType: string;
+
+    /** Preferred policy */
+    preferredPolicy: string;
+
+    /** Specifies the format for the report title related to this card */
+    reportTitleFormat: string;
+
+    /** Indicates the day when the statement period for this card ends */
+    statementPeriodEndDay: string;
+};
+
+/** Card feeds model */
+type CardFeeds = {
+    /** Company cards feeds */
+    companyCards: Record<string, CardFeedData>;
+
+    /** User-friendly feed nicknames */
+    companyCardNicknames: Record<string, string>;
+};
+
+export default CardFeeds;
diff --git a/src/types/onyx/Console.ts b/src/types/onyx/Console.ts
index 592d23fecfa0..03c76b6912b5 100644
--- a/src/types/onyx/Console.ts
+++ b/src/types/onyx/Console.ts
@@ -1,11 +1,21 @@
 import type CONST from '@src/CONST';
 
+/** Model of a log */
 type Log = {
+    /** Log time */
     time: Date;
+
+    /** Log level */
     level: keyof typeof CONST.DEBUG_CONSOLE.LEVELS;
+
+    /** Log message */
     message: string;
+
+    /** Additional data */
+    extraData: string | Record<string, unknown> | Array<Record<string, unknown>> | Error;
 };
 
+/** Record of captured logs */
 type CapturedLogs = Record<number, Log>;
 
 export type {Log, CapturedLogs};
diff --git a/src/types/onyx/Credentials.ts b/src/types/onyx/Credentials.ts
index 6a22eeb5af89..135cbae5fe76 100644
--- a/src/types/onyx/Credentials.ts
+++ b/src/types/onyx/Credentials.ts
@@ -1,3 +1,4 @@
+/** Model of user credentials */
 type Credentials = {
     /** The email/phone the user logged in with */
     login?: string;
diff --git a/src/types/onyx/Currency.ts b/src/types/onyx/Currency.ts
index b8d6f8dda88b..69b4203cdbf1 100644
--- a/src/types/onyx/Currency.ts
+++ b/src/types/onyx/Currency.ts
@@ -1,3 +1,4 @@
+/** Model of currency */
 type Currency = {
     /** Symbol for the currency */
     symbol: string;
@@ -21,6 +22,7 @@ type Currency = {
     cacheBurst?: number;
 };
 
+/** Record of currencies, index by currency code */
 type CurrencyList = Record<string, Currency | null>;
 
 export default Currency;
diff --git a/src/types/onyx/CustomStatusDraft.ts b/src/types/onyx/CustomStatusDraft.ts
index 73c8fa4baa1a..d29061f5b5ed 100644
--- a/src/types/onyx/CustomStatusDraft.ts
+++ b/src/types/onyx/CustomStatusDraft.ts
@@ -1,3 +1,4 @@
+/** Model of custom status draft */
 type CustomStatusDraft = {
     /** The emoji code of the draft status */
     emojiCode?: string;
diff --git a/src/types/onyx/DismissedReferralBanners.ts b/src/types/onyx/DismissedReferralBanners.ts
index 86937d3bfbaf..92b3da647759 100644
--- a/src/types/onyx/DismissedReferralBanners.ts
+++ b/src/types/onyx/DismissedReferralBanners.ts
@@ -1,10 +1,20 @@
 import type CONST from '@src/CONST';
 
+/** Model of dismissed referral banners */
 type DismissedReferralBanners = {
+    /** Is 'Submit expense' referral dismissed */
     [CONST.REFERRAL_PROGRAM.CONTENT_TYPES.SUBMIT_EXPENSE]?: boolean;
+
+    /** Is 'Start chat' referral dismissed */
     [CONST.REFERRAL_PROGRAM.CONTENT_TYPES.START_CHAT]?: boolean;
+
+    /** Is 'Pay someone' referral dismissed */
     [CONST.REFERRAL_PROGRAM.CONTENT_TYPES.PAY_SOMEONE]?: boolean;
+
+    /** Is 'Refer friend' referral dismissed */
     [CONST.REFERRAL_PROGRAM.CONTENT_TYPES.REFER_FRIEND]?: boolean;
+
+    /** Is 'Share code' referral dismissed */
     [CONST.REFERRAL_PROGRAM.CONTENT_TYPES.SHARE_CODE]?: boolean;
 };
 
diff --git a/src/types/onyx/Download.ts b/src/types/onyx/Download.ts
index 9c6c2f61f716..de9e91064ed1 100644
--- a/src/types/onyx/Download.ts
+++ b/src/types/onyx/Download.ts
@@ -1,3 +1,4 @@
+/** Model of file download */
 type Download = {
     /** If a file download is happening */
     isDownloading: boolean;
diff --git a/src/types/onyx/ExpensifyCardSettings.ts b/src/types/onyx/ExpensifyCardSettings.ts
new file mode 100644
index 000000000000..05c6667e7c05
--- /dev/null
+++ b/src/types/onyx/ExpensifyCardSettings.ts
@@ -0,0 +1,27 @@
+import type * as OnyxCommon from './OnyxCommon';
+
+/** Model of Expensify card settings for a workspace */
+type ExpensifyCardSettings = OnyxCommon.OnyxValueWithOfflineFeedback<{
+    /** Sum of all posted Expensify Card transactions */
+    currentBalance?: number;
+
+    /** Remaining limit for Expensify Cards on the workspace */
+    remainingLimit?: number;
+
+    /** The total amount of cash back earned thus far */
+    earnedCashback?: number;
+
+    /** The date of the last settlement */
+    monthlySettlementDate: Date;
+
+    /** Whether monthly option should appear in the settlement frequency settings */
+    isMonthlySettlementAllowed: boolean;
+
+    /** The bank account chosen for the card settlement */
+    paymentBankAccountID: number;
+
+    /** Whether we are loading the data via the API */
+    isLoading?: boolean;
+}>;
+
+export default ExpensifyCardSettings;
diff --git a/src/types/onyx/FrequentlyUsedEmoji.ts b/src/types/onyx/FrequentlyUsedEmoji.ts
index c8f6a5179fc6..82de844c0c6f 100644
--- a/src/types/onyx/FrequentlyUsedEmoji.ts
+++ b/src/types/onyx/FrequentlyUsedEmoji.ts
@@ -1,3 +1,4 @@
+/** Model of frequently used emoji */
 type FrequentlyUsedEmoji = {
     /** The emoji code */
     code: string;
diff --git a/src/types/onyx/Fund.ts b/src/types/onyx/Fund.ts
index a3c0a95849d1..7e29334aeca0 100644
--- a/src/types/onyx/Fund.ts
+++ b/src/types/onyx/Fund.ts
@@ -1,41 +1,76 @@
+import type {ValueOf} from 'type-fest';
 import type CONST from '@src/CONST';
 import type {BankName} from './Bank';
+import type {BankAccountAdditionalData} from './BankAccount';
 import type * as OnyxCommon from './OnyxCommon';
 
-type AdditionalData = {
-    isBillingCard?: boolean;
-    isP2PDebitCard?: boolean;
-};
-
+/** Model of debit card account data */
 type AccountData = {
-    additionalData?: AdditionalData;
+    /** Additional account data */
+    additionalData?: BankAccountAdditionalData;
+
+    /** Address name */
     addressName?: string;
+
+    /** Address state */
     addressState?: string;
+
+    /** Address street */
     addressStreet?: string;
+
+    /** Address zip code */
     addressZip?: number;
+
+    /** Debit card month */
     cardMonth?: number;
 
-    /** The masked credit card number */
+    /** The masked debit card number */
     cardNumber?: string;
 
+    /** Debit card year */
     cardYear?: number;
+
+    /** Debit card creation date */
     created?: string;
-    currency?: string;
+
+    /** Debit card currency */
+    currency?: ValueOf<typeof CONST.PAYMENT_CARD_CURRENCY>;
+
+    /** Debit card ID number */
     fundID?: number;
+
+    /** Debit card bank name */
     bank?: BankName;
 };
 
+/** Model of debit card fund */
 type Fund = OnyxCommon.OnyxValueWithOfflineFeedback<{
+    /** All data related to the debit card */
     accountData?: AccountData;
+
+    /** Debit card type */
     accountType?: typeof CONST.PAYMENT_METHODS.DEBIT_CARD;
+
+    /** Debit card description */
     description?: string;
+
+    /** String like `fund-<fundID>` */
     key?: string;
+
+    /** Alias for fundID */
     methodID?: number;
+
+    /** Debit card title */
     title?: string;
+
+    /** Is default debit card */
     isDefault?: boolean;
+
+    /** Debit card related error messages */
     errors?: OnyxCommon.Errors;
 }>;
 
+/** Record of debit card funds, indexed by fundID */
 type FundList = Record<string, Fund>;
 
 export default Fund;
diff --git a/src/types/onyx/IOU.ts b/src/types/onyx/IOU.ts
index 726b94c5f6d3..59db6db0a35c 100644
--- a/src/types/onyx/IOU.ts
+++ b/src/types/onyx/IOU.ts
@@ -1,61 +1,171 @@
 import type {ValueOf} from 'type-fest';
 import type CONST from '@src/CONST';
+import type {IOUType} from '@src/CONST';
 import type {Icon} from './OnyxCommon';
+import type Report from './Report';
 
+/** Model of IOU participant */
 type Participant = {
+    /** IOU participant account ID */
     accountID?: number;
+
+    /** IOU participant login */
     login?: string;
+
+    /** IOU participant display name */
     displayName?: string;
+
+    /** Is IOU participant associated with policy expense chat */
     isPolicyExpenseChat?: boolean;
+
+    /** Whether the IOU participant is an invoice receiver */
+    isInvoiceRoom?: boolean;
+
+    /** Is IOU participant associated with is own policy expense chat */
     isOwnPolicyExpenseChat?: boolean;
+
+    /** Type of chat associated with IOU participant */
     chatType?: ValueOf<typeof CONST.REPORT.CHAT_TYPE>;
+
+    /** IOU participant report ID */
     reportID?: string;
+
+    /** IOU participant policy ID */
     policyID?: string;
+
+    /** Is IOU participant selected in list */
     selected?: boolean;
+
+    /** Text that IOU participant display name and login, if available, for searching purposes */
     searchText?: string;
+
+    /** Additional text shown in lists (participant phone number or display name) */
     alternateText?: string;
+
+    /** IOU participant first name */
     firstName?: string;
+
+    /** Icons used in lists (participant avatar) */
     icons?: Icon[];
+
+    /** Key to be used in lists (participant account ID) */
     keyForList?: string;
+
+    /** IOU participant last name */
     lastName?: string;
+
+    /** IOU participant phone number */
     phoneNumber?: string;
+
+    /** Text to be displayed in lists (participant display name) */
     text?: string;
+
+    /** Is IOU participant selected in list */
     isSelected?: boolean;
+
+    /** Is IOU participant the current user */
     isSelfDM?: boolean;
+
+    /** Whether the IOU participant is an invoice sender */
     isSender?: boolean;
+
+    /** The type of IOU report, i.e. split, request, send, track */
+    iouType?: IOUType;
+
+    /** When the participant is associated with a policy expense chat, this is the account ID of the policy owner */
+    ownerAccountID?: number;
+
+    /** The report associated to the IOU participant */
+    item?: Report;
 };
 
+/** Model of IOU split */
 type Split = {
+    /** IOU split participant email */
     email?: string;
+
+    /** IOU split participant amount paid */
     amount?: number;
+
+    /** IOU split participant account ID */
     accountID?: number;
+
+    /** Chat report ID */
     chatReportID?: string;
+
+    /** IOU report ID */
     iouReportID?: string;
+
+    /** Report Action ID */
     reportActionID?: string;
+
+    /** Transaction ID */
     transactionID?: string;
+
+    /** Policy ID */
     policyID?: string;
+
+    /** Created chat report action ID */
     createdChatReportActionID?: string;
+
+    /** Created IOU report action ID */
     createdIOUReportActionID?: string;
+
+    /** Report preview report action ID */
     reportPreviewReportActionID?: string;
+
+    /** Transaction thread report ID */
     transactionThreadReportID?: string;
+
+    /** Created report action ID for thread */
     createdReportActionIDForThread?: string;
+
+    /** IOU tax amount */
+    taxAmount?: number;
 };
 
+/** Model of IOU request */
 type IOU = {
+    /** ID of the IOU request */
     id: string;
+
+    /** Amount requested in IOU */
     amount?: number;
+
     /** Selected Currency Code of the current IOU */
     currency?: string;
+
+    /** Comment of the IOU request creator */
     comment?: string;
+
+    /** Category assigned to the IOU request */
     category?: string;
+
+    /** Merchant where the amount was spent */
     merchant?: string;
+
+    /** Date timestamp when the IOU request was created */
     created?: string;
+
+    /** Local file path of the expense receipt */
     receiptPath?: string;
+
+    /** File name of the expense receipt */
     receiptFilename?: string;
+
+    /** Transaction ID assigned to the IOU request */
     transactionID?: string;
+
+    /** Users involved in the IOU request */
     participants?: Participant[];
+
+    /** Tag assigned to the IOU request */
     tag?: string;
+
+    /** Whether the IOU request is billable */
     billable?: boolean;
+
+    /** Whether the IOU request is to be split with multiple users */
     isSplitRequest?: boolean;
 };
 
diff --git a/src/types/onyx/IntroSelected.ts b/src/types/onyx/IntroSelected.ts
index 14a0d2f70dfe..6850f651ca2a 100644
--- a/src/types/onyx/IntroSelected.ts
+++ b/src/types/onyx/IntroSelected.ts
@@ -1,5 +1,6 @@
 import type {OnboardingPurposeType} from '@src/CONST';
 
+/** Model of onboarding */
 type IntroSelected = {
     /** The choice that the user selected in the engagement modal */
     choice: OnboardingPurposeType;
diff --git a/src/types/onyx/InvitedEmailsToAccountIDs.ts b/src/types/onyx/InvitedEmailsToAccountIDs.ts
index 929d21746682..1f233e7c968c 100644
--- a/src/types/onyx/InvitedEmailsToAccountIDs.ts
+++ b/src/types/onyx/InvitedEmailsToAccountIDs.ts
@@ -1,3 +1,4 @@
+/** Record of workspace invited accountIDs, indexed by login name of inviter */
 type InvitedEmailsToAccountIDs = Record<string, number>;
 
 export default InvitedEmailsToAccountIDs;
diff --git a/src/types/onyx/LastExportMethod.ts b/src/types/onyx/LastExportMethod.ts
new file mode 100644
index 000000000000..0af3b1a05f1e
--- /dev/null
+++ b/src/types/onyx/LastExportMethod.ts
@@ -0,0 +1,6 @@
+import type {ReportExportType} from '@components/ButtonWithDropdownMenu/types';
+
+/** Record of last export methods, indexed by policy id */
+type LastExportMethod = Record<string, ReportExportType>;
+
+export default LastExportMethod;
diff --git a/src/types/onyx/LastPaymentMethod.ts b/src/types/onyx/LastPaymentMethod.ts
index 677a23fa9586..ea0c644fc730 100644
--- a/src/types/onyx/LastPaymentMethod.ts
+++ b/src/types/onyx/LastPaymentMethod.ts
@@ -1,3 +1,4 @@
+/** Record of last payment methods, indexed by policy id */
 type LastPaymentMethod = Record<string, string>;
 
 export default LastPaymentMethod;
diff --git a/src/types/onyx/LastSelectedDistanceRates.ts b/src/types/onyx/LastSelectedDistanceRates.ts
index 1db1cf32b160..3b09864db905 100644
--- a/src/types/onyx/LastSelectedDistanceRates.ts
+++ b/src/types/onyx/LastSelectedDistanceRates.ts
@@ -1,3 +1,4 @@
+/** Record of last selected distance rates, indexed by policy id */
 type LastSelectedDistanceRates = Record<string, string>;
 
 export default LastSelectedDistanceRates;
diff --git a/src/types/onyx/Locale.ts b/src/types/onyx/Locale.ts
index 89d7636009d7..37c340945bf1 100644
--- a/src/types/onyx/Locale.ts
+++ b/src/types/onyx/Locale.ts
@@ -1,6 +1,7 @@
 import type {ValueOf} from 'type-fest';
 import type CONST from '@src/CONST';
 
+/** Available locale values */
 type Locale = ValueOf<typeof CONST.LOCALES>;
 
 export default Locale;
diff --git a/src/types/onyx/Login.ts b/src/types/onyx/Login.ts
index fec12da1b8e4..d89b7f2a29a3 100644
--- a/src/types/onyx/Login.ts
+++ b/src/types/onyx/Login.ts
@@ -1,5 +1,6 @@
 import type * as OnyxCommon from './OnyxCommon';
 
+/** Model of user login data */
 type Login = OnyxCommon.OnyxValueWithOfflineFeedback<
     {
         /** Phone/Email associated with user */
@@ -20,6 +21,7 @@ type Login = OnyxCommon.OnyxValueWithOfflineFeedback<
     'defaultLogin' | 'validateLogin' | 'addedLogin' | 'deletedLogin'
 >;
 
+/** Record of user login data, indexed by partnerUserID */
 type LoginList = Record<string, Login>;
 
 export default Login;
diff --git a/src/types/onyx/MapboxAccessToken.ts b/src/types/onyx/MapboxAccessToken.ts
index bea23bcf86c4..9af8621d09b4 100644
--- a/src/types/onyx/MapboxAccessToken.ts
+++ b/src/types/onyx/MapboxAccessToken.ts
@@ -1,6 +1,12 @@
+/** Model of Mapbox access token data */
 type MapboxAccessToken = {
+    /** Mapbox access token */
     token: string;
+
+    /** Mapbox access token expiration date */
     expiration: string;
+
+    /** Mapbox access error messages */
     errors: string[];
 };
 
diff --git a/src/types/onyx/MobileSelectionMode.ts b/src/types/onyx/MobileSelectionMode.ts
new file mode 100644
index 000000000000..a54909a1d19f
--- /dev/null
+++ b/src/types/onyx/MobileSelectionMode.ts
@@ -0,0 +1,11 @@
+/**
+ * Model of mobile selection mode
+ */
+type MobileSelectionMode = {
+    /**
+     *  Whether the mobile selection mode is enabled or not
+     */
+    isEnabled: boolean;
+};
+
+export default MobileSelectionMode;
diff --git a/src/types/onyx/Modal.ts b/src/types/onyx/Modal.ts
index 1ea96cd283ce..b4b761cc8677 100644
--- a/src/types/onyx/Modal.ts
+++ b/src/types/onyx/Modal.ts
@@ -1,3 +1,4 @@
+/** Modal state */
 type Modal = {
     /** Indicates when an Alert modal is about to be visible */
     willAlertModalBecomeVisible?: boolean;
@@ -8,6 +9,7 @@ type Modal = {
     /** Indicates if there is a modal currently visible or not */
     isVisible?: boolean;
 
+    /** Indicates if the modal is a popover */
     isPopover?: boolean;
 };
 
diff --git a/src/types/onyx/Network.ts b/src/types/onyx/Network.ts
index cdfa7e02c8f6..680c6c468c00 100644
--- a/src/types/onyx/Network.ts
+++ b/src/types/onyx/Network.ts
@@ -1,5 +1,6 @@
 import type {NetworkStatus} from '@libs/NetworkConnection';
 
+/** Model of network state */
 type Network = {
     /** Is the network currently offline or not */
     isOffline: boolean;
diff --git a/src/types/onyx/NewGroupChatDraft.ts b/src/types/onyx/NewGroupChatDraft.ts
index 008475212cbe..e075ed6e5e33 100644
--- a/src/types/onyx/NewGroupChatDraft.ts
+++ b/src/types/onyx/NewGroupChatDraft.ts
@@ -1,12 +1,28 @@
+/** Selected chat participant */
 type SelectedParticipant = {
+    /** Participant ID */
     accountID: number;
+
+    /** Participant login name */
     login: string;
 };
 
+/** Model of new group chat draft */
 type NewGroupChatDraft = {
+    /** New group chat participants */
     participants: SelectedParticipant[];
+
+    /** New group chat name */
     reportName: string | null;
+
+    /** New group chat avatar URI */
     avatarUri: string | null;
+
+    /** New group chat avatar file name */
+    avatarFileName: string | null;
+
+    /** New group chat avatar file type */
+    avatarFileType: string | null;
 };
 export type {SelectedParticipant};
 export default NewGroupChatDraft;
diff --git a/src/types/onyx/OldDotAction.ts b/src/types/onyx/OldDotAction.ts
new file mode 100644
index 000000000000..a7ad789a3352
--- /dev/null
+++ b/src/types/onyx/OldDotAction.ts
@@ -0,0 +1,471 @@
+import type {ValueOf} from 'type-fest';
+import type CONST from '@src/CONST';
+import type {
+    ChangeFieldParams,
+    ChangePolicyParams,
+    DelegateSubmitParams,
+    ExportedToIntegrationParams,
+    IntegrationsMessageParams,
+    MarkReimbursedFromIntegrationParams,
+    ShareParams,
+    UnshareParams,
+} from '@src/languages/types';
+
+/**
+ *
+ */
+type OldDotOriginalMessageActionName =
+    | 'CHANGEFIELD'
+    | 'CHANGEPOLICY'
+    | 'CHANGETYPE'
+    | 'DELEGATESUBMIT'
+    | 'EXPORTCSV'
+    | 'EXPORTINTEGRATION'
+    | 'INTEGRATIONSMESSAGE'
+    | 'MANAGERATTACHRECEIPT'
+    | 'MANAGERDETACHRECEIPT'
+    | 'MARKEDREIMBURSED'
+    | 'MARKREIMBURSEDFROMINTEGRATION'
+    | 'OUTDATEDBANKACCOUNT'
+    | 'REIMBURSEMENTACHBOUNCE'
+    | 'REIMBURSEMENTACHCANCELLED'
+    | 'REIMBURSEMENTACCOUNTCHANGED'
+    | 'REIMBURSEMENTDELAYED'
+    | 'SELECTEDFORRANDOMAUDIT'
+    | 'SHARE'
+    | 'STRIPEPAID'
+    | 'TAKECONTROL'
+    | 'UNAPPROVED'
+    | 'UNSHARE';
+
+/**
+ *
+ */
+type OriginalMessageChangeField = {
+    /**
+     *
+     */
+    actionName: typeof CONST.REPORT.ACTIONS.TYPE.CHANGE_FIELD;
+    /**
+     *
+     */
+    originalMessage: Record<string, unknown> & ChangeFieldParams;
+};
+
+/**
+ *
+ */
+type OriginalMessageChangePolicy = {
+    /**
+     *
+     */
+    actionName: typeof CONST.REPORT.ACTIONS.TYPE.CHANGE_POLICY;
+    /**
+     *
+     */
+    originalMessage: ChangePolicyParams & Record<string, unknown>;
+};
+
+// Currently lacking Params
+// type OriginalMessageChangeType = {
+//     /**
+//      *
+//      */
+//     actionName: typeof CONST.REPORT.ACTIONS.TYPE.CHANGE_TYPE;
+//     /**
+//      *
+//      */
+//     originalMessage: ChangeTypeParams & Record<string, unknown>;
+// };
+
+/**
+ *
+ */
+type OriginalMessageDelegateSubmit = {
+    /**
+     *
+     */
+    actionName: typeof CONST.REPORT.ACTIONS.TYPE.DELEGATE_SUBMIT;
+    /**
+     *
+     */
+    originalMessage: DelegateSubmitParams & Record<string, unknown>;
+};
+
+/**
+ *
+ */
+type OriginalMessageExportedToCSV = {
+    /**
+     *
+     */
+    actionName: typeof CONST.REPORT.ACTIONS.TYPE.EXPORTED_TO_CSV;
+    /**
+     *
+     */
+    originalMessage: Record<string, unknown>;
+};
+
+/**
+ *
+ */
+type OriginalMessageExportedToIntegration = {
+    /**
+     *
+     */
+    actionName: typeof CONST.REPORT.ACTIONS.TYPE.EXPORTED_TO_INTEGRATION;
+    /**
+     *
+     */
+    originalMessage: ExportedToIntegrationParams & Record<string, unknown>;
+};
+
+/**
+ *
+ */
+type OriginalMessageIntegrationsMessage = {
+    /**
+     *
+     */
+    actionName: typeof CONST.REPORT.ACTIONS.TYPE.INTEGRATIONS_MESSAGE;
+    /**
+     *
+     */
+    originalMessage: IntegrationsMessageParams & Record<string, unknown>;
+};
+
+/**
+ *
+ */
+type OriginalMessageManagerAttachReceipt = {
+    /**
+     *
+     */
+    actionName: typeof CONST.REPORT.ACTIONS.TYPE.MANAGER_ATTACH_RECEIPT;
+    /**
+     *
+     */
+    originalMessage: Record<string, unknown>;
+};
+
+/**
+ *
+ */
+type OriginalMessageManagerDetachReceipt = {
+    /**
+     *
+     */
+    actionName: typeof CONST.REPORT.ACTIONS.TYPE.MANAGER_DETACH_RECEIPT;
+    /**
+     *
+     */
+    originalMessage: Record<string, unknown>;
+};
+
+// Currently lacking Params
+// type OriginalMessageMarkedReimbursed = {
+//     /**
+//      *
+//      */
+//     actionName: typeof CONST.REPORT.ACTIONS.TYPE.MARKED_REIMBURSED;
+//     /**
+//      *
+//      */
+//     originalMessage: MarkedReimbursedParams & Record<string, unknown>;
+// };
+
+/**
+ *
+ */
+type OriginalMessageMarkReimbursedFromIntegration = {
+    /**
+     *
+     */
+    actionName: typeof CONST.REPORT.ACTIONS.TYPE.MARK_REIMBURSED_FROM_INTEGRATION;
+    /**
+     *
+     */
+    originalMessage: MarkReimbursedFromIntegrationParams & Record<string, unknown>;
+};
+
+/**
+ *
+ */
+type OriginalMessageOutdatedBankAccount = {
+    /**
+     *
+     */
+    actionName: typeof CONST.REPORT.ACTIONS.TYPE.OUTDATED_BANK_ACCOUNT;
+    /**
+     *
+     */
+    originalMessage: Record<string, unknown>;
+};
+
+/**
+ *
+ */
+type OriginalMessageReimbursementACHBounce = {
+    /**
+     *
+     */
+    actionName: typeof CONST.REPORT.ACTIONS.TYPE.REIMBURSEMENT_ACH_BOUNCE;
+    /**
+     *
+     */
+    originalMessage: Record<string, unknown>;
+};
+
+/**
+ *
+ */
+type OriginalMessageReimbursementACHCancelled = {
+    /**
+     *
+     */
+    actionName: typeof CONST.REPORT.ACTIONS.TYPE.REIMBURSEMENT_ACH_CANCELLED;
+    /**
+     *
+     */
+    originalMessage: Record<string, unknown>;
+};
+
+/**
+ *
+ */
+type OriginalMessageReimbursementAccountChanged = {
+    /**
+     *
+     */
+    actionName: typeof CONST.REPORT.ACTIONS.TYPE.REIMBURSEMENT_ACCOUNT_CHANGED;
+    /**
+     *
+     */
+    originalMessage: Record<string, unknown>;
+};
+
+/**
+ *
+ */
+type OriginalMessageReimbursementDelayed = {
+    /**
+     *
+     */
+    actionName: typeof CONST.REPORT.ACTIONS.TYPE.REIMBURSEMENT_DELAYED;
+    /**
+     *
+     */
+    originalMessage: Record<string, unknown>;
+};
+
+/**
+ *
+ */
+type OriginalMessageSelectedForRandomAudit = {
+    /**
+     *
+     */
+    actionName: typeof CONST.REPORT.ACTIONS.TYPE.SELECTED_FOR_RANDOM_AUDIT;
+    /**
+     *
+     */
+    originalMessage: Record<string, unknown>;
+};
+
+/**
+ *
+ */
+type OriginalMessageShare = {
+    /**
+     *
+     */
+    actionName: typeof CONST.REPORT.ACTIONS.TYPE.SHARE;
+    /**
+     *
+     */
+    originalMessage: ShareParams & Record<string, unknown>;
+};
+
+/**
+ *
+ */
+type OriginalMessageUnshare = {
+    /**
+     *
+     */
+    actionName: typeof CONST.REPORT.ACTIONS.TYPE.UNSHARE;
+    /**
+     *
+     */
+    originalMessage: UnshareParams & Record<string, unknown>;
+};
+
+// Currently lacking Params
+// type OriginalMessageStripePaid = {
+//     /**
+//      *
+//      */
+//     actionName: typeof CONST.REPORT.ACTIONS.TYPE.STRIPE_PAID;
+//     /**
+//      *
+//      */
+//     originalMessage: StripePaidParams & Record<string, unknown>;
+// };
+
+/**
+ *
+ */
+type OriginalMessageTakeControl = {
+    /**
+     *
+     */
+    actionName: typeof CONST.REPORT.ACTIONS.TYPE.TAKE_CONTROL;
+    /**
+     *
+     */
+    originalMessage: Record<string, unknown>;
+};
+
+// Currently lacking Params
+// type OriginalMessageUnapproved = {
+//     /**
+//      *
+//      */
+//     actionName: typeof CONST.REPORT.ACTIONS.TYPE.UNAPPROVED;
+//     /**
+//      *
+//      */
+//     originalMessage: UnapprovedParams & Record<string, unknown>;
+// };
+
+/**
+ *
+ */
+type OldDotOriginalMessageMap = {
+    /**
+     *
+     */
+    [CONST.REPORT.ACTIONS.TYPE.CHANGE_FIELD]: OriginalMessageChangeField;
+    /**
+     *
+     */
+    [CONST.REPORT.ACTIONS.TYPE.CHANGE_POLICY]: OriginalMessageChangePolicy;
+    /**
+     *
+     */
+    [CONST.REPORT.ACTIONS.TYPE.DELEGATE_SUBMIT]: OriginalMessageDelegateSubmit;
+    /**
+     *
+     */
+    [CONST.REPORT.ACTIONS.TYPE.EXPORTED_TO_CSV]: OriginalMessageExportedToCSV;
+    /**
+     *
+     */
+    [CONST.REPORT.ACTIONS.TYPE.EXPORTED_TO_INTEGRATION]: OriginalMessageExportedToIntegration;
+    /**
+     *
+     */
+    [CONST.REPORT.ACTIONS.TYPE.INTEGRATIONS_MESSAGE]: OriginalMessageIntegrationsMessage;
+    /**
+     *
+     */
+    [CONST.REPORT.ACTIONS.TYPE.MANAGER_ATTACH_RECEIPT]: OriginalMessageManagerAttachReceipt;
+    /**
+     *
+     */
+    [CONST.REPORT.ACTIONS.TYPE.MANAGER_DETACH_RECEIPT]: OriginalMessageManagerDetachReceipt;
+    /**
+     *
+     */
+    [CONST.REPORT.ACTIONS.TYPE.MARK_REIMBURSED_FROM_INTEGRATION]: OriginalMessageMarkReimbursedFromIntegration;
+    /**
+     *
+     */
+    [CONST.REPORT.ACTIONS.TYPE.OUTDATED_BANK_ACCOUNT]: OriginalMessageOutdatedBankAccount;
+    /**
+     *
+     */
+    [CONST.REPORT.ACTIONS.TYPE.REIMBURSEMENT_ACH_BOUNCE]: OriginalMessageReimbursementACHBounce;
+    /**
+     *
+     */
+    [CONST.REPORT.ACTIONS.TYPE.REIMBURSEMENT_ACH_CANCELLED]: OriginalMessageReimbursementACHCancelled;
+    /**
+     *
+     */
+    [CONST.REPORT.ACTIONS.TYPE.REIMBURSEMENT_ACCOUNT_CHANGED]: OriginalMessageReimbursementAccountChanged;
+    /**
+     *
+     */
+    [CONST.REPORT.ACTIONS.TYPE.REIMBURSEMENT_DELAYED]: OriginalMessageReimbursementDelayed;
+    /**
+     *
+     */
+    [CONST.REPORT.ACTIONS.TYPE.SELECTED_FOR_RANDOM_AUDIT]: OriginalMessageSelectedForRandomAudit;
+    /**
+     *
+     */
+    [CONST.REPORT.ACTIONS.TYPE.SHARE]: OriginalMessageShare;
+    /**
+     *
+     */
+    [CONST.REPORT.ACTIONS.TYPE.UNSHARE]: OriginalMessageUnshare;
+    /**
+     *
+     */
+    [CONST.REPORT.ACTIONS.TYPE.TAKE_CONTROL]: OriginalMessageTakeControl;
+};
+
+/**
+ *
+ */
+type OldDotLegacyMessage = {
+    /**
+     *
+     */
+    html?: string;
+    /**
+     *
+     */
+    text?: string;
+};
+
+/**
+ *
+ */
+type OldDotLegacyAction = {
+    /**
+     *
+     */
+    message: OldDotLegacyMessage[] | OldDotLegacyMessage;
+};
+
+/**
+ *
+ */
+type OldDotAction = ValueOf<OldDotOriginalMessageMap>;
+
+export default OldDotAction;
+export type {
+    OriginalMessageChangeField,
+    OldDotOriginalMessageActionName,
+    OriginalMessageChangePolicy,
+    OriginalMessageDelegateSubmit,
+    OriginalMessageExportedToCSV,
+    OriginalMessageExportedToIntegration,
+    OriginalMessageIntegrationsMessage,
+    OriginalMessageManagerAttachReceipt,
+    OriginalMessageManagerDetachReceipt,
+    OriginalMessageMarkReimbursedFromIntegration,
+    OriginalMessageOutdatedBankAccount,
+    OriginalMessageReimbursementACHBounce,
+    OriginalMessageReimbursementACHCancelled,
+    OriginalMessageReimbursementAccountChanged,
+    OriginalMessageReimbursementDelayed,
+    OriginalMessageSelectedForRandomAudit,
+    OriginalMessageShare,
+    OriginalMessageUnshare,
+    OriginalMessageTakeControl,
+    OldDotOriginalMessageMap,
+    OldDotLegacyAction,
+};
diff --git a/src/types/onyx/Onboarding.ts b/src/types/onyx/Onboarding.ts
index 3559dea90450..bb250d895c87 100644
--- a/src/types/onyx/Onboarding.ts
+++ b/src/types/onyx/Onboarding.ts
@@ -1,4 +1,8 @@
+/** Model of onboarding */
 type Onboarding = {
+    /** ID of the report used to display the onboarding checklist message */
+    chatReportID?: string;
+
     /** A Boolean that informs whether the user has completed the guided setup onboarding flow */
     hasCompletedGuidedSetupFlow: boolean;
 };
diff --git a/src/types/onyx/OnyxCommon.ts b/src/types/onyx/OnyxCommon.ts
index c4a3afc3e0b9..4f97df07ea26 100644
--- a/src/types/onyx/OnyxCommon.ts
+++ b/src/types/onyx/OnyxCommon.ts
@@ -1,12 +1,14 @@
 import type {ValueOf} from 'type-fest';
-import type {MaybePhraseKey} from '@libs/Localize';
 import type {AvatarSource} from '@libs/UserUtils';
 import type CONST from '@src/CONST';
 
+/** Pending onyx actions */
 type PendingAction = ValueOf<typeof CONST.RED_BRICK_ROAD_PENDING_ACTION> | null;
 
+/** Mapping of form fields with pending actions */
 type PendingFields<TKey extends string> = {[key in Exclude<TKey, 'pendingAction' | 'pendingFields' | 'errorFields'>]?: PendingAction};
 
+/** Offline properties that store information about data that was written while the app was offline */
 type OfflineFeedback<TKey extends string> = {
     /** The type of action that's pending  */
     pendingAction?: PendingAction;
@@ -15,20 +17,29 @@ type OfflineFeedback<TKey extends string> = {
     pendingFields?: PendingFields<TKey>;
 };
 
+/** Onyx data with offline properties that store information about data that was written while the app was offline */
 type OnyxValueWithOfflineFeedback<TOnyx, TKey extends string = never> = keyof TOnyx extends string ? TOnyx & OfflineFeedback<keyof TOnyx | TKey> : never;
 
+/** Mapping of form fields with errors */
 type ErrorFields<TKey extends string = string> = Record<TKey, Errors | null | undefined>;
 
-type Errors = Record<string, MaybePhraseKey | null>;
+/** Mapping of form fields with error translation keys and variables */
+type Errors = Record<string, string | null>;
 
+/**
+ * Types of avatars
+ ** avatar - user avatar
+ ** workspace - workspace avatar
+ */
 type AvatarType = typeof CONST.ICON_TYPE_AVATAR | typeof CONST.ICON_TYPE_WORKSPACE;
 
+/** Icon properties */
 type Icon = {
     /** Avatar source to display */
-    source?: AvatarSource;
+    source: AvatarSource;
 
     /** Denotes whether it is an avatar or a workspace avatar */
-    type?: AvatarType;
+    type: AvatarType;
 
     /** Owner of the avatar. If user, displayName. If workspace, policy name */
     name?: string;
@@ -43,4 +54,4 @@ type Icon = {
     fill?: string;
 };
 
-export type {Icon, PendingAction, ErrorFields, Errors, AvatarType, OnyxValueWithOfflineFeedback};
+export type {Icon, PendingAction, PendingFields, ErrorFields, Errors, AvatarType, OnyxValueWithOfflineFeedback};
diff --git a/src/types/onyx/OnyxInputOrEntry.ts b/src/types/onyx/OnyxInputOrEntry.ts
new file mode 100644
index 000000000000..3ec1e6041bd0
--- /dev/null
+++ b/src/types/onyx/OnyxInputOrEntry.ts
@@ -0,0 +1,8 @@
+import type {OnyxEntry, OnyxInputValue} from 'react-native-onyx';
+
+/**
+ * This type represents that can be either an Onyx entry or an Onyx input value.
+ */
+type OnyxInputOrEntry<TOnyxValue> = OnyxEntry<TOnyxValue> | OnyxInputValue<TOnyxValue>;
+
+export default OnyxInputOrEntry;
diff --git a/src/types/onyx/OnyxUpdatesFromServer.ts b/src/types/onyx/OnyxUpdatesFromServer.ts
index 0877ea6755f8..99d565ede08f 100644
--- a/src/types/onyx/OnyxUpdatesFromServer.ts
+++ b/src/types/onyx/OnyxUpdatesFromServer.ts
@@ -3,25 +3,51 @@ import CONST from '@src/CONST';
 import type Request from './Request';
 import type Response from './Response';
 
+/** Model of a onyx server update */
 type OnyxServerUpdate = OnyxUpdate & {
+    /** Whether the update should notify UI */
     shouldNotify?: boolean;
+
+    /** Whether the update should be shown as a push notification */
     shouldShowPushNotification?: boolean;
 };
 
+/** Model of a onyx update event */
 type OnyxUpdateEvent = {
+    /** Type of the update event received from the server */
     eventType: string;
+
+    /** Collections of data updates */
     data: OnyxServerUpdate[];
 };
 
+/** Model of onyx server updates */
 type OnyxUpdatesFromServer = {
+    /** Delivery method of onyx updates */
     type: 'https' | 'pusher' | 'airship';
+
+    /** Last update ID from server */
     lastUpdateID: number | string;
+
+    /** Previous update ID from server */
     previousUpdateID: number | string;
+
+    /** Request data sent to the server */
     request?: Request;
+
+    /** Response data from server */
     response?: Response;
+
+    /** Collection of onyx updates */
     updates?: OnyxUpdateEvent[];
 };
 
+/**
+ * Helper function to determine if onyx update received from server is valid
+ *
+ * @param value - represent the onyx update received from the server
+ * @returns boolean indicating if the onyx update received from the server is valid
+ */
 function isValidOnyxUpdateFromServer(value: unknown): value is OnyxUpdatesFromServer {
     if (!value || typeof value !== 'object') {
         return false;
diff --git a/src/types/onyx/OriginalMessage.ts b/src/types/onyx/OriginalMessage.ts
index 3cc9cb41cb20..c18992923c21 100644
--- a/src/types/onyx/OriginalMessage.ts
+++ b/src/types/onyx/OriginalMessage.ts
@@ -1,380 +1,665 @@
 import type {ValueOf} from 'type-fest';
 import type CONST from '@src/CONST';
 import type DeepValueOf from '@src/types/utils/DeepValueOf';
+import type {OldDotOriginalMessageMap} from './OldDotAction';
+import type ReportActionName from './ReportActionName';
 
+/** Types of join workspace resolutions */
+type JoinWorkspaceResolution = ValueOf<typeof CONST.REPORT.ACTIONABLE_MENTION_JOIN_WORKSPACE_RESOLUTION>;
+
+/** Types of payments methods */
 type PaymentMethodType = DeepValueOf<typeof CONST.IOU.PAYMENT_TYPE | typeof CONST.IOU.REPORT_ACTION_TYPE | typeof CONST.WALLET.TRANSFER_METHOD_TYPE>;
 
-type ActionName = DeepValueOf<typeof CONST.REPORT.ACTIONS.TYPE>;
-type OriginalMessageActionName =
-    | 'ADDCOMMENT'
-    | 'APPROVED'
-    | 'CHRONOSOOOLIST'
-    | 'CLOSED'
-    | 'CREATED'
-    | 'HOLD'
-    | 'UNHOLD'
-    | 'IOU'
-    | 'MODIFIEDEXPENSE'
-    | 'REIMBURSEMENTQUEUED'
-    | 'RENAMED'
-    | 'REPORTPREVIEW'
-    | 'SUBMITTED'
-    | 'TASKCANCELLED'
-    | 'TASKCOMPLETED'
-    | 'TASKEDITED'
-    | 'TASKREOPENED'
-    | 'ACTIONABLEJOINREQUEST'
-    | 'ACTIONABLEMENTIONWHISPER'
-    | 'ACTIONABLETRACKEXPENSEWHISPER'
-    | ValueOf<typeof CONST.REPORT.ACTIONS.TYPE.POLICY_CHANGE_LOG>;
-type OriginalMessageApproved = {
-    actionName: typeof CONST.REPORT.ACTIONS.TYPE.APPROVED;
-    originalMessage: unknown;
-};
+/** Types of sources of original message */
 type OriginalMessageSource = 'Chronos' | 'email' | 'ios' | 'android' | 'web' | '';
 
-type OriginalMessageHold = {
-    actionName: typeof CONST.REPORT.ACTIONS.TYPE.HOLD;
-    originalMessage: unknown;
-};
-
-type OriginalMessageHoldComment = {
-    actionName: typeof CONST.REPORT.ACTIONS.TYPE.HOLD_COMMENT;
-    originalMessage: unknown;
-};
-
-type OriginalMessageUnHold = {
-    actionName: typeof CONST.REPORT.ACTIONS.TYPE.UNHOLD;
-    originalMessage: unknown;
-};
-
+/** Details provided when sending money */
 type IOUDetails = {
+    /** How much was sent */
     amount: number;
-    comment?: string;
+
+    /** Optional comment */
+    comment: string;
+
+    /** Currency of the money sent */
     currency: string;
 };
 
-type IOUMessage = {
-    /** The ID of the iou transaction */
+/** Model of `IOU` report action */
+type OriginalMessageIOU = {
+    /** The ID of the `IOU` transaction */
     IOUTransactionID?: string;
+
+    /** ID of the `IOU` report */
     IOUReportID?: string;
+
+    /** ID of the expense report */
     expenseReportID?: string;
+
+    /** How much was transactioned */
     amount: number;
+
+    /** Optional comment */
     comment?: string;
+
+    /** Currency of the transactioned money */
     currency: string;
+
+    /** When was the `IOU` last modified */
     lastModified?: string;
+
+    /** Who participated in the transaction, by accountID */
     participantAccountIDs?: number[];
+
+    /** Type of `IOU` report action */
     type: ValueOf<typeof CONST.IOU.REPORT_ACTION_TYPE>;
+
+    /** If the action was cancelled, this is the reason for the cancellation */
     cancellationReason?: string;
+
+    /** Type of payment method used in transaction */
     paymentType?: PaymentMethodType;
+
+    /** Timestamp of when the `IOU` report action was deleted */
     deleted?: string;
+
     /** Only exists when we are sending money */
     IOUDetails?: IOUDetails;
-};
-
-type ReimbursementDeQueuedMessage = {
-    cancellationReason: string;
-    expenseReportID?: string;
-    amount: number;
-    currency: string;
-};
-
-type OriginalMessageIOU = {
-    actionName: typeof CONST.REPORT.ACTIONS.TYPE.IOU;
-    originalMessage: IOUMessage;
-};
 
-type FlagSeverityName = ValueOf<
-    Pick<
-        typeof CONST.MODERATION,
-        'FLAG_SEVERITY_SPAM' | 'FLAG_SEVERITY_INCONSIDERATE' | 'FLAG_SEVERITY_INTIMIDATION' | 'FLAG_SEVERITY_BULLYING' | 'FLAG_SEVERITY_HARASSMENT' | 'FLAG_SEVERITY_ASSAULT'
-    >
->;
-type FlagSeverity = {
-    accountID: number;
-    timestamp: string;
+    /** Collection of accountIDs of users mentioned in message */
+    whisperedTo?: number[];
 };
 
+/** Names of moderation decisions */
 type DecisionName = ValueOf<
     Pick<
         typeof CONST.MODERATION,
         'MODERATOR_DECISION_PENDING' | 'MODERATOR_DECISION_PENDING_HIDE' | 'MODERATOR_DECISION_PENDING_REMOVE' | 'MODERATOR_DECISION_APPROVED' | 'MODERATOR_DECISION_HIDDEN'
     >
 >;
+
+/** Model of moderator decision */
 type Decision = {
+    /** Name of the decision */
     decision: DecisionName;
+
+    /** When was the decision made */
     timestamp?: string;
 };
 
+/** Model of user reaction */
 type User = {
+    /** Account ID of the user that reacted to the comment */
     accountID: number;
+
+    /** What's the skin tone of the user reaction */
     skinTone: number;
 };
 
+/** Model of comment reaction */
 type Reaction = {
+    /** Which emoji was used to react to the comment */
     emoji: string;
+
+    /** Which users reacted with this emoji */
     users: User[];
 };
 
-type Closed = {
-    policyName: string;
-    reason: ValueOf<typeof CONST.REPORT.ARCHIVE_REASON>;
+/** Model of `add comment` report action */
+type OriginalMessageAddComment = {
+    /** HTML content of the comment */
+    html: string;
+
+    /** Origin of the comment */
+    source?: OriginalMessageSource;
+
+    /** When was the comment last modified */
     lastModified?: string;
-    newAccountID?: number;
-    oldAccountID?: number;
-};
 
-type OriginalMessageAddComment = {
-    actionName: typeof CONST.REPORT.ACTIONS.TYPE.ADD_COMMENT;
-    originalMessage: {
-        html: string;
-        source?: OriginalMessageSource;
-        lastModified?: string;
-        taskReportID?: string;
-        edits?: string[];
-        childReportID?: string;
-        isDeletedParentAction?: boolean;
-        flags?: Record<FlagSeverityName, FlagSeverity[]>;
-        moderationDecisions?: Decision[];
-        whisperedTo: number[];
-        reactions?: Reaction[];
-    };
+    /** ID of the task report */
+    taskReportID?: string;
+
+    /** Collection of accountIDs of users mentioned in message */
+    whisperedTo: number[];
+
+    /** List accountIDs are mentioned in message */
+    mentionedAccountIDs?: number[];
 };
 
+/** Model of `actionable mention whisper` report action */
 type OriginalMessageActionableMentionWhisper = {
-    actionName: typeof CONST.REPORT.ACTIONS.TYPE.ACTIONABLE_MENTION_WHISPER;
-    originalMessage: {
-        inviteeAccountIDs: number[];
-        inviteeEmails: string;
-        lastModified: string;
-        reportID: number;
-        resolution?: ValueOf<typeof CONST.REPORT.ACTIONABLE_MENTION_WHISPER_RESOLUTION> | null;
-        whisperedTo?: number[];
-    };
+    /** Account IDs of users that aren't members of the room  */
+    inviteeAccountIDs: number[];
+
+    /** Decision on whether to invite users that were mentioned but aren't members or do nothing */
+    resolution?: ValueOf<typeof CONST.REPORT.ACTIONABLE_MENTION_WHISPER_RESOLUTION> | null;
+
+    /** Collection of accountIDs of users mentioned in message */
+    whisperedTo?: number[];
+};
+
+/** Model of `actionable report mention whisper` report action */
+type OriginalMessageActionableReportMentionWhisper = {
+    /** Decision on whether to create a report that were mentioned but doesn't exist or do nothing */
+    resolution?: ValueOf<typeof CONST.REPORT.ACTIONABLE_REPORT_MENTION_WHISPER_RESOLUTION> | null;
+
+    /** Collection of accountIDs of users mentioned in message */
+    whisperedTo?: number[];
 };
 
+/** Model of `submitted` report action */
 type OriginalMessageSubmitted = {
-    actionName: typeof CONST.REPORT.ACTIONS.TYPE.SUBMITTED;
-    originalMessage: unknown;
+    /** Approved expense amount */
+    amount: number;
+
+    /** Currency of the approved expense amount */
+    currency: string;
+
+    /** Report ID of the expense */
+    expenseReportID: string;
 };
 
+/** Model of `closed` report action */
 type OriginalMessageClosed = {
-    actionName: typeof CONST.REPORT.ACTIONS.TYPE.CLOSED;
-    originalMessage: Closed;
-};
+    /** Name of the policy */
+    policyName: string;
 
-type OriginalMessageCreated = {
-    actionName: typeof CONST.REPORT.ACTIONS.TYPE.CREATED;
-    originalMessage?: unknown;
-};
+    /** What was the reason to close the report */
+    reason: ValueOf<typeof CONST.REPORT.ARCHIVE_REASON>;
 
-type OriginalMessageMarkedReimbursed = {
-    actionName: typeof CONST.REPORT.ACTIONS.TYPE.MARKED_REIMBURSED;
-    originalMessage?: unknown;
+    /** When was the message last modified */
+    lastModified?: string;
+
+    /** If the report was closed because accounts got merged, then this is the new account ID */
+    newAccountID?: number;
+
+    /** If the report was closed because accounts got merged, then this is the old account ID */
+    oldAccountID?: number;
 };
 
+/** Model of `renamed` report action, created when chat rooms get renamed */
 type OriginalMessageRenamed = {
-    actionName: typeof CONST.REPORT.ACTIONS.TYPE.RENAMED;
-    originalMessage: {
-        html: string;
-        lastModified: string;
-        oldName: string;
-        newName: string;
-    };
+    /** Renamed room comment */
+    html: string;
+
+    /** When was report action last modified */
+    lastModified: string;
+
+    /** Old room name */
+    oldName: string;
+
+    /** New room name */
+    newName: string;
 };
 
+/** Model of Chronos OOO Timestamp */
 type ChronosOOOTimestamp = {
+    /** Date timestamp */
     date: string;
-    timezone: string;
-    // eslint-disable-next-line @typescript-eslint/naming-convention
-    timezone_type: number;
-};
-
-type ChangeLog = {
-    targetAccountIDs?: number[];
-    roomName?: string;
-    reportID?: number;
 };
 
+/** Model of Chronos OOO Event */
 type ChronosOOOEvent = {
+    /** ID of the OOO event */
     id: string;
+
+    /** How many days will the user be OOO */
     lengthInDays: number;
+
+    /** Description of the OOO state */
     summary: string;
+
+    /** When will the OOO state start */
     start: ChronosOOOTimestamp;
+
+    /** When will the OOO state end */
     end: ChronosOOOTimestamp;
 };
 
+/** Model of `Chronos OOO List` report action */
 type OriginalMessageChronosOOOList = {
-    actionName: typeof CONST.REPORT.ACTIONS.TYPE.CHRONOS_OOO_LIST;
-    originalMessage: {
-        edits: string[];
-        events: ChronosOOOEvent[];
-        html: string;
-        lastModified: string;
-    };
+    /** Collection of OOO events to show in report action */
+    events: ChronosOOOEvent[];
 };
 
+/** Model of `report preview` report action */
 type OriginalMessageReportPreview = {
-    actionName: typeof CONST.REPORT.ACTIONS.TYPE.REPORT_PREVIEW;
-    originalMessage: {
-        linkedReportID: string;
-        lastModified?: string;
-    };
-};
+    /** ID of the report to be previewed */
+    linkedReportID: string;
 
-type OriginalMessagePolicyChangeLog = {
-    actionName: ValueOf<typeof CONST.REPORT.ACTIONS.TYPE.POLICY_CHANGE_LOG>;
-    originalMessage: ChangeLog;
+    /** Collection of accountIDs of users mentioned in report */
+    whisperedTo?: number[];
 };
 
-type OriginalMessageJoinPolicyChangeLog = {
-    actionName: typeof CONST.REPORT.ACTIONS.TYPE.ACTIONABLE_JOIN_REQUEST;
-    originalMessage: {
-        choice: string;
-        email: string;
-        inviterEmail: string;
-        lastModified: string;
-        policyID: string;
-    };
-};
+/** Model of change log */
+type OriginalMessageChangeLog = {
+    /** Account IDs of users that either got invited or removed from the room */
+    targetAccountIDs?: number[];
+
+    /** Name of the chat room */
+    roomName?: string;
+
+    /** Description of the chat room */
+    description?: string;
+
+    /** ID of the report */
+    reportID?: number;
+
+    /** Old name of the workspace */
+    oldName?: string;
+
+    /** New name of the workspace */
+    newName?: string;
 
-type OriginalMessageRoomChangeLog = {
-    actionName: ValueOf<typeof CONST.REPORT.ACTIONS.TYPE.ROOM_CHANGE_LOG>;
-    originalMessage: ChangeLog;
+    /** Email of user */
+    email?: string;
+
+    /** Role of user */
+    role?: string;
+
+    /** When was it last modified */
+    lastModified?: string;
+
+    /** New role of user */
+    newValue?: string;
+
+    /** Old role of user */
+    oldValue?: string;
 };
 
-type OriginalMessagePolicyTask = {
-    actionName:
-        | typeof CONST.REPORT.ACTIONS.TYPE.TASK_EDITED
-        | typeof CONST.REPORT.ACTIONS.TYPE.TASK_CANCELLED
-        | typeof CONST.REPORT.ACTIONS.TYPE.TASK_COMPLETED
-        | typeof CONST.REPORT.ACTIONS.TYPE.TASK_REOPENED
-        | typeof CONST.REPORT.ACTIONS.TYPE.MODIFIED_EXPENSE;
-    originalMessage: unknown;
+/** Model of `join policy changelog` report action */
+type OriginalMessageJoinPolicyChangeLog = {
+    /** What was the invited user decision */
+    choice: JoinWorkspaceResolution;
+
+    /** ID of the affected policy */
+    policyID: string;
 };
 
+/** Model of `modified expense` report action */
 type OriginalMessageModifiedExpense = {
-    actionName: typeof CONST.REPORT.ACTIONS.TYPE.MODIFIED_EXPENSE;
-    originalMessage: {
-        oldMerchant?: string;
-        merchant?: string;
-        oldCurrency?: string;
-        currency?: string;
-        oldAmount?: number;
-        amount?: number;
-        oldComment?: string;
-        newComment?: string;
-        oldCreated?: string;
-        created?: string;
-        oldCategory?: string;
-        category?: string;
-        oldTag?: string;
-        tag?: string;
-        oldTaxAmount?: number;
-        taxAmount?: number;
-        oldTaxRate?: string;
-        taxRate?: string;
-        oldBillable?: string;
-        billable?: string;
-    };
+    /** Old content of the comment */
+    oldComment?: string;
+
+    /** Edited content of the comment */
+    newComment?: string;
+
+    /** Edited merchant name */
+    merchant?: string;
+
+    /** Old creation date timestamp */
+    oldCreated?: string;
+
+    /** Edited creation date timestamp */
+    created?: string;
+
+    /** Old merchant name */
+    oldMerchant?: string;
+
+    /** Old expense amount */
+    oldAmount?: number;
+
+    /** Edited expense amount */
+    amount?: number;
+
+    /** Old expense amount currency  */
+    oldCurrency?: string;
+
+    /** Edited expense amount currency */
+    currency?: string;
+
+    /** Edited expense category */
+    category?: string;
+
+    /** Old expense category */
+    oldCategory?: string;
+
+    /** Edited expense tag */
+    tag?: string;
+
+    /** Old expense tag */
+    oldTag?: string;
+
+    /** Edited billable */
+    billable?: string;
+
+    /** Old billable */
+    oldBillable?: string;
+
+    /** Old expense tag amount */
+    oldTaxAmount?: number;
+
+    /** Edited expense tax amount */
+    taxAmount?: number;
+
+    /** Edited expense tax rate */
+    taxRate?: string;
+
+    /** Old expense tax rate */
+    oldTaxRate?: string;
+
+    /** Edited expense reimbursable */
+    reimbursable?: string;
+
+    /** Old expense reimbursable */
+    oldReimbursable?: string;
+
+    /** Collection of accountIDs of users mentioned in expense report */
+    whisperedTo?: number[];
+
+    /** The ID of moved report */
+    movedToReportID?: string;
 };
 
+/** Model of `reimbursement queued` report action */
 type OriginalMessageReimbursementQueued = {
-    actionName: typeof CONST.REPORT.ACTIONS.TYPE.REIMBURSEMENT_QUEUED;
-    originalMessage: {
-        paymentType: DeepValueOf<typeof CONST.IOU.PAYMENT_TYPE>;
-    };
+    /** How is the payment getting reimbursed */
+    paymentType: DeepValueOf<typeof CONST.IOU.PAYMENT_TYPE>;
 };
 
+/** Model of `actionable tracked expense whisper` report action */
 type OriginalMessageActionableTrackedExpenseWhisper = {
-    actionName: typeof CONST.REPORT.ACTIONS.TYPE.ACTIONABLE_TRACK_EXPENSE_WHISPER;
-    originalMessage: {
-        transactionID: string;
-        lastModified: string;
-        resolution?: ValueOf<typeof CONST.REPORT.ACTIONABLE_TRACK_EXPENSE_WHISPER_RESOLUTION>;
-    };
+    /** ID of the transaction */
+    transactionID: string;
+
+    /** When was the tracked expense whisper last modified */
+    lastModified: string;
+
+    /** What was the decision of the user */
+    resolution?: ValueOf<typeof CONST.REPORT.ACTIONABLE_TRACK_EXPENSE_WHISPER_RESOLUTION>;
 };
 
+/** Model of `reimbursement dequeued` report action */
 type OriginalMessageReimbursementDequeued = {
-    actionName: typeof CONST.REPORT.ACTIONS.TYPE.REIMBURSEMENT_DEQUEUED;
-    originalMessage: {
-        expenseReportID: string;
-    };
+    /** Why the reimbursement was cancelled */
+    cancellationReason: ValueOf<typeof CONST.REPORT.CANCEL_PAYMENT_REASONS>;
+
+    /** ID of the `expense` report */
+    expenseReportID?: string;
+
+    /** Amount that wasn't reimbursed */
+    amount: number;
+
+    /** Currency of the money that wasn't reimbursed */
+    currency: string;
 };
 
+/** Model of `moved` report action */
 type OriginalMessageMoved = {
-    actionName: typeof CONST.REPORT.ACTIONS.TYPE.MOVED;
-    originalMessage: {
-        fromPolicyID: string;
-        toPolicyID: string;
-        newParentReportID: string;
-        movedReportID: string;
-    };
-};
+    /** ID of the old policy */
+    fromPolicyID: string;
+
+    /** ID of the new policy */
+    toPolicyID: string;
 
-type OriginalMessageMergedWithCashTransaction = {
-    actionName: typeof CONST.REPORT.ACTIONS.TYPE.MERGED_WITH_CASH_TRANSACTION;
-    originalMessage: Record<string, never>; // No data is sent with this action
+    /** ID of the new parent report */
+    newParentReportID: string;
+
+    /** ID of the moved report */
+    movedReportID: string;
 };
 
+/** Model of `dismissed violation` report action */
 type OriginalMessageDismissedViolation = {
-    actionName: typeof CONST.REPORT.ACTIONS.TYPE.DISMISSED_VIOLATION;
-    originalMessage: {
-        reason: string;
-        violationName: string;
-    };
+    /** Why the violation was dismissed */
+    reason: string;
+
+    /** Name of the violation */
+    violationName: string;
+};
+
+/** Model of `trip room preview` report action */
+type OriginalMessageTripRoomPreview = {
+    /** ID of the report to be previewed */
+    linkedReportID: string;
+
+    /** When was report action last modified */
+    lastModified?: string;
+
+    /** Collection of accountIDs of users mentioned in report */
+    whisperedTo?: number[];
+};
+
+/** Model of `approved` report action */
+type OriginalMessageApproved = {
+    /** Approved expense amount */
+    amount: number;
+
+    /** Currency of the approved expense amount */
+    currency: string;
+
+    /** Report ID of the expense */
+    expenseReportID: string;
+};
+
+/** Model of `forwarded` report action */
+type OriginalMessageForwarded = {
+    /** Forwarded expense amount */
+    amount: number;
+
+    /** Currency of the forwarded expense amount */
+    currency: string;
+
+    /** Report ID of the expense */
+    expenseReportID: string;
 };
 
-type OriginalMessage =
-    | OriginalMessageApproved
-    | OriginalMessageIOU
-    | OriginalMessageAddComment
-    | OriginalMessageActionableMentionWhisper
-    | OriginalMessageSubmitted
-    | OriginalMessageClosed
-    | OriginalMessageCreated
-    | OriginalMessageHold
-    | OriginalMessageHoldComment
-    | OriginalMessageUnHold
-    | OriginalMessageRenamed
-    | OriginalMessageChronosOOOList
-    | OriginalMessageReportPreview
-    | OriginalMessageRoomChangeLog
-    | OriginalMessagePolicyChangeLog
-    | OriginalMessagePolicyTask
-    | OriginalMessageJoinPolicyChangeLog
-    | OriginalMessageModifiedExpense
-    | OriginalMessageReimbursementQueued
-    | OriginalMessageReimbursementDequeued
-    | OriginalMessageMoved
-    | OriginalMessageMarkedReimbursed
-    | OriginalMessageActionableTrackedExpenseWhisper
-    | OriginalMessageMergedWithCashTransaction
-    | OriginalMessageDismissedViolation;
+/**
+ *
+ */
+type OriginalMessageExportIntegration = {
+    /**
+     * Whether the export was done via an automation
+     */
+    automaticAction: false;
+
+    /**
+     * The integration that was exported to (display text)
+     */
+    label: string;
+
+    /**
+     *
+     */
+    lastModified: string;
+
+    /**
+     * Whether the report was manually marked as exported
+     */
+    markedManually: boolean;
+
+    /**
+     * An list of URLs to the report in the integration for company card expenses
+     */
+    nonReimbursableUrls?: string[];
+
+    /**
+     * An list of URLs to the report in the integration for out of pocket expenses
+     */
+    reimbursableUrls?: string[];
+};
+
+/** Model of `unapproved` report action */
+type OriginalMessageUnapproved = {
+    /** Unapproved expense amount */
+    amount: number;
+
+    /** Currency of the unapproved expense amount */
+    currency: string;
+
+    /** Report ID of the expense */
+    expenseReportID: string;
+};
+
+/**
+ * Model of `Add payment card` report action
+ */
+type OriginalMessageAddPaymentCard = Record<string, never>;
+
+/**
+ * Original message for INTEGRATIONSYNCFAILED actions
+ */
+type OriginalMessageIntegrationSyncFailed = {
+    /** The user friendly connection name */
+    label: string;
+
+    /** The source of the connection sync */
+    source: string;
+
+    /** The error message from Integration Server */
+    errorMessage: string;
+};
+
+/** The map type of original message */
+type OriginalMessageMap = {
+    /** */
+    [CONST.REPORT.ACTIONS.TYPE.ACTIONABLE_ADD_PAYMENT_CARD]: OriginalMessageAddPaymentCard;
+    /** */
+    [CONST.REPORT.ACTIONS.TYPE.ACTIONABLE_JOIN_REQUEST]: OriginalMessageJoinPolicyChangeLog;
+    /** */
+    [CONST.REPORT.ACTIONS.TYPE.ACTIONABLE_MENTION_WHISPER]: OriginalMessageActionableMentionWhisper;
+    /** */
+    [CONST.REPORT.ACTIONS.TYPE.ACTIONABLE_REPORT_MENTION_WHISPER]: OriginalMessageActionableReportMentionWhisper;
+    /** */
+    [CONST.REPORT.ACTIONS.TYPE.ACTIONABLE_TRACK_EXPENSE_WHISPER]: OriginalMessageActionableTrackedExpenseWhisper;
+    /** */
+    [CONST.REPORT.ACTIONS.TYPE.ADD_COMMENT]: OriginalMessageAddComment;
+    /** */
+    [CONST.REPORT.ACTIONS.TYPE.APPROVED]: OriginalMessageApproved;
+    /** */
+    [CONST.REPORT.ACTIONS.TYPE.CHANGE_FIELD]: never;
+    /** */
+    [CONST.REPORT.ACTIONS.TYPE.CHANGE_POLICY]: never;
+    /** */
+    [CONST.REPORT.ACTIONS.TYPE.CHANGE_TYPE]: never;
+    /** */
+    [CONST.REPORT.ACTIONS.TYPE.CHRONOS_OOO_LIST]: OriginalMessageChronosOOOList;
+    /** */
+    [CONST.REPORT.ACTIONS.TYPE.CLOSED]: OriginalMessageClosed;
+    /** */
+    [CONST.REPORT.ACTIONS.TYPE.CREATED]: never;
+    /** */
+    [CONST.REPORT.ACTIONS.TYPE.DELEGATE_SUBMIT]: never;
+    /** */
+    [CONST.REPORT.ACTIONS.TYPE.DISMISSED_VIOLATION]: OriginalMessageDismissedViolation;
+    /** */
+    [CONST.REPORT.ACTIONS.TYPE.EXPORTED_TO_CSV]: never;
+    /** */
+    [CONST.REPORT.ACTIONS.TYPE.EXPORTED_TO_INTEGRATION]: OriginalMessageExportIntegration;
+    /** */
+    [CONST.REPORT.ACTIONS.TYPE.FORWARDED]: OriginalMessageForwarded;
+    /** */
+    [CONST.REPORT.ACTIONS.TYPE.HOLD]: never;
+    /** */
+    [CONST.REPORT.ACTIONS.TYPE.HOLD_COMMENT]: never;
+    /** */
+    [CONST.REPORT.ACTIONS.TYPE.INTEGRATIONS_MESSAGE]: never;
+    /** */
+    [CONST.REPORT.ACTIONS.TYPE.IOU]: OriginalMessageIOU;
+    /** */
+    [CONST.REPORT.ACTIONS.TYPE.MANAGER_ATTACH_RECEIPT]: never;
+    /** */
+    [CONST.REPORT.ACTIONS.TYPE.MANAGER_DETACH_RECEIPT]: never;
+    /** */
+    [CONST.REPORT.ACTIONS.TYPE.MARK_REIMBURSED_FROM_INTEGRATION]: never;
+    /** */
+    [CONST.REPORT.ACTIONS.TYPE.MARKED_REIMBURSED]: never;
+    /** */
+    [CONST.REPORT.ACTIONS.TYPE.MERGED_WITH_CASH_TRANSACTION]: never;
+    /** */
+    [CONST.REPORT.ACTIONS.TYPE.MODIFIED_EXPENSE]: OriginalMessageModifiedExpense;
+    /** */
+    [CONST.REPORT.ACTIONS.TYPE.MOVED]: OriginalMessageMoved;
+    /** */
+    [CONST.REPORT.ACTIONS.TYPE.OUTDATED_BANK_ACCOUNT]: never;
+    /** */
+    [CONST.REPORT.ACTIONS.TYPE.REIMBURSEMENT_ACH_BOUNCE]: never;
+    /** */
+    [CONST.REPORT.ACTIONS.TYPE.REIMBURSEMENT_ACH_CANCELLED]: never;
+    /** */
+    [CONST.REPORT.ACTIONS.TYPE.REIMBURSEMENT_ACCOUNT_CHANGED]: never;
+    /** */
+    [CONST.REPORT.ACTIONS.TYPE.REIMBURSEMENT_DEQUEUED]: OriginalMessageReimbursementDequeued;
+    /** */
+    [CONST.REPORT.ACTIONS.TYPE.REIMBURSEMENT_DELAYED]: never;
+    /** */
+    [CONST.REPORT.ACTIONS.TYPE.REIMBURSEMENT_QUEUED]: OriginalMessageReimbursementQueued;
+    /** */
+    [CONST.REPORT.ACTIONS.TYPE.RENAMED]: OriginalMessageRenamed;
+    /** */
+    [CONST.REPORT.ACTIONS.TYPE.REPORT_PREVIEW]: OriginalMessageReportPreview;
+    /** */
+    [CONST.REPORT.ACTIONS.TYPE.SELECTED_FOR_RANDOM_AUDIT]: never;
+    /** */
+    [CONST.REPORT.ACTIONS.TYPE.SHARE]: never;
+    /** */
+    [CONST.REPORT.ACTIONS.TYPE.STRIPE_PAID]: never;
+    /** */
+    [CONST.REPORT.ACTIONS.TYPE.SUBMITTED]: OriginalMessageSubmitted;
+    /** */
+    [CONST.REPORT.ACTIONS.TYPE.TASK_CANCELLED]: never;
+    /** */
+    [CONST.REPORT.ACTIONS.TYPE.TASK_COMPLETED]: never;
+    /** */
+    [CONST.REPORT.ACTIONS.TYPE.TASK_EDITED]: never;
+    /** */
+    [CONST.REPORT.ACTIONS.TYPE.TASK_REOPENED]: never;
+    /** */
+    [CONST.REPORT.ACTIONS.TYPE.TAKE_CONTROL]: never;
+    /** */
+    [CONST.REPORT.ACTIONS.TYPE.UNAPPROVED]: OriginalMessageUnapproved;
+    /** */
+    [CONST.REPORT.ACTIONS.TYPE.UNHOLD]: never;
+    /** */
+    [CONST.REPORT.ACTIONS.TYPE.UNSHARE]: never;
+    /** */
+    [CONST.REPORT.ACTIONS.TYPE.UPDATE_GROUP_CHAT_MEMBER_ROLE]: never;
+    /** */
+    [CONST.REPORT.ACTIONS.TYPE.TRIPPREVIEW]: OriginalMessageTripRoomPreview;
+    /** */
+    [CONST.REPORT.ACTIONS.TYPE.REIMBURSEMENT_REQUESTED]: never;
+    /** */
+    [CONST.REPORT.ACTIONS.TYPE.REIMBURSEMENT_SETUP]: never;
+    /** */
+    [CONST.REPORT.ACTIONS.TYPE.EXPORTED_TO_QUICK_BOOKS]: never;
+    /** */
+    [CONST.REPORT.ACTIONS.TYPE.DONATION]: never;
+    /** */
+    [CONST.REPORT.ACTIONS.TYPE.DELETED_ACCOUNT]: never;
+    /** */
+    [CONST.REPORT.ACTIONS.TYPE.REIMBURSEMENT_REQUESTED]: never;
+    /** */
+    [CONST.REPORT.ACTIONS.TYPE.REIMBURSEMENT_SETUP]: never;
+    /** */
+    [CONST.REPORT.ACTIONS.TYPE.REIMBURSEMENT_SETUP_REQUESTED]: never;
+    /** */
+    [CONST.REPORT.ACTIONS.TYPE.CARD_ISSUED]: never;
+    /** */
+    [CONST.REPORT.ACTIONS.TYPE.CARD_MISSING_ADDRESS]: never;
+    /** */
+    [CONST.REPORT.ACTIONS.TYPE.CARD_ISSUED_VIRTUAL]: never;
+    /** */
+    [CONST.REPORT.ACTIONS.TYPE.INTEGRATION_SYNC_FAILED]: OriginalMessageIntegrationSyncFailed;
+} & OldDotOriginalMessageMap & {
+        [T in ValueOf<typeof CONST.REPORT.ACTIONS.TYPE.POLICY_CHANGE_LOG>]: OriginalMessageChangeLog;
+    } & {
+        [T in ValueOf<typeof CONST.REPORT.ACTIONS.TYPE.ROOM_CHANGE_LOG>]: OriginalMessageChangeLog;
+    };
+
+/** */
+type OriginalMessage<T extends ReportActionName> = OriginalMessageMap[T];
 
 export default OriginalMessage;
 export type {
-    ChronosOOOEvent,
-    Decision,
-    Reaction,
-    ActionName,
-    IOUMessage,
-    ReimbursementDeQueuedMessage,
-    Closed,
-    OriginalMessageActionName,
-    ChangeLog,
-    OriginalMessageIOU,
-    OriginalMessageCreated,
-    OriginalMessageRenamed,
-    OriginalMessageAddComment,
-    OriginalMessageJoinPolicyChangeLog,
-    OriginalMessageActionableMentionWhisper,
-    OriginalMessageChronosOOOList,
-    OriginalMessageRoomChangeLog,
-    OriginalMessageSource,
-    OriginalMessageReimbursementDequeued,
     DecisionName,
+    OriginalMessageIOU,
+    ChronosOOOEvent,
     PaymentMethodType,
-    OriginalMessageActionableTrackedExpenseWhisper,
-    OriginalMessageDismissedViolation,
+    OriginalMessageSource,
+    Reaction,
+    Decision,
+    OriginalMessageChangeLog,
+    JoinWorkspaceResolution,
+    OriginalMessageModifiedExpense,
+    OriginalMessageExportIntegration,
 };
diff --git a/src/types/onyx/Pages.ts b/src/types/onyx/Pages.ts
new file mode 100644
index 000000000000..746e3330895d
--- /dev/null
+++ b/src/types/onyx/Pages.ts
@@ -0,0 +1,59 @@
+/**
+ * An array of arrays of IDs, representing pages of a resource fetched via pagination.
+ *
+ * Here's an example (assuming a page size of 5 and sequential IDs):
+ *
+ * 1. Open a report, fetch the latest reportActions. Pages would look like this:
+ *
+ *    [
+ *      [
+ *        11,
+ *        12,
+ *        13,
+ *        14,
+ *        15,
+ *      ],
+ *    ]
+ *
+ * 2. Click on a link to reportAction 7. Now Pages looks like this:
+ *
+ *    [
+ *      [
+ *        5,
+ *        6,
+ *        7,
+ *        8,
+ *        9,
+ *      ],
+ *      // This space between these non-continuous pages represents a gap that must be filled
+ *      [
+ *        11,
+ *        12,
+ *        13,
+ *        14,
+ *        15,
+ *      ],
+ *    ]
+ *
+ * 3. Scroll down, load more actions after reportAction 9
+ *
+ *    [
+ *      [
+ *        5,
+ *        6,
+ *        7,
+ *        8,
+ *        9,
+ *        // Note: the gap is filled and the pages are now continuous/merged together
+ *        10,
+ *        11,
+ *        12,
+ *        13,
+ *        14,
+ *        15,
+ *      ],
+ *    ]
+ */
+type Pages = string[][];
+
+export default Pages;
diff --git a/src/types/onyx/PaymentMethod.ts b/src/types/onyx/PaymentMethod.ts
index 4b3a4c8986fb..b95f890939eb 100644
--- a/src/types/onyx/PaymentMethod.ts
+++ b/src/types/onyx/PaymentMethod.ts
@@ -3,12 +3,24 @@ import type IconAsset from '@src/types/utils/IconAsset';
 import type BankAccount from './BankAccount';
 import type Fund from './Fund';
 
+/** Model of a payment method */
 type PaymentMethod = (BankAccount | Fund) & {
+    /** Text shown under menu item title */
     description: string;
+
+    /** Source of the menu item icon, which can be a component or an image asset */
     icon: IconAsset;
+
+    /** Size of the menu item icon */
     iconSize?: number;
+
+    /** Height of the menu item icon */
     iconHeight?: number;
+
+    /** Width of the menu item icon */
     iconWidth?: number;
+
+    /** Icon wrapper styles */
     iconStyles?: ViewStyle[];
 };
 
diff --git a/src/types/onyx/PersonalBankAccount.ts b/src/types/onyx/PersonalBankAccount.ts
index 3e52a3cf59f3..b36e7754ca23 100644
--- a/src/types/onyx/PersonalBankAccount.ts
+++ b/src/types/onyx/PersonalBankAccount.ts
@@ -1,6 +1,7 @@
 import type {Route} from '@src/ROUTES';
 import type * as OnyxCommon from './OnyxCommon';
 
+/** Model of personal bank account */
 type PersonalBankAccount = {
     /** An error message to display to the user */
     errors?: OnyxCommon.Errors;
diff --git a/src/types/onyx/PersonalDetails.ts b/src/types/onyx/PersonalDetails.ts
index b7c96998080c..8ebb19743d0f 100644
--- a/src/types/onyx/PersonalDetails.ts
+++ b/src/types/onyx/PersonalDetails.ts
@@ -1,9 +1,12 @@
+import type {TupleToUnion} from 'type-fest';
 import type {AvatarSource} from '@libs/UserUtils';
 import type TIMEZONES from '@src/TIMEZONES';
 import type * as OnyxCommon from './OnyxCommon';
 
-type SelectedTimezone = (typeof TIMEZONES)[number];
+/** Selectable timezones */
+type SelectedTimezone = TupleToUnion<typeof TIMEZONES>;
 
+/** Model of timezone */
 type Timezone = {
     /** Value of selected timezone */
     selected?: SelectedTimezone;
@@ -12,6 +15,7 @@ type Timezone = {
     automatic?: boolean;
 };
 
+/** Model of user status */
 type Status = {
     /** The emoji code of the status */
     emojiCode: string;
@@ -23,6 +27,7 @@ type Status = {
     clearAfter: string; // ISO 8601 format;
 };
 
+/** Model of user personal details */
 type PersonalDetails = OnyxCommon.OnyxValueWithOfflineFeedback<{
     /** ID of the current user from their personal details */
     accountID: number;
@@ -48,6 +53,7 @@ type PersonalDetails = OnyxCommon.OnyxValueWithOfflineFeedback<{
     /** Avatar thumbnail URL of the current user from their personal details */
     avatarThumbnail?: string;
 
+    /** Avatar original file name with extension */
     originalFileName?: string;
 
     /** Flag to set when Avatar uploading */
@@ -78,11 +84,13 @@ type PersonalDetails = OnyxCommon.OnyxValueWithOfflineFeedback<{
     status?: Status;
 }>;
 
+/** Model of personal details metadata */
 type PersonalDetailsMetadata = {
     /** Whether we are waiting for the data to load via the API */
     isLoading?: boolean;
 };
 
+/** Record of user personal details, indexed by user id */
 type PersonalDetailsList = Record<string, PersonalDetails | null>;
 
 export default PersonalDetails;
diff --git a/src/types/onyx/PlaidBankAccount.ts b/src/types/onyx/PlaidBankAccount.ts
index 7620c4aee367..6e59fc015ca4 100644
--- a/src/types/onyx/PlaidBankAccount.ts
+++ b/src/types/onyx/PlaidBankAccount.ts
@@ -1,3 +1,4 @@
+/** Model of plaid bank account data */
 type PlaidBankAccount = {
     /** Masked account number */
     accountNumber: string;
diff --git a/src/types/onyx/PlaidData.ts b/src/types/onyx/PlaidData.ts
index 8ec93119cbd8..8f8e16324176 100644
--- a/src/types/onyx/PlaidData.ts
+++ b/src/types/onyx/PlaidData.ts
@@ -1,6 +1,7 @@
 import type * as OnyxCommon from './OnyxCommon';
 import type PlaidBankAccount from './PlaidBankAccount';
 
+/** Model of plaid data */
 type PlaidData = {
     /** Name of the bank */
     bankName?: string;
@@ -14,7 +15,10 @@ type PlaidData = {
     /** List of plaid bank accounts */
     bankAccounts?: PlaidBankAccount[];
 
+    /** Whether the data is being fetched from server */
     isLoading?: boolean;
+
+    /** Error messages to show in UI */
     errors: OnyxCommon.Errors;
 };
 
diff --git a/src/types/onyx/Policy.ts b/src/types/onyx/Policy.ts
index fed42477c635..0260b3354f79 100644
--- a/src/types/onyx/Policy.ts
+++ b/src/types/onyx/Policy.ts
@@ -5,48 +5,117 @@ import type * as OnyxTypes from '.';
 import type * as OnyxCommon from './OnyxCommon';
 import type {WorkspaceTravelSettings} from './TravelSettings';
 
+/** Distance units */
 type Unit = 'mi' | 'km';
 
-type Rate = OnyxCommon.OnyxValueWithOfflineFeedback<{
-    name?: string;
-    rate?: number;
-    currency?: string;
-    customUnitRateID?: string;
-    enabled?: boolean;
-    errors?: OnyxCommon.Errors;
-    errorFields?: OnyxCommon.ErrorFields;
-}>;
+/** Tax rate attributes of the policy distance rate */
+type TaxRateAttributes = {
+    /** Percentage of the tax that can be reclaimable */
+    taxClaimablePercentage?: number;
+
+    /** External ID associated to this tax rate */
+    taxRateExternalID?: string;
+};
+
+/** Model of policy distance rate */
+type Rate = OnyxCommon.OnyxValueWithOfflineFeedback<
+    {
+        /** Name of the distance rate */
+        name?: string;
+
+        /** Amount to be reimbursed per distance unit travelled */
+        rate?: number;
+
+        /** Currency used to pay the distance rate */
+        currency?: string;
+
+        /** Generated ID to identify the distance rate */
+        customUnitRateID?: string;
+
+        /** Whether this distance rate is currently enabled */
+        enabled?: boolean;
+
+        /** Error messages to show in UI */
+        errors?: OnyxCommon.Errors;
+
+        /** Form fields that triggered the errors */
+        errorFields?: OnyxCommon.ErrorFields;
+
+        /** Tax rate attributes of the policy */
+        attributes?: TaxRateAttributes;
+    },
+    keyof TaxRateAttributes
+>;
 
+/** Custom unit attributes */
 type Attributes = {
+    /** Distance unit name */
     unit: Unit;
+
+    /** Whether the tax tracking is enabled or not */
+    taxEnabled?: boolean;
 };
 
-type CustomUnit = OnyxCommon.OnyxValueWithOfflineFeedback<{
-    name: string;
-    customUnitID: string;
-    attributes: Attributes;
-    rates: Record<string, Rate>;
-    defaultCategory?: string;
-    enabled?: boolean;
-    errors?: OnyxCommon.Errors;
-    errorFields?: OnyxCommon.ErrorFields;
-}>;
+/** Policy custom unit */
+type CustomUnit = OnyxCommon.OnyxValueWithOfflineFeedback<
+    {
+        /** Custom unit name */
+        name: string;
+
+        /** ID that identifies this custom unit */
+        customUnitID: string;
+
+        /** Contains custom attributes like unit, for this custom unit */
+        attributes: Attributes;
+
+        /** Distance rates using this custom unit */
+        rates: Record<string, Rate>;
+
+        /** The default category in which this custom unit is used */
+        defaultCategory?: string;
 
+        /** Whether this custom unit is enabled */
+        enabled?: boolean;
+
+        /** Error messages to show in UI */
+        errors?: OnyxCommon.Errors;
+
+        /** Form fields that triggered errors */
+        errorFields?: OnyxCommon.ErrorFields;
+    },
+    keyof Attributes
+>;
+
+/** Policy company address data */
 type CompanyAddress = {
+    /** Street address */
     addressStreet: string;
+
+    /** City */
     city: string;
+
+    /** State */
     state: string;
+
+    /** Zip post code */
     zipCode: string;
+
+    /** Country code */
     country: Country | '';
 };
 
+/** Policy disabled fields */
 type DisabledFields = {
+    /** Whether the default billable field is disabled */
     defaultBillable?: boolean;
+
+    /** Whether the reimbursable field is disabled */
     reimbursable?: boolean;
 };
 
+/** Policy tax rate */
 type TaxRate = OnyxCommon.OnyxValueWithOfflineFeedback<{
-    /** Name of the a tax rate. */
+    /** Name of the tax rate. */
     name: string;
 
     /** The value of the tax rate. */
@@ -61,6 +130,12 @@ type TaxRate = OnyxCommon.OnyxValueWithOfflineFeedback<{
     /** Indicates if the tax rate is disabled. */
     isDisabled?: boolean;
 
+    /** Indicates if the tax rate is selected. */
+    isSelected?: boolean;
+
+    /** The old tax code of the tax rate when we edit the tax code */
+    previousTaxCode?: string;
+
     /** An error message to display to the user */
     errors?: OnyxCommon.Errors;
 
@@ -68,8 +143,10 @@ type TaxRate = OnyxCommon.OnyxValueWithOfflineFeedback<{
     errorFields?: OnyxCommon.ErrorFields;
 }>;
 
+/** Record of policy tax rates, indexed by id_{taxRateName} where taxRateName is the name of the tax rate in UPPER_SNAKE_CASE */
 type TaxRates = Record<string, TaxRate>;
 
+/** Policy tax rates with default tax rate */
 type TaxRatesWithDefault = OnyxCommon.OnyxValueWithOfflineFeedback<{
     /** Name of the tax */
     name: string;
@@ -93,196 +170,1090 @@ type TaxRatesWithDefault = OnyxCommon.OnyxValueWithOfflineFeedback<{
     errorFields?: OnyxCommon.ErrorFields;
 }>;
 
+/** Connection sync source values */
+type JobSourceValues = 'DIRECT' | 'EXPENSIFYWEB' | 'EXPENSIFYAPI' | 'NEWEXPENSIFY' | 'AUTOSYNC' | 'AUTOAPPROVE';
+
+/** Connection last synchronization state */
 type ConnectionLastSync = {
+    /** Date when the connection's last successful sync occurred */
     successfulDate?: string;
+
+    /** Date when the connection's last failed sync occurred */
     errorDate?: string;
+
+    /** Error message when the connection's last sync failed */
+    errorMessage?: string;
+
+    /** If the connection's last sync failed due to authentication error */
+    isAuthenticationError: boolean;
+
+    /** Whether the connection's last sync was successful */
     isSuccessful: boolean;
-    source: 'DIRECT' | 'EXPENSIFYWEB' | 'EXPENSIFYAPI' | 'AUTOSYNC' | 'AUTOAPPROVE';
+
+    /** Where did the connection's last sync job come from */
+    source: JobSourceValues;
+
+    /**
+     * Sometimes we'll have a connection that is not connected, but the connection object is still present, so we can
+     * show an error message
+     */
+    isConnected?: boolean;
 };
 
+/** Financial account (bank account, debit card, etc) */
 type Account = {
+    /** GL code assigned to the financial account */
     glCode?: string;
+
+    /** Name of the financial account */
     name: string;
+
+    /** Currency of the financial account */
     currency: string;
+
+    /** ID assigned to the financial account */
     id: string;
 };
 
+/**
+ * Model of QuickBooks Online employee data
+ *
+ * TODO: QBO remaining comments will be handled here (https://github.com/Expensify/App/issues/43033)
+ */
 type Employee = {
+    /** ID assigned to the employee */
     id: string;
+
+    /** Employee's first name */
     firstName?: string;
+
+    /** Employee's last name */
     lastName?: string;
+
+    /** Employee's display name */
     name: string;
+
+    /** Employee's e-mail */
     email: string;
 };
 
+/**
+ * Model of QuickBooks Online vendor data
+ *
+ * TODO: QBO remaining comments will be handled here (https://github.com/Expensify/App/issues/43033)
+ */
 type Vendor = {
+    /** ID assigned to the vendor */
     id: string;
+
+    /** Vendor's name */
     name: string;
+
+    /** Vendor's currency */
     currency: string;
+
+    /** Vendor's e-mail */
     email: string;
 };
 
+/**
+ * Model of QuickBooks Online tax code data
+ *
+ * TODO: QBO remaining comments will be handled here (https://github.com/Expensify/App/issues/43033)
+ */
 type TaxCode = {
+    /** TODO: Will be handled in another issue */
     totalTaxRateVal: string;
+
+    /** TODO: Will be handled in another issue */
     simpleName: string;
+
+    /** TODO: Will be handled in another issue */
     taxCodeRef: string;
+
+    /** TODO: Will be handled in another issue */
     taxRateRefs: Record<string, string>;
+
+    /** TODO: Will be handled in another issue */
+    /** Name of the tax code */
     name: string;
 };
 
 /**
  * Data imported from QuickBooks Online.
+ *
+ * TODO: QBO remaining comments will be handled here (https://github.com/Expensify/App/issues/43033)
  */
 type QBOConnectionData = {
-    country: string;
+    /** Country code */
+    country: ValueOf<typeof CONST.COUNTRY>;
+
+    /** TODO: Will be handled in another issue */
     edition: string;
+
+    /** TODO: Will be handled in another issue */
     homeCurrency: string;
+
+    /** TODO: Will be handled in another issue */
     isMultiCurrencyEnabled: boolean;
 
+    /** Collection of journal entry accounts  */
     journalEntryAccounts: Account[];
+
+    /** Collection of bank accounts */
     bankAccounts: Account[];
+
+    /** Collection of credit cards */
     creditCards: Account[];
+
+    /** Collection of export destination accounts */
     accountsReceivable: Account[];
+
+    /** TODO: Will be handled in another issue */
     accountPayable: Account[];
+
+    /** TODO: Will be handled in another issue */
     otherCurrentAssetAccounts: Account[];
 
+    /** TODO: Will be handled in another issue */
     taxCodes: TaxCode[];
+
+    /** TODO: Will be handled in another issue */
     employees: Employee[];
+
+    /** Collections of vendors */
     vendors: Vendor[];
 };
 
-type IntegrationEntityMap = (typeof CONST.INTEGRATION_ENTITY_MAP_TYPES)[keyof typeof CONST.INTEGRATION_ENTITY_MAP_TYPES];
+/** Sync entity names */
+type IntegrationEntityMap = ValueOf<typeof CONST.INTEGRATION_ENTITY_MAP_TYPES>;
 
-type QBONonReimbursableExportAccountType = (typeof CONST.QUICKBOOKS_NON_REIMBURSABLE_EXPORT_ACCOUNT_TYPE)[keyof typeof CONST.QUICKBOOKS_NON_REIMBURSABLE_EXPORT_ACCOUNT_TYPE];
-type QBOReimbursableExportAccountType = (typeof CONST.QUICKBOOKS_REIMBURSABLE_ACCOUNT_TYPE)[keyof typeof CONST.QUICKBOOKS_REIMBURSABLE_ACCOUNT_TYPE];
+/**
+ * Non reimbursable account types exported from QuickBooks Online
+ *
+ * TODO: QBO remaining comments will be handled here (https://github.com/Expensify/App/issues/43033)
+ */
+type QBONonReimbursableExportAccountType = ValueOf<typeof CONST.QUICKBOOKS_NON_REIMBURSABLE_EXPORT_ACCOUNT_TYPE>;
+
+/**
+ * Reimbursable account types exported from QuickBooks Online
+ *
+ * TODO: QBO remaining comments will be handled here (https://github.com/Expensify/App/issues/43033)
+ */
+type QBOReimbursableExportAccountType = ValueOf<typeof CONST.QUICKBOOKS_REIMBURSABLE_ACCOUNT_TYPE>;
 
 /**
  * User configuration for the QuickBooks Online accounting integration.
+ *
+ * TODO: QBO remaining comments will be handled here (https://github.com/Expensify/App/issues/43033)
  */
 type QBOConnectionConfig = OnyxCommon.OnyxValueWithOfflineFeedback<{
+    /** TODO: Will be handled in another issue */
     realmId: string;
+
+    /** TODO: Will be handled in another issue */
     companyName: string;
+
+    /** Configuration of automatic synchronization from QuickBooks Online to the app */
     autoSync: {
+        /** TODO: Will be handled in another issue */
         jobID: string;
+
+        /** Whether changes made in QuickBooks Online should be reflected into the app automatically */
         enabled: boolean;
     };
+
+    /** Whether employees can be invited */
     syncPeople: boolean;
+
+    /** TODO: Will be handled in another issue */
     syncItems: boolean;
+
+    /** TODO: Will be handled in another issue */
     markChecksToBePrinted: boolean;
+
+    /** Defines how reimbursable expenses are exported */
     reimbursableExpensesExportDestination: QBOReimbursableExportAccountType;
+
+    /** Defines how non reimbursable expenses are exported */
     nonReimbursableExpensesExportDestination: QBONonReimbursableExportAccountType;
+
+    /** Default vendor of non reimbursable bill */
     nonReimbursableBillDefaultVendor: string;
+
+    /** ID of the invoice collection account */
     collectionAccountID?: string;
+
+    /** ID of the bill payment account */
     reimbursementAccountID?: string;
+
+    /** Account that receives the reimbursable expenses */
     reimbursableExpensesAccount?: Account;
+
+    /** Account that receives the non reimbursable expenses */
     nonReimbursableExpensesAccount?: Account;
+
+    /** Account that receives the exported invoices */
     receivableAccount?: Account;
+
+    /**
+     * Whether a default vendor will be created and applied to all credit card
+     * transactions upon import
+     */
     autoCreateVendor: boolean;
+
+    /** TODO: Will be handled in another issue */
     hasChosenAutoSyncOption: boolean;
+
+    /** Whether Quickbooks Online classes should be imported */
     syncClasses: IntegrationEntityMap;
+
+    /** Whether Quickbooks Online customers should be imported */
     syncCustomers: IntegrationEntityMap;
+
+    /** Whether Quickbooks Online locations should be imported */
     syncLocations: IntegrationEntityMap;
+
+    /** TODO: Will be handled in another issue */
     lastConfigurationTime: number;
+
+    /** Whether the taxes should be synchronized */
     syncTax: boolean;
+
+    /** Whether new categories are enabled in chart of accounts */
     enableNewCategories: boolean;
+
+    /** TODO: Will be handled in another issue */
     errors?: OnyxCommon.Errors;
+
+    /** TODO: Will be handled in another issue */
     exportDate: ValueOf<typeof CONST.QUICKBOOKS_EXPORT_DATE>;
+
+    /** Configuration of the export */
     export: {
+        /** E-mail of the exporter */
         exporter: string;
     };
+
+    /** Collections of form field errors */
     errorFields?: OnyxCommon.ErrorFields;
 }>;
 
+/** Xero bill status values
+ *
+ * TODO: Xero remaining comments will be handled here (https://github.com/Expensify/App/issues/43033)
+ */
 type BillStatusValues = 'DRAFT' | 'AWT_APPROVAL' | 'AWT_PAYMENT';
 
+/** Xero expense status values
+ *
+ *  TODO: Xero remaining comments will be handled here (https://github.com/Expensify/App/issues/43033)
+ */
 type ExpenseTypesValues = 'BILL' | 'BANK_TRANSACTION' | 'SALES_INVOICE' | 'NOTHING';
 
+/** Xero bill date values
+ *
+ *  TODO: Xero remaining comments will be handled here (https://github.com/Expensify/App/issues/43033)
+ */
 type BillDateValues = 'REPORT_SUBMITTED' | 'REPORT_EXPORTED' | 'LAST_EXPENSE';
 
+/**
+ * Model of an organization in Xero
+ *
+ * TODO: Xero remaining comments will be handled here (https://github.com/Expensify/App/issues/43033)
+ */
 type Tenant = {
+    /** ID of the organization */
     id: string;
+
+    /** Name of the organization */
     name: string;
+
+    /** TODO: Will be handled in another issue */
     value: string;
 };
 
+/** TODO: Xero remaining comments will be handled here (https://github.com/Expensify/App/issues/43033) */
+type XeroTrackingCategory = {
+    /** TODO: Will be handled in another issue */
+    id: string;
+
+    /** TODO: Will be handled in another issue */
+    name: string;
+};
+
+/**
+ * Data imported from Xero
+ *
+ * TODO: Xero remaining comments will be handled here (https://github.com/Expensify/App/issues/43033)
+ */
 type XeroConnectionData = {
-    bankAccounts: unknown[];
+    /** Collection of bank accounts */
+    bankAccounts: Account[];
+
+    /** TODO: Will be handled in another issue */
     countryCode: string;
+
+    /** TODO: Will be handled in another issue */
     organisationID: string;
+
+    /** TODO: Will be handled in another issue */
     revenueAccounts: Array<{
+        /** TODO: Will be handled in another issue */
         id: string;
+
+        /** TODO: Will be handled in another issue */
         name: string;
     }>;
+
+    /** Collection of organizations */
     tenants: Tenant[];
-    trackingCategories: unknown[];
+
+    /** TODO: Will be handled in another issue */
+    trackingCategories: XeroTrackingCategory[];
+};
+
+/** TODO: Xero remaining comments will be handled here (https://github.com/Expensify/App/issues/43033) */
+type XeroMappingType = {
+    /** TODO: Will be handled in another issue */
+    customer: string;
+} & {
+    [key in `trackingCategory_${string}`]: string;
+};
+
+/** Xero auto synchronization configs */
+type XeroAutoSyncConfig = {
+    /** Whether data should be automatically synched between the app and Xero */
+    enabled: boolean;
+
+    /** TODO: Will be handled in another issue */
+    jobID: string;
+};
+
+/** Xero export configs */
+type XeroExportConfig = {
+    /** Current bill status */
+    billDate: BillDateValues;
+
+    /** TODO: Will be handled in another issue */
+    billStatus: {
+        /** Current status of the purchase bill */
+        purchase: BillStatusValues;
+
+        /** Current status of the sales bill */
+        sales: BillStatusValues;
+    };
+
+    /** TODO: Will be handled in another issue */
+    billable: ExpenseTypesValues;
+
+    /** The e-mail of the exporter */
+    exporter: string;
+
+    /** TODO: Will be handled in another issue */
+    nonReimbursable: ExpenseTypesValues;
+
+    /** TODO: Will be handled in another issue */
+    nonReimbursableAccount: string;
+
+    /** TODO: Will be handled in another issue */
+    reimbursable: ExpenseTypesValues;
+};
+
+/** TODO: Will be handled in another issue */
+type XeroSyncConfig = {
+    /** TODO: Will be handled in another issue */
+    hasChosenAutoSyncOption: boolean;
+
+    /** TODO: Will be handled in another issue */
+    hasChosenSyncReimbursedReportsOption: boolean;
+
+    /** ID of the bank account for Xero invoice collections */
+    invoiceCollectionsAccountID: string;
+
+    /** ID of the bank account for Xero bill payment account */
+    reimbursementAccountID: string;
+
+    /** Whether the reimbursed reports should be synched */
+    syncReimbursedReports: boolean;
 };
 
 /**
  * User configuration for the Xero accounting integration.
+ *
+ * TODO: Xero remaining comments will be handled here (https://github.com/Expensify/App/issues/43033)
  */
-type XeroConnectionConfig = OnyxCommon.OnyxValueWithOfflineFeedback<{
-    autoSync: {
-        enabled: boolean;
-        jobID: string;
-    };
-    enableNewCategories: boolean;
-    export: {
-        billDate: BillDateValues;
-        billStatus: {
-            purchase: BillStatusValues;
-            sales: BillStatusValues;
-        };
-        billable: ExpenseTypesValues;
-        exporter: string;
-        nonReimbursable: ExpenseTypesValues;
-        nonReimbursableAccount: string;
-        reimbursable: ExpenseTypesValues;
-    };
-    importCustomers: boolean;
-    importTaxRates: boolean;
-    importTrackingCategories: boolean;
-    isConfigured: boolean;
-    mappings: {
-        customer: string;
-    };
-    sync: {
+type XeroConnectionConfig = OnyxCommon.OnyxValueWithOfflineFeedback<
+    {
+        /** Xero auto synchronization configs */
+        autoSync: XeroAutoSyncConfig;
+
+        /** TODO: Will be handled in another issue */
+        enableNewCategories: boolean;
+
+        /** Xero export configs */
+        export: XeroExportConfig;
+
+        /** Whether customers should be imported from Xero */
+        importCustomers: boolean;
+
+        /** Whether tax rates should be imported from Xero */
+        importTaxRates: boolean;
+
+        /** Whether tracking categories should be imported from Xero */
+        importTrackingCategories: boolean;
+
+        /** TODO: Will be handled in another issue */
+        isConfigured: boolean;
+
+        /** TODO: Will be handled in another issue */
+        mappings: XeroMappingType;
+
+        /** TODO: Will be handled in another issue */
+        sync: XeroSyncConfig;
+
+        /** ID of Xero organization */
+        tenantID: string;
+
+        /** TODO: Will be handled in another issue */
+        errors?: OnyxCommon.Errors;
+
+        /** Collection of form field errors  */
+        errorFields?: OnyxCommon.ErrorFields;
+    },
+    keyof XeroAutoSyncConfig | keyof XeroExportConfig | keyof XeroSyncConfig | keyof XeroMappingType
+>;
+
+/** Data stored about subsidiaries from NetSuite  */
+type NetSuiteSubsidiary = {
+    /** ID of the subsidiary */
+    internalID: string;
+
+    /** Country where subsidiary is present */
+    country: string;
+
+    /** Whether the subsidiary is an elimination subsidiary (a special type used to handle intercompany transaction) */
+    isElimination: boolean;
+
+    /** Name of the subsidiary */
+    name: string;
+};
+
+/** NetSuite bank account type values imported by Expensify */
+type AccountTypeValues = '_accountsPayable' | '_otherCurrentLiability' | '_creditCard' | '_bank' | '_otherCurrentAsset' | '_longTermLiability' | '_accountsReceivable' | '_expense';
+
+/** NetSuite Financial account (bank account, debit card, etc) */
+type NetSuiteAccount = {
+    /** GL code assigned to the financial account */
+    // eslint-disable-next-line @typescript-eslint/naming-convention
+    'GL Code'?: string;
+
+    /** Name of the account */
+    name: string;
+
+    /** ID assigned to the financial account in NetSuite */
+    id: string;
+
+    /** Type of the financial account */
+    type: AccountTypeValues;
+};
+
+/** NetSuite Tax account */
+type NetSuiteTaxAccount = {
+    /** Name of the tax account */
+    name: string;
+
+    /** ID assigned to the tax account in NetSuite */
+    externalID: string;
+
+    /** Country of the tax account */
+    country: string;
+};
+
+/** NetSuite Vendor Model */
+type NetSuiteVendor = {
+    /** ID of the vendor in NetSuite */
+    id: string;
+
+    /** Name of the vendor */
+    name: string;
+
+    /** E-mail of the vendor */
+    email: string;
+};
+
+/** NetSuite Invoice Item Model */
+type InvoiceItem = {
+    /** ID of the invoice item in NetSuite */
+    id: string;
+
+    /** Name of the invoice item */
+    name: string;
+};
+
+/**
+ * NetSuite Custom List data modal
+ */
+type NetSuiteCustomListSource = {
+    /** Internal ID of the custom list in NetSuite */
+    id: string;
+
+    /** Name of the custom list */
+    name: string;
+};
+
+/** Data from the NetSuite accounting integration. */
+type NetSuiteConnectionData = {
+    /** Collection of the custom lists in the NetSuite account */
+    customLists: NetSuiteCustomListSource[];
+
+    /** Collection of the subsidiaries present in the NetSuite account */
+    subsidiaryList: NetSuiteSubsidiary[];
+
+    /** Collection of receivable accounts */
+    receivableList?: NetSuiteAccount[];
+
+    /** Collection of vendors */
+    vendors?: NetSuiteVendor[];
+
+    /** Collection of invoice items */
+    items?: InvoiceItem[];
+
+    /** Collection of the payable accounts */
+    payableList: NetSuiteAccount[];
+
+    /** Collection of tax accounts */
+    taxAccountsList?: NetSuiteTaxAccount[];
+};
+
+/** NetSuite mapping values */
+type NetSuiteMappingValues = 'NETSUITE_DEFAULT' | 'REPORT_FIELD' | 'TAG';
+
+/** NetSuite invoice item preference values */
+type NetSuiteInvoiceItemPreferenceValues = 'create' | 'select';
+
+/** NetSuite export destination values */
+type NetSuiteExportDestinationValues = 'EXPENSE_REPORT' | 'VENDOR_BILL' | 'JOURNAL_ENTRY';
+
+/** NetSuite expense report approval level values */
+type NetSuiteExpenseReportApprovalLevels = 'REPORTS_APPROVED_NONE' | 'REPORTS_SUPERVISOR_APPROVED' | 'REPORTS_ACCOUNTING_APPROVED' | 'REPORTS_APPROVED_BOTH';
+
+/** NetSuite vendor bills approval level values */
+type NetSuiteVendorBillApprovalLevels = 'VENDOR_BILLS_APPROVED_NONE' | 'VENDOR_BILLS_APPROVAL_PENDING' | 'VENDOR_BILLS_APPROVED';
+
+/** NetSuite journal approval level values */
+type NetSuiteJournalApprovalLevels = 'JOURNALS_APPROVED_NONE' | 'JOURNALS_APPROVAL_PENDING' | 'JOURNALS_APPROVED';
+
+/** NetSuite export date values */
+type NetSuiteExportDateOptions = 'SUBMITTED' | 'EXPORTED' | 'LAST_EXPENSE';
+
+/** NetSuite journal posting preference values */
+type NetSuiteJournalPostingPreferences = 'JOURNALS_POSTING_TOTAL_LINE' | 'JOURNALS_POSTING_INDIVIDUAL_LINE';
+
+/** NetSuite custom segment/records and custom lists mapping values */
+type NetSuiteCustomFieldMapping = 'TAG' | 'REPORT_FIELD';
+
+/** The custom form selection options for transactions (any one will be used at most) */
+type NetSuiteCustomFormIDOptions = {
+    /** If the option is expense report */
+    expenseReport?: string;
+
+    /** If the option is vendor bill */
+    vendorBill?: string;
+
+    /** If the option is journal entry */
+    journalEntry?: string;
+};
+
+/** NetSuite custom list */
+type NetSuiteCustomList = {
+    /** The name of the custom list in NetSuite */
+    listName: string;
+
+    /** The internalID of the custom list in NetSuite */
+    internalID: string;
+
+    /** The ID of the transaction form field we'll code the list option onto during Export */
+    transactionFieldID: string;
+
+    /** Whether we import this list as a report field or tag */
+    mapping: NetSuiteCustomFieldMapping;
+};
+
+/** NetSuite custom segments/records */
+type NetSuiteCustomSegment = {
+    /** The name of the custom segment */
+    segmentName: string;
+
+    /** The ID of the custom segment in NetSuite */
+    internalID: string;
+
+    /** The ID of the transaction form field we'll code this segment onto during Export */
+    scriptID: string;
+
+    /** Whether we import this segment as a report field or tag */
+    mapping: NetSuiteCustomFieldMapping;
+};
+
+/** The custom form ID object */
+type NetSuiteCustomFormID = {
+    /** The custom form selections for reimbursable transactions */
+    reimbursable: NetSuiteCustomFormIDOptions;
+
+    /** The custom form selections for non-reimbursable transactions */
+    nonReimbursable: NetSuiteCustomFormIDOptions;
+
+    /** Whether we'll use the custom form selections upon export to NetSuite */
+    enabled: boolean;
+};
+
+/** User configuration for the NetSuite accounting integration. */
+type NetSuiteConnectionConfig = OnyxCommon.OnyxValueWithOfflineFeedback<{
+    /** Invoice Item Preference */
+    invoiceItemPreference?: NetSuiteInvoiceItemPreferenceValues;
+
+    /** ID of the bank account for NetSuite invoice collections */
+    receivableAccount?: string;
+
+    /** ID of the bank account for NetSuite tax posting */
+    taxPostingAccount?: string;
+
+    /** Whether we should export to the most recent open period if the current one is closed  */
+    exportToNextOpenPeriod: boolean;
+
+    /** Whether we will include the original foreign amount of a transaction to NetSuite */
+    allowForeignCurrency?: boolean;
+
+    /** Where to export reimbursable expenses */
+    reimbursableExpensesExportDestination: NetSuiteExportDestinationValues;
+
+    /** The sub-entity within the NetSuite account for which this policy is connected */
+    subsidiary: string;
+
+    /** Configuration options pertaining to sync. This subset of configurations is a legacy object. New configurations should just go directly under the config */
+    syncOptions: OnyxCommon.OnyxValueWithOfflineFeedback<{
+        /** Different NetSuite records that can be mapped to either Report Fields or Tags in Expensify */
+        mapping: OnyxCommon.OnyxValueWithOfflineFeedback<{
+            /** A general type of classification category in NetSuite */
+            classes: NetSuiteMappingValues;
+
+            /** A type of classification category in NetSuite linked to projects */
+            jobs: NetSuiteMappingValues;
+
+            /** A type of classification category in NetSuite linked to locations */
+            locations: NetSuiteMappingValues;
+
+            /** A type of classification category in NetSuite linked to customers */
+            customers: NetSuiteMappingValues;
+
+            /** A type of classification category in NetSuite linked to departments within the company */
+            departments: NetSuiteMappingValues;
+        }>;
+
+        /** Whether we want to import customers into NetSuite from across all subsidiaries */
+        crossSubsidiaryCustomers: boolean;
+
+        /** Whether we'll import employee supervisors and set them as managers in the Expensify approval workflow */
+        syncApprovalWorkflow: boolean;
+
+        /** Whether we import custom lists from NetSuite */
+        syncCustomLists?: boolean;
+
+        /** The approval level we set for an Expense Report record created in NetSuite */
+        exportReportsTo: NetSuiteExpenseReportApprovalLevels;
+
+        /** The approval level we set for a Vendor Bill record created in NetSuite */
+        exportVendorBillsTo: NetSuiteVendorBillApprovalLevels;
+
+        /** Whether or not we need to set the final approver in this policy via sync */
+        setFinalApprover: boolean;
+
+        /** Whether we sync report reimbursement status between Expensify and NetSuite */
+        syncReimbursedReports: boolean;
+
+        /** The relevant details of the custom segments we import into Expensify and code onto expenses */
+        customSegments?: NetSuiteCustomSegment[];
+
+        /** Whether to import Employees from NetSuite into Expensify */
+        syncPeople: boolean;
+
+        /** Whether to enable a new Expense Category into Expensify */
+        enableNewCategories?: boolean;
+
+        /** A now unused configuration saying whether a customer had toggled AutoSync yet. */
         hasChosenAutoSyncOption: boolean;
+
+        /** The final approver to be set in the Expensify approval workflow */
+        finalApprover: string;
+
+        /** Whether to import tax groups from NetSuite */
+        syncTax?: boolean;
+
+        /** Whether to import custom segments from NetSuite */
+        syncCustomSegments?: boolean;
+
+        /** The relevant details of the custom lists we import into Expensify and code onto expenses */
+        customLists?: NetSuiteCustomList[];
+
+        /** Whether we'll import Expense Categories into Expensify as categories */
+        syncCategories: boolean;
+
+        /** A now unused configuration saying whether a customer had toggled syncing reimbursement yet. */
         hasChosenSyncReimbursedReportsOption: boolean;
-        invoiceCollectionsAccountID: string;
-        reimbursementAccountID: string;
-        syncReimbursedReports: boolean;
-    };
-    tenantID: string;
+
+        /** The approval level we set for a Journal Entry record created in NetSuite */
+        exportJournalsTo: NetSuiteJournalApprovalLevels;
+    }>;
+
+    /** Whther to automatically create employees and vendors upon export in NetSuite if they don't exist */
+    autoCreateEntities: boolean;
+
+    /** The account to run auto export */
+    exporter: string;
+
+    /** The transaction date to set upon export */
+    exportDate?: NetSuiteExportDateOptions;
+
+    /** The type of transaction in NetSuite we export non-reimbursable transactions to */
+    nonreimbursableExpensesExportDestination: NetSuiteExportDestinationValues;
+
+    /** Credit account for reimbursable transactions */
+    reimbursablePayableAccount: string;
+
+    /** Whether we post Journals as individual separate entries or a single unified entry */
+    journalPostingPreference?: NetSuiteJournalPostingPreferences;
+
+    /** The Item record to associate with lines on an invoice created via Expensify */
+    invoiceItem?: string;
+
+    /** The internaID of the selected subsidiary in NetSuite */
+    subsidiaryID?: string;
+
+    /** The default vendor to use for Transactions in NetSuite */
+    defaultVendor?: string;
+
+    /** The provincial tax account for tax line items in NetSuite (only for Canadian Subsidiaries) */
+    provincialTaxPostingAccount?: string;
+
+    /** The account used for reimbursement in NetSuite */
+    reimbursementAccountID?: string;
+
+    /** The account used for approvals in NetSuite */
+    approvalAccount: string;
+
+    /** Credit account for Non-reimbursables (not applicable to expense report entry) */
+    payableAcct: string;
+
+    /** Configurations for customer to set custom forms for which reimbursable and non-reimbursable transactions will export to in NetSuite */
+    customFormIDOptions?: NetSuiteCustomFormID;
+
+    /** The account to use for Invoices export to NetSuite */
+    collectionAccount?: string;
+
+    /** Whether this account is using the newer version of tax in NetSuite, SuiteTax */
+    suiteTaxEnabled?: boolean;
+
+    /** Collection of errors coming from BE */
     errors?: OnyxCommon.Errors;
+
+    /** Collection of form field errors  */
     errorFields?: OnyxCommon.ErrorFields;
 }>;
 
+/** NetSuite connection model */
+type NetSuiteConnection = {
+    /** Account ID of the NetSuite Integration */
+    accountID: string;
+
+    /** Encrypted tokenID for authenticating to NetSuite */
+    tokenID: string;
+
+    /** Config and Data for the NetSuite connection */
+    options: {
+        /** Data imported from NetSuite */
+        data: NetSuiteConnectionData;
+
+        /** Configuration of the connection */
+        config: NetSuiteConnectionConfig;
+    };
+
+    /** Whether the sync connection has been successful */
+    verified: boolean;
+
+    /** Date when the connection's last successful sync occurred */
+    lastSyncDate: string;
+
+    /** Date when the connection's last failed sync occurred */
+    lastErrorSyncDate: string;
+
+    /** Where did the connection's last sync came from */
+    source: JobSourceValues;
+
+    /** Config object used solely to store autosync settings */
+    config: OnyxCommon.OnyxValueWithOfflineFeedback<{
+        /** NetSuite auto synchronization configs */
+        autoSync: {
+            /** Whether data should be automatically synched between the app and NetSuite */
+            enabled: boolean;
+
+            /** The bedrock job associated with the NetSuite Auto Sync job */
+            jobID: string;
+        };
+
+        /** Collection of errors coming from BE */
+        errors?: OnyxCommon.Errors;
+
+        /** Collection of form field errors  */
+        errorFields?: OnyxCommon.ErrorFields;
+    }>;
+
+    /** Encrypted token secret for authenticating to NetSuite */
+    tokenSecret: string;
+};
+
+/** One of the SageIntacctConnectionData object elements */
+type SageIntacctDataElement = {
+    /** Element ID */
+    id: string;
+
+    /** Element name */
+    name: string;
+};
+
+/** One of the SageIntacctConnectionData object elements with value */
+type SageIntacctDataElementWithValue = SageIntacctDataElement & {
+    /** Element value */
+    value: string;
+};
+
+/**
+ * Connection data for Sage Intacct
+ */
+type SageIntacctConnectionData = {
+    /** Collection of credit cards */
+    creditCards: SageIntacctDataElement[];
+
+    /** Collection of entities */
+    entities: SageIntacctDataElementWithValue[];
+
+    /** Collection of bank accounts */
+    bankAccounts: SageIntacctDataElement[];
+
+    /** Collection of vendors */
+    vendors: SageIntacctDataElementWithValue[];
+
+    /** Collection of journals */
+    journals: SageIntacctDataElementWithValue[];
+
+    /** Collection of items */
+    items: SageIntacctDataElement[];
+
+    /** Collection of tax solutions IDs */
+    taxSolutionIDs: string[];
+};
+
+/** Mapping value for Sage Intacct */
+type SageIntacctMappingValue = ValueOf<typeof CONST.SAGE_INTACCT_MAPPING_VALUE>;
+
+/** Mapping names for Sage Intacct */
+type SageIntacctMappingName = ValueOf<typeof CONST.SAGE_INTACCT_CONFIG.MAPPINGS>;
+
+/**
+ * Sage Intacct dimension type
+ */
+type SageIntacctDimension = {
+    /** Name of user defined dimention */
+    dimension: string;
+
+    /** Mapping value for user defined dimention */
+    mapping: typeof CONST.SAGE_INTACCT_MAPPING_VALUE.TAG | typeof CONST.SAGE_INTACCT_MAPPING_VALUE.REPORT_FIELD;
+};
+
+/** Mapping type for Sage Intacct */
+type SageIntacctMappingType = {
+    /** Whether should sync items for Sage Intacct */
+    syncItems: boolean;
+
+    /** Mapping type for Sage Intacct */
+    departments: SageIntacctMappingValue;
+
+    /** Mapping type for Sage Intacct */
+    classes: SageIntacctMappingValue;
+
+    /** Mapping type for Sage Intacct */
+    locations: SageIntacctMappingValue;
+
+    /** Mapping type for Sage Intacct */
+    customers: SageIntacctMappingValue;
+
+    /** Mapping type for Sage Intacct */
+    projects: SageIntacctMappingValue;
+
+    /** User defined dimention type for Sage Intacct */
+    dimensions: SageIntacctDimension[];
+};
+
+/** Configuration of automatic synchronization from Sage Intacct to the app */
+type SageIntacctAutoSyncConfig = {
+    /** Whether changes made in Sage Intacct should be reflected into the app automatically */
+    enabled: boolean;
+};
+
+/** Sage Intacct sync */
+type SageIntacctSyncConfig = {
+    /** ID of the bank account for Sage Intacct bill payment account */
+    reimbursementAccountID?: string;
+
+    /** Whether the reimbursed reports should be synced */
+    syncReimbursedReports: boolean | string;
+};
+
+/** Sage Intacct export configs */
+type SageIntacctExportConfig = {
+    /** Export date type */
+    exportDate: ValueOf<typeof CONST.SAGE_INTACCT_EXPORT_DATE>;
+
+    /** The e-mail of the exporter */
+    exporter: string;
+
+    /** Defines how non-reimbursable expenses are exported */
+    nonReimbursable: ValueOf<typeof CONST.SAGE_INTACCT_NON_REIMBURSABLE_EXPENSE_TYPE>;
+
+    /** Account that receives the non-reimbursable expenses */
+    nonReimbursableAccount: string;
+
+    /** Default vendor used for credit card transactions of non-reimbursable bill */
+    nonReimbursableCreditCardChargeDefaultVendor: string;
+
+    /** Default vendor of non-reimbursable bill */
+    nonReimbursableVendor: string;
+
+    /** Defines how reimbursable expenses are exported */
+    reimbursable: ValueOf<typeof CONST.SAGE_INTACCT_REIMBURSABLE_EXPENSE_TYPE>;
+
+    /** Default vendor of reimbursable bill */
+    reimbursableExpenseReportDefaultVendor: string;
+};
+
+/**
+ * Connection config for Sage Intacct
+ */
+type SageIntacctOfflineStateKeys = keyof SageIntacctMappingType | `dimension_${string}`;
+
+/**
+ * Connection config for Sage Intacct
+ */
+type SageIntacctConnectionsConfig = OnyxCommon.OnyxValueWithOfflineFeedback<
+    {
+        /** Sage Intacct credentials */
+        credentials: {
+            /** Sage Intacct companyID */
+            companyID: string;
+
+            /** Sage Intacct password */
+            password: string;
+
+            /** Sage Intacct userID */
+            userID: string;
+        };
+
+        /** Sage Intacct mappings */
+        mappings: SageIntacctMappingType;
+
+        /** Sage Intacct tax */
+        tax: {
+            /** Sage Intacct tax solution ID */
+            taxSolutionID: string;
+
+            /** Whether should sync tax with Sage Intacct */
+            syncTax: boolean;
+        };
+
+        /** Sage Intacct export configs */
+        export: SageIntacctExportConfig;
+
+        /** Whether employees should be imported from Sage Intacct */
+        importEmployees: boolean;
+
+        /** Sage Intacct approval mode */
+        approvalMode: ValueOf<typeof CONST.SAGE_INTACCT.APPROVAL_MODE.APPROVAL_MANUAL> | null;
+
+        /** Configuration of automatic synchronization from Sage Intacct to the app */
+        autoSync: SageIntacctAutoSyncConfig;
+
+        /** Sage Intacct sync */
+        sync: SageIntacctSyncConfig;
+
+        /** Sage Intacct entity */
+        entity?: string;
+
+        /** Collection of Sage Intacct config errors */
+        errors?: OnyxCommon.Errors;
+
+        /** Collection of form field errors  */
+        errorFields?: OnyxCommon.ErrorFields;
+    },
+    SageIntacctOfflineStateKeys | keyof SageIntacctSyncConfig | keyof SageIntacctAutoSyncConfig | keyof SageIntacctExportConfig
+>;
+
+/** State of integration connection */
 type Connection<ConnectionData, ConnectionConfig> = {
+    /** State of the last synchronization */
     lastSync?: ConnectionLastSync;
-    data: ConnectionData;
+
+    /** Data imported from integration */
+    data?: ConnectionData;
+
+    /** Configuration of the connection */
     config: ConnectionConfig;
 };
 
+/** Available integration connections */
 type Connections = {
-    quickbooksOnline: Connection<QBOConnectionData, QBOConnectionConfig>;
-    xero: Connection<XeroConnectionData, XeroConnectionConfig>;
+    /** QuickBooks integration connection */
+    [CONST.POLICY.CONNECTIONS.NAME.QBO]: Connection<QBOConnectionData, QBOConnectionConfig>;
+
+    /** Xero integration connection */
+    [CONST.POLICY.CONNECTIONS.NAME.XERO]: Connection<XeroConnectionData, XeroConnectionConfig>;
+
+    /** NetSuite integration connection */
+    [CONST.POLICY.CONNECTIONS.NAME.NETSUITE]: NetSuiteConnection;
+
+    /** Sage Intacct integration connection */
+    [CONST.POLICY.CONNECTIONS.NAME.SAGE_INTACCT]: Connection<SageIntacctConnectionData, SageIntacctConnectionsConfig>;
 };
 
+/** Names of integration connections */
 type ConnectionName = keyof Connections;
 
+/** Model of verified reimbursement bank account linked to policy */
 type ACHAccount = {
+    /** ID of the bank account */
     bankAccountID: number;
+
+    /** Bank account number */
     accountNumber: string;
+
+    /** Routing number of bank account */
     routingNumber: string;
+
+    /** Address name of the bank account */
     addressName: string;
+
+    /** Name of the bank */
     bankName: string;
+
+    /** E-mail of the reimburser */
     reimburser: string;
 };
 
+/** Day of the month to schedule submission  */
 type AutoReportingOffset = number | ValueOf<typeof CONST.POLICY.AUTO_REPORTING_OFFSET>;
 
+/** Types of policy report fields */
 type PolicyReportFieldType = 'text' | 'date' | 'dropdown' | 'formula';
 
+/** Model of policy report field */
 type PolicyReportField = {
     /** Name of the field */
     name: string;
@@ -303,19 +1274,21 @@ type PolicyReportField = {
     deletable: boolean;
 
     /** Value of the field */
-    value: string | null;
+    value?: string | null;
+
+    /** Value of the target */
+    target?: 'expense' | 'invoice' | 'paycheck';
 
     /** Options to select from if field is of type dropdown */
     values: string[];
 
-    target: string;
-
     /** Tax UDFs have keys holding the names of taxes (eg, VAT), values holding percentages (eg, 15%) and a value indicating the currently selected tax value (eg, 15%). */
     keys: string[];
 
     /** list of externalIDs, this are either imported from the integrations or auto generated by us, each externalID */
     externalIDs: string[];
 
+    /** Collection of flags that state whether droplist field options are disabled */
     disabledOptions: boolean[];
 
     /** Is this a tax user defined report field */
@@ -331,22 +1304,46 @@ type PolicyReportField = {
     defaultExternalID?: string | null;
 };
 
+/** Policy invoicing details */
+type PolicyInvoicingDetails = OnyxCommon.OnyxValueWithOfflineFeedback<{
+    /** Stripe Connect company name */
+    companyName?: string;
+
+    /** Stripe Connect company website */
+    companyWebsite?: string;
+}>;
+
+/** Names of policy features */
 type PolicyFeatureName = ValueOf<typeof CONST.POLICY.MORE_FEATURES>;
 
+/** Current user policy join request state */
 type PendingJoinRequestPolicy = {
+    /** Whether the current user requested to join the policy */
     isJoinRequestPending: boolean;
+
+    /** Record of public policy details, indexed by policy ID */
     policyDetailsForNonMembers: Record<
         string,
         OnyxCommon.OnyxValueWithOfflineFeedback<{
+            /** Name of the policy */
             name: string;
+
+            /** Policy owner account ID */
             ownerAccountID: number;
+
+            /** Policy owner e-mail */
             ownerEmail: string;
+
+            /** Policy type */
             type: ValueOf<typeof CONST.POLICY.TYPE>;
+
+            /** Policy avatar */
             avatar?: string;
         }>
     >;
 };
 
+/** Model of policy data */
 type Policy = OnyxCommon.OnyxValueWithOfflineFeedback<
     {
         /** The ID of the policy */
@@ -397,11 +1394,16 @@ type Policy = OnyxCommon.OnyxValueWithOfflineFeedback<
         /** Whether the auto reporting is enabled */
         autoReporting?: boolean;
 
-        /** The scheduled submit frequency set up on this policy */
-        autoReportingFrequency?: ValueOf<typeof CONST.POLICY.AUTO_REPORTING_FREQUENCIES>;
+        /**
+         * The scheduled submit frequency set up on this policy.
+         * Note that manual does not exist in the DB and thus should not exist in Onyx, only as a param for the API.
+         * "manual" really means "immediate" (aka "daily") && harvesting.enabled === false
+         */
+        autoReportingFrequency?: Exclude<ValueOf<typeof CONST.POLICY.AUTO_REPORTING_FREQUENCIES>, typeof CONST.POLICY.AUTO_REPORTING_FREQUENCIES.MANUAL>;
 
-        /** Whether the scheduled submit is enabled */
+        /** Scheduled submit data */
         harvesting?: {
+            /** Whether the scheduled submit is enabled */
             enabled: boolean;
         };
 
@@ -411,9 +1413,6 @@ type Policy = OnyxCommon.OnyxValueWithOfflineFeedback<
         /** When the monthly scheduled submit should happen */
         autoReportingOffset?: AutoReportingOffset;
 
-        /** The accountID of manager who the employee submits their expenses to on paid policies */
-        submitsTo?: number;
-
         /** The employee list of the policy */
         employeeList?: OnyxTypes.PolicyEmployeeList;
 
@@ -469,8 +1468,12 @@ type Policy = OnyxCommon.OnyxValueWithOfflineFeedback<
          */
         isTaxTrackingEnabled?: boolean;
 
-        /** Whether or not the policy has tax tracking enabled */
+        /** Policy invoicing details */
+        invoice?: PolicyInvoicingDetails;
+
+        /** Tax data */
         tax?: {
+            /** Whether or not the policy has tax tracking enabled */
             trackingEnabled: boolean;
         };
 
@@ -487,7 +1490,7 @@ type Policy = OnyxCommon.OnyxValueWithOfflineFeedback<
         connections?: Connections;
 
         /** Report fields attached to the policy */
-        fieldList?: Record<string, PolicyReportField>;
+        fieldList?: Record<string, OnyxCommon.OnyxValueWithOfflineFeedback<PolicyReportField>>;
 
         /** Whether the Categories feature is enabled */
         areCategoriesEnabled?: boolean;
@@ -501,21 +1504,39 @@ type Policy = OnyxCommon.OnyxValueWithOfflineFeedback<
         /** Whether the Distance Rates feature is enabled */
         areDistanceRatesEnabled?: boolean;
 
+        /** Whether the Expensify Card feature is enabled */
+        areExpensifyCardsEnabled?: boolean;
+
         /** Whether the workflows feature is enabled */
         areWorkflowsEnabled?: boolean;
 
+        /** Whether the rules feature is enabled */
+        areRulesEnabled?: boolean;
+
         /** Whether the Report Fields feature is enabled */
         areReportFieldsEnabled?: boolean;
 
         /** Whether the Connections feature is enabled */
         areConnectionsEnabled?: boolean;
 
+        /** Whether the Invoices feature is enabled */
+        areInvoicesEnabled?: boolean;
+
+        /** Whether the Company Cards feature is enabled */
+        areCompanyCardsEnabled?: boolean;
+
         /** The verified bank account linked to the policy */
         achAccount?: ACHAccount;
 
+        /** Whether the eReceipts are enabled */
+        eReceipts?: boolean;
+
         /** Indicates if the Policy is in loading state */
         isLoading?: boolean;
 
+        /** Indicates the Policy's SetWorkspaceReimbursement call loading state */
+        isLoadingWorkspaceReimbursement?: boolean;
+
         /** Indicates if the Policy ownership change is successful */
         isChangeOwnerSuccessful?: boolean;
 
@@ -524,15 +1545,44 @@ type Policy = OnyxCommon.OnyxValueWithOfflineFeedback<
 
         /** Object containing all policy information necessary to connect with Spontana */
         travelSettings?: WorkspaceTravelSettings;
+
+        /** Indicates if the policy is pending an upgrade */
+        isPendingUpgrade?: boolean;
+
+        /** Max expense age for a Policy violation */
+        maxExpenseAge?: number;
+
+        /** Max expense amount for a policy violation */
+        maxExpenseAmount?: number;
+
+        /** Max amount for an expense with no receipt violation */
+        maxExpenseAmountNoReceipt?: number;
+
+        /** Whether GL codes are enabled */
+        glCodes?: boolean;
+
+        /** Workspace account ID configured for Expensify Card */
+        workspaceAccountID?: number;
     } & Partial<PendingJoinRequestPolicy>,
-    'generalSettings' | 'addWorkspaceRoom' | keyof ACHAccount
+    'addWorkspaceRoom' | 'employeeList' | keyof ACHAccount | keyof Attributes
 >;
 
+/** Stages of policy connection sync */
 type PolicyConnectionSyncStage = ValueOf<typeof CONST.POLICY.CONNECTIONS.SYNC_STAGE_NAME>;
-type PolicyConnectionName = ValueOf<typeof CONST.POLICY.CONNECTIONS.NAME>;
+
+/** Names of policy connection services */
+type PolicyConnectionName = ConnectionName;
+
+/** Policy connection sync progress state */
 type PolicyConnectionSyncProgress = {
+    /** Current sync stage */
     stageInProgress: PolicyConnectionSyncStage;
-    connectionName: PolicyConnectionName;
+
+    /** Name of the connected service */
+    connectionName: ConnectionName;
+
+    /** Timestamp of the connection */
+    timestamp: string;
 };
 
 export default Policy;
@@ -544,6 +1594,7 @@ export type {
     CustomUnit,
     Attributes,
     Rate,
+    TaxRateAttributes,
     TaxRate,
     TaxRates,
     TaxRatesWithDefault,
@@ -555,10 +1606,35 @@ export type {
     PolicyConnectionSyncStage,
     PolicyConnectionSyncProgress,
     Connections,
+    SageIntacctOfflineStateKeys,
     ConnectionName,
     Tenant,
     Account,
     QBONonReimbursableExportAccountType,
     QBOReimbursableExportAccountType,
     QBOConnectionConfig,
+    XeroTrackingCategory,
+    NetSuiteConnection,
+    ConnectionLastSync,
+    NetSuiteSubsidiary,
+    NetSuiteCustomList,
+    NetSuiteCustomSegment,
+    NetSuiteCustomListSource,
+    NetSuiteCustomFieldMapping,
+    NetSuiteAccount,
+    NetSuiteVendor,
+    InvoiceItem,
+    NetSuiteTaxAccount,
+    NetSuiteCustomFormIDOptions,
+    NetSuiteCustomFormID,
+    SageIntacctMappingValue,
+    SageIntacctMappingType,
+    SageIntacctMappingName,
+    SageIntacctDimension,
+    SageIntacctDataElementWithValue,
+    NetSuiteMappingValues,
+    SageIntacctDataElement,
+    SageIntacctConnectionsConfig,
+    SageIntacctExportConfig,
+    ACHAccount,
 };
diff --git a/src/types/onyx/PolicyCategory.ts b/src/types/onyx/PolicyCategory.ts
index b42bceec0468..18a714208819 100644
--- a/src/types/onyx/PolicyCategory.ts
+++ b/src/types/onyx/PolicyCategory.ts
@@ -1,32 +1,41 @@
 import type * as OnyxCommon from './OnyxCommon';
 
+/** Model of policy category */
 type PolicyCategory = OnyxCommon.OnyxValueWithOfflineFeedback<{
     /** Name of a category */
     name: string;
 
     /** Unencoded name of a category */
-    unencodedName: string;
+    unencodedName?: 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;
+    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;
 
+    /** Payroll code is used to keep track of taxes, deductions, and an employee’s earnings */
+    // eslint-disable-next-line @typescript-eslint/naming-convention
+    'Payroll Code'?: string;
+
     /** An ID for this category from an external accounting system */
-    externalID: string;
+    externalID?: string;
 
     /** The external accounting service that this category comes from */
-    origin: string;
+    origin?: string;
+
+    /** The old category name of the category when we edit the category name */
+    previousCategoryName?: string;
 
     /** A list of errors keyed by microtime */
     errors?: OnyxCommon.Errors | null;
 }>;
 
+/** Record of policy categories, indexed by their name */
 type PolicyCategories = Record<string, PolicyCategory>;
 
 export type {PolicyCategory, PolicyCategories};
diff --git a/src/types/onyx/PolicyEmployee.ts b/src/types/onyx/PolicyEmployee.ts
index 4a5f374de44a..91b7f1653821 100644
--- a/src/types/onyx/PolicyEmployee.ts
+++ b/src/types/onyx/PolicyEmployee.ts
@@ -1,5 +1,6 @@
 import type * as OnyxCommon from './OnyxCommon';
 
+/** Model of policy employee */
 type PolicyEmployee = OnyxCommon.OnyxValueWithOfflineFeedback<{
     /** Role of the user in the policy */
     role?: string;
@@ -7,12 +8,18 @@ type PolicyEmployee = OnyxCommon.OnyxValueWithOfflineFeedback<{
     /** Email of the user */
     email?: string;
 
-    /** Email of the user this user forwards all approved reports to */
+    /** Determines if this employee should approve a report. If report total > approvalLimit, next approver will be 'overLimitForwardsTo', otherwise 'forwardsTo' */
+    approvalLimit?: number;
+
+    /** Email of the user this user forwards all approved reports to (when report total under 'approvalLimit' or when 'overLimitForwardsTo' is not set) */
     forwardsTo?: string;
 
     /** Email of the user this user submits all reports to */
     submitsTo?: string;
 
+    /** Email of the user this user forwards all reports to when the report total is over the 'approvalLimit' */
+    overLimitForwardsTo?: string;
+
     /**
      * Errors from api calls on the specific user
      * {<timestamp>: 'error message', <timestamp2>: 'error message 2'}
@@ -20,6 +27,7 @@ type PolicyEmployee = OnyxCommon.OnyxValueWithOfflineFeedback<{
     errors?: OnyxCommon.Errors;
 }>;
 
+/** Record of policy employees, indexed by their email */
 type PolicyEmployeeList = Record<string, PolicyEmployee>;
 
 export default PolicyEmployee;
diff --git a/src/types/onyx/PolicyJoinMember.ts b/src/types/onyx/PolicyJoinMember.ts
index 7c540b334b4a..bb7b346e6ded 100644
--- a/src/types/onyx/PolicyJoinMember.ts
+++ b/src/types/onyx/PolicyJoinMember.ts
@@ -1,5 +1,6 @@
 import type * as OnyxCommon from './OnyxCommon';
 
+/** Model of policy join member */
 type PolicyJoinMember = {
     /** The ID of the policy */
     policyID?: string;
diff --git a/src/types/onyx/PolicyOwnershipChangeChecks.ts b/src/types/onyx/PolicyOwnershipChangeChecks.ts
index 8033cffdee3c..9950122b069a 100644
--- a/src/types/onyx/PolicyOwnershipChangeChecks.ts
+++ b/src/types/onyx/PolicyOwnershipChangeChecks.ts
@@ -1,7 +1,15 @@
+/** Model of policy ownership change checks */
 type PolicyOwnershipChangeChecks = {
+    /** Whether the outstanding balance should be cleared after changing workspace owner */
     shouldClearOutstandingBalance?: boolean;
+
+    /** Whether the amount owed should be transferred after changing workspace owner */
     shouldTransferAmountOwed?: boolean;
+
+    /** Whether the subscription should be transferred after changing workspace owner */
     shouldTransferSubscription?: boolean;
+
+    /** Whether the single subscription should be transferred after changing workspace owner */
     shouldTransferSingleSubscription?: boolean;
 };
 
diff --git a/src/types/onyx/PolicyTag.ts b/src/types/onyx/PolicyTag.ts
index 37e979fb58f6..fbcfb6fdc9b0 100644
--- a/src/types/onyx/PolicyTag.ts
+++ b/src/types/onyx/PolicyTag.ts
@@ -1,5 +1,6 @@
 import type * as OnyxCommon from './OnyxCommon';
 
+/** Model of policy tag */
 type PolicyTag = OnyxCommon.OnyxValueWithOfflineFeedback<{
     /** Name of a Tag */
     name: string;
@@ -7,34 +8,57 @@ type PolicyTag = OnyxCommon.OnyxValueWithOfflineFeedback<{
     /** Flag that determines if a tag is active and able to be selected */
     enabled: boolean;
 
+    /** The old tag name of the tag when we edit the tag name */
+    previousTagName?: string;
+
     /** "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;
 
     /** A list of errors keyed by microtime */
     errors?: OnyxCommon.Errors | null;
+
+    /** The rules applied to the policy tag */
+    rules?: {
+        /**
+         * String representation of regex to match against parent tag. Eg, if San Francisco is a child tag of California
+         * its parentTagsFilter will be ^California$
+         */
+        parentTagsFilter?: string;
+    };
+
+    /**
+     * String representation of regex to match against parent tag. Eg, if San Francisco is a child tag of California
+     * its parentTagsFilter will be ^California$
+     */
+    parentTagsFilter?: string;
 }>;
 
+/** Record of policy tags, indexed by their name */
 type PolicyTags = Record<string, PolicyTag>;
 
-type PolicyTagList<T extends string = string> = Record<
-    T,
-    OnyxCommon.OnyxValueWithOfflineFeedback<{
-        /** Name of the tag list */
-        name: T;
+/** Single policy tag list */
+type PolicyTagList = {
+    /** Name of the tag list */
+    name: string;
 
-        /** Flag that determines if tags are required */
-        required: boolean;
+    /** Flag that determines if tags are required */
+    required: boolean;
 
-        /** List of tags */
-        tags: PolicyTags;
+    /** List of tags */
+    tags: PolicyTags;
+
+    /** Index by which the tag appears in the hierarchy of tags */
+    orderWeight: number;
+
+    /** A list of errors keyed by microtime */
+    errors?: OnyxCommon.Errors;
 
-        /** Index by which the tag appears in the hierarchy of tags */
-        orderWeight: number;
+    /** Error objects keyed by field name containing errors keyed by microtime */
+    errorFields?: OnyxCommon.ErrorFields;
+};
 
-        /** A list of errors keyed by microtime */
-        errors?: OnyxCommon.Errors;
-    }>
->;
+/** Record of policy tag lists, index by the name of the tag list */
+type PolicyTagLists = Record<string, OnyxCommon.OnyxValueWithOfflineFeedback<PolicyTagList>>;
 
-export type {PolicyTag, PolicyTags, PolicyTagList};
+export type {PolicyTag, PolicyTags, PolicyTagLists};
diff --git a/src/types/onyx/PreferredTheme.ts b/src/types/onyx/PreferredTheme.ts
index 408748ad06ea..98c001df018c 100644
--- a/src/types/onyx/PreferredTheme.ts
+++ b/src/types/onyx/PreferredTheme.ts
@@ -2,6 +2,7 @@ import type {OnyxEntry} from 'react-native-onyx';
 import type {ValueOf} from 'type-fest';
 import type CONST from '@src/CONST';
 
+/** Possible user preferred themes to be used in the whole app */
 type PreferredTheme = OnyxEntry<ValueOf<typeof CONST.THEME>>;
 
 export default PreferredTheme;
diff --git a/src/types/onyx/PriorityMode.ts b/src/types/onyx/PriorityMode.ts
index 224c86867f35..404c678945ad 100644
--- a/src/types/onyx/PriorityMode.ts
+++ b/src/types/onyx/PriorityMode.ts
@@ -2,6 +2,7 @@ import type {OnyxEntry} from 'react-native-onyx';
 import type {ValueOf} from 'type-fest';
 import type CONST from '@src/CONST';
 
+/** Modes that define how the user's chats are displayed in his chat list  */
 type PriorityMode = OnyxEntry<ValueOf<typeof CONST.PRIORITY_MODE>>;
 
 export default PriorityMode;
diff --git a/src/types/onyx/PrivatePersonalDetails.ts b/src/types/onyx/PrivatePersonalDetails.ts
index 3099cb0095e9..1635c610badf 100644
--- a/src/types/onyx/PrivatePersonalDetails.ts
+++ b/src/types/onyx/PrivatePersonalDetails.ts
@@ -1,29 +1,69 @@
 import type {Country} from '@src/CONST';
 
+/** User address data */
 type Address = {
+    /** Street line 1 */
     street: string;
+
+    /** Street line 2 */
     street2?: string;
+
+    /** City */
     city?: string;
+
+    /** State */
     state?: string;
+
+    /** Zip post code */
     zip?: string;
+
+    /** Country code */
     country?: Country | '';
+
+    /** Zip post code */
     zipPostCode?: string;
+
+    /** Street line 1 */
     addressLine1?: string;
+
+    /** Street line 2 */
     addressLine2?: string;
+
+    /** Latitude */
     lat?: string;
+
+    /** Longitude */
     lng?: string;
+
+    /** Zip post code */
     zipCode?: string;
+
+    /** Google place description */
     address?: string;
+
+    /** Is the current address */
+    current?: boolean;
 };
 
+/** Model of user private personal details */
 type PrivatePersonalDetails = {
+    /** User's legal first name */
     legalFirstName?: string;
+
+    /** User's legal last name */
     legalLastName?: string;
+
+    /** User's date of birth */
     dob?: string;
+
+    /** User's phone number */
     phoneNumber?: string;
 
-    /** User's home address */
+    /** @deprecated User's home address */
     address?: Address;
+
+    /** User's home address history. The most recent address is the last item in the array */
+    addresses?: Address[];
 };
 
 export default PrivatePersonalDetails;
diff --git a/src/types/onyx/PrivateStripeCustomer.ts b/src/types/onyx/PrivateStripeCustomer.ts
new file mode 100644
index 000000000000..7cf770e3ae5a
--- /dev/null
+++ b/src/types/onyx/PrivateStripeCustomer.ts
@@ -0,0 +1,11 @@
+/** Model of private stripe customer ID */
+type PrivateStripeCustomer = {
+    /** Currency of the stripe payment */
+    [currency: string]: string;
+    /** paymentMethodID of the stripe payment */
+    paymentMethodID: string;
+    /** Status of the stripe payment */
+    status: string;
+};
+
+export default PrivateStripeCustomer;
diff --git a/src/types/onyx/PrivateSubscription.ts b/src/types/onyx/PrivateSubscription.ts
new file mode 100644
index 000000000000..cd3282a87973
--- /dev/null
+++ b/src/types/onyx/PrivateSubscription.ts
@@ -0,0 +1,37 @@
+import type {SubscriptionType} from '@src/CONST';
+import type * as OnyxCommon from './OnyxCommon';
+
+/** Model of private subscription */
+type PrivateSubscription = OnyxCommon.OnyxValueWithOfflineFeedback<{
+    /** "auto increase annual seats" setting */
+    addNewUsersAutomatically: boolean;
+
+    /** "auto renew" setting */
+    autoRenew: boolean;
+
+    /** The date "auto renew" was last edited */
+    autoRenewLastChangedDate: string;
+
+    /** "corporate karma" setting */
+    donateToExpensifyOrg?: true;
+
+    /** Subscription end date */
+    endDate: string;
+
+    /** Subscription start date */
+    startDate: string;
+
+    /** Subscription variant. "yearly2018" - annual, "monthly2018" - pay-per-use */
+    type: SubscriptionType;
+
+    /** Subscription size */
+    userCount?: number;
+
+    /** An error message */
+    errors?: OnyxCommon.Errors;
+
+    /** Field-specific error messages */
+    errorFields?: OnyxCommon.ErrorFields;
+}>;
+
+export default PrivateSubscription;
diff --git a/src/types/onyx/QuickAction.ts b/src/types/onyx/QuickAction.ts
index 325893637911..c10ec8356546 100644
--- a/src/types/onyx/QuickAction.ts
+++ b/src/types/onyx/QuickAction.ts
@@ -1,8 +1,10 @@
 import type {ValueOf} from 'type-fest';
 import type CONST from '@src/CONST';
 
+/** Names of quick actions that the user can execute */
 type QuickActionName = ValueOf<typeof CONST.QUICK_ACTIONS>;
 
+/** Model of user quick action */
 type QuickAction = {
     /** The action to take */
     action?: QuickActionName;
diff --git a/src/types/onyx/RecentWaypoint.ts b/src/types/onyx/RecentWaypoint.ts
index 55232f7ef71d..6624eb044f98 100644
--- a/src/types/onyx/RecentWaypoint.ts
+++ b/src/types/onyx/RecentWaypoint.ts
@@ -1,3 +1,4 @@
+/** Model of recent endpoint used in distance expense */
 type RecentWaypoint = {
     /** The name associated with the address of the waypoint */
     name?: string;
@@ -10,6 +11,9 @@ type RecentWaypoint = {
 
     /** The longitude of the waypoint */
     lng?: number;
+
+    /** A unique key for waypoint is required for correct draggable list rendering */
+    keyForList?: string;
 };
 
 export default RecentWaypoint;
diff --git a/src/types/onyx/RecentlyUsedCategories.ts b/src/types/onyx/RecentlyUsedCategories.ts
index d251b16f8667..c3d7c187c710 100644
--- a/src/types/onyx/RecentlyUsedCategories.ts
+++ b/src/types/onyx/RecentlyUsedCategories.ts
@@ -1,3 +1,4 @@
+/** Workspace categories that have been recently used by members */
 type RecentlyUsedCategories = string[];
 
 export default RecentlyUsedCategories;
diff --git a/src/types/onyx/RecentlyUsedReportFields.ts b/src/types/onyx/RecentlyUsedReportFields.ts
index 2b3d046c8316..95af207eaa31 100644
--- a/src/types/onyx/RecentlyUsedReportFields.ts
+++ b/src/types/onyx/RecentlyUsedReportFields.ts
@@ -1,3 +1,4 @@
+/** Record of policy recently used report fields, indexed by expensify_${reportFieldId} */
 type RecentlyUsedReportFields = Record<string, string[]>;
 
 export default RecentlyUsedReportFields;
diff --git a/src/types/onyx/RecentlyUsedTags.ts b/src/types/onyx/RecentlyUsedTags.ts
index 1d6112514609..650a0554ef37 100644
--- a/src/types/onyx/RecentlyUsedTags.ts
+++ b/src/types/onyx/RecentlyUsedTags.ts
@@ -1,3 +1,4 @@
+/** Record of policy recently used tags, indexed by nvp_recentlyUsedTags_{policyID} */
 type RecentlyUsedTags = Record<string, string[]>;
 
 export default RecentlyUsedTags;
diff --git a/src/types/onyx/ReimbursementAccount.ts b/src/types/onyx/ReimbursementAccount.ts
index f2565b29eaf3..186b3e6ad05b 100644
--- a/src/types/onyx/ReimbursementAccount.ts
+++ b/src/types/onyx/ReimbursementAccount.ts
@@ -4,10 +4,13 @@ import type {ACHContractStepProps, BeneficialOwnersStepProps, CompanyStepProps,
 import type {BankName} from './Bank';
 import type * as OnyxCommon from './OnyxCommon';
 
+/** Steps to setup a reimbursement bank account */
 type BankAccountStep = ValueOf<typeof CONST.BANK_ACCOUNT.STEP>;
 
+/** Substeps to setup a reimbursement bank account */
 type BankAccountSubStep = ValueOf<typeof CONST.BANK_ACCOUNT.SUBSTEP>;
 
+/** Model of ACH data */
 type ACHData = Partial<BeneficialOwnersStepProps & CompanyStepProps & RequestorStepProps & ACHContractStepProps & ReimbursementAccountProps> & {
     /** Step of the setup flow that we are on. Determines which view is presented. */
     currentStep?: BankAccountStep;
@@ -46,6 +49,22 @@ type ACHData = Partial<BeneficialOwnersStepProps & CompanyStepProps & RequestorS
     plaidAccountID?: string;
 };
 
+/** The step in an reimbursement account's ach data */
+type ReimbursementAccountStep = BankAccountStep | '';
+
+/** The sub step in an reimbursement account's ach data */
+type ReimbursementAccountSubStep = BankAccountSubStep | '';
+
+/** The ACHData for an reimbursement account */
+type ACHDataReimbursementAccount = Omit<ACHData, 'subStep' | 'currentStep'> & {
+    /** Step of the setup flow that we are on. Determines which view is presented. */
+    currentStep?: ReimbursementAccountStep;
+
+    /** Optional subStep we would like the user to start back on */
+    subStep?: ReimbursementAccountSubStep;
+};
+
+/** Model of reimbursement account data */
 type ReimbursementAccount = OnyxCommon.OnyxValueWithOfflineFeedback<{
     /** Whether we are loading the data via the API */
     isLoading?: boolean;
@@ -54,7 +73,7 @@ type ReimbursementAccount = OnyxCommon.OnyxValueWithOfflineFeedback<{
     throttledDate?: string;
 
     /** Additional data for the account in setup */
-    achData?: ACHData;
+    achData?: ACHDataReimbursementAccount;
 
     /** Disable validation button if max attempts exceeded */
     maxAttemptsReached?: boolean;
@@ -76,4 +95,4 @@ type ReimbursementAccount = OnyxCommon.OnyxValueWithOfflineFeedback<{
 }>;
 
 export default ReimbursementAccount;
-export type {BankAccountStep, BankAccountSubStep, ACHData};
+export type {BankAccountStep, BankAccountSubStep, ACHData, ReimbursementAccountStep, ReimbursementAccountSubStep, ACHDataReimbursementAccount};
diff --git a/src/types/onyx/Report.ts b/src/types/onyx/Report.ts
index 2c765be70248..0a545cb8e4dc 100644
--- a/src/types/onyx/Report.ts
+++ b/src/types/onyx/Report.ts
@@ -6,40 +6,66 @@ import type * as OnyxCommon from './OnyxCommon';
 import type PersonalDetails from './PersonalDetails';
 import type {PolicyReportField} from './Policy';
 
+/** Preference that defines how regular the chat notifications are sent to the user */
 type NotificationPreference = ValueOf<typeof CONST.REPORT.NOTIFICATION_PREFERENCE>;
 
+/** Defines who's able to write messages in the chat */
 type WriteCapability = ValueOf<typeof CONST.REPORT.WRITE_CAPABILITIES>;
 
+/** Defines which users have access to the chat */
 type RoomVisibility = ValueOf<typeof CONST.REPORT.VISIBILITY>;
 
+/** Model of report private note */
 type Note = OnyxCommon.OnyxValueWithOfflineFeedback<{
+    /** Content of the note */
     note: string;
+
+    /** Collection of errors to show to the user */
     errors?: OnyxCommon.Errors;
 }>;
 
 /** The pending member of report */
 type PendingChatMember = {
+    /** Account ID of the pending member */
     accountID: string;
+
+    /** Action to be applied to the pending member of report */
     pendingAction: OnyxCommon.PendingAction;
+
+    /** Collection of errors to show to the user */
+    errors?: OnyxCommon.Errors;
 };
 
-type Participant = {
+/** Report participant properties */
+type Participant = OnyxCommon.OnyxValueWithOfflineFeedback<{
+    /** Whether the participant is visible in the report */
     hidden?: boolean;
+
+    /** What is the role of the participant in the report */
     role?: 'admin' | 'member';
-};
+}>;
 
+/** Types of invoice receivers in a report */
 type InvoiceReceiver =
     | {
+          /** An individual */
           type: typeof CONST.REPORT.INVOICE_RECEIVER_TYPE.INDIVIDUAL;
+
+          /** Account ID of the user */
           accountID: number;
       }
     | {
+          /** A business */
           type: typeof CONST.REPORT.INVOICE_RECEIVER_TYPE.BUSINESS;
+
+          /** ID of the policy */
           policyID: string;
       };
 
+/** Record of report participants, indexed by their accountID */
 type Participants = Record<number, Participant>;
 
+/** Model of report data */
 type Report = OnyxCommon.OnyxValueWithOfflineFeedback<
     {
         /** The URL of the Group Chat report custom avatar */
@@ -51,6 +77,9 @@ type Report = OnyxCommon.OnyxValueWithOfflineFeedback<
         /** Whether the report has a child that is an outstanding expense that is awaiting action from the current user */
         hasOutstandingChildRequest?: boolean;
 
+        /** Whether the report has a child task that is awaiting action from the current user */
+        hasOutstandingChildTask?: boolean;
+
         /** List of icons for report participants */
         icons?: OnyxCommon.Icon[];
 
@@ -87,6 +116,9 @@ type Report = OnyxCommon.OnyxValueWithOfflineFeedback<
         /** The current user's notification preference for this report */
         notificationPreference?: NotificationPreference;
 
+        /** The policy avatar to use, if any */
+        policyAvatar?: string | null;
+
         /** The policy name to use */
         policyName?: string | null;
 
@@ -141,29 +173,58 @@ type Report = OnyxCommon.OnyxValueWithOfflineFeedback<
         /** Invoice room receiver data */
         invoiceReceiver?: InvoiceReceiver;
 
+        /** Translation key of the last message in the report */
         lastMessageTranslationKey?: string;
+
+        /** ID of the parent report of the current report, if it exists */
         parentReportID?: string;
+
+        /** ID of the parent report action of the current report, if it exists */
         parentReportActionID?: string;
+
+        /** Whether the current report is optimistic */
         isOptimisticReport?: boolean;
+
+        /** Account ID of the report manager */
         managerID?: number;
+
+        /** When was the last visible action last modified */
         lastVisibleActionLastModified?: string;
+
+        /** Display name of the report, shown in options and mentions */
         displayName?: string;
+
+        /** HTML content of the last message in the report */
         lastMessageHtml?: string;
+
+        /** Account ID of the user that sent the last message */
         lastActorAccountID?: number;
 
-        // The type of the last action
+        /** The type of the last action */
         lastActionType?: ValueOf<typeof CONST.REPORT.ACTIONS.TYPE>;
+
+        /** Account ID of the report owner */
         ownerAccountID?: number;
+
+        /** E-mail of the report owner */
         ownerEmail?: string;
+
+        /** Collection of report participants, indexed by their accountID */
         participants?: Participants;
-        participantAccountIDs?: number[];
-        visibleChatMemberAccountIDs?: number[];
+
+        /** For expense reports, this is the total amount approved */
         total?: number;
+
+        /** For expense reports, this is the total amount requested */
         unheldTotal?: number;
+
+        /** For expense reports, this is the currency of the expense */
         currency?: string;
+
+        /** Collection of errors to be shown to the user */
         errors?: OnyxCommon.Errors;
-        managerEmail?: string;
-        parentReportActionIDs?: number[];
+
+        /** Collection of errors that exist in report fields */
         errorFields?: OnyxCommon.ErrorFields;
 
         /** Whether the report is waiting on a bank account */
@@ -186,13 +247,26 @@ type Report = OnyxCommon.OnyxValueWithOfflineFeedback<
 
         /** If the report contains nonreimbursable expenses, send the nonreimbursable total */
         nonReimbursableTotal?: number;
+
+        /** Whether the report is hidden from options list */
         isHidden?: boolean;
+
+        /** Whether the report is a chat room */
         isChatRoom?: boolean;
+
+        /** Collection of participants personal details */
         participantsList?: PersonalDetails[];
+
+        /** Text to be displayed in options list, which matches reportName by default */
         text?: string;
-        updateReportInLHN?: boolean;
+
+        /** Collection of participant private notes, indexed by their accountID */
         privateNotes?: Record<number, Note>;
+
+        /** Whether participants private notes are being currently loaded */
         isLoadingPrivateNotes?: boolean;
+
+        /** Whether the report is currently selected in the options list */
         selected?: boolean;
 
         /** Pending members of the report */
@@ -201,13 +275,32 @@ type Report = OnyxCommon.OnyxValueWithOfflineFeedback<
         /** The ID of the single transaction thread report associated with this report, if one exists */
         transactionThreadReportID?: string;
 
+        /** Collection of policy report fields, indexed by their fieldID */
         fieldList?: Record<string, PolicyReportField>;
 
+        /** Collection of report permissions granted to the current user */
         permissions?: Array<ValueOf<typeof CONST.REPORT.PERMISSIONS>>;
+
+        /** The trip data for a trip room */
+        tripData?: {
+            /** The start date of a trip */
+            startDate: string;
+
+            /** The end date of a trip */
+            endDate: string;
+
+            /** The trip ID in spotnana */
+            tripID: string;
+        };
+
+        /** Whether the report is archived */
+        // eslint-disable-next-line @typescript-eslint/naming-convention
+        private_isArchived?: string;
     },
     PolicyReportField['fieldID']
 >;
 
+/** Collection of reports, indexed by report_{reportID} */
 type ReportCollectionDataSet = CollectionDataSet<typeof ONYXKEYS.COLLECTION.REPORT>;
 
 export default Report;
diff --git a/src/types/onyx/ReportAction.ts b/src/types/onyx/ReportAction.ts
index dade2052e052..80ef5e9698fe 100644
--- a/src/types/onyx/ReportAction.ts
+++ b/src/types/onyx/ReportAction.ts
@@ -1,16 +1,17 @@
-import type {ValueOf} from 'type-fest';
-import type {FileObject} from '@components/AttachmentModal';
+import type {Spread, ValueOf} from 'type-fest';
 import type {AvatarSource} from '@libs/UserUtils';
 import type CONST from '@src/CONST';
 import type ONYXKEYS from '@src/ONYXKEYS';
 import type CollectionDataSet from '@src/types/utils/CollectionDataSet';
-import type {EmptyObject} from '@src/types/utils/EmptyObject';
+import type OldDotAction from './OldDotAction';
 import type * as OnyxCommon from './OnyxCommon';
-import type {Decision, Reaction} from './OriginalMessage';
 import type OriginalMessage from './OriginalMessage';
+import type {Decision} from './OriginalMessage';
 import type {NotificationPreference} from './Report';
+import type ReportActionName from './ReportActionName';
 import type {Receipt} from './Transaction';
 
+/** Model of report action message */
 type Message = {
     /** The type of the action item fragment. Used to render a corresponding component */
     type: string;
@@ -49,10 +50,14 @@ type Message = {
 
     /** Whether the pending transaction was reversed and didn't post to the card */
     isReversedTransaction?: boolean;
+
+    /** Collection of accountIDs of users mentioned in message */
     whisperedTo?: number[];
-    reactions?: Reaction[];
 
+    /** In situations where moderation is required, this is the moderator decision data */
     moderationDecision?: Decision;
+
+    /** Key to translate the message */
     translationKey?: string;
 
     /** ID of a task report */
@@ -71,12 +76,13 @@ type Message = {
     currency?: string;
 
     /** resolution for actionable mention whisper */
-    resolution?: ValueOf<typeof CONST.REPORT.ACTIONABLE_MENTION_WHISPER_RESOLUTION> | null;
+    resolution?: ValueOf<typeof CONST.REPORT.ACTIONABLE_MENTION_WHISPER_RESOLUTION> | ValueOf<typeof CONST.REPORT.ACTIONABLE_REPORT_MENTION_WHISPER_RESOLUTION> | null;
 
     /** The time this report action was deleted */
     deleted?: string;
 };
 
+/** Model of image */
 type ImageMetadata = {
     /**  The height of the image. */
     height?: number;
@@ -91,6 +97,7 @@ type ImageMetadata = {
     type?: string;
 };
 
+/** Model of link */
 type LinkMetadata = {
     /**  The URL of the link. */
     url?: string;
@@ -111,12 +118,19 @@ type LinkMetadata = {
     logo?: ImageMetadata;
 };
 
+/** Model of report action person */
 type Person = {
+    /** Type of the message to display */
     type?: string;
+
+    /** Style applied to the message */
     style?: string;
+
+    /** Content of the message to display which corresponds to the user display name */
     text?: string;
 };
 
+/** Main properties of report action */
 type ReportActionBase = OnyxCommon.OnyxValueWithOfflineFeedback<{
     /** The ID of the reportAction. It is the string representation of the a 64-bit integer. */
     reportActionID: string;
@@ -124,9 +138,10 @@ type ReportActionBase = OnyxCommon.OnyxValueWithOfflineFeedback<{
     /** @deprecated Used in old report actions before migration. Replaced by reportActionID. */
     sequenceNumber?: number;
 
-    /** 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;
+    /** The name (or type) of the action */
+    actionName: ReportActionName;
 
+    /** Account ID of the actor that created the action */
     actorAccountID?: number;
 
     /** The account of the last message's actor */
@@ -138,22 +153,16 @@ type ReportActionBase = OnyxCommon.OnyxValueWithOfflineFeedback<{
     /** ISO-formatted datetime */
     created: string;
 
-    /** report action message */
-    message?: Array<Message | undefined>;
-
-    /** report action message */
-    previousMessage?: Array<Message | undefined>;
-
     /** Whether we have received a response back from the server */
     isLoading?: boolean;
 
-    /** accountIDs of the people to which the whisper was sent to (if any). Returns empty array if it is not a whisper */
-    whisperedToAccountIDs?: number[];
-
+    /** Avatar data to display on the report action */
     avatar?: AvatarSource;
 
+    /** TODO: Not enough context */
     automatic?: boolean;
 
+    /** TODO: Not enough context */
     shouldShow?: boolean;
 
     /** The ID of childReport */
@@ -168,29 +177,50 @@ type ReportActionBase = OnyxCommon.OnyxValueWithOfflineFeedback<{
     /** The user's ID */
     accountID?: number;
 
-    childOldestFourEmails?: string;
+    /** Account IDs of the oldest four participants, useful to determine which avatars to display in threads */
     childOldestFourAccountIDs?: string;
+
+    /** How many participants commented in the report */
     childCommenterCount?: number;
+
+    /** Timestamp of the most recent reply */
     childLastVisibleActionCreated?: string;
+
+    /** Number of thread replies */
     childVisibleActionCount?: number;
+
+    /** Report ID of the parent report, if there's one */
     parentReportID?: string;
+
+    /** In task reports this is account ID of the user assigned to the task */
     childManagerAccountID?: number;
 
+    /** The owner account ID of the child report action */
+    childOwnerAccountID?: number;
+
     /** The status of the child report */
     childStatusNum?: ValueOf<typeof CONST.REPORT.STATUS_NUM>;
 
     /** Report action child status name */
     childStateNum?: ValueOf<typeof CONST.REPORT.STATE_NUM>;
-    childLastReceiptTransactionIDs?: string;
+
+    /** Content of the last money request comment, used in report preview */
     childLastMoneyRequestComment?: string;
+
+    /** Account ID of the last actor */
     childLastActorAccountID?: number;
-    timestamp?: number;
-    reportActionTimestamp?: number;
+
+    /** Amount of money requests */
     childMoneyRequestCount?: number;
+
+    /** Whether the report action is the first one */
     isFirstItem?: boolean;
 
-    /** Informations about attachments of report action */
-    attachmentInfo?: FileObject | EmptyObject;
+    /** Whether the report action is only an attachment */
+    isAttachmentOnly?: boolean;
+
+    /** Whether the report action is an attachment with text */
+    isAttachmentWithText?: boolean;
 
     /** Receipt tied to report action */
     receipt?: Receipt;
@@ -198,6 +228,7 @@ type ReportActionBase = OnyxCommon.OnyxValueWithOfflineFeedback<{
     /** ISO-formatted datetime */
     lastModified?: string;
 
+    /** The accountID of the copilot who took this action on behalf of the user */
     delegateAccountID?: number;
 
     /** Server side errors keyed by microtime */
@@ -206,9 +237,6 @@ type ReportActionBase = OnyxCommon.OnyxValueWithOfflineFeedback<{
     /** Error associated with the report action */
     error?: string;
 
-    /** Whether the report action is attachment */
-    isAttachment?: boolean;
-
     /** Recent receipt transaction IDs keyed by reportID */
     childRecentReceiptTransactionIDs?: Record<string, string>;
 
@@ -229,13 +257,38 @@ type ReportActionBase = OnyxCommon.OnyxValueWithOfflineFeedback<{
 
     /** The admins's ID */
     adminAccountID?: number;
+
+    /** These are the account IDs to whom a message was whispered. It is used to check if a specific user should be displayed a whisper message or not. */
+    whisperedToAccountIDs?: number[];
 }>;
 
-type ReportAction = ReportActionBase & OriginalMessage;
+/**
+ *
+ */
+type OldDotReportAction = ReportActionBase & OldDotAction;
+
+/**
+ *
+ */
+type ReportAction<T extends ReportActionName = ReportActionName> = ReportActionBase & {
+    /** @deprecated Used in old report actions before migration. Replaced by using getOriginalMessage function. */
+    originalMessage?: OriginalMessage<T>;
+
+    /** report action message */
+    message?: (OriginalMessage<T> & Message) | Array<Message | undefined>;
+
+    /** report action message */
+    previousMessage?: (OriginalMessage<T> & Message) | Array<Message | undefined>;
+};
+
+/** */
+type ReportActionChangeLog = ReportAction<ValueOf<Spread<typeof CONST.REPORT.ACTIONS.TYPE.POLICY_CHANGE_LOG, typeof CONST.REPORT.ACTIONS.TYPE.ROOM_CHANGE_LOG>>>;
 
+/** Record of report actions, indexed by report action ID */
 type ReportActions = Record<string, ReportAction>;
 
+/** Collection of mock report actions, indexed by reportActions_${reportID} */
 type ReportActionsCollectionDataSet = CollectionDataSet<typeof ONYXKEYS.COLLECTION.REPORT_ACTIONS>;
 
 export default ReportAction;
-export type {ReportActions, ReportActionBase, Message, LinkMetadata, OriginalMessage, ReportActionsCollectionDataSet};
+export type {ReportActions, Message, LinkMetadata, OriginalMessage, ReportActionsCollectionDataSet, ReportActionChangeLog, OldDotReportAction};
diff --git a/src/types/onyx/ReportActionName.ts b/src/types/onyx/ReportActionName.ts
new file mode 100644
index 000000000000..b5a16c88242a
--- /dev/null
+++ b/src/types/onyx/ReportActionName.ts
@@ -0,0 +1,7 @@
+import type CONST from '@src/CONST';
+import type DeepValueOf from '@src/types/utils/DeepValueOf';
+
+/** The name (or type) of a reportAction */
+type ReportActionName = DeepValueOf<typeof CONST.REPORT.ACTIONS.TYPE>;
+
+export default ReportActionName;
diff --git a/src/types/onyx/ReportActionReactions.ts b/src/types/onyx/ReportActionReactions.ts
index 983598e0b420..fd14b681d6e9 100644
--- a/src/types/onyx/ReportActionReactions.ts
+++ b/src/types/onyx/ReportActionReactions.ts
@@ -1,5 +1,6 @@
 import type * as OnyxCommon from './OnyxCommon';
 
+/** Model of report user reaction */
 type UserReaction = {
     /** ID of user reaction */
     id: string;
@@ -11,8 +12,10 @@ type UserReaction = {
     oldestTimestamp: string;
 };
 
+/** Record of report user reactions, indexed by their login name or account id */
 type UsersReactions = Record<string, UserReaction>;
 
+/** Model of report action reaction */
 type ReportActionReaction = OnyxCommon.OnyxValueWithOfflineFeedback<{
     /** The time the emoji was added */
     createdAt: string;
@@ -24,6 +27,7 @@ type ReportActionReaction = OnyxCommon.OnyxValueWithOfflineFeedback<{
     users: UsersReactions;
 }>;
 
+/** Record of report action reactions, indexed by emoji name */
 type ReportActionReactions = Record<string, ReportActionReaction>;
 
 export default ReportActionReactions;
diff --git a/src/types/onyx/ReportActionsDraft.ts b/src/types/onyx/ReportActionsDraft.ts
index 41a701f16e71..762e4f690853 100644
--- a/src/types/onyx/ReportActionsDraft.ts
+++ b/src/types/onyx/ReportActionsDraft.ts
@@ -1,5 +1,7 @@
+/** Model of a report action draft */
 type ReportActionsDraft =
     | {
+          /** Chat message content */
           message: string;
       }
     | string;
diff --git a/src/types/onyx/ReportActionsDrafts.ts b/src/types/onyx/ReportActionsDrafts.ts
index e4c51c61ed25..56be910d53de 100644
--- a/src/types/onyx/ReportActionsDrafts.ts
+++ b/src/types/onyx/ReportActionsDrafts.ts
@@ -2,8 +2,10 @@ import type ONYXKEYS from '@src/ONYXKEYS';
 import type CollectionDataSet from '@src/types/utils/CollectionDataSet';
 import type ReportActionsDraft from './ReportActionsDraft';
 
+/** Record of report actions drafts, indexed by their ID */
 type ReportActionsDrafts = Record<string, ReportActionsDraft>;
 
+/** Record of report actions drafts grouped by report, indexed by reportActionsDrafts_\<REPORT_ID\> */
 type ReportActionsDraftCollectionDataSet = CollectionDataSet<typeof ONYXKEYS.COLLECTION.REPORT_ACTIONS_DRAFTS>;
 
 export default ReportActionsDrafts;
diff --git a/src/types/onyx/ReportMetadata.ts b/src/types/onyx/ReportMetadata.ts
index c6484705553c..65a6f153c51b 100644
--- a/src/types/onyx/ReportMetadata.ts
+++ b/src/types/onyx/ReportMetadata.ts
@@ -1,10 +1,17 @@
+/** Model of report metadata */
 type ReportMetadata = {
     /** Are we loading newer report actions? */
     isLoadingNewerReportActions?: boolean;
 
+    /** Was there an error when loading newer report actions? */
+    hasLoadingNewerReportActionsError?: boolean;
+
     /** Are we loading older report actions? */
     isLoadingOlderReportActions?: boolean;
 
+    /** Was there an error when loading older report actions? */
+    hasLoadingOlderReportActionsError?: boolean;
+
     /** Flag to check if the report actions data are loading */
     isLoadingInitialReportActions?: boolean;
 
diff --git a/src/types/onyx/ReportNameValuePairs.ts b/src/types/onyx/ReportNameValuePairs.ts
new file mode 100644
index 000000000000..8b5a50d8d5c8
--- /dev/null
+++ b/src/types/onyx/ReportNameValuePairs.ts
@@ -0,0 +1,10 @@
+import type * as OnyxCommon from './OnyxCommon';
+
+/** Model of additional report details */
+type ReportNameValuePairs = OnyxCommon.OnyxValueWithOfflineFeedback<{
+    /** Whether the report is an archived room */
+    // eslint-disable-next-line @typescript-eslint/naming-convention
+    private_isArchived: boolean;
+}>;
+
+export default ReportNameValuePairs;
diff --git a/src/types/onyx/ReportNextStep.ts b/src/types/onyx/ReportNextStep.ts
index b619319d8f91..2107cbfccaac 100644
--- a/src/types/onyx/ReportNextStep.ts
+++ b/src/types/onyx/ReportNextStep.ts
@@ -1,53 +1,89 @@
+import type {ValueOf} from 'type-fest';
+import type CONST from '@src/CONST';
+
+/** Model of report next step message */
 type Message = {
+    /** Message content */
     text: string;
+
+    /** HTML tag name */
     type?: string;
+
+    /** Action for the user to take */
     action?: string;
 };
 
+/** Model of report next step button data */
 type DataOptions = {
+    /** Whether the user should see the option to pay via Expensify (ACH) */
     canSeeACHOption?: boolean;
+
+    /** Whether workspace reimbursements is set to Indirect reimbursements */
     isManualReimbursementEnabled?: boolean;
+
+    /**
+     * If there is a masked bank account number from the server, the account needs to be unlocked
+     *
+     * (Note: Copied directly from a comment in Old Dot JS)
+     */
     maskedLockedAccountNumber?: string;
+
+    /** Whether the preferred business bank account of the policy is deleted or no longer accessible to the policy reimburser */
     preferredWithdrawalDeleted?: boolean;
 };
 
+/** Model of report next step button */
 type Button = {
+    /** Text/label shown on the button */
     text?: string;
+
+    /** Text to show on a tooltip */
     tooltip?: string;
+
+    /** Whether the button should be disabled */
     disabled?: boolean;
+
+    /** Whether the button should be hidden */
     hidden?: boolean;
+
+    /** Data needed to render the button and handle its click events */
     data?: DataOptions;
 };
 
+/** Model for next step of a report */
 type ReportNextStep = {
     /** The message parts of the next step */
     message?: Message[];
 
-    /** The title for the next step */
-    title?: string;
+    /** The icon for the next step */
+    icon: ValueOf<typeof CONST.NEXT_STEP.ICONS>;
 
     /** Whether the user should take some sort of action in order to unblock the report */
     requiresUserAction?: boolean;
 
-    /** The type of next step */
+    /**
+     * The type of next step
+     *
+     * "neutral" for normal next steps, "alert" for more urgent/actionable
+     */
     type: 'alert' | 'neutral' | null;
 
-    /** If the "Undo submit" button should be visible */
+    /** Whether the "Undo submit" button should be visible */
     showUndoSubmit?: boolean;
 
-    /** Deprecated - If the next step should be displayed on mobile, related to OldApp */
+    /** Whether the next step should be displayed on mobile, related to OldApp */
     showForMobile?: boolean;
 
-    /** If the next step should be displayed at the expense level */
+    /** Whether the next step should be displayed at the expense level */
     showForExpense?: boolean;
 
     /** An optional alternate message to display on expenses instead of what is provided in the "message" field */
     expenseMessage?: Message[];
 
-    /** The next person in the approval chain of the report */
+    /** Email of the next person in the approval chain that needs to approve the report */
     nextReceiver?: string;
 
-    /** An array of buttons to be displayed next to the next step */
+    /** An array listing the buttons to be displayed alongside the next step copy */
     buttons?: Record<string, Button>;
 };
 
diff --git a/src/types/onyx/ReportUserIsTyping.ts b/src/types/onyx/ReportUserIsTyping.ts
index 1e6f482ffa7a..b599da4974fe 100644
--- a/src/types/onyx/ReportUserIsTyping.ts
+++ b/src/types/onyx/ReportUserIsTyping.ts
@@ -1,3 +1,4 @@
+/** Record of report users typing state, indexed by their login name or account id */
 type ReportUserIsTyping = Record<string, boolean>;
 
 export default ReportUserIsTyping;
diff --git a/src/types/onyx/ReportViolation.ts b/src/types/onyx/ReportViolation.ts
new file mode 100644
index 000000000000..fae385cc674d
--- /dev/null
+++ b/src/types/onyx/ReportViolation.ts
@@ -0,0 +1,21 @@
+import type {EmptyObject, ValueOf} from 'type-fest';
+import type CONST from '@src/CONST';
+
+/**
+ * Names of violations.
+ * Derived from `CONST.VIOLATIONS` to maintain a single source of truth.
+ */
+type ReportViolationName = ValueOf<typeof CONST.REPORT_VIOLATIONS>;
+
+/**
+ * Keys of this object are IDs of field that has violations
+ */
+type ReportFieldsViolations = Record<string, EmptyObject>;
+
+/**
+ * Report Violation model
+ */
+type ReportViolations = Record<ReportViolationName, ReportFieldsViolations>;
+
+export type {ReportViolationName, ReportFieldsViolations};
+export default ReportViolations;
diff --git a/src/types/onyx/Request.ts b/src/types/onyx/Request.ts
index 233519f010fc..1f3f788a8418 100644
--- a/src/types/onyx/Request.ts
+++ b/src/types/onyx/Request.ts
@@ -1,30 +1,88 @@
 import type {OnyxUpdate} from 'react-native-onyx';
 import type Response from './Response';
 
+/** Model of onyx requests sent to the API */
 type OnyxData = {
+    /** Onyx instructions that are executed after getting response from server with jsonCode === 200 */
     successData?: OnyxUpdate[];
+
+    /** Onyx instructions that are executed after getting response from server with jsonCode !== 200 */
     failureData?: OnyxUpdate[];
+
+    /** Onyx instructions that are executed after getting any response from server */
     finallyData?: OnyxUpdate[];
+
+    /** Onyx instructions that are executed before request is made to the server */
     optimisticData?: OnyxUpdate[];
 };
 
+/** HTTP request method names */
 type RequestType = 'get' | 'post';
 
+/** Model of overall requests sent to the API */
 type RequestData = {
+    /** Name of the API command */
     command: string;
+
+    /** Command name for logging purposes */
     commandName?: string;
+
+    /** Additional parameters that can be sent with the request */
     data?: Record<string, unknown>;
+
+    /** The HTTP request method name */
     type?: RequestType;
+
+    /** Whether the app should connect to the secure API endpoints */
     shouldUseSecure?: boolean;
+
+    /** Onyx instructions that are executed after getting response from server with jsonCode === 200 */
     successData?: OnyxUpdate[];
+
+    /** Onyx instructions that are executed after getting response from server with jsonCode !== 200 */
     failureData?: OnyxUpdate[];
+
+    /** Onyx instructions that are executed after getting any response from server */
     finallyData?: OnyxUpdate[];
+
+    /** Promise resolve handler */
     resolve?: (value: Response) => void;
+
+    /** Promise reject handler */
     reject?: (value?: unknown) => void;
+
+    /** Whether the app should skip the web proxy to connect to API endpoints */
     shouldSkipWebProxy?: boolean;
 };
 
+/** Model of requests sent to the API */
 type Request = RequestData & OnyxData;
 
+/**
+ * An object used to describe how a request can be paginated.
+ */
+type PaginationConfig = {
+    /**
+     * The ID of the resource we're trying to paginate (i.e: the reportID in the case of paginating reportActions).
+     */
+    resourceID: string;
+
+    /**
+     * The ID used as a cursor/offset when making a paginated request.
+     */
+    cursorID?: string | null;
+};
+
+/**
+ * A paginated request object.
+ */
+type PaginatedRequest = Request &
+    PaginationConfig & {
+        /**
+         * A boolean flag to mark a request as Paginated.
+         */
+        isPaginated: true;
+    };
+
 export default Request;
-export type {OnyxData, RequestType};
+export type {OnyxData, RequestType, PaginationConfig, PaginatedRequest};
diff --git a/src/types/onyx/Response.ts b/src/types/onyx/Response.ts
index 5e606738c56d..ef558896c55e 100644
--- a/src/types/onyx/Response.ts
+++ b/src/types/onyx/Response.ts
@@ -1,26 +1,71 @@
 import type {OnyxUpdate} from 'react-native-onyx';
 
+/** Model of commands data */
 type Data = {
+    /** Name of the API call */
     phpCommandName: string;
+
+    /** Collection of auth write requests */
     authWriteCommands: string[];
 };
 
+/** Model of server response */
 type Response = {
+    /** ID of the next update that needs to be fetched from the server */
     previousUpdateID?: number | string;
+
+    /** ID of the last update that needs to be fetched from the server */
     lastUpdateID?: number | string;
+
+    /** HTTP response status code */
     jsonCode?: number | string;
+
+    /** Collection of onyx updates (SET/MERGE/...) */
     onyxData?: OnyxUpdate[];
+
+    /** ID of the request that triggered this response */
     requestID?: string;
+
+    /** Report ID of the updated report */
     reportID?: string;
+
+    /**
+     * Whether the sequential queue should not send any requests to the server.
+     * Used when there's a gap between client and server updates.
+     */
     shouldPauseQueue?: boolean;
+
+    /** User session auth token */
     authToken?: string;
+
+    /** Used to load resources like attachment videos and images */
     encryptedAuthToken?: string;
+
+    /** User session auth token when connecting as a delegate */
+    restrictedToken?: string;
+
+    /** Used to pass error messages for error handling purposes */
     message?: string;
+
+    /** Used to pass error title for error handling purposes */
     title?: string;
+
+    /** Commands data */
     data?: Data;
+
+    /** Used to pass error type for error handling purposes */
     type?: string;
+
+    /** Short lived auth token generated by API */
     shortLivedAuthToken?: string;
+
+    /** Short lived token generated by spotnana for authenticating travelDot */
+    spotnanaToken?: string;
+
+    /** User authorization token to authorize Pusher connections */
     auth?: string;
+
+    /** Base64 key to decrypt messages from Pusher encrypted channels */
     // eslint-disable-next-line @typescript-eslint/naming-convention
     shared_secret?: string;
 };
diff --git a/src/types/onyx/ReviewDuplicates.ts b/src/types/onyx/ReviewDuplicates.ts
new file mode 100644
index 000000000000..0682ed0a7f7c
--- /dev/null
+++ b/src/types/onyx/ReviewDuplicates.ts
@@ -0,0 +1,36 @@
+/**
+ * Model of review duplicates request
+ */
+type ReviewDuplicates = {
+    /** Transactions ids which are duplicates of selected transcation */
+    duplicates: string[];
+
+    /** ID of transaction we want to keep */
+    transactionID: string;
+
+    /** Merchant which user want to keep */
+    merchant: string;
+
+    /** Category  which user want to keep */
+    category: string;
+
+    /** Tag  which user want to keep */
+    tag: string;
+
+    /** Tax code  which user want to keep */
+    taxCode: string;
+
+    /** Calculated tax amount */
+    taxAmount: number;
+
+    /** Description  which user want to keep */
+    description: string;
+
+    /** Whether the transaction is reimbursable */
+    reimbursable: boolean;
+
+    /** Whether the transaction is billable */
+    billable: boolean;
+};
+
+export default ReviewDuplicates;
diff --git a/src/types/onyx/ScreenShareRequest.ts b/src/types/onyx/ScreenShareRequest.ts
index 564ba99c22ac..920921e8c9b2 100644
--- a/src/types/onyx/ScreenShareRequest.ts
+++ b/src/types/onyx/ScreenShareRequest.ts
@@ -1,3 +1,4 @@
+/** Model of screen share request */
 type ScreenShareRequest = {
     /** Access token required to join a screen share room, generated by the backend */
     accessToken: string;
diff --git a/src/types/onyx/SearchResults.ts b/src/types/onyx/SearchResults.ts
index af23821d70e8..e67b5b30f1d6 100644
--- a/src/types/onyx/SearchResults.ts
+++ b/src/types/onyx/SearchResults.ts
@@ -1,65 +1,229 @@
 import type {ValueOf} from 'type-fest';
+import type {SearchStatus} from '@components/Search/types';
+import type ReportListItem from '@components/SelectionList/Search/ReportListItem';
+import type TransactionListItem from '@components/SelectionList/Search/TransactionListItem';
+import type {ReportListItemType, TransactionListItemType} from '@components/SelectionList/types';
 import type CONST from '@src/CONST';
-import type {Receipt} from './Transaction';
 
+/** Types of search data */
+type SearchDataTypes = ValueOf<typeof CONST.SEARCH.DATA_TYPES>;
+
+/** Model of search result list item */
+type ListItemType<T extends SearchStatus> = T extends typeof CONST.SEARCH.STATUS.EXPENSE.ALL ? typeof TransactionListItem : typeof ReportListItem;
+
+/** Model of search list item data type */
+type ListItemDataType<T extends SearchStatus> = T extends typeof CONST.SEARCH.STATUS.EXPENSE.ALL ? TransactionListItemType[] : ReportListItemType[];
+
+/** Model of columns to show for search results */
+type ColumnsToShow = {
+    /** Whether the category column should be shown */
+    shouldShowCategoryColumn: boolean;
+
+    /** Whether the tag column should be shown */
+    shouldShowTagColumn: boolean;
+
+    /** Whether the tax column should be shown */
+    shouldShowTaxColumn: boolean;
+};
+
+/** Model of search result state */
 type SearchResultsInfo = {
+    /** Current search results offset/cursor */
     offset: number;
-    type: string;
+
+    /** Type of search */
+    type: SearchDataTypes;
+
+    /** The status filter for the current search */
+    status: SearchStatus;
+
+    /** Whether the user can fetch more search results */
     hasMoreResults: boolean;
+
+    /** Whether the search results are currently loading */
+    isLoading: boolean;
+
+    /** The optional columns that should be shown according to policy settings */
+    columnsToShow: ColumnsToShow;
 };
 
+/** Model of personal details search result */
 type SearchPersonalDetails = {
+    /** ID of user account */
     accountID: number;
+
+    /** User's avatar URL */
     avatar: string;
+
+    /** User's display name */
     displayName?: string;
+
+    /** User's email */
     login?: string;
 };
 
-type SearchPolicyDetails = {
-    id: string;
-    avatarURL: string;
-    name: string;
+/** The action that can be performed for the transaction */
+type SearchTransactionAction = ValueOf<typeof CONST.SEARCH.ACTION_TYPES>;
+
+/** Model of report search result */
+type SearchReport = {
+    /** The ID of the report */
+    reportID?: string;
+
+    /** The name of the report */
+    reportName?: string;
+
+    /** The report total amount */
+    total?: number;
+
+    /** The report currency */
+    currency?: string;
+
+    /** The report type */
+    type?: ValueOf<typeof CONST.REPORT.TYPE>;
+
+    /** The accountID of the report manager */
+    managerID?: number;
+
+    /** The accountID of the user who created the report  */
+    accountID?: number;
+
+    /** The policyID of the report */
+    policyID?: string;
+
+    /** The date the report was created */
+    created?: string;
+
+    /** The action that can be performed for the report */
+    action?: SearchTransactionAction;
 };
 
+/** Model of transaction search result */
 type SearchTransaction = {
+    /** The ID of the transaction */
     transactionID: string;
-    parentTransactionID?: string;
-    receipt?: Receipt;
-    hasEReceipt?: boolean;
+
+    /** The transaction created date */
     created: string;
+
+    /** The edited transaction created date */
+    modifiedCreated: string;
+
+    /** The transaction amount */
+    amount: number;
+
+    /** If the transaction can be deleted */
+    canDelete: boolean;
+
+    /** If the transaction can be put on hold */
+    canHold: boolean;
+
+    /** If the transaction can be removed from hold */
+    canUnhold: boolean;
+
+    /** The edited transaction amount */
+    modifiedAmount: number;
+
+    /** The transaction currency */
+    currency: string;
+
+    /** The edited transaction currency */
+    modifiedCurrency: string;
+
+    /** The transaction merchant */
     merchant: string;
-    modifiedCreated?: string;
-    modifiedMerchant?: string;
+
+    /** The edited transaction merchant */
+    modifiedMerchant: string;
+
+    /** The receipt object */
+    receipt?: {
+        /** Source of the receipt */
+        source?: string;
+
+        /** State of the receipt */
+        state?: ValueOf<typeof CONST.IOU.RECEIPT_STATE>;
+    };
+
+    /** The transaction tag */
+    tag: string;
+
+    /** The transaction description */
+    comment?: {
+        /** Content of the transaction description */
+        comment?: string;
+    };
+
+    /** The transaction category */
+    category: string;
+
+    /** The type of request */
+    transactionType: ValueOf<typeof CONST.SEARCH.TRANSACTION_TYPE>;
+
+    /** The type of report the transaction is associated with */
+    reportType: string;
+
+    /** The ID of the policy the transaction is associated with */
+    policyID: string;
+
+    /** The ID of the parent of the transaction */
+    parentTransactionID?: string;
+
+    /** If the transaction has an Ereceipt */
+    hasEReceipt?: boolean;
+
+    /** The transaction description */
     description: string;
+
+    /** The transaction sender ID */
     accountID: number;
+
+    /** The transaction recipient ID */
     managerID: number;
-    from: SearchPersonalDetails | SearchPolicyDetails;
-    to: SearchPersonalDetails | SearchPolicyDetails;
-    amount: number;
-    modifiedAmount?: number;
-    category?: string;
-    currency: string;
-    tag?: string;
-    type: SearchTransactionType;
+
+    /** If the transaction has a Ereceipt */
     hasViolation: boolean;
+
+    /** The transaction tax amount */
     taxAmount?: number;
+
+    /** The ID of the report the transaction is associated with */
     reportID: string;
-    reportType: string;
-    policyID: string;
+
+    /** The report ID of the transaction thread associated with the transaction */
     transactionThreadReportID: string;
-    shouldShowMerchant: boolean;
-    action: string;
-};
 
-type SearchTransactionType = ValueOf<typeof CONST.SEARCH_TRANSACTION_TYPE>;
+    /** The action that can be performed for the transaction */
+    action: SearchTransactionAction;
+
+    /** The MCC Group associated with the transaction */
+    mccGroup?: ValueOf<typeof CONST.MCC_GROUPS>;
 
-type SearchQuery = ValueOf<typeof CONST.TAB_SEARCH>;
+    /** The modified MCC Group associated with the transaction */
+    modifiedMCCGroup?: ValueOf<typeof CONST.MCC_GROUPS>;
 
+    /** The ID of the money request reportAction associated with the transaction */
+    moneyRequestReportActionID?: string;
+
+    /** Whether the transaction report has only a single transaction */
+    isFromOneTransactionReport?: boolean;
+};
+
+/** Types of searchable transactions */
+type SearchTransactionType = ValueOf<typeof CONST.SEARCH.TRANSACTION_TYPE>;
+
+/** Model of search results */
 type SearchResults = {
+    /** Current search results state */
     search: SearchResultsInfo;
-    data: Record<string, SearchTransaction & Record<string, SearchPersonalDetails>> & Record<string, SearchPolicyDetails>;
+
+    /** Search results data */
+    data: Record<string, SearchTransaction & Record<string, SearchPersonalDetails>> & Record<string, SearchReport>;
+
+    /** Whether search data is being fetched from server */
+    isLoading?: boolean;
 };
 
 export default SearchResults;
 
-export type {SearchQuery, SearchTransaction, SearchTransactionType, SearchPersonalDetails, SearchPolicyDetails};
+export type {ListItemType, ListItemDataType, SearchTransaction, SearchTransactionType, SearchTransactionAction, SearchPersonalDetails, SearchDataTypes, SearchReport};
diff --git a/src/types/onyx/SecurityGroup.ts b/src/types/onyx/SecurityGroup.ts
index b2362c1eb628..7b213c2e88c8 100644
--- a/src/types/onyx/SecurityGroup.ts
+++ b/src/types/onyx/SecurityGroup.ts
@@ -1,4 +1,6 @@
+/** Model of security group */
 type SecurityGroup = {
+    /** Whether the security group restricts primary login switching */
     hasRestrictedPrimaryLogin: boolean;
 };
 
diff --git a/src/types/onyx/SelectedTabRequest.ts b/src/types/onyx/SelectedTabRequest.ts
index 8a87db6eee82..db79b948dcde 100644
--- a/src/types/onyx/SelectedTabRequest.ts
+++ b/src/types/onyx/SelectedTabRequest.ts
@@ -1,6 +1,7 @@
 import type {ValueOf} from 'type-fest';
 import type CONST from '@src/CONST';
 
+/** Selectable IOU request tabs */
 type SelectedTabRequest = ValueOf<typeof CONST.TAB_REQUEST>;
 
 export default SelectedTabRequest;
diff --git a/src/types/onyx/Session.ts b/src/types/onyx/Session.ts
index d181114d02d3..7cb47a380717 100644
--- a/src/types/onyx/Session.ts
+++ b/src/types/onyx/Session.ts
@@ -2,8 +2,10 @@ import type {ValueOf} from 'type-fest';
 import type CONST from '@src/CONST';
 import type * as OnyxCommon from './OnyxCommon';
 
+/** Possible states of the automatic authentication after user clicks on a magic link */
 type AutoAuthState = ValueOf<typeof CONST.AUTO_AUTH_STATE>;
 
+/** Model of user session data */
 type Session = {
     /** The user's email for the current session */
     email?: string;
@@ -26,6 +28,7 @@ type Session = {
     /** Currently logged in user accountID */
     accountID?: number;
 
+    /** Current state of the automatic authentication after user clicks on a magic link */
     autoAuthState?: AutoAuthState;
 
     /** Server side errors keyed by microtime */
diff --git a/src/types/onyx/StripeCustomerID.ts b/src/types/onyx/StripeCustomerID.ts
new file mode 100644
index 000000000000..292cb517e2a6
--- /dev/null
+++ b/src/types/onyx/StripeCustomerID.ts
@@ -0,0 +1,16 @@
+/** Model of Stripe customer */
+type StripeCustomerID = {
+    /** Payment method's ID */
+    paymentMethodID: string;
+
+    /** Intent's ID */
+    intentsID: string;
+
+    /** Payment currency */
+    currency: string;
+
+    /** Payment status */
+    status: 'authentication_required' | 'intent_required' | 'succeeded';
+};
+
+export default StripeCustomerID;
diff --git a/src/types/onyx/Task.ts b/src/types/onyx/Task.ts
index ee3b8e8abd87..fcdb97899338 100644
--- a/src/types/onyx/Task.ts
+++ b/src/types/onyx/Task.ts
@@ -1,5 +1,6 @@
 import type Report from './Report';
 
+/** Model of task data */
 type Task = {
     /** Title of the Task */
     title?: string;
@@ -7,8 +8,11 @@ type Task = {
     /** Description of the Task */
     description?: string;
 
-    // TODO: Make sure this field exists in the API
-    /** Share destination of the Task */
+    /**
+     * Report ID of the report where the task will be shared
+     *
+     * (Note: This variable doesn't exist in the API. It's only used locally for UI purposes)
+     */
     shareDestination?: string;
 
     /** The task report if it's currently being edited */
diff --git a/src/types/onyx/Transaction.ts b/src/types/onyx/Transaction.ts
index 7894876fdcdf..2677e8a74fd5 100644
--- a/src/types/onyx/Transaction.ts
+++ b/src/types/onyx/Transaction.ts
@@ -7,7 +7,9 @@ import type {Participant, Split} from './IOU';
 import type * as OnyxCommon from './OnyxCommon';
 import type RecentWaypoint from './RecentWaypoint';
 import type ReportAction from './ReportAction';
+import type {ViolationName} from './TransactionViolation';
 
+/** Model of waypoint */
 type Waypoint = {
     /** The name associated with the address of the waypoint */
     name?: string;
@@ -38,75 +40,267 @@ type Waypoint = {
 
     /** Address street line 2 */
     street2?: string;
+
+    /** A unique key for waypoint is required for correct draggable list rendering */
+    keyForList?: string;
 };
 
+/**
+ * Collection of waypoints, indexed by `waypoint${index}`
+ * where `index` corresponds to the position of the waypoint in the list
+ */
 type WaypointCollection = Record<string, RecentWaypoint | Waypoint>;
 
+/** Model of transaction comment */
 type Comment = {
+    /** Content of the transaction comment */
     comment?: string;
+
+    /** Whether the transaction is on hold */
     hold?: string;
+
+    /** Collection of waypoints associated with the transaction */
     waypoints?: WaypointCollection;
+
+    /** Whether the transaction comment is loading */
     isLoading?: boolean;
-    type?: string;
+
+    /** Type of the transaction */
+    type?: ValueOf<typeof CONST.TRANSACTION.TYPE>;
+
+    /** In custom unit transactions this holds the information of the custom unit */
     customUnit?: TransactionCustomUnit;
+
+    /** Source of the transaction which when specified matches `split` */
     source?: string;
+
+    /** ID of the original transaction */
     originalTransactionID?: string;
+
+    /** In split transactions this is a collection of participant split data */
     splits?: Split[];
+
+    /** Violations that were dismissed */
+    dismissedViolations?: Record<ViolationName, Record<string, string | number>>;
 };
 
+/** Model of transaction custom unit */
 type TransactionCustomUnit = {
+    /** ID of the custom unit */
     customUnitID?: string;
+
+    /** ID of the custom unit rate */
     customUnitRateID?: string;
-    quantity?: number;
-    name?: string;
+
+    /** Custom unit amount */
+    quantity?: number | null;
+
+    /** Name of the custom unit */
+    name?: ValueOf<typeof CONST.CUSTOM_UNITS>;
+
+    /** Default rate for custom unit */
     defaultP2PRate?: number;
 };
 
+/** Types of geometry */
 type GeometryType = 'LineString';
 
+/** Geometry data */
 type Geometry = {
+    /** Matrix of points, indexed by their coordinates */
     coordinates: number[][] | null;
+
+    /** Type of connections between coordinates */
     type?: GeometryType;
 };
 
+/** Accepted receipt paths */
 type ReceiptSource = string;
 
+/** Model of receipt */
 type Receipt = {
-    receiptID?: number;
-    path?: string;
+    /** Name of receipt file */
     name?: string;
+
+    /** ID of receipt file */
+    receiptID?: number;
+
+    /** Path of the receipt file */
     source?: ReceiptSource;
+
+    /** Name of receipt file */
     filename?: string;
+
+    /** Current receipt scan state */
     state?: ValueOf<typeof CONST.IOU.RECEIPT_STATE>;
+
+    /** Type of the receipt file */
     type?: string;
+
+    /** Collection of reservations */
+    reservationList?: Reservation[];
 };
 
+/** Model of route */
 type Route = {
+    /** Distance amount of the route */
     distance: number | null;
+
+    /** Route geometry data */
     geometry: Geometry;
 };
 
+/** Collection of routes, indexed by `route${index}` where `index` is the position of the route in the list */
 type Routes = Record<string, Route>;
 
-type ReceiptError = {error?: string; source: string; filename: string};
+/** Model of receipt error */
+type ReceiptError = {
+    /** Path of the receipt file */
+    source: string;
+
+    /** Name of the receipt file */
+    filename: string;
+};
 
+/** Collection of receipt errors, indexed by a UNIX timestamp of when the error occurred */
 type ReceiptErrors = Record<string, ReceiptError>;
 
+/** Tax rate data */
 type TaxRateData = {
-    name: string;
+    /** Tax rate percentage */
     value: string;
+
+    /** Tax rate code */
     code?: string;
 };
 
+/** Model of tax rate */
 type TaxRate = {
+    /** Default name of the tax rate */
     text: string;
+
+    /** Key of the tax rate to index it on options list */
     keyForList: string;
-    searchText: string;
-    tooltipText: string;
-    isDisabled?: boolean;
+
+    /** Data of the tax rate */
     data?: TaxRateData;
 };
 
+/** Model of reservation */
+type Reservation = {
+    /** ID of the reservation */
+    reservationID?: string;
+
+    /** Details about the start of the reservation */
+    start: ReservationTimeDetails;
+
+    /** Details about the end of the reservation */
+    end: ReservationTimeDetails;
+
+    /** Type of reservation */
+    type: ReservationType;
+
+    /** In flight reservations, this represents the details of the airline company */
+    company?: Company;
+
+    /** Collection of passenger confirmations */
+    confirmations?: ReservationConfirmation[];
+
+    /** In flight and car reservations, this represents the number of passengers */
+    numPassengers?: number;
+
+    /** In hotel reservations, this represents the number of rooms reserved */
+    numberOfRooms?: number;
+
+    /** In flight reservations, this represents the details of the route */
+    route?: {
+        /** Route airline code */
+        airlineCode: string;
+
+        /** Passenger class */
+        class?: string;
+
+        /** Passenger seat number */
+        number: string;
+    };
+
+    /** In car reservations, this represents the car dealership name */
+    vendor?: string;
+
+    /** In car reservations, this represents the details of the car */
+    carInfo?: CarInfo;
+
+    /** Payment type of the reservation */
+    paymentType?: string;
+};
+
+/** Model of trip reservation time details */
+type ReservationTimeDetails = {
+    /** Date timestamp */
+    date: string;
+
+    /** In hotel reservations, this is the address of the hotel */
+    address?: string;
+
+    /** In car reservations, this is the location of the car dealership */
+    location?: string;
+
+    /** In flight reservations, this is the long name of the airport */
+    longName?: string;
+
+    /** In flight reservations, this is the short name of the airport */
+    shortName?: string;
+
+    /** Timezone offset */
+    timezoneOffset?: string;
+};
+
+/** Model of airline company details */
+type Company = {
+    /** Long name of airline company */
+    longName: string;
+
+    /** Short name of airline company */
+    shortName?: string;
+
+    /** Phone number of airline company support */
+    phone?: string;
+};
+
+/** Model of reservation confirmation */
+type ReservationConfirmation = {
+    /** Passenger name */
+    name: string;
+
+    /** Reservation code */
+    value: string;
+};
+
+/** Model of car details */
+type CarInfo = {
+    /** Name of the car */
+    name?: string;
+
+    /** Engine type */
+    engine?: string;
+};
+
+/** Types of reservations */
+type ReservationType = ValueOf<typeof CONST.RESERVATION_TYPE>;
+
+/** Participant split data */
+type SplitShare = {
+    /** Amount to be split with participant */
+    amount: number;
+
+    /** Whether the split was modified */
+    isModified?: boolean;
+};
+
+/** Record of participant split data, indexed by their `accountID` */
+type SplitShares = Record<number, SplitShare | null>;
+
+/** Model of transaction */
 type Transaction = OnyxCommon.OnyxValueWithOfflineFeedback<
     {
         /** The original transaction amount */
@@ -125,7 +319,7 @@ type Transaction = OnyxCommon.OnyxValueWithOfflineFeedback<
         category?: string;
 
         /** The comment object on the transaction */
-        comment: Comment;
+        comment?: Comment;
 
         /** Date that the expense was created */
         created: string;
@@ -163,6 +357,9 @@ type Transaction = OnyxCommon.OnyxValueWithOfflineFeedback<
         /** The edited waypoints for the distance expense */
         modifiedWaypoints?: WaypointCollection;
 
+        /** The edited distance rate for the distance request */
+        modifiedCustomUnitRateID?: string;
+
         /**
          * Used during the creation flow before the transaction is saved to the server and helps dictate where
          * the user is navigated to when pressing the back button on the confirmation step
@@ -225,6 +422,15 @@ type Transaction = OnyxCommon.OnyxValueWithOfflineFeedback<
         /** Indicates transaction loading */
         isLoading?: boolean;
 
+        /** Holds individual shares of a split keyed by accountID, only used locally */
+        splitShares?: SplitShares;
+
+        /** Holds the accountIDs of accounts who paid the split, for now only supports a single payer */
+        splitPayerAccountIDs?: number[];
+
+        /** Whether the user input should be kept */
+        shouldShowOriginalAmount?: boolean;
+
         /** The actionable report action ID associated with the transaction */
         actionableWhisperReportActionID?: string;
 
@@ -234,23 +440,46 @@ type Transaction = OnyxCommon.OnyxValueWithOfflineFeedback<
         /** The linked report id for the tracked expense */
         linkedTrackedExpenseReportID?: string;
 
-        /** The payers of split bill transaction */
-        splitPayerAccountIDs?: number[];
+        /** The bank of the purchaser card, if any */
+        bank?: string;
+
+        /** The display name of the purchaser card, if any */
+        cardName?: string;
+
+        /** The masked PAN of the purchaser card, if any */
+        cardNumber?: string;
+
+        /** Whether the transaction is linked to a managed card */
+        managedCard?: boolean;
     },
-    keyof Comment
+    keyof Comment | keyof TransactionCustomUnit
 >;
 
+/** Keys of pending transaction fields */
 type TransactionPendingFieldsKey = KeysOfUnion<Transaction['pendingFields']>;
 
+/** Additional transaction changes data */
 type AdditionalTransactionChanges = {
+    /** Content of modified comment */
     comment?: string;
+
+    /** Collection of modified waypoints */
     waypoints?: WaypointCollection;
+
+    /** The ID of the distance rate */
+    customUnitRateID?: string;
+
+    /** Previous amount before changes */
     oldAmount?: number;
+
+    /** Previous currency before changes */
     oldCurrency?: string;
 };
 
+/** Model of transaction changes  */
 type TransactionChanges = Partial<Transaction> & AdditionalTransactionChanges;
 
+/** Collection of mock transactions, indexed by `transactions_${transactionID}` */
 type TransactionCollectionDataSet = CollectionDataSet<typeof ONYXKEYS.COLLECTION.TRANSACTION>;
 
 export default Transaction;
@@ -259,11 +488,17 @@ export type {
     Comment,
     Receipt,
     Waypoint,
+    Routes,
     ReceiptError,
     ReceiptErrors,
     TransactionPendingFieldsKey,
     TransactionChanges,
     TaxRate,
+    Reservation,
+    ReservationTimeDetails,
+    ReservationType,
     ReceiptSource,
     TransactionCollectionDataSet,
+    SplitShare,
+    SplitShares,
 };
diff --git a/src/types/onyx/TransactionViolation.ts b/src/types/onyx/TransactionViolation.ts
index 28de4582bd5e..67497edd2f3a 100644
--- a/src/types/onyx/TransactionViolation.ts
+++ b/src/types/onyx/TransactionViolation.ts
@@ -1,38 +1,98 @@
+import type {ValueOf} from 'type-fest';
 import type CONST from '@src/CONST';
 
 /**
  * Names of violations.
  * Derived from `CONST.VIOLATIONS` to maintain a single source of truth.
  */
-type ViolationName = (typeof CONST.VIOLATIONS)[keyof typeof CONST.VIOLATIONS];
+type ViolationName = ValueOf<typeof CONST.VIOLATIONS>;
 
+/**
+ * Types for the data in the modifiedAmount violation
+ * Derived from CONST.VIOLATION_DATA_TYPES to maintain a single source of truth.
+ */
+type ViolationDataType = ValueOf<typeof CONST.MODIFIED_AMOUNT_VIOLATION_DATA>;
+
+/** Model of transaction violation data */
+type TransactionViolationData = {
+    /** Who rejected the transaction */
+    rejectedBy?: string;
+
+    /** Why the transaction was rejected */
+    rejectReason?: string;
+
+    /** Limit that the transaction violated */
+    formattedLimit?: string;
+
+    /** Percentage amount of conversion surcharge applied to the transaction */
+    surcharge?: number;
+
+    /** Percentage amount of invoice markup applied to the transaction */
+    invoiceMarkup?: number;
+
+    /** Amount of days which the transaction date overpasses the date limit */
+    maxAge?: number;
+
+    /** Name of the tag that triggered this violation */
+    tagName?: string;
+
+    /** Name of the category that triggered this violation */
+    category?: string;
+
+    /** Whether the transaction failed due to a broken bank connection */
+    brokenBankConnection?: boolean;
+
+    /** Whether the workspace admin needs to resolve this violation */
+    isAdmin?: boolean;
+
+    /** Workspace admin email */
+    email?: string;
+
+    /** Whether the transaction is older than 7 days */
+    isTransactionOlderThan7Days?: boolean;
+
+    /** Workspace admin name */
+    member?: string;
+
+    /** Name of the tax that triggered this violation */
+    taxName?: string;
+
+    /** Index of the tag form field that triggered this violation */
+    tagListIndex?: number;
+
+    /** Name of the tag form field that triggered this violation */
+    tagListName?: string;
+
+    /** Collection of form fields that triggered this violation */
+    errorIndexes?: number[];
+
+    /** Whether the current violation is `pending RTER` */
+    pendingPattern?: boolean;
+
+    /** modifiedAmount violation type (eg, 'distance', 'card') */
+    type?: ViolationDataType;
+
+    /** Percent Variance for modified amount violations */
+    displayPercentVariance?: number;
+
+    /** List of duplicate transactions */
+    duplicates?: string[];
+};
+
+/** Model of a transaction violation */
 type TransactionViolation = {
-    type: string;
+    /** Type of transaction violation */
+    type: ValueOf<typeof CONST.VIOLATION_TYPES>;
+
+    /** Name of the transaction violation */
     name: ViolationName;
-    data?: {
-        rejectedBy?: string;
-        rejectReason?: string;
-        formattedLimit?: string;
-        surcharge?: number;
-        invoiceMarkup?: number;
-        maxAge?: number;
-        tagName?: string;
-        categoryLimit?: string;
-        limit?: string;
-        category?: string;
-        brokenBankConnection?: boolean;
-        isAdmin?: boolean;
-        email?: string;
-        isTransactionOlderThan7Days?: boolean;
-        member?: string;
-        taxName?: string;
-        tagListIndex?: number;
-        tagListName?: string;
-        errorIndexes?: number[];
-    };
+
+    /** Additional violation information to provide the user */
+    data?: TransactionViolationData;
 };
 
+/** Collection of transaction violations */
 type TransactionViolations = TransactionViolation[];
 
-export type {TransactionViolation, ViolationName};
+export type {TransactionViolation, ViolationName, ViolationDataType};
 export default TransactionViolations;
diff --git a/src/types/onyx/TravelSettings.ts b/src/types/onyx/TravelSettings.ts
index e653c3378572..a1c0a4446ec7 100644
--- a/src/types/onyx/TravelSettings.ts
+++ b/src/types/onyx/TravelSettings.ts
@@ -1,11 +1,19 @@
+/** Model of user travel information to connect with Spotnana */
 type TravelSettings = {
     /** UUIDs that spotnana provides us with when we provision users in their system, and the spotnanaCompanyIDs as the values */
     accountIDs: Record<string, string>;
 
     /** Whether the user has completed the travel terms and conditions checkbox */
     hasAcceptedTerms: boolean;
+
+    /** Whether the user is setup for staging travelDot */
+    testAccount?: boolean;
+
+    /** Whether the user is waiting for the API response after accepting terms */
+    isLoading?: boolean;
 };
 
+/** Model of workspace travel information to connect with Spotnana */
 type WorkspaceTravelSettings = {
     /** The UUID that spotnana provides us when we create a “company” in their system */
     spotnanaCompanyID: string;
diff --git a/src/types/onyx/TryNewDot.ts b/src/types/onyx/TryNewDot.ts
new file mode 100644
index 000000000000..67ea66d255d8
--- /dev/null
+++ b/src/types/onyx/TryNewDot.ts
@@ -0,0 +1,25 @@
+/**
+ * HybridApp NVP
+ */
+type TryNewDot = {
+    /**
+     * This key is mostly used on OldDot. In NewDot, we only use `completedHybridAppOnboarding`.
+     */
+    classicRedirect: {
+        /**
+         * Indicates if transistion from OldDot to NewDot should happen in HybridApp.
+         */
+        dismissed: boolean | string;
+        /**
+         * Indicates timestamp of an action.
+         */
+        timestamp: Date;
+
+        /**
+         * Indicates if explanation modal on NewDot was dismissed.
+         */
+        completedHybridAppOnboarding: boolean;
+    };
+};
+
+export default TryNewDot;
diff --git a/src/types/onyx/User.ts b/src/types/onyx/User.ts
index 973f09e16b82..f30ca846ef43 100644
--- a/src/types/onyx/User.ts
+++ b/src/types/onyx/User.ts
@@ -1,3 +1,4 @@
+/** Model of user data */
 type User = {
     /** Whether or not the user is subscribed to news updates */
     isSubscribedToNewsletter: boolean;
diff --git a/src/types/onyx/UserLocation.ts b/src/types/onyx/UserLocation.ts
index b22802bfefb1..8ff0b8f8f101 100644
--- a/src/types/onyx/UserLocation.ts
+++ b/src/types/onyx/UserLocation.ts
@@ -1,3 +1,4 @@
+/** Location coordinates for user */
 type UserLocation = Pick<GeolocationCoordinates, 'latitude' | 'longitude'>;
 
 export default UserLocation;
diff --git a/src/types/onyx/UserMetadata.ts b/src/types/onyx/UserMetadata.ts
new file mode 100644
index 000000000000..5fc5d477afca
--- /dev/null
+++ b/src/types/onyx/UserMetadata.ts
@@ -0,0 +1,25 @@
+/** Model of user metadata */
+type UserMetadata = {
+    /** Type of user plan */
+    planType?: string;
+
+    /** Type of user role */
+    role?: string;
+
+    /** Whether the user is on a free trial */
+    freeTrial?: boolean;
+
+    /** User's account ID */
+    accountID?: number;
+
+    /** User email so we can filter out certain accounts */
+    email?: string;
+
+    /** Type of environment the user is using (staging or production) */
+    environment?: string;
+
+    /** Information if user dismissed the try new dot popup before. Can be "empty", true or false */
+    tryNewDotDismissed?: 'empty' | boolean;
+};
+
+export default UserMetadata;
diff --git a/src/types/onyx/UserWallet.ts b/src/types/onyx/UserWallet.ts
index 55a1b31a9084..eb1b11c7adb0 100644
--- a/src/types/onyx/UserWallet.ts
+++ b/src/types/onyx/UserWallet.ts
@@ -2,12 +2,16 @@ import type {ValueOf} from 'type-fest';
 import type CONST from '@src/CONST';
 import type * as OnyxCommon from './OnyxCommon';
 
+/** Type of account linked to user's wallet */
 type WalletLinkedAccountType = 'debitCard' | 'bankAccount';
 
+/** Error code sent from the server after updating user's wallet */
 type ErrorCode = 'ssnError' | 'kbaNeeded' | 'kycFailed';
 
+/** Type of setup that the user follows to link an account to his wallet */
 type SetupType = ValueOf<typeof CONST.BANK_ACCOUNT.SETUP_TYPE>;
 
+/** Model of user wallet */
 type UserWallet = {
     /** The user's available wallet balance */
     availableBalance: number;
diff --git a/src/types/onyx/WalletAdditionalDetails.ts b/src/types/onyx/WalletAdditionalDetails.ts
index c574006e9f66..0593b64ffc3b 100644
--- a/src/types/onyx/WalletAdditionalDetails.ts
+++ b/src/types/onyx/WalletAdditionalDetails.ts
@@ -1,23 +1,48 @@
 import type * as OnyxCommon from './OnyxCommon';
 
+/** Model of user wallet Idology question */
 type WalletAdditionalQuestionDetails = {
+    /** Question prompt */
     prompt: string;
+
+    /** Question type */
     type: string;
+
+    /** Possible answers */
     answer: string[];
 };
 
+/** Model of wallet personal details */
 type WalletPersonalDetails = {
+    /** Legal first name */
     legalFirstName: string;
+
+    /** Legal last name */
     legalLastName: string;
+
+    /** Date of birth */
     dob: string;
+
+    /** Social Security Number (SSN) */
     ssn: string;
+
+    /** Street address */
     addressStreet: string;
+
+    /** City */
     addressCity: string;
+
+    /** State */
     addressState: string;
+
+    /** ZIP code */
     addressZipCode: string;
+
+    /** Phone number */
     phoneNumber: string;
 };
 
+/** Model of user wallet additional details */
 type WalletAdditionalDetails = {
     /** Questions returned by Idology */
     questions?: WalletAdditionalQuestionDetails[];
@@ -30,12 +55,15 @@ type WalletAdditionalDetails = {
 
     /** Which field needs attention? */
     errorFields?: OnyxCommon.ErrorFields;
-    additionalErrorMessage?: string;
+
+    /** Whether the details are being loaded */
     isLoading?: boolean;
+
+    /** Error messages to display to the user */
     errors?: OnyxCommon.Errors;
 };
 
-// TODO: refactor into one type after removing old wallet flow
+/** TODO: refactor into one type after removing old wallet flow */
 type WalletAdditionalDetailsRefactor = WalletAdditionalDetails & WalletPersonalDetails;
 
 export default WalletAdditionalDetails;
diff --git a/src/types/onyx/WalletOnfido.ts b/src/types/onyx/WalletOnfido.ts
index de7c80b34037..344ffdef170c 100644
--- a/src/types/onyx/WalletOnfido.ts
+++ b/src/types/onyx/WalletOnfido.ts
@@ -1,5 +1,6 @@
 import type * as OnyxCommon from './OnyxCommon';
 
+/** Model of wallet Onfido flow */
 type WalletOnfido = {
     /** Unique identifier returned from openOnfidoFlow then re-sent to ActivateWallet with Onfido response data */
     applicantID?: string;
diff --git a/src/types/onyx/WalletStatement.ts b/src/types/onyx/WalletStatement.ts
index 62b8266c8e43..c9cc72662c1c 100644
--- a/src/types/onyx/WalletStatement.ts
+++ b/src/types/onyx/WalletStatement.ts
@@ -1,3 +1,4 @@
+/** Model of wallet statement */
 type WalletStatement = {
     /** Whether we are currently generating a PDF version of the statement */
     isGenerating: boolean;
diff --git a/src/types/onyx/WalletTerms.ts b/src/types/onyx/WalletTerms.ts
index c2653cae0f97..be66b779b91f 100644
--- a/src/types/onyx/WalletTerms.ts
+++ b/src/types/onyx/WalletTerms.ts
@@ -1,6 +1,7 @@
 import type {Source} from '@components/KYCWall/types';
 import type * as OnyxCommon from './OnyxCommon';
 
+/** Model of wallet terms */
 type WalletTerms = {
     /** Any error message to show */
     errors?: OnyxCommon.Errors;
diff --git a/src/types/onyx/WalletTransfer.ts b/src/types/onyx/WalletTransfer.ts
index 961a7c9752a5..8bcf6e7217a3 100644
--- a/src/types/onyx/WalletTransfer.ts
+++ b/src/types/onyx/WalletTransfer.ts
@@ -3,6 +3,7 @@ import type CONST from '@src/CONST';
 import type * as OnyxCommon from './OnyxCommon';
 import type PaymentMethod from './PaymentMethod';
 
+/** Model of user wallet transfer */
 type WalletTransfer = {
     /** Selected accountID for transfer */
     selectedAccountID?: string | number;
@@ -22,9 +23,11 @@ type WalletTransfer = {
     /** Whether or not data is loading */
     loading?: boolean;
 
+    /** Payment method used for transfer */
     paymentMethodType?: ValueOf<Pick<PaymentMethod, 'accountType'>>;
 };
 
+/** Available payment methods */
 type FilterMethodPaymentType = typeof CONST.PAYMENT_METHODS.DEBIT_CARD | typeof CONST.PAYMENT_METHODS.PERSONAL_BANK_ACCOUNT | '';
 
 export default WalletTransfer;
diff --git a/src/types/onyx/WorkspaceRateAndUnit.ts b/src/types/onyx/WorkspaceRateAndUnit.ts
index a374239c93f8..ebef0902d972 100644
--- a/src/types/onyx/WorkspaceRateAndUnit.ts
+++ b/src/types/onyx/WorkspaceRateAndUnit.ts
@@ -1,5 +1,7 @@
+/** Units of distance */
 type Unit = 'mi' | 'km';
 
+/** Model of workspace distance rate */
 type WorkspaceRateAndUnit = {
     /** policyID of the Workspace */
     policyID: string;
@@ -7,7 +9,7 @@ type WorkspaceRateAndUnit = {
     /** Unit of the Workspace */
     unit?: Unit;
 
-    /** Unit of the Workspace */
+    /** Distance rate of the Workspace */
     rate?: string;
 };
 
diff --git a/src/types/onyx/WorkspaceTooltip.ts b/src/types/onyx/WorkspaceTooltip.ts
new file mode 100644
index 000000000000..4371ac6533d8
--- /dev/null
+++ b/src/types/onyx/WorkspaceTooltip.ts
@@ -0,0 +1,9 @@
+/**
+ * The NVP containing all information related to educational tooltip in workspace chat.
+ */
+type WorkspaceTooltip = {
+    /** Should show educational tooltip in workspace chat for first-time user */
+    shouldShow: boolean;
+};
+
+export default WorkspaceTooltip;
diff --git a/src/types/onyx/index.ts b/src/types/onyx/index.ts
index 1695daebace8..54ee7fe25892 100644
--- a/src/types/onyx/index.ts
+++ b/src/types/onyx/index.ts
@@ -1,11 +1,16 @@
 import type Account from './Account';
 import type AccountData from './AccountData';
+import type {ApprovalWorkflowOnyx} from './ApprovalWorkflow';
 import type {BankAccountList} from './BankAccount';
 import type BankAccount from './BankAccount';
 import type Beta from './Beta';
+import type BillingGraceEndPeriod from './BillingGraceEndPeriod';
+import type BillingStatus from './BillingStatus';
 import type BlockedFromConcierge from './BlockedFromConcierge';
+import type CancellationDetails from './CancellationDetails';
 import type Card from './Card';
-import type {CardList} from './Card';
+import type {CardList, IssueNewCard, WorkspaceCardsList} from './Card';
+import type CardFeeds from './CardFeeds';
 import type {CapturedLogs, Log} from './Console';
 import type Credentials from './Credentials';
 import type Currency from './Currency';
@@ -13,38 +18,44 @@ import type {CurrencyList} from './Currency';
 import type CustomStatusDraft from './CustomStatusDraft';
 import type DismissedReferralBanners from './DismissedReferralBanners';
 import type Download from './Download';
+import type ExpensifyCardSettings from './ExpensifyCardSettings';
 import type FrequentlyUsedEmoji from './FrequentlyUsedEmoji';
 import type {FundList} from './Fund';
 import type Fund from './Fund';
 import type IntroSelected from './IntroSelected';
 import type InvitedEmailsToAccountIDs from './InvitedEmailsToAccountIDs';
 import type IOU from './IOU';
+import type LastExportMethod from './LastExportMethod';
 import type LastPaymentMethod from './LastPaymentMethod';
 import type LastSelectedDistanceRates from './LastSelectedDistanceRates';
 import type Locale from './Locale';
 import type {LoginList} from './Login';
 import type Login from './Login';
 import type MapboxAccessToken from './MapboxAccessToken';
+import type MobileSelectionMode from './MobileSelectionMode';
 import type Modal from './Modal';
 import type Network from './Network';
 import type NewGroupChatDraft from './NewGroupChatDraft';
+import type OnyxInputOrEntry from './OnyxInputOrEntry';
 import type {OnyxUpdateEvent, OnyxUpdatesFromServer} from './OnyxUpdatesFromServer';
 import type {DecisionName, OriginalMessageIOU} from './OriginalMessage';
+import type Pages from './Pages';
 import type PersonalBankAccount from './PersonalBankAccount';
 import type {PersonalDetailsList, PersonalDetailsMetadata} from './PersonalDetails';
 import type PersonalDetails from './PersonalDetails';
 import type PlaidData from './PlaidData';
 import type Policy from './Policy';
-import type {PolicyConnectionSyncProgress, PolicyReportField, TaxRate, TaxRates, TaxRatesWithDefault} from './Policy';
+import type {PolicyConnectionName, PolicyConnectionSyncProgress, PolicyReportField, TaxRate, TaxRates, TaxRatesWithDefault} from './Policy';
 import type {PolicyCategories, PolicyCategory} from './PolicyCategory';
 import type {PolicyEmployeeList} from './PolicyEmployee';
 import type PolicyEmployee from './PolicyEmployee';
 import type PolicyJoinMember from './PolicyJoinMember';
 import type PolicyOwnershipChangeChecks from './PolicyOwnershipChangeChecks';
-import type {PolicyTag, PolicyTagList, PolicyTags} from './PolicyTag';
+import type {PolicyTag, PolicyTagLists, PolicyTags} from './PolicyTag';
 import type PreferredTheme from './PreferredTheme';
 import type PriorityMode from './PriorityMode';
 import type PrivatePersonalDetails from './PrivatePersonalDetails';
+import type PrivateSubscription from './PrivateSubscription';
 import type QuickAction from './QuickAction';
 import type RecentlyUsedCategories from './RecentlyUsedCategories';
 import type RecentlyUsedReportFields from './RecentlyUsedReportFields';
@@ -52,27 +63,35 @@ import type RecentlyUsedTags from './RecentlyUsedTags';
 import type RecentWaypoint from './RecentWaypoint';
 import type ReimbursementAccount from './ReimbursementAccount';
 import type Report from './Report';
-import type {ReportActionBase, ReportActions} from './ReportAction';
+import type {ReportActions} from './ReportAction';
 import type ReportAction from './ReportAction';
 import type ReportActionReactions from './ReportActionReactions';
 import type ReportActionsDraft from './ReportActionsDraft';
 import type ReportActionsDrafts from './ReportActionsDrafts';
 import type ReportMetadata from './ReportMetadata';
+import type ReportNameValuePairs from './ReportNameValuePairs';
 import type ReportNextStep from './ReportNextStep';
 import type ReportUserIsTyping from './ReportUserIsTyping';
+import type {ReportFieldsViolations, ReportViolationName} from './ReportViolation';
+import type ReportViolations from './ReportViolation';
 import type Request from './Request';
 import type Response from './Response';
+import type ReviewDuplicates from './ReviewDuplicates';
 import type ScreenShareRequest from './ScreenShareRequest';
 import type SearchResults from './SearchResults';
 import type SecurityGroup from './SecurityGroup';
 import type SelectedTabRequest from './SelectedTabRequest';
 import type Session from './Session';
+import type StripeCustomerID from './StripeCustomerID';
 import type Task from './Task';
 import type Transaction from './Transaction';
 import type {TransactionViolation, ViolationName} from './TransactionViolation';
 import type TransactionViolations from './TransactionViolation';
+import type {TravelSettings} from './TravelSettings';
+import type TryNewDot from './TryNewDot';
 import type User from './User';
 import type UserLocation from './UserLocation';
+import type UserMetadata from './UserMetadata';
 import type UserWallet from './UserWallet';
 import type WalletAdditionalDetails from './WalletAdditionalDetails';
 import type {WalletAdditionalQuestionDetails} from './WalletAdditionalDetails';
@@ -81,8 +100,10 @@ import type WalletStatement from './WalletStatement';
 import type WalletTerms from './WalletTerms';
 import type WalletTransfer from './WalletTransfer';
 import type WorkspaceRateAndUnit from './WorkspaceRateAndUnit';
+import type WorkspaceTooltip from './WorkspaceTooltip';
 
 export type {
+    TryNewDot,
     Account,
     AccountData,
     BankAccount,
@@ -97,19 +118,25 @@ export type {
     CustomStatusDraft,
     DismissedReferralBanners,
     Download,
+    WorkspaceCardsList,
+    ExpensifyCardSettings,
     FrequentlyUsedEmoji,
     Fund,
     FundList,
     IntroSelected,
     IOU,
+    IssueNewCard,
+    LastExportMethod,
     Locale,
     Login,
     LoginList,
     MapboxAccessToken,
     Modal,
     Network,
+    OnyxInputOrEntry,
     OnyxUpdateEvent,
     OnyxUpdatesFromServer,
+    Pages,
     PersonalBankAccount,
     PersonalDetails,
     PersonalDetailsList,
@@ -120,11 +147,12 @@ export type {
     PolicyCategory,
     PolicyEmployee,
     PolicyEmployeeList,
+    PolicyConnectionName,
     PolicyConnectionSyncProgress,
     PolicyOwnershipChangeChecks,
     PolicyTag,
     PolicyTags,
-    PolicyTagList,
+    PolicyTagLists,
     PreferredTheme,
     PriorityMode,
     PrivatePersonalDetails,
@@ -134,6 +162,7 @@ export type {
     RecentlyUsedTags,
     ReimbursementAccount,
     Report,
+    ReportNameValuePairs,
     ReportAction,
     ReportActionReactions,
     ReportActions,
@@ -141,6 +170,9 @@ export type {
     ReportActionsDrafts,
     ReportMetadata,
     ReportNextStep,
+    ReportViolationName,
+    ReportViolations,
+    ReportFieldsViolations,
     Request,
     Response,
     ScreenShareRequest,
@@ -154,8 +186,10 @@ export type {
     Transaction,
     TransactionViolation,
     TransactionViolations,
+    TravelSettings,
     User,
     UserLocation,
+    UserMetadata,
     UserWallet,
     ViolationName,
     WalletAdditionalDetails,
@@ -170,7 +204,6 @@ export type {
     RecentlyUsedReportFields,
     DecisionName,
     OriginalMessageIOU,
-    ReportActionBase,
     LastPaymentMethod,
     LastSelectedDistanceRates,
     InvitedEmailsToAccountIDs,
@@ -179,4 +212,14 @@ export type {
     PolicyJoinMember,
     CapturedLogs,
     SearchResults,
+    ReviewDuplicates,
+    PrivateSubscription,
+    BillingGraceEndPeriod,
+    StripeCustomerID,
+    BillingStatus,
+    CancellationDetails,
+    ApprovalWorkflowOnyx,
+    MobileSelectionMode,
+    WorkspaceTooltip,
+    CardFeeds,
 };
diff --git a/src/types/utils/AnchorAlignment.ts b/src/types/utils/AnchorAlignment.ts
index 899e3d9e277b..5ed043d36b18 100644
--- a/src/types/utils/AnchorAlignment.ts
+++ b/src/types/utils/AnchorAlignment.ts
@@ -9,4 +9,13 @@ type AnchorAlignment = {
     vertical: ValueOf<typeof CONST.MODAL.ANCHOR_ORIGIN_VERTICAL>;
 };
 
+type TooltipAnchorAlignment = {
+    /** The horizontal anchor alignment of the tooltip */
+    horizontal: ValueOf<typeof CONST.MODAL.ANCHOR_ORIGIN_HORIZONTAL>;
+
+    /** The vertical anchor alignment of the tooltip */
+    vertical: Exclude<ValueOf<typeof CONST.MODAL.ANCHOR_ORIGIN_VERTICAL>, typeof CONST.MODAL.ANCHOR_ORIGIN_VERTICAL.CENTER>;
+};
+
+export type {TooltipAnchorAlignment};
 export default AnchorAlignment;
diff --git a/src/types/utils/CollectionDataSet.ts b/src/types/utils/CollectionDataSet.ts
index b8065cee8f84..c48d1568534e 100644
--- a/src/types/utils/CollectionDataSet.ts
+++ b/src/types/utils/CollectionDataSet.ts
@@ -1,12 +1,12 @@
-import type {OnyxEntry} from 'react-native-onyx';
+import type {OnyxInputValue} from 'react-native-onyx';
 import type {OnyxCollectionKey, OnyxCollectionValuesMapping} from '@src/ONYXKEYS';
 
 /** Helps with typing a collection item update inside Onyx.multiSet call */
-type CollectionDataSet<TCollectionKey extends OnyxCollectionKey> = Record<`${TCollectionKey}${string}`, OnyxEntry<OnyxCollectionValuesMapping[TCollectionKey]>>;
+type CollectionDataSet<TCollectionKey extends OnyxCollectionKey> = Record<`${TCollectionKey}${string}`, OnyxInputValue<OnyxCollectionValuesMapping[TCollectionKey]>>;
 
 const toCollectionDataSet = <TCollectionKey extends OnyxCollectionKey>(
     collectionKey: TCollectionKey,
-    collection: Array<OnyxEntry<OnyxCollectionValuesMapping[TCollectionKey]>>,
+    collection: Array<OnyxInputValue<OnyxCollectionValuesMapping[TCollectionKey]>>,
     idSelector: (collectionValue: OnyxCollectionValuesMapping[TCollectionKey]) => string,
 ) => {
     const collectionDataSet = collection.reduce<CollectionDataSet<TCollectionKey>>((result, collectionValue) => {
diff --git a/src/types/utils/NonPartial.ts b/src/types/utils/NonPartial.ts
new file mode 100644
index 000000000000..aea7c22b60ad
--- /dev/null
+++ b/src/types/utils/NonPartial.ts
@@ -0,0 +1,7 @@
+/**
+ * Utility type to make all properties of an object non-optional with `undefined` as a possible value. It fixes the issue with `Required` utility type, which makes all properties required.
+ * See https://github.com/microsoft/TypeScript/issues/31025 for more details.
+ */
+type NonPartial<T, RT extends T = Required<T>> = {[K in keyof RT]: K extends keyof T ? (undefined extends T[K] ? T[K] | undefined : T[K]) : never};
+
+export default NonPartial;
diff --git a/src/types/utils/ReactComponentModule.ts b/src/types/utils/ReactComponentModule.ts
new file mode 100644
index 000000000000..8b40f2cb5c56
--- /dev/null
+++ b/src/types/utils/ReactComponentModule.ts
@@ -0,0 +1,3 @@
+type ReactComponentModule = {default: React.ComponentType};
+
+export default ReactComponentModule;
diff --git a/src/types/utils/TupleOperations.ts b/src/types/utils/TupleOperations.ts
new file mode 100644
index 000000000000..b8c056992509
--- /dev/null
+++ b/src/types/utils/TupleOperations.ts
@@ -0,0 +1,26 @@
+/* eslint-disable @typescript-eslint/no-explicit-any */
+import type NonPartial from './NonPartial';
+
+/**
+ * Fill a tuple with `N` elements from the rest of the tuple.
+ */
+type FillFromRest<T extends any[], N extends number, O extends any[] = []> = O['length'] extends N
+    ? O
+    : T extends [infer Head, ...infer Tail]
+    ? FillFromRest<Tail, N, [...O, Head]>
+    : T extends [...infer Rest]
+    ? FillFromRest<Rest, N, [...O, Rest[number]]>
+    : O;
+
+// Based on: https://stackoverflow.com/questions/67605122/obtain-a-slice-of-a-typescript-parameters-tuple
+/**
+ * Split a tuple into two parts: the first `N` elements and the rest.
+ */
+type TupleSplit<T, N extends number, O extends any[] = []> = O['length'] extends N ? [O, T] : T extends [infer F, ...infer R] ? TupleSplit<[...R], N, [...O, F]> : [O, T];
+
+/**
+ * Get the first `N` elements of a tuple. If `N` is not provided, it returns the whole tuple.
+ */
+type TakeFirst<T extends any[], N extends number = T['length']> = number extends N ? T : TupleSplit<NonPartial<FillFromRest<T, N>>, N>[0];
+
+export type {TupleSplit, TakeFirst};
diff --git a/src/types/utils/htmlDivElementRef.ts b/src/types/utils/htmlDivElementRef.ts
new file mode 100644
index 000000000000..9a20bb87e32e
--- /dev/null
+++ b/src/types/utils/htmlDivElementRef.ts
@@ -0,0 +1,5 @@
+import type {View} from 'react-native';
+
+const htmlDivElementRef = (ref: React.RefObject<View | HTMLDivElement>) => ref as React.RefObject<HTMLDivElement>;
+
+export default htmlDivElementRef;
diff --git a/src/types/utils/isLoadingOnyxValue.ts b/src/types/utils/isLoadingOnyxValue.ts
index 052c97ad40ef..7d5bfa88ba2e 100644
--- a/src/types/utils/isLoadingOnyxValue.ts
+++ b/src/types/utils/isLoadingOnyxValue.ts
@@ -1,6 +1,6 @@
-import type {OnyxKey, UseOnyxResult} from 'react-native-onyx';
+import type {ResultMetadata} from 'react-native-onyx';
 
-function isLoadingOnyxValue(...results: Array<UseOnyxResult<OnyxKey, unknown>[1]>): boolean {
+function isLoadingOnyxValue(...results: ResultMetadata[]): boolean {
     return results.some((result) => result.status === 'loading');
 }
 
diff --git a/src/types/utils/textRef.ts b/src/types/utils/textRef.ts
index 668f54d59e36..ecc22c8b013a 100644
--- a/src/types/utils/textRef.ts
+++ b/src/types/utils/textRef.ts
@@ -1,6 +1,6 @@
 // eslint-disable-next-line no-restricted-imports
 import type {Text} from 'react-native';
 
-const textRef = (ref: React.RefObject<Text | HTMLDivElement>) => ref as React.RefObject<Text>;
+const textRef = (ref: React.RefObject<Text | HTMLElement>) => ref as React.RefObject<Text>;
 
 export default textRef;
diff --git a/src/types/utils/viewForwardedRef.ts b/src/types/utils/viewForwardedRef.ts
index 87b26bfbab40..bd6201d4321e 100644
--- a/src/types/utils/viewForwardedRef.ts
+++ b/src/types/utils/viewForwardedRef.ts
@@ -1,6 +1,6 @@
 import type {ForwardedRef} from 'react';
 import type {View} from 'react-native';
 
-const viewForwardedRef = (ref: ForwardedRef<View | HTMLDivElement>) => ref as ForwardedRef<View>;
+const viewForwardedRef = (ref: ForwardedRef<View | HTMLElement>) => ref as ForwardedRef<View>;
 
 export default viewForwardedRef;
diff --git a/src/types/utils/viewRef.ts b/src/types/utils/viewRef.ts
index 1fd9d186ba1f..41d7cfac5b62 100644
--- a/src/types/utils/viewRef.ts
+++ b/src/types/utils/viewRef.ts
@@ -1,5 +1,5 @@
 import type {View} from 'react-native';
 
-const viewRef = (ref: React.RefObject<View | HTMLDivElement>) => ref as React.RefObject<View>;
+const viewRef = (ref: React.RefObject<View | HTMLElement>) => ref as React.RefObject<View>;
 
 export default viewRef;
diff --git a/src/utils/arraysEqual.ts b/src/utils/arraysEqual.ts
new file mode 100644
index 000000000000..3a8111cc7bb7
--- /dev/null
+++ b/src/utils/arraysEqual.ts
@@ -0,0 +1,25 @@
+function arraysEqual<T>(a: T[], b: T[]): boolean {
+    if (a === b) {
+        return true;
+    }
+    if (a == null || b == null) {
+        return false;
+    }
+    if (a.length !== b.length) {
+        return false;
+    }
+
+    // If you don't care about the order of the elements inside
+    // the array, you should sort both arrays here.
+    // Please note that calling sort on an array will modify that array.
+    // you might want to clone your array first.
+
+    for (let i = 0; i < a.length; ++i) {
+        if (a[i] !== b[i]) {
+            return false;
+        }
+    }
+    return true;
+}
+
+export default arraysEqual;
diff --git a/src/utils/createProxyForObject.ts b/src/utils/createProxyForObject.ts
index c18e5e30a0d9..c5055845d5da 100644
--- a/src/utils/createProxyForObject.ts
+++ b/src/utils/createProxyForObject.ts
@@ -12,7 +12,7 @@ const createProxyForObject = <Value extends Record<string, unknown>>(value: Valu
 
             return target[property];
         },
-        set: (target, property, newValue) => {
+        set: (target, property, newValue: Value[string]) => {
             if (typeof property === 'symbol') {
                 return false;
             }
diff --git a/src/utils/lazyRetry.ts b/src/utils/lazyRetry.ts
new file mode 100644
index 000000000000..35c6b444e612
--- /dev/null
+++ b/src/utils/lazyRetry.ts
@@ -0,0 +1,42 @@
+import type {ComponentType} from 'react';
+import CONST from '@src/CONST';
+
+type Import<T> = Promise<{default: T}>;
+type ComponentImport<T> = () => Import<T>;
+
+/**
+ * Attempts to lazily import a React component with a retry mechanism on failure.
+ * If the initial import fails the function will refresh the page once and retry the import.
+ * If the import fails again after the refresh, the error is propagated.
+ *
+ * @param componentImport - A function that returns a promise resolving to a lazily imported React component.
+ * @returns A promise that resolves to the imported component or rejects with an error after a retry attempt.
+ */
+// eslint-disable-next-line @typescript-eslint/no-explicit-any
+const lazyRetry = function <T extends ComponentType<any>>(componentImport: ComponentImport<T>): Import<T> {
+    return new Promise((resolve, reject) => {
+        // Retrieve the retry status from sessionStorage, defaulting to 'false' if not set
+        const hasRefreshed = JSON.parse(sessionStorage.getItem(CONST.SESSION_STORAGE_KEYS.RETRY_LAZY_REFRESHED) ?? 'false') as boolean;
+
+        componentImport()
+            .then((component) => {
+                // Reset the retry status to 'false' on successful import
+                sessionStorage.setItem(CONST.SESSION_STORAGE_KEYS.RETRY_LAZY_REFRESHED, 'false'); // success so reset the refresh
+                resolve(component);
+            })
+            .catch((component: ComponentImport<T>) => {
+                if (!hasRefreshed) {
+                    console.error('Failed to lazily import a React component, refreshing the page in order to retry the operation.', component);
+                    // Set the retry status to 'true' and refresh the page
+                    sessionStorage.setItem(CONST.SESSION_STORAGE_KEYS.RETRY_LAZY_REFRESHED, 'true');
+                    window.location.reload(); // Refresh the page to retry the import
+                } else {
+                    console.error('Failed to lazily import a React component after the retry operation!', component);
+                    // If the import fails again reject with the error to trigger default error handling
+                    reject(component);
+                }
+            });
+    });
+};
+
+export default lazyRetry;
diff --git a/tests/.eslintrc.js b/tests/.eslintrc.js
index 4972022ae5e5..f3152bb7d2f1 100644
--- a/tests/.eslintrc.js
+++ b/tests/.eslintrc.js
@@ -1,5 +1,21 @@
 module.exports = {
+    extends: ['plugin:testing-library/react'],
     rules: {
         'no-import-assign': 'off',
+        '@lwc/lwc/no-async-await': 'off',
+        'no-await-in-loop': 'off',
+        'no-restricted-syntax': ['error', 'ForInStatement', 'LabeledStatement', 'WithStatement'],
+
+        // This helps disable the `prefer-alias` rule for tests
+        '@dword-design/import-alias/prefer-alias': ['off'],
+
+        'testing-library/await-async-queries': 'error',
+        'testing-library/await-async-utils': 'error',
+        'testing-library/no-debugging-utils': 'error',
+        'testing-library/no-manual-cleanup': 'error',
+        'testing-library/no-unnecessary-act': 'error',
+        'testing-library/prefer-find-by': 'error',
+        'testing-library/prefer-presence-queries': 'error',
+        'testing-library/prefer-screen-queries': 'error',
     },
 };
diff --git a/tests/actions/EnforceActionExportRestrictions.ts b/tests/actions/EnforceActionExportRestrictions.ts
index e18cfa2182be..9590f878116e 100644
--- a/tests/actions/EnforceActionExportRestrictions.ts
+++ b/tests/actions/EnforceActionExportRestrictions.ts
@@ -1,6 +1,7 @@
 import * as IOU from '@libs/actions/IOU';
-import * as Policy from '@libs/actions/Policy';
+import * as OptionsListUtils from '@libs/OptionsListUtils';
 import * as ReportUtils from '@libs/ReportUtils';
+import * as Policy from '@userActions/Policy/Policy';
 import * as Task from '@userActions/Task';
 
 // There are some methods that are OK to use inside an action file, but should not be exported. These are typically methods that look up and return Onyx data.
@@ -41,6 +42,11 @@ describe('IOU', () => {
         // @ts-expect-error the test is asserting that it's undefined, so the TS error is normal
         expect(IOU.getPolicy).toBeUndefined();
     });
+
+    it('does not export getReport', () => {
+        // @ts-expect-error the test is asserting that it's undefined, so the TS error is normal
+        expect(IOU.getReportOrDraftReport).toBeUndefined();
+    });
 });
 
 describe('Task', () => {
@@ -49,3 +55,10 @@ describe('Task', () => {
         expect(Task.getParentReport).toBeUndefined();
     });
 });
+
+describe('OptionsListUtils', () => {
+    it('does not export getReport', () => {
+        // @ts-expect-error the test is asserting that it's undefined, so the TS error is normal
+        expect(OptionsListUtils.getReportOrDraftReport).toBeUndefined();
+    });
+});
diff --git a/tests/actions/IOUTest.ts b/tests/actions/IOUTest.ts
index 45bdc5fe743a..8a7095af6f7f 100644
--- a/tests/actions/IOUTest.ts
+++ b/tests/actions/IOUTest.ts
@@ -5,12 +5,12 @@ import type {OptimisticChatReport} from '@libs/ReportUtils';
 import CONST from '@src/CONST';
 import * as IOU from '@src/libs/actions/IOU';
 import OnyxUpdateManager from '@src/libs/actions/OnyxUpdateManager';
-import * as PolicyActions from '@src/libs/actions/Policy';
+import * as PolicyActions from '@src/libs/actions/Policy/Policy';
 import * as Report from '@src/libs/actions/Report';
 import * as ReportActions from '@src/libs/actions/ReportActions';
 import * as User from '@src/libs/actions/User';
 import DateUtils from '@src/libs/DateUtils';
-import Navigation from '@src/libs/Navigation/Navigation';
+import * as Localize from '@src/libs/Localize';
 import * as NumberUtils from '@src/libs/NumberUtils';
 import * as PersonalDetailsUtils from '@src/libs/PersonalDetailsUtils';
 import * as ReportActionsUtils from '@src/libs/ReportActionsUtils';
@@ -18,11 +18,11 @@ import * as ReportUtils from '@src/libs/ReportUtils';
 import ONYXKEYS from '@src/ONYXKEYS';
 import ROUTES from '@src/ROUTES';
 import type * as OnyxTypes from '@src/types/onyx';
-import type {IOUMessage, OriginalMessageIOU} from '@src/types/onyx/OriginalMessage';
-import type {ReportActionBase} from '@src/types/onyx/ReportAction';
+import type {Participant} from '@src/types/onyx/Report';
 import {toCollectionDataSet} from '@src/types/utils/CollectionDataSet';
 import {isEmptyObject} from '@src/types/utils/EmptyObject';
 import PusherHelper from '../utils/PusherHelper';
+import type {MockFetch} from '../utils/TestHelper';
 import * as TestHelper from '../utils/TestHelper';
 import waitForBatchedUpdates from '../utils/waitForBatchedUpdates';
 import waitForNetworkPromises from '../utils/waitForNetworkPromises';
@@ -34,26 +34,37 @@ jest.mock('@src/libs/Navigation/Navigation', () => ({
     goBack: jest.fn(),
 }));
 
+jest.mock('@src/libs/Navigation/isSearchTopmostCentralPane', () => jest.fn());
+
 const CARLOS_EMAIL = 'cmartins@expensifail.com';
 const CARLOS_ACCOUNT_ID = 1;
+const CARLOS_PARTICIPANT: Participant = {hidden: false, role: 'member'};
 const JULES_EMAIL = 'jules@expensifail.com';
 const JULES_ACCOUNT_ID = 2;
+const JULES_PARTICIPANT: Participant = {hidden: false, role: 'member'};
 const RORY_EMAIL = 'rory@expensifail.com';
 const RORY_ACCOUNT_ID = 3;
+const RORY_PARTICIPANT: Participant = {hidden: false, role: 'admin'};
 const VIT_EMAIL = 'vit@expensifail.com';
 const VIT_ACCOUNT_ID = 4;
+const VIT_PARTICIPANT: Participant = {hidden: false, role: 'member'};
 
 OnyxUpdateManager();
 describe('actions/IOU', () => {
     beforeAll(() => {
         Onyx.init({
             keys: ONYXKEYS,
+            initialKeyStates: {
+                [ONYXKEYS.SESSION]: {accountID: RORY_ACCOUNT_ID, email: RORY_EMAIL},
+                [ONYXKEYS.PERSONAL_DETAILS_LIST]: {[RORY_ACCOUNT_ID]: {accountID: RORY_ACCOUNT_ID, login: RORY_EMAIL}},
+            },
         });
     });
 
+    let mockFetch: MockFetch;
     beforeEach(() => {
-        // @ts-expect-error TODO: Remove this once TestHelper (https://github.com/Expensify/App/issues/25318) is migrated to TypeScript.
         global.fetch = TestHelper.getGlobalFetchMock();
+        mockFetch = fetch as MockFetch;
         return Onyx.clear().then(waitForBatchedUpdates);
     });
 
@@ -64,183 +75,180 @@ describe('actions/IOU', () => {
             const merchant = 'KFC';
             let iouReportID: string | undefined;
             let createdAction: OnyxEntry<OnyxTypes.ReportAction>;
-            let iouAction: OnyxEntry<OnyxTypes.ReportAction>;
+            let iouAction: OnyxEntry<OnyxTypes.ReportAction<typeof CONST.REPORT.ACTIONS.TYPE.IOU>>;
             let transactionID: string | undefined;
             let transactionThread: OnyxEntry<OnyxTypes.Report>;
             let transactionThreadCreatedAction: OnyxEntry<OnyxTypes.ReportAction>;
-            // @ts-expect-error TODO: Remove this once TestHelper (https://github.com/Expensify/App/issues/25318) is migrated to TypeScript.
-            fetch.pause();
+            mockFetch?.pause?.();
             IOU.requestMoney({reportID: ''}, amount, CONST.CURRENCY.USD, '', merchant, RORY_EMAIL, RORY_ACCOUNT_ID, {login: CARLOS_EMAIL, accountID: CARLOS_ACCOUNT_ID}, comment, {});
-            return (
-                waitForBatchedUpdates()
-                    .then(
-                        () =>
-                            new Promise<void>((resolve) => {
-                                const connectionID = Onyx.connect({
-                                    key: ONYXKEYS.COLLECTION.REPORT,
-                                    waitForCollectionCallback: true,
-                                    callback: (allReports) => {
-                                        Onyx.disconnect(connectionID);
+            return waitForBatchedUpdates()
+                .then(
+                    () =>
+                        new Promise<void>((resolve) => {
+                            const connection = Onyx.connect({
+                                key: ONYXKEYS.COLLECTION.REPORT,
+                                waitForCollectionCallback: true,
+                                callback: (allReports) => {
+                                    Onyx.disconnect(connection);
 
-                                        // A chat report, a transaction thread, and an iou report should be created
-                                        const chatReports = Object.values(allReports ?? {}).filter((report) => report?.type === CONST.REPORT.TYPE.CHAT);
-                                        const iouReports = Object.values(allReports ?? {}).filter((report) => report?.type === CONST.REPORT.TYPE.IOU);
-                                        expect(Object.keys(chatReports).length).toBe(2);
-                                        expect(Object.keys(iouReports).length).toBe(1);
-                                        const chatReport = chatReports[0];
-                                        const transactionThreadReport = chatReports[1];
-                                        const iouReport = iouReports[0];
-                                        iouReportID = iouReport?.reportID;
-                                        transactionThread = transactionThreadReport;
+                                    // A chat report, a transaction thread, and an iou report should be created
+                                    const chatReports = Object.values(allReports ?? {}).filter((report) => report?.type === CONST.REPORT.TYPE.CHAT);
+                                    const iouReports = Object.values(allReports ?? {}).filter((report) => report?.type === CONST.REPORT.TYPE.IOU);
+                                    expect(Object.keys(chatReports).length).toBe(2);
+                                    expect(Object.keys(iouReports).length).toBe(1);
+                                    const chatReport = chatReports[0];
+                                    const transactionThreadReport = chatReports[1];
+                                    const iouReport = iouReports[0];
+                                    iouReportID = iouReport?.reportID;
+                                    transactionThread = transactionThreadReport;
 
-                                        expect(iouReport?.notificationPreference).toBe(CONST.REPORT.NOTIFICATION_PREFERENCE.HIDDEN);
+                                    expect(iouReport?.notificationPreference).toBe(CONST.REPORT.NOTIFICATION_PREFERENCE.HIDDEN);
 
-                                        // They should be linked together
-                                        expect(chatReport?.participantAccountIDs).toEqual([CARLOS_ACCOUNT_ID]);
-                                        expect(chatReport?.iouReportID).toBe(iouReport?.reportID);
+                                    // They should be linked together
+                                    expect(chatReport?.participants).toEqual({[RORY_ACCOUNT_ID]: RORY_PARTICIPANT, [CARLOS_ACCOUNT_ID]: CARLOS_PARTICIPANT});
+                                    expect(chatReport?.iouReportID).toBe(iouReport?.reportID);
 
-                                        resolve();
-                                    },
-                                });
-                            }),
-                    )
-                    .then(
-                        () =>
-                            new Promise<void>((resolve) => {
-                                const connectionID = Onyx.connect({
-                                    key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${iouReportID}`,
-                                    waitForCollectionCallback: false,
-                                    callback: (reportActionsForIOUReport) => {
-                                        Onyx.disconnect(connectionID);
+                                    resolve();
+                                },
+                            });
+                        }),
+                )
+                .then(
+                    () =>
+                        new Promise<void>((resolve) => {
+                            const connection = Onyx.connect({
+                                key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${iouReportID}`,
+                                waitForCollectionCallback: false,
+                                callback: (reportActionsForIOUReport) => {
+                                    Onyx.disconnect(connection);
 
-                                        // The IOU report should have a CREATED action and IOU action
-                                        expect(Object.values(reportActionsForIOUReport ?? {}).length).toBe(2);
-                                        const createdActions = Object.values(reportActionsForIOUReport ?? {}).filter(
-                                            (reportAction) => reportAction?.actionName === CONST.REPORT.ACTIONS.TYPE.CREATED,
-                                        );
-                                        const iouActions = Object.values(reportActionsForIOUReport ?? {}).filter(
-                                            (reportAction): reportAction is ReportActionBase & OriginalMessageIOU => reportAction?.actionName === CONST.REPORT.ACTIONS.TYPE.IOU,
-                                        );
-                                        expect(Object.values(createdActions).length).toBe(1);
-                                        expect(Object.values(iouActions).length).toBe(1);
-                                        createdAction = createdActions?.[0] ?? null;
-                                        iouAction = iouActions?.[0] ?? null;
+                                    // The IOU report should have a CREATED action and IOU action
+                                    expect(Object.values(reportActionsForIOUReport ?? {}).length).toBe(2);
+                                    const createdActions = Object.values(reportActionsForIOUReport ?? {}).filter(
+                                        (reportAction) => reportAction?.actionName === CONST.REPORT.ACTIONS.TYPE.CREATED,
+                                    );
+                                    const iouActions = Object.values(reportActionsForIOUReport ?? {}).filter(
+                                        (reportAction): reportAction is OnyxTypes.ReportAction<typeof CONST.REPORT.ACTIONS.TYPE.IOU> => ReportActionsUtils.isMoneyRequestAction(reportAction),
+                                    );
+                                    expect(Object.values(createdActions).length).toBe(1);
+                                    expect(Object.values(iouActions).length).toBe(1);
+                                    createdAction = createdActions?.[0] ?? null;
+                                    iouAction = iouActions?.[0] ?? null;
+                                    const originalMessage = ReportActionsUtils.isMoneyRequestAction(iouAction) ? ReportActionsUtils.getOriginalMessage(iouAction) : undefined;
 
-                                        // The CREATED action should not be created after the IOU action
-                                        expect(Date.parse(createdAction?.created ?? '')).toBeLessThan(Date.parse(iouAction?.created ?? ''));
+                                    // The CREATED action should not be created after the IOU action
+                                    expect(Date.parse(createdAction?.created ?? '')).toBeLessThan(Date.parse(iouAction?.created ?? ''));
 
-                                        // The IOUReportID should be correct
-                                        expect(iouAction.originalMessage.IOUReportID).toBe(iouReportID);
+                                    // The IOUReportID should be correct
+                                    expect(originalMessage?.IOUReportID).toBe(iouReportID);
 
-                                        // The comment should be included in the IOU action
-                                        expect(iouAction.originalMessage.comment).toBe(comment);
+                                    // The comment should be included in the IOU action
+                                    expect(originalMessage?.comment).toBe(comment);
 
-                                        // The amount in the IOU action should be correct
-                                        expect(iouAction.originalMessage.amount).toBe(amount);
+                                    // The amount in the IOU action should be correct
+                                    expect(originalMessage?.amount).toBe(amount);
 
-                                        // The IOU type should be correct
-                                        expect(iouAction.originalMessage.type).toBe(CONST.IOU.REPORT_ACTION_TYPE.CREATE);
+                                    // The IOU type should be correct
+                                    expect(originalMessage?.type).toBe(CONST.IOU.REPORT_ACTION_TYPE.CREATE);
 
-                                        // Both actions should be pending
-                                        expect(createdAction?.pendingAction).toBe(CONST.RED_BRICK_ROAD_PENDING_ACTION.ADD);
-                                        expect(iouAction?.pendingAction).toBe(CONST.RED_BRICK_ROAD_PENDING_ACTION.ADD);
+                                    // Both actions should be pending
+                                    expect(createdAction?.pendingAction).toBe(CONST.RED_BRICK_ROAD_PENDING_ACTION.ADD);
+                                    expect(iouAction?.pendingAction).toBe(CONST.RED_BRICK_ROAD_PENDING_ACTION.ADD);
 
-                                        resolve();
-                                    },
-                                });
-                            }),
-                    )
-                    .then(
-                        () =>
-                            new Promise<void>((resolve) => {
-                                const connectionID = Onyx.connect({
-                                    key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${transactionThread?.reportID}`,
-                                    waitForCollectionCallback: false,
-                                    callback: (reportActionsForTransactionThread) => {
-                                        Onyx.disconnect(connectionID);
+                                    resolve();
+                                },
+                            });
+                        }),
+                )
+                .then(
+                    () =>
+                        new Promise<void>((resolve) => {
+                            const connection = Onyx.connect({
+                                key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${transactionThread?.reportID}`,
+                                waitForCollectionCallback: false,
+                                callback: (reportActionsForTransactionThread) => {
+                                    Onyx.disconnect(connection);
 
-                                        // The transaction thread should have a CREATED action
-                                        expect(Object.values(reportActionsForTransactionThread ?? {}).length).toBe(1);
-                                        const createdActions = Object.values(reportActionsForTransactionThread ?? {}).filter(
-                                            (reportAction) => reportAction?.actionName === CONST.REPORT.ACTIONS.TYPE.CREATED,
-                                        );
-                                        expect(Object.values(createdActions).length).toBe(1);
-                                        transactionThreadCreatedAction = createdActions[0];
+                                    // The transaction thread should have a CREATED action
+                                    expect(Object.values(reportActionsForTransactionThread ?? {}).length).toBe(1);
+                                    const createdActions = Object.values(reportActionsForTransactionThread ?? {}).filter(
+                                        (reportAction) => reportAction?.actionName === CONST.REPORT.ACTIONS.TYPE.CREATED,
+                                    );
+                                    expect(Object.values(createdActions).length).toBe(1);
+                                    transactionThreadCreatedAction = createdActions[0];
 
-                                        expect(transactionThreadCreatedAction?.pendingAction).toBe(CONST.RED_BRICK_ROAD_PENDING_ACTION.ADD);
-                                        resolve();
-                                    },
-                                });
-                            }),
-                    )
-                    .then(
-                        () =>
-                            new Promise<void>((resolve) => {
-                                const connectionID = Onyx.connect({
-                                    key: ONYXKEYS.COLLECTION.TRANSACTION,
-                                    waitForCollectionCallback: true,
-                                    callback: (allTransactions) => {
-                                        Onyx.disconnect(connectionID);
+                                    expect(transactionThreadCreatedAction?.pendingAction).toBe(CONST.RED_BRICK_ROAD_PENDING_ACTION.ADD);
+                                    resolve();
+                                },
+                            });
+                        }),
+                )
+                .then(
+                    () =>
+                        new Promise<void>((resolve) => {
+                            const connection = Onyx.connect({
+                                key: ONYXKEYS.COLLECTION.TRANSACTION,
+                                waitForCollectionCallback: true,
+                                callback: (allTransactions) => {
+                                    Onyx.disconnect(connection);
 
-                                        // There should be one transaction
-                                        expect(Object.values(allTransactions ?? {}).length).toBe(1);
-                                        const transaction = Object.values(allTransactions ?? []).find((t) => !isEmptyObject(t));
-                                        transactionID = transaction?.transactionID;
+                                    // There should be one transaction
+                                    expect(Object.values(allTransactions ?? {}).length).toBe(1);
+                                    const transaction = Object.values(allTransactions ?? []).find((t) => !isEmptyObject(t));
+                                    transactionID = transaction?.transactionID;
 
-                                        // The transaction should be attached to the IOU report
-                                        expect(transaction?.reportID).toBe(iouReportID);
+                                    // The transaction should be attached to the IOU report
+                                    expect(transaction?.reportID).toBe(iouReportID);
 
-                                        // Its amount should match the amount of the expense
-                                        expect(transaction?.amount).toBe(amount);
+                                    // Its amount should match the amount of the expense
+                                    expect(transaction?.amount).toBe(amount);
 
-                                        // The comment should be correct
-                                        expect(transaction?.comment.comment).toBe(comment);
+                                    // The comment should be correct
+                                    expect(transaction?.comment?.comment).toBe(comment);
 
-                                        // It should be pending
-                                        expect(transaction?.pendingAction).toBe(CONST.RED_BRICK_ROAD_PENDING_ACTION.ADD);
+                                    // It should be pending
+                                    expect(transaction?.pendingAction).toBe(CONST.RED_BRICK_ROAD_PENDING_ACTION.ADD);
 
-                                        // The transactionID on the iou action should match the one from the transactions collection
-                                        expect((iouAction?.originalMessage as IOUMessage)?.IOUTransactionID).toBe(transactionID);
+                                    // The transactionID on the iou action should match the one from the transactions collection
+                                    expect(iouAction && ReportActionsUtils.getOriginalMessage(iouAction)?.IOUTransactionID).toBe(transactionID);
 
-                                        expect(transaction?.merchant).toBe(merchant);
+                                    expect(transaction?.merchant).toBe(merchant);
 
-                                        resolve();
-                                    },
-                                });
-                            }),
-                    )
-                    // @ts-expect-error TODO: Remove this once TestHelper (https://github.com/Expensify/App/issues/25318) is migrated to TypeScript.
-                    .then(fetch.resume)
-                    .then(
-                        () =>
-                            new Promise<void>((resolve) => {
-                                const connectionID = Onyx.connect({
-                                    key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${iouReportID}`,
-                                    waitForCollectionCallback: false,
-                                    callback: (reportActionsForIOUReport) => {
-                                        Onyx.disconnect(connectionID);
-                                        expect(Object.values(reportActionsForIOUReport ?? {}).length).toBe(2);
-                                        Object.values(reportActionsForIOUReport ?? {}).forEach((reportAction) => expect(reportAction?.pendingAction).toBeFalsy());
-                                        resolve();
-                                    },
-                                });
-                            }),
-                    )
-                    .then(
-                        () =>
-                            new Promise<void>((resolve) => {
-                                const connectionID = Onyx.connect({
-                                    key: `${ONYXKEYS.COLLECTION.TRANSACTION}${transactionID}`,
-                                    waitForCollectionCallback: false,
-                                    callback: (transaction) => {
-                                        Onyx.disconnect(connectionID);
-                                        expect(transaction?.pendingAction).toBeFalsy();
-                                        resolve();
-                                    },
-                                });
-                            }),
-                    )
-            );
+                                    resolve();
+                                },
+                            });
+                        }),
+                )
+                .then(mockFetch?.resume)
+                .then(
+                    () =>
+                        new Promise<void>((resolve) => {
+                            const connection = Onyx.connect({
+                                key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${iouReportID}`,
+                                waitForCollectionCallback: false,
+                                callback: (reportActionsForIOUReport) => {
+                                    Onyx.disconnect(connection);
+                                    expect(Object.values(reportActionsForIOUReport ?? {}).length).toBe(2);
+                                    Object.values(reportActionsForIOUReport ?? {}).forEach((reportAction) => expect(reportAction?.pendingAction).toBeFalsy());
+                                    resolve();
+                                },
+                            });
+                        }),
+                )
+                .then(
+                    () =>
+                        new Promise<void>((resolve) => {
+                            const connection = Onyx.connect({
+                                key: `${ONYXKEYS.COLLECTION.TRANSACTION}${transactionID}`,
+                                waitForCollectionCallback: false,
+                                callback: (transaction) => {
+                                    Onyx.disconnect(connection);
+                                    expect(transaction?.pendingAction).toBeFalsy();
+                                    resolve();
+                                },
+                            });
+                        }),
+                );
         });
 
         it('updates existing chat report if there is one', () => {
@@ -249,7 +257,7 @@ describe('actions/IOU', () => {
             let chatReport: OnyxTypes.Report = {
                 reportID: '1234',
                 type: CONST.REPORT.TYPE.CHAT,
-                participantAccountIDs: [CARLOS_ACCOUNT_ID],
+                participants: {[RORY_ACCOUNT_ID]: RORY_PARTICIPANT, [CARLOS_ACCOUNT_ID]: CARLOS_PARTICIPANT},
             };
             const createdAction: OnyxTypes.ReportAction = {
                 reportActionID: NumberUtils.rand64(),
@@ -257,155 +265,151 @@ describe('actions/IOU', () => {
                 created: DateUtils.getDBTime(),
             };
             let iouReportID: string | undefined;
-            let iouAction: OnyxEntry<OnyxTypes.ReportAction>;
+            let iouAction: OnyxEntry<OnyxTypes.ReportAction<typeof CONST.REPORT.ACTIONS.TYPE.IOU>>;
             let iouCreatedAction: OnyxEntry<OnyxTypes.ReportAction>;
             let transactionID: string | undefined;
-            // @ts-expect-error TODO: Remove this once TestHelper (https://github.com/Expensify/App/issues/25318) is migrated to TypeScript.
-            fetch.pause();
-            return (
-                Onyx.set(`${ONYXKEYS.COLLECTION.REPORT}${chatReport.reportID}`, chatReport)
-                    .then(() =>
-                        Onyx.set(`${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${chatReport.reportID}`, {
-                            [createdAction.reportActionID]: createdAction,
-                        }),
-                    )
-                    .then(() => {
-                        IOU.requestMoney(chatReport, amount, CONST.CURRENCY.USD, '', '', RORY_EMAIL, RORY_ACCOUNT_ID, {login: CARLOS_EMAIL, accountID: CARLOS_ACCOUNT_ID}, comment, {});
-                        return waitForBatchedUpdates();
-                    })
-                    .then(
-                        () =>
-                            new Promise<void>((resolve) => {
-                                const connectionID = Onyx.connect({
-                                    key: ONYXKEYS.COLLECTION.REPORT,
-                                    waitForCollectionCallback: true,
-                                    callback: (allReports) => {
-                                        Onyx.disconnect(connectionID);
+            mockFetch?.pause?.();
+            return Onyx.set(`${ONYXKEYS.COLLECTION.REPORT}${chatReport.reportID}`, chatReport)
+                .then(() =>
+                    Onyx.set(`${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${chatReport.reportID}`, {
+                        [createdAction.reportActionID]: createdAction,
+                    }),
+                )
+                .then(() => {
+                    IOU.requestMoney(chatReport, amount, CONST.CURRENCY.USD, '', '', RORY_EMAIL, RORY_ACCOUNT_ID, {login: CARLOS_EMAIL, accountID: CARLOS_ACCOUNT_ID}, comment, {});
+                    return waitForBatchedUpdates();
+                })
+                .then(
+                    () =>
+                        new Promise<void>((resolve) => {
+                            const connection = Onyx.connect({
+                                key: ONYXKEYS.COLLECTION.REPORT,
+                                waitForCollectionCallback: true,
+                                callback: (allReports) => {
+                                    Onyx.disconnect(connection);
 
-                                        // The same chat report should be reused, a transaction thread and an IOU report should be created
-                                        expect(Object.values(allReports ?? {}).length).toBe(3);
-                                        expect(Object.values(allReports ?? {}).find((report) => report?.type === CONST.REPORT.TYPE.CHAT)?.reportID).toBe(chatReport.reportID);
-                                        chatReport = Object.values(allReports ?? {}).find((report) => report?.type === CONST.REPORT.TYPE.CHAT) ?? chatReport;
-                                        const iouReport = Object.values(allReports ?? {}).find((report) => report?.type === CONST.REPORT.TYPE.IOU);
-                                        iouReportID = iouReport?.reportID;
+                                    // The same chat report should be reused, a transaction thread and an IOU report should be created
+                                    expect(Object.values(allReports ?? {}).length).toBe(3);
+                                    expect(Object.values(allReports ?? {}).find((report) => report?.type === CONST.REPORT.TYPE.CHAT)?.reportID).toBe(chatReport.reportID);
+                                    chatReport = Object.values(allReports ?? {}).find((report) => report?.type === CONST.REPORT.TYPE.CHAT) ?? chatReport;
+                                    const iouReport = Object.values(allReports ?? {}).find((report) => report?.type === CONST.REPORT.TYPE.IOU);
+                                    iouReportID = iouReport?.reportID;
 
-                                        expect(iouReport?.notificationPreference).toBe(CONST.REPORT.NOTIFICATION_PREFERENCE.HIDDEN);
+                                    expect(iouReport?.notificationPreference).toBe(CONST.REPORT.NOTIFICATION_PREFERENCE.HIDDEN);
 
-                                        // They should be linked together
-                                        expect(chatReport.iouReportID).toBe(iouReportID);
+                                    // They should be linked together
+                                    expect(chatReport.iouReportID).toBe(iouReportID);
 
-                                        resolve();
-                                    },
-                                });
-                            }),
-                    )
-                    .then(
-                        () =>
-                            new Promise<void>((resolve) => {
-                                const connectionID = Onyx.connect({
-                                    key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${iouReportID}`,
-                                    waitForCollectionCallback: false,
-                                    callback: (allIOUReportActions) => {
-                                        Onyx.disconnect(connectionID);
-
-                                        iouCreatedAction =
-                                            Object.values(allIOUReportActions ?? {}).find((reportAction) => reportAction.actionName === CONST.REPORT.ACTIONS.TYPE.CREATED) ?? null;
-                                        iouAction =
-                                            Object.values(allIOUReportActions ?? {}).find(
-                                                (reportAction): reportAction is ReportActionBase & OriginalMessageIOU => reportAction.actionName === CONST.REPORT.ACTIONS.TYPE.IOU,
-                                            ) ?? null;
+                                    resolve();
+                                },
+                            });
+                        }),
+                )
+                .then(
+                    () =>
+                        new Promise<void>((resolve) => {
+                            const connection = Onyx.connect({
+                                key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${iouReportID}`,
+                                waitForCollectionCallback: false,
+                                callback: (allIOUReportActions) => {
+                                    Onyx.disconnect(connection);
 
-                                        // The CREATED action should not be created after the IOU action
-                                        expect(Date.parse(iouCreatedAction?.created ?? '')).toBeLessThan(Date.parse(iouAction?.created ?? ''));
+                                    iouCreatedAction = Object.values(allIOUReportActions ?? {}).find((reportAction) => reportAction.actionName === CONST.REPORT.ACTIONS.TYPE.CREATED);
+                                    iouAction = Object.values(allIOUReportActions ?? {}).find((reportAction): reportAction is OnyxTypes.ReportAction<typeof CONST.REPORT.ACTIONS.TYPE.IOU> =>
+                                        ReportActionsUtils.isMoneyRequestAction(reportAction),
+                                    );
+                                    const originalMessage = iouAction ? ReportActionsUtils.getOriginalMessage(iouAction) : null;
 
-                                        // The IOUReportID should be correct
-                                        expect(iouAction?.originalMessage?.IOUReportID).toBe(iouReportID);
+                                    // The CREATED action should not be created after the IOU action
+                                    expect(Date.parse(iouCreatedAction?.created ?? '')).toBeLessThan(Date.parse(iouAction?.created ?? ''));
 
-                                        // The comment should be included in the IOU action
-                                        expect(iouAction?.originalMessage?.comment).toBe(comment);
+                                    // The IOUReportID should be correct
+                                    expect(originalMessage?.IOUReportID).toBe(iouReportID);
 
-                                        // The amount in the IOU action should be correct
-                                        expect(iouAction?.originalMessage?.amount).toBe(amount);
+                                    // The comment should be included in the IOU action
+                                    expect(originalMessage?.comment).toBe(comment);
 
-                                        // The IOU action type should be correct
-                                        expect(iouAction?.originalMessage?.type).toBe(CONST.IOU.REPORT_ACTION_TYPE.CREATE);
+                                    // The amount in the IOU action should be correct
+                                    expect(originalMessage?.amount).toBe(amount);
 
-                                        // The IOU action should be pending
-                                        expect(iouAction?.pendingAction).toBe(CONST.RED_BRICK_ROAD_PENDING_ACTION.ADD);
+                                    // The IOU action type should be correct
+                                    expect(originalMessage?.type).toBe(CONST.IOU.REPORT_ACTION_TYPE.CREATE);
 
-                                        resolve();
-                                    },
-                                });
-                            }),
-                    )
-                    .then(
-                        () =>
-                            new Promise<void>((resolve) => {
-                                const connectionID = Onyx.connect({
-                                    key: ONYXKEYS.COLLECTION.TRANSACTION,
-                                    waitForCollectionCallback: true,
-                                    callback: (allTransactions) => {
-                                        Onyx.disconnect(connectionID);
+                                    // The IOU action should be pending
+                                    expect(iouAction?.pendingAction).toBe(CONST.RED_BRICK_ROAD_PENDING_ACTION.ADD);
 
-                                        // There should be one transaction
-                                        expect(Object.values(allTransactions ?? {}).length).toBe(1);
-                                        const transaction = Object.values(allTransactions ?? {}).find((t) => !isEmptyObject(t));
-                                        transactionID = transaction?.transactionID;
+                                    resolve();
+                                },
+                            });
+                        }),
+                )
+                .then(
+                    () =>
+                        new Promise<void>((resolve) => {
+                            const connection = Onyx.connect({
+                                key: ONYXKEYS.COLLECTION.TRANSACTION,
+                                waitForCollectionCallback: true,
+                                callback: (allTransactions) => {
+                                    Onyx.disconnect(connection);
 
-                                        // The transaction should be attached to the IOU report
-                                        expect(transaction?.reportID).toBe(iouReportID);
+                                    // There should be one transaction
+                                    expect(Object.values(allTransactions ?? {}).length).toBe(1);
+                                    const transaction = Object.values(allTransactions ?? {}).find((t) => !isEmptyObject(t));
+                                    transactionID = transaction?.transactionID;
+                                    const originalMessage = iouAction ? ReportActionsUtils.getOriginalMessage(iouAction) : null;
 
-                                        // Its amount should match the amount of the expense
-                                        expect(transaction?.amount).toBe(amount);
+                                    // The transaction should be attached to the IOU report
+                                    expect(transaction?.reportID).toBe(iouReportID);
 
-                                        // The comment should be correct
-                                        expect(transaction?.comment.comment).toBe(comment);
+                                    // Its amount should match the amount of the expense
+                                    expect(transaction?.amount).toBe(amount);
 
-                                        expect(transaction?.merchant).toBe(CONST.TRANSACTION.PARTIAL_TRANSACTION_MERCHANT);
+                                    // The comment should be correct
+                                    expect(transaction?.comment?.comment).toBe(comment);
 
-                                        // It should be pending
-                                        expect(transaction?.pendingAction).toBe(CONST.RED_BRICK_ROAD_PENDING_ACTION.ADD);
+                                    expect(transaction?.merchant).toBe(CONST.TRANSACTION.PARTIAL_TRANSACTION_MERCHANT);
 
-                                        // The transactionID on the iou action should match the one from the transactions collection
-                                        expect((iouAction?.originalMessage as IOUMessage)?.IOUTransactionID).toBe(transactionID);
+                                    // It should be pending
+                                    expect(transaction?.pendingAction).toBe(CONST.RED_BRICK_ROAD_PENDING_ACTION.ADD);
 
-                                        resolve();
-                                    },
-                                });
-                            }),
-                    )
-                    // @ts-expect-error TODO: Remove this once TestHelper (https://github.com/Expensify/App/issues/25318) is migrated to TypeScript.
-                    .then(fetch.resume)
-                    .then(waitForBatchedUpdates)
-                    .then(
-                        () =>
-                            new Promise<void>((resolve) => {
-                                const connectionID = Onyx.connect({
-                                    key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${iouReportID}`,
-                                    waitForCollectionCallback: false,
-                                    callback: (reportActionsForIOUReport) => {
-                                        Onyx.disconnect(connectionID);
-                                        expect(Object.values(reportActionsForIOUReport ?? {}).length).toBe(2);
-                                        Object.values(reportActionsForIOUReport ?? {}).forEach((reportAction) => expect(reportAction?.pendingAction).toBeFalsy());
-                                        resolve();
-                                    },
-                                });
-                            }),
-                    )
-                    .then(
-                        () =>
-                            new Promise<void>((resolve) => {
-                                const connectionID = Onyx.connect({
-                                    key: `${ONYXKEYS.COLLECTION.TRANSACTION}${transactionID}`,
-                                    callback: (transaction) => {
-                                        Onyx.disconnect(connectionID);
-                                        expect(transaction?.pendingAction).toBeFalsy();
-                                        resolve();
-                                    },
-                                });
-                            }),
-                    )
-            );
+                                    // The transactionID on the iou action should match the one from the transactions collection
+                                    expect(originalMessage?.IOUTransactionID).toBe(transactionID);
+
+                                    resolve();
+                                },
+                            });
+                        }),
+                )
+                .then(mockFetch?.resume)
+                .then(waitForBatchedUpdates)
+                .then(
+                    () =>
+                        new Promise<void>((resolve) => {
+                            const connection = Onyx.connect({
+                                key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${iouReportID}`,
+                                waitForCollectionCallback: false,
+                                callback: (reportActionsForIOUReport) => {
+                                    Onyx.disconnect(connection);
+                                    expect(Object.values(reportActionsForIOUReport ?? {}).length).toBe(2);
+                                    Object.values(reportActionsForIOUReport ?? {}).forEach((reportAction) => expect(reportAction?.pendingAction).toBeFalsy());
+                                    resolve();
+                                },
+                            });
+                        }),
+                )
+                .then(
+                    () =>
+                        new Promise<void>((resolve) => {
+                            const connection = Onyx.connect({
+                                key: `${ONYXKEYS.COLLECTION.TRANSACTION}${transactionID}`,
+                                callback: (transaction) => {
+                                    Onyx.disconnect(connection);
+                                    expect(transaction?.pendingAction).toBeFalsy();
+                                    resolve();
+                                },
+                            });
+                        }),
+                );
         });
 
         it('updates existing IOU report if there is one', () => {
@@ -417,7 +421,7 @@ describe('actions/IOU', () => {
                 reportID: chatReportID,
                 type: CONST.REPORT.TYPE.CHAT,
                 iouReportID,
-                participantAccountIDs: [CARLOS_ACCOUNT_ID],
+                participants: {[RORY_ACCOUNT_ID]: RORY_PARTICIPANT, [CARLOS_ACCOUNT_ID]: CARLOS_PARTICIPANT},
             };
             const createdAction: OnyxTypes.ReportAction = {
                 reportActionID: NumberUtils.rand64(),
@@ -444,7 +448,7 @@ describe('actions/IOU', () => {
                 currency: CONST.CURRENCY.USD,
                 total: existingTransaction.amount,
             };
-            const iouAction: OnyxEntry<OnyxTypes.ReportAction> = {
+            const iouAction: OnyxEntry<OnyxTypes.ReportAction<typeof CONST.REPORT.ACTIONS.TYPE.IOU>> = {
                 reportActionID: NumberUtils.rand64(),
                 actionName: CONST.REPORT.ACTIONS.TYPE.IOU,
                 actorAccountID: RORY_ACCOUNT_ID,
@@ -458,148 +462,147 @@ describe('actions/IOU', () => {
                     participantAccountIDs: [RORY_ACCOUNT_ID, CARLOS_ACCOUNT_ID],
                 },
             };
-            let newIOUAction: OnyxEntry<OnyxTypes.ReportAction>;
+            let newIOUAction: OnyxEntry<OnyxTypes.ReportAction<typeof CONST.REPORT.ACTIONS.TYPE.IOU>>;
             let newTransaction: OnyxEntry<OnyxTypes.Transaction>;
-            // @ts-expect-error TODO: Remove this once TestHelper (https://github.com/Expensify/App/issues/25318) is migrated to TypeScript.
-            fetch.pause();
-            return (
-                Onyx.set(`${ONYXKEYS.COLLECTION.REPORT}${chatReportID}`, chatReport)
-                    .then(() => Onyx.set(`${ONYXKEYS.COLLECTION.REPORT}${iouReportID}`, iouReport))
-                    .then(() =>
-                        Onyx.set(`${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${iouReportID}`, {
-                            [createdAction.reportActionID]: createdAction,
-                            [iouAction.reportActionID]: iouAction,
-                        }),
-                    )
-                    .then(() => Onyx.set(`${ONYXKEYS.COLLECTION.TRANSACTION}${existingTransaction.transactionID}`, existingTransaction))
-                    .then(() => {
-                        if (chatReport) {
-                            IOU.requestMoney(chatReport, amount, CONST.CURRENCY.USD, '', '', RORY_EMAIL, RORY_ACCOUNT_ID, {login: CARLOS_EMAIL, accountID: CARLOS_ACCOUNT_ID}, comment, {});
-                        }
-                        return waitForBatchedUpdates();
-                    })
-                    .then(
-                        () =>
-                            new Promise<void>((resolve) => {
-                                const connectionID = Onyx.connect({
-                                    key: ONYXKEYS.COLLECTION.REPORT,
-                                    waitForCollectionCallback: true,
-                                    callback: (allReports) => {
-                                        Onyx.disconnect(connectionID);
+            mockFetch?.pause?.();
+            return Onyx.set(`${ONYXKEYS.COLLECTION.REPORT}${chatReportID}`, chatReport)
+                .then(() => Onyx.set(`${ONYXKEYS.COLLECTION.REPORT}${iouReportID}`, iouReport ?? null))
+                .then(() =>
+                    Onyx.set(`${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${iouReportID}`, {
+                        [createdAction.reportActionID]: createdAction,
+                        [iouAction.reportActionID]: iouAction,
+                    }),
+                )
+                .then(() => Onyx.set(`${ONYXKEYS.COLLECTION.TRANSACTION}${existingTransaction.transactionID}`, existingTransaction))
+                .then(() => {
+                    if (chatReport) {
+                        IOU.requestMoney(chatReport, amount, CONST.CURRENCY.USD, '', '', RORY_EMAIL, RORY_ACCOUNT_ID, {login: CARLOS_EMAIL, accountID: CARLOS_ACCOUNT_ID}, comment, {});
+                    }
+                    return waitForBatchedUpdates();
+                })
+                .then(
+                    () =>
+                        new Promise<void>((resolve) => {
+                            const connection = Onyx.connect({
+                                key: ONYXKEYS.COLLECTION.REPORT,
+                                waitForCollectionCallback: true,
+                                callback: (allReports) => {
+                                    Onyx.disconnect(connection);
 
-                                        // No new reports should be created
-                                        expect(Object.values(allReports ?? {}).length).toBe(3);
-                                        expect(Object.values(allReports ?? {}).find((report) => report?.reportID === chatReportID)).toBeTruthy();
-                                        expect(Object.values(allReports ?? {}).find((report) => report?.reportID === iouReportID)).toBeTruthy();
+                                    // No new reports should be created
+                                    expect(Object.values(allReports ?? {}).length).toBe(3);
+                                    expect(Object.values(allReports ?? {}).find((report) => report?.reportID === chatReportID)).toBeTruthy();
+                                    expect(Object.values(allReports ?? {}).find((report) => report?.reportID === iouReportID)).toBeTruthy();
 
-                                        chatReport = Object.values(allReports ?? {}).find((report) => report?.type === CONST.REPORT.TYPE.CHAT) ?? null;
-                                        iouReport = Object.values(allReports ?? {}).find((report) => report?.type === CONST.REPORT.TYPE.IOU) ?? null;
+                                    chatReport = Object.values(allReports ?? {}).find((report) => report?.type === CONST.REPORT.TYPE.CHAT);
+                                    iouReport = Object.values(allReports ?? {}).find((report) => report?.type === CONST.REPORT.TYPE.IOU);
 
-                                        // The total on the iou report should be updated
-                                        expect(iouReport?.total).toBe(11000);
+                                    // The total on the iou report should be updated
+                                    expect(iouReport?.total).toBe(11000);
 
-                                        resolve();
-                                    },
-                                });
-                            }),
-                    )
-                    .then(
-                        () =>
-                            new Promise<void>((resolve) => {
-                                const connectionID = Onyx.connect({
-                                    key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${iouReportID}`,
-                                    waitForCollectionCallback: false,
-                                    callback: (reportActionsForIOUReport) => {
-                                        Onyx.disconnect(connectionID);
+                                    resolve();
+                                },
+                            });
+                        }),
+                )
+                .then(
+                    () =>
+                        new Promise<void>((resolve) => {
+                            const connection = Onyx.connect({
+                                key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${iouReportID}`,
+                                waitForCollectionCallback: false,
+                                callback: (reportActionsForIOUReport) => {
+                                    Onyx.disconnect(connection);
 
-                                        expect(Object.values(reportActionsForIOUReport ?? {}).length).toBe(3);
-                                        newIOUAction =
-                                            Object.values(reportActionsForIOUReport ?? {}).find(
-                                                (reportAction): reportAction is ReportActionBase & OriginalMessageIOU =>
-                                                    reportAction?.reportActionID !== createdAction.reportActionID && reportAction?.reportActionID !== iouAction?.reportActionID,
-                                            ) ?? null;
+                                    expect(Object.values(reportActionsForIOUReport ?? {}).length).toBe(3);
+                                    newIOUAction = Object.values(reportActionsForIOUReport ?? {}).find(
+                                        (reportAction): reportAction is OnyxTypes.ReportAction<typeof CONST.REPORT.ACTIONS.TYPE.IOU> =>
+                                            reportAction?.reportActionID !== createdAction.reportActionID && reportAction?.reportActionID !== iouAction?.reportActionID,
+                                    );
 
-                                        // The IOUReportID should be correct
-                                        expect(iouAction.originalMessage.IOUReportID).toBe(iouReportID);
+                                    const newOriginalMessage = newIOUAction ? ReportActionsUtils.getOriginalMessage(newIOUAction) : null;
 
-                                        // The comment should be included in the IOU action
-                                        expect(newIOUAction?.originalMessage.comment).toBe(comment);
+                                    // The IOUReportID should be correct
+                                    expect(ReportActionsUtils.getOriginalMessage(iouAction)?.IOUReportID).toBe(iouReportID);
 
-                                        // The amount in the IOU action should be correct
-                                        expect(newIOUAction?.originalMessage.amount).toBe(amount);
+                                    // The comment should be included in the IOU action
+                                    expect(newOriginalMessage?.comment).toBe(comment);
 
-                                        // The type of the IOU action should be correct
-                                        expect(newIOUAction?.originalMessage.type).toBe(CONST.IOU.REPORT_ACTION_TYPE.CREATE);
+                                    // The amount in the IOU action should be correct
+                                    expect(newOriginalMessage?.amount).toBe(amount);
 
-                                        // The IOU action should be pending
-                                        expect(newIOUAction?.pendingAction).toBe(CONST.RED_BRICK_ROAD_PENDING_ACTION.ADD);
+                                    // The type of the IOU action should be correct
+                                    expect(newOriginalMessage?.type).toBe(CONST.IOU.REPORT_ACTION_TYPE.CREATE);
 
-                                        resolve();
-                                    },
-                                });
-                            }),
-                    )
-                    .then(
-                        () =>
-                            new Promise<void>((resolve) => {
-                                const connectionID = Onyx.connect({
-                                    key: ONYXKEYS.COLLECTION.TRANSACTION,
-                                    waitForCollectionCallback: true,
-                                    callback: (allTransactions) => {
-                                        Onyx.disconnect(connectionID);
+                                    // The IOU action should be pending
+                                    expect(newIOUAction?.pendingAction).toBe(CONST.RED_BRICK_ROAD_PENDING_ACTION.ADD);
 
-                                        // There should be two transactions
-                                        expect(Object.values(allTransactions ?? {}).length).toBe(2);
+                                    resolve();
+                                },
+                            });
+                        }),
+                )
+                .then(
+                    () =>
+                        new Promise<void>((resolve) => {
+                            const connection = Onyx.connect({
+                                key: ONYXKEYS.COLLECTION.TRANSACTION,
+                                waitForCollectionCallback: true,
+                                callback: (allTransactions) => {
+                                    Onyx.disconnect(connection);
 
-                                        newTransaction = Object.values(allTransactions ?? {}).find((transaction) => transaction?.transactionID !== existingTransaction.transactionID) ?? null;
+                                    // There should be two transactions
+                                    expect(Object.values(allTransactions ?? {}).length).toBe(2);
 
-                                        expect(newTransaction?.reportID).toBe(iouReportID);
-                                        expect(newTransaction?.amount).toBe(amount);
-                                        expect(newTransaction?.comment.comment).toBe(comment);
-                                        expect(newTransaction?.merchant).toBe(CONST.TRANSACTION.PARTIAL_TRANSACTION_MERCHANT);
-                                        expect(newTransaction?.pendingAction).toBe(CONST.RED_BRICK_ROAD_PENDING_ACTION.ADD);
+                                    newTransaction = Object.values(allTransactions ?? {}).find((transaction) => transaction?.transactionID !== existingTransaction.transactionID);
 
-                                        // The transactionID on the iou action should match the one from the transactions collection
-                                        expect((newIOUAction?.originalMessage as IOUMessage)?.IOUTransactionID).toBe(newTransaction?.transactionID);
+                                    expect(newTransaction?.reportID).toBe(iouReportID);
+                                    expect(newTransaction?.amount).toBe(amount);
+                                    expect(newTransaction?.comment?.comment).toBe(comment);
+                                    expect(newTransaction?.merchant).toBe(CONST.TRANSACTION.PARTIAL_TRANSACTION_MERCHANT);
+                                    expect(newTransaction?.pendingAction).toBe(CONST.RED_BRICK_ROAD_PENDING_ACTION.ADD);
 
-                                        resolve();
-                                    },
-                                });
-                            }),
-                    )
-                    // @ts-expect-error TODO: Remove this once TestHelper (https://github.com/Expensify/App/issues/25318) is migrated to TypeScript.
-                    .then(fetch.resume)
-                    .then(waitForNetworkPromises)
-                    .then(
-                        () =>
-                            new Promise<void>((resolve) => {
-                                const connectionID = Onyx.connect({
-                                    key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${iouReportID}`,
-                                    waitForCollectionCallback: false,
-                                    callback: (reportActionsForIOUReport) => {
-                                        Onyx.disconnect(connectionID);
-                                        expect(Object.values(reportActionsForIOUReport ?? {}).length).toBe(3);
-                                        Object.values(reportActionsForIOUReport ?? {}).forEach((reportAction) => expect(reportAction?.pendingAction).toBeFalsy());
-                                        resolve();
-                                    },
-                                });
-                            }),
-                    )
-                    .then(
-                        () =>
-                            new Promise<void>((resolve) => {
-                                const connectionID = Onyx.connect({
-                                    key: ONYXKEYS.COLLECTION.TRANSACTION,
-                                    waitForCollectionCallback: true,
-                                    callback: (allTransactions) => {
-                                        Onyx.disconnect(connectionID);
-                                        Object.values(allTransactions ?? {}).forEach((transaction) => expect(transaction?.pendingAction).toBeFalsy());
-                                        resolve();
-                                    },
-                                });
-                            }),
-                    )
-            );
+                                    // The transactionID on the iou action should match the one from the transactions collection
+                                    expect(ReportActionsUtils.isMoneyRequestAction(newIOUAction) ? ReportActionsUtils.getOriginalMessage(newIOUAction)?.IOUTransactionID : '0').toBe(
+                                        newTransaction?.transactionID,
+                                    );
+
+                                    resolve();
+                                },
+                            });
+                        }),
+                )
+                .then(mockFetch?.resume)
+                .then(waitForNetworkPromises)
+                .then(
+                    () =>
+                        new Promise<void>((resolve) => {
+                            const connection = Onyx.connect({
+                                key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${iouReportID}`,
+                                waitForCollectionCallback: false,
+                                callback: (reportActionsForIOUReport) => {
+                                    Onyx.disconnect(connection);
+                                    expect(Object.values(reportActionsForIOUReport ?? {}).length).toBe(3);
+                                    Object.values(reportActionsForIOUReport ?? {}).forEach((reportAction) => expect(reportAction?.pendingAction).toBeFalsy());
+                                    resolve();
+                                },
+                            });
+                        }),
+                )
+                .then(
+                    () =>
+                        new Promise<void>((resolve) => {
+                            const connection = Onyx.connect({
+                                key: ONYXKEYS.COLLECTION.TRANSACTION,
+                                waitForCollectionCallback: true,
+                                callback: (allTransactions) => {
+                                    Onyx.disconnect(connection);
+                                    Object.values(allTransactions ?? {}).forEach((transaction) => expect(transaction?.pendingAction).toBeFalsy());
+                                    resolve();
+                                },
+                            });
+                        }),
+                );
         });
 
         it('correctly implements RedBrickRoad error handling', () => {
@@ -608,23 +611,22 @@ describe('actions/IOU', () => {
             let chatReportID: string | undefined;
             let iouReportID: string | undefined;
             let createdAction: OnyxEntry<OnyxTypes.ReportAction>;
-            let iouAction: OnyxEntry<OnyxTypes.ReportAction>;
+            let iouAction: OnyxEntry<OnyxTypes.ReportAction<typeof CONST.REPORT.ACTIONS.TYPE.IOU>>;
             let transactionID: string;
             let transactionThreadReport: OnyxEntry<OnyxTypes.Report>;
             let transactionThreadAction: OnyxEntry<OnyxTypes.ReportAction>;
-            // @ts-expect-error TODO: Remove this once TestHelper (https://github.com/Expensify/App/issues/25318) is migrated to TypeScript.
-            fetch.pause();
+            mockFetch?.pause?.();
             IOU.requestMoney({reportID: ''}, amount, CONST.CURRENCY.USD, '', '', RORY_EMAIL, RORY_ACCOUNT_ID, {login: CARLOS_EMAIL, accountID: CARLOS_ACCOUNT_ID}, comment, {});
             return (
                 waitForBatchedUpdates()
                     .then(
                         () =>
                             new Promise<void>((resolve) => {
-                                const connectionID = Onyx.connect({
+                                const connection = Onyx.connect({
                                     key: ONYXKEYS.COLLECTION.REPORT,
                                     waitForCollectionCallback: true,
                                     callback: (allReports) => {
-                                        Onyx.disconnect(connectionID);
+                                        Onyx.disconnect(connection);
 
                                         // A chat report, transaction thread and an iou report should be created
                                         const chatReports = Object.values(allReports ?? {}).filter((report) => report?.type === CONST.REPORT.TYPE.CHAT);
@@ -641,7 +643,7 @@ describe('actions/IOU', () => {
                                         expect(iouReport?.notificationPreference).toBe(CONST.REPORT.NOTIFICATION_PREFERENCE.HIDDEN);
 
                                         // They should be linked together
-                                        expect(chatReport?.participantAccountIDs).toEqual([CARLOS_ACCOUNT_ID]);
+                                        expect(chatReport?.participants).toEqual({[RORY_ACCOUNT_ID]: RORY_PARTICIPANT, [CARLOS_ACCOUNT_ID]: CARLOS_PARTICIPANT});
                                         expect(chatReport?.iouReportID).toBe(iouReport?.reportID);
 
                                         resolve();
@@ -652,11 +654,11 @@ describe('actions/IOU', () => {
                     .then(
                         () =>
                             new Promise<void>((resolve) => {
-                                const connectionID = Onyx.connect({
+                                const connection = Onyx.connect({
                                     key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${iouReportID}`,
                                     waitForCollectionCallback: false,
                                     callback: (reportActionsForIOUReport) => {
-                                        Onyx.disconnect(connectionID);
+                                        Onyx.disconnect(connection);
 
                                         // The chat report should have a CREATED action and IOU action
                                         expect(Object.values(reportActionsForIOUReport ?? {}).length).toBe(2);
@@ -664,27 +666,29 @@ describe('actions/IOU', () => {
                                             Object.values(reportActionsForIOUReport ?? {}).filter((reportAction) => reportAction?.actionName === CONST.REPORT.ACTIONS.TYPE.CREATED) ?? null;
                                         const iouActions =
                                             Object.values(reportActionsForIOUReport ?? {}).filter(
-                                                (reportAction): reportAction is ReportActionBase & OriginalMessageIOU => reportAction?.actionName === CONST.REPORT.ACTIONS.TYPE.IOU,
+                                                (reportAction): reportAction is OnyxTypes.ReportAction<typeof CONST.REPORT.ACTIONS.TYPE.IOU> =>
+                                                    ReportActionsUtils.isMoneyRequestAction(reportAction),
                                             ) ?? null;
                                         expect(Object.values(createdActions).length).toBe(1);
                                         expect(Object.values(iouActions).length).toBe(1);
                                         createdAction = createdActions[0];
                                         iouAction = iouActions[0];
+                                        const originalMessage = ReportActionsUtils.getOriginalMessage(iouAction);
 
                                         // The CREATED action should not be created after the IOU action
                                         expect(Date.parse(createdAction?.created ?? '')).toBeLessThan(Date.parse(iouAction?.created ?? {}));
 
                                         // The IOUReportID should be correct
-                                        expect(iouAction.originalMessage.IOUReportID).toBe(iouReportID);
+                                        expect(originalMessage?.IOUReportID).toBe(iouReportID);
 
                                         // The comment should be included in the IOU action
-                                        expect(iouAction.originalMessage.comment).toBe(comment);
+                                        expect(originalMessage?.comment).toBe(comment);
 
                                         // The amount in the IOU action should be correct
-                                        expect(iouAction.originalMessage.amount).toBe(amount);
+                                        expect(originalMessage?.amount).toBe(amount);
 
                                         // The type should be correct
-                                        expect(iouAction.originalMessage.type).toBe(CONST.IOU.REPORT_ACTION_TYPE.CREATE);
+                                        expect(originalMessage?.type).toBe(CONST.IOU.REPORT_ACTION_TYPE.CREATE);
 
                                         // Both actions should be pending
                                         expect(createdAction?.pendingAction).toBe(CONST.RED_BRICK_ROAD_PENDING_ACTION.ADD);
@@ -698,25 +702,25 @@ describe('actions/IOU', () => {
                     .then(
                         () =>
                             new Promise<void>((resolve) => {
-                                const connectionID = Onyx.connect({
+                                const connection = Onyx.connect({
                                     key: ONYXKEYS.COLLECTION.TRANSACTION,
                                     waitForCollectionCallback: true,
                                     callback: (allTransactions) => {
-                                        Onyx.disconnect(connectionID);
+                                        Onyx.disconnect(connection);
 
                                         // There should be one transaction
                                         expect(Object.values(allTransactions ?? {}).length).toBe(1);
                                         const transaction = Object.values(allTransactions ?? {}).find((t) => !isEmptyObject(t));
-                                        transactionID = transaction?.transactionID ?? '';
+                                        transactionID = transaction?.transactionID ?? '-1';
 
                                         expect(transaction?.reportID).toBe(iouReportID);
                                         expect(transaction?.amount).toBe(amount);
-                                        expect(transaction?.comment.comment).toBe(comment);
+                                        expect(transaction?.comment?.comment).toBe(comment);
                                         expect(transaction?.merchant).toBe(CONST.TRANSACTION.PARTIAL_TRANSACTION_MERCHANT);
                                         expect(transaction?.pendingAction).toBe(CONST.RED_BRICK_ROAD_PENDING_ACTION.ADD);
 
                                         // The transactionID on the iou action should match the one from the transactions collection
-                                        expect((iouAction?.originalMessage as IOUMessage)?.IOUTransactionID).toBe(transactionID);
+                                        expect(iouAction && ReportActionsUtils.getOriginalMessage(iouAction)?.IOUTransactionID).toBe(transactionID);
 
                                         resolve();
                                     },
@@ -724,21 +728,22 @@ describe('actions/IOU', () => {
                             }),
                     )
                     .then((): Promise<unknown> => {
-                        // @ts-expect-error TODO: Remove this once TestHelper (https://github.com/Expensify/App/issues/25318) is migrated to TypeScript.
-                        fetch.fail();
-                        // @ts-expect-error TODO: Remove this once TestHelper (https://github.com/Expensify/App/issues/25318) is migrated to TypeScript.
-                        return fetch.resume() as Promise<unknown>;
+                        mockFetch?.fail?.();
+                        return mockFetch?.resume?.() as Promise<unknown>;
                     })
                     .then(
                         () =>
                             new Promise<void>((resolve) => {
-                                const connectionID = Onyx.connect({
+                                const connection = Onyx.connect({
                                     key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${iouReportID}`,
                                     waitForCollectionCallback: false,
                                     callback: (reportActionsForIOUReport) => {
-                                        Onyx.disconnect(connectionID);
+                                        Onyx.disconnect(connection);
                                         expect(Object.values(reportActionsForIOUReport ?? {}).length).toBe(2);
-                                        iouAction = Object.values(reportActionsForIOUReport ?? {}).find((reportAction) => reportAction?.actionName === CONST.REPORT.ACTIONS.TYPE.IOU) ?? null;
+                                        iouAction = Object.values(reportActionsForIOUReport ?? {}).find(
+                                            (reportAction): reportAction is OnyxTypes.ReportAction<typeof CONST.REPORT.ACTIONS.TYPE.IOU> =>
+                                                ReportActionsUtils.isMoneyRequestAction(reportAction),
+                                        );
                                         expect(iouAction?.pendingAction).toBe(CONST.RED_BRICK_ROAD_PENDING_ACTION.ADD);
                                         resolve();
                                     },
@@ -748,16 +753,15 @@ describe('actions/IOU', () => {
                     .then(
                         () =>
                             new Promise<void>((resolve) => {
-                                const connectionID = Onyx.connect({
+                                const connection = Onyx.connect({
                                     key: ONYXKEYS.COLLECTION.REPORT_ACTIONS,
                                     waitForCollectionCallback: true,
                                     callback: (reportActionsForTransactionThread) => {
-                                        Onyx.disconnect(connectionID);
+                                        Onyx.disconnect(connection);
                                         expect(Object.values(reportActionsForTransactionThread ?? {}).length).toBe(3);
-                                        transactionThreadAction =
-                                            Object.values(reportActionsForTransactionThread?.[`${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${transactionThreadReport?.reportID}`] ?? {}).find(
-                                                (reportAction) => reportAction.actionName === CONST.REPORT.ACTIONS.TYPE.CREATED,
-                                            ) ?? null;
+                                        transactionThreadAction = Object.values(
+                                            reportActionsForTransactionThread?.[`${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${transactionThreadReport?.reportID}`] ?? {},
+                                        ).find((reportAction) => reportAction.actionName === CONST.REPORT.ACTIONS.TYPE.CREATED);
                                         expect(transactionThreadAction?.pendingAction).toBe(CONST.RED_BRICK_ROAD_PENDING_ACTION.ADD);
                                         resolve();
                                     },
@@ -767,14 +771,14 @@ describe('actions/IOU', () => {
                     .then(
                         () =>
                             new Promise<void>((resolve) => {
-                                const connectionID = Onyx.connect({
+                                const connection = Onyx.connect({
                                     key: `${ONYXKEYS.COLLECTION.TRANSACTION}${transactionID}`,
                                     waitForCollectionCallback: false,
                                     callback: (transaction) => {
-                                        Onyx.disconnect(connectionID);
-                                        expect(transaction?.pendingAction).toBeFalsy();
+                                        Onyx.disconnect(connection);
+                                        expect(transaction?.pendingAction).toBe(CONST.RED_BRICK_ROAD_PENDING_ACTION.ADD);
                                         expect(transaction?.errors).toBeTruthy();
-                                        expect(Object.values(transaction?.errors ?? {})[0]).toEqual(expect.arrayContaining(['iou.error.genericCreateFailureMessage', {isTranslated: false}]));
+                                        expect(Object.values(transaction?.errors ?? {})[0]).toEqual(Localize.translateLocal('iou.error.genericCreateFailureMessage'));
                                         resolve();
                                     },
                                 });
@@ -785,7 +789,7 @@ describe('actions/IOU', () => {
                     .then(
                         () =>
                             new Promise<void>((resolve) => {
-                                ReportActions.clearAllRelatedReportActionErrors(iouReportID ?? '', iouAction);
+                                ReportActions.clearAllRelatedReportActionErrors(iouReportID ?? '-1', iouAction ?? null);
                                 resolve();
                             }),
                     )
@@ -794,12 +798,15 @@ describe('actions/IOU', () => {
                     .then(
                         () =>
                             new Promise<void>((resolve) => {
-                                const connectionID = Onyx.connect({
+                                const connection = Onyx.connect({
                                     key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${chatReportID}`,
                                     waitForCollectionCallback: false,
                                     callback: (reportActionsForReport) => {
-                                        Onyx.disconnect(connectionID);
-                                        iouAction = Object.values(reportActionsForReport ?? {}).find((reportAction) => reportAction?.actionName === CONST.REPORT.ACTIONS.TYPE.IOU) ?? null;
+                                        Onyx.disconnect(connection);
+                                        iouAction = Object.values(reportActionsForReport ?? {}).find(
+                                            (reportAction): reportAction is OnyxTypes.ReportAction<typeof CONST.REPORT.ACTIONS.TYPE.IOU> =>
+                                                ReportActionsUtils.isMoneyRequestAction(reportAction),
+                                        );
                                         expect(iouAction).toBeFalsy();
                                         resolve();
                                     },
@@ -811,12 +818,15 @@ describe('actions/IOU', () => {
                     .then(
                         () =>
                             new Promise<void>((resolve) => {
-                                const connectionID = Onyx.connect({
+                                const connection = Onyx.connect({
                                     key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${iouReportID}`,
                                     waitForCollectionCallback: false,
                                     callback: (reportActionsForReport) => {
-                                        Onyx.disconnect(connectionID);
-                                        iouAction = Object.values(reportActionsForReport ?? {}).find((reportAction) => reportAction?.actionName === CONST.REPORT.ACTIONS.TYPE.IOU) ?? null;
+                                        Onyx.disconnect(connection);
+                                        iouAction = Object.values(reportActionsForReport ?? {}).find(
+                                            (reportAction): reportAction is OnyxTypes.ReportAction<typeof CONST.REPORT.ACTIONS.TYPE.IOU> =>
+                                                ReportActionsUtils.isMoneyRequestAction(reportAction),
+                                        );
                                         expect(iouAction).toBeFalsy();
                                         resolve();
                                     },
@@ -828,11 +838,11 @@ describe('actions/IOU', () => {
                     .then(
                         () =>
                             new Promise<void>((resolve) => {
-                                const connectionID = Onyx.connect({
+                                const connection = Onyx.connect({
                                     key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${transactionThreadReport?.reportID}`,
                                     waitForCollectionCallback: false,
                                     callback: (reportActionsForReport) => {
-                                        Onyx.disconnect(connectionID);
+                                        Onyx.disconnect(connection);
                                         expect(reportActionsForReport).toMatchObject({});
                                         resolve();
                                     },
@@ -844,11 +854,11 @@ describe('actions/IOU', () => {
                     .then(
                         () =>
                             new Promise<void>((resolve) => {
-                                const connectionID = Onyx.connect({
+                                const connection = Onyx.connect({
                                     key: `${ONYXKEYS.COLLECTION.TRANSACTION}${transactionID}`,
                                     waitForCollectionCallback: false,
                                     callback: (transaction) => {
-                                        Onyx.disconnect(connectionID);
+                                        Onyx.disconnect(connection);
                                         expect(transaction).toBeFalsy();
                                         resolve();
                                     },
@@ -860,8 +870,8 @@ describe('actions/IOU', () => {
                     .then(
                         () =>
                             new Promise<void>((resolve) => {
-                                Report.deleteReport(chatReportID ?? '');
-                                Report.deleteReport(transactionThreadReport?.reportID ?? '');
+                                Report.deleteReport(chatReportID ?? '-1');
+                                Report.deleteReport(transactionThreadReport?.reportID ?? '-1');
                                 resolve();
                             }),
                     )
@@ -870,11 +880,11 @@ describe('actions/IOU', () => {
                     .then(
                         () =>
                             new Promise<void>((resolve) => {
-                                const connectionID = Onyx.connect({
+                                const connection = Onyx.connect({
                                     key: ONYXKEYS.COLLECTION.REPORT,
                                     waitForCollectionCallback: true,
                                     callback: (allReports) => {
-                                        Onyx.disconnect(connectionID);
+                                        Onyx.disconnect(connection);
                                         Object.values(allReports ?? {}).forEach((report) => expect(report).toBeFalsy());
                                         resolve();
                                     },
@@ -886,11 +896,11 @@ describe('actions/IOU', () => {
                     .then(
                         () =>
                             new Promise<void>((resolve) => {
-                                const connectionID = Onyx.connect({
+                                const connection = Onyx.connect({
                                     key: ONYXKEYS.COLLECTION.REPORT_ACTIONS,
                                     waitForCollectionCallback: false,
                                     callback: (allReportActions) => {
-                                        Onyx.disconnect(connectionID);
+                                        Onyx.disconnect(connection);
                                         Object.values(allReportActions ?? {}).forEach((reportAction) => expect(reportAction).toBeFalsy());
                                         resolve();
                                     },
@@ -902,11 +912,11 @@ describe('actions/IOU', () => {
                     .then(
                         () =>
                             new Promise<void>((resolve) => {
-                                const connectionID = Onyx.connect({
+                                const connection = Onyx.connect({
                                     key: ONYXKEYS.COLLECTION.TRANSACTION,
                                     waitForCollectionCallback: true,
                                     callback: (allTransactions) => {
-                                        Onyx.disconnect(connectionID);
+                                        Onyx.disconnect(connection);
                                         Object.values(allTransactions ?? {}).forEach((transaction) => expect(transaction).toBeFalsy());
                                         resolve();
                                     },
@@ -915,8 +925,7 @@ describe('actions/IOU', () => {
                     )
 
                     // Cleanup
-                    // @ts-expect-error TODO: Remove this once TestHelper (https://github.com/Expensify/App/issues/25318) is migrated to TypeScript.
-                    .then(fetch.succeed)
+                    .then(mockFetch?.succeed)
             );
         });
     });
@@ -937,7 +946,7 @@ describe('actions/IOU', () => {
             let carlosChatReport: OnyxEntry<OnyxTypes.Report> = {
                 reportID: NumberUtils.rand64(),
                 type: CONST.REPORT.TYPE.CHAT,
-                participantAccountIDs: [CARLOS_ACCOUNT_ID],
+                participants: {[RORY_ACCOUNT_ID]: RORY_PARTICIPANT, [CARLOS_ACCOUNT_ID]: CARLOS_PARTICIPANT},
             };
             const carlosCreatedAction: OnyxEntry<OnyxTypes.ReportAction> = {
                 reportActionID: NumberUtils.rand64(),
@@ -950,7 +959,7 @@ describe('actions/IOU', () => {
                 reportID: NumberUtils.rand64(),
                 type: CONST.REPORT.TYPE.CHAT,
                 iouReportID: julesIOUReportID,
-                participantAccountIDs: [JULES_ACCOUNT_ID],
+                participants: {[RORY_ACCOUNT_ID]: RORY_PARTICIPANT, [JULES_ACCOUNT_ID]: JULES_PARTICIPANT},
             };
             const julesChatCreatedAction: OnyxEntry<OnyxTypes.ReportAction> = {
                 reportActionID: NumberUtils.rand64(),
@@ -1002,23 +1011,23 @@ describe('actions/IOU', () => {
             };
 
             let carlosIOUReport: OnyxEntry<OnyxTypes.Report>;
-            let carlosIOUAction: OnyxEntry<OnyxTypes.ReportAction>;
+            let carlosIOUAction: OnyxEntry<OnyxTypes.ReportAction<typeof CONST.REPORT.ACTIONS.TYPE.IOU>>;
             let carlosIOUCreatedAction: OnyxEntry<OnyxTypes.ReportAction>;
             let carlosTransaction: OnyxEntry<OnyxTypes.Transaction>;
 
-            let julesIOUAction: OnyxEntry<OnyxTypes.ReportAction>;
+            let julesIOUAction: OnyxEntry<OnyxTypes.ReportAction<typeof CONST.REPORT.ACTIONS.TYPE.IOU>>;
             let julesIOUCreatedAction: OnyxEntry<OnyxTypes.ReportAction>;
             let julesTransaction: OnyxEntry<OnyxTypes.Transaction>;
 
             let vitChatReport: OnyxEntry<OnyxTypes.Report>;
             let vitIOUReport: OnyxEntry<OnyxTypes.Report>;
             let vitCreatedAction: OnyxEntry<OnyxTypes.ReportAction>;
-            let vitIOUAction: OnyxEntry<OnyxTypes.ReportAction>;
+            let vitIOUAction: OnyxEntry<OnyxTypes.ReportAction<typeof CONST.REPORT.ACTIONS.TYPE.IOU>>;
             let vitTransaction: OnyxEntry<OnyxTypes.Transaction>;
 
             let groupChat: OnyxEntry<OnyxTypes.Report>;
             let groupCreatedAction: OnyxEntry<OnyxTypes.ReportAction>;
-            let groupIOUAction: OnyxEntry<OnyxTypes.ReportAction>;
+            let groupIOUAction: OnyxEntry<OnyxTypes.ReportAction<typeof CONST.REPORT.ACTIONS.TYPE.IOU>>;
             let groupTransaction: OnyxEntry<OnyxTypes.Transaction>;
 
             const reportCollectionDataSet = toCollectionDataSet(ONYXKEYS.COLLECTION.REPORT, [carlosChatReport, julesChatReport, julesIOUReport], (item) => item.reportID);
@@ -1030,7 +1039,7 @@ describe('actions/IOU', () => {
                         [carlosCreatedAction.reportActionID]: carlosCreatedAction,
                     },
                 ],
-                (item) => item[carlosCreatedAction.reportActionID].reportID ?? '',
+                (item) => item[carlosCreatedAction.reportActionID].reportID ?? '-1',
             );
 
             const julesActionsCollectionDataSet = toCollectionDataSet(
@@ -1041,7 +1050,7 @@ describe('actions/IOU', () => {
                         [julesExistingIOUAction.reportActionID]: julesExistingIOUAction,
                     },
                 ],
-                (item) => item[julesCreatedAction.reportActionID].reportID ?? '',
+                (item) => item[julesCreatedAction.reportActionID].reportID ?? '-1',
             );
 
             const julesCreatedActionsCollectionDataSet = toCollectionDataSet(
@@ -1051,352 +1060,349 @@ describe('actions/IOU', () => {
                         [julesChatCreatedAction.reportActionID]: julesChatCreatedAction,
                     },
                 ],
-                (item) => item[julesChatCreatedAction.reportActionID].reportID ?? '',
+                (item) => item[julesChatCreatedAction.reportActionID].reportID ?? '-1',
             );
 
-            return (
-                Onyx.mergeCollection(ONYXKEYS.COLLECTION.REPORT, {
-                    ...reportCollectionDataSet,
+            return Onyx.mergeCollection(ONYXKEYS.COLLECTION.REPORT, {
+                ...reportCollectionDataSet,
+            })
+                .then(() =>
+                    Onyx.mergeCollection(ONYXKEYS.COLLECTION.REPORT_ACTIONS, {
+                        ...carlosActionsCollectionDataSet,
+                        ...julesCreatedActionsCollectionDataSet,
+                        ...julesActionsCollectionDataSet,
+                    }),
+                )
+                .then(() => Onyx.set(`${ONYXKEYS.COLLECTION.TRANSACTION}${julesExistingTransaction?.transactionID}`, julesExistingTransaction))
+                .then(() => {
+                    // When we split a bill offline
+                    mockFetch?.pause?.();
+                    IOU.splitBill(
+                        // TODO: Migrate after the backend accepts accountIDs
+                        {
+                            participants: [
+                                [CARLOS_EMAIL, String(CARLOS_ACCOUNT_ID)],
+                                [JULES_EMAIL, String(JULES_ACCOUNT_ID)],
+                                [VIT_EMAIL, String(VIT_ACCOUNT_ID)],
+                            ].map(([email, accountID]) => ({login: email, accountID: Number(accountID)})),
+                            currentUserLogin: RORY_EMAIL,
+                            currentUserAccountID: RORY_ACCOUNT_ID,
+                            amount,
+                            comment,
+                            currency: CONST.CURRENCY.USD,
+                            merchant,
+                            created: '',
+                            tag: '',
+                            existingSplitChatReportID: '',
+                        },
+                    );
+                    return waitForBatchedUpdates();
                 })
-                    .then(() =>
-                        Onyx.mergeCollection(ONYXKEYS.COLLECTION.REPORT_ACTIONS, {
-                            ...carlosActionsCollectionDataSet,
-                            ...julesCreatedActionsCollectionDataSet,
-                            ...julesActionsCollectionDataSet,
-                        }),
-                    )
-                    .then(() => Onyx.set(`${ONYXKEYS.COLLECTION.TRANSACTION}${julesExistingTransaction?.transactionID}`, julesExistingTransaction))
-                    .then(() => {
-                        // When we split a bill offline
-                        // @ts-expect-error TODO: Remove this once TestHelper (https://github.com/Expensify/App/issues/25318) is migrated to TypeScript.
-                        fetch.pause();
-                        IOU.splitBill(
-                            // TODO: Migrate after the backend accepts accountIDs
-                            {
-                                participants: [
-                                    [CARLOS_EMAIL, String(CARLOS_ACCOUNT_ID)],
-                                    [JULES_EMAIL, String(JULES_ACCOUNT_ID)],
-                                    [VIT_EMAIL, String(VIT_ACCOUNT_ID)],
-                                ].map(([email, accountID]) => ({login: email, accountID: Number(accountID)})),
-                                currentUserLogin: RORY_EMAIL,
-                                currentUserAccountID: RORY_ACCOUNT_ID,
-                                amount,
-                                comment,
-                                currency: CONST.CURRENCY.USD,
-                                merchant,
-                                created: '',
-                                tag: '',
-                                existingSplitChatReportID: '',
-                            },
-                        );
-                        return waitForBatchedUpdates();
-                    })
-                    .then(
-                        () =>
-                            new Promise<void>((resolve) => {
-                                const connectionID = Onyx.connect({
-                                    key: ONYXKEYS.COLLECTION.REPORT,
-                                    waitForCollectionCallback: true,
-                                    callback: (allReports) => {
-                                        Onyx.disconnect(connectionID);
-
-                                        // There should now be 10 reports
-                                        expect(Object.values(allReports ?? {}).length).toBe(10);
-
-                                        // 1. The chat report with Rory + Carlos
-                                        carlosChatReport = Object.values(allReports ?? {}).find((report) => report?.reportID === carlosChatReport?.reportID) ?? null;
-                                        expect(isEmptyObject(carlosChatReport)).toBe(false);
-                                        expect(carlosChatReport?.pendingFields).toBeFalsy();
-
-                                        // 2. The IOU report with Rory + Carlos (new)
-                                        carlosIOUReport =
-                                            Object.values(allReports ?? {}).find((report) => report?.type === CONST.REPORT.TYPE.IOU && report.managerID === CARLOS_ACCOUNT_ID) ?? null;
-                                        expect(isEmptyObject(carlosIOUReport)).toBe(false);
-                                        expect(carlosIOUReport?.total).toBe(amount / 4);
-
-                                        // 3. The chat report with Rory + Jules
-                                        julesChatReport = Object.values(allReports ?? {}).find((report) => report?.reportID === julesChatReport?.reportID) ?? null;
-                                        expect(isEmptyObject(julesChatReport)).toBe(false);
-                                        expect(julesChatReport?.pendingFields).toBeFalsy();
-
-                                        // 4. The IOU report with Rory + Jules
-                                        julesIOUReport = Object.values(allReports ?? {}).find((report) => report?.reportID === julesIOUReport?.reportID) ?? null;
-                                        expect(isEmptyObject(julesIOUReport)).toBe(false);
-                                        expect(julesChatReport?.pendingFields).toBeFalsy();
-                                        expect(julesIOUReport?.total).toBe((julesExistingTransaction?.amount ?? 0) + amount / 4);
-
-                                        // 5. The chat report with Rory + Vit (new)
-                                        vitChatReport =
-                                            Object.values(allReports ?? {}).find(
-                                                (report) => report?.type === CONST.REPORT.TYPE.CHAT && isEqual(report.participantAccountIDs, [VIT_ACCOUNT_ID]),
-                                            ) ?? null;
-                                        expect(isEmptyObject(vitChatReport)).toBe(false);
-                                        expect(vitChatReport?.pendingFields).toStrictEqual({createChat: CONST.RED_BRICK_ROAD_PENDING_ACTION.ADD});
-
-                                        // 6. The IOU report with Rory + Vit (new)
-                                        vitIOUReport =
-                                            Object.values(allReports ?? {}).find((report) => report?.type === CONST.REPORT.TYPE.IOU && report.managerID === VIT_ACCOUNT_ID) ?? null;
-                                        expect(isEmptyObject(vitIOUReport)).toBe(false);
-                                        expect(vitIOUReport?.total).toBe(amount / 4);
-
-                                        // 7. The group chat with everyone
-                                        groupChat =
-                                            Object.values(allReports ?? {}).find(
-                                                (report) =>
-                                                    report?.type === CONST.REPORT.TYPE.CHAT &&
-                                                    isEqual(report.participantAccountIDs, [CARLOS_ACCOUNT_ID, JULES_ACCOUNT_ID, VIT_ACCOUNT_ID, RORY_ACCOUNT_ID]),
-                                            ) ?? null;
-                                        expect(isEmptyObject(groupChat)).toBe(false);
-                                        expect(groupChat?.pendingFields).toStrictEqual({createChat: CONST.RED_BRICK_ROAD_PENDING_ACTION.ADD});
-
-                                        // The 1:1 chat reports and the IOU reports should be linked together
-                                        expect(carlosChatReport?.iouReportID).toBe(carlosIOUReport?.reportID);
-                                        expect(carlosIOUReport?.chatReportID).toBe(carlosChatReport?.reportID);
-                                        expect(carlosIOUReport?.notificationPreference).toBe(CONST.REPORT.NOTIFICATION_PREFERENCE.HIDDEN);
-
-                                        expect(julesChatReport?.iouReportID).toBe(julesIOUReport?.reportID);
-                                        expect(julesIOUReport?.chatReportID).toBe(julesChatReport?.reportID);
-
-                                        expect(vitChatReport?.iouReportID).toBe(vitIOUReport?.reportID);
-                                        expect(vitIOUReport?.chatReportID).toBe(vitChatReport?.reportID);
-                                        expect(carlosIOUReport?.notificationPreference).toBe(CONST.REPORT.NOTIFICATION_PREFERENCE.HIDDEN);
-
-                                        resolve();
-                                    },
-                                });
-                            }),
-                    )
-                    .then(
-                        () =>
-                            new Promise<void>((resolve) => {
-                                const connectionID = Onyx.connect({
-                                    key: ONYXKEYS.COLLECTION.REPORT_ACTIONS,
-                                    waitForCollectionCallback: true,
-                                    callback: (allReportActions) => {
-                                        Onyx.disconnect(connectionID);
-
-                                        // There should be reportActions on all 7 chat reports + 3 IOU reports in each 1:1 chat
-                                        expect(Object.values(allReportActions ?? {}).length).toBe(10);
-
-                                        const carlosReportActions = allReportActions?.[`${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${carlosChatReport?.iouReportID}`];
-                                        const julesReportActions = allReportActions?.[`${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${julesChatReport?.iouReportID}`];
-                                        const vitReportActions = allReportActions?.[`${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${vitChatReport?.iouReportID}`];
-                                        const groupReportActions = allReportActions?.[`${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${groupChat?.reportID}`];
-
-                                        // Carlos DM should have two reportActions – the existing CREATED action and a pending IOU action
-                                        expect(Object.values(carlosReportActions ?? {}).length).toBe(2);
-                                        carlosIOUCreatedAction =
-                                            Object.values(carlosReportActions ?? {}).find(
-                                                (reportAction): reportAction is ReportActionBase & OriginalMessageIOU => reportAction.actionName === CONST.REPORT.ACTIONS.TYPE.CREATED,
-                                            ) ?? null;
-                                        carlosIOUAction =
-                                            Object.values(carlosReportActions ?? {}).find(
-                                                (reportAction): reportAction is ReportActionBase & OriginalMessageIOU => reportAction.actionName === CONST.REPORT.ACTIONS.TYPE.IOU,
-                                            ) ?? null;
-                                        expect(carlosIOUAction?.pendingAction).toBe(CONST.RED_BRICK_ROAD_PENDING_ACTION.ADD);
-                                        expect(carlosIOUAction?.originalMessage.IOUReportID).toBe(carlosIOUReport?.reportID);
-                                        expect(carlosIOUAction?.originalMessage.amount).toBe(amount / 4);
-                                        expect(carlosIOUAction?.originalMessage.comment).toBe(comment);
-                                        expect(carlosIOUAction?.originalMessage.type).toBe(CONST.IOU.REPORT_ACTION_TYPE.CREATE);
-                                        expect(Date.parse(carlosIOUCreatedAction?.created ?? '')).toBeLessThan(Date.parse(carlosIOUAction?.created ?? ''));
-
-                                        // Jules DM should have three reportActions, the existing CREATED action, the existing IOU action, and a new pending IOU action
-                                        expect(Object.values(julesReportActions ?? {}).length).toBe(3);
-                                        expect(julesReportActions?.[julesCreatedAction.reportActionID]).toStrictEqual(julesCreatedAction);
-                                        julesIOUCreatedAction =
-                                            Object.values(julesReportActions ?? {}).find(
-                                                (reportAction): reportAction is ReportActionBase & OriginalMessageIOU => reportAction.actionName === CONST.REPORT.ACTIONS.TYPE.CREATED,
-                                            ) ?? null;
-                                        julesIOUAction =
-                                            Object.values(julesReportActions ?? {}).find(
-                                                (reportAction): reportAction is ReportActionBase & OriginalMessageIOU =>
-                                                    reportAction.reportActionID !== julesCreatedAction.reportActionID &&
-                                                    reportAction.reportActionID !== julesExistingIOUAction.reportActionID,
-                                            ) ?? null;
-                                        expect(julesIOUAction?.pendingAction).toBe(CONST.RED_BRICK_ROAD_PENDING_ACTION.ADD);
-                                        expect(julesIOUAction?.originalMessage.IOUReportID).toBe(julesIOUReport?.reportID);
-                                        expect(julesIOUAction?.originalMessage.amount).toBe(amount / 4);
-                                        expect(julesIOUAction?.originalMessage.comment).toBe(comment);
-                                        expect(julesIOUAction?.originalMessage.type).toBe(CONST.IOU.REPORT_ACTION_TYPE.CREATE);
-                                        expect(Date.parse(julesIOUCreatedAction?.created ?? '')).toBeLessThan(Date.parse(julesIOUAction?.created ?? ''));
-
-                                        // Vit DM should have two reportActions – a pending CREATED action and a pending IOU action
-                                        expect(Object.values(vitReportActions ?? {}).length).toBe(2);
-                                        vitCreatedAction =
-                                            Object.values(vitReportActions ?? {}).find(
-                                                (reportAction): reportAction is ReportActionBase & OriginalMessageIOU => reportAction.actionName === CONST.REPORT.ACTIONS.TYPE.CREATED,
-                                            ) ?? null;
-                                        vitIOUAction =
-                                            Object.values(vitReportActions ?? {}).find(
-                                                (reportAction): reportAction is ReportActionBase & OriginalMessageIOU => reportAction.actionName === CONST.REPORT.ACTIONS.TYPE.IOU,
-                                            ) ?? null;
-                                        expect(vitCreatedAction?.pendingAction).toBe(CONST.RED_BRICK_ROAD_PENDING_ACTION.ADD);
-                                        expect(vitIOUAction?.pendingAction).toBe(CONST.RED_BRICK_ROAD_PENDING_ACTION.ADD);
-                                        expect(vitIOUAction?.originalMessage.IOUReportID).toBe(vitIOUReport?.reportID);
-                                        expect(vitIOUAction?.originalMessage.amount).toBe(amount / 4);
-                                        expect(vitIOUAction?.originalMessage.comment).toBe(comment);
-                                        expect(vitIOUAction?.originalMessage.type).toBe(CONST.IOU.REPORT_ACTION_TYPE.CREATE);
-                                        expect(Date.parse(vitCreatedAction?.created ?? '')).toBeLessThan(Date.parse(vitIOUAction?.created ?? ''));
-
-                                        // Group chat should have two reportActions – a pending CREATED action and a pending IOU action w/ type SPLIT
-                                        expect(Object.values(groupReportActions ?? {}).length).toBe(2);
-                                        groupCreatedAction =
-                                            Object.values(groupReportActions ?? {}).find((reportAction) => reportAction.actionName === CONST.REPORT.ACTIONS.TYPE.CREATED) ?? null;
-                                        groupIOUAction =
-                                            Object.values(groupReportActions ?? {}).find(
-                                                (reportAction): reportAction is ReportActionBase & OriginalMessageIOU => reportAction.actionName === CONST.REPORT.ACTIONS.TYPE.IOU,
-                                            ) ?? null;
-                                        expect(groupCreatedAction?.pendingAction).toBe(CONST.RED_BRICK_ROAD_PENDING_ACTION.ADD);
-                                        expect(groupIOUAction?.pendingAction).toBe(CONST.RED_BRICK_ROAD_PENDING_ACTION.ADD);
-                                        expect(groupIOUAction?.originalMessage).not.toHaveProperty('IOUReportID');
-                                        expect(groupIOUAction?.originalMessage?.type).toBe(CONST.IOU.REPORT_ACTION_TYPE.SPLIT);
-                                        expect(Date.parse(groupCreatedAction?.created ?? '')).toBeLessThanOrEqual(Date.parse(groupIOUAction?.created ?? ''));
-
-                                        resolve();
-                                    },
-                                });
-                            }),
-                    )
-                    .then(
-                        () =>
-                            new Promise<void>((resolve) => {
-                                const connectionID = Onyx.connect({
-                                    key: ONYXKEYS.COLLECTION.TRANSACTION,
-                                    waitForCollectionCallback: true,
-                                    callback: (allTransactions) => {
-                                        Onyx.disconnect(connectionID);
-
-                                        /* There should be 5 transactions
-                                         *   – one existing one with Jules
-                                         *   - one for each of the three IOU reports
-                                         *   - one on the group chat w/ deleted report
-                                         */
-                                        expect(Object.values(allTransactions ?? {}).length).toBe(5);
-                                        expect(allTransactions?.[`${ONYXKEYS.COLLECTION.TRANSACTION}${julesExistingTransaction?.transactionID}`]).toBeTruthy();
-
-                                        carlosTransaction =
-                                            Object.values(allTransactions ?? {}).find(
-                                                (transaction) => transaction?.transactionID === (carlosIOUAction?.originalMessage as IOUMessage)?.IOUTransactionID,
-                                            ) ?? null;
-                                        julesTransaction =
-                                            Object.values(allTransactions ?? {}).find(
-                                                (transaction) => transaction?.transactionID === (julesIOUAction?.originalMessage as IOUMessage)?.IOUTransactionID,
-                                            ) ?? null;
-                                        vitTransaction =
-                                            Object.values(allTransactions ?? {}).find(
-                                                (transaction) => transaction?.transactionID === (vitIOUAction?.originalMessage as IOUMessage)?.IOUTransactionID,
-                                            ) ?? null;
-                                        groupTransaction = Object.values(allTransactions ?? {}).find((transaction) => transaction?.reportID === CONST.REPORT.SPLIT_REPORTID) ?? null;
-
-                                        expect(carlosTransaction?.reportID).toBe(carlosIOUReport?.reportID);
-                                        expect(julesTransaction?.reportID).toBe(julesIOUReport?.reportID);
-                                        expect(vitTransaction?.reportID).toBe(vitIOUReport?.reportID);
-                                        expect(groupTransaction).toBeTruthy();
-
-                                        expect(carlosTransaction?.amount).toBe(amount / 4);
-                                        expect(julesTransaction?.amount).toBe(amount / 4);
-                                        expect(vitTransaction?.amount).toBe(amount / 4);
-                                        expect(groupTransaction?.amount).toBe(amount);
-
-                                        expect(carlosTransaction?.comment.comment).toBe(comment);
-                                        expect(julesTransaction?.comment.comment).toBe(comment);
-                                        expect(vitTransaction?.comment.comment).toBe(comment);
-                                        expect(groupTransaction?.comment.comment).toBe(comment);
-
-                                        expect(carlosTransaction?.merchant).toBe(merchant);
-                                        expect(julesTransaction?.merchant).toBe(merchant);
-                                        expect(vitTransaction?.merchant).toBe(merchant);
-                                        expect(groupTransaction?.merchant).toBe(merchant);
+                .then(
+                    () =>
+                        new Promise<void>((resolve) => {
+                            const connection = Onyx.connect({
+                                key: ONYXKEYS.COLLECTION.REPORT,
+                                waitForCollectionCallback: true,
+                                callback: (allReports) => {
+                                    Onyx.disconnect(connection);
+
+                                    // There should now be 10 reports
+                                    expect(Object.values(allReports ?? {}).length).toBe(10);
+
+                                    // 1. The chat report with Rory + Carlos
+                                    carlosChatReport = Object.values(allReports ?? {}).find((report) => report?.reportID === carlosChatReport?.reportID);
+                                    expect(isEmptyObject(carlosChatReport)).toBe(false);
+                                    expect(carlosChatReport?.pendingFields).toBeFalsy();
+
+                                    // 2. The IOU report with Rory + Carlos (new)
+                                    carlosIOUReport = Object.values(allReports ?? {}).find((report) => report?.type === CONST.REPORT.TYPE.IOU && report.managerID === CARLOS_ACCOUNT_ID);
+                                    expect(isEmptyObject(carlosIOUReport)).toBe(false);
+                                    expect(carlosIOUReport?.total).toBe(amount / 4);
+
+                                    // 3. The chat report with Rory + Jules
+                                    julesChatReport = Object.values(allReports ?? {}).find((report) => report?.reportID === julesChatReport?.reportID);
+                                    expect(isEmptyObject(julesChatReport)).toBe(false);
+                                    expect(julesChatReport?.pendingFields).toBeFalsy();
+
+                                    // 4. The IOU report with Rory + Jules
+                                    julesIOUReport = Object.values(allReports ?? {}).find((report) => report?.reportID === julesIOUReport?.reportID);
+                                    expect(isEmptyObject(julesIOUReport)).toBe(false);
+                                    expect(julesChatReport?.pendingFields).toBeFalsy();
+                                    expect(julesIOUReport?.total).toBe((julesExistingTransaction?.amount ?? 0) + amount / 4);
+
+                                    // 5. The chat report with Rory + Vit (new)
+                                    vitChatReport = Object.values(allReports ?? {}).find(
+                                        (report) =>
+                                            report?.type === CONST.REPORT.TYPE.CHAT && isEqual(report.participants, {[RORY_ACCOUNT_ID]: RORY_PARTICIPANT, [VIT_ACCOUNT_ID]: VIT_PARTICIPANT}),
+                                    );
+                                    expect(isEmptyObject(vitChatReport)).toBe(false);
+                                    expect(vitChatReport?.pendingFields).toStrictEqual({createChat: CONST.RED_BRICK_ROAD_PENDING_ACTION.ADD});
+
+                                    // 6. The IOU report with Rory + Vit (new)
+                                    vitIOUReport = Object.values(allReports ?? {}).find((report) => report?.type === CONST.REPORT.TYPE.IOU && report.managerID === VIT_ACCOUNT_ID);
+                                    expect(isEmptyObject(vitIOUReport)).toBe(false);
+                                    expect(vitIOUReport?.total).toBe(amount / 4);
+
+                                    // 7. The group chat with everyone
+                                    groupChat = Object.values(allReports ?? {}).find(
+                                        (report) =>
+                                            report?.type === CONST.REPORT.TYPE.CHAT &&
+                                            isEqual(report.participants, {
+                                                [CARLOS_ACCOUNT_ID]: CARLOS_PARTICIPANT,
+                                                [JULES_ACCOUNT_ID]: JULES_PARTICIPANT,
+                                                [VIT_ACCOUNT_ID]: VIT_PARTICIPANT,
+                                                [RORY_ACCOUNT_ID]: RORY_PARTICIPANT,
+                                            }),
+                                    );
+                                    expect(isEmptyObject(groupChat)).toBe(false);
+                                    expect(groupChat?.pendingFields).toStrictEqual({createChat: CONST.RED_BRICK_ROAD_PENDING_ACTION.ADD});
 
-                                        expect(carlosTransaction?.comment.source).toBe(CONST.IOU.TYPE.SPLIT);
-                                        expect(julesTransaction?.comment.source).toBe(CONST.IOU.TYPE.SPLIT);
-                                        expect(vitTransaction?.comment.source).toBe(CONST.IOU.TYPE.SPLIT);
+                                    // The 1:1 chat reports and the IOU reports should be linked together
+                                    expect(carlosChatReport?.iouReportID).toBe(carlosIOUReport?.reportID);
+                                    expect(carlosIOUReport?.chatReportID).toBe(carlosChatReport?.reportID);
+                                    expect(carlosIOUReport?.notificationPreference).toBe(CONST.REPORT.NOTIFICATION_PREFERENCE.HIDDEN);
 
-                                        expect(carlosTransaction?.comment.originalTransactionID).toBe(groupTransaction?.transactionID);
-                                        expect(julesTransaction?.comment.originalTransactionID).toBe(groupTransaction?.transactionID);
-                                        expect(vitTransaction?.comment.originalTransactionID).toBe(groupTransaction?.transactionID);
+                                    expect(julesChatReport?.iouReportID).toBe(julesIOUReport?.reportID);
+                                    expect(julesIOUReport?.chatReportID).toBe(julesChatReport?.reportID);
 
-                                        expect(carlosTransaction?.pendingAction).toBe(CONST.RED_BRICK_ROAD_PENDING_ACTION.ADD);
-                                        expect(julesTransaction?.pendingAction).toBe(CONST.RED_BRICK_ROAD_PENDING_ACTION.ADD);
-                                        expect(vitTransaction?.pendingAction).toBe(CONST.RED_BRICK_ROAD_PENDING_ACTION.ADD);
-                                        expect(groupTransaction?.pendingAction).toBe(CONST.RED_BRICK_ROAD_PENDING_ACTION.ADD);
+                                    expect(vitChatReport?.iouReportID).toBe(vitIOUReport?.reportID);
+                                    expect(vitIOUReport?.chatReportID).toBe(vitChatReport?.reportID);
+                                    expect(carlosIOUReport?.notificationPreference).toBe(CONST.REPORT.NOTIFICATION_PREFERENCE.HIDDEN);
 
-                                        resolve();
-                                    },
-                                });
-                            }),
-                    )
-                    .then(
-                        () =>
-                            new Promise<void>((resolve) => {
-                                const connectionID = Onyx.connect({
-                                    key: ONYXKEYS.PERSONAL_DETAILS_LIST,
-                                    waitForCollectionCallback: false,
-                                    callback: (allPersonalDetails) => {
-                                        Onyx.disconnect(connectionID);
-                                        expect(allPersonalDetails).toMatchObject({
-                                            [VIT_ACCOUNT_ID]: {
-                                                accountID: VIT_ACCOUNT_ID,
-                                                displayName: VIT_EMAIL,
-                                                login: VIT_EMAIL,
-                                            },
-                                        });
-                                        resolve();
-                                    },
-                                });
-                            }),
-                    )
-                    // @ts-expect-error TODO: Remove this once TestHelper (https://github.com/Expensify/App/issues/25318) is migrated to TypeScript.
-                    .then(fetch.resume)
-                    .then(waitForNetworkPromises)
-                    .then(
-                        () =>
-                            new Promise<void>((resolve) => {
-                                const connectionID = Onyx.connect({
-                                    key: ONYXKEYS.COLLECTION.REPORT,
-                                    waitForCollectionCallback: true,
-                                    callback: (allReports) => {
-                                        Onyx.disconnect(connectionID);
-                                        Object.values(allReports ?? {}).forEach((report) => {
-                                            if (!report?.pendingFields) {
-                                                return;
-                                            }
-                                            Object.values(report?.pendingFields).forEach((pendingField) => expect(pendingField).toBeFalsy());
-                                        });
-                                        resolve();
-                                    },
-                                });
-                            }),
-                    )
-                    .then(
-                        () =>
-                            new Promise<void>((resolve) => {
-                                const connectionID = Onyx.connect({
-                                    key: ONYXKEYS.COLLECTION.REPORT_ACTIONS,
-                                    waitForCollectionCallback: true,
-                                    callback: (allReportActions) => {
-                                        Onyx.disconnect(connectionID);
-                                        Object.values(allReportActions ?? {}).forEach((reportAction) => expect(reportAction?.pendingAction).toBeFalsy());
-                                        resolve();
-                                    },
-                                });
-                            }),
-                    )
-                    .then(
-                        () =>
-                            new Promise<void>((resolve) => {
-                                const connectionID = Onyx.connect({
-                                    key: ONYXKEYS.COLLECTION.TRANSACTION,
-                                    waitForCollectionCallback: true,
-                                    callback: (allTransactions) => {
-                                        Onyx.disconnect(connectionID);
-                                        Object.values(allTransactions ?? {}).forEach((transaction) => expect(transaction?.pendingAction).toBeFalsy());
-                                        resolve();
-                                    },
-                                });
-                            }),
-                    )
-            );
+                                    resolve();
+                                },
+                            });
+                        }),
+                )
+                .then(
+                    () =>
+                        new Promise<void>((resolve) => {
+                            const connection = Onyx.connect({
+                                key: ONYXKEYS.COLLECTION.REPORT_ACTIONS,
+                                waitForCollectionCallback: true,
+                                callback: (allReportActions) => {
+                                    Onyx.disconnect(connection);
+
+                                    // There should be reportActions on all 7 chat reports + 3 IOU reports in each 1:1 chat
+                                    expect(Object.values(allReportActions ?? {}).length).toBe(10);
+
+                                    const carlosReportActions = allReportActions?.[`${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${carlosChatReport?.iouReportID}`];
+                                    const julesReportActions = allReportActions?.[`${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${julesChatReport?.iouReportID}`];
+                                    const vitReportActions = allReportActions?.[`${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${vitChatReport?.iouReportID}`];
+                                    const groupReportActions = allReportActions?.[`${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${groupChat?.reportID}`];
+
+                                    // Carlos DM should have two reportActions – the existing CREATED action and a pending IOU action
+                                    expect(Object.values(carlosReportActions ?? {}).length).toBe(2);
+                                    carlosIOUCreatedAction = Object.values(carlosReportActions ?? {}).find(
+                                        (reportAction): reportAction is OnyxTypes.ReportAction<typeof CONST.REPORT.ACTIONS.TYPE.IOU> =>
+                                            reportAction.actionName === CONST.REPORT.ACTIONS.TYPE.CREATED,
+                                    );
+                                    carlosIOUAction = Object.values(carlosReportActions ?? {}).find(
+                                        (reportAction): reportAction is OnyxTypes.ReportAction<typeof CONST.REPORT.ACTIONS.TYPE.IOU> => ReportActionsUtils.isMoneyRequestAction(reportAction),
+                                    );
+                                    const carlosOriginalMessage = carlosIOUAction ? ReportActionsUtils.getOriginalMessage(carlosIOUAction) : undefined;
+
+                                    expect(carlosIOUAction?.pendingAction).toBe(CONST.RED_BRICK_ROAD_PENDING_ACTION.ADD);
+                                    expect(carlosOriginalMessage?.IOUReportID).toBe(carlosIOUReport?.reportID);
+                                    expect(carlosOriginalMessage?.amount).toBe(amount / 4);
+                                    expect(carlosOriginalMessage?.comment).toBe(comment);
+                                    expect(carlosOriginalMessage?.type).toBe(CONST.IOU.REPORT_ACTION_TYPE.CREATE);
+                                    expect(Date.parse(carlosIOUCreatedAction?.created ?? '')).toBeLessThan(Date.parse(carlosIOUAction?.created ?? ''));
+
+                                    // Jules DM should have three reportActions, the existing CREATED action, the existing IOU action, and a new pending IOU action
+                                    expect(Object.values(julesReportActions ?? {}).length).toBe(3);
+                                    expect(julesReportActions?.[julesCreatedAction.reportActionID]).toStrictEqual(julesCreatedAction);
+                                    julesIOUCreatedAction = Object.values(julesReportActions ?? {}).find(
+                                        (reportAction): reportAction is OnyxTypes.ReportAction<typeof CONST.REPORT.ACTIONS.TYPE.IOU> =>
+                                            reportAction.actionName === CONST.REPORT.ACTIONS.TYPE.CREATED,
+                                    );
+                                    julesIOUAction = Object.values(julesReportActions ?? {}).find(
+                                        (reportAction): reportAction is OnyxTypes.ReportAction<typeof CONST.REPORT.ACTIONS.TYPE.IOU> =>
+                                            reportAction.reportActionID !== julesCreatedAction.reportActionID && reportAction.reportActionID !== julesExistingIOUAction.reportActionID,
+                                    );
+                                    const julesOriginalMessage = julesIOUAction ? ReportActionsUtils.getOriginalMessage(julesIOUAction) : undefined;
+
+                                    expect(julesIOUAction?.pendingAction).toBe(CONST.RED_BRICK_ROAD_PENDING_ACTION.ADD);
+                                    expect(julesOriginalMessage?.IOUReportID).toBe(julesIOUReport?.reportID);
+                                    expect(julesOriginalMessage?.amount).toBe(amount / 4);
+                                    expect(julesOriginalMessage?.comment).toBe(comment);
+                                    expect(julesOriginalMessage?.type).toBe(CONST.IOU.REPORT_ACTION_TYPE.CREATE);
+                                    expect(Date.parse(julesIOUCreatedAction?.created ?? '')).toBeLessThan(Date.parse(julesIOUAction?.created ?? ''));
+
+                                    // Vit DM should have two reportActions – a pending CREATED action and a pending IOU action
+                                    expect(Object.values(vitReportActions ?? {}).length).toBe(2);
+                                    vitCreatedAction = Object.values(vitReportActions ?? {}).find(
+                                        (reportAction): reportAction is OnyxTypes.ReportAction<typeof CONST.REPORT.ACTIONS.TYPE.IOU> =>
+                                            reportAction.actionName === CONST.REPORT.ACTIONS.TYPE.CREATED,
+                                    );
+                                    vitIOUAction = Object.values(vitReportActions ?? {}).find((reportAction): reportAction is OnyxTypes.ReportAction<typeof CONST.REPORT.ACTIONS.TYPE.IOU> =>
+                                        ReportActionsUtils.isMoneyRequestAction(reportAction),
+                                    );
+                                    const vitOriginalMessage = vitIOUAction ? ReportActionsUtils.getOriginalMessage(vitIOUAction) : undefined;
+
+                                    expect(vitCreatedAction?.pendingAction).toBe(CONST.RED_BRICK_ROAD_PENDING_ACTION.ADD);
+                                    expect(vitIOUAction?.pendingAction).toBe(CONST.RED_BRICK_ROAD_PENDING_ACTION.ADD);
+                                    expect(vitOriginalMessage?.IOUReportID).toBe(vitIOUReport?.reportID);
+                                    expect(vitOriginalMessage?.amount).toBe(amount / 4);
+                                    expect(vitOriginalMessage?.comment).toBe(comment);
+                                    expect(vitOriginalMessage?.type).toBe(CONST.IOU.REPORT_ACTION_TYPE.CREATE);
+                                    expect(Date.parse(vitCreatedAction?.created ?? '')).toBeLessThan(Date.parse(vitIOUAction?.created ?? ''));
+
+                                    // Group chat should have two reportActions – a pending CREATED action and a pending IOU action w/ type SPLIT
+                                    expect(Object.values(groupReportActions ?? {}).length).toBe(2);
+                                    groupCreatedAction = Object.values(groupReportActions ?? {}).find((reportAction) => reportAction.actionName === CONST.REPORT.ACTIONS.TYPE.CREATED);
+                                    groupIOUAction = Object.values(groupReportActions ?? {}).find(
+                                        (reportAction): reportAction is OnyxTypes.ReportAction<typeof CONST.REPORT.ACTIONS.TYPE.IOU> => ReportActionsUtils.isMoneyRequestAction(reportAction),
+                                    );
+                                    const groupOriginalMessage = groupIOUAction ? ReportActionsUtils.getOriginalMessage(groupIOUAction) : undefined;
+
+                                    expect(groupCreatedAction?.pendingAction).toBe(CONST.RED_BRICK_ROAD_PENDING_ACTION.ADD);
+                                    expect(groupIOUAction?.pendingAction).toBe(CONST.RED_BRICK_ROAD_PENDING_ACTION.ADD);
+                                    expect(groupOriginalMessage).not.toHaveProperty('IOUReportID');
+                                    expect(groupOriginalMessage?.type).toBe(CONST.IOU.REPORT_ACTION_TYPE.SPLIT);
+                                    expect(Date.parse(groupCreatedAction?.created ?? '')).toBeLessThanOrEqual(Date.parse(groupIOUAction?.created ?? ''));
+
+                                    resolve();
+                                },
+                            });
+                        }),
+                )
+                .then(
+                    () =>
+                        new Promise<void>((resolve) => {
+                            const connection = Onyx.connect({
+                                key: ONYXKEYS.COLLECTION.TRANSACTION,
+                                waitForCollectionCallback: true,
+                                callback: (allTransactions) => {
+                                    Onyx.disconnect(connection);
+
+                                    /* There should be 5 transactions
+                                     *   – one existing one with Jules
+                                     *   - one for each of the three IOU reports
+                                     *   - one on the group chat w/ deleted report
+                                     */
+                                    expect(Object.values(allTransactions ?? {}).length).toBe(5);
+                                    expect(allTransactions?.[`${ONYXKEYS.COLLECTION.TRANSACTION}${julesExistingTransaction?.transactionID}`]).toBeTruthy();
+
+                                    carlosTransaction = Object.values(allTransactions ?? {}).find(
+                                        (transaction) => carlosIOUAction && transaction?.transactionID === ReportActionsUtils.getOriginalMessage(carlosIOUAction)?.IOUTransactionID,
+                                    );
+                                    julesTransaction = Object.values(allTransactions ?? {}).find(
+                                        (transaction) => julesIOUAction && transaction?.transactionID === ReportActionsUtils.getOriginalMessage(julesIOUAction)?.IOUTransactionID,
+                                    );
+                                    vitTransaction = Object.values(allTransactions ?? {}).find(
+                                        (transaction) => vitIOUAction && transaction?.transactionID === ReportActionsUtils.getOriginalMessage(vitIOUAction)?.IOUTransactionID,
+                                    );
+                                    groupTransaction = Object.values(allTransactions ?? {}).find((transaction) => transaction?.reportID === CONST.REPORT.SPLIT_REPORTID);
+
+                                    expect(carlosTransaction?.reportID).toBe(carlosIOUReport?.reportID);
+                                    expect(julesTransaction?.reportID).toBe(julesIOUReport?.reportID);
+                                    expect(vitTransaction?.reportID).toBe(vitIOUReport?.reportID);
+                                    expect(groupTransaction).toBeTruthy();
+
+                                    expect(carlosTransaction?.amount).toBe(amount / 4);
+                                    expect(julesTransaction?.amount).toBe(amount / 4);
+                                    expect(vitTransaction?.amount).toBe(amount / 4);
+                                    expect(groupTransaction?.amount).toBe(amount);
+
+                                    expect(carlosTransaction?.comment?.comment).toBe(comment);
+                                    expect(julesTransaction?.comment?.comment).toBe(comment);
+                                    expect(vitTransaction?.comment?.comment).toBe(comment);
+                                    expect(groupTransaction?.comment?.comment).toBe(comment);
+
+                                    expect(carlosTransaction?.merchant).toBe(merchant);
+                                    expect(julesTransaction?.merchant).toBe(merchant);
+                                    expect(vitTransaction?.merchant).toBe(merchant);
+                                    expect(groupTransaction?.merchant).toBe(merchant);
+
+                                    expect(carlosTransaction?.comment?.source).toBe(CONST.IOU.TYPE.SPLIT);
+                                    expect(julesTransaction?.comment?.source).toBe(CONST.IOU.TYPE.SPLIT);
+                                    expect(vitTransaction?.comment?.source).toBe(CONST.IOU.TYPE.SPLIT);
+
+                                    expect(carlosTransaction?.comment?.originalTransactionID).toBe(groupTransaction?.transactionID);
+                                    expect(julesTransaction?.comment?.originalTransactionID).toBe(groupTransaction?.transactionID);
+                                    expect(vitTransaction?.comment?.originalTransactionID).toBe(groupTransaction?.transactionID);
+
+                                    expect(carlosTransaction?.pendingAction).toBe(CONST.RED_BRICK_ROAD_PENDING_ACTION.ADD);
+                                    expect(julesTransaction?.pendingAction).toBe(CONST.RED_BRICK_ROAD_PENDING_ACTION.ADD);
+                                    expect(vitTransaction?.pendingAction).toBe(CONST.RED_BRICK_ROAD_PENDING_ACTION.ADD);
+                                    expect(groupTransaction?.pendingAction).toBe(CONST.RED_BRICK_ROAD_PENDING_ACTION.ADD);
+
+                                    resolve();
+                                },
+                            });
+                        }),
+                )
+                .then(
+                    () =>
+                        new Promise<void>((resolve) => {
+                            const connection = Onyx.connect({
+                                key: ONYXKEYS.PERSONAL_DETAILS_LIST,
+                                waitForCollectionCallback: false,
+                                callback: (allPersonalDetails) => {
+                                    Onyx.disconnect(connection);
+                                    expect(allPersonalDetails).toMatchObject({
+                                        [VIT_ACCOUNT_ID]: {
+                                            accountID: VIT_ACCOUNT_ID,
+                                            displayName: VIT_EMAIL,
+                                            login: VIT_EMAIL,
+                                        },
+                                    });
+                                    resolve();
+                                },
+                            });
+                        }),
+                )
+                .then(mockFetch?.resume)
+                .then(waitForNetworkPromises)
+                .then(
+                    () =>
+                        new Promise<void>((resolve) => {
+                            const connection = Onyx.connect({
+                                key: ONYXKEYS.COLLECTION.REPORT,
+                                waitForCollectionCallback: true,
+                                callback: (allReports) => {
+                                    Onyx.disconnect(connection);
+                                    Object.values(allReports ?? {}).forEach((report) => {
+                                        if (!report?.pendingFields) {
+                                            return;
+                                        }
+                                        Object.values(report?.pendingFields).forEach((pendingField) => expect(pendingField).toBeFalsy());
+                                    });
+                                    resolve();
+                                },
+                            });
+                        }),
+                )
+                .then(
+                    () =>
+                        new Promise<void>((resolve) => {
+                            const connection = Onyx.connect({
+                                key: ONYXKEYS.COLLECTION.REPORT_ACTIONS,
+                                waitForCollectionCallback: true,
+                                callback: (allReportActions) => {
+                                    Onyx.disconnect(connection);
+                                    Object.values(allReportActions ?? {}).forEach((reportAction) => expect(reportAction?.pendingAction).toBeFalsy());
+                                    resolve();
+                                },
+                            });
+                        }),
+                )
+                .then(
+                    () =>
+                        new Promise<void>((resolve) => {
+                            const connection = Onyx.connect({
+                                key: ONYXKEYS.COLLECTION.TRANSACTION,
+                                waitForCollectionCallback: true,
+                                callback: (allTransactions) => {
+                                    Onyx.disconnect(connection);
+                                    Object.values(allTransactions ?? {}).forEach((transaction) => expect(transaction?.pendingAction).toBeFalsy());
+                                    resolve();
+                                },
+                            });
+                        }),
+                );
         });
     });
 
@@ -1406,193 +1412,190 @@ describe('actions/IOU', () => {
             const comment = 'Giv money plz';
             let chatReport: OnyxEntry<OnyxTypes.Report>;
             let iouReport: OnyxEntry<OnyxTypes.Report>;
-            let createIOUAction: OnyxEntry<OnyxTypes.ReportAction>;
+            let createIOUAction: OnyxEntry<OnyxTypes.ReportAction<typeof CONST.REPORT.ACTIONS.TYPE.IOU>>;
             let payIOUAction: OnyxEntry<OnyxTypes.ReportAction>;
             let transaction: OnyxEntry<OnyxTypes.Transaction>;
             IOU.requestMoney({reportID: ''}, amount, CONST.CURRENCY.USD, '', '', RORY_EMAIL, RORY_ACCOUNT_ID, {login: CARLOS_EMAIL, accountID: CARLOS_ACCOUNT_ID}, comment, {});
-            return (
-                waitForBatchedUpdates()
-                    .then(
-                        () =>
-                            new Promise<void>((resolve) => {
-                                const connectionID = Onyx.connect({
-                                    key: ONYXKEYS.COLLECTION.REPORT,
-                                    waitForCollectionCallback: true,
-                                    callback: (allReports) => {
-                                        Onyx.disconnect(connectionID);
+            return waitForBatchedUpdates()
+                .then(
+                    () =>
+                        new Promise<void>((resolve) => {
+                            const connection = Onyx.connect({
+                                key: ONYXKEYS.COLLECTION.REPORT,
+                                waitForCollectionCallback: true,
+                                callback: (allReports) => {
+                                    Onyx.disconnect(connection);
 
-                                        expect(Object.values(allReports ?? {}).length).toBe(3);
+                                    expect(Object.values(allReports ?? {}).length).toBe(3);
 
-                                        const chatReports = Object.values(allReports ?? {}).filter((report) => report?.type === CONST.REPORT.TYPE.CHAT);
-                                        chatReport = chatReports[0];
-                                        expect(chatReport).toBeTruthy();
-                                        expect(chatReport).toHaveProperty('reportID');
-                                        expect(chatReport).toHaveProperty('iouReportID');
+                                    const chatReports = Object.values(allReports ?? {}).filter((report) => report?.type === CONST.REPORT.TYPE.CHAT);
+                                    chatReport = chatReports[0];
+                                    expect(chatReport).toBeTruthy();
+                                    expect(chatReport).toHaveProperty('reportID');
+                                    expect(chatReport).toHaveProperty('iouReportID');
 
-                                        iouReport = Object.values(allReports ?? {}).find((report) => report?.type === CONST.REPORT.TYPE.IOU) ?? null;
-                                        expect(iouReport).toBeTruthy();
-                                        expect(iouReport).toHaveProperty('reportID');
-                                        expect(iouReport).toHaveProperty('chatReportID');
+                                    iouReport = Object.values(allReports ?? {}).find((report) => report?.type === CONST.REPORT.TYPE.IOU);
+                                    expect(iouReport).toBeTruthy();
+                                    expect(iouReport).toHaveProperty('reportID');
+                                    expect(iouReport).toHaveProperty('chatReportID');
 
-                                        expect(chatReport?.iouReportID).toBe(iouReport?.reportID);
-                                        expect(iouReport?.chatReportID).toBe(chatReport?.reportID);
+                                    expect(chatReport?.iouReportID).toBe(iouReport?.reportID);
+                                    expect(iouReport?.chatReportID).toBe(chatReport?.reportID);
 
-                                        expect(chatReport?.pendingFields).toBeFalsy();
-                                        expect(iouReport?.pendingFields).toBeFalsy();
+                                    expect(chatReport?.pendingFields).toBeFalsy();
+                                    expect(iouReport?.pendingFields).toBeFalsy();
 
-                                        resolve();
-                                    },
-                                });
-                            }),
-                    )
-                    .then(
-                        () =>
-                            new Promise<void>((resolve) => {
-                                const connectionID = Onyx.connect({
-                                    key: ONYXKEYS.COLLECTION.REPORT_ACTIONS,
-                                    waitForCollectionCallback: true,
-                                    callback: (allReportActions) => {
-                                        Onyx.disconnect(connectionID);
+                                    resolve();
+                                },
+                            });
+                        }),
+                )
+                .then(
+                    () =>
+                        new Promise<void>((resolve) => {
+                            const connection = Onyx.connect({
+                                key: ONYXKEYS.COLLECTION.REPORT_ACTIONS,
+                                waitForCollectionCallback: true,
+                                callback: (allReportActions) => {
+                                    Onyx.disconnect(connection);
 
-                                        const reportActionsForIOUReport = allReportActions?.[`${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${chatReport?.iouReportID}`];
+                                    const reportActionsForIOUReport = allReportActions?.[`${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${chatReport?.iouReportID}`];
 
-                                        createIOUAction =
-                                            Object.values(reportActionsForIOUReport ?? {}).find((reportAction) => reportAction.actionName === CONST.REPORT.ACTIONS.TYPE.IOU) ?? null;
-                                        expect(createIOUAction).toBeTruthy();
-                                        expect((createIOUAction?.originalMessage as IOUMessage)?.IOUReportID).toBe(iouReport?.reportID);
+                                    createIOUAction = Object.values(reportActionsForIOUReport ?? {}).find(
+                                        (reportAction): reportAction is OnyxTypes.ReportAction<typeof CONST.REPORT.ACTIONS.TYPE.IOU> => ReportActionsUtils.isMoneyRequestAction(reportAction),
+                                    );
+                                    expect(createIOUAction).toBeTruthy();
+                                    expect(createIOUAction && ReportActionsUtils.getOriginalMessage(createIOUAction)?.IOUReportID).toBe(iouReport?.reportID);
 
-                                        resolve();
-                                    },
-                                });
-                            }),
-                    )
-                    .then(
-                        () =>
-                            new Promise<void>((resolve) => {
-                                const connectionID = Onyx.connect({
-                                    key: ONYXKEYS.COLLECTION.TRANSACTION,
-                                    waitForCollectionCallback: true,
-                                    callback: (allTransactions) => {
-                                        Onyx.disconnect(connectionID);
-                                        expect(Object.values(allTransactions ?? {}).length).toBe(1);
-                                        transaction = Object.values(allTransactions ?? {}).find((t) => t) ?? null;
-                                        expect(transaction).toBeTruthy();
-                                        expect(transaction?.amount).toBe(amount);
-                                        expect(transaction?.reportID).toBe(iouReport?.reportID);
-                                        expect((createIOUAction?.originalMessage as IOUMessage)?.IOUTransactionID).toBe(transaction?.transactionID);
-                                        resolve();
-                                    },
-                                });
-                            }),
-                    )
-                    .then(() => {
-                        // @ts-expect-error TODO: Remove this once TestHelper (https://github.com/Expensify/App/issues/25318) is migrated to TypeScript.
-                        fetch.pause();
-                        if (chatReport && iouReport) {
-                            IOU.payMoneyRequest(CONST.IOU.PAYMENT_TYPE.ELSEWHERE, chatReport, iouReport);
-                        }
-                        return waitForBatchedUpdates();
-                    })
-                    .then(
-                        () =>
-                            new Promise<void>((resolve) => {
-                                const connectionID = Onyx.connect({
-                                    key: ONYXKEYS.COLLECTION.REPORT,
-                                    waitForCollectionCallback: true,
-                                    callback: (allReports) => {
-                                        Onyx.disconnect(connectionID);
+                                    resolve();
+                                },
+                            });
+                        }),
+                )
+                .then(
+                    () =>
+                        new Promise<void>((resolve) => {
+                            const connection = Onyx.connect({
+                                key: ONYXKEYS.COLLECTION.TRANSACTION,
+                                waitForCollectionCallback: true,
+                                callback: (allTransactions) => {
+                                    Onyx.disconnect(connection);
+                                    expect(Object.values(allTransactions ?? {}).length).toBe(1);
+                                    transaction = Object.values(allTransactions ?? {}).find((t) => t);
+                                    expect(transaction).toBeTruthy();
+                                    expect(transaction?.amount).toBe(amount);
+                                    expect(transaction?.reportID).toBe(iouReport?.reportID);
+                                    expect(createIOUAction && ReportActionsUtils.getOriginalMessage(createIOUAction)?.IOUTransactionID).toBe(transaction?.transactionID);
+                                    resolve();
+                                },
+                            });
+                        }),
+                )
+                .then(() => {
+                    mockFetch?.pause?.();
+                    if (chatReport && iouReport) {
+                        IOU.payMoneyRequest(CONST.IOU.PAYMENT_TYPE.ELSEWHERE, chatReport, iouReport);
+                    }
+                    return waitForBatchedUpdates();
+                })
+                .then(
+                    () =>
+                        new Promise<void>((resolve) => {
+                            const connection = Onyx.connect({
+                                key: ONYXKEYS.COLLECTION.REPORT,
+                                waitForCollectionCallback: true,
+                                callback: (allReports) => {
+                                    Onyx.disconnect(connection);
 
-                                        expect(Object.values(allReports ?? {}).length).toBe(3);
+                                    expect(Object.values(allReports ?? {}).length).toBe(3);
 
-                                        chatReport = Object.values(allReports ?? {}).find((r) => r?.type === CONST.REPORT.TYPE.CHAT) ?? null;
-                                        iouReport = Object.values(allReports ?? {}).find((r) => r?.type === CONST.REPORT.TYPE.IOU) ?? null;
+                                    chatReport = Object.values(allReports ?? {}).find((r) => r?.type === CONST.REPORT.TYPE.CHAT);
+                                    iouReport = Object.values(allReports ?? {}).find((r) => r?.type === CONST.REPORT.TYPE.IOU);
 
-                                        expect(chatReport?.iouReportID).toBeFalsy();
+                                    expect(chatReport?.iouReportID).toBeFalsy();
 
-                                        // expect(iouReport.status).toBe(CONST.REPORT.STATUS_NUM.REIMBURSED);
-                                        // expect(iouReport.stateNum).toBe(CONST.REPORT.STATE_NUM.APPROVED);
+                                    // expect(iouReport.status).toBe(CONST.REPORT.STATUS_NUM.REIMBURSED);
+                                    // expect(iouReport.stateNum).toBe(CONST.REPORT.STATE_NUM.APPROVED);
 
-                                        resolve();
-                                    },
-                                });
-                            }),
-                    )
-                    .then(
-                        () =>
-                            new Promise<void>((resolve) => {
-                                const connectionID = Onyx.connect({
-                                    key: ONYXKEYS.COLLECTION.REPORT_ACTIONS,
-                                    waitForCollectionCallback: true,
-                                    callback: (allReportActions) => {
-                                        Onyx.disconnect(connectionID);
+                                    resolve();
+                                },
+                            });
+                        }),
+                )
+                .then(
+                    () =>
+                        new Promise<void>((resolve) => {
+                            const connection = Onyx.connect({
+                                key: ONYXKEYS.COLLECTION.REPORT_ACTIONS,
+                                waitForCollectionCallback: true,
+                                callback: (allReportActions) => {
+                                    Onyx.disconnect(connection);
 
-                                        const reportActionsForIOUReport = allReportActions?.[`${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${iouReport?.reportID}`];
-                                        expect(Object.values(reportActionsForIOUReport ?? {}).length).toBe(3);
+                                    const reportActionsForIOUReport = allReportActions?.[`${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${iouReport?.reportID}`];
+                                    expect(Object.values(reportActionsForIOUReport ?? {}).length).toBe(3);
 
-                                        payIOUAction =
-                                            Object.values(reportActionsForIOUReport ?? {}).find(
-                                                (reportAction) =>
-                                                    reportAction?.actionName === CONST.REPORT.ACTIONS.TYPE.IOU && reportAction?.originalMessage?.type === CONST.IOU.REPORT_ACTION_TYPE.PAY,
-                                            ) ?? null;
-                                        expect(payIOUAction).toBeTruthy();
-                                        expect(payIOUAction?.pendingAction).toBe(CONST.RED_BRICK_ROAD_PENDING_ACTION.ADD);
+                                    payIOUAction = Object.values(reportActionsForIOUReport ?? {}).find(
+                                        (reportAction) =>
+                                            ReportActionsUtils.isMoneyRequestAction(reportAction) &&
+                                            ReportActionsUtils.getOriginalMessage(reportAction)?.type === CONST.IOU.REPORT_ACTION_TYPE.PAY,
+                                    );
+                                    expect(payIOUAction).toBeTruthy();
+                                    expect(payIOUAction?.pendingAction).toBe(CONST.RED_BRICK_ROAD_PENDING_ACTION.ADD);
 
-                                        resolve();
-                                    },
-                                });
-                            }),
-                    )
-                    // @ts-expect-error TODO: Remove this once TestHelper (https://github.com/Expensify/App/issues/25318) is migrated to TypeScript.
-                    .then(fetch.resume)
-                    .then(
-                        () =>
-                            new Promise<void>((resolve) => {
-                                const connectionID = Onyx.connect({
-                                    key: ONYXKEYS.COLLECTION.REPORT,
-                                    waitForCollectionCallback: true,
-                                    callback: (allReports) => {
-                                        Onyx.disconnect(connectionID);
+                                    resolve();
+                                },
+                            });
+                        }),
+                )
+                .then(mockFetch?.resume)
+                .then(
+                    () =>
+                        new Promise<void>((resolve) => {
+                            const connection = Onyx.connect({
+                                key: ONYXKEYS.COLLECTION.REPORT,
+                                waitForCollectionCallback: true,
+                                callback: (allReports) => {
+                                    Onyx.disconnect(connection);
 
-                                        expect(Object.values(allReports ?? {}).length).toBe(3);
+                                    expect(Object.values(allReports ?? {}).length).toBe(3);
 
-                                        chatReport = Object.values(allReports ?? {}).find((r) => r?.type === CONST.REPORT.TYPE.CHAT) ?? null;
-                                        iouReport = Object.values(allReports ?? {}).find((r) => r?.type === CONST.REPORT.TYPE.IOU) ?? null;
+                                    chatReport = Object.values(allReports ?? {}).find((r) => r?.type === CONST.REPORT.TYPE.CHAT);
+                                    iouReport = Object.values(allReports ?? {}).find((r) => r?.type === CONST.REPORT.TYPE.IOU);
 
-                                        expect(chatReport?.iouReportID).toBeFalsy();
+                                    expect(chatReport?.iouReportID).toBeFalsy();
 
-                                        // expect(iouReport.status).toBe(CONST.REPORT.STATUS_NUM.REIMBURSED);
-                                        // expect(iouReport.stateNum).toBe(CONST.REPORT.STATE_NUM.APPROVED);
+                                    // expect(iouReport.status).toBe(CONST.REPORT.STATUS_NUM.REIMBURSED);
+                                    // expect(iouReport.stateNum).toBe(CONST.REPORT.STATE_NUM.APPROVED);
 
-                                        resolve();
-                                    },
-                                });
-                            }),
-                    )
-                    .then(
-                        () =>
-                            new Promise<void>((resolve) => {
-                                const connectionID = Onyx.connect({
-                                    key: ONYXKEYS.COLLECTION.REPORT_ACTIONS,
-                                    waitForCollectionCallback: true,
-                                    callback: (allReportActions) => {
-                                        Onyx.disconnect(connectionID);
+                                    resolve();
+                                },
+                            });
+                        }),
+                )
+                .then(
+                    () =>
+                        new Promise<void>((resolve) => {
+                            const connection = Onyx.connect({
+                                key: ONYXKEYS.COLLECTION.REPORT_ACTIONS,
+                                waitForCollectionCallback: true,
+                                callback: (allReportActions) => {
+                                    Onyx.disconnect(connection);
 
-                                        const reportActionsForIOUReport = allReportActions?.[`${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${iouReport?.reportID}`];
-                                        expect(Object.values(reportActionsForIOUReport ?? {}).length).toBe(3);
+                                    const reportActionsForIOUReport = allReportActions?.[`${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${iouReport?.reportID}`];
+                                    expect(Object.values(reportActionsForIOUReport ?? {}).length).toBe(3);
 
-                                        payIOUAction =
-                                            Object.values(reportActionsForIOUReport ?? {}).find(
-                                                (reportAction) =>
-                                                    reportAction.actionName === CONST.REPORT.ACTIONS.TYPE.IOU && reportAction.originalMessage.type === CONST.IOU.REPORT_ACTION_TYPE.PAY,
-                                            ) ?? null;
-                                        expect(payIOUAction).toBeTruthy();
+                                    payIOUAction = Object.values(reportActionsForIOUReport ?? {}).find(
+                                        (reportAction) =>
+                                            ReportActionsUtils.isMoneyRequestAction(reportAction) &&
+                                            ReportActionsUtils.getOriginalMessage(reportAction)?.type === CONST.IOU.REPORT_ACTION_TYPE.PAY,
+                                    );
+                                    expect(payIOUAction).toBeTruthy();
 
-                                        resolve();
-                                    },
-                                });
-                            }),
-                    )
-            );
+                                    resolve();
+                                },
+                            });
+                        }),
+                );
         });
     });
 
@@ -1602,18 +1605,16 @@ describe('actions/IOU', () => {
         const merchant = 'NASDAQ';
 
         afterEach(() => {
-            // @ts-expect-error TODO: Remove this once TestHelper (https://github.com/Expensify/App/issues/25318) is migrated to TypeScript.
-            fetch.resume();
+            mockFetch?.resume?.();
         });
 
         it('updates the IOU request and IOU report when offline', () => {
             let thread: OptimisticChatReport;
-            let iouReport: OnyxEntry<OnyxTypes.Report> = null;
-            let iouAction: OnyxEntry<OnyxTypes.ReportAction> = null;
-            let transaction: OnyxEntry<OnyxTypes.Transaction> = null;
+            let iouReport: OnyxEntry<OnyxTypes.Report>;
+            let iouAction: OnyxEntry<OnyxTypes.ReportAction<typeof CONST.REPORT.ACTIONS.TYPE.IOU>>;
+            let transaction: OnyxEntry<OnyxTypes.Transaction>;
 
-            // @ts-expect-error TODO: Remove this once TestHelper (https://github.com/Expensify/App/issues/25318) is migrated to TypeScript.
-            fetch.pause();
+            mockFetch?.pause?.();
             IOU.requestMoney({reportID: ''}, amount, CONST.CURRENCY.USD, '', merchant, RORY_EMAIL, RORY_ACCOUNT_ID, {login: CARLOS_EMAIL, accountID: CARLOS_ACCOUNT_ID}, comment, {});
             return waitForBatchedUpdates()
                 .then(() => {
@@ -1623,12 +1624,12 @@ describe('actions/IOU', () => {
                 .then(
                     () =>
                         new Promise<void>((resolve) => {
-                            const connectionID = Onyx.connect({
+                            const connection = Onyx.connect({
                                 key: ONYXKEYS.COLLECTION.REPORT,
                                 waitForCollectionCallback: true,
                                 callback: (allReports) => {
-                                    Onyx.disconnect(connectionID);
-                                    iouReport = Object.values(allReports ?? {}).find((report) => report?.type === CONST.REPORT.TYPE.IOU) ?? null;
+                                    Onyx.disconnect(connection);
+                                    iouReport = Object.values(allReports ?? {}).find((report) => report?.type === CONST.REPORT.TYPE.IOU);
 
                                     resolve();
                                 },
@@ -1638,13 +1639,15 @@ describe('actions/IOU', () => {
                 .then(
                     () =>
                         new Promise<void>((resolve) => {
-                            const connectionID = Onyx.connect({
+                            const connection = Onyx.connect({
                                 key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${iouReport?.reportID}`,
                                 waitForCollectionCallback: false,
                                 callback: (reportActionsForIOUReport) => {
-                                    Onyx.disconnect(connectionID);
+                                    Onyx.disconnect(connection);
 
-                                    [iouAction] = Object.values(reportActionsForIOUReport ?? {}).filter((reportAction) => reportAction?.actionName === CONST.REPORT.ACTIONS.TYPE.IOU);
+                                    [iouAction] = Object.values(reportActionsForIOUReport ?? {}).filter(
+                                        (reportAction): reportAction is OnyxTypes.ReportAction<typeof CONST.REPORT.ACTIONS.TYPE.IOU> => ReportActionsUtils.isMoneyRequestAction(reportAction),
+                                    );
                                     resolve();
                                 },
                             });
@@ -1653,13 +1656,13 @@ describe('actions/IOU', () => {
                 .then(
                     () =>
                         new Promise<void>((resolve) => {
-                            const connectionID = Onyx.connect({
+                            const connection = Onyx.connect({
                                 key: ONYXKEYS.COLLECTION.TRANSACTION,
                                 waitForCollectionCallback: true,
                                 callback: (allTransactions) => {
-                                    Onyx.disconnect(connectionID);
+                                    Onyx.disconnect(connection);
 
-                                    transaction = Object.values(allTransactions ?? {}).find((t) => !isEmptyObject(t)) ?? null;
+                                    transaction = Object.values(allTransactions ?? {}).find((t) => !isEmptyObject(t));
                                     resolve();
                                 },
                             });
@@ -1667,7 +1670,7 @@ describe('actions/IOU', () => {
                 )
                 .then(() => {
                     thread = ReportUtils.buildTransactionThread(iouAction, iouReport) ?? null;
-                    Onyx.set(`report_${thread?.reportID ?? ''}`, thread);
+                    Onyx.set(`report_${thread?.reportID ?? '-1'}`, thread);
                     return waitForBatchedUpdates();
                 })
                 .then(() => {
@@ -1694,11 +1697,11 @@ describe('actions/IOU', () => {
                 .then(
                     () =>
                         new Promise<void>((resolve) => {
-                            const connectionID = Onyx.connect({
+                            const connection = Onyx.connect({
                                 key: ONYXKEYS.COLLECTION.TRANSACTION,
                                 waitForCollectionCallback: true,
                                 callback: (allTransactions) => {
-                                    Onyx.disconnect(connectionID);
+                                    Onyx.disconnect(connection);
 
                                     const updatedTransaction = Object.values(allTransactions ?? {}).find((t) => !isEmptyObject(t));
                                     expect(updatedTransaction?.modifiedAmount).toBe(20000);
@@ -1711,14 +1714,14 @@ describe('actions/IOU', () => {
                 .then(
                     () =>
                         new Promise<void>((resolve) => {
-                            const connectionID = Onyx.connect({
+                            const connection = Onyx.connect({
                                 key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${thread.reportID}`,
                                 waitForCollectionCallback: false,
                                 callback: (allActions) => {
-                                    Onyx.disconnect(connectionID);
+                                    Onyx.disconnect(connection);
                                     const updatedAction = Object.values(allActions ?? {}).find((reportAction) => !isEmptyObject(reportAction));
                                     expect(updatedAction?.actionName).toEqual('MODIFIEDEXPENSE');
-                                    expect(updatedAction?.originalMessage).toEqual(
+                                    expect(updatedAction && ReportActionsUtils.getOriginalMessage(updatedAction)).toEqual(
                                         expect.objectContaining({amount: 20000, newComment: 'Double the amount!', oldAmount: amount, oldComment: comment}),
                                     );
                                     resolve();
@@ -1729,11 +1732,11 @@ describe('actions/IOU', () => {
                 .then(
                     () =>
                         new Promise<void>((resolve) => {
-                            const connectionID = Onyx.connect({
+                            const connection = Onyx.connect({
                                 key: ONYXKEYS.COLLECTION.REPORT,
                                 waitForCollectionCallback: true,
                                 callback: (allReports) => {
-                                    Onyx.disconnect(connectionID);
+                                    Onyx.disconnect(connection);
                                     const updatedIOUReport = Object.values(allReports ?? {}).find((report) => report?.type === CONST.REPORT.TYPE.IOU);
                                     const updatedChatReport = Object.values(allReports ?? {}).find((report) => report?.reportID === iouReport?.chatReportID);
                                     expect(updatedIOUReport).toEqual(
@@ -1756,15 +1759,14 @@ describe('actions/IOU', () => {
                         }),
                 )
                 .then(() => {
-                    // @ts-expect-error TODO: Remove this once TestHelper (https://github.com/Expensify/App/issues/25318) is migrated to TypeScript.
-                    fetch.resume();
+                    mockFetch?.resume?.();
                 });
         });
 
         it('resets the IOU request and IOU report when api returns an error', () => {
             let thread: OptimisticChatReport;
             let iouReport: OnyxEntry<OnyxTypes.Report>;
-            let iouAction: OnyxEntry<OnyxTypes.ReportAction>;
+            let iouAction: OnyxEntry<OnyxTypes.ReportAction<typeof CONST.REPORT.ACTIONS.TYPE.IOU>>;
             let transaction: OnyxEntry<OnyxTypes.Transaction>;
 
             IOU.requestMoney({reportID: ''}, amount, CONST.CURRENCY.USD, '', merchant, RORY_EMAIL, RORY_ACCOUNT_ID, {login: CARLOS_EMAIL, accountID: CARLOS_ACCOUNT_ID}, comment, {});
@@ -1776,11 +1778,11 @@ describe('actions/IOU', () => {
                 .then(
                     () =>
                         new Promise<void>((resolve) => {
-                            const connectionID = Onyx.connect({
+                            const connection = Onyx.connect({
                                 key: ONYXKEYS.COLLECTION.REPORT,
                                 waitForCollectionCallback: true,
                                 callback: (allReports) => {
-                                    Onyx.disconnect(connectionID);
+                                    Onyx.disconnect(connection);
                                     [iouReport] = Object.values(allReports ?? {}).filter((report) => report?.type === CONST.REPORT.TYPE.IOU);
                                     resolve();
                                 },
@@ -1790,13 +1792,15 @@ describe('actions/IOU', () => {
                 .then(
                     () =>
                         new Promise<void>((resolve) => {
-                            const connectionID = Onyx.connect({
+                            const connection = Onyx.connect({
                                 key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${iouReport?.reportID}`,
                                 waitForCollectionCallback: false,
                                 callback: (reportActionsForIOUReport) => {
-                                    Onyx.disconnect(connectionID);
+                                    Onyx.disconnect(connection);
 
-                                    [iouAction] = Object.values(reportActionsForIOUReport ?? {}).filter((reportAction) => reportAction.actionName === CONST.REPORT.ACTIONS.TYPE.IOU);
+                                    [iouAction] = Object.values(reportActionsForIOUReport ?? {}).filter(
+                                        (reportAction): reportAction is OnyxTypes.ReportAction<typeof CONST.REPORT.ACTIONS.TYPE.IOU> => ReportActionsUtils.isMoneyRequestAction(reportAction),
+                                    );
                                     resolve();
                                 },
                             });
@@ -1805,13 +1809,13 @@ describe('actions/IOU', () => {
                 .then(
                     () =>
                         new Promise<void>((resolve) => {
-                            const connectionID = Onyx.connect({
+                            const connection = Onyx.connect({
                                 key: ONYXKEYS.COLLECTION.TRANSACTION,
                                 waitForCollectionCallback: true,
                                 callback: (allTransactions) => {
-                                    Onyx.disconnect(connectionID);
+                                    Onyx.disconnect(connection);
 
-                                    transaction = Object.values(allTransactions ?? {}).find((t) => !isEmptyObject(t)) ?? null;
+                                    transaction = Object.values(allTransactions ?? {}).find((t) => !isEmptyObject(t));
                                     resolve();
                                 },
                             });
@@ -1823,8 +1827,7 @@ describe('actions/IOU', () => {
                     return waitForBatchedUpdates();
                 })
                 .then(() => {
-                    // @ts-expect-error TODO: Remove this once TestHelper (https://github.com/Expensify/App/issues/25318) is migrated to TypeScript.
-                    fetch.fail();
+                    mockFetch?.fail?.();
 
                     if (transaction) {
                         IOU.editMoneyRequest(
@@ -1849,11 +1852,11 @@ describe('actions/IOU', () => {
                 .then(
                     () =>
                         new Promise<void>((resolve) => {
-                            const connectionID = Onyx.connect({
+                            const connection = Onyx.connect({
                                 key: ONYXKEYS.COLLECTION.TRANSACTION,
                                 waitForCollectionCallback: true,
                                 callback: (allTransactions) => {
-                                    Onyx.disconnect(connectionID);
+                                    Onyx.disconnect(connection);
 
                                     const updatedTransaction = Object.values(allTransactions ?? {}).find((t) => !isEmptyObject(t));
                                     expect(updatedTransaction?.modifiedAmount).toBe(undefined);
@@ -1867,14 +1870,14 @@ describe('actions/IOU', () => {
                 .then(
                     () =>
                         new Promise<void>((resolve) => {
-                            const connectionID = Onyx.connect({
+                            const connection = Onyx.connect({
                                 key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${thread.reportID}`,
                                 waitForCollectionCallback: false,
                                 callback: (allActions) => {
-                                    Onyx.disconnect(connectionID);
+                                    Onyx.disconnect(connection);
                                     const updatedAction = Object.values(allActions ?? {}).find((reportAction) => !isEmptyObject(reportAction));
                                     expect(updatedAction?.actionName).toEqual('MODIFIEDEXPENSE');
-                                    expect(Object.values(updatedAction?.errors ?? {})).toEqual(expect.arrayContaining([['iou.error.genericEditFailureMessage', {isTranslated: false}]]));
+                                    expect(Object.values(updatedAction?.errors ?? {})[0]).toEqual(Localize.translateLocal('iou.error.genericEditFailureMessage'));
                                     resolve();
                                 },
                             });
@@ -1883,11 +1886,11 @@ describe('actions/IOU', () => {
                 .then(
                     () =>
                         new Promise<void>((resolve) => {
-                            const connectionID = Onyx.connect({
+                            const connection = Onyx.connect({
                                 key: ONYXKEYS.COLLECTION.REPORT,
                                 waitForCollectionCallback: true,
                                 callback: (allReports) => {
-                                    Onyx.disconnect(connectionID);
+                                    Onyx.disconnect(connection);
                                     const updatedIOUReport = Object.values(allReports ?? {}).find((report) => report?.type === CONST.REPORT.TYPE.IOU);
                                     const updatedChatReport = Object.values(allReports ?? {}).find((report) => report?.reportID === iouReport?.chatReportID);
                                     expect(updatedIOUReport).toEqual(
@@ -1917,16 +1920,14 @@ describe('actions/IOU', () => {
         const merchant = 'NASDAQ';
 
         afterEach(() => {
-            // @ts-expect-error TODO: Remove this once TestHelper (https://github.com/Expensify/App/issues/25318) is migrated to TypeScript.
-            fetch.resume();
+            mockFetch?.resume?.();
         });
 
         it('updates the expense request and expense report when paid while offline', () => {
             let expenseReport: OnyxEntry<OnyxTypes.Report>;
             let chatReport: OnyxEntry<OnyxTypes.Report>;
 
-            // @ts-expect-error TODO: Remove this once TestHelper (https://github.com/Expensify/App/issues/25318) is migrated to TypeScript.
-            fetch.pause();
+            mockFetch?.pause?.();
             Onyx.set(ONYXKEYS.SESSION, {email: CARLOS_EMAIL, accountID: CARLOS_ACCOUNT_ID});
             return waitForBatchedUpdates()
                 .then(() => {
@@ -1936,12 +1937,12 @@ describe('actions/IOU', () => {
                 .then(
                     () =>
                         new Promise<void>((resolve) => {
-                            const connectionID = Onyx.connect({
+                            const connection = Onyx.connect({
                                 key: ONYXKEYS.COLLECTION.REPORT,
                                 waitForCollectionCallback: true,
                                 callback: (allReports) => {
-                                    Onyx.disconnect(connectionID);
-                                    chatReport = Object.values(allReports ?? {}).find((report) => report?.chatType === CONST.REPORT.CHAT_TYPE.POLICY_EXPENSE_CHAT) ?? null;
+                                    Onyx.disconnect(connection);
+                                    chatReport = Object.values(allReports ?? {}).find((report) => report?.chatType === CONST.REPORT.CHAT_TYPE.POLICY_EXPENSE_CHAT);
 
                                     resolve();
                                 },
@@ -1957,12 +1958,12 @@ describe('actions/IOU', () => {
                 .then(
                     () =>
                         new Promise<void>((resolve) => {
-                            const connectionID = Onyx.connect({
+                            const connection = Onyx.connect({
                                 key: ONYXKEYS.COLLECTION.REPORT,
                                 waitForCollectionCallback: true,
                                 callback: (allReports) => {
-                                    Onyx.disconnect(connectionID);
-                                    expenseReport = Object.values(allReports ?? {}).find((report) => report?.type === CONST.REPORT.TYPE.IOU) ?? null;
+                                    Onyx.disconnect(connection);
+                                    expenseReport = Object.values(allReports ?? {}).find((report) => report?.type === CONST.REPORT.TYPE.IOU);
 
                                     resolve();
                                 },
@@ -1978,11 +1979,11 @@ describe('actions/IOU', () => {
                 .then(
                     () =>
                         new Promise<void>((resolve) => {
-                            const connectionID = Onyx.connect({
+                            const connection = Onyx.connect({
                                 key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${expenseReport?.reportID}`,
                                 waitForCollectionCallback: false,
                                 callback: (allActions) => {
-                                    Onyx.disconnect(connectionID);
+                                    Onyx.disconnect(connection);
                                     expect(Object.values(allActions ?? {})).toEqual(
                                         expect.arrayContaining([
                                             expect.objectContaining({
@@ -2008,11 +2009,11 @@ describe('actions/IOU', () => {
                 .then(
                     () =>
                         new Promise<void>((resolve) => {
-                            const connectionID = Onyx.connect({
+                            const connection = Onyx.connect({
                                 key: ONYXKEYS.COLLECTION.REPORT,
                                 waitForCollectionCallback: true,
                                 callback: (allReports) => {
-                                    Onyx.disconnect(connectionID);
+                                    Onyx.disconnect(connection);
                                     const updatedIOUReport = Object.values(allReports ?? {}).find((report) => report?.type === CONST.REPORT.TYPE.IOU);
                                     const updatedChatReport = Object.values(allReports ?? {}).find((report) => report?.reportID === expenseReport?.chatReportID);
                                     expect(updatedIOUReport).toEqual(
@@ -2049,12 +2050,12 @@ describe('actions/IOU', () => {
                 .then(
                     () =>
                         new Promise<void>((resolve) => {
-                            const connectionID = Onyx.connect({
+                            const connection = Onyx.connect({
                                 key: ONYXKEYS.COLLECTION.REPORT,
                                 waitForCollectionCallback: true,
                                 callback: (allReports) => {
-                                    Onyx.disconnect(connectionID);
-                                    chatReport = Object.values(allReports ?? {}).find((report) => report?.chatType === CONST.REPORT.CHAT_TYPE.POLICY_EXPENSE_CHAT) ?? null;
+                                    Onyx.disconnect(connection);
+                                    chatReport = Object.values(allReports ?? {}).find((report) => report?.chatType === CONST.REPORT.CHAT_TYPE.POLICY_EXPENSE_CHAT);
 
                                     resolve();
                                 },
@@ -2070,12 +2071,12 @@ describe('actions/IOU', () => {
                 .then(
                     () =>
                         new Promise<void>((resolve) => {
-                            const connectionID = Onyx.connect({
+                            const connection = Onyx.connect({
                                 key: ONYXKEYS.COLLECTION.REPORT,
                                 waitForCollectionCallback: true,
                                 callback: (allReports) => {
-                                    Onyx.disconnect(connectionID);
-                                    expenseReport = Object.values(allReports ?? {}).find((report) => report?.type === CONST.REPORT.TYPE.IOU) ?? null;
+                                    Onyx.disconnect(connection);
+                                    expenseReport = Object.values(allReports ?? {}).find((report) => report?.type === CONST.REPORT.TYPE.IOU);
 
                                     resolve();
                                 },
@@ -2083,8 +2084,7 @@ describe('actions/IOU', () => {
                         }),
                 )
                 .then(() => {
-                    // @ts-expect-error TODO: Remove this once TestHelper (https://github.com/Expensify/App/issues/25318) is migrated to TypeScript.
-                    fetch.fail();
+                    mockFetch?.fail?.();
                     if (chatReport && expenseReport) {
                         IOU.payMoneyRequest('ACH', chatReport, expenseReport);
                     }
@@ -2093,13 +2093,13 @@ describe('actions/IOU', () => {
                 .then(
                     () =>
                         new Promise<void>((resolve) => {
-                            const connectionID = Onyx.connect({
+                            const connection = Onyx.connect({
                                 key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${expenseReport?.reportID}`,
                                 waitForCollectionCallback: false,
                                 callback: (allActions) => {
-                                    Onyx.disconnect(connectionID);
+                                    Onyx.disconnect(connection);
                                     const erroredAction = Object.values(allActions ?? {}).find((action) => !isEmptyObject(action?.errors));
-                                    expect(Object.values(erroredAction?.errors ?? {})).toEqual(expect.arrayContaining([['iou.error.other', {isTranslated: false}]]));
+                                    expect(Object.values(erroredAction?.errors ?? {})[0]).toEqual(Localize.translateLocal('iou.error.other'));
                                     resolve();
                                 },
                             });
@@ -2113,7 +2113,7 @@ describe('actions/IOU', () => {
         const comment = 'Send me money please';
         let chatReport: OnyxEntry<OnyxTypes.Report>;
         let iouReport: OnyxEntry<OnyxTypes.Report>;
-        let createIOUAction: OnyxEntry<OnyxTypes.ReportAction>;
+        let createIOUAction: OnyxEntry<OnyxTypes.ReportAction<typeof CONST.REPORT.ACTIONS.TYPE.IOU>>;
         let transaction: OnyxEntry<OnyxTypes.Transaction>;
         let thread: OptimisticChatReport;
         const TEST_USER_ACCOUNT_ID = 1;
@@ -2155,11 +2155,11 @@ describe('actions/IOU', () => {
 
             // When fetching all reports from Onyx
             const allReports = await new Promise<OnyxCollection<OnyxTypes.Report>>((resolve) => {
-                const connectionID = Onyx.connect({
+                const connection = Onyx.connect({
                     key: ONYXKEYS.COLLECTION.REPORT,
                     waitForCollectionCallback: true,
                     callback: (reports) => {
-                        Onyx.disconnect(connectionID);
+                        Onyx.disconnect(connection);
                         resolve(reports);
                     },
                 });
@@ -2169,13 +2169,13 @@ describe('actions/IOU', () => {
             expect(Object.values(allReports ?? {}).length).toBe(3);
 
             // Then one of them should be a chat report with relevant properties
-            chatReport = Object.values(allReports ?? {}).find((report) => report?.type === CONST.REPORT.TYPE.CHAT) ?? null;
+            chatReport = Object.values(allReports ?? {}).find((report) => report?.type === CONST.REPORT.TYPE.CHAT);
             expect(chatReport).toBeTruthy();
             expect(chatReport).toHaveProperty('reportID');
             expect(chatReport).toHaveProperty('iouReportID');
 
             // Then one of them should be an IOU report with relevant properties
-            iouReport = Object.values(allReports ?? {}).find((report) => report?.type === CONST.REPORT.TYPE.IOU) ?? null;
+            iouReport = Object.values(allReports ?? {}).find((report) => report?.type === CONST.REPORT.TYPE.IOU);
             expect(iouReport).toBeTruthy();
             expect(iouReport).toHaveProperty('reportID');
             expect(iouReport).toHaveProperty('chatReportID');
@@ -2185,17 +2185,17 @@ describe('actions/IOU', () => {
             expect(iouReport?.chatReportID).toBe(chatReport?.reportID);
 
             // Storing IOU Report ID for further reference
-            IOU_REPORT_ID = chatReport?.iouReportID ?? '';
+            IOU_REPORT_ID = chatReport?.iouReportID ?? '-1';
 
             await waitForBatchedUpdates();
 
             // When fetching all report actions from Onyx
             const allReportActions = await new Promise<OnyxCollection<OnyxTypes.ReportActions>>((resolve) => {
-                const connectionID = Onyx.connect({
+                const connection = Onyx.connect({
                     key: ONYXKEYS.COLLECTION.REPORT_ACTIONS,
                     waitForCollectionCallback: true,
                     callback: (actions) => {
-                        Onyx.disconnect(connectionID);
+                        Onyx.disconnect(connection);
                         resolve(actions);
                     },
                 });
@@ -2203,39 +2203,37 @@ describe('actions/IOU', () => {
 
             // Then we should find an IOU action with specific properties
             const reportActionsForIOUReport = allReportActions?.[`${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${chatReport?.iouReportID}`];
-            createIOUAction =
-                Object.values(reportActionsForIOUReport ?? {}).find(
-                    (reportAction): reportAction is ReportActionBase & OriginalMessageIOU => reportAction.actionName === CONST.REPORT.ACTIONS.TYPE.IOU,
-                ) ?? null;
+            createIOUAction = Object.values(reportActionsForIOUReport ?? {}).find((reportAction): reportAction is OnyxTypes.ReportAction<typeof CONST.REPORT.ACTIONS.TYPE.IOU> =>
+                ReportActionsUtils.isMoneyRequestAction(reportAction),
+            );
             expect(createIOUAction).toBeTruthy();
-            expect(createIOUAction?.originalMessage.IOUReportID).toBe(iouReport?.reportID);
+            expect(createIOUAction && ReportActionsUtils.getOriginalMessage(createIOUAction)?.IOUReportID).toBe(iouReport?.reportID);
 
             // When fetching all transactions from Onyx
             const allTransactions = await new Promise<OnyxCollection<OnyxTypes.Transaction>>((resolve) => {
-                const connectionID = Onyx.connect({
+                const connection = Onyx.connect({
                     key: ONYXKEYS.COLLECTION.TRANSACTION,
                     waitForCollectionCallback: true,
                     callback: (transactions) => {
-                        Onyx.disconnect(connectionID);
+                        Onyx.disconnect(connection);
                         resolve(transactions);
                     },
                 });
             });
 
             // Then we should find a specific transaction with relevant properties
-            transaction = Object.values(allTransactions ?? {}).find((t) => t) ?? null;
+            transaction = Object.values(allTransactions ?? {}).find((t) => t);
             expect(transaction).toBeTruthy();
             expect(transaction?.amount).toBe(amount);
             expect(transaction?.reportID).toBe(iouReport?.reportID);
-            expect(createIOUAction?.originalMessage.IOUTransactionID).toBe(transaction?.transactionID);
+            expect(createIOUAction && ReportActionsUtils.getOriginalMessage(createIOUAction)?.IOUTransactionID).toBe(transaction?.transactionID);
         });
 
         afterEach(PusherHelper.teardown);
 
         it('delete an expense (IOU Action and transaction) successfully', async () => {
             // Given the fetch operations are paused and an expense is initiated
-            // @ts-expect-error TODO: Remove this once TestHelper (https://github.com/Expensify/App/issues/25318) is migrated to TypeScript.
-            fetch.pause();
+            mockFetch?.pause?.();
 
             if (transaction && createIOUAction) {
                 // When the expense is deleted
@@ -2245,27 +2243,29 @@ describe('actions/IOU', () => {
 
             // Then we check if the IOU report action is removed from the report actions collection
             let reportActionsForReport = await new Promise<OnyxCollection<OnyxTypes.ReportAction>>((resolve) => {
-                const connectionID = Onyx.connect({
+                const connection = Onyx.connect({
                     key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${iouReport?.reportID}`,
                     waitForCollectionCallback: false,
                     callback: (actionsForReport) => {
-                        Onyx.disconnect(connectionID);
+                        Onyx.disconnect(connection);
                         resolve(actionsForReport);
                     },
                 });
             });
 
-            createIOUAction = Object.values(reportActionsForReport ?? {}).find((reportAction) => reportAction?.actionName === CONST.REPORT.ACTIONS.TYPE.IOU) ?? null;
+            createIOUAction = Object.values(reportActionsForReport ?? {}).find((reportAction): reportAction is OnyxTypes.ReportAction<typeof CONST.REPORT.ACTIONS.TYPE.IOU> =>
+                ReportActionsUtils.isMoneyRequestAction(reportAction),
+            );
             // Then the IOU Action should be truthy for offline support.
             expect(createIOUAction).toBeTruthy();
 
             // Then we check if the transaction is removed from the transactions collection
             const t = await new Promise<OnyxEntry<OnyxTypes.Transaction>>((resolve) => {
-                const connectionID = Onyx.connect({
+                const connection = Onyx.connect({
                     key: `${ONYXKEYS.COLLECTION.TRANSACTION}${transaction?.transactionID}`,
                     waitForCollectionCallback: false,
                     callback: (transactionResult) => {
-                        Onyx.disconnect(connectionID);
+                        Onyx.disconnect(connection);
                         resolve(transactionResult);
                     },
                 });
@@ -2274,32 +2274,33 @@ describe('actions/IOU', () => {
             expect(t).toBeFalsy();
 
             // Given fetch operations are resumed
-            // @ts-expect-error TODO: Remove this once TestHelper (https://github.com/Expensify/App/issues/25318) is migrated to TypeScript.
-            fetch.resume();
+            mockFetch?.resume?.();
             await waitForBatchedUpdates();
 
             // Then we recheck the IOU report action from the report actions collection
             reportActionsForReport = await new Promise<OnyxCollection<OnyxTypes.ReportAction>>((resolve) => {
-                const connectionID = Onyx.connect({
+                const connection = Onyx.connect({
                     key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${iouReport?.reportID}`,
                     waitForCollectionCallback: false,
                     callback: (actionsForReport) => {
-                        Onyx.disconnect(connectionID);
+                        Onyx.disconnect(connection);
                         resolve(actionsForReport);
                     },
                 });
             });
 
-            createIOUAction = Object.values(reportActionsForReport ?? {}).find((reportAction) => reportAction?.actionName === CONST.REPORT.ACTIONS.TYPE.IOU) ?? null;
+            createIOUAction = Object.values(reportActionsForReport ?? {}).find((reportAction): reportAction is OnyxTypes.ReportAction<typeof CONST.REPORT.ACTIONS.TYPE.IOU> =>
+                ReportActionsUtils.isMoneyRequestAction(reportAction),
+            );
             expect(createIOUAction).toBeFalsy();
 
             // Then we recheck the transaction from the transactions collection
             const tr = await new Promise<OnyxEntry<OnyxTypes.Transaction>>((resolve) => {
-                const connectionID = Onyx.connect({
+                const connection = Onyx.connect({
                     key: `${ONYXKEYS.COLLECTION.TRANSACTION}${transaction?.transactionID}`,
                     waitForCollectionCallback: false,
                     callback: (transactionResult) => {
-                        Onyx.disconnect(connectionID);
+                        Onyx.disconnect(connection);
                         resolve(transactionResult);
                     },
                 });
@@ -2310,8 +2311,7 @@ describe('actions/IOU', () => {
 
         it('delete the IOU report when there are no visible comments left in the IOU report', async () => {
             // Given an IOU report and a paused fetch state
-            // @ts-expect-error TODO: Remove this once TestHelper (https://github.com/Expensify/App/issues/25318) is migrated to TypeScript.
-            fetch.pause();
+            mockFetch?.pause?.();
 
             if (transaction && createIOUAction) {
                 // When the IOU expense is deleted
@@ -2320,11 +2320,11 @@ describe('actions/IOU', () => {
             await waitForBatchedUpdates();
 
             let report = await new Promise<OnyxEntry<OnyxTypes.Report>>((resolve) => {
-                const connectionID = Onyx.connect({
+                const connection = Onyx.connect({
                     key: `${ONYXKEYS.COLLECTION.REPORT}${iouReport?.reportID}`,
                     waitForCollectionCallback: false,
                     callback: (res) => {
-                        Onyx.disconnect(connectionID);
+                        Onyx.disconnect(connection);
                         resolve(res);
                     },
                 });
@@ -2334,16 +2334,15 @@ describe('actions/IOU', () => {
             expect(report).toBeTruthy();
 
             // Given the resumed fetch state
-            // @ts-expect-error TODO: Remove this once TestHelper (https://github.com/Expensify/App/issues/25318) is migrated to TypeScript.
-            fetch.resume();
+            mockFetch?.resume?.();
             await waitForBatchedUpdates();
 
             report = await new Promise<OnyxEntry<OnyxTypes.Report>>((resolve) => {
-                const connectionID = Onyx.connect({
+                const connection = Onyx.connect({
                     key: `${ONYXKEYS.COLLECTION.REPORT}${iouReport?.reportID}`,
                     waitForCollectionCallback: false,
                     callback: (res) => {
-                        Onyx.disconnect(connectionID);
+                        Onyx.disconnect(connection);
                         resolve(res);
                     },
                 });
@@ -2371,7 +2370,7 @@ describe('actions/IOU', () => {
 
             // Then verify that the comment is correctly added
             const resultAction = Object.values(reportActions ?? {}).find((reportAction) => reportAction?.actionName === CONST.REPORT.ACTIONS.TYPE.ADD_COMMENT);
-            reportActionID = resultAction?.reportActionID ?? '';
+            reportActionID = resultAction?.reportActionID ?? '-1';
 
             expect(resultAction?.message).toEqual(REPORT_ACTION.message);
             expect(resultAction?.person).toEqual(REPORT_ACTION.person);
@@ -2387,8 +2386,7 @@ describe('actions/IOU', () => {
             expect(resultActionAfterUpdate?.pendingAction).toBeUndefined();
 
             // When we attempt to delete an expense from the IOU report
-            // @ts-expect-error TODO: Remove this once TestHelper (https://github.com/Expensify/App/issues/25318) is migrated to TypeScript.
-            fetch.pause();
+            mockFetch?.pause?.();
             if (transaction && createIOUAction) {
                 IOU.deleteMoneyRequest(transaction?.transactionID, createIOUAction, false);
             }
@@ -2396,11 +2394,11 @@ describe('actions/IOU', () => {
 
             // Then expect that the IOU report still exists
             let allReports = await new Promise<OnyxCollection<OnyxTypes.Report>>((resolve) => {
-                const connectionID = Onyx.connect({
+                const connection = Onyx.connect({
                     key: ONYXKEYS.COLLECTION.REPORT,
                     waitForCollectionCallback: true,
                     callback: (reports) => {
-                        Onyx.disconnect(connectionID);
+                        Onyx.disconnect(connection);
                         resolve(reports);
                     },
                 });
@@ -2408,27 +2406,26 @@ describe('actions/IOU', () => {
 
             await waitForBatchedUpdates();
 
-            iouReport = Object.values(allReports ?? {}).find((report) => ReportUtils.isIOUReport(report)) ?? null;
+            iouReport = Object.values(allReports ?? {}).find((report) => ReportUtils.isIOUReport(report));
             expect(iouReport).toBeTruthy();
             expect(iouReport).toHaveProperty('reportID');
             expect(iouReport).toHaveProperty('chatReportID');
 
             // Given the resumed fetch state
-            // @ts-expect-error TODO: Remove this once TestHelper (https://github.com/Expensify/App/issues/25318) is migrated to TypeScript.
-            fetch.resume();
+            mockFetch?.resume?.();
 
             allReports = await new Promise<OnyxCollection<OnyxTypes.Report>>((resolve) => {
-                const connectionID = Onyx.connect({
+                const connection = Onyx.connect({
                     key: ONYXKEYS.COLLECTION.REPORT,
                     waitForCollectionCallback: true,
                     callback: (reports) => {
-                        Onyx.disconnect(connectionID);
+                        Onyx.disconnect(connection);
                         resolve(reports);
                     },
                 });
             });
             // Then expect that the IOU report still exists
-            iouReport = Object.values(allReports ?? {}).find((report) => ReportUtils.isIOUReport(report)) ?? null;
+            iouReport = Object.values(allReports ?? {}).find((report) => ReportUtils.isIOUReport(report));
             expect(iouReport).toBeTruthy();
             expect(iouReport).toHaveProperty('reportID');
             expect(iouReport).toHaveProperty('chatReportID');
@@ -2454,7 +2451,8 @@ describe('actions/IOU', () => {
             jest.advanceTimersByTime(10);
 
             // Given User logins from the participant accounts
-            const userLogins = PersonalDetailsUtils.getLoginsByAccountIDs(thread?.participantAccountIDs ?? []);
+            const participantAccountIDs = Object.keys(thread.participants ?? {}).map(Number);
+            const userLogins = PersonalDetailsUtils.getLoginsByAccountIDs(participantAccountIDs);
 
             // When Opening a thread report with the given details
             Report.openReport(thread.reportID, '', userLogins, thread, createIOUAction?.reportActionID);
@@ -2462,24 +2460,25 @@ describe('actions/IOU', () => {
 
             // Then The iou action has the transaction report id as a child report ID
             const allReportActions = await new Promise<OnyxCollection<OnyxTypes.ReportActions>>((resolve) => {
-                const connectionID = Onyx.connect({
+                const connection = Onyx.connect({
                     key: ONYXKEYS.COLLECTION.REPORT_ACTIONS,
                     waitForCollectionCallback: true,
                     callback: (actions) => {
-                        Onyx.disconnect(connectionID);
+                        Onyx.disconnect(connection);
                         resolve(actions);
                     },
                 });
             });
             const reportActionsForIOUReport = allReportActions?.[`${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${chatReport?.iouReportID}`];
-            createIOUAction = Object.values(reportActionsForIOUReport ?? {}).find((reportAction) => reportAction.actionName === CONST.REPORT.ACTIONS.TYPE.IOU) ?? null;
+            createIOUAction = Object.values(reportActionsForIOUReport ?? {}).find((reportAction): reportAction is OnyxTypes.ReportAction<typeof CONST.REPORT.ACTIONS.TYPE.IOU> =>
+                ReportActionsUtils.isMoneyRequestAction(reportAction),
+            );
             expect(createIOUAction?.childReportID).toBe(thread.reportID);
 
             await waitForBatchedUpdates();
 
             // Given Fetch is paused and timers have advanced
-            // @ts-expect-error TODO: Remove this once TestHelper (https://github.com/Expensify/App/issues/25318) is migrated to TypeScript.
-            fetch.pause();
+            mockFetch?.pause?.();
             jest.advanceTimersByTime(10);
 
             if (transaction && createIOUAction) {
@@ -2490,27 +2489,26 @@ describe('actions/IOU', () => {
 
             // Then The report for the given thread ID does not exist
             let report = await new Promise<OnyxEntry<OnyxTypes.Report>>((resolve) => {
-                const connectionID = Onyx.connect({
+                const connection = Onyx.connect({
                     key: `${ONYXKEYS.COLLECTION.REPORT}${thread.reportID}`,
                     waitForCollectionCallback: false,
                     callback: (reportData) => {
-                        Onyx.disconnect(connectionID);
+                        Onyx.disconnect(connection);
                         resolve(reportData);
                     },
                 });
             });
 
             expect(report).toBeFalsy();
-            // @ts-expect-error TODO: Remove this once TestHelper (https://github.com/Expensify/App/issues/25318) is migrated to TypeScript.
-            fetch.resume();
+            mockFetch?.resume?.();
 
             // Then After resuming fetch, the report for the given thread ID still does not exist
             report = await new Promise<OnyxEntry<OnyxTypes.Report>>((resolve) => {
-                const connectionID = Onyx.connect({
+                const connection = Onyx.connect({
                     key: `${ONYXKEYS.COLLECTION.REPORT}${thread.reportID}`,
                     waitForCollectionCallback: false,
                     callback: (reportData) => {
-                        Onyx.disconnect(connectionID);
+                        Onyx.disconnect(connection);
                         resolve(reportData);
                     },
                 });
@@ -2537,7 +2535,8 @@ describe('actions/IOU', () => {
             jest.advanceTimersByTime(10);
 
             // Given User logins from the participant accounts
-            const userLogins = PersonalDetailsUtils.getLoginsByAccountIDs(thread?.participantAccountIDs ?? []);
+            const participantAccountIDs = Object.keys(thread.participants ?? {}).map(Number);
+            const userLogins = PersonalDetailsUtils.getLoginsByAccountIDs(participantAccountIDs);
 
             // When Opening a thread report with the given details
             Report.openReport(thread.reportID, '', userLogins, thread, createIOUAction?.reportActionID);
@@ -2545,17 +2544,19 @@ describe('actions/IOU', () => {
 
             // Then The iou action has the transaction report id as a child report ID
             const allReportActions = await new Promise<OnyxCollection<OnyxTypes.ReportActions>>((resolve) => {
-                const connectionID = Onyx.connect({
+                const connection = Onyx.connect({
                     key: ONYXKEYS.COLLECTION.REPORT_ACTIONS,
                     waitForCollectionCallback: true,
                     callback: (actions) => {
-                        Onyx.disconnect(connectionID);
+                        Onyx.disconnect(connection);
                         resolve(actions);
                     },
                 });
             });
             const reportActionsForIOUReport = allReportActions?.[`${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${chatReport?.iouReportID}`];
-            createIOUAction = Object.values(reportActionsForIOUReport ?? {}).find((reportAction) => reportAction.actionName === CONST.REPORT.ACTIONS.TYPE.IOU) ?? null;
+            createIOUAction = Object.values(reportActionsForIOUReport ?? {}).find((reportAction): reportAction is OnyxTypes.ReportAction<typeof CONST.REPORT.ACTIONS.TYPE.IOU> =>
+                ReportActionsUtils.isMoneyRequestAction(reportAction),
+            );
             expect(createIOUAction?.childReportID).toBe(thread.reportID);
 
             await waitForBatchedUpdates();
@@ -2586,12 +2587,14 @@ describe('actions/IOU', () => {
 
             // Fetch the updated IOU Action from Onyx
             await new Promise<void>((resolve) => {
-                const connectionID = Onyx.connect({
+                const connection = Onyx.connect({
                     key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${iouReport?.reportID}`,
                     waitForCollectionCallback: false,
                     callback: (reportActionsForReport) => {
-                        Onyx.disconnect(connectionID);
-                        createIOUAction = Object.values(reportActionsForReport ?? {}).find((reportAction) => reportAction.actionName === CONST.REPORT.ACTIONS.TYPE.IOU) ?? null;
+                        Onyx.disconnect(connection);
+                        createIOUAction = Object.values(reportActionsForReport ?? {}).find((reportAction): reportAction is OnyxTypes.ReportAction<typeof CONST.REPORT.ACTIONS.TYPE.IOU> =>
+                            ReportActionsUtils.isMoneyRequestAction(reportAction),
+                        );
                         resolve();
                     },
                 });
@@ -2605,11 +2608,11 @@ describe('actions/IOU', () => {
 
             // Then, the report for the given thread ID does not exist
             const report = await new Promise<OnyxEntry<OnyxTypes.Report>>((resolve) => {
-                const connectionID = Onyx.connect({
+                const connection = Onyx.connect({
                     key: `${ONYXKEYS.COLLECTION.REPORT}${thread.reportID}`,
                     waitForCollectionCallback: false,
                     callback: (reportData) => {
-                        Onyx.disconnect(connectionID);
+                        Onyx.disconnect(connection);
                         resolve(reportData);
                     },
                 });
@@ -2627,7 +2630,8 @@ describe('actions/IOU', () => {
 
             expect(thread.notificationPreference).toBe(CONST.REPORT.NOTIFICATION_PREFERENCE.HIDDEN);
 
-            const userLogins = PersonalDetailsUtils.getLoginsByAccountIDs(thread?.participantAccountIDs ?? []);
+            const participantAccountIDs = Object.keys(thread.participants ?? {}).map(Number);
+            const userLogins = PersonalDetailsUtils.getLoginsByAccountIDs(participantAccountIDs);
             jest.advanceTimersByTime(10);
             Report.openReport(thread.reportID, '', userLogins, thread, createIOUAction?.reportActionID);
             await waitForBatchedUpdates();
@@ -2639,10 +2643,10 @@ describe('actions/IOU', () => {
             await waitForBatchedUpdates();
 
             await new Promise<void>((resolve) => {
-                const connectionID = Onyx.connect({
+                const connection = Onyx.connect({
                     key: `${ONYXKEYS.COLLECTION.REPORT}${thread.reportID}`,
                     callback: (report) => {
-                        Onyx.disconnect(connectionID);
+                        Onyx.disconnect(connection);
                         expect(report).toBeTruthy();
                         resolve();
                     },
@@ -2657,7 +2661,7 @@ describe('actions/IOU', () => {
 
             // Then comment details should match the expected report action
             const resultAction = Object.values(reportActions ?? {}).find((reportAction) => reportAction?.actionName === CONST.REPORT.ACTIONS.TYPE.ADD_COMMENT);
-            reportActionID = resultAction?.reportActionID ?? '';
+            reportActionID = resultAction?.reportActionID ?? '-1';
             expect(resultAction?.message).toEqual(REPORT_ACTION.message);
             expect(resultAction?.person).toEqual(REPORT_ACTION.person);
 
@@ -2668,8 +2672,7 @@ describe('actions/IOU', () => {
             const resultActionAfter = reportActions?.[reportActionID];
             expect(resultActionAfter?.pendingAction).toBeUndefined();
 
-            // @ts-expect-error TODO: Remove this once TestHelper (https://github.com/Expensify/App/issues/25318) is migrated to TypeScript.
-            fetch.pause();
+            mockFetch?.pause?.();
 
             if (transaction && createIOUAction) {
                 // When deleting expense
@@ -2679,11 +2682,11 @@ describe('actions/IOU', () => {
 
             // Then the transaction thread report should still exist
             await new Promise<void>((resolve) => {
-                const connectionID = Onyx.connect({
+                const connection = Onyx.connect({
                     key: `${ONYXKEYS.COLLECTION.REPORT}${thread.reportID}`,
                     waitForCollectionCallback: false,
                     callback: (report) => {
-                        Onyx.disconnect(connectionID);
+                        Onyx.disconnect(connection);
                         expect(report).toBeTruthy();
                         resolve();
                     },
@@ -2692,13 +2695,12 @@ describe('actions/IOU', () => {
 
             // When fetch resumes
             // Then the transaction thread report should still exist
-            // @ts-expect-error TODO: Remove this once TestHelper (https://github.com/Expensify/App/issues/25318) is migrated to TypeScript.
-            fetch.resume();
+            mockFetch?.resume?.();
             await new Promise<void>((resolve) => {
-                const connectionID = Onyx.connect({
+                const connection = Onyx.connect({
                     key: `${ONYXKEYS.COLLECTION.REPORT}${thread.reportID}`,
                     callback: (report) => {
-                        Onyx.disconnect(connectionID);
+                        Onyx.disconnect(connection);
                         expect(report).toBeTruthy();
                         resolve();
                     },
@@ -2723,24 +2725,27 @@ describe('actions/IOU', () => {
             await waitForBatchedUpdates();
 
             jest.advanceTimersByTime(10);
-            const userLogins = PersonalDetailsUtils.getLoginsByAccountIDs(thread?.participantAccountIDs ?? []);
+            const participantAccountIDs = Object.keys(thread.participants ?? {}).map(Number);
+            const userLogins = PersonalDetailsUtils.getLoginsByAccountIDs(participantAccountIDs);
             Report.openReport(thread.reportID, '', userLogins, thread, createIOUAction?.reportActionID);
 
             await waitForBatchedUpdates();
 
             const allReportActions = await new Promise<OnyxCollection<OnyxTypes.ReportActions>>((resolve) => {
-                const connectionID = Onyx.connect({
+                const connection = Onyx.connect({
                     key: ONYXKEYS.COLLECTION.REPORT_ACTIONS,
                     waitForCollectionCallback: true,
                     callback: (actions) => {
-                        Onyx.disconnect(connectionID);
+                        Onyx.disconnect(connection);
                         resolve(actions);
                     },
                 });
             });
 
             const reportActionsForIOUReport = allReportActions?.[`${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${chatReport?.iouReportID}`];
-            createIOUAction = Object.values(reportActionsForIOUReport ?? {}).find((reportAction) => reportAction.actionName === CONST.REPORT.ACTIONS.TYPE.IOU) ?? null;
+            createIOUAction = Object.values(reportActionsForIOUReport ?? {}).find((reportAction): reportAction is OnyxTypes.ReportAction<typeof CONST.REPORT.ACTIONS.TYPE.IOU> =>
+                ReportActionsUtils.isMoneyRequestAction(reportAction),
+            );
             expect(createIOUAction?.childReportID).toBe(thread.reportID);
 
             await waitForBatchedUpdates();
@@ -2755,19 +2760,21 @@ describe('actions/IOU', () => {
             // Fetch the updated IOU Action from Onyx due to addition of comment to transaction thread.
             // This needs to be fetched as `deleteMoneyRequest` depends on `childVisibleActionCount` in `createIOUAction`.
             await new Promise<void>((resolve) => {
-                const connectionID = Onyx.connect({
+                const connection = Onyx.connect({
                     key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${iouReport?.reportID}`,
                     waitForCollectionCallback: false,
                     callback: (reportActionsForReport) => {
-                        Onyx.disconnect(connectionID);
-                        createIOUAction = Object.values(reportActionsForReport ?? {}).find((reportAction) => reportAction.actionName === CONST.REPORT.ACTIONS.TYPE.IOU) ?? null;
+                        Onyx.disconnect(connection);
+                        createIOUAction = Object.values(reportActionsForReport ?? {}).find((reportAction): reportAction is OnyxTypes.ReportAction<typeof CONST.REPORT.ACTIONS.TYPE.IOU> =>
+                            ReportActionsUtils.isMoneyRequestAction(reportAction),
+                        );
                         resolve();
                     },
                 });
             });
 
             let resultAction = Object.values(reportActions ?? {}).find((reportAction) => reportAction?.actionName === CONST.REPORT.ACTIONS.TYPE.ADD_COMMENT);
-            reportActionID = resultAction?.reportActionID ?? '';
+            reportActionID = resultAction?.reportActionID ?? '-1';
 
             expect(resultAction?.message).toEqual(REPORT_ACTION.message);
             expect(resultAction?.person).toEqual(REPORT_ACTION.person);
@@ -2799,7 +2806,7 @@ describe('actions/IOU', () => {
             await waitForBatchedUpdates();
 
             resultAction = Object.values(reportActions ?? {}).find((reportAction) => reportAction?.actionName === CONST.REPORT.ACTIONS.TYPE.ADD_COMMENT);
-            reportActionID = resultAction?.reportActionID ?? '';
+            reportActionID = resultAction?.reportActionID ?? '-1';
 
             expect(resultAction?.message).toEqual(REPORT_ACTION.message);
             expect(resultAction?.person).toEqual(REPORT_ACTION.person);
@@ -2815,8 +2822,7 @@ describe('actions/IOU', () => {
             // Verify that our action is no longer in the loading state
             expect(resultActionAfterUpdate?.pendingAction).toBeUndefined();
 
-            // @ts-expect-error TODO: Remove this once TestHelper (https://github.com/Expensify/App/issues/25318) is migrated to TypeScript.
-            fetch.pause();
+            mockFetch?.pause?.();
             if (transaction && createIOUAction) {
                 // When we delete the expense
                 IOU.deleteMoneyRequest(transaction.transactionID, createIOUAction, false);
@@ -2826,32 +2832,35 @@ describe('actions/IOU', () => {
             // Then we expect the moneyRequestPreview to show [Deleted expense]
 
             await new Promise<void>((resolve) => {
-                const connectionID = Onyx.connect({
+                const connection = Onyx.connect({
                     key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${iouReport?.reportID}`,
                     waitForCollectionCallback: false,
                     callback: (reportActionsForReport) => {
-                        Onyx.disconnect(connectionID);
-                        createIOUAction = Object.values(reportActionsForReport ?? {}).find((reportAction) => reportAction.actionName === CONST.REPORT.ACTIONS.TYPE.IOU) ?? null;
-                        expect(createIOUAction?.message?.[0]?.isDeletedParentAction).toBeTruthy();
+                        Onyx.disconnect(connection);
+                        createIOUAction = Object.values(reportActionsForReport ?? {}).find((reportAction): reportAction is OnyxTypes.ReportAction<typeof CONST.REPORT.ACTIONS.TYPE.IOU> =>
+                            ReportActionsUtils.isMoneyRequestAction(reportAction),
+                        );
+                        expect(ReportActionsUtils.getReportActionMessage(createIOUAction)?.isDeletedParentAction).toBeTruthy();
                         resolve();
                     },
                 });
             });
 
             // When we resume fetch
-            // @ts-expect-error TODO: Remove this once TestHelper (https://github.com/Expensify/App/issues/25318) is migrated to TypeScript.
-            fetch.resume();
+            mockFetch?.resume?.();
 
             // Then we expect the moneyRequestPreview to show [Deleted expense]
 
             await new Promise<void>((resolve) => {
-                const connectionID = Onyx.connect({
+                const connection = Onyx.connect({
                     key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${iouReport?.reportID}`,
                     waitForCollectionCallback: false,
                     callback: (reportActionsForReport) => {
-                        Onyx.disconnect(connectionID);
-                        createIOUAction = Object.values(reportActionsForReport ?? {}).find((reportAction) => reportAction.actionName === CONST.REPORT.ACTIONS.TYPE.IOU) ?? null;
-                        expect(createIOUAction?.message?.[0]?.isDeletedParentAction).toBeTruthy();
+                        Onyx.disconnect(connection);
+                        createIOUAction = Object.values(reportActionsForReport ?? {}).find((reportAction): reportAction is OnyxTypes.ReportAction<typeof CONST.REPORT.ACTIONS.TYPE.IOU> =>
+                            ReportActionsUtils.isMoneyRequestAction(reportAction),
+                        );
+                        expect(ReportActionsUtils.getReportActionMessage(createIOUAction)?.isDeletedParentAction).toBeTruthy();
                         resolve();
                     },
                 });
@@ -2884,13 +2893,12 @@ describe('actions/IOU', () => {
             expect(iouReport).toHaveProperty('chatReportID');
             expect(iouReport?.total).toBe(30000);
 
-            const ioupreview = ReportActionsUtils.getReportPreviewAction(chatReport?.reportID ?? '', iouReport?.reportID ?? '');
+            const ioupreview = ReportActionsUtils.getReportPreviewAction(chatReport?.reportID ?? '-1', iouReport?.reportID ?? '-1');
             expect(ioupreview).toBeTruthy();
-            expect(ioupreview?.message?.[0]?.text).toBe('rory@expensifail.com owes $300.00');
+            expect(ReportActionsUtils.getReportActionText(ioupreview)).toBe('rory@expensifail.com owes $300.00');
 
             // When we delete the first expense
-            // @ts-expect-error TODO: Remove this once TestHelper (https://github.com/Expensify/App/issues/25318) is migrated to TypeScript.
-            fetch.pause();
+            mockFetch?.pause?.();
             jest.advanceTimersByTime(10);
             if (transaction && createIOUAction) {
                 IOU.deleteMoneyRequest(transaction.transactionID, createIOUAction, false);
@@ -2905,8 +2913,7 @@ describe('actions/IOU', () => {
             expect(iouReport?.total).toBe(20000);
 
             // When we resume
-            // @ts-expect-error TODO: Remove this once TestHelper (https://github.com/Expensify/App/issues/25318) is migrated to TypeScript.
-            fetch.resume();
+            mockFetch?.resume?.();
 
             // Then we expect the IOU report and reportPreview to update with new totals
             expect(iouReport).toBeTruthy();
@@ -2958,43 +2965,46 @@ describe('actions/IOU', () => {
             await waitForBatchedUpdates();
 
             jest.advanceTimersByTime(10);
-            const userLogins = PersonalDetailsUtils.getLoginsByAccountIDs(thread?.participantAccountIDs ?? []);
+            const participantAccountIDs = Object.keys(thread.participants ?? {}).map(Number);
+            const userLogins = PersonalDetailsUtils.getLoginsByAccountIDs(participantAccountIDs);
             Report.openReport(thread.reportID, '', userLogins, thread, createIOUAction?.reportActionID);
             await waitForBatchedUpdates();
 
             const allReportActions = await new Promise<OnyxCollection<OnyxTypes.ReportActions>>((resolve) => {
-                const connectionID = Onyx.connect({
+                const connection = Onyx.connect({
                     key: ONYXKEYS.COLLECTION.REPORT_ACTIONS,
                     waitForCollectionCallback: true,
                     callback: (actions) => {
-                        Onyx.disconnect(connectionID);
+                        Onyx.disconnect(connection);
                         resolve(actions);
                     },
                 });
             });
 
             const reportActionsForIOUReport = allReportActions?.[`${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${chatReport?.iouReportID}`];
-            createIOUAction = Object.values(reportActionsForIOUReport ?? {}).find((reportAction) => reportAction.actionName === CONST.REPORT.ACTIONS.TYPE.IOU) ?? null;
+            createIOUAction = Object.values(reportActionsForIOUReport ?? {}).find((reportAction): reportAction is OnyxTypes.ReportAction<typeof CONST.REPORT.ACTIONS.TYPE.IOU> =>
+                ReportActionsUtils.isMoneyRequestAction(reportAction),
+            );
             expect(createIOUAction?.childReportID).toBe(thread.reportID);
 
             await waitForBatchedUpdates();
 
             // When we delete the expense in SingleTransactionView and we should not delete the IOU report
 
-            // @ts-expect-error TODO: Remove this once TestHelper (https://github.com/Expensify/App/issues/25318) is migrated to TypeScript.
-            fetch.pause();
+            mockFetch?.pause?.();
 
+            let navigateToAfterDelete;
             if (transaction && createIOUAction) {
-                IOU.deleteMoneyRequest(transaction.transactionID, createIOUAction, true);
+                navigateToAfterDelete = IOU.deleteMoneyRequest(transaction.transactionID, createIOUAction, true);
             }
             await waitForBatchedUpdates();
 
             let allReports = await new Promise<OnyxCollection<OnyxTypes.Report>>((resolve) => {
-                const connectionID = Onyx.connect({
+                const connection = Onyx.connect({
                     key: ONYXKEYS.COLLECTION.REPORT,
                     waitForCollectionCallback: true,
                     callback: (reports) => {
-                        Onyx.disconnect(connectionID);
+                        Onyx.disconnect(connection);
                         resolve(reports);
                     },
                 });
@@ -3002,42 +3012,42 @@ describe('actions/IOU', () => {
 
             await waitForBatchedUpdates();
 
-            iouReport = Object.values(allReports ?? {}).find((report) => ReportUtils.isIOUReport(report)) ?? null;
+            iouReport = Object.values(allReports ?? {}).find((report) => ReportUtils.isIOUReport(report));
             expect(iouReport).toBeTruthy();
             expect(iouReport).toHaveProperty('reportID');
             expect(iouReport).toHaveProperty('chatReportID');
 
-            // @ts-expect-error TODO: Remove this once TestHelper (https://github.com/Expensify/App/issues/25318) is migrated to TypeScript.
-            fetch.resume();
+            mockFetch?.resume?.();
 
             allReports = await new Promise<OnyxCollection<OnyxTypes.Report>>((resolve) => {
-                const connectionID = Onyx.connect({
+                const connection = Onyx.connect({
                     key: ONYXKEYS.COLLECTION.REPORT,
                     waitForCollectionCallback: true,
                     callback: (reports) => {
-                        Onyx.disconnect(connectionID);
+                        Onyx.disconnect(connection);
                         resolve(reports);
                     },
                 });
             });
 
-            iouReport = Object.values(allReports ?? {}).find((report) => ReportUtils.isIOUReport(report)) ?? null;
+            iouReport = Object.values(allReports ?? {}).find((report) => ReportUtils.isIOUReport(report));
             expect(iouReport).toBeTruthy();
             expect(iouReport).toHaveProperty('reportID');
             expect(iouReport).toHaveProperty('chatReportID');
 
             // Then we expect to navigate to the iou report
 
-            expect(Navigation.goBack).toHaveBeenCalledWith(ROUTES.REPORT_WITH_ID.getRoute(IOU_REPORT_ID));
+            expect(navigateToAfterDelete).toEqual(ROUTES.REPORT_WITH_ID.getRoute(IOU_REPORT_ID));
         });
 
         it('navigate the user correctly to the chat Report when appropriate', () => {
+            let navigateToAfterDelete;
             if (transaction && createIOUAction) {
                 // When we delete the expense and we should delete the IOU report
-                IOU.deleteMoneyRequest(transaction.transactionID, createIOUAction, false);
+                navigateToAfterDelete = IOU.deleteMoneyRequest(transaction.transactionID, createIOUAction, false);
             }
             // Then we expect to navigate to the chat report
-            expect(Navigation.goBack).toHaveBeenCalledWith(ROUTES.REPORT_WITH_ID.getRoute(chatReport?.reportID ?? ''));
+            expect(navigateToAfterDelete).toEqual(ROUTES.REPORT_WITH_ID.getRoute(chatReport?.reportID ?? '-1'));
         });
     });
 
@@ -3060,12 +3070,12 @@ describe('actions/IOU', () => {
                 .then(
                     () =>
                         new Promise<void>((resolve) => {
-                            const connectionID = Onyx.connect({
+                            const connection = Onyx.connect({
                                 key: ONYXKEYS.COLLECTION.REPORT,
                                 waitForCollectionCallback: true,
                                 callback: (allReports) => {
-                                    Onyx.disconnect(connectionID);
-                                    chatReport = Object.values(allReports ?? {}).find((report) => report?.chatType === CONST.REPORT.CHAT_TYPE.POLICY_EXPENSE_CHAT) ?? null;
+                                    Onyx.disconnect(connection);
+                                    chatReport = Object.values(allReports ?? {}).find((report) => report?.chatType === CONST.REPORT.CHAT_TYPE.POLICY_EXPENSE_CHAT);
 
                                     resolve();
                                 },
@@ -3092,12 +3102,12 @@ describe('actions/IOU', () => {
                 .then(
                     () =>
                         new Promise<void>((resolve) => {
-                            const connectionID = Onyx.connect({
+                            const connection = Onyx.connect({
                                 key: ONYXKEYS.COLLECTION.REPORT,
                                 waitForCollectionCallback: true,
                                 callback: (allReports) => {
-                                    Onyx.disconnect(connectionID);
-                                    expenseReport = Object.values(allReports ?? {}).find((report) => report?.type === CONST.REPORT.TYPE.EXPENSE) ?? null;
+                                    Onyx.disconnect(connection);
+                                    expenseReport = Object.values(allReports ?? {}).find((report) => report?.type === CONST.REPORT.TYPE.EXPENSE);
                                     Onyx.merge(`report_${expenseReport?.reportID}`, {
                                         statusNum: 0,
                                         stateNum: 0,
@@ -3110,12 +3120,12 @@ describe('actions/IOU', () => {
                 .then(
                     () =>
                         new Promise<void>((resolve) => {
-                            const connectionID = Onyx.connect({
+                            const connection = Onyx.connect({
                                 key: ONYXKEYS.COLLECTION.REPORT,
                                 waitForCollectionCallback: true,
                                 callback: (allReports) => {
-                                    Onyx.disconnect(connectionID);
-                                    expenseReport = Object.values(allReports ?? {}).find((report) => report?.type === CONST.REPORT.TYPE.EXPENSE) ?? null;
+                                    Onyx.disconnect(connection);
+                                    expenseReport = Object.values(allReports ?? {}).find((report) => report?.type === CONST.REPORT.TYPE.EXPENSE);
 
                                     // Verify report is a draft
                                     expect(expenseReport?.stateNum).toBe(0);
@@ -3134,13 +3144,12 @@ describe('actions/IOU', () => {
                 .then(
                     () =>
                         new Promise<void>((resolve) => {
-                            const connectionID = Onyx.connect({
+                            const connection = Onyx.connect({
                                 key: ONYXKEYS.COLLECTION.REPORT,
                                 waitForCollectionCallback: true,
                                 callback: (allReports) => {
-                                    Onyx.disconnect(connectionID);
-                                    expenseReport = Object.values(allReports ?? {}).find((report) => report?.type === CONST.REPORT.TYPE.EXPENSE) ?? null;
-
+                                    Onyx.disconnect(connection);
+                                    expenseReport = Object.values(allReports ?? {}).find((report) => report?.type === CONST.REPORT.TYPE.EXPENSE);
                                     // Report was submitted correctly
                                     expect(expenseReport?.stateNum).toBe(1);
                                     expect(expenseReport?.statusNum).toBe(1);
@@ -3164,12 +3173,12 @@ describe('actions/IOU', () => {
                 .then(
                     () =>
                         new Promise<void>((resolve) => {
-                            const connectionID = Onyx.connect({
+                            const connection = Onyx.connect({
                                 key: ONYXKEYS.COLLECTION.REPORT,
                                 waitForCollectionCallback: true,
                                 callback: (allReports) => {
-                                    Onyx.disconnect(connectionID);
-                                    chatReport = Object.values(allReports ?? {}).find((report) => report?.chatType === CONST.REPORT.CHAT_TYPE.POLICY_EXPENSE_CHAT) ?? null;
+                                    Onyx.disconnect(connection);
+                                    chatReport = Object.values(allReports ?? {}).find((report) => report?.chatType === CONST.REPORT.CHAT_TYPE.POLICY_EXPENSE_CHAT);
 
                                     resolve();
                                 },
@@ -3196,12 +3205,12 @@ describe('actions/IOU', () => {
                 .then(
                     () =>
                         new Promise<void>((resolve) => {
-                            const connectionID = Onyx.connect({
+                            const connection = Onyx.connect({
                                 key: ONYXKEYS.COLLECTION.REPORT,
                                 waitForCollectionCallback: true,
                                 callback: (allReports) => {
-                                    Onyx.disconnect(connectionID);
-                                    expenseReport = Object.values(allReports ?? {}).find((report) => report?.type === CONST.REPORT.TYPE.EXPENSE) ?? null;
+                                    Onyx.disconnect(connection);
+                                    expenseReport = Object.values(allReports ?? {}).find((report) => report?.type === CONST.REPORT.TYPE.EXPENSE);
                                     Onyx.merge(`report_${expenseReport?.reportID}`, {
                                         statusNum: 0,
                                         stateNum: 0,
@@ -3214,12 +3223,12 @@ describe('actions/IOU', () => {
                 .then(
                     () =>
                         new Promise<void>((resolve) => {
-                            const connectionID = Onyx.connect({
+                            const connection = Onyx.connect({
                                 key: ONYXKEYS.COLLECTION.REPORT,
                                 waitForCollectionCallback: true,
                                 callback: (allReports) => {
-                                    Onyx.disconnect(connectionID);
-                                    expenseReport = Object.values(allReports ?? {}).find((report) => report?.type === CONST.REPORT.TYPE.EXPENSE) ?? null;
+                                    Onyx.disconnect(connection);
+                                    expenseReport = Object.values(allReports ?? {}).find((report) => report?.type === CONST.REPORT.TYPE.EXPENSE);
 
                                     // Verify report is a draft
                                     expect(expenseReport?.stateNum).toBe(0);
@@ -3238,12 +3247,12 @@ describe('actions/IOU', () => {
                 .then(
                     () =>
                         new Promise<void>((resolve) => {
-                            const connectionID = Onyx.connect({
+                            const connection = Onyx.connect({
                                 key: ONYXKEYS.COLLECTION.REPORT,
                                 waitForCollectionCallback: true,
                                 callback: (allReports) => {
-                                    Onyx.disconnect(connectionID);
-                                    expenseReport = Object.values(allReports ?? {}).find((report) => report?.type === CONST.REPORT.TYPE.EXPENSE) ?? null;
+                                    Onyx.disconnect(connection);
+                                    expenseReport = Object.values(allReports ?? {}).find((report) => report?.type === CONST.REPORT.TYPE.EXPENSE);
 
                                     // Report is closed since the default policy settings is Submit and Close
                                     expect(expenseReport?.stateNum).toBe(2);
@@ -3268,12 +3277,12 @@ describe('actions/IOU', () => {
                 .then(
                     () =>
                         new Promise<void>((resolve) => {
-                            const connectionID = Onyx.connect({
+                            const connection = Onyx.connect({
                                 key: ONYXKEYS.COLLECTION.REPORT,
                                 waitForCollectionCallback: true,
                                 callback: (allReports) => {
-                                    Onyx.disconnect(connectionID);
-                                    chatReport = Object.values(allReports ?? {}).find((report) => report?.chatType === CONST.REPORT.CHAT_TYPE.POLICY_EXPENSE_CHAT) ?? null;
+                                    Onyx.disconnect(connection);
+                                    chatReport = Object.values(allReports ?? {}).find((report) => report?.chatType === CONST.REPORT.CHAT_TYPE.POLICY_EXPENSE_CHAT);
 
                                     resolve();
                                 },
@@ -3300,12 +3309,12 @@ describe('actions/IOU', () => {
                 .then(
                     () =>
                         new Promise<void>((resolve) => {
-                            const connectionID = Onyx.connect({
+                            const connection = Onyx.connect({
                                 key: ONYXKEYS.COLLECTION.REPORT,
                                 waitForCollectionCallback: true,
                                 callback: (allReports) => {
-                                    Onyx.disconnect(connectionID);
-                                    expenseReport = Object.values(allReports ?? {}).find((report) => report?.type === CONST.REPORT.TYPE.EXPENSE) ?? null;
+                                    Onyx.disconnect(connection);
+                                    expenseReport = Object.values(allReports ?? {}).find((report) => report?.type === CONST.REPORT.TYPE.EXPENSE);
                                     Onyx.merge(`report_${expenseReport?.reportID}`, {
                                         statusNum: 0,
                                         stateNum: 0,
@@ -3318,12 +3327,12 @@ describe('actions/IOU', () => {
                 .then(
                     () =>
                         new Promise<void>((resolve) => {
-                            const connectionID = Onyx.connect({
+                            const connection = Onyx.connect({
                                 key: ONYXKEYS.COLLECTION.REPORT,
                                 waitForCollectionCallback: true,
                                 callback: (allReports) => {
-                                    Onyx.disconnect(connectionID);
-                                    expenseReport = Object.values(allReports ?? {}).find((report) => report?.type === CONST.REPORT.TYPE.EXPENSE) ?? null;
+                                    Onyx.disconnect(connection);
+                                    expenseReport = Object.values(allReports ?? {}).find((report) => report?.type === CONST.REPORT.TYPE.EXPENSE);
 
                                     // Verify report is a draft
                                     expect(expenseReport?.stateNum).toBe(0);
@@ -3334,8 +3343,7 @@ describe('actions/IOU', () => {
                         }),
                 )
                 .then(() => {
-                    // @ts-expect-error TODO: Remove this once TestHelper (https://github.com/Expensify/App/issues/25318) is migrated to TypeScript.
-                    fetch.fail();
+                    mockFetch?.fail?.();
                     if (expenseReport) {
                         IOU.submitReport(expenseReport);
                     }
@@ -3344,12 +3352,12 @@ describe('actions/IOU', () => {
                 .then(
                     () =>
                         new Promise<void>((resolve) => {
-                            const connectionID = Onyx.connect({
+                            const connection = Onyx.connect({
                                 key: ONYXKEYS.COLLECTION.REPORT,
                                 waitForCollectionCallback: true,
                                 callback: (allReports) => {
-                                    Onyx.disconnect(connectionID);
-                                    expenseReport = Object.values(allReports ?? {}).find((report) => report?.type === CONST.REPORT.TYPE.EXPENSE) ?? null;
+                                    Onyx.disconnect(connection);
+                                    expenseReport = Object.values(allReports ?? {}).find((report) => report?.type === CONST.REPORT.TYPE.EXPENSE);
 
                                     // Report was submitted with some fail
                                     expect(expenseReport?.stateNum).toBe(0);
diff --git a/tests/actions/OnyxUpdateManagerTest.ts b/tests/actions/OnyxUpdateManagerTest.ts
index d1a10f8a4775..3a4ff0779217 100644
--- a/tests/actions/OnyxUpdateManagerTest.ts
+++ b/tests/actions/OnyxUpdateManagerTest.ts
@@ -20,7 +20,7 @@ import createOnyxMockUpdate from '../utils/createOnyxMockUpdate';
 jest.mock('@libs/actions/App');
 jest.mock('@libs/actions/OnyxUpdateManager/utils');
 jest.mock('@libs/actions/OnyxUpdateManager/utils/applyUpdates', () => {
-    const ApplyUpdatesImplementation: typeof ApplyUpdatesImport = jest.requireActual('@libs/actions/OnyxUpdateManager/utils/applyUpdates');
+    const ApplyUpdatesImplementation = jest.requireActual<typeof ApplyUpdatesImport>('@libs/actions/OnyxUpdateManager/utils/applyUpdates');
 
     return {
         applyUpdates: jest.fn((updates: DeferredUpdatesDictionary) => ApplyUpdatesImplementation.applyUpdates(updates)),
diff --git a/tests/actions/PolicyCategoryTest.ts b/tests/actions/PolicyCategoryTest.ts
new file mode 100644
index 000000000000..e470771d492f
--- /dev/null
+++ b/tests/actions/PolicyCategoryTest.ts
@@ -0,0 +1,247 @@
+import Onyx from 'react-native-onyx';
+import CONST from '@src/CONST';
+import OnyxUpdateManager from '@src/libs/actions/OnyxUpdateManager';
+import * as Category from '@src/libs/actions/Policy/Category';
+import ONYXKEYS from '@src/ONYXKEYS';
+import createRandomPolicy from '../utils/collections/policies';
+import createRandomPolicyCategories from '../utils/collections/policyCategory';
+import * as TestHelper from '../utils/TestHelper';
+import type {MockFetch} from '../utils/TestHelper';
+import waitForBatchedUpdates from '../utils/waitForBatchedUpdates';
+
+OnyxUpdateManager();
+describe('actions/PolicyCategory', () => {
+    beforeAll(() => {
+        Onyx.init({
+            keys: ONYXKEYS,
+        });
+    });
+
+    let mockFetch: MockFetch;
+    beforeEach(() => {
+        global.fetch = TestHelper.getGlobalFetchMock();
+        mockFetch = fetch as MockFetch;
+        return Onyx.clear().then(waitForBatchedUpdates);
+    });
+
+    describe('setWorkspaceRequiresCategory', () => {
+        it('Enable require category', async () => {
+            const fakePolicy = createRandomPolicy(0);
+            fakePolicy.requiresCategory = false;
+
+            mockFetch?.pause?.();
+            Onyx.set(`${ONYXKEYS.COLLECTION.POLICY}${fakePolicy.id}`, fakePolicy);
+            Category.setWorkspaceRequiresCategory(fakePolicy.id, true);
+            await waitForBatchedUpdates();
+            await new Promise<void>((resolve) => {
+                const connection = Onyx.connect({
+                    key: `${ONYXKEYS.COLLECTION.POLICY}${fakePolicy.id}`,
+                    waitForCollectionCallback: false,
+                    callback: (policy) => {
+                        Onyx.disconnect(connection);
+                        // Check if policy requiresCategory was updated with correct values
+                        expect(policy?.requiresCategory).toBeTruthy();
+                        expect(policy?.pendingFields?.requiresCategory).toBe(CONST.RED_BRICK_ROAD_PENDING_ACTION.UPDATE);
+                        expect(policy?.errors?.requiresCategory).toBeFalsy();
+                        resolve();
+                    },
+                });
+            });
+            await mockFetch?.resume?.();
+            await waitForBatchedUpdates();
+            await new Promise<void>((resolve) => {
+                const connection = Onyx.connect({
+                    key: `${ONYXKEYS.COLLECTION.POLICY}${fakePolicy.id}`,
+                    waitForCollectionCallback: false,
+                    callback: (policy) => {
+                        Onyx.disconnect(connection);
+                        // Check if the policy pendingFields was cleared
+                        expect(policy?.pendingFields?.requiresCategory).toBeFalsy();
+                        resolve();
+                    },
+                });
+            });
+        });
+    });
+    describe('createWorkspaceCategories', () => {
+        it('Create a new policy category', async () => {
+            const fakePolicy = createRandomPolicy(0);
+            const fakeCategories = createRandomPolicyCategories(3);
+            const newCategoryName = 'New category';
+            mockFetch?.pause?.();
+            Onyx.set(`${ONYXKEYS.COLLECTION.POLICY}${fakePolicy.id}`, fakePolicy);
+            Onyx.set(`${ONYXKEYS.COLLECTION.POLICY_CATEGORIES}${fakePolicy.id}`, fakeCategories);
+            Category.createPolicyCategory(fakePolicy.id, newCategoryName);
+            await waitForBatchedUpdates();
+            await new Promise<void>((resolve) => {
+                const connection = Onyx.connect({
+                    key: `${ONYXKEYS.COLLECTION.POLICY_CATEGORIES}${fakePolicy.id}`,
+                    waitForCollectionCallback: false,
+                    callback: (policyCategories) => {
+                        Onyx.disconnect(connection);
+                        const newCategory = policyCategories?.[newCategoryName];
+
+                        expect(newCategory?.name).toBe(newCategoryName);
+                        expect(newCategory?.errors).toBeFalsy();
+
+                        resolve();
+                    },
+                });
+            });
+            await mockFetch?.resume?.();
+            await waitForBatchedUpdates();
+            await new Promise<void>((resolve) => {
+                const connection = Onyx.connect({
+                    key: `${ONYXKEYS.COLLECTION.POLICY_CATEGORIES}${fakePolicy.id}`,
+                    waitForCollectionCallback: false,
+                    callback: (policyCategories) => {
+                        Onyx.disconnect(connection);
+
+                        const newCategory = policyCategories?.[newCategoryName];
+                        expect(newCategory?.errors).toBeFalsy();
+                        expect(newCategory?.pendingAction).toBeFalsy();
+
+                        resolve();
+                    },
+                });
+            });
+        });
+    });
+    describe('renameWorkspaceCategory', () => {
+        it('Rename category', async () => {
+            const fakePolicy = createRandomPolicy(0);
+            const fakeCategories = createRandomPolicyCategories(3);
+            const oldCategoryName = Object.keys(fakeCategories)[0];
+            const newCategoryName = 'Updated category';
+            mockFetch?.pause?.();
+            Onyx.set(`${ONYXKEYS.COLLECTION.POLICY}${fakePolicy.id}`, fakePolicy);
+            Onyx.set(`${ONYXKEYS.COLLECTION.POLICY_CATEGORIES}${fakePolicy.id}`, fakeCategories);
+            Category.renamePolicyCategory(fakePolicy.id, {
+                oldName: oldCategoryName,
+                newName: newCategoryName,
+            });
+            await waitForBatchedUpdates();
+            await new Promise<void>((resolve) => {
+                const connection = Onyx.connect({
+                    key: `${ONYXKEYS.COLLECTION.POLICY_CATEGORIES}${fakePolicy.id}`,
+                    waitForCollectionCallback: false,
+                    callback: (policyCategories) => {
+                        Onyx.disconnect(connection);
+
+                        expect(policyCategories?.[oldCategoryName]).toBeFalsy();
+                        expect(policyCategories?.[newCategoryName]?.name).toBe(newCategoryName);
+                        expect(policyCategories?.[newCategoryName]?.pendingAction).toBe(CONST.RED_BRICK_ROAD_PENDING_ACTION.UPDATE);
+                        expect(policyCategories?.[newCategoryName]?.pendingFields?.name).toBe(CONST.RED_BRICK_ROAD_PENDING_ACTION.UPDATE);
+
+                        resolve();
+                    },
+                });
+            });
+            await mockFetch?.resume?.();
+            await waitForBatchedUpdates();
+            await new Promise<void>((resolve) => {
+                const connection = Onyx.connect({
+                    key: `${ONYXKEYS.COLLECTION.POLICY_CATEGORIES}${fakePolicy.id}`,
+                    waitForCollectionCallback: false,
+                    callback: (policyCategories) => {
+                        Onyx.disconnect(connection);
+
+                        expect(policyCategories?.[newCategoryName]?.pendingAction).toBeFalsy();
+                        expect(policyCategories?.[newCategoryName]?.pendingFields?.name).toBeFalsy();
+
+                        resolve();
+                    },
+                });
+            });
+        });
+    });
+    describe('setWorkspaceCategoriesEnabled', () => {
+        it('Enable category', async () => {
+            const fakePolicy = createRandomPolicy(0);
+            const fakeCategories = createRandomPolicyCategories(3);
+            const categoryNameToUpdate = Object.keys(fakeCategories)[0];
+            const categoriesToUpdate = {
+                [categoryNameToUpdate]: {
+                    name: categoryNameToUpdate,
+                    enabled: true,
+                },
+            };
+            mockFetch?.pause?.();
+            Onyx.set(`${ONYXKEYS.COLLECTION.POLICY}${fakePolicy.id}`, fakePolicy);
+            Onyx.set(`${ONYXKEYS.COLLECTION.POLICY_CATEGORIES}${fakePolicy.id}`, fakeCategories);
+            Category.setWorkspaceCategoryEnabled(fakePolicy.id, categoriesToUpdate);
+            await waitForBatchedUpdates();
+            await new Promise<void>((resolve) => {
+                const connection = Onyx.connect({
+                    key: `${ONYXKEYS.COLLECTION.POLICY_CATEGORIES}${fakePolicy.id}`,
+                    waitForCollectionCallback: false,
+                    callback: (policyCategories) => {
+                        Onyx.disconnect(connection);
+
+                        expect(policyCategories?.[categoryNameToUpdate]?.enabled).toBeTruthy();
+                        expect(policyCategories?.[categoryNameToUpdate]?.pendingAction).toBe(CONST.RED_BRICK_ROAD_PENDING_ACTION.UPDATE);
+                        expect(policyCategories?.[categoryNameToUpdate]?.pendingFields?.enabled).toBe(CONST.RED_BRICK_ROAD_PENDING_ACTION.UPDATE);
+                        expect(policyCategories?.[categoryNameToUpdate]?.errors).toBeFalsy();
+                        resolve();
+                    },
+                });
+            });
+            await mockFetch?.resume?.();
+            await waitForBatchedUpdates();
+            await new Promise<void>((resolve) => {
+                const connection = Onyx.connect({
+                    key: `${ONYXKEYS.COLLECTION.POLICY_CATEGORIES}${fakePolicy.id}`,
+                    waitForCollectionCallback: false,
+                    callback: (policyCategories) => {
+                        Onyx.disconnect(connection);
+
+                        expect(policyCategories?.[categoryNameToUpdate]?.pendingAction).toBeFalsy();
+                        expect(policyCategories?.[categoryNameToUpdate]?.pendingFields?.enabled).toBeFalsy();
+
+                        resolve();
+                    },
+                });
+            });
+        });
+    });
+
+    describe('deleteWorkspaceCategories', () => {
+        it('Delete category', async () => {
+            const fakePolicy = createRandomPolicy(0);
+            const fakeCategories = createRandomPolicyCategories(3);
+            const categoryNameToDelete = Object.keys(fakeCategories)[0];
+            const categoriesToDelete = [categoryNameToDelete];
+            mockFetch?.pause?.();
+            Onyx.set(`${ONYXKEYS.COLLECTION.POLICY}${fakePolicy.id}`, fakePolicy);
+            Onyx.set(`${ONYXKEYS.COLLECTION.POLICY_CATEGORIES}${fakePolicy.id}`, fakeCategories);
+            Category.deleteWorkspaceCategories(fakePolicy.id, categoriesToDelete);
+            await waitForBatchedUpdates();
+            await new Promise<void>((resolve) => {
+                const connection = Onyx.connect({
+                    key: `${ONYXKEYS.COLLECTION.POLICY_CATEGORIES}${fakePolicy.id}`,
+                    waitForCollectionCallback: false,
+                    callback: (policyCategories) => {
+                        Onyx.disconnect(connection);
+
+                        expect(policyCategories?.[categoryNameToDelete]?.pendingAction).toBe(CONST.RED_BRICK_ROAD_PENDING_ACTION.DELETE);
+                        resolve();
+                    },
+                });
+            });
+            await mockFetch?.resume?.();
+            await waitForBatchedUpdates();
+            await new Promise<void>((resolve) => {
+                const connection = Onyx.connect({
+                    key: `${ONYXKEYS.COLLECTION.POLICY_CATEGORIES}${fakePolicy.id}`,
+                    waitForCollectionCallback: false,
+                    callback: (policyCategories) => {
+                        Onyx.disconnect(connection);
+                        expect(policyCategories?.[categoryNameToDelete]).toBeFalsy();
+
+                        resolve();
+                    },
+                });
+            });
+        });
+    });
+});
diff --git a/tests/actions/PolicyMemberTest.ts b/tests/actions/PolicyMemberTest.ts
new file mode 100644
index 000000000000..f9ac32010a23
--- /dev/null
+++ b/tests/actions/PolicyMemberTest.ts
@@ -0,0 +1,231 @@
+import Onyx from 'react-native-onyx';
+import CONST from '@src/CONST';
+import OnyxUpdateManager from '@src/libs/actions/OnyxUpdateManager';
+import * as Member from '@src/libs/actions/Policy/Member';
+import * as Policy from '@src/libs/actions/Policy/Policy';
+import * as ReportActionsUtils from '@src/libs/ReportActionsUtils';
+import ONYXKEYS from '@src/ONYXKEYS';
+import type {Policy as PolicyType, Report, ReportAction} from '@src/types/onyx';
+import {isEmptyObject} from '@src/types/utils/EmptyObject';
+import createPersonalDetails from '../utils/collections/personalDetails';
+import createRandomPolicy from '../utils/collections/policies';
+import createRandomReportAction from '../utils/collections/reportActions';
+import createRandomReport from '../utils/collections/reports';
+import * as TestHelper from '../utils/TestHelper';
+import type {MockFetch} from '../utils/TestHelper';
+import waitForBatchedUpdates from '../utils/waitForBatchedUpdates';
+
+OnyxUpdateManager();
+describe('actions/PolicyMember', () => {
+    beforeAll(() => {
+        Onyx.init({
+            keys: ONYXKEYS,
+        });
+    });
+
+    let mockFetch: MockFetch;
+    beforeEach(() => {
+        global.fetch = TestHelper.getGlobalFetchMock();
+        mockFetch = fetch as MockFetch;
+        return Onyx.clear().then(waitForBatchedUpdates);
+    });
+
+    describe('acceptJoinRequest', () => {
+        it('Accept user join request to a workspace', async () => {
+            const fakePolicy = createRandomPolicy(0);
+            const fakeReport: Report = {
+                ...createRandomReport(0),
+                policyID: fakePolicy.id,
+            };
+            const fakeReportAction = {
+                ...createRandomReportAction(0),
+                actionName: CONST.REPORT.ACTIONS.TYPE.ACTIONABLE_JOIN_REQUEST,
+            } as ReportAction<typeof CONST.REPORT.ACTIONS.TYPE.ACTIONABLE_JOIN_REQUEST>;
+
+            mockFetch?.pause?.();
+            Onyx.set(`${ONYXKEYS.COLLECTION.POLICY}${fakePolicy.id}`, fakePolicy);
+            Onyx.set(`${ONYXKEYS.COLLECTION.REPORT}${fakeReport.reportID}`, fakeReport);
+            Onyx.merge(`${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${fakeReport.reportID}`, {
+                [fakeReportAction.reportActionID]: fakeReportAction,
+            });
+            Member.acceptJoinRequest(fakeReport.reportID, fakeReportAction);
+            await waitForBatchedUpdates();
+            await new Promise<void>((resolve) => {
+                const connection = Onyx.connect({
+                    key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${fakeReport.reportID}`,
+                    waitForCollectionCallback: false,
+                    callback: (reportActions) => {
+                        Onyx.disconnect(connection);
+
+                        const reportAction = reportActions?.[fakeReportAction.reportActionID] as ReportAction<typeof CONST.REPORT.ACTIONS.TYPE.ACTIONABLE_JOIN_REQUEST>;
+
+                        if (!isEmptyObject(reportAction)) {
+                            expect(ReportActionsUtils.getOriginalMessage(reportAction)?.choice)?.toBe(CONST.REPORT.ACTIONABLE_MENTION_JOIN_WORKSPACE_RESOLUTION.ACCEPT);
+                            expect(reportAction?.pendingAction).toBe(CONST.RED_BRICK_ROAD_PENDING_ACTION.UPDATE);
+                        }
+                        resolve();
+                    },
+                });
+            });
+            await mockFetch?.resume?.();
+            await waitForBatchedUpdates();
+            await new Promise<void>((resolve) => {
+                const connection = Onyx.connect({
+                    key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${fakeReport.reportID}`,
+                    waitForCollectionCallback: false,
+                    callback: (reportActions) => {
+                        Onyx.disconnect(connection);
+
+                        const reportAction = reportActions?.[fakeReportAction.reportActionID];
+
+                        if (!isEmptyObject(reportAction)) {
+                            expect(reportAction?.pendingAction).toBeFalsy();
+                        }
+                        resolve();
+                    },
+                });
+            });
+        });
+    });
+    describe('updateWorkspaceMembersRole', () => {
+        it('Update member to admin role', async () => {
+            const fakeUser2 = createPersonalDetails(2);
+            const fakePolicy: PolicyType = {
+                ...createRandomPolicy(0),
+                employeeList: {
+                    [fakeUser2.login ?? '']: {
+                        email: fakeUser2.login,
+                        role: CONST.POLICY.ROLE.USER,
+                    },
+                },
+            };
+
+            mockFetch?.pause?.();
+            Onyx.set(`${ONYXKEYS.COLLECTION.POLICY}${fakePolicy.id}`, fakePolicy);
+            Onyx.set(`${ONYXKEYS.PERSONAL_DETAILS_LIST}`, {[fakeUser2.accountID]: fakeUser2});
+            await waitForBatchedUpdates();
+            Member.updateWorkspaceMembersRole(fakePolicy.id, [fakeUser2.accountID], CONST.POLICY.ROLE.ADMIN);
+            await waitForBatchedUpdates();
+            await new Promise<void>((resolve) => {
+                const connection = Onyx.connect({
+                    key: `${ONYXKEYS.COLLECTION.POLICY}${fakePolicy.id}`,
+                    waitForCollectionCallback: false,
+                    callback: (policy) => {
+                        Onyx.disconnect(connection);
+                        const employee = policy?.employeeList?.[fakeUser2?.login ?? ''];
+                        expect(employee?.role).toBe(CONST.POLICY.ROLE.ADMIN);
+
+                        resolve();
+                    },
+                });
+            });
+            await mockFetch?.resume?.();
+            await waitForBatchedUpdates();
+            await new Promise<void>((resolve) => {
+                const connection = Onyx.connect({
+                    key: `${ONYXKEYS.COLLECTION.POLICY}${fakePolicy.id}`,
+                    waitForCollectionCallback: false,
+                    callback: (policy) => {
+                        Onyx.disconnect(connection);
+                        const employee = policy?.employeeList?.[fakeUser2?.login ?? ''];
+                        expect(employee?.pendingAction).toBeFalsy();
+                        resolve();
+                    },
+                });
+            });
+        });
+    });
+    describe('requestWorkspaceOwnerChange', () => {
+        it('Change the workspace`s owner', async () => {
+            const fakePolicy: PolicyType = createRandomPolicy(0);
+            const fakeEmail = 'fake@gmail.com';
+            const fakeAccountID = 1;
+
+            mockFetch?.pause?.();
+            Onyx.set(`${ONYXKEYS.COLLECTION.POLICY}${fakePolicy.id}`, fakePolicy);
+            Onyx.merge(ONYXKEYS.SESSION, {email: fakeEmail, accountID: fakeAccountID});
+            Member.requestWorkspaceOwnerChange(fakePolicy.id);
+            await waitForBatchedUpdates();
+            await new Promise<void>((resolve) => {
+                const connection = Onyx.connect({
+                    key: `${ONYXKEYS.COLLECTION.POLICY}${fakePolicy.id}`,
+                    waitForCollectionCallback: false,
+                    callback: (policy) => {
+                        Onyx.disconnect(connection);
+                        expect(policy?.errorFields).toBeFalsy();
+                        expect(policy?.isLoading).toBeTruthy();
+                        expect(policy?.isChangeOwnerSuccessful).toBeFalsy();
+                        expect(policy?.isChangeOwnerFailed).toBeFalsy();
+                        resolve();
+                    },
+                });
+            });
+            await mockFetch?.resume?.();
+            await waitForBatchedUpdates();
+            await new Promise<void>((resolve) => {
+                const connection = Onyx.connect({
+                    key: `${ONYXKEYS.COLLECTION.POLICY}${fakePolicy.id}`,
+                    waitForCollectionCallback: false,
+                    callback: (policy) => {
+                        Onyx.disconnect(connection);
+                        expect(policy?.isLoading).toBeFalsy();
+                        expect(policy?.isChangeOwnerSuccessful).toBeTruthy();
+                        expect(policy?.isChangeOwnerFailed)?.toBeFalsy();
+                        resolve();
+                    },
+                });
+            });
+        });
+    });
+    describe('addBillingCardAndRequestPolicyOwnerChange', () => {
+        it('Add billing card and change the workspace`s owner', async () => {
+            const fakePolicy: PolicyType = createRandomPolicy(0);
+            const fakeEmail = 'fake@gmail.com';
+            const fakeCard = {
+                cardNumber: '1234567890123456',
+                cardYear: '2023',
+                cardMonth: '05',
+                cardCVV: '123',
+                addressName: 'John Doe',
+                addressZip: '12345',
+                currency: 'USD',
+            };
+            const fakeAccountID = 1;
+
+            mockFetch?.pause?.();
+            Onyx.set(`${ONYXKEYS.COLLECTION.POLICY}${fakePolicy.id}`, fakePolicy);
+            Onyx.merge(ONYXKEYS.SESSION, {email: fakeEmail, accountID: fakeAccountID});
+            Policy.addBillingCardAndRequestPolicyOwnerChange(fakePolicy.id, fakeCard);
+            await waitForBatchedUpdates();
+            await new Promise<void>((resolve) => {
+                const connection = Onyx.connect({
+                    key: `${ONYXKEYS.COLLECTION.POLICY}${fakePolicy.id}`,
+                    waitForCollectionCallback: false,
+                    callback: (policy) => {
+                        Onyx.disconnect(connection);
+                        expect(policy?.errorFields).toBeFalsy();
+                        expect(policy?.isLoading).toBeTruthy();
+                        expect(policy?.isChangeOwnerSuccessful).toBeFalsy();
+                        expect(policy?.isChangeOwnerFailed).toBeFalsy();
+                        resolve();
+                    },
+                });
+            });
+            await mockFetch?.resume?.();
+            await waitForBatchedUpdates();
+            await new Promise<void>((resolve) => {
+                const connection = Onyx.connect({
+                    key: `${ONYXKEYS.COLLECTION.POLICY}${fakePolicy.id}`,
+                    waitForCollectionCallback: false,
+                    callback: (policy) => {
+                        Onyx.disconnect(connection);
+                        expect(policy?.isLoading).toBeFalsy();
+                        expect(policy?.isChangeOwnerSuccessful).toBeTruthy();
+                        expect(policy?.isChangeOwnerFailed)?.toBeFalsy();
+                        resolve();
+                    },
+                });
+            });
+        });
+    });
+});
diff --git a/tests/actions/PolicyProfileTest.ts b/tests/actions/PolicyProfileTest.ts
new file mode 100644
index 000000000000..7232ed33227f
--- /dev/null
+++ b/tests/actions/PolicyProfileTest.ts
@@ -0,0 +1,68 @@
+import Onyx from 'react-native-onyx';
+import CONST from '@src/CONST';
+import OnyxUpdateManager from '@src/libs/actions/OnyxUpdateManager';
+import * as Policy from '@src/libs/actions/Policy/Policy';
+import * as ReportUtils from '@src/libs/ReportUtils';
+import ONYXKEYS from '@src/ONYXKEYS';
+import createRandomPolicy from '../utils/collections/policies';
+import * as TestHelper from '../utils/TestHelper';
+import type {MockFetch} from '../utils/TestHelper';
+import waitForBatchedUpdates from '../utils/waitForBatchedUpdates';
+
+OnyxUpdateManager();
+describe('actions/PolicyProfile', () => {
+    beforeAll(() => {
+        Onyx.init({
+            keys: ONYXKEYS,
+        });
+    });
+
+    let mockFetch: MockFetch;
+    beforeEach(() => {
+        global.fetch = TestHelper.getGlobalFetchMock();
+        mockFetch = fetch as MockFetch;
+        return Onyx.clear().then(waitForBatchedUpdates);
+    });
+
+    describe('updateWorkspaceDescription', () => {
+        it('Update workspace`s description', async () => {
+            const fakePolicy = createRandomPolicy(0);
+
+            const oldDescription = fakePolicy.description ?? '';
+            const newDescription = 'Updated description';
+            const parsedDescription = ReportUtils.getParsedComment(newDescription);
+            mockFetch?.pause?.();
+            Onyx.set(`${ONYXKEYS.COLLECTION.POLICY}${fakePolicy.id}`, fakePolicy);
+            Policy.updateWorkspaceDescription(fakePolicy.id, newDescription, oldDescription);
+            await waitForBatchedUpdates();
+            await new Promise<void>((resolve) => {
+                const connection = Onyx.connect({
+                    key: `${ONYXKEYS.COLLECTION.POLICY}${fakePolicy.id}`,
+                    waitForCollectionCallback: false,
+                    callback: (policy) => {
+                        Onyx.disconnect(connection);
+
+                        expect(policy?.description).toBe(parsedDescription);
+                        expect(policy?.pendingFields?.description).toBe(CONST.RED_BRICK_ROAD_PENDING_ACTION.UPDATE);
+                        expect(policy?.errorFields?.description).toBeFalsy();
+                        resolve();
+                    },
+                });
+            });
+            await mockFetch?.resume?.();
+            await waitForBatchedUpdates();
+            await new Promise<void>((resolve) => {
+                const connection = Onyx.connect({
+                    key: `${ONYXKEYS.COLLECTION.POLICY}${fakePolicy.id}`,
+                    waitForCollectionCallback: false,
+                    callback: (policy) => {
+                        Onyx.disconnect(connection);
+                        expect(policy?.pendingFields?.description).toBeFalsy();
+
+                        resolve();
+                    },
+                });
+            });
+        });
+    });
+});
diff --git a/tests/actions/PolicyTagTest.ts b/tests/actions/PolicyTagTest.ts
index ff4439c392fa..19749c7eb644 100644
--- a/tests/actions/PolicyTagTest.ts
+++ b/tests/actions/PolicyTagTest.ts
@@ -1,12 +1,13 @@
 import Onyx from 'react-native-onyx';
 import OnyxUpdateManager from '@libs/actions/OnyxUpdateManager';
-import * as Policy from '@libs/actions/Policy';
+import * as Tag from '@userActions/Policy/Tag';
 import CONST from '@src/CONST';
 import ONYXKEYS from '@src/ONYXKEYS';
 import type {PolicyTags} from '@src/types/onyx';
 import createRandomPolicy from '../utils/collections/policies';
 import createRandomPolicyTags from '../utils/collections/policyTags';
 import * as TestHelper from '../utils/TestHelper';
+import type {MockFetch} from '../utils/TestHelper';
 import waitForBatchedUpdates from '../utils/waitForBatchedUpdates';
 
 OnyxUpdateManager();
@@ -17,9 +18,10 @@ describe('actions/Policy', () => {
         });
     });
 
+    let mockFetch: MockFetch;
     beforeEach(() => {
-        // @ts-expect-error TODO: Remove this once TestHelper (https://github.com/Expensify/App/issues/25318) is migrated to TypeScript.
         global.fetch = TestHelper.getGlobalFetchMock();
+        mockFetch = fetch as MockFetch;
         return Onyx.clear().then(waitForBatchedUpdates);
     });
 
@@ -28,139 +30,127 @@ describe('actions/Policy', () => {
             const fakePolicy = createRandomPolicy(0);
             fakePolicy.requiresTag = false;
 
-            // @ts-expect-error TODO: Remove this once TestHelper (https://github.com/Expensify/App/issues/25318) is migrated to TypeScript.
-            fetch.pause();
-
-            return (
-                Onyx.set(`${ONYXKEYS.COLLECTION.POLICY}${fakePolicy.id}`, fakePolicy)
-                    .then(() => {
-                        Policy.setPolicyRequiresTag(fakePolicy.id, true);
-                        return waitForBatchedUpdates();
-                    })
-                    .then(
-                        () =>
-                            new Promise<void>((resolve) => {
-                                const connectionID = Onyx.connect({
-                                    key: `${ONYXKEYS.COLLECTION.POLICY}${fakePolicy.id}`,
-                                    waitForCollectionCallback: false,
-                                    callback: (policy) => {
-                                        Onyx.disconnect(connectionID);
-
-                                        // RequiresTag is enabled and pending
-                                        expect(policy?.requiresTag).toBeTruthy();
-                                        expect(policy?.pendingFields?.requiresTag).toBe(CONST.RED_BRICK_ROAD_PENDING_ACTION.UPDATE);
-
-                                        resolve();
-                                    },
-                                });
-                            }),
-                    )
-                    // @ts-expect-error TODO: Remove this once TestHelper (https://github.com/Expensify/App/issues/25318) is migrated to TypeScript.
-                    .then(fetch.resume)
-                    .then(waitForBatchedUpdates)
-                    .then(
-                        () =>
-                            new Promise<void>((resolve) => {
-                                const connectionID = Onyx.connect({
-                                    key: `${ONYXKEYS.COLLECTION.POLICY}${fakePolicy.id}`,
-                                    waitForCollectionCallback: false,
-                                    callback: (policy) => {
-                                        Onyx.disconnect(connectionID);
-                                        expect(policy?.pendingFields?.requiresTag).toBeFalsy();
-                                        resolve();
-                                    },
-                                });
-                            }),
-                    )
-            );
+            mockFetch?.pause?.();
+
+            return Onyx.set(`${ONYXKEYS.COLLECTION.POLICY}${fakePolicy.id}`, fakePolicy)
+                .then(() => {
+                    Tag.setPolicyRequiresTag(fakePolicy.id, true);
+                    return waitForBatchedUpdates();
+                })
+                .then(
+                    () =>
+                        new Promise<void>((resolve) => {
+                            const connection = Onyx.connect({
+                                key: `${ONYXKEYS.COLLECTION.POLICY}${fakePolicy.id}`,
+                                waitForCollectionCallback: false,
+                                callback: (policy) => {
+                                    Onyx.disconnect(connection);
+
+                                    // RequiresTag is enabled and pending
+                                    expect(policy?.requiresTag).toBeTruthy();
+                                    expect(policy?.pendingFields?.requiresTag).toBe(CONST.RED_BRICK_ROAD_PENDING_ACTION.UPDATE);
+
+                                    resolve();
+                                },
+                            });
+                        }),
+                )
+                .then(mockFetch?.resume)
+                .then(waitForBatchedUpdates)
+                .then(
+                    () =>
+                        new Promise<void>((resolve) => {
+                            const connection = Onyx.connect({
+                                key: `${ONYXKEYS.COLLECTION.POLICY}${fakePolicy.id}`,
+                                waitForCollectionCallback: false,
+                                callback: (policy) => {
+                                    Onyx.disconnect(connection);
+                                    expect(policy?.pendingFields?.requiresTag).toBeFalsy();
+                                    resolve();
+                                },
+                            });
+                        }),
+                );
         });
 
         it('disable require tag', () => {
             const fakePolicy = createRandomPolicy(0);
             fakePolicy.requiresTag = true;
 
-            // @ts-expect-error TODO: Remove this once TestHelper (https://github.com/Expensify/App/issues/25318) is migrated to TypeScript.
-            fetch.pause();
-
-            return (
-                Onyx.set(`${ONYXKEYS.COLLECTION.POLICY}${fakePolicy.id}`, fakePolicy)
-                    .then(() => {
-                        Policy.setPolicyRequiresTag(fakePolicy.id, false);
-                        return waitForBatchedUpdates();
-                    })
-                    .then(
-                        () =>
-                            new Promise<void>((resolve) => {
-                                const connectionID = Onyx.connect({
-                                    key: `${ONYXKEYS.COLLECTION.POLICY}${fakePolicy.id}`,
-                                    waitForCollectionCallback: false,
-                                    callback: (policy) => {
-                                        Onyx.disconnect(connectionID);
-
-                                        // RequiresTag is disabled and pending
-                                        expect(policy?.requiresTag).toBeFalsy();
-                                        expect(policy?.pendingFields?.requiresTag).toBe(CONST.RED_BRICK_ROAD_PENDING_ACTION.UPDATE);
-
-                                        resolve();
-                                    },
-                                });
-                            }),
-                    )
-                    // @ts-expect-error TODO: Remove this once TestHelper (https://github.com/Expensify/App/issues/25318) is migrated to TypeScript.
-                    .then(fetch.resume)
-                    .then(waitForBatchedUpdates)
-                    .then(
-                        () =>
-                            new Promise<void>((resolve) => {
-                                const connectionID = Onyx.connect({
-                                    key: `${ONYXKEYS.COLLECTION.POLICY}${fakePolicy.id}`,
-                                    waitForCollectionCallback: false,
-                                    callback: (policy) => {
-                                        Onyx.disconnect(connectionID);
-                                        expect(policy?.pendingFields?.requiresTag).toBeFalsy();
-                                        resolve();
-                                    },
-                                });
-                            }),
-                    )
-            );
+            mockFetch?.pause?.();
+
+            return Onyx.set(`${ONYXKEYS.COLLECTION.POLICY}${fakePolicy.id}`, fakePolicy)
+                .then(() => {
+                    Tag.setPolicyRequiresTag(fakePolicy.id, false);
+                    return waitForBatchedUpdates();
+                })
+                .then(
+                    () =>
+                        new Promise<void>((resolve) => {
+                            const connection = Onyx.connect({
+                                key: `${ONYXKEYS.COLLECTION.POLICY}${fakePolicy.id}`,
+                                waitForCollectionCallback: false,
+                                callback: (policy) => {
+                                    Onyx.disconnect(connection);
+
+                                    // RequiresTag is disabled and pending
+                                    expect(policy?.requiresTag).toBeFalsy();
+                                    expect(policy?.pendingFields?.requiresTag).toBe(CONST.RED_BRICK_ROAD_PENDING_ACTION.UPDATE);
+
+                                    resolve();
+                                },
+                            });
+                        }),
+                )
+                .then(mockFetch?.resume)
+                .then(waitForBatchedUpdates)
+                .then(
+                    () =>
+                        new Promise<void>((resolve) => {
+                            const connection = Onyx.connect({
+                                key: `${ONYXKEYS.COLLECTION.POLICY}${fakePolicy.id}`,
+                                waitForCollectionCallback: false,
+                                callback: (policy) => {
+                                    Onyx.disconnect(connection);
+                                    expect(policy?.pendingFields?.requiresTag).toBeFalsy();
+                                    resolve();
+                                },
+                            });
+                        }),
+                );
         });
 
         it('reset require tag when api returns an error', () => {
             const fakePolicy = createRandomPolicy(0);
             fakePolicy.requiresTag = true;
 
-            // @ts-expect-error TODO: Remove this once TestHelper (https://github.com/Expensify/App/issues/25318) is migrated to TypeScript.
-            fetch.pause();
-
-            return (
-                Onyx.set(`${ONYXKEYS.COLLECTION.POLICY}${fakePolicy.id}`, fakePolicy)
-                    .then(() => {
-                        // @ts-expect-error TODO: Remove this once TestHelper (https://github.com/Expensify/App/issues/25318) is migrated to TypeScript.
-                        fetch.fail();
-                        Policy.setPolicyRequiresTag(fakePolicy.id, false);
-                        return waitForBatchedUpdates();
-                    })
-                    // @ts-expect-error TODO: Remove this once TestHelper (https://github.com/Expensify/App/issues/25318) is migrated to TypeScript.
-                    .then(fetch.resume)
-                    .then(waitForBatchedUpdates)
-                    .then(
-                        () =>
-                            new Promise<void>((resolve) => {
-                                const connectionID = Onyx.connect({
-                                    key: `${ONYXKEYS.COLLECTION.POLICY}${fakePolicy.id}`,
-                                    waitForCollectionCallback: false,
-                                    callback: (policy) => {
-                                        Onyx.disconnect(connectionID);
-                                        expect(policy?.pendingFields?.requiresTag).toBeFalsy();
-                                        expect(policy?.errors).toBeTruthy();
-                                        expect(policy?.requiresTag).toBeTruthy();
-                                        resolve();
-                                    },
-                                });
-                            }),
-                    )
-            );
+            mockFetch?.pause?.();
+
+            return Onyx.set(`${ONYXKEYS.COLLECTION.POLICY}${fakePolicy.id}`, fakePolicy)
+                .then(() => {
+                    mockFetch?.fail?.();
+                    Tag.setPolicyRequiresTag(fakePolicy.id, false);
+                    return waitForBatchedUpdates();
+                })
+
+                .then(mockFetch?.resume)
+                .then(waitForBatchedUpdates)
+                .then(
+                    () =>
+                        new Promise<void>((resolve) => {
+                            const connection = Onyx.connect({
+                                key: `${ONYXKEYS.COLLECTION.POLICY}${fakePolicy.id}`,
+                                waitForCollectionCallback: false,
+                                callback: (policy) => {
+                                    Onyx.disconnect(connection);
+                                    expect(policy?.pendingFields?.requiresTag).toBeFalsy();
+                                    expect(policy?.errors).toBeTruthy();
+                                    expect(policy?.requiresTag).toBeTruthy();
+                                    resolve();
+                                },
+                            });
+                        }),
+                );
         });
     });
 
@@ -173,65 +163,62 @@ describe('actions/Policy', () => {
             const newTagListName = 'New tag list name';
             const fakePolicyTags = createRandomPolicyTags(oldTagListName);
 
-            // @ts-expect-error TODO: Remove this once TestHelper (https://github.com/Expensify/App/issues/25318) is migrated to TypeScript.
-            fetch.pause();
-
-            return (
-                Onyx.set(`${ONYXKEYS.COLLECTION.POLICY}${fakePolicy.id}`, fakePolicy)
-                    .then(() => {
-                        Onyx.set(`${ONYXKEYS.COLLECTION.POLICY_TAGS}${fakePolicy.id}`, fakePolicyTags);
-                    })
-                    .then(() => {
-                        Policy.renamePolicyTaglist(
-                            fakePolicy.id,
-                            {
-                                oldName: oldTagListName,
-                                newName: newTagListName,
-                            },
-                            fakePolicyTags,
-                        );
-                        return waitForBatchedUpdates();
-                    })
-                    .then(
-                        () =>
-                            new Promise<void>((resolve) => {
-                                const connectionID = Onyx.connect({
-                                    key: `${ONYXKEYS.COLLECTION.POLICY_TAGS}${fakePolicy.id}`,
-                                    waitForCollectionCallback: false,
-                                    callback: (policyTags) => {
-                                        Onyx.disconnect(connectionID);
-
-                                        // Tag list name is updated and pending
-                                        expect(Object.keys(policyTags?.[oldTagListName] ?? {}).length).toBe(0);
-                                        expect(policyTags?.[newTagListName]?.name).toBe(newTagListName);
-                                        expect(policyTags?.[newTagListName]?.pendingAction).toBe(CONST.RED_BRICK_ROAD_PENDING_ACTION.ADD);
-
-                                        resolve();
-                                    },
-                                });
-                            }),
-                    )
-                    // @ts-expect-error TODO: Remove this once TestHelper (https://github.com/Expensify/App/issues/25318) is migrated to TypeScript.
-                    .then(fetch.resume)
-                    .then(waitForBatchedUpdates)
-                    .then(
-                        () =>
-                            new Promise<void>((resolve) => {
-                                const connectionID = Onyx.connect({
-                                    key: `${ONYXKEYS.COLLECTION.POLICY_TAGS}${fakePolicy.id}`,
-                                    waitForCollectionCallback: false,
-                                    callback: (policyTags) => {
-                                        Onyx.disconnect(connectionID);
-
-                                        expect(policyTags?.[newTagListName]?.pendingAction).toBeFalsy();
-                                        expect(Object.keys(policyTags?.[oldTagListName] ?? {}).length).toBe(0);
-
-                                        resolve();
-                                    },
-                                });
-                            }),
-                    )
-            );
+            mockFetch?.pause?.();
+
+            return Onyx.set(`${ONYXKEYS.COLLECTION.POLICY}${fakePolicy.id}`, fakePolicy)
+                .then(() => {
+                    Onyx.set(`${ONYXKEYS.COLLECTION.POLICY_TAGS}${fakePolicy.id}`, fakePolicyTags);
+                })
+                .then(() => {
+                    Tag.renamePolicyTaglist(
+                        fakePolicy.id,
+                        {
+                            oldName: oldTagListName,
+                            newName: newTagListName,
+                        },
+                        fakePolicyTags,
+                        Object.values(fakePolicyTags)[0].orderWeight,
+                    );
+                    return waitForBatchedUpdates();
+                })
+                .then(
+                    () =>
+                        new Promise<void>((resolve) => {
+                            const connection = Onyx.connect({
+                                key: `${ONYXKEYS.COLLECTION.POLICY_TAGS}${fakePolicy.id}`,
+                                waitForCollectionCallback: false,
+                                callback: (policyTags) => {
+                                    Onyx.disconnect(connection);
+
+                                    // Tag list name is updated and pending
+                                    expect(Object.keys(policyTags?.[oldTagListName] ?? {}).length).toBe(0);
+                                    expect(policyTags?.[newTagListName]?.name).toBe(newTagListName);
+                                    expect(policyTags?.[newTagListName]?.pendingAction).toBe(CONST.RED_BRICK_ROAD_PENDING_ACTION.ADD);
+
+                                    resolve();
+                                },
+                            });
+                        }),
+                )
+                .then(mockFetch?.resume)
+                .then(waitForBatchedUpdates)
+                .then(
+                    () =>
+                        new Promise<void>((resolve) => {
+                            const connection = Onyx.connect({
+                                key: `${ONYXKEYS.COLLECTION.POLICY_TAGS}${fakePolicy.id}`,
+                                waitForCollectionCallback: false,
+                                callback: (policyTags) => {
+                                    Onyx.disconnect(connection);
+
+                                    expect(policyTags?.[newTagListName]?.pendingAction).toBeFalsy();
+                                    expect(Object.keys(policyTags?.[oldTagListName] ?? {}).length).toBe(0);
+
+                                    resolve();
+                                },
+                            });
+                        }),
+                );
         });
 
         it('reset the policy tag list name when api returns error', () => {
@@ -242,50 +229,46 @@ describe('actions/Policy', () => {
             const newTagListName = 'New tag list name';
             const fakePolicyTags = createRandomPolicyTags(oldTagListName);
 
-            // @ts-expect-error TODO: Remove this once TestHelper (https://github.com/Expensify/App/issues/25318) is migrated to TypeScript.
-            fetch.pause();
-
-            return (
-                Onyx.set(`${ONYXKEYS.COLLECTION.POLICY}${fakePolicy.id}`, fakePolicy)
-                    .then(() => {
-                        Onyx.set(`${ONYXKEYS.COLLECTION.POLICY_TAGS}${fakePolicy.id}`, fakePolicyTags);
-                    })
-                    .then(() => {
-                        // @ts-expect-error TODO: Remove this once TestHelper (https://github.com/Expensify/App/issues/25318) is migrated to TypeScript.
-                        fetch.fail();
-
-                        Policy.renamePolicyTaglist(
-                            fakePolicy.id,
-                            {
-                                oldName: oldTagListName,
-                                newName: newTagListName,
-                            },
-                            fakePolicyTags,
-                        );
-                        return waitForBatchedUpdates();
-                    })
-                    // @ts-expect-error TODO: Remove this once TestHelper (https://github.com/Expensify/App/issues/25318) is migrated to TypeScript.
-                    .then(fetch.resume)
-                    .then(waitForBatchedUpdates)
-                    .then(
-                        () =>
-                            new Promise<void>((resolve) => {
-                                const connectionID = Onyx.connect({
-                                    key: `${ONYXKEYS.COLLECTION.POLICY_TAGS}${fakePolicy.id}`,
-                                    waitForCollectionCallback: false,
-                                    callback: (policyTags) => {
-                                        Onyx.disconnect(connectionID);
-
-                                        expect(policyTags?.[newTagListName]).toBeFalsy();
-                                        expect(policyTags?.[oldTagListName]).toBeTruthy();
-                                        expect(policyTags?.errors).toBeTruthy();
-
-                                        resolve();
-                                    },
-                                });
-                            }),
-                    )
-            );
+            mockFetch?.pause?.();
+
+            return Onyx.set(`${ONYXKEYS.COLLECTION.POLICY}${fakePolicy.id}`, fakePolicy)
+                .then(() => {
+                    Onyx.set(`${ONYXKEYS.COLLECTION.POLICY_TAGS}${fakePolicy.id}`, fakePolicyTags);
+                })
+                .then(() => {
+                    mockFetch?.fail?.();
+
+                    Tag.renamePolicyTaglist(
+                        fakePolicy.id,
+                        {
+                            oldName: oldTagListName,
+                            newName: newTagListName,
+                        },
+                        fakePolicyTags,
+                        Object.values(fakePolicyTags)[0].orderWeight,
+                    );
+                    return waitForBatchedUpdates();
+                })
+                .then(mockFetch?.resume)
+                .then(waitForBatchedUpdates)
+                .then(
+                    () =>
+                        new Promise<void>((resolve) => {
+                            const connection = Onyx.connect({
+                                key: `${ONYXKEYS.COLLECTION.POLICY_TAGS}${fakePolicy.id}`,
+                                waitForCollectionCallback: false,
+                                callback: (policyTags) => {
+                                    Onyx.disconnect(connection);
+
+                                    expect(policyTags?.[newTagListName]).toBeFalsy();
+                                    expect(policyTags?.[oldTagListName]).toBeTruthy();
+                                    expect(policyTags?.[oldTagListName]?.errors).toBeTruthy();
+
+                                    resolve();
+                                },
+                            });
+                        }),
+                );
         });
     });
 
@@ -298,60 +281,56 @@ describe('actions/Policy', () => {
             const newTagName = 'new tag';
             const fakePolicyTags = createRandomPolicyTags(tagListName);
 
-            // @ts-expect-error TODO: Remove this once TestHelper (https://github.com/Expensify/App/issues/25318) is migrated to TypeScript.
-            fetch.pause();
-
-            return (
-                Onyx.set(`${ONYXKEYS.COLLECTION.POLICY}${fakePolicy.id}`, fakePolicy)
-                    .then(() => {
-                        Onyx.set(`${ONYXKEYS.COLLECTION.POLICY_TAGS}${fakePolicy.id}`, fakePolicyTags);
-                    })
-                    .then(() => {
-                        Policy.createPolicyTag(fakePolicy.id, newTagName);
-                        return waitForBatchedUpdates();
-                    })
-                    .then(
-                        () =>
-                            new Promise<void>((resolve) => {
-                                const connectionID = Onyx.connect({
-                                    key: `${ONYXKEYS.COLLECTION.POLICY_TAGS}${fakePolicy.id}`,
-                                    waitForCollectionCallback: false,
-                                    callback: (policyTags) => {
-                                        Onyx.disconnect(connectionID);
-
-                                        const newTag = policyTags?.[tagListName]?.tags?.[newTagName];
-                                        expect(newTag?.name).toBe(newTagName);
-                                        expect(newTag?.enabled).toBe(true);
-                                        expect(newTag?.errors).toBeFalsy();
-                                        expect(newTag?.pendingAction).toBe(CONST.RED_BRICK_ROAD_PENDING_ACTION.ADD);
-
-                                        resolve();
-                                    },
-                                });
-                            }),
-                    )
-                    // @ts-expect-error TODO: Remove this once TestHelper (https://github.com/Expensify/App/issues/25318) is migrated to TypeScript.
-                    .then(fetch.resume)
-                    .then(waitForBatchedUpdates)
-                    .then(
-                        () =>
-                            new Promise<void>((resolve) => {
-                                const connectionID = Onyx.connect({
-                                    key: `${ONYXKEYS.COLLECTION.POLICY_TAGS}${fakePolicy.id}`,
-                                    waitForCollectionCallback: false,
-                                    callback: (policyTags) => {
-                                        Onyx.disconnect(connectionID);
-
-                                        const newTag = policyTags?.[tagListName]?.tags?.[newTagName];
-                                        expect(newTag?.errors).toBeFalsy();
-                                        expect(newTag?.pendingAction).toBeFalsy();
-
-                                        resolve();
-                                    },
-                                });
-                            }),
-                    )
-            );
+            mockFetch?.pause?.();
+
+            return Onyx.set(`${ONYXKEYS.COLLECTION.POLICY}${fakePolicy.id}`, fakePolicy)
+                .then(() => {
+                    Onyx.set(`${ONYXKEYS.COLLECTION.POLICY_TAGS}${fakePolicy.id}`, fakePolicyTags);
+                })
+                .then(() => {
+                    Tag.createPolicyTag(fakePolicy.id, newTagName);
+                    return waitForBatchedUpdates();
+                })
+                .then(
+                    () =>
+                        new Promise<void>((resolve) => {
+                            const connection = Onyx.connect({
+                                key: `${ONYXKEYS.COLLECTION.POLICY_TAGS}${fakePolicy.id}`,
+                                waitForCollectionCallback: false,
+                                callback: (policyTags) => {
+                                    Onyx.disconnect(connection);
+
+                                    const newTag = policyTags?.[tagListName]?.tags?.[newTagName];
+                                    expect(newTag?.name).toBe(newTagName);
+                                    expect(newTag?.enabled).toBe(true);
+                                    expect(newTag?.errors).toBeFalsy();
+                                    expect(newTag?.pendingAction).toBe(CONST.RED_BRICK_ROAD_PENDING_ACTION.ADD);
+
+                                    resolve();
+                                },
+                            });
+                        }),
+                )
+                .then(mockFetch?.resume)
+                .then(waitForBatchedUpdates)
+                .then(
+                    () =>
+                        new Promise<void>((resolve) => {
+                            const connection = Onyx.connect({
+                                key: `${ONYXKEYS.COLLECTION.POLICY_TAGS}${fakePolicy.id}`,
+                                waitForCollectionCallback: false,
+                                callback: (policyTags) => {
+                                    Onyx.disconnect(connection);
+
+                                    const newTag = policyTags?.[tagListName]?.tags?.[newTagName];
+                                    expect(newTag?.errors).toBeFalsy();
+                                    expect(newTag?.pendingAction).toBeFalsy();
+
+                                    resolve();
+                                },
+                            });
+                        }),
+                );
         });
 
         it('reset new policy tag when api returns error', () => {
@@ -362,42 +341,37 @@ describe('actions/Policy', () => {
             const newTagName = 'new tag';
             const fakePolicyTags = createRandomPolicyTags(tagListName);
 
-            // @ts-expect-error TODO: Remove this once TestHelper (https://github.com/Expensify/App/issues/25318) is migrated to TypeScript.
-            fetch.pause();
-
-            return (
-                Onyx.set(`${ONYXKEYS.COLLECTION.POLICY}${fakePolicy.id}`, fakePolicy)
-                    .then(() => {
-                        Onyx.set(`${ONYXKEYS.COLLECTION.POLICY_TAGS}${fakePolicy.id}`, fakePolicyTags);
-                    })
-                    .then(() => {
-                        // @ts-expect-error TODO: Remove this once TestHelper (https://github.com/Expensify/App/issues/25318) is migrated to TypeScript.
-                        fetch.fail();
-
-                        Policy.createPolicyTag(fakePolicy.id, newTagName);
-                        return waitForBatchedUpdates();
-                    })
-                    // @ts-expect-error TODO: Remove this once TestHelper (https://github.com/Expensify/App/issues/25318) is migrated to TypeScript.
-                    .then(fetch.resume)
-                    .then(waitForBatchedUpdates)
-                    .then(
-                        () =>
-                            new Promise<void>((resolve) => {
-                                const connectionID = Onyx.connect({
-                                    key: `${ONYXKEYS.COLLECTION.POLICY_TAGS}${fakePolicy.id}`,
-                                    waitForCollectionCallback: false,
-                                    callback: (policyTags) => {
-                                        Onyx.disconnect(connectionID);
-
-                                        const newTag = policyTags?.[tagListName]?.tags?.[newTagName];
-                                        expect(newTag?.errors).toBeTruthy();
-
-                                        resolve();
-                                    },
-                                });
-                            }),
-                    )
-            );
+            mockFetch?.pause?.();
+
+            return Onyx.set(`${ONYXKEYS.COLLECTION.POLICY}${fakePolicy.id}`, fakePolicy)
+                .then(() => {
+                    Onyx.set(`${ONYXKEYS.COLLECTION.POLICY_TAGS}${fakePolicy.id}`, fakePolicyTags);
+                })
+                .then(() => {
+                    mockFetch?.fail?.();
+
+                    Tag.createPolicyTag(fakePolicy.id, newTagName);
+                    return waitForBatchedUpdates();
+                })
+                .then(mockFetch?.resume)
+                .then(waitForBatchedUpdates)
+                .then(
+                    () =>
+                        new Promise<void>((resolve) => {
+                            const connection = Onyx.connect({
+                                key: `${ONYXKEYS.COLLECTION.POLICY_TAGS}${fakePolicy.id}`,
+                                waitForCollectionCallback: false,
+                                callback: (policyTags) => {
+                                    Onyx.disconnect(connection);
+
+                                    const newTag = policyTags?.[tagListName]?.tags?.[newTagName];
+                                    expect(newTag?.errors).toBeTruthy();
+
+                                    resolve();
+                                },
+                            });
+                        }),
+                );
         });
     });
 
@@ -416,65 +390,61 @@ describe('actions/Policy', () => {
                 return acc;
             }, {});
 
-            // @ts-expect-error TODO: Remove this once TestHelper (https://github.com/Expensify/App/issues/25318) is migrated to TypeScript.
-            fetch.pause();
-
-            return (
-                Onyx.set(`${ONYXKEYS.COLLECTION.POLICY}${fakePolicy.id}`, fakePolicy)
-                    .then(() => {
-                        Onyx.set(`${ONYXKEYS.COLLECTION.POLICY_TAGS}${fakePolicy.id}`, fakePolicyTags);
-                    })
-                    .then(() => {
-                        Policy.setWorkspaceTagEnabled(fakePolicy.id, tagsToUpdate);
-                        return waitForBatchedUpdates();
-                    })
-                    .then(
-                        () =>
-                            new Promise<void>((resolve) => {
-                                const connectionID = Onyx.connect({
-                                    key: `${ONYXKEYS.COLLECTION.POLICY_TAGS}${fakePolicy.id}`,
-                                    waitForCollectionCallback: false,
-                                    callback: (policyTags) => {
-                                        Onyx.disconnect(connectionID);
-
-                                        Object.keys(tagsToUpdate).forEach((key) => {
-                                            const updatedTag = policyTags?.[tagListName]?.tags[key];
-                                            expect(updatedTag?.enabled).toBeFalsy();
-                                            expect(updatedTag?.errors).toBeFalsy();
-                                            expect(updatedTag?.pendingAction).toBe(CONST.RED_BRICK_ROAD_PENDING_ACTION.UPDATE);
-                                            expect(updatedTag?.pendingFields?.enabled).toBe(CONST.RED_BRICK_ROAD_PENDING_ACTION.UPDATE);
-                                        });
-
-                                        resolve();
-                                    },
-                                });
-                            }),
-                    )
-                    // @ts-expect-error TODO: Remove this once TestHelper (https://github.com/Expensify/App/issues/25318) is migrated to TypeScript.
-                    .then(fetch.resume)
-                    .then(waitForBatchedUpdates)
-                    .then(
-                        () =>
-                            new Promise<void>((resolve) => {
-                                const connectionID = Onyx.connect({
-                                    key: `${ONYXKEYS.COLLECTION.POLICY_TAGS}${fakePolicy.id}`,
-                                    waitForCollectionCallback: false,
-                                    callback: (policyTags) => {
-                                        Onyx.disconnect(connectionID);
-
-                                        Object.keys(tagsToUpdate).forEach((key) => {
-                                            const updatedTag = policyTags?.[tagListName]?.tags[key];
-                                            expect(updatedTag?.errors).toBeFalsy();
-                                            expect(updatedTag?.pendingAction).toBeFalsy();
-                                            expect(updatedTag?.pendingFields?.enabled).toBeFalsy();
-                                        });
-
-                                        resolve();
-                                    },
-                                });
-                            }),
-                    )
-            );
+            mockFetch?.pause?.();
+
+            return Onyx.set(`${ONYXKEYS.COLLECTION.POLICY}${fakePolicy.id}`, fakePolicy)
+                .then(() => {
+                    Onyx.set(`${ONYXKEYS.COLLECTION.POLICY_TAGS}${fakePolicy.id}`, fakePolicyTags);
+                })
+                .then(() => {
+                    Tag.setWorkspaceTagEnabled(fakePolicy.id, tagsToUpdate, 0);
+                    return waitForBatchedUpdates();
+                })
+                .then(
+                    () =>
+                        new Promise<void>((resolve) => {
+                            const connection = Onyx.connect({
+                                key: `${ONYXKEYS.COLLECTION.POLICY_TAGS}${fakePolicy.id}`,
+                                waitForCollectionCallback: false,
+                                callback: (policyTags) => {
+                                    Onyx.disconnect(connection);
+
+                                    Object.keys(tagsToUpdate).forEach((key) => {
+                                        const updatedTag = policyTags?.[tagListName]?.tags[key];
+                                        expect(updatedTag?.enabled).toBeFalsy();
+                                        expect(updatedTag?.errors).toBeFalsy();
+                                        expect(updatedTag?.pendingAction).toBe(CONST.RED_BRICK_ROAD_PENDING_ACTION.UPDATE);
+                                        expect(updatedTag?.pendingFields?.enabled).toBe(CONST.RED_BRICK_ROAD_PENDING_ACTION.UPDATE);
+                                    });
+
+                                    resolve();
+                                },
+                            });
+                        }),
+                )
+                .then(mockFetch?.resume)
+                .then(waitForBatchedUpdates)
+                .then(
+                    () =>
+                        new Promise<void>((resolve) => {
+                            const connection = Onyx.connect({
+                                key: `${ONYXKEYS.COLLECTION.POLICY_TAGS}${fakePolicy.id}`,
+                                waitForCollectionCallback: false,
+                                callback: (policyTags) => {
+                                    Onyx.disconnect(connection);
+
+                                    Object.keys(tagsToUpdate).forEach((key) => {
+                                        const updatedTag = policyTags?.[tagListName]?.tags[key];
+                                        expect(updatedTag?.errors).toBeFalsy();
+                                        expect(updatedTag?.pendingAction).toBeFalsy();
+                                        expect(updatedTag?.pendingFields?.enabled).toBeFalsy();
+                                    });
+
+                                    resolve();
+                                },
+                            });
+                        }),
+                );
         });
 
         it('reset policy tag enable when api returns error', () => {
@@ -491,46 +461,41 @@ describe('actions/Policy', () => {
                 return acc;
             }, {});
 
-            // @ts-expect-error TODO: Remove this once TestHelper (https://github.com/Expensify/App/issues/25318) is migrated to TypeScript.
-            fetch.pause();
-
-            return (
-                Onyx.set(`${ONYXKEYS.COLLECTION.POLICY}${fakePolicy.id}`, fakePolicy)
-                    .then(() => {
-                        Onyx.set(`${ONYXKEYS.COLLECTION.POLICY_TAGS}${fakePolicy.id}`, fakePolicyTags);
-                    })
-                    .then(() => {
-                        // @ts-expect-error TODO: Remove this once TestHelper (https://github.com/Expensify/App/issues/25318) is migrated to TypeScript.
-                        fetch.fail();
-
-                        Policy.setWorkspaceTagEnabled(fakePolicy.id, tagsToUpdate);
-                        return waitForBatchedUpdates();
-                    })
-                    // @ts-expect-error TODO: Remove this once TestHelper (https://github.com/Expensify/App/issues/25318) is migrated to TypeScript.
-                    .then(fetch.resume)
-                    .then(waitForBatchedUpdates)
-                    .then(
-                        () =>
-                            new Promise<void>((resolve) => {
-                                const connectionID = Onyx.connect({
-                                    key: `${ONYXKEYS.COLLECTION.POLICY_TAGS}${fakePolicy.id}`,
-                                    waitForCollectionCallback: false,
-                                    callback: (policyTags) => {
-                                        Onyx.disconnect(connectionID);
-
-                                        Object.keys(tagsToUpdate).forEach((key) => {
-                                            const updatedTag = policyTags?.[tagListName]?.tags[key];
-                                            expect(updatedTag?.errors).toBeTruthy();
-                                            expect(updatedTag?.pendingAction).toBeFalsy();
-                                            expect(updatedTag?.pendingFields?.enabled).toBeFalsy();
-                                        });
-
-                                        resolve();
-                                    },
-                                });
-                            }),
-                    )
-            );
+            mockFetch?.pause?.();
+
+            return Onyx.set(`${ONYXKEYS.COLLECTION.POLICY}${fakePolicy.id}`, fakePolicy)
+                .then(() => {
+                    Onyx.set(`${ONYXKEYS.COLLECTION.POLICY_TAGS}${fakePolicy.id}`, fakePolicyTags);
+                })
+                .then(() => {
+                    mockFetch?.fail?.();
+
+                    Tag.setWorkspaceTagEnabled(fakePolicy.id, tagsToUpdate, 0);
+                    return waitForBatchedUpdates();
+                })
+                .then(mockFetch?.resume)
+                .then(waitForBatchedUpdates)
+                .then(
+                    () =>
+                        new Promise<void>((resolve) => {
+                            const connection = Onyx.connect({
+                                key: `${ONYXKEYS.COLLECTION.POLICY_TAGS}${fakePolicy.id}`,
+                                waitForCollectionCallback: false,
+                                callback: (policyTags) => {
+                                    Onyx.disconnect(connection);
+
+                                    Object.keys(tagsToUpdate).forEach((key) => {
+                                        const updatedTag = policyTags?.[tagListName]?.tags[key];
+                                        expect(updatedTag?.errors).toBeTruthy();
+                                        expect(updatedTag?.pendingAction).toBeFalsy();
+                                        expect(updatedTag?.pendingFields?.enabled).toBeFalsy();
+                                    });
+
+                                    resolve();
+                                },
+                            });
+                        }),
+                );
         });
     });
 
@@ -544,63 +509,63 @@ describe('actions/Policy', () => {
             const oldTagName = Object.keys(fakePolicyTags?.[tagListName]?.tags)[0];
             const newTagName = 'New tag';
 
-            // @ts-expect-error TODO: Remove this once TestHelper (https://github.com/Expensify/App/issues/25318) is migrated to TypeScript.
-            fetch.pause();
+            mockFetch?.pause?.();
 
-            return (
-                Onyx.set(`${ONYXKEYS.COLLECTION.POLICY}${fakePolicy.id}`, fakePolicy)
-                    .then(() => {
-                        Onyx.set(`${ONYXKEYS.COLLECTION.POLICY_TAGS}${fakePolicy.id}`, fakePolicyTags);
-                    })
-                    .then(() => {
-                        Policy.renamePolicyTag(fakePolicy.id, {
+            return Onyx.set(`${ONYXKEYS.COLLECTION.POLICY}${fakePolicy.id}`, fakePolicy)
+                .then(() => {
+                    Onyx.set(`${ONYXKEYS.COLLECTION.POLICY_TAGS}${fakePolicy.id}`, fakePolicyTags);
+                })
+                .then(() => {
+                    Tag.renamePolicyTag(
+                        fakePolicy.id,
+                        {
                             oldName: oldTagName,
                             newName: newTagName,
-                        });
-                        return waitForBatchedUpdates();
-                    })
-                    .then(
-                        () =>
-                            new Promise<void>((resolve) => {
-                                const connectionID = Onyx.connect({
-                                    key: `${ONYXKEYS.COLLECTION.POLICY_TAGS}${fakePolicy.id}`,
-                                    waitForCollectionCallback: false,
-                                    callback: (policyTags) => {
-                                        Onyx.disconnect(connectionID);
-
-                                        const tags = policyTags?.[tagListName]?.tags;
-                                        expect(tags?.[oldTagName]).toBeFalsy();
-                                        expect(tags?.[newTagName]?.name).toBe(newTagName);
-                                        expect(tags?.[newTagName]?.pendingAction).toBe(CONST.RED_BRICK_ROAD_PENDING_ACTION.UPDATE);
-                                        expect(tags?.[newTagName]?.pendingFields?.name).toBe(CONST.RED_BRICK_ROAD_PENDING_ACTION.UPDATE);
-
-                                        resolve();
-                                    },
-                                });
-                            }),
-                    )
-                    // @ts-expect-error TODO: Remove this once TestHelper (https://github.com/Expensify/App/issues/25318) is migrated to TypeScript.
-                    .then(fetch.resume)
-                    .then(waitForBatchedUpdates)
-                    .then(
-                        () =>
-                            new Promise<void>((resolve) => {
-                                const connectionID = Onyx.connect({
-                                    key: `${ONYXKEYS.COLLECTION.POLICY_TAGS}${fakePolicy.id}`,
-                                    waitForCollectionCallback: false,
-                                    callback: (policyTags) => {
-                                        Onyx.disconnect(connectionID);
-
-                                        const tags = policyTags?.[tagListName]?.tags;
-                                        expect(tags?.[newTagName]?.pendingAction).toBeFalsy();
-                                        expect(tags?.[newTagName]?.pendingFields?.name).toBeFalsy();
-
-                                        resolve();
-                                    },
-                                });
-                            }),
-                    )
-            );
+                        },
+                        0,
+                    );
+                    return waitForBatchedUpdates();
+                })
+                .then(
+                    () =>
+                        new Promise<void>((resolve) => {
+                            const connection = Onyx.connect({
+                                key: `${ONYXKEYS.COLLECTION.POLICY_TAGS}${fakePolicy.id}`,
+                                waitForCollectionCallback: false,
+                                callback: (policyTags) => {
+                                    Onyx.disconnect(connection);
+
+                                    const tags = policyTags?.[tagListName]?.tags;
+                                    expect(tags?.[oldTagName]).toBeFalsy();
+                                    expect(tags?.[newTagName]?.name).toBe(newTagName);
+                                    expect(tags?.[newTagName]?.pendingAction).toBe(CONST.RED_BRICK_ROAD_PENDING_ACTION.UPDATE);
+                                    expect(tags?.[newTagName]?.pendingFields?.name).toBe(CONST.RED_BRICK_ROAD_PENDING_ACTION.UPDATE);
+
+                                    resolve();
+                                },
+                            });
+                        }),
+                )
+                .then(mockFetch?.resume)
+                .then(waitForBatchedUpdates)
+                .then(
+                    () =>
+                        new Promise<void>((resolve) => {
+                            const connection = Onyx.connect({
+                                key: `${ONYXKEYS.COLLECTION.POLICY_TAGS}${fakePolicy.id}`,
+                                waitForCollectionCallback: false,
+                                callback: (policyTags) => {
+                                    Onyx.disconnect(connection);
+
+                                    const tags = policyTags?.[tagListName]?.tags;
+                                    expect(tags?.[newTagName]?.pendingAction).toBeFalsy();
+                                    expect(tags?.[newTagName]?.pendingFields?.name).toBeFalsy();
+
+                                    resolve();
+                                },
+                            });
+                        }),
+                );
         });
 
         it('reset policy tag name when api returns error', () => {
@@ -612,46 +577,45 @@ describe('actions/Policy', () => {
             const oldTagName = Object.keys(fakePolicyTags?.[tagListName]?.tags)[0];
             const newTagName = 'New tag';
 
-            // @ts-expect-error TODO: Remove this once TestHelper (https://github.com/Expensify/App/issues/25318) is migrated to TypeScript.
-            fetch.pause();
+            mockFetch?.pause?.();
 
-            return (
-                Onyx.set(`${ONYXKEYS.COLLECTION.POLICY}${fakePolicy.id}`, fakePolicy)
-                    .then(() => {
-                        Onyx.set(`${ONYXKEYS.COLLECTION.POLICY_TAGS}${fakePolicy.id}`, fakePolicyTags);
-                    })
-                    .then(() => {
-                        // @ts-expect-error TODO: Remove this once TestHelper (https://github.com/Expensify/App/issues/25318) is migrated to TypeScript.
-                        fetch.fail();
+            return Onyx.set(`${ONYXKEYS.COLLECTION.POLICY}${fakePolicy.id}`, fakePolicy)
+                .then(() => {
+                    Onyx.set(`${ONYXKEYS.COLLECTION.POLICY_TAGS}${fakePolicy.id}`, fakePolicyTags);
+                })
+                .then(() => {
+                    mockFetch?.fail?.();
 
-                        Policy.renamePolicyTag(fakePolicy.id, {
+                    Tag.renamePolicyTag(
+                        fakePolicy.id,
+                        {
                             oldName: oldTagName,
                             newName: newTagName,
-                        });
-                        return waitForBatchedUpdates();
-                    })
-                    // @ts-expect-error TODO: Remove this once TestHelper (https://github.com/Expensify/App/issues/25318) is migrated to TypeScript.
-                    .then(fetch.resume)
-                    .then(waitForBatchedUpdates)
-                    .then(
-                        () =>
-                            new Promise<void>((resolve) => {
-                                const connectionID = Onyx.connect({
-                                    key: `${ONYXKEYS.COLLECTION.POLICY_TAGS}${fakePolicy.id}`,
-                                    waitForCollectionCallback: false,
-                                    callback: (policyTags) => {
-                                        Onyx.disconnect(connectionID);
-
-                                        const tags = policyTags?.[tagListName]?.tags;
-                                        expect(tags?.[newTagName]).toBeFalsy();
-                                        expect(tags?.[oldTagName]?.errors).toBeTruthy();
-
-                                        resolve();
-                                    },
-                                });
-                            }),
-                    )
-            );
+                        },
+                        0,
+                    );
+                    return waitForBatchedUpdates();
+                })
+                .then(mockFetch?.resume)
+                .then(waitForBatchedUpdates)
+                .then(
+                    () =>
+                        new Promise<void>((resolve) => {
+                            const connection = Onyx.connect({
+                                key: `${ONYXKEYS.COLLECTION.POLICY_TAGS}${fakePolicy.id}`,
+                                waitForCollectionCallback: false,
+                                callback: (policyTags) => {
+                                    Onyx.disconnect(connection);
+
+                                    const tags = policyTags?.[tagListName]?.tags;
+                                    expect(tags?.[newTagName]).toBeFalsy();
+                                    expect(tags?.[oldTagName]?.errors).toBeTruthy();
+
+                                    resolve();
+                                },
+                            });
+                        }),
+                );
         });
     });
 
@@ -664,58 +628,54 @@ describe('actions/Policy', () => {
             const fakePolicyTags = createRandomPolicyTags(tagListName, 2);
             const tagsToDelete = Object.keys(fakePolicyTags?.[tagListName]?.tags ?? {});
 
-            // @ts-expect-error TODO: Remove this once TestHelper (https://github.com/Expensify/App/issues/25318) is migrated to TypeScript.
-            fetch.pause();
-
-            return (
-                Onyx.set(`${ONYXKEYS.COLLECTION.POLICY}${fakePolicy.id}`, fakePolicy)
-                    .then(() => {
-                        Onyx.set(`${ONYXKEYS.COLLECTION.POLICY_TAGS}${fakePolicy.id}`, fakePolicyTags);
-                    })
-                    .then(() => {
-                        Policy.deletePolicyTags(fakePolicy.id, tagsToDelete);
-                        return waitForBatchedUpdates();
-                    })
-                    .then(
-                        () =>
-                            new Promise<void>((resolve) => {
-                                const connectionID = Onyx.connect({
-                                    key: `${ONYXKEYS.COLLECTION.POLICY_TAGS}${fakePolicy.id}`,
-                                    waitForCollectionCallback: false,
-                                    callback: (policyTags) => {
-                                        Onyx.disconnect(connectionID);
-
-                                        tagsToDelete.forEach((tagName) => {
-                                            expect(policyTags?.[tagListName]?.tags[tagName]?.pendingAction).toBe(CONST.RED_BRICK_ROAD_PENDING_ACTION.DELETE);
-                                        });
-
-                                        resolve();
-                                    },
-                                });
-                            }),
-                    )
-                    // @ts-expect-error TODO: Remove this once TestHelper (https://github.com/Expensify/App/issues/25318) is migrated to TypeScript.
-                    .then(fetch.resume)
-                    .then(waitForBatchedUpdates)
-                    .then(
-                        () =>
-                            new Promise<void>((resolve) => {
-                                const connectionID = Onyx.connect({
-                                    key: `${ONYXKEYS.COLLECTION.POLICY_TAGS}${fakePolicy.id}`,
-                                    waitForCollectionCallback: false,
-                                    callback: (policyTags) => {
-                                        Onyx.disconnect(connectionID);
-
-                                        tagsToDelete.forEach((tagName) => {
-                                            expect(policyTags?.[tagListName]?.tags[tagName]).toBeFalsy();
-                                        });
-
-                                        resolve();
-                                    },
-                                });
-                            }),
-                    )
-            );
+            mockFetch?.pause?.();
+
+            return Onyx.set(`${ONYXKEYS.COLLECTION.POLICY}${fakePolicy.id}`, fakePolicy)
+                .then(() => {
+                    Onyx.set(`${ONYXKEYS.COLLECTION.POLICY_TAGS}${fakePolicy.id}`, fakePolicyTags);
+                })
+                .then(() => {
+                    Tag.deletePolicyTags(fakePolicy.id, tagsToDelete);
+                    return waitForBatchedUpdates();
+                })
+                .then(
+                    () =>
+                        new Promise<void>((resolve) => {
+                            const connection = Onyx.connect({
+                                key: `${ONYXKEYS.COLLECTION.POLICY_TAGS}${fakePolicy.id}`,
+                                waitForCollectionCallback: false,
+                                callback: (policyTags) => {
+                                    Onyx.disconnect(connection);
+
+                                    tagsToDelete.forEach((tagName) => {
+                                        expect(policyTags?.[tagListName]?.tags[tagName]?.pendingAction).toBe(CONST.RED_BRICK_ROAD_PENDING_ACTION.DELETE);
+                                    });
+
+                                    resolve();
+                                },
+                            });
+                        }),
+                )
+                .then(mockFetch?.resume)
+                .then(waitForBatchedUpdates)
+                .then(
+                    () =>
+                        new Promise<void>((resolve) => {
+                            const connection = Onyx.connect({
+                                key: `${ONYXKEYS.COLLECTION.POLICY_TAGS}${fakePolicy.id}`,
+                                waitForCollectionCallback: false,
+                                callback: (policyTags) => {
+                                    Onyx.disconnect(connection);
+
+                                    tagsToDelete.forEach((tagName) => {
+                                        expect(policyTags?.[tagListName]?.tags[tagName]).toBeFalsy();
+                                    });
+
+                                    resolve();
+                                },
+                            });
+                        }),
+                );
         });
 
         it('reset the deleted policy tag when api returns error', () => {
@@ -726,44 +686,39 @@ describe('actions/Policy', () => {
             const fakePolicyTags = createRandomPolicyTags(tagListName, 2);
             const tagsToDelete = Object.keys(fakePolicyTags?.[tagListName]?.tags ?? {});
 
-            // @ts-expect-error TODO: Remove this once TestHelper (https://github.com/Expensify/App/issues/25318) is migrated to TypeScript.
-            fetch.pause();
-
-            return (
-                Onyx.set(`${ONYXKEYS.COLLECTION.POLICY}${fakePolicy.id}`, fakePolicy)
-                    .then(() => {
-                        Onyx.set(`${ONYXKEYS.COLLECTION.POLICY_TAGS}${fakePolicy.id}`, fakePolicyTags);
-                    })
-                    .then(() => {
-                        // @ts-expect-error TODO: Remove this once TestHelper (https://github.com/Expensify/App/issues/25318) is migrated to TypeScript.
-                        fetch.fail();
-
-                        Policy.deletePolicyTags(fakePolicy.id, tagsToDelete);
-                        return waitForBatchedUpdates();
-                    })
-                    // @ts-expect-error TODO: Remove this once TestHelper (https://github.com/Expensify/App/issues/25318) is migrated to TypeScript.
-                    .then(fetch.resume)
-                    .then(waitForBatchedUpdates)
-                    .then(
-                        () =>
-                            new Promise<void>((resolve) => {
-                                const connectionID = Onyx.connect({
-                                    key: `${ONYXKEYS.COLLECTION.POLICY_TAGS}${fakePolicy.id}`,
-                                    waitForCollectionCallback: false,
-                                    callback: (policyTags) => {
-                                        Onyx.disconnect(connectionID);
-
-                                        tagsToDelete.forEach((tagName) => {
-                                            expect(policyTags?.[tagListName]?.tags[tagName].pendingAction).toBeFalsy();
-                                            expect(policyTags?.[tagListName]?.tags[tagName].errors).toBeTruthy();
-                                        });
-
-                                        resolve();
-                                    },
-                                });
-                            }),
-                    )
-            );
+            mockFetch?.pause?.();
+
+            return Onyx.set(`${ONYXKEYS.COLLECTION.POLICY}${fakePolicy.id}`, fakePolicy)
+                .then(() => {
+                    Onyx.set(`${ONYXKEYS.COLLECTION.POLICY_TAGS}${fakePolicy.id}`, fakePolicyTags);
+                })
+                .then(() => {
+                    mockFetch?.fail?.();
+
+                    Tag.deletePolicyTags(fakePolicy.id, tagsToDelete);
+                    return waitForBatchedUpdates();
+                })
+                .then(mockFetch?.resume)
+                .then(waitForBatchedUpdates)
+                .then(
+                    () =>
+                        new Promise<void>((resolve) => {
+                            const connection = Onyx.connect({
+                                key: `${ONYXKEYS.COLLECTION.POLICY_TAGS}${fakePolicy.id}`,
+                                waitForCollectionCallback: false,
+                                callback: (policyTags) => {
+                                    Onyx.disconnect(connection);
+
+                                    tagsToDelete.forEach((tagName) => {
+                                        expect(policyTags?.[tagListName]?.tags[tagName].pendingAction).toBeFalsy();
+                                        expect(policyTags?.[tagListName]?.tags[tagName].errors).toBeTruthy();
+                                    });
+
+                                    resolve();
+                                },
+                            });
+                        }),
+                );
         });
     });
 });
diff --git a/tests/actions/PolicyTaxTest.ts b/tests/actions/PolicyTaxTest.ts
new file mode 100644
index 000000000000..ed4c32af9f2e
--- /dev/null
+++ b/tests/actions/PolicyTaxTest.ts
@@ -0,0 +1,826 @@
+import Onyx from 'react-native-onyx';
+import {createPolicyTax, deletePolicyTaxes, renamePolicyTax, setPolicyTaxesEnabled, updatePolicyTaxValue} from '@libs/actions/TaxRate';
+import CONST from '@src/CONST';
+import OnyxUpdateManager from '@src/libs/actions/OnyxUpdateManager';
+import * as Policy from '@src/libs/actions/Policy/Policy';
+import ONYXKEYS from '@src/ONYXKEYS';
+import type {Policy as PolicyType, TaxRate} from '@src/types/onyx';
+import createRandomPolicy from '../utils/collections/policies';
+import * as TestHelper from '../utils/TestHelper';
+import type {MockFetch} from '../utils/TestHelper';
+import waitForBatchedUpdates from '../utils/waitForBatchedUpdates';
+
+OnyxUpdateManager();
+describe('actions/PolicyTax', () => {
+    const fakePolicy: PolicyType = {...createRandomPolicy(0), taxRates: CONST.DEFAULT_TAX};
+    beforeAll(() => {
+        Onyx.init({
+            keys: ONYXKEYS,
+        });
+    });
+
+    let mockFetch: MockFetch;
+    beforeEach(() => {
+        global.fetch = TestHelper.getGlobalFetchMock();
+        mockFetch = fetch as MockFetch;
+        return Onyx.clear()
+            .then(() => Onyx.set(`${ONYXKEYS.COLLECTION.POLICY}${fakePolicy.id}`, fakePolicy))
+            .then(waitForBatchedUpdates);
+    });
+
+    describe('SetPolicyCustomTaxName', () => {
+        it('Set policy`s custom tax name', () => {
+            const customTaxName = 'Custom tag name';
+            mockFetch?.pause?.();
+            Policy.setPolicyCustomTaxName(fakePolicy.id, customTaxName);
+            return waitForBatchedUpdates()
+                .then(
+                    () =>
+                        new Promise<void>((resolve) => {
+                            const connection = Onyx.connect({
+                                key: `${ONYXKEYS.COLLECTION.POLICY}${fakePolicy.id}`,
+                                waitForCollectionCallback: false,
+                                callback: (policy) => {
+                                    Onyx.disconnect(connection);
+                                    expect(policy?.taxRates?.name).toBe(customTaxName);
+                                    expect(policy?.taxRates?.pendingFields?.name).toBe(CONST.RED_BRICK_ROAD_PENDING_ACTION.UPDATE);
+                                    expect(policy?.taxRates?.errorFields).toBeFalsy();
+                                    resolve();
+                                },
+                            });
+                        }),
+                )
+                .then(mockFetch?.resume)
+                .then(waitForBatchedUpdates)
+                .then(
+                    () =>
+                        new Promise<void>((resolve) => {
+                            const connection = Onyx.connect({
+                                key: `${ONYXKEYS.COLLECTION.POLICY}${fakePolicy.id}`,
+                                waitForCollectionCallback: false,
+                                callback: (policy) => {
+                                    Onyx.disconnect(connection);
+                                    expect(policy?.taxRates?.pendingFields?.name).toBeFalsy();
+                                    expect(policy?.taxRates?.errorFields).toBeFalsy();
+                                    resolve();
+                                },
+                            });
+                        }),
+                );
+        });
+        it('Reset policy`s custom tax name when API returns an error', () => {
+            const customTaxName = 'Custom tag name';
+            const originalCustomTaxName = fakePolicy?.taxRates?.name;
+
+            mockFetch?.pause?.();
+            Policy.setPolicyCustomTaxName(fakePolicy.id, customTaxName);
+            return waitForBatchedUpdates()
+                .then(
+                    () =>
+                        new Promise<void>((resolve) => {
+                            const connection = Onyx.connect({
+                                key: `${ONYXKEYS.COLLECTION.POLICY}${fakePolicy.id}`,
+                                waitForCollectionCallback: false,
+                                callback: (policy) => {
+                                    Onyx.disconnect(connection);
+                                    expect(policy?.taxRates?.name).toBe(customTaxName);
+                                    expect(policy?.taxRates?.pendingFields?.name).toBe(CONST.RED_BRICK_ROAD_PENDING_ACTION.UPDATE);
+                                    expect(policy?.taxRates?.errorFields).toBeFalsy();
+                                    resolve();
+                                },
+                            });
+                        }),
+                )
+                .then(() => {
+                    mockFetch?.fail?.();
+                    return mockFetch?.resume?.() as Promise<unknown>;
+                })
+                .then(waitForBatchedUpdates)
+                .then(
+                    () =>
+                        new Promise<void>((resolve) => {
+                            const connection = Onyx.connect({
+                                key: `${ONYXKEYS.COLLECTION.POLICY}${fakePolicy.id}`,
+                                waitForCollectionCallback: false,
+                                callback: (policy) => {
+                                    Onyx.disconnect(connection);
+                                    expect(policy?.taxRates?.name).toBe(originalCustomTaxName);
+                                    expect(policy?.taxRates?.pendingFields?.name).toBeFalsy();
+                                    expect(policy?.taxRates?.errorFields?.name).toBeTruthy();
+                                    resolve();
+                                },
+                            });
+                        }),
+                );
+        });
+    });
+
+    describe('SetPolicyCurrencyDefaultTax', () => {
+        it('Set policy`s currency default tax', () => {
+            const taxCode = 'id_TAX_RATE_1';
+
+            mockFetch?.pause?.();
+            Policy.setWorkspaceCurrencyDefault(fakePolicy.id, taxCode);
+            return waitForBatchedUpdates()
+                .then(
+                    () =>
+                        new Promise<void>((resolve) => {
+                            const connection = Onyx.connect({
+                                key: `${ONYXKEYS.COLLECTION.POLICY}${fakePolicy.id}`,
+                                waitForCollectionCallback: false,
+                                callback: (policy) => {
+                                    Onyx.disconnect(connection);
+                                    expect(policy?.taxRates?.defaultExternalID).toBe(taxCode);
+                                    expect(policy?.taxRates?.pendingFields?.defaultExternalID).toBe(CONST.RED_BRICK_ROAD_PENDING_ACTION.UPDATE);
+                                    expect(policy?.taxRates?.errorFields).toBeFalsy();
+                                    resolve();
+                                },
+                            });
+                        }),
+                )
+                .then(mockFetch?.resume)
+                .then(waitForBatchedUpdates)
+                .then(
+                    () =>
+                        new Promise<void>((resolve) => {
+                            const connection = Onyx.connect({
+                                key: `${ONYXKEYS.COLLECTION.POLICY}${fakePolicy.id}`,
+                                waitForCollectionCallback: false,
+                                callback: (policy) => {
+                                    Onyx.disconnect(connection);
+                                    expect(policy?.taxRates?.pendingFields?.defaultExternalID).toBeFalsy();
+                                    expect(policy?.taxRates?.errorFields).toBeFalsy();
+                                    resolve();
+                                },
+                            });
+                        }),
+                );
+        });
+        it('Reset policy`s currency default tax when API returns an error', () => {
+            const taxCode = 'id_TAX_RATE_1';
+            const originalDefaultExternalID = fakePolicy?.taxRates?.defaultExternalID;
+
+            mockFetch?.pause?.();
+            Policy.setWorkspaceCurrencyDefault(fakePolicy.id, taxCode);
+            return waitForBatchedUpdates()
+                .then(
+                    () =>
+                        new Promise<void>((resolve) => {
+                            const connection = Onyx.connect({
+                                key: `${ONYXKEYS.COLLECTION.POLICY}${fakePolicy.id}`,
+                                waitForCollectionCallback: false,
+                                callback: (policy) => {
+                                    Onyx.disconnect(connection);
+                                    expect(policy?.taxRates?.defaultExternalID).toBe(taxCode);
+                                    expect(policy?.taxRates?.pendingFields?.defaultExternalID).toBe(CONST.RED_BRICK_ROAD_PENDING_ACTION.UPDATE);
+                                    expect(policy?.taxRates?.errorFields).toBeFalsy();
+                                    resolve();
+                                },
+                            });
+                        }),
+                )
+                .then(() => {
+                    mockFetch?.fail?.();
+                    return mockFetch?.resume?.() as Promise<unknown>;
+                })
+                .then(waitForBatchedUpdates)
+                .then(
+                    () =>
+                        new Promise<void>((resolve) => {
+                            const connection = Onyx.connect({
+                                key: `${ONYXKEYS.COLLECTION.POLICY}${fakePolicy.id}`,
+                                waitForCollectionCallback: false,
+                                callback: (policy) => {
+                                    Onyx.disconnect(connection);
+                                    expect(policy?.taxRates?.defaultExternalID).toBe(originalDefaultExternalID);
+                                    expect(policy?.taxRates?.pendingFields?.defaultExternalID).toBeFalsy();
+                                    expect(policy?.taxRates?.errorFields?.defaultExternalID).toBeTruthy();
+                                    resolve();
+                                },
+                            });
+                        }),
+                );
+        });
+    });
+    describe('SetPolicyForeignCurrencyDefaultTax', () => {
+        it('Set policy`s foreign currency default', () => {
+            const taxCode = 'id_TAX_RATE_1';
+
+            mockFetch?.pause?.();
+            Policy.setForeignCurrencyDefault(fakePolicy.id, taxCode);
+            return waitForBatchedUpdates()
+                .then(
+                    () =>
+                        new Promise<void>((resolve) => {
+                            const connection = Onyx.connect({
+                                key: `${ONYXKEYS.COLLECTION.POLICY}${fakePolicy.id}`,
+                                waitForCollectionCallback: false,
+                                callback: (policy) => {
+                                    Onyx.disconnect(connection);
+                                    expect(policy?.taxRates?.foreignTaxDefault).toBe(taxCode);
+                                    expect(policy?.taxRates?.pendingFields?.foreignTaxDefault).toBe(CONST.RED_BRICK_ROAD_PENDING_ACTION.UPDATE);
+                                    expect(policy?.taxRates?.errorFields).toBeFalsy();
+                                    resolve();
+                                },
+                            });
+                        }),
+                )
+                .then(mockFetch?.resume)
+                .then(waitForBatchedUpdates)
+                .then(
+                    () =>
+                        new Promise<void>((resolve) => {
+                            const connection = Onyx.connect({
+                                key: `${ONYXKEYS.COLLECTION.POLICY}${fakePolicy.id}`,
+                                waitForCollectionCallback: false,
+                                callback: (policy) => {
+                                    Onyx.disconnect(connection);
+                                    // Check if the policy pendingFields was cleared
+                                    expect(policy?.taxRates?.pendingFields?.foreignTaxDefault).toBeFalsy();
+                                    expect(policy?.taxRates?.errorFields).toBeFalsy();
+                                    resolve();
+                                },
+                            });
+                        }),
+                );
+        });
+        it('Reset policy`s foreign currency default when API returns an error', () => {
+            const taxCode = 'id_TAX_RATE_1';
+            const originalDefaultForeignCurrencyID = fakePolicy?.taxRates?.foreignTaxDefault;
+
+            mockFetch?.pause?.();
+            Policy.setForeignCurrencyDefault(fakePolicy.id, taxCode);
+            return waitForBatchedUpdates()
+                .then(
+                    () =>
+                        new Promise<void>((resolve) => {
+                            const connection = Onyx.connect({
+                                key: `${ONYXKEYS.COLLECTION.POLICY}${fakePolicy.id}`,
+                                waitForCollectionCallback: false,
+                                callback: (policy) => {
+                                    Onyx.disconnect(connection);
+                                    expect(policy?.taxRates?.foreignTaxDefault).toBe(taxCode);
+                                    expect(policy?.taxRates?.pendingFields?.foreignTaxDefault).toBe(CONST.RED_BRICK_ROAD_PENDING_ACTION.UPDATE);
+                                    expect(policy?.taxRates?.errorFields).toBeFalsy();
+                                    resolve();
+                                },
+                            });
+                        }),
+                )
+
+                .then(() => {
+                    mockFetch?.fail?.();
+                    return mockFetch?.resume?.() as Promise<unknown>;
+                })
+                .then(waitForBatchedUpdates)
+                .then(
+                    () =>
+                        new Promise<void>((resolve) => {
+                            const connection = Onyx.connect({
+                                key: `${ONYXKEYS.COLLECTION.POLICY}${fakePolicy.id}`,
+                                waitForCollectionCallback: false,
+                                callback: (policy) => {
+                                    Onyx.disconnect(connection);
+                                    // Check if the policy pendingFields was cleared
+                                    expect(policy?.taxRates?.foreignTaxDefault).toBe(originalDefaultForeignCurrencyID);
+                                    expect(policy?.taxRates?.pendingFields?.foreignTaxDefault).toBeFalsy();
+                                    expect(policy?.taxRates?.errorFields?.foreignTaxDefault).toBeTruthy();
+                                    resolve();
+                                },
+                            });
+                        }),
+                );
+        });
+    });
+    describe('CreatePolicyTax', () => {
+        it('Create a new tax', () => {
+            const newTaxRate: TaxRate = {
+                name: 'Tax rate 2',
+                value: '2%',
+                code: 'id_TAX_RATE_2',
+            };
+
+            mockFetch?.pause?.();
+            createPolicyTax(fakePolicy.id, newTaxRate);
+            return waitForBatchedUpdates()
+                .then(
+                    () =>
+                        new Promise<void>((resolve) => {
+                            const connection = Onyx.connect({
+                                key: `${ONYXKEYS.COLLECTION.POLICY}${fakePolicy.id}`,
+                                waitForCollectionCallback: false,
+                                callback: (policy) => {
+                                    Onyx.disconnect(connection);
+                                    const createdTax = policy?.taxRates?.taxes?.[newTaxRate.code ?? ''];
+                                    expect(createdTax?.code).toBe(newTaxRate.code);
+                                    expect(createdTax?.name).toBe(newTaxRate.name);
+                                    expect(createdTax?.value).toBe(newTaxRate.value);
+                                    expect(createdTax?.pendingAction).toBe(CONST.RED_BRICK_ROAD_PENDING_ACTION.ADD);
+                                    resolve();
+                                },
+                            });
+                        }),
+                )
+                .then(mockFetch?.resume)
+                .then(waitForBatchedUpdates)
+                .then(
+                    () =>
+                        new Promise<void>((resolve) => {
+                            const connection = Onyx.connect({
+                                key: `${ONYXKEYS.COLLECTION.POLICY}${fakePolicy.id}`,
+                                waitForCollectionCallback: false,
+                                callback: (policy) => {
+                                    Onyx.disconnect(connection);
+                                    const createdTax = policy?.taxRates?.taxes?.[newTaxRate.code ?? ''];
+                                    expect(createdTax?.errors).toBeFalsy();
+                                    expect(createdTax?.pendingFields).toBeFalsy();
+                                    resolve();
+                                },
+                            });
+                        }),
+                );
+        });
+
+        it('Remove the optimistic tax if the API returns an error', () => {
+            const newTaxRate: TaxRate = {
+                name: 'Tax rate 2',
+                value: '2%',
+                code: 'id_TAX_RATE_2',
+            };
+
+            mockFetch?.pause?.();
+            createPolicyTax(fakePolicy.id, newTaxRate);
+            return waitForBatchedUpdates()
+                .then(
+                    () =>
+                        new Promise<void>((resolve) => {
+                            const connection = Onyx.connect({
+                                key: `${ONYXKEYS.COLLECTION.POLICY}${fakePolicy.id}`,
+                                waitForCollectionCallback: false,
+                                callback: (policy) => {
+                                    Onyx.disconnect(connection);
+                                    const createdTax = policy?.taxRates?.taxes?.[newTaxRate.code ?? ''];
+                                    expect(createdTax?.code).toBe(newTaxRate.code);
+                                    expect(createdTax?.name).toBe(newTaxRate.name);
+                                    expect(createdTax?.value).toBe(newTaxRate.value);
+                                    expect(createdTax?.pendingAction).toBe(CONST.RED_BRICK_ROAD_PENDING_ACTION.ADD);
+                                    resolve();
+                                },
+                            });
+                        }),
+                )
+                .then(() => {
+                    mockFetch?.fail?.();
+                    return mockFetch?.resume?.() as Promise<unknown>;
+                })
+                .then(waitForBatchedUpdates)
+                .then(
+                    () =>
+                        new Promise<void>((resolve) => {
+                            const connection = Onyx.connect({
+                                key: `${ONYXKEYS.COLLECTION.POLICY}${fakePolicy.id}`,
+                                waitForCollectionCallback: false,
+                                callback: (policy) => {
+                                    Onyx.disconnect(connection);
+                                    const createdTax = policy?.taxRates?.taxes?.[newTaxRate.code ?? ''];
+                                    expect(createdTax?.errors).toBeTruthy();
+                                    resolve();
+                                },
+                            });
+                        }),
+                );
+        });
+    });
+    describe('SetPolicyTaxesEnabled', () => {
+        it('Disable policy`s taxes', () => {
+            const disableTaxID = 'id_TAX_RATE_1';
+            mockFetch?.pause?.();
+            setPolicyTaxesEnabled(fakePolicy.id, [disableTaxID], false);
+            return waitForBatchedUpdates()
+                .then(
+                    () =>
+                        new Promise<void>((resolve) => {
+                            const connection = Onyx.connect({
+                                key: `${ONYXKEYS.COLLECTION.POLICY}${fakePolicy.id}`,
+                                waitForCollectionCallback: false,
+                                callback: (policy) => {
+                                    Onyx.disconnect(connection);
+                                    const disabledTax = policy?.taxRates?.taxes?.[disableTaxID];
+                                    expect(disabledTax?.isDisabled).toBeTruthy();
+                                    expect(disabledTax?.pendingFields?.isDisabled).toBe(CONST.RED_BRICK_ROAD_PENDING_ACTION.UPDATE);
+                                    expect(disabledTax?.errorFields?.isDisabled).toBeFalsy();
+
+                                    resolve();
+                                },
+                            });
+                        }),
+                )
+                .then(mockFetch?.resume)
+                .then(waitForBatchedUpdates)
+                .then(
+                    () =>
+                        new Promise<void>((resolve) => {
+                            const connection = Onyx.connect({
+                                key: `${ONYXKEYS.COLLECTION.POLICY}${fakePolicy.id}`,
+                                waitForCollectionCallback: false,
+                                callback: (policy) => {
+                                    Onyx.disconnect(connection);
+                                    const disabledTax = policy?.taxRates?.taxes?.[disableTaxID];
+                                    expect(disabledTax?.errorFields?.isDisabled).toBeFalsy();
+                                    expect(disabledTax?.pendingFields?.isDisabled).toBeFalsy();
+                                    resolve();
+                                },
+                            });
+                        }),
+                );
+        });
+
+        it('Disable policy`s taxes but API returns an error, then enable policy`s taxes again', () => {
+            const disableTaxID = 'id_TAX_RATE_1';
+            mockFetch?.pause?.();
+            setPolicyTaxesEnabled(fakePolicy.id, [disableTaxID], false);
+            const originalTaxes = {...fakePolicy?.taxRates?.taxes};
+            return waitForBatchedUpdates()
+                .then(
+                    () =>
+                        new Promise<void>((resolve) => {
+                            const connection = Onyx.connect({
+                                key: `${ONYXKEYS.COLLECTION.POLICY}${fakePolicy.id}`,
+                                waitForCollectionCallback: false,
+                                callback: (policy) => {
+                                    Onyx.disconnect(connection);
+                                    const disabledTax = policy?.taxRates?.taxes?.[disableTaxID];
+                                    expect(disabledTax?.isDisabled).toBeTruthy();
+                                    expect(disabledTax?.pendingFields?.isDisabled).toBe(CONST.RED_BRICK_ROAD_PENDING_ACTION.UPDATE);
+                                    expect(disabledTax?.errorFields?.isDisabled).toBeFalsy();
+
+                                    resolve();
+                                },
+                            });
+                        }),
+                )
+                .then(() => {
+                    mockFetch?.fail?.();
+                    return mockFetch?.resume?.() as Promise<unknown>;
+                })
+                .then(waitForBatchedUpdates)
+                .then(
+                    () =>
+                        new Promise<void>((resolve) => {
+                            const connection = Onyx.connect({
+                                key: `${ONYXKEYS.COLLECTION.POLICY}${fakePolicy.id}`,
+                                waitForCollectionCallback: false,
+                                callback: (policy) => {
+                                    Onyx.disconnect(connection);
+                                    const disabledTax = policy?.taxRates?.taxes?.[disableTaxID];
+                                    expect(disabledTax?.isDisabled).toBe(!!originalTaxes[disableTaxID].isDisabled);
+                                    expect(disabledTax?.errorFields?.isDisabled).toBeTruthy();
+                                    expect(disabledTax?.pendingFields?.isDisabled).toBeFalsy();
+                                    resolve();
+                                },
+                            });
+                        }),
+                );
+        });
+    });
+
+    describe('RenamePolicyTax', () => {
+        it('Rename tax', () => {
+            const taxID = 'id_TAX_RATE_1';
+            const newTaxName = 'Tax rate 1 updated';
+            mockFetch?.pause?.();
+            renamePolicyTax(fakePolicy.id, taxID, newTaxName);
+            return waitForBatchedUpdates()
+                .then(
+                    () =>
+                        new Promise<void>((resolve) => {
+                            const connection = Onyx.connect({
+                                key: `${ONYXKEYS.COLLECTION.POLICY}${fakePolicy.id}`,
+                                waitForCollectionCallback: false,
+                                callback: (policy) => {
+                                    Onyx.disconnect(connection);
+                                    const updatedTax = policy?.taxRates?.taxes?.[taxID];
+                                    expect(updatedTax?.name).toBe(newTaxName);
+                                    expect(updatedTax?.pendingFields?.name).toBe(CONST.RED_BRICK_ROAD_PENDING_ACTION.UPDATE);
+                                    expect(updatedTax?.errorFields?.name).toBeFalsy();
+
+                                    resolve();
+                                },
+                            });
+                        }),
+                )
+                .then(mockFetch?.resume)
+                .then(waitForBatchedUpdates)
+                .then(
+                    () =>
+                        new Promise<void>((resolve) => {
+                            const connection = Onyx.connect({
+                                key: `${ONYXKEYS.COLLECTION.POLICY}${fakePolicy.id}`,
+                                waitForCollectionCallback: false,
+                                callback: (policy) => {
+                                    Onyx.disconnect(connection);
+                                    const updatedTax = policy?.taxRates?.taxes?.[taxID];
+                                    expect(updatedTax?.errorFields?.name).toBeFalsy();
+                                    expect(updatedTax?.pendingFields?.name).toBeFalsy();
+                                    resolve();
+                                },
+                            });
+                        }),
+                );
+        });
+
+        it('Rename tax but API returns an error, then recover the original tax`s name', () => {
+            const taxID = 'id_TAX_RATE_1';
+            const newTaxName = 'Tax rate 1 updated';
+            const originalTaxRate = {...fakePolicy?.taxRates?.taxes[taxID]};
+            mockFetch?.pause?.();
+            renamePolicyTax(fakePolicy.id, taxID, newTaxName);
+            return waitForBatchedUpdates()
+                .then(
+                    () =>
+                        new Promise<void>((resolve) => {
+                            const connection = Onyx.connect({
+                                key: `${ONYXKEYS.COLLECTION.POLICY}${fakePolicy.id}`,
+                                waitForCollectionCallback: false,
+                                callback: (policy) => {
+                                    Onyx.disconnect(connection);
+                                    const updatedTax = policy?.taxRates?.taxes?.[taxID];
+                                    expect(updatedTax?.name).toBe(newTaxName);
+                                    expect(updatedTax?.pendingFields?.name).toBe(CONST.RED_BRICK_ROAD_PENDING_ACTION.UPDATE);
+                                    expect(updatedTax?.errorFields?.name).toBeFalsy();
+
+                                    resolve();
+                                },
+                            });
+                        }),
+                )
+                .then(() => {
+                    mockFetch?.fail?.();
+                    return mockFetch?.resume?.() as Promise<unknown>;
+                })
+                .then(waitForBatchedUpdates)
+                .then(
+                    () =>
+                        new Promise<void>((resolve) => {
+                            const connection = Onyx.connect({
+                                key: `${ONYXKEYS.COLLECTION.POLICY}${fakePolicy.id}`,
+                                waitForCollectionCallback: false,
+                                callback: (policy) => {
+                                    Onyx.disconnect(connection);
+                                    const updatedTax = policy?.taxRates?.taxes?.[taxID];
+                                    expect(updatedTax?.name).toBe(originalTaxRate.name);
+                                    expect(updatedTax?.errorFields?.name).toBeTruthy();
+                                    expect(updatedTax?.pendingFields?.name).toBeFalsy();
+                                    resolve();
+                                },
+                            });
+                        }),
+                );
+        });
+    });
+    describe('UpdatePolicyTaxValue', () => {
+        it('Update tax`s value', () => {
+            const taxID = 'id_TAX_RATE_1';
+            const newTaxValue = 10;
+            const stringTaxValue = `${newTaxValue}%`;
+            mockFetch?.pause?.();
+            updatePolicyTaxValue(fakePolicy.id, taxID, newTaxValue);
+            return waitForBatchedUpdates()
+                .then(
+                    () =>
+                        new Promise<void>((resolve) => {
+                            const connection = Onyx.connect({
+                                key: `${ONYXKEYS.COLLECTION.POLICY}${fakePolicy.id}`,
+                                waitForCollectionCallback: false,
+                                callback: (policy) => {
+                                    Onyx.disconnect(connection);
+                                    const updatedTax = policy?.taxRates?.taxes?.[taxID];
+                                    expect(updatedTax?.value).toBe(stringTaxValue);
+                                    expect(updatedTax?.pendingFields?.value).toBe(CONST.RED_BRICK_ROAD_PENDING_ACTION.UPDATE);
+                                    expect(updatedTax?.errorFields?.value).toBeFalsy();
+
+                                    resolve();
+                                },
+                            });
+                        }),
+                )
+                .then(mockFetch?.resume)
+                .then(waitForBatchedUpdates)
+                .then(
+                    () =>
+                        new Promise<void>((resolve) => {
+                            const connection = Onyx.connect({
+                                key: `${ONYXKEYS.COLLECTION.POLICY}${fakePolicy.id}`,
+                                waitForCollectionCallback: false,
+                                callback: (policy) => {
+                                    Onyx.disconnect(connection);
+                                    const updatedTax = policy?.taxRates?.taxes?.[taxID];
+                                    expect(updatedTax?.errorFields?.value).toBeFalsy();
+                                    expect(updatedTax?.pendingFields?.value).toBeFalsy();
+                                    resolve();
+                                },
+                            });
+                        }),
+                );
+        });
+
+        it('Update tax`s value but API returns an error, then recover the original tax`s value', () => {
+            const taxID = 'id_TAX_RATE_1';
+            const newTaxValue = 10;
+            const originalTaxRate = {...fakePolicy?.taxRates?.taxes[taxID]};
+            const stringTaxValue = `${newTaxValue}%`;
+            mockFetch?.pause?.();
+            updatePolicyTaxValue(fakePolicy.id, taxID, newTaxValue);
+            return waitForBatchedUpdates()
+                .then(
+                    () =>
+                        new Promise<void>((resolve) => {
+                            const connection = Onyx.connect({
+                                key: `${ONYXKEYS.COLLECTION.POLICY}${fakePolicy.id}`,
+                                waitForCollectionCallback: false,
+                                callback: (policy) => {
+                                    Onyx.disconnect(connection);
+                                    const updatedTax = policy?.taxRates?.taxes?.[taxID];
+                                    expect(updatedTax?.value).toBe(stringTaxValue);
+                                    expect(updatedTax?.pendingFields?.value).toBe(CONST.RED_BRICK_ROAD_PENDING_ACTION.UPDATE);
+                                    expect(updatedTax?.errorFields?.value).toBeFalsy();
+
+                                    resolve();
+                                },
+                            });
+                        }),
+                )
+                .then(() => {
+                    mockFetch?.fail?.();
+                    return mockFetch?.resume?.() as Promise<unknown>;
+                })
+                .then(waitForBatchedUpdates)
+                .then(
+                    () =>
+                        new Promise<void>((resolve) => {
+                            const connection = Onyx.connect({
+                                key: `${ONYXKEYS.COLLECTION.POLICY}${fakePolicy.id}`,
+                                waitForCollectionCallback: false,
+                                callback: (policy) => {
+                                    Onyx.disconnect(connection);
+                                    const updatedTax = policy?.taxRates?.taxes?.[taxID];
+                                    expect(updatedTax?.value).toBe(originalTaxRate.value);
+                                    expect(updatedTax?.errorFields?.value).toBeTruthy();
+                                    expect(updatedTax?.pendingFields?.value).toBeFalsy();
+                                    resolve();
+                                },
+                            });
+                        }),
+                );
+        });
+    });
+    describe('DeletePolicyTaxes', () => {
+        it('Delete tax that is not foreignTaxDefault', () => {
+            const foreignTaxDefault = fakePolicy?.taxRates?.foreignTaxDefault;
+            const taxID = 'id_TAX_RATE_1';
+
+            mockFetch?.pause?.();
+            deletePolicyTaxes(fakePolicy.id, [taxID]);
+            return waitForBatchedUpdates()
+                .then(
+                    () =>
+                        new Promise<void>((resolve) => {
+                            const connection = Onyx.connect({
+                                key: `${ONYXKEYS.COLLECTION.POLICY}${fakePolicy.id}`,
+                                waitForCollectionCallback: false,
+                                callback: (policy) => {
+                                    Onyx.disconnect(connection);
+                                    const taxRates = policy?.taxRates;
+                                    const deletedTax = taxRates?.taxes?.[taxID];
+                                    expect(taxRates?.pendingFields?.foreignTaxDefault).toBeFalsy();
+                                    expect(taxRates?.foreignTaxDefault).toBe(foreignTaxDefault);
+                                    expect(deletedTax?.pendingAction).toBe(CONST.RED_BRICK_ROAD_PENDING_ACTION.DELETE);
+                                    expect(deletedTax?.errors).toBeFalsy();
+                                    resolve();
+                                },
+                            });
+                        }),
+                )
+                .then(mockFetch?.resume)
+                .then(waitForBatchedUpdates)
+                .then(
+                    () =>
+                        new Promise<void>((resolve) => {
+                            const connection = Onyx.connect({
+                                key: `${ONYXKEYS.COLLECTION.POLICY}${fakePolicy.id}`,
+                                waitForCollectionCallback: false,
+                                callback: (policy) => {
+                                    Onyx.disconnect(connection);
+                                    const taxRates = policy?.taxRates;
+                                    const deletedTax = taxRates?.taxes?.[taxID];
+                                    expect(taxRates?.pendingFields?.foreignTaxDefault).toBeFalsy();
+                                    expect(deletedTax).toBeFalsy();
+                                    resolve();
+                                },
+                            });
+                        }),
+                );
+        });
+
+        it('Delete tax that is foreignTaxDefault', () => {
+            const taxID = 'id_TAX_RATE_1';
+            const firstTaxID = 'id_TAX_EXEMPT';
+
+            mockFetch?.pause?.();
+            return Onyx.merge(`${ONYXKEYS.COLLECTION.POLICY}${fakePolicy.id}`, {taxRates: {foreignTaxDefault: 'id_TAX_RATE_1'}})
+                .then(() => {
+                    deletePolicyTaxes(fakePolicy.id, [taxID]);
+                    return waitForBatchedUpdates();
+                })
+                .then(
+                    () =>
+                        new Promise<void>((resolve) => {
+                            const connection = Onyx.connect({
+                                key: `${ONYXKEYS.COLLECTION.POLICY}${fakePolicy.id}`,
+                                waitForCollectionCallback: false,
+                                callback: (policy) => {
+                                    Onyx.disconnect(connection);
+                                    const taxRates = policy?.taxRates;
+                                    const deletedTax = taxRates?.taxes?.[taxID];
+                                    expect(taxRates?.pendingFields?.foreignTaxDefault).toBe(CONST.RED_BRICK_ROAD_PENDING_ACTION.UPDATE);
+                                    expect(taxRates?.foreignTaxDefault).toBe(firstTaxID);
+                                    expect(deletedTax?.pendingAction).toBe(CONST.RED_BRICK_ROAD_PENDING_ACTION.DELETE);
+                                    expect(deletedTax?.errors).toBeFalsy();
+                                    resolve();
+                                },
+                            });
+                        }),
+                )
+                .then(mockFetch?.resume)
+                .then(waitForBatchedUpdates)
+                .then(
+                    () =>
+                        new Promise<void>((resolve) => {
+                            const connection = Onyx.connect({
+                                key: `${ONYXKEYS.COLLECTION.POLICY}${fakePolicy.id}`,
+                                waitForCollectionCallback: false,
+                                callback: (policy) => {
+                                    Onyx.disconnect(connection);
+                                    const taxRates = policy?.taxRates;
+                                    const deletedTax = taxRates?.taxes?.[taxID];
+                                    expect(taxRates?.pendingFields?.foreignTaxDefault).toBeFalsy();
+                                    expect(deletedTax).toBeFalsy();
+                                    resolve();
+                                },
+                            });
+                        }),
+                );
+        });
+
+        it('Delete tax that is not foreignTaxDefault but API return an error, then recover the delated tax', () => {
+            const foreignTaxDefault = fakePolicy?.taxRates?.foreignTaxDefault;
+            const taxID = 'id_TAX_RATE_1';
+
+            mockFetch?.pause?.();
+            deletePolicyTaxes(fakePolicy.id, [taxID]);
+            return waitForBatchedUpdates()
+                .then(
+                    () =>
+                        new Promise<void>((resolve) => {
+                            const connection = Onyx.connect({
+                                key: `${ONYXKEYS.COLLECTION.POLICY}${fakePolicy.id}`,
+                                waitForCollectionCallback: false,
+                                callback: (policy) => {
+                                    Onyx.disconnect(connection);
+                                    const taxRates = policy?.taxRates;
+                                    const deletedTax = taxRates?.taxes?.[taxID];
+                                    expect(taxRates?.pendingFields?.foreignTaxDefault).toBeFalsy();
+                                    expect(taxRates?.foreignTaxDefault).toBe(foreignTaxDefault);
+                                    expect(deletedTax?.pendingAction).toBe(CONST.RED_BRICK_ROAD_PENDING_ACTION.DELETE);
+                                    expect(deletedTax?.errors).toBeFalsy();
+                                    resolve();
+                                },
+                            });
+                        }),
+                )
+                .then(() => {
+                    mockFetch?.fail?.();
+                    return mockFetch?.resume?.() as Promise<unknown>;
+                })
+                .then(waitForBatchedUpdates)
+                .then(
+                    () =>
+                        new Promise<void>((resolve) => {
+                            const connection = Onyx.connect({
+                                key: `${ONYXKEYS.COLLECTION.POLICY}${fakePolicy.id}`,
+                                waitForCollectionCallback: false,
+                                callback: (policy) => {
+                                    Onyx.disconnect(connection);
+                                    const taxRates = policy?.taxRates;
+                                    const deletedTax = taxRates?.taxes?.[taxID];
+                                    expect(taxRates?.pendingFields?.foreignTaxDefault).toBeFalsy();
+                                    expect(deletedTax?.pendingAction).toBeFalsy();
+                                    expect(deletedTax?.errors).toBeTruthy();
+                                    resolve();
+                                },
+                            });
+                        }),
+                );
+        });
+    });
+});
diff --git a/tests/actions/PolicyTest.ts b/tests/actions/PolicyTest.ts
index 44b69bcb86fe..5b95d50eed52 100644
--- a/tests/actions/PolicyTest.ts
+++ b/tests/actions/PolicyTest.ts
@@ -2,14 +2,17 @@ import type {OnyxCollection, OnyxEntry} from 'react-native-onyx';
 import Onyx from 'react-native-onyx';
 import CONST from '@src/CONST';
 import OnyxUpdateManager from '@src/libs/actions/OnyxUpdateManager';
-import * as Policy from '@src/libs/actions/Policy';
+import * as Policy from '@src/libs/actions/Policy/Policy';
 import ONYXKEYS from '@src/ONYXKEYS';
 import type {Policy as PolicyType, Report, ReportAction, ReportActions} from '@src/types/onyx';
+import type {Participant} from '@src/types/onyx/Report';
 import * as TestHelper from '../utils/TestHelper';
+import type {MockFetch} from '../utils/TestHelper';
 import waitForBatchedUpdates from '../utils/waitForBatchedUpdates';
 
 const ESH_EMAIL = 'eshgupta1217@gmail.com';
 const ESH_ACCOUNT_ID = 1;
+const ESH_PARTICIPANT: Participant = {hidden: false, role: 'admin'};
 const WORKSPACE_NAME = "Esh's Workspace";
 
 OnyxUpdateManager();
@@ -21,15 +24,13 @@ describe('actions/Policy', () => {
     });
 
     beforeEach(() => {
-        // @ts-expect-error TODO: Remove this once TestHelper (https://github.com/Expensify/App/issues/25318) is migrated to TypeScript.
         global.fetch = TestHelper.getGlobalFetchMock();
         return Onyx.clear().then(waitForBatchedUpdates);
     });
 
     describe('createWorkspace', () => {
         it('creates a new workspace', async () => {
-            // @ts-expect-error TODO: Remove this once TestHelper (https://github.com/Expensify/App/issues/25318) is migrated to TypeScript.
-            fetch.pause();
+            (fetch as MockFetch)?.pause?.();
             Onyx.set(ONYXKEYS.SESSION, {email: ESH_EMAIL, accountID: ESH_ACCOUNT_ID});
             await waitForBatchedUpdates();
 
@@ -42,10 +43,10 @@ describe('actions/Policy', () => {
             await waitForBatchedUpdates();
 
             let policy: OnyxEntry<PolicyType> | OnyxCollection<PolicyType> = await new Promise((resolve) => {
-                const connectionID = Onyx.connect({
+                const connection = Onyx.connect({
                     key: `${ONYXKEYS.COLLECTION.POLICY}${policyID}`,
                     callback: (workspace) => {
-                        Onyx.disconnect(connectionID);
+                        Onyx.disconnect(connection);
                         resolve(workspace);
                     },
                 });
@@ -62,11 +63,11 @@ describe('actions/Policy', () => {
             expect(policy?.employeeList).toEqual({[ESH_EMAIL]: {errors: {}, role: CONST.POLICY.ROLE.ADMIN}});
 
             let allReports: OnyxCollection<Report> = await new Promise((resolve) => {
-                const connectionID = Onyx.connect({
+                const connection = Onyx.connect({
                     key: ONYXKEYS.COLLECTION.REPORT,
                     waitForCollectionCallback: true,
                     callback: (reports) => {
-                        Onyx.disconnect(connectionID);
+                        Onyx.disconnect(connection);
                         resolve(reports);
                     },
                 });
@@ -77,7 +78,7 @@ describe('actions/Policy', () => {
             expect(workspaceReports.length).toBe(3);
             workspaceReports.forEach((report) => {
                 expect(report?.pendingFields?.addWorkspaceRoom).toBe(CONST.RED_BRICK_ROAD_PENDING_ACTION.ADD);
-                expect(report?.participantAccountIDs).toEqual([ESH_ACCOUNT_ID]);
+                expect(report?.participants).toEqual({[ESH_ACCOUNT_ID]: ESH_PARTICIPANT});
                 switch (report?.chatType) {
                     case CONST.REPORT.CHAT_TYPE.POLICY_ADMINS: {
                         adminReportID = report.reportID;
@@ -97,11 +98,11 @@ describe('actions/Policy', () => {
             });
 
             let reportActions: OnyxCollection<ReportActions> = await new Promise((resolve) => {
-                const connectionID = Onyx.connect({
+                const connection = Onyx.connect({
                     key: ONYXKEYS.COLLECTION.REPORT_ACTIONS,
                     waitForCollectionCallback: true,
                     callback: (actions) => {
-                        Onyx.disconnect(connectionID);
+                        Onyx.disconnect(connection);
                         resolve(actions);
                     },
                 });
@@ -122,16 +123,15 @@ describe('actions/Policy', () => {
             });
 
             // Check for success data
-            // @ts-expect-error TODO: Remove this once TestHelper (https://github.com/Expensify/App/issues/25318) is migrated to TypeScript.
-            fetch.resume();
+            (fetch as MockFetch)?.resume?.();
             await waitForBatchedUpdates();
 
             policy = await new Promise((resolve) => {
-                const connectionID = Onyx.connect({
+                const connection = Onyx.connect({
                     key: ONYXKEYS.COLLECTION.POLICY,
                     waitForCollectionCallback: true,
                     callback: (workspace) => {
-                        Onyx.disconnect(connectionID);
+                        Onyx.disconnect(connection);
                         resolve(workspace);
                     },
                 });
@@ -141,11 +141,11 @@ describe('actions/Policy', () => {
             expect(policy?.pendingAction).toBeFalsy();
 
             allReports = await new Promise((resolve) => {
-                const connectionID = Onyx.connect({
+                const connection = Onyx.connect({
                     key: ONYXKEYS.COLLECTION.REPORT,
                     waitForCollectionCallback: true,
                     callback: (reports) => {
-                        Onyx.disconnect(connectionID);
+                        Onyx.disconnect(connection);
                         resolve(reports);
                     },
                 });
@@ -158,11 +158,11 @@ describe('actions/Policy', () => {
             });
 
             reportActions = await new Promise((resolve) => {
-                const connectionID = Onyx.connect({
+                const connection = Onyx.connect({
                     key: ONYXKEYS.COLLECTION.REPORT_ACTIONS,
                     waitForCollectionCallback: true,
                     callback: (actions) => {
-                        Onyx.disconnect(connectionID);
+                        Onyx.disconnect(connection);
                         resolve(actions);
                     },
                 });
diff --git a/tests/actions/ReportFieldTest.ts b/tests/actions/ReportFieldTest.ts
new file mode 100644
index 000000000000..823cb1cc02db
--- /dev/null
+++ b/tests/actions/ReportFieldTest.ts
@@ -0,0 +1,540 @@
+import type {OnyxEntry} from 'react-native-onyx';
+import Onyx from 'react-native-onyx';
+import DateUtils from '@libs/DateUtils';
+import {generateFieldID} from '@libs/WorkspaceReportFieldUtils';
+import CONST from '@src/CONST';
+import OnyxUpdateManager from '@src/libs/actions/OnyxUpdateManager';
+import * as Policy from '@src/libs/actions/Policy/Policy';
+import * as ReportField from '@src/libs/actions/Policy/ReportField';
+import type {CreateReportFieldArguments} from '@src/libs/actions/Policy/ReportField';
+import * as ReportUtils from '@src/libs/ReportUtils';
+import ONYXKEYS from '@src/ONYXKEYS';
+import INPUT_IDS from '@src/types/form/WorkspaceReportFieldForm';
+import type {PolicyReportField, Policy as PolicyType} from '@src/types/onyx';
+import type {OnyxValueWithOfflineFeedback} from '@src/types/onyx/OnyxCommon';
+import createRandomPolicy from '../utils/collections/policies';
+import * as TestHelper from '../utils/TestHelper';
+import type {MockFetch} from '../utils/TestHelper';
+import waitForBatchedUpdates from '../utils/waitForBatchedUpdates';
+
+type PolicyReportFieldWithOfflineFeedback = Record<string, OnyxValueWithOfflineFeedback<PolicyReportField>>;
+type PolicyReportFieldWithoutOfflineFeedback = Record<string, PolicyReportField>;
+
+OnyxUpdateManager();
+describe('actions/ReportField', () => {
+    function connectToFetchPolicy(policyID: string): Promise<OnyxEntry<PolicyType>> {
+        return new Promise((resolve) => {
+            const connection = Onyx.connect({
+                key: `${ONYXKEYS.COLLECTION.POLICY}${policyID}`,
+                callback: (workspace) => {
+                    Onyx.disconnect(connection);
+                    resolve(workspace);
+                },
+            });
+        });
+    }
+
+    beforeAll(() => {
+        Onyx.init({
+            keys: ONYXKEYS,
+        });
+    });
+
+    let mockFetch: MockFetch;
+    beforeEach(() => {
+        global.fetch = TestHelper.getGlobalFetchMock();
+        mockFetch = fetch as MockFetch;
+        return Onyx.clear().then(waitForBatchedUpdates);
+    });
+
+    describe('createReportField', () => {
+        it('creates a new text report field of a workspace', async () => {
+            mockFetch.pause();
+            Onyx.set(ONYXKEYS.FORMS.WORKSPACE_REPORT_FIELDS_FORM_DRAFT, {});
+            await waitForBatchedUpdates();
+
+            const policyID = Policy.generatePolicyID();
+            const reportFieldName = 'Test Field';
+            const reportFieldID = generateFieldID(reportFieldName);
+            const reportFieldKey = ReportUtils.getReportFieldKey(reportFieldID);
+            const newReportField: OnyxValueWithOfflineFeedback<PolicyReportField> = {
+                name: reportFieldName,
+                type: CONST.REPORT_FIELD_TYPES.TEXT,
+                defaultValue: 'Default Value',
+                values: [],
+                disabledOptions: [],
+                fieldID: reportFieldID,
+                orderWeight: 1,
+                deletable: false,
+                keys: [],
+                pendingAction: CONST.RED_BRICK_ROAD_PENDING_ACTION.ADD,
+                externalIDs: [],
+                isTax: false,
+            };
+            const createReportFieldArguments: CreateReportFieldArguments = {
+                name: reportFieldName,
+                type: CONST.REPORT_FIELD_TYPES.TEXT,
+                initialValue: 'Default Value',
+            };
+
+            ReportField.createReportField(policyID, createReportFieldArguments);
+            await waitForBatchedUpdates();
+
+            let policy: OnyxEntry<PolicyType> = await connectToFetchPolicy(policyID);
+
+            // check if the new report field was added to the policy
+            expect(policy?.fieldList).toStrictEqual<PolicyReportFieldWithOfflineFeedback>({
+                [reportFieldKey]: {...newReportField, pendingAction: CONST.RED_BRICK_ROAD_PENDING_ACTION.ADD},
+            });
+
+            // Check for success data
+            mockFetch.resume();
+            await waitForBatchedUpdates();
+
+            policy = await connectToFetchPolicy(policyID);
+
+            // Check if the policy pending action was cleared
+            expect(policy?.fieldList?.[reportFieldKey]?.pendingAction).toBeFalsy();
+        });
+
+        it('creates a new date report field of a workspace', async () => {
+            mockFetch.pause();
+            Onyx.set(ONYXKEYS.FORMS.WORKSPACE_REPORT_FIELDS_FORM_DRAFT, {});
+            await waitForBatchedUpdates();
+
+            const policyID = Policy.generatePolicyID();
+            const reportFieldName = 'Test Field 2';
+            const reportFieldID = generateFieldID(reportFieldName);
+            const reportFieldKey = ReportUtils.getReportFieldKey(reportFieldID);
+            const defaultDate = DateUtils.extractDate(new Date().toString());
+            const newReportField: OnyxValueWithOfflineFeedback<PolicyReportField> = {
+                name: reportFieldName,
+                type: CONST.REPORT_FIELD_TYPES.DATE,
+                defaultValue: defaultDate,
+                values: [],
+                disabledOptions: [],
+                fieldID: reportFieldID,
+                orderWeight: 1,
+                deletable: false,
+                keys: [],
+                pendingAction: CONST.RED_BRICK_ROAD_PENDING_ACTION.ADD,
+                externalIDs: [],
+                isTax: false,
+            };
+            const createReportFieldArguments: CreateReportFieldArguments = {
+                name: reportFieldName,
+                type: CONST.REPORT_FIELD_TYPES.DATE,
+                initialValue: defaultDate,
+            };
+
+            ReportField.createReportField(policyID, createReportFieldArguments);
+            await waitForBatchedUpdates();
+
+            let policy: OnyxEntry<PolicyType> = await connectToFetchPolicy(policyID);
+
+            // check if the new report field was added to the policy
+            expect(policy?.fieldList).toStrictEqual<PolicyReportFieldWithOfflineFeedback>({
+                [reportFieldKey]: {...newReportField, pendingAction: CONST.RED_BRICK_ROAD_PENDING_ACTION.ADD},
+            });
+
+            // Check for success data
+            mockFetch.resume();
+            await waitForBatchedUpdates();
+
+            policy = await connectToFetchPolicy(policyID);
+
+            // Check if the policy pending action was cleared
+            expect(policy?.fieldList?.[reportFieldKey]?.pendingAction).toBeFalsy();
+        });
+
+        it('creates a new list report field of a workspace', async () => {
+            mockFetch.pause();
+            Onyx.set(ONYXKEYS.FORMS.WORKSPACE_REPORT_FIELDS_FORM_DRAFT, {
+                [INPUT_IDS.LIST_VALUES]: ['Value 1', 'Value 2'],
+                [INPUT_IDS.DISABLED_LIST_VALUES]: [false, true],
+            });
+            await waitForBatchedUpdates();
+
+            const policyID = Policy.generatePolicyID();
+            const reportFieldName = 'Test Field 3';
+            const reportFieldID = generateFieldID(reportFieldName);
+            const reportFieldKey = ReportUtils.getReportFieldKey(reportFieldID);
+            const newReportField: OnyxValueWithOfflineFeedback<PolicyReportField> = {
+                name: reportFieldName,
+                type: CONST.REPORT_FIELD_TYPES.LIST,
+                defaultValue: '',
+                values: ['Value 1', 'Value 2'],
+                disabledOptions: [false, true],
+                fieldID: reportFieldID,
+                orderWeight: 1,
+                deletable: false,
+                keys: [],
+                externalIDs: [],
+                isTax: false,
+                pendingAction: CONST.RED_BRICK_ROAD_PENDING_ACTION.ADD,
+                value: CONST.REPORT_FIELD_TYPES.LIST,
+            };
+            const createReportFieldArguments: CreateReportFieldArguments = {
+                name: reportFieldName,
+                type: CONST.REPORT_FIELD_TYPES.LIST,
+                initialValue: '',
+            };
+
+            ReportField.createReportField(policyID, createReportFieldArguments);
+            await waitForBatchedUpdates();
+
+            let policy: OnyxEntry<PolicyType> = await connectToFetchPolicy(policyID);
+
+            // check if the new report field was added to the policy
+            expect(policy?.fieldList).toStrictEqual<PolicyReportFieldWithOfflineFeedback>({
+                [reportFieldKey]: {...newReportField, pendingAction: CONST.RED_BRICK_ROAD_PENDING_ACTION.ADD},
+            });
+
+            // Check for success data
+            mockFetch.resume();
+            await waitForBatchedUpdates();
+
+            policy = await connectToFetchPolicy(policyID);
+
+            // Check if the policy pending action was cleared
+            expect(policy?.fieldList?.[reportFieldKey].pendingAction).toBeFalsy();
+        });
+    });
+
+    describe('deleteReportField', () => {
+        it('Deleted a report field from a workspace', async () => {
+            const fakePolicy = createRandomPolicy(0);
+            const reportFieldName = 'Test Field';
+            const reportFieldID = generateFieldID(reportFieldName);
+            const reportFieldKey = ReportUtils.getReportFieldKey(reportFieldID);
+            const fakeReportField: OnyxValueWithOfflineFeedback<PolicyReportField> = {
+                name: reportFieldName,
+                type: CONST.REPORT_FIELD_TYPES.TEXT,
+                defaultValue: 'Default Value',
+                values: [],
+                disabledOptions: [],
+                fieldID: reportFieldID,
+                orderWeight: 1,
+                deletable: false,
+                keys: [],
+                pendingAction: CONST.RED_BRICK_ROAD_PENDING_ACTION.DELETE,
+                value: 'default',
+                externalIDs: [],
+                isTax: false,
+            };
+            fakePolicy.fieldList = {
+                [reportFieldKey]: fakeReportField,
+            };
+            Onyx.set(`${ONYXKEYS.COLLECTION.POLICY}${fakePolicy.id}`, fakePolicy);
+            await waitForBatchedUpdates();
+
+            let policy: OnyxEntry<PolicyType> = await connectToFetchPolicy(fakePolicy.id);
+
+            // check if the report field exists in the policy
+            expect(policy?.fieldList).toStrictEqual<PolicyReportFieldWithOfflineFeedback>({
+                [reportFieldKey]: fakeReportField,
+            });
+
+            ReportField.deleteReportFields(fakePolicy.id, [reportFieldKey]);
+            await waitForBatchedUpdates();
+
+            // Check for success data
+            mockFetch.resume();
+            await waitForBatchedUpdates();
+
+            policy = await connectToFetchPolicy(fakePolicy.id);
+
+            // Check if the policy report field was removed
+            expect(policy?.fieldList?.[reportFieldKey]).toBeFalsy();
+        });
+
+        it('Deleted a report field from a workspace when API fails', async () => {
+            const policyID = Policy.generatePolicyID();
+            const fakePolicy = createRandomPolicy(Number(policyID));
+            const reportFieldName = 'Test Field';
+            const reportFieldID = generateFieldID(reportFieldName);
+            const reportFieldKey = ReportUtils.getReportFieldKey(reportFieldID);
+            const fakeReportField: OnyxValueWithOfflineFeedback<PolicyReportField> = {
+                name: reportFieldName,
+                type: CONST.REPORT_FIELD_TYPES.TEXT,
+                defaultValue: 'Default Value',
+                values: [],
+                disabledOptions: [],
+                fieldID: reportFieldID,
+                orderWeight: 1,
+                deletable: false,
+                keys: [],
+                value: 'default',
+                externalIDs: [],
+                isTax: false,
+            };
+            fakePolicy.fieldList = {
+                [reportFieldKey]: fakeReportField,
+            };
+            Onyx.set(`${ONYXKEYS.COLLECTION.POLICY}${policyID}`, fakePolicy);
+            await waitForBatchedUpdates();
+
+            let policy: OnyxEntry<PolicyType> = await connectToFetchPolicy(policyID);
+
+            // check if the report field exists in the policy
+            expect(policy?.fieldList).toStrictEqual<PolicyReportFieldWithOfflineFeedback>({
+                [reportFieldKey]: fakeReportField,
+            });
+
+            // Check for failure data
+            mockFetch.fail();
+            ReportField.deleteReportFields(policyID, [reportFieldKey]);
+            await waitForBatchedUpdates();
+
+            mockFetch.resume();
+            await waitForBatchedUpdates();
+
+            policy = await connectToFetchPolicy(policyID);
+
+            // check if the deleted report field was reset in the policy
+            expect(policy?.fieldList).toStrictEqual<PolicyReportFieldWithOfflineFeedback>({
+                [reportFieldKey]: fakeReportField,
+            });
+        });
+    });
+
+    describe('updateReportFieldInitialValue', () => {
+        it('updates the initial value of a text report field', async () => {
+            mockFetch.pause();
+
+            const policyID = Policy.generatePolicyID();
+            const reportFieldName = 'Test Field';
+            const oldInitialValue = 'Old initial value';
+            const newInitialValue = 'New initial value';
+            const reportFieldID = generateFieldID(reportFieldName);
+            const reportFieldKey = ReportUtils.getReportFieldKey(reportFieldID);
+            const reportField: PolicyReportField = {
+                name: reportFieldName,
+                type: CONST.REPORT_FIELD_TYPES.TEXT,
+                defaultValue: oldInitialValue,
+                values: [],
+                disabledOptions: [],
+                fieldID: reportFieldID,
+                orderWeight: 1,
+                deletable: false,
+                keys: [],
+                externalIDs: [],
+                isTax: false,
+            };
+            const fakePolicy = createRandomPolicy(Number(policyID));
+
+            Onyx.set(`${ONYXKEYS.COLLECTION.POLICY}${policyID}`, {...fakePolicy, fieldList: {[reportFieldKey]: reportField}});
+            await waitForBatchedUpdates();
+
+            ReportField.updateReportFieldInitialValue(policyID, reportFieldID, newInitialValue);
+            await waitForBatchedUpdates();
+
+            let policy: OnyxEntry<PolicyType> = await connectToFetchPolicy(policyID);
+
+            // check if the updated report field was set to the policy
+            expect(policy?.fieldList).toStrictEqual<PolicyReportFieldWithOfflineFeedback>({
+                [reportFieldKey]: {
+                    ...reportField,
+                    defaultValue: newInitialValue,
+                    pendingAction: CONST.RED_BRICK_ROAD_PENDING_ACTION.UPDATE,
+                },
+            });
+
+            // Check for success data
+            mockFetch.resume();
+            await waitForBatchedUpdates();
+
+            policy = await connectToFetchPolicy(policyID);
+
+            // Check if the policy pending action was cleared
+            expect(policy?.fieldList?.[reportFieldKey].pendingAction).toBeFalsy();
+        });
+
+        it('updates the initial value of a text report field when api returns an error', async () => {
+            mockFetch.pause();
+
+            const policyID = Policy.generatePolicyID();
+            const reportFieldName = 'Test Field';
+            const oldInitialValue = 'Old initial value';
+            const newInitialValue = 'New initial value';
+            const reportFieldID = generateFieldID(reportFieldName);
+            const reportFieldKey = ReportUtils.getReportFieldKey(reportFieldID);
+            const reportField: PolicyReportField = {
+                name: reportFieldName,
+                type: CONST.REPORT_FIELD_TYPES.TEXT,
+                defaultValue: oldInitialValue,
+                values: [],
+                disabledOptions: [],
+                fieldID: reportFieldID,
+                orderWeight: 1,
+                deletable: false,
+                keys: [],
+                externalIDs: [],
+                isTax: false,
+            };
+            const fakePolicy = createRandomPolicy(Number(policyID));
+
+            Onyx.set(`${ONYXKEYS.COLLECTION.POLICY}${policyID}`, {...fakePolicy, fieldList: {[reportFieldKey]: reportField}});
+            await waitForBatchedUpdates();
+
+            ReportField.updateReportFieldInitialValue(policyID, reportFieldID, newInitialValue);
+            await waitForBatchedUpdates();
+
+            let policy: OnyxEntry<PolicyType> = await connectToFetchPolicy(policyID);
+
+            // check if the updated report field was set to the policy
+            expect(policy?.fieldList).toStrictEqual<PolicyReportFieldWithOfflineFeedback>({
+                [reportFieldKey]: {
+                    ...reportField,
+                    defaultValue: newInitialValue,
+                    pendingAction: CONST.RED_BRICK_ROAD_PENDING_ACTION.UPDATE,
+                },
+            });
+
+            // Check for failure data
+            mockFetch.fail();
+            mockFetch.resume();
+            await waitForBatchedUpdates();
+
+            policy = await connectToFetchPolicy(policyID);
+
+            // check if the updated report field was reset in the policy
+            expect(policy?.fieldList).toStrictEqual<PolicyReportFieldWithOfflineFeedback>({
+                [reportFieldKey]: reportField,
+            });
+            // Check if the policy errors was set
+            expect(policy?.errorFields?.[reportFieldKey]).toBeTruthy();
+        });
+    });
+
+    describe('updateReportFieldListValueEnabled', () => {
+        it('updates the enabled flag of report field list values', async () => {
+            mockFetch.pause();
+
+            const policyID = Policy.generatePolicyID();
+            const reportFieldName = 'Test Field';
+            const valueIndexesTpUpdate = [1, 2];
+            const reportFieldID = generateFieldID(reportFieldName);
+            const reportFieldKey = ReportUtils.getReportFieldKey(reportFieldID);
+            const reportField: PolicyReportField = {
+                name: reportFieldName,
+                type: CONST.REPORT_FIELD_TYPES.LIST,
+                defaultValue: 'Value 2',
+                values: ['Value 1', 'Value 2', 'Value 3'],
+                disabledOptions: [false, false, true],
+                fieldID: reportFieldID,
+                orderWeight: 1,
+                deletable: false,
+                keys: [],
+                externalIDs: [],
+                isTax: false,
+                value: CONST.REPORT_FIELD_TYPES.LIST,
+            };
+            const fakePolicy = createRandomPolicy(Number(policyID));
+
+            Onyx.set(`${ONYXKEYS.COLLECTION.POLICY}${policyID}`, {...fakePolicy, fieldList: {[reportFieldKey]: reportField}});
+            await waitForBatchedUpdates();
+
+            ReportField.updateReportFieldListValueEnabled(policyID, reportFieldID, valueIndexesTpUpdate, false);
+            await waitForBatchedUpdates();
+
+            const policy: OnyxEntry<PolicyType> = await connectToFetchPolicy(policyID);
+
+            // check if the new report field was added to the policy optimistically
+            expect(policy?.fieldList).toStrictEqual<PolicyReportFieldWithoutOfflineFeedback>({
+                [reportFieldKey]: {
+                    ...reportField,
+                    defaultValue: '',
+                    disabledOptions: [false, true, true],
+                },
+            });
+        });
+    });
+
+    describe('addReportFieldListValue', () => {
+        it('adds a new value to a report field list', async () => {
+            mockFetch.pause();
+
+            const policyID = Policy.generatePolicyID();
+            const reportFieldName = 'Test Field';
+            const reportFieldID = generateFieldID(reportFieldName);
+            const reportFieldKey = ReportUtils.getReportFieldKey(reportFieldID);
+            const reportField: PolicyReportField = {
+                name: reportFieldName,
+                type: CONST.REPORT_FIELD_TYPES.LIST,
+                defaultValue: 'Value 2',
+                values: ['Value 1', 'Value 2', 'Value 3'],
+                disabledOptions: [false, false, true],
+                fieldID: reportFieldID,
+                orderWeight: 1,
+                deletable: false,
+                keys: [],
+                externalIDs: [],
+                isTax: false,
+                value: CONST.REPORT_FIELD_TYPES.LIST,
+            };
+            const fakePolicy = createRandomPolicy(Number(policyID));
+            const newListValueName = 'Value 4';
+
+            Onyx.set(`${ONYXKEYS.COLLECTION.POLICY}${policyID}`, {...fakePolicy, fieldList: {[reportFieldKey]: reportField}});
+            await waitForBatchedUpdates();
+
+            ReportField.addReportFieldListValue(policyID, reportFieldID, newListValueName);
+            await waitForBatchedUpdates();
+
+            const policy: OnyxEntry<PolicyType> = await connectToFetchPolicy(policyID);
+            // Check if the new report field was added to the policy optimistically
+            expect(policy?.fieldList).toStrictEqual<PolicyReportFieldWithoutOfflineFeedback>({
+                [reportFieldKey]: {
+                    ...reportField,
+                    values: [...reportField.values, newListValueName],
+                    disabledOptions: [...reportField.disabledOptions, false],
+                },
+            });
+        });
+    });
+
+    describe('removeReportFieldListValue', () => {
+        it('removes list values from a report field list', async () => {
+            mockFetch.pause();
+
+            const policyID = Policy.generatePolicyID();
+            const reportFieldName = 'Test Field';
+            const reportFieldID = generateFieldID(reportFieldName);
+            const reportFieldKey = ReportUtils.getReportFieldKey(reportFieldID);
+            const reportField: PolicyReportField = {
+                name: reportFieldName,
+                type: CONST.REPORT_FIELD_TYPES.LIST,
+                defaultValue: 'Value 2',
+                values: ['Value 1', 'Value 2', 'Value 3'],
+                disabledOptions: [false, false, true],
+                fieldID: reportFieldID,
+                orderWeight: 1,
+                deletable: false,
+                keys: [],
+                externalIDs: [],
+                isTax: false,
+                value: CONST.REPORT_FIELD_TYPES.LIST,
+            };
+            const fakePolicy = createRandomPolicy(Number(policyID));
+
+            Onyx.set(`${ONYXKEYS.COLLECTION.POLICY}${policyID}`, {...fakePolicy, fieldList: {[reportFieldKey]: reportField}});
+            await waitForBatchedUpdates();
+
+            ReportField.removeReportFieldListValue(policyID, reportFieldID, [1, 2]);
+            await waitForBatchedUpdates();
+
+            const policy: OnyxEntry<PolicyType> = await connectToFetchPolicy(policyID);
+
+            // Check if the values were removed from the report field optimistically
+            expect(policy?.fieldList).toStrictEqual<PolicyReportFieldWithoutOfflineFeedback>({
+                [reportFieldKey]: {
+                    ...reportField,
+                    defaultValue: '',
+                    values: ['Value 1'],
+                    disabledOptions: [false],
+                },
+            });
+        });
+    });
+});
diff --git a/tests/actions/ReportTest.ts b/tests/actions/ReportTest.ts
index 28aa84babfb5..e6ab31334bb1 100644
--- a/tests/actions/ReportTest.ts
+++ b/tests/actions/ReportTest.ts
@@ -52,7 +52,6 @@ describe('actions/Report', () => {
     afterEach(PusherHelper.teardown);
 
     it('should store a new report action in Onyx when onyxApiUpdate event is handled via Pusher', () => {
-        // @ts-expect-error TODO: Remove this once TestHelper (https://github.com/Expensify/App/issues/25318) is migrated to TypeScript.
         global.fetch = TestHelper.getGlobalFetchMock();
 
         const TEST_USER_ACCOUNT_ID = 1;
@@ -168,7 +167,6 @@ describe('actions/Report', () => {
         return TestHelper.signInWithTestUser(TEST_USER_ACCOUNT_ID, TEST_USER_LOGIN)
             .then(() => TestHelper.setPersonalDetails(TEST_USER_LOGIN, TEST_USER_ACCOUNT_ID))
             .then(() => {
-                // @ts-expect-error TODO: Remove this once TestHelper (https://github.com/Expensify/App/issues/25318) is migrated to TypeScript.
                 global.fetch = TestHelper.getGlobalFetchMock();
 
                 // WHEN we add enough logs to send a packet
@@ -188,14 +186,13 @@ describe('actions/Report', () => {
             .then(() => {
                 // THEN only ONE call to AddComment will happen
                 const URL_ARGUMENT_INDEX = 0;
-                const addCommentCalls = (global.fetch as jest.Mock).mock.calls.filter((callArguments) => callArguments[URL_ARGUMENT_INDEX].includes('AddComment'));
+                const addCommentCalls = (global.fetch as jest.Mock).mock.calls.filter((callArguments: string[]) => callArguments[URL_ARGUMENT_INDEX].includes('AddComment'));
                 expect(addCommentCalls.length).toBe(1);
             });
     });
 
     it('should be updated correctly when new comments are added, deleted or marked as unread', () => {
         jest.useFakeTimers();
-        // @ts-expect-error TODO: Remove this once TestHelper (https://github.com/Expensify/App/issues/25318) is migrated to TypeScript.
         global.fetch = TestHelper.getGlobalFetchMock();
         const REPORT_ID = '1';
         let report: OnyxEntry<OnyxTypes.Report>;
@@ -432,7 +429,6 @@ describe('actions/Report', () => {
          * already in the comment and the user deleted it on purpose.
          */
 
-        // @ts-expect-error TODO: Remove this once TestHelper (https://github.com/Expensify/App/issues/25318) is migrated to TypeScript.
         global.fetch = TestHelper.getGlobalFetchMock();
 
         // User edits comment to add link
@@ -545,7 +541,6 @@ describe('actions/Report', () => {
     });
 
     it('should properly toggle reactions on a message', () => {
-        // @ts-expect-error TODO: Remove this once TestHelper (https://github.com/Expensify/App/issues/25318) is migrated to TypeScript.
         global.fetch = TestHelper.getGlobalFetchMock();
 
         const TEST_USER_ACCOUNT_ID = 1;
@@ -666,7 +661,6 @@ describe('actions/Report', () => {
     });
 
     it("shouldn't add the same reaction twice when changing preferred skin color and reaction doesn't support skin colors", () => {
-        // @ts-expect-error TODO: Remove this once TestHelper (https://github.com/Expensify/App/issues/25318) is migrated to TypeScript.
         global.fetch = TestHelper.getGlobalFetchMock();
 
         const TEST_USER_ACCOUNT_ID = 1;
diff --git a/tests/actions/SessionTest.ts b/tests/actions/SessionTest.ts
index f4c4d186ff50..62d6a54b20b5 100644
--- a/tests/actions/SessionTest.ts
+++ b/tests/actions/SessionTest.ts
@@ -35,13 +35,13 @@ describe('Session', () => {
         const TEST_INITIAL_AUTH_TOKEN = 'initialAuthToken';
         const TEST_REFRESHED_AUTH_TOKEN = 'refreshedAuthToken';
 
-        let credentials: OnyxEntry<Credentials> = null;
+        let credentials: OnyxEntry<Credentials>;
         Onyx.connect({
             key: ONYXKEYS.CREDENTIALS,
             callback: (val) => (credentials = val),
         });
 
-        let session: OnyxEntry<Session> = null;
+        let session: OnyxEntry<Session>;
         Onyx.connect({
             key: ONYXKEYS.SESSION,
             callback: (val) => (session = val),
diff --git a/tests/e2e/ADDING_TESTS.md b/tests/e2e/ADDING_TESTS.md
index f262a5ed9a0a..92f6404203c1 100644
--- a/tests/e2e/ADDING_TESTS.md
+++ b/tests/e2e/ADDING_TESTS.md
@@ -72,7 +72,8 @@ const test = () => {
       // ... do something with the measurements
       E2EClient.submitTestResults({
           name: "Navigate to report",
-          duration: measurement.duration,
+          metric: measurement.duration,
+          unit: 'ms',
       }).then(E2EClient.submitTestDone)
   });
 
diff --git a/tests/e2e/README.md b/tests/e2e/README.md
index ea36172a52ff..1f590a474ad5 100644
--- a/tests/e2e/README.md
+++ b/tests/e2e/README.md
@@ -148,7 +148,8 @@ const someDurationWeCollected = // ...
 
 E2EClient.submitTestResults({
     name: 'My test name',
-    duration: someDurationWeCollected,
+    metric: someDurationWeCollected,
+    unit: 'ms',
 });
 ```
 
diff --git a/tests/e2e/TestSpec.yml b/tests/e2e/TestSpec.yml
index 3570bc11f3bb..277a4d1ef43b 100644
--- a/tests/e2e/TestSpec.yml
+++ b/tests/e2e/TestSpec.yml
@@ -5,6 +5,7 @@ phases:
     commands:
       # Install correct version of node
       - export NVM_DIR=$HOME/.nvm
+      - export FLASHLIGHT_BINARY_PATH=$DEVICEFARM_TEST_PACKAGE_PATH/zip/bin
       - . $NVM_DIR/nvm.sh
       # Note: Node v16 is the latest supported version of node for AWS Device Farm
       # using v20 will not work!
diff --git a/tests/e2e/compare/compare.ts b/tests/e2e/compare/compare.ts
index 6cd1feec47b5..40a728545668 100644
--- a/tests/e2e/compare/compare.ts
+++ b/tests/e2e/compare/compare.ts
@@ -1,3 +1,4 @@
+import type {Unit} from '@libs/E2E/types';
 import type {Stats} from '../measure/math';
 import getStats from '../measure/math';
 import * as math from './math';
@@ -28,7 +29,16 @@ const PROBABILITY_CONSIDERED_SIGNIFICANCE = 0.02;
  */
 const DURATION_DIFF_THRESHOLD_SIGNIFICANCE = 100;
 
-function buildCompareEntry(name: string, compare: Stats, baseline: Stats): Entry {
+const LowerIsBetter: Record<Unit, boolean> = {
+    ms: true,
+    MB: true,
+    // eslint-disable-next-line @typescript-eslint/naming-convention
+    '%': true,
+    renders: true,
+    FPS: false,
+};
+
+function buildCompareEntry(name: string, compare: Stats, baseline: Stats, unit: Unit): Entry {
     const diff = compare.mean - baseline.mean;
     const relativeDurationDiff = diff / baseline.mean;
 
@@ -38,11 +48,12 @@ function buildCompareEntry(name: string, compare: Stats, baseline: Stats): Entry
     const isDurationDiffOfSignificance = prob < PROBABILITY_CONSIDERED_SIGNIFICANCE && Math.abs(diff) >= DURATION_DIFF_THRESHOLD_SIGNIFICANCE;
 
     return {
+        unit,
         name,
         baseline,
         current: compare,
         diff,
-        relativeDurationDiff,
+        relativeDurationDiff: LowerIsBetter[unit] ? relativeDurationDiff : -relativeDurationDiff,
         isDurationDiffOfSignificance,
     };
 }
@@ -50,7 +61,7 @@ function buildCompareEntry(name: string, compare: Stats, baseline: Stats): Entry
 /**
  * Compare results between baseline and current entries and categorize.
  */
-function compareResults(compareEntries: Metric | string, baselineEntries: Metric | string) {
+function compareResults(baselineEntries: Metric | string, compareEntries: Metric | string = baselineEntries, metricForTest: Record<string, Unit> = {}) {
     // Unique test scenario names
     const baselineKeys = Object.keys(baselineEntries ?? {});
     const names = Array.from(new Set([...baselineKeys]));
@@ -66,7 +77,7 @@ function compareResults(compareEntries: Metric | string, baselineEntries: Metric
             const deltaStats = getStats(current);
 
             if (baseline && current) {
-                compared.push(buildCompareEntry(name, deltaStats, currentStats));
+                compared.push(buildCompareEntry(name, deltaStats, currentStats, metricForTest[name]));
             }
         });
     }
@@ -80,9 +91,9 @@ function compareResults(compareEntries: Metric | string, baselineEntries: Metric
     };
 }
 
-export default (main: Metric | string, delta: Metric | string, outputFile: string, outputFormat = 'all') => {
-    // IMPORTANT NOTE: make sure you are passing the delta/compare results first, then the main/baseline results:
-    const outputData = compareResults(delta, main);
+export default (main: Metric | string, delta: Metric | string, outputFile: string, outputFormat = 'all', metricForTest = {}) => {
+    // IMPORTANT NOTE: make sure you are passing the main/baseline results first, then the delta/compare results:
+    const outputData = compareResults(main, delta, metricForTest);
 
     if (outputFormat === 'console' || outputFormat === 'all') {
         printToConsole(outputData);
@@ -92,3 +103,4 @@ export default (main: Metric | string, delta: Metric | string, outputFile: strin
         return writeToMarkdown(outputFile, outputData);
     }
 };
+export {compareResults};
diff --git a/tests/e2e/compare/output/console.ts b/tests/e2e/compare/output/console.ts
index 77170e43f4a6..41ae5a4e0ccf 100644
--- a/tests/e2e/compare/output/console.ts
+++ b/tests/e2e/compare/output/console.ts
@@ -1,3 +1,4 @@
+import type {Unit} from '@libs/E2E/types';
 import type {Stats} from '../../measure/math';
 import * as format from './format';
 
@@ -8,6 +9,7 @@ type Entry = {
     diff: number;
     relativeDurationDiff: number;
     isDurationDiffOfSignificance: boolean;
+    unit: Unit;
 };
 
 type Data = {
@@ -18,7 +20,7 @@ type Data = {
 };
 
 const printRegularLine = (entry: Entry) => {
-    console.debug(` - ${entry.name}: ${format.formatDurationDiffChange(entry)}`);
+    console.debug(` - ${entry.name}: ${format.formatMetricDiffChange(entry)}`);
 };
 
 /**
diff --git a/tests/e2e/compare/output/format.ts b/tests/e2e/compare/output/format.ts
index 40c9e74d6247..f00684cd5a01 100644
--- a/tests/e2e/compare/output/format.ts
+++ b/tests/e2e/compare/output/format.ts
@@ -20,16 +20,16 @@ const formatPercentChange = (value: number): string => {
     return `${value >= 0 ? '+' : '-'}${formatPercent(absValue)}`;
 };
 
-const formatDuration = (duration: number): string => `${duration.toFixed(3)} ms`;
+const formatMetric = (duration: number, unit: string): string => `${duration.toFixed(3)} ${unit}`;
 
-const formatDurationChange = (value: number): string => {
+const formatMetricChange = (value: number, unit: string): string => {
     if (value > 0) {
-        return `+${formatDuration(value)}`;
+        return `+${formatMetric(value, unit)}`;
     }
     if (value < 0) {
-        return `${formatDuration(value)}`;
+        return `${formatMetric(value, unit)}`;
     }
-    return '0 ms';
+    return `0 ${unit}`;
 };
 
 const formatChange = (value: number): string => {
@@ -69,13 +69,13 @@ const getDurationSymbols = (entry: Entry): string => {
     return '';
 };
 
-const formatDurationDiffChange = (entry: Entry): string => {
+const formatMetricDiffChange = (entry: Entry): string => {
     const {baseline, current} = entry;
 
-    let output = `${formatDuration(baseline.mean)} → ${formatDuration(current.mean)}`;
+    let output = `${formatMetric(baseline.mean, entry.unit)} → ${formatMetric(current.mean, entry.unit)}`;
 
     if (baseline.mean !== current.mean) {
-        output += ` (${formatDurationChange(entry.diff)}, ${formatPercentChange(entry.relativeDurationDiff)})`;
+        output += ` (${formatMetricChange(entry.diff, entry.unit)}, ${formatPercentChange(entry.relativeDurationDiff)})`;
     }
 
     output += ` ${getDurationSymbols(entry)}`;
@@ -83,4 +83,4 @@ const formatDurationDiffChange = (entry: Entry): string => {
     return output;
 };
 
-export {formatPercent, formatPercentChange, formatDuration, formatDurationChange, formatChange, getDurationSymbols, formatDurationDiffChange};
+export {formatPercent, formatPercentChange, formatMetric, formatMetricChange, formatChange, getDurationSymbols, formatMetricDiffChange};
diff --git a/tests/e2e/compare/output/markdown.ts b/tests/e2e/compare/output/markdown.ts
index 34bc3251c422..32af6c5e22ad 100644
--- a/tests/e2e/compare/output/markdown.ts
+++ b/tests/e2e/compare/output/markdown.ts
@@ -11,13 +11,13 @@ const tableHeader = ['Name', 'Duration'];
 
 const collapsibleSection = (title: string, content: string) => `<details>\n<summary>${title}</summary>\n\n${content}\n</details>\n\n`;
 
-const buildDurationDetails = (title: string, entry: Stats) => {
+const buildDurationDetails = (title: string, entry: Stats, unit: string) => {
     const relativeStdev = entry.stdev / entry.mean;
 
     return [
         `**${title}**`,
-        `Mean: ${format.formatDuration(entry.mean)}`,
-        `Stdev: ${format.formatDuration(entry.stdev)} (${format.formatPercent(relativeStdev)})`,
+        `Mean: ${format.formatMetric(entry.mean, unit)}`,
+        `Stdev: ${format.formatMetric(entry.stdev, unit)} (${format.formatPercent(relativeStdev)})`,
         entry.entries ? `Runs: ${entry.entries.join(' ')}` : '',
     ]
         .filter(Boolean)
@@ -25,26 +25,24 @@ const buildDurationDetails = (title: string, entry: Stats) => {
 };
 
 const buildDurationDetailsEntry = (entry: Entry) =>
-    ['baseline' in entry ? buildDurationDetails('Baseline', entry.baseline) : '', 'current' in entry ? buildDurationDetails('Current', entry.current) : '']
+    ['baseline' in entry ? buildDurationDetails('Baseline', entry.baseline, entry.unit) : '', 'current' in entry ? buildDurationDetails('Current', entry.current, entry.unit) : '']
         .filter(Boolean)
         .join('<br/><br/>');
 
 const formatEntryDuration = (entry: Entry): string => {
-    let formattedDuration = '';
-
     if ('baseline' in entry && 'current' in entry) {
-        formattedDuration = format.formatDurationDiffChange(entry);
+        return format.formatMetricDiffChange(entry);
     }
 
     if ('baseline' in entry) {
-        formattedDuration = format.formatDuration(entry.baseline.mean);
+        return format.formatMetric((entry as Entry).baseline.mean, (entry as Entry).unit);
     }
 
     if ('current' in entry) {
-        formattedDuration = format.formatDuration(entry.current.mean);
+        return format.formatMetric((entry as Entry).current.mean, (entry as Entry).unit);
     }
 
-    return formattedDuration;
+    return '';
 };
 
 const buildDetailsTable = (entries: Entry[]) => {
@@ -120,3 +118,4 @@ const writeToMarkdown = (filePath: string, data: Data) => {
 };
 
 export default writeToMarkdown;
+export {buildMarkdown};
diff --git a/tests/e2e/config.dev.ts b/tests/e2e/config.dev.ts
index cdd7bce756c8..a400cbf4787e 100644
--- a/tests/e2e/config.dev.ts
+++ b/tests/e2e/config.dev.ts
@@ -6,6 +6,8 @@ const appPath = './android/app/build/outputs/apk/development/debug/app-developme
 const config: Config = {
     MAIN_APP_PACKAGE: packageName,
     DELTA_APP_PACKAGE: packageName,
+    BRANCH_MAIN: 'main',
+    BRANCH_DELTA: 'main',
     MAIN_APP_PATH: appPath,
     DELTA_APP_PATH: appPath,
     RUNS: 8,
diff --git a/tests/e2e/config.ts b/tests/e2e/config.ts
index 6fe88d45c2e9..bdb24bee0bc5 100644
--- a/tests/e2e/config.ts
+++ b/tests/e2e/config.ts
@@ -26,6 +26,9 @@ export default {
     MAIN_APP_PATH: './app-e2eRelease.apk',
     DELTA_APP_PATH: './app-e2edeltaRelease.apk',
 
+    BRANCH_MAIN: 'main',
+    BRANCH_DELTA: 'delta',
+
     ENTRY_FILE: 'src/libs/E2E/reactNativeLaunchingTest.ts',
 
     // The path to the activity within the app that we want to launch.
@@ -68,37 +71,35 @@ export default {
     TESTS_CONFIG: {
         [TEST_NAMES.AppStartTime]: {
             name: TEST_NAMES.AppStartTime,
-
             // ... any additional config you might need
         },
         [TEST_NAMES.OpenChatFinderPage]: {
             name: TEST_NAMES.OpenChatFinderPage,
         },
-        // TODO: Fix text and enable again
-        // [TEST_NAMES.ReportTyping]: {
-        //     name: TEST_NAMES.ReportTyping,
-        //     reportScreen: {
-        //         autoFocus: true,
-        //     },
-        //     // Crowded Policy (Do Not Delete) Report, has a input bar available:
-        //     reportID: '8268282951170052',
-        // },
+        [TEST_NAMES.ReportTyping]: {
+            name: TEST_NAMES.ReportTyping,
+            reportScreen: {
+                autoFocus: true,
+            },
+            // Crowded Policy (Do Not Delete) Report, has a input bar available:
+            reportID: '8268282951170052',
+            message: `Measure_performance#${Math.floor(Math.random() * 1000000)}`,
+        },
         [TEST_NAMES.ChatOpening]: {
             name: TEST_NAMES.ChatOpening,
             // #announce Chat with many messages
             reportID: '5421294415618529',
         },
-        // TODO: fix and enable again
-        // [TEST_NAMES.Linking]: {
-        //     name: TEST_NAMES.Linking,
-        //     reportScreen: {
-        //         autoFocus: true,
-        //     },
-        //     // Crowded Policy (Do Not Delete) Report, has a input bar available:
-        //     reportID: '8268282951170052',
-        //     linkedReportID: '5421294415618529',
-        //     linkedReportActionID: '2845024374735019929',
-        // },
+        [TEST_NAMES.Linking]: {
+            name: TEST_NAMES.Linking,
+            reportScreen: {
+                autoFocus: true,
+            },
+            // Crowded Policy (Do Not Delete) Report, has a input bar available:
+            reportID: '8268282951170052',
+            linkedReportID: '5421294415618529',
+            linkedReportActionID: '2845024374735019929',
+        },
     },
 };
 
diff --git a/tests/e2e/merge.ts b/tests/e2e/merge.ts
deleted file mode 100644
index d7c1b8699c7d..000000000000
--- a/tests/e2e/merge.ts
+++ /dev/null
@@ -1,27 +0,0 @@
-import compare from './compare/compare';
-import CONFIG from './config';
-
-const args = process.argv.slice(2);
-
-let mainPath = `${CONFIG.OUTPUT_DIR}/main.json`;
-if (args.includes('--mainPath')) {
-    mainPath = args[args.indexOf('--mainPath') + 1];
-}
-
-let deltaPath = `${CONFIG.OUTPUT_DIR}/delta.json`;
-if (args.includes('--deltaPath')) {
-    deltaPath = args[args.indexOf('--deltaPath') + 1];
-}
-
-let outputPath = `${CONFIG.OUTPUT_DIR}/output.md`;
-if (args.includes('--outputPath')) {
-    outputPath = args[args.indexOf('--outputPath') + 1];
-}
-
-async function run() {
-    await compare(mainPath, deltaPath, outputPath, 'all');
-
-    process.exit(0);
-}
-
-run();
diff --git a/tests/e2e/nativeCommands/adbBackspace.ts b/tests/e2e/nativeCommands/adbBackspace.ts
index 2891d1daf0e9..112a80bdb37e 100644
--- a/tests/e2e/nativeCommands/adbBackspace.ts
+++ b/tests/e2e/nativeCommands/adbBackspace.ts
@@ -1,10 +1,9 @@
 import execAsync from '../utils/execAsync';
 import * as Logger from '../utils/logger';
 
-const adbBackspace = () => {
+const adbBackspace = (): Promise<boolean> => {
     Logger.log(`🔙 Pressing backspace`);
-    execAsync(`adb shell input keyevent KEYCODE_DEL`);
-    return true;
+    return execAsync(`adb shell input keyevent KEYCODE_DEL`).then(() => true);
 };
 
 export default adbBackspace;
diff --git a/tests/e2e/nativeCommands/adbTypeText.ts b/tests/e2e/nativeCommands/adbTypeText.ts
index 72fefbd25d26..deea16b198c8 100644
--- a/tests/e2e/nativeCommands/adbTypeText.ts
+++ b/tests/e2e/nativeCommands/adbTypeText.ts
@@ -3,8 +3,7 @@ import * as Logger from '../utils/logger';
 
 const adbTypeText = (text: string) => {
     Logger.log(`📝 Typing text: ${text}`);
-    execAsync(`adb shell input text "${text}"`);
-    return true;
+    return execAsync(`adb shell input text "${text}"`).then(() => true);
 };
 
 export default adbTypeText;
diff --git a/tests/e2e/nativeCommands/index.ts b/tests/e2e/nativeCommands/index.ts
index 31af618c8ec1..310aa2ab3c22 100644
--- a/tests/e2e/nativeCommands/index.ts
+++ b/tests/e2e/nativeCommands/index.ts
@@ -4,7 +4,7 @@ import adbTypeText from './adbTypeText';
 // eslint-disable-next-line rulesdir/prefer-import-module-contents
 import {NativeCommandsAction} from './NativeCommandsAction';
 
-const executeFromPayload = (actionName?: string, payload?: NativeCommandPayload): boolean => {
+const executeFromPayload = (actionName?: string, payload?: NativeCommandPayload): Promise<boolean> => {
     switch (actionName) {
         case NativeCommandsAction.scroll:
             throw new Error('Not implemented yet');
diff --git a/tests/e2e/server/index.ts b/tests/e2e/server/index.ts
index 51b73447bab4..512492908049 100644
--- a/tests/e2e/server/index.ts
+++ b/tests/e2e/server/index.ts
@@ -20,14 +20,20 @@ type TestDoneListener = () => void;
 
 type TestResultListener = (testResult: TestResult) => void;
 
-type AddListener<TListener> = (listener: TListener) => void;
+type AddListener<TListener> = (listener: TListener) => () => void;
+
+type ClearAllListeners = () => void;
 
 type ServerInstance = {
     setTestConfig: (testConfig: TestConfig) => void;
+    getTestConfig: () => TestConfig;
     addTestStartedListener: AddListener<TestStartedListener>;
     addTestResultListener: AddListener<TestResultListener>;
     addTestDoneListener: AddListener<TestDoneListener>;
+    clearAllTestDoneListeners: ClearAllListeners;
     forceTestCompletion: () => void;
+    setReadyToAcceptTestResults: (isReady: boolean) => void;
+    isReadyToAcceptTestResults: boolean;
     start: () => Promise<void>;
     stop: () => Promise<Error | undefined>;
 };
@@ -67,7 +73,7 @@ const getPostJSONRequestData = <TRequestData extends RequestData>(req: IncomingM
     });
 };
 
-const createListenerState = <TListener>(): [TListener[], AddListener<TListener>] => {
+const createListenerState = <TListener>(): [TListener[], AddListener<TListener>, ClearAllListeners] => {
     const listeners: TListener[] = [];
     const addListener = (listener: TListener) => {
         listeners.push(listener);
@@ -78,8 +84,11 @@ const createListenerState = <TListener>(): [TListener[], AddListener<TListener>]
             }
         };
     };
+    const clearAllListeners = () => {
+        listeners.splice(0, listeners.length);
+    };
 
-    return [listeners, addListener];
+    return [listeners, addListener, clearAllListeners];
 };
 
 /**
@@ -95,7 +104,12 @@ const createListenerState = <TListener>(): [TListener[], AddListener<TListener>]
 const createServerInstance = (): ServerInstance => {
     const [testStartedListeners, addTestStartedListener] = createListenerState<TestStartedListener>();
     const [testResultListeners, addTestResultListener] = createListenerState<TestResultListener>();
-    const [testDoneListeners, addTestDoneListener] = createListenerState<TestDoneListener>();
+    const [testDoneListeners, addTestDoneListener, clearAllTestDoneListeners] = createListenerState<TestDoneListener>();
+    let isReadyToAcceptTestResults = true;
+
+    const setReadyToAcceptTestResults = (isReady: boolean) => {
+        isReadyToAcceptTestResults = isReady;
+    };
 
     const forceTestCompletion = () => {
         testDoneListeners.forEach((listener) => {
@@ -109,6 +123,13 @@ const createServerInstance = (): ServerInstance => {
     const setTestConfig = (testConfig: TestConfig) => {
         activeTestConfig = testConfig;
     };
+    const getTestConfig = (): TestConfig => {
+        if (!activeTestConfig) {
+            throw new Error('No test config set');
+        }
+
+        return activeTestConfig;
+    };
 
     const server = createServer((req, res): ServerResponse<IncomingMessage> | void => {
         res.statusCode = 200;
@@ -122,6 +143,10 @@ const createServerInstance = (): ServerInstance => {
             }
 
             case Routes.testResults: {
+                if (!isReadyToAcceptTestResults) {
+                    return res.end('ok');
+                }
+
                 getPostJSONRequestData<TestResult>(req, res)?.then((data) => {
                     if (!data) {
                         // The getPostJSONRequestData function already handled the response
@@ -144,8 +169,8 @@ const createServerInstance = (): ServerInstance => {
 
             case Routes.testNativeCommand: {
                 getPostJSONRequestData<NativeCommand>(req, res)
-                    ?.then((data) => {
-                        const status = nativeCommands.executeFromPayload(data?.actionName, data?.payload);
+                    ?.then((data) => nativeCommands.executeFromPayload(data?.actionName, data?.payload))
+                    .then((status) => {
                         if (status) {
                             res.end('ok');
                             return;
@@ -153,7 +178,7 @@ const createServerInstance = (): ServerInstance => {
                         res.statusCode = 500;
                         res.end('Error executing command');
                     })
-                    .catch((error) => {
+                    .catch((error: string) => {
                         Logger.error('Error executing command', error);
                         res.statusCode = 500;
                         res.end('Error executing command');
@@ -201,10 +226,16 @@ const createServerInstance = (): ServerInstance => {
     });
 
     return {
+        setReadyToAcceptTestResults,
+        get isReadyToAcceptTestResults() {
+            return isReadyToAcceptTestResults;
+        },
         setTestConfig,
+        getTestConfig,
         addTestStartedListener,
         addTestResultListener,
         addTestDoneListener,
+        clearAllTestDoneListeners,
         forceTestCompletion,
         start: () =>
             new Promise<void>((resolve) => {
diff --git a/tests/e2e/testRunner.ts b/tests/e2e/testRunner.ts
index ee8cf45df191..2d78cf154ff1 100644
--- a/tests/e2e/testRunner.ts
+++ b/tests/e2e/testRunner.ts
@@ -16,7 +16,8 @@
 /* eslint-disable @lwc/lwc/no-async-await,no-restricted-syntax,no-await-in-loop */
 import {execSync} from 'child_process';
 import fs from 'fs';
-import type {TestConfig} from '@libs/E2E/types';
+import type {TestResult} from '@libs/E2E/client';
+import type {TestConfig, Unit} from '@libs/E2E/types';
 import compare from './compare/compare';
 import defaultConfig from './config';
 import createServerInstance from './server';
@@ -25,11 +26,16 @@ import installApp from './utils/installApp';
 import killApp from './utils/killApp';
 import launchApp from './utils/launchApp';
 import * as Logger from './utils/logger';
+import * as MeasureUtils from './utils/measure';
 import sleep from './utils/sleep';
 import withFailTimeout from './utils/withFailTimeout';
 
 type Result = Record<string, number[]>;
 
+type CustomConfig = {
+    default: unknown;
+};
+
 // VARIABLE CONFIGURATION
 const args = process.argv.slice(2);
 const getArg = (argName: string): string | undefined => {
@@ -46,7 +52,7 @@ const setConfigPath = (configPathParam: string | undefined) => {
     if (!configPath?.startsWith('.')) {
         configPath = `./${configPath}`;
     }
-    const customConfig = require(configPath).default;
+    const customConfig = (require(configPath) as CustomConfig).default;
     config = Object.assign(defaultConfig, customConfig);
 };
 
@@ -90,32 +96,19 @@ const runTests = async (): Promise<void> => {
 
     // Create a dict in which we will store the run durations for all tests
     const results: Record<string, Result> = {};
+    const metricForTest: Record<string, Unit> = {};
 
-    // Collect results while tests are being executed
-    server.addTestResultListener((testResult) => {
-        const {isCritical = true} = testResult;
-
-        if (testResult?.error != null && isCritical) {
-            throw new Error(`Test '${testResult.name}' failed with error: ${testResult.error}`);
-        }
-        if (testResult?.error != null && !isCritical) {
-            // force test completion, since we don't want to have timeout error for non being execute test
-            server.forceTestCompletion();
-            Logger.warn(`Test '${testResult.name}' failed with error: ${testResult.error}`);
-        }
+    const attachTestResult = (testResult: TestResult) => {
         let result = 0;
 
-        if (testResult?.duration !== undefined) {
-            if (testResult.duration < 0) {
+        if (testResult?.metric !== undefined) {
+            if (testResult.metric < 0) {
                 return;
             }
-            result = testResult.duration;
-        }
-        if (testResult?.renderCount !== undefined) {
-            result = testResult.renderCount;
+            result = testResult.metric;
         }
 
-        Logger.log(`[LISTENER] Test '${testResult?.name}' on '${testResult?.branch}' measured ${result}`);
+        Logger.log(`[LISTENER] Test '${testResult?.name}' on '${testResult?.branch}' measured ${result}${testResult.unit}`);
 
         if (testResult?.branch && !results[testResult.branch]) {
             results[testResult.branch] = {};
@@ -124,10 +117,30 @@ const runTests = async (): Promise<void> => {
         if (testResult?.branch && testResult?.name) {
             results[testResult.branch][testResult.name] = (results[testResult.branch][testResult.name] ?? []).concat(result);
         }
+
+        if (!metricForTest[testResult.name] && testResult.unit) {
+            metricForTest[testResult.name] = testResult.unit;
+        }
+    };
+
+    // Collect results while tests are being executed
+    server.addTestResultListener((testResult) => {
+        const {isCritical = true} = testResult;
+
+        if (testResult?.error != null && isCritical) {
+            throw new Error(`Test '${testResult.name}' failed with error: ${testResult.error}`);
+        }
+        if (testResult?.error != null && !isCritical) {
+            // force test completion, since we don't want to have timeout error for non being execute test
+            server.forceTestCompletion();
+            Logger.warn(`Test '${testResult.name}' failed with error: ${testResult.error}`);
+        }
+
+        attachTestResult(testResult);
     });
 
     // Function to run a single test iteration
-    async function runTestIteration(appPackage: string, iterationText: string, launchArgs: Record<string, boolean> = {}): Promise<void> {
+    async function runTestIteration(appPackage: string, iterationText: string, branch: string, launchArgs: Record<string, boolean> = {}): Promise<void> {
         Logger.info(iterationText);
 
         // Making sure the app is really killed (e.g. if a prior test run crashed)
@@ -137,15 +150,65 @@ const runTests = async (): Promise<void> => {
         Logger.log('Launching', appPackage);
         await launchApp('android', appPackage, config.ACTIVITY_PATH, launchArgs);
 
-        await withFailTimeout(
+        const {promise, resetTimeout} = withFailTimeout(
             new Promise<void>((resolve) => {
-                server.addTestDoneListener(() => {
+                const removeListener = server.addTestDoneListener(() => {
                     Logger.success(iterationText);
+
+                    const metrics = MeasureUtils.stop();
+                    const test = server.getTestConfig();
+
+                    if (server.isReadyToAcceptTestResults) {
+                        attachTestResult({
+                            name: `${test.name} (CPU)`,
+                            branch,
+                            metric: metrics.cpu,
+                            unit: '%',
+                        });
+                        attachTestResult({
+                            name: `${test.name} (FPS)`,
+                            branch,
+                            metric: metrics.fps,
+                            unit: 'FPS',
+                        });
+                        attachTestResult({
+                            name: `${test.name} (RAM)`,
+                            branch,
+                            metric: metrics.ram,
+                            unit: 'MB',
+                        });
+                        attachTestResult({
+                            name: `${test.name} (CPU/JS)`,
+                            branch,
+                            metric: metrics.jsThread,
+                            unit: '%',
+                        });
+                        attachTestResult({
+                            name: `${test.name} (CPU/UI)`,
+                            branch,
+                            metric: metrics.uiThread,
+                            unit: '%',
+                        });
+                    }
+                    removeListener();
                     resolve();
                 });
+                MeasureUtils.start(appPackage, {
+                    onAttachFailed: async () => {
+                        MeasureUtils.stop();
+                        resetTimeout();
+                        removeListener();
+                        // something went wrong, let's wait a little bit and try again
+                        await sleep(5000);
+                        // simply restart the test
+                        await runTestIteration(appPackage, iterationText, branch, launchArgs);
+                        resolve();
+                    },
+                });
             }),
             iterationText,
         );
+        await promise;
 
         Logger.log('Killing', appPackage);
         await killApp('android', appPackage);
@@ -156,6 +219,10 @@ const runTests = async (): Promise<void> => {
     for (let testIndex = 0; testIndex < tests.length; testIndex++) {
         const test = Object.values(config.TESTS_CONFIG)[testIndex];
 
+        // re-instal app for each new test suite
+        await installApp(config.MAIN_APP_PACKAGE, mainAppPath);
+        await installApp(config.DELTA_APP_PACKAGE, deltaAppPath);
+
         // check if we want to skip the test
         if (args.includes('--includes')) {
             const includes = args[args.indexOf('--includes') + 1];
@@ -174,14 +241,23 @@ const runTests = async (): Promise<void> => {
         await sleep(config.BOOT_COOL_DOWN);
 
         server.setTestConfig(test as TestConfig);
+        server.setReadyToAcceptTestResults(false);
 
         const warmupText = `Warmup for test '${test.name}' [${testIndex + 1}/${tests.length}]`;
 
-        // Warmup the main app:
-        await runTestIteration(config.MAIN_APP_PACKAGE, `[MAIN] ${warmupText}`);
+        // by default we do 2 warmups:
+        // - first warmup to pass a login flow
+        // - second warmup to pass an actual flow and cache network requests
+        const iterations = 2;
+        for (let i = 0; i < iterations; i++) {
+            // Warmup the main app:
+            await runTestIteration(config.MAIN_APP_PACKAGE, `[MAIN] ${warmupText}. Iteration ${i + 1}/${iterations}`, config.BRANCH_MAIN);
+
+            // Warmup the delta app:
+            await runTestIteration(config.DELTA_APP_PACKAGE, `[DELTA] ${warmupText}. Iteration ${i + 1}/${iterations}`, config.BRANCH_DELTA);
+        }
 
-        // Warmup the delta app:
-        await runTestIteration(config.DELTA_APP_PACKAGE, `[DELTA] ${warmupText}`);
+        server.setReadyToAcceptTestResults(true);
 
         // For each test case we allow the test to fail three times before we stop the test run:
         const errorCountRef = {
@@ -192,6 +268,8 @@ const runTests = async (): Promise<void> => {
         // We run each test multiple time to average out the results
         for (let testIteration = 0; testIteration < config.RUNS; testIteration++) {
             const onError = (e: Error) => {
+                MeasureUtils.stop();
+                server.clearAllTestDoneListeners();
                 errorCountRef.errorCount += 1;
                 if (testIteration === 0 || errorCountRef.errorCount === errorCountRef.allowedExceptions) {
                     Logger.error("There was an error running the test and we've reached the maximum number of allowed exceptions. Stopping the test run.");
@@ -213,10 +291,10 @@ const runTests = async (): Promise<void> => {
             const deltaIterationText = `[DELTA] ${iterationText}`;
             try {
                 // Run the test on the main app:
-                await runTestIteration(config.MAIN_APP_PACKAGE, mainIterationText, launchArgs);
+                await runTestIteration(config.MAIN_APP_PACKAGE, mainIterationText, config.BRANCH_MAIN, launchArgs);
 
                 // Run the test on the delta app:
-                await runTestIteration(config.DELTA_APP_PACKAGE, deltaIterationText, launchArgs);
+                await runTestIteration(config.DELTA_APP_PACKAGE, deltaIterationText, config.BRANCH_DELTA, launchArgs);
             } catch (e) {
                 onError(e as Error);
             }
@@ -225,7 +303,7 @@ const runTests = async (): Promise<void> => {
 
     // Calculate statistics and write them to our work file
     Logger.info('Calculating statics and writing results');
-    compare(results.main, results.delta, `${config.OUTPUT_DIR}/output.md`);
+    compare(results.main, results.delta, `${config.OUTPUT_DIR}/output.md`, 'all', metricForTest);
 
     await server.stop();
 };
diff --git a/tests/e2e/utils/execAsync.ts b/tests/e2e/utils/execAsync.ts
index 9ec8ca892a50..1317b4dcc3ca 100644
--- a/tests/e2e/utils/execAsync.ts
+++ b/tests/e2e/utils/execAsync.ts
@@ -28,7 +28,7 @@ export default (command: string, env: NodeJS.ProcessEnv = {}): PromiseWithAbort
             },
             (error, stdout) => {
                 if (error) {
-                    if (error && error.killed) {
+                    if (error?.killed) {
                         resolve();
                     } else {
                         Logger.error(`failed with error: ${error.message}`);
diff --git a/tests/e2e/utils/installApp.ts b/tests/e2e/utils/installApp.ts
index dc6a9d64053f..9c2f82e47336 100644
--- a/tests/e2e/utils/installApp.ts
+++ b/tests/e2e/utils/installApp.ts
@@ -19,7 +19,20 @@ export default function (packageName: string, path: string, platform = 'android'
                 // Ignore errors
                 Logger.warn('Failed to uninstall app:', error.message);
             })
+            // install and grant push notifications permissions right away (the popup may block e2e tests sometimes)
             // eslint-disable-next-line @typescript-eslint/no-misused-promises
-            .finally(() => execAsync(`adb install ${path}`))
+            .finally(() =>
+                // install the app
+                execAsync(`adb install ${path}`).then(() =>
+                    // and grant push notifications permissions right away (the popup may block e2e tests sometimes)
+                    // eslint-disable-next-line @typescript-eslint/no-unused-vars
+                    execAsync(`adb shell pm grant ${packageName.split('/')[0]} android.permission.POST_NOTIFICATIONS`).catch((_: ExecException) =>
+                        // in case of error - just log it and continue (if we request this permission on Android < 13 it'll fail because there is no such permission)
+                        Logger.warn(
+                            'Failed to grant push notifications permissions. It might be due to the fact that push-notifications permission type is not supported on this OS version yet. Continue tests execution...',
+                        ),
+                    ),
+                ),
+            )
     );
 }
diff --git a/tests/e2e/utils/measure.ts b/tests/e2e/utils/measure.ts
new file mode 100644
index 000000000000..c3fedce76272
--- /dev/null
+++ b/tests/e2e/utils/measure.ts
@@ -0,0 +1,53 @@
+import {profiler} from '@perf-profiler/profiler';
+import {getAverageCpuUsage, getAverageCpuUsagePerProcess, getAverageFPSUsage, getAverageRAMUsage} from '@perf-profiler/reporter';
+import {ThreadNames} from '@perf-profiler/types';
+import type {Measure} from '@perf-profiler/types';
+
+let measures: Measure[] = [];
+const POLLING_STOPPED = {
+    stop: (): void => {
+        throw new Error('Cannot stop polling on a stopped profiler');
+    },
+};
+let polling = POLLING_STOPPED;
+
+type StartOptions = {
+    onAttachFailed: () => Promise<void>;
+};
+
+const start = (bundleId: string, {onAttachFailed}: StartOptions) => {
+    // clear our measurements results
+    measures = [];
+
+    polling = profiler.pollPerformanceMeasures(bundleId, {
+        onMeasure: (measure: Measure) => {
+            measures.push(measure);
+        },
+        onPidChanged: () => {
+            onAttachFailed();
+        },
+    });
+};
+
+const stop = () => {
+    polling.stop();
+    polling = POLLING_STOPPED;
+
+    const average = getAverageCpuUsagePerProcess(measures);
+    const uiThread = average.find(({processName}) => processName === ThreadNames.ANDROID.UI)?.cpuUsage;
+    // most likely this line needs to be updated when we migrate to RN 0.74 with bridgeless mode
+    const jsThread = average.find(({processName}) => processName === ThreadNames.RN.JS_ANDROID)?.cpuUsage;
+    const cpu = getAverageCpuUsage(measures);
+    const fps = getAverageFPSUsage(measures);
+    const ram = getAverageRAMUsage(measures);
+
+    return {
+        uiThread,
+        jsThread,
+        cpu,
+        fps,
+        ram,
+    };
+};
+
+export {start, stop};
diff --git a/tests/e2e/utils/withFailTimeout.ts b/tests/e2e/utils/withFailTimeout.ts
index bac21c58a169..b7736e75d92b 100644
--- a/tests/e2e/utils/withFailTimeout.ts
+++ b/tests/e2e/utils/withFailTimeout.ts
@@ -3,9 +3,18 @@ import CONFIG from '../config';
 // eslint-disable-next-line @typescript-eslint/prefer-nullish-coalescing -- nullish coalescing doesn't achieve the same result in this case
 const TIMEOUT = Number(process.env.INTERACTION_TIMEOUT || CONFIG.INTERACTION_TIMEOUT);
 
-const withFailTimeout = (promise: Promise<void>, name: string): Promise<void> =>
-    new Promise((resolve, reject) => {
-        const timeoutId = setTimeout(() => {
+type WithFailTimeoutReturn = {
+    promise: Promise<unknown>;
+    resetTimeout: () => void;
+};
+
+const withFailTimeout = (promise: Promise<void>, name: string): WithFailTimeoutReturn => {
+    let timeoutId: NodeJS.Timeout;
+    const resetTimeout = () => {
+        clearTimeout(timeoutId);
+    };
+    const race = new Promise((resolve, reject) => {
+        timeoutId = setTimeout(() => {
             reject(new Error(`"${name}": Interaction timed out after ${(TIMEOUT / 1000).toFixed(0)}s`));
         }, TIMEOUT);
 
@@ -17,8 +26,11 @@ const withFailTimeout = (promise: Promise<void>, name: string): Promise<void> =>
                 reject(e);
             })
             .finally(() => {
-                clearTimeout(timeoutId);
+                resetTimeout();
             });
     });
 
+    return {promise: race, resetTimeout};
+};
+
 export default withFailTimeout;
diff --git a/tests/perf-test/ChatFinderPage.perf-test.tsx b/tests/perf-test/ChatFinderPage.perf-test.tsx
index 9285b3b8b24d..4346977a1cd0 100644
--- a/tests/perf-test/ChatFinderPage.perf-test.tsx
+++ b/tests/perf-test/ChatFinderPage.perf-test.tsx
@@ -1,5 +1,5 @@
 import type * as NativeNavigation from '@react-navigation/native';
-import type {StackScreenProps} from '@react-navigation/stack';
+import type {StackNavigationProp, StackScreenProps} from '@react-navigation/stack';
 import {fireEvent, screen} from '@testing-library/react-native';
 import React, {useMemo} from 'react';
 import type {ComponentType} from 'react';
@@ -22,12 +22,13 @@ import type {Beta, PersonalDetails, Report} from '@src/types/onyx';
 import createCollection from '../utils/collections/createCollection';
 import createPersonalDetails from '../utils/collections/personalDetails';
 import createRandomReport from '../utils/collections/reports';
+import createAddListenerMock from '../utils/createAddListenerMock';
 import * as TestHelper from '../utils/TestHelper';
 import waitForBatchedUpdates from '../utils/waitForBatchedUpdates';
 import wrapOnyxWithWaitForBatchedUpdates from '../utils/wrapOnyxWithWaitForBatchedUpdates';
 
 jest.mock('lodash/debounce', () =>
-    jest.fn((fn: Record<string, jest.Mock<jest.Func>>) => {
+    jest.fn((fn: Record<string, jest.Mock>) => {
         // eslint-disable-next-line no-param-reassign
         fn.cancel = jest.fn();
         return fn;
@@ -42,10 +43,15 @@ jest.mock('@src/libs/API', () => ({
     read: jest.fn(),
 }));
 
-jest.mock('@src/libs/Navigation/Navigation');
+jest.mock('@src/libs/Navigation/Navigation', () => ({
+    dismissModalWithReport: jest.fn(),
+    getTopmostReportId: jest.fn(),
+    isNavigationReady: jest.fn(() => Promise.resolve()),
+    isDisplayedInModal: jest.fn(() => false),
+}));
 
 jest.mock('@react-navigation/native', () => {
-    const actualNav = jest.requireActual('@react-navigation/native');
+    const actualNav = jest.requireActual<typeof NativeNavigation>('@react-navigation/native');
     return {
         ...actualNav,
         useFocusEffect: jest.fn(),
@@ -55,8 +61,14 @@ jest.mock('@react-navigation/native', () => {
             navigate: jest.fn(),
             addListener: () => jest.fn(),
         }),
-        createNavigationContainerRef: jest.fn(),
-    } as typeof NativeNavigation;
+        createNavigationContainerRef: () => ({
+            addListener: () => jest.fn(),
+            removeListener: () => jest.fn(),
+            isReady: () => jest.fn(),
+            getCurrentRoute: () => jest.fn(),
+            getState: () => jest.fn(),
+        }),
+    };
 });
 
 jest.mock('@src/components/withNavigationFocus', () => (Component: ComponentType<WithNavigationFocusProps>) => {
@@ -112,7 +124,6 @@ beforeAll(() =>
 
 // Initialize the network key for OfflineWithFeedback
 beforeEach(() => {
-    // @ts-expect-error TODO: Remove this once TestHelper (https://github.com/Expensify/App/issues/25318) is migrated to TypeScript.
     global.fetch = TestHelper.getGlobalFetchMock();
     wrapOnyxWithWaitForBatchedUpdates(Onyx);
     Onyx.merge(ONYXKEYS.NETWORK, {isOffline: false});
@@ -123,10 +134,10 @@ afterEach(() => {
     Onyx.clear();
 });
 
-type ChatFinderPageProps = StackScreenProps<RootStackParamList, typeof SCREENS.CHAT_FINDER_ROOT> & {
-    betas: OnyxEntry<Beta[]>;
-    reports: OnyxCollection<Report>;
-    isSearchingForReports: OnyxEntry<boolean>;
+type ChatFinderPageProps = StackScreenProps<RootStackParamList, typeof SCREENS.LEFT_MODAL.CHAT_FINDER> & {
+    betas?: OnyxEntry<Beta[]>;
+    reports?: OnyxCollection<Report>;
+    isSearchingForReports?: OnyxEntry<boolean>;
 };
 
 function ChatFinderPageWrapper(args: ChatFinderPageProps) {
@@ -158,31 +169,36 @@ function ChatFinderPageWithCachedOptions(args: ChatFinderPageProps) {
 }
 
 test('[ChatFinderPage] should render list with cached options', async () => {
-    const {addListener} = TestHelper.createAddListenerMock();
+    const {addListener} = createAddListenerMock();
 
     const scenario = async () => {
         await screen.findByTestId('ChatFinderPage');
     };
 
-    const navigation = {addListener};
-
-    return (
-        waitForBatchedUpdates()
-            .then(() =>
-                Onyx.multiSet({
-                    ...mockedReports,
-                    [ONYXKEYS.PERSONAL_DETAILS_LIST]: mockedPersonalDetails,
-                    [ONYXKEYS.BETAS]: mockedBetas,
-                    [ONYXKEYS.IS_SEARCHING_FOR_REPORTS]: true,
-                }),
-            )
-            // @ts-expect-error TODO: Remove this once TestHelper (https://github.com/Expensify/App/issues/25318) is migrated to TypeScript.
-            .then(() => measurePerformance(<ChatFinderPageWithCachedOptions navigation={navigation} />, {scenario}))
-    );
+    const navigation = {addListener} as unknown as StackNavigationProp<RootStackParamList, 'ChatFinder', undefined>;
+
+    return waitForBatchedUpdates()
+        .then(() =>
+            Onyx.multiSet({
+                ...mockedReports,
+                [ONYXKEYS.PERSONAL_DETAILS_LIST]: mockedPersonalDetails,
+                [ONYXKEYS.BETAS]: mockedBetas,
+                [ONYXKEYS.IS_SEARCHING_FOR_REPORTS]: true,
+            }),
+        )
+        .then(() =>
+            measurePerformance(
+                <ChatFinderPageWithCachedOptions
+                    route={{key: 'ChatFinder_Root', name: 'ChatFinder'}}
+                    navigation={navigation}
+                />,
+                {scenario},
+            ),
+        );
 });
 
 test('[ChatFinderPage] should interact when text input changes', async () => {
-    const {addListener} = TestHelper.createAddListenerMock();
+    const {addListener} = createAddListenerMock();
 
     const scenario = async () => {
         await screen.findByTestId('ChatFinderPage');
@@ -193,19 +209,24 @@ test('[ChatFinderPage] should interact when text input changes', async () => {
         fireEvent.changeText(input, 'Email Five');
     };
 
-    const navigation = {addListener};
-
-    return (
-        waitForBatchedUpdates()
-            .then(() =>
-                Onyx.multiSet({
-                    ...mockedReports,
-                    [ONYXKEYS.PERSONAL_DETAILS_LIST]: mockedPersonalDetails,
-                    [ONYXKEYS.BETAS]: mockedBetas,
-                    [ONYXKEYS.IS_SEARCHING_FOR_REPORTS]: true,
-                }),
-            )
-            // @ts-expect-error TODO: Remove this once TestHelper (https://github.com/Expensify/App/issues/25318) is migrated to TypeScript.
-            .then(() => measurePerformance(<ChatFinderPageWrapper navigation={navigation} />, {scenario}))
-    );
+    const navigation = {addListener} as unknown as StackNavigationProp<RootStackParamList, 'ChatFinder', undefined>;
+
+    return waitForBatchedUpdates()
+        .then(() =>
+            Onyx.multiSet({
+                ...mockedReports,
+                [ONYXKEYS.PERSONAL_DETAILS_LIST]: mockedPersonalDetails,
+                [ONYXKEYS.BETAS]: mockedBetas,
+                [ONYXKEYS.IS_SEARCHING_FOR_REPORTS]: true,
+            }),
+        )
+        .then(() =>
+            measurePerformance(
+                <ChatFinderPageWrapper
+                    route={{key: 'ChatFinder_Root', name: 'ChatFinder'}}
+                    navigation={navigation}
+                />,
+                {scenario},
+            ),
+        );
 });
diff --git a/tests/perf-test/OptionsListUtils.perf-test.ts b/tests/perf-test/OptionsListUtils.perf-test.ts
index ddd441f8fae2..16522297a416 100644
--- a/tests/perf-test/OptionsListUtils.perf-test.ts
+++ b/tests/perf-test/OptionsListUtils.perf-test.ts
@@ -64,13 +64,13 @@ const mockedPersonalDetailsMap = getMockedPersonalDetails(PERSONAL_DETAILS_LIST_
 const mockedBetas = Object.values(CONST.BETAS);
 
 jest.mock('@react-navigation/native', () => {
-    const actualNav = jest.requireActual('@react-navigation/native');
+    const actualNav = jest.requireActual<typeof NativeNavigation>('@react-navigation/native');
     return {
         ...actualNav,
         createNavigationContainerRef: () => ({
             getState: () => jest.fn(),
         }),
-    } as typeof NativeNavigation;
+    };
 });
 
 const options = OptionsListUtils.createOptionList(personalDetails, reports);
diff --git a/tests/perf-test/OptionsSelector.perf-test.tsx b/tests/perf-test/OptionsSelector.perf-test.tsx
deleted file mode 100644
index fe234dda1e19..000000000000
--- a/tests/perf-test/OptionsSelector.perf-test.tsx
+++ /dev/null
@@ -1,141 +0,0 @@
-import {fireEvent} from '@testing-library/react-native';
-import type {RenderResult} from '@testing-library/react-native';
-import React from 'react';
-import type {ComponentType} from 'react';
-import {measurePerformance} from 'reassure';
-import type {WithLocalizeProps} from '@components/withLocalize';
-import type {WithNavigationFocusProps} from '@components/withNavigationFocus';
-import type Navigation from '@libs/Navigation/Navigation';
-import OptionsSelector from '@src/components/OptionsSelector';
-import variables from '@src/styles/variables';
-
-jest.mock('@src/components/withLocalize', () => (Component: ComponentType<WithLocalizeProps>) => {
-    function WrappedComponent(props: WithLocalizeProps) {
-        return (
-            <Component
-                // eslint-disable-next-line react/jsx-props-no-spreading
-                {...props}
-                translate={() => ''}
-            />
-        );
-    }
-    WrappedComponent.displayName = `WrappedComponent`;
-    return WrappedComponent;
-});
-
-jest.mock('@src/components/withNavigationFocus', () => (Component: ComponentType<WithNavigationFocusProps>) => {
-    function WithNavigationFocus(props: WithNavigationFocusProps) {
-        return (
-            <Component
-                // eslint-disable-next-line react/jsx-props-no-spreading
-                {...props}
-                isFocused={false}
-            />
-        );
-    }
-
-    WithNavigationFocus.displayName = 'WithNavigationFocus';
-
-    return WithNavigationFocus;
-});
-
-jest.mock('@react-navigation/native', () => {
-    const actualNav = jest.requireActual('@react-navigation/native');
-    return {
-        ...actualNav,
-        useNavigation: () => ({
-            navigate: jest.fn(),
-            addListener: () => jest.fn(),
-        }),
-        useIsFocused: () => true,
-    } as typeof Navigation;
-});
-
-type GenerateSectionsProps = Array<{numberOfItems: number; shouldShow?: boolean}>;
-
-const generateSections = (sections: GenerateSectionsProps) =>
-    sections.map(({numberOfItems, shouldShow = true}) => ({
-        data: Array.from({length: numberOfItems}, (v, i) => ({
-            text: `Item ${i}`,
-            keyForList: `item-${i}`,
-        })),
-        shouldShow,
-    }));
-
-const singleSectionsConfig = [{numberOfItems: 1000}];
-
-const mutlipleSectionsConfig = [{numberOfItems: 1000}, {numberOfItems: 100}];
-// @ts-expect-error TODO: Remove this once OptionsSelector is migrated to TypeScript.
-function OptionsSelectorWrapper(args) {
-    const sections = generateSections(singleSectionsConfig);
-    return (
-        <OptionsSelector
-            value="test"
-            sections={sections}
-            // eslint-disable-next-line react/jsx-props-no-spreading
-            {...args}
-        />
-    );
-}
-
-test('[OptionsSelector] should render text input with interactions', () => {
-    const scenario = ((screen: RenderResult) => {
-        const textInput = screen.getByTestId('options-selector-input');
-        fireEvent.changeText(textInput, 'test');
-        fireEvent.changeText(textInput, 'test2');
-        fireEvent.changeText(textInput, 'test3');
-    }) as Awaited<(screen: RenderResult) => Promise<void>>;
-
-    measurePerformance(<OptionsSelectorWrapper />, {scenario});
-});
-
-test('[OptionsSelector] should render 1 section', () => {
-    measurePerformance(<OptionsSelectorWrapper />);
-});
-
-test('[OptionsSelector] should render multiple sections', () => {
-    const sections = generateSections(mutlipleSectionsConfig);
-    measurePerformance(<OptionsSelectorWrapper sections={sections} />);
-});
-
-test('[OptionsSelector] should press a list items', () => {
-    const scenario = ((screen: RenderResult) => {
-        fireEvent.press(screen.getByText('Item 1'));
-        fireEvent.press(screen.getByText('Item 5'));
-        fireEvent.press(screen.getByText('Item 10'));
-    }) as Awaited<(screen: RenderResult) => Promise<void>>;
-
-    measurePerformance(<OptionsSelectorWrapper />, {scenario});
-});
-
-test('[OptionsSelector] should scroll and press few items', () => {
-    const sections = generateSections(mutlipleSectionsConfig);
-
-    const generateEventData = (numberOfOptions: number, optionRowHeight: number) => ({
-        nativeEvent: {
-            contentOffset: {
-                y: optionRowHeight * numberOfOptions,
-            },
-            contentSize: {
-                height: optionRowHeight * 10,
-                width: 100,
-            },
-            layoutMeasurement: {
-                height: optionRowHeight * 5,
-                width: 100,
-            },
-        },
-    });
-
-    const eventData = generateEventData(100, variables.optionRowHeight);
-    const eventData2 = generateEventData(200, variables.optionRowHeight);
-    const scenario = async (screen: RenderResult) => {
-        fireEvent.press(screen.getByText('Item 10'));
-        fireEvent.scroll(screen.getByTestId('options-list'), eventData);
-        fireEvent.press(await screen.findByText('Item 100'));
-        fireEvent.scroll(screen.getByTestId('options-list'), eventData2);
-        fireEvent.press(screen.getByText('Item 200'));
-    };
-
-    measurePerformance(<OptionsSelectorWrapper sections={sections} />, {scenario});
-});
diff --git a/tests/perf-test/ReportActionCompose.perf-test.tsx b/tests/perf-test/ReportActionCompose.perf-test.tsx
index 242008965c83..f8f3ce499218 100644
--- a/tests/perf-test/ReportActionCompose.perf-test.tsx
+++ b/tests/perf-test/ReportActionCompose.perf-test.tsx
@@ -1,5 +1,5 @@
 import {fireEvent, screen} from '@testing-library/react-native';
-import type {ComponentType} from 'react';
+import type {ComponentType, EffectCallback} from 'react';
 import React from 'react';
 import Onyx from 'react-native-onyx';
 import type Animated from 'react-native-reanimated';
@@ -21,17 +21,13 @@ import waitForBatchedUpdates from '../utils/waitForBatchedUpdates';
 // mock PortalStateContext
 jest.mock('@gorhom/portal');
 
-jest.mock(
-    'react-native-reanimated',
-    () =>
-        ({
-            ...jest.requireActual('react-native-reanimated/mock'),
-            useAnimatedRef: jest.fn(),
-        } as typeof Animated),
-);
+jest.mock('react-native-reanimated', () => ({
+    ...jest.requireActual<typeof Animated>('react-native-reanimated/mock'),
+    useAnimatedRef: jest.fn(),
+}));
 
 jest.mock('@react-navigation/native', () => {
-    const actualNav = jest.requireActual('@react-navigation/native');
+    const actualNav = jest.requireActual<typeof Navigation>('@react-navigation/native');
     return {
         ...actualNav,
         useNavigation: () => ({
@@ -40,11 +36,12 @@ jest.mock('@react-navigation/native', () => {
         }),
         useIsFocused: () => true,
         useNavigationState: () => {},
-    } as typeof Navigation;
+        useFocusEffect: (cb: EffectCallback) => cb(),
+    };
 });
 
 jest.mock('@src/libs/actions/EmojiPickerAction', () => {
-    const actualEmojiPickerAction = jest.requireActual('@src/libs/actions/EmojiPickerAction');
+    const actualEmojiPickerAction = jest.requireActual<EmojiPickerRef>('@src/libs/actions/EmojiPickerAction');
     return {
         ...actualEmojiPickerAction,
         emojiPickerRef: {
@@ -55,7 +52,7 @@ jest.mock('@src/libs/actions/EmojiPickerAction', () => {
         showEmojiPicker: jest.fn(),
         hideEmojiPicker: jest.fn(),
         isActive: () => true,
-    } as EmojiPickerRef;
+    };
 });
 
 jest.mock('@src/components/withNavigationFocus', <TProps extends WithNavigationFocusProps>() => (Component: ComponentType<TProps>) => {
@@ -95,7 +92,6 @@ function ReportActionComposeWrapper() {
                 disabled={false}
                 report={LHNTestUtils.getFakeReport()}
                 isComposerFullSize
-                listHeight={200}
             />
         </ComposeProviders>
     );
@@ -107,18 +103,36 @@ test('[ReportActionCompose] should render Composer with text input interactions'
         // Query for the composer
         const composer = await screen.findByTestId('composer');
         fireEvent.changeText(composer, '@test');
+    };
 
-        // Query for the suggestions
-        await screen.findByTestId('suggestions');
+    await waitForBatchedUpdates();
+    await measurePerformance(<ReportActionComposeWrapper />, {scenario});
+});
+
+test('[ReportActionCompose] should scroll to hide suggestions', async () => {
+    const scenario = async () => {
+        // Query for the composer
+        const composer = await screen.findByTestId('composer');
 
         // scroll to hide suggestions
         fireEvent.scroll(composer);
+    };
+
+    await waitForBatchedUpdates();
+    await measurePerformance(<ReportActionComposeWrapper />, {scenario});
+});
+
+test('[ReportActionCompose] should press to block suggestions', async () => {
+    const scenario = async () => {
+        // Query for the composer
+        const composer = await screen.findByTestId('composer');
 
         // press to block suggestions
         fireEvent.press(composer);
     };
 
-    return waitForBatchedUpdates().then(() => measurePerformance(<ReportActionComposeWrapper />, {scenario}));
+    await waitForBatchedUpdates();
+    await measurePerformance(<ReportActionComposeWrapper />, {scenario});
 });
 
 test('[ReportActionCompose] should press add attachemnt button', async () => {
@@ -130,7 +144,8 @@ test('[ReportActionCompose] should press add attachemnt button', async () => {
         fireEvent.press(attachmentButton, mockEvent);
     };
 
-    return waitForBatchedUpdates().then(() => measurePerformance(<ReportActionComposeWrapper />, {scenario}));
+    await waitForBatchedUpdates();
+    await measurePerformance(<ReportActionComposeWrapper />, {scenario});
 });
 
 test('[ReportActionCompose] should press add emoji button', async () => {
@@ -142,7 +157,8 @@ test('[ReportActionCompose] should press add emoji button', async () => {
         fireEvent.press(emojiButton);
     };
 
-    return waitForBatchedUpdates().then(() => measurePerformance(<ReportActionComposeWrapper />, {scenario}));
+    await waitForBatchedUpdates();
+    await measurePerformance(<ReportActionComposeWrapper />, {scenario});
 });
 
 test('[ReportActionCompose] should press send message button', async () => {
@@ -154,25 +170,40 @@ test('[ReportActionCompose] should press send message button', async () => {
         fireEvent.press(sendButton);
     };
 
-    return waitForBatchedUpdates().then(() => measurePerformance(<ReportActionComposeWrapper />, {scenario}));
+    await waitForBatchedUpdates();
+    await measurePerformance(<ReportActionComposeWrapper />, {scenario});
 });
 
-test('[ReportActionCompose] render composer with attachement modal interactions', async () => {
+test('[ReportActionCompose] press add attachment button', async () => {
     const scenario = async () => {
         const hintAddAttachmentButtonText = Localize.translateLocal('reportActionCompose.addAttachment');
-        const hintAssignTaskButtonText = Localize.translateLocal('newTaskPage.assignTask');
-        const hintSplitBillButtonText = Localize.translateLocal('iou.splitExpense');
 
-        // Query for the attachment modal items
         const addAttachmentButton = await screen.findByLabelText(hintAddAttachmentButtonText);
         fireEvent.press(addAttachmentButton, mockEvent);
+    };
+
+    await waitForBatchedUpdates();
+    await measurePerformance(<ReportActionComposeWrapper />, {scenario});
+});
 
+test('[ReportActionCompose] should press split bill button', async () => {
+    const scenario = async () => {
+        const hintSplitBillButtonText = Localize.translateLocal('iou.splitExpense');
         const splitBillButton = await screen.findByLabelText(hintSplitBillButtonText);
         fireEvent.press(splitBillButton, mockEvent);
+    };
 
+    await waitForBatchedUpdates();
+    await measurePerformance(<ReportActionComposeWrapper />, {scenario});
+});
+
+test('[ReportActionCompose] should press assign task button', async () => {
+    const scenario = async () => {
+        const hintAssignTaskButtonText = Localize.translateLocal('newTaskPage.assignTask');
         const assignTaskButton = await screen.findByLabelText(hintAssignTaskButtonText);
         fireEvent.press(assignTaskButton, mockEvent);
     };
 
-    return waitForBatchedUpdates().then(() => measurePerformance(<ReportActionComposeWrapper />, {scenario}));
+    await waitForBatchedUpdates();
+    await measurePerformance(<ReportActionComposeWrapper />, {scenario});
 });
diff --git a/tests/perf-test/ReportActionsList.perf-test.tsx b/tests/perf-test/ReportActionsList.perf-test.tsx
index 7d45e3e4b45d..f0fef9a8e574 100644
--- a/tests/perf-test/ReportActionsList.perf-test.tsx
+++ b/tests/perf-test/ReportActionsList.perf-test.tsx
@@ -14,19 +14,22 @@ import ReportActionsList from '@src/pages/home/report/ReportActionsList';
 import {ReportAttachmentsProvider} from '@src/pages/home/report/ReportAttachmentsContext';
 import {ActionListContext, ReactionListContext} from '@src/pages/home/ReportScreenContext';
 import variables from '@src/styles/variables';
+import type {PersonalDetailsList} from '@src/types/onyx';
 import createRandomReportAction from '../utils/collections/reportActions';
 import * as LHNTestUtilsModule from '../utils/LHNTestUtils';
-import PusherHelper from '../utils/PusherHelper';
 import * as ReportTestUtils from '../utils/ReportTestUtils';
 import waitForBatchedUpdates from '../utils/waitForBatchedUpdates';
 import wrapOnyxWithWaitForBatchedUpdates from '../utils/wrapOnyxWithWaitForBatchedUpdates';
 
+type LazyLoadLHNTestUtils = {
+    fakePersonalDetails: PersonalDetailsList;
+};
+
 const mockedNavigate = jest.fn();
 
 jest.mock('@components/withCurrentUserPersonalDetails', () => {
     // Lazy loading of LHNTestUtils
-    // eslint-disable-next-line @typescript-eslint/no-unsafe-return
-    const lazyLoadLHNTestUtils = () => require('../utils/LHNTestUtils');
+    const lazyLoadLHNTestUtils = () => require<LazyLoadLHNTestUtils>('../utils/LHNTestUtils');
 
     return <TProps extends WithCurrentUserPersonalDetailsProps>(Component: ComponentType<TProps>) => {
         function WrappedComponent(props: Omit<TProps, keyof WithCurrentUserPersonalDetailsProps>) {
@@ -49,12 +52,12 @@ jest.mock('@components/withCurrentUserPersonalDetails', () => {
 });
 
 jest.mock('@react-navigation/native', () => {
-    const actualNav = jest.requireActual('@react-navigation/native');
+    const actualNav = jest.requireActual<typeof Navigation>('@react-navigation/native');
     return {
         ...actualNav,
         useRoute: () => mockedNavigate,
         useIsFocused: () => true,
-    } as typeof Navigation;
+    };
 });
 
 jest.mock('@src/components/ConfirmedRoute.tsx');
@@ -66,26 +69,16 @@ beforeAll(() =>
     }),
 );
 
-afterAll(() => {
-    jest.clearAllMocks();
-});
-
 const mockOnLayout = jest.fn();
 const mockOnScroll = jest.fn();
 const mockLoadChats = jest.fn();
 const mockRef = {current: null, flatListRef: null, scrollPosition: null, setScrollPosition: () => {}};
 
-// Initialize the network key for OfflineWithFeedback
 beforeEach(() => {
-    PusherHelper.setup();
+    // Initialize the network key for OfflineWithFeedback
+    Onyx.merge(ONYXKEYS.NETWORK, {isOffline: false});
     wrapOnyxWithWaitForBatchedUpdates(Onyx);
-    return Onyx.merge(ONYXKEYS.NETWORK, {isOffline: false});
-});
-
-// Clear out Onyx after each test so that each test starts with a clean slate
-afterEach(() => {
-    Onyx.clear();
-    PusherHelper.teardown();
+    Onyx.clear().then(waitForBatchedUpdates);
 });
 
 function ReportActionsListWrapper() {
@@ -95,7 +88,7 @@ function ReportActionsListWrapper() {
                 <ActionListContext.Provider value={mockRef}>
                     <ReportActionsList
                         parentReportAction={createRandomReportAction(1)}
-                        parentReportActionForTransactionThread={null}
+                        parentReportActionForTransactionThread={undefined}
                         sortedReportActions={ReportTestUtils.getMockedSortedReportActions(500)}
                         report={LHNTestUtilsModule.getFakeReport()}
                         onLayout={mockOnLayout}
@@ -113,24 +106,35 @@ function ReportActionsListWrapper() {
     );
 }
 
-test('[ReportActionsList] should render ReportActionsList with 500 reportActions stored', () => {
+test('[ReportActionsList] should render ReportActionsList with 500 reportActions stored', async () => {
     const scenario = async () => {
         await screen.findByTestId('report-actions-list');
+    };
+    await waitForBatchedUpdates();
+
+    Onyx.multiSet({
+        [ONYXKEYS.PERSONAL_DETAILS_LIST]: LHNTestUtilsModule.fakePersonalDetails,
+    });
+
+    await measurePerformance(<ReportActionsListWrapper />, {scenario});
+});
+
+test('[ReportActionsList] should render list items', async () => {
+    const scenario = async () => {
         const hintText = Localize.translateLocal('accessibilityHints.chatMessage');
-        // Ensure that the list of items is rendered
         await screen.findAllByLabelText(hintText);
     };
 
-    return waitForBatchedUpdates()
-        .then(() =>
-            Onyx.multiSet({
-                [ONYXKEYS.PERSONAL_DETAILS_LIST]: LHNTestUtilsModule.fakePersonalDetails,
-            }),
-        )
-        .then(() => measurePerformance(<ReportActionsListWrapper />, {scenario}));
+    await waitForBatchedUpdates();
+
+    Onyx.multiSet({
+        [ONYXKEYS.PERSONAL_DETAILS_LIST]: LHNTestUtilsModule.fakePersonalDetails,
+    });
+
+    await measurePerformance(<ReportActionsListWrapper />, {scenario});
 });
 
-test('[ReportActionsList] should scroll and click some of the reports', () => {
+test('[ReportActionsList] should scroll through list of items', async () => {
     const eventData = {
         nativeEvent: {
             contentOffset: {
@@ -152,18 +156,12 @@ test('[ReportActionsList] should scroll and click some of the reports', () => {
     const scenario = async () => {
         const reportActionsList = await screen.findByTestId('report-actions-list');
         fireEvent.scroll(reportActionsList, eventData);
-
-        const hintText = Localize.translateLocal('accessibilityHints.chatMessage');
-        const reportItems = await screen.findAllByLabelText(hintText);
-
-        fireEvent.press(reportItems[0], 'onLongPress');
     };
+    await waitForBatchedUpdates();
+
+    Onyx.multiSet({
+        [ONYXKEYS.PERSONAL_DETAILS_LIST]: LHNTestUtilsModule.fakePersonalDetails,
+    });
 
-    return waitForBatchedUpdates()
-        .then(() =>
-            Onyx.multiSet({
-                [ONYXKEYS.PERSONAL_DETAILS_LIST]: LHNTestUtilsModule.fakePersonalDetails,
-            }),
-        )
-        .then(() => measurePerformance(<ReportActionsListWrapper />, {scenario}));
+    await measurePerformance(<ReportActionsListWrapper />, {scenario});
 });
diff --git a/tests/perf-test/ReportActionsUtils.perf-test.ts b/tests/perf-test/ReportActionsUtils.perf-test.ts
index f194cd32bbf4..a33a448cfee7 100644
--- a/tests/perf-test/ReportActionsUtils.perf-test.ts
+++ b/tests/perf-test/ReportActionsUtils.perf-test.ts
@@ -20,13 +20,13 @@ const getMockedReportActionsMap = (reportsLength = 10, actionsPerReportLength =
     const reportKeysMap = Array.from({length: reportsLength}, (v, i) => {
         const key = i + 1;
 
-        return {[`${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${key}`]: Object.assign({}, ...mockReportActions)};
+        return {[`${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${key}`]: Object.assign({}, ...mockReportActions) as Partial<ReportAction>};
     });
 
     return Object.assign({}, ...reportKeysMap) as Partial<ReportAction>;
 };
 
-const mockedReportActionsMap = getMockedReportActionsMap(2, 10000);
+const mockedReportActionsMap: Partial<ReportAction> = getMockedReportActionsMap(2, 10000);
 
 const reportActions = createCollection<ReportAction>(
     (item) => `${item.reportActionID}`,
diff --git a/tests/perf-test/ReportScreen.perf-test.tsx b/tests/perf-test/ReportScreen.perf-test.tsx
index 29a17e9b0070..69469a7cdb45 100644
--- a/tests/perf-test/ReportScreen.perf-test.tsx
+++ b/tests/perf-test/ReportScreen.perf-test.tsx
@@ -1,13 +1,15 @@
-import type {StackScreenProps} from '@react-navigation/stack';
-import {screen, waitFor} from '@testing-library/react-native';
+import type {StackNavigationProp, StackScreenProps} from '@react-navigation/stack';
+import {screen} from '@testing-library/react-native';
 import type {ComponentType} from 'react';
 import React from 'react';
+import type ReactNative from 'react-native';
+import {Dimensions, InteractionManager} from 'react-native';
 import Onyx from 'react-native-onyx';
 import type Animated from 'react-native-reanimated';
 import {measurePerformance} from 'reassure';
 import type {WithNavigationFocusProps} from '@components/withNavigationFocus';
 import type Navigation from '@libs/Navigation/Navigation';
-import type {CentralPaneNavigatorParamList} from '@libs/Navigation/types';
+import type {AuthScreensParamList} from '@libs/Navigation/types';
 import ComposeProviders from '@src/components/ComposeProviders';
 import DragAndDropProvider from '@src/components/DragAndDrop/Provider';
 import {LocaleContextProvider} from '@src/components/LocaleContextProvider';
@@ -27,28 +29,49 @@ import createCollection from '../utils/collections/createCollection';
 import createPersonalDetails from '../utils/collections/personalDetails';
 import createRandomPolicy from '../utils/collections/policies';
 import createRandomReport from '../utils/collections/reports';
-import PusherHelper from '../utils/PusherHelper';
+import createAddListenerMock from '../utils/createAddListenerMock';
 import * as ReportTestUtils from '../utils/ReportTestUtils';
 import * as TestHelper from '../utils/TestHelper';
 import waitForBatchedUpdates from '../utils/waitForBatchedUpdates';
 import wrapOnyxWithWaitForBatchedUpdates from '../utils/wrapOnyxWithWaitForBatchedUpdates';
 
-type ReportScreenWrapperProps = StackScreenProps<CentralPaneNavigatorParamList, typeof SCREENS.REPORT>;
+type ReportScreenWrapperProps = StackScreenProps<AuthScreensParamList, typeof SCREENS.REPORT>;
 
 jest.mock('@src/libs/API', () => ({
     write: jest.fn(),
     makeRequestWithSideEffects: jest.fn(),
     read: jest.fn(),
+    paginate: jest.fn(),
 }));
 
+jest.mock('react-native/Libraries/Interaction/InteractionManager', () => ({
+    runAfterInteractions: () => ({
+        cancel: jest.fn(),
+    }),
+    createInteractionHandle: jest.fn(),
+    clearInteractionHandle: jest.fn(),
+}));
+
+jest.mock('react-native', () => {
+    const actualReactNative = jest.requireActual<typeof ReactNative>('react-native');
+    // eslint-disable-next-line @typescript-eslint/no-unsafe-return
+    return {
+        ...actualReactNative,
+        Dimensions: {
+            ...actualReactNative.Dimensions,
+            addEventListener: jest.fn(),
+        },
+    };
+});
+
 jest.mock('react-native-reanimated', () => {
-    const actualNav = jest.requireActual('react-native-reanimated/mock');
+    const actualNav = jest.requireActual<typeof Animated>('react-native-reanimated/mock');
     return {
         ...actualNav,
         useSharedValue: jest.fn,
         useAnimatedStyle: jest.fn,
         useAnimatedRef: jest.fn,
-    } as typeof Animated;
+    };
 });
 
 jest.mock('@src/components/ConfirmedRoute.tsx');
@@ -82,12 +105,14 @@ jest.mock('@src/libs/Permissions', () => ({
     canUseLinkPreviews: jest.fn(() => true),
     canUseDefaultRooms: jest.fn(() => true),
 }));
-jest.mock('@src/hooks/usePermissions.ts');
 
-jest.mock('@src/libs/Navigation/Navigation');
+jest.mock('@src/libs/Navigation/Navigation', () => ({
+    isNavigationReady: jest.fn(() => Promise.resolve()),
+    isDisplayedInModal: jest.fn(() => false),
+}));
 
 jest.mock('@react-navigation/native', () => {
-    const actualNav = jest.requireActual('@react-navigation/native');
+    const actualNav = jest.requireActual<typeof Navigation>('@react-navigation/native');
     return {
         ...actualNav,
         useFocusEffect: jest.fn(),
@@ -99,7 +124,7 @@ jest.mock('@react-navigation/native', () => {
         }),
         useNavigationState: () => {},
         createNavigationContainerRef: jest.fn(),
-    } as typeof Navigation;
+    };
 });
 
 // mock PortalStateContext
@@ -112,18 +137,41 @@ beforeAll(() =>
     }),
 );
 
-// Initialize the network key for OfflineWithFeedback
+type MockListener = {
+    remove: jest.Mock;
+    callback?: () => void;
+};
+
+const mockListener: MockListener = {remove: jest.fn()};
+let mockCancel: jest.Mock;
+let mockRunAfterInteractions: jest.Mock;
+
 beforeEach(() => {
-    // @ts-expect-error TODO: Remove this once TestHelper (https://github.com/Expensify/App/issues/25318) is migrated to TypeScript.
     global.fetch = TestHelper.getGlobalFetchMock();
     wrapOnyxWithWaitForBatchedUpdates(Onyx);
-    Onyx.merge(ONYXKEYS.NETWORK, {isOffline: false});
-});
 
-// Clear out Onyx after each test so that each test starts with a clean state
-afterEach(() => {
-    Onyx.clear();
-    PusherHelper.teardown();
+    // Reset mocks before each test
+    (Dimensions.addEventListener as jest.Mock).mockClear();
+    mockListener.remove.mockClear();
+
+    // Mock the implementation of addEventListener to return the mockListener
+    (Dimensions.addEventListener as jest.Mock).mockImplementation((event: string, callback: () => void) => {
+        if (event === 'change') {
+            mockListener.callback = callback;
+            return mockListener;
+        }
+        return {remove: jest.fn()};
+    });
+
+    // Mock the implementation of InteractionManager.runAfterInteractions
+    mockCancel = jest.fn();
+    mockRunAfterInteractions = jest.fn().mockReturnValue({cancel: mockCancel});
+
+    jest.spyOn(InteractionManager, 'runAfterInteractions').mockImplementation(mockRunAfterInteractions);
+
+    // Initialize the network key for OfflineWithFeedback
+    Onyx.merge(ONYXKEYS.NETWORK, {isOffline: false});
+    Onyx.clear().then(waitForBatchedUpdates);
 });
 
 const policies = createCollection(
@@ -163,59 +211,113 @@ function ReportScreenWrapper(props: ReportScreenWrapperProps) {
 
 const report = {...createRandomReport(1), policyID: '1'};
 const reportActions = ReportTestUtils.getMockedReportActionsMap(1000);
-const mockRoute = {params: {reportID: '1'}};
+const mockRoute = {params: {reportID: '1', reportActionID: ''}, key: 'Report', name: 'Report' as const};
 
-test('[ReportScreen] should render ReportScreen', () => {
-    const {triggerTransitionEnd, addListener} = TestHelper.createAddListenerMock();
+test('[ReportScreen] should render ReportScreen', async () => {
+    const {addListener} = createAddListenerMock();
+    const scenario = async () => {
+        await screen.findByTestId(`report-screen-${report.reportID}`);
+    };
+
+    const navigation = {addListener} as unknown as StackNavigationProp<AuthScreensParamList, 'Report', undefined>;
+
+    await waitForBatchedUpdates();
+    const reportCollectionDataSet: ReportCollectionDataSet = {
+        [`${ONYXKEYS.COLLECTION.REPORT}${mockRoute.params.reportID}`]: report,
+    };
+    const reportActionsCollectionDataSet: ReportActionsCollectionDataSet = {
+        [`${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${mockRoute.params.reportID}`]: reportActions,
+    };
+
+    Onyx.multiSet({
+        [ONYXKEYS.IS_SIDEBAR_LOADED]: true,
+        [ONYXKEYS.PERSONAL_DETAILS_LIST]: personalDetails,
+        [ONYXKEYS.BETAS]: [CONST.BETAS.DEFAULT_ROOMS],
+        [`${ONYXKEYS.COLLECTION.POLICY}`]: policies,
+        [ONYXKEYS.SHOULD_SHOW_COMPOSE_INPUT]: true,
+        ...reportCollectionDataSet,
+        ...reportActionsCollectionDataSet,
+    });
+    await measurePerformance(
+        <ReportScreenWrapper
+            navigation={navigation}
+            route={mockRoute}
+        />,
+        {scenario},
+    );
+});
+
+test('[ReportScreen] should render composer', async () => {
+    const {addListener} = createAddListenerMock();
     const scenario = async () => {
-        /**
-         * First make sure ReportScreen is mounted, so that we can trigger
-         * the transitionEnd event manually.
-         *
-         * If we don't do that, then the transitionEnd event will be triggered
-         * before the ReportScreen is mounted, and the test will fail.
-         */
-        await screen.findByTestId('ReportScreen');
-        await waitFor(triggerTransitionEnd);
-
-        // Query for the composer
         await screen.findByTestId('composer');
+    };
 
-        // Query for the report list
+    const navigation = {addListener} as unknown as StackNavigationProp<AuthScreensParamList, 'Report', undefined>;
+
+    await waitForBatchedUpdates();
+
+    const reportCollectionDataSet: ReportCollectionDataSet = {
+        [`${ONYXKEYS.COLLECTION.REPORT}${mockRoute.params.reportID}`]: report,
+    };
+
+    const reportActionsCollectionDataSet: ReportActionsCollectionDataSet = {
+        [`${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${mockRoute.params.reportID}`]: reportActions,
+    };
+    Onyx.multiSet({
+        [ONYXKEYS.IS_SIDEBAR_LOADED]: true,
+        [ONYXKEYS.PERSONAL_DETAILS_LIST]: personalDetails,
+        [ONYXKEYS.BETAS]: [CONST.BETAS.DEFAULT_ROOMS],
+        [`${ONYXKEYS.COLLECTION.POLICY}`]: policies,
+        [ONYXKEYS.SHOULD_SHOW_COMPOSE_INPUT]: true,
+        ...reportCollectionDataSet,
+        ...reportActionsCollectionDataSet,
+    });
+    await measurePerformance(
+        <ReportScreenWrapper
+            navigation={navigation}
+            route={mockRoute}
+        />,
+        {scenario},
+    );
+});
+
+test('[ReportScreen] should render report list', async () => {
+    const {addListener} = createAddListenerMock();
+    const scenario = async () => {
         await screen.findByTestId('report-actions-list');
     };
 
-    const navigation = {addListener};
-
-    return waitForBatchedUpdates()
-        .then(() => {
-            const reportCollectionDataSet: ReportCollectionDataSet = {
-                [`${ONYXKEYS.COLLECTION.REPORT}${mockRoute.params.reportID}`]: report,
-            };
-
-            const reportActionsCollectionDataSet: ReportActionsCollectionDataSet = {
-                [`${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${mockRoute.params.reportID}`]: reportActions,
-            };
-
-            return Onyx.multiSet({
-                [ONYXKEYS.IS_SIDEBAR_LOADED]: true,
-                [ONYXKEYS.PERSONAL_DETAILS_LIST]: personalDetails,
-                [ONYXKEYS.BETAS]: [CONST.BETAS.DEFAULT_ROOMS],
-                [`${ONYXKEYS.COLLECTION.POLICY}`]: policies,
-                [ONYXKEYS.SHOULD_SHOW_COMPOSE_INPUT]: true,
-                ...reportCollectionDataSet,
-                ...reportActionsCollectionDataSet,
-            });
-        })
-        .then(() =>
-            measurePerformance(
-                <ReportScreenWrapper
-                    // @ts-expect-error TODO: Remove this once TestHelper (https://github.com/Expensify/App/issues/25318) is migrated to TypeScript.
-                    navigation={navigation}
-                    // @ts-expect-error TODO: Remove this once TestHelper (https://github.com/Expensify/App/issues/25318) is migrated to TypeScript.
-                    route={mockRoute}
-                />,
-                {scenario},
-            ),
-        );
+    const navigation = {addListener} as unknown as StackNavigationProp<AuthScreensParamList, 'Report', undefined>;
+
+    await waitForBatchedUpdates();
+
+    const reportCollectionDataSet: ReportCollectionDataSet = {
+        [`${ONYXKEYS.COLLECTION.REPORT}${mockRoute.params.reportID}`]: report,
+    };
+
+    const reportActionsCollectionDataSet: ReportActionsCollectionDataSet = {
+        [`${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${mockRoute.params.reportID}`]: reportActions,
+    };
+
+    Onyx.multiSet({
+        [ONYXKEYS.IS_SIDEBAR_LOADED]: true,
+        [ONYXKEYS.PERSONAL_DETAILS_LIST]: personalDetails,
+        [ONYXKEYS.BETAS]: [CONST.BETAS.DEFAULT_ROOMS],
+        [`${ONYXKEYS.COLLECTION.POLICY}`]: policies,
+        [ONYXKEYS.SHOULD_SHOW_COMPOSE_INPUT]: true,
+        [ONYXKEYS.IS_LOADING_APP]: false,
+        [`${ONYXKEYS.COLLECTION.REPORT_METADATA}${mockRoute.params.reportID}`]: {
+            isLoadingInitialReportActions: false,
+        },
+        ...reportCollectionDataSet,
+        ...reportActionsCollectionDataSet,
+    });
+    await measurePerformance(
+        <ReportScreenWrapper
+            navigation={navigation}
+            route={mockRoute}
+        />,
+        {scenario},
+    );
 });
diff --git a/tests/perf-test/ReportUtils.perf-test.ts b/tests/perf-test/ReportUtils.perf-test.ts
index 8a5c5d6ff935..11c6d3772799 100644
--- a/tests/perf-test/ReportUtils.perf-test.ts
+++ b/tests/perf-test/ReportUtils.perf-test.ts
@@ -42,8 +42,10 @@ describe('ReportUtils', () => {
             keys: ONYXKEYS,
             safeEvictionKeys: [ONYXKEYS.COLLECTION.REPORT_ACTIONS],
         });
+    });
 
-        Onyx.multiSet({
+    beforeEach(async () => {
+        await Onyx.multiSet({
             ...mockedPoliciesMap,
             ...mockedReportsMap,
         });
@@ -55,13 +57,17 @@ describe('ReportUtils', () => {
 
     test('[ReportUtils] findLastAccessedReport on 2k reports and policies', async () => {
         const ignoreDomainRooms = true;
-        const isFirstTimeNewExpensifyUser = true;
         const reports = getMockedReports(2000);
         const policies = getMockedPolicies(2000);
         const openOnAdminRoom = true;
 
+        await Onyx.multiSet({
+            [ONYXKEYS.COLLECTION.REPORT]: reports,
+            [ONYXKEYS.COLLECTION.POLICY]: policies,
+        });
+
         await waitForBatchedUpdates();
-        await measureFunction(() => ReportUtils.findLastAccessedReport(reports, ignoreDomainRooms, policies, isFirstTimeNewExpensifyUser, openOnAdminRoom));
+        await measureFunction(() => ReportUtils.findLastAccessedReport(ignoreDomainRooms, openOnAdminRoom));
     });
 
     test('[ReportUtils] canDeleteReportAction on 1k reports and policies', async () => {
@@ -136,13 +142,13 @@ describe('ReportUtils', () => {
     test('[ReportUtils] shouldReportBeInOptionList on 1k participant', async () => {
         const report = {...createRandomReport(1), participantAccountIDs, type: CONST.REPORT.TYPE.CHAT};
         const currentReportId = '2';
-        const isInGSDMode = true;
+        const isInFocusMode = true;
         const betas = [CONST.BETAS.DEFAULT_ROOMS];
         const policies = getMockedPolicies();
 
         await waitForBatchedUpdates();
         await measureFunction(() =>
-            ReportUtils.shouldReportBeInOptionList({report, currentReportId, isInGSDMode, betas, policies, doesReportHaveViolations: false, excludeEmptyChats: false}),
+            ReportUtils.shouldReportBeInOptionList({report, currentReportId, isInFocusMode, betas, policies, doesReportHaveViolations: false, excludeEmptyChats: false}),
         );
     });
 
diff --git a/tests/perf-test/SidebarLinks.perf-test.tsx b/tests/perf-test/SidebarLinks.perf-test.tsx
index 2848015d5c63..0b851a56f2ad 100644
--- a/tests/perf-test/SidebarLinks.perf-test.tsx
+++ b/tests/perf-test/SidebarLinks.perf-test.tsx
@@ -5,12 +5,25 @@ import variables from '@styles/variables';
 import CONST from '@src/CONST';
 import ONYXKEYS from '@src/ONYXKEYS';
 import * as LHNTestUtils from '../utils/LHNTestUtils';
+import * as TestHelper from '../utils/TestHelper';
 import waitForBatchedUpdates from '../utils/waitForBatchedUpdates';
 import wrapOnyxWithWaitForBatchedUpdates from '../utils/wrapOnyxWithWaitForBatchedUpdates';
 
 jest.mock('@libs/Permissions');
-jest.mock('@hooks/usePermissions.ts');
-jest.mock('@libs/Navigation/Navigation');
+jest.mock('@src/hooks/useActiveWorkspaceFromNavigationState');
+jest.mock('../../src/libs/Navigation/Navigation', () => ({
+    navigate: jest.fn(),
+    isActiveRoute: jest.fn(),
+    getTopmostReportId: jest.fn(),
+    getTopmostReportActionId: jest.fn(),
+    isNavigationReady: jest.fn(() => Promise.resolve()),
+    isDisplayedInModal: jest.fn(() => false),
+}));
+jest.mock('../../src/libs/Navigation/navigationRef', () => ({
+    getState: () => ({
+        routes: [],
+    }),
+}));
 jest.mock('@components/Icon/Expensicons');
 
 jest.mock('@react-navigation/native');
@@ -21,7 +34,7 @@ const getMockedReportsMap = (length = 100) => {
             const reportID = index + 1;
             const participants = [1, 2];
             const reportKey = `${ONYXKEYS.COLLECTION.REPORT}${reportID}`;
-            const report = LHNTestUtils.getFakeReport(participants, 1, true);
+            const report = {...LHNTestUtils.getFakeReport(participants, 1, true), lastMessageText: 'hey'};
 
             return [reportKey, report];
         }),
@@ -30,7 +43,7 @@ const getMockedReportsMap = (length = 100) => {
     return mockReports;
 };
 
-const mockedResponseMap = getMockedReportsMap(500);
+const mockedResponseMap = getMockedReportsMap(5);
 
 describe('SidebarLinks', () => {
     beforeAll(() => {
@@ -38,6 +51,24 @@ describe('SidebarLinks', () => {
             keys: ONYXKEYS,
             safeEvictionKeys: [ONYXKEYS.COLLECTION.REPORT_ACTIONS],
         });
+    });
+
+    beforeEach(() => {
+        global.fetch = TestHelper.getGlobalFetchMock();
+        wrapOnyxWithWaitForBatchedUpdates(Onyx);
+
+        // Initialize the network key for OfflineWithFeedback
+        Onyx.merge(ONYXKEYS.NETWORK, {isOffline: false});
+        Onyx.clear().then(waitForBatchedUpdates);
+    });
+
+    test('[SidebarLinks] should render Sidebar with 500 reports stored', async () => {
+        const scenario = async () => {
+            // Query for the sidebar
+            await screen.findByTestId('lhn-options-list');
+        };
+
+        await waitForBatchedUpdates();
 
         Onyx.multiSet({
             [ONYXKEYS.PERSONAL_DETAILS_LIST]: LHNTestUtils.fakePersonalDetails,
@@ -46,22 +77,12 @@ describe('SidebarLinks', () => {
             [ONYXKEYS.IS_LOADING_REPORT_DATA]: false,
             ...mockedResponseMap,
         });
-    });
 
-    // Initialize the network key for OfflineWithFeedback
-    beforeEach(() => {
-        wrapOnyxWithWaitForBatchedUpdates(Onyx);
-        return Onyx.merge(ONYXKEYS.NETWORK, {isOffline: false});
+        await measurePerformance(<LHNTestUtils.MockedSidebarLinks />, {scenario, runs: 1});
     });
 
-    afterAll(() => {
-        Onyx.clear();
-    });
-
-    test('[SidebarLinks] should render Sidebar with 500 reports stored', async () => {
+    test('[SidebarLinks] should render list itmes', async () => {
         const scenario = async () => {
-            // Query for the sidebar
-            await screen.findByTestId('lhn-options-list');
             /**
              * Query for display names of participants [1, 2].
              * This will ensure that the sidebar renders a list of items.
@@ -70,10 +91,19 @@ describe('SidebarLinks', () => {
         };
 
         await waitForBatchedUpdates();
+
+        Onyx.multiSet({
+            [ONYXKEYS.PERSONAL_DETAILS_LIST]: LHNTestUtils.fakePersonalDetails,
+            [ONYXKEYS.BETAS]: [CONST.BETAS.DEFAULT_ROOMS],
+            [ONYXKEYS.NVP_PRIORITY_MODE]: CONST.PRIORITY_MODE.GSD,
+            [ONYXKEYS.IS_LOADING_REPORT_DATA]: false,
+            ...mockedResponseMap,
+        });
+
         await measurePerformance(<LHNTestUtils.MockedSidebarLinks />, {scenario});
     });
 
-    test('[SidebarLinks] should scroll and click some of the items', async () => {
+    test('[SidebarLinks] should scroll through the list of items ', async () => {
         const scenario = async () => {
             const eventData = {
                 nativeEvent: {
@@ -96,15 +126,37 @@ describe('SidebarLinks', () => {
             const lhnOptionsList = await screen.findByTestId('lhn-options-list');
 
             fireEvent.scroll(lhnOptionsList, eventData);
-            // find elements that are currently visible in the viewport
-            const button1 = await screen.findByTestId('7');
-            const button2 = await screen.findByTestId('8');
-            fireEvent.press(button1);
-            fireEvent.press(button2);
         };
 
         await waitForBatchedUpdates();
 
+        Onyx.multiSet({
+            [ONYXKEYS.PERSONAL_DETAILS_LIST]: LHNTestUtils.fakePersonalDetails,
+            [ONYXKEYS.BETAS]: [CONST.BETAS.DEFAULT_ROOMS],
+            [ONYXKEYS.NVP_PRIORITY_MODE]: CONST.PRIORITY_MODE.GSD,
+            [ONYXKEYS.IS_LOADING_REPORT_DATA]: false,
+            ...mockedResponseMap,
+        });
+
+        await measurePerformance(<LHNTestUtils.MockedSidebarLinks />, {scenario});
+    });
+
+    test('[SidebarLinks] should click on list item', async () => {
+        const scenario = async () => {
+            const button = await screen.findByTestId('1');
+            fireEvent.press(button);
+        };
+
+        await waitForBatchedUpdates();
+
+        Onyx.multiSet({
+            [ONYXKEYS.PERSONAL_DETAILS_LIST]: LHNTestUtils.fakePersonalDetails,
+            [ONYXKEYS.BETAS]: [CONST.BETAS.DEFAULT_ROOMS],
+            [ONYXKEYS.NVP_PRIORITY_MODE]: CONST.PRIORITY_MODE.GSD,
+            [ONYXKEYS.IS_LOADING_REPORT_DATA]: false,
+            ...mockedResponseMap,
+        });
+
         await measurePerformance(<LHNTestUtils.MockedSidebarLinks />, {scenario});
     });
 });
diff --git a/tests/perf-test/SidebarUtils.perf-test.ts b/tests/perf-test/SidebarUtils.perf-test.ts
index cceb3ae437b9..4a6b12d726d9 100644
--- a/tests/perf-test/SidebarUtils.perf-test.ts
+++ b/tests/perf-test/SidebarUtils.perf-test.ts
@@ -2,12 +2,13 @@ import {rand} from '@ngneat/falso';
 import type {OnyxCollection} from 'react-native-onyx';
 import Onyx from 'react-native-onyx';
 import {measureFunction} from 'reassure';
-import type {ChatReportSelector} from '@hooks/useReportIDs';
+import {getReportActionMessage} from '@libs/ReportActionsUtils';
 import SidebarUtils from '@libs/SidebarUtils';
 import CONST from '@src/CONST';
 import ONYXKEYS from '@src/ONYXKEYS';
 import type {PersonalDetails, TransactionViolation} from '@src/types/onyx';
 import type Policy from '@src/types/onyx/Policy';
+import type Report from '@src/types/onyx/Report';
 import type ReportAction from '@src/types/onyx/ReportAction';
 import createCollection from '../utils/collections/createCollection';
 import createPersonalDetails from '../utils/collections/personalDetails';
@@ -20,7 +21,7 @@ const REPORTS_COUNT = 15000;
 const REPORT_TRESHOLD = 5;
 const PERSONAL_DETAILS_LIST_COUNT = 1000;
 
-const allReports = createCollection<ChatReportSelector>(
+const allReports = createCollection<Report>(
     (item) => `${ONYXKEYS.COLLECTION.REPORT}${item.reportID}`,
     (index) => ({
         ...createRandomReport(index),
@@ -61,7 +62,7 @@ const allReportActions = Object.fromEntries(
                 message: [
                     {
                         moderationDecision: {
-                            decision: reportActions[key].message?.[0]?.moderationDecision?.decision,
+                            decision: getReportActionMessage(reportActions[key])?.moderationDecision?.decision,
                         },
                     },
                 ],
diff --git a/tests/ui/PaginationTest.tsx b/tests/ui/PaginationTest.tsx
new file mode 100644
index 000000000000..277f6b88e78f
--- /dev/null
+++ b/tests/ui/PaginationTest.tsx
@@ -0,0 +1,350 @@
+/* eslint-disable @typescript-eslint/naming-convention */
+import * as NativeNavigation from '@react-navigation/native';
+import {act, fireEvent, render, screen, within} from '@testing-library/react-native';
+import {addSeconds, format, subMinutes} from 'date-fns';
+import React from 'react';
+import Onyx from 'react-native-onyx';
+import * as Localize from '@libs/Localize';
+import * as SequentialQueue from '@libs/Network/SequentialQueue';
+import * as AppActions from '@userActions/App';
+import * as User from '@userActions/User';
+import App from '@src/App';
+import CONST from '@src/CONST';
+import ONYXKEYS from '@src/ONYXKEYS';
+import type {ReportAction} from '@src/types/onyx';
+import type {NativeNavigationMock} from '../../__mocks__/@react-navigation/native';
+import PusherHelper from '../utils/PusherHelper';
+import * as TestHelper from '../utils/TestHelper';
+import waitForBatchedUpdates from '../utils/waitForBatchedUpdates';
+import waitForBatchedUpdatesWithAct from '../utils/waitForBatchedUpdatesWithAct';
+
+// We need a large timeout here as we are lazy loading React Navigation screens and this test is running against the entire mounted App
+jest.setTimeout(30000);
+
+jest.mock('@react-navigation/native');
+jest.mock('../../src/libs/Notification/LocalNotification');
+jest.mock('../../src/components/Icon/Expensicons');
+jest.mock('../../src/components/ConfirmedRoute.tsx');
+
+TestHelper.setupApp();
+const fetchMock = TestHelper.setupGlobalFetchMock();
+
+const LIST_SIZE = {
+    width: 300,
+    height: 400,
+};
+const LIST_CONTENT_SIZE = {
+    width: 300,
+    height: 600,
+};
+const TEN_MINUTES_AGO = subMinutes(new Date(), 10);
+
+const REPORT_ID = '1';
+const COMMENT_LINKING_REPORT_ID = '2';
+const USER_A_ACCOUNT_ID = 1;
+const USER_A_EMAIL = 'user_a@test.com';
+const USER_B_ACCOUNT_ID = 2;
+const USER_B_EMAIL = 'user_b@test.com';
+
+function getReportScreen(reportID = REPORT_ID) {
+    return screen.getByTestId(`report-screen-${reportID}`);
+}
+
+function scrollToOffset(offset: number) {
+    const hintText = Localize.translateLocal('sidebarScreen.listOfChatMessages');
+    fireEvent.scroll(within(getReportScreen()).getByLabelText(hintText), {
+        nativeEvent: {
+            contentOffset: {
+                y: offset,
+            },
+            contentSize: LIST_CONTENT_SIZE,
+            layoutMeasurement: LIST_SIZE,
+        },
+    });
+}
+
+function triggerListLayout(reportID?: string) {
+    const report = getReportScreen(reportID);
+    fireEvent(within(report).getByTestId('report-actions-view-wrapper'), 'onLayout', {
+        nativeEvent: {
+            layout: {
+                x: 0,
+                y: 0,
+                ...LIST_SIZE,
+            },
+        },
+    });
+
+    fireEvent(within(report).getByTestId('report-actions-list'), 'onContentSizeChange', LIST_CONTENT_SIZE.width, LIST_CONTENT_SIZE.height);
+}
+
+function getReportActions(reportID?: string) {
+    const report = getReportScreen(reportID);
+    return [
+        ...within(report).queryAllByLabelText(Localize.translateLocal('accessibilityHints.chatMessage')),
+        // Created action has a different accessibility label.
+        ...within(report).queryAllByLabelText(Localize.translateLocal('accessibilityHints.chatWelcomeMessage')),
+    ];
+}
+
+async function navigateToSidebarOption(reportID: string): Promise<void> {
+    const optionRow = screen.getByTestId(reportID);
+    fireEvent(optionRow, 'press');
+    await act(() => {
+        (NativeNavigation as NativeNavigationMock).triggerTransitionEnd();
+    });
+    // ReportScreen relies on the onLayout event to receive updates from onyx.
+    triggerListLayout(reportID);
+    await waitForBatchedUpdatesWithAct();
+}
+
+function buildCreatedAction(reportActionID: string, created: string) {
+    return {
+        reportActionID,
+        actionName: 'CREATED' as const,
+        created,
+        message: [
+            {
+                type: 'TEXT',
+                text: 'CREATED',
+            },
+        ],
+    };
+}
+
+function buildReportComments(count: number, initialID: string, reverse = false) {
+    let currentID = parseInt(initialID, 10);
+    const result: Record<string, Partial<ReportAction>> = {};
+    for (let i = 0; i < count; i++) {
+        if (currentID < 1) {
+            break;
+        }
+        const created = format(addSeconds(TEN_MINUTES_AGO, 10 * currentID), CONST.DATE.FNS_DB_FORMAT_STRING);
+        const id = currentID;
+        currentID += reverse ? 1 : -1;
+        result[`${id}`] = id === 1 ? buildCreatedAction('1', created) : TestHelper.buildTestReportComment(created, USER_B_ACCOUNT_ID, `${id}`);
+    }
+    return result;
+}
+
+function mockOpenReport(messageCount: number, initialID: string) {
+    fetchMock.mockAPICommand('OpenReport', ({reportID}) =>
+        reportID === REPORT_ID
+            ? [
+                  {
+                      onyxMethod: 'merge',
+                      key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${REPORT_ID}`,
+                      value: buildReportComments(messageCount, initialID),
+                  },
+              ]
+            : [],
+    );
+}
+
+function mockGetOlderActions(messageCount: number) {
+    fetchMock.mockAPICommand('GetOlderActions', ({reportID, reportActionID}) =>
+        reportID === REPORT_ID
+            ? [
+                  {
+                      onyxMethod: 'merge',
+                      key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${REPORT_ID}`,
+                      // The API also returns the action that was requested with the reportActionID.
+                      value: buildReportComments(messageCount + 1, reportActionID),
+                  },
+              ]
+            : [],
+    );
+}
+
+function mockGetNewerActions(messageCount: number) {
+    fetchMock.mockAPICommand('GetNewerActions', ({reportID, reportActionID}) =>
+        reportID === REPORT_ID
+            ? [
+                  {
+                      onyxMethod: 'merge',
+                      key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${REPORT_ID}`,
+                      // The API also returns the action that was requested with the reportActionID.
+                      value: buildReportComments(messageCount + 1, reportActionID, true),
+                  },
+              ]
+            : [],
+    );
+}
+
+/**
+ * Sets up a test with a logged in user. Returns the <App/> test instance.
+ */
+async function signInAndGetApp(): Promise<void> {
+    // Render the App and sign in as a test user.
+    render(<App />);
+    await waitForBatchedUpdatesWithAct();
+    const hintText = Localize.translateLocal('loginForm.loginForm');
+    const loginForm = await screen.findAllByLabelText(hintText);
+    expect(loginForm).toHaveLength(1);
+
+    await act(async () => {
+        await TestHelper.signInWithTestUser(USER_A_ACCOUNT_ID, USER_A_EMAIL, undefined, undefined, 'A');
+    });
+
+    await waitForBatchedUpdatesWithAct();
+
+    User.subscribeToUserEvents();
+
+    await waitForBatchedUpdates();
+
+    await act(async () => {
+        // Simulate setting an unread report and personal details
+        await Onyx.merge(`${ONYXKEYS.COLLECTION.REPORT}${REPORT_ID}`, {
+            reportID: REPORT_ID,
+            reportName: CONST.REPORT.DEFAULT_REPORT_NAME,
+            lastMessageText: 'Test',
+            participants: {[USER_B_ACCOUNT_ID]: {hidden: false}},
+            lastActorAccountID: USER_B_ACCOUNT_ID,
+            type: CONST.REPORT.TYPE.CHAT,
+        });
+
+        await Onyx.merge(ONYXKEYS.PERSONAL_DETAILS_LIST, {
+            [USER_B_ACCOUNT_ID]: TestHelper.buildPersonalDetails(USER_B_EMAIL, USER_B_ACCOUNT_ID, 'B'),
+        });
+
+        // Setup a 2nd report to test comment linking.
+        await Onyx.merge(`${ONYXKEYS.COLLECTION.REPORT}${COMMENT_LINKING_REPORT_ID}`, {
+            reportID: COMMENT_LINKING_REPORT_ID,
+            reportName: CONST.REPORT.DEFAULT_REPORT_NAME,
+            lastMessageText: 'Test',
+            participants: {[USER_A_ACCOUNT_ID]: {hidden: false}},
+            lastActorAccountID: USER_A_ACCOUNT_ID,
+            type: CONST.REPORT.TYPE.CHAT,
+        });
+
+        await Onyx.merge(`${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${COMMENT_LINKING_REPORT_ID}`, {
+            '100': buildCreatedAction('100', format(TEN_MINUTES_AGO, CONST.DATE.FNS_DB_FORMAT_STRING)),
+            '101': {
+                actionName: CONST.REPORT.ACTIONS.TYPE.ADD_COMMENT,
+                person: [{type: 'TEXT', style: 'strong', text: 'User B'}],
+                created: format(addSeconds(TEN_MINUTES_AGO, 10), CONST.DATE.FNS_DB_FORMAT_STRING),
+                message: [
+                    {
+                        type: 'COMMENT',
+                        html: '<a href="https://dev.new.expensify.com:8082/r/1/5">Link 1</a>',
+                        text: 'Link 1',
+                    },
+                ],
+                reportActionID: '101',
+                actorAccountID: USER_A_ACCOUNT_ID,
+            },
+        });
+
+        // We manually setting the sidebar as loaded since the onLayout event does not fire in tests
+        AppActions.setSidebarLoaded();
+    });
+
+    await waitForBatchedUpdatesWithAct();
+}
+
+describe('Pagination', () => {
+    afterEach(async () => {
+        await SequentialQueue.waitForIdle();
+        await act(async () => {
+            await Onyx.clear();
+
+            // Unsubscribe to pusher channels
+            PusherHelper.teardown();
+        });
+
+        await waitForBatchedUpdatesWithAct();
+
+        jest.clearAllMocks();
+    });
+
+    it('opens a chat and load initial messages', async () => {
+        mockOpenReport(5, '5');
+
+        await signInAndGetApp();
+        await navigateToSidebarOption(REPORT_ID);
+
+        expect(getReportActions()).toHaveLength(5);
+        TestHelper.expectAPICommandToHaveBeenCalled('OpenReport', 1);
+        TestHelper.expectAPICommandToHaveBeenCalledWith('OpenReport', 0, {reportID: REPORT_ID, reportActionID: ''});
+        TestHelper.expectAPICommandToHaveBeenCalled('GetOlderActions', 0);
+        TestHelper.expectAPICommandToHaveBeenCalled('GetNewerActions', 0);
+
+        // Scrolling here should not trigger a new network request.
+        scrollToOffset(LIST_CONTENT_SIZE.height);
+        await waitForBatchedUpdatesWithAct();
+        scrollToOffset(0);
+        await waitForBatchedUpdatesWithAct();
+
+        TestHelper.expectAPICommandToHaveBeenCalled('OpenReport', 1);
+        TestHelper.expectAPICommandToHaveBeenCalled('GetOlderActions', 0);
+        TestHelper.expectAPICommandToHaveBeenCalled('GetNewerActions', 0);
+    });
+
+    it('opens a chat and load older messages', async () => {
+        mockOpenReport(CONST.REPORT.MIN_INITIAL_REPORT_ACTION_COUNT, '18');
+        mockGetOlderActions(5);
+
+        await signInAndGetApp();
+        await navigateToSidebarOption(REPORT_ID);
+
+        expect(getReportActions()).toHaveLength(CONST.REPORT.MIN_INITIAL_REPORT_ACTION_COUNT);
+        TestHelper.expectAPICommandToHaveBeenCalled('OpenReport', 1);
+        TestHelper.expectAPICommandToHaveBeenCalledWith('OpenReport', 0, {reportID: REPORT_ID, reportActionID: ''});
+        TestHelper.expectAPICommandToHaveBeenCalled('GetOlderActions', 0);
+        TestHelper.expectAPICommandToHaveBeenCalled('GetNewerActions', 0);
+
+        // Scrolling here should trigger a new network request.
+        scrollToOffset(LIST_CONTENT_SIZE.height);
+        await waitForBatchedUpdatesWithAct();
+
+        TestHelper.expectAPICommandToHaveBeenCalled('OpenReport', 1);
+        TestHelper.expectAPICommandToHaveBeenCalled('GetOlderActions', 1);
+        TestHelper.expectAPICommandToHaveBeenCalledWith('GetOlderActions', 0, {reportID: REPORT_ID, reportActionID: '4'});
+        TestHelper.expectAPICommandToHaveBeenCalled('GetNewerActions', 0);
+
+        await waitForBatchedUpdatesWithAct();
+
+        // We now have 18 messages. 15 (MIN_INITIAL_REPORT_ACTION_COUNT) from the initial OpenReport and 3 from GetOlderActions.
+        // GetOlderActions only returns 3 actions since it reaches id '1', which is the created action.
+        expect(getReportActions()).toHaveLength(18);
+    });
+
+    // Currently broken on main by https://github.com/Expensify/App/pull/42582.
+    // TODO: Investigate and re-enable.
+    it.skip('opens a chat and load newer messages', async () => {
+        mockOpenReport(5, '5');
+        mockGetNewerActions(5);
+
+        await signInAndGetApp();
+        await navigateToSidebarOption(COMMENT_LINKING_REPORT_ID);
+
+        const link = screen.getByText('Link 1');
+        fireEvent(link, 'press');
+        await act(() => {
+            (NativeNavigation as NativeNavigationMock).triggerTransitionEnd();
+        });
+        // ReportScreen relies on the onLayout event to receive updates from onyx.
+        triggerListLayout();
+
+        expect(getReportActions()).toHaveLength(5);
+
+        // There is 1 extra call here because of the comment linking report.
+        TestHelper.expectAPICommandToHaveBeenCalled('OpenReport', 2);
+        TestHelper.expectAPICommandToHaveBeenCalledWith('OpenReport', 1, {reportID: REPORT_ID, reportActionID: '5'});
+        TestHelper.expectAPICommandToHaveBeenCalled('GetOlderActions', 0);
+        TestHelper.expectAPICommandToHaveBeenCalled('GetNewerActions', 0);
+
+        scrollToOffset(0);
+        await waitForBatchedUpdatesWithAct();
+
+        TestHelper.expectAPICommandToHaveBeenCalled('OpenReport', 2);
+        TestHelper.expectAPICommandToHaveBeenCalled('GetOlderActions', 0);
+        TestHelper.expectAPICommandToHaveBeenCalled('GetNewerActions', 1);
+        TestHelper.expectAPICommandToHaveBeenCalledWith('GetNewerActions', 0, {reportID: REPORT_ID, reportActionID: '5'});
+
+        await waitForBatchedUpdatesWithAct();
+
+        // We now have 10 messages. 5 from the initial OpenReport and 5 from GetNewerActions.
+        expect(getReportActions()).toHaveLength(10);
+    });
+});
diff --git a/tests/ui/UnreadIndicatorsTest.tsx b/tests/ui/UnreadIndicatorsTest.tsx
index 5218c1e696c9..1d31a707d81d 100644
--- a/tests/ui/UnreadIndicatorsTest.tsx
+++ b/tests/ui/UnreadIndicatorsTest.tsx
@@ -1,30 +1,28 @@
 /* eslint-disable @typescript-eslint/naming-convention */
-import type * as NativeNavigation from '@react-navigation/native';
+import * as NativeNavigation from '@react-navigation/native';
 import {act, fireEvent, render, screen, waitFor} from '@testing-library/react-native';
 import {addSeconds, format, subMinutes, subSeconds} from 'date-fns';
 import {utcToZonedTime} from 'date-fns-tz';
 import React from 'react';
-import {AppState, DeviceEventEmitter, Linking} from 'react-native';
+import {AppState, DeviceEventEmitter} from 'react-native';
+import type {TextStyle, ViewStyle} from 'react-native';
 import type {OnyxEntry} from 'react-native-onyx';
 import Onyx from 'react-native-onyx';
-import type Animated from 'react-native-reanimated';
 import * as CollectionUtils from '@libs/CollectionUtils';
 import DateUtils from '@libs/DateUtils';
 import * as Localize from '@libs/Localize';
 import LocalNotification from '@libs/Notification/LocalNotification';
 import * as NumberUtils from '@libs/NumberUtils';
-import * as Pusher from '@libs/Pusher/pusher';
-import PusherConnectionManager from '@libs/PusherConnectionManager';
+import {getReportActionText} from '@libs/ReportActionsUtils';
 import FontUtils from '@styles/utils/FontUtils';
 import * as AppActions from '@userActions/App';
 import * as Report from '@userActions/Report';
 import * as User from '@userActions/User';
 import App from '@src/App';
-import CONFIG from '@src/CONFIG';
 import CONST from '@src/CONST';
 import ONYXKEYS from '@src/ONYXKEYS';
-import appSetup from '@src/setup';
 import type {ReportAction, ReportActions} from '@src/types/onyx';
+import type {NativeNavigationMock} from '../../__mocks__/@react-navigation/native';
 import PusherHelper from '../utils/PusherHelper';
 import * as TestHelper from '../utils/TestHelper';
 import waitForBatchedUpdates from '../utils/waitForBatchedUpdates';
@@ -33,105 +31,16 @@ import waitForBatchedUpdatesWithAct from '../utils/waitForBatchedUpdatesWithAct'
 // We need a large timeout here as we are lazy loading React Navigation screens and this test is running against the entire mounted App
 jest.setTimeout(30000);
 
+jest.mock('@react-navigation/native');
 jest.mock('../../src/libs/Notification/LocalNotification');
 jest.mock('../../src/components/Icon/Expensicons');
 jest.mock('../../src/components/ConfirmedRoute.tsx');
 
-// Needed for: https://stackoverflow.com/questions/76903168/mocking-libraries-in-jest
-jest.mock('react-native/Libraries/LogBox/LogBox', () => ({
-    __esModule: true,
-    default: {
-        ignoreLogs: jest.fn(),
-        ignoreAllLogs: jest.fn(),
-    },
-}));
-
-jest.mock('react-native-reanimated', () => ({
-    ...jest.requireActual<typeof Animated>('react-native-reanimated/mock'),
-    createAnimatedPropAdapter: jest.fn,
-    useReducedMotion: jest.fn,
-}));
+TestHelper.setupApp();
+TestHelper.setupGlobalFetchMock();
 
-/**
- * We need to keep track of the transitionEnd callback so we can trigger it in our tests
- */
-let transitionEndCB: () => void;
-
-type ListenerMock = {
-    triggerTransitionEnd: () => void;
-    addListener: jest.Mock;
-};
-
-/**
- * This is a helper function to create a mock for the addListener function of the react-navigation library.
- * The reason we need this is because we need to trigger the transitionEnd event in our tests to simulate
- * the transitionEnd event that is triggered when the screen transition animation is completed.
- *
- * P.S: This can't be moved to a utils file because Jest wants any external function to stay in the scope.
- *
- * @returns An object with two functions: triggerTransitionEnd and addListener
- */
-const createAddListenerMock = (): ListenerMock => {
-    const transitionEndListeners: Array<() => void> = [];
-    const triggerTransitionEnd = () => {
-        transitionEndListeners.forEach((transitionEndListener) => transitionEndListener());
-    };
-
-    const addListener: jest.Mock = jest.fn().mockImplementation((listener, callback) => {
-        if (listener === 'transitionEnd') {
-            transitionEndListeners.push(callback);
-        }
-        return () => {
-            transitionEndListeners.filter((cb) => cb !== callback);
-        };
-    });
-
-    return {triggerTransitionEnd, addListener};
-};
-
-jest.mock('@react-navigation/native', () => {
-    const actualNav = jest.requireActual('@react-navigation/native');
-    const {triggerTransitionEnd, addListener} = createAddListenerMock();
-    transitionEndCB = triggerTransitionEnd;
-
-    const useNavigation = () =>
-        ({
-            navigate: jest.fn(),
-            ...actualNav.useNavigation,
-            getState: () => ({
-                routes: [],
-            }),
-            addListener,
-        } as typeof NativeNavigation.useNavigation);
-
-    return {
-        ...actualNav,
-        useNavigation,
-        getState: () => ({
-            routes: [],
-        }),
-    } as typeof NativeNavigation;
-});
-
-beforeAll(() => {
-    // In this test, we are generically mocking the responses of all API requests by mocking fetch() and having it
-    // return 200. In other tests, we might mock HttpUtils.xhr() with a more specific mock data response (which means
-    // fetch() never gets called so it does not need mocking) or we might have fetch throw an error to test error handling
-    // behavior. But here we just want to treat all API requests as a generic "success" and in the cases where we need to
-    // simulate data arriving we will just set it into Onyx directly with Onyx.merge() or Onyx.set() etc.
-    // @ts-expect-error -- TODO: Remove this once TestHelper (https://github.com/Expensify/App/issues/25318) is migrated
-    global.fetch = TestHelper.getGlobalFetchMock();
-
-    Linking.setInitialURL('https://new.expensify.com/');
-    appSetup();
-
-    // Connect to Pusher
-    PusherConnectionManager.init();
-    Pusher.init({
-        appKey: CONFIG.PUSHER.APP_KEY,
-        cluster: CONFIG.PUSHER.CLUSTER,
-        authEndpoint: `${CONFIG.EXPENSIFY.DEFAULT_API_ROOT}api/AuthenticatePusher?`,
-    });
+beforeEach(() => {
+    Onyx.set(ONYXKEYS.NVP_ONBOARDING, {hasCompletedGuidedSetupFlow: true});
 });
 
 function scrollUpToRevealNewMessagesBadge() {
@@ -158,7 +67,10 @@ function scrollUpToRevealNewMessagesBadge() {
 function isNewMessagesBadgeVisible(): boolean {
     const hintText = Localize.translateLocal('accessibilityHints.scrollToNewestMessages');
     const badge = screen.queryByAccessibilityHint(hintText);
-    return Math.round(badge?.props.style.transform[0].translateY) === -40;
+    const badgeProps = badge?.props as {style: ViewStyle};
+    const transformStyle = badgeProps.style.transform?.[0] as {translateY: number};
+
+    return Math.round(transformStyle.translateY) === -40;
 }
 
 function navigateToSidebar(): Promise<void> {
@@ -228,7 +140,7 @@ function signInAndGetAppWithUnreadChat(): Promise<void> {
                 lastReadTime: reportAction3CreatedDate,
                 lastVisibleActionCreated: reportAction9CreatedDate,
                 lastMessageText: 'Test',
-                participantAccountIDs: [USER_B_ACCOUNT_ID],
+                participants: {[USER_B_ACCOUNT_ID]: {hidden: false}},
                 lastActorAccountID: USER_B_ACCOUNT_ID,
                 type: CONST.REPORT.TYPE.CHAT,
             });
@@ -252,15 +164,15 @@ function signInAndGetAppWithUnreadChat(): Promise<void> {
                         },
                     ],
                 },
-                1: TestHelper.buildTestReportComment(format(addSeconds(TEN_MINUTES_AGO, 10), CONST.DATE.FNS_DB_FORMAT_STRING), USER_B_ACCOUNT_ID, '1', createdReportActionID),
-                2: TestHelper.buildTestReportComment(format(addSeconds(TEN_MINUTES_AGO, 20), CONST.DATE.FNS_DB_FORMAT_STRING), USER_B_ACCOUNT_ID, '2', '1'),
-                3: TestHelper.buildTestReportComment(reportAction3CreatedDate, USER_B_ACCOUNT_ID, '3', '2'),
-                4: TestHelper.buildTestReportComment(format(addSeconds(TEN_MINUTES_AGO, 40), CONST.DATE.FNS_DB_FORMAT_STRING), USER_B_ACCOUNT_ID, '4', '3'),
-                5: TestHelper.buildTestReportComment(format(addSeconds(TEN_MINUTES_AGO, 50), CONST.DATE.FNS_DB_FORMAT_STRING), USER_B_ACCOUNT_ID, '5', '4'),
-                6: TestHelper.buildTestReportComment(format(addSeconds(TEN_MINUTES_AGO, 60), CONST.DATE.FNS_DB_FORMAT_STRING), USER_B_ACCOUNT_ID, '6', '5'),
-                7: TestHelper.buildTestReportComment(format(addSeconds(TEN_MINUTES_AGO, 70), CONST.DATE.FNS_DB_FORMAT_STRING), USER_B_ACCOUNT_ID, '7', '6'),
-                8: TestHelper.buildTestReportComment(format(addSeconds(TEN_MINUTES_AGO, 80), CONST.DATE.FNS_DB_FORMAT_STRING), USER_B_ACCOUNT_ID, '8', '7'),
-                9: TestHelper.buildTestReportComment(reportAction9CreatedDate, USER_B_ACCOUNT_ID, '9', '8'),
+                1: TestHelper.buildTestReportComment(format(addSeconds(TEN_MINUTES_AGO, 10), CONST.DATE.FNS_DB_FORMAT_STRING), USER_B_ACCOUNT_ID, '1'),
+                2: TestHelper.buildTestReportComment(format(addSeconds(TEN_MINUTES_AGO, 20), CONST.DATE.FNS_DB_FORMAT_STRING), USER_B_ACCOUNT_ID, '2'),
+                3: TestHelper.buildTestReportComment(reportAction3CreatedDate, USER_B_ACCOUNT_ID, '3'),
+                4: TestHelper.buildTestReportComment(format(addSeconds(TEN_MINUTES_AGO, 40), CONST.DATE.FNS_DB_FORMAT_STRING), USER_B_ACCOUNT_ID, '4'),
+                5: TestHelper.buildTestReportComment(format(addSeconds(TEN_MINUTES_AGO, 50), CONST.DATE.FNS_DB_FORMAT_STRING), USER_B_ACCOUNT_ID, '5'),
+                6: TestHelper.buildTestReportComment(format(addSeconds(TEN_MINUTES_AGO, 60), CONST.DATE.FNS_DB_FORMAT_STRING), USER_B_ACCOUNT_ID, '6'),
+                7: TestHelper.buildTestReportComment(format(addSeconds(TEN_MINUTES_AGO, 70), CONST.DATE.FNS_DB_FORMAT_STRING), USER_B_ACCOUNT_ID, '7'),
+                8: TestHelper.buildTestReportComment(format(addSeconds(TEN_MINUTES_AGO, 80), CONST.DATE.FNS_DB_FORMAT_STRING), USER_B_ACCOUNT_ID, '8'),
+                9: TestHelper.buildTestReportComment(reportAction9CreatedDate, USER_B_ACCOUNT_ID, '9'),
             });
             await Onyx.merge(ONYXKEYS.PERSONAL_DETAILS_LIST, {
                 [USER_B_ACCOUNT_ID]: TestHelper.buildPersonalDetails(USER_B_EMAIL, USER_B_ACCOUNT_ID, 'B'),
@@ -300,12 +212,12 @@ describe('Unread Indicators', () => {
                 // And that the text is bold
                 const displayNameHintText = Localize.translateLocal('accessibilityHints.chatUserDisplayNames');
                 const displayNameText = screen.queryByLabelText(displayNameHintText);
-                expect(displayNameText?.props?.style?.fontWeight).toBe(FontUtils.fontWeight.bold);
+                expect((displayNameText?.props?.style as TextStyle)?.fontWeight).toBe(FontUtils.fontWeight.bold);
 
                 return navigateToSidebarOption(0);
             })
             .then(async () => {
-                await act(() => transitionEndCB?.());
+                await act(() => (NativeNavigation as NativeNavigationMock).triggerTransitionEnd());
 
                 // That the report actions are visible along with the created action
                 const welcomeMessageHintText = Localize.translateLocal('accessibilityHints.chatWelcomeMessage');
@@ -319,7 +231,7 @@ describe('Unread Indicators', () => {
                 const newMessageLineIndicatorHintText = Localize.translateLocal('accessibilityHints.newMessageLineIndicator');
                 const unreadIndicator = screen.queryAllByLabelText(newMessageLineIndicatorHintText);
                 expect(unreadIndicator).toHaveLength(1);
-                const reportActionID = unreadIndicator[0]?.props?.['data-action-id'];
+                const reportActionID = unreadIndicator[0]?.props?.['data-action-id'] as string;
                 expect(reportActionID).toBe('4');
                 // Scroll up and verify that the "New messages" badge appears
                 scrollUpToRevealNewMessagesBadge();
@@ -330,7 +242,7 @@ describe('Unread Indicators', () => {
             // Navigate to the unread chat from the sidebar
             .then(() => navigateToSidebarOption(0))
             .then(async () => {
-                await act(() => transitionEndCB?.());
+                await act(() => (NativeNavigation as NativeNavigationMock).triggerTransitionEnd());
                 // Verify the unread indicator is present
                 const newMessageLineIndicatorHintText = Localize.translateLocal('accessibilityHints.newMessageLineIndicator');
                 const unreadIndicator = screen.queryAllByLabelText(newMessageLineIndicatorHintText);
@@ -389,7 +301,7 @@ describe('Unread Indicators', () => {
                             lastVisibleActionCreated: DateUtils.getDBTime(utcToZonedTime(NEW_REPORT_FIST_MESSAGE_CREATED_DATE, 'UTC').valueOf()),
                             lastMessageText: 'Comment 1',
                             lastActorAccountID: USER_C_ACCOUNT_ID,
-                            participantAccountIDs: [USER_C_ACCOUNT_ID],
+                            participants: {[USER_C_ACCOUNT_ID]: {hidden: false}},
                             type: CONST.REPORT.TYPE.CHAT,
                         },
                     },
@@ -438,11 +350,11 @@ describe('Unread Indicators', () => {
                 const displayNameTexts = screen.queryAllByLabelText(displayNameHintTexts);
                 expect(displayNameTexts).toHaveLength(2);
                 const firstReportOption = displayNameTexts[0];
-                expect(firstReportOption?.props?.style?.fontWeight).toBe(FontUtils.fontWeight.bold);
+                expect((firstReportOption?.props?.style as TextStyle)?.fontWeight).toBe(FontUtils.fontWeight.bold);
                 expect(screen.getByText('C User')).toBeOnTheScreen();
 
                 const secondReportOption = displayNameTexts[1];
-                expect(secondReportOption?.props?.style?.fontWeight).toBe(FontUtils.fontWeight.bold);
+                expect((secondReportOption?.props?.style as TextStyle)?.fontWeight).toBe(FontUtils.fontWeight.bold);
                 expect(screen.getByText('B User')).toBeOnTheScreen();
 
                 // Tap the new report option and navigate back to the sidebar again via the back button
@@ -450,14 +362,14 @@ describe('Unread Indicators', () => {
             })
             .then(waitForBatchedUpdates)
             .then(async () => {
-                await act(() => transitionEndCB?.());
+                await act(() => (NativeNavigation as NativeNavigationMock).triggerTransitionEnd());
                 // 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');
                 const displayNameTexts = screen.queryAllByLabelText(hintText);
                 expect(displayNameTexts).toHaveLength(2);
-                expect(displayNameTexts[0]?.props?.style?.fontWeight).toBe(undefined);
+                expect((displayNameTexts[0]?.props?.style as TextStyle)?.fontWeight).toBe(FontUtils.fontWeight.normal);
                 expect(screen.getAllByText('C User')[0]).toBeOnTheScreen();
-                expect(displayNameTexts[1]?.props?.style?.fontWeight).toBe(FontUtils.fontWeight.bold);
+                expect((displayNameTexts[1]?.props?.style as TextStyle)?.fontWeight).toBe(FontUtils.fontWeight.bold);
                 expect(screen.getByText('B User')).toBeOnTheScreen();
             }));
 
@@ -476,7 +388,7 @@ describe('Unread Indicators', () => {
                 const newMessageLineIndicatorHintText = Localize.translateLocal('accessibilityHints.newMessageLineIndicator');
                 const unreadIndicator = screen.queryAllByLabelText(newMessageLineIndicatorHintText);
                 expect(unreadIndicator).toHaveLength(1);
-                const reportActionID = unreadIndicator[0]?.props?.['data-action-id'];
+                const reportActionID = unreadIndicator[0]?.props?.['data-action-id'] as string;
                 expect(reportActionID).toBe('3');
                 // Scroll up and verify the new messages badge appears
                 scrollUpToRevealNewMessagesBadge();
@@ -489,7 +401,7 @@ describe('Unread Indicators', () => {
                 const hintText = Localize.translateLocal('accessibilityHints.chatUserDisplayNames');
                 const displayNameTexts = screen.queryAllByLabelText(hintText);
                 expect(displayNameTexts).toHaveLength(1);
-                expect(displayNameTexts[0]?.props?.style?.fontWeight).toBe(FontUtils.fontWeight.bold);
+                expect((displayNameTexts[0]?.props?.style as TextStyle)?.fontWeight).toBe(FontUtils.fontWeight.bold);
                 expect(screen.getByText('B User')).toBeOnTheScreen();
 
                 // Navigate to the report again and back to the sidebar
@@ -501,7 +413,7 @@ describe('Unread Indicators', () => {
                 const hintText = Localize.translateLocal('accessibilityHints.chatUserDisplayNames');
                 const displayNameTexts = screen.queryAllByLabelText(hintText);
                 expect(displayNameTexts).toHaveLength(1);
-                expect(displayNameTexts[0]?.props?.style?.fontWeight).toBe(undefined);
+                expect((displayNameTexts[0]?.props?.style as TextStyle)?.fontWeight).toBe(undefined);
                 expect(screen.getByText('B User')).toBeOnTheScreen();
 
                 // Navigate to the report again and verify the new line indicator is missing
@@ -527,7 +439,7 @@ describe('Unread Indicators', () => {
                 return navigateToSidebarOption(0);
             })
             .then(async () => {
-                await act(() => transitionEndCB?.());
+                await act(() => (NativeNavigation as NativeNavigationMock).triggerTransitionEnd());
                 const newMessageLineIndicatorHintText = Localize.translateLocal('accessibilityHints.newMessageLineIndicator');
                 const unreadIndicator = screen.queryAllByLabelText(newMessageLineIndicatorHintText);
                 expect(unreadIndicator).toHaveLength(1);
@@ -603,8 +515,7 @@ describe('Unread Indicators', () => {
                     // Simulate the response from the server so that the comment can be deleted in this test
                     lastReportAction = reportActions ? CollectionUtils.lastItem(reportActions) : undefined;
                     Onyx.merge(`${ONYXKEYS.COLLECTION.REPORT}${REPORT_ID}`, {
-                        lastMessageText: lastReportAction?.message?.[0]?.text,
-                        lastVisibleActionCreated: DateUtils.getDBTime(lastReportAction?.timestamp),
+                        lastMessageText: getReportActionText(lastReportAction),
                         lastActorAccountID: lastReportAction?.actorAccountID,
                         reportID: REPORT_ID,
                     });
@@ -615,7 +526,9 @@ describe('Unread Indicators', () => {
                     const hintText = Localize.translateLocal('accessibilityHints.lastChatMessagePreview');
                     const alternateText = screen.queryAllByLabelText(hintText);
                     expect(alternateText).toHaveLength(1);
-                    expect(screen.getByText('Current User Comment 1')).toBeOnTheScreen();
+
+                    // This message is visible on the sidebar and the report screen, so there are two occurrences.
+                    expect(screen.getAllByText('Current User Comment 1')[0]).toBeOnTheScreen();
 
                     if (lastReportAction) {
                         Report.deleteReportComment(REPORT_ID, lastReportAction);
diff --git a/tests/unit/APITest.ts b/tests/unit/APITest.ts
index 359288b2a1ef..74be6c742f51 100644
--- a/tests/unit/APITest.ts
+++ b/tests/unit/APITest.ts
@@ -1,5 +1,6 @@
 import MockedOnyx from 'react-native-onyx';
 import type {ValueOf} from 'type-fest';
+import type {ApiRequestCommandParameters, ReadCommand, WriteCommand} from '@libs/API/types';
 import CONST from '@src/CONST';
 import * as PersistedRequests from '@src/libs/actions/PersistedRequests';
 import * as API from '@src/libs/API';
@@ -40,7 +41,6 @@ type XhrCalls = Array<{
 const originalXHR = HttpUtils.xhr;
 
 beforeEach(() => {
-    // @ts-expect-error TODO: Remove this once TestHelper (https://github.com/Expensify/App/issues/25318) is migrated to TypeScript.
     global.fetch = TestHelper.getGlobalFetchMock();
     HttpUtils.xhr = originalXHR;
     MainQueue.clear();
@@ -71,12 +71,9 @@ describe('APITests', () => {
         return Onyx.set(ONYXKEYS.NETWORK, {isOffline: true})
             .then(() => {
                 // When API Writes and Reads are called
-                // @ts-expect-error - mocking the parameter
-                API.write('mock command', {param1: 'value1'});
-                // @ts-expect-error - mocking the parameter
-                API.read('mock command', {param2: 'value2'});
-                // @ts-expect-error - mocking the parameter
-                API.write('mock command', {param3: 'value3'});
+                API.write<WriteCommand>('mock command' as WriteCommand, {param1: 'value1'} as ApiRequestCommandParameters[WriteCommand]);
+                API.read<ReadCommand>('mock command' as ReadCommand, {param2: 'value2'} as unknown as ApiRequestCommandParameters[ReadCommand]);
+                API.write<WriteCommand>('mock command' as WriteCommand, {param3: 'value3'} as ApiRequestCommandParameters[WriteCommand]);
                 return waitForBatchedUpdates();
             })
             .then(() => {
@@ -110,10 +107,8 @@ describe('APITests', () => {
             })
                 .then(() => {
                     // When API Write commands are made
-                    // @ts-expect-error - mocking the parameter
-                    API.write('mock command', {param1: 'value1'});
-                    // @ts-expect-error - mocking the parameter
-                    API.write('mock command', {param2: 'value2'});
+                    API.write<WriteCommand>('mock command' as WriteCommand, {param1: 'value1'} as ApiRequestCommandParameters[WriteCommand]);
+                    API.write<WriteCommand>('mock command' as WriteCommand, {param2: 'value2'} as ApiRequestCommandParameters[WriteCommand]);
                     return waitForBatchedUpdates();
                 })
                 .then(() => {
@@ -161,10 +156,8 @@ describe('APITests', () => {
             Onyx.set(ONYXKEYS.NETWORK, {isOffline: true})
                 .then(() => {
                     // When API Write commands are made
-                    // @ts-expect-error - mocking the parameter
-                    API.write('mock command', {param1: 'value1'});
-                    // @ts-expect-error - mocking the parameter
-                    API.write('mock command', {param2: 'value2'});
+                    API.write<WriteCommand>('mock command' as WriteCommand, {param1: 'value1'} as ApiRequestCommandParameters[WriteCommand]);
+                    API.write<WriteCommand>('mock command' as WriteCommand, {param2: 'value2'} as ApiRequestCommandParameters[WriteCommand]);
                     return waitForBatchedUpdates();
                 })
 
@@ -225,8 +218,7 @@ describe('APITests', () => {
             Onyx.set(ONYXKEYS.NETWORK, {isOffline: true})
                 .then(() => {
                     // When API Write commands are made
-                    // @ts-expect-error - mocking the parameter
-                    API.write('mock command', {param1: 'value1'});
+                    API.write<WriteCommand>('mock command' as WriteCommand, {param1: 'value1'} as ApiRequestCommandParameters[WriteCommand]);
                     return waitForNetworkPromises();
                 })
 
@@ -312,8 +304,7 @@ describe('APITests', () => {
             waitForBatchedUpdates()
                 .then(() => Onyx.set(ONYXKEYS.NETWORK, {isOffline: true}))
                 .then(() => {
-                    // @ts-expect-error - mocking the parameter
-                    API.write('Mock', {param1: 'value1'});
+                    API.write<WriteCommand>('Mock' as WriteCommand, {param1: 'value1'} as ApiRequestCommandParameters[WriteCommand]);
                     return waitForBatchedUpdates();
                 })
 
@@ -346,20 +337,13 @@ describe('APITests', () => {
         })
             .then(() => {
                 // When we queue 6 persistable commands and one not persistable
-                // @ts-expect-error - mocking the parameter
-                API.write('MockCommand', {content: 'value1'});
-                // @ts-expect-error - mocking the parameter
-                API.write('MockCommand', {content: 'value2'});
-                // @ts-expect-error - mocking the parameter
-                API.write('MockCommand', {content: 'value3'});
-                // @ts-expect-error - mocking the parameter
-                API.read('MockCommand', {content: 'not-persisted'});
-                // @ts-expect-error - mocking the parameter
-                API.write('MockCommand', {content: 'value4'});
-                // @ts-expect-error - mocking the parameter
-                API.write('MockCommand', {content: 'value5'});
-                // @ts-expect-error - mocking the parameter
-                API.write('MockCommand', {content: 'value6'});
+                API.write<WriteCommand>('MockCommand' as WriteCommand, {content: 'value1'} as ApiRequestCommandParameters[WriteCommand]);
+                API.write<WriteCommand>('MockCommand' as WriteCommand, {content: 'value2'} as ApiRequestCommandParameters[WriteCommand]);
+                API.write<WriteCommand>('MockCommand' as WriteCommand, {content: 'value3'} as ApiRequestCommandParameters[WriteCommand]);
+                API.read<ReadCommand>('MockCommand' as ReadCommand, {content: 'not-persisted'} as unknown as ApiRequestCommandParameters[ReadCommand]);
+                API.write<WriteCommand>('MockCommand' as WriteCommand, {content: 'value4'} as ApiRequestCommandParameters[WriteCommand]);
+                API.write<WriteCommand>('MockCommand' as WriteCommand, {content: 'value5'} as ApiRequestCommandParameters[WriteCommand]);
+                API.write<WriteCommand>('MockCommand' as WriteCommand, {content: 'value6'} as ApiRequestCommandParameters[WriteCommand]);
 
                 return waitForBatchedUpdates();
             })
@@ -390,18 +374,12 @@ describe('APITests', () => {
         })
             .then(() => {
                 // When we queue 6 persistable commands
-                // @ts-expect-error - mocking the parameter
-                API.write('MockCommand', {content: 'value1'});
-                // @ts-expect-error - mocking the parameter
-                API.write('MockCommand', {content: 'value2'});
-                // @ts-expect-error - mocking the parameter
-                API.write('MockCommand', {content: 'value3'});
-                // @ts-expect-error - mocking the parameter
-                API.write('MockCommand', {content: 'value4'});
-                // @ts-expect-error - mocking the parameter
-                API.write('MockCommand', {content: 'value5'});
-                // @ts-expect-error - mocking the parameter
-                API.write('MockCommand', {content: 'value6'});
+                API.write<WriteCommand>('MockCommand' as WriteCommand, {content: 'value1'} as ApiRequestCommandParameters[WriteCommand]);
+                API.write<WriteCommand>('MockCommand' as WriteCommand, {content: 'value2'} as ApiRequestCommandParameters[WriteCommand]);
+                API.write<WriteCommand>('MockCommand' as WriteCommand, {content: 'value3'} as ApiRequestCommandParameters[WriteCommand]);
+                API.write<WriteCommand>('MockCommand' as WriteCommand, {content: 'value4'} as ApiRequestCommandParameters[WriteCommand]);
+                API.write<WriteCommand>('MockCommand' as WriteCommand, {content: 'value5'} as ApiRequestCommandParameters[WriteCommand]);
+                API.write<WriteCommand>('MockCommand' as WriteCommand, {content: 'value6'} as ApiRequestCommandParameters[WriteCommand]);
                 return waitForBatchedUpdates();
             })
             .then(() => Onyx.set(ONYXKEYS.NETWORK, {isOffline: false}))
@@ -454,8 +432,7 @@ describe('APITests', () => {
                 return waitForBatchedUpdates();
             })
             .then(() => {
-                // @ts-expect-error - mocking the parameter
-                API.write('MockCommand');
+                API.write('MockCommand' as WriteCommand, {});
                 expect(PersistedRequests.getAll().length).toBe(1);
                 expect(NetworkStore.isOffline()).toBe(true);
                 expect(SequentialQueue.isRunning()).toBe(false);
@@ -524,8 +501,7 @@ describe('APITests', () => {
                 NetworkStore.resetHasReadRequiredDataFromStorage();
 
                 // And queue a Write request while offline
-                // @ts-expect-error - mocking the parameter
-                API.write('MockCommand', {content: 'value1'});
+                API.write<WriteCommand>('MockCommand' as WriteCommand, {content: 'value1'} as ApiRequestCommandParameters[WriteCommand]);
 
                 // Then we should expect the request to get persisted
                 expect(PersistedRequests.getAll().length).toBe(1);
@@ -561,12 +537,9 @@ describe('APITests', () => {
                 expect(NetworkStore.isOffline()).toBe(false);
 
                 // WHEN we make a request that should be retried, one that should not, and another that should
-                // @ts-expect-error - mocking the parameter
-                API.write('MockCommandOne');
-                // @ts-expect-error - mocking the parameter
-                API.read('MockCommandTwo');
-                // @ts-expect-error - mocking the parameter
-                API.write('MockCommandThree');
+                API.write('MockCommandOne' as WriteCommand, {});
+                API.read('MockCommandTwo' as ReadCommand, null);
+                API.write('MockCommandThree' as WriteCommand, {});
 
                 // THEN the retryable requests should immediately be added to the persisted requests
                 expect(PersistedRequests.getAll().length).toBe(2);
diff --git a/tests/unit/CIGitLogicTest.sh b/tests/unit/CIGitLogicTest.sh
deleted file mode 100755
index a2333faaf3f8..000000000000
--- a/tests/unit/CIGitLogicTest.sh
+++ /dev/null
@@ -1,429 +0,0 @@
-#!/bin/bash
-
-# Fail immediately if there is an error thrown
-set -e
-
-TEST_DIR=$(dirname "$(dirname "$(cd "$(dirname "$0")" || exit 1; pwd)/$(basename "$0")")")
-declare -r SCRIPTS_DIR="$TEST_DIR/../scripts"
-declare -r DUMMY_DIR="$HOME/DumDumRepo"
-declare -r GIT_REMOTE="$HOME/dummyGitRemotes/DumDumRepo"
-declare -r SEMVER_LEVEL_BUILD='BUILD'
-declare -r SEMVER_LEVEL_PATCH='PATCH'
-
-declare -r bumpVersion="$TEST_DIR/utils/bumpVersion.ts"
-declare -r getPreviousVersion="$TEST_DIR/utils/getPreviousVersion.ts"
-declare -r getPullRequestsMergedBetween="$TEST_DIR/utils/getPullRequestsMergedBetween.ts"
-
-source "$SCRIPTS_DIR/shellUtils.sh"
-
-function setup_git_as_human {
-  info "Switching to human git user"
-  git config --local user.name test
-  git config --local user.email test@test.com
-}
-
-function setup_git_as_osbotify {
-  info "Switching to OSBotify git user"
-  git config --local user.name OSBotify
-  git config --local user.email infra+osbotify@expensify.com
-}
-
-function print_version {
-  < package.json jq -r .version
-}
-
-function init_git_server {
-  info "Initializing git server..."
-  cd "$HOME" || exit 1
-  rm -rf "$GIT_REMOTE" || exit 1
-  mkdir -p "$GIT_REMOTE"
-  cd "$GIT_REMOTE" || exit 1
-  git init -b main
-  setup_git_as_human
-  npm init -y
-  npm version --no-git-tag-version 1.0.0-0
-  npm install lodash
-  echo "node_modules/" >> .gitignore
-  git add -A
-  git commit -m "Initial commit"
-  git switch -c staging
-  git tag "$(print_version)"
-  git branch production
-  git config --local receive.denyCurrentBranch ignore
-  success "Initialized git server in $GIT_REMOTE"
-}
-
-# Note that instead of doing a git clone, we checkout the repo following the same steps used by actions/checkout
-function checkout_repo {
-  info "Checking out repo at $DUMMY_DIR"
-
-  if [ -d "$DUMMY_DIR" ]; then
-    info "Found existing directory at $DUMMY_DIR, deleting it to simulate a fresh checkout..."
-    cd "$HOME" || exit 1
-    rm -rf "$DUMMY_DIR"
-  fi
-
-  mkdir "$DUMMY_DIR"
-  cd "$DUMMY_DIR" || exit 1
-  git init
-  git remote add origin "$GIT_REMOTE"
-  git fetch --no-tags --prune --progress --no-recurse-submodules --depth=1 origin +refs/heads/main:refs/remotes/origin/main
-  git checkout --progress --force -B main refs/remotes/origin/main
-  success "Checked out repo at $DUMMY_DIR!"
-}
-
-function bump_version {
-  info "Bumping version..."
-  setup_git_as_osbotify
-  git switch main
-  npm --no-git-tag-version version "$(ts-node "$bumpVersion" "$(print_version)" "$1")"
-  git add package.json package-lock.json
-  git commit -m "Update version to $(print_version)"
-  git push origin main
-  success "Version bumped to $(print_version) on main"
-}
-
-function update_staging_from_main {
-  info "Recreating staging from main..."
-  git switch main
-  if git rev-parse --verify staging 2>/dev/null; then
-    git branch -D staging
-  fi
-  git switch -c staging
-  git push --force origin staging
-  success "Recreated staging from main!"
-}
-
-function update_production_from_staging {
-  info "Recreating production from staging..."
-
-  if ! git rev-parse --verify staging 2>/dev/null; then
-    git fetch origin staging --depth=1
-  fi
-  git switch staging
-
-  if git rev-parse --verify production 2>/dev/null; then
-    git branch -D production
-  fi
-  git switch -c production
-  git push --force origin production
-
-  success "Recreated production from staging!"
-}
-
-function create_basic_pr {
-  info "Creating PR #$1..."
-  checkout_repo
-  setup_git_as_human
-  git pull
-  git switch -c "pr-$1"
-  echo "Changes from PR #$1" >> "PR$1.txt"
-  git add "PR$1.txt"
-  git commit -m "Changes from PR #$1"
-  success "Created PR #$1 in branch pr-$1"
-}
-
-function merge_pr {
-  info "Merging PR #$1 to main"
-  git switch main
-  git merge "pr-$1" --no-ff -m "Merge pull request #$1 from Expensify/pr-$1"
-  git push origin main
-  git branch -d "pr-$1"
-  success "Merged PR #$1 to main"
-}
-
-function cherry_pick_pr {
-  info "Cherry-picking PR $1 to staging..."
-  merge_pr "$1"
-  PR_MERGE_COMMIT="$(git rev-parse HEAD)"
-
-  bump_version "$SEMVER_LEVEL_BUILD"
-  VERSION_BUMP_COMMIT="$(git rev-parse HEAD)"
-
-  checkout_repo
-  setup_git_as_osbotify
-  PREVIOUS_PATCH_VERSION="$(ts-node "$getPreviousVersion" "$(print_version)" "$SEMVER_LEVEL_PATCH")"
-  git fetch origin main staging --no-tags --shallow-exclude="$PREVIOUS_PATCH_VERSION"
-
-  git switch staging
-  git switch -c cherry-pick-staging
-  git cherry-pick -x --mainline 1 "$VERSION_BUMP_COMMIT"
-  setup_git_as_human
-  git cherry-pick -x --mainline 1 --strategy=recursive -Xtheirs "$PR_MERGE_COMMIT"
-  setup_git_as_osbotify
-
-  git switch staging
-  git merge cherry-pick-staging --no-ff -m "Merge pull request #$(($1 + 1)) from Expensify/cherry-pick-staging"
-  git branch -d cherry-pick-staging
-  git push origin staging
-  info "Merged PR #$(($1 + 1)) into staging"
-
-  tag_staging
-
-  success "Successfully cherry-picked PR #$1 to staging!"
-}
-
-function tag_staging {
-  info "Tagging new version from the staging branch..."
-  checkout_repo
-  setup_git_as_osbotify
-  if ! git rev-parse --verify staging 2>/dev/null; then
-    git fetch origin staging --depth=1
-  fi
-  git switch staging
-  git tag "$(print_version)"
-  git push --tags
-  success "Created new tag $(print_version)"
-}
-
-function deploy_staging {
-  info "Deploying staging..."
-  checkout_repo
-  bump_version "$SEMVER_LEVEL_BUILD"
-  update_staging_from_main
-  tag_staging
-  success "Deployed v$(print_version) to staging!"
-}
-
-function deploy_production {
-  info "Checklist closed, deploying production and staging..."
-
-  info "Deploying production..."
-  update_production_from_staging
-  success "Deployed v$(print_version) to production!"
-
-  info "Deploying staging..."
-  bump_version "$SEMVER_LEVEL_PATCH"
-  update_staging_from_main
-  tag_staging
-  success "Deployed v$(print_version) to staging!"
-}
-
-function assert_prs_merged_between {
-  checkout_repo
-  output=$(ts-node "$getPullRequestsMergedBetween" "$1" "$2")
-  info "Checking output of getPullRequestsMergedBetween $1 $2"
-  assert_equal "$output" "$3"
-}
-
-### Phase 0: Verify necessary tools are installed (all tools should be pre-installed on all GitHub Actions runners)
-
-if ! command -v jq &> /dev/null; then
-  error "command jq could not be found, install it with \`brew install jq\` (macOS) or \`apt-get install jq\` (Linux) and re-run this script"
-  exit 1
-fi
-
-if ! command -v npm &> /dev/null; then
-  error "command npm could not be found, install it and re-run this script"
-  exit 1
-fi
-
-
-### Setup
-title "Starting setup"
-
-init_git_server
-checkout_repo
-
-success "Setup complete!"
-
-
-title "Scenario #1: Merge a pull request while the checklist is unlocked"
-
-create_basic_pr 1
-merge_pr 1
-deploy_staging
-
-# Verify output for checklist and deploy comment
-assert_prs_merged_between '1.0.0-0' '1.0.0-1' "[ 1 ]"
-
-success "Scenario #1 completed successfully!"
-
-
-title "Scenario #2: Merge a pull request with the checklist locked, but don't CP it"
-
-create_basic_pr 2
-merge_pr 2
-
-success "Scenario #2 completed successfully!"
-
-title "Scenario #3: Merge a pull request with the checklist locked and CP it to staging"
-
-create_basic_pr 3
-cherry_pick_pr 3
-
-# Verify output for checklist
-assert_prs_merged_between '1.0.0-0' '1.0.0-2' "[ 1, 3 ]"
-
-# Verify output for deploy comment
-assert_prs_merged_between '1.0.0-1' '1.0.0-2' "[ 3 ]"
-
-success "Scenario #3 completed successfully!"
-
-
-title "Scenario #4: Close the checklist"
-
-deploy_production
-
-# Verify output for release body and production deploy comments
-assert_prs_merged_between '1.0.0-0' '1.0.0-2' "[ 1, 3 ]"
-
-# Verify output for new checklist and staging deploy comments
-assert_prs_merged_between '1.0.0-2' '1.0.1-0' "[ 2 ]"
-
-success "Scenario #4 completed successfully!"
-
-
-title "Scenario #5: Merging another pull request when the checklist is unlocked"
-
-create_basic_pr 5
-merge_pr 5
-deploy_staging
-
-# Verify output for checklist
-assert_prs_merged_between '1.0.0-2' '1.0.1-1' "[ 2, 5 ]"
-
-# Verify output for deploy comment
-assert_prs_merged_between '1.0.1-0' '1.0.1-1' "[ 5 ]"
-
-success "Scenario #5 completed successfully!"
-
-title "Scenario #6: Deploying a PR, then CPing a revert, then adding the same code back again before the next production deploy results in the correct code on staging and production."
-
-info "Creating myFile.txt in PR #6"
-setup_git_as_human
-git switch main
-git switch -c pr-6
-echo "Changes from PR #6" >> myFile.txt
-git add myFile.txt
-git commit -m "Add myFile.txt in PR #6"
-
-merge_pr 6
-deploy_staging
-
-# Verify output for checklist
-assert_prs_merged_between '1.0.0-2' '1.0.1-2' "[ 2, 5, 6 ]"
-
-# Verify output for deploy comment
-assert_prs_merged_between '1.0.1-1' '1.0.1-2' "[ 6 ]"
-
-info "Appending and prepending content to myFile.txt in PR #7"
-setup_git_as_human
-git switch main
-git switch -c pr-7
-printf "[DEBUG] Before:\n\n%s" "$(cat myFile.txt)"
-printf "Prepended content\n%s" "$(cat myFile.txt)" > myFile.txt
-printf "\nAppended content\n" >> myFile.txt
-printf "\n\n[DEBUG] After:\n\n%s\n" "$(cat myFile.txt)"
-git add myFile.txt
-git commit -m "Append and prepend content in myFile.txt"
-
-merge_pr 7
-deploy_staging
-
-# Verify output for checklist
-assert_prs_merged_between '1.0.0-2' '1.0.1-3' "[ 2, 5, 6, 7 ]"
-
-# Verify output for deploy comment
-assert_prs_merged_between '1.0.1-2' '1.0.1-3' "[ 7 ]"
-
-info "Making an unrelated change in PR #8"
-setup_git_as_human
-git switch main
-git switch -c pr-8
-echo "some content" >> anotherFile.txt
-git add anotherFile.txt
-git commit -m "Create another file"
-
-merge_pr 8
-
-info "Reverting the append + prepend on main in PR #9"
-setup_git_as_human
-git switch main
-git switch -c pr-9
-printf "Before:\n\n%s\n" "$(cat myFile.txt)"
-echo "some content" > myFile.txt
-printf "\nAfter:\n\n%s\n" "$(cat myFile.txt)"
-git add myFile.txt
-git commit -m "Revert append and prepend"
-
-cherry_pick_pr 9
-
-info "Verifying that the revert is present on staging, but the unrelated change is not"
-if [[ "$(cat myFile.txt)" != "some content" ]]; then
-  error "Revert did not make it to staging"
-  exit 1
-else
-  success "Revert made it to staging"
-fi
-if [[ -f anotherFile.txt ]]; then
-  error "Unrelated change made it to staging"
-  exit 1
-else
-  success "Unrelated change not on staging yet"
-fi
-
-info "Repeating previously reverted append + prepend on main in PR #10"
-setup_git_as_human
-git switch main
-git switch -c pr-10
-printf "[DEBUG] Before:\n\n%s" "$(cat myFile.txt)"
-printf "Prepended content\n%s" "$(cat myFile.txt)" > myFile.txt
-printf "\nAppended content\n" >> myFile.txt
-printf "\n\n[DEBUG] After:\n\n%s\n" "$(cat myFile.txt)"
-git add myFile.txt
-git commit -m "Append and prepend content in myFile.txt"
-
-merge_pr 10
-deploy_production
-
-# Verify production release list
-assert_prs_merged_between '1.0.0-2' '1.0.1-4' '[ 2, 5, 6, 7, 9 ]'
-
-# Verify PR list for the new checklist
-assert_prs_merged_between '1.0.1-4' '1.0.2-0' '[ 8, 10 ]'
-
-success "Scenario #6 completed successfully!"
-
-title "Scenario #7: Force-pushing to a branch after rebasing older commits"
-
-create_basic_pr 11
-git push origin pr-11
-
-create_basic_pr 12
-merge_pr 12
-deploy_staging
-
-# Verify PRs for checklist
-assert_prs_merged_between '1.0.1-4' '1.0.2-1' '[ 8, 10, 12 ]'
-
-# Verify PRs for deploy comments
-assert_prs_merged_between '1.0.2-0' '1.0.2-1' '[ 12 ]'
-
-info "Rebasing PR #11 onto main and merging it..."
-checkout_repo
-setup_git_as_human
-git fetch origin pr-11
-git switch pr-11
-git rebase main -Xours
-git push --force origin pr-11
-merge_pr 11
-success "Rebased PR #11 and merged it to main..."
-
-deploy_production
-
-# Verify PRs for deploy comments / release
-assert_prs_merged_between '1.0.1-4' '1.0.2-1' '[ 8, 10, 12 ]'
-
-# Verify PRs for new checklist
-assert_prs_merged_between '1.0.2-1' '1.0.3-0' '[ 11 ]'
-
-success "Scenario #7 complete!"
-
-
-### Cleanup
-title "Cleaning up..."
-cd "$TEST_DIR" || exit 1
-rm -rf "$DUMMY_DIR"
-rm -rf "$GIT_REMOTE"
-success "All tests passed! Hooray!"
diff --git a/tests/unit/CIGitLogicTest.ts b/tests/unit/CIGitLogicTest.ts
new file mode 100644
index 000000000000..50471b76318a
--- /dev/null
+++ b/tests/unit/CIGitLogicTest.ts
@@ -0,0 +1,500 @@
+/**
+ * @jest-environment node
+ * @jest-config bail=true
+ */
+
+/* eslint-disable no-console */
+import * as core from '@actions/core';
+import {execSync} from 'child_process';
+import fs from 'fs';
+import os from 'os';
+import path from 'path';
+import type {PackageJson} from 'type-fest';
+import getPreviousVersion from '@github/actions/javascript/getPreviousVersion/getPreviousVersion';
+import CONST from '@github/libs/CONST';
+import GitUtils from '@github/libs/GitUtils';
+import * as VersionUpdater from '@github/libs/versionUpdater';
+import type {SemverLevel} from '@github/libs/versionUpdater';
+import asMutable from '@src/types/utils/asMutable';
+import * as Log from '../../scripts/utils/Logger';
+
+const DUMMY_DIR = path.resolve(os.homedir(), 'DumDumRepo');
+const GIT_REMOTE = path.resolve(os.homedir(), 'dummyGitRemotes/DumDumRepo');
+
+const mockGetInput = jest.fn();
+
+type ExecSyncError = {stderr: Buffer};
+
+function exec(command: string) {
+    try {
+        Log.info(command);
+        execSync(command, {stdio: 'inherit'});
+    } catch (error) {
+        if ((error as ExecSyncError).stderr) {
+            Log.error((error as ExecSyncError).stderr.toString());
+        } else {
+            Log.error('Error:', error);
+        }
+        throw new Error(error as string);
+    }
+}
+
+function setupGitAsHuman() {
+    Log.info('Switching to human git user');
+    exec('git config --local user.name test');
+    exec('git config --local user.email test@test.com');
+}
+
+function setupGitAsOSBotify() {
+    Log.info('Switching to OSBotify git user');
+    exec(`git config --local user.name ${CONST.OS_BOTIFY}`);
+    exec('git config --local user.email infra+osbotify@expensify.com');
+}
+
+function getVersion(): string {
+    const packageJson = JSON.parse(fs.readFileSync('package.json', {encoding: 'utf-8'})) as PackageJson;
+
+    if (!packageJson.version) {
+        throw new Error('package.json does not contain a version field');
+    }
+
+    return packageJson.version;
+}
+
+function initGitServer() {
+    Log.info('Initializing git server...');
+    if (fs.existsSync(GIT_REMOTE)) {
+        fs.rmSync(GIT_REMOTE, {recursive: true});
+    }
+    fs.mkdirSync(GIT_REMOTE, {recursive: true});
+    process.chdir(GIT_REMOTE);
+    exec('git init -b main');
+    setupGitAsHuman();
+    exec('npm init -y');
+    exec('npm version --no-git-tag-version 1.0.0-0');
+    fs.appendFileSync('.gitignore', 'node_modules/\n');
+    exec('git add -A');
+    exec('git commit -m "Initial commit"');
+    exec('git switch -c staging');
+    exec(`git tag ${getVersion()}`);
+    exec('git branch production');
+    exec('git config --local receive.denyCurrentBranch ignore');
+    Log.success(`Initialized git server in ${GIT_REMOTE}`);
+}
+
+function checkoutRepo() {
+    if (fs.existsSync(DUMMY_DIR)) {
+        Log.warn(`Found existing directory at ${DUMMY_DIR}, deleting it to simulate a fresh checkout...`);
+        fs.rmSync(DUMMY_DIR, {recursive: true});
+    }
+    fs.mkdirSync(DUMMY_DIR);
+    process.chdir(DUMMY_DIR);
+    exec('git init');
+    exec(`git remote add origin ${GIT_REMOTE}`);
+    exec('git fetch --no-tags --prune --progress --no-recurse-submodules --depth=1 origin +refs/heads/main:refs/remotes/origin/main');
+    exec('git checkout --progress --force -B main refs/remotes/origin/main');
+    Log.success('Checked out repo at $DUMMY_DIR!');
+}
+
+function bumpVersion(level: SemverLevel) {
+    Log.info('Bumping version...');
+    setupGitAsOSBotify();
+    exec('git switch main');
+    const nextVersion = VersionUpdater.incrementVersion(getVersion(), level);
+    exec(`npm --no-git-tag-version version ${nextVersion}`);
+    exec('git add package.json');
+    exec(`git commit -m "Update version to ${nextVersion}"`);
+    exec('git push origin main');
+    Log.success(`Version bumped to ${nextVersion} on main`);
+}
+
+function updateStagingFromMain() {
+    Log.info('Recreating staging from main...');
+    exec('git switch main');
+    try {
+        execSync('git rev-parse --verify staging', {stdio: 'ignore'});
+        exec('git branch -D staging');
+        // eslint-disable-next-line no-empty
+    } catch (e) {}
+    exec('git switch -c staging');
+    exec('git push --force origin staging');
+    Log.success('Recreated staging from main!');
+}
+
+function updateProductionFromStaging() {
+    Log.info('Recreating production from staging...');
+
+    try {
+        execSync('git rev-parse --verify staging', {stdio: 'ignore'});
+    } catch (e) {
+        exec('git fetch origin staging --depth=1');
+    }
+
+    exec('git switch staging');
+
+    try {
+        execSync('git rev-parse --verify production', {stdio: 'ignore'});
+        exec('git branch -D production');
+        // eslint-disable-next-line no-empty
+    } catch (e) {}
+
+    exec('git switch -c production');
+    exec('git push --force origin production');
+    Log.success('Recreated production from staging!');
+}
+
+function createBasicPR(num: number) {
+    const branchName = `pr-${num}`;
+    const content = `Changes from PR #${num}`;
+    const filePath = path.resolve(process.cwd(), `PR${num}.txt`);
+
+    Log.info(`Creating PR #${num}`);
+    checkoutRepo();
+    setupGitAsHuman();
+    exec('git pull');
+    exec(`git switch -c ${branchName}`);
+    fs.appendFileSync(filePath, content);
+    exec(`git add ${filePath}`);
+    exec(`git commit -m "${content}"`);
+    Log.success(`Created PR #${num} in branch ${branchName}`);
+}
+
+function mergePR(num: number) {
+    const branchName = `pr-${num}`;
+
+    Log.info(`Merging PR #${num} to main`);
+    exec('git switch main');
+    exec(`git merge ${branchName} --no-ff -m "Merge pull request #${num} from Expensify/${branchName}"`);
+    exec('git push origin main');
+    exec(`git branch -d ${branchName}`);
+    Log.success(`Merged PR #${num} to main`);
+}
+
+function cherryPickPR(num: number, resolveVersionBumpConflicts: () => void = () => {}, resolveMergeCommitConflicts: () => void = () => {}) {
+    Log.info(`Cherry-picking PR ${num} to staging...`);
+    mergePR(num);
+    const prMergeCommit = execSync('git rev-parse HEAD', {encoding: 'utf-8'}).trim();
+    bumpVersion(VersionUpdater.SEMANTIC_VERSION_LEVELS.BUILD);
+    const versionBumpCommit = execSync('git rev-parse HEAD', {encoding: 'utf-8'}).trim();
+    checkoutRepo();
+    setupGitAsOSBotify();
+
+    mockGetInput.mockReturnValue(VersionUpdater.SEMANTIC_VERSION_LEVELS.PATCH);
+    const previousPatchVersion = getPreviousVersion();
+    exec(`git fetch origin main staging --no-tags --shallow-exclude="${previousPatchVersion}"`);
+
+    exec('git switch staging');
+    exec('git switch -c cherry-pick-staging');
+
+    try {
+        exec(`git cherry-pick -x --mainline 1 ${versionBumpCommit}`);
+    } catch (e) {
+        resolveVersionBumpConflicts();
+    }
+
+    setupGitAsHuman();
+
+    try {
+        exec(`git cherry-pick -x --mainline 1 --strategy=recursive -Xtheirs ${prMergeCommit}`);
+    } catch (e) {
+        resolveMergeCommitConflicts();
+    }
+
+    setupGitAsOSBotify();
+    exec('git switch staging');
+    exec(`git merge cherry-pick-staging --no-ff -m "Merge pull request #${num + 1} from Expensify/cherry-pick-staging"`);
+    exec('git branch -d cherry-pick-staging');
+    exec('git push origin staging');
+    Log.info(`Merged PR #${num + 1} into staging`);
+    tagStaging();
+    Log.success(`Successfully cherry-picked PR #${num} to staging!`);
+}
+
+function tagStaging() {
+    Log.info('Tagging new version from the staging branch...');
+    checkoutRepo();
+    setupGitAsOSBotify();
+    try {
+        execSync('git rev-parse --verify staging', {stdio: 'ignore'});
+    } catch (e) {
+        exec('git fetch origin staging --depth=1');
+    }
+    exec('git switch staging');
+    exec(`git tag ${getVersion()}`);
+    exec('git push --tags');
+    Log.success(`Created new tag ${getVersion()}`);
+}
+
+function deployStaging() {
+    Log.info('Deploying staging...');
+    checkoutRepo();
+    bumpVersion(VersionUpdater.SEMANTIC_VERSION_LEVELS.BUILD);
+    updateStagingFromMain();
+    tagStaging();
+    Log.success(`Deployed ${getVersion()} to staging!`);
+}
+
+function deployProduction() {
+    Log.info('Checklist closed, deploying production and staging...');
+
+    Log.info('Deploying production...');
+    updateProductionFromStaging();
+    Log.success(`Deployed v${getVersion()} to production!`);
+
+    Log.info('Deploying staging...');
+    bumpVersion(VersionUpdater.SEMANTIC_VERSION_LEVELS.PATCH);
+    updateStagingFromMain();
+    tagStaging();
+    Log.success(`Deployed v${getVersion()} to staging!`);
+}
+
+async function assertPRsMergedBetween(from: string, to: string, expected: number[]) {
+    checkoutRepo();
+    const PRs = await GitUtils.getPullRequestsMergedBetween(from, to);
+    expect(PRs).toStrictEqual(expected);
+    Log.success(`Verified PRs merged between ${from} and ${to} are [${expected.join(',')}]`);
+}
+
+/*
+ * These tests are different from most jest tests. They create a dummy git repo and simulate the GitHub Actions CI environment
+ * and ensure that deploy checklists, comments, and releases are created correctly and completely,
+ * including a number of real-world edge cases we have encountered and fixed.
+ *
+ * However, because they are different, there are a few additional "rules" with these tests:
+ *   - They should not be run in parallel with other tests on the same machine. They will not play nicely with other tests.
+ *   - The whole suite should be run. Running individual tests from the suite may not work as expected.
+ */
+
+let startingDir: string;
+describe('CIGitLogic', () => {
+    beforeAll(() => {
+        Log.info('Starting setup');
+        startingDir = process.cwd();
+        initGitServer();
+        checkoutRepo();
+        Log.success('Setup complete!');
+
+        // Mock core module
+        asMutable(core).getInput = mockGetInput;
+    });
+
+    afterAll(() => {
+        fs.rmSync(DUMMY_DIR, {recursive: true, force: true});
+        fs.rmSync(path.resolve(GIT_REMOTE, '..'), {recursive: true, force: true});
+        process.chdir(startingDir);
+    });
+
+    test('Merge a pull request while the checklist is unlocked', async () => {
+        createBasicPR(1);
+        mergePR(1);
+        deployStaging();
+
+        // Verify output for checklist and deploy comment
+        await assertPRsMergedBetween('1.0.0-0', '1.0.0-1', [1]);
+    });
+
+    test("Merge a pull request with the checklist locked, but don't CP it", () => {
+        createBasicPR(2);
+        mergePR(2);
+    });
+
+    test('Merge a pull request with the checklist locked and CP it to staging', async () => {
+        createBasicPR(3);
+        cherryPickPR(3);
+
+        // Verify output for checklist
+        await assertPRsMergedBetween('1.0.0-0', '1.0.0-2', [1, 3]);
+
+        // Verify output for deploy comment
+        await assertPRsMergedBetween('1.0.0-1', '1.0.0-2', [3]);
+    });
+
+    test('Close the checklist', async () => {
+        deployProduction();
+
+        // Verify output for release body and production deploy comments
+        await assertPRsMergedBetween('1.0.0-0', '1.0.0-2', [1, 3]);
+
+        // Verify output for new checklist and staging deploy comments
+        await assertPRsMergedBetween('1.0.0-2', '1.0.1-0', [2]);
+    });
+
+    test('Merging another pull request when the checklist is unlocked', async () => {
+        createBasicPR(5);
+        mergePR(5);
+        deployStaging();
+
+        // Verify output for checklist
+        await assertPRsMergedBetween('1.0.0-2', '1.0.1-1', [2, 5]);
+
+        // Verify output for deploy comment
+        await assertPRsMergedBetween('1.0.1-0', '1.0.1-1', [5]);
+    });
+
+    test('Deploying a PR, then CPing a revert, then adding the same code back again before the next production deploy results in the correct code on staging and production', async () => {
+        Log.info('Creating myFile.txt in PR #6');
+        setupGitAsHuman();
+        exec('git switch main');
+        exec('git switch -c pr-6');
+        const initialFileContent = 'Changes from PR #6';
+        fs.appendFileSync('myFile.txt', 'Changes from PR #6');
+        exec('git add myFile.txt');
+        exec('git commit -m "Add myFile.txt in PR #6"');
+
+        mergePR(6);
+        deployStaging();
+
+        // Verify output for checklist
+        await assertPRsMergedBetween('1.0.0-2', '1.0.1-2', [2, 5, 6]);
+
+        // Verify output for deploy comment
+        await assertPRsMergedBetween('1.0.1-1', '1.0.1-2', [6]);
+
+        Log.info('Appending and prepending content to myFile.txt in PR #7');
+        setupGitAsHuman();
+        exec('git switch main');
+        exec('git switch -c pr-7');
+        const newFileContent = `
+Prepended content
+${initialFileContent}
+Appended content
+`;
+        fs.writeFileSync('myFile.txt', newFileContent, {encoding: 'utf-8'});
+        exec('git add myFile.txt');
+        exec('git commit -m "Append and prepend content in myFile.txt"');
+        mergePR(7);
+        deployStaging();
+
+        // Verify output for checklist
+        await assertPRsMergedBetween('1.0.0-2', '1.0.1-3', [2, 5, 6, 7]);
+
+        // Verify output for deploy comment
+        await assertPRsMergedBetween('1.0.1-2', '1.0.1-3', [7]);
+
+        Log.info('Making an unrelated change in PR #8');
+        setupGitAsHuman();
+        exec('git switch main');
+        exec('git switch -c pr-8');
+        fs.appendFileSync('anotherFile.txt', 'some content');
+        exec('git add anotherFile.txt');
+        exec('git commit -m "Create another file"');
+        mergePR(8);
+
+        Log.info('Reverting the append + prepend on main in PR #9');
+        setupGitAsHuman();
+        exec('git switch main');
+        exec('git switch -c pr-9');
+        console.log('RORY_DEBUG BEFORE:', fs.readFileSync('myFile.txt', {encoding: 'utf8'}));
+        fs.writeFileSync('myFile.txt', initialFileContent);
+        console.log('RORY_DEBUG AFTER:', fs.readFileSync('myFile.txt', {encoding: 'utf8'}));
+        exec('git add myFile.txt');
+        exec('git commit -m "Revert append and prepend"');
+        cherryPickPR(9);
+
+        Log.info('Verifying that the revert is present on staging, but the unrelated change is not');
+        expect(fs.readFileSync('myFile.txt', {encoding: 'utf8'})).toBe(initialFileContent);
+        expect(fs.existsSync('anotherFile.txt')).toBe(false);
+
+        Log.info('Repeating previously reverted append + prepend on main in PR #10');
+        setupGitAsHuman();
+        exec('git switch main');
+        exec('git switch -c pr-10');
+        fs.writeFileSync('myFile.txt', newFileContent, {encoding: 'utf-8'});
+        exec('git add myFile.txt');
+        exec('git commit -m "Append and prepend content in myFile.txt"');
+
+        mergePR(10);
+        deployProduction();
+
+        // Verify production release list
+        await assertPRsMergedBetween('1.0.0-2', '1.0.1-4', [2, 5, 6, 7, 9]);
+
+        // Verify PR list for the new checklist
+        await assertPRsMergedBetween('1.0.1-4', '1.0.2-0', [8, 10]);
+    });
+
+    test('Force-pushing to a branch after rebasing older commits', async () => {
+        createBasicPR(11);
+        exec('git push origin pr-11');
+        createBasicPR(12);
+        mergePR(12);
+        deployStaging();
+
+        // Verify PRs for checklist
+        await assertPRsMergedBetween('1.0.1-4', '1.0.2-1', [8, 10, 12]);
+
+        // Verify PRs for deploy comments
+        await assertPRsMergedBetween('1.0.2-0', '1.0.2-1', [12]);
+
+        checkoutRepo();
+        setupGitAsHuman();
+        exec('git fetch origin pr-11');
+        exec('git switch pr-11');
+        exec('git rebase main -Xours');
+        exec('git push --force origin pr-11');
+        mergePR(11);
+
+        deployProduction();
+
+        // Verify PRs for deploy comments / release
+        await assertPRsMergedBetween('1.0.1-4', '1.0.2-1', [8, 10, 12]);
+
+        // Verify PRs for new checklist
+        await assertPRsMergedBetween('1.0.2-1', '1.0.3-0', [11]);
+    });
+
+    test('Manual version bump', async () => {
+        Log.info('Creating manual version bump in PR #13');
+        checkoutRepo();
+        setupGitAsHuman();
+        exec('git pull');
+        exec('git switch -c "pr-13"');
+        for (let i = 0; i < 3; i++) {
+            exec(`npm --no-git-tag-version version ${VersionUpdater.incrementVersion(getVersion(), VersionUpdater.SEMANTIC_VERSION_LEVELS.MAJOR)}`);
+        }
+        exec('git add package.json');
+        exec(`git commit -m "Manually bump version to ${getVersion()} in PR #13"`);
+        Log.success('Created manual version bump in PR #13 in branch pr-13');
+
+        mergePR(13);
+        Log.info('Deploying staging...');
+        checkoutRepo();
+        updateStagingFromMain();
+        tagStaging();
+        Log.success(`Deployed v${getVersion()} to staging!`);
+
+        // Verify PRs for deploy comments / release and new checklist
+        await assertPRsMergedBetween('1.0.3-0', '4.0.0-0', [13]);
+
+        Log.info('Creating manual version bump in PR #14');
+        checkoutRepo();
+        setupGitAsHuman();
+        exec('git pull');
+        exec('git switch -c "pr-14"');
+        for (let i = 0; i < 3; i++) {
+            exec(`npm --no-git-tag-version version ${VersionUpdater.incrementVersion(getVersion(), VersionUpdater.SEMANTIC_VERSION_LEVELS.MAJOR)}`);
+        }
+        exec('git add package.json');
+        exec(`git commit -m "Manually bump version to ${getVersion()} in PR #14"`);
+        Log.success('Created manual version bump in PR #14 in branch pr-14');
+
+        const packageJSONBefore = fs.readFileSync('package.json', {encoding: 'utf-8'});
+        cherryPickPR(
+            14,
+            () => {
+                fs.writeFileSync('package.json', packageJSONBefore);
+                exec('git add package.json');
+                exec('git cherry-pick --continue');
+            },
+            () => {
+                exec('git commit --no-edit --allow-empty');
+            },
+        );
+
+        // Verify PRs for deploy comments
+        await assertPRsMergedBetween('4.0.0-0', '7.0.0-0', [14]);
+
+        // Verify PRs for the deploy checklist
+        await assertPRsMergedBetween('1.0.3-0', '7.0.0-0', [13, 14]);
+    });
+});
diff --git a/tests/unit/CardsSectionUtilsTest.ts b/tests/unit/CardsSectionUtilsTest.ts
new file mode 100644
index 000000000000..ca13045c96f7
--- /dev/null
+++ b/tests/unit/CardsSectionUtilsTest.ts
@@ -0,0 +1,238 @@
+import * as Expensicons from '@components/Icon/Expensicons';
+import * as Illustrations from '@components/Icon/Illustrations';
+import type {Phrase, PhraseParameters} from '@libs/Localize';
+import type * as SubscriptionUtils from '@libs/SubscriptionUtils';
+import {PAYMENT_STATUS} from '@libs/SubscriptionUtils';
+import type {TranslationPaths} from '@src/languages/types';
+import type {BillingStatusResult} from '@src/pages/settings/Subscription/CardSection/utils';
+import CardSectionUtils from '@src/pages/settings/Subscription/CardSection/utils';
+
+// eslint-disable-next-line @typescript-eslint/no-unused-vars -- this param is required for the mock
+function translateMock<TKey extends TranslationPaths>(key: TKey, ...phraseParameters: PhraseParameters<Phrase<TKey>>): string {
+    return key;
+}
+
+const AMOUNT_OWED = 100;
+const GRACE_PERIOD_DATE = 1750819200;
+
+const ACCOUNT_DATA = {
+    cardNumber: '1234',
+    cardMonth: 12,
+    cardYear: 2024,
+};
+
+const mockGetSubscriptionStatus = jest.fn();
+
+jest.mock('@libs/SubscriptionUtils', () => ({
+    ...jest.requireActual<typeof SubscriptionUtils>('@libs/SubscriptionUtils'),
+    getAmountOwed: () => AMOUNT_OWED,
+    getOverdueGracePeriodDate: () => GRACE_PERIOD_DATE,
+    getSubscriptionStatus: () => mockGetSubscriptionStatus() as BillingStatusResult,
+}));
+
+describe('getNextBillingDate', () => {
+    beforeAll(() => {
+        jest.useFakeTimers();
+        // Month is zero indexed, so this is July 5th 2024
+        jest.setSystemTime(new Date(2024, 6, 5));
+    });
+
+    afterAll(() => {
+        jest.useRealTimers();
+    });
+
+    it('should return the next billing date when initial date is valid', () => {
+        const expectedNextBillingDate = 'August 1, 2024';
+
+        expect(CardSectionUtils.getNextBillingDate()).toEqual(expectedNextBillingDate);
+    });
+
+    it('should handle end-of-month edge cases correctly', () => {
+        const nextBillingDate = CardSectionUtils.getNextBillingDate();
+        const expectedNextBillingDate = 'August 1, 2024';
+        expect(nextBillingDate).toBe(expectedNextBillingDate);
+    });
+
+    it('should handle date when it at the current month', () => {
+        const nextBillingDate = CardSectionUtils.getNextBillingDate();
+        const expectedNextBillingDate = 'August 1, 2024';
+        expect(nextBillingDate).toBe(expectedNextBillingDate);
+    });
+
+    it('should return the next billing date when initial date is invalid', () => {
+        const expectedNextBillingDate = 'August 1, 2024';
+
+        expect(CardSectionUtils.getNextBillingDate()).toEqual(expectedNextBillingDate);
+    });
+});
+
+describe('CardSectionUtils', () => {
+    afterEach(() => {
+        jest.restoreAllMocks();
+    });
+
+    beforeAll(() => {
+        mockGetSubscriptionStatus.mockReturnValue('');
+
+        jest.useFakeTimers();
+        // Month is zero indexed, so this is July 5th 2024
+        jest.setSystemTime(new Date(2024, 6, 5));
+    });
+
+    afterAll(() => {
+        jest.useRealTimers();
+    });
+
+    it('should return undefined by default', () => {
+        expect(CardSectionUtils.getBillingStatus(translateMock, ACCOUNT_DATA)).toBeUndefined();
+    });
+
+    it('should return POLICY_OWNER_WITH_AMOUNT_OWED variant', () => {
+        mockGetSubscriptionStatus.mockReturnValue({
+            status: PAYMENT_STATUS.POLICY_OWNER_WITH_AMOUNT_OWED,
+        });
+
+        expect(CardSectionUtils.getBillingStatus(translateMock, ACCOUNT_DATA)).toEqual({
+            title: 'subscription.billingBanner.policyOwnerAmountOwed.title',
+            subtitle: 'subscription.billingBanner.policyOwnerAmountOwed.subtitle',
+            isError: true,
+            isRetryAvailable: true,
+        });
+    });
+
+    it('should return POLICY_OWNER_WITH_AMOUNT_OWED_OVERDUE variant', () => {
+        mockGetSubscriptionStatus.mockReturnValue({
+            status: PAYMENT_STATUS.POLICY_OWNER_WITH_AMOUNT_OWED_OVERDUE,
+        });
+
+        expect(CardSectionUtils.getBillingStatus(translateMock, ACCOUNT_DATA)).toEqual({
+            title: 'subscription.billingBanner.policyOwnerAmountOwedOverdue.title',
+            subtitle: 'subscription.billingBanner.policyOwnerAmountOwedOverdue.subtitle',
+            isError: true,
+        });
+    });
+
+    it('should return OWNER_OF_POLICY_UNDER_INVOICING variant', () => {
+        mockGetSubscriptionStatus.mockReturnValue({
+            status: PAYMENT_STATUS.OWNER_OF_POLICY_UNDER_INVOICING,
+        });
+
+        expect(CardSectionUtils.getBillingStatus(translateMock, ACCOUNT_DATA)).toEqual({
+            title: 'subscription.billingBanner.policyOwnerUnderInvoicing.title',
+            subtitle: 'subscription.billingBanner.policyOwnerUnderInvoicing.subtitle',
+            isError: true,
+            isAddButtonDark: true,
+        });
+    });
+
+    it('should return OWNER_OF_POLICY_UNDER_INVOICING_OVERDUE variant', () => {
+        mockGetSubscriptionStatus.mockReturnValue({
+            status: PAYMENT_STATUS.OWNER_OF_POLICY_UNDER_INVOICING_OVERDUE,
+        });
+
+        expect(CardSectionUtils.getBillingStatus(translateMock, ACCOUNT_DATA)).toEqual({
+            title: 'subscription.billingBanner.policyOwnerUnderInvoicingOverdue.title',
+            subtitle: 'subscription.billingBanner.policyOwnerUnderInvoicingOverdue.subtitle',
+            isError: true,
+            isAddButtonDark: true,
+        });
+    });
+
+    it('should return BILLING_DISPUTE_PENDING variant', () => {
+        mockGetSubscriptionStatus.mockReturnValue({
+            status: PAYMENT_STATUS.BILLING_DISPUTE_PENDING,
+        });
+
+        expect(CardSectionUtils.getBillingStatus(translateMock, ACCOUNT_DATA)).toEqual({
+            title: 'subscription.billingBanner.billingDisputePending.title',
+            subtitle: 'subscription.billingBanner.billingDisputePending.subtitle',
+            isError: true,
+            isRetryAvailable: false,
+        });
+    });
+
+    it('should return CARD_AUTHENTICATION_REQUIRED variant', () => {
+        mockGetSubscriptionStatus.mockReturnValue({
+            status: PAYMENT_STATUS.CARD_AUTHENTICATION_REQUIRED,
+        });
+
+        expect(CardSectionUtils.getBillingStatus(translateMock, ACCOUNT_DATA)).toEqual({
+            title: 'subscription.billingBanner.cardAuthenticationRequired.title',
+            subtitle: 'subscription.billingBanner.cardAuthenticationRequired.subtitle',
+            isError: true,
+            isAuthenticationRequired: true,
+        });
+    });
+
+    it('should return INSUFFICIENT_FUNDS variant', () => {
+        mockGetSubscriptionStatus.mockReturnValue({
+            status: PAYMENT_STATUS.INSUFFICIENT_FUNDS,
+        });
+
+        expect(CardSectionUtils.getBillingStatus(translateMock, ACCOUNT_DATA)).toEqual({
+            title: 'subscription.billingBanner.insufficientFunds.title',
+            subtitle: 'subscription.billingBanner.insufficientFunds.subtitle',
+            isError: true,
+            isRetryAvailable: true,
+        });
+    });
+
+    it('should return CARD_EXPIRED variant with correct isRetryAvailableStatus for expired and unexpired card', () => {
+        mockGetSubscriptionStatus.mockReturnValue({
+            status: PAYMENT_STATUS.CARD_EXPIRED,
+        });
+
+        expect(CardSectionUtils.getBillingStatus(translateMock, {...ACCOUNT_DATA, cardYear: 2023})).toEqual({
+            title: 'subscription.billingBanner.cardExpired.title',
+            subtitle: 'subscription.billingBanner.cardExpired.subtitle',
+            isError: true,
+            isRetryAvailable: false,
+        });
+
+        expect(CardSectionUtils.getBillingStatus(translateMock, ACCOUNT_DATA)).toEqual({
+            title: 'subscription.billingBanner.cardExpired.title',
+            subtitle: 'subscription.billingBanner.cardExpired.subtitle',
+            isError: true,
+            isRetryAvailable: true,
+        });
+    });
+
+    it('should return CARD_EXPIRE_SOON variant', () => {
+        mockGetSubscriptionStatus.mockReturnValue({
+            status: PAYMENT_STATUS.CARD_EXPIRE_SOON,
+        });
+
+        expect(CardSectionUtils.getBillingStatus(translateMock, ACCOUNT_DATA)).toEqual({
+            title: 'subscription.billingBanner.cardExpireSoon.title',
+            subtitle: 'subscription.billingBanner.cardExpireSoon.subtitle',
+            isError: false,
+            icon: Illustrations.CreditCardEyes,
+        });
+    });
+
+    it('should return RETRY_BILLING_SUCCESS variant', () => {
+        mockGetSubscriptionStatus.mockReturnValue({
+            status: PAYMENT_STATUS.RETRY_BILLING_SUCCESS,
+        });
+
+        expect(CardSectionUtils.getBillingStatus(translateMock, ACCOUNT_DATA)).toEqual({
+            title: 'subscription.billingBanner.retryBillingSuccess.title',
+            subtitle: 'subscription.billingBanner.retryBillingSuccess.subtitle',
+            isError: false,
+            rightIcon: Expensicons.Close,
+        });
+    });
+
+    it('should return RETRY_BILLING_ERROR variant', () => {
+        mockGetSubscriptionStatus.mockReturnValue({
+            status: PAYMENT_STATUS.RETRY_BILLING_ERROR,
+        });
+
+        expect(CardSectionUtils.getBillingStatus(translateMock, ACCOUNT_DATA)).toEqual({
+            title: 'subscription.billingBanner.retryBillingError.title',
+            subtitle: 'subscription.billingBanner.retryBillingError.subtitle',
+            isError: true,
+            isRetryAvailable: false,
+        });
+    });
+});
diff --git a/tests/unit/CurrencyUtilsTest.ts b/tests/unit/CurrencyUtilsTest.ts
index a1e4b03fa715..9a86c9188d42 100644
--- a/tests/unit/CurrencyUtilsTest.ts
+++ b/tests/unit/CurrencyUtilsTest.ts
@@ -105,15 +105,42 @@ describe('CurrencyUtils', () => {
         });
     });
 
-    describe('convertToFrontendAmount', () => {
+    describe('convertToFrontendAmountAsInteger', () => {
         test.each([
-            [2500, 25],
-            [2550, 25.5],
-            [25, 0.25],
-            [2500, 25],
-            [2500.5, 25], // The backend should never send a decimal .5 value
-        ])('Correctly converts %s to amount in units handled in frontend', (amount, expectedResult) => {
-            expect(CurrencyUtils.convertToFrontendAmount(amount)).toBe(expectedResult);
+            [2500, 25, 'USD'],
+            [2550, 25.5, 'USD'],
+            [25, 0.25, 'USD'],
+            [2500, 25, 'USD'],
+            [2500.5, 25, 'USD'], // The backend should never send a decimal .5 value
+            [2500, 25, 'VND'],
+            [2550, 26, 'VND'],
+            [25, 0, 'VND'],
+            [2586, 26, 'VND'],
+            [2500.5, 25, 'VND'], // The backend should never send a decimal .5 value
+        ])('Correctly converts %s to amount in units handled in frontend as an integer', (amount, expectedResult, currency) => {
+            expect(CurrencyUtils.convertToFrontendAmountAsInteger(amount, currency)).toBe(expectedResult);
+        });
+    });
+
+    describe('convertToFrontendAmountAsString', () => {
+        test.each([
+            [2500, '25.00', 'USD'],
+            [2550, '25.50', 'USD'],
+            [25, '0.25', 'USD'],
+            [2500.5, '25.00', 'USD'],
+            [null, '', 'USD'],
+            [undefined, '', 'USD'],
+            [0, '0.00', 'USD'],
+            [2500, '25', 'VND'],
+            [2550, '26', 'VND'],
+            [25, '0', 'VND'],
+            [2500.5, '25', 'VND'],
+            [null, '', 'VND'],
+            [undefined, '', 'VND'],
+            [0, '0', 'VND'],
+            [2586, '26', 'VND'],
+        ])('Correctly converts %s to amount in units handled in frontend as a string', (input, expectedResult, currency) => {
+            expect(CurrencyUtils.convertToFrontendAmountAsString(input, currency ?? CONST.CURRENCY.USD)).toBe(expectedResult);
         });
     });
 
@@ -128,8 +155,8 @@ describe('CurrencyUtils', () => {
             ['JPY', 2500.5, '¥25'],
             ['RSD', 100, 'RSD\xa01.00'],
             ['RSD', 145, 'RSD\xa01.45'],
-            ['BHD', 12345, 'BHD\xa0123.450'],
-            ['BHD', 1, 'BHD\xa00.010'],
+            ['BHD', 12345, 'BHD\xa0123.45'],
+            ['BHD', 1, 'BHD\xa00.01'],
         ])('Correctly displays %s', (currency, amount, expectedResult) => {
             expect(CurrencyUtils.convertToDisplayString(amount, currency)).toBe(expectedResult);
         });
@@ -143,4 +170,31 @@ describe('CurrencyUtils', () => {
             Onyx.set(ONYXKEYS.NVP_PREFERRED_LOCALE, CONST.LOCALES.ES).then(() => expect(CurrencyUtils.convertToDisplayString(amount, currency)).toBe(expectedResult)),
         );
     });
+
+    describe('convertToShortDisplayString', () => {
+        test.each([
+            [CONST.CURRENCY.USD, 25, '$0'],
+            [CONST.CURRENCY.USD, 2500, '$25'],
+            [CONST.CURRENCY.USD, 150, '$2'],
+            [CONST.CURRENCY.USD, 250000, '$2,500'],
+            ['JPY', 2500, '¥25'],
+            ['JPY', 250000, '¥2,500'],
+            ['JPY', 2500.5, '¥25'],
+            ['RSD', 100, 'RSD\xa01'],
+            ['RSD', 145, 'RSD\xa01'],
+            ['BHD', 12345, 'BHD\xa0123'],
+            ['BHD', 1, 'BHD\xa00'],
+        ])('Correctly displays %s', (currency, amount, expectedResult) => {
+            expect(CurrencyUtils.convertToShortDisplayString(amount, currency)).toBe(expectedResult);
+        });
+
+        test.each([
+            ['EUR', 25, '0\xa0€'],
+            ['EUR', 2500, '25\xa0€'],
+            ['EUR', 250000, '2500\xa0€'],
+            ['EUR', 250000000, '2.500.000\xa0€'],
+        ])('Correctly displays %s in ES locale', (currency, amount, expectedResult) =>
+            Onyx.set(ONYXKEYS.NVP_PREFERRED_LOCALE, CONST.LOCALES.ES).then(() => expect(CurrencyUtils.convertToShortDisplayString(amount, currency)).toBe(expectedResult)),
+        );
+    });
 });
diff --git a/tests/unit/DateUtilsTest.ts b/tests/unit/DateUtilsTest.ts
index 9df0113168e4..f3abed2e3372 100644
--- a/tests/unit/DateUtilsTest.ts
+++ b/tests/unit/DateUtilsTest.ts
@@ -265,4 +265,18 @@ describe('DateUtils', () => {
             expect(lastBusinessDay).toEqual(expectedResult);
         });
     });
+
+    describe('isCardExpired', () => {
+        it('should return true when the card is expired', () => {
+            const cardMonth = 1;
+            const cardYear = new Date().getFullYear() - 1;
+            expect(DateUtils.isCardExpired(cardMonth, cardYear)).toBe(true);
+        });
+
+        it('should return false when the card is not expired', () => {
+            const cardMonth = 1;
+            const cardYear = new Date().getFullYear() + 1;
+            expect(DateUtils.isCardExpired(cardMonth, cardYear)).toBe(false);
+        });
+    });
 });
diff --git a/tests/unit/E2EMarkdownTest.ts b/tests/unit/E2EMarkdownTest.ts
new file mode 100644
index 000000000000..74c5659c9487
--- /dev/null
+++ b/tests/unit/E2EMarkdownTest.ts
@@ -0,0 +1,18 @@
+import {compareResults} from '../e2e/compare/compare';
+import {buildMarkdown} from '../e2e/compare/output/markdown';
+
+const results = {
+    main: {
+        commentLinking: [100.5145680010319, 121.8861090019345, 112.0048420019448, 124.26110899820924, 135.1571460030973, 140.33837900310755, 160.7034499980509, 158.5825610011816],
+    },
+    delta: {
+        commentLinking: [361.5145680010319, 402.8861090019345, 412.0048420019448, 414.26110899820924, 425.1571460030973, 440.33837900310755, 458.7034499980509, 459.5825610011816],
+    },
+};
+
+describe('markdown formatter', () => {
+    it('should format significant changes properly', () => {
+        const data = compareResults(results.main, results.delta, {commentLinking: 'ms'});
+        expect(buildMarkdown(data)).toMatchSnapshot();
+    });
+});
diff --git a/tests/unit/EmojiTest.ts b/tests/unit/EmojiTest.ts
index 954d561598e8..6af24553bee9 100644
--- a/tests/unit/EmojiTest.ts
+++ b/tests/unit/EmojiTest.ts
@@ -1,16 +1,16 @@
-import {getUnixTime} from 'date-fns';
-import Onyx from 'react-native-onyx';
-import Emojis from '@assets/emojis';
+import Emojis, {importEmojiLocale} from '@assets/emojis';
 import type {Emoji} from '@assets/emojis/types';
-import * as User from '@libs/actions/User';
+import {buildEmojisTrie} from '@libs/EmojiTrie';
 import * as EmojiUtils from '@libs/EmojiUtils';
-import CONST from '@src/CONST';
-import ONYXKEYS from '@src/ONYXKEYS';
-import type {FrequentlyUsedEmoji} from '@src/types/onyx';
-import * as TestHelper from '../utils/TestHelper';
-import waitForBatchedUpdates from '../utils/waitForBatchedUpdates';
 
 describe('EmojiTest', () => {
+    beforeAll(async () => {
+        await importEmojiLocale('en');
+        buildEmojisTrie('en');
+        await importEmojiLocale('es');
+        buildEmojisTrie('es');
+    });
+
     it('matches all the emojis in the list', () => {
         // Given the set of Emojis available in the application
         const emojiMatched = Emojis.every((emoji) => {
@@ -153,7 +153,30 @@ describe('EmojiTest', () => {
     });
 
     it('correct suggests emojis accounting for keywords', () => {
-        const thumbEmojis: Emoji[] = [
+        const thumbEmojisEn: Emoji[] = [
+            {
+                name: 'hand_with_index_finger_and_thumb_crossed',
+                code: '🫰',
+                types: ['🫰🏿', '🫰🏾', '🫰🏽', '🫰🏼', '🫰🏻'],
+            },
+            {
+                code: '👍',
+                name: '+1',
+                types: ['👍🏿', '👍🏾', '👍🏽', '👍🏼', '👍🏻'],
+            },
+            {
+                code: '👎',
+                name: '-1',
+                types: ['👎🏿', '👎🏾', '👎🏽', '👎🏼', '👎🏻'],
+            },
+        ];
+
+        const thumbEmojisEs: Emoji[] = [
+            {
+                name: 'mano_con_dedos_cruzados',
+                code: '🫰',
+                types: ['🫰🏿', '🫰🏾', '🫰🏽', '🫰🏼', '🫰🏻'],
+            },
             {
                 code: '👍',
                 name: '+1',
@@ -166,11 +189,16 @@ describe('EmojiTest', () => {
             },
         ];
 
-        expect(EmojiUtils.suggestEmojis(':thumb', 'en')).toEqual(thumbEmojis);
+        expect(EmojiUtils.suggestEmojis(':thumb', 'en')).toEqual(thumbEmojisEn);
 
-        expect(EmojiUtils.suggestEmojis(':thumb', 'es')).toEqual(thumbEmojis);
+        expect(EmojiUtils.suggestEmojis(':thumb', 'es')).toEqual(thumbEmojisEs);
 
         expect(EmojiUtils.suggestEmojis(':pulgar', 'es')).toEqual([
+            {
+                name: 'mano_con_dedos_cruzados',
+                code: '🫰',
+                types: ['🫰🏿', '🫰🏾', '🫰🏽', '🫰🏼', '🫰🏻'],
+            },
             {
                 code: '🤙',
                 name: 'mano_llámame',
@@ -188,328 +216,4 @@ describe('EmojiTest', () => {
             },
         ]);
     });
-
-    describe('update frequently used emojis', () => {
-        let spy: jest.SpyInstance;
-
-        beforeAll(() => {
-            Onyx.init({keys: ONYXKEYS});
-            // @ts-expect-error TODO: Remove this once TestHelper (https://github.com/Expensify/App/issues/25318) is migrated to TypeScript.
-            global.fetch = TestHelper.getGlobalFetchMock();
-            spy = jest.spyOn(User, 'updateFrequentlyUsedEmojis');
-        });
-
-        beforeEach(() => {
-            spy.mockClear();
-            return Onyx.clear();
-        });
-
-        it('should put a less frequent and recent used emoji behind', () => {
-            // Given an existing frequently used emojis list with count > 1
-            const frequentlyEmojisList: FrequentlyUsedEmoji[] = [
-                {
-                    code: '👋',
-                    name: 'wave',
-                    count: 2,
-                    lastUpdatedAt: 4,
-                    types: ['👋🏿', '👋🏾', '👋🏽', '👋🏼', '👋🏻'],
-                },
-                {
-                    code: '💤',
-                    name: 'zzz',
-                    count: 2,
-                    lastUpdatedAt: 3,
-                },
-                {
-                    code: '💯',
-                    name: '100',
-                    count: 2,
-                    lastUpdatedAt: 2,
-                },
-                {
-                    code: '👿',
-                    name: 'imp',
-                    count: 2,
-                    lastUpdatedAt: 1,
-                },
-            ];
-            Onyx.merge(ONYXKEYS.FREQUENTLY_USED_EMOJIS, frequentlyEmojisList);
-
-            return waitForBatchedUpdates().then(() => {
-                // When add a new emoji
-                const currentTime = getUnixTime(new Date());
-                const smileEmoji: Emoji = {code: '😄', name: 'smile'};
-                const newEmoji = [smileEmoji];
-                User.updateFrequentlyUsedEmojis(EmojiUtils.getFrequentlyUsedEmojis(newEmoji));
-
-                // Then the new emoji should be at the last item of the list
-                const expectedSmileEmoji: FrequentlyUsedEmoji = {...smileEmoji, count: 1, lastUpdatedAt: currentTime};
-
-                const expectedFrequentlyEmojisList = [...frequentlyEmojisList, expectedSmileEmoji];
-                expect(spy).toBeCalledWith(expectedFrequentlyEmojisList);
-            });
-        });
-
-        it('should put more frequent and recent used emoji to the front', () => {
-            // Given an existing frequently used emojis list
-            const smileEmoji: Emoji = {code: '😄', name: 'smile'};
-            const frequentlyEmojisList: FrequentlyUsedEmoji[] = [
-                {
-                    code: '😠',
-                    name: 'angry',
-                    count: 3,
-                    lastUpdatedAt: 5,
-                },
-                {
-                    code: '👋',
-                    name: 'wave',
-                    count: 2,
-                    lastUpdatedAt: 4,
-                    types: ['👋🏿', '👋🏾', '👋🏽', '👋🏼', '👋🏻'],
-                },
-                {
-                    code: '💤',
-                    name: 'zzz',
-                    count: 2,
-                    lastUpdatedAt: 3,
-                },
-                {
-                    code: '💯',
-                    name: '100',
-                    count: 1,
-                    lastUpdatedAt: 2,
-                },
-                {...smileEmoji, count: 1, lastUpdatedAt: 1},
-            ];
-            Onyx.merge(ONYXKEYS.FREQUENTLY_USED_EMOJIS, frequentlyEmojisList);
-
-            return waitForBatchedUpdates().then(() => {
-                // When add an emoji that exists in the list
-                const currentTime = getUnixTime(new Date());
-                const newEmoji = [smileEmoji];
-                User.updateFrequentlyUsedEmojis(EmojiUtils.getFrequentlyUsedEmojis(newEmoji));
-
-                // Then the count should be increased and put into the very front of the other emoji within the same count
-                const expectedFrequentlyEmojisList = [frequentlyEmojisList[0], {...smileEmoji, count: 2, lastUpdatedAt: currentTime}, ...frequentlyEmojisList.slice(1, -1)];
-                expect(spy).toBeCalledWith(expectedFrequentlyEmojisList);
-            });
-        });
-
-        it('should sorted descending by count and lastUpdatedAt for multiple emoji added', () => {
-            // Given an existing frequently used emojis list
-            const smileEmoji: Emoji = {code: '😄', name: 'smile'};
-            const zzzEmoji: Emoji = {code: '💤', name: 'zzz'};
-            const impEmoji: Emoji = {code: '👿', name: 'imp'};
-            const frequentlyEmojisList: FrequentlyUsedEmoji[] = [
-                {
-                    code: '😠',
-                    name: 'angry',
-                    count: 3,
-                    lastUpdatedAt: 5,
-                },
-                {
-                    code: '👋',
-                    name: 'wave',
-                    count: 2,
-                    lastUpdatedAt: 4,
-                    types: ['👋🏿', '👋🏾', '👋🏽', '👋🏼', '👋🏻'],
-                },
-                {...zzzEmoji, count: 2, lastUpdatedAt: 3},
-                {
-                    code: '💯',
-                    name: '100',
-                    count: 1,
-                    lastUpdatedAt: 2,
-                },
-                {...smileEmoji, count: 1, lastUpdatedAt: 1},
-            ];
-            Onyx.merge(ONYXKEYS.FREQUENTLY_USED_EMOJIS, frequentlyEmojisList);
-
-            return waitForBatchedUpdates().then(() => {
-                // When add multiple emojis that either exist or not exist in the list
-                const currentTime = getUnixTime(new Date());
-                const newEmoji = [smileEmoji, zzzEmoji, impEmoji];
-                User.updateFrequentlyUsedEmojis(EmojiUtils.getFrequentlyUsedEmojis(newEmoji));
-
-                // Then the count should be increased for existing emoji and sorted descending by count and lastUpdatedAt
-                const expectedFrequentlyEmojisList = [
-                    {...zzzEmoji, count: 3, lastUpdatedAt: currentTime},
-                    frequentlyEmojisList[0],
-                    {...smileEmoji, count: 2, lastUpdatedAt: currentTime},
-                    frequentlyEmojisList[1],
-                    {...impEmoji, count: 1, lastUpdatedAt: currentTime},
-                    frequentlyEmojisList[3],
-                ];
-                expect(spy).toBeCalledWith(expectedFrequentlyEmojisList);
-            });
-        });
-
-        it('make sure the most recent new emoji is added to the list even it is full with count > 1', () => {
-            // Given an existing full (24 items) frequently used emojis list
-            const smileEmoji: Emoji = {code: '😄', name: 'smile'};
-            const zzzEmoji: Emoji = {code: '💤', name: 'zzz'};
-            const impEmoji: Emoji = {code: '👿', name: 'imp'};
-            const bookEmoji: Emoji = {code: '📚', name: 'books'};
-            const frequentlyEmojisList: FrequentlyUsedEmoji[] = [
-                {
-                    code: '😠',
-                    name: 'angry',
-                    count: 3,
-                    lastUpdatedAt: 24,
-                },
-                {
-                    code: '👋',
-                    name: 'wave',
-                    count: 3,
-                    lastUpdatedAt: 23,
-                    types: ['👋🏿', '👋🏾', '👋🏽', '👋🏼', '👋🏻'],
-                },
-                {
-                    code: '😡',
-                    name: 'rage',
-                    count: 3,
-                    lastUpdatedAt: 22,
-                },
-                {
-                    code: '😤',
-                    name: 'triumph',
-                    count: 3,
-                    lastUpdatedAt: 21,
-                },
-                {
-                    code: '🥱',
-                    name: 'yawning_face',
-                    count: 3,
-                    lastUpdatedAt: 20,
-                },
-                {
-                    code: '😫',
-                    name: 'tired_face',
-                    count: 3,
-                    lastUpdatedAt: 19,
-                },
-                {
-                    code: '😩',
-                    name: 'weary',
-                    count: 3,
-                    lastUpdatedAt: 18,
-                },
-                {
-                    code: '😓',
-                    name: 'sweat',
-                    count: 3,
-                    lastUpdatedAt: 17,
-                },
-                {
-                    code: '😞',
-                    name: 'disappointed',
-                    count: 3,
-                    lastUpdatedAt: 16,
-                },
-                {
-                    code: '😣',
-                    name: 'persevere',
-                    count: 3,
-                    lastUpdatedAt: 15,
-                },
-                {
-                    code: '😖',
-                    name: 'confounded',
-                    count: 3,
-                    lastUpdatedAt: 14,
-                },
-                {
-                    code: '👶',
-                    name: 'baby',
-                    count: 3,
-                    lastUpdatedAt: 13,
-                    types: ['👶🏿', '👶🏾', '👶🏽', '👶🏼', '👶🏻'],
-                },
-                {
-                    code: '👄',
-                    name: 'lips',
-                    count: 3,
-                    lastUpdatedAt: 12,
-                },
-                {
-                    code: '🐶',
-                    name: 'dog',
-                    count: 3,
-                    lastUpdatedAt: 11,
-                },
-                {
-                    code: '🦮',
-                    name: 'guide_dog',
-                    count: 3,
-                    lastUpdatedAt: 10,
-                },
-                {
-                    code: '🐱',
-                    name: 'cat',
-                    count: 3,
-                    lastUpdatedAt: 9,
-                },
-                {
-                    code: '🐈‍⬛',
-                    name: 'black_cat',
-                    count: 3,
-                    lastUpdatedAt: 8,
-                },
-                {
-                    code: '🕞',
-                    name: 'clock330',
-                    count: 3,
-                    lastUpdatedAt: 7,
-                },
-                {
-                    code: '🥎',
-                    name: 'softball',
-                    count: 3,
-                    lastUpdatedAt: 6,
-                },
-                {
-                    code: '🏀',
-                    name: 'basketball',
-                    count: 3,
-                    lastUpdatedAt: 5,
-                },
-                {
-                    code: '📟',
-                    name: 'pager',
-                    count: 3,
-                    lastUpdatedAt: 4,
-                },
-                {
-                    code: '🎬',
-                    name: 'clapper',
-                    count: 3,
-                    lastUpdatedAt: 3,
-                },
-                {
-                    code: '📺',
-                    name: 'tv',
-                    count: 3,
-                    lastUpdatedAt: 2,
-                },
-                {...bookEmoji, count: 3, lastUpdatedAt: 1},
-            ];
-            expect(frequentlyEmojisList.length).toBe(CONST.EMOJI_FREQUENT_ROW_COUNT * CONST.EMOJI_NUM_PER_ROW);
-            Onyx.merge(ONYXKEYS.FREQUENTLY_USED_EMOJIS, frequentlyEmojisList);
-
-            return waitForBatchedUpdates().then(() => {
-                // When add new emojis
-                const currentTime = getUnixTime(new Date());
-                const newEmoji = [bookEmoji, smileEmoji, zzzEmoji, impEmoji, smileEmoji];
-                User.updateFrequentlyUsedEmojis(EmojiUtils.getFrequentlyUsedEmojis(newEmoji));
-
-                // Then the last emojis from the list should be replaced with the most recent new emoji (smile)
-                const expectedFrequentlyEmojisList = [
-                    {...bookEmoji, count: 4, lastUpdatedAt: currentTime},
-                    ...frequentlyEmojisList.slice(0, -2),
-                    {...smileEmoji, count: 1, lastUpdatedAt: currentTime},
-                ];
-                expect(spy).toBeCalledWith(expectedFrequentlyEmojisList);
-            });
-        });
-    });
 });
diff --git a/tests/unit/ErrorUtilsTest.ts b/tests/unit/ErrorUtilsTest.ts
index 9168c1ca12a5..f5517c56156a 100644
--- a/tests/unit/ErrorUtilsTest.ts
+++ b/tests/unit/ErrorUtilsTest.ts
@@ -6,21 +6,21 @@ describe('ErrorUtils', () => {
         const errors: Errors = {};
         ErrorUtils.addErrorMessage(errors, 'username', 'Username cannot be empty');
 
-        expect(errors).toEqual({username: ['Username cannot be empty', {isTranslated: true}]});
+        expect(errors).toEqual({username: 'Username cannot be empty'});
     });
 
     test('should append an error message to an existing error message for a given inputID', () => {
         const errors: Errors = {username: 'Username cannot be empty'};
         ErrorUtils.addErrorMessage(errors, 'username', 'Username must be at least 6 characters long');
 
-        expect(errors).toEqual({username: ['Username cannot be empty\nUsername must be at least 6 characters long', {isTranslated: true}]});
+        expect(errors).toEqual({username: 'Username cannot be empty\nUsername must be at least 6 characters long'});
     });
 
     test('should add an error to input which does not contain any errors yet', () => {
         const errors: Errors = {username: 'Username cannot be empty'};
         ErrorUtils.addErrorMessage(errors, 'password', 'Password cannot be empty');
 
-        expect(errors).toEqual({username: 'Username cannot be empty', password: ['Password cannot be empty', {isTranslated: true}]});
+        expect(errors).toEqual({username: 'Username cannot be empty', password: 'Password cannot be empty'});
     });
 
     test('should not mutate the errors object when message is empty', () => {
@@ -50,7 +50,7 @@ describe('ErrorUtils', () => {
         ErrorUtils.addErrorMessage(errors, 'username', 'Username must be at least 6 characters long');
         ErrorUtils.addErrorMessage(errors, 'username', 'Username must contain at least one letter');
 
-        expect(errors).toEqual({username: ['Username cannot be empty\nUsername must be at least 6 characters long\nUsername must contain at least one letter', {isTranslated: true}]});
+        expect(errors).toEqual({username: 'Username cannot be empty\nUsername must be at least 6 characters long\nUsername must contain at least one letter'});
     });
 
     test('should append multiple error messages to an existing error message for the same inputID', () => {
@@ -59,10 +59,7 @@ describe('ErrorUtils', () => {
         ErrorUtils.addErrorMessage(errors, 'username', 'Username must not contain special characters');
 
         expect(errors).toEqual({
-            username: [
-                'Username cannot be empty\nUsername must be at least 6 characters long\nUsername must contain at least one letter\nUsername must not contain special characters',
-                {isTranslated: true},
-            ],
+            username: 'Username cannot be empty\nUsername must be at least 6 characters long\nUsername must contain at least one letter\nUsername must not contain special characters',
         });
     });
 });
diff --git a/tests/unit/GithubUtilsTest.ts b/tests/unit/GithubUtilsTest.ts
index 0ff25d16d06c..2bab87550357 100644
--- a/tests/unit/GithubUtilsTest.ts
+++ b/tests/unit/GithubUtilsTest.ts
@@ -34,6 +34,8 @@ type ObjectMethodData<T> = {
     data: T;
 };
 
+type OctokitCreateIssue = InternalOctokit['rest']['issues']['create'];
+
 const asMutable = <T>(value: T): Writable<T> => value as Writable<T>;
 
 beforeAll(() => {
@@ -44,7 +46,7 @@ beforeAll(() => {
     const moctokit = {
         rest: {
             issues: {
-                create: jest.fn().mockImplementation((arg) =>
+                create: jest.fn().mockImplementation((arg: Parameters<OctokitCreateIssue>[0]) =>
                     Promise.resolve({
                         data: {
                             ...arg,
@@ -619,13 +621,4 @@ describe('GithubUtils', () => {
             [54321, 'https://github.com/Expensify/App/pull/54321'],
         ])('getPullRequestNumberFromURL("%s")', (input, expectedOutput) => expect(GithubUtils.getPullRequestURLFromNumber(input)).toBe(expectedOutput));
     });
-
-    describe('getReleaseBody', () => {
-        test.each([
-            // eslint-disable-next-line max-len
-            [[1, 2, 3], '- https://github.com/Expensify/App/pull/1\r\n- https://github.com/Expensify/App/pull/2\r\n- https://github.com/Expensify/App/pull/3'],
-            [[], ''],
-            [[12345], '- https://github.com/Expensify/App/pull/12345'],
-        ])('getReleaseBody("%s")', (input, expectedOutput) => expect(GithubUtils.getReleaseBody(input)).toBe(expectedOutput));
-    });
 });
diff --git a/tests/unit/IOUUtilsTest.ts b/tests/unit/IOUUtilsTest.ts
index b8640e4ecdf1..04a5b3babd5e 100644
--- a/tests/unit/IOUUtilsTest.ts
+++ b/tests/unit/IOUUtilsTest.ts
@@ -114,6 +114,24 @@ describe('IOUUtils', () => {
             expect(IOUUtils.calculateAmount(participantsAccountIDs.length, 100, 'BHD')).toBe(33);
         });
     });
+
+    describe('insertTagIntoTransactionTagsString', () => {
+        test('Inserting a tag into tag string should update the tag', () => {
+            expect(IOUUtils.insertTagIntoTransactionTagsString(':NY:Texas', 'California', 2)).toBe(':NY:California');
+        });
+
+        test('Inserting a tag into an index with no tags should update the tag', () => {
+            expect(IOUUtils.insertTagIntoTransactionTagsString('::California', 'NY', 1)).toBe(':NY:California');
+        });
+
+        test('Inserting a tag with colon in name into tag string should keep the colon in tag', () => {
+            expect(IOUUtils.insertTagIntoTransactionTagsString('East:NY:California', 'City \\: \\:', 1)).toBe('East:City \\: \\::California');
+        });
+
+        test('Remove a tag from tagString', () => {
+            expect(IOUUtils.insertTagIntoTransactionTagsString('East:City \\: \\::California', '', 1)).toBe('East::California');
+        });
+    });
 });
 
 describe('isValidMoneyRequestType', () => {
diff --git a/tests/unit/MiddlewareTest.ts b/tests/unit/MiddlewareTest.ts
index 78a54461ae20..be13ded01342 100644
--- a/tests/unit/MiddlewareTest.ts
+++ b/tests/unit/MiddlewareTest.ts
@@ -9,12 +9,13 @@ import ONYXKEYS from '@src/ONYXKEYS';
 import * as TestHelper from '../utils/TestHelper';
 import waitForNetworkPromises from '../utils/waitForNetworkPromises';
 
+type FormDataObject = {body: TestHelper.FormData};
+
 Onyx.init({
     keys: ONYXKEYS,
 });
 
 beforeAll(() => {
-    // @ts-expect-error TODO: Remove this once TestHelper (https://github.com/Expensify/App/issues/25318) is migrated to TypeScript.
     global.fetch = TestHelper.getGlobalFetchMock();
 });
 
@@ -50,9 +51,14 @@ describe('Middleware', () => {
 
             expect(global.fetch).toHaveBeenCalledTimes(2);
             expect(global.fetch).toHaveBeenLastCalledWith('https://www.expensify.com.dev/api/AddComment?', expect.anything());
-            TestHelper.assertFormDataMatchesObject((global.fetch as jest.Mock).mock.calls[1][1].body, {reportID: '1234', reportActionID: '5678'});
+            TestHelper.assertFormDataMatchesObject(((global.fetch as jest.Mock).mock.calls[1] as FormDataObject[])[1].body, {
+                reportID: '1234',
+                reportActionID: '5678',
+            });
             expect(global.fetch).toHaveBeenNthCalledWith(1, 'https://www.expensify.com.dev/api/OpenReport?', expect.anything());
-            TestHelper.assertFormDataMatchesObject((global.fetch as jest.Mock).mock.calls[0][1].body, {reportID: '1234'});
+            TestHelper.assertFormDataMatchesObject(((global.fetch as jest.Mock).mock.calls[0] as FormDataObject[])[1].body, {
+                reportID: '1234',
+            });
         });
 
         test('Request with preexistingReportID', async () => {
@@ -94,9 +100,12 @@ describe('Middleware', () => {
 
             expect(global.fetch).toHaveBeenCalledTimes(2);
             expect(global.fetch).toHaveBeenLastCalledWith('https://www.expensify.com.dev/api/AddComment?', expect.anything());
-            TestHelper.assertFormDataMatchesObject((global.fetch as jest.Mock).mock.calls[1][1].body, {reportID: '5555', reportActionID: '5678'});
+            TestHelper.assertFormDataMatchesObject(((global.fetch as jest.Mock).mock.calls[1] as FormDataObject[])[1].body, {
+                reportID: '5555',
+                reportActionID: '5678',
+            });
             expect(global.fetch).toHaveBeenNthCalledWith(1, 'https://www.expensify.com.dev/api/OpenReport?', expect.anything());
-            TestHelper.assertFormDataMatchesObject((global.fetch as jest.Mock).mock.calls[0][1].body, {reportID: '1234'});
+            TestHelper.assertFormDataMatchesObject(((global.fetch as jest.Mock).mock.calls[0] as FormDataObject[])[1].body, {reportID: '1234'});
         });
     });
 });
diff --git a/tests/unit/MigrationTest.ts b/tests/unit/MigrationTest.ts
index 69e0e80e589a..f184d2c40e2e 100644
--- a/tests/unit/MigrationTest.ts
+++ b/tests/unit/MigrationTest.ts
@@ -1,13 +1,11 @@
 /* eslint-disable @typescript-eslint/naming-convention */
 import Onyx from 'react-native-onyx';
-import CONST from '@src/CONST';
+import type {OnyxInputValue} from 'react-native-onyx';
 import Log from '@src/libs/Log';
-import CheckForPreviousReportActionID from '@src/libs/migrations/CheckForPreviousReportActionID';
 import KeyReportActionsDraftByReportActionID from '@src/libs/migrations/KeyReportActionsDraftByReportActionID';
 import ONYXKEYS from '@src/ONYXKEYS';
+import type * as OnyxTypes from '@src/types/onyx';
 import type {ReportActionsDraftCollectionDataSet} from '@src/types/onyx/ReportActionsDrafts';
-import {toCollectionDataSet} from '@src/types/utils/CollectionDataSet';
-import type CollectionDataSet from '@src/types/utils/CollectionDataSet';
 import waitForBatchedUpdates from '../utils/waitForBatchedUpdates';
 
 jest.mock('@src/libs/getPlatform');
@@ -28,229 +26,6 @@ describe('Migrations', () => {
         return waitForBatchedUpdates();
     });
 
-    describe('CheckForPreviousReportActionID', () => {
-        it("Should work even if there's no reportAction data in Onyx", () =>
-            CheckForPreviousReportActionID().then(() =>
-                expect(LogSpy).toHaveBeenCalledWith('[Migrate Onyx] Skipped migration CheckForPreviousReportActionID because there were no reportActions'),
-            ));
-
-        it('Should remove all report actions given that a previousReportActionID does not exist', () => {
-            const reportActionsCollectionDataSet = toCollectionDataSet(
-                ONYXKEYS.COLLECTION.REPORT_ACTIONS,
-                [
-                    {
-                        1: {
-                            reportActionID: '1',
-                            created: '',
-                            actionName: CONST.REPORT.ACTIONS.TYPE.MARKED_REIMBURSED,
-                            reportID: '1',
-                        },
-                        2: {reportActionID: '2', created: '', actionName: CONST.REPORT.ACTIONS.TYPE.MARKED_REIMBURSED, reportID: '1'},
-                    },
-                ],
-                (item) => item[1].reportID ?? '',
-            );
-
-            return Onyx.multiSet(reportActionsCollectionDataSet)
-                .then(CheckForPreviousReportActionID)
-                .then(() => {
-                    expect(LogSpy).toHaveBeenCalledWith(
-                        '[Migrate Onyx] CheckForPreviousReportActionID Migration: removing all reportActions because previousReportActionID not found in the first valid reportAction',
-                    );
-                    const connectionID = Onyx.connect({
-                        key: ONYXKEYS.COLLECTION.REPORT_ACTIONS,
-                        waitForCollectionCallback: true,
-                        callback: (allReportActions) => {
-                            Onyx.disconnect(connectionID);
-                            const expectedReportAction = {};
-                            expect(allReportActions?.[`${ONYXKEYS.COLLECTION.REPORT_ACTIONS}1`]).toMatchObject(expectedReportAction);
-                        },
-                    });
-                });
-        });
-
-        it('Should not remove any report action given that previousReportActionID exists in first valid report action', () => {
-            const reportActionsCollectionDataSet = toCollectionDataSet(
-                ONYXKEYS.COLLECTION.REPORT_ACTIONS,
-                [
-                    {
-                        1: {
-                            reportActionID: '1',
-                            previousReportActionID: '0',
-                            created: '',
-                            actionName: CONST.REPORT.ACTIONS.TYPE.MARKED_REIMBURSED,
-                            reportID: '1',
-                        },
-                        2: {
-                            reportActionID: '2',
-                            previousReportActionID: '1',
-                            created: '',
-                            actionName: CONST.REPORT.ACTIONS.TYPE.MARKED_REIMBURSED,
-                            reportID: '1',
-                        },
-                    },
-                ],
-                (item) => item[1].reportID ?? '',
-            );
-
-            return Onyx.multiSet(reportActionsCollectionDataSet)
-                .then(CheckForPreviousReportActionID)
-                .then(() => {
-                    expect(LogSpy).toHaveBeenCalledWith('[Migrate Onyx] CheckForPreviousReportActionID Migration: previousReportActionID found. Migration complete');
-                    const connectionID = Onyx.connect({
-                        key: ONYXKEYS.COLLECTION.REPORT_ACTIONS,
-                        waitForCollectionCallback: true,
-                        callback: (allReportActions) => {
-                            Onyx.disconnect(connectionID);
-                            const expectedReportAction = {
-                                1: {
-                                    reportActionID: '1',
-                                    previousReportActionID: '0',
-                                },
-                                2: {
-                                    reportActionID: '2',
-                                    previousReportActionID: '1',
-                                },
-                            };
-                            expect(allReportActions?.[`${ONYXKEYS.COLLECTION.REPORT_ACTIONS}1`]).toMatchObject(expectedReportAction);
-                        },
-                    });
-                });
-        });
-
-        it('Should skip zombie report actions and proceed to remove all reportActions given that a previousReportActionID does not exist', () => {
-            const reportActionsCollectionDataSet = toCollectionDataSet(
-                ONYXKEYS.COLLECTION.REPORT_ACTIONS,
-                [
-                    {
-                        1: {
-                            reportActionID: '1',
-                            created: '',
-                            actionName: CONST.REPORT.ACTIONS.TYPE.MARKED_REIMBURSED,
-                            reportID: '4',
-                        },
-                        2: {
-                            reportActionID: '2',
-                            created: '',
-                            actionName: CONST.REPORT.ACTIONS.TYPE.MARKED_REIMBURSED,
-                            reportID: '4',
-                        },
-                    },
-                ],
-                (item) => item[1].reportID ?? '',
-            );
-
-            return Onyx.multiSet({
-                [`${ONYXKEYS.COLLECTION.REPORT_ACTIONS}1`]: {},
-                [`${ONYXKEYS.COLLECTION.REPORT_ACTIONS}2`]: null,
-                [`${ONYXKEYS.COLLECTION.REPORT_ACTIONS}3`]: null,
-                ...reportActionsCollectionDataSet,
-            })
-                .then(CheckForPreviousReportActionID)
-                .then(() => {
-                    expect(LogSpy).toHaveBeenCalledWith(
-                        '[Migrate Onyx] CheckForPreviousReportActionID Migration: removing all reportActions because previousReportActionID not found in the first valid reportAction',
-                    );
-                    const connectionID = Onyx.connect({
-                        key: ONYXKEYS.COLLECTION.REPORT_ACTIONS,
-                        waitForCollectionCallback: true,
-                        callback: (allReportActions) => {
-                            Onyx.disconnect(connectionID);
-                            const expectedReportAction = {};
-                            expect(allReportActions?.[`${ONYXKEYS.COLLECTION.REPORT_ACTIONS}1`]).toMatchObject(expectedReportAction);
-                            expect(allReportActions?.[`${ONYXKEYS.COLLECTION.REPORT_ACTIONS}2`]).toBeUndefined();
-                            expect(allReportActions?.[`${ONYXKEYS.COLLECTION.REPORT_ACTIONS}3`]).toBeUndefined();
-                            expect(allReportActions?.[`${ONYXKEYS.COLLECTION.REPORT_ACTIONS}4`]).toMatchObject(expectedReportAction);
-                        },
-                    });
-                });
-        });
-
-        it('Should skip zombie report actions and should not remove any report action given that previousReportActionID exists in first valid report action', () => {
-            const reportActionsCollectionDataSet = toCollectionDataSet(
-                ONYXKEYS.COLLECTION.REPORT_ACTIONS,
-                [
-                    {
-                        1: {
-                            reportActionID: '1',
-                            previousReportActionID: '10',
-                            created: '',
-                            actionName: CONST.REPORT.ACTIONS.TYPE.MARKED_REIMBURSED,
-                            reportID: '4',
-                        },
-                        2: {
-                            reportActionID: '2',
-                            previousReportActionID: '23',
-                            created: '',
-                            actionName: CONST.REPORT.ACTIONS.TYPE.MARKED_REIMBURSED,
-                            reportID: '4',
-                        },
-                    },
-                ],
-                (item) => item[1].reportID ?? '',
-            );
-
-            return Onyx.multiSet({
-                [`${ONYXKEYS.COLLECTION.REPORT_ACTIONS}1`]: {},
-                [`${ONYXKEYS.COLLECTION.REPORT_ACTIONS}2`]: null,
-                [`${ONYXKEYS.COLLECTION.REPORT_ACTIONS}3`]: null,
-                ...reportActionsCollectionDataSet,
-            })
-                .then(CheckForPreviousReportActionID)
-                .then(() => {
-                    expect(LogSpy).toHaveBeenCalledWith('[Migrate Onyx] CheckForPreviousReportActionID Migration: previousReportActionID found. Migration complete');
-                    const connectionID = Onyx.connect({
-                        key: ONYXKEYS.COLLECTION.REPORT_ACTIONS,
-                        waitForCollectionCallback: true,
-                        callback: (allReportActions) => {
-                            Onyx.disconnect(connectionID);
-                            const expectedReportAction1 = {};
-                            const expectedReportAction4 = {
-                                1: {
-                                    reportActionID: '1',
-                                    previousReportActionID: '10',
-                                },
-                                2: {
-                                    reportActionID: '2',
-                                    previousReportActionID: '23',
-                                },
-                            };
-                            expect(allReportActions?.[`${ONYXKEYS.COLLECTION.REPORT_ACTIONS}1`]).toMatchObject(expectedReportAction1);
-                            expect(allReportActions?.[`${ONYXKEYS.COLLECTION.REPORT_ACTIONS}2`]).toBeUndefined();
-                            expect(allReportActions?.[`${ONYXKEYS.COLLECTION.REPORT_ACTIONS}3`]).toBeUndefined();
-                            expect(allReportActions?.[`${ONYXKEYS.COLLECTION.REPORT_ACTIONS}4`]).toMatchObject(expectedReportAction4);
-                        },
-                    });
-                });
-        });
-
-        it('Should skip if no valid reportActions', () => {
-            const setQueries: CollectionDataSet<typeof ONYXKEYS.COLLECTION.REPORT_ACTIONS> = {
-                [`${ONYXKEYS.COLLECTION.REPORT_ACTIONS}1`]: null,
-                [`${ONYXKEYS.COLLECTION.REPORT_ACTIONS}2`]: {},
-                [`${ONYXKEYS.COLLECTION.REPORT_ACTIONS}3`]: {},
-                [`${ONYXKEYS.COLLECTION.REPORT_ACTIONS}4`]: null,
-            };
-            return Onyx.multiSet(setQueries)
-                .then(CheckForPreviousReportActionID)
-                .then(() => {
-                    expect(LogSpy).toHaveBeenCalledWith('[Migrate Onyx] Skipped migration CheckForPreviousReportActionID because there were no valid reportActions');
-                    const connectionID = Onyx.connect({
-                        key: ONYXKEYS.COLLECTION.REPORT_ACTIONS,
-                        waitForCollectionCallback: true,
-                        callback: (allReportActions) => {
-                            const expectedReportAction = {};
-                            Onyx.disconnect(connectionID);
-                            expect(allReportActions?.[`${ONYXKEYS.COLLECTION.REPORT_ACTIONS}1`]).toBeUndefined();
-                            expect(allReportActions?.[`${ONYXKEYS.COLLECTION.REPORT_ACTIONS}2`]).toMatchObject(expectedReportAction);
-                            expect(allReportActions?.[`${ONYXKEYS.COLLECTION.REPORT_ACTIONS}3`]).toMatchObject(expectedReportAction);
-                            expect(allReportActions?.[`${ONYXKEYS.COLLECTION.REPORT_ACTIONS}4`]).toBeUndefined();
-                        },
-                    });
-                });
-        });
-    });
-
     describe('KeyReportActionsDraftByReportActionID', () => {
         it("Should work even if there's no reportActionsDrafts data in Onyx", () =>
             KeyReportActionsDraftByReportActionID().then(() =>
@@ -260,22 +35,19 @@ describe('Migrations', () => {
         it('Should move individual draft to a draft collection of report', () => {
             const setQueries: ReportActionsDraftCollectionDataSet = {};
 
-            // @ts-expect-error preset invalid value
-            setQueries[`${ONYXKEYS.COLLECTION.REPORT_ACTIONS_DRAFTS}1_1`] = 'a';
-            // @ts-expect-error preset invalid value
-            setQueries[`${ONYXKEYS.COLLECTION.REPORT_ACTIONS_DRAFTS}1_2`] = 'b';
+            setQueries[`${ONYXKEYS.COLLECTION.REPORT_ACTIONS_DRAFTS}1_1`] = 'a' as unknown as OnyxInputValue<OnyxTypes.ReportActionsDrafts>;
+            setQueries[`${ONYXKEYS.COLLECTION.REPORT_ACTIONS_DRAFTS}1_2`] = 'b' as unknown as OnyxInputValue<OnyxTypes.ReportActionsDrafts>;
             setQueries[`${ONYXKEYS.COLLECTION.REPORT_ACTIONS_DRAFTS}2`] = {3: 'c'};
-            // @ts-expect-error preset invalid value
-            setQueries[`${ONYXKEYS.COLLECTION.REPORT_ACTIONS_DRAFTS}2_4`] = 'd';
+            setQueries[`${ONYXKEYS.COLLECTION.REPORT_ACTIONS_DRAFTS}2_4`] = 'd' as unknown as OnyxInputValue<OnyxTypes.ReportActionsDrafts>;
 
             return Onyx.multiSet(setQueries)
                 .then(KeyReportActionsDraftByReportActionID)
                 .then(() => {
-                    const connectionID = Onyx.connect({
+                    const connection = Onyx.connect({
                         key: ONYXKEYS.COLLECTION.REPORT_ACTIONS_DRAFTS,
                         waitForCollectionCallback: true,
                         callback: (allReportActionsDrafts) => {
-                            Onyx.disconnect(connectionID);
+                            Onyx.disconnect(connection);
                             const expectedReportActionDraft1 = {
                                 1: 'a',
                                 2: 'b',
@@ -303,11 +75,11 @@ describe('Migrations', () => {
                 .then(KeyReportActionsDraftByReportActionID)
                 .then(() => {
                     expect(LogSpy).toHaveBeenCalledWith('[Migrate Onyx] Skipped migration KeyReportActionsDraftByReportActionID because there are no actions drafts to migrate');
-                    const connectionID = Onyx.connect({
+                    const connection = Onyx.connect({
                         key: ONYXKEYS.COLLECTION.REPORT_ACTIONS_DRAFTS,
                         waitForCollectionCallback: true,
                         callback: (allReportActions) => {
-                            Onyx.disconnect(connectionID);
+                            Onyx.disconnect(connection);
                             const expectedReportActionDraft = {};
                             expect(allReportActions?.[`${ONYXKEYS.COLLECTION.REPORT_ACTIONS_DRAFTS}1_1`]).toBeUndefined();
                             expect(allReportActions?.[`${ONYXKEYS.COLLECTION.REPORT_ACTIONS_DRAFTS}1_2`]).toBeUndefined();
@@ -321,18 +93,17 @@ describe('Migrations', () => {
         it("Shouldn't move empty individual draft to a draft collection of report", () => {
             const setQueries: ReportActionsDraftCollectionDataSet = {};
 
-            // @ts-expect-error preset empty string value
-            setQueries[`${ONYXKEYS.COLLECTION.REPORT_ACTIONS_DRAFTS}1_1`] = '';
+            setQueries[`${ONYXKEYS.COLLECTION.REPORT_ACTIONS_DRAFTS}1_1`] = '' as unknown as OnyxInputValue<OnyxTypes.ReportActionsDrafts>;
             setQueries[`${ONYXKEYS.COLLECTION.REPORT_ACTIONS_DRAFTS}1`] = {};
 
             return Onyx.multiSet(setQueries)
                 .then(KeyReportActionsDraftByReportActionID)
                 .then(() => {
-                    const connectionID = Onyx.connect({
+                    const connection = Onyx.connect({
                         key: ONYXKEYS.COLLECTION.REPORT_ACTIONS_DRAFTS,
                         waitForCollectionCallback: true,
                         callback: (allReportActionsDrafts) => {
-                            Onyx.disconnect(connectionID);
+                            Onyx.disconnect(connection);
                             expect(allReportActionsDrafts?.[`${ONYXKEYS.COLLECTION.REPORT_ACTIONS_DRAFTS}1_1`]).toBeUndefined();
                         },
                     });
diff --git a/tests/unit/MoneyRequestUtilsTest.ts b/tests/unit/MoneyRequestUtilsTest.ts
new file mode 100644
index 000000000000..dfd339049d37
--- /dev/null
+++ b/tests/unit/MoneyRequestUtilsTest.ts
@@ -0,0 +1,22 @@
+import * as MoneyRequestUtils from '@libs/MoneyRequestUtils';
+
+describe('ReportActionsUtils', () => {
+    describe('validateAmount', () => {
+        it('should pass the validation when amount is within the max digit and decimal', () => {
+            expect(MoneyRequestUtils.validateAmount('12345678', 2, 8)).toBe(true);
+            expect(MoneyRequestUtils.validateAmount('12345678', 0, 8)).toBe(true);
+            expect(MoneyRequestUtils.validateAmount('12345678.12', 2, 8)).toBe(true);
+            expect(MoneyRequestUtils.validateAmount('1234567.1', 2, 8)).toBe(true);
+            expect(MoneyRequestUtils.validateAmount('12345678.123', 3, 8)).toBe(true);
+            expect(MoneyRequestUtils.validateAmount('1234.1234', 4, 4)).toBe(true);
+        });
+
+        it("shouldn't pass the validation when amount is bigger than the max digit and decimal", () => {
+            expect(MoneyRequestUtils.validateAmount('12345678.123', 2, 8)).toBe(false);
+            expect(MoneyRequestUtils.validateAmount('12345678.1', 0, 8)).toBe(false);
+            expect(MoneyRequestUtils.validateAmount('123456789.12', 2, 8)).toBe(false);
+            expect(MoneyRequestUtils.validateAmount('123456789.1234', 3, 8)).toBe(false);
+            expect(MoneyRequestUtils.validateAmount('1234.12345', 4, 4)).toBe(false);
+        });
+    });
+});
diff --git a/tests/unit/NetworkTest.ts b/tests/unit/NetworkTest.ts
index 01689de89037..e79a7c93c0e5 100644
--- a/tests/unit/NetworkTest.ts
+++ b/tests/unit/NetworkTest.ts
@@ -16,6 +16,8 @@ import type ReactNativeOnyxMock from '../../__mocks__/react-native-onyx';
 import * as TestHelper from '../utils/TestHelper';
 import waitForBatchedUpdates from '../utils/waitForBatchedUpdates';
 
+type OnResolved = (params: {jsonCode?: string | number}) => void;
+
 const Onyx = MockedOnyx as typeof ReactNativeOnyxMock;
 
 jest.mock('@src/libs/Log');
@@ -28,7 +30,6 @@ OnyxUpdateManager();
 const originalXHR = HttpUtils.xhr;
 
 beforeEach(() => {
-    // @ts-expect-error TODO: Remove this once TestHelper (https://github.com/Expensify/App/issues/25318) is migrated to TypeScript.
     global.fetch = TestHelper.getGlobalFetchMock();
     HttpUtils.xhr = originalXHR;
     MainQueue.clear();
@@ -54,18 +55,18 @@ describe('NetworkTests', () => {
         const TEST_USER_LOGIN = 'test@testguy.com';
         const TEST_USER_ACCOUNT_ID = 1;
 
-        let isOffline: boolean | null = null;
+        let isOffline: boolean;
 
         Onyx.connect({
             key: ONYXKEYS.NETWORK,
             callback: (val) => {
-                isOffline = val && val.isOffline;
+                isOffline = !!val?.isOffline;
             },
         });
 
         // Given a test user login and account ID
         return TestHelper.signInWithTestUser(TEST_USER_ACCOUNT_ID, TEST_USER_LOGIN).then(() => {
-            expect(isOffline).toBe(null);
+            expect(isOffline).toBe(false);
 
             // Mock fetch() so that it throws a TypeError to simulate a bad network connection
             global.fetch = jest.fn().mockRejectedValue(new TypeError(CONST.ERROR.FAILED_TO_FETCH));
@@ -290,7 +291,7 @@ describe('NetworkTests', () => {
     test('test Failed to fetch error for non-retryable requests resolve with unable to retry jsonCode', () => {
         // Setup xhr handler that rejects once with a Failed to Fetch
         global.fetch = jest.fn().mockRejectedValue(new Error(CONST.ERROR.FAILED_TO_FETCH));
-        const onResolved = jest.fn();
+        const onResolved = jest.fn() as jest.MockedFunction<OnResolved>;
 
         // Given we have a request made while online
         return Onyx.set(ONYXKEYS.NETWORK, {isOffline: false})
diff --git a/tests/unit/NextStepUtilsTest.ts b/tests/unit/NextStepUtilsTest.ts
index 65ce7352b6e6..2b915fcfc4f0 100644
--- a/tests/unit/NextStepUtilsTest.ts
+++ b/tests/unit/NextStepUtilsTest.ts
@@ -31,10 +31,11 @@ describe('libs/NextStepUtils', () => {
             type: 'team',
             outputCurrency: CONST.CURRENCY.USD,
             isPolicyExpenseChatEnabled: true,
+            reimbursementChoice: CONST.POLICY.REIMBURSEMENT_CHOICES.REIMBURSEMENT_MANUAL,
         };
         const optimisticNextStep: ReportNextStep = {
             type: 'neutral',
-            title: '',
+            icon: CONST.NEXT_STEP.ICONS.HOURGLASS,
             message: [],
         };
         const report = ReportUtils.buildOptimisticExpenseReport('fake-chat-report-id-1', policyID, 1, -500, CONST.CURRENCY.USD) as Report;
@@ -63,7 +64,7 @@ describe('libs/NextStepUtils', () => {
         beforeEach(() => {
             report.ownerAccountID = currentUserAccountID;
             report.managerID = currentUserAccountID;
-            optimisticNextStep.title = '';
+            optimisticNextStep.icon = CONST.NEXT_STEP.ICONS.HOURGLASS;
             optimisticNextStep.message = [];
 
             Onyx.merge(`${ONYXKEYS.COLLECTION.POLICY}${policyID}`, policy).then(waitForBatchedUpdates);
@@ -71,24 +72,25 @@ describe('libs/NextStepUtils', () => {
 
         describe('it generates an optimistic nextStep once a report has been opened', () => {
             test('self review', () => {
-                optimisticNextStep.title = 'Next Steps:';
+                optimisticNextStep.icon = CONST.NEXT_STEP.ICONS.HOURGLASS;
+
+                // Waiting for userSubmitter to add expense(s).
                 optimisticNextStep.message = [
                     {
                         text: 'Waiting for ',
                     },
                     {
-                        text: 'you',
+                        text: `${currentUserEmail}`,
                         type: 'strong',
                     },
                     {
                         text: ' to ',
                     },
                     {
-                        text: 'submit',
-                        type: 'strong',
+                        text: 'add',
                     },
                     {
-                        text: ' these expenses.',
+                        text: ' %expenses.',
                     },
                 ];
 
@@ -99,20 +101,26 @@ describe('libs/NextStepUtils', () => {
 
             describe('scheduled submit enabled', () => {
                 beforeEach(() => {
-                    optimisticNextStep.title = 'Next Steps:';
+                    optimisticNextStep.icon = CONST.NEXT_STEP.ICONS.HOURGLASS;
                 });
 
+                // Format: Waiting for userSubmitter's expense(s) to automatically submit on scheduledSubmitSettings
+
                 test('daily', () => {
+                    // Waiting for userSubmitter's expense(s) to automatically submit later today
                     optimisticNextStep.message = [
                         {
-                            text: 'These expenses are scheduled to ',
+                            text: 'Waiting for ',
                         },
                         {
-                            text: 'automatically submit later today!',
+                            text: `${currentUserEmail}'s`,
                             type: 'strong',
                         },
                         {
-                            text: ' No further action required!',
+                            text: ' %expenses to automatically submit',
+                        },
+                        {
+                            text: ' later today',
                         },
                     ];
 
@@ -129,16 +137,20 @@ describe('libs/NextStepUtils', () => {
                 });
 
                 test('weekly', () => {
+                    // Waiting for userSubmitter's expense(s) to automatically submit on Sunday
                     optimisticNextStep.message = [
                         {
-                            text: 'These expenses are scheduled to ',
+                            text: 'Waiting for ',
                         },
                         {
-                            text: 'automatically submit on Sunday!',
+                            text: `${currentUserEmail}'s`,
                             type: 'strong',
                         },
                         {
-                            text: ' No further action required!',
+                            text: ' %expenses to automatically submit',
+                        },
+                        {
+                            text: ' on Sunday',
                         },
                     ];
 
@@ -155,16 +167,20 @@ describe('libs/NextStepUtils', () => {
                 });
 
                 test('twice a month', () => {
+                    // Waiting for userSubmitter's expense(s) to automatically submit on the 1st and 16th of each month
                     optimisticNextStep.message = [
                         {
-                            text: 'These expenses are scheduled to ',
+                            text: 'Waiting for ',
                         },
                         {
-                            text: 'automatically submit on the 1st and 16th of each month!',
+                            text: `${currentUserEmail}'s`,
                             type: 'strong',
                         },
                         {
-                            text: ' No further action required!',
+                            text: ' %expenses to automatically submit',
+                        },
+                        {
+                            text: ' on the 1st and 16th of each month',
                         },
                     ];
 
@@ -181,16 +197,20 @@ describe('libs/NextStepUtils', () => {
                 });
 
                 test('monthly on the 2nd', () => {
+                    // Waiting for userSubmitter's expense(s) to automatically submit on the 2nd of each month
                     optimisticNextStep.message = [
                         {
-                            text: 'These expenses are scheduled to ',
+                            text: 'Waiting for ',
                         },
                         {
-                            text: 'automatically submit on the 2nd of each month!',
+                            text: `${currentUserEmail}'s`,
                             type: 'strong',
                         },
                         {
-                            text: ' No further action required!',
+                            text: ' %expenses to automatically submit',
+                        },
+                        {
+                            text: ' on the 2nd of each month',
                         },
                     ];
 
@@ -208,16 +228,20 @@ describe('libs/NextStepUtils', () => {
                 });
 
                 test('monthly on the last day', () => {
+                    // Waiting for userSubmitter's expense(s) to automatically submit on lastDayOfMonth of each month
                     optimisticNextStep.message = [
                         {
-                            text: 'These expenses are scheduled to ',
+                            text: 'Waiting for ',
                         },
                         {
-                            text: `automatically submit on the ${format(lastDayOfMonth(new Date()), CONST.DATE.ORDINAL_DAY_OF_MONTH)} of each month!`,
+                            text: `${currentUserEmail}'s`,
                             type: 'strong',
                         },
                         {
-                            text: ' No further action required!',
+                            text: ' %expenses to automatically submit',
+                        },
+                        {
+                            text: ` on the ${format(lastDayOfMonth(new Date()), CONST.DATE.ORDINAL_DAY_OF_MONTH)} of each month`,
                         },
                     ];
 
@@ -236,16 +260,21 @@ describe('libs/NextStepUtils', () => {
 
                 test('monthly on the last business day', () => {
                     const lastBusinessDayOfMonth = DateUtils.getLastBusinessDayOfMonth(new Date());
+
+                    // Waiting for userSubmitter's expense(s) to automatically submit on lastBusinessDayOfMonth of each month
                     optimisticNextStep.message = [
                         {
-                            text: 'These expenses are scheduled to ',
+                            text: 'Waiting for ',
                         },
                         {
-                            text: `automatically submit on the ${format(setDate(new Date(), lastBusinessDayOfMonth), CONST.DATE.ORDINAL_DAY_OF_MONTH)} of each month!`,
+                            text: `${currentUserEmail}'s`,
                             type: 'strong',
                         },
                         {
-                            text: ' No further action required!',
+                            text: ' %expenses to automatically submit',
+                        },
+                        {
+                            text: ` on the ${format(setDate(new Date(), lastBusinessDayOfMonth), CONST.DATE.ORDINAL_DAY_OF_MONTH)} of each month`,
                         },
                     ];
 
@@ -263,16 +292,20 @@ describe('libs/NextStepUtils', () => {
                 });
 
                 test('trip', () => {
+                    // Waiting for userSubmitter's expense(s) to automatically submit at the end of their trip
                     optimisticNextStep.message = [
                         {
-                            text: 'These expenses are scheduled to ',
+                            text: 'Waiting for ',
                         },
                         {
-                            text: 'automatically submit at the end of your trip!',
+                            text: `${currentUserEmail}'s`,
                             type: 'strong',
                         },
                         {
-                            text: ' No further action required!',
+                            text: ' %expenses to automatically submit',
+                        },
+                        {
+                            text: ` at the end of their trip`,
                         },
                     ];
 
@@ -289,30 +322,30 @@ describe('libs/NextStepUtils', () => {
                 });
 
                 test('manual', () => {
+                    // Waiting for userSubmitter to add expense(s).
                     optimisticNextStep.message = [
                         {
                             text: 'Waiting for ',
                         },
                         {
-                            text: 'you',
+                            text: `${currentUserEmail}`,
                             type: 'strong',
                         },
                         {
                             text: ' to ',
                         },
                         {
-                            text: 'submit',
-                            type: 'strong',
+                            text: 'add',
                         },
                         {
-                            text: ' these expenses.',
+                            text: ' %expenses.',
                         },
                     ];
 
                     return Onyx.merge(`${ONYXKEYS.COLLECTION.POLICY}${policyID}`, {
-                        autoReportingFrequency: CONST.POLICY.AUTO_REPORTING_FREQUENCIES.MANUAL,
+                        autoReportingFrequency: CONST.POLICY.AUTO_REPORTING_FREQUENCIES.IMMEDIATE,
                         harvesting: {
-                            enabled: true,
+                            enabled: false,
                         },
                     }).then(() => {
                         const result = NextStepUtils.buildNextStep(report, CONST.REPORT.STATUS_NUM.OPEN);
@@ -321,53 +354,19 @@ describe('libs/NextStepUtils', () => {
                     });
                 });
             });
-
-            test('prevented self submitting', () => {
-                optimisticNextStep.title = 'Next Steps:';
-                optimisticNextStep.message = [
-                    {
-                        text: "Oops! Looks like you're submitting to ",
-                    },
-                    {
-                        text: 'yourself',
-                        type: 'strong',
-                    },
-                    {
-                        text: '. Approving your own reports is ',
-                    },
-                    {
-                        text: 'forbidden',
-                        type: 'strong',
-                    },
-                    {
-                        text: ' by your policy. Please submit this report to someone else or contact your admin to change the person you submit to.',
-                    },
-                ];
-
-                return Onyx.merge(`${ONYXKEYS.COLLECTION.POLICY}${policyID}`, {
-                    preventSelfApproval: true,
-                    employeeList: {
-                        [currentUserEmail]: {
-                            submitsTo: currentUserEmail,
-                        },
-                    },
-                }).then(() => {
-                    const result = NextStepUtils.buildNextStep(report, CONST.REPORT.STATUS_NUM.OPEN);
-
-                    expect(result).toMatchObject(optimisticNextStep);
-                });
-            });
         });
 
         describe('it generates an optimistic nextStep once a report has been submitted', () => {
             test('self review', () => {
-                optimisticNextStep.title = 'Next Steps:';
+                optimisticNextStep.icon = CONST.NEXT_STEP.ICONS.HOURGLASS;
+
+                // Waiting for userAdmin to pay expense(s)
                 optimisticNextStep.message = [
                     {
                         text: 'Waiting for ',
                     },
                     {
-                        text: 'you',
+                        text: `${currentUserEmail}`,
                         type: 'strong',
                     },
                     {
@@ -375,7 +374,6 @@ describe('libs/NextStepUtils', () => {
                     },
                     {
                         text: 'pay',
-                        type: 'strong',
                     },
                     {
                         text: ' %expenses.',
@@ -389,7 +387,9 @@ describe('libs/NextStepUtils', () => {
 
             test('another reviewer', () => {
                 report.managerID = strangeAccountID;
-                optimisticNextStep.title = 'Next Steps:';
+                optimisticNextStep.icon = CONST.NEXT_STEP.ICONS.HOURGLASS;
+
+                // Waiting for userApprover to approve expense(s)
                 optimisticNextStep.message = [
                     {
                         text: 'Waiting for ',
@@ -403,7 +403,6 @@ describe('libs/NextStepUtils', () => {
                     },
                     {
                         text: 'approve',
-                        type: 'strong',
                     },
                     {
                         text: ' %expenses.',
@@ -425,28 +424,25 @@ describe('libs/NextStepUtils', () => {
 
             test('another owner', () => {
                 report.ownerAccountID = strangeAccountID;
-                optimisticNextStep.title = 'Next Steps:';
+                optimisticNextStep.icon = CONST.NEXT_STEP.ICONS.HOURGLASS;
+
+                // Waiting for userApprover to approve expense(s)
                 optimisticNextStep.message = [
                     {
-                        text: strangeEmail,
-                        type: 'strong',
-                    },
-                    {
-                        text: ' is waiting for ',
+                        text: 'Waiting for ',
                     },
                     {
-                        text: 'you',
+                        text: currentUserEmail,
                         type: 'strong',
                     },
                     {
                         text: ' to ',
                     },
                     {
-                        text: 'review',
-                        type: 'strong',
+                        text: 'approve',
                     },
                     {
-                        text: ' these %expenses.',
+                        text: ' %expenses.',
                     },
                 ];
 
@@ -462,10 +458,9 @@ describe('libs/NextStepUtils', () => {
                     expect(result).toMatchObject(optimisticNextStep);
                 });
             });
-
             test('submit and close approval mode', () => {
                 report.ownerAccountID = strangeAccountID;
-                optimisticNextStep.title = 'Finished!';
+                optimisticNextStep.icon = CONST.NEXT_STEP.ICONS.CHECKMARK;
                 optimisticNextStep.message = [
                     {
                         text: 'No further action required!',
@@ -483,25 +478,12 @@ describe('libs/NextStepUtils', () => {
         });
 
         describe('it generates an optimistic nextStep once a report has been approved', () => {
-            test('self review', () => {
-                optimisticNextStep.title = 'Next Steps:';
+            test('non-payer', () => {
+                report.managerID = strangeAccountID;
+                optimisticNextStep.icon = CONST.NEXT_STEP.ICONS.CHECKMARK;
                 optimisticNextStep.message = [
                     {
-                        text: 'Waiting for ',
-                    },
-                    {
-                        text: 'you',
-                        type: 'strong',
-                    },
-                    {
-                        text: ' to ',
-                    },
-                    {
-                        text: 'pay',
-                        type: 'strong',
-                    },
-                    {
-                        text: ' %expenses.',
+                        text: 'No further action required!',
                     },
                 ];
 
@@ -510,15 +492,16 @@ describe('libs/NextStepUtils', () => {
                 expect(result).toMatchObject(optimisticNextStep);
             });
 
-            test('another owner', () => {
-                report.ownerAccountID = strangeAccountID;
-                optimisticNextStep.title = 'Next Steps:';
+            test('payer', () => {
+                optimisticNextStep.icon = CONST.NEXT_STEP.ICONS.HOURGLASS;
+
+                // Waiting for userAdmin to pay expense(s).
                 optimisticNextStep.message = [
                     {
                         text: 'Waiting for ',
                     },
                     {
-                        text: 'you',
+                        text: currentUserEmail,
                         type: 'strong',
                     },
                     {
@@ -526,67 +509,36 @@ describe('libs/NextStepUtils', () => {
                     },
                     {
                         text: 'pay',
-                        type: 'strong',
                     },
                     {
                         text: ' %expenses.',
                     },
                 ];
+                // mock the report as approved
+                const originalState = {stateNum: report.stateNum, statusNum: report.statusNum};
+                report.stateNum = CONST.REPORT.STATE_NUM.APPROVED;
+                report.statusNum = CONST.REPORT.STATUS_NUM.APPROVED;
 
                 const result = NextStepUtils.buildNextStep(report, CONST.REPORT.STATUS_NUM.APPROVED);
 
                 expect(result).toMatchObject(optimisticNextStep);
+
+                // restore
+                report.stateNum = originalState.stateNum;
+                report.statusNum = originalState.statusNum;
             });
         });
 
         describe('it generates an optimistic nextStep once a report has been paid', () => {
-            test('paid with wallet', () => {
-                optimisticNextStep.title = 'Finished!';
-                optimisticNextStep.message = [
-                    {
-                        text: 'You',
-                        type: 'strong',
-                    },
-                    {
-                        text: ' have marked these expenses as ',
-                    },
-                    {
-                        text: 'paid',
-                        type: 'strong',
-                    },
-                    {
-                        text: '.',
-                    },
-                ];
-
-                const result = NextStepUtils.buildNextStep(report, CONST.REPORT.STATUS_NUM.REIMBURSED, {isPaidWithExpensify: true});
-
-                expect(result).toMatchObject(optimisticNextStep);
-            });
-
-            test('paid outside of Expensify', () => {
-                optimisticNextStep.title = 'Finished!';
+            test('paid with wallet / outside of Expensify', () => {
+                optimisticNextStep.icon = CONST.NEXT_STEP.ICONS.CHECKMARK;
                 optimisticNextStep.message = [
                     {
-                        text: 'You',
-                        type: 'strong',
-                    },
-                    {
-                        text: ' have marked these expenses as ',
-                    },
-                    {
-                        text: 'paid',
-                        type: 'strong',
-                    },
-                    {
-                        text: ' outside of Expensify',
-                    },
-                    {
-                        text: '.',
+                        text: 'No further action required!',
                     },
                 ];
 
-                const result = NextStepUtils.buildNextStep(report, CONST.REPORT.STATUS_NUM.REIMBURSED, {isPaidWithExpensify: false});
+                const result = NextStepUtils.buildNextStep(report, CONST.REPORT.STATUS_NUM.REIMBURSED);
 
                 expect(result).toMatchObject(optimisticNextStep);
             });
diff --git a/tests/unit/OnyxUpdateManagerTest.ts b/tests/unit/OnyxUpdateManagerTest.ts
index 20b29ca18a56..2cfd1eec10c7 100644
--- a/tests/unit/OnyxUpdateManagerTest.ts
+++ b/tests/unit/OnyxUpdateManagerTest.ts
@@ -18,6 +18,7 @@ const ApplyUpdates = ApplyUpdatesImport as ApplyUpdatesMock;
 const OnyxUpdateManagerUtils = OnyxUpdateManagerUtilsImport as OnyxUpdateManagerUtilsMock;
 
 const mockUpdate3 = createOnyxMockUpdate(3);
+const offsetedMockUpdate3 = createOnyxMockUpdate(3, undefined, 2);
 const mockUpdate4 = createOnyxMockUpdate(4);
 const mockUpdate5 = createOnyxMockUpdate(5);
 const mockUpdate6 = createOnyxMockUpdate(6);
@@ -193,7 +194,7 @@ describe('OnyxUpdateManager', () => {
             // Even though there are multiple gaps in the deferred updates, we only want to fetch missing updates once per batch.
             expect(App.getMissingOnyxUpdates).toHaveBeenCalledTimes(1);
 
-            // validateAndApplyDeferredUpdates should be called twice, once for the initial deferred updates and once for the remaining deferred updates with gaps.
+            // validateAndApplyDeferredUpdates should be called once for the initial deferred updates
             // Unfortunately, we cannot easily count the calls of this function with Jest, since it recursively calls itself.
             // The intended assertion would look like this:
             // expect(OnyxUpdateManagerUtils.validateAndApplyDeferredUpdates).toHaveBeenCalledTimes(1);
@@ -254,4 +255,28 @@ describe('OnyxUpdateManager', () => {
             expect(ApplyUpdates.applyUpdates).toHaveBeenNthCalledWith(2, {7: mockUpdate7});
         });
     });
+
+    it('should only fetch missing updates that are not outdated (older than already locally applied update)', () => {
+        OnyxUpdateManager.handleOnyxUpdateGap(offsetedMockUpdate3);
+        OnyxUpdateManager.handleOnyxUpdateGap(mockUpdate4);
+
+        return OnyxUpdateManager.queryPromise.then(() => {
+            // After all missing and deferred updates have been applied, the lastUpdateIDAppliedToClient should be 4.
+            expect(lastUpdateIDAppliedToClient).toBe(4);
+
+            // validateAndApplyDeferredUpdates should be called once for the initial deferred updates
+            // Unfortunately, we cannot easily count the calls of this function with Jest, since it recursively calls itself.
+            // The intended assertion would look like this:
+            // expect(OnyxUpdateManagerUtils.validateAndApplyDeferredUpdates).toHaveBeenCalledTimes(1);
+
+            // There should be only one call to applyUpdates. The call should contain all the deferred update,
+            // since the locally applied updates have changed in the meantime.
+            expect(ApplyUpdates.applyUpdates).toHaveBeenCalledTimes(1);
+            // eslint-disable-next-line @typescript-eslint/naming-convention
+            expect(ApplyUpdates.applyUpdates).toHaveBeenCalledWith({3: offsetedMockUpdate3, 4: mockUpdate4});
+
+            // There are no gaps in the deferred updates, therefore only one call to getMissingOnyxUpdates should be triggered
+            expect(App.getMissingOnyxUpdates).toHaveBeenCalledTimes(1);
+        });
+    });
 });
diff --git a/tests/unit/OnyxUpdatesTest.ts b/tests/unit/OnyxUpdatesTest.ts
new file mode 100644
index 000000000000..c05738396585
--- /dev/null
+++ b/tests/unit/OnyxUpdatesTest.ts
@@ -0,0 +1,79 @@
+import type {KeyValueMapping, OnyxEntry, OnyxKey} from 'react-native-onyx';
+import Onyx from 'react-native-onyx';
+import CONST from '@src/CONST';
+import * as OnyxUpdates from '@src/libs/actions/OnyxUpdates';
+import DateUtils from '@src/libs/DateUtils';
+import * as NumberUtils from '@src/libs/NumberUtils';
+import ONYXKEYS from '@src/ONYXKEYS';
+import type {OnyxUpdatesFromServer} from '@src/types/onyx';
+import waitForBatchedUpdates from '../utils/waitForBatchedUpdates';
+
+describe('OnyxUpdatesTest', () => {
+    beforeAll(() => {
+        Onyx.init({
+            keys: ONYXKEYS,
+        });
+    });
+
+    beforeEach(() => Onyx.clear().then(waitForBatchedUpdates));
+
+    it('applies Airship Onyx updates correctly', () => {
+        const reportID = NumberUtils.rand64();
+        const reportActionID = NumberUtils.rand64();
+        const created = DateUtils.getDBTime();
+
+        const reportValue = {reportID};
+        const reportActionValue = {
+            [reportActionID]: {
+                reportActionID,
+                created,
+            },
+        };
+
+        // Given an onyx update from an Airship push notification
+        const airshipUpdates: OnyxUpdatesFromServer = {
+            type: CONST.ONYX_UPDATE_TYPES.AIRSHIP,
+            previousUpdateID: 0,
+            lastUpdateID: 1,
+            updates: [
+                {
+                    eventType: '',
+                    data: [
+                        {
+                            onyxMethod: 'merge',
+                            key: `${ONYXKEYS.COLLECTION.REPORT}${reportID}`,
+                            value: reportValue,
+                        },
+                        {
+                            onyxMethod: 'merge',
+                            key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${reportID}`,
+                            value: reportActionValue,
+                            shouldShowPushNotification: true,
+                        },
+                    ],
+                },
+            ],
+        };
+
+        // When we apply the updates, then their values are updated correctly
+        return OnyxUpdates.apply(airshipUpdates)
+            .then(() => getOnyxValues(`${ONYXKEYS.COLLECTION.REPORT}${reportID}`, `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${reportID}`))
+            .then(([report, reportAction]) => {
+                expect(report).toStrictEqual(reportValue);
+                expect(reportAction).toStrictEqual(reportActionValue);
+            });
+    });
+});
+
+function getOnyxValues<TKey extends OnyxKey>(...keys: TKey[]) {
+    return Promise.all(keys.map((key) => getOnyxValue(key)));
+}
+
+function getOnyxValue<TKey extends OnyxKey>(key: TKey): Promise<OnyxEntry<KeyValueMapping[TKey]>> {
+    return new Promise((resolve) => {
+        Onyx.connect({
+            key,
+            callback: (value) => resolve(value),
+        });
+    });
+}
diff --git a/tests/unit/OptionsListUtilsTest.ts b/tests/unit/OptionsListUtilsTest.ts
index 76b4324f697b..c2beebfa563d 100644
--- a/tests/unit/OptionsListUtilsTest.ts
+++ b/tests/unit/OptionsListUtilsTest.ts
@@ -2,11 +2,13 @@
 import type {OnyxCollection} from 'react-native-onyx';
 import Onyx from 'react-native-onyx';
 import type {SelectedTagOption} from '@components/TagPicker';
+import DateUtils from '@libs/DateUtils';
 import CONST from '@src/CONST';
 import * as OptionsListUtils from '@src/libs/OptionsListUtils';
 import * as ReportUtils from '@src/libs/ReportUtils';
 import ONYXKEYS from '@src/ONYXKEYS';
-import type {PersonalDetails, Policy, PolicyCategories, Report, TaxRatesWithDefault} from '@src/types/onyx';
+import type {PersonalDetails, Policy, PolicyCategories, Report, TaxRatesWithDefault, Transaction} from '@src/types/onyx';
+import type {PendingAction} from '@src/types/onyx/OnyxCommon';
 import waitForBatchedUpdates from '../utils/waitForBatchedUpdates';
 
 type PersonalDetailsList = Record<string, PersonalDetails & ReportUtils.OptionData>;
@@ -19,13 +21,12 @@ describe('OptionsListUtils', () => {
             lastVisibleActionCreated: '2022-11-22 03:26:02.015',
             isPinned: false,
             reportID: '1',
-            participantAccountIDs: [2, 1],
-            visibleChatMemberAccountIDs: [2, 1],
             participants: {
                 2: {},
                 1: {},
+                5: {},
             },
-            reportName: 'Iron Man, Mister Fantastic',
+            reportName: 'Iron Man, Mister Fantastic, Invisible Woman',
             type: CONST.REPORT.TYPE.CHAT,
         },
         '2': {
@@ -33,9 +34,8 @@ describe('OptionsListUtils', () => {
             lastVisibleActionCreated: '2022-11-22 03:26:02.016',
             isPinned: false,
             reportID: '2',
-            participantAccountIDs: [3],
-            visibleChatMemberAccountIDs: [3],
             participants: {
+                2: {},
                 3: {},
             },
             reportName: 'Spider-Man',
@@ -48,9 +48,8 @@ describe('OptionsListUtils', () => {
             lastVisibleActionCreated: '2022-11-22 03:26:02.170',
             isPinned: true,
             reportID: '3',
-            participantAccountIDs: [1],
-            visibleChatMemberAccountIDs: [1],
             participants: {
+                2: {},
                 1: {},
             },
             reportName: 'Mister Fantastic',
@@ -61,9 +60,8 @@ describe('OptionsListUtils', () => {
             lastVisibleActionCreated: '2022-11-22 03:26:02.180',
             isPinned: false,
             reportID: '4',
-            participantAccountIDs: [4],
-            visibleChatMemberAccountIDs: [4],
             participants: {
+                2: {},
                 4: {},
             },
             reportName: 'Black Panther',
@@ -74,9 +72,8 @@ describe('OptionsListUtils', () => {
             lastVisibleActionCreated: '2022-11-22 03:26:02.019',
             isPinned: false,
             reportID: '5',
-            participantAccountIDs: [5],
-            visibleChatMemberAccountIDs: [5],
             participants: {
+                2: {},
                 5: {},
             },
             reportName: 'Invisible Woman',
@@ -87,9 +84,8 @@ describe('OptionsListUtils', () => {
             lastVisibleActionCreated: '2022-11-22 03:26:02.020',
             isPinned: false,
             reportID: '6',
-            participantAccountIDs: [6],
-            visibleChatMemberAccountIDs: [6],
             participants: {
+                2: {},
                 6: {},
             },
             reportName: 'Thor',
@@ -102,9 +98,8 @@ describe('OptionsListUtils', () => {
             lastVisibleActionCreated: '2022-11-22 03:26:03.999',
             isPinned: false,
             reportID: '7',
-            participantAccountIDs: [7],
-            visibleChatMemberAccountIDs: [7],
             participants: {
+                2: {},
                 7: {},
             },
             reportName: 'Captain America',
@@ -117,9 +112,8 @@ describe('OptionsListUtils', () => {
             lastVisibleActionCreated: '2022-11-22 03:26:02.000',
             isPinned: false,
             reportID: '8',
-            participantAccountIDs: [12],
-            visibleChatMemberAccountIDs: [12],
             participants: {
+                2: {},
                 12: {},
             },
             reportName: 'Silver Surfer',
@@ -132,9 +126,8 @@ describe('OptionsListUtils', () => {
             lastVisibleActionCreated: '2022-11-22 03:26:02.998',
             isPinned: false,
             reportID: '9',
-            participantAccountIDs: [8],
-            visibleChatMemberAccountIDs: [8],
             participants: {
+                2: {},
                 8: {},
             },
             reportName: 'Mister Sinister',
@@ -148,8 +141,6 @@ describe('OptionsListUtils', () => {
             lastVisibleActionCreated: '2022-11-22 03:26:02.001',
             reportID: '10',
             isPinned: false,
-            participantAccountIDs: [2, 7],
-            visibleChatMemberAccountIDs: [2, 7],
             participants: {
                 2: {},
                 7: {},
@@ -163,6 +154,8 @@ describe('OptionsListUtils', () => {
             // This indicates that the report is archived
             stateNum: 2,
             statusNum: 2,
+            // eslint-disable-next-line @typescript-eslint/naming-convention
+            private_isArchived: DateUtils.getDBTime(),
         },
     };
 
@@ -242,9 +235,8 @@ describe('OptionsListUtils', () => {
             lastVisibleActionCreated: '2022-11-22 03:26:02.022',
             isPinned: false,
             reportID: '11',
-            participantAccountIDs: [999],
-            visibleChatMemberAccountIDs: [999],
             participants: {
+                2: {},
                 999: {},
             },
             reportName: 'Concierge',
@@ -259,9 +251,8 @@ describe('OptionsListUtils', () => {
             lastVisibleActionCreated: '2022-11-22 03:26:02.022',
             isPinned: false,
             reportID: '12',
-            participantAccountIDs: [1000],
-            visibleChatMemberAccountIDs: [1000],
             participants: {
+                2: {},
                 1000: {},
             },
             reportName: 'Chronos',
@@ -276,9 +267,8 @@ describe('OptionsListUtils', () => {
             lastVisibleActionCreated: '2022-11-22 03:26:02.022',
             isPinned: false,
             reportID: '13',
-            participantAccountIDs: [1001],
-            visibleChatMemberAccountIDs: [1001],
             participants: {
+                2: {},
                 1001: {},
             },
             reportName: 'Receipts',
@@ -293,9 +283,8 @@ describe('OptionsListUtils', () => {
             lastVisibleActionCreated: '2022-11-22 03:26:02.022',
             isPinned: false,
             reportID: '14',
-            participantAccountIDs: [1, 10, 3],
-            visibleChatMemberAccountIDs: [1, 10, 3],
             participants: {
+                2: {},
                 1: {},
                 10: {},
                 3: {},
@@ -308,16 +297,15 @@ describe('OptionsListUtils', () => {
         },
     };
 
-    const REPORTS_WITH_CHAT_ROOM = {
+    const REPORTS_WITH_CHAT_ROOM: OnyxCollection<Report> = {
         ...REPORTS,
         15: {
             lastReadTime: '2021-01-14 11:25:39.301',
             lastVisibleActionCreated: '2022-11-22 03:26:02.000',
             isPinned: false,
             reportID: '15',
-            participantAccountIDs: [3, 4],
-            visibleChatMemberAccountIDs: [3, 4],
             participants: {
+                2: {},
                 3: {},
                 4: {},
             },
@@ -404,50 +392,24 @@ describe('OptionsListUtils', () => {
     let OPTIONS_WITH_CONCIERGE: OptionsListUtils.OptionList;
     let OPTIONS_WITH_CHRONOS: OptionsListUtils.OptionList;
     let OPTIONS_WITH_RECEIPTS: OptionsListUtils.OptionList;
-    let OPTIONS_WITH_WORKSPACES: OptionsListUtils.OptionList;
+    let OPTIONS_WITH_WORKSPACE_ROOM: OptionsListUtils.OptionList;
 
     beforeEach(() => {
         OPTIONS = OptionsListUtils.createOptionList(PERSONAL_DETAILS, REPORTS);
         OPTIONS_WITH_CONCIERGE = OptionsListUtils.createOptionList(PERSONAL_DETAILS_WITH_CONCIERGE, REPORTS_WITH_CONCIERGE);
         OPTIONS_WITH_CHRONOS = OptionsListUtils.createOptionList(PERSONAL_DETAILS_WITH_CHRONOS, REPORTS_WITH_CHRONOS);
         OPTIONS_WITH_RECEIPTS = OptionsListUtils.createOptionList(PERSONAL_DETAILS_WITH_RECEIPTS, REPORTS_WITH_RECEIPTS);
-        OPTIONS_WITH_WORKSPACES = OptionsListUtils.createOptionList(PERSONAL_DETAILS, REPORTS_WITH_WORKSPACE_ROOMS);
+        OPTIONS_WITH_WORKSPACE_ROOM = OptionsListUtils.createOptionList(PERSONAL_DETAILS, REPORTS_WITH_WORKSPACE_ROOMS);
     });
 
     it('getSearchOptions()', () => {
         // When we filter in the Search view without providing a searchValue
-        let results = OptionsListUtils.getSearchOptions(OPTIONS, '', [CONST.BETAS.ALL]);
+        const results = OptionsListUtils.getSearchOptions(OPTIONS, '', [CONST.BETAS.ALL]);
         // Then the 2 personalDetails that don't have reports should be returned
         expect(results.personalDetails.length).toBe(2);
 
         // Then all of the reports should be shown including the archived rooms.
         expect(results.recentReports.length).toBe(Object.values(OPTIONS.reports).length);
-
-        // When we filter again but provide a searchValue
-        results = OptionsListUtils.getSearchOptions(OPTIONS, 'spider');
-
-        // Then only one option should be returned and it's the one matching the search value
-        expect(results.recentReports.length).toBe(1);
-        expect(results.recentReports[0].login).toBe('peterparker@expensify.com');
-
-        // When we filter again but provide a searchValue that should match multiple times
-        results = OptionsListUtils.getSearchOptions(OPTIONS, 'fantastic');
-
-        // Value with latest lastVisibleActionCreated should be at the top.
-        expect(results.recentReports.length).toBe(2);
-        expect(results.recentReports[0].text).toBe('Mister Fantastic');
-        expect(results.recentReports[1].text).toBe('Mister Fantastic');
-
-        return waitForBatchedUpdates()
-            .then(() => Onyx.set(ONYXKEYS.PERSONAL_DETAILS_LIST, PERSONAL_DETAILS_WITH_PERIODS))
-            .then(() => {
-                const OPTIONS_WITH_PERIODS = OptionsListUtils.createOptionList(PERSONAL_DETAILS_WITH_PERIODS, REPORTS);
-                // When we filter again but provide a searchValue that should match with periods
-                results = OptionsListUtils.getSearchOptions(OPTIONS_WITH_PERIODS, 'barry.allen@expensify.com');
-                // Then we expect to have the personal detail with period filtered
-                expect(results.recentReports.length).toBe(1);
-                expect(results.recentReports[0].text).toBe('The Flash');
-            });
     });
 
     it('getFilteredOptions()', () => {
@@ -486,7 +448,7 @@ describe('OptionsListUtils', () => {
         // When we don't include personal detail to the result
         results = OptionsListUtils.getFilteredOptions(
             [],
-            OPTIONS.personalDetails,
+            [],
             [],
             '',
             undefined,
@@ -502,6 +464,7 @@ describe('OptionsListUtils', () => {
             undefined,
             undefined,
             undefined,
+            0,
             undefined,
             undefined,
             undefined,
@@ -513,34 +476,6 @@ describe('OptionsListUtils', () => {
         // Then no personal detail options will be returned
         expect(results.personalDetails.length).toBe(0);
 
-        // When we provide a search value that does not match any personal details
-        results = OptionsListUtils.getFilteredOptions(OPTIONS.reports, OPTIONS.personalDetails, [], '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.getFilteredOptions(OPTIONS.reports, OPTIONS.personalDetails, [], 'peterparker@expensify.com');
-
-        // Then one recentReports will be returned and it will be the correct option
-        // personalDetails should be empty array
-        expect(results.recentReports.length).toBe(1);
-        expect(results.recentReports[0].text).toBe('Spider-Man');
-        expect(results.personalDetails.length).toBe(0);
-
-        // When we provide a search value that matches a partial display name or email
-        results = OptionsListUtils.getFilteredOptions(OPTIONS.reports, OPTIONS.personalDetails, [], '.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.
-        // Should be ordered by lastVisibleActionCreated values.
-        expect(results.personalDetails.length).toBe(4);
-        expect(results.recentReports.length).toBe(5);
-        expect(results.personalDetails[0].login).toBe('natasharomanoff@expensify.com');
-        expect(results.recentReports[0].text).toBe('Captain America');
-        expect(results.recentReports[1].text).toBe('Mr Sinister');
-        expect(results.recentReports[2].text).toBe('Black Panther');
-
         // Test for Concierge's existence in chat options
 
         results = OptionsListUtils.getFilteredOptions(OPTIONS_WITH_CONCIERGE.reports, OPTIONS_WITH_CONCIERGE.personalDetails);
@@ -594,27 +529,6 @@ describe('OptionsListUtils', () => {
         const personalDetailsOverlapWithReports = results.personalDetails.every((personalDetailOption) => reportLogins.includes(personalDetailOption.login));
         expect(personalDetailsOverlapWithReports).toBe(false);
 
-        // When we search for an option that is only in a personalDetail with no existing report
-        results = OptionsListUtils.getFilteredOptions(OPTIONS.reports, OPTIONS.personalDetails, [], 'hulk');
-
-        // Then reports should return no results
-        expect(results.recentReports.length).toBe(0);
-
-        // And personalDetails should show just one option and it will be the one we expect
-        expect(results.personalDetails.length).toBe(1);
-        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.getFilteredOptions(OPTIONS.reports, OPTIONS.personalDetails, [], '.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);
-        expect(results.recentReports[0].text).toBe('Captain America');
-
-        // And logins with no single participant reports will show up in personalDetails
-        expect(results.personalDetails.length).toBe(4);
-        expect(results.personalDetails[0].login).toBe('natasharomanoff@expensify.com');
-
         // When we provide no selected options to getFilteredOptions()
         results = OptionsListUtils.getFilteredOptions(OPTIONS.reports, OPTIONS.personalDetails, [], '', []);
 
@@ -630,72 +544,6 @@ describe('OptionsListUtils', () => {
         expect(results.recentReports.every((option) => option.login !== 'peterparker@expensify.com')).toBe(true);
         expect(results.personalDetails.every((option) => option.login !== 'peterparker@expensify.com')).toBe(true);
 
-        // When we add a search term for which no options exist and the searchValue itself
-        // is not a potential email or phone
-        results = OptionsListUtils.getFilteredOptions(OPTIONS.reports, OPTIONS.personalDetails, [], '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);
-        expect(results.personalDetails.length).toBe(0);
-        expect(results.userToInvite).toBe(null);
-
-        // When we add a search term for which no options exist and the searchValue itself
-        // is a potential email
-        results = OptionsListUtils.getFilteredOptions(OPTIONS.reports, OPTIONS.personalDetails, [], '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);
-        expect(results.personalDetails.length).toBe(0);
-        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.getFilteredOptions(OPTIONS.reports, OPTIONS.personalDetails, [], 'peter.parker@expensify.com');
-
-        // Then we should have no options at all but there should be a userToInvite
-        expect(results.recentReports.length).toBe(0);
-        expect(results.userToInvite).not.toBe(null);
-
-        // 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.getFilteredOptions(OPTIONS.reports, OPTIONS.personalDetails, [], '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
-        expect(results.recentReports.length).toBe(0);
-        expect(results.personalDetails.length).toBe(0);
-        expect(results.userToInvite).not.toBe(null);
-        expect(results.userToInvite?.login).toBe('+15005550006');
-
-        // 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.getFilteredOptions(OPTIONS.reports, OPTIONS.personalDetails, [], '+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
-        expect(results.recentReports.length).toBe(0);
-        expect(results.personalDetails.length).toBe(0);
-        expect(results.userToInvite).not.toBe(null);
-        expect(results.userToInvite?.login).toBe('+15005550006');
-
-        // 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.getFilteredOptions(OPTIONS.reports, OPTIONS.personalDetails, [], '+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
-        expect(results.recentReports.length).toBe(0);
-        expect(results.personalDetails.length).toBe(0);
-        expect(results.userToInvite).not.toBe(null);
-        expect(results.userToInvite?.login).toBe('+18003243233');
-
-        // When we use a search term for contact number that contains alphabet characters
-        results = OptionsListUtils.getFilteredOptions(OPTIONS.reports, OPTIONS.personalDetails, [], '998243aaaa');
-
-        // Then we shouldn't have any results or user to invite
-        expect(results.recentReports.length).toBe(0);
-        expect(results.personalDetails.length).toBe(0);
-        expect(results.userToInvite).toBe(null);
-
         // Test Concierge's existence in new group options
         results = OptionsListUtils.getFilteredOptions(OPTIONS_WITH_CONCIERGE.reports, OPTIONS_WITH_CONCIERGE.personalDetails);
 
@@ -748,20 +596,8 @@ describe('OptionsListUtils', () => {
         // Then we should expect all the recent reports to show but exclude the archived rooms
         expect(results.recentReports.length).toBe(Object.values(OPTIONS.reports).length - 1);
 
-        // When we pass a search value that doesn't match the group chat name
-        results = OptionsListUtils.getShareDestinationOptions(filteredReports, OPTIONS.personalDetails, [], 'mutants');
-
-        // Then we should expect no recent reports to show
-        expect(results.recentReports.length).toBe(0);
-
-        // When we pass a search value that matches the group chat name
-        results = OptionsListUtils.getShareDestinationOptions(filteredReports, OPTIONS.personalDetails, [], 'Iron Man, Fantastic');
-
-        // Then we should expect the group chat to show along with the contacts matching the search
-        expect(results.recentReports.length).toBe(1);
-
         // Filter current REPORTS_WITH_WORKSPACE_ROOMS as we do in the component, before getting share destination options
-        const filteredReportsWithWorkspaceRooms = Object.values(OPTIONS_WITH_WORKSPACES.reports).reduce<OptionsListUtils.OptionList['reports']>((filtered, option) => {
+        const filteredReportsWithWorkspaceRooms = Object.values(OPTIONS_WITH_WORKSPACE_ROOM.reports).reduce<OptionsListUtils.OptionList['reports']>((filtered, option) => {
             const report = option.item;
             // eslint-disable-next-line @typescript-eslint/prefer-nullish-coalescing
             if (ReportUtils.canUserPerformWriteAction(report) || ReportUtils.isExpensifyOnlyParticipantInReport(report)) {
@@ -774,43 +610,18 @@ describe('OptionsListUtils', () => {
         results = OptionsListUtils.getShareDestinationOptions(filteredReportsWithWorkspaceRooms, OPTIONS.personalDetails, [], '');
         // Then we should expect the DMS, the group chats and the workspace room to show
         // We should expect all the recent reports to show, excluding the archived rooms
-        expect(results.recentReports.length).toBe(Object.values(OPTIONS_WITH_WORKSPACES.reports).length - 1);
-
-        // When we search for a workspace room
-        results = OptionsListUtils.getShareDestinationOptions(filteredReportsWithWorkspaceRooms, OPTIONS.personalDetails, [], 'Avengers Room');
-
-        // Then we should expect only the workspace room to show
-        expect(results.recentReports.length).toBe(1);
-
-        // When we search for a workspace room that doesn't exist
-        results = OptionsListUtils.getShareDestinationOptions(filteredReportsWithWorkspaceRooms, OPTIONS.personalDetails, [], 'Mutants Lair');
-
-        // Then we should expect no results to show
-        expect(results.recentReports.length).toBe(0);
+        expect(results.recentReports.length).toBe(Object.values(OPTIONS_WITH_WORKSPACE_ROOM.reports).length - 1);
     });
 
     it('getMemberInviteOptions()', () => {
         // When we only pass personal details
-        let results = OptionsListUtils.getMemberInviteOptions(OPTIONS.personalDetails, [], '');
+        const results = OptionsListUtils.getMemberInviteOptions(OPTIONS.personalDetails, [], '');
 
         // We should expect personal details to be sorted alphabetically
         expect(results.personalDetails[0].text).toBe('Black Panther');
         expect(results.personalDetails[1].text).toBe('Black Widow');
         expect(results.personalDetails[2].text).toBe('Captain America');
         expect(results.personalDetails[3].text).toBe('Invisible Woman');
-
-        // When we provide a search value that does not match any personal details
-        results = OptionsListUtils.getMemberInviteOptions(OPTIONS.personalDetails, [], '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.getMemberInviteOptions(OPTIONS.personalDetails, [], 'peterparker@expensify.com');
-
-        // Then one personal should be in personalDetails list
-        expect(results.personalDetails.length).toBe(1);
-        expect(results.personalDetails[0].text).toBe('Spider-Man');
     });
 
     it('getFilteredOptions() for categories', () => {
@@ -833,6 +644,7 @@ describe('OptionsListUtils', () => {
                 'GL Code': '',
                 externalID: '',
                 origin: '',
+                pendingAction: undefined,
             },
             Restaurant: {
                 enabled: true,
@@ -842,6 +654,7 @@ describe('OptionsListUtils', () => {
                 'GL Code': '',
                 externalID: '',
                 origin: '',
+                pendingAction: 'delete',
             },
             Food: {
                 enabled: true,
@@ -851,6 +664,7 @@ describe('OptionsListUtils', () => {
                 'GL Code': '',
                 externalID: '',
                 origin: '',
+                pendingAction: undefined,
             },
             'Food: Meat': {
                 enabled: true,
@@ -860,6 +674,7 @@ describe('OptionsListUtils', () => {
                 'GL Code': '',
                 externalID: '',
                 origin: '',
+                pendingAction: undefined,
             },
         };
         const smallResultList: OptionsListUtils.CategoryTreeSection[] = [
@@ -874,6 +689,7 @@ describe('OptionsListUtils', () => {
                         tooltipText: 'Food',
                         isDisabled: false,
                         isSelected: false,
+                        pendingAction: undefined,
                     },
                     {
                         text: '    Meat',
@@ -882,14 +698,16 @@ describe('OptionsListUtils', () => {
                         tooltipText: 'Meat',
                         isDisabled: false,
                         isSelected: false,
+                        pendingAction: undefined,
                     },
                     {
                         text: 'Restaurant',
                         keyForList: 'Restaurant',
                         searchText: 'Restaurant',
                         tooltipText: 'Restaurant',
-                        isDisabled: false,
+                        isDisabled: true,
                         isSelected: false,
+                        pendingAction: 'delete',
                     },
                 ],
                 indexOffset: 3,
@@ -908,6 +726,7 @@ describe('OptionsListUtils', () => {
                         tooltipText: 'Food',
                         isDisabled: false,
                         isSelected: false,
+                        pendingAction: undefined,
                     },
                     {
                         text: 'Food: Meat',
@@ -916,6 +735,7 @@ describe('OptionsListUtils', () => {
                         tooltipText: 'Food: Meat',
                         isDisabled: false,
                         isSelected: false,
+                        pendingAction: undefined,
                     },
                 ],
             },
@@ -1067,8 +887,9 @@ describe('OptionsListUtils', () => {
                         keyForList: 'Medical',
                         searchText: 'Medical',
                         tooltipText: 'Medical',
-                        isDisabled: false,
-                        isSelected: false,
+                        isDisabled: true,
+                        isSelected: true,
+                        pendingAction: undefined,
                     },
                 ],
             },
@@ -1084,6 +905,7 @@ describe('OptionsListUtils', () => {
                         tooltipText: 'Restaurant',
                         isDisabled: false,
                         isSelected: false,
+                        pendingAction: undefined,
                     },
                 ],
             },
@@ -1099,6 +921,7 @@ describe('OptionsListUtils', () => {
                         tooltipText: 'Cars',
                         isDisabled: true,
                         isSelected: false,
+                        pendingAction: undefined,
                     },
                     {
                         text: '    Audi',
@@ -1107,6 +930,7 @@ describe('OptionsListUtils', () => {
                         tooltipText: 'Audi',
                         isDisabled: false,
                         isSelected: false,
+                        pendingAction: undefined,
                     },
                     {
                         text: '    Mercedes-Benz',
@@ -1115,6 +939,7 @@ describe('OptionsListUtils', () => {
                         tooltipText: 'Mercedes-Benz',
                         isDisabled: false,
                         isSelected: false,
+                        pendingAction: undefined,
                     },
                     {
                         text: 'Food',
@@ -1123,6 +948,7 @@ describe('OptionsListUtils', () => {
                         tooltipText: 'Food',
                         isDisabled: false,
                         isSelected: false,
+                        pendingAction: undefined,
                     },
                     {
                         text: '    Meat',
@@ -1131,6 +957,7 @@ describe('OptionsListUtils', () => {
                         tooltipText: 'Meat',
                         isDisabled: false,
                         isSelected: false,
+                        pendingAction: undefined,
                     },
                     {
                         text: '    Milk',
@@ -1139,6 +966,7 @@ describe('OptionsListUtils', () => {
                         tooltipText: 'Milk',
                         isDisabled: false,
                         isSelected: false,
+                        pendingAction: undefined,
                     },
                     {
                         text: 'Restaurant',
@@ -1147,6 +975,7 @@ describe('OptionsListUtils', () => {
                         tooltipText: 'Restaurant',
                         isDisabled: false,
                         isSelected: false,
+                        pendingAction: undefined,
                     },
                     {
                         text: 'Travel',
@@ -1155,6 +984,7 @@ describe('OptionsListUtils', () => {
                         tooltipText: 'Travel',
                         isDisabled: true,
                         isSelected: false,
+                        pendingAction: undefined,
                     },
                     {
                         text: '    Meals',
@@ -1163,6 +993,7 @@ describe('OptionsListUtils', () => {
                         tooltipText: 'Meals',
                         isDisabled: false,
                         isSelected: false,
+                        pendingAction: undefined,
                     },
                     {
                         text: '        Breakfast',
@@ -1171,6 +1002,7 @@ describe('OptionsListUtils', () => {
                         tooltipText: 'Breakfast',
                         isDisabled: false,
                         isSelected: false,
+                        pendingAction: undefined,
                     },
                     {
                         text: '        Lunch',
@@ -1179,6 +1011,7 @@ describe('OptionsListUtils', () => {
                         tooltipText: 'Lunch',
                         isDisabled: false,
                         isSelected: false,
+                        pendingAction: undefined,
                     },
                 ],
             },
@@ -1196,6 +1029,7 @@ describe('OptionsListUtils', () => {
                         tooltipText: 'Food',
                         isDisabled: false,
                         isSelected: false,
+                        pendingAction: undefined,
                     },
                     {
                         text: 'Food: Meat',
@@ -1204,6 +1038,7 @@ describe('OptionsListUtils', () => {
                         tooltipText: 'Food: Meat',
                         isDisabled: false,
                         isSelected: false,
+                        pendingAction: undefined,
                     },
                     {
                         text: 'Food: Milk',
@@ -1212,6 +1047,7 @@ describe('OptionsListUtils', () => {
                         tooltipText: 'Food: Milk',
                         isDisabled: false,
                         isSelected: false,
+                        pendingAction: undefined,
                     },
                 ],
             },
@@ -1236,8 +1072,9 @@ describe('OptionsListUtils', () => {
                         keyForList: 'Medical',
                         searchText: 'Medical',
                         tooltipText: 'Medical',
-                        isDisabled: false,
-                        isSelected: false,
+                        isDisabled: true,
+                        isSelected: true,
+                        pendingAction: undefined,
                     },
                 ],
             },
@@ -1332,6 +1169,7 @@ describe('OptionsListUtils', () => {
                 enabled: true,
                 name: 'HR',
                 accountID: undefined,
+                pendingAction: 'delete',
             },
         };
         const smallResultList: OptionsListUtils.CategorySection[] = [
@@ -1347,14 +1185,16 @@ describe('OptionsListUtils', () => {
                         tooltipText: 'Accounting',
                         isDisabled: false,
                         isSelected: false,
+                        pendingAction: undefined,
                     },
                     {
                         text: 'HR',
                         keyForList: 'HR',
                         searchText: 'HR',
                         tooltipText: 'HR',
-                        isDisabled: false,
+                        isDisabled: true,
                         isSelected: false,
+                        pendingAction: 'delete',
                     },
                     {
                         text: 'Medical',
@@ -1363,6 +1203,7 @@ describe('OptionsListUtils', () => {
                         tooltipText: 'Medical',
                         isDisabled: false,
                         isSelected: false,
+                        pendingAction: undefined,
                     },
                 ],
             },
@@ -1379,6 +1220,7 @@ describe('OptionsListUtils', () => {
                         tooltipText: 'Accounting',
                         isDisabled: false,
                         isSelected: false,
+                        pendingAction: undefined,
                     },
                 ],
             },
@@ -1440,6 +1282,7 @@ describe('OptionsListUtils', () => {
                 enabled: true,
                 name: 'Taxes',
                 accountID: undefined,
+                pendingAction: 'delete',
             },
             Benefits: {
                 enabled: true,
@@ -1459,6 +1302,7 @@ describe('OptionsListUtils', () => {
                         tooltipText: 'Medical',
                         isDisabled: false,
                         isSelected: true,
+                        pendingAction: undefined,
                     },
                 ],
             },
@@ -1473,6 +1317,7 @@ describe('OptionsListUtils', () => {
                         tooltipText: 'HR',
                         isDisabled: false,
                         isSelected: false,
+                        pendingAction: undefined,
                     },
                 ],
             },
@@ -1488,6 +1333,7 @@ describe('OptionsListUtils', () => {
                         tooltipText: 'Accounting',
                         isDisabled: false,
                         isSelected: false,
+                        pendingAction: undefined,
                     },
                     {
                         text: 'Benefits',
@@ -1496,6 +1342,7 @@ describe('OptionsListUtils', () => {
                         tooltipText: 'Benefits',
                         isDisabled: false,
                         isSelected: false,
+                        pendingAction: undefined,
                     },
                     {
                         text: 'Cleaning',
@@ -1504,6 +1351,7 @@ describe('OptionsListUtils', () => {
                         tooltipText: 'Cleaning',
                         isDisabled: false,
                         isSelected: false,
+                        pendingAction: undefined,
                     },
                     {
                         text: 'Food',
@@ -1512,6 +1360,7 @@ describe('OptionsListUtils', () => {
                         tooltipText: 'Food',
                         isDisabled: false,
                         isSelected: false,
+                        pendingAction: undefined,
                     },
                     {
                         text: 'HR',
@@ -1520,6 +1369,7 @@ describe('OptionsListUtils', () => {
                         tooltipText: 'HR',
                         isDisabled: false,
                         isSelected: false,
+                        pendingAction: undefined,
                     },
                     {
                         text: 'Software',
@@ -1528,14 +1378,16 @@ describe('OptionsListUtils', () => {
                         tooltipText: 'Software',
                         isDisabled: false,
                         isSelected: false,
+                        pendingAction: undefined,
                     },
                     {
                         text: 'Taxes',
                         keyForList: 'Taxes',
                         searchText: 'Taxes',
                         tooltipText: 'Taxes',
-                        isDisabled: false,
+                        isDisabled: true,
                         isSelected: false,
+                        pendingAction: 'delete',
                     },
                 ],
             },
@@ -1552,6 +1404,7 @@ describe('OptionsListUtils', () => {
                         tooltipText: 'Accounting',
                         isDisabled: false,
                         isSelected: false,
+                        pendingAction: undefined,
                     },
                     {
                         text: 'Cleaning',
@@ -1560,6 +1413,7 @@ describe('OptionsListUtils', () => {
                         tooltipText: 'Cleaning',
                         isDisabled: false,
                         isSelected: false,
+                        pendingAction: undefined,
                     },
                 ],
             },
@@ -1721,6 +1575,7 @@ describe('OptionsListUtils', () => {
                 tooltipText: 'Meals',
                 isDisabled: false,
                 isSelected: false,
+                pendingAction: undefined,
             },
             {
                 text: 'Restaurant',
@@ -1729,6 +1584,7 @@ describe('OptionsListUtils', () => {
                 tooltipText: 'Restaurant',
                 isDisabled: false,
                 isSelected: false,
+                pendingAction: undefined,
             },
             {
                 text: 'Food',
@@ -1737,6 +1593,7 @@ describe('OptionsListUtils', () => {
                 tooltipText: 'Food',
                 isDisabled: false,
                 isSelected: false,
+                pendingAction: undefined,
             },
             {
                 text: '    Meat',
@@ -1745,6 +1602,7 @@ describe('OptionsListUtils', () => {
                 tooltipText: 'Meat',
                 isDisabled: false,
                 isSelected: false,
+                pendingAction: undefined,
             },
             {
                 text: '    Milk',
@@ -1753,6 +1611,7 @@ describe('OptionsListUtils', () => {
                 tooltipText: 'Milk',
                 isDisabled: false,
                 isSelected: false,
+                pendingAction: undefined,
             },
             {
                 text: 'Cars',
@@ -1761,6 +1620,7 @@ describe('OptionsListUtils', () => {
                 tooltipText: 'Cars',
                 isDisabled: true,
                 isSelected: false,
+                pendingAction: undefined,
             },
             {
                 text: '    Audi',
@@ -1769,6 +1629,7 @@ describe('OptionsListUtils', () => {
                 tooltipText: 'Audi',
                 isDisabled: false,
                 isSelected: false,
+                pendingAction: undefined,
             },
             {
                 text: '    Mercedes-Benz',
@@ -1777,6 +1638,7 @@ describe('OptionsListUtils', () => {
                 tooltipText: 'Mercedes-Benz',
                 isDisabled: false,
                 isSelected: false,
+                pendingAction: undefined,
             },
             {
                 text: 'Travel',
@@ -1785,6 +1647,7 @@ describe('OptionsListUtils', () => {
                 tooltipText: 'Travel',
                 isDisabled: true,
                 isSelected: false,
+                pendingAction: undefined,
             },
             {
                 text: '    Meals',
@@ -1793,6 +1656,7 @@ describe('OptionsListUtils', () => {
                 tooltipText: 'Meals',
                 isDisabled: false,
                 isSelected: false,
+                pendingAction: undefined,
             },
             {
                 text: '        Breakfast',
@@ -1801,6 +1665,7 @@ describe('OptionsListUtils', () => {
                 tooltipText: 'Breakfast',
                 isDisabled: false,
                 isSelected: false,
+                pendingAction: undefined,
             },
             {
                 text: '        Lunch',
@@ -1809,6 +1674,7 @@ describe('OptionsListUtils', () => {
                 tooltipText: 'Lunch',
                 isDisabled: false,
                 isSelected: false,
+                pendingAction: undefined,
             },
             {
                 text: 'Plain',
@@ -1817,6 +1683,7 @@ describe('OptionsListUtils', () => {
                 tooltipText: 'Plain',
                 isDisabled: false,
                 isSelected: false,
+                pendingAction: undefined,
             },
             {
                 text: 'Audi',
@@ -1825,6 +1692,7 @@ describe('OptionsListUtils', () => {
                 tooltipText: 'Audi',
                 isDisabled: false,
                 isSelected: false,
+                pendingAction: undefined,
             },
             {
                 text: 'Health',
@@ -1833,6 +1701,7 @@ describe('OptionsListUtils', () => {
                 tooltipText: 'Health',
                 isDisabled: false,
                 isSelected: false,
+                pendingAction: undefined,
             },
             {
                 text: 'A',
@@ -1841,6 +1710,7 @@ describe('OptionsListUtils', () => {
                 tooltipText: 'A',
                 isDisabled: true,
                 isSelected: false,
+                pendingAction: undefined,
             },
             {
                 text: '    B',
@@ -1849,6 +1719,7 @@ describe('OptionsListUtils', () => {
                 tooltipText: 'B',
                 isDisabled: true,
                 isSelected: false,
+                pendingAction: undefined,
             },
             {
                 text: '        C',
@@ -1857,6 +1728,7 @@ describe('OptionsListUtils', () => {
                 tooltipText: 'C',
                 isDisabled: false,
                 isSelected: false,
+                pendingAction: undefined,
             },
             {
                 text: '            D',
@@ -1865,6 +1737,7 @@ describe('OptionsListUtils', () => {
                 tooltipText: 'D',
                 isDisabled: true,
                 isSelected: false,
+                pendingAction: undefined,
             },
             {
                 text: '                E',
@@ -1873,6 +1746,7 @@ describe('OptionsListUtils', () => {
                 tooltipText: 'E',
                 isDisabled: false,
                 isSelected: false,
+                pendingAction: undefined,
             },
         ];
         const resultOneLine = [
@@ -1883,6 +1757,7 @@ describe('OptionsListUtils', () => {
                 tooltipText: 'Meals',
                 isDisabled: false,
                 isSelected: false,
+                pendingAction: undefined,
             },
             {
                 text: 'Restaurant',
@@ -1891,6 +1766,7 @@ describe('OptionsListUtils', () => {
                 tooltipText: 'Restaurant',
                 isDisabled: false,
                 isSelected: false,
+                pendingAction: undefined,
             },
             {
                 text: 'Food',
@@ -1899,6 +1775,7 @@ describe('OptionsListUtils', () => {
                 tooltipText: 'Food',
                 isDisabled: false,
                 isSelected: false,
+                pendingAction: undefined,
             },
             {
                 text: 'Food: Meat',
@@ -1907,6 +1784,7 @@ describe('OptionsListUtils', () => {
                 tooltipText: 'Food: Meat',
                 isDisabled: false,
                 isSelected: false,
+                pendingAction: undefined,
             },
             {
                 text: 'Food: Milk',
@@ -1915,6 +1793,7 @@ describe('OptionsListUtils', () => {
                 tooltipText: 'Food: Milk',
                 isDisabled: false,
                 isSelected: false,
+                pendingAction: undefined,
             },
             {
                 text: 'Cars: Audi',
@@ -1923,6 +1802,7 @@ describe('OptionsListUtils', () => {
                 tooltipText: 'Cars: Audi',
                 isDisabled: false,
                 isSelected: false,
+                pendingAction: undefined,
             },
             {
                 text: 'Cars: Mercedes-Benz',
@@ -1931,6 +1811,7 @@ describe('OptionsListUtils', () => {
                 tooltipText: 'Cars: Mercedes-Benz',
                 isDisabled: false,
                 isSelected: false,
+                pendingAction: undefined,
             },
             {
                 text: 'Travel: Meals',
@@ -1939,6 +1820,7 @@ describe('OptionsListUtils', () => {
                 tooltipText: 'Travel: Meals',
                 isDisabled: false,
                 isSelected: false,
+                pendingAction: undefined,
             },
             {
                 text: 'Travel: Meals: Breakfast',
@@ -1947,6 +1829,7 @@ describe('OptionsListUtils', () => {
                 tooltipText: 'Travel: Meals: Breakfast',
                 isDisabled: false,
                 isSelected: false,
+                pendingAction: undefined,
             },
             {
                 text: 'Travel: Meals: Lunch',
@@ -1955,6 +1838,7 @@ describe('OptionsListUtils', () => {
                 tooltipText: 'Travel: Meals: Lunch',
                 isDisabled: false,
                 isSelected: false,
+                pendingAction: undefined,
             },
             {
                 text: 'Plain',
@@ -1963,6 +1847,7 @@ describe('OptionsListUtils', () => {
                 tooltipText: 'Plain',
                 isDisabled: false,
                 isSelected: false,
+                pendingAction: undefined,
             },
             {
                 text: 'Audi',
@@ -1971,6 +1856,7 @@ describe('OptionsListUtils', () => {
                 tooltipText: 'Audi',
                 isDisabled: false,
                 isSelected: false,
+                pendingAction: undefined,
             },
             {
                 text: 'Health',
@@ -1979,6 +1865,7 @@ describe('OptionsListUtils', () => {
                 tooltipText: 'Health',
                 isDisabled: false,
                 isSelected: false,
+                pendingAction: undefined,
             },
             {
                 text: 'A: B: C',
@@ -1987,6 +1874,7 @@ describe('OptionsListUtils', () => {
                 tooltipText: 'A: B: C',
                 isDisabled: false,
                 isSelected: false,
+                pendingAction: undefined,
             },
             {
                 text: 'A: B: C: D: E',
@@ -1995,6 +1883,7 @@ describe('OptionsListUtils', () => {
                 tooltipText: 'A: B: C: D: E',
                 isDisabled: false,
                 isSelected: false,
+                pendingAction: undefined,
             },
         ];
 
@@ -2023,6 +1912,7 @@ describe('OptionsListUtils', () => {
             Test: {
                 name: 'Test',
                 enabled: true,
+                pendingAction: 'delete' as PendingAction,
             },
             Test1: {
                 name: 'Test1',
@@ -2077,70 +1967,87 @@ describe('OptionsListUtils', () => {
             {
                 name: 'Taxes',
                 enabled: true,
+                pendingAction: undefined,
             },
             {
                 name: 'Taxi',
                 enabled: false,
+                pendingAction: undefined,
             },
             {
                 name: 'Test',
                 enabled: true,
+                pendingAction: 'delete',
             },
             {
                 name: 'Test: Test1',
                 enabled: true,
+                pendingAction: undefined,
             },
             {
                 name: 'Test: Test1: Subtest1',
                 enabled: true,
+                pendingAction: undefined,
             },
             {
                 name: 'Test: Test1: Subtest2',
                 enabled: true,
+                pendingAction: undefined,
             },
             {
                 name: 'Test: Test1: Subtest3',
                 enabled: false,
+                pendingAction: undefined,
             },
             {
                 name: 'Test: Test1: Subtest4',
                 enabled: true,
+                pendingAction: undefined,
             },
             {
                 name: 'Test: Test2',
                 enabled: true,
+                pendingAction: undefined,
             },
             {
                 name: 'Test: Test3: Subtest1',
                 enabled: true,
+                pendingAction: undefined,
             },
             {
                 name: 'Test1',
                 enabled: true,
+                pendingAction: undefined,
             },
             {
                 name: 'Test1: Subtest1',
                 enabled: true,
+                pendingAction: undefined,
             },
             {
                 name: 'Test1: Subtest2',
                 enabled: true,
+                pendingAction: undefined,
             },
             {
                 name: 'Test1: Subtest3',
                 enabled: true,
+                pendingAction: undefined,
             },
             {
                 name: 'Travel',
                 enabled: true,
+                pendingAction: undefined,
             },
             {
                 name: 'Travel: Nested-Travel',
                 enabled: true,
+                pendingAction: undefined,
             },
             {
                 name: 'Utilities',
                 enabled: true,
+                pendingAction: undefined,
             },
         ];
         const categoriesIncorrectOrdering2 = {
@@ -2205,58 +2112,72 @@ describe('OptionsListUtils', () => {
             {
                 enabled: true,
                 name: 'Cars: Audi',
+                pendingAction: undefined,
             },
             {
                 enabled: false,
                 name: 'Cars: BMW',
+                pendingAction: undefined,
             },
             {
                 enabled: true,
                 name: 'Cars: Mercedes-Benz',
+                pendingAction: undefined,
             },
             {
                 enabled: true,
                 name: 'Food',
+                pendingAction: undefined,
             },
             {
                 enabled: true,
                 name: 'Food: Meat',
+                pendingAction: undefined,
             },
             {
                 enabled: true,
                 name: 'Food: Milk',
+                pendingAction: undefined,
             },
             {
                 enabled: false,
                 name: 'Food: Vegetables',
+                pendingAction: undefined,
             },
             {
                 enabled: false,
                 name: 'Medical',
+                pendingAction: undefined,
             },
             {
                 enabled: true,
                 name: 'Restaurant',
+                pendingAction: undefined,
             },
             {
                 enabled: false,
                 name: 'Taxi',
+                pendingAction: undefined,
             },
             {
                 enabled: true,
                 name: 'Travel: Meals',
+                pendingAction: undefined,
             },
             {
                 enabled: true,
                 name: 'Travel: Meals: Breakfast',
+                pendingAction: undefined,
             },
             {
                 enabled: false,
                 name: 'Travel: Meals: Dinner',
+                pendingAction: undefined,
             },
             {
                 enabled: true,
                 name: 'Travel: Meals: Lunch',
+                pendingAction: undefined,
             },
         ];
         const categoriesIncorrectOrdering3 = {
@@ -2289,26 +2210,32 @@ describe('OptionsListUtils', () => {
             {
                 enabled: true,
                 name: 'Dr. House',
+                pendingAction: undefined,
             },
             {
                 enabled: true,
                 name: 'House, M.D.',
+                pendingAction: undefined,
             },
             {
                 enabled: true,
                 name: 'Many.dots.on.the.way.',
+                pendingAction: undefined,
             },
             {
                 enabled: false,
                 name: 'More.Many.dots.on.the.way.',
+                pendingAction: undefined,
             },
             {
                 enabled: true,
                 name: 'Movies',
+                pendingAction: undefined,
             },
             {
                 enabled: true,
                 name: 'Movies: Mr. Nobody',
+                pendingAction: undefined,
             },
         ];
 
@@ -2557,114 +2484,107 @@ describe('OptionsListUtils', () => {
                     value: '3%',
                     code: 'CODE2',
                     modifiedName: 'Tax rate 2 (3%)',
+                    pendingAction: 'delete',
                 },
                 CODE3: {
                     name: 'Tax option 3',
                     value: '5%',
                     code: 'CODE3',
                     modifiedName: 'Tax option 3 (5%)',
+                    pendingAction: undefined,
                 },
                 CODE1: {
                     name: 'Tax exempt 1',
                     value: '0%',
                     code: 'CODE1',
                     modifiedName: 'Tax exempt 1 (0%) • Default',
+                    pendingAction: undefined,
                 },
             },
         };
+        const policy = {
+            taxRates: taxRatesWithDefault,
+        } as Policy;
+
+        const transaction = {
+            taxCode: 'CODE1',
+        } as Transaction;
 
         const resultList: OptionsListUtils.CategorySection[] = [
             {
-                title: '',
-                shouldShow: false,
-                // data sorted alphabetically by name
                 data: [
                     {
-                        // Adds 'Default' title to default tax.
-                        // Adds value to tax name for more description.
-                        text: 'Tax exempt 1 (0%) • Default',
+                        code: 'CODE1',
+                        isDisabled: false,
+                        isSelected: undefined,
                         keyForList: 'Tax exempt 1 (0%) • Default',
                         searchText: 'Tax exempt 1 (0%) • Default',
+                        text: 'Tax exempt 1 (0%) • Default',
                         tooltipText: 'Tax exempt 1 (0%) • Default',
-                        isDisabled: undefined,
-                        // creates a data option.
-                        data: {
-                            name: 'Tax exempt 1',
-                            code: 'CODE1',
-                            modifiedName: 'Tax exempt 1 (0%) • Default',
-                            value: '0%',
-                        },
+                        pendingAction: undefined,
                     },
                     {
-                        text: 'Tax option 3 (5%)',
+                        code: 'CODE3',
+                        isDisabled: false,
+                        isSelected: undefined,
                         keyForList: 'Tax option 3 (5%)',
                         searchText: 'Tax option 3 (5%)',
+                        text: 'Tax option 3 (5%)',
                         tooltipText: 'Tax option 3 (5%)',
-                        isDisabled: undefined,
-                        data: {
-                            name: 'Tax option 3',
-                            code: 'CODE3',
-                            modifiedName: 'Tax option 3 (5%)',
-                            value: '5%',
-                        },
+                        pendingAction: undefined,
                     },
                     {
-                        text: 'Tax rate 2 (3%)',
+                        code: 'CODE2',
+                        isDisabled: true,
+                        isSelected: undefined,
                         keyForList: 'Tax rate 2 (3%)',
                         searchText: 'Tax rate 2 (3%)',
+                        text: 'Tax rate 2 (3%)',
                         tooltipText: 'Tax rate 2 (3%)',
-                        isDisabled: undefined,
-                        data: {
-                            name: 'Tax rate 2',
-                            code: 'CODE2',
-                            modifiedName: 'Tax rate 2 (3%)',
-                            value: '3%',
-                        },
+                        pendingAction: 'delete',
                     },
                 ],
+                shouldShow: false,
+                title: '',
             },
         ];
 
         const searchResultList: OptionsListUtils.CategorySection[] = [
             {
-                title: '',
-                shouldShow: true,
-                // data sorted alphabetically by name
                 data: [
                     {
-                        text: 'Tax rate 2 (3%)',
+                        code: 'CODE2',
+                        isDisabled: true,
+                        isSelected: undefined,
                         keyForList: 'Tax rate 2 (3%)',
                         searchText: 'Tax rate 2 (3%)',
+                        text: 'Tax rate 2 (3%)',
                         tooltipText: 'Tax rate 2 (3%)',
-                        isDisabled: undefined,
-                        data: {
-                            name: 'Tax rate 2',
-                            code: 'CODE2',
-                            modifiedName: 'Tax rate 2 (3%)',
-                            value: '3%',
-                        },
+                        pendingAction: 'delete',
                     },
                 ],
+                shouldShow: true,
+                title: '',
             },
         ];
 
         const wrongSearchResultList: OptionsListUtils.CategorySection[] = [
             {
-                title: '',
-                shouldShow: true,
                 data: [],
+                shouldShow: true,
+                title: '',
             },
         ];
 
-        const result = OptionsListUtils.getFilteredOptions([], [], [], emptySearch, [], [], false, false, false, {}, [], false, {}, [], false, false, true, taxRatesWithDefault);
+        const result = OptionsListUtils.getTaxRatesSection(policy, [], emptySearch, transaction);
 
-        expect(result.taxRatesOptions).toStrictEqual(resultList);
+        expect(result).toStrictEqual(resultList);
 
-        const searchResult = OptionsListUtils.getFilteredOptions([], [], [], search, [], [], false, false, false, {}, [], false, {}, [], false, false, true, taxRatesWithDefault);
-        expect(searchResult.taxRatesOptions).toStrictEqual(searchResultList);
+        const searchResult = OptionsListUtils.getTaxRatesSection(policy, [], search, transaction);
+        expect(searchResult).toStrictEqual(searchResultList);
 
-        const wrongSearchResult = OptionsListUtils.getFilteredOptions([], [], [], wrongSearch, [], [], false, false, false, {}, [], false, {}, [], false, false, true, taxRatesWithDefault);
-        expect(wrongSearchResult.taxRatesOptions).toStrictEqual(wrongSearchResultList);
+        const wrongSearchResult = OptionsListUtils.getTaxRatesSection(policy, [], wrongSearch, transaction);
+        expect(wrongSearchResult).toStrictEqual(wrongSearchResultList);
     });
 
     it('formatMemberForList()', () => {
@@ -2690,20 +2610,19 @@ describe('OptionsListUtils', () => {
             const options = OptionsListUtils.getSearchOptions(OPTIONS, '', [CONST.BETAS.ALL]);
             const filteredOptions = OptionsListUtils.filterOptions(options, '');
 
-            expect(options.recentReports.length + options.personalDetails.length).toBe(filteredOptions.recentReports.length);
+            expect(options.recentReports.length + options.personalDetails.length).toBe(filteredOptions.recentReports.length + filteredOptions.personalDetails.length);
         });
 
         it('should return filtered options in correct order', () => {
             const searchText = 'man';
             const options = OptionsListUtils.getSearchOptions(OPTIONS, '', [CONST.BETAS.ALL]);
 
-            const filteredOptions = OptionsListUtils.filterOptions(options, searchText);
-            expect(filteredOptions.recentReports.length).toBe(5);
+            const filteredOptions = OptionsListUtils.filterOptions(options, searchText, {sortByReportTypeInSearch: true});
+            expect(filteredOptions.recentReports.length).toBe(4);
             expect(filteredOptions.recentReports[0].text).toBe('Invisible Woman');
             expect(filteredOptions.recentReports[1].text).toBe('Spider-Man');
             expect(filteredOptions.recentReports[2].text).toBe('Black Widow');
-            expect(filteredOptions.recentReports[3].text).toBe('Mister Fantastic');
-            expect(filteredOptions.recentReports[4].text).toBe("SHIELD's workspace (archived)");
+            expect(filteredOptions.recentReports[3].text).toBe('Mister Fantastic, Invisible Woman');
         });
 
         it('should filter users by email', () => {
@@ -2730,15 +2649,15 @@ describe('OptionsListUtils', () => {
             const OPTIONS_WITH_PERIODS = OptionsListUtils.createOptionList(PERSONAL_DETAILS_WITH_PERIODS, REPORTS);
             const options = OptionsListUtils.getSearchOptions(OPTIONS_WITH_PERIODS, '', [CONST.BETAS.ALL]);
 
-            const filteredOptions = OptionsListUtils.filterOptions(options, searchText);
+            const filteredOptions = OptionsListUtils.filterOptions(options, searchText, {sortByReportTypeInSearch: true});
 
             expect(filteredOptions.recentReports.length).toBe(1);
             expect(filteredOptions.recentReports[0].login).toBe('barry.allen@expensify.com');
         });
 
-        it('should include workspaces in the search results', () => {
+        it('should include workspace rooms in the search results', () => {
             const searchText = 'avengers';
-            const options = OptionsListUtils.getSearchOptions(OPTIONS_WITH_WORKSPACES, '', [CONST.BETAS.ALL]);
+            const options = OptionsListUtils.getSearchOptions(OPTIONS_WITH_WORKSPACE_ROOM, '', [CONST.BETAS.ALL]);
 
             const filteredOptions = OptionsListUtils.filterOptions(options, searchText);
 
@@ -2752,7 +2671,7 @@ describe('OptionsListUtils', () => {
 
             const filteredOptions = OptionsListUtils.filterOptions(options, searchText);
 
-            expect(filteredOptions.recentReports.length).toBe(2);
+            expect(filteredOptions.recentReports.length).toBe(1);
             expect(filteredOptions.recentReports[0].login).toBe(searchText);
         });
 
@@ -2775,7 +2694,281 @@ describe('OptionsListUtils', () => {
 
             expect(filteredOptions.recentReports.length).toBe(2);
             expect(filteredOptions.recentReports[0].text).toBe('Mister Fantastic');
-            expect(filteredOptions.recentReports[1].text).toBe('Mister Fantastic');
+            expect(filteredOptions.recentReports[1].text).toBe('Mister Fantastic, Invisible Woman');
+        });
+
+        it('should return the user to invite when the search value is a valid, non-existent email', () => {
+            const searchText = 'test@email.com';
+
+            const options = OptionsListUtils.getSearchOptions(OPTIONS, '');
+            const filteredOptions = OptionsListUtils.filterOptions(options, searchText);
+
+            expect(filteredOptions.userToInvite?.login).toBe(searchText);
+        });
+
+        it('should not return any results if the search value is on an exluded logins list', () => {
+            const searchText = 'admin@expensify.com';
+
+            const options = OptionsListUtils.getFilteredOptions(OPTIONS.reports, OPTIONS.personalDetails, [], searchText, [], CONST.EXPENSIFY_EMAILS);
+            const filterOptions = OptionsListUtils.filterOptions(options, searchText, {excludeLogins: CONST.EXPENSIFY_EMAILS});
+            expect(filterOptions.recentReports.length).toBe(0);
+        });
+
+        it('should return the user to invite when the search value is a valid, non-existent email and the user is not excluded', () => {
+            const searchText = 'test@email.com';
+
+            const options = OptionsListUtils.getSearchOptions(OPTIONS, '');
+            const filteredOptions = OptionsListUtils.filterOptions(options, searchText, {excludeLogins: CONST.EXPENSIFY_EMAILS});
+
+            expect(filteredOptions.userToInvite?.login).toBe(searchText);
+        });
+
+        it('should return limited amount of recent reports if the limit is set', () => {
+            const searchText = '';
+
+            const options = OptionsListUtils.getSearchOptions(OPTIONS, '');
+            const filteredOptions = OptionsListUtils.filterOptions(options, searchText, {maxRecentReportsToShow: 2});
+
+            expect(filteredOptions.recentReports.length).toBe(2);
+        });
+
+        it('should not return any user to invite if email exists on the personal details list', () => {
+            const searchText = 'natasharomanoff@expensify.com';
+            const options = OptionsListUtils.getSearchOptions(OPTIONS, '', [CONST.BETAS.ALL]);
+
+            const filteredOptions = OptionsListUtils.filterOptions(options, searchText);
+            expect(filteredOptions.personalDetails.length).toBe(1);
+            expect(filteredOptions.userToInvite).toBe(null);
+        });
+
+        it('should not return any options if search value does not match any personal details (getMemberInviteOptions)', () => {
+            const options = OptionsListUtils.getMemberInviteOptions(OPTIONS.personalDetails, [], '');
+            const filteredOptions = OptionsListUtils.filterOptions(options, 'magneto');
+            expect(filteredOptions.personalDetails.length).toBe(0);
+        });
+
+        it('should return one personal detail if search value matches an email (getMemberInviteOptions)', () => {
+            const options = OptionsListUtils.getMemberInviteOptions(OPTIONS.personalDetails, [], '');
+            const filteredOptions = OptionsListUtils.filterOptions(options, 'peterparker@expensify.com');
+
+            expect(filteredOptions.personalDetails.length).toBe(1);
+            expect(filteredOptions.personalDetails[0].text).toBe('Spider-Man');
+        });
+
+        it('should not show any recent reports if a search value does not match the group chat name (getShareDestinationsOptions)', () => {
+            // Filter current REPORTS as we do in the component, before getting share destination options
+            const filteredReports = Object.values(OPTIONS.reports).reduce<OptionsListUtils.OptionList['reports']>((filtered, option) => {
+                const report = option.item;
+                if (ReportUtils.canUserPerformWriteAction(report) && ReportUtils.canCreateTaskInReport(report) && !ReportUtils.isCanceledTaskReport(report)) {
+                    filtered.push(option);
+                }
+                return filtered;
+            }, []);
+            const options = OptionsListUtils.getShareDestinationOptions(filteredReports, OPTIONS.personalDetails, [], '');
+            const filteredOptions = OptionsListUtils.filterOptions(options, 'mutants');
+
+            expect(filteredOptions.recentReports.length).toBe(0);
+        });
+
+        it('should return a workspace room when we search for a workspace room(getShareDestinationsOptions)', () => {
+            const filteredReportsWithWorkspaceRooms = Object.values(OPTIONS_WITH_WORKSPACE_ROOM.reports).reduce<OptionsListUtils.OptionList['reports']>((filtered, option) => {
+                const report = option.item;
+                // eslint-disable-next-line @typescript-eslint/prefer-nullish-coalescing
+                if (ReportUtils.canUserPerformWriteAction(report) || ReportUtils.isExpensifyOnlyParticipantInReport(report)) {
+                    filtered.push(option);
+                }
+                return filtered;
+            }, []);
+
+            const options = OptionsListUtils.getShareDestinationOptions(filteredReportsWithWorkspaceRooms, OPTIONS.personalDetails, [], '');
+            const filteredOptions = OptionsListUtils.filterOptions(options, 'Avengers Room');
+
+            expect(filteredOptions.recentReports.length).toBe(1);
+        });
+
+        it('should not show any results if searching for a non-existing workspace room(getShareDestinationOptions)', () => {
+            const filteredReportsWithWorkspaceRooms = Object.values(OPTIONS_WITH_WORKSPACE_ROOM.reports).reduce<OptionsListUtils.OptionList['reports']>((filtered, option) => {
+                const report = option.item;
+                // eslint-disable-next-line @typescript-eslint/prefer-nullish-coalescing
+                if (ReportUtils.canUserPerformWriteAction(report) || ReportUtils.isExpensifyOnlyParticipantInReport(report)) {
+                    filtered.push(option);
+                }
+                return filtered;
+            }, []);
+
+            const options = OptionsListUtils.getShareDestinationOptions(filteredReportsWithWorkspaceRooms, OPTIONS.personalDetails, [], '');
+            const filteredOptions = OptionsListUtils.filterOptions(options, 'Mutants Lair');
+
+            expect(filteredOptions.recentReports.length).toBe(0);
+        });
+
+        it('should show the option from personal details when searching for personal detail with no existing report (getFilteredOptions)', () => {
+            const options = OptionsListUtils.getFilteredOptions(OPTIONS.reports, OPTIONS.personalDetails, [], '');
+            const filteredOptions = OptionsListUtils.filterOptions(options, 'hulk');
+
+            expect(filteredOptions.recentReports.length).toBe(0);
+
+            expect(filteredOptions.personalDetails.length).toBe(1);
+            expect(filteredOptions.personalDetails[0].login).toBe('brucebanner@expensify.com');
+        });
+
+        it('should return all matching reports and personal details (getFilteredOptions)', () => {
+            const options = OptionsListUtils.getFilteredOptions(OPTIONS.reports, OPTIONS.personalDetails, [], '');
+            const filteredOptions = OptionsListUtils.filterOptions(options, '.com');
+
+            expect(filteredOptions.recentReports.length).toBe(5);
+            expect(filteredOptions.recentReports[0].text).toBe('Captain America');
+
+            expect(filteredOptions.personalDetails.length).toBe(4);
+            expect(filteredOptions.personalDetails[0].login).toBe('natasharomanoff@expensify.com');
+        });
+
+        it('should not return any options or user to invite if there are no search results and the string does not match a potential email or phone (getFilteredOptions)', () => {
+            const options = OptionsListUtils.getFilteredOptions(OPTIONS.reports, OPTIONS.personalDetails, [], '');
+            const filteredOptions = OptionsListUtils.filterOptions(options, 'marc@expensify');
+
+            expect(filteredOptions.recentReports.length).toBe(0);
+            expect(filteredOptions.personalDetails.length).toBe(0);
+            expect(filteredOptions.userToInvite).toBe(null);
+        });
+
+        it('should not return any options but should return an user to invite if no matching options exist and the search value is a potential email (getFilteredOptions)', () => {
+            const options = OptionsListUtils.getFilteredOptions(OPTIONS.reports, OPTIONS.personalDetails, [], '');
+            const filteredOptions = OptionsListUtils.filterOptions(options, 'marc@expensify.com');
+
+            expect(filteredOptions.recentReports.length).toBe(0);
+            expect(filteredOptions.personalDetails.length).toBe(0);
+            expect(filteredOptions.userToInvite).not.toBe(null);
+        });
+
+        it('should return user to invite when search term has a period with options for it that do not contain the period (getFilteredOptions)', () => {
+            const options = OptionsListUtils.getFilteredOptions(OPTIONS.reports, OPTIONS.personalDetails, [], '');
+            const filteredOptions = OptionsListUtils.filterOptions(options, 'peter.parker@expensify.com');
+
+            expect(filteredOptions.recentReports.length).toBe(0);
+            expect(filteredOptions.userToInvite).not.toBe(null);
+        });
+
+        it('should not return options but should return an user to invite if no matching options exist and the search value is a potential phone number (getFilteredOptions)', () => {
+            const options = OptionsListUtils.getFilteredOptions(OPTIONS.reports, OPTIONS.personalDetails, [], '');
+            const filteredOptions = OptionsListUtils.filterOptions(options, '5005550006');
+
+            expect(filteredOptions.recentReports.length).toBe(0);
+            expect(filteredOptions.personalDetails.length).toBe(0);
+            expect(filteredOptions.userToInvite).not.toBe(null);
+            expect(filteredOptions.userToInvite?.login).toBe('+15005550006');
+        });
+
+        it('should not return options but should return an user to invite if no matching options exist and the search value is a potential phone number with country code added (getFilteredOptions)', () => {
+            const options = OptionsListUtils.getFilteredOptions(OPTIONS.reports, OPTIONS.personalDetails, [], '');
+            const filteredOptions = OptionsListUtils.filterOptions(options, '+15005550006');
+
+            expect(filteredOptions.recentReports.length).toBe(0);
+            expect(filteredOptions.personalDetails.length).toBe(0);
+            expect(filteredOptions.userToInvite).not.toBe(null);
+            expect(filteredOptions.userToInvite?.login).toBe('+15005550006');
+        });
+
+        it('should not return options but should return an user to invite if no matching options exist and the search value is a potential phone number with special characters added (getFilteredOptions)', () => {
+            const options = OptionsListUtils.getFilteredOptions(OPTIONS.reports, OPTIONS.personalDetails, [], '');
+            const filteredOptions = OptionsListUtils.filterOptions(options, '+1 (800)324-3233');
+
+            expect(filteredOptions.recentReports.length).toBe(0);
+            expect(filteredOptions.personalDetails.length).toBe(0);
+            expect(filteredOptions.userToInvite).not.toBe(null);
+            expect(filteredOptions.userToInvite?.login).toBe('+18003243233');
+        });
+
+        it('should not return any options or user to invite if contact number contains alphabet characters (getFilteredOptions)', () => {
+            const options = OptionsListUtils.getFilteredOptions(OPTIONS.reports, OPTIONS.personalDetails, [], '');
+            const filteredOptions = OptionsListUtils.filterOptions(options, '998243aaaa');
+
+            expect(filteredOptions.recentReports.length).toBe(0);
+            expect(filteredOptions.personalDetails.length).toBe(0);
+            expect(filteredOptions.userToInvite).toBe(null);
+        });
+
+        it('should not return any options if search value does not match any personal details (getFilteredOptions)', () => {
+            const options = OptionsListUtils.getFilteredOptions(OPTIONS.reports, OPTIONS.personalDetails, [], '');
+            const filteredOptions = OptionsListUtils.filterOptions(options, 'magneto');
+
+            expect(filteredOptions.personalDetails.length).toBe(0);
+        });
+
+        it('should return one recent report and no personal details if a search value provides an email (getFilteredOptions)', () => {
+            const options = OptionsListUtils.getFilteredOptions(OPTIONS.reports, OPTIONS.personalDetails, [], '');
+            const filteredOptions = OptionsListUtils.filterOptions(options, 'peterparker@expensify.com', {sortByReportTypeInSearch: true});
+            expect(filteredOptions.recentReports.length).toBe(1);
+            expect(filteredOptions.recentReports[0].text).toBe('Spider-Man');
+            expect(filteredOptions.personalDetails.length).toBe(0);
+        });
+
+        it('should return all matching reports and personal details (getFilteredOptions)', () => {
+            const options = OptionsListUtils.getFilteredOptions(OPTIONS.reports, OPTIONS.personalDetails, [], '');
+            const filteredOptions = OptionsListUtils.filterOptions(options, '.com');
+
+            expect(filteredOptions.personalDetails.length).toBe(4);
+            expect(filteredOptions.recentReports.length).toBe(5);
+            expect(filteredOptions.personalDetails[0].login).toBe('natasharomanoff@expensify.com');
+            expect(filteredOptions.recentReports[0].text).toBe('Captain America');
+            expect(filteredOptions.recentReports[1].text).toBe('Mr Sinister');
+            expect(filteredOptions.recentReports[2].text).toBe('Black Panther');
+        });
+
+        it('should return matching option when searching (getSearchOptions)', () => {
+            const options = OptionsListUtils.getSearchOptions(OPTIONS, '');
+            const filteredOptions = OptionsListUtils.filterOptions(options, 'spider');
+
+            expect(filteredOptions.recentReports.length).toBe(1);
+            expect(filteredOptions.recentReports[0].text).toBe('Spider-Man');
+        });
+
+        it('should return latest lastVisibleActionCreated item on top when search value matches multiple items (getSearchOptions)', () => {
+            const options = OptionsListUtils.getSearchOptions(OPTIONS, '');
+            const filteredOptions = OptionsListUtils.filterOptions(options, 'fantastic');
+
+            expect(filteredOptions.recentReports.length).toBe(2);
+            expect(filteredOptions.recentReports[0].text).toBe('Mister Fantastic');
+            expect(filteredOptions.recentReports[1].text).toBe('Mister Fantastic, Invisible Woman');
+
+            return waitForBatchedUpdates()
+                .then(() => Onyx.set(ONYXKEYS.PERSONAL_DETAILS_LIST, PERSONAL_DETAILS_WITH_PERIODS))
+                .then(() => {
+                    const OPTIONS_WITH_PERIODS = OptionsListUtils.createOptionList(PERSONAL_DETAILS_WITH_PERIODS, REPORTS);
+                    const results = OptionsListUtils.getSearchOptions(OPTIONS_WITH_PERIODS, '');
+                    const filteredResults = OptionsListUtils.filterOptions(results, 'barry.allen@expensify.com', {sortByReportTypeInSearch: true});
+
+                    expect(filteredResults.recentReports.length).toBe(1);
+                    expect(filteredResults.recentReports[0].text).toBe('The Flash');
+                });
+        });
+    });
+
+    describe('canCreateOptimisticPersonalDetailOption', () => {
+        const VALID_EMAIL = 'valid@email.com';
+        it('should allow to create optimistic personal detail option if email is valid', () => {
+            const canCreate = OptionsListUtils.canCreateOptimisticPersonalDetailOption({
+                searchValue: VALID_EMAIL,
+                recentReportOptions: OPTIONS.reports,
+                personalDetailsOptions: OPTIONS.personalDetails,
+                currentUserOption: null,
+                excludeUnknownUsers: false,
+            });
+
+            expect(canCreate).toBe(true);
+        });
+
+        it('should not allow to create option if email is an email of current user', () => {
+            const currentUserEmail = 'tonystark@expensify.com';
+            const canCreate = OptionsListUtils.canCreateOptimisticPersonalDetailOption({
+                searchValue: currentUserEmail,
+                recentReportOptions: OPTIONS.reports,
+                personalDetailsOptions: OPTIONS.personalDetails,
+                currentUserOption: null,
+                excludeUnknownUsers: false,
+            });
+
+            expect(canCreate).toBe(false);
         });
     });
 });
diff --git a/tests/unit/PaginationUtilsTest.ts b/tests/unit/PaginationUtilsTest.ts
new file mode 100644
index 000000000000..09323e10a416
--- /dev/null
+++ b/tests/unit/PaginationUtilsTest.ts
@@ -0,0 +1,568 @@
+import CONST from '@src/CONST';
+import type {Pages} from '@src/types/onyx';
+import PaginationUtils from '../../src/libs/PaginationUtils';
+
+type Item = {
+    id: string;
+};
+
+function createItems(ids: string[]): Item[] {
+    return ids.map((id) => ({
+        id,
+    }));
+}
+
+function getID(item: Item) {
+    return item.id;
+}
+
+describe('PaginationUtils', () => {
+    describe('getContinuousChain', () => {
+        test.each([
+            [
+                ['1', '2', '3', '4', '5', '6', '7'],
+                ['7', '6', '5', '4', '3', '2', '1'],
+            ],
+            [
+                ['9', '10', '11', '12'],
+                ['12', '11', '10', '9'],
+            ],
+            [
+                ['14', '15', '16', '17'],
+                ['17', '16', '15', '14'],
+            ],
+        ])('given ID in the range %s, it will return the items with ID in range %s', (targetIDs, expectedOutputIDs) => {
+            const expectedOutput = createItems(expectedOutputIDs);
+            const input = createItems([
+                '17',
+                '16',
+                '15',
+                '14',
+                // Gap
+                '12',
+                '11',
+                '10',
+                '9',
+                // Gap
+                '7',
+                '6',
+                '5',
+                '4',
+                '3',
+                '2',
+                '1',
+            ]);
+            const pages = [
+                ['17', '16', '15', '14'],
+                ['12', '11', '10', '9'],
+                ['7', '6', '5', '4', '3', '2', '1'],
+            ];
+            for (const targetID of targetIDs) {
+                const result = PaginationUtils.getContinuousChain(input, pages, getID, targetID);
+                expect(result).toStrictEqual(expectedOutput);
+            }
+        });
+
+        it('given an input ID of 8 or 13 which do not exist in Onyx it will return an empty array', () => {
+            const input: Item[] = createItems([
+                // Given these sortedItems
+                '17',
+                '16',
+                '15',
+                '14',
+                // Gap
+                '12',
+                '11',
+                '10',
+                '9',
+                // Gap
+                '7',
+                '6',
+                '5',
+                '4',
+                '3',
+                '2',
+                '1',
+            ]);
+
+            const pages = [
+                // Given these pages
+                ['17', '16', '15', '14'],
+                ['12', '11', '10', '9'],
+                ['7', '6', '5', '4', '3', '2', '1'],
+            ];
+
+            // Expect these sortedItems
+            const expectedResult: Item[] = [];
+            const result = PaginationUtils.getContinuousChain(input, pages, getID, '8');
+            expect(result).toStrictEqual(expectedResult);
+        });
+
+        it('given an input ID of an action in a gap it will return only that action', () => {
+            const input = createItems([
+                // Given these sortedItems
+                '17',
+                '16',
+                '15',
+                '14',
+                '13',
+                '12',
+                '11',
+                '10',
+                '9',
+                '8',
+                '7',
+                '6',
+                '5',
+                '4',
+                '3',
+                '2',
+                '1',
+            ]);
+
+            const pages = [
+                // Given these pages
+                ['17', '16', '15', '14'],
+                ['12', '11', '10', '9'],
+                ['7', '6', '5', '4', '3', '2', '1'],
+            ];
+
+            const expectedResult = createItems([
+                // Expect these sortedItems
+                '8',
+            ]);
+            const result = PaginationUtils.getContinuousChain(input, pages, getID, '8');
+            expect(result).toStrictEqual(expectedResult);
+        });
+
+        it('given an empty input ID and the report only contains pending actions, it will return all actions', () => {
+            const input = createItems([
+                // Given these sortedItems
+                '7',
+                '6',
+                '5',
+                '4',
+                '3',
+                '2',
+                '1',
+            ]);
+
+            const pages: Pages = [];
+
+            // Expect these sortedItems
+            const expectedResult = [...input];
+            const result = PaginationUtils.getContinuousChain(input, pages, getID, '');
+            expect(result).toStrictEqual(expectedResult);
+        });
+
+        it('given an input ID and the report only contains pending actions, it will return an empty array', () => {
+            const input = createItems([
+                // Given these sortedItems
+                '7',
+                '6',
+                '5',
+                '4',
+                '3',
+                '2',
+                '1',
+            ]);
+
+            const pages: Pages = [];
+
+            // Expect these sortedItems
+            const expectedResult: Item[] = [];
+            const result = PaginationUtils.getContinuousChain(input, pages, getID, '4');
+            expect(result).toStrictEqual(expectedResult);
+        });
+
+        it('does not include actions outside of pages', () => {
+            const input = createItems([
+                // Given these sortedItems
+                '17',
+                '16',
+                '15',
+                '14',
+                '13',
+                '12',
+                '11',
+                '10',
+                '9',
+                '8',
+                '7',
+                '6',
+                '5',
+                '4',
+                '3',
+                '2',
+                '1',
+            ]);
+
+            const pages = [
+                // Given these pages
+                ['17', '16', '15', '14'],
+                ['12', '11', '10', '9'],
+                ['7', '6', '5', '4', '3', '2'],
+            ];
+
+            const expectedResult = createItems([
+                // Expect these sortedItems
+                '12',
+                '11',
+                '10',
+                '9',
+            ]);
+            const result = PaginationUtils.getContinuousChain(input, pages, getID, '10');
+            expect(result).toStrictEqual(expectedResult);
+        });
+
+        it('given a page with an empty firstItemID include actions until the start', () => {
+            const input = createItems([
+                // Given these sortedItems
+                '17',
+                '16',
+                '15',
+                '14',
+            ]);
+
+            const pages = [
+                // Given these pages
+                [CONST.PAGINATION_START_ID, '15', '14'],
+            ];
+
+            const expectedResult = createItems([
+                // Expect these sortedItems
+                '17',
+                '16',
+                '15',
+                '14',
+            ]);
+            const result = PaginationUtils.getContinuousChain(input, pages, getID, '');
+            expect(result).toStrictEqual(expectedResult);
+        });
+
+        it('given a page with null lastItemID include actions to the end', () => {
+            const input = createItems([
+                // Given these sortedItems
+                '17',
+                '16',
+                '15',
+                '14',
+            ]);
+
+            const pages = [
+                // Given these pages
+                ['17', '16', CONST.PAGINATION_END_ID],
+            ];
+
+            const expectedResult = createItems([
+                // Expect these sortedItems
+                '17',
+                '16',
+                '15',
+                '14',
+            ]);
+            const result = PaginationUtils.getContinuousChain(input, pages, getID, '');
+            expect(result).toStrictEqual(expectedResult);
+        });
+    });
+
+    describe('mergeAndSortContinuousPages', () => {
+        it('merges continuous pages', () => {
+            const sortedItems = createItems([
+                // Given these sortedItems
+                '5',
+                '4',
+                '3',
+                '2',
+                '1',
+            ]);
+            const pages = [
+                // Given these pages
+                ['5', '4', '3'],
+                ['3', '2', '1'],
+            ];
+            const expectedResult = [
+                // Expect these pages
+                ['5', '4', '3', '2', '1'],
+            ];
+            const result = PaginationUtils.mergeAndSortContinuousPages(sortedItems, pages, getID);
+            expect(result).toStrictEqual(expectedResult);
+        });
+
+        it('merges overlapping pages', () => {
+            const sortedItems = createItems([
+                // Given these sortedItems
+                '5',
+                '4',
+                '3',
+                '2',
+                '1',
+            ]);
+            const pages = [
+                // Given these pages
+                ['4', '3', '2'],
+                ['3', '2', '1'],
+            ];
+            const expectedResult = [
+                // Expect these pages
+                ['4', '3', '2', '1'],
+            ];
+            const result = PaginationUtils.mergeAndSortContinuousPages(sortedItems, pages, getID);
+            expect(result).toStrictEqual(expectedResult);
+        });
+
+        it('merges included pages', () => {
+            const sortedItems = createItems([
+                // Given these sortedItems
+                '5',
+                '4',
+                '3',
+                '2',
+                '1',
+            ]);
+            const pages = [
+                // Given these pages
+                ['5', '4', '3', '2', '1'],
+                ['5', '4', '3', '2'],
+            ];
+            const expectedResult = [
+                // Expect these pages
+                ['5', '4', '3', '2', '1'],
+            ];
+            const result = PaginationUtils.mergeAndSortContinuousPages(sortedItems, pages, getID);
+            expect(result).toStrictEqual(expectedResult);
+        });
+
+        it('do not merge separate pages', () => {
+            const sortedItems = createItems([
+                // Given these sortedItems
+                '5',
+                '4',
+                // Gap
+                '2',
+                '1',
+            ]);
+            const pages = [
+                // Given these pages
+                ['5', '4'],
+                ['2', '1'],
+            ];
+            const expectedResult = [
+                // Expect these pages
+                ['5', '4'],
+                ['2', '1'],
+            ];
+            const result = PaginationUtils.mergeAndSortContinuousPages(sortedItems, pages, getID);
+            expect(result).toStrictEqual(expectedResult);
+        });
+
+        it('sorts pages', () => {
+            const sortedItems = createItems([
+                // Given these sortedItems
+                '9',
+                '8',
+                // Gap
+                '6',
+                '5',
+                // Gap
+                '3',
+                '2',
+                '1',
+            ]);
+            const pages = [
+                // Given these pages
+                ['3', '2', '1'],
+                ['3', '2'],
+                ['6', '5'],
+                ['9', '8'],
+            ];
+            const expectedResult = [
+                // Expect these pages
+                ['9', '8'],
+                ['6', '5'],
+                ['3', '2', '1'],
+            ];
+            const result = PaginationUtils.mergeAndSortContinuousPages(sortedItems, pages, getID);
+            expect(result).toStrictEqual(expectedResult);
+        });
+
+        it('handles actions that no longer exist', () => {
+            const sortedItems = createItems([
+                // Given these sortedItems
+                '4',
+                '3',
+            ]);
+            const pages = [
+                // Given these pages
+                ['6', '5', '4', '3', '2', '1'],
+            ];
+            const expectedResult = [
+                // Expect these pages
+                ['4', '3'],
+            ];
+            const result = PaginationUtils.mergeAndSortContinuousPages(sortedItems, pages, getID);
+            expect(result).toStrictEqual(expectedResult);
+        });
+
+        it('removes pages that are empty', () => {
+            const sortedItems = createItems([
+                // Given these sortedItems
+                '4',
+            ]);
+            const pages = [
+                // Given these pages
+                ['6', '5'],
+                ['3', '2', '1'],
+            ];
+
+            // Expect these pages
+            const expectedResult: Pages = [];
+            const result = PaginationUtils.mergeAndSortContinuousPages(sortedItems, pages, getID);
+            expect(result).toStrictEqual(expectedResult);
+        });
+
+        it('handles pages with a single action', () => {
+            const sortedItems = createItems([
+                // Given these sortedItems
+                '4',
+                '2',
+            ]);
+            const pages = [
+                // Given these pages
+                ['4'],
+                ['2'],
+                ['2'],
+            ];
+            const expectedResult = [
+                // Expect these pages
+                ['4'],
+                ['2'],
+            ];
+            const result = PaginationUtils.mergeAndSortContinuousPages(sortedItems, pages, getID);
+            expect(result).toStrictEqual(expectedResult);
+        });
+
+        it('handles out of order ids', () => {
+            const sortedItems = createItems([
+                // Given these sortedItems
+                '2',
+                '1',
+                '3',
+                '4',
+            ]);
+            const pages = [
+                // Given these pages
+                ['2', '1'],
+                ['1', '3'],
+                ['4'],
+            ];
+            const expectedResult = [
+                // Expect these pages
+                ['2', '1', '3'],
+                ['4'],
+            ];
+            const result = PaginationUtils.mergeAndSortContinuousPages(sortedItems, pages, getID);
+            expect(result).toStrictEqual(expectedResult);
+        });
+
+        it('handles basic reordering', () => {
+            const sortedItems = createItems([
+                // Given these sortedItems
+                '1',
+                '2',
+                '4',
+                '5',
+            ]);
+            const pages = [
+                // Given these pages
+                ['5', '4'],
+                ['2', '1'],
+            ];
+            const expectedResult = [
+                // Expect these pages
+                ['1', '2'],
+                ['4', '5'],
+            ];
+            const result = PaginationUtils.mergeAndSortContinuousPages(sortedItems, pages, getID);
+            expect(result).toStrictEqual(expectedResult);
+        });
+
+        it('handles page start markers', () => {
+            const sortedItems = createItems([
+                // Given these sortedItems
+                '1',
+                '2',
+            ]);
+            const pages = [
+                // Given these pages
+                ['1', '2'],
+                [CONST.PAGINATION_START_ID, '1'],
+            ];
+            const expectedResult = [
+                // Expect these pages
+                [CONST.PAGINATION_START_ID, '1', '2'],
+            ];
+            const result = PaginationUtils.mergeAndSortContinuousPages(sortedItems, pages, getID);
+            expect(result).toStrictEqual(expectedResult);
+        });
+
+        it('handles page end markers', () => {
+            const sortedItems = createItems([
+                // Given these sortedItems
+                '1',
+                '2',
+            ]);
+            const pages = [
+                // Given these pages
+                ['2', CONST.PAGINATION_END_ID],
+                ['1', '2'],
+            ];
+            const expectedResult = [
+                // Expect these pages
+                ['1', '2', CONST.PAGINATION_END_ID],
+            ];
+            const result = PaginationUtils.mergeAndSortContinuousPages(sortedItems, pages, getID);
+            expect(result).toStrictEqual(expectedResult);
+        });
+
+        it('handles both page markers', () => {
+            const sortedItems = createItems([
+                // Given these sortedItems
+                '1',
+                '2',
+                '3',
+            ]);
+            const pages = [
+                // Given these pages
+                [CONST.PAGINATION_START_ID, '1', '2', '3', CONST.PAGINATION_END_ID],
+                [CONST.PAGINATION_START_ID, '2', CONST.PAGINATION_END_ID],
+            ];
+            const expectedResult = [
+                // Expect these pages
+                [CONST.PAGINATION_START_ID, '1', '2', '3', CONST.PAGINATION_END_ID],
+            ];
+            const result = PaginationUtils.mergeAndSortContinuousPages(sortedItems, pages, getID);
+            expect(result).toStrictEqual(expectedResult);
+        });
+
+        it('handles mixed page markers', () => {
+            const sortedItems = createItems([
+                // Given these sortedItems
+                '1',
+                '2',
+                '3',
+            ]);
+            const pages = [
+                // Given these pages
+                [CONST.PAGINATION_START_ID, '1', '2', '3'],
+                ['2', '3', CONST.PAGINATION_END_ID],
+            ];
+            const expectedResult = [
+                // Expect these pages
+                [CONST.PAGINATION_START_ID, '1', '2', '3', CONST.PAGINATION_END_ID],
+            ];
+            const result = PaginationUtils.mergeAndSortContinuousPages(sortedItems, pages, getID);
+            expect(result).toStrictEqual(expectedResult);
+        });
+    });
+});
diff --git a/tests/unit/PolicyUtilsTest.ts b/tests/unit/PolicyUtilsTest.ts
new file mode 100644
index 000000000000..8178bb99e877
--- /dev/null
+++ b/tests/unit/PolicyUtilsTest.ts
@@ -0,0 +1,48 @@
+import * as PolicyUtils from '@libs/PolicyUtils';
+
+function toLocaleDigitMock(dot: string): string {
+    return dot;
+}
+
+describe('PolicyUtils', () => {
+    describe('getRateDisplayValue', () => {
+        it('should return an empty string for NaN', () => {
+            const rate = PolicyUtils.getRateDisplayValue('invalid' as unknown as number, toLocaleDigitMock);
+            expect(rate).toEqual('');
+        });
+
+        describe('withDecimals = false', () => {
+            it('should return integer value as is', () => {
+                const rate = PolicyUtils.getRateDisplayValue(100, toLocaleDigitMock);
+                expect(rate).toEqual('100');
+            });
+
+            it('should return non-integer value as is', () => {
+                const rate = PolicyUtils.getRateDisplayValue(10.5, toLocaleDigitMock);
+                expect(rate).toEqual('10.5');
+            });
+        });
+
+        describe('withDecimals = true', () => {
+            it('should return integer value with 2 trailing zeros', () => {
+                const rate = PolicyUtils.getRateDisplayValue(10, toLocaleDigitMock, true);
+                expect(rate).toEqual('10.00');
+            });
+
+            it('should return non-integer value with up to 2 trailing zeros', () => {
+                const rate = PolicyUtils.getRateDisplayValue(10.5, toLocaleDigitMock, true);
+                expect(rate).toEqual('10.50');
+            });
+
+            it('should return non-integer value with 3 decimals as is', () => {
+                const rate = PolicyUtils.getRateDisplayValue(10.531, toLocaleDigitMock, true);
+                expect(rate).toEqual('10.531');
+            });
+
+            it('should return non-integer value with 3+ decimals cut to 3', () => {
+                const rate = PolicyUtils.getRateDisplayValue(10.531345, toLocaleDigitMock, true);
+                expect(rate).toEqual('10.531');
+            });
+        });
+    });
+});
diff --git a/tests/unit/ReportActionsUtilsTest.ts b/tests/unit/ReportActionsUtilsTest.ts
index 05fe50fe78b7..d753069265f8 100644
--- a/tests/unit/ReportActionsUtilsTest.ts
+++ b/tests/unit/ReportActionsUtilsTest.ts
@@ -1,3 +1,4 @@
+import type {KeyValueMapping} from 'react-native-onyx';
 import Onyx from 'react-native-onyx';
 import CONST from '../../src/CONST';
 import * as ReportActionsUtils from '../../src/libs/ReportActionsUtils';
@@ -441,1486 +442,6 @@ describe('ReportActionsUtils', () => {
             expect(result).toStrictEqual(input);
         });
     });
-    describe('getContinuousReportActionChain', () => {
-        it('given an input ID of 1, ..., 7 it will return the report actions with id 1 - 7', () => {
-            const input: ReportAction[] = [
-                // Given these sortedReportActions
-                {
-                    reportActionID: '1',
-                    previousReportActionID: undefined,
-                    created: '2022-11-13 22:27:01.825',
-                    actionName: CONST.REPORT.ACTIONS.TYPE.ADD_COMMENT,
-                    originalMessage: {
-                        html: 'Hello world',
-                        whisperedTo: [],
-                    },
-                    message: [
-                        {
-                            html: 'Hello world',
-                            type: 'Action type',
-                            text: 'Action text',
-                        },
-                    ],
-                },
-                {
-                    reportActionID: '2',
-                    previousReportActionID: '1',
-                    created: '2022-11-13 22:27:01.825',
-                    actionName: CONST.REPORT.ACTIONS.TYPE.ADD_COMMENT,
-                    originalMessage: {
-                        html: 'Hello world',
-                        whisperedTo: [],
-                    },
-                    message: [
-                        {
-                            html: 'Hello world',
-                            type: 'Action type',
-                            text: 'Action text',
-                        },
-                    ],
-                },
-                {
-                    reportActionID: '3',
-                    previousReportActionID: '2',
-                    created: '2022-11-13 22:27:01.825',
-                    actionName: CONST.REPORT.ACTIONS.TYPE.ADD_COMMENT,
-                    originalMessage: {
-                        html: 'Hello world',
-                        whisperedTo: [],
-                    },
-                    message: [
-                        {
-                            html: 'Hello world',
-                            type: 'Action type',
-                            text: 'Action text',
-                        },
-                    ],
-                },
-                {
-                    reportActionID: '4',
-                    previousReportActionID: '3',
-                    created: '2022-11-13 22:27:01.825',
-                    actionName: CONST.REPORT.ACTIONS.TYPE.ADD_COMMENT,
-                    originalMessage: {
-                        html: 'Hello world',
-                        whisperedTo: [],
-                    },
-                    message: [
-                        {
-                            html: 'Hello world',
-                            type: 'Action type',
-                            text: 'Action text',
-                        },
-                    ],
-                },
-                {
-                    reportActionID: '5',
-                    previousReportActionID: '4',
-                    created: '2022-11-13 22:27:01.825',
-                    actionName: CONST.REPORT.ACTIONS.TYPE.ADD_COMMENT,
-                    originalMessage: {
-                        html: 'Hello world',
-                        whisperedTo: [],
-                    },
-                    message: [
-                        {
-                            html: 'Hello world',
-                            type: 'Action type',
-                            text: 'Action text',
-                        },
-                    ],
-                },
-                {
-                    reportActionID: '6',
-                    previousReportActionID: '5',
-                    created: '2022-11-13 22:27:01.825',
-                    actionName: CONST.REPORT.ACTIONS.TYPE.ADD_COMMENT,
-                    originalMessage: {
-                        html: 'Hello world',
-                        whisperedTo: [],
-                    },
-                    message: [
-                        {
-                            html: 'Hello world',
-                            type: 'Action type',
-                            text: 'Action text',
-                        },
-                    ],
-                },
-                {
-                    reportActionID: '7',
-                    previousReportActionID: '6',
-                    created: '2022-11-13 22:27:01.825',
-                    actionName: CONST.REPORT.ACTIONS.TYPE.ADD_COMMENT,
-                    originalMessage: {
-                        html: 'Hello world',
-                        whisperedTo: [],
-                    },
-                    message: [
-                        {
-                            html: 'Hello world',
-                            type: 'Action type',
-                            text: 'Action text',
-                        },
-                    ],
-                },
-
-                // Note: there's a "gap" here because the previousReportActionID (8) does not match the ID of the previous reportAction in the array (7)
-                {
-                    reportActionID: '9',
-                    previousReportActionID: '8',
-                    created: '2022-11-13 22:27:01.825',
-                    actionName: CONST.REPORT.ACTIONS.TYPE.ADD_COMMENT,
-                    originalMessage: {
-                        html: 'Hello world',
-                        whisperedTo: [],
-                    },
-                    message: [
-                        {
-                            html: 'Hello world',
-                            type: 'Action type',
-                            text: 'Action text',
-                        },
-                    ],
-                },
-                {
-                    reportActionID: '10',
-                    previousReportActionID: '9',
-                    created: '2022-11-13 22:27:01.825',
-                    actionName: CONST.REPORT.ACTIONS.TYPE.ADD_COMMENT,
-                    originalMessage: {
-                        html: 'Hello world',
-                        whisperedTo: [],
-                    },
-                    message: [
-                        {
-                            html: 'Hello world',
-                            type: 'Action type',
-                            text: 'Action text',
-                        },
-                    ],
-                },
-                {
-                    reportActionID: '11',
-                    previousReportActionID: '10',
-                    created: '2022-11-13 22:27:01.825',
-                    actionName: CONST.REPORT.ACTIONS.TYPE.ADD_COMMENT,
-                    originalMessage: {
-                        html: 'Hello world',
-                        whisperedTo: [],
-                    },
-                    message: [
-                        {
-                            html: 'Hello world',
-                            type: 'Action type',
-                            text: 'Action text',
-                        },
-                    ],
-                },
-                {
-                    reportActionID: '12',
-                    previousReportActionID: '11',
-                    created: '2022-11-13 22:27:01.825',
-                    actionName: CONST.REPORT.ACTIONS.TYPE.ADD_COMMENT,
-                    originalMessage: {
-                        html: 'Hello world',
-                        whisperedTo: [],
-                    },
-                    message: [
-                        {
-                            html: 'Hello world',
-                            type: 'Action type',
-                            text: 'Action text',
-                        },
-                    ],
-                },
-
-                // Note: another gap
-                {
-                    reportActionID: '14',
-                    previousReportActionID: '13',
-                    created: '2022-11-13 22:27:01.825',
-                    actionName: CONST.REPORT.ACTIONS.TYPE.ADD_COMMENT,
-                    originalMessage: {
-                        html: 'Hello world',
-                        whisperedTo: [],
-                    },
-                    message: [
-                        {
-                            html: 'Hello world',
-                            type: 'Action type',
-                            text: 'Action text',
-                        },
-                    ],
-                },
-                {
-                    reportActionID: '15',
-                    previousReportActionID: '14',
-                    created: '2022-11-13 22:27:01.825',
-                    actionName: CONST.REPORT.ACTIONS.TYPE.ADD_COMMENT,
-                    originalMessage: {
-                        html: 'Hello world',
-                        whisperedTo: [],
-                    },
-                    message: [
-                        {
-                            html: 'Hello world',
-                            type: 'Action type',
-                            text: 'Action text',
-                        },
-                    ],
-                },
-                {
-                    reportActionID: '16',
-                    previousReportActionID: '15',
-                    created: '2022-11-13 22:27:01.825',
-                    actionName: CONST.REPORT.ACTIONS.TYPE.ADD_COMMENT,
-                    originalMessage: {
-                        html: 'Hello world',
-                        whisperedTo: [],
-                    },
-                    message: [
-                        {
-                            html: 'Hello world',
-                            type: 'Action type',
-                            text: 'Action text',
-                        },
-                    ],
-                },
-                {
-                    reportActionID: '17',
-                    previousReportActionID: '16',
-                    created: '2022-11-13 22:27:01.825',
-                    actionName: CONST.REPORT.ACTIONS.TYPE.ADD_COMMENT,
-                    originalMessage: {
-                        html: 'Hello world',
-                        whisperedTo: [],
-                    },
-                    message: [
-                        {
-                            html: 'Hello world',
-                            type: 'Action type',
-                            text: 'Action text',
-                        },
-                    ],
-                },
-            ];
-
-            const expectedResult = [
-                {
-                    reportActionID: '1',
-                    previousReportActionID: undefined,
-                    created: '2022-11-13 22:27:01.825',
-                    actionName: CONST.REPORT.ACTIONS.TYPE.ADD_COMMENT,
-                    originalMessage: {
-                        html: 'Hello world',
-                        whisperedTo: [],
-                    },
-                    message: [
-                        {
-                            html: 'Hello world',
-                            type: 'Action type',
-                            text: 'Action text',
-                        },
-                    ],
-                },
-                {
-                    reportActionID: '2',
-                    previousReportActionID: '1',
-                    created: '2022-11-13 22:27:01.825',
-                    actionName: CONST.REPORT.ACTIONS.TYPE.ADD_COMMENT,
-                    originalMessage: {
-                        html: 'Hello world',
-                        whisperedTo: [],
-                    },
-                    message: [
-                        {
-                            html: 'Hello world',
-                            type: 'Action type',
-                            text: 'Action text',
-                        },
-                    ],
-                },
-                {
-                    reportActionID: '3',
-                    previousReportActionID: '2',
-                    created: '2022-11-13 22:27:01.825',
-                    actionName: CONST.REPORT.ACTIONS.TYPE.ADD_COMMENT,
-                    originalMessage: {
-                        html: 'Hello world',
-                        whisperedTo: [],
-                    },
-                    message: [
-                        {
-                            html: 'Hello world',
-                            type: 'Action type',
-                            text: 'Action text',
-                        },
-                    ],
-                },
-                {
-                    reportActionID: '4',
-                    previousReportActionID: '3',
-                    created: '2022-11-13 22:27:01.825',
-                    actionName: CONST.REPORT.ACTIONS.TYPE.ADD_COMMENT,
-                    originalMessage: {
-                        html: 'Hello world',
-                        whisperedTo: [],
-                    },
-                    message: [
-                        {
-                            html: 'Hello world',
-                            type: 'Action type',
-                            text: 'Action text',
-                        },
-                    ],
-                },
-                {
-                    reportActionID: '5',
-                    previousReportActionID: '4',
-                    created: '2022-11-13 22:27:01.825',
-                    actionName: CONST.REPORT.ACTIONS.TYPE.ADD_COMMENT,
-                    originalMessage: {
-                        html: 'Hello world',
-                        whisperedTo: [],
-                    },
-                    message: [
-                        {
-                            html: 'Hello world',
-                            type: 'Action type',
-                            text: 'Action text',
-                        },
-                    ],
-                },
-                {
-                    reportActionID: '6',
-                    previousReportActionID: '5',
-                    created: '2022-11-13 22:27:01.825',
-                    actionName: CONST.REPORT.ACTIONS.TYPE.ADD_COMMENT,
-                    originalMessage: {
-                        html: 'Hello world',
-                        whisperedTo: [],
-                    },
-                    message: [
-                        {
-                            html: 'Hello world',
-                            type: 'Action type',
-                            text: 'Action text',
-                        },
-                    ],
-                },
-                {
-                    reportActionID: '7',
-                    previousReportActionID: '6',
-                    created: '2022-11-13 22:27:01.825',
-                    actionName: CONST.REPORT.ACTIONS.TYPE.ADD_COMMENT,
-                    originalMessage: {
-                        html: 'Hello world',
-                        whisperedTo: [],
-                    },
-                    message: [
-                        {
-                            html: 'Hello world',
-                            type: 'Action type',
-                            text: 'Action text',
-                        },
-                    ],
-                },
-            ];
-            // Reversing the input array to simulate descending order sorting as per our data structure
-            const result = ReportActionsUtils.getContinuousReportActionChain(input.reverse(), '3');
-            input.pop();
-            expect(result).toStrictEqual(expectedResult.reverse());
-        });
-
-        it('given an input ID of 9, ..., 12 it will return the report actions with id 9 - 12', () => {
-            const input: ReportAction[] = [
-                // Given these sortedReportActions
-                {
-                    reportActionID: '1',
-                    previousReportActionID: undefined,
-                    created: '2022-11-13 22:27:01.825',
-                    actionName: CONST.REPORT.ACTIONS.TYPE.ADD_COMMENT,
-                    originalMessage: {
-                        html: 'Hello world',
-                        whisperedTo: [],
-                    },
-                    message: [
-                        {
-                            html: 'Hello world',
-                            type: 'Action type',
-                            text: 'Action text',
-                        },
-                    ],
-                },
-                {
-                    reportActionID: '2',
-                    previousReportActionID: '1',
-                    created: '2022-11-13 22:27:01.825',
-                    actionName: CONST.REPORT.ACTIONS.TYPE.ADD_COMMENT,
-                    originalMessage: {
-                        html: 'Hello world',
-                        whisperedTo: [],
-                    },
-                    message: [
-                        {
-                            html: 'Hello world',
-                            type: 'Action type',
-                            text: 'Action text',
-                        },
-                    ],
-                },
-                {
-                    reportActionID: '3',
-                    previousReportActionID: '2',
-                    created: '2022-11-13 22:27:01.825',
-                    actionName: CONST.REPORT.ACTIONS.TYPE.ADD_COMMENT,
-                    originalMessage: {
-                        html: 'Hello world',
-                        whisperedTo: [],
-                    },
-                    message: [
-                        {
-                            html: 'Hello world',
-                            type: 'Action type',
-                            text: 'Action text',
-                        },
-                    ],
-                },
-                {
-                    reportActionID: '4',
-                    previousReportActionID: '3',
-                    created: '2022-11-13 22:27:01.825',
-                    actionName: CONST.REPORT.ACTIONS.TYPE.ADD_COMMENT,
-                    originalMessage: {
-                        html: 'Hello world',
-                        whisperedTo: [],
-                    },
-                    message: [
-                        {
-                            html: 'Hello world',
-                            type: 'Action type',
-                            text: 'Action text',
-                        },
-                    ],
-                },
-                {
-                    reportActionID: '5',
-                    previousReportActionID: '4',
-                    created: '2022-11-13 22:27:01.825',
-                    actionName: CONST.REPORT.ACTIONS.TYPE.ADD_COMMENT,
-                    originalMessage: {
-                        html: 'Hello world',
-                        whisperedTo: [],
-                    },
-                    message: [
-                        {
-                            html: 'Hello world',
-                            type: 'Action type',
-                            text: 'Action text',
-                        },
-                    ],
-                },
-                {
-                    reportActionID: '6',
-                    previousReportActionID: '5',
-                    created: '2022-11-13 22:27:01.825',
-                    actionName: CONST.REPORT.ACTIONS.TYPE.ADD_COMMENT,
-                    originalMessage: {
-                        html: 'Hello world',
-                        whisperedTo: [],
-                    },
-                    message: [
-                        {
-                            html: 'Hello world',
-                            type: 'Action type',
-                            text: 'Action text',
-                        },
-                    ],
-                },
-                {
-                    reportActionID: '7',
-                    previousReportActionID: '6',
-                    created: '2022-11-13 22:27:01.825',
-                    actionName: CONST.REPORT.ACTIONS.TYPE.ADD_COMMENT,
-                    originalMessage: {
-                        html: 'Hello world',
-                        whisperedTo: [],
-                    },
-                    message: [
-                        {
-                            html: 'Hello world',
-                            type: 'Action type',
-                            text: 'Action text',
-                        },
-                    ],
-                },
-
-                // Note: there's a "gap" here because the previousReportActionID (8) does not match the ID of the previous reportAction in the array (7)
-                {
-                    reportActionID: '9',
-                    previousReportActionID: '8',
-                    created: '2022-11-13 22:27:01.825',
-                    actionName: CONST.REPORT.ACTIONS.TYPE.ADD_COMMENT,
-                    originalMessage: {
-                        html: 'Hello world',
-                        whisperedTo: [],
-                    },
-                    message: [
-                        {
-                            html: 'Hello world',
-                            type: 'Action type',
-                            text: 'Action text',
-                        },
-                    ],
-                },
-                {
-                    reportActionID: '10',
-                    previousReportActionID: '9',
-                    created: '2022-11-13 22:27:01.825',
-                    actionName: CONST.REPORT.ACTIONS.TYPE.ADD_COMMENT,
-                    originalMessage: {
-                        html: 'Hello world',
-                        whisperedTo: [],
-                    },
-                    message: [
-                        {
-                            html: 'Hello world',
-                            type: 'Action type',
-                            text: 'Action text',
-                        },
-                    ],
-                },
-                {
-                    reportActionID: '11',
-                    previousReportActionID: '10',
-                    created: '2022-11-13 22:27:01.825',
-                    actionName: CONST.REPORT.ACTIONS.TYPE.ADD_COMMENT,
-                    originalMessage: {
-                        html: 'Hello world',
-                        whisperedTo: [],
-                    },
-                    message: [
-                        {
-                            html: 'Hello world',
-                            type: 'Action type',
-                            text: 'Action text',
-                        },
-                    ],
-                },
-                {
-                    reportActionID: '12',
-                    previousReportActionID: '11',
-                    created: '2022-11-13 22:27:01.825',
-                    actionName: CONST.REPORT.ACTIONS.TYPE.ADD_COMMENT,
-                    originalMessage: {
-                        html: 'Hello world',
-                        whisperedTo: [],
-                    },
-                    message: [
-                        {
-                            html: 'Hello world',
-                            type: 'Action type',
-                            text: 'Action text',
-                        },
-                    ],
-                },
-
-                // Note: another gap
-                {
-                    reportActionID: '14',
-                    previousReportActionID: '13',
-                    created: '2022-11-13 22:27:01.825',
-                    actionName: CONST.REPORT.ACTIONS.TYPE.ADD_COMMENT,
-                    originalMessage: {
-                        html: 'Hello world',
-                        whisperedTo: [],
-                    },
-                    message: [
-                        {
-                            html: 'Hello world',
-                            type: 'Action type',
-                            text: 'Action text',
-                        },
-                    ],
-                },
-                {
-                    reportActionID: '15',
-                    previousReportActionID: '14',
-                    created: '2022-11-13 22:27:01.825',
-                    actionName: CONST.REPORT.ACTIONS.TYPE.ADD_COMMENT,
-                    originalMessage: {
-                        html: 'Hello world',
-                        whisperedTo: [],
-                    },
-                    message: [
-                        {
-                            html: 'Hello world',
-                            type: 'Action type',
-                            text: 'Action text',
-                        },
-                    ],
-                },
-                {
-                    reportActionID: '16',
-                    previousReportActionID: '15',
-                    created: '2022-11-13 22:27:01.825',
-                    actionName: CONST.REPORT.ACTIONS.TYPE.ADD_COMMENT,
-                    originalMessage: {
-                        html: 'Hello world',
-                        whisperedTo: [],
-                    },
-                    message: [
-                        {
-                            html: 'Hello world',
-                            type: 'Action type',
-                            text: 'Action text',
-                        },
-                    ],
-                },
-                {
-                    reportActionID: '17',
-                    previousReportActionID: '16',
-                    created: '2022-11-13 22:27:01.825',
-                    actionName: CONST.REPORT.ACTIONS.TYPE.ADD_COMMENT,
-                    originalMessage: {
-                        html: 'Hello world',
-                        whisperedTo: [],
-                    },
-                    message: [
-                        {
-                            html: 'Hello world',
-                            type: 'Action type',
-                            text: 'Action text',
-                        },
-                    ],
-                },
-            ];
-
-            const expectedResult = [
-                {
-                    reportActionID: '9',
-                    previousReportActionID: '8',
-                    created: '2022-11-13 22:27:01.825',
-                    actionName: CONST.REPORT.ACTIONS.TYPE.ADD_COMMENT,
-                    originalMessage: {
-                        html: 'Hello world',
-                        whisperedTo: [],
-                    },
-                    message: [
-                        {
-                            html: 'Hello world',
-                            type: 'Action type',
-                            text: 'Action text',
-                        },
-                    ],
-                },
-                {
-                    reportActionID: '10',
-                    previousReportActionID: '9',
-                    created: '2022-11-13 22:27:01.825',
-                    actionName: CONST.REPORT.ACTIONS.TYPE.ADD_COMMENT,
-                    originalMessage: {
-                        html: 'Hello world',
-                        whisperedTo: [],
-                    },
-                    message: [
-                        {
-                            html: 'Hello world',
-                            type: 'Action type',
-                            text: 'Action text',
-                        },
-                    ],
-                },
-                {
-                    reportActionID: '11',
-                    previousReportActionID: '10',
-                    created: '2022-11-13 22:27:01.825',
-                    actionName: CONST.REPORT.ACTIONS.TYPE.ADD_COMMENT,
-                    originalMessage: {
-                        html: 'Hello world',
-                        whisperedTo: [],
-                    },
-                    message: [
-                        {
-                            html: 'Hello world',
-                            type: 'Action type',
-                            text: 'Action text',
-                        },
-                    ],
-                },
-                {
-                    reportActionID: '12',
-                    previousReportActionID: '11',
-                    created: '2022-11-13 22:27:01.825',
-                    actionName: CONST.REPORT.ACTIONS.TYPE.ADD_COMMENT,
-                    originalMessage: {
-                        html: 'Hello world',
-                        whisperedTo: [],
-                    },
-                    message: [
-                        {
-                            html: 'Hello world',
-                            type: 'Action type',
-                            text: 'Action text',
-                        },
-                    ],
-                },
-            ];
-            // Reversing the input array to simulate descending order sorting as per our data structure
-            const result = ReportActionsUtils.getContinuousReportActionChain(input.reverse(), '10');
-            input.pop();
-            expect(result).toStrictEqual(expectedResult.reverse());
-        });
-
-        it('given an input ID of 14, ..., 17 it will return the report actions with id 14 - 17', () => {
-            const input = [
-                // Given these sortedReportActions
-                {
-                    reportActionID: '1',
-                    previousReportActionID: undefined,
-                    created: '2022-11-13 22:27:01.825',
-                    actionName: CONST.REPORT.ACTIONS.TYPE.ADD_COMMENT,
-                    originalMessage: {
-                        html: 'Hello world',
-                        whisperedTo: [],
-                    },
-                    message: [
-                        {
-                            html: 'Hello world',
-                            type: 'Action type',
-                            text: 'Action text',
-                        },
-                    ],
-                },
-                {
-                    reportActionID: '2',
-                    previousReportActionID: '1',
-                    created: '2022-11-13 22:27:01.825',
-                    actionName: CONST.REPORT.ACTIONS.TYPE.ADD_COMMENT,
-                    originalMessage: {
-                        html: 'Hello world',
-                        whisperedTo: [],
-                    },
-                    message: [
-                        {
-                            html: 'Hello world',
-                            type: 'Action type',
-                            text: 'Action text',
-                        },
-                    ],
-                },
-                {
-                    reportActionID: '3',
-                    previousReportActionID: '2',
-                    created: '2022-11-13 22:27:01.825',
-                    actionName: CONST.REPORT.ACTIONS.TYPE.ADD_COMMENT,
-                    originalMessage: {
-                        html: 'Hello world',
-                        whisperedTo: [],
-                    },
-                    message: [
-                        {
-                            html: 'Hello world',
-                            type: 'Action type',
-                            text: 'Action text',
-                        },
-                    ],
-                },
-                {
-                    reportActionID: '4',
-                    previousReportActionID: '3',
-                    created: '2022-11-13 22:27:01.825',
-                    actionName: CONST.REPORT.ACTIONS.TYPE.ADD_COMMENT,
-                    originalMessage: {
-                        html: 'Hello world',
-                        whisperedTo: [],
-                    },
-                    message: [
-                        {
-                            html: 'Hello world',
-                            type: 'Action type',
-                            text: 'Action text',
-                        },
-                    ],
-                },
-                {
-                    reportActionID: '5',
-                    previousReportActionID: '4',
-                    created: '2022-11-13 22:27:01.825',
-                    actionName: CONST.REPORT.ACTIONS.TYPE.ADD_COMMENT,
-                    originalMessage: {
-                        html: 'Hello world',
-                        whisperedTo: [],
-                    },
-                    message: [
-                        {
-                            html: 'Hello world',
-                            type: 'Action type',
-                            text: 'Action text',
-                        },
-                    ],
-                },
-                {
-                    reportActionID: '6',
-                    previousReportActionID: '5',
-                    created: '2022-11-13 22:27:01.825',
-                    actionName: CONST.REPORT.ACTIONS.TYPE.ADD_COMMENT,
-                    originalMessage: {
-                        html: 'Hello world',
-                        whisperedTo: [],
-                    },
-                    message: [
-                        {
-                            html: 'Hello world',
-                            type: 'Action type',
-                            text: 'Action text',
-                        },
-                    ],
-                },
-                {
-                    reportActionID: '7',
-                    previousReportActionID: '6',
-                    created: '2022-11-13 22:27:01.825',
-                    actionName: CONST.REPORT.ACTIONS.TYPE.ADD_COMMENT,
-                    originalMessage: {
-                        html: 'Hello world',
-                        whisperedTo: [],
-                    },
-                    message: [
-                        {
-                            html: 'Hello world',
-                            type: 'Action type',
-                            text: 'Action text',
-                        },
-                    ],
-                },
-
-                // Note: there's a "gap" here because the previousReportActionID (8) does not match the ID of the previous reportAction in the array (7)
-                {
-                    reportActionID: '9',
-                    previousReportActionID: '8',
-                    created: '2022-11-13 22:27:01.825',
-                    actionName: CONST.REPORT.ACTIONS.TYPE.ADD_COMMENT,
-                    originalMessage: {
-                        html: 'Hello world',
-                        whisperedTo: [],
-                    },
-                    message: [
-                        {
-                            html: 'Hello world',
-                            type: 'Action type',
-                            text: 'Action text',
-                        },
-                    ],
-                },
-                {
-                    reportActionID: '10',
-                    previousReportActionID: '9',
-                    created: '2022-11-13 22:27:01.825',
-                    actionName: CONST.REPORT.ACTIONS.TYPE.ADD_COMMENT,
-                    originalMessage: {
-                        html: 'Hello world',
-                        whisperedTo: [],
-                    },
-                    message: [
-                        {
-                            html: 'Hello world',
-                            type: 'Action type',
-                            text: 'Action text',
-                        },
-                    ],
-                },
-                {
-                    reportActionID: '11',
-                    previousReportActionID: '10',
-                    created: '2022-11-13 22:27:01.825',
-                    actionName: CONST.REPORT.ACTIONS.TYPE.ADD_COMMENT,
-                    originalMessage: {
-                        html: 'Hello world',
-                        whisperedTo: [],
-                    },
-                    message: [
-                        {
-                            html: 'Hello world',
-                            type: 'Action type',
-                            text: 'Action text',
-                        },
-                    ],
-                },
-                {
-                    reportActionID: '12',
-                    previousReportActionID: '11',
-                    created: '2022-11-13 22:27:01.825',
-                    actionName: CONST.REPORT.ACTIONS.TYPE.ADD_COMMENT,
-                    originalMessage: {
-                        html: 'Hello world',
-                        whisperedTo: [],
-                    },
-                    message: [
-                        {
-                            html: 'Hello world',
-                            type: 'Action type',
-                            text: 'Action text',
-                        },
-                    ],
-                },
-
-                // Note: another gap
-                {
-                    reportActionID: '14',
-                    previousReportActionID: '13',
-                    created: '2022-11-13 22:27:01.825',
-                    actionName: CONST.REPORT.ACTIONS.TYPE.ADD_COMMENT,
-                    originalMessage: {
-                        html: 'Hello world',
-                        whisperedTo: [],
-                    },
-                    message: [
-                        {
-                            html: 'Hello world',
-                            type: 'Action type',
-                            text: 'Action text',
-                        },
-                    ],
-                },
-                {
-                    reportActionID: '15',
-                    previousReportActionID: '14',
-                    created: '2022-11-13 22:27:01.825',
-                    actionName: CONST.REPORT.ACTIONS.TYPE.ADD_COMMENT,
-                    originalMessage: {
-                        html: 'Hello world',
-                        whisperedTo: [],
-                    },
-                    message: [
-                        {
-                            html: 'Hello world',
-                            type: 'Action type',
-                            text: 'Action text',
-                        },
-                    ],
-                },
-                {
-                    reportActionID: '16',
-                    previousReportActionID: '15',
-                    created: '2022-11-13 22:27:01.825',
-                    actionName: CONST.REPORT.ACTIONS.TYPE.ADD_COMMENT,
-                    originalMessage: {
-                        html: 'Hello world',
-                        whisperedTo: [],
-                    },
-                    message: [
-                        {
-                            html: 'Hello world',
-                            type: 'Action type',
-                            text: 'Action text',
-                        },
-                    ],
-                },
-                {
-                    reportActionID: '17',
-                    previousReportActionID: '16',
-                    created: '2022-11-13 22:27:01.825',
-                    actionName: CONST.REPORT.ACTIONS.TYPE.ADD_COMMENT,
-                    originalMessage: {
-                        html: 'Hello world',
-                        whisperedTo: [],
-                    },
-                    message: [
-                        {
-                            html: 'Hello world',
-                            type: 'Action type',
-                            text: 'Action text',
-                        },
-                    ],
-                },
-            ];
-
-            const expectedResult = [
-                {
-                    reportActionID: '14',
-                    previousReportActionID: '13',
-                    created: '2022-11-13 22:27:01.825',
-                    actionName: CONST.REPORT.ACTIONS.TYPE.ADD_COMMENT,
-                    originalMessage: {
-                        html: 'Hello world',
-                        whisperedTo: [],
-                    },
-                    message: [
-                        {
-                            html: 'Hello world',
-                            type: 'Action type',
-                            text: 'Action text',
-                        },
-                    ],
-                },
-                {
-                    reportActionID: '15',
-                    previousReportActionID: '14',
-                    created: '2022-11-13 22:27:01.825',
-                    actionName: CONST.REPORT.ACTIONS.TYPE.ADD_COMMENT,
-                    originalMessage: {
-                        html: 'Hello world',
-                        whisperedTo: [],
-                    },
-                    message: [
-                        {
-                            html: 'Hello world',
-                            type: 'Action type',
-                            text: 'Action text',
-                        },
-                    ],
-                },
-                {
-                    reportActionID: '16',
-                    previousReportActionID: '15',
-                    created: '2022-11-13 22:27:01.825',
-                    actionName: CONST.REPORT.ACTIONS.TYPE.ADD_COMMENT,
-                    originalMessage: {
-                        html: 'Hello world',
-                        whisperedTo: [],
-                    },
-                    message: [
-                        {
-                            html: 'Hello world',
-                            type: 'Action type',
-                            text: 'Action text',
-                        },
-                    ],
-                },
-                {
-                    reportActionID: '17',
-                    previousReportActionID: '16',
-                    created: '2022-11-13 22:27:01.825',
-                    actionName: CONST.REPORT.ACTIONS.TYPE.ADD_COMMENT,
-                    originalMessage: {
-                        html: 'Hello world',
-                        whisperedTo: [],
-                    },
-                    message: [
-                        {
-                            html: 'Hello world',
-                            type: 'Action type',
-                            text: 'Action text',
-                        },
-                    ],
-                },
-            ];
-            // Reversing the input array to simulate descending order sorting as per our data structure
-            const result = ReportActionsUtils.getContinuousReportActionChain(input.reverse(), '16');
-            input.pop();
-            expect(result).toStrictEqual(expectedResult.reverse());
-        });
-
-        it('given an input ID of 8 or 13 which are not exist in Onyx it will return an empty array', () => {
-            const input: ReportAction[] = [
-                // Given these sortedReportActions
-                {
-                    reportActionID: '1',
-                    previousReportActionID: undefined,
-                    created: '2022-11-13 22:27:01.825',
-                    actionName: CONST.REPORT.ACTIONS.TYPE.ADD_COMMENT,
-                    originalMessage: {
-                        html: 'Hello world',
-                        whisperedTo: [],
-                    },
-                    message: [
-                        {
-                            html: 'Hello world',
-                            type: 'Action type',
-                            text: 'Action text',
-                        },
-                    ],
-                },
-                {
-                    reportActionID: '2',
-                    previousReportActionID: '1',
-                    created: '2022-11-13 22:27:01.825',
-                    actionName: CONST.REPORT.ACTIONS.TYPE.ADD_COMMENT,
-                    originalMessage: {
-                        html: 'Hello world',
-                        whisperedTo: [],
-                    },
-                    message: [
-                        {
-                            html: 'Hello world',
-                            type: 'Action type',
-                            text: 'Action text',
-                        },
-                    ],
-                },
-                {
-                    reportActionID: '3',
-                    previousReportActionID: '2',
-                    created: '2022-11-13 22:27:01.825',
-                    actionName: CONST.REPORT.ACTIONS.TYPE.ADD_COMMENT,
-                    originalMessage: {
-                        html: 'Hello world',
-                        whisperedTo: [],
-                    },
-                    message: [
-                        {
-                            html: 'Hello world',
-                            type: 'Action type',
-                            text: 'Action text',
-                        },
-                    ],
-                },
-                {
-                    reportActionID: '4',
-                    previousReportActionID: '3',
-                    created: '2022-11-13 22:27:01.825',
-                    actionName: CONST.REPORT.ACTIONS.TYPE.ADD_COMMENT,
-                    originalMessage: {
-                        html: 'Hello world',
-                        whisperedTo: [],
-                    },
-                    message: [
-                        {
-                            html: 'Hello world',
-                            type: 'Action type',
-                            text: 'Action text',
-                        },
-                    ],
-                },
-                {
-                    reportActionID: '5',
-                    previousReportActionID: '4',
-                    created: '2022-11-13 22:27:01.825',
-                    actionName: CONST.REPORT.ACTIONS.TYPE.ADD_COMMENT,
-                    originalMessage: {
-                        html: 'Hello world',
-                        whisperedTo: [],
-                    },
-                    message: [
-                        {
-                            html: 'Hello world',
-                            type: 'Action type',
-                            text: 'Action text',
-                        },
-                    ],
-                },
-                {
-                    reportActionID: '6',
-                    previousReportActionID: '5',
-                    created: '2022-11-13 22:27:01.825',
-                    actionName: CONST.REPORT.ACTIONS.TYPE.ADD_COMMENT,
-                    originalMessage: {
-                        html: 'Hello world',
-                        whisperedTo: [],
-                    },
-                    message: [
-                        {
-                            html: 'Hello world',
-                            type: 'Action type',
-                            text: 'Action text',
-                        },
-                    ],
-                },
-                {
-                    reportActionID: '7',
-                    previousReportActionID: '6',
-                    created: '2022-11-13 22:27:01.825',
-                    actionName: CONST.REPORT.ACTIONS.TYPE.ADD_COMMENT,
-                    originalMessage: {
-                        html: 'Hello world',
-                        whisperedTo: [],
-                    },
-                    message: [
-                        {
-                            html: 'Hello world',
-                            type: 'Action type',
-                            text: 'Action text',
-                        },
-                    ],
-                },
-
-                // Note: there's a "gap" here because the previousReportActionID (8) does not match the ID of the previous reportAction in the array (7)
-                {
-                    reportActionID: '9',
-                    previousReportActionID: '8',
-                    created: '2022-11-13 22:27:01.825',
-                    actionName: CONST.REPORT.ACTIONS.TYPE.ADD_COMMENT,
-                    originalMessage: {
-                        html: 'Hello world',
-                        whisperedTo: [],
-                    },
-                    message: [
-                        {
-                            html: 'Hello world',
-                            type: 'Action type',
-                            text: 'Action text',
-                        },
-                    ],
-                },
-                {
-                    reportActionID: '10',
-                    previousReportActionID: '9',
-                    created: '2022-11-13 22:27:01.825',
-                    actionName: CONST.REPORT.ACTIONS.TYPE.ADD_COMMENT,
-                    originalMessage: {
-                        html: 'Hello world',
-                        whisperedTo: [],
-                    },
-                    message: [
-                        {
-                            html: 'Hello world',
-                            type: 'Action type',
-                            text: 'Action text',
-                        },
-                    ],
-                },
-                {
-                    reportActionID: '11',
-                    previousReportActionID: '10',
-                    created: '2022-11-13 22:27:01.825',
-                    actionName: CONST.REPORT.ACTIONS.TYPE.ADD_COMMENT,
-                    originalMessage: {
-                        html: 'Hello world',
-                        whisperedTo: [],
-                    },
-                    message: [
-                        {
-                            html: 'Hello world',
-                            type: 'Action type',
-                            text: 'Action text',
-                        },
-                    ],
-                },
-                {
-                    reportActionID: '12',
-                    previousReportActionID: '11',
-                    created: '2022-11-13 22:27:01.825',
-                    actionName: CONST.REPORT.ACTIONS.TYPE.ADD_COMMENT,
-                    originalMessage: {
-                        html: 'Hello world',
-                        whisperedTo: [],
-                    },
-                    message: [
-                        {
-                            html: 'Hello world',
-                            type: 'Action type',
-                            text: 'Action text',
-                        },
-                    ],
-                },
-
-                // Note: another gap
-                {
-                    reportActionID: '14',
-                    previousReportActionID: '13',
-                    created: '2022-11-13 22:27:01.825',
-                    actionName: CONST.REPORT.ACTIONS.TYPE.ADD_COMMENT,
-                    originalMessage: {
-                        html: 'Hello world',
-                        whisperedTo: [],
-                    },
-                    message: [
-                        {
-                            html: 'Hello world',
-                            type: 'Action type',
-                            text: 'Action text',
-                        },
-                    ],
-                },
-                {
-                    reportActionID: '15',
-                    previousReportActionID: '14',
-                    created: '2022-11-13 22:27:01.825',
-                    actionName: CONST.REPORT.ACTIONS.TYPE.ADD_COMMENT,
-                    originalMessage: {
-                        html: 'Hello world',
-                        whisperedTo: [],
-                    },
-                    message: [
-                        {
-                            html: 'Hello world',
-                            type: 'Action type',
-                            text: 'Action text',
-                        },
-                    ],
-                },
-                {
-                    reportActionID: '16',
-                    previousReportActionID: '15',
-                    created: '2022-11-13 22:27:01.825',
-                    actionName: CONST.REPORT.ACTIONS.TYPE.ADD_COMMENT,
-                    originalMessage: {
-                        html: 'Hello world',
-                        whisperedTo: [],
-                    },
-                    message: [
-                        {
-                            html: 'Hello world',
-                            type: 'Action type',
-                            text: 'Action text',
-                        },
-                    ],
-                },
-                {
-                    reportActionID: '17',
-                    previousReportActionID: '16',
-                    created: '2022-11-13 22:27:01.825',
-                    actionName: CONST.REPORT.ACTIONS.TYPE.ADD_COMMENT,
-                    originalMessage: {
-                        html: 'Hello world',
-                        whisperedTo: [],
-                    },
-                    message: [
-                        {
-                            html: 'Hello world',
-                            type: 'Action type',
-                            text: 'Action text',
-                        },
-                    ],
-                },
-            ];
-
-            const expectedResult: ReportAction[] = [];
-            // Reversing the input array to simulate descending order sorting as per our data structure
-            const result = ReportActionsUtils.getContinuousReportActionChain(input.reverse(), '8');
-            input.pop();
-            expect(result).toStrictEqual(expectedResult.reverse());
-        });
-
-        it('given an empty input ID and the report only contains pending actions, it will return all actions', () => {
-            const input: ReportAction[] = [
-                // Given these sortedReportActions
-                {
-                    reportActionID: '1',
-                    previousReportActionID: undefined,
-                    created: '2022-11-13 22:27:01.825',
-                    actionName: CONST.REPORT.ACTIONS.TYPE.ADD_COMMENT,
-                    originalMessage: {
-                        html: 'Hello world',
-                        whisperedTo: [],
-                    },
-                    message: [
-                        {
-                            html: 'Hello world',
-                            type: 'Action type',
-                            text: 'Action text',
-                        },
-                    ],
-                    pendingAction: CONST.RED_BRICK_ROAD_PENDING_ACTION.ADD,
-                },
-                {
-                    reportActionID: '2',
-                    previousReportActionID: '1',
-                    created: '2022-11-13 22:27:01.825',
-                    actionName: CONST.REPORT.ACTIONS.TYPE.ADD_COMMENT,
-                    originalMessage: {
-                        html: 'Hello world',
-                        whisperedTo: [],
-                    },
-                    message: [
-                        {
-                            html: 'Hello world',
-                            type: 'Action type',
-                            text: 'Action text',
-                        },
-                    ],
-                    pendingAction: CONST.RED_BRICK_ROAD_PENDING_ACTION.ADD,
-                },
-                {
-                    reportActionID: '3',
-                    previousReportActionID: '2',
-                    created: '2022-11-13 22:27:01.825',
-                    actionName: CONST.REPORT.ACTIONS.TYPE.ADD_COMMENT,
-                    originalMessage: {
-                        html: 'Hello world',
-                        whisperedTo: [],
-                    },
-                    message: [
-                        {
-                            html: 'Hello world',
-                            type: 'Action type',
-                            text: 'Action text',
-                        },
-                    ],
-                    pendingAction: CONST.RED_BRICK_ROAD_PENDING_ACTION.ADD,
-                },
-                {
-                    reportActionID: '4',
-                    previousReportActionID: '3',
-                    created: '2022-11-13 22:27:01.825',
-                    actionName: CONST.REPORT.ACTIONS.TYPE.ADD_COMMENT,
-                    originalMessage: {
-                        html: 'Hello world',
-                        whisperedTo: [],
-                    },
-                    message: [
-                        {
-                            html: 'Hello world',
-                            type: 'Action type',
-                            text: 'Action text',
-                        },
-                    ],
-                    pendingAction: CONST.RED_BRICK_ROAD_PENDING_ACTION.ADD,
-                },
-                {
-                    reportActionID: '5',
-                    previousReportActionID: '4',
-                    created: '2022-11-13 22:27:01.825',
-                    actionName: CONST.REPORT.ACTIONS.TYPE.ADD_COMMENT,
-                    originalMessage: {
-                        html: 'Hello world',
-                        whisperedTo: [],
-                    },
-                    message: [
-                        {
-                            html: 'Hello world',
-                            type: 'Action type',
-                            text: 'Action text',
-                        },
-                    ],
-                    pendingAction: CONST.RED_BRICK_ROAD_PENDING_ACTION.ADD,
-                },
-                {
-                    reportActionID: '6',
-                    previousReportActionID: '5',
-                    created: '2022-11-13 22:27:01.825',
-                    actionName: CONST.REPORT.ACTIONS.TYPE.ADD_COMMENT,
-                    originalMessage: {
-                        html: 'Hello world',
-                        whisperedTo: [],
-                    },
-                    message: [
-                        {
-                            html: 'Hello world',
-                            type: 'Action type',
-                            text: 'Action text',
-                        },
-                    ],
-                    pendingAction: CONST.RED_BRICK_ROAD_PENDING_ACTION.ADD,
-                },
-                {
-                    reportActionID: '7',
-                    previousReportActionID: '6',
-                    created: '2022-11-13 22:27:01.825',
-                    actionName: CONST.REPORT.ACTIONS.TYPE.ADD_COMMENT,
-                    originalMessage: {
-                        html: 'Hello world',
-                        whisperedTo: [],
-                    },
-                    message: [
-                        {
-                            html: 'Hello world',
-                            type: 'Action type',
-                            text: 'Action text',
-                        },
-                    ],
-                    pendingAction: CONST.RED_BRICK_ROAD_PENDING_ACTION.ADD,
-                },
-            ];
-
-            const expectedResult = input;
-            // Reversing the input array to simulate descending order sorting as per our data structure
-            const result = ReportActionsUtils.getContinuousReportActionChain(input.reverse(), '');
-            expect(result).toStrictEqual(expectedResult.reverse());
-        });
-    });
 
     describe('getLastVisibleAction', () => {
         it('should return the last visible action for a report', () => {
@@ -1952,19 +473,18 @@ describe('ReportActionsUtils', () => {
                 waitForBatchedUpdates()
                     // When Onyx is updated with the data and the sidebar re-renders
                     .then(() =>
-                        // @ts-expect-error Preset necessary values
                         Onyx.multiSet({
                             [`${ONYXKEYS.COLLECTION.REPORT}${report.reportID}`]: report,
                             [`${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${report.reportID}`]: {[action.reportActionID]: action, [action2.reportActionID]: action2},
-                        }),
+                        } as unknown as KeyValueMapping),
                     )
                     .then(
                         () =>
                             new Promise<void>((resolve) => {
-                                const connectionID = Onyx.connect({
+                                const connection = Onyx.connect({
                                     key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${report.reportID}`,
                                     callback: () => {
-                                        Onyx.disconnect(connectionID);
+                                        Onyx.disconnect(connection);
                                         const res = ReportActionsUtils.getLastVisibleAction(report.reportID);
                                         expect(res).toEqual(action2);
                                         resolve();
diff --git a/tests/unit/ReportUtilsTest.ts b/tests/unit/ReportUtilsTest.ts
index d0ea948bdb6c..6161fa57f75c 100644
--- a/tests/unit/ReportUtilsTest.ts
+++ b/tests/unit/ReportUtilsTest.ts
@@ -1,6 +1,8 @@
 /* eslint-disable @typescript-eslint/naming-convention */
+import {addDays, format as formatDate} from 'date-fns';
 import type {OnyxEntry} from 'react-native-onyx';
 import Onyx from 'react-native-onyx';
+import DateUtils from '@libs/DateUtils';
 import * as ReportUtils from '@libs/ReportUtils';
 import CONST from '@src/CONST';
 import ONYXKEYS from '@src/ONYXKEYS';
@@ -98,13 +100,11 @@ describe('ReportUtils', () => {
             expect(participants[0].displayName).toBe('(833) 240-3627');
             expect(participants[0].login).toBe('+18332403627@expensify.sms');
 
-            expect(participants[2].avatar).toBeInstanceOf(Function);
             expect(participants[2].displayName).toBe('Lagertha Lothbrok');
             expect(participants[2].login).toBe('lagertha@vikings.net');
             expect(participants[2].accountID).toBe(3);
             expect(participants[2].pronouns).toBe('She/her');
 
-            expect(participants[4].avatar).toBeInstanceOf(Function);
             expect(participants[4].displayName).toBe('Ragnar Lothbrok');
             expect(participants[4].login).toBe('ragnar@vikings.net');
             expect(participants[4].accountID).toBe(1);
@@ -118,7 +118,7 @@ describe('ReportUtils', () => {
                 expect(
                     ReportUtils.getReportName({
                         reportID: '',
-                        participantAccountIDs: [currentUserAccountID, 1],
+                        participants: ReportUtils.buildParticipantsFromAccountIDs([currentUserAccountID, 1]),
                     }),
                 ).toBe('Ragnar Lothbrok');
             });
@@ -127,7 +127,7 @@ describe('ReportUtils', () => {
                 expect(
                     ReportUtils.getReportName({
                         reportID: '',
-                        participantAccountIDs: [currentUserAccountID, 2],
+                        participants: ReportUtils.buildParticipantsFromAccountIDs([currentUserAccountID, 2]),
                     }),
                 ).toBe('floki@vikings.net');
             });
@@ -136,7 +136,7 @@ describe('ReportUtils', () => {
                 expect(
                     ReportUtils.getReportName({
                         reportID: '',
-                        participantAccountIDs: [currentUserAccountID, 4],
+                        participants: ReportUtils.buildParticipantsFromAccountIDs([currentUserAccountID, 4]),
                     }),
                 ).toBe('(833) 240-3627');
             });
@@ -146,7 +146,7 @@ describe('ReportUtils', () => {
             expect(
                 ReportUtils.getReportName({
                     reportID: '',
-                    participantAccountIDs: [currentUserAccountID, 1, 2, 3, 4],
+                    participants: ReportUtils.buildParticipantsFromAccountIDs([currentUserAccountID, 1, 2, 3, 4]),
                 }),
             ).toBe('Ragnar, floki@vikings.net, Lagertha, (833) 240-3627');
         });
@@ -167,6 +167,8 @@ describe('ReportUtils', () => {
                     ...baseAdminsRoom,
                     statusNum: CONST.REPORT.STATUS_NUM.CLOSED,
                     stateNum: CONST.REPORT.STATE_NUM.APPROVED,
+                    // eslint-disable-next-line @typescript-eslint/naming-convention
+                    private_isArchived: DateUtils.getDBTime(),
                 };
 
                 expect(ReportUtils.getReportName(archivedAdminsRoom)).toBe('#admins (archived)');
@@ -191,6 +193,8 @@ describe('ReportUtils', () => {
                     ...baseUserCreatedRoom,
                     statusNum: CONST.REPORT.STATUS_NUM.CLOSED,
                     stateNum: CONST.REPORT.STATE_NUM.APPROVED,
+                    // eslint-disable-next-line @typescript-eslint/naming-convention
+                    private_isArchived: DateUtils.getDBTime(),
                 };
 
                 expect(ReportUtils.getReportName(archivedPolicyRoom)).toBe('#VikingsChat (archived)');
@@ -235,6 +239,8 @@ describe('ReportUtils', () => {
                     oldPolicyName: policy.name,
                     statusNum: CONST.REPORT.STATUS_NUM.CLOSED,
                     stateNum: CONST.REPORT.STATE_NUM.APPROVED,
+                    // eslint-disable-next-line @typescript-eslint/naming-convention
+                    private_isArchived: DateUtils.getDBTime(),
                 };
 
                 test('as member', () => {
@@ -267,9 +273,15 @@ describe('ReportUtils', () => {
     });
 
     describe('requiresAttentionFromCurrentUser', () => {
+        afterEach(async () => {
+            await Onyx.clear();
+            await Onyx.set(ONYXKEYS.SESSION, {email: currentUserEmail, accountID: currentUserAccountID});
+        });
+
         it('returns false when there is no report', () => {
-            expect(ReportUtils.requiresAttentionFromCurrentUser(null)).toBe(false);
+            expect(ReportUtils.requiresAttentionFromCurrentUser(undefined)).toBe(false);
         });
+
         it('returns false when the matched IOU report does not have an owner accountID', () => {
             const report = {
                 ...LHNTestUtils.getFakeReport(),
@@ -277,6 +289,7 @@ describe('ReportUtils', () => {
             };
             expect(ReportUtils.requiresAttentionFromCurrentUser(report)).toBe(false);
         });
+
         it('returns false when the linked iou report has an oustanding IOU', () => {
             const report = {
                 ...LHNTestUtils.getFakeReport(),
@@ -289,6 +302,7 @@ describe('ReportUtils', () => {
                 expect(ReportUtils.requiresAttentionFromCurrentUser(report)).toBe(false);
             });
         });
+
         it('returns false when the report has no outstanding IOU but is waiting for a bank account and the logged user is the report owner', () => {
             const report = {
                 ...LHNTestUtils.getFakeReport(),
@@ -297,6 +311,7 @@ describe('ReportUtils', () => {
             };
             expect(ReportUtils.requiresAttentionFromCurrentUser(report)).toBe(false);
         });
+
         it('returns false when the report has outstanding IOU and is not waiting for a bank account and the logged user is the report owner', () => {
             const report = {
                 ...LHNTestUtils.getFakeReport(),
@@ -305,7 +320,8 @@ describe('ReportUtils', () => {
             };
             expect(ReportUtils.requiresAttentionFromCurrentUser(report)).toBe(false);
         });
-        it('returns false when the report has no oustanding IOU but is waiting for a bank account and the logged user is not the report owner', () => {
+
+        it('returns false when the report has no outstanding IOU but is waiting for a bank account and the logged user is not the report owner', () => {
             const report = {
                 ...LHNTestUtils.getFakeReport(),
                 ownerAccountID: 97,
@@ -313,6 +329,7 @@ describe('ReportUtils', () => {
             };
             expect(ReportUtils.requiresAttentionFromCurrentUser(report)).toBe(false);
         });
+
         it('returns true when the report has an unread mention', () => {
             const report = {
                 ...LHNTestUtils.getFakeReport(),
@@ -320,6 +337,7 @@ describe('ReportUtils', () => {
             };
             expect(ReportUtils.requiresAttentionFromCurrentUser(report)).toBe(true);
         });
+
         it('returns true when the report is an outstanding task', () => {
             const report = {
                 ...LHNTestUtils.getFakeReport(),
@@ -331,7 +349,8 @@ describe('ReportUtils', () => {
             };
             expect(ReportUtils.requiresAttentionFromCurrentUser(report)).toBe(true);
         });
-        it('returns true when the report has oustanding child expense', () => {
+
+        it('returns true when the report has outstanding child expense', () => {
             const report = {
                 ...LHNTestUtils.getFakeReport(),
                 ownerAccountID: 99,
@@ -340,6 +359,34 @@ describe('ReportUtils', () => {
             };
             expect(ReportUtils.requiresAttentionFromCurrentUser(report)).toBe(true);
         });
+
+        it('returns false if the user is not on free trial', async () => {
+            await Onyx.multiSet({
+                [ONYXKEYS.NVP_LAST_DAY_FREE_TRIAL]: null, // not on free trial
+                [ONYXKEYS.NVP_BILLING_FUND_ID]: null, // no payment card added
+            });
+
+            const report: Report = {
+                ...LHNTestUtils.getFakeReport(),
+                chatType: CONST.REPORT.CHAT_TYPE.SYSTEM,
+            };
+
+            expect(ReportUtils.requiresAttentionFromCurrentUser(report)).toBe(false);
+        });
+
+        it("returns false if the user free trial hasn't ended yet", async () => {
+            await Onyx.multiSet({
+                [ONYXKEYS.NVP_LAST_DAY_FREE_TRIAL]: formatDate(addDays(new Date(), 1), CONST.DATE.FNS_DATE_TIME_FORMAT_STRING), // trial not ended
+                [ONYXKEYS.NVP_BILLING_FUND_ID]: null, // no payment card added
+            });
+
+            const report: Report = {
+                ...LHNTestUtils.getFakeReport(),
+                chatType: CONST.REPORT.CHAT_TYPE.SYSTEM,
+            };
+
+            expect(ReportUtils.requiresAttentionFromCurrentUser(report)).toBe(false);
+        });
     });
 
     describe('getMoneyRequestOptions', () => {
@@ -359,7 +406,7 @@ describe('ReportUtils', () => {
         describe('return empty iou options if', () => {
             it('participants array contains excluded expensify iou emails', () => {
                 const allEmpty = CONST.EXPENSIFY_ACCOUNT_IDS.every((accountID) => {
-                    const moneyRequestOptions = ReportUtils.temporary_getMoneyRequestOptions(null, null, [currentUserAccountID, accountID]);
+                    const moneyRequestOptions = ReportUtils.temporary_getMoneyRequestOptions(undefined, undefined, [currentUserAccountID, accountID]);
                     return moneyRequestOptions.length === 0;
                 });
                 expect(allEmpty).toBe(true);
@@ -370,7 +417,7 @@ describe('ReportUtils', () => {
                     ...LHNTestUtils.getFakeReport(),
                     chatType: CONST.REPORT.CHAT_TYPE.POLICY_ROOM,
                 };
-                const moneyRequestOptions = ReportUtils.temporary_getMoneyRequestOptions(report, null, [currentUserAccountID]);
+                const moneyRequestOptions = ReportUtils.temporary_getMoneyRequestOptions(report, undefined, [currentUserAccountID]);
                 expect(moneyRequestOptions.length).toBe(0);
             });
 
@@ -380,7 +427,7 @@ describe('ReportUtils', () => {
                     chatType: CONST.REPORT.CHAT_TYPE.POLICY_EXPENSE_CHAT,
                     isOwnPolicyExpenseChat: false,
                 };
-                const moneyRequestOptions = ReportUtils.temporary_getMoneyRequestOptions(report, null, [currentUserAccountID]);
+                const moneyRequestOptions = ReportUtils.temporary_getMoneyRequestOptions(report, undefined, [currentUserAccountID]);
                 expect(moneyRequestOptions.length).toBe(0);
             });
 
@@ -390,7 +437,7 @@ describe('ReportUtils', () => {
                     type: CONST.REPORT.TYPE.IOU,
                     statusNum: CONST.REPORT.STATUS_NUM.REIMBURSED,
                 };
-                const moneyRequestOptions = ReportUtils.temporary_getMoneyRequestOptions(report, null, [currentUserAccountID]);
+                const moneyRequestOptions = ReportUtils.temporary_getMoneyRequestOptions(report, undefined, [currentUserAccountID]);
                 expect(moneyRequestOptions.length).toBe(0);
             });
 
@@ -401,7 +448,7 @@ describe('ReportUtils', () => {
                     stateNum: CONST.REPORT.STATE_NUM.APPROVED,
                     statusNum: CONST.REPORT.STATUS_NUM.APPROVED,
                 };
-                const moneyRequestOptions = ReportUtils.temporary_getMoneyRequestOptions(report, null, [currentUserAccountID]);
+                const moneyRequestOptions = ReportUtils.temporary_getMoneyRequestOptions(report, undefined, [currentUserAccountID]);
                 expect(moneyRequestOptions.length).toBe(0);
             });
 
@@ -411,7 +458,7 @@ describe('ReportUtils', () => {
                     type: CONST.REPORT.TYPE.EXPENSE,
                     statusNum: CONST.REPORT.STATUS_NUM.REIMBURSED,
                 };
-                const moneyRequestOptions = ReportUtils.temporary_getMoneyRequestOptions(report, null, [currentUserAccountID]);
+                const moneyRequestOptions = ReportUtils.temporary_getMoneyRequestOptions(report, undefined, [currentUserAccountID]);
                 expect(moneyRequestOptions.length).toBe(0);
             });
 
@@ -425,7 +472,7 @@ describe('ReportUtils', () => {
                         parentReportID: '100',
                         type: CONST.REPORT.TYPE.EXPENSE,
                     };
-                    const moneyRequestOptions = ReportUtils.temporary_getMoneyRequestOptions(report, null, [currentUserAccountID]);
+                    const moneyRequestOptions = ReportUtils.temporary_getMoneyRequestOptions(report, undefined, [currentUserAccountID]);
                     expect(moneyRequestOptions.length).toBe(0);
                 });
             });
@@ -463,18 +510,13 @@ describe('ReportUtils', () => {
         });
 
         describe('return only iou split option if', () => {
-            it('it is a chat room with more than one participant', () => {
-                const onlyHaveSplitOption = [
-                    CONST.REPORT.CHAT_TYPE.POLICY_ADMINS,
-                    CONST.REPORT.CHAT_TYPE.POLICY_ANNOUNCE,
-                    CONST.REPORT.CHAT_TYPE.DOMAIN_ALL,
-                    CONST.REPORT.CHAT_TYPE.POLICY_ROOM,
-                ].every((chatType) => {
+            it('it is a chat room with more than one participant that is not an announce room', () => {
+                const onlyHaveSplitOption = [CONST.REPORT.CHAT_TYPE.POLICY_ADMINS, CONST.REPORT.CHAT_TYPE.DOMAIN_ALL, CONST.REPORT.CHAT_TYPE.POLICY_ROOM].every((chatType) => {
                     const report = {
                         ...LHNTestUtils.getFakeReport(),
                         chatType,
                     };
-                    const moneyRequestOptions = ReportUtils.temporary_getMoneyRequestOptions(report, null, [currentUserAccountID, participantsAccountIDs[0]]);
+                    const moneyRequestOptions = ReportUtils.temporary_getMoneyRequestOptions(report, undefined, [currentUserAccountID, participantsAccountIDs[0]]);
                     return moneyRequestOptions.length === 1 && moneyRequestOptions.includes(CONST.IOU.TYPE.SPLIT);
                 });
                 expect(onlyHaveSplitOption).toBe(true);
@@ -485,7 +527,7 @@ describe('ReportUtils', () => {
                     ...LHNTestUtils.getFakeReport(),
                     chatType: CONST.REPORT.CHAT_TYPE.POLICY_ROOM,
                 };
-                const moneyRequestOptions = ReportUtils.temporary_getMoneyRequestOptions(report, null, [currentUserAccountID, ...participantsAccountIDs]);
+                const moneyRequestOptions = ReportUtils.temporary_getMoneyRequestOptions(report, undefined, [currentUserAccountID, ...participantsAccountIDs]);
                 expect(moneyRequestOptions.length).toBe(1);
                 expect(moneyRequestOptions.includes(CONST.IOU.TYPE.SPLIT)).toBe(true);
             });
@@ -495,7 +537,7 @@ describe('ReportUtils', () => {
                     ...LHNTestUtils.getFakeReport(),
                     chatType: CONST.REPORT.CHAT_TYPE.POLICY_ROOM,
                 };
-                const moneyRequestOptions = ReportUtils.temporary_getMoneyRequestOptions(report, null, [currentUserAccountID, ...participantsAccountIDs]);
+                const moneyRequestOptions = ReportUtils.temporary_getMoneyRequestOptions(report, undefined, [currentUserAccountID, ...participantsAccountIDs]);
                 expect(moneyRequestOptions.length).toBe(1);
                 expect(moneyRequestOptions.includes(CONST.IOU.TYPE.SPLIT)).toBe(true);
             });
@@ -506,7 +548,7 @@ describe('ReportUtils', () => {
                     type: CONST.REPORT.TYPE.CHAT,
                     participantsAccountIDs: [currentUserAccountID, ...participantsAccountIDs],
                 };
-                const moneyRequestOptions = ReportUtils.temporary_getMoneyRequestOptions(report, null, [currentUserAccountID, ...participantsAccountIDs.map(Number)]);
+                const moneyRequestOptions = ReportUtils.temporary_getMoneyRequestOptions(report, undefined, [currentUserAccountID, ...participantsAccountIDs.map(Number)]);
                 expect(moneyRequestOptions.length).toBe(1);
                 expect(moneyRequestOptions.includes(CONST.IOU.TYPE.SPLIT)).toBe(true);
             });
@@ -519,8 +561,9 @@ describe('ReportUtils', () => {
                     type: CONST.REPORT.TYPE.IOU,
                     stateNum: CONST.REPORT.STATE_NUM.SUBMITTED,
                     statusNum: CONST.REPORT.STATUS_NUM.SUBMITTED,
+                    managerID: currentUserAccountID,
                 };
-                const moneyRequestOptions = ReportUtils.temporary_getMoneyRequestOptions(report, null, [currentUserAccountID, participantsAccountIDs[0]]);
+                const moneyRequestOptions = ReportUtils.temporary_getMoneyRequestOptions(report, undefined, [currentUserAccountID, participantsAccountIDs[0]]);
                 expect(moneyRequestOptions.length).toBe(1);
                 expect(moneyRequestOptions.includes(CONST.IOU.TYPE.SUBMIT)).toBe(true);
             });
@@ -531,8 +574,9 @@ describe('ReportUtils', () => {
                     type: CONST.REPORT.TYPE.IOU,
                     stateNum: CONST.REPORT.STATE_NUM.SUBMITTED,
                     statusNum: CONST.REPORT.STATUS_NUM.SUBMITTED,
+                    managerID: currentUserAccountID,
                 };
-                const moneyRequestOptions = ReportUtils.temporary_getMoneyRequestOptions(report, null, [currentUserAccountID, participantsAccountIDs[0]]);
+                const moneyRequestOptions = ReportUtils.temporary_getMoneyRequestOptions(report, undefined, [currentUserAccountID, participantsAccountIDs[0]]);
                 expect(moneyRequestOptions.length).toBe(1);
                 expect(moneyRequestOptions.includes(CONST.IOU.TYPE.SUBMIT)).toBe(true);
             });
@@ -549,8 +593,9 @@ describe('ReportUtils', () => {
                         ...LHNTestUtils.getFakeReport(),
                         parentReportID: '102',
                         type: CONST.REPORT.TYPE.EXPENSE,
+                        managerID: currentUserAccountID,
                     };
-                    const moneyRequestOptions = ReportUtils.temporary_getMoneyRequestOptions(report, null, [currentUserAccountID]);
+                    const moneyRequestOptions = ReportUtils.temporary_getMoneyRequestOptions(report, undefined, [currentUserAccountID]);
                     expect(moneyRequestOptions.length).toBe(2);
                     expect(moneyRequestOptions.includes(CONST.IOU.TYPE.SUBMIT)).toBe(true);
                     expect(moneyRequestOptions.includes(CONST.IOU.TYPE.TRACK)).toBe(true);
@@ -569,6 +614,7 @@ describe('ReportUtils', () => {
                         stateNum: CONST.REPORT.STATE_NUM.OPEN,
                         statusNum: CONST.REPORT.STATUS_NUM.OPEN,
                         parentReportID: '103',
+                        managerID: currentUserAccountID,
                     };
                     const paidPolicy = {
                         type: CONST.POLICY.TYPE.TEAM,
@@ -592,8 +638,9 @@ describe('ReportUtils', () => {
                     type: CONST.REPORT.TYPE.IOU,
                     stateNum: CONST.REPORT.STATE_NUM.SUBMITTED,
                     statusNum: CONST.REPORT.STATUS_NUM.SUBMITTED,
+                    managerID: currentUserAccountID,
                 };
-                const moneyRequestOptions = ReportUtils.temporary_getMoneyRequestOptions(report, null, [currentUserAccountID, participantsAccountIDs[0]]);
+                const moneyRequestOptions = ReportUtils.temporary_getMoneyRequestOptions(report, undefined, [currentUserAccountID, participantsAccountIDs[0]]);
                 expect(moneyRequestOptions.length).toBe(1);
                 expect(moneyRequestOptions.includes(CONST.IOU.TYPE.SUBMIT)).toBe(true);
             });
@@ -604,8 +651,9 @@ describe('ReportUtils', () => {
                     type: CONST.REPORT.TYPE.IOU,
                     stateNum: CONST.REPORT.STATE_NUM.SUBMITTED,
                     statusNum: CONST.REPORT.STATUS_NUM.SUBMITTED,
+                    managerID: currentUserAccountID,
                 };
-                const moneyRequestOptions = ReportUtils.temporary_getMoneyRequestOptions(report, null, [currentUserAccountID, participantsAccountIDs[0]]);
+                const moneyRequestOptions = ReportUtils.temporary_getMoneyRequestOptions(report, undefined, [currentUserAccountID, participantsAccountIDs[0]]);
                 expect(moneyRequestOptions.length).toBe(1);
                 expect(moneyRequestOptions.includes(CONST.IOU.TYPE.SUBMIT)).toBe(true);
             });
@@ -637,6 +685,7 @@ describe('ReportUtils', () => {
                         statusNum: CONST.REPORT.STATUS_NUM.SUBMITTED,
                         parentReportID: '101',
                         policyID: paidPolicy.id,
+                        managerID: currentUserAccountID,
                     };
                     const moneyRequestOptions = ReportUtils.temporary_getMoneyRequestOptions(report, paidPolicy, [currentUserAccountID, participantsAccountIDs[0]]);
                     expect(moneyRequestOptions.length).toBe(2);
@@ -652,7 +701,7 @@ describe('ReportUtils', () => {
                     ...LHNTestUtils.getFakeReport(),
                     type: CONST.REPORT.TYPE.CHAT,
                 };
-                const moneyRequestOptions = ReportUtils.temporary_getMoneyRequestOptions(report, null, [currentUserAccountID, participantsAccountIDs[0]]);
+                const moneyRequestOptions = ReportUtils.temporary_getMoneyRequestOptions(report, undefined, [currentUserAccountID, participantsAccountIDs[0]]);
                 expect(moneyRequestOptions.length).toBe(3);
                 expect(moneyRequestOptions.includes(CONST.IOU.TYPE.SPLIT)).toBe(true);
                 expect(moneyRequestOptions.includes(CONST.IOU.TYPE.SUBMIT)).toBe(true);
@@ -664,8 +713,9 @@ describe('ReportUtils', () => {
                     ...LHNTestUtils.getFakeReport(),
                     chatType: CONST.REPORT.CHAT_TYPE.POLICY_EXPENSE_CHAT,
                     isOwnPolicyExpenseChat: true,
+                    managerID: currentUserAccountID,
                 };
-                const moneyRequestOptions = ReportUtils.temporary_getMoneyRequestOptions(report, null, [currentUserAccountID, ...participantsAccountIDs]);
+                const moneyRequestOptions = ReportUtils.temporary_getMoneyRequestOptions(report, undefined, [currentUserAccountID, ...participantsAccountIDs]);
                 expect(moneyRequestOptions.length).toBe(3);
                 expect(moneyRequestOptions.includes(CONST.IOU.TYPE.SUBMIT)).toBe(true);
                 expect(moneyRequestOptions.includes(CONST.IOU.TYPE.SPLIT)).toBe(true);
@@ -690,8 +740,8 @@ describe('ReportUtils', () => {
         });
     });
 
-    describe('sortReportsByLastRead', () => {
-        it('should filter out report without reportID & lastReadTime and sort lastReadTime in ascending order', () => {
+    describe('getMostRecentlyVisitedReport', () => {
+        it('should filter out report without reportID & lastReadTime and return the most recently visited report', () => {
             const reports: Array<OnyxEntry<Report>> = [
                 {reportID: '1', lastReadTime: '2023-07-08 07:15:44.030'},
                 {reportID: '2', lastReadTime: undefined},
@@ -699,14 +749,10 @@ describe('ReportUtils', () => {
                 {reportID: '4', lastReadTime: '2023-07-07 07:15:44.030', type: CONST.REPORT.TYPE.IOU},
                 {lastReadTime: '2023-07-09 07:15:44.030'} as Report,
                 {reportID: '6'},
-                null,
+                undefined,
             ];
-            const sortedReports: Array<OnyxEntry<Report>> = [
-                {reportID: '3', lastReadTime: '2023-07-06 07:15:44.030'},
-                {reportID: '4', lastReadTime: '2023-07-07 07:15:44.030', type: CONST.REPORT.TYPE.IOU},
-                {reportID: '1', lastReadTime: '2023-07-08 07:15:44.030'},
-            ];
-            expect(ReportUtils.sortReportsByLastRead(reports, null)).toEqual(sortedReports);
+            const latestReport: OnyxEntry<Report> = {reportID: '1', lastReadTime: '2023-07-08 07:15:44.030'};
+            expect(ReportUtils.getMostRecentlyVisitedReport(reports, undefined)).toEqual(latestReport);
         });
     });
 
@@ -769,7 +815,9 @@ describe('ReportUtils', () => {
         it("should disable on a whisper action and it's neither a report preview nor IOU action", () => {
             const reportAction = {
                 actionName: CONST.REPORT.ACTIONS.TYPE.MODIFIED_EXPENSE,
-                whisperedToAccountIDs: [123456],
+                originalMessage: {
+                    whisperedTo: [123456],
+                },
             } as ReportAction;
             expect(ReportUtils.shouldDisableThread(reportAction, reportID)).toBeTruthy();
         });
@@ -816,13 +864,139 @@ describe('ReportUtils', () => {
 
         it('should return correctly all ancestors of a thread report', () => {
             const resultAncestors = [
-                {report: reports[1], reportAction: reportActions[0], shouldDisplayNewMarker: false},
-                {report: reports[2], reportAction: reportActions[1], shouldDisplayNewMarker: false},
-                {report: reports[3], reportAction: reportActions[2], shouldDisplayNewMarker: false},
-                {report: reports[4], reportAction: reportActions[3], shouldDisplayNewMarker: false},
+                {report: reports[0], reportAction: reportActions[0], shouldDisplayNewMarker: false},
+                {report: reports[1], reportAction: reportActions[1], shouldDisplayNewMarker: false},
+                {report: reports[2], reportAction: reportActions[2], shouldDisplayNewMarker: false},
+                {report: reports[3], reportAction: reportActions[3], shouldDisplayNewMarker: false},
             ];
 
             expect(ReportUtils.getAllAncestorReportActions(reports[4])).toEqual(resultAncestors);
         });
     });
+
+    describe('isChatUsedForOnboarding', () => {
+        afterEach(async () => {
+            await Onyx.clear();
+            await Onyx.set(ONYXKEYS.SESSION, {email: currentUserEmail, accountID: currentUserAccountID});
+        });
+
+        it('should return false if the report is neither the system or concierge chat', () => {
+            expect(ReportUtils.isChatUsedForOnboarding(LHNTestUtils.getFakeReport())).toBeFalsy();
+        });
+
+        it('should return true if the user account ID is odd and report is the system chat', async () => {
+            const accountID = 1;
+
+            await Onyx.multiSet({
+                [ONYXKEYS.PERSONAL_DETAILS_LIST]: {
+                    [accountID]: {
+                        accountID,
+                    },
+                },
+                [ONYXKEYS.SESSION]: {email: currentUserEmail, accountID},
+            });
+
+            const report: Report = {
+                ...LHNTestUtils.getFakeReport(),
+                chatType: CONST.REPORT.CHAT_TYPE.SYSTEM,
+            };
+
+            expect(ReportUtils.isChatUsedForOnboarding(report)).toBeTruthy();
+        });
+
+        it('should return true if the user account ID is even and report is the concierge chat', async () => {
+            const accountID = 2;
+
+            await Onyx.multiSet({
+                [ONYXKEYS.PERSONAL_DETAILS_LIST]: {
+                    [accountID]: {
+                        accountID,
+                    },
+                },
+                [ONYXKEYS.SESSION]: {email: currentUserEmail, accountID},
+            });
+
+            const report: Report = {
+                ...LHNTestUtils.getFakeReport([accountID, CONST.ACCOUNT_ID.CONCIERGE]),
+            };
+
+            expect(ReportUtils.isChatUsedForOnboarding(report)).toBeTruthy();
+        });
+
+        it("should use the report id from the onboarding NVP if it's set", async () => {
+            const reportID = '8010';
+
+            await Onyx.multiSet({
+                [ONYXKEYS.NVP_ONBOARDING]: {chatReportID: reportID, hasCompletedGuidedSetupFlow: true},
+            });
+
+            const report1: Report = {
+                ...LHNTestUtils.getFakeReport(),
+                reportID,
+            };
+            expect(ReportUtils.isChatUsedForOnboarding(report1)).toBeTruthy();
+
+            const report2: Report = {
+                ...LHNTestUtils.getFakeReport(),
+                reportID: '8011',
+            };
+            expect(ReportUtils.isChatUsedForOnboarding(report2)).toBeFalsy();
+        });
+    });
+
+    describe('getChatByParticipants', () => {
+        const userAccountID = 1;
+        const userAccountID2 = 2;
+        let oneOnOneChatReport: Report;
+        let groupChatReport: Report;
+
+        beforeAll(() => {
+            const invoiceReport: Report = {
+                reportID: '1',
+                type: CONST.REPORT.TYPE.INVOICE,
+                participants: {[userAccountID]: {hidden: false}, [currentUserAccountID]: {hidden: false}},
+            };
+            const taskReport: Report = {
+                reportID: '2',
+                type: CONST.REPORT.TYPE.TASK,
+                participants: {[userAccountID]: {hidden: false}, [currentUserAccountID]: {hidden: false}},
+            };
+            const iouReport: Report = {
+                reportID: '3',
+                type: CONST.REPORT.TYPE.IOU,
+                participants: {[userAccountID]: {hidden: false}, [currentUserAccountID]: {hidden: false}},
+            };
+            groupChatReport = {
+                reportID: '4',
+                type: CONST.REPORT.TYPE.CHAT,
+                chatType: CONST.REPORT.CHAT_TYPE.GROUP,
+                participants: {[userAccountID]: {hidden: false}, [userAccountID2]: {hidden: false}, [currentUserAccountID]: {hidden: false}},
+            };
+            oneOnOneChatReport = {
+                reportID: '5',
+                type: CONST.REPORT.TYPE.CHAT,
+                participants: {[userAccountID]: {hidden: false}, [currentUserAccountID]: {hidden: false}},
+            };
+            const reportCollectionDataSet = toCollectionDataSet(
+                ONYXKEYS.COLLECTION.REPORT,
+                [invoiceReport, taskReport, iouReport, groupChatReport, oneOnOneChatReport],
+                (item) => item.reportID,
+            );
+            return Onyx.mergeCollection(ONYXKEYS.COLLECTION.REPORT, reportCollectionDataSet);
+        });
+        it('should return the 1:1 chat', () => {
+            const report = ReportUtils.getChatByParticipants([currentUserAccountID, userAccountID]);
+            expect(report?.reportID).toEqual(oneOnOneChatReport.reportID);
+        });
+
+        it('should return the group chat', () => {
+            const report = ReportUtils.getChatByParticipants([currentUserAccountID, userAccountID, userAccountID2], undefined, true);
+            expect(report?.reportID).toEqual(groupChatReport.reportID);
+        });
+
+        it('should return undefined when no report is found', () => {
+            const report = ReportUtils.getChatByParticipants([currentUserAccountID, userAccountID2], undefined);
+            expect(report).toEqual(undefined);
+        });
+    });
 });
diff --git a/tests/unit/RequestTest.ts b/tests/unit/RequestTest.ts
index de05f9cab2fa..74c42cdf02c4 100644
--- a/tests/unit/RequestTest.ts
+++ b/tests/unit/RequestTest.ts
@@ -5,7 +5,6 @@ import * as TestHelper from '../utils/TestHelper';
 import waitForBatchedUpdates from '../utils/waitForBatchedUpdates';
 
 beforeAll(() => {
-    // @ts-expect-error TODO: Remove this once TestHelper (https://github.com/Expensify/App/issues/25318) is migrated to TypeScript.
     global.fetch = TestHelper.getGlobalFetchMock();
 });
 
@@ -19,8 +18,8 @@ const request: OnyxTypes.Request = {
 };
 
 test('Request.use() can register a middleware and it will run', () => {
-    const testMiddleware = jest.fn();
-    Request.use(testMiddleware);
+    const testMiddleware = jest.fn<Middleware, Parameters<Middleware>>();
+    Request.use(testMiddleware as unknown as Middleware);
 
     Request.processWithMiddleware(request, true);
     return waitForBatchedUpdates().then(() => {
diff --git a/tests/unit/SidebarFilterTest.ts b/tests/unit/SidebarFilterTest.ts
index 09ad1c379a09..5505ffdd0971 100644
--- a/tests/unit/SidebarFilterTest.ts
+++ b/tests/unit/SidebarFilterTest.ts
@@ -12,7 +12,6 @@ import wrapOnyxWithWaitForBatchedUpdates from '../utils/wrapOnyxWithWaitForBatch
 // Be sure to include the mocked permissions library, as some components that are rendered
 // during the test depend on its methods.
 jest.mock('@libs/Permissions');
-jest.mock('@hooks/usePermissions.ts');
 
 const ONYXKEYS = {
     PERSONAL_DETAILS_LIST: 'personalDetailsList',
@@ -280,6 +279,40 @@ xdescribe('Sidebar', () => {
             );
         });
 
+        it('filter paycheck and bill report', () => {
+            const report1: Report = {
+                ...LHNTestUtils.getFakeReport(),
+                type: CONST.REPORT.UNSUPPORTED_TYPE.PAYCHECK,
+            };
+            const report2: Report = {
+                ...LHNTestUtils.getFakeReport(),
+                type: CONST.REPORT.UNSUPPORTED_TYPE.BILL,
+                errorFields: {
+                    notFound: {
+                        error: 'Report not found',
+                    },
+                },
+            };
+            const report3: Report = LHNTestUtils.getFakeReport();
+            LHNTestUtils.getDefaultRenderedSidebarLinks(report1.reportID);
+            const reportCollectionDataSet: ReportCollectionDataSet = {
+                [`${ONYXKEYS.COLLECTION.REPORT}${report1.reportID}`]: report1,
+                [`${ONYXKEYS.COLLECTION.REPORT}${report2.reportID}`]: report2,
+                [`${ONYXKEYS.COLLECTION.REPORT}${report3.reportID}`]: report3,
+            };
+            return (
+                waitForBatchedUpdates()
+                    .then(() => Onyx.multiSet(reportCollectionDataSet))
+
+                    // Then the reports 1 and 2 are hidden and 3 is not
+                    .then(() => {
+                        const hintText = Localize.translateLocal('accessibilityHints.navigatesToChat');
+                        const optionRows = screen.queryAllByAccessibilityHint(hintText);
+                        expect(optionRows).toHaveLength(1);
+                    })
+            );
+        });
+
         // NOTE: This is also for #focus mode, should we move this test block?
         describe('all combinations of isArchived, isUserCreatedPolicyRoom, hasAddWorkspaceError, isUnread, isPinned, hasDraft', () => {
             // Given a report that is the active report and doesn't change
@@ -320,7 +353,7 @@ xdescribe('Sidebar', () => {
                 const boolArr: boolean[] = [];
                 for (let j = AMOUNT_OF_VARIABLES - 1; j >= 0; j--) {
                     // eslint-disable-next-line no-bitwise
-                    boolArr.push(Boolean(i & (1 << j)));
+                    boolArr.push(!!(i & (1 << j)));
                 }
 
                 // To test a failing set of conditions, comment out the for loop above and then use a hardcoded array
@@ -666,7 +699,7 @@ xdescribe('Sidebar', () => {
             const boolArr: boolean[] = [];
             for (let j = AMOUNT_OF_VARIABLES - 1; j >= 0; j--) {
                 // eslint-disable-next-line no-bitwise
-                boolArr.push(Boolean(i & (1 << j)));
+                boolArr.push(!!(i & (1 << j)));
             }
 
             // To test a failing set of conditions, comment out the for loop above and then use a hardcoded array
diff --git a/tests/unit/SidebarOrderTest.ts b/tests/unit/SidebarOrderTest.ts
index 644bba5a589b..b8a507289e8d 100644
--- a/tests/unit/SidebarOrderTest.ts
+++ b/tests/unit/SidebarOrderTest.ts
@@ -10,10 +10,10 @@ import * as LHNTestUtils from '../utils/LHNTestUtils';
 import waitForBatchedUpdates from '../utils/waitForBatchedUpdates';
 import wrapOnyxWithWaitForBatchedUpdates from '../utils/wrapOnyxWithWaitForBatchedUpdates';
 
-// Be sure to include the mocked Permissions and Expensicons libraries as well as the usePermissions hook or else the beta tests won't work
+// Be sure to include the mocked Permissions and Expensicons libraries or else the beta tests won't work
 jest.mock('@libs/Permissions');
-jest.mock('@hooks/usePermissions.ts');
 jest.mock('@components/Icon/Expensicons');
+jest.mock('@src/hooks/useActiveWorkspaceFromNavigationState');
 
 const ONYXKEYS = {
     PERSONAL_DETAILS_LIST: 'personalDetailsList',
@@ -62,33 +62,29 @@ describe('Sidebar', () => {
             expect(screen.toJSON()).toBe(null);
         });
 
-        it('is rendered with an empty list when personal details exist', () => {
-            // Given the sidebar is rendered with default props
-            LHNTestUtils.getDefaultRenderedSidebarLinks();
-
-            return (
-                waitForBatchedUpdates()
-                    // When Onyx is updated with some personal details
-                    .then(() =>
-                        Onyx.multiSet({
-                            [ONYXKEYS.PERSONAL_DETAILS_LIST]: LHNTestUtils.fakePersonalDetails,
-                            [ONYXKEYS.IS_LOADING_APP]: false,
-                        }),
-                    )
-
-                    // Then the component should be rendered with an empty list since it will get past the early return
-                    .then(() => {
-                        expect(screen.toJSON()).not.toBe(null);
-                        const navigatesToChatHintText = Localize.translateLocal('accessibilityHints.navigatesToChat');
-                        expect(screen.queryAllByAccessibilityHint(navigatesToChatHintText)).toHaveLength(0);
-                    })
-            );
-        });
+        it('is rendered with an empty list when personal details exist', () =>
+            waitForBatchedUpdates()
+                // Given the sidebar is rendered with default props
+                .then(() => LHNTestUtils.getDefaultRenderedSidebarLinks())
+
+                // When Onyx is updated with some personal details
+                .then(() =>
+                    Onyx.multiSet({
+                        [ONYXKEYS.PERSONAL_DETAILS_LIST]: LHNTestUtils.fakePersonalDetails,
+                        [ONYXKEYS.IS_LOADING_APP]: false,
+                    }),
+                )
+
+                // Then the component should be rendered with an empty list since it will get past the early return
+                .then(() => {
+                    expect(screen.toJSON()).not.toBe(null);
+                    const navigatesToChatHintText = Localize.translateLocal('accessibilityHints.navigatesToChat');
+                    expect(screen.queryAllByAccessibilityHint(navigatesToChatHintText)).toHaveLength(0);
+                }));
 
         it('contains one report when a report is in Onyx', () => {
             // Given a single report
             const report = LHNTestUtils.getFakeReport([1, 2]);
-            LHNTestUtils.getDefaultRenderedSidebarLinks(report.reportID);
 
             const reportCollectionDataSet: ReportCollectionDataSet = {
                 [`${ONYXKEYS.COLLECTION.REPORT}${report.reportID}`]: report,
@@ -96,6 +92,8 @@ describe('Sidebar', () => {
 
             return (
                 waitForBatchedUpdates()
+                    .then(() => LHNTestUtils.getDefaultRenderedSidebarLinks(report.reportID))
+
                     // When Onyx is updated with the data and the sidebar re-renders
                     .then(() =>
                         Onyx.multiSet({
@@ -114,8 +112,6 @@ describe('Sidebar', () => {
         });
 
         it('orders items with most recently updated on top', () => {
-            LHNTestUtils.getDefaultRenderedSidebarLinks();
-
             // Given three unread reports in the recently updated order of 3, 2, 1
             const report1 = LHNTestUtils.getFakeReport([1, 2], 3);
             const report2 = LHNTestUtils.getFakeReport([3, 4], 2);
@@ -134,6 +130,8 @@ describe('Sidebar', () => {
 
             return (
                 waitForBatchedUpdates()
+                    .then(() => LHNTestUtils.getDefaultRenderedSidebarLinks())
+
                     // When Onyx is updated with the data and the sidebar re-renders
                     .then(() =>
                         Onyx.multiSet({
@@ -173,8 +171,6 @@ describe('Sidebar', () => {
             Report.addComment(report3.reportID, 'Hi, this is a comment');
 
             const currentReportId = report1.reportID;
-            LHNTestUtils.getDefaultRenderedSidebarLinks(currentReportId);
-
             const reportCollectionDataSet: ReportCollectionDataSet = {
                 [`${ONYXKEYS.COLLECTION.REPORT}${report1.reportID}`]: report1,
                 [`${ONYXKEYS.COLLECTION.REPORT}${report2.reportID}`]: report2,
@@ -183,6 +179,8 @@ describe('Sidebar', () => {
 
             return (
                 waitForBatchedUpdates()
+                    .then(() => LHNTestUtils.getDefaultRenderedSidebarLinks(currentReportId))
+
                     // When Onyx is updated with the data and the sidebar re-renders
                     .then(() =>
                         Onyx.multiSet({
@@ -211,8 +209,6 @@ describe('Sidebar', () => {
         });
 
         it('reorders the reports to always have the most recently updated one on top', () => {
-            LHNTestUtils.getDefaultRenderedSidebarLinks();
-
             // Given three reports in the recently updated order of 3, 2, 1
             const report1 = LHNTestUtils.getFakeReport([1, 2], 3);
             const report2 = LHNTestUtils.getFakeReport([3, 4], 2);
@@ -231,6 +227,8 @@ describe('Sidebar', () => {
 
             return (
                 waitForBatchedUpdates()
+                    .then(() => LHNTestUtils.getDefaultRenderedSidebarLinks())
+
                     // When Onyx is updated with the data and the sidebar re-renders
                     .then(() =>
                         Onyx.multiSet({
@@ -282,8 +280,6 @@ describe('Sidebar', () => {
             Report.addComment(report2.reportID, 'Hi, this is a comment');
             Report.addComment(report3.reportID, 'Hi, this is a comment');
 
-            LHNTestUtils.getDefaultRenderedSidebarLinks(taskReport.reportID);
-
             const reportCollectionDataSet: ReportCollectionDataSet = {
                 [`${ONYXKEYS.COLLECTION.REPORT}${report1.reportID}`]: report1,
                 [`${ONYXKEYS.COLLECTION.REPORT}${report2.reportID}`]: report2,
@@ -293,6 +289,8 @@ describe('Sidebar', () => {
 
             return (
                 waitForBatchedUpdates()
+                    .then(() => LHNTestUtils.getDefaultRenderedSidebarLinks(taskReport.reportID))
+
                     // When Onyx is updated with the data and the sidebar re-renders
                     .then(() =>
                         Onyx.multiSet({
@@ -346,8 +344,6 @@ describe('Sidebar', () => {
             Report.addComment(report2.reportID, 'Hi, this is a comment');
             Report.addComment(report3.reportID, 'Hi, this is a comment');
 
-            LHNTestUtils.getDefaultRenderedSidebarLinks(report3.reportID);
-
             const reportCollectionDataSet: ReportCollectionDataSet = {
                 [`${ONYXKEYS.COLLECTION.REPORT}${report1.reportID}`]: report1,
                 [`${ONYXKEYS.COLLECTION.REPORT}${report2.reportID}`]: report2,
@@ -357,6 +353,8 @@ describe('Sidebar', () => {
 
             return (
                 waitForBatchedUpdates()
+                    .then(() => LHNTestUtils.getDefaultRenderedSidebarLinks(report3.reportID))
+
                     // When Onyx is updated with the data and the sidebar re-renders
                     .then(() =>
                         Onyx.multiSet({
@@ -413,8 +411,6 @@ describe('Sidebar', () => {
             Report.addComment(report2.reportID, 'Hi, this is a comment');
             Report.addComment(report3.reportID, 'Hi, this is a comment');
 
-            LHNTestUtils.getDefaultRenderedSidebarLinks(report3.reportID);
-
             const reportCollectionDataSet: ReportCollectionDataSet = {
                 [`${ONYXKEYS.COLLECTION.REPORT}${report1.reportID}`]: report1,
                 [`${ONYXKEYS.COLLECTION.REPORT}${report2.reportID}`]: report2,
@@ -424,6 +420,8 @@ describe('Sidebar', () => {
 
             return (
                 waitForBatchedUpdates()
+                    .then(() => LHNTestUtils.getDefaultRenderedSidebarLinks(report3.reportID))
+
                     // When Onyx is updated with the data and the sidebar re-renders
                     .then(() =>
                         Onyx.multiSet({
@@ -464,7 +462,6 @@ describe('Sidebar', () => {
             Report.addComment(report3.reportID, 'Hi, this is a comment');
 
             const currentReportId = report2.reportID;
-            LHNTestUtils.getDefaultRenderedSidebarLinks(currentReportId);
 
             const reportCollectionDataSet: ReportCollectionDataSet = {
                 [`${ONYXKEYS.COLLECTION.REPORT}${report1.reportID}`]: report1,
@@ -474,6 +471,8 @@ describe('Sidebar', () => {
 
             return (
                 waitForBatchedUpdates()
+                    .then(() => LHNTestUtils.getDefaultRenderedSidebarLinks(currentReportId))
+
                     // When Onyx is updated with the data and the sidebar re-renders
                     .then(() =>
                         Onyx.multiSet({
@@ -507,8 +506,6 @@ describe('Sidebar', () => {
         });
 
         it('removes the pencil icon when draft is removed', () => {
-            LHNTestUtils.getDefaultRenderedSidebarLinks();
-
             // Given a single report
             // And the report has a draft
             const report: OnyxTypes.Report = {
@@ -521,6 +518,8 @@ describe('Sidebar', () => {
 
             return (
                 waitForBatchedUpdates()
+                    .then(() => LHNTestUtils.getDefaultRenderedSidebarLinks())
+
                     // When Onyx is updated with the data and the sidebar re-renders
                     .then(() =>
                         Onyx.multiSet({
@@ -548,8 +547,6 @@ describe('Sidebar', () => {
         });
 
         it('removes the pin icon when chat is unpinned', () => {
-            LHNTestUtils.getDefaultRenderedSidebarLinks();
-
             // Given a single report
             // And the report is pinned
             const report: OnyxTypes.Report = {
@@ -563,6 +560,8 @@ describe('Sidebar', () => {
 
             return (
                 waitForBatchedUpdates()
+                    .then(() => LHNTestUtils.getDefaultRenderedSidebarLinks())
+
                     // When Onyx is updated with the data and the sidebar re-renders
                     .then(() =>
                         Onyx.multiSet({
@@ -624,8 +623,6 @@ describe('Sidebar', () => {
             const currentReportId = report2.reportID;
             const currentlyLoggedInUserAccountID = 9;
 
-            LHNTestUtils.getDefaultRenderedSidebarLinks(currentReportId);
-
             const reportCollectionDataSet: ReportCollectionDataSet = {
                 [`${ONYXKEYS.COLLECTION.REPORT}${report1.reportID}`]: report1,
                 [`${ONYXKEYS.COLLECTION.REPORT}${report2.reportID}`]: report2,
@@ -635,6 +632,8 @@ describe('Sidebar', () => {
 
             return (
                 waitForBatchedUpdates()
+                    .then(() => LHNTestUtils.getDefaultRenderedSidebarLinks(currentReportId))
+
                     // When Onyx is updated with the data and the sidebar re-renders
                     .then(() =>
                         Onyx.multiSet({
@@ -683,8 +682,6 @@ describe('Sidebar', () => {
                 isPinned: true,
             };
 
-            LHNTestUtils.getDefaultRenderedSidebarLinks('0');
-
             const reportCollectionDataSet: ReportCollectionDataSet = {
                 [`${ONYXKEYS.COLLECTION.REPORT}${report1.reportID}`]: report1,
                 [`${ONYXKEYS.COLLECTION.REPORT}${report2.reportID}`]: report2,
@@ -693,6 +690,8 @@ describe('Sidebar', () => {
 
             return (
                 waitForBatchedUpdates()
+                    .then(() => LHNTestUtils.getDefaultRenderedSidebarLinks('0'))
+
                     // When Onyx is updated with the data and the sidebar re-renders
                     .then(() =>
                         Onyx.multiSet({
@@ -745,8 +744,6 @@ describe('Sidebar', () => {
                 ...LHNTestUtils.getFakeReport([7, 8], 0),
             };
 
-            LHNTestUtils.getDefaultRenderedSidebarLinks('0');
-
             const reportCollectionDataSet: ReportCollectionDataSet = {
                 [`${ONYXKEYS.COLLECTION.REPORT}${report1.reportID}`]: report1,
                 [`${ONYXKEYS.COLLECTION.REPORT}${report2.reportID}`]: report2,
@@ -761,6 +758,8 @@ describe('Sidebar', () => {
 
             return (
                 waitForBatchedUpdates()
+                    .then(() => LHNTestUtils.getDefaultRenderedSidebarLinks('0'))
+
                     // When Onyx is updated with the data and the sidebar re-renders
                     .then(() =>
                         Onyx.multiSet({
@@ -812,6 +811,8 @@ describe('Sidebar', () => {
                 chatType: CONST.REPORT.CHAT_TYPE.POLICY_ROOM,
                 statusNum: CONST.REPORT.STATUS_NUM.CLOSED,
                 stateNum: CONST.REPORT.STATE_NUM.APPROVED,
+                // eslint-disable-next-line @typescript-eslint/naming-convention
+                private_isArchived: DateUtils.getDBTime(),
             };
             const report2 = LHNTestUtils.getFakeReport([3, 4]);
             const report3 = LHNTestUtils.getFakeReport([5, 6]);
@@ -824,8 +825,6 @@ describe('Sidebar', () => {
             // Given the user is in all betas
             const betas = [CONST.BETAS.DEFAULT_ROOMS];
 
-            LHNTestUtils.getDefaultRenderedSidebarLinks('0');
-
             const reportCollectionDataSet: ReportCollectionDataSet = {
                 [`${ONYXKEYS.COLLECTION.REPORT}${report1.reportID}`]: report1,
                 [`${ONYXKEYS.COLLECTION.REPORT}${report2.reportID}`]: report2,
@@ -834,6 +833,8 @@ describe('Sidebar', () => {
 
             return (
                 waitForBatchedUpdates()
+                    .then(() => LHNTestUtils.getDefaultRenderedSidebarLinks('0'))
+
                     // When Onyx is updated with the data and the sidebar re-renders
                     .then(() =>
                         Onyx.multiSet({
@@ -860,12 +861,10 @@ describe('Sidebar', () => {
 
     describe('in #focus mode', () => {
         it('alphabetizes chats', () => {
-            LHNTestUtils.getDefaultRenderedSidebarLinks();
-
-            const report1 = LHNTestUtils.getFakeReport([1, 2], 3, true);
-            const report2 = LHNTestUtils.getFakeReport([3, 4], 2, true);
-            const report3 = LHNTestUtils.getFakeReport([5, 6], 1, true);
-            const report4 = LHNTestUtils.getFakeReport([7, 8], 0, true);
+            const report1 = {...LHNTestUtils.getFakeReport([1, 2], 3, true), lastMessageText: 'test'};
+            const report2 = {...LHNTestUtils.getFakeReport([3, 4], 2, true), lastMessageText: 'test'};
+            const report3 = {...LHNTestUtils.getFakeReport([5, 6], 1, true), lastMessageText: 'test'};
+            const report4 = {...LHNTestUtils.getFakeReport([7, 8], 0, true), lastMessageText: 'test'};
 
             const reportCollectionDataSet: ReportCollectionDataSet = {
                 [`${ONYXKEYS.COLLECTION.REPORT}${report1.reportID}`]: report1,
@@ -875,12 +874,13 @@ describe('Sidebar', () => {
 
             return (
                 waitForBatchedUpdates()
+                    .then(() => Onyx.set(ONYXKEYS.PERSONAL_DETAILS_LIST, LHNTestUtils.fakePersonalDetails))
+                    .then(() => LHNTestUtils.getDefaultRenderedSidebarLinks('0'))
                     // Given the sidebar is rendered in #focus mode (hides read chats)
                     // with all reports having unread comments
                     .then(() =>
                         Onyx.multiSet({
                             [ONYXKEYS.NVP_PRIORITY_MODE]: CONST.PRIORITY_MODE.GSD,
-                            [ONYXKEYS.PERSONAL_DETAILS_LIST]: LHNTestUtils.fakePersonalDetails,
                             [ONYXKEYS.IS_LOADING_APP]: false,
                             ...reportCollectionDataSet,
                         }),
@@ -919,15 +919,19 @@ describe('Sidebar', () => {
                 chatType: CONST.REPORT.CHAT_TYPE.POLICY_ROOM,
                 statusNum: CONST.REPORT.STATUS_NUM.CLOSED,
                 stateNum: CONST.REPORT.STATE_NUM.APPROVED,
+                lastMessageText: 'test',
+                // eslint-disable-next-line @typescript-eslint/naming-convention
+                private_isArchived: DateUtils.getDBTime(),
             };
-            const report2 = LHNTestUtils.getFakeReport([3, 4], 2, true);
-            const report3 = LHNTestUtils.getFakeReport([5, 6], 1, true);
+            const report2 = {
+                ...LHNTestUtils.getFakeReport([3, 4], 2, true),
+                lastMessageText: 'test',
+            };
+            const report3 = {...LHNTestUtils.getFakeReport([5, 6], 1, true), lastMessageText: 'test'};
 
             // Given the user is in all betas
             const betas = [CONST.BETAS.DEFAULT_ROOMS];
 
-            LHNTestUtils.getDefaultRenderedSidebarLinks('0');
-
             const reportCollectionDataSet: ReportCollectionDataSet = {
                 [`${ONYXKEYS.COLLECTION.REPORT}${report1.reportID}`]: report1,
                 [`${ONYXKEYS.COLLECTION.REPORT}${report2.reportID}`]: report2,
@@ -936,6 +940,8 @@ describe('Sidebar', () => {
 
             return (
                 waitForBatchedUpdates()
+                    .then(() => LHNTestUtils.getDefaultRenderedSidebarLinks('0'))
+
                     // When Onyx is updated with the data and the sidebar re-renders
                     .then(() =>
                         Onyx.multiSet({
@@ -1060,8 +1066,6 @@ describe('Sidebar', () => {
 
             const currentlyLoggedInUserAccountID = 13;
 
-            LHNTestUtils.getDefaultRenderedSidebarLinks('0');
-
             const reportCollectionDataSet: ReportCollectionDataSet = {
                 [`${ONYXKEYS.COLLECTION.REPORT}${report1.reportID}`]: report1,
                 [`${ONYXKEYS.COLLECTION.REPORT}${report2.reportID}`]: report2,
@@ -1077,6 +1081,7 @@ describe('Sidebar', () => {
 
             return (
                 waitForBatchedUpdates()
+                    .then(() => LHNTestUtils.getDefaultRenderedSidebarLinks('0'))
                     // When Onyx is updated with the data and the sidebar re-renders
                     .then(() =>
                         Onyx.multiSet({
@@ -1123,8 +1128,6 @@ describe('Sidebar', () => {
             Report.addComment(report2.reportID, 'Hi, this is a comment');
             Report.addComment(report3.reportID, 'Hi, this is a comment');
 
-            LHNTestUtils.getDefaultRenderedSidebarLinks('0');
-
             const reportCollectionDataSet: ReportCollectionDataSet = {
                 [`${ONYXKEYS.COLLECTION.REPORT}${report1.reportID}`]: report1,
                 [`${ONYXKEYS.COLLECTION.REPORT}${report2.reportID}`]: report2,
@@ -1133,6 +1136,8 @@ describe('Sidebar', () => {
 
             return (
                 waitForBatchedUpdates()
+                    .then(() => LHNTestUtils.getDefaultRenderedSidebarLinks('0'))
+
                     // When Onyx is updated with the data and the sidebar re-renders
                     .then(() =>
                         Onyx.multiSet({
diff --git a/tests/unit/SidebarTest.ts b/tests/unit/SidebarTest.ts
index c037c1ced3f0..6913d39b7f34 100644
--- a/tests/unit/SidebarTest.ts
+++ b/tests/unit/SidebarTest.ts
@@ -1,5 +1,6 @@
 import {screen} from '@testing-library/react-native';
 import Onyx from 'react-native-onyx';
+import DateUtils from '@libs/DateUtils';
 import CONST from '@src/CONST';
 import * as Localize from '@src/libs/Localize';
 import ONYXKEYS from '@src/ONYXKEYS';
@@ -9,9 +10,9 @@ import * as LHNTestUtils from '../utils/LHNTestUtils';
 import waitForBatchedUpdates from '../utils/waitForBatchedUpdates';
 import wrapOnyxWithWaitForBatchedUpdates from '../utils/wrapOnyxWithWaitForBatchedUpdates';
 
-// Be sure to include the mocked Permissions and Expensicons libraries as well as the usePermissions hook or else the beta tests won't work
+// Be sure to include the mocked Permissions and Expensicons libraries or else the beta tests won't work
 jest.mock('@src/libs/Permissions');
-jest.mock('@src/hooks/usePermissions.ts');
+jest.mock('@src/hooks/useActiveWorkspaceFromNavigationState');
 jest.mock('@src/components/Icon/Expensicons');
 
 describe('Sidebar', () => {
@@ -41,6 +42,9 @@ describe('Sidebar', () => {
                 chatType: CONST.REPORT.CHAT_TYPE.POLICY_ROOM,
                 statusNum: CONST.REPORT.STATUS_NUM.CLOSED,
                 stateNum: CONST.REPORT.STATE_NUM.APPROVED,
+                // eslint-disable-next-line @typescript-eslint/naming-convention
+                private_isArchived: DateUtils.getDBTime(),
+                lastMessageText: 'test',
             };
 
             const action = {
@@ -53,9 +57,9 @@ describe('Sidebar', () => {
 
             // Given the user is in all betas
             const betas = [CONST.BETAS.DEFAULT_ROOMS];
-            LHNTestUtils.getDefaultRenderedSidebarLinks('0');
             return (
                 waitForBatchedUpdates()
+                    .then(() => LHNTestUtils.getDefaultRenderedSidebarLinks('0'))
                     // When Onyx is updated with the data and the sidebar re-renders
                     .then(() => {
                         const reportCollection: ReportCollectionDataSet = {
@@ -93,6 +97,9 @@ describe('Sidebar', () => {
                 chatType: CONST.REPORT.CHAT_TYPE.POLICY_ROOM,
                 statusNum: CONST.REPORT.STATUS_NUM.CLOSED,
                 stateNum: CONST.REPORT.STATE_NUM.APPROVED,
+                // eslint-disable-next-line @typescript-eslint/naming-convention
+                private_isArchived: DateUtils.getDBTime(),
+                lastMessageText: 'test',
             };
             const action = {
                 ...LHNTestUtils.getFakeReportAction('email1@test.com', 3),
@@ -105,9 +112,9 @@ describe('Sidebar', () => {
 
             // Given the user is in all betas
             const betas = [CONST.BETAS.DEFAULT_ROOMS];
-            LHNTestUtils.getDefaultRenderedSidebarLinks('0');
             return (
                 waitForBatchedUpdates()
+                    .then(() => LHNTestUtils.getDefaultRenderedSidebarLinks('0'))
                     // When Onyx is updated with the data and the sidebar re-renders
                     .then(() => {
                         const reportCollection: ReportCollectionDataSet = {
diff --git a/tests/unit/StringUtilsTest.ts b/tests/unit/StringUtilsTest.ts
deleted file mode 100644
index 04ce748c984b..000000000000
--- a/tests/unit/StringUtilsTest.ts
+++ /dev/null
@@ -1,20 +0,0 @@
-import StringUtils from '@libs/StringUtils';
-
-describe('StringUtils', () => {
-    describe('getAcronym', () => {
-        it('should return the acronym of a string with multiple words', () => {
-            const acronym = StringUtils.getAcronym('Hello World');
-            expect(acronym).toBe('HW');
-        });
-
-        it('should return an acronym of a string with a single word', () => {
-            const acronym = StringUtils.getAcronym('Hello');
-            expect(acronym).toBe('H');
-        });
-
-        it('should return an acronym of a string when word in a string has a hyphen', () => {
-            const acronym = StringUtils.getAcronym('Hello Every-One');
-            expect(acronym).toBe('HEO');
-        });
-    });
-});
diff --git a/tests/unit/SubscriptionUtilsTest.ts b/tests/unit/SubscriptionUtilsTest.ts
new file mode 100644
index 000000000000..0ab5b8afa968
--- /dev/null
+++ b/tests/unit/SubscriptionUtilsTest.ts
@@ -0,0 +1,462 @@
+import {addDays, addMinutes, format as formatDate, getUnixTime, subDays} from 'date-fns';
+import Onyx from 'react-native-onyx';
+import * as SubscriptionUtils from '@libs/SubscriptionUtils';
+import {PAYMENT_STATUS} from '@libs/SubscriptionUtils';
+import CONST from '@src/CONST';
+import ONYXKEYS from '@src/ONYXKEYS';
+import type {BillingGraceEndPeriod, BillingStatus, FundList, StripeCustomerID} from '@src/types/onyx';
+import createRandomPolicy from '../utils/collections/policies';
+
+const billingGraceEndPeriod: BillingGraceEndPeriod = {
+    value: 0,
+};
+
+const GRACE_PERIOD_DATE = new Date().getTime() + 1000 * 3600;
+const GRACE_PERIOD_DATE_OVERDUE = new Date().getTime() - 1000;
+
+const AMOUNT_OWED = 100;
+const STRIPE_CUSTOMER_ID: StripeCustomerID = {
+    paymentMethodID: '1',
+    intentsID: '2',
+    currency: 'USD',
+    status: 'authentication_required',
+};
+const BILLING_STATUS_INSUFFICIENT_FUNDS: BillingStatus = {
+    action: 'action',
+    periodMonth: 'periodMonth',
+    periodYear: 'periodYear',
+    declineReason: 'insufficient_funds',
+};
+const BILLING_STATUS_EXPIRED_CARD: BillingStatus = {
+    ...BILLING_STATUS_INSUFFICIENT_FUNDS,
+    declineReason: 'expired_card',
+};
+const FUND_LIST: FundList = {
+    defaultCard: {
+        isDefault: true,
+        accountData: {
+            cardYear: new Date().getFullYear(),
+            cardMonth: new Date().getMonth() + 1,
+            additionalData: {
+                isBillingCard: true,
+            },
+        },
+    },
+};
+
+Onyx.init({keys: ONYXKEYS});
+
+describe('SubscriptionUtils', () => {
+    describe('calculateRemainingFreeTrialDays', () => {
+        afterEach(async () => {
+            await Onyx.clear();
+            await Onyx.multiSet({
+                [ONYXKEYS.NVP_FIRST_DAY_FREE_TRIAL]: null,
+            });
+        });
+
+        it('should return 0 if the Onyx key is not set', () => {
+            expect(SubscriptionUtils.calculateRemainingFreeTrialDays()).toBe(0);
+        });
+
+        it('should return 0 if the current date is after the free trial end date', async () => {
+            await Onyx.set(ONYXKEYS.NVP_LAST_DAY_FREE_TRIAL, formatDate(subDays(new Date(), 8), CONST.DATE.FNS_DATE_TIME_FORMAT_STRING));
+            expect(SubscriptionUtils.calculateRemainingFreeTrialDays()).toBe(0);
+        });
+
+        it('should return 1 if the current date is on the same day of the free trial end date, but some minutes earlier', async () => {
+            await Onyx.set(ONYXKEYS.NVP_LAST_DAY_FREE_TRIAL, formatDate(addMinutes(new Date(), 30), CONST.DATE.FNS_DATE_TIME_FORMAT_STRING));
+            expect(SubscriptionUtils.calculateRemainingFreeTrialDays()).toBe(1);
+        });
+
+        it('should return the remaining days if the current date is before the free trial end date', async () => {
+            await Onyx.set(ONYXKEYS.NVP_LAST_DAY_FREE_TRIAL, formatDate(addDays(new Date(), 5), CONST.DATE.FNS_DATE_TIME_FORMAT_STRING));
+            expect(SubscriptionUtils.calculateRemainingFreeTrialDays()).toBe(5);
+        });
+    });
+
+    describe('isUserOnFreeTrial', () => {
+        afterEach(async () => {
+            await Onyx.clear();
+            await Onyx.multiSet({
+                [ONYXKEYS.NVP_FIRST_DAY_FREE_TRIAL]: null,
+                [ONYXKEYS.NVP_LAST_DAY_FREE_TRIAL]: null,
+            });
+        });
+
+        it('should return false if the Onyx keys are not set', () => {
+            expect(SubscriptionUtils.isUserOnFreeTrial()).toBeFalsy();
+        });
+
+        it('should return false if the current date is before the free trial start date', async () => {
+            await Onyx.multiSet({
+                [ONYXKEYS.NVP_FIRST_DAY_FREE_TRIAL]: formatDate(addDays(new Date(), 2), CONST.DATE.FNS_DATE_TIME_FORMAT_STRING),
+                [ONYXKEYS.NVP_LAST_DAY_FREE_TRIAL]: formatDate(addDays(new Date(), 4), CONST.DATE.FNS_DATE_TIME_FORMAT_STRING),
+            });
+
+            expect(SubscriptionUtils.isUserOnFreeTrial()).toBeFalsy();
+        });
+
+        it('should return false if the current date is after the free trial end date', async () => {
+            await Onyx.multiSet({
+                [ONYXKEYS.NVP_FIRST_DAY_FREE_TRIAL]: formatDate(subDays(new Date(), 4), CONST.DATE.FNS_DATE_TIME_FORMAT_STRING),
+                [ONYXKEYS.NVP_LAST_DAY_FREE_TRIAL]: formatDate(subDays(new Date(), 2), CONST.DATE.FNS_DATE_TIME_FORMAT_STRING),
+            });
+
+            expect(SubscriptionUtils.isUserOnFreeTrial()).toBeFalsy();
+        });
+
+        it('should return true if the current date is on the same date of free trial start date', async () => {
+            await Onyx.multiSet({
+                [ONYXKEYS.NVP_FIRST_DAY_FREE_TRIAL]: formatDate(new Date(), CONST.DATE.FNS_DATE_TIME_FORMAT_STRING),
+                [ONYXKEYS.NVP_LAST_DAY_FREE_TRIAL]: formatDate(addDays(new Date(), 3), CONST.DATE.FNS_DATE_TIME_FORMAT_STRING),
+            });
+
+            expect(SubscriptionUtils.isUserOnFreeTrial()).toBeTruthy();
+        });
+
+        it('should return true if the current date is on the same date of free trial end date, but some minutes earlier', async () => {
+            await Onyx.multiSet({
+                [ONYXKEYS.NVP_FIRST_DAY_FREE_TRIAL]: formatDate(subDays(new Date(), 2), CONST.DATE.FNS_DATE_TIME_FORMAT_STRING),
+                [ONYXKEYS.NVP_LAST_DAY_FREE_TRIAL]: formatDate(addMinutes(new Date(), 30), CONST.DATE.FNS_DATE_TIME_FORMAT_STRING),
+            });
+
+            expect(SubscriptionUtils.isUserOnFreeTrial()).toBeTruthy();
+        });
+
+        it('should return true if the current date is between the free trial start and end dates', async () => {
+            await Onyx.multiSet({
+                [ONYXKEYS.NVP_FIRST_DAY_FREE_TRIAL]: formatDate(subDays(new Date(), 1), CONST.DATE.FNS_DATE_TIME_FORMAT_STRING),
+                [ONYXKEYS.NVP_LAST_DAY_FREE_TRIAL]: formatDate(addDays(new Date(), 3), CONST.DATE.FNS_DATE_TIME_FORMAT_STRING),
+            });
+
+            expect(SubscriptionUtils.isUserOnFreeTrial()).toBeTruthy();
+        });
+    });
+
+    describe('hasUserFreeTrialEnded', () => {
+        afterEach(async () => {
+            await Onyx.clear();
+            await Onyx.multiSet({
+                [ONYXKEYS.NVP_FIRST_DAY_FREE_TRIAL]: null,
+                [ONYXKEYS.NVP_LAST_DAY_FREE_TRIAL]: null,
+            });
+        });
+
+        it('should return false if the Onyx key is not set', () => {
+            expect(SubscriptionUtils.hasUserFreeTrialEnded()).toBeFalsy();
+        });
+
+        it('should return false if the current date is before the free trial end date', async () => {
+            await Onyx.set(ONYXKEYS.NVP_LAST_DAY_FREE_TRIAL, formatDate(addDays(new Date(), 1), CONST.DATE.FNS_DATE_TIME_FORMAT_STRING));
+            expect(SubscriptionUtils.hasUserFreeTrialEnded()).toBeFalsy();
+        });
+
+        it('should return true if the current date is after the free trial end date', async () => {
+            await Onyx.set(ONYXKEYS.NVP_LAST_DAY_FREE_TRIAL, formatDate(subDays(new Date(), 2), CONST.DATE.FNS_DATE_TIME_FORMAT_STRING));
+            expect(SubscriptionUtils.hasUserFreeTrialEnded()).toBeTruthy();
+        });
+    });
+
+    describe('doesUserHavePaymentCardAdded', () => {
+        afterEach(async () => {
+            await Onyx.clear();
+            await Onyx.multiSet({
+                [ONYXKEYS.NVP_BILLING_FUND_ID]: null,
+            });
+        });
+
+        it('should return false if the Onyx key is not set', () => {
+            expect(SubscriptionUtils.doesUserHavePaymentCardAdded()).toBeFalsy();
+        });
+
+        it('should return true if the Onyx key is set', async () => {
+            await Onyx.set(ONYXKEYS.NVP_BILLING_FUND_ID, 8010);
+            expect(SubscriptionUtils.doesUserHavePaymentCardAdded()).toBeTruthy();
+        });
+    });
+
+    describe('shouldRestrictUserBillableActions', () => {
+        afterEach(async () => {
+            await Onyx.clear();
+            await Onyx.multiSet({
+                [ONYXKEYS.SESSION]: null,
+                [ONYXKEYS.COLLECTION.SHARED_NVP_PRIVATE_USER_BILLING_GRACE_PERIOD_END]: null,
+                [ONYXKEYS.NVP_PRIVATE_OWNER_BILLING_GRACE_PERIOD_END]: null,
+                [ONYXKEYS.NVP_PRIVATE_AMOUNT_OWED]: null,
+                [ONYXKEYS.COLLECTION.POLICY]: null,
+            });
+        });
+
+        it("should return false if the user isn't a workspace's owner or isn't a member of any past due billing workspace", () => {
+            expect(SubscriptionUtils.shouldRestrictUserBillableActions('1')).toBeFalsy();
+        });
+
+        it('should return false if the user is a non-owner of a workspace that is not in the shared NVP collection', async () => {
+            const policyID = '1001';
+            const ownerAccountID = 2001;
+
+            await Onyx.multiSet({
+                [`${ONYXKEYS.COLLECTION.SHARED_NVP_PRIVATE_USER_BILLING_GRACE_PERIOD_END}${ownerAccountID}` as const]: {
+                    ...billingGraceEndPeriod,
+                    value: getUnixTime(subDays(new Date(), 3)), // past due
+                },
+                [`${ONYXKEYS.COLLECTION.POLICY}${policyID}` as const]: {
+                    ...createRandomPolicy(Number(policyID)),
+                    ownerAccountID: 2002, // owner not in the shared NVP collection
+                },
+            });
+
+            expect(SubscriptionUtils.shouldRestrictUserBillableActions(policyID)).toBeFalsy();
+        });
+
+        it("should return false if the user is a workspace's non-owner that is not past due billing", async () => {
+            const policyID = '1001';
+            const ownerAccountID = 2001;
+
+            await Onyx.multiSet({
+                [`${ONYXKEYS.COLLECTION.SHARED_NVP_PRIVATE_USER_BILLING_GRACE_PERIOD_END}${ownerAccountID}` as const]: {
+                    ...billingGraceEndPeriod,
+                    value: getUnixTime(addDays(new Date(), 3)), // not past due
+                },
+                [`${ONYXKEYS.COLLECTION.POLICY}${policyID}` as const]: {
+                    ...createRandomPolicy(Number(policyID)),
+                    ownerAccountID, // owner in the shared NVP collection
+                },
+            });
+
+            expect(SubscriptionUtils.shouldRestrictUserBillableActions(policyID)).toBeFalsy();
+        });
+
+        it("should return true if the user is a workspace's non-owner that is past due billing", async () => {
+            const policyID = '1001';
+            const ownerAccountID = 2001;
+
+            await Onyx.multiSet({
+                [`${ONYXKEYS.COLLECTION.SHARED_NVP_PRIVATE_USER_BILLING_GRACE_PERIOD_END}${ownerAccountID}` as const]: {
+                    ...billingGraceEndPeriod,
+                    value: getUnixTime(subDays(new Date(), 3)), // past due
+                },
+                [`${ONYXKEYS.COLLECTION.POLICY}${policyID}` as const]: {
+                    ...createRandomPolicy(Number(policyID)),
+                    ownerAccountID, // owner in the shared NVP collection
+                },
+            });
+
+            expect(SubscriptionUtils.shouldRestrictUserBillableActions(policyID)).toBeTruthy();
+        });
+
+        it("should return false if the user is the workspace's owner but is not past due billing", async () => {
+            const accountID = 1;
+            const policyID = '1001';
+
+            await Onyx.multiSet({
+                [ONYXKEYS.SESSION]: {email: '', accountID},
+                [ONYXKEYS.NVP_PRIVATE_OWNER_BILLING_GRACE_PERIOD_END]: getUnixTime(addDays(new Date(), 3)), // not past due
+                [`${ONYXKEYS.COLLECTION.POLICY}${policyID}` as const]: {
+                    ...createRandomPolicy(Number(policyID)),
+                    ownerAccountID: accountID,
+                },
+            });
+
+            expect(SubscriptionUtils.shouldRestrictUserBillableActions(policyID)).toBeFalsy();
+        });
+
+        it("should return false if the user is the workspace's owner that is past due billing but isn't owning any amount", async () => {
+            const accountID = 1;
+            const policyID = '1001';
+
+            await Onyx.multiSet({
+                [ONYXKEYS.SESSION]: {email: '', accountID},
+                [ONYXKEYS.NVP_PRIVATE_OWNER_BILLING_GRACE_PERIOD_END]: getUnixTime(subDays(new Date(), 3)), // past due
+                [ONYXKEYS.NVP_PRIVATE_AMOUNT_OWED]: 0,
+                [`${ONYXKEYS.COLLECTION.POLICY}${policyID}` as const]: {
+                    ...createRandomPolicy(Number(policyID)),
+                    ownerAccountID: accountID,
+                },
+            });
+
+            expect(SubscriptionUtils.shouldRestrictUserBillableActions(policyID)).toBeFalsy();
+        });
+
+        it("should return true if the user is the workspace's owner that is past due billing and is owning some amount", async () => {
+            const accountID = 1;
+            const policyID = '1001';
+
+            await Onyx.multiSet({
+                [ONYXKEYS.SESSION]: {email: '', accountID},
+                [ONYXKEYS.NVP_PRIVATE_OWNER_BILLING_GRACE_PERIOD_END]: getUnixTime(subDays(new Date(), 3)), // past due
+                [ONYXKEYS.NVP_PRIVATE_AMOUNT_OWED]: 8010,
+                [`${ONYXKEYS.COLLECTION.POLICY}${policyID}` as const]: {
+                    ...createRandomPolicy(Number(policyID)),
+                    ownerAccountID: accountID,
+                },
+            });
+
+            expect(SubscriptionUtils.shouldRestrictUserBillableActions(policyID)).toBeTruthy();
+        });
+
+        it("should return false if the user is past due billing but is not the workspace's owner", async () => {
+            const accountID = 1;
+            const policyID = '1001';
+
+            await Onyx.multiSet({
+                [ONYXKEYS.SESSION]: {email: '', accountID},
+                [ONYXKEYS.NVP_PRIVATE_OWNER_BILLING_GRACE_PERIOD_END]: getUnixTime(subDays(new Date(), 3)), // past due
+                [ONYXKEYS.NVP_PRIVATE_AMOUNT_OWED]: 8010,
+                [`${ONYXKEYS.COLLECTION.POLICY}${policyID}` as const]: {
+                    ...createRandomPolicy(Number(policyID)),
+                    ownerAccountID: 2, // not the user
+                },
+            });
+
+            expect(SubscriptionUtils.shouldRestrictUserBillableActions(policyID)).toBeFalsy();
+        });
+    });
+
+    describe('getSubscriptionStatus', () => {
+        afterEach(async () => {
+            await Onyx.clear();
+            await Onyx.multiSet({
+                [ONYXKEYS.NVP_PRIVATE_OWNER_BILLING_GRACE_PERIOD_END]: null,
+                [ONYXKEYS.NVP_PRIVATE_AMOUNT_OWED]: null,
+                [ONYXKEYS.NVP_PRIVATE_BILLING_DISPUTE_PENDING]: null,
+                [ONYXKEYS.NVP_PRIVATE_STRIPE_CUSTOMER_ID]: null,
+                [ONYXKEYS.NVP_PRIVATE_BILLING_STATUS]: null,
+                [ONYXKEYS.FUND_LIST]: null,
+                [ONYXKEYS.SUBSCRIPTION_RETRY_BILLING_STATUS_SUCCESSFUL]: null,
+                [ONYXKEYS.SUBSCRIPTION_RETRY_BILLING_STATUS_FAILED]: null,
+            });
+        });
+
+        it('should return undefined by default', () => {
+            expect(SubscriptionUtils.getSubscriptionStatus()).toBeUndefined();
+        });
+
+        it('should return POLICY_OWNER_WITH_AMOUNT_OWED status', async () => {
+            await Onyx.multiSet({
+                [ONYXKEYS.NVP_PRIVATE_OWNER_BILLING_GRACE_PERIOD_END]: GRACE_PERIOD_DATE,
+                [ONYXKEYS.NVP_PRIVATE_AMOUNT_OWED]: AMOUNT_OWED,
+            });
+
+            expect(SubscriptionUtils.getSubscriptionStatus()).toEqual({
+                status: PAYMENT_STATUS.POLICY_OWNER_WITH_AMOUNT_OWED,
+                isError: true,
+            });
+        });
+
+        it('should return POLICY_OWNER_WITH_AMOUNT_OWED_OVERDUE status', async () => {
+            await Onyx.multiSet({
+                [ONYXKEYS.NVP_PRIVATE_OWNER_BILLING_GRACE_PERIOD_END]: GRACE_PERIOD_DATE_OVERDUE,
+                [ONYXKEYS.NVP_PRIVATE_AMOUNT_OWED]: AMOUNT_OWED,
+            });
+
+            expect(SubscriptionUtils.getSubscriptionStatus()).toEqual({
+                status: PAYMENT_STATUS.POLICY_OWNER_WITH_AMOUNT_OWED_OVERDUE,
+            });
+        });
+
+        it('should return OWNER_OF_POLICY_UNDER_INVOICING_OVERDUE status', async () => {
+            await Onyx.multiSet({
+                [ONYXKEYS.NVP_PRIVATE_OWNER_BILLING_GRACE_PERIOD_END]: GRACE_PERIOD_DATE_OVERDUE,
+                [ONYXKEYS.NVP_PRIVATE_AMOUNT_OWED]: 0,
+            });
+
+            expect(SubscriptionUtils.getSubscriptionStatus()).toEqual({
+                status: PAYMENT_STATUS.OWNER_OF_POLICY_UNDER_INVOICING_OVERDUE,
+            });
+        });
+
+        it('should return OWNER_OF_POLICY_UNDER_INVOICING status', async () => {
+            await Onyx.multiSet({
+                [ONYXKEYS.NVP_PRIVATE_OWNER_BILLING_GRACE_PERIOD_END]: GRACE_PERIOD_DATE,
+            });
+
+            expect(SubscriptionUtils.getSubscriptionStatus()).toEqual({
+                status: PAYMENT_STATUS.OWNER_OF_POLICY_UNDER_INVOICING,
+            });
+        });
+
+        it('should return BILLING_DISPUTE_PENDING status', async () => {
+            await Onyx.multiSet({
+                [ONYXKEYS.NVP_PRIVATE_OWNER_BILLING_GRACE_PERIOD_END]: 0,
+                [ONYXKEYS.NVP_PRIVATE_BILLING_DISPUTE_PENDING]: 1,
+            });
+
+            expect(SubscriptionUtils.getSubscriptionStatus()).toEqual({
+                status: PAYMENT_STATUS.BILLING_DISPUTE_PENDING,
+            });
+        });
+
+        it('should return CARD_AUTHENTICATION_REQUIRED status', async () => {
+            await Onyx.multiSet({
+                [ONYXKEYS.NVP_PRIVATE_AMOUNT_OWED]: 0,
+                [ONYXKEYS.NVP_PRIVATE_BILLING_DISPUTE_PENDING]: 0,
+                [ONYXKEYS.NVP_PRIVATE_STRIPE_CUSTOMER_ID]: STRIPE_CUSTOMER_ID,
+            });
+
+            expect(SubscriptionUtils.getSubscriptionStatus()).toEqual({
+                status: PAYMENT_STATUS.CARD_AUTHENTICATION_REQUIRED,
+            });
+        });
+
+        it('should return INSUFFICIENT_FUNDS status', async () => {
+            await Onyx.multiSet({
+                [ONYXKEYS.NVP_PRIVATE_AMOUNT_OWED]: AMOUNT_OWED,
+                [ONYXKEYS.NVP_PRIVATE_STRIPE_CUSTOMER_ID]: {},
+                [ONYXKEYS.NVP_PRIVATE_BILLING_STATUS]: BILLING_STATUS_INSUFFICIENT_FUNDS,
+            });
+
+            expect(SubscriptionUtils.getSubscriptionStatus()).toEqual({
+                status: PAYMENT_STATUS.INSUFFICIENT_FUNDS,
+            });
+        });
+
+        it('should return CARD_EXPIRED status', async () => {
+            await Onyx.multiSet({
+                [ONYXKEYS.NVP_PRIVATE_BILLING_STATUS]: BILLING_STATUS_EXPIRED_CARD,
+            });
+
+            expect(SubscriptionUtils.getSubscriptionStatus()).toEqual({
+                status: PAYMENT_STATUS.CARD_EXPIRED,
+            });
+        });
+
+        it('should return CARD_EXPIRE_SOON status', async () => {
+            await Onyx.multiSet({
+                [ONYXKEYS.NVP_PRIVATE_AMOUNT_OWED]: 0,
+                [ONYXKEYS.NVP_PRIVATE_BILLING_STATUS]: {},
+                [ONYXKEYS.FUND_LIST]: FUND_LIST,
+            });
+
+            expect(SubscriptionUtils.getSubscriptionStatus()).toEqual({
+                status: PAYMENT_STATUS.CARD_EXPIRE_SOON,
+            });
+        });
+
+        it('should return RETRY_BILLING_SUCCESS status', async () => {
+            await Onyx.multiSet({
+                [ONYXKEYS.FUND_LIST]: {},
+                [ONYXKEYS.SUBSCRIPTION_RETRY_BILLING_STATUS_SUCCESSFUL]: true,
+            });
+
+            expect(SubscriptionUtils.getSubscriptionStatus()).toEqual({
+                status: PAYMENT_STATUS.RETRY_BILLING_SUCCESS,
+                isError: false,
+            });
+        });
+
+        it('should return RETRY_BILLING_ERROR status', async () => {
+            await Onyx.multiSet({
+                [ONYXKEYS.FUND_LIST]: {},
+                [ONYXKEYS.SUBSCRIPTION_RETRY_BILLING_STATUS_SUCCESSFUL]: false,
+                [ONYXKEYS.SUBSCRIPTION_RETRY_BILLING_STATUS_FAILED]: true,
+            });
+
+            expect(SubscriptionUtils.getSubscriptionStatus()).toEqual({
+                status: PAYMENT_STATUS.RETRY_BILLING_ERROR,
+                isError: true,
+            });
+        });
+    });
+});
diff --git a/tests/unit/TransactionUtilsTest.ts b/tests/unit/TransactionUtilsTest.ts
index e51ffede633b..f23259eb568c 100644
--- a/tests/unit/TransactionUtilsTest.ts
+++ b/tests/unit/TransactionUtilsTest.ts
@@ -23,7 +23,7 @@ describe('TransactionUtils', () => {
             it('returns the "modifiedCreated" date with the correct format', () => {
                 const expectedResult = '2023-10-25';
 
-                const result = TransactionUtils.getCreated(transaction);
+                const result = TransactionUtils.getFormattedCreated(transaction);
 
                 expect(result).toEqual(expectedResult);
             });
@@ -39,7 +39,7 @@ describe('TransactionUtils', () => {
                 it('returns the "created" date with the correct format', () => {
                     const expectedResult = '2023-10-01';
 
-                    const result = TransactionUtils.getCreated(transaction);
+                    const result = TransactionUtils.getFormattedCreated(transaction);
 
                     expect(result).toEqual(expectedResult);
                 });
@@ -54,7 +54,7 @@ describe('TransactionUtils', () => {
                 it('returns an empty string', () => {
                     const expectedResult = '';
 
-                    const result = TransactionUtils.getCreated(transaction);
+                    const result = TransactionUtils.getFormattedCreated(transaction);
 
                     expect(result).toEqual(expectedResult);
                 });
diff --git a/tests/unit/UnreadIndicatorUpdaterTest.ts b/tests/unit/UnreadIndicatorUpdaterTest.ts
index a5f58b57793a..9cf65bcb69d4 100644
--- a/tests/unit/UnreadIndicatorUpdaterTest.ts
+++ b/tests/unit/UnreadIndicatorUpdaterTest.ts
@@ -1,16 +1,30 @@
 /* eslint-disable @typescript-eslint/naming-convention */
 import CONST from '../../src/CONST';
-import getUnreadReportsForUnreadIndicator from '../../src/libs/UnreadIndicatorUpdater';
+import * as UnreadIndicatorUpdater from '../../src/libs/UnreadIndicatorUpdater';
 
 describe('UnreadIndicatorUpdaterTest', () => {
     describe('should return correct number of unread reports', () => {
         it('given last read time < last visible action created', () => {
             const reportsToBeUsed = {
-                1: {reportID: '1', reportName: 'test', type: CONST.REPORT.TYPE.EXPENSE, lastReadTime: '2023-07-08 07:15:44.030', lastVisibleActionCreated: '2023-08-08 07:15:44.030'},
-                2: {reportID: '2', reportName: 'test', type: CONST.REPORT.TYPE.TASK, lastReadTime: '2023-02-05 09:12:05.000', lastVisibleActionCreated: '2023-02-06 07:15:44.030'},
-                3: {reportID: '3', reportName: 'test', type: CONST.REPORT.TYPE.TASK},
+                1: {
+                    reportID: '1',
+                    reportName: 'test',
+                    type: CONST.REPORT.TYPE.EXPENSE,
+                    lastReadTime: '2023-07-08 07:15:44.030',
+                    lastVisibleActionCreated: '2023-08-08 07:15:44.030',
+                    lastMessageText: 'test',
+                },
+                2: {
+                    reportID: '2',
+                    reportName: 'test',
+                    type: CONST.REPORT.TYPE.TASK,
+                    lastReadTime: '2023-02-05 09:12:05.000',
+                    lastVisibleActionCreated: '2023-02-06 07:15:44.030',
+                    lastMessageText: 'test',
+                },
+                3: {reportID: '3', reportName: 'test', type: CONST.REPORT.TYPE.TASK, lastMessageText: 'test'},
             };
-            expect(getUnreadReportsForUnreadIndicator(reportsToBeUsed, '3').length).toBe(2);
+            expect(UnreadIndicatorUpdater.getUnreadReportsForUnreadIndicator(reportsToBeUsed, '3').length).toBe(2);
         });
 
         it('given some reports are incomplete', () => {
@@ -19,7 +33,7 @@ describe('UnreadIndicatorUpdaterTest', () => {
                 2: {reportID: '2', type: CONST.REPORT.TYPE.TASK, lastReadTime: '2023-02-05 09:12:05.000', lastVisibleActionCreated: '2023-02-06 07:15:44.030'},
                 3: {reportID: '3', type: CONST.REPORT.TYPE.TASK},
             };
-            expect(getUnreadReportsForUnreadIndicator(reportsToBeUsed, '3').length).toBe(0);
+            expect(UnreadIndicatorUpdater.getUnreadReportsForUnreadIndicator(reportsToBeUsed, '3').length).toBe(0);
         });
 
         it('given notification preference of some reports is hidden', () => {
@@ -31,11 +45,19 @@ describe('UnreadIndicatorUpdaterTest', () => {
                     notificationPreference: CONST.REPORT.NOTIFICATION_PREFERENCE.HIDDEN,
                     lastReadTime: '2023-07-08 07:15:44.030',
                     lastVisibleActionCreated: '2023-08-08 07:15:44.030',
+                    lastMessageText: 'test',
+                },
+                2: {
+                    reportID: '2',
+                    reportName: 'test',
+                    type: CONST.REPORT.TYPE.TASK,
+                    lastReadTime: '2023-02-05 09:12:05.000',
+                    lastVisibleActionCreated: '2023-02-06 07:15:44.030',
+                    lastMessageText: 'test',
                 },
-                2: {reportID: '2', reportName: 'test', type: CONST.REPORT.TYPE.TASK, lastReadTime: '2023-02-05 09:12:05.000', lastVisibleActionCreated: '2023-02-06 07:15:44.030'},
-                3: {reportID: '3', reportName: 'test', type: CONST.REPORT.TYPE.TASK},
+                3: {reportID: '3', reportName: 'test', type: CONST.REPORT.TYPE.TASK, lastMessageText: 'test'},
             };
-            expect(getUnreadReportsForUnreadIndicator(reportsToBeUsed, '3').length).toBe(1);
+            expect(UnreadIndicatorUpdater.getUnreadReportsForUnreadIndicator(reportsToBeUsed, '3').length).toBe(1);
         });
     });
 });
diff --git a/tests/unit/UserUtilsTest.ts b/tests/unit/UserUtilsTest.ts
index f91f2a499e79..e5378c756751 100644
--- a/tests/unit/UserUtilsTest.ts
+++ b/tests/unit/UserUtilsTest.ts
@@ -1,9 +1,17 @@
 import * as UserUtils from '@src/libs/UserUtils';
 
 describe('UserUtils', () => {
-    it('should return the default avatar from the avatar url', () => {
+    it('should return default avatar if the url is for default avatar', () => {
         const avatarURL = 'https://d2k5nsl2zxldvw.cloudfront.net/images/avatars/default-avatar_7.png';
-        const defaultAvatar = UserUtils.getDefaultAvatar(1, avatarURL);
+        const defaultAvatar = UserUtils.getAvatar(avatarURL, 1);
+
         expect(typeof defaultAvatar).toBe('function');
     });
+
+    it('should return the same url if url is not for default avatar', () => {
+        const avatarURL = 'https://test.com/images/some_avatar.png';
+        const avatar = UserUtils.getAvatar(avatarURL, 1);
+
+        expect(avatar).toEqual('https://test.com/images/some_avatar.png');
+    });
 });
diff --git a/tests/unit/ValidationUtilsTest.ts b/tests/unit/ValidationUtilsTest.ts
index fc5dacee2cf2..ce57d7d2593f 100644
--- a/tests/unit/ValidationUtilsTest.ts
+++ b/tests/unit/ValidationUtilsTest.ts
@@ -1,4 +1,5 @@
 import {addDays, format, startOfDay, subYears} from 'date-fns';
+import * as Localize from '@libs/Localize';
 import CONST from '@src/CONST';
 import * as ValidationUtils from '@src/libs/ValidationUtils';
 
@@ -23,7 +24,7 @@ describe('ValidationUtils', () => {
         });
 
         test('Should return false for a date after the range', () => {
-            const futureDate = '3024-07-18';
+            const futureDate = '3042-07-18';
             const isValid = ValidationUtils.isValidDate(futureDate);
             expect(isValid).toBe(false);
         });
@@ -186,19 +187,23 @@ describe('ValidationUtils', () => {
         test('Should return an error message for a date before the minimum age requirement', () => {
             const invalidDate: string = format(subYears(new Date(), 17), CONST.DATE.FNS_FORMAT_STRING); // Date of birth 17 years ago
             const error = ValidationUtils.getAgeRequirementError(invalidDate, 18, 150);
-            expect(error).toEqual(['privatePersonalDetails.error.dateShouldBeBefore', {dateString: format(startOfDay(subYears(new Date(), 18)), CONST.DATE.FNS_FORMAT_STRING)}]);
+            expect(error).toEqual(
+                Localize.translateLocal('privatePersonalDetails.error.dateShouldBeBefore', {dateString: format(startOfDay(subYears(new Date(), 18)), CONST.DATE.FNS_FORMAT_STRING)}),
+            );
         });
 
         test('Should return an error message for a date after the maximum age requirement', () => {
             const invalidDate: string = format(subYears(new Date(), 160), CONST.DATE.FNS_FORMAT_STRING); // Date of birth 160 years ago
             const error = ValidationUtils.getAgeRequirementError(invalidDate, 18, 150);
-            expect(error).toEqual(['privatePersonalDetails.error.dateShouldBeAfter', {dateString: format(startOfDay(subYears(new Date(), 150)), CONST.DATE.FNS_FORMAT_STRING)}]);
+            expect(error).toEqual(
+                Localize.translateLocal('privatePersonalDetails.error.dateShouldBeAfter', {dateString: format(startOfDay(subYears(new Date(), 150)), CONST.DATE.FNS_FORMAT_STRING)}),
+            );
         });
 
         test('Should return an error message for an invalid date', () => {
             const invalidDate = '2023-07-32'; // Invalid date
             const error = ValidationUtils.getAgeRequirementError(invalidDate, 18, 150);
-            expect(error).toBe('common.error.dateInvalid');
+            expect(error).toBe(Localize.translateLocal('common.error.dateInvalid'));
         });
     });
 
@@ -320,4 +325,16 @@ describe('ValidationUtils', () => {
             expect(ValidationUtils.isValidPersonName('test123$')).toBe(false);
         });
     });
+
+    describe('ValidateLegalName', () => {
+        test('Valid legal name', () => {
+            expect(ValidationUtils.isValidLegalName('test name')).toBe(true);
+            expect(ValidationUtils.isValidLegalName(`X Æ A test`)).toBe(true);
+        });
+
+        test('Invalid legal name', () => {
+            expect(ValidationUtils.isValidLegalName(`a hyphenated-name`)).toBe(false);
+            expect(ValidationUtils.isValidLegalName('άλφα')).toBe(false);
+        });
+    });
 });
diff --git a/tests/unit/ViolationUtilsTest.ts b/tests/unit/ViolationUtilsTest.ts
index b967617918c1..ba4b5131a548 100644
--- a/tests/unit/ViolationUtilsTest.ts
+++ b/tests/unit/ViolationUtilsTest.ts
@@ -3,7 +3,7 @@ import Onyx from 'react-native-onyx';
 import ViolationsUtils from '@libs/Violations/ViolationsUtils';
 import CONST from '@src/CONST';
 import ONYXKEYS from '@src/ONYXKEYS';
-import type {PolicyCategories, PolicyTagList, Transaction, TransactionViolation} from '@src/types/onyx';
+import type {PolicyCategories, PolicyTagLists, Transaction, TransactionViolation} from '@src/types/onyx';
 
 const categoryOutOfPolicyViolation = {
     name: 'categoryOutOfPolicy',
@@ -29,7 +29,7 @@ describe('getViolationsOnyxData', () => {
     let transaction: Transaction;
     let transactionViolations: TransactionViolation[];
     let policyRequiresTags: boolean;
-    let policyTags: PolicyTagList;
+    let policyTags: PolicyTagLists;
     let policyRequiresCategories: boolean;
     let policyCategories: PolicyCategories;
 
@@ -43,7 +43,7 @@ describe('getViolationsOnyxData', () => {
     });
 
     it('should return an object with correct shape and with empty transactionViolations array', () => {
-        const result = ViolationsUtils.getViolationsOnyxData(transaction, transactionViolations, policyRequiresTags, policyTags, policyRequiresCategories, policyCategories);
+        const result = ViolationsUtils.getViolationsOnyxData(transaction, transactionViolations, policyRequiresTags, policyTags, policyRequiresCategories, policyCategories, false);
 
         expect(result).toEqual({
             onyxMethod: Onyx.METHOD.SET,
@@ -57,7 +57,7 @@ describe('getViolationsOnyxData', () => {
             {name: 'duplicatedTransaction', type: CONST.VIOLATION_TYPES.VIOLATION},
             {name: 'receiptRequired', type: CONST.VIOLATION_TYPES.VIOLATION},
         ];
-        const result = ViolationsUtils.getViolationsOnyxData(transaction, transactionViolations, policyRequiresTags, policyTags, policyRequiresCategories, policyCategories);
+        const result = ViolationsUtils.getViolationsOnyxData(transaction, transactionViolations, policyRequiresTags, policyTags, policyRequiresCategories, policyCategories, false);
         expect(result.value).toEqual(expect.arrayContaining(transactionViolations));
     });
 
@@ -70,24 +70,32 @@ describe('getViolationsOnyxData', () => {
 
         it('should add missingCategory violation if no category is included', () => {
             transaction.category = undefined;
-            const result = ViolationsUtils.getViolationsOnyxData(transaction, transactionViolations, policyRequiresTags, policyTags, policyRequiresCategories, policyCategories);
+            const result = ViolationsUtils.getViolationsOnyxData(transaction, transactionViolations, policyRequiresTags, policyTags, policyRequiresCategories, policyCategories, false);
             expect(result.value).toEqual(expect.arrayContaining([missingCategoryViolation, ...transactionViolations]));
         });
 
         it('should add categoryOutOfPolicy violation when category is not in policy', () => {
             transaction.category = 'Bananas';
-            const result = ViolationsUtils.getViolationsOnyxData(transaction, transactionViolations, policyRequiresTags, policyTags, policyRequiresCategories, policyCategories);
+            const result = ViolationsUtils.getViolationsOnyxData(transaction, transactionViolations, policyRequiresTags, policyTags, policyRequiresCategories, policyCategories, false);
             expect(result.value).toEqual(expect.arrayContaining([categoryOutOfPolicyViolation, ...transactionViolations]));
         });
 
         it('should not include a categoryOutOfPolicy violation when category is in policy', () => {
-            const result = ViolationsUtils.getViolationsOnyxData(transaction, transactionViolations, policyRequiresTags, policyTags, policyRequiresCategories, policyCategories);
+            const result = ViolationsUtils.getViolationsOnyxData(transaction, transactionViolations, policyRequiresTags, policyTags, policyRequiresCategories, policyCategories, false);
             expect(result.value).not.toContainEqual(categoryOutOfPolicyViolation);
         });
 
         it('should not add a category violation when the transaction is partial', () => {
             const partialTransaction = {...transaction, amount: 0, merchant: CONST.TRANSACTION.PARTIAL_TRANSACTION_MERCHANT, category: undefined};
-            const result = ViolationsUtils.getViolationsOnyxData(partialTransaction, transactionViolations, policyRequiresTags, policyTags, policyRequiresCategories, policyCategories);
+            const result = ViolationsUtils.getViolationsOnyxData(
+                partialTransaction,
+                transactionViolations,
+                policyRequiresTags,
+                policyTags,
+                policyRequiresCategories,
+                policyCategories,
+                false,
+            );
             expect(result.value).not.toContainEqual(missingCategoryViolation);
         });
 
@@ -98,7 +106,7 @@ describe('getViolationsOnyxData', () => {
                 {name: 'receiptRequired', type: CONST.VIOLATION_TYPES.VIOLATION},
             ];
 
-            const result = ViolationsUtils.getViolationsOnyxData(transaction, transactionViolations, policyRequiresTags, policyTags, policyRequiresCategories, policyCategories);
+            const result = ViolationsUtils.getViolationsOnyxData(transaction, transactionViolations, policyRequiresTags, policyTags, policyRequiresCategories, policyCategories, false);
 
             expect(result.value).toEqual(expect.arrayContaining([categoryOutOfPolicyViolation, ...transactionViolations]));
         });
@@ -110,7 +118,7 @@ describe('getViolationsOnyxData', () => {
                 {name: 'receiptRequired', type: CONST.VIOLATION_TYPES.VIOLATION},
             ];
 
-            const result = ViolationsUtils.getViolationsOnyxData(transaction, transactionViolations, policyRequiresTags, policyTags, policyRequiresCategories, policyCategories);
+            const result = ViolationsUtils.getViolationsOnyxData(transaction, transactionViolations, policyRequiresTags, policyTags, policyRequiresCategories, policyCategories, false);
 
             expect(result.value).toEqual(expect.arrayContaining([missingCategoryViolation, ...transactionViolations]));
         });
@@ -122,7 +130,7 @@ describe('getViolationsOnyxData', () => {
         });
 
         it('should not add any violations when categories are not required', () => {
-            const result = ViolationsUtils.getViolationsOnyxData(transaction, transactionViolations, policyRequiresTags, policyTags, policyRequiresCategories, policyCategories);
+            const result = ViolationsUtils.getViolationsOnyxData(transaction, transactionViolations, policyRequiresTags, policyTags, policyRequiresCategories, policyCategories, false);
 
             expect(result.value).not.toContainEqual([categoryOutOfPolicyViolation]);
             expect(result.value).not.toContainEqual([missingCategoryViolation]);
@@ -147,7 +155,7 @@ describe('getViolationsOnyxData', () => {
         });
 
         it("shouldn't update the transactionViolations if the policy requires tags and the transaction has a tag from the policy", () => {
-            const result = ViolationsUtils.getViolationsOnyxData(transaction, transactionViolations, policyRequiresTags, policyTags, policyRequiresCategories, policyCategories);
+            const result = ViolationsUtils.getViolationsOnyxData(transaction, transactionViolations, policyRequiresTags, policyTags, policyRequiresCategories, policyCategories, false);
 
             expect(result.value).toEqual(transactionViolations);
         });
@@ -155,7 +163,7 @@ describe('getViolationsOnyxData', () => {
         it('should add a missingTag violation if none is provided and policy requires tags', () => {
             transaction.tag = undefined;
 
-            const result = ViolationsUtils.getViolationsOnyxData(transaction, transactionViolations, policyRequiresTags, policyTags, policyRequiresCategories, policyCategories);
+            const result = ViolationsUtils.getViolationsOnyxData(transaction, transactionViolations, policyRequiresTags, policyTags, policyRequiresCategories, policyCategories, false);
 
             expect(result.value).toEqual(expect.arrayContaining([{...missingTagViolation}]));
         });
@@ -163,14 +171,22 @@ describe('getViolationsOnyxData', () => {
         it('should add a tagOutOfPolicy violation when policy requires tags and tag is not in the policy', () => {
             policyTags = {};
 
-            const result = ViolationsUtils.getViolationsOnyxData(transaction, transactionViolations, policyRequiresTags, policyTags, policyRequiresCategories, policyCategories);
+            const result = ViolationsUtils.getViolationsOnyxData(transaction, transactionViolations, policyRequiresTags, policyTags, policyRequiresCategories, policyCategories, false);
 
             expect(result.value).toEqual([]);
         });
 
         it('should not add a tag violation when the transaction is partial', () => {
             const partialTransaction = {...transaction, amount: 0, merchant: CONST.TRANSACTION.PARTIAL_TRANSACTION_MERCHANT, tag: undefined};
-            const result = ViolationsUtils.getViolationsOnyxData(partialTransaction, transactionViolations, policyRequiresTags, policyTags, policyRequiresCategories, policyCategories);
+            const result = ViolationsUtils.getViolationsOnyxData(
+                partialTransaction,
+                transactionViolations,
+                policyRequiresTags,
+                policyTags,
+                policyRequiresCategories,
+                policyCategories,
+                false,
+            );
             expect(result.value).not.toContainEqual(missingTagViolation);
         });
 
@@ -181,7 +197,7 @@ describe('getViolationsOnyxData', () => {
                 {name: 'receiptRequired', type: CONST.VIOLATION_TYPES.VIOLATION},
             ];
 
-            const result = ViolationsUtils.getViolationsOnyxData(transaction, transactionViolations, policyRequiresTags, policyTags, policyRequiresCategories, policyCategories);
+            const result = ViolationsUtils.getViolationsOnyxData(transaction, transactionViolations, policyRequiresTags, policyTags, policyRequiresCategories, policyCategories, false);
 
             expect(result.value).toEqual(expect.arrayContaining([{...tagOutOfPolicyViolation}, ...transactionViolations]));
         });
@@ -193,7 +209,7 @@ describe('getViolationsOnyxData', () => {
                 {name: 'receiptRequired', type: CONST.VIOLATION_TYPES.VIOLATION},
             ];
 
-            const result = ViolationsUtils.getViolationsOnyxData(transaction, transactionViolations, policyRequiresTags, policyTags, policyRequiresCategories, policyCategories);
+            const result = ViolationsUtils.getViolationsOnyxData(transaction, transactionViolations, policyRequiresTags, policyTags, policyRequiresCategories, policyCategories, false);
 
             expect(result.value).toEqual(expect.arrayContaining([{...missingTagViolation}, ...transactionViolations]));
         });
@@ -205,7 +221,7 @@ describe('getViolationsOnyxData', () => {
         });
 
         it('should not add any violations when tags are not required', () => {
-            const result = ViolationsUtils.getViolationsOnyxData(transaction, transactionViolations, policyRequiresTags, policyTags, policyRequiresCategories, policyCategories);
+            const result = ViolationsUtils.getViolationsOnyxData(transaction, transactionViolations, policyRequiresTags, policyTags, policyRequiresCategories, policyCategories, false);
 
             expect(result.value).not.toContainEqual([tagOutOfPolicyViolation]);
             expect(result.value).not.toContainEqual([missingTagViolation]);
@@ -260,32 +276,40 @@ describe('getViolationsOnyxData', () => {
             };
 
             // Test case where transaction has no tags
-            let result = ViolationsUtils.getViolationsOnyxData(transaction, transactionViolations, policyRequiresTags, policyTags, policyRequiresCategories, policyCategories);
+            let result = ViolationsUtils.getViolationsOnyxData(transaction, transactionViolations, policyRequiresTags, policyTags, policyRequiresCategories, policyCategories, false);
             expect(result.value).toEqual([someTagLevelsRequiredViolation]);
 
             // Test case where transaction has 1 tag
             transaction.tag = 'Africa';
             someTagLevelsRequiredViolation.data = {errorIndexes: [1, 2]};
-            result = ViolationsUtils.getViolationsOnyxData(transaction, transactionViolations, policyRequiresTags, policyTags, policyRequiresCategories, policyCategories);
+            result = ViolationsUtils.getViolationsOnyxData(transaction, transactionViolations, policyRequiresTags, policyTags, policyRequiresCategories, policyCategories, false);
             expect(result.value).toEqual([someTagLevelsRequiredViolation]);
 
             // Test case where transaction has 2 tags
             transaction.tag = 'Africa::Project1';
             someTagLevelsRequiredViolation.data = {errorIndexes: [1]};
-            result = ViolationsUtils.getViolationsOnyxData(transaction, transactionViolations, policyRequiresTags, policyTags, policyRequiresCategories, policyCategories);
+            result = ViolationsUtils.getViolationsOnyxData(transaction, transactionViolations, policyRequiresTags, policyTags, policyRequiresCategories, policyCategories, false);
             expect(result.value).toEqual([someTagLevelsRequiredViolation]);
 
             // Test case where transaction has all tags
             transaction.tag = 'Africa:Accounting:Project1';
-            result = ViolationsUtils.getViolationsOnyxData(transaction, transactionViolations, policyRequiresTags, policyTags, policyRequiresCategories, policyCategories);
+            result = ViolationsUtils.getViolationsOnyxData(transaction, transactionViolations, policyRequiresTags, policyTags, policyRequiresCategories, policyCategories, false);
             expect(result.value).toEqual([]);
         });
         it('should return tagOutOfPolicy when a tag is not enabled in the policy but is set in the transaction', () => {
             policyTags.Department.tags.Accounting.enabled = false;
             transaction.tag = 'Africa:Accounting:Project1';
-            const result = ViolationsUtils.getViolationsOnyxData(transaction, transactionViolations, policyRequiresTags, policyTags, policyRequiresCategories, policyCategories);
+            const result = ViolationsUtils.getViolationsOnyxData(transaction, transactionViolations, policyRequiresTags, policyTags, policyRequiresCategories, policyCategories, false);
             const violation = {...tagOutOfPolicyViolation, data: {tagName: 'Department'}};
             expect(result.value).toEqual([violation]);
         });
+        it('should return missingTag when all dependent tags are enabled in the policy but are not set in the transaction', () => {
+            const missingDepartmentTag = {...missingTagViolation, data: {tagName: 'Department'}};
+            const missingRegionTag = {...missingTagViolation, data: {tagName: 'Region'}};
+            const missingProjectTag = {...missingTagViolation, data: {tagName: 'Project'}};
+            transaction.tag = undefined;
+            const result = ViolationsUtils.getViolationsOnyxData(transaction, transactionViolations, policyRequiresTags, policyTags, policyRequiresCategories, policyCategories, true);
+            expect(result.value).toEqual(expect.arrayContaining([missingDepartmentTag, missingRegionTag, missingProjectTag]));
+        });
     });
 });
diff --git a/tests/unit/WorkflowUtilsTest.ts b/tests/unit/WorkflowUtilsTest.ts
new file mode 100644
index 000000000000..8ef2b873bd8e
--- /dev/null
+++ b/tests/unit/WorkflowUtilsTest.ts
@@ -0,0 +1,429 @@
+/* eslint-disable @typescript-eslint/naming-convention */
+import * as WorkflowUtils from '@src/libs/WorkflowUtils';
+import type {Approver, Member} from '@src/types/onyx/ApprovalWorkflow';
+import type ApprovalWorkflow from '@src/types/onyx/ApprovalWorkflow';
+import type {PersonalDetailsList} from '@src/types/onyx/PersonalDetails';
+import type {PolicyEmployeeList} from '@src/types/onyx/PolicyEmployee';
+import type PolicyEmployee from '@src/types/onyx/PolicyEmployee';
+import * as TestHelper from '../utils/TestHelper';
+
+const personalDetails: PersonalDetailsList = {};
+const personalDetailsByEmail: PersonalDetailsList = {};
+
+function buildPolicyEmployee(accountID: number, policyEmployee: Partial<PolicyEmployee> = {}): PolicyEmployee {
+    return {
+        email: `${accountID}@example.com`,
+        ...policyEmployee,
+    };
+}
+
+function buildMember(accountID: number): Member {
+    return {
+        email: `${accountID}@example.com`,
+        avatar: 'https://d2k5nsl2zxldvw.cloudfront.net/images/avatars/avatar_7.png',
+        displayName: `${accountID}@example.com User`,
+    };
+}
+
+function buildApprover(accountID: number, approver: Partial<Approver> = {}): Approver {
+    return {
+        email: `${accountID}@example.com`,
+        forwardsTo: undefined,
+        avatar: 'https://d2k5nsl2zxldvw.cloudfront.net/images/avatars/avatar_7.png',
+        displayName: `${accountID}@example.com User`,
+        isCircularReference: false,
+        ...approver,
+    };
+}
+
+function buildWorkflow(memberIDs: number[], approverIDs: number[], workflow: Partial<ApprovalWorkflow> = {}): ApprovalWorkflow {
+    return {
+        members: memberIDs.map(buildMember),
+        approvers: approverIDs.map((id) => buildApprover(id)),
+        isDefault: false,
+        ...workflow,
+    };
+}
+
+describe('WorkflowUtils', () => {
+    beforeAll(() => {
+        for (let accountID = 0; accountID < 10; accountID++) {
+            const email = `${accountID}@example.com`;
+            personalDetails[accountID] = TestHelper.buildPersonalDetails(email, accountID, email);
+            personalDetailsByEmail[email] = personalDetails[accountID];
+        }
+    });
+
+    describe('calculateApprovers', () => {
+        it('Should return no approvers for empty employees object', () => {
+            const employees: PolicyEmployeeList = {};
+            const firstEmail = '1@example.com';
+            const approvers = WorkflowUtils.calculateApprovers({employees, firstEmail, personalDetailsByEmail});
+
+            expect(approvers).toEqual([]);
+        });
+
+        it('Should return just one approver if there is no forwardsTo', () => {
+            const employees: PolicyEmployeeList = {
+                '1@example.com': {
+                    email: '1@example.com',
+                    forwardsTo: undefined,
+                },
+                '2@example.com': {
+                    email: '2@example.com',
+                    forwardsTo: undefined,
+                },
+            };
+            const firstEmail = '1@example.com';
+            const approvers = WorkflowUtils.calculateApprovers({employees, firstEmail, personalDetailsByEmail});
+
+            expect(approvers).toEqual([buildApprover(1)]);
+        });
+
+        it('Should return just one approver if there is no forwardsTo', () => {
+            const employees: PolicyEmployeeList = {
+                '1@example.com': {
+                    email: '1@example.com',
+                    forwardsTo: undefined,
+                },
+                '2@example.com': {
+                    email: '2@example.com',
+                    forwardsTo: undefined,
+                },
+            };
+            const firstEmail = '1@example.com';
+            const approvers = WorkflowUtils.calculateApprovers({employees, firstEmail, personalDetailsByEmail});
+
+            expect(approvers).toEqual([buildApprover(1)]);
+        });
+
+        it('Should return a list of approvers when forwardsTo is defined', () => {
+            const employees: PolicyEmployeeList = {
+                '1@example.com': {
+                    email: '1@example.com',
+                    forwardsTo: '2@example.com',
+                },
+                '2@example.com': {
+                    email: '2@example.com',
+                    forwardsTo: '3@example.com',
+                },
+                '3@example.com': {
+                    email: '3@example.com',
+                    forwardsTo: '4@example.com',
+                },
+                '4@example.com': {
+                    email: '4@example.com',
+                    forwardsTo: undefined,
+                },
+                '5@example.com': {
+                    email: '5@example.com',
+                    forwardsTo: undefined,
+                },
+            };
+
+            expect(WorkflowUtils.calculateApprovers({employees, firstEmail: '1@example.com', personalDetailsByEmail})).toEqual([
+                buildApprover(1, {forwardsTo: '2@example.com'}),
+                buildApprover(2, {forwardsTo: '3@example.com'}),
+                buildApprover(3, {forwardsTo: '4@example.com'}),
+                buildApprover(4),
+            ]);
+            expect(WorkflowUtils.calculateApprovers({employees, firstEmail: '2@example.com', personalDetailsByEmail})).toEqual([
+                buildApprover(2, {forwardsTo: '3@example.com'}),
+                buildApprover(3, {forwardsTo: '4@example.com'}),
+                buildApprover(4),
+            ]);
+            expect(WorkflowUtils.calculateApprovers({employees, firstEmail: '3@example.com', personalDetailsByEmail})).toEqual([
+                buildApprover(3, {forwardsTo: '4@example.com'}),
+                buildApprover(4),
+            ]);
+        });
+
+        it('Should return a list of approvers with circular references', () => {
+            const employees: PolicyEmployeeList = {
+                '1@example.com': {
+                    email: '1@example.com',
+                    forwardsTo: '2@example.com',
+                },
+                '2@example.com': {
+                    email: '2@example.com',
+                    forwardsTo: '3@example.com',
+                },
+                '3@example.com': {
+                    email: '3@example.com',
+                    forwardsTo: '4@example.com',
+                },
+                '4@example.com': {
+                    email: '4@example.com',
+                    forwardsTo: '5@example.com',
+                },
+                '5@example.com': {
+                    email: '5@example.com',
+                    forwardsTo: '1@example.com',
+                },
+            };
+
+            expect(WorkflowUtils.calculateApprovers({employees, firstEmail: '1@example.com', personalDetailsByEmail})).toEqual([
+                buildApprover(1, {forwardsTo: '2@example.com'}),
+                buildApprover(2, {forwardsTo: '3@example.com'}),
+                buildApprover(3, {forwardsTo: '4@example.com'}),
+                buildApprover(4, {forwardsTo: '5@example.com'}),
+                buildApprover(5, {forwardsTo: '1@example.com'}),
+                buildApprover(1, {forwardsTo: '2@example.com', isCircularReference: true}),
+            ]);
+            expect(WorkflowUtils.calculateApprovers({employees, firstEmail: '2@example.com', personalDetailsByEmail})).toEqual([
+                buildApprover(2, {forwardsTo: '3@example.com'}),
+                buildApprover(3, {forwardsTo: '4@example.com'}),
+                buildApprover(4, {forwardsTo: '5@example.com'}),
+                buildApprover(5, {forwardsTo: '1@example.com'}),
+                buildApprover(1, {forwardsTo: '2@example.com'}),
+                buildApprover(2, {forwardsTo: '3@example.com', isCircularReference: true}),
+            ]);
+        });
+
+        it('Should return a list of approvers with circular references', () => {
+            const employees: PolicyEmployeeList = {
+                '1@example.com': {
+                    email: '1@example.com',
+                    forwardsTo: '1@example.com',
+                },
+            };
+
+            expect(WorkflowUtils.calculateApprovers({employees, firstEmail: '1@example.com', personalDetailsByEmail})).toEqual([
+                buildApprover(1, {forwardsTo: '1@example.com'}),
+                buildApprover(1, {forwardsTo: '1@example.com', isCircularReference: true}),
+            ]);
+        });
+    });
+
+    describe('convertPolicyEmployeesToApprovalWorkflows', () => {
+        it('Should return an empty list if there are no employees', () => {
+            const employees: PolicyEmployeeList = {};
+            const defaultApprover = '1@example.com';
+
+            const {approvalWorkflows} = WorkflowUtils.convertPolicyEmployeesToApprovalWorkflows({employees, defaultApprover, personalDetails});
+
+            expect(approvalWorkflows).toEqual([]);
+        });
+
+        it('Should transform all users into one default workflow', () => {
+            const employees: PolicyEmployeeList = {
+                '1@example.com': {
+                    email: '1@example.com',
+                    forwardsTo: undefined,
+                    submitsTo: '1@example.com',
+                },
+                '2@example.com': {
+                    email: '2@example.com',
+                    forwardsTo: undefined,
+                    submitsTo: '1@example.com',
+                },
+            };
+            const defaultApprover = '1@example.com';
+
+            const {approvalWorkflows} = WorkflowUtils.convertPolicyEmployeesToApprovalWorkflows({employees, defaultApprover, personalDetails});
+
+            expect(approvalWorkflows).toEqual([buildWorkflow([1, 2], [1], {isDefault: true})]);
+        });
+
+        it('Should transform all users into two workflows', () => {
+            const employees: PolicyEmployeeList = {
+                '1@example.com': {
+                    email: '1@example.com',
+                    forwardsTo: undefined,
+                    submitsTo: '4@example.com',
+                },
+                '2@example.com': {
+                    email: '2@example.com',
+                    forwardsTo: undefined,
+                    submitsTo: '1@example.com',
+                },
+                '3@example.com': {
+                    email: '3@example.com',
+                    forwardsTo: undefined,
+                    submitsTo: '1@example.com',
+                },
+                '4@example.com': {
+                    email: '4@example.com',
+                    forwardsTo: undefined,
+                    submitsTo: '4@example.com',
+                },
+            };
+            const defaultApprover = '1@example.com';
+
+            const {approvalWorkflows} = WorkflowUtils.convertPolicyEmployeesToApprovalWorkflows({employees, defaultApprover, personalDetails});
+
+            expect(approvalWorkflows).toEqual([buildWorkflow([2, 3], [1], {isDefault: true}), buildWorkflow([1, 4], [4])]);
+        });
+
+        it('Should sort the workflows (first the default and then based on the first approver display name)', () => {
+            const employees: PolicyEmployeeList = {
+                '5@example.com': {
+                    email: '5@example.com',
+                    forwardsTo: undefined,
+                    submitsTo: '3@example.com',
+                },
+                '4@example.com': {
+                    email: '4@example.com',
+                    forwardsTo: undefined,
+                    submitsTo: '4@example.com',
+                },
+                '3@example.com': {
+                    email: '3@example.com',
+                    forwardsTo: undefined,
+                    submitsTo: '1@example.com',
+                },
+                '2@example.com': {
+                    email: '2@example.com',
+                    forwardsTo: undefined,
+                    submitsTo: '1@example.com',
+                },
+                '1@example.com': {
+                    email: '1@example.com',
+                    forwardsTo: undefined,
+                    submitsTo: '4@example.com',
+                },
+            };
+            const defaultApprover = '1@example.com';
+
+            const {approvalWorkflows} = WorkflowUtils.convertPolicyEmployeesToApprovalWorkflows({employees, defaultApprover, personalDetails});
+
+            expect(approvalWorkflows).toEqual([buildWorkflow([3, 2], [1], {isDefault: true}), buildWorkflow([5], [3]), buildWorkflow([4, 1], [4])]);
+        });
+
+        it('Should mark approvers that are used in multiple workflows', () => {
+            const employees: PolicyEmployeeList = {
+                '1@example.com': {
+                    email: '1@example.com',
+                    forwardsTo: '3@example.com',
+                    submitsTo: '2@example.com',
+                },
+                '2@example.com': {
+                    email: '2@example.com',
+                    forwardsTo: '3@example.com',
+                    submitsTo: '1@example.com',
+                },
+                '3@example.com': {
+                    email: '3@example.com',
+                    forwardsTo: '4@example.com',
+                    submitsTo: '1@example.com',
+                },
+                '4@example.com': {
+                    email: '4@example.com',
+                    forwardsTo: undefined,
+                    submitsTo: '1@example.com',
+                },
+            };
+            const defaultApprover = '1@example.com';
+
+            const {approvalWorkflows} = WorkflowUtils.convertPolicyEmployeesToApprovalWorkflows({employees, defaultApprover, personalDetails});
+
+            const defaultWorkflow = buildWorkflow([2, 3, 4], [1, 3, 4], {isDefault: true});
+            defaultWorkflow.approvers[0].forwardsTo = '3@example.com';
+            defaultWorkflow.approvers[1].forwardsTo = '4@example.com';
+            const secondWorkflow = buildWorkflow([1], [2, 3, 4]);
+            secondWorkflow.approvers[0].forwardsTo = '3@example.com';
+            secondWorkflow.approvers[1].forwardsTo = '4@example.com';
+
+            expect(approvalWorkflows).toEqual([defaultWorkflow, secondWorkflow]);
+        });
+
+        it('Should build multiple workflows with many approvers', () => {
+            const employees: PolicyEmployeeList = {
+                '1@example.com': {
+                    email: '1@example.com',
+                    forwardsTo: undefined,
+                    submitsTo: '1@example.com',
+                },
+                '2@example.com': {
+                    email: '2@example.com',
+                    forwardsTo: undefined,
+                    submitsTo: '4@example.com',
+                },
+                '3@example.com': {
+                    email: '3@example.com',
+                    forwardsTo: undefined,
+                    submitsTo: '4@example.com',
+                },
+                '4@example.com': {
+                    email: '4@example.com',
+                    forwardsTo: '5@example.com',
+                    submitsTo: '1@example.com',
+                },
+                '5@example.com': {
+                    email: '5@example.com',
+                    forwardsTo: '6@example.com',
+                    submitsTo: '1@example.com',
+                },
+                '6@example.com': {
+                    email: '6@example.com',
+                    forwardsTo: undefined,
+                    submitsTo: '1@example.com',
+                },
+            };
+            const defaultApprover = '1@example.com';
+
+            const {approvalWorkflows} = WorkflowUtils.convertPolicyEmployeesToApprovalWorkflows({employees, defaultApprover, personalDetails});
+
+            const defaultWorkflow = buildWorkflow([1, 4, 5, 6], [1], {isDefault: true});
+            const secondWorkflow = buildWorkflow([2, 3], [4, 5, 6]);
+            secondWorkflow.approvers[0].forwardsTo = '5@example.com';
+            secondWorkflow.approvers[1].forwardsTo = '6@example.com';
+            expect(approvalWorkflows).toEqual([defaultWorkflow, secondWorkflow]);
+        });
+    });
+
+    describe('convertApprovalWorkflowToPolicyEmployees', () => {
+        it('Should return an updated employee list for a simple default workflow', () => {
+            const approvalWorkflow: ApprovalWorkflow = {
+                members: [buildMember(1), buildMember(2)],
+                approvers: [buildApprover(1)],
+                isDefault: true,
+            };
+
+            const convertedEmployees = WorkflowUtils.convertApprovalWorkflowToPolicyEmployees({approvalWorkflow, type: 'create'});
+
+            expect(convertedEmployees).toEqual({
+                '1@example.com': buildPolicyEmployee(1, {forwardsTo: '', submitsTo: '1@example.com'}),
+                '2@example.com': buildPolicyEmployee(2, {submitsTo: '1@example.com'}),
+            });
+        });
+
+        it('Should return an updated employee list for a complex workflow', () => {
+            const approvalWorkflow: ApprovalWorkflow = {
+                members: [buildMember(4), buildMember(5), buildMember(6)],
+                approvers: [buildApprover(1, {forwardsTo: '2@example.com'}), buildApprover(2, {forwardsTo: '2@example.com'}), buildApprover(3)],
+                isDefault: false,
+            };
+
+            const convertedEmployees = WorkflowUtils.convertApprovalWorkflowToPolicyEmployees({approvalWorkflow, type: 'create'});
+
+            expect(convertedEmployees).toEqual({
+                '1@example.com': buildPolicyEmployee(1, {forwardsTo: '2@example.com'}),
+                '2@example.com': buildPolicyEmployee(2, {forwardsTo: '3@example.com'}),
+                '3@example.com': buildPolicyEmployee(3, {forwardsTo: ''}),
+                '4@example.com': buildPolicyEmployee(4, {submitsTo: '1@example.com'}),
+                '5@example.com': buildPolicyEmployee(5, {submitsTo: '1@example.com'}),
+                '6@example.com': buildPolicyEmployee(6, {submitsTo: '1@example.com'}),
+            });
+        });
+
+        it('Should return an updated employee list for a complex workflow when removing', () => {
+            const approvalWorkflow: ApprovalWorkflow = {
+                members: [buildMember(4), buildMember(5), buildMember(6)],
+                approvers: [buildApprover(1, {forwardsTo: '2@example.com'}), buildApprover(2, {forwardsTo: '2@example.com'}), buildApprover(3)],
+                isDefault: false,
+            };
+
+            const convertedEmployees = WorkflowUtils.convertApprovalWorkflowToPolicyEmployees({approvalWorkflow, type: 'remove'});
+
+            expect(convertedEmployees).toEqual({
+                '1@example.com': buildPolicyEmployee(1, {forwardsTo: ''}),
+                '2@example.com': buildPolicyEmployee(2, {forwardsTo: ''}),
+                '3@example.com': buildPolicyEmployee(3, {forwardsTo: ''}),
+                '4@example.com': buildPolicyEmployee(4, {submitsTo: ''}),
+                '5@example.com': buildPolicyEmployee(5, {submitsTo: ''}),
+                '6@example.com': buildPolicyEmployee(6, {submitsTo: ''}),
+            });
+        });
+    });
+});
diff --git a/tests/unit/__snapshots__/E2EMarkdownTest.ts.snap b/tests/unit/__snapshots__/E2EMarkdownTest.ts.snap
new file mode 100644
index 000000000000..9a66a0e2e823
--- /dev/null
+++ b/tests/unit/__snapshots__/E2EMarkdownTest.ts.snap
@@ -0,0 +1,24 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`markdown formatter should format significant changes properly 1`] = `
+"## Performance Comparison Report 📊
+
+### Significant Changes To Duration
+| Name           | Duration                                            |
+| -------------- | --------------------------------------------------- |
+| commentLinking | 131.681 ms → 421.806 ms (+290.125 ms, +220.3%) 🔴🔴 |
+<details>
+<summary>Show details</summary>
+
+| Name           | Duration                                                                                                                                                                                                                                                                                                                                                                                                                                                     |
+| -------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ |
+| commentLinking | **Baseline**<br/>Mean: 131.681 ms<br/>Stdev: 19.883 ms (15.1%)<br/>Runs: 100.5145680010319 112.0048420019448 121.8861090019345 124.26110899820924 135.1571460030973 140.33837900310755 158.5825610011816 160.7034499980509<br/><br/>**Current**<br/>Mean: 421.806 ms<br/>Stdev: 30.185 ms (7.2%)<br/>Runs: 361.5145680010319 402.8861090019345 412.0048420019448 414.26110899820924 425.1571460030973 440.33837900310755 458.7034499980509 459.5825610011816 |
+</details>
+
+
+
+### Meaningless Changes To Duration
+_There are no entries_
+
+"
+`;
diff --git a/tests/unit/awaitStagingDeploysTest.ts b/tests/unit/awaitStagingDeploysTest.ts
index e4f7d6494b15..64d79c9faf94 100644
--- a/tests/unit/awaitStagingDeploysTest.ts
+++ b/tests/unit/awaitStagingDeploysTest.ts
@@ -68,16 +68,16 @@ beforeAll(() => {
     asMutable(core).getInput = mockGetInput;
 
     // Mock octokit module
-    const moctokit: InternalOctokit = {
+    const moctokit = {
         rest: {
-            // @ts-expect-error This error was removed because getting the rest of the data from internalOctokit makes the test to break
             actions: {
+                ...(GithubUtils.internalOctokit as unknown as typeof GithubUtils.octokit.actions),
                 listWorkflowRuns: mockListWorkflowRuns as unknown as typeof GithubUtils.octokit.actions.listWorkflowRuns,
             },
         },
     };
 
-    GithubUtils.internalOctokit = moctokit;
+    GithubUtils.internalOctokit = moctokit as InternalOctokit;
 });
 
 beforeEach(() => {
diff --git a/tests/unit/compareUserInListTest.ts b/tests/unit/compareUserInListTest.ts
new file mode 100644
index 000000000000..ce8b27ddf226
--- /dev/null
+++ b/tests/unit/compareUserInListTest.ts
@@ -0,0 +1,30 @@
+import {compareUserInList} from '@pages/home/report/ReportActionCompose/SuggestionMention';
+
+describe('compareUserInList', () => {
+    it('Should compare the weight if the weight is different', () => {
+        const first = {login: 'John Doe', weight: 1, accountID: 1};
+        const second = {login: 'Jane Doe', weight: 2, accountID: 2};
+        expect(compareUserInList(first, second)).toBe(-1);
+        expect(compareUserInList(second, first)).toBe(1);
+    });
+
+    it('Should compare the displayName if the weight is the same', () => {
+        const first = {login: 'águero', weight: 2, accountID: 3};
+        const second = {login: 'Bronn', weight: 2, accountID: 4};
+        const third = {login: 'Carol', weight: 2, accountID: 5};
+        expect(compareUserInList(first, second)).toBe(-1);
+        expect(compareUserInList(first, third)).toBe(-1);
+        expect(compareUserInList(second, third)).toBe(-1);
+
+        expect(compareUserInList(second, first)).toBe(1);
+        expect(compareUserInList(third, first)).toBe(1);
+        expect(compareUserInList(third, second)).toBe(1);
+    });
+
+    it('Should compare the accountID if both the weight and displayName are the same', () => {
+        const first = {login: 'águero', weight: 2, accountID: 6};
+        const second = {login: 'aguero', weight: 2, accountID: 7};
+        expect(compareUserInList(first, second)).toBe(-1);
+        expect(compareUserInList(second, first)).toBe(1);
+    });
+});
diff --git a/tests/unit/createOrUpdateStagingDeployTest.ts b/tests/unit/createOrUpdateStagingDeployTest.ts
index 2adac21bec51..8cd340f317c7 100644
--- a/tests/unit/createOrUpdateStagingDeployTest.ts
+++ b/tests/unit/createOrUpdateStagingDeployTest.ts
@@ -12,6 +12,11 @@ import type {InternalOctokit} from '@github/libs/GithubUtils';
 import GithubUtils from '@github/libs/GithubUtils';
 import GitUtils from '@github/libs/GitUtils';
 
+type Arguments = {
+    issue_number?: number;
+    labels?: string;
+};
+
 const PATH_TO_PACKAGE_JSON = path.resolve(__dirname, '../../package.json');
 
 jest.mock('fs');
@@ -29,7 +34,7 @@ beforeAll(() => {
     const moctokit = {
         rest: {
             issues: {
-                create: jest.fn().mockImplementation((arg) =>
+                create: jest.fn().mockImplementation((arg: Arguments) =>
                     Promise.resolve({
                         data: {
                             ...arg,
@@ -37,7 +42,7 @@ beforeAll(() => {
                         },
                     }),
                 ),
-                update: jest.fn().mockImplementation((arg) =>
+                update: jest.fn().mockImplementation((arg: Arguments) =>
                     Promise.resolve({
                         data: {
                             ...arg,
@@ -171,7 +176,7 @@ describe('createOrUpdateStagingDeployCash', () => {
             return [];
         });
 
-        mockListIssues.mockImplementation((args) => {
+        mockListIssues.mockImplementation((args: Arguments) => {
             if (args.labels === CONST.LABELS.STAGING_DEPLOY) {
                 return {data: [closedStagingDeployCash]};
             }
@@ -266,7 +271,7 @@ describe('createOrUpdateStagingDeployCash', () => {
                 return [];
             });
 
-            mockListIssues.mockImplementation((args) => {
+            mockListIssues.mockImplementation((args: Arguments) => {
                 if (args.labels === CONST.LABELS.STAGING_DEPLOY) {
                     return {data: [openStagingDeployCashBefore, closedStagingDeployCash]};
                 }
@@ -341,7 +346,7 @@ describe('createOrUpdateStagingDeployCash', () => {
                 }
                 return [];
             });
-            mockListIssues.mockImplementation((args) => {
+            mockListIssues.mockImplementation((args: Arguments) => {
                 if (args.labels === CONST.LABELS.STAGING_DEPLOY) {
                     return {data: [openStagingDeployCashBefore, closedStagingDeployCash]};
                 }
diff --git a/tests/unit/enhanceParametersTest.ts b/tests/unit/enhanceParametersTest.ts
index bf2756767401..799e80e381da 100644
--- a/tests/unit/enhanceParametersTest.ts
+++ b/tests/unit/enhanceParametersTest.ts
@@ -1,5 +1,6 @@
 /* eslint-disable @typescript-eslint/naming-convention */
 import Onyx from 'react-native-onyx';
+import pkg from '../../package.json';
 import CONFIG from '../../src/CONFIG';
 import enhanceParameters from '../../src/libs/Network/enhanceParameters';
 import ONYXKEYS from '../../src/ONYXKEYS';
@@ -18,10 +19,12 @@ test('Enhance parameters adds correct parameters for Log command with no authTok
         expect(finalParameters).toEqual({
             testParameter: 'test',
             api_setCookie: false,
+            appversion: pkg.version,
             email,
             isFromDevEnv: true,
             platform: 'ios',
             referer: CONFIG.EXPENSIFY.EXPENSIFY_CASH_REFERER,
+            clientUpdateID: -1,
         });
     });
 });
@@ -37,10 +40,12 @@ test('Enhance parameters adds correct parameters for a command that requires aut
         expect(finalParameters).toEqual({
             testParameter: 'test',
             api_setCookie: false,
+            appversion: pkg.version,
             email,
             isFromDevEnv: true,
             platform: 'ios',
             authToken,
+            clientUpdateID: -1,
             referer: CONFIG.EXPENSIFY.EXPENSIFY_CASH_REFERER,
         });
     });
diff --git a/tests/unit/markPullRequestsAsDeployedTest.ts b/tests/unit/markPullRequestsAsDeployedTest.ts
index d533435273d4..4d491db2e53e 100644
--- a/tests/unit/markPullRequestsAsDeployedTest.ts
+++ b/tests/unit/markPullRequestsAsDeployedTest.ts
@@ -3,6 +3,7 @@
 /**
  * @jest-environment node
  */
+import CONST from '../../.github/libs/CONST';
 import type {InternalOctokit} from '../../.github/libs/GithubUtils';
 import GithubUtils from '../../.github/libs/GithubUtils';
 import GitUtils from '../../.github/libs/GitUtils';
@@ -15,6 +16,7 @@ type PullRequest = {
     issue_number: number;
     title: string;
     merged_by: {login: string};
+    labels: Array<{name: string}>;
 };
 
 type PullRequestParams = {
@@ -35,7 +37,7 @@ type CommitData = {
     };
 };
 
-let run;
+let run: () => Promise<void>;
 
 const mockGetInput = jest.fn();
 const mockGetPullRequest = jest.fn();
@@ -52,6 +54,7 @@ const PRList: Record<number, PullRequest> = {
         merged_by: {
             login: 'odin',
         },
+        labels: [],
     },
     2: {
         issue_number: 2,
@@ -59,6 +62,7 @@ const PRList: Record<number, PullRequest> = {
         merged_by: {
             login: 'loki',
         },
+        labels: [],
     },
 };
 const version = '42.42.42-42';
@@ -138,7 +142,7 @@ beforeAll(() => {
     jest.mock('../../.github/libs/ActionUtils', () => ({
         getJSONInput: jest.fn().mockImplementation((name: string, defaultValue: string) => {
             try {
-                const input: string = mockGetInput(name);
+                const input = mockGetInput(name) as string;
                 return JSON.parse(input) as unknown;
             } catch (err) {
                 return defaultValue;
@@ -171,10 +175,12 @@ afterAll(() => {
     jest.clearAllMocks();
 });
 
+type MockedActionRun = () => Promise<void>;
+
 describe('markPullRequestsAsDeployed', () => {
     it('comments on pull requests correctly for a standard staging deploy', async () => {
         // Note: we import this in here so that it executes after all the mocks are set up
-        run = require('../../.github/actions/javascript/markPullRequestsAsDeployed/markPullRequestsAsDeployed');
+        run = require<MockedActionRun>('../../.github/actions/javascript/markPullRequestsAsDeployed/markPullRequestsAsDeployed');
         await run();
         expect(mockCreateComment).toHaveBeenCalledTimes(Object.keys(PRList).length);
         for (let i = 0; i < Object.keys(PRList).length; i++) {
@@ -196,7 +202,7 @@ platform | result
     });
 
     it('comments on pull requests correctly for a standard production deploy', async () => {
-        mockGetInput.mockImplementation((key) => {
+        mockGetInput.mockImplementation((key: string) => {
             if (key === 'IS_PRODUCTION_DEPLOY') {
                 return true;
             }
@@ -204,7 +210,7 @@ platform | result
         });
 
         // Note: we import this in here so that it executes after all the mocks are set up
-        run = require('../../.github/actions/javascript/markPullRequestsAsDeployed/markPullRequestsAsDeployed');
+        run = require<MockedActionRun>('../../.github/actions/javascript/markPullRequestsAsDeployed/markPullRequestsAsDeployed');
 
         await run();
         expect(mockCreateComment).toHaveBeenCalledTimes(Object.keys(PRList).length);
@@ -226,7 +232,7 @@ platform | result
     });
 
     it('comments on pull requests correctly for a cherry pick', async () => {
-        mockGetInput.mockImplementation((key) => {
+        mockGetInput.mockImplementation((key: string) => {
             if (key === 'PR_LIST') {
                 return JSON.stringify([3]);
             }
@@ -244,6 +250,7 @@ platform | result
                         merged_by: {
                             login: 'thor',
                         },
+                        labels: [{name: CONST.LABELS.CP_STAGING}],
                     },
                 };
             }
@@ -254,13 +261,20 @@ platform | result
         });
         mockGetCommit.mockImplementation(({commit_sha}: Commit) => {
             if (commit_sha === 'xyz') {
-                return {data: {message: 'Test PR 3 (cherry picked from commit dagdag)', committer: {name: 'freyja'}}};
+                return {
+                    data: {
+                        message: `Merge pull request #3 blahblahblah
+(cherry picked from commit dagdag)
+(CP triggered by freyja)`,
+                        committer: {name: 'freyja'},
+                    },
+                };
             }
             return mockGetCommitDefaultImplementation({commit_sha});
         });
 
         // Note: we import this in here so that it executes after all the mocks are set up
-        run = require('../../.github/actions/javascript/markPullRequestsAsDeployed/markPullRequestsAsDeployed');
+        run = require<MockedActionRun>('../../.github/actions/javascript/markPullRequestsAsDeployed/markPullRequestsAsDeployed');
         await run();
         expect(mockCreateComment).toHaveBeenCalledTimes(1);
         expect(mockCreateComment).toHaveBeenCalledWith({
@@ -281,7 +295,7 @@ platform | result
     });
 
     it('comments on pull requests correctly when one platform fails', async () => {
-        mockGetInput.mockImplementation((key) => {
+        mockGetInput.mockImplementation((key: string) => {
             if (key === 'ANDROID') {
                 return 'skipped';
             }
@@ -295,7 +309,7 @@ platform | result
         });
 
         // Note: we import this in here so that it executes after all the mocks are set up
-        run = require('../../.github/actions/javascript/markPullRequestsAsDeployed/markPullRequestsAsDeployed');
+        run = require<MockedActionRun>('../../.github/actions/javascript/markPullRequestsAsDeployed/markPullRequestsAsDeployed');
         await run();
         expect(mockCreateComment).toHaveBeenCalledTimes(Object.keys(PRList).length);
         for (let i = 0; i < Object.keys(PRList).length; i++) {
diff --git a/tests/unit/memoizeTest.ts b/tests/unit/memoizeTest.ts
new file mode 100644
index 000000000000..b3d3b5306a7e
--- /dev/null
+++ b/tests/unit/memoizeTest.ts
@@ -0,0 +1,87 @@
+import memoize from '../../src/libs/memoize';
+
+describe('memoize test', () => {
+    it('should return the memoized result', () => {
+        const add = (a: number, b: number) => a + b;
+        const memoizedAdd = memoize(add);
+
+        const result1 = memoizedAdd(2, 3);
+        const result2 = memoizedAdd(2, 3);
+
+        expect(result1).toBe(5);
+        expect(result2).toBe(5);
+    });
+
+    it('should not call original function if the same arguments are passed', () => {
+        const fn = jest.fn();
+        const memoizedFn = memoize(fn);
+
+        memoizedFn(2, 3);
+        memoizedFn(2, 3);
+        memoizedFn(2, 3);
+
+        expect(fn).toHaveBeenCalledTimes(1);
+    });
+
+    it('should recompute the result if different arguments are passed', () => {
+        const fn = jest.fn();
+        const memoizedFn = memoize(fn);
+
+        memoizedFn(4, 20);
+        memoizedFn('r2d2');
+
+        expect(fn).toHaveBeenCalledTimes(2);
+    });
+
+    it('should handle deep comparison', () => {
+        const fn = jest.fn();
+        const memoizedFn = memoize(fn, {equality: 'deep'});
+
+        memoizedFn({a: 1, b: 'test'}, {c: 3, d: 'test'});
+        memoizedFn({a: 1, b: 'test'}, {c: 3, d: 'test'});
+
+        expect(fn).toHaveBeenCalledTimes(1);
+    });
+
+    it('should handle custom key comparator', () => {
+        const fn = jest.fn();
+        const memoizedFn = memoize(fn, {equality: () => true});
+
+        memoizedFn(1, 2);
+        memoizedFn(1, 3);
+        memoizedFn(1, 4);
+        memoizedFn(1, 5);
+
+        expect(fn).toHaveBeenCalledTimes(1);
+    });
+
+    it('should handle cache eviction', () => {
+        const fn = jest.fn();
+        const memoizedFn = memoize(fn, {maxSize: 1});
+
+        memoizedFn(1, 2);
+        memoizedFn(1, 3);
+        memoizedFn(1, 2);
+        memoizedFn(1, 3);
+
+        expect(fn).toHaveBeenCalledTimes(4);
+    });
+
+    it('should return cache snapshot', () => {
+        const fn = (a: number, b: number) => a + b;
+        const memoizedFn = memoize(fn);
+
+        memoizedFn(1, 2);
+        memoizedFn(2, 3);
+
+        expect(memoizedFn.cache.snapshot.keys()).toEqual([
+            [1, 2],
+            [2, 3],
+        ]);
+        expect(memoizedFn.cache.snapshot.values()).toEqual([3, 5]);
+        expect(memoizedFn.cache.snapshot.entries()).toEqual([
+            [[1, 2], 3],
+            [[2, 3], 5],
+        ]);
+    });
+});
diff --git a/tests/unit/postTestBuildComment.ts b/tests/unit/postTestBuildComment.ts
index 310809cd4f83..6a7f8182be1e 100644
--- a/tests/unit/postTestBuildComment.ts
+++ b/tests/unit/postTestBuildComment.ts
@@ -16,13 +16,17 @@ jest.spyOn(GithubUtils, 'octokit', 'get').mockReturnValue({
     },
 } as RestEndpointMethods);
 
-// @ts-expect-error -- it's a static getter
-jest.spyOn(GithubUtils, 'paginate', 'get').mockReturnValue(<T, TData>(endpoint: (params: Record<string, T>) => Promise<{data: TData}>, params: Record<string, T>) =>
-    endpoint(params).then((response) => response.data),
-);
+function mockImplementation<T, TData>(endpoint: (params: Record<string, T>) => Promise<{data: TData}>, params: Record<string, T>) {
+    return endpoint(params).then((response) => response.data);
+}
 
-// @ts-expect-error -- it's a static getter
-jest.spyOn(GithubUtils, 'graphql', 'get').mockReturnValue(mockGraphql);
+Object.defineProperty(GithubUtils, 'paginate', {
+    get: () => mockImplementation,
+});
+
+Object.defineProperty(GithubUtils, 'graphql', {
+    get: () => mockGraphql,
+});
 
 jest.mock('@actions/github', () => ({
     context: {
diff --git a/tests/unit/sanitizeStringForJSONParseTest.ts b/tests/unit/sanitizeStringForJSONParseTest.ts
index 9d39685eb1f7..da09aa346db9 100644
--- a/tests/unit/sanitizeStringForJSONParseTest.ts
+++ b/tests/unit/sanitizeStringForJSONParseTest.ts
@@ -1,5 +1,9 @@
 import sanitizeStringForJSONParse from '../../.github/libs/sanitizeStringForJSONParse';
 
+type ParsedJSON = {
+    key?: string;
+};
+
 // Bad inputs should cause an error to be thrown
 const badInputs: Array<null | undefined | number | boolean> = [null, undefined, 42, true];
 
@@ -30,7 +34,6 @@ const validJSONData: Array<[string, string]> = [
 describe('santizeStringForJSONParse', () => {
     describe.each(badInputs)('willDetectBadInputs', (input) => {
         test('sanitizeStringForJSONParse', () => {
-            // @ts-expect-error TODO: Remove this once sanitizeStringForJSONParse (https://github.com/Expensify/App/issues/25360) is migrated to TypeScript.
             expect(() => sanitizeStringForJSONParse(input)).toThrow();
         });
     });
@@ -38,16 +41,15 @@ describe('santizeStringForJSONParse', () => {
     describe.each(invalidJSONData)('canHandleInvalidJSON', (input, expectedOutput) => {
         test('sanitizeStringForJSONParse', () => {
             const badJSON = `{"key": "${input}"}`;
-            // eslint-disable-next-line @typescript-eslint/no-unsafe-return -- it's supposed to throw an error
-            expect(() => JSON.parse(badJSON)).toThrow();
-            const goodJSON = JSON.parse(`{"key": "${sanitizeStringForJSONParse(input)}"}`);
+            expect(() => JSON.parse(badJSON) as unknown).toThrow();
+            const goodJSON = JSON.parse(`{"key": "${sanitizeStringForJSONParse(input)}"}`) as ParsedJSON;
             expect(goodJSON.key).toStrictEqual(expectedOutput);
         });
     });
 
     describe.each(validJSONData)('canHandleValidJSON', (input, expectedOutput) => {
         test('sanitizeStringForJSONParse', () => {
-            const goodJSON = JSON.parse(`{"key": "${sanitizeStringForJSONParse(input)}"}`);
+            const goodJSON = JSON.parse(`{"key": "${sanitizeStringForJSONParse(input)}"}`) as ParsedJSON;
             expect(goodJSON.key).toStrictEqual(expectedOutput);
         });
     });
diff --git a/tests/utils/LHNTestUtils.tsx b/tests/utils/LHNTestUtils.tsx
index abfaf9bd8b00..7197529cd43c 100644
--- a/tests/utils/LHNTestUtils.tsx
+++ b/tests/utils/LHNTestUtils.tsx
@@ -10,11 +10,12 @@ import {CurrentReportIDContextProvider} from '@components/withCurrentReportID';
 import {EnvironmentProvider} from '@components/withEnvironment';
 import {ReportIDsContextProvider} from '@hooks/useReportIDs';
 import DateUtils from '@libs/DateUtils';
+import * as ReportUtils from '@libs/ReportUtils';
 import ReportActionItemSingle from '@pages/home/report/ReportActionItemSingle';
 import SidebarLinksData from '@pages/home/sidebar/SidebarLinksData';
 import CONST from '@src/CONST';
 import type {PersonalDetailsList, Policy, Report, ReportAction} from '@src/types/onyx';
-import type {ActionName} from '@src/types/onyx/OriginalMessage';
+import type ReportActionName from '@src/types/onyx/ReportActionName';
 
 type MockedReportActionItemSingleProps = {
     /** Determines if the avatar is displayed as a subscript (positioned lower than normal) */
@@ -32,8 +33,8 @@ type MockedSidebarLinksProps = {
     currentReportID?: string;
 };
 
-jest.mock('@react-navigation/native', (): typeof Navigation => {
-    const actualNav = jest.requireActual('@react-navigation/native');
+jest.mock('@react-navigation/native', () => {
+    const actualNav = jest.requireActual<typeof Navigation>('@react-navigation/native');
     return {
         ...actualNav,
         useRoute: jest.fn(),
@@ -44,7 +45,7 @@ jest.mock('@react-navigation/native', (): typeof Navigation => {
             addListener: jest.fn(),
         }),
         createNavigationContainerRef: jest.fn(),
-    } as typeof Navigation;
+    };
 });
 
 const fakePersonalDetails: PersonalDetailsList = {
@@ -128,7 +129,7 @@ function getFakeReport(participantAccountIDs = [1, 2], millisecondsInThePast = 0
         reportName: 'Report',
         lastVisibleActionCreated,
         lastReadTime: isUnread ? DateUtils.subtractMillisecondsFromDateTime(lastVisibleActionCreated, 1) : lastVisibleActionCreated,
-        participantAccountIDs,
+        participants: ReportUtils.buildParticipantsFromAccountIDs(participantAccountIDs),
     };
 }
 
@@ -138,19 +139,15 @@ function getFakeReport(participantAccountIDs = [1, 2], millisecondsInThePast = 0
 function getFakeReportAction(actor = 'email1@test.com', millisecondsInThePast = 0): ReportAction {
     const timestamp = Date.now() - millisecondsInThePast;
     const created = DateUtils.getDBTime(timestamp);
-    const previousReportActionID = lastFakeReportActionID;
     const reportActionID = ++lastFakeReportActionID;
 
     return {
         actor,
         actorAccountID: 1,
         reportActionID: `${reportActionID}`,
-        previousReportActionID: `${previousReportActionID}`,
         actionName: CONST.REPORT.ACTIONS.TYPE.CREATED,
         shouldShow: true,
         created,
-        timestamp,
-        reportActionTimestamp: timestamp,
         person: [
             {
                 type: 'TEXT',
@@ -158,7 +155,6 @@ function getFakeReportAction(actor = 'email1@test.com', millisecondsInThePast =
                 text: 'Email One',
             },
         ],
-        whisperedToAccountIDs: [],
         automatic: false,
         message: [
             {
@@ -168,46 +164,12 @@ function getFakeReportAction(actor = 'email1@test.com', millisecondsInThePast =
                 isEdited: false,
                 whisperedTo: [],
                 isDeletedParentAction: false,
-                reactions: [
-                    {
-                        emoji: 'heart',
-                        users: [
-                            {
-                                accountID: 1,
-                                skinTone: -1,
-                            },
-                        ],
-                    },
-                ],
             },
         ],
         originalMessage: {
-            childReportID: `${reportActionID}`,
-            emojiReactions: {
-                heart: {
-                    createdAt: '2023-08-28 15:27:52',
-                    users: {
-                        1: {
-                            skinTones: {
-                                '-1': '2023-08-28 15:27:52',
-                            },
-                        },
-                    },
-                },
-            },
+            whisperedTo: [],
             html: 'hey',
             lastModified: '2023-08-28 15:28:12.432',
-            reactions: [
-                {
-                    emoji: 'heart',
-                    users: [
-                        {
-                            accountID: 1,
-                            skinTone: -1,
-                        },
-                    ],
-                },
-            ],
         },
     };
 }
@@ -259,7 +221,6 @@ function getFakePolicy(id = '1', name = 'Workspace-Test-001'): Policy {
         },
         autoReportingOffset: 1,
         preventSelfApproval: true,
-        submitsTo: 123456,
         defaultBillable: false,
         disabledFields: {defaultBillable: true, reimbursable: false},
         approvalMode: 'BASIC',
@@ -269,7 +230,7 @@ function getFakePolicy(id = '1', name = 'Workspace-Test-001'): Policy {
 /**
  * @param millisecondsInThePast the number of milliseconds in the past for the last message timestamp (to order reports by most recent messages)
  */
-function getFakeAdvancedReportAction(actionName: ActionName = 'IOU', actor = 'email1@test.com', millisecondsInThePast = 0): ReportAction {
+function getFakeAdvancedReportAction(actionName: ReportActionName = 'IOU', actor = 'email1@test.com', millisecondsInThePast = 0): ReportAction {
     return {
         ...getFakeReportAction(actor, millisecondsInThePast),
         actionName,
diff --git a/tests/utils/ReportTestUtils.ts b/tests/utils/ReportTestUtils.ts
index 3948baca3113..deab909cd272 100644
--- a/tests/utils/ReportTestUtils.ts
+++ b/tests/utils/ReportTestUtils.ts
@@ -1,17 +1,17 @@
 import type {ReportAction, ReportActions} from '@src/types/onyx';
-import type {ActionName} from '@src/types/onyx/OriginalMessage';
+import type ReportActionName from '@src/types/onyx/ReportActionName';
 import createRandomReportAction from './collections/reportActions';
 
-const actionNames: ActionName[] = ['ADDCOMMENT', 'IOU', 'REPORTPREVIEW', 'CLOSED'];
+const actionNames: ReportActionName[] = ['ADDCOMMENT', 'IOU', 'REPORTPREVIEW', 'CLOSED'];
 
-const getFakeReportAction = (index: number, actionName?: ActionName): ReportAction =>
+const getFakeReportAction = (index: number, actionName?: ReportActionName): ReportAction =>
     ({
         actionName,
         actorAccountID: index,
         automatic: false,
         avatar: '',
         created: '2023-09-12 16:27:35.124',
-        isAttachment: true,
+        isAttachmentOnly: true,
         isFirstItem: false,
         lastModified: '2021-07-14T15:00:00Z',
         message: [
@@ -19,7 +19,6 @@ const getFakeReportAction = (index: number, actionName?: ActionName): ReportActi
                 html: 'hey',
                 isDeletedParentAction: false,
                 isEdited: false,
-                reactions: [],
                 text: 'test',
                 type: 'TEXT',
                 whisperedTo: [],
@@ -30,6 +29,9 @@ const getFakeReportAction = (index: number, actionName?: ActionName): ReportActi
             lastModified: '2021-07-14T15:00:00Z',
             // IOUReportID: index,
             linkedReportID: index.toString(),
+            whisperedTo: [],
+            reason: '',
+            violationName: '',
         },
         pendingAction: null,
         person: [
@@ -40,31 +42,26 @@ const getFakeReportAction = (index: number, actionName?: ActionName): ReportActi
             },
         ],
         reportActionID: index.toString(),
-        previousReportActionID: (index === 0 ? 0 : index - 1).toString(),
-        reportActionTimestamp: 1696243169753,
         sequenceNumber: 0,
         shouldShow: true,
-        timestamp: 1696243169,
-        whisperedToAccountIDs: [],
     } as ReportAction);
 
 const getMockedSortedReportActions = (length = 100): ReportAction[] =>
     Array.from({length}, (element, index): ReportAction => {
-        const actionName: ActionName = index === 0 ? 'CREATED' : 'ADDCOMMENT';
+        const actionName: ReportActionName = index === 0 ? 'CREATED' : 'ADDCOMMENT';
         return getFakeReportAction(index + 1, actionName);
     }).reverse();
 
 const getMockedReportActionsMap = (length = 100): ReportActions => {
     const mockReports: ReportActions[] = Array.from({length}, (element, index): ReportActions => {
         const reportID = index + 1;
-        const actionName: ActionName = index === 0 ? 'CREATED' : actionNames[index % actionNames.length];
+        const actionName: ReportActionName = index === 0 ? 'CREATED' : actionNames[index % actionNames.length];
         const reportAction = {
             ...createRandomReportAction(reportID),
             actionName,
             originalMessage: {
                 linkedReportID: reportID.toString(),
             },
-            previousReportActionID: index.toString(),
         } as ReportAction;
 
         return {[reportID]: reportAction};
diff --git a/tests/utils/TestHelper.ts b/tests/utils/TestHelper.ts
index 562176288565..84ea2b2aafbe 100644
--- a/tests/utils/TestHelper.ts
+++ b/tests/utils/TestHelper.ts
@@ -1,27 +1,51 @@
-import Str from 'expensify-common/lib/str';
+import {Str} from 'expensify-common';
+import {Linking} from 'react-native';
 import Onyx from 'react-native-onyx';
+import type {ApiCommand, ApiRequestCommandParameters} from '@libs/API/types';
+import * as Pusher from '@libs/Pusher/pusher';
+import PusherConnectionManager from '@libs/PusherConnectionManager';
+import CONFIG from '@src/CONFIG';
 import CONST from '@src/CONST';
 import * as Session from '@src/libs/actions/Session';
 import HttpUtils from '@src/libs/HttpUtils';
 import * as NumberUtils from '@src/libs/NumberUtils';
 import ONYXKEYS from '@src/ONYXKEYS';
+import appSetup from '@src/setup';
 import type {Response as OnyxResponse, PersonalDetails, Report} from '@src/types/onyx';
 import waitForBatchedUpdates from './waitForBatchedUpdates';
 
-type MockFetch = ReturnType<typeof jest.fn> & {
-    pause?: () => void;
-    fail?: () => void;
-    succeed?: () => void;
-    resume?: () => Promise<void>;
+type MockFetch = jest.MockedFn<typeof fetch> & {
+    pause: () => void;
+    fail: () => void;
+    succeed: () => void;
+    resume: () => Promise<void>;
+    mockAPICommand: <TCommand extends ApiCommand>(command: TCommand, responseHandler: (params: ApiRequestCommandParameters[TCommand]) => OnyxResponse['onyxData']) => void;
 };
 
-type QueueItem = (value: Partial<Response> | PromiseLike<Partial<Response>>) => void;
+type QueueItem = {
+    resolve: (value: Partial<Response> | PromiseLike<Partial<Response>>) => void;
+    input: RequestInfo;
+    options?: RequestInit;
+};
 
 type FormData = {
     entries: () => Array<[string, string | Blob]>;
 };
 
-type Listener = () => void;
+function setupApp() {
+    beforeAll(() => {
+        Linking.setInitialURL('https://new.expensify.com/');
+        appSetup();
+
+        // Connect to Pusher
+        PusherConnectionManager.init();
+        Pusher.init({
+            appKey: CONFIG.PUSHER.APP_KEY,
+            cluster: CONFIG.PUSHER.CLUSTER,
+            authEndpoint: `${CONFIG.EXPENSIFY.DEFAULT_API_ROOT}api/AuthenticatePusher?`,
+        });
+    });
+}
 
 function buildPersonalDetails(login: string, accountID: number, firstName = 'Test'): PersonalDetails {
     return {
@@ -156,12 +180,14 @@ function signOutTestUser() {
  * - fail() - start returning a failure response
  * - success() - go back to returning a success response
  */
-function getGlobalFetchMock() {
-    const queue: QueueItem[] = [];
+function getGlobalFetchMock(): typeof fetch {
+    let queue: QueueItem[] = [];
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
+    let responses = new Map<string, (params: any) => OnyxResponse['onyxData']>();
     let isPaused = false;
     let shouldFail = false;
 
-    const getResponse = (): Partial<Response> =>
+    const getResponse = (input: RequestInfo, options?: RequestInit): Partial<Response> =>
         shouldFail
             ? {
                   ok: true,
@@ -169,28 +195,86 @@ function getGlobalFetchMock() {
               }
             : {
                   ok: true,
-                  json: () => Promise.resolve({jsonCode: 200}),
+                  json: async () => {
+                      const commandMatch = typeof input === 'string' ? input.match(/https:\/\/www.expensify.com.dev\/api\/(\w+)\?/) : null;
+                      const command = commandMatch ? commandMatch[1] : null;
+
+                      const responseHandler = command ? responses.get(command) : null;
+                      if (responseHandler) {
+                          const requestData = options?.body instanceof FormData ? Object.fromEntries(options.body) : {};
+                          return Promise.resolve({jsonCode: 200, onyxData: responseHandler(requestData)});
+                      }
+
+                      return Promise.resolve({jsonCode: 200});
+                  },
               };
 
-    const mockFetch: MockFetch = jest.fn().mockImplementation(() => {
+    const mockFetch = jest.fn().mockImplementation((input: RequestInfo, options?: RequestInit) => {
         if (!isPaused) {
-            return Promise.resolve(getResponse());
+            return Promise.resolve(getResponse(input, options));
         }
         return new Promise((resolve) => {
-            queue.push(resolve);
+            queue.push({resolve, input, options});
         });
-    });
+    }) as MockFetch;
+
+    const baseMockReset = mockFetch.mockReset.bind(mockFetch);
+    mockFetch.mockReset = () => {
+        baseMockReset();
+        queue = [];
+        responses = new Map();
+        isPaused = false;
+        shouldFail = false;
+        return mockFetch;
+    };
 
     mockFetch.pause = () => (isPaused = true);
     mockFetch.resume = () => {
         isPaused = false;
-        queue.forEach((resolve) => resolve(getResponse()));
+        queue.forEach(({resolve, input}) => resolve(getResponse(input)));
         return waitForBatchedUpdates();
     };
     mockFetch.fail = () => (shouldFail = true);
     mockFetch.succeed = () => (shouldFail = false);
+    mockFetch.mockAPICommand = <TCommand extends ApiCommand>(command: TCommand, responseHandler: (params: ApiRequestCommandParameters[TCommand]) => OnyxResponse['onyxData']): void => {
+        responses.set(command, responseHandler);
+    };
+    return mockFetch as typeof fetch;
+}
+
+function setupGlobalFetchMock(): MockFetch {
+    const mockFetch = getGlobalFetchMock();
+    const originalFetch = global.fetch;
+
+    global.fetch = mockFetch as unknown as typeof global.fetch;
+
+    afterAll(() => {
+        global.fetch = originalFetch;
+    });
+
+    return mockFetch as MockFetch;
+}
 
-    return mockFetch;
+function getFetchMockCalls(commandName: ApiCommand) {
+    return (global.fetch as MockFetch).mock.calls.filter((c) => c[0] === `https://www.expensify.com.dev/api/${commandName}?`);
+}
+
+/**
+ * Assertion helper to validate that a command has been called a specific number of times.
+ */
+function expectAPICommandToHaveBeenCalled(commandName: ApiCommand, expectedCalls: number) {
+    expect(getFetchMockCalls(commandName)).toHaveLength(expectedCalls);
+}
+
+/**
+ * Assertion helper to validate that a command has been called with specific parameters.
+ */
+function expectAPICommandToHaveBeenCalledWith<TCommand extends ApiCommand>(commandName: TCommand, callIndex: number, expectedParams: ApiRequestCommandParameters[TCommand]) {
+    const call = getFetchMockCalls(commandName).at(callIndex);
+    expect(call).toBeTruthy();
+    const body = (call?.at(1) as RequestInit)?.body;
+    const params = body instanceof FormData ? Object.fromEntries(body) : {};
+    expect(params).toEqual(expect.objectContaining(expectedParams));
 }
 
 function setPersonalDetails(login: string, accountID: number) {
@@ -200,7 +284,7 @@ function setPersonalDetails(login: string, accountID: number) {
     return waitForBatchedUpdates();
 }
 
-function buildTestReportComment(created: string, actorAccountID: number, actionID: string | null = null, previousReportActionID: string | null = null) {
+function buildTestReportComment(created: string, actorAccountID: number, actionID: string | null = null) {
     const reportActionID = actionID ?? NumberUtils.rand64().toString();
     return {
         actionName: CONST.REPORT.ACTIONS.TYPE.ADD_COMMENT,
@@ -209,37 +293,29 @@ function buildTestReportComment(created: string, actorAccountID: number, actionI
         message: [{type: 'COMMENT', html: `Comment ${actionID}`, text: `Comment ${actionID}`}],
         reportActionID,
         actorAccountID,
-        previousReportActionID,
     };
 }
 
 function assertFormDataMatchesObject(formData: FormData, obj: Report) {
-    expect(Array.from(formData.entries()).reduce((memo, x) => ({...memo, [x[0]]: x[1]}), {})).toEqual(expect.objectContaining(obj));
+    expect(
+        Array.from(formData.entries()).reduce((acc, [key, val]) => {
+            acc[key] = val;
+            return acc;
+        }, {} as Record<string, string | Blob>),
+    ).toEqual(expect.objectContaining(obj));
 }
 
-/**
- * This is a helper function to create a mock for the addListener function of the react-navigation library.
- * The reason we need this is because we need to trigger the transitionEnd event in our tests to simulate
- * the transitionEnd event that is triggered when the screen transition animation is completed.
- *
- * @returns An object with two functions: triggerTransitionEnd and addListener
- */
-const createAddListenerMock = () => {
-    const transitionEndListeners: Listener[] = [];
-    const triggerTransitionEnd = () => {
-        transitionEndListeners.forEach((transitionEndListener) => transitionEndListener());
-    };
-
-    const addListener = jest.fn().mockImplementation((listener, callback) => {
-        if (listener === 'transitionEnd') {
-            transitionEndListeners.push(callback);
-        }
-        return () => {
-            transitionEndListeners.filter((cb) => cb !== callback);
-        };
-    });
-
-    return {triggerTransitionEnd, addListener};
+export type {MockFetch, FormData};
+export {
+    assertFormDataMatchesObject,
+    buildPersonalDetails,
+    buildTestReportComment,
+    getGlobalFetchMock,
+    setPersonalDetails,
+    signInWithTestUser,
+    signOutTestUser,
+    setupApp,
+    expectAPICommandToHaveBeenCalled,
+    expectAPICommandToHaveBeenCalledWith,
+    setupGlobalFetchMock,
 };
-
-export {assertFormDataMatchesObject, buildPersonalDetails, buildTestReportComment, createAddListenerMock, getGlobalFetchMock, setPersonalDetails, signInWithTestUser, signOutTestUser};
diff --git a/tests/utils/bumpVersion.ts b/tests/utils/bumpVersion.ts
deleted file mode 100644
index e187de508dab..000000000000
--- a/tests/utils/bumpVersion.ts
+++ /dev/null
@@ -1,14 +0,0 @@
-#!/usr/bin/env node
-import {incrementVersion} from '../../.github/libs/versionUpdater';
-
-const version = process.argv[2];
-const level = process.argv[3];
-
-/* eslint-disable no-console */
-const realConsoleLog = console.log;
-console.log = () => {};
-
-const output = incrementVersion(version, level);
-
-console.log = realConsoleLog;
-console.log(output);
diff --git a/tests/utils/collections/policies.ts b/tests/utils/collections/policies.ts
index 5507c9e75436..47bf996afb7e 100644
--- a/tests/utils/collections/policies.ts
+++ b/tests/utils/collections/policies.ts
@@ -1,4 +1,5 @@
 import {rand, randAvatar, randBoolean, randCurrencyCode, randEmail, randPastDate, randWord} from '@ngneat/falso';
+import type {ValueOf} from 'type-fest';
 import CONST from '@src/CONST';
 import type {Policy} from '@src/types/onyx';
 
@@ -9,13 +10,17 @@ export default function createRandomPolicy(index: number): Policy {
         type: rand(Object.values(CONST.POLICY.TYPE)),
         autoReporting: randBoolean(),
         isPolicyExpenseChatEnabled: randBoolean(),
-        autoReportingFrequency: rand(Object.values(CONST.POLICY.AUTO_REPORTING_FREQUENCIES)),
+        autoReportingFrequency: rand(
+            Object.values(CONST.POLICY.AUTO_REPORTING_FREQUENCIES).filter(
+                (frequency): frequency is Exclude<ValueOf<typeof CONST.POLICY.AUTO_REPORTING_FREQUENCIES>, typeof CONST.POLICY.AUTO_REPORTING_FREQUENCIES.MANUAL> =>
+                    frequency !== CONST.POLICY.AUTO_REPORTING_FREQUENCIES.MANUAL,
+            ),
+        ),
         harvesting: {
             enabled: randBoolean(),
         },
         autoReportingOffset: 1,
         preventSelfApproval: randBoolean(),
-        submitsTo: index,
         outputCurrency: randCurrencyCode(),
         role: rand(Object.values(CONST.POLICY.ROLE)),
         owner: randEmail(),
diff --git a/tests/utils/collections/policyCategory.ts b/tests/utils/collections/policyCategory.ts
new file mode 100644
index 000000000000..37a5ecb4f21f
--- /dev/null
+++ b/tests/utils/collections/policyCategory.ts
@@ -0,0 +1,21 @@
+import {randWord} from '@ngneat/falso';
+import type {PolicyCategories} from '@src/types/onyx';
+
+export default function createRandomPolicyCategories(numberOfCategories = 0): PolicyCategories {
+    const categories: PolicyCategories = {};
+    for (let i = 0; i < numberOfCategories; i++) {
+        const categoryName = randWord();
+        categories[categoryName] = {
+            name: categoryName,
+            enabled: false,
+            // eslint-disable-next-line @typescript-eslint/naming-convention
+            'GL Code': '',
+            unencodedName: categoryName,
+            externalID: '',
+            areCommentsRequired: false,
+            origin: '',
+        };
+    }
+
+    return categories;
+}
diff --git a/tests/utils/collections/policyTags.ts b/tests/utils/collections/policyTags.ts
index ed5bbd7efda4..6854c669a5b5 100644
--- a/tests/utils/collections/policyTags.ts
+++ b/tests/utils/collections/policyTags.ts
@@ -1,7 +1,7 @@
 import {randWord} from '@ngneat/falso';
-import type {PolicyTagList, PolicyTags} from '@src/types/onyx';
+import type {PolicyTagLists, PolicyTags} from '@src/types/onyx';
 
-export default function createRandomPolicyTags(tagListName: string, numberOfTags = 0): PolicyTagList {
+export default function createRandomPolicyTags(tagListName: string, numberOfTags = 0): PolicyTagLists {
     const tags: PolicyTags = {};
     for (let i = 0; i < numberOfTags; i++) {
         const tagName = randWord();
diff --git a/tests/utils/collections/reportActions.ts b/tests/utils/collections/reportActions.ts
index f19e939083d2..9a05ba6ad992 100644
--- a/tests/utils/collections/reportActions.ts
+++ b/tests/utils/collections/reportActions.ts
@@ -2,17 +2,16 @@ import {rand, randAggregation, randBoolean, randWord} from '@ngneat/falso';
 import {format} from 'date-fns';
 import CONST from '@src/CONST';
 import type {ReportAction} from '@src/types/onyx';
+import type ReportActionName from '@src/types/onyx/ReportActionName';
+import type DeepRecord from '@src/types/utils/DeepRecord';
 
-type ActionType = keyof typeof CONST.REPORT.ACTIONS.TYPE;
-
-// eslint-disable-next-line @typescript-eslint/no-explicit-any
-const flattenActionNamesValues = (actionNames: any) => {
-    let result = [] as ActionType[];
-    Object.keys(actionNames).forEach((key) => {
-        if (typeof actionNames[key] === 'object') {
-            result = result.concat(flattenActionNamesValues(actionNames[key]));
+const flattenActionNamesValues = (actionNames: DeepRecord<string, ReportActionName>): ReportActionName[] => {
+    let result: ReportActionName[] = [];
+    Object.values(actionNames).forEach((value) => {
+        if (typeof value === 'object') {
+            result = result.concat(flattenActionNamesValues(value));
         } else {
-            result.push(actionNames[key]);
+            result.push(value);
         }
     });
     return result;
@@ -27,13 +26,20 @@ const getRandomDate = (): string => {
     return formattedDate;
 };
 
+const deprecatedReportActions: ReportActionName[] = [
+    CONST.REPORT.ACTIONS.TYPE.DELETED_ACCOUNT,
+    CONST.REPORT.ACTIONS.TYPE.REIMBURSEMENT_REQUESTED,
+    CONST.REPORT.ACTIONS.TYPE.REIMBURSEMENT_SETUP_REQUESTED,
+    CONST.REPORT.ACTIONS.TYPE.DONATION,
+] as const;
+
 export default function createRandomReportAction(index: number): ReportAction {
     return {
-        // we need to add any here because of the way we are generating random values
-        // eslint-disable-next-line @typescript-eslint/no-explicit-any
-        actionName: rand(flattenActionNamesValues(CONST.REPORT.ACTIONS.TYPE)) as any,
+        // We need to assert the type of actionName so that rest of the properties are inferred correctly
+        actionName: rand(
+            flattenActionNamesValues(CONST.REPORT.ACTIONS.TYPE).filter((actionType: ReportActionName) => !deprecatedReportActions.includes(actionType)),
+        ) as typeof CONST.REPORT.ACTIONS.TYPE.ADD_COMMENT,
         reportActionID: index.toString(),
-        previousReportActionID: (index === 0 ? 0 : index - 1).toString(),
         actorAccountID: index,
         person: [
             {
@@ -52,24 +58,13 @@ export default function createRandomReportAction(index: number): ReportAction {
                 isEdited: randBoolean(),
                 isDeletedParentAction: randBoolean(),
                 whisperedTo: randAggregation(),
-                reactions: [
-                    {
-                        emoji: randWord(),
-                        users: [
-                            {
-                                accountID: index,
-                                skinTone: index,
-                            },
-                        ],
-                    },
-                ],
             },
         ],
         originalMessage: {
             html: randWord(),
             lastModified: getRandomDate(),
+            whisperedTo: randAggregation(),
         },
-        whisperedToAccountIDs: randAggregation(),
         avatar: randWord(),
         automatic: randBoolean(),
         shouldShow: randBoolean(),
@@ -77,7 +72,7 @@ export default function createRandomReportAction(index: number): ReportAction {
         pendingAction: rand(Object.values(CONST.RED_BRICK_ROAD_PENDING_ACTION)),
         delegateAccountID: index,
         errors: {},
-        isAttachment: randBoolean(),
+        isAttachmentOnly: randBoolean(),
     };
 }
 
diff --git a/tests/utils/collections/userAccount.ts b/tests/utils/collections/userAccount.ts
index ebaa0a132169..9e7c33a228d5 100644
--- a/tests/utils/collections/userAccount.ts
+++ b/tests/utils/collections/userAccount.ts
@@ -7,10 +7,6 @@ function getValidAccount(credentialLogin = ''): Account {
         primaryLogin: credentialLogin,
         isLoading: false,
         requiresTwoFactorAuth: false,
-        travelSettings: {
-            accountIDs: {},
-            hasAcceptedTerms: false,
-        },
     };
 }
 
diff --git a/tests/utils/createAddListenerMock.ts b/tests/utils/createAddListenerMock.ts
new file mode 100644
index 000000000000..6196dd7296e4
--- /dev/null
+++ b/tests/utils/createAddListenerMock.ts
@@ -0,0 +1,28 @@
+type Listener = () => void;
+
+/**
+ * This is a helper function to create a mock for the addListener function of the react-navigation library.
+ * The reason we need this is because we need to trigger the transitionEnd event in our tests to simulate
+ * the transitionEnd event that is triggered when the screen transition animation is completed.
+ *
+ * @returns An object with two functions: triggerTransitionEnd and addListener
+ */
+const createAddListenerMock = () => {
+    const transitionEndListeners: Listener[] = [];
+    const triggerTransitionEnd = () => {
+        transitionEndListeners.forEach((transitionEndListener) => transitionEndListener());
+    };
+
+    const addListener = jest.fn().mockImplementation((listener, callback: Listener) => {
+        if (listener === 'transitionEnd') {
+            transitionEndListeners.push(callback);
+        }
+        return () => {
+            transitionEndListeners.filter((cb) => cb !== callback);
+        };
+    });
+
+    return {triggerTransitionEnd, addListener};
+};
+
+export default createAddListenerMock;
diff --git a/tests/utils/createOnyxMockUpdate.ts b/tests/utils/createOnyxMockUpdate.ts
index f8e28e364cf7..e50918b01faf 100644
--- a/tests/utils/createOnyxMockUpdate.ts
+++ b/tests/utils/createOnyxMockUpdate.ts
@@ -1,10 +1,10 @@
 import type {OnyxUpdate} from 'react-native-onyx';
 import type {OnyxUpdatesFromServer} from '@src/types/onyx';
 
-const createOnyxMockUpdate = (lastUpdateID: number, successData: OnyxUpdate[] = []): OnyxUpdatesFromServer => ({
+const createOnyxMockUpdate = (lastUpdateID: number, successData: OnyxUpdate[] = [], previousUpdateIDOffset = 1): OnyxUpdatesFromServer => ({
     type: 'https',
     lastUpdateID,
-    previousUpdateID: lastUpdateID - 1,
+    previousUpdateID: lastUpdateID - previousUpdateIDOffset,
     request: {
         command: 'TestCommand',
         successData,
@@ -15,7 +15,7 @@ const createOnyxMockUpdate = (lastUpdateID: number, successData: OnyxUpdate[] =
     response: {
         jsonCode: 200,
         lastUpdateID,
-        previousUpdateID: lastUpdateID - 1,
+        previousUpdateID: lastUpdateID - previousUpdateIDOffset,
         onyxData: successData,
     },
 });
diff --git a/tests/utils/debug.ts b/tests/utils/debug.ts
new file mode 100644
index 000000000000..c6c88e19376d
--- /dev/null
+++ b/tests/utils/debug.ts
@@ -0,0 +1,114 @@
+/**
+ * The debug utility that ships with react native testing library does not work properly and
+ * has limited functionality. This is a better version of it that allows logging a subtree of
+ * the app.
+ */
+
+/* eslint-disable  no-console, testing-library/no-node-access, testing-library/no-debugging-utils, @typescript-eslint/no-unsafe-call, @typescript-eslint/no-unsafe-assignment, @typescript-eslint/no-unsafe-return, @typescript-eslint/no-explicit-any, @typescript-eslint/no-unsafe-member-access */
+import type {NewPlugin} from 'pretty-format';
+import prettyFormat, {plugins} from 'pretty-format';
+import ReactIs from 'react-is';
+import type {ReactTestInstance, ReactTestRendererJSON} from 'react-test-renderer';
+
+// These are giant objects and cause the serializer to crash because the
+// output becomes too large.
+const NativeComponentPlugin: NewPlugin = {
+    // eslint-disable-next-line no-underscore-dangle
+    test: (val) => !!val?._reactInternalInstance,
+    serialize: () => 'NativeComponentInstance {}',
+};
+
+type Options = {
+    includeProps?: boolean;
+    maxDepth?: number;
+};
+
+const format = (input: ReactTestRendererJSON | ReactTestRendererJSON[], options: Options) =>
+    prettyFormat(input, {
+        plugins: [plugins.ReactTestComponent, plugins.ReactElement, NativeComponentPlugin],
+        highlight: true,
+        printBasicPrototype: false,
+        maxDepth: options.maxDepth,
+    });
+
+function getType(element: any) {
+    const type = element.type;
+    if (typeof type === 'string') {
+        return type;
+    }
+    if (typeof type === 'function') {
+        return type.displayName || type.name || 'Unknown';
+    }
+
+    if (ReactIs.isFragment(element)) {
+        return 'React.Fragment';
+    }
+    if (ReactIs.isSuspense(element)) {
+        return 'React.Suspense';
+    }
+    if (typeof type === 'object' && type !== null) {
+        if (ReactIs.isContextProvider(element)) {
+            return 'Context.Provider';
+        }
+
+        if (ReactIs.isContextConsumer(element)) {
+            return 'Context.Consumer';
+        }
+
+        if (ReactIs.isForwardRef(element)) {
+            if (type.displayName) {
+                return type.displayName;
+            }
+
+            const functionName = type.render.displayName || type.render.name || '';
+
+            return functionName === '' ? 'ForwardRef' : `ForwardRef(${functionName})`;
+        }
+
+        if (ReactIs.isMemo(element)) {
+            const functionName = type.displayName || type.type.displayName || type.type.name || '';
+
+            return functionName === '' ? 'Memo' : `Memo(${functionName})`;
+        }
+    }
+    return 'UNDEFINED';
+}
+
+function getProps(props: Record<string, unknown>, options: Options) {
+    if (!options.includeProps) {
+        return {};
+    }
+    const {children, ...propsWithoutChildren} = props;
+    return propsWithoutChildren;
+}
+
+function toJSON(node: ReactTestInstance, options: Options): ReactTestRendererJSON {
+    const json = {
+        $$typeof: Symbol.for('react.test.json'),
+        type: getType({type: node.type, $$typeof: Symbol.for('react.element')}),
+        props: getProps(node.props, options),
+        children: node.children?.map((c) => (typeof c === 'string' ? c : toJSON(c, options))) ?? null,
+    };
+
+    return json;
+}
+
+function formatNode(node: ReactTestInstance, options: Options) {
+    return format(toJSON(node, options), options);
+}
+
+/**
+ * Log a subtree of the app for debugging purposes.
+ *
+ * @example debug(screen.getByTestId('report-actions-view-wrapper'));
+ */
+export default function debug(node: ReactTestInstance | ReactTestInstance[] | null, {includeProps = true, maxDepth = Infinity}: Options = {}): void {
+    const options = {includeProps, maxDepth};
+    if (node == null) {
+        console.log('null');
+    } else if (Array.isArray(node)) {
+        console.log(node.map((n) => formatNode(n, options)).join('\n'));
+    } else {
+        console.log(formatNode(node, options));
+    }
+}
diff --git a/tests/utils/getIsUsingFakeTimers.ts b/tests/utils/getIsUsingFakeTimers.ts
index 52138276928c..b5dda6a4bac1 100644
--- a/tests/utils/getIsUsingFakeTimers.ts
+++ b/tests/utils/getIsUsingFakeTimers.ts
@@ -1,3 +1,3 @@
 type SetTimeout = typeof global.setTimeout & jest.Mock & typeof jasmine;
 
-export default () => Boolean((global.setTimeout as SetTimeout).mock || (global.setTimeout as SetTimeout).clock);
+export default () => !!((global.setTimeout as SetTimeout).mock || (global.setTimeout as SetTimeout).clock);
diff --git a/tests/utils/getPreviousVersion.ts b/tests/utils/getPreviousVersion.ts
deleted file mode 100644
index 1eecf2fe5180..000000000000
--- a/tests/utils/getPreviousVersion.ts
+++ /dev/null
@@ -1,14 +0,0 @@
-#!/usr/bin/env node
-import {getPreviousVersion} from '../../.github/libs/versionUpdater';
-
-const currentVersion = process.argv[2];
-const level = process.argv[3];
-
-/* eslint-disable no-console */
-const realConsoleLog = console.log;
-console.log = () => {};
-
-const output = getPreviousVersion(currentVersion, level);
-
-console.log = realConsoleLog;
-console.log(output);
diff --git a/tests/utils/getPullRequestsMergedBetween.ts b/tests/utils/getPullRequestsMergedBetween.ts
deleted file mode 100755
index 2bf5a0835710..000000000000
--- a/tests/utils/getPullRequestsMergedBetween.ts
+++ /dev/null
@@ -1,17 +0,0 @@
-#!/usr/bin/env node
-import GitUtils from '../../.github/libs/GitUtils';
-
-const fromRef = process.argv[2];
-const toRef = process.argv[3];
-
-/* eslint-disable no-console */
-const realConsoleLog = console.log;
-console.log = () => {};
-
-async function main() {
-    const output = await GitUtils.getPullRequestsMergedBetween(fromRef, toRef);
-
-    console.log = realConsoleLog;
-    console.log(output);
-}
-main();
diff --git a/tsconfig.json b/tsconfig.json
index 7f7b7479f44b..869627446f09 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -1,37 +1,13 @@
 {
     "$schema": "https://json.schemastore.org/tsconfig",
+    "extends": "expo/tsconfig.base",
     "compilerOptions": {
-        "target": "esnext",
         "module": "commonjs",
-        "types": ["react-native", "jest"],
-        "lib": [
-            "DOM",
-            "es2019",
-            "es2020.bigint",
-            "es2020.date",
-            "es2020.number",
-            "es2020.promise",
-            "es2020.string",
-            "es2020.symbol.wellknown",
-            "es2021.promise",
-            "es2021.string",
-            "es2021.weakref",
-            "es2022.array",
-            "es2022.object",
-            "es2022.string",
-            "ES2021.Intl",
-            "ES2023.Array"
-        ],
-        "allowJs": true,
-        "checkJs": false,
-        "jsx": "react-native",
-        "noEmit": true,
+        "types": ["react-native", "react-native-web", "jest", "node"],
+        "lib": ["DOM", "DOM.Iterable", "ESNext"],
         "isolatedModules": true,
         "strict": true,
-        "moduleResolution": "node",
-        "resolveJsonModule": true,
         "allowSyntheticDefaultImports": true,
-        "skipLibCheck": true,
         "incremental": true,
         "baseUrl": ".",
         "paths": {
@@ -48,7 +24,6 @@
             "@userActions/*": ["./src/libs/actions/*"]
         }
     },
-    "exclude": ["**/node_modules/*", "**/dist/*", ".github/actions/**/index.js", "**/docs/*"],
-    "include": ["src", "desktop", "web", "website", "docs", "assets", "config", "tests", "jest", "__mocks__", ".github/**/*", ".storybook/**/*", "workflow_tests", "scripts"],
-    "extends": "expo/tsconfig.base"
+    "include": ["src", "desktop", "web", "website", "docs", "assets", "config", "tests", "jest", "__mocks__", ".github/**/*", ".storybook/**/*", "scripts"],
+    "exclude": ["**/node_modules/*", "**/dist/*", ".github/actions/**/index.js", "**/docs/*"]
 }
diff --git a/wdyr.ts b/wdyr.ts
index 3f49eb4035a0..e5b40bc3b4c7 100644
--- a/wdyr.ts
+++ b/wdyr.ts
@@ -6,7 +6,7 @@ import Config from 'react-native-config';
 const useWDYR = Config?.USE_WDYR === 'true';
 
 if (useWDYR) {
-    const whyDidYouRender: typeof WhyDidYouRender = require('@welldone-software/why-did-you-render');
+    const whyDidYouRender = require<typeof WhyDidYouRender>('@welldone-software/why-did-you-render');
     whyDidYouRender(React, {
         // Enable tracking in all pure components by default
         trackAllPureComponents: true,
diff --git a/web/gtm.js b/web/gtm.js
deleted file mode 100644
index ee96d01b9a67..000000000000
--- a/web/gtm.js
+++ /dev/null
@@ -1,11 +0,0 @@
-/* eslint-disable no-param-reassign, prefer-template */
-(function (w, d, s, l, i) {
-    w[l] = w[l] || [];
-    w[l].push({'gtm.start': new Date().getTime(), event: 'gtm.js'});
-    const f = d.getElementsByTagName(s)[0];
-    const j = d.createElement(s);
-    const dl = l !== 'dataLayer' ? '&l=' + l : '';
-    j.async = true;
-    j.src = 'https://www.googletagmanager.com/gtm.js?id=' + i + dl;
-    f.parentNode.insertBefore(j, f);
-})(window, document, 'script', 'dataLayer', 'GTM-N4M3FLJZ');
diff --git a/web/index.html b/web/index.html
index 115803573bbd..25a650c4412d 100644
--- a/web/index.html
+++ b/web/index.html
@@ -4,7 +4,7 @@
     <meta charset="utf-8" />
     <title>New Expensify</title>
     <meta name="description" content="Corporate cards, reimbursements, receipt scanning, invoicing, and bill pay.">
-    <meta name="theme-color" content="">
+    <meta name="theme-color" content="#03D47C">
     <meta property="twitter:card" content="summary">
     <meta property="twitter:site" content="@expensify">
     <meta property="og:type" content="website">
@@ -81,18 +81,9 @@
             transition: transform var(--label-transition-duration);
         }
 
-        @media screen and (min-width: 480px) {
-            .splash-logo > svg {
-                width: 104px;
-                height: 104px;
-            }
-        }
-
-        @media screen and (max-width: 479px) {
-            .splash-logo > svg {
-                width: 52px;
-                height: 52px;
-            }
+        .splash-logo > svg {
+            width: 104px;
+            height: 104px;
         }
 
         #splash {
@@ -118,14 +109,10 @@
     <meta name="viewport" content="width=device-width, user-scalable=no, initial-scale=1, interactive-widget=resizes-content">
     <link rel="apple-touch-icon" sizes="180x180" href="/apple-touch-icon.png">
     <link rel="shortcut icon" id="favicon" href="/favicon.png">
-    <% if (htmlWebpackPlugin.options.isWeb) { %>
-        <!-- polyfill.io is only needed on Web to support older browsers. It should not be loaded for desktop -->
-        <script src="https://polyfill.io/v3/polyfill.min.js?features=default%2CResizeObserver&flags=gated"></script>
-        <% if (htmlWebpackPlugin.options.isProduction) { %>
-            <!-- Google Tag Manager -->
-            <script async="" src="gtm.js"></script>
-            <!-- End Google Tag Manager -->
-        <% } %>
+    <% if (htmlWebpackPlugin.options.isWeb && htmlWebpackPlugin.options.isProduction) { %>
+        <!-- Third party scripts -->
+        <script async="" src="thirdPartyScripts.js"></script>
+        <!-- End Third party scripts -->
     <% } %>
     <link rel="manifest" href="/manifest.json" />
 </head>
@@ -136,7 +123,7 @@
         <!-- End Google Tag Manager (noscript) -->
     <% } %>
     <div style="position: absolute; top: 0; left: 0; right: 0; height: 30px;" data-drag-area="true"></div>
-    <div id="root"></div>
+    <div id="root" class="fs-unmask"></div>
     <div id="splash">
         <div class="splash-logo">
             <%= htmlWebpackPlugin.options.splashLogo %>
diff --git a/web/proxy.ts b/web/proxy.ts
index 6660db3f5e87..a72c428afe75 100644
--- a/web/proxy.ts
+++ b/web/proxy.ts
@@ -27,6 +27,18 @@ const server = http.createServer((request: IncomingMessage, response: ServerResp
     let hostname = host;
     let requestPath = request.url;
 
+    // Add CORS headers
+    response.setHeader('Access-Control-Allow-Origin', '*');
+    response.setHeader('Access-Control-Allow-Methods', 'GET, POST, PUT, DELETE, OPTIONS');
+    response.setHeader('Access-Control-Allow-Headers', 'Content-Type, Authorization, X-Requested-With');
+
+    // Handle preflight requests
+    if (request.method === 'OPTIONS') {
+        response.writeHead(200);
+        response.end();
+        return;
+    }
+
     /**
      * When a request is matching a proxy config path we might direct it to a different host (e.g. staging)
      * For requests matching proxy config patterns we replace the mapping url (prefix) with the actual path.
diff --git a/web/thirdPartyScripts.js b/web/thirdPartyScripts.js
new file mode 100644
index 000000000000..15e77dbd490e
--- /dev/null
+++ b/web/thirdPartyScripts.js
@@ -0,0 +1,155 @@
+/* eslint-disable */
+// Google Tag Manager
+(function (w, d, s, l, i) {
+    w[l] = w[l] || [];
+    w[l].push({'gtm.start': new Date().getTime(), event: 'gtm.js'});
+    const f = d.getElementsByTagName(s)[0];
+    const j = d.createElement(s);
+    const dl = l !== 'dataLayer' ? '&l=' + l : '';
+    j.async = true;
+    j.src = 'https://www.googletagmanager.com/gtm.js?id=' + i + dl;
+    f.parentNode.insertBefore(j, f);
+})(window, document, 'script', 'dataLayer', 'GTM-N4M3FLJZ');
+
+// FullStory
+window['_fs_host'] = 'fullstory.com';
+window['_fs_script'] = 'edge.fullstory.com/s/fs.js';
+window['_fs_org'] = 'o-1WN56P-na1';
+window['_fs_namespace'] = 'FS';
+!(function (m, n, e, t, l, o, g, y) {
+    var s,
+        f,
+        a = (function (h) {
+            return !(h in m) || (m.console && m.console.log && m.console.log('FullStory namespace conflict. Please set window["_fs_namespace"].'), !1);
+        })(e);
+    function p(b) {
+        var h,
+            d = [];
+        function j() {
+            h &&
+                (d.forEach(function (b) {
+                    var d;
+                    try {
+                        d = b[h[0]] && b[h[0]](h[1]);
+                    } catch (h) {
+                        return void (b[3] && b[3](h));
+                    }
+                    d && d.then ? d.then(b[2], b[3]) : b[2] && b[2](d);
+                }),
+                (d.length = 0));
+        }
+        function r(b) {
+            return function (d) {
+                h || ((h = [b, d]), j());
+            };
+        }
+        return (
+            b(r(0), r(1)),
+            {
+                then: function (b, h) {
+                    return p(function (r, i) {
+                        d.push([b, h, r, i]), j();
+                    });
+                },
+            }
+        );
+    }
+    a &&
+        ((g = m[e] =
+            (function () {
+                var b = function (b, d, j, r) {
+                    function i(i, c) {
+                        h(b, d, j, i, c, r);
+                    }
+                    r = r || 2;
+                    var c,
+                        u = /Async$/;
+                    return u.test(b) ? ((b = b.replace(u, '')), 'function' == typeof Promise ? new Promise(i) : p(i)) : h(b, d, j, c, c, r);
+                };
+                function h(h, d, j, r, i, c) {
+                    return b._api ? b._api(h, d, j, r, i, c) : (b.q && b.q.push([h, d, j, r, i, c]), null);
+                }
+                return (b.q = []), b;
+            })()),
+        (y = function (b) {
+            function h(h) {
+                'function' == typeof h[4] && h[4](new Error(b));
+            }
+            var d = g.q;
+            if (d) {
+                for (var j = 0; j < d.length; j++) h(d[j]);
+                (d.length = 0), (d.push = h);
+            }
+        }),
+        (function () {
+            ((o = n.createElement(t)).async = !0),
+                (o.crossOrigin = 'anonymous'),
+                (o.src = 'https://' + l),
+                (o.onerror = function () {
+                    y('Error loading ' + l);
+                });
+            var b = n.getElementsByTagName(t)[0];
+            b && b.parentNode ? b.parentNode.insertBefore(o, b) : n.head.appendChild(o);
+        })(),
+        (function () {
+            function b() {}
+            function h(b, h, d) {
+                g(b, h, d, 1);
+            }
+            function d(b, d, j) {
+                h('setProperties', {type: b, properties: d}, j);
+            }
+            function j(b, h) {
+                d('user', b, h);
+            }
+            function r(b, h, d) {
+                j(
+                    {
+                        uid: b,
+                    },
+                    d,
+                ),
+                    h && j(h, d);
+            }
+            (g.identify = r),
+                (g.setUserVars = j),
+                (g.identifyAccount = b),
+                (g.clearUserCookie = b),
+                (g.setVars = d),
+                (g.event = function (b, d, j) {
+                    h(
+                        'trackEvent',
+                        {
+                            name: b,
+                            properties: d,
+                        },
+                        j,
+                    );
+                }),
+                (g.anonymize = function () {
+                    r(!1);
+                }),
+                (g.shutdown = function () {
+                    h('shutdown');
+                }),
+                (g.restart = function () {
+                    h('restart');
+                }),
+                (g.log = function (b, d) {
+                    h('log', {level: b, msg: d});
+                }),
+                (g.consent = function (b) {
+                    h('setIdentity', {consent: !arguments.length || b});
+                });
+        })(),
+        (s = 'fetch'),
+        (f = 'XMLHttpRequest'),
+        (g._w = {}),
+        (g._w[f] = m[f]),
+        (g._w[s] = m[s]),
+        m[s] &&
+            (m[s] = function () {
+                return g._w[s].apply(this, arguments);
+            }),
+        (g._v = '2.0.0'));
+})(window, document, window._fs_namespace, 'script', window._fs_script);
diff --git a/workflow_tests/README.md b/workflow_tests/README.md
deleted file mode 100644
index b55e2691d13e..000000000000
--- a/workflow_tests/README.md
+++ /dev/null
@@ -1,422 +0,0 @@
-# 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',
-);
-```
-
-### `createMockStep`
-`createMockStep` 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.createMockStep(
-    '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',
-}
-```
-
-### `createStepAssertion`
-`createStepAssertion` allows for creating uniform assertions for output from executed step, compatible with step mocks provided by `createMockStep`
-
-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.createStepAssertion(
-    '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 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.createMockStep('<step_2_1_name>', '<message>'),
-                utils.createMockStep('<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 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.createMockStep()` (`<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.createMockStep('<step_2_1_name>', '<message>'),
-        utils.createMockStep('<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 `createStepAssertion()` 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.ts b/workflow_tests/assertions/authorChecklistAssertions.ts
deleted file mode 100644
index 997eac2d3ea9..000000000000
--- a/workflow_tests/assertions/authorChecklistAssertions.ts
+++ /dev/null
@@ -1,19 +0,0 @@
-import type {Step} from '@kie/act-js';
-import {createStepAssertion} from '../utils/utils';
-
-function assertChecklistJobExecuted(workflowResult: Step[], didExecute = true) {
-    const steps = [
-        createStepAssertion('Checkout', true, null, 'CHECKLIST', 'Checkout'),
-        createStepAssertion('authorChecklist.ts', true, null, 'CHECKLIST', 'Running authorChecklist.ts', [{key: 'GITHUB_TOKEN', value: '***'}], []),
-    ] as const;
-
-    steps.forEach((expectedStep) => {
-        if (didExecute) {
-            expect(workflowResult).toEqual(expect.arrayContaining([expectedStep]));
-        } else {
-            expect(workflowResult).not.toEqual(expect.arrayContaining([expectedStep]));
-        }
-    });
-}
-
-export default {assertChecklistJobExecuted};
diff --git a/workflow_tests/assertions/cherryPickAssertions.ts b/workflow_tests/assertions/cherryPickAssertions.ts
deleted file mode 100644
index 8cf5dbd56d54..000000000000
--- a/workflow_tests/assertions/cherryPickAssertions.ts
+++ /dev/null
@@ -1,116 +0,0 @@
-import type {Step} from '@kie/act-js';
-import {createStepAssertion} from '../utils/utils';
-
-function assertValidateActorJobExecuted(workflowResult: Step[], didExecute = true) {
-    const steps = [createStepAssertion('Check if user is deployer', true, null, 'VALIDATEACTOR', 'Checking if user is a deployer', [], [{key: 'GITHUB_TOKEN', value: '***'}])] as const;
-
-    steps.forEach((expectedStep) => {
-        if (didExecute) {
-            expect(workflowResult).toEqual(expect.arrayContaining([expectedStep]));
-        } else {
-            expect(workflowResult).not.toEqual(expect.arrayContaining([expectedStep]));
-        }
-    });
-}
-
-function assertCreateNewVersionJobExecuted(workflowResult: Step[], didExecute = true) {
-    const steps = [createStepAssertion('Create new version', true, null, 'CREATENEWVERSION', 'Creating new version', [], [])] as const;
-
-    steps.forEach((expectedStep) => {
-        if (didExecute) {
-            expect(workflowResult).toEqual(expect.arrayContaining([expectedStep]));
-        } else {
-            expect(workflowResult).not.toEqual(expect.arrayContaining([expectedStep]));
-        }
-    });
-}
-
-function assertCherryPickJobExecuted(workflowResult: Step[], user = 'Dummy Author', pullRequestNumber = '1234', didExecute = true, hasConflicts = false, isSuccessful = true) {
-    const steps = [
-        createStepAssertion(
-            'Checkout staging branch',
-            true,
-            null,
-            'CHERRYPICK',
-            'Checking out staging branch',
-            [
-                {key: 'ref', value: 'staging'},
-                {key: 'token', value: '***'},
-            ],
-            [],
-        ),
-        createStepAssertion('Set up git for OSBotify', true, null, 'CHERRYPICK', 'Setting up git for OSBotify', [{key: 'GPG_PASSPHRASE', value: '***'}], []),
-        createStepAssertion('Get previous app version', true, null, 'CHERRYPICK', 'Get previous app version', [{key: 'SEMVER_LEVEL', value: 'PATCH'}]),
-        createStepAssertion('Fetch history of relevant refs', true, null, 'CHERRYPICK', 'Fetch history of relevant refs'),
-        createStepAssertion('Get version bump commit', true, null, 'CHERRYPICK', 'Get version bump commit', [], []),
-        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},
-            ],
-            [],
-        ),
-        createStepAssertion('Cherry-pick the version-bump to staging', true, null, 'CHERRYPICK', 'Cherry-picking the version-bump to staging', [], []),
-        createStepAssertion('Cherry-pick the merge commit of target PR', true, null, 'CHERRYPICK', 'Cherry-picking the merge commit of target PR', [], []),
-        createStepAssertion('Push changes', true, null, 'CHERRYPICK', 'Pushing changes', [], []),
-    ] as const;
-
-    steps.forEach((expectedStep) => {
-        if (didExecute) {
-            expect(workflowResult).toEqual(expect.arrayContaining([expectedStep]));
-        } else {
-            expect(workflowResult).not.toEqual(expect.arrayContaining([expectedStep]));
-        }
-    });
-
-    const conflictSteps = [
-        createStepAssertion(
-            'Create Pull Request to manually finish CP',
-            true,
-            null,
-            'CHERRYPICK',
-            'Creating Pull Request to manually finish CP',
-            [],
-            [{key: 'GITHUB_TOKEN', value: 'os_botify_api_token'}],
-        ),
-    ] as const;
-
-    conflictSteps.forEach((step) => {
-        if (didExecute && hasConflicts) {
-            expect(workflowResult).toEqual(expect.arrayContaining([step]));
-        } else {
-            expect(workflowResult).not.toEqual(expect.arrayContaining([step]));
-        }
-    });
-
-    const failedSteps = [
-        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: '***'},
-            ],
-        ),
-    ] as const;
-
-    failedSteps.forEach((step) => {
-        if (didExecute && !isSuccessful) {
-            expect(workflowResult).toEqual(expect.arrayContaining([step]));
-        } else {
-            expect(workflowResult).not.toEqual(expect.arrayContaining([step]));
-        }
-    });
-}
-
-export default {assertValidateActorJobExecuted, assertCreateNewVersionJobExecuted, assertCherryPickJobExecuted};
diff --git a/workflow_tests/assertions/claAssertions.ts b/workflow_tests/assertions/claAssertions.ts
deleted file mode 100644
index 401e094923dc..000000000000
--- a/workflow_tests/assertions/claAssertions.ts
+++ /dev/null
@@ -1,73 +0,0 @@
-import type {Step} from '@kie/act-js';
-import {createStepAssertion} from '../utils/utils';
-
-function assertCLAJobExecuted(workflowResult: Step[], commentBody = '', githubRepository = '', didExecute = true, runAssistant = true) {
-    const steps = [
-        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*'},
-            ],
-            [],
-        ),
-        createStepAssertion(
-            'CLA comment re-check',
-            true,
-            null,
-            'CLA',
-            'CLA comment re-check',
-            [
-                {key: 'text', value: commentBody},
-                {key: 'regex', value: '\\s*recheck\\s*'},
-            ],
-            [],
-        ),
-    ] as const;
-
-    steps.forEach((expectedStep) => {
-        if (didExecute) {
-            expect(workflowResult).toEqual(expect.arrayContaining([expectedStep]));
-        } else {
-            expect(workflowResult).not.toEqual(expect.arrayContaining([expectedStep]));
-        }
-    });
-
-    const assistantSteps = [
-        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: '***'},
-            ],
-        ),
-    ] as const;
-
-    assistantSteps.forEach((step) => {
-        if (didExecute && runAssistant) {
-            expect(workflowResult).toEqual(expect.arrayContaining([step]));
-        } else {
-            expect(workflowResult).not.toEqual(expect.arrayContaining([step]));
-        }
-    });
-}
-
-// eslint-disable-next-line import/prefer-default-export
-export {assertCLAJobExecuted};
diff --git a/workflow_tests/assertions/createNewVersionAssertions.ts b/workflow_tests/assertions/createNewVersionAssertions.ts
deleted file mode 100644
index 253a44060c76..000000000000
--- a/workflow_tests/assertions/createNewVersionAssertions.ts
+++ /dev/null
@@ -1,71 +0,0 @@
-import type {Step} from '@kie/act-js';
-import {createStepAssertion} from '../utils/utils';
-
-function assertValidateActorJobExecuted(workflowResult: Step[], didExecute = true) {
-    const steps = [createStepAssertion('Get user permissions', true, null, 'VALIDATEACTOR', 'Get user permissions', [], [{key: 'GITHUB_TOKEN', value: '***'}])] as const;
-
-    steps.forEach((expectedStep) => {
-        if (didExecute) {
-            expect(workflowResult).toEqual(expect.arrayContaining([expectedStep]));
-        } else {
-            expect(workflowResult).not.toEqual(expect.arrayContaining([expectedStep]));
-        }
-    });
-}
-
-function assertCreateNewVersionJobExecuted(workflowResult: Step[], semverLevel = 'BUILD', didExecute = true, isSuccessful = true) {
-    const steps = [
-        createStepAssertion('Run turnstyle', true, null, 'CREATENEWVERSION', 'Run turnstyle', [{key: 'poll-interval-seconds', value: '10'}], [{key: 'GITHUB_TOKEN', value: '***'}]),
-        createStepAssertion(
-            'Check out',
-            true,
-            null,
-            'CREATENEWVERSION',
-            'Check out',
-            [
-                {key: 'ref', value: 'main'},
-                {key: 'token', value: '***'},
-            ],
-            [],
-        ),
-        createStepAssertion('Setup git for OSBotify', true, null, 'CREATENEWVERSION', 'Setup git for OSBotify', [{key: 'GPG_PASSPHRASE', value: '***'}], []),
-        createStepAssertion(
-            'Generate version',
-            true,
-            null,
-            'CREATENEWVERSION',
-            'Generate version',
-            [
-                {key: 'GITHUB_TOKEN', value: '***'},
-                {key: 'SEMVER_LEVEL', value: semverLevel},
-            ],
-            [],
-        ),
-        createStepAssertion('Commit new version', true, null, 'CREATENEWVERSION', 'Commit new version', [], []),
-        createStepAssertion('Update main branch', true, null, 'CREATENEWVERSION', 'Update main branch', [], []),
-    ] as const;
-
-    steps.forEach((expectedStep) => {
-        if (didExecute) {
-            if (isSuccessful) {
-                expect(workflowResult).toEqual(expect.arrayContaining([expectedStep]));
-            }
-        } else {
-            expect(workflowResult).not.toEqual(expect.arrayContaining([expectedStep]));
-        }
-    });
-
-    const failedSteps = [
-        createStepAssertion('Announce failed workflow in Slack', true, null, 'CREATENEWVERSION', 'Announce failed workflow in Slack', [{key: 'SLACK_WEBHOOK', value: '***'}], []),
-    ] as const;
-
-    failedSteps.forEach((step) => {
-        if (didExecute && !isSuccessful) {
-            expect(workflowResult).toEqual(expect.arrayContaining([step]));
-        } else {
-            expect(workflowResult).not.toEqual(expect.arrayContaining([step]));
-        }
-    });
-}
-
-export default {assertValidateActorJobExecuted, assertCreateNewVersionJobExecuted};
diff --git a/workflow_tests/assertions/deployAssertions.ts b/workflow_tests/assertions/deployAssertions.ts
deleted file mode 100644
index c5106ab6d945..000000000000
--- a/workflow_tests/assertions/deployAssertions.ts
+++ /dev/null
@@ -1,69 +0,0 @@
-import type {Step} from '@kie/act-js';
-import {createStepAssertion} from '../utils/utils';
-
-function assertDeployStagingJobExecuted(workflowResult: Step[], didExecute = true) {
-    const steps = [
-        createStepAssertion('Checkout staging branch', true, null, 'DEPLOY_STAGING', 'Checking out staging branch', [
-            {key: 'ref', value: 'staging'},
-            {key: 'token', value: '***'},
-        ]),
-        createStepAssertion('Setup git for OSBotify', true, null, 'DEPLOY_STAGING', 'Setting up git for OSBotify', [
-            {key: 'GPG_PASSPHRASE', value: '***'},
-            {key: 'OS_BOTIFY_APP_ID', value: '***'},
-            {key: 'OS_BOTIFY_PRIVATE_KEY', value: '***'},
-        ]),
-        createStepAssertion('Tag version', true, null, 'DEPLOY_STAGING', 'Tagging new version'),
-        createStepAssertion('🚀 Push tags to trigger staging deploy 🚀', true, null, 'DEPLOY_STAGING', 'Pushing tag to trigger staging deploy'),
-    ] as const;
-
-    steps.forEach((expectedStep) => {
-        if (didExecute) {
-            expect(workflowResult).toEqual(expect.arrayContaining([expectedStep]));
-        } else {
-            expect(workflowResult).not.toEqual(expect.arrayContaining([expectedStep]));
-        }
-    });
-}
-
-function assertDeployProductionJobExecuted(workflowResult: Step[], didExecute = true) {
-    const steps = [
-        createStepAssertion('Checkout', true, null, 'DEPLOY_PRODUCTION', 'Checking out', [
-            {key: 'ref', value: 'production'},
-            {key: 'token', value: '***'},
-        ]),
-        createStepAssertion('Setup git for OSBotify', true, null, 'DEPLOY_PRODUCTION', 'Setting up git for OSBotify', [
-            {key: 'GPG_PASSPHRASE', value: '***'},
-            {key: 'OS_BOTIFY_APP_ID', value: '***'},
-            {key: 'OS_BOTIFY_PRIVATE_KEY', value: '***'},
-        ]),
-        createStepAssertion('Get current app version', true, null, 'DEPLOY_PRODUCTION', 'Getting current app version'),
-        createStepAssertion('Get Release Pull Request List', true, null, 'DEPLOY_PRODUCTION', 'Getting release PR list', [
-            {key: 'TAG', value: '1.2.3'},
-            {key: 'GITHUB_TOKEN', value: 'os_botify_api_token'},
-            {key: 'IS_PRODUCTION_DEPLOY', value: 'true'},
-        ]),
-        createStepAssertion('Generate Release Body', true, null, 'DEPLOY_PRODUCTION', 'Generating release body', [{key: 'PR_LIST', value: '[1.2.1, 1.2.2]'}]),
-        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: 'os_botify_api_token'}],
-        ),
-    ] as const;
-
-    steps.forEach((expectedStep) => {
-        if (didExecute) {
-            expect(workflowResult).toEqual(expect.arrayContaining([expectedStep]));
-        } else {
-            expect(workflowResult).not.toEqual(expect.arrayContaining([expectedStep]));
-        }
-    });
-}
-
-export default {assertDeployStagingJobExecuted, assertDeployProductionJobExecuted};
diff --git a/workflow_tests/assertions/deployBlockerAssertions.ts b/workflow_tests/assertions/deployBlockerAssertions.ts
deleted file mode 100644
index 3d031dda5d74..000000000000
--- a/workflow_tests/assertions/deployBlockerAssertions.ts
+++ /dev/null
@@ -1,84 +0,0 @@
-import type {Step} from '@kie/act-js';
-import {createStepAssertion} from '../utils/utils';
-
-function assertUpdateChecklistJobExecuted(workflowResult: Step[], didExecute = true, isSuccessful = true) {
-    const steps = [createStepAssertion('updateChecklist', true, null, 'UPDATECHECKLIST', 'Run updateChecklist')] as const;
-
-    steps.forEach((expectedStep) => {
-        if (didExecute) {
-            if (isSuccessful) {
-                expect(workflowResult).toEqual(expect.arrayContaining([expectedStep]));
-            }
-        } else {
-            expect(workflowResult).not.toEqual(expect.arrayContaining([expectedStep]));
-        }
-    });
-}
-
-function assertDeployBlockerJobExecuted(workflowResult: Step[], didExecute = true, isSuccessful = true, failsAt = -1) {
-    const steps = [
-        createStepAssertion('Checkout', true, null, 'DEPLOYBLOCKER', 'Checkout'),
-        createStepAssertion(
-            'Give the issue/PR the Hourly, Engineering labels',
-            true,
-            null,
-            'DEPLOYBLOCKER',
-            'Give the issue/PR the Hourly, Engineering labels',
-            [],
-            [{key: 'GITHUB_TOKEN', value: '***'}],
-        ),
-        createStepAssertion('Comment on deploy blocker', true, null, 'DEPLOYBLOCKER', 'Comment on deploy blocker', [], [{key: 'GITHUB_TOKEN', value: '***'}]),
-    ] as const;
-
-    steps.forEach((expectedStep, i) => {
-        if (didExecute) {
-            if (failsAt === -1 || i < failsAt) {
-                expect(workflowResult).toEqual(expect.arrayContaining([expectedStep]));
-            } else if (i === failsAt) {
-                steps[i].status = 1;
-                expect(workflowResult).toEqual(expect.arrayContaining([expectedStep]));
-            } else {
-                expect(workflowResult).not.toEqual(expect.arrayContaining([expectedStep]));
-            }
-        } else {
-            expect(workflowResult).not.toEqual(expect.arrayContaining([expectedStep]));
-        }
-    });
-
-    const successSteps = [
-        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: '***'},
-            ],
-        ),
-    ] as const;
-
-    successSteps.forEach((step) => {
-        if (didExecute && isSuccessful) {
-            expect(workflowResult).toEqual(expect.arrayContaining([step]));
-        } else {
-            expect(workflowResult).not.toEqual(expect.arrayContaining([step]));
-        }
-    });
-
-    const failedSteps = [
-        createStepAssertion('Announce failed workflow in Slack', true, null, 'DEPLOYBLOCKER', 'Announce failed workflow in Slack', [{key: 'SLACK_WEBHOOK', value: '***'}], []),
-    ] as const;
-
-    failedSteps.forEach((step) => {
-        if (didExecute && !isSuccessful) {
-            expect(workflowResult).toEqual(expect.arrayContaining([step]));
-        } else {
-            expect(workflowResult).not.toEqual(expect.arrayContaining([step]));
-        }
-    });
-}
-
-export default {assertUpdateChecklistJobExecuted, assertDeployBlockerJobExecuted};
diff --git a/workflow_tests/assertions/failureNotifierAssertions.ts b/workflow_tests/assertions/failureNotifierAssertions.ts
deleted file mode 100644
index 37be4e872d32..000000000000
--- a/workflow_tests/assertions/failureNotifierAssertions.ts
+++ /dev/null
@@ -1,19 +0,0 @@
-import type {Step} from '@kie/act-js';
-import {createStepAssertion} from '../utils/utils';
-
-function assertNotifyFailureJobExecuted(workflowResult: Step[], didExecute = true) {
-    const steps = [
-        createStepAssertion('Fetch Workflow Run Jobs', true, null, 'NOTIFYFAILURE', 'Fetch Workflow Run Jobs', [], []),
-        createStepAssertion('Process Each Failed Job', true, null, 'NOTIFYFAILURE', 'Process Each Failed Job', [], []),
-    ] as const;
-
-    for (const expectedStep of steps) {
-        if (didExecute) {
-            expect(workflowResult).toEqual(expect.arrayContaining([expectedStep]));
-        } else {
-            expect(workflowResult).not.toEqual(expect.arrayContaining([expectedStep]));
-        }
-    }
-}
-
-export default {assertNotifyFailureJobExecuted};
diff --git a/workflow_tests/assertions/finishReleaseCycleAssertions.ts b/workflow_tests/assertions/finishReleaseCycleAssertions.ts
deleted file mode 100644
index 5750200affae..000000000000
--- a/workflow_tests/assertions/finishReleaseCycleAssertions.ts
+++ /dev/null
@@ -1,194 +0,0 @@
-import type {Step} from '@kie/act-js';
-import {createStepAssertion} from '../utils/utils';
-
-function assertValidateJobExecuted(workflowResult: Step[], issueNumber = '', didExecute = true, isTeamMember = true, hasBlockers = false, isSuccessful = true) {
-    const steps = [
-        createStepAssertion('Checkout', true, null, 'VALIDATE', 'Checkout', [
-            {key: 'ref', value: 'main'},
-            {key: 'token', value: '***'},
-        ]),
-        createStepAssertion('Setup git for OSBotify', true, null, 'VALIDATE', 'Setup git for OSBotify', [
-            {key: 'GPG_PASSPHRASE', value: '***'},
-            {key: 'OS_BOTIFY_APP_ID', value: '***'},
-            {key: 'OS_BOTIFY_PRIVATE_KEY', value: '***'},
-        ]),
-        createStepAssertion('Validate actor is deployer', true, null, 'VALIDATE', 'Validating if actor is deployer', [], [{key: 'GITHUB_TOKEN', value: 'os_botify_api_token'}]),
-    ];
-
-    if (isTeamMember) {
-        steps.push(
-            createStepAssertion(
-                'Check for any deploy blockers',
-                true,
-                null,
-                'VALIDATE',
-                'Checking for deploy blockers',
-                [
-                    {key: 'GITHUB_TOKEN', value: 'os_botify_api_token'},
-                    {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 = [
-        createStepAssertion(
-            'Reopen and comment on issue (not a team member)',
-            true,
-            null,
-            'VALIDATE',
-            'Reopening issue - not a team member',
-            [
-                {key: 'GITHUB_TOKEN', value: 'os_botify_api_token'},
-                {key: 'ISSUE_NUMBER', value: issueNumber},
-                {key: 'COMMENT', value: 'Sorry, only members of @Expensify/Mobile-Deployers can close deploy checklists.\nReopening!'},
-            ],
-            [],
-        ),
-    ] as const;
-
-    notTeamMemberSteps.forEach((expectedStep) => {
-        if (didExecute && !isTeamMember) {
-            expect(workflowResult).toEqual(expect.arrayContaining([expectedStep]));
-        } else {
-            expect(workflowResult).not.toEqual(expect.arrayContaining([expectedStep]));
-        }
-    });
-
-    const blockerSteps = [
-        createStepAssertion(
-            'Reopen and comment on issue (has blockers)',
-            true,
-            null,
-            'VALIDATE',
-            'Reopening issue - blockers',
-            [
-                {key: 'GITHUB_TOKEN', value: 'os_botify_api_token'},
-                {key: 'ISSUE_NUMBER', value: issueNumber},
-            ],
-            [],
-        ),
-    ] as const;
-
-    blockerSteps.forEach((expectedStep) => {
-        if (didExecute && hasBlockers) {
-            expect(workflowResult).toEqual(expect.arrayContaining([expectedStep]));
-        } else {
-            expect(workflowResult).not.toEqual(expect.arrayContaining([expectedStep]));
-        }
-    });
-
-    const failedSteps = [
-        createStepAssertion('Announce failed workflow in Slack', true, null, 'VALIDATE', 'Announce failed workflow in Slack', [{key: 'SLACK_WEBHOOK', value: '***'}], []),
-    ] as const;
-
-    failedSteps.forEach((expectedStep) => {
-        if (didExecute && !isSuccessful) {
-            expect(workflowResult).toEqual(expect.arrayContaining([expectedStep]));
-        } else {
-            expect(workflowResult).not.toEqual(expect.arrayContaining([expectedStep]));
-        }
-    });
-}
-
-function assertUpdateProductionJobExecuted(workflowResult: Step[], didExecute = true, isSuccessful = true) {
-    const steps = [
-        createStepAssertion(
-            'Checkout',
-            true,
-            null,
-            'UPDATEPRODUCTION',
-            'Checkout',
-            [
-                {key: 'ref', value: 'staging'},
-                {key: 'token', value: '***'},
-            ],
-            [],
-        ),
-        createStepAssertion('Setup git for OSBotify', true, null, 'UPDATEPRODUCTION', 'Setup git for OSBotify', [{key: 'GPG_PASSPHRASE', value: '***'}], []),
-        createStepAssertion('Update production branch', true, null, 'UPDATEPRODUCTION', 'Updating production branch', [], []),
-    ] as const;
-
-    steps.forEach((expectedStep) => {
-        if (didExecute) {
-            expect(workflowResult).toEqual(expect.arrayContaining([expectedStep]));
-        } else {
-            expect(workflowResult).not.toEqual(expect.arrayContaining([expectedStep]));
-        }
-    });
-
-    const failedSteps = [
-        createStepAssertion('Announce failed workflow in Slack', true, null, 'UPDATEPRODUCTION', 'Announce failed workflow in Slack', [{key: 'SLACK_WEBHOOK', value: '***'}], []),
-    ] as const;
-
-    failedSteps.forEach((expectedStep) => {
-        if (didExecute && !isSuccessful) {
-            expect(workflowResult).toEqual(expect.arrayContaining([expectedStep]));
-        } else {
-            expect(workflowResult).not.toEqual(expect.arrayContaining([expectedStep]));
-        }
-    });
-}
-
-function assertCreateNewPatchVersionJobExecuted(workflowResult: Step[], didExecute = true) {
-    const steps = [createStepAssertion('Create new version', true, null, 'CREATENEWPATCHVERSION', 'Creating new version', [{key: 'SEMVER_LEVEL', value: 'PATCH'}], [])] as const;
-
-    steps.forEach((expectedStep) => {
-        if (didExecute) {
-            expect(workflowResult).toEqual(expect.arrayContaining([expectedStep]));
-        } else {
-            expect(workflowResult).not.toEqual(expect.arrayContaining([expectedStep]));
-        }
-    });
-}
-
-function assertUpdateStagingJobExecuted(workflowResult: Step[], didExecute = true, isSuccessful = true) {
-    const steps = [
-        createStepAssertion(
-            'Checkout',
-            true,
-            null,
-            'UPDATESTAGING',
-            'Checkout',
-            [
-                {key: 'ref', value: 'main'},
-                {key: 'token', value: '***'},
-            ],
-            [],
-        ),
-        createStepAssertion('Setup git for OSBotify', true, null, 'UPDATESTAGING', 'Setup git for OSBotify', [{key: 'GPG_PASSPHRASE', value: '***'}], []),
-        createStepAssertion('Update staging branch to trigger staging deploy', true, null, 'UPDATESTAGING', 'Updating staging branch', [], []),
-    ] as const;
-
-    steps.forEach((expectedStep) => {
-        if (didExecute) {
-            expect(workflowResult).toEqual(expect.arrayContaining([expectedStep]));
-        } else {
-            expect(workflowResult).not.toEqual(expect.arrayContaining([expectedStep]));
-        }
-    });
-
-    const failedSteps = [
-        createStepAssertion('Announce failed workflow in Slack', true, null, 'UPDATESTAGING', 'Announce failed workflow in Slack', [{key: 'SLACK_WEBHOOK', value: '***'}], []),
-    ] as const;
-
-    failedSteps.forEach((expectedStep) => {
-        if (didExecute && !isSuccessful) {
-            expect(workflowResult).toEqual(expect.arrayContaining([expectedStep]));
-        } else {
-            expect(workflowResult).not.toEqual(expect.arrayContaining([expectedStep]));
-        }
-    });
-}
-
-export default {assertValidateJobExecuted, assertUpdateProductionJobExecuted, assertCreateNewPatchVersionJobExecuted, assertUpdateStagingJobExecuted};
diff --git a/workflow_tests/assertions/lintAssertions.ts b/workflow_tests/assertions/lintAssertions.ts
deleted file mode 100644
index 488ec31df95f..000000000000
--- a/workflow_tests/assertions/lintAssertions.ts
+++ /dev/null
@@ -1,22 +0,0 @@
-import type {Step} from '@kie/act-js';
-import {createStepAssertion} from '../utils/utils';
-
-function assertLintJobExecuted(workflowResult: Step[], didExecute = true) {
-    const steps = [
-        createStepAssertion('Checkout', true, null, 'LINT', 'Checkout', [], []),
-        createStepAssertion('Setup Node', true, null, 'LINT', 'Setup Node', [], []),
-        createStepAssertion('Lint JavaScript and Typescript with ESLint', true, null, 'LINT', 'Lint JavaScript with ESLint', [], [{key: 'CI', value: 'true'}]),
-        createStepAssertion("Verify there's no Prettier diff", true, null, 'LINT', 'Verify theres no Prettier diff', [], []),
-        createStepAssertion('Run unused style searcher', true, null, 'LINT', 'Run unused style searcher', [], []),
-    ] as const;
-
-    steps.forEach((expectedStep) => {
-        if (didExecute) {
-            expect(workflowResult).toEqual(expect.arrayContaining([expectedStep]));
-        } else {
-            expect(workflowResult).not.toEqual(expect.arrayContaining([expectedStep]));
-        }
-    });
-}
-
-export default {assertLintJobExecuted};
diff --git a/workflow_tests/assertions/lockDeploysAssertions.ts b/workflow_tests/assertions/lockDeploysAssertions.ts
deleted file mode 100644
index 467e20bc5047..000000000000
--- a/workflow_tests/assertions/lockDeploysAssertions.ts
+++ /dev/null
@@ -1,74 +0,0 @@
-import type {Step} from '@kie/act-js';
-import {createStepAssertion} from '../utils/utils';
-
-function assertlockStagingDeploysJobExecuted(workflowResult: Step[], didExecute = true, isSuccessful = true) {
-    const steps = [
-        createStepAssertion(
-            'Checkout',
-            true,
-            null,
-            'LOCKSTAGINGDEPLOYS',
-            'Checking out',
-            [
-                {key: 'ref', value: 'main'},
-                {key: 'token', value: '***'},
-            ],
-            [],
-        ),
-        createStepAssertion('Wait for staging deploys to finish', true, null, 'LOCKSTAGINGDEPLOYS', 'Waiting for staging deploys to finish', [{key: 'GITHUB_TOKEN', value: '***'}], []),
-        createStepAssertion(
-            'Comment in StagingDeployCash to give Applause the 🟢 to begin QA',
-            true,
-            null,
-            'LOCKSTAGINGDEPLOYS',
-            'Commenting in StagingDeployCash',
-            [],
-            [{key: 'GITHUB_TOKEN', value: '***'}],
-        ),
-    ] as const;
-
-    steps.forEach((expectedStep) => {
-        if (didExecute) {
-            expect(workflowResult).toEqual(expect.arrayContaining([expectedStep]));
-        } else {
-            expect(workflowResult).not.toEqual(expect.arrayContaining([expectedStep]));
-        }
-    });
-
-    const failProdSteps = [
-        createStepAssertion('Announce failed workflow', true, null, 'LOCKSTAGINGDEPLOYS', 'Announcing failed workflow in Slack', [{key: 'SLACK_WEBHOOK', value: '***'}], []),
-    ] as const;
-
-    failProdSteps.forEach((expectedStep) => {
-        if (didExecute && !isSuccessful) {
-            expect(workflowResult).toEqual(expect.arrayContaining([expectedStep]));
-        } else {
-            expect(workflowResult).not.toEqual(expect.arrayContaining([expectedStep]));
-        }
-    });
-}
-
-function assertlockStagingDeploysJobFailedAfterFirstStep(workflowResult: Step[]) {
-    const steps = [
-        createStepAssertion(
-            'Checkout',
-            true,
-            null,
-            'LOCKSTAGINGDEPLOYS',
-            'Checking out',
-            [
-                {key: 'ref', value: 'main'},
-                {key: 'token', value: '***'},
-            ],
-            [],
-        ),
-        createStepAssertion('Wait for staging deploys to finish', false, null, 'LOCKSTAGINGDEPLOYS', 'Waiting for staging deploys to finish', [{key: 'GITHUB_TOKEN', value: '***'}], []),
-        createStepAssertion('Announce failed workflow', true, null, 'LOCKSTAGINGDEPLOYS', 'Announcing failed workflow in Slack', [{key: 'SLACK_WEBHOOK', value: '***'}], []),
-    ] as const;
-
-    steps.forEach((expectedStep) => {
-        expect(workflowResult).toEqual(expect.arrayContaining([expectedStep]));
-    });
-}
-
-export default {assertlockStagingDeploysJobExecuted, assertlockStagingDeploysJobFailedAfterFirstStep};
diff --git a/workflow_tests/assertions/platformDeployAssertions.ts b/workflow_tests/assertions/platformDeployAssertions.ts
deleted file mode 100644
index a93abd77cca9..000000000000
--- a/workflow_tests/assertions/platformDeployAssertions.ts
+++ /dev/null
@@ -1,389 +0,0 @@
-import type {Step} from '@kie/act-js';
-import {createStepAssertion} from '../utils/utils';
-
-function assertVerifyActorJobExecuted(workflowResult: Step[], didExecute = true) {
-    const steps = [createStepAssertion('Check if user is deployer', true, null, 'VALIDATE_ACTOR', 'Checking if the user is a deployer', [], [{key: 'GITHUB_TOKEN', value: '***'}])] as const;
-
-    steps.forEach((expectedStep) => {
-        if (didExecute) {
-            expect(workflowResult).toEqual(expect.arrayContaining([expectedStep]));
-        } else {
-            expect(workflowResult).not.toEqual(expect.arrayContaining([expectedStep]));
-        }
-    });
-}
-
-function assertDeployChecklistJobExecuted(workflowResult: Step[], didExecute = true) {
-    const steps = [createStepAssertion('deployChecklist', true, null, 'DEPLOY_CHECKLIST', 'Run deployChecklist')] as const;
-
-    steps.forEach((expectedStep) => {
-        if (didExecute) {
-            expect(workflowResult).toEqual(expect.arrayContaining([expectedStep]));
-        } else {
-            expect(workflowResult).not.toEqual(expect.arrayContaining([expectedStep]));
-        }
-    });
-}
-
-function assertAndroidJobExecuted(workflowResult: Step[], didExecute = true, isProduction = true, isSuccessful = true) {
-    const steps = [
-        createStepAssertion('Checkout', true, null, 'ANDROID', 'Checking out'),
-        createStepAssertion('Configure MapBox SDK', true, null, 'ANDROID', 'Configure MapBox SDK'),
-        createStepAssertion('Setup Node', true, null, 'ANDROID', 'Setting up Node'),
-        createStepAssertion(
-            'Setup Java',
-            true,
-            null,
-            'ANDROID',
-            'Setup Java',
-            [
-                {key: 'distribution', value: 'oracle'},
-                {key: 'java-version', value: '17'},
-            ],
-            [],
-        ),
-        createStepAssertion('Setup Ruby', true, null, 'ANDROID', 'Setting up Ruby', [
-            {key: 'ruby-version', value: '2.7'},
-            {key: 'bundler-cache', value: 'true'},
-        ]),
-        createStepAssertion('Decrypt keystore', true, null, 'ANDROID', 'Decrypting keystore', null, [{key: 'LARGE_SECRET_PASSPHRASE', value: '***'}]),
-        createStepAssertion('Decrypt json key', true, null, 'ANDROID', 'Decrypting JSON key', null, [{key: 'LARGE_SECRET_PASSPHRASE', value: '***'}]),
-        createStepAssertion('Set version in ENV', true, null, 'ANDROID', 'Setting version in ENV'),
-    ];
-
-    if (!isProduction) {
-        steps.push(
-            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(createStepAssertion('Run Fastlane production', true, null, 'ANDROID', 'Running Fastlane production', null, [{key: 'VERSION', value: '1.2.3'}]));
-    }
-    steps.push(
-        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(
-            createStepAssertion('Upload Android version to GitHub artifacts', true, null, 'ANDROID', 'Upload Android version to GitHub artifacts', [
-                {key: 'name', value: 'app-production-release.aab'},
-                {key: 'path', value: 'android/app/build/outputs/bundle/productionRelease/app-production-release.aab'},
-            ]),
-            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 = [
-        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: '***'},
-            ],
-        ),
-    ] as const;
-
-    failProdSteps.forEach((expectedStep) => {
-        if (didExecute && isProduction && !isSuccessful) {
-            expect(workflowResult).toEqual(expect.arrayContaining([expectedStep]));
-        } else {
-            expect(workflowResult).not.toEqual(expect.arrayContaining([expectedStep]));
-        }
-    });
-}
-
-function assertDesktopJobExecuted(workflowResult: Step[], didExecute = true, isProduction = true) {
-    const steps = [
-        createStepAssertion('Checkout', true, null, 'DESKTOP', 'Checking out'),
-        createStepAssertion('Setup Node', true, null, 'DESKTOP', 'Setting up Node'),
-        createStepAssertion('Decrypt Developer ID Certificate', true, null, 'DESKTOP', 'Decrypting developer id certificate', null, [{key: 'DEVELOPER_ID_SECRET_PASSPHRASE', value: '***'}]),
-    ];
-
-    if (isProduction) {
-        steps.push(
-            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(
-            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]));
-        }
-    });
-}
-
-function assertIOSJobExecuted(workflowResult: Step[], didExecute = true, isProduction = true, isSuccessful = true) {
-    const steps = [
-        createStepAssertion('Checkout', true, null, 'IOS', 'Checking out'),
-        createStepAssertion('Configure MapBox SDK', true, null, 'IOS', 'Configure MapBox SDK'),
-        createStepAssertion('Setup Node', true, null, 'IOS', 'Setting up Node'),
-        createStepAssertion('Setup Ruby', true, null, 'IOS', 'Setting up Ruby', [
-            {key: 'ruby-version', value: '2.7'},
-            {key: 'bundler-cache', value: 'true'},
-        ]),
-        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-'},
-        ]),
-        createStepAssertion('Compare Podfile.lock and Manifest.lock', true, null, 'IOS', 'Compare Podfile.lock and Manifest.lock'),
-        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'},
-        ]),
-        createStepAssertion('Decrypt AppStore profile', true, null, 'IOS', 'Decrypting profile', null, [{key: 'LARGE_SECRET_PASSPHRASE', value: '***'}]),
-        createStepAssertion('Decrypt AppStore Notification Service profile', true, null, 'IOS', 'Decrypting profile', null, [{key: 'LARGE_SECRET_PASSPHRASE', value: '***'}]),
-        createStepAssertion('Decrypt certificate', true, null, 'IOS', 'Decrypting certificate', null, [{key: 'LARGE_SECRET_PASSPHRASE', value: '***'}]),
-        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(
-            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(
-        createStepAssertion('Archive iOS sourcemaps', true, null, 'IOS', 'Archiving sourcemaps', [
-            {key: 'name', value: 'ios-sourcemap'},
-            {key: 'path', value: 'main.jsbundle.map'},
-        ]),
-    );
-    if (!isProduction) {
-        steps.push(
-            createStepAssertion('Upload iOS version to GitHub artifacts', true, null, 'IOS', 'Upload iOS version to GitHub artifacts', [
-                {key: 'name', value: 'New Expensify.ipa'},
-                {key: 'path', value: '/Users/runner/work/App/App/New Expensify.ipa'},
-            ]),
-            createStepAssertion('Upload iOS version to Browser Stack', true, null, 'IOS', 'Uploading version to Browser Stack', null, [{key: 'BROWSERSTACK', value: '***'}]),
-        );
-    } else {
-        steps.push(
-            createStepAssertion('Set iOS version in ENV', true, null, 'IOS', 'Setting iOS version'),
-            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 = [
-        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: '***'},
-            ],
-        ),
-    ] as const;
-
-    failProdSteps.forEach((expectedStep) => {
-        if (didExecute && isProduction && !isSuccessful) {
-            expect(workflowResult).toEqual(expect.arrayContaining([expectedStep]));
-        } else {
-            expect(workflowResult).not.toEqual(expect.arrayContaining([expectedStep]));
-        }
-    });
-}
-
-function assertWebJobExecuted(workflowResult: Step[], didExecute = true, isProduction = true) {
-    const steps = [
-        createStepAssertion('Checkout', true, null, 'WEB', 'Checking out'),
-        createStepAssertion('Setup Node', true, null, 'WEB', 'Setting up Node'),
-        createStepAssertion('Setup Cloudflare CLI', true, null, 'WEB', 'Setting up Cloudflare CLI'),
-        createStepAssertion('Configure AWS Credentials', true, null, 'WEB', 'Configuring AWS credentials', [
-            {key: 'aws-access-key-id', value: '***'},
-            {key: 'aws-secret-access-key', value: '***'},
-            {key: 'aws-region', value: 'us-east-1'},
-        ]),
-    ];
-
-    if (isProduction) {
-        steps.push(
-            createStepAssertion('Build web for production', true, null, 'WEB', 'Building web for production'),
-            createStepAssertion('Build storybook docs for production', true, null, 'WEB', 'Build storybook docs for production'),
-            createStepAssertion('Deploy production to S3', true, null, 'WEB', 'Deploying production to S3'),
-            createStepAssertion('Purge production Cloudflare cache', true, null, 'WEB', 'Purging production Cloudflare cache', null, [{key: 'CF_API_KEY', value: '***'}]),
-        );
-    } else {
-        steps.push(
-            createStepAssertion('Build web for staging', true, null, 'WEB', 'Building web for staging'),
-            createStepAssertion('Build storybook docs for staging', true, null, 'WEB', 'Build storybook docs for staging'),
-            createStepAssertion('Deploy staging to S3', true, null, 'WEB', 'Deploying staging to S3'),
-            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]));
-        }
-    });
-}
-
-function assertPostSlackOnFailureJobExecuted(workflowResult: Step[], didExecute = true) {
-    const steps = [
-        createStepAssertion('Post Slack message on failure', true, null, 'POST_SLACK_FAIL', 'Posting Slack message on platform deploy failure', [{key: 'SLACK_WEBHOOK', value: '***'}]),
-    ] as const;
-
-    steps.forEach((expectedStep) => {
-        if (didExecute) {
-            expect(workflowResult).toEqual(expect.arrayContaining([expectedStep]));
-        } else {
-            expect(workflowResult).not.toEqual(expect.arrayContaining([expectedStep]));
-        }
-    });
-}
-
-function assertPostSlackOnSuccessJobExecuted(workflowResult: Step[], didExecute = true, isProduction = true) {
-    const steps = [
-        createStepAssertion('Checkout', true, null, 'POST_SLACK_SUCCESS', 'Checking out'),
-        createStepAssertion('Set version', true, null, 'POST_SLACK_SUCCESS', 'Setting version'),
-        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: '***'},
-            ],
-        ),
-        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(
-            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]));
-        }
-    });
-}
-
-function assertPostGithubCommentJobExecuted(workflowResult: Step[], didExecute = true, isProduction = true, didDeploy = true) {
-    const steps = [
-        createStepAssertion('Checkout', true, null, 'POST_GITHUB_COMMENT', 'Checking out'),
-        createStepAssertion('Setup Node', true, null, 'POST_GITHUB_COMMENT', 'Setting up Node'),
-        createStepAssertion('Set version', true, null, 'POST_GITHUB_COMMENT', 'Setting version'),
-        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'},
-        ]),
-        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' : ''},
-        ]),
-    ] as const;
-
-    steps.forEach((expectedStep) => {
-        if (didExecute) {
-            expect(workflowResult).toEqual(expect.arrayContaining([expectedStep]));
-        } else {
-            expect(workflowResult).not.toEqual(expect.arrayContaining([expectedStep]));
-        }
-    });
-}
-
-export default {
-    assertVerifyActorJobExecuted,
-    assertDeployChecklistJobExecuted,
-    assertAndroidJobExecuted,
-    assertDesktopJobExecuted,
-    assertIOSJobExecuted,
-    assertWebJobExecuted,
-    assertPostSlackOnFailureJobExecuted,
-    assertPostSlackOnSuccessJobExecuted,
-    assertPostGithubCommentJobExecuted,
-};
diff --git a/workflow_tests/assertions/preDeployAssertions.ts b/workflow_tests/assertions/preDeployAssertions.ts
deleted file mode 100644
index 8a89d2377606..000000000000
--- a/workflow_tests/assertions/preDeployAssertions.ts
+++ /dev/null
@@ -1,133 +0,0 @@
-import type {Step} from '@kie/act-js';
-import {createStepAssertion} from '../utils/utils';
-
-function assertTypecheckJobExecuted(workflowResult: Step[], didExecute = true) {
-    const steps = [createStepAssertion('Run typecheck workflow', true, null, 'TYPECHECK', 'Running typecheck workflow')] as const;
-
-    steps.forEach((expectedStep) => {
-        if (didExecute) {
-            expect(workflowResult).toEqual(expect.arrayContaining([expectedStep]));
-        } else {
-            expect(workflowResult).not.toEqual(expect.arrayContaining([expectedStep]));
-        }
-    });
-}
-
-function assertLintJobExecuted(workflowResult: Step[], didExecute = true) {
-    const steps = [createStepAssertion('Run lint workflow', true, null, 'LINT', 'Running lint workflow')] as const;
-
-    steps.forEach((expectedStep) => {
-        if (didExecute) {
-            expect(workflowResult).toEqual(expect.arrayContaining([expectedStep]));
-        } else {
-            expect(workflowResult).not.toEqual(expect.arrayContaining([expectedStep]));
-        }
-    });
-}
-
-function assertTestJobExecuted(workflowResult: Step[], didExecute = true) {
-    const steps = [createStepAssertion('Run test workflow', true, null, 'TEST', 'Running test workflow')] as const;
-
-    steps.forEach((expectedStep) => {
-        if (didExecute) {
-            expect(workflowResult).toEqual(expect.arrayContaining([expectedStep]));
-        } else {
-            expect(workflowResult).not.toEqual(expect.arrayContaining([expectedStep]));
-        }
-    });
-}
-
-function assertChooseDeployActionsJobExecuted(workflowResult: Step[], didExecute = true) {
-    const steps = [
-        createStepAssertion('Get merged pull request', true, null, 'CHOOSE_DEPLOY_ACTIONS', 'Getting merged pull request', [{key: 'github_token', value: '***'}]),
-        createStepAssertion('Check if StagingDeployCash is locked', true, null, 'CHOOSE_DEPLOY_ACTIONS', 'Checking StagingDeployCash', [{key: 'GITHUB_TOKEN', value: '***'}]),
-        createStepAssertion('Check if merged pull request should trigger a deploy', true, ''),
-    ] as const;
-
-    steps.forEach((expectedStep) => {
-        if (didExecute) {
-            expect(workflowResult).toEqual(expect.arrayContaining([expectedStep]));
-        } else {
-            expect(workflowResult).not.toEqual(expect.arrayContaining([expectedStep]));
-        }
-    });
-}
-
-function assertSkipDeployJobExecuted(workflowResult: Step[], 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.' as const;
-    const steps = [
-        createStepAssertion('Comment on deferred PR', true, null, 'SKIP_DEPLOY', 'Skipping deploy', [
-            {key: 'github_token', value: '***'},
-            {key: 'number', value: '123'},
-            {key: 'body', value: body},
-        ]),
-    ] as const;
-
-    steps.forEach((expectedStep) => {
-        if (didExecute) {
-            expect(workflowResult).toEqual(expect.arrayContaining([expectedStep]));
-        } else {
-            expect(workflowResult).not.toEqual(expect.arrayContaining([expectedStep]));
-        }
-    });
-}
-
-function assertCreateNewVersionJobExecuted(workflowResult: Step[], didExecute = true) {
-    const steps = [createStepAssertion('Create new version', true, null, 'CREATE_NEW_VERSION', 'Creating new version')] as const;
-
-    steps.forEach((expectedStep) => {
-        if (didExecute) {
-            expect(workflowResult).toEqual(expect.arrayContaining([expectedStep]));
-        } else {
-            expect(workflowResult).not.toEqual(expect.arrayContaining([expectedStep]));
-        }
-    });
-}
-
-function assertUpdateStagingJobExecuted(workflowResult: Step[], didExecute = true) {
-    const steps = [
-        createStepAssertion('Run turnstyle', true, null, 'UPDATE_STAGING', 'Running turnstyle', [
-            {key: 'poll-interval-seconds', value: '10'},
-            {key: 'GITHUB_TOKEN', value: '***'},
-        ]),
-        createStepAssertion('Checkout main', true, null, 'UPDATE_STAGING', 'Checkout main', [
-            {key: 'ref', value: 'main'},
-            {key: 'token', value: '***'},
-        ]),
-        createStepAssertion('Setup Git for OSBotify', true, null, 'UPDATE_STAGING', 'Setup Git for OSBotify', [{key: 'GPG_PASSPHRASE', value: '***'}]),
-        createStepAssertion('Update staging branch from main', true, null, 'UPDATE_STAGING', 'Update staging branch from main'),
-    ] as const;
-
-    steps.forEach((expectedStep) => {
-        if (didExecute) {
-            expect(workflowResult).toEqual(expect.arrayContaining([expectedStep]));
-        } else {
-            expect(workflowResult).not.toEqual(expect.arrayContaining([expectedStep]));
-        }
-    });
-}
-
-function assertUpdateStagingJobFailed(workflowResult: Step[], didFail = false) {
-    const steps = [
-        createStepAssertion('Announce failed workflow in Slack', true, null, 'UPDATE_STAGING', 'Announcing failed workflow in Slack', [{key: 'SLACK_WEBHOOK', value: '***'}]),
-    ] as const;
-
-    steps.forEach((expectedStep) => {
-        if (didFail) {
-            expect(workflowResult).toEqual(expect.arrayContaining([expectedStep]));
-        } else {
-            expect(workflowResult).not.toEqual(expect.arrayContaining([expectedStep]));
-        }
-    });
-}
-
-export default {
-    assertTypecheckJobExecuted,
-    assertLintJobExecuted,
-    assertTestJobExecuted,
-    assertChooseDeployActionsJobExecuted,
-    assertSkipDeployJobExecuted,
-    assertCreateNewVersionJobExecuted,
-    assertUpdateStagingJobExecuted,
-    assertUpdateStagingJobFailed,
-};
diff --git a/workflow_tests/assertions/reviewerChecklistAssertions.ts b/workflow_tests/assertions/reviewerChecklistAssertions.ts
deleted file mode 100644
index 4be8e1807dc7..000000000000
--- a/workflow_tests/assertions/reviewerChecklistAssertions.ts
+++ /dev/null
@@ -1,16 +0,0 @@
-import type {Step} from '@kie/act-js';
-import {createStepAssertion} from '../utils/utils';
-
-function assertChecklistJobExecuted(workflowResult: Step[], didExecute = true) {
-    const steps = [createStepAssertion('reviewerChecklist.js', true, null, 'CHECKLIST', 'reviewerChecklist.js', [{key: 'GITHUB_TOKEN', value: '***'}], [])] as const;
-
-    steps.forEach((expectedStep) => {
-        if (didExecute) {
-            expect(workflowResult).toEqual(expect.arrayContaining([expectedStep]));
-        } else {
-            expect(workflowResult).not.toEqual(expect.arrayContaining([expectedStep]));
-        }
-    });
-}
-
-export default {assertChecklistJobExecuted};
diff --git a/workflow_tests/assertions/testAssertions.ts b/workflow_tests/assertions/testAssertions.ts
deleted file mode 100644
index 06379403a834..000000000000
--- a/workflow_tests/assertions/testAssertions.ts
+++ /dev/null
@@ -1,57 +0,0 @@
-import type {Step} from '@kie/act-js';
-import {createStepAssertion} from '../utils/utils';
-
-function assertJestJobExecuted(workflowResult: Step[], didExecute = true, timesExecuted = 3) {
-    const steps = [
-        createStepAssertion('Checkout', true, null, 'JEST', 'Checkout', [], []),
-        createStepAssertion('Setup Node', true, null, 'JEST', 'Setup Node', [], []),
-        createStepAssertion('Get number of CPU cores', true, null, 'JEST', 'Get number of CPU cores', [], []),
-        createStepAssertion(
-            'Cache Jest cache',
-            true,
-            null,
-            'JEST',
-            'Cache Jest cache',
-            [
-                {key: 'path', value: '.jest-cache'},
-                {key: 'key', value: 'Linux-jest'},
-            ],
-            [],
-        ),
-        createStepAssertion('Jest tests', true, null, 'JEST', 'Jest tests', [], []),
-    ] as const;
-
-    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]));
-        }
-    });
-}
-
-function assertShellTestsJobExecuted(workflowResult: Step[], didExecute = true) {
-    const steps = [
-        createStepAssertion('Checkout', true, null, 'SHELLTESTS', 'Checkout', [], []),
-        createStepAssertion('Setup Node', true, null, 'SHELLTESTS', 'Setup Node', [], []),
-        createStepAssertion('Test CI git logic', true, null, 'SHELLTESTS', 'Test CI git logic', [], []),
-    ] as const;
-
-    steps.forEach((expectedStep) => {
-        if (didExecute) {
-            expect(workflowResult).toEqual(expect.arrayContaining([expectedStep]));
-        } else {
-            expect(workflowResult).not.toEqual(expect.arrayContaining([expectedStep]));
-        }
-    });
-}
-
-export default {assertJestJobExecuted, assertShellTestsJobExecuted};
diff --git a/workflow_tests/assertions/testBuildAssertions.ts b/workflow_tests/assertions/testBuildAssertions.ts
deleted file mode 100644
index 5fb0a8fd9342..000000000000
--- a/workflow_tests/assertions/testBuildAssertions.ts
+++ /dev/null
@@ -1,408 +0,0 @@
-import type {Step} from '@kie/act-js';
-import {createStepAssertion} from '../utils/utils';
-
-function assertValidateActorJobExecuted(workflowResult: Step[], pullRequestNumber = '1234', didExecute = true) {
-    const steps = [
-        createStepAssertion('Is Expensify employee', true, null, 'VALIDATEACTOR', 'Is Expensify employee', [], [{key: 'GITHUB_TOKEN', value: '***'}]),
-        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: '***'},
-            ],
-        ),
-    ] as const;
-
-    steps.forEach((expectedStep) => {
-        if (didExecute) {
-            expect(workflowResult).toEqual(expect.arrayContaining([expectedStep]));
-        } else {
-            expect(workflowResult).not.toEqual(expect.arrayContaining([expectedStep]));
-        }
-    });
-}
-
-function assertGetBranchRefJobExecuted(workflowResult: Step[], didExecute = true) {
-    const steps = [
-        createStepAssertion('Checkout', true, null, 'GETBRANCHREF', 'Checkout', [], []),
-        createStepAssertion('Check if pull request number is correct', true, null, 'GETBRANCHREF', 'Check if pull request number is correct', [], [{key: 'GITHUB_TOKEN', value: '***'}]),
-    ] as const;
-
-    steps.forEach((expectedStep) => {
-        if (didExecute) {
-            expect(workflowResult).toEqual(expect.arrayContaining([expectedStep]));
-        } else {
-            expect(workflowResult).not.toEqual(expect.arrayContaining([expectedStep]));
-        }
-    });
-}
-
-function assertAndroidJobExecuted(workflowResult: Step[], ref = '', didExecute = true, failsAt = -1) {
-    const steps = [
-        createStepAssertion('Checkout', true, null, 'ANDROID', 'Checkout', [{key: 'ref', value: ref}], []),
-        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', [], []),
-        createStepAssertion('Setup Node', true, null, 'ANDROID', 'Setup Node', [], []),
-        createStepAssertion(
-            'Setup Java',
-            true,
-            null,
-            'ANDROID',
-            'Setup Java',
-            [
-                {key: 'distribution', value: 'oracle'},
-                {key: 'java-version', value: '17'},
-            ],
-            [],
-        ),
-        createStepAssertion(
-            'Setup Ruby',
-            true,
-            null,
-            'ANDROID',
-            'Setup Ruby',
-            [
-                {key: 'ruby-version', value: '2.7'},
-                {key: 'bundler-cache', value: true},
-            ],
-            [],
-        ),
-        createStepAssertion('Decrypt keystore', true, null, 'ANDROID', 'Decrypt keystore', [], [{key: 'LARGE_SECRET_PASSPHRASE', value: '***'}]),
-        createStepAssertion('Decrypt json key', true, null, 'ANDROID', 'Decrypt json key', [], [{key: 'LARGE_SECRET_PASSPHRASE', value: '***'}]),
-        createStepAssertion(
-            'Configure AWS Credentials',
-            true,
-            null,
-            'ANDROID',
-            'Configure AWS Credentials',
-            [
-                {key: 'aws-access-key-id', value: '***'},
-                {key: 'aws-secret-access-key', value: '***'},
-                {key: 'aws-region', value: 'us-east-1'},
-            ],
-            [],
-        ),
-        createStepAssertion('Configure MapBox SDK', true, null, 'ANDROID', 'Configure MapBox SDK'),
-        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: '***'},
-            ],
-        ),
-        createStepAssertion(
-            'Upload Artifact',
-            true,
-            null,
-            'ANDROID',
-            'Upload Artifact',
-            [
-                {key: 'name', value: 'android'},
-                {key: 'path', value: './android_paths.json'},
-            ],
-            [],
-        ),
-    ] as const;
-
-    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]));
-        }
-    });
-}
-
-function assertIOSJobExecuted(workflowResult: Step[], ref = '', didExecute = true, failsAt = -1) {
-    const steps = [
-        createStepAssertion('Checkout', true, null, 'IOS', 'Checkout', [{key: 'ref', value: ref}], []),
-        createStepAssertion('Configure MapBox SDK', true, null, 'IOS', 'Configure MapBox SDK'),
-        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', [], []),
-        createStepAssertion('Setup Node', true, null, 'IOS', 'Setup Node', [], []),
-        createStepAssertion('Setup XCode', true, null, 'IOS', 'Setup XCode', [], []),
-        createStepAssertion(
-            'Setup Ruby',
-            true,
-            null,
-            'IOS',
-            'Setup Ruby',
-            [
-                {key: 'ruby-version', value: '2.7'},
-                {key: 'bundler-cache', value: true},
-            ],
-            [],
-        ),
-        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-'},
-        ]),
-        createStepAssertion('Compare Podfile.lock and Manifest.lock', true, null, 'IOS', 'Compare Podfile.lock and Manifest.lock'),
-        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'},
-            ],
-            [],
-        ),
-        createStepAssertion('Decrypt AdHoc profile', true, null, 'IOS', 'Decrypt AdHoc profile', [], [{key: 'LARGE_SECRET_PASSPHRASE', value: '***'}]),
-        createStepAssertion(
-            'Decrypt AdHoc Notification Service profile',
-            true,
-            null,
-            'IOS',
-            'Decrypt AdHoc Notification Service profile',
-            [],
-            [{key: 'LARGE_SECRET_PASSPHRASE', value: '***'}],
-        ),
-        createStepAssertion('Decrypt certificate', true, null, 'IOS', 'Decrypt certificate', [], [{key: 'LARGE_SECRET_PASSPHRASE', value: '***'}]),
-        createStepAssertion(
-            'Configure AWS Credentials',
-            true,
-            null,
-            'IOS',
-            'Configure AWS Credentials',
-            [
-                {key: 'aws-access-key-id', value: '***'},
-                {key: 'aws-secret-access-key', value: '***'},
-                {key: 'aws-region', value: 'us-east-1'},
-            ],
-            [],
-        ),
-        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'},
-            ],
-        ),
-        createStepAssertion(
-            'Upload Artifact',
-            true,
-            null,
-            'IOS',
-            'Upload Artifact',
-            [
-                {key: 'name', value: 'ios'},
-                {key: 'path', value: './ios_paths.json'},
-            ],
-            [],
-        ),
-    ] as const;
-
-    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]));
-        }
-    });
-}
-
-function assertDesktopJobExecuted(workflowResult: Step[], ref = '', didExecute = true, failsAt = -1) {
-    const steps = [
-        createStepAssertion('Checkout', true, null, 'DESKTOP', 'Checkout', [{key: 'ref', value: ref}], []),
-        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', [], []),
-        createStepAssertion('Setup Node', true, null, 'DESKTOP', 'Setup Node', [], []),
-        createStepAssertion('Decrypt Developer ID Certificate', true, null, 'DESKTOP', 'Decrypt Developer ID Certificate', [], [{key: 'DEVELOPER_ID_SECRET_PASSPHRASE', value: '***'}]),
-        createStepAssertion(
-            'Configure AWS Credentials',
-            true,
-            null,
-            'DESKTOP',
-            'Configure AWS Credentials',
-            [
-                {key: 'aws-access-key-id', value: '***'},
-                {key: 'aws-secret-access-key', value: '***'},
-                {key: 'aws-region', value: 'us-east-1'},
-            ],
-            [],
-        ),
-        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: '***'},
-            ],
-        ),
-    ] as const;
-
-    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]));
-        }
-    });
-}
-
-function assertWebJobExecuted(workflowResult: Step[], ref = '', didExecute = true, failsAt = -1) {
-    const steps = [
-        createStepAssertion('Checkout', true, null, 'WEB', 'Checkout', [{key: 'ref', value: ref}], []),
-        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', [], []),
-        createStepAssertion('Setup Node', true, null, 'WEB', 'Setup Node', [], []),
-        createStepAssertion(
-            'Configure AWS Credentials',
-            true,
-            null,
-            'WEB',
-            'Configure AWS Credentials',
-            [
-                {key: 'aws-access-key-id', value: '***'},
-                {key: 'aws-secret-access-key', value: '***'},
-                {key: 'aws-region', value: 'us-east-1'},
-            ],
-            [],
-        ),
-        createStepAssertion('Build web for testing', true, null, 'WEB', 'Build web for testing', [], []),
-        createStepAssertion('Build docs', true, null, 'WEB', 'Build docs', [], []),
-        createStepAssertion('Deploy to S3 for internal testing', true, null, 'WEB', 'Deploy to S3 for internal testing', [], []),
-    ] as const;
-
-    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]));
-        }
-    });
-}
-
-function assertPostGithubCommentJobExecuted(
-    workflowResult: Step[],
-    ref = '',
-    pullRequestNumber = '1234',
-    didExecute = true,
-    androidStatus = 'success',
-    iOSStatus = 'success',
-    desktopStatus = 'success',
-    webStatus = 'success',
-) {
-    const steps = [
-        createStepAssertion('Checkout', true, null, 'POSTGITHUBCOMMENT', 'Checkout', [{key: 'ref', value: ref}], []),
-        createStepAssertion('Download Artifact', true, null, 'POSTGITHUBCOMMENT', 'Download Artifact', [], []),
-    ];
-
-    if (androidStatus === 'success') {
-        steps.push(createStepAssertion('Read JSONs with android paths', true, null, 'POSTGITHUBCOMMENT', 'Read JSONs with android paths', [], []));
-    }
-    if (iOSStatus === 'success') {
-        steps.push(createStepAssertion('Read JSONs with iOS paths', true, null, 'POSTGITHUBCOMMENT', 'Read JSONs with iOS paths', [], []));
-    }
-
-    steps.push(
-        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]));
-        }
-    });
-}
-
-export default {
-    assertValidateActorJobExecuted,
-    assertGetBranchRefJobExecuted,
-    assertAndroidJobExecuted,
-    assertIOSJobExecuted,
-    assertDesktopJobExecuted,
-    assertWebJobExecuted,
-    assertPostGithubCommentJobExecuted,
-};
diff --git a/workflow_tests/assertions/validateGithubActionsAssertions.ts b/workflow_tests/assertions/validateGithubActionsAssertions.ts
deleted file mode 100644
index 89eb444299ed..000000000000
--- a/workflow_tests/assertions/validateGithubActionsAssertions.ts
+++ /dev/null
@@ -1,21 +0,0 @@
-import type {Step} from '@kie/act-js';
-import {createStepAssertion} from '../utils/utils';
-
-function assertVerifyJobExecuted(workflowResult: Step[], didExecute = true) {
-    const steps = [
-        createStepAssertion('Checkout', true, null, 'VERIFY', 'Checkout'),
-        createStepAssertion('Setup Node', true, null, 'VERIFY', 'Setup Node', [], []),
-        createStepAssertion('Verify Javascript Action Builds', true, null, 'VERIFY', 'Verify Javascript Action Builds', [], []),
-        createStepAssertion('Validate actions and workflows', true, null, 'VERIFY', 'Validate actions and workflows', [], []),
-    ] as const;
-
-    steps.forEach((expectedStep) => {
-        if (didExecute) {
-            expect(workflowResult).toEqual(expect.arrayContaining([expectedStep]));
-        } else {
-            expect(workflowResult).not.toEqual(expect.arrayContaining([expectedStep]));
-        }
-    });
-}
-
-export default {assertVerifyJobExecuted};
diff --git a/workflow_tests/assertions/verifyPodfileAssertions.ts b/workflow_tests/assertions/verifyPodfileAssertions.ts
deleted file mode 100644
index d837507ede1b..000000000000
--- a/workflow_tests/assertions/verifyPodfileAssertions.ts
+++ /dev/null
@@ -1,20 +0,0 @@
-import type {Step} from '@kie/act-js';
-import {createStepAssertion} from '../utils/utils';
-
-function assertVerifyJobExecuted(workflowResult: Step[], didExecute = true) {
-    const steps = [
-        createStepAssertion('Checkout', true, null, 'VERIFY', 'Checkout'),
-        createStepAssertion('Setup Node', true, null, 'VERIFY', 'Setup Node', [], []),
-        createStepAssertion('Verify podfile', true, null, 'VERIFY', 'Verify podfile', [], []),
-    ] as const;
-
-    steps.forEach((expectedStep) => {
-        if (didExecute) {
-            expect(workflowResult).toEqual(expect.arrayContaining([expectedStep]));
-        } else {
-            expect(workflowResult).not.toEqual(expect.arrayContaining([expectedStep]));
-        }
-    });
-}
-
-export default {assertVerifyJobExecuted};
diff --git a/workflow_tests/assertions/verifySignedCommitsAssertions.ts b/workflow_tests/assertions/verifySignedCommitsAssertions.ts
deleted file mode 100644
index 8aaabafa9d9d..000000000000
--- a/workflow_tests/assertions/verifySignedCommitsAssertions.ts
+++ /dev/null
@@ -1,17 +0,0 @@
-import type {Step} from '@kie/act-js';
-import {createStepAssertion} from '../utils/utils';
-
-function assertVerifySignedCommitsJobExecuted(workflowResult: Step[], didExecute = true) {
-    const steps = [createStepAssertion('Verify signed commits', true, null, 'VERIFYSIGNEDCOMMITS', 'Verify signed commits', [{key: 'GITHUB_TOKEN', value: '***'}], [])] as const;
-
-    steps.forEach((expectedStep) => {
-        if (didExecute) {
-            expect(workflowResult).toEqual(expect.arrayContaining([expectedStep]));
-        } else {
-            expect(workflowResult).not.toEqual(expect.arrayContaining([expectedStep]));
-        }
-    });
-}
-
-// eslint-disable-next-line import/prefer-default-export
-export default {assertVerifySignedCommitsJobExecuted};
diff --git a/workflow_tests/authorChecklist.test.ts b/workflow_tests/authorChecklist.test.ts
deleted file mode 100644
index 84509818ff61..000000000000
--- a/workflow_tests/authorChecklist.test.ts
+++ /dev/null
@@ -1,179 +0,0 @@
-import type {MockStep} from '@kie/act-js/build/src/step-mocker/step-mocker.types';
-import {MockGithub} from '@kie/mock-github';
-import type {CreateRepositoryFile} from '@kie/mock-github';
-import path from 'path';
-import assertions from './assertions/authorChecklistAssertions';
-import mocks from './mocks/authorChecklistMocks';
-import ExtendedAct from './utils/ExtendedAct';
-import * as utils from './utils/utils';
-
-jest.setTimeout(90 * 1000);
-
-let mockGithub: MockGithub;
-
-const FILES_TO_COPY_INTO_TEST_REPO: CreateRepositoryFile[] = [
-    ...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(() => {
-        // 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 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_target';
-        const eventOptions = {
-            action: 'opened',
-        };
-        describe('actor is not OSBotify', () => {
-            it('executes workflow', async () => {
-                const repoPath = mockGithub.repo.getPath('testAuthorChecklistWorkflowRepo') ?? '';
-                const workflowPath = path.join(repoPath, '.github', 'workflows', 'authorChecklist.yml');
-                let act = new ExtendedAct(repoPath, workflowPath);
-                act = utils.setUpActParams(act, event, eventOptions, {}, githubToken);
-                const testMockSteps: MockStep = {
-                    checklist: mocks.AUTHORCHECKLIST__CHECKLIST__STEP_MOCKS,
-                };
-                const result = await act.runEvent(event, {
-                    workflowFile: path.join(repoPath, '.github', 'workflows', 'authorChecklist.yml'),
-                    mockSteps: testMockSteps,
-                    actor: 'Dummy Author',
-                    logFile: utils.getLogFilePath('authorChecklist', expect.getState().currentTestName),
-                });
-
-                assertions.assertChecklistJobExecuted(result);
-            });
-        });
-        describe('actor is 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 ExtendedAct(repoPath, workflowPath);
-                act = utils.setUpActParams(act, event, eventOptions, {}, githubToken);
-                const testMockSteps: MockStep = {
-                    checklist: mocks.AUTHORCHECKLIST__CHECKLIST__STEP_MOCKS,
-                };
-                const result = await act.runEvent(event, {
-                    workflowFile: path.join(repoPath, '.github', 'workflows', 'authorChecklist.yml'),
-                    mockSteps: testMockSteps,
-                    actor: 'OSBotify',
-                    logFile: utils.getLogFilePath('authorChecklist', expect.getState().currentTestName),
-                });
-
-                assertions.assertChecklistJobExecuted(result, false);
-            });
-        });
-    });
-    describe('pull request edited', () => {
-        const event = 'pull_request_target';
-        const eventOptions = {
-            action: 'edited',
-        };
-        describe('actor is not OSBotify', () => {
-            it('executes workflow', async () => {
-                const repoPath = mockGithub.repo.getPath('testAuthorChecklistWorkflowRepo') ?? '';
-                const workflowPath = path.join(repoPath, '.github', 'workflows', 'authorChecklist.yml');
-                let act = new ExtendedAct(repoPath, workflowPath);
-                act = utils.setUpActParams(act, event, eventOptions, {}, githubToken);
-                const testMockSteps: MockStep = {
-                    checklist: mocks.AUTHORCHECKLIST__CHECKLIST__STEP_MOCKS,
-                };
-                const result = await act.runEvent(event, {
-                    workflowFile: path.join(repoPath, '.github', 'workflows', 'authorChecklist.yml'),
-                    mockSteps: testMockSteps,
-                    actor: 'Dummy Author',
-                    logFile: utils.getLogFilePath('authorChecklist', expect.getState().currentTestName),
-                });
-
-                assertions.assertChecklistJobExecuted(result);
-            });
-        });
-        describe('actor is 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 ExtendedAct(repoPath, workflowPath);
-                act = utils.setUpActParams(act, event, eventOptions, {}, githubToken);
-                const testMockSteps: MockStep = {
-                    checklist: mocks.AUTHORCHECKLIST__CHECKLIST__STEP_MOCKS,
-                };
-                const result = await act.runEvent(event, {
-                    workflowFile: path.join(repoPath, '.github', 'workflows', 'authorChecklist.yml'),
-                    mockSteps: testMockSteps,
-                    actor: 'OSBotify',
-                    logFile: utils.getLogFilePath('authorChecklist', expect.getState().currentTestName),
-                });
-
-                assertions.assertChecklistJobExecuted(result, false);
-            });
-        });
-    });
-    describe('pull request reopened', () => {
-        const event = 'pull_request_target';
-        const eventOptions = {
-            action: 'reopened',
-        };
-        describe('actor is not OSBotify', () => {
-            it('executes workflow', async () => {
-                const repoPath = mockGithub.repo.getPath('testAuthorChecklistWorkflowRepo') ?? '';
-                const workflowPath = path.join(repoPath, '.github', 'workflows', 'authorChecklist.yml');
-                let act = new ExtendedAct(repoPath, workflowPath);
-                act = utils.setUpActParams(act, event, eventOptions, {}, githubToken);
-                const testMockSteps: MockStep = {
-                    checklist: mocks.AUTHORCHECKLIST__CHECKLIST__STEP_MOCKS,
-                };
-                const result = await act.runEvent(event, {
-                    workflowFile: path.join(repoPath, '.github', 'workflows', 'authorChecklist.yml'),
-                    mockSteps: testMockSteps,
-                    actor: 'Dummy Author',
-                    logFile: utils.getLogFilePath('authorChecklist', expect.getState().currentTestName),
-                });
-
-                assertions.assertChecklistJobExecuted(result);
-            });
-        });
-        describe('actor is 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 ExtendedAct(repoPath, workflowPath);
-                act = utils.setUpActParams(act, event, eventOptions, {}, githubToken);
-                const testMockSteps: MockStep = {
-                    checklist: mocks.AUTHORCHECKLIST__CHECKLIST__STEP_MOCKS,
-                };
-                const result = await act.runEvent(event, {
-                    workflowFile: path.join(repoPath, '.github', 'workflows', 'authorChecklist.yml'),
-                    mockSteps: testMockSteps,
-                    actor: 'OSBotify',
-                    logFile: utils.getLogFilePath('authorChecklist', expect.getState().currentTestName),
-                });
-
-                assertions.assertChecklistJobExecuted(result, false);
-            });
-        });
-    });
-});
diff --git a/workflow_tests/cherryPick.test.ts b/workflow_tests/cherryPick.test.ts
deleted file mode 100644
index 56ce851755b6..000000000000
--- a/workflow_tests/cherryPick.test.ts
+++ /dev/null
@@ -1,396 +0,0 @@
-import type {MockStep} from '@kie/act-js/build/src/step-mocker/step-mocker.types';
-import {MockGithub} from '@kie/mock-github';
-import type {CreateRepositoryFile} from '@kie/mock-github';
-import path from 'path';
-import assertions from './assertions/cherryPickAssertions';
-import mocks from './mocks/cherryPickMocks';
-import ExtendedAct from './utils/ExtendedAct';
-import type {MockJobs} from './utils/JobMocker';
-import * as utils from './utils/utils';
-
-jest.setTimeout(90 * 1000);
-
-let mockGithub: MockGithub;
-
-const FILES_TO_COPY_INTO_TEST_REPO: CreateRepositoryFile[] = [
-    ...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(() => {
-        // 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 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 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: MockStep = {
-                    validateActor: mocks.CHERRYPICK__VALIDATEACTOR__FALSE__STEP_MOCKS,
-                    cherryPick: mocks.getCherryPickMockSteps(true, false),
-                };
-                const testMockJobs: MockJobs = {
-                    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 ExtendedAct(repoPath, workflowPath);
-                const testMockSteps: MockStep = {
-                    validateActor: mocks.CHERRYPICK__VALIDATEACTOR__FALSE__STEP_MOCKS,
-                    cherryPick: mocks.getCherryPickMockSteps(versionsMatch, mergeConflicts),
-                };
-                const testMockJobs: MockJobs = {
-                    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 ExtendedAct(repoPath, workflowPath);
-                        const testMockSteps: MockStep = {
-                            validateActor: mocks.CHERRYPICK__VALIDATEACTOR__TRUE__STEP_MOCKS,
-                        };
-                        testMockSteps.cherryPick = mocks.getCherryPickMockSteps(versionsMatch, mergeConflicts);
-                        const testMockJobs: MockJobs = {
-                            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 ExtendedAct(repoPath, workflowPath);
-                        const testMockSteps: MockStep = {
-                            validateActor: mocks.CHERRYPICK__VALIDATEACTOR__TRUE__STEP_MOCKS,
-                        };
-                        testMockSteps.cherryPick = mocks.getCherryPickMockSteps(versionsMatch, mergeConflicts);
-                        const testMockJobs: MockJobs = {
-                            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 ExtendedAct(repoPath, workflowPath);
-                        const testMockSteps: MockStep = {
-                            validateActor: mocks.CHERRYPICK__VALIDATEACTOR__TRUE__STEP_MOCKS,
-                        };
-                        testMockSteps.cherryPick = mocks.getCherryPickMockSteps(versionsMatch, mergeConflicts);
-                        const testMockJobs: MockJobs = {
-                            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 ExtendedAct(repoPath, workflowPath);
-                        const testMockSteps: MockStep = {
-                            validateActor: mocks.CHERRYPICK__VALIDATEACTOR__TRUE__STEP_MOCKS,
-                        };
-                        testMockSteps.cherryPick = mocks.getCherryPickMockSteps(versionsMatch, mergeConflicts);
-                        const testMockJobs: MockJobs = {
-                            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 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: MockStep = {
-                validateActor: mocks.CHERRYPICK__VALIDATEACTOR__TRUE__STEP_MOCKS,
-                cherryPick: mocks.getCherryPickMockSteps(true, false),
-            };
-            const testMockJobs: MockJobs = {
-                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.ts b/workflow_tests/cla.test.ts
deleted file mode 100644
index 91691ec80587..000000000000
--- a/workflow_tests/cla.test.ts
+++ /dev/null
@@ -1,213 +0,0 @@
-/* eslint-disable @typescript-eslint/naming-convention */
-import type {Step} from '@kie/act-js';
-import {MockGithub} from '@kie/mock-github';
-import type {CreateRepositoryFile} from '@kie/mock-github';
-import path from 'path';
-import {assertCLAJobExecuted} from './assertions/claAssertions';
-import {CLA__CLA__CHECK_MATCH__STEP_MOCKS, CLA__CLA__NO_MATCHES__STEP_MOCKS, CLA__CLA__RECHECK_MATCH__STEP_MOCKS} from './mocks/claMocks';
-import ExtendedAct from './utils/ExtendedAct';
-import * as utils from './utils/utils';
-
-jest.setTimeout(90 * 1000);
-
-let mockGithub: MockGithub;
-
-const FILES_TO_COPY_INTO_TEST_REPO: CreateRepositoryFile[] = [
-    ...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: Record<string, string> = {
-        CLA_BOTIFY_TOKEN: 'dummy_cla_botify_token',
-    };
-    const githubToken = 'dummy_github_token';
-    const actor = 'Dummy Author';
-
-    // eslint-disable-next-line @typescript-eslint/require-await
-    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 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 ExtendedAct(repoPath, workflowPath);
-                act = utils.setUpActParams(act, event, eventData, secrets, githubToken);
-
-                const testMockSteps = {
-                    CLA: 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),
-                });
-
-                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 ExtendedAct(repoPath, workflowPath);
-                act = utils.setUpActParams(act, event, eventData, secrets, githubToken);
-
-                const testMockSteps = {
-                    CLA: 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),
-                });
-
-                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 ExtendedAct(repoPath, workflowPath);
-                act = utils.setUpActParams(act, event, eventData, secrets, githubToken);
-
-                const testMockSteps = {
-                    CLA: 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),
-                });
-
-                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 ExtendedAct(repoPath, workflowPath);
-                act = utils.setUpActParams(act, event, eventData, secrets, githubToken);
-
-                const testMockSteps = {
-                    CLA: 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),
-                });
-
-                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 ExtendedAct(repoPath, workflowPath);
-            act = utils.setUpActParams(act, event, eventData, secrets, githubToken);
-
-            const testMockSteps = {
-                CLA: CLA__CLA__NO_MATCHES__STEP_MOCKS,
-            };
-
-            const result: Step[] = await act.runEvent(event, {
-                workflowFile: path.join(repoPath, '.github', 'workflows', 'cla.yml'),
-                mockSteps: testMockSteps,
-                actor,
-                logFile: utils.getLogFilePath('cla', expect.getState().currentTestName),
-            });
-
-            assertCLAJobExecuted(result, '', `${repoPath}/remote/origin`, false);
-        });
-    });
-});
diff --git a/workflow_tests/createNewVersion.test.ts b/workflow_tests/createNewVersion.test.ts
deleted file mode 100644
index 05dcc2b10073..000000000000
--- a/workflow_tests/createNewVersion.test.ts
+++ /dev/null
@@ -1,169 +0,0 @@
-import {MockGithub} from '@kie/mock-github';
-import path from 'path';
-import assertions from './assertions/createNewVersionAssertions';
-import mocks from './mocks/createNewVersionMocks';
-import ExtendedAct from './utils/ExtendedAct';
-import * as utils from './utils/utils';
-
-jest.setTimeout(90 * 1000); // 90 sec
-let mockGithub: 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(() => {
-        // 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 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_COMMIT_TOKEN: 'dummy_osbotify_commit_token',
-            SLACK_WEBHOOK: 'dummy_webhook',
-            OS_BOTIFY_APP_ID: 'os_botify_app_id',
-            OS_BOTIFY_PRIVATE_KEY: 'os_botify_private_key',
-        };
-        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 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 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 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 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 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.ts b/workflow_tests/deploy.test.ts
deleted file mode 100644
index 4edb3b252d38..000000000000
--- a/workflow_tests/deploy.test.ts
+++ /dev/null
@@ -1,164 +0,0 @@
-import {MockGithub} from '@kie/mock-github';
-import path from 'path';
-import assertions from './assertions/deployAssertions';
-import mocks from './mocks/deployMocks';
-import ExtendedAct from './utils/ExtendedAct';
-import * as utils from './utils/utils';
-
-jest.setTimeout(90 * 1000);
-let mockGithub: 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(() => {
-        // 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 MockGithub({
-            repo: {
-                testDeployWorkflowRepo: {
-                    files: FILES_TO_COPY_INTO_TEST_REPO,
-                    pushedBranches: ['staging', 'production'],
-                },
-            },
-        });
-
-        await mockGithub.setup();
-    });
-
-    afterEach(async () => {
-        await mockGithub.teardown();
-    });
-
-    const secrets = {
-        OS_BOTIFY_TOKEN: 'dummy_token',
-        LARGE_SECRET_PASSPHRASE: '3xtr3m3ly_53cr3t_p455w0rd',
-        OS_BOTIFY_APP_ID: 'os_botify_app_id',
-        OS_BOTIFY_PRIVATE_KEY: 'os_botify_private_key',
-    };
-    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 ExtendedAct(repoPath, workflowPath);
-            act = utils.setUpActParams(
-                act,
-                'push',
-                {
-                    ref: 'refs/heads/main',
-                },
-                secrets,
-                '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 ExtendedAct(repoPath, workflowPath);
-            act = utils.setUpActParams(
-                act,
-                'push',
-                {
-                    ref: 'refs/heads/staging',
-                },
-                secrets,
-                '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 ExtendedAct(repoPath, workflowPath);
-            act = utils.setUpActParams(
-                act,
-                'push',
-                {
-                    ref: 'refs/heads/production',
-                },
-                secrets,
-                '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 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'}}, secrets, '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', {}, secrets, '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.ts b/workflow_tests/deployBlocker.test.ts
deleted file mode 100644
index eb4cdc2c9497..000000000000
--- a/workflow_tests/deployBlocker.test.ts
+++ /dev/null
@@ -1,161 +0,0 @@
-/* eslint-disable @typescript-eslint/naming-convention */
-import {MockGithub} from '@kie/mock-github';
-import path from 'path';
-import assertions from './assertions/deployBlockerAssertions';
-import mocks from './mocks/deployBlockerMocks';
-import ExtendedAct from './utils/ExtendedAct';
-import * as utils from './utils/utils';
-
-jest.setTimeout(90 * 1000);
-let mockGithub: 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(() => {
-        // 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 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 ExtendedAct(repoPath, workflowPath);
-                act = utils.setUpActParams(act, event, testEventOptions, secrets, githubToken, {}, {});
-                const testMockSteps = {
-                    deployBlocker: mocks.DEPLOYBLOCKER__DEPLOYBLOCKER__STEP_MOCKS,
-                };
-                const testMockJobs = {
-                    updateChecklist: {
-                        steps: mocks.DEPLOYBLOCKER__UPDATECHECKLIST__STEP_MOCKS,
-                        runsOn: 'ubuntu-latest',
-                    },
-                };
-                const result = await act.runEvent(event, {
-                    workflowFile: path.join(repoPath, '.github', 'workflows', 'deployBlocker.yml'),
-                    mockSteps: testMockSteps,
-                    actor,
-                    logFile: utils.getLogFilePath('deployBlocker', expect.getState().currentTestName),
-                    mockJobs: testMockJobs,
-                });
-
-                assertions.assertUpdateChecklistJobExecuted(result);
-                assertions.assertDeployBlockerJobExecuted(result);
-            });
-            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 ExtendedAct(repoPath, workflowPath);
-                    act = utils.setUpActParams(act, event, testEventOptions, secrets, githubToken, {}, {});
-                    const testMockSteps = {
-                        deployBlocker: utils.deepCopy(mocks.DEPLOYBLOCKER__DEPLOYBLOCKER__STEP_MOCKS),
-                    };
-                    testMockSteps.deployBlocker[1] = utils.createMockStep(
-                        'Give the issue/PR the Hourly, Engineering labels',
-                        'Give the issue/PR the Hourly, Engineering labels',
-                        'DEPLOYBLOCKER',
-                        [],
-                        ['GITHUB_TOKEN'],
-                        null,
-                        null,
-                        false,
-                    );
-                    const testMockJobs = {
-                        updateChecklist: {
-                            steps: mocks.DEPLOYBLOCKER__UPDATECHECKLIST__STEP_MOCKS,
-                            runsOn: 'ubuntu-latest',
-                        },
-                    };
-                    const result = await act.runEvent(event, {
-                        workflowFile: path.join(repoPath, '.github', 'workflows', 'deployBlocker.yml'),
-                        mockSteps: testMockSteps,
-                        actor,
-                        logFile: utils.getLogFilePath('deployBlocker', expect.getState().currentTestName),
-                        mockJobs: testMockJobs,
-                    });
-
-                    assertions.assertUpdateChecklistJobExecuted(result);
-                    assertions.assertDeployBlockerJobExecuted(result, true, false, 1);
-                });
-            });
-        });
-        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 ExtendedAct(repoPath, workflowPath);
-                act = utils.setUpActParams(act, event, testEventOptions, secrets, githubToken, {}, {});
-                const testMockSteps = {
-                    deployBlocker: mocks.DEPLOYBLOCKER__DEPLOYBLOCKER__STEP_MOCKS,
-                };
-                const testMockJobs = {
-                    updateChecklist: {
-                        steps: mocks.DEPLOYBLOCKER__UPDATECHECKLIST__STEP_MOCKS,
-                        runsOn: 'ubuntu-latest',
-                    },
-                };
-                const result = await act.runEvent(event, {
-                    workflowFile: path.join(repoPath, '.github', 'workflows', 'deployBlocker.yml'),
-                    mockSteps: testMockSteps,
-                    actor,
-                    logFile: utils.getLogFilePath('deployBlocker', expect.getState().currentTestName),
-                    mockJobs: testMockJobs,
-                });
-
-                assertions.assertUpdateChecklistJobExecuted(result, false);
-                assertions.assertDeployBlockerJobExecuted(result, false);
-            });
-        });
-    });
-});
diff --git a/workflow_tests/failureNotifier.test.ts b/workflow_tests/failureNotifier.test.ts
deleted file mode 100644
index 07ebb45517b3..000000000000
--- a/workflow_tests/failureNotifier.test.ts
+++ /dev/null
@@ -1,64 +0,0 @@
-import type {MockStep} from '@kie/act-js/build/src/step-mocker/step-mocker.types';
-import {MockGithub} from '@kie/mock-github';
-import type {CreateRepositoryFile} from '@kie/mock-github';
-import path from 'path';
-import assertions from './assertions/failureNotifierAssertions';
-import mocks from './mocks/failureNotifierMocks';
-import ExtendedAct from './utils/ExtendedAct';
-
-jest.setTimeout(90 * 1000);
-let mockGithub: MockGithub;
-
-const FILES_TO_COPY_INTO_TEST_REPO = [
-    {
-        src: path.resolve(__dirname, '..', '.github', 'workflows', 'failureNotifier.yml'),
-        dest: '.github/workflows/failureNotifier.yml',
-    },
-] as const satisfies CreateRepositoryFile[];
-
-describe('test workflow failureNotifier', () => {
-    const actor = 'Dummy Actor';
-    beforeEach(async () => {
-        // create a local repository and copy required files
-        mockGithub = new MockGithub({
-            repo: {
-                testFailureNotifierWorkflowRepo: {
-                    files: FILES_TO_COPY_INTO_TEST_REPO,
-
-                    // if any branches besides main are needed add: pushedBranches: ['staging', 'production'],
-                },
-            },
-        });
-
-        await mockGithub.setup();
-    });
-
-    afterEach(async () => {
-        await mockGithub.teardown();
-    });
-    it('runs the notify failure when main fails', async () => {
-        const repoPath = mockGithub.repo.getPath('testFailureNotifierWorkflowRepo') ?? '';
-        const workflowPath = path.join(repoPath, '.github', 'workflows', 'failureNotifier.yml');
-        let act = new ExtendedAct(repoPath, workflowPath);
-        const event = 'workflow_run';
-        act = act.setEvent({
-            // eslint-disable-next-line @typescript-eslint/naming-convention
-            workflow_run: {
-                name: 'Process new code merged to main',
-                conclusion: 'failure',
-            },
-        });
-        const testMockSteps = {
-            notifyFailure: mocks.FAILURENOTIFIER__NOTIFYFAILURE__STEP_MOCKS,
-        } as const satisfies MockStep;
-
-        const result = await act.runEvent(event, {
-            workflowFile: path.join(repoPath, '.github', 'workflows', 'failureNotifier.yml'),
-            mockSteps: testMockSteps,
-            actor,
-        });
-
-        // assert execution with imported assertions
-        assertions.assertNotifyFailureJobExecuted(result);
-    });
-});
diff --git a/workflow_tests/finishReleaseCycle.test.ts b/workflow_tests/finishReleaseCycle.test.ts
deleted file mode 100644
index 7f81137807f4..000000000000
--- a/workflow_tests/finishReleaseCycle.test.ts
+++ /dev/null
@@ -1,240 +0,0 @@
-import {MockGithub} from '@kie/mock-github';
-import path from 'path';
-import assertions from './assertions/finishReleaseCycleAssertions';
-import mocks from './mocks/finishReleaseCycleMocks';
-import ExtendedAct from './utils/ExtendedAct';
-import type {MockJobs} from './utils/JobMocker';
-import * as utils from './utils/utils';
-
-jest.setTimeout(90 * 1000);
-let mockGithub: 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(() => {
-        // 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 MockGithub({
-            repo: {
-                testFinishReleaseCycleWorkflowRepo: {
-                    files: FILES_TO_COPY_INTO_TEST_REPO,
-                },
-            },
-        });
-
-        await mockGithub.setup();
-    });
-
-    afterEach(async () => {
-        await mockGithub.teardown();
-    });
-    const secrets = {
-        OS_BOTIFY_TOKEN: 'dummy_token',
-        LARGE_SECRET_PASSPHRASE: '3xtr3m3ly_53cr3t_p455w0rd',
-        SLACK_WEBHOOK: 'dummy_slack_webhook',
-        OS_BOTIFY_APP_ID: 'os_botify_app_id',
-        OS_BOTIFY_PRIVATE_KEY: 'os_botify_private_key',
-    };
-    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 ExtendedAct(repoPath, workflowPath);
-                        act = utils.setUpActParams(
-                            act,
-                            'issues',
-                            {
-                                action: 'closed',
-                                type: 'closed',
-                                issue: {
-                                    labels: [{name: 'StagingDeployCash'}],
-                                    number: '1234',
-                                },
-                            },
-                            secrets,
-                        );
-                        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: MockJobs = {
-                            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 ExtendedAct(repoPath, workflowPath);
-                        act = utils.setUpActParams(
-                            act,
-                            'issues',
-                            {
-                                action: 'closed',
-                                type: 'closed',
-                                issue: {
-                                    labels: [{name: 'StagingDeployCash'}],
-                                    number: '1234',
-                                },
-                            },
-                            secrets,
-                        );
-                        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 ExtendedAct(repoPath, workflowPath);
-                    act = utils.setUpActParams(
-                        act,
-                        'issues',
-                        {
-                            action: 'closed',
-                            type: 'closed',
-                            issue: {
-                                labels: [{name: 'StagingDeployCash'}],
-                                number: '1234',
-                            },
-                        },
-                        secrets,
-                    );
-                    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 ExtendedAct(repoPath, workflowPath);
-                act = utils.setUpActParams(
-                    act,
-                    'issues',
-                    {
-                        action: 'closed',
-                        type: 'closed',
-                        issue: {
-                            labels: [{name: 'Some'}, {name: 'Other'}, {name: 'Labels'}],
-                            number: '1234',
-                        },
-                    },
-                    secrets,
-                );
-                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.ts b/workflow_tests/jest.config.ts
deleted file mode 100644
index 8156e449039f..000000000000
--- a/workflow_tests/jest.config.ts
+++ /dev/null
@@ -1,13 +0,0 @@
-/* eslint-disable @typescript-eslint/naming-convention */
-import type {Config} from 'jest';
-
-const config: Config = {
-    verbose: true,
-    transform: {
-        '^.+\\.(js|jsx|ts|tsx)$': 'ts-jest',
-    },
-    clearMocks: true,
-    resetMocks: true,
-};
-
-export default config;
diff --git a/workflow_tests/lint.test.ts b/workflow_tests/lint.test.ts
deleted file mode 100644
index e0b0fb13859d..000000000000
--- a/workflow_tests/lint.test.ts
+++ /dev/null
@@ -1,155 +0,0 @@
-import {MockGithub} from '@kie/mock-github';
-import path from 'path';
-import assertions from './assertions/lintAssertions';
-import mocks from './mocks/lintMocks';
-import ExtendedAct from './utils/ExtendedAct';
-import * as utils from './utils/utils';
-
-jest.setTimeout(90 * 1000);
-let mockGithub: 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(() => {
-        // 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 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 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 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 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 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 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.ts b/workflow_tests/lockDeploys.test.ts
deleted file mode 100644
index c9b083b4d804..000000000000
--- a/workflow_tests/lockDeploys.test.ts
+++ /dev/null
@@ -1,462 +0,0 @@
-import type {MockStep} from '@kie/act-js/build/src/step-mocker/step-mocker.types';
-import {MockGithub} from '@kie/mock-github';
-import type {CreateRepositoryFile} from '@kie/mock-github';
-import path from 'path';
-import assertions from './assertions/lockDeploysAssertions';
-import mocks from './mocks/lockDeploysMocks';
-import ExtendedAct from './utils/ExtendedAct';
-import * as utils from './utils/utils';
-
-jest.setTimeout(90 * 1000);
-
-let mockGithub: MockGithub;
-
-const FILES_TO_COPY_INTO_TEST_REPO: CreateRepositoryFile[] = [
-    ...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(() => {
-        // 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 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 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: MockStep = {
-                            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 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: MockStep = {
-                            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 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: MockStep = {
-                            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 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: MockStep = {
-                            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 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: MockStep = {
-                            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 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: MockStep = {
-                            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 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: MockStep = {
-                            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 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: MockStep = {
-                            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 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: MockStep = {
-                            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.ts b/workflow_tests/mocks/authorChecklistMocks.ts
deleted file mode 100644
index 50e90ddae799..000000000000
--- a/workflow_tests/mocks/authorChecklistMocks.ts
+++ /dev/null
@@ -1,15 +0,0 @@
-/* eslint-disable @typescript-eslint/naming-convention */
-import type {StepIdentifier} from '@kie/act-js/build/src/step-mocker/step-mocker.types';
-import {createMockStep} from '../utils/utils';
-
-// checklist
-const AUTHORCHECKLIST__CHECKLIST__CHECKOUT__STEP_MOCK = createMockStep('Checkout', 'Checkout', 'CHECKLIST');
-const AUTHORCHECKLIST__CHECKLIST__AUTHORCHECKLIST_JS__STEP_MOCK = createMockStep('authorChecklist.ts', 'Running authorChecklist.ts', 'CHECKLIST', ['GITHUB_TOKEN'], []);
-const AUTHORCHECKLIST__CHECKLIST__STEP_MOCKS = [
-    AUTHORCHECKLIST__CHECKLIST__CHECKOUT__STEP_MOCK,
-    AUTHORCHECKLIST__CHECKLIST__AUTHORCHECKLIST_JS__STEP_MOCK,
-] as const satisfies StepIdentifier[];
-
-export default {
-    AUTHORCHECKLIST__CHECKLIST__STEP_MOCKS,
-};
diff --git a/workflow_tests/mocks/cherryPickMocks.ts b/workflow_tests/mocks/cherryPickMocks.ts
deleted file mode 100644
index c1a33be868d6..000000000000
--- a/workflow_tests/mocks/cherryPickMocks.ts
+++ /dev/null
@@ -1,113 +0,0 @@
-/* eslint-disable @typescript-eslint/naming-convention */
-import type {StepIdentifier} from '@kie/act-js/build/src/step-mocker/step-mocker.types';
-import {createMockStep} from '../utils/utils';
-
-// validateactor
-const CHERRYPICK__VALIDATEACTOR__CHECK_IF_USER_IS_DEPLOYER_TRUE__STEP_MOCK = 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 = 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 = 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 = createMockStep('Checkout staging branch', 'Checking out staging branch', 'CHERRYPICK', ['ref', 'token'], []);
-const CHERRYPICK__CHERRYPICK__SET_UP_GIT_FOR_OSBOTIFY__STEP_MOCK = createMockStep('Set up git for OSBotify', 'Setting up git for OSBotify', 'CHERRYPICK', ['GPG_PASSPHRASE'], [], {
-    OS_BOTIFY_API_TOKEN: 'os_botify_api_token',
-});
-const CHERRYPICK__CHERRYPICK__GET_PREVIOUS_APP_VERSION__STEP_MOCK = createMockStep('Get previous app version', 'Get previous app version', 'CHERRYPICK', ['SEMVER_LEVEL']);
-const CHERRYPICK__CHERRYPICK__FETCH_HISTORY_OF_RELEVANT_REFS__STEP_MOCK = createMockStep('Fetch history of relevant refs', 'Fetch history of relevant refs', 'CHERRYPICK');
-const CHERRYPICK__CHERRYPICK__GET_VERSION_BUMP_COMMIT__STEP_MOCK = createMockStep('Get version bump commit', 'Get version bump commit', 'CHERRYPICK', [], [], {
-    VERSION_BUMP_SHA: 'version_bump_sha',
-});
-const CHERRYPICK__CHERRYPICK__GET_MERGE_COMMIT_FOR_PULL_REQUEST_TO_CP__STEP_MOCK = 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 = 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 = 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 = 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 = createMockStep('Push changes', 'Pushing changes', 'CHERRYPICK', [], []);
-const CHERRYPICK__CHERRYPICK__CREATE_PULL_REQUEST_TO_MANUALLY_FINISH_CP__STEP_MOCK = createMockStep(
-    'Create Pull Request to manually finish CP',
-    'Creating Pull Request to manually finish CP',
-    'CHERRYPICK',
-    [],
-    ['GITHUB_TOKEN'],
-);
-const CHERRYPICK__CHERRYPICK__ANNOUNCES_A_CP_FAILURE_IN_THE_ANNOUNCE_SLACK_ROOM__STEP_MOCK = createMockStep(
-    'Announces a CP failure in the #announce Slack room',
-    'Announcing a CP failure',
-    'CHERRYPICK',
-    ['status'],
-    ['GITHUB_TOKEN', 'SLACK_WEBHOOK_URL'],
-);
-
-const getCherryPickMockSteps = (upToDate: boolean, hasConflicts: boolean): StepIdentifier[] => [
-    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,
-];
-
-export default {CHERRYPICK__CREATENEWVERSION__STEP_MOCKS, CHERRYPICK__VALIDATEACTOR__FALSE__STEP_MOCKS, CHERRYPICK__VALIDATEACTOR__TRUE__STEP_MOCKS, getCherryPickMockSteps};
diff --git a/workflow_tests/mocks/claMocks.ts b/workflow_tests/mocks/claMocks.ts
deleted file mode 100644
index ca065510cd4a..000000000000
--- a/workflow_tests/mocks/claMocks.ts
+++ /dev/null
@@ -1,22 +0,0 @@
-/* eslint-disable @typescript-eslint/naming-convention */
-import {createMockStep} from '../utils/utils';
-
-// cla
-const CLA__CLA__CLA_COMMENT_CHECK__NO_MATCH__STEP_MOCK = createMockStep('CLA comment check', 'CLA comment check', 'CLA', ['text', 'regex'], [], {match: ''});
-const CLA__CLA__CLA_COMMENT_CHECK__MATCH__STEP_MOCK = createMockStep('CLA comment check', 'CLA comment check', 'CLA', ['text', 'regex'], [], {
-    match: 'I have read the CLA Document and I hereby sign the CLA',
-});
-const CLA__CLA__CLA_COMMENT_RE_CHECK__NO_MATCH__STEP_MOCK = createMockStep('CLA comment re-check', 'CLA comment re-check', 'CLA', ['text', 'regex'], [], {match: ''});
-const CLA__CLA__CLA_COMMENT_RE_CHECK__MATCH__STEP_MOCK = createMockStep('CLA comment re-check', 'CLA comment re-check', 'CLA', ['text', 'regex'], [], {match: 'recheck'});
-const CLA__CLA__CLA_ASSISTANT__STEP_MOCK = createMockStep(
-    'CLA Assistant',
-    'CLA Assistant',
-    'CLA',
-    ['path-to-signatures', 'path-to-document', 'branch', 'remote-organization-name', 'remote-repository-name', 'lock-pullrequest-aftermerge', 'allowlist'],
-    ['GITHUB_TOKEN', 'PERSONAL_ACCESS_TOKEN'],
-);
-const CLA__CLA__NO_MATCHES__STEP_MOCKS = [CLA__CLA__CLA_COMMENT_CHECK__NO_MATCH__STEP_MOCK, CLA__CLA__CLA_COMMENT_RE_CHECK__NO_MATCH__STEP_MOCK, CLA__CLA__CLA_ASSISTANT__STEP_MOCK];
-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];
-
-export {CLA__CLA__NO_MATCHES__STEP_MOCKS, CLA__CLA__CHECK_MATCH__STEP_MOCKS, CLA__CLA__RECHECK_MATCH__STEP_MOCKS};
diff --git a/workflow_tests/mocks/createNewVersionMocks.ts b/workflow_tests/mocks/createNewVersionMocks.ts
deleted file mode 100644
index dd094e6459e8..000000000000
--- a/workflow_tests/mocks/createNewVersionMocks.ts
+++ /dev/null
@@ -1,48 +0,0 @@
-/* eslint-disable @typescript-eslint/naming-convention */
-import type {StepIdentifier} from '@kie/act-js';
-import {createMockStep} from '../utils/utils';
-
-// validateactor
-const CREATENEWVERSION__VALIDATEACTOR__GET_USER_PERMISSIONS__ADMIN__STEP_MOCK = createMockStep('Get user permissions', 'Get user permissions', 'VALIDATEACTOR', [], ['GITHUB_TOKEN'], {
-    PERMISSION: 'admin',
-});
-const CREATENEWVERSION__VALIDATEACTOR__GET_USER_PERMISSIONS__WRITE__STEP_MOCK = createMockStep('Get user permissions', 'Get user permissions', 'VALIDATEACTOR', [], ['GITHUB_TOKEN'], {
-    PERMISSION: 'write',
-});
-const CREATENEWVERSION__VALIDATEACTOR__GET_USER_PERMISSIONS__NONE__STEP_MOCK = createMockStep('Get user permissions', 'Get user permissions', 'VALIDATEACTOR', [], ['GITHUB_TOKEN'], {
-    PERMISSION: 'read',
-});
-const CREATENEWVERSION__VALIDATEACTOR__ADMIN__STEP_MOCKS = [CREATENEWVERSION__VALIDATEACTOR__GET_USER_PERMISSIONS__ADMIN__STEP_MOCK] as const satisfies StepIdentifier[];
-const CREATENEWVERSION__VALIDATEACTOR__WRITER__STEP_MOCKS = [CREATENEWVERSION__VALIDATEACTOR__GET_USER_PERMISSIONS__WRITE__STEP_MOCK] as const satisfies StepIdentifier[];
-const CREATENEWVERSION__VALIDATEACTOR__NO_PERMISSION__STEP_MOCKS = [CREATENEWVERSION__VALIDATEACTOR__GET_USER_PERMISSIONS__NONE__STEP_MOCK] as const satisfies StepIdentifier[];
-
-// createnewversion
-const CREATENEWVERSION__CREATENEWVERSION__RUN_TURNSTYLE__STEP_MOCK = createMockStep('Run turnstyle', 'Run turnstyle', 'CREATENEWVERSION', ['poll-interval-seconds'], ['GITHUB_TOKEN']);
-const CREATENEWVERSION__CREATENEWVERSION__CHECK_OUT__STEP_MOCK = createMockStep('Check out', 'Check out', 'CREATENEWVERSION', ['ref', 'token'], []);
-const CREATENEWVERSION__CREATENEWVERSION__SETUP_GIT_FOR_OSBOTIFY__STEP_MOCK = createMockStep('Setup git for OSBotify', 'Setup git for OSBotify', 'CREATENEWVERSION', ['GPG_PASSPHRASE'], []);
-const CREATENEWVERSION__CREATENEWVERSION__GENERATE_VERSION__STEP_MOCK = createMockStep('Generate version', 'Generate version', 'CREATENEWVERSION', ['GITHUB_TOKEN', 'SEMVER_LEVEL'], []);
-const CREATENEWVERSION__CREATENEWVERSION__COMMIT_NEW_VERSION__STEP_MOCK = createMockStep('Commit new version', 'Commit new version', 'CREATENEWVERSION', [], []);
-const CREATENEWVERSION__CREATENEWVERSION__UPDATE_MAIN_BRANCH__STEP_MOCK = createMockStep('Update main branch', 'Update main branch', 'CREATENEWVERSION', [], []);
-const CREATENEWVERSION__CREATENEWVERSION__ANNOUNCE_FAILED_WORKFLOW_IN_SLACK__STEP_MOCK = createMockStep(
-    'Announce failed workflow in Slack',
-    'Announce failed workflow in Slack',
-    'CREATENEWVERSION',
-    ['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,
-] as const satisfies StepIdentifier[];
-
-export default {
-    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.ts b/workflow_tests/mocks/deployBlockerMocks.ts
deleted file mode 100644
index b60d41383a1e..000000000000
--- a/workflow_tests/mocks/deployBlockerMocks.ts
+++ /dev/null
@@ -1,41 +0,0 @@
-/* eslint-disable @typescript-eslint/naming-convention */
-import type {StepIdentifier} from '@kie/act-js';
-import {createMockStep} from '../utils/utils';
-
-// updateChecklist
-const DEPLOYBLOCKER__UPDATECHECKLIST__STEP_MOCK = createMockStep('updateChecklist', 'Run updateChecklist', 'UPDATECHECKLIST');
-const DEPLOYBLOCKER__UPDATECHECKLIST__STEP_MOCKS = [DEPLOYBLOCKER__UPDATECHECKLIST__STEP_MOCK] as const satisfies StepIdentifier[];
-
-// deployblocker
-const DEPLOYBLOCKER__DEPLOYBLOCKER__CHECKOUT__STEP_MOCK = createMockStep('Checkout', 'Checkout', 'DEPLOYBLOCKER');
-const DEPLOYBLOCKER__DEPLOYBLOCKER__GIVE_LABELS__STEP_MOCK = createMockStep(
-    'Give the issue/PR the Hourly, Engineering labels',
-    'Give the issue/PR the Hourly, Engineering labels',
-    'DEPLOYBLOCKER',
-    [],
-    ['GITHUB_TOKEN'],
-);
-const DEPLOYBLOCKER__DEPLOYBLOCKER__POST_THE_ISSUE_IN_THE_EXPENSIFY_OPEN_SOURCE_SLACK_ROOM__STEP_MOCK = createMockStep(
-    'Post the issue in the #expensify-open-source slack room',
-    'Post the issue in the expensify-open-source slack room',
-    'DEPLOYBLOCKER',
-    ['status'],
-    ['GITHUB_TOKEN', 'SLACK_WEBHOOK_URL'],
-);
-const DEPLOYBLOCKER__DEPLOYBLOCKER__COMMENT_ON_DEPLOY_BLOCKER__STEP_MOCK = createMockStep('Comment on deploy blocker', 'Comment on deploy blocker', 'DEPLOYBLOCKER', [], ['GITHUB_TOKEN']);
-const DEPLOYBLOCKER__DEPLOYBLOCKER__ANNOUNCE_FAILED_WORKFLOW_IN_SLACK__STEP_MOCK = createMockStep(
-    'Announce failed workflow in Slack',
-    'Announce failed workflow in Slack',
-    'DEPLOYBLOCKER',
-    ['SLACK_WEBHOOK'],
-    [],
-);
-const DEPLOYBLOCKER__DEPLOYBLOCKER__STEP_MOCKS = [
-    DEPLOYBLOCKER__DEPLOYBLOCKER__CHECKOUT__STEP_MOCK,
-    DEPLOYBLOCKER__DEPLOYBLOCKER__GIVE_LABELS__STEP_MOCK,
-    DEPLOYBLOCKER__DEPLOYBLOCKER__POST_THE_ISSUE_IN_THE_EXPENSIFY_OPEN_SOURCE_SLACK_ROOM__STEP_MOCK,
-    DEPLOYBLOCKER__DEPLOYBLOCKER__COMMENT_ON_DEPLOY_BLOCKER__STEP_MOCK,
-    DEPLOYBLOCKER__DEPLOYBLOCKER__ANNOUNCE_FAILED_WORKFLOW_IN_SLACK__STEP_MOCK,
-] as const satisfies StepIdentifier[];
-
-export default {DEPLOYBLOCKER__UPDATECHECKLIST__STEP_MOCKS, DEPLOYBLOCKER__DEPLOYBLOCKER__STEP_MOCKS};
diff --git a/workflow_tests/mocks/deployMocks.ts b/workflow_tests/mocks/deployMocks.ts
deleted file mode 100644
index 5c0d79235d89..000000000000
--- a/workflow_tests/mocks/deployMocks.ts
+++ /dev/null
@@ -1,59 +0,0 @@
-/* eslint-disable @typescript-eslint/naming-convention */
-import type {StepIdentifier} from '@kie/act-js';
-import {createMockStep} from '../utils/utils';
-
-const DEPLOY_STAGING__CHECKOUT__STEP_MOCK = createMockStep('Checkout staging branch', 'Checking out staging branch', 'DEPLOY_STAGING', ['ref', 'token']);
-const DEPLOY_STAGING__SETUP_GIT__STEP_MOCK = createMockStep('Setup git for OSBotify', 'Setting up git for OSBotify', 'DEPLOY_STAGING', [
-    'GPG_PASSPHRASE',
-    'OS_BOTIFY_APP_ID',
-    'OS_BOTIFY_PRIVATE_KEY',
-]);
-const DEPLOY_STAGING__TAG_VERSION__STEP_MOCK = createMockStep('Tag version', 'Tagging new version', 'DEPLOY_STAGING');
-const DEPLOY_STAGING__PUSH_TAG__STEP_MOCK = createMockStep('🚀 Push tags to trigger staging deploy 🚀', 'Pushing tag to trigger staging deploy', 'DEPLOY_STAGING');
-const DEPLOY_STAGING_STEP_MOCKS = [
-    DEPLOY_STAGING__CHECKOUT__STEP_MOCK,
-    DEPLOY_STAGING__SETUP_GIT__STEP_MOCK,
-    DEPLOY_STAGING__TAG_VERSION__STEP_MOCK,
-    DEPLOY_STAGING__PUSH_TAG__STEP_MOCK,
-] as const satisfies StepIdentifier[];
-
-const DEPLOY_PRODUCTION__CHECKOUT__STEP_MOCK = createMockStep('Checkout', 'Checking out', 'DEPLOY_PRODUCTION', ['ref', 'token']);
-const DEPLOY_PRODUCTION__SETUP_GIT__STEP_MOCK = createMockStep(
-    'Setup git for OSBotify',
-    'Setting up git for OSBotify',
-    'DEPLOY_PRODUCTION',
-    ['GPG_PASSPHRASE', 'OS_BOTIFY_APP_ID', 'OS_BOTIFY_PRIVATE_KEY'],
-    null,
-    {OS_BOTIFY_API_TOKEN: 'os_botify_api_token'},
-);
-const DEPLOY_PRODUCTION__CURRENT_APP_VERSION__STEP_MOCK = createMockStep('Get current app version', 'Getting current app version', 'DEPLOY_PRODUCTION', null, null, null, {
-    PRODUCTION_VERSION: '1.2.3',
-});
-const DEPLOY_PRODUCTION__RELEASE_PR_LIST__STEP_MOCK = createMockStep(
-    'Get Release Pull Request List',
-    'Getting release PR list',
-    'DEPLOY_PRODUCTION',
-    ['TAG', 'GITHUB_TOKEN', 'IS_PRODUCTION_DEPLOY'],
-    null,
-    {PR_LIST: '["1.2.1", "1.2.2"]'},
-);
-const DEPLOY_PRODUCTION__GENERATE_RELEASE_BODY__STEP_MOCK = createMockStep('Generate Release Body', 'Generating release body', 'DEPLOY_PRODUCTION', ['PR_LIST'], null, {
-    RELEASE_BODY: 'Release body',
-});
-const DEPLOY_PRODUCTION__CREATE_RELEASE__STEP_MOCK = createMockStep(
-    '🚀 Create release to trigger production deploy 🚀',
-    'Creating release to trigger production deploy',
-    'DEPLOY_PRODUCTION',
-    ['tag_name', 'body'],
-    ['GITHUB_TOKEN'],
-);
-const DEPLOY_PRODUCTION_STEP_MOCKS = [
-    DEPLOY_PRODUCTION__CHECKOUT__STEP_MOCK,
-    DEPLOY_PRODUCTION__SETUP_GIT__STEP_MOCK,
-    DEPLOY_PRODUCTION__CURRENT_APP_VERSION__STEP_MOCK,
-    DEPLOY_PRODUCTION__RELEASE_PR_LIST__STEP_MOCK,
-    DEPLOY_PRODUCTION__GENERATE_RELEASE_BODY__STEP_MOCK,
-    DEPLOY_PRODUCTION__CREATE_RELEASE__STEP_MOCK,
-] as const satisfies StepIdentifier[];
-
-export default {DEPLOY_STAGING_STEP_MOCKS, DEPLOY_PRODUCTION_STEP_MOCKS};
diff --git a/workflow_tests/mocks/failureNotifierMocks.ts b/workflow_tests/mocks/failureNotifierMocks.ts
deleted file mode 100644
index ca4009aef952..000000000000
--- a/workflow_tests/mocks/failureNotifierMocks.ts
+++ /dev/null
@@ -1,27 +0,0 @@
-/* eslint-disable @typescript-eslint/naming-convention */
-
-/* eslint-disable rulesdir/no-negated-variables */
-import {createMockStep} from '../utils/utils';
-
-// notifyfailure
-const FAILURENOTIFIER__NOTIFYFAILURE__FETCH_WORKFLOW_RUN_JOBS__STEP_MOCK = createMockStep('Fetch Workflow Run Jobs', 'Fetch Workflow Run Jobs', 'NOTIFYFAILURE', [], []);
-const FAILURENOTIFIER__NOTIFYFAILURE_FETCH_PREVIOUS_WORKFLOW_RUN__STEP_MOCK = createMockStep('Fetch Previous Workflow Run', 'Fetch Previous Workflow Run', 'NOTIFYFAILURE', [], []);
-const FAILURENOTIFIER__NOTIFYFAILURE_FETCH_PREVIOUS_WORKFLOW_RUN_JOBS__STEP_MOCK = createMockStep(
-    'Fetch Previous Workflow Run Jobs',
-    'Fetch Previous Workflow Run Jobs',
-    'NOTIFYFAILURE',
-    [],
-    [],
-);
-const FAILURENOTIFIER__NOTIFYFAILURE__PROCESS_EACH_FAILED_JOB__STEP_MOCK = createMockStep('Process Each Failed Job', 'Process Each Failed Job', 'NOTIFYFAILURE', [], []);
-
-const FAILURENOTIFIER__NOTIFYFAILURE__STEP_MOCKS = [
-    FAILURENOTIFIER__NOTIFYFAILURE__FETCH_WORKFLOW_RUN_JOBS__STEP_MOCK,
-    FAILURENOTIFIER__NOTIFYFAILURE_FETCH_PREVIOUS_WORKFLOW_RUN__STEP_MOCK,
-    FAILURENOTIFIER__NOTIFYFAILURE_FETCH_PREVIOUS_WORKFLOW_RUN_JOBS__STEP_MOCK,
-    FAILURENOTIFIER__NOTIFYFAILURE__PROCESS_EACH_FAILED_JOB__STEP_MOCK,
-];
-
-export default {
-    FAILURENOTIFIER__NOTIFYFAILURE__STEP_MOCKS,
-};
diff --git a/workflow_tests/mocks/finishReleaseCycleMocks.ts b/workflow_tests/mocks/finishReleaseCycleMocks.ts
deleted file mode 100644
index 23d81a557705..000000000000
--- a/workflow_tests/mocks/finishReleaseCycleMocks.ts
+++ /dev/null
@@ -1,178 +0,0 @@
-/* eslint-disable @typescript-eslint/naming-convention */
-import type {StepIdentifier} from '@kie/act-js';
-import {createMockStep} from '../utils/utils';
-
-// validate
-const FINISHRELEASECYCLE__VALIDATE__CHECKOUT__STEP_MOCK = createMockStep('Checkout', 'Checkout', 'VALIDATE', ['ref', 'token']);
-const FINISHRELEASECYCLE__VALIDATE__SETUP_GIT_FOR_OSBOTIFY__STEP_MOCK = createMockStep(
-    'Setup git for OSBotify',
-    'Setup git for OSBotify',
-    'VALIDATE',
-    ['GPG_PASSPHRASE', 'OS_BOTIFY_APP_ID', 'OS_BOTIFY_PRIVATE_KEY'],
-    [],
-    {OS_BOTIFY_API_TOKEN: 'os_botify_api_token'},
-);
-const FINISHRELEASECYCLE__VALIDATE__VALIDATE_ACTOR_IS_DEPLOYER_TRUE__STEP_MOCK = 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 = 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 = 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 = 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 = 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 = 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 = 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__CHECKOUT__STEP_MOCK,
-    FINISHRELEASECYCLE__VALIDATE__SETUP_GIT_FOR_OSBOTIFY__STEP_MOCK,
-    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,
-] as const satisfies StepIdentifier[];
-const FINISHRELEASECYCLE__VALIDATE__TEAM_MEMBER_BLOCKERS__STEP_MOCKS = [
-    FINISHRELEASECYCLE__VALIDATE__CHECKOUT__STEP_MOCK,
-    FINISHRELEASECYCLE__VALIDATE__SETUP_GIT_FOR_OSBOTIFY__STEP_MOCK,
-    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,
-] as const satisfies StepIdentifier[];
-// eslint-disable-next-line rulesdir/no-negated-variables
-const FINISHRELEASECYCLE__VALIDATE__NOT_TEAM_MEMBER_NO_BLOCKERS__STEP_MOCKS = [
-    FINISHRELEASECYCLE__VALIDATE__CHECKOUT__STEP_MOCK,
-    FINISHRELEASECYCLE__VALIDATE__SETUP_GIT_FOR_OSBOTIFY__STEP_MOCK,
-    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,
-] as const satisfies StepIdentifier[];
-// eslint-disable-next-line rulesdir/no-negated-variables
-const FINISHRELEASECYCLE__VALIDATE__NOT_TEAM_MEMBER_BLOCKERS__STEP_MOCKS = [
-    FINISHRELEASECYCLE__VALIDATE__CHECKOUT__STEP_MOCK,
-    FINISHRELEASECYCLE__VALIDATE__SETUP_GIT_FOR_OSBOTIFY__STEP_MOCK,
-    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 = createMockStep('Checkout', 'Checkout', 'UPDATEPRODUCTION', ['ref', 'token'], []);
-const FINISHRELEASECYCLE__UPDATEPRODUCTION__SETUP_GIT_FOR_OSBOTIFY__STEP_MOCK = createMockStep(
-    'Setup git for OSBotify',
-    'Setup git for OSBotify',
-    'UPDATEPRODUCTION',
-    ['GPG_PASSPHRASE'],
-    [],
-);
-const FINISHRELEASECYCLE__UPDATEPRODUCTION__UPDATE_PRODUCTION_BRANCH__STEP_MOCK = createMockStep('Update production branch', 'Updating production branch', 'UPDATEPRODUCTION', [], []);
-const FINISHRELEASECYCLE__UPDATEPRODUCTION__ANNOUNCE_FAILED_WORKFLOW_IN_SLACK__STEP_MOCK = createMockStep(
-    'Announce failed workflow in Slack',
-    'Announce failed workflow in Slack',
-    'UPDATEPRODUCTION',
-    ['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,
-] as const satisfies StepIdentifier[];
-
-// createnewpatchversion
-const FINISHRELEASECYCLE__CREATENEWPATCHVERSION__CREATE_NEW_VERSION__STEP_MOCK = 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] as const satisfies StepIdentifier[];
-
-// updatestaging
-const FINISHRELEASECYCLE__UPDATESTAGING__CHECKOUT__STEP_MOCK = createMockStep('Checkout', 'Checkout', 'UPDATESTAGING', ['ref', 'token'], []);
-const FINISHRELEASECYCLE__UPDATESTAGING__SETUP_GIT_FOR_OSBOTIFY__STEP_MOCK = createMockStep('Setup git for OSBotify', 'Setup git for OSBotify', 'UPDATESTAGING', ['GPG_PASSPHRASE'], []);
-const FINISHRELEASECYCLE__UPDATESTAGING__UPDATE_STAGING_BRANCH_TO_TRIGGER_STAGING_DEPLOY__STEP_MOCK = createMockStep(
-    'Update staging branch to trigger staging deploy',
-    'Updating staging branch',
-    'UPDATESTAGING',
-    [],
-    [],
-);
-const FINISHRELEASECYCLE__UPDATESTAGING__ANNOUNCE_FAILED_WORKFLOW_IN_SLACK__STEP_MOCK = 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,
-] as const satisfies StepIdentifier[];
-
-export default {
-    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.ts b/workflow_tests/mocks/lintMocks.ts
deleted file mode 100644
index 27ce53afc1f4..000000000000
--- a/workflow_tests/mocks/lintMocks.ts
+++ /dev/null
@@ -1,19 +0,0 @@
-/* eslint-disable @typescript-eslint/naming-convention */
-import type {StepIdentifier} from '@kie/act-js';
-import {createMockStep} from '../utils/utils';
-
-// lint
-const LINT__LINT__CHECKOUT__STEP_MOCK = createMockStep('Checkout', 'Checkout', 'LINT', [], []);
-const LINT__LINT__SETUP_NODE__STEP_MOCK = createMockStep('Setup Node', 'Setup Node', 'LINT', [], []);
-const LINT__LINT__LINT_JAVASCRIPT_WITH_ESLINT__STEP_MOCK = createMockStep('Lint JavaScript and Typescript with ESLint', 'Lint JavaScript with ESLint', 'LINT', [], ['CI']);
-const LINT__LINT__VERIFY_NO_PRETTIER__STEP_MOCK = createMockStep("Verify there's no Prettier diff", 'Verify theres no Prettier diff', 'LINT');
-const LINT__LINT__RUN_UNUSED_SEARCHER__STEP_MOCK = createMockStep('Run unused style searcher', 'Run unused style searcher', 'LINT');
-const LINT__LINT__STEP_MOCKS = [
-    LINT__LINT__CHECKOUT__STEP_MOCK,
-    LINT__LINT__SETUP_NODE__STEP_MOCK,
-    LINT__LINT__LINT_JAVASCRIPT_WITH_ESLINT__STEP_MOCK,
-    LINT__LINT__VERIFY_NO_PRETTIER__STEP_MOCK,
-    LINT__LINT__RUN_UNUSED_SEARCHER__STEP_MOCK,
-] as const satisfies StepIdentifier[];
-
-export default {LINT__LINT__STEP_MOCKS};
diff --git a/workflow_tests/mocks/lockDeploysMocks.ts b/workflow_tests/mocks/lockDeploysMocks.ts
deleted file mode 100644
index 138b30fbb306..000000000000
--- a/workflow_tests/mocks/lockDeploysMocks.ts
+++ /dev/null
@@ -1,36 +0,0 @@
-/* eslint-disable @typescript-eslint/naming-convention */
-import {createMockStep} from '../utils/utils';
-
-// lockstagingdeploys
-const LOCKDEPLOYS__LOCKSTAGINGDEPLOYS__CHECKOUT__STEP_MOCK = createMockStep('Checkout', 'Checking out', 'LOCKSTAGINGDEPLOYS', ['ref', 'token'], []);
-const LOCKDEPLOYS__LOCKSTAGINGDEPLOYS__WAIT_FOR_STAGING_DEPLOYS_TO_FINISH__STEP_MOCK = createMockStep(
-    'Wait for staging deploys to finish',
-    'Waiting for staging deploys to finish',
-    'LOCKSTAGINGDEPLOYS',
-    ['GITHUB_TOKEN'],
-    [],
-);
-const LOCKDEPLOYS__LOCKSTAGINGDEPLOYS__COMMENT_IN_STAGINGDEPLOYCASH_TO_GIVE_APPLAUSE_THE_GREEN_LIGHT_TO_BEGIN_QA__STEP_MOCK = 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 = 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,
-];
-
-export default {
-    LOCKDEPLOYS__LOCKSTAGINGDEPLOYS__STEP_MOCKS,
-};
diff --git a/workflow_tests/mocks/platformDeployMocks.ts b/workflow_tests/mocks/platformDeployMocks.ts
deleted file mode 100644
index 9d5727bbf5f5..000000000000
--- a/workflow_tests/mocks/platformDeployMocks.ts
+++ /dev/null
@@ -1,281 +0,0 @@
-/* eslint-disable @typescript-eslint/naming-convention */
-import {createMockStep} from '../utils/utils';
-
-// validateActor
-const PLATFORM_DEPLOY__VALIDATE_ACTOR__CHECK_USER_DEPLOYER__TEAM_MEMBER__STEP_MOCK = createMockStep(
-    'Check if user is deployer',
-    'Checking if the user is a deployer',
-    'VALIDATE_ACTOR',
-    [],
-    ['GITHUB_TOKEN'],
-    {IS_DEPLOYER: true},
-);
-const PLATFORM_DEPLOY__VALIDATE_ACTOR__CHECK_USER_DEPLOYER__OUTSIDER__STEP_MOCK = createMockStep(
-    'Check if user is deployer',
-    'Checking if the user is a deployer',
-    'VALIDATE_ACTOR',
-    [],
-    ['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__STEP_MOCK = createMockStep('deployChecklist', 'Run deployChecklist', 'DEPLOY_CHECKLIST');
-const PLATFORM_DEPLOY__DEPLOY_CHECKLIST__STEP_MOCKS = [PLATFORM_DEPLOY__DEPLOY_CHECKLIST__STEP_MOCK];
-
-// android
-const PLATFORM_DEPLOY__ANDROID__CHECKOUT__STEP_MOCK = createMockStep('Checkout', 'Checking out', 'ANDROID');
-const PLATFORM_DEPLOY__ANDROID__CONFIGURE_MAPBOX_SDK__STEP_MOCK = createMockStep('Configure MapBox SDK', 'Configure MapBox SDK', 'ANDROID');
-const PLATFORM_DEPLOY__ANDROID__SETUP_NODE__STEP_MOCK = createMockStep('Setup Node', 'Setting up Node', 'ANDROID');
-const PLATFORM_DEPLOY__ANDROID__SETUP_JAVA__STEP_MOCK = createMockStep('Setup Java', 'Setup Java', 'ANDROID', ['distribution', 'java-version'], []);
-const PLATFORM_DEPLOY__ANDROID__SETUP_RUBY__STEP_MOCK = createMockStep('Setup Ruby', 'Setting up Ruby', 'ANDROID', ['ruby-version', 'bundler-cache']);
-const PLATFORM_DEPLOY__ANDROID__DECRYPT_KEYSTORE__STEP_MOCK = createMockStep('Decrypt keystore', 'Decrypting keystore', 'ANDROID', null, ['LARGE_SECRET_PASSPHRASE']);
-const PLATFORM_DEPLOY__ANDROID__DECRYPT_JSON_KEY__STEP_MOCK = createMockStep('Decrypt json key', 'Decrypting JSON key', 'ANDROID', null, ['LARGE_SECRET_PASSPHRASE']);
-const PLATFORM_DEPLOY__ANDROID__SET_VERSION__STEP_MOCK = createMockStep('Set version in ENV', 'Setting version in ENV', 'ANDROID', null, null, null, {VERSION_CODE: '1.2.3'});
-const PLATFORM_DEPLOY__ANDROID__FASTLANE_BETA__STEP_MOCK = createMockStep('Run Fastlane beta', 'Running Fastlane beta', 'ANDROID', null, [
-    'MYAPP_UPLOAD_STORE_PASSWORD',
-    'MYAPP_UPLOAD_KEY_PASSWORD',
-]);
-const PLATFORM_DEPLOY__ANDROID__ARCHIVE_SOURCEMAPS__STEP_MOCK = createMockStep('Archive Android sourcemaps', 'Archiving Android sourcemaps', 'ANDROID', ['name', 'path']);
-const PLATFORM_DEPLOY__ANDROID__UPLOAD_ANDROID_VERSION_TO_GITHUB_ARTIFACTS__STEP_MOCK = createMockStep(
-    'Upload Android version to GitHub artifacts',
-    'Upload Android version to GitHub artifacts',
-    'ANDROID',
-    ['name', 'path'],
-);
-const PLATFORM_DEPLOY__ANDROID__UPLOAD_TO_BROWSER_STACK__STEP_MOCK = createMockStep(
-    'Upload Android version to Browser Stack',
-    'Uploading Android version to Browser Stack',
-    'ANDROID',
-    null,
-    ['BROWSERSTACK'],
-);
-const PLATFORM_DEPLOY__ANDROID__WARN_DEPLOYERS__STEP_MOCK = 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_JAVA__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__ARCHIVE_SOURCEMAPS__STEP_MOCK,
-    PLATFORM_DEPLOY__ANDROID__UPLOAD_ANDROID_VERSION_TO_GITHUB_ARTIFACTS__STEP_MOCK,
-    PLATFORM_DEPLOY__ANDROID__UPLOAD_TO_BROWSER_STACK__STEP_MOCK,
-    PLATFORM_DEPLOY__ANDROID__WARN_DEPLOYERS__STEP_MOCK,
-];
-
-// desktop
-const PLATFORM_DEPLOY__DESKTOP__CHECKOUT__STEP_MOCK = createMockStep('Checkout', 'Checking out', 'DESKTOP');
-const PLATFORM_DEPLOY__DESKTOP__SETUP_NODE__STEP_MOCK = createMockStep('Setup Node', 'Setting up Node', 'DESKTOP');
-const PLATFORM_DEPLOY__DESKTOP__DECRYPT_ID__STEP_MOCK = createMockStep('Decrypt Developer ID Certificate', 'Decrypting developer id certificate', 'DESKTOP', null, [
-    'DEVELOPER_ID_SECRET_PASSPHRASE',
-]);
-const PLATFORM_DEPLOY__DESKTOP__BUILD_PRODUCTION__STEP_MOCK = 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 = 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 = createMockStep('Checkout', 'Checking out', 'IOS');
-const PLATFORM_DEPLOY__IOS__CONFIGURE_MAPBOX_SDK__STEP_MOCK = createMockStep('Configure MapBox SDK', 'Configure MapBox SDK', 'IOS');
-const PLATFORM_DEPLOY__IOS__SETUP_NODE__STEP_MOCK = createMockStep('Setup Node', 'Setting up Node', 'IOS');
-const PLATFORM_DEPLOY__IOS__SETUP_RUBY__STEP_MOCK = createMockStep('Setup Ruby', 'Setting up Ruby', 'IOS', ['ruby-version', 'bundler-cache']);
-const PLATFORM_DEPLOY__IOS__CACHE_POD_DEPENDENCIES__STEP_MOCK = createMockStep('Cache Pod dependencies', 'Cache Pod dependencies', 'IOS', ['path', 'key', 'restore-keys'], [], {
-    'cache-hit': false,
-});
-const PLATFORM_DEPLOY__IOS__COMPARE_PODFILE_AND_MANIFEST__STEP_MOCK = createMockStep('Compare Podfile.lock and Manifest.lock', 'Compare Podfile.lock and Manifest.lock', 'IOS', [], [], {
-    IS_PODFILE_SAME_AS_MANIFEST: false,
-});
-const PLATFORM_DEPLOY__IOS__COCOAPODS__STEP_MOCK = createMockStep('Install cocoapods', 'Installing cocoapods', 'IOS', ['timeout_minutes', 'max_attempts', 'command']);
-const PLATFORM_DEPLOY__IOS__DECRYPT_APPSTORE_PROFILE__STEP_MOCK = createMockStep('Decrypt AppStore profile', 'Decrypting profile', 'IOS', null, ['LARGE_SECRET_PASSPHRASE']);
-const PLATFORM_DEPLOY__IOS__DECRYPT_APPSTORE_NSE_PROFILE__STEP_MOCK = createMockStep('Decrypt AppStore Notification Service profile', 'Decrypting profile', 'IOS', null, [
-    'LARGE_SECRET_PASSPHRASE',
-]);
-const PLATFORM_DEPLOY__IOS__DECRYPT_CERTIFICATE__STEP_MOCK = createMockStep('Decrypt certificate', 'Decrypting certificate', 'IOS', null, ['LARGE_SECRET_PASSPHRASE']);
-const PLATFORM_DEPLOY__IOS__DECRYPT_APP_STORE_API_KEY__STEP_MOCK = createMockStep('Decrypt App Store Connect API key', 'Decrypting App Store API key', 'IOS', null, [
-    'LARGE_SECRET_PASSPHRASE',
-]);
-const PLATFORM_DEPLOY__IOS__FASTLANE__STEP_MOCK = 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 = createMockStep('Archive iOS sourcemaps', 'Archiving sourcemaps', 'IOS', ['name', 'path']);
-const PLATFORM_DEPLOY__IOS__UPLOAD_IOS_VERSION_TO_GITHUB_ARTIFACTS__STEP_MOCK = createMockStep('Upload iOS version to GitHub artifacts', 'Upload iOS version to GitHub artifacts', 'IOS', [
-    'name',
-    'path',
-]);
-const PLATFORM_DEPLOY__IOS__UPLOAD_BROWSERSTACK__STEP_MOCK = createMockStep('Upload iOS version to Browser Stack', 'Uploading version to Browser Stack', 'IOS', null, ['BROWSERSTACK']);
-const PLATFORM_DEPLOY__IOS__SET_VERSION__STEP_MOCK = createMockStep('Set iOS version in ENV', 'Setting iOS version', 'IOS', null, null, null, {IOS_VERSION: '1.2.3'});
-const PLATFORM_DEPLOY__IOS__RELEASE_FASTLANE__STEP_MOCK = createMockStep('Run Fastlane for App Store release', 'Running Fastlane for release', 'IOS', null, ['VERSION']);
-const PLATFORM_DEPLOY__IOS__WARN_FAIL__STEP_MOCK = createMockStep(
-    'Warn deployers if iOS production deploy failed',
-    'Warning developers of failed deploy',
-    'IOS',
-    ['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_APPSTORE_PROFILE__STEP_MOCK,
-    PLATFORM_DEPLOY__IOS__DECRYPT_APPSTORE_NSE_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_IOS_VERSION_TO_GITHUB_ARTIFACTS__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 = createMockStep('Checkout', 'Checking out', 'WEB');
-const PLATFORM_DEPLOY__WEB__SETUP_NODE__STEP_MOCK = createMockStep('Setup Node', 'Setting up Node', 'WEB');
-const PLATFORM_DEPLOY__WEB__CLOUDFLARE__STEP_MOCK = createMockStep('Setup Cloudflare CLI', 'Setting up Cloudflare CLI', 'WEB');
-const PLATFORM_DEPLOY__WEB__AWS_CREDENTIALS__STEP_MOCK = createMockStep('Configure AWS Credentials', 'Configuring AWS credentials', 'WEB', [
-    'aws-access-key-id',
-    'aws-secret-access-key',
-    'aws-region',
-]);
-const PLATFORM_DEPLOY__WEB__BUILD_PRODUCTION__STEP_MOCK = createMockStep('Build web for production', 'Building web for production', 'WEB');
-const PLATFORM_DEPLOY__WEB__BUILD_STAGING__STEP_MOCK = createMockStep('Build web for staging', 'Building web for staging', 'WEB');
-const PLATFORM_DEPLOY__WEB__BUILD_STORYBOOK_DOCS_FOR_PRODUCTION__STEP_MOCK = createMockStep('Build storybook docs for production', 'Build storybook docs for production', 'WEB');
-const PLATFORM_DEPLOY__WEB__BUILD_STORYBOOK_DOCS_FOR_STAGING__STEP_MOCK = createMockStep('Build storybook docs for staging', 'Build storybook docs for staging', 'WEB');
-const PLATFORM_DEPLOY__WEB__DEPLOY_PRODUCTION_S3__STEP_MOCK = createMockStep('Deploy production to S3', 'Deploying production to S3', 'WEB');
-const PLATFORM_DEPLOY__WEB__DEPLOY_STAGING_S3__STEP_MOCK = createMockStep('Deploy staging to S3', 'Deploying staging to S3', 'WEB');
-const PLATFORM_DEPLOY__WEB__PURGE_PRODUCTION_CACHE__STEP_MOCK = createMockStep('Purge production Cloudflare cache', 'Purging production Cloudflare cache', 'WEB', null, ['CF_API_KEY']);
-const PLATFORM_DEPLOY__WEB__PURGE_STAGING_CACHE__STEP_MOCK = createMockStep('Purge staging Cloudflare cache', 'Purging staging Cloudflare cache', 'WEB', null, ['CF_API_KEY']);
-const PLATFORM_DEPLOY__WEB__STEP_MOCKS = [
-    PLATFORM_DEPLOY__WEB__CHECKOUT__STEP_MOCK,
-    PLATFORM_DEPLOY__WEB__SETUP_NODE__STEP_MOCK,
-    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 = 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 = createMockStep('Checkout', 'Checking out', 'POST_SLACK_SUCCESS');
-const PLATFORM_DEPLOY__POST_SLACK_SUCCESS__SET_VERSION__STEP_MOCK = createMockStep('Set version', 'Setting version', 'POST_SLACK_SUCCESS', null, null, null, {VERSION: '1.2.3'});
-const PLATFORM_DEPLOY__POST_SLACK_SUCCESS__ANNOUNCE_CHANNEL__STEP_MOCK = createMockStep(
-    'Announces the deploy in the #announce Slack room',
-    'Posting message to \\#announce channel',
-    'POST_SLACK_SUCCESS',
-    ['status'],
-    ['GITHUB_TOKEN', 'SLACK_WEBHOOK_URL'],
-);
-const PLATFORM_DEPLOY__POST_SLACK_SUCCESS__DEPLOYER_CHANNEL__STEP_MOCK = 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 = 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 = createMockStep('Checkout', 'Checking out', 'POST_GITHUB_COMMENT');
-const PLATFORM_DEPLOY__POST_GIHUB_COMMENT__SETUP_NODE__STEP_MOCK = createMockStep('Setup Node', 'Setting up Node', 'POST_GITHUB_COMMENT');
-const PLATFORM_DEPLOY__POST_GIHUB_COMMENT__SET_VERSION__STEP_MOCK = createMockStep('Set version', 'Setting version', 'POST_GITHUB_COMMENT', null, null, null, {VERSION: '1.2.3'});
-const PLATFORM_DEPLOY__POST_GIHUB_COMMENT__GET_PR_LIST__STEP_MOCK = createMockStep(
-    'Get Release Pull Request List',
-    'Getting release pull request list',
-    'POST_GITHUB_COMMENT',
-    ['TAG', 'GITHUB_TOKEN', 'IS_PRODUCTION_DEPLOY'],
-    null,
-    {PR_LIST: '[1.2.1, 1.2.2]'},
-);
-const PLATFORM_DEPLOY__POST_GIHUB_COMMENT__COMMENT__STEP_MOCK = createMockStep('Comment on issues', 'Commenting on issues', 'POST_GITHUB_COMMENT', [
-    'PR_LIST',
-    'IS_PRODUCTION_DEPLOY',
-    'DEPLOY_VERSION',
-    '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,
-];
-
-export default {
-    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.ts b/workflow_tests/mocks/preDeployMocks.ts
deleted file mode 100644
index 12156a690804..000000000000
--- a/workflow_tests/mocks/preDeployMocks.ts
+++ /dev/null
@@ -1,94 +0,0 @@
-/* eslint-disable @typescript-eslint/naming-convention */
-import {createMockStep} from '../utils/utils';
-
-// typecheck
-const TYPECHECK_WORKFLOW_MOCK_STEP = createMockStep('Run typecheck workflow', 'Running typecheck workflow', 'TYPECHECK');
-const TYPECHECK_JOB_MOCK_STEPS = [TYPECHECK_WORKFLOW_MOCK_STEP];
-
-// lint
-const LINT_WORKFLOW_MOCK_STEP = createMockStep('Run lint workflow', 'Running lint workflow', 'LINT');
-const LINT_JOB_MOCK_STEPS = [LINT_WORKFLOW_MOCK_STEP];
-
-// test
-const TEST_WORKFLOW_MOCK_STEP = 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 = 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 = createMockStep('Get merged pull request', 'Getting merged pull request', 'CHOOSE_DEPLOY_ACTIONS', ['github_token'], null, {
-    number: '123',
-    labels: '[]',
-});
-const CHECK_IF_STAGINGDEPLOYCASH_IS_LOCKED_MOCK_STEP__LOCKED = createMockStep(
-    'Check if StagingDeployCash is locked',
-    'Checking StagingDeployCash',
-    'CHOOSE_DEPLOY_ACTIONS',
-    ['GITHUB_TOKEN'],
-    null,
-    {IS_LOCKED: true},
-);
-const CHECK_IF_STAGINGDEPLOYCASH_IS_LOCKED_MOCK_STEP__UNLOCKED = createMockStep(
-    'Check if StagingDeployCash is locked',
-    'Checking StagingDeployCash',
-    'CHOOSE_DEPLOY_ACTIONS',
-    ['GITHUB_TOKEN'],
-    null,
-    {IS_LOCKED: false},
-);
-const CHOOSE_DEPLOY_ACTIONS_JOB_MOCK_STEPS__STAGING_LOCKED = [
-    GET_MERGED_PULL_REQUEST_MOCK_STEP__CHOOSE_DEPLOY,
-    CHECK_IF_STAGINGDEPLOYCASH_IS_LOCKED_MOCK_STEP__LOCKED,
-
-    // step 3 runs normally
-];
-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 = 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 = 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 = createMockStep('Run turnstyle', 'Running turnstyle', 'UPDATE_STAGING', ['poll-interval-seconds'], ['GITHUB_TOKEN']);
-const CHECKOUT_MAIN_MOCK_STEP = createMockStep('Checkout main', 'Checkout main', 'UPDATE_STAGING', ['ref', 'token']);
-const SETUP_GIT_FOR_OSBOTIFY_MOCK_STEP = createMockStep('Setup Git for OSBotify', 'Setup Git for OSBotify', 'UPDATE_STAGING', ['GPG_PASSPHRASE']);
-const UPDATE_STAGING_BRANCH_FROM_MAIN_MOCK_STEP = createMockStep('Update staging branch from main', 'Update staging branch from main', 'UPDATE_STAGING');
-const ANNOUNCE_FAILED_WORKFLOW_IN_SLACK_MOCK_STEP = createMockStep('Announce failed workflow in Slack', 'Announcing failed workflow in Slack', 'UPDATE_STAGING', ['SLACK_WEBHOOK']);
-const UPDATE_STAGING_JOB_MOCK_STEPS = [
-    RUN_TURNSTYLE_MOCK_STEP,
-    CHECKOUT_MAIN_MOCK_STEP,
-    SETUP_GIT_FOR_OSBOTIFY_MOCK_STEP,
-    UPDATE_STAGING_BRANCH_FROM_MAIN_MOCK_STEP,
-    ANNOUNCE_FAILED_WORKFLOW_IN_SLACK_MOCK_STEP,
-];
-
-const PREDEPLOY__E2EPERFORMANCETESTS__PERFORM_E2E_TESTS__MOCK_STEP = createMockStep('Perform E2E tests', 'Perform E2E tests', 'E2EPERFORMANCETESTS');
-const PREDEPLOY__E2EPERFORMANCETESTS__MOCK_STEPS = [PREDEPLOY__E2EPERFORMANCETESTS__PERFORM_E2E_TESTS__MOCK_STEP];
-
-export default {
-    TYPECHECK_JOB_MOCK_STEPS,
-    LINT_JOB_MOCK_STEPS,
-    TEST_JOB_MOCK_STEPS,
-    CONFIRM_PASSING_BUILD_JOB_MOCK_STEPS,
-    CHOOSE_DEPLOY_ACTIONS_JOB_MOCK_STEPS__STAGING_LOCKED,
-    CHOOSE_DEPLOY_ACTIONS_JOB_MOCK_STEPS__STAGING_UNLOCKED,
-    SKIP_DEPLOY_JOB_MOCK_STEPS,
-    CREATE_NEW_VERSION_JOB_MOCK_STEPS,
-    UPDATE_STAGING_JOB_MOCK_STEPS,
-    PREDEPLOY__E2EPERFORMANCETESTS__MOCK_STEPS,
-};
diff --git a/workflow_tests/mocks/reviewerChecklistMocks.ts b/workflow_tests/mocks/reviewerChecklistMocks.ts
deleted file mode 100644
index 8a70c0c71597..000000000000
--- a/workflow_tests/mocks/reviewerChecklistMocks.ts
+++ /dev/null
@@ -1,10 +0,0 @@
-/* eslint-disable @typescript-eslint/naming-convention */
-import {createMockStep} from '../utils/utils';
-
-// checklist
-const REVIEWERCHECKLIST__CHECKLIST__REVIEWERCHECKLIST_JS__STEP_MOCK = createMockStep('reviewerChecklist.js', 'reviewerChecklist.js', 'CHECKLIST', ['GITHUB_TOKEN'], []);
-const REVIEWERCHECKLIST__CHECKLIST__STEP_MOCKS = [REVIEWERCHECKLIST__CHECKLIST__REVIEWERCHECKLIST_JS__STEP_MOCK];
-
-export default {
-    REVIEWERCHECKLIST__CHECKLIST__STEP_MOCKS,
-};
diff --git a/workflow_tests/mocks/testBuildMocks.ts b/workflow_tests/mocks/testBuildMocks.ts
deleted file mode 100644
index cfd194d07185..000000000000
--- a/workflow_tests/mocks/testBuildMocks.ts
+++ /dev/null
@@ -1,261 +0,0 @@
-/* eslint-disable @typescript-eslint/naming-convention */
-import {createMockStep} from '../utils/utils';
-
-// validateactor
-const TESTBUILD__VALIDATEACTOR__IS_TEAM_MEMBER__TRUE__STEP_MOCK = createMockStep('Is Expensify employee', 'Is Expensify employee', 'VALIDATEACTOR', [], ['GITHUB_TOKEN'], {
-    IS_EXPENSIFY_EMPLOYEE: true,
-});
-const TESTBUILD__VALIDATEACTOR__IS_TEAM_MEMBER__FALSE__STEP_MOCK = 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 = 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 = 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 = createMockStep('Checkout', 'Checkout', 'GETBRANCHREF', [], []);
-const TESTBUILD__GETBRANCHREF__CHECK_IF_PULL_REQUEST_NUMBER_IS_CORRECT__STEP_MOCK = createMockStep(
-    'Check if pull request number is correct',
-    'Check if pull request number is correct',
-    'GETBRANCHREF',
-    [],
-    ['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 = createMockStep('Checkout', 'Checkout', 'ANDROID', ['ref'], []);
-const TESTBUILD__ANDROID__CREATE_ENV_ADHOC__STEP_MOCK = createMockStep(
-    'Create .env.adhoc file based on staging and add PULL_REQUEST_NUMBER env to it',
-    'Creating .env.adhoc file based on staging',
-    'ANDROID',
-    [],
-    [],
-);
-const TESTBUILD__ANDROID__SETUP_NODE__STEP_MOCK = createMockStep('Setup Node', 'Setup Node', 'ANDROID', [], []);
-const TESTBUILD__ANDROID__SETUP_JAVA__STEP_MOCK = createMockStep('Setup Java', 'Setup Java', 'ANDROID', ['distribution', 'java-version'], []);
-const TESTBUILD__ANDROID__SETUP_RUBY__STEP_MOCK = createMockStep('Setup Ruby', 'Setup Ruby', 'ANDROID', ['ruby-version', 'bundler-cache'], []);
-const TESTBUILD__ANDROID__DECRYPT_KEYSTORE__STEP_MOCK = createMockStep('Decrypt keystore', 'Decrypt keystore', 'ANDROID', [], ['LARGE_SECRET_PASSPHRASE']);
-const TESTBUILD__ANDROID__DECRYPT_JSON_KEY__STEP_MOCK = createMockStep('Decrypt json key', 'Decrypt json key', 'ANDROID', [], ['LARGE_SECRET_PASSPHRASE']);
-const TESTBUILD__ANDROID__CONFIGURE_AWS_CREDENTIALS__STEP_MOCK = createMockStep(
-    'Configure AWS Credentials',
-    'Configure AWS Credentials',
-    'ANDROID',
-    ['aws-access-key-id', 'aws-secret-access-key', 'aws-region'],
-    [],
-);
-const TESTBUILD__ANDROID__CONFIGURE_MAPBOX_SDK__STEP_MOCK = createMockStep('Configure MapBox SDK', 'Configure MapBox SDK', 'ANDROID');
-const TESTBUILD__ANDROID__RUN_FASTLANE_BETA_TEST__STEP_MOCK = createMockStep(
-    'Run Fastlane beta test',
-    'Run Fastlane beta test',
-    'ANDROID',
-    [],
-    ['S3_ACCESS_KEY', 'S3_SECRET_ACCESS_KEY', 'S3_BUCKET', 'S3_REGION', 'MYAPP_UPLOAD_STORE_PASSWORD', 'MYAPP_UPLOAD_KEY_PASSWORD'],
-);
-const TESTBUILD__ANDROID__UPLOAD_ARTIFACT__STEP_MOCK = 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_JAVA__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 = createMockStep('Checkout', 'Checkout', 'IOS', ['ref'], []);
-const TESTBUILD__IOS__CONFIGURE_MAPBOX_SDK__STEP_MOCK = createMockStep('Configure MapBox SDK', 'Configure MapBox SDK', 'IOS');
-const TESTBUILD__IOS__CREATE_ENV_ADHOC__STEP_MOCK = createMockStep(
-    'Create .env.adhoc file based on staging and add PULL_REQUEST_NUMBER env to it',
-    'Creating .env.adhoc file based on staging',
-    'IOS',
-    [],
-    [],
-);
-const TESTBUILD__IOS__SETUP_NODE__STEP_MOCK = createMockStep('Setup Node', 'Setup Node', 'IOS', [], []);
-const TESTBUILD__IOS__SETUP_XCODE__STEP_MOCK = createMockStep('Setup XCode', 'Setup XCode', 'IOS', [], []);
-const TESTBUILD__IOS__SETUP_RUBY__STEP_MOCK = createMockStep('Setup Ruby', 'Setup Ruby', 'IOS', ['ruby-version', 'bundler-cache'], []);
-const TESTBUILD__IOS__CACHE_POD_DEPENDENCIES__STEP_MOCK = createMockStep('Cache Pod dependencies', 'Cache Pod dependencies', 'IOS', ['path', 'key', 'restore-keys'], [], {
-    'cache-hit': false,
-});
-const TESTBUILD__IOS__COMPARE_PODFILE_AND_MANIFEST__STEP_MOCK = 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 = createMockStep('Install cocoapods', 'Install cocoapods', 'IOS', ['timeout_minutes', 'max_attempts', 'command'], []);
-const TESTBUILD__IOS__DECRYPT_ADHOC_PROFILE__STEP_MOCK = createMockStep('Decrypt AdHoc profile', 'Decrypt AdHoc profile', 'IOS', [], ['LARGE_SECRET_PASSPHRASE']);
-const TESTBUILD__IOS__DECRYPT_ADHOC_NSE_PROFILE__STEP_MOCK = createMockStep(
-    'Decrypt AdHoc Notification Service profile',
-    'Decrypt AdHoc Notification Service profile',
-    'IOS',
-    [],
-    ['LARGE_SECRET_PASSPHRASE'],
-);
-const TESTBUILD__IOS__DECRYPT_CERTIFICATE__STEP_MOCK = createMockStep('Decrypt certificate', 'Decrypt certificate', 'IOS', [], ['LARGE_SECRET_PASSPHRASE']);
-const TESTBUILD__IOS__CONFIGURE_AWS_CREDENTIALS__STEP_MOCK = createMockStep(
-    'Configure AWS Credentials',
-    'Configure AWS Credentials',
-    'IOS',
-    ['aws-access-key-id', 'aws-secret-access-key', 'aws-region'],
-    [],
-);
-const TESTBUILD__IOS__RUN_FASTLANE__STEP_MOCK = createMockStep('Run Fastlane', 'Run Fastlane', 'IOS', [], ['S3_ACCESS_KEY', 'S3_SECRET_ACCESS_KEY', 'S3_BUCKET', 'S3_REGION']);
-const TESTBUILD__IOS__UPLOAD_ARTIFACT__STEP_MOCK = createMockStep('Upload Artifact', 'Upload Artifact', 'IOS', ['name', 'path'], []);
-const TESTBUILD__IOS__STEP_MOCKS = [
-    TESTBUILD__IOS__CHECKOUT__STEP_MOCK,
-    TESTBUILD__IOS__CONFIGURE_MAPBOX_SDK__STEP_MOCK,
-    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_ADHOC_PROFILE__STEP_MOCK,
-    TESTBUILD__IOS__DECRYPT_ADHOC_NSE_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 = createMockStep('Checkout', 'Checkout', 'DESKTOP', ['ref'], []);
-const TESTBUILD__DESKTOP__CREATE_ENV_ADHOC__STEP_MOCK = createMockStep(
-    'Create .env.adhoc file based on staging and add PULL_REQUEST_NUMBER env to it',
-    'Creating .env.adhoc file based on staging',
-    'DESKTOP',
-    [],
-    [],
-);
-const TESTBUILD__DESKTOP__SETUP_NODE__STEP_MOCK = createMockStep('Setup Node', 'Setup Node', 'DESKTOP', [], []);
-const TESTBUILD__DESKTOP__DECRYPT_DEVELOPER_ID_CERTIFICATE__STEP_MOCK = createMockStep(
-    'Decrypt Developer ID Certificate',
-    'Decrypt Developer ID Certificate',
-    'DESKTOP',
-    [],
-    ['DEVELOPER_ID_SECRET_PASSPHRASE'],
-);
-const TESTBUILD__DESKTOP__CONFIGURE_AWS_CREDENTIALS__STEP_MOCK = createMockStep(
-    'Configure AWS Credentials',
-    'Configure AWS Credentials',
-    'DESKTOP',
-    ['aws-access-key-id', 'aws-secret-access-key', 'aws-region'],
-    [],
-);
-const TESTBUILD__DESKTOP__BUILD_DESKTOP_APP_FOR_TESTING__STEP_MOCK = 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 = createMockStep('Checkout', 'Checkout', 'WEB', ['ref'], []);
-const TESTBUILD__WEB__CREATE_ENV_ADHOC__STEP_MOCK = createMockStep(
-    'Create .env.adhoc file based on staging and add PULL_REQUEST_NUMBER env to it',
-    'Creating .env.adhoc file based on staging',
-    'WEB',
-    [],
-    [],
-);
-const TESTBUILD__WEB__SETUP_NODE__STEP_MOCK = createMockStep('Setup Node', 'Setup Node', 'WEB', [], []);
-const TESTBUILD__WEB__CONFIGURE_AWS_CREDENTIALS__STEP_MOCK = createMockStep(
-    'Configure AWS Credentials',
-    'Configure AWS Credentials',
-    'WEB',
-    ['aws-access-key-id', 'aws-secret-access-key', 'aws-region'],
-    [],
-);
-const TESTBUILD__WEB__BUILD_WEB_FOR_TESTING__STEP_MOCK = createMockStep('Build web for testing', 'Build web for testing', 'WEB', [], []);
-const TESTBUILD__WEB__BUILD_DOCS__STEP_MOCK = createMockStep('Build docs', 'Build docs', 'WEB', [], []);
-const TESTBUILD__WEB__DEPLOY_TO_S3_FOR_INTERNAL_TESTING__STEP_MOCK = createMockStep('Deploy to S3 for internal testing', 'Deploy to S3 for internal testing', 'WEB', [], []);
-const TESTBUILD__WEB__STEP_MOCKS = [
-    TESTBUILD__WEB__CHECKOUT__STEP_MOCK,
-    TESTBUILD__WEB__CREATE_ENV_ADHOC__STEP_MOCK,
-    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 = createMockStep('Checkout', 'Checkout', 'POSTGITHUBCOMMENT', ['ref'], []);
-const TESTBUILD__POSTGITHUBCOMMENT__DOWNLOAD_ARTIFACT__STEP_MOCK = createMockStep('Download Artifact', 'Download Artifact', 'POSTGITHUBCOMMENT', [], []);
-const TESTBUILD__POSTGITHUBCOMMENT__READ_JSONS_WITH_ANDROID_PATHS__STEP_MOCK = createMockStep('Read JSONs with android paths', 'Read JSONs with android paths', 'POSTGITHUBCOMMENT', [], [], {
-    android_path: 'http://dummy.android.link',
-});
-const TESTBUILD__POSTGITHUBCOMMENT__READ_JSONS_WITH_IOS_PATHS__STEP_MOCK = createMockStep('Read JSONs with iOS paths', 'Read JSONs with iOS paths', 'POSTGITHUBCOMMENT', [], [], {
-    ios_path: 'http://dummy.ios.link',
-});
-const TESTBUILD__POSTGITHUBCOMMENT__PUBLISH_LINKS_TO_APPS_FOR_DOWNLOAD__STEP_MOCK = 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__PUBLISH_LINKS_TO_APPS_FOR_DOWNLOAD__STEP_MOCK,
-];
-
-export default {
-    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.ts b/workflow_tests/mocks/testMocks.ts
deleted file mode 100644
index 2d9527957b91..000000000000
--- a/workflow_tests/mocks/testMocks.ts
+++ /dev/null
@@ -1,24 +0,0 @@
-/* eslint-disable @typescript-eslint/naming-convention */
-import {createMockStep} from '../utils/utils';
-
-// jest
-const TEST__JEST__CHECKOUT__STEP_MOCK = createMockStep('Checkout', 'Checkout', 'JEST', [], []);
-const TEST__JEST__SETUP_NODE__STEP_MOCK = createMockStep('Setup Node', 'Setup Node', 'JEST', [], []);
-const TEST__JEST__GET_NUMBER_OF_CPU_CORES__STEP_MOCK = createMockStep('Get number of CPU cores', 'Get number of CPU cores', 'JEST', [], [], {count: 8});
-const TEST__JEST__CACHE_JEST_CACHE__STEP_MOCK = createMockStep('Cache Jest cache', 'Cache Jest cache', 'JEST', ['path', 'key'], []);
-const TEST__JEST__JEST_TESTS__STEP_MOCK = createMockStep('Jest tests', 'Jest tests', 'JEST', [], []);
-const TEST__JEST__STEP_MOCKS = [
-    TEST__JEST__CHECKOUT__STEP_MOCK,
-    TEST__JEST__SETUP_NODE__STEP_MOCK,
-    TEST__JEST__GET_NUMBER_OF_CPU_CORES__STEP_MOCK,
-    TEST__JEST__CACHE_JEST_CACHE__STEP_MOCK,
-    TEST__JEST__JEST_TESTS__STEP_MOCK,
-];
-
-// shelltests
-const TEST__SHELLTESTS__CHECKOUT__STEP_MOCK = createMockStep('Checkout', 'Checkout', 'SHELLTESTS', [], []);
-const TEST__SHELLTESTS__SETUP_NODE__STEP_MOCK = createMockStep('Setup Node', 'Setup Node', 'SHELLTESTS', [], []);
-const TEST__SHELLTESTS__TEST_CI_GIT_LOGIC__STEP_MOCK = createMockStep('Test CI git logic', 'Test CI git logic', 'SHELLTESTS', [], []);
-const TEST__SHELLTESTS__STEP_MOCKS = [TEST__SHELLTESTS__CHECKOUT__STEP_MOCK, TEST__SHELLTESTS__SETUP_NODE__STEP_MOCK, TEST__SHELLTESTS__TEST_CI_GIT_LOGIC__STEP_MOCK];
-
-export default {TEST__JEST__STEP_MOCKS, TEST__SHELLTESTS__STEP_MOCKS};
diff --git a/workflow_tests/mocks/validateGithubActionsMocks.ts b/workflow_tests/mocks/validateGithubActionsMocks.ts
deleted file mode 100644
index 2c1afba74387..000000000000
--- a/workflow_tests/mocks/validateGithubActionsMocks.ts
+++ /dev/null
@@ -1,18 +0,0 @@
-/* eslint-disable @typescript-eslint/naming-convention */
-import {createMockStep} from '../utils/utils';
-
-// verify
-const VALIDATEGITHUBACTIONS__VERIFY__CHECKOUT__STEP_MOCK = createMockStep('Checkout', 'Checkout', 'VERIFY');
-const VALIDATEGITHUBACTIONS__VERIFY__SETUP_NODE__STEP_MOCK = createMockStep('Setup Node', 'Setup Node', 'VERIFY', [], []);
-const VALIDATEGITHUBACTIONS__VERIFY__VERIFY_JAVASCRIPT_ACTION_BUILDS__STEP_MOCK = createMockStep('Verify Javascript Action Builds', 'Verify Javascript Action Builds', 'VERIFY', [], []);
-const VALIDATEGITHUBACTIONS__VERIFY__VALIDATE_ACTIONS_AND_WORKFLOWS__STEP_MOCK = createMockStep('Validate actions and workflows', 'Validate actions and workflows', 'VERIFY', [], []);
-const VALIDATEGITHUBACTIONS__VERIFY__STEP_MOCKS = [
-    VALIDATEGITHUBACTIONS__VERIFY__CHECKOUT__STEP_MOCK,
-    VALIDATEGITHUBACTIONS__VERIFY__SETUP_NODE__STEP_MOCK,
-    VALIDATEGITHUBACTIONS__VERIFY__VERIFY_JAVASCRIPT_ACTION_BUILDS__STEP_MOCK,
-    VALIDATEGITHUBACTIONS__VERIFY__VALIDATE_ACTIONS_AND_WORKFLOWS__STEP_MOCK,
-];
-
-export default {
-    VALIDATEGITHUBACTIONS__VERIFY__STEP_MOCKS,
-};
diff --git a/workflow_tests/mocks/verifyPodfileMocks.ts b/workflow_tests/mocks/verifyPodfileMocks.ts
deleted file mode 100644
index 0cd7ea396dad..000000000000
--- a/workflow_tests/mocks/verifyPodfileMocks.ts
+++ /dev/null
@@ -1,12 +0,0 @@
-/* eslint-disable @typescript-eslint/naming-convention */
-import {createMockStep} from '../utils/utils';
-
-// verify
-const VERIFYPODFILE__VERIFY__CHECKOUT__STEP_MOCK = createMockStep('Checkout', 'Checkout', 'VERIFY');
-const VERIFYPODFILE__VERIFY__SETUP_NODE__STEP_MOCK = createMockStep('Setup Node', 'Setup Node', 'VERIFY', [], []);
-const VERIFYPODFILE__VERIFY__VERIFY_PODFILE__STEP_MOCK = createMockStep('Verify podfile', 'Verify podfile', 'VERIFY', [], []);
-const VERIFYPODFILE__VERIFY__STEP_MOCKS = [VERIFYPODFILE__VERIFY__CHECKOUT__STEP_MOCK, VERIFYPODFILE__VERIFY__SETUP_NODE__STEP_MOCK, VERIFYPODFILE__VERIFY__VERIFY_PODFILE__STEP_MOCK];
-
-export default {
-    VERIFYPODFILE__VERIFY__STEP_MOCKS,
-};
diff --git a/workflow_tests/mocks/verifySignedCommitsMocks.ts b/workflow_tests/mocks/verifySignedCommitsMocks.ts
deleted file mode 100644
index 6109af183fd7..000000000000
--- a/workflow_tests/mocks/verifySignedCommitsMocks.ts
+++ /dev/null
@@ -1,16 +0,0 @@
-/* eslint-disable @typescript-eslint/naming-convention */
-import {createMockStep} from '../utils/utils';
-
-// verifysignedcommits
-const VERIFYSIGNEDCOMMITS__VERIFYSIGNEDCOMMITS__VERIFY_SIGNED_COMMITS__STEP_MOCK = createMockStep(
-    'Verify signed commits',
-    'Verify signed commits',
-    'VERIFYSIGNEDCOMMITS',
-    ['GITHUB_TOKEN'],
-    [],
-);
-const VERIFYSIGNEDCOMMITS__VERIFYSIGNEDCOMMITS__STEP_MOCKS = [VERIFYSIGNEDCOMMITS__VERIFYSIGNEDCOMMITS__VERIFY_SIGNED_COMMITS__STEP_MOCK];
-
-export default {
-    VERIFYSIGNEDCOMMITS__VERIFYSIGNEDCOMMITS__STEP_MOCKS,
-};
diff --git a/workflow_tests/platformDeploy.test.ts b/workflow_tests/platformDeploy.test.ts
deleted file mode 100644
index 0ac68eb6d55b..000000000000
--- a/workflow_tests/platformDeploy.test.ts
+++ /dev/null
@@ -1,302 +0,0 @@
-import type {MockStep} from '@kie/act-js/build/src/step-mocker/step-mocker.types';
-import {MockGithub} from '@kie/mock-github';
-import type {CreateRepositoryFile} from '@kie/mock-github';
-import path from 'path';
-import assertions from './assertions/platformDeployAssertions';
-import mocks from './mocks/platformDeployMocks';
-import ExtendedAct from './utils/ExtendedAct';
-import type {MockJobs} from './utils/JobMocker';
-import * as utils from './utils/utils';
-
-jest.setTimeout(90 * 1000);
-
-let mockGithub: MockGithub;
-
-const FILES_TO_COPY_INTO_TEST_REPO: CreateRepositoryFile[] = [
-    ...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(() => {
-        // 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 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 ExtendedAct(repoPath, workflowPath);
-                act = utils.setUpActParams(
-                    act,
-                    'push',
-                    {
-                        ref: 'refs/tags/1.2.3',
-                        // eslint-disable-next-line @typescript-eslint/naming-convention
-                        ref_type: 'tag',
-                        // eslint-disable-next-line @typescript-eslint/naming-convention
-                        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: MockStep = {
-                    validateActor: mocks.PLATFORM_DEPLOY__VALIDATE_ACTOR__TEAM_MEMBER__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 testMockJobs: MockJobs = {
-                    deployChecklist: {
-                        steps: mocks.PLATFORM_DEPLOY__DEPLOY_CHECKLIST__STEP_MOCKS,
-                        runsOn: 'ubuntu-latest',
-                    },
-                };
-                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),
-                    mockJobs: testMockJobs,
-                });
-
-                assertions.assertVerifyActorJobExecuted(result);
-                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 ExtendedAct(repoPath, workflowPath);
-                act = utils.setUpActParams(
-                    act,
-                    'push',
-                    {
-                        ref: 'refs/tags/1.2.3',
-                        // eslint-disable-next-line @typescript-eslint/naming-convention
-                        ref_type: 'tag',
-                        // eslint-disable-next-line @typescript-eslint/naming-convention
-                        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,
-                    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 testMockJobs: MockJobs = {
-                    deployChecklist: {
-                        steps: mocks.PLATFORM_DEPLOY__DEPLOY_CHECKLIST__STEP_MOCKS,
-                        runsOn: 'ubuntu-latest',
-                    },
-                };
-                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),
-                    mockJobs: testMockJobs,
-                });
-
-                assertions.assertVerifyActorJobExecuted(result);
-                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 ExtendedAct(repoPath, workflowPath);
-                act = utils.setUpActParams(
-                    act,
-                    'push',
-                    {
-                        ref: 'refs/tags/1.2.3',
-                        // eslint-disable-next-line @typescript-eslint/naming-convention
-                        ref_type: 'tag',
-                        // eslint-disable-next-line @typescript-eslint/naming-convention
-                        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,
-                    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 testMockJobs: MockJobs = {
-                    deployChecklist: {
-                        steps: mocks.PLATFORM_DEPLOY__DEPLOY_CHECKLIST__STEP_MOCKS,
-                        runsOn: 'ubuntu-latest',
-                    },
-                };
-                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),
-                    mockJobs: testMockJobs,
-                });
-
-                assertions.assertVerifyActorJobExecuted(result);
-                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.ts b/workflow_tests/preDeploy.test.ts
deleted file mode 100644
index 1739fec13815..000000000000
--- a/workflow_tests/preDeploy.test.ts
+++ /dev/null
@@ -1,800 +0,0 @@
-import type {MockStep} from '@kie/act-js/build/src/step-mocker/step-mocker.types';
-import {MockGithub} from '@kie/mock-github';
-import type {CreateRepositoryFile} from '@kie/mock-github';
-import path from 'path';
-import assertions from './assertions/preDeployAssertions';
-import mocks from './mocks/preDeployMocks';
-import ExtendedAct from './utils/ExtendedAct';
-import type {MockJobs} from './utils/JobMocker';
-import * as utils from './utils/utils';
-
-jest.setTimeout(90 * 1000);
-
-let mockGithub: MockGithub;
-
-const FILES_TO_COPY_INTO_TEST_REPO: CreateRepositoryFile[] = [
-    ...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(() => {
-        // 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 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 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: MockStep = {
-            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,
-        };
-        const testMockJobs: MockJobs = {
-            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.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 ExtendedAct(repoPath, workflowPath);
-        const testMockSteps: MockStep = {
-            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,
-        };
-        const testMockJobs: MockJobs = {
-            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.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.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 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: MockStep = {
-                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,
-            };
-            const testMockJobs: MockJobs = {
-                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);
-            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 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: MockStep = {
-                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,
-            };
-            const testMockJobs: MockJobs = {
-                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);
-            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 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: MockStep = {
-                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,
-            };
-            const testMockJobs: MockJobs = {
-                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')]));
-            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 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: MockStep = {
-                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,
-            };
-            const testMockJobs: MockJobs = {
-                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.assertChooseDeployActionsJobExecuted(result);
-            assertions.assertSkipDeployJobExecuted(result, false);
-            assertions.assertCreateNewVersionJobExecuted(result);
-            assertions.assertUpdateStagingJobExecuted(result);
-        });
-    });
-
-    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 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: MockStep = {
-                    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,
-                };
-                const testMockJobs: MockJobs = {
-                    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.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 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: MockStep = {
-                    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,
-                };
-                const testMockJobs: MockJobs = {
-                    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.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 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: MockStep = {
-                    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,
-                };
-                const testMockJobs: MockJobs = {
-                    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.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 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: MockStep = {
-                    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,
-                };
-                const testMockJobs: MockJobs = {
-                    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.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 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: MockStep = {
-                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,
-            };
-            testMockSteps.updateStaging[3].mockWith = 'exit 1';
-            const testMockJobs: MockJobs = {
-                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.assertChooseDeployActionsJobExecuted(result);
-            assertions.assertSkipDeployJobExecuted(result, false);
-            assertions.assertCreateNewVersionJobExecuted(result);
-            assertions.assertUpdateStagingJobFailed(result, true);
-        });
-    });
-});
diff --git a/workflow_tests/reviewerChecklist.test.ts b/workflow_tests/reviewerChecklist.test.ts
deleted file mode 100644
index d70afd31f115..000000000000
--- a/workflow_tests/reviewerChecklist.test.ts
+++ /dev/null
@@ -1,88 +0,0 @@
-import type {MockStep} from '@kie/act-js/build/src/step-mocker/step-mocker.types';
-import {MockGithub} from '@kie/mock-github';
-import type {CreateRepositoryFile} from '@kie/mock-github';
-import path from 'path';
-import assertions from './assertions/reviewerChecklistAssertions';
-import mocks from './mocks/reviewerChecklistMocks';
-import ExtendedAct from './utils/ExtendedAct';
-import * as utils from './utils/utils';
-
-jest.setTimeout(90 * 1000);
-
-let mockGithub: MockGithub;
-
-const FILES_TO_COPY_INTO_TEST_REPO: CreateRepositoryFile[] = [
-    ...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(() => {
-        // 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 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 ExtendedAct(repoPath, workflowPath);
-            act = utils.setUpActParams(act, event, eventOptions, {}, githubToken);
-            const testMockSteps: MockStep = {
-                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 ExtendedAct(repoPath, workflowPath);
-                act = utils.setUpActParams(act, event, eventOptions, {}, githubToken);
-                const testMockSteps: MockStep = {
-                    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
deleted file mode 100755
index c8ee88e33e99..000000000000
--- a/workflow_tests/scripts/runWorkflowTests.sh
+++ /dev/null
@@ -1,63 +0,0 @@
-#!/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.ts --runInBand "$@"
diff --git a/workflow_tests/test.test.ts b/workflow_tests/test.test.ts
deleted file mode 100644
index 085a2b3902d6..000000000000
--- a/workflow_tests/test.test.ts
+++ /dev/null
@@ -1,188 +0,0 @@
-import type {MockStep} from '@kie/act-js/build/src/step-mocker/step-mocker.types';
-import {MockGithub} from '@kie/mock-github';
-import type {CreateRepositoryFile} from '@kie/mock-github';
-import path from 'path';
-import assertions from './assertions/testAssertions';
-import mocks from './mocks/testMocks';
-import ExtendedAct from './utils/ExtendedAct';
-import * as utils from './utils/utils';
-
-jest.setTimeout(90 * 1000);
-
-let mockGithub: MockGithub;
-
-const FILES_TO_COPY_INTO_TEST_REPO: CreateRepositoryFile[] = [
-    ...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(() => {
-        // 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 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 ExtendedAct(repoPath, workflowPath);
-            act = utils.setUpActParams(act, event, eventOptions, {}, githubToken);
-            const testMockSteps: MockStep = {
-                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 ExtendedAct(repoPath, workflowPath);
-                act = utils.setUpActParams(act, event, eventOptions, {}, githubToken);
-                const testMockSteps: MockStep = {
-                    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 ExtendedAct(repoPath, workflowPath);
-            act = utils.setUpActParams(act, event, eventOptions, {}, githubToken);
-            const testMockSteps: MockStep = {
-                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 ExtendedAct(repoPath, workflowPath);
-                act = utils.setUpActParams(act, event, eventOptions, {}, githubToken);
-                const testMockSteps: MockStep = {
-                    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 ExtendedAct(repoPath, workflowPath);
-            act = utils.setUpActParams(act, event, eventOptions, {}, githubToken);
-            const testMockSteps: MockStep = {
-                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 ExtendedAct(repoPath, workflowPath);
-                act = utils.setUpActParams(act, event, eventOptions, {}, githubToken);
-                const testMockSteps: MockStep = {
-                    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.ts b/workflow_tests/testBuild.test.ts
deleted file mode 100644
index cd793fa9aaca..000000000000
--- a/workflow_tests/testBuild.test.ts
+++ /dev/null
@@ -1,754 +0,0 @@
-/* eslint-disable @typescript-eslint/naming-convention */
-import {MockGithub} from '@kie/mock-github';
-import path from 'path';
-import assertions from './assertions/testBuildAssertions';
-import mocks from './mocks/testBuildMocks';
-import ExtendedAct from './utils/ExtendedAct';
-import * as utils from './utils/utils';
-
-jest.setTimeout(90 * 1000);
-let mockGithub: 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(() => {
-        // 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 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 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 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 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 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 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[5] = 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, 5);
-                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 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 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 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', 'aws-region'],
-                    [],
-                    {},
-                    {},
-                    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 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 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 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 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 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 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 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 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 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 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 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 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.ts b/workflow_tests/utils/ExtendedAct.ts
deleted file mode 100644
index b0f4d7e159e4..000000000000
--- a/workflow_tests/utils/ExtendedAct.ts
+++ /dev/null
@@ -1,58 +0,0 @@
-/* eslint-disable @typescript-eslint/dot-notation */
-// This eslint-disable comment is here to allow accessing private properties in the Act class
-import type {RunOpts, Step, Workflow} from '@kie/act-js';
-import {Act} from '@kie/act-js';
-import path from 'path';
-import JobMocker from './JobMocker';
-import type {MockJobs} from './JobMocker';
-
-type ExtendedActOpts = RunOpts & {actor?: string; workflowFile?: string; mockJobs?: MockJobs};
-
-type ActOptions = {
-    cwd: string;
-    actArguments: string[];
-    proxy: unknown;
-};
-
-// @ts-expect-error Override shouldn't be done on private methods wait until https://github.com/kiegroup/act-js/issues/77 is resolved or try to create a params workaround
-class ExtendedAct extends Act {
-    async parseRunOpts(opts?: ExtendedActOpts): Promise<ActOptions> {
-        const {cwd, actArguments, proxy} = await super['parseRunOpts'](opts);
-
-        if (opts?.actor) {
-            actArguments.push('--actor', opts.actor);
-        }
-
-        return {cwd, actArguments, proxy};
-    }
-
-    async runEvent(event: string, opts?: ExtendedActOpts): Promise<Step[]> {
-        const {mockJobs, ...vanillaOpts} = opts ?? {};
-
-        if (mockJobs) {
-            await this.handleJobMocking((workflow) => workflow.events.includes(event), {mockJobs, workflowFile: vanillaOpts.workflowFile, cwd: vanillaOpts.cwd});
-        }
-
-        return super.runEvent(event, vanillaOpts);
-    }
-
-    async handleJobMocking(filter: (workflow: Workflow) => boolean, opts: ExtendedActOpts): Promise<void[]> {
-        let workflowFiles: string[];
-
-        if (opts.workflowFile) {
-            workflowFiles = [path.basename(opts.workflowFile)];
-        } else if (this['workflowFile'] !== this['cwd']) {
-            workflowFiles = [path.basename(this['workflowFile'])];
-        } else {
-            const availableWorkflows = await this.list(undefined, opts.cwd, opts.workflowFile);
-            workflowFiles = availableWorkflows.filter(filter).map((workflow: Workflow) => workflow.workflowFile);
-        }
-
-        return workflowFiles.map((workflowFile) => {
-            const jobMocker = new JobMocker(workflowFile, opts.cwd ?? this['cwd']);
-            return jobMocker.mock(opts.mockJobs);
-        });
-    }
-}
-
-export default ExtendedAct;
diff --git a/workflow_tests/utils/JobMocker.ts b/workflow_tests/utils/JobMocker.ts
deleted file mode 100644
index dadb85014d01..000000000000
--- a/workflow_tests/utils/JobMocker.ts
+++ /dev/null
@@ -1,108 +0,0 @@
-import type {StepIdentifier} from '@kie/act-js';
-import type {PathOrFileDescriptor} from 'fs';
-import fs from 'fs';
-import path from 'path';
-import yaml from 'yaml';
-
-// eslint-disable-next-line @typescript-eslint/naming-convention
-type YamlMockJob = Omit<MockJob, 'runsOn'> & {'runs-on'?: string};
-
-type YamlWorkflow = {
-    jobs: Record<string, YamlMockJob>;
-};
-
-type MockJob = {
-    steps: StepIdentifier[];
-    uses?: string;
-    secrets?: string[];
-    with?: string;
-    outputs?: Record<string, string>;
-    runsOn: string;
-};
-
-type MockJobs = Record<string, MockJob>;
-
-class JobMocker {
-    workflowFile: string;
-
-    cwd: string;
-
-    constructor(workflowFile: string, cwd: string) {
-        this.workflowFile = workflowFile;
-        this.cwd = cwd;
-    }
-
-    mock(mockJobs: MockJobs = {}) {
-        const filePath = this.getWorkflowPath();
-        const workflow = 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: string | undefined;
-                if (job.with) {
-                    jobWith = job.with;
-                    delete job.with;
-                }
-                job.steps = mockJob.steps.map((step): StepIdentifier => {
-                    const mockStep: StepIdentifier = {
-                        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: YamlWorkflow, jobId: string): YamlMockJob {
-        return workflow.jobs[jobId];
-    }
-
-    getWorkflowPath(): string {
-        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}`);
-    }
-
-    readWorkflowFile(location: PathOrFileDescriptor): YamlWorkflow {
-        const test: YamlWorkflow = yaml.parse(fs.readFileSync(location, 'utf8'));
-
-        return test;
-    }
-
-    writeWorkflowFile(location: PathOrFileDescriptor, data: YamlWorkflow) {
-        return fs.writeFileSync(location, yaml.stringify(data), 'utf8');
-    }
-}
-
-export default JobMocker;
-export type {MockJob, MockJobs, YamlWorkflow, YamlMockJob};
diff --git a/workflow_tests/utils/preGenerateTest.ts b/workflow_tests/utils/preGenerateTest.ts
deleted file mode 100644
index 25bdb8f00ae3..000000000000
--- a/workflow_tests/utils/preGenerateTest.ts
+++ /dev/null
@@ -1,297 +0,0 @@
-/* eslint no-console: ["error", { allow: ["warn", "log"] }] */
-import type {StepIdentifier} from '@kie/act-js';
-import type {PathLike} from 'fs';
-import fs from 'fs';
-import path from 'path';
-import {exit} from 'process';
-import yaml from 'yaml';
-import type {YamlMockJob, YamlWorkflow} from './JobMocker';
-
-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: string): string => (s && s.charAt(0).toUpperCase() + s.slice(1)) || '';
-const mockFileTemplate = (mockSteps: string, exports: string) => `const utils = require('../utils/utils');
-${mockSteps}
-${exports}
-`;
-
-const assertionFileTemplate = (jobAssertions: string, exports: string) => `import type {Step} from '@kie/act-js';
-import * as utils from 'workflow_tests/utils/utils';
-
-${jobAssertions}
-${exports}
-`;
-
-const testFileTemplate = (workflowName: string) => `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 ExtendedAct = require('./utils/ExtendedAct').default;
-
-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', '${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 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', '${workflowName}.yml'),
-                mockSteps: testMockSteps,
-                actor,
-            });
-            
-        // assert execution with imported assertions
-    });
-});
-`;
-
-const mockStepTemplate = (stepMockName: string, step: StepIdentifier, jobId: string | undefined) => `
-const ${stepMockName} = utils.createMockStep(
-    '${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 = (stepName: string, jobId: string, stepMessage: string, inputs: string[] = [], envs: string[] = []): string => {
-    const inputsString = inputs.map((input) => `{key: '${input}', value: '[FILL_IN]'}`).join(',');
-    const envsString = envs.map((env) => `{key: '${env}', value: '[FILL_IN]'}`).join(',');
-
-    return `
-        utils.createStepAssertion(
-            '${stepName}',
-            true,
-            null,
-            '${jobId}',
-            '${stepMessage}',
-            [${inputsString}],
-            [${envsString}],
-        ),`;
-};
-
-const jobMocksTemplate = (jobMocksName: string, stepMocks: string[]): string => {
-    const stepMocksString = stepMocks.map((stepMock) => `${stepMock}`).join(',');
-
-    return `const ${jobMocksName} = [${stepMocksString}\n];`;
-};
-
-const jobAssertionTemplate = (jobAssertionName: string, stepAssertionsContent: string) => `
-function ${jobAssertionName}(workflowResult: Step[], didExecute = true) {
-    const steps = [\n${stepAssertionsContent}\n];
-
-    for (const expectedStep of steps) {
-        if (didExecute) {
-            expect(workflowResult).toEqual(expect.arrayContaining([expectedStep]));
-        } else {
-            expect(workflowResult).not.toEqual(expect.arrayContaining([expectedStep]));
-        }
-    }
-};`;
-
-const mocksExportsTemplate = (jobMocks: string[]): string => {
-    const jobMocksString = jobMocks.map((jobMock) => `  ${jobMock}`).join(',\n');
-
-    return `\nmodule.exports = {\n${jobMocksString}\n};\n`;
-};
-
-const assertionsExportsTemplate = (jobAssertions: string[]): string => {
-    const assertionsString = jobAssertions.join(',\n');
-    // There are other pre-generated files using imports from here, so to keep the interface uniform it's better to just disable it
-    const eslintDisable = jobAssertions.length === 1 ? '// eslint-disable-next-line import/prefer-default-export\n' : '';
-
-    return `\n${eslintDisable}export default {\n${assertionsString}\n};\n`;
-};
-
-const checkArguments = (args: string[]) => {
-    if (args.length > 0 && args[0]) {
-        return;
-    }
-    console.warn('Please provide workflow file name');
-    exit(1);
-};
-const checkWorkflowFileName = (fileName: string) => {
-    if (workflowFileRegex.test(fileName)) {
-        return;
-    }
-    console.warn(`Please provide a valid workflow file name ([workflow].yml) instead of ${fileName}`);
-    exit(1);
-};
-const checkWorkflowFilePath = (filePath: PathLike) => {
-    if (fs.existsSync(filePath)) {
-        return;
-    }
-    console.warn(`Provided workflow file does not exist: ${filePath.toString()}`);
-    exit(1);
-};
-const checkIfTestFileExists = (testsDirectory: string, testFileName: string) => {
-    if (!fs.existsSync(path.join(testsDirectory, testFileName))) {
-        return;
-    }
-    console.warn(`The test file ${testFileName} already exists, exiting`);
-    exit(1);
-};
-const checkIfMocksFileExists = (mocksDirectory: string, mocksFileName: string) => {
-    if (!fs.existsSync(path.join(mocksDirectory, mocksFileName))) {
-        return;
-    }
-    console.warn(`The mocks file ${mocksFileName} already exists, exiting`);
-    exit(1);
-};
-const checkIfAssertionsFileExists = (assertionsDirectory: string, assertionsFileName: string) => {
-    if (!fs.existsSync(path.join(assertionsDirectory, assertionsFileName))) {
-        return;
-    }
-    console.warn(`The assertions file ${assertionsFileName} already exists, exiting`);
-    exit(1);
-};
-const parseWorkflowFile = (workflow: YamlWorkflow) => {
-    const workflowJobs: Record<string, YamlMockJob> = {};
-    Object.entries(workflow.jobs).forEach(([jobId, job]) => {
-        workflowJobs[jobId] = {
-            steps: [],
-        };
-        job.steps.forEach((step) => {
-            const workflowStep = {
-                name: step.name,
-                inputs: Object.keys(step.with ?? {}),
-                envs: step.envs ?? [],
-            };
-            workflowJobs[jobId].steps.push(workflowStep);
-        });
-    });
-    return workflowJobs;
-};
-const getMockFileContent = (workflowName: string, jobs: Record<string, YamlMockJob>): string => {
-    let content = '';
-    const jobMocks: string[] = [];
-    Object.entries(jobs).forEach(([jobId, job]) => {
-        let mockStepsContent = `\n// ${jobId.toLowerCase()}`;
-        const stepMocks: string[] = [];
-        job.steps.forEach((step) => {
-            const stepMockName = `${workflowName.toUpperCase()}__${jobId.toUpperCase()}__${step.name
-                .replaceAll(' ', '_')
-                .replaceAll('-', '_')
-                .replaceAll(',', '')
-                .replaceAll('#', '')
-                .replaceAll('.ts', '')
-                .replaceAll('.js', '')
-                .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 = (jobs: Record<string, YamlMockJob>): string => {
-    let content = '';
-    const jobAssertions: string[] = [];
-
-    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: string): string => testFileTemplate(workflowName);
-
-const callArgs = process.argv.slice(2);
-checkArguments(callArgs);
-
-const workflowFileName = callArgs[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.ts`;
-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(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);
-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.ts b/workflow_tests/utils/utils.ts
deleted file mode 100644
index b70a88c24c7a..000000000000
--- a/workflow_tests/utils/utils.ts
+++ /dev/null
@@ -1,214 +0,0 @@
-import type {EventJSON} from '@kie/act-js/build/src/action-event/action-event.types';
-import type {StepIdentifier} from '@kie/act-js/build/src/step-mocker/step-mocker.types';
-import fs from 'fs';
-import path from 'path';
-import yaml from 'yaml';
-import type ExtendedAct from './ExtendedAct';
-
-type StepAssertionInputEntry = {key: string; value: string | boolean};
-
-type StepAssertion = {
-    name: string;
-    status: number;
-    output: string;
-};
-
-function setUpActParams(
-    act: ExtendedAct,
-    event: string | null = null,
-    eventOptions: EventJSON | null = null,
-    secrets: Record<string, string> | null = null,
-    githubToken: string | null = null,
-    envVars: Record<string, string> | null = null,
-    inputs: Record<string, string> | null = null,
-): ExtendedAct {
-    let updatedAct = 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,
-        };
-        updatedAct = updatedAct.setEvent(eventData);
-    }
-
-    if (secrets) {
-        Object.entries(secrets).forEach(([key, value]) => {
-            updatedAct = updatedAct.setSecret(key, value);
-        });
-    }
-
-    if (githubToken) {
-        updatedAct = updatedAct.setGithubToken(githubToken);
-    }
-
-    if (envVars) {
-        Object.entries(envVars).forEach(([key, value]) => {
-            updatedAct = updatedAct.setEnv(key, value);
-        });
-    }
-
-    if (inputs) {
-        Object.entries(inputs).forEach(([key, value]) => {
-            updatedAct = updatedAct.setInput(key, value);
-        });
-    }
-
-    return updatedAct;
-}
-
-function createMockStep(
-    name: string,
-    message: string,
-    jobId: string | null = null,
-    inputs: string[] | null = null,
-    inEnvs: string[] | null = null,
-    outputs: Record<string, string | boolean | number> | null = null,
-    outEnvs: Record<string, string> | null = null,
-    isSuccessful = true,
-    id: string | null = null,
-): StepIdentifier {
-    const mockStepName = name;
-    let mockWithCommand = 'echo [MOCK]';
-    if (jobId) {
-        mockWithCommand += ` [${jobId}]`;
-    }
-    mockWithCommand += ` ${message}`;
-    if (inputs) {
-        inputs.forEach((input) => {
-            mockWithCommand += `, ${input}="\${{ inputs.${input} && inputs.${input} || github.event.inputs.${input} }}"`;
-        });
-    }
-    if (inEnvs) {
-        inEnvs.forEach((env) => {
-            mockWithCommand += `, ${env}="\${{ env.${env} }}"`;
-        });
-    }
-    if (outputs) {
-        Object.entries(outputs).forEach(([key, value]) => {
-            mockWithCommand += `\necho "${key}=${value}" >> "$GITHUB_OUTPUT"`;
-        });
-    }
-    if (outEnvs) {
-        Object.entries(outEnvs).forEach(([key, value]) => {
-            mockWithCommand += `\necho "${key}=${value}" >> "$GITHUB_ENV"`;
-        });
-    }
-    if (!isSuccessful) {
-        mockWithCommand += '\nexit 1';
-    }
-    if (!id) {
-        return {
-            name: mockStepName,
-            mockWith: mockWithCommand,
-        };
-    }
-
-    return {
-        id,
-        name: mockStepName,
-        mockWith: mockWithCommand,
-    };
-}
-
-function createStepAssertion(
-    name: string,
-    isSuccessful = true,
-    expectedOutput: string | null = null,
-    jobId: string | null = null,
-    message: string | null = null,
-    inputs: StepAssertionInputEntry[] | null = null,
-    envs: StepAssertionInputEntry[] | null = null,
-): StepAssertion {
-    const stepName = `Main ${name}`;
-    const stepStatus = isSuccessful ? 0 : 1;
-    let stepOutput: string;
-    if (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: ExtendedAct, jobs: Record<string, string>, workflowPath: string): ExtendedAct {
-    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<TObject>(originalObject: TObject): TObject {
-    return JSON.parse(JSON.stringify(originalObject)) as TObject;
-}
-
-function getLogFilePath(workflowName: string, testName: string | undefined): string {
-    if (!testName) {
-        throw new Error();
-    }
-
-    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',
-    },
-];
-
-export {setUpActParams, createMockStep, createStepAssertion, setJobRunners, deepCopy, getLogFilePath, FILES_TO_COPY_INTO_TEST_REPO, removeMockRepoDir};
diff --git a/workflow_tests/validateGithubActions.test.ts b/workflow_tests/validateGithubActions.test.ts
deleted file mode 100644
index f4972a9ae653..000000000000
--- a/workflow_tests/validateGithubActions.test.ts
+++ /dev/null
@@ -1,90 +0,0 @@
-import {MockGithub} from '@kie/mock-github';
-import path from 'path';
-import assertions from './assertions/validateGithubActionsAssertions';
-import mocks from './mocks/validateGithubActionsMocks';
-import ExtendedAct from './utils/ExtendedAct';
-import * as utils from './utils/utils';
-
-jest.setTimeout(90 * 1000);
-let mockGithub: 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(() => {
-        // 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 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 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 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.ts b/workflow_tests/verifyPodfile.test.ts
deleted file mode 100644
index 6124cdc856c1..000000000000
--- a/workflow_tests/verifyPodfile.test.ts
+++ /dev/null
@@ -1,134 +0,0 @@
-import {MockGithub} from '@kie/mock-github';
-import path from 'path';
-import assertions from './assertions/verifyPodfileAssertions';
-import mocks from './mocks/verifyPodfileMocks';
-import ExtendedAct from './utils/ExtendedAct';
-import * as utils from './utils/utils';
-
-jest.setTimeout(90 * 1000);
-let mockGithub: 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(() => {
-        // 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 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 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 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 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 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.ts b/workflow_tests/verifySignedCommits.test.ts
deleted file mode 100644
index 3bf6c15ec1bb..000000000000
--- a/workflow_tests/verifySignedCommits.test.ts
+++ /dev/null
@@ -1,91 +0,0 @@
-import {MockGithub} from '@kie/mock-github';
-import path from 'path';
-import assertions from './assertions/verifySignedCommitsAssertions';
-import mocks from './mocks/verifySignedCommitsMocks';
-import ExtendedAct from './utils/ExtendedAct';
-import * as utils from './utils/utils';
-
-jest.setTimeout(90 * 1000);
-let mockGithub: 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(() => {
-        // 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 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 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 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);
-        });
-    });
-});